diff --git a/asm/boot.s b/asm/boot.s index 2bdee2ae9f..f94ddb851c 100644 --- a/asm/boot.s +++ b/asm/boot.s @@ -316,6 +316,7 @@ glabel func_A4000040 /* 4B4 A40004B4 258C0000 */ addiu $t4, $t4, %lo(D_80000000) /* 4B8 A40004B8 01800008 */ jr $t4 /* 4BC A40004BC 00000000 */ nop + glabel func_A40004C0 /* 4C0 A40004C0 3C0BB000 */ lui $t3, %hi(D_B0000008) /* 4C4 A40004C4 8D690008 */ lw $t1, %lo(D_B0000008)($t3) @@ -501,6 +502,7 @@ glabel func_A40004C0 /* 760 A4000760 01200008 */ jr $t1 /* 764 A4000764 00000000 */ nop /* 768 A4000768 00000000 */ nop + glabel func_A400076C /* 76C A400076C 27BDFF60 */ addiu $sp, $sp, -0xa0 /* 770 A4000770 AFB00040 */ sw $s0, 0x40($sp) @@ -610,6 +612,7 @@ glabel func_A4000874 /* 8F4 A40008F4 27BD0020 */ addiu $sp, $sp, 0x20 /* 8F8 A40008F8 03E00008 */ jr $ra /* 8FC A40008FC 00000000 */ nop + glabel func_A4000900 /* 900 A4000900 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 904 A4000904 AFBF001C */ sw $ra, 0x1c($sp) @@ -643,6 +646,7 @@ glabel func_A4000900 /* 968 A4000968 27BD0028 */ addiu $sp, $sp, 0x28 /* 96C A400096C 03E00008 */ jr $ra /* 970 A4000970 00000000 */ nop + glabel func_A4000974 /* 974 A4000974 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 978 A4000978 AFBF001C */ sw $ra, 0x1c($sp) @@ -698,6 +702,7 @@ glabel func_A4000974 /* A28 A4000A28 27BD0028 */ addiu $sp, $sp, 0x28 /* A2C A4000A2C 03E00008 */ jr $ra /* A30 A4000A30 00000000 */ nop + glabel func_A4000A34 /* A34 A4000A34 27BDFFD8 */ addiu $sp, $sp, -0x28 /* A38 A4000A38 308400FF */ andi $a0, $a0, 0xff @@ -737,6 +742,7 @@ glabel func_A4000A34 /* AB8 A4000AB8 27BD0028 */ addiu $sp, $sp, 0x28 /* ABC A4000ABC 03E00008 */ jr $ra /* AC0 A4000AC0 00000000 */ nop + glabel func_A4000AC4 /* AC4 A4000AC4 27BDFFD8 */ addiu $sp, $sp, -0x28 /* AC8 A4000AC8 AFBF001C */ sw $ra, 0x1c($sp) diff --git a/asm/data/code_16A3E0.data.s b/asm/data/code_16A3E0.data.s index 1cf5b9dd9c..69dfb7b4bb 100644 --- a/asm/data/code_16A3E0.data.s +++ b/asm/data/code_16A3E0.data.s @@ -206,35 +206,35 @@ glabel D_8024BDA8 glabel D_8024BDE0 .word 0x00000000, 0x00000000, 0x00000000, 0x8024B400, 0x31100810, 0x08100810, 0x08000000, 0x00000000, 0xFC317FFF, 0x5FFEF438, 0xFC3135FF, 0x5FFEFE38, 0xFFFFFFFF, 0xC8C8AAFF, 0x00000000, 0x00000000, 0x00000000, 0x8024B400, 0x31100810, 0x08100810, 0x08000000, 0x00000000, 0xFC317FFF, 0x5FFEF438, 0xFC3135FF, 0x5FFEFE38, 0x585C44FF, 0x988F82FF, 0x00000000, 0x00000000, 0x00000000, 0x8024B400, 0x31100810, 0x08100810, 0x08000000, 0x00000000, 0xFC317FFF, 0x5FFEF438, 0xFC3135FF, 0x5FFEFE38, 0xFFEE6AFF, 0x92641AFF, 0x00000000, 0x00000000, 0x00000000, 0x8024A400, 0x03101010, 0x10101010, 0x10000000, 0x00000000, 0xFCFFFFFF, 0xFFFD7438, 0xFCFFB5FF, 0xFFFD7E38, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024A400, 0x03101010, 0x10101010, 0x10000000, 0x00000000, 0xFCFFFFFF, 0xFFFD7438, 0xFCFFB5FF, 0xFFFD7E38, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024A400, 0x03101010, 0x10101010, 0x10000000, 0x00000000, 0xFCFFFFFF, 0xFFFD7438, 0xFCFFB5FF, 0xFFFD7E38, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024B400, 0x31100810, 0x08100810, 0x08000000, 0x00000000, 0xFC317FFF, 0x5FFEF438, 0xFC3135FF, 0x5FFEFE38, 0xFFFFFFFF, 0xC8C8AAFF, 0x00000000, 0x00000000 -glabel D_8024BF70 -.word 0x80244C74, 0x80244C80, 0x80244CA4, 0x80244C8C, 0x80244C98, 0x00000000 +glabel jtbl_8024BF70_16C7D0 +.word L80244C74_1654D4, L80244C80_1654E0, L80244CA4_165504, L80244C8C_1654EC, L80244C98_1654F8, 0 -glabel D_8024BF88 -.word 0x80245C10, 0x80245C38, 0x80245C38, 0x80245C38, 0x80245C38, 0x00000000 +glabel jtbl_8024BF88_16C7E8 +.word L80245C10_166470, L80245C38_166498, L80245C38_166498, L80245C38_166498, L80245C38_166498, 0 -glabel D_8024BFA0 -.word 0x80245DD0, 0x802461E8, 0x8024672C, 0x80246370, 0x80246420, 0x00000000 +glabel jtbl_8024BFA0_16C800 +.word L80245DD0_166630, L802461E8_166A48, L8024672C_166F8C, L80246370_166BD0, L80246420_166C80, 0 -glabel D_8024BFB8 -.word 0x80246920, 0x8024692C, 0x8024692C, 0x8024692C, 0x8024692C, 0x00000000 +glabel jtbl_8024BFB8_16C818 +.word L80246920_167180, L8024692C_16718C, L8024692C_16718C, L8024692C_16718C, L8024692C_16718C, 0 -glabel D_8024BFD0 -.word 0x80246960, 0x80246A04, 0x80246AFC, 0x80246A60, 0x80246ABC, 0x00000000 +glabel jtbl_8024BFD0_16C830 +.word L80246960_1671C0, L80246A04_167264, L80246AFC_16735C, L80246A60_1672C0, L80246ABC_16731C, 0 -glabel D_8024BFE8 -.word 0x80246D64, 0x80246D64, 0x80246D64, 0x80246D64, 0x80246D64, 0x00000000 +glabel jtbl_8024BFE8_16C848 +.word L80246D64_1675C4, L80246D64_1675C4, L80246D64_1675C4, L80246D64_1675C4, L80246D64_1675C4, 0 -glabel D_8024C000 -.word 0x80246E6C, 0x80246F9C, 0x80246FDC, 0x80246F00, 0x802470D4, 0x00000000 +glabel jtbl_8024C000_16C860 +.word L80246E6C_1676CC, L80246F9C_1677FC, L80246FDC_16783C, L80246F00_167760, L802470D4_167934, 0 -glabel D_8024C018 -.word 0x80247370, 0x80247664, 0x802477F8, 0x802474E4, 0x80247A3C, 0x00000000 +glabel jtbl_8024C018_16C878 +.word L80247370_167BD0, L80247664_167EC4, L802477F8_168058, L802474E4_167D44, L80247A3C_16829C, 0 -glabel D_8024C030 -.word 0x80247AC4, 0x80247AC4, 0x80247ADC, 0x80247AC4, 0x80247AF8, 0x00000000 +glabel jtbl_8024C030_16C890 +.word L80247AC4_168324, L80247AC4_168324, L80247ADC_16833C, L80247AC4_168324, L80247AF8_168358, 0 -glabel D_8024C048 -.word 0x80247C08, 0x80247C08, 0x80247C20, 0x80247C08, 0x80247C3C, 0x00000000 +glabel pause_partners_draw_movelist_title +.word L80247C08_168468, L80247C08_168468, L80247C20_168480, L80247C08_168468, L80247C3C_16849C, 0 -glabel D_8024C060 -.word 0x80248E34, 0x80248E64, 0x80248E90, 0x80249034, 0x80248ED4, 0x00000000, 0x00000000, 0x00000000 +glabel jtbl_8024C060_16C8C0 +.word L80248E34_169694, L80248E64_1696C4, L80248E90_1696F0, L80249034_169894, L80248ED4_169734, 0, 0, 0 diff --git a/asm/data/code_1AF2D0.data.s b/asm/data/code_1AF2D0.data.s index 9a3fbf91cf..94306090ec 100644 --- a/asm/data/code_1AF2D0.data.s +++ b/asm/data/code_1AF2D0.data.s @@ -413,44 +413,44 @@ glabel D_802946E0 glabel D_8029C7D0 .word 0x00789E60, 0x0078B600, 0x802A1000, 0x802A24E8, 0x0078B600, 0x0078D150, 0x802A1000, 0x802A2928, 0x0078D150, 0x0078E7D0, 0x802A1000, 0x802A24D8, 0x0078E7D0, 0x007900D0, 0x802A1000, 0x802A25A8, 0x007900D0, 0x00791D90, 0x802A1000, 0x802A27A8, 0x00791D90, 0x00793D20, 0x802A1000, 0x802A2510, 0x00793D20, 0x007952E0, 0x802A1000, 0x802A23D8, 0x007952E0, 0x00796FC0, 0x802A1000, 0x802A2588, 0x00796FC0, 0x007997B0, 0x802A1000, 0x802A35B4, 0x007997B0, 0x0079BFA0, 0x802A1000, 0x802A35B4, 0x0079BFA0, 0x0079D8A0, 0x802A1000, 0x802A23E8, 0x0079D8A0, 0x0079EF40, 0x802A1000, 0x802A2468, 0x0001001F, 0x0001002C, 0x0001002A, 0x00010005, 0x00000000, 0x00090003, 0x00090013, 0x00090013, 0x00090003, 0x00090001, 0x000A0006, 0x000A001B, 0x000A001B, 0x000A0006, 0x000A0004, 0x000B0008, 0x000B001D, 0x000B001D, 0x000B0008, 0x000B0004, 0x000C0003, 0x000C0018, 0x000C0018, 0x000C0003, 0x000C0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000E0003, 0x000E000A, 0x000E000A, 0x000E0003, 0x000C0001, 0x000F0003, 0x000F0013, 0x000F0013, 0x000F0003, 0x000F0001, 0x00100003, 0x00100009, 0x00100009, 0x00100003, 0x00100001, 0x000D0003, 0x000D0013, 0x000D0013, 0x000D0003, 0x000D0001, 0x00000000, 0x00000000 -glabel D_8029C960 -.word 0x8023EA64, 0x8023EA64, 0x8023E5CC, 0x8023E6BC, 0x8023E6FC, 0x8023E7AC, 0x8023E60C, 0x8023E61C, 0x8023E5DC, 0x8023E5EC, 0x8023E5FC, 0x8023E62C, 0x8023E63C, 0x8023E64C, 0x8023E65C, 0x8023E66C, 0x8023E68C, 0x8023E67C, 0x8023E69C, 0x8023E6AC, 0x8023E71C, 0x8023E70C, 0x8023E6EC, 0x8023E6CC, 0x8023E6DC, 0x8023E75C, 0x8023E76C, 0x8023E72C, 0x8023E77C, 0x8023E78C, 0x8023E74C, 0x8023E79C, 0x8023E7E4, 0x8023E73C, 0x8023E7CC, 0x8023E7BC, 0x8023E7DC, 0x00000000 +glabel jtbl_8029C960_1CB240 +.word L8023EA64_16D344, L8023EA64_16D344, L8023E5CC_16CEAC, L8023E6BC_16CF9C, L8023E6FC_16CFDC, L8023E7AC_16D08C, L8023E60C_16CEEC, L8023E61C_16CEFC, L8023E5DC_16CEBC, L8023E5EC_16CECC, L8023E5FC_16CEDC, L8023E62C_16CF0C, L8023E63C_16CF1C, L8023E64C_16CF2C, L8023E65C_16CF3C, L8023E66C_16CF4C, L8023E68C_16CF6C, L8023E67C_16CF5C, L8023E69C_16CF7C, L8023E6AC_16CF8C, L8023E71C_16CFFC, L8023E70C_16CFEC, L8023E6EC_16CFCC, L8023E6CC_16CFAC, L8023E6DC_16CFBC, L8023E75C_16D03C, L8023E76C_16D04C, L8023E72C_16D00C, L8023E77C_16D05C, L8023E78C_16D06C, L8023E74C_16D02C, L8023E79C_16D07C, L8023E7E4_16D0C4, L8023E73C_16D01C, L8023E7CC_16D0AC, L8023E7BC_16D09C, L8023E7DC_16D0BC, 0 -glabel D_8029C9F8 -.word 0x8023EB20, 0x8023EC10, 0x8023EC40, 0x8023ED00, 0x8023EB60, 0x8023EB70, 0x8023EB30, 0x8023EB40, 0x8023EB50, 0x8023EB80, 0x8023EB90, 0x8023EBA0, 0x8023EBB0, 0x8023EBC0, 0x8023EBE0, 0x8023EBD0, 0x8023EBF0, 0x8023EC00, 0x8023EC70, 0x8023EC60, 0x8023EC50, 0x8023EC20, 0x8023EC30, 0x8023ECB0, 0x8023ECC0, 0x8023EC80, 0x8023ECD0, 0x8023ECE0, 0x8023ECA0, 0x8023ECF0, 0x8023ED38, 0x8023EC90, 0x8023ED20, 0x8023ED10, 0x8023ED30, 0x00000000 +glabel jtbl_8029C9F8_1CB2D8 +.word L8023EB20_16D400, L8023EC10_16D4F0, L8023EC40_16D520, L8023ED00_16D5E0, L8023EB60_16D440, L8023EB70_16D450, L8023EB30_16D410, L8023EB40_16D420, L8023EB50_16D430, L8023EB80_16D460, L8023EB90_16D470, L8023EBA0_16D480, L8023EBB0_16D490, L8023EBC0_16D4A0, L8023EBE0_16D4C0, L8023EBD0_16D4B0, L8023EBF0_16D4D0, L8023EC00_16D4E0, L8023EC70_16D550, L8023EC60_16D540, L8023EC50_16D530, L8023EC20_16D500, L8023EC30_16D510, L8023ECB0_16D590, L8023ECC0_16D5A0, L8023EC80_16D560, L8023ECD0_16D5B0, L8023ECE0_16D5C0, L8023ECA0_16D580, L8023ECF0_16D5D0, L8023ED38_16D618, L8023EC90_16D570, L8023ED20_16D600, L8023ED10_16D5F0, L8023ED30_16D610, 0 -glabel D_8029CA88 -.word 0x802412B4, 0x80241590, 0x80241A88, 0x80241A88, 0x802417DC, 0x80241A88, 0x80241A88, 0x802419CC, 0x80241A64 +glabel jtbl_8029CA88_1CB368 +.word L802412B4_16FB94, L80241590_16FE70, L80241A88_170368, L80241A88_170368, L802417DC_1700BC, L80241A88_170368, L80241A88_170368, L802419CC_1702AC, L80241A64_170344 glabel D_8029CAAC .word 0x67765F30, 0x31000000, 0x00000000 -glabel D_8029CAB8 -.word 0x80244AA8, 0x80244B40, 0x80244B88, 0x80244C0C, 0x80244C28, 0x00000000 +glabel jtbl_8029CAB8_1CB398 +.word L80244AA8_173388, L80244B40_173420, L80244B88_173468, L80244C0C_1734EC, L80244C28_173508, 0 -glabel D_8029CAD0 -.word 0x8024574C, 0x80245AAC, 0x80245828, 0x8024589C, 0x80245938, 0x80245994, 0x80245A00, 0x80245A44 +glabel jtbl_8029CAD0_1CB3B0 +.word L8024574C_17402C, L80245AAC_17438C, L80245828_174108, L8024589C_17417C, L80245938_174218, L80245994_174274, L80245A00_1742E0, L80245A44_174324 -glabel D_8029CAF0 -.word 0x80246194, 0x802461BC, 0x8024619C, 0x802461A4, 0x802461CC, 0x802461AC, 0x802461B4, 0x802461C4 +glabel jtbl_8029CAF0_1CB3D0 +.word L80246194_174A74, L802461BC_174A9C, L8024619C_174A7C, L802461A4_174A84, L802461CC_174AAC, L802461AC_174A8C, L802461B4_174A94, L802461C4_174AA4 -glabel D_8029CB10 -.word 0x80246310, 0x80246338, 0x80246318, 0x80246320, 0x80246348, 0x80246328, 0x80246330, 0x80246340 +glabel jtbl_8029CB10_1CB3F0 +.word L80246310_174BF0, L80246338_174C18, L80246318_174BF8, L80246320_174C00, L80246348_174C28, L80246328_174C08, L80246330_174C10, L80246340_174C20 -glabel D_8029CB30 -.word 0x80246B8C, 0x80246FFC, 0x80246C5C, 0x80246CFC, 0x80246FFC, 0x80246FFC, 0x80246FFC, 0x80246FFC, 0x80246FFC, 0x80246FFC, 0x80246FFC, 0x80246FA0, 0x80246FD4, 0x00000000 +glabel jtbl_8029CB30_1CB410 +.word L80246B8C_17546C, L80246FFC_1758DC, L80246C5C_17553C, L80246CFC_1755DC, L80246FFC_1758DC, L80246FFC_1758DC, L80246FFC_1758DC, L80246FFC_1758DC, L80246FFC_1758DC, L80246FFC_1758DC, L80246FFC_1758DC, L80246FA0_175880, L80246FD4_1758B4, 0 -glabel D_8029CB68 -.word 0x802470BC, 0x802470E4, 0x802470C4, 0x802470CC, 0x802470F4, 0x802470D4, 0x802470DC, 0x802470EC +glabel jtbl_8029CB68_1CB448 +.word L802470BC_17599C, L802470E4_1759C4, L802470C4_1759A4, L802470CC_1759AC, L802470F4_1759D4, L802470D4_1759B4, L802470DC_1759BC, L802470EC_1759CC -glabel D_8029CB88 -.word 0x802475CC, 0x802475CC, 0x80247720, 0x802479CC, 0x802479CC, 0x802479CC, 0x802479CC, 0x802479CC, 0x802479CC, 0x802479CC, 0x802479CC, 0x80247970, 0x802479A4, 0x00000000 +glabel jtbl_8029CB88_1CB468 +.word L802475CC_175EAC, L802475CC_175EAC, L80247720_176000, L802479CC_1762AC, L802479CC_1762AC, L802479CC_1762AC, L802479CC_1762AC, L802479CC_1762AC, L802479CC_1762AC, L802479CC_1762AC, L802479CC_1762AC, L80247970_176250, L802479A4_176284, 0 -glabel D_8029CBC0 -.word 0x8024791C, 0x80247944, 0x80247924, 0x8024792C, 0x8024794C, 0x80247934, 0x8024793C, 0x00000000 +glabel jtbl_8029CBC0_1CB4A0 +.word L8024791C_1761FC, L80247944_176224, L80247924_176204, L8024792C_17620C, L8024794C_17622C, L80247934_176214, L8024793C_17621C, 0 -glabel D_8029CBE0 -.word 0x80248B54, 0x80248BA4, 0x80248C0C, 0x80248C90, 0x80248CAC, 0x00000000, 0x00000000, 0x00000000 +glabel jtbl_8029CBE0_1CB4C0 +.word L80248B54_177434, L80248BA4_177484, L80248C0C_1774EC, L80248C90_177570, L80248CAC_17758C, 0, 0, 0 glabel D_8029CC00 .double 0.4 @@ -479,44 +479,44 @@ glabel D_8029CC38 glabel D_8029CC40 .double 0.01 -glabel D_8029CC48 -.word 0x8024CFB0, 0x8024CFBC, 0x8024CFC8, 0x8024CFFC, 0x8024D024, 0x8024D04C, 0x8024D074, 0x8024D09C, 0x8024D0C4, 0x8024D0EC, 0x8024D120, 0x8024D154, 0x8024D17C, 0x8024D1B0, 0x8024D1E4, 0x8024D20C, 0x8024D240, 0x8024D288, 0x8024D2CC, 0x8024D2FC, 0x8024D314, 0x8024D324, 0x8024D4A0, 0x8024D424, 0x8024D3B4, 0x8024D348, 0x8024D4EC, 0x8024D548, 0x8024D5A0, 0x8024DE00, 0x8024D5E4, 0x8024D5E4, 0x8024D654, 0x8024D6A0, 0x8024D6D4, 0x8024D740, 0x8024D7FC, 0x8024D7A0, 0x8024D85C, 0x8024D8B8, 0x8024D910, 0x8024D97C, 0x8024D97C, 0x8024D9BC, 0x8024DA18, 0x8024DA80, 0x8024DAE0, 0x8024DC9C, 0x8024DCF0, 0x8024DD4C, 0x8024DDA8, 0x8024DE00, 0x8024DE30, 0x8024DE8C, 0x8024DEEC, 0x8024DF5C, 0x8024DF94, 0x8024DFE8, 0x8024E04C, 0x8024E0CC, 0x8024E144, 0x8024E1A4, 0x8024E1A4, 0x8024E218, 0x8024E24C, 0x8024E274, 0x8024E29C, 0x8024E2F8, 0x8024E320, 0x8024DBEC, 0x8024DB48, 0x8024DBA0, 0x8024DBEC, 0x8024DC58 +glabel jtbl_8029CC48_1CB528 +.word L8024CFB0_17B890, L8024CFBC_17B89C, L8024CFC8_17B8A8, L8024CFFC_17B8DC, L8024D024_17B904, L8024D04C_17B92C, L8024D074_17B954, L8024D09C_17B97C, L8024D0C4_17B9A4, L8024D0EC_17B9CC, L8024D120_17BA00, L8024D154_17BA34, L8024D17C_17BA5C, L8024D1B0_17BA90, L8024D1E4_17BAC4, L8024D20C_17BAEC, L8024D240_17BB20, L8024D288_17BB68, L8024D2CC_17BBAC, L8024D2FC_17BBDC, L8024D314_17BBF4, L8024D324_17BC04, L8024D4A0_17BD80, L8024D424_17BD04, L8024D3B4_17BC94, L8024D348_17BC28, L8024D4EC_17BDCC, L8024D548_17BE28, L8024D5A0_17BE80, L8024DE00_17C6E0, L8024D5E4_17BEC4, L8024D5E4_17BEC4, L8024D654_17BF34, L8024D6A0_17BF80, L8024D6D4_17BFB4, L8024D740_17C020, L8024D7FC_17C0DC, L8024D7A0_17C080, L8024D85C_17C13C, L8024D8B8_17C198, L8024D910_17C1F0, L8024D97C_17C25C, L8024D97C_17C25C, L8024D9BC_17C29C, L8024DA18_17C2F8, L8024DA80_17C360, L8024DAE0_17C3C0, L8024DC9C_17C57C, L8024DCF0_17C5D0, L8024DD4C_17C62C, L8024DDA8_17C688, L8024DE00_17C6E0, L8024DE30_17C710, L8024DE8C_17C76C, L8024DEEC_17C7CC, L8024DF5C_17C83C, L8024DF94_17C874, L8024DFE8_17C8C8, L8024E04C_17C92C, L8024E0CC_17C9AC, L8024E144_17CA24, L8024E1A4_17CA84, L8024E1A4_17CA84, L8024E218_17CAF8, L8024E24C_17CB2C, L8024E274_17CB54, L8024E29C_17CB7C, L8024E2F8_17CBD8, L8024E320_17CC00, L8024DBEC_17C4CC, L8024DB48_17C428, L8024DBA0_17C480, L8024DBEC_17C4CC, L8024DC58_17C538 -glabel D_8029CD70 -.word 0x8024E7C4, 0x8024E7CC, 0x8024E7D4, 0x8024E7DC, 0x8024E7E4, 0x8024E7EC, 0x8024E7F8, 0x8024E800 +glabel jtbl_8029CD70_1CB650 +.word L8024E7C4_17D0A4, L8024E7CC_17D0AC, L8024E7D4_17D0B4, L8024E7DC_17D0BC, L8024E7E4_17D0C4, L8024E7EC_17D0CC, L8024E7F8_17D0D8, L8024E800_17D0E0 glabel D_8029CD90 .double 0.8 -glabel D_8029CD98 -.word 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FBC0, 0x8024FBC0, 0x8024FBC0, 0x8024FBC0, 0x8024FBC0, 0x8024FBC0, 0x8024FBC0, 0x8024FBC0, 0x8024FBC0, 0x8024FBC0, 0x8024FBC0, 0x8024FBC0, 0x8024FBC0, 0x8024FBC0, 0x8024FBC0, 0x8024FBC0, 0x8024FBC0, 0x8024FBC0, 0x8024FBC0, 0x8024FBC0, 0x8024FBC0, 0x80250654, 0x80250654, 0x80250654, 0x80250654, 0x80250654, 0x80250654, 0x802506BC, 0x802506BC, 0x802506BC, 0x802506BC, 0x802506BC, 0x802506BC, 0x802506BC, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x8024FB84, 0x00000000 +glabel jtbl_8029CD98_1CB678 +.word L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FBC0_17E4A0, L8024FBC0_17E4A0, L8024FBC0_17E4A0, L8024FBC0_17E4A0, L8024FBC0_17E4A0, L8024FBC0_17E4A0, L8024FBC0_17E4A0, L8024FBC0_17E4A0, L8024FBC0_17E4A0, L8024FBC0_17E4A0, L8024FBC0_17E4A0, L8024FBC0_17E4A0, L8024FBC0_17E4A0, L8024FBC0_17E4A0, L8024FBC0_17E4A0, L8024FBC0_17E4A0, L8024FBC0_17E4A0, L8024FBC0_17E4A0, L8024FBC0_17E4A0, L8024FBC0_17E4A0, L8024FBC0_17E4A0, L80250654_17EF34, L80250654_17EF34, L80250654_17EF34, L80250654_17EF34, L80250654_17EF34, L80250654_17EF34, L802506BC_17EF9C, L802506BC_17EF9C, L802506BC_17EF9C, L802506BC_17EF9C, L802506BC_17EF9C, L802506BC_17EF9C, L802506BC_17EF9C, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, L8024FB84_17E464, 0 -glabel D_8029CEF0 -.word 0x802507A8, 0x80250678, 0x8024FBA8, 0x802506B0, 0x8024FBDC, 0x00000000 +glabel jtbl_8029CEF0_1CB7D0 +.word L802507A8_17F088, L80250678_17EF58, L8024FBA8_17E488, L802506B0_17EF90, L8024FBDC_17E4BC, 0 -glabel D_8029CF08 -.word 0x80250178, 0x8024FC78, 0x80250178, 0x80250178, 0x8024FC68, 0x8024FCDC, 0x8024FD40, 0x8024FE1C, 0x8024FE2C, 0x8024FECC, 0x8024FEDC, 0x8024FF40, 0x8024FFA0, 0x80250178, 0x80250178, 0x80250004, 0x80250068, 0x80250178, 0x8025013C, 0x8025013C, 0x80250178, 0x00000000 +glabel jtbl_8029CF08_1CB7E8 +.word L80250178_17EA58, L8024FC78_17E558, L80250178_17EA58, L80250178_17EA58, L8024FC68_17E548, L8024FCDC_17E5BC, L8024FD40_17E620, L8024FE1C_17E6FC, L8024FE2C_17E70C, L8024FECC_17E7AC, L8024FEDC_17E7BC, L8024FF40_17E820, L8024FFA0_17E880, L80250178_17EA58, L80250178_17EA58, L80250004_17E8E4, L80250068_17E948, L80250178_17EA58, L8025013C_17EA1C, L8025013C_17EA1C, L80250178_17EA58, 0 -glabel D_8029CF60 -.word 0x802504A4, 0x80250254, 0x802504A4, 0x80250224, 0x8025023C, 0x80250284, 0x802502B4, 0x80250314, 0x8025032C, 0x80250374, 0x8025038C, 0x802503BC, 0x802503EC, 0x8025041C, 0x802504A4, 0x80250434, 0x8025045C, 0x80250474, 0x8025048C, 0x8025048C, 0x802504A4, 0x00000000 +glabel jtbl_8029CF60_1CB840 +.word L802504A4_17ED84, L80250254_17EB34, L802504A4_17ED84, L80250224_17EB04, L8025023C_17EB1C, L80250284_17EB64, L802502B4_17EB94, L80250314_17EBF4, L8025032C_17EC0C, L80250374_17EC54, L8025038C_17EC6C, L802503BC_17EC9C, L802503EC_17ECCC, L8025041C_17ECFC, L802504A4_17ED84, L80250434_17ED14, L8025045C_17ED3C, L80250474_17ED54, L8025048C_17ED6C, L8025048C_17ED6C, L802504A4_17ED84, 0 -glabel D_8029CFB8 -.word 0x802505A4, 0x802505B4, 0x802505A4, 0x802505A4, 0x802505A4, 0x802505B4, 0x80250604, 0x802505A4, 0x802505D4, 0x802505A4, 0x802505B4, 0x802505B4, 0x802505B4, 0x802505A4, 0x802505A4, 0x802505B4, 0x802505D4, 0x802505A4, 0x802505A4, 0x802505A4, 0x802505A4, 0x00000000 +glabel jtbl_8029CFB8_1CB898 +.word L802505A4_17EE84, L802505B4_17EE94, L802505A4_17EE84, L802505A4_17EE84, L802505A4_17EE84, L802505B4_17EE94, L80250604_17EEE4, L802505A4_17EE84, L802505D4_17EEB4, L802505A4_17EE84, L802505B4_17EE94, L802505B4_17EE94, L802505B4_17EE94, L802505A4_17EE84, L802505A4_17EE84, L802505B4_17EE94, L802505D4_17EEB4, L802505A4_17EE84, L802505A4_17EE84, L802505A4_17EE84, L802505A4_17EE84, 0 -glabel D_8029D010 -.word 0x802507A8, 0x80250678, 0x80250684, 0x802506B0, 0x8024FBDC, 0x00000000 +glabel jtbl_8029D010_1CB8F0 +.word L802507A8_17F088, L80250678_17EF58, L80250684_17EF64, L802506B0_17EF90, L8024FBDC_17E4BC, 0 -glabel D_8029D028 -.word 0x80250708, 0x80250718, 0x80250728, 0x80250738, 0x80250748, 0x80250758, 0x80250768, 0x00000000 +glabel jtbl_8029D028_1CB908 +.word L80250708_17EFE8, L80250718_17EFF8, L80250728_17F008, L80250738_17F018, L80250748_17F028, L80250758_17F038, L80250768_17F048, 0 -glabel D_8029D048 -.word 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x802508C0, 0x802508C0, 0x802508C0, 0x802508C0, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x802508C0, 0x802508C0, 0x802508C0, 0x802508C0, 0x802508C0, 0x802508C0, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x802509DC, 0x802509DC, 0x802509DC, 0x802509DC, 0x802509DC, 0x802509DC, 0x802509DC, 0x802509DC, 0x802509DC, 0x802509DC, 0x802509DC, 0x802509DC, 0x802509DC, 0x802509DC, 0x802509DC, 0x802509DC, 0x802509DC, 0x802509DC, 0x802509DC, 0x802509DC, 0x802509DC, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250868, 0x80250988, 0x80250988, 0x80250988, 0x80250988, 0x80250988, 0x80250988, 0x80250988, 0x80250868, 0x8025090C, 0x80250868, 0x80250868, 0x80250868, 0x00000000 +glabel jtbl_8029D048_1CB928 +.word L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L802508C0_17F1A0, L802508C0_17F1A0, L802508C0_17F1A0, L802508C0_17F1A0, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L802508C0_17F1A0, L802508C0_17F1A0, L802508C0_17F1A0, L802508C0_17F1A0, L802508C0_17F1A0, L802508C0_17F1A0, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L802509DC_17F2BC, L802509DC_17F2BC, L802509DC_17F2BC, L802509DC_17F2BC, L802509DC_17F2BC, L802509DC_17F2BC, L802509DC_17F2BC, L802509DC_17F2BC, L802509DC_17F2BC, L802509DC_17F2BC, L802509DC_17F2BC, L802509DC_17F2BC, L802509DC_17F2BC, L802509DC_17F2BC, L802509DC_17F2BC, L802509DC_17F2BC, L802509DC_17F2BC, L802509DC_17F2BC, L802509DC_17F2BC, L802509DC_17F2BC, L802509DC_17F2BC, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250868_17F148, L80250988_17F268, L80250988_17F268, L80250988_17F268, L80250988_17F268, L80250988_17F268, L80250988_17F268, L80250988_17F268, L80250868_17F148, L8025090C_17F1EC, L80250868_17F148, L80250868_17F148, L80250868_17F148, 0 -glabel D_8029D1A0 -.word 0x80250A88, 0x80250AA0, 0x80250B00, 0x80250B18, 0x80250B30, 0x80250B58, 0x80250E80, 0x80250E80, 0x80250BB0, 0x80250E80, 0x80250C54, 0x80250E80, 0x80250C9C, 0x80250E80, 0x80250D00, 0x80250D18, 0x80250D60, 0x80250E80, 0x80250E3C, 0x80250E3C +glabel jtbl_8029D1A0_1CBA80 +.word L80250A88_17F368, L80250AA0_17F380, L80250B00_17F3E0, L80250B18_17F3F8, L80250B30_17F410, L80250B58_17F438, L80250E80_17F760, L80250E80_17F760, L80250BB0_17F490, L80250E80_17F760, L80250C54_17F534, L80250E80_17F760, L80250C9C_17F57C, L80250E80_17F760, L80250D00_17F5E0, L80250D18_17F5F8, L80250D60_17F640, L80250E80_17F760, L80250E3C_17F71C, L80250E3C_17F71C -glabel D_8029D1F0 -.word 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80251010, 0x80251010, 0x80251010, 0x80251010, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80251010, 0x80251010, 0x80251010, 0x80251010, 0x80251010, 0x80251010, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80251190, 0x80251190, 0x80251190, 0x80251190, 0x80251190, 0x80251190, 0x80251190, 0x80251190, 0x80251190, 0x80251190, 0x80251190, 0x80251190, 0x80251190, 0x80251190, 0x80251190, 0x80251190, 0x80251190, 0x80251190, 0x80251190, 0x80251190, 0x80251190, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x80250F90, 0x80250F90, 0x80250F90, 0x80250F90, 0x80250F90, 0x80250F90, 0x80250F90, 0x80250EEC, 0x802510C8, 0x80250EEC, 0x80250EEC, 0x80250EEC, 0x00000000, 0x00000000, 0x00000000 +glabel jtbl_8029D1F0_1CBAD0 +.word L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80251010_17F8F0, L80251010_17F8F0, L80251010_17F8F0, L80251010_17F8F0, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80251010_17F8F0, L80251010_17F8F0, L80251010_17F8F0, L80251010_17F8F0, L80251010_17F8F0, L80251010_17F8F0, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80251190_17FA70, L80251190_17FA70, L80251190_17FA70, L80251190_17FA70, L80251190_17FA70, L80251190_17FA70, L80251190_17FA70, L80251190_17FA70, L80251190_17FA70, L80251190_17FA70, L80251190_17FA70, L80251190_17FA70, L80251190_17FA70, L80251190_17FA70, L80251190_17FA70, L80251190_17FA70, L80251190_17FA70, L80251190_17FA70, L80251190_17FA70, L80251190_17FA70, L80251190_17FA70, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250F90_17F870, L80250F90_17F870, L80250F90_17F870, L80250F90_17F870, L80250F90_17F870, L80250F90_17F870, L80250F90_17F870, L80250EEC_17F7CC, L802510C8_17F9A8, L80250EEC_17F7CC, L80250EEC_17F7CC, L80250EEC_17F7CC, 0, 0, 0 glabel D_8029D350 .double 0.7142857142857143 @@ -548,8 +548,8 @@ glabel D_8029D390 glabel D_8029D398 .double 0.7142857142857143 -glabel D_8029D3A0 -.word 0x80259300, 0x80259484, 0x80259484, 0x8025931C, 0x80259338, 0x80259354, 0x80259370, 0x8025938C, 0x802593A8, 0x802593C4, 0x802593E0, 0x80259484, 0x802593FC, 0x8025941C, 0x80259440, 0x80259450, 0x80259470, 0x00000000 +glabel jtbl_8029D3A0_1CBC80 +.word L80259300_187BE0, L80259484_187D64, L80259484_187D64, L8025931C_187BFC, L80259338_187C18, L80259354_187C34, L80259370_187C50, L8025938C_187C6C, L802593A8_187C88, L802593C4_187CA4, L802593E0_187CC0, L80259484_187D64, L802593FC_187CDC, L8025941C_187CFC, L80259440_187D20, L80259450_187D30, L80259470_187D50, 0 glabel D_8029D3E8 .double 0.2 @@ -572,26 +572,26 @@ glabel D_8029D410 glabel D_8029D418 .double 0.1 -glabel D_8029D420 -.word 0x8025CE90, 0x8025CE84, 0x8025CE84, 0x8025CE7C, 0x8025CE7C, 0x8025CE84, 0x8025CE84, 0x8025CE7C, 0x8025CE7C, 0x00000000 +glabel jtbl_8029D420_1CBD00 +.word L8025CE90_18B770, L8025CE84_18B764, L8025CE84_18B764, L8025CE7C_18B75C, L8025CE7C_18B75C, L8025CE84_18B764, L8025CE84_18B764, L8025CE7C_18B75C, L8025CE7C_18B75C, 0 -glabel D_8029D448 -.word 0x8025CE90, 0x8025CE7C, 0x8025CE7C, 0x8025CE84, 0x8025CE84, 0x8025CE7C, 0x8025CE7C, 0x8025CE84, 0x8025CE84, 0x8025CE7C, 0x8025CE7C, 0x8025CE84, 0x8025CE84, 0x8025CE7C, 0x8025CE7C, 0x00000000 +glabel jtbl_8029D448_1CBD28 +.word L8025CE90_18B770, L8025CE7C_18B75C, L8025CE7C_18B75C, L8025CE84_18B764, L8025CE84_18B764, L8025CE7C_18B75C, L8025CE7C_18B75C, L8025CE84_18B764, L8025CE84_18B764, L8025CE7C_18B75C, L8025CE7C_18B75C, L8025CE84_18B764, L8025CE84_18B764, L8025CE7C_18B75C, L8025CE7C_18B75C, 0 glabel D_8029D488 .word 0x8025CF28, 0x8025CF3C, 0x8025CF50, 0x8025CF64, 0x8025CF78, 0x8025CF8C, 0x8025CFA0, 0x8025CFB4, 0x8025CFC8, 0x8025CFDC, 0x8025CFF0, 0x8025D004 -glabel D_8029D4B8 -.word 0x8025D07C, 0x8025D08C, 0x8025D09C, 0x8025D0AC, 0x8025D0BC, 0x8025D0CC, 0x8025D0DC, 0x8025D0EC, 0x8025D0FC, 0x8025D10C, 0x8025D11C, 0x8025D12C +glabel jtbl_8029D4B8_1CBD98 +.word L8025D07C_18B95C, L8025D08C_18B96C, L8025D09C_18B97C, L8025D0AC_18B98C, L8025D0BC_18B99C, L8025D0CC_18B9AC, L8025D0DC_18B9BC, L8025D0EC_18B9CC, L8025D0FC_18B9DC, L8025D10C_18B9EC, L8025D11C_18B9FC, L8025D12C_18BA0C glabel D_8029D4E8 .double 0.7999999999999999 -glabel D_8029D4F0 -.word 0x8025E1FC, 0x8025E2EC, 0x8025E3C8, 0x8025E594, 0x8025E5C0, 0x8025E62C, 0x8025E6A0, 0x8025F5F4, 0x8025F824, 0x8025F924, 0x8025FADC, 0x8025FC04, 0x8025FF48, 0x8025FF48, 0x8025FF48, 0x8025FCA4, 0x8025FD2C, 0x8025FF48, 0x8025FF48, 0x8025FF48, 0x8025FD7C, 0x8025FE58, 0x8025FEFC, 0x00000000 +glabel jtbl_8029D4F0_1CBDD0 +.word L8025E1FC_18CADC, L8025E2EC_18CBCC, L8025E3C8_18CCA8, L8025E594_18CE74, L8025E5C0_18CEA0, L8025E62C_18CF0C, L8025E6A0_18CF80, L8025F5F4_18DED4, L8025F824_18E104, L8025F924_18E204, L8025FADC_18E3BC, L8025FC04_18E4E4, L8025FF48_18E828, L8025FF48_18E828, L8025FF48_18E828, L8025FCA4_18E584, L8025FD2C_18E60C, L8025FF48_18E828, L8025FF48_18E828, L8025FF48_18E828, L8025FD7C_18E65C, L8025FE58_18E738, L8025FEFC_18E7DC, 0 -glabel D_8029D550 -.word 0x80260208, 0x80260300, 0x80260774, 0x80260774, 0x80260800, 0x80260838, 0x80260838, 0x80260838, 0x80260300, 0x80260300, 0x80260838, 0x80260838, 0x80260838, 0x80260838, 0x80260810, 0x00000000 +glabel jtbl_8029D550_1CBE30 +.word L80260208_18EAE8, L80260300_18EBE0, L80260774_18F054, L80260774_18F054, L80260800_18F0E0, L80260838_18F118, L80260838_18F118, L80260838_18F118, L80260300_18EBE0, L80260300_18EBE0, L80260838_18F118, L80260838_18F118, L80260838_18F118, L80260838_18F118, L80260810_18F0F0, 0 glabel D_8029D590 .double 0.35 @@ -623,56 +623,56 @@ glabel D_8029D5D0 glabel D_8029D5D8 .double 0.8 -glabel D_8029D5E0 -.word 0x80266238, 0x80266238, 0x80266238, 0x80265F80, 0x80265F80, 0x80265F80, 0x80265F80, 0x80265F80, 0x80265F80, 0x80265F80, 0x80265F80, 0x80266138, 0x8026618C, 0x802661C0, 0x802661F8, 0x00000000 +glabel jtbl_8029D5E0_1CBEC0 +.word L80266238_194B18, L80266238_194B18, L80266238_194B18, L80265F80_194860, L80265F80_194860, L80265F80_194860, L80265F80_194860, L80265F80_194860, L80265F80_194860, L80265F80_194860, L80265F80_194860, L80266138_194A18, L8026618C_194A6C, L802661C0_194AA0, L802661F8_194AD8, 0 -glabel D_8029D620 -.word 0x802660E4, 0x802660D0, 0x802660B0, 0x80266090, 0x8026602C, 0x80266238, 0x80266104, 0x80266124 +glabel jtbl_8029D620_1CBF00 +.word L802660E4_1949C4, L802660D0_1949B0, L802660B0_194990, L80266090_194970, L8026602C_19490C, L80266238_194B18, L80266104_1949E4, L80266124_194A04 -glabel D_8029D640 -.word 0x80266844, 0x80266854, 0x80266860, 0x8026686C, 0x80266878, 0x802668F8 +glabel jtbl_8029D640_1CBF20 +.word L80266844_195124, L80266854_195134, L80266860_195140, L8026686C_19514C, L80266878_195158, L802668F8_1951D8 -glabel D_8029D658 -.word 0x802668B0, 0x802668D8, 0x802668E0, 0x802668E8, 0x802668F0, 0x802668F8 +glabel jtbl_8029D658_1CBF38 +.word L802668B0_195190, L802668D8_1951B8, L802668E0_1951C0, L802668E8_1951C8, L802668F0_1951D0, L802668F8_1951D8 -glabel D_8029D670 -.word 0x80267EB8, 0x80267E38, 0x80267E48, 0x80267E58, 0x80267E68, 0x80267E78, 0x80267E88, 0x80267E98, 0x80267E98, 0x80267E98, 0x80267E98, 0x80267E98 +glabel jtbl_8029D670_1CBF50 +.word L80267EB8_196798, L80267E38_196718, L80267E48_196728, L80267E58_196738, L80267E68_196748, L80267E78_196758, L80267E88_196768, L80267E98_196778, L80267E98_196778, L80267E98_196778, L80267E98_196778, L80267E98_196778 -glabel D_8029D6A0 -.word 0x80268AEC, 0x80268984, 0x80268994, 0x802689A4, 0x802689B4, 0x802689C4, 0x802689D4, 0x802689E4, 0x802689F4, 0x80268A04, 0x80268A14, 0x80268A24, 0x80268A34, 0x80268A44, 0x80268A54, 0x80268A64, 0x80268A74, 0x80268A84, 0x80268A94, 0x80268AA4, 0x80268AB4, 0x80268AC4, 0x80268AD4, 0x80268AE4 +glabel jtbl_8029D6A0_1CBF80 +.word L80268AEC_1973CC, L80268984_197264, L80268994_197274, L802689A4_197284, L802689B4_197294, L802689C4_1972A4, L802689D4_1972B4, L802689E4_1972C4, L802689F4_1972D4, L80268A04_1972E4, L80268A14_1972F4, L80268A24_197304, L80268A34_197314, L80268A44_197324, L80268A54_197334, L80268A64_197344, L80268A74_197354, L80268A84_197364, L80268A94_197374, L80268AA4_197384, L80268AB4_197394, L80268AC4_1973A4, L80268AD4_1973B4, L80268AE4_1973C4 -glabel D_8029D700 -.word 0x80268C90, 0x80268B28, 0x80268B38, 0x80268B48, 0x80268B58, 0x80268B68, 0x80268B78, 0x80268B88, 0x80268B98, 0x80268BA8, 0x80268BB8, 0x80268BC8, 0x80268BD8, 0x80268BE8, 0x80268BF8, 0x80268C08, 0x80268C18, 0x80268C28, 0x80268C38, 0x80268C48, 0x80268C58, 0x80268C68, 0x80268C78, 0x80268C88 +glabel jtbl_8029D700_1CBFE0 +.word L80268C90_197570, L80268B28_197408, L80268B38_197418, L80268B48_197428, L80268B58_197438, L80268B68_197448, L80268B78_197458, L80268B88_197468, L80268B98_197478, L80268BA8_197488, L80268BB8_197498, L80268BC8_1974A8, L80268BD8_1974B8, L80268BE8_1974C8, L80268BF8_1974D8, L80268C08_1974E8, L80268C18_1974F8, L80268C28_197508, L80268C38_197518, L80268C48_197528, L80268C58_197538, L80268C68_197548, L80268C78_197558, L80268C88_197568 -glabel D_8029D760 -.word 0x80268E3C, 0x80268CD4, 0x80268CE4, 0x80268CF4, 0x80268D04, 0x80268D14, 0x80268D24, 0x80268D34, 0x80268D44, 0x80268D54, 0x80268D64, 0x80268D74, 0x80268D84, 0x80268D94, 0x80268DA4, 0x80268DB4, 0x80268DC4, 0x80268DD4, 0x80268DE4, 0x80268DF4, 0x80268E04, 0x80268E14, 0x80268E24, 0x80268E34 +glabel jtbl_8029D760_1CC040 +.word L80268E3C_19771C, L80268CD4_1975B4, L80268CE4_1975C4, L80268CF4_1975D4, L80268D04_1975E4, L80268D14_1975F4, L80268D24_197604, L80268D34_197614, L80268D44_197624, L80268D54_197634, L80268D64_197644, L80268D74_197654, L80268D84_197664, L80268D94_197674, L80268DA4_197684, L80268DB4_197694, L80268DC4_1976A4, L80268DD4_1976B4, L80268DE4_1976C4, L80268DF4_1976D4, L80268E04_1976E4, L80268E14_1976F4, L80268E24_197704, L80268E34_197714 -glabel D_8029D7C0 -.word 0x8026F7E4, 0x8026F7F0, 0x8026F7FC, 0x8026F804, 0x8026F80C, 0x8026F814 +glabel jtbl_8029D7C0_1CC0A0 +.word L8026F7E4_19E0C4, L8026F7F0_19E0D0, L8026F7FC_19E0DC, L8026F804_19E0E4, L8026F80C_19E0EC, L8026F814_19E0F4 -glabel D_8029D7D8 -.word 0x8026F8D4, 0x8026F914, 0x8026F954, 0x8026F978, 0x8026F99C, 0x8026F9C0 +glabel jtbl_8029D7D8_1CC0B8 +.word L8026F8D4_19E1B4, L8026F914_19E1F4, L8026F954_19E234, L8026F978_19E258, L8026F99C_19E27C, L8026F9C0_19E2A0 -glabel D_8029D7F0 -.word 0x8026FAC8, 0x8026FAD4, 0x8026FAE0, 0x8026FAE8, 0x8026FAF0, 0x8026FAF8 +glabel jtbl_8029D7F0_1CC0D0 +.word L8026FAC8_19E3A8, L8026FAD4_19E3B4, L8026FAE0_19E3C0, L8026FAE8_19E3C8, L8026FAF0_19E3D0, L8026FAF8_19E3D8 -glabel D_8029D808 -.word 0x8026FFDC, 0x80270028, 0x802700B8, 0x802700E0, 0x8027010C, 0x00000000 +glabel jtbl_8029D808_1CC0E8 +.word L8026FFDC_19E8BC, L80270028_19E908, L802700B8_19E998, L802700E0_19E9C0, L8027010C_19E9EC, 0 -glabel D_8029D820 -.word 0x8027047C, gItemMenuCurrentPage, 0x80270558, 0x80270580, 0x802705AC, 0x00000000 +glabel jtbl_8029D820_1CC100 +.word L8027047C_19ED5C, L802704C8_19EDA8, L80270558_19EE38, L80270580_19EE60, L802705AC_19EE8C, 0 -glabel D_8029D838 -.word 0x80270814, 0x80270860, 0x802708AC, 0x802708D4, 0x80270900, 0x00000000 +glabel jtbl_8029D838_1CC118 +.word L80270814_19F0F4, L80270860_19F140, L802708AC_19F18C, L802708D4_19F1B4, L80270900_19F1E0, 0 -glabel D_8029D850 -.word 0x80270B5C, 0x80270BA8, 0x80270BF4, 0x80270C1C, 0x80270C48, 0x00000000 +glabel jtbl_8029D850_1CC130 +.word L80270B5C_19F43C, L80270BA8_19F488, L80270BF4_19F4D4, L80270C1C_19F4FC, L80270C48_19F528, 0 -glabel D_8029D868 -.word 0x80270FB4, 0x8027100C, 0x80271078, 0x802710B0, 0x802710D4, 0x00000000 +glabel jtbl_8029D868_1CC148 +.word L80270FB4_19F894, L8027100C_19F8EC, L80271078_19F958, L802710B0_19F990, L802710D4_19F9B4, 0 -glabel D_8029D880 -.word 0x80271E4C, 0x80271E58, 0x80271E64, 0x80271E70, 0x80271E7C, 0x80271E88 +glabel jtbl_8029D880_1CC160 +.word L80271E4C_1A072C, L80271E58_1A0738, L80271E64_1A0744, L80271E70_1A0750, L80271E7C_1A075C, L80271E88_1A0768 glabel D_8029D898 .double 54.9 @@ -764,11 +764,11 @@ glabel D_8029D978 glabel D_8029D980 .double 0.53, 0.0 -glabel D_8029D990 -.word 0x80277044, 0x8027704C, 0x80277054, 0x80277090, 0x802770CC, 0x80277108 +glabel jtbl_8029D990_1CC270 +.word L80277044_1A5924, L8027704C_1A592C, L80277054_1A5934, L80277090_1A5970, L802770CC_1A59AC, L80277108_1A59E8 -glabel D_8029D9A8 -.word 0x8027B12C, 0x8027B158, 0x8027B16C, 0x8027B180, 0x8027B300, 0x8027B340, 0x8027B368, 0x8027B208, 0x8027B258, 0x8027B3F8, 0x8027B4B8, 0x8027B53C, 0x8027B58C, 0x00000000 +glabel jtbl_8029D9A8_1CC288 +.word L8027B12C_1A9A0C, L8027B158_1A9A38, L8027B16C_1A9A4C, L8027B180_1A9A60, L8027B300_1A9BE0, L8027B340_1A9C20, L8027B368_1A9C48, L8027B208_1A9AE8, L8027B258_1A9B38, L8027B3F8_1A9CD8, L8027B4B8_1A9D98, L8027B53C_1A9E1C, L8027B58C_1A9E6C, 0 glabel D_8029D9E0 .double 3.141592 diff --git a/asm/data/code_3195D0.data.s b/asm/data/code_3195D0.data.s new file mode 100644 index 0000000000..2e7358af95 --- /dev/null +++ b/asm/data/code_3195D0.data.s @@ -0,0 +1,18 @@ +.include "macro.inc" + +.section .data + +glabel D_802BE880 +.byte 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x01, 0x80, 0x2B, 0xD3, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00 + +glabel D_802BE89C +.word 0x802BE940, 0x00000043, 0x00000001, 0x802BD338, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802BD758, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802BE4E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 + +glabel D_802BE900 +.double 0.8 + +glabel D_802BE908 +.double 500.0 + +glabel D_802BE910 +.double 0.55, 0.0 diff --git a/asm/data/code_31B000.data.s b/asm/data/code_31B000.data.s new file mode 100644 index 0000000000..3888370086 --- /dev/null +++ b/asm/data/code_31B000.data.s @@ -0,0 +1,24 @@ +.include "macro.inc" + +.section .data + +glabel D_802BEA90 +.byte 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x01, 0x80, 0x2B, 0xD1, 0x48, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00 + +glabel D_802BEAAC +.word 0x802BEBC8, 0x00000043, 0x00000001, 0x802BD180, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802BD660, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802BE8D4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 + +glabel D_802BEB10 +.double 0.8 + +glabel jtbl_802BEB18_31B088 +.word L802BDAF8_31A068, L802BE210_31A780, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE764_31ACD4, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BD848_319DB8, L802BD904_319E74, 0 + +glabel D_802BEB98 +.double 1.3 + +glabel D_802BEBA0 +.double 0.1 + +glabel D_802BEBA8 +.double 0.05 diff --git a/asm/data/code_31CB60.data.s b/asm/data/code_31CB60.data.s new file mode 100644 index 0000000000..4821093bec --- /dev/null +++ b/asm/data/code_31CB60.data.s @@ -0,0 +1,33 @@ +.include "macro.inc" + +.section .data + +glabel D_802BEB40 +.word 0x00000000, 0x00000043, 0x00000001, 0x802BD228, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +glabel D_802BEB60 +.word 0x802BEC80, 0x00000043, 0x00000001, 0x802BD260, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802BD638, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802BE7E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 + +glabel D_802BEBC0 +.double 0.8 + +glabel jtbl_802BEBC8_31CBE8 +.word L802BDAA8_31BAC8, L802BDD4C_31BD6C, L802BE23C_31C25C, L802BE37C_31C39C, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BD73C_31B75C, L802BD7F0_31B810 + +glabel D_802BEC18 +.double 0.01 + +glabel D_802BEC20 +.double 0.01 + +glabel D_802BEC28 +.double 0.01 + +glabel D_802BEC30 +.double 1.3333333333333333 + +glabel D_802BEC38 +.double 0.55 + +glabel D_802BEC40 +.double 0.8, 0.0 diff --git a/asm/data/code_31DDC0.data.s b/asm/data/code_31DDC0.data.s new file mode 100644 index 0000000000..d4d1c93815 --- /dev/null +++ b/asm/data/code_31DDC0.data.s @@ -0,0 +1,15 @@ +.include "macro.inc" + +.section .data + +glabel D_802BE250 +.word 0x00000018, 0x00000006, 0x00000043, 0x00000001, 0x802BD27C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +glabel D_802BE274 +.word 0x802BE318 + +glabel D_802BE278 +.word 0x00000000, 0x00000043, 0x00000001, 0x802BD2B4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802BD754, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802BDD0C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802BDE88, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 + +glabel D_802BE2F0 +.double 0.8, 0.0 diff --git a/asm/data/code_320B20.data.s b/asm/data/code_320B20.data.s new file mode 100644 index 0000000000..2a93ce80e6 --- /dev/null +++ b/asm/data/code_320B20.data.s @@ -0,0 +1,36 @@ +.include "macro.inc" + +.section .data + +glabel D_802BFDB0 +.float 0.0 + +glabel D_802BFDB4 +.float 0.0 + +glabel D_802BFDB8 +.word 0x00000000 + +glabel D_802BFDBC +.word 0x00000000, 0x00000043, 0x00000001, 0x802BE3A4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802BF568, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +glabel D_802BFDF8 +.word 0x802BFF10, 0x00000043, 0x00000001, 0x802BF5A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802BF964, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802BFAB8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +glabel D_802BFE50 +.double 0.15 + +glabel D_802BFE58 +.double 0.14 + +glabel D_802BFE60 +.double 1.8 + +glabel jtbl_802BFE68_320BD8 +.word L802BE474_31F1E4, L802BEB18_31F888, L802BF4F0_320260, L802BF204_31FF74, L802BF21C_31FF8C, L802BF24C_31FFBC, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BF400_320170, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BE58C_31F2FC, L802BE77C_31F4EC, L802BE9D8_31F748, L802BE998_31F708, L802BE9D8_31F748, L802BE9E4_31F754 + +glabel D_802BFED0 +.double 0.6 + +glabel D_802BFED8 +.double 0.8 diff --git a/asm/data/code_3239B0.data.s b/asm/data/code_3239B0.data.s new file mode 100644 index 0000000000..bd3438f26f --- /dev/null +++ b/asm/data/code_3239B0.data.s @@ -0,0 +1,15 @@ +.include "macro.inc" + +.section .data + +glabel D_802BFE60 +.byte 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x01, 0x80, 0x2B, 0xD2, 0x9C, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00 + +glabel D_802BFE7C +.word 0x802BFF30, 0x00000043, 0x00000001, 0x802BD2D4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802BE724, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802BF4F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802BFBA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +glabel D_802BFEF0 +.double 0.8 + +glabel D_802BFEF8 +.double 1.8 diff --git a/asm/data/code_324930.data.s b/asm/data/code_324930.data.s new file mode 100644 index 0000000000..21073b0265 --- /dev/null +++ b/asm/data/code_324930.data.s @@ -0,0 +1,15 @@ +.include "macro.inc" + +.section .data + +glabel D_802BDFE0 +.byte 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x01, 0x80, 0x2B, 0xD1, 0x30, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00 + +glabel D_802BDFFC +.word 0x802BE0C8, 0x00000043, 0x00000001, 0x802BD168, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802BD694, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802BDF08, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 + +glabel D_802BE060 +.double 0.8 + +glabel jtbl_802BE068_3249B8 +.word L802BDB88_3244D8, L802BDC64_3245B4, L802BDD74_3246C4, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BD894_3241E4, L802BDA20_324370, 0 diff --git a/asm/data/code_421FC0.data.s b/asm/data/code_421FC0.data.s new file mode 100644 index 0000000000..ffd321d224 --- /dev/null +++ b/asm/data/code_421FC0.data.s @@ -0,0 +1,6 @@ +.include "macro.inc" + +.section .data + +glabel jtbl_802A95D0_421FC0 +.word L802A927C_421C6C, L802A92A0_421C90, L802A952C_421F1C, L802A952C_421F1C, L802A952C_421F1C, L802A952C_421F1C, L802A952C_421F1C, L802A952C_421F1C, L802A952C_421F1C, L802A952C_421F1C, L802A9344_421D34, L802A9404_421DF4, L802A950C_421EFC, 0, 0, 0 diff --git a/asm/data/code_6EAC0.data.s b/asm/data/code_6EAC0.data.s index e53bc8ff77..a781923680 100644 --- a/asm/data/code_6EAC0.data.s +++ b/asm/data/code_6EAC0.data.s @@ -27,7 +27,7 @@ glabel nuContCallBack .word 0x00000000, 0x80093CA8, 0x02000000, 0x00000000 glabel nuContRmbSearchTime -.word 0x0000012C, 0x8005FB10, contRmbCheckMesg, contRmbStartMesg, contRmbStopMesg, contRmbForceStopMesg, contRmbForceStopEndMesg, 0x00000000 +.word 0x0000012C, contRmbControl, contRmbCheckMesg, contRmbStartMesg, contRmbStopMesg, contRmbForceStopMesg, contRmbForceStopEndMesg, 0x00000000 glabel nuContRmbCallBack .word 0x00000000, 0x80093CE4, 0x03000000, 0x00000000 diff --git a/asm/data/code_71430.data.s b/asm/data/code_71430.data.s index db08a0bae8..12f0ce5b5d 100644 --- a/asm/data/code_71430.data.s +++ b/asm/data/code_71430.data.s @@ -12,8 +12,8 @@ glabel D_80097D30 .ascii "File:%s Line:%d %s \0\0\0" -glabel D_80097D48 -.word 0x800270B4, 0x800270E4, 0x8002710C, 0x80027134, 0x80027168, 0x00000000 +glabel jtbl_80097D48_73148 +.word L800270B4_24B4, L800270E4_24E4, L8002710C_250C, L80027134_2534, L80027168_2568, 0 glabel D_80097D60 .word 0x3F000020, 0x04DBF38E @@ -33,8 +33,8 @@ glabel D_80097D80 glabel D_80097D88 .word 0x3F000020, 0x04DBF38E -glabel D_80097D90 -.word 0x8002A40C, 0x8002A438, 0x8002A44C, 0x8002A460, 0x8002A5E0, 0x8002A620, 0x8002A648, 0x8002A4E8, 0x8002A534, 0x8002A6D8, 0x8002A798, 0x8002A820, 0x8002A870, 0x00000000 +glabel jtbl_80097D90_73190 +.word L8002A40C_580C, L8002A438_5838, L8002A44C_584C, L8002A460_5860, L8002A5E0_59E0, L8002A620_5A20, L8002A648_5A48, L8002A4E8_58E8, L8002A534_5934, L8002A6D8_5AD8, L8002A798_5B98, L8002A820_5C20, L8002A870_5C70, 0 glabel D_80097DC8 .double 3.141592 @@ -120,8 +120,8 @@ glabel D_800981B4 glabel D_800981C8 .word 0x4D4D3A25, 0x30385848, 0x00000000, 0x00000000, 0x00000000, 0x00000000 -glabel D_800981E0 -.word 0x8002D4A8, 0x8002D4B8, 0x8002D4C8, 0x8002D498, 0x8002D4D8, 0x8002D4E8, 0x8002D4F8, 0x00000000 +glabel jtbl_800981E0_735E0 +.word L8002D4A8_88A8, L8002D4B8_88B8, L8002D4C8_88C8, L8002D498_8898, L8002D4D8_88D8, L8002D4E8_88E8, L8002D4F8_88F8, 0 glabel D_80098200 .double 0.01 @@ -129,11 +129,11 @@ glabel D_80098200 glabel D_80098208 .double -0.01 -glabel D_80098210 -.word 0x800305B0, 0x80030768, 0x80030868, 0x80030874, 0x80030880, 0x80030868, 0x80030644, 0x00000000 +glabel jtbl_80098210_73610 +.word L800305B0_B9B0, L80030768_BB68, L80030868_BC68, L80030874_BC74, L80030880_BC80, L80030868_BC68, L80030644_BA44, 0 -glabel D_80098230 -.word 0x800308D0, 0x80030BFC, 0x80030E54, 0x80031210, 0x80031220, 0x8003106C, 0x800309CC, 0x00000000 +glabel jtbl_80098230_73630 +.word L800308D0_BCD0, L80030BFC_BFFC, L80030E54_C254, L80031210_C610, L80031220_C620, L8003106C_C46C, L800309CC_BDCC, 0 glabel D_80098250 .double 1.01 @@ -159,23 +159,23 @@ glabel D_80098280 glabel D_80098288 .double -0.1 -glabel D_80098290 -.word 0x800341F8, 0x8003411C, 0x80034150, 0x80034170, 0x800341A8, 0x800341D8, 0x800341F8, 0x80034230, 0x80034278, 0x800342D4, 0x800342FC, 0x8003432C +glabel jtbl_80098290_73690 +.word L800341F8_F5F8, L8003411C_F51C, L80034150_F550, L80034170_F570, L800341A8_F5A8, L800341D8_F5D8, L800341F8_F5F8, L80034230_F630, L80034278_F678, L800342D4_F6D4, L800342FC_F6FC, L8003432C_F72C -glabel D_800982C0 -.word 0x800344A8, 0x800344A8, 0x800344A8, 0x80034628, 0x80034628, 0x80034628, 0x800347A8, 0x800347A8, 0x800347A8, 0x800347A8 +glabel jtbl_800982C0_736C0 +.word L800344A8_F8A8, L800344A8_F8A8, L800344A8_F8A8, L80034628_FA28, L80034628_FA28, L80034628_FA28, L800347A8_FBA8, L800347A8_FBA8, L800347A8_FBA8, L800347A8_FBA8 -glabel D_800982E8 -.word 0x80035740, 0x800357A4, 0x80035814, 0x80035A68, 0x80035AE0, 0x00000000 +glabel jtbl_800982E8_736E8 +.word L80035740_10B40, L800357A4_10BA4, L80035814_10C14, L80035A68_10E68, L80035AE0_10EE0, 0 -glabel D_80098300 -.word 0x80035B7C, 0x80035BDC, 0x80035C10, 0x80035C2C, 0x80035C80, 0x80035CCC, 0x80035D00, 0x00000000 +glabel jtbl_80098300_73700 +.word L80035B7C_10F7C, L80035BDC_10FDC, L80035C10_11010, L80035C2C_1102C, L80035C80_11080, L80035CCC_110CC, L80035D00_11100, 0 -glabel D_80098320 -.word 0x800361B4, 0x80036208, 0x80036244, 0x800362F8, 0x8003637C, 0x00000000 +glabel jtbl_80098320_73720 +.word L800361B4_115B4, L80036208_11608, L80036244_11644, L800362F8_116F8, L8003637C_1177C, 0 -glabel D_80098338 -.word 0x8003696C, 0x80036A20, 0x80036AA0, 0x80036C40, 0x80036D04, 0x80036D78, 0x80036D78, 0x80036D78, 0x80036D78, 0x80036D78, 0x80036D78, 0x80036D78, 0x80036D78, 0x80036D78, 0x80036D78, 0x80036D78, 0x80036D78, 0x80036D78, 0x80036D78, 0x80036D78, 0x80036D78, 0x80036A5C +glabel jtbl_80098338_73738 +.word L8003696C_11D6C, L80036A20_11E20, L80036AA0_11EA0, L80036C40_12040, L80036D04_12104, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036A5C_11E5C glabel D_80098390 .ascii "title_data\0\0" @@ -183,17 +183,17 @@ glabel D_80098390 glabel D_8009839C .word 0x7469746C, 0x655F6267, 0x00000000 -glabel D_800983A8 -.word 0x80037130, 0x80037184, 0x80037204, 0x8003756C, 0x800372DC, 0x8003733C, 0x80037450, 0x00000000 +glabel jtbl_800983A8_737A8 +.word L80037130_12530, L80037184_12584, L80037204_12604, L8003756C_1296C, L800372DC_126DC, L8003733C_1273C, L80037450_12850, 0 -glabel D_800983C8 -.word 0x800375D8, 0x80037624, 0x800375F4, 0x8003762C, 0x80037624, 0x80037624 +glabel jtbl_800983C8_737C8 +.word L800375D8_129D8, L80037624_12A24, L800375F4_129F4, L8003762C_12A2C, L80037624_12A24, L80037624_12A24 -glabel D_800983E0 -.word 0x80037718, 0x8003768C, 0x800376BC, 0x80037718, 0x800376C8, 0x800376D4, 0x656E6400, 0x6B6B6A5F, 0x32360000, 0x61726E5F, 0x30380000, 0x6B6B6A5F, 0x31310000, 0x6E6F6B5F, 0x30320000, 0x6D61635F, 0x30330000, 0x6B7A6E5F, 0x30320000, 0x6D61635F, 0x30300000, 0x6A616E5F, 0x30340000, 0x7472645F, 0x30390000, 0x74696B5F, 0x30330000, 0x69736B5F, 0x30340000, 0x6E6F6B5F, 0x31320000, 0x00000000 +glabel jtbl_800983E0_737E0 +.word L80037718_12B18, L8003768C_12A8C, L800376BC_12ABC, L80037718_12B18, L800376C8_12AC8, L800376D4_12AD4, 0x656E6400, 0x6B6B6A5F, 0x32360000, 0x61726E5F, 0x30380000, 0x6B6B6A5F, 0x31310000, 0x6E6F6B5F, 0x30320000, 0x6D61635F, 0x30330000, 0x6B7A6E5F, 0x30320000, 0x6D61635F, 0x30300000, 0x6A616E5F, 0x30340000, 0x7472645F, 0x30390000, 0x74696B5F, 0x30330000, 0x69736B5F, 0x30340000, 0x6E6F6B5F, 0x31320000, 0 -glabel D_80098460 -.word 0x80038320, 0x8003836C, 0x8003840C, 0x8003817C, 0x800381C8, 0x00000000, 0x00000000, 0x00000000 +glabel jtbl_80098460_73860 +.word L80038320_13720, L8003836C_1376C, L8003840C_1380C, L8003817C_1357C, L800381C8_135C8, 0, 0, 0 glabel D_80098480 .double 0.7142857142857143 @@ -222,14 +222,14 @@ glabel D_800984B8 glabel D_800984C0 .double 0.7142857142857143 -glabel D_800984C8 -.word 0x8003B4AC, 0x8003B4BC, 0x8003B4CC, 0x8003B4DC, 0x8003B4EC, 0x00000000 +glabel jtbl_800984C8_738C8 +.word L8003B4AC_168AC, L8003B4BC_168BC, L8003B4CC_168CC, L8003B4DC_168DC, L8003B4EC_168EC, 0 glabel D_800984E0 .word 0x8003C490, 0x8003C4A4, 0x8003C4B8, 0x8003C4CC, 0x8003C4E0, 0x8003C4F4, 0x8003C508, 0x00000000 -glabel D_80098500 -.word 0x8003C57C, 0x8003C590, 0x8003C5A4, 0x8003C5B8, 0x8003C5CC, 0x8003C5E0, 0x8003C5F4, 0x00000000 +glabel jtbl_80098500_73900 +.word L8003C57C_1797C, L8003C590_17990, L8003C5A4_179A4, L8003C5B8_179B8, L8003C5CC_179CC, L8003C5E0_179E0, L8003C5F4_179F4, 0 glabel D_80098520 .double 0.01 @@ -246,44 +246,44 @@ glabel D_80098538 glabel D_80098540 .double 0.20000000298023224 -glabel D_80098548 -.word 0x8003D43C, 0x8003D46C, 0x8003D464, 0x8003D464, 0x8003D48C, 0x8003D54C, 0x8003D4A8, 0x8003D4C8, 0x8003D4F4, 0x8003D510, 0x8003D530, 0x8003D5FC, 0x8003D5FC, 0x8003D568, 0x8003D584, 0x8003D5A4, 0x8003D5D0, 0x00000000 +glabel jtbl_80098548_73948 +.word L8003D43C_1883C, L8003D46C_1886C, L8003D464_18864, L8003D464_18864, L8003D48C_1888C, L8003D54C_1894C, L8003D4A8_188A8, L8003D4C8_188C8, L8003D4F4_188F4, L8003D510_18910, L8003D530_18930, L8003D5FC_189FC, L8003D5FC_189FC, L8003D568_18968, L8003D584_18984, L8003D5A4_189A4, L8003D5D0_189D0, 0 -glabel D_80098590 -.word 0x8003D750, 0x8003D764, 0x8003D764, 0x8003D764, 0x8003D764, 0x8003D6E8, 0x8003D6FC, 0x8003D710, 0x8003D73C, 0x00000000, 0x00000000, 0x00000000 +glabel jtbl_80098590_73990 +.word L8003D750_18B50, L8003D764_18B64, L8003D764_18B64, L8003D764_18B64, L8003D764_18B64, L8003D6E8_18AE8, L8003D6FC_18AFC, L8003D710_18B10, L8003D73C_18B3C, 0, 0, 0 -glabel D_800985C0 -.word 0x8003E59C, 0x8003E554, 0x8003E564, 0x8003E574, 0x8003E584, 0x8003E594 +glabel jtbl_800985C0_739C0 +.word L8003E59C_1999C, L8003E554_19954, L8003E564_19964, L8003E574_19974, L8003E584_19984, L8003E594_19994 -glabel D_800985D8 -.word 0x8003E628, 0x8003E5E0, 0x8003E5F0, 0x8003E600, 0x8003E610, 0x8003E620 +glabel jtbl_800985D8_739D8 +.word L8003E628_19A28, L8003E5E0_199E0, L8003E5F0_199F0, L8003E600_19A00, L8003E610_19A10, L8003E620_19A20 glabel D_800985F0 .double 0.35 -glabel D_800985F8 -.word 0x80040320, 0x80040320, 0x80040594, 0x80040594, 0x80040594, 0x80040320, 0x80040320, 0x80040320, 0x80040320, 0x80040594, 0x80040320, 0x80040320, 0x80040320, 0x80040320, 0x80040594, 0x8003FFA0 +glabel jtbl_800985F8_739F8 +.word L80040320_1B720, L80040320_1B720, L80040594_1B994, L80040594_1B994, L80040594_1B994, L80040320_1B720, L80040320_1B720, L80040320_1B720, L80040320_1B720, L80040594_1B994, L80040320_1B720, L80040320_1B720, L80040320_1B720, L80040320_1B720, L80040594_1B994, L8003FFA0_1B3A0 -glabel D_80098638 -.word 0x80040540, 0x80040540, 0x8004055C, 0x8004055C, 0x8004055C, 0x80040540, 0x80040540, 0x80040540, 0x80040540, 0x8004055C, 0x80040548, 0x80040548, 0x80040554, 0x80040554 +glabel jtbl_80098638_73A38 +.word L80040540_1B940, L80040540_1B940, L8004055C_1B95C, L8004055C_1B95C, L8004055C_1B95C, L80040540_1B940, L80040540_1B940, L80040540_1B940, L80040540_1B940, L8004055C_1B95C, L80040548_1B948, L80040548_1B948, L80040554_1B954, L80040554_1B954 glabel D_80098670 .double 0.8 -glabel D_80098678 -.word 0x80041314, 0x80040918, 0x80040BF4, 0x80040ABC, 0x80040E34, 0x800410BC, 0x8004115C, 0x00000000 +glabel jtbl_80098678_73A78 +.word L80041314_1C714, L80040918_1BD18, L80040BF4_1BFF4, L80040ABC_1BEBC, L80040E34_1C234, L800410BC_1C4BC, L8004115C_1C55C, 0 -glabel D_80098698 -.word 0x80042198, 0x800421AC, 0x800421C0, 0x800421E8, 0x800421D4, 0x00000000 +glabel jtbl_80098698_73A98 +.word L80042198_1D598, L800421AC_1D5AC, L800421C0_1D5C0, L800421E8_1D5E8, L800421D4_1D5D4, 0 -glabel D_800986B0 -.word 0x80045DB4, 0x80045DC0, 0x80045DCC, 0x80045E08, 0x80045E14, 0x00000000 +glabel jtbl_800986B0_73AB0 +.word L80045DB4_211B4, L80045DC0_211C0, L80045DCC_211CC, L80045E08_21208, L80045E14_21214, 0 -glabel D_800986C8 -.word 0x800460F0, 0x800460E0, 0x800460D0, 0x800460C0, 0x80046130, 0x80046100, 0x80046110, 0x80046120 +glabel jtbl_800986C8_73AC8 +.word L800460F0_214F0, L800460E0_214E0, L800460D0_214D0, L800460C0_214C0, L80046130_21530, L80046100_21500, L80046110_21510, L80046120_21520 -glabel D_800986E8 -.word 0x80046204, 0x800461F0, 0x800461DC, 0x800461C8, 0x80046254, 0x80046218, 0x8004622C, 0x80046240, 0x00000000, 0x00000000 +glabel jtbl_800986E8_73AE8 +.word L80046204_21604, L800461F0_215F0, L800461DC_215DC, L800461C8_215C8, L80046254_21654, L80046218_21618, L8004622C_2162C, L80046240_21640, 0, 0 glabel D_80098710 .double 1.15 @@ -294,20 +294,20 @@ glabel D_80098718 glabel D_80098720 .double 32767.0 -glabel D_80098728 -.word 0x8004A5FC, 0x8004A60C, 0x8004A624, 0x8004A634, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A64C, 0x8004A65C, 0x8004A674, 0x8004A684, 0x8004A6A4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6C4, 0x8004A6BC, 0x00000000, 0x00000000 +glabel jtbl_80098728_73B28 +.word L8004A5FC_259FC, L8004A60C_25A0C, L8004A624_25A24, L8004A634_25A34, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A64C_25A4C, L8004A65C_25A5C, L8004A674_25A74, L8004A684_25A84, L8004A6A4_25AA4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6C4_25AC4, L8004A6BC_25ABC, 0, 0 glabel D_800988C0 .word 0x8004E5A8, 0x8004E54C, 0x8004E574, 0x8004E584, 0x8004E594, 0x00000000 -glabel D_800988D8 -.word 0x8005033C, 0x800503C0, 0x800503E4, 0x8005045C, 0x80050470, 0x800504A8 +glabel jtbl_800988D8_73CD8 +.word L8005033C_2B73C, L800503C0_2B7C0, L800503E4_2B7E4, L8005045C_2B85C, L80050470_2B870, L800504A8_2B8A8 -glabel D_800988F0 -.word 0x80054778, 0x80054784, 0x800547B4, 0x80054790, 0x8005479C, 0x800547A8 +glabel jtbl_800988F0_73CF0 +.word L80054778_2FB78, L80054784_2FB84, L800547B4_2FBB4, L80054790_2FB90, L8005479C_2FB9C, L800547A8_2FBA8 -glabel D_80098908 -.word 0x80055ED8, 0x80055EE8, 0x80055EF8, 0x80055F08, 0x80055F18, 0x80055F28, 0x80055F38, 0x80055F48, 0x00000000, 0x00000000 +glabel jtbl_80098908_73D08 +.word L80055ED8_312D8, L80055EE8_312E8, L80055EF8_312F8, L80055F08_31308, L80055F18_31318, L80055F28_31328, L80055F38_31338, L80055F48_31348, 0, 0 glabel D_80098930 .double 1.99996 @@ -315,14 +315,14 @@ glabel D_80098930 glabel D_80098938 .double 65535.0 -glabel D_80098940 -.word 0x80059094, 0x800590F4, 0x800590AC, 0x800590B8, 0x800590A0, 0x800590C4, 0x800590D0, 0x800590DC, 0x800590E8, 0x800590F4 +glabel jtbl_80098940_73D40 +.word L80059094_34494, L800590F4_344F4, L800590AC_344AC, L800590B8_344B8, L800590A0_344A0, L800590C4_344C4, L800590D0_344D0, L800590DC_344DC, L800590E8_344E8, L800590F4_344F4 glabel D_80098968 .double 173123.404906676 -glabel D_80098970 -.word 0x800598D0, 0x800598FC, 0x8005994C, 0x80059928, 0x80059970, 0x80059994, 0x800599F0, 0x80059A6C +glabel jtbl_80098970_73D70 +.word L800598D0_34CD0, L800598FC_34CFC, L8005994C_34D4C, L80059928_34D28, L80059970_34D70, L80059994_34D94, L800599F0_34DF0, L80059A6C_34E6C glabel D_80098990 .double 173123.404906676, 0.0 diff --git a/asm/data/code_74EA0.rodata.s b/asm/data/code_74EA0.rodata.s index 200fcf555c..432a950d57 100644 --- a/asm/data/code_74EA0.rodata.s +++ b/asm/data/code_74EA0.rodata.s @@ -5,8 +5,8 @@ glabel D_80099AA0 .short 0x0555, 0x0556, 0x0559, 0x055A, 0x0565, 0x0566, 0x0569, 0x056A, 0x0595, 0x0596, 0x0599, 0x059A, 0x05A5, 0x05A6, 0x05A9, 0x05AA, 0x0655, 0x0656, 0x0659, 0x065A, 0x0665, 0x0666, 0x0669, 0x066A, 0x0695, 0x0696, 0x0699, 0x069A, 0x06A5, 0x06A6, 0x06A9, 0x06AA, 0x0955, 0x0956, 0x0959, 0x095A, 0x0965, 0x0966, 0x0969, 0x096A, 0x0995, 0x0996, 0x0999, 0x099A, 0x09A5, 0x09A6, 0x09A9, 0x09AA, 0x0A55, 0x0A56, 0x0A59, 0x0A5A, 0x0A65, 0x0A66, 0x0A69, 0x0A6A, 0x0A95, 0x0A96, 0x0A99, 0x0A9A, 0x0AA5, 0x0AA6, 0x0AA9, 0x0AAA -glabel D_80099B20 -.word 0x800613D4, 0x800612F4, 0x80061328, 0x800613E4, 0x800613E4, 0x8006135C, 0x80061398, 0x00000000 +glabel jtbl_80099B20_74F20 +.word L800613D4_3C7D4, L800612F4_3C6F4, L80061328_3C728, L800613E4_3C7E4, L800613E4_3C7E4, L8006135C_3C75C, L80061398_3C798, 0 glabel D_80099B40 .double 4294967296.0, 0.0 @@ -77,17 +77,17 @@ glabel D_80099BF8 glabel D_80099C10 .word 0x686C4C00, 0x00000000 -glabel D_80099C18 -.word 0x800654B0, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800652CC, 0x800654CC, 0x800652CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800651B4, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x80065080, 0x800650B4, 0x800652CC, 0x800652CC, 0x800652CC, 0x800654CC, 0x800650B4, 0x800654CC, 0x800654CC, 0x800654CC, 0x800654CC, 0x80065380, 0x800651B4, 0x80065420, 0x800654CC, 0x800654CC, 0x8006546C, 0x800654CC, 0x800651B4, 0x800654CC, 0x800654CC, 0x800651B4, 0x00000000, 0x00000000 +glabel jtbl_80099C18_75018 +.word L800654B0_408B0, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800652CC_406CC, L800654CC_408CC, L800652CC_406CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800651B4_405B4, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L80065080_40480, L800650B4_404B4, L800652CC_406CC, L800652CC_406CC, L800652CC_406CC, L800654CC_408CC, L800650B4_404B4, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L80065380_40780, L800651B4_405B4, L80065420_40820, L800654CC_408CC, L800654CC_408CC, L8006546C_4086C, L800654CC_408CC, L800651B4_405B4, L800654CC_408CC, L800654CC_408CC, L800651B4_405B4, 0, 0 glabel D_80099D70 .double 4294967296.0, 0.0 -glabel D_80099D80 -.byte 0x00, 0x14, 0x18, 0x18, 0x1C, 0x1C, 0x1C, 0x1C, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x04, 0x08, 0x08, 0x0C, 0x0C, 0x0C, 0x0C, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10 +glabel jtbl_80099D80_75180 +.word 0x141818, 0x1C1C1C1C, 0x20202020, 0x20202020, 0x40808, 0xC0C0C0C, 0x10101010, 0x10101010 -glabel D_80099DA0 -.word 0x8006AF00, 0x8006AEC4, 0x8006AEA0, 0x8006ACC8, 0x8006AC80, 0x8006AE3C, 0x8006AC44, 0x8006AC50, 0x8006AC5C, 0x00000000, 0x00000000, 0x00000000 +glabel jtbl_80099DA0_751A0 +.word L8006AF00_46300, L8006AEC4_462C4, L8006AEA0_462A0, L8006ACC8_460C8, L8006AC80_46080, L8006AE3C_4623C, L8006AC44_46044, L8006AC50_46050, L8006AC5C_4605C, 0, 0, 0 glabel D_80099DD0 .word 0x40240000, 0x00000000, 0x40590000, 0x00000000, 0x40C38800, 0x00000000, 0x4197D784, 0x00000000, 0x4341C379, 0x37E08000, 0x4693B8B5, 0xB5056E17, 0x4D384F03, 0xE93FF9F5, 0x5A827748, 0xF9301D32, 0x75154FDD, 0x7F73BF3C diff --git a/asm/data/code_E5830.data.s b/asm/data/code_E5830.data.s index 773beb6efa..92ba970bc8 100644 --- a/asm/data/code_E5830.data.s +++ b/asm/data/code_E5830.data.s @@ -56,23 +56,23 @@ glabel gSongsUsingVariationFlag glabel D_8014F738 .short 0x0000, 0x0000, 0x0000, 0x0000 -glabel D_8014F740 -.word 0x8010FC18, 0x8010FC30, 0x8010FC50, 0x8010FC6C, 0x8010FC90, 0x8010FCAC, 0x8010FCCC, 0x8010FCE8, 0x8010FD08, 0x8010FD2C +glabel jtbl_8014F740_E5E40 +.word L8010FC18_A6318, L8010FC30_A6330, L8010FC50_A6350, L8010FC6C_A636C, L8010FC90_A6390, L8010FCAC_A63AC, L8010FCCC_A63CC, L8010FCE8_A63E8, L8010FD08_A6408, L8010FD2C_A642C -glabel D_8014F768 -.word 0x80110A70, 0x80110A70, 0x80110A68, 0x80110A68, 0x80110A70, 0x80110A68, 0x80110A70, 0x80110A70, 0x80110A70, 0x80110A70, 0x80110A70, 0x80110A70, 0x80110A68, 0x80110A70, 0x80110A70, 0x80110A68, 0x80110A68, 0x80110A70, 0x80110A68, 0x80110A68, 0x80110A68, 0x80110A68, 0x80110A68, 0x80110A68, 0x80110A68, 0x80110A68, 0x80110A68, 0x80110A70, 0x80110A68, 0x80110A68, 0x80110A68, 0x80110A70 +glabel jtbl_8014F768_E5E68 +.word L80110A70_A7170, L80110A70_A7170, L80110A68_A7168, L80110A68_A7168, L80110A70_A7170, L80110A68_A7168, L80110A70_A7170, L80110A70_A7170, L80110A70_A7170, L80110A70_A7170, L80110A70_A7170, L80110A70_A7170, L80110A68_A7168, L80110A70_A7170, L80110A70_A7170, L80110A68_A7168, L80110A68_A7168, L80110A70_A7170, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A70_A7170, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A70_A7170 -glabel D_8014F7E8 -.word 0x80110A70, 0x80110A70, 0x80110A68, 0x80110A68, 0x80110A70, 0x80110A68, 0x80110A70, 0x80110A70, 0x80110A70, 0x80110A70, 0x80110A70, 0x80110A70, 0x80110A68, 0x80110A70, 0x80110A68, 0x80110A68, 0x80110A68, 0x80110A68, 0x80110A68, 0x80110A68, 0x80110A70, 0x80110A70, 0x80110A68, 0x80110A68, 0x80110A68, 0x80110A70, 0x80110A68, 0x80110A70 +glabel jtbl_8014F7E8_E5EE8 +.word L80110A70_A7170, L80110A70_A7170, L80110A68_A7168, L80110A68_A7168, L80110A70_A7170, L80110A68_A7168, L80110A70_A7170, L80110A70_A7170, L80110A70_A7170, L80110A70_A7170, L80110A70_A7170, L80110A70_A7170, L80110A68_A7168, L80110A70_A7170, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A70_A7170, L80110A70_A7170, L80110A68_A7168, L80110A68_A7168, L80110A68_A7168, L80110A70_A7170, L80110A68_A7168, L80110A70_A7170 -glabel D_8014F858 -.word 0x80111478, 0x80111480, 0x80111478, 0x80111480, 0x80111478, 0x80111480, 0x80111478, 0x80111480 +glabel jtbl_8014F858_E5F58 +.word L80111478_A7B78, L80111480_A7B80, L80111478_A7B78, L80111480_A7B80, L80111478_A7B78, L80111480_A7B80, L80111478_A7B78, L80111480_A7B80 -glabel D_8014F878 -.word 0x80111B80, 0x80111B80, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B8C, 0x80111B80, 0x80111B80, 0x80111B8C, 0x80111B80, 0x00000000 +glabel jtbl_8014F878_E5F78 +.word L80111B80_A8280, L80111B80_A8280, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B8C_A828C, L80111B80_A8280, L80111B80_A8280, L80111B8C_A828C, L80111B80_A8280, 0 -glabel D_8014F928 -.word 0x801122B0, 0x801122C4, 0x801122AC, 0x801122C0, 0x801122D8, 0x801122D4 +glabel jtbl_8014F928_E6028 +.word L801122B0_A89B0, L801122C4_A89C4, L801122AC_A89AC, L801122C0_A89C0, L801122D8_A89D8, L801122D4_A89D4 glabel D_8014F940 .double 0.95 @@ -104,32 +104,32 @@ glabel D_8014F980 glabel D_8014F988 .double 0.01 -glabel D_8014F990 -.word 0x80113428, 0x80113488, 0x801134E8, 0x80113568, 0x80113608, 0x801136C8, 0x801137A8, 0x801138A8 +glabel jtbl_8014F990_E6090 +.word L80113428_A9B28, L80113488_A9B88, L801134E8_A9BE8, L80113568_A9C68, L80113608_A9D08, L801136C8_A9DC8, L801137A8_A9EA8, L801138A8_A9FA8 -glabel D_8014F9B0 -.word 0x80113C14, 0x80113CD8, 0x80113D94, 0x80113F64, 0x80113F64, 0x801142F4, 0x80114690, 0x80114690, 0x80114690, 0x8011460C, 0x8011460C, 0x00000000 +glabel jtbl_8014F9B0_E60B0 +.word L80113C14_AA314, L80113CD8_AA3D8, L80113D94_AA494, L80113F64_AA664, L80113F64_AA664, L801142F4_AA9F4, L80114690_AAD90, L80114690_AAD90, L80114690_AAD90, L8011460C_AAD0C, L8011460C_AAD0C, 0 -glabel D_8014F9E0 -.word 0x80113CD0, 0x80113CD0, 0x80113C40, 0x80113CA8, 0x80113C48, 0x80113CD0, 0x80113C50, 0x80113CD0, 0x80113C58, 0x80113CD0, 0x80113CD0, 0x80113CD0, 0x80113C60, 0x80113CD0, 0x80113C68, 0x80113CB0, 0x80113C78, 0x80113CD0, 0x80113C80, 0x80113CB8, 0x80113C88, 0x80113C78, 0x80113CD0, 0x80113CD0, 0x80113CD0, 0x80113C90, 0x80113CD0, 0x80113C98, 0x80113CD0, 0x80113CD0, 0x80113CD0, 0x80113CD0, 0x80113CD0, 0x80113C78, 0x80113CD0, 0x80113CD0, 0x80113CD0, 0x80113CA0, 0x80113CD0, 0x80113CD0, 0x80113C70, 0x80113CD0, 0x80113CD0, 0x80113CD0, 0x80113CD0, 0x80113CC0, 0x80113CC8, 0x00000000 +glabel jtbl_8014F9E0_E60E0 +.word L80113CD0_AA3D0, L80113CD0_AA3D0, L80113C40_AA340, L80113CA8_AA3A8, L80113C48_AA348, L80113CD0_AA3D0, L80113C50_AA350, L80113CD0_AA3D0, L80113C58_AA358, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113C60_AA360, L80113CD0_AA3D0, L80113C68_AA368, L80113CB0_AA3B0, L80113C78_AA378, L80113CD0_AA3D0, L80113C80_AA380, L80113CB8_AA3B8, L80113C88_AA388, L80113C78_AA378, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113C90_AA390, L80113CD0_AA3D0, L80113C98_AA398, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113C78_AA378, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CA0_AA3A0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113C70_AA370, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CD0_AA3D0, L80113CC0_AA3C0, L80113CC8_AA3C8, 0 -glabel D_8014FAA0 -.word 0x80113D8C, 0x80113D8C, 0x80113D04, 0x80113D64, 0x80113D0C, 0x80113D8C, 0x80113D14, 0x80113D8C, 0x80113D1C, 0x80113D8C, 0x80113D8C, 0x80113D8C, 0x80113D24, 0x80113D8C, 0x80113D2C, 0x80113D6C, 0x80113D34, 0x80113D8C, 0x80113D44, 0x80113D74, 0x80113D8C, 0x80113D34, 0x80113D8C, 0x80113D8C, 0x80113D8C, 0x80113D4C, 0x80113D8C, 0x80113D54, 0x80113D8C, 0x80113D8C, 0x80113D8C, 0x80113D8C, 0x80113D8C, 0x80113D34, 0x80113D8C, 0x80113D8C, 0x80113D8C, 0x80113D5C, 0x80113D8C, 0x80113D8C, 0x80113D3C, 0x80113D8C, 0x80113D8C, 0x80113D8C, 0x80113D8C, 0x80113D7C, 0x80113D84, 0x00000000 +glabel jtbl_8014FAA0_E61A0 +.word L80113D8C_AA48C, L80113D8C_AA48C, L80113D04_AA404, L80113D64_AA464, L80113D0C_AA40C, L80113D8C_AA48C, L80113D14_AA414, L80113D8C_AA48C, L80113D1C_AA41C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D24_AA424, L80113D8C_AA48C, L80113D2C_AA42C, L80113D6C_AA46C, L80113D34_AA434, L80113D8C_AA48C, L80113D44_AA444, L80113D74_AA474, L80113D8C_AA48C, L80113D34_AA434, L80113D8C_AA48C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D4C_AA44C, L80113D8C_AA48C, L80113D54_AA454, L80113D8C_AA48C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D34_AA434, L80113D8C_AA48C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D5C_AA45C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D3C_AA43C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D8C_AA48C, L80113D7C_AA47C, L80113D84_AA484, 0 -glabel D_8014FB60 -.word 0x80113E48, 0x80113E48, 0x80113DC0, 0x80113E20, 0x80113DC8, 0x80113E48, 0x80113DD0, 0x80113E48, 0x80113DD8, 0x80113E48, 0x80113E48, 0x80113E48, 0x80113DE0, 0x80113E48, 0x80113DE8, 0x80113E28, 0x80113DF0, 0x80113E48, 0x80113E00, 0x80113E30, 0x80113E48, 0x80113DF0, 0x80113E48, 0x80113E48, 0x80113E48, 0x80113E08, 0x80113E48, 0x80113E10, 0x80113E48, 0x80113E48, 0x80113E48, 0x80113E48, 0x80113E48, 0x80113DF0, 0x80113E48, 0x80113E48, 0x80113E48, 0x80113E18, 0x80113E48, 0x80113E48, 0x80113DF8, 0x80113E48, 0x80113E48, 0x80113E48, 0x80113E48, 0x80113E38, 0x80113E40, 0x00000000 +glabel jtbl_8014FB60_E6260 +.word L80113E48_AA548, L80113E48_AA548, L80113DC0_AA4C0, L80113E20_AA520, L80113DC8_AA4C8, L80113E48_AA548, L80113DD0_AA4D0, L80113E48_AA548, L80113DD8_AA4D8, L80113E48_AA548, L80113E48_AA548, L80113E48_AA548, L80113DE0_AA4E0, L80113E48_AA548, L80113DE8_AA4E8, L80113E28_AA528, L80113DF0_AA4F0, L80113E48_AA548, L80113E00_AA500, L80113E30_AA530, L80113E48_AA548, L80113DF0_AA4F0, L80113E48_AA548, L80113E48_AA548, L80113E48_AA548, L80113E08_AA508, L80113E48_AA548, L80113E10_AA510, L80113E48_AA548, L80113E48_AA548, L80113E48_AA548, L80113E48_AA548, L80113E48_AA548, L80113DF0_AA4F0, L80113E48_AA548, L80113E48_AA548, L80113E48_AA548, L80113E18_AA518, L80113E48_AA548, L80113E48_AA548, L80113DF8_AA4F8, L80113E48_AA548, L80113E48_AA548, L80113E48_AA548, L80113E48_AA548, L80113E38_AA538, L80113E40_AA540, 0 -glabel D_8014FC20 -.word 0x80113FC4, 0x80114234, 0x80113FE4, 0x80114184, 0x80114004, 0x80114234, 0x80114024, 0x80114234, 0x80114044, 0x80114234, 0x80114234, 0x80114234, 0x80114064, 0x80114234, 0x80114084, 0x801141A4, 0x801140A4, 0x80114234, 0x80114104, 0x801141C4, 0x80114234, 0x801140C4, 0x80114234, 0x80114234, 0x80114234, 0x80114124, 0x80114234, 0x80114144, 0x80114234, 0x80114234, 0x80114234, 0x80114234, 0x80114234, 0x801140E4, 0x80114234, 0x80114234, 0x80114234, 0x80114164, 0x80114234, 0x80114234, 0x80114234, 0x80114234, 0x80114234, 0x80114234, 0x80114234, 0x801141E4, 0x80114204, 0x00000000 +glabel jtbl_8014FC20_E6320 +.word L80113FC4_AA6C4, L80114234_AA934, L80113FE4_AA6E4, L80114184_AA884, L80114004_AA704, L80114234_AA934, L80114024_AA724, L80114234_AA934, L80114044_AA744, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114064_AA764, L80114234_AA934, L80114084_AA784, L801141A4_AA8A4, L801140A4_AA7A4, L80114234_AA934, L80114104_AA804, L801141C4_AA8C4, L80114234_AA934, L801140C4_AA7C4, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114124_AA824, L80114234_AA934, L80114144_AA844, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114234_AA934, L801140E4_AA7E4, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114164_AA864, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114234_AA934, L80114234_AA934, L801141E4_AA8E4, L80114204_AA904, 0 -glabel D_8014FCE0 -.word 0x801143A8, 0x801143A8, 0x80114320, 0x80114380, 0x80114328, 0x801143A8, 0x80114330, 0x801143A8, 0x80114338, 0x801143A8, 0x801143A8, 0x801143A8, 0x80114340, 0x801143A8, 0x80114348, 0x80114388, 0x80114350, 0x801143A8, 0x80114360, 0x80114390, 0x801143A8, 0x80114350, 0x801143A8, 0x801143A8, 0x801143A8, 0x80114368, 0x801143A8, 0x80114370, 0x801143A8, 0x801143A8, 0x801143A8, 0x801143A8, 0x801143A8, 0x80114350, 0x801143A8, 0x801143A8, 0x801143A8, 0x80114378, 0x801143A8, 0x801143A8, 0x80114358, 0x801143A8, 0x801143A8, 0x801143A8, 0x801143A8, 0x80114398, 0x801143A0, 0x00000000 +glabel jtbl_8014FCE0_E63E0 +.word L801143A8_AAAA8, L801143A8_AAAA8, L80114320_AAA20, L80114380_AAA80, L80114328_AAA28, L801143A8_AAAA8, L80114330_AAA30, L801143A8_AAAA8, L80114338_AAA38, L801143A8_AAAA8, L801143A8_AAAA8, L801143A8_AAAA8, L80114340_AAA40, L801143A8_AAAA8, L80114348_AAA48, L80114388_AAA88, L80114350_AAA50, L801143A8_AAAA8, L80114360_AAA60, L80114390_AAA90, L801143A8_AAAA8, L80114350_AAA50, L801143A8_AAAA8, L801143A8_AAAA8, L801143A8_AAAA8, L80114368_AAA68, L801143A8_AAAA8, L80114370_AAA70, L801143A8_AAAA8, L801143A8_AAAA8, L801143A8_AAAA8, L801143A8_AAAA8, L801143A8_AAAA8, L80114350_AAA50, L801143A8_AAAA8, L801143A8_AAAA8, L801143A8_AAAA8, L80114378_AAA78, L801143A8_AAAA8, L801143A8_AAAA8, L80114358_AAA58, L801143A8_AAAA8, L801143A8_AAAA8, L801143A8_AAAA8, L801143A8_AAAA8, L80114398_AAA98, L801143A0_AAAA0, 0 -glabel D_8014FDA0 -.word 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114638, 0x80114660, 0x80114660, 0x80114660, 0x80114640, 0x80114660, 0x80114660, 0x80114660, 0x80114648, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114660, 0x80114650, 0x80114658, 0x00000000 +glabel jtbl_8014FDA0_E64A0 +.word L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114638_AAD38, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114640_AAD40, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114648_AAD48, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114660_AAD60, L80114650_AAD50, L80114658_AAD58, 0 -glabel D_8014FE60 -.word 0x8011EC3C, 0x8011EC5C, 0x8011F034, 0x8011EC7C, 0x8011F034, 0x8011ED48, 0x8011EE10, 0x8011F034, 0x8011EEF0, 0x8011F034, 0x8011EC8C, 0x8011F034, 0x8011F034, 0x8011F034, 0x8011EC9C, 0x8011ECB8, 0x8011ECEC, 0x8011EF6C, 0x8011EC44, 0x8011ED2C +glabel jtbl_8014FE60_E6560 +.word L8011EC3C_B533C, L8011EC5C_B535C, L8011F034_B5734, L8011EC7C_B537C, L8011F034_B5734, L8011ED48_B5448, L8011EE10_B5510, L8011F034_B5734, L8011EEF0_B55F0, L8011F034_B5734, L8011EC8C_B538C, L8011F034_B5734, L8011F034_B5734, L8011F034_B5734, L8011EC9C_B539C, L8011ECB8_B53B8, L8011ECEC_B53EC, L8011EF6C_B566C, L8011EC44_B5344, L8011ED2C_B542C glabel D_8014FEB0 .double 180.0 @@ -149,11 +149,11 @@ glabel D_8014FED0 glabel D_8014FED8 .double 32767.0 -glabel D_8014FEE0 -.word 0x8011F63C, 0x8011F9FC, 0x8011F9FC, 0x8011F9FC, 0x8011F66C, 0x8011F9FC, 0x8011F9FC, 0x8011F9FC, 0x8011F69C, 0x8011F9FC, 0x8011F9FC, 0x8011F9FC, 0x8011F6CC, 0x8011F9FC, 0x8011F9FC, 0x8011F9FC, 0x8011F6FC, 0x8011F9FC, 0x8011F9FC, 0x8011F9FC, 0x8011F9FC, 0x8011F9FC, 0x8011F9FC, 0x8011F9FC, 0x8011F9FC, 0x8011F72C, 0x8011F9FC, 0x8011F9FC, 0x8011F9FC, 0x8011F9FC, 0x8011F9FC, 0x8011F9FC, 0x8011F9FC, 0x8011F9FC, 0x8011F9FC, 0x8011F9FC, 0x8011F9FC, 0x8011F75C +glabel jtbl_8014FEE0_E65E0 +.word L8011F63C_B5D3C, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F66C_B5D6C, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F69C_B5D9C, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F6CC_B5DCC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F6FC_B5DFC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F72C_B5E2C, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F9FC_B60FC, L8011F75C_B5E5C -glabel D_8014FF78 -.word 0x8011F7BC, 0x8011F908, 0x8011F908, 0x8011F908, 0x8011F7EC, 0x8011F908, 0x8011F908, 0x8011F908, 0x8011F81C, 0x8011F908, 0x8011F908, 0x8011F908, 0x8011F84C, 0x8011F908, 0x8011F908, 0x8011F908, 0x8011F87C, 0x8011F908, 0x8011F908, 0x8011F908, 0x8011F908, 0x8011F908, 0x8011F908, 0x8011F908, 0x8011F908, 0x8011F8AC, 0x8011F908, 0x8011F908, 0x8011F908, 0x8011F908, 0x8011F908, 0x8011F908, 0x8011F908, 0x8011F908, 0x8011F908, 0x8011F908, 0x8011F908, 0x8011F8DC +glabel jtbl_8014FF78_E6678 +.word L8011F7BC_B5EBC, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F7EC_B5EEC, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F81C_B5F1C, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F84C_B5F4C, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F87C_B5F7C, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F8AC_B5FAC, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F908_B6008, L8011F8DC_B5FDC glabel D_80150010 .double 180.0 @@ -167,8 +167,8 @@ glabel D_80150020 glabel D_80150028 .double 32767.0 -glabel D_80150030 -.word 0x80120748, 0x80120768, 0x80120B7C, 0x80120778, 0x80120798, 0x80120870, 0x8012093C, 0x80120B7C, 0x80120A20, 0x80120B7C, 0x801207AC, 0x80120B7C, 0x80120B7C, 0x80120B7C, 0x801207C4, 0x801207E0, 0x80120814, 0x80120AA0, 0x80120750, 0x80120854 +glabel jtbl_80150030_E6730 +.word L80120748_B6E48, L80120768_B6E68, L80120B7C_B727C, L80120778_B6E78, L80120798_B6E98, L80120870_B6F70, L8012093C_B703C, L80120B7C_B727C, L80120A20_B7120, L80120B7C_B727C, L801207AC_B6EAC, L80120B7C_B727C, L80120B7C_B727C, L80120B7C_B727C, L801207C4_B6EC4, L801207E0_B6EE0, L80120814_B6F14, L80120AA0_B71A0, L80120750_B6E50, L80120854_B6F54 glabel D_80150080 .double 180.0 @@ -188,20 +188,20 @@ glabel D_801500A0 glabel D_801500A8 .double 32767.0 -glabel D_801500B0 -.word 0x80120FF0, 0x80121000, 0x80121048, 0x80121058, 0x80121068, 0x80121080, 0x801210A0, 0x801210C4 +glabel jtbl_801500B0_E67B0 +.word L80120FF0_B76F0, L80121000_B7700, L80121048_B7748, L80121058_B7758, L80121068_B7768, L80121080_B7780, L801210A0_B77A0, L801210C4_B77C4 -glabel D_801500D0 -.word 0x8012136C, 0x801218AC, 0x801218AC, 0x8012157C, 0x8012139C, 0x801218AC, 0x801218AC, 0x801218AC, 0x801213CC, 0x801218AC, 0x801218AC, 0x801218AC, 0x801213FC, 0x801218AC, 0x8012154C, 0x801215AC, 0x8012142C, 0x801218AC, 0x8012145C, 0x801215DC, 0x801218AC, 0x8012142C, 0x801218AC, 0x801218AC, 0x801218AC, 0x8012148C, 0x801218AC, 0x801214BC, 0x801218AC, 0x8012148C, 0x801218AC, 0x801214BC, 0x801218AC, 0x8012142C, 0x801218AC, 0x801218AC, 0x801218AC, 0x801214EC, 0x801218AC, 0x8012151C, 0x801218AC, 0x8012157C, 0x801215AC, 0x801215DC, 0x8012160C, 0x00000000 +glabel jtbl_801500D0_E67D0 +.word L8012136C_B7A6C, L801218AC_B7FAC, L801218AC_B7FAC, L8012157C_B7C7C, L8012139C_B7A9C, L801218AC_B7FAC, L801218AC_B7FAC, L801218AC_B7FAC, L801213CC_B7ACC, L801218AC_B7FAC, L801218AC_B7FAC, L801218AC_B7FAC, L801213FC_B7AFC, L801218AC_B7FAC, L8012154C_B7C4C, L801215AC_B7CAC, L8012142C_B7B2C, L801218AC_B7FAC, L8012145C_B7B5C, L801215DC_B7CDC, L801218AC_B7FAC, L8012142C_B7B2C, L801218AC_B7FAC, L801218AC_B7FAC, L801218AC_B7FAC, L8012148C_B7B8C, L801218AC_B7FAC, L801214BC_B7BBC, L801218AC_B7FAC, L8012148C_B7B8C, L801218AC_B7FAC, L801214BC_B7BBC, L801218AC_B7FAC, L8012142C_B7B2C, L801218AC_B7FAC, L801218AC_B7FAC, L801218AC_B7FAC, L801214EC_B7BEC, L801218AC_B7FAC, L8012151C_B7C1C, L801218AC_B7FAC, L8012157C_B7C7C, L801215AC_B7CAC, L801215DC_B7CDC, L8012160C_B7D0C, 0 -glabel D_80150188 -.word 0x8012166C, 0x801217B8, 0x801217B8, 0x801217B8, 0x8012169C, 0x801217B8, 0x801217B8, 0x801217B8, 0x801216CC, 0x801217B8, 0x801217B8, 0x801217B8, 0x801216FC, 0x801217B8, 0x801217B8, 0x801217B8, 0x8012172C, 0x801217B8, 0x801217B8, 0x801217B8, 0x801217B8, 0x801217B8, 0x801217B8, 0x801217B8, 0x801217B8, 0x8012175C, 0x801217B8, 0x801217B8, 0x801217B8, 0x801217B8, 0x801217B8, 0x801217B8, 0x801217B8, 0x801217B8, 0x801217B8, 0x801217B8, 0x801217B8, 0x8012178C +glabel jtbl_80150188_E6888 +.word L8012166C_B7D6C, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L8012169C_B7D9C, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801216CC_B7DCC, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801216FC_B7DFC, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L8012172C_B7E2C, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L8012175C_B7E5C, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L801217B8_B7EB8, L8012178C_B7E8C -glabel D_80150220 -.word 0x80122440, 0x80122980, 0x80122980, 0x80122650, 0x80122470, 0x80122980, 0x80122980, 0x80122980, 0x801224A0, 0x80122980, 0x80122980, 0x80122980, 0x801224D0, 0x80122980, 0x80122620, 0x80122680, 0x80122500, 0x80122980, 0x80122530, 0x801226B0, 0x80122980, 0x80122500, 0x80122980, 0x80122980, 0x80122980, 0x80122560, 0x80122980, 0x80122590, 0x80122980, 0x80122560, 0x80122980, 0x80122590, 0x80122980, 0x80122500, 0x80122980, 0x80122980, 0x80122980, 0x801225C0, 0x80122980, 0x801225F0, 0x80122980, 0x80122650, 0x80122680, 0x801226B0, 0x801226E0, 0x00000000 +glabel jtbl_80150220_E6920 +.word L80122440_B8B40, L80122980_B9080, L80122980_B9080, L80122650_B8D50, L80122470_B8B70, L80122980_B9080, L80122980_B9080, L80122980_B9080, L801224A0_B8BA0, L80122980_B9080, L80122980_B9080, L80122980_B9080, L801224D0_B8BD0, L80122980_B9080, L80122620_B8D20, L80122680_B8D80, L80122500_B8C00, L80122980_B9080, L80122530_B8C30, L801226B0_B8DB0, L80122980_B9080, L80122500_B8C00, L80122980_B9080, L80122980_B9080, L80122980_B9080, L80122560_B8C60, L80122980_B9080, L80122590_B8C90, L80122980_B9080, L80122560_B8C60, L80122980_B9080, L80122590_B8C90, L80122980_B9080, L80122500_B8C00, L80122980_B9080, L80122980_B9080, L80122980_B9080, L801225C0_B8CC0, L80122980_B9080, L801225F0_B8CF0, L80122980_B9080, L80122650_B8D50, L80122680_B8D80, L801226B0_B8DB0, L801226E0_B8DE0, 0 -glabel D_801502D8 -.word 0x80122740, 0x8012288C, 0x8012288C, 0x8012288C, 0x80122770, 0x8012288C, 0x8012288C, 0x8012288C, 0x801227A0, 0x8012288C, 0x8012288C, 0x8012288C, 0x801227D0, 0x8012288C, 0x8012288C, 0x8012288C, 0x80122800, 0x8012288C, 0x8012288C, 0x8012288C, 0x8012288C, 0x8012288C, 0x8012288C, 0x8012288C, 0x8012288C, 0x80122830, 0x8012288C, 0x8012288C, 0x8012288C, 0x8012288C, 0x8012288C, 0x8012288C, 0x8012288C, 0x8012288C, 0x8012288C, 0x8012288C, 0x8012288C, 0x80122860 +glabel jtbl_801502D8_E69D8 +.word L80122740_B8E40, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L80122770_B8E70, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L801227A0_B8EA0, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L801227D0_B8ED0, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L80122800_B8F00, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L80122830_B8F30, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L8012288C_B8F8C, L80122860_B8F60 glabel D_80150370 .double 3.8 @@ -209,20 +209,20 @@ glabel D_80150370 glabel D_80150378 .double 122.0 -glabel D_80150380 -.word 0x80123E98, 0x80124174, 0x80124174, 0x80123E50, 0x80124174, 0x80123F2C, 0x80124174, 0x80124174, 0x80124174, 0x80124174, 0x80124018, 0x80124174, 0x80124174, 0x80124174 +glabel jtbl_80150380_E6A80 +.word L80123E98_BA598, L80124174_BA874, L80124174_BA874, L80123E50_BA550, L80124174_BA874, L80123F2C_BA62C, L80124174_BA874, L80124174_BA874, L80124174_BA874, L80124174_BA874, L80124018_BA718, L80124174_BA874, L80124174_BA874, L80124174_BA874 -glabel D_801503B8 -.word 0x80124600, 0x80124664, 0x801246C4, 0x801246EC, 0x801246EC, 0x801246EC, 0x801246EC, 0x80124704, 0x8012470C, 0x80124714, 0x8012471C, 0x80124730, 0x801247CC, 0x80124B08, 0x801255A4, 0x80124B7C +glabel jtbl_801503B8_E6AB8 +.word L80124600_BAD00, L80124664_BAD64, L801246C4_BADC4, L801246EC_BADEC, L801246EC_BADEC, L801246EC_BADEC, L801246EC_BADEC, L80124704_BAE04, L8012470C_BAE0C, L80124714_BAE14, L8012471C_BAE1C, L80124730_BAE30, L801247CC_BAECC, L80124B08_BB208, L801255A4_BBCA4, L80124B7C_BB27C -glabel D_801503F8 -.word 0x80124818, 0x80124818, 0x80124818, 0x80124818, 0x80124878, 0x801248BC, 0x80124990, 0x80124984, 0x801249B8, 0x80124AA4, 0x80124AA4, 0x80124920, 0x801248BC, 0x80124AE8, 0x801248BC, 0x00000000 +glabel jtbl_801503F8_E6AF8 +.word L80124818_BAF18, L80124818_BAF18, L80124818_BAF18, L80124818_BAF18, L80124878_BAF78, L801248BC_BAFBC, L80124990_BB090, L80124984_BB084, L801249B8_BB0B8, L80124AA4_BB1A4, L80124AA4_BB1A4, L80124920_BB020, L801248BC_BAFBC, L80124AE8_BB1E8, L801248BC_BAFBC, 0 -glabel D_80150438 -.word 0x80124BA4, 0x80124BC4, 0x80125600, 0x80125138, 0x80125148, 0x80124BE8, 0x80124BF8, 0x80124C04, 0x80124C18, 0x80124C38, 0x80124C48, 0x80124C28, 0x80124C54, 0x80124CE8, 0x80124D54, 0x80124D78, 0x80124D94, 0x80124DB4, 0x80124DC4, 0x80124DD4, 0x80124DE4, 0x80124DF4, 0x80124E28, 0x80124E7C, 0x80124F18, 0x80124FA8, 0x80124FCC, 0x80125020, 0x80125040, 0x80125084, 0x801250C4, 0x801250D4, 0x80125118, 0x80125128, 0x80125184, 0x80125194, 0x801251A4, 0x801251B4, 0x801251C4, 0x80125218, 0x80125244, 0x8012553C, 0x80125564, 0x80125594, 0x801254C0, 0x80125600, 0x801254B0, 0x8012546C +glabel jtbl_80150438_E6B38 +.word L80124BA4_BB2A4, L80124BC4_BB2C4, L80125600_BBD00, L80125138_BB838, L80125148_BB848, L80124BE8_BB2E8, L80124BF8_BB2F8, L80124C04_BB304, L80124C18_BB318, L80124C38_BB338, L80124C48_BB348, L80124C28_BB328, L80124C54_BB354, L80124CE8_BB3E8, L80124D54_BB454, L80124D78_BB478, L80124D94_BB494, L80124DB4_BB4B4, L80124DC4_BB4C4, L80124DD4_BB4D4, L80124DE4_BB4E4, L80124DF4_BB4F4, L80124E28_BB528, L80124E7C_BB57C, L80124F18_BB618, L80124FA8_BB6A8, L80124FCC_BB6CC, L80125020_BB720, L80125040_BB740, L80125084_BB784, L801250C4_BB7C4, L801250D4_BB7D4, L80125118_BB818, L80125128_BB828, L80125184_BB884, L80125194_BB894, L801251A4_BB8A4, L801251B4_BB8B4, L801251C4_BB8C4, L80125218_BB918, L80125244_BB944, L8012553C_BBC3C, L80125564_BBC64, L80125594_BBC94, L801254C0_BBBC0, L80125600_BBD00, L801254B0_BBBB0, L8012546C_BBB6C -glabel D_801504F8 -.word 0x80125204, 0x80125204, 0x80125204, 0x80125210, 0x80125600, 0x80125210, 0x80125204, 0x80125210, 0x80125204, 0x80125204, 0x80125204, 0x80125204, 0x80125204, 0x80125204, 0x80125204, 0x00000000 +glabel jtbl_801504F8_E6BF8 +.word L80125204_BB904, L80125204_BB904, L80125204_BB904, L80125210_BB910, L80125600_BBD00, L80125210_BB910, L80125204_BB904, L80125210_BB910, L80125204_BB904, L80125204_BB904, L80125204_BB904, L80125204_BB904, L80125204_BB904, L80125204_BB904, L80125204_BB904, 0 glabel D_80150538 .word 0x801252CC, 0x801253D4, 0x801253D4, 0x80125300, 0x80125300, 0x80125300, 0x80125300, 0x80125314, 0x801253D4, 0x801253D4, 0x801253D4, 0x801253D4, 0x801253D4, 0x801253D4, 0x801253D4, 0x80125320 @@ -233,20 +233,20 @@ glabel D_80150578 glabel D_80150580 .double 0.6 -glabel D_80150588 -.word 0x801260B0, 0x80126080, 0x80126260, 0x80126074, 0x80126074, 0x80126074, 0x80126074, 0x80126294, 0x80126294, 0x80126294, 0x801262E8, 0x80126080, 0x801260F4, 0x8012612C, 0x801262A0, 0x80126158 +glabel jtbl_80150588_E6C88 +.word L801260B0_BC7B0, L80126080_BC780, L80126260_BC960, L80126074_BC774, L80126074_BC774, L80126074_BC774, L80126074_BC774, L80126294_BC994, L80126294_BC994, L80126294_BC994, L801262E8_BC9E8, L80126080_BC780, L801260F4_BC7F4, L8012612C_BC82C, L801262A0_BC9A0, L80126158_BC858 -glabel D_801505C8 -.word 0x801262E8, 0x801262E8, 0x801262E8, 0x801262E8, 0x80126124, 0x801262E8, 0x801262E8, 0x801262E8, 0x80126260, 0x801262E8, 0x801262E8, 0x00000000 +glabel jtbl_801505C8_E6CC8 +.word L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L80126124_BC824, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L80126260_BC960, L801262E8_BC9E8, L801262E8_BC9E8, 0 -glabel D_801505F8 -.word 0x80126184, 0x801261D8, 0x801261D8, 0x801262E8, 0x801261C4, 0x80126260, 0x801262E8, 0x801262E8, 0x801262E8, 0x801262E8, 0x801262E8, 0x80126260, 0x80126260, 0x801261E0, 0x80126224, 0x801261A4, 0x801261A4, 0x80126260, 0x80126260, 0x80126260, 0x80126260, 0x80126260, 0x801261A0, 0x80126260, 0x8012619C, 0x80126260, 0x801261A0, 0x801261A4, 0x80126260, 0x801261D8, 0x80126260, 0x80126260, 0x80126260, 0x80126260, 0x801262E8, 0x801262E8, 0x801262E8, 0x801262E8, 0x80126234, 0x80126260, 0x80126268, 0x801261AC, 0x80126260, 0x801262E8, 0x80126198, 0x801261D8, 0x801261D8, 0x80126260 +glabel jtbl_801505F8_E6CF8 +.word L80126184_BC884, L801261D8_BC8D8, L801261D8_BC8D8, L801262E8_BC9E8, L801261C4_BC8C4, L80126260_BC960, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L80126260_BC960, L80126260_BC960, L801261E0_BC8E0, L80126224_BC924, L801261A4_BC8A4, L801261A4_BC8A4, L80126260_BC960, L80126260_BC960, L80126260_BC960, L80126260_BC960, L80126260_BC960, L801261A0_BC8A0, L80126260_BC960, L8012619C_BC89C, L80126260_BC960, L801261A0_BC8A0, L801261A4_BC8A4, L80126260_BC960, L801261D8_BC8D8, L80126260_BC960, L80126260_BC960, L80126260_BC960, L80126260_BC960, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L80126234_BC934, L80126260_BC960, L80126268_BC968, L801261AC_BC8AC, L80126260_BC960, L801262E8_BC9E8, L80126198_BC898, L801261D8_BC8D8, L801261D8_BC8D8, L80126260_BC960 -glabel D_801506B8 -.word 0x801262E8, 0x801262E8, 0x801262E8, 0x80126260, 0x801262E8, 0x80126260, 0x801262E8, 0x80126260, 0x801262E8, 0x801262E8, 0x801262E8, 0x801262E8, 0x801262E8, 0x801262E8, 0x801262E8, 0x00000000 +glabel jtbl_801506B8_E6DB8 +.word L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L80126260_BC960, L801262E8_BC9E8, L80126260_BC960, L801262E8_BC9E8, L80126260_BC960, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, L801262E8_BC9E8, 0 -glabel D_801506F8 -.word 0x80126874, 0x80126884, 0x801268D8, 0x80126900, 0x8012698C, 0x00000000 +glabel jtbl_801506F8_E6DF8 +.word L80126874_BCF74, L80126884_BCF84, L801268D8_BCFD8, L80126900_BD000, L8012698C_BD08C, 0 glabel D_80150710 .double 0.2 @@ -260,11 +260,11 @@ glabel D_80150720 glabel D_80150728 .double 14.4 -glabel D_80150730 -.word 0x80127FAC, 0x8012803C, 0x8012803C, 0x8012803C, 0x8012803C, 0x80128068, 0x80128068, 0x80128068, 0x801280A0, 0x8012A6C4, 0x80129ADC, 0x80129BF8, 0x8012AB5C, 0x8012AB5C, 0x8012AB5C, 0x80129C04 +glabel jtbl_80150730_E6E30 +.word L80127FAC_BE6AC, L8012803C_BE73C, L8012803C_BE73C, L8012803C_BE73C, L8012803C_BE73C, L80128068_BE768, L80128068_BE768, L80128068_BE768, L801280A0_BE7A0, L8012A6C4_C0DC4, L80129ADC_C01DC, L80129BF8_C02F8, L8012AB5C_C125C, L8012AB5C_C125C, L8012AB5C_C125C, L80129C04_C0304 -glabel D_80150770 -.word 0x801280DC, 0x801280DC, 0x801280DC, 0x801280DC, 0x8012897C, 0x80128D28, 0x80128F34, 0x80128F34, 0x801296EC, 0x80129958, 0x80129958, 0x80128D28, 0x80128D28, 0x80129A40, 0x80128D28, 0x00000000 +glabel jtbl_80150770_E6E70 +.word L801280DC_BE7DC, L801280DC_BE7DC, L801280DC_BE7DC, L801280DC_BE7DC, L8012897C_BF07C, L80128D28_BF428, L80128F34_BF634, L80128F34_BF634, L801296EC_BFDEC, L80129958_C0058, L80129958_C0058, L80128D28_BF428, L80128D28_BF428, L80129A40_C0140, L80128D28_BF428, 0 glabel D_801507B0 .double 0.35 @@ -284,8 +284,8 @@ glabel D_801507D0 glabel D_801507D8 .double 0.6 -glabel D_801507E0 -.word 0x80129C44, 0x80129C7C, 0x8012BF70, 0x8012BF70, 0x80129CA8, 0x80129CE0, 0x80129D00, 0x80129E38, 0x80129E84, 0x80129EBC, 0x80129EE0, 0x80129F14, 0x80129F40, 0x8012BF70, 0x80129F74, 0x8012A0C8, 0x8012A21C, 0x8012A350, 0x8012A54C, 0x8012AB44, 0x8012A564, 0x8012A5E0, 0x8012A634, 0x8012A654, 0x8012A664, 0x8012A68C, 0x8012A6B4, 0x8012A6DC, 0x8012A6FC, 0x8012A960, 0x8012AAD8, 0x00000000 +glabel jtbl_801507E0_E6EE0 +.word L80129C44_C0344, L80129C7C_C037C, L8012BF70_C2670, L8012BF70_C2670, L80129CA8_C03A8, L80129CE0_C03E0, L80129D00_C0400, L80129E38_C0538, L80129E84_C0584, L80129EBC_C05BC, L80129EE0_C05E0, L80129F14_C0614, L80129F40_C0640, L8012BF70_C2670, L80129F74_C0674, L8012A0C8_C07C8, L8012A21C_C091C, L8012A350_C0A50, L8012A54C_C0C4C, L8012AB44_C1244, L8012A564_C0C64, L8012A5E0_C0CE0, L8012A634_C0D34, L8012A654_C0D54, L8012A664_C0D64, L8012A68C_C0D8C, L8012A6B4_C0DB4, L8012A6DC_C0DDC, L8012A6FC_C0DFC, L8012A960_C1060, L8012AAD8_C11D8, 0 glabel D_80150860 .double 0.7 @@ -296,11 +296,11 @@ glabel D_80150868 glabel D_80150870 .double 0.7 -glabel D_80150878 -.word 0x8012A734, 0x8012A74C, 0x8012A764, 0x8012A7AC, 0x8012BF70, 0x8012A834, 0x8012A864, 0x8012A87C, 0x8012A8AC, 0x8012A8C4, 0x8012A8DC, 0x8012A8F4, 0x8012A90C, 0x8012A924, 0x8012A93C, 0x00000000 +glabel jtbl_80150878_E6F78 +.word L8012A734_C0E34, L8012A74C_C0E4C, L8012A764_C0E64, L8012A7AC_C0EAC, L8012BF70_C2670, L8012A834_C0F34, L8012A864_C0F64, L8012A87C_C0F7C, L8012A8AC_C0FAC, L8012A8C4_C0FC4, L8012A8DC_C0FDC, L8012A8F4_C0FF4, L8012A90C_C100C, L8012A924_C1024, L8012A93C_C103C, 0 -glabel D_801508B8 -.word 0x8012A998, 0x8012A9AC, 0x8012A9C0, 0x8012A9D4, 0x8012AB44, 0x8012A9EC, 0x8012AA00, 0x8012AA10, 0x8012AA24, 0x8012AA38, 0x8012AA60, 0x8012AA74, 0x8012AA88, 0x8012AA9C, 0x8012AAB8, 0x00000000 +glabel jtbl_801508B8_E6FB8 +.word L8012A998_C1098, L8012A9AC_C10AC, L8012A9C0_C10C0, L8012A9D4_C10D4, L8012AB44_C1244, L8012A9EC_C10EC, L8012AA00_C1100, L8012AA10_C1110, L8012AA24_C1124, L8012AA38_C1138, L8012AA60_C1160, L8012AA74_C1174, L8012AA88_C1188, L8012AA9C_C119C, L8012AAB8_C11B8, 0 glabel D_801508F8 .double 0.35 @@ -341,8 +341,8 @@ glabel D_80150950 glabel D_80150958 .double 0.3 -glabel D_80150960 -.word 0x8012BC6C, 0x8012BC64, 0x8012BC64, 0x8012BC64, 0x8012BC64, 0x8012BC64, 0x8012BC64, 0x8012BC6C, 0x8012BC64, 0x8012BC64, 0x8012BC30, 0x8012BC64, 0x8012BC64, 0x8012BC64, 0x8012BC64, 0x8012BC64, 0x8012BC6C, 0x8012BC6C, 0x8012BC6C, 0x8012BC6C, 0x8012BC6C, 0x8012BC64, 0x8012BC64, 0x8012BC64, 0x8012BC64, 0x8012BC64, 0x8012BC64, 0x8012BC64, 0x8012BC64, 0x8012BC64, 0x8012BC64, 0x8012BC64, 0x8012BC3C, 0x8012BC64, 0x8012BC44, 0x8012BC50, 0x8012BC64, 0x8012BC58 +glabel jtbl_80150960_E7060 +.word L8012BC6C_C236C, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC6C_C236C, L8012BC64_C2364, L8012BC64_C2364, L8012BC30_C2330, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC6C_C236C, L8012BC6C_C236C, L8012BC6C_C236C, L8012BC6C_C236C, L8012BC6C_C236C, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC64_C2364, L8012BC3C_C233C, L8012BC64_C2364, L8012BC44_C2344, L8012BC50_C2350, L8012BC64_C2364, L8012BC58_C2358 glabel D_801509F8 .double 255.0 @@ -377,50 +377,50 @@ glabel D_80150A48 glabel D_80150A50 .double 0.01, 0.0 -glabel D_80150A60 -.word 0x80130ABC, 0x80130A30, 0x80130A50, 0x80130A60, 0x80130AB4, 0x80130AC4, 0x80130AC4, 0x80130A70 +glabel jtbl_80150A60_E7160 +.word L80130ABC_C71BC, L80130A30_C7130, L80130A50_C7150, L80130A60_C7160, L80130AB4_C71B4, L80130AC4_C71C4, L80130AC4_C71C4, L80130A70_C7170 -glabel D_80150A80 -.word 0x801313BC, 0x801311B8, 0x80131188, 0x80131188, 0x801311B0, 0x00000000 +glabel jtbl_80150A80_E7180 +.word L801313BC_C7ABC, L801311B8_C78B8, L80131188_C7888, L80131188_C7888, L801311B0_C78B0, 0 -glabel D_80150A98 -.word 0x80131468, 0x80131478, 0x80131478, 0x80131478, 0x80131478, 0x80131468, 0x80131468, 0x80131468, 0x80131468, 0x80131478, 0x80131468, 0x80131468, 0x80131478, 0x80131468, 0x80131468, 0x80131468, 0x80131478, 0x80131468, 0x80131468, 0x80131478, 0x80131478, 0x80131468, 0x80131468, 0x00000000 +glabel jtbl_80150A98_E7198 +.word L80131468_C7B68, L80131478_C7B78, L80131478_C7B78, L80131478_C7B78, L80131478_C7B78, L80131468_C7B68, L80131468_C7B68, L80131468_C7B68, L80131468_C7B68, L80131478_C7B78, L80131468_C7B68, L80131468_C7B68, L80131478_C7B78, L80131468_C7B68, L80131468_C7B68, L80131468_C7B68, L80131478_C7B78, L80131468_C7B68, L80131468_C7B68, L80131478_C7B78, L80131478_C7B78, L80131468_C7B68, L80131468_C7B68, 0 -glabel D_80150AF8 -.word 0x80131620, 0x8013162C, 0x80131638, 0x8013162C, 0x80131644, 0x80131660, 0x80131674, 0x80131688, 0x8013169C, 0x801316B0, 0x801316C4, 0x801316E0, 0x80131708, 0x80131714, 0x80131728, 0x8013173C, 0x80131750, 0x80131768, 0x80131784, 0x801317A0, 0x801318B4, 0x801318C4, 0x801318E4, 0x801317BC, 0x801317E8, 0x8013181C, 0x80131850, 0x80131878 +glabel jtbl_80150AF8_E71F8 +.word L80131620_C7D20, L8013162C_C7D2C, L80131638_C7D38, L8013162C_C7D2C, L80131644_C7D44, L80131660_C7D60, L80131674_C7D74, L80131688_C7D88, L8013169C_C7D9C, L801316B0_C7DB0, L801316C4_C7DC4, L801316E0_C7DE0, L80131708_C7E08, L80131714_C7E14, L80131728_C7E28, L8013173C_C7E3C, L80131750_C7E50, L80131768_C7E68, L80131784_C7E84, L801317A0_C7EA0, L801318B4_C7FB4, L801318C4_C7FC4, L801318E4_C7FE4, L801317BC_C7EBC, L801317E8_C7EE8, L8013181C_C7F1C, L80131850_C7F50, L80131878_C7F78 -glabel D_80150B68 -.word 0x8013192C, 0x80131A0C, 0x80131A0C, 0x8013192C, 0x80131A0C, 0x80131A0C, 0x80131A0C, 0x80131A0C, 0x80131A0C, 0x80131A0C, 0x80131A0C, 0x80131A0C, 0x8013192C, 0x80131A0C, 0x80131A0C, 0x80131A0C, 0x8013192C, 0x80131A0C, 0x80131A0C, 0x80131A0C, 0x8013192C, 0x00000000 +glabel jtbl_80150B68_E7268 +.word L8013192C_C802C, L80131A0C_C810C, L80131A0C_C810C, L8013192C_C802C, L80131A0C_C810C, L80131A0C_C810C, L80131A0C_C810C, L80131A0C_C810C, L80131A0C_C810C, L80131A0C_C810C, L80131A0C_C810C, L80131A0C_C810C, L8013192C_C802C, L80131A0C_C810C, L80131A0C_C810C, L80131A0C_C810C, L8013192C_C802C, L80131A0C_C810C, L80131A0C_C810C, L80131A0C_C810C, L8013192C_C802C, 0 glabel D_80150BC0 .word 0x80131E38, 0x80131E44, 0x80131EC4, 0x80131E98, 0x80131EA4, 0x00000000 -glabel D_80150BD8 -.word 0x80131FD8, 0x80131FE8, 0x80131FE8, 0x80131FF8, 0x80132010, 0x80132010, 0x80132010, 0x80132010, 0x80132010, 0x80132010, 0x80132010, 0x80132010, 0x80131FF8, 0x80132010, 0x80132010, 0x80132010, 0x80131FF8, 0x80132010, 0x80132010, 0x80132010, 0x80131FF8, 0x80132010, 0x80132010, 0x80131FF8, 0x80132010, 0x80132010, 0x80132010, 0x80132010, 0x80132008, 0x00000000 +glabel jtbl_80150BD8_E72D8 +.word L80131FD8_C86D8, L80131FE8_C86E8, L80131FE8_C86E8, L80131FF8_C86F8, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80131FF8_C86F8, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80131FF8_C86F8, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80131FF8_C86F8, L80132010_C8710, L80132010_C8710, L80131FF8_C86F8, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80132010_C8710, L80132008_C8708, 0 -glabel D_80150C50 -.word 0x8013204C, 0x80132140, 0x80132140, 0x8013204C, 0x80132140, 0x80132140, 0x80132140, 0x80132140, 0x80132140, 0x80132140, 0x80132140, 0x80132140, 0x8013204C, 0x80132140, 0x80132140, 0x80132140, 0x8013204C, 0x80132140, 0x80132140, 0x80132140, 0x80132140, 0x80132140, 0x80132140, 0x80132140, 0x80132140, 0x80132140, 0x80132140, 0x80132140, 0x8013204C, 0x00000000 +glabel jtbl_80150C50_E7350 +.word L8013204C_C874C, L80132140_C8840, L80132140_C8840, L8013204C_C874C, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L8013204C_C874C, L80132140_C8840, L80132140_C8840, L80132140_C8840, L8013204C_C874C, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L80132140_C8840, L8013204C_C874C, 0 glabel D_80150CC8 .word 0x80132E08, 0x80132E18, 0x80132E18, 0x80132E28, 0x80132E30, 0x80132E30, 0x80132E30, 0x80132E30, 0x80132E30, 0x80132E30, 0x80132E30, 0x80132E30, 0x80132E28, 0x80132E30, 0x80132E30, 0x80132E30, 0x80132E28, 0x80132E30, 0x80132E30, 0x80132E30, 0x80132E28, 0x80132E30, 0x80132E30, 0x80132E28 -glabel D_80150D28 -.word 0x801339B0, 0x801339B8, 0x801339B8, 0x801339B0, 0x801339B8, 0x801339B8, 0x801339B8, 0x801339B8, 0x801339B8, 0x801339B8, 0x801339B8, 0x801339B8, 0x801339B0, 0x801339B8, 0x801339B8, 0x801339B8, 0x801339B0, 0x801339B8, 0x801339B8, 0x801339B8, 0x801339B0, 0x801339B8, 0x801339B8, 0x801339B8, 0x801339B8, 0x801339B8, 0x801339B8, 0x801339B8, 0x801339B0, 0x00000000 +glabel jtbl_80150D28_E7428 +.word L801339B0_CA0B0, L801339B8_CA0B8, L801339B8_CA0B8, L801339B0_CA0B0, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B0_CA0B0, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B0_CA0B0, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B0_CA0B0, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B8_CA0B8, L801339B0_CA0B0, 0 -glabel D_80150DA0 -.word 0x80133A48, 0x80133A50, 0x80133A50, 0x80133A48, 0x80133A50, 0x80133A50, 0x80133A50, 0x80133A50, 0x80133A50, 0x80133A50, 0x80133A50, 0x80133A50, 0x80133A48, 0x80133A50, 0x80133A50, 0x80133A50, 0x80133A48, 0x80133A50, 0x80133A50, 0x80133A50, 0x80133A48, 0x80133A50, 0x80133A50, 0x80133A50, 0x80133A50, 0x80133A50, 0x80133A50, 0x80133A50, 0x80133A48, 0x00000000 +glabel jtbl_80150DA0_E74A0 +.word L80133A48_CA148, L80133A50_CA150, L80133A50_CA150, L80133A48_CA148, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A48_CA148, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A48_CA148, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A48_CA148, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A50_CA150, L80133A48_CA148, 0 glabel D_80150E18 .double 0.6 -glabel D_80150E20 -.word 0x801357A8, 0x80135B24, 0x80135E48, 0x80135E78, 0x80135F08, 0x80135F78, 0x8013637C, 0x8013637C, 0x80135F94, 0x80135FE8, 0x8013610C, 0x8013614C, 0x8013629C, 0x801362D0, 0x80136310, 0x00000000 +glabel jtbl_80150E20_E7520 +.word L801357A8_CBEA8, L80135B24_CC224, L80135E48_CC548, L80135E78_CC578, L80135F08_CC608, L80135F78_CC678, L8013637C_CCA7C, L8013637C_CCA7C, L80135F94_CC694, L80135FE8_CC6E8, L8013610C_CC80C, L8013614C_CC84C, L8013629C_CC99C, L801362D0_CC9D0, L80136310_CCA10, 0 -glabel D_80150E60 -.word 0x801367A4, 0x801367A4, 0x801369B4, 0x801369B4, 0x801369B4, 0x801369B4, 0x801369B4, 0x801369B4, 0x801367A4, 0x801367A4, 0x801369B4, 0x8013694C, 0x8013694C, 0x00000000, 0x00000000, 0x00000000 +glabel jtbl_80150E60_E7560 +.word L801367A4_CCEA4, L801367A4_CCEA4, L801369B4_CD0B4, L801369B4_CD0B4, L801369B4_CD0B4, L801369B4_CD0B4, L801369B4_CD0B4, L801369B4_CD0B4, L801367A4_CCEA4, L801367A4_CCEA4, L801369B4_CD0B4, L8013694C_CD04C, L8013694C_CD04C, 0, 0, 0 -glabel D_80150EA0 -.word 0x8013722C, 0x80137170, 0x80136FE8, 0x80137098, 0x801371D0, 0x8013704C, 0x801370FC, 0x8013755C, 0x80137954, 0x80137C8C, 0x80137C9C, 0x80137CBC, 0x80137D00, 0x80137D00 +glabel jtbl_80150EA0_E75A0 +.word L8013722C_CD92C, L80137170_CD870, L80136FE8_CD6E8, L80137098_CD798, L801371D0_CD8D0, L8013704C_CD74C, L801370FC_CD7FC, L8013755C_CDC5C, L80137954_CE054, L80137C8C_CE38C, L80137C9C_CE39C, L80137CBC_CE3BC, L80137D00_CE400, L80137D00_CE400 glabel D_80150ED8 .double 0.8 @@ -431,11 +431,11 @@ glabel D_80150EE0 glabel D_80150EE8 .double 0.8 -glabel D_80150EF0 -.word 0x80138358, 0x80138310, 0x801383A4, 0x80138318, 0x8013838C, 0x8013838C, 0x8013834C, 0x80138360, 0x801383B0, 0x801383C4, 0x801383D0, 0x80138380, 0x801383E8, 0x80138410, 0x80138398, 0x80138380, 0x80138428, 0x00000000 +glabel jtbl_80150EF0_E75F0 +.word L80138358_CEA58, L80138310_CEA10, L801383A4_CEAA4, L80138318_CEA18, L8013838C_CEA8C, L8013838C_CEA8C, L8013834C_CEA4C, L80138360_CEA60, L801383B0_CEAB0, L801383C4_CEAC4, L801383D0_CEAD0, L80138380_CEA80, L801383E8_CEAE8, L80138410_CEB10, L80138398_CEA98, L80138380_CEA80, L80138428_CEB28, 0 -glabel D_80150F38 -.word 0x80138658, 0x80138658, 0x80138640, 0x80138624, 0x8013864C, 0x8013864C, 0x80138658, 0x8013864C, 0x80138660, 0x8013864C, 0x8013864C, 0x80138668, 0x80138674, 0x80138658, 0x80138658, 0x80138660, 0x80138680, 0x00000000 +glabel jtbl_80150F38_E7638 +.word L80138658_CED58, L80138658_CED58, L80138640_CED40, L80138624_CED24, L8013864C_CED4C, L8013864C_CED4C, L80138658_CED58, L8013864C_CED4C, L80138660_CED60, L8013864C_CED4C, L8013864C_CED4C, L80138668_CED68, L80138674_CED74, L80138658_CED58, L80138658_CED58, L80138660_CED60, L80138680_CED80, 0 glabel D_80150F80 .double 0.14 @@ -452,29 +452,29 @@ glabel D_80150F98 glabel D_80150FA0 .double 0.09, 0.0 -glabel D_80150FB0 -.word 0x8013AB0C, 0x8013AB5C, 0x8013AB70, 0x8013AB0C, 0x8013AC14, 0x8013ABDC, 0x8013AC14, 0x8013AC14, 0x8013AC14, 0x8013AC14, 0x8013AC14, 0x8013AC14, 0x8013AC14, 0x8013AC14, 0x8013AC14, 0x8013ABB0, 0x8013ABB0, 0x8013AB84 +glabel jtbl_80150FB0_E76B0 +.word L8013AB0C_D120C, L8013AB5C_D125C, L8013AB70_D1270, L8013AB0C_D120C, L8013AC14_D1314, L8013ABDC_D12DC, L8013AC14_D1314, L8013AC14_D1314, L8013AC14_D1314, L8013AC14_D1314, L8013AC14_D1314, L8013AC14_D1314, L8013AC14_D1314, L8013AC14_D1314, L8013AC14_D1314, L8013ABB0_D12B0, L8013ABB0_D12B0, L8013AB84_D1284 -glabel D_80150FF8 -.word 0x8013ACD8, 0x8013ACE4, 0x8013AD08, 0x8013AD30, 0x8013AD30, 0x8013AD30, 0x8013ADAC, 0x8013ADAC, 0x8013ADE4, 0x8013AE58, 0x8013AECC, 0x8013AED8, 0x8013AEE4, 0x8013AEE4 +glabel jtbl_80150FF8_E76F8 +.word L8013ACD8_D13D8, L8013ACE4_D13E4, L8013AD08_D1408, L8013AD30_D1430, L8013AD30_D1430, L8013AD30_D1430, L8013ADAC_D14AC, L8013ADAC_D14AC, L8013ADE4_D14E4, L8013AE58_D1558, L8013AECC_D15CC, L8013AED8_D15D8, L8013AEE4_D15E4, L8013AEE4_D15E4 glabel D_80151030 .double 255.0 -glabel D_80151038 -.word 0x8013B160, 0x8013B140, 0x8013B150, 0x8013B120, 0x8013B160, 0x00000000 +glabel jtbl_80151038_E7738 +.word L8013B160_D1860, L8013B140_D1840, L8013B150_D1850, L8013B120_D1820, L8013B160_D1860, 0 glabel D_80151050 .double 255.0 -glabel D_80151058 -.word 0x8013B350, 0x8013B358, 0x8013B364, 0x8013B364, 0x8013B358, 0x8013B364, 0x8013B364, 0x8013B364, 0x8013B364, 0x8013B360, 0x8013B364, 0x8013B350 +glabel jtbl_80151058_E7758 +.word L8013B350_D1A50, L8013B358_D1A58, L8013B364_D1A64, L8013B364_D1A64, L8013B358_D1A58, L8013B364_D1A64, L8013B364_D1A64, L8013B364_D1A64, L8013B364_D1A64, L8013B360_D1A60, L8013B364_D1A64, L8013B350_D1A50 -glabel D_80151088 -.word 0x8013BAEC, 0x8013B484, 0x8013B4B4, 0x8013B500, 0x8013B56C, 0x8013B57C, 0x8013B5E8, 0x8013B664, 0x8013B678, 0x8013B650, 0x8013B68C, 0x8013B6F8, 0x8013B89C, 0x8013BA84, 0x8013BAEC, 0x8013BB20, 0x8013BAEC, 0x00000000 +glabel jtbl_80151088_E7788 +.word L8013BAEC_D21EC, L8013B484_D1B84, L8013B4B4_D1BB4, L8013B500_D1C00, L8013B56C_D1C6C, L8013B57C_D1C7C, L8013B5E8_D1CE8, L8013B664_D1D64, L8013B678_D1D78, L8013B650_D1D50, L8013B68C_D1D8C, L8013B6F8_D1DF8, L8013B89C_D1F9C, L8013BA84_D2184, L8013BAEC_D21EC, L8013BB20_D2220, L8013BAEC_D21EC, 0 -glabel D_801510D0 -.word 0x8013BB8C, 0x8013BBA0, 0x8013BBB4, 0x8013BBA0, 0x8013BBC8, 0x00000000 +glabel jtbl_801510D0_E77D0 +.word L8013BB8C_D228C, L8013BBA0_D22A0, L8013BBB4_D22B4, L8013BBA0_D22A0, L8013BBC8_D22C8, 0 glabel D_801510E8 .double 0.01 @@ -509,14 +509,14 @@ glabel D_80151130 glabel D_80151138 .double 255.0 -glabel D_80151140 -.word 0x8013F6DC, 0x8013F418, 0x8013F3B4, 0x8013F38C, 0x8013F38C, 0x8013F3BC, 0x8013F3C8, 0x8013F3C8, 0x8013F38C, 0x8013F38C, 0x8013F410, 0x8013F410, 0x8013F418, 0x8013F430, 0x8013F410, 0x8013F410, 0x8013F418, 0x8013F38C, 0x8013F38C, 0x8013F3DC, 0x8013F418, 0x8013F410, 0x8013F38C, 0x8013F410, 0x8013F410, 0x8013F410, 0x8013F410, 0x8013F418 +glabel jtbl_80151140_E7840 +.word L8013F6DC_D5DDC, L8013F418_D5B18, L8013F3B4_D5AB4, L8013F38C_D5A8C, L8013F38C_D5A8C, L8013F3BC_D5ABC, L8013F3C8_D5AC8, L8013F3C8_D5AC8, L8013F38C_D5A8C, L8013F38C_D5A8C, L8013F410_D5B10, L8013F410_D5B10, L8013F418_D5B18, L8013F430_D5B30, L8013F410_D5B10, L8013F410_D5B10, L8013F418_D5B18, L8013F38C_D5A8C, L8013F38C_D5A8C, L8013F3DC_D5ADC, L8013F418_D5B18, L8013F410_D5B10, L8013F38C_D5A8C, L8013F410_D5B10, L8013F410_D5B10, L8013F410_D5B10, L8013F410_D5B10, L8013F418_D5B18 -glabel D_801511B0 -.word 0x80141750, 0x80141808, 0x80141920, 0x80141C6C, 0x80141C7C, 0x80141CBC, 0x80141CFC, 0x80141DDC, 0x801417A0, 0x801417B8, 0x80141E28, 0x80141E48, 0x80141E74, 0x80141A54, 0x80141EA8, 0x80142080, 0x801420BC, 0x80141768, 0x80141784, 0x801420E4, 0x80141C8C, 0x80142144, 0x801421F0, 0x80142174, 0x801417CC, 0x801417EC, 0x801421A4, 0x801421C0 +glabel jtbl_801511B0_E78B0 +.word L80141750_D7E50, L80141808_D7F08, L80141920_D8020, L80141C6C_D836C, L80141C7C_D837C, L80141CBC_D83BC, L80141CFC_D83FC, L80141DDC_D84DC, L801417A0_D7EA0, L801417B8_D7EB8, L80141E28_D8528, L80141E48_D8548, L80141E74_D8574, L80141A54_D8154, L80141EA8_D85A8, L80142080_D8780, L801420BC_D87BC, L80141768_D7E68, L80141784_D7E84, L801420E4_D87E4, L80141C8C_D838C, L80142144_D8844, L801421F0_D88F0, L80142174_D8874, L801417CC_D7ECC, L801417EC_D7EEC, L801421A4_D88A4, L801421C0_D88C0 -glabel D_80151220 -.word 0x80146030, 0x801461A0, 0x80146044, 0x8014607C, 0x801461A0, 0x00000000, 0x00000000, 0x00000000 +glabel jtbl_80151220_E7920 +.word L80146030_DC730, L801461A0_DC8A0, L80146044_DC744, L8014607C_DC77C, L801461A0_DC8A0, 0, 0, 0 glabel D_80151240 .double 0.01 @@ -548,5 +548,5 @@ glabel D_80151280 glabel D_80151288 .double 360.0 -glabel D_80151290 -.word 0x8014A7A0, 0x8014A5AC, 0x8014A64C, 0x8014A68C, 0x8014A644, 0x8014A698, 0x00000000, 0x00000000 +glabel jtbl_80151290_E7990 +.word L8014A7A0_E0EA0, L8014A5AC_E0CAC, L8014A64C_E0D4C, L8014A68C_E0D8C, L8014A644_E0D44, L8014A698_E0D98, 0, 0 diff --git a/asm/data/si.rodata.s b/asm/data/si.rodata.s index b5846dc34e..99ea9c32ce 100644 --- a/asm/data/si.rodata.s +++ b/asm/data/si.rodata.s @@ -71,8 +71,8 @@ glabel D_802D9F00 glabel D_802D9F10 .ascii " [%d]\0\0\0" -glabel D_802D9F20 -.word 0x802C743C, 0x802C7A54, 0x802C747C, 0x802C748C, 0x802C749C, 0x802C74AC, 0x802C74BC, 0x802C74CC, 0x802C74DC, 0x802C74EC, 0x802C74FC, 0x802C750C, 0x802C751C, 0x802C752C, 0x802C753C, 0x802C754C, 0x802C755C, 0x802C756C, 0x802C757C, 0x802C758C, 0x802C759C, 0x802C75AC, 0x802C75BC, 0x802C75CC, 0x802C75DC, 0x802C75FC, 0x802C75EC, 0x802C760C, 0x802C761C, 0x802C763C, 0x802C765C, 0x802C766C, 0x802C764C, 0x802C767C, 0x802C762C, 0x802C768C, 0x802C769C, 0x802C76AC, 0x802C76BC, 0x802C76CC, 0x802C76DC, 0x802C76EC, 0x802C76FC, 0x802C770C, 0x802C771C, 0x802C772C, 0x802C773C, 0x802C774C, 0x802C775C, 0x802C776C, 0x802C777C, 0x802C778C, 0x802C779C, 0x802C77AC, 0x802C77BC, 0x802C77CC, 0x802C77DC, 0x802C77EC, 0x802C77FC, 0x802C780C, 0x802C781C, 0x802C782C, 0x802C783C, 0x802C785C, 0x802C786C, 0x802C787C, 0x802C788C, 0x802C789C, 0x802C78AC, 0x802C78BC, 0x802C78CC, 0x802C78DC, 0x802C78EC, 0x802C784C, 0x802C792C, 0x802C78FC, 0x802C790C, 0x802C791C, 0x802C793C, 0x802C794C, 0x802C795C, 0x802C796C, 0x802C797C, 0x802C798C, 0x802C799C, 0x802C79AC, 0x802C79BC, 0x802C79CC, 0x802C79DC, 0x802C79EC, 0x802C79FC, 0x802C7A0C, 0x802C7A1C, 0x802C7A2C, 0x802C7A3C, 0x00000000 +glabel jtbl_802D9F20_FE8D0 +.word L802C743C_EBDEC, L802C7A54_EC404, L802C747C_EBE2C, L802C748C_EBE3C, L802C749C_EBE4C, L802C74AC_EBE5C, L802C74BC_EBE6C, L802C74CC_EBE7C, L802C74DC_EBE8C, L802C74EC_EBE9C, L802C74FC_EBEAC, L802C750C_EBEBC, L802C751C_EBECC, L802C752C_EBEDC, L802C753C_EBEEC, L802C754C_EBEFC, L802C755C_EBF0C, L802C756C_EBF1C, L802C757C_EBF2C, L802C758C_EBF3C, L802C759C_EBF4C, L802C75AC_EBF5C, L802C75BC_EBF6C, L802C75CC_EBF7C, L802C75DC_EBF8C, L802C75FC_EBFAC, L802C75EC_EBF9C, L802C760C_EBFBC, L802C761C_EBFCC, L802C763C_EBFEC, L802C765C_EC00C, L802C766C_EC01C, L802C764C_EBFFC, L802C767C_EC02C, L802C762C_EBFDC, L802C768C_EC03C, L802C769C_EC04C, L802C76AC_EC05C, L802C76BC_EC06C, L802C76CC_EC07C, L802C76DC_EC08C, L802C76EC_EC09C, L802C76FC_EC0AC, L802C770C_EC0BC, L802C771C_EC0CC, L802C772C_EC0DC, L802C773C_EC0EC, L802C774C_EC0FC, L802C775C_EC10C, L802C776C_EC11C, L802C777C_EC12C, L802C778C_EC13C, L802C779C_EC14C, L802C77AC_EC15C, L802C77BC_EC16C, L802C77CC_EC17C, L802C77DC_EC18C, L802C77EC_EC19C, L802C77FC_EC1AC, L802C780C_EC1BC, L802C781C_EC1CC, L802C782C_EC1DC, L802C783C_EC1EC, L802C785C_EC20C, L802C786C_EC21C, L802C787C_EC22C, L802C788C_EC23C, L802C789C_EC24C, L802C78AC_EC25C, L802C78BC_EC26C, L802C78CC_EC27C, L802C78DC_EC28C, L802C78EC_EC29C, L802C784C_EC1FC, L802C792C_EC2DC, L802C78FC_EC2AC, L802C790C_EC2BC, L802C791C_EC2CC, L802C793C_EC2EC, L802C794C_EC2FC, L802C795C_EC30C, L802C796C_EC31C, L802C797C_EC32C, L802C798C_EC33C, L802C799C_EC34C, L802C79AC_EC35C, L802C79BC_EC36C, L802C79CC_EC37C, L802C79DC_EC38C, L802C79EC_EC39C, L802C79FC_EC3AC, L802C7A0C_EC3BC, L802C7A1C_EC3CC, L802C7A2C_EC3DC, L802C7A3C_EC3EC, 0 glabel D_802DA0A0 .word 0x802C8944, 0x802C890C, 0x802C890C, 0x802C890C, 0x802C890C, 0x802C890C, 0x802C890C, 0x802C890C, 0x802C890C, 0x802C8960, 0x802C8960, 0x802C8960, 0x802C8960, 0x802C8960, 0x802C8960, 0x802C8960, 0x802C8960, 0x802C8968, 0x802C894C, 0x00000000 @@ -89,14 +89,14 @@ glabel D_802DA1D0 glabel D_802DA1E0 .double 180.0, 0.0 -glabel D_802DA1F0 -.word 0x802D0668, 0x802D0674, 0x802D0680, 0x802D068C, 0x802D0698, 0x802D069C +glabel jtbl_802DA1F0_FEBA0 +.word L802D0668_F5018, L802D0674_F5024, L802D0680_F5030, L802D068C_F503C, L802D0698_F5048, L802D069C_F504C -glabel D_802DA208 -.word 0x802D25A8, 0x802D25DC, 0x802D25D4, 0x802D25D4, 0x802D2604, 0x802D2760, 0x802D2664, 0x802D26C4, 0x802D2704, 0x802D283C, 0x802D283C, 0x802D283C, 0x802D283C, 0x802D27C0 +glabel jtbl_802DA208_FEBB8 +.word L802D25A8_F6F58, L802D25DC_F6F8C, L802D25D4_F6F84, L802D25D4_F6F84, L802D2604_F6FB4, L802D2760_F7110, L802D2664_F7014, L802D26C4_F7074, L802D2704_F70B4, L802D283C_F71EC, L802D283C_F71EC, L802D283C_F71EC, L802D283C_F71EC, L802D27C0_F7170 -glabel D_802DA240 -.word 0x802D40D4, 0x802D40E0, 0x802D4148, 0x802D40EC, 0x802D40F8, 0x802D4104 +glabel jtbl_802DA240_FEBF0 +.word L802D40D4_F8A84, L802D40E0_F8A90, L802D4148_F8AF8, L802D40EC_F8A9C, L802D40F8_F8AA8, L802D4104_F8AB4 -glabel D_802DA258 -.word 0x802D8560, 0x802D858C, 0x802D9688, 0x802D9688, 0x802D9688, 0x802D9688, 0x802D85A4, 0x802D85C0, 0x802D85E0, 0x802D85FC, 0x802D861C, 0x802D8638, 0x802D8654, 0x802D8674, 0x802D8698, 0x802D86B4, 0x802D86E0, 0x802D870C, 0x802D8728, 0x802D8750, 0x802D8770, 0x802D878C, 0x802D87A8, 0x802D87C4, 0x802D87E0, 0x802D8808, 0x802D8824, 0x802D8840, 0x802D8864, 0x802D8880, 0x802D88A8, 0x802D88E8, 0x802D8A68, 0x802D8914, 0x802D893C, 0x802D8968, 0x802D8984, 0x802D89A4, 0x802D89C0, 0x802D89DC, 0x802D89FC, 0x802D8A24, 0x802D9688, 0x802D8A4C, 0x802D8A8C, 0x802D8AA8, 0x802D8AC8, 0x802D8AE8, 0x802D8B20, 0x802D8B3C, 0x802D8B58, 0x802D8B74, 0x802D8B94, 0x802D8BB8, 0x802D8BDC, 0x802D8BFC, 0x802D8C30, 0x802D8C50, 0x802D8C70, 0x802D8C9C, 0x802D8CC0, 0x802D8CF4, 0x802D8D34, 0x802D8D54, 0x802D8D70, 0x802D8D8C, 0x802D8DA8, 0x802D8DC8, 0x802D8DE8, 0x802D8E08, 0x802D8E1C, 0x802D8E30, 0x802D8E50, 0x802D8E70, 0x802D8E90, 0x802D8EB0, 0x802D8ED0, 0x802D8F00, 0x802D8F44, 0x802D8F60, 0x802D9688, 0x802D8FBC, 0x802D8F80, 0x802D8FA0, 0x802D9688, 0x802D94A0, 0x802D8FDC, 0x802D8FFC, 0x802D901C, 0x802D903C, 0x802D906C, 0x802D908C, 0x802D90AC, 0x802D90CC, 0x802D90EC, 0x802D911C, 0x802D913C, 0x802D915C, 0x802D917C, 0x802D919C, 0x802D91D4, 0x802D9204, 0x802D9224, 0x802D9244, 0x802D9264, 0x802D9284, 0x802D9688, 0x802D92A4, 0x802D92C4, 0x802D92E4, 0x802D9304, 0x802D932C, 0x802D934C, 0x802D9388, 0x802D93A8, 0x802D93D4, 0x802D93FC, 0x802D9430, 0x802D9688, 0x802D9450, 0x802D9480, 0x802D94BC, 0x802D94DC, 0x802D94FC, 0x802D951C, 0x802D953C, 0x802D955C, 0x802D957C, 0x802D959C, 0x802D95BC, 0x802D95DC, 0x802D95FC, 0x802D961C, 0x802D9648, 0x802D9668, 0x00000000, 0x00000000, 0x00000000 +glabel jtbl_802DA258_FEC08 +.word L802D8560_FCF10, L802D858C_FCF3C, L802D9688_FE038, L802D9688_FE038, L802D9688_FE038, L802D9688_FE038, L802D85A4_FCF54, L802D85C0_FCF70, L802D85E0_FCF90, L802D85FC_FCFAC, L802D861C_FCFCC, L802D8638_FCFE8, L802D8654_FD004, L802D8674_FD024, L802D8698_FD048, L802D86B4_FD064, L802D86E0_FD090, L802D870C_FD0BC, L802D8728_FD0D8, L802D8750_FD100, L802D8770_FD120, L802D878C_FD13C, L802D87A8_FD158, L802D87C4_FD174, L802D87E0_FD190, L802D8808_FD1B8, L802D8824_FD1D4, L802D8840_FD1F0, L802D8864_FD214, L802D8880_FD230, L802D88A8_FD258, L802D88E8_FD298, L802D8A68_FD418, L802D8914_FD2C4, L802D893C_FD2EC, L802D8968_FD318, L802D8984_FD334, L802D89A4_FD354, L802D89C0_FD370, L802D89DC_FD38C, L802D89FC_FD3AC, L802D8A24_FD3D4, L802D9688_FE038, L802D8A4C_FD3FC, L802D8A8C_FD43C, L802D8AA8_FD458, L802D8AC8_FD478, L802D8AE8_FD498, L802D8B20_FD4D0, L802D8B3C_FD4EC, L802D8B58_FD508, L802D8B74_FD524, L802D8B94_FD544, L802D8BB8_FD568, L802D8BDC_FD58C, L802D8BFC_FD5AC, L802D8C30_FD5E0, L802D8C50_FD600, L802D8C70_FD620, L802D8C9C_FD64C, L802D8CC0_FD670, L802D8CF4_FD6A4, L802D8D34_FD6E4, L802D8D54_FD704, L802D8D70_FD720, L802D8D8C_FD73C, L802D8DA8_FD758, L802D8DC8_FD778, L802D8DE8_FD798, L802D8E08_FD7B8, L802D8E1C_FD7CC, L802D8E30_FD7E0, L802D8E50_FD800, L802D8E70_FD820, L802D8E90_FD840, L802D8EB0_FD860, L802D8ED0_FD880, L802D8F00_FD8B0, L802D8F44_FD8F4, L802D8F60_FD910, L802D9688_FE038, L802D8FBC_FD96C, L802D8F80_FD930, L802D8FA0_FD950, L802D9688_FE038, L802D94A0_FDE50, L802D8FDC_FD98C, L802D8FFC_FD9AC, L802D901C_FD9CC, L802D903C_FD9EC, L802D906C_FDA1C, L802D908C_FDA3C, L802D90AC_FDA5C, L802D90CC_FDA7C, L802D90EC_FDA9C, L802D911C_FDACC, L802D913C_FDAEC, L802D915C_FDB0C, L802D917C_FDB2C, L802D919C_FDB4C, L802D91D4_FDB84, L802D9204_FDBB4, L802D9224_FDBD4, L802D9244_FDBF4, L802D9264_FDC14, L802D9284_FDC34, L802D9688_FE038, L802D92A4_FDC54, L802D92C4_FDC74, L802D92E4_FDC94, L802D9304_FDCB4, L802D932C_FDCDC, L802D934C_FDCFC, L802D9388_FDD38, L802D93A8_FDD58, L802D93D4_FDD84, L802D93FC_FDDAC, L802D9430_FDDE0, L802D9688_FE038, L802D9450_FDE00, L802D9480_FDE30, L802D94BC_FDE6C, L802D94DC_FDE8C, L802D94FC_FDEAC, L802D951C_FDECC, L802D953C_FDEEC, L802D955C_FDF0C, L802D957C_FDF2C, L802D959C_FDF4C, L802D95BC_FDF6C, L802D95DC_FDF8C, L802D95FC_FDFAC, L802D961C_FDFCC, L802D9648_FDFF8, L802D9668_FE018, 0, 0, 0 diff --git a/asm/data/world/partner/goombario.rodata.s b/asm/data/world/partner/goombario.rodata.s new file mode 100644 index 0000000000..9933a55935 --- /dev/null +++ b/asm/data/world/partner/goombario.rodata.s @@ -0,0 +1,9 @@ +.include "macro.inc" + +.section .rodata + +glabel D_802BDE80 +.double 0.8 + +glabel D_802BDE88 +.word 0x802BD8EC, 0x802BD90C, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD858, 0x802BD870, 0x802BD974, 0x802BD858, 0x802BD870, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD88C, 0x802BD8BC, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD974, 0x802BD92C, 0x802BD94C diff --git a/asm/data/world/partner/goompa.rodata.s b/asm/data/world/partner/goompa.rodata.s new file mode 100644 index 0000000000..f088e20d2c --- /dev/null +++ b/asm/data/world/partner/goompa.rodata.s @@ -0,0 +1,6 @@ +.include "macro.inc" + +.section .rodata + +glabel D_802BD5F0 +.double 0.8, 0.0 diff --git a/asm/nonmatchings/battle/area_arn/4FEA50/func_80218058_4FEAA8.s b/asm/nonmatchings/battle/area_arn/4FEA50/func_80218058_4FEAA8.s index 0863935c4e..64a1b118dd 100644 --- a/asm/nonmatchings/battle/area_arn/4FEA50/func_80218058_4FEAA8.s +++ b/asm/nonmatchings/battle/area_arn/4FEA50/func_80218058_4FEAA8.s @@ -11,12 +11,12 @@ glabel func_80218058_4FEAA8 /* 4FEAC0 80218070 46007506 */ mov.s $f20, $f14 /* 4FEAC4 80218074 4600A18D */ trunc.w.s $f6, $f20 /* 4FEAC8 80218078 44023000 */ mfc1 $v0, $f6 -/* 4FEACC 8021807C 00000000 */ nop +/* 4FEACC 8021807C 00000000 */ nop /* 4FEAD0 80218080 04420001 */ bltzl $v0, .L80218088 /* 4FEAD4 80218084 00021023 */ negu $v0, $v0 .L80218088: /* 4FEAD8 80218088 44821000 */ mtc1 $v0, $f2 -/* 4FEADC 8021808C 00000000 */ nop +/* 4FEADC 8021808C 00000000 */ nop /* 4FEAE0 80218090 468010A0 */ cvt.s.w $f2, $f2 /* 4FEAE4 80218094 46001103 */ div.s $f4, $f2, $f0 /* 4FEAE8 80218098 0000202D */ daddu $a0, $zero, $zero @@ -37,7 +37,7 @@ glabel func_80218058_4FEAA8 /* 4FEB20 802180D0 00471021 */ addu $v0, $v0, $a3 /* 4FEB24 802180D4 C4400000 */ lwc1 $f0, ($v0) /* 4FEB28 802180D8 4604003C */ c.lt.s $f0, $f4 -/* 4FEB2C 802180DC 00000000 */ nop +/* 4FEB2C 802180DC 00000000 */ nop /* 4FEB30 802180E0 45020002 */ bc1fl .L802180EC /* 4FEB34 802180E4 0060302D */ daddu $a2, $v1, $zero /* 4FEB38 802180E8 0060202D */ daddu $a0, $v1, $zero @@ -62,43 +62,43 @@ glabel func_80218058_4FEAA8 /* 4FEB80 80218130 46001085 */ abs.s $f2, $f2 /* 4FEB84 80218134 46000005 */ abs.s $f0, $f0 /* 4FEB88 80218138 4600103C */ c.lt.s $f2, $f0 -/* 4FEB8C 8021813C 00000000 */ nop +/* 4FEB8C 8021813C 00000000 */ nop /* 4FEB90 80218140 45000002 */ bc1f .L8021814C /* 4FEB94 80218144 00C0182D */ daddu $v1, $a2, $zero /* 4FEB98 80218148 0080182D */ daddu $v1, $a0, $zero .L8021814C: /* 4FEB9C 8021814C 44800000 */ mtc1 $zero, $f0 -/* 4FEBA0 80218150 00000000 */ nop +/* 4FEBA0 80218150 00000000 */ nop /* 4FEBA4 80218154 4600B03C */ c.lt.s $f22, $f0 -/* 4FEBA8 80218158 00000000 */ nop +/* 4FEBA8 80218158 00000000 */ nop /* 4FEBAC 8021815C 4500000A */ bc1f .L80218188 -/* 4FEBB0 80218160 00000000 */ nop +/* 4FEBB0 80218160 00000000 */ nop /* 4FEBB4 80218164 4614003E */ c.le.s $f0, $f20 -/* 4FEBB8 80218168 00000000 */ nop +/* 4FEBB8 80218168 00000000 */ nop /* 4FEBBC 8021816C 45000004 */ bc1f .L80218180 /* 4FEBC0 80218170 240200B4 */ addiu $v0, $zero, 0xb4 /* 4FEBC4 80218174 00431823 */ subu $v1, $v0, $v1 /* 4FEBC8 80218178 44800000 */ mtc1 $zero, $f0 -/* 4FEBCC 8021817C 00000000 */ nop +/* 4FEBCC 8021817C 00000000 */ nop .L80218180: /* 4FEBD0 80218180 4600B03C */ c.lt.s $f22, $f0 -/* 4FEBD4 80218184 00000000 */ nop +/* 4FEBD4 80218184 00000000 */ nop .L80218188: /* 4FEBD8 80218188 45000005 */ bc1f .L802181A0 -/* 4FEBDC 8021818C 00000000 */ nop +/* 4FEBDC 8021818C 00000000 */ nop /* 4FEBE0 80218190 4600A03C */ c.lt.s $f20, $f0 -/* 4FEBE4 80218194 00000000 */ nop +/* 4FEBE4 80218194 00000000 */ nop /* 4FEBE8 80218198 45030001 */ bc1tl .L802181A0 /* 4FEBEC 8021819C 246300B4 */ addiu $v1, $v1, 0xb4 .L802181A0: /* 4FEBF0 802181A0 44800000 */ mtc1 $zero, $f0 -/* 4FEBF4 802181A4 00000000 */ nop +/* 4FEBF4 802181A4 00000000 */ nop /* 4FEBF8 802181A8 4616003E */ c.le.s $f0, $f22 -/* 4FEBFC 802181AC 00000000 */ nop +/* 4FEBFC 802181AC 00000000 */ nop /* 4FEC00 802181B0 45000006 */ bc1f .L802181CC -/* 4FEC04 802181B4 00000000 */ nop +/* 4FEC04 802181B4 00000000 */ nop /* 4FEC08 802181B8 4600A03C */ c.lt.s $f20, $f0 -/* 4FEC0C 802181BC 00000000 */ nop +/* 4FEC0C 802181BC 00000000 */ nop /* 4FEC10 802181C0 45000002 */ bc1f .L802181CC /* 4FEC14 802181C4 24020168 */ addiu $v0, $zero, 0x168 /* 4FEC18 802181C8 00431823 */ subu $v1, $v0, $v1 diff --git a/asm/nonmatchings/battle/area_arn/4FEA50/func_802181E4_4FEC34.s b/asm/nonmatchings/battle/area_arn/4FEA50/func_802181E4_4FEC34.s index 2861cde547..4c12964b71 100644 --- a/asm/nonmatchings/battle/area_arn/4FEA50/func_802181E4_4FEC34.s +++ b/asm/nonmatchings/battle/area_arn/4FEA50/func_802181E4_4FEC34.s @@ -36,7 +36,7 @@ glabel func_802181E4_4FEC34 /* 4FECB0 80218260 0C0B1EAF */ jal get_variable /* 4FECB4 80218264 02118023 */ subu $s0, $s0, $s1 /* 4FECB8 80218268 16600006 */ bnez $s3, .L80218284 -/* 4FECBC 8021826C 00000000 */ nop +/* 4FECBC 8021826C 00000000 */ nop /* 4FECC0 80218270 16000004 */ bnez $s0, .L80218284 /* 4FECC4 80218274 0280202D */ daddu $a0, $s4, $zero /* 4FECC8 80218278 8E450000 */ lw $a1, ($s2) @@ -44,10 +44,10 @@ glabel func_802181E4_4FEC34 /* 4FECD0 80218280 0040302D */ daddu $a2, $v0, $zero .L80218284: /* 4FECD4 80218284 44936000 */ mtc1 $s3, $f12 -/* 4FECD8 80218288 00000000 */ nop +/* 4FECD8 80218288 00000000 */ nop /* 4FECDC 8021828C 46806320 */ cvt.s.w $f12, $f12 /* 4FECE0 80218290 44907000 */ mtc1 $s0, $f14 -/* 4FECE4 80218294 00000000 */ nop +/* 4FECE4 80218294 00000000 */ nop /* 4FECE8 80218298 0C086016 */ jal func_80218058_4FEAA8 /* 4FECEC 8021829C 468073A0 */ cvt.s.w $f14, $f14 /* 4FECF0 802182A0 0280202D */ daddu $a0, $s4, $zero @@ -55,7 +55,7 @@ glabel func_802181E4_4FEC34 /* 4FECF8 802182A8 2446FFA6 */ addiu $a2, $v0, -0x5a .L802182AC: /* 4FECFC 802182AC 0C0B2026 */ jal set_variable -/* 4FED00 802182B0 00000000 */ nop +/* 4FED00 802182B0 00000000 */ nop /* 4FED04 802182B4 24020002 */ addiu $v0, $zero, 2 /* 4FED08 802182B8 8FBF0024 */ lw $ra, 0x24($sp) /* 4FED0C 802182BC 8FB40020 */ lw $s4, 0x20($sp) @@ -65,5 +65,5 @@ glabel func_802181E4_4FEC34 /* 4FED1C 802182CC 8FB00010 */ lw $s0, 0x10($sp) /* 4FED20 802182D0 03E00008 */ jr $ra /* 4FED24 802182D4 27BD0028 */ addiu $sp, $sp, 0x28 -/* 4FED28 802182D8 00000000 */ nop -/* 4FED2C 802182DC 00000000 */ nop +/* 4FED28 802182D8 00000000 */ nop +/* 4FED2C 802182DC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_arn/4FED30/func_80218338_4FED88.s b/asm/nonmatchings/battle/area_arn/4FED30/func_80218338_4FED88.s index 7e64fae3ab..f1810e7bc5 100644 --- a/asm/nonmatchings/battle/area_arn/4FED30/func_80218338_4FED88.s +++ b/asm/nonmatchings/battle/area_arn/4FED30/func_80218338_4FED88.s @@ -11,12 +11,12 @@ glabel func_80218338_4FED88 /* 4FEDA0 80218350 46007506 */ mov.s $f20, $f14 /* 4FEDA4 80218354 4600A18D */ trunc.w.s $f6, $f20 /* 4FEDA8 80218358 44023000 */ mfc1 $v0, $f6 -/* 4FEDAC 8021835C 00000000 */ nop +/* 4FEDAC 8021835C 00000000 */ nop /* 4FEDB0 80218360 04420001 */ bltzl $v0, .L80218368 /* 4FEDB4 80218364 00021023 */ negu $v0, $v0 .L80218368: /* 4FEDB8 80218368 44821000 */ mtc1 $v0, $f2 -/* 4FEDBC 8021836C 00000000 */ nop +/* 4FEDBC 8021836C 00000000 */ nop /* 4FEDC0 80218370 468010A0 */ cvt.s.w $f2, $f2 /* 4FEDC4 80218374 46001103 */ div.s $f4, $f2, $f0 /* 4FEDC8 80218378 0000202D */ daddu $a0, $zero, $zero @@ -37,7 +37,7 @@ glabel func_80218338_4FED88 /* 4FEE00 802183B0 00471021 */ addu $v0, $v0, $a3 /* 4FEE04 802183B4 C4400000 */ lwc1 $f0, ($v0) /* 4FEE08 802183B8 4604003C */ c.lt.s $f0, $f4 -/* 4FEE0C 802183BC 00000000 */ nop +/* 4FEE0C 802183BC 00000000 */ nop /* 4FEE10 802183C0 45020002 */ bc1fl .L802183CC /* 4FEE14 802183C4 0060302D */ daddu $a2, $v1, $zero /* 4FEE18 802183C8 0060202D */ daddu $a0, $v1, $zero @@ -62,43 +62,43 @@ glabel func_80218338_4FED88 /* 4FEE60 80218410 46001085 */ abs.s $f2, $f2 /* 4FEE64 80218414 46000005 */ abs.s $f0, $f0 /* 4FEE68 80218418 4600103C */ c.lt.s $f2, $f0 -/* 4FEE6C 8021841C 00000000 */ nop +/* 4FEE6C 8021841C 00000000 */ nop /* 4FEE70 80218420 45000002 */ bc1f .L8021842C /* 4FEE74 80218424 00C0182D */ daddu $v1, $a2, $zero /* 4FEE78 80218428 0080182D */ daddu $v1, $a0, $zero .L8021842C: /* 4FEE7C 8021842C 44800000 */ mtc1 $zero, $f0 -/* 4FEE80 80218430 00000000 */ nop +/* 4FEE80 80218430 00000000 */ nop /* 4FEE84 80218434 4600B03C */ c.lt.s $f22, $f0 -/* 4FEE88 80218438 00000000 */ nop +/* 4FEE88 80218438 00000000 */ nop /* 4FEE8C 8021843C 4500000A */ bc1f .L80218468 -/* 4FEE90 80218440 00000000 */ nop +/* 4FEE90 80218440 00000000 */ nop /* 4FEE94 80218444 4614003E */ c.le.s $f0, $f20 -/* 4FEE98 80218448 00000000 */ nop +/* 4FEE98 80218448 00000000 */ nop /* 4FEE9C 8021844C 45000004 */ bc1f .L80218460 /* 4FEEA0 80218450 240200B4 */ addiu $v0, $zero, 0xb4 /* 4FEEA4 80218454 00431823 */ subu $v1, $v0, $v1 /* 4FEEA8 80218458 44800000 */ mtc1 $zero, $f0 -/* 4FEEAC 8021845C 00000000 */ nop +/* 4FEEAC 8021845C 00000000 */ nop .L80218460: /* 4FEEB0 80218460 4600B03C */ c.lt.s $f22, $f0 -/* 4FEEB4 80218464 00000000 */ nop +/* 4FEEB4 80218464 00000000 */ nop .L80218468: /* 4FEEB8 80218468 45000005 */ bc1f .L80218480 -/* 4FEEBC 8021846C 00000000 */ nop +/* 4FEEBC 8021846C 00000000 */ nop /* 4FEEC0 80218470 4600A03C */ c.lt.s $f20, $f0 -/* 4FEEC4 80218474 00000000 */ nop +/* 4FEEC4 80218474 00000000 */ nop /* 4FEEC8 80218478 45030001 */ bc1tl .L80218480 /* 4FEECC 8021847C 246300B4 */ addiu $v1, $v1, 0xb4 .L80218480: /* 4FEED0 80218480 44800000 */ mtc1 $zero, $f0 -/* 4FEED4 80218484 00000000 */ nop +/* 4FEED4 80218484 00000000 */ nop /* 4FEED8 80218488 4616003E */ c.le.s $f0, $f22 -/* 4FEEDC 8021848C 00000000 */ nop +/* 4FEEDC 8021848C 00000000 */ nop /* 4FEEE0 80218490 45000006 */ bc1f .L802184AC -/* 4FEEE4 80218494 00000000 */ nop +/* 4FEEE4 80218494 00000000 */ nop /* 4FEEE8 80218498 4600A03C */ c.lt.s $f20, $f0 -/* 4FEEEC 8021849C 00000000 */ nop +/* 4FEEEC 8021849C 00000000 */ nop /* 4FEEF0 802184A0 45000002 */ bc1f .L802184AC /* 4FEEF4 802184A4 24020168 */ addiu $v0, $zero, 0x168 /* 4FEEF8 802184A8 00431823 */ subu $v1, $v0, $v1 diff --git a/asm/nonmatchings/battle/area_arn/4FED30/func_802184C4_4FEF14.s b/asm/nonmatchings/battle/area_arn/4FED30/func_802184C4_4FEF14.s index a762bd44e6..ee72656a0e 100644 --- a/asm/nonmatchings/battle/area_arn/4FED30/func_802184C4_4FEF14.s +++ b/asm/nonmatchings/battle/area_arn/4FED30/func_802184C4_4FEF14.s @@ -36,7 +36,7 @@ glabel func_802184C4_4FEF14 /* 4FEF90 80218540 0C0B1EAF */ jal get_variable /* 4FEF94 80218544 02118023 */ subu $s0, $s0, $s1 /* 4FEF98 80218548 16600006 */ bnez $s3, .L80218564 -/* 4FEF9C 8021854C 00000000 */ nop +/* 4FEF9C 8021854C 00000000 */ nop /* 4FEFA0 80218550 16000004 */ bnez $s0, .L80218564 /* 4FEFA4 80218554 0280202D */ daddu $a0, $s4, $zero /* 4FEFA8 80218558 8E450000 */ lw $a1, ($s2) @@ -44,10 +44,10 @@ glabel func_802184C4_4FEF14 /* 4FEFB0 80218560 0040302D */ daddu $a2, $v0, $zero .L80218564: /* 4FEFB4 80218564 44936000 */ mtc1 $s3, $f12 -/* 4FEFB8 80218568 00000000 */ nop +/* 4FEFB8 80218568 00000000 */ nop /* 4FEFBC 8021856C 46806320 */ cvt.s.w $f12, $f12 /* 4FEFC0 80218570 44907000 */ mtc1 $s0, $f14 -/* 4FEFC4 80218574 00000000 */ nop +/* 4FEFC4 80218574 00000000 */ nop /* 4FEFC8 80218578 0C0860CE */ jal func_80218338_4FED88 /* 4FEFCC 8021857C 468073A0 */ cvt.s.w $f14, $f14 /* 4FEFD0 80218580 0280202D */ daddu $a0, $s4, $zero @@ -55,7 +55,7 @@ glabel func_802184C4_4FEF14 /* 4FEFD8 80218588 2446FFA6 */ addiu $a2, $v0, -0x5a .L8021858C: /* 4FEFDC 8021858C 0C0B2026 */ jal set_variable -/* 4FEFE0 80218590 00000000 */ nop +/* 4FEFE0 80218590 00000000 */ nop /* 4FEFE4 80218594 24020002 */ addiu $v0, $zero, 2 /* 4FEFE8 80218598 8FBF0024 */ lw $ra, 0x24($sp) /* 4FEFEC 8021859C 8FB40020 */ lw $s4, 0x20($sp) @@ -65,5 +65,5 @@ glabel func_802184C4_4FEF14 /* 4FEFFC 802185AC 8FB00010 */ lw $s0, 0x10($sp) /* 4FF000 802185B0 03E00008 */ jr $ra /* 4FF004 802185B4 27BD0028 */ addiu $sp, $sp, 0x28 -/* 4FF008 802185B8 00000000 */ nop -/* 4FF00C 802185BC 00000000 */ nop +/* 4FF008 802185B8 00000000 */ nop +/* 4FF00C 802185BC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_arn/4FF0D0/func_80218680_4FF0D0.s b/asm/nonmatchings/battle/area_arn/4FF0D0/func_80218680_4FF0D0.s index bced5e856d..697b154327 100644 --- a/asm/nonmatchings/battle/area_arn/4FF0D0/func_80218680_4FF0D0.s +++ b/asm/nonmatchings/battle/area_arn/4FF0D0/func_80218680_4FF0D0.s @@ -35,17 +35,17 @@ glabel func_80218680_4FF0D0 /* 4FF148 802186F8 0040802D */ daddu $s0, $v0, $zero /* 4FF14C 802186FC 8E42000C */ lw $v0, 0xc($s2) /* 4FF150 80218700 44941000 */ mtc1 $s4, $f2 -/* 4FF154 80218704 00000000 */ nop +/* 4FF154 80218704 00000000 */ nop /* 4FF158 80218708 468010A0 */ cvt.s.w $f2, $f2 /* 4FF15C 8021870C E4420004 */ swc1 $f2, 4($v0) /* 4FF160 80218710 8E42000C */ lw $v0, 0xc($s2) /* 4FF164 80218714 44931000 */ mtc1 $s3, $f2 -/* 4FF168 80218718 00000000 */ nop +/* 4FF168 80218718 00000000 */ nop /* 4FF16C 8021871C 468010A0 */ cvt.s.w $f2, $f2 /* 4FF170 80218720 E4420008 */ swc1 $f2, 8($v0) /* 4FF174 80218724 8E42000C */ lw $v0, 0xc($s2) /* 4FF178 80218728 44901000 */ mtc1 $s0, $f2 -/* 4FF17C 8021872C 00000000 */ nop +/* 4FF17C 8021872C 00000000 */ nop /* 4FF180 80218730 468010A0 */ cvt.s.w $f2, $f2 /* 4FF184 80218734 E442000C */ swc1 $f2, 0xc($v0) /* 4FF188 80218738 8E43000C */ lw $v1, 0xc($s2) @@ -59,6 +59,6 @@ glabel func_80218680_4FF0D0 /* 4FF1A8 80218758 24020002 */ addiu $v0, $zero, 2 /* 4FF1AC 8021875C 03E00008 */ jr $ra /* 4FF1B0 80218760 27BD0028 */ addiu $sp, $sp, 0x28 -/* 4FF1B4 80218764 00000000 */ nop -/* 4FF1B8 80218768 00000000 */ nop -/* 4FF1BC 8021876C 00000000 */ nop +/* 4FF1B4 80218764 00000000 */ nop +/* 4FF1B8 80218768 00000000 */ nop +/* 4FF1BC 8021876C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_dig/6DE1F0/func_80218430_6DE1F0.s b/asm/nonmatchings/battle/area_dig/6DE1F0/func_80218430_6DE1F0.s index eb527cae13..e1ce94f62d 100644 --- a/asm/nonmatchings/battle/area_dig/6DE1F0/func_80218430_6DE1F0.s +++ b/asm/nonmatchings/battle/area_dig/6DE1F0/func_80218430_6DE1F0.s @@ -18,7 +18,7 @@ glabel func_80218430_6DE1F0 /* 6DE224 80218464 0C0B1EAF */ jal get_variable /* 6DE228 80218468 26100004 */ addiu $s0, $s0, 4 /* 6DE22C 8021846C 4482A000 */ mtc1 $v0, $f20 -/* 6DE230 80218470 00000000 */ nop +/* 6DE230 80218470 00000000 */ nop /* 6DE234 80218474 4680A521 */ cvt.d.w $f20, $f20 /* 6DE238 80218478 3C014024 */ lui $at, 0x4024 /* 6DE23C 8021847C 44810800 */ mtc1 $at, $f1 @@ -31,7 +31,7 @@ glabel func_80218430_6DE1F0 /* 6DE258 80218498 44810000 */ mtc1 $at, $f0 /* 6DE25C 8021849C 4620A520 */ cvt.s.d $f20, $f20 /* 6DE260 802184A0 4600A502 */ mul.s $f20, $f20, $f0 -/* 6DE264 802184A4 00000000 */ nop +/* 6DE264 802184A4 00000000 */ nop /* 6DE268 802184A8 8E130000 */ lw $s3, ($s0) /* 6DE26C 802184AC 8E100004 */ lw $s0, 4($s0) /* 6DE270 802184B0 3C0143B4 */ lui $at, 0x43b4 @@ -42,14 +42,14 @@ glabel func_80218430_6DE1F0 /* 6DE284 802184C4 0C00A85B */ jal sin_rad /* 6DE288 802184C8 4600A306 */ mov.s $f12, $f20 /* 6DE28C 802184CC 46180582 */ mul.s $f22, $f0, $f24 -/* 6DE290 802184D0 00000000 */ nop +/* 6DE290 802184D0 00000000 */ nop /* 6DE294 802184D4 4480D000 */ mtc1 $zero, $f26 -/* 6DE298 802184D8 00000000 */ nop +/* 6DE298 802184D8 00000000 */ nop /* 6DE29C 802184DC 461AB580 */ add.s $f22, $f22, $f26 /* 6DE2A0 802184E0 0C00A874 */ jal cos_rad /* 6DE2A4 802184E4 4600A306 */ mov.s $f12, $f20 /* 6DE2A8 802184E8 46180502 */ mul.s $f20, $f0, $f24 -/* 6DE2AC 802184EC 00000000 */ nop +/* 6DE2AC 802184EC 00000000 */ nop /* 6DE2B0 802184F0 3C01C37C */ lui $at, 0xc37c /* 6DE2B4 802184F4 4481C000 */ mtc1 $at, $f24 /* 6DE2B8 802184F8 C62000B8 */ lwc1 $f0, 0xb8($s1) diff --git a/asm/nonmatchings/battle/area_dig/6DE1F0/func_80218580_6DE340.s b/asm/nonmatchings/battle/area_dig/6DE1F0/func_80218580_6DE340.s index d1c1299bd6..f6e3a98184 100644 --- a/asm/nonmatchings/battle/area_dig/6DE1F0/func_80218580_6DE340.s +++ b/asm/nonmatchings/battle/area_dig/6DE1F0/func_80218580_6DE340.s @@ -24,5 +24,5 @@ glabel func_80218580_6DE340 /* 6DE38C 802185CC 24020002 */ addiu $v0, $zero, 2 /* 6DE390 802185D0 03E00008 */ jr $ra /* 6DE394 802185D4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 6DE398 802185D8 00000000 */ nop -/* 6DE39C 802185DC 00000000 */ nop +/* 6DE398 802185D8 00000000 */ nop +/* 6DE39C 802185DC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_flo/5B14B0/func_802180CC_5B157C.s b/asm/nonmatchings/battle/area_flo/5B14B0/func_802180CC_5B157C.s index cc2dd64317..afdda3a326 100644 --- a/asm/nonmatchings/battle/area_flo/5B14B0/func_802180CC_5B157C.s +++ b/asm/nonmatchings/battle/area_flo/5B14B0/func_802180CC_5B157C.s @@ -31,30 +31,30 @@ glabel func_802180CC_5B157C /* 5B15E4 80218134 0C0B1EAF */ jal get_variable /* 5B15E8 80218138 0040902D */ daddu $s2, $v0, $zero /* 5B15EC 8021813C 4482A000 */ mtc1 $v0, $f20 -/* 5B15F0 80218140 00000000 */ nop +/* 5B15F0 80218140 00000000 */ nop /* 5B15F4 80218144 4680A520 */ cvt.s.w $f20, $f20 /* 5B15F8 80218148 0C00A8D4 */ jal cos_deg /* 5B15FC 8021814C 4600A306 */ mov.s $f12, $f20 /* 5B1600 80218150 4492B000 */ mtc1 $s2, $f22 -/* 5B1604 80218154 00000000 */ nop +/* 5B1604 80218154 00000000 */ nop /* 5B1608 80218158 4680B5A0 */ cvt.s.w $f22, $f22 /* 5B160C 8021815C 4600B002 */ mul.s $f0, $f22, $f0 -/* 5B1610 80218160 00000000 */ nop +/* 5B1610 80218160 00000000 */ nop /* 5B1614 80218164 4600A306 */ mov.s $f12, $f20 /* 5B1618 80218168 4493A000 */ mtc1 $s3, $f20 -/* 5B161C 8021816C 00000000 */ nop +/* 5B161C 8021816C 00000000 */ nop /* 5B1620 80218170 4680A520 */ cvt.s.w $f20, $f20 /* 5B1624 80218174 4600A500 */ add.s $f20, $f20, $f0 /* 5B1628 80218178 0C00A8BB */ jal sin_deg /* 5B162C 8021817C 26100004 */ addiu $s0, $s0, 4 /* 5B1630 80218180 4600B582 */ mul.s $f22, $f22, $f0 -/* 5B1634 80218184 00000000 */ nop +/* 5B1634 80218184 00000000 */ nop /* 5B1638 80218188 8E050000 */ lw $a1, ($s0) /* 5B163C 8021818C 26100004 */ addiu $s0, $s0, 4 /* 5B1640 80218190 0220202D */ daddu $a0, $s1, $zero /* 5B1644 80218194 4406A000 */ mfc1 $a2, $f20 /* 5B1648 80218198 4494A000 */ mtc1 $s4, $f20 -/* 5B164C 8021819C 00000000 */ nop +/* 5B164C 8021819C 00000000 */ nop /* 5B1650 802181A0 4680A520 */ cvt.s.w $f20, $f20 /* 5B1654 802181A4 0C0B2190 */ jal set_float_variable /* 5B1658 802181A8 4616A501 */ sub.s $f20, $f20, $f22 @@ -73,5 +73,5 @@ glabel func_802180CC_5B157C /* 5B168C 802181DC 24020002 */ addiu $v0, $zero, 2 /* 5B1690 802181E0 03E00008 */ jr $ra /* 5B1694 802181E4 27BD0038 */ addiu $sp, $sp, 0x38 -/* 5B1698 802181E8 00000000 */ nop -/* 5B169C 802181EC 00000000 */ nop +/* 5B1698 802181E8 00000000 */ nop +/* 5B169C 802181EC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_8021844C_5B18FC.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_8021844C_5B18FC.s index e2d81596f3..a2e9deb020 100644 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_8021844C_5B18FC.s +++ b/asm/nonmatchings/battle/area_flo/5B16A0/func_8021844C_5B18FC.s @@ -35,26 +35,26 @@ glabel func_8021844C_5B18FC /* 5B1974 802184C4 34210FD8 */ ori $at, $at, 0xfd8 /* 5B1978 802184C8 44814000 */ mtc1 $at, $f8 /* 5B197C 802184CC 44922000 */ mtc1 $s2, $f4 -/* 5B1980 802184D0 00000000 */ nop +/* 5B1980 802184D0 00000000 */ nop /* 5B1984 802184D4 46802120 */ cvt.s.w $f4, $f4 /* 5B1988 802184D8 46082202 */ mul.s $f8, $f4, $f8 -/* 5B198C 802184DC 00000000 */ nop +/* 5B198C 802184DC 00000000 */ nop /* 5B1990 802184E0 44903000 */ mtc1 $s0, $f6 -/* 5B1994 802184E4 00000000 */ nop +/* 5B1994 802184E4 00000000 */ nop /* 5B1998 802184E8 468031A0 */ cvt.s.w $f6, $f6 /* 5B199C 802184EC 3C013F80 */ lui $at, 0x3f80 /* 5B19A0 802184F0 44811000 */ mtc1 $at, $f2 /* 5B19A4 802184F4 46062103 */ div.s $f4, $f4, $f6 /* 5B19A8 802184F8 46041081 */ sub.s $f2, $f2, $f4 /* 5B19AC 802184FC 46020502 */ mul.s $f20, $f0, $f2 -/* 5B19B0 80218500 00000000 */ nop +/* 5B19B0 80218500 00000000 */ nop /* 5B19B4 80218504 44936000 */ mtc1 $s3, $f12 -/* 5B19B8 80218508 00000000 */ nop +/* 5B19B8 80218508 00000000 */ nop /* 5B19BC 8021850C 46806320 */ cvt.s.w $f12, $f12 /* 5B19C0 80218510 0C00A874 */ jal cos_rad /* 5B19C4 80218514 460C4303 */ div.s $f12, $f8, $f12 /* 5B19C8 80218518 4600A502 */ mul.s $f20, $f20, $f0 -/* 5B19CC 8021851C 00000000 */ nop +/* 5B19CC 8021851C 00000000 */ nop /* 5B19D0 80218520 0220202D */ daddu $a0, $s1, $zero /* 5B19D4 80218524 4600A28D */ trunc.w.s $f10, $f20 /* 5B19D8 80218528 44065000 */ mfc1 $a2, $f10 @@ -70,4 +70,4 @@ glabel func_8021844C_5B18FC /* 5B1A00 80218550 24020002 */ addiu $v0, $zero, 2 /* 5B1A04 80218554 03E00008 */ jr $ra /* 5B1A08 80218558 27BD0030 */ addiu $sp, $sp, 0x30 -/* 5B1A0C 8021855C 00000000 */ nop +/* 5B1A0C 8021855C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80218560_5B1A10.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_80218560_5B1A10.s index 7f6fe317e5..98b456c758 100644 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_80218560_5B1A10.s +++ b/asm/nonmatchings/battle/area_flo/5B16A0/func_80218560_5B1A10.s @@ -69,12 +69,12 @@ glabel func_80218560_5B1A10 /* 5B1B10 80218660 82030210 */ lb $v1, 0x210($s0) /* 5B1B14 80218664 2402000A */ addiu $v0, $zero, 0xa /* 5B1B18 80218668 14620007 */ bne $v1, $v0, .L80218688 -/* 5B1B1C 8021866C 00000000 */ nop +/* 5B1B1C 8021866C 00000000 */ nop /* 5B1B20 80218670 8C82000C */ lw $v0, 0xc($a0) /* 5B1B24 80218674 3C013ECC */ lui $at, 0x3ecc /* 5B1B28 80218678 3421CCCD */ ori $at, $at, 0xcccd /* 5B1B2C 8021867C 44810000 */ mtc1 $at, $f0 -/* 5B1B30 80218680 00000000 */ nop +/* 5B1B30 80218680 00000000 */ nop /* 5B1B34 80218684 E4400028 */ swc1 $f0, 0x28($v0) .L80218688: /* 5B1B38 80218688 8FBF0028 */ lw $ra, 0x28($sp) diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80218808_5B1CB8.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_80218808_5B1CB8.s index 2dceed077b..011f72b236 100644 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_80218808_5B1CB8.s +++ b/asm/nonmatchings/battle/area_flo/5B16A0/func_80218808_5B1CB8.s @@ -14,11 +14,11 @@ glabel func_80218808_5B1CB8 /* 5B1CDC 8021882C 0040202D */ daddu $a0, $v0, $zero /* 5B1CE0 80218830 2402FF81 */ addiu $v0, $zero, -0x7f /* 5B1CE4 80218834 14820002 */ bne $a0, $v0, .L80218840 -/* 5B1CE8 80218838 00000000 */ nop +/* 5B1CE8 80218838 00000000 */ nop /* 5B1CEC 8021883C 8E240148 */ lw $a0, 0x148($s1) .L80218840: /* 5B1CF0 80218840 0C09A75B */ jal get_actor -/* 5B1CF4 80218844 00000000 */ nop +/* 5B1CF4 80218844 00000000 */ nop /* 5B1CF8 80218848 0040202D */ daddu $a0, $v0, $zero /* 5B1CFC 8021884C 90830136 */ lbu $v1, 0x136($a0) /* 5B1D00 80218850 24020047 */ addiu $v0, $zero, 0x47 @@ -49,11 +49,11 @@ glabel func_80218808_5B1CB8 /* 5B1D58 802188A8 0000302D */ daddu $a2, $zero, $zero .L802188AC: /* 5B1D5C 802188AC 0C0B2026 */ jal set_variable -/* 5B1D60 802188B0 00000000 */ nop +/* 5B1D60 802188B0 00000000 */ nop /* 5B1D64 802188B4 8FBF0018 */ lw $ra, 0x18($sp) /* 5B1D68 802188B8 8FB10014 */ lw $s1, 0x14($sp) /* 5B1D6C 802188BC 8FB00010 */ lw $s0, 0x10($sp) /* 5B1D70 802188C0 24020002 */ addiu $v0, $zero, 2 /* 5B1D74 802188C4 03E00008 */ jr $ra /* 5B1D78 802188C8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 5B1D7C 802188CC 00000000 */ nop +/* 5B1D7C 802188CC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_802188D0_5B1D80.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_802188D0_5B1D80.s index 6dd5abf4cf..035c849483 100644 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_802188D0_5B1D80.s +++ b/asm/nonmatchings/battle/area_flo/5B16A0/func_802188D0_5B1D80.s @@ -69,12 +69,12 @@ glabel func_802188D0_5B1D80 /* 5B1E80 802189D0 82030210 */ lb $v1, 0x210($s0) /* 5B1E84 802189D4 2402000A */ addiu $v0, $zero, 0xa /* 5B1E88 802189D8 14620007 */ bne $v1, $v0, .L802189F8 -/* 5B1E8C 802189DC 00000000 */ nop +/* 5B1E8C 802189DC 00000000 */ nop /* 5B1E90 802189E0 8C82000C */ lw $v0, 0xc($a0) /* 5B1E94 802189E4 3C013ECC */ lui $at, 0x3ecc /* 5B1E98 802189E8 3421CCCD */ ori $at, $at, 0xcccd /* 5B1E9C 802189EC 44810000 */ mtc1 $at, $f0 -/* 5B1EA0 802189F0 00000000 */ nop +/* 5B1EA0 802189F0 00000000 */ nop /* 5B1EA4 802189F4 E4400028 */ swc1 $f0, 0x28($v0) .L802189F8: /* 5B1EA8 802189F8 8FBF0028 */ lw $ra, 0x28($sp) diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80218B78_5B2028.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_80218B78_5B2028.s index d504ab6356..e023833a1d 100644 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_80218B78_5B2028.s +++ b/asm/nonmatchings/battle/area_flo/5B16A0/func_80218B78_5B2028.s @@ -14,11 +14,11 @@ glabel func_80218B78_5B2028 /* 5B204C 80218B9C 0040202D */ daddu $a0, $v0, $zero /* 5B2050 80218BA0 2402FF81 */ addiu $v0, $zero, -0x7f /* 5B2054 80218BA4 14820002 */ bne $a0, $v0, .L80218BB0 -/* 5B2058 80218BA8 00000000 */ nop +/* 5B2058 80218BA8 00000000 */ nop /* 5B205C 80218BAC 8E240148 */ lw $a0, 0x148($s1) .L80218BB0: /* 5B2060 80218BB0 0C09A75B */ jal get_actor -/* 5B2064 80218BB4 00000000 */ nop +/* 5B2064 80218BB4 00000000 */ nop /* 5B2068 80218BB8 0040202D */ daddu $a0, $v0, $zero /* 5B206C 80218BBC 90830136 */ lbu $v1, 0x136($a0) /* 5B2070 80218BC0 24020047 */ addiu $v0, $zero, 0x47 @@ -49,11 +49,11 @@ glabel func_80218B78_5B2028 /* 5B20C8 80218C18 0000302D */ daddu $a2, $zero, $zero .L80218C1C: /* 5B20CC 80218C1C 0C0B2026 */ jal set_variable -/* 5B20D0 80218C20 00000000 */ nop +/* 5B20D0 80218C20 00000000 */ nop /* 5B20D4 80218C24 8FBF0018 */ lw $ra, 0x18($sp) /* 5B20D8 80218C28 8FB10014 */ lw $s1, 0x14($sp) /* 5B20DC 80218C2C 8FB00010 */ lw $s0, 0x10($sp) /* 5B20E0 80218C30 24020002 */ addiu $v0, $zero, 2 /* 5B20E4 80218C34 03E00008 */ jr $ra /* 5B20E8 80218C38 27BD0020 */ addiu $sp, $sp, 0x20 -/* 5B20EC 80218C3C 00000000 */ nop +/* 5B20EC 80218C3C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80218C40_5B20F0.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_80218C40_5B20F0.s index b0e77e35ce..8206f62516 100644 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_80218C40_5B20F0.s +++ b/asm/nonmatchings/battle/area_flo/5B16A0/func_80218C40_5B20F0.s @@ -69,12 +69,12 @@ glabel func_80218C40_5B20F0 /* 5B21F0 80218D40 82030210 */ lb $v1, 0x210($s0) /* 5B21F4 80218D44 2402000A */ addiu $v0, $zero, 0xa /* 5B21F8 80218D48 14620007 */ bne $v1, $v0, .L80218D68 -/* 5B21FC 80218D4C 00000000 */ nop +/* 5B21FC 80218D4C 00000000 */ nop /* 5B2200 80218D50 8C82000C */ lw $v0, 0xc($a0) /* 5B2204 80218D54 3C013ECC */ lui $at, 0x3ecc /* 5B2208 80218D58 3421CCCD */ ori $at, $at, 0xcccd /* 5B220C 80218D5C 44810000 */ mtc1 $at, $f0 -/* 5B2210 80218D60 00000000 */ nop +/* 5B2210 80218D60 00000000 */ nop /* 5B2214 80218D64 E4400028 */ swc1 $f0, 0x28($v0) .L80218D68: /* 5B2218 80218D68 8FBF0028 */ lw $ra, 0x28($sp) diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80218EE8_5B2398.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_80218EE8_5B2398.s index d3696cbd60..b3ca3d371b 100644 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_80218EE8_5B2398.s +++ b/asm/nonmatchings/battle/area_flo/5B16A0/func_80218EE8_5B2398.s @@ -14,11 +14,11 @@ glabel func_80218EE8_5B2398 /* 5B23BC 80218F0C 0040202D */ daddu $a0, $v0, $zero /* 5B23C0 80218F10 2402FF81 */ addiu $v0, $zero, -0x7f /* 5B23C4 80218F14 14820002 */ bne $a0, $v0, .L80218F20 -/* 5B23C8 80218F18 00000000 */ nop +/* 5B23C8 80218F18 00000000 */ nop /* 5B23CC 80218F1C 8E240148 */ lw $a0, 0x148($s1) .L80218F20: /* 5B23D0 80218F20 0C09A75B */ jal get_actor -/* 5B23D4 80218F24 00000000 */ nop +/* 5B23D4 80218F24 00000000 */ nop /* 5B23D8 80218F28 0040202D */ daddu $a0, $v0, $zero /* 5B23DC 80218F2C 90830136 */ lbu $v1, 0x136($a0) /* 5B23E0 80218F30 24020047 */ addiu $v0, $zero, 0x47 @@ -49,7 +49,7 @@ glabel func_80218EE8_5B2398 /* 5B2438 80218F88 0000302D */ daddu $a2, $zero, $zero .L80218F8C: /* 5B243C 80218F8C 0C0B2026 */ jal set_variable -/* 5B2440 80218F90 00000000 */ nop +/* 5B2440 80218F90 00000000 */ nop /* 5B2444 80218F94 8FBF0018 */ lw $ra, 0x18($sp) /* 5B2448 80218F98 8FB10014 */ lw $s1, 0x14($sp) /* 5B244C 80218F9C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_8021900C_5B24BC.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_8021900C_5B24BC.s index 902bafa44d..ef7dff016b 100644 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_8021900C_5B24BC.s +++ b/asm/nonmatchings/battle/area_flo/5B16A0/func_8021900C_5B24BC.s @@ -21,7 +21,7 @@ glabel func_8021900C_5B24BC /* 5B24FC 8021904C 0040902D */ daddu $s2, $v0, $zero /* 5B2500 80219050 2402FF81 */ addiu $v0, $zero, -0x7f /* 5B2504 80219054 16220002 */ bne $s1, $v0, .L80219060 -/* 5B2508 80219058 00000000 */ nop +/* 5B2508 80219058 00000000 */ nop /* 5B250C 8021905C 8E710148 */ lw $s1, 0x148($s3) .L80219060: /* 5B2510 80219060 0C09A75B */ jal get_actor diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_802190B0_5B2560.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_802190B0_5B2560.s index 7f2b7aa9a4..91615e97d6 100644 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_802190B0_5B2560.s +++ b/asm/nonmatchings/battle/area_flo/5B16A0/func_802190B0_5B2560.s @@ -69,12 +69,12 @@ glabel func_802190B0_5B2560 /* 5B2660 802191B0 82030210 */ lb $v1, 0x210($s0) /* 5B2664 802191B4 2402000A */ addiu $v0, $zero, 0xa /* 5B2668 802191B8 14620007 */ bne $v1, $v0, .L802191D8 -/* 5B266C 802191BC 00000000 */ nop +/* 5B266C 802191BC 00000000 */ nop /* 5B2670 802191C0 8C82000C */ lw $v0, 0xc($a0) /* 5B2674 802191C4 3C013ECC */ lui $at, 0x3ecc /* 5B2678 802191C8 3421CCCD */ ori $at, $at, 0xcccd /* 5B267C 802191CC 44810000 */ mtc1 $at, $f0 -/* 5B2680 802191D0 00000000 */ nop +/* 5B2680 802191D0 00000000 */ nop /* 5B2684 802191D4 E4400028 */ swc1 $f0, 0x28($v0) .L802191D8: /* 5B2688 802191D8 8FBF0028 */ lw $ra, 0x28($sp) diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219358_5B2808.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_80219358_5B2808.s index f0aedf78d7..3ab5b62a08 100644 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219358_5B2808.s +++ b/asm/nonmatchings/battle/area_flo/5B16A0/func_80219358_5B2808.s @@ -14,11 +14,11 @@ glabel func_80219358_5B2808 /* 5B282C 8021937C 0040202D */ daddu $a0, $v0, $zero /* 5B2830 80219380 2402FF81 */ addiu $v0, $zero, -0x7f /* 5B2834 80219384 14820002 */ bne $a0, $v0, .L80219390 -/* 5B2838 80219388 00000000 */ nop +/* 5B2838 80219388 00000000 */ nop /* 5B283C 8021938C 8E240148 */ lw $a0, 0x148($s1) .L80219390: /* 5B2840 80219390 0C09A75B */ jal get_actor -/* 5B2844 80219394 00000000 */ nop +/* 5B2844 80219394 00000000 */ nop /* 5B2848 80219398 0040202D */ daddu $a0, $v0, $zero /* 5B284C 8021939C 90830136 */ lbu $v1, 0x136($a0) /* 5B2850 802193A0 24020047 */ addiu $v0, $zero, 0x47 @@ -49,11 +49,11 @@ glabel func_80219358_5B2808 /* 5B28A8 802193F8 0000302D */ daddu $a2, $zero, $zero .L802193FC: /* 5B28AC 802193FC 0C0B2026 */ jal set_variable -/* 5B28B0 80219400 00000000 */ nop +/* 5B28B0 80219400 00000000 */ nop /* 5B28B4 80219404 8FBF0018 */ lw $ra, 0x18($sp) /* 5B28B8 80219408 8FB10014 */ lw $s1, 0x14($sp) /* 5B28BC 8021940C 8FB00010 */ lw $s0, 0x10($sp) /* 5B28C0 80219410 24020002 */ addiu $v0, $zero, 2 /* 5B28C4 80219414 03E00008 */ jr $ra /* 5B28C8 80219418 27BD0020 */ addiu $sp, $sp, 0x20 -/* 5B28CC 8021941C 00000000 */ nop +/* 5B28CC 8021941C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219420_5B28D0.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_80219420_5B28D0.s index 3bb32f15e8..866be3570c 100644 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219420_5B28D0.s +++ b/asm/nonmatchings/battle/area_flo/5B16A0/func_80219420_5B28D0.s @@ -37,7 +37,7 @@ glabel func_80219420_5B28D0 /* 5B2948 80219498 26100004 */ addiu $s0, $s0, 4 .L8021949C: /* 5B294C 8021949C 44800000 */ mtc1 $zero, $f0 -/* 5B2950 802194A0 00000000 */ nop +/* 5B2950 802194A0 00000000 */ nop /* 5B2954 802194A4 44050000 */ mfc1 $a1, $f0 /* 5B2958 802194A8 0240202D */ daddu $a0, $s2, $zero /* 5B295C 802194AC AFA00014 */ sw $zero, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_802194E0_5B2990.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_802194E0_5B2990.s index 7ddae8b8ca..d65c983db1 100644 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_802194E0_5B2990.s +++ b/asm/nonmatchings/battle/area_flo/5B16A0/func_802194E0_5B2990.s @@ -37,7 +37,7 @@ glabel func_802194E0_5B2990 /* 5B2A08 80219558 26100004 */ addiu $s0, $s0, 4 .L8021955C: /* 5B2A0C 8021955C 44800000 */ mtc1 $zero, $f0 -/* 5B2A10 80219560 00000000 */ nop +/* 5B2A10 80219560 00000000 */ nop /* 5B2A14 80219564 44050000 */ mfc1 $a1, $f0 /* 5B2A18 80219568 0240202D */ daddu $a0, $s2, $zero /* 5B2A1C 8021956C AFA00014 */ sw $zero, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_802195A0_5B2A50.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_802195A0_5B2A50.s index dd59a12b56..6ec2bf4291 100644 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_802195A0_5B2A50.s +++ b/asm/nonmatchings/battle/area_flo/5B16A0/func_802195A0_5B2A50.s @@ -37,7 +37,7 @@ glabel func_802195A0_5B2A50 /* 5B2AC8 80219618 26100004 */ addiu $s0, $s0, 4 .L8021961C: /* 5B2ACC 8021961C 44800000 */ mtc1 $zero, $f0 -/* 5B2AD0 80219620 00000000 */ nop +/* 5B2AD0 80219620 00000000 */ nop /* 5B2AD4 80219624 44050000 */ mfc1 $a1, $f0 /* 5B2AD8 80219628 0240202D */ daddu $a0, $s2, $zero /* 5B2ADC 8021962C AFA00014 */ sw $zero, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219660_5B2B10.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_80219660_5B2B10.s index 130d71b57b..99774caf43 100644 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219660_5B2B10.s +++ b/asm/nonmatchings/battle/area_flo/5B16A0/func_80219660_5B2B10.s @@ -37,7 +37,7 @@ glabel func_80219660_5B2B10 /* 5B2B88 802196D8 26100004 */ addiu $s0, $s0, 4 .L802196DC: /* 5B2B8C 802196DC 44800000 */ mtc1 $zero, $f0 -/* 5B2B90 802196E0 00000000 */ nop +/* 5B2B90 802196E0 00000000 */ nop /* 5B2B94 802196E4 44050000 */ mfc1 $a1, $f0 /* 5B2B98 802196E8 0240202D */ daddu $a0, $s2, $zero /* 5B2B9C 802196EC AFA00014 */ sw $zero, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219720_5B2BD0.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_80219720_5B2BD0.s index a489453ba1..9b0e250ee8 100644 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219720_5B2BD0.s +++ b/asm/nonmatchings/battle/area_flo/5B16A0/func_80219720_5B2BD0.s @@ -37,7 +37,7 @@ glabel func_80219720_5B2BD0 /* 5B2C48 80219798 26100004 */ addiu $s0, $s0, 4 .L8021979C: /* 5B2C4C 8021979C 44800000 */ mtc1 $zero, $f0 -/* 5B2C50 802197A0 00000000 */ nop +/* 5B2C50 802197A0 00000000 */ nop /* 5B2C54 802197A4 44050000 */ mfc1 $a1, $f0 /* 5B2C58 802197A8 0240202D */ daddu $a0, $s2, $zero /* 5B2C5C 802197AC AFA00014 */ sw $zero, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_802197E0_5B2C90.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_802197E0_5B2C90.s index 2f18657240..e78498a980 100644 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_802197E0_5B2C90.s +++ b/asm/nonmatchings/battle/area_flo/5B16A0/func_802197E0_5B2C90.s @@ -37,7 +37,7 @@ glabel func_802197E0_5B2C90 /* 5B2D08 80219858 26100004 */ addiu $s0, $s0, 4 .L8021985C: /* 5B2D0C 8021985C 44800000 */ mtc1 $zero, $f0 -/* 5B2D10 80219860 00000000 */ nop +/* 5B2D10 80219860 00000000 */ nop /* 5B2D14 80219864 44050000 */ mfc1 $a1, $f0 /* 5B2D18 80219868 0240202D */ daddu $a0, $s2, $zero /* 5B2D1C 8021986C AFA00014 */ sw $zero, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_802198A0_5B2D50.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_802198A0_5B2D50.s index ec95458de2..06b2396ce5 100644 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_802198A0_5B2D50.s +++ b/asm/nonmatchings/battle/area_flo/5B16A0/func_802198A0_5B2D50.s @@ -37,7 +37,7 @@ glabel func_802198A0_5B2D50 /* 5B2DC8 80219918 26100004 */ addiu $s0, $s0, 4 .L8021991C: /* 5B2DCC 8021991C 44800000 */ mtc1 $zero, $f0 -/* 5B2DD0 80219920 00000000 */ nop +/* 5B2DD0 80219920 00000000 */ nop /* 5B2DD4 80219924 44050000 */ mfc1 $a1, $f0 /* 5B2DD8 80219928 0240202D */ daddu $a0, $s2, $zero /* 5B2DDC 8021992C AFA00014 */ sw $zero, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219C80_5B3130.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_80219C80_5B3130.s index 85f0ba1625..2a7b8c9d6c 100644 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219C80_5B3130.s +++ b/asm/nonmatchings/battle/area_flo/5B16A0/func_80219C80_5B3130.s @@ -37,7 +37,7 @@ glabel func_80219C80_5B3130 /* 5B31A8 80219CF8 26100004 */ addiu $s0, $s0, 4 .L80219CFC: /* 5B31AC 80219CFC 44800000 */ mtc1 $zero, $f0 -/* 5B31B0 80219D00 00000000 */ nop +/* 5B31B0 80219D00 00000000 */ nop /* 5B31B4 80219D04 44050000 */ mfc1 $a1, $f0 /* 5B31B8 80219D08 0240202D */ daddu $a0, $s2, $zero /* 5B31BC 80219D0C AFA00014 */ sw $zero, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219D40_5B31F0.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_80219D40_5B31F0.s index 5ba9d3baa9..f41225c5a4 100644 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219D40_5B31F0.s +++ b/asm/nonmatchings/battle/area_flo/5B16A0/func_80219D40_5B31F0.s @@ -37,7 +37,7 @@ glabel func_80219D40_5B31F0 /* 5B3268 80219DB8 26100004 */ addiu $s0, $s0, 4 .L80219DBC: /* 5B326C 80219DBC 44800000 */ mtc1 $zero, $f0 -/* 5B3270 80219DC0 00000000 */ nop +/* 5B3270 80219DC0 00000000 */ nop /* 5B3274 80219DC4 44050000 */ mfc1 $a1, $f0 /* 5B3278 80219DC8 0240202D */ daddu $a0, $s2, $zero /* 5B327C 80219DCC AFA00014 */ sw $zero, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219E00_5B32B0.s b/asm/nonmatchings/battle/area_flo/5B16A0/func_80219E00_5B32B0.s index 40f4b2709a..06140b6985 100644 --- a/asm/nonmatchings/battle/area_flo/5B16A0/func_80219E00_5B32B0.s +++ b/asm/nonmatchings/battle/area_flo/5B16A0/func_80219E00_5B32B0.s @@ -37,7 +37,7 @@ glabel func_80219E00_5B32B0 /* 5B3328 80219E78 26100004 */ addiu $s0, $s0, 4 .L80219E7C: /* 5B332C 80219E7C 44800000 */ mtc1 $zero, $f0 -/* 5B3330 80219E80 00000000 */ nop +/* 5B3330 80219E80 00000000 */ nop /* 5B3334 80219E84 44050000 */ mfc1 $a1, $f0 /* 5B3338 80219E88 0240202D */ daddu $a0, $s2, $zero /* 5B333C 80219E8C AFA00014 */ sw $zero, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_flo2/5CE690/func_80218058_5CE6E8.s b/asm/nonmatchings/battle/area_flo2/5CE690/func_80218058_5CE6E8.s index 16b02c58dd..1333918b4c 100644 --- a/asm/nonmatchings/battle/area_flo2/5CE690/func_80218058_5CE6E8.s +++ b/asm/nonmatchings/battle/area_flo2/5CE690/func_80218058_5CE6E8.s @@ -17,30 +17,30 @@ glabel func_80218058_5CE6E8 /* 5CE718 80218088 0040882D */ daddu $s1, $v0, $zero /* 5CE71C 8021808C C6200138 */ lwc1 $f0, 0x138($s1) /* 5CE720 80218090 44821000 */ mtc1 $v0, $f2 -/* 5CE724 80218094 00000000 */ nop +/* 5CE724 80218094 00000000 */ nop /* 5CE728 80218098 468010A0 */ cvt.s.w $f2, $f2 /* 5CE72C 8021809C 46020000 */ add.s $f0, $f0, $f2 /* 5CE730 802180A0 26100004 */ addiu $s0, $s0, 4 /* 5CE734 802180A4 4600018D */ trunc.w.s $f6, $f0 /* 5CE738 802180A8 44023000 */ mfc1 $v0, $f6 -/* 5CE73C 802180AC 00000000 */ nop +/* 5CE73C 802180AC 00000000 */ nop /* 5CE740 802180B0 A6220156 */ sh $v0, 0x156($s1) /* 5CE744 802180B4 8E050000 */ lw $a1, ($s0) /* 5CE748 802180B8 0C0B1EAF */ jal get_variable /* 5CE74C 802180BC 0240202D */ daddu $a0, $s2, $zero /* 5CE750 802180C0 44822000 */ mtc1 $v0, $f4 -/* 5CE754 802180C4 00000000 */ nop +/* 5CE754 802180C4 00000000 */ nop /* 5CE758 802180C8 46802120 */ cvt.s.w $f4, $f4 /* 5CE75C 802180CC C620013C */ lwc1 $f0, 0x13c($s1) /* 5CE760 802180D0 C6220140 */ lwc1 $f2, 0x140($s1) /* 5CE764 802180D4 46040000 */ add.s $f0, $f0, $f4 /* 5CE768 802180D8 4600118D */ trunc.w.s $f6, $f2 /* 5CE76C 802180DC 44033000 */ mfc1 $v1, $f6 -/* 5CE770 802180E0 00000000 */ nop +/* 5CE770 802180E0 00000000 */ nop /* 5CE774 802180E4 A623015A */ sh $v1, 0x15a($s1) /* 5CE778 802180E8 4600018D */ trunc.w.s $f6, $f0 /* 5CE77C 802180EC 44033000 */ mfc1 $v1, $f6 -/* 5CE780 802180F0 00000000 */ nop +/* 5CE780 802180F0 00000000 */ nop /* 5CE784 802180F4 A6230158 */ sh $v1, 0x158($s1) /* 5CE788 802180F8 8FBF001C */ lw $ra, 0x1c($sp) /* 5CE78C 802180FC 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/battle/area_flo2/5CE690/func_802182A4_5CE934.s b/asm/nonmatchings/battle/area_flo2/5CE690/func_802182A4_5CE934.s index 68c6a9e481..31d7a6a8ad 100644 --- a/asm/nonmatchings/battle/area_flo2/5CE690/func_802182A4_5CE934.s +++ b/asm/nonmatchings/battle/area_flo2/5CE690/func_802182A4_5CE934.s @@ -57,16 +57,16 @@ glabel func_802182A4_5CE934 /* 5CEA04 80218374 0C00A8D4 */ jal cos_deg /* 5CEA08 80218378 4600C306 */ mov.s $f12, $f24 /* 5CEA0C 8021837C 4614B502 */ mul.s $f20, $f22, $f20 -/* 5CEA10 80218380 00000000 */ nop +/* 5CEA10 80218380 00000000 */ nop /* 5CEA14 80218384 4600A502 */ mul.s $f20, $f20, $f0 -/* 5CEA18 80218388 00000000 */ nop +/* 5CEA18 80218388 00000000 */ nop /* 5CEA1C 8021838C C7A40010 */ lwc1 $f4, 0x10($sp) /* 5CEA20 80218390 46142100 */ add.s $f4, $f4, $f20 /* 5CEA24 80218394 4600D306 */ mov.s $f12, $f26 /* 5CEA28 80218398 0C00A8BB */ jal sin_deg /* 5CEA2C 8021839C E7A40010 */ swc1 $f4, 0x10($sp) /* 5CEA30 802183A0 4600B002 */ mul.s $f0, $f22, $f0 -/* 5CEA34 802183A4 00000000 */ nop +/* 5CEA34 802183A4 00000000 */ nop /* 5CEA38 802183A8 4600D306 */ mov.s $f12, $f26 /* 5CEA3C 802183AC 0C00A8D4 */ jal cos_deg /* 5CEA40 802183B0 4600F780 */ add.s $f30, $f30, $f0 @@ -74,9 +74,9 @@ glabel func_802182A4_5CE934 /* 5CEA48 802183B8 0C00A8BB */ jal sin_deg /* 5CEA4C 802183BC 46000506 */ mov.s $f20, $f0 /* 5CEA50 802183C0 4614B582 */ mul.s $f22, $f22, $f20 -/* 5CEA54 802183C4 00000000 */ nop +/* 5CEA54 802183C4 00000000 */ nop /* 5CEA58 802183C8 4600B582 */ mul.s $f22, $f22, $f0 -/* 5CEA5C 802183CC 00000000 */ nop +/* 5CEA5C 802183CC 00000000 */ nop /* 5CEA60 802183D0 0220202D */ daddu $a0, $s1, $zero /* 5CEA64 802183D4 0260282D */ daddu $a1, $s3, $zero /* 5CEA68 802183D8 8FA60010 */ lw $a2, 0x10($sp) diff --git a/asm/nonmatchings/battle/area_flo2/5CE690/func_80218620_5CECB0.s b/asm/nonmatchings/battle/area_flo2/5CE690/func_80218620_5CECB0.s index 3c65b7639c..6974ac2ecb 100644 --- a/asm/nonmatchings/battle/area_flo2/5CE690/func_80218620_5CECB0.s +++ b/asm/nonmatchings/battle/area_flo2/5CE690/func_80218620_5CECB0.s @@ -23,7 +23,7 @@ glabel func_80218620_5CECB0 /* 5CECF8 80218668 0C0B1EAF */ jal get_variable /* 5CECFC 8021866C 02238821 */ addu $s1, $s1, $v1 /* 5CED00 80218670 44820000 */ mtc1 $v0, $f0 -/* 5CED04 80218674 00000000 */ nop +/* 5CED04 80218674 00000000 */ nop /* 5CED08 80218678 46800020 */ cvt.s.w $f0, $f0 /* 5CED0C 8021867C E6200000 */ swc1 $f0, ($s1) /* 5CED10 80218680 8E050000 */ lw $a1, ($s0) @@ -31,7 +31,7 @@ glabel func_80218620_5CECB0 /* 5CED18 80218688 0C0B1EAF */ jal get_variable /* 5CED1C 8021868C 0240202D */ daddu $a0, $s2, $zero /* 5CED20 80218690 44820000 */ mtc1 $v0, $f0 -/* 5CED24 80218694 00000000 */ nop +/* 5CED24 80218694 00000000 */ nop /* 5CED28 80218698 46800020 */ cvt.s.w $f0, $f0 /* 5CED2C 8021869C E6200004 */ swc1 $f0, 4($s1) /* 5CED30 802186A0 8E050000 */ lw $a1, ($s0) @@ -40,20 +40,20 @@ glabel func_80218620_5CECB0 /* 5CED3C 802186AC 0240202D */ daddu $a0, $s2, $zero /* 5CED40 802186B0 24040014 */ addiu $a0, $zero, 0x14 /* 5CED44 802186B4 44820000 */ mtc1 $v0, $f0 -/* 5CED48 802186B8 00000000 */ nop +/* 5CED48 802186B8 00000000 */ nop /* 5CED4C 802186BC 46800020 */ cvt.s.w $f0, $f0 /* 5CED50 802186C0 0C00A67F */ jal rand_int /* 5CED54 802186C4 E6200008 */ swc1 $f0, 8($s1) /* 5CED58 802186C8 24040028 */ addiu $a0, $zero, 0x28 /* 5CED5C 802186CC 00021023 */ negu $v0, $v0 /* 5CED60 802186D0 44820000 */ mtc1 $v0, $f0 -/* 5CED64 802186D4 00000000 */ nop +/* 5CED64 802186D4 00000000 */ nop /* 5CED68 802186D8 46800020 */ cvt.s.w $f0, $f0 /* 5CED6C 802186DC 0C00A67F */ jal rand_int /* 5CED70 802186E0 E620000C */ swc1 $f0, 0xc($s1) /* 5CED74 802186E4 2442003C */ addiu $v0, $v0, 0x3c /* 5CED78 802186E8 44820000 */ mtc1 $v0, $f0 -/* 5CED7C 802186EC 00000000 */ nop +/* 5CED7C 802186EC 00000000 */ nop /* 5CED80 802186F0 46800020 */ cvt.s.w $f0, $f0 /* 5CED84 802186F4 E6200010 */ swc1 $f0, 0x10($s1) /* 5CED88 802186F8 AE200014 */ sw $zero, 0x14($s1) @@ -62,7 +62,7 @@ glabel func_80218620_5CECB0 /* 5CED94 80218704 0C0B1EAF */ jal get_variable /* 5CED98 80218708 0240202D */ daddu $a0, $s2, $zero /* 5CED9C 8021870C 44820000 */ mtc1 $v0, $f0 -/* 5CEDA0 80218710 00000000 */ nop +/* 5CEDA0 80218710 00000000 */ nop /* 5CEDA4 80218714 46800020 */ cvt.s.w $f0, $f0 /* 5CEDA8 80218718 E6200018 */ swc1 $f0, 0x18($s1) /* 5CEDAC 8021871C 8E050000 */ lw $a1, ($s0) @@ -70,14 +70,14 @@ glabel func_80218620_5CECB0 /* 5CEDB4 80218724 0C0B1EAF */ jal get_variable /* 5CEDB8 80218728 0240202D */ daddu $a0, $s2, $zero /* 5CEDBC 8021872C 44820000 */ mtc1 $v0, $f0 -/* 5CEDC0 80218730 00000000 */ nop +/* 5CEDC0 80218730 00000000 */ nop /* 5CEDC4 80218734 46800020 */ cvt.s.w $f0, $f0 /* 5CEDC8 80218738 E620001C */ swc1 $f0, 0x1c($s1) /* 5CEDCC 8021873C 8E050000 */ lw $a1, ($s0) /* 5CEDD0 80218740 0C0B1EAF */ jal get_variable /* 5CEDD4 80218744 0240202D */ daddu $a0, $s2, $zero /* 5CEDD8 80218748 44820000 */ mtc1 $v0, $f0 -/* 5CEDDC 8021874C 00000000 */ nop +/* 5CEDDC 8021874C 00000000 */ nop /* 5CEDE0 80218750 46800020 */ cvt.s.w $f0, $f0 /* 5CEDE4 80218754 E6200020 */ swc1 $f0, 0x20($s1) /* 5CEDE8 80218758 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/battle/area_flo2/5CE690/func_80218924_5CEFB4.s b/asm/nonmatchings/battle/area_flo2/5CE690/func_80218924_5CEFB4.s index c41fd706e5..fdf33be06b 100644 --- a/asm/nonmatchings/battle/area_flo2/5CE690/func_80218924_5CEFB4.s +++ b/asm/nonmatchings/battle/area_flo2/5CE690/func_80218924_5CEFB4.s @@ -28,19 +28,19 @@ glabel func_80218924_5CEFB4 /* 5CF010 80218980 0C0B210B */ jal get_float_variable /* 5CF014 80218984 0040802D */ daddu $s0, $v0, $zero /* 5CF018 80218988 44932000 */ mtc1 $s3, $f4 -/* 5CF01C 8021898C 00000000 */ nop +/* 5CF01C 8021898C 00000000 */ nop /* 5CF020 80218990 46802120 */ cvt.s.w $f4, $f4 /* 5CF024 80218994 44052000 */ mfc1 $a1, $f4 /* 5CF028 80218998 44922000 */ mtc1 $s2, $f4 -/* 5CF02C 8021899C 00000000 */ nop +/* 5CF02C 8021899C 00000000 */ nop /* 5CF030 802189A0 46802120 */ cvt.s.w $f4, $f4 /* 5CF034 802189A4 3C014020 */ lui $at, 0x4020 /* 5CF038 802189A8 44811000 */ mtc1 $at, $f2 /* 5CF03C 802189AC 44062000 */ mfc1 $a2, $f4 /* 5CF040 802189B0 46020002 */ mul.s $f0, $f0, $f2 -/* 5CF044 802189B4 00000000 */ nop +/* 5CF044 802189B4 00000000 */ nop /* 5CF048 802189B8 44902000 */ mtc1 $s0, $f4 -/* 5CF04C 802189BC 00000000 */ nop +/* 5CF04C 802189BC 00000000 */ nop /* 5CF050 802189C0 46802120 */ cvt.s.w $f4, $f4 /* 5CF054 802189C4 44072000 */ mfc1 $a3, $f4 /* 5CF058 802189C8 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/battle/area_flo2/5CE690/func_80218B60_5CF1F0.s b/asm/nonmatchings/battle/area_flo2/5CE690/func_80218B60_5CF1F0.s index e30558dff5..053ea7362b 100644 --- a/asm/nonmatchings/battle/area_flo2/5CE690/func_80218B60_5CF1F0.s +++ b/asm/nonmatchings/battle/area_flo2/5CE690/func_80218B60_5CF1F0.s @@ -55,6 +55,6 @@ glabel func_80218B60_5CF1F0 /* 5CF2B8 80218C28 24020002 */ addiu $v0, $zero, 2 /* 5CF2BC 80218C2C 03E00008 */ jr $ra /* 5CF2C0 80218C30 27BD0040 */ addiu $sp, $sp, 0x40 -/* 5CF2C4 80218C34 00000000 */ nop -/* 5CF2C8 80218C38 00000000 */ nop -/* 5CF2CC 80218C3C 00000000 */ nop +/* 5CF2C4 80218C34 00000000 */ nop +/* 5CF2C8 80218C38 00000000 */ nop +/* 5CF2CC 80218C3C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80218DD0_5CF460.s b/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80218DD0_5CF460.s index 719c485c7a..5115c9fe5a 100644 --- a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80218DD0_5CF460.s +++ b/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80218DD0_5CF460.s @@ -37,7 +37,7 @@ glabel func_80218DD0_5CF460 /* 5CF4D8 80218E48 26100004 */ addiu $s0, $s0, 4 .L80218E4C: /* 5CF4DC 80218E4C 44800000 */ mtc1 $zero, $f0 -/* 5CF4E0 80218E50 00000000 */ nop +/* 5CF4E0 80218E50 00000000 */ nop /* 5CF4E4 80218E54 44050000 */ mfc1 $a1, $f0 /* 5CF4E8 80218E58 0240202D */ daddu $a0, $s2, $zero /* 5CF4EC 80218E5C AFA00014 */ sw $zero, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80218E90_5CF520.s b/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80218E90_5CF520.s index 1886d13257..c45f80d151 100644 --- a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80218E90_5CF520.s +++ b/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80218E90_5CF520.s @@ -37,7 +37,7 @@ glabel func_80218E90_5CF520 /* 5CF598 80218F08 26100004 */ addiu $s0, $s0, 4 .L80218F0C: /* 5CF59C 80218F0C 44800000 */ mtc1 $zero, $f0 -/* 5CF5A0 80218F10 00000000 */ nop +/* 5CF5A0 80218F10 00000000 */ nop /* 5CF5A4 80218F14 44050000 */ mfc1 $a1, $f0 /* 5CF5A8 80218F18 0240202D */ daddu $a0, $s2, $zero /* 5CF5AC 80218F1C AFA00014 */ sw $zero, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80218F50_5CF5E0.s b/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80218F50_5CF5E0.s index 57963380e6..56c8a32a03 100644 --- a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80218F50_5CF5E0.s +++ b/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80218F50_5CF5E0.s @@ -37,7 +37,7 @@ glabel func_80218F50_5CF5E0 /* 5CF658 80218FC8 26100004 */ addiu $s0, $s0, 4 .L80218FCC: /* 5CF65C 80218FCC 44800000 */ mtc1 $zero, $f0 -/* 5CF660 80218FD0 00000000 */ nop +/* 5CF660 80218FD0 00000000 */ nop /* 5CF664 80218FD4 44050000 */ mfc1 $a1, $f0 /* 5CF668 80218FD8 0240202D */ daddu $a0, $s2, $zero /* 5CF66C 80218FDC AFA00014 */ sw $zero, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80219010_5CF6A0.s b/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80219010_5CF6A0.s index 9068df9cbf..011757ca03 100644 --- a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80219010_5CF6A0.s +++ b/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80219010_5CF6A0.s @@ -37,7 +37,7 @@ glabel func_80219010_5CF6A0 /* 5CF718 80219088 26100004 */ addiu $s0, $s0, 4 .L8021908C: /* 5CF71C 8021908C 44800000 */ mtc1 $zero, $f0 -/* 5CF720 80219090 00000000 */ nop +/* 5CF720 80219090 00000000 */ nop /* 5CF724 80219094 44050000 */ mfc1 $a1, $f0 /* 5CF728 80219098 0240202D */ daddu $a0, $s2, $zero /* 5CF72C 8021909C AFA00014 */ sw $zero, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_802190D0_5CF760.s b/asm/nonmatchings/battle/area_flo2/5CF2D0/func_802190D0_5CF760.s index a752c6d8b2..962fe5557e 100644 --- a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_802190D0_5CF760.s +++ b/asm/nonmatchings/battle/area_flo2/5CF2D0/func_802190D0_5CF760.s @@ -37,7 +37,7 @@ glabel func_802190D0_5CF760 /* 5CF7D8 80219148 26100004 */ addiu $s0, $s0, 4 .L8021914C: /* 5CF7DC 8021914C 44800000 */ mtc1 $zero, $f0 -/* 5CF7E0 80219150 00000000 */ nop +/* 5CF7E0 80219150 00000000 */ nop /* 5CF7E4 80219154 44050000 */ mfc1 $a1, $f0 /* 5CF7E8 80219158 0240202D */ daddu $a0, $s2, $zero /* 5CF7EC 8021915C AFA00014 */ sw $zero, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80219190_5CF820.s b/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80219190_5CF820.s index 801eacbdb2..f03e09e548 100644 --- a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80219190_5CF820.s +++ b/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80219190_5CF820.s @@ -37,7 +37,7 @@ glabel func_80219190_5CF820 /* 5CF898 80219208 26100004 */ addiu $s0, $s0, 4 .L8021920C: /* 5CF89C 8021920C 44800000 */ mtc1 $zero, $f0 -/* 5CF8A0 80219210 00000000 */ nop +/* 5CF8A0 80219210 00000000 */ nop /* 5CF8A4 80219214 44050000 */ mfc1 $a1, $f0 /* 5CF8A8 80219218 0240202D */ daddu $a0, $s2, $zero /* 5CF8AC 8021921C AFA00014 */ sw $zero, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80219250_5CF8E0.s b/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80219250_5CF8E0.s index 71ff5f49af..67850b343f 100644 --- a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80219250_5CF8E0.s +++ b/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80219250_5CF8E0.s @@ -37,7 +37,7 @@ glabel func_80219250_5CF8E0 /* 5CF958 802192C8 26100004 */ addiu $s0, $s0, 4 .L802192CC: /* 5CF95C 802192CC 44800000 */ mtc1 $zero, $f0 -/* 5CF960 802192D0 00000000 */ nop +/* 5CF960 802192D0 00000000 */ nop /* 5CF964 802192D4 44050000 */ mfc1 $a1, $f0 /* 5CF968 802192D8 0240202D */ daddu $a0, $s2, $zero /* 5CF96C 802192DC AFA00014 */ sw $zero, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80219630_5CFCC0.s b/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80219630_5CFCC0.s index 5d69fc460e..8a20414c09 100644 --- a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80219630_5CFCC0.s +++ b/asm/nonmatchings/battle/area_flo2/5CF2D0/func_80219630_5CFCC0.s @@ -37,7 +37,7 @@ glabel func_80219630_5CFCC0 /* 5CFD38 802196A8 26100004 */ addiu $s0, $s0, 4 .L802196AC: /* 5CFD3C 802196AC 44800000 */ mtc1 $zero, $f0 -/* 5CFD40 802196B0 00000000 */ nop +/* 5CFD40 802196B0 00000000 */ nop /* 5CFD44 802196B4 44050000 */ mfc1 $a1, $f0 /* 5CFD48 802196B8 0240202D */ daddu $a0, $s2, $zero /* 5CFD4C 802196BC AFA00014 */ sw $zero, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_802196F0_5CFD80.s b/asm/nonmatchings/battle/area_flo2/5CF2D0/func_802196F0_5CFD80.s index c72dcc6cad..26addd6415 100644 --- a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_802196F0_5CFD80.s +++ b/asm/nonmatchings/battle/area_flo2/5CF2D0/func_802196F0_5CFD80.s @@ -37,7 +37,7 @@ glabel func_802196F0_5CFD80 /* 5CFDF8 80219768 26100004 */ addiu $s0, $s0, 4 .L8021976C: /* 5CFDFC 8021976C 44800000 */ mtc1 $zero, $f0 -/* 5CFE00 80219770 00000000 */ nop +/* 5CFE00 80219770 00000000 */ nop /* 5CFE04 80219774 44050000 */ mfc1 $a1, $f0 /* 5CFE08 80219778 0240202D */ daddu $a0, $s2, $zero /* 5CFE0C 8021977C AFA00014 */ sw $zero, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_802197B0_5CFE40.s b/asm/nonmatchings/battle/area_flo2/5CF2D0/func_802197B0_5CFE40.s index 75f3e8427b..66c3c72d0d 100644 --- a/asm/nonmatchings/battle/area_flo2/5CF2D0/func_802197B0_5CFE40.s +++ b/asm/nonmatchings/battle/area_flo2/5CF2D0/func_802197B0_5CFE40.s @@ -37,7 +37,7 @@ glabel func_802197B0_5CFE40 /* 5CFEB8 80219828 26100004 */ addiu $s0, $s0, 4 .L8021982C: /* 5CFEBC 8021982C 44800000 */ mtc1 $zero, $f0 -/* 5CFEC0 80219830 00000000 */ nop +/* 5CFEC0 80219830 00000000 */ nop /* 5CFEC4 80219834 44050000 */ mfc1 $a1, $f0 /* 5CFEC8 80219838 0240202D */ daddu $a0, $s2, $zero /* 5CFECC 8021983C AFA00014 */ sw $zero, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_hos/47F0D0/func_80218020_47F0D0.s b/asm/nonmatchings/battle/area_hos/47F0D0/func_80218020_47F0D0.s index 36ed3edb52..b045b6c8d1 100644 --- a/asm/nonmatchings/battle/area_hos/47F0D0/func_80218020_47F0D0.s +++ b/asm/nonmatchings/battle/area_hos/47F0D0/func_80218020_47F0D0.s @@ -17,26 +17,26 @@ glabel func_80218020_47F0D0 /* 47F100 80218050 C6200144 */ lwc1 $f0, 0x144($s1) /* 47F104 80218054 46001081 */ sub.s $f2, $f2, $f0 /* 47F108 80218058 46021082 */ mul.s $f2, $f2, $f2 -/* 47F10C 8021805C 00000000 */ nop +/* 47F10C 8021805C 00000000 */ nop /* 47F110 80218060 C626001C */ lwc1 $f6, 0x1c($s1) /* 47F114 80218064 C6200148 */ lwc1 $f0, 0x148($s1) /* 47F118 80218068 46003181 */ sub.s $f6, $f6, $f0 /* 47F11C 8021806C 46063182 */ mul.s $f6, $f6, $f6 -/* 47F120 80218070 00000000 */ nop +/* 47F120 80218070 00000000 */ nop /* 47F124 80218074 C624014C */ lwc1 $f4, 0x14c($s1) /* 47F128 80218078 C6200020 */ lwc1 $f0, 0x20($s1) /* 47F12C 8021807C 46040001 */ sub.s $f0, $f0, $f4 /* 47F130 80218080 46000002 */ mul.s $f0, $f0, $f0 -/* 47F134 80218084 00000000 */ nop +/* 47F134 80218084 00000000 */ nop /* 47F138 80218088 46061080 */ add.s $f2, $f2, $f6 /* 47F13C 8021808C 46001300 */ add.s $f12, $f2, $f0 /* 47F140 80218090 46006104 */ sqrt.s $f4, $f12 /* 47F144 80218094 46042032 */ c.eq.s $f4, $f4 -/* 47F148 80218098 00000000 */ nop +/* 47F148 80218098 00000000 */ nop /* 47F14C 8021809C 45010004 */ bc1t .L802180B0 -/* 47F150 802180A0 00000000 */ nop +/* 47F150 802180A0 00000000 */ nop /* 47F154 802180A4 0C0187BC */ jal sqrtf -/* 47F158 802180A8 00000000 */ nop +/* 47F158 802180A8 00000000 */ nop /* 47F15C 802180AC 46000106 */ mov.s $f4, $f0 .L802180B0: /* 47F160 802180B0 C620004C */ lwc1 $f0, 0x4c($s1) @@ -44,10 +44,10 @@ glabel func_80218020_47F0D0 /* 47F168 802180B8 44811000 */ mtc1 $at, $f2 /* 47F16C 802180BC 46002003 */ div.s $f0, $f4, $f0 /* 47F170 802180C0 46020002 */ mul.s $f0, $f0, $f2 -/* 47F174 802180C4 00000000 */ nop +/* 47F174 802180C4 00000000 */ nop /* 47F178 802180C8 3C013F80 */ lui $at, 0x3f80 /* 47F17C 802180CC 44811000 */ mtc1 $at, $f2 -/* 47F180 802180D0 00000000 */ nop +/* 47F180 802180D0 00000000 */ nop /* 47F184 802180D4 46020000 */ add.s $f0, $f0, $f2 /* 47F188 802180D8 4600020D */ trunc.w.s $f8, $f0 /* 47F18C 802180DC E6480070 */ swc1 $f8, 0x70($s2) diff --git a/asm/nonmatchings/battle/area_hos/47F0D0/func_80218150_47F200.s b/asm/nonmatchings/battle/area_hos/47F0D0/func_80218150_47F200.s index 9ea06861a9..7e64fac9e2 100644 --- a/asm/nonmatchings/battle/area_hos/47F0D0/func_80218150_47F200.s +++ b/asm/nonmatchings/battle/area_hos/47F0D0/func_80218150_47F200.s @@ -69,12 +69,12 @@ glabel func_80218150_47F200 /* 47F300 80218250 82030210 */ lb $v1, 0x210($s0) /* 47F304 80218254 2402000A */ addiu $v0, $zero, 0xa /* 47F308 80218258 14620007 */ bne $v1, $v0, .L80218278 -/* 47F30C 8021825C 00000000 */ nop +/* 47F30C 8021825C 00000000 */ nop /* 47F310 80218260 8C82000C */ lw $v0, 0xc($a0) /* 47F314 80218264 3C013ECC */ lui $at, 0x3ecc /* 47F318 80218268 3421CCCD */ ori $at, $at, 0xcccd /* 47F31C 8021826C 44810000 */ mtc1 $at, $f0 -/* 47F320 80218270 00000000 */ nop +/* 47F320 80218270 00000000 */ nop /* 47F324 80218274 E4400028 */ swc1 $f0, 0x28($v0) .L80218278: /* 47F328 80218278 8FBF0028 */ lw $ra, 0x28($sp) diff --git a/asm/nonmatchings/battle/area_hos/47F0D0/func_802183F8_47F4A8.s b/asm/nonmatchings/battle/area_hos/47F0D0/func_802183F8_47F4A8.s index b0c2bd2b32..f703863bc2 100644 --- a/asm/nonmatchings/battle/area_hos/47F0D0/func_802183F8_47F4A8.s +++ b/asm/nonmatchings/battle/area_hos/47F0D0/func_802183F8_47F4A8.s @@ -14,11 +14,11 @@ glabel func_802183F8_47F4A8 /* 47F4CC 8021841C 0040202D */ daddu $a0, $v0, $zero /* 47F4D0 80218420 2402FF81 */ addiu $v0, $zero, -0x7f /* 47F4D4 80218424 14820002 */ bne $a0, $v0, .L80218430 -/* 47F4D8 80218428 00000000 */ nop +/* 47F4D8 80218428 00000000 */ nop /* 47F4DC 8021842C 8E240148 */ lw $a0, 0x148($s1) .L80218430: /* 47F4E0 80218430 0C09A75B */ jal get_actor -/* 47F4E4 80218434 00000000 */ nop +/* 47F4E4 80218434 00000000 */ nop /* 47F4E8 80218438 0040202D */ daddu $a0, $v0, $zero /* 47F4EC 8021843C 90830136 */ lbu $v1, 0x136($a0) /* 47F4F0 80218440 24020047 */ addiu $v0, $zero, 0x47 @@ -49,11 +49,11 @@ glabel func_802183F8_47F4A8 /* 47F548 80218498 0000302D */ daddu $a2, $zero, $zero .L8021849C: /* 47F54C 8021849C 0C0B2026 */ jal set_variable -/* 47F550 802184A0 00000000 */ nop +/* 47F550 802184A0 00000000 */ nop /* 47F554 802184A4 8FBF0018 */ lw $ra, 0x18($sp) /* 47F558 802184A8 8FB10014 */ lw $s1, 0x14($sp) /* 47F55C 802184AC 8FB00010 */ lw $s0, 0x10($sp) /* 47F560 802184B0 24020002 */ addiu $v0, $zero, 2 /* 47F564 802184B4 03E00008 */ jr $ra /* 47F568 802184B8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 47F56C 802184BC 00000000 */ nop +/* 47F56C 802184BC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_802183C0_4E2B00.s b/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_802183C0_4E2B00.s index 5db0b347d9..747b54b5fa 100644 --- a/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_802183C0_4E2B00.s +++ b/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_802183C0_4E2B00.s @@ -11,7 +11,7 @@ glabel func_802183C0_4E2B00 /* 4E2B18 802183D8 44863000 */ mtc1 $a2, $f6 /* 4E2B1C 802183DC F7B40018 */ sdc1 $f20, 0x18($sp) /* 4E2B20 802183E0 46003502 */ mul.s $f20, $f6, $f0 -/* 4E2B24 802183E4 00000000 */ nop +/* 4E2B24 802183E4 00000000 */ nop /* 4E2B28 802183E8 AFB00010 */ sw $s0, 0x10($sp) /* 4E2B2C 802183EC 3C0143B4 */ lui $at, 0x43b4 /* 4E2B30 802183F0 44810000 */ mtc1 $at, $f0 @@ -25,9 +25,9 @@ glabel func_802183C0_4E2B00 /* 4E2B50 80218410 46000506 */ mov.s $f20, $f0 /* 4E2B54 80218414 4600B087 */ neg.s $f2, $f22 /* 4E2B58 80218418 46141082 */ mul.s $f2, $f2, $f20 -/* 4E2B5C 8021841C 00000000 */ nop +/* 4E2B5C 8021841C 00000000 */ nop /* 4E2B60 80218420 4600B582 */ mul.s $f22, $f22, $f0 -/* 4E2B64 80218424 00000000 */ nop +/* 4E2B64 80218424 00000000 */ nop /* 4E2B68 80218428 C6040000 */ lwc1 $f4, ($s0) /* 4E2B6C 8021842C 46022100 */ add.s $f4, $f4, $f2 /* 4E2B70 80218430 C6000004 */ lwc1 $f0, 4($s0) diff --git a/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218458_4E2B98.s b/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218458_4E2B98.s index 5df7a30840..ad8ddcdb77 100644 --- a/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218458_4E2B98.s +++ b/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218458_4E2B98.s @@ -11,7 +11,7 @@ glabel func_80218458_4E2B98 /* 4E2BB0 80218470 44861000 */ mtc1 $a2, $f2 /* 4E2BB4 80218474 F7B40018 */ sdc1 $f20, 0x18($sp) /* 4E2BB8 80218478 46001502 */ mul.s $f20, $f2, $f0 -/* 4E2BBC 8021847C 00000000 */ nop +/* 4E2BBC 8021847C 00000000 */ nop /* 4E2BC0 80218480 AFB00010 */ sw $s0, 0x10($sp) /* 4E2BC4 80218484 3C0143B4 */ lui $at, 0x43b4 /* 4E2BC8 80218488 44810000 */ mtc1 $at, $f0 @@ -23,7 +23,7 @@ glabel func_80218458_4E2B98 /* 4E2BE0 802184A0 0C00A874 */ jal cos_rad /* 4E2BE4 802184A4 4600A306 */ mov.s $f12, $f20 /* 4E2BE8 802184A8 4600B582 */ mul.s $f22, $f22, $f0 -/* 4E2BEC 802184AC 00000000 */ nop +/* 4E2BEC 802184AC 00000000 */ nop /* 4E2BF0 802184B0 E6160000 */ swc1 $f22, ($s0) /* 4E2BF4 802184B4 8FBF0014 */ lw $ra, 0x14($sp) /* 4E2BF8 802184B8 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_802184CC_4E2C0C.s b/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_802184CC_4E2C0C.s index 90c7cb4a02..b96421f8db 100644 --- a/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_802184CC_4E2C0C.s +++ b/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_802184CC_4E2C0C.s @@ -82,13 +82,13 @@ glabel func_802184CC_4E2C0C /* 4E2D28 802185E8 46000007 */ neg.s $f0, $f0 /* 4E2D2C 802185EC 46000000 */ add.s $f0, $f0, $f0 /* 4E2D30 802185F0 4600103C */ c.lt.s $f2, $f0 -/* 4E2D34 802185F4 00000000 */ nop +/* 4E2D34 802185F4 00000000 */ nop /* 4E2D38 802185F8 4500000D */ bc1f .L80218630 /* 4E2D3C 802185FC E6020014 */ swc1 $f2, 0x14($s0) /* 4E2D40 80218600 E6000014 */ swc1 $f0, 0x14($s0) /* 4E2D44 80218604 8E2200A8 */ lw $v0, 0xa8($s1) /* 4E2D48 80218608 10400009 */ beqz $v0, .L80218630 -/* 4E2D4C 8021860C 00000000 */ nop +/* 4E2D4C 8021860C 00000000 */ nop /* 4E2D50 80218610 16600007 */ bnez $s3, .L80218630 /* 4E2D54 80218614 24042063 */ addiu $a0, $zero, 0x2063 /* 4E2D58 80218618 C620014C */ lwc1 $f0, 0x14c($s1) @@ -108,9 +108,9 @@ glabel func_802184CC_4E2C0C /* 4E2D8C 8021864C 3C014004 */ lui $at, 0x4004 /* 4E2D90 80218650 44811800 */ mtc1 $at, $f3 /* 4E2D94 80218654 44801000 */ mtc1 $zero, $f2 -/* 4E2D98 80218658 00000000 */ nop +/* 4E2D98 80218658 00000000 */ nop /* 4E2D9C 8021865C 4622003C */ c.lt.d $f0, $f2 -/* 4E2DA0 80218660 00000000 */ nop +/* 4E2DA0 80218660 00000000 */ nop /* 4E2DA4 80218664 45000012 */ bc1f .L802186B0 /* 4E2DA8 80218668 4600A306 */ mov.s $f12, $f20 /* 4E2DAC 8021866C 3C014020 */ lui $at, 0x4020 @@ -121,9 +121,9 @@ glabel func_802184CC_4E2C0C /* 4E2DBC 8021867C 3C014014 */ lui $at, 0x4014 /* 4E2DC0 80218680 44811800 */ mtc1 $at, $f3 /* 4E2DC4 80218684 44801000 */ mtc1 $zero, $f2 -/* 4E2DC8 80218688 00000000 */ nop +/* 4E2DC8 80218688 00000000 */ nop /* 4E2DCC 8021868C 4622003C */ c.lt.d $f0, $f2 -/* 4E2DD0 80218690 00000000 */ nop +/* 4E2DD0 80218690 00000000 */ nop /* 4E2DD4 80218694 45000006 */ bc1f .L802186B0 /* 4E2DD8 80218698 4600A306 */ mov.s $f12, $f20 /* 4E2DDC 8021869C 3C0140A0 */ lui $at, 0x40a0 @@ -145,7 +145,7 @@ glabel func_802184CC_4E2C0C /* 4E2E14 802186D4 46000506 */ mov.s $f20, $f0 /* 4E2E18 802186D8 C6020028 */ lwc1 $f2, 0x28($s0) /* 4E2E1C 802186DC 4614103E */ c.le.s $f2, $f20 -/* 4E2E20 802186E0 00000000 */ nop +/* 4E2E20 802186E0 00000000 */ nop /* 4E2E24 802186E4 45000012 */ bc1f .L80218730 /* 4E2E28 802186E8 46000586 */ mov.s $f22, $f0 /* 4E2E2C 802186EC 4602A081 */ sub.s $f2, $f20, $f2 @@ -159,7 +159,7 @@ glabel func_802184CC_4E2C0C /* 4E2E4C 8021870C 44801000 */ mtc1 $zero, $f2 /* 4E2E50 80218710 46000021 */ cvt.d.s $f0, $f0 /* 4E2E54 80218714 46220002 */ mul.d $f0, $f0, $f2 -/* 4E2E58 80218718 00000000 */ nop +/* 4E2E58 80218718 00000000 */ nop /* 4E2E5C 8021871C C6020014 */ lwc1 $f2, 0x14($s0) /* 4E2E60 80218720 460010A1 */ cvt.d.s $f2, $f2 /* 4E2E64 80218724 46201080 */ add.d $f2, $f2, $f0 @@ -168,14 +168,14 @@ glabel func_802184CC_4E2C0C .L80218730: /* 4E2E70 80218730 C6000024 */ lwc1 $f0, 0x24($s0) /* 4E2E74 80218734 4614003E */ c.le.s $f0, $f20 -/* 4E2E78 80218738 00000000 */ nop +/* 4E2E78 80218738 00000000 */ nop /* 4E2E7C 8021873C 4500000F */ bc1f .L8021877C -/* 4E2E80 80218740 00000000 */ nop +/* 4E2E80 80218740 00000000 */ nop /* 4E2E84 80218744 C6000020 */ lwc1 $f0, 0x20($s0) /* 4E2E88 80218748 4614003E */ c.le.s $f0, $f20 -/* 4E2E8C 8021874C 00000000 */ nop +/* 4E2E8C 8021874C 00000000 */ nop /* 4E2E90 80218750 45000003 */ bc1f .L80218760 -/* 4E2E94 80218754 00000000 */ nop +/* 4E2E94 80218754 00000000 */ nop /* 4E2E98 80218758 080861DC */ j .L80218770 /* 4E2E9C 8021875C 4600A001 */ sub.s $f0, $f20, $f0 .L80218760: @@ -186,14 +186,14 @@ glabel func_802184CC_4E2C0C .L80218770: /* 4E2EB0 80218770 44050000 */ mfc1 $a1, $f0 /* 4E2EB4 80218774 080861F2 */ j .L802187C8 -/* 4E2EB8 80218778 00000000 */ nop +/* 4E2EB8 80218778 00000000 */ nop .L8021877C: /* 4E2EBC 8021877C C602001C */ lwc1 $f2, 0x1c($s0) /* 4E2EC0 80218780 3C018022 */ lui $at, %hi(D_80224920) /* 4E2EC4 80218784 D4204920 */ ldc1 $f0, %lo(D_80224920)($at) /* 4E2EC8 80218788 460010A1 */ cvt.d.s $f2, $f2 /* 4E2ECC 8021878C 46201082 */ mul.d $f2, $f2, $f0 -/* 4E2ED0 80218790 00000000 */ nop +/* 4E2ED0 80218790 00000000 */ nop /* 4E2ED4 80218794 C6000018 */ lwc1 $f0, 0x18($s0) /* 4E2ED8 80218798 46000021 */ cvt.d.s $f0, $f0 /* 4E2EDC 8021879C 46220001 */ sub.d $f0, $f0, $f2 @@ -202,7 +202,7 @@ glabel func_802184CC_4E2C0C /* 4E2EE8 802187A8 46200020 */ cvt.s.d $f0, $f0 /* 4E2EEC 802187AC 460000A1 */ cvt.d.s $f2, $f0 /* 4E2EF0 802187B0 4624103C */ c.lt.d $f2, $f4 -/* 4E2EF4 802187B4 00000000 */ nop +/* 4E2EF4 802187B4 00000000 */ nop /* 4E2EF8 802187B8 45000002 */ bc1f .L802187C4 /* 4E2EFC 802187BC E6000018 */ swc1 $f0, 0x18($s0) /* 4E2F00 802187C0 AE000018 */ sw $zero, 0x18($s0) @@ -218,12 +218,12 @@ glabel func_802184CC_4E2C0C /* 4E2F20 802187E0 44801000 */ mtc1 $zero, $f2 /* 4E2F24 802187E4 46000021 */ cvt.d.s $f0, $f0 /* 4E2F28 802187E8 4620103C */ c.lt.d $f2, $f0 -/* 4E2F2C 802187EC 00000000 */ nop +/* 4E2F2C 802187EC 00000000 */ nop /* 4E2F30 802187F0 45000005 */ bc1f .L80218808 /* 4E2F34 802187F4 0220202D */ daddu $a0, $s1, $zero /* 4E2F38 802187F8 3C014080 */ lui $at, 0x4080 /* 4E2F3C 802187FC 44810000 */ mtc1 $at, $f0 -/* 4E2F40 80218800 00000000 */ nop +/* 4E2F40 80218800 00000000 */ nop /* 4E2F44 80218804 E6000018 */ swc1 $f0, 0x18($s0) .L80218808: /* 4E2F48 80218808 0C099117 */ jal get_actor_part diff --git a/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218944_4E3084.s b/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218944_4E3084.s index 6ed8d83db9..8738899e21 100644 --- a/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218944_4E3084.s +++ b/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218944_4E3084.s @@ -7,13 +7,13 @@ glabel func_80218944_4E3084 /* 4E308C 8021894C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 4E3090 80218950 AFBF0010 */ sw $ra, 0x10($sp) /* 4E3094 80218954 0C016914 */ jal remove_effect -/* 4E3098 80218958 00000000 */ nop +/* 4E3098 80218958 00000000 */ nop /* 4E309C 8021895C 3C048022 */ lui $a0, %hi(D_80224D64) /* 4E30A0 80218960 8C844D64 */ lw $a0, %lo(D_80224D64)($a0) /* 4E30A4 80218964 0C016914 */ jal remove_effect -/* 4E30A8 80218968 00000000 */ nop +/* 4E30A8 80218968 00000000 */ nop /* 4E30AC 8021896C 8FBF0010 */ lw $ra, 0x10($sp) /* 4E30B0 80218970 24020002 */ addiu $v0, $zero, 2 /* 4E30B4 80218974 03E00008 */ jr $ra /* 4E30B8 80218978 27BD0018 */ addiu $sp, $sp, 0x18 -/* 4E30BC 8021897C 00000000 */ nop +/* 4E30BC 8021897C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218A10_4E3150.s b/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218A10_4E3150.s index e7ce9c3ee3..eb75ddf111 100644 --- a/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218A10_4E3150.s +++ b/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_80218A10_4E3150.s @@ -7,14 +7,14 @@ glabel func_80218A10_4E3150 /* 4E3158 80218A18 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 4E315C 80218A1C AFBF0010 */ sw $ra, 0x10($sp) /* 4E3160 80218A20 0C016914 */ jal remove_effect -/* 4E3164 80218A24 00000000 */ nop +/* 4E3164 80218A24 00000000 */ nop /* 4E3168 80218A28 3C048022 */ lui $a0, %hi(D_80224D74) /* 4E316C 80218A2C 8C844D74 */ lw $a0, %lo(D_80224D74)($a0) /* 4E3170 80218A30 0C016914 */ jal remove_effect -/* 4E3174 80218A34 00000000 */ nop +/* 4E3174 80218A34 00000000 */ nop /* 4E3178 80218A38 8FBF0010 */ lw $ra, 0x10($sp) /* 4E317C 80218A3C 24020002 */ addiu $v0, $zero, 2 /* 4E3180 80218A40 03E00008 */ jr $ra /* 4E3184 80218A44 27BD0018 */ addiu $sp, $sp, 0x18 -/* 4E3188 80218A48 00000000 */ nop -/* 4E318C 80218A4C 00000000 */ nop +/* 4E3188 80218A48 00000000 */ nop +/* 4E318C 80218A4C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_isk_part_1/4E3190/func_80218A98_4E31D8.s b/asm/nonmatchings/battle/area_isk_part_1/4E3190/func_80218A98_4E31D8.s index 07e90bb481..42e32dee47 100644 --- a/asm/nonmatchings/battle/area_isk_part_1/4E3190/func_80218A98_4E31D8.s +++ b/asm/nonmatchings/battle/area_isk_part_1/4E3190/func_80218A98_4E31D8.s @@ -7,7 +7,7 @@ glabel func_80218A98_4E31D8 /* 4E31E0 80218AA0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 4E31E4 80218AA4 AFBF0010 */ sw $ra, 0x10($sp) /* 4E31E8 80218AA8 0C016914 */ jal remove_effect -/* 4E31EC 80218AAC 00000000 */ nop +/* 4E31EC 80218AAC 00000000 */ nop /* 4E31F0 80218AB0 8FBF0010 */ lw $ra, 0x10($sp) /* 4E31F4 80218AB4 24020002 */ addiu $v0, $zero, 2 /* 4E31F8 80218AB8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/battle/area_isk_part_1/4E3190/func_80218B08_4E3248.s b/asm/nonmatchings/battle/area_isk_part_1/4E3190/func_80218B08_4E3248.s index ea4b6a843d..45b3534d7a 100644 --- a/asm/nonmatchings/battle/area_isk_part_1/4E3190/func_80218B08_4E3248.s +++ b/asm/nonmatchings/battle/area_isk_part_1/4E3190/func_80218B08_4E3248.s @@ -7,7 +7,7 @@ glabel func_80218B08_4E3248 /* 4E3250 80218B10 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 4E3254 80218B14 AFBF0010 */ sw $ra, 0x10($sp) /* 4E3258 80218B18 0C016914 */ jal remove_effect -/* 4E325C 80218B1C 00000000 */ nop +/* 4E325C 80218B1C 00000000 */ nop /* 4E3260 80218B20 8FBF0010 */ lw $ra, 0x10($sp) /* 4E3264 80218B24 24020002 */ addiu $v0, $zero, 2 /* 4E3268 80218B28 03E00008 */ jr $ra diff --git a/asm/nonmatchings/battle/area_isk_part_1/4E3190/func_80218B78_4E32B8.s b/asm/nonmatchings/battle/area_isk_part_1/4E3190/func_80218B78_4E32B8.s index 134f1bdcbf..b480404572 100644 --- a/asm/nonmatchings/battle/area_isk_part_1/4E3190/func_80218B78_4E32B8.s +++ b/asm/nonmatchings/battle/area_isk_part_1/4E3190/func_80218B78_4E32B8.s @@ -7,7 +7,7 @@ glabel func_80218B78_4E32B8 /* 4E32C0 80218B80 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 4E32C4 80218B84 AFBF0010 */ sw $ra, 0x10($sp) /* 4E32C8 80218B88 0C016914 */ jal remove_effect -/* 4E32CC 80218B8C 00000000 */ nop +/* 4E32CC 80218B8C 00000000 */ nop /* 4E32D0 80218B90 8FBF0010 */ lw $ra, 0x10($sp) /* 4E32D4 80218B94 24020002 */ addiu $v0, $zero, 2 /* 4E32D8 80218B98 03E00008 */ jr $ra diff --git a/asm/nonmatchings/battle/area_isk_part_1/4E3190/func_80218BE8_4E3328.s b/asm/nonmatchings/battle/area_isk_part_1/4E3190/func_80218BE8_4E3328.s index eca1328d84..d9c958adbe 100644 --- a/asm/nonmatchings/battle/area_isk_part_1/4E3190/func_80218BE8_4E3328.s +++ b/asm/nonmatchings/battle/area_isk_part_1/4E3190/func_80218BE8_4E3328.s @@ -7,7 +7,7 @@ glabel func_80218BE8_4E3328 /* 4E3330 80218BF0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 4E3334 80218BF4 AFBF0010 */ sw $ra, 0x10($sp) /* 4E3338 80218BF8 0C016914 */ jal remove_effect -/* 4E333C 80218BFC 00000000 */ nop +/* 4E333C 80218BFC 00000000 */ nop /* 4E3340 80218C00 8FBF0010 */ lw $ra, 0x10($sp) /* 4E3344 80218C04 24020002 */ addiu $v0, $zero, 2 /* 4E3348 80218C08 03E00008 */ jr $ra diff --git a/asm/nonmatchings/battle/area_isk_part_2/4EF4A0/func_80218150_4EF5F0.s b/asm/nonmatchings/battle/area_isk_part_2/4EF4A0/func_80218150_4EF5F0.s index 120c8ef3c2..8efaf642bd 100644 --- a/asm/nonmatchings/battle/area_isk_part_2/4EF4A0/func_80218150_4EF5F0.s +++ b/asm/nonmatchings/battle/area_isk_part_2/4EF4A0/func_80218150_4EF5F0.s @@ -11,7 +11,7 @@ glabel func_80218150_4EF5F0 /* 4EF608 80218168 44863000 */ mtc1 $a2, $f6 /* 4EF60C 8021816C F7B40018 */ sdc1 $f20, 0x18($sp) /* 4EF610 80218170 46003502 */ mul.s $f20, $f6, $f0 -/* 4EF614 80218174 00000000 */ nop +/* 4EF614 80218174 00000000 */ nop /* 4EF618 80218178 AFB00010 */ sw $s0, 0x10($sp) /* 4EF61C 8021817C 3C0143B4 */ lui $at, 0x43b4 /* 4EF620 80218180 44810000 */ mtc1 $at, $f0 @@ -25,9 +25,9 @@ glabel func_80218150_4EF5F0 /* 4EF640 802181A0 46000506 */ mov.s $f20, $f0 /* 4EF644 802181A4 4600B087 */ neg.s $f2, $f22 /* 4EF648 802181A8 46141082 */ mul.s $f2, $f2, $f20 -/* 4EF64C 802181AC 00000000 */ nop +/* 4EF64C 802181AC 00000000 */ nop /* 4EF650 802181B0 4600B582 */ mul.s $f22, $f22, $f0 -/* 4EF654 802181B4 00000000 */ nop +/* 4EF654 802181B4 00000000 */ nop /* 4EF658 802181B8 C6040000 */ lwc1 $f4, ($s0) /* 4EF65C 802181BC 46022100 */ add.s $f4, $f4, $f2 /* 4EF660 802181C0 C6000004 */ lwc1 $f0, 4($s0) diff --git a/asm/nonmatchings/battle/area_isk_part_2/4EF4A0/func_802181E8_4EF688.s b/asm/nonmatchings/battle/area_isk_part_2/4EF4A0/func_802181E8_4EF688.s index 73cb804b33..312da35fc0 100644 --- a/asm/nonmatchings/battle/area_isk_part_2/4EF4A0/func_802181E8_4EF688.s +++ b/asm/nonmatchings/battle/area_isk_part_2/4EF4A0/func_802181E8_4EF688.s @@ -11,7 +11,7 @@ glabel func_802181E8_4EF688 /* 4EF6A0 80218200 44861000 */ mtc1 $a2, $f2 /* 4EF6A4 80218204 F7B40018 */ sdc1 $f20, 0x18($sp) /* 4EF6A8 80218208 46001502 */ mul.s $f20, $f2, $f0 -/* 4EF6AC 8021820C 00000000 */ nop +/* 4EF6AC 8021820C 00000000 */ nop /* 4EF6B0 80218210 AFB00010 */ sw $s0, 0x10($sp) /* 4EF6B4 80218214 3C0143B4 */ lui $at, 0x43b4 /* 4EF6B8 80218218 44810000 */ mtc1 $at, $f0 @@ -23,7 +23,7 @@ glabel func_802181E8_4EF688 /* 4EF6D0 80218230 0C00A874 */ jal cos_rad /* 4EF6D4 80218234 4600A306 */ mov.s $f12, $f20 /* 4EF6D8 80218238 4600B582 */ mul.s $f22, $f22, $f0 -/* 4EF6DC 8021823C 00000000 */ nop +/* 4EF6DC 8021823C 00000000 */ nop /* 4EF6E0 80218240 E6160000 */ swc1 $f22, ($s0) /* 4EF6E4 80218244 8FBF0014 */ lw $ra, 0x14($sp) /* 4EF6E8 80218248 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/battle/area_isk_part_2/4EF4A0/func_8021825C_4EF6FC.s b/asm/nonmatchings/battle/area_isk_part_2/4EF4A0/func_8021825C_4EF6FC.s index e752ecbaf2..4062ffa91c 100644 --- a/asm/nonmatchings/battle/area_isk_part_2/4EF4A0/func_8021825C_4EF6FC.s +++ b/asm/nonmatchings/battle/area_isk_part_2/4EF4A0/func_8021825C_4EF6FC.s @@ -69,7 +69,7 @@ glabel func_8021825C_4EF6FC .L80218354: /* 4EF7F4 80218354 82220210 */ lb $v0, 0x210($s1) /* 4EF7F8 80218358 14540005 */ bne $v0, $s4, .L80218370 -/* 4EF7FC 8021835C 00000000 */ nop +/* 4EF7FC 8021835C 00000000 */ nop /* 4EF800 80218360 E61A0020 */ swc1 $f26, 0x20($s0) /* 4EF804 80218364 E61A0028 */ swc1 $f26, 0x28($s0) /* 4EF808 80218368 080860E2 */ j .L80218388 @@ -77,7 +77,7 @@ glabel func_8021825C_4EF6FC .L80218370: /* 4EF810 80218370 3C0140E0 */ lui $at, 0x40e0 /* 4EF814 80218374 44810000 */ mtc1 $at, $f0 -/* 4EF818 80218378 00000000 */ nop +/* 4EF818 80218378 00000000 */ nop /* 4EF81C 8021837C E6000020 */ swc1 $f0, 0x20($s0) /* 4EF820 80218380 E6000028 */ swc1 $f0, 0x28($s0) /* 4EF824 80218384 E6000024 */ swc1 $f0, 0x24($s0) @@ -88,13 +88,13 @@ glabel func_8021825C_4EF6FC /* 4EF834 80218394 46000007 */ neg.s $f0, $f0 /* 4EF838 80218398 46000000 */ add.s $f0, $f0, $f0 /* 4EF83C 8021839C 4600103C */ c.lt.s $f2, $f0 -/* 4EF840 802183A0 00000000 */ nop +/* 4EF840 802183A0 00000000 */ nop /* 4EF844 802183A4 4500000D */ bc1f .L802183DC /* 4EF848 802183A8 E6020014 */ swc1 $f2, 0x14($s0) /* 4EF84C 802183AC E6000014 */ swc1 $f0, 0x14($s0) /* 4EF850 802183B0 8E2200A8 */ lw $v0, 0xa8($s1) /* 4EF854 802183B4 10400009 */ beqz $v0, .L802183DC -/* 4EF858 802183B8 00000000 */ nop +/* 4EF858 802183B8 00000000 */ nop /* 4EF85C 802183BC 16600007 */ bnez $s3, .L802183DC /* 4EF860 802183C0 24042063 */ addiu $a0, $zero, 0x2063 /* 4EF864 802183C4 C620014C */ lwc1 $f0, 0x14c($s1) @@ -114,9 +114,9 @@ glabel func_8021825C_4EF6FC /* 4EF898 802183F8 3C014004 */ lui $at, 0x4004 /* 4EF89C 802183FC 44811800 */ mtc1 $at, $f3 /* 4EF8A0 80218400 44801000 */ mtc1 $zero, $f2 -/* 4EF8A4 80218404 00000000 */ nop +/* 4EF8A4 80218404 00000000 */ nop /* 4EF8A8 80218408 4622003C */ c.lt.d $f0, $f2 -/* 4EF8AC 8021840C 00000000 */ nop +/* 4EF8AC 8021840C 00000000 */ nop /* 4EF8B0 80218410 45000012 */ bc1f .L8021845C /* 4EF8B4 80218414 4600A306 */ mov.s $f12, $f20 /* 4EF8B8 80218418 3C014020 */ lui $at, 0x4020 @@ -127,9 +127,9 @@ glabel func_8021825C_4EF6FC /* 4EF8C8 80218428 3C014014 */ lui $at, 0x4014 /* 4EF8CC 8021842C 44811800 */ mtc1 $at, $f3 /* 4EF8D0 80218430 44801000 */ mtc1 $zero, $f2 -/* 4EF8D4 80218434 00000000 */ nop +/* 4EF8D4 80218434 00000000 */ nop /* 4EF8D8 80218438 4622003C */ c.lt.d $f0, $f2 -/* 4EF8DC 8021843C 00000000 */ nop +/* 4EF8DC 8021843C 00000000 */ nop /* 4EF8E0 80218440 45000006 */ bc1f .L8021845C /* 4EF8E4 80218444 4600A306 */ mov.s $f12, $f20 /* 4EF8E8 80218448 3C0140A0 */ lui $at, 0x40a0 @@ -151,7 +151,7 @@ glabel func_8021825C_4EF6FC /* 4EF920 80218480 46000506 */ mov.s $f20, $f0 /* 4EF924 80218484 C6020028 */ lwc1 $f2, 0x28($s0) /* 4EF928 80218488 4614103E */ c.le.s $f2, $f20 -/* 4EF92C 8021848C 00000000 */ nop +/* 4EF92C 8021848C 00000000 */ nop /* 4EF930 80218490 45000012 */ bc1f .L802184DC /* 4EF934 80218494 46000586 */ mov.s $f22, $f0 /* 4EF938 80218498 4602A081 */ sub.s $f2, $f20, $f2 @@ -165,7 +165,7 @@ glabel func_8021825C_4EF6FC /* 4EF958 802184B8 44801000 */ mtc1 $zero, $f2 /* 4EF95C 802184BC 46000021 */ cvt.d.s $f0, $f0 /* 4EF960 802184C0 46220002 */ mul.d $f0, $f0, $f2 -/* 4EF964 802184C4 00000000 */ nop +/* 4EF964 802184C4 00000000 */ nop /* 4EF968 802184C8 C6020014 */ lwc1 $f2, 0x14($s0) /* 4EF96C 802184CC 460010A1 */ cvt.d.s $f2, $f2 /* 4EF970 802184D0 46201080 */ add.d $f2, $f2, $f0 @@ -174,14 +174,14 @@ glabel func_8021825C_4EF6FC .L802184DC: /* 4EF97C 802184DC C6000024 */ lwc1 $f0, 0x24($s0) /* 4EF980 802184E0 4614003E */ c.le.s $f0, $f20 -/* 4EF984 802184E4 00000000 */ nop +/* 4EF984 802184E4 00000000 */ nop /* 4EF988 802184E8 4500000F */ bc1f .L80218528 -/* 4EF98C 802184EC 00000000 */ nop +/* 4EF98C 802184EC 00000000 */ nop /* 4EF990 802184F0 C6000020 */ lwc1 $f0, 0x20($s0) /* 4EF994 802184F4 4614003E */ c.le.s $f0, $f20 -/* 4EF998 802184F8 00000000 */ nop +/* 4EF998 802184F8 00000000 */ nop /* 4EF99C 802184FC 45000003 */ bc1f .L8021850C -/* 4EF9A0 80218500 00000000 */ nop +/* 4EF9A0 80218500 00000000 */ nop /* 4EF9A4 80218504 08086147 */ j .L8021851C /* 4EF9A8 80218508 4600A001 */ sub.s $f0, $f20, $f0 .L8021850C: @@ -192,14 +192,14 @@ glabel func_8021825C_4EF6FC .L8021851C: /* 4EF9BC 8021851C 44050000 */ mfc1 $a1, $f0 /* 4EF9C0 80218520 0808615D */ j .L80218574 -/* 4EF9C4 80218524 00000000 */ nop +/* 4EF9C4 80218524 00000000 */ nop .L80218528: /* 4EF9C8 80218528 C602001C */ lwc1 $f2, 0x1c($s0) /* 4EF9CC 8021852C 3C018022 */ lui $at, %hi(D_802204E0) /* 4EF9D0 80218530 D42004E0 */ ldc1 $f0, %lo(D_802204E0)($at) /* 4EF9D4 80218534 460010A1 */ cvt.d.s $f2, $f2 /* 4EF9D8 80218538 46201082 */ mul.d $f2, $f2, $f0 -/* 4EF9DC 8021853C 00000000 */ nop +/* 4EF9DC 8021853C 00000000 */ nop /* 4EF9E0 80218540 C6000018 */ lwc1 $f0, 0x18($s0) /* 4EF9E4 80218544 46000021 */ cvt.d.s $f0, $f0 /* 4EF9E8 80218548 46220001 */ sub.d $f0, $f0, $f2 @@ -208,7 +208,7 @@ glabel func_8021825C_4EF6FC /* 4EF9F4 80218554 46200020 */ cvt.s.d $f0, $f0 /* 4EF9F8 80218558 460000A1 */ cvt.d.s $f2, $f0 /* 4EF9FC 8021855C 4624103C */ c.lt.d $f2, $f4 -/* 4EFA00 80218560 00000000 */ nop +/* 4EFA00 80218560 00000000 */ nop /* 4EFA04 80218564 45000002 */ bc1f .L80218570 /* 4EFA08 80218568 E6000018 */ swc1 $f0, 0x18($s0) /* 4EFA0C 8021856C AE000018 */ sw $zero, 0x18($s0) @@ -224,17 +224,17 @@ glabel func_8021825C_4EF6FC /* 4EFA2C 8021858C 44801000 */ mtc1 $zero, $f2 /* 4EFA30 80218590 46000021 */ cvt.d.s $f0, $f0 /* 4EFA34 80218594 4620103C */ c.lt.d $f2, $f0 -/* 4EFA38 80218598 00000000 */ nop +/* 4EFA38 80218598 00000000 */ nop /* 4EFA3C 8021859C 45000005 */ bc1f .L802185B4 /* 4EFA40 802185A0 0220202D */ daddu $a0, $s1, $zero /* 4EFA44 802185A4 3C014080 */ lui $at, 0x4080 /* 4EFA48 802185A8 44810000 */ mtc1 $at, $f0 -/* 4EFA4C 802185AC 00000000 */ nop +/* 4EFA4C 802185AC 00000000 */ nop /* 4EFA50 802185B0 E6000018 */ swc1 $f0, 0x18($s0) .L802185B4: /* 4EFA54 802185B4 02D32821 */ addu $a1, $s6, $s3 /* 4EFA58 802185B8 44950000 */ mtc1 $s5, $f0 -/* 4EFA5C 802185BC 00000000 */ nop +/* 4EFA5C 802185BC 00000000 */ nop /* 4EFA60 802185C0 46800020 */ cvt.s.w $f0, $f0 /* 4EFA64 802185C4 0C099117 */ jal get_actor_part /* 4EFA68 802185C8 E6000004 */ swc1 $f0, 4($s0) diff --git a/asm/nonmatchings/battle/area_isk_part_2/4EF4A0/func_8021875C_4EFBFC.s b/asm/nonmatchings/battle/area_isk_part_2/4EF4A0/func_8021875C_4EFBFC.s index 1987014d60..d2660596f3 100644 --- a/asm/nonmatchings/battle/area_isk_part_2/4EF4A0/func_8021875C_4EFBFC.s +++ b/asm/nonmatchings/battle/area_isk_part_2/4EF4A0/func_8021875C_4EFBFC.s @@ -23,14 +23,14 @@ glabel func_8021875C_4EFBFC /* 4EFC44 802187A4 0040802D */ daddu $s0, $v0, $zero /* 4EFC48 802187A8 24040002 */ addiu $a0, $zero, 2 /* 4EFC4C 802187AC 44923000 */ mtc1 $s2, $f6 -/* 4EFC50 802187B0 00000000 */ nop +/* 4EFC50 802187B0 00000000 */ nop /* 4EFC54 802187B4 468031A0 */ cvt.s.w $f6, $f6 /* 4EFC58 802187B8 44900000 */ mtc1 $s0, $f0 -/* 4EFC5C 802187BC 00000000 */ nop +/* 4EFC5C 802187BC 00000000 */ nop /* 4EFC60 802187C0 46800020 */ cvt.s.w $f0, $f0 /* 4EFC64 802187C4 44053000 */ mfc1 $a1, $f6 /* 4EFC68 802187C8 44823000 */ mtc1 $v0, $f6 -/* 4EFC6C 802187CC 00000000 */ nop +/* 4EFC6C 802187CC 00000000 */ nop /* 4EFC70 802187D0 468031A0 */ cvt.s.w $f6, $f6 /* 4EFC74 802187D4 E7A00010 */ swc1 $f0, 0x10($sp) /* 4EFC78 802187D8 3C01BF00 */ lui $at, 0xbf00 @@ -61,5 +61,5 @@ glabel func_8021875C_4EFBFC /* 4EFCDC 8021883C 24020002 */ addiu $v0, $zero, 2 /* 4EFCE0 80218840 03E00008 */ jr $ra /* 4EFCE4 80218844 27BD0038 */ addiu $sp, $sp, 0x38 -/* 4EFCE8 80218848 00000000 */ nop -/* 4EFCEC 8021884C 00000000 */ nop +/* 4EFCE8 80218848 00000000 */ nop +/* 4EFCEC 8021884C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_isk_part_2/4EFCF0/func_802188E4_4EFD84.s b/asm/nonmatchings/battle/area_isk_part_2/4EFCF0/func_802188E4_4EFD84.s index 33a7c57a74..0ca1512df2 100644 --- a/asm/nonmatchings/battle/area_isk_part_2/4EFCF0/func_802188E4_4EFD84.s +++ b/asm/nonmatchings/battle/area_isk_part_2/4EFCF0/func_802188E4_4EFD84.s @@ -7,13 +7,13 @@ glabel func_802188E4_4EFD84 /* 4EFD8C 802188EC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 4EFD90 802188F0 AFBF0010 */ sw $ra, 0x10($sp) /* 4EFD94 802188F4 0C016914 */ jal remove_effect -/* 4EFD98 802188F8 00000000 */ nop +/* 4EFD98 802188F8 00000000 */ nop /* 4EFD9C 802188FC 3C048022 */ lui $a0, %hi(D_80220744) /* 4EFDA0 80218900 8C840744 */ lw $a0, %lo(D_80220744)($a0) /* 4EFDA4 80218904 0C016914 */ jal remove_effect -/* 4EFDA8 80218908 00000000 */ nop +/* 4EFDA8 80218908 00000000 */ nop /* 4EFDAC 8021890C 8FBF0010 */ lw $ra, 0x10($sp) /* 4EFDB0 80218910 24020002 */ addiu $v0, $zero, 2 /* 4EFDB4 80218914 03E00008 */ jr $ra /* 4EFDB8 80218918 27BD0018 */ addiu $sp, $sp, 0x18 -/* 4EFDBC 8021891C 00000000 */ nop +/* 4EFDBC 8021891C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_isk_part_2/4EFCF0/func_802189B0_4EFE50.s b/asm/nonmatchings/battle/area_isk_part_2/4EFCF0/func_802189B0_4EFE50.s index f2f73b632f..83bd7c9918 100644 --- a/asm/nonmatchings/battle/area_isk_part_2/4EFCF0/func_802189B0_4EFE50.s +++ b/asm/nonmatchings/battle/area_isk_part_2/4EFCF0/func_802189B0_4EFE50.s @@ -7,14 +7,14 @@ glabel func_802189B0_4EFE50 /* 4EFE58 802189B8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 4EFE5C 802189BC AFBF0010 */ sw $ra, 0x10($sp) /* 4EFE60 802189C0 0C016914 */ jal remove_effect -/* 4EFE64 802189C4 00000000 */ nop +/* 4EFE64 802189C4 00000000 */ nop /* 4EFE68 802189C8 3C048022 */ lui $a0, %hi(D_80220754) /* 4EFE6C 802189CC 8C840754 */ lw $a0, %lo(D_80220754)($a0) /* 4EFE70 802189D0 0C016914 */ jal remove_effect -/* 4EFE74 802189D4 00000000 */ nop +/* 4EFE74 802189D4 00000000 */ nop /* 4EFE78 802189D8 8FBF0010 */ lw $ra, 0x10($sp) /* 4EFE7C 802189DC 24020002 */ addiu $v0, $zero, 2 /* 4EFE80 802189E0 03E00008 */ jr $ra /* 4EFE84 802189E4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 4EFE88 802189E8 00000000 */ nop -/* 4EFE8C 802189EC 00000000 */ nop +/* 4EFE88 802189E8 00000000 */ nop +/* 4EFE8C 802189EC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_isk_part_2/4EFE90/func_80218A38_4EFED8.s b/asm/nonmatchings/battle/area_isk_part_2/4EFE90/func_80218A38_4EFED8.s index 36eb1987a5..37a165e421 100644 --- a/asm/nonmatchings/battle/area_isk_part_2/4EFE90/func_80218A38_4EFED8.s +++ b/asm/nonmatchings/battle/area_isk_part_2/4EFE90/func_80218A38_4EFED8.s @@ -7,7 +7,7 @@ glabel func_80218A38_4EFED8 /* 4EFEE0 80218A40 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 4EFEE4 80218A44 AFBF0010 */ sw $ra, 0x10($sp) /* 4EFEE8 80218A48 0C016914 */ jal remove_effect -/* 4EFEEC 80218A4C 00000000 */ nop +/* 4EFEEC 80218A4C 00000000 */ nop /* 4EFEF0 80218A50 8FBF0010 */ lw $ra, 0x10($sp) /* 4EFEF4 80218A54 24020002 */ addiu $v0, $zero, 2 /* 4EFEF8 80218A58 03E00008 */ jr $ra diff --git a/asm/nonmatchings/battle/area_isk_part_2/4EFE90/func_80218AA8_4EFF48.s b/asm/nonmatchings/battle/area_isk_part_2/4EFE90/func_80218AA8_4EFF48.s index fdfc2faa83..6609c52a2b 100644 --- a/asm/nonmatchings/battle/area_isk_part_2/4EFE90/func_80218AA8_4EFF48.s +++ b/asm/nonmatchings/battle/area_isk_part_2/4EFE90/func_80218AA8_4EFF48.s @@ -7,7 +7,7 @@ glabel func_80218AA8_4EFF48 /* 4EFF50 80218AB0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 4EFF54 80218AB4 AFBF0010 */ sw $ra, 0x10($sp) /* 4EFF58 80218AB8 0C016914 */ jal remove_effect -/* 4EFF5C 80218ABC 00000000 */ nop +/* 4EFF5C 80218ABC 00000000 */ nop /* 4EFF60 80218AC0 8FBF0010 */ lw $ra, 0x10($sp) /* 4EFF64 80218AC4 24020002 */ addiu $v0, $zero, 2 /* 4EFF68 80218AC8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/battle/area_isk_part_2/4EFE90/func_80218B18_4EFFB8.s b/asm/nonmatchings/battle/area_isk_part_2/4EFE90/func_80218B18_4EFFB8.s index 04e0031b53..7969a8b9b2 100644 --- a/asm/nonmatchings/battle/area_isk_part_2/4EFE90/func_80218B18_4EFFB8.s +++ b/asm/nonmatchings/battle/area_isk_part_2/4EFE90/func_80218B18_4EFFB8.s @@ -7,7 +7,7 @@ glabel func_80218B18_4EFFB8 /* 4EFFC0 80218B20 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 4EFFC4 80218B24 AFBF0010 */ sw $ra, 0x10($sp) /* 4EFFC8 80218B28 0C016914 */ jal remove_effect -/* 4EFFCC 80218B2C 00000000 */ nop +/* 4EFFCC 80218B2C 00000000 */ nop /* 4EFFD0 80218B30 8FBF0010 */ lw $ra, 0x10($sp) /* 4EFFD4 80218B34 24020002 */ addiu $v0, $zero, 2 /* 4EFFD8 80218B38 03E00008 */ jr $ra diff --git a/asm/nonmatchings/battle/area_iwa/4D01F0/func_80218000_4D01F0.s b/asm/nonmatchings/battle/area_iwa/4D01F0/func_80218000_4D01F0.s index 3ff2fe7534..e3fc646753 100644 --- a/asm/nonmatchings/battle/area_iwa/4D01F0/func_80218000_4D01F0.s +++ b/asm/nonmatchings/battle/area_iwa/4D01F0/func_80218000_4D01F0.s @@ -13,7 +13,7 @@ glabel func_80218000_4D01F0 /* 4D0210 80218020 0C09A75B */ jal get_actor /* 4D0214 80218024 0040802D */ daddu $s0, $v0, $zero /* 4D0218 80218028 16000005 */ bnez $s0, .L80218040 -/* 4D021C 8021802C 00000000 */ nop +/* 4D021C 8021802C 00000000 */ nop /* 4D0220 80218030 8C430008 */ lw $v1, 8($v0) /* 4D0224 80218034 24020004 */ addiu $v0, $zero, 4 /* 4D0228 80218038 08086012 */ j .L80218048 diff --git a/asm/nonmatchings/battle/area_jan/573C30/func_802183DC_573CFC.s b/asm/nonmatchings/battle/area_jan/573C30/func_802183DC_573CFC.s index 9c42f698a7..9616a91586 100644 --- a/asm/nonmatchings/battle/area_jan/573C30/func_802183DC_573CFC.s +++ b/asm/nonmatchings/battle/area_jan/573C30/func_802183DC_573CFC.s @@ -35,26 +35,26 @@ glabel func_802183DC_573CFC /* 573D74 80218454 34210FD8 */ ori $at, $at, 0xfd8 /* 573D78 80218458 44814000 */ mtc1 $at, $f8 /* 573D7C 8021845C 44922000 */ mtc1 $s2, $f4 -/* 573D80 80218460 00000000 */ nop +/* 573D80 80218460 00000000 */ nop /* 573D84 80218464 46802120 */ cvt.s.w $f4, $f4 /* 573D88 80218468 46082202 */ mul.s $f8, $f4, $f8 -/* 573D8C 8021846C 00000000 */ nop +/* 573D8C 8021846C 00000000 */ nop /* 573D90 80218470 44903000 */ mtc1 $s0, $f6 -/* 573D94 80218474 00000000 */ nop +/* 573D94 80218474 00000000 */ nop /* 573D98 80218478 468031A0 */ cvt.s.w $f6, $f6 /* 573D9C 8021847C 3C013F80 */ lui $at, 0x3f80 /* 573DA0 80218480 44811000 */ mtc1 $at, $f2 /* 573DA4 80218484 46062103 */ div.s $f4, $f4, $f6 /* 573DA8 80218488 46041081 */ sub.s $f2, $f2, $f4 /* 573DAC 8021848C 46020502 */ mul.s $f20, $f0, $f2 -/* 573DB0 80218490 00000000 */ nop +/* 573DB0 80218490 00000000 */ nop /* 573DB4 80218494 44936000 */ mtc1 $s3, $f12 -/* 573DB8 80218498 00000000 */ nop +/* 573DB8 80218498 00000000 */ nop /* 573DBC 8021849C 46806320 */ cvt.s.w $f12, $f12 /* 573DC0 802184A0 0C00A874 */ jal cos_rad /* 573DC4 802184A4 460C4303 */ div.s $f12, $f8, $f12 /* 573DC8 802184A8 4600A502 */ mul.s $f20, $f20, $f0 -/* 573DCC 802184AC 00000000 */ nop +/* 573DCC 802184AC 00000000 */ nop /* 573DD0 802184B0 0220202D */ daddu $a0, $s1, $zero /* 573DD4 802184B4 4600A28D */ trunc.w.s $f10, $f20 /* 573DD8 802184B8 44065000 */ mfc1 $a2, $f10 @@ -70,4 +70,4 @@ glabel func_802183DC_573CFC /* 573E00 802184E0 24020002 */ addiu $v0, $zero, 2 /* 573E04 802184E4 03E00008 */ jr $ra /* 573E08 802184E8 27BD0030 */ addiu $sp, $sp, 0x30 -/* 573E0C 802184EC 00000000 */ nop +/* 573E0C 802184EC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_jan2/584940/func_802180CC_584A0C.s b/asm/nonmatchings/battle/area_jan2/584940/func_802180CC_584A0C.s index 1c23f177e4..5d1de89014 100644 --- a/asm/nonmatchings/battle/area_jan2/584940/func_802180CC_584A0C.s +++ b/asm/nonmatchings/battle/area_jan2/584940/func_802180CC_584A0C.s @@ -57,15 +57,15 @@ glabel func_802180CC_584A0C /* 584ADC 8021819C 0040882D */ daddu $s1, $v0, $zero /* 584AE0 802181A0 24040001 */ addiu $a0, $zero, 1 /* 584AE4 802181A4 44961000 */ mtc1 $s6, $f2 -/* 584AE8 802181A8 00000000 */ nop +/* 584AE8 802181A8 00000000 */ nop /* 584AEC 802181AC 468010A0 */ cvt.s.w $f2, $f2 /* 584AF0 802181B0 44051000 */ mfc1 $a1, $f2 /* 584AF4 802181B4 44951000 */ mtc1 $s5, $f2 -/* 584AF8 802181B8 00000000 */ nop +/* 584AF8 802181B8 00000000 */ nop /* 584AFC 802181BC 468010A0 */ cvt.s.w $f2, $f2 /* 584B00 802181C0 44061000 */ mfc1 $a2, $f2 /* 584B04 802181C4 44941000 */ mtc1 $s4, $f2 -/* 584B08 802181C8 00000000 */ nop +/* 584B08 802181C8 00000000 */ nop /* 584B0C 802181CC 468010A0 */ cvt.s.w $f2, $f2 /* 584B10 802181D0 44071000 */ mfc1 $a3, $f2 /* 584B14 802181D4 0040802D */ daddu $s0, $v0, $zero @@ -97,5 +97,5 @@ glabel func_802180CC_584A0C /* 584B7C 8021823C 24020002 */ addiu $v0, $zero, 2 /* 584B80 80218240 03E00008 */ jr $ra /* 584B84 80218244 27BD0040 */ addiu $sp, $sp, 0x40 -/* 584B88 80218248 00000000 */ nop -/* 584B8C 8021824C 00000000 */ nop +/* 584B88 80218248 00000000 */ nop +/* 584B8C 8021824C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_jan2/584B90/func_80218250_584B90.s b/asm/nonmatchings/battle/area_jan2/584B90/func_80218250_584B90.s index 1f42a317f6..9b21363176 100644 --- a/asm/nonmatchings/battle/area_jan2/584B90/func_80218250_584B90.s +++ b/asm/nonmatchings/battle/area_jan2/584B90/func_80218250_584B90.s @@ -69,12 +69,12 @@ glabel func_80218250_584B90 /* 584C90 80218350 82030210 */ lb $v1, 0x210($s0) /* 584C94 80218354 2402000A */ addiu $v0, $zero, 0xa /* 584C98 80218358 14620007 */ bne $v1, $v0, .L80218378 -/* 584C9C 8021835C 00000000 */ nop +/* 584C9C 8021835C 00000000 */ nop /* 584CA0 80218360 8C82000C */ lw $v0, 0xc($a0) /* 584CA4 80218364 3C013ECC */ lui $at, 0x3ecc /* 584CA8 80218368 3421CCCD */ ori $at, $at, 0xcccd /* 584CAC 8021836C 44810000 */ mtc1 $at, $f0 -/* 584CB0 80218370 00000000 */ nop +/* 584CB0 80218370 00000000 */ nop /* 584CB4 80218374 E4400028 */ swc1 $f0, 0x28($v0) .L80218378: /* 584CB8 80218378 8FBF0028 */ lw $ra, 0x28($sp) diff --git a/asm/nonmatchings/battle/area_jan2/584B90/func_802184F8_584E38.s b/asm/nonmatchings/battle/area_jan2/584B90/func_802184F8_584E38.s index 962dd2a385..ccd07dc757 100644 --- a/asm/nonmatchings/battle/area_jan2/584B90/func_802184F8_584E38.s +++ b/asm/nonmatchings/battle/area_jan2/584B90/func_802184F8_584E38.s @@ -14,11 +14,11 @@ glabel func_802184F8_584E38 /* 584E5C 8021851C 0040202D */ daddu $a0, $v0, $zero /* 584E60 80218520 2402FF81 */ addiu $v0, $zero, -0x7f /* 584E64 80218524 14820002 */ bne $a0, $v0, .L80218530 -/* 584E68 80218528 00000000 */ nop +/* 584E68 80218528 00000000 */ nop /* 584E6C 8021852C 8E240148 */ lw $a0, 0x148($s1) .L80218530: /* 584E70 80218530 0C09A75B */ jal get_actor -/* 584E74 80218534 00000000 */ nop +/* 584E74 80218534 00000000 */ nop /* 584E78 80218538 0040202D */ daddu $a0, $v0, $zero /* 584E7C 8021853C 90830136 */ lbu $v1, 0x136($a0) /* 584E80 80218540 24020047 */ addiu $v0, $zero, 0x47 @@ -49,7 +49,7 @@ glabel func_802184F8_584E38 /* 584ED8 80218598 0000302D */ daddu $a2, $zero, $zero .L8021859C: /* 584EDC 8021859C 0C0B2026 */ jal set_variable -/* 584EE0 802185A0 00000000 */ nop +/* 584EE0 802185A0 00000000 */ nop /* 584EE4 802185A4 8FBF0018 */ lw $ra, 0x18($sp) /* 584EE8 802185A8 8FB10014 */ lw $s1, 0x14($sp) /* 584EEC 802185AC 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/battle/area_jan2/584B90/func_8021861C_584F5C.s b/asm/nonmatchings/battle/area_jan2/584B90/func_8021861C_584F5C.s index 0d63a05250..1f027747a2 100644 --- a/asm/nonmatchings/battle/area_jan2/584B90/func_8021861C_584F5C.s +++ b/asm/nonmatchings/battle/area_jan2/584B90/func_8021861C_584F5C.s @@ -21,7 +21,7 @@ glabel func_8021861C_584F5C /* 584F9C 8021865C 0040902D */ daddu $s2, $v0, $zero /* 584FA0 80218660 2402FF81 */ addiu $v0, $zero, -0x7f /* 584FA4 80218664 16220002 */ bne $s1, $v0, .L80218670 -/* 584FA8 80218668 00000000 */ nop +/* 584FA8 80218668 00000000 */ nop /* 584FAC 8021866C 8E710148 */ lw $s1, 0x148($s3) .L80218670: /* 584FB0 80218670 0C09A75B */ jal get_actor diff --git a/asm/nonmatchings/battle/area_kgr/56E2A0/func_802180CC_56E36C.s b/asm/nonmatchings/battle/area_kgr/56E2A0/func_802180CC_56E36C.s index 796307b87a..806da707b6 100644 --- a/asm/nonmatchings/battle/area_kgr/56E2A0/func_802180CC_56E36C.s +++ b/asm/nonmatchings/battle/area_kgr/56E2A0/func_802180CC_56E36C.s @@ -62,12 +62,12 @@ glabel func_802180CC_56E36C /* 56E450 802181B0 C626001C */ lwc1 $f6, 0x1c($s1) /* 56E454 802181B4 468031A0 */ cvt.s.w $f6, $f6 /* 56E458 802181B8 46062102 */ mul.s $f4, $f4, $f6 -/* 56E45C 802181BC 00000000 */ nop +/* 56E45C 802181BC 00000000 */ nop /* 56E460 802181C0 3C013F00 */ lui $at, 0x3f00 /* 56E464 802181C4 44811000 */ mtc1 $at, $f2 -/* 56E468 802181C8 00000000 */ nop +/* 56E468 802181C8 00000000 */ nop /* 56E46C 802181CC 46022102 */ mul.s $f4, $f4, $f2 -/* 56E470 802181D0 00000000 */ nop +/* 56E470 802181D0 00000000 */ nop /* 56E474 802181D4 E620000C */ swc1 $f0, 0xc($s1) /* 56E478 802181D8 C6200004 */ lwc1 $f0, 4($s1) /* 56E47C 802181DC C602000C */ lwc1 $f2, 0xc($s0) @@ -84,7 +84,7 @@ glabel func_802180CC_56E36C /* 56E4A4 80218204 8E240020 */ lw $a0, 0x20($s1) /* 56E4A8 80218208 0040802D */ daddu $s0, $v0, $zero /* 56E4AC 8021820C 16000005 */ bnez $s0, .L80218224 -/* 56E4B0 80218210 00000000 */ nop +/* 56E4B0 80218210 00000000 */ nop /* 56E4B4 80218214 0C00AB4B */ jal heap_free /* 56E4B8 80218218 8E440070 */ lw $a0, 0x70($s2) /* 56E4BC 8021821C 080860B2 */ j .L802182C8 @@ -92,10 +92,10 @@ glabel func_802180CC_56E36C .L80218224: /* 56E4C4 80218224 C62C000C */ lwc1 $f12, 0xc($s1) /* 56E4C8 80218228 0C00A8BB */ jal sin_deg -/* 56E4CC 8021822C 00000000 */ nop +/* 56E4CC 8021822C 00000000 */ nop /* 56E4D0 80218230 C6220014 */ lwc1 $f2, 0x14($s1) /* 56E4D4 80218234 46001082 */ mul.s $f2, $f2, $f0 -/* 56E4D8 80218238 00000000 */ nop +/* 56E4D8 80218238 00000000 */ nop /* 56E4DC 8021823C C6000008 */ lwc1 $f0, 8($s0) /* 56E4E0 80218240 46020000 */ add.s $f0, $f0, $f2 /* 56E4E4 80218244 E6000008 */ swc1 $f0, 8($s0) @@ -103,7 +103,7 @@ glabel func_802180CC_56E36C /* 56E4EC 8021824C C62C000C */ lwc1 $f12, 0xc($s1) /* 56E4F0 80218250 C6220014 */ lwc1 $f2, 0x14($s1) /* 56E4F4 80218254 46001082 */ mul.s $f2, $f2, $f0 -/* 56E4F8 80218258 00000000 */ nop +/* 56E4F8 80218258 00000000 */ nop /* 56E4FC 8021825C C6000010 */ lwc1 $f0, 0x10($s0) /* 56E500 80218260 46020001 */ sub.s $f0, $f0, $f2 /* 56E504 80218264 E6000010 */ swc1 $f0, 0x10($s0) diff --git a/asm/nonmatchings/battle/area_kgr/56E2A0/func_802182E4_56E584.s b/asm/nonmatchings/battle/area_kgr/56E2A0/func_802182E4_56E584.s index 0125b97013..ce5cf17623 100644 --- a/asm/nonmatchings/battle/area_kgr/56E2A0/func_802182E4_56E584.s +++ b/asm/nonmatchings/battle/area_kgr/56E2A0/func_802182E4_56E584.s @@ -56,12 +56,12 @@ glabel func_802182E4_56E584 /* 56E644 802183A4 50600007 */ beql $v1, $zero, .L802183C4 /* 56E648 802183A8 A25000AE */ sb $s0, 0xae($s2) /* 56E64C 802183AC 0808611E */ j .L80218478 -/* 56E650 802183B0 00000000 */ nop +/* 56E650 802183B0 00000000 */ nop .L802183B4: /* 56E654 802183B4 50620026 */ beql $v1, $v0, .L80218450 /* 56E658 802183B8 A25000B0 */ sb $s0, 0xb0($s2) /* 56E65C 802183BC 0808611E */ j .L80218478 -/* 56E660 802183C0 00000000 */ nop +/* 56E660 802183C0 00000000 */ nop .L802183C4: /* 56E664 802183C4 8E250000 */ lw $a1, ($s1) /* 56E668 802183C8 82820001 */ lb $v0, 1($s4) @@ -110,7 +110,7 @@ glabel func_802182E4_56E584 /* 56E70C 8021846C 2406004F */ addiu $a2, $zero, 0x4f .L80218470: /* 56E710 80218470 0C0B2026 */ jal set_variable -/* 56E714 80218474 00000000 */ nop +/* 56E714 80218474 00000000 */ nop .L80218478: /* 56E718 80218478 8FBF0038 */ lw $ra, 0x38($sp) /* 56E71C 8021847C 8FB50034 */ lw $s5, 0x34($sp) diff --git a/asm/nonmatchings/battle/area_kgr/56E2A0/func_802184F8_56E798.s b/asm/nonmatchings/battle/area_kgr/56E2A0/func_802184F8_56E798.s index f1bd69abcb..7f92706eaa 100644 --- a/asm/nonmatchings/battle/area_kgr/56E2A0/func_802184F8_56E798.s +++ b/asm/nonmatchings/battle/area_kgr/56E2A0/func_802184F8_56E798.s @@ -12,10 +12,10 @@ glabel func_802184F8_56E798 /* 56E7B4 80218514 8C85000C */ lw $a1, 0xc($a0) /* 56E7B8 80218518 806200AF */ lb $v0, 0xaf($v1) /* 56E7BC 8021851C 10460004 */ beq $v0, $a2, .L80218530 -/* 56E7C0 80218520 00000000 */ nop +/* 56E7C0 80218520 00000000 */ nop /* 56E7C4 80218524 806200B0 */ lb $v0, 0xb0($v1) /* 56E7C8 80218528 14460004 */ bne $v0, $a2, .L8021853C -/* 56E7CC 8021852C 00000000 */ nop +/* 56E7CC 8021852C 00000000 */ nop .L80218530: /* 56E7D0 80218530 8CA50000 */ lw $a1, ($a1) /* 56E7D4 80218534 08086150 */ j .L80218540 @@ -24,10 +24,10 @@ glabel func_802184F8_56E798 /* 56E7DC 8021853C 8CA50000 */ lw $a1, ($a1) .L80218540: /* 56E7E0 80218540 0C0B2026 */ jal set_variable -/* 56E7E4 80218544 00000000 */ nop +/* 56E7E4 80218544 00000000 */ nop /* 56E7E8 80218548 8FBF0010 */ lw $ra, 0x10($sp) /* 56E7EC 8021854C 24020002 */ addiu $v0, $zero, 2 /* 56E7F0 80218550 03E00008 */ jr $ra /* 56E7F4 80218554 27BD0018 */ addiu $sp, $sp, 0x18 -/* 56E7F8 80218558 00000000 */ nop -/* 56E7FC 8021855C 00000000 */ nop +/* 56E7F8 80218558 00000000 */ nop +/* 56E7FC 8021855C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kgr/56E800/func_80218560_56E800.s b/asm/nonmatchings/battle/area_kgr/56E800/func_80218560_56E800.s index 6fb6d31fb6..0496f05c40 100644 --- a/asm/nonmatchings/battle/area_kgr/56E800/func_80218560_56E800.s +++ b/asm/nonmatchings/battle/area_kgr/56E800/func_80218560_56E800.s @@ -26,14 +26,14 @@ glabel func_80218560_56E800 /* 56E854 802185B4 12200009 */ beqz $s1, .L802185DC /* 56E858 802185B8 2402008E */ addiu $v0, $zero, 0x8e /* 56E85C 802185BC 08086258 */ j .L80218960 -/* 56E860 802185C0 00000000 */ nop +/* 56E860 802185C0 00000000 */ nop .L802185C4: /* 56E864 802185C4 12220085 */ beq $s1, $v0, .L802187DC /* 56E868 802185C8 24020003 */ addiu $v0, $zero, 3 /* 56E86C 802185CC 12220013 */ beq $s1, $v0, .L8021861C /* 56E870 802185D0 2403005B */ addiu $v1, $zero, 0x5b /* 56E874 802185D4 08086258 */ j .L80218960 -/* 56E878 802185D8 00000000 */ nop +/* 56E878 802185D8 00000000 */ nop .L802185DC: /* 56E87C 802185DC 3C01430E */ lui $at, 0x430e /* 56E880 802185E0 44812000 */ mtc1 $at, $f4 @@ -77,7 +77,7 @@ glabel func_80218560_56E800 /* 56E90C 8021866C AE0200A8 */ sw $v0, 0xa8($s0) /* 56E910 80218670 2842002E */ slti $v0, $v0, 0x2e /* 56E914 80218674 14400003 */ bnez $v0, .L80218684 -/* 56E918 80218678 00000000 */ nop +/* 56E918 80218678 00000000 */ nop /* 56E91C 8021867C 2402002D */ addiu $v0, $zero, 0x2d /* 56E920 80218680 AE0200A8 */ sw $v0, 0xa8($s0) .L80218684: @@ -95,7 +95,7 @@ glabel func_80218560_56E800 /* 56E950 802186B0 C61E0098 */ lwc1 $f30, 0x98($s0) /* 56E954 802186B4 4680F7A0 */ cvt.s.w $f30, $f30 /* 56E958 802186B8 461A6302 */ mul.s $f12, $f12, $f26 -/* 56E95C 802186BC 00000000 */ nop +/* 56E95C 802186BC 00000000 */ nop /* 56E960 802186C0 C61C009C */ lwc1 $f28, 0x9c($s0) /* 56E964 802186C4 4680E720 */ cvt.s.w $f28, $f28 /* 56E968 802186C8 3C0143B4 */ lui $at, 0x43b4 @@ -113,22 +113,22 @@ glabel func_80218560_56E800 /* 56E998 802186F8 4620B001 */ sub.d $f0, $f22, $f0 /* 56E99C 802186FC 46002521 */ cvt.d.s $f20, $f4 /* 56E9A0 80218700 4620A502 */ mul.d $f20, $f20, $f0 -/* 56E9A4 80218704 00000000 */ nop +/* 56E9A4 80218704 00000000 */ nop /* 56E9A8 80218708 C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 56E9AC 8021870C 46806320 */ cvt.s.w $f12, $f12 /* 56E9B0 80218710 461A6302 */ mul.s $f12, $f12, $f26 -/* 56E9B4 80218714 00000000 */ nop +/* 56E9B4 80218714 00000000 */ nop /* 56E9B8 80218718 0C00A85B */ jal sin_rad /* 56E9BC 8021871C 46186303 */ div.s $f12, $f12, $f24 /* 56E9C0 80218720 4600E002 */ mul.s $f0, $f28, $f0 -/* 56E9C4 80218724 00000000 */ nop +/* 56E9C4 80218724 00000000 */ nop /* 56E9C8 80218728 8E0200A8 */ lw $v0, 0xa8($s0) /* 56E9CC 8021872C 00021040 */ sll $v0, $v0, 1 /* 56E9D0 80218730 44826000 */ mtc1 $v0, $f12 -/* 56E9D4 80218734 00000000 */ nop +/* 56E9D4 80218734 00000000 */ nop /* 56E9D8 80218738 46806320 */ cvt.s.w $f12, $f12 /* 56E9DC 8021873C 461A6302 */ mul.s $f12, $f12, $f26 -/* 56E9E0 80218740 00000000 */ nop +/* 56E9E0 80218740 00000000 */ nop /* 56E9E4 80218744 46000021 */ cvt.d.s $f0, $f0 /* 56E9E8 80218748 4620A500 */ add.d $f20, $f20, $f0 /* 56E9EC 8021874C 46186303 */ div.s $f12, $f12, $f24 @@ -138,12 +138,12 @@ glabel func_80218560_56E800 /* 56E9FC 8021875C C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 56EA00 80218760 46806320 */ cvt.s.w $f12, $f12 /* 56EA04 80218764 461A6302 */ mul.s $f12, $f12, $f26 -/* 56EA08 80218768 00000000 */ nop +/* 56EA08 80218768 00000000 */ nop /* 56EA0C 8021876C 3C0142B4 */ lui $at, 0x42b4 /* 56EA10 80218770 44811000 */ mtc1 $at, $f2 -/* 56EA14 80218774 00000000 */ nop +/* 56EA14 80218774 00000000 */ nop /* 56EA18 80218778 46020002 */ mul.s $f0, $f0, $f2 -/* 56EA1C 8021877C 00000000 */ nop +/* 56EA1C 8021877C 00000000 */ nop /* 56EA20 80218780 C7A40014 */ lwc1 $f4, 0x14($sp) /* 56EA24 80218784 46002100 */ add.s $f4, $f4, $f0 /* 56EA28 80218788 46186303 */ div.s $f12, $f12, $f24 @@ -152,17 +152,17 @@ glabel func_80218560_56E800 /* 56EA34 80218794 C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 56EA38 80218798 46806320 */ cvt.s.w $f12, $f12 /* 56EA3C 8021879C 461A6302 */ mul.s $f12, $f12, $f26 -/* 56EA40 802187A0 00000000 */ nop +/* 56EA40 802187A0 00000000 */ nop /* 56EA44 802187A4 46000021 */ cvt.d.s $f0, $f0 /* 56EA48 802187A8 4620B581 */ sub.d $f22, $f22, $f0 /* 56EA4C 802187AC 4600F521 */ cvt.d.s $f20, $f30 /* 56EA50 802187B0 4636A502 */ mul.d $f20, $f20, $f22 -/* 56EA54 802187B4 00000000 */ nop +/* 56EA54 802187B4 00000000 */ nop /* 56EA58 802187B8 0C00A85B */ jal sin_rad /* 56EA5C 802187BC 46186303 */ div.s $f12, $f12, $f24 /* 56EA60 802187C0 C7A40018 */ lwc1 $f4, 0x18($sp) /* 56EA64 802187C4 46002002 */ mul.s $f0, $f4, $f0 -/* 56EA68 802187C8 00000000 */ nop +/* 56EA68 802187C8 00000000 */ nop /* 56EA6C 802187CC 46000021 */ cvt.d.s $f0, $f0 /* 56EA70 802187D0 4620A500 */ add.d $f20, $f20, $f0 /* 56EA74 802187D4 08086254 */ j .L80218950 @@ -191,7 +191,7 @@ glabel func_80218560_56E800 /* 56EAC8 80218828 C61E0098 */ lwc1 $f30, 0x98($s0) /* 56EACC 8021882C 4680F7A0 */ cvt.s.w $f30, $f30 /* 56EAD0 80218830 461A6302 */ mul.s $f12, $f12, $f26 -/* 56EAD4 80218834 00000000 */ nop +/* 56EAD4 80218834 00000000 */ nop /* 56EAD8 80218838 C61C009C */ lwc1 $f28, 0x9c($s0) /* 56EADC 8021883C 4680E720 */ cvt.s.w $f28, $f28 /* 56EAE0 80218840 3C0143B4 */ lui $at, 0x43b4 @@ -209,22 +209,22 @@ glabel func_80218560_56E800 /* 56EB10 80218870 4620B001 */ sub.d $f0, $f22, $f0 /* 56EB14 80218874 46002521 */ cvt.d.s $f20, $f4 /* 56EB18 80218878 4620A502 */ mul.d $f20, $f20, $f0 -/* 56EB1C 8021887C 00000000 */ nop +/* 56EB1C 8021887C 00000000 */ nop /* 56EB20 80218880 C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 56EB24 80218884 46806320 */ cvt.s.w $f12, $f12 /* 56EB28 80218888 461A6302 */ mul.s $f12, $f12, $f26 -/* 56EB2C 8021888C 00000000 */ nop +/* 56EB2C 8021888C 00000000 */ nop /* 56EB30 80218890 0C00A85B */ jal sin_rad /* 56EB34 80218894 46186303 */ div.s $f12, $f12, $f24 /* 56EB38 80218898 4600E002 */ mul.s $f0, $f28, $f0 -/* 56EB3C 8021889C 00000000 */ nop +/* 56EB3C 8021889C 00000000 */ nop /* 56EB40 802188A0 8E0200A8 */ lw $v0, 0xa8($s0) /* 56EB44 802188A4 00021040 */ sll $v0, $v0, 1 /* 56EB48 802188A8 44826000 */ mtc1 $v0, $f12 -/* 56EB4C 802188AC 00000000 */ nop +/* 56EB4C 802188AC 00000000 */ nop /* 56EB50 802188B0 46806320 */ cvt.s.w $f12, $f12 /* 56EB54 802188B4 461A6302 */ mul.s $f12, $f12, $f26 -/* 56EB58 802188B8 00000000 */ nop +/* 56EB58 802188B8 00000000 */ nop /* 56EB5C 802188BC 46000021 */ cvt.d.s $f0, $f0 /* 56EB60 802188C0 4620A500 */ add.d $f20, $f20, $f0 /* 56EB64 802188C4 46186303 */ div.s $f12, $f12, $f24 @@ -234,12 +234,12 @@ glabel func_80218560_56E800 /* 56EB74 802188D4 C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 56EB78 802188D8 46806320 */ cvt.s.w $f12, $f12 /* 56EB7C 802188DC 461A6302 */ mul.s $f12, $f12, $f26 -/* 56EB80 802188E0 00000000 */ nop +/* 56EB80 802188E0 00000000 */ nop /* 56EB84 802188E4 3C0142B4 */ lui $at, 0x42b4 /* 56EB88 802188E8 44811000 */ mtc1 $at, $f2 -/* 56EB8C 802188EC 00000000 */ nop +/* 56EB8C 802188EC 00000000 */ nop /* 56EB90 802188F0 46020002 */ mul.s $f0, $f0, $f2 -/* 56EB94 802188F4 00000000 */ nop +/* 56EB94 802188F4 00000000 */ nop /* 56EB98 802188F8 C7A40014 */ lwc1 $f4, 0x14($sp) /* 56EB9C 802188FC 46002100 */ add.s $f4, $f4, $f0 /* 56EBA0 80218900 46186303 */ div.s $f12, $f12, $f24 @@ -248,17 +248,17 @@ glabel func_80218560_56E800 /* 56EBAC 8021890C C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 56EBB0 80218910 46806320 */ cvt.s.w $f12, $f12 /* 56EBB4 80218914 461A6302 */ mul.s $f12, $f12, $f26 -/* 56EBB8 80218918 00000000 */ nop +/* 56EBB8 80218918 00000000 */ nop /* 56EBBC 8021891C 46000021 */ cvt.d.s $f0, $f0 /* 56EBC0 80218920 4620B581 */ sub.d $f22, $f22, $f0 /* 56EBC4 80218924 4600F521 */ cvt.d.s $f20, $f30 /* 56EBC8 80218928 4636A502 */ mul.d $f20, $f20, $f22 -/* 56EBCC 8021892C 00000000 */ nop +/* 56EBCC 8021892C 00000000 */ nop /* 56EBD0 80218930 0C00A85B */ jal sin_rad /* 56EBD4 80218934 46186303 */ div.s $f12, $f12, $f24 /* 56EBD8 80218938 C7A40018 */ lwc1 $f4, 0x18($sp) /* 56EBDC 8021893C 46002002 */ mul.s $f0, $f4, $f0 -/* 56EBE0 80218940 00000000 */ nop +/* 56EBE0 80218940 00000000 */ nop /* 56EBE4 80218944 46000021 */ cvt.d.s $f0, $f0 /* 56EBE8 80218948 4620A500 */ add.d $f20, $f20, $f0 /* 56EBEC 8021894C 2402005A */ addiu $v0, $zero, 0x5a diff --git a/asm/nonmatchings/battle/area_kkj/6DBDA0/func_80218000_6DBDA0.s b/asm/nonmatchings/battle/area_kkj/6DBDA0/func_80218000_6DBDA0.s index 8c9e13d13e..07fdd194e8 100644 --- a/asm/nonmatchings/battle/area_kkj/6DBDA0/func_80218000_6DBDA0.s +++ b/asm/nonmatchings/battle/area_kkj/6DBDA0/func_80218000_6DBDA0.s @@ -14,7 +14,7 @@ glabel func_80218000_6DBDA0 /* 6DBDC4 80218024 0040882D */ daddu $s1, $v0, $zero /* 6DBDC8 80218028 24630009 */ addiu $v1, $v1, 9 /* 6DBDCC 8021802C 44836000 */ mtc1 $v1, $f12 -/* 6DBDD0 80218030 00000000 */ nop +/* 6DBDD0 80218030 00000000 */ nop /* 6DBDD4 80218034 46806320 */ cvt.s.w $f12, $f12 /* 6DBDD8 80218038 0C00A6C9 */ jal clamp_angle /* 6DBDDC 8021803C AE030000 */ sw $v1, ($s0) @@ -24,10 +24,10 @@ glabel func_80218000_6DBDA0 /* 6DBDEC 8021804C 34210FD0 */ ori $at, $at, 0xfd0 /* 6DBDF0 80218050 44810000 */ mtc1 $at, $f0 /* 6DBDF4 80218054 44826000 */ mtc1 $v0, $f12 -/* 6DBDF8 80218058 00000000 */ nop +/* 6DBDF8 80218058 00000000 */ nop /* 6DBDFC 8021805C 46806320 */ cvt.s.w $f12, $f12 /* 6DBE00 80218060 46006302 */ mul.s $f12, $f12, $f0 -/* 6DBE04 80218064 00000000 */ nop +/* 6DBE04 80218064 00000000 */ nop /* 6DBE08 80218068 3C0143B4 */ lui $at, 0x43b4 /* 6DBE0C 8021806C 44810000 */ mtc1 $at, $f0 /* 6DBE10 80218070 AE020000 */ sw $v0, ($s0) @@ -35,12 +35,12 @@ glabel func_80218000_6DBDA0 /* 6DBE18 80218078 46006303 */ div.s $f12, $f12, $f0 /* 6DBE1C 8021807C 3C014040 */ lui $at, 0x4040 /* 6DBE20 80218080 44811000 */ mtc1 $at, $f2 -/* 6DBE24 80218084 00000000 */ nop +/* 6DBE24 80218084 00000000 */ nop /* 6DBE28 80218088 46020002 */ mul.s $f0, $f0, $f2 -/* 6DBE2C 8021808C 00000000 */ nop +/* 6DBE2C 8021808C 00000000 */ nop /* 6DBE30 80218090 4600010D */ trunc.w.s $f4, $f0 /* 6DBE34 80218094 44032000 */ mfc1 $v1, $f4 -/* 6DBE38 80218098 00000000 */ nop +/* 6DBE38 80218098 00000000 */ nop /* 6DBE3C 8021809C A223019A */ sb $v1, 0x19a($s1) /* 6DBE40 802180A0 8FBF0018 */ lw $ra, 0x18($sp) /* 6DBE44 802180A4 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_kkj/6DBDA0/func_802180B8_6DBE58.s b/asm/nonmatchings/battle/area_kkj/6DBDA0/func_802180B8_6DBE58.s index 372672c128..1ff2c5d20f 100644 --- a/asm/nonmatchings/battle/area_kkj/6DBDA0/func_802180B8_6DBE58.s +++ b/asm/nonmatchings/battle/area_kkj/6DBDA0/func_802180B8_6DBE58.s @@ -23,18 +23,18 @@ glabel func_802180B8_6DBE58 /* 6DBEA0 80218100 8E050000 */ lw $a1, ($s0) /* 6DBEA4 80218104 26100004 */ addiu $s0, $s0, 4 /* 6DBEA8 80218108 4482C000 */ mtc1 $v0, $f24 -/* 6DBEAC 8021810C 00000000 */ nop +/* 6DBEAC 8021810C 00000000 */ nop /* 6DBEB0 80218110 4680C620 */ cvt.s.w $f24, $f24 /* 6DBEB4 80218114 0C0B1EAF */ jal get_variable /* 6DBEB8 80218118 0220202D */ daddu $a0, $s1, $zero /* 6DBEBC 8021811C 8E050000 */ lw $a1, ($s0) /* 6DBEC0 80218120 4482B000 */ mtc1 $v0, $f22 -/* 6DBEC4 80218124 00000000 */ nop +/* 6DBEC4 80218124 00000000 */ nop /* 6DBEC8 80218128 4680B5A0 */ cvt.s.w $f22, $f22 /* 6DBECC 8021812C 0C0B1EAF */ jal get_variable /* 6DBED0 80218130 0220202D */ daddu $a0, $s1, $zero /* 6DBED4 80218134 4482A000 */ mtc1 $v0, $f20 -/* 6DBED8 80218138 00000000 */ nop +/* 6DBED8 80218138 00000000 */ nop /* 6DBEDC 8021813C 4680A520 */ cvt.s.w $f20, $f20 /* 6DBEE0 80218140 0C04417A */ jal get_entity_by_index /* 6DBEE4 80218144 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/battle/area_kkj/6DBDA0/func_80218220_6DBFC0.s b/asm/nonmatchings/battle/area_kkj/6DBDA0/func_80218220_6DBFC0.s index 4a936fc058..3e29eb42c4 100644 --- a/asm/nonmatchings/battle/area_kkj/6DBDA0/func_80218220_6DBFC0.s +++ b/asm/nonmatchings/battle/area_kkj/6DBDA0/func_80218220_6DBFC0.s @@ -23,7 +23,7 @@ glabel func_80218220_6DBFC0 /* 6DC004 80218264 44811000 */ mtc1 $at, $f2 /* 6DC008 80218268 00621023 */ subu $v0, $v1, $v0 /* 6DC00C 8021826C 44820000 */ mtc1 $v0, $f0 -/* 6DC010 80218270 00000000 */ nop +/* 6DC010 80218270 00000000 */ nop /* 6DC014 80218274 46800020 */ cvt.s.w $f0, $f0 /* 6DC018 80218278 46020003 */ div.s $f0, $f0, $f2 /* 6DC01C 8021827C E6200054 */ swc1 $f0, 0x54($s1) @@ -33,34 +33,34 @@ glabel func_80218220_6DBFC0 /* 6DC02C 8021828C 44816000 */ mtc1 $at, $f12 /* 6DC030 80218290 00621023 */ subu $v0, $v1, $v0 /* 6DC034 80218294 44820000 */ mtc1 $v0, $f0 -/* 6DC038 80218298 00000000 */ nop +/* 6DC038 80218298 00000000 */ nop /* 6DC03C 8021829C 46800020 */ cvt.s.w $f0, $f0 /* 6DC040 802182A0 46020003 */ div.s $f0, $f0, $f2 /* 6DC044 802182A4 E6200058 */ swc1 $f0, 0x58($s1) /* 6DC048 802182A8 8E420074 */ lw $v0, 0x74($s2) /* 6DC04C 802182AC 460C0302 */ mul.s $f12, $f0, $f12 -/* 6DC050 802182B0 00000000 */ nop +/* 6DC050 802182B0 00000000 */ nop /* 6DC054 802182B4 00621823 */ subu $v1, $v1, $v0 /* 6DC058 802182B8 44830000 */ mtc1 $v1, $f0 -/* 6DC05C 802182BC 00000000 */ nop +/* 6DC05C 802182BC 00000000 */ nop /* 6DC060 802182C0 46800020 */ cvt.s.w $f0, $f0 /* 6DC064 802182C4 46020003 */ div.s $f0, $f0, $f2 /* 6DC068 802182C8 0C00A874 */ jal cos_rad /* 6DC06C 802182CC E620005C */ swc1 $f0, 0x5c($s1) /* 6DC070 802182D0 3C013F80 */ lui $at, 0x3f80 /* 6DC074 802182D4 44811000 */ mtc1 $at, $f2 -/* 6DC078 802182D8 00000000 */ nop +/* 6DC078 802182D8 00000000 */ nop /* 6DC07C 802182DC 46001081 */ sub.s $f2, $f2, $f0 /* 6DC080 802182E0 3C014487 */ lui $at, 0x4487 /* 6DC084 802182E4 44810000 */ mtc1 $at, $f0 -/* 6DC088 802182E8 00000000 */ nop +/* 6DC088 802182E8 00000000 */ nop /* 6DC08C 802182EC 46001082 */ mul.s $f2, $f2, $f0 -/* 6DC090 802182F0 00000000 */ nop +/* 6DC090 802182F0 00000000 */ nop /* 6DC094 802182F4 3C013F00 */ lui $at, 0x3f00 /* 6DC098 802182F8 44810000 */ mtc1 $at, $f0 -/* 6DC09C 802182FC 00000000 */ nop +/* 6DC09C 802182FC 00000000 */ nop /* 6DC0A0 80218300 46001082 */ mul.s $f2, $f2, $f0 -/* 6DC0A4 80218304 00000000 */ nop +/* 6DC0A4 80218304 00000000 */ nop /* 6DC0A8 80218308 E6220064 */ swc1 $f2, 0x64($s1) /* 6DC0AC 8021830C 8E430074 */ lw $v1, 0x74($s2) /* 6DC0B0 80218310 2463FFFF */ addiu $v1, $v1, -1 diff --git a/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80218000_4309A0.s b/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80218000_4309A0.s index 4b35467df6..5bb3cf167a 100644 --- a/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80218000_4309A0.s +++ b/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80218000_4309A0.s @@ -11,12 +11,12 @@ glabel func_80218000_4309A0 /* 4309B8 80218018 46007506 */ mov.s $f20, $f14 /* 4309BC 8021801C 4600A18D */ trunc.w.s $f6, $f20 /* 4309C0 80218020 44023000 */ mfc1 $v0, $f6 -/* 4309C4 80218024 00000000 */ nop +/* 4309C4 80218024 00000000 */ nop /* 4309C8 80218028 04420001 */ bltzl $v0, .L80218030 /* 4309CC 8021802C 00021023 */ negu $v0, $v0 .L80218030: /* 4309D0 80218030 44821000 */ mtc1 $v0, $f2 -/* 4309D4 80218034 00000000 */ nop +/* 4309D4 80218034 00000000 */ nop /* 4309D8 80218038 468010A0 */ cvt.s.w $f2, $f2 /* 4309DC 8021803C 46001103 */ div.s $f4, $f2, $f0 /* 4309E0 80218040 0000202D */ daddu $a0, $zero, $zero @@ -37,7 +37,7 @@ glabel func_80218000_4309A0 /* 430A18 80218078 00471021 */ addu $v0, $v0, $a3 /* 430A1C 8021807C C4400000 */ lwc1 $f0, ($v0) /* 430A20 80218080 4604003C */ c.lt.s $f0, $f4 -/* 430A24 80218084 00000000 */ nop +/* 430A24 80218084 00000000 */ nop /* 430A28 80218088 45020002 */ bc1fl .L80218094 /* 430A2C 8021808C 0060302D */ daddu $a2, $v1, $zero /* 430A30 80218090 0060202D */ daddu $a0, $v1, $zero @@ -62,43 +62,43 @@ glabel func_80218000_4309A0 /* 430A78 802180D8 46001085 */ abs.s $f2, $f2 /* 430A7C 802180DC 46000005 */ abs.s $f0, $f0 /* 430A80 802180E0 4600103C */ c.lt.s $f2, $f0 -/* 430A84 802180E4 00000000 */ nop +/* 430A84 802180E4 00000000 */ nop /* 430A88 802180E8 45000002 */ bc1f .L802180F4 /* 430A8C 802180EC 00C0182D */ daddu $v1, $a2, $zero /* 430A90 802180F0 0080182D */ daddu $v1, $a0, $zero .L802180F4: /* 430A94 802180F4 44800000 */ mtc1 $zero, $f0 -/* 430A98 802180F8 00000000 */ nop +/* 430A98 802180F8 00000000 */ nop /* 430A9C 802180FC 4600B03C */ c.lt.s $f22, $f0 -/* 430AA0 80218100 00000000 */ nop +/* 430AA0 80218100 00000000 */ nop /* 430AA4 80218104 4500000A */ bc1f .L80218130 -/* 430AA8 80218108 00000000 */ nop +/* 430AA8 80218108 00000000 */ nop /* 430AAC 8021810C 4614003E */ c.le.s $f0, $f20 -/* 430AB0 80218110 00000000 */ nop +/* 430AB0 80218110 00000000 */ nop /* 430AB4 80218114 45000004 */ bc1f .L80218128 /* 430AB8 80218118 240200B4 */ addiu $v0, $zero, 0xb4 /* 430ABC 8021811C 00431823 */ subu $v1, $v0, $v1 /* 430AC0 80218120 44800000 */ mtc1 $zero, $f0 -/* 430AC4 80218124 00000000 */ nop +/* 430AC4 80218124 00000000 */ nop .L80218128: /* 430AC8 80218128 4600B03C */ c.lt.s $f22, $f0 -/* 430ACC 8021812C 00000000 */ nop +/* 430ACC 8021812C 00000000 */ nop .L80218130: /* 430AD0 80218130 45000005 */ bc1f .L80218148 -/* 430AD4 80218134 00000000 */ nop +/* 430AD4 80218134 00000000 */ nop /* 430AD8 80218138 4600A03C */ c.lt.s $f20, $f0 -/* 430ADC 8021813C 00000000 */ nop +/* 430ADC 8021813C 00000000 */ nop /* 430AE0 80218140 45030001 */ bc1tl .L80218148 /* 430AE4 80218144 246300B4 */ addiu $v1, $v1, 0xb4 .L80218148: /* 430AE8 80218148 44800000 */ mtc1 $zero, $f0 -/* 430AEC 8021814C 00000000 */ nop +/* 430AEC 8021814C 00000000 */ nop /* 430AF0 80218150 4616003E */ c.le.s $f0, $f22 -/* 430AF4 80218154 00000000 */ nop +/* 430AF4 80218154 00000000 */ nop /* 430AF8 80218158 45000006 */ bc1f .L80218174 -/* 430AFC 8021815C 00000000 */ nop +/* 430AFC 8021815C 00000000 */ nop /* 430B00 80218160 4600A03C */ c.lt.s $f20, $f0 -/* 430B04 80218164 00000000 */ nop +/* 430B04 80218164 00000000 */ nop /* 430B08 80218168 45000002 */ bc1f .L80218174 /* 430B0C 8021816C 24020168 */ addiu $v0, $zero, 0x168 /* 430B10 80218170 00431823 */ subu $v1, $v0, $v1 diff --git a/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_8021818C_430B2C.s b/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_8021818C_430B2C.s index d7cc609880..a5b95bae93 100644 --- a/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_8021818C_430B2C.s +++ b/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_8021818C_430B2C.s @@ -36,7 +36,7 @@ glabel func_8021818C_430B2C /* 430BA8 80218208 0C0B1EAF */ jal get_variable /* 430BAC 8021820C 02118023 */ subu $s0, $s0, $s1 /* 430BB0 80218210 16600006 */ bnez $s3, .L8021822C -/* 430BB4 80218214 00000000 */ nop +/* 430BB4 80218214 00000000 */ nop /* 430BB8 80218218 16000004 */ bnez $s0, .L8021822C /* 430BBC 8021821C 0280202D */ daddu $a0, $s4, $zero /* 430BC0 80218220 8E450000 */ lw $a1, ($s2) @@ -44,10 +44,10 @@ glabel func_8021818C_430B2C /* 430BC8 80218228 0040302D */ daddu $a2, $v0, $zero .L8021822C: /* 430BCC 8021822C 44936000 */ mtc1 $s3, $f12 -/* 430BD0 80218230 00000000 */ nop +/* 430BD0 80218230 00000000 */ nop /* 430BD4 80218234 46806320 */ cvt.s.w $f12, $f12 /* 430BD8 80218238 44907000 */ mtc1 $s0, $f14 -/* 430BDC 8021823C 00000000 */ nop +/* 430BDC 8021823C 00000000 */ nop /* 430BE0 80218240 0C086000 */ jal func_80218000_4309A0 /* 430BE4 80218244 468073A0 */ cvt.s.w $f14, $f14 /* 430BE8 80218248 0280202D */ daddu $a0, $s4, $zero @@ -55,7 +55,7 @@ glabel func_8021818C_430B2C /* 430BF0 80218250 2446FFA6 */ addiu $a2, $v0, -0x5a .L80218254: /* 430BF4 80218254 0C0B2026 */ jal set_variable -/* 430BF8 80218258 00000000 */ nop +/* 430BF8 80218258 00000000 */ nop /* 430BFC 8021825C 24020002 */ addiu $v0, $zero, 2 /* 430C00 80218260 8FBF0024 */ lw $ra, 0x24($sp) /* 430C04 80218264 8FB40020 */ lw $s4, 0x20($sp) diff --git a/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80218280_430C20.s b/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80218280_430C20.s index 11e218c302..94a9ae95be 100644 --- a/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80218280_430C20.s +++ b/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80218280_430C20.s @@ -11,12 +11,12 @@ glabel func_80218280_430C20 /* 430C38 80218298 46007506 */ mov.s $f20, $f14 /* 430C3C 8021829C 4600A18D */ trunc.w.s $f6, $f20 /* 430C40 802182A0 44023000 */ mfc1 $v0, $f6 -/* 430C44 802182A4 00000000 */ nop +/* 430C44 802182A4 00000000 */ nop /* 430C48 802182A8 04420001 */ bltzl $v0, .L802182B0 /* 430C4C 802182AC 00021023 */ negu $v0, $v0 .L802182B0: /* 430C50 802182B0 44821000 */ mtc1 $v0, $f2 -/* 430C54 802182B4 00000000 */ nop +/* 430C54 802182B4 00000000 */ nop /* 430C58 802182B8 468010A0 */ cvt.s.w $f2, $f2 /* 430C5C 802182BC 46001103 */ div.s $f4, $f2, $f0 /* 430C60 802182C0 0000202D */ daddu $a0, $zero, $zero @@ -37,7 +37,7 @@ glabel func_80218280_430C20 /* 430C98 802182F8 00471021 */ addu $v0, $v0, $a3 /* 430C9C 802182FC C4400000 */ lwc1 $f0, ($v0) /* 430CA0 80218300 4604003C */ c.lt.s $f0, $f4 -/* 430CA4 80218304 00000000 */ nop +/* 430CA4 80218304 00000000 */ nop /* 430CA8 80218308 45020002 */ bc1fl .L80218314 /* 430CAC 8021830C 0060302D */ daddu $a2, $v1, $zero /* 430CB0 80218310 0060202D */ daddu $a0, $v1, $zero @@ -62,43 +62,43 @@ glabel func_80218280_430C20 /* 430CF8 80218358 46001085 */ abs.s $f2, $f2 /* 430CFC 8021835C 46000005 */ abs.s $f0, $f0 /* 430D00 80218360 4600103C */ c.lt.s $f2, $f0 -/* 430D04 80218364 00000000 */ nop +/* 430D04 80218364 00000000 */ nop /* 430D08 80218368 45000002 */ bc1f .L80218374 /* 430D0C 8021836C 00C0182D */ daddu $v1, $a2, $zero /* 430D10 80218370 0080182D */ daddu $v1, $a0, $zero .L80218374: /* 430D14 80218374 44800000 */ mtc1 $zero, $f0 -/* 430D18 80218378 00000000 */ nop +/* 430D18 80218378 00000000 */ nop /* 430D1C 8021837C 4600B03C */ c.lt.s $f22, $f0 -/* 430D20 80218380 00000000 */ nop +/* 430D20 80218380 00000000 */ nop /* 430D24 80218384 4500000A */ bc1f .L802183B0 -/* 430D28 80218388 00000000 */ nop +/* 430D28 80218388 00000000 */ nop /* 430D2C 8021838C 4614003E */ c.le.s $f0, $f20 -/* 430D30 80218390 00000000 */ nop +/* 430D30 80218390 00000000 */ nop /* 430D34 80218394 45000004 */ bc1f .L802183A8 /* 430D38 80218398 240200B4 */ addiu $v0, $zero, 0xb4 /* 430D3C 8021839C 00431823 */ subu $v1, $v0, $v1 /* 430D40 802183A0 44800000 */ mtc1 $zero, $f0 -/* 430D44 802183A4 00000000 */ nop +/* 430D44 802183A4 00000000 */ nop .L802183A8: /* 430D48 802183A8 4600B03C */ c.lt.s $f22, $f0 -/* 430D4C 802183AC 00000000 */ nop +/* 430D4C 802183AC 00000000 */ nop .L802183B0: /* 430D50 802183B0 45000005 */ bc1f .L802183C8 -/* 430D54 802183B4 00000000 */ nop +/* 430D54 802183B4 00000000 */ nop /* 430D58 802183B8 4600A03C */ c.lt.s $f20, $f0 -/* 430D5C 802183BC 00000000 */ nop +/* 430D5C 802183BC 00000000 */ nop /* 430D60 802183C0 45030001 */ bc1tl .L802183C8 /* 430D64 802183C4 246300B4 */ addiu $v1, $v1, 0xb4 .L802183C8: /* 430D68 802183C8 44800000 */ mtc1 $zero, $f0 -/* 430D6C 802183CC 00000000 */ nop +/* 430D6C 802183CC 00000000 */ nop /* 430D70 802183D0 4616003E */ c.le.s $f0, $f22 -/* 430D74 802183D4 00000000 */ nop +/* 430D74 802183D4 00000000 */ nop /* 430D78 802183D8 45000006 */ bc1f .L802183F4 -/* 430D7C 802183DC 00000000 */ nop +/* 430D7C 802183DC 00000000 */ nop /* 430D80 802183E0 4600A03C */ c.lt.s $f20, $f0 -/* 430D84 802183E4 00000000 */ nop +/* 430D84 802183E4 00000000 */ nop /* 430D88 802183E8 45000002 */ bc1f .L802183F4 /* 430D8C 802183EC 24020168 */ addiu $v0, $zero, 0x168 /* 430D90 802183F0 00431823 */ subu $v1, $v0, $v1 diff --git a/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_8021840C_430DAC.s b/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_8021840C_430DAC.s index d057318d17..3ff9437709 100644 --- a/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_8021840C_430DAC.s +++ b/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_8021840C_430DAC.s @@ -36,7 +36,7 @@ glabel func_8021840C_430DAC /* 430E28 80218488 0C0B1EAF */ jal get_variable /* 430E2C 8021848C 02118023 */ subu $s0, $s0, $s1 /* 430E30 80218490 16600006 */ bnez $s3, .L802184AC -/* 430E34 80218494 00000000 */ nop +/* 430E34 80218494 00000000 */ nop /* 430E38 80218498 16000004 */ bnez $s0, .L802184AC /* 430E3C 8021849C 0280202D */ daddu $a0, $s4, $zero /* 430E40 802184A0 8E450000 */ lw $a1, ($s2) @@ -44,10 +44,10 @@ glabel func_8021840C_430DAC /* 430E48 802184A8 0040302D */ daddu $a2, $v0, $zero .L802184AC: /* 430E4C 802184AC 44936000 */ mtc1 $s3, $f12 -/* 430E50 802184B0 00000000 */ nop +/* 430E50 802184B0 00000000 */ nop /* 430E54 802184B4 46806320 */ cvt.s.w $f12, $f12 /* 430E58 802184B8 44907000 */ mtc1 $s0, $f14 -/* 430E5C 802184BC 00000000 */ nop +/* 430E5C 802184BC 00000000 */ nop /* 430E60 802184C0 0C0860A0 */ jal func_80218280_430C20 /* 430E64 802184C4 468073A0 */ cvt.s.w $f14, $f14 /* 430E68 802184C8 0280202D */ daddu $a0, $s4, $zero @@ -55,7 +55,7 @@ glabel func_8021840C_430DAC /* 430E70 802184D0 2446FFA6 */ addiu $a2, $v0, -0x5a .L802184D4: /* 430E74 802184D4 0C0B2026 */ jal set_variable -/* 430E78 802184D8 00000000 */ nop +/* 430E78 802184D8 00000000 */ nop /* 430E7C 802184DC 24020002 */ addiu $v0, $zero, 2 /* 430E80 802184E0 8FBF0024 */ lw $ra, 0x24($sp) /* 430E84 802184E4 8FB40020 */ lw $s4, 0x20($sp) diff --git a/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80218558_430EF8.s b/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80218558_430EF8.s index 140e7fa21e..49d4db78b3 100644 --- a/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80218558_430EF8.s +++ b/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80218558_430EF8.s @@ -11,12 +11,12 @@ glabel func_80218558_430EF8 /* 430F10 80218570 46007506 */ mov.s $f20, $f14 /* 430F14 80218574 4600A18D */ trunc.w.s $f6, $f20 /* 430F18 80218578 44023000 */ mfc1 $v0, $f6 -/* 430F1C 8021857C 00000000 */ nop +/* 430F1C 8021857C 00000000 */ nop /* 430F20 80218580 04420001 */ bltzl $v0, .L80218588 /* 430F24 80218584 00021023 */ negu $v0, $v0 .L80218588: /* 430F28 80218588 44821000 */ mtc1 $v0, $f2 -/* 430F2C 8021858C 00000000 */ nop +/* 430F2C 8021858C 00000000 */ nop /* 430F30 80218590 468010A0 */ cvt.s.w $f2, $f2 /* 430F34 80218594 46001103 */ div.s $f4, $f2, $f0 /* 430F38 80218598 0000202D */ daddu $a0, $zero, $zero @@ -37,7 +37,7 @@ glabel func_80218558_430EF8 /* 430F70 802185D0 00471021 */ addu $v0, $v0, $a3 /* 430F74 802185D4 C4400000 */ lwc1 $f0, ($v0) /* 430F78 802185D8 4604003C */ c.lt.s $f0, $f4 -/* 430F7C 802185DC 00000000 */ nop +/* 430F7C 802185DC 00000000 */ nop /* 430F80 802185E0 45020002 */ bc1fl .L802185EC /* 430F84 802185E4 0060302D */ daddu $a2, $v1, $zero /* 430F88 802185E8 0060202D */ daddu $a0, $v1, $zero @@ -62,43 +62,43 @@ glabel func_80218558_430EF8 /* 430FD0 80218630 46001085 */ abs.s $f2, $f2 /* 430FD4 80218634 46000005 */ abs.s $f0, $f0 /* 430FD8 80218638 4600103C */ c.lt.s $f2, $f0 -/* 430FDC 8021863C 00000000 */ nop +/* 430FDC 8021863C 00000000 */ nop /* 430FE0 80218640 45000002 */ bc1f .L8021864C /* 430FE4 80218644 00C0182D */ daddu $v1, $a2, $zero /* 430FE8 80218648 0080182D */ daddu $v1, $a0, $zero .L8021864C: /* 430FEC 8021864C 44800000 */ mtc1 $zero, $f0 -/* 430FF0 80218650 00000000 */ nop +/* 430FF0 80218650 00000000 */ nop /* 430FF4 80218654 4600B03C */ c.lt.s $f22, $f0 -/* 430FF8 80218658 00000000 */ nop +/* 430FF8 80218658 00000000 */ nop /* 430FFC 8021865C 4500000A */ bc1f .L80218688 -/* 431000 80218660 00000000 */ nop +/* 431000 80218660 00000000 */ nop /* 431004 80218664 4614003E */ c.le.s $f0, $f20 -/* 431008 80218668 00000000 */ nop +/* 431008 80218668 00000000 */ nop /* 43100C 8021866C 45000004 */ bc1f .L80218680 /* 431010 80218670 240200B4 */ addiu $v0, $zero, 0xb4 /* 431014 80218674 00431823 */ subu $v1, $v0, $v1 /* 431018 80218678 44800000 */ mtc1 $zero, $f0 -/* 43101C 8021867C 00000000 */ nop +/* 43101C 8021867C 00000000 */ nop .L80218680: /* 431020 80218680 4600B03C */ c.lt.s $f22, $f0 -/* 431024 80218684 00000000 */ nop +/* 431024 80218684 00000000 */ nop .L80218688: /* 431028 80218688 45000005 */ bc1f .L802186A0 -/* 43102C 8021868C 00000000 */ nop +/* 43102C 8021868C 00000000 */ nop /* 431030 80218690 4600A03C */ c.lt.s $f20, $f0 -/* 431034 80218694 00000000 */ nop +/* 431034 80218694 00000000 */ nop /* 431038 80218698 45030001 */ bc1tl .L802186A0 /* 43103C 8021869C 246300B4 */ addiu $v1, $v1, 0xb4 .L802186A0: /* 431040 802186A0 44800000 */ mtc1 $zero, $f0 -/* 431044 802186A4 00000000 */ nop +/* 431044 802186A4 00000000 */ nop /* 431048 802186A8 4616003E */ c.le.s $f0, $f22 -/* 43104C 802186AC 00000000 */ nop +/* 43104C 802186AC 00000000 */ nop /* 431050 802186B0 45000006 */ bc1f .L802186CC -/* 431054 802186B4 00000000 */ nop +/* 431054 802186B4 00000000 */ nop /* 431058 802186B8 4600A03C */ c.lt.s $f20, $f0 -/* 43105C 802186BC 00000000 */ nop +/* 43105C 802186BC 00000000 */ nop /* 431060 802186C0 45000002 */ bc1f .L802186CC /* 431064 802186C4 24020168 */ addiu $v0, $zero, 0x168 /* 431068 802186C8 00431823 */ subu $v1, $v0, $v1 diff --git a/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_802186E4_431084.s b/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_802186E4_431084.s index 1b36e5df62..3f6f09af2c 100644 --- a/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_802186E4_431084.s +++ b/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_802186E4_431084.s @@ -36,7 +36,7 @@ glabel func_802186E4_431084 /* 431100 80218760 0C0B1EAF */ jal get_variable /* 431104 80218764 02118023 */ subu $s0, $s0, $s1 /* 431108 80218768 16600006 */ bnez $s3, .L80218784 -/* 43110C 8021876C 00000000 */ nop +/* 43110C 8021876C 00000000 */ nop /* 431110 80218770 16000004 */ bnez $s0, .L80218784 /* 431114 80218774 0280202D */ daddu $a0, $s4, $zero /* 431118 80218778 8E450000 */ lw $a1, ($s2) @@ -44,10 +44,10 @@ glabel func_802186E4_431084 /* 431120 80218780 0040302D */ daddu $a2, $v0, $zero .L80218784: /* 431124 80218784 44936000 */ mtc1 $s3, $f12 -/* 431128 80218788 00000000 */ nop +/* 431128 80218788 00000000 */ nop /* 43112C 8021878C 46806320 */ cvt.s.w $f12, $f12 /* 431130 80218790 44907000 */ mtc1 $s0, $f14 -/* 431134 80218794 00000000 */ nop +/* 431134 80218794 00000000 */ nop /* 431138 80218798 0C086156 */ jal func_80218558_430EF8 /* 43113C 8021879C 468073A0 */ cvt.s.w $f14, $f14 /* 431140 802187A0 0280202D */ daddu $a0, $s4, $zero @@ -55,7 +55,7 @@ glabel func_802186E4_431084 /* 431148 802187A8 2446FFA6 */ addiu $a2, $v0, -0x5a .L802187AC: /* 43114C 802187AC 0C0B2026 */ jal set_variable -/* 431150 802187B0 00000000 */ nop +/* 431150 802187B0 00000000 */ nop /* 431154 802187B4 24020002 */ addiu $v0, $zero, 2 /* 431158 802187B8 8FBF0024 */ lw $ra, 0x24($sp) /* 43115C 802187BC 8FB40020 */ lw $s4, 0x20($sp) @@ -65,5 +65,5 @@ glabel func_802186E4_431084 /* 43116C 802187CC 8FB00010 */ lw $s0, 0x10($sp) /* 431170 802187D0 03E00008 */ jr $ra /* 431174 802187D4 27BD0028 */ addiu $sp, $sp, 0x28 -/* 431178 802187D8 00000000 */ nop -/* 43117C 802187DC 00000000 */ nop +/* 431178 802187D8 00000000 */ nop +/* 43117C 802187DC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kmr_part_1/431180/func_802187E0_431180.s b/asm/nonmatchings/battle/area_kmr_part_1/431180/func_802187E0_431180.s index 89b2f35340..b0782dee91 100644 --- a/asm/nonmatchings/battle/area_kmr_part_1/431180/func_802187E0_431180.s +++ b/asm/nonmatchings/battle/area_kmr_part_1/431180/func_802187E0_431180.s @@ -21,7 +21,7 @@ glabel func_802187E0_431180 /* 4311C0 80218820 0C0B1EAF */ jal get_variable /* 4311C4 80218824 26100004 */ addiu $s0, $s0, 4 /* 4311C8 80218828 44820000 */ mtc1 $v0, $f0 -/* 4311CC 8021882C 00000000 */ nop +/* 4311CC 8021882C 00000000 */ nop /* 4311D0 80218830 46800021 */ cvt.d.w $f0, $f0 /* 4311D4 80218834 8E110000 */ lw $s1, ($s0) /* 4311D8 80218838 26100004 */ addiu $s0, $s0, 4 @@ -35,7 +35,7 @@ glabel func_802187E0_431180 /* 4311F8 80218858 46220003 */ div.d $f0, $f0, $f2 /* 4311FC 8021885C 462007A0 */ cvt.s.d $f30, $f0 /* 431200 80218860 4614F502 */ mul.s $f20, $f30, $f20 -/* 431204 80218864 00000000 */ nop +/* 431204 80218864 00000000 */ nop /* 431208 80218868 26100004 */ addiu $s0, $s0, 4 /* 43120C 8021886C 8E120000 */ lw $s2, ($s0) /* 431210 80218870 3C0143B4 */ lui $at, 0x43b4 @@ -46,28 +46,28 @@ glabel func_802187E0_431180 /* 431224 80218884 4600A306 */ mov.s $f12, $f20 /* 431228 80218888 3C014100 */ lui $at, 0x4100 /* 43122C 8021888C 44816000 */ mtc1 $at, $f12 -/* 431230 80218890 00000000 */ nop +/* 431230 80218890 00000000 */ nop /* 431234 80218894 460CA302 */ mul.s $f12, $f20, $f12 -/* 431238 80218898 00000000 */ nop +/* 431238 80218898 00000000 */ nop /* 43123C 8021889C 3C014316 */ lui $at, 0x4316 /* 431240 802188A0 4481E000 */ mtc1 $at, $f28 -/* 431244 802188A4 00000000 */ nop +/* 431244 802188A4 00000000 */ nop /* 431248 802188A8 461C0582 */ mul.s $f22, $f0, $f28 -/* 43124C 802188AC 00000000 */ nop +/* 43124C 802188AC 00000000 */ nop /* 431250 802188B0 4480D000 */ mtc1 $zero, $f26 /* 431254 802188B4 0C00A85B */ jal sin_rad /* 431258 802188B8 461AB580 */ add.s $f22, $f22, $f26 /* 43125C 802188BC 3C014120 */ lui $at, 0x4120 /* 431260 802188C0 44811000 */ mtc1 $at, $f2 -/* 431264 802188C4 00000000 */ nop +/* 431264 802188C4 00000000 */ nop /* 431268 802188C8 46020602 */ mul.s $f24, $f0, $f2 -/* 43126C 802188CC 00000000 */ nop +/* 43126C 802188CC 00000000 */ nop /* 431270 802188D0 4600A306 */ mov.s $f12, $f20 /* 431274 802188D4 0C00A874 */ jal cos_rad /* 431278 802188D8 461AC600 */ add.s $f24, $f24, $f26 /* 43127C 802188DC 0280202D */ daddu $a0, $s4, $zero /* 431280 802188E0 461C0502 */ mul.s $f20, $f0, $f28 -/* 431284 802188E4 00000000 */ nop +/* 431284 802188E4 00000000 */ nop /* 431288 802188E8 0220282D */ daddu $a1, $s1, $zero /* 43128C 802188EC 4406B000 */ mfc1 $a2, $f22 /* 431290 802188F0 3C0141A0 */ lui $at, 0x41a0 @@ -87,34 +87,34 @@ glabel func_802187E0_431180 /* 4312C8 80218928 0240282D */ daddu $a1, $s2, $zero /* 4312CC 8021892C 3C0142B4 */ lui $at, 0x42b4 /* 4312D0 80218930 44810000 */ mtc1 $at, $f0 -/* 4312D4 80218934 00000000 */ nop +/* 4312D4 80218934 00000000 */ nop /* 4312D8 80218938 461E003C */ c.lt.s $f0, $f30 -/* 4312DC 8021893C 00000000 */ nop +/* 4312DC 8021893C 00000000 */ nop /* 4312E0 80218940 4500000B */ bc1f .L80218970 /* 4312E4 80218944 0000302D */ daddu $a2, $zero, $zero /* 4312E8 80218948 3C014387 */ lui $at, 0x4387 /* 4312EC 8021894C 44810000 */ mtc1 $at, $f0 -/* 4312F0 80218950 00000000 */ nop +/* 4312F0 80218950 00000000 */ nop /* 4312F4 80218954 4600F03C */ c.lt.s $f30, $f0 -/* 4312F8 80218958 00000000 */ nop +/* 4312F8 80218958 00000000 */ nop /* 4312FC 8021895C 45030001 */ bc1tl .L80218964 /* 431300 80218960 240600B4 */ addiu $a2, $zero, 0xb4 .L80218964: /* 431304 80218964 3C0142B4 */ lui $at, 0x42b4 /* 431308 80218968 44810000 */ mtc1 $at, $f0 -/* 43130C 8021896C 00000000 */ nop +/* 43130C 8021896C 00000000 */ nop .L80218970: /* 431310 80218970 461E0001 */ sub.s $f0, $f0, $f30 /* 431314 80218974 46000005 */ abs.s $f0, $f0 /* 431318 80218978 4600010D */ trunc.w.s $f4, $f0 /* 43131C 8021897C 44022000 */ mfc1 $v0, $f4 -/* 431320 80218980 00000000 */ nop +/* 431320 80218980 00000000 */ nop /* 431324 80218984 2842002D */ slti $v0, $v0, 0x2d /* 431328 80218988 10400008 */ beqz $v0, .L802189AC -/* 43132C 8021898C 00000000 */ nop +/* 43132C 8021898C 00000000 */ nop /* 431330 80218990 3C014234 */ lui $at, 0x4234 /* 431334 80218994 44810000 */ mtc1 $at, $f0 -/* 431338 80218998 00000000 */ nop +/* 431338 80218998 00000000 */ nop /* 43133C 8021899C 4600F001 */ sub.s $f0, $f30, $f0 /* 431340 802189A0 46000000 */ add.s $f0, $f0, $f0 /* 431344 802189A4 4600010D */ trunc.w.s $f4, $f0 @@ -122,23 +122,23 @@ glabel func_802187E0_431180 .L802189AC: /* 43134C 802189AC 3C014387 */ lui $at, 0x4387 /* 431350 802189B0 44810000 */ mtc1 $at, $f0 -/* 431354 802189B4 00000000 */ nop +/* 431354 802189B4 00000000 */ nop /* 431358 802189B8 461E0001 */ sub.s $f0, $f0, $f30 /* 43135C 802189BC 46000005 */ abs.s $f0, $f0 /* 431360 802189C0 4600010D */ trunc.w.s $f4, $f0 /* 431364 802189C4 44022000 */ mfc1 $v0, $f4 -/* 431368 802189C8 00000000 */ nop +/* 431368 802189C8 00000000 */ nop /* 43136C 802189CC 2842002D */ slti $v0, $v0, 0x2d /* 431370 802189D0 1040000C */ beqz $v0, .L80218A04 /* 431374 802189D4 0280202D */ daddu $a0, $s4, $zero /* 431378 802189D8 3C014361 */ lui $at, 0x4361 /* 43137C 802189DC 44810000 */ mtc1 $at, $f0 -/* 431380 802189E0 00000000 */ nop +/* 431380 802189E0 00000000 */ nop /* 431384 802189E4 4600F001 */ sub.s $f0, $f30, $f0 /* 431388 802189E8 46000000 */ add.s $f0, $f0, $f0 /* 43138C 802189EC 3C014334 */ lui $at, 0x4334 /* 431390 802189F0 44811000 */ mtc1 $at, $f2 -/* 431394 802189F4 00000000 */ nop +/* 431394 802189F4 00000000 */ nop /* 431398 802189F8 46020000 */ add.s $f0, $f0, $f2 /* 43139C 802189FC 4600010D */ trunc.w.s $f4, $f0 /* 4313A0 80218A00 44062000 */ mfc1 $a2, $f4 @@ -160,5 +160,5 @@ glabel func_802187E0_431180 /* 4313DC 80218A3C 24020002 */ addiu $v0, $zero, 2 /* 4313E0 80218A40 03E00008 */ jr $ra /* 4313E4 80218A44 27BD0058 */ addiu $sp, $sp, 0x58 -/* 4313E8 80218A48 00000000 */ nop -/* 4313EC 80218A4C 00000000 */ nop +/* 4313E8 80218A48 00000000 */ nop +/* 4313EC 80218A4C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kmr_part_1/4313F0/func_80218A50_4313F0.s b/asm/nonmatchings/battle/area_kmr_part_1/4313F0/func_80218A50_4313F0.s index 6cb99d6dea..f3c30954c4 100644 --- a/asm/nonmatchings/battle/area_kmr_part_1/4313F0/func_80218A50_4313F0.s +++ b/asm/nonmatchings/battle/area_kmr_part_1/4313F0/func_80218A50_4313F0.s @@ -21,7 +21,7 @@ glabel func_80218A50_4313F0 /* 431430 80218A90 0C0B1EAF */ jal get_variable /* 431434 80218A94 26100004 */ addiu $s0, $s0, 4 /* 431438 80218A98 44820000 */ mtc1 $v0, $f0 -/* 43143C 80218A9C 00000000 */ nop +/* 43143C 80218A9C 00000000 */ nop /* 431440 80218AA0 46800021 */ cvt.d.w $f0, $f0 /* 431444 80218AA4 8E110000 */ lw $s1, ($s0) /* 431448 80218AA8 26100004 */ addiu $s0, $s0, 4 @@ -35,7 +35,7 @@ glabel func_80218A50_4313F0 /* 431468 80218AC8 46220003 */ div.d $f0, $f0, $f2 /* 43146C 80218ACC 462007A0 */ cvt.s.d $f30, $f0 /* 431470 80218AD0 4614F502 */ mul.s $f20, $f30, $f20 -/* 431474 80218AD4 00000000 */ nop +/* 431474 80218AD4 00000000 */ nop /* 431478 80218AD8 26100004 */ addiu $s0, $s0, 4 /* 43147C 80218ADC 8E120000 */ lw $s2, ($s0) /* 431480 80218AE0 3C0143B4 */ lui $at, 0x43b4 @@ -46,28 +46,28 @@ glabel func_80218A50_4313F0 /* 431494 80218AF4 4600A306 */ mov.s $f12, $f20 /* 431498 80218AF8 3C014100 */ lui $at, 0x4100 /* 43149C 80218AFC 44816000 */ mtc1 $at, $f12 -/* 4314A0 80218B00 00000000 */ nop +/* 4314A0 80218B00 00000000 */ nop /* 4314A4 80218B04 460CA302 */ mul.s $f12, $f20, $f12 -/* 4314A8 80218B08 00000000 */ nop +/* 4314A8 80218B08 00000000 */ nop /* 4314AC 80218B0C 3C014316 */ lui $at, 0x4316 /* 4314B0 80218B10 4481E000 */ mtc1 $at, $f28 -/* 4314B4 80218B14 00000000 */ nop +/* 4314B4 80218B14 00000000 */ nop /* 4314B8 80218B18 461C0582 */ mul.s $f22, $f0, $f28 -/* 4314BC 80218B1C 00000000 */ nop +/* 4314BC 80218B1C 00000000 */ nop /* 4314C0 80218B20 4480D000 */ mtc1 $zero, $f26 /* 4314C4 80218B24 0C00A85B */ jal sin_rad /* 4314C8 80218B28 461AB580 */ add.s $f22, $f22, $f26 /* 4314CC 80218B2C 3C014120 */ lui $at, 0x4120 /* 4314D0 80218B30 44811000 */ mtc1 $at, $f2 -/* 4314D4 80218B34 00000000 */ nop +/* 4314D4 80218B34 00000000 */ nop /* 4314D8 80218B38 46020602 */ mul.s $f24, $f0, $f2 -/* 4314DC 80218B3C 00000000 */ nop +/* 4314DC 80218B3C 00000000 */ nop /* 4314E0 80218B40 4600A306 */ mov.s $f12, $f20 /* 4314E4 80218B44 0C00A874 */ jal cos_rad /* 4314E8 80218B48 461AC600 */ add.s $f24, $f24, $f26 /* 4314EC 80218B4C 0280202D */ daddu $a0, $s4, $zero /* 4314F0 80218B50 461C0502 */ mul.s $f20, $f0, $f28 -/* 4314F4 80218B54 00000000 */ nop +/* 4314F4 80218B54 00000000 */ nop /* 4314F8 80218B58 0220282D */ daddu $a1, $s1, $zero /* 4314FC 80218B5C 4406B000 */ mfc1 $a2, $f22 /* 431500 80218B60 3C0141A0 */ lui $at, 0x41a0 @@ -87,34 +87,34 @@ glabel func_80218A50_4313F0 /* 431538 80218B98 0240282D */ daddu $a1, $s2, $zero /* 43153C 80218B9C 3C0142B4 */ lui $at, 0x42b4 /* 431540 80218BA0 44810000 */ mtc1 $at, $f0 -/* 431544 80218BA4 00000000 */ nop +/* 431544 80218BA4 00000000 */ nop /* 431548 80218BA8 461E003C */ c.lt.s $f0, $f30 -/* 43154C 80218BAC 00000000 */ nop +/* 43154C 80218BAC 00000000 */ nop /* 431550 80218BB0 4500000B */ bc1f .L80218BE0 /* 431554 80218BB4 0000302D */ daddu $a2, $zero, $zero /* 431558 80218BB8 3C014387 */ lui $at, 0x4387 /* 43155C 80218BBC 44810000 */ mtc1 $at, $f0 -/* 431560 80218BC0 00000000 */ nop +/* 431560 80218BC0 00000000 */ nop /* 431564 80218BC4 4600F03C */ c.lt.s $f30, $f0 -/* 431568 80218BC8 00000000 */ nop +/* 431568 80218BC8 00000000 */ nop /* 43156C 80218BCC 45030001 */ bc1tl .L80218BD4 /* 431570 80218BD0 240600B4 */ addiu $a2, $zero, 0xb4 .L80218BD4: /* 431574 80218BD4 3C0142B4 */ lui $at, 0x42b4 /* 431578 80218BD8 44810000 */ mtc1 $at, $f0 -/* 43157C 80218BDC 00000000 */ nop +/* 43157C 80218BDC 00000000 */ nop .L80218BE0: /* 431580 80218BE0 461E0001 */ sub.s $f0, $f0, $f30 /* 431584 80218BE4 46000005 */ abs.s $f0, $f0 /* 431588 80218BE8 4600010D */ trunc.w.s $f4, $f0 /* 43158C 80218BEC 44022000 */ mfc1 $v0, $f4 -/* 431590 80218BF0 00000000 */ nop +/* 431590 80218BF0 00000000 */ nop /* 431594 80218BF4 2842002D */ slti $v0, $v0, 0x2d /* 431598 80218BF8 10400008 */ beqz $v0, .L80218C1C -/* 43159C 80218BFC 00000000 */ nop +/* 43159C 80218BFC 00000000 */ nop /* 4315A0 80218C00 3C014234 */ lui $at, 0x4234 /* 4315A4 80218C04 44810000 */ mtc1 $at, $f0 -/* 4315A8 80218C08 00000000 */ nop +/* 4315A8 80218C08 00000000 */ nop /* 4315AC 80218C0C 4600F001 */ sub.s $f0, $f30, $f0 /* 4315B0 80218C10 46000000 */ add.s $f0, $f0, $f0 /* 4315B4 80218C14 4600010D */ trunc.w.s $f4, $f0 @@ -122,23 +122,23 @@ glabel func_80218A50_4313F0 .L80218C1C: /* 4315BC 80218C1C 3C014387 */ lui $at, 0x4387 /* 4315C0 80218C20 44810000 */ mtc1 $at, $f0 -/* 4315C4 80218C24 00000000 */ nop +/* 4315C4 80218C24 00000000 */ nop /* 4315C8 80218C28 461E0001 */ sub.s $f0, $f0, $f30 /* 4315CC 80218C2C 46000005 */ abs.s $f0, $f0 /* 4315D0 80218C30 4600010D */ trunc.w.s $f4, $f0 /* 4315D4 80218C34 44022000 */ mfc1 $v0, $f4 -/* 4315D8 80218C38 00000000 */ nop +/* 4315D8 80218C38 00000000 */ nop /* 4315DC 80218C3C 2842002D */ slti $v0, $v0, 0x2d /* 4315E0 80218C40 1040000C */ beqz $v0, .L80218C74 /* 4315E4 80218C44 0280202D */ daddu $a0, $s4, $zero /* 4315E8 80218C48 3C014361 */ lui $at, 0x4361 /* 4315EC 80218C4C 44810000 */ mtc1 $at, $f0 -/* 4315F0 80218C50 00000000 */ nop +/* 4315F0 80218C50 00000000 */ nop /* 4315F4 80218C54 4600F001 */ sub.s $f0, $f30, $f0 /* 4315F8 80218C58 46000000 */ add.s $f0, $f0, $f0 /* 4315FC 80218C5C 3C014334 */ lui $at, 0x4334 /* 431600 80218C60 44811000 */ mtc1 $at, $f2 -/* 431604 80218C64 00000000 */ nop +/* 431604 80218C64 00000000 */ nop /* 431608 80218C68 46020000 */ add.s $f0, $f0, $f2 /* 43160C 80218C6C 4600010D */ trunc.w.s $f4, $f0 /* 431610 80218C70 44062000 */ mfc1 $a2, $f4 @@ -160,5 +160,5 @@ glabel func_80218A50_4313F0 /* 43164C 80218CAC 24020002 */ addiu $v0, $zero, 2 /* 431650 80218CB0 03E00008 */ jr $ra /* 431654 80218CB4 27BD0058 */ addiu $sp, $sp, 0x58 -/* 431658 80218CB8 00000000 */ nop -/* 43165C 80218CBC 00000000 */ nop +/* 431658 80218CB8 00000000 */ nop +/* 43165C 80218CBC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kmr_part_1/431660/func_80218CC0_431660.s b/asm/nonmatchings/battle/area_kmr_part_1/431660/func_80218CC0_431660.s index 17ff38800e..8e2f1b475b 100644 --- a/asm/nonmatchings/battle/area_kmr_part_1/431660/func_80218CC0_431660.s +++ b/asm/nonmatchings/battle/area_kmr_part_1/431660/func_80218CC0_431660.s @@ -21,7 +21,7 @@ glabel func_80218CC0_431660 /* 4316A0 80218D00 0C0B1EAF */ jal get_variable /* 4316A4 80218D04 26100004 */ addiu $s0, $s0, 4 /* 4316A8 80218D08 44820000 */ mtc1 $v0, $f0 -/* 4316AC 80218D0C 00000000 */ nop +/* 4316AC 80218D0C 00000000 */ nop /* 4316B0 80218D10 46800021 */ cvt.d.w $f0, $f0 /* 4316B4 80218D14 8E110000 */ lw $s1, ($s0) /* 4316B8 80218D18 26100004 */ addiu $s0, $s0, 4 @@ -35,7 +35,7 @@ glabel func_80218CC0_431660 /* 4316D8 80218D38 46220003 */ div.d $f0, $f0, $f2 /* 4316DC 80218D3C 462007A0 */ cvt.s.d $f30, $f0 /* 4316E0 80218D40 4614F502 */ mul.s $f20, $f30, $f20 -/* 4316E4 80218D44 00000000 */ nop +/* 4316E4 80218D44 00000000 */ nop /* 4316E8 80218D48 26100004 */ addiu $s0, $s0, 4 /* 4316EC 80218D4C 8E120000 */ lw $s2, ($s0) /* 4316F0 80218D50 3C0143B4 */ lui $at, 0x43b4 @@ -46,28 +46,28 @@ glabel func_80218CC0_431660 /* 431704 80218D64 4600A306 */ mov.s $f12, $f20 /* 431708 80218D68 3C014100 */ lui $at, 0x4100 /* 43170C 80218D6C 44816000 */ mtc1 $at, $f12 -/* 431710 80218D70 00000000 */ nop +/* 431710 80218D70 00000000 */ nop /* 431714 80218D74 460CA302 */ mul.s $f12, $f20, $f12 -/* 431718 80218D78 00000000 */ nop +/* 431718 80218D78 00000000 */ nop /* 43171C 80218D7C 3C014316 */ lui $at, 0x4316 /* 431720 80218D80 4481E000 */ mtc1 $at, $f28 -/* 431724 80218D84 00000000 */ nop +/* 431724 80218D84 00000000 */ nop /* 431728 80218D88 461C0582 */ mul.s $f22, $f0, $f28 -/* 43172C 80218D8C 00000000 */ nop +/* 43172C 80218D8C 00000000 */ nop /* 431730 80218D90 4480D000 */ mtc1 $zero, $f26 /* 431734 80218D94 0C00A85B */ jal sin_rad /* 431738 80218D98 461AB580 */ add.s $f22, $f22, $f26 /* 43173C 80218D9C 3C014120 */ lui $at, 0x4120 /* 431740 80218DA0 44811000 */ mtc1 $at, $f2 -/* 431744 80218DA4 00000000 */ nop +/* 431744 80218DA4 00000000 */ nop /* 431748 80218DA8 46020602 */ mul.s $f24, $f0, $f2 -/* 43174C 80218DAC 00000000 */ nop +/* 43174C 80218DAC 00000000 */ nop /* 431750 80218DB0 4600A306 */ mov.s $f12, $f20 /* 431754 80218DB4 0C00A874 */ jal cos_rad /* 431758 80218DB8 461AC600 */ add.s $f24, $f24, $f26 /* 43175C 80218DBC 0280202D */ daddu $a0, $s4, $zero /* 431760 80218DC0 461C0502 */ mul.s $f20, $f0, $f28 -/* 431764 80218DC4 00000000 */ nop +/* 431764 80218DC4 00000000 */ nop /* 431768 80218DC8 0220282D */ daddu $a1, $s1, $zero /* 43176C 80218DCC 4406B000 */ mfc1 $a2, $f22 /* 431770 80218DD0 3C0141A0 */ lui $at, 0x41a0 @@ -87,34 +87,34 @@ glabel func_80218CC0_431660 /* 4317A8 80218E08 0240282D */ daddu $a1, $s2, $zero /* 4317AC 80218E0C 3C0142B4 */ lui $at, 0x42b4 /* 4317B0 80218E10 44810000 */ mtc1 $at, $f0 -/* 4317B4 80218E14 00000000 */ nop +/* 4317B4 80218E14 00000000 */ nop /* 4317B8 80218E18 461E003C */ c.lt.s $f0, $f30 -/* 4317BC 80218E1C 00000000 */ nop +/* 4317BC 80218E1C 00000000 */ nop /* 4317C0 80218E20 4500000B */ bc1f .L80218E50 /* 4317C4 80218E24 0000302D */ daddu $a2, $zero, $zero /* 4317C8 80218E28 3C014387 */ lui $at, 0x4387 /* 4317CC 80218E2C 44810000 */ mtc1 $at, $f0 -/* 4317D0 80218E30 00000000 */ nop +/* 4317D0 80218E30 00000000 */ nop /* 4317D4 80218E34 4600F03C */ c.lt.s $f30, $f0 -/* 4317D8 80218E38 00000000 */ nop +/* 4317D8 80218E38 00000000 */ nop /* 4317DC 80218E3C 45030001 */ bc1tl .L80218E44 /* 4317E0 80218E40 240600B4 */ addiu $a2, $zero, 0xb4 .L80218E44: /* 4317E4 80218E44 3C0142B4 */ lui $at, 0x42b4 /* 4317E8 80218E48 44810000 */ mtc1 $at, $f0 -/* 4317EC 80218E4C 00000000 */ nop +/* 4317EC 80218E4C 00000000 */ nop .L80218E50: /* 4317F0 80218E50 461E0001 */ sub.s $f0, $f0, $f30 /* 4317F4 80218E54 46000005 */ abs.s $f0, $f0 /* 4317F8 80218E58 4600010D */ trunc.w.s $f4, $f0 /* 4317FC 80218E5C 44022000 */ mfc1 $v0, $f4 -/* 431800 80218E60 00000000 */ nop +/* 431800 80218E60 00000000 */ nop /* 431804 80218E64 2842002D */ slti $v0, $v0, 0x2d /* 431808 80218E68 10400008 */ beqz $v0, .L80218E8C -/* 43180C 80218E6C 00000000 */ nop +/* 43180C 80218E6C 00000000 */ nop /* 431810 80218E70 3C014234 */ lui $at, 0x4234 /* 431814 80218E74 44810000 */ mtc1 $at, $f0 -/* 431818 80218E78 00000000 */ nop +/* 431818 80218E78 00000000 */ nop /* 43181C 80218E7C 4600F001 */ sub.s $f0, $f30, $f0 /* 431820 80218E80 46000000 */ add.s $f0, $f0, $f0 /* 431824 80218E84 4600010D */ trunc.w.s $f4, $f0 @@ -122,23 +122,23 @@ glabel func_80218CC0_431660 .L80218E8C: /* 43182C 80218E8C 3C014387 */ lui $at, 0x4387 /* 431830 80218E90 44810000 */ mtc1 $at, $f0 -/* 431834 80218E94 00000000 */ nop +/* 431834 80218E94 00000000 */ nop /* 431838 80218E98 461E0001 */ sub.s $f0, $f0, $f30 /* 43183C 80218E9C 46000005 */ abs.s $f0, $f0 /* 431840 80218EA0 4600010D */ trunc.w.s $f4, $f0 /* 431844 80218EA4 44022000 */ mfc1 $v0, $f4 -/* 431848 80218EA8 00000000 */ nop +/* 431848 80218EA8 00000000 */ nop /* 43184C 80218EAC 2842002D */ slti $v0, $v0, 0x2d /* 431850 80218EB0 1040000C */ beqz $v0, .L80218EE4 /* 431854 80218EB4 0280202D */ daddu $a0, $s4, $zero /* 431858 80218EB8 3C014361 */ lui $at, 0x4361 /* 43185C 80218EBC 44810000 */ mtc1 $at, $f0 -/* 431860 80218EC0 00000000 */ nop +/* 431860 80218EC0 00000000 */ nop /* 431864 80218EC4 4600F001 */ sub.s $f0, $f30, $f0 /* 431868 80218EC8 46000000 */ add.s $f0, $f0, $f0 /* 43186C 80218ECC 3C014334 */ lui $at, 0x4334 /* 431870 80218ED0 44811000 */ mtc1 $at, $f2 -/* 431874 80218ED4 00000000 */ nop +/* 431874 80218ED4 00000000 */ nop /* 431878 80218ED8 46020000 */ add.s $f0, $f0, $f2 /* 43187C 80218EDC 4600010D */ trunc.w.s $f4, $f0 /* 431880 80218EE0 44062000 */ mfc1 $a2, $f4 @@ -160,5 +160,5 @@ glabel func_80218CC0_431660 /* 4318BC 80218F1C 24020002 */ addiu $v0, $zero, 2 /* 4318C0 80218F20 03E00008 */ jr $ra /* 4318C4 80218F24 27BD0058 */ addiu $sp, $sp, 0x58 -/* 4318C8 80218F28 00000000 */ nop -/* 4318CC 80218F2C 00000000 */ nop +/* 4318C8 80218F28 00000000 */ nop +/* 4318CC 80218F2C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kmr_part_1/4318D0/func_80218F30_4318D0.s b/asm/nonmatchings/battle/area_kmr_part_1/4318D0/func_80218F30_4318D0.s index 2bb460b11e..a623cb295b 100644 --- a/asm/nonmatchings/battle/area_kmr_part_1/4318D0/func_80218F30_4318D0.s +++ b/asm/nonmatchings/battle/area_kmr_part_1/4318D0/func_80218F30_4318D0.s @@ -21,7 +21,7 @@ glabel func_80218F30_4318D0 /* 431910 80218F70 0C0B1EAF */ jal get_variable /* 431914 80218F74 26100004 */ addiu $s0, $s0, 4 /* 431918 80218F78 44820000 */ mtc1 $v0, $f0 -/* 43191C 80218F7C 00000000 */ nop +/* 43191C 80218F7C 00000000 */ nop /* 431920 80218F80 46800021 */ cvt.d.w $f0, $f0 /* 431924 80218F84 8E110000 */ lw $s1, ($s0) /* 431928 80218F88 26100004 */ addiu $s0, $s0, 4 @@ -35,7 +35,7 @@ glabel func_80218F30_4318D0 /* 431948 80218FA8 46220003 */ div.d $f0, $f0, $f2 /* 43194C 80218FAC 462007A0 */ cvt.s.d $f30, $f0 /* 431950 80218FB0 4614F502 */ mul.s $f20, $f30, $f20 -/* 431954 80218FB4 00000000 */ nop +/* 431954 80218FB4 00000000 */ nop /* 431958 80218FB8 26100004 */ addiu $s0, $s0, 4 /* 43195C 80218FBC 8E120000 */ lw $s2, ($s0) /* 431960 80218FC0 3C0143B4 */ lui $at, 0x43b4 @@ -46,28 +46,28 @@ glabel func_80218F30_4318D0 /* 431974 80218FD4 4600A306 */ mov.s $f12, $f20 /* 431978 80218FD8 3C014100 */ lui $at, 0x4100 /* 43197C 80218FDC 44816000 */ mtc1 $at, $f12 -/* 431980 80218FE0 00000000 */ nop +/* 431980 80218FE0 00000000 */ nop /* 431984 80218FE4 460CA302 */ mul.s $f12, $f20, $f12 -/* 431988 80218FE8 00000000 */ nop +/* 431988 80218FE8 00000000 */ nop /* 43198C 80218FEC 3C014316 */ lui $at, 0x4316 /* 431990 80218FF0 4481E000 */ mtc1 $at, $f28 -/* 431994 80218FF4 00000000 */ nop +/* 431994 80218FF4 00000000 */ nop /* 431998 80218FF8 461C0582 */ mul.s $f22, $f0, $f28 -/* 43199C 80218FFC 00000000 */ nop +/* 43199C 80218FFC 00000000 */ nop /* 4319A0 80219000 4480D000 */ mtc1 $zero, $f26 /* 4319A4 80219004 0C00A85B */ jal sin_rad /* 4319A8 80219008 461AB580 */ add.s $f22, $f22, $f26 /* 4319AC 8021900C 3C014120 */ lui $at, 0x4120 /* 4319B0 80219010 44811000 */ mtc1 $at, $f2 -/* 4319B4 80219014 00000000 */ nop +/* 4319B4 80219014 00000000 */ nop /* 4319B8 80219018 46020602 */ mul.s $f24, $f0, $f2 -/* 4319BC 8021901C 00000000 */ nop +/* 4319BC 8021901C 00000000 */ nop /* 4319C0 80219020 4600A306 */ mov.s $f12, $f20 /* 4319C4 80219024 0C00A874 */ jal cos_rad /* 4319C8 80219028 461AC600 */ add.s $f24, $f24, $f26 /* 4319CC 8021902C 0280202D */ daddu $a0, $s4, $zero /* 4319D0 80219030 461C0502 */ mul.s $f20, $f0, $f28 -/* 4319D4 80219034 00000000 */ nop +/* 4319D4 80219034 00000000 */ nop /* 4319D8 80219038 0220282D */ daddu $a1, $s1, $zero /* 4319DC 8021903C 4406B000 */ mfc1 $a2, $f22 /* 4319E0 80219040 3C0141A0 */ lui $at, 0x41a0 @@ -87,34 +87,34 @@ glabel func_80218F30_4318D0 /* 431A18 80219078 0240282D */ daddu $a1, $s2, $zero /* 431A1C 8021907C 3C0142B4 */ lui $at, 0x42b4 /* 431A20 80219080 44810000 */ mtc1 $at, $f0 -/* 431A24 80219084 00000000 */ nop +/* 431A24 80219084 00000000 */ nop /* 431A28 80219088 461E003C */ c.lt.s $f0, $f30 -/* 431A2C 8021908C 00000000 */ nop +/* 431A2C 8021908C 00000000 */ nop /* 431A30 80219090 4500000B */ bc1f .L802190C0 /* 431A34 80219094 0000302D */ daddu $a2, $zero, $zero /* 431A38 80219098 3C014387 */ lui $at, 0x4387 /* 431A3C 8021909C 44810000 */ mtc1 $at, $f0 -/* 431A40 802190A0 00000000 */ nop +/* 431A40 802190A0 00000000 */ nop /* 431A44 802190A4 4600F03C */ c.lt.s $f30, $f0 -/* 431A48 802190A8 00000000 */ nop +/* 431A48 802190A8 00000000 */ nop /* 431A4C 802190AC 45030001 */ bc1tl .L802190B4 /* 431A50 802190B0 240600B4 */ addiu $a2, $zero, 0xb4 .L802190B4: /* 431A54 802190B4 3C0142B4 */ lui $at, 0x42b4 /* 431A58 802190B8 44810000 */ mtc1 $at, $f0 -/* 431A5C 802190BC 00000000 */ nop +/* 431A5C 802190BC 00000000 */ nop .L802190C0: /* 431A60 802190C0 461E0001 */ sub.s $f0, $f0, $f30 /* 431A64 802190C4 46000005 */ abs.s $f0, $f0 /* 431A68 802190C8 4600010D */ trunc.w.s $f4, $f0 /* 431A6C 802190CC 44022000 */ mfc1 $v0, $f4 -/* 431A70 802190D0 00000000 */ nop +/* 431A70 802190D0 00000000 */ nop /* 431A74 802190D4 2842002D */ slti $v0, $v0, 0x2d /* 431A78 802190D8 10400008 */ beqz $v0, .L802190FC -/* 431A7C 802190DC 00000000 */ nop +/* 431A7C 802190DC 00000000 */ nop /* 431A80 802190E0 3C014234 */ lui $at, 0x4234 /* 431A84 802190E4 44810000 */ mtc1 $at, $f0 -/* 431A88 802190E8 00000000 */ nop +/* 431A88 802190E8 00000000 */ nop /* 431A8C 802190EC 4600F001 */ sub.s $f0, $f30, $f0 /* 431A90 802190F0 46000000 */ add.s $f0, $f0, $f0 /* 431A94 802190F4 4600010D */ trunc.w.s $f4, $f0 @@ -122,23 +122,23 @@ glabel func_80218F30_4318D0 .L802190FC: /* 431A9C 802190FC 3C014387 */ lui $at, 0x4387 /* 431AA0 80219100 44810000 */ mtc1 $at, $f0 -/* 431AA4 80219104 00000000 */ nop +/* 431AA4 80219104 00000000 */ nop /* 431AA8 80219108 461E0001 */ sub.s $f0, $f0, $f30 /* 431AAC 8021910C 46000005 */ abs.s $f0, $f0 /* 431AB0 80219110 4600010D */ trunc.w.s $f4, $f0 /* 431AB4 80219114 44022000 */ mfc1 $v0, $f4 -/* 431AB8 80219118 00000000 */ nop +/* 431AB8 80219118 00000000 */ nop /* 431ABC 8021911C 2842002D */ slti $v0, $v0, 0x2d /* 431AC0 80219120 1040000C */ beqz $v0, .L80219154 /* 431AC4 80219124 0280202D */ daddu $a0, $s4, $zero /* 431AC8 80219128 3C014361 */ lui $at, 0x4361 /* 431ACC 8021912C 44810000 */ mtc1 $at, $f0 -/* 431AD0 80219130 00000000 */ nop +/* 431AD0 80219130 00000000 */ nop /* 431AD4 80219134 4600F001 */ sub.s $f0, $f30, $f0 /* 431AD8 80219138 46000000 */ add.s $f0, $f0, $f0 /* 431ADC 8021913C 3C014334 */ lui $at, 0x4334 /* 431AE0 80219140 44811000 */ mtc1 $at, $f2 -/* 431AE4 80219144 00000000 */ nop +/* 431AE4 80219144 00000000 */ nop /* 431AE8 80219148 46020000 */ add.s $f0, $f0, $f2 /* 431AEC 8021914C 4600010D */ trunc.w.s $f4, $f0 /* 431AF0 80219150 44062000 */ mfc1 $a2, $f4 diff --git a/asm/nonmatchings/battle/area_kmr_part_1/4318D0/func_80219198_431B38.s b/asm/nonmatchings/battle/area_kmr_part_1/4318D0/func_80219198_431B38.s index 55a6e5bc43..7e46bc0004 100644 --- a/asm/nonmatchings/battle/area_kmr_part_1/4318D0/func_80219198_431B38.s +++ b/asm/nonmatchings/battle/area_kmr_part_1/4318D0/func_80219198_431B38.s @@ -13,10 +13,10 @@ glabel func_80219198_431B38 /* 431B58 802191B8 0C046EE2 */ jal set_world_fog_color /* 431B5C 802191BC 240700FF */ addiu $a3, $zero, 0xff /* 431B60 802191C0 0C046ED4 */ jal enable_world_fog -/* 431B64 802191C4 00000000 */ nop +/* 431B64 802191C4 00000000 */ nop /* 431B68 802191C8 8FBF0010 */ lw $ra, 0x10($sp) /* 431B6C 802191CC 24020002 */ addiu $v0, $zero, 2 /* 431B70 802191D0 03E00008 */ jr $ra /* 431B74 802191D4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 431B78 802191D8 00000000 */ nop -/* 431B7C 802191DC 00000000 */ nop +/* 431B78 802191D8 00000000 */ nop +/* 431B7C 802191DC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_80218000_439A90.s b/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_80218000_439A90.s index 7d48daba1d..a67cf2aa41 100644 --- a/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_80218000_439A90.s +++ b/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_80218000_439A90.s @@ -11,12 +11,12 @@ glabel func_80218000_439A90 /* 439AA8 80218018 46007506 */ mov.s $f20, $f14 /* 439AAC 8021801C 4600A18D */ trunc.w.s $f6, $f20 /* 439AB0 80218020 44023000 */ mfc1 $v0, $f6 -/* 439AB4 80218024 00000000 */ nop +/* 439AB4 80218024 00000000 */ nop /* 439AB8 80218028 04420001 */ bltzl $v0, .L80218030 /* 439ABC 8021802C 00021023 */ negu $v0, $v0 .L80218030: /* 439AC0 80218030 44821000 */ mtc1 $v0, $f2 -/* 439AC4 80218034 00000000 */ nop +/* 439AC4 80218034 00000000 */ nop /* 439AC8 80218038 468010A0 */ cvt.s.w $f2, $f2 /* 439ACC 8021803C 46001103 */ div.s $f4, $f2, $f0 /* 439AD0 80218040 0000202D */ daddu $a0, $zero, $zero @@ -37,7 +37,7 @@ glabel func_80218000_439A90 /* 439B08 80218078 00471021 */ addu $v0, $v0, $a3 /* 439B0C 8021807C C4400000 */ lwc1 $f0, ($v0) /* 439B10 80218080 4604003C */ c.lt.s $f0, $f4 -/* 439B14 80218084 00000000 */ nop +/* 439B14 80218084 00000000 */ nop /* 439B18 80218088 45020002 */ bc1fl .L80218094 /* 439B1C 8021808C 0060302D */ daddu $a2, $v1, $zero /* 439B20 80218090 0060202D */ daddu $a0, $v1, $zero @@ -62,43 +62,43 @@ glabel func_80218000_439A90 /* 439B68 802180D8 46001085 */ abs.s $f2, $f2 /* 439B6C 802180DC 46000005 */ abs.s $f0, $f0 /* 439B70 802180E0 4600103C */ c.lt.s $f2, $f0 -/* 439B74 802180E4 00000000 */ nop +/* 439B74 802180E4 00000000 */ nop /* 439B78 802180E8 45000002 */ bc1f .L802180F4 /* 439B7C 802180EC 00C0182D */ daddu $v1, $a2, $zero /* 439B80 802180F0 0080182D */ daddu $v1, $a0, $zero .L802180F4: /* 439B84 802180F4 44800000 */ mtc1 $zero, $f0 -/* 439B88 802180F8 00000000 */ nop +/* 439B88 802180F8 00000000 */ nop /* 439B8C 802180FC 4600B03C */ c.lt.s $f22, $f0 -/* 439B90 80218100 00000000 */ nop +/* 439B90 80218100 00000000 */ nop /* 439B94 80218104 4500000A */ bc1f .L80218130 -/* 439B98 80218108 00000000 */ nop +/* 439B98 80218108 00000000 */ nop /* 439B9C 8021810C 4614003E */ c.le.s $f0, $f20 -/* 439BA0 80218110 00000000 */ nop +/* 439BA0 80218110 00000000 */ nop /* 439BA4 80218114 45000004 */ bc1f .L80218128 /* 439BA8 80218118 240200B4 */ addiu $v0, $zero, 0xb4 /* 439BAC 8021811C 00431823 */ subu $v1, $v0, $v1 /* 439BB0 80218120 44800000 */ mtc1 $zero, $f0 -/* 439BB4 80218124 00000000 */ nop +/* 439BB4 80218124 00000000 */ nop .L80218128: /* 439BB8 80218128 4600B03C */ c.lt.s $f22, $f0 -/* 439BBC 8021812C 00000000 */ nop +/* 439BBC 8021812C 00000000 */ nop .L80218130: /* 439BC0 80218130 45000005 */ bc1f .L80218148 -/* 439BC4 80218134 00000000 */ nop +/* 439BC4 80218134 00000000 */ nop /* 439BC8 80218138 4600A03C */ c.lt.s $f20, $f0 -/* 439BCC 8021813C 00000000 */ nop +/* 439BCC 8021813C 00000000 */ nop /* 439BD0 80218140 45030001 */ bc1tl .L80218148 /* 439BD4 80218144 246300B4 */ addiu $v1, $v1, 0xb4 .L80218148: /* 439BD8 80218148 44800000 */ mtc1 $zero, $f0 -/* 439BDC 8021814C 00000000 */ nop +/* 439BDC 8021814C 00000000 */ nop /* 439BE0 80218150 4616003E */ c.le.s $f0, $f22 -/* 439BE4 80218154 00000000 */ nop +/* 439BE4 80218154 00000000 */ nop /* 439BE8 80218158 45000006 */ bc1f .L80218174 -/* 439BEC 8021815C 00000000 */ nop +/* 439BEC 8021815C 00000000 */ nop /* 439BF0 80218160 4600A03C */ c.lt.s $f20, $f0 -/* 439BF4 80218164 00000000 */ nop +/* 439BF4 80218164 00000000 */ nop /* 439BF8 80218168 45000002 */ bc1f .L80218174 /* 439BFC 8021816C 24020168 */ addiu $v0, $zero, 0x168 /* 439C00 80218170 00431823 */ subu $v1, $v0, $v1 diff --git a/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_8021818C_439C1C.s b/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_8021818C_439C1C.s index 4d4a839028..18a0c1024b 100644 --- a/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_8021818C_439C1C.s +++ b/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_8021818C_439C1C.s @@ -36,7 +36,7 @@ glabel func_8021818C_439C1C /* 439C98 80218208 0C0B1EAF */ jal get_variable /* 439C9C 8021820C 02118023 */ subu $s0, $s0, $s1 /* 439CA0 80218210 16600006 */ bnez $s3, .L8021822C -/* 439CA4 80218214 00000000 */ nop +/* 439CA4 80218214 00000000 */ nop /* 439CA8 80218218 16000004 */ bnez $s0, .L8021822C /* 439CAC 8021821C 0280202D */ daddu $a0, $s4, $zero /* 439CB0 80218220 8E450000 */ lw $a1, ($s2) @@ -44,10 +44,10 @@ glabel func_8021818C_439C1C /* 439CB8 80218228 0040302D */ daddu $a2, $v0, $zero .L8021822C: /* 439CBC 8021822C 44936000 */ mtc1 $s3, $f12 -/* 439CC0 80218230 00000000 */ nop +/* 439CC0 80218230 00000000 */ nop /* 439CC4 80218234 46806320 */ cvt.s.w $f12, $f12 /* 439CC8 80218238 44907000 */ mtc1 $s0, $f14 -/* 439CCC 8021823C 00000000 */ nop +/* 439CCC 8021823C 00000000 */ nop /* 439CD0 80218240 0C086000 */ jal func_80218000_439A90 /* 439CD4 80218244 468073A0 */ cvt.s.w $f14, $f14 /* 439CD8 80218248 0280202D */ daddu $a0, $s4, $zero @@ -55,7 +55,7 @@ glabel func_8021818C_439C1C /* 439CE0 80218250 2446FFA6 */ addiu $a2, $v0, -0x5a .L80218254: /* 439CE4 80218254 0C0B2026 */ jal set_variable -/* 439CE8 80218258 00000000 */ nop +/* 439CE8 80218258 00000000 */ nop /* 439CEC 8021825C 24020002 */ addiu $v0, $zero, 2 /* 439CF0 80218260 8FBF0024 */ lw $ra, 0x24($sp) /* 439CF4 80218264 8FB40020 */ lw $s4, 0x20($sp) diff --git a/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_80218280_439D10.s b/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_80218280_439D10.s index 7aba07c94c..12561050c2 100644 --- a/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_80218280_439D10.s +++ b/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_80218280_439D10.s @@ -11,12 +11,12 @@ glabel func_80218280_439D10 /* 439D28 80218298 46007506 */ mov.s $f20, $f14 /* 439D2C 8021829C 4600A18D */ trunc.w.s $f6, $f20 /* 439D30 802182A0 44023000 */ mfc1 $v0, $f6 -/* 439D34 802182A4 00000000 */ nop +/* 439D34 802182A4 00000000 */ nop /* 439D38 802182A8 04420001 */ bltzl $v0, .L802182B0 /* 439D3C 802182AC 00021023 */ negu $v0, $v0 .L802182B0: /* 439D40 802182B0 44821000 */ mtc1 $v0, $f2 -/* 439D44 802182B4 00000000 */ nop +/* 439D44 802182B4 00000000 */ nop /* 439D48 802182B8 468010A0 */ cvt.s.w $f2, $f2 /* 439D4C 802182BC 46001103 */ div.s $f4, $f2, $f0 /* 439D50 802182C0 0000202D */ daddu $a0, $zero, $zero @@ -37,7 +37,7 @@ glabel func_80218280_439D10 /* 439D88 802182F8 00471021 */ addu $v0, $v0, $a3 /* 439D8C 802182FC C4400000 */ lwc1 $f0, ($v0) /* 439D90 80218300 4604003C */ c.lt.s $f0, $f4 -/* 439D94 80218304 00000000 */ nop +/* 439D94 80218304 00000000 */ nop /* 439D98 80218308 45020002 */ bc1fl .L80218314 /* 439D9C 8021830C 0060302D */ daddu $a2, $v1, $zero /* 439DA0 80218310 0060202D */ daddu $a0, $v1, $zero @@ -62,43 +62,43 @@ glabel func_80218280_439D10 /* 439DE8 80218358 46001085 */ abs.s $f2, $f2 /* 439DEC 8021835C 46000005 */ abs.s $f0, $f0 /* 439DF0 80218360 4600103C */ c.lt.s $f2, $f0 -/* 439DF4 80218364 00000000 */ nop +/* 439DF4 80218364 00000000 */ nop /* 439DF8 80218368 45000002 */ bc1f .L80218374 /* 439DFC 8021836C 00C0182D */ daddu $v1, $a2, $zero /* 439E00 80218370 0080182D */ daddu $v1, $a0, $zero .L80218374: /* 439E04 80218374 44800000 */ mtc1 $zero, $f0 -/* 439E08 80218378 00000000 */ nop +/* 439E08 80218378 00000000 */ nop /* 439E0C 8021837C 4600B03C */ c.lt.s $f22, $f0 -/* 439E10 80218380 00000000 */ nop +/* 439E10 80218380 00000000 */ nop /* 439E14 80218384 4500000A */ bc1f .L802183B0 -/* 439E18 80218388 00000000 */ nop +/* 439E18 80218388 00000000 */ nop /* 439E1C 8021838C 4614003E */ c.le.s $f0, $f20 -/* 439E20 80218390 00000000 */ nop +/* 439E20 80218390 00000000 */ nop /* 439E24 80218394 45000004 */ bc1f .L802183A8 /* 439E28 80218398 240200B4 */ addiu $v0, $zero, 0xb4 /* 439E2C 8021839C 00431823 */ subu $v1, $v0, $v1 /* 439E30 802183A0 44800000 */ mtc1 $zero, $f0 -/* 439E34 802183A4 00000000 */ nop +/* 439E34 802183A4 00000000 */ nop .L802183A8: /* 439E38 802183A8 4600B03C */ c.lt.s $f22, $f0 -/* 439E3C 802183AC 00000000 */ nop +/* 439E3C 802183AC 00000000 */ nop .L802183B0: /* 439E40 802183B0 45000005 */ bc1f .L802183C8 -/* 439E44 802183B4 00000000 */ nop +/* 439E44 802183B4 00000000 */ nop /* 439E48 802183B8 4600A03C */ c.lt.s $f20, $f0 -/* 439E4C 802183BC 00000000 */ nop +/* 439E4C 802183BC 00000000 */ nop /* 439E50 802183C0 45030001 */ bc1tl .L802183C8 /* 439E54 802183C4 246300B4 */ addiu $v1, $v1, 0xb4 .L802183C8: /* 439E58 802183C8 44800000 */ mtc1 $zero, $f0 -/* 439E5C 802183CC 00000000 */ nop +/* 439E5C 802183CC 00000000 */ nop /* 439E60 802183D0 4616003E */ c.le.s $f0, $f22 -/* 439E64 802183D4 00000000 */ nop +/* 439E64 802183D4 00000000 */ nop /* 439E68 802183D8 45000006 */ bc1f .L802183F4 -/* 439E6C 802183DC 00000000 */ nop +/* 439E6C 802183DC 00000000 */ nop /* 439E70 802183E0 4600A03C */ c.lt.s $f20, $f0 -/* 439E74 802183E4 00000000 */ nop +/* 439E74 802183E4 00000000 */ nop /* 439E78 802183E8 45000002 */ bc1f .L802183F4 /* 439E7C 802183EC 24020168 */ addiu $v0, $zero, 0x168 /* 439E80 802183F0 00431823 */ subu $v1, $v0, $v1 diff --git a/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_8021840C_439E9C.s b/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_8021840C_439E9C.s index 2f01c1f987..69484b2509 100644 --- a/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_8021840C_439E9C.s +++ b/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_8021840C_439E9C.s @@ -36,7 +36,7 @@ glabel func_8021840C_439E9C /* 439F18 80218488 0C0B1EAF */ jal get_variable /* 439F1C 8021848C 02118023 */ subu $s0, $s0, $s1 /* 439F20 80218490 16600006 */ bnez $s3, .L802184AC -/* 439F24 80218494 00000000 */ nop +/* 439F24 80218494 00000000 */ nop /* 439F28 80218498 16000004 */ bnez $s0, .L802184AC /* 439F2C 8021849C 0280202D */ daddu $a0, $s4, $zero /* 439F30 802184A0 8E450000 */ lw $a1, ($s2) @@ -44,10 +44,10 @@ glabel func_8021840C_439E9C /* 439F38 802184A8 0040302D */ daddu $a2, $v0, $zero .L802184AC: /* 439F3C 802184AC 44936000 */ mtc1 $s3, $f12 -/* 439F40 802184B0 00000000 */ nop +/* 439F40 802184B0 00000000 */ nop /* 439F44 802184B4 46806320 */ cvt.s.w $f12, $f12 /* 439F48 802184B8 44907000 */ mtc1 $s0, $f14 -/* 439F4C 802184BC 00000000 */ nop +/* 439F4C 802184BC 00000000 */ nop /* 439F50 802184C0 0C0860A0 */ jal func_80218280_439D10 /* 439F54 802184C4 468073A0 */ cvt.s.w $f14, $f14 /* 439F58 802184C8 0280202D */ daddu $a0, $s4, $zero @@ -55,7 +55,7 @@ glabel func_8021840C_439E9C /* 439F60 802184D0 2446FFA6 */ addiu $a2, $v0, -0x5a .L802184D4: /* 439F64 802184D4 0C0B2026 */ jal set_variable -/* 439F68 802184D8 00000000 */ nop +/* 439F68 802184D8 00000000 */ nop /* 439F6C 802184DC 24020002 */ addiu $v0, $zero, 2 /* 439F70 802184E0 8FBF0024 */ lw $ra, 0x24($sp) /* 439F74 802184E4 8FB40020 */ lw $s4, 0x20($sp) diff --git a/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_80218500_439F90.s b/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_80218500_439F90.s index 22f8f9b8f7..cad6579b8d 100644 --- a/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_80218500_439F90.s +++ b/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_80218500_439F90.s @@ -11,12 +11,12 @@ glabel func_80218500_439F90 /* 439FA8 80218518 46007506 */ mov.s $f20, $f14 /* 439FAC 8021851C 4600A18D */ trunc.w.s $f6, $f20 /* 439FB0 80218520 44023000 */ mfc1 $v0, $f6 -/* 439FB4 80218524 00000000 */ nop +/* 439FB4 80218524 00000000 */ nop /* 439FB8 80218528 04420001 */ bltzl $v0, .L80218530 /* 439FBC 8021852C 00021023 */ negu $v0, $v0 .L80218530: /* 439FC0 80218530 44821000 */ mtc1 $v0, $f2 -/* 439FC4 80218534 00000000 */ nop +/* 439FC4 80218534 00000000 */ nop /* 439FC8 80218538 468010A0 */ cvt.s.w $f2, $f2 /* 439FCC 8021853C 46001103 */ div.s $f4, $f2, $f0 /* 439FD0 80218540 0000202D */ daddu $a0, $zero, $zero @@ -37,7 +37,7 @@ glabel func_80218500_439F90 /* 43A008 80218578 00471021 */ addu $v0, $v0, $a3 /* 43A00C 8021857C C4400000 */ lwc1 $f0, ($v0) /* 43A010 80218580 4604003C */ c.lt.s $f0, $f4 -/* 43A014 80218584 00000000 */ nop +/* 43A014 80218584 00000000 */ nop /* 43A018 80218588 45020002 */ bc1fl .L80218594 /* 43A01C 8021858C 0060302D */ daddu $a2, $v1, $zero /* 43A020 80218590 0060202D */ daddu $a0, $v1, $zero @@ -62,43 +62,43 @@ glabel func_80218500_439F90 /* 43A068 802185D8 46001085 */ abs.s $f2, $f2 /* 43A06C 802185DC 46000005 */ abs.s $f0, $f0 /* 43A070 802185E0 4600103C */ c.lt.s $f2, $f0 -/* 43A074 802185E4 00000000 */ nop +/* 43A074 802185E4 00000000 */ nop /* 43A078 802185E8 45000002 */ bc1f .L802185F4 /* 43A07C 802185EC 00C0182D */ daddu $v1, $a2, $zero /* 43A080 802185F0 0080182D */ daddu $v1, $a0, $zero .L802185F4: /* 43A084 802185F4 44800000 */ mtc1 $zero, $f0 -/* 43A088 802185F8 00000000 */ nop +/* 43A088 802185F8 00000000 */ nop /* 43A08C 802185FC 4600B03C */ c.lt.s $f22, $f0 -/* 43A090 80218600 00000000 */ nop +/* 43A090 80218600 00000000 */ nop /* 43A094 80218604 4500000A */ bc1f .L80218630 -/* 43A098 80218608 00000000 */ nop +/* 43A098 80218608 00000000 */ nop /* 43A09C 8021860C 4614003E */ c.le.s $f0, $f20 -/* 43A0A0 80218610 00000000 */ nop +/* 43A0A0 80218610 00000000 */ nop /* 43A0A4 80218614 45000004 */ bc1f .L80218628 /* 43A0A8 80218618 240200B4 */ addiu $v0, $zero, 0xb4 /* 43A0AC 8021861C 00431823 */ subu $v1, $v0, $v1 /* 43A0B0 80218620 44800000 */ mtc1 $zero, $f0 -/* 43A0B4 80218624 00000000 */ nop +/* 43A0B4 80218624 00000000 */ nop .L80218628: /* 43A0B8 80218628 4600B03C */ c.lt.s $f22, $f0 -/* 43A0BC 8021862C 00000000 */ nop +/* 43A0BC 8021862C 00000000 */ nop .L80218630: /* 43A0C0 80218630 45000005 */ bc1f .L80218648 -/* 43A0C4 80218634 00000000 */ nop +/* 43A0C4 80218634 00000000 */ nop /* 43A0C8 80218638 4600A03C */ c.lt.s $f20, $f0 -/* 43A0CC 8021863C 00000000 */ nop +/* 43A0CC 8021863C 00000000 */ nop /* 43A0D0 80218640 45030001 */ bc1tl .L80218648 /* 43A0D4 80218644 246300B4 */ addiu $v1, $v1, 0xb4 .L80218648: /* 43A0D8 80218648 44800000 */ mtc1 $zero, $f0 -/* 43A0DC 8021864C 00000000 */ nop +/* 43A0DC 8021864C 00000000 */ nop /* 43A0E0 80218650 4616003E */ c.le.s $f0, $f22 -/* 43A0E4 80218654 00000000 */ nop +/* 43A0E4 80218654 00000000 */ nop /* 43A0E8 80218658 45000006 */ bc1f .L80218674 -/* 43A0EC 8021865C 00000000 */ nop +/* 43A0EC 8021865C 00000000 */ nop /* 43A0F0 80218660 4600A03C */ c.lt.s $f20, $f0 -/* 43A0F4 80218664 00000000 */ nop +/* 43A0F4 80218664 00000000 */ nop /* 43A0F8 80218668 45000002 */ bc1f .L80218674 /* 43A0FC 8021866C 24020168 */ addiu $v0, $zero, 0x168 /* 43A100 80218670 00431823 */ subu $v1, $v0, $v1 diff --git a/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_8021868C_43A11C.s b/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_8021868C_43A11C.s index ed02205c3c..e248d80757 100644 --- a/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_8021868C_43A11C.s +++ b/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_8021868C_43A11C.s @@ -36,7 +36,7 @@ glabel func_8021868C_43A11C /* 43A198 80218708 0C0B1EAF */ jal get_variable /* 43A19C 8021870C 02118023 */ subu $s0, $s0, $s1 /* 43A1A0 80218710 16600006 */ bnez $s3, .L8021872C -/* 43A1A4 80218714 00000000 */ nop +/* 43A1A4 80218714 00000000 */ nop /* 43A1A8 80218718 16000004 */ bnez $s0, .L8021872C /* 43A1AC 8021871C 0280202D */ daddu $a0, $s4, $zero /* 43A1B0 80218720 8E450000 */ lw $a1, ($s2) @@ -44,10 +44,10 @@ glabel func_8021868C_43A11C /* 43A1B8 80218728 0040302D */ daddu $a2, $v0, $zero .L8021872C: /* 43A1BC 8021872C 44936000 */ mtc1 $s3, $f12 -/* 43A1C0 80218730 00000000 */ nop +/* 43A1C0 80218730 00000000 */ nop /* 43A1C4 80218734 46806320 */ cvt.s.w $f12, $f12 /* 43A1C8 80218738 44907000 */ mtc1 $s0, $f14 -/* 43A1CC 8021873C 00000000 */ nop +/* 43A1CC 8021873C 00000000 */ nop /* 43A1D0 80218740 0C086140 */ jal func_80218500_439F90 /* 43A1D4 80218744 468073A0 */ cvt.s.w $f14, $f14 /* 43A1D8 80218748 0280202D */ daddu $a0, $s4, $zero @@ -55,7 +55,7 @@ glabel func_8021868C_43A11C /* 43A1E0 80218750 2446FFA6 */ addiu $a2, $v0, -0x5a .L80218754: /* 43A1E4 80218754 0C0B2026 */ jal set_variable -/* 43A1E8 80218758 00000000 */ nop +/* 43A1E8 80218758 00000000 */ nop /* 43A1EC 8021875C 24020002 */ addiu $v0, $zero, 2 /* 43A1F0 80218760 8FBF0024 */ lw $ra, 0x24($sp) /* 43A1F4 80218764 8FB40020 */ lw $s4, 0x20($sp) diff --git a/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_802187B0_43A240.s b/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_802187B0_43A240.s index 7f65ed4539..e9fff83623 100644 --- a/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_802187B0_43A240.s +++ b/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_802187B0_43A240.s @@ -11,12 +11,12 @@ glabel func_802187B0_43A240 /* 43A258 802187C8 46007506 */ mov.s $f20, $f14 /* 43A25C 802187CC 4600A18D */ trunc.w.s $f6, $f20 /* 43A260 802187D0 44023000 */ mfc1 $v0, $f6 -/* 43A264 802187D4 00000000 */ nop +/* 43A264 802187D4 00000000 */ nop /* 43A268 802187D8 04420001 */ bltzl $v0, .L802187E0 /* 43A26C 802187DC 00021023 */ negu $v0, $v0 .L802187E0: /* 43A270 802187E0 44821000 */ mtc1 $v0, $f2 -/* 43A274 802187E4 00000000 */ nop +/* 43A274 802187E4 00000000 */ nop /* 43A278 802187E8 468010A0 */ cvt.s.w $f2, $f2 /* 43A27C 802187EC 46001103 */ div.s $f4, $f2, $f0 /* 43A280 802187F0 0000202D */ daddu $a0, $zero, $zero @@ -37,7 +37,7 @@ glabel func_802187B0_43A240 /* 43A2B8 80218828 00471021 */ addu $v0, $v0, $a3 /* 43A2BC 8021882C C4400000 */ lwc1 $f0, ($v0) /* 43A2C0 80218830 4604003C */ c.lt.s $f0, $f4 -/* 43A2C4 80218834 00000000 */ nop +/* 43A2C4 80218834 00000000 */ nop /* 43A2C8 80218838 45020002 */ bc1fl .L80218844 /* 43A2CC 8021883C 0060302D */ daddu $a2, $v1, $zero /* 43A2D0 80218840 0060202D */ daddu $a0, $v1, $zero @@ -62,43 +62,43 @@ glabel func_802187B0_43A240 /* 43A318 80218888 46001085 */ abs.s $f2, $f2 /* 43A31C 8021888C 46000005 */ abs.s $f0, $f0 /* 43A320 80218890 4600103C */ c.lt.s $f2, $f0 -/* 43A324 80218894 00000000 */ nop +/* 43A324 80218894 00000000 */ nop /* 43A328 80218898 45000002 */ bc1f .L802188A4 /* 43A32C 8021889C 00C0182D */ daddu $v1, $a2, $zero /* 43A330 802188A0 0080182D */ daddu $v1, $a0, $zero .L802188A4: /* 43A334 802188A4 44800000 */ mtc1 $zero, $f0 -/* 43A338 802188A8 00000000 */ nop +/* 43A338 802188A8 00000000 */ nop /* 43A33C 802188AC 4600B03C */ c.lt.s $f22, $f0 -/* 43A340 802188B0 00000000 */ nop +/* 43A340 802188B0 00000000 */ nop /* 43A344 802188B4 4500000A */ bc1f .L802188E0 -/* 43A348 802188B8 00000000 */ nop +/* 43A348 802188B8 00000000 */ nop /* 43A34C 802188BC 4614003E */ c.le.s $f0, $f20 -/* 43A350 802188C0 00000000 */ nop +/* 43A350 802188C0 00000000 */ nop /* 43A354 802188C4 45000004 */ bc1f .L802188D8 /* 43A358 802188C8 240200B4 */ addiu $v0, $zero, 0xb4 /* 43A35C 802188CC 00431823 */ subu $v1, $v0, $v1 /* 43A360 802188D0 44800000 */ mtc1 $zero, $f0 -/* 43A364 802188D4 00000000 */ nop +/* 43A364 802188D4 00000000 */ nop .L802188D8: /* 43A368 802188D8 4600B03C */ c.lt.s $f22, $f0 -/* 43A36C 802188DC 00000000 */ nop +/* 43A36C 802188DC 00000000 */ nop .L802188E0: /* 43A370 802188E0 45000005 */ bc1f .L802188F8 -/* 43A374 802188E4 00000000 */ nop +/* 43A374 802188E4 00000000 */ nop /* 43A378 802188E8 4600A03C */ c.lt.s $f20, $f0 -/* 43A37C 802188EC 00000000 */ nop +/* 43A37C 802188EC 00000000 */ nop /* 43A380 802188F0 45030001 */ bc1tl .L802188F8 /* 43A384 802188F4 246300B4 */ addiu $v1, $v1, 0xb4 .L802188F8: /* 43A388 802188F8 44800000 */ mtc1 $zero, $f0 -/* 43A38C 802188FC 00000000 */ nop +/* 43A38C 802188FC 00000000 */ nop /* 43A390 80218900 4616003E */ c.le.s $f0, $f22 -/* 43A394 80218904 00000000 */ nop +/* 43A394 80218904 00000000 */ nop /* 43A398 80218908 45000006 */ bc1f .L80218924 -/* 43A39C 8021890C 00000000 */ nop +/* 43A39C 8021890C 00000000 */ nop /* 43A3A0 80218910 4600A03C */ c.lt.s $f20, $f0 -/* 43A3A4 80218914 00000000 */ nop +/* 43A3A4 80218914 00000000 */ nop /* 43A3A8 80218918 45000002 */ bc1f .L80218924 /* 43A3AC 8021891C 24020168 */ addiu $v0, $zero, 0x168 /* 43A3B0 80218920 00431823 */ subu $v1, $v0, $v1 diff --git a/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_8021893C_43A3CC.s b/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_8021893C_43A3CC.s index 79fae2df7f..f94746715c 100644 --- a/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_8021893C_43A3CC.s +++ b/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_8021893C_43A3CC.s @@ -36,7 +36,7 @@ glabel func_8021893C_43A3CC /* 43A448 802189B8 0C0B1EAF */ jal get_variable /* 43A44C 802189BC 02118023 */ subu $s0, $s0, $s1 /* 43A450 802189C0 16600006 */ bnez $s3, .L802189DC -/* 43A454 802189C4 00000000 */ nop +/* 43A454 802189C4 00000000 */ nop /* 43A458 802189C8 16000004 */ bnez $s0, .L802189DC /* 43A45C 802189CC 0280202D */ daddu $a0, $s4, $zero /* 43A460 802189D0 8E450000 */ lw $a1, ($s2) @@ -44,10 +44,10 @@ glabel func_8021893C_43A3CC /* 43A468 802189D8 0040302D */ daddu $a2, $v0, $zero .L802189DC: /* 43A46C 802189DC 44936000 */ mtc1 $s3, $f12 -/* 43A470 802189E0 00000000 */ nop +/* 43A470 802189E0 00000000 */ nop /* 43A474 802189E4 46806320 */ cvt.s.w $f12, $f12 /* 43A478 802189E8 44907000 */ mtc1 $s0, $f14 -/* 43A47C 802189EC 00000000 */ nop +/* 43A47C 802189EC 00000000 */ nop /* 43A480 802189F0 0C0861EC */ jal func_802187B0_43A240 /* 43A484 802189F4 468073A0 */ cvt.s.w $f14, $f14 /* 43A488 802189F8 0280202D */ daddu $a0, $s4, $zero @@ -55,7 +55,7 @@ glabel func_8021893C_43A3CC /* 43A490 80218A00 2446FFA6 */ addiu $a2, $v0, -0x5a .L80218A04: /* 43A494 80218A04 0C0B2026 */ jal set_variable -/* 43A498 80218A08 00000000 */ nop +/* 43A498 80218A08 00000000 */ nop /* 43A49C 80218A0C 24020002 */ addiu $v0, $zero, 2 /* 43A4A0 80218A10 8FBF0024 */ lw $ra, 0x24($sp) /* 43A4A4 80218A14 8FB40020 */ lw $s4, 0x20($sp) diff --git a/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_80218A60_43A4F0.s b/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_80218A60_43A4F0.s index 685d6a46b5..8a50a41ed0 100644 --- a/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_80218A60_43A4F0.s +++ b/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_80218A60_43A4F0.s @@ -22,15 +22,15 @@ glabel func_80218A60_43A4F0 /* 43A534 80218AA4 0C0B1EAF */ jal get_variable /* 43A538 80218AA8 0040802D */ daddu $s0, $v0, $zero /* 43A53C 80218AAC 44920000 */ mtc1 $s2, $f0 -/* 43A540 80218AB0 00000000 */ nop +/* 43A540 80218AB0 00000000 */ nop /* 43A544 80218AB4 46800020 */ cvt.s.w $f0, $f0 /* 43A548 80218AB8 44050000 */ mfc1 $a1, $f0 /* 43A54C 80218ABC 44900000 */ mtc1 $s0, $f0 -/* 43A550 80218AC0 00000000 */ nop +/* 43A550 80218AC0 00000000 */ nop /* 43A554 80218AC4 46800020 */ cvt.s.w $f0, $f0 /* 43A558 80218AC8 44060000 */ mfc1 $a2, $f0 /* 43A55C 80218ACC 44820000 */ mtc1 $v0, $f0 -/* 43A560 80218AD0 00000000 */ nop +/* 43A560 80218AD0 00000000 */ nop /* 43A564 80218AD4 46800020 */ cvt.s.w $f0, $f0 /* 43A568 80218AD8 44070000 */ mfc1 $a3, $f0 /* 43A56C 80218ADC 24040002 */ addiu $a0, $zero, 2 @@ -43,6 +43,6 @@ glabel func_80218A60_43A4F0 /* 43A588 80218AF8 24020002 */ addiu $v0, $zero, 2 /* 43A58C 80218AFC 03E00008 */ jr $ra /* 43A590 80218B00 27BD0028 */ addiu $sp, $sp, 0x28 -/* 43A594 80218B04 00000000 */ nop -/* 43A598 80218B08 00000000 */ nop -/* 43A59C 80218B0C 00000000 */ nop +/* 43A594 80218B04 00000000 */ nop +/* 43A598 80218B08 00000000 */ nop +/* 43A59C 80218B0C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kmr_part_2/43A7E0/func_80218D50_43A7E0.s b/asm/nonmatchings/battle/area_kmr_part_2/43A7E0/func_80218D50_43A7E0.s index 26cf5e4daf..4c652965dd 100644 --- a/asm/nonmatchings/battle/area_kmr_part_2/43A7E0/func_80218D50_43A7E0.s +++ b/asm/nonmatchings/battle/area_kmr_part_2/43A7E0/func_80218D50_43A7E0.s @@ -21,7 +21,7 @@ glabel func_80218D50_43A7E0 /* 43A820 80218D90 0C0B1EAF */ jal get_variable /* 43A824 80218D94 26100004 */ addiu $s0, $s0, 4 /* 43A828 80218D98 44820000 */ mtc1 $v0, $f0 -/* 43A82C 80218D9C 00000000 */ nop +/* 43A82C 80218D9C 00000000 */ nop /* 43A830 80218DA0 46800021 */ cvt.d.w $f0, $f0 /* 43A834 80218DA4 8E110000 */ lw $s1, ($s0) /* 43A838 80218DA8 26100004 */ addiu $s0, $s0, 4 @@ -35,7 +35,7 @@ glabel func_80218D50_43A7E0 /* 43A858 80218DC8 46220003 */ div.d $f0, $f0, $f2 /* 43A85C 80218DCC 462007A0 */ cvt.s.d $f30, $f0 /* 43A860 80218DD0 4614F502 */ mul.s $f20, $f30, $f20 -/* 43A864 80218DD4 00000000 */ nop +/* 43A864 80218DD4 00000000 */ nop /* 43A868 80218DD8 26100004 */ addiu $s0, $s0, 4 /* 43A86C 80218DDC 8E120000 */ lw $s2, ($s0) /* 43A870 80218DE0 3C0143B4 */ lui $at, 0x43b4 @@ -46,28 +46,28 @@ glabel func_80218D50_43A7E0 /* 43A884 80218DF4 4600A306 */ mov.s $f12, $f20 /* 43A888 80218DF8 3C014100 */ lui $at, 0x4100 /* 43A88C 80218DFC 44816000 */ mtc1 $at, $f12 -/* 43A890 80218E00 00000000 */ nop +/* 43A890 80218E00 00000000 */ nop /* 43A894 80218E04 460CA302 */ mul.s $f12, $f20, $f12 -/* 43A898 80218E08 00000000 */ nop +/* 43A898 80218E08 00000000 */ nop /* 43A89C 80218E0C 3C014316 */ lui $at, 0x4316 /* 43A8A0 80218E10 4481E000 */ mtc1 $at, $f28 -/* 43A8A4 80218E14 00000000 */ nop +/* 43A8A4 80218E14 00000000 */ nop /* 43A8A8 80218E18 461C0582 */ mul.s $f22, $f0, $f28 -/* 43A8AC 80218E1C 00000000 */ nop +/* 43A8AC 80218E1C 00000000 */ nop /* 43A8B0 80218E20 4480D000 */ mtc1 $zero, $f26 /* 43A8B4 80218E24 0C00A85B */ jal sin_rad /* 43A8B8 80218E28 461AB580 */ add.s $f22, $f22, $f26 /* 43A8BC 80218E2C 3C014120 */ lui $at, 0x4120 /* 43A8C0 80218E30 44811000 */ mtc1 $at, $f2 -/* 43A8C4 80218E34 00000000 */ nop +/* 43A8C4 80218E34 00000000 */ nop /* 43A8C8 80218E38 46020602 */ mul.s $f24, $f0, $f2 -/* 43A8CC 80218E3C 00000000 */ nop +/* 43A8CC 80218E3C 00000000 */ nop /* 43A8D0 80218E40 4600A306 */ mov.s $f12, $f20 /* 43A8D4 80218E44 0C00A874 */ jal cos_rad /* 43A8D8 80218E48 461AC600 */ add.s $f24, $f24, $f26 /* 43A8DC 80218E4C 0280202D */ daddu $a0, $s4, $zero /* 43A8E0 80218E50 461C0502 */ mul.s $f20, $f0, $f28 -/* 43A8E4 80218E54 00000000 */ nop +/* 43A8E4 80218E54 00000000 */ nop /* 43A8E8 80218E58 0220282D */ daddu $a1, $s1, $zero /* 43A8EC 80218E5C 4406B000 */ mfc1 $a2, $f22 /* 43A8F0 80218E60 3C0141A0 */ lui $at, 0x41a0 @@ -87,34 +87,34 @@ glabel func_80218D50_43A7E0 /* 43A928 80218E98 0240282D */ daddu $a1, $s2, $zero /* 43A92C 80218E9C 3C0142B4 */ lui $at, 0x42b4 /* 43A930 80218EA0 44810000 */ mtc1 $at, $f0 -/* 43A934 80218EA4 00000000 */ nop +/* 43A934 80218EA4 00000000 */ nop /* 43A938 80218EA8 461E003C */ c.lt.s $f0, $f30 -/* 43A93C 80218EAC 00000000 */ nop +/* 43A93C 80218EAC 00000000 */ nop /* 43A940 80218EB0 4500000B */ bc1f .L80218EE0 /* 43A944 80218EB4 0000302D */ daddu $a2, $zero, $zero /* 43A948 80218EB8 3C014387 */ lui $at, 0x4387 /* 43A94C 80218EBC 44810000 */ mtc1 $at, $f0 -/* 43A950 80218EC0 00000000 */ nop +/* 43A950 80218EC0 00000000 */ nop /* 43A954 80218EC4 4600F03C */ c.lt.s $f30, $f0 -/* 43A958 80218EC8 00000000 */ nop +/* 43A958 80218EC8 00000000 */ nop /* 43A95C 80218ECC 45030001 */ bc1tl .L80218ED4 /* 43A960 80218ED0 240600B4 */ addiu $a2, $zero, 0xb4 .L80218ED4: /* 43A964 80218ED4 3C0142B4 */ lui $at, 0x42b4 /* 43A968 80218ED8 44810000 */ mtc1 $at, $f0 -/* 43A96C 80218EDC 00000000 */ nop +/* 43A96C 80218EDC 00000000 */ nop .L80218EE0: /* 43A970 80218EE0 461E0001 */ sub.s $f0, $f0, $f30 /* 43A974 80218EE4 46000005 */ abs.s $f0, $f0 /* 43A978 80218EE8 4600010D */ trunc.w.s $f4, $f0 /* 43A97C 80218EEC 44022000 */ mfc1 $v0, $f4 -/* 43A980 80218EF0 00000000 */ nop +/* 43A980 80218EF0 00000000 */ nop /* 43A984 80218EF4 2842002D */ slti $v0, $v0, 0x2d /* 43A988 80218EF8 10400008 */ beqz $v0, .L80218F1C -/* 43A98C 80218EFC 00000000 */ nop +/* 43A98C 80218EFC 00000000 */ nop /* 43A990 80218F00 3C014234 */ lui $at, 0x4234 /* 43A994 80218F04 44810000 */ mtc1 $at, $f0 -/* 43A998 80218F08 00000000 */ nop +/* 43A998 80218F08 00000000 */ nop /* 43A99C 80218F0C 4600F001 */ sub.s $f0, $f30, $f0 /* 43A9A0 80218F10 46000000 */ add.s $f0, $f0, $f0 /* 43A9A4 80218F14 4600010D */ trunc.w.s $f4, $f0 @@ -122,23 +122,23 @@ glabel func_80218D50_43A7E0 .L80218F1C: /* 43A9AC 80218F1C 3C014387 */ lui $at, 0x4387 /* 43A9B0 80218F20 44810000 */ mtc1 $at, $f0 -/* 43A9B4 80218F24 00000000 */ nop +/* 43A9B4 80218F24 00000000 */ nop /* 43A9B8 80218F28 461E0001 */ sub.s $f0, $f0, $f30 /* 43A9BC 80218F2C 46000005 */ abs.s $f0, $f0 /* 43A9C0 80218F30 4600010D */ trunc.w.s $f4, $f0 /* 43A9C4 80218F34 44022000 */ mfc1 $v0, $f4 -/* 43A9C8 80218F38 00000000 */ nop +/* 43A9C8 80218F38 00000000 */ nop /* 43A9CC 80218F3C 2842002D */ slti $v0, $v0, 0x2d /* 43A9D0 80218F40 1040000C */ beqz $v0, .L80218F74 /* 43A9D4 80218F44 0280202D */ daddu $a0, $s4, $zero /* 43A9D8 80218F48 3C014361 */ lui $at, 0x4361 /* 43A9DC 80218F4C 44810000 */ mtc1 $at, $f0 -/* 43A9E0 80218F50 00000000 */ nop +/* 43A9E0 80218F50 00000000 */ nop /* 43A9E4 80218F54 4600F001 */ sub.s $f0, $f30, $f0 /* 43A9E8 80218F58 46000000 */ add.s $f0, $f0, $f0 /* 43A9EC 80218F5C 3C014334 */ lui $at, 0x4334 /* 43A9F0 80218F60 44811000 */ mtc1 $at, $f2 -/* 43A9F4 80218F64 00000000 */ nop +/* 43A9F4 80218F64 00000000 */ nop /* 43A9F8 80218F68 46020000 */ add.s $f0, $f0, $f2 /* 43A9FC 80218F6C 4600010D */ trunc.w.s $f4, $f0 /* 43AA00 80218F70 44062000 */ mfc1 $a2, $f4 @@ -160,5 +160,5 @@ glabel func_80218D50_43A7E0 /* 43AA3C 80218FAC 24020002 */ addiu $v0, $zero, 2 /* 43AA40 80218FB0 03E00008 */ jr $ra /* 43AA44 80218FB4 27BD0058 */ addiu $sp, $sp, 0x58 -/* 43AA48 80218FB8 00000000 */ nop -/* 43AA4C 80218FBC 00000000 */ nop +/* 43AA48 80218FB8 00000000 */ nop +/* 43AA4C 80218FBC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kmr_part_2/43AA50/func_80218FC0_43AA50.s b/asm/nonmatchings/battle/area_kmr_part_2/43AA50/func_80218FC0_43AA50.s index b7ad736aba..ba6ee75fba 100644 --- a/asm/nonmatchings/battle/area_kmr_part_2/43AA50/func_80218FC0_43AA50.s +++ b/asm/nonmatchings/battle/area_kmr_part_2/43AA50/func_80218FC0_43AA50.s @@ -21,7 +21,7 @@ glabel func_80218FC0_43AA50 /* 43AA90 80219000 0C0B1EAF */ jal get_variable /* 43AA94 80219004 26100004 */ addiu $s0, $s0, 4 /* 43AA98 80219008 44820000 */ mtc1 $v0, $f0 -/* 43AA9C 8021900C 00000000 */ nop +/* 43AA9C 8021900C 00000000 */ nop /* 43AAA0 80219010 46800021 */ cvt.d.w $f0, $f0 /* 43AAA4 80219014 8E110000 */ lw $s1, ($s0) /* 43AAA8 80219018 26100004 */ addiu $s0, $s0, 4 @@ -35,7 +35,7 @@ glabel func_80218FC0_43AA50 /* 43AAC8 80219038 46220003 */ div.d $f0, $f0, $f2 /* 43AACC 8021903C 462007A0 */ cvt.s.d $f30, $f0 /* 43AAD0 80219040 4614F502 */ mul.s $f20, $f30, $f20 -/* 43AAD4 80219044 00000000 */ nop +/* 43AAD4 80219044 00000000 */ nop /* 43AAD8 80219048 26100004 */ addiu $s0, $s0, 4 /* 43AADC 8021904C 8E120000 */ lw $s2, ($s0) /* 43AAE0 80219050 3C0143B4 */ lui $at, 0x43b4 @@ -46,28 +46,28 @@ glabel func_80218FC0_43AA50 /* 43AAF4 80219064 4600A306 */ mov.s $f12, $f20 /* 43AAF8 80219068 3C014100 */ lui $at, 0x4100 /* 43AAFC 8021906C 44816000 */ mtc1 $at, $f12 -/* 43AB00 80219070 00000000 */ nop +/* 43AB00 80219070 00000000 */ nop /* 43AB04 80219074 460CA302 */ mul.s $f12, $f20, $f12 -/* 43AB08 80219078 00000000 */ nop +/* 43AB08 80219078 00000000 */ nop /* 43AB0C 8021907C 3C014316 */ lui $at, 0x4316 /* 43AB10 80219080 4481E000 */ mtc1 $at, $f28 -/* 43AB14 80219084 00000000 */ nop +/* 43AB14 80219084 00000000 */ nop /* 43AB18 80219088 461C0582 */ mul.s $f22, $f0, $f28 -/* 43AB1C 8021908C 00000000 */ nop +/* 43AB1C 8021908C 00000000 */ nop /* 43AB20 80219090 4480D000 */ mtc1 $zero, $f26 /* 43AB24 80219094 0C00A85B */ jal sin_rad /* 43AB28 80219098 461AB580 */ add.s $f22, $f22, $f26 /* 43AB2C 8021909C 3C014120 */ lui $at, 0x4120 /* 43AB30 802190A0 44811000 */ mtc1 $at, $f2 -/* 43AB34 802190A4 00000000 */ nop +/* 43AB34 802190A4 00000000 */ nop /* 43AB38 802190A8 46020602 */ mul.s $f24, $f0, $f2 -/* 43AB3C 802190AC 00000000 */ nop +/* 43AB3C 802190AC 00000000 */ nop /* 43AB40 802190B0 4600A306 */ mov.s $f12, $f20 /* 43AB44 802190B4 0C00A874 */ jal cos_rad /* 43AB48 802190B8 461AC600 */ add.s $f24, $f24, $f26 /* 43AB4C 802190BC 0280202D */ daddu $a0, $s4, $zero /* 43AB50 802190C0 461C0502 */ mul.s $f20, $f0, $f28 -/* 43AB54 802190C4 00000000 */ nop +/* 43AB54 802190C4 00000000 */ nop /* 43AB58 802190C8 0220282D */ daddu $a1, $s1, $zero /* 43AB5C 802190CC 4406B000 */ mfc1 $a2, $f22 /* 43AB60 802190D0 3C0141A0 */ lui $at, 0x41a0 @@ -87,34 +87,34 @@ glabel func_80218FC0_43AA50 /* 43AB98 80219108 0240282D */ daddu $a1, $s2, $zero /* 43AB9C 8021910C 3C0142B4 */ lui $at, 0x42b4 /* 43ABA0 80219110 44810000 */ mtc1 $at, $f0 -/* 43ABA4 80219114 00000000 */ nop +/* 43ABA4 80219114 00000000 */ nop /* 43ABA8 80219118 461E003C */ c.lt.s $f0, $f30 -/* 43ABAC 8021911C 00000000 */ nop +/* 43ABAC 8021911C 00000000 */ nop /* 43ABB0 80219120 4500000B */ bc1f .L80219150 /* 43ABB4 80219124 0000302D */ daddu $a2, $zero, $zero /* 43ABB8 80219128 3C014387 */ lui $at, 0x4387 /* 43ABBC 8021912C 44810000 */ mtc1 $at, $f0 -/* 43ABC0 80219130 00000000 */ nop +/* 43ABC0 80219130 00000000 */ nop /* 43ABC4 80219134 4600F03C */ c.lt.s $f30, $f0 -/* 43ABC8 80219138 00000000 */ nop +/* 43ABC8 80219138 00000000 */ nop /* 43ABCC 8021913C 45030001 */ bc1tl .L80219144 /* 43ABD0 80219140 240600B4 */ addiu $a2, $zero, 0xb4 .L80219144: /* 43ABD4 80219144 3C0142B4 */ lui $at, 0x42b4 /* 43ABD8 80219148 44810000 */ mtc1 $at, $f0 -/* 43ABDC 8021914C 00000000 */ nop +/* 43ABDC 8021914C 00000000 */ nop .L80219150: /* 43ABE0 80219150 461E0001 */ sub.s $f0, $f0, $f30 /* 43ABE4 80219154 46000005 */ abs.s $f0, $f0 /* 43ABE8 80219158 4600010D */ trunc.w.s $f4, $f0 /* 43ABEC 8021915C 44022000 */ mfc1 $v0, $f4 -/* 43ABF0 80219160 00000000 */ nop +/* 43ABF0 80219160 00000000 */ nop /* 43ABF4 80219164 2842002D */ slti $v0, $v0, 0x2d /* 43ABF8 80219168 10400008 */ beqz $v0, .L8021918C -/* 43ABFC 8021916C 00000000 */ nop +/* 43ABFC 8021916C 00000000 */ nop /* 43AC00 80219170 3C014234 */ lui $at, 0x4234 /* 43AC04 80219174 44810000 */ mtc1 $at, $f0 -/* 43AC08 80219178 00000000 */ nop +/* 43AC08 80219178 00000000 */ nop /* 43AC0C 8021917C 4600F001 */ sub.s $f0, $f30, $f0 /* 43AC10 80219180 46000000 */ add.s $f0, $f0, $f0 /* 43AC14 80219184 4600010D */ trunc.w.s $f4, $f0 @@ -122,23 +122,23 @@ glabel func_80218FC0_43AA50 .L8021918C: /* 43AC1C 8021918C 3C014387 */ lui $at, 0x4387 /* 43AC20 80219190 44810000 */ mtc1 $at, $f0 -/* 43AC24 80219194 00000000 */ nop +/* 43AC24 80219194 00000000 */ nop /* 43AC28 80219198 461E0001 */ sub.s $f0, $f0, $f30 /* 43AC2C 8021919C 46000005 */ abs.s $f0, $f0 /* 43AC30 802191A0 4600010D */ trunc.w.s $f4, $f0 /* 43AC34 802191A4 44022000 */ mfc1 $v0, $f4 -/* 43AC38 802191A8 00000000 */ nop +/* 43AC38 802191A8 00000000 */ nop /* 43AC3C 802191AC 2842002D */ slti $v0, $v0, 0x2d /* 43AC40 802191B0 1040000C */ beqz $v0, .L802191E4 /* 43AC44 802191B4 0280202D */ daddu $a0, $s4, $zero /* 43AC48 802191B8 3C014361 */ lui $at, 0x4361 /* 43AC4C 802191BC 44810000 */ mtc1 $at, $f0 -/* 43AC50 802191C0 00000000 */ nop +/* 43AC50 802191C0 00000000 */ nop /* 43AC54 802191C4 4600F001 */ sub.s $f0, $f30, $f0 /* 43AC58 802191C8 46000000 */ add.s $f0, $f0, $f0 /* 43AC5C 802191CC 3C014334 */ lui $at, 0x4334 /* 43AC60 802191D0 44811000 */ mtc1 $at, $f2 -/* 43AC64 802191D4 00000000 */ nop +/* 43AC64 802191D4 00000000 */ nop /* 43AC68 802191D8 46020000 */ add.s $f0, $f0, $f2 /* 43AC6C 802191DC 4600010D */ trunc.w.s $f4, $f0 /* 43AC70 802191E0 44062000 */ mfc1 $a2, $f4 @@ -160,5 +160,5 @@ glabel func_80218FC0_43AA50 /* 43ACAC 8021921C 24020002 */ addiu $v0, $zero, 2 /* 43ACB0 80219220 03E00008 */ jr $ra /* 43ACB4 80219224 27BD0058 */ addiu $sp, $sp, 0x58 -/* 43ACB8 80219228 00000000 */ nop -/* 43ACBC 8021922C 00000000 */ nop +/* 43ACB8 80219228 00000000 */ nop +/* 43ACBC 8021922C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kmr_part_2/43ACC0/func_80219230_43ACC0.s b/asm/nonmatchings/battle/area_kmr_part_2/43ACC0/func_80219230_43ACC0.s index 6ff9733c66..57946074f6 100644 --- a/asm/nonmatchings/battle/area_kmr_part_2/43ACC0/func_80219230_43ACC0.s +++ b/asm/nonmatchings/battle/area_kmr_part_2/43ACC0/func_80219230_43ACC0.s @@ -21,7 +21,7 @@ glabel func_80219230_43ACC0 /* 43AD00 80219270 0C0B1EAF */ jal get_variable /* 43AD04 80219274 26100004 */ addiu $s0, $s0, 4 /* 43AD08 80219278 44820000 */ mtc1 $v0, $f0 -/* 43AD0C 8021927C 00000000 */ nop +/* 43AD0C 8021927C 00000000 */ nop /* 43AD10 80219280 46800021 */ cvt.d.w $f0, $f0 /* 43AD14 80219284 8E110000 */ lw $s1, ($s0) /* 43AD18 80219288 26100004 */ addiu $s0, $s0, 4 @@ -35,7 +35,7 @@ glabel func_80219230_43ACC0 /* 43AD38 802192A8 46220003 */ div.d $f0, $f0, $f2 /* 43AD3C 802192AC 462007A0 */ cvt.s.d $f30, $f0 /* 43AD40 802192B0 4614F502 */ mul.s $f20, $f30, $f20 -/* 43AD44 802192B4 00000000 */ nop +/* 43AD44 802192B4 00000000 */ nop /* 43AD48 802192B8 26100004 */ addiu $s0, $s0, 4 /* 43AD4C 802192BC 8E120000 */ lw $s2, ($s0) /* 43AD50 802192C0 3C0143B4 */ lui $at, 0x43b4 @@ -46,28 +46,28 @@ glabel func_80219230_43ACC0 /* 43AD64 802192D4 4600A306 */ mov.s $f12, $f20 /* 43AD68 802192D8 3C014100 */ lui $at, 0x4100 /* 43AD6C 802192DC 44816000 */ mtc1 $at, $f12 -/* 43AD70 802192E0 00000000 */ nop +/* 43AD70 802192E0 00000000 */ nop /* 43AD74 802192E4 460CA302 */ mul.s $f12, $f20, $f12 -/* 43AD78 802192E8 00000000 */ nop +/* 43AD78 802192E8 00000000 */ nop /* 43AD7C 802192EC 3C014316 */ lui $at, 0x4316 /* 43AD80 802192F0 4481E000 */ mtc1 $at, $f28 -/* 43AD84 802192F4 00000000 */ nop +/* 43AD84 802192F4 00000000 */ nop /* 43AD88 802192F8 461C0582 */ mul.s $f22, $f0, $f28 -/* 43AD8C 802192FC 00000000 */ nop +/* 43AD8C 802192FC 00000000 */ nop /* 43AD90 80219300 4480D000 */ mtc1 $zero, $f26 /* 43AD94 80219304 0C00A85B */ jal sin_rad /* 43AD98 80219308 461AB580 */ add.s $f22, $f22, $f26 /* 43AD9C 8021930C 3C014120 */ lui $at, 0x4120 /* 43ADA0 80219310 44811000 */ mtc1 $at, $f2 -/* 43ADA4 80219314 00000000 */ nop +/* 43ADA4 80219314 00000000 */ nop /* 43ADA8 80219318 46020602 */ mul.s $f24, $f0, $f2 -/* 43ADAC 8021931C 00000000 */ nop +/* 43ADAC 8021931C 00000000 */ nop /* 43ADB0 80219320 4600A306 */ mov.s $f12, $f20 /* 43ADB4 80219324 0C00A874 */ jal cos_rad /* 43ADB8 80219328 461AC600 */ add.s $f24, $f24, $f26 /* 43ADBC 8021932C 0280202D */ daddu $a0, $s4, $zero /* 43ADC0 80219330 461C0502 */ mul.s $f20, $f0, $f28 -/* 43ADC4 80219334 00000000 */ nop +/* 43ADC4 80219334 00000000 */ nop /* 43ADC8 80219338 0220282D */ daddu $a1, $s1, $zero /* 43ADCC 8021933C 4406B000 */ mfc1 $a2, $f22 /* 43ADD0 80219340 3C0141A0 */ lui $at, 0x41a0 @@ -87,34 +87,34 @@ glabel func_80219230_43ACC0 /* 43AE08 80219378 0240282D */ daddu $a1, $s2, $zero /* 43AE0C 8021937C 3C0142B4 */ lui $at, 0x42b4 /* 43AE10 80219380 44810000 */ mtc1 $at, $f0 -/* 43AE14 80219384 00000000 */ nop +/* 43AE14 80219384 00000000 */ nop /* 43AE18 80219388 461E003C */ c.lt.s $f0, $f30 -/* 43AE1C 8021938C 00000000 */ nop +/* 43AE1C 8021938C 00000000 */ nop /* 43AE20 80219390 4500000B */ bc1f .L802193C0 /* 43AE24 80219394 0000302D */ daddu $a2, $zero, $zero /* 43AE28 80219398 3C014387 */ lui $at, 0x4387 /* 43AE2C 8021939C 44810000 */ mtc1 $at, $f0 -/* 43AE30 802193A0 00000000 */ nop +/* 43AE30 802193A0 00000000 */ nop /* 43AE34 802193A4 4600F03C */ c.lt.s $f30, $f0 -/* 43AE38 802193A8 00000000 */ nop +/* 43AE38 802193A8 00000000 */ nop /* 43AE3C 802193AC 45030001 */ bc1tl .L802193B4 /* 43AE40 802193B0 240600B4 */ addiu $a2, $zero, 0xb4 .L802193B4: /* 43AE44 802193B4 3C0142B4 */ lui $at, 0x42b4 /* 43AE48 802193B8 44810000 */ mtc1 $at, $f0 -/* 43AE4C 802193BC 00000000 */ nop +/* 43AE4C 802193BC 00000000 */ nop .L802193C0: /* 43AE50 802193C0 461E0001 */ sub.s $f0, $f0, $f30 /* 43AE54 802193C4 46000005 */ abs.s $f0, $f0 /* 43AE58 802193C8 4600010D */ trunc.w.s $f4, $f0 /* 43AE5C 802193CC 44022000 */ mfc1 $v0, $f4 -/* 43AE60 802193D0 00000000 */ nop +/* 43AE60 802193D0 00000000 */ nop /* 43AE64 802193D4 2842002D */ slti $v0, $v0, 0x2d /* 43AE68 802193D8 10400008 */ beqz $v0, .L802193FC -/* 43AE6C 802193DC 00000000 */ nop +/* 43AE6C 802193DC 00000000 */ nop /* 43AE70 802193E0 3C014234 */ lui $at, 0x4234 /* 43AE74 802193E4 44810000 */ mtc1 $at, $f0 -/* 43AE78 802193E8 00000000 */ nop +/* 43AE78 802193E8 00000000 */ nop /* 43AE7C 802193EC 4600F001 */ sub.s $f0, $f30, $f0 /* 43AE80 802193F0 46000000 */ add.s $f0, $f0, $f0 /* 43AE84 802193F4 4600010D */ trunc.w.s $f4, $f0 @@ -122,23 +122,23 @@ glabel func_80219230_43ACC0 .L802193FC: /* 43AE8C 802193FC 3C014387 */ lui $at, 0x4387 /* 43AE90 80219400 44810000 */ mtc1 $at, $f0 -/* 43AE94 80219404 00000000 */ nop +/* 43AE94 80219404 00000000 */ nop /* 43AE98 80219408 461E0001 */ sub.s $f0, $f0, $f30 /* 43AE9C 8021940C 46000005 */ abs.s $f0, $f0 /* 43AEA0 80219410 4600010D */ trunc.w.s $f4, $f0 /* 43AEA4 80219414 44022000 */ mfc1 $v0, $f4 -/* 43AEA8 80219418 00000000 */ nop +/* 43AEA8 80219418 00000000 */ nop /* 43AEAC 8021941C 2842002D */ slti $v0, $v0, 0x2d /* 43AEB0 80219420 1040000C */ beqz $v0, .L80219454 /* 43AEB4 80219424 0280202D */ daddu $a0, $s4, $zero /* 43AEB8 80219428 3C014361 */ lui $at, 0x4361 /* 43AEBC 8021942C 44810000 */ mtc1 $at, $f0 -/* 43AEC0 80219430 00000000 */ nop +/* 43AEC0 80219430 00000000 */ nop /* 43AEC4 80219434 4600F001 */ sub.s $f0, $f30, $f0 /* 43AEC8 80219438 46000000 */ add.s $f0, $f0, $f0 /* 43AECC 8021943C 3C014334 */ lui $at, 0x4334 /* 43AED0 80219440 44811000 */ mtc1 $at, $f2 -/* 43AED4 80219444 00000000 */ nop +/* 43AED4 80219444 00000000 */ nop /* 43AED8 80219448 46020000 */ add.s $f0, $f0, $f2 /* 43AEDC 8021944C 4600010D */ trunc.w.s $f4, $f0 /* 43AEE0 80219450 44062000 */ mfc1 $a2, $f4 @@ -160,5 +160,5 @@ glabel func_80219230_43ACC0 /* 43AF1C 8021948C 24020002 */ addiu $v0, $zero, 2 /* 43AF20 80219490 03E00008 */ jr $ra /* 43AF24 80219494 27BD0058 */ addiu $sp, $sp, 0x58 -/* 43AF28 80219498 00000000 */ nop -/* 43AF2C 8021949C 00000000 */ nop +/* 43AF28 80219498 00000000 */ nop +/* 43AF2C 8021949C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kmr_part_2/43AF30/func_802194A0_43AF30.s b/asm/nonmatchings/battle/area_kmr_part_2/43AF30/func_802194A0_43AF30.s index aa3fcaefb1..890bb5ab90 100644 --- a/asm/nonmatchings/battle/area_kmr_part_2/43AF30/func_802194A0_43AF30.s +++ b/asm/nonmatchings/battle/area_kmr_part_2/43AF30/func_802194A0_43AF30.s @@ -21,7 +21,7 @@ glabel func_802194A0_43AF30 /* 43AF70 802194E0 0C0B1EAF */ jal get_variable /* 43AF74 802194E4 26100004 */ addiu $s0, $s0, 4 /* 43AF78 802194E8 44820000 */ mtc1 $v0, $f0 -/* 43AF7C 802194EC 00000000 */ nop +/* 43AF7C 802194EC 00000000 */ nop /* 43AF80 802194F0 46800021 */ cvt.d.w $f0, $f0 /* 43AF84 802194F4 8E110000 */ lw $s1, ($s0) /* 43AF88 802194F8 26100004 */ addiu $s0, $s0, 4 @@ -35,7 +35,7 @@ glabel func_802194A0_43AF30 /* 43AFA8 80219518 46220003 */ div.d $f0, $f0, $f2 /* 43AFAC 8021951C 462007A0 */ cvt.s.d $f30, $f0 /* 43AFB0 80219520 4614F502 */ mul.s $f20, $f30, $f20 -/* 43AFB4 80219524 00000000 */ nop +/* 43AFB4 80219524 00000000 */ nop /* 43AFB8 80219528 26100004 */ addiu $s0, $s0, 4 /* 43AFBC 8021952C 8E120000 */ lw $s2, ($s0) /* 43AFC0 80219530 3C0143B4 */ lui $at, 0x43b4 @@ -46,28 +46,28 @@ glabel func_802194A0_43AF30 /* 43AFD4 80219544 4600A306 */ mov.s $f12, $f20 /* 43AFD8 80219548 3C014100 */ lui $at, 0x4100 /* 43AFDC 8021954C 44816000 */ mtc1 $at, $f12 -/* 43AFE0 80219550 00000000 */ nop +/* 43AFE0 80219550 00000000 */ nop /* 43AFE4 80219554 460CA302 */ mul.s $f12, $f20, $f12 -/* 43AFE8 80219558 00000000 */ nop +/* 43AFE8 80219558 00000000 */ nop /* 43AFEC 8021955C 3C014316 */ lui $at, 0x4316 /* 43AFF0 80219560 4481E000 */ mtc1 $at, $f28 -/* 43AFF4 80219564 00000000 */ nop +/* 43AFF4 80219564 00000000 */ nop /* 43AFF8 80219568 461C0582 */ mul.s $f22, $f0, $f28 -/* 43AFFC 8021956C 00000000 */ nop +/* 43AFFC 8021956C 00000000 */ nop /* 43B000 80219570 4480D000 */ mtc1 $zero, $f26 /* 43B004 80219574 0C00A85B */ jal sin_rad /* 43B008 80219578 461AB580 */ add.s $f22, $f22, $f26 /* 43B00C 8021957C 3C014120 */ lui $at, 0x4120 /* 43B010 80219580 44811000 */ mtc1 $at, $f2 -/* 43B014 80219584 00000000 */ nop +/* 43B014 80219584 00000000 */ nop /* 43B018 80219588 46020602 */ mul.s $f24, $f0, $f2 -/* 43B01C 8021958C 00000000 */ nop +/* 43B01C 8021958C 00000000 */ nop /* 43B020 80219590 4600A306 */ mov.s $f12, $f20 /* 43B024 80219594 0C00A874 */ jal cos_rad /* 43B028 80219598 461AC600 */ add.s $f24, $f24, $f26 /* 43B02C 8021959C 0280202D */ daddu $a0, $s4, $zero /* 43B030 802195A0 461C0502 */ mul.s $f20, $f0, $f28 -/* 43B034 802195A4 00000000 */ nop +/* 43B034 802195A4 00000000 */ nop /* 43B038 802195A8 0220282D */ daddu $a1, $s1, $zero /* 43B03C 802195AC 4406B000 */ mfc1 $a2, $f22 /* 43B040 802195B0 3C0141A0 */ lui $at, 0x41a0 @@ -87,34 +87,34 @@ glabel func_802194A0_43AF30 /* 43B078 802195E8 0240282D */ daddu $a1, $s2, $zero /* 43B07C 802195EC 3C0142B4 */ lui $at, 0x42b4 /* 43B080 802195F0 44810000 */ mtc1 $at, $f0 -/* 43B084 802195F4 00000000 */ nop +/* 43B084 802195F4 00000000 */ nop /* 43B088 802195F8 461E003C */ c.lt.s $f0, $f30 -/* 43B08C 802195FC 00000000 */ nop +/* 43B08C 802195FC 00000000 */ nop /* 43B090 80219600 4500000B */ bc1f .L80219630 /* 43B094 80219604 0000302D */ daddu $a2, $zero, $zero /* 43B098 80219608 3C014387 */ lui $at, 0x4387 /* 43B09C 8021960C 44810000 */ mtc1 $at, $f0 -/* 43B0A0 80219610 00000000 */ nop +/* 43B0A0 80219610 00000000 */ nop /* 43B0A4 80219614 4600F03C */ c.lt.s $f30, $f0 -/* 43B0A8 80219618 00000000 */ nop +/* 43B0A8 80219618 00000000 */ nop /* 43B0AC 8021961C 45030001 */ bc1tl .L80219624 /* 43B0B0 80219620 240600B4 */ addiu $a2, $zero, 0xb4 .L80219624: /* 43B0B4 80219624 3C0142B4 */ lui $at, 0x42b4 /* 43B0B8 80219628 44810000 */ mtc1 $at, $f0 -/* 43B0BC 8021962C 00000000 */ nop +/* 43B0BC 8021962C 00000000 */ nop .L80219630: /* 43B0C0 80219630 461E0001 */ sub.s $f0, $f0, $f30 /* 43B0C4 80219634 46000005 */ abs.s $f0, $f0 /* 43B0C8 80219638 4600010D */ trunc.w.s $f4, $f0 /* 43B0CC 8021963C 44022000 */ mfc1 $v0, $f4 -/* 43B0D0 80219640 00000000 */ nop +/* 43B0D0 80219640 00000000 */ nop /* 43B0D4 80219644 2842002D */ slti $v0, $v0, 0x2d /* 43B0D8 80219648 10400008 */ beqz $v0, .L8021966C -/* 43B0DC 8021964C 00000000 */ nop +/* 43B0DC 8021964C 00000000 */ nop /* 43B0E0 80219650 3C014234 */ lui $at, 0x4234 /* 43B0E4 80219654 44810000 */ mtc1 $at, $f0 -/* 43B0E8 80219658 00000000 */ nop +/* 43B0E8 80219658 00000000 */ nop /* 43B0EC 8021965C 4600F001 */ sub.s $f0, $f30, $f0 /* 43B0F0 80219660 46000000 */ add.s $f0, $f0, $f0 /* 43B0F4 80219664 4600010D */ trunc.w.s $f4, $f0 @@ -122,23 +122,23 @@ glabel func_802194A0_43AF30 .L8021966C: /* 43B0FC 8021966C 3C014387 */ lui $at, 0x4387 /* 43B100 80219670 44810000 */ mtc1 $at, $f0 -/* 43B104 80219674 00000000 */ nop +/* 43B104 80219674 00000000 */ nop /* 43B108 80219678 461E0001 */ sub.s $f0, $f0, $f30 /* 43B10C 8021967C 46000005 */ abs.s $f0, $f0 /* 43B110 80219680 4600010D */ trunc.w.s $f4, $f0 /* 43B114 80219684 44022000 */ mfc1 $v0, $f4 -/* 43B118 80219688 00000000 */ nop +/* 43B118 80219688 00000000 */ nop /* 43B11C 8021968C 2842002D */ slti $v0, $v0, 0x2d /* 43B120 80219690 1040000C */ beqz $v0, .L802196C4 /* 43B124 80219694 0280202D */ daddu $a0, $s4, $zero /* 43B128 80219698 3C014361 */ lui $at, 0x4361 /* 43B12C 8021969C 44810000 */ mtc1 $at, $f0 -/* 43B130 802196A0 00000000 */ nop +/* 43B130 802196A0 00000000 */ nop /* 43B134 802196A4 4600F001 */ sub.s $f0, $f30, $f0 /* 43B138 802196A8 46000000 */ add.s $f0, $f0, $f0 /* 43B13C 802196AC 3C014334 */ lui $at, 0x4334 /* 43B140 802196B0 44811000 */ mtc1 $at, $f2 -/* 43B144 802196B4 00000000 */ nop +/* 43B144 802196B4 00000000 */ nop /* 43B148 802196B8 46020000 */ add.s $f0, $f0, $f2 /* 43B14C 802196BC 4600010D */ trunc.w.s $f4, $f0 /* 43B150 802196C0 44062000 */ mfc1 $a2, $f4 diff --git a/asm/nonmatchings/battle/area_kmr_part_2/43AF30/func_80219708_43B198.s b/asm/nonmatchings/battle/area_kmr_part_2/43AF30/func_80219708_43B198.s index efc3ca4ae0..aabf171cdc 100644 --- a/asm/nonmatchings/battle/area_kmr_part_2/43AF30/func_80219708_43B198.s +++ b/asm/nonmatchings/battle/area_kmr_part_2/43AF30/func_80219708_43B198.s @@ -13,10 +13,10 @@ glabel func_80219708_43B198 /* 43B1B8 80219728 0C046EE2 */ jal set_world_fog_color /* 43B1BC 8021972C 240700FF */ addiu $a3, $zero, 0xff /* 43B1C0 80219730 0C046ED4 */ jal enable_world_fog -/* 43B1C4 80219734 00000000 */ nop +/* 43B1C4 80219734 00000000 */ nop /* 43B1C8 80219738 8FBF0010 */ lw $ra, 0x10($sp) /* 43B1CC 8021973C 24020002 */ addiu $v0, $zero, 2 /* 43B1D0 80219740 03E00008 */ jr $ra /* 43B1D4 80219744 27BD0018 */ addiu $sp, $sp, 0x18 -/* 43B1D8 80219748 00000000 */ nop -/* 43B1DC 8021974C 00000000 */ nop +/* 43B1D8 80219748 00000000 */ nop +/* 43B1DC 8021974C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kmr_part_3/447440/func_80218000_447440.s b/asm/nonmatchings/battle/area_kmr_part_3/447440/func_80218000_447440.s index 477964d913..7ea4ac9c22 100644 --- a/asm/nonmatchings/battle/area_kmr_part_3/447440/func_80218000_447440.s +++ b/asm/nonmatchings/battle/area_kmr_part_3/447440/func_80218000_447440.s @@ -11,12 +11,12 @@ glabel func_80218000_447440 /* 447458 80218018 46007506 */ mov.s $f20, $f14 /* 44745C 8021801C 4600A18D */ trunc.w.s $f6, $f20 /* 447460 80218020 44023000 */ mfc1 $v0, $f6 -/* 447464 80218024 00000000 */ nop +/* 447464 80218024 00000000 */ nop /* 447468 80218028 04420001 */ bltzl $v0, .L80218030 /* 44746C 8021802C 00021023 */ negu $v0, $v0 .L80218030: /* 447470 80218030 44821000 */ mtc1 $v0, $f2 -/* 447474 80218034 00000000 */ nop +/* 447474 80218034 00000000 */ nop /* 447478 80218038 468010A0 */ cvt.s.w $f2, $f2 /* 44747C 8021803C 46001103 */ div.s $f4, $f2, $f0 /* 447480 80218040 0000202D */ daddu $a0, $zero, $zero @@ -37,7 +37,7 @@ glabel func_80218000_447440 /* 4474B8 80218078 00471021 */ addu $v0, $v0, $a3 /* 4474BC 8021807C C4400000 */ lwc1 $f0, ($v0) /* 4474C0 80218080 4604003C */ c.lt.s $f0, $f4 -/* 4474C4 80218084 00000000 */ nop +/* 4474C4 80218084 00000000 */ nop /* 4474C8 80218088 45020002 */ bc1fl .L80218094 /* 4474CC 8021808C 0060302D */ daddu $a2, $v1, $zero /* 4474D0 80218090 0060202D */ daddu $a0, $v1, $zero @@ -62,43 +62,43 @@ glabel func_80218000_447440 /* 447518 802180D8 46001085 */ abs.s $f2, $f2 /* 44751C 802180DC 46000005 */ abs.s $f0, $f0 /* 447520 802180E0 4600103C */ c.lt.s $f2, $f0 -/* 447524 802180E4 00000000 */ nop +/* 447524 802180E4 00000000 */ nop /* 447528 802180E8 45000002 */ bc1f .L802180F4 /* 44752C 802180EC 00C0182D */ daddu $v1, $a2, $zero /* 447530 802180F0 0080182D */ daddu $v1, $a0, $zero .L802180F4: /* 447534 802180F4 44800000 */ mtc1 $zero, $f0 -/* 447538 802180F8 00000000 */ nop +/* 447538 802180F8 00000000 */ nop /* 44753C 802180FC 4600B03C */ c.lt.s $f22, $f0 -/* 447540 80218100 00000000 */ nop +/* 447540 80218100 00000000 */ nop /* 447544 80218104 4500000A */ bc1f .L80218130 -/* 447548 80218108 00000000 */ nop +/* 447548 80218108 00000000 */ nop /* 44754C 8021810C 4614003E */ c.le.s $f0, $f20 -/* 447550 80218110 00000000 */ nop +/* 447550 80218110 00000000 */ nop /* 447554 80218114 45000004 */ bc1f .L80218128 /* 447558 80218118 240200B4 */ addiu $v0, $zero, 0xb4 /* 44755C 8021811C 00431823 */ subu $v1, $v0, $v1 /* 447560 80218120 44800000 */ mtc1 $zero, $f0 -/* 447564 80218124 00000000 */ nop +/* 447564 80218124 00000000 */ nop .L80218128: /* 447568 80218128 4600B03C */ c.lt.s $f22, $f0 -/* 44756C 8021812C 00000000 */ nop +/* 44756C 8021812C 00000000 */ nop .L80218130: /* 447570 80218130 45000005 */ bc1f .L80218148 -/* 447574 80218134 00000000 */ nop +/* 447574 80218134 00000000 */ nop /* 447578 80218138 4600A03C */ c.lt.s $f20, $f0 -/* 44757C 8021813C 00000000 */ nop +/* 44757C 8021813C 00000000 */ nop /* 447580 80218140 45030001 */ bc1tl .L80218148 /* 447584 80218144 246300B4 */ addiu $v1, $v1, 0xb4 .L80218148: /* 447588 80218148 44800000 */ mtc1 $zero, $f0 -/* 44758C 8021814C 00000000 */ nop +/* 44758C 8021814C 00000000 */ nop /* 447590 80218150 4616003E */ c.le.s $f0, $f22 -/* 447594 80218154 00000000 */ nop +/* 447594 80218154 00000000 */ nop /* 447598 80218158 45000006 */ bc1f .L80218174 -/* 44759C 8021815C 00000000 */ nop +/* 44759C 8021815C 00000000 */ nop /* 4475A0 80218160 4600A03C */ c.lt.s $f20, $f0 -/* 4475A4 80218164 00000000 */ nop +/* 4475A4 80218164 00000000 */ nop /* 4475A8 80218168 45000002 */ bc1f .L80218174 /* 4475AC 8021816C 24020168 */ addiu $v0, $zero, 0x168 /* 4475B0 80218170 00431823 */ subu $v1, $v0, $v1 diff --git a/asm/nonmatchings/battle/area_kmr_part_3/447440/func_8021818C_4475CC.s b/asm/nonmatchings/battle/area_kmr_part_3/447440/func_8021818C_4475CC.s index 94b75b937e..cdd62cd47c 100644 --- a/asm/nonmatchings/battle/area_kmr_part_3/447440/func_8021818C_4475CC.s +++ b/asm/nonmatchings/battle/area_kmr_part_3/447440/func_8021818C_4475CC.s @@ -36,7 +36,7 @@ glabel func_8021818C_4475CC /* 447648 80218208 0C0B1EAF */ jal get_variable /* 44764C 8021820C 02118023 */ subu $s0, $s0, $s1 /* 447650 80218210 16600006 */ bnez $s3, .L8021822C -/* 447654 80218214 00000000 */ nop +/* 447654 80218214 00000000 */ nop /* 447658 80218218 16000004 */ bnez $s0, .L8021822C /* 44765C 8021821C 0280202D */ daddu $a0, $s4, $zero /* 447660 80218220 8E450000 */ lw $a1, ($s2) @@ -44,10 +44,10 @@ glabel func_8021818C_4475CC /* 447668 80218228 0040302D */ daddu $a2, $v0, $zero .L8021822C: /* 44766C 8021822C 44936000 */ mtc1 $s3, $f12 -/* 447670 80218230 00000000 */ nop +/* 447670 80218230 00000000 */ nop /* 447674 80218234 46806320 */ cvt.s.w $f12, $f12 /* 447678 80218238 44907000 */ mtc1 $s0, $f14 -/* 44767C 8021823C 00000000 */ nop +/* 44767C 8021823C 00000000 */ nop /* 447680 80218240 0C086000 */ jal func_80218000_447440 /* 447684 80218244 468073A0 */ cvt.s.w $f14, $f14 /* 447688 80218248 0280202D */ daddu $a0, $s4, $zero @@ -55,7 +55,7 @@ glabel func_8021818C_4475CC /* 447690 80218250 2446FFA6 */ addiu $a2, $v0, -0x5a .L80218254: /* 447694 80218254 0C0B2026 */ jal set_variable -/* 447698 80218258 00000000 */ nop +/* 447698 80218258 00000000 */ nop /* 44769C 8021825C 24020002 */ addiu $v0, $zero, 2 /* 4476A0 80218260 8FBF0024 */ lw $ra, 0x24($sp) /* 4476A4 80218264 8FB40020 */ lw $s4, 0x20($sp) diff --git a/asm/nonmatchings/battle/area_kmr_part_3/447440/func_802182D8_447718.s b/asm/nonmatchings/battle/area_kmr_part_3/447440/func_802182D8_447718.s index f62319c49f..1c64d82eeb 100644 --- a/asm/nonmatchings/battle/area_kmr_part_3/447440/func_802182D8_447718.s +++ b/asm/nonmatchings/battle/area_kmr_part_3/447440/func_802182D8_447718.s @@ -11,12 +11,12 @@ glabel func_802182D8_447718 /* 447730 802182F0 46007506 */ mov.s $f20, $f14 /* 447734 802182F4 4600A18D */ trunc.w.s $f6, $f20 /* 447738 802182F8 44023000 */ mfc1 $v0, $f6 -/* 44773C 802182FC 00000000 */ nop +/* 44773C 802182FC 00000000 */ nop /* 447740 80218300 04420001 */ bltzl $v0, .L80218308 /* 447744 80218304 00021023 */ negu $v0, $v0 .L80218308: /* 447748 80218308 44821000 */ mtc1 $v0, $f2 -/* 44774C 8021830C 00000000 */ nop +/* 44774C 8021830C 00000000 */ nop /* 447750 80218310 468010A0 */ cvt.s.w $f2, $f2 /* 447754 80218314 46001103 */ div.s $f4, $f2, $f0 /* 447758 80218318 0000202D */ daddu $a0, $zero, $zero @@ -37,7 +37,7 @@ glabel func_802182D8_447718 /* 447790 80218350 00471021 */ addu $v0, $v0, $a3 /* 447794 80218354 C4400000 */ lwc1 $f0, ($v0) /* 447798 80218358 4604003C */ c.lt.s $f0, $f4 -/* 44779C 8021835C 00000000 */ nop +/* 44779C 8021835C 00000000 */ nop /* 4477A0 80218360 45020002 */ bc1fl .L8021836C /* 4477A4 80218364 0060302D */ daddu $a2, $v1, $zero /* 4477A8 80218368 0060202D */ daddu $a0, $v1, $zero @@ -62,43 +62,43 @@ glabel func_802182D8_447718 /* 4477F0 802183B0 46001085 */ abs.s $f2, $f2 /* 4477F4 802183B4 46000005 */ abs.s $f0, $f0 /* 4477F8 802183B8 4600103C */ c.lt.s $f2, $f0 -/* 4477FC 802183BC 00000000 */ nop +/* 4477FC 802183BC 00000000 */ nop /* 447800 802183C0 45000002 */ bc1f .L802183CC /* 447804 802183C4 00C0182D */ daddu $v1, $a2, $zero /* 447808 802183C8 0080182D */ daddu $v1, $a0, $zero .L802183CC: /* 44780C 802183CC 44800000 */ mtc1 $zero, $f0 -/* 447810 802183D0 00000000 */ nop +/* 447810 802183D0 00000000 */ nop /* 447814 802183D4 4600B03C */ c.lt.s $f22, $f0 -/* 447818 802183D8 00000000 */ nop +/* 447818 802183D8 00000000 */ nop /* 44781C 802183DC 4500000A */ bc1f .L80218408 -/* 447820 802183E0 00000000 */ nop +/* 447820 802183E0 00000000 */ nop /* 447824 802183E4 4614003E */ c.le.s $f0, $f20 -/* 447828 802183E8 00000000 */ nop +/* 447828 802183E8 00000000 */ nop /* 44782C 802183EC 45000004 */ bc1f .L80218400 /* 447830 802183F0 240200B4 */ addiu $v0, $zero, 0xb4 /* 447834 802183F4 00431823 */ subu $v1, $v0, $v1 /* 447838 802183F8 44800000 */ mtc1 $zero, $f0 -/* 44783C 802183FC 00000000 */ nop +/* 44783C 802183FC 00000000 */ nop .L80218400: /* 447840 80218400 4600B03C */ c.lt.s $f22, $f0 -/* 447844 80218404 00000000 */ nop +/* 447844 80218404 00000000 */ nop .L80218408: /* 447848 80218408 45000005 */ bc1f .L80218420 -/* 44784C 8021840C 00000000 */ nop +/* 44784C 8021840C 00000000 */ nop /* 447850 80218410 4600A03C */ c.lt.s $f20, $f0 -/* 447854 80218414 00000000 */ nop +/* 447854 80218414 00000000 */ nop /* 447858 80218418 45030001 */ bc1tl .L80218420 /* 44785C 8021841C 246300B4 */ addiu $v1, $v1, 0xb4 .L80218420: /* 447860 80218420 44800000 */ mtc1 $zero, $f0 -/* 447864 80218424 00000000 */ nop +/* 447864 80218424 00000000 */ nop /* 447868 80218428 4616003E */ c.le.s $f0, $f22 -/* 44786C 8021842C 00000000 */ nop +/* 44786C 8021842C 00000000 */ nop /* 447870 80218430 45000006 */ bc1f .L8021844C -/* 447874 80218434 00000000 */ nop +/* 447874 80218434 00000000 */ nop /* 447878 80218438 4600A03C */ c.lt.s $f20, $f0 -/* 44787C 8021843C 00000000 */ nop +/* 44787C 8021843C 00000000 */ nop /* 447880 80218440 45000002 */ bc1f .L8021844C /* 447884 80218444 24020168 */ addiu $v0, $zero, 0x168 /* 447888 80218448 00431823 */ subu $v1, $v0, $v1 diff --git a/asm/nonmatchings/battle/area_kmr_part_3/447440/func_80218464_4478A4.s b/asm/nonmatchings/battle/area_kmr_part_3/447440/func_80218464_4478A4.s index 9a74d9a344..d468ccfbdb 100644 --- a/asm/nonmatchings/battle/area_kmr_part_3/447440/func_80218464_4478A4.s +++ b/asm/nonmatchings/battle/area_kmr_part_3/447440/func_80218464_4478A4.s @@ -36,7 +36,7 @@ glabel func_80218464_4478A4 /* 447920 802184E0 0C0B1EAF */ jal get_variable /* 447924 802184E4 02118023 */ subu $s0, $s0, $s1 /* 447928 802184E8 16600006 */ bnez $s3, .L80218504 -/* 44792C 802184EC 00000000 */ nop +/* 44792C 802184EC 00000000 */ nop /* 447930 802184F0 16000004 */ bnez $s0, .L80218504 /* 447934 802184F4 0280202D */ daddu $a0, $s4, $zero /* 447938 802184F8 8E450000 */ lw $a1, ($s2) @@ -44,10 +44,10 @@ glabel func_80218464_4478A4 /* 447940 80218500 0040302D */ daddu $a2, $v0, $zero .L80218504: /* 447944 80218504 44936000 */ mtc1 $s3, $f12 -/* 447948 80218508 00000000 */ nop +/* 447948 80218508 00000000 */ nop /* 44794C 8021850C 46806320 */ cvt.s.w $f12, $f12 /* 447950 80218510 44907000 */ mtc1 $s0, $f14 -/* 447954 80218514 00000000 */ nop +/* 447954 80218514 00000000 */ nop /* 447958 80218518 0C0860B6 */ jal func_802182D8_447718 /* 44795C 8021851C 468073A0 */ cvt.s.w $f14, $f14 /* 447960 80218520 0280202D */ daddu $a0, $s4, $zero @@ -55,7 +55,7 @@ glabel func_80218464_4478A4 /* 447968 80218528 2446FFA6 */ addiu $a2, $v0, -0x5a .L8021852C: /* 44796C 8021852C 0C0B2026 */ jal set_variable -/* 447970 80218530 00000000 */ nop +/* 447970 80218530 00000000 */ nop /* 447974 80218534 24020002 */ addiu $v0, $zero, 2 /* 447978 80218538 8FBF0024 */ lw $ra, 0x24($sp) /* 44797C 8021853C 8FB40020 */ lw $s4, 0x20($sp) @@ -65,5 +65,5 @@ glabel func_80218464_4478A4 /* 44798C 8021854C 8FB00010 */ lw $s0, 0x10($sp) /* 447990 80218550 03E00008 */ jr $ra /* 447994 80218554 27BD0028 */ addiu $sp, $sp, 0x28 -/* 447998 80218558 00000000 */ nop -/* 44799C 8021855C 00000000 */ nop +/* 447998 80218558 00000000 */ nop +/* 44799C 8021855C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kmr_part_3/4479A0/func_802185B8_4479F8.s b/asm/nonmatchings/battle/area_kmr_part_3/4479A0/func_802185B8_4479F8.s index 73c050a8e6..6d0f4b83b2 100644 --- a/asm/nonmatchings/battle/area_kmr_part_3/4479A0/func_802185B8_4479F8.s +++ b/asm/nonmatchings/battle/area_kmr_part_3/4479A0/func_802185B8_4479F8.s @@ -11,12 +11,12 @@ glabel func_802185B8_4479F8 /* 447A10 802185D0 46007506 */ mov.s $f20, $f14 /* 447A14 802185D4 4600A18D */ trunc.w.s $f6, $f20 /* 447A18 802185D8 44023000 */ mfc1 $v0, $f6 -/* 447A1C 802185DC 00000000 */ nop +/* 447A1C 802185DC 00000000 */ nop /* 447A20 802185E0 04420001 */ bltzl $v0, .L802185E8 /* 447A24 802185E4 00021023 */ negu $v0, $v0 .L802185E8: /* 447A28 802185E8 44821000 */ mtc1 $v0, $f2 -/* 447A2C 802185EC 00000000 */ nop +/* 447A2C 802185EC 00000000 */ nop /* 447A30 802185F0 468010A0 */ cvt.s.w $f2, $f2 /* 447A34 802185F4 46001103 */ div.s $f4, $f2, $f0 /* 447A38 802185F8 0000202D */ daddu $a0, $zero, $zero @@ -37,7 +37,7 @@ glabel func_802185B8_4479F8 /* 447A70 80218630 00471021 */ addu $v0, $v0, $a3 /* 447A74 80218634 C4400000 */ lwc1 $f0, ($v0) /* 447A78 80218638 4604003C */ c.lt.s $f0, $f4 -/* 447A7C 8021863C 00000000 */ nop +/* 447A7C 8021863C 00000000 */ nop /* 447A80 80218640 45020002 */ bc1fl .L8021864C /* 447A84 80218644 0060302D */ daddu $a2, $v1, $zero /* 447A88 80218648 0060202D */ daddu $a0, $v1, $zero @@ -62,43 +62,43 @@ glabel func_802185B8_4479F8 /* 447AD0 80218690 46001085 */ abs.s $f2, $f2 /* 447AD4 80218694 46000005 */ abs.s $f0, $f0 /* 447AD8 80218698 4600103C */ c.lt.s $f2, $f0 -/* 447ADC 8021869C 00000000 */ nop +/* 447ADC 8021869C 00000000 */ nop /* 447AE0 802186A0 45000002 */ bc1f .L802186AC /* 447AE4 802186A4 00C0182D */ daddu $v1, $a2, $zero /* 447AE8 802186A8 0080182D */ daddu $v1, $a0, $zero .L802186AC: /* 447AEC 802186AC 44800000 */ mtc1 $zero, $f0 -/* 447AF0 802186B0 00000000 */ nop +/* 447AF0 802186B0 00000000 */ nop /* 447AF4 802186B4 4600B03C */ c.lt.s $f22, $f0 -/* 447AF8 802186B8 00000000 */ nop +/* 447AF8 802186B8 00000000 */ nop /* 447AFC 802186BC 4500000A */ bc1f .L802186E8 -/* 447B00 802186C0 00000000 */ nop +/* 447B00 802186C0 00000000 */ nop /* 447B04 802186C4 4614003E */ c.le.s $f0, $f20 -/* 447B08 802186C8 00000000 */ nop +/* 447B08 802186C8 00000000 */ nop /* 447B0C 802186CC 45000004 */ bc1f .L802186E0 /* 447B10 802186D0 240200B4 */ addiu $v0, $zero, 0xb4 /* 447B14 802186D4 00431823 */ subu $v1, $v0, $v1 /* 447B18 802186D8 44800000 */ mtc1 $zero, $f0 -/* 447B1C 802186DC 00000000 */ nop +/* 447B1C 802186DC 00000000 */ nop .L802186E0: /* 447B20 802186E0 4600B03C */ c.lt.s $f22, $f0 -/* 447B24 802186E4 00000000 */ nop +/* 447B24 802186E4 00000000 */ nop .L802186E8: /* 447B28 802186E8 45000005 */ bc1f .L80218700 -/* 447B2C 802186EC 00000000 */ nop +/* 447B2C 802186EC 00000000 */ nop /* 447B30 802186F0 4600A03C */ c.lt.s $f20, $f0 -/* 447B34 802186F4 00000000 */ nop +/* 447B34 802186F4 00000000 */ nop /* 447B38 802186F8 45030001 */ bc1tl .L80218700 /* 447B3C 802186FC 246300B4 */ addiu $v1, $v1, 0xb4 .L80218700: /* 447B40 80218700 44800000 */ mtc1 $zero, $f0 -/* 447B44 80218704 00000000 */ nop +/* 447B44 80218704 00000000 */ nop /* 447B48 80218708 4616003E */ c.le.s $f0, $f22 -/* 447B4C 8021870C 00000000 */ nop +/* 447B4C 8021870C 00000000 */ nop /* 447B50 80218710 45000006 */ bc1f .L8021872C -/* 447B54 80218714 00000000 */ nop +/* 447B54 80218714 00000000 */ nop /* 447B58 80218718 4600A03C */ c.lt.s $f20, $f0 -/* 447B5C 8021871C 00000000 */ nop +/* 447B5C 8021871C 00000000 */ nop /* 447B60 80218720 45000002 */ bc1f .L8021872C /* 447B64 80218724 24020168 */ addiu $v0, $zero, 0x168 /* 447B68 80218728 00431823 */ subu $v1, $v0, $v1 diff --git a/asm/nonmatchings/battle/area_kmr_part_3/4479A0/func_80218744_447B84.s b/asm/nonmatchings/battle/area_kmr_part_3/4479A0/func_80218744_447B84.s index fabf683fc3..3c13e555d8 100644 --- a/asm/nonmatchings/battle/area_kmr_part_3/4479A0/func_80218744_447B84.s +++ b/asm/nonmatchings/battle/area_kmr_part_3/4479A0/func_80218744_447B84.s @@ -36,7 +36,7 @@ glabel func_80218744_447B84 /* 447C00 802187C0 0C0B1EAF */ jal get_variable /* 447C04 802187C4 02118023 */ subu $s0, $s0, $s1 /* 447C08 802187C8 16600006 */ bnez $s3, .L802187E4 -/* 447C0C 802187CC 00000000 */ nop +/* 447C0C 802187CC 00000000 */ nop /* 447C10 802187D0 16000004 */ bnez $s0, .L802187E4 /* 447C14 802187D4 0280202D */ daddu $a0, $s4, $zero /* 447C18 802187D8 8E450000 */ lw $a1, ($s2) @@ -44,10 +44,10 @@ glabel func_80218744_447B84 /* 447C20 802187E0 0040302D */ daddu $a2, $v0, $zero .L802187E4: /* 447C24 802187E4 44936000 */ mtc1 $s3, $f12 -/* 447C28 802187E8 00000000 */ nop +/* 447C28 802187E8 00000000 */ nop /* 447C2C 802187EC 46806320 */ cvt.s.w $f12, $f12 /* 447C30 802187F0 44907000 */ mtc1 $s0, $f14 -/* 447C34 802187F4 00000000 */ nop +/* 447C34 802187F4 00000000 */ nop /* 447C38 802187F8 0C08616E */ jal func_802185B8_4479F8 /* 447C3C 802187FC 468073A0 */ cvt.s.w $f14, $f14 /* 447C40 80218800 0280202D */ daddu $a0, $s4, $zero @@ -55,7 +55,7 @@ glabel func_80218744_447B84 /* 447C48 80218808 2446FFA6 */ addiu $a2, $v0, -0x5a .L8021880C: /* 447C4C 8021880C 0C0B2026 */ jal set_variable -/* 447C50 80218810 00000000 */ nop +/* 447C50 80218810 00000000 */ nop /* 447C54 80218814 24020002 */ addiu $v0, $zero, 2 /* 447C58 80218818 8FBF0024 */ lw $ra, 0x24($sp) /* 447C5C 8021881C 8FB40020 */ lw $s4, 0x20($sp) @@ -65,5 +65,5 @@ glabel func_80218744_447B84 /* 447C6C 8021882C 8FB00010 */ lw $s0, 0x10($sp) /* 447C70 80218830 03E00008 */ jr $ra /* 447C74 80218834 27BD0028 */ addiu $sp, $sp, 0x28 -/* 447C78 80218838 00000000 */ nop -/* 447C7C 8021883C 00000000 */ nop +/* 447C78 80218838 00000000 */ nop +/* 447C7C 8021883C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218B9C_447FDC.s b/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218B9C_447FDC.s index 8d0187e751..1eb4a9cef6 100644 --- a/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218B9C_447FDC.s +++ b/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218B9C_447FDC.s @@ -11,12 +11,12 @@ glabel func_80218B9C_447FDC /* 447FF4 80218BB4 46007506 */ mov.s $f20, $f14 /* 447FF8 80218BB8 4600A18D */ trunc.w.s $f6, $f20 /* 447FFC 80218BBC 44023000 */ mfc1 $v0, $f6 -/* 448000 80218BC0 00000000 */ nop +/* 448000 80218BC0 00000000 */ nop /* 448004 80218BC4 04420001 */ bltzl $v0, .L80218BCC /* 448008 80218BC8 00021023 */ negu $v0, $v0 .L80218BCC: /* 44800C 80218BCC 44821000 */ mtc1 $v0, $f2 -/* 448010 80218BD0 00000000 */ nop +/* 448010 80218BD0 00000000 */ nop /* 448014 80218BD4 468010A0 */ cvt.s.w $f2, $f2 /* 448018 80218BD8 46001103 */ div.s $f4, $f2, $f0 /* 44801C 80218BDC 0000202D */ daddu $a0, $zero, $zero @@ -37,7 +37,7 @@ glabel func_80218B9C_447FDC /* 448054 80218C14 00471021 */ addu $v0, $v0, $a3 /* 448058 80218C18 C4400000 */ lwc1 $f0, ($v0) /* 44805C 80218C1C 4604003C */ c.lt.s $f0, $f4 -/* 448060 80218C20 00000000 */ nop +/* 448060 80218C20 00000000 */ nop /* 448064 80218C24 45020002 */ bc1fl .L80218C30 /* 448068 80218C28 0060302D */ daddu $a2, $v1, $zero /* 44806C 80218C2C 0060202D */ daddu $a0, $v1, $zero @@ -62,43 +62,43 @@ glabel func_80218B9C_447FDC /* 4480B4 80218C74 46001085 */ abs.s $f2, $f2 /* 4480B8 80218C78 46000005 */ abs.s $f0, $f0 /* 4480BC 80218C7C 4600103C */ c.lt.s $f2, $f0 -/* 4480C0 80218C80 00000000 */ nop +/* 4480C0 80218C80 00000000 */ nop /* 4480C4 80218C84 45000002 */ bc1f .L80218C90 /* 4480C8 80218C88 00C0182D */ daddu $v1, $a2, $zero /* 4480CC 80218C8C 0080182D */ daddu $v1, $a0, $zero .L80218C90: /* 4480D0 80218C90 44800000 */ mtc1 $zero, $f0 -/* 4480D4 80218C94 00000000 */ nop +/* 4480D4 80218C94 00000000 */ nop /* 4480D8 80218C98 4600B03C */ c.lt.s $f22, $f0 -/* 4480DC 80218C9C 00000000 */ nop +/* 4480DC 80218C9C 00000000 */ nop /* 4480E0 80218CA0 4500000A */ bc1f .L80218CCC -/* 4480E4 80218CA4 00000000 */ nop +/* 4480E4 80218CA4 00000000 */ nop /* 4480E8 80218CA8 4614003E */ c.le.s $f0, $f20 -/* 4480EC 80218CAC 00000000 */ nop +/* 4480EC 80218CAC 00000000 */ nop /* 4480F0 80218CB0 45000004 */ bc1f .L80218CC4 /* 4480F4 80218CB4 240200B4 */ addiu $v0, $zero, 0xb4 /* 4480F8 80218CB8 00431823 */ subu $v1, $v0, $v1 /* 4480FC 80218CBC 44800000 */ mtc1 $zero, $f0 -/* 448100 80218CC0 00000000 */ nop +/* 448100 80218CC0 00000000 */ nop .L80218CC4: /* 448104 80218CC4 4600B03C */ c.lt.s $f22, $f0 -/* 448108 80218CC8 00000000 */ nop +/* 448108 80218CC8 00000000 */ nop .L80218CCC: /* 44810C 80218CCC 45000005 */ bc1f .L80218CE4 -/* 448110 80218CD0 00000000 */ nop +/* 448110 80218CD0 00000000 */ nop /* 448114 80218CD4 4600A03C */ c.lt.s $f20, $f0 -/* 448118 80218CD8 00000000 */ nop +/* 448118 80218CD8 00000000 */ nop /* 44811C 80218CDC 45030001 */ bc1tl .L80218CE4 /* 448120 80218CE0 246300B4 */ addiu $v1, $v1, 0xb4 .L80218CE4: /* 448124 80218CE4 44800000 */ mtc1 $zero, $f0 -/* 448128 80218CE8 00000000 */ nop +/* 448128 80218CE8 00000000 */ nop /* 44812C 80218CEC 4616003E */ c.le.s $f0, $f22 -/* 448130 80218CF0 00000000 */ nop +/* 448130 80218CF0 00000000 */ nop /* 448134 80218CF4 45000006 */ bc1f .L80218D10 -/* 448138 80218CF8 00000000 */ nop +/* 448138 80218CF8 00000000 */ nop /* 44813C 80218CFC 4600A03C */ c.lt.s $f20, $f0 -/* 448140 80218D00 00000000 */ nop +/* 448140 80218D00 00000000 */ nop /* 448144 80218D04 45000002 */ bc1f .L80218D10 /* 448148 80218D08 24020168 */ addiu $v0, $zero, 0x168 /* 44814C 80218D0C 00431823 */ subu $v1, $v0, $v1 diff --git a/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218D28_448168.s b/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218D28_448168.s index 5c2e93308b..203adc66b8 100644 --- a/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218D28_448168.s +++ b/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218D28_448168.s @@ -36,7 +36,7 @@ glabel func_80218D28_448168 /* 4481E4 80218DA4 0C0B1EAF */ jal get_variable /* 4481E8 80218DA8 02118023 */ subu $s0, $s0, $s1 /* 4481EC 80218DAC 16600006 */ bnez $s3, .L80218DC8 -/* 4481F0 80218DB0 00000000 */ nop +/* 4481F0 80218DB0 00000000 */ nop /* 4481F4 80218DB4 16000004 */ bnez $s0, .L80218DC8 /* 4481F8 80218DB8 0280202D */ daddu $a0, $s4, $zero /* 4481FC 80218DBC 8E450000 */ lw $a1, ($s2) @@ -44,10 +44,10 @@ glabel func_80218D28_448168 /* 448204 80218DC4 0040302D */ daddu $a2, $v0, $zero .L80218DC8: /* 448208 80218DC8 44936000 */ mtc1 $s3, $f12 -/* 44820C 80218DCC 00000000 */ nop +/* 44820C 80218DCC 00000000 */ nop /* 448210 80218DD0 46806320 */ cvt.s.w $f12, $f12 /* 448214 80218DD4 44907000 */ mtc1 $s0, $f14 -/* 448218 80218DD8 00000000 */ nop +/* 448218 80218DD8 00000000 */ nop /* 44821C 80218DDC 0C0862E7 */ jal func_80218B9C_447FDC /* 448220 80218DE0 468073A0 */ cvt.s.w $f14, $f14 /* 448224 80218DE4 0280202D */ daddu $a0, $s4, $zero @@ -55,7 +55,7 @@ glabel func_80218D28_448168 /* 44822C 80218DEC 2446FFA6 */ addiu $a2, $v0, -0x5a .L80218DF0: /* 448230 80218DF0 0C0B2026 */ jal set_variable -/* 448234 80218DF4 00000000 */ nop +/* 448234 80218DF4 00000000 */ nop /* 448238 80218DF8 24020002 */ addiu $v0, $zero, 2 /* 44823C 80218DFC 8FBF0024 */ lw $ra, 0x24($sp) /* 448240 80218E00 8FB40020 */ lw $s4, 0x20($sp) diff --git a/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218E1C_44825C.s b/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218E1C_44825C.s index 71b90e03c1..70ef9b27bb 100644 --- a/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218E1C_44825C.s +++ b/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218E1C_44825C.s @@ -42,31 +42,31 @@ glabel func_80218E1C_44825C /* 4482F0 80218EB0 0040882D */ daddu $s1, $v0, $zero /* 4482F4 80218EB4 02749823 */ subu $s3, $s3, $s4 /* 4482F8 80218EB8 44932000 */ mtc1 $s3, $f4 -/* 4482FC 80218EBC 00000000 */ nop +/* 4482FC 80218EBC 00000000 */ nop /* 448300 80218EC0 46802120 */ cvt.s.w $f4, $f4 /* 448304 80218EC4 46042102 */ mul.s $f4, $f4, $f4 -/* 448308 80218EC8 00000000 */ nop +/* 448308 80218EC8 00000000 */ nop /* 44830C 80218ECC 02519023 */ subu $s2, $s2, $s1 /* 448310 80218ED0 44921000 */ mtc1 $s2, $f2 -/* 448314 80218ED4 00000000 */ nop +/* 448314 80218ED4 00000000 */ nop /* 448318 80218ED8 468010A0 */ cvt.s.w $f2, $f2 /* 44831C 80218EDC 46021082 */ mul.s $f2, $f2, $f2 -/* 448320 80218EE0 00000000 */ nop +/* 448320 80218EE0 00000000 */ nop /* 448324 80218EE4 02028023 */ subu $s0, $s0, $v0 /* 448328 80218EE8 44900000 */ mtc1 $s0, $f0 -/* 44832C 80218EEC 00000000 */ nop +/* 44832C 80218EEC 00000000 */ nop /* 448330 80218EF0 46800020 */ cvt.s.w $f0, $f0 /* 448334 80218EF4 46000002 */ mul.s $f0, $f0, $f0 -/* 448338 80218EF8 00000000 */ nop +/* 448338 80218EF8 00000000 */ nop /* 44833C 80218EFC 46022100 */ add.s $f4, $f4, $f2 /* 448340 80218F00 46002300 */ add.s $f12, $f4, $f0 /* 448344 80218F04 46006004 */ sqrt.s $f0, $f12 /* 448348 80218F08 46000032 */ c.eq.s $f0, $f0 -/* 44834C 80218F0C 00000000 */ nop +/* 44834C 80218F0C 00000000 */ nop /* 448350 80218F10 45010003 */ bc1t .L80218F20 /* 448354 80218F14 26B50004 */ addiu $s5, $s5, 4 /* 448358 80218F18 0C0187BC */ jal sqrtf -/* 44835C 80218F1C 00000000 */ nop +/* 44835C 80218F1C 00000000 */ nop .L80218F20: /* 448360 80218F20 8EA50000 */ lw $a1, ($s5) /* 448364 80218F24 4600018D */ trunc.w.s $f6, $f0 diff --git a/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218FA4_4483E4.s b/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218FA4_4483E4.s index 500f9327ec..3c1a86b4f9 100644 --- a/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218FA4_4483E4.s +++ b/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218FA4_4483E4.s @@ -16,4 +16,4 @@ glabel func_80218FA4_4483E4 /* 448410 80218FD0 24020002 */ addiu $v0, $zero, 2 /* 448414 80218FD4 03E00008 */ jr $ra /* 448418 80218FD8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 44841C 80218FDC 00000000 */ nop +/* 44841C 80218FDC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218FE0_448420.s b/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218FE0_448420.s index 2ed97323d6..6a9c29aa16 100644 --- a/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218FE0_448420.s +++ b/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218FE0_448420.s @@ -21,7 +21,7 @@ glabel func_80218FE0_448420 /* 448460 80219020 0C0B1EAF */ jal get_variable /* 448464 80219024 26100004 */ addiu $s0, $s0, 4 /* 448468 80219028 44820000 */ mtc1 $v0, $f0 -/* 44846C 8021902C 00000000 */ nop +/* 44846C 8021902C 00000000 */ nop /* 448470 80219030 46800021 */ cvt.d.w $f0, $f0 /* 448474 80219034 8E110000 */ lw $s1, ($s0) /* 448478 80219038 26100004 */ addiu $s0, $s0, 4 @@ -35,7 +35,7 @@ glabel func_80218FE0_448420 /* 448498 80219058 46220003 */ div.d $f0, $f0, $f2 /* 44849C 8021905C 462007A0 */ cvt.s.d $f30, $f0 /* 4484A0 80219060 4614F502 */ mul.s $f20, $f30, $f20 -/* 4484A4 80219064 00000000 */ nop +/* 4484A4 80219064 00000000 */ nop /* 4484A8 80219068 26100004 */ addiu $s0, $s0, 4 /* 4484AC 8021906C 8E120000 */ lw $s2, ($s0) /* 4484B0 80219070 3C0143B4 */ lui $at, 0x43b4 @@ -46,28 +46,28 @@ glabel func_80218FE0_448420 /* 4484C4 80219084 4600A306 */ mov.s $f12, $f20 /* 4484C8 80219088 3C014100 */ lui $at, 0x4100 /* 4484CC 8021908C 44816000 */ mtc1 $at, $f12 -/* 4484D0 80219090 00000000 */ nop +/* 4484D0 80219090 00000000 */ nop /* 4484D4 80219094 460CA302 */ mul.s $f12, $f20, $f12 -/* 4484D8 80219098 00000000 */ nop +/* 4484D8 80219098 00000000 */ nop /* 4484DC 8021909C 3C014316 */ lui $at, 0x4316 /* 4484E0 802190A0 4481E000 */ mtc1 $at, $f28 -/* 4484E4 802190A4 00000000 */ nop +/* 4484E4 802190A4 00000000 */ nop /* 4484E8 802190A8 461C0582 */ mul.s $f22, $f0, $f28 -/* 4484EC 802190AC 00000000 */ nop +/* 4484EC 802190AC 00000000 */ nop /* 4484F0 802190B0 4480D000 */ mtc1 $zero, $f26 /* 4484F4 802190B4 0C00A85B */ jal sin_rad /* 4484F8 802190B8 461AB580 */ add.s $f22, $f22, $f26 /* 4484FC 802190BC 3C014120 */ lui $at, 0x4120 /* 448500 802190C0 44811000 */ mtc1 $at, $f2 -/* 448504 802190C4 00000000 */ nop +/* 448504 802190C4 00000000 */ nop /* 448508 802190C8 46020602 */ mul.s $f24, $f0, $f2 -/* 44850C 802190CC 00000000 */ nop +/* 44850C 802190CC 00000000 */ nop /* 448510 802190D0 4600A306 */ mov.s $f12, $f20 /* 448514 802190D4 0C00A874 */ jal cos_rad /* 448518 802190D8 461AC600 */ add.s $f24, $f24, $f26 /* 44851C 802190DC 0280202D */ daddu $a0, $s4, $zero /* 448520 802190E0 461C0502 */ mul.s $f20, $f0, $f28 -/* 448524 802190E4 00000000 */ nop +/* 448524 802190E4 00000000 */ nop /* 448528 802190E8 0220282D */ daddu $a1, $s1, $zero /* 44852C 802190EC 4406B000 */ mfc1 $a2, $f22 /* 448530 802190F0 3C0141A0 */ lui $at, 0x41a0 @@ -87,34 +87,34 @@ glabel func_80218FE0_448420 /* 448568 80219128 0240282D */ daddu $a1, $s2, $zero /* 44856C 8021912C 3C0142B4 */ lui $at, 0x42b4 /* 448570 80219130 44810000 */ mtc1 $at, $f0 -/* 448574 80219134 00000000 */ nop +/* 448574 80219134 00000000 */ nop /* 448578 80219138 461E003C */ c.lt.s $f0, $f30 -/* 44857C 8021913C 00000000 */ nop +/* 44857C 8021913C 00000000 */ nop /* 448580 80219140 4500000B */ bc1f .L80219170 /* 448584 80219144 0000302D */ daddu $a2, $zero, $zero /* 448588 80219148 3C014387 */ lui $at, 0x4387 /* 44858C 8021914C 44810000 */ mtc1 $at, $f0 -/* 448590 80219150 00000000 */ nop +/* 448590 80219150 00000000 */ nop /* 448594 80219154 4600F03C */ c.lt.s $f30, $f0 -/* 448598 80219158 00000000 */ nop +/* 448598 80219158 00000000 */ nop /* 44859C 8021915C 45030001 */ bc1tl .L80219164 /* 4485A0 80219160 240600B4 */ addiu $a2, $zero, 0xb4 .L80219164: /* 4485A4 80219164 3C0142B4 */ lui $at, 0x42b4 /* 4485A8 80219168 44810000 */ mtc1 $at, $f0 -/* 4485AC 8021916C 00000000 */ nop +/* 4485AC 8021916C 00000000 */ nop .L80219170: /* 4485B0 80219170 461E0001 */ sub.s $f0, $f0, $f30 /* 4485B4 80219174 46000005 */ abs.s $f0, $f0 /* 4485B8 80219178 4600010D */ trunc.w.s $f4, $f0 /* 4485BC 8021917C 44022000 */ mfc1 $v0, $f4 -/* 4485C0 80219180 00000000 */ nop +/* 4485C0 80219180 00000000 */ nop /* 4485C4 80219184 2842002D */ slti $v0, $v0, 0x2d /* 4485C8 80219188 10400008 */ beqz $v0, .L802191AC -/* 4485CC 8021918C 00000000 */ nop +/* 4485CC 8021918C 00000000 */ nop /* 4485D0 80219190 3C014234 */ lui $at, 0x4234 /* 4485D4 80219194 44810000 */ mtc1 $at, $f0 -/* 4485D8 80219198 00000000 */ nop +/* 4485D8 80219198 00000000 */ nop /* 4485DC 8021919C 4600F001 */ sub.s $f0, $f30, $f0 /* 4485E0 802191A0 46000000 */ add.s $f0, $f0, $f0 /* 4485E4 802191A4 4600010D */ trunc.w.s $f4, $f0 @@ -122,23 +122,23 @@ glabel func_80218FE0_448420 .L802191AC: /* 4485EC 802191AC 3C014387 */ lui $at, 0x4387 /* 4485F0 802191B0 44810000 */ mtc1 $at, $f0 -/* 4485F4 802191B4 00000000 */ nop +/* 4485F4 802191B4 00000000 */ nop /* 4485F8 802191B8 461E0001 */ sub.s $f0, $f0, $f30 /* 4485FC 802191BC 46000005 */ abs.s $f0, $f0 /* 448600 802191C0 4600010D */ trunc.w.s $f4, $f0 /* 448604 802191C4 44022000 */ mfc1 $v0, $f4 -/* 448608 802191C8 00000000 */ nop +/* 448608 802191C8 00000000 */ nop /* 44860C 802191CC 2842002D */ slti $v0, $v0, 0x2d /* 448610 802191D0 1040000C */ beqz $v0, .L80219204 /* 448614 802191D4 0280202D */ daddu $a0, $s4, $zero /* 448618 802191D8 3C014361 */ lui $at, 0x4361 /* 44861C 802191DC 44810000 */ mtc1 $at, $f0 -/* 448620 802191E0 00000000 */ nop +/* 448620 802191E0 00000000 */ nop /* 448624 802191E4 4600F001 */ sub.s $f0, $f30, $f0 /* 448628 802191E8 46000000 */ add.s $f0, $f0, $f0 /* 44862C 802191EC 3C014334 */ lui $at, 0x4334 /* 448630 802191F0 44811000 */ mtc1 $at, $f2 -/* 448634 802191F4 00000000 */ nop +/* 448634 802191F4 00000000 */ nop /* 448638 802191F8 46020000 */ add.s $f0, $f0, $f2 /* 44863C 802191FC 4600010D */ trunc.w.s $f4, $f0 /* 448640 80219200 44062000 */ mfc1 $a2, $f4 @@ -160,5 +160,5 @@ glabel func_80218FE0_448420 /* 44867C 8021923C 24020002 */ addiu $v0, $zero, 2 /* 448680 80219240 03E00008 */ jr $ra /* 448684 80219244 27BD0058 */ addiu $sp, $sp, 0x58 -/* 448688 80219248 00000000 */ nop -/* 44868C 8021924C 00000000 */ nop +/* 448688 80219248 00000000 */ nop +/* 44868C 8021924C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kmr_part_3/448690/func_80219250_448690.s b/asm/nonmatchings/battle/area_kmr_part_3/448690/func_80219250_448690.s index fca01aa20d..cf123ea831 100644 --- a/asm/nonmatchings/battle/area_kmr_part_3/448690/func_80219250_448690.s +++ b/asm/nonmatchings/battle/area_kmr_part_3/448690/func_80219250_448690.s @@ -21,7 +21,7 @@ glabel func_80219250_448690 /* 4486D0 80219290 0C0B1EAF */ jal get_variable /* 4486D4 80219294 26100004 */ addiu $s0, $s0, 4 /* 4486D8 80219298 44820000 */ mtc1 $v0, $f0 -/* 4486DC 8021929C 00000000 */ nop +/* 4486DC 8021929C 00000000 */ nop /* 4486E0 802192A0 46800021 */ cvt.d.w $f0, $f0 /* 4486E4 802192A4 8E110000 */ lw $s1, ($s0) /* 4486E8 802192A8 26100004 */ addiu $s0, $s0, 4 @@ -35,7 +35,7 @@ glabel func_80219250_448690 /* 448708 802192C8 46220003 */ div.d $f0, $f0, $f2 /* 44870C 802192CC 462007A0 */ cvt.s.d $f30, $f0 /* 448710 802192D0 4614F502 */ mul.s $f20, $f30, $f20 -/* 448714 802192D4 00000000 */ nop +/* 448714 802192D4 00000000 */ nop /* 448718 802192D8 26100004 */ addiu $s0, $s0, 4 /* 44871C 802192DC 8E120000 */ lw $s2, ($s0) /* 448720 802192E0 3C0143B4 */ lui $at, 0x43b4 @@ -46,28 +46,28 @@ glabel func_80219250_448690 /* 448734 802192F4 4600A306 */ mov.s $f12, $f20 /* 448738 802192F8 3C014100 */ lui $at, 0x4100 /* 44873C 802192FC 44816000 */ mtc1 $at, $f12 -/* 448740 80219300 00000000 */ nop +/* 448740 80219300 00000000 */ nop /* 448744 80219304 460CA302 */ mul.s $f12, $f20, $f12 -/* 448748 80219308 00000000 */ nop +/* 448748 80219308 00000000 */ nop /* 44874C 8021930C 3C014316 */ lui $at, 0x4316 /* 448750 80219310 4481E000 */ mtc1 $at, $f28 -/* 448754 80219314 00000000 */ nop +/* 448754 80219314 00000000 */ nop /* 448758 80219318 461C0582 */ mul.s $f22, $f0, $f28 -/* 44875C 8021931C 00000000 */ nop +/* 44875C 8021931C 00000000 */ nop /* 448760 80219320 4480D000 */ mtc1 $zero, $f26 /* 448764 80219324 0C00A85B */ jal sin_rad /* 448768 80219328 461AB580 */ add.s $f22, $f22, $f26 /* 44876C 8021932C 3C014120 */ lui $at, 0x4120 /* 448770 80219330 44811000 */ mtc1 $at, $f2 -/* 448774 80219334 00000000 */ nop +/* 448774 80219334 00000000 */ nop /* 448778 80219338 46020602 */ mul.s $f24, $f0, $f2 -/* 44877C 8021933C 00000000 */ nop +/* 44877C 8021933C 00000000 */ nop /* 448780 80219340 4600A306 */ mov.s $f12, $f20 /* 448784 80219344 0C00A874 */ jal cos_rad /* 448788 80219348 461AC600 */ add.s $f24, $f24, $f26 /* 44878C 8021934C 0280202D */ daddu $a0, $s4, $zero /* 448790 80219350 461C0502 */ mul.s $f20, $f0, $f28 -/* 448794 80219354 00000000 */ nop +/* 448794 80219354 00000000 */ nop /* 448798 80219358 0220282D */ daddu $a1, $s1, $zero /* 44879C 8021935C 4406B000 */ mfc1 $a2, $f22 /* 4487A0 80219360 3C0141A0 */ lui $at, 0x41a0 @@ -87,34 +87,34 @@ glabel func_80219250_448690 /* 4487D8 80219398 0240282D */ daddu $a1, $s2, $zero /* 4487DC 8021939C 3C0142B4 */ lui $at, 0x42b4 /* 4487E0 802193A0 44810000 */ mtc1 $at, $f0 -/* 4487E4 802193A4 00000000 */ nop +/* 4487E4 802193A4 00000000 */ nop /* 4487E8 802193A8 461E003C */ c.lt.s $f0, $f30 -/* 4487EC 802193AC 00000000 */ nop +/* 4487EC 802193AC 00000000 */ nop /* 4487F0 802193B0 4500000B */ bc1f .L802193E0 /* 4487F4 802193B4 0000302D */ daddu $a2, $zero, $zero /* 4487F8 802193B8 3C014387 */ lui $at, 0x4387 /* 4487FC 802193BC 44810000 */ mtc1 $at, $f0 -/* 448800 802193C0 00000000 */ nop +/* 448800 802193C0 00000000 */ nop /* 448804 802193C4 4600F03C */ c.lt.s $f30, $f0 -/* 448808 802193C8 00000000 */ nop +/* 448808 802193C8 00000000 */ nop /* 44880C 802193CC 45030001 */ bc1tl .L802193D4 /* 448810 802193D0 240600B4 */ addiu $a2, $zero, 0xb4 .L802193D4: /* 448814 802193D4 3C0142B4 */ lui $at, 0x42b4 /* 448818 802193D8 44810000 */ mtc1 $at, $f0 -/* 44881C 802193DC 00000000 */ nop +/* 44881C 802193DC 00000000 */ nop .L802193E0: /* 448820 802193E0 461E0001 */ sub.s $f0, $f0, $f30 /* 448824 802193E4 46000005 */ abs.s $f0, $f0 /* 448828 802193E8 4600010D */ trunc.w.s $f4, $f0 /* 44882C 802193EC 44022000 */ mfc1 $v0, $f4 -/* 448830 802193F0 00000000 */ nop +/* 448830 802193F0 00000000 */ nop /* 448834 802193F4 2842002D */ slti $v0, $v0, 0x2d /* 448838 802193F8 10400008 */ beqz $v0, .L8021941C -/* 44883C 802193FC 00000000 */ nop +/* 44883C 802193FC 00000000 */ nop /* 448840 80219400 3C014234 */ lui $at, 0x4234 /* 448844 80219404 44810000 */ mtc1 $at, $f0 -/* 448848 80219408 00000000 */ nop +/* 448848 80219408 00000000 */ nop /* 44884C 8021940C 4600F001 */ sub.s $f0, $f30, $f0 /* 448850 80219410 46000000 */ add.s $f0, $f0, $f0 /* 448854 80219414 4600010D */ trunc.w.s $f4, $f0 @@ -122,23 +122,23 @@ glabel func_80219250_448690 .L8021941C: /* 44885C 8021941C 3C014387 */ lui $at, 0x4387 /* 448860 80219420 44810000 */ mtc1 $at, $f0 -/* 448864 80219424 00000000 */ nop +/* 448864 80219424 00000000 */ nop /* 448868 80219428 461E0001 */ sub.s $f0, $f0, $f30 /* 44886C 8021942C 46000005 */ abs.s $f0, $f0 /* 448870 80219430 4600010D */ trunc.w.s $f4, $f0 /* 448874 80219434 44022000 */ mfc1 $v0, $f4 -/* 448878 80219438 00000000 */ nop +/* 448878 80219438 00000000 */ nop /* 44887C 8021943C 2842002D */ slti $v0, $v0, 0x2d /* 448880 80219440 1040000C */ beqz $v0, .L80219474 /* 448884 80219444 0280202D */ daddu $a0, $s4, $zero /* 448888 80219448 3C014361 */ lui $at, 0x4361 /* 44888C 8021944C 44810000 */ mtc1 $at, $f0 -/* 448890 80219450 00000000 */ nop +/* 448890 80219450 00000000 */ nop /* 448894 80219454 4600F001 */ sub.s $f0, $f30, $f0 /* 448898 80219458 46000000 */ add.s $f0, $f0, $f0 /* 44889C 8021945C 3C014334 */ lui $at, 0x4334 /* 4488A0 80219460 44811000 */ mtc1 $at, $f2 -/* 4488A4 80219464 00000000 */ nop +/* 4488A4 80219464 00000000 */ nop /* 4488A8 80219468 46020000 */ add.s $f0, $f0, $f2 /* 4488AC 8021946C 4600010D */ trunc.w.s $f4, $f0 /* 4488B0 80219470 44062000 */ mfc1 $a2, $f4 @@ -160,5 +160,5 @@ glabel func_80219250_448690 /* 4488EC 802194AC 24020002 */ addiu $v0, $zero, 2 /* 4488F0 802194B0 03E00008 */ jr $ra /* 4488F4 802194B4 27BD0058 */ addiu $sp, $sp, 0x58 -/* 4488F8 802194B8 00000000 */ nop -/* 4488FC 802194BC 00000000 */ nop +/* 4488F8 802194B8 00000000 */ nop +/* 4488FC 802194BC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kmr_part_3/448900/func_802194C0_448900.s b/asm/nonmatchings/battle/area_kmr_part_3/448900/func_802194C0_448900.s index 2543e14dfb..e934b31413 100644 --- a/asm/nonmatchings/battle/area_kmr_part_3/448900/func_802194C0_448900.s +++ b/asm/nonmatchings/battle/area_kmr_part_3/448900/func_802194C0_448900.s @@ -21,7 +21,7 @@ glabel func_802194C0_448900 /* 448940 80219500 0C0B1EAF */ jal get_variable /* 448944 80219504 26100004 */ addiu $s0, $s0, 4 /* 448948 80219508 44820000 */ mtc1 $v0, $f0 -/* 44894C 8021950C 00000000 */ nop +/* 44894C 8021950C 00000000 */ nop /* 448950 80219510 46800021 */ cvt.d.w $f0, $f0 /* 448954 80219514 8E110000 */ lw $s1, ($s0) /* 448958 80219518 26100004 */ addiu $s0, $s0, 4 @@ -35,7 +35,7 @@ glabel func_802194C0_448900 /* 448978 80219538 46220003 */ div.d $f0, $f0, $f2 /* 44897C 8021953C 462007A0 */ cvt.s.d $f30, $f0 /* 448980 80219540 4614F502 */ mul.s $f20, $f30, $f20 -/* 448984 80219544 00000000 */ nop +/* 448984 80219544 00000000 */ nop /* 448988 80219548 26100004 */ addiu $s0, $s0, 4 /* 44898C 8021954C 8E120000 */ lw $s2, ($s0) /* 448990 80219550 3C0143B4 */ lui $at, 0x43b4 @@ -46,28 +46,28 @@ glabel func_802194C0_448900 /* 4489A4 80219564 4600A306 */ mov.s $f12, $f20 /* 4489A8 80219568 3C014100 */ lui $at, 0x4100 /* 4489AC 8021956C 44816000 */ mtc1 $at, $f12 -/* 4489B0 80219570 00000000 */ nop +/* 4489B0 80219570 00000000 */ nop /* 4489B4 80219574 460CA302 */ mul.s $f12, $f20, $f12 -/* 4489B8 80219578 00000000 */ nop +/* 4489B8 80219578 00000000 */ nop /* 4489BC 8021957C 3C014316 */ lui $at, 0x4316 /* 4489C0 80219580 4481E000 */ mtc1 $at, $f28 -/* 4489C4 80219584 00000000 */ nop +/* 4489C4 80219584 00000000 */ nop /* 4489C8 80219588 461C0582 */ mul.s $f22, $f0, $f28 -/* 4489CC 8021958C 00000000 */ nop +/* 4489CC 8021958C 00000000 */ nop /* 4489D0 80219590 4480D000 */ mtc1 $zero, $f26 /* 4489D4 80219594 0C00A85B */ jal sin_rad /* 4489D8 80219598 461AB580 */ add.s $f22, $f22, $f26 /* 4489DC 8021959C 3C014120 */ lui $at, 0x4120 /* 4489E0 802195A0 44811000 */ mtc1 $at, $f2 -/* 4489E4 802195A4 00000000 */ nop +/* 4489E4 802195A4 00000000 */ nop /* 4489E8 802195A8 46020602 */ mul.s $f24, $f0, $f2 -/* 4489EC 802195AC 00000000 */ nop +/* 4489EC 802195AC 00000000 */ nop /* 4489F0 802195B0 4600A306 */ mov.s $f12, $f20 /* 4489F4 802195B4 0C00A874 */ jal cos_rad /* 4489F8 802195B8 461AC600 */ add.s $f24, $f24, $f26 /* 4489FC 802195BC 0280202D */ daddu $a0, $s4, $zero /* 448A00 802195C0 461C0502 */ mul.s $f20, $f0, $f28 -/* 448A04 802195C4 00000000 */ nop +/* 448A04 802195C4 00000000 */ nop /* 448A08 802195C8 0220282D */ daddu $a1, $s1, $zero /* 448A0C 802195CC 4406B000 */ mfc1 $a2, $f22 /* 448A10 802195D0 3C0141A0 */ lui $at, 0x41a0 @@ -87,34 +87,34 @@ glabel func_802194C0_448900 /* 448A48 80219608 0240282D */ daddu $a1, $s2, $zero /* 448A4C 8021960C 3C0142B4 */ lui $at, 0x42b4 /* 448A50 80219610 44810000 */ mtc1 $at, $f0 -/* 448A54 80219614 00000000 */ nop +/* 448A54 80219614 00000000 */ nop /* 448A58 80219618 461E003C */ c.lt.s $f0, $f30 -/* 448A5C 8021961C 00000000 */ nop +/* 448A5C 8021961C 00000000 */ nop /* 448A60 80219620 4500000B */ bc1f .L80219650 /* 448A64 80219624 0000302D */ daddu $a2, $zero, $zero /* 448A68 80219628 3C014387 */ lui $at, 0x4387 /* 448A6C 8021962C 44810000 */ mtc1 $at, $f0 -/* 448A70 80219630 00000000 */ nop +/* 448A70 80219630 00000000 */ nop /* 448A74 80219634 4600F03C */ c.lt.s $f30, $f0 -/* 448A78 80219638 00000000 */ nop +/* 448A78 80219638 00000000 */ nop /* 448A7C 8021963C 45030001 */ bc1tl .L80219644 /* 448A80 80219640 240600B4 */ addiu $a2, $zero, 0xb4 .L80219644: /* 448A84 80219644 3C0142B4 */ lui $at, 0x42b4 /* 448A88 80219648 44810000 */ mtc1 $at, $f0 -/* 448A8C 8021964C 00000000 */ nop +/* 448A8C 8021964C 00000000 */ nop .L80219650: /* 448A90 80219650 461E0001 */ sub.s $f0, $f0, $f30 /* 448A94 80219654 46000005 */ abs.s $f0, $f0 /* 448A98 80219658 4600010D */ trunc.w.s $f4, $f0 /* 448A9C 8021965C 44022000 */ mfc1 $v0, $f4 -/* 448AA0 80219660 00000000 */ nop +/* 448AA0 80219660 00000000 */ nop /* 448AA4 80219664 2842002D */ slti $v0, $v0, 0x2d /* 448AA8 80219668 10400008 */ beqz $v0, .L8021968C -/* 448AAC 8021966C 00000000 */ nop +/* 448AAC 8021966C 00000000 */ nop /* 448AB0 80219670 3C014234 */ lui $at, 0x4234 /* 448AB4 80219674 44810000 */ mtc1 $at, $f0 -/* 448AB8 80219678 00000000 */ nop +/* 448AB8 80219678 00000000 */ nop /* 448ABC 8021967C 4600F001 */ sub.s $f0, $f30, $f0 /* 448AC0 80219680 46000000 */ add.s $f0, $f0, $f0 /* 448AC4 80219684 4600010D */ trunc.w.s $f4, $f0 @@ -122,23 +122,23 @@ glabel func_802194C0_448900 .L8021968C: /* 448ACC 8021968C 3C014387 */ lui $at, 0x4387 /* 448AD0 80219690 44810000 */ mtc1 $at, $f0 -/* 448AD4 80219694 00000000 */ nop +/* 448AD4 80219694 00000000 */ nop /* 448AD8 80219698 461E0001 */ sub.s $f0, $f0, $f30 /* 448ADC 8021969C 46000005 */ abs.s $f0, $f0 /* 448AE0 802196A0 4600010D */ trunc.w.s $f4, $f0 /* 448AE4 802196A4 44022000 */ mfc1 $v0, $f4 -/* 448AE8 802196A8 00000000 */ nop +/* 448AE8 802196A8 00000000 */ nop /* 448AEC 802196AC 2842002D */ slti $v0, $v0, 0x2d /* 448AF0 802196B0 1040000C */ beqz $v0, .L802196E4 /* 448AF4 802196B4 0280202D */ daddu $a0, $s4, $zero /* 448AF8 802196B8 3C014361 */ lui $at, 0x4361 /* 448AFC 802196BC 44810000 */ mtc1 $at, $f0 -/* 448B00 802196C0 00000000 */ nop +/* 448B00 802196C0 00000000 */ nop /* 448B04 802196C4 4600F001 */ sub.s $f0, $f30, $f0 /* 448B08 802196C8 46000000 */ add.s $f0, $f0, $f0 /* 448B0C 802196CC 3C014334 */ lui $at, 0x4334 /* 448B10 802196D0 44811000 */ mtc1 $at, $f2 -/* 448B14 802196D4 00000000 */ nop +/* 448B14 802196D4 00000000 */ nop /* 448B18 802196D8 46020000 */ add.s $f0, $f0, $f2 /* 448B1C 802196DC 4600010D */ trunc.w.s $f4, $f0 /* 448B20 802196E0 44062000 */ mfc1 $a2, $f4 @@ -160,5 +160,5 @@ glabel func_802194C0_448900 /* 448B5C 8021971C 24020002 */ addiu $v0, $zero, 2 /* 448B60 80219720 03E00008 */ jr $ra /* 448B64 80219724 27BD0058 */ addiu $sp, $sp, 0x58 -/* 448B68 80219728 00000000 */ nop -/* 448B6C 8021972C 00000000 */ nop +/* 448B68 80219728 00000000 */ nop +/* 448B6C 8021972C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kmr_part_3/448B70/func_80219730_448B70.s b/asm/nonmatchings/battle/area_kmr_part_3/448B70/func_80219730_448B70.s index 78a97f254a..35f83c13eb 100644 --- a/asm/nonmatchings/battle/area_kmr_part_3/448B70/func_80219730_448B70.s +++ b/asm/nonmatchings/battle/area_kmr_part_3/448B70/func_80219730_448B70.s @@ -21,7 +21,7 @@ glabel func_80219730_448B70 /* 448BB0 80219770 0C0B1EAF */ jal get_variable /* 448BB4 80219774 26100004 */ addiu $s0, $s0, 4 /* 448BB8 80219778 44820000 */ mtc1 $v0, $f0 -/* 448BBC 8021977C 00000000 */ nop +/* 448BBC 8021977C 00000000 */ nop /* 448BC0 80219780 46800021 */ cvt.d.w $f0, $f0 /* 448BC4 80219784 8E110000 */ lw $s1, ($s0) /* 448BC8 80219788 26100004 */ addiu $s0, $s0, 4 @@ -35,7 +35,7 @@ glabel func_80219730_448B70 /* 448BE8 802197A8 46220003 */ div.d $f0, $f0, $f2 /* 448BEC 802197AC 462007A0 */ cvt.s.d $f30, $f0 /* 448BF0 802197B0 4614F502 */ mul.s $f20, $f30, $f20 -/* 448BF4 802197B4 00000000 */ nop +/* 448BF4 802197B4 00000000 */ nop /* 448BF8 802197B8 26100004 */ addiu $s0, $s0, 4 /* 448BFC 802197BC 8E120000 */ lw $s2, ($s0) /* 448C00 802197C0 3C0143B4 */ lui $at, 0x43b4 @@ -46,28 +46,28 @@ glabel func_80219730_448B70 /* 448C14 802197D4 4600A306 */ mov.s $f12, $f20 /* 448C18 802197D8 3C014100 */ lui $at, 0x4100 /* 448C1C 802197DC 44816000 */ mtc1 $at, $f12 -/* 448C20 802197E0 00000000 */ nop +/* 448C20 802197E0 00000000 */ nop /* 448C24 802197E4 460CA302 */ mul.s $f12, $f20, $f12 -/* 448C28 802197E8 00000000 */ nop +/* 448C28 802197E8 00000000 */ nop /* 448C2C 802197EC 3C014316 */ lui $at, 0x4316 /* 448C30 802197F0 4481E000 */ mtc1 $at, $f28 -/* 448C34 802197F4 00000000 */ nop +/* 448C34 802197F4 00000000 */ nop /* 448C38 802197F8 461C0582 */ mul.s $f22, $f0, $f28 -/* 448C3C 802197FC 00000000 */ nop +/* 448C3C 802197FC 00000000 */ nop /* 448C40 80219800 4480D000 */ mtc1 $zero, $f26 /* 448C44 80219804 0C00A85B */ jal sin_rad /* 448C48 80219808 461AB580 */ add.s $f22, $f22, $f26 /* 448C4C 8021980C 3C014120 */ lui $at, 0x4120 /* 448C50 80219810 44811000 */ mtc1 $at, $f2 -/* 448C54 80219814 00000000 */ nop +/* 448C54 80219814 00000000 */ nop /* 448C58 80219818 46020602 */ mul.s $f24, $f0, $f2 -/* 448C5C 8021981C 00000000 */ nop +/* 448C5C 8021981C 00000000 */ nop /* 448C60 80219820 4600A306 */ mov.s $f12, $f20 /* 448C64 80219824 0C00A874 */ jal cos_rad /* 448C68 80219828 461AC600 */ add.s $f24, $f24, $f26 /* 448C6C 8021982C 0280202D */ daddu $a0, $s4, $zero /* 448C70 80219830 461C0502 */ mul.s $f20, $f0, $f28 -/* 448C74 80219834 00000000 */ nop +/* 448C74 80219834 00000000 */ nop /* 448C78 80219838 0220282D */ daddu $a1, $s1, $zero /* 448C7C 8021983C 4406B000 */ mfc1 $a2, $f22 /* 448C80 80219840 3C0141A0 */ lui $at, 0x41a0 @@ -87,34 +87,34 @@ glabel func_80219730_448B70 /* 448CB8 80219878 0240282D */ daddu $a1, $s2, $zero /* 448CBC 8021987C 3C0142B4 */ lui $at, 0x42b4 /* 448CC0 80219880 44810000 */ mtc1 $at, $f0 -/* 448CC4 80219884 00000000 */ nop +/* 448CC4 80219884 00000000 */ nop /* 448CC8 80219888 461E003C */ c.lt.s $f0, $f30 -/* 448CCC 8021988C 00000000 */ nop +/* 448CCC 8021988C 00000000 */ nop /* 448CD0 80219890 4500000B */ bc1f .L802198C0 /* 448CD4 80219894 0000302D */ daddu $a2, $zero, $zero /* 448CD8 80219898 3C014387 */ lui $at, 0x4387 /* 448CDC 8021989C 44810000 */ mtc1 $at, $f0 -/* 448CE0 802198A0 00000000 */ nop +/* 448CE0 802198A0 00000000 */ nop /* 448CE4 802198A4 4600F03C */ c.lt.s $f30, $f0 -/* 448CE8 802198A8 00000000 */ nop +/* 448CE8 802198A8 00000000 */ nop /* 448CEC 802198AC 45030001 */ bc1tl .L802198B4 /* 448CF0 802198B0 240600B4 */ addiu $a2, $zero, 0xb4 .L802198B4: /* 448CF4 802198B4 3C0142B4 */ lui $at, 0x42b4 /* 448CF8 802198B8 44810000 */ mtc1 $at, $f0 -/* 448CFC 802198BC 00000000 */ nop +/* 448CFC 802198BC 00000000 */ nop .L802198C0: /* 448D00 802198C0 461E0001 */ sub.s $f0, $f0, $f30 /* 448D04 802198C4 46000005 */ abs.s $f0, $f0 /* 448D08 802198C8 4600010D */ trunc.w.s $f4, $f0 /* 448D0C 802198CC 44022000 */ mfc1 $v0, $f4 -/* 448D10 802198D0 00000000 */ nop +/* 448D10 802198D0 00000000 */ nop /* 448D14 802198D4 2842002D */ slti $v0, $v0, 0x2d /* 448D18 802198D8 10400008 */ beqz $v0, .L802198FC -/* 448D1C 802198DC 00000000 */ nop +/* 448D1C 802198DC 00000000 */ nop /* 448D20 802198E0 3C014234 */ lui $at, 0x4234 /* 448D24 802198E4 44810000 */ mtc1 $at, $f0 -/* 448D28 802198E8 00000000 */ nop +/* 448D28 802198E8 00000000 */ nop /* 448D2C 802198EC 4600F001 */ sub.s $f0, $f30, $f0 /* 448D30 802198F0 46000000 */ add.s $f0, $f0, $f0 /* 448D34 802198F4 4600010D */ trunc.w.s $f4, $f0 @@ -122,23 +122,23 @@ glabel func_80219730_448B70 .L802198FC: /* 448D3C 802198FC 3C014387 */ lui $at, 0x4387 /* 448D40 80219900 44810000 */ mtc1 $at, $f0 -/* 448D44 80219904 00000000 */ nop +/* 448D44 80219904 00000000 */ nop /* 448D48 80219908 461E0001 */ sub.s $f0, $f0, $f30 /* 448D4C 8021990C 46000005 */ abs.s $f0, $f0 /* 448D50 80219910 4600010D */ trunc.w.s $f4, $f0 /* 448D54 80219914 44022000 */ mfc1 $v0, $f4 -/* 448D58 80219918 00000000 */ nop +/* 448D58 80219918 00000000 */ nop /* 448D5C 8021991C 2842002D */ slti $v0, $v0, 0x2d /* 448D60 80219920 1040000C */ beqz $v0, .L80219954 /* 448D64 80219924 0280202D */ daddu $a0, $s4, $zero /* 448D68 80219928 3C014361 */ lui $at, 0x4361 /* 448D6C 8021992C 44810000 */ mtc1 $at, $f0 -/* 448D70 80219930 00000000 */ nop +/* 448D70 80219930 00000000 */ nop /* 448D74 80219934 4600F001 */ sub.s $f0, $f30, $f0 /* 448D78 80219938 46000000 */ add.s $f0, $f0, $f0 /* 448D7C 8021993C 3C014334 */ lui $at, 0x4334 /* 448D80 80219940 44811000 */ mtc1 $at, $f2 -/* 448D84 80219944 00000000 */ nop +/* 448D84 80219944 00000000 */ nop /* 448D88 80219948 46020000 */ add.s $f0, $f0, $f2 /* 448D8C 8021994C 4600010D */ trunc.w.s $f4, $f0 /* 448D90 80219950 44062000 */ mfc1 $a2, $f4 diff --git a/asm/nonmatchings/battle/area_kmr_part_3/448B70/func_80219998_448DD8.s b/asm/nonmatchings/battle/area_kmr_part_3/448B70/func_80219998_448DD8.s index 0a3fdc31b0..a566762dde 100644 --- a/asm/nonmatchings/battle/area_kmr_part_3/448B70/func_80219998_448DD8.s +++ b/asm/nonmatchings/battle/area_kmr_part_3/448B70/func_80219998_448DD8.s @@ -13,10 +13,10 @@ glabel func_80219998_448DD8 /* 448DF8 802199B8 0C046EE2 */ jal set_world_fog_color /* 448DFC 802199BC 240700FF */ addiu $a3, $zero, 0xff /* 448E00 802199C0 0C046ED4 */ jal enable_world_fog -/* 448E04 802199C4 00000000 */ nop +/* 448E04 802199C4 00000000 */ nop /* 448E08 802199C8 8FBF0010 */ lw $ra, 0x10($sp) /* 448E0C 802199CC 24020002 */ addiu $v0, $zero, 2 /* 448E10 802199D0 03E00008 */ jr $ra /* 448E14 802199D4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 448E18 802199D8 00000000 */ nop -/* 448E1C 802199DC 00000000 */ nop +/* 448E18 802199D8 00000000 */ nop +/* 448E1C 802199DC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kmr_part_3/448E20/func_802199E0_448E20.s b/asm/nonmatchings/battle/area_kmr_part_3/448E20/func_802199E0_448E20.s index 5df7fea1db..aeed351d63 100644 --- a/asm/nonmatchings/battle/area_kmr_part_3/448E20/func_802199E0_448E20.s +++ b/asm/nonmatchings/battle/area_kmr_part_3/448E20/func_802199E0_448E20.s @@ -5,7 +5,7 @@ glabel func_802199E0_448E20 /* 448E20 802199E0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 448E24 802199E4 AFBF0010 */ sw $ra, 0x10($sp) /* 448E28 802199E8 0C046ED4 */ jal enable_world_fog -/* 448E2C 802199EC 00000000 */ nop +/* 448E2C 802199EC 00000000 */ nop /* 448E30 802199F0 240403B6 */ addiu $a0, $zero, 0x3b6 /* 448E34 802199F4 0C046EDD */ jal set_world_fog_dist /* 448E38 802199F8 240503E8 */ addiu $a1, $zero, 0x3e8 @@ -25,4 +25,4 @@ glabel func_802199E0_448E20 /* 448E70 80219A30 24020002 */ addiu $v0, $zero, 2 /* 448E74 80219A34 03E00008 */ jr $ra /* 448E78 80219A38 27BD0018 */ addiu $sp, $sp, 0x18 -/* 448E7C 80219A3C 00000000 */ nop +/* 448E7C 80219A3C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kmr_part_3/448E20/func_80219C5C_44909C.s b/asm/nonmatchings/battle/area_kmr_part_3/448E20/func_80219C5C_44909C.s index c21359798b..c38007c051 100644 --- a/asm/nonmatchings/battle/area_kmr_part_3/448E20/func_80219C5C_44909C.s +++ b/asm/nonmatchings/battle/area_kmr_part_3/448E20/func_80219C5C_44909C.s @@ -25,17 +25,17 @@ glabel func_80219C5C_44909C /* 4490EC 80219CAC 00071883 */ sra $v1, $a3, 2 /* 4490F0 80219CB0 00621823 */ subu $v1, $v1, $v0 /* 4490F4 80219CB4 44836000 */ mtc1 $v1, $f12 -/* 4490F8 80219CB8 00000000 */ nop +/* 4490F8 80219CB8 00000000 */ nop /* 4490FC 80219CBC 46806320 */ cvt.s.w $f12, $f12 /* 449100 80219CC0 46006302 */ mul.s $f12, $f12, $f0 -/* 449104 80219CC4 00000000 */ nop +/* 449104 80219CC4 00000000 */ nop /* 449108 80219CC8 3C0143B4 */ lui $at, 0x43b4 /* 44910C 80219CCC 44810000 */ mtc1 $at, $f0 /* 449110 80219CD0 3C014100 */ lui $at, 0x4100 /* 449114 80219CD4 44811000 */ mtc1 $at, $f2 /* 449118 80219CD8 46006303 */ div.s $f12, $f12, $f0 /* 44911C 80219CDC 46026302 */ mul.s $f12, $f12, $f2 -/* 449120 80219CE0 00000000 */ nop +/* 449120 80219CE0 00000000 */ nop /* 449124 80219CE4 8E120000 */ lw $s2, ($s0) /* 449128 80219CE8 26100004 */ addiu $s0, $s0, 4 /* 44912C 80219CEC 8E130000 */ lw $s3, ($s0) @@ -46,7 +46,7 @@ glabel func_80219C5C_44909C /* 449140 80219D00 44811000 */ mtc1 $at, $f2 /* 449144 80219D04 0240282D */ daddu $a1, $s2, $zero /* 449148 80219D08 46020502 */ mul.s $f20, $f0, $f2 -/* 44914C 80219D0C 00000000 */ nop +/* 44914C 80219D0C 00000000 */ nop /* 449150 80219D10 0C0B2026 */ jal set_variable /* 449154 80219D14 0000302D */ daddu $a2, $zero, $zero /* 449158 80219D18 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/battle/area_kmr_part_3/448E20/func_80219D60_4491A0.s b/asm/nonmatchings/battle/area_kmr_part_3/448E20/func_80219D60_4491A0.s index 133b76ea5e..327e14405d 100644 --- a/asm/nonmatchings/battle/area_kmr_part_3/448E20/func_80219D60_4491A0.s +++ b/asm/nonmatchings/battle/area_kmr_part_3/448E20/func_80219D60_4491A0.s @@ -26,14 +26,14 @@ glabel func_80219D60_4491A0 /* 4491F4 80219DB4 12200009 */ beqz $s1, .L80219DDC /* 4491F8 80219DB8 2402008E */ addiu $v0, $zero, 0x8e /* 4491FC 80219DBC 08086858 */ j .L8021A160 -/* 449200 80219DC0 00000000 */ nop +/* 449200 80219DC0 00000000 */ nop .L80219DC4: /* 449204 80219DC4 12220085 */ beq $s1, $v0, .L80219FDC /* 449208 80219DC8 24020003 */ addiu $v0, $zero, 3 /* 44920C 80219DCC 12220013 */ beq $s1, $v0, .L80219E1C /* 449210 80219DD0 2403005B */ addiu $v1, $zero, 0x5b /* 449214 80219DD4 08086858 */ j .L8021A160 -/* 449218 80219DD8 00000000 */ nop +/* 449218 80219DD8 00000000 */ nop .L80219DDC: /* 44921C 80219DDC 3C01430E */ lui $at, 0x430e /* 449220 80219DE0 44812000 */ mtc1 $at, $f4 @@ -77,7 +77,7 @@ glabel func_80219D60_4491A0 /* 4492AC 80219E6C AE0200A8 */ sw $v0, 0xa8($s0) /* 4492B0 80219E70 2842002E */ slti $v0, $v0, 0x2e /* 4492B4 80219E74 14400003 */ bnez $v0, .L80219E84 -/* 4492B8 80219E78 00000000 */ nop +/* 4492B8 80219E78 00000000 */ nop /* 4492BC 80219E7C 2402002D */ addiu $v0, $zero, 0x2d /* 4492C0 80219E80 AE0200A8 */ sw $v0, 0xa8($s0) .L80219E84: @@ -95,7 +95,7 @@ glabel func_80219D60_4491A0 /* 4492F0 80219EB0 C61E0098 */ lwc1 $f30, 0x98($s0) /* 4492F4 80219EB4 4680F7A0 */ cvt.s.w $f30, $f30 /* 4492F8 80219EB8 461A6302 */ mul.s $f12, $f12, $f26 -/* 4492FC 80219EBC 00000000 */ nop +/* 4492FC 80219EBC 00000000 */ nop /* 449300 80219EC0 C61C009C */ lwc1 $f28, 0x9c($s0) /* 449304 80219EC4 4680E720 */ cvt.s.w $f28, $f28 /* 449308 80219EC8 3C0143B4 */ lui $at, 0x43b4 @@ -113,22 +113,22 @@ glabel func_80219D60_4491A0 /* 449338 80219EF8 4620B001 */ sub.d $f0, $f22, $f0 /* 44933C 80219EFC 46002521 */ cvt.d.s $f20, $f4 /* 449340 80219F00 4620A502 */ mul.d $f20, $f20, $f0 -/* 449344 80219F04 00000000 */ nop +/* 449344 80219F04 00000000 */ nop /* 449348 80219F08 C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 44934C 80219F0C 46806320 */ cvt.s.w $f12, $f12 /* 449350 80219F10 461A6302 */ mul.s $f12, $f12, $f26 -/* 449354 80219F14 00000000 */ nop +/* 449354 80219F14 00000000 */ nop /* 449358 80219F18 0C00A85B */ jal sin_rad /* 44935C 80219F1C 46186303 */ div.s $f12, $f12, $f24 /* 449360 80219F20 4600E002 */ mul.s $f0, $f28, $f0 -/* 449364 80219F24 00000000 */ nop +/* 449364 80219F24 00000000 */ nop /* 449368 80219F28 8E0200A8 */ lw $v0, 0xa8($s0) /* 44936C 80219F2C 00021040 */ sll $v0, $v0, 1 /* 449370 80219F30 44826000 */ mtc1 $v0, $f12 -/* 449374 80219F34 00000000 */ nop +/* 449374 80219F34 00000000 */ nop /* 449378 80219F38 46806320 */ cvt.s.w $f12, $f12 /* 44937C 80219F3C 461A6302 */ mul.s $f12, $f12, $f26 -/* 449380 80219F40 00000000 */ nop +/* 449380 80219F40 00000000 */ nop /* 449384 80219F44 46000021 */ cvt.d.s $f0, $f0 /* 449388 80219F48 4620A500 */ add.d $f20, $f20, $f0 /* 44938C 80219F4C 46186303 */ div.s $f12, $f12, $f24 @@ -138,12 +138,12 @@ glabel func_80219D60_4491A0 /* 44939C 80219F5C C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 4493A0 80219F60 46806320 */ cvt.s.w $f12, $f12 /* 4493A4 80219F64 461A6302 */ mul.s $f12, $f12, $f26 -/* 4493A8 80219F68 00000000 */ nop +/* 4493A8 80219F68 00000000 */ nop /* 4493AC 80219F6C 3C0142B4 */ lui $at, 0x42b4 /* 4493B0 80219F70 44811000 */ mtc1 $at, $f2 -/* 4493B4 80219F74 00000000 */ nop +/* 4493B4 80219F74 00000000 */ nop /* 4493B8 80219F78 46020002 */ mul.s $f0, $f0, $f2 -/* 4493BC 80219F7C 00000000 */ nop +/* 4493BC 80219F7C 00000000 */ nop /* 4493C0 80219F80 C7A40014 */ lwc1 $f4, 0x14($sp) /* 4493C4 80219F84 46002100 */ add.s $f4, $f4, $f0 /* 4493C8 80219F88 46186303 */ div.s $f12, $f12, $f24 @@ -152,17 +152,17 @@ glabel func_80219D60_4491A0 /* 4493D4 80219F94 C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 4493D8 80219F98 46806320 */ cvt.s.w $f12, $f12 /* 4493DC 80219F9C 461A6302 */ mul.s $f12, $f12, $f26 -/* 4493E0 80219FA0 00000000 */ nop +/* 4493E0 80219FA0 00000000 */ nop /* 4493E4 80219FA4 46000021 */ cvt.d.s $f0, $f0 /* 4493E8 80219FA8 4620B581 */ sub.d $f22, $f22, $f0 /* 4493EC 80219FAC 4600F521 */ cvt.d.s $f20, $f30 /* 4493F0 80219FB0 4636A502 */ mul.d $f20, $f20, $f22 -/* 4493F4 80219FB4 00000000 */ nop +/* 4493F4 80219FB4 00000000 */ nop /* 4493F8 80219FB8 0C00A85B */ jal sin_rad /* 4493FC 80219FBC 46186303 */ div.s $f12, $f12, $f24 /* 449400 80219FC0 C7A40018 */ lwc1 $f4, 0x18($sp) /* 449404 80219FC4 46002002 */ mul.s $f0, $f4, $f0 -/* 449408 80219FC8 00000000 */ nop +/* 449408 80219FC8 00000000 */ nop /* 44940C 80219FCC 46000021 */ cvt.d.s $f0, $f0 /* 449410 80219FD0 4620A500 */ add.d $f20, $f20, $f0 /* 449414 80219FD4 08086854 */ j .L8021A150 @@ -191,7 +191,7 @@ glabel func_80219D60_4491A0 /* 449468 8021A028 C61E0098 */ lwc1 $f30, 0x98($s0) /* 44946C 8021A02C 4680F7A0 */ cvt.s.w $f30, $f30 /* 449470 8021A030 461A6302 */ mul.s $f12, $f12, $f26 -/* 449474 8021A034 00000000 */ nop +/* 449474 8021A034 00000000 */ nop /* 449478 8021A038 C61C009C */ lwc1 $f28, 0x9c($s0) /* 44947C 8021A03C 4680E720 */ cvt.s.w $f28, $f28 /* 449480 8021A040 3C0143B4 */ lui $at, 0x43b4 @@ -209,22 +209,22 @@ glabel func_80219D60_4491A0 /* 4494B0 8021A070 4620B001 */ sub.d $f0, $f22, $f0 /* 4494B4 8021A074 46002521 */ cvt.d.s $f20, $f4 /* 4494B8 8021A078 4620A502 */ mul.d $f20, $f20, $f0 -/* 4494BC 8021A07C 00000000 */ nop +/* 4494BC 8021A07C 00000000 */ nop /* 4494C0 8021A080 C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 4494C4 8021A084 46806320 */ cvt.s.w $f12, $f12 /* 4494C8 8021A088 461A6302 */ mul.s $f12, $f12, $f26 -/* 4494CC 8021A08C 00000000 */ nop +/* 4494CC 8021A08C 00000000 */ nop /* 4494D0 8021A090 0C00A85B */ jal sin_rad /* 4494D4 8021A094 46186303 */ div.s $f12, $f12, $f24 /* 4494D8 8021A098 4600E002 */ mul.s $f0, $f28, $f0 -/* 4494DC 8021A09C 00000000 */ nop +/* 4494DC 8021A09C 00000000 */ nop /* 4494E0 8021A0A0 8E0200A8 */ lw $v0, 0xa8($s0) /* 4494E4 8021A0A4 00021040 */ sll $v0, $v0, 1 /* 4494E8 8021A0A8 44826000 */ mtc1 $v0, $f12 -/* 4494EC 8021A0AC 00000000 */ nop +/* 4494EC 8021A0AC 00000000 */ nop /* 4494F0 8021A0B0 46806320 */ cvt.s.w $f12, $f12 /* 4494F4 8021A0B4 461A6302 */ mul.s $f12, $f12, $f26 -/* 4494F8 8021A0B8 00000000 */ nop +/* 4494F8 8021A0B8 00000000 */ nop /* 4494FC 8021A0BC 46000021 */ cvt.d.s $f0, $f0 /* 449500 8021A0C0 4620A500 */ add.d $f20, $f20, $f0 /* 449504 8021A0C4 46186303 */ div.s $f12, $f12, $f24 @@ -234,12 +234,12 @@ glabel func_80219D60_4491A0 /* 449514 8021A0D4 C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 449518 8021A0D8 46806320 */ cvt.s.w $f12, $f12 /* 44951C 8021A0DC 461A6302 */ mul.s $f12, $f12, $f26 -/* 449520 8021A0E0 00000000 */ nop +/* 449520 8021A0E0 00000000 */ nop /* 449524 8021A0E4 3C0142B4 */ lui $at, 0x42b4 /* 449528 8021A0E8 44811000 */ mtc1 $at, $f2 -/* 44952C 8021A0EC 00000000 */ nop +/* 44952C 8021A0EC 00000000 */ nop /* 449530 8021A0F0 46020002 */ mul.s $f0, $f0, $f2 -/* 449534 8021A0F4 00000000 */ nop +/* 449534 8021A0F4 00000000 */ nop /* 449538 8021A0F8 C7A40014 */ lwc1 $f4, 0x14($sp) /* 44953C 8021A0FC 46002100 */ add.s $f4, $f4, $f0 /* 449540 8021A100 46186303 */ div.s $f12, $f12, $f24 @@ -248,17 +248,17 @@ glabel func_80219D60_4491A0 /* 44954C 8021A10C C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 449550 8021A110 46806320 */ cvt.s.w $f12, $f12 /* 449554 8021A114 461A6302 */ mul.s $f12, $f12, $f26 -/* 449558 8021A118 00000000 */ nop +/* 449558 8021A118 00000000 */ nop /* 44955C 8021A11C 46000021 */ cvt.d.s $f0, $f0 /* 449560 8021A120 4620B581 */ sub.d $f22, $f22, $f0 /* 449564 8021A124 4600F521 */ cvt.d.s $f20, $f30 /* 449568 8021A128 4636A502 */ mul.d $f20, $f20, $f22 -/* 44956C 8021A12C 00000000 */ nop +/* 44956C 8021A12C 00000000 */ nop /* 449570 8021A130 0C00A85B */ jal sin_rad /* 449574 8021A134 46186303 */ div.s $f12, $f12, $f24 /* 449578 8021A138 C7A40018 */ lwc1 $f4, 0x18($sp) /* 44957C 8021A13C 46002002 */ mul.s $f0, $f4, $f0 -/* 449580 8021A140 00000000 */ nop +/* 449580 8021A140 00000000 */ nop /* 449584 8021A144 46000021 */ cvt.d.s $f0, $f0 /* 449588 8021A148 4620A500 */ add.d $f20, $f20, $f0 /* 44958C 8021A14C 2402005A */ addiu $v0, $zero, 0x5a diff --git a/asm/nonmatchings/battle/area_kpa/684C30/func_80218200_684C30.s b/asm/nonmatchings/battle/area_kpa/684C30/func_80218200_684C30.s index 91d5af7e83..a16cfcf322 100644 --- a/asm/nonmatchings/battle/area_kpa/684C30/func_80218200_684C30.s +++ b/asm/nonmatchings/battle/area_kpa/684C30/func_80218200_684C30.s @@ -69,12 +69,12 @@ glabel func_80218200_684C30 /* 684D30 80218300 82030210 */ lb $v1, 0x210($s0) /* 684D34 80218304 2402000A */ addiu $v0, $zero, 0xa /* 684D38 80218308 14620007 */ bne $v1, $v0, .L80218328 -/* 684D3C 8021830C 00000000 */ nop +/* 684D3C 8021830C 00000000 */ nop /* 684D40 80218310 8C82000C */ lw $v0, 0xc($a0) /* 684D44 80218314 3C013ECC */ lui $at, 0x3ecc /* 684D48 80218318 3421CCCD */ ori $at, $at, 0xcccd /* 684D4C 8021831C 44810000 */ mtc1 $at, $f0 -/* 684D50 80218320 00000000 */ nop +/* 684D50 80218320 00000000 */ nop /* 684D54 80218324 E4400028 */ swc1 $f0, 0x28($v0) .L80218328: /* 684D58 80218328 8FBF0028 */ lw $ra, 0x28($sp) diff --git a/asm/nonmatchings/battle/area_kpa/684C30/func_80218638_685068.s b/asm/nonmatchings/battle/area_kpa/684C30/func_80218638_685068.s index a3f3b94e98..9f05c14a4c 100644 --- a/asm/nonmatchings/battle/area_kpa/684C30/func_80218638_685068.s +++ b/asm/nonmatchings/battle/area_kpa/684C30/func_80218638_685068.s @@ -14,11 +14,11 @@ glabel func_80218638_685068 /* 68508C 8021865C 0040202D */ daddu $a0, $v0, $zero /* 685090 80218660 2402FF81 */ addiu $v0, $zero, -0x7f /* 685094 80218664 14820002 */ bne $a0, $v0, .L80218670 -/* 685098 80218668 00000000 */ nop +/* 685098 80218668 00000000 */ nop /* 68509C 8021866C 8E240148 */ lw $a0, 0x148($s1) .L80218670: /* 6850A0 80218670 0C09A75B */ jal get_actor -/* 6850A4 80218674 00000000 */ nop +/* 6850A4 80218674 00000000 */ nop /* 6850A8 80218678 0040202D */ daddu $a0, $v0, $zero /* 6850AC 8021867C 90830136 */ lbu $v1, 0x136($a0) /* 6850B0 80218680 24020047 */ addiu $v0, $zero, 0x47 @@ -49,11 +49,11 @@ glabel func_80218638_685068 /* 685108 802186D8 0000302D */ daddu $a2, $zero, $zero .L802186DC: /* 68510C 802186DC 0C0B2026 */ jal set_variable -/* 685110 802186E0 00000000 */ nop +/* 685110 802186E0 00000000 */ nop /* 685114 802186E4 8FBF0018 */ lw $ra, 0x18($sp) /* 685118 802186E8 8FB10014 */ lw $s1, 0x14($sp) /* 68511C 802186EC 8FB00010 */ lw $s0, 0x10($sp) /* 685120 802186F0 24020002 */ addiu $v0, $zero, 2 /* 685124 802186F4 03E00008 */ jr $ra /* 685128 802186F8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 68512C 802186FC 00000000 */ nop +/* 68512C 802186FC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kpa/684C30/func_80218700_685130.s b/asm/nonmatchings/battle/area_kpa/684C30/func_80218700_685130.s index c39541a333..284ce6b74e 100644 --- a/asm/nonmatchings/battle/area_kpa/684C30/func_80218700_685130.s +++ b/asm/nonmatchings/battle/area_kpa/684C30/func_80218700_685130.s @@ -17,26 +17,26 @@ glabel func_80218700_685130 /* 685160 80218730 C6200144 */ lwc1 $f0, 0x144($s1) /* 685164 80218734 46001081 */ sub.s $f2, $f2, $f0 /* 685168 80218738 46021082 */ mul.s $f2, $f2, $f2 -/* 68516C 8021873C 00000000 */ nop +/* 68516C 8021873C 00000000 */ nop /* 685170 80218740 C626001C */ lwc1 $f6, 0x1c($s1) /* 685174 80218744 C6200148 */ lwc1 $f0, 0x148($s1) /* 685178 80218748 46003181 */ sub.s $f6, $f6, $f0 /* 68517C 8021874C 46063182 */ mul.s $f6, $f6, $f6 -/* 685180 80218750 00000000 */ nop +/* 685180 80218750 00000000 */ nop /* 685184 80218754 C624014C */ lwc1 $f4, 0x14c($s1) /* 685188 80218758 C6200020 */ lwc1 $f0, 0x20($s1) /* 68518C 8021875C 46040001 */ sub.s $f0, $f0, $f4 /* 685190 80218760 46000002 */ mul.s $f0, $f0, $f0 -/* 685194 80218764 00000000 */ nop +/* 685194 80218764 00000000 */ nop /* 685198 80218768 46061080 */ add.s $f2, $f2, $f6 /* 68519C 8021876C 46001300 */ add.s $f12, $f2, $f0 /* 6851A0 80218770 46006104 */ sqrt.s $f4, $f12 /* 6851A4 80218774 46042032 */ c.eq.s $f4, $f4 -/* 6851A8 80218778 00000000 */ nop +/* 6851A8 80218778 00000000 */ nop /* 6851AC 8021877C 45010004 */ bc1t .L80218790 -/* 6851B0 80218780 00000000 */ nop +/* 6851B0 80218780 00000000 */ nop /* 6851B4 80218784 0C0187BC */ jal sqrtf -/* 6851B8 80218788 00000000 */ nop +/* 6851B8 80218788 00000000 */ nop /* 6851BC 8021878C 46000106 */ mov.s $f4, $f0 .L80218790: /* 6851C0 80218790 C620004C */ lwc1 $f0, 0x4c($s1) @@ -44,10 +44,10 @@ glabel func_80218700_685130 /* 6851C8 80218798 44811000 */ mtc1 $at, $f2 /* 6851CC 8021879C 46002003 */ div.s $f0, $f4, $f0 /* 6851D0 802187A0 46020002 */ mul.s $f0, $f0, $f2 -/* 6851D4 802187A4 00000000 */ nop +/* 6851D4 802187A4 00000000 */ nop /* 6851D8 802187A8 3C013F80 */ lui $at, 0x3f80 /* 6851DC 802187AC 44811000 */ mtc1 $at, $f2 -/* 6851E0 802187B0 00000000 */ nop +/* 6851E0 802187B0 00000000 */ nop /* 6851E4 802187B4 46020000 */ add.s $f0, $f0, $f2 /* 6851E8 802187B8 4600020D */ trunc.w.s $f8, $f0 /* 6851EC 802187BC E6480070 */ swc1 $f8, 0x70($s2) diff --git a/asm/nonmatchings/battle/area_kpa2/69F200/func_80218098_69F298.s b/asm/nonmatchings/battle/area_kpa2/69F200/func_80218098_69F298.s index 7f297ac7b5..abd09c3f0d 100644 --- a/asm/nonmatchings/battle/area_kpa2/69F200/func_80218098_69F298.s +++ b/asm/nonmatchings/battle/area_kpa2/69F200/func_80218098_69F298.s @@ -37,5 +37,5 @@ glabel func_80218098_69F298 /* 69F30C 8021810C 8FB00010 */ lw $s0, 0x10($sp) /* 69F310 80218110 03E00008 */ jr $ra /* 69F314 80218114 27BD0018 */ addiu $sp, $sp, 0x18 -/* 69F318 80218118 00000000 */ nop -/* 69F31C 8021811C 00000000 */ nop +/* 69F318 80218118 00000000 */ nop +/* 69F31C 8021811C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kpa2/69F320/func_80218178_69F378.s b/asm/nonmatchings/battle/area_kpa2/69F320/func_80218178_69F378.s index f7acf6d768..207256f66d 100644 --- a/asm/nonmatchings/battle/area_kpa2/69F320/func_80218178_69F378.s +++ b/asm/nonmatchings/battle/area_kpa2/69F320/func_80218178_69F378.s @@ -11,19 +11,19 @@ glabel func_80218178_69F378 /* 69F390 80218190 3C013D23 */ lui $at, 0x3d23 /* 69F394 80218194 3421D70A */ ori $at, $at, 0xd70a /* 69F398 80218198 44810000 */ mtc1 $at, $f0 -/* 69F39C 8021819C 00000000 */ nop +/* 69F39C 8021819C 00000000 */ nop /* 69F3A0 802181A0 E4600038 */ swc1 $f0, 0x38($v1) /* 69F3A4 802181A4 E4600030 */ swc1 $f0, 0x30($v1) /* 69F3A8 802181A8 8C43000C */ lw $v1, 0xc($v0) /* 69F3AC 802181AC 3C013FF0 */ lui $at, 0x3ff0 /* 69F3B0 802181B0 44810000 */ mtc1 $at, $f0 -/* 69F3B4 802181B4 00000000 */ nop +/* 69F3B4 802181B4 00000000 */ nop /* 69F3B8 802181B8 E4600034 */ swc1 $f0, 0x34($v1) /* 69F3BC 802181BC 8C43000C */ lw $v1, 0xc($v0) /* 69F3C0 802181C0 3C013D4C */ lui $at, 0x3d4c /* 69F3C4 802181C4 3421CCCD */ ori $at, $at, 0xcccd /* 69F3C8 802181C8 44810000 */ mtc1 $at, $f0 -/* 69F3CC 802181CC 00000000 */ nop +/* 69F3CC 802181CC 00000000 */ nop /* 69F3D0 802181D0 E460003C */ swc1 $f0, 0x3c($v1) /* 69F3D4 802181D4 8FBF0010 */ lw $ra, 0x10($sp) /* 69F3D8 802181D8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/battle/area_kpa2/69F320/func_802181E4_69F3E4.s b/asm/nonmatchings/battle/area_kpa2/69F320/func_802181E4_69F3E4.s index 5645b627e9..94596d95ee 100644 --- a/asm/nonmatchings/battle/area_kpa2/69F320/func_802181E4_69F3E4.s +++ b/asm/nonmatchings/battle/area_kpa2/69F320/func_802181E4_69F3E4.s @@ -91,10 +91,10 @@ glabel func_802181E4_69F3E4 /* 69F528 80218328 46000021 */ cvt.d.s $f0, $f0 /* 69F52C 8021832C 46380000 */ add.d $f0, $f0, $f24 /* 69F530 80218330 46360002 */ mul.d $f0, $f0, $f22 -/* 69F534 80218334 00000000 */ nop +/* 69F534 80218334 00000000 */ nop /* 69F538 80218338 27A20020 */ addiu $v0, $sp, 0x20 /* 69F53C 8021833C 4620A03E */ c.le.d $f20, $f0 -/* 69F540 80218340 00000000 */ nop +/* 69F540 80218340 00000000 */ nop /* 69F544 80218344 45010005 */ bc1t .L8021835C /* 69F548 80218348 00511021 */ addu $v0, $v0, $s1 /* 69F54C 8021834C 4620008D */ trunc.w.d $f2, $f0 @@ -105,7 +105,7 @@ glabel func_802181E4_69F3E4 /* 69F55C 8021835C 46340001 */ sub.d $f0, $f0, $f20 /* 69F560 80218360 4620008D */ trunc.w.d $f2, $f0 /* 69F564 80218364 44031000 */ mfc1 $v1, $f2 -/* 69F568 80218368 00000000 */ nop +/* 69F568 80218368 00000000 */ nop /* 69F56C 8021836C 00721825 */ or $v1, $v1, $s2 /* 69F570 80218370 A0430000 */ sb $v1, ($v0) .L80218374: @@ -118,10 +118,10 @@ glabel func_802181E4_69F3E4 /* 69F58C 8021838C 46000021 */ cvt.d.s $f0, $f0 /* 69F590 80218390 46380000 */ add.d $f0, $f0, $f24 /* 69F594 80218394 46360002 */ mul.d $f0, $f0, $f22 -/* 69F598 80218398 00000000 */ nop +/* 69F598 80218398 00000000 */ nop /* 69F59C 8021839C 27A20038 */ addiu $v0, $sp, 0x38 /* 69F5A0 802183A0 4620A03E */ c.le.d $f20, $f0 -/* 69F5A4 802183A4 00000000 */ nop +/* 69F5A4 802183A4 00000000 */ nop /* 69F5A8 802183A8 45010005 */ bc1t .L802183C0 /* 69F5AC 802183AC 00511021 */ addu $v0, $v0, $s1 /* 69F5B0 802183B0 4620008D */ trunc.w.d $f2, $f0 @@ -132,7 +132,7 @@ glabel func_802181E4_69F3E4 /* 69F5C0 802183C0 46340001 */ sub.d $f0, $f0, $f20 /* 69F5C4 802183C4 4620008D */ trunc.w.d $f2, $f0 /* 69F5C8 802183C8 44031000 */ mfc1 $v1, $f2 -/* 69F5CC 802183CC 00000000 */ nop +/* 69F5CC 802183CC 00000000 */ nop /* 69F5D0 802183D0 00721825 */ or $v1, $v1, $s2 /* 69F5D4 802183D4 A0430000 */ sb $v1, ($v0) .L802183D8: @@ -145,10 +145,10 @@ glabel func_802181E4_69F3E4 /* 69F5F0 802183F0 46000021 */ cvt.d.s $f0, $f0 /* 69F5F4 802183F4 46380000 */ add.d $f0, $f0, $f24 /* 69F5F8 802183F8 46360002 */ mul.d $f0, $f0, $f22 -/* 69F5FC 802183FC 00000000 */ nop +/* 69F5FC 802183FC 00000000 */ nop /* 69F600 80218400 27A20050 */ addiu $v0, $sp, 0x50 /* 69F604 80218404 4620A03E */ c.le.d $f20, $f0 -/* 69F608 80218408 00000000 */ nop +/* 69F608 80218408 00000000 */ nop /* 69F60C 8021840C 45010005 */ bc1t .L80218424 /* 69F610 80218410 00511021 */ addu $v0, $v0, $s1 /* 69F614 80218414 4620008D */ trunc.w.d $f2, $f0 @@ -159,7 +159,7 @@ glabel func_802181E4_69F3E4 /* 69F624 80218424 46340001 */ sub.d $f0, $f0, $f20 /* 69F628 80218428 4620008D */ trunc.w.d $f2, $f0 /* 69F62C 8021842C 44031000 */ mfc1 $v1, $f2 -/* 69F630 80218430 00000000 */ nop +/* 69F630 80218430 00000000 */ nop /* 69F634 80218434 00721825 */ or $v1, $v1, $s2 /* 69F638 80218438 A0430000 */ sb $v1, ($v0) .L8021843C: diff --git a/asm/nonmatchings/battle/area_kpa2/69F320/func_802186D0_69F8D0.s b/asm/nonmatchings/battle/area_kpa2/69F320/func_802186D0_69F8D0.s index bbdc2ac04e..43667d1e9a 100644 --- a/asm/nonmatchings/battle/area_kpa2/69F320/func_802186D0_69F8D0.s +++ b/asm/nonmatchings/battle/area_kpa2/69F320/func_802186D0_69F8D0.s @@ -31,21 +31,21 @@ glabel func_802186D0_69F8D0 /* 69F938 80218738 8E050000 */ lw $a1, ($s0) /* 69F93C 8021873C 26100004 */ addiu $s0, $s0, 4 /* 69F940 80218740 4482E000 */ mtc1 $v0, $f28 -/* 69F944 80218744 00000000 */ nop +/* 69F944 80218744 00000000 */ nop /* 69F948 80218748 4680E720 */ cvt.s.w $f28, $f28 /* 69F94C 8021874C 0C0B1EAF */ jal get_variable /* 69F950 80218750 0220202D */ daddu $a0, $s1, $zero /* 69F954 80218754 8E050000 */ lw $a1, ($s0) /* 69F958 80218758 26100004 */ addiu $s0, $s0, 4 /* 69F95C 8021875C 4482D000 */ mtc1 $v0, $f26 -/* 69F960 80218760 00000000 */ nop +/* 69F960 80218760 00000000 */ nop /* 69F964 80218764 4680D6A0 */ cvt.s.w $f26, $f26 /* 69F968 80218768 0C0B1EAF */ jal get_variable /* 69F96C 8021876C 0220202D */ daddu $a0, $s1, $zero /* 69F970 80218770 8E050000 */ lw $a1, ($s0) /* 69F974 80218774 26100004 */ addiu $s0, $s0, 4 /* 69F978 80218778 4482C000 */ mtc1 $v0, $f24 -/* 69F97C 8021877C 00000000 */ nop +/* 69F97C 8021877C 00000000 */ nop /* 69F980 80218780 4680C620 */ cvt.s.w $f24, $f24 /* 69F984 80218784 0C0B210B */ jal get_float_variable /* 69F988 80218788 0220202D */ daddu $a0, $s1, $zero @@ -130,7 +130,7 @@ glabel func_802186D0_69F8D0 .L802188B8: /* 69FAB8 802188B8 8E020010 */ lw $v0, 0x10($s0) /* 69FABC 802188BC 10400003 */ beqz $v0, .L802188CC -/* 69FAC0 802188C0 00000000 */ nop +/* 69FAC0 802188C0 00000000 */ nop /* 69FAC4 802188C4 08086291 */ j .L80218A44 /* 69FAC8 802188C8 26940001 */ addiu $s4, $s4, 1 .L802188CC: @@ -141,7 +141,7 @@ glabel func_802186D0_69F8D0 /* 69FADC 802188DC 468010A0 */ cvt.s.w $f2, $f2 /* 69FAE0 802188E0 46000005 */ abs.s $f0, $f0 /* 69FAE4 802188E4 46020002 */ mul.s $f0, $f0, $f2 -/* 69FAE8 802188E8 00000000 */ nop +/* 69FAE8 802188E8 00000000 */ nop /* 69FAEC 802188EC C606000C */ lwc1 $f6, 0xc($s0) /* 69FAF0 802188F0 3C014110 */ lui $at, 0x4110 /* 69FAF4 802188F4 44811000 */ mtc1 $at, $f2 @@ -159,25 +159,25 @@ glabel func_802186D0_69F8D0 /* 69FB24 80218924 00621021 */ addu $v0, $v1, $v0 /* 69FB28 80218928 00021043 */ sra $v0, $v0, 1 /* 69FB2C 8021892C 44821000 */ mtc1 $v0, $f2 -/* 69FB30 80218930 00000000 */ nop +/* 69FB30 80218930 00000000 */ nop /* 69FB34 80218934 468010A0 */ cvt.s.w $f2, $f2 /* 69FB38 80218938 0060102D */ daddu $v0, $v1, $zero /* 69FB3C 8021893C 46181082 */ mul.s $f2, $f2, $f24 -/* 69FB40 80218940 00000000 */ nop +/* 69FB40 80218940 00000000 */ nop /* 69FB44 80218944 00021FC2 */ srl $v1, $v0, 0x1f /* 69FB48 80218948 00431021 */ addu $v0, $v0, $v1 /* 69FB4C 8021894C 00021043 */ sra $v0, $v0, 1 /* 69FB50 80218950 44820000 */ mtc1 $v0, $f0 -/* 69FB54 80218954 00000000 */ nop +/* 69FB54 80218954 00000000 */ nop /* 69FB58 80218958 46800020 */ cvt.s.w $f0, $f0 /* 69FB5C 8021895C 46180002 */ mul.s $f0, $f0, $f24 -/* 69FB60 80218960 00000000 */ nop +/* 69FB60 80218960 00000000 */ nop /* 69FB64 80218964 46161080 */ add.s $f2, $f2, $f22 /* 69FB68 80218968 46141082 */ mul.s $f2, $f2, $f20 -/* 69FB6C 8021896C 00000000 */ nop +/* 69FB6C 8021896C 00000000 */ nop /* 69FB70 80218970 46160000 */ add.s $f0, $f0, $f22 /* 69FB74 80218974 46140002 */ mul.s $f0, $f0, $f20 -/* 69FB78 80218978 00000000 */ nop +/* 69FB78 80218978 00000000 */ nop /* 69FB7C 8021897C 4600128D */ trunc.w.s $f10, $f2 /* 69FB80 80218980 E60AFFFC */ swc1 $f10, -4($s0) /* 69FB84 80218984 4600028D */ trunc.w.s $f10, $f0 @@ -189,7 +189,7 @@ glabel func_802186D0_69F8D0 /* 69FB98 80218998 AE02FFF8 */ sw $v0, -8($s0) /* 69FB9C 8021899C 8E240000 */ lw $a0, ($s1) /* 69FBA0 802189A0 0C016914 */ jal remove_effect -/* 69FBA4 802189A4 00000000 */ nop +/* 69FBA4 802189A4 00000000 */ nop /* 69FBA8 802189A8 24020001 */ addiu $v0, $zero, 1 /* 69FBAC 802189AC 08086291 */ j .L80218A44 /* 69FBB0 802189B0 AE020010 */ sw $v0, 0x10($s0) diff --git a/asm/nonmatchings/battle/area_kpa2/69F320/func_80218AA4_69FCA4.s b/asm/nonmatchings/battle/area_kpa2/69F320/func_80218AA4_69FCA4.s index dd3158f19d..4ad7180b6d 100644 --- a/asm/nonmatchings/battle/area_kpa2/69F320/func_80218AA4_69FCA4.s +++ b/asm/nonmatchings/battle/area_kpa2/69F320/func_80218AA4_69FCA4.s @@ -30,20 +30,20 @@ glabel func_80218AA4_69FCA4 /* 69FD08 80218B08 8E050000 */ lw $a1, ($s0) /* 69FD0C 80218B0C 26100004 */ addiu $s0, $s0, 4 /* 69FD10 80218B10 4482D000 */ mtc1 $v0, $f26 -/* 69FD14 80218B14 00000000 */ nop +/* 69FD14 80218B14 00000000 */ nop /* 69FD18 80218B18 4680D6A0 */ cvt.s.w $f26, $f26 /* 69FD1C 80218B1C 0C0B1EAF */ jal get_variable /* 69FD20 80218B20 0220202D */ daddu $a0, $s1, $zero /* 69FD24 80218B24 8E050000 */ lw $a1, ($s0) /* 69FD28 80218B28 26100004 */ addiu $s0, $s0, 4 /* 69FD2C 80218B2C 4482C000 */ mtc1 $v0, $f24 -/* 69FD30 80218B30 00000000 */ nop +/* 69FD30 80218B30 00000000 */ nop /* 69FD34 80218B34 4680C620 */ cvt.s.w $f24, $f24 /* 69FD38 80218B38 0C0B1EAF */ jal get_variable /* 69FD3C 80218B3C 0220202D */ daddu $a0, $s1, $zero /* 69FD40 80218B40 8E050000 */ lw $a1, ($s0) /* 69FD44 80218B44 4482B000 */ mtc1 $v0, $f22 -/* 69FD48 80218B48 00000000 */ nop +/* 69FD48 80218B48 00000000 */ nop /* 69FD4C 80218B4C 4680B5A0 */ cvt.s.w $f22, $f22 /* 69FD50 80218B50 0C0B210B */ jal get_float_variable /* 69FD54 80218B54 0220202D */ daddu $a0, $s1, $zero @@ -55,7 +55,7 @@ glabel func_80218AA4_69FCA4 /* 69FD6C 80218B6C D4224740 */ ldc1 $f2, %lo(D_80234740)($at) /* 69FD70 80218B70 4600A021 */ cvt.d.s $f0, $f20 /* 69FD74 80218B74 46220002 */ mul.d $f0, $f0, $f2 -/* 69FD78 80218B78 00000000 */ nop +/* 69FD78 80218B78 00000000 */ nop /* 69FD7C 80218B7C 46200520 */ cvt.s.d $f20, $f0 .L80218B80: /* 69FD80 80218B80 0C00AB39 */ jal heap_malloc @@ -130,7 +130,7 @@ glabel func_80218AA4_69FCA4 .L80218C84: /* 69FE84 80218C84 82830210 */ lb $v1, 0x210($s4) /* 69FE88 80218C88 10620023 */ beq $v1, $v0, .L80218D18 -/* 69FE8C 80218C8C 00000000 */ nop +/* 69FE8C 80218C8C 00000000 */ nop /* 69FE90 80218C90 C602FFD8 */ lwc1 $f2, -0x28($s0) /* 69FE94 80218C94 3C014044 */ lui $at, 0x4044 /* 69FE98 80218C98 44810800 */ mtc1 $at, $f1 @@ -145,7 +145,7 @@ glabel func_80218AA4_69FCA4 /* 69FEBC 80218CBC 3C01404E */ lui $at, 0x404e /* 69FEC0 80218CC0 44810800 */ mtc1 $at, $f1 /* 69FEC4 80218CC4 44800000 */ mtc1 $zero, $f0 -/* 69FEC8 80218CC8 00000000 */ nop +/* 69FEC8 80218CC8 00000000 */ nop /* 69FECC 80218CCC 4620103C */ c.lt.d $f2, $f0 /* 69FED0 80218CD0 3C018023 */ lui $at, %hi(D_80234748) /* 69FED4 80218CD4 D4204748 */ ldc1 $f0, %lo(D_80234748)($at) @@ -154,7 +154,7 @@ glabel func_80218AA4_69FCA4 /* 69FEE0 80218CE0 3C014054 */ lui $at, 0x4054 /* 69FEE4 80218CE4 44810800 */ mtc1 $at, $f1 /* 69FEE8 80218CE8 44800000 */ mtc1 $zero, $f0 -/* 69FEEC 80218CEC 00000000 */ nop +/* 69FEEC 80218CEC 00000000 */ nop /* 69FEF0 80218CF0 4620103C */ c.lt.d $f2, $f0 /* 69FEF4 80218CF4 3C018023 */ lui $at, %hi(D_80234750) /* 69FEF8 80218CF8 D4204750 */ ldc1 $f0, %lo(D_80234750)($at) @@ -179,7 +179,7 @@ glabel func_80218AA4_69FCA4 /* 69FF40 80218D40 3C014038 */ lui $at, 0x4038 /* 69FF44 80218D44 44810800 */ mtc1 $at, $f1 /* 69FF48 80218D48 44800000 */ mtc1 $zero, $f0 -/* 69FF4C 80218D4C 00000000 */ nop +/* 69FF4C 80218D4C 00000000 */ nop /* 69FF50 80218D50 4620103C */ c.lt.d $f2, $f0 /* 69FF54 80218D54 3C018023 */ lui $at, %hi(D_80234760) /* 69FF58 80218D58 D4204760 */ ldc1 $f0, %lo(D_80234760)($at) @@ -188,7 +188,7 @@ glabel func_80218AA4_69FCA4 /* 69FF64 80218D64 3C014040 */ lui $at, 0x4040 /* 69FF68 80218D68 44810800 */ mtc1 $at, $f1 /* 69FF6C 80218D6C 44800000 */ mtc1 $zero, $f0 -/* 69FF70 80218D70 00000000 */ nop +/* 69FF70 80218D70 00000000 */ nop /* 69FF74 80218D74 4620103C */ c.lt.d $f2, $f0 /* 69FF78 80218D78 3C018023 */ lui $at, %hi(D_80234768) /* 69FF7C 80218D7C D4204768 */ ldc1 $f0, %lo(D_80234768)($at) @@ -266,7 +266,7 @@ glabel func_80218AA4_69FCA4 /* 6A008C 80218E8C AE02FFE8 */ sw $v0, -0x18($s0) /* 6A0090 80218E90 8E240000 */ lw $a0, ($s1) /* 6A0094 80218E94 0C016914 */ jal remove_effect -/* 6A0098 80218E98 00000000 */ nop +/* 6A0098 80218E98 00000000 */ nop /* 6A009C 80218E9C 24020001 */ addiu $v0, $zero, 1 /* 6A00A0 80218EA0 AE020000 */ sw $v0, ($s0) .L80218EA4: diff --git a/asm/nonmatchings/battle/area_kpa2/69F320/func_80218F58_6A0158.s b/asm/nonmatchings/battle/area_kpa2/69F320/func_80218F58_6A0158.s index 3badf9e17b..5f29500600 100644 --- a/asm/nonmatchings/battle/area_kpa2/69F320/func_80218F58_6A0158.s +++ b/asm/nonmatchings/battle/area_kpa2/69F320/func_80218F58_6A0158.s @@ -91,10 +91,10 @@ glabel func_80218F58_6A0158 /* 6A029C 8021909C 46000021 */ cvt.d.s $f0, $f0 /* 6A02A0 802190A0 46380000 */ add.d $f0, $f0, $f24 /* 6A02A4 802190A4 46360002 */ mul.d $f0, $f0, $f22 -/* 6A02A8 802190A8 00000000 */ nop +/* 6A02A8 802190A8 00000000 */ nop /* 6A02AC 802190AC 27A20020 */ addiu $v0, $sp, 0x20 /* 6A02B0 802190B0 4620A03E */ c.le.d $f20, $f0 -/* 6A02B4 802190B4 00000000 */ nop +/* 6A02B4 802190B4 00000000 */ nop /* 6A02B8 802190B8 45010005 */ bc1t .L802190D0 /* 6A02BC 802190BC 00511021 */ addu $v0, $v0, $s1 /* 6A02C0 802190C0 4620008D */ trunc.w.d $f2, $f0 @@ -105,7 +105,7 @@ glabel func_80218F58_6A0158 /* 6A02D0 802190D0 46340001 */ sub.d $f0, $f0, $f20 /* 6A02D4 802190D4 4620008D */ trunc.w.d $f2, $f0 /* 6A02D8 802190D8 44031000 */ mfc1 $v1, $f2 -/* 6A02DC 802190DC 00000000 */ nop +/* 6A02DC 802190DC 00000000 */ nop /* 6A02E0 802190E0 00721825 */ or $v1, $v1, $s2 /* 6A02E4 802190E4 A0430000 */ sb $v1, ($v0) .L802190E8: @@ -118,10 +118,10 @@ glabel func_80218F58_6A0158 /* 6A0300 80219100 46000021 */ cvt.d.s $f0, $f0 /* 6A0304 80219104 46380000 */ add.d $f0, $f0, $f24 /* 6A0308 80219108 46360002 */ mul.d $f0, $f0, $f22 -/* 6A030C 8021910C 00000000 */ nop +/* 6A030C 8021910C 00000000 */ nop /* 6A0310 80219110 27A20038 */ addiu $v0, $sp, 0x38 /* 6A0314 80219114 4620A03E */ c.le.d $f20, $f0 -/* 6A0318 80219118 00000000 */ nop +/* 6A0318 80219118 00000000 */ nop /* 6A031C 8021911C 45010005 */ bc1t .L80219134 /* 6A0320 80219120 00511021 */ addu $v0, $v0, $s1 /* 6A0324 80219124 4620008D */ trunc.w.d $f2, $f0 @@ -132,7 +132,7 @@ glabel func_80218F58_6A0158 /* 6A0334 80219134 46340001 */ sub.d $f0, $f0, $f20 /* 6A0338 80219138 4620008D */ trunc.w.d $f2, $f0 /* 6A033C 8021913C 44031000 */ mfc1 $v1, $f2 -/* 6A0340 80219140 00000000 */ nop +/* 6A0340 80219140 00000000 */ nop /* 6A0344 80219144 00721825 */ or $v1, $v1, $s2 /* 6A0348 80219148 A0430000 */ sb $v1, ($v0) .L8021914C: @@ -145,10 +145,10 @@ glabel func_80218F58_6A0158 /* 6A0364 80219164 46000021 */ cvt.d.s $f0, $f0 /* 6A0368 80219168 46380000 */ add.d $f0, $f0, $f24 /* 6A036C 8021916C 46360002 */ mul.d $f0, $f0, $f22 -/* 6A0370 80219170 00000000 */ nop +/* 6A0370 80219170 00000000 */ nop /* 6A0374 80219174 27A20050 */ addiu $v0, $sp, 0x50 /* 6A0378 80219178 4620A03E */ c.le.d $f20, $f0 -/* 6A037C 8021917C 00000000 */ nop +/* 6A037C 8021917C 00000000 */ nop /* 6A0380 80219180 45010005 */ bc1t .L80219198 /* 6A0384 80219184 00511021 */ addu $v0, $v0, $s1 /* 6A0388 80219188 4620008D */ trunc.w.d $f2, $f0 @@ -159,7 +159,7 @@ glabel func_80218F58_6A0158 /* 6A0398 80219198 46340001 */ sub.d $f0, $f0, $f20 /* 6A039C 8021919C 4620008D */ trunc.w.d $f2, $f0 /* 6A03A0 802191A0 44031000 */ mfc1 $v1, $f2 -/* 6A03A4 802191A4 00000000 */ nop +/* 6A03A4 802191A4 00000000 */ nop /* 6A03A8 802191A8 00721825 */ or $v1, $v1, $s2 /* 6A03AC 802191AC A0430000 */ sb $v1, ($v0) .L802191B0: diff --git a/asm/nonmatchings/battle/area_kpa2/69F320/func_80219444_6A0644.s b/asm/nonmatchings/battle/area_kpa2/69F320/func_80219444_6A0644.s index 253a42d235..d3117c8eaf 100644 --- a/asm/nonmatchings/battle/area_kpa2/69F320/func_80219444_6A0644.s +++ b/asm/nonmatchings/battle/area_kpa2/69F320/func_80219444_6A0644.s @@ -31,21 +31,21 @@ glabel func_80219444_6A0644 /* 6A06AC 802194AC 8E050000 */ lw $a1, ($s0) /* 6A06B0 802194B0 26100004 */ addiu $s0, $s0, 4 /* 6A06B4 802194B4 4482E000 */ mtc1 $v0, $f28 -/* 6A06B8 802194B8 00000000 */ nop +/* 6A06B8 802194B8 00000000 */ nop /* 6A06BC 802194BC 4680E720 */ cvt.s.w $f28, $f28 /* 6A06C0 802194C0 0C0B1EAF */ jal get_variable /* 6A06C4 802194C4 0220202D */ daddu $a0, $s1, $zero /* 6A06C8 802194C8 8E050000 */ lw $a1, ($s0) /* 6A06CC 802194CC 26100004 */ addiu $s0, $s0, 4 /* 6A06D0 802194D0 4482D000 */ mtc1 $v0, $f26 -/* 6A06D4 802194D4 00000000 */ nop +/* 6A06D4 802194D4 00000000 */ nop /* 6A06D8 802194D8 4680D6A0 */ cvt.s.w $f26, $f26 /* 6A06DC 802194DC 0C0B1EAF */ jal get_variable /* 6A06E0 802194E0 0220202D */ daddu $a0, $s1, $zero /* 6A06E4 802194E4 8E050000 */ lw $a1, ($s0) /* 6A06E8 802194E8 26100004 */ addiu $s0, $s0, 4 /* 6A06EC 802194EC 4482C000 */ mtc1 $v0, $f24 -/* 6A06F0 802194F0 00000000 */ nop +/* 6A06F0 802194F0 00000000 */ nop /* 6A06F4 802194F4 4680C620 */ cvt.s.w $f24, $f24 /* 6A06F8 802194F8 0C0B210B */ jal get_float_variable /* 6A06FC 802194FC 0220202D */ daddu $a0, $s1, $zero @@ -130,7 +130,7 @@ glabel func_80219444_6A0644 .L8021962C: /* 6A082C 8021962C 8E020010 */ lw $v0, 0x10($s0) /* 6A0830 80219630 10400003 */ beqz $v0, .L80219640 -/* 6A0834 80219634 00000000 */ nop +/* 6A0834 80219634 00000000 */ nop /* 6A0838 80219638 080865EE */ j .L802197B8 /* 6A083C 8021963C 26940001 */ addiu $s4, $s4, 1 .L80219640: @@ -141,7 +141,7 @@ glabel func_80219444_6A0644 /* 6A0850 80219650 468010A0 */ cvt.s.w $f2, $f2 /* 6A0854 80219654 46000005 */ abs.s $f0, $f0 /* 6A0858 80219658 46020002 */ mul.s $f0, $f0, $f2 -/* 6A085C 8021965C 00000000 */ nop +/* 6A085C 8021965C 00000000 */ nop /* 6A0860 80219660 C606000C */ lwc1 $f6, 0xc($s0) /* 6A0864 80219664 3C014110 */ lui $at, 0x4110 /* 6A0868 80219668 44811000 */ mtc1 $at, $f2 @@ -159,25 +159,25 @@ glabel func_80219444_6A0644 /* 6A0898 80219698 00621021 */ addu $v0, $v1, $v0 /* 6A089C 8021969C 00021043 */ sra $v0, $v0, 1 /* 6A08A0 802196A0 44821000 */ mtc1 $v0, $f2 -/* 6A08A4 802196A4 00000000 */ nop +/* 6A08A4 802196A4 00000000 */ nop /* 6A08A8 802196A8 468010A0 */ cvt.s.w $f2, $f2 /* 6A08AC 802196AC 0060102D */ daddu $v0, $v1, $zero /* 6A08B0 802196B0 46181082 */ mul.s $f2, $f2, $f24 -/* 6A08B4 802196B4 00000000 */ nop +/* 6A08B4 802196B4 00000000 */ nop /* 6A08B8 802196B8 00021FC2 */ srl $v1, $v0, 0x1f /* 6A08BC 802196BC 00431021 */ addu $v0, $v0, $v1 /* 6A08C0 802196C0 00021043 */ sra $v0, $v0, 1 /* 6A08C4 802196C4 44820000 */ mtc1 $v0, $f0 -/* 6A08C8 802196C8 00000000 */ nop +/* 6A08C8 802196C8 00000000 */ nop /* 6A08CC 802196CC 46800020 */ cvt.s.w $f0, $f0 /* 6A08D0 802196D0 46180002 */ mul.s $f0, $f0, $f24 -/* 6A08D4 802196D4 00000000 */ nop +/* 6A08D4 802196D4 00000000 */ nop /* 6A08D8 802196D8 46161080 */ add.s $f2, $f2, $f22 /* 6A08DC 802196DC 46141082 */ mul.s $f2, $f2, $f20 -/* 6A08E0 802196E0 00000000 */ nop +/* 6A08E0 802196E0 00000000 */ nop /* 6A08E4 802196E4 46160000 */ add.s $f0, $f0, $f22 /* 6A08E8 802196E8 46140002 */ mul.s $f0, $f0, $f20 -/* 6A08EC 802196EC 00000000 */ nop +/* 6A08EC 802196EC 00000000 */ nop /* 6A08F0 802196F0 4600128D */ trunc.w.s $f10, $f2 /* 6A08F4 802196F4 E60AFFFC */ swc1 $f10, -4($s0) /* 6A08F8 802196F8 4600028D */ trunc.w.s $f10, $f0 @@ -189,7 +189,7 @@ glabel func_80219444_6A0644 /* 6A090C 8021970C AE02FFF8 */ sw $v0, -8($s0) /* 6A0910 80219710 8E240000 */ lw $a0, ($s1) /* 6A0914 80219714 0C016914 */ jal remove_effect -/* 6A0918 80219718 00000000 */ nop +/* 6A0918 80219718 00000000 */ nop /* 6A091C 8021971C 24020001 */ addiu $v0, $zero, 1 /* 6A0920 80219720 080865EE */ j .L802197B8 /* 6A0924 80219724 AE020010 */ sw $v0, 0x10($s0) diff --git a/asm/nonmatchings/battle/area_kpa2/69F320/func_80219818_6A0A18.s b/asm/nonmatchings/battle/area_kpa2/69F320/func_80219818_6A0A18.s index 677abbfce0..cca3b66ea9 100644 --- a/asm/nonmatchings/battle/area_kpa2/69F320/func_80219818_6A0A18.s +++ b/asm/nonmatchings/battle/area_kpa2/69F320/func_80219818_6A0A18.s @@ -30,20 +30,20 @@ glabel func_80219818_6A0A18 /* 6A0A7C 8021987C 8E050000 */ lw $a1, ($s0) /* 6A0A80 80219880 26100004 */ addiu $s0, $s0, 4 /* 6A0A84 80219884 4482D000 */ mtc1 $v0, $f26 -/* 6A0A88 80219888 00000000 */ nop +/* 6A0A88 80219888 00000000 */ nop /* 6A0A8C 8021988C 4680D6A0 */ cvt.s.w $f26, $f26 /* 6A0A90 80219890 0C0B1EAF */ jal get_variable /* 6A0A94 80219894 0220202D */ daddu $a0, $s1, $zero /* 6A0A98 80219898 8E050000 */ lw $a1, ($s0) /* 6A0A9C 8021989C 26100004 */ addiu $s0, $s0, 4 /* 6A0AA0 802198A0 4482C000 */ mtc1 $v0, $f24 -/* 6A0AA4 802198A4 00000000 */ nop +/* 6A0AA4 802198A4 00000000 */ nop /* 6A0AA8 802198A8 4680C620 */ cvt.s.w $f24, $f24 /* 6A0AAC 802198AC 0C0B1EAF */ jal get_variable /* 6A0AB0 802198B0 0220202D */ daddu $a0, $s1, $zero /* 6A0AB4 802198B4 8E050000 */ lw $a1, ($s0) /* 6A0AB8 802198B8 4482B000 */ mtc1 $v0, $f22 -/* 6A0ABC 802198BC 00000000 */ nop +/* 6A0ABC 802198BC 00000000 */ nop /* 6A0AC0 802198C0 4680B5A0 */ cvt.s.w $f22, $f22 /* 6A0AC4 802198C4 0C0B210B */ jal get_float_variable /* 6A0AC8 802198C8 0220202D */ daddu $a0, $s1, $zero @@ -55,7 +55,7 @@ glabel func_80219818_6A0A18 /* 6A0AE0 802198E0 D4224780 */ ldc1 $f2, %lo(D_80234780)($at) /* 6A0AE4 802198E4 4600A021 */ cvt.d.s $f0, $f20 /* 6A0AE8 802198E8 46220002 */ mul.d $f0, $f0, $f2 -/* 6A0AEC 802198EC 00000000 */ nop +/* 6A0AEC 802198EC 00000000 */ nop /* 6A0AF0 802198F0 46200520 */ cvt.s.d $f20, $f0 .L802198F4: /* 6A0AF4 802198F4 0C00AB39 */ jal heap_malloc @@ -130,7 +130,7 @@ glabel func_80219818_6A0A18 .L802199F8: /* 6A0BF8 802199F8 82830210 */ lb $v1, 0x210($s4) /* 6A0BFC 802199FC 10620023 */ beq $v1, $v0, .L80219A8C -/* 6A0C00 80219A00 00000000 */ nop +/* 6A0C00 80219A00 00000000 */ nop /* 6A0C04 80219A04 C602FFD8 */ lwc1 $f2, -0x28($s0) /* 6A0C08 80219A08 3C014044 */ lui $at, 0x4044 /* 6A0C0C 80219A0C 44810800 */ mtc1 $at, $f1 @@ -145,7 +145,7 @@ glabel func_80219818_6A0A18 /* 6A0C30 80219A30 3C01404E */ lui $at, 0x404e /* 6A0C34 80219A34 44810800 */ mtc1 $at, $f1 /* 6A0C38 80219A38 44800000 */ mtc1 $zero, $f0 -/* 6A0C3C 80219A3C 00000000 */ nop +/* 6A0C3C 80219A3C 00000000 */ nop /* 6A0C40 80219A40 4620103C */ c.lt.d $f2, $f0 /* 6A0C44 80219A44 3C018023 */ lui $at, %hi(D_80234788) /* 6A0C48 80219A48 D4204788 */ ldc1 $f0, %lo(D_80234788)($at) @@ -154,7 +154,7 @@ glabel func_80219818_6A0A18 /* 6A0C54 80219A54 3C014054 */ lui $at, 0x4054 /* 6A0C58 80219A58 44810800 */ mtc1 $at, $f1 /* 6A0C5C 80219A5C 44800000 */ mtc1 $zero, $f0 -/* 6A0C60 80219A60 00000000 */ nop +/* 6A0C60 80219A60 00000000 */ nop /* 6A0C64 80219A64 4620103C */ c.lt.d $f2, $f0 /* 6A0C68 80219A68 3C018023 */ lui $at, %hi(D_80234790) /* 6A0C6C 80219A6C D4204790 */ ldc1 $f0, %lo(D_80234790)($at) @@ -179,7 +179,7 @@ glabel func_80219818_6A0A18 /* 6A0CB4 80219AB4 3C014038 */ lui $at, 0x4038 /* 6A0CB8 80219AB8 44810800 */ mtc1 $at, $f1 /* 6A0CBC 80219ABC 44800000 */ mtc1 $zero, $f0 -/* 6A0CC0 80219AC0 00000000 */ nop +/* 6A0CC0 80219AC0 00000000 */ nop /* 6A0CC4 80219AC4 4620103C */ c.lt.d $f2, $f0 /* 6A0CC8 80219AC8 3C018023 */ lui $at, %hi(D_802347A0) /* 6A0CCC 80219ACC D42047A0 */ ldc1 $f0, %lo(D_802347A0)($at) @@ -188,7 +188,7 @@ glabel func_80219818_6A0A18 /* 6A0CD8 80219AD8 3C014040 */ lui $at, 0x4040 /* 6A0CDC 80219ADC 44810800 */ mtc1 $at, $f1 /* 6A0CE0 80219AE0 44800000 */ mtc1 $zero, $f0 -/* 6A0CE4 80219AE4 00000000 */ nop +/* 6A0CE4 80219AE4 00000000 */ nop /* 6A0CE8 80219AE8 4620103C */ c.lt.d $f2, $f0 /* 6A0CEC 80219AEC 3C018023 */ lui $at, %hi(D_802347A8) /* 6A0CF0 80219AF0 D42047A8 */ ldc1 $f0, %lo(D_802347A8)($at) @@ -266,7 +266,7 @@ glabel func_80219818_6A0A18 /* 6A0E00 80219C00 AE02FFE8 */ sw $v0, -0x18($s0) /* 6A0E04 80219C04 8E240000 */ lw $a0, ($s1) /* 6A0E08 80219C08 0C016914 */ jal remove_effect -/* 6A0E0C 80219C0C 00000000 */ nop +/* 6A0E0C 80219C0C 00000000 */ nop /* 6A0E10 80219C10 24020001 */ addiu $v0, $zero, 1 /* 6A0E14 80219C14 AE020000 */ sw $v0, ($s0) .L80219C18: diff --git a/asm/nonmatchings/battle/area_kpa2/69F320/func_80219CD4_6A0ED4.s b/asm/nonmatchings/battle/area_kpa2/69F320/func_80219CD4_6A0ED4.s index 4d624e477d..19f1fd1bc7 100644 --- a/asm/nonmatchings/battle/area_kpa2/69F320/func_80219CD4_6A0ED4.s +++ b/asm/nonmatchings/battle/area_kpa2/69F320/func_80219CD4_6A0ED4.s @@ -21,7 +21,7 @@ glabel func_80219CD4_6A0ED4 /* 6A0F10 80219D10 14410004 */ bne $v0, $at, .L80219D24 /* 6A0F14 80219D14 3C018000 */ lui $at, 0x8000 /* 6A0F18 80219D18 14C10002 */ bne $a2, $at, .L80219D24 -/* 6A0F1C 80219D1C 00000000 */ nop +/* 6A0F1C 80219D1C 00000000 */ nop /* 6A0F20 80219D20 0006000D */ break 6 .L80219D24: /* 6A0F24 80219D24 00003012 */ mflo $a2 diff --git a/asm/nonmatchings/battle/area_kpa2/69F320/func_80219D44_6A0F44.s b/asm/nonmatchings/battle/area_kpa2/69F320/func_80219D44_6A0F44.s index d771b96360..b13e3887dc 100644 --- a/asm/nonmatchings/battle/area_kpa2/69F320/func_80219D44_6A0F44.s +++ b/asm/nonmatchings/battle/area_kpa2/69F320/func_80219D44_6A0F44.s @@ -62,12 +62,12 @@ glabel func_80219D44_6A0F44 /* 6A1028 80219E28 C626001C */ lwc1 $f6, 0x1c($s1) /* 6A102C 80219E2C 468031A0 */ cvt.s.w $f6, $f6 /* 6A1030 80219E30 46062102 */ mul.s $f4, $f4, $f6 -/* 6A1034 80219E34 00000000 */ nop +/* 6A1034 80219E34 00000000 */ nop /* 6A1038 80219E38 3C013F00 */ lui $at, 0x3f00 /* 6A103C 80219E3C 44811000 */ mtc1 $at, $f2 -/* 6A1040 80219E40 00000000 */ nop +/* 6A1040 80219E40 00000000 */ nop /* 6A1044 80219E44 46022102 */ mul.s $f4, $f4, $f2 -/* 6A1048 80219E48 00000000 */ nop +/* 6A1048 80219E48 00000000 */ nop /* 6A104C 80219E4C E620000C */ swc1 $f0, 0xc($s1) /* 6A1050 80219E50 C6200004 */ lwc1 $f0, 4($s1) /* 6A1054 80219E54 C602000C */ lwc1 $f2, 0xc($s0) @@ -84,7 +84,7 @@ glabel func_80219D44_6A0F44 /* 6A107C 80219E7C 8E240020 */ lw $a0, 0x20($s1) /* 6A1080 80219E80 0040802D */ daddu $s0, $v0, $zero /* 6A1084 80219E84 16000005 */ bnez $s0, .L80219E9C -/* 6A1088 80219E88 00000000 */ nop +/* 6A1088 80219E88 00000000 */ nop /* 6A108C 80219E8C 0C00AB4B */ jal heap_free /* 6A1090 80219E90 8E440070 */ lw $a0, 0x70($s2) /* 6A1094 80219E94 080867D0 */ j .L80219F40 @@ -92,10 +92,10 @@ glabel func_80219D44_6A0F44 .L80219E9C: /* 6A109C 80219E9C C62C000C */ lwc1 $f12, 0xc($s1) /* 6A10A0 80219EA0 0C00A8BB */ jal sin_deg -/* 6A10A4 80219EA4 00000000 */ nop +/* 6A10A4 80219EA4 00000000 */ nop /* 6A10A8 80219EA8 C6220014 */ lwc1 $f2, 0x14($s1) /* 6A10AC 80219EAC 46001082 */ mul.s $f2, $f2, $f0 -/* 6A10B0 80219EB0 00000000 */ nop +/* 6A10B0 80219EB0 00000000 */ nop /* 6A10B4 80219EB4 C6000008 */ lwc1 $f0, 8($s0) /* 6A10B8 80219EB8 46020000 */ add.s $f0, $f0, $f2 /* 6A10BC 80219EBC E6000008 */ swc1 $f0, 8($s0) @@ -103,7 +103,7 @@ glabel func_80219D44_6A0F44 /* 6A10C4 80219EC4 C62C000C */ lwc1 $f12, 0xc($s1) /* 6A10C8 80219EC8 C6220014 */ lwc1 $f2, 0x14($s1) /* 6A10CC 80219ECC 46001082 */ mul.s $f2, $f2, $f0 -/* 6A10D0 80219ED0 00000000 */ nop +/* 6A10D0 80219ED0 00000000 */ nop /* 6A10D4 80219ED4 C6000010 */ lwc1 $f0, 0x10($s0) /* 6A10D8 80219ED8 46020001 */ sub.s $f0, $f0, $f2 /* 6A10DC 80219EDC E6000010 */ swc1 $f0, 0x10($s0) diff --git a/asm/nonmatchings/battle/area_kpa2/69F320/func_80219FFC_6A11FC.s b/asm/nonmatchings/battle/area_kpa2/69F320/func_80219FFC_6A11FC.s index 70f7f35d89..2742949862 100644 --- a/asm/nonmatchings/battle/area_kpa2/69F320/func_80219FFC_6A11FC.s +++ b/asm/nonmatchings/battle/area_kpa2/69F320/func_80219FFC_6A11FC.s @@ -56,12 +56,12 @@ glabel func_80219FFC_6A11FC /* 6A12BC 8021A0BC 50600007 */ beql $v1, $zero, .L8021A0DC /* 6A12C0 8021A0C0 A25000AE */ sb $s0, 0xae($s2) /* 6A12C4 8021A0C4 08086864 */ j .L8021A190 -/* 6A12C8 8021A0C8 00000000 */ nop +/* 6A12C8 8021A0C8 00000000 */ nop .L8021A0CC: /* 6A12CC 8021A0CC 50620026 */ beql $v1, $v0, .L8021A168 /* 6A12D0 8021A0D0 A25000B0 */ sb $s0, 0xb0($s2) /* 6A12D4 8021A0D4 08086864 */ j .L8021A190 -/* 6A12D8 8021A0D8 00000000 */ nop +/* 6A12D8 8021A0D8 00000000 */ nop .L8021A0DC: /* 6A12DC 8021A0DC 8E250000 */ lw $a1, ($s1) /* 6A12E0 8021A0E0 82820001 */ lb $v0, 1($s4) @@ -110,7 +110,7 @@ glabel func_80219FFC_6A11FC /* 6A1384 8021A184 2406004F */ addiu $a2, $zero, 0x4f .L8021A188: /* 6A1388 8021A188 0C0B2026 */ jal set_variable -/* 6A138C 8021A18C 00000000 */ nop +/* 6A138C 8021A18C 00000000 */ nop .L8021A190: /* 6A1390 8021A190 8FBF0038 */ lw $ra, 0x38($sp) /* 6A1394 8021A194 8FB50034 */ lw $s5, 0x34($sp) diff --git a/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A1B8_6A13B8.s b/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A1B8_6A13B8.s index 4fceacc7c4..c5aab24cd7 100644 --- a/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A1B8_6A13B8.s +++ b/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A1B8_6A13B8.s @@ -22,10 +22,10 @@ glabel func_8021A1B8_6A13B8 /* 6A13FC 8021A1FC 0240202D */ daddu $a0, $s2, $zero /* 6A1400 8021A200 822200AF */ lb $v0, 0xaf($s1) /* 6A1404 8021A204 10430004 */ beq $v0, $v1, .L8021A218 -/* 6A1408 8021A208 00000000 */ nop +/* 6A1408 8021A208 00000000 */ nop /* 6A140C 8021A20C 822200B0 */ lb $v0, 0xb0($s1) /* 6A1410 8021A210 14430005 */ bne $v0, $v1, .L8021A228 -/* 6A1414 8021A214 00000000 */ nop +/* 6A1414 8021A214 00000000 */ nop .L8021A218: /* 6A1418 8021A218 8E050000 */ lw $a1, ($s0) /* 6A141C 8021A21C 0808688C */ j .L8021A230 @@ -37,7 +37,7 @@ glabel func_8021A1B8_6A13B8 /* 6A142C 8021A22C 2406FFFF */ addiu $a2, $zero, -1 .L8021A230: /* 6A1430 8021A230 0C0B2026 */ jal set_variable -/* 6A1434 8021A234 00000000 */ nop +/* 6A1434 8021A234 00000000 */ nop /* 6A1438 8021A238 24020002 */ addiu $v0, $zero, 2 /* 6A143C 8021A23C 8FBF001C */ lw $ra, 0x1c($sp) /* 6A1440 8021A240 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A254_6A1454.s b/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A254_6A1454.s index 23acba987f..38676a08fd 100644 --- a/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A254_6A1454.s +++ b/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A254_6A1454.s @@ -11,19 +11,19 @@ glabel func_8021A254_6A1454 /* 6A146C 8021A26C 3C013D23 */ lui $at, 0x3d23 /* 6A1470 8021A270 3421D70A */ ori $at, $at, 0xd70a /* 6A1474 8021A274 44810000 */ mtc1 $at, $f0 -/* 6A1478 8021A278 00000000 */ nop +/* 6A1478 8021A278 00000000 */ nop /* 6A147C 8021A27C E4600038 */ swc1 $f0, 0x38($v1) /* 6A1480 8021A280 E4600030 */ swc1 $f0, 0x30($v1) /* 6A1484 8021A284 8C43000C */ lw $v1, 0xc($v0) /* 6A1488 8021A288 3C013FF0 */ lui $at, 0x3ff0 /* 6A148C 8021A28C 44810000 */ mtc1 $at, $f0 -/* 6A1490 8021A290 00000000 */ nop +/* 6A1490 8021A290 00000000 */ nop /* 6A1494 8021A294 E4600034 */ swc1 $f0, 0x34($v1) /* 6A1498 8021A298 8C43000C */ lw $v1, 0xc($v0) /* 6A149C 8021A29C 3C013D4C */ lui $at, 0x3d4c /* 6A14A0 8021A2A0 3421CCCD */ ori $at, $at, 0xcccd /* 6A14A4 8021A2A4 44810000 */ mtc1 $at, $f0 -/* 6A14A8 8021A2A8 00000000 */ nop +/* 6A14A8 8021A2A8 00000000 */ nop /* 6A14AC 8021A2AC E460003C */ swc1 $f0, 0x3c($v1) /* 6A14B0 8021A2B0 8FBF0010 */ lw $ra, 0x10($sp) /* 6A14B4 8021A2B4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A318_6A1518.s b/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A318_6A1518.s index d8394141ec..db2d66d110 100644 --- a/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A318_6A1518.s +++ b/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A318_6A1518.s @@ -91,10 +91,10 @@ glabel func_8021A318_6A1518 /* 6A165C 8021A45C 46000021 */ cvt.d.s $f0, $f0 /* 6A1660 8021A460 46380000 */ add.d $f0, $f0, $f24 /* 6A1664 8021A464 46360002 */ mul.d $f0, $f0, $f22 -/* 6A1668 8021A468 00000000 */ nop +/* 6A1668 8021A468 00000000 */ nop /* 6A166C 8021A46C 27A20020 */ addiu $v0, $sp, 0x20 /* 6A1670 8021A470 4620A03E */ c.le.d $f20, $f0 -/* 6A1674 8021A474 00000000 */ nop +/* 6A1674 8021A474 00000000 */ nop /* 6A1678 8021A478 45010005 */ bc1t .L8021A490 /* 6A167C 8021A47C 00511021 */ addu $v0, $v0, $s1 /* 6A1680 8021A480 4620008D */ trunc.w.d $f2, $f0 @@ -105,7 +105,7 @@ glabel func_8021A318_6A1518 /* 6A1690 8021A490 46340001 */ sub.d $f0, $f0, $f20 /* 6A1694 8021A494 4620008D */ trunc.w.d $f2, $f0 /* 6A1698 8021A498 44031000 */ mfc1 $v1, $f2 -/* 6A169C 8021A49C 00000000 */ nop +/* 6A169C 8021A49C 00000000 */ nop /* 6A16A0 8021A4A0 00721825 */ or $v1, $v1, $s2 /* 6A16A4 8021A4A4 A0430000 */ sb $v1, ($v0) .L8021A4A8: @@ -118,10 +118,10 @@ glabel func_8021A318_6A1518 /* 6A16C0 8021A4C0 46000021 */ cvt.d.s $f0, $f0 /* 6A16C4 8021A4C4 46380000 */ add.d $f0, $f0, $f24 /* 6A16C8 8021A4C8 46360002 */ mul.d $f0, $f0, $f22 -/* 6A16CC 8021A4CC 00000000 */ nop +/* 6A16CC 8021A4CC 00000000 */ nop /* 6A16D0 8021A4D0 27A20038 */ addiu $v0, $sp, 0x38 /* 6A16D4 8021A4D4 4620A03E */ c.le.d $f20, $f0 -/* 6A16D8 8021A4D8 00000000 */ nop +/* 6A16D8 8021A4D8 00000000 */ nop /* 6A16DC 8021A4DC 45010005 */ bc1t .L8021A4F4 /* 6A16E0 8021A4E0 00511021 */ addu $v0, $v0, $s1 /* 6A16E4 8021A4E4 4620008D */ trunc.w.d $f2, $f0 @@ -132,7 +132,7 @@ glabel func_8021A318_6A1518 /* 6A16F4 8021A4F4 46340001 */ sub.d $f0, $f0, $f20 /* 6A16F8 8021A4F8 4620008D */ trunc.w.d $f2, $f0 /* 6A16FC 8021A4FC 44031000 */ mfc1 $v1, $f2 -/* 6A1700 8021A500 00000000 */ nop +/* 6A1700 8021A500 00000000 */ nop /* 6A1704 8021A504 00721825 */ or $v1, $v1, $s2 /* 6A1708 8021A508 A0430000 */ sb $v1, ($v0) .L8021A50C: @@ -145,10 +145,10 @@ glabel func_8021A318_6A1518 /* 6A1724 8021A524 46000021 */ cvt.d.s $f0, $f0 /* 6A1728 8021A528 46380000 */ add.d $f0, $f0, $f24 /* 6A172C 8021A52C 46360002 */ mul.d $f0, $f0, $f22 -/* 6A1730 8021A530 00000000 */ nop +/* 6A1730 8021A530 00000000 */ nop /* 6A1734 8021A534 27A20050 */ addiu $v0, $sp, 0x50 /* 6A1738 8021A538 4620A03E */ c.le.d $f20, $f0 -/* 6A173C 8021A53C 00000000 */ nop +/* 6A173C 8021A53C 00000000 */ nop /* 6A1740 8021A540 45010005 */ bc1t .L8021A558 /* 6A1744 8021A544 00511021 */ addu $v0, $v0, $s1 /* 6A1748 8021A548 4620008D */ trunc.w.d $f2, $f0 @@ -159,7 +159,7 @@ glabel func_8021A318_6A1518 /* 6A1758 8021A558 46340001 */ sub.d $f0, $f0, $f20 /* 6A175C 8021A55C 4620008D */ trunc.w.d $f2, $f0 /* 6A1760 8021A560 44031000 */ mfc1 $v1, $f2 -/* 6A1764 8021A564 00000000 */ nop +/* 6A1764 8021A564 00000000 */ nop /* 6A1768 8021A568 00721825 */ or $v1, $v1, $s2 /* 6A176C 8021A56C A0430000 */ sb $v1, ($v0) .L8021A570: diff --git a/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A804_6A1A04.s b/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A804_6A1A04.s index f874a7342d..3fb50c1da1 100644 --- a/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A804_6A1A04.s +++ b/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A804_6A1A04.s @@ -31,21 +31,21 @@ glabel func_8021A804_6A1A04 /* 6A1A6C 8021A86C 8E050000 */ lw $a1, ($s0) /* 6A1A70 8021A870 26100004 */ addiu $s0, $s0, 4 /* 6A1A74 8021A874 4482E000 */ mtc1 $v0, $f28 -/* 6A1A78 8021A878 00000000 */ nop +/* 6A1A78 8021A878 00000000 */ nop /* 6A1A7C 8021A87C 4680E720 */ cvt.s.w $f28, $f28 /* 6A1A80 8021A880 0C0B1EAF */ jal get_variable /* 6A1A84 8021A884 0220202D */ daddu $a0, $s1, $zero /* 6A1A88 8021A888 8E050000 */ lw $a1, ($s0) /* 6A1A8C 8021A88C 26100004 */ addiu $s0, $s0, 4 /* 6A1A90 8021A890 4482D000 */ mtc1 $v0, $f26 -/* 6A1A94 8021A894 00000000 */ nop +/* 6A1A94 8021A894 00000000 */ nop /* 6A1A98 8021A898 4680D6A0 */ cvt.s.w $f26, $f26 /* 6A1A9C 8021A89C 0C0B1EAF */ jal get_variable /* 6A1AA0 8021A8A0 0220202D */ daddu $a0, $s1, $zero /* 6A1AA4 8021A8A4 8E050000 */ lw $a1, ($s0) /* 6A1AA8 8021A8A8 26100004 */ addiu $s0, $s0, 4 /* 6A1AAC 8021A8AC 4482C000 */ mtc1 $v0, $f24 -/* 6A1AB0 8021A8B0 00000000 */ nop +/* 6A1AB0 8021A8B0 00000000 */ nop /* 6A1AB4 8021A8B4 4680C620 */ cvt.s.w $f24, $f24 /* 6A1AB8 8021A8B8 0C0B210B */ jal get_float_variable /* 6A1ABC 8021A8BC 0220202D */ daddu $a0, $s1, $zero @@ -130,7 +130,7 @@ glabel func_8021A804_6A1A04 .L8021A9EC: /* 6A1BEC 8021A9EC 8E020010 */ lw $v0, 0x10($s0) /* 6A1BF0 8021A9F0 10400003 */ beqz $v0, .L8021AA00 -/* 6A1BF4 8021A9F4 00000000 */ nop +/* 6A1BF4 8021A9F4 00000000 */ nop /* 6A1BF8 8021A9F8 08086ADE */ j .L8021AB78 /* 6A1BFC 8021A9FC 26940001 */ addiu $s4, $s4, 1 .L8021AA00: @@ -141,7 +141,7 @@ glabel func_8021A804_6A1A04 /* 6A1C10 8021AA10 468010A0 */ cvt.s.w $f2, $f2 /* 6A1C14 8021AA14 46000005 */ abs.s $f0, $f0 /* 6A1C18 8021AA18 46020002 */ mul.s $f0, $f0, $f2 -/* 6A1C1C 8021AA1C 00000000 */ nop +/* 6A1C1C 8021AA1C 00000000 */ nop /* 6A1C20 8021AA20 C606000C */ lwc1 $f6, 0xc($s0) /* 6A1C24 8021AA24 3C014110 */ lui $at, 0x4110 /* 6A1C28 8021AA28 44811000 */ mtc1 $at, $f2 @@ -159,25 +159,25 @@ glabel func_8021A804_6A1A04 /* 6A1C58 8021AA58 00621021 */ addu $v0, $v1, $v0 /* 6A1C5C 8021AA5C 00021043 */ sra $v0, $v0, 1 /* 6A1C60 8021AA60 44821000 */ mtc1 $v0, $f2 -/* 6A1C64 8021AA64 00000000 */ nop +/* 6A1C64 8021AA64 00000000 */ nop /* 6A1C68 8021AA68 468010A0 */ cvt.s.w $f2, $f2 /* 6A1C6C 8021AA6C 0060102D */ daddu $v0, $v1, $zero /* 6A1C70 8021AA70 46181082 */ mul.s $f2, $f2, $f24 -/* 6A1C74 8021AA74 00000000 */ nop +/* 6A1C74 8021AA74 00000000 */ nop /* 6A1C78 8021AA78 00021FC2 */ srl $v1, $v0, 0x1f /* 6A1C7C 8021AA7C 00431021 */ addu $v0, $v0, $v1 /* 6A1C80 8021AA80 00021043 */ sra $v0, $v0, 1 /* 6A1C84 8021AA84 44820000 */ mtc1 $v0, $f0 -/* 6A1C88 8021AA88 00000000 */ nop +/* 6A1C88 8021AA88 00000000 */ nop /* 6A1C8C 8021AA8C 46800020 */ cvt.s.w $f0, $f0 /* 6A1C90 8021AA90 46180002 */ mul.s $f0, $f0, $f24 -/* 6A1C94 8021AA94 00000000 */ nop +/* 6A1C94 8021AA94 00000000 */ nop /* 6A1C98 8021AA98 46161080 */ add.s $f2, $f2, $f22 /* 6A1C9C 8021AA9C 46141082 */ mul.s $f2, $f2, $f20 -/* 6A1CA0 8021AAA0 00000000 */ nop +/* 6A1CA0 8021AAA0 00000000 */ nop /* 6A1CA4 8021AAA4 46160000 */ add.s $f0, $f0, $f22 /* 6A1CA8 8021AAA8 46140002 */ mul.s $f0, $f0, $f20 -/* 6A1CAC 8021AAAC 00000000 */ nop +/* 6A1CAC 8021AAAC 00000000 */ nop /* 6A1CB0 8021AAB0 4600128D */ trunc.w.s $f10, $f2 /* 6A1CB4 8021AAB4 E60AFFFC */ swc1 $f10, -4($s0) /* 6A1CB8 8021AAB8 4600028D */ trunc.w.s $f10, $f0 @@ -189,7 +189,7 @@ glabel func_8021A804_6A1A04 /* 6A1CCC 8021AACC AE02FFF8 */ sw $v0, -8($s0) /* 6A1CD0 8021AAD0 8E240000 */ lw $a0, ($s1) /* 6A1CD4 8021AAD4 0C016914 */ jal remove_effect -/* 6A1CD8 8021AAD8 00000000 */ nop +/* 6A1CD8 8021AAD8 00000000 */ nop /* 6A1CDC 8021AADC 24020001 */ addiu $v0, $zero, 1 /* 6A1CE0 8021AAE0 08086ADE */ j .L8021AB78 /* 6A1CE4 8021AAE4 AE020010 */ sw $v0, 0x10($s0) diff --git a/asm/nonmatchings/battle/area_kpa2/69F320/func_8021ABD8_6A1DD8.s b/asm/nonmatchings/battle/area_kpa2/69F320/func_8021ABD8_6A1DD8.s index a0224b6766..5a02c570ee 100644 --- a/asm/nonmatchings/battle/area_kpa2/69F320/func_8021ABD8_6A1DD8.s +++ b/asm/nonmatchings/battle/area_kpa2/69F320/func_8021ABD8_6A1DD8.s @@ -30,20 +30,20 @@ glabel func_8021ABD8_6A1DD8 /* 6A1E3C 8021AC3C 8E050000 */ lw $a1, ($s0) /* 6A1E40 8021AC40 26100004 */ addiu $s0, $s0, 4 /* 6A1E44 8021AC44 4482D000 */ mtc1 $v0, $f26 -/* 6A1E48 8021AC48 00000000 */ nop +/* 6A1E48 8021AC48 00000000 */ nop /* 6A1E4C 8021AC4C 4680D6A0 */ cvt.s.w $f26, $f26 /* 6A1E50 8021AC50 0C0B1EAF */ jal get_variable /* 6A1E54 8021AC54 0220202D */ daddu $a0, $s1, $zero /* 6A1E58 8021AC58 8E050000 */ lw $a1, ($s0) /* 6A1E5C 8021AC5C 26100004 */ addiu $s0, $s0, 4 /* 6A1E60 8021AC60 4482C000 */ mtc1 $v0, $f24 -/* 6A1E64 8021AC64 00000000 */ nop +/* 6A1E64 8021AC64 00000000 */ nop /* 6A1E68 8021AC68 4680C620 */ cvt.s.w $f24, $f24 /* 6A1E6C 8021AC6C 0C0B1EAF */ jal get_variable /* 6A1E70 8021AC70 0220202D */ daddu $a0, $s1, $zero /* 6A1E74 8021AC74 8E050000 */ lw $a1, ($s0) /* 6A1E78 8021AC78 4482B000 */ mtc1 $v0, $f22 -/* 6A1E7C 8021AC7C 00000000 */ nop +/* 6A1E7C 8021AC7C 00000000 */ nop /* 6A1E80 8021AC80 4680B5A0 */ cvt.s.w $f22, $f22 /* 6A1E84 8021AC84 0C0B210B */ jal get_float_variable /* 6A1E88 8021AC88 0220202D */ daddu $a0, $s1, $zero @@ -55,7 +55,7 @@ glabel func_8021ABD8_6A1DD8 /* 6A1EA0 8021ACA0 D42247C0 */ ldc1 $f2, %lo(D_802347C0)($at) /* 6A1EA4 8021ACA4 4600A021 */ cvt.d.s $f0, $f20 /* 6A1EA8 8021ACA8 46220002 */ mul.d $f0, $f0, $f2 -/* 6A1EAC 8021ACAC 00000000 */ nop +/* 6A1EAC 8021ACAC 00000000 */ nop /* 6A1EB0 8021ACB0 46200520 */ cvt.s.d $f20, $f0 .L8021ACB4: /* 6A1EB4 8021ACB4 0C00AB39 */ jal heap_malloc @@ -130,7 +130,7 @@ glabel func_8021ABD8_6A1DD8 .L8021ADB8: /* 6A1FB8 8021ADB8 82830210 */ lb $v1, 0x210($s4) /* 6A1FBC 8021ADBC 10620021 */ beq $v1, $v0, .L8021AE44 -/* 6A1FC0 8021ADC0 00000000 */ nop +/* 6A1FC0 8021ADC0 00000000 */ nop /* 6A1FC4 8021ADC4 C602FFD8 */ lwc1 $f2, -0x28($s0) /* 6A1FC8 8021ADC8 3C01404E */ lui $at, 0x404e /* 6A1FCC 8021ADCC 44810800 */ mtc1 $at, $f1 @@ -152,7 +152,7 @@ glabel func_8021ABD8_6A1DD8 /* 6A200C 8021AE0C 3C01405E */ lui $at, 0x405e /* 6A2010 8021AE10 44810800 */ mtc1 $at, $f1 /* 6A2014 8021AE14 44800000 */ mtc1 $zero, $f0 -/* 6A2018 8021AE18 00000000 */ nop +/* 6A2018 8021AE18 00000000 */ nop /* 6A201C 8021AE1C 4620103C */ c.lt.d $f2, $f0 /* 6A2020 8021AE20 3C018023 */ lui $at, %hi(D_802347D8) /* 6A2024 8021AE24 D42047D8 */ ldc1 $f0, %lo(D_802347D8)($at) @@ -177,7 +177,7 @@ glabel func_8021ABD8_6A1DD8 /* 6A206C 8021AE6C 3C014042 */ lui $at, 0x4042 /* 6A2070 8021AE70 44810800 */ mtc1 $at, $f1 /* 6A2074 8021AE74 44800000 */ mtc1 $zero, $f0 -/* 6A2078 8021AE78 00000000 */ nop +/* 6A2078 8021AE78 00000000 */ nop /* 6A207C 8021AE7C 4620103C */ c.lt.d $f2, $f0 /* 6A2080 8021AE80 3C018023 */ lui $at, %hi(D_802347E8) /* 6A2084 8021AE84 D42047E8 */ ldc1 $f0, %lo(D_802347E8)($at) @@ -186,7 +186,7 @@ glabel func_8021ABD8_6A1DD8 /* 6A2090 8021AE90 3C014048 */ lui $at, 0x4048 /* 6A2094 8021AE94 44810800 */ mtc1 $at, $f1 /* 6A2098 8021AE98 44800000 */ mtc1 $zero, $f0 -/* 6A209C 8021AE9C 00000000 */ nop +/* 6A209C 8021AE9C 00000000 */ nop /* 6A20A0 8021AEA0 4620103C */ c.lt.d $f2, $f0 /* 6A20A4 8021AEA4 3C018023 */ lui $at, %hi(D_802347F0) /* 6A20A8 8021AEA8 D42047F0 */ ldc1 $f0, %lo(D_802347F0)($at) @@ -264,7 +264,7 @@ glabel func_8021ABD8_6A1DD8 /* 6A21B8 8021AFB8 AE02FFE8 */ sw $v0, -0x18($s0) /* 6A21BC 8021AFBC 8E240000 */ lw $a0, ($s1) /* 6A21C0 8021AFC0 0C016914 */ jal remove_effect -/* 6A21C4 8021AFC4 00000000 */ nop +/* 6A21C4 8021AFC4 00000000 */ nop /* 6A21C8 8021AFC8 24020001 */ addiu $v0, $zero, 1 /* 6A21CC 8021AFCC AE020000 */ sw $v0, ($s0) .L8021AFD0: diff --git a/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B08C_6A228C.s b/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B08C_6A228C.s index 6b988153ae..304bda5f77 100644 --- a/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B08C_6A228C.s +++ b/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B08C_6A228C.s @@ -21,7 +21,7 @@ glabel func_8021B08C_6A228C /* 6A22C8 8021B0C8 14410004 */ bne $v0, $at, .L8021B0DC /* 6A22CC 8021B0CC 3C018000 */ lui $at, 0x8000 /* 6A22D0 8021B0D0 14C10002 */ bne $a2, $at, .L8021B0DC -/* 6A22D4 8021B0D4 00000000 */ nop +/* 6A22D4 8021B0D4 00000000 */ nop /* 6A22D8 8021B0D8 0006000D */ break 6 .L8021B0DC: /* 6A22DC 8021B0DC 00003012 */ mflo $a2 diff --git a/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B0FC_6A22FC.s b/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B0FC_6A22FC.s index a8506ae1d7..4580b10b21 100644 --- a/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B0FC_6A22FC.s +++ b/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B0FC_6A22FC.s @@ -62,12 +62,12 @@ glabel func_8021B0FC_6A22FC /* 6A23E0 8021B1E0 C626001C */ lwc1 $f6, 0x1c($s1) /* 6A23E4 8021B1E4 468031A0 */ cvt.s.w $f6, $f6 /* 6A23E8 8021B1E8 46062102 */ mul.s $f4, $f4, $f6 -/* 6A23EC 8021B1EC 00000000 */ nop +/* 6A23EC 8021B1EC 00000000 */ nop /* 6A23F0 8021B1F0 3C013F00 */ lui $at, 0x3f00 /* 6A23F4 8021B1F4 44811000 */ mtc1 $at, $f2 -/* 6A23F8 8021B1F8 00000000 */ nop +/* 6A23F8 8021B1F8 00000000 */ nop /* 6A23FC 8021B1FC 46022102 */ mul.s $f4, $f4, $f2 -/* 6A2400 8021B200 00000000 */ nop +/* 6A2400 8021B200 00000000 */ nop /* 6A2404 8021B204 E620000C */ swc1 $f0, 0xc($s1) /* 6A2408 8021B208 C6200004 */ lwc1 $f0, 4($s1) /* 6A240C 8021B20C C602000C */ lwc1 $f2, 0xc($s0) @@ -84,7 +84,7 @@ glabel func_8021B0FC_6A22FC /* 6A2434 8021B234 8E240020 */ lw $a0, 0x20($s1) /* 6A2438 8021B238 0040802D */ daddu $s0, $v0, $zero /* 6A243C 8021B23C 16000005 */ bnez $s0, .L8021B254 -/* 6A2440 8021B240 00000000 */ nop +/* 6A2440 8021B240 00000000 */ nop /* 6A2444 8021B244 0C00AB4B */ jal heap_free /* 6A2448 8021B248 8E440070 */ lw $a0, 0x70($s2) /* 6A244C 8021B24C 08086CBE */ j .L8021B2F8 @@ -92,10 +92,10 @@ glabel func_8021B0FC_6A22FC .L8021B254: /* 6A2454 8021B254 C62C000C */ lwc1 $f12, 0xc($s1) /* 6A2458 8021B258 0C00A8BB */ jal sin_deg -/* 6A245C 8021B25C 00000000 */ nop +/* 6A245C 8021B25C 00000000 */ nop /* 6A2460 8021B260 C6220014 */ lwc1 $f2, 0x14($s1) /* 6A2464 8021B264 46001082 */ mul.s $f2, $f2, $f0 -/* 6A2468 8021B268 00000000 */ nop +/* 6A2468 8021B268 00000000 */ nop /* 6A246C 8021B26C C6000008 */ lwc1 $f0, 8($s0) /* 6A2470 8021B270 46020000 */ add.s $f0, $f0, $f2 /* 6A2474 8021B274 E6000008 */ swc1 $f0, 8($s0) @@ -103,7 +103,7 @@ glabel func_8021B0FC_6A22FC /* 6A247C 8021B27C C62C000C */ lwc1 $f12, 0xc($s1) /* 6A2480 8021B280 C6220014 */ lwc1 $f2, 0x14($s1) /* 6A2484 8021B284 46001082 */ mul.s $f2, $f2, $f0 -/* 6A2488 8021B288 00000000 */ nop +/* 6A2488 8021B288 00000000 */ nop /* 6A248C 8021B28C C6000010 */ lwc1 $f0, 0x10($s0) /* 6A2490 8021B290 46020001 */ sub.s $f0, $f0, $f2 /* 6A2494 8021B294 E6000010 */ swc1 $f0, 0x10($s0) diff --git a/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B3B4_6A25B4.s b/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B3B4_6A25B4.s index d24c5526cf..28b19bace8 100644 --- a/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B3B4_6A25B4.s +++ b/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B3B4_6A25B4.s @@ -56,12 +56,12 @@ glabel func_8021B3B4_6A25B4 /* 6A2674 8021B474 50600007 */ beql $v1, $zero, .L8021B494 /* 6A2678 8021B478 A25000AE */ sb $s0, 0xae($s2) /* 6A267C 8021B47C 08086D52 */ j .L8021B548 -/* 6A2680 8021B480 00000000 */ nop +/* 6A2680 8021B480 00000000 */ nop .L8021B484: /* 6A2684 8021B484 50620026 */ beql $v1, $v0, .L8021B520 /* 6A2688 8021B488 A25000B0 */ sb $s0, 0xb0($s2) /* 6A268C 8021B48C 08086D52 */ j .L8021B548 -/* 6A2690 8021B490 00000000 */ nop +/* 6A2690 8021B490 00000000 */ nop .L8021B494: /* 6A2694 8021B494 8E250000 */ lw $a1, ($s1) /* 6A2698 8021B498 82820001 */ lb $v0, 1($s4) @@ -110,7 +110,7 @@ glabel func_8021B3B4_6A25B4 /* 6A273C 8021B53C 2406004F */ addiu $a2, $zero, 0x4f .L8021B540: /* 6A2740 8021B540 0C0B2026 */ jal set_variable -/* 6A2744 8021B544 00000000 */ nop +/* 6A2744 8021B544 00000000 */ nop .L8021B548: /* 6A2748 8021B548 8FBF0038 */ lw $ra, 0x38($sp) /* 6A274C 8021B54C 8FB50034 */ lw $s5, 0x34($sp) diff --git a/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B570_6A2770.s b/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B570_6A2770.s index ea44078fea..a73b25224c 100644 --- a/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B570_6A2770.s +++ b/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B570_6A2770.s @@ -22,10 +22,10 @@ glabel func_8021B570_6A2770 /* 6A27B4 8021B5B4 0240202D */ daddu $a0, $s2, $zero /* 6A27B8 8021B5B8 822200AF */ lb $v0, 0xaf($s1) /* 6A27BC 8021B5BC 10430004 */ beq $v0, $v1, .L8021B5D0 -/* 6A27C0 8021B5C0 00000000 */ nop +/* 6A27C0 8021B5C0 00000000 */ nop /* 6A27C4 8021B5C4 822200B0 */ lb $v0, 0xb0($s1) /* 6A27C8 8021B5C8 14430005 */ bne $v0, $v1, .L8021B5E0 -/* 6A27CC 8021B5CC 00000000 */ nop +/* 6A27CC 8021B5CC 00000000 */ nop .L8021B5D0: /* 6A27D0 8021B5D0 8E050000 */ lw $a1, ($s0) /* 6A27D4 8021B5D4 08086D7A */ j .L8021B5E8 @@ -37,7 +37,7 @@ glabel func_8021B570_6A2770 /* 6A27E4 8021B5E4 2406FFFF */ addiu $a2, $zero, -1 .L8021B5E8: /* 6A27E8 8021B5E8 0C0B2026 */ jal set_variable -/* 6A27EC 8021B5EC 00000000 */ nop +/* 6A27EC 8021B5EC 00000000 */ nop /* 6A27F0 8021B5F0 24020002 */ addiu $v0, $zero, 2 /* 6A27F4 8021B5F4 8FBF001C */ lw $ra, 0x1c($sp) /* 6A27F8 8021B5F8 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B60C_6A280C.s b/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B60C_6A280C.s index 862d09a9dc..4b224747b4 100644 --- a/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B60C_6A280C.s +++ b/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B60C_6A280C.s @@ -11,19 +11,19 @@ glabel func_8021B60C_6A280C /* 6A2824 8021B624 3C013D23 */ lui $at, 0x3d23 /* 6A2828 8021B628 3421D70A */ ori $at, $at, 0xd70a /* 6A282C 8021B62C 44810000 */ mtc1 $at, $f0 -/* 6A2830 8021B630 00000000 */ nop +/* 6A2830 8021B630 00000000 */ nop /* 6A2834 8021B634 E4600038 */ swc1 $f0, 0x38($v1) /* 6A2838 8021B638 E4600030 */ swc1 $f0, 0x30($v1) /* 6A283C 8021B63C 8C43000C */ lw $v1, 0xc($v0) /* 6A2840 8021B640 3C013FF0 */ lui $at, 0x3ff0 /* 6A2844 8021B644 44810000 */ mtc1 $at, $f0 -/* 6A2848 8021B648 00000000 */ nop +/* 6A2848 8021B648 00000000 */ nop /* 6A284C 8021B64C E4600034 */ swc1 $f0, 0x34($v1) /* 6A2850 8021B650 8C43000C */ lw $v1, 0xc($v0) /* 6A2854 8021B654 3C013D4C */ lui $at, 0x3d4c /* 6A2858 8021B658 3421CCCD */ ori $at, $at, 0xcccd /* 6A285C 8021B65C 44810000 */ mtc1 $at, $f0 -/* 6A2860 8021B660 00000000 */ nop +/* 6A2860 8021B660 00000000 */ nop /* 6A2864 8021B664 E460003C */ swc1 $f0, 0x3c($v1) /* 6A2868 8021B668 8FBF0010 */ lw $ra, 0x10($sp) /* 6A286C 8021B66C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B678_6A2878.s b/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B678_6A2878.s index e5459f5387..ce55ccd2bd 100644 --- a/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B678_6A2878.s +++ b/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B678_6A2878.s @@ -50,12 +50,12 @@ glabel func_8021B678_6A2878 /* 6A292C 8021B72C 26300018 */ addiu $s0, $s1, 0x18 /* 6A2930 8021B730 8E650000 */ lw $a1, ($s3) /* 6A2934 8021B734 4482B000 */ mtc1 $v0, $f22 -/* 6A2938 8021B738 00000000 */ nop +/* 6A2938 8021B738 00000000 */ nop /* 6A293C 8021B73C 4680B5A0 */ cvt.s.w $f22, $f22 /* 6A2940 8021B740 0C0B1EAF */ jal get_variable /* 6A2944 8021B744 02A0202D */ daddu $a0, $s5, $zero /* 6A2948 8021B748 4482A000 */ mtc1 $v0, $f20 -/* 6A294C 8021B74C 00000000 */ nop +/* 6A294C 8021B74C 00000000 */ nop /* 6A2950 8021B750 4680A520 */ cvt.s.w $f20, $f20 .L8021B754: /* 6A2954 8021B754 24040002 */ addiu $a0, $zero, 2 @@ -70,12 +70,12 @@ glabel func_8021B678_6A2878 /* 6A2978 8021B778 0C01C6F4 */ jal func_80071BD0 /* 6A297C 8021B77C AFB70020 */ sw $s7, 0x20($sp) /* 6A2980 8021B780 449E0000 */ mtc1 $fp, $f0 -/* 6A2984 8021B784 00000000 */ nop +/* 6A2984 8021B784 00000000 */ nop /* 6A2988 8021B788 46800020 */ cvt.s.w $f0, $f0 /* 6A298C 8021B78C AE220000 */ sw $v0, ($s1) /* 6A2990 8021B790 E600FFF0 */ swc1 $f0, -0x10($s0) /* 6A2994 8021B794 44940000 */ mtc1 $s4, $f0 -/* 6A2998 8021B798 00000000 */ nop +/* 6A2998 8021B798 00000000 */ nop /* 6A299C 8021B79C 46800020 */ cvt.s.w $f0, $f0 /* 6A29A0 8021B7A0 AE160004 */ sw $s6, 4($s0) /* 6A29A4 8021B7A4 E616FFEC */ swc1 $f22, -0x14($s0) @@ -102,7 +102,7 @@ glabel func_8021B678_6A2878 /* 6A29F0 8021B7F0 C60CFFF8 */ lwc1 $f12, -8($s0) /* 6A29F4 8021B7F4 C602FFF4 */ lwc1 $f2, -0xc($s0) /* 6A29F8 8021B7F8 46020002 */ mul.s $f0, $f0, $f2 -/* 6A29FC 8021B7FC 00000000 */ nop +/* 6A29FC 8021B7FC 00000000 */ nop /* 6A2A00 8021B800 C614FFE8 */ lwc1 $f20, -0x18($s0) /* 6A2A04 8021B804 C60CFFF8 */ lwc1 $f12, -8($s0) /* 6A2A08 8021B808 0C00A8BB */ jal sin_deg @@ -117,7 +117,7 @@ glabel func_8021B678_6A2878 /* 6A2A2C 8021B82C E4540010 */ swc1 $f20, 0x10($v0) /* 6A2A30 8021B830 8E220000 */ lw $v0, ($s1) /* 6A2A34 8021B834 46040002 */ mul.s $f0, $f0, $f4 -/* 6A2A38 8021B838 00000000 */ nop +/* 6A2A38 8021B838 00000000 */ nop /* 6A2A3C 8021B83C 8C42000C */ lw $v0, 0xc($v0) /* 6A2A40 8021B840 E454001C */ swc1 $f20, 0x1c($v0) /* 6A2A44 8021B844 8E220000 */ lw $v0, ($s1) @@ -133,7 +133,7 @@ glabel func_8021B678_6A2878 /* 6A2A6C 8021B86C 8E020000 */ lw $v0, ($s0) /* 6A2A70 8021B870 2842000B */ slti $v0, $v0, 0xb /* 6A2A74 8021B874 14400006 */ bnez $v0, .L8021B890 -/* 6A2A78 8021B878 00000000 */ nop +/* 6A2A78 8021B878 00000000 */ nop /* 6A2A7C 8021B87C C600FFF4 */ lwc1 $f0, -0xc($s0) /* 6A2A80 8021B880 46000021 */ cvt.d.s $f0, $f0 /* 6A2A84 8021B884 46360000 */ add.d $f0, $f0, $f22 @@ -188,5 +188,5 @@ glabel func_8021B678_6A2878 /* 6A2B3C 8021B93C D7B40050 */ ldc1 $f20, 0x50($sp) /* 6A2B40 8021B940 03E00008 */ jr $ra /* 6A2B44 8021B944 27BD0078 */ addiu $sp, $sp, 0x78 -/* 6A2B48 8021B948 00000000 */ nop -/* 6A2B4C 8021B94C 00000000 */ nop +/* 6A2B48 8021B948 00000000 */ nop +/* 6A2B4C 8021B94C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021B9A8_6A2BA8.s b/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021B9A8_6A2BA8.s index 6b8ec22a19..6c827c0e0e 100644 --- a/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021B9A8_6A2BA8.s +++ b/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021B9A8_6A2BA8.s @@ -62,11 +62,11 @@ glabel func_8021B9A8_6A2BA8 /* 6A2C8C 8021BA8C 46000606 */ mov.s $f24, $f0 /* 6A2C90 8021BA90 3C014210 */ lui $at, 0x4210 /* 6A2C94 8021BA94 44811000 */ mtc1 $at, $f2 -/* 6A2C98 8021BA98 00000000 */ nop +/* 6A2C98 8021BA98 00000000 */ nop /* 6A2C9C 8021BA9C 4602C082 */ mul.s $f2, $f24, $f2 -/* 6A2CA0 8021BAA0 00000000 */ nop +/* 6A2CA0 8021BAA0 00000000 */ nop /* 6A2CA4 8021BAA4 44950000 */ mtc1 $s5, $f0 -/* 6A2CA8 8021BAA8 00000000 */ nop +/* 6A2CA8 8021BAA8 00000000 */ nop /* 6A2CAC 8021BAAC 46800020 */ cvt.s.w $f0, $f0 /* 6A2CB0 8021BAB0 46020000 */ add.s $f0, $f0, $f2 /* 6A2CB4 8021BAB4 4600010D */ trunc.w.s $f4, $f0 @@ -78,9 +78,9 @@ glabel func_8021B9A8_6A2BA8 /* 6A2CC8 8021BAC8 D4204828 */ ldc1 $f0, %lo(D_80234828)($at) /* 6A2CCC 8021BACC 4600C0A1 */ cvt.d.s $f2, $f24 /* 6A2CD0 8021BAD0 46201082 */ mul.d $f2, $f2, $f0 -/* 6A2CD4 8021BAD4 00000000 */ nop +/* 6A2CD4 8021BAD4 00000000 */ nop /* 6A2CD8 8021BAD8 44950000 */ mtc1 $s5, $f0 -/* 6A2CDC 8021BADC 00000000 */ nop +/* 6A2CDC 8021BADC 00000000 */ nop /* 6A2CE0 8021BAE0 46800021 */ cvt.d.w $f0, $f0 /* 6A2CE4 8021BAE4 46220000 */ add.d $f0, $f0, $f2 /* 6A2CE8 8021BAE8 4620010D */ trunc.w.d $f4, $f0 @@ -98,14 +98,14 @@ glabel func_8021B9A8_6A2BA8 /* 6A2D10 8021BB10 00621821 */ addu $v1, $v1, $v0 /* 6A2D14 8021BB14 2463FFF1 */ addiu $v1, $v1, -0xf /* 6A2D18 8021BB18 4483A000 */ mtc1 $v1, $f20 -/* 6A2D1C 8021BB1C 00000000 */ nop +/* 6A2D1C 8021BB1C 00000000 */ nop /* 6A2D20 8021BB20 4680A520 */ cvt.s.w $f20, $f20 /* 6A2D24 8021BB24 0C00A8BB */ jal sin_deg /* 6A2D28 8021BB28 4600A306 */ mov.s $f12, $f20 /* 6A2D2C 8021BB2C 461A0002 */ mul.s $f0, $f0, $f26 -/* 6A2D30 8021BB30 00000000 */ nop +/* 6A2D30 8021BB30 00000000 */ nop /* 6A2D34 8021BB34 449EB000 */ mtc1 $fp, $f22 -/* 6A2D38 8021BB38 00000000 */ nop +/* 6A2D38 8021BB38 00000000 */ nop /* 6A2D3C 8021BB3C 4680B5A0 */ cvt.s.w $f22, $f22 /* 6A2D40 8021BB40 46160000 */ add.s $f0, $f0, $f22 /* 6A2D44 8021BB44 4600010D */ trunc.w.s $f4, $f0 @@ -114,17 +114,17 @@ glabel func_8021B9A8_6A2BA8 /* 6A2D50 8021BB50 4600A306 */ mov.s $f12, $f20 /* 6A2D54 8021BB54 24040001 */ addiu $a0, $zero, 1 /* 6A2D58 8021BB58 44901000 */ mtc1 $s0, $f2 -/* 6A2D5C 8021BB5C 00000000 */ nop +/* 6A2D5C 8021BB5C 00000000 */ nop /* 6A2D60 8021BB60 468010A0 */ cvt.s.w $f2, $f2 /* 6A2D64 8021BB64 E7A20010 */ swc1 $f2, 0x10($sp) /* 6A2D68 8021BB68 44971000 */ mtc1 $s7, $f2 -/* 6A2D6C 8021BB6C 00000000 */ nop +/* 6A2D6C 8021BB6C 00000000 */ nop /* 6A2D70 8021BB70 468010A0 */ cvt.s.w $f2, $f2 /* 6A2D74 8021BB74 461A0002 */ mul.s $f0, $f0, $f26 -/* 6A2D78 8021BB78 00000000 */ nop +/* 6A2D78 8021BB78 00000000 */ nop /* 6A2D7C 8021BB7C E7A20018 */ swc1 $f2, 0x18($sp) /* 6A2D80 8021BB80 44951000 */ mtc1 $s5, $f2 -/* 6A2D84 8021BB84 00000000 */ nop +/* 6A2D84 8021BB84 00000000 */ nop /* 6A2D88 8021BB88 468010A0 */ cvt.s.w $f2, $f2 /* 6A2D8C 8021BB8C 2402000B */ addiu $v0, $zero, 0xb /* 6A2D90 8021BB90 4405B000 */ mfc1 $a1, $f22 @@ -135,11 +135,11 @@ glabel func_8021B9A8_6A2BA8 /* 6A2DA4 8021BBA4 4600010D */ trunc.w.s $f4, $f0 /* 6A2DA8 8021BBA8 44022000 */ mfc1 $v0, $f4 /* 6A2DAC 8021BBAC 44962000 */ mtc1 $s6, $f4 -/* 6A2DB0 8021BBB0 00000000 */ nop +/* 6A2DB0 8021BBB0 00000000 */ nop /* 6A2DB4 8021BBB4 46802120 */ cvt.s.w $f4, $f4 /* 6A2DB8 8021BBB8 44072000 */ mfc1 $a3, $f4 /* 6A2DBC 8021BBBC 44820000 */ mtc1 $v0, $f0 -/* 6A2DC0 8021BBC0 00000000 */ nop +/* 6A2DC0 8021BBC0 00000000 */ nop /* 6A2DC4 8021BBC4 46800020 */ cvt.s.w $f0, $f0 /* 6A2DC8 8021BBC8 0C01C6F4 */ jal func_80071BD0 /* 6A2DCC 8021BBCC E7A00014 */ swc1 $f0, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021BC60_6A2E60.s b/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021BC60_6A2E60.s index df1ebdbb17..4b6c23edce 100644 --- a/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021BC60_6A2E60.s +++ b/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021BC60_6A2E60.s @@ -91,10 +91,10 @@ glabel func_8021BC60_6A2E60 /* 6A2FA4 8021BDA4 46000021 */ cvt.d.s $f0, $f0 /* 6A2FA8 8021BDA8 46380000 */ add.d $f0, $f0, $f24 /* 6A2FAC 8021BDAC 46360002 */ mul.d $f0, $f0, $f22 -/* 6A2FB0 8021BDB0 00000000 */ nop +/* 6A2FB0 8021BDB0 00000000 */ nop /* 6A2FB4 8021BDB4 27A20020 */ addiu $v0, $sp, 0x20 /* 6A2FB8 8021BDB8 4620A03E */ c.le.d $f20, $f0 -/* 6A2FBC 8021BDBC 00000000 */ nop +/* 6A2FBC 8021BDBC 00000000 */ nop /* 6A2FC0 8021BDC0 45010005 */ bc1t .L8021BDD8 /* 6A2FC4 8021BDC4 00511021 */ addu $v0, $v0, $s1 /* 6A2FC8 8021BDC8 4620008D */ trunc.w.d $f2, $f0 @@ -105,7 +105,7 @@ glabel func_8021BC60_6A2E60 /* 6A2FD8 8021BDD8 46340001 */ sub.d $f0, $f0, $f20 /* 6A2FDC 8021BDDC 4620008D */ trunc.w.d $f2, $f0 /* 6A2FE0 8021BDE0 44031000 */ mfc1 $v1, $f2 -/* 6A2FE4 8021BDE4 00000000 */ nop +/* 6A2FE4 8021BDE4 00000000 */ nop /* 6A2FE8 8021BDE8 00721825 */ or $v1, $v1, $s2 /* 6A2FEC 8021BDEC A0430000 */ sb $v1, ($v0) .L8021BDF0: @@ -118,10 +118,10 @@ glabel func_8021BC60_6A2E60 /* 6A3008 8021BE08 46000021 */ cvt.d.s $f0, $f0 /* 6A300C 8021BE0C 46380000 */ add.d $f0, $f0, $f24 /* 6A3010 8021BE10 46360002 */ mul.d $f0, $f0, $f22 -/* 6A3014 8021BE14 00000000 */ nop +/* 6A3014 8021BE14 00000000 */ nop /* 6A3018 8021BE18 27A20038 */ addiu $v0, $sp, 0x38 /* 6A301C 8021BE1C 4620A03E */ c.le.d $f20, $f0 -/* 6A3020 8021BE20 00000000 */ nop +/* 6A3020 8021BE20 00000000 */ nop /* 6A3024 8021BE24 45010005 */ bc1t .L8021BE3C /* 6A3028 8021BE28 00511021 */ addu $v0, $v0, $s1 /* 6A302C 8021BE2C 4620008D */ trunc.w.d $f2, $f0 @@ -132,7 +132,7 @@ glabel func_8021BC60_6A2E60 /* 6A303C 8021BE3C 46340001 */ sub.d $f0, $f0, $f20 /* 6A3040 8021BE40 4620008D */ trunc.w.d $f2, $f0 /* 6A3044 8021BE44 44031000 */ mfc1 $v1, $f2 -/* 6A3048 8021BE48 00000000 */ nop +/* 6A3048 8021BE48 00000000 */ nop /* 6A304C 8021BE4C 00721825 */ or $v1, $v1, $s2 /* 6A3050 8021BE50 A0430000 */ sb $v1, ($v0) .L8021BE54: @@ -145,10 +145,10 @@ glabel func_8021BC60_6A2E60 /* 6A306C 8021BE6C 46000021 */ cvt.d.s $f0, $f0 /* 6A3070 8021BE70 46380000 */ add.d $f0, $f0, $f24 /* 6A3074 8021BE74 46360002 */ mul.d $f0, $f0, $f22 -/* 6A3078 8021BE78 00000000 */ nop +/* 6A3078 8021BE78 00000000 */ nop /* 6A307C 8021BE7C 27A20050 */ addiu $v0, $sp, 0x50 /* 6A3080 8021BE80 4620A03E */ c.le.d $f20, $f0 -/* 6A3084 8021BE84 00000000 */ nop +/* 6A3084 8021BE84 00000000 */ nop /* 6A3088 8021BE88 45010005 */ bc1t .L8021BEA0 /* 6A308C 8021BE8C 00511021 */ addu $v0, $v0, $s1 /* 6A3090 8021BE90 4620008D */ trunc.w.d $f2, $f0 @@ -159,7 +159,7 @@ glabel func_8021BC60_6A2E60 /* 6A30A0 8021BEA0 46340001 */ sub.d $f0, $f0, $f20 /* 6A30A4 8021BEA4 4620008D */ trunc.w.d $f2, $f0 /* 6A30A8 8021BEA8 44031000 */ mfc1 $v1, $f2 -/* 6A30AC 8021BEAC 00000000 */ nop +/* 6A30AC 8021BEAC 00000000 */ nop /* 6A30B0 8021BEB0 00721825 */ or $v1, $v1, $s2 /* 6A30B4 8021BEB4 A0430000 */ sb $v1, ($v0) .L8021BEB8: diff --git a/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C14C_6A334C.s b/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C14C_6A334C.s index a2e40cfd35..93f6de61fa 100644 --- a/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C14C_6A334C.s +++ b/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C14C_6A334C.s @@ -31,21 +31,21 @@ glabel func_8021C14C_6A334C /* 6A33B4 8021C1B4 8E050000 */ lw $a1, ($s0) /* 6A33B8 8021C1B8 26100004 */ addiu $s0, $s0, 4 /* 6A33BC 8021C1BC 4482E000 */ mtc1 $v0, $f28 -/* 6A33C0 8021C1C0 00000000 */ nop +/* 6A33C0 8021C1C0 00000000 */ nop /* 6A33C4 8021C1C4 4680E720 */ cvt.s.w $f28, $f28 /* 6A33C8 8021C1C8 0C0B1EAF */ jal get_variable /* 6A33CC 8021C1CC 0220202D */ daddu $a0, $s1, $zero /* 6A33D0 8021C1D0 8E050000 */ lw $a1, ($s0) /* 6A33D4 8021C1D4 26100004 */ addiu $s0, $s0, 4 /* 6A33D8 8021C1D8 4482D000 */ mtc1 $v0, $f26 -/* 6A33DC 8021C1DC 00000000 */ nop +/* 6A33DC 8021C1DC 00000000 */ nop /* 6A33E0 8021C1E0 4680D6A0 */ cvt.s.w $f26, $f26 /* 6A33E4 8021C1E4 0C0B1EAF */ jal get_variable /* 6A33E8 8021C1E8 0220202D */ daddu $a0, $s1, $zero /* 6A33EC 8021C1EC 8E050000 */ lw $a1, ($s0) /* 6A33F0 8021C1F0 26100004 */ addiu $s0, $s0, 4 /* 6A33F4 8021C1F4 4482C000 */ mtc1 $v0, $f24 -/* 6A33F8 8021C1F8 00000000 */ nop +/* 6A33F8 8021C1F8 00000000 */ nop /* 6A33FC 8021C1FC 4680C620 */ cvt.s.w $f24, $f24 /* 6A3400 8021C200 0C0B210B */ jal get_float_variable /* 6A3404 8021C204 0220202D */ daddu $a0, $s1, $zero @@ -130,7 +130,7 @@ glabel func_8021C14C_6A334C .L8021C334: /* 6A3534 8021C334 8E020010 */ lw $v0, 0x10($s0) /* 6A3538 8021C338 10400003 */ beqz $v0, .L8021C348 -/* 6A353C 8021C33C 00000000 */ nop +/* 6A353C 8021C33C 00000000 */ nop /* 6A3540 8021C340 08087130 */ j .L8021C4C0 /* 6A3544 8021C344 26940001 */ addiu $s4, $s4, 1 .L8021C348: @@ -141,7 +141,7 @@ glabel func_8021C14C_6A334C /* 6A3558 8021C358 468010A0 */ cvt.s.w $f2, $f2 /* 6A355C 8021C35C 46000005 */ abs.s $f0, $f0 /* 6A3560 8021C360 46020002 */ mul.s $f0, $f0, $f2 -/* 6A3564 8021C364 00000000 */ nop +/* 6A3564 8021C364 00000000 */ nop /* 6A3568 8021C368 C606000C */ lwc1 $f6, 0xc($s0) /* 6A356C 8021C36C 3C014110 */ lui $at, 0x4110 /* 6A3570 8021C370 44811000 */ mtc1 $at, $f2 @@ -159,25 +159,25 @@ glabel func_8021C14C_6A334C /* 6A35A0 8021C3A0 00621021 */ addu $v0, $v1, $v0 /* 6A35A4 8021C3A4 00021043 */ sra $v0, $v0, 1 /* 6A35A8 8021C3A8 44821000 */ mtc1 $v0, $f2 -/* 6A35AC 8021C3AC 00000000 */ nop +/* 6A35AC 8021C3AC 00000000 */ nop /* 6A35B0 8021C3B0 468010A0 */ cvt.s.w $f2, $f2 /* 6A35B4 8021C3B4 0060102D */ daddu $v0, $v1, $zero /* 6A35B8 8021C3B8 46181082 */ mul.s $f2, $f2, $f24 -/* 6A35BC 8021C3BC 00000000 */ nop +/* 6A35BC 8021C3BC 00000000 */ nop /* 6A35C0 8021C3C0 00021FC2 */ srl $v1, $v0, 0x1f /* 6A35C4 8021C3C4 00431021 */ addu $v0, $v0, $v1 /* 6A35C8 8021C3C8 00021043 */ sra $v0, $v0, 1 /* 6A35CC 8021C3CC 44820000 */ mtc1 $v0, $f0 -/* 6A35D0 8021C3D0 00000000 */ nop +/* 6A35D0 8021C3D0 00000000 */ nop /* 6A35D4 8021C3D4 46800020 */ cvt.s.w $f0, $f0 /* 6A35D8 8021C3D8 46180002 */ mul.s $f0, $f0, $f24 -/* 6A35DC 8021C3DC 00000000 */ nop +/* 6A35DC 8021C3DC 00000000 */ nop /* 6A35E0 8021C3E0 46161080 */ add.s $f2, $f2, $f22 /* 6A35E4 8021C3E4 46141082 */ mul.s $f2, $f2, $f20 -/* 6A35E8 8021C3E8 00000000 */ nop +/* 6A35E8 8021C3E8 00000000 */ nop /* 6A35EC 8021C3EC 46160000 */ add.s $f0, $f0, $f22 /* 6A35F0 8021C3F0 46140002 */ mul.s $f0, $f0, $f20 -/* 6A35F4 8021C3F4 00000000 */ nop +/* 6A35F4 8021C3F4 00000000 */ nop /* 6A35F8 8021C3F8 4600128D */ trunc.w.s $f10, $f2 /* 6A35FC 8021C3FC E60AFFFC */ swc1 $f10, -4($s0) /* 6A3600 8021C400 4600028D */ trunc.w.s $f10, $f0 @@ -189,7 +189,7 @@ glabel func_8021C14C_6A334C /* 6A3614 8021C414 AE02FFF8 */ sw $v0, -8($s0) /* 6A3618 8021C418 8E240000 */ lw $a0, ($s1) /* 6A361C 8021C41C 0C016914 */ jal remove_effect -/* 6A3620 8021C420 00000000 */ nop +/* 6A3620 8021C420 00000000 */ nop /* 6A3624 8021C424 24020001 */ addiu $v0, $zero, 1 /* 6A3628 8021C428 08087130 */ j .L8021C4C0 /* 6A362C 8021C42C AE020010 */ sw $v0, 0x10($s0) diff --git a/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C520_6A3720.s b/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C520_6A3720.s index 0a985380ee..a6f2e11189 100644 --- a/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C520_6A3720.s +++ b/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C520_6A3720.s @@ -30,20 +30,20 @@ glabel func_8021C520_6A3720 /* 6A3784 8021C584 8E050000 */ lw $a1, ($s0) /* 6A3788 8021C588 26100004 */ addiu $s0, $s0, 4 /* 6A378C 8021C58C 4482D000 */ mtc1 $v0, $f26 -/* 6A3790 8021C590 00000000 */ nop +/* 6A3790 8021C590 00000000 */ nop /* 6A3794 8021C594 4680D6A0 */ cvt.s.w $f26, $f26 /* 6A3798 8021C598 0C0B1EAF */ jal get_variable /* 6A379C 8021C59C 0220202D */ daddu $a0, $s1, $zero /* 6A37A0 8021C5A0 8E050000 */ lw $a1, ($s0) /* 6A37A4 8021C5A4 26100004 */ addiu $s0, $s0, 4 /* 6A37A8 8021C5A8 4482C000 */ mtc1 $v0, $f24 -/* 6A37AC 8021C5AC 00000000 */ nop +/* 6A37AC 8021C5AC 00000000 */ nop /* 6A37B0 8021C5B0 4680C620 */ cvt.s.w $f24, $f24 /* 6A37B4 8021C5B4 0C0B1EAF */ jal get_variable /* 6A37B8 8021C5B8 0220202D */ daddu $a0, $s1, $zero /* 6A37BC 8021C5BC 8E050000 */ lw $a1, ($s0) /* 6A37C0 8021C5C0 4482B000 */ mtc1 $v0, $f22 -/* 6A37C4 8021C5C4 00000000 */ nop +/* 6A37C4 8021C5C4 00000000 */ nop /* 6A37C8 8021C5C8 4680B5A0 */ cvt.s.w $f22, $f22 /* 6A37CC 8021C5CC 0C0B210B */ jal get_float_variable /* 6A37D0 8021C5D0 0220202D */ daddu $a0, $s1, $zero @@ -55,7 +55,7 @@ glabel func_8021C520_6A3720 /* 6A37E8 8021C5E8 D4224830 */ ldc1 $f2, %lo(D_80234830)($at) /* 6A37EC 8021C5EC 4600A021 */ cvt.d.s $f0, $f20 /* 6A37F0 8021C5F0 46220002 */ mul.d $f0, $f0, $f2 -/* 6A37F4 8021C5F4 00000000 */ nop +/* 6A37F4 8021C5F4 00000000 */ nop /* 6A37F8 8021C5F8 46200520 */ cvt.s.d $f20, $f0 .L8021C5FC: /* 6A37FC 8021C5FC 0C00AB39 */ jal heap_malloc @@ -130,7 +130,7 @@ glabel func_8021C520_6A3720 .L8021C700: /* 6A3900 8021C700 82830210 */ lb $v1, 0x210($s4) /* 6A3904 8021C704 10620021 */ beq $v1, $v0, .L8021C78C -/* 6A3908 8021C708 00000000 */ nop +/* 6A3908 8021C708 00000000 */ nop /* 6A390C 8021C70C C602FFD8 */ lwc1 $f2, -0x28($s0) /* 6A3910 8021C710 3C01404E */ lui $at, 0x404e /* 6A3914 8021C714 44810800 */ mtc1 $at, $f1 @@ -152,7 +152,7 @@ glabel func_8021C520_6A3720 /* 6A3954 8021C754 3C01405E */ lui $at, 0x405e /* 6A3958 8021C758 44810800 */ mtc1 $at, $f1 /* 6A395C 8021C75C 44800000 */ mtc1 $zero, $f0 -/* 6A3960 8021C760 00000000 */ nop +/* 6A3960 8021C760 00000000 */ nop /* 6A3964 8021C764 4620103C */ c.lt.d $f2, $f0 /* 6A3968 8021C768 3C018023 */ lui $at, %hi(D_80234848) /* 6A396C 8021C76C D4204848 */ ldc1 $f0, %lo(D_80234848)($at) @@ -177,7 +177,7 @@ glabel func_8021C520_6A3720 /* 6A39B4 8021C7B4 3C014042 */ lui $at, 0x4042 /* 6A39B8 8021C7B8 44810800 */ mtc1 $at, $f1 /* 6A39BC 8021C7BC 44800000 */ mtc1 $zero, $f0 -/* 6A39C0 8021C7C0 00000000 */ nop +/* 6A39C0 8021C7C0 00000000 */ nop /* 6A39C4 8021C7C4 4620103C */ c.lt.d $f2, $f0 /* 6A39C8 8021C7C8 3C018023 */ lui $at, %hi(D_80234858) /* 6A39CC 8021C7CC D4204858 */ ldc1 $f0, %lo(D_80234858)($at) @@ -186,7 +186,7 @@ glabel func_8021C520_6A3720 /* 6A39D8 8021C7D8 3C014048 */ lui $at, 0x4048 /* 6A39DC 8021C7DC 44810800 */ mtc1 $at, $f1 /* 6A39E0 8021C7E0 44800000 */ mtc1 $zero, $f0 -/* 6A39E4 8021C7E4 00000000 */ nop +/* 6A39E4 8021C7E4 00000000 */ nop /* 6A39E8 8021C7E8 4620103C */ c.lt.d $f2, $f0 /* 6A39EC 8021C7EC 3C018023 */ lui $at, %hi(D_80234860) /* 6A39F0 8021C7F0 D4204860 */ ldc1 $f0, %lo(D_80234860)($at) @@ -264,7 +264,7 @@ glabel func_8021C520_6A3720 /* 6A3B00 8021C900 AE02FFE8 */ sw $v0, -0x18($s0) /* 6A3B04 8021C904 8E240000 */ lw $a0, ($s1) /* 6A3B08 8021C908 0C016914 */ jal remove_effect -/* 6A3B0C 8021C90C 00000000 */ nop +/* 6A3B0C 8021C90C 00000000 */ nop /* 6A3B10 8021C910 24020001 */ addiu $v0, $zero, 1 /* 6A3B14 8021C914 AE020000 */ sw $v0, ($s0) .L8021C918: diff --git a/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C9D4_6A3BD4.s b/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C9D4_6A3BD4.s index ea7064af49..6f244952e9 100644 --- a/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C9D4_6A3BD4.s +++ b/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C9D4_6A3BD4.s @@ -21,7 +21,7 @@ glabel func_8021C9D4_6A3BD4 /* 6A3C10 8021CA10 14410004 */ bne $v0, $at, .L8021CA24 /* 6A3C14 8021CA14 3C018000 */ lui $at, 0x8000 /* 6A3C18 8021CA18 14C10002 */ bne $a2, $at, .L8021CA24 -/* 6A3C1C 8021CA1C 00000000 */ nop +/* 6A3C1C 8021CA1C 00000000 */ nop /* 6A3C20 8021CA20 0006000D */ break 6 .L8021CA24: /* 6A3C24 8021CA24 00003012 */ mflo $a2 diff --git a/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CA44_6A3C44.s b/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CA44_6A3C44.s index 974d0f250a..b5798463ae 100644 --- a/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CA44_6A3C44.s +++ b/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CA44_6A3C44.s @@ -62,12 +62,12 @@ glabel func_8021CA44_6A3C44 /* 6A3D28 8021CB28 C626001C */ lwc1 $f6, 0x1c($s1) /* 6A3D2C 8021CB2C 468031A0 */ cvt.s.w $f6, $f6 /* 6A3D30 8021CB30 46062102 */ mul.s $f4, $f4, $f6 -/* 6A3D34 8021CB34 00000000 */ nop +/* 6A3D34 8021CB34 00000000 */ nop /* 6A3D38 8021CB38 3C013F00 */ lui $at, 0x3f00 /* 6A3D3C 8021CB3C 44811000 */ mtc1 $at, $f2 -/* 6A3D40 8021CB40 00000000 */ nop +/* 6A3D40 8021CB40 00000000 */ nop /* 6A3D44 8021CB44 46022102 */ mul.s $f4, $f4, $f2 -/* 6A3D48 8021CB48 00000000 */ nop +/* 6A3D48 8021CB48 00000000 */ nop /* 6A3D4C 8021CB4C E620000C */ swc1 $f0, 0xc($s1) /* 6A3D50 8021CB50 C6200004 */ lwc1 $f0, 4($s1) /* 6A3D54 8021CB54 C602000C */ lwc1 $f2, 0xc($s0) @@ -84,7 +84,7 @@ glabel func_8021CA44_6A3C44 /* 6A3D7C 8021CB7C 8E240020 */ lw $a0, 0x20($s1) /* 6A3D80 8021CB80 0040802D */ daddu $s0, $v0, $zero /* 6A3D84 8021CB84 16000005 */ bnez $s0, .L8021CB9C -/* 6A3D88 8021CB88 00000000 */ nop +/* 6A3D88 8021CB88 00000000 */ nop /* 6A3D8C 8021CB8C 0C00AB4B */ jal heap_free /* 6A3D90 8021CB90 8E440070 */ lw $a0, 0x70($s2) /* 6A3D94 8021CB94 08087310 */ j .L8021CC40 @@ -92,10 +92,10 @@ glabel func_8021CA44_6A3C44 .L8021CB9C: /* 6A3D9C 8021CB9C C62C000C */ lwc1 $f12, 0xc($s1) /* 6A3DA0 8021CBA0 0C00A8BB */ jal sin_deg -/* 6A3DA4 8021CBA4 00000000 */ nop +/* 6A3DA4 8021CBA4 00000000 */ nop /* 6A3DA8 8021CBA8 C6220014 */ lwc1 $f2, 0x14($s1) /* 6A3DAC 8021CBAC 46001082 */ mul.s $f2, $f2, $f0 -/* 6A3DB0 8021CBB0 00000000 */ nop +/* 6A3DB0 8021CBB0 00000000 */ nop /* 6A3DB4 8021CBB4 C6000008 */ lwc1 $f0, 8($s0) /* 6A3DB8 8021CBB8 46020000 */ add.s $f0, $f0, $f2 /* 6A3DBC 8021CBBC E6000008 */ swc1 $f0, 8($s0) @@ -103,7 +103,7 @@ glabel func_8021CA44_6A3C44 /* 6A3DC4 8021CBC4 C62C000C */ lwc1 $f12, 0xc($s1) /* 6A3DC8 8021CBC8 C6220014 */ lwc1 $f2, 0x14($s1) /* 6A3DCC 8021CBCC 46001082 */ mul.s $f2, $f2, $f0 -/* 6A3DD0 8021CBD0 00000000 */ nop +/* 6A3DD0 8021CBD0 00000000 */ nop /* 6A3DD4 8021CBD4 C6000010 */ lwc1 $f0, 0x10($s0) /* 6A3DD8 8021CBD8 46020001 */ sub.s $f0, $f0, $f2 /* 6A3DDC 8021CBDC E6000010 */ swc1 $f0, 0x10($s0) diff --git a/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CCFC_6A3EFC.s b/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CCFC_6A3EFC.s index 87e2454727..01f7f73ced 100644 --- a/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CCFC_6A3EFC.s +++ b/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CCFC_6A3EFC.s @@ -56,12 +56,12 @@ glabel func_8021CCFC_6A3EFC /* 6A3FBC 8021CDBC 50600007 */ beql $v1, $zero, .L8021CDDC /* 6A3FC0 8021CDC0 A25000AE */ sb $s0, 0xae($s2) /* 6A3FC4 8021CDC4 080873A4 */ j .L8021CE90 -/* 6A3FC8 8021CDC8 00000000 */ nop +/* 6A3FC8 8021CDC8 00000000 */ nop .L8021CDCC: /* 6A3FCC 8021CDCC 50620026 */ beql $v1, $v0, .L8021CE68 /* 6A3FD0 8021CDD0 A25000B0 */ sb $s0, 0xb0($s2) /* 6A3FD4 8021CDD4 080873A4 */ j .L8021CE90 -/* 6A3FD8 8021CDD8 00000000 */ nop +/* 6A3FD8 8021CDD8 00000000 */ nop .L8021CDDC: /* 6A3FDC 8021CDDC 8E250000 */ lw $a1, ($s1) /* 6A3FE0 8021CDE0 82820001 */ lb $v0, 1($s4) @@ -110,7 +110,7 @@ glabel func_8021CCFC_6A3EFC /* 6A4084 8021CE84 2406004F */ addiu $a2, $zero, 0x4f .L8021CE88: /* 6A4088 8021CE88 0C0B2026 */ jal set_variable -/* 6A408C 8021CE8C 00000000 */ nop +/* 6A408C 8021CE8C 00000000 */ nop .L8021CE90: /* 6A4090 8021CE90 8FBF0038 */ lw $ra, 0x38($sp) /* 6A4094 8021CE94 8FB50034 */ lw $s5, 0x34($sp) diff --git a/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CEB8_6A40B8.s b/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CEB8_6A40B8.s index 8724f40e5b..47cb8ebcf2 100644 --- a/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CEB8_6A40B8.s +++ b/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CEB8_6A40B8.s @@ -22,10 +22,10 @@ glabel func_8021CEB8_6A40B8 /* 6A40FC 8021CEFC 0240202D */ daddu $a0, $s2, $zero /* 6A4100 8021CF00 822200AF */ lb $v0, 0xaf($s1) /* 6A4104 8021CF04 10430004 */ beq $v0, $v1, .L8021CF18 -/* 6A4108 8021CF08 00000000 */ nop +/* 6A4108 8021CF08 00000000 */ nop /* 6A410C 8021CF0C 822200B0 */ lb $v0, 0xb0($s1) /* 6A4110 8021CF10 14430005 */ bne $v0, $v1, .L8021CF28 -/* 6A4114 8021CF14 00000000 */ nop +/* 6A4114 8021CF14 00000000 */ nop .L8021CF18: /* 6A4118 8021CF18 8E050000 */ lw $a1, ($s0) /* 6A411C 8021CF1C 080873CC */ j .L8021CF30 @@ -37,7 +37,7 @@ glabel func_8021CEB8_6A40B8 /* 6A412C 8021CF2C 2406FFFF */ addiu $a2, $zero, -1 .L8021CF30: /* 6A4130 8021CF30 0C0B2026 */ jal set_variable -/* 6A4134 8021CF34 00000000 */ nop +/* 6A4134 8021CF34 00000000 */ nop /* 6A4138 8021CF38 24020002 */ addiu $v0, $zero, 2 /* 6A413C 8021CF3C 8FBF001C */ lw $ra, 0x1c($sp) /* 6A4140 8021CF40 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CF54_6A4154.s b/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CF54_6A4154.s index 5224b916e9..9e67743149 100644 --- a/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CF54_6A4154.s +++ b/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CF54_6A4154.s @@ -11,19 +11,19 @@ glabel func_8021CF54_6A4154 /* 6A416C 8021CF6C 3C013D23 */ lui $at, 0x3d23 /* 6A4170 8021CF70 3421D70A */ ori $at, $at, 0xd70a /* 6A4174 8021CF74 44810000 */ mtc1 $at, $f0 -/* 6A4178 8021CF78 00000000 */ nop +/* 6A4178 8021CF78 00000000 */ nop /* 6A417C 8021CF7C E4600038 */ swc1 $f0, 0x38($v1) /* 6A4180 8021CF80 E4600030 */ swc1 $f0, 0x30($v1) /* 6A4184 8021CF84 8C43000C */ lw $v1, 0xc($v0) /* 6A4188 8021CF88 3C013FF0 */ lui $at, 0x3ff0 /* 6A418C 8021CF8C 44810000 */ mtc1 $at, $f0 -/* 6A4190 8021CF90 00000000 */ nop +/* 6A4190 8021CF90 00000000 */ nop /* 6A4194 8021CF94 E4600034 */ swc1 $f0, 0x34($v1) /* 6A4198 8021CF98 8C43000C */ lw $v1, 0xc($v0) /* 6A419C 8021CF9C 3C013D4C */ lui $at, 0x3d4c /* 6A41A0 8021CFA0 3421CCCD */ ori $at, $at, 0xcccd /* 6A41A4 8021CFA4 44810000 */ mtc1 $at, $f0 -/* 6A41A8 8021CFA8 00000000 */ nop +/* 6A41A8 8021CFA8 00000000 */ nop /* 6A41AC 8021CFAC E460003C */ swc1 $f0, 0x3c($v1) /* 6A41B0 8021CFB0 8FBF0010 */ lw $ra, 0x10($sp) /* 6A41B4 8021CFB4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CFC0_6A41C0.s b/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CFC0_6A41C0.s index 92a228e1fc..01bc582fb5 100644 --- a/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CFC0_6A41C0.s +++ b/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CFC0_6A41C0.s @@ -50,12 +50,12 @@ glabel func_8021CFC0_6A41C0 /* 6A4274 8021D074 26300018 */ addiu $s0, $s1, 0x18 /* 6A4278 8021D078 8E650000 */ lw $a1, ($s3) /* 6A427C 8021D07C 4482B000 */ mtc1 $v0, $f22 -/* 6A4280 8021D080 00000000 */ nop +/* 6A4280 8021D080 00000000 */ nop /* 6A4284 8021D084 4680B5A0 */ cvt.s.w $f22, $f22 /* 6A4288 8021D088 0C0B1EAF */ jal get_variable /* 6A428C 8021D08C 02A0202D */ daddu $a0, $s5, $zero /* 6A4290 8021D090 4482A000 */ mtc1 $v0, $f20 -/* 6A4294 8021D094 00000000 */ nop +/* 6A4294 8021D094 00000000 */ nop /* 6A4298 8021D098 4680A520 */ cvt.s.w $f20, $f20 .L8021D09C: /* 6A429C 8021D09C 24040002 */ addiu $a0, $zero, 2 @@ -70,12 +70,12 @@ glabel func_8021CFC0_6A41C0 /* 6A42C0 8021D0C0 0C01C6F4 */ jal func_80071BD0 /* 6A42C4 8021D0C4 AFB70020 */ sw $s7, 0x20($sp) /* 6A42C8 8021D0C8 449E0000 */ mtc1 $fp, $f0 -/* 6A42CC 8021D0CC 00000000 */ nop +/* 6A42CC 8021D0CC 00000000 */ nop /* 6A42D0 8021D0D0 46800020 */ cvt.s.w $f0, $f0 /* 6A42D4 8021D0D4 AE220000 */ sw $v0, ($s1) /* 6A42D8 8021D0D8 E600FFF0 */ swc1 $f0, -0x10($s0) /* 6A42DC 8021D0DC 44940000 */ mtc1 $s4, $f0 -/* 6A42E0 8021D0E0 00000000 */ nop +/* 6A42E0 8021D0E0 00000000 */ nop /* 6A42E4 8021D0E4 46800020 */ cvt.s.w $f0, $f0 /* 6A42E8 8021D0E8 AE160004 */ sw $s6, 4($s0) /* 6A42EC 8021D0EC E616FFEC */ swc1 $f22, -0x14($s0) @@ -102,7 +102,7 @@ glabel func_8021CFC0_6A41C0 /* 6A4338 8021D138 C60CFFF8 */ lwc1 $f12, -8($s0) /* 6A433C 8021D13C C602FFF4 */ lwc1 $f2, -0xc($s0) /* 6A4340 8021D140 46020002 */ mul.s $f0, $f0, $f2 -/* 6A4344 8021D144 00000000 */ nop +/* 6A4344 8021D144 00000000 */ nop /* 6A4348 8021D148 C614FFE8 */ lwc1 $f20, -0x18($s0) /* 6A434C 8021D14C C60CFFF8 */ lwc1 $f12, -8($s0) /* 6A4350 8021D150 0C00A8BB */ jal sin_deg @@ -117,7 +117,7 @@ glabel func_8021CFC0_6A41C0 /* 6A4374 8021D174 E4540010 */ swc1 $f20, 0x10($v0) /* 6A4378 8021D178 8E220000 */ lw $v0, ($s1) /* 6A437C 8021D17C 46040002 */ mul.s $f0, $f0, $f4 -/* 6A4380 8021D180 00000000 */ nop +/* 6A4380 8021D180 00000000 */ nop /* 6A4384 8021D184 8C42000C */ lw $v0, 0xc($v0) /* 6A4388 8021D188 E454001C */ swc1 $f20, 0x1c($v0) /* 6A438C 8021D18C 8E220000 */ lw $v0, ($s1) @@ -133,7 +133,7 @@ glabel func_8021CFC0_6A41C0 /* 6A43B4 8021D1B4 8E020000 */ lw $v0, ($s0) /* 6A43B8 8021D1B8 2842000B */ slti $v0, $v0, 0xb /* 6A43BC 8021D1BC 14400006 */ bnez $v0, .L8021D1D8 -/* 6A43C0 8021D1C0 00000000 */ nop +/* 6A43C0 8021D1C0 00000000 */ nop /* 6A43C4 8021D1C4 C600FFF4 */ lwc1 $f0, -0xc($s0) /* 6A43C8 8021D1C8 46000021 */ cvt.d.s $f0, $f0 /* 6A43CC 8021D1CC 46360000 */ add.d $f0, $f0, $f22 diff --git a/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802180D0_6BBC60.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802180D0_6BBC60.s index ecbdd07ac5..b15693c97b 100644 --- a/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802180D0_6BBC60.s +++ b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802180D0_6BBC60.s @@ -40,7 +40,7 @@ glabel func_802180D0_6BBC60 .L8021815C: /* 6BBCEC 8021815C 8E820070 */ lw $v0, 0x70($s4) /* 6BBCF0 80218160 144000F7 */ bnez $v0, .L80218540 -/* 6BBCF4 80218164 00000000 */ nop +/* 6BBCF4 80218164 00000000 */ nop /* 6BBCF8 80218168 C6600144 */ lwc1 $f0, 0x144($s3) /* 6BBCFC 8021816C C638000C */ lwc1 $f24, 0xc($s1) /* 6BBD00 80218170 C63A0014 */ lwc1 $f26, 0x14($s1) @@ -70,29 +70,29 @@ glabel func_802180D0_6BBC60 /* 6BBD60 802181D0 46002003 */ div.s $f0, $f4, $f0 /* 6BBD64 802181D4 4600028D */ trunc.w.s $f10, $f0 /* 6BBD68 802181D8 44035000 */ mfc1 $v1, $f10 -/* 6BBD6C 802181DC 00000000 */ nop +/* 6BBD6C 802181DC 00000000 */ nop /* 6BBD70 802181E0 00031400 */ sll $v0, $v1, 0x10 /* 6BBD74 802181E4 00021403 */ sra $v0, $v0, 0x10 /* 6BBD78 802181E8 44820000 */ mtc1 $v0, $f0 -/* 6BBD7C 802181EC 00000000 */ nop +/* 6BBD7C 802181EC 00000000 */ nop /* 6BBD80 802181F0 46800020 */ cvt.s.w $f0, $f0 /* 6BBD84 802181F4 46020002 */ mul.s $f0, $f0, $f2 -/* 6BBD88 802181F8 00000000 */ nop +/* 6BBD88 802181F8 00000000 */ nop /* 6BBD8C 802181FC 46002086 */ mov.s $f2, $f4 /* 6BBD90 80218200 A6230064 */ sh $v1, 0x64($s1) /* 6BBD94 80218204 08086090 */ j .L80218240 /* 6BBD98 80218208 46001201 */ sub.s $f8, $f2, $f0 .L8021820C: /* 6BBD9C 8021820C 44821000 */ mtc1 $v0, $f2 -/* 6BBDA0 80218210 00000000 */ nop +/* 6BBDA0 80218210 00000000 */ nop /* 6BBDA4 80218214 468010A0 */ cvt.s.w $f2, $f2 /* 6BBDA8 80218218 86220064 */ lh $v0, 0x64($s1) /* 6BBDAC 8021821C 46022083 */ div.s $f2, $f4, $f2 /* 6BBDB0 80218220 44820000 */ mtc1 $v0, $f0 -/* 6BBDB4 80218224 00000000 */ nop +/* 6BBDB4 80218224 00000000 */ nop /* 6BBDB8 80218228 46800020 */ cvt.s.w $f0, $f0 /* 6BBDBC 8021822C 46020002 */ mul.s $f0, $f0, $f2 -/* 6BBDC0 80218230 00000000 */ nop +/* 6BBDC0 80218230 00000000 */ nop /* 6BBDC4 80218234 C624004C */ lwc1 $f4, 0x4c($s1) /* 6BBDC8 80218238 E6220040 */ swc1 $f2, 0x40($s1) /* 6BBDCC 8021823C 46002201 */ sub.s $f8, $f4, $f0 @@ -107,13 +107,13 @@ glabel func_802180D0_6BBC60 /* 6BBDEC 8021825C 44810000 */ mtc1 $at, $f0 /* 6BBDF0 80218260 C6240000 */ lwc1 $f4, ($s1) /* 6BBDF4 80218264 44823000 */ mtc1 $v0, $f6 -/* 6BBDF8 80218268 00000000 */ nop +/* 6BBDF8 80218268 00000000 */ nop /* 6BBDFC 8021826C 468031A0 */ cvt.s.w $f6, $f6 /* 6BBE00 80218270 46060003 */ div.s $f0, $f0, $f6 /* 6BBE04 80218274 46041081 */ sub.s $f2, $f2, $f4 /* 6BBE08 80218278 E620003C */ swc1 $f0, 0x3c($s1) /* 6BBE0C 8021827C 44830000 */ mtc1 $v1, $f0 -/* 6BBE10 80218280 00000000 */ nop +/* 6BBE10 80218280 00000000 */ nop /* 6BBE14 80218284 46800020 */ cvt.s.w $f0, $f0 /* 6BBE18 80218288 46001083 */ div.s $f2, $f2, $f0 /* 6BBE1C 8021828C C6200010 */ lwc1 $f0, 0x10($s1) @@ -147,7 +147,7 @@ glabel func_802180D0_6BBC60 /* 6BBE88 802182F8 14410004 */ bne $v0, $at, .L8021830C /* 6BBE8C 802182FC 3C018000 */ lui $at, 0x8000 /* 6BBE90 80218300 14610002 */ bne $v1, $at, .L8021830C -/* 6BBE94 80218304 00000000 */ nop +/* 6BBE94 80218304 00000000 */ nop /* 6BBE98 80218308 0006000D */ break 6 .L8021830C: /* 6BBE9C 8021830C 00001812 */ mflo $v1 @@ -172,7 +172,7 @@ glabel func_802180D0_6BBC60 /* 6BBEE8 80218358 44811000 */ mtc1 $at, $f2 /* 6BBEEC 8021835C 46200220 */ cvt.s.d $f8, $f0 /* 6BBEF0 80218360 44830000 */ mtc1 $v1, $f0 -/* 6BBEF4 80218364 00000000 */ nop +/* 6BBEF4 80218364 00000000 */ nop /* 6BBEF8 80218368 46800020 */ cvt.s.w $f0, $f0 /* 6BBEFC 8021836C 86230066 */ lh $v1, 0x66($s1) /* 6BBF00 80218370 24020002 */ addiu $v0, $zero, 2 @@ -184,7 +184,7 @@ glabel func_802180D0_6BBC60 /* 6BBF18 80218388 D4228408 */ ldc1 $f2, %lo(D_80228408)($at) /* 6BBF1C 8021838C 46004021 */ cvt.d.s $f0, $f8 /* 6BBF20 80218390 46220002 */ mul.d $f0, $f0, $f2 -/* 6BBF24 80218394 00000000 */ nop +/* 6BBF24 80218394 00000000 */ nop /* 6BBF28 80218398 46200020 */ cvt.s.d $f0, $f0 /* 6BBF2C 8021839C E6200050 */ swc1 $f0, 0x50($s1) .L802183A0: @@ -196,7 +196,7 @@ glabel func_802180D0_6BBC60 /* 6BBF44 802183B4 C636003C */ lwc1 $f22, 0x3c($s1) /* 6BBF48 802183B8 AE200018 */ sw $zero, 0x18($s1) /* 6BBF4C 802183BC 46006302 */ mul.s $f12, $f12, $f0 -/* 6BBF50 802183C0 00000000 */ nop +/* 6BBF50 802183C0 00000000 */ nop /* 6BBF54 802183C4 AE20001C */ sw $zero, 0x1c($s1) /* 6BBF58 802183C8 4600A521 */ cvt.d.s $f20, $f20 /* 6BBF5C 802183CC 3C0143B4 */ lui $at, 0x43b4 @@ -219,7 +219,7 @@ glabel func_802180D0_6BBC60 /* 6BBF98 80218408 14410004 */ bne $v0, $at, .L8021841C /* 6BBF9C 8021840C 3C018000 */ lui $at, 0x8000 /* 6BBFA0 80218410 14610002 */ bne $v1, $at, .L8021841C -/* 6BBFA4 80218414 00000000 */ nop +/* 6BBFA4 80218414 00000000 */ nop /* 6BBFA8 80218418 0006000D */ break 6 .L8021841C: /* 6BBFAC 8021841C 00001812 */ mflo $v1 @@ -244,7 +244,7 @@ glabel func_802180D0_6BBC60 /* 6BBFF8 80218468 44811000 */ mtc1 $at, $f2 /* 6BBFFC 8021846C 46200220 */ cvt.s.d $f8, $f0 /* 6BC000 80218470 44830000 */ mtc1 $v1, $f0 -/* 6BC004 80218474 00000000 */ nop +/* 6BC004 80218474 00000000 */ nop /* 6BC008 80218478 46800020 */ cvt.s.w $f0, $f0 /* 6BC00C 8021847C 86230066 */ lh $v1, 0x66($s1) /* 6BC010 80218480 24020004 */ addiu $v0, $zero, 4 @@ -257,7 +257,7 @@ glabel func_802180D0_6BBC60 /* 6BC02C 8021849C 44801000 */ mtc1 $zero, $f2 /* 6BC030 802184A0 46004021 */ cvt.d.s $f0, $f8 /* 6BC034 802184A4 46220002 */ mul.d $f0, $f0, $f2 -/* 6BC038 802184A8 00000000 */ nop +/* 6BC038 802184A8 00000000 */ nop /* 6BC03C 802184AC 46200020 */ cvt.s.d $f0, $f0 /* 6BC040 802184B0 E6200050 */ swc1 $f0, 0x50($s1) .L802184B4: @@ -269,7 +269,7 @@ glabel func_802180D0_6BBC60 /* 6BC058 802184C8 C636003C */ lwc1 $f22, 0x3c($s1) /* 6BC05C 802184CC AE200018 */ sw $zero, 0x18($s1) /* 6BC060 802184D0 46006302 */ mul.s $f12, $f12, $f0 -/* 6BC064 802184D4 00000000 */ nop +/* 6BC064 802184D4 00000000 */ nop /* 6BC068 802184D8 AE20001C */ sw $zero, 0x1c($s1) /* 6BC06C 802184DC 4600A521 */ cvt.d.s $f20, $f20 /* 6BC070 802184E0 3C0143B4 */ lui $at, 0x43b4 @@ -282,9 +282,9 @@ glabel func_802180D0_6BBC60 /* 6BC08C 802184FC 46000021 */ cvt.d.s $f0, $f0 .L80218500: /* 6BC090 80218500 46220002 */ mul.d $f0, $f0, $f2 -/* 6BC094 80218504 00000000 */ nop +/* 6BC094 80218504 00000000 */ nop /* 6BC098 80218508 46360002 */ mul.d $f0, $f0, $f22 -/* 6BC09C 8021850C 00000000 */ nop +/* 6BC09C 8021850C 00000000 */ nop /* 6BC0A0 80218510 46360000 */ add.d $f0, $f0, $f22 /* 6BC0A4 80218514 4620A500 */ add.d $f20, $f20, $f0 /* 6BC0A8 80218518 4620A520 */ cvt.s.d $f20, $f20 @@ -308,21 +308,21 @@ glabel func_802180D0_6BBC60 /* 6BC0EC 8021855C 10620008 */ beq $v1, $v0, .L80218580 /* 6BC0F0 80218560 0000102D */ daddu $v0, $zero, $zero /* 6BC0F4 80218564 0808624C */ j .L80218930 -/* 6BC0F8 80218568 00000000 */ nop +/* 6BC0F8 80218568 00000000 */ nop .L8021856C: /* 6BC0FC 8021856C 24020003 */ addiu $v0, $zero, 3 /* 6BC100 80218570 106200BA */ beq $v1, $v0, .L8021885C /* 6BC104 80218574 0000102D */ daddu $v0, $zero, $zero /* 6BC108 80218578 0808624C */ j .L80218930 -/* 6BC10C 8021857C 00000000 */ nop +/* 6BC10C 8021857C 00000000 */ nop .L80218580: /* 6BC110 80218580 C6220044 */ lwc1 $f2, 0x44($s1) /* 6BC114 80218584 3C013FC9 */ lui $at, 0x3fc9 /* 6BC118 80218588 34210FD0 */ ori $at, $at, 0xfd0 /* 6BC11C 8021858C 44810000 */ mtc1 $at, $f0 -/* 6BC120 80218590 00000000 */ nop +/* 6BC120 80218590 00000000 */ nop /* 6BC124 80218594 4602003C */ c.lt.s $f0, $f2 -/* 6BC128 80218598 00000000 */ nop +/* 6BC128 80218598 00000000 */ nop /* 6BC12C 8021859C 45000004 */ bc1f .L802185B0 /* 6BC130 802185A0 2404FF81 */ addiu $a0, $zero, -0x7f /* 6BC134 802185A4 8E26005C */ lw $a2, 0x5c($s1) @@ -351,7 +351,7 @@ glabel func_802180D0_6BBC60 /* 6BC18C 802185FC C62C0044 */ lwc1 $f12, 0x44($s1) /* 6BC190 80218600 C6220050 */ lwc1 $f2, 0x50($s1) /* 6BC194 80218604 46001082 */ mul.s $f2, $f2, $f0 -/* 6BC198 80218608 00000000 */ nop +/* 6BC198 80218608 00000000 */ nop /* 6BC19C 8021860C C6200004 */ lwc1 $f0, 4($s1) /* 6BC1A0 80218610 46020000 */ add.s $f0, $f0, $f2 /* 6BC1A4 80218614 E6600148 */ swc1 $f0, 0x148($s3) @@ -360,7 +360,7 @@ glabel func_802180D0_6BBC60 /* 6BC1B0 80218620 C6220010 */ lwc1 $f2, 0x10($s1) /* 6BC1B4 80218624 C6600148 */ lwc1 $f0, 0x148($s3) /* 6BC1B8 80218628 4602003C */ c.lt.s $f0, $f2 -/* 6BC1BC 8021862C 00000000 */ nop +/* 6BC1BC 8021862C 00000000 */ nop /* 6BC1C0 80218630 45000007 */ bc1f .L80218650 /* 6BC1C4 80218634 4600B306 */ mov.s $f12, $f22 /* 6BC1C8 80218638 86220064 */ lh $v0, 0x64($s1) @@ -389,7 +389,7 @@ glabel func_802180D0_6BBC60 /* 6BC21C 8021868C 44810000 */ mtc1 $at, $f0 /* 6BC220 80218690 C6340044 */ lwc1 $f20, 0x44($s1) /* 6BC224 80218694 46006302 */ mul.s $f12, $f12, $f0 -/* 6BC228 80218698 00000000 */ nop +/* 6BC228 80218698 00000000 */ nop /* 6BC22C 8021869C C636003C */ lwc1 $f22, 0x3c($s1) /* 6BC230 802186A0 4600A521 */ cvt.d.s $f20, $f20 /* 6BC234 802186A4 3C0143B4 */ lui $at, 0x43b4 @@ -408,7 +408,7 @@ glabel func_802180D0_6BBC60 /* 6BC264 802186D4 44810000 */ mtc1 $at, $f0 /* 6BC268 802186D8 C6340044 */ lwc1 $f20, 0x44($s1) /* 6BC26C 802186DC 46006302 */ mul.s $f12, $f12, $f0 -/* 6BC270 802186E0 00000000 */ nop +/* 6BC270 802186E0 00000000 */ nop /* 6BC274 802186E4 C636003C */ lwc1 $f22, 0x3c($s1) /* 6BC278 802186E8 4600A521 */ cvt.d.s $f20, $f20 /* 6BC27C 802186EC 3C0143B4 */ lui $at, 0x43b4 @@ -421,9 +421,9 @@ glabel func_802180D0_6BBC60 /* 6BC298 80218708 46000021 */ cvt.d.s $f0, $f0 .L8021870C: /* 6BC29C 8021870C 46220002 */ mul.d $f0, $f0, $f2 -/* 6BC2A0 80218710 00000000 */ nop +/* 6BC2A0 80218710 00000000 */ nop /* 6BC2A4 80218714 46360002 */ mul.d $f0, $f0, $f22 -/* 6BC2A8 80218718 00000000 */ nop +/* 6BC2A8 80218718 00000000 */ nop /* 6BC2AC 8021871C 46360000 */ add.d $f0, $f0, $f22 /* 6BC2B0 80218720 4620A500 */ add.d $f20, $f20, $f0 /* 6BC2B4 80218724 4620A520 */ cvt.s.d $f20, $f20 @@ -469,7 +469,7 @@ glabel func_802180D0_6BBC60 /* 6BC34C 802187BC 14410004 */ bne $v0, $at, .L802187D0 /* 6BC350 802187C0 3C018000 */ lui $at, 0x8000 /* 6BC354 802187C4 14610002 */ bne $v1, $at, .L802187D0 -/* 6BC358 802187C8 00000000 */ nop +/* 6BC358 802187C8 00000000 */ nop /* 6BC35C 802187CC 0006000D */ break 6 .L802187D0: /* 6BC360 802187D0 00001812 */ mflo $v1 @@ -496,7 +496,7 @@ glabel func_802180D0_6BBC60 /* 6BC3B4 80218824 46200020 */ cvt.s.d $f0, $f0 /* 6BC3B8 80218828 E6200050 */ swc1 $f0, 0x50($s1) /* 6BC3BC 8021882C 44830000 */ mtc1 $v1, $f0 -/* 6BC3C0 80218830 00000000 */ nop +/* 6BC3C0 80218830 00000000 */ nop /* 6BC3C4 80218834 46800020 */ cvt.s.w $f0, $f0 /* 6BC3C8 80218838 E6200028 */ swc1 $f0, 0x28($s1) /* 6BC3CC 8021883C C6600144 */ lwc1 $f0, 0x144($s3) @@ -512,9 +512,9 @@ glabel func_802180D0_6BBC60 /* 6BC3F0 80218860 3C0140C9 */ lui $at, 0x40c9 /* 6BC3F4 80218864 34210FD0 */ ori $at, $at, 0xfd0 /* 6BC3F8 80218868 4481B000 */ mtc1 $at, $f22 -/* 6BC3FC 8021886C 00000000 */ nop +/* 6BC3FC 8021886C 00000000 */ nop /* 6BC400 80218870 46166302 */ mul.s $f12, $f12, $f22 -/* 6BC404 80218874 00000000 */ nop +/* 6BC404 80218874 00000000 */ nop /* 6BC408 80218878 C6340000 */ lwc1 $f20, ($s1) /* 6BC40C 8021887C 3C0143B4 */ lui $at, 0x43b4 /* 6BC410 80218880 4481C000 */ mtc1 $at, $f24 @@ -523,10 +523,10 @@ glabel func_802180D0_6BBC60 /* 6BC41C 8021888C 46186303 */ div.s $f12, $f12, $f24 /* 6BC420 80218890 C6220050 */ lwc1 $f2, 0x50($s1) /* 6BC424 80218894 46001082 */ mul.s $f2, $f2, $f0 -/* 6BC428 80218898 00000000 */ nop +/* 6BC428 80218898 00000000 */ nop /* 6BC42C 8021889C C62C0024 */ lwc1 $f12, 0x24($s1) /* 6BC430 802188A0 46166302 */ mul.s $f12, $f12, $f22 -/* 6BC434 802188A4 00000000 */ nop +/* 6BC434 802188A4 00000000 */ nop /* 6BC438 802188A8 3C018023 */ lui $at, %hi(D_80228440) /* 6BC43C 802188AC D4208440 */ ldc1 $f0, %lo(D_80228440)($at) /* 6BC440 802188B0 460010A1 */ cvt.d.s $f2, $f2 @@ -538,7 +538,7 @@ glabel func_802180D0_6BBC60 /* 6BC458 802188C8 E6340000 */ swc1 $f20, ($s1) /* 6BC45C 802188CC C6220050 */ lwc1 $f2, 0x50($s1) /* 6BC460 802188D0 46001082 */ mul.s $f2, $f2, $f0 -/* 6BC464 802188D4 00000000 */ nop +/* 6BC464 802188D4 00000000 */ nop /* 6BC468 802188D8 C62C0024 */ lwc1 $f12, 0x24($s1) /* 6BC46C 802188DC C6200028 */ lwc1 $f0, 0x28($s1) /* 6BC470 802188E0 46006300 */ add.s $f12, $f12, $f0 diff --git a/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218960_6BC4F0.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218960_6BC4F0.s index 49380b6e7b..bc3f6a20f3 100644 --- a/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218960_6BC4F0.s +++ b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218960_6BC4F0.s @@ -31,9 +31,9 @@ glabel func_80218960_6BC4F0 .L802189C4: /* 6BC554 802189C4 C6200050 */ lwc1 $f0, 0x50($s1) /* 6BC558 802189C8 4480A000 */ mtc1 $zero, $f20 -/* 6BC55C 802189CC 00000000 */ nop +/* 6BC55C 802189CC 00000000 */ nop /* 6BC560 802189D0 4600A03C */ c.lt.s $f20, $f0 -/* 6BC564 802189D4 00000000 */ nop +/* 6BC564 802189D4 00000000 */ nop /* 6BC568 802189D8 45000005 */ bc1f .L802189F0 /* 6BC56C 802189DC 2404FF81 */ addiu $a0, $zero, -0x7f /* 6BC570 802189E0 8E260064 */ lw $a2, 0x64($s1) @@ -42,7 +42,7 @@ glabel func_80218960_6BC4F0 /* 6BC57C 802189EC C6200050 */ lwc1 $f0, 0x50($s1) .L802189F0: /* 6BC580 802189F0 4614003C */ c.lt.s $f0, $f20 -/* 6BC584 802189F4 00000000 */ nop +/* 6BC584 802189F4 00000000 */ nop /* 6BC588 802189F8 45000004 */ bc1f .L80218A0C /* 6BC58C 802189FC 2404FF81 */ addiu $a0, $zero, -0x7f /* 6BC590 80218A00 8E260068 */ lw $a2, 0x68($s1) @@ -67,7 +67,7 @@ glabel func_80218960_6BC4F0 /* 6BC5D8 80218A48 C6240148 */ lwc1 $f4, 0x148($s1) /* 6BC5DC 80218A4C E622014C */ swc1 $f2, 0x14c($s1) /* 6BC5E0 80218A50 4614203C */ c.lt.s $f4, $f20 -/* 6BC5E4 80218A54 00000000 */ nop +/* 6BC5E4 80218A54 00000000 */ nop /* 6BC5E8 80218A58 45010003 */ bc1t .L80218A68 /* 6BC5EC 80218A5C E6200144 */ swc1 $f0, 0x144($s1) /* 6BC5F0 80218A60 080862A5 */ j .L80218A94 diff --git a/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218AB4_6BC644.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218AB4_6BC644.s index 33f2a4a822..23b46dbfd5 100644 --- a/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218AB4_6BC644.s +++ b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218AB4_6BC644.s @@ -14,7 +14,7 @@ glabel func_80218AB4_6BC644 /* 6BC668 80218AD8 8C820000 */ lw $v0, ($a0) /* 6BC66C 80218ADC 30420800 */ andi $v0, $v0, 0x800 /* 6BC670 80218AE0 1440000A */ bnez $v0, .L80218B0C -/* 6BC674 80218AE4 00000000 */ nop +/* 6BC674 80218AE4 00000000 */ nop /* 6BC678 80218AE8 90820191 */ lbu $v0, 0x191($a0) /* 6BC67C 80218AEC 8E030088 */ lw $v1, 0x88($s0) /* 6BC680 80218AF0 00021042 */ srl $v0, $v0, 1 diff --git a/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218BC4_6BC754.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218BC4_6BC754.s index 9e1722ecec..c98e23efad 100644 --- a/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218BC4_6BC754.s +++ b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218BC4_6BC754.s @@ -10,7 +10,7 @@ glabel func_80218BC4_6BC754 /* 6BC768 80218BD8 8C43000C */ lw $v1, 0xc($v0) /* 6BC76C 80218BDC 3C01C47A */ lui $at, 0xc47a /* 6BC770 80218BE0 44810000 */ mtc1 $at, $f0 -/* 6BC774 80218BE4 00000000 */ nop +/* 6BC774 80218BE4 00000000 */ nop /* 6BC778 80218BE8 E4600008 */ swc1 $f0, 8($v1) /* 6BC77C 80218BEC 8FBF0010 */ lw $ra, 0x10($sp) /* 6BC780 80218BF0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218BFC_6BC78C.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218BFC_6BC78C.s index c14f997c1a..9aafbb19e3 100644 --- a/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218BFC_6BC78C.s +++ b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218BFC_6BC78C.s @@ -11,7 +11,7 @@ glabel func_80218BFC_6BC78C /* 6BC7A4 80218C14 8C82000C */ lw $v0, 0xc($a0) /* 6BC7A8 80218C18 3C014310 */ lui $at, 0x4310 /* 6BC7AC 80218C1C 44810000 */ mtc1 $at, $f0 -/* 6BC7B0 80218C20 00000000 */ nop +/* 6BC7B0 80218C20 00000000 */ nop /* 6BC7B4 80218C24 E4400008 */ swc1 $f0, 8($v0) /* 6BC7B8 80218C28 8C830000 */ lw $v1, ($a0) /* 6BC7BC 80218C2C 34630010 */ ori $v1, $v1, 0x10 diff --git a/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218D10_6BC8A0.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218D10_6BC8A0.s index 8803f52689..6463a8892f 100644 --- a/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218D10_6BC8A0.s +++ b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218D10_6BC8A0.s @@ -27,9 +27,9 @@ glabel func_80218D10_6BC8A0 /* 6BC8F4 80218D64 C622004C */ lwc1 $f2, 0x4c($s1) /* 6BC8F8 80218D68 3C014080 */ lui $at, 0x4080 /* 6BC8FC 80218D6C 44810000 */ mtc1 $at, $f0 -/* 6BC900 80218D70 00000000 */ nop +/* 6BC900 80218D70 00000000 */ nop /* 6BC904 80218D74 4600103C */ c.lt.s $f2, $f0 -/* 6BC908 80218D78 00000000 */ nop +/* 6BC908 80218D78 00000000 */ nop /* 6BC90C 80218D7C 45000007 */ bc1f .L80218D9C /* 6BC910 80218D80 0000202D */ daddu $a0, $zero, $zero /* 6BC914 80218D84 C6200054 */ lwc1 $f0, 0x54($s1) @@ -47,7 +47,7 @@ glabel func_80218D10_6BC8A0 /* 6BC940 80218DB0 24040001 */ addiu $a0, $zero, 1 .L80218DB4: /* 6BC944 80218DB4 0C0990BC */ jal play_movement_dust_effects -/* 6BC948 80218DB8 00000000 */ nop +/* 6BC948 80218DB8 00000000 */ nop /* 6BC94C 80218DBC C6400040 */ lwc1 $f0, 0x40($s2) /* 6BC950 80218DC0 3C013FF8 */ lui $at, 0x3ff8 /* 6BC954 80218DC4 44811800 */ mtc1 $at, $f3 @@ -68,7 +68,7 @@ glabel func_80218D10_6BC8A0 /* 6BC990 80218E00 44801000 */ mtc1 $zero, $f2 /* 6BC994 80218E04 46000021 */ cvt.d.s $f0, $f0 /* 6BC998 80218E08 4622003C */ c.lt.d $f0, $f2 -/* 6BC99C 80218E0C 00000000 */ nop +/* 6BC99C 80218E0C 00000000 */ nop /* 6BC9A0 80218E10 45010002 */ bc1t .L80218E1C /* 6BC9A4 80218E14 24020002 */ addiu $v0, $zero, 2 /* 6BC9A8 80218E18 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218E34_6BC9C4.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218E34_6BC9C4.s index d2f0824b5f..48d6f59c49 100644 --- a/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218E34_6BC9C4.s +++ b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218E34_6BC9C4.s @@ -27,9 +27,9 @@ glabel func_80218E34_6BC9C4 /* 6BCA18 80218E88 C622004C */ lwc1 $f2, 0x4c($s1) /* 6BCA1C 80218E8C 3C014080 */ lui $at, 0x4080 /* 6BCA20 80218E90 44810000 */ mtc1 $at, $f0 -/* 6BCA24 80218E94 00000000 */ nop +/* 6BCA24 80218E94 00000000 */ nop /* 6BCA28 80218E98 4600103C */ c.lt.s $f2, $f0 -/* 6BCA2C 80218E9C 00000000 */ nop +/* 6BCA2C 80218E9C 00000000 */ nop /* 6BCA30 80218EA0 45000007 */ bc1f .L80218EC0 /* 6BCA34 80218EA4 0000202D */ daddu $a0, $zero, $zero /* 6BCA38 80218EA8 C6200054 */ lwc1 $f0, 0x54($s1) @@ -47,7 +47,7 @@ glabel func_80218E34_6BC9C4 /* 6BCA64 80218ED4 24040001 */ addiu $a0, $zero, 1 .L80218ED8: /* 6BCA68 80218ED8 0C0990BC */ jal play_movement_dust_effects -/* 6BCA6C 80218EDC 00000000 */ nop +/* 6BCA6C 80218EDC 00000000 */ nop /* 6BCA70 80218EE0 C6400040 */ lwc1 $f0, 0x40($s2) /* 6BCA74 80218EE4 3C013FF8 */ lui $at, 0x3ff8 /* 6BCA78 80218EE8 44811800 */ mtc1 $at, $f3 @@ -68,7 +68,7 @@ glabel func_80218E34_6BC9C4 /* 6BCAB4 80218F24 44801000 */ mtc1 $zero, $f2 /* 6BCAB8 80218F28 46000021 */ cvt.d.s $f0, $f0 /* 6BCABC 80218F2C 4622003C */ c.lt.d $f0, $f2 -/* 6BCAC0 80218F30 00000000 */ nop +/* 6BCAC0 80218F30 00000000 */ nop /* 6BCAC4 80218F34 45010002 */ bc1t .L80218F40 /* 6BCAC8 80218F38 24020002 */ addiu $v0, $zero, 2 /* 6BCACC 80218F3C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218F58_6BCAE8.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218F58_6BCAE8.s index 34f6e74302..be5f80a17d 100644 --- a/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218F58_6BCAE8.s +++ b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218F58_6BCAE8.s @@ -39,7 +39,7 @@ glabel func_80218F58_6BCAE8 /* 6BCB6C 80218FDC 3C013ECC */ lui $at, 0x3ecc /* 6BCB70 80218FE0 3421CCCD */ ori $at, $at, 0xcccd /* 6BCB74 80218FE4 44810000 */ mtc1 $at, $f0 -/* 6BCB78 80218FE8 00000000 */ nop +/* 6BCB78 80218FE8 00000000 */ nop /* 6BCB7C 80218FEC E7A00010 */ swc1 $f0, 0x10($sp) .L80218FF0: /* 6BCB80 80218FF0 24020005 */ addiu $v0, $zero, 5 @@ -64,7 +64,7 @@ glabel func_80218F58_6BCAE8 /* 6BCBC8 80219038 3C013ECC */ lui $at, 0x3ecc /* 6BCBCC 8021903C 3421CCCD */ ori $at, $at, 0xcccd /* 6BCBD0 80219040 44810000 */ mtc1 $at, $f0 -/* 6BCBD4 80219044 00000000 */ nop +/* 6BCBD4 80219044 00000000 */ nop /* 6BCBD8 80219048 E7A00010 */ swc1 $f0, 0x10($sp) .L8021904C: /* 6BCBDC 8021904C 24020005 */ addiu $v0, $zero, 5 @@ -90,11 +90,11 @@ glabel func_80218F58_6BCAE8 /* 6BCC28 80219098 24020008 */ addiu $v0, $zero, 8 /* 6BCC2C 8021909C 82230210 */ lb $v1, 0x210($s1) /* 6BCC30 802190A0 1062000A */ beq $v1, $v0, .L802190CC -/* 6BCC34 802190A4 00000000 */ nop +/* 6BCC34 802190A4 00000000 */ nop /* 6BCC38 802190A8 8E020008 */ lw $v0, 8($s0) /* 6BCC3C 802190AC 2442000F */ addiu $v0, $v0, 0xf /* 6BCC40 802190B0 44826000 */ mtc1 $v0, $f12 -/* 6BCC44 802190B4 00000000 */ nop +/* 6BCC44 802190B4 00000000 */ nop /* 6BCC48 802190B8 46806320 */ cvt.s.w $f12, $f12 /* 6BCC4C 802190BC 0C00A6C9 */ jal clamp_angle /* 6BCC50 802190C0 AE020008 */ sw $v0, 8($s0) @@ -107,36 +107,36 @@ glabel func_80218F58_6BCAE8 /* 6BCC68 802190D8 C60C0008 */ lwc1 $f12, 8($s0) /* 6BCC6C 802190DC 46806320 */ cvt.s.w $f12, $f12 /* 6BCC70 802190E0 46006302 */ mul.s $f12, $f12, $f0 -/* 6BCC74 802190E4 00000000 */ nop +/* 6BCC74 802190E4 00000000 */ nop /* 6BCC78 802190E8 3C0143B4 */ lui $at, 0x43b4 /* 6BCC7C 802190EC 44810000 */ mtc1 $at, $f0 /* 6BCC80 802190F0 0C00A85B */ jal sin_rad /* 6BCC84 802190F4 46006303 */ div.s $f12, $f12, $f0 /* 6BCC88 802190F8 3C014040 */ lui $at, 0x4040 /* 6BCC8C 802190FC 44811000 */ mtc1 $at, $f2 -/* 6BCC90 80219100 00000000 */ nop +/* 6BCC90 80219100 00000000 */ nop /* 6BCC94 80219104 46020002 */ mul.s $f0, $f0, $f2 -/* 6BCC98 80219108 00000000 */ nop +/* 6BCC98 80219108 00000000 */ nop /* 6BCC9C 8021910C 86220152 */ lh $v0, 0x152($s1) /* 6BCCA0 80219110 44821000 */ mtc1 $v0, $f2 -/* 6BCCA4 80219114 00000000 */ nop +/* 6BCCA4 80219114 00000000 */ nop /* 6BCCA8 80219118 468010A0 */ cvt.s.w $f2, $f2 /* 6BCCAC 8021911C 4600018D */ trunc.w.s $f6, $f0 /* 6BCCB0 80219120 44033000 */ mfc1 $v1, $f6 -/* 6BCCB4 80219124 00000000 */ nop +/* 6BCCB4 80219124 00000000 */ nop /* 6BCCB8 80219128 00031600 */ sll $v0, $v1, 0x18 /* 6BCCBC 8021912C C6200148 */ lwc1 $f0, 0x148($s1) /* 6BCCC0 80219130 00021603 */ sra $v0, $v0, 0x18 /* 6BCCC4 80219134 A223019A */ sb $v1, 0x19a($s1) /* 6BCCC8 80219138 46020000 */ add.s $f0, $f0, $f2 /* 6BCCCC 8021913C 44821000 */ mtc1 $v0, $f2 -/* 6BCCD0 80219140 00000000 */ nop +/* 6BCCD0 80219140 00000000 */ nop /* 6BCCD4 80219144 468010A0 */ cvt.s.w $f2, $f2 /* 6BCCD8 80219148 86220150 */ lh $v0, 0x150($s1) /* 6BCCDC 8021914C 46020000 */ add.s $f0, $f0, $f2 /* 6BCCE0 80219150 2403000A */ addiu $v1, $zero, 0xa /* 6BCCE4 80219154 44821000 */ mtc1 $v0, $f2 -/* 6BCCE8 80219158 00000000 */ nop +/* 6BCCE8 80219158 00000000 */ nop /* 6BCCEC 8021915C 468010A0 */ cvt.s.w $f2, $f2 /* 6BCCF0 80219160 46000121 */ cvt.d.s $f4, $f0 /* 6BCCF4 80219164 C6200144 */ lwc1 $f0, 0x144($s1) @@ -149,14 +149,14 @@ glabel func_80218F58_6BCAE8 /* 6BCD10 80219180 3C014028 */ lui $at, 0x4028 /* 6BCD14 80219184 44810800 */ mtc1 $at, $f1 /* 6BCD18 80219188 44800000 */ mtc1 $zero, $f0 -/* 6BCD1C 8021918C 00000000 */ nop +/* 6BCD1C 8021918C 00000000 */ nop /* 6BCD20 80219190 46202000 */ add.d $f0, $f4, $f0 .L80219194: /* 6BCD24 80219194 46200520 */ cvt.s.d $f20, $f0 /* 6BCD28 80219198 86220154 */ lh $v0, 0x154($s1) /* 6BCD2C 8021919C C620014C */ lwc1 $f0, 0x14c($s1) /* 6BCD30 802191A0 44821000 */ mtc1 $v0, $f2 -/* 6BCD34 802191A4 00000000 */ nop +/* 6BCD34 802191A4 00000000 */ nop /* 6BCD38 802191A8 468010A0 */ cvt.s.w $f2, $f2 /* 6BCD3C 802191AC 8E02000C */ lw $v0, 0xc($s0) /* 6BCD40 802191B0 10400059 */ beqz $v0, .L80219318 @@ -165,16 +165,16 @@ glabel func_80218F58_6BCAE8 /* 6BCD4C 802191BC 10600005 */ beqz $v1, .L802191D4 /* 6BCD50 802191C0 24020001 */ addiu $v0, $zero, 1 /* 6BCD54 802191C4 1062002A */ beq $v1, $v0, .L80219270 -/* 6BCD58 802191C8 00000000 */ nop +/* 6BCD58 802191C8 00000000 */ nop /* 6BCD5C 802191CC 080864D4 */ j .L80219350 -/* 6BCD60 802191D0 00000000 */ nop +/* 6BCD60 802191D0 00000000 */ nop .L802191D4: /* 6BCD64 802191D4 8E020014 */ lw $v0, 0x14($s0) /* 6BCD68 802191D8 14400016 */ bnez $v0, .L80219234 /* 6BCD6C 802191DC 2402000A */ addiu $v0, $zero, 0xa /* 6BCD70 802191E0 82230210 */ lb $v1, 0x210($s1) /* 6BCD74 802191E4 10620005 */ beq $v1, $v0, .L802191FC -/* 6BCD78 802191E8 00000000 */ nop +/* 6BCD78 802191E8 00000000 */ nop /* 6BCD7C 802191EC 3C013F80 */ lui $at, 0x3f80 /* 6BCD80 802191F0 44810000 */ mtc1 $at, $f0 /* 6BCD84 802191F4 08086484 */ j .L80219210 @@ -183,7 +183,7 @@ glabel func_80218F58_6BCAE8 /* 6BCD8C 802191FC 3C013ECC */ lui $at, 0x3ecc /* 6BCD90 80219200 3421CCCD */ ori $at, $at, 0xcccd /* 6BCD94 80219204 44810000 */ mtc1 $at, $f0 -/* 6BCD98 80219208 00000000 */ nop +/* 6BCD98 80219208 00000000 */ nop /* 6BCD9C 8021920C E7A00010 */ swc1 $f0, 0x10($sp) .L80219210: /* 6BCDA0 80219210 0000202D */ daddu $a0, $zero, $zero @@ -198,7 +198,7 @@ glabel func_80218F58_6BCAE8 .L80219234: /* 6BCDC4 80219234 8E030018 */ lw $v1, 0x18($s0) /* 6BCDC8 80219238 10600005 */ beqz $v1, .L80219250 -/* 6BCDCC 8021923C 00000000 */ nop +/* 6BCDCC 8021923C 00000000 */ nop /* 6BCDD0 80219240 8C620000 */ lw $v0, ($v1) /* 6BCDD4 80219244 34420010 */ ori $v0, $v0, 0x10 /* 6BCDD8 80219248 AC620000 */ sw $v0, ($v1) @@ -215,7 +215,7 @@ glabel func_80218F58_6BCAE8 .L80219270: /* 6BCE00 80219270 8E030014 */ lw $v1, 0x14($s0) /* 6BCE04 80219274 10600005 */ beqz $v1, .L8021928C -/* 6BCE08 80219278 00000000 */ nop +/* 6BCE08 80219278 00000000 */ nop /* 6BCE0C 8021927C 8C620000 */ lw $v0, ($v1) /* 6BCE10 80219280 34420010 */ ori $v0, $v0, 0x10 /* 6BCE14 80219284 AC620000 */ sw $v0, ($v1) @@ -223,11 +223,11 @@ glabel func_80218F58_6BCAE8 .L8021928C: /* 6BCE1C 8021928C 8E020018 */ lw $v0, 0x18($s0) /* 6BCE20 80219290 14400018 */ bnez $v0, .L802192F4 -/* 6BCE24 80219294 00000000 */ nop +/* 6BCE24 80219294 00000000 */ nop /* 6BCE28 80219298 82230210 */ lb $v1, 0x210($s1) /* 6BCE2C 8021929C 2402000A */ addiu $v0, $zero, 0xa /* 6BCE30 802192A0 10620005 */ beq $v1, $v0, .L802192B8 -/* 6BCE34 802192A4 00000000 */ nop +/* 6BCE34 802192A4 00000000 */ nop /* 6BCE38 802192A8 3C013F80 */ lui $at, 0x3f80 /* 6BCE3C 802192AC 44810000 */ mtc1 $at, $f0 /* 6BCE40 802192B0 080864B3 */ j .L802192CC @@ -236,7 +236,7 @@ glabel func_80218F58_6BCAE8 /* 6BCE48 802192B8 3C013ECC */ lui $at, 0x3ecc /* 6BCE4C 802192BC 3421CCCD */ ori $at, $at, 0xcccd /* 6BCE50 802192C0 44810000 */ mtc1 $at, $f0 -/* 6BCE54 802192C4 00000000 */ nop +/* 6BCE54 802192C4 00000000 */ nop /* 6BCE58 802192C8 E7A00010 */ swc1 $f0, 0x10($sp) .L802192CC: /* 6BCE5C 802192CC 24040001 */ addiu $a0, $zero, 1 @@ -263,7 +263,7 @@ glabel func_80218F58_6BCAE8 .L80219318: /* 6BCEA8 80219318 8E030014 */ lw $v1, 0x14($s0) /* 6BCEAC 8021931C 10600005 */ beqz $v1, .L80219334 -/* 6BCEB0 80219320 00000000 */ nop +/* 6BCEB0 80219320 00000000 */ nop /* 6BCEB4 80219324 8C620000 */ lw $v0, ($v1) /* 6BCEB8 80219328 34420010 */ ori $v0, $v0, 0x10 /* 6BCEBC 8021932C AC620000 */ sw $v0, ($v1) @@ -271,7 +271,7 @@ glabel func_80218F58_6BCAE8 .L80219334: /* 6BCEC4 80219334 8E030018 */ lw $v1, 0x18($s0) /* 6BCEC8 80219338 10600005 */ beqz $v1, .L80219350 -/* 6BCECC 8021933C 00000000 */ nop +/* 6BCECC 8021933C 00000000 */ nop /* 6BCED0 80219340 8C620000 */ lw $v0, ($v1) /* 6BCED4 80219344 34420010 */ ori $v0, $v0, 0x10 /* 6BCED8 80219348 AC620000 */ sw $v0, ($v1) @@ -286,7 +286,7 @@ glabel func_80218F58_6BCAE8 /* 6BCEF8 80219368 0000102D */ daddu $v0, $zero, $zero /* 6BCEFC 8021936C 8E030014 */ lw $v1, 0x14($s0) /* 6BCF00 80219370 10600005 */ beqz $v1, .L80219388 -/* 6BCF04 80219374 00000000 */ nop +/* 6BCF04 80219374 00000000 */ nop /* 6BCF08 80219378 8C620000 */ lw $v0, ($v1) /* 6BCF0C 8021937C 34420010 */ ori $v0, $v0, 0x10 /* 6BCF10 80219380 AC620000 */ sw $v0, ($v1) @@ -294,7 +294,7 @@ glabel func_80218F58_6BCAE8 .L80219388: /* 6BCF18 80219388 8E030018 */ lw $v1, 0x18($s0) /* 6BCF1C 8021938C 10600005 */ beqz $v1, .L802193A4 -/* 6BCF20 80219390 00000000 */ nop +/* 6BCF20 80219390 00000000 */ nop /* 6BCF24 80219394 8C620000 */ lw $v0, ($v1) /* 6BCF28 80219398 34420010 */ ori $v0, $v0, 0x10 /* 6BCF2C 8021939C AC620000 */ sw $v0, ($v1) diff --git a/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802193D4_6BCF64.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802193D4_6BCF64.s index 60311c99f8..b5fd8d916b 100644 --- a/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802193D4_6BCF64.s +++ b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802193D4_6BCF64.s @@ -16,7 +16,7 @@ glabel func_802193D4_6BCF64 .L80219400: /* 6BCF90 80219400 8C830018 */ lw $v1, 0x18($a0) /* 6BCF94 80219404 10600004 */ beqz $v1, .L80219418 -/* 6BCF98 80219408 00000000 */ nop +/* 6BCF98 80219408 00000000 */ nop /* 6BCF9C 8021940C 8C620000 */ lw $v0, ($v1) /* 6BCFA0 80219410 34420010 */ ori $v0, $v0, 0x10 /* 6BCFA4 80219414 AC620000 */ sw $v0, ($v1) diff --git a/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802195F4_6BD184.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802195F4_6BD184.s index 32dd71fe96..0be5709a9f 100644 --- a/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802195F4_6BD184.s +++ b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802195F4_6BD184.s @@ -18,35 +18,44 @@ glabel func_802195F4_6BD184 /* 6BD1B8 80219628 1040001E */ beqz $v0, .L802196A4 /* 6BD1BC 8021962C 0000202D */ daddu $a0, $zero, $zero /* 6BD1C0 80219630 00101080 */ sll $v0, $s0, 2 -/* 6BD1C4 80219634 3C018023 */ lui $at, %hi(D_80228450) +/* 6BD1C4 80219634 3C018023 */ lui $at, %hi(jtbl_80228450_6CBFE0) /* 6BD1C8 80219638 00220821 */ addu $at, $at, $v0 -/* 6BD1CC 8021963C 8C228450 */ lw $v0, %lo(D_80228450)($at) +/* 6BD1CC 8021963C 8C228450 */ lw $v0, %lo(jtbl_80228450_6CBFE0)($at) /* 6BD1D0 80219640 00400008 */ jr $v0 -/* 6BD1D4 80219644 00000000 */ nop +/* 6BD1D4 80219644 00000000 */ nop +glabel L80219648_6BD1D8 /* 6BD1D8 80219648 3C048022 */ lui $a0, %hi(D_8021E990) /* 6BD1DC 8021964C 080865A9 */ j .L802196A4 /* 6BD1E0 80219650 2484E990 */ addiu $a0, $a0, %lo(D_8021E990) +glabel L80219654_6BD1E4 /* 6BD1E4 80219654 3C048022 */ lui $a0, %hi(D_80220644) /* 6BD1E8 80219658 080865A9 */ j .L802196A4 /* 6BD1EC 8021965C 24840644 */ addiu $a0, $a0, %lo(D_80220644) +glabel L80219660_6BD1F0 /* 6BD1F0 80219660 3C048022 */ lui $a0, %hi(D_802218A4) /* 6BD1F4 80219664 080865A9 */ j .L802196A4 /* 6BD1F8 80219668 248418A4 */ addiu $a0, $a0, %lo(D_802218A4) +glabel L8021966C_6BD1FC /* 6BD1FC 8021966C 3C048022 */ lui $a0, %hi(D_80222830) /* 6BD200 80219670 080865A9 */ j .L802196A4 /* 6BD204 80219674 24842830 */ addiu $a0, $a0, %lo(D_80222830) +glabel L80219678_6BD208 /* 6BD208 80219678 3C048022 */ lui $a0, %hi(D_80223C00) /* 6BD20C 8021967C 080865A9 */ j .L802196A4 /* 6BD210 80219680 24843C00 */ addiu $a0, $a0, %lo(D_80223C00) +glabel L80219684_6BD214 /* 6BD214 80219684 3C048022 */ lui $a0, %hi(D_80224AFC) /* 6BD218 80219688 080865A9 */ j .L802196A4 /* 6BD21C 8021968C 24844AFC */ addiu $a0, $a0, %lo(D_80224AFC) +glabel L80219690_6BD220 /* 6BD220 80219690 3C048022 */ lui $a0, %hi(D_80226494) /* 6BD224 80219694 080865A9 */ j .L802196A4 /* 6BD228 80219698 24846494 */ addiu $a0, $a0, %lo(D_80226494) +glabel L8021969C_6BD22C /* 6BD22C 8021969C 3C048022 */ lui $a0, %hi(D_80227734) /* 6BD230 802196A0 24847734 */ addiu $a0, $a0, %lo(D_80227734) .L802196A4: +glabel L802196A4_6BD234 /* 6BD234 802196A4 806301F1 */ lb $v1, 0x1f1($v1) /* 6BD238 802196A8 AC830008 */ sw $v1, 8($a0) /* 6BD23C 802196AC 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_kpa4/6CC1C0/func_80218150_6CC1C0.s b/asm/nonmatchings/battle/area_kpa4/6CC1C0/func_80218150_6CC1C0.s index 0dd83a6f64..549e086f2b 100644 --- a/asm/nonmatchings/battle/area_kpa4/6CC1C0/func_80218150_6CC1C0.s +++ b/asm/nonmatchings/battle/area_kpa4/6CC1C0/func_80218150_6CC1C0.s @@ -69,12 +69,12 @@ glabel func_80218150_6CC1C0 /* 6CC2C0 80218250 82030210 */ lb $v1, 0x210($s0) /* 6CC2C4 80218254 2402000A */ addiu $v0, $zero, 0xa /* 6CC2C8 80218258 14620007 */ bne $v1, $v0, .L80218278 -/* 6CC2CC 8021825C 00000000 */ nop +/* 6CC2CC 8021825C 00000000 */ nop /* 6CC2D0 80218260 8C82000C */ lw $v0, 0xc($a0) /* 6CC2D4 80218264 3C013ECC */ lui $at, 0x3ecc /* 6CC2D8 80218268 3421CCCD */ ori $at, $at, 0xcccd /* 6CC2DC 8021826C 44810000 */ mtc1 $at, $f0 -/* 6CC2E0 80218270 00000000 */ nop +/* 6CC2E0 80218270 00000000 */ nop /* 6CC2E4 80218274 E4400028 */ swc1 $f0, 0x28($v0) .L80218278: /* 6CC2E8 80218278 8FBF0028 */ lw $ra, 0x28($sp) diff --git a/asm/nonmatchings/battle/area_kpa4/6CC1C0/func_80218588_6CC5F8.s b/asm/nonmatchings/battle/area_kpa4/6CC1C0/func_80218588_6CC5F8.s index 6df6402586..043fe1b768 100644 --- a/asm/nonmatchings/battle/area_kpa4/6CC1C0/func_80218588_6CC5F8.s +++ b/asm/nonmatchings/battle/area_kpa4/6CC1C0/func_80218588_6CC5F8.s @@ -14,11 +14,11 @@ glabel func_80218588_6CC5F8 /* 6CC61C 802185AC 0040202D */ daddu $a0, $v0, $zero /* 6CC620 802185B0 2402FF81 */ addiu $v0, $zero, -0x7f /* 6CC624 802185B4 14820002 */ bne $a0, $v0, .L802185C0 -/* 6CC628 802185B8 00000000 */ nop +/* 6CC628 802185B8 00000000 */ nop /* 6CC62C 802185BC 8E240148 */ lw $a0, 0x148($s1) .L802185C0: /* 6CC630 802185C0 0C09A75B */ jal get_actor -/* 6CC634 802185C4 00000000 */ nop +/* 6CC634 802185C4 00000000 */ nop /* 6CC638 802185C8 0040202D */ daddu $a0, $v0, $zero /* 6CC63C 802185CC 90830136 */ lbu $v1, 0x136($a0) /* 6CC640 802185D0 24020047 */ addiu $v0, $zero, 0x47 @@ -49,11 +49,11 @@ glabel func_80218588_6CC5F8 /* 6CC698 80218628 0000302D */ daddu $a2, $zero, $zero .L8021862C: /* 6CC69C 8021862C 0C0B2026 */ jal set_variable -/* 6CC6A0 80218630 00000000 */ nop +/* 6CC6A0 80218630 00000000 */ nop /* 6CC6A4 80218634 8FBF0018 */ lw $ra, 0x18($sp) /* 6CC6A8 80218638 8FB10014 */ lw $s1, 0x14($sp) /* 6CC6AC 8021863C 8FB00010 */ lw $s0, 0x10($sp) /* 6CC6B0 80218640 24020002 */ addiu $v0, $zero, 2 /* 6CC6B4 80218644 03E00008 */ jr $ra /* 6CC6B8 80218648 27BD0020 */ addiu $sp, $sp, 0x20 -/* 6CC6BC 8021864C 00000000 */ nop +/* 6CC6BC 8021864C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kzn/58C2F0/func_80218000_58C2F0.s b/asm/nonmatchings/battle/area_kzn/58C2F0/func_80218000_58C2F0.s index d685e29712..107c98a874 100644 --- a/asm/nonmatchings/battle/area_kzn/58C2F0/func_80218000_58C2F0.s +++ b/asm/nonmatchings/battle/area_kzn/58C2F0/func_80218000_58C2F0.s @@ -17,26 +17,26 @@ glabel func_80218000_58C2F0 /* 58C320 80218030 C6200144 */ lwc1 $f0, 0x144($s1) /* 58C324 80218034 46001081 */ sub.s $f2, $f2, $f0 /* 58C328 80218038 46021082 */ mul.s $f2, $f2, $f2 -/* 58C32C 8021803C 00000000 */ nop +/* 58C32C 8021803C 00000000 */ nop /* 58C330 80218040 C626001C */ lwc1 $f6, 0x1c($s1) /* 58C334 80218044 C6200148 */ lwc1 $f0, 0x148($s1) /* 58C338 80218048 46003181 */ sub.s $f6, $f6, $f0 /* 58C33C 8021804C 46063182 */ mul.s $f6, $f6, $f6 -/* 58C340 80218050 00000000 */ nop +/* 58C340 80218050 00000000 */ nop /* 58C344 80218054 C624014C */ lwc1 $f4, 0x14c($s1) /* 58C348 80218058 C6200020 */ lwc1 $f0, 0x20($s1) /* 58C34C 8021805C 46040001 */ sub.s $f0, $f0, $f4 /* 58C350 80218060 46000002 */ mul.s $f0, $f0, $f0 -/* 58C354 80218064 00000000 */ nop +/* 58C354 80218064 00000000 */ nop /* 58C358 80218068 46061080 */ add.s $f2, $f2, $f6 /* 58C35C 8021806C 46001300 */ add.s $f12, $f2, $f0 /* 58C360 80218070 46006104 */ sqrt.s $f4, $f12 /* 58C364 80218074 46042032 */ c.eq.s $f4, $f4 -/* 58C368 80218078 00000000 */ nop +/* 58C368 80218078 00000000 */ nop /* 58C36C 8021807C 45010004 */ bc1t .L80218090 -/* 58C370 80218080 00000000 */ nop +/* 58C370 80218080 00000000 */ nop /* 58C374 80218084 0C0187BC */ jal sqrtf -/* 58C378 80218088 00000000 */ nop +/* 58C378 80218088 00000000 */ nop /* 58C37C 8021808C 46000106 */ mov.s $f4, $f0 .L80218090: /* 58C380 80218090 C620004C */ lwc1 $f0, 0x4c($s1) @@ -44,10 +44,10 @@ glabel func_80218000_58C2F0 /* 58C388 80218098 44811000 */ mtc1 $at, $f2 /* 58C38C 8021809C 46002003 */ div.s $f0, $f4, $f0 /* 58C390 802180A0 46020002 */ mul.s $f0, $f0, $f2 -/* 58C394 802180A4 00000000 */ nop +/* 58C394 802180A4 00000000 */ nop /* 58C398 802180A8 3C013F80 */ lui $at, 0x3f80 /* 58C39C 802180AC 44811000 */ mtc1 $at, $f2 -/* 58C3A0 802180B0 00000000 */ nop +/* 58C3A0 802180B0 00000000 */ nop /* 58C3A4 802180B4 46020000 */ add.s $f0, $f0, $f2 /* 58C3A8 802180B8 4600020D */ trunc.w.s $f8, $f0 /* 58C3AC 802180BC E6480070 */ swc1 $f8, 0x70($s2) diff --git a/asm/nonmatchings/battle/area_kzn/58C2F0/func_802181FC_58C4EC.s b/asm/nonmatchings/battle/area_kzn/58C2F0/func_802181FC_58C4EC.s index 2295783d86..11dd961097 100644 --- a/asm/nonmatchings/battle/area_kzn/58C2F0/func_802181FC_58C4EC.s +++ b/asm/nonmatchings/battle/area_kzn/58C2F0/func_802181FC_58C4EC.s @@ -57,15 +57,15 @@ glabel func_802181FC_58C4EC /* 58C5BC 802182CC 0040882D */ daddu $s1, $v0, $zero /* 58C5C0 802182D0 24040001 */ addiu $a0, $zero, 1 /* 58C5C4 802182D4 44961000 */ mtc1 $s6, $f2 -/* 58C5C8 802182D8 00000000 */ nop +/* 58C5C8 802182D8 00000000 */ nop /* 58C5CC 802182DC 468010A0 */ cvt.s.w $f2, $f2 /* 58C5D0 802182E0 44051000 */ mfc1 $a1, $f2 /* 58C5D4 802182E4 44951000 */ mtc1 $s5, $f2 -/* 58C5D8 802182E8 00000000 */ nop +/* 58C5D8 802182E8 00000000 */ nop /* 58C5DC 802182EC 468010A0 */ cvt.s.w $f2, $f2 /* 58C5E0 802182F0 44061000 */ mfc1 $a2, $f2 /* 58C5E4 802182F4 44941000 */ mtc1 $s4, $f2 -/* 58C5E8 802182F8 00000000 */ nop +/* 58C5E8 802182F8 00000000 */ nop /* 58C5EC 802182FC 468010A0 */ cvt.s.w $f2, $f2 /* 58C5F0 80218300 44071000 */ mfc1 $a3, $f2 /* 58C5F4 80218304 0040802D */ daddu $s0, $v0, $zero @@ -97,5 +97,5 @@ glabel func_802181FC_58C4EC /* 58C65C 8021836C 24020002 */ addiu $v0, $zero, 2 /* 58C660 80218370 03E00008 */ jr $ra /* 58C664 80218374 27BD0040 */ addiu $sp, $sp, 0x40 -/* 58C668 80218378 00000000 */ nop -/* 58C66C 8021837C 00000000 */ nop +/* 58C668 80218378 00000000 */ nop +/* 58C66C 8021837C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kzn/58C740/func_8021851C_58C80C.s b/asm/nonmatchings/battle/area_kzn/58C740/func_8021851C_58C80C.s index 8c0b59bd97..d8dd35d906 100644 --- a/asm/nonmatchings/battle/area_kzn/58C740/func_8021851C_58C80C.s +++ b/asm/nonmatchings/battle/area_kzn/58C740/func_8021851C_58C80C.s @@ -35,26 +35,26 @@ glabel func_8021851C_58C80C /* 58C884 80218594 34210FD8 */ ori $at, $at, 0xfd8 /* 58C888 80218598 44814000 */ mtc1 $at, $f8 /* 58C88C 8021859C 44922000 */ mtc1 $s2, $f4 -/* 58C890 802185A0 00000000 */ nop +/* 58C890 802185A0 00000000 */ nop /* 58C894 802185A4 46802120 */ cvt.s.w $f4, $f4 /* 58C898 802185A8 46082202 */ mul.s $f8, $f4, $f8 -/* 58C89C 802185AC 00000000 */ nop +/* 58C89C 802185AC 00000000 */ nop /* 58C8A0 802185B0 44903000 */ mtc1 $s0, $f6 -/* 58C8A4 802185B4 00000000 */ nop +/* 58C8A4 802185B4 00000000 */ nop /* 58C8A8 802185B8 468031A0 */ cvt.s.w $f6, $f6 /* 58C8AC 802185BC 3C013F80 */ lui $at, 0x3f80 /* 58C8B0 802185C0 44811000 */ mtc1 $at, $f2 /* 58C8B4 802185C4 46062103 */ div.s $f4, $f4, $f6 /* 58C8B8 802185C8 46041081 */ sub.s $f2, $f2, $f4 /* 58C8BC 802185CC 46020502 */ mul.s $f20, $f0, $f2 -/* 58C8C0 802185D0 00000000 */ nop +/* 58C8C0 802185D0 00000000 */ nop /* 58C8C4 802185D4 44936000 */ mtc1 $s3, $f12 -/* 58C8C8 802185D8 00000000 */ nop +/* 58C8C8 802185D8 00000000 */ nop /* 58C8CC 802185DC 46806320 */ cvt.s.w $f12, $f12 /* 58C8D0 802185E0 0C00A874 */ jal cos_rad /* 58C8D4 802185E4 460C4303 */ div.s $f12, $f8, $f12 /* 58C8D8 802185E8 4600A502 */ mul.s $f20, $f20, $f0 -/* 58C8DC 802185EC 00000000 */ nop +/* 58C8DC 802185EC 00000000 */ nop /* 58C8E0 802185F0 0220202D */ daddu $a0, $s1, $zero /* 58C8E4 802185F4 4600A28D */ trunc.w.s $f10, $f20 /* 58C8E8 802185F8 44065000 */ mfc1 $a2, $f10 @@ -70,4 +70,4 @@ glabel func_8021851C_58C80C /* 58C910 80218620 24020002 */ addiu $v0, $zero, 2 /* 58C914 80218624 03E00008 */ jr $ra /* 58C918 80218628 27BD0030 */ addiu $sp, $sp, 0x30 -/* 58C91C 8021862C 00000000 */ nop +/* 58C91C 8021862C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kzn/58C740/func_80218630_58C920.s b/asm/nonmatchings/battle/area_kzn/58C740/func_80218630_58C920.s index 1c8fca7a10..2079b90c02 100644 --- a/asm/nonmatchings/battle/area_kzn/58C740/func_80218630_58C920.s +++ b/asm/nonmatchings/battle/area_kzn/58C740/func_80218630_58C920.s @@ -69,12 +69,12 @@ glabel func_80218630_58C920 /* 58CA20 80218730 82030210 */ lb $v1, 0x210($s0) /* 58CA24 80218734 2402000A */ addiu $v0, $zero, 0xa /* 58CA28 80218738 14620007 */ bne $v1, $v0, .L80218758 -/* 58CA2C 8021873C 00000000 */ nop +/* 58CA2C 8021873C 00000000 */ nop /* 58CA30 80218740 8C82000C */ lw $v0, 0xc($a0) /* 58CA34 80218744 3C013ECC */ lui $at, 0x3ecc /* 58CA38 80218748 3421CCCD */ ori $at, $at, 0xcccd /* 58CA3C 8021874C 44810000 */ mtc1 $at, $f0 -/* 58CA40 80218750 00000000 */ nop +/* 58CA40 80218750 00000000 */ nop /* 58CA44 80218754 E4400028 */ swc1 $f0, 0x28($v0) .L80218758: /* 58CA48 80218758 8FBF0028 */ lw $ra, 0x28($sp) diff --git a/asm/nonmatchings/battle/area_kzn/58C740/func_802188D8_58CBC8.s b/asm/nonmatchings/battle/area_kzn/58C740/func_802188D8_58CBC8.s index d55d0cad80..11f848ec12 100644 --- a/asm/nonmatchings/battle/area_kzn/58C740/func_802188D8_58CBC8.s +++ b/asm/nonmatchings/battle/area_kzn/58C740/func_802188D8_58CBC8.s @@ -14,11 +14,11 @@ glabel func_802188D8_58CBC8 /* 58CBEC 802188FC 0040202D */ daddu $a0, $v0, $zero /* 58CBF0 80218900 2402FF81 */ addiu $v0, $zero, -0x7f /* 58CBF4 80218904 14820002 */ bne $a0, $v0, .L80218910 -/* 58CBF8 80218908 00000000 */ nop +/* 58CBF8 80218908 00000000 */ nop /* 58CBFC 8021890C 8E240148 */ lw $a0, 0x148($s1) .L80218910: /* 58CC00 80218910 0C09A75B */ jal get_actor -/* 58CC04 80218914 00000000 */ nop +/* 58CC04 80218914 00000000 */ nop /* 58CC08 80218918 0040202D */ daddu $a0, $v0, $zero /* 58CC0C 8021891C 90830136 */ lbu $v1, 0x136($a0) /* 58CC10 80218920 24020047 */ addiu $v0, $zero, 0x47 @@ -49,11 +49,11 @@ glabel func_802188D8_58CBC8 /* 58CC68 80218978 0000302D */ daddu $a2, $zero, $zero .L8021897C: /* 58CC6C 8021897C 0C0B2026 */ jal set_variable -/* 58CC70 80218980 00000000 */ nop +/* 58CC70 80218980 00000000 */ nop /* 58CC74 80218984 8FBF0018 */ lw $ra, 0x18($sp) /* 58CC78 80218988 8FB10014 */ lw $s1, 0x14($sp) /* 58CC7C 8021898C 8FB00010 */ lw $s0, 0x10($sp) /* 58CC80 80218990 24020002 */ addiu $v0, $zero, 2 /* 58CC84 80218994 03E00008 */ jr $ra /* 58CC88 80218998 27BD0020 */ addiu $sp, $sp, 0x20 -/* 58CC8C 8021899C 00000000 */ nop +/* 58CC8C 8021899C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kzn/58C740/func_802189A0_58CC90.s b/asm/nonmatchings/battle/area_kzn/58C740/func_802189A0_58CC90.s index 441c2db093..85b1ed8daf 100644 --- a/asm/nonmatchings/battle/area_kzn/58C740/func_802189A0_58CC90.s +++ b/asm/nonmatchings/battle/area_kzn/58C740/func_802189A0_58CC90.s @@ -69,12 +69,12 @@ glabel func_802189A0_58CC90 /* 58CD90 80218AA0 82030210 */ lb $v1, 0x210($s0) /* 58CD94 80218AA4 2402000A */ addiu $v0, $zero, 0xa /* 58CD98 80218AA8 14620007 */ bne $v1, $v0, .L80218AC8 -/* 58CD9C 80218AAC 00000000 */ nop +/* 58CD9C 80218AAC 00000000 */ nop /* 58CDA0 80218AB0 8C82000C */ lw $v0, 0xc($a0) /* 58CDA4 80218AB4 3C013ECC */ lui $at, 0x3ecc /* 58CDA8 80218AB8 3421CCCD */ ori $at, $at, 0xcccd /* 58CDAC 80218ABC 44810000 */ mtc1 $at, $f0 -/* 58CDB0 80218AC0 00000000 */ nop +/* 58CDB0 80218AC0 00000000 */ nop /* 58CDB4 80218AC4 E4400028 */ swc1 $f0, 0x28($v0) .L80218AC8: /* 58CDB8 80218AC8 8FBF0028 */ lw $ra, 0x28($sp) diff --git a/asm/nonmatchings/battle/area_kzn/58C740/func_80218C48_58CF38.s b/asm/nonmatchings/battle/area_kzn/58C740/func_80218C48_58CF38.s index ac32633040..603624af81 100644 --- a/asm/nonmatchings/battle/area_kzn/58C740/func_80218C48_58CF38.s +++ b/asm/nonmatchings/battle/area_kzn/58C740/func_80218C48_58CF38.s @@ -14,11 +14,11 @@ glabel func_80218C48_58CF38 /* 58CF5C 80218C6C 0040202D */ daddu $a0, $v0, $zero /* 58CF60 80218C70 2402FF81 */ addiu $v0, $zero, -0x7f /* 58CF64 80218C74 14820002 */ bne $a0, $v0, .L80218C80 -/* 58CF68 80218C78 00000000 */ nop +/* 58CF68 80218C78 00000000 */ nop /* 58CF6C 80218C7C 8E240148 */ lw $a0, 0x148($s1) .L80218C80: /* 58CF70 80218C80 0C09A75B */ jal get_actor -/* 58CF74 80218C84 00000000 */ nop +/* 58CF74 80218C84 00000000 */ nop /* 58CF78 80218C88 0040202D */ daddu $a0, $v0, $zero /* 58CF7C 80218C8C 90830136 */ lbu $v1, 0x136($a0) /* 58CF80 80218C90 24020047 */ addiu $v0, $zero, 0x47 @@ -49,7 +49,7 @@ glabel func_80218C48_58CF38 /* 58CFD8 80218CE8 0000302D */ daddu $a2, $zero, $zero .L80218CEC: /* 58CFDC 80218CEC 0C0B2026 */ jal set_variable -/* 58CFE0 80218CF0 00000000 */ nop +/* 58CFE0 80218CF0 00000000 */ nop /* 58CFE4 80218CF4 8FBF0018 */ lw $ra, 0x18($sp) /* 58CFE8 80218CF8 8FB10014 */ lw $s1, 0x14($sp) /* 58CFEC 80218CFC 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/battle/area_kzn/58C740/func_80218D6C_58D05C.s b/asm/nonmatchings/battle/area_kzn/58C740/func_80218D6C_58D05C.s index 003be1426a..52845aee0e 100644 --- a/asm/nonmatchings/battle/area_kzn/58C740/func_80218D6C_58D05C.s +++ b/asm/nonmatchings/battle/area_kzn/58C740/func_80218D6C_58D05C.s @@ -21,7 +21,7 @@ glabel func_80218D6C_58D05C /* 58D09C 80218DAC 0040902D */ daddu $s2, $v0, $zero /* 58D0A0 80218DB0 2402FF81 */ addiu $v0, $zero, -0x7f /* 58D0A4 80218DB4 16220002 */ bne $s1, $v0, .L80218DC0 -/* 58D0A8 80218DB8 00000000 */ nop +/* 58D0A8 80218DB8 00000000 */ nop /* 58D0AC 80218DBC 8E710148 */ lw $s1, 0x148($s3) .L80218DC0: /* 58D0B0 80218DC0 0C09A75B */ jal get_actor diff --git a/asm/nonmatchings/battle/area_kzn2/59E6E0/func_8021812C_59E80C.s b/asm/nonmatchings/battle/area_kzn2/59E6E0/func_8021812C_59E80C.s index 40f79bdf9c..a314e04228 100644 --- a/asm/nonmatchings/battle/area_kzn2/59E6E0/func_8021812C_59E80C.s +++ b/asm/nonmatchings/battle/area_kzn2/59E6E0/func_8021812C_59E80C.s @@ -34,7 +34,7 @@ glabel func_8021812C_59E80C /* 59E880 802181A0 0C0B1EAF */ jal get_variable /* 59E884 802181A4 0040802D */ daddu $s0, $v0, $zero /* 59E888 802181A8 44821000 */ mtc1 $v0, $f2 -/* 59E88C 802181AC 00000000 */ nop +/* 59E88C 802181AC 00000000 */ nop /* 59E890 802181B0 468010A0 */ cvt.s.w $f2, $f2 /* 59E894 802181B4 24020002 */ addiu $v0, $zero, 2 /* 59E898 802181B8 3C038023 */ lui $v1, %hi(D_8022ADD0) @@ -48,11 +48,11 @@ glabel func_8021812C_59E80C /* 59E8B8 802181D8 00431804 */ sllv $v1, $v1, $v0 /* 59E8BC 802181DC 00832021 */ addu $a0, $a0, $v1 /* 59E8C0 802181E0 44940000 */ mtc1 $s4, $f0 -/* 59E8C4 802181E4 00000000 */ nop +/* 59E8C4 802181E4 00000000 */ nop /* 59E8C8 802181E8 46800020 */ cvt.s.w $f0, $f0 /* 59E8CC 802181EC E4800000 */ swc1 $f0, ($a0) /* 59E8D0 802181F0 44900000 */ mtc1 $s0, $f0 -/* 59E8D4 802181F4 00000000 */ nop +/* 59E8D4 802181F4 00000000 */ nop /* 59E8D8 802181F8 46800020 */ cvt.s.w $f0, $f0 /* 59E8DC 802181FC E4800004 */ swc1 $f0, 4($a0) /* 59E8E0 80218200 E4820008 */ swc1 $f2, 8($a0) diff --git a/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218224_59E904.s b/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218224_59E904.s index 5ff33fb82e..94e0628607 100644 --- a/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218224_59E904.s +++ b/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218224_59E904.s @@ -31,7 +31,7 @@ glabel func_80218224_59E904 /* 59E96C 8021828C 0C0B1EAF */ jal get_variable /* 59E970 80218290 0220202D */ daddu $a0, $s1, $zero /* 59E974 80218294 44820000 */ mtc1 $v0, $f0 -/* 59E978 80218298 00000000 */ nop +/* 59E978 80218298 00000000 */ nop /* 59E97C 8021829C 46800020 */ cvt.s.w $f0, $f0 /* 59E980 802182A0 24020002 */ addiu $v0, $zero, 2 /* 59E984 802182A4 3C048023 */ lui $a0, %hi(D_8022ADD0) diff --git a/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218930_59F010.s b/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218930_59F010.s index 3dc56c352e..0eac44c57c 100644 --- a/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218930_59F010.s +++ b/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218930_59F010.s @@ -35,7 +35,7 @@ glabel func_80218930_59F010 /* 59F088 802189A8 8E050000 */ lw $a1, ($s0) /* 59F08C 802189AC 26100004 */ addiu $s0, $s0, 4 /* 59F090 802189B0 4482B000 */ mtc1 $v0, $f22 -/* 59F094 802189B4 00000000 */ nop +/* 59F094 802189B4 00000000 */ nop /* 59F098 802189B8 4680B5A0 */ cvt.s.w $f22, $f22 /* 59F09C 802189BC 0C0B1EAF */ jal get_variable /* 59F0A0 802189C0 0220202D */ daddu $a0, $s1, $zero @@ -52,30 +52,30 @@ glabel func_80218930_59F010 /* 59F0CC 802189EC 0C00A8D4 */ jal cos_deg /* 59F0D0 802189F0 0040802D */ daddu $s0, $v0, $zero /* 59F0D4 802189F4 4493A000 */ mtc1 $s3, $f20 -/* 59F0D8 802189F8 00000000 */ nop +/* 59F0D8 802189F8 00000000 */ nop /* 59F0DC 802189FC 4680A520 */ cvt.s.w $f20, $f20 /* 59F0E0 80218A00 46140002 */ mul.s $f0, $f0, $f20 -/* 59F0E4 80218A04 00000000 */ nop +/* 59F0E4 80218A04 00000000 */ nop /* 59F0E8 80218A08 44951000 */ mtc1 $s5, $f2 -/* 59F0EC 80218A0C 00000000 */ nop +/* 59F0EC 80218A0C 00000000 */ nop /* 59F0F0 80218A10 468010A0 */ cvt.s.w $f2, $f2 /* 59F0F4 80218A14 46001081 */ sub.s $f2, $f2, $f0 /* 59F0F8 80218A18 4600B306 */ mov.s $f12, $f22 /* 59F0FC 80218A1C 0C00A8BB */ jal sin_deg /* 59F100 80218A20 E6820004 */ swc1 $f2, 4($s4) /* 59F104 80218A24 46140002 */ mul.s $f0, $f0, $f20 -/* 59F108 80218A28 00000000 */ nop +/* 59F108 80218A28 00000000 */ nop /* 59F10C 80218A2C 3C013C23 */ lui $at, 0x3c23 /* 59F110 80218A30 3421D70A */ ori $at, $at, 0xd70a /* 59F114 80218A34 44811000 */ mtc1 $at, $f2 /* 59F118 80218A38 44902000 */ mtc1 $s0, $f4 -/* 59F11C 80218A3C 00000000 */ nop +/* 59F11C 80218A3C 00000000 */ nop /* 59F120 80218A40 46802120 */ cvt.s.w $f4, $f4 /* 59F124 80218A44 46022102 */ mul.s $f4, $f4, $f2 -/* 59F128 80218A48 00000000 */ nop +/* 59F128 80218A48 00000000 */ nop /* 59F12C 80218A4C 02519021 */ addu $s2, $s2, $s1 /* 59F130 80218A50 44921000 */ mtc1 $s2, $f2 -/* 59F134 80218A54 00000000 */ nop +/* 59F134 80218A54 00000000 */ nop /* 59F138 80218A58 468010A0 */ cvt.s.w $f2, $f2 /* 59F13C 80218A5C 46001081 */ sub.s $f2, $f2, $f0 /* 59F140 80218A60 E6840010 */ swc1 $f4, 0x10($s4) diff --git a/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218A98_59F178.s b/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218A98_59F178.s index a648e83baa..67a295d039 100644 --- a/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218A98_59F178.s +++ b/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218A98_59F178.s @@ -31,7 +31,7 @@ glabel func_80218A98_59F178 /* 59F1DC 80218AFC 0000102D */ daddu $v0, $zero, $zero .L80218B00: /* 59F1E0 80218B00 0C052B02 */ jal func_8014AC08 -/* 59F1E4 80218B04 00000000 */ nop +/* 59F1E4 80218B04 00000000 */ nop /* 59F1E8 80218B08 080862CB */ j .L80218B2C /* 59F1EC 80218B0C 0000102D */ daddu $v0, $zero, $zero .L80218B10: diff --git a/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218BE8_59F2C8.s b/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218BE8_59F2C8.s index 51d9f38ea0..7bd1475770 100644 --- a/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218BE8_59F2C8.s +++ b/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218BE8_59F2C8.s @@ -30,7 +30,7 @@ glabel func_80218BE8_59F2C8 /* 59F32C 80218C4C 8E050000 */ lw $a1, ($s0) /* 59F330 80218C50 26100004 */ addiu $s0, $s0, 4 /* 59F334 80218C54 4482B000 */ mtc1 $v0, $f22 -/* 59F338 80218C58 00000000 */ nop +/* 59F338 80218C58 00000000 */ nop /* 59F33C 80218C5C 4680B5A0 */ cvt.s.w $f22, $f22 /* 59F340 80218C60 0C0B1EAF */ jal get_variable /* 59F344 80218C64 0240202D */ daddu $a0, $s2, $zero @@ -42,12 +42,12 @@ glabel func_80218BE8_59F2C8 /* 59F35C 80218C7C 0C00A8D4 */ jal cos_deg /* 59F360 80218C80 0040882D */ daddu $s1, $v0, $zero /* 59F364 80218C84 4493A000 */ mtc1 $s3, $f20 -/* 59F368 80218C88 00000000 */ nop +/* 59F368 80218C88 00000000 */ nop /* 59F36C 80218C8C 4680A520 */ cvt.s.w $f20, $f20 /* 59F370 80218C90 46140002 */ mul.s $f0, $f0, $f20 -/* 59F374 80218C94 00000000 */ nop +/* 59F374 80218C94 00000000 */ nop /* 59F378 80218C98 44951000 */ mtc1 $s5, $f2 -/* 59F37C 80218C9C 00000000 */ nop +/* 59F37C 80218C9C 00000000 */ nop /* 59F380 80218CA0 468010A0 */ cvt.s.w $f2, $f2 /* 59F384 80218CA4 46001081 */ sub.s $f2, $f2, $f0 /* 59F388 80218CA8 26100004 */ addiu $s0, $s0, 4 @@ -56,12 +56,12 @@ glabel func_80218BE8_59F2C8 /* 59F394 80218CB4 0C00A8BB */ jal sin_deg /* 59F398 80218CB8 4600B306 */ mov.s $f12, $f22 /* 59F39C 80218CBC 46140002 */ mul.s $f0, $f0, $f20 -/* 59F3A0 80218CC0 00000000 */ nop +/* 59F3A0 80218CC0 00000000 */ nop /* 59F3A4 80218CC4 8E050000 */ lw $a1, ($s0) /* 59F3A8 80218CC8 26100004 */ addiu $s0, $s0, 4 /* 59F3AC 80218CCC 02918821 */ addu $s1, $s4, $s1 /* 59F3B0 80218CD0 44911000 */ mtc1 $s1, $f2 -/* 59F3B4 80218CD4 00000000 */ nop +/* 59F3B4 80218CD4 00000000 */ nop /* 59F3B8 80218CD8 468010A0 */ cvt.s.w $f2, $f2 /* 59F3BC 80218CDC 46001081 */ sub.s $f2, $f2, $f0 /* 59F3C0 80218CE0 0240202D */ daddu $a0, $s2, $zero @@ -85,6 +85,6 @@ glabel func_80218BE8_59F2C8 /* 59F408 80218D28 24020002 */ addiu $v0, $zero, 2 /* 59F40C 80218D2C 03E00008 */ jr $ra /* 59F410 80218D30 27BD0040 */ addiu $sp, $sp, 0x40 -/* 59F414 80218D34 00000000 */ nop -/* 59F418 80218D38 00000000 */ nop -/* 59F41C 80218D3C 00000000 */ nop +/* 59F414 80218D34 00000000 */ nop +/* 59F418 80218D38 00000000 */ nop +/* 59F41C 80218D3C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kzn2/59F420/func_80218D90_59F470.s b/asm/nonmatchings/battle/area_kzn2/59F420/func_80218D90_59F470.s index bf72f26944..a62f77a411 100644 --- a/asm/nonmatchings/battle/area_kzn2/59F420/func_80218D90_59F470.s +++ b/asm/nonmatchings/battle/area_kzn2/59F420/func_80218D90_59F470.s @@ -16,7 +16,7 @@ glabel func_80218D90_59F470 /* 59F49C 80218DBC 0C0B1EAF */ jal get_variable /* 59F4A0 80218DC0 0220202D */ daddu $a0, $s1, $zero /* 59F4A4 80218DC4 44820000 */ mtc1 $v0, $f0 -/* 59F4A8 80218DC8 00000000 */ nop +/* 59F4A8 80218DC8 00000000 */ nop /* 59F4AC 80218DCC 46800020 */ cvt.s.w $f0, $f0 /* 59F4B0 80218DD0 E6000004 */ swc1 $f0, 4($s0) /* 59F4B4 80218DD4 8FBF0018 */ lw $ra, 0x18($sp) @@ -25,4 +25,4 @@ glabel func_80218D90_59F470 /* 59F4C0 80218DE0 24020002 */ addiu $v0, $zero, 2 /* 59F4C4 80218DE4 03E00008 */ jr $ra /* 59F4C8 80218DE8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 59F4CC 80218DEC 00000000 */ nop +/* 59F4CC 80218DEC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kzn2/59F420/func_80218DF0_59F4D0.s b/asm/nonmatchings/battle/area_kzn2/59F420/func_80218DF0_59F4D0.s index 304a830c1d..933adc8a10 100644 --- a/asm/nonmatchings/battle/area_kzn2/59F420/func_80218DF0_59F4D0.s +++ b/asm/nonmatchings/battle/area_kzn2/59F420/func_80218DF0_59F4D0.s @@ -23,6 +23,6 @@ glabel func_80218DF0_59F4D0 /* 59F518 80218E38 24020002 */ addiu $v0, $zero, 2 /* 59F51C 80218E3C 03E00008 */ jr $ra /* 59F520 80218E40 27BD0020 */ addiu $sp, $sp, 0x20 -/* 59F524 80218E44 00000000 */ nop -/* 59F528 80218E48 00000000 */ nop -/* 59F52C 80218E4C 00000000 */ nop +/* 59F524 80218E44 00000000 */ nop +/* 59F528 80218E48 00000000 */ nop +/* 59F52C 80218E4C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_mac/464560/func_80218300_464790.s b/asm/nonmatchings/battle/area_mac/464560/func_80218300_464790.s index afd722ec31..ba50ed76ce 100644 --- a/asm/nonmatchings/battle/area_mac/464560/func_80218300_464790.s +++ b/asm/nonmatchings/battle/area_mac/464560/func_80218300_464790.s @@ -40,7 +40,7 @@ glabel func_80218300_464790 .L8021838C: /* 46481C 8021838C 8E820070 */ lw $v0, 0x70($s4) /* 464820 80218390 144000F7 */ bnez $v0, .L80218770 -/* 464824 80218394 00000000 */ nop +/* 464824 80218394 00000000 */ nop /* 464828 80218398 C6600144 */ lwc1 $f0, 0x144($s3) /* 46482C 8021839C C638000C */ lwc1 $f24, 0xc($s1) /* 464830 802183A0 C63A0014 */ lwc1 $f26, 0x14($s1) @@ -70,29 +70,29 @@ glabel func_80218300_464790 /* 464890 80218400 46002003 */ div.s $f0, $f4, $f0 /* 464894 80218404 4600028D */ trunc.w.s $f10, $f0 /* 464898 80218408 44035000 */ mfc1 $v1, $f10 -/* 46489C 8021840C 00000000 */ nop +/* 46489C 8021840C 00000000 */ nop /* 4648A0 80218410 00031400 */ sll $v0, $v1, 0x10 /* 4648A4 80218414 00021403 */ sra $v0, $v0, 0x10 /* 4648A8 80218418 44820000 */ mtc1 $v0, $f0 -/* 4648AC 8021841C 00000000 */ nop +/* 4648AC 8021841C 00000000 */ nop /* 4648B0 80218420 46800020 */ cvt.s.w $f0, $f0 /* 4648B4 80218424 46020002 */ mul.s $f0, $f0, $f2 -/* 4648B8 80218428 00000000 */ nop +/* 4648B8 80218428 00000000 */ nop /* 4648BC 8021842C 46002086 */ mov.s $f2, $f4 /* 4648C0 80218430 A6230064 */ sh $v1, 0x64($s1) /* 4648C4 80218434 0808611C */ j .L80218470 /* 4648C8 80218438 46001201 */ sub.s $f8, $f2, $f0 .L8021843C: /* 4648CC 8021843C 44821000 */ mtc1 $v0, $f2 -/* 4648D0 80218440 00000000 */ nop +/* 4648D0 80218440 00000000 */ nop /* 4648D4 80218444 468010A0 */ cvt.s.w $f2, $f2 /* 4648D8 80218448 86220064 */ lh $v0, 0x64($s1) /* 4648DC 8021844C 46022083 */ div.s $f2, $f4, $f2 /* 4648E0 80218450 44820000 */ mtc1 $v0, $f0 -/* 4648E4 80218454 00000000 */ nop +/* 4648E4 80218454 00000000 */ nop /* 4648E8 80218458 46800020 */ cvt.s.w $f0, $f0 /* 4648EC 8021845C 46020002 */ mul.s $f0, $f0, $f2 -/* 4648F0 80218460 00000000 */ nop +/* 4648F0 80218460 00000000 */ nop /* 4648F4 80218464 C624004C */ lwc1 $f4, 0x4c($s1) /* 4648F8 80218468 E6220040 */ swc1 $f2, 0x40($s1) /* 4648FC 8021846C 46002201 */ sub.s $f8, $f4, $f0 @@ -107,13 +107,13 @@ glabel func_80218300_464790 /* 46491C 8021848C 44810000 */ mtc1 $at, $f0 /* 464920 80218490 C6240000 */ lwc1 $f4, ($s1) /* 464924 80218494 44823000 */ mtc1 $v0, $f6 -/* 464928 80218498 00000000 */ nop +/* 464928 80218498 00000000 */ nop /* 46492C 8021849C 468031A0 */ cvt.s.w $f6, $f6 /* 464930 802184A0 46060003 */ div.s $f0, $f0, $f6 /* 464934 802184A4 46041081 */ sub.s $f2, $f2, $f4 /* 464938 802184A8 E620003C */ swc1 $f0, 0x3c($s1) /* 46493C 802184AC 44830000 */ mtc1 $v1, $f0 -/* 464940 802184B0 00000000 */ nop +/* 464940 802184B0 00000000 */ nop /* 464944 802184B4 46800020 */ cvt.s.w $f0, $f0 /* 464948 802184B8 46001083 */ div.s $f2, $f2, $f0 /* 46494C 802184BC C6200010 */ lwc1 $f0, 0x10($s1) @@ -147,7 +147,7 @@ glabel func_80218300_464790 /* 4649B8 80218528 14410004 */ bne $v0, $at, .L8021853C /* 4649BC 8021852C 3C018000 */ lui $at, 0x8000 /* 4649C0 80218530 14610002 */ bne $v1, $at, .L8021853C -/* 4649C4 80218534 00000000 */ nop +/* 4649C4 80218534 00000000 */ nop /* 4649C8 80218538 0006000D */ break 6 .L8021853C: /* 4649CC 8021853C 00001812 */ mflo $v1 @@ -172,7 +172,7 @@ glabel func_80218300_464790 /* 464A18 80218588 44811000 */ mtc1 $at, $f2 /* 464A1C 8021858C 46200220 */ cvt.s.d $f8, $f0 /* 464A20 80218590 44830000 */ mtc1 $v1, $f0 -/* 464A24 80218594 00000000 */ nop +/* 464A24 80218594 00000000 */ nop /* 464A28 80218598 46800020 */ cvt.s.w $f0, $f0 /* 464A2C 8021859C 86230066 */ lh $v1, 0x66($s1) /* 464A30 802185A0 24020002 */ addiu $v0, $zero, 2 @@ -184,7 +184,7 @@ glabel func_80218300_464790 /* 464A48 802185B8 D4222AF8 */ ldc1 $f2, %lo(D_80232AF8)($at) /* 464A4C 802185BC 46004021 */ cvt.d.s $f0, $f8 /* 464A50 802185C0 46220002 */ mul.d $f0, $f0, $f2 -/* 464A54 802185C4 00000000 */ nop +/* 464A54 802185C4 00000000 */ nop /* 464A58 802185C8 46200020 */ cvt.s.d $f0, $f0 /* 464A5C 802185CC E6200050 */ swc1 $f0, 0x50($s1) .L802185D0: @@ -196,7 +196,7 @@ glabel func_80218300_464790 /* 464A74 802185E4 C636003C */ lwc1 $f22, 0x3c($s1) /* 464A78 802185E8 AE200018 */ sw $zero, 0x18($s1) /* 464A7C 802185EC 46006302 */ mul.s $f12, $f12, $f0 -/* 464A80 802185F0 00000000 */ nop +/* 464A80 802185F0 00000000 */ nop /* 464A84 802185F4 AE20001C */ sw $zero, 0x1c($s1) /* 464A88 802185F8 4600A521 */ cvt.d.s $f20, $f20 /* 464A8C 802185FC 3C0143B4 */ lui $at, 0x43b4 @@ -219,7 +219,7 @@ glabel func_80218300_464790 /* 464AC8 80218638 14410004 */ bne $v0, $at, .L8021864C /* 464ACC 8021863C 3C018000 */ lui $at, 0x8000 /* 464AD0 80218640 14610002 */ bne $v1, $at, .L8021864C -/* 464AD4 80218644 00000000 */ nop +/* 464AD4 80218644 00000000 */ nop /* 464AD8 80218648 0006000D */ break 6 .L8021864C: /* 464ADC 8021864C 00001812 */ mflo $v1 @@ -244,7 +244,7 @@ glabel func_80218300_464790 /* 464B28 80218698 44811000 */ mtc1 $at, $f2 /* 464B2C 8021869C 46200220 */ cvt.s.d $f8, $f0 /* 464B30 802186A0 44830000 */ mtc1 $v1, $f0 -/* 464B34 802186A4 00000000 */ nop +/* 464B34 802186A4 00000000 */ nop /* 464B38 802186A8 46800020 */ cvt.s.w $f0, $f0 /* 464B3C 802186AC 86230066 */ lh $v1, 0x66($s1) /* 464B40 802186B0 24020004 */ addiu $v0, $zero, 4 @@ -257,7 +257,7 @@ glabel func_80218300_464790 /* 464B5C 802186CC 44801000 */ mtc1 $zero, $f2 /* 464B60 802186D0 46004021 */ cvt.d.s $f0, $f8 /* 464B64 802186D4 46220002 */ mul.d $f0, $f0, $f2 -/* 464B68 802186D8 00000000 */ nop +/* 464B68 802186D8 00000000 */ nop /* 464B6C 802186DC 46200020 */ cvt.s.d $f0, $f0 /* 464B70 802186E0 E6200050 */ swc1 $f0, 0x50($s1) .L802186E4: @@ -269,7 +269,7 @@ glabel func_80218300_464790 /* 464B88 802186F8 C636003C */ lwc1 $f22, 0x3c($s1) /* 464B8C 802186FC AE200018 */ sw $zero, 0x18($s1) /* 464B90 80218700 46006302 */ mul.s $f12, $f12, $f0 -/* 464B94 80218704 00000000 */ nop +/* 464B94 80218704 00000000 */ nop /* 464B98 80218708 AE20001C */ sw $zero, 0x1c($s1) /* 464B9C 8021870C 4600A521 */ cvt.d.s $f20, $f20 /* 464BA0 80218710 3C0143B4 */ lui $at, 0x43b4 @@ -282,9 +282,9 @@ glabel func_80218300_464790 /* 464BBC 8021872C 46000021 */ cvt.d.s $f0, $f0 .L80218730: /* 464BC0 80218730 46220002 */ mul.d $f0, $f0, $f2 -/* 464BC4 80218734 00000000 */ nop +/* 464BC4 80218734 00000000 */ nop /* 464BC8 80218738 46360002 */ mul.d $f0, $f0, $f22 -/* 464BCC 8021873C 00000000 */ nop +/* 464BCC 8021873C 00000000 */ nop /* 464BD0 80218740 46360000 */ add.d $f0, $f0, $f22 /* 464BD4 80218744 4620A500 */ add.d $f20, $f20, $f0 /* 464BD8 80218748 4620A520 */ cvt.s.d $f20, $f20 @@ -308,21 +308,21 @@ glabel func_80218300_464790 /* 464C1C 8021878C 10620008 */ beq $v1, $v0, .L802187B0 /* 464C20 80218790 0000102D */ daddu $v0, $zero, $zero /* 464C24 80218794 080862D8 */ j .L80218B60 -/* 464C28 80218798 00000000 */ nop +/* 464C28 80218798 00000000 */ nop .L8021879C: /* 464C2C 8021879C 24020003 */ addiu $v0, $zero, 3 /* 464C30 802187A0 106200BA */ beq $v1, $v0, .L80218A8C /* 464C34 802187A4 0000102D */ daddu $v0, $zero, $zero /* 464C38 802187A8 080862D8 */ j .L80218B60 -/* 464C3C 802187AC 00000000 */ nop +/* 464C3C 802187AC 00000000 */ nop .L802187B0: /* 464C40 802187B0 C6220044 */ lwc1 $f2, 0x44($s1) /* 464C44 802187B4 3C013FC9 */ lui $at, 0x3fc9 /* 464C48 802187B8 34210FD0 */ ori $at, $at, 0xfd0 /* 464C4C 802187BC 44810000 */ mtc1 $at, $f0 -/* 464C50 802187C0 00000000 */ nop +/* 464C50 802187C0 00000000 */ nop /* 464C54 802187C4 4602003C */ c.lt.s $f0, $f2 -/* 464C58 802187C8 00000000 */ nop +/* 464C58 802187C8 00000000 */ nop /* 464C5C 802187CC 45000004 */ bc1f .L802187E0 /* 464C60 802187D0 2404FF81 */ addiu $a0, $zero, -0x7f /* 464C64 802187D4 8E26005C */ lw $a2, 0x5c($s1) @@ -351,7 +351,7 @@ glabel func_80218300_464790 /* 464CBC 8021882C C62C0044 */ lwc1 $f12, 0x44($s1) /* 464CC0 80218830 C6220050 */ lwc1 $f2, 0x50($s1) /* 464CC4 80218834 46001082 */ mul.s $f2, $f2, $f0 -/* 464CC8 80218838 00000000 */ nop +/* 464CC8 80218838 00000000 */ nop /* 464CCC 8021883C C6200004 */ lwc1 $f0, 4($s1) /* 464CD0 80218840 46020000 */ add.s $f0, $f0, $f2 /* 464CD4 80218844 E6600148 */ swc1 $f0, 0x148($s3) @@ -360,7 +360,7 @@ glabel func_80218300_464790 /* 464CE0 80218850 C6220010 */ lwc1 $f2, 0x10($s1) /* 464CE4 80218854 C6600148 */ lwc1 $f0, 0x148($s3) /* 464CE8 80218858 4602003C */ c.lt.s $f0, $f2 -/* 464CEC 8021885C 00000000 */ nop +/* 464CEC 8021885C 00000000 */ nop /* 464CF0 80218860 45000007 */ bc1f .L80218880 /* 464CF4 80218864 4600B306 */ mov.s $f12, $f22 /* 464CF8 80218868 86220064 */ lh $v0, 0x64($s1) @@ -389,7 +389,7 @@ glabel func_80218300_464790 /* 464D4C 802188BC 44810000 */ mtc1 $at, $f0 /* 464D50 802188C0 C6340044 */ lwc1 $f20, 0x44($s1) /* 464D54 802188C4 46006302 */ mul.s $f12, $f12, $f0 -/* 464D58 802188C8 00000000 */ nop +/* 464D58 802188C8 00000000 */ nop /* 464D5C 802188CC C636003C */ lwc1 $f22, 0x3c($s1) /* 464D60 802188D0 4600A521 */ cvt.d.s $f20, $f20 /* 464D64 802188D4 3C0143B4 */ lui $at, 0x43b4 @@ -408,7 +408,7 @@ glabel func_80218300_464790 /* 464D94 80218904 44810000 */ mtc1 $at, $f0 /* 464D98 80218908 C6340044 */ lwc1 $f20, 0x44($s1) /* 464D9C 8021890C 46006302 */ mul.s $f12, $f12, $f0 -/* 464DA0 80218910 00000000 */ nop +/* 464DA0 80218910 00000000 */ nop /* 464DA4 80218914 C636003C */ lwc1 $f22, 0x3c($s1) /* 464DA8 80218918 4600A521 */ cvt.d.s $f20, $f20 /* 464DAC 8021891C 3C0143B4 */ lui $at, 0x43b4 @@ -421,9 +421,9 @@ glabel func_80218300_464790 /* 464DC8 80218938 46000021 */ cvt.d.s $f0, $f0 .L8021893C: /* 464DCC 8021893C 46220002 */ mul.d $f0, $f0, $f2 -/* 464DD0 80218940 00000000 */ nop +/* 464DD0 80218940 00000000 */ nop /* 464DD4 80218944 46360002 */ mul.d $f0, $f0, $f22 -/* 464DD8 80218948 00000000 */ nop +/* 464DD8 80218948 00000000 */ nop /* 464DDC 8021894C 46360000 */ add.d $f0, $f0, $f22 /* 464DE0 80218950 4620A500 */ add.d $f20, $f20, $f0 /* 464DE4 80218954 4620A520 */ cvt.s.d $f20, $f20 @@ -469,7 +469,7 @@ glabel func_80218300_464790 /* 464E7C 802189EC 14410004 */ bne $v0, $at, .L80218A00 /* 464E80 802189F0 3C018000 */ lui $at, 0x8000 /* 464E84 802189F4 14610002 */ bne $v1, $at, .L80218A00 -/* 464E88 802189F8 00000000 */ nop +/* 464E88 802189F8 00000000 */ nop /* 464E8C 802189FC 0006000D */ break 6 .L80218A00: /* 464E90 80218A00 00001812 */ mflo $v1 @@ -496,7 +496,7 @@ glabel func_80218300_464790 /* 464EE4 80218A54 46200020 */ cvt.s.d $f0, $f0 /* 464EE8 80218A58 E6200050 */ swc1 $f0, 0x50($s1) /* 464EEC 80218A5C 44830000 */ mtc1 $v1, $f0 -/* 464EF0 80218A60 00000000 */ nop +/* 464EF0 80218A60 00000000 */ nop /* 464EF4 80218A64 46800020 */ cvt.s.w $f0, $f0 /* 464EF8 80218A68 E6200028 */ swc1 $f0, 0x28($s1) /* 464EFC 80218A6C C6600144 */ lwc1 $f0, 0x144($s3) @@ -512,9 +512,9 @@ glabel func_80218300_464790 /* 464F20 80218A90 3C0140C9 */ lui $at, 0x40c9 /* 464F24 80218A94 34210FD0 */ ori $at, $at, 0xfd0 /* 464F28 80218A98 4481B000 */ mtc1 $at, $f22 -/* 464F2C 80218A9C 00000000 */ nop +/* 464F2C 80218A9C 00000000 */ nop /* 464F30 80218AA0 46166302 */ mul.s $f12, $f12, $f22 -/* 464F34 80218AA4 00000000 */ nop +/* 464F34 80218AA4 00000000 */ nop /* 464F38 80218AA8 C6340000 */ lwc1 $f20, ($s1) /* 464F3C 80218AAC 3C0143B4 */ lui $at, 0x43b4 /* 464F40 80218AB0 4481C000 */ mtc1 $at, $f24 @@ -523,10 +523,10 @@ glabel func_80218300_464790 /* 464F4C 80218ABC 46186303 */ div.s $f12, $f12, $f24 /* 464F50 80218AC0 C6220050 */ lwc1 $f2, 0x50($s1) /* 464F54 80218AC4 46001082 */ mul.s $f2, $f2, $f0 -/* 464F58 80218AC8 00000000 */ nop +/* 464F58 80218AC8 00000000 */ nop /* 464F5C 80218ACC C62C0024 */ lwc1 $f12, 0x24($s1) /* 464F60 80218AD0 46166302 */ mul.s $f12, $f12, $f22 -/* 464F64 80218AD4 00000000 */ nop +/* 464F64 80218AD4 00000000 */ nop /* 464F68 80218AD8 3C018023 */ lui $at, %hi(D_80232B30) /* 464F6C 80218ADC D4202B30 */ ldc1 $f0, %lo(D_80232B30)($at) /* 464F70 80218AE0 460010A1 */ cvt.d.s $f2, $f2 @@ -538,7 +538,7 @@ glabel func_80218300_464790 /* 464F88 80218AF8 E6340000 */ swc1 $f20, ($s1) /* 464F8C 80218AFC C6220050 */ lwc1 $f2, 0x50($s1) /* 464F90 80218B00 46001082 */ mul.s $f2, $f2, $f0 -/* 464F94 80218B04 00000000 */ nop +/* 464F94 80218B04 00000000 */ nop /* 464F98 80218B08 C62C0024 */ lwc1 $f12, 0x24($s1) /* 464F9C 80218B0C C6200028 */ lwc1 $f0, 0x28($s1) /* 464FA0 80218B10 46006300 */ add.s $f12, $f12, $f0 diff --git a/asm/nonmatchings/battle/area_mac/464560/func_80218B90_465020.s b/asm/nonmatchings/battle/area_mac/464560/func_80218B90_465020.s index 084e213430..fa6d4d95da 100644 --- a/asm/nonmatchings/battle/area_mac/464560/func_80218B90_465020.s +++ b/asm/nonmatchings/battle/area_mac/464560/func_80218B90_465020.s @@ -31,9 +31,9 @@ glabel func_80218B90_465020 .L80218BF4: /* 465084 80218BF4 C6200050 */ lwc1 $f0, 0x50($s1) /* 465088 80218BF8 4480A000 */ mtc1 $zero, $f20 -/* 46508C 80218BFC 00000000 */ nop +/* 46508C 80218BFC 00000000 */ nop /* 465090 80218C00 4600A03C */ c.lt.s $f20, $f0 -/* 465094 80218C04 00000000 */ nop +/* 465094 80218C04 00000000 */ nop /* 465098 80218C08 45000005 */ bc1f .L80218C20 /* 46509C 80218C0C 2404FF81 */ addiu $a0, $zero, -0x7f /* 4650A0 80218C10 8E260064 */ lw $a2, 0x64($s1) @@ -42,7 +42,7 @@ glabel func_80218B90_465020 /* 4650AC 80218C1C C6200050 */ lwc1 $f0, 0x50($s1) .L80218C20: /* 4650B0 80218C20 4614003C */ c.lt.s $f0, $f20 -/* 4650B4 80218C24 00000000 */ nop +/* 4650B4 80218C24 00000000 */ nop /* 4650B8 80218C28 45000004 */ bc1f .L80218C3C /* 4650BC 80218C2C 2404FF81 */ addiu $a0, $zero, -0x7f /* 4650C0 80218C30 8E260068 */ lw $a2, 0x68($s1) @@ -67,7 +67,7 @@ glabel func_80218B90_465020 /* 465108 80218C78 C6240148 */ lwc1 $f4, 0x148($s1) /* 46510C 80218C7C E622014C */ swc1 $f2, 0x14c($s1) /* 465110 80218C80 4614203C */ c.lt.s $f4, $f20 -/* 465114 80218C84 00000000 */ nop +/* 465114 80218C84 00000000 */ nop /* 465118 80218C88 45010003 */ bc1t .L80218C98 /* 46511C 80218C8C E6200144 */ swc1 $f0, 0x144($s1) /* 465120 80218C90 08086331 */ j .L80218CC4 diff --git a/asm/nonmatchings/battle/area_mac/464560/func_80218CE4_465174.s b/asm/nonmatchings/battle/area_mac/464560/func_80218CE4_465174.s index 2cb367f5d1..532a92313b 100644 --- a/asm/nonmatchings/battle/area_mac/464560/func_80218CE4_465174.s +++ b/asm/nonmatchings/battle/area_mac/464560/func_80218CE4_465174.s @@ -14,7 +14,7 @@ glabel func_80218CE4_465174 /* 465198 80218D08 8C820000 */ lw $v0, ($a0) /* 46519C 80218D0C 30420800 */ andi $v0, $v0, 0x800 /* 4651A0 80218D10 1440000A */ bnez $v0, .L80218D3C -/* 4651A4 80218D14 00000000 */ nop +/* 4651A4 80218D14 00000000 */ nop /* 4651A8 80218D18 90820191 */ lbu $v0, 0x191($a0) /* 4651AC 80218D1C 8E030088 */ lw $v1, 0x88($s0) /* 4651B0 80218D20 00021042 */ srl $v0, $v0, 1 diff --git a/asm/nonmatchings/battle/area_mac/464560/func_80218DF4_465284.s b/asm/nonmatchings/battle/area_mac/464560/func_80218DF4_465284.s index cf22211611..3cbe9a5b7d 100644 --- a/asm/nonmatchings/battle/area_mac/464560/func_80218DF4_465284.s +++ b/asm/nonmatchings/battle/area_mac/464560/func_80218DF4_465284.s @@ -10,7 +10,7 @@ glabel func_80218DF4_465284 /* 465298 80218E08 8C43000C */ lw $v1, 0xc($v0) /* 46529C 80218E0C 3C01C47A */ lui $at, 0xc47a /* 4652A0 80218E10 44810000 */ mtc1 $at, $f0 -/* 4652A4 80218E14 00000000 */ nop +/* 4652A4 80218E14 00000000 */ nop /* 4652A8 80218E18 E4600008 */ swc1 $f0, 8($v1) /* 4652AC 80218E1C 8FBF0010 */ lw $ra, 0x10($sp) /* 4652B0 80218E20 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/battle/area_mac/464560/func_80218E2C_4652BC.s b/asm/nonmatchings/battle/area_mac/464560/func_80218E2C_4652BC.s index c01ca96b97..a7e3eef03b 100644 --- a/asm/nonmatchings/battle/area_mac/464560/func_80218E2C_4652BC.s +++ b/asm/nonmatchings/battle/area_mac/464560/func_80218E2C_4652BC.s @@ -11,7 +11,7 @@ glabel func_80218E2C_4652BC /* 4652D4 80218E44 8C82000C */ lw $v0, 0xc($a0) /* 4652D8 80218E48 3C014310 */ lui $at, 0x4310 /* 4652DC 80218E4C 44810000 */ mtc1 $at, $f0 -/* 4652E0 80218E50 00000000 */ nop +/* 4652E0 80218E50 00000000 */ nop /* 4652E4 80218E54 E4400008 */ swc1 $f0, 8($v0) /* 4652E8 80218E58 8C830000 */ lw $v1, ($a0) /* 4652EC 80218E5C 34630010 */ ori $v1, $v1, 0x10 diff --git a/asm/nonmatchings/battle/area_mac/464560/func_80218F40_4653D0.s b/asm/nonmatchings/battle/area_mac/464560/func_80218F40_4653D0.s index 8388c67102..2bb780f6eb 100644 --- a/asm/nonmatchings/battle/area_mac/464560/func_80218F40_4653D0.s +++ b/asm/nonmatchings/battle/area_mac/464560/func_80218F40_4653D0.s @@ -27,9 +27,9 @@ glabel func_80218F40_4653D0 /* 465424 80218F94 C622004C */ lwc1 $f2, 0x4c($s1) /* 465428 80218F98 3C014080 */ lui $at, 0x4080 /* 46542C 80218F9C 44810000 */ mtc1 $at, $f0 -/* 465430 80218FA0 00000000 */ nop +/* 465430 80218FA0 00000000 */ nop /* 465434 80218FA4 4600103C */ c.lt.s $f2, $f0 -/* 465438 80218FA8 00000000 */ nop +/* 465438 80218FA8 00000000 */ nop /* 46543C 80218FAC 45000007 */ bc1f .L80218FCC /* 465440 80218FB0 0000202D */ daddu $a0, $zero, $zero /* 465444 80218FB4 C6200054 */ lwc1 $f0, 0x54($s1) @@ -47,7 +47,7 @@ glabel func_80218F40_4653D0 /* 465470 80218FE0 24040001 */ addiu $a0, $zero, 1 .L80218FE4: /* 465474 80218FE4 0C0990BC */ jal play_movement_dust_effects -/* 465478 80218FE8 00000000 */ nop +/* 465478 80218FE8 00000000 */ nop /* 46547C 80218FEC C6400040 */ lwc1 $f0, 0x40($s2) /* 465480 80218FF0 3C013FF8 */ lui $at, 0x3ff8 /* 465484 80218FF4 44811800 */ mtc1 $at, $f3 @@ -68,7 +68,7 @@ glabel func_80218F40_4653D0 /* 4654C0 80219030 44801000 */ mtc1 $zero, $f2 /* 4654C4 80219034 46000021 */ cvt.d.s $f0, $f0 /* 4654C8 80219038 4622003C */ c.lt.d $f0, $f2 -/* 4654CC 8021903C 00000000 */ nop +/* 4654CC 8021903C 00000000 */ nop /* 4654D0 80219040 45010002 */ bc1t .L8021904C /* 4654D4 80219044 24020002 */ addiu $v0, $zero, 2 /* 4654D8 80219048 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/battle/area_mac/464560/func_80219064_4654F4.s b/asm/nonmatchings/battle/area_mac/464560/func_80219064_4654F4.s index 47b226d2f8..b4ee0ddb26 100644 --- a/asm/nonmatchings/battle/area_mac/464560/func_80219064_4654F4.s +++ b/asm/nonmatchings/battle/area_mac/464560/func_80219064_4654F4.s @@ -27,9 +27,9 @@ glabel func_80219064_4654F4 /* 465548 802190B8 C622004C */ lwc1 $f2, 0x4c($s1) /* 46554C 802190BC 3C014080 */ lui $at, 0x4080 /* 465550 802190C0 44810000 */ mtc1 $at, $f0 -/* 465554 802190C4 00000000 */ nop +/* 465554 802190C4 00000000 */ nop /* 465558 802190C8 4600103C */ c.lt.s $f2, $f0 -/* 46555C 802190CC 00000000 */ nop +/* 46555C 802190CC 00000000 */ nop /* 465560 802190D0 45000007 */ bc1f .L802190F0 /* 465564 802190D4 0000202D */ daddu $a0, $zero, $zero /* 465568 802190D8 C6200054 */ lwc1 $f0, 0x54($s1) @@ -47,7 +47,7 @@ glabel func_80219064_4654F4 /* 465594 80219104 24040001 */ addiu $a0, $zero, 1 .L80219108: /* 465598 80219108 0C0990BC */ jal play_movement_dust_effects -/* 46559C 8021910C 00000000 */ nop +/* 46559C 8021910C 00000000 */ nop /* 4655A0 80219110 C6400040 */ lwc1 $f0, 0x40($s2) /* 4655A4 80219114 3C013FF8 */ lui $at, 0x3ff8 /* 4655A8 80219118 44811800 */ mtc1 $at, $f3 @@ -68,7 +68,7 @@ glabel func_80219064_4654F4 /* 4655E4 80219154 44801000 */ mtc1 $zero, $f2 /* 4655E8 80219158 46000021 */ cvt.d.s $f0, $f0 /* 4655EC 8021915C 4622003C */ c.lt.d $f0, $f2 -/* 4655F0 80219160 00000000 */ nop +/* 4655F0 80219160 00000000 */ nop /* 4655F4 80219164 45010002 */ bc1t .L80219170 /* 4655F8 80219168 24020002 */ addiu $v0, $zero, 2 /* 4655FC 8021916C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/battle/area_mac/464560/func_80219188_465618.s b/asm/nonmatchings/battle/area_mac/464560/func_80219188_465618.s index df5fe76f4c..f0016203b7 100644 --- a/asm/nonmatchings/battle/area_mac/464560/func_80219188_465618.s +++ b/asm/nonmatchings/battle/area_mac/464560/func_80219188_465618.s @@ -39,7 +39,7 @@ glabel func_80219188_465618 /* 46569C 8021920C 3C013ECC */ lui $at, 0x3ecc /* 4656A0 80219210 3421CCCD */ ori $at, $at, 0xcccd /* 4656A4 80219214 44810000 */ mtc1 $at, $f0 -/* 4656A8 80219218 00000000 */ nop +/* 4656A8 80219218 00000000 */ nop /* 4656AC 8021921C E7A00010 */ swc1 $f0, 0x10($sp) .L80219220: /* 4656B0 80219220 24020005 */ addiu $v0, $zero, 5 @@ -64,7 +64,7 @@ glabel func_80219188_465618 /* 4656F8 80219268 3C013ECC */ lui $at, 0x3ecc /* 4656FC 8021926C 3421CCCD */ ori $at, $at, 0xcccd /* 465700 80219270 44810000 */ mtc1 $at, $f0 -/* 465704 80219274 00000000 */ nop +/* 465704 80219274 00000000 */ nop /* 465708 80219278 E7A00010 */ swc1 $f0, 0x10($sp) .L8021927C: /* 46570C 8021927C 24020005 */ addiu $v0, $zero, 5 @@ -90,11 +90,11 @@ glabel func_80219188_465618 /* 465758 802192C8 24020008 */ addiu $v0, $zero, 8 /* 46575C 802192CC 82230210 */ lb $v1, 0x210($s1) /* 465760 802192D0 1062000A */ beq $v1, $v0, .L802192FC -/* 465764 802192D4 00000000 */ nop +/* 465764 802192D4 00000000 */ nop /* 465768 802192D8 8E020008 */ lw $v0, 8($s0) /* 46576C 802192DC 2442000F */ addiu $v0, $v0, 0xf /* 465770 802192E0 44826000 */ mtc1 $v0, $f12 -/* 465774 802192E4 00000000 */ nop +/* 465774 802192E4 00000000 */ nop /* 465778 802192E8 46806320 */ cvt.s.w $f12, $f12 /* 46577C 802192EC 0C00A6C9 */ jal clamp_angle /* 465780 802192F0 AE020008 */ sw $v0, 8($s0) @@ -107,36 +107,36 @@ glabel func_80219188_465618 /* 465798 80219308 C60C0008 */ lwc1 $f12, 8($s0) /* 46579C 8021930C 46806320 */ cvt.s.w $f12, $f12 /* 4657A0 80219310 46006302 */ mul.s $f12, $f12, $f0 -/* 4657A4 80219314 00000000 */ nop +/* 4657A4 80219314 00000000 */ nop /* 4657A8 80219318 3C0143B4 */ lui $at, 0x43b4 /* 4657AC 8021931C 44810000 */ mtc1 $at, $f0 /* 4657B0 80219320 0C00A85B */ jal sin_rad /* 4657B4 80219324 46006303 */ div.s $f12, $f12, $f0 /* 4657B8 80219328 3C014040 */ lui $at, 0x4040 /* 4657BC 8021932C 44811000 */ mtc1 $at, $f2 -/* 4657C0 80219330 00000000 */ nop +/* 4657C0 80219330 00000000 */ nop /* 4657C4 80219334 46020002 */ mul.s $f0, $f0, $f2 -/* 4657C8 80219338 00000000 */ nop +/* 4657C8 80219338 00000000 */ nop /* 4657CC 8021933C 86220152 */ lh $v0, 0x152($s1) /* 4657D0 80219340 44821000 */ mtc1 $v0, $f2 -/* 4657D4 80219344 00000000 */ nop +/* 4657D4 80219344 00000000 */ nop /* 4657D8 80219348 468010A0 */ cvt.s.w $f2, $f2 /* 4657DC 8021934C 4600018D */ trunc.w.s $f6, $f0 /* 4657E0 80219350 44033000 */ mfc1 $v1, $f6 -/* 4657E4 80219354 00000000 */ nop +/* 4657E4 80219354 00000000 */ nop /* 4657E8 80219358 00031600 */ sll $v0, $v1, 0x18 /* 4657EC 8021935C C6200148 */ lwc1 $f0, 0x148($s1) /* 4657F0 80219360 00021603 */ sra $v0, $v0, 0x18 /* 4657F4 80219364 A223019A */ sb $v1, 0x19a($s1) /* 4657F8 80219368 46020000 */ add.s $f0, $f0, $f2 /* 4657FC 8021936C 44821000 */ mtc1 $v0, $f2 -/* 465800 80219370 00000000 */ nop +/* 465800 80219370 00000000 */ nop /* 465804 80219374 468010A0 */ cvt.s.w $f2, $f2 /* 465808 80219378 86220150 */ lh $v0, 0x150($s1) /* 46580C 8021937C 46020000 */ add.s $f0, $f0, $f2 /* 465810 80219380 2403000A */ addiu $v1, $zero, 0xa /* 465814 80219384 44821000 */ mtc1 $v0, $f2 -/* 465818 80219388 00000000 */ nop +/* 465818 80219388 00000000 */ nop /* 46581C 8021938C 468010A0 */ cvt.s.w $f2, $f2 /* 465820 80219390 46000121 */ cvt.d.s $f4, $f0 /* 465824 80219394 C6200144 */ lwc1 $f0, 0x144($s1) @@ -149,14 +149,14 @@ glabel func_80219188_465618 /* 465840 802193B0 3C014028 */ lui $at, 0x4028 /* 465844 802193B4 44810800 */ mtc1 $at, $f1 /* 465848 802193B8 44800000 */ mtc1 $zero, $f0 -/* 46584C 802193BC 00000000 */ nop +/* 46584C 802193BC 00000000 */ nop /* 465850 802193C0 46202000 */ add.d $f0, $f4, $f0 .L802193C4: /* 465854 802193C4 46200520 */ cvt.s.d $f20, $f0 /* 465858 802193C8 86220154 */ lh $v0, 0x154($s1) /* 46585C 802193CC C620014C */ lwc1 $f0, 0x14c($s1) /* 465860 802193D0 44821000 */ mtc1 $v0, $f2 -/* 465864 802193D4 00000000 */ nop +/* 465864 802193D4 00000000 */ nop /* 465868 802193D8 468010A0 */ cvt.s.w $f2, $f2 /* 46586C 802193DC 8E02000C */ lw $v0, 0xc($s0) /* 465870 802193E0 10400059 */ beqz $v0, .L80219548 @@ -165,16 +165,16 @@ glabel func_80219188_465618 /* 46587C 802193EC 10600005 */ beqz $v1, .L80219404 /* 465880 802193F0 24020001 */ addiu $v0, $zero, 1 /* 465884 802193F4 1062002A */ beq $v1, $v0, .L802194A0 -/* 465888 802193F8 00000000 */ nop +/* 465888 802193F8 00000000 */ nop /* 46588C 802193FC 08086560 */ j .L80219580 -/* 465890 80219400 00000000 */ nop +/* 465890 80219400 00000000 */ nop .L80219404: /* 465894 80219404 8E020014 */ lw $v0, 0x14($s0) /* 465898 80219408 14400016 */ bnez $v0, .L80219464 /* 46589C 8021940C 2402000A */ addiu $v0, $zero, 0xa /* 4658A0 80219410 82230210 */ lb $v1, 0x210($s1) /* 4658A4 80219414 10620005 */ beq $v1, $v0, .L8021942C -/* 4658A8 80219418 00000000 */ nop +/* 4658A8 80219418 00000000 */ nop /* 4658AC 8021941C 3C013F80 */ lui $at, 0x3f80 /* 4658B0 80219420 44810000 */ mtc1 $at, $f0 /* 4658B4 80219424 08086510 */ j .L80219440 @@ -183,7 +183,7 @@ glabel func_80219188_465618 /* 4658BC 8021942C 3C013ECC */ lui $at, 0x3ecc /* 4658C0 80219430 3421CCCD */ ori $at, $at, 0xcccd /* 4658C4 80219434 44810000 */ mtc1 $at, $f0 -/* 4658C8 80219438 00000000 */ nop +/* 4658C8 80219438 00000000 */ nop /* 4658CC 8021943C E7A00010 */ swc1 $f0, 0x10($sp) .L80219440: /* 4658D0 80219440 0000202D */ daddu $a0, $zero, $zero @@ -198,7 +198,7 @@ glabel func_80219188_465618 .L80219464: /* 4658F4 80219464 8E030018 */ lw $v1, 0x18($s0) /* 4658F8 80219468 10600005 */ beqz $v1, .L80219480 -/* 4658FC 8021946C 00000000 */ nop +/* 4658FC 8021946C 00000000 */ nop /* 465900 80219470 8C620000 */ lw $v0, ($v1) /* 465904 80219474 34420010 */ ori $v0, $v0, 0x10 /* 465908 80219478 AC620000 */ sw $v0, ($v1) @@ -215,7 +215,7 @@ glabel func_80219188_465618 .L802194A0: /* 465930 802194A0 8E030014 */ lw $v1, 0x14($s0) /* 465934 802194A4 10600005 */ beqz $v1, .L802194BC -/* 465938 802194A8 00000000 */ nop +/* 465938 802194A8 00000000 */ nop /* 46593C 802194AC 8C620000 */ lw $v0, ($v1) /* 465940 802194B0 34420010 */ ori $v0, $v0, 0x10 /* 465944 802194B4 AC620000 */ sw $v0, ($v1) @@ -223,11 +223,11 @@ glabel func_80219188_465618 .L802194BC: /* 46594C 802194BC 8E020018 */ lw $v0, 0x18($s0) /* 465950 802194C0 14400018 */ bnez $v0, .L80219524 -/* 465954 802194C4 00000000 */ nop +/* 465954 802194C4 00000000 */ nop /* 465958 802194C8 82230210 */ lb $v1, 0x210($s1) /* 46595C 802194CC 2402000A */ addiu $v0, $zero, 0xa /* 465960 802194D0 10620005 */ beq $v1, $v0, .L802194E8 -/* 465964 802194D4 00000000 */ nop +/* 465964 802194D4 00000000 */ nop /* 465968 802194D8 3C013F80 */ lui $at, 0x3f80 /* 46596C 802194DC 44810000 */ mtc1 $at, $f0 /* 465970 802194E0 0808653F */ j .L802194FC @@ -236,7 +236,7 @@ glabel func_80219188_465618 /* 465978 802194E8 3C013ECC */ lui $at, 0x3ecc /* 46597C 802194EC 3421CCCD */ ori $at, $at, 0xcccd /* 465980 802194F0 44810000 */ mtc1 $at, $f0 -/* 465984 802194F4 00000000 */ nop +/* 465984 802194F4 00000000 */ nop /* 465988 802194F8 E7A00010 */ swc1 $f0, 0x10($sp) .L802194FC: /* 46598C 802194FC 24040001 */ addiu $a0, $zero, 1 @@ -263,7 +263,7 @@ glabel func_80219188_465618 .L80219548: /* 4659D8 80219548 8E030014 */ lw $v1, 0x14($s0) /* 4659DC 8021954C 10600005 */ beqz $v1, .L80219564 -/* 4659E0 80219550 00000000 */ nop +/* 4659E0 80219550 00000000 */ nop /* 4659E4 80219554 8C620000 */ lw $v0, ($v1) /* 4659E8 80219558 34420010 */ ori $v0, $v0, 0x10 /* 4659EC 8021955C AC620000 */ sw $v0, ($v1) @@ -271,7 +271,7 @@ glabel func_80219188_465618 .L80219564: /* 4659F4 80219564 8E030018 */ lw $v1, 0x18($s0) /* 4659F8 80219568 10600005 */ beqz $v1, .L80219580 -/* 4659FC 8021956C 00000000 */ nop +/* 4659FC 8021956C 00000000 */ nop /* 465A00 80219570 8C620000 */ lw $v0, ($v1) /* 465A04 80219574 34420010 */ ori $v0, $v0, 0x10 /* 465A08 80219578 AC620000 */ sw $v0, ($v1) @@ -286,7 +286,7 @@ glabel func_80219188_465618 /* 465A28 80219598 0000102D */ daddu $v0, $zero, $zero /* 465A2C 8021959C 8E030014 */ lw $v1, 0x14($s0) /* 465A30 802195A0 10600005 */ beqz $v1, .L802195B8 -/* 465A34 802195A4 00000000 */ nop +/* 465A34 802195A4 00000000 */ nop /* 465A38 802195A8 8C620000 */ lw $v0, ($v1) /* 465A3C 802195AC 34420010 */ ori $v0, $v0, 0x10 /* 465A40 802195B0 AC620000 */ sw $v0, ($v1) @@ -294,7 +294,7 @@ glabel func_80219188_465618 .L802195B8: /* 465A48 802195B8 8E030018 */ lw $v1, 0x18($s0) /* 465A4C 802195BC 10600005 */ beqz $v1, .L802195D4 -/* 465A50 802195C0 00000000 */ nop +/* 465A50 802195C0 00000000 */ nop /* 465A54 802195C4 8C620000 */ lw $v0, ($v1) /* 465A58 802195C8 34420010 */ ori $v0, $v0, 0x10 /* 465A5C 802195CC AC620000 */ sw $v0, ($v1) diff --git a/asm/nonmatchings/battle/area_mac/464560/func_80219604_465A94.s b/asm/nonmatchings/battle/area_mac/464560/func_80219604_465A94.s index 1840506b10..17c55774de 100644 --- a/asm/nonmatchings/battle/area_mac/464560/func_80219604_465A94.s +++ b/asm/nonmatchings/battle/area_mac/464560/func_80219604_465A94.s @@ -16,7 +16,7 @@ glabel func_80219604_465A94 .L80219630: /* 465AC0 80219630 8C830018 */ lw $v1, 0x18($a0) /* 465AC4 80219634 10600004 */ beqz $v1, .L80219648 -/* 465AC8 80219638 00000000 */ nop +/* 465AC8 80219638 00000000 */ nop /* 465ACC 8021963C 8C620000 */ lw $v0, ($v1) /* 465AD0 80219640 34420010 */ ori $v0, $v0, 0x10 /* 465AD4 80219644 AC620000 */ sw $v0, ($v1) diff --git a/asm/nonmatchings/battle/area_mac/464560/func_80219824_465CB4.s b/asm/nonmatchings/battle/area_mac/464560/func_80219824_465CB4.s index 95f2067d3a..a6da96767b 100644 --- a/asm/nonmatchings/battle/area_mac/464560/func_80219824_465CB4.s +++ b/asm/nonmatchings/battle/area_mac/464560/func_80219824_465CB4.s @@ -18,35 +18,44 @@ glabel func_80219824_465CB4 /* 465CE8 80219858 1040001E */ beqz $v0, .L802198D4 /* 465CEC 8021985C 0000202D */ daddu $a0, $zero, $zero /* 465CF0 80219860 00101080 */ sll $v0, $s0, 2 -/* 465CF4 80219864 3C018023 */ lui $at, %hi(D_80232B40) +/* 465CF4 80219864 3C018023 */ lui $at, %hi(jtbl_80232B40_47EFD0) /* 465CF8 80219868 00220821 */ addu $at, $at, $v0 -/* 465CFC 8021986C 8C222B40 */ lw $v0, %lo(D_80232B40)($at) +/* 465CFC 8021986C 8C222B40 */ lw $v0, %lo(jtbl_80232B40_47EFD0)($at) /* 465D00 80219870 00400008 */ jr $v0 -/* 465D04 80219874 00000000 */ nop +/* 465D04 80219874 00000000 */ nop +glabel L80219878_465D08 /* 465D08 80219878 3C048022 */ lui $a0, %hi(D_80220524) /* 465D0C 8021987C 08086635 */ j .L802198D4 /* 465D10 80219880 24840524 */ addiu $a0, $a0, %lo(D_80220524) +glabel L80219884_465D14 /* 465D14 80219884 3C048022 */ lui $a0, %hi(D_80222274) /* 465D18 80219888 08086635 */ j .L802198D4 /* 465D1C 8021988C 24842274 */ addiu $a0, $a0, %lo(D_80222274) +glabel L80219890_465D20 /* 465D20 80219890 3C048022 */ lui $a0, %hi(D_8022336C) /* 465D24 80219894 08086635 */ j .L802198D4 /* 465D28 80219898 2484336C */ addiu $a0, $a0, %lo(D_8022336C) +glabel L8021989C_465D2C /* 465D2C 8021989C 3C048022 */ lui $a0, %hi(D_802243F4) /* 465D30 802198A0 08086635 */ j .L802198D4 /* 465D34 802198A4 248443F4 */ addiu $a0, $a0, %lo(D_802243F4) +glabel L802198A8_465D38 /* 465D38 802198A8 3C048022 */ lui $a0, %hi(D_80225958) /* 465D3C 802198AC 08086635 */ j .L802198D4 /* 465D40 802198B0 24845958 */ addiu $a0, $a0, %lo(D_80225958) +glabel L802198B4_465D44 /* 465D44 802198B4 3C048022 */ lui $a0, %hi(D_80226960) /* 465D48 802198B8 08086635 */ j .L802198D4 /* 465D4C 802198BC 24846960 */ addiu $a0, $a0, %lo(D_80226960) +glabel L802198C0_465D50 /* 465D50 802198C0 3C048023 */ lui $a0, %hi(D_802283F0) /* 465D54 802198C4 08086635 */ j .L802198D4 /* 465D58 802198C8 248483F0 */ addiu $a0, $a0, %lo(D_802283F0) +glabel L802198CC_465D5C /* 465D5C 802198CC 3C048023 */ lui $a0, %hi(D_8022972C) /* 465D60 802198D0 2484972C */ addiu $a0, $a0, %lo(D_8022972C) .L802198D4: +glabel L802198D4_465D64 /* 465D64 802198D4 806301F1 */ lb $v1, 0x1f1($v1) /* 465D68 802198D8 2463000A */ addiu $v1, $v1, 0xa /* 465D6C 802198DC AC830008 */ sw $v1, 8($a0) @@ -55,6 +64,6 @@ glabel func_80219824_465CB4 /* 465D78 802198E8 24020002 */ addiu $v0, $zero, 2 /* 465D7C 802198EC 03E00008 */ jr $ra /* 465D80 802198F0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 465D84 802198F4 00000000 */ nop -/* 465D88 802198F8 00000000 */ nop -/* 465D8C 802198FC 00000000 */ nop +/* 465D84 802198F4 00000000 */ nop +/* 465D88 802198F8 00000000 */ nop +/* 465D8C 802198FC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_mac/465D90/func_80219900_465D90.s b/asm/nonmatchings/battle/area_mac/465D90/func_80219900_465D90.s index 688d3a50a0..6f6559e9d2 100644 --- a/asm/nonmatchings/battle/area_mac/465D90/func_80219900_465D90.s +++ b/asm/nonmatchings/battle/area_mac/465D90/func_80219900_465D90.s @@ -26,14 +26,14 @@ glabel func_80219900_465D90 /* 465DE4 80219954 12200009 */ beqz $s1, .L8021997C /* 465DE8 80219958 2402008E */ addiu $v0, $zero, 0x8e /* 465DEC 8021995C 08086740 */ j .L80219D00 -/* 465DF0 80219960 00000000 */ nop +/* 465DF0 80219960 00000000 */ nop .L80219964: /* 465DF4 80219964 12220085 */ beq $s1, $v0, .L80219B7C /* 465DF8 80219968 24020003 */ addiu $v0, $zero, 3 /* 465DFC 8021996C 12220013 */ beq $s1, $v0, .L802199BC /* 465E00 80219970 2403005B */ addiu $v1, $zero, 0x5b /* 465E04 80219974 08086740 */ j .L80219D00 -/* 465E08 80219978 00000000 */ nop +/* 465E08 80219978 00000000 */ nop .L8021997C: /* 465E0C 8021997C 3C01430E */ lui $at, 0x430e /* 465E10 80219980 44812000 */ mtc1 $at, $f4 @@ -77,7 +77,7 @@ glabel func_80219900_465D90 /* 465E9C 80219A0C AE0200A8 */ sw $v0, 0xa8($s0) /* 465EA0 80219A10 2842002E */ slti $v0, $v0, 0x2e /* 465EA4 80219A14 14400003 */ bnez $v0, .L80219A24 -/* 465EA8 80219A18 00000000 */ nop +/* 465EA8 80219A18 00000000 */ nop /* 465EAC 80219A1C 2402002D */ addiu $v0, $zero, 0x2d /* 465EB0 80219A20 AE0200A8 */ sw $v0, 0xa8($s0) .L80219A24: @@ -95,7 +95,7 @@ glabel func_80219900_465D90 /* 465EE0 80219A50 C61E0098 */ lwc1 $f30, 0x98($s0) /* 465EE4 80219A54 4680F7A0 */ cvt.s.w $f30, $f30 /* 465EE8 80219A58 461A6302 */ mul.s $f12, $f12, $f26 -/* 465EEC 80219A5C 00000000 */ nop +/* 465EEC 80219A5C 00000000 */ nop /* 465EF0 80219A60 C61C009C */ lwc1 $f28, 0x9c($s0) /* 465EF4 80219A64 4680E720 */ cvt.s.w $f28, $f28 /* 465EF8 80219A68 3C0143B4 */ lui $at, 0x43b4 @@ -113,22 +113,22 @@ glabel func_80219900_465D90 /* 465F28 80219A98 4620B001 */ sub.d $f0, $f22, $f0 /* 465F2C 80219A9C 46002521 */ cvt.d.s $f20, $f4 /* 465F30 80219AA0 4620A502 */ mul.d $f20, $f20, $f0 -/* 465F34 80219AA4 00000000 */ nop +/* 465F34 80219AA4 00000000 */ nop /* 465F38 80219AA8 C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 465F3C 80219AAC 46806320 */ cvt.s.w $f12, $f12 /* 465F40 80219AB0 461A6302 */ mul.s $f12, $f12, $f26 -/* 465F44 80219AB4 00000000 */ nop +/* 465F44 80219AB4 00000000 */ nop /* 465F48 80219AB8 0C00A85B */ jal sin_rad /* 465F4C 80219ABC 46186303 */ div.s $f12, $f12, $f24 /* 465F50 80219AC0 4600E002 */ mul.s $f0, $f28, $f0 -/* 465F54 80219AC4 00000000 */ nop +/* 465F54 80219AC4 00000000 */ nop /* 465F58 80219AC8 8E0200A8 */ lw $v0, 0xa8($s0) /* 465F5C 80219ACC 00021040 */ sll $v0, $v0, 1 /* 465F60 80219AD0 44826000 */ mtc1 $v0, $f12 -/* 465F64 80219AD4 00000000 */ nop +/* 465F64 80219AD4 00000000 */ nop /* 465F68 80219AD8 46806320 */ cvt.s.w $f12, $f12 /* 465F6C 80219ADC 461A6302 */ mul.s $f12, $f12, $f26 -/* 465F70 80219AE0 00000000 */ nop +/* 465F70 80219AE0 00000000 */ nop /* 465F74 80219AE4 46000021 */ cvt.d.s $f0, $f0 /* 465F78 80219AE8 4620A500 */ add.d $f20, $f20, $f0 /* 465F7C 80219AEC 46186303 */ div.s $f12, $f12, $f24 @@ -138,12 +138,12 @@ glabel func_80219900_465D90 /* 465F8C 80219AFC C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 465F90 80219B00 46806320 */ cvt.s.w $f12, $f12 /* 465F94 80219B04 461A6302 */ mul.s $f12, $f12, $f26 -/* 465F98 80219B08 00000000 */ nop +/* 465F98 80219B08 00000000 */ nop /* 465F9C 80219B0C 3C0142B4 */ lui $at, 0x42b4 /* 465FA0 80219B10 44811000 */ mtc1 $at, $f2 -/* 465FA4 80219B14 00000000 */ nop +/* 465FA4 80219B14 00000000 */ nop /* 465FA8 80219B18 46020002 */ mul.s $f0, $f0, $f2 -/* 465FAC 80219B1C 00000000 */ nop +/* 465FAC 80219B1C 00000000 */ nop /* 465FB0 80219B20 C7A40014 */ lwc1 $f4, 0x14($sp) /* 465FB4 80219B24 46002100 */ add.s $f4, $f4, $f0 /* 465FB8 80219B28 46186303 */ div.s $f12, $f12, $f24 @@ -152,17 +152,17 @@ glabel func_80219900_465D90 /* 465FC4 80219B34 C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 465FC8 80219B38 46806320 */ cvt.s.w $f12, $f12 /* 465FCC 80219B3C 461A6302 */ mul.s $f12, $f12, $f26 -/* 465FD0 80219B40 00000000 */ nop +/* 465FD0 80219B40 00000000 */ nop /* 465FD4 80219B44 46000021 */ cvt.d.s $f0, $f0 /* 465FD8 80219B48 4620B581 */ sub.d $f22, $f22, $f0 /* 465FDC 80219B4C 4600F521 */ cvt.d.s $f20, $f30 /* 465FE0 80219B50 4636A502 */ mul.d $f20, $f20, $f22 -/* 465FE4 80219B54 00000000 */ nop +/* 465FE4 80219B54 00000000 */ nop /* 465FE8 80219B58 0C00A85B */ jal sin_rad /* 465FEC 80219B5C 46186303 */ div.s $f12, $f12, $f24 /* 465FF0 80219B60 C7A40018 */ lwc1 $f4, 0x18($sp) /* 465FF4 80219B64 46002002 */ mul.s $f0, $f4, $f0 -/* 465FF8 80219B68 00000000 */ nop +/* 465FF8 80219B68 00000000 */ nop /* 465FFC 80219B6C 46000021 */ cvt.d.s $f0, $f0 /* 466000 80219B70 4620A500 */ add.d $f20, $f20, $f0 /* 466004 80219B74 0808673C */ j .L80219CF0 @@ -191,7 +191,7 @@ glabel func_80219900_465D90 /* 466058 80219BC8 C61E0098 */ lwc1 $f30, 0x98($s0) /* 46605C 80219BCC 4680F7A0 */ cvt.s.w $f30, $f30 /* 466060 80219BD0 461A6302 */ mul.s $f12, $f12, $f26 -/* 466064 80219BD4 00000000 */ nop +/* 466064 80219BD4 00000000 */ nop /* 466068 80219BD8 C61C009C */ lwc1 $f28, 0x9c($s0) /* 46606C 80219BDC 4680E720 */ cvt.s.w $f28, $f28 /* 466070 80219BE0 3C0143B4 */ lui $at, 0x43b4 @@ -209,22 +209,22 @@ glabel func_80219900_465D90 /* 4660A0 80219C10 4620B001 */ sub.d $f0, $f22, $f0 /* 4660A4 80219C14 46002521 */ cvt.d.s $f20, $f4 /* 4660A8 80219C18 4620A502 */ mul.d $f20, $f20, $f0 -/* 4660AC 80219C1C 00000000 */ nop +/* 4660AC 80219C1C 00000000 */ nop /* 4660B0 80219C20 C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 4660B4 80219C24 46806320 */ cvt.s.w $f12, $f12 /* 4660B8 80219C28 461A6302 */ mul.s $f12, $f12, $f26 -/* 4660BC 80219C2C 00000000 */ nop +/* 4660BC 80219C2C 00000000 */ nop /* 4660C0 80219C30 0C00A85B */ jal sin_rad /* 4660C4 80219C34 46186303 */ div.s $f12, $f12, $f24 /* 4660C8 80219C38 4600E002 */ mul.s $f0, $f28, $f0 -/* 4660CC 80219C3C 00000000 */ nop +/* 4660CC 80219C3C 00000000 */ nop /* 4660D0 80219C40 8E0200A8 */ lw $v0, 0xa8($s0) /* 4660D4 80219C44 00021040 */ sll $v0, $v0, 1 /* 4660D8 80219C48 44826000 */ mtc1 $v0, $f12 -/* 4660DC 80219C4C 00000000 */ nop +/* 4660DC 80219C4C 00000000 */ nop /* 4660E0 80219C50 46806320 */ cvt.s.w $f12, $f12 /* 4660E4 80219C54 461A6302 */ mul.s $f12, $f12, $f26 -/* 4660E8 80219C58 00000000 */ nop +/* 4660E8 80219C58 00000000 */ nop /* 4660EC 80219C5C 46000021 */ cvt.d.s $f0, $f0 /* 4660F0 80219C60 4620A500 */ add.d $f20, $f20, $f0 /* 4660F4 80219C64 46186303 */ div.s $f12, $f12, $f24 @@ -234,12 +234,12 @@ glabel func_80219900_465D90 /* 466104 80219C74 C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 466108 80219C78 46806320 */ cvt.s.w $f12, $f12 /* 46610C 80219C7C 461A6302 */ mul.s $f12, $f12, $f26 -/* 466110 80219C80 00000000 */ nop +/* 466110 80219C80 00000000 */ nop /* 466114 80219C84 3C0142B4 */ lui $at, 0x42b4 /* 466118 80219C88 44811000 */ mtc1 $at, $f2 -/* 46611C 80219C8C 00000000 */ nop +/* 46611C 80219C8C 00000000 */ nop /* 466120 80219C90 46020002 */ mul.s $f0, $f0, $f2 -/* 466124 80219C94 00000000 */ nop +/* 466124 80219C94 00000000 */ nop /* 466128 80219C98 C7A40014 */ lwc1 $f4, 0x14($sp) /* 46612C 80219C9C 46002100 */ add.s $f4, $f4, $f0 /* 466130 80219CA0 46186303 */ div.s $f12, $f12, $f24 @@ -248,17 +248,17 @@ glabel func_80219900_465D90 /* 46613C 80219CAC C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 466140 80219CB0 46806320 */ cvt.s.w $f12, $f12 /* 466144 80219CB4 461A6302 */ mul.s $f12, $f12, $f26 -/* 466148 80219CB8 00000000 */ nop +/* 466148 80219CB8 00000000 */ nop /* 46614C 80219CBC 46000021 */ cvt.d.s $f0, $f0 /* 466150 80219CC0 4620B581 */ sub.d $f22, $f22, $f0 /* 466154 80219CC4 4600F521 */ cvt.d.s $f20, $f30 /* 466158 80219CC8 4636A502 */ mul.d $f20, $f20, $f22 -/* 46615C 80219CCC 00000000 */ nop +/* 46615C 80219CCC 00000000 */ nop /* 466160 80219CD0 0C00A85B */ jal sin_rad /* 466164 80219CD4 46186303 */ div.s $f12, $f12, $f24 /* 466168 80219CD8 C7A40018 */ lwc1 $f4, 0x18($sp) /* 46616C 80219CDC 46002002 */ mul.s $f0, $f4, $f0 -/* 466170 80219CE0 00000000 */ nop +/* 466170 80219CE0 00000000 */ nop /* 466174 80219CE4 46000021 */ cvt.d.s $f0, $f0 /* 466178 80219CE8 4620A500 */ add.d $f20, $f20, $f0 /* 46617C 80219CEC 2402005A */ addiu $v0, $zero, 0x5a diff --git a/asm/nonmatchings/battle/area_mim/4F7D50/func_8021823C_4F7E1C.s b/asm/nonmatchings/battle/area_mim/4F7D50/func_8021823C_4F7E1C.s index f56dff4ced..3dda593692 100644 --- a/asm/nonmatchings/battle/area_mim/4F7D50/func_8021823C_4F7E1C.s +++ b/asm/nonmatchings/battle/area_mim/4F7D50/func_8021823C_4F7E1C.s @@ -31,30 +31,30 @@ glabel func_8021823C_4F7E1C /* 4F7E84 802182A4 0C0B1EAF */ jal get_variable /* 4F7E88 802182A8 0040902D */ daddu $s2, $v0, $zero /* 4F7E8C 802182AC 4482A000 */ mtc1 $v0, $f20 -/* 4F7E90 802182B0 00000000 */ nop +/* 4F7E90 802182B0 00000000 */ nop /* 4F7E94 802182B4 4680A520 */ cvt.s.w $f20, $f20 /* 4F7E98 802182B8 0C00A8D4 */ jal cos_deg /* 4F7E9C 802182BC 4600A306 */ mov.s $f12, $f20 /* 4F7EA0 802182C0 4492B000 */ mtc1 $s2, $f22 -/* 4F7EA4 802182C4 00000000 */ nop +/* 4F7EA4 802182C4 00000000 */ nop /* 4F7EA8 802182C8 4680B5A0 */ cvt.s.w $f22, $f22 /* 4F7EAC 802182CC 4600B002 */ mul.s $f0, $f22, $f0 -/* 4F7EB0 802182D0 00000000 */ nop +/* 4F7EB0 802182D0 00000000 */ nop /* 4F7EB4 802182D4 4600A306 */ mov.s $f12, $f20 /* 4F7EB8 802182D8 4493A000 */ mtc1 $s3, $f20 -/* 4F7EBC 802182DC 00000000 */ nop +/* 4F7EBC 802182DC 00000000 */ nop /* 4F7EC0 802182E0 4680A520 */ cvt.s.w $f20, $f20 /* 4F7EC4 802182E4 4600A500 */ add.s $f20, $f20, $f0 /* 4F7EC8 802182E8 0C00A8BB */ jal sin_deg /* 4F7ECC 802182EC 26100004 */ addiu $s0, $s0, 4 /* 4F7ED0 802182F0 4600B582 */ mul.s $f22, $f22, $f0 -/* 4F7ED4 802182F4 00000000 */ nop +/* 4F7ED4 802182F4 00000000 */ nop /* 4F7ED8 802182F8 8E050000 */ lw $a1, ($s0) /* 4F7EDC 802182FC 26100004 */ addiu $s0, $s0, 4 /* 4F7EE0 80218300 0220202D */ daddu $a0, $s1, $zero /* 4F7EE4 80218304 4406A000 */ mfc1 $a2, $f20 /* 4F7EE8 80218308 4494A000 */ mtc1 $s4, $f20 -/* 4F7EEC 8021830C 00000000 */ nop +/* 4F7EEC 8021830C 00000000 */ nop /* 4F7EF0 80218310 4680A520 */ cvt.s.w $f20, $f20 /* 4F7EF4 80218314 0C0B2190 */ jal set_float_variable /* 4F7EF8 80218318 4616A501 */ sub.s $f20, $f20, $f22 @@ -73,5 +73,5 @@ glabel func_8021823C_4F7E1C /* 4F7F2C 8021834C 24020002 */ addiu $v0, $zero, 2 /* 4F7F30 80218350 03E00008 */ jr $ra /* 4F7F34 80218354 27BD0038 */ addiu $sp, $sp, 0x38 -/* 4F7F38 80218358 00000000 */ nop -/* 4F7F3C 8021835C 00000000 */ nop +/* 4F7F38 80218358 00000000 */ nop +/* 4F7F3C 8021835C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_mim/4F7F40/func_80218360_4F7F40.s b/asm/nonmatchings/battle/area_mim/4F7F40/func_80218360_4F7F40.s index 397a30e2c8..61ef9ac43a 100644 --- a/asm/nonmatchings/battle/area_mim/4F7F40/func_80218360_4F7F40.s +++ b/asm/nonmatchings/battle/area_mim/4F7F40/func_80218360_4F7F40.s @@ -5,7 +5,7 @@ glabel func_80218360_4F7F40 /* 4F7F40 80218360 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 4F7F44 80218364 AFBF0010 */ sw $ra, 0x10($sp) /* 4F7F48 80218368 0C046ED4 */ jal enable_world_fog -/* 4F7F4C 8021836C 00000000 */ nop +/* 4F7F4C 8021836C 00000000 */ nop /* 4F7F50 80218370 240403B6 */ addiu $a0, $zero, 0x3b6 /* 4F7F54 80218374 0C046EDD */ jal set_world_fog_dist /* 4F7F58 80218378 240503E8 */ addiu $a1, $zero, 0x3e8 @@ -25,4 +25,4 @@ glabel func_80218360_4F7F40 /* 4F7F90 802183B0 24020002 */ addiu $v0, $zero, 2 /* 4F7F94 802183B4 03E00008 */ jr $ra /* 4F7F98 802183B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 4F7F9C 802183BC 00000000 */ nop +/* 4F7F9C 802183BC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_nok/48D1A0/func_80218000_48D1A0.s b/asm/nonmatchings/battle/area_nok/48D1A0/func_80218000_48D1A0.s index 54650aad57..0f3a813a4d 100644 --- a/asm/nonmatchings/battle/area_nok/48D1A0/func_80218000_48D1A0.s +++ b/asm/nonmatchings/battle/area_nok/48D1A0/func_80218000_48D1A0.s @@ -11,12 +11,12 @@ glabel func_80218000_48D1A0 /* 48D1B8 80218018 46007506 */ mov.s $f20, $f14 /* 48D1BC 8021801C 4600A18D */ trunc.w.s $f6, $f20 /* 48D1C0 80218020 44023000 */ mfc1 $v0, $f6 -/* 48D1C4 80218024 00000000 */ nop +/* 48D1C4 80218024 00000000 */ nop /* 48D1C8 80218028 04420001 */ bltzl $v0, .L80218030 /* 48D1CC 8021802C 00021023 */ negu $v0, $v0 .L80218030: /* 48D1D0 80218030 44821000 */ mtc1 $v0, $f2 -/* 48D1D4 80218034 00000000 */ nop +/* 48D1D4 80218034 00000000 */ nop /* 48D1D8 80218038 468010A0 */ cvt.s.w $f2, $f2 /* 48D1DC 8021803C 46001103 */ div.s $f4, $f2, $f0 /* 48D1E0 80218040 0000202D */ daddu $a0, $zero, $zero @@ -37,7 +37,7 @@ glabel func_80218000_48D1A0 /* 48D218 80218078 00471021 */ addu $v0, $v0, $a3 /* 48D21C 8021807C C4400000 */ lwc1 $f0, ($v0) /* 48D220 80218080 4604003C */ c.lt.s $f0, $f4 -/* 48D224 80218084 00000000 */ nop +/* 48D224 80218084 00000000 */ nop /* 48D228 80218088 45020002 */ bc1fl .L80218094 /* 48D22C 8021808C 0060302D */ daddu $a2, $v1, $zero /* 48D230 80218090 0060202D */ daddu $a0, $v1, $zero @@ -62,43 +62,43 @@ glabel func_80218000_48D1A0 /* 48D278 802180D8 46001085 */ abs.s $f2, $f2 /* 48D27C 802180DC 46000005 */ abs.s $f0, $f0 /* 48D280 802180E0 4600103C */ c.lt.s $f2, $f0 -/* 48D284 802180E4 00000000 */ nop +/* 48D284 802180E4 00000000 */ nop /* 48D288 802180E8 45000002 */ bc1f .L802180F4 /* 48D28C 802180EC 00C0182D */ daddu $v1, $a2, $zero /* 48D290 802180F0 0080182D */ daddu $v1, $a0, $zero .L802180F4: /* 48D294 802180F4 44800000 */ mtc1 $zero, $f0 -/* 48D298 802180F8 00000000 */ nop +/* 48D298 802180F8 00000000 */ nop /* 48D29C 802180FC 4600B03C */ c.lt.s $f22, $f0 -/* 48D2A0 80218100 00000000 */ nop +/* 48D2A0 80218100 00000000 */ nop /* 48D2A4 80218104 4500000A */ bc1f .L80218130 -/* 48D2A8 80218108 00000000 */ nop +/* 48D2A8 80218108 00000000 */ nop /* 48D2AC 8021810C 4614003E */ c.le.s $f0, $f20 -/* 48D2B0 80218110 00000000 */ nop +/* 48D2B0 80218110 00000000 */ nop /* 48D2B4 80218114 45000004 */ bc1f .L80218128 /* 48D2B8 80218118 240200B4 */ addiu $v0, $zero, 0xb4 /* 48D2BC 8021811C 00431823 */ subu $v1, $v0, $v1 /* 48D2C0 80218120 44800000 */ mtc1 $zero, $f0 -/* 48D2C4 80218124 00000000 */ nop +/* 48D2C4 80218124 00000000 */ nop .L80218128: /* 48D2C8 80218128 4600B03C */ c.lt.s $f22, $f0 -/* 48D2CC 8021812C 00000000 */ nop +/* 48D2CC 8021812C 00000000 */ nop .L80218130: /* 48D2D0 80218130 45000005 */ bc1f .L80218148 -/* 48D2D4 80218134 00000000 */ nop +/* 48D2D4 80218134 00000000 */ nop /* 48D2D8 80218138 4600A03C */ c.lt.s $f20, $f0 -/* 48D2DC 8021813C 00000000 */ nop +/* 48D2DC 8021813C 00000000 */ nop /* 48D2E0 80218140 45030001 */ bc1tl .L80218148 /* 48D2E4 80218144 246300B4 */ addiu $v1, $v1, 0xb4 .L80218148: /* 48D2E8 80218148 44800000 */ mtc1 $zero, $f0 -/* 48D2EC 8021814C 00000000 */ nop +/* 48D2EC 8021814C 00000000 */ nop /* 48D2F0 80218150 4616003E */ c.le.s $f0, $f22 -/* 48D2F4 80218154 00000000 */ nop +/* 48D2F4 80218154 00000000 */ nop /* 48D2F8 80218158 45000006 */ bc1f .L80218174 -/* 48D2FC 8021815C 00000000 */ nop +/* 48D2FC 8021815C 00000000 */ nop /* 48D300 80218160 4600A03C */ c.lt.s $f20, $f0 -/* 48D304 80218164 00000000 */ nop +/* 48D304 80218164 00000000 */ nop /* 48D308 80218168 45000002 */ bc1f .L80218174 /* 48D30C 8021816C 24020168 */ addiu $v0, $zero, 0x168 /* 48D310 80218170 00431823 */ subu $v1, $v0, $v1 diff --git a/asm/nonmatchings/battle/area_nok/48D1A0/func_8021818C_48D32C.s b/asm/nonmatchings/battle/area_nok/48D1A0/func_8021818C_48D32C.s index de64bfe177..7f5e224787 100644 --- a/asm/nonmatchings/battle/area_nok/48D1A0/func_8021818C_48D32C.s +++ b/asm/nonmatchings/battle/area_nok/48D1A0/func_8021818C_48D32C.s @@ -36,7 +36,7 @@ glabel func_8021818C_48D32C /* 48D3A8 80218208 0C0B1EAF */ jal get_variable /* 48D3AC 8021820C 02118023 */ subu $s0, $s0, $s1 /* 48D3B0 80218210 16600006 */ bnez $s3, .L8021822C -/* 48D3B4 80218214 00000000 */ nop +/* 48D3B4 80218214 00000000 */ nop /* 48D3B8 80218218 16000004 */ bnez $s0, .L8021822C /* 48D3BC 8021821C 0280202D */ daddu $a0, $s4, $zero /* 48D3C0 80218220 8E450000 */ lw $a1, ($s2) @@ -44,10 +44,10 @@ glabel func_8021818C_48D32C /* 48D3C8 80218228 0040302D */ daddu $a2, $v0, $zero .L8021822C: /* 48D3CC 8021822C 44936000 */ mtc1 $s3, $f12 -/* 48D3D0 80218230 00000000 */ nop +/* 48D3D0 80218230 00000000 */ nop /* 48D3D4 80218234 46806320 */ cvt.s.w $f12, $f12 /* 48D3D8 80218238 44907000 */ mtc1 $s0, $f14 -/* 48D3DC 8021823C 00000000 */ nop +/* 48D3DC 8021823C 00000000 */ nop /* 48D3E0 80218240 0C086000 */ jal func_80218000_48D1A0 /* 48D3E4 80218244 468073A0 */ cvt.s.w $f14, $f14 /* 48D3E8 80218248 0280202D */ daddu $a0, $s4, $zero @@ -55,7 +55,7 @@ glabel func_8021818C_48D32C /* 48D3F0 80218250 2446FFA6 */ addiu $a2, $v0, -0x5a .L80218254: /* 48D3F4 80218254 0C0B2026 */ jal set_variable -/* 48D3F8 80218258 00000000 */ nop +/* 48D3F8 80218258 00000000 */ nop /* 48D3FC 8021825C 24020002 */ addiu $v0, $zero, 2 /* 48D400 80218260 8FBF0024 */ lw $ra, 0x24($sp) /* 48D404 80218264 8FB40020 */ lw $s4, 0x20($sp) diff --git a/asm/nonmatchings/battle/area_nok/48D1A0/func_802182D8_48D478.s b/asm/nonmatchings/battle/area_nok/48D1A0/func_802182D8_48D478.s index a43957c9f6..d97d3b71f5 100644 --- a/asm/nonmatchings/battle/area_nok/48D1A0/func_802182D8_48D478.s +++ b/asm/nonmatchings/battle/area_nok/48D1A0/func_802182D8_48D478.s @@ -11,12 +11,12 @@ glabel func_802182D8_48D478 /* 48D490 802182F0 46007506 */ mov.s $f20, $f14 /* 48D494 802182F4 4600A18D */ trunc.w.s $f6, $f20 /* 48D498 802182F8 44023000 */ mfc1 $v0, $f6 -/* 48D49C 802182FC 00000000 */ nop +/* 48D49C 802182FC 00000000 */ nop /* 48D4A0 80218300 04420001 */ bltzl $v0, .L80218308 /* 48D4A4 80218304 00021023 */ negu $v0, $v0 .L80218308: /* 48D4A8 80218308 44821000 */ mtc1 $v0, $f2 -/* 48D4AC 8021830C 00000000 */ nop +/* 48D4AC 8021830C 00000000 */ nop /* 48D4B0 80218310 468010A0 */ cvt.s.w $f2, $f2 /* 48D4B4 80218314 46001103 */ div.s $f4, $f2, $f0 /* 48D4B8 80218318 0000202D */ daddu $a0, $zero, $zero @@ -37,7 +37,7 @@ glabel func_802182D8_48D478 /* 48D4F0 80218350 00471021 */ addu $v0, $v0, $a3 /* 48D4F4 80218354 C4400000 */ lwc1 $f0, ($v0) /* 48D4F8 80218358 4604003C */ c.lt.s $f0, $f4 -/* 48D4FC 8021835C 00000000 */ nop +/* 48D4FC 8021835C 00000000 */ nop /* 48D500 80218360 45020002 */ bc1fl .L8021836C /* 48D504 80218364 0060302D */ daddu $a2, $v1, $zero /* 48D508 80218368 0060202D */ daddu $a0, $v1, $zero @@ -62,43 +62,43 @@ glabel func_802182D8_48D478 /* 48D550 802183B0 46001085 */ abs.s $f2, $f2 /* 48D554 802183B4 46000005 */ abs.s $f0, $f0 /* 48D558 802183B8 4600103C */ c.lt.s $f2, $f0 -/* 48D55C 802183BC 00000000 */ nop +/* 48D55C 802183BC 00000000 */ nop /* 48D560 802183C0 45000002 */ bc1f .L802183CC /* 48D564 802183C4 00C0182D */ daddu $v1, $a2, $zero /* 48D568 802183C8 0080182D */ daddu $v1, $a0, $zero .L802183CC: /* 48D56C 802183CC 44800000 */ mtc1 $zero, $f0 -/* 48D570 802183D0 00000000 */ nop +/* 48D570 802183D0 00000000 */ nop /* 48D574 802183D4 4600B03C */ c.lt.s $f22, $f0 -/* 48D578 802183D8 00000000 */ nop +/* 48D578 802183D8 00000000 */ nop /* 48D57C 802183DC 4500000A */ bc1f .L80218408 -/* 48D580 802183E0 00000000 */ nop +/* 48D580 802183E0 00000000 */ nop /* 48D584 802183E4 4614003E */ c.le.s $f0, $f20 -/* 48D588 802183E8 00000000 */ nop +/* 48D588 802183E8 00000000 */ nop /* 48D58C 802183EC 45000004 */ bc1f .L80218400 /* 48D590 802183F0 240200B4 */ addiu $v0, $zero, 0xb4 /* 48D594 802183F4 00431823 */ subu $v1, $v0, $v1 /* 48D598 802183F8 44800000 */ mtc1 $zero, $f0 -/* 48D59C 802183FC 00000000 */ nop +/* 48D59C 802183FC 00000000 */ nop .L80218400: /* 48D5A0 80218400 4600B03C */ c.lt.s $f22, $f0 -/* 48D5A4 80218404 00000000 */ nop +/* 48D5A4 80218404 00000000 */ nop .L80218408: /* 48D5A8 80218408 45000005 */ bc1f .L80218420 -/* 48D5AC 8021840C 00000000 */ nop +/* 48D5AC 8021840C 00000000 */ nop /* 48D5B0 80218410 4600A03C */ c.lt.s $f20, $f0 -/* 48D5B4 80218414 00000000 */ nop +/* 48D5B4 80218414 00000000 */ nop /* 48D5B8 80218418 45030001 */ bc1tl .L80218420 /* 48D5BC 8021841C 246300B4 */ addiu $v1, $v1, 0xb4 .L80218420: /* 48D5C0 80218420 44800000 */ mtc1 $zero, $f0 -/* 48D5C4 80218424 00000000 */ nop +/* 48D5C4 80218424 00000000 */ nop /* 48D5C8 80218428 4616003E */ c.le.s $f0, $f22 -/* 48D5CC 8021842C 00000000 */ nop +/* 48D5CC 8021842C 00000000 */ nop /* 48D5D0 80218430 45000006 */ bc1f .L8021844C -/* 48D5D4 80218434 00000000 */ nop +/* 48D5D4 80218434 00000000 */ nop /* 48D5D8 80218438 4600A03C */ c.lt.s $f20, $f0 -/* 48D5DC 8021843C 00000000 */ nop +/* 48D5DC 8021843C 00000000 */ nop /* 48D5E0 80218440 45000002 */ bc1f .L8021844C /* 48D5E4 80218444 24020168 */ addiu $v0, $zero, 0x168 /* 48D5E8 80218448 00431823 */ subu $v1, $v0, $v1 diff --git a/asm/nonmatchings/battle/area_nok/48D1A0/func_80218464_48D604.s b/asm/nonmatchings/battle/area_nok/48D1A0/func_80218464_48D604.s index 63e800b60e..ae4b2d1403 100644 --- a/asm/nonmatchings/battle/area_nok/48D1A0/func_80218464_48D604.s +++ b/asm/nonmatchings/battle/area_nok/48D1A0/func_80218464_48D604.s @@ -36,7 +36,7 @@ glabel func_80218464_48D604 /* 48D680 802184E0 0C0B1EAF */ jal get_variable /* 48D684 802184E4 02118023 */ subu $s0, $s0, $s1 /* 48D688 802184E8 16600006 */ bnez $s3, .L80218504 -/* 48D68C 802184EC 00000000 */ nop +/* 48D68C 802184EC 00000000 */ nop /* 48D690 802184F0 16000004 */ bnez $s0, .L80218504 /* 48D694 802184F4 0280202D */ daddu $a0, $s4, $zero /* 48D698 802184F8 8E450000 */ lw $a1, ($s2) @@ -44,10 +44,10 @@ glabel func_80218464_48D604 /* 48D6A0 80218500 0040302D */ daddu $a2, $v0, $zero .L80218504: /* 48D6A4 80218504 44936000 */ mtc1 $s3, $f12 -/* 48D6A8 80218508 00000000 */ nop +/* 48D6A8 80218508 00000000 */ nop /* 48D6AC 8021850C 46806320 */ cvt.s.w $f12, $f12 /* 48D6B0 80218510 44907000 */ mtc1 $s0, $f14 -/* 48D6B4 80218514 00000000 */ nop +/* 48D6B4 80218514 00000000 */ nop /* 48D6B8 80218518 0C0860B6 */ jal func_802182D8_48D478 /* 48D6BC 8021851C 468073A0 */ cvt.s.w $f14, $f14 /* 48D6C0 80218520 0280202D */ daddu $a0, $s4, $zero @@ -55,7 +55,7 @@ glabel func_80218464_48D604 /* 48D6C8 80218528 2446FFA6 */ addiu $a2, $v0, -0x5a .L8021852C: /* 48D6CC 8021852C 0C0B2026 */ jal set_variable -/* 48D6D0 80218530 00000000 */ nop +/* 48D6D0 80218530 00000000 */ nop /* 48D6D4 80218534 24020002 */ addiu $v0, $zero, 2 /* 48D6D8 80218538 8FBF0024 */ lw $ra, 0x24($sp) /* 48D6DC 8021853C 8FB40020 */ lw $s4, 0x20($sp) @@ -65,5 +65,5 @@ glabel func_80218464_48D604 /* 48D6EC 8021854C 8FB00010 */ lw $s0, 0x10($sp) /* 48D6F0 80218550 03E00008 */ jr $ra /* 48D6F4 80218554 27BD0028 */ addiu $sp, $sp, 0x28 -/* 48D6F8 80218558 00000000 */ nop -/* 48D6FC 8021855C 00000000 */ nop +/* 48D6F8 80218558 00000000 */ nop +/* 48D6FC 8021855C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_nok/48D700/func_80218560_48D700.s b/asm/nonmatchings/battle/area_nok/48D700/func_80218560_48D700.s index 0d992f2975..4ef5bc1280 100644 --- a/asm/nonmatchings/battle/area_nok/48D700/func_80218560_48D700.s +++ b/asm/nonmatchings/battle/area_nok/48D700/func_80218560_48D700.s @@ -11,12 +11,12 @@ glabel func_80218560_48D700 /* 48D718 80218578 46007506 */ mov.s $f20, $f14 /* 48D71C 8021857C 4600A18D */ trunc.w.s $f6, $f20 /* 48D720 80218580 44023000 */ mfc1 $v0, $f6 -/* 48D724 80218584 00000000 */ nop +/* 48D724 80218584 00000000 */ nop /* 48D728 80218588 04420001 */ bltzl $v0, .L80218590 /* 48D72C 8021858C 00021023 */ negu $v0, $v0 .L80218590: /* 48D730 80218590 44821000 */ mtc1 $v0, $f2 -/* 48D734 80218594 00000000 */ nop +/* 48D734 80218594 00000000 */ nop /* 48D738 80218598 468010A0 */ cvt.s.w $f2, $f2 /* 48D73C 8021859C 46001103 */ div.s $f4, $f2, $f0 /* 48D740 802185A0 0000202D */ daddu $a0, $zero, $zero @@ -37,7 +37,7 @@ glabel func_80218560_48D700 /* 48D778 802185D8 00471021 */ addu $v0, $v0, $a3 /* 48D77C 802185DC C4400000 */ lwc1 $f0, ($v0) /* 48D780 802185E0 4604003C */ c.lt.s $f0, $f4 -/* 48D784 802185E4 00000000 */ nop +/* 48D784 802185E4 00000000 */ nop /* 48D788 802185E8 45020002 */ bc1fl .L802185F4 /* 48D78C 802185EC 0060302D */ daddu $a2, $v1, $zero /* 48D790 802185F0 0060202D */ daddu $a0, $v1, $zero @@ -62,43 +62,43 @@ glabel func_80218560_48D700 /* 48D7D8 80218638 46001085 */ abs.s $f2, $f2 /* 48D7DC 8021863C 46000005 */ abs.s $f0, $f0 /* 48D7E0 80218640 4600103C */ c.lt.s $f2, $f0 -/* 48D7E4 80218644 00000000 */ nop +/* 48D7E4 80218644 00000000 */ nop /* 48D7E8 80218648 45000002 */ bc1f .L80218654 /* 48D7EC 8021864C 00C0182D */ daddu $v1, $a2, $zero /* 48D7F0 80218650 0080182D */ daddu $v1, $a0, $zero .L80218654: /* 48D7F4 80218654 44800000 */ mtc1 $zero, $f0 -/* 48D7F8 80218658 00000000 */ nop +/* 48D7F8 80218658 00000000 */ nop /* 48D7FC 8021865C 4600B03C */ c.lt.s $f22, $f0 -/* 48D800 80218660 00000000 */ nop +/* 48D800 80218660 00000000 */ nop /* 48D804 80218664 4500000A */ bc1f .L80218690 -/* 48D808 80218668 00000000 */ nop +/* 48D808 80218668 00000000 */ nop /* 48D80C 8021866C 4614003E */ c.le.s $f0, $f20 -/* 48D810 80218670 00000000 */ nop +/* 48D810 80218670 00000000 */ nop /* 48D814 80218674 45000004 */ bc1f .L80218688 /* 48D818 80218678 240200B4 */ addiu $v0, $zero, 0xb4 /* 48D81C 8021867C 00431823 */ subu $v1, $v0, $v1 /* 48D820 80218680 44800000 */ mtc1 $zero, $f0 -/* 48D824 80218684 00000000 */ nop +/* 48D824 80218684 00000000 */ nop .L80218688: /* 48D828 80218688 4600B03C */ c.lt.s $f22, $f0 -/* 48D82C 8021868C 00000000 */ nop +/* 48D82C 8021868C 00000000 */ nop .L80218690: /* 48D830 80218690 45000005 */ bc1f .L802186A8 -/* 48D834 80218694 00000000 */ nop +/* 48D834 80218694 00000000 */ nop /* 48D838 80218698 4600A03C */ c.lt.s $f20, $f0 -/* 48D83C 8021869C 00000000 */ nop +/* 48D83C 8021869C 00000000 */ nop /* 48D840 802186A0 45030001 */ bc1tl .L802186A8 /* 48D844 802186A4 246300B4 */ addiu $v1, $v1, 0xb4 .L802186A8: /* 48D848 802186A8 44800000 */ mtc1 $zero, $f0 -/* 48D84C 802186AC 00000000 */ nop +/* 48D84C 802186AC 00000000 */ nop /* 48D850 802186B0 4616003E */ c.le.s $f0, $f22 -/* 48D854 802186B4 00000000 */ nop +/* 48D854 802186B4 00000000 */ nop /* 48D858 802186B8 45000006 */ bc1f .L802186D4 -/* 48D85C 802186BC 00000000 */ nop +/* 48D85C 802186BC 00000000 */ nop /* 48D860 802186C0 4600A03C */ c.lt.s $f20, $f0 -/* 48D864 802186C4 00000000 */ nop +/* 48D864 802186C4 00000000 */ nop /* 48D868 802186C8 45000002 */ bc1f .L802186D4 /* 48D86C 802186CC 24020168 */ addiu $v0, $zero, 0x168 /* 48D870 802186D0 00431823 */ subu $v1, $v0, $v1 diff --git a/asm/nonmatchings/battle/area_nok/48D700/func_802186EC_48D88C.s b/asm/nonmatchings/battle/area_nok/48D700/func_802186EC_48D88C.s index bc0bfa47fa..3c83d24cff 100644 --- a/asm/nonmatchings/battle/area_nok/48D700/func_802186EC_48D88C.s +++ b/asm/nonmatchings/battle/area_nok/48D700/func_802186EC_48D88C.s @@ -36,7 +36,7 @@ glabel func_802186EC_48D88C /* 48D908 80218768 0C0B1EAF */ jal get_variable /* 48D90C 8021876C 02118023 */ subu $s0, $s0, $s1 /* 48D910 80218770 16600006 */ bnez $s3, .L8021878C -/* 48D914 80218774 00000000 */ nop +/* 48D914 80218774 00000000 */ nop /* 48D918 80218778 16000004 */ bnez $s0, .L8021878C /* 48D91C 8021877C 0280202D */ daddu $a0, $s4, $zero /* 48D920 80218780 8E450000 */ lw $a1, ($s2) @@ -44,10 +44,10 @@ glabel func_802186EC_48D88C /* 48D928 80218788 0040302D */ daddu $a2, $v0, $zero .L8021878C: /* 48D92C 8021878C 44936000 */ mtc1 $s3, $f12 -/* 48D930 80218790 00000000 */ nop +/* 48D930 80218790 00000000 */ nop /* 48D934 80218794 46806320 */ cvt.s.w $f12, $f12 /* 48D938 80218798 44907000 */ mtc1 $s0, $f14 -/* 48D93C 8021879C 00000000 */ nop +/* 48D93C 8021879C 00000000 */ nop /* 48D940 802187A0 0C086158 */ jal func_80218560_48D700 /* 48D944 802187A4 468073A0 */ cvt.s.w $f14, $f14 /* 48D948 802187A8 0280202D */ daddu $a0, $s4, $zero @@ -55,7 +55,7 @@ glabel func_802186EC_48D88C /* 48D950 802187B0 2446FFA6 */ addiu $a2, $v0, -0x5a .L802187B4: /* 48D954 802187B4 0C0B2026 */ jal set_variable -/* 48D958 802187B8 00000000 */ nop +/* 48D958 802187B8 00000000 */ nop /* 48D95C 802187BC 24020002 */ addiu $v0, $zero, 2 /* 48D960 802187C0 8FBF0024 */ lw $ra, 0x24($sp) /* 48D964 802187C4 8FB40020 */ lw $s4, 0x20($sp) diff --git a/asm/nonmatchings/battle/area_nok/48DCF0/func_80218C74_48DE14.s b/asm/nonmatchings/battle/area_nok/48DCF0/func_80218C74_48DE14.s index 71ab7fede2..2a9a91ce7c 100644 --- a/asm/nonmatchings/battle/area_nok/48DCF0/func_80218C74_48DE14.s +++ b/asm/nonmatchings/battle/area_nok/48DCF0/func_80218C74_48DE14.s @@ -26,16 +26,16 @@ glabel func_80218C74_48DE14 /* 48DE68 80218CC8 0C00A67F */ jal rand_int /* 48DE6C 80218CCC 0040982D */ daddu $s3, $v0, $zero /* 48DE70 80218CD0 4482B000 */ mtc1 $v0, $f22 -/* 48DE74 80218CD4 00000000 */ nop +/* 48DE74 80218CD4 00000000 */ nop /* 48DE78 80218CD8 4680B5A0 */ cvt.s.w $f22, $f22 /* 48DE7C 80218CDC 3C014238 */ lui $at, 0x4238 /* 48DE80 80218CE0 4481C000 */ mtc1 $at, $f24 /* 48DE84 80218CE4 0C00A8D4 */ jal cos_deg /* 48DE88 80218CE8 4600B306 */ mov.s $f12, $f22 /* 48DE8C 80218CEC 46180002 */ mul.s $f0, $f0, $f24 -/* 48DE90 80218CF0 00000000 */ nop +/* 48DE90 80218CF0 00000000 */ nop /* 48DE94 80218CF4 4492A000 */ mtc1 $s2, $f20 -/* 48DE98 80218CF8 00000000 */ nop +/* 48DE98 80218CF8 00000000 */ nop /* 48DE9C 80218CFC 4680A520 */ cvt.s.w $f20, $f20 /* 48DEA0 80218D00 4600A000 */ add.s $f0, $f20, $f0 /* 48DEA4 80218D04 4600008D */ trunc.w.s $f2, $f0 @@ -43,9 +43,9 @@ glabel func_80218C74_48DE14 /* 48DEAC 80218D0C 0C00A8BB */ jal sin_deg /* 48DEB0 80218D10 4600B306 */ mov.s $f12, $f22 /* 48DEB4 80218D14 46180002 */ mul.s $f0, $f0, $f24 -/* 48DEB8 80218D18 00000000 */ nop +/* 48DEB8 80218D18 00000000 */ nop /* 48DEBC 80218D1C 4493C000 */ mtc1 $s3, $f24 -/* 48DEC0 80218D20 00000000 */ nop +/* 48DEC0 80218D20 00000000 */ nop /* 48DEC4 80218D24 4680C620 */ cvt.s.w $f24, $f24 /* 48DEC8 80218D28 4600C000 */ add.s $f0, $f24, $f0 /* 48DECC 80218D2C 3C014278 */ lui $at, 0x4278 @@ -55,14 +55,14 @@ glabel func_80218C74_48DE14 /* 48DEDC 80218D3C 0C00A8D4 */ jal cos_deg /* 48DEE0 80218D40 4600B306 */ mov.s $f12, $f22 /* 48DEE4 80218D44 461A0002 */ mul.s $f0, $f0, $f26 -/* 48DEE8 80218D48 00000000 */ nop +/* 48DEE8 80218D48 00000000 */ nop /* 48DEEC 80218D4C 4600A500 */ add.s $f20, $f20, $f0 /* 48DEF0 80218D50 4600A08D */ trunc.w.s $f2, $f20 /* 48DEF4 80218D54 44141000 */ mfc1 $s4, $f2 /* 48DEF8 80218D58 0C00A8BB */ jal sin_deg /* 48DEFC 80218D5C 4600B306 */ mov.s $f12, $f22 /* 48DF00 80218D60 461A0002 */ mul.s $f0, $f0, $f26 -/* 48DF04 80218D64 00000000 */ nop +/* 48DF04 80218D64 00000000 */ nop /* 48DF08 80218D68 26100004 */ addiu $s0, $s0, 4 /* 48DF0C 80218D6C 8E050000 */ lw $a1, ($s0) /* 48DF10 80218D70 26100004 */ addiu $s0, $s0, 4 diff --git a/asm/nonmatchings/battle/area_nok/48DCF0/func_80218DF8_48DF98.s b/asm/nonmatchings/battle/area_nok/48DCF0/func_80218DF8_48DF98.s index a4a150cf94..2bd5a49bd5 100644 --- a/asm/nonmatchings/battle/area_nok/48DCF0/func_80218DF8_48DF98.s +++ b/asm/nonmatchings/battle/area_nok/48DCF0/func_80218DF8_48DF98.s @@ -11,4 +11,4 @@ glabel func_80218DF8_48DF98 /* 48DFB0 80218E10 24020002 */ addiu $v0, $zero, 2 /* 48DFB4 80218E14 03E00008 */ jr $ra /* 48DFB8 80218E18 27BD0018 */ addiu $sp, $sp, 0x18 -/* 48DFBC 80218E1C 00000000 */ nop +/* 48DFBC 80218E1C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_omo/512AB0/func_802185AC_512B7C.s b/asm/nonmatchings/battle/area_omo/512AB0/func_802185AC_512B7C.s index 679bab8fcb..1fb08b26bb 100644 --- a/asm/nonmatchings/battle/area_omo/512AB0/func_802185AC_512B7C.s +++ b/asm/nonmatchings/battle/area_omo/512AB0/func_802185AC_512B7C.s @@ -35,26 +35,26 @@ glabel func_802185AC_512B7C /* 512BF4 80218624 34210FD8 */ ori $at, $at, 0xfd8 /* 512BF8 80218628 44814000 */ mtc1 $at, $f8 /* 512BFC 8021862C 44922000 */ mtc1 $s2, $f4 -/* 512C00 80218630 00000000 */ nop +/* 512C00 80218630 00000000 */ nop /* 512C04 80218634 46802120 */ cvt.s.w $f4, $f4 /* 512C08 80218638 46082202 */ mul.s $f8, $f4, $f8 -/* 512C0C 8021863C 00000000 */ nop +/* 512C0C 8021863C 00000000 */ nop /* 512C10 80218640 44903000 */ mtc1 $s0, $f6 -/* 512C14 80218644 00000000 */ nop +/* 512C14 80218644 00000000 */ nop /* 512C18 80218648 468031A0 */ cvt.s.w $f6, $f6 /* 512C1C 8021864C 3C013F80 */ lui $at, 0x3f80 /* 512C20 80218650 44811000 */ mtc1 $at, $f2 /* 512C24 80218654 46062103 */ div.s $f4, $f4, $f6 /* 512C28 80218658 46041081 */ sub.s $f2, $f2, $f4 /* 512C2C 8021865C 46020502 */ mul.s $f20, $f0, $f2 -/* 512C30 80218660 00000000 */ nop +/* 512C30 80218660 00000000 */ nop /* 512C34 80218664 44936000 */ mtc1 $s3, $f12 -/* 512C38 80218668 00000000 */ nop +/* 512C38 80218668 00000000 */ nop /* 512C3C 8021866C 46806320 */ cvt.s.w $f12, $f12 /* 512C40 80218670 0C00A874 */ jal cos_rad /* 512C44 80218674 460C4303 */ div.s $f12, $f8, $f12 /* 512C48 80218678 4600A502 */ mul.s $f20, $f20, $f0 -/* 512C4C 8021867C 00000000 */ nop +/* 512C4C 8021867C 00000000 */ nop /* 512C50 80218680 0220202D */ daddu $a0, $s1, $zero /* 512C54 80218684 4600A28D */ trunc.w.s $f10, $f20 /* 512C58 80218688 44065000 */ mfc1 $a2, $f10 @@ -70,4 +70,4 @@ glabel func_802185AC_512B7C /* 512C80 802186B0 24020002 */ addiu $v0, $zero, 2 /* 512C84 802186B4 03E00008 */ jr $ra /* 512C88 802186B8 27BD0030 */ addiu $sp, $sp, 0x30 -/* 512C8C 802186BC 00000000 */ nop +/* 512C8C 802186BC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_omo/512AB0/func_8021878C_512D5C.s b/asm/nonmatchings/battle/area_omo/512AB0/func_8021878C_512D5C.s index ca33060468..07ca8acb50 100644 --- a/asm/nonmatchings/battle/area_omo/512AB0/func_8021878C_512D5C.s +++ b/asm/nonmatchings/battle/area_omo/512AB0/func_8021878C_512D5C.s @@ -38,15 +38,15 @@ glabel func_8021878C_512D5C /* 512DE0 80218810 3C058023 */ lui $a1, %hi(D_802310D0) /* 512DE4 80218814 24A510D0 */ addiu $a1, $a1, %lo(D_802310D0) /* 512DE8 80218818 44940000 */ mtc1 $s4, $f0 -/* 512DEC 8021881C 00000000 */ nop +/* 512DEC 8021881C 00000000 */ nop /* 512DF0 80218820 46800020 */ cvt.s.w $f0, $f0 /* 512DF4 80218824 E4A00028 */ swc1 $f0, 0x28($a1) /* 512DF8 80218828 44930000 */ mtc1 $s3, $f0 -/* 512DFC 8021882C 00000000 */ nop +/* 512DFC 8021882C 00000000 */ nop /* 512E00 80218830 46800020 */ cvt.s.w $f0, $f0 /* 512E04 80218834 E4A0002C */ swc1 $f0, 0x2c($a1) /* 512E08 80218838 44920000 */ mtc1 $s2, $f0 -/* 512E0C 8021883C 00000000 */ nop +/* 512E0C 8021883C 00000000 */ nop /* 512E10 80218840 46800020 */ cvt.s.w $f0, $f0 /* 512E14 80218844 4406A000 */ mfc1 $a2, $f20 /* 512E18 80218848 0040382D */ daddu $a3, $v0, $zero @@ -62,4 +62,4 @@ glabel func_8021878C_512D5C /* 512E40 80218870 24020002 */ addiu $v0, $zero, 2 /* 512E44 80218874 03E00008 */ jr $ra /* 512E48 80218878 27BD0030 */ addiu $sp, $sp, 0x30 -/* 512E4C 8021887C 00000000 */ nop +/* 512E4C 8021887C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_omo/512AB0/func_80218880_512E50.s b/asm/nonmatchings/battle/area_omo/512AB0/func_80218880_512E50.s index 3d3c5256a3..af13d39c7c 100644 --- a/asm/nonmatchings/battle/area_omo/512AB0/func_80218880_512E50.s +++ b/asm/nonmatchings/battle/area_omo/512AB0/func_80218880_512E50.s @@ -62,12 +62,12 @@ glabel func_80218880_512E50 /* 512F34 80218964 C626001C */ lwc1 $f6, 0x1c($s1) /* 512F38 80218968 468031A0 */ cvt.s.w $f6, $f6 /* 512F3C 8021896C 46062102 */ mul.s $f4, $f4, $f6 -/* 512F40 80218970 00000000 */ nop +/* 512F40 80218970 00000000 */ nop /* 512F44 80218974 3C013F00 */ lui $at, 0x3f00 /* 512F48 80218978 44811000 */ mtc1 $at, $f2 -/* 512F4C 8021897C 00000000 */ nop +/* 512F4C 8021897C 00000000 */ nop /* 512F50 80218980 46022102 */ mul.s $f4, $f4, $f2 -/* 512F54 80218984 00000000 */ nop +/* 512F54 80218984 00000000 */ nop /* 512F58 80218988 E620000C */ swc1 $f0, 0xc($s1) /* 512F5C 8021898C C6200004 */ lwc1 $f0, 4($s1) /* 512F60 80218990 C602000C */ lwc1 $f2, 0xc($s0) @@ -84,7 +84,7 @@ glabel func_80218880_512E50 /* 512F88 802189B8 8E240020 */ lw $a0, 0x20($s1) /* 512F8C 802189BC 0040802D */ daddu $s0, $v0, $zero /* 512F90 802189C0 16000005 */ bnez $s0, .L802189D8 -/* 512F94 802189C4 00000000 */ nop +/* 512F94 802189C4 00000000 */ nop /* 512F98 802189C8 0C00AB4B */ jal heap_free /* 512F9C 802189CC 8E440070 */ lw $a0, 0x70($s2) /* 512FA0 802189D0 0808629F */ j .L80218A7C @@ -92,10 +92,10 @@ glabel func_80218880_512E50 .L802189D8: /* 512FA8 802189D8 C62C000C */ lwc1 $f12, 0xc($s1) /* 512FAC 802189DC 0C00A8BB */ jal sin_deg -/* 512FB0 802189E0 00000000 */ nop +/* 512FB0 802189E0 00000000 */ nop /* 512FB4 802189E4 C6220014 */ lwc1 $f2, 0x14($s1) /* 512FB8 802189E8 46001082 */ mul.s $f2, $f2, $f0 -/* 512FBC 802189EC 00000000 */ nop +/* 512FBC 802189EC 00000000 */ nop /* 512FC0 802189F0 C6000008 */ lwc1 $f0, 8($s0) /* 512FC4 802189F4 46020000 */ add.s $f0, $f0, $f2 /* 512FC8 802189F8 E6000008 */ swc1 $f0, 8($s0) @@ -103,7 +103,7 @@ glabel func_80218880_512E50 /* 512FD0 80218A00 C62C000C */ lwc1 $f12, 0xc($s1) /* 512FD4 80218A04 C6220014 */ lwc1 $f2, 0x14($s1) /* 512FD8 80218A08 46001082 */ mul.s $f2, $f2, $f0 -/* 512FDC 80218A0C 00000000 */ nop +/* 512FDC 80218A0C 00000000 */ nop /* 512FE0 80218A10 C6000010 */ lwc1 $f0, 0x10($s0) /* 512FE4 80218A14 46020001 */ sub.s $f0, $f0, $f2 /* 512FE8 80218A18 E6000010 */ swc1 $f0, 0x10($s0) diff --git a/asm/nonmatchings/battle/area_omo/512AB0/func_80218B38_513108.s b/asm/nonmatchings/battle/area_omo/512AB0/func_80218B38_513108.s index b31eac4652..a4cfdb792e 100644 --- a/asm/nonmatchings/battle/area_omo/512AB0/func_80218B38_513108.s +++ b/asm/nonmatchings/battle/area_omo/512AB0/func_80218B38_513108.s @@ -56,12 +56,12 @@ glabel func_80218B38_513108 /* 5131C8 80218BF8 50600007 */ beql $v1, $zero, .L80218C18 /* 5131CC 80218BFC A25000AE */ sb $s0, 0xae($s2) /* 5131D0 80218C00 08086333 */ j .L80218CCC -/* 5131D4 80218C04 00000000 */ nop +/* 5131D4 80218C04 00000000 */ nop .L80218C08: /* 5131D8 80218C08 50620026 */ beql $v1, $v0, .L80218CA4 /* 5131DC 80218C0C A25000B0 */ sb $s0, 0xb0($s2) /* 5131E0 80218C10 08086333 */ j .L80218CCC -/* 5131E4 80218C14 00000000 */ nop +/* 5131E4 80218C14 00000000 */ nop .L80218C18: /* 5131E8 80218C18 8E250000 */ lw $a1, ($s1) /* 5131EC 80218C1C 82820001 */ lb $v0, 1($s4) @@ -110,7 +110,7 @@ glabel func_80218B38_513108 /* 513290 80218CC0 2406004F */ addiu $a2, $zero, 0x4f .L80218CC4: /* 513294 80218CC4 0C0B2026 */ jal set_variable -/* 513298 80218CC8 00000000 */ nop +/* 513298 80218CC8 00000000 */ nop .L80218CCC: /* 51329C 80218CCC 8FBF0038 */ lw $ra, 0x38($sp) /* 5132A0 80218CD0 8FB50034 */ lw $s5, 0x34($sp) diff --git a/asm/nonmatchings/battle/area_omo/512AB0/func_80218CF4_5132C4.s b/asm/nonmatchings/battle/area_omo/512AB0/func_80218CF4_5132C4.s index cbe334ca20..810671ef3d 100644 --- a/asm/nonmatchings/battle/area_omo/512AB0/func_80218CF4_5132C4.s +++ b/asm/nonmatchings/battle/area_omo/512AB0/func_80218CF4_5132C4.s @@ -12,10 +12,10 @@ glabel func_80218CF4_5132C4 /* 5132E0 80218D10 8C85000C */ lw $a1, 0xc($a0) /* 5132E4 80218D14 806200AF */ lb $v0, 0xaf($v1) /* 5132E8 80218D18 10460004 */ beq $v0, $a2, .L80218D2C -/* 5132EC 80218D1C 00000000 */ nop +/* 5132EC 80218D1C 00000000 */ nop /* 5132F0 80218D20 806200B0 */ lb $v0, 0xb0($v1) /* 5132F4 80218D24 14460004 */ bne $v0, $a2, .L80218D38 -/* 5132F8 80218D28 00000000 */ nop +/* 5132F8 80218D28 00000000 */ nop .L80218D2C: /* 5132FC 80218D2C 8CA50000 */ lw $a1, ($a1) /* 513300 80218D30 0808634F */ j .L80218D3C @@ -24,7 +24,7 @@ glabel func_80218CF4_5132C4 /* 513308 80218D38 8CA50000 */ lw $a1, ($a1) .L80218D3C: /* 51330C 80218D3C 0C0B2026 */ jal set_variable -/* 513310 80218D40 00000000 */ nop +/* 513310 80218D40 00000000 */ nop /* 513314 80218D44 8FBF0010 */ lw $ra, 0x10($sp) /* 513318 80218D48 24020002 */ addiu $v0, $zero, 2 /* 51331C 80218D4C 03E00008 */ jr $ra diff --git a/asm/nonmatchings/battle/area_omo/513580/func_80218FB0_513580.s b/asm/nonmatchings/battle/area_omo/513580/func_80218FB0_513580.s index 6c9ec34db9..72a8b230b8 100644 --- a/asm/nonmatchings/battle/area_omo/513580/func_80218FB0_513580.s +++ b/asm/nonmatchings/battle/area_omo/513580/func_80218FB0_513580.s @@ -61,9 +61,9 @@ glabel func_80218FB0_513580 /* 513654 80219084 3C014048 */ lui $at, 0x4048 /* 513658 80219088 3421F5C3 */ ori $at, $at, 0xf5c3 /* 51365C 8021908C 44816000 */ mtc1 $at, $f12 -/* 513660 80219090 00000000 */ nop +/* 513660 80219090 00000000 */ nop /* 513664 80219094 460C0302 */ mul.s $f12, $f0, $f12 -/* 513668 80219098 00000000 */ nop +/* 513668 80219098 00000000 */ nop /* 51366C 8021909C 3C014334 */ lui $at, 0x4334 /* 513670 802190A0 44811000 */ mtc1 $at, $f2 /* 513674 802190A4 E6200008 */ swc1 $f0, 8($s1) @@ -71,11 +71,11 @@ glabel func_80218FB0_513580 /* 51367C 802190AC 46026303 */ div.s $f12, $f12, $f2 /* 513680 802190B0 3C0141A0 */ lui $at, 0x41a0 /* 513684 802190B4 44811000 */ mtc1 $at, $f2 -/* 513688 802190B8 00000000 */ nop +/* 513688 802190B8 00000000 */ nop /* 51368C 802190BC 46020502 */ mul.s $f20, $f0, $f2 -/* 513690 802190C0 00000000 */ nop +/* 513690 802190C0 00000000 */ nop /* 513694 802190C4 4614A582 */ mul.s $f22, $f20, $f20 -/* 513698 802190C8 00000000 */ nop +/* 513698 802190C8 00000000 */ nop /* 51369C 802190CC 26940001 */ addiu $s4, $s4, 1 /* 5136A0 802190D0 3C0142B4 */ lui $at, 0x42b4 /* 5136A4 802190D4 44810000 */ mtc1 $at, $f0 @@ -135,5 +135,5 @@ glabel func_80218FB0_513580 /* 51377C 802191AC D7B400B8 */ ldc1 $f20, 0xb8($sp) /* 513780 802191B0 03E00008 */ jr $ra /* 513784 802191B4 27BD00D0 */ addiu $sp, $sp, 0xd0 -/* 513788 802191B8 00000000 */ nop -/* 51378C 802191BC 00000000 */ nop +/* 513788 802191B8 00000000 */ nop +/* 51378C 802191BC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_omo2/52B6A0/func_80218098_52B738.s b/asm/nonmatchings/battle/area_omo2/52B6A0/func_80218098_52B738.s index baafca2975..d7a0adeade 100644 --- a/asm/nonmatchings/battle/area_omo2/52B6A0/func_80218098_52B738.s +++ b/asm/nonmatchings/battle/area_omo2/52B6A0/func_80218098_52B738.s @@ -37,5 +37,5 @@ glabel func_80218098_52B738 /* 52B7AC 8021810C 8FB00010 */ lw $s0, 0x10($sp) /* 52B7B0 80218110 03E00008 */ jr $ra /* 52B7B4 80218114 27BD0018 */ addiu $sp, $sp, 0x18 -/* 52B7B8 80218118 00000000 */ nop -/* 52B7BC 8021811C 00000000 */ nop +/* 52B7B8 80218118 00000000 */ nop +/* 52B7BC 8021811C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_omo2/52B7C0/func_80218120_52B7C0.s b/asm/nonmatchings/battle/area_omo2/52B7C0/func_80218120_52B7C0.s index 6862876b4a..ce8aefec88 100644 --- a/asm/nonmatchings/battle/area_omo2/52B7C0/func_80218120_52B7C0.s +++ b/asm/nonmatchings/battle/area_omo2/52B7C0/func_80218120_52B7C0.s @@ -35,16 +35,16 @@ glabel func_80218120_52B7C0 /* 52B838 80218198 8C43000C */ lw $v1, 0xc($v0) /* 52B83C 8021819C 24020002 */ addiu $v0, $zero, 2 /* 52B840 802181A0 44940000 */ mtc1 $s4, $f0 -/* 52B844 802181A4 00000000 */ nop +/* 52B844 802181A4 00000000 */ nop /* 52B848 802181A8 46800020 */ cvt.s.w $f0, $f0 /* 52B84C 802181AC 02228821 */ addu $s1, $s1, $v0 /* 52B850 802181B0 E4600004 */ swc1 $f0, 4($v1) /* 52B854 802181B4 44930000 */ mtc1 $s3, $f0 -/* 52B858 802181B8 00000000 */ nop +/* 52B858 802181B8 00000000 */ nop /* 52B85C 802181BC 46800020 */ cvt.s.w $f0, $f0 /* 52B860 802181C0 E4600008 */ swc1 $f0, 8($v1) /* 52B864 802181C4 44910000 */ mtc1 $s1, $f0 -/* 52B868 802181C8 00000000 */ nop +/* 52B868 802181C8 00000000 */ nop /* 52B86C 802181CC 46800020 */ cvt.s.w $f0, $f0 /* 52B870 802181D0 E460000C */ swc1 $f0, 0xc($v1) /* 52B874 802181D4 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/asm/nonmatchings/battle/area_omo2/52B7C0/func_802181F4_52B894.s b/asm/nonmatchings/battle/area_omo2/52B7C0/func_802181F4_52B894.s index a79bcb0706..546fbf621c 100644 --- a/asm/nonmatchings/battle/area_omo2/52B7C0/func_802181F4_52B894.s +++ b/asm/nonmatchings/battle/area_omo2/52B7C0/func_802181F4_52B894.s @@ -14,7 +14,7 @@ glabel func_802181F4_52B894 /* 52B8B8 80218218 0C0B1EAF */ jal get_variable /* 52B8BC 8021821C 0200202D */ daddu $a0, $s0, $zero /* 52B8C0 80218220 44820000 */ mtc1 $v0, $f0 -/* 52B8C4 80218224 00000000 */ nop +/* 52B8C4 80218224 00000000 */ nop /* 52B8C8 80218228 46800020 */ cvt.s.w $f0, $f0 /* 52B8CC 8021822C 44050000 */ mfc1 $a1, $f0 /* 52B8D0 80218230 0C04DF69 */ jal func_80137DA4 diff --git a/asm/nonmatchings/battle/area_omo2_1/543570/func_80231000_543570.s b/asm/nonmatchings/battle/area_omo2_1/543570/func_80231000_543570.s index 4b5bdca664..2c7e7c4417 100644 --- a/asm/nonmatchings/battle/area_omo2_1/543570/func_80231000_543570.s +++ b/asm/nonmatchings/battle/area_omo2_1/543570/func_80231000_543570.s @@ -21,7 +21,7 @@ glabel func_80231000_543570 /* 5435B0 80231040 0040902D */ daddu $s2, $v0, $zero /* 5435B4 80231044 2402FF81 */ addiu $v0, $zero, -0x7f /* 5435B8 80231048 16020002 */ bne $s0, $v0, .L80231054 -/* 5435BC 8023104C 00000000 */ nop +/* 5435BC 8023104C 00000000 */ nop /* 5435C0 80231050 8E700148 */ lw $s0, 0x148($s3) .L80231054: /* 5435C4 80231054 0C09A75B */ jal get_actor diff --git a/asm/nonmatchings/battle/area_omo2_3/54CC70/func_80231000_54CC70.s b/asm/nonmatchings/battle/area_omo2_3/54CC70/func_80231000_54CC70.s index 0c647fe050..9c4051b790 100644 --- a/asm/nonmatchings/battle/area_omo2_3/54CC70/func_80231000_54CC70.s +++ b/asm/nonmatchings/battle/area_omo2_3/54CC70/func_80231000_54CC70.s @@ -11,6 +11,6 @@ glabel func_80231000_54CC70 /* 54CC88 80231018 24020002 */ addiu $v0, $zero, 2 /* 54CC8C 8023101C 03E00008 */ jr $ra /* 54CC90 80231020 27BD0018 */ addiu $sp, $sp, 0x18 -/* 54CC94 80231024 00000000 */ nop -/* 54CC98 80231028 00000000 */ nop -/* 54CC9C 8023102C 00000000 */ nop +/* 54CC94 80231024 00000000 */ nop +/* 54CC98 80231028 00000000 */ nop +/* 54CC9C 8023102C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_omo3/5573E0/func_80218070_557450.s b/asm/nonmatchings/battle/area_omo3/5573E0/func_80218070_557450.s index 2c64c76fbf..0a1fa30893 100644 --- a/asm/nonmatchings/battle/area_omo3/5573E0/func_80218070_557450.s +++ b/asm/nonmatchings/battle/area_omo3/5573E0/func_80218070_557450.s @@ -67,15 +67,15 @@ glabel func_80218070_557450 /* 55753C 8021815C D420EB70 */ ldc1 $f0, %lo(D_8022EB70)($at) /* 557540 80218160 4600C621 */ cvt.d.s $f24, $f24 /* 557544 80218164 4620C602 */ mul.d $f24, $f24, $f0 -/* 557548 80218168 00000000 */ nop +/* 557548 80218168 00000000 */ nop /* 55754C 8021816C 8FA2001C */ lw $v0, 0x1c($sp) /* 557550 80218170 24420014 */ addiu $v0, $v0, 0x14 /* 557554 80218174 4482B000 */ mtc1 $v0, $f22 -/* 557558 80218178 00000000 */ nop +/* 557558 80218178 00000000 */ nop /* 55755C 8021817C 4680B5A0 */ cvt.s.w $f22, $f22 /* 557560 80218180 4600B5A1 */ cvt.d.s $f22, $f22 /* 557564 80218184 4620B582 */ mul.d $f22, $f22, $f0 -/* 557568 80218188 00000000 */ nop +/* 557568 80218188 00000000 */ nop /* 55756C 8021818C 4600A306 */ mov.s $f12, $f20 /* 557570 80218190 AFA2001C */ sw $v0, 0x1c($sp) /* 557574 80218194 4620C620 */ cvt.s.d $f24, $f24 @@ -86,20 +86,20 @@ glabel func_80218070_557450 /* 557588 802181A8 4600E321 */ cvt.d.s $f12, $f28 /* 55758C 802181AC 46226300 */ add.d $f12, $f12, $f2 /* 557590 802181B0 4600C602 */ mul.s $f24, $f24, $f0 -/* 557594 802181B4 00000000 */ nop +/* 557594 802181B4 00000000 */ nop /* 557598 802181B8 0C00A8BB */ jal sin_deg /* 55759C 802181BC 46206320 */ cvt.s.d $f12, $f12 /* 5575A0 802181C0 4600B582 */ mul.s $f22, $f22, $f0 -/* 5575A4 802181C4 00000000 */ nop +/* 5575A4 802181C4 00000000 */ nop /* 5575A8 802181C8 0C00A8D4 */ jal cos_deg /* 5575AC 802181CC 4600D306 */ mov.s $f12, $f26 /* 5575B0 802181D0 4600D306 */ mov.s $f12, $f26 /* 5575B4 802181D4 0C00A8BB */ jal sin_deg /* 5575B8 802181D8 46000506 */ mov.s $f20, $f0 /* 5575BC 802181DC 4614C502 */ mul.s $f20, $f24, $f20 -/* 5575C0 802181E0 00000000 */ nop +/* 5575C0 802181E0 00000000 */ nop /* 5575C4 802181E4 4600B002 */ mul.s $f0, $f22, $f0 -/* 5575C8 802181E8 00000000 */ nop +/* 5575C8 802181E8 00000000 */ nop /* 5575CC 802181EC 4600A500 */ add.s $f20, $f20, $f0 /* 5575D0 802181F0 4600A18D */ trunc.w.s $f6, $f20 /* 5575D4 802181F4 E7A60018 */ swc1 $f6, 0x18($sp) @@ -110,9 +110,9 @@ glabel func_80218070_557450 /* 5575E8 80218208 46000506 */ mov.s $f20, $f0 /* 5575EC 8021820C 4600A507 */ neg.s $f20, $f20 /* 5575F0 80218210 4614C602 */ mul.s $f24, $f24, $f20 -/* 5575F4 80218214 00000000 */ nop +/* 5575F4 80218214 00000000 */ nop /* 5575F8 80218218 4600B582 */ mul.s $f22, $f22, $f0 -/* 5575FC 8021821C 00000000 */ nop +/* 5575FC 8021821C 00000000 */ nop /* 557600 80218220 8E23007C */ lw $v1, 0x7c($s1) /* 557604 80218224 4616C600 */ add.s $f24, $f24, $f22 /* 557608 80218228 2C62000C */ sltiu $v0, $v1, 0xc @@ -120,48 +120,59 @@ glabel func_80218070_557450 /* 557610 80218230 E7A6001C */ swc1 $f6, 0x1c($sp) /* 557614 80218234 10400044 */ beqz $v0, .L80218348 /* 557618 80218238 00031080 */ sll $v0, $v1, 2 -/* 55761C 8021823C 3C018023 */ lui $at, %hi(D_8022EB80) +/* 55761C 8021823C 3C018023 */ lui $at, %hi(jtbl_8022EB80_56DF60) /* 557620 80218240 00220821 */ addu $at, $at, $v0 -/* 557624 80218244 8C22EB80 */ lw $v0, %lo(D_8022EB80)($at) +/* 557624 80218244 8C22EB80 */ lw $v0, %lo(jtbl_8022EB80_56DF60)($at) /* 557628 80218248 00400008 */ jr $v0 -/* 55762C 8021824C 00000000 */ nop +/* 55762C 8021824C 00000000 */ nop +glabel L80218250_557630 /* 557630 80218250 0220202D */ daddu $a0, $s1, $zero /* 557634 80218254 0C08600E */ jal func_80218038_557418 /* 557638 80218258 24050122 */ addiu $a1, $zero, 0x122 /* 55763C 8021825C 080860D3 */ j .L8021834C -/* 557640 80218260 00000000 */ nop +/* 557640 80218260 00000000 */ nop +glabel L80218264_557644 /* 557644 80218264 0220202D */ daddu $a0, $s1, $zero /* 557648 80218268 080860B6 */ j .L802182D8 /* 55764C 8021826C 240500FA */ addiu $a1, $zero, 0xfa +glabel L80218270_557650 /* 557650 80218270 0220202D */ daddu $a0, $s1, $zero /* 557654 80218274 080860B6 */ j .L802182D8 /* 557658 80218278 240500F0 */ addiu $a1, $zero, 0xf0 +glabel L8021827C_55765C /* 55765C 8021827C 0220202D */ daddu $a0, $s1, $zero /* 557660 80218280 080860B6 */ j .L802182D8 /* 557664 80218284 240500E6 */ addiu $a1, $zero, 0xe6 +glabel L80218288_557668 /* 557668 80218288 0220202D */ daddu $a0, $s1, $zero /* 55766C 8021828C 080860B6 */ j .L802182D8 /* 557670 80218290 240500DC */ addiu $a1, $zero, 0xdc +glabel L80218294_557674 /* 557674 80218294 0220202D */ daddu $a0, $s1, $zero /* 557678 80218298 080860B6 */ j .L802182D8 /* 55767C 8021829C 240500D2 */ addiu $a1, $zero, 0xd2 +glabel L802182A0_557680 /* 557680 802182A0 0220202D */ daddu $a0, $s1, $zero /* 557684 802182A4 080860B6 */ j .L802182D8 /* 557688 802182A8 240500B4 */ addiu $a1, $zero, 0xb4 +glabel L802182AC_55768C /* 55768C 802182AC 0220202D */ daddu $a0, $s1, $zero /* 557690 802182B0 080860B6 */ j .L802182D8 /* 557694 802182B4 2405008C */ addiu $a1, $zero, 0x8c +glabel L802182B8_557698 /* 557698 802182B8 0220202D */ daddu $a0, $s1, $zero /* 55769C 802182BC 080860B6 */ j .L802182D8 /* 5576A0 802182C0 24050064 */ addiu $a1, $zero, 0x64 +glabel L802182C4_5576A4 /* 5576A4 802182C4 0220202D */ daddu $a0, $s1, $zero /* 5576A8 802182C8 080860B6 */ j .L802182D8 /* 5576AC 802182CC 24050046 */ addiu $a1, $zero, 0x46 +glabel L802182D0_5576B0 /* 5576B0 802182D0 0220202D */ daddu $a0, $s1, $zero /* 5576B4 802182D4 24050028 */ addiu $a1, $zero, 0x28 .L802182D8: /* 5576B8 802182D8 0C08600E */ jal func_80218038_557418 -/* 5576BC 802182DC 00000000 */ nop +/* 5576BC 802182DC 00000000 */ nop /* 5576C0 802182E0 24044000 */ addiu $a0, $zero, 0x4000 /* 5576C4 802182E4 0C00A67F */ jal rand_int /* 5576C8 802182E8 0040802D */ daddu $s0, $v0, $zero @@ -177,6 +188,7 @@ glabel func_80218070_557450 /* 5576F0 80218310 00431023 */ subu $v0, $v0, $v1 /* 5576F4 80218314 080860D3 */ j .L8021834C /* 5576F8 80218318 02021021 */ addu $v0, $s0, $v0 +glabel L8021831C_5576FC /* 5576FC 8021831C 0220202D */ daddu $a0, $s1, $zero /* 557700 80218320 0C08600E */ jal func_80218038_557418 /* 557704 80218324 24050014 */ addiu $a1, $zero, 0x14 @@ -187,12 +199,12 @@ glabel func_80218070_557450 /* 557718 80218338 0C08600E */ jal func_80218038_557418 /* 55771C 8021833C 24050014 */ addiu $a1, $zero, 0x14 /* 557720 80218340 080860D3 */ j .L8021834C -/* 557724 80218344 00000000 */ nop +/* 557724 80218344 00000000 */ nop .L80218348: /* 557728 80218348 0000102D */ daddu $v0, $zero, $zero .L8021834C: /* 55772C 8021834C 44823000 */ mtc1 $v0, $f6 -/* 557730 80218350 00000000 */ nop +/* 557730 80218350 00000000 */ nop /* 557734 80218354 468031A0 */ cvt.s.w $f6, $f6 /* 557738 80218358 44053000 */ mfc1 $a1, $f6 /* 55773C 8021835C 0C04E035 */ jal func_801380D4 @@ -254,7 +266,7 @@ glabel func_80218070_557450 /* 55781C 8021843C 8E22008C */ lw $v0, 0x8c($s1) /* 557820 80218440 24420019 */ addiu $v0, $v0, 0x19 /* 557824 80218444 44820000 */ mtc1 $v0, $f0 -/* 557828 80218448 00000000 */ nop +/* 557828 80218448 00000000 */ nop /* 55782C 8021844C 46800020 */ cvt.s.w $f0, $f0 /* 557830 80218450 E680000C */ swc1 $f0, 0xc($s4) .L80218454: diff --git a/asm/nonmatchings/battle/area_omo3/5573E0/func_80218490_557870.s b/asm/nonmatchings/battle/area_omo3/5573E0/func_80218490_557870.s index 19461e81fc..4a3a22c0d0 100644 --- a/asm/nonmatchings/battle/area_omo3/5573E0/func_80218490_557870.s +++ b/asm/nonmatchings/battle/area_omo3/5573E0/func_80218490_557870.s @@ -61,9 +61,9 @@ glabel func_80218490_557870 /* 557944 80218564 3C014048 */ lui $at, 0x4048 /* 557948 80218568 3421F5C3 */ ori $at, $at, 0xf5c3 /* 55794C 8021856C 44816000 */ mtc1 $at, $f12 -/* 557950 80218570 00000000 */ nop +/* 557950 80218570 00000000 */ nop /* 557954 80218574 460C0302 */ mul.s $f12, $f0, $f12 -/* 557958 80218578 00000000 */ nop +/* 557958 80218578 00000000 */ nop /* 55795C 8021857C 3C014334 */ lui $at, 0x4334 /* 557960 80218580 44811000 */ mtc1 $at, $f2 /* 557964 80218584 E6200008 */ swc1 $f0, 8($s1) @@ -71,11 +71,11 @@ glabel func_80218490_557870 /* 55796C 8021858C 46026303 */ div.s $f12, $f12, $f2 /* 557970 80218590 3C0141A0 */ lui $at, 0x41a0 /* 557974 80218594 44811000 */ mtc1 $at, $f2 -/* 557978 80218598 00000000 */ nop +/* 557978 80218598 00000000 */ nop /* 55797C 8021859C 46020502 */ mul.s $f20, $f0, $f2 -/* 557980 802185A0 00000000 */ nop +/* 557980 802185A0 00000000 */ nop /* 557984 802185A4 4614A582 */ mul.s $f22, $f20, $f20 -/* 557988 802185A8 00000000 */ nop +/* 557988 802185A8 00000000 */ nop /* 55798C 802185AC 26940001 */ addiu $s4, $s4, 1 /* 557990 802185B0 3C0142B4 */ lui $at, 0x42b4 /* 557994 802185B4 44810000 */ mtc1 $at, $f0 @@ -135,5 +135,5 @@ glabel func_80218490_557870 /* 557A6C 8021868C D7B400B8 */ ldc1 $f20, 0xb8($sp) /* 557A70 80218690 03E00008 */ jr $ra /* 557A74 80218694 27BD00D0 */ addiu $sp, $sp, 0xd0 -/* 557A78 80218698 00000000 */ nop -/* 557A7C 8021869C 00000000 */ nop +/* 557A78 80218698 00000000 */ nop +/* 557A7C 8021869C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_omo3/557AD0/func_802186F0_557AD0.s b/asm/nonmatchings/battle/area_omo3/557AD0/func_802186F0_557AD0.s index 29c10e63c9..92a66beb84 100644 --- a/asm/nonmatchings/battle/area_omo3/557AD0/func_802186F0_557AD0.s +++ b/asm/nonmatchings/battle/area_omo3/557AD0/func_802186F0_557AD0.s @@ -11,12 +11,12 @@ glabel func_802186F0_557AD0 /* 557AE8 80218708 46007506 */ mov.s $f20, $f14 /* 557AEC 8021870C 4600A18D */ trunc.w.s $f6, $f20 /* 557AF0 80218710 44023000 */ mfc1 $v0, $f6 -/* 557AF4 80218714 00000000 */ nop +/* 557AF4 80218714 00000000 */ nop /* 557AF8 80218718 04420001 */ bltzl $v0, .L80218720 /* 557AFC 8021871C 00021023 */ negu $v0, $v0 .L80218720: /* 557B00 80218720 44821000 */ mtc1 $v0, $f2 -/* 557B04 80218724 00000000 */ nop +/* 557B04 80218724 00000000 */ nop /* 557B08 80218728 468010A0 */ cvt.s.w $f2, $f2 /* 557B0C 8021872C 46001103 */ div.s $f4, $f2, $f0 /* 557B10 80218730 0000202D */ daddu $a0, $zero, $zero @@ -37,7 +37,7 @@ glabel func_802186F0_557AD0 /* 557B48 80218768 00471021 */ addu $v0, $v0, $a3 /* 557B4C 8021876C C4400000 */ lwc1 $f0, ($v0) /* 557B50 80218770 4604003C */ c.lt.s $f0, $f4 -/* 557B54 80218774 00000000 */ nop +/* 557B54 80218774 00000000 */ nop /* 557B58 80218778 45020002 */ bc1fl .L80218784 /* 557B5C 8021877C 0060302D */ daddu $a2, $v1, $zero /* 557B60 80218780 0060202D */ daddu $a0, $v1, $zero @@ -62,43 +62,43 @@ glabel func_802186F0_557AD0 /* 557BA8 802187C8 46001085 */ abs.s $f2, $f2 /* 557BAC 802187CC 46000005 */ abs.s $f0, $f0 /* 557BB0 802187D0 4600103C */ c.lt.s $f2, $f0 -/* 557BB4 802187D4 00000000 */ nop +/* 557BB4 802187D4 00000000 */ nop /* 557BB8 802187D8 45000002 */ bc1f .L802187E4 /* 557BBC 802187DC 00C0182D */ daddu $v1, $a2, $zero /* 557BC0 802187E0 0080182D */ daddu $v1, $a0, $zero .L802187E4: /* 557BC4 802187E4 44800000 */ mtc1 $zero, $f0 -/* 557BC8 802187E8 00000000 */ nop +/* 557BC8 802187E8 00000000 */ nop /* 557BCC 802187EC 4600B03C */ c.lt.s $f22, $f0 -/* 557BD0 802187F0 00000000 */ nop +/* 557BD0 802187F0 00000000 */ nop /* 557BD4 802187F4 4500000A */ bc1f .L80218820 -/* 557BD8 802187F8 00000000 */ nop +/* 557BD8 802187F8 00000000 */ nop /* 557BDC 802187FC 4614003E */ c.le.s $f0, $f20 -/* 557BE0 80218800 00000000 */ nop +/* 557BE0 80218800 00000000 */ nop /* 557BE4 80218804 45000004 */ bc1f .L80218818 /* 557BE8 80218808 240200B4 */ addiu $v0, $zero, 0xb4 /* 557BEC 8021880C 00431823 */ subu $v1, $v0, $v1 /* 557BF0 80218810 44800000 */ mtc1 $zero, $f0 -/* 557BF4 80218814 00000000 */ nop +/* 557BF4 80218814 00000000 */ nop .L80218818: /* 557BF8 80218818 4600B03C */ c.lt.s $f22, $f0 -/* 557BFC 8021881C 00000000 */ nop +/* 557BFC 8021881C 00000000 */ nop .L80218820: /* 557C00 80218820 45000005 */ bc1f .L80218838 -/* 557C04 80218824 00000000 */ nop +/* 557C04 80218824 00000000 */ nop /* 557C08 80218828 4600A03C */ c.lt.s $f20, $f0 -/* 557C0C 8021882C 00000000 */ nop +/* 557C0C 8021882C 00000000 */ nop /* 557C10 80218830 45030001 */ bc1tl .L80218838 /* 557C14 80218834 246300B4 */ addiu $v1, $v1, 0xb4 .L80218838: /* 557C18 80218838 44800000 */ mtc1 $zero, $f0 -/* 557C1C 8021883C 00000000 */ nop +/* 557C1C 8021883C 00000000 */ nop /* 557C20 80218840 4616003E */ c.le.s $f0, $f22 -/* 557C24 80218844 00000000 */ nop +/* 557C24 80218844 00000000 */ nop /* 557C28 80218848 45000006 */ bc1f .L80218864 -/* 557C2C 8021884C 00000000 */ nop +/* 557C2C 8021884C 00000000 */ nop /* 557C30 80218850 4600A03C */ c.lt.s $f20, $f0 -/* 557C34 80218854 00000000 */ nop +/* 557C34 80218854 00000000 */ nop /* 557C38 80218858 45000002 */ bc1f .L80218864 /* 557C3C 8021885C 24020168 */ addiu $v0, $zero, 0x168 /* 557C40 80218860 00431823 */ subu $v1, $v0, $v1 diff --git a/asm/nonmatchings/battle/area_omo3/557AD0/func_8021887C_557C5C.s b/asm/nonmatchings/battle/area_omo3/557AD0/func_8021887C_557C5C.s index 96f0bd8e01..26916ba31d 100644 --- a/asm/nonmatchings/battle/area_omo3/557AD0/func_8021887C_557C5C.s +++ b/asm/nonmatchings/battle/area_omo3/557AD0/func_8021887C_557C5C.s @@ -36,7 +36,7 @@ glabel func_8021887C_557C5C /* 557CD8 802188F8 0C0B1EAF */ jal get_variable /* 557CDC 802188FC 02118023 */ subu $s0, $s0, $s1 /* 557CE0 80218900 16600006 */ bnez $s3, .L8021891C -/* 557CE4 80218904 00000000 */ nop +/* 557CE4 80218904 00000000 */ nop /* 557CE8 80218908 16000004 */ bnez $s0, .L8021891C /* 557CEC 8021890C 0280202D */ daddu $a0, $s4, $zero /* 557CF0 80218910 8E450000 */ lw $a1, ($s2) @@ -44,10 +44,10 @@ glabel func_8021887C_557C5C /* 557CF8 80218918 0040302D */ daddu $a2, $v0, $zero .L8021891C: /* 557CFC 8021891C 44936000 */ mtc1 $s3, $f12 -/* 557D00 80218920 00000000 */ nop +/* 557D00 80218920 00000000 */ nop /* 557D04 80218924 46806320 */ cvt.s.w $f12, $f12 /* 557D08 80218928 44907000 */ mtc1 $s0, $f14 -/* 557D0C 8021892C 00000000 */ nop +/* 557D0C 8021892C 00000000 */ nop /* 557D10 80218930 0C0861BC */ jal func_802186F0_557AD0 /* 557D14 80218934 468073A0 */ cvt.s.w $f14, $f14 /* 557D18 80218938 0280202D */ daddu $a0, $s4, $zero @@ -55,7 +55,7 @@ glabel func_8021887C_557C5C /* 557D20 80218940 2446FFA6 */ addiu $a2, $v0, -0x5a .L80218944: /* 557D24 80218944 0C0B2026 */ jal set_variable -/* 557D28 80218948 00000000 */ nop +/* 557D28 80218948 00000000 */ nop /* 557D2C 8021894C 24020002 */ addiu $v0, $zero, 2 /* 557D30 80218950 8FBF0024 */ lw $ra, 0x24($sp) /* 557D34 80218954 8FB40020 */ lw $s4, 0x20($sp) diff --git a/asm/nonmatchings/battle/area_pra/649050/func_80218240_649050.s b/asm/nonmatchings/battle/area_pra/649050/func_80218240_649050.s index db4f62fc0c..f4a25506d7 100644 --- a/asm/nonmatchings/battle/area_pra/649050/func_80218240_649050.s +++ b/asm/nonmatchings/battle/area_pra/649050/func_80218240_649050.s @@ -22,13 +22,13 @@ glabel func_80218240_649050 /* 649094 80218284 8E050000 */ lw $a1, ($s0) /* 649098 80218288 26100004 */ addiu $s0, $s0, 4 /* 64909C 8021828C 4482B000 */ mtc1 $v0, $f22 -/* 6490A0 80218290 00000000 */ nop +/* 6490A0 80218290 00000000 */ nop /* 6490A4 80218294 4680B5A0 */ cvt.s.w $f22, $f22 /* 6490A8 80218298 0C0B1EAF */ jal get_variable /* 6490AC 8021829C 0220202D */ daddu $a0, $s1, $zero /* 6490B0 802182A0 8E050000 */ lw $a1, ($s0) /* 6490B4 802182A4 4482A000 */ mtc1 $v0, $f20 -/* 6490B8 802182A8 00000000 */ nop +/* 6490B8 802182A8 00000000 */ nop /* 6490BC 802182AC 4680A520 */ cvt.s.w $f20, $f20 /* 6490C0 802182B0 0C0B1EAF */ jal get_variable /* 6490C4 802182B4 0220202D */ daddu $a0, $s1, $zero @@ -38,7 +38,7 @@ glabel func_80218240_649050 /* 6490D4 802182C4 E474003C */ swc1 $f20, 0x3c($v1) /* 6490D8 802182C8 8E43000C */ lw $v1, 0xc($s2) /* 6490DC 802182CC 44820000 */ mtc1 $v0, $f0 -/* 6490E0 802182D0 00000000 */ nop +/* 6490E0 802182D0 00000000 */ nop /* 6490E4 802182D4 46800020 */ cvt.s.w $f0, $f0 /* 6490E8 802182D8 E4600040 */ swc1 $f0, 0x40($v1) /* 6490EC 802182DC 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/battle/area_pra/649050/func_80218300_649110.s b/asm/nonmatchings/battle/area_pra/649050/func_80218300_649110.s index e85cce604e..8c24cce0b8 100644 --- a/asm/nonmatchings/battle/area_pra/649050/func_80218300_649110.s +++ b/asm/nonmatchings/battle/area_pra/649050/func_80218300_649110.s @@ -69,12 +69,12 @@ glabel func_80218300_649110 /* 649210 80218400 82030210 */ lb $v1, 0x210($s0) /* 649214 80218404 2402000A */ addiu $v0, $zero, 0xa /* 649218 80218408 14620007 */ bne $v1, $v0, .L80218428 -/* 64921C 8021840C 00000000 */ nop +/* 64921C 8021840C 00000000 */ nop /* 649220 80218410 8C82000C */ lw $v0, 0xc($a0) /* 649224 80218414 3C013ECC */ lui $at, 0x3ecc /* 649228 80218418 3421CCCD */ ori $at, $at, 0xcccd /* 64922C 8021841C 44810000 */ mtc1 $at, $f0 -/* 649230 80218420 00000000 */ nop +/* 649230 80218420 00000000 */ nop /* 649234 80218424 E4400028 */ swc1 $f0, 0x28($v0) .L80218428: /* 649238 80218428 8FBF0028 */ lw $ra, 0x28($sp) diff --git a/asm/nonmatchings/battle/area_pra/649050/func_802185A8_6493B8.s b/asm/nonmatchings/battle/area_pra/649050/func_802185A8_6493B8.s index 64d19e2ec4..448ad17b84 100644 --- a/asm/nonmatchings/battle/area_pra/649050/func_802185A8_6493B8.s +++ b/asm/nonmatchings/battle/area_pra/649050/func_802185A8_6493B8.s @@ -14,11 +14,11 @@ glabel func_802185A8_6493B8 /* 6493DC 802185CC 0040202D */ daddu $a0, $v0, $zero /* 6493E0 802185D0 2402FF81 */ addiu $v0, $zero, -0x7f /* 6493E4 802185D4 14820002 */ bne $a0, $v0, .L802185E0 -/* 6493E8 802185D8 00000000 */ nop +/* 6493E8 802185D8 00000000 */ nop /* 6493EC 802185DC 8E240148 */ lw $a0, 0x148($s1) .L802185E0: /* 6493F0 802185E0 0C09A75B */ jal get_actor -/* 6493F4 802185E4 00000000 */ nop +/* 6493F4 802185E4 00000000 */ nop /* 6493F8 802185E8 0040202D */ daddu $a0, $v0, $zero /* 6493FC 802185EC 90830136 */ lbu $v1, 0x136($a0) /* 649400 802185F0 24020047 */ addiu $v0, $zero, 0x47 @@ -49,11 +49,11 @@ glabel func_802185A8_6493B8 /* 649458 80218648 0000302D */ daddu $a2, $zero, $zero .L8021864C: /* 64945C 8021864C 0C0B2026 */ jal set_variable -/* 649460 80218650 00000000 */ nop +/* 649460 80218650 00000000 */ nop /* 649464 80218654 8FBF0018 */ lw $ra, 0x18($sp) /* 649468 80218658 8FB10014 */ lw $s1, 0x14($sp) /* 64946C 8021865C 8FB00010 */ lw $s0, 0x10($sp) /* 649470 80218660 24020002 */ addiu $v0, $zero, 2 /* 649474 80218664 03E00008 */ jr $ra /* 649478 80218668 27BD0020 */ addiu $sp, $sp, 0x20 -/* 64947C 8021866C 00000000 */ nop +/* 64947C 8021866C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_pra/649050/func_80218670_649480.s b/asm/nonmatchings/battle/area_pra/649050/func_80218670_649480.s index 43ec5ebd16..8314f01096 100644 --- a/asm/nonmatchings/battle/area_pra/649050/func_80218670_649480.s +++ b/asm/nonmatchings/battle/area_pra/649050/func_80218670_649480.s @@ -69,12 +69,12 @@ glabel func_80218670_649480 /* 649580 80218770 82030210 */ lb $v1, 0x210($s0) /* 649584 80218774 2402000A */ addiu $v0, $zero, 0xa /* 649588 80218778 14620007 */ bne $v1, $v0, .L80218798 -/* 64958C 8021877C 00000000 */ nop +/* 64958C 8021877C 00000000 */ nop /* 649590 80218780 8C82000C */ lw $v0, 0xc($a0) /* 649594 80218784 3C013ECC */ lui $at, 0x3ecc /* 649598 80218788 3421CCCD */ ori $at, $at, 0xcccd /* 64959C 8021878C 44810000 */ mtc1 $at, $f0 -/* 6495A0 80218790 00000000 */ nop +/* 6495A0 80218790 00000000 */ nop /* 6495A4 80218794 E4400028 */ swc1 $f0, 0x28($v0) .L80218798: /* 6495A8 80218798 8FBF0028 */ lw $ra, 0x28($sp) diff --git a/asm/nonmatchings/battle/area_pra/649050/func_80218918_649728.s b/asm/nonmatchings/battle/area_pra/649050/func_80218918_649728.s index 84c83bb0eb..4963c1e2ff 100644 --- a/asm/nonmatchings/battle/area_pra/649050/func_80218918_649728.s +++ b/asm/nonmatchings/battle/area_pra/649050/func_80218918_649728.s @@ -14,11 +14,11 @@ glabel func_80218918_649728 /* 64974C 8021893C 0040202D */ daddu $a0, $v0, $zero /* 649750 80218940 2402FF81 */ addiu $v0, $zero, -0x7f /* 649754 80218944 14820002 */ bne $a0, $v0, .L80218950 -/* 649758 80218948 00000000 */ nop +/* 649758 80218948 00000000 */ nop /* 64975C 8021894C 8E240148 */ lw $a0, 0x148($s1) .L80218950: /* 649760 80218950 0C09A75B */ jal get_actor -/* 649764 80218954 00000000 */ nop +/* 649764 80218954 00000000 */ nop /* 649768 80218958 0040202D */ daddu $a0, $v0, $zero /* 64976C 8021895C 90830136 */ lbu $v1, 0x136($a0) /* 649770 80218960 24020047 */ addiu $v0, $zero, 0x47 @@ -49,11 +49,11 @@ glabel func_80218918_649728 /* 6497C8 802189B8 0000302D */ daddu $a2, $zero, $zero .L802189BC: /* 6497CC 802189BC 0C0B2026 */ jal set_variable -/* 6497D0 802189C0 00000000 */ nop +/* 6497D0 802189C0 00000000 */ nop /* 6497D4 802189C4 8FBF0018 */ lw $ra, 0x18($sp) /* 6497D8 802189C8 8FB10014 */ lw $s1, 0x14($sp) /* 6497DC 802189CC 8FB00010 */ lw $s0, 0x10($sp) /* 6497E0 802189D0 24020002 */ addiu $v0, $zero, 2 /* 6497E4 802189D4 03E00008 */ jr $ra /* 6497E8 802189D8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 6497EC 802189DC 00000000 */ nop +/* 6497EC 802189DC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_pra/649050/func_802189E0_6497F0.s b/asm/nonmatchings/battle/area_pra/649050/func_802189E0_6497F0.s index 7e9cc76608..c6a10ae1d4 100644 --- a/asm/nonmatchings/battle/area_pra/649050/func_802189E0_6497F0.s +++ b/asm/nonmatchings/battle/area_pra/649050/func_802189E0_6497F0.s @@ -69,12 +69,12 @@ glabel func_802189E0_6497F0 /* 6498F0 80218AE0 82030210 */ lb $v1, 0x210($s0) /* 6498F4 80218AE4 2402000A */ addiu $v0, $zero, 0xa /* 6498F8 80218AE8 14620007 */ bne $v1, $v0, .L80218B08 -/* 6498FC 80218AEC 00000000 */ nop +/* 6498FC 80218AEC 00000000 */ nop /* 649900 80218AF0 8C82000C */ lw $v0, 0xc($a0) /* 649904 80218AF4 3C013ECC */ lui $at, 0x3ecc /* 649908 80218AF8 3421CCCD */ ori $at, $at, 0xcccd /* 64990C 80218AFC 44810000 */ mtc1 $at, $f0 -/* 649910 80218B00 00000000 */ nop +/* 649910 80218B00 00000000 */ nop /* 649914 80218B04 E4400028 */ swc1 $f0, 0x28($v0) .L80218B08: /* 649918 80218B08 8FBF0028 */ lw $ra, 0x28($sp) diff --git a/asm/nonmatchings/battle/area_pra/649050/func_80218C88_649A98.s b/asm/nonmatchings/battle/area_pra/649050/func_80218C88_649A98.s index 312839a06c..39d6ca99b6 100644 --- a/asm/nonmatchings/battle/area_pra/649050/func_80218C88_649A98.s +++ b/asm/nonmatchings/battle/area_pra/649050/func_80218C88_649A98.s @@ -14,11 +14,11 @@ glabel func_80218C88_649A98 /* 649ABC 80218CAC 0040202D */ daddu $a0, $v0, $zero /* 649AC0 80218CB0 2402FF81 */ addiu $v0, $zero, -0x7f /* 649AC4 80218CB4 14820002 */ bne $a0, $v0, .L80218CC0 -/* 649AC8 80218CB8 00000000 */ nop +/* 649AC8 80218CB8 00000000 */ nop /* 649ACC 80218CBC 8E240148 */ lw $a0, 0x148($s1) .L80218CC0: /* 649AD0 80218CC0 0C09A75B */ jal get_actor -/* 649AD4 80218CC4 00000000 */ nop +/* 649AD4 80218CC4 00000000 */ nop /* 649AD8 80218CC8 0040202D */ daddu $a0, $v0, $zero /* 649ADC 80218CCC 90830136 */ lbu $v1, 0x136($a0) /* 649AE0 80218CD0 24020047 */ addiu $v0, $zero, 0x47 @@ -49,11 +49,11 @@ glabel func_80218C88_649A98 /* 649B38 80218D28 0000302D */ daddu $a2, $zero, $zero .L80218D2C: /* 649B3C 80218D2C 0C0B2026 */ jal set_variable -/* 649B40 80218D30 00000000 */ nop +/* 649B40 80218D30 00000000 */ nop /* 649B44 80218D34 8FBF0018 */ lw $ra, 0x18($sp) /* 649B48 80218D38 8FB10014 */ lw $s1, 0x14($sp) /* 649B4C 80218D3C 8FB00010 */ lw $s0, 0x10($sp) /* 649B50 80218D40 24020002 */ addiu $v0, $zero, 2 /* 649B54 80218D44 03E00008 */ jr $ra /* 649B58 80218D48 27BD0020 */ addiu $sp, $sp, 0x20 -/* 649B5C 80218D4C 00000000 */ nop +/* 649B5C 80218D4C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_pra/649050/func_80218D50_649B60.s b/asm/nonmatchings/battle/area_pra/649050/func_80218D50_649B60.s index 329a53a55f..6f9ce8a496 100644 --- a/asm/nonmatchings/battle/area_pra/649050/func_80218D50_649B60.s +++ b/asm/nonmatchings/battle/area_pra/649050/func_80218D50_649B60.s @@ -69,12 +69,12 @@ glabel func_80218D50_649B60 /* 649C60 80218E50 82030210 */ lb $v1, 0x210($s0) /* 649C64 80218E54 2402000A */ addiu $v0, $zero, 0xa /* 649C68 80218E58 14620007 */ bne $v1, $v0, .L80218E78 -/* 649C6C 80218E5C 00000000 */ nop +/* 649C6C 80218E5C 00000000 */ nop /* 649C70 80218E60 8C82000C */ lw $v0, 0xc($a0) /* 649C74 80218E64 3C013ECC */ lui $at, 0x3ecc /* 649C78 80218E68 3421CCCD */ ori $at, $at, 0xcccd /* 649C7C 80218E6C 44810000 */ mtc1 $at, $f0 -/* 649C80 80218E70 00000000 */ nop +/* 649C80 80218E70 00000000 */ nop /* 649C84 80218E74 E4400028 */ swc1 $f0, 0x28($v0) .L80218E78: /* 649C88 80218E78 8FBF0028 */ lw $ra, 0x28($sp) diff --git a/asm/nonmatchings/battle/area_pra/649050/func_80218FF8_649E08.s b/asm/nonmatchings/battle/area_pra/649050/func_80218FF8_649E08.s index 726382d110..9e119a0cdb 100644 --- a/asm/nonmatchings/battle/area_pra/649050/func_80218FF8_649E08.s +++ b/asm/nonmatchings/battle/area_pra/649050/func_80218FF8_649E08.s @@ -14,11 +14,11 @@ glabel func_80218FF8_649E08 /* 649E2C 8021901C 0040202D */ daddu $a0, $v0, $zero /* 649E30 80219020 2402FF81 */ addiu $v0, $zero, -0x7f /* 649E34 80219024 14820002 */ bne $a0, $v0, .L80219030 -/* 649E38 80219028 00000000 */ nop +/* 649E38 80219028 00000000 */ nop /* 649E3C 8021902C 8E240148 */ lw $a0, 0x148($s1) .L80219030: /* 649E40 80219030 0C09A75B */ jal get_actor -/* 649E44 80219034 00000000 */ nop +/* 649E44 80219034 00000000 */ nop /* 649E48 80219038 0040202D */ daddu $a0, $v0, $zero /* 649E4C 8021903C 90830136 */ lbu $v1, 0x136($a0) /* 649E50 80219040 24020047 */ addiu $v0, $zero, 0x47 @@ -49,11 +49,11 @@ glabel func_80218FF8_649E08 /* 649EA8 80219098 0000302D */ daddu $a2, $zero, $zero .L8021909C: /* 649EAC 8021909C 0C0B2026 */ jal set_variable -/* 649EB0 802190A0 00000000 */ nop +/* 649EB0 802190A0 00000000 */ nop /* 649EB4 802190A4 8FBF0018 */ lw $ra, 0x18($sp) /* 649EB8 802190A8 8FB10014 */ lw $s1, 0x14($sp) /* 649EBC 802190AC 8FB00010 */ lw $s0, 0x10($sp) /* 649EC0 802190B0 24020002 */ addiu $v0, $zero, 2 /* 649EC4 802190B4 03E00008 */ jr $ra /* 649EC8 802190B8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 649ECC 802190BC 00000000 */ nop +/* 649ECC 802190BC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_pra/649050/func_802190C0_649ED0.s b/asm/nonmatchings/battle/area_pra/649050/func_802190C0_649ED0.s index 517c3cb76c..8815171acc 100644 --- a/asm/nonmatchings/battle/area_pra/649050/func_802190C0_649ED0.s +++ b/asm/nonmatchings/battle/area_pra/649050/func_802190C0_649ED0.s @@ -69,12 +69,12 @@ glabel func_802190C0_649ED0 /* 649FD0 802191C0 82030210 */ lb $v1, 0x210($s0) /* 649FD4 802191C4 2402000A */ addiu $v0, $zero, 0xa /* 649FD8 802191C8 14620007 */ bne $v1, $v0, .L802191E8 -/* 649FDC 802191CC 00000000 */ nop +/* 649FDC 802191CC 00000000 */ nop /* 649FE0 802191D0 8C82000C */ lw $v0, 0xc($a0) /* 649FE4 802191D4 3C013ECC */ lui $at, 0x3ecc /* 649FE8 802191D8 3421CCCD */ ori $at, $at, 0xcccd /* 649FEC 802191DC 44810000 */ mtc1 $at, $f0 -/* 649FF0 802191E0 00000000 */ nop +/* 649FF0 802191E0 00000000 */ nop /* 649FF4 802191E4 E4400028 */ swc1 $f0, 0x28($v0) .L802191E8: /* 649FF8 802191E8 8FBF0028 */ lw $ra, 0x28($sp) diff --git a/asm/nonmatchings/battle/area_pra/649050/func_80219368_64A178.s b/asm/nonmatchings/battle/area_pra/649050/func_80219368_64A178.s index 7308ce39e9..65defc954b 100644 --- a/asm/nonmatchings/battle/area_pra/649050/func_80219368_64A178.s +++ b/asm/nonmatchings/battle/area_pra/649050/func_80219368_64A178.s @@ -14,11 +14,11 @@ glabel func_80219368_64A178 /* 64A19C 8021938C 0040202D */ daddu $a0, $v0, $zero /* 64A1A0 80219390 2402FF81 */ addiu $v0, $zero, -0x7f /* 64A1A4 80219394 14820002 */ bne $a0, $v0, .L802193A0 -/* 64A1A8 80219398 00000000 */ nop +/* 64A1A8 80219398 00000000 */ nop /* 64A1AC 8021939C 8E240148 */ lw $a0, 0x148($s1) .L802193A0: /* 64A1B0 802193A0 0C09A75B */ jal get_actor -/* 64A1B4 802193A4 00000000 */ nop +/* 64A1B4 802193A4 00000000 */ nop /* 64A1B8 802193A8 0040202D */ daddu $a0, $v0, $zero /* 64A1BC 802193AC 90830136 */ lbu $v1, 0x136($a0) /* 64A1C0 802193B0 24020047 */ addiu $v0, $zero, 0x47 @@ -49,7 +49,7 @@ glabel func_80219368_64A178 /* 64A218 80219408 0000302D */ daddu $a2, $zero, $zero .L8021940C: /* 64A21C 8021940C 0C0B2026 */ jal set_variable -/* 64A220 80219410 00000000 */ nop +/* 64A220 80219410 00000000 */ nop /* 64A224 80219414 8FBF0018 */ lw $ra, 0x18($sp) /* 64A228 80219418 8FB10014 */ lw $s1, 0x14($sp) /* 64A22C 8021941C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/battle/area_pra/649050/func_8021948C_64A29C.s b/asm/nonmatchings/battle/area_pra/649050/func_8021948C_64A29C.s index 9a496075c4..c104b41631 100644 --- a/asm/nonmatchings/battle/area_pra/649050/func_8021948C_64A29C.s +++ b/asm/nonmatchings/battle/area_pra/649050/func_8021948C_64A29C.s @@ -21,7 +21,7 @@ glabel func_8021948C_64A29C /* 64A2DC 802194CC 0040902D */ daddu $s2, $v0, $zero /* 64A2E0 802194D0 2402FF81 */ addiu $v0, $zero, -0x7f /* 64A2E4 802194D4 16220002 */ bne $s1, $v0, .L802194E0 -/* 64A2E8 802194D8 00000000 */ nop +/* 64A2E8 802194D8 00000000 */ nop /* 64A2EC 802194DC 8E710148 */ lw $s1, 0x148($s3) .L802194E0: /* 64A2F0 802194E0 0C09A75B */ jal get_actor diff --git a/asm/nonmatchings/battle/area_pra2/660750/func_802181E8_660938.s b/asm/nonmatchings/battle/area_pra2/660750/func_802181E8_660938.s index 3bb66bc957..38634f7297 100644 --- a/asm/nonmatchings/battle/area_pra2/660750/func_802181E8_660938.s +++ b/asm/nonmatchings/battle/area_pra2/660750/func_802181E8_660938.s @@ -21,7 +21,7 @@ glabel func_802181E8_660938 /* 660978 80218228 0040982D */ daddu $s3, $v0, $zero /* 66097C 8021822C 2402FF81 */ addiu $v0, $zero, -0x7f /* 660980 80218230 16220002 */ bne $s1, $v0, .L8021823C -/* 660984 80218234 00000000 */ nop +/* 660984 80218234 00000000 */ nop /* 660988 80218238 8E510148 */ lw $s1, 0x148($s2) .L8021823C: /* 66098C 8021823C 0C09A75B */ jal get_actor diff --git a/asm/nonmatchings/battle/area_pra2/660750/func_802183A4_660AF4.s b/asm/nonmatchings/battle/area_pra2/660750/func_802183A4_660AF4.s index 6c1332fdb3..06e0c0c154 100644 --- a/asm/nonmatchings/battle/area_pra2/660750/func_802183A4_660AF4.s +++ b/asm/nonmatchings/battle/area_pra2/660750/func_802183A4_660AF4.s @@ -20,26 +20,26 @@ glabel func_802183A4_660AF4 /* 660B30 802183E0 8E050000 */ lw $a1, ($s0) /* 660B34 802183E4 26100004 */ addiu $s0, $s0, 4 /* 660B38 802183E8 4482C000 */ mtc1 $v0, $f24 -/* 660B3C 802183EC 00000000 */ nop +/* 660B3C 802183EC 00000000 */ nop /* 660B40 802183F0 4680C620 */ cvt.s.w $f24, $f24 /* 660B44 802183F4 0C0B1EAF */ jal get_variable /* 660B48 802183F8 0220202D */ daddu $a0, $s1, $zero /* 660B4C 802183FC 8E050000 */ lw $a1, ($s0) /* 660B50 80218400 26100004 */ addiu $s0, $s0, 4 /* 660B54 80218404 4482B000 */ mtc1 $v0, $f22 -/* 660B58 80218408 00000000 */ nop +/* 660B58 80218408 00000000 */ nop /* 660B5C 8021840C 4680B5A0 */ cvt.s.w $f22, $f22 /* 660B60 80218410 0C0B1EAF */ jal get_variable /* 660B64 80218414 0220202D */ daddu $a0, $s1, $zero /* 660B68 80218418 8E050000 */ lw $a1, ($s0) /* 660B6C 8021841C 4482A000 */ mtc1 $v0, $f20 -/* 660B70 80218420 00000000 */ nop +/* 660B70 80218420 00000000 */ nop /* 660B74 80218424 4680A520 */ cvt.s.w $f20, $f20 /* 660B78 80218428 0C0B1EAF */ jal get_variable /* 660B7C 8021842C 0220202D */ daddu $a0, $s1, $zero /* 660B80 80218430 4600C306 */ mov.s $f12, $f24 /* 660B84 80218434 44821000 */ mtc1 $v0, $f2 -/* 660B88 80218438 00000000 */ nop +/* 660B88 80218438 00000000 */ nop /* 660B8C 8021843C 468010A0 */ cvt.s.w $f2, $f2 /* 660B90 80218440 4406A000 */ mfc1 $a2, $f20 /* 660B94 80218444 44071000 */ mfc1 $a3, $f2 diff --git a/asm/nonmatchings/battle/area_pra2/660750/func_8021848C_660BDC.s b/asm/nonmatchings/battle/area_pra2/660750/func_8021848C_660BDC.s index 5373775738..59348df680 100644 --- a/asm/nonmatchings/battle/area_pra2/660750/func_8021848C_660BDC.s +++ b/asm/nonmatchings/battle/area_pra2/660750/func_8021848C_660BDC.s @@ -18,7 +18,7 @@ glabel func_8021848C_660BDC /* 660C10 802184C0 0C0B1EAF */ jal get_variable /* 660C14 802184C4 0040882D */ daddu $s1, $v0, $zero /* 660C18 802184C8 44820000 */ mtc1 $v0, $f0 -/* 660C1C 802184CC 00000000 */ nop +/* 660C1C 802184CC 00000000 */ nop /* 660C20 802184D0 46800020 */ cvt.s.w $f0, $f0 /* 660C24 802184D4 E6200000 */ swc1 $f0, ($s1) /* 660C28 802184D8 8E050000 */ lw $a1, ($s0) @@ -26,7 +26,7 @@ glabel func_8021848C_660BDC /* 660C30 802184E0 0C0B1EAF */ jal get_variable /* 660C34 802184E4 0240202D */ daddu $a0, $s2, $zero /* 660C38 802184E8 44820000 */ mtc1 $v0, $f0 -/* 660C3C 802184EC 00000000 */ nop +/* 660C3C 802184EC 00000000 */ nop /* 660C40 802184F0 46800020 */ cvt.s.w $f0, $f0 /* 660C44 802184F4 E6200004 */ swc1 $f0, 4($s1) /* 660C48 802184F8 8E050000 */ lw $a1, ($s0) @@ -35,20 +35,20 @@ glabel func_8021848C_660BDC /* 660C54 80218504 0240202D */ daddu $a0, $s2, $zero /* 660C58 80218508 24040014 */ addiu $a0, $zero, 0x14 /* 660C5C 8021850C 44820000 */ mtc1 $v0, $f0 -/* 660C60 80218510 00000000 */ nop +/* 660C60 80218510 00000000 */ nop /* 660C64 80218514 46800020 */ cvt.s.w $f0, $f0 /* 660C68 80218518 0C00A67F */ jal rand_int /* 660C6C 8021851C E6200008 */ swc1 $f0, 8($s1) /* 660C70 80218520 24040028 */ addiu $a0, $zero, 0x28 /* 660C74 80218524 00021023 */ negu $v0, $v0 /* 660C78 80218528 44820000 */ mtc1 $v0, $f0 -/* 660C7C 8021852C 00000000 */ nop +/* 660C7C 8021852C 00000000 */ nop /* 660C80 80218530 46800020 */ cvt.s.w $f0, $f0 /* 660C84 80218534 0C00A67F */ jal rand_int /* 660C88 80218538 E620000C */ swc1 $f0, 0xc($s1) /* 660C8C 8021853C 24420028 */ addiu $v0, $v0, 0x28 /* 660C90 80218540 44820000 */ mtc1 $v0, $f0 -/* 660C94 80218544 00000000 */ nop +/* 660C94 80218544 00000000 */ nop /* 660C98 80218548 46800020 */ cvt.s.w $f0, $f0 /* 660C9C 8021854C E6200010 */ swc1 $f0, 0x10($s1) /* 660CA0 80218550 AE200014 */ sw $zero, 0x14($s1) @@ -57,7 +57,7 @@ glabel func_8021848C_660BDC /* 660CAC 8021855C 0C0B1EAF */ jal get_variable /* 660CB0 80218560 0240202D */ daddu $a0, $s2, $zero /* 660CB4 80218564 44820000 */ mtc1 $v0, $f0 -/* 660CB8 80218568 00000000 */ nop +/* 660CB8 80218568 00000000 */ nop /* 660CBC 8021856C 46800020 */ cvt.s.w $f0, $f0 /* 660CC0 80218570 E6200018 */ swc1 $f0, 0x18($s1) /* 660CC4 80218574 8E050000 */ lw $a1, ($s0) @@ -65,14 +65,14 @@ glabel func_8021848C_660BDC /* 660CCC 8021857C 0C0B1EAF */ jal get_variable /* 660CD0 80218580 0240202D */ daddu $a0, $s2, $zero /* 660CD4 80218584 44820000 */ mtc1 $v0, $f0 -/* 660CD8 80218588 00000000 */ nop +/* 660CD8 80218588 00000000 */ nop /* 660CDC 8021858C 46800020 */ cvt.s.w $f0, $f0 /* 660CE0 80218590 E620001C */ swc1 $f0, 0x1c($s1) /* 660CE4 80218594 8E050000 */ lw $a1, ($s0) /* 660CE8 80218598 0C0B1EAF */ jal get_variable /* 660CEC 8021859C 0240202D */ daddu $a0, $s2, $zero /* 660CF0 802185A0 44820000 */ mtc1 $v0, $f0 -/* 660CF4 802185A4 00000000 */ nop +/* 660CF4 802185A4 00000000 */ nop /* 660CF8 802185A8 46800020 */ cvt.s.w $f0, $f0 /* 660CFC 802185AC E6200020 */ swc1 $f0, 0x20($s1) /* 660D00 802185B0 8FBF001C */ lw $ra, 0x1c($sp) @@ -82,4 +82,4 @@ glabel func_8021848C_660BDC /* 660D10 802185C0 24020002 */ addiu $v0, $zero, 2 /* 660D14 802185C4 03E00008 */ jr $ra /* 660D18 802185C8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 660D1C 802185CC 00000000 */ nop +/* 660D1C 802185CC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_pra2/660750/func_802185D0_660D20.s b/asm/nonmatchings/battle/area_pra2/660750/func_802185D0_660D20.s index ab27aebeb0..25952d48be 100644 --- a/asm/nonmatchings/battle/area_pra2/660750/func_802185D0_660D20.s +++ b/asm/nonmatchings/battle/area_pra2/660750/func_802185D0_660D20.s @@ -22,21 +22,21 @@ glabel func_802185D0_660D20 /* 660D64 80218614 C600004C */ lwc1 $f0, 0x4c($s0) /* 660D68 80218618 3C0141C0 */ lui $at, 0x41c0 /* 660D6C 8021861C 44811000 */ mtc1 $at, $f2 -/* 660D70 80218620 00000000 */ nop +/* 660D70 80218620 00000000 */ nop /* 660D74 80218624 46020002 */ mul.s $f0, $f0, $f2 -/* 660D78 80218628 00000000 */ nop +/* 660D78 80218628 00000000 */ nop /* 660D7C 8021862C 0040182D */ daddu $v1, $v0, $zero /* 660D80 80218630 8C62000C */ lw $v0, 0xc($v1) /* 660D84 80218634 E4400010 */ swc1 $f0, 0x10($v0) /* 660D88 80218638 C6000050 */ lwc1 $f0, 0x50($s0) /* 660D8C 8021863C 46020002 */ mul.s $f0, $f0, $f2 -/* 660D90 80218640 00000000 */ nop +/* 660D90 80218640 00000000 */ nop /* 660D94 80218644 8C62000C */ lw $v0, 0xc($v1) /* 660D98 80218648 E4400014 */ swc1 $f0, 0x14($v0) /* 660D9C 8021864C 8E020000 */ lw $v0, ($s0) /* 660DA0 80218650 30420001 */ andi $v0, $v0, 1 /* 660DA4 80218654 10400009 */ beqz $v0, .L8021867C -/* 660DA8 80218658 00000000 */ nop +/* 660DA8 80218658 00000000 */ nop /* 660DAC 8021865C 8C62000C */ lw $v0, 0xc($v1) /* 660DB0 80218660 C6400144 */ lwc1 $f0, 0x144($s2) /* 660DB4 80218664 E4400004 */ swc1 $f0, 4($v0) @@ -63,4 +63,4 @@ glabel func_802185D0_660D20 /* 660E00 802186B0 0000102D */ daddu $v0, $zero, $zero /* 660E04 802186B4 03E00008 */ jr $ra /* 660E08 802186B8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 660E0C 802186BC 00000000 */ nop +/* 660E0C 802186BC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_pra2/660750/func_802188DC_66102C.s b/asm/nonmatchings/battle/area_pra2/660750/func_802188DC_66102C.s index dd81ed0e59..2226445211 100644 --- a/asm/nonmatchings/battle/area_pra2/660750/func_802188DC_66102C.s +++ b/asm/nonmatchings/battle/area_pra2/660750/func_802188DC_66102C.s @@ -25,17 +25,17 @@ glabel func_802188DC_66102C /* 66107C 8021892C 00071883 */ sra $v1, $a3, 2 /* 661080 80218930 00621823 */ subu $v1, $v1, $v0 /* 661084 80218934 44836000 */ mtc1 $v1, $f12 -/* 661088 80218938 00000000 */ nop +/* 661088 80218938 00000000 */ nop /* 66108C 8021893C 46806320 */ cvt.s.w $f12, $f12 /* 661090 80218940 46006302 */ mul.s $f12, $f12, $f0 -/* 661094 80218944 00000000 */ nop +/* 661094 80218944 00000000 */ nop /* 661098 80218948 3C0143B4 */ lui $at, 0x43b4 /* 66109C 8021894C 44810000 */ mtc1 $at, $f0 /* 6610A0 80218950 3C014100 */ lui $at, 0x4100 /* 6610A4 80218954 44811000 */ mtc1 $at, $f2 /* 6610A8 80218958 46006303 */ div.s $f12, $f12, $f0 /* 6610AC 8021895C 46026302 */ mul.s $f12, $f12, $f2 -/* 6610B0 80218960 00000000 */ nop +/* 6610B0 80218960 00000000 */ nop /* 6610B4 80218964 8E120000 */ lw $s2, ($s0) /* 6610B8 80218968 26100004 */ addiu $s0, $s0, 4 /* 6610BC 8021896C 8E130000 */ lw $s3, ($s0) @@ -46,7 +46,7 @@ glabel func_802188DC_66102C /* 6610D0 80218980 44811000 */ mtc1 $at, $f2 /* 6610D4 80218984 0240282D */ daddu $a1, $s2, $zero /* 6610D8 80218988 46020502 */ mul.s $f20, $f0, $f2 -/* 6610DC 8021898C 00000000 */ nop +/* 6610DC 8021898C 00000000 */ nop /* 6610E0 80218990 0C0B2026 */ jal set_variable /* 6610E4 80218994 0000302D */ daddu $a2, $zero, $zero /* 6610E8 80218998 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/battle/area_pra2/660750/func_802189E0_661130.s b/asm/nonmatchings/battle/area_pra2/660750/func_802189E0_661130.s index bdefb974b2..b7a70d9c21 100644 --- a/asm/nonmatchings/battle/area_pra2/660750/func_802189E0_661130.s +++ b/asm/nonmatchings/battle/area_pra2/660750/func_802189E0_661130.s @@ -5,8 +5,8 @@ glabel func_802189E0_661130 /* 661130 802189E0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 661134 802189E4 AFBF0010 */ sw $ra, 0x10($sp) /* 661138 802189E8 0C051C83 */ jal func_8014720C -/* 66113C 802189EC 00000000 */ nop +/* 66113C 802189EC 00000000 */ nop /* 661140 802189F0 8FBF0010 */ lw $ra, 0x10($sp) /* 661144 802189F4 03E00008 */ jr $ra /* 661148 802189F8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 66114C 802189FC 00000000 */ nop +/* 66114C 802189FC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_pra3/669D80/func_80218000_669D80.s b/asm/nonmatchings/battle/area_pra3/669D80/func_80218000_669D80.s index d7659df6b9..fde774fc93 100644 --- a/asm/nonmatchings/battle/area_pra3/669D80/func_80218000_669D80.s +++ b/asm/nonmatchings/battle/area_pra3/669D80/func_80218000_669D80.s @@ -40,7 +40,7 @@ glabel func_80218000_669D80 .L8021808C: /* 669E0C 8021808C 8E820070 */ lw $v0, 0x70($s4) /* 669E10 80218090 144000F7 */ bnez $v0, .L80218470 -/* 669E14 80218094 00000000 */ nop +/* 669E14 80218094 00000000 */ nop /* 669E18 80218098 C6600144 */ lwc1 $f0, 0x144($s3) /* 669E1C 8021809C C638000C */ lwc1 $f24, 0xc($s1) /* 669E20 802180A0 C63A0014 */ lwc1 $f26, 0x14($s1) @@ -70,29 +70,29 @@ glabel func_80218000_669D80 /* 669E80 80218100 46002003 */ div.s $f0, $f4, $f0 /* 669E84 80218104 4600028D */ trunc.w.s $f10, $f0 /* 669E88 80218108 44035000 */ mfc1 $v1, $f10 -/* 669E8C 8021810C 00000000 */ nop +/* 669E8C 8021810C 00000000 */ nop /* 669E90 80218110 00031400 */ sll $v0, $v1, 0x10 /* 669E94 80218114 00021403 */ sra $v0, $v0, 0x10 /* 669E98 80218118 44820000 */ mtc1 $v0, $f0 -/* 669E9C 8021811C 00000000 */ nop +/* 669E9C 8021811C 00000000 */ nop /* 669EA0 80218120 46800020 */ cvt.s.w $f0, $f0 /* 669EA4 80218124 46020002 */ mul.s $f0, $f0, $f2 -/* 669EA8 80218128 00000000 */ nop +/* 669EA8 80218128 00000000 */ nop /* 669EAC 8021812C 46002086 */ mov.s $f2, $f4 /* 669EB0 80218130 A6230064 */ sh $v1, 0x64($s1) /* 669EB4 80218134 0808605C */ j .L80218170 /* 669EB8 80218138 46001201 */ sub.s $f8, $f2, $f0 .L8021813C: /* 669EBC 8021813C 44821000 */ mtc1 $v0, $f2 -/* 669EC0 80218140 00000000 */ nop +/* 669EC0 80218140 00000000 */ nop /* 669EC4 80218144 468010A0 */ cvt.s.w $f2, $f2 /* 669EC8 80218148 86220064 */ lh $v0, 0x64($s1) /* 669ECC 8021814C 46022083 */ div.s $f2, $f4, $f2 /* 669ED0 80218150 44820000 */ mtc1 $v0, $f0 -/* 669ED4 80218154 00000000 */ nop +/* 669ED4 80218154 00000000 */ nop /* 669ED8 80218158 46800020 */ cvt.s.w $f0, $f0 /* 669EDC 8021815C 46020002 */ mul.s $f0, $f0, $f2 -/* 669EE0 80218160 00000000 */ nop +/* 669EE0 80218160 00000000 */ nop /* 669EE4 80218164 C624004C */ lwc1 $f4, 0x4c($s1) /* 669EE8 80218168 E6220040 */ swc1 $f2, 0x40($s1) /* 669EEC 8021816C 46002201 */ sub.s $f8, $f4, $f0 @@ -107,13 +107,13 @@ glabel func_80218000_669D80 /* 669F0C 8021818C 44810000 */ mtc1 $at, $f0 /* 669F10 80218190 C6240000 */ lwc1 $f4, ($s1) /* 669F14 80218194 44823000 */ mtc1 $v0, $f6 -/* 669F18 80218198 00000000 */ nop +/* 669F18 80218198 00000000 */ nop /* 669F1C 8021819C 468031A0 */ cvt.s.w $f6, $f6 /* 669F20 802181A0 46060003 */ div.s $f0, $f0, $f6 /* 669F24 802181A4 46041081 */ sub.s $f2, $f2, $f4 /* 669F28 802181A8 E620003C */ swc1 $f0, 0x3c($s1) /* 669F2C 802181AC 44830000 */ mtc1 $v1, $f0 -/* 669F30 802181B0 00000000 */ nop +/* 669F30 802181B0 00000000 */ nop /* 669F34 802181B4 46800020 */ cvt.s.w $f0, $f0 /* 669F38 802181B8 46001083 */ div.s $f2, $f2, $f0 /* 669F3C 802181BC C6200010 */ lwc1 $f0, 0x10($s1) @@ -147,7 +147,7 @@ glabel func_80218000_669D80 /* 669FA8 80218228 14410004 */ bne $v0, $at, .L8021823C /* 669FAC 8021822C 3C018000 */ lui $at, 0x8000 /* 669FB0 80218230 14610002 */ bne $v1, $at, .L8021823C -/* 669FB4 80218234 00000000 */ nop +/* 669FB4 80218234 00000000 */ nop /* 669FB8 80218238 0006000D */ break 6 .L8021823C: /* 669FBC 8021823C 00001812 */ mflo $v1 @@ -172,7 +172,7 @@ glabel func_80218000_669D80 /* 66A008 80218288 44811000 */ mtc1 $at, $f2 /* 66A00C 8021828C 46200220 */ cvt.s.d $f8, $f0 /* 66A010 80218290 44830000 */ mtc1 $v1, $f0 -/* 66A014 80218294 00000000 */ nop +/* 66A014 80218294 00000000 */ nop /* 66A018 80218298 46800020 */ cvt.s.w $f0, $f0 /* 66A01C 8021829C 86230066 */ lh $v1, 0x66($s1) /* 66A020 802182A0 24020002 */ addiu $v0, $zero, 2 @@ -184,7 +184,7 @@ glabel func_80218000_669D80 /* 66A038 802182B8 D42229D8 */ ldc1 $f2, %lo(D_802329D8)($at) /* 66A03C 802182BC 46004021 */ cvt.d.s $f0, $f8 /* 66A040 802182C0 46220002 */ mul.d $f0, $f0, $f2 -/* 66A044 802182C4 00000000 */ nop +/* 66A044 802182C4 00000000 */ nop /* 66A048 802182C8 46200020 */ cvt.s.d $f0, $f0 /* 66A04C 802182CC E6200050 */ swc1 $f0, 0x50($s1) .L802182D0: @@ -196,7 +196,7 @@ glabel func_80218000_669D80 /* 66A064 802182E4 C636003C */ lwc1 $f22, 0x3c($s1) /* 66A068 802182E8 AE200018 */ sw $zero, 0x18($s1) /* 66A06C 802182EC 46006302 */ mul.s $f12, $f12, $f0 -/* 66A070 802182F0 00000000 */ nop +/* 66A070 802182F0 00000000 */ nop /* 66A074 802182F4 AE20001C */ sw $zero, 0x1c($s1) /* 66A078 802182F8 4600A521 */ cvt.d.s $f20, $f20 /* 66A07C 802182FC 3C0143B4 */ lui $at, 0x43b4 @@ -219,7 +219,7 @@ glabel func_80218000_669D80 /* 66A0B8 80218338 14410004 */ bne $v0, $at, .L8021834C /* 66A0BC 8021833C 3C018000 */ lui $at, 0x8000 /* 66A0C0 80218340 14610002 */ bne $v1, $at, .L8021834C -/* 66A0C4 80218344 00000000 */ nop +/* 66A0C4 80218344 00000000 */ nop /* 66A0C8 80218348 0006000D */ break 6 .L8021834C: /* 66A0CC 8021834C 00001812 */ mflo $v1 @@ -244,7 +244,7 @@ glabel func_80218000_669D80 /* 66A118 80218398 44811000 */ mtc1 $at, $f2 /* 66A11C 8021839C 46200220 */ cvt.s.d $f8, $f0 /* 66A120 802183A0 44830000 */ mtc1 $v1, $f0 -/* 66A124 802183A4 00000000 */ nop +/* 66A124 802183A4 00000000 */ nop /* 66A128 802183A8 46800020 */ cvt.s.w $f0, $f0 /* 66A12C 802183AC 86230066 */ lh $v1, 0x66($s1) /* 66A130 802183B0 24020004 */ addiu $v0, $zero, 4 @@ -257,7 +257,7 @@ glabel func_80218000_669D80 /* 66A14C 802183CC 44801000 */ mtc1 $zero, $f2 /* 66A150 802183D0 46004021 */ cvt.d.s $f0, $f8 /* 66A154 802183D4 46220002 */ mul.d $f0, $f0, $f2 -/* 66A158 802183D8 00000000 */ nop +/* 66A158 802183D8 00000000 */ nop /* 66A15C 802183DC 46200020 */ cvt.s.d $f0, $f0 /* 66A160 802183E0 E6200050 */ swc1 $f0, 0x50($s1) .L802183E4: @@ -269,7 +269,7 @@ glabel func_80218000_669D80 /* 66A178 802183F8 C636003C */ lwc1 $f22, 0x3c($s1) /* 66A17C 802183FC AE200018 */ sw $zero, 0x18($s1) /* 66A180 80218400 46006302 */ mul.s $f12, $f12, $f0 -/* 66A184 80218404 00000000 */ nop +/* 66A184 80218404 00000000 */ nop /* 66A188 80218408 AE20001C */ sw $zero, 0x1c($s1) /* 66A18C 8021840C 4600A521 */ cvt.d.s $f20, $f20 /* 66A190 80218410 3C0143B4 */ lui $at, 0x43b4 @@ -282,9 +282,9 @@ glabel func_80218000_669D80 /* 66A1AC 8021842C 46000021 */ cvt.d.s $f0, $f0 .L80218430: /* 66A1B0 80218430 46220002 */ mul.d $f0, $f0, $f2 -/* 66A1B4 80218434 00000000 */ nop +/* 66A1B4 80218434 00000000 */ nop /* 66A1B8 80218438 46360002 */ mul.d $f0, $f0, $f22 -/* 66A1BC 8021843C 00000000 */ nop +/* 66A1BC 8021843C 00000000 */ nop /* 66A1C0 80218440 46360000 */ add.d $f0, $f0, $f22 /* 66A1C4 80218444 4620A500 */ add.d $f20, $f20, $f0 /* 66A1C8 80218448 4620A520 */ cvt.s.d $f20, $f20 @@ -308,21 +308,21 @@ glabel func_80218000_669D80 /* 66A20C 8021848C 10620008 */ beq $v1, $v0, .L802184B0 /* 66A210 80218490 0000102D */ daddu $v0, $zero, $zero /* 66A214 80218494 08086218 */ j .L80218860 -/* 66A218 80218498 00000000 */ nop +/* 66A218 80218498 00000000 */ nop .L8021849C: /* 66A21C 8021849C 24020003 */ addiu $v0, $zero, 3 /* 66A220 802184A0 106200BA */ beq $v1, $v0, .L8021878C /* 66A224 802184A4 0000102D */ daddu $v0, $zero, $zero /* 66A228 802184A8 08086218 */ j .L80218860 -/* 66A22C 802184AC 00000000 */ nop +/* 66A22C 802184AC 00000000 */ nop .L802184B0: /* 66A230 802184B0 C6220044 */ lwc1 $f2, 0x44($s1) /* 66A234 802184B4 3C013FC9 */ lui $at, 0x3fc9 /* 66A238 802184B8 34210FD0 */ ori $at, $at, 0xfd0 /* 66A23C 802184BC 44810000 */ mtc1 $at, $f0 -/* 66A240 802184C0 00000000 */ nop +/* 66A240 802184C0 00000000 */ nop /* 66A244 802184C4 4602003C */ c.lt.s $f0, $f2 -/* 66A248 802184C8 00000000 */ nop +/* 66A248 802184C8 00000000 */ nop /* 66A24C 802184CC 45000004 */ bc1f .L802184E0 /* 66A250 802184D0 2404FF81 */ addiu $a0, $zero, -0x7f /* 66A254 802184D4 8E26005C */ lw $a2, 0x5c($s1) @@ -351,7 +351,7 @@ glabel func_80218000_669D80 /* 66A2AC 8021852C C62C0044 */ lwc1 $f12, 0x44($s1) /* 66A2B0 80218530 C6220050 */ lwc1 $f2, 0x50($s1) /* 66A2B4 80218534 46001082 */ mul.s $f2, $f2, $f0 -/* 66A2B8 80218538 00000000 */ nop +/* 66A2B8 80218538 00000000 */ nop /* 66A2BC 8021853C C6200004 */ lwc1 $f0, 4($s1) /* 66A2C0 80218540 46020000 */ add.s $f0, $f0, $f2 /* 66A2C4 80218544 E6600148 */ swc1 $f0, 0x148($s3) @@ -360,7 +360,7 @@ glabel func_80218000_669D80 /* 66A2D0 80218550 C6220010 */ lwc1 $f2, 0x10($s1) /* 66A2D4 80218554 C6600148 */ lwc1 $f0, 0x148($s3) /* 66A2D8 80218558 4602003C */ c.lt.s $f0, $f2 -/* 66A2DC 8021855C 00000000 */ nop +/* 66A2DC 8021855C 00000000 */ nop /* 66A2E0 80218560 45000007 */ bc1f .L80218580 /* 66A2E4 80218564 4600B306 */ mov.s $f12, $f22 /* 66A2E8 80218568 86220064 */ lh $v0, 0x64($s1) @@ -389,7 +389,7 @@ glabel func_80218000_669D80 /* 66A33C 802185BC 44810000 */ mtc1 $at, $f0 /* 66A340 802185C0 C6340044 */ lwc1 $f20, 0x44($s1) /* 66A344 802185C4 46006302 */ mul.s $f12, $f12, $f0 -/* 66A348 802185C8 00000000 */ nop +/* 66A348 802185C8 00000000 */ nop /* 66A34C 802185CC C636003C */ lwc1 $f22, 0x3c($s1) /* 66A350 802185D0 4600A521 */ cvt.d.s $f20, $f20 /* 66A354 802185D4 3C0143B4 */ lui $at, 0x43b4 @@ -408,7 +408,7 @@ glabel func_80218000_669D80 /* 66A384 80218604 44810000 */ mtc1 $at, $f0 /* 66A388 80218608 C6340044 */ lwc1 $f20, 0x44($s1) /* 66A38C 8021860C 46006302 */ mul.s $f12, $f12, $f0 -/* 66A390 80218610 00000000 */ nop +/* 66A390 80218610 00000000 */ nop /* 66A394 80218614 C636003C */ lwc1 $f22, 0x3c($s1) /* 66A398 80218618 4600A521 */ cvt.d.s $f20, $f20 /* 66A39C 8021861C 3C0143B4 */ lui $at, 0x43b4 @@ -421,9 +421,9 @@ glabel func_80218000_669D80 /* 66A3B8 80218638 46000021 */ cvt.d.s $f0, $f0 .L8021863C: /* 66A3BC 8021863C 46220002 */ mul.d $f0, $f0, $f2 -/* 66A3C0 80218640 00000000 */ nop +/* 66A3C0 80218640 00000000 */ nop /* 66A3C4 80218644 46360002 */ mul.d $f0, $f0, $f22 -/* 66A3C8 80218648 00000000 */ nop +/* 66A3C8 80218648 00000000 */ nop /* 66A3CC 8021864C 46360000 */ add.d $f0, $f0, $f22 /* 66A3D0 80218650 4620A500 */ add.d $f20, $f20, $f0 /* 66A3D4 80218654 4620A520 */ cvt.s.d $f20, $f20 @@ -469,7 +469,7 @@ glabel func_80218000_669D80 /* 66A46C 802186EC 14410004 */ bne $v0, $at, .L80218700 /* 66A470 802186F0 3C018000 */ lui $at, 0x8000 /* 66A474 802186F4 14610002 */ bne $v1, $at, .L80218700 -/* 66A478 802186F8 00000000 */ nop +/* 66A478 802186F8 00000000 */ nop /* 66A47C 802186FC 0006000D */ break 6 .L80218700: /* 66A480 80218700 00001812 */ mflo $v1 @@ -496,7 +496,7 @@ glabel func_80218000_669D80 /* 66A4D4 80218754 46200020 */ cvt.s.d $f0, $f0 /* 66A4D8 80218758 E6200050 */ swc1 $f0, 0x50($s1) /* 66A4DC 8021875C 44830000 */ mtc1 $v1, $f0 -/* 66A4E0 80218760 00000000 */ nop +/* 66A4E0 80218760 00000000 */ nop /* 66A4E4 80218764 46800020 */ cvt.s.w $f0, $f0 /* 66A4E8 80218768 E6200028 */ swc1 $f0, 0x28($s1) /* 66A4EC 8021876C C6600144 */ lwc1 $f0, 0x144($s3) @@ -512,9 +512,9 @@ glabel func_80218000_669D80 /* 66A510 80218790 3C0140C9 */ lui $at, 0x40c9 /* 66A514 80218794 34210FD0 */ ori $at, $at, 0xfd0 /* 66A518 80218798 4481B000 */ mtc1 $at, $f22 -/* 66A51C 8021879C 00000000 */ nop +/* 66A51C 8021879C 00000000 */ nop /* 66A520 802187A0 46166302 */ mul.s $f12, $f12, $f22 -/* 66A524 802187A4 00000000 */ nop +/* 66A524 802187A4 00000000 */ nop /* 66A528 802187A8 C6340000 */ lwc1 $f20, ($s1) /* 66A52C 802187AC 3C0143B4 */ lui $at, 0x43b4 /* 66A530 802187B0 4481C000 */ mtc1 $at, $f24 @@ -523,10 +523,10 @@ glabel func_80218000_669D80 /* 66A53C 802187BC 46186303 */ div.s $f12, $f12, $f24 /* 66A540 802187C0 C6220050 */ lwc1 $f2, 0x50($s1) /* 66A544 802187C4 46001082 */ mul.s $f2, $f2, $f0 -/* 66A548 802187C8 00000000 */ nop +/* 66A548 802187C8 00000000 */ nop /* 66A54C 802187CC C62C0024 */ lwc1 $f12, 0x24($s1) /* 66A550 802187D0 46166302 */ mul.s $f12, $f12, $f22 -/* 66A554 802187D4 00000000 */ nop +/* 66A554 802187D4 00000000 */ nop /* 66A558 802187D8 3C018023 */ lui $at, %hi(D_80232A10) /* 66A55C 802187DC D4202A10 */ ldc1 $f0, %lo(D_80232A10)($at) /* 66A560 802187E0 460010A1 */ cvt.d.s $f2, $f2 @@ -538,7 +538,7 @@ glabel func_80218000_669D80 /* 66A578 802187F8 E6340000 */ swc1 $f20, ($s1) /* 66A57C 802187FC C6220050 */ lwc1 $f2, 0x50($s1) /* 66A580 80218800 46001082 */ mul.s $f2, $f2, $f0 -/* 66A584 80218804 00000000 */ nop +/* 66A584 80218804 00000000 */ nop /* 66A588 80218808 C62C0024 */ lwc1 $f12, 0x24($s1) /* 66A58C 8021880C C6200028 */ lwc1 $f0, 0x28($s1) /* 66A590 80218810 46006300 */ add.s $f12, $f12, $f0 diff --git a/asm/nonmatchings/battle/area_pra3/669D80/func_80218890_66A610.s b/asm/nonmatchings/battle/area_pra3/669D80/func_80218890_66A610.s index 6d54ce71d5..e1502b45b5 100644 --- a/asm/nonmatchings/battle/area_pra3/669D80/func_80218890_66A610.s +++ b/asm/nonmatchings/battle/area_pra3/669D80/func_80218890_66A610.s @@ -31,9 +31,9 @@ glabel func_80218890_66A610 .L802188F4: /* 66A674 802188F4 C6200050 */ lwc1 $f0, 0x50($s1) /* 66A678 802188F8 4480A000 */ mtc1 $zero, $f20 -/* 66A67C 802188FC 00000000 */ nop +/* 66A67C 802188FC 00000000 */ nop /* 66A680 80218900 4600A03C */ c.lt.s $f20, $f0 -/* 66A684 80218904 00000000 */ nop +/* 66A684 80218904 00000000 */ nop /* 66A688 80218908 45000005 */ bc1f .L80218920 /* 66A68C 8021890C 2404FF81 */ addiu $a0, $zero, -0x7f /* 66A690 80218910 8E260064 */ lw $a2, 0x64($s1) @@ -42,7 +42,7 @@ glabel func_80218890_66A610 /* 66A69C 8021891C C6200050 */ lwc1 $f0, 0x50($s1) .L80218920: /* 66A6A0 80218920 4614003C */ c.lt.s $f0, $f20 -/* 66A6A4 80218924 00000000 */ nop +/* 66A6A4 80218924 00000000 */ nop /* 66A6A8 80218928 45000004 */ bc1f .L8021893C /* 66A6AC 8021892C 2404FF81 */ addiu $a0, $zero, -0x7f /* 66A6B0 80218930 8E260068 */ lw $a2, 0x68($s1) @@ -67,7 +67,7 @@ glabel func_80218890_66A610 /* 66A6F8 80218978 C6240148 */ lwc1 $f4, 0x148($s1) /* 66A6FC 8021897C E622014C */ swc1 $f2, 0x14c($s1) /* 66A700 80218980 4614203C */ c.lt.s $f4, $f20 -/* 66A704 80218984 00000000 */ nop +/* 66A704 80218984 00000000 */ nop /* 66A708 80218988 45010003 */ bc1t .L80218998 /* 66A70C 8021898C E6200144 */ swc1 $f0, 0x144($s1) /* 66A710 80218990 08086271 */ j .L802189C4 diff --git a/asm/nonmatchings/battle/area_pra3/669D80/func_802189E4_66A764.s b/asm/nonmatchings/battle/area_pra3/669D80/func_802189E4_66A764.s index 4a90192e77..33849e7cf6 100644 --- a/asm/nonmatchings/battle/area_pra3/669D80/func_802189E4_66A764.s +++ b/asm/nonmatchings/battle/area_pra3/669D80/func_802189E4_66A764.s @@ -14,7 +14,7 @@ glabel func_802189E4_66A764 /* 66A788 80218A08 8C820000 */ lw $v0, ($a0) /* 66A78C 80218A0C 30420800 */ andi $v0, $v0, 0x800 /* 66A790 80218A10 1440000A */ bnez $v0, .L80218A3C -/* 66A794 80218A14 00000000 */ nop +/* 66A794 80218A14 00000000 */ nop /* 66A798 80218A18 90820191 */ lbu $v0, 0x191($a0) /* 66A79C 80218A1C 8E030088 */ lw $v1, 0x88($s0) /* 66A7A0 80218A20 00021042 */ srl $v0, $v0, 1 diff --git a/asm/nonmatchings/battle/area_pra3/669D80/func_80218AF4_66A874.s b/asm/nonmatchings/battle/area_pra3/669D80/func_80218AF4_66A874.s index f0f7ec1d52..3795f3633d 100644 --- a/asm/nonmatchings/battle/area_pra3/669D80/func_80218AF4_66A874.s +++ b/asm/nonmatchings/battle/area_pra3/669D80/func_80218AF4_66A874.s @@ -10,7 +10,7 @@ glabel func_80218AF4_66A874 /* 66A888 80218B08 8C43000C */ lw $v1, 0xc($v0) /* 66A88C 80218B0C 3C01C47A */ lui $at, 0xc47a /* 66A890 80218B10 44810000 */ mtc1 $at, $f0 -/* 66A894 80218B14 00000000 */ nop +/* 66A894 80218B14 00000000 */ nop /* 66A898 80218B18 E4600008 */ swc1 $f0, 8($v1) /* 66A89C 80218B1C 8FBF0010 */ lw $ra, 0x10($sp) /* 66A8A0 80218B20 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/battle/area_pra3/669D80/func_80218B2C_66A8AC.s b/asm/nonmatchings/battle/area_pra3/669D80/func_80218B2C_66A8AC.s index 8e4d50bfa3..2fe2f767f9 100644 --- a/asm/nonmatchings/battle/area_pra3/669D80/func_80218B2C_66A8AC.s +++ b/asm/nonmatchings/battle/area_pra3/669D80/func_80218B2C_66A8AC.s @@ -11,7 +11,7 @@ glabel func_80218B2C_66A8AC /* 66A8C4 80218B44 8C82000C */ lw $v0, 0xc($a0) /* 66A8C8 80218B48 3C014310 */ lui $at, 0x4310 /* 66A8CC 80218B4C 44810000 */ mtc1 $at, $f0 -/* 66A8D0 80218B50 00000000 */ nop +/* 66A8D0 80218B50 00000000 */ nop /* 66A8D4 80218B54 E4400008 */ swc1 $f0, 8($v0) /* 66A8D8 80218B58 8C830000 */ lw $v1, ($a0) /* 66A8DC 80218B5C 34630010 */ ori $v1, $v1, 0x10 diff --git a/asm/nonmatchings/battle/area_pra3/669D80/func_80218C40_66A9C0.s b/asm/nonmatchings/battle/area_pra3/669D80/func_80218C40_66A9C0.s index 11de665d83..462aa9b135 100644 --- a/asm/nonmatchings/battle/area_pra3/669D80/func_80218C40_66A9C0.s +++ b/asm/nonmatchings/battle/area_pra3/669D80/func_80218C40_66A9C0.s @@ -27,9 +27,9 @@ glabel func_80218C40_66A9C0 /* 66AA14 80218C94 C622004C */ lwc1 $f2, 0x4c($s1) /* 66AA18 80218C98 3C014080 */ lui $at, 0x4080 /* 66AA1C 80218C9C 44810000 */ mtc1 $at, $f0 -/* 66AA20 80218CA0 00000000 */ nop +/* 66AA20 80218CA0 00000000 */ nop /* 66AA24 80218CA4 4600103C */ c.lt.s $f2, $f0 -/* 66AA28 80218CA8 00000000 */ nop +/* 66AA28 80218CA8 00000000 */ nop /* 66AA2C 80218CAC 45000007 */ bc1f .L80218CCC /* 66AA30 80218CB0 0000202D */ daddu $a0, $zero, $zero /* 66AA34 80218CB4 C6200054 */ lwc1 $f0, 0x54($s1) @@ -47,7 +47,7 @@ glabel func_80218C40_66A9C0 /* 66AA60 80218CE0 24040001 */ addiu $a0, $zero, 1 .L80218CE4: /* 66AA64 80218CE4 0C0990BC */ jal play_movement_dust_effects -/* 66AA68 80218CE8 00000000 */ nop +/* 66AA68 80218CE8 00000000 */ nop /* 66AA6C 80218CEC C6400040 */ lwc1 $f0, 0x40($s2) /* 66AA70 80218CF0 3C013FF8 */ lui $at, 0x3ff8 /* 66AA74 80218CF4 44811800 */ mtc1 $at, $f3 @@ -68,7 +68,7 @@ glabel func_80218C40_66A9C0 /* 66AAB0 80218D30 44801000 */ mtc1 $zero, $f2 /* 66AAB4 80218D34 46000021 */ cvt.d.s $f0, $f0 /* 66AAB8 80218D38 4622003C */ c.lt.d $f0, $f2 -/* 66AABC 80218D3C 00000000 */ nop +/* 66AABC 80218D3C 00000000 */ nop /* 66AAC0 80218D40 45010002 */ bc1t .L80218D4C /* 66AAC4 80218D44 24020002 */ addiu $v0, $zero, 2 /* 66AAC8 80218D48 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/battle/area_pra3/669D80/func_80218D64_66AAE4.s b/asm/nonmatchings/battle/area_pra3/669D80/func_80218D64_66AAE4.s index f1ea75165c..e09c1c67d9 100644 --- a/asm/nonmatchings/battle/area_pra3/669D80/func_80218D64_66AAE4.s +++ b/asm/nonmatchings/battle/area_pra3/669D80/func_80218D64_66AAE4.s @@ -27,9 +27,9 @@ glabel func_80218D64_66AAE4 /* 66AB38 80218DB8 C622004C */ lwc1 $f2, 0x4c($s1) /* 66AB3C 80218DBC 3C014080 */ lui $at, 0x4080 /* 66AB40 80218DC0 44810000 */ mtc1 $at, $f0 -/* 66AB44 80218DC4 00000000 */ nop +/* 66AB44 80218DC4 00000000 */ nop /* 66AB48 80218DC8 4600103C */ c.lt.s $f2, $f0 -/* 66AB4C 80218DCC 00000000 */ nop +/* 66AB4C 80218DCC 00000000 */ nop /* 66AB50 80218DD0 45000007 */ bc1f .L80218DF0 /* 66AB54 80218DD4 0000202D */ daddu $a0, $zero, $zero /* 66AB58 80218DD8 C6200054 */ lwc1 $f0, 0x54($s1) @@ -47,7 +47,7 @@ glabel func_80218D64_66AAE4 /* 66AB84 80218E04 24040001 */ addiu $a0, $zero, 1 .L80218E08: /* 66AB88 80218E08 0C0990BC */ jal play_movement_dust_effects -/* 66AB8C 80218E0C 00000000 */ nop +/* 66AB8C 80218E0C 00000000 */ nop /* 66AB90 80218E10 C6400040 */ lwc1 $f0, 0x40($s2) /* 66AB94 80218E14 3C013FF8 */ lui $at, 0x3ff8 /* 66AB98 80218E18 44811800 */ mtc1 $at, $f3 @@ -68,7 +68,7 @@ glabel func_80218D64_66AAE4 /* 66ABD4 80218E54 44801000 */ mtc1 $zero, $f2 /* 66ABD8 80218E58 46000021 */ cvt.d.s $f0, $f0 /* 66ABDC 80218E5C 4622003C */ c.lt.d $f0, $f2 -/* 66ABE0 80218E60 00000000 */ nop +/* 66ABE0 80218E60 00000000 */ nop /* 66ABE4 80218E64 45010002 */ bc1t .L80218E70 /* 66ABE8 80218E68 24020002 */ addiu $v0, $zero, 2 /* 66ABEC 80218E6C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/battle/area_pra3/669D80/func_80218E88_66AC08.s b/asm/nonmatchings/battle/area_pra3/669D80/func_80218E88_66AC08.s index 7294a58ade..48eae45fea 100644 --- a/asm/nonmatchings/battle/area_pra3/669D80/func_80218E88_66AC08.s +++ b/asm/nonmatchings/battle/area_pra3/669D80/func_80218E88_66AC08.s @@ -39,7 +39,7 @@ glabel func_80218E88_66AC08 /* 66AC8C 80218F0C 3C013ECC */ lui $at, 0x3ecc /* 66AC90 80218F10 3421CCCD */ ori $at, $at, 0xcccd /* 66AC94 80218F14 44810000 */ mtc1 $at, $f0 -/* 66AC98 80218F18 00000000 */ nop +/* 66AC98 80218F18 00000000 */ nop /* 66AC9C 80218F1C E7A00010 */ swc1 $f0, 0x10($sp) .L80218F20: /* 66ACA0 80218F20 24020005 */ addiu $v0, $zero, 5 @@ -64,7 +64,7 @@ glabel func_80218E88_66AC08 /* 66ACE8 80218F68 3C013ECC */ lui $at, 0x3ecc /* 66ACEC 80218F6C 3421CCCD */ ori $at, $at, 0xcccd /* 66ACF0 80218F70 44810000 */ mtc1 $at, $f0 -/* 66ACF4 80218F74 00000000 */ nop +/* 66ACF4 80218F74 00000000 */ nop /* 66ACF8 80218F78 E7A00010 */ swc1 $f0, 0x10($sp) .L80218F7C: /* 66ACFC 80218F7C 24020005 */ addiu $v0, $zero, 5 @@ -90,11 +90,11 @@ glabel func_80218E88_66AC08 /* 66AD48 80218FC8 24020008 */ addiu $v0, $zero, 8 /* 66AD4C 80218FCC 82230210 */ lb $v1, 0x210($s1) /* 66AD50 80218FD0 1062000A */ beq $v1, $v0, .L80218FFC -/* 66AD54 80218FD4 00000000 */ nop +/* 66AD54 80218FD4 00000000 */ nop /* 66AD58 80218FD8 8E020008 */ lw $v0, 8($s0) /* 66AD5C 80218FDC 2442000F */ addiu $v0, $v0, 0xf /* 66AD60 80218FE0 44826000 */ mtc1 $v0, $f12 -/* 66AD64 80218FE4 00000000 */ nop +/* 66AD64 80218FE4 00000000 */ nop /* 66AD68 80218FE8 46806320 */ cvt.s.w $f12, $f12 /* 66AD6C 80218FEC 0C00A6C9 */ jal clamp_angle /* 66AD70 80218FF0 AE020008 */ sw $v0, 8($s0) @@ -107,36 +107,36 @@ glabel func_80218E88_66AC08 /* 66AD88 80219008 C60C0008 */ lwc1 $f12, 8($s0) /* 66AD8C 8021900C 46806320 */ cvt.s.w $f12, $f12 /* 66AD90 80219010 46006302 */ mul.s $f12, $f12, $f0 -/* 66AD94 80219014 00000000 */ nop +/* 66AD94 80219014 00000000 */ nop /* 66AD98 80219018 3C0143B4 */ lui $at, 0x43b4 /* 66AD9C 8021901C 44810000 */ mtc1 $at, $f0 /* 66ADA0 80219020 0C00A85B */ jal sin_rad /* 66ADA4 80219024 46006303 */ div.s $f12, $f12, $f0 /* 66ADA8 80219028 3C014040 */ lui $at, 0x4040 /* 66ADAC 8021902C 44811000 */ mtc1 $at, $f2 -/* 66ADB0 80219030 00000000 */ nop +/* 66ADB0 80219030 00000000 */ nop /* 66ADB4 80219034 46020002 */ mul.s $f0, $f0, $f2 -/* 66ADB8 80219038 00000000 */ nop +/* 66ADB8 80219038 00000000 */ nop /* 66ADBC 8021903C 86220152 */ lh $v0, 0x152($s1) /* 66ADC0 80219040 44821000 */ mtc1 $v0, $f2 -/* 66ADC4 80219044 00000000 */ nop +/* 66ADC4 80219044 00000000 */ nop /* 66ADC8 80219048 468010A0 */ cvt.s.w $f2, $f2 /* 66ADCC 8021904C 4600018D */ trunc.w.s $f6, $f0 /* 66ADD0 80219050 44033000 */ mfc1 $v1, $f6 -/* 66ADD4 80219054 00000000 */ nop +/* 66ADD4 80219054 00000000 */ nop /* 66ADD8 80219058 00031600 */ sll $v0, $v1, 0x18 /* 66ADDC 8021905C C6200148 */ lwc1 $f0, 0x148($s1) /* 66ADE0 80219060 00021603 */ sra $v0, $v0, 0x18 /* 66ADE4 80219064 A223019A */ sb $v1, 0x19a($s1) /* 66ADE8 80219068 46020000 */ add.s $f0, $f0, $f2 /* 66ADEC 8021906C 44821000 */ mtc1 $v0, $f2 -/* 66ADF0 80219070 00000000 */ nop +/* 66ADF0 80219070 00000000 */ nop /* 66ADF4 80219074 468010A0 */ cvt.s.w $f2, $f2 /* 66ADF8 80219078 86220150 */ lh $v0, 0x150($s1) /* 66ADFC 8021907C 46020000 */ add.s $f0, $f0, $f2 /* 66AE00 80219080 2403000A */ addiu $v1, $zero, 0xa /* 66AE04 80219084 44821000 */ mtc1 $v0, $f2 -/* 66AE08 80219088 00000000 */ nop +/* 66AE08 80219088 00000000 */ nop /* 66AE0C 8021908C 468010A0 */ cvt.s.w $f2, $f2 /* 66AE10 80219090 46000121 */ cvt.d.s $f4, $f0 /* 66AE14 80219094 C6200144 */ lwc1 $f0, 0x144($s1) @@ -149,14 +149,14 @@ glabel func_80218E88_66AC08 /* 66AE30 802190B0 3C014028 */ lui $at, 0x4028 /* 66AE34 802190B4 44810800 */ mtc1 $at, $f1 /* 66AE38 802190B8 44800000 */ mtc1 $zero, $f0 -/* 66AE3C 802190BC 00000000 */ nop +/* 66AE3C 802190BC 00000000 */ nop /* 66AE40 802190C0 46202000 */ add.d $f0, $f4, $f0 .L802190C4: /* 66AE44 802190C4 46200520 */ cvt.s.d $f20, $f0 /* 66AE48 802190C8 86220154 */ lh $v0, 0x154($s1) /* 66AE4C 802190CC C620014C */ lwc1 $f0, 0x14c($s1) /* 66AE50 802190D0 44821000 */ mtc1 $v0, $f2 -/* 66AE54 802190D4 00000000 */ nop +/* 66AE54 802190D4 00000000 */ nop /* 66AE58 802190D8 468010A0 */ cvt.s.w $f2, $f2 /* 66AE5C 802190DC 8E02000C */ lw $v0, 0xc($s0) /* 66AE60 802190E0 10400059 */ beqz $v0, .L80219248 @@ -165,16 +165,16 @@ glabel func_80218E88_66AC08 /* 66AE6C 802190EC 10600005 */ beqz $v1, .L80219104 /* 66AE70 802190F0 24020001 */ addiu $v0, $zero, 1 /* 66AE74 802190F4 1062002A */ beq $v1, $v0, .L802191A0 -/* 66AE78 802190F8 00000000 */ nop +/* 66AE78 802190F8 00000000 */ nop /* 66AE7C 802190FC 080864A0 */ j .L80219280 -/* 66AE80 80219100 00000000 */ nop +/* 66AE80 80219100 00000000 */ nop .L80219104: /* 66AE84 80219104 8E020014 */ lw $v0, 0x14($s0) /* 66AE88 80219108 14400016 */ bnez $v0, .L80219164 /* 66AE8C 8021910C 2402000A */ addiu $v0, $zero, 0xa /* 66AE90 80219110 82230210 */ lb $v1, 0x210($s1) /* 66AE94 80219114 10620005 */ beq $v1, $v0, .L8021912C -/* 66AE98 80219118 00000000 */ nop +/* 66AE98 80219118 00000000 */ nop /* 66AE9C 8021911C 3C013F80 */ lui $at, 0x3f80 /* 66AEA0 80219120 44810000 */ mtc1 $at, $f0 /* 66AEA4 80219124 08086450 */ j .L80219140 @@ -183,7 +183,7 @@ glabel func_80218E88_66AC08 /* 66AEAC 8021912C 3C013ECC */ lui $at, 0x3ecc /* 66AEB0 80219130 3421CCCD */ ori $at, $at, 0xcccd /* 66AEB4 80219134 44810000 */ mtc1 $at, $f0 -/* 66AEB8 80219138 00000000 */ nop +/* 66AEB8 80219138 00000000 */ nop /* 66AEBC 8021913C E7A00010 */ swc1 $f0, 0x10($sp) .L80219140: /* 66AEC0 80219140 0000202D */ daddu $a0, $zero, $zero @@ -198,7 +198,7 @@ glabel func_80218E88_66AC08 .L80219164: /* 66AEE4 80219164 8E030018 */ lw $v1, 0x18($s0) /* 66AEE8 80219168 10600005 */ beqz $v1, .L80219180 -/* 66AEEC 8021916C 00000000 */ nop +/* 66AEEC 8021916C 00000000 */ nop /* 66AEF0 80219170 8C620000 */ lw $v0, ($v1) /* 66AEF4 80219174 34420010 */ ori $v0, $v0, 0x10 /* 66AEF8 80219178 AC620000 */ sw $v0, ($v1) @@ -215,7 +215,7 @@ glabel func_80218E88_66AC08 .L802191A0: /* 66AF20 802191A0 8E030014 */ lw $v1, 0x14($s0) /* 66AF24 802191A4 10600005 */ beqz $v1, .L802191BC -/* 66AF28 802191A8 00000000 */ nop +/* 66AF28 802191A8 00000000 */ nop /* 66AF2C 802191AC 8C620000 */ lw $v0, ($v1) /* 66AF30 802191B0 34420010 */ ori $v0, $v0, 0x10 /* 66AF34 802191B4 AC620000 */ sw $v0, ($v1) @@ -223,11 +223,11 @@ glabel func_80218E88_66AC08 .L802191BC: /* 66AF3C 802191BC 8E020018 */ lw $v0, 0x18($s0) /* 66AF40 802191C0 14400018 */ bnez $v0, .L80219224 -/* 66AF44 802191C4 00000000 */ nop +/* 66AF44 802191C4 00000000 */ nop /* 66AF48 802191C8 82230210 */ lb $v1, 0x210($s1) /* 66AF4C 802191CC 2402000A */ addiu $v0, $zero, 0xa /* 66AF50 802191D0 10620005 */ beq $v1, $v0, .L802191E8 -/* 66AF54 802191D4 00000000 */ nop +/* 66AF54 802191D4 00000000 */ nop /* 66AF58 802191D8 3C013F80 */ lui $at, 0x3f80 /* 66AF5C 802191DC 44810000 */ mtc1 $at, $f0 /* 66AF60 802191E0 0808647F */ j .L802191FC @@ -236,7 +236,7 @@ glabel func_80218E88_66AC08 /* 66AF68 802191E8 3C013ECC */ lui $at, 0x3ecc /* 66AF6C 802191EC 3421CCCD */ ori $at, $at, 0xcccd /* 66AF70 802191F0 44810000 */ mtc1 $at, $f0 -/* 66AF74 802191F4 00000000 */ nop +/* 66AF74 802191F4 00000000 */ nop /* 66AF78 802191F8 E7A00010 */ swc1 $f0, 0x10($sp) .L802191FC: /* 66AF7C 802191FC 24040001 */ addiu $a0, $zero, 1 @@ -263,7 +263,7 @@ glabel func_80218E88_66AC08 .L80219248: /* 66AFC8 80219248 8E030014 */ lw $v1, 0x14($s0) /* 66AFCC 8021924C 10600005 */ beqz $v1, .L80219264 -/* 66AFD0 80219250 00000000 */ nop +/* 66AFD0 80219250 00000000 */ nop /* 66AFD4 80219254 8C620000 */ lw $v0, ($v1) /* 66AFD8 80219258 34420010 */ ori $v0, $v0, 0x10 /* 66AFDC 8021925C AC620000 */ sw $v0, ($v1) @@ -271,7 +271,7 @@ glabel func_80218E88_66AC08 .L80219264: /* 66AFE4 80219264 8E030018 */ lw $v1, 0x18($s0) /* 66AFE8 80219268 10600005 */ beqz $v1, .L80219280 -/* 66AFEC 8021926C 00000000 */ nop +/* 66AFEC 8021926C 00000000 */ nop /* 66AFF0 80219270 8C620000 */ lw $v0, ($v1) /* 66AFF4 80219274 34420010 */ ori $v0, $v0, 0x10 /* 66AFF8 80219278 AC620000 */ sw $v0, ($v1) @@ -286,7 +286,7 @@ glabel func_80218E88_66AC08 /* 66B018 80219298 0000102D */ daddu $v0, $zero, $zero /* 66B01C 8021929C 8E030014 */ lw $v1, 0x14($s0) /* 66B020 802192A0 10600005 */ beqz $v1, .L802192B8 -/* 66B024 802192A4 00000000 */ nop +/* 66B024 802192A4 00000000 */ nop /* 66B028 802192A8 8C620000 */ lw $v0, ($v1) /* 66B02C 802192AC 34420010 */ ori $v0, $v0, 0x10 /* 66B030 802192B0 AC620000 */ sw $v0, ($v1) @@ -294,7 +294,7 @@ glabel func_80218E88_66AC08 .L802192B8: /* 66B038 802192B8 8E030018 */ lw $v1, 0x18($s0) /* 66B03C 802192BC 10600005 */ beqz $v1, .L802192D4 -/* 66B040 802192C0 00000000 */ nop +/* 66B040 802192C0 00000000 */ nop /* 66B044 802192C4 8C620000 */ lw $v0, ($v1) /* 66B048 802192C8 34420010 */ ori $v0, $v0, 0x10 /* 66B04C 802192CC AC620000 */ sw $v0, ($v1) diff --git a/asm/nonmatchings/battle/area_pra3/669D80/func_80219304_66B084.s b/asm/nonmatchings/battle/area_pra3/669D80/func_80219304_66B084.s index 19ad21512d..88a92ebf16 100644 --- a/asm/nonmatchings/battle/area_pra3/669D80/func_80219304_66B084.s +++ b/asm/nonmatchings/battle/area_pra3/669D80/func_80219304_66B084.s @@ -16,7 +16,7 @@ glabel func_80219304_66B084 .L80219330: /* 66B0B0 80219330 8C830018 */ lw $v1, 0x18($a0) /* 66B0B4 80219334 10600004 */ beqz $v1, .L80219348 -/* 66B0B8 80219338 00000000 */ nop +/* 66B0B8 80219338 00000000 */ nop /* 66B0BC 8021933C 8C620000 */ lw $v0, ($v1) /* 66B0C0 80219340 34420010 */ ori $v0, $v0, 0x10 /* 66B0C4 80219344 AC620000 */ sw $v0, ($v1) diff --git a/asm/nonmatchings/battle/area_pra3/669D80/func_80219524_66B2A4.s b/asm/nonmatchings/battle/area_pra3/669D80/func_80219524_66B2A4.s index 16e493e052..c02066b00f 100644 --- a/asm/nonmatchings/battle/area_pra3/669D80/func_80219524_66B2A4.s +++ b/asm/nonmatchings/battle/area_pra3/669D80/func_80219524_66B2A4.s @@ -18,35 +18,44 @@ glabel func_80219524_66B2A4 /* 66B2D8 80219558 1040001E */ beqz $v0, .L802195D4 /* 66B2DC 8021955C 0000202D */ daddu $a0, $zero, $zero /* 66B2E0 80219560 00101080 */ sll $v0, $s0, 2 -/* 66B2E4 80219564 3C018023 */ lui $at, %hi(D_80232A20) +/* 66B2E4 80219564 3C018023 */ lui $at, %hi(jtbl_80232A20_6847A0) /* 66B2E8 80219568 00220821 */ addu $at, $at, $v0 -/* 66B2EC 8021956C 8C222A20 */ lw $v0, %lo(D_80232A20)($at) +/* 66B2EC 8021956C 8C222A20 */ lw $v0, %lo(jtbl_80232A20_6847A0)($at) /* 66B2F0 80219570 00400008 */ jr $v0 -/* 66B2F4 80219574 00000000 */ nop +/* 66B2F4 80219574 00000000 */ nop +glabel L80219578_66B2F8 /* 66B2F8 80219578 3C048022 */ lui $a0, %hi(D_8021D6E0) /* 66B2FC 8021957C 08086575 */ j .L802195D4 /* 66B300 80219580 2484D6E0 */ addiu $a0, $a0, %lo(D_8021D6E0) +glabel L80219584_66B304 /* 66B304 80219584 3C048022 */ lui $a0, %hi(D_8021F394) /* 66B308 80219588 08086575 */ j .L802195D4 /* 66B30C 8021958C 2484F394 */ addiu $a0, $a0, %lo(D_8021F394) +glabel L80219590_66B310 /* 66B310 80219590 3C048022 */ lui $a0, %hi(D_802205F4) /* 66B314 80219594 08086575 */ j .L802195D4 /* 66B318 80219598 248405F4 */ addiu $a0, $a0, %lo(D_802205F4) +glabel L8021959C_66B31C /* 66B31C 8021959C 3C048022 */ lui $a0, %hi(D_80221580) /* 66B320 802195A0 08086575 */ j .L802195D4 /* 66B324 802195A4 24841580 */ addiu $a0, $a0, %lo(D_80221580) +glabel L802195A8_66B328 /* 66B328 802195A8 3C048022 */ lui $a0, %hi(D_80222950) /* 66B32C 802195AC 08086575 */ j .L802195D4 /* 66B330 802195B0 24842950 */ addiu $a0, $a0, %lo(D_80222950) +glabel L802195B4_66B334 /* 66B334 802195B4 3C048022 */ lui $a0, %hi(D_8022384C) /* 66B338 802195B8 08086575 */ j .L802195D4 /* 66B33C 802195BC 2484384C */ addiu $a0, $a0, %lo(D_8022384C) +glabel L802195C0_66B340 /* 66B340 802195C0 3C048022 */ lui $a0, %hi(D_802251E4) /* 66B344 802195C4 08086575 */ j .L802195D4 /* 66B348 802195C8 248451E4 */ addiu $a0, $a0, %lo(D_802251E4) +glabel L802195CC_66B34C /* 66B34C 802195CC 3C048022 */ lui $a0, %hi(D_80226484) /* 66B350 802195D0 24846484 */ addiu $a0, $a0, %lo(D_80226484) .L802195D4: +glabel L802195D4_66B354 /* 66B354 802195D4 806301F1 */ lb $v1, 0x1f1($v1) /* 66B358 802195D8 AC830008 */ sw $v1, 8($a0) /* 66B35C 802195DC 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219830_66B5B0.s b/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219830_66B5B0.s index e7652c22ac..e61f483a72 100644 --- a/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219830_66B5B0.s +++ b/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219830_66B5B0.s @@ -69,12 +69,12 @@ glabel func_80219830_66B5B0 /* 66B6B0 80219930 82030210 */ lb $v1, 0x210($s0) /* 66B6B4 80219934 2402000A */ addiu $v0, $zero, 0xa /* 66B6B8 80219938 14620007 */ bne $v1, $v0, .L80219958 -/* 66B6BC 8021993C 00000000 */ nop +/* 66B6BC 8021993C 00000000 */ nop /* 66B6C0 80219940 8C82000C */ lw $v0, 0xc($a0) /* 66B6C4 80219944 3C013ECC */ lui $at, 0x3ecc /* 66B6C8 80219948 3421CCCD */ ori $at, $at, 0xcccd /* 66B6CC 8021994C 44810000 */ mtc1 $at, $f0 -/* 66B6D0 80219950 00000000 */ nop +/* 66B6D0 80219950 00000000 */ nop /* 66B6D4 80219954 E4400028 */ swc1 $f0, 0x28($v0) .L80219958: /* 66B6D8 80219958 8FBF0028 */ lw $ra, 0x28($sp) diff --git a/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219AD8_66B858.s b/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219AD8_66B858.s index c749d35f28..9102b672b2 100644 --- a/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219AD8_66B858.s +++ b/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219AD8_66B858.s @@ -14,11 +14,11 @@ glabel func_80219AD8_66B858 /* 66B87C 80219AFC 0040202D */ daddu $a0, $v0, $zero /* 66B880 80219B00 2402FF81 */ addiu $v0, $zero, -0x7f /* 66B884 80219B04 14820002 */ bne $a0, $v0, .L80219B10 -/* 66B888 80219B08 00000000 */ nop +/* 66B888 80219B08 00000000 */ nop /* 66B88C 80219B0C 8E240148 */ lw $a0, 0x148($s1) .L80219B10: /* 66B890 80219B10 0C09A75B */ jal get_actor -/* 66B894 80219B14 00000000 */ nop +/* 66B894 80219B14 00000000 */ nop /* 66B898 80219B18 0040202D */ daddu $a0, $v0, $zero /* 66B89C 80219B1C 90830136 */ lbu $v1, 0x136($a0) /* 66B8A0 80219B20 24020047 */ addiu $v0, $zero, 0x47 @@ -49,11 +49,11 @@ glabel func_80219AD8_66B858 /* 66B8F8 80219B78 0000302D */ daddu $a2, $zero, $zero .L80219B7C: /* 66B8FC 80219B7C 0C0B2026 */ jal set_variable -/* 66B900 80219B80 00000000 */ nop +/* 66B900 80219B80 00000000 */ nop /* 66B904 80219B84 8FBF0018 */ lw $ra, 0x18($sp) /* 66B908 80219B88 8FB10014 */ lw $s1, 0x14($sp) /* 66B90C 80219B8C 8FB00010 */ lw $s0, 0x10($sp) /* 66B910 80219B90 24020002 */ addiu $v0, $zero, 2 /* 66B914 80219B94 03E00008 */ jr $ra /* 66B918 80219B98 27BD0020 */ addiu $sp, $sp, 0x20 -/* 66B91C 80219B9C 00000000 */ nop +/* 66B91C 80219B9C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219BA0_66B920.s b/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219BA0_66B920.s index 27ebdcaf41..c0458bf4bd 100644 --- a/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219BA0_66B920.s +++ b/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219BA0_66B920.s @@ -69,12 +69,12 @@ glabel func_80219BA0_66B920 /* 66BA20 80219CA0 82030210 */ lb $v1, 0x210($s0) /* 66BA24 80219CA4 2402000A */ addiu $v0, $zero, 0xa /* 66BA28 80219CA8 14620007 */ bne $v1, $v0, .L80219CC8 -/* 66BA2C 80219CAC 00000000 */ nop +/* 66BA2C 80219CAC 00000000 */ nop /* 66BA30 80219CB0 8C82000C */ lw $v0, 0xc($a0) /* 66BA34 80219CB4 3C013ECC */ lui $at, 0x3ecc /* 66BA38 80219CB8 3421CCCD */ ori $at, $at, 0xcccd /* 66BA3C 80219CBC 44810000 */ mtc1 $at, $f0 -/* 66BA40 80219CC0 00000000 */ nop +/* 66BA40 80219CC0 00000000 */ nop /* 66BA44 80219CC4 E4400028 */ swc1 $f0, 0x28($v0) .L80219CC8: /* 66BA48 80219CC8 8FBF0028 */ lw $ra, 0x28($sp) diff --git a/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219E48_66BBC8.s b/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219E48_66BBC8.s index a0a1bb397c..7a9a1c0c2f 100644 --- a/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219E48_66BBC8.s +++ b/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219E48_66BBC8.s @@ -14,11 +14,11 @@ glabel func_80219E48_66BBC8 /* 66BBEC 80219E6C 0040202D */ daddu $a0, $v0, $zero /* 66BBF0 80219E70 2402FF81 */ addiu $v0, $zero, -0x7f /* 66BBF4 80219E74 14820002 */ bne $a0, $v0, .L80219E80 -/* 66BBF8 80219E78 00000000 */ nop +/* 66BBF8 80219E78 00000000 */ nop /* 66BBFC 80219E7C 8E240148 */ lw $a0, 0x148($s1) .L80219E80: /* 66BC00 80219E80 0C09A75B */ jal get_actor -/* 66BC04 80219E84 00000000 */ nop +/* 66BC04 80219E84 00000000 */ nop /* 66BC08 80219E88 0040202D */ daddu $a0, $v0, $zero /* 66BC0C 80219E8C 90830136 */ lbu $v1, 0x136($a0) /* 66BC10 80219E90 24020047 */ addiu $v0, $zero, 0x47 @@ -49,11 +49,11 @@ glabel func_80219E48_66BBC8 /* 66BC68 80219EE8 0000302D */ daddu $a2, $zero, $zero .L80219EEC: /* 66BC6C 80219EEC 0C0B2026 */ jal set_variable -/* 66BC70 80219EF0 00000000 */ nop +/* 66BC70 80219EF0 00000000 */ nop /* 66BC74 80219EF4 8FBF0018 */ lw $ra, 0x18($sp) /* 66BC78 80219EF8 8FB10014 */ lw $s1, 0x14($sp) /* 66BC7C 80219EFC 8FB00010 */ lw $s0, 0x10($sp) /* 66BC80 80219F00 24020002 */ addiu $v0, $zero, 2 /* 66BC84 80219F04 03E00008 */ jr $ra /* 66BC88 80219F08 27BD0020 */ addiu $sp, $sp, 0x20 -/* 66BC8C 80219F0C 00000000 */ nop +/* 66BC8C 80219F0C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_sam/623BA0/func_80218000_623BA0.s b/asm/nonmatchings/battle/area_sam/623BA0/func_80218000_623BA0.s index afeea5085e..d6e690dacf 100644 --- a/asm/nonmatchings/battle/area_sam/623BA0/func_80218000_623BA0.s +++ b/asm/nonmatchings/battle/area_sam/623BA0/func_80218000_623BA0.s @@ -40,7 +40,7 @@ glabel func_80218000_623BA0 .L8021808C: /* 623C2C 8021808C 8E820070 */ lw $v0, 0x70($s4) /* 623C30 80218090 144000F7 */ bnez $v0, .L80218470 -/* 623C34 80218094 00000000 */ nop +/* 623C34 80218094 00000000 */ nop /* 623C38 80218098 C6600144 */ lwc1 $f0, 0x144($s3) /* 623C3C 8021809C C638000C */ lwc1 $f24, 0xc($s1) /* 623C40 802180A0 C63A0014 */ lwc1 $f26, 0x14($s1) @@ -70,29 +70,29 @@ glabel func_80218000_623BA0 /* 623CA0 80218100 46002003 */ div.s $f0, $f4, $f0 /* 623CA4 80218104 4600028D */ trunc.w.s $f10, $f0 /* 623CA8 80218108 44035000 */ mfc1 $v1, $f10 -/* 623CAC 8021810C 00000000 */ nop +/* 623CAC 8021810C 00000000 */ nop /* 623CB0 80218110 00031400 */ sll $v0, $v1, 0x10 /* 623CB4 80218114 00021403 */ sra $v0, $v0, 0x10 /* 623CB8 80218118 44820000 */ mtc1 $v0, $f0 -/* 623CBC 8021811C 00000000 */ nop +/* 623CBC 8021811C 00000000 */ nop /* 623CC0 80218120 46800020 */ cvt.s.w $f0, $f0 /* 623CC4 80218124 46020002 */ mul.s $f0, $f0, $f2 -/* 623CC8 80218128 00000000 */ nop +/* 623CC8 80218128 00000000 */ nop /* 623CCC 8021812C 46002086 */ mov.s $f2, $f4 /* 623CD0 80218130 A6230064 */ sh $v1, 0x64($s1) /* 623CD4 80218134 0808605C */ j .L80218170 /* 623CD8 80218138 46001201 */ sub.s $f8, $f2, $f0 .L8021813C: /* 623CDC 8021813C 44821000 */ mtc1 $v0, $f2 -/* 623CE0 80218140 00000000 */ nop +/* 623CE0 80218140 00000000 */ nop /* 623CE4 80218144 468010A0 */ cvt.s.w $f2, $f2 /* 623CE8 80218148 86220064 */ lh $v0, 0x64($s1) /* 623CEC 8021814C 46022083 */ div.s $f2, $f4, $f2 /* 623CF0 80218150 44820000 */ mtc1 $v0, $f0 -/* 623CF4 80218154 00000000 */ nop +/* 623CF4 80218154 00000000 */ nop /* 623CF8 80218158 46800020 */ cvt.s.w $f0, $f0 /* 623CFC 8021815C 46020002 */ mul.s $f0, $f0, $f2 -/* 623D00 80218160 00000000 */ nop +/* 623D00 80218160 00000000 */ nop /* 623D04 80218164 C624004C */ lwc1 $f4, 0x4c($s1) /* 623D08 80218168 E6220040 */ swc1 $f2, 0x40($s1) /* 623D0C 8021816C 46002201 */ sub.s $f8, $f4, $f0 @@ -107,13 +107,13 @@ glabel func_80218000_623BA0 /* 623D2C 8021818C 44810000 */ mtc1 $at, $f0 /* 623D30 80218190 C6240000 */ lwc1 $f4, ($s1) /* 623D34 80218194 44823000 */ mtc1 $v0, $f6 -/* 623D38 80218198 00000000 */ nop +/* 623D38 80218198 00000000 */ nop /* 623D3C 8021819C 468031A0 */ cvt.s.w $f6, $f6 /* 623D40 802181A0 46060003 */ div.s $f0, $f0, $f6 /* 623D44 802181A4 46041081 */ sub.s $f2, $f2, $f4 /* 623D48 802181A8 E620003C */ swc1 $f0, 0x3c($s1) /* 623D4C 802181AC 44830000 */ mtc1 $v1, $f0 -/* 623D50 802181B0 00000000 */ nop +/* 623D50 802181B0 00000000 */ nop /* 623D54 802181B4 46800020 */ cvt.s.w $f0, $f0 /* 623D58 802181B8 46001083 */ div.s $f2, $f2, $f0 /* 623D5C 802181BC C6200010 */ lwc1 $f0, 0x10($s1) @@ -147,7 +147,7 @@ glabel func_80218000_623BA0 /* 623DC8 80218228 14410004 */ bne $v0, $at, .L8021823C /* 623DCC 8021822C 3C018000 */ lui $at, 0x8000 /* 623DD0 80218230 14610002 */ bne $v1, $at, .L8021823C -/* 623DD4 80218234 00000000 */ nop +/* 623DD4 80218234 00000000 */ nop /* 623DD8 80218238 0006000D */ break 6 .L8021823C: /* 623DDC 8021823C 00001812 */ mflo $v1 @@ -172,7 +172,7 @@ glabel func_80218000_623BA0 /* 623E28 80218288 44811000 */ mtc1 $at, $f2 /* 623E2C 8021828C 46200220 */ cvt.s.d $f8, $f0 /* 623E30 80218290 44830000 */ mtc1 $v1, $f0 -/* 623E34 80218294 00000000 */ nop +/* 623E34 80218294 00000000 */ nop /* 623E38 80218298 46800020 */ cvt.s.w $f0, $f0 /* 623E3C 8021829C 86230066 */ lh $v1, 0x66($s1) /* 623E40 802182A0 24020002 */ addiu $v0, $zero, 2 @@ -184,7 +184,7 @@ glabel func_80218000_623BA0 /* 623E58 802182B8 D42212D8 */ ldc1 $f2, %lo(D_802312D8)($at) /* 623E5C 802182BC 46004021 */ cvt.d.s $f0, $f8 /* 623E60 802182C0 46220002 */ mul.d $f0, $f0, $f2 -/* 623E64 802182C4 00000000 */ nop +/* 623E64 802182C4 00000000 */ nop /* 623E68 802182C8 46200020 */ cvt.s.d $f0, $f0 /* 623E6C 802182CC E6200050 */ swc1 $f0, 0x50($s1) .L802182D0: @@ -196,7 +196,7 @@ glabel func_80218000_623BA0 /* 623E84 802182E4 C636003C */ lwc1 $f22, 0x3c($s1) /* 623E88 802182E8 AE200018 */ sw $zero, 0x18($s1) /* 623E8C 802182EC 46006302 */ mul.s $f12, $f12, $f0 -/* 623E90 802182F0 00000000 */ nop +/* 623E90 802182F0 00000000 */ nop /* 623E94 802182F4 AE20001C */ sw $zero, 0x1c($s1) /* 623E98 802182F8 4600A521 */ cvt.d.s $f20, $f20 /* 623E9C 802182FC 3C0143B4 */ lui $at, 0x43b4 @@ -219,7 +219,7 @@ glabel func_80218000_623BA0 /* 623ED8 80218338 14410004 */ bne $v0, $at, .L8021834C /* 623EDC 8021833C 3C018000 */ lui $at, 0x8000 /* 623EE0 80218340 14610002 */ bne $v1, $at, .L8021834C -/* 623EE4 80218344 00000000 */ nop +/* 623EE4 80218344 00000000 */ nop /* 623EE8 80218348 0006000D */ break 6 .L8021834C: /* 623EEC 8021834C 00001812 */ mflo $v1 @@ -244,7 +244,7 @@ glabel func_80218000_623BA0 /* 623F38 80218398 44811000 */ mtc1 $at, $f2 /* 623F3C 8021839C 46200220 */ cvt.s.d $f8, $f0 /* 623F40 802183A0 44830000 */ mtc1 $v1, $f0 -/* 623F44 802183A4 00000000 */ nop +/* 623F44 802183A4 00000000 */ nop /* 623F48 802183A8 46800020 */ cvt.s.w $f0, $f0 /* 623F4C 802183AC 86230066 */ lh $v1, 0x66($s1) /* 623F50 802183B0 24020004 */ addiu $v0, $zero, 4 @@ -257,7 +257,7 @@ glabel func_80218000_623BA0 /* 623F6C 802183CC 44801000 */ mtc1 $zero, $f2 /* 623F70 802183D0 46004021 */ cvt.d.s $f0, $f8 /* 623F74 802183D4 46220002 */ mul.d $f0, $f0, $f2 -/* 623F78 802183D8 00000000 */ nop +/* 623F78 802183D8 00000000 */ nop /* 623F7C 802183DC 46200020 */ cvt.s.d $f0, $f0 /* 623F80 802183E0 E6200050 */ swc1 $f0, 0x50($s1) .L802183E4: @@ -269,7 +269,7 @@ glabel func_80218000_623BA0 /* 623F98 802183F8 C636003C */ lwc1 $f22, 0x3c($s1) /* 623F9C 802183FC AE200018 */ sw $zero, 0x18($s1) /* 623FA0 80218400 46006302 */ mul.s $f12, $f12, $f0 -/* 623FA4 80218404 00000000 */ nop +/* 623FA4 80218404 00000000 */ nop /* 623FA8 80218408 AE20001C */ sw $zero, 0x1c($s1) /* 623FAC 8021840C 4600A521 */ cvt.d.s $f20, $f20 /* 623FB0 80218410 3C0143B4 */ lui $at, 0x43b4 @@ -282,9 +282,9 @@ glabel func_80218000_623BA0 /* 623FCC 8021842C 46000021 */ cvt.d.s $f0, $f0 .L80218430: /* 623FD0 80218430 46220002 */ mul.d $f0, $f0, $f2 -/* 623FD4 80218434 00000000 */ nop +/* 623FD4 80218434 00000000 */ nop /* 623FD8 80218438 46360002 */ mul.d $f0, $f0, $f22 -/* 623FDC 8021843C 00000000 */ nop +/* 623FDC 8021843C 00000000 */ nop /* 623FE0 80218440 46360000 */ add.d $f0, $f0, $f22 /* 623FE4 80218444 4620A500 */ add.d $f20, $f20, $f0 /* 623FE8 80218448 4620A520 */ cvt.s.d $f20, $f20 @@ -308,21 +308,21 @@ glabel func_80218000_623BA0 /* 62402C 8021848C 10620008 */ beq $v1, $v0, .L802184B0 /* 624030 80218490 0000102D */ daddu $v0, $zero, $zero /* 624034 80218494 08086218 */ j .L80218860 -/* 624038 80218498 00000000 */ nop +/* 624038 80218498 00000000 */ nop .L8021849C: /* 62403C 8021849C 24020003 */ addiu $v0, $zero, 3 /* 624040 802184A0 106200BA */ beq $v1, $v0, .L8021878C /* 624044 802184A4 0000102D */ daddu $v0, $zero, $zero /* 624048 802184A8 08086218 */ j .L80218860 -/* 62404C 802184AC 00000000 */ nop +/* 62404C 802184AC 00000000 */ nop .L802184B0: /* 624050 802184B0 C6220044 */ lwc1 $f2, 0x44($s1) /* 624054 802184B4 3C013FC9 */ lui $at, 0x3fc9 /* 624058 802184B8 34210FD0 */ ori $at, $at, 0xfd0 /* 62405C 802184BC 44810000 */ mtc1 $at, $f0 -/* 624060 802184C0 00000000 */ nop +/* 624060 802184C0 00000000 */ nop /* 624064 802184C4 4602003C */ c.lt.s $f0, $f2 -/* 624068 802184C8 00000000 */ nop +/* 624068 802184C8 00000000 */ nop /* 62406C 802184CC 45000004 */ bc1f .L802184E0 /* 624070 802184D0 2404FF81 */ addiu $a0, $zero, -0x7f /* 624074 802184D4 8E26005C */ lw $a2, 0x5c($s1) @@ -351,7 +351,7 @@ glabel func_80218000_623BA0 /* 6240CC 8021852C C62C0044 */ lwc1 $f12, 0x44($s1) /* 6240D0 80218530 C6220050 */ lwc1 $f2, 0x50($s1) /* 6240D4 80218534 46001082 */ mul.s $f2, $f2, $f0 -/* 6240D8 80218538 00000000 */ nop +/* 6240D8 80218538 00000000 */ nop /* 6240DC 8021853C C6200004 */ lwc1 $f0, 4($s1) /* 6240E0 80218540 46020000 */ add.s $f0, $f0, $f2 /* 6240E4 80218544 E6600148 */ swc1 $f0, 0x148($s3) @@ -360,7 +360,7 @@ glabel func_80218000_623BA0 /* 6240F0 80218550 C6220010 */ lwc1 $f2, 0x10($s1) /* 6240F4 80218554 C6600148 */ lwc1 $f0, 0x148($s3) /* 6240F8 80218558 4602003C */ c.lt.s $f0, $f2 -/* 6240FC 8021855C 00000000 */ nop +/* 6240FC 8021855C 00000000 */ nop /* 624100 80218560 45000007 */ bc1f .L80218580 /* 624104 80218564 4600B306 */ mov.s $f12, $f22 /* 624108 80218568 86220064 */ lh $v0, 0x64($s1) @@ -389,7 +389,7 @@ glabel func_80218000_623BA0 /* 62415C 802185BC 44810000 */ mtc1 $at, $f0 /* 624160 802185C0 C6340044 */ lwc1 $f20, 0x44($s1) /* 624164 802185C4 46006302 */ mul.s $f12, $f12, $f0 -/* 624168 802185C8 00000000 */ nop +/* 624168 802185C8 00000000 */ nop /* 62416C 802185CC C636003C */ lwc1 $f22, 0x3c($s1) /* 624170 802185D0 4600A521 */ cvt.d.s $f20, $f20 /* 624174 802185D4 3C0143B4 */ lui $at, 0x43b4 @@ -408,7 +408,7 @@ glabel func_80218000_623BA0 /* 6241A4 80218604 44810000 */ mtc1 $at, $f0 /* 6241A8 80218608 C6340044 */ lwc1 $f20, 0x44($s1) /* 6241AC 8021860C 46006302 */ mul.s $f12, $f12, $f0 -/* 6241B0 80218610 00000000 */ nop +/* 6241B0 80218610 00000000 */ nop /* 6241B4 80218614 C636003C */ lwc1 $f22, 0x3c($s1) /* 6241B8 80218618 4600A521 */ cvt.d.s $f20, $f20 /* 6241BC 8021861C 3C0143B4 */ lui $at, 0x43b4 @@ -421,9 +421,9 @@ glabel func_80218000_623BA0 /* 6241D8 80218638 46000021 */ cvt.d.s $f0, $f0 .L8021863C: /* 6241DC 8021863C 46220002 */ mul.d $f0, $f0, $f2 -/* 6241E0 80218640 00000000 */ nop +/* 6241E0 80218640 00000000 */ nop /* 6241E4 80218644 46360002 */ mul.d $f0, $f0, $f22 -/* 6241E8 80218648 00000000 */ nop +/* 6241E8 80218648 00000000 */ nop /* 6241EC 8021864C 46360000 */ add.d $f0, $f0, $f22 /* 6241F0 80218650 4620A500 */ add.d $f20, $f20, $f0 /* 6241F4 80218654 4620A520 */ cvt.s.d $f20, $f20 @@ -469,7 +469,7 @@ glabel func_80218000_623BA0 /* 62428C 802186EC 14410004 */ bne $v0, $at, .L80218700 /* 624290 802186F0 3C018000 */ lui $at, 0x8000 /* 624294 802186F4 14610002 */ bne $v1, $at, .L80218700 -/* 624298 802186F8 00000000 */ nop +/* 624298 802186F8 00000000 */ nop /* 62429C 802186FC 0006000D */ break 6 .L80218700: /* 6242A0 80218700 00001812 */ mflo $v1 @@ -496,7 +496,7 @@ glabel func_80218000_623BA0 /* 6242F4 80218754 46200020 */ cvt.s.d $f0, $f0 /* 6242F8 80218758 E6200050 */ swc1 $f0, 0x50($s1) /* 6242FC 8021875C 44830000 */ mtc1 $v1, $f0 -/* 624300 80218760 00000000 */ nop +/* 624300 80218760 00000000 */ nop /* 624304 80218764 46800020 */ cvt.s.w $f0, $f0 /* 624308 80218768 E6200028 */ swc1 $f0, 0x28($s1) /* 62430C 8021876C C6600144 */ lwc1 $f0, 0x144($s3) @@ -512,9 +512,9 @@ glabel func_80218000_623BA0 /* 624330 80218790 3C0140C9 */ lui $at, 0x40c9 /* 624334 80218794 34210FD0 */ ori $at, $at, 0xfd0 /* 624338 80218798 4481B000 */ mtc1 $at, $f22 -/* 62433C 8021879C 00000000 */ nop +/* 62433C 8021879C 00000000 */ nop /* 624340 802187A0 46166302 */ mul.s $f12, $f12, $f22 -/* 624344 802187A4 00000000 */ nop +/* 624344 802187A4 00000000 */ nop /* 624348 802187A8 C6340000 */ lwc1 $f20, ($s1) /* 62434C 802187AC 3C0143B4 */ lui $at, 0x43b4 /* 624350 802187B0 4481C000 */ mtc1 $at, $f24 @@ -523,10 +523,10 @@ glabel func_80218000_623BA0 /* 62435C 802187BC 46186303 */ div.s $f12, $f12, $f24 /* 624360 802187C0 C6220050 */ lwc1 $f2, 0x50($s1) /* 624364 802187C4 46001082 */ mul.s $f2, $f2, $f0 -/* 624368 802187C8 00000000 */ nop +/* 624368 802187C8 00000000 */ nop /* 62436C 802187CC C62C0024 */ lwc1 $f12, 0x24($s1) /* 624370 802187D0 46166302 */ mul.s $f12, $f12, $f22 -/* 624374 802187D4 00000000 */ nop +/* 624374 802187D4 00000000 */ nop /* 624378 802187D8 3C018023 */ lui $at, %hi(D_80231310) /* 62437C 802187DC D4201310 */ ldc1 $f0, %lo(D_80231310)($at) /* 624380 802187E0 460010A1 */ cvt.d.s $f2, $f2 @@ -538,7 +538,7 @@ glabel func_80218000_623BA0 /* 624398 802187F8 E6340000 */ swc1 $f20, ($s1) /* 62439C 802187FC C6220050 */ lwc1 $f2, 0x50($s1) /* 6243A0 80218800 46001082 */ mul.s $f2, $f2, $f0 -/* 6243A4 80218804 00000000 */ nop +/* 6243A4 80218804 00000000 */ nop /* 6243A8 80218808 C62C0024 */ lwc1 $f12, 0x24($s1) /* 6243AC 8021880C C6200028 */ lwc1 $f0, 0x28($s1) /* 6243B0 80218810 46006300 */ add.s $f12, $f12, $f0 diff --git a/asm/nonmatchings/battle/area_sam/623BA0/func_80218890_624430.s b/asm/nonmatchings/battle/area_sam/623BA0/func_80218890_624430.s index e781f780a0..2c2b7ecaab 100644 --- a/asm/nonmatchings/battle/area_sam/623BA0/func_80218890_624430.s +++ b/asm/nonmatchings/battle/area_sam/623BA0/func_80218890_624430.s @@ -31,9 +31,9 @@ glabel func_80218890_624430 .L802188F4: /* 624494 802188F4 C6200050 */ lwc1 $f0, 0x50($s1) /* 624498 802188F8 4480A000 */ mtc1 $zero, $f20 -/* 62449C 802188FC 00000000 */ nop +/* 62449C 802188FC 00000000 */ nop /* 6244A0 80218900 4600A03C */ c.lt.s $f20, $f0 -/* 6244A4 80218904 00000000 */ nop +/* 6244A4 80218904 00000000 */ nop /* 6244A8 80218908 45000005 */ bc1f .L80218920 /* 6244AC 8021890C 2404FF81 */ addiu $a0, $zero, -0x7f /* 6244B0 80218910 8E260064 */ lw $a2, 0x64($s1) @@ -42,7 +42,7 @@ glabel func_80218890_624430 /* 6244BC 8021891C C6200050 */ lwc1 $f0, 0x50($s1) .L80218920: /* 6244C0 80218920 4614003C */ c.lt.s $f0, $f20 -/* 6244C4 80218924 00000000 */ nop +/* 6244C4 80218924 00000000 */ nop /* 6244C8 80218928 45000004 */ bc1f .L8021893C /* 6244CC 8021892C 2404FF81 */ addiu $a0, $zero, -0x7f /* 6244D0 80218930 8E260068 */ lw $a2, 0x68($s1) @@ -67,7 +67,7 @@ glabel func_80218890_624430 /* 624518 80218978 C6240148 */ lwc1 $f4, 0x148($s1) /* 62451C 8021897C E622014C */ swc1 $f2, 0x14c($s1) /* 624520 80218980 4614203C */ c.lt.s $f4, $f20 -/* 624524 80218984 00000000 */ nop +/* 624524 80218984 00000000 */ nop /* 624528 80218988 45010003 */ bc1t .L80218998 /* 62452C 8021898C E6200144 */ swc1 $f0, 0x144($s1) /* 624530 80218990 08086271 */ j .L802189C4 diff --git a/asm/nonmatchings/battle/area_sam/623BA0/func_802189E4_624584.s b/asm/nonmatchings/battle/area_sam/623BA0/func_802189E4_624584.s index 063665c749..2f3b5e82ec 100644 --- a/asm/nonmatchings/battle/area_sam/623BA0/func_802189E4_624584.s +++ b/asm/nonmatchings/battle/area_sam/623BA0/func_802189E4_624584.s @@ -14,7 +14,7 @@ glabel func_802189E4_624584 /* 6245A8 80218A08 8C820000 */ lw $v0, ($a0) /* 6245AC 80218A0C 30420800 */ andi $v0, $v0, 0x800 /* 6245B0 80218A10 1440000A */ bnez $v0, .L80218A3C -/* 6245B4 80218A14 00000000 */ nop +/* 6245B4 80218A14 00000000 */ nop /* 6245B8 80218A18 90820191 */ lbu $v0, 0x191($a0) /* 6245BC 80218A1C 8E030088 */ lw $v1, 0x88($s0) /* 6245C0 80218A20 00021042 */ srl $v0, $v0, 1 diff --git a/asm/nonmatchings/battle/area_sam/623BA0/func_80218AF4_624694.s b/asm/nonmatchings/battle/area_sam/623BA0/func_80218AF4_624694.s index aab18b8bac..693aa167fd 100644 --- a/asm/nonmatchings/battle/area_sam/623BA0/func_80218AF4_624694.s +++ b/asm/nonmatchings/battle/area_sam/623BA0/func_80218AF4_624694.s @@ -10,7 +10,7 @@ glabel func_80218AF4_624694 /* 6246A8 80218B08 8C43000C */ lw $v1, 0xc($v0) /* 6246AC 80218B0C 3C01C47A */ lui $at, 0xc47a /* 6246B0 80218B10 44810000 */ mtc1 $at, $f0 -/* 6246B4 80218B14 00000000 */ nop +/* 6246B4 80218B14 00000000 */ nop /* 6246B8 80218B18 E4600008 */ swc1 $f0, 8($v1) /* 6246BC 80218B1C 8FBF0010 */ lw $ra, 0x10($sp) /* 6246C0 80218B20 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/battle/area_sam/623BA0/func_80218B2C_6246CC.s b/asm/nonmatchings/battle/area_sam/623BA0/func_80218B2C_6246CC.s index b9aacee02f..4e0f79919d 100644 --- a/asm/nonmatchings/battle/area_sam/623BA0/func_80218B2C_6246CC.s +++ b/asm/nonmatchings/battle/area_sam/623BA0/func_80218B2C_6246CC.s @@ -11,7 +11,7 @@ glabel func_80218B2C_6246CC /* 6246E4 80218B44 8C82000C */ lw $v0, 0xc($a0) /* 6246E8 80218B48 3C014310 */ lui $at, 0x4310 /* 6246EC 80218B4C 44810000 */ mtc1 $at, $f0 -/* 6246F0 80218B50 00000000 */ nop +/* 6246F0 80218B50 00000000 */ nop /* 6246F4 80218B54 E4400008 */ swc1 $f0, 8($v0) /* 6246F8 80218B58 8C830000 */ lw $v1, ($a0) /* 6246FC 80218B5C 34630010 */ ori $v1, $v1, 0x10 diff --git a/asm/nonmatchings/battle/area_sam/623BA0/func_80218C40_6247E0.s b/asm/nonmatchings/battle/area_sam/623BA0/func_80218C40_6247E0.s index f335cf22c4..5580fe04ad 100644 --- a/asm/nonmatchings/battle/area_sam/623BA0/func_80218C40_6247E0.s +++ b/asm/nonmatchings/battle/area_sam/623BA0/func_80218C40_6247E0.s @@ -27,9 +27,9 @@ glabel func_80218C40_6247E0 /* 624834 80218C94 C622004C */ lwc1 $f2, 0x4c($s1) /* 624838 80218C98 3C014080 */ lui $at, 0x4080 /* 62483C 80218C9C 44810000 */ mtc1 $at, $f0 -/* 624840 80218CA0 00000000 */ nop +/* 624840 80218CA0 00000000 */ nop /* 624844 80218CA4 4600103C */ c.lt.s $f2, $f0 -/* 624848 80218CA8 00000000 */ nop +/* 624848 80218CA8 00000000 */ nop /* 62484C 80218CAC 45000007 */ bc1f .L80218CCC /* 624850 80218CB0 0000202D */ daddu $a0, $zero, $zero /* 624854 80218CB4 C6200054 */ lwc1 $f0, 0x54($s1) @@ -47,7 +47,7 @@ glabel func_80218C40_6247E0 /* 624880 80218CE0 24040001 */ addiu $a0, $zero, 1 .L80218CE4: /* 624884 80218CE4 0C0990BC */ jal play_movement_dust_effects -/* 624888 80218CE8 00000000 */ nop +/* 624888 80218CE8 00000000 */ nop /* 62488C 80218CEC C6400040 */ lwc1 $f0, 0x40($s2) /* 624890 80218CF0 3C013FF8 */ lui $at, 0x3ff8 /* 624894 80218CF4 44811800 */ mtc1 $at, $f3 @@ -68,7 +68,7 @@ glabel func_80218C40_6247E0 /* 6248D0 80218D30 44801000 */ mtc1 $zero, $f2 /* 6248D4 80218D34 46000021 */ cvt.d.s $f0, $f0 /* 6248D8 80218D38 4622003C */ c.lt.d $f0, $f2 -/* 6248DC 80218D3C 00000000 */ nop +/* 6248DC 80218D3C 00000000 */ nop /* 6248E0 80218D40 45010002 */ bc1t .L80218D4C /* 6248E4 80218D44 24020002 */ addiu $v0, $zero, 2 /* 6248E8 80218D48 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/battle/area_sam/623BA0/func_80218D64_624904.s b/asm/nonmatchings/battle/area_sam/623BA0/func_80218D64_624904.s index eeea8e65ba..604d2ae322 100644 --- a/asm/nonmatchings/battle/area_sam/623BA0/func_80218D64_624904.s +++ b/asm/nonmatchings/battle/area_sam/623BA0/func_80218D64_624904.s @@ -27,9 +27,9 @@ glabel func_80218D64_624904 /* 624958 80218DB8 C622004C */ lwc1 $f2, 0x4c($s1) /* 62495C 80218DBC 3C014080 */ lui $at, 0x4080 /* 624960 80218DC0 44810000 */ mtc1 $at, $f0 -/* 624964 80218DC4 00000000 */ nop +/* 624964 80218DC4 00000000 */ nop /* 624968 80218DC8 4600103C */ c.lt.s $f2, $f0 -/* 62496C 80218DCC 00000000 */ nop +/* 62496C 80218DCC 00000000 */ nop /* 624970 80218DD0 45000007 */ bc1f .L80218DF0 /* 624974 80218DD4 0000202D */ daddu $a0, $zero, $zero /* 624978 80218DD8 C6200054 */ lwc1 $f0, 0x54($s1) @@ -47,7 +47,7 @@ glabel func_80218D64_624904 /* 6249A4 80218E04 24040001 */ addiu $a0, $zero, 1 .L80218E08: /* 6249A8 80218E08 0C0990BC */ jal play_movement_dust_effects -/* 6249AC 80218E0C 00000000 */ nop +/* 6249AC 80218E0C 00000000 */ nop /* 6249B0 80218E10 C6400040 */ lwc1 $f0, 0x40($s2) /* 6249B4 80218E14 3C013FF8 */ lui $at, 0x3ff8 /* 6249B8 80218E18 44811800 */ mtc1 $at, $f3 @@ -68,7 +68,7 @@ glabel func_80218D64_624904 /* 6249F4 80218E54 44801000 */ mtc1 $zero, $f2 /* 6249F8 80218E58 46000021 */ cvt.d.s $f0, $f0 /* 6249FC 80218E5C 4622003C */ c.lt.d $f0, $f2 -/* 624A00 80218E60 00000000 */ nop +/* 624A00 80218E60 00000000 */ nop /* 624A04 80218E64 45010002 */ bc1t .L80218E70 /* 624A08 80218E68 24020002 */ addiu $v0, $zero, 2 /* 624A0C 80218E6C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/battle/area_sam/623BA0/func_80218E88_624A28.s b/asm/nonmatchings/battle/area_sam/623BA0/func_80218E88_624A28.s index 9cef96b154..e51a41e3a1 100644 --- a/asm/nonmatchings/battle/area_sam/623BA0/func_80218E88_624A28.s +++ b/asm/nonmatchings/battle/area_sam/623BA0/func_80218E88_624A28.s @@ -39,7 +39,7 @@ glabel func_80218E88_624A28 /* 624AAC 80218F0C 3C013ECC */ lui $at, 0x3ecc /* 624AB0 80218F10 3421CCCD */ ori $at, $at, 0xcccd /* 624AB4 80218F14 44810000 */ mtc1 $at, $f0 -/* 624AB8 80218F18 00000000 */ nop +/* 624AB8 80218F18 00000000 */ nop /* 624ABC 80218F1C E7A00010 */ swc1 $f0, 0x10($sp) .L80218F20: /* 624AC0 80218F20 24020005 */ addiu $v0, $zero, 5 @@ -64,7 +64,7 @@ glabel func_80218E88_624A28 /* 624B08 80218F68 3C013ECC */ lui $at, 0x3ecc /* 624B0C 80218F6C 3421CCCD */ ori $at, $at, 0xcccd /* 624B10 80218F70 44810000 */ mtc1 $at, $f0 -/* 624B14 80218F74 00000000 */ nop +/* 624B14 80218F74 00000000 */ nop /* 624B18 80218F78 E7A00010 */ swc1 $f0, 0x10($sp) .L80218F7C: /* 624B1C 80218F7C 24020005 */ addiu $v0, $zero, 5 @@ -90,11 +90,11 @@ glabel func_80218E88_624A28 /* 624B68 80218FC8 24020008 */ addiu $v0, $zero, 8 /* 624B6C 80218FCC 82230210 */ lb $v1, 0x210($s1) /* 624B70 80218FD0 1062000A */ beq $v1, $v0, .L80218FFC -/* 624B74 80218FD4 00000000 */ nop +/* 624B74 80218FD4 00000000 */ nop /* 624B78 80218FD8 8E020008 */ lw $v0, 8($s0) /* 624B7C 80218FDC 2442000F */ addiu $v0, $v0, 0xf /* 624B80 80218FE0 44826000 */ mtc1 $v0, $f12 -/* 624B84 80218FE4 00000000 */ nop +/* 624B84 80218FE4 00000000 */ nop /* 624B88 80218FE8 46806320 */ cvt.s.w $f12, $f12 /* 624B8C 80218FEC 0C00A6C9 */ jal clamp_angle /* 624B90 80218FF0 AE020008 */ sw $v0, 8($s0) @@ -107,36 +107,36 @@ glabel func_80218E88_624A28 /* 624BA8 80219008 C60C0008 */ lwc1 $f12, 8($s0) /* 624BAC 8021900C 46806320 */ cvt.s.w $f12, $f12 /* 624BB0 80219010 46006302 */ mul.s $f12, $f12, $f0 -/* 624BB4 80219014 00000000 */ nop +/* 624BB4 80219014 00000000 */ nop /* 624BB8 80219018 3C0143B4 */ lui $at, 0x43b4 /* 624BBC 8021901C 44810000 */ mtc1 $at, $f0 /* 624BC0 80219020 0C00A85B */ jal sin_rad /* 624BC4 80219024 46006303 */ div.s $f12, $f12, $f0 /* 624BC8 80219028 3C014040 */ lui $at, 0x4040 /* 624BCC 8021902C 44811000 */ mtc1 $at, $f2 -/* 624BD0 80219030 00000000 */ nop +/* 624BD0 80219030 00000000 */ nop /* 624BD4 80219034 46020002 */ mul.s $f0, $f0, $f2 -/* 624BD8 80219038 00000000 */ nop +/* 624BD8 80219038 00000000 */ nop /* 624BDC 8021903C 86220152 */ lh $v0, 0x152($s1) /* 624BE0 80219040 44821000 */ mtc1 $v0, $f2 -/* 624BE4 80219044 00000000 */ nop +/* 624BE4 80219044 00000000 */ nop /* 624BE8 80219048 468010A0 */ cvt.s.w $f2, $f2 /* 624BEC 8021904C 4600018D */ trunc.w.s $f6, $f0 /* 624BF0 80219050 44033000 */ mfc1 $v1, $f6 -/* 624BF4 80219054 00000000 */ nop +/* 624BF4 80219054 00000000 */ nop /* 624BF8 80219058 00031600 */ sll $v0, $v1, 0x18 /* 624BFC 8021905C C6200148 */ lwc1 $f0, 0x148($s1) /* 624C00 80219060 00021603 */ sra $v0, $v0, 0x18 /* 624C04 80219064 A223019A */ sb $v1, 0x19a($s1) /* 624C08 80219068 46020000 */ add.s $f0, $f0, $f2 /* 624C0C 8021906C 44821000 */ mtc1 $v0, $f2 -/* 624C10 80219070 00000000 */ nop +/* 624C10 80219070 00000000 */ nop /* 624C14 80219074 468010A0 */ cvt.s.w $f2, $f2 /* 624C18 80219078 86220150 */ lh $v0, 0x150($s1) /* 624C1C 8021907C 46020000 */ add.s $f0, $f0, $f2 /* 624C20 80219080 2403000A */ addiu $v1, $zero, 0xa /* 624C24 80219084 44821000 */ mtc1 $v0, $f2 -/* 624C28 80219088 00000000 */ nop +/* 624C28 80219088 00000000 */ nop /* 624C2C 8021908C 468010A0 */ cvt.s.w $f2, $f2 /* 624C30 80219090 46000121 */ cvt.d.s $f4, $f0 /* 624C34 80219094 C6200144 */ lwc1 $f0, 0x144($s1) @@ -149,14 +149,14 @@ glabel func_80218E88_624A28 /* 624C50 802190B0 3C014028 */ lui $at, 0x4028 /* 624C54 802190B4 44810800 */ mtc1 $at, $f1 /* 624C58 802190B8 44800000 */ mtc1 $zero, $f0 -/* 624C5C 802190BC 00000000 */ nop +/* 624C5C 802190BC 00000000 */ nop /* 624C60 802190C0 46202000 */ add.d $f0, $f4, $f0 .L802190C4: /* 624C64 802190C4 46200520 */ cvt.s.d $f20, $f0 /* 624C68 802190C8 86220154 */ lh $v0, 0x154($s1) /* 624C6C 802190CC C620014C */ lwc1 $f0, 0x14c($s1) /* 624C70 802190D0 44821000 */ mtc1 $v0, $f2 -/* 624C74 802190D4 00000000 */ nop +/* 624C74 802190D4 00000000 */ nop /* 624C78 802190D8 468010A0 */ cvt.s.w $f2, $f2 /* 624C7C 802190DC 8E02000C */ lw $v0, 0xc($s0) /* 624C80 802190E0 10400059 */ beqz $v0, .L80219248 @@ -165,16 +165,16 @@ glabel func_80218E88_624A28 /* 624C8C 802190EC 10600005 */ beqz $v1, .L80219104 /* 624C90 802190F0 24020001 */ addiu $v0, $zero, 1 /* 624C94 802190F4 1062002A */ beq $v1, $v0, .L802191A0 -/* 624C98 802190F8 00000000 */ nop +/* 624C98 802190F8 00000000 */ nop /* 624C9C 802190FC 080864A0 */ j .L80219280 -/* 624CA0 80219100 00000000 */ nop +/* 624CA0 80219100 00000000 */ nop .L80219104: /* 624CA4 80219104 8E020014 */ lw $v0, 0x14($s0) /* 624CA8 80219108 14400016 */ bnez $v0, .L80219164 /* 624CAC 8021910C 2402000A */ addiu $v0, $zero, 0xa /* 624CB0 80219110 82230210 */ lb $v1, 0x210($s1) /* 624CB4 80219114 10620005 */ beq $v1, $v0, .L8021912C -/* 624CB8 80219118 00000000 */ nop +/* 624CB8 80219118 00000000 */ nop /* 624CBC 8021911C 3C013F80 */ lui $at, 0x3f80 /* 624CC0 80219120 44810000 */ mtc1 $at, $f0 /* 624CC4 80219124 08086450 */ j .L80219140 @@ -183,7 +183,7 @@ glabel func_80218E88_624A28 /* 624CCC 8021912C 3C013ECC */ lui $at, 0x3ecc /* 624CD0 80219130 3421CCCD */ ori $at, $at, 0xcccd /* 624CD4 80219134 44810000 */ mtc1 $at, $f0 -/* 624CD8 80219138 00000000 */ nop +/* 624CD8 80219138 00000000 */ nop /* 624CDC 8021913C E7A00010 */ swc1 $f0, 0x10($sp) .L80219140: /* 624CE0 80219140 0000202D */ daddu $a0, $zero, $zero @@ -198,7 +198,7 @@ glabel func_80218E88_624A28 .L80219164: /* 624D04 80219164 8E030018 */ lw $v1, 0x18($s0) /* 624D08 80219168 10600005 */ beqz $v1, .L80219180 -/* 624D0C 8021916C 00000000 */ nop +/* 624D0C 8021916C 00000000 */ nop /* 624D10 80219170 8C620000 */ lw $v0, ($v1) /* 624D14 80219174 34420010 */ ori $v0, $v0, 0x10 /* 624D18 80219178 AC620000 */ sw $v0, ($v1) @@ -215,7 +215,7 @@ glabel func_80218E88_624A28 .L802191A0: /* 624D40 802191A0 8E030014 */ lw $v1, 0x14($s0) /* 624D44 802191A4 10600005 */ beqz $v1, .L802191BC -/* 624D48 802191A8 00000000 */ nop +/* 624D48 802191A8 00000000 */ nop /* 624D4C 802191AC 8C620000 */ lw $v0, ($v1) /* 624D50 802191B0 34420010 */ ori $v0, $v0, 0x10 /* 624D54 802191B4 AC620000 */ sw $v0, ($v1) @@ -223,11 +223,11 @@ glabel func_80218E88_624A28 .L802191BC: /* 624D5C 802191BC 8E020018 */ lw $v0, 0x18($s0) /* 624D60 802191C0 14400018 */ bnez $v0, .L80219224 -/* 624D64 802191C4 00000000 */ nop +/* 624D64 802191C4 00000000 */ nop /* 624D68 802191C8 82230210 */ lb $v1, 0x210($s1) /* 624D6C 802191CC 2402000A */ addiu $v0, $zero, 0xa /* 624D70 802191D0 10620005 */ beq $v1, $v0, .L802191E8 -/* 624D74 802191D4 00000000 */ nop +/* 624D74 802191D4 00000000 */ nop /* 624D78 802191D8 3C013F80 */ lui $at, 0x3f80 /* 624D7C 802191DC 44810000 */ mtc1 $at, $f0 /* 624D80 802191E0 0808647F */ j .L802191FC @@ -236,7 +236,7 @@ glabel func_80218E88_624A28 /* 624D88 802191E8 3C013ECC */ lui $at, 0x3ecc /* 624D8C 802191EC 3421CCCD */ ori $at, $at, 0xcccd /* 624D90 802191F0 44810000 */ mtc1 $at, $f0 -/* 624D94 802191F4 00000000 */ nop +/* 624D94 802191F4 00000000 */ nop /* 624D98 802191F8 E7A00010 */ swc1 $f0, 0x10($sp) .L802191FC: /* 624D9C 802191FC 24040001 */ addiu $a0, $zero, 1 @@ -263,7 +263,7 @@ glabel func_80218E88_624A28 .L80219248: /* 624DE8 80219248 8E030014 */ lw $v1, 0x14($s0) /* 624DEC 8021924C 10600005 */ beqz $v1, .L80219264 -/* 624DF0 80219250 00000000 */ nop +/* 624DF0 80219250 00000000 */ nop /* 624DF4 80219254 8C620000 */ lw $v0, ($v1) /* 624DF8 80219258 34420010 */ ori $v0, $v0, 0x10 /* 624DFC 8021925C AC620000 */ sw $v0, ($v1) @@ -271,7 +271,7 @@ glabel func_80218E88_624A28 .L80219264: /* 624E04 80219264 8E030018 */ lw $v1, 0x18($s0) /* 624E08 80219268 10600005 */ beqz $v1, .L80219280 -/* 624E0C 8021926C 00000000 */ nop +/* 624E0C 8021926C 00000000 */ nop /* 624E10 80219270 8C620000 */ lw $v0, ($v1) /* 624E14 80219274 34420010 */ ori $v0, $v0, 0x10 /* 624E18 80219278 AC620000 */ sw $v0, ($v1) @@ -286,7 +286,7 @@ glabel func_80218E88_624A28 /* 624E38 80219298 0000102D */ daddu $v0, $zero, $zero /* 624E3C 8021929C 8E030014 */ lw $v1, 0x14($s0) /* 624E40 802192A0 10600005 */ beqz $v1, .L802192B8 -/* 624E44 802192A4 00000000 */ nop +/* 624E44 802192A4 00000000 */ nop /* 624E48 802192A8 8C620000 */ lw $v0, ($v1) /* 624E4C 802192AC 34420010 */ ori $v0, $v0, 0x10 /* 624E50 802192B0 AC620000 */ sw $v0, ($v1) @@ -294,7 +294,7 @@ glabel func_80218E88_624A28 .L802192B8: /* 624E58 802192B8 8E030018 */ lw $v1, 0x18($s0) /* 624E5C 802192BC 10600005 */ beqz $v1, .L802192D4 -/* 624E60 802192C0 00000000 */ nop +/* 624E60 802192C0 00000000 */ nop /* 624E64 802192C4 8C620000 */ lw $v0, ($v1) /* 624E68 802192C8 34420010 */ ori $v0, $v0, 0x10 /* 624E6C 802192CC AC620000 */ sw $v0, ($v1) diff --git a/asm/nonmatchings/battle/area_sam/623BA0/func_80219304_624EA4.s b/asm/nonmatchings/battle/area_sam/623BA0/func_80219304_624EA4.s index 8fa98bc9a2..0ded521e5c 100644 --- a/asm/nonmatchings/battle/area_sam/623BA0/func_80219304_624EA4.s +++ b/asm/nonmatchings/battle/area_sam/623BA0/func_80219304_624EA4.s @@ -16,7 +16,7 @@ glabel func_80219304_624EA4 .L80219330: /* 624ED0 80219330 8C830018 */ lw $v1, 0x18($a0) /* 624ED4 80219334 10600004 */ beqz $v1, .L80219348 -/* 624ED8 80219338 00000000 */ nop +/* 624ED8 80219338 00000000 */ nop /* 624EDC 8021933C 8C620000 */ lw $v0, ($v1) /* 624EE0 80219340 34420010 */ ori $v0, $v0, 0x10 /* 624EE4 80219344 AC620000 */ sw $v0, ($v1) diff --git a/asm/nonmatchings/battle/area_sam/623BA0/func_80219524_6250C4.s b/asm/nonmatchings/battle/area_sam/623BA0/func_80219524_6250C4.s index 0290080efa..0a054dd66e 100644 --- a/asm/nonmatchings/battle/area_sam/623BA0/func_80219524_6250C4.s +++ b/asm/nonmatchings/battle/area_sam/623BA0/func_80219524_6250C4.s @@ -18,35 +18,44 @@ glabel func_80219524_6250C4 /* 6250F8 80219558 1040001E */ beqz $v0, .L802195D4 /* 6250FC 8021955C 0000202D */ daddu $a0, $zero, $zero /* 625100 80219560 00101080 */ sll $v0, $s0, 2 -/* 625104 80219564 3C018023 */ lui $at, %hi(D_80231320) +/* 625104 80219564 3C018023 */ lui $at, %hi(jtbl_80231320_63CEC0) /* 625108 80219568 00220821 */ addu $at, $at, $v0 -/* 62510C 8021956C 8C221320 */ lw $v0, %lo(D_80231320)($at) +/* 62510C 8021956C 8C221320 */ lw $v0, %lo(jtbl_80231320_63CEC0)($at) /* 625110 80219570 00400008 */ jr $v0 -/* 625114 80219574 00000000 */ nop +/* 625114 80219574 00000000 */ nop +glabel L80219578_625118 /* 625118 80219578 3C048022 */ lui $a0, %hi(D_8021E660) /* 62511C 8021957C 08086575 */ j .L802195D4 /* 625120 80219580 2484E660 */ addiu $a0, $a0, %lo(D_8021E660) +glabel L80219584_625124 /* 625124 80219584 3C048022 */ lui $a0, %hi(D_80220314) /* 625128 80219588 08086575 */ j .L802195D4 /* 62512C 8021958C 24840314 */ addiu $a0, $a0, %lo(D_80220314) +glabel L80219590_625130 /* 625130 80219590 3C048022 */ lui $a0, %hi(D_80221574) /* 625134 80219594 08086575 */ j .L802195D4 /* 625138 80219598 24841574 */ addiu $a0, $a0, %lo(D_80221574) +glabel L8021959C_62513C /* 62513C 8021959C 3C048022 */ lui $a0, %hi(D_80222500) /* 625140 802195A0 08086575 */ j .L802195D4 /* 625144 802195A4 24842500 */ addiu $a0, $a0, %lo(D_80222500) +glabel L802195A8_625148 /* 625148 802195A8 3C048022 */ lui $a0, %hi(D_802238D0) /* 62514C 802195AC 08086575 */ j .L802195D4 /* 625150 802195B0 248438D0 */ addiu $a0, $a0, %lo(D_802238D0) +glabel L802195B4_625154 /* 625154 802195B4 3C048022 */ lui $a0, %hi(D_802247CC) /* 625158 802195B8 08086575 */ j .L802195D4 /* 62515C 802195BC 248447CC */ addiu $a0, $a0, %lo(D_802247CC) +glabel L802195C0_625160 /* 625160 802195C0 3C048022 */ lui $a0, %hi(D_80226164) /* 625164 802195C4 08086575 */ j .L802195D4 /* 625168 802195C8 24846164 */ addiu $a0, $a0, %lo(D_80226164) +glabel L802195CC_62516C /* 62516C 802195CC 3C048022 */ lui $a0, %hi(D_80227404) /* 625170 802195D0 24847404 */ addiu $a0, $a0, %lo(D_80227404) .L802195D4: +glabel L802195D4_625174 /* 625174 802195D4 806301F1 */ lb $v1, 0x1f1($v1) /* 625178 802195D8 AC830008 */ sw $v1, 8($a0) /* 62517C 802195DC 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_sam/623BA0/func_802196BC_62525C.s b/asm/nonmatchings/battle/area_sam/623BA0/func_802196BC_62525C.s index ac9d1932df..f23feaaa70 100644 --- a/asm/nonmatchings/battle/area_sam/623BA0/func_802196BC_62525C.s +++ b/asm/nonmatchings/battle/area_sam/623BA0/func_802196BC_62525C.s @@ -57,15 +57,15 @@ glabel func_802196BC_62525C /* 62532C 8021978C 0040882D */ daddu $s1, $v0, $zero /* 625330 80219790 24040001 */ addiu $a0, $zero, 1 /* 625334 80219794 44961000 */ mtc1 $s6, $f2 -/* 625338 80219798 00000000 */ nop +/* 625338 80219798 00000000 */ nop /* 62533C 8021979C 468010A0 */ cvt.s.w $f2, $f2 /* 625340 802197A0 44051000 */ mfc1 $a1, $f2 /* 625344 802197A4 44951000 */ mtc1 $s5, $f2 -/* 625348 802197A8 00000000 */ nop +/* 625348 802197A8 00000000 */ nop /* 62534C 802197AC 468010A0 */ cvt.s.w $f2, $f2 /* 625350 802197B0 44061000 */ mfc1 $a2, $f2 /* 625354 802197B4 44941000 */ mtc1 $s4, $f2 -/* 625358 802197B8 00000000 */ nop +/* 625358 802197B8 00000000 */ nop /* 62535C 802197BC 468010A0 */ cvt.s.w $f2, $f2 /* 625360 802197C0 44071000 */ mfc1 $a3, $f2 /* 625364 802197C4 0040802D */ daddu $s0, $v0, $zero @@ -97,5 +97,5 @@ glabel func_802196BC_62525C /* 6253CC 8021982C 24020002 */ addiu $v0, $zero, 2 /* 6253D0 80219830 03E00008 */ jr $ra /* 6253D4 80219834 27BD0040 */ addiu $sp, $sp, 0x40 -/* 6253D8 80219838 00000000 */ nop -/* 6253DC 8021983C 00000000 */ nop +/* 6253D8 80219838 00000000 */ nop +/* 6253DC 8021983C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_80219840_6253E0.s b/asm/nonmatchings/battle/area_sam/6253E0/func_80219840_6253E0.s index e70a407f6d..508cacedcf 100644 --- a/asm/nonmatchings/battle/area_sam/6253E0/func_80219840_6253E0.s +++ b/asm/nonmatchings/battle/area_sam/6253E0/func_80219840_6253E0.s @@ -69,12 +69,12 @@ glabel func_80219840_6253E0 /* 6254E0 80219940 82030210 */ lb $v1, 0x210($s0) /* 6254E4 80219944 2402000A */ addiu $v0, $zero, 0xa /* 6254E8 80219948 14620007 */ bne $v1, $v0, .L80219968 -/* 6254EC 8021994C 00000000 */ nop +/* 6254EC 8021994C 00000000 */ nop /* 6254F0 80219950 8C82000C */ lw $v0, 0xc($a0) /* 6254F4 80219954 3C013ECC */ lui $at, 0x3ecc /* 6254F8 80219958 3421CCCD */ ori $at, $at, 0xcccd /* 6254FC 8021995C 44810000 */ mtc1 $at, $f0 -/* 625500 80219960 00000000 */ nop +/* 625500 80219960 00000000 */ nop /* 625504 80219964 E4400028 */ swc1 $f0, 0x28($v0) .L80219968: /* 625508 80219968 8FBF0028 */ lw $ra, 0x28($sp) diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_80219AE8_625688.s b/asm/nonmatchings/battle/area_sam/6253E0/func_80219AE8_625688.s index b62e8278d2..bc8133af94 100644 --- a/asm/nonmatchings/battle/area_sam/6253E0/func_80219AE8_625688.s +++ b/asm/nonmatchings/battle/area_sam/6253E0/func_80219AE8_625688.s @@ -14,11 +14,11 @@ glabel func_80219AE8_625688 /* 6256AC 80219B0C 0040202D */ daddu $a0, $v0, $zero /* 6256B0 80219B10 2402FF81 */ addiu $v0, $zero, -0x7f /* 6256B4 80219B14 14820002 */ bne $a0, $v0, .L80219B20 -/* 6256B8 80219B18 00000000 */ nop +/* 6256B8 80219B18 00000000 */ nop /* 6256BC 80219B1C 8E240148 */ lw $a0, 0x148($s1) .L80219B20: /* 6256C0 80219B20 0C09A75B */ jal get_actor -/* 6256C4 80219B24 00000000 */ nop +/* 6256C4 80219B24 00000000 */ nop /* 6256C8 80219B28 0040202D */ daddu $a0, $v0, $zero /* 6256CC 80219B2C 90830136 */ lbu $v1, 0x136($a0) /* 6256D0 80219B30 24020047 */ addiu $v0, $zero, 0x47 @@ -49,11 +49,11 @@ glabel func_80219AE8_625688 /* 625728 80219B88 0000302D */ daddu $a2, $zero, $zero .L80219B8C: /* 62572C 80219B8C 0C0B2026 */ jal set_variable -/* 625730 80219B90 00000000 */ nop +/* 625730 80219B90 00000000 */ nop /* 625734 80219B94 8FBF0018 */ lw $ra, 0x18($sp) /* 625738 80219B98 8FB10014 */ lw $s1, 0x14($sp) /* 62573C 80219B9C 8FB00010 */ lw $s0, 0x10($sp) /* 625740 80219BA0 24020002 */ addiu $v0, $zero, 2 /* 625744 80219BA4 03E00008 */ jr $ra /* 625748 80219BA8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 62574C 80219BAC 00000000 */ nop +/* 62574C 80219BAC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_80219DCC_62596C.s b/asm/nonmatchings/battle/area_sam/6253E0/func_80219DCC_62596C.s index b61cd5b12f..20ec92ffe0 100644 --- a/asm/nonmatchings/battle/area_sam/6253E0/func_80219DCC_62596C.s +++ b/asm/nonmatchings/battle/area_sam/6253E0/func_80219DCC_62596C.s @@ -25,17 +25,17 @@ glabel func_80219DCC_62596C /* 6259BC 80219E1C 00071883 */ sra $v1, $a3, 2 /* 6259C0 80219E20 00621823 */ subu $v1, $v1, $v0 /* 6259C4 80219E24 44836000 */ mtc1 $v1, $f12 -/* 6259C8 80219E28 00000000 */ nop +/* 6259C8 80219E28 00000000 */ nop /* 6259CC 80219E2C 46806320 */ cvt.s.w $f12, $f12 /* 6259D0 80219E30 46006302 */ mul.s $f12, $f12, $f0 -/* 6259D4 80219E34 00000000 */ nop +/* 6259D4 80219E34 00000000 */ nop /* 6259D8 80219E38 3C0143B4 */ lui $at, 0x43b4 /* 6259DC 80219E3C 44810000 */ mtc1 $at, $f0 /* 6259E0 80219E40 3C014100 */ lui $at, 0x4100 /* 6259E4 80219E44 44811000 */ mtc1 $at, $f2 /* 6259E8 80219E48 46006303 */ div.s $f12, $f12, $f0 /* 6259EC 80219E4C 46026302 */ mul.s $f12, $f12, $f2 -/* 6259F0 80219E50 00000000 */ nop +/* 6259F0 80219E50 00000000 */ nop /* 6259F4 80219E54 8E120000 */ lw $s2, ($s0) /* 6259F8 80219E58 26100004 */ addiu $s0, $s0, 4 /* 6259FC 80219E5C 8E130000 */ lw $s3, ($s0) @@ -46,7 +46,7 @@ glabel func_80219DCC_62596C /* 625A10 80219E70 44811000 */ mtc1 $at, $f2 /* 625A14 80219E74 0240282D */ daddu $a1, $s2, $zero /* 625A18 80219E78 46020502 */ mul.s $f20, $f0, $f2 -/* 625A1C 80219E7C 00000000 */ nop +/* 625A1C 80219E7C 00000000 */ nop /* 625A20 80219E80 0C0B2026 */ jal set_variable /* 625A24 80219E84 0000302D */ daddu $a2, $zero, $zero /* 625A28 80219E88 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_8021A0EC_625C8C.s b/asm/nonmatchings/battle/area_sam/6253E0/func_8021A0EC_625C8C.s index 528acc1169..16003c2dbd 100644 --- a/asm/nonmatchings/battle/area_sam/6253E0/func_8021A0EC_625C8C.s +++ b/asm/nonmatchings/battle/area_sam/6253E0/func_8021A0EC_625C8C.s @@ -25,17 +25,17 @@ glabel func_8021A0EC_625C8C /* 625CDC 8021A13C 00071883 */ sra $v1, $a3, 2 /* 625CE0 8021A140 00621823 */ subu $v1, $v1, $v0 /* 625CE4 8021A144 44836000 */ mtc1 $v1, $f12 -/* 625CE8 8021A148 00000000 */ nop +/* 625CE8 8021A148 00000000 */ nop /* 625CEC 8021A14C 46806320 */ cvt.s.w $f12, $f12 /* 625CF0 8021A150 46006302 */ mul.s $f12, $f12, $f0 -/* 625CF4 8021A154 00000000 */ nop +/* 625CF4 8021A154 00000000 */ nop /* 625CF8 8021A158 3C0143B4 */ lui $at, 0x43b4 /* 625CFC 8021A15C 44810000 */ mtc1 $at, $f0 /* 625D00 8021A160 3C014100 */ lui $at, 0x4100 /* 625D04 8021A164 44811000 */ mtc1 $at, $f2 /* 625D08 8021A168 46006303 */ div.s $f12, $f12, $f0 /* 625D0C 8021A16C 46026302 */ mul.s $f12, $f12, $f2 -/* 625D10 8021A170 00000000 */ nop +/* 625D10 8021A170 00000000 */ nop /* 625D14 8021A174 8E120000 */ lw $s2, ($s0) /* 625D18 8021A178 26100004 */ addiu $s0, $s0, 4 /* 625D1C 8021A17C 8E130000 */ lw $s3, ($s0) @@ -46,7 +46,7 @@ glabel func_8021A0EC_625C8C /* 625D30 8021A190 44811000 */ mtc1 $at, $f2 /* 625D34 8021A194 0240282D */ daddu $a1, $s2, $zero /* 625D38 8021A198 46020502 */ mul.s $f20, $f0, $f2 -/* 625D3C 8021A19C 00000000 */ nop +/* 625D3C 8021A19C 00000000 */ nop /* 625D40 8021A1A0 0C0B2026 */ jal set_variable /* 625D44 8021A1A4 0000302D */ daddu $a2, $zero, $zero /* 625D48 8021A1A8 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_8021A40C_625FAC.s b/asm/nonmatchings/battle/area_sam/6253E0/func_8021A40C_625FAC.s index b64defa084..d4ce577d92 100644 --- a/asm/nonmatchings/battle/area_sam/6253E0/func_8021A40C_625FAC.s +++ b/asm/nonmatchings/battle/area_sam/6253E0/func_8021A40C_625FAC.s @@ -25,17 +25,17 @@ glabel func_8021A40C_625FAC /* 625FFC 8021A45C 00071883 */ sra $v1, $a3, 2 /* 626000 8021A460 00621823 */ subu $v1, $v1, $v0 /* 626004 8021A464 44836000 */ mtc1 $v1, $f12 -/* 626008 8021A468 00000000 */ nop +/* 626008 8021A468 00000000 */ nop /* 62600C 8021A46C 46806320 */ cvt.s.w $f12, $f12 /* 626010 8021A470 46006302 */ mul.s $f12, $f12, $f0 -/* 626014 8021A474 00000000 */ nop +/* 626014 8021A474 00000000 */ nop /* 626018 8021A478 3C0143B4 */ lui $at, 0x43b4 /* 62601C 8021A47C 44810000 */ mtc1 $at, $f0 /* 626020 8021A480 3C014100 */ lui $at, 0x4100 /* 626024 8021A484 44811000 */ mtc1 $at, $f2 /* 626028 8021A488 46006303 */ div.s $f12, $f12, $f0 /* 62602C 8021A48C 46026302 */ mul.s $f12, $f12, $f2 -/* 626030 8021A490 00000000 */ nop +/* 626030 8021A490 00000000 */ nop /* 626034 8021A494 8E120000 */ lw $s2, ($s0) /* 626038 8021A498 26100004 */ addiu $s0, $s0, 4 /* 62603C 8021A49C 8E130000 */ lw $s3, ($s0) @@ -46,7 +46,7 @@ glabel func_8021A40C_625FAC /* 626050 8021A4B0 44811000 */ mtc1 $at, $f2 /* 626054 8021A4B4 0240282D */ daddu $a1, $s2, $zero /* 626058 8021A4B8 46020502 */ mul.s $f20, $f0, $f2 -/* 62605C 8021A4BC 00000000 */ nop +/* 62605C 8021A4BC 00000000 */ nop /* 626060 8021A4C0 0C0B2026 */ jal set_variable /* 626064 8021A4C4 0000302D */ daddu $a2, $zero, $zero /* 626068 8021A4C8 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_8021A72C_6262CC.s b/asm/nonmatchings/battle/area_sam/6253E0/func_8021A72C_6262CC.s index cc38e48463..ed69c18b3c 100644 --- a/asm/nonmatchings/battle/area_sam/6253E0/func_8021A72C_6262CC.s +++ b/asm/nonmatchings/battle/area_sam/6253E0/func_8021A72C_6262CC.s @@ -25,17 +25,17 @@ glabel func_8021A72C_6262CC /* 62631C 8021A77C 00071883 */ sra $v1, $a3, 2 /* 626320 8021A780 00621823 */ subu $v1, $v1, $v0 /* 626324 8021A784 44836000 */ mtc1 $v1, $f12 -/* 626328 8021A788 00000000 */ nop +/* 626328 8021A788 00000000 */ nop /* 62632C 8021A78C 46806320 */ cvt.s.w $f12, $f12 /* 626330 8021A790 46006302 */ mul.s $f12, $f12, $f0 -/* 626334 8021A794 00000000 */ nop +/* 626334 8021A794 00000000 */ nop /* 626338 8021A798 3C0143B4 */ lui $at, 0x43b4 /* 62633C 8021A79C 44810000 */ mtc1 $at, $f0 /* 626340 8021A7A0 3C014100 */ lui $at, 0x4100 /* 626344 8021A7A4 44811000 */ mtc1 $at, $f2 /* 626348 8021A7A8 46006303 */ div.s $f12, $f12, $f0 /* 62634C 8021A7AC 46026302 */ mul.s $f12, $f12, $f2 -/* 626350 8021A7B0 00000000 */ nop +/* 626350 8021A7B0 00000000 */ nop /* 626354 8021A7B4 8E120000 */ lw $s2, ($s0) /* 626358 8021A7B8 26100004 */ addiu $s0, $s0, 4 /* 62635C 8021A7BC 8E130000 */ lw $s3, ($s0) @@ -46,7 +46,7 @@ glabel func_8021A72C_6262CC /* 626370 8021A7D0 44811000 */ mtc1 $at, $f2 /* 626374 8021A7D4 0240282D */ daddu $a1, $s2, $zero /* 626378 8021A7D8 46020502 */ mul.s $f20, $f0, $f2 -/* 62637C 8021A7DC 00000000 */ nop +/* 62637C 8021A7DC 00000000 */ nop /* 626380 8021A7E0 0C0B2026 */ jal set_variable /* 626384 8021A7E4 0000302D */ daddu $a2, $zero, $zero /* 626388 8021A7E8 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_8021AA4C_6265EC.s b/asm/nonmatchings/battle/area_sam/6253E0/func_8021AA4C_6265EC.s index 1e91a8c657..29fb2d14e7 100644 --- a/asm/nonmatchings/battle/area_sam/6253E0/func_8021AA4C_6265EC.s +++ b/asm/nonmatchings/battle/area_sam/6253E0/func_8021AA4C_6265EC.s @@ -25,17 +25,17 @@ glabel func_8021AA4C_6265EC /* 62663C 8021AA9C 00071883 */ sra $v1, $a3, 2 /* 626640 8021AAA0 00621823 */ subu $v1, $v1, $v0 /* 626644 8021AAA4 44836000 */ mtc1 $v1, $f12 -/* 626648 8021AAA8 00000000 */ nop +/* 626648 8021AAA8 00000000 */ nop /* 62664C 8021AAAC 46806320 */ cvt.s.w $f12, $f12 /* 626650 8021AAB0 46006302 */ mul.s $f12, $f12, $f0 -/* 626654 8021AAB4 00000000 */ nop +/* 626654 8021AAB4 00000000 */ nop /* 626658 8021AAB8 3C0143B4 */ lui $at, 0x43b4 /* 62665C 8021AABC 44810000 */ mtc1 $at, $f0 /* 626660 8021AAC0 3C014100 */ lui $at, 0x4100 /* 626664 8021AAC4 44811000 */ mtc1 $at, $f2 /* 626668 8021AAC8 46006303 */ div.s $f12, $f12, $f0 /* 62666C 8021AACC 46026302 */ mul.s $f12, $f12, $f2 -/* 626670 8021AAD0 00000000 */ nop +/* 626670 8021AAD0 00000000 */ nop /* 626674 8021AAD4 8E120000 */ lw $s2, ($s0) /* 626678 8021AAD8 26100004 */ addiu $s0, $s0, 4 /* 62667C 8021AADC 8E130000 */ lw $s3, ($s0) @@ -46,7 +46,7 @@ glabel func_8021AA4C_6265EC /* 626690 8021AAF0 44811000 */ mtc1 $at, $f2 /* 626694 8021AAF4 0240282D */ daddu $a1, $s2, $zero /* 626698 8021AAF8 46020502 */ mul.s $f20, $f0, $f2 -/* 62669C 8021AAFC 00000000 */ nop +/* 62669C 8021AAFC 00000000 */ nop /* 6266A0 8021AB00 0C0B2026 */ jal set_variable /* 6266A4 8021AB04 0000302D */ daddu $a2, $zero, $zero /* 6266A8 8021AB08 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_8021AD6C_62690C.s b/asm/nonmatchings/battle/area_sam/6253E0/func_8021AD6C_62690C.s index ddb54ffec8..90d68faf70 100644 --- a/asm/nonmatchings/battle/area_sam/6253E0/func_8021AD6C_62690C.s +++ b/asm/nonmatchings/battle/area_sam/6253E0/func_8021AD6C_62690C.s @@ -25,17 +25,17 @@ glabel func_8021AD6C_62690C /* 62695C 8021ADBC 00071883 */ sra $v1, $a3, 2 /* 626960 8021ADC0 00621823 */ subu $v1, $v1, $v0 /* 626964 8021ADC4 44836000 */ mtc1 $v1, $f12 -/* 626968 8021ADC8 00000000 */ nop +/* 626968 8021ADC8 00000000 */ nop /* 62696C 8021ADCC 46806320 */ cvt.s.w $f12, $f12 /* 626970 8021ADD0 46006302 */ mul.s $f12, $f12, $f0 -/* 626974 8021ADD4 00000000 */ nop +/* 626974 8021ADD4 00000000 */ nop /* 626978 8021ADD8 3C0143B4 */ lui $at, 0x43b4 /* 62697C 8021ADDC 44810000 */ mtc1 $at, $f0 /* 626980 8021ADE0 3C014100 */ lui $at, 0x4100 /* 626984 8021ADE4 44811000 */ mtc1 $at, $f2 /* 626988 8021ADE8 46006303 */ div.s $f12, $f12, $f0 /* 62698C 8021ADEC 46026302 */ mul.s $f12, $f12, $f2 -/* 626990 8021ADF0 00000000 */ nop +/* 626990 8021ADF0 00000000 */ nop /* 626994 8021ADF4 8E120000 */ lw $s2, ($s0) /* 626998 8021ADF8 26100004 */ addiu $s0, $s0, 4 /* 62699C 8021ADFC 8E130000 */ lw $s3, ($s0) @@ -46,7 +46,7 @@ glabel func_8021AD6C_62690C /* 6269B0 8021AE10 44811000 */ mtc1 $at, $f2 /* 6269B4 8021AE14 0240282D */ daddu $a1, $s2, $zero /* 6269B8 8021AE18 46020502 */ mul.s $f20, $f0, $f2 -/* 6269BC 8021AE1C 00000000 */ nop +/* 6269BC 8021AE1C 00000000 */ nop /* 6269C0 8021AE20 0C0B2026 */ jal set_variable /* 6269C4 8021AE24 0000302D */ daddu $a2, $zero, $zero /* 6269C8 8021AE28 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/battle/area_sam/6253E0/func_8021AE70_626A10.s b/asm/nonmatchings/battle/area_sam/6253E0/func_8021AE70_626A10.s index b35dff7abe..57442191ef 100644 --- a/asm/nonmatchings/battle/area_sam/6253E0/func_8021AE70_626A10.s +++ b/asm/nonmatchings/battle/area_sam/6253E0/func_8021AE70_626A10.s @@ -5,8 +5,8 @@ glabel func_8021AE70_626A10 /* 626A10 8021AE70 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 626A14 8021AE74 AFBF0010 */ sw $ra, 0x10($sp) /* 626A18 8021AE78 0C051C83 */ jal func_8014720C -/* 626A1C 8021AE7C 00000000 */ nop +/* 626A1C 8021AE7C 00000000 */ nop /* 626A20 8021AE80 8FBF0010 */ lw $ra, 0x10($sp) /* 626A24 8021AE84 03E00008 */ jr $ra /* 626A28 8021AE88 27BD0018 */ addiu $sp, $sp, 0x18 -/* 626A2C 8021AE8C 00000000 */ nop +/* 626A2C 8021AE8C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_sam2/63D1E0/func_80218000_63D1E0.s b/asm/nonmatchings/battle/area_sam2/63D1E0/func_80218000_63D1E0.s index 0b8961fbde..0097a76408 100644 --- a/asm/nonmatchings/battle/area_sam2/63D1E0/func_80218000_63D1E0.s +++ b/asm/nonmatchings/battle/area_sam2/63D1E0/func_80218000_63D1E0.s @@ -89,10 +89,10 @@ glabel func_80218000_63D1E0 /* 63D324 80218144 46000021 */ cvt.d.s $f0, $f0 /* 63D328 80218148 46380000 */ add.d $f0, $f0, $f24 /* 63D32C 8021814C 46360002 */ mul.d $f0, $f0, $f22 -/* 63D330 80218150 00000000 */ nop +/* 63D330 80218150 00000000 */ nop /* 63D334 80218154 27A20020 */ addiu $v0, $sp, 0x20 /* 63D338 80218158 4620A03E */ c.le.d $f20, $f0 -/* 63D33C 8021815C 00000000 */ nop +/* 63D33C 8021815C 00000000 */ nop /* 63D340 80218160 45010005 */ bc1t .L80218178 /* 63D344 80218164 00501021 */ addu $v0, $v0, $s0 /* 63D348 80218168 4620008D */ trunc.w.d $f2, $f0 @@ -103,7 +103,7 @@ glabel func_80218000_63D1E0 /* 63D358 80218178 46340001 */ sub.d $f0, $f0, $f20 /* 63D35C 8021817C 4620008D */ trunc.w.d $f2, $f0 /* 63D360 80218180 44031000 */ mfc1 $v1, $f2 -/* 63D364 80218184 00000000 */ nop +/* 63D364 80218184 00000000 */ nop /* 63D368 80218188 00731825 */ or $v1, $v1, $s3 /* 63D36C 8021818C A0430000 */ sb $v1, ($v0) .L80218190: @@ -116,10 +116,10 @@ glabel func_80218000_63D1E0 /* 63D388 802181A8 46000021 */ cvt.d.s $f0, $f0 /* 63D38C 802181AC 46380000 */ add.d $f0, $f0, $f24 /* 63D390 802181B0 46360002 */ mul.d $f0, $f0, $f22 -/* 63D394 802181B4 00000000 */ nop +/* 63D394 802181B4 00000000 */ nop /* 63D398 802181B8 27A20038 */ addiu $v0, $sp, 0x38 /* 63D39C 802181BC 4620A03E */ c.le.d $f20, $f0 -/* 63D3A0 802181C0 00000000 */ nop +/* 63D3A0 802181C0 00000000 */ nop /* 63D3A4 802181C4 45010005 */ bc1t .L802181DC /* 63D3A8 802181C8 00501021 */ addu $v0, $v0, $s0 /* 63D3AC 802181CC 4620008D */ trunc.w.d $f2, $f0 @@ -130,7 +130,7 @@ glabel func_80218000_63D1E0 /* 63D3BC 802181DC 46340001 */ sub.d $f0, $f0, $f20 /* 63D3C0 802181E0 4620008D */ trunc.w.d $f2, $f0 /* 63D3C4 802181E4 44031000 */ mfc1 $v1, $f2 -/* 63D3C8 802181E8 00000000 */ nop +/* 63D3C8 802181E8 00000000 */ nop /* 63D3CC 802181EC 00731825 */ or $v1, $v1, $s3 /* 63D3D0 802181F0 A0430000 */ sb $v1, ($v0) .L802181F4: @@ -143,10 +143,10 @@ glabel func_80218000_63D1E0 /* 63D3EC 8021820C 46000021 */ cvt.d.s $f0, $f0 /* 63D3F0 80218210 46380000 */ add.d $f0, $f0, $f24 /* 63D3F4 80218214 46360002 */ mul.d $f0, $f0, $f22 -/* 63D3F8 80218218 00000000 */ nop +/* 63D3F8 80218218 00000000 */ nop /* 63D3FC 8021821C 27A20050 */ addiu $v0, $sp, 0x50 /* 63D400 80218220 4620A03E */ c.le.d $f20, $f0 -/* 63D404 80218224 00000000 */ nop +/* 63D404 80218224 00000000 */ nop /* 63D408 80218228 45010005 */ bc1t .L80218240 /* 63D40C 8021822C 00501021 */ addu $v0, $v0, $s0 /* 63D410 80218230 4620008D */ trunc.w.d $f2, $f0 @@ -157,7 +157,7 @@ glabel func_80218000_63D1E0 /* 63D420 80218240 46340001 */ sub.d $f0, $f0, $f20 /* 63D424 80218244 4620008D */ trunc.w.d $f2, $f0 /* 63D428 80218248 44031000 */ mfc1 $v1, $f2 -/* 63D42C 8021824C 00000000 */ nop +/* 63D42C 8021824C 00000000 */ nop /* 63D430 80218250 00731825 */ or $v1, $v1, $s3 /* 63D434 80218254 A0430000 */ sb $v1, ($v0) .L80218258: diff --git a/asm/nonmatchings/battle/area_sam2/63D1E0/func_80218314_63D4F4.s b/asm/nonmatchings/battle/area_sam2/63D1E0/func_80218314_63D4F4.s index 8badfac9f5..9dec12ddb1 100644 --- a/asm/nonmatchings/battle/area_sam2/63D1E0/func_80218314_63D4F4.s +++ b/asm/nonmatchings/battle/area_sam2/63D1E0/func_80218314_63D4F4.s @@ -42,31 +42,31 @@ glabel func_80218314_63D4F4 /* 63D588 802183A8 0040882D */ daddu $s1, $v0, $zero /* 63D58C 802183AC 02749823 */ subu $s3, $s3, $s4 /* 63D590 802183B0 44932000 */ mtc1 $s3, $f4 -/* 63D594 802183B4 00000000 */ nop +/* 63D594 802183B4 00000000 */ nop /* 63D598 802183B8 46802120 */ cvt.s.w $f4, $f4 /* 63D59C 802183BC 46042102 */ mul.s $f4, $f4, $f4 -/* 63D5A0 802183C0 00000000 */ nop +/* 63D5A0 802183C0 00000000 */ nop /* 63D5A4 802183C4 02519023 */ subu $s2, $s2, $s1 /* 63D5A8 802183C8 44921000 */ mtc1 $s2, $f2 -/* 63D5AC 802183CC 00000000 */ nop +/* 63D5AC 802183CC 00000000 */ nop /* 63D5B0 802183D0 468010A0 */ cvt.s.w $f2, $f2 /* 63D5B4 802183D4 46021082 */ mul.s $f2, $f2, $f2 -/* 63D5B8 802183D8 00000000 */ nop +/* 63D5B8 802183D8 00000000 */ nop /* 63D5BC 802183DC 02028023 */ subu $s0, $s0, $v0 /* 63D5C0 802183E0 44900000 */ mtc1 $s0, $f0 -/* 63D5C4 802183E4 00000000 */ nop +/* 63D5C4 802183E4 00000000 */ nop /* 63D5C8 802183E8 46800020 */ cvt.s.w $f0, $f0 /* 63D5CC 802183EC 46000002 */ mul.s $f0, $f0, $f0 -/* 63D5D0 802183F0 00000000 */ nop +/* 63D5D0 802183F0 00000000 */ nop /* 63D5D4 802183F4 46022100 */ add.s $f4, $f4, $f2 /* 63D5D8 802183F8 46002300 */ add.s $f12, $f4, $f0 /* 63D5DC 802183FC 46006004 */ sqrt.s $f0, $f12 /* 63D5E0 80218400 46000032 */ c.eq.s $f0, $f0 -/* 63D5E4 80218404 00000000 */ nop +/* 63D5E4 80218404 00000000 */ nop /* 63D5E8 80218408 45010003 */ bc1t .L80218418 /* 63D5EC 8021840C 26B50004 */ addiu $s5, $s5, 4 /* 63D5F0 80218410 0C0187BC */ jal sqrtf -/* 63D5F4 80218414 00000000 */ nop +/* 63D5F4 80218414 00000000 */ nop .L80218418: /* 63D5F8 80218418 8EA50000 */ lw $a1, ($s5) /* 63D5FC 8021841C 4600018D */ trunc.w.s $f6, $f0 diff --git a/asm/nonmatchings/battle/area_sam2/63D710/func_80218588_63D768.s b/asm/nonmatchings/battle/area_sam2/63D710/func_80218588_63D768.s index 698ab7b129..5b252f75a2 100644 --- a/asm/nonmatchings/battle/area_sam2/63D710/func_80218588_63D768.s +++ b/asm/nonmatchings/battle/area_sam2/63D710/func_80218588_63D768.s @@ -11,12 +11,12 @@ glabel func_80218588_63D768 /* 63D780 802185A0 46007506 */ mov.s $f20, $f14 /* 63D784 802185A4 4600A18D */ trunc.w.s $f6, $f20 /* 63D788 802185A8 44023000 */ mfc1 $v0, $f6 -/* 63D78C 802185AC 00000000 */ nop +/* 63D78C 802185AC 00000000 */ nop /* 63D790 802185B0 04420001 */ bltzl $v0, .L802185B8 /* 63D794 802185B4 00021023 */ negu $v0, $v0 .L802185B8: /* 63D798 802185B8 44821000 */ mtc1 $v0, $f2 -/* 63D79C 802185BC 00000000 */ nop +/* 63D79C 802185BC 00000000 */ nop /* 63D7A0 802185C0 468010A0 */ cvt.s.w $f2, $f2 /* 63D7A4 802185C4 46001103 */ div.s $f4, $f2, $f0 /* 63D7A8 802185C8 0000202D */ daddu $a0, $zero, $zero @@ -37,7 +37,7 @@ glabel func_80218588_63D768 /* 63D7E0 80218600 00471021 */ addu $v0, $v0, $a3 /* 63D7E4 80218604 C4400000 */ lwc1 $f0, ($v0) /* 63D7E8 80218608 4604003C */ c.lt.s $f0, $f4 -/* 63D7EC 8021860C 00000000 */ nop +/* 63D7EC 8021860C 00000000 */ nop /* 63D7F0 80218610 45020002 */ bc1fl .L8021861C /* 63D7F4 80218614 0060302D */ daddu $a2, $v1, $zero /* 63D7F8 80218618 0060202D */ daddu $a0, $v1, $zero @@ -62,43 +62,43 @@ glabel func_80218588_63D768 /* 63D840 80218660 46001085 */ abs.s $f2, $f2 /* 63D844 80218664 46000005 */ abs.s $f0, $f0 /* 63D848 80218668 4600103C */ c.lt.s $f2, $f0 -/* 63D84C 8021866C 00000000 */ nop +/* 63D84C 8021866C 00000000 */ nop /* 63D850 80218670 45000002 */ bc1f .L8021867C /* 63D854 80218674 00C0182D */ daddu $v1, $a2, $zero /* 63D858 80218678 0080182D */ daddu $v1, $a0, $zero .L8021867C: /* 63D85C 8021867C 44800000 */ mtc1 $zero, $f0 -/* 63D860 80218680 00000000 */ nop +/* 63D860 80218680 00000000 */ nop /* 63D864 80218684 4600B03C */ c.lt.s $f22, $f0 -/* 63D868 80218688 00000000 */ nop +/* 63D868 80218688 00000000 */ nop /* 63D86C 8021868C 4500000A */ bc1f .L802186B8 -/* 63D870 80218690 00000000 */ nop +/* 63D870 80218690 00000000 */ nop /* 63D874 80218694 4614003E */ c.le.s $f0, $f20 -/* 63D878 80218698 00000000 */ nop +/* 63D878 80218698 00000000 */ nop /* 63D87C 8021869C 45000004 */ bc1f .L802186B0 /* 63D880 802186A0 240200B4 */ addiu $v0, $zero, 0xb4 /* 63D884 802186A4 00431823 */ subu $v1, $v0, $v1 /* 63D888 802186A8 44800000 */ mtc1 $zero, $f0 -/* 63D88C 802186AC 00000000 */ nop +/* 63D88C 802186AC 00000000 */ nop .L802186B0: /* 63D890 802186B0 4600B03C */ c.lt.s $f22, $f0 -/* 63D894 802186B4 00000000 */ nop +/* 63D894 802186B4 00000000 */ nop .L802186B8: /* 63D898 802186B8 45000005 */ bc1f .L802186D0 -/* 63D89C 802186BC 00000000 */ nop +/* 63D89C 802186BC 00000000 */ nop /* 63D8A0 802186C0 4600A03C */ c.lt.s $f20, $f0 -/* 63D8A4 802186C4 00000000 */ nop +/* 63D8A4 802186C4 00000000 */ nop /* 63D8A8 802186C8 45030001 */ bc1tl .L802186D0 /* 63D8AC 802186CC 246300B4 */ addiu $v1, $v1, 0xb4 .L802186D0: /* 63D8B0 802186D0 44800000 */ mtc1 $zero, $f0 -/* 63D8B4 802186D4 00000000 */ nop +/* 63D8B4 802186D4 00000000 */ nop /* 63D8B8 802186D8 4616003E */ c.le.s $f0, $f22 -/* 63D8BC 802186DC 00000000 */ nop +/* 63D8BC 802186DC 00000000 */ nop /* 63D8C0 802186E0 45000006 */ bc1f .L802186FC -/* 63D8C4 802186E4 00000000 */ nop +/* 63D8C4 802186E4 00000000 */ nop /* 63D8C8 802186E8 4600A03C */ c.lt.s $f20, $f0 -/* 63D8CC 802186EC 00000000 */ nop +/* 63D8CC 802186EC 00000000 */ nop /* 63D8D0 802186F0 45000002 */ bc1f .L802186FC /* 63D8D4 802186F4 24020168 */ addiu $v0, $zero, 0x168 /* 63D8D8 802186F8 00431823 */ subu $v1, $v0, $v1 diff --git a/asm/nonmatchings/battle/area_sam2/63D710/func_80218714_63D8F4.s b/asm/nonmatchings/battle/area_sam2/63D710/func_80218714_63D8F4.s index 4373b20e1d..5225b32ed9 100644 --- a/asm/nonmatchings/battle/area_sam2/63D710/func_80218714_63D8F4.s +++ b/asm/nonmatchings/battle/area_sam2/63D710/func_80218714_63D8F4.s @@ -36,7 +36,7 @@ glabel func_80218714_63D8F4 /* 63D970 80218790 0C0B1EAF */ jal get_variable /* 63D974 80218794 02118023 */ subu $s0, $s0, $s1 /* 63D978 80218798 16600006 */ bnez $s3, .L802187B4 -/* 63D97C 8021879C 00000000 */ nop +/* 63D97C 8021879C 00000000 */ nop /* 63D980 802187A0 16000004 */ bnez $s0, .L802187B4 /* 63D984 802187A4 0280202D */ daddu $a0, $s4, $zero /* 63D988 802187A8 8E450000 */ lw $a1, ($s2) @@ -44,10 +44,10 @@ glabel func_80218714_63D8F4 /* 63D990 802187B0 0040302D */ daddu $a2, $v0, $zero .L802187B4: /* 63D994 802187B4 44936000 */ mtc1 $s3, $f12 -/* 63D998 802187B8 00000000 */ nop +/* 63D998 802187B8 00000000 */ nop /* 63D99C 802187BC 46806320 */ cvt.s.w $f12, $f12 /* 63D9A0 802187C0 44907000 */ mtc1 $s0, $f14 -/* 63D9A4 802187C4 00000000 */ nop +/* 63D9A4 802187C4 00000000 */ nop /* 63D9A8 802187C8 0C086162 */ jal func_80218588_63D768 /* 63D9AC 802187CC 468073A0 */ cvt.s.w $f14, $f14 /* 63D9B0 802187D0 0280202D */ daddu $a0, $s4, $zero @@ -55,7 +55,7 @@ glabel func_80218714_63D8F4 /* 63D9B8 802187D8 2446FFA6 */ addiu $a2, $v0, -0x5a .L802187DC: /* 63D9BC 802187DC 0C0B2026 */ jal set_variable -/* 63D9C0 802187E0 00000000 */ nop +/* 63D9C0 802187E0 00000000 */ nop /* 63D9C4 802187E4 24020002 */ addiu $v0, $zero, 2 /* 63D9C8 802187E8 8FBF0024 */ lw $ra, 0x24($sp) /* 63D9CC 802187EC 8FB40020 */ lw $s4, 0x20($sp) @@ -65,5 +65,5 @@ glabel func_80218714_63D8F4 /* 63D9DC 802187FC 8FB00010 */ lw $s0, 0x10($sp) /* 63D9E0 80218800 03E00008 */ jr $ra /* 63D9E4 80218804 27BD0028 */ addiu $sp, $sp, 0x28 -/* 63D9E8 80218808 00000000 */ nop -/* 63D9EC 8021880C 00000000 */ nop +/* 63D9E8 80218808 00000000 */ nop +/* 63D9EC 8021880C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218810_63D9F0.s b/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218810_63D9F0.s index 64a7560713..6f7ffbc3f1 100644 --- a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218810_63D9F0.s +++ b/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218810_63D9F0.s @@ -69,12 +69,12 @@ glabel func_80218810_63D9F0 /* 63DAF0 80218910 82030210 */ lb $v1, 0x210($s0) /* 63DAF4 80218914 2402000A */ addiu $v0, $zero, 0xa /* 63DAF8 80218918 14620007 */ bne $v1, $v0, .L80218938 -/* 63DAFC 8021891C 00000000 */ nop +/* 63DAFC 8021891C 00000000 */ nop /* 63DB00 80218920 8C82000C */ lw $v0, 0xc($a0) /* 63DB04 80218924 3C013ECC */ lui $at, 0x3ecc /* 63DB08 80218928 3421CCCD */ ori $at, $at, 0xcccd /* 63DB0C 8021892C 44810000 */ mtc1 $at, $f0 -/* 63DB10 80218930 00000000 */ nop +/* 63DB10 80218930 00000000 */ nop /* 63DB14 80218934 E4400028 */ swc1 $f0, 0x28($v0) .L80218938: /* 63DB18 80218938 8FBF0028 */ lw $ra, 0x28($sp) diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218AB8_63DC98.s b/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218AB8_63DC98.s index cbb151e34b..dc047d3d4a 100644 --- a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218AB8_63DC98.s +++ b/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218AB8_63DC98.s @@ -14,11 +14,11 @@ glabel func_80218AB8_63DC98 /* 63DCBC 80218ADC 0040202D */ daddu $a0, $v0, $zero /* 63DCC0 80218AE0 2402FF81 */ addiu $v0, $zero, -0x7f /* 63DCC4 80218AE4 14820002 */ bne $a0, $v0, .L80218AF0 -/* 63DCC8 80218AE8 00000000 */ nop +/* 63DCC8 80218AE8 00000000 */ nop /* 63DCCC 80218AEC 8E240148 */ lw $a0, 0x148($s1) .L80218AF0: /* 63DCD0 80218AF0 0C09A75B */ jal get_actor -/* 63DCD4 80218AF4 00000000 */ nop +/* 63DCD4 80218AF4 00000000 */ nop /* 63DCD8 80218AF8 0040202D */ daddu $a0, $v0, $zero /* 63DCDC 80218AFC 90830136 */ lbu $v1, 0x136($a0) /* 63DCE0 80218B00 24020047 */ addiu $v0, $zero, 0x47 @@ -49,11 +49,11 @@ glabel func_80218AB8_63DC98 /* 63DD38 80218B58 0000302D */ daddu $a2, $zero, $zero .L80218B5C: /* 63DD3C 80218B5C 0C0B2026 */ jal set_variable -/* 63DD40 80218B60 00000000 */ nop +/* 63DD40 80218B60 00000000 */ nop /* 63DD44 80218B64 8FBF0018 */ lw $ra, 0x18($sp) /* 63DD48 80218B68 8FB10014 */ lw $s1, 0x14($sp) /* 63DD4C 80218B6C 8FB00010 */ lw $s0, 0x10($sp) /* 63DD50 80218B70 24020002 */ addiu $v0, $zero, 2 /* 63DD54 80218B74 03E00008 */ jr $ra /* 63DD58 80218B78 27BD0020 */ addiu $sp, $sp, 0x20 -/* 63DD5C 80218B7C 00000000 */ nop +/* 63DD5C 80218B7C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218D9C_63DF7C.s b/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218D9C_63DF7C.s index ec187127d6..f2ea4ee49a 100644 --- a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218D9C_63DF7C.s +++ b/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218D9C_63DF7C.s @@ -25,17 +25,17 @@ glabel func_80218D9C_63DF7C /* 63DFCC 80218DEC 00071883 */ sra $v1, $a3, 2 /* 63DFD0 80218DF0 00621823 */ subu $v1, $v1, $v0 /* 63DFD4 80218DF4 44836000 */ mtc1 $v1, $f12 -/* 63DFD8 80218DF8 00000000 */ nop +/* 63DFD8 80218DF8 00000000 */ nop /* 63DFDC 80218DFC 46806320 */ cvt.s.w $f12, $f12 /* 63DFE0 80218E00 46006302 */ mul.s $f12, $f12, $f0 -/* 63DFE4 80218E04 00000000 */ nop +/* 63DFE4 80218E04 00000000 */ nop /* 63DFE8 80218E08 3C0143B4 */ lui $at, 0x43b4 /* 63DFEC 80218E0C 44810000 */ mtc1 $at, $f0 /* 63DFF0 80218E10 3C014100 */ lui $at, 0x4100 /* 63DFF4 80218E14 44811000 */ mtc1 $at, $f2 /* 63DFF8 80218E18 46006303 */ div.s $f12, $f12, $f0 /* 63DFFC 80218E1C 46026302 */ mul.s $f12, $f12, $f2 -/* 63E000 80218E20 00000000 */ nop +/* 63E000 80218E20 00000000 */ nop /* 63E004 80218E24 8E120000 */ lw $s2, ($s0) /* 63E008 80218E28 26100004 */ addiu $s0, $s0, 4 /* 63E00C 80218E2C 8E130000 */ lw $s3, ($s0) @@ -46,7 +46,7 @@ glabel func_80218D9C_63DF7C /* 63E020 80218E40 44811000 */ mtc1 $at, $f2 /* 63E024 80218E44 0240282D */ daddu $a1, $s2, $zero /* 63E028 80218E48 46020502 */ mul.s $f20, $f0, $f2 -/* 63E02C 80218E4C 00000000 */ nop +/* 63E02C 80218E4C 00000000 */ nop /* 63E030 80218E50 0C0B2026 */ jal set_variable /* 63E034 80218E54 0000302D */ daddu $a2, $zero, $zero /* 63E038 80218E58 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_802190BC_63E29C.s b/asm/nonmatchings/battle/area_sam2/63D9F0/func_802190BC_63E29C.s index ec83a26a10..d23687250c 100644 --- a/asm/nonmatchings/battle/area_sam2/63D9F0/func_802190BC_63E29C.s +++ b/asm/nonmatchings/battle/area_sam2/63D9F0/func_802190BC_63E29C.s @@ -25,17 +25,17 @@ glabel func_802190BC_63E29C /* 63E2EC 8021910C 00071883 */ sra $v1, $a3, 2 /* 63E2F0 80219110 00621823 */ subu $v1, $v1, $v0 /* 63E2F4 80219114 44836000 */ mtc1 $v1, $f12 -/* 63E2F8 80219118 00000000 */ nop +/* 63E2F8 80219118 00000000 */ nop /* 63E2FC 8021911C 46806320 */ cvt.s.w $f12, $f12 /* 63E300 80219120 46006302 */ mul.s $f12, $f12, $f0 -/* 63E304 80219124 00000000 */ nop +/* 63E304 80219124 00000000 */ nop /* 63E308 80219128 3C0143B4 */ lui $at, 0x43b4 /* 63E30C 8021912C 44810000 */ mtc1 $at, $f0 /* 63E310 80219130 3C014100 */ lui $at, 0x4100 /* 63E314 80219134 44811000 */ mtc1 $at, $f2 /* 63E318 80219138 46006303 */ div.s $f12, $f12, $f0 /* 63E31C 8021913C 46026302 */ mul.s $f12, $f12, $f2 -/* 63E320 80219140 00000000 */ nop +/* 63E320 80219140 00000000 */ nop /* 63E324 80219144 8E120000 */ lw $s2, ($s0) /* 63E328 80219148 26100004 */ addiu $s0, $s0, 4 /* 63E32C 8021914C 8E130000 */ lw $s3, ($s0) @@ -46,7 +46,7 @@ glabel func_802190BC_63E29C /* 63E340 80219160 44811000 */ mtc1 $at, $f2 /* 63E344 80219164 0240282D */ daddu $a1, $s2, $zero /* 63E348 80219168 46020502 */ mul.s $f20, $f0, $f2 -/* 63E34C 8021916C 00000000 */ nop +/* 63E34C 8021916C 00000000 */ nop /* 63E350 80219170 0C0B2026 */ jal set_variable /* 63E354 80219174 0000302D */ daddu $a2, $zero, $zero /* 63E358 80219178 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_802193DC_63E5BC.s b/asm/nonmatchings/battle/area_sam2/63D9F0/func_802193DC_63E5BC.s index 78fbf1c08e..36acbe8944 100644 --- a/asm/nonmatchings/battle/area_sam2/63D9F0/func_802193DC_63E5BC.s +++ b/asm/nonmatchings/battle/area_sam2/63D9F0/func_802193DC_63E5BC.s @@ -25,17 +25,17 @@ glabel func_802193DC_63E5BC /* 63E60C 8021942C 00071883 */ sra $v1, $a3, 2 /* 63E610 80219430 00621823 */ subu $v1, $v1, $v0 /* 63E614 80219434 44836000 */ mtc1 $v1, $f12 -/* 63E618 80219438 00000000 */ nop +/* 63E618 80219438 00000000 */ nop /* 63E61C 8021943C 46806320 */ cvt.s.w $f12, $f12 /* 63E620 80219440 46006302 */ mul.s $f12, $f12, $f0 -/* 63E624 80219444 00000000 */ nop +/* 63E624 80219444 00000000 */ nop /* 63E628 80219448 3C0143B4 */ lui $at, 0x43b4 /* 63E62C 8021944C 44810000 */ mtc1 $at, $f0 /* 63E630 80219450 3C014100 */ lui $at, 0x4100 /* 63E634 80219454 44811000 */ mtc1 $at, $f2 /* 63E638 80219458 46006303 */ div.s $f12, $f12, $f0 /* 63E63C 8021945C 46026302 */ mul.s $f12, $f12, $f2 -/* 63E640 80219460 00000000 */ nop +/* 63E640 80219460 00000000 */ nop /* 63E644 80219464 8E120000 */ lw $s2, ($s0) /* 63E648 80219468 26100004 */ addiu $s0, $s0, 4 /* 63E64C 8021946C 8E130000 */ lw $s3, ($s0) @@ -46,7 +46,7 @@ glabel func_802193DC_63E5BC /* 63E660 80219480 44811000 */ mtc1 $at, $f2 /* 63E664 80219484 0240282D */ daddu $a1, $s2, $zero /* 63E668 80219488 46020502 */ mul.s $f20, $f0, $f2 -/* 63E66C 8021948C 00000000 */ nop +/* 63E66C 8021948C 00000000 */ nop /* 63E670 80219490 0C0B2026 */ jal set_variable /* 63E674 80219494 0000302D */ daddu $a2, $zero, $zero /* 63E678 80219498 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_802196FC_63E8DC.s b/asm/nonmatchings/battle/area_sam2/63D9F0/func_802196FC_63E8DC.s index 778936fb2d..7ffbae76b1 100644 --- a/asm/nonmatchings/battle/area_sam2/63D9F0/func_802196FC_63E8DC.s +++ b/asm/nonmatchings/battle/area_sam2/63D9F0/func_802196FC_63E8DC.s @@ -25,17 +25,17 @@ glabel func_802196FC_63E8DC /* 63E92C 8021974C 00071883 */ sra $v1, $a3, 2 /* 63E930 80219750 00621823 */ subu $v1, $v1, $v0 /* 63E934 80219754 44836000 */ mtc1 $v1, $f12 -/* 63E938 80219758 00000000 */ nop +/* 63E938 80219758 00000000 */ nop /* 63E93C 8021975C 46806320 */ cvt.s.w $f12, $f12 /* 63E940 80219760 46006302 */ mul.s $f12, $f12, $f0 -/* 63E944 80219764 00000000 */ nop +/* 63E944 80219764 00000000 */ nop /* 63E948 80219768 3C0143B4 */ lui $at, 0x43b4 /* 63E94C 8021976C 44810000 */ mtc1 $at, $f0 /* 63E950 80219770 3C014100 */ lui $at, 0x4100 /* 63E954 80219774 44811000 */ mtc1 $at, $f2 /* 63E958 80219778 46006303 */ div.s $f12, $f12, $f0 /* 63E95C 8021977C 46026302 */ mul.s $f12, $f12, $f2 -/* 63E960 80219780 00000000 */ nop +/* 63E960 80219780 00000000 */ nop /* 63E964 80219784 8E120000 */ lw $s2, ($s0) /* 63E968 80219788 26100004 */ addiu $s0, $s0, 4 /* 63E96C 8021978C 8E130000 */ lw $s3, ($s0) @@ -46,7 +46,7 @@ glabel func_802196FC_63E8DC /* 63E980 802197A0 44811000 */ mtc1 $at, $f2 /* 63E984 802197A4 0240282D */ daddu $a1, $s2, $zero /* 63E988 802197A8 46020502 */ mul.s $f20, $f0, $f2 -/* 63E98C 802197AC 00000000 */ nop +/* 63E98C 802197AC 00000000 */ nop /* 63E990 802197B0 0C0B2026 */ jal set_variable /* 63E994 802197B4 0000302D */ daddu $a2, $zero, $zero /* 63E998 802197B8 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219A1C_63EBFC.s b/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219A1C_63EBFC.s index 5c3680a1b6..1b47eed5bb 100644 --- a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219A1C_63EBFC.s +++ b/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219A1C_63EBFC.s @@ -25,17 +25,17 @@ glabel func_80219A1C_63EBFC /* 63EC4C 80219A6C 00071883 */ sra $v1, $a3, 2 /* 63EC50 80219A70 00621823 */ subu $v1, $v1, $v0 /* 63EC54 80219A74 44836000 */ mtc1 $v1, $f12 -/* 63EC58 80219A78 00000000 */ nop +/* 63EC58 80219A78 00000000 */ nop /* 63EC5C 80219A7C 46806320 */ cvt.s.w $f12, $f12 /* 63EC60 80219A80 46006302 */ mul.s $f12, $f12, $f0 -/* 63EC64 80219A84 00000000 */ nop +/* 63EC64 80219A84 00000000 */ nop /* 63EC68 80219A88 3C0143B4 */ lui $at, 0x43b4 /* 63EC6C 80219A8C 44810000 */ mtc1 $at, $f0 /* 63EC70 80219A90 3C014100 */ lui $at, 0x4100 /* 63EC74 80219A94 44811000 */ mtc1 $at, $f2 /* 63EC78 80219A98 46006303 */ div.s $f12, $f12, $f0 /* 63EC7C 80219A9C 46026302 */ mul.s $f12, $f12, $f2 -/* 63EC80 80219AA0 00000000 */ nop +/* 63EC80 80219AA0 00000000 */ nop /* 63EC84 80219AA4 8E120000 */ lw $s2, ($s0) /* 63EC88 80219AA8 26100004 */ addiu $s0, $s0, 4 /* 63EC8C 80219AAC 8E130000 */ lw $s3, ($s0) @@ -46,7 +46,7 @@ glabel func_80219A1C_63EBFC /* 63ECA0 80219AC0 44811000 */ mtc1 $at, $f2 /* 63ECA4 80219AC4 0240282D */ daddu $a1, $s2, $zero /* 63ECA8 80219AC8 46020502 */ mul.s $f20, $f0, $f2 -/* 63ECAC 80219ACC 00000000 */ nop +/* 63ECAC 80219ACC 00000000 */ nop /* 63ECB0 80219AD0 0C0B2026 */ jal set_variable /* 63ECB4 80219AD4 0000302D */ daddu $a2, $zero, $zero /* 63ECB8 80219AD8 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219D3C_63EF1C.s b/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219D3C_63EF1C.s index 2e18002baa..6a17391100 100644 --- a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219D3C_63EF1C.s +++ b/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219D3C_63EF1C.s @@ -25,17 +25,17 @@ glabel func_80219D3C_63EF1C /* 63EF6C 80219D8C 00071883 */ sra $v1, $a3, 2 /* 63EF70 80219D90 00621823 */ subu $v1, $v1, $v0 /* 63EF74 80219D94 44836000 */ mtc1 $v1, $f12 -/* 63EF78 80219D98 00000000 */ nop +/* 63EF78 80219D98 00000000 */ nop /* 63EF7C 80219D9C 46806320 */ cvt.s.w $f12, $f12 /* 63EF80 80219DA0 46006302 */ mul.s $f12, $f12, $f0 -/* 63EF84 80219DA4 00000000 */ nop +/* 63EF84 80219DA4 00000000 */ nop /* 63EF88 80219DA8 3C0143B4 */ lui $at, 0x43b4 /* 63EF8C 80219DAC 44810000 */ mtc1 $at, $f0 /* 63EF90 80219DB0 3C014100 */ lui $at, 0x4100 /* 63EF94 80219DB4 44811000 */ mtc1 $at, $f2 /* 63EF98 80219DB8 46006303 */ div.s $f12, $f12, $f0 /* 63EF9C 80219DBC 46026302 */ mul.s $f12, $f12, $f2 -/* 63EFA0 80219DC0 00000000 */ nop +/* 63EFA0 80219DC0 00000000 */ nop /* 63EFA4 80219DC4 8E120000 */ lw $s2, ($s0) /* 63EFA8 80219DC8 26100004 */ addiu $s0, $s0, 4 /* 63EFAC 80219DCC 8E130000 */ lw $s3, ($s0) @@ -46,7 +46,7 @@ glabel func_80219D3C_63EF1C /* 63EFC0 80219DE0 44811000 */ mtc1 $at, $f2 /* 63EFC4 80219DE4 0240282D */ daddu $a1, $s2, $zero /* 63EFC8 80219DE8 46020502 */ mul.s $f20, $f0, $f2 -/* 63EFCC 80219DEC 00000000 */ nop +/* 63EFCC 80219DEC 00000000 */ nop /* 63EFD0 80219DF0 0C0B2026 */ jal set_variable /* 63EFD4 80219DF4 0000302D */ daddu $a2, $zero, $zero /* 63EFD8 80219DF8 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219E40_63F020.s b/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219E40_63F020.s index 326ef39bd1..0f38da25af 100644 --- a/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219E40_63F020.s +++ b/asm/nonmatchings/battle/area_sam2/63D9F0/func_80219E40_63F020.s @@ -5,8 +5,8 @@ glabel func_80219E40_63F020 /* 63F020 80219E40 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 63F024 80219E44 AFBF0010 */ sw $ra, 0x10($sp) /* 63F028 80219E48 0C051C83 */ jal func_8014720C -/* 63F02C 80219E4C 00000000 */ nop +/* 63F02C 80219E4C 00000000 */ nop /* 63F030 80219E50 8FBF0010 */ lw $ra, 0x10($sp) /* 63F034 80219E54 03E00008 */ jr $ra /* 63F038 80219E58 27BD0018 */ addiu $sp, $sp, 0x18 -/* 63F03C 80219E5C 00000000 */ nop +/* 63F03C 80219E5C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_sbk/4DA6B0/func_802180D0_4DA6B0.s b/asm/nonmatchings/battle/area_sbk/4DA6B0/func_802180D0_4DA6B0.s index 0b6fef639c..07edd71eb6 100644 --- a/asm/nonmatchings/battle/area_sbk/4DA6B0/func_802180D0_4DA6B0.s +++ b/asm/nonmatchings/battle/area_sbk/4DA6B0/func_802180D0_4DA6B0.s @@ -18,7 +18,7 @@ glabel func_802180D0_4DA6B0 /* 4DA6E4 80218104 0C0B1EAF */ jal get_variable /* 4DA6E8 80218108 26100004 */ addiu $s0, $s0, 4 /* 4DA6EC 8021810C 4482A000 */ mtc1 $v0, $f20 -/* 4DA6F0 80218110 00000000 */ nop +/* 4DA6F0 80218110 00000000 */ nop /* 4DA6F4 80218114 4680A521 */ cvt.d.w $f20, $f20 /* 4DA6F8 80218118 3C014024 */ lui $at, 0x4024 /* 4DA6FC 8021811C 44810800 */ mtc1 $at, $f1 @@ -31,7 +31,7 @@ glabel func_802180D0_4DA6B0 /* 4DA718 80218138 44810000 */ mtc1 $at, $f0 /* 4DA71C 8021813C 4620A520 */ cvt.s.d $f20, $f20 /* 4DA720 80218140 4600A502 */ mul.s $f20, $f20, $f0 -/* 4DA724 80218144 00000000 */ nop +/* 4DA724 80218144 00000000 */ nop /* 4DA728 80218148 8E130000 */ lw $s3, ($s0) /* 4DA72C 8021814C 8E100004 */ lw $s0, 4($s0) /* 4DA730 80218150 3C0143B4 */ lui $at, 0x43b4 @@ -42,14 +42,14 @@ glabel func_802180D0_4DA6B0 /* 4DA744 80218164 0C00A85B */ jal sin_rad /* 4DA748 80218168 4600A306 */ mov.s $f12, $f20 /* 4DA74C 8021816C 46180582 */ mul.s $f22, $f0, $f24 -/* 4DA750 80218170 00000000 */ nop +/* 4DA750 80218170 00000000 */ nop /* 4DA754 80218174 4480D000 */ mtc1 $zero, $f26 -/* 4DA758 80218178 00000000 */ nop +/* 4DA758 80218178 00000000 */ nop /* 4DA75C 8021817C 461AB580 */ add.s $f22, $f22, $f26 /* 4DA760 80218180 0C00A874 */ jal cos_rad /* 4DA764 80218184 4600A306 */ mov.s $f12, $f20 /* 4DA768 80218188 46180502 */ mul.s $f20, $f0, $f24 -/* 4DA76C 8021818C 00000000 */ nop +/* 4DA76C 8021818C 00000000 */ nop /* 4DA770 80218190 3C01C37C */ lui $at, 0xc37c /* 4DA774 80218194 4481C000 */ mtc1 $at, $f24 /* 4DA778 80218198 C62000B8 */ lwc1 $f0, 0xb8($s1) diff --git a/asm/nonmatchings/battle/area_sbk/4DA6B0/func_80218220_4DA800.s b/asm/nonmatchings/battle/area_sbk/4DA6B0/func_80218220_4DA800.s index 18f5f6be47..07d755df2e 100644 --- a/asm/nonmatchings/battle/area_sbk/4DA6B0/func_80218220_4DA800.s +++ b/asm/nonmatchings/battle/area_sbk/4DA6B0/func_80218220_4DA800.s @@ -24,5 +24,5 @@ glabel func_80218220_4DA800 /* 4DA84C 8021826C 24020002 */ addiu $v0, $zero, 2 /* 4DA850 80218270 03E00008 */ jr $ra /* 4DA854 80218274 27BD0018 */ addiu $sp, $sp, 0x18 -/* 4DA858 80218278 00000000 */ nop -/* 4DA85C 8021827C 00000000 */ nop +/* 4DA858 80218278 00000000 */ nop +/* 4DA85C 8021827C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_tik/5EC690/func_80218200_5EC690.s b/asm/nonmatchings/battle/area_tik/5EC690/func_80218200_5EC690.s index 40f3db1e05..52ae6b4e5f 100644 --- a/asm/nonmatchings/battle/area_tik/5EC690/func_80218200_5EC690.s +++ b/asm/nonmatchings/battle/area_tik/5EC690/func_80218200_5EC690.s @@ -11,12 +11,12 @@ glabel func_80218200_5EC690 /* 5EC6A8 80218218 46007506 */ mov.s $f20, $f14 /* 5EC6AC 8021821C 4600A18D */ trunc.w.s $f6, $f20 /* 5EC6B0 80218220 44023000 */ mfc1 $v0, $f6 -/* 5EC6B4 80218224 00000000 */ nop +/* 5EC6B4 80218224 00000000 */ nop /* 5EC6B8 80218228 04420001 */ bltzl $v0, .L80218230 /* 5EC6BC 8021822C 00021023 */ negu $v0, $v0 .L80218230: /* 5EC6C0 80218230 44821000 */ mtc1 $v0, $f2 -/* 5EC6C4 80218234 00000000 */ nop +/* 5EC6C4 80218234 00000000 */ nop /* 5EC6C8 80218238 468010A0 */ cvt.s.w $f2, $f2 /* 5EC6CC 8021823C 46001103 */ div.s $f4, $f2, $f0 /* 5EC6D0 80218240 0000202D */ daddu $a0, $zero, $zero @@ -37,7 +37,7 @@ glabel func_80218200_5EC690 /* 5EC708 80218278 00471021 */ addu $v0, $v0, $a3 /* 5EC70C 8021827C C4400000 */ lwc1 $f0, ($v0) /* 5EC710 80218280 4604003C */ c.lt.s $f0, $f4 -/* 5EC714 80218284 00000000 */ nop +/* 5EC714 80218284 00000000 */ nop /* 5EC718 80218288 45020002 */ bc1fl .L80218294 /* 5EC71C 8021828C 0060302D */ daddu $a2, $v1, $zero /* 5EC720 80218290 0060202D */ daddu $a0, $v1, $zero @@ -62,43 +62,43 @@ glabel func_80218200_5EC690 /* 5EC768 802182D8 46001085 */ abs.s $f2, $f2 /* 5EC76C 802182DC 46000005 */ abs.s $f0, $f0 /* 5EC770 802182E0 4600103C */ c.lt.s $f2, $f0 -/* 5EC774 802182E4 00000000 */ nop +/* 5EC774 802182E4 00000000 */ nop /* 5EC778 802182E8 45000002 */ bc1f .L802182F4 /* 5EC77C 802182EC 00C0182D */ daddu $v1, $a2, $zero /* 5EC780 802182F0 0080182D */ daddu $v1, $a0, $zero .L802182F4: /* 5EC784 802182F4 44800000 */ mtc1 $zero, $f0 -/* 5EC788 802182F8 00000000 */ nop +/* 5EC788 802182F8 00000000 */ nop /* 5EC78C 802182FC 4600B03C */ c.lt.s $f22, $f0 -/* 5EC790 80218300 00000000 */ nop +/* 5EC790 80218300 00000000 */ nop /* 5EC794 80218304 4500000A */ bc1f .L80218330 -/* 5EC798 80218308 00000000 */ nop +/* 5EC798 80218308 00000000 */ nop /* 5EC79C 8021830C 4614003E */ c.le.s $f0, $f20 -/* 5EC7A0 80218310 00000000 */ nop +/* 5EC7A0 80218310 00000000 */ nop /* 5EC7A4 80218314 45000004 */ bc1f .L80218328 /* 5EC7A8 80218318 240200B4 */ addiu $v0, $zero, 0xb4 /* 5EC7AC 8021831C 00431823 */ subu $v1, $v0, $v1 /* 5EC7B0 80218320 44800000 */ mtc1 $zero, $f0 -/* 5EC7B4 80218324 00000000 */ nop +/* 5EC7B4 80218324 00000000 */ nop .L80218328: /* 5EC7B8 80218328 4600B03C */ c.lt.s $f22, $f0 -/* 5EC7BC 8021832C 00000000 */ nop +/* 5EC7BC 8021832C 00000000 */ nop .L80218330: /* 5EC7C0 80218330 45000005 */ bc1f .L80218348 -/* 5EC7C4 80218334 00000000 */ nop +/* 5EC7C4 80218334 00000000 */ nop /* 5EC7C8 80218338 4600A03C */ c.lt.s $f20, $f0 -/* 5EC7CC 8021833C 00000000 */ nop +/* 5EC7CC 8021833C 00000000 */ nop /* 5EC7D0 80218340 45030001 */ bc1tl .L80218348 /* 5EC7D4 80218344 246300B4 */ addiu $v1, $v1, 0xb4 .L80218348: /* 5EC7D8 80218348 44800000 */ mtc1 $zero, $f0 -/* 5EC7DC 8021834C 00000000 */ nop +/* 5EC7DC 8021834C 00000000 */ nop /* 5EC7E0 80218350 4616003E */ c.le.s $f0, $f22 -/* 5EC7E4 80218354 00000000 */ nop +/* 5EC7E4 80218354 00000000 */ nop /* 5EC7E8 80218358 45000006 */ bc1f .L80218374 -/* 5EC7EC 8021835C 00000000 */ nop +/* 5EC7EC 8021835C 00000000 */ nop /* 5EC7F0 80218360 4600A03C */ c.lt.s $f20, $f0 -/* 5EC7F4 80218364 00000000 */ nop +/* 5EC7F4 80218364 00000000 */ nop /* 5EC7F8 80218368 45000002 */ bc1f .L80218374 /* 5EC7FC 8021836C 24020168 */ addiu $v0, $zero, 0x168 /* 5EC800 80218370 00431823 */ subu $v1, $v0, $v1 diff --git a/asm/nonmatchings/battle/area_tik/5EC690/func_8021838C_5EC81C.s b/asm/nonmatchings/battle/area_tik/5EC690/func_8021838C_5EC81C.s index 9c11c7707e..54c197dc39 100644 --- a/asm/nonmatchings/battle/area_tik/5EC690/func_8021838C_5EC81C.s +++ b/asm/nonmatchings/battle/area_tik/5EC690/func_8021838C_5EC81C.s @@ -36,7 +36,7 @@ glabel func_8021838C_5EC81C /* 5EC898 80218408 0C0B1EAF */ jal get_variable /* 5EC89C 8021840C 02118023 */ subu $s0, $s0, $s1 /* 5EC8A0 80218410 16600006 */ bnez $s3, .L8021842C -/* 5EC8A4 80218414 00000000 */ nop +/* 5EC8A4 80218414 00000000 */ nop /* 5EC8A8 80218418 16000004 */ bnez $s0, .L8021842C /* 5EC8AC 8021841C 0280202D */ daddu $a0, $s4, $zero /* 5EC8B0 80218420 8E450000 */ lw $a1, ($s2) @@ -44,10 +44,10 @@ glabel func_8021838C_5EC81C /* 5EC8B8 80218428 0040302D */ daddu $a2, $v0, $zero .L8021842C: /* 5EC8BC 8021842C 44936000 */ mtc1 $s3, $f12 -/* 5EC8C0 80218430 00000000 */ nop +/* 5EC8C0 80218430 00000000 */ nop /* 5EC8C4 80218434 46806320 */ cvt.s.w $f12, $f12 /* 5EC8C8 80218438 44907000 */ mtc1 $s0, $f14 -/* 5EC8CC 8021843C 00000000 */ nop +/* 5EC8CC 8021843C 00000000 */ nop /* 5EC8D0 80218440 0C086080 */ jal func_80218200_5EC690 /* 5EC8D4 80218444 468073A0 */ cvt.s.w $f14, $f14 /* 5EC8D8 80218448 0280202D */ daddu $a0, $s4, $zero @@ -55,7 +55,7 @@ glabel func_8021838C_5EC81C /* 5EC8E0 80218450 2446FFA6 */ addiu $a2, $v0, -0x5a .L80218454: /* 5EC8E4 80218454 0C0B2026 */ jal set_variable -/* 5EC8E8 80218458 00000000 */ nop +/* 5EC8E8 80218458 00000000 */ nop /* 5EC8EC 8021845C 24020002 */ addiu $v0, $zero, 2 /* 5EC8F0 80218460 8FBF0024 */ lw $ra, 0x24($sp) /* 5EC8F4 80218464 8FB40020 */ lw $s4, 0x20($sp) diff --git a/asm/nonmatchings/battle/area_tik/5EC690/func_80218480_5EC910.s b/asm/nonmatchings/battle/area_tik/5EC690/func_80218480_5EC910.s index cc3ecaa159..eece74dc3e 100644 --- a/asm/nonmatchings/battle/area_tik/5EC690/func_80218480_5EC910.s +++ b/asm/nonmatchings/battle/area_tik/5EC690/func_80218480_5EC910.s @@ -11,12 +11,12 @@ glabel func_80218480_5EC910 /* 5EC928 80218498 46007506 */ mov.s $f20, $f14 /* 5EC92C 8021849C 4600A18D */ trunc.w.s $f6, $f20 /* 5EC930 802184A0 44023000 */ mfc1 $v0, $f6 -/* 5EC934 802184A4 00000000 */ nop +/* 5EC934 802184A4 00000000 */ nop /* 5EC938 802184A8 04420001 */ bltzl $v0, .L802184B0 /* 5EC93C 802184AC 00021023 */ negu $v0, $v0 .L802184B0: /* 5EC940 802184B0 44821000 */ mtc1 $v0, $f2 -/* 5EC944 802184B4 00000000 */ nop +/* 5EC944 802184B4 00000000 */ nop /* 5EC948 802184B8 468010A0 */ cvt.s.w $f2, $f2 /* 5EC94C 802184BC 46001103 */ div.s $f4, $f2, $f0 /* 5EC950 802184C0 0000202D */ daddu $a0, $zero, $zero @@ -37,7 +37,7 @@ glabel func_80218480_5EC910 /* 5EC988 802184F8 00471021 */ addu $v0, $v0, $a3 /* 5EC98C 802184FC C4400000 */ lwc1 $f0, ($v0) /* 5EC990 80218500 4604003C */ c.lt.s $f0, $f4 -/* 5EC994 80218504 00000000 */ nop +/* 5EC994 80218504 00000000 */ nop /* 5EC998 80218508 45020002 */ bc1fl .L80218514 /* 5EC99C 8021850C 0060302D */ daddu $a2, $v1, $zero /* 5EC9A0 80218510 0060202D */ daddu $a0, $v1, $zero @@ -62,43 +62,43 @@ glabel func_80218480_5EC910 /* 5EC9E8 80218558 46001085 */ abs.s $f2, $f2 /* 5EC9EC 8021855C 46000005 */ abs.s $f0, $f0 /* 5EC9F0 80218560 4600103C */ c.lt.s $f2, $f0 -/* 5EC9F4 80218564 00000000 */ nop +/* 5EC9F4 80218564 00000000 */ nop /* 5EC9F8 80218568 45000002 */ bc1f .L80218574 /* 5EC9FC 8021856C 00C0182D */ daddu $v1, $a2, $zero /* 5ECA00 80218570 0080182D */ daddu $v1, $a0, $zero .L80218574: /* 5ECA04 80218574 44800000 */ mtc1 $zero, $f0 -/* 5ECA08 80218578 00000000 */ nop +/* 5ECA08 80218578 00000000 */ nop /* 5ECA0C 8021857C 4600B03C */ c.lt.s $f22, $f0 -/* 5ECA10 80218580 00000000 */ nop +/* 5ECA10 80218580 00000000 */ nop /* 5ECA14 80218584 4500000A */ bc1f .L802185B0 -/* 5ECA18 80218588 00000000 */ nop +/* 5ECA18 80218588 00000000 */ nop /* 5ECA1C 8021858C 4614003E */ c.le.s $f0, $f20 -/* 5ECA20 80218590 00000000 */ nop +/* 5ECA20 80218590 00000000 */ nop /* 5ECA24 80218594 45000004 */ bc1f .L802185A8 /* 5ECA28 80218598 240200B4 */ addiu $v0, $zero, 0xb4 /* 5ECA2C 8021859C 00431823 */ subu $v1, $v0, $v1 /* 5ECA30 802185A0 44800000 */ mtc1 $zero, $f0 -/* 5ECA34 802185A4 00000000 */ nop +/* 5ECA34 802185A4 00000000 */ nop .L802185A8: /* 5ECA38 802185A8 4600B03C */ c.lt.s $f22, $f0 -/* 5ECA3C 802185AC 00000000 */ nop +/* 5ECA3C 802185AC 00000000 */ nop .L802185B0: /* 5ECA40 802185B0 45000005 */ bc1f .L802185C8 -/* 5ECA44 802185B4 00000000 */ nop +/* 5ECA44 802185B4 00000000 */ nop /* 5ECA48 802185B8 4600A03C */ c.lt.s $f20, $f0 -/* 5ECA4C 802185BC 00000000 */ nop +/* 5ECA4C 802185BC 00000000 */ nop /* 5ECA50 802185C0 45030001 */ bc1tl .L802185C8 /* 5ECA54 802185C4 246300B4 */ addiu $v1, $v1, 0xb4 .L802185C8: /* 5ECA58 802185C8 44800000 */ mtc1 $zero, $f0 -/* 5ECA5C 802185CC 00000000 */ nop +/* 5ECA5C 802185CC 00000000 */ nop /* 5ECA60 802185D0 4616003E */ c.le.s $f0, $f22 -/* 5ECA64 802185D4 00000000 */ nop +/* 5ECA64 802185D4 00000000 */ nop /* 5ECA68 802185D8 45000006 */ bc1f .L802185F4 -/* 5ECA6C 802185DC 00000000 */ nop +/* 5ECA6C 802185DC 00000000 */ nop /* 5ECA70 802185E0 4600A03C */ c.lt.s $f20, $f0 -/* 5ECA74 802185E4 00000000 */ nop +/* 5ECA74 802185E4 00000000 */ nop /* 5ECA78 802185E8 45000002 */ bc1f .L802185F4 /* 5ECA7C 802185EC 24020168 */ addiu $v0, $zero, 0x168 /* 5ECA80 802185F0 00431823 */ subu $v1, $v0, $v1 diff --git a/asm/nonmatchings/battle/area_tik/5EC690/func_8021860C_5ECA9C.s b/asm/nonmatchings/battle/area_tik/5EC690/func_8021860C_5ECA9C.s index 7b0bfc1be6..3e668b4b9b 100644 --- a/asm/nonmatchings/battle/area_tik/5EC690/func_8021860C_5ECA9C.s +++ b/asm/nonmatchings/battle/area_tik/5EC690/func_8021860C_5ECA9C.s @@ -36,7 +36,7 @@ glabel func_8021860C_5ECA9C /* 5ECB18 80218688 0C0B1EAF */ jal get_variable /* 5ECB1C 8021868C 02118023 */ subu $s0, $s0, $s1 /* 5ECB20 80218690 16600006 */ bnez $s3, .L802186AC -/* 5ECB24 80218694 00000000 */ nop +/* 5ECB24 80218694 00000000 */ nop /* 5ECB28 80218698 16000004 */ bnez $s0, .L802186AC /* 5ECB2C 8021869C 0280202D */ daddu $a0, $s4, $zero /* 5ECB30 802186A0 8E450000 */ lw $a1, ($s2) @@ -44,10 +44,10 @@ glabel func_8021860C_5ECA9C /* 5ECB38 802186A8 0040302D */ daddu $a2, $v0, $zero .L802186AC: /* 5ECB3C 802186AC 44936000 */ mtc1 $s3, $f12 -/* 5ECB40 802186B0 00000000 */ nop +/* 5ECB40 802186B0 00000000 */ nop /* 5ECB44 802186B4 46806320 */ cvt.s.w $f12, $f12 /* 5ECB48 802186B8 44907000 */ mtc1 $s0, $f14 -/* 5ECB4C 802186BC 00000000 */ nop +/* 5ECB4C 802186BC 00000000 */ nop /* 5ECB50 802186C0 0C086120 */ jal func_80218480_5EC910 /* 5ECB54 802186C4 468073A0 */ cvt.s.w $f14, $f14 /* 5ECB58 802186C8 0280202D */ daddu $a0, $s4, $zero @@ -55,7 +55,7 @@ glabel func_8021860C_5ECA9C /* 5ECB60 802186D0 2446FFA6 */ addiu $a2, $v0, -0x5a .L802186D4: /* 5ECB64 802186D4 0C0B2026 */ jal set_variable -/* 5ECB68 802186D8 00000000 */ nop +/* 5ECB68 802186D8 00000000 */ nop /* 5ECB6C 802186DC 24020002 */ addiu $v0, $zero, 2 /* 5ECB70 802186E0 8FBF0024 */ lw $ra, 0x24($sp) /* 5ECB74 802186E4 8FB40020 */ lw $s4, 0x20($sp) diff --git a/asm/nonmatchings/battle/area_tik/5EC690/func_80218758_5ECBE8.s b/asm/nonmatchings/battle/area_tik/5EC690/func_80218758_5ECBE8.s index 22cb8806a0..ec8bc8eff8 100644 --- a/asm/nonmatchings/battle/area_tik/5EC690/func_80218758_5ECBE8.s +++ b/asm/nonmatchings/battle/area_tik/5EC690/func_80218758_5ECBE8.s @@ -11,12 +11,12 @@ glabel func_80218758_5ECBE8 /* 5ECC00 80218770 46007506 */ mov.s $f20, $f14 /* 5ECC04 80218774 4600A18D */ trunc.w.s $f6, $f20 /* 5ECC08 80218778 44023000 */ mfc1 $v0, $f6 -/* 5ECC0C 8021877C 00000000 */ nop +/* 5ECC0C 8021877C 00000000 */ nop /* 5ECC10 80218780 04420001 */ bltzl $v0, .L80218788 /* 5ECC14 80218784 00021023 */ negu $v0, $v0 .L80218788: /* 5ECC18 80218788 44821000 */ mtc1 $v0, $f2 -/* 5ECC1C 8021878C 00000000 */ nop +/* 5ECC1C 8021878C 00000000 */ nop /* 5ECC20 80218790 468010A0 */ cvt.s.w $f2, $f2 /* 5ECC24 80218794 46001103 */ div.s $f4, $f2, $f0 /* 5ECC28 80218798 0000202D */ daddu $a0, $zero, $zero @@ -37,7 +37,7 @@ glabel func_80218758_5ECBE8 /* 5ECC60 802187D0 00471021 */ addu $v0, $v0, $a3 /* 5ECC64 802187D4 C4400000 */ lwc1 $f0, ($v0) /* 5ECC68 802187D8 4604003C */ c.lt.s $f0, $f4 -/* 5ECC6C 802187DC 00000000 */ nop +/* 5ECC6C 802187DC 00000000 */ nop /* 5ECC70 802187E0 45020002 */ bc1fl .L802187EC /* 5ECC74 802187E4 0060302D */ daddu $a2, $v1, $zero /* 5ECC78 802187E8 0060202D */ daddu $a0, $v1, $zero @@ -62,43 +62,43 @@ glabel func_80218758_5ECBE8 /* 5ECCC0 80218830 46001085 */ abs.s $f2, $f2 /* 5ECCC4 80218834 46000005 */ abs.s $f0, $f0 /* 5ECCC8 80218838 4600103C */ c.lt.s $f2, $f0 -/* 5ECCCC 8021883C 00000000 */ nop +/* 5ECCCC 8021883C 00000000 */ nop /* 5ECCD0 80218840 45000002 */ bc1f .L8021884C /* 5ECCD4 80218844 00C0182D */ daddu $v1, $a2, $zero /* 5ECCD8 80218848 0080182D */ daddu $v1, $a0, $zero .L8021884C: /* 5ECCDC 8021884C 44800000 */ mtc1 $zero, $f0 -/* 5ECCE0 80218850 00000000 */ nop +/* 5ECCE0 80218850 00000000 */ nop /* 5ECCE4 80218854 4600B03C */ c.lt.s $f22, $f0 -/* 5ECCE8 80218858 00000000 */ nop +/* 5ECCE8 80218858 00000000 */ nop /* 5ECCEC 8021885C 4500000A */ bc1f .L80218888 -/* 5ECCF0 80218860 00000000 */ nop +/* 5ECCF0 80218860 00000000 */ nop /* 5ECCF4 80218864 4614003E */ c.le.s $f0, $f20 -/* 5ECCF8 80218868 00000000 */ nop +/* 5ECCF8 80218868 00000000 */ nop /* 5ECCFC 8021886C 45000004 */ bc1f .L80218880 /* 5ECD00 80218870 240200B4 */ addiu $v0, $zero, 0xb4 /* 5ECD04 80218874 00431823 */ subu $v1, $v0, $v1 /* 5ECD08 80218878 44800000 */ mtc1 $zero, $f0 -/* 5ECD0C 8021887C 00000000 */ nop +/* 5ECD0C 8021887C 00000000 */ nop .L80218880: /* 5ECD10 80218880 4600B03C */ c.lt.s $f22, $f0 -/* 5ECD14 80218884 00000000 */ nop +/* 5ECD14 80218884 00000000 */ nop .L80218888: /* 5ECD18 80218888 45000005 */ bc1f .L802188A0 -/* 5ECD1C 8021888C 00000000 */ nop +/* 5ECD1C 8021888C 00000000 */ nop /* 5ECD20 80218890 4600A03C */ c.lt.s $f20, $f0 -/* 5ECD24 80218894 00000000 */ nop +/* 5ECD24 80218894 00000000 */ nop /* 5ECD28 80218898 45030001 */ bc1tl .L802188A0 /* 5ECD2C 8021889C 246300B4 */ addiu $v1, $v1, 0xb4 .L802188A0: /* 5ECD30 802188A0 44800000 */ mtc1 $zero, $f0 -/* 5ECD34 802188A4 00000000 */ nop +/* 5ECD34 802188A4 00000000 */ nop /* 5ECD38 802188A8 4616003E */ c.le.s $f0, $f22 -/* 5ECD3C 802188AC 00000000 */ nop +/* 5ECD3C 802188AC 00000000 */ nop /* 5ECD40 802188B0 45000006 */ bc1f .L802188CC -/* 5ECD44 802188B4 00000000 */ nop +/* 5ECD44 802188B4 00000000 */ nop /* 5ECD48 802188B8 4600A03C */ c.lt.s $f20, $f0 -/* 5ECD4C 802188BC 00000000 */ nop +/* 5ECD4C 802188BC 00000000 */ nop /* 5ECD50 802188C0 45000002 */ bc1f .L802188CC /* 5ECD54 802188C4 24020168 */ addiu $v0, $zero, 0x168 /* 5ECD58 802188C8 00431823 */ subu $v1, $v0, $v1 diff --git a/asm/nonmatchings/battle/area_tik/5EC690/func_802188E4_5ECD74.s b/asm/nonmatchings/battle/area_tik/5EC690/func_802188E4_5ECD74.s index 1a940c2e3b..95ea4a982d 100644 --- a/asm/nonmatchings/battle/area_tik/5EC690/func_802188E4_5ECD74.s +++ b/asm/nonmatchings/battle/area_tik/5EC690/func_802188E4_5ECD74.s @@ -36,7 +36,7 @@ glabel func_802188E4_5ECD74 /* 5ECDF0 80218960 0C0B1EAF */ jal get_variable /* 5ECDF4 80218964 02118023 */ subu $s0, $s0, $s1 /* 5ECDF8 80218968 16600006 */ bnez $s3, .L80218984 -/* 5ECDFC 8021896C 00000000 */ nop +/* 5ECDFC 8021896C 00000000 */ nop /* 5ECE00 80218970 16000004 */ bnez $s0, .L80218984 /* 5ECE04 80218974 0280202D */ daddu $a0, $s4, $zero /* 5ECE08 80218978 8E450000 */ lw $a1, ($s2) @@ -44,10 +44,10 @@ glabel func_802188E4_5ECD74 /* 5ECE10 80218980 0040302D */ daddu $a2, $v0, $zero .L80218984: /* 5ECE14 80218984 44936000 */ mtc1 $s3, $f12 -/* 5ECE18 80218988 00000000 */ nop +/* 5ECE18 80218988 00000000 */ nop /* 5ECE1C 8021898C 46806320 */ cvt.s.w $f12, $f12 /* 5ECE20 80218990 44907000 */ mtc1 $s0, $f14 -/* 5ECE24 80218994 00000000 */ nop +/* 5ECE24 80218994 00000000 */ nop /* 5ECE28 80218998 0C0861D6 */ jal func_80218758_5ECBE8 /* 5ECE2C 8021899C 468073A0 */ cvt.s.w $f14, $f14 /* 5ECE30 802189A0 0280202D */ daddu $a0, $s4, $zero @@ -55,7 +55,7 @@ glabel func_802188E4_5ECD74 /* 5ECE38 802189A8 2446FFA6 */ addiu $a2, $v0, -0x5a .L802189AC: /* 5ECE3C 802189AC 0C0B2026 */ jal set_variable -/* 5ECE40 802189B0 00000000 */ nop +/* 5ECE40 802189B0 00000000 */ nop /* 5ECE44 802189B4 24020002 */ addiu $v0, $zero, 2 /* 5ECE48 802189B8 8FBF0024 */ lw $ra, 0x24($sp) /* 5ECE4C 802189BC 8FB40020 */ lw $s4, 0x20($sp) @@ -65,5 +65,5 @@ glabel func_802188E4_5ECD74 /* 5ECE5C 802189CC 8FB00010 */ lw $s0, 0x10($sp) /* 5ECE60 802189D0 03E00008 */ jr $ra /* 5ECE64 802189D4 27BD0028 */ addiu $sp, $sp, 0x28 -/* 5ECE68 802189D8 00000000 */ nop -/* 5ECE6C 802189DC 00000000 */ nop +/* 5ECE68 802189D8 00000000 */ nop +/* 5ECE6C 802189DC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_tik/5ED010/func_80218B80_5ED010.s b/asm/nonmatchings/battle/area_tik/5ED010/func_80218B80_5ED010.s index c7dc2fd3e3..d1a8c7d962 100644 --- a/asm/nonmatchings/battle/area_tik/5ED010/func_80218B80_5ED010.s +++ b/asm/nonmatchings/battle/area_tik/5ED010/func_80218B80_5ED010.s @@ -32,58 +32,58 @@ glabel func_80218B80_5ED010 /* 5ED07C 80218BEC C6200098 */ lwc1 $f0, 0x98($s1) /* 5ED080 80218BF0 46001081 */ sub.s $f2, $f2, $f0 /* 5ED084 80218BF4 46021182 */ mul.s $f6, $f2, $f2 -/* 5ED088 80218BF8 00000000 */ nop +/* 5ED088 80218BF8 00000000 */ nop /* 5ED08C 80218BFC C62000A0 */ lwc1 $f0, 0xa0($s1) /* 5ED090 80218C00 C602014C */ lwc1 $f2, 0x14c($s0) /* 5ED094 80218C04 46001081 */ sub.s $f2, $f2, $f0 /* 5ED098 80218C08 46021102 */ mul.s $f4, $f2, $f2 -/* 5ED09C 80218C0C 00000000 */ nop +/* 5ED09C 80218C0C 00000000 */ nop /* 5ED0A0 80218C10 92020191 */ lbu $v0, 0x191($s0) /* 5ED0A4 80218C14 C6020148 */ lwc1 $f2, 0x148($s0) /* 5ED0A8 80218C18 44820000 */ mtc1 $v0, $f0 -/* 5ED0AC 80218C1C 00000000 */ nop +/* 5ED0AC 80218C1C 00000000 */ nop /* 5ED0B0 80218C20 46800020 */ cvt.s.w $f0, $f0 /* 5ED0B4 80218C24 46001080 */ add.s $f2, $f2, $f0 /* 5ED0B8 80218C28 3C013FC0 */ lui $at, 0x3fc0 /* 5ED0BC 80218C2C 44810000 */ mtc1 $at, $f0 -/* 5ED0C0 80218C30 00000000 */ nop +/* 5ED0C0 80218C30 00000000 */ nop /* 5ED0C4 80218C34 46001081 */ sub.s $f2, $f2, $f0 /* 5ED0C8 80218C38 46043300 */ add.s $f12, $f6, $f4 /* 5ED0CC 80218C3C C620009C */ lwc1 $f0, 0x9c($s1) /* 5ED0D0 80218C40 46001501 */ sub.s $f20, $f2, $f0 /* 5ED0D4 80218C44 46006084 */ sqrt.s $f2, $f12 /* 5ED0D8 80218C48 46021032 */ c.eq.s $f2, $f2 -/* 5ED0DC 80218C4C 00000000 */ nop +/* 5ED0DC 80218C4C 00000000 */ nop /* 5ED0E0 80218C50 45010004 */ bc1t .L80218C64 -/* 5ED0E4 80218C54 00000000 */ nop +/* 5ED0E4 80218C54 00000000 */ nop /* 5ED0E8 80218C58 0C0187BC */ jal sqrtf -/* 5ED0EC 80218C5C 00000000 */ nop +/* 5ED0EC 80218C5C 00000000 */ nop /* 5ED0F0 80218C60 46000086 */ mov.s $f2, $f0 .L80218C64: /* 5ED0F4 80218C64 44800000 */ mtc1 $zero, $f0 -/* 5ED0F8 80218C68 00000000 */ nop +/* 5ED0F8 80218C68 00000000 */ nop /* 5ED0FC 80218C6C 4614003C */ c.lt.s $f0, $f20 -/* 5ED100 80218C70 00000000 */ nop +/* 5ED100 80218C70 00000000 */ nop /* 5ED104 80218C74 45000017 */ bc1f .L80218CD4 /* 5ED108 80218C78 46001106 */ mov.s $f4, $f2 /* 5ED10C 80218C7C 92020191 */ lbu $v0, 0x191($s0) /* 5ED110 80218C80 44820000 */ mtc1 $v0, $f0 -/* 5ED114 80218C84 00000000 */ nop +/* 5ED114 80218C84 00000000 */ nop /* 5ED118 80218C88 46800020 */ cvt.s.w $f0, $f0 /* 5ED11C 80218C8C 4600A03C */ c.lt.s $f20, $f0 -/* 5ED120 80218C90 00000000 */ nop +/* 5ED120 80218C90 00000000 */ nop /* 5ED124 80218C94 4500000F */ bc1f .L80218CD4 -/* 5ED128 80218C98 00000000 */ nop +/* 5ED128 80218C98 00000000 */ nop /* 5ED12C 80218C9C 92020190 */ lbu $v0, 0x190($s0) /* 5ED130 80218CA0 3C013F00 */ lui $at, 0x3f00 /* 5ED134 80218CA4 44811000 */ mtc1 $at, $f2 /* 5ED138 80218CA8 44820000 */ mtc1 $v0, $f0 -/* 5ED13C 80218CAC 00000000 */ nop +/* 5ED13C 80218CAC 00000000 */ nop /* 5ED140 80218CB0 46800020 */ cvt.s.w $f0, $f0 /* 5ED144 80218CB4 46020002 */ mul.s $f0, $f0, $f2 -/* 5ED148 80218CB8 00000000 */ nop +/* 5ED148 80218CB8 00000000 */ nop /* 5ED14C 80218CBC 4600203C */ c.lt.s $f4, $f0 -/* 5ED150 80218CC0 00000000 */ nop +/* 5ED150 80218CC0 00000000 */ nop /* 5ED154 80218CC4 45000003 */ bc1f .L80218CD4 /* 5ED158 80218CC8 24020001 */ addiu $v0, $zero, 1 /* 5ED15C 80218CCC 080863F7 */ j .L80218FDC @@ -96,58 +96,58 @@ glabel func_80218B80_5ED010 /* 5ED174 80218CE4 C6200098 */ lwc1 $f0, 0x98($s1) /* 5ED178 80218CE8 46001081 */ sub.s $f2, $f2, $f0 /* 5ED17C 80218CEC 46021182 */ mul.s $f6, $f2, $f2 -/* 5ED180 80218CF0 00000000 */ nop +/* 5ED180 80218CF0 00000000 */ nop /* 5ED184 80218CF4 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 5ED188 80218CF8 C602014C */ lwc1 $f2, 0x14c($s0) /* 5ED18C 80218CFC 46001081 */ sub.s $f2, $f2, $f0 /* 5ED190 80218D00 46021102 */ mul.s $f4, $f2, $f2 -/* 5ED194 80218D04 00000000 */ nop +/* 5ED194 80218D04 00000000 */ nop /* 5ED198 80218D08 92020191 */ lbu $v0, 0x191($s0) /* 5ED19C 80218D0C C6020148 */ lwc1 $f2, 0x148($s0) /* 5ED1A0 80218D10 44820000 */ mtc1 $v0, $f0 -/* 5ED1A4 80218D14 00000000 */ nop +/* 5ED1A4 80218D14 00000000 */ nop /* 5ED1A8 80218D18 46800020 */ cvt.s.w $f0, $f0 /* 5ED1AC 80218D1C 46001080 */ add.s $f2, $f2, $f0 /* 5ED1B0 80218D20 3C013FC0 */ lui $at, 0x3fc0 /* 5ED1B4 80218D24 44810000 */ mtc1 $at, $f0 -/* 5ED1B8 80218D28 00000000 */ nop +/* 5ED1B8 80218D28 00000000 */ nop /* 5ED1BC 80218D2C 46001081 */ sub.s $f2, $f2, $f0 /* 5ED1C0 80218D30 46043300 */ add.s $f12, $f6, $f4 /* 5ED1C4 80218D34 C620009C */ lwc1 $f0, 0x9c($s1) /* 5ED1C8 80218D38 46001501 */ sub.s $f20, $f2, $f0 /* 5ED1CC 80218D3C 46006084 */ sqrt.s $f2, $f12 /* 5ED1D0 80218D40 46021032 */ c.eq.s $f2, $f2 -/* 5ED1D4 80218D44 00000000 */ nop +/* 5ED1D4 80218D44 00000000 */ nop /* 5ED1D8 80218D48 45010004 */ bc1t .L80218D5C -/* 5ED1DC 80218D4C 00000000 */ nop +/* 5ED1DC 80218D4C 00000000 */ nop /* 5ED1E0 80218D50 0C0187BC */ jal sqrtf -/* 5ED1E4 80218D54 00000000 */ nop +/* 5ED1E4 80218D54 00000000 */ nop /* 5ED1E8 80218D58 46000086 */ mov.s $f2, $f0 .L80218D5C: /* 5ED1EC 80218D5C 44800000 */ mtc1 $zero, $f0 -/* 5ED1F0 80218D60 00000000 */ nop +/* 5ED1F0 80218D60 00000000 */ nop /* 5ED1F4 80218D64 4614003C */ c.lt.s $f0, $f20 -/* 5ED1F8 80218D68 00000000 */ nop +/* 5ED1F8 80218D68 00000000 */ nop /* 5ED1FC 80218D6C 4500001B */ bc1f .L80218DDC /* 5ED200 80218D70 46001106 */ mov.s $f4, $f2 /* 5ED204 80218D74 92020191 */ lbu $v0, 0x191($s0) /* 5ED208 80218D78 44820000 */ mtc1 $v0, $f0 -/* 5ED20C 80218D7C 00000000 */ nop +/* 5ED20C 80218D7C 00000000 */ nop /* 5ED210 80218D80 46800020 */ cvt.s.w $f0, $f0 /* 5ED214 80218D84 4600A03C */ c.lt.s $f20, $f0 -/* 5ED218 80218D88 00000000 */ nop +/* 5ED218 80218D88 00000000 */ nop /* 5ED21C 80218D8C 45000014 */ bc1f .L80218DE0 /* 5ED220 80218D90 0000982D */ daddu $s3, $zero, $zero /* 5ED224 80218D94 92020190 */ lbu $v0, 0x190($s0) /* 5ED228 80218D98 3C013F00 */ lui $at, 0x3f00 /* 5ED22C 80218D9C 44811000 */ mtc1 $at, $f2 /* 5ED230 80218DA0 44820000 */ mtc1 $v0, $f0 -/* 5ED234 80218DA4 00000000 */ nop +/* 5ED234 80218DA4 00000000 */ nop /* 5ED238 80218DA8 46800020 */ cvt.s.w $f0, $f0 /* 5ED23C 80218DAC 46020002 */ mul.s $f0, $f0, $f2 -/* 5ED240 80218DB0 00000000 */ nop +/* 5ED240 80218DB0 00000000 */ nop /* 5ED244 80218DB4 4600203C */ c.lt.s $f4, $f0 -/* 5ED248 80218DB8 00000000 */ nop +/* 5ED248 80218DB8 00000000 */ nop /* 5ED24C 80218DBC 45000008 */ bc1f .L80218DE0 /* 5ED250 80218DC0 24020001 */ addiu $v0, $zero, 1 /* 5ED254 80218DC4 080863F7 */ j .L80218FDC @@ -179,16 +179,16 @@ glabel func_80218B80_5ED010 /* 5ED2A8 80218E18 C6200098 */ lwc1 $f0, 0x98($s1) /* 5ED2AC 80218E1C 46001081 */ sub.s $f2, $f2, $f0 /* 5ED2B0 80218E20 46021182 */ mul.s $f6, $f2, $f2 -/* 5ED2B4 80218E24 00000000 */ nop +/* 5ED2B4 80218E24 00000000 */ nop /* 5ED2B8 80218E28 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 5ED2BC 80218E2C C602014C */ lwc1 $f2, 0x14c($s0) /* 5ED2C0 80218E30 46001081 */ sub.s $f2, $f2, $f0 /* 5ED2C4 80218E34 46021102 */ mul.s $f4, $f2, $f2 -/* 5ED2C8 80218E38 00000000 */ nop +/* 5ED2C8 80218E38 00000000 */ nop /* 5ED2CC 80218E3C 92020191 */ lbu $v0, 0x191($s0) /* 5ED2D0 80218E40 C6020148 */ lwc1 $f2, 0x148($s0) /* 5ED2D4 80218E44 44820000 */ mtc1 $v0, $f0 -/* 5ED2D8 80218E48 00000000 */ nop +/* 5ED2D8 80218E48 00000000 */ nop /* 5ED2DC 80218E4C 46800020 */ cvt.s.w $f0, $f0 /* 5ED2E0 80218E50 46001080 */ add.s $f2, $f2, $f0 /* 5ED2E4 80218E54 461A1081 */ sub.s $f2, $f2, $f26 @@ -197,32 +197,32 @@ glabel func_80218B80_5ED010 /* 5ED2F0 80218E60 46001501 */ sub.s $f20, $f2, $f0 /* 5ED2F4 80218E64 46006004 */ sqrt.s $f0, $f12 /* 5ED2F8 80218E68 46000032 */ c.eq.s $f0, $f0 -/* 5ED2FC 80218E6C 00000000 */ nop +/* 5ED2FC 80218E6C 00000000 */ nop /* 5ED300 80218E70 45010003 */ bc1t .L80218E80 -/* 5ED304 80218E74 00000000 */ nop +/* 5ED304 80218E74 00000000 */ nop /* 5ED308 80218E78 0C0187BC */ jal sqrtf -/* 5ED30C 80218E7C 00000000 */ nop +/* 5ED30C 80218E7C 00000000 */ nop .L80218E80: /* 5ED310 80218E80 4614C03C */ c.lt.s $f24, $f20 -/* 5ED314 80218E84 00000000 */ nop +/* 5ED314 80218E84 00000000 */ nop /* 5ED318 80218E88 45000013 */ bc1f .L80218ED8 /* 5ED31C 80218E8C 46000106 */ mov.s $f4, $f0 /* 5ED320 80218E90 92020191 */ lbu $v0, 0x191($s0) /* 5ED324 80218E94 44820000 */ mtc1 $v0, $f0 -/* 5ED328 80218E98 00000000 */ nop +/* 5ED328 80218E98 00000000 */ nop /* 5ED32C 80218E9C 46800020 */ cvt.s.w $f0, $f0 /* 5ED330 80218EA0 4600A03C */ c.lt.s $f20, $f0 -/* 5ED334 80218EA4 00000000 */ nop +/* 5ED334 80218EA4 00000000 */ nop /* 5ED338 80218EA8 4500000B */ bc1f .L80218ED8 -/* 5ED33C 80218EAC 00000000 */ nop +/* 5ED33C 80218EAC 00000000 */ nop /* 5ED340 80218EB0 92020190 */ lbu $v0, 0x190($s0) /* 5ED344 80218EB4 44820000 */ mtc1 $v0, $f0 -/* 5ED348 80218EB8 00000000 */ nop +/* 5ED348 80218EB8 00000000 */ nop /* 5ED34C 80218EBC 46800020 */ cvt.s.w $f0, $f0 /* 5ED350 80218EC0 46160002 */ mul.s $f0, $f0, $f22 -/* 5ED354 80218EC4 00000000 */ nop +/* 5ED354 80218EC4 00000000 */ nop /* 5ED358 80218EC8 4600203C */ c.lt.s $f4, $f0 -/* 5ED35C 80218ECC 00000000 */ nop +/* 5ED35C 80218ECC 00000000 */ nop /* 5ED360 80218ED0 4501FFBE */ bc1t .L80218DCC /* 5ED364 80218ED4 24020001 */ addiu $v0, $zero, 1 .L80218ED8: @@ -235,21 +235,21 @@ glabel func_80218B80_5ED010 /* 5ED37C 80218EEC 14400034 */ bnez $v0, .L80218FC0 /* 5ED380 80218EF0 00751024 */ and $v0, $v1, $s5 /* 5ED384 80218EF4 10400032 */ beqz $v0, .L80218FC0 -/* 5ED388 80218EF8 00000000 */ nop +/* 5ED388 80218EF8 00000000 */ nop /* 5ED38C 80218EFC C6020058 */ lwc1 $f2, 0x58($s0) /* 5ED390 80218F00 C6200098 */ lwc1 $f0, 0x98($s1) /* 5ED394 80218F04 46001081 */ sub.s $f2, $f2, $f0 /* 5ED398 80218F08 46021182 */ mul.s $f6, $f2, $f2 -/* 5ED39C 80218F0C 00000000 */ nop +/* 5ED39C 80218F0C 00000000 */ nop /* 5ED3A0 80218F10 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 5ED3A4 80218F14 C6020060 */ lwc1 $f2, 0x60($s0) /* 5ED3A8 80218F18 46001081 */ sub.s $f2, $f2, $f0 /* 5ED3AC 80218F1C 46021102 */ mul.s $f4, $f2, $f2 -/* 5ED3B0 80218F20 00000000 */ nop +/* 5ED3B0 80218F20 00000000 */ nop /* 5ED3B4 80218F24 92020073 */ lbu $v0, 0x73($s0) /* 5ED3B8 80218F28 C600005C */ lwc1 $f0, 0x5c($s0) /* 5ED3BC 80218F2C 44821000 */ mtc1 $v0, $f2 -/* 5ED3C0 80218F30 00000000 */ nop +/* 5ED3C0 80218F30 00000000 */ nop /* 5ED3C4 80218F34 468010A0 */ cvt.s.w $f2, $f2 /* 5ED3C8 80218F38 46020000 */ add.s $f0, $f0, $f2 /* 5ED3CC 80218F3C 461A0001 */ sub.s $f0, $f0, $f26 @@ -258,38 +258,38 @@ glabel func_80218B80_5ED010 /* 5ED3D8 80218F48 46020501 */ sub.s $f20, $f0, $f2 /* 5ED3DC 80218F4C 46006004 */ sqrt.s $f0, $f12 /* 5ED3E0 80218F50 46000032 */ c.eq.s $f0, $f0 -/* 5ED3E4 80218F54 00000000 */ nop +/* 5ED3E4 80218F54 00000000 */ nop /* 5ED3E8 80218F58 45010003 */ bc1t .L80218F68 -/* 5ED3EC 80218F5C 00000000 */ nop +/* 5ED3EC 80218F5C 00000000 */ nop /* 5ED3F0 80218F60 0C0187BC */ jal sqrtf -/* 5ED3F4 80218F64 00000000 */ nop +/* 5ED3F4 80218F64 00000000 */ nop .L80218F68: /* 5ED3F8 80218F68 4614C03C */ c.lt.s $f24, $f20 -/* 5ED3FC 80218F6C 00000000 */ nop +/* 5ED3FC 80218F6C 00000000 */ nop /* 5ED400 80218F70 45000013 */ bc1f .L80218FC0 /* 5ED404 80218F74 46000106 */ mov.s $f4, $f0 /* 5ED408 80218F78 92020073 */ lbu $v0, 0x73($s0) /* 5ED40C 80218F7C 44820000 */ mtc1 $v0, $f0 -/* 5ED410 80218F80 00000000 */ nop +/* 5ED410 80218F80 00000000 */ nop /* 5ED414 80218F84 46800020 */ cvt.s.w $f0, $f0 /* 5ED418 80218F88 4600A03C */ c.lt.s $f20, $f0 -/* 5ED41C 80218F8C 00000000 */ nop +/* 5ED41C 80218F8C 00000000 */ nop /* 5ED420 80218F90 4500000B */ bc1f .L80218FC0 -/* 5ED424 80218F94 00000000 */ nop +/* 5ED424 80218F94 00000000 */ nop /* 5ED428 80218F98 92020072 */ lbu $v0, 0x72($s0) /* 5ED42C 80218F9C 44820000 */ mtc1 $v0, $f0 -/* 5ED430 80218FA0 00000000 */ nop +/* 5ED430 80218FA0 00000000 */ nop /* 5ED434 80218FA4 46800020 */ cvt.s.w $f0, $f0 /* 5ED438 80218FA8 46160002 */ mul.s $f0, $f0, $f22 -/* 5ED43C 80218FAC 00000000 */ nop +/* 5ED43C 80218FAC 00000000 */ nop /* 5ED440 80218FB0 4600203C */ c.lt.s $f4, $f0 -/* 5ED444 80218FB4 00000000 */ nop +/* 5ED444 80218FB4 00000000 */ nop /* 5ED448 80218FB8 4501FF86 */ bc1t .L80218DD4 /* 5ED44C 80218FBC 24020001 */ addiu $v0, $zero, 1 .L80218FC0: /* 5ED450 80218FC0 8E10000C */ lw $s0, 0xc($s0) /* 5ED454 80218FC4 1600FFC7 */ bnez $s0, .L80218EE4 -/* 5ED458 80218FC8 00000000 */ nop +/* 5ED458 80218FC8 00000000 */ nop /* 5ED45C 80218FCC 26730001 */ addiu $s3, $s3, 1 .L80218FD0: /* 5ED460 80218FD0 2A620018 */ slti $v0, $s3, 0x18 @@ -310,6 +310,6 @@ glabel func_80218B80_5ED010 /* 5ED498 80219008 D7B40030 */ ldc1 $f20, 0x30($sp) /* 5ED49C 8021900C 03E00008 */ jr $ra /* 5ED4A0 80219010 27BD0050 */ addiu $sp, $sp, 0x50 -/* 5ED4A4 80219014 00000000 */ nop -/* 5ED4A8 80219018 00000000 */ nop -/* 5ED4AC 8021901C 00000000 */ nop +/* 5ED4A4 80219014 00000000 */ nop +/* 5ED4A8 80219018 00000000 */ nop +/* 5ED4AC 8021901C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_tik/5ED4B0/func_80219020_5ED4B0.s b/asm/nonmatchings/battle/area_tik/5ED4B0/func_80219020_5ED4B0.s index 256c79ef9b..9bea023ef2 100644 --- a/asm/nonmatchings/battle/area_tik/5ED4B0/func_80219020_5ED4B0.s +++ b/asm/nonmatchings/battle/area_tik/5ED4B0/func_80219020_5ED4B0.s @@ -32,58 +32,58 @@ glabel func_80219020_5ED4B0 /* 5ED51C 8021908C C6200098 */ lwc1 $f0, 0x98($s1) /* 5ED520 80219090 46001081 */ sub.s $f2, $f2, $f0 /* 5ED524 80219094 46021182 */ mul.s $f6, $f2, $f2 -/* 5ED528 80219098 00000000 */ nop +/* 5ED528 80219098 00000000 */ nop /* 5ED52C 8021909C C62000A0 */ lwc1 $f0, 0xa0($s1) /* 5ED530 802190A0 C602014C */ lwc1 $f2, 0x14c($s0) /* 5ED534 802190A4 46001081 */ sub.s $f2, $f2, $f0 /* 5ED538 802190A8 46021102 */ mul.s $f4, $f2, $f2 -/* 5ED53C 802190AC 00000000 */ nop +/* 5ED53C 802190AC 00000000 */ nop /* 5ED540 802190B0 92020191 */ lbu $v0, 0x191($s0) /* 5ED544 802190B4 C6020148 */ lwc1 $f2, 0x148($s0) /* 5ED548 802190B8 44820000 */ mtc1 $v0, $f0 -/* 5ED54C 802190BC 00000000 */ nop +/* 5ED54C 802190BC 00000000 */ nop /* 5ED550 802190C0 46800020 */ cvt.s.w $f0, $f0 /* 5ED554 802190C4 46001080 */ add.s $f2, $f2, $f0 /* 5ED558 802190C8 3C013FC0 */ lui $at, 0x3fc0 /* 5ED55C 802190CC 44810000 */ mtc1 $at, $f0 -/* 5ED560 802190D0 00000000 */ nop +/* 5ED560 802190D0 00000000 */ nop /* 5ED564 802190D4 46001081 */ sub.s $f2, $f2, $f0 /* 5ED568 802190D8 46043300 */ add.s $f12, $f6, $f4 /* 5ED56C 802190DC C620009C */ lwc1 $f0, 0x9c($s1) /* 5ED570 802190E0 46001501 */ sub.s $f20, $f2, $f0 /* 5ED574 802190E4 46006084 */ sqrt.s $f2, $f12 /* 5ED578 802190E8 46021032 */ c.eq.s $f2, $f2 -/* 5ED57C 802190EC 00000000 */ nop +/* 5ED57C 802190EC 00000000 */ nop /* 5ED580 802190F0 45010004 */ bc1t .L80219104 -/* 5ED584 802190F4 00000000 */ nop +/* 5ED584 802190F4 00000000 */ nop /* 5ED588 802190F8 0C0187BC */ jal sqrtf -/* 5ED58C 802190FC 00000000 */ nop +/* 5ED58C 802190FC 00000000 */ nop /* 5ED590 80219100 46000086 */ mov.s $f2, $f0 .L80219104: /* 5ED594 80219104 44800000 */ mtc1 $zero, $f0 -/* 5ED598 80219108 00000000 */ nop +/* 5ED598 80219108 00000000 */ nop /* 5ED59C 8021910C 4614003C */ c.lt.s $f0, $f20 -/* 5ED5A0 80219110 00000000 */ nop +/* 5ED5A0 80219110 00000000 */ nop /* 5ED5A4 80219114 45000017 */ bc1f .L80219174 /* 5ED5A8 80219118 46001106 */ mov.s $f4, $f2 /* 5ED5AC 8021911C 92020191 */ lbu $v0, 0x191($s0) /* 5ED5B0 80219120 44820000 */ mtc1 $v0, $f0 -/* 5ED5B4 80219124 00000000 */ nop +/* 5ED5B4 80219124 00000000 */ nop /* 5ED5B8 80219128 46800020 */ cvt.s.w $f0, $f0 /* 5ED5BC 8021912C 4600A03C */ c.lt.s $f20, $f0 -/* 5ED5C0 80219130 00000000 */ nop +/* 5ED5C0 80219130 00000000 */ nop /* 5ED5C4 80219134 4500000F */ bc1f .L80219174 -/* 5ED5C8 80219138 00000000 */ nop +/* 5ED5C8 80219138 00000000 */ nop /* 5ED5CC 8021913C 92020190 */ lbu $v0, 0x190($s0) /* 5ED5D0 80219140 3C013F00 */ lui $at, 0x3f00 /* 5ED5D4 80219144 44811000 */ mtc1 $at, $f2 /* 5ED5D8 80219148 44820000 */ mtc1 $v0, $f0 -/* 5ED5DC 8021914C 00000000 */ nop +/* 5ED5DC 8021914C 00000000 */ nop /* 5ED5E0 80219150 46800020 */ cvt.s.w $f0, $f0 /* 5ED5E4 80219154 46020002 */ mul.s $f0, $f0, $f2 -/* 5ED5E8 80219158 00000000 */ nop +/* 5ED5E8 80219158 00000000 */ nop /* 5ED5EC 8021915C 4600203C */ c.lt.s $f4, $f0 -/* 5ED5F0 80219160 00000000 */ nop +/* 5ED5F0 80219160 00000000 */ nop /* 5ED5F4 80219164 45000003 */ bc1f .L80219174 /* 5ED5F8 80219168 24020001 */ addiu $v0, $zero, 1 /* 5ED5FC 8021916C 0808651F */ j .L8021947C @@ -96,58 +96,58 @@ glabel func_80219020_5ED4B0 /* 5ED614 80219184 C6200098 */ lwc1 $f0, 0x98($s1) /* 5ED618 80219188 46001081 */ sub.s $f2, $f2, $f0 /* 5ED61C 8021918C 46021182 */ mul.s $f6, $f2, $f2 -/* 5ED620 80219190 00000000 */ nop +/* 5ED620 80219190 00000000 */ nop /* 5ED624 80219194 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 5ED628 80219198 C602014C */ lwc1 $f2, 0x14c($s0) /* 5ED62C 8021919C 46001081 */ sub.s $f2, $f2, $f0 /* 5ED630 802191A0 46021102 */ mul.s $f4, $f2, $f2 -/* 5ED634 802191A4 00000000 */ nop +/* 5ED634 802191A4 00000000 */ nop /* 5ED638 802191A8 92020191 */ lbu $v0, 0x191($s0) /* 5ED63C 802191AC C6020148 */ lwc1 $f2, 0x148($s0) /* 5ED640 802191B0 44820000 */ mtc1 $v0, $f0 -/* 5ED644 802191B4 00000000 */ nop +/* 5ED644 802191B4 00000000 */ nop /* 5ED648 802191B8 46800020 */ cvt.s.w $f0, $f0 /* 5ED64C 802191BC 46001080 */ add.s $f2, $f2, $f0 /* 5ED650 802191C0 3C013FC0 */ lui $at, 0x3fc0 /* 5ED654 802191C4 44810000 */ mtc1 $at, $f0 -/* 5ED658 802191C8 00000000 */ nop +/* 5ED658 802191C8 00000000 */ nop /* 5ED65C 802191CC 46001081 */ sub.s $f2, $f2, $f0 /* 5ED660 802191D0 46043300 */ add.s $f12, $f6, $f4 /* 5ED664 802191D4 C620009C */ lwc1 $f0, 0x9c($s1) /* 5ED668 802191D8 46001501 */ sub.s $f20, $f2, $f0 /* 5ED66C 802191DC 46006084 */ sqrt.s $f2, $f12 /* 5ED670 802191E0 46021032 */ c.eq.s $f2, $f2 -/* 5ED674 802191E4 00000000 */ nop +/* 5ED674 802191E4 00000000 */ nop /* 5ED678 802191E8 45010004 */ bc1t .L802191FC -/* 5ED67C 802191EC 00000000 */ nop +/* 5ED67C 802191EC 00000000 */ nop /* 5ED680 802191F0 0C0187BC */ jal sqrtf -/* 5ED684 802191F4 00000000 */ nop +/* 5ED684 802191F4 00000000 */ nop /* 5ED688 802191F8 46000086 */ mov.s $f2, $f0 .L802191FC: /* 5ED68C 802191FC 44800000 */ mtc1 $zero, $f0 -/* 5ED690 80219200 00000000 */ nop +/* 5ED690 80219200 00000000 */ nop /* 5ED694 80219204 4614003C */ c.lt.s $f0, $f20 -/* 5ED698 80219208 00000000 */ nop +/* 5ED698 80219208 00000000 */ nop /* 5ED69C 8021920C 4500001B */ bc1f .L8021927C /* 5ED6A0 80219210 46001106 */ mov.s $f4, $f2 /* 5ED6A4 80219214 92020191 */ lbu $v0, 0x191($s0) /* 5ED6A8 80219218 44820000 */ mtc1 $v0, $f0 -/* 5ED6AC 8021921C 00000000 */ nop +/* 5ED6AC 8021921C 00000000 */ nop /* 5ED6B0 80219220 46800020 */ cvt.s.w $f0, $f0 /* 5ED6B4 80219224 4600A03C */ c.lt.s $f20, $f0 -/* 5ED6B8 80219228 00000000 */ nop +/* 5ED6B8 80219228 00000000 */ nop /* 5ED6BC 8021922C 45000014 */ bc1f .L80219280 /* 5ED6C0 80219230 0000982D */ daddu $s3, $zero, $zero /* 5ED6C4 80219234 92020190 */ lbu $v0, 0x190($s0) /* 5ED6C8 80219238 3C013F00 */ lui $at, 0x3f00 /* 5ED6CC 8021923C 44811000 */ mtc1 $at, $f2 /* 5ED6D0 80219240 44820000 */ mtc1 $v0, $f0 -/* 5ED6D4 80219244 00000000 */ nop +/* 5ED6D4 80219244 00000000 */ nop /* 5ED6D8 80219248 46800020 */ cvt.s.w $f0, $f0 /* 5ED6DC 8021924C 46020002 */ mul.s $f0, $f0, $f2 -/* 5ED6E0 80219250 00000000 */ nop +/* 5ED6E0 80219250 00000000 */ nop /* 5ED6E4 80219254 4600203C */ c.lt.s $f4, $f0 -/* 5ED6E8 80219258 00000000 */ nop +/* 5ED6E8 80219258 00000000 */ nop /* 5ED6EC 8021925C 45000008 */ bc1f .L80219280 /* 5ED6F0 80219260 24020001 */ addiu $v0, $zero, 1 /* 5ED6F4 80219264 0808651F */ j .L8021947C @@ -179,16 +179,16 @@ glabel func_80219020_5ED4B0 /* 5ED748 802192B8 C6200098 */ lwc1 $f0, 0x98($s1) /* 5ED74C 802192BC 46001081 */ sub.s $f2, $f2, $f0 /* 5ED750 802192C0 46021182 */ mul.s $f6, $f2, $f2 -/* 5ED754 802192C4 00000000 */ nop +/* 5ED754 802192C4 00000000 */ nop /* 5ED758 802192C8 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 5ED75C 802192CC C602014C */ lwc1 $f2, 0x14c($s0) /* 5ED760 802192D0 46001081 */ sub.s $f2, $f2, $f0 /* 5ED764 802192D4 46021102 */ mul.s $f4, $f2, $f2 -/* 5ED768 802192D8 00000000 */ nop +/* 5ED768 802192D8 00000000 */ nop /* 5ED76C 802192DC 92020191 */ lbu $v0, 0x191($s0) /* 5ED770 802192E0 C6020148 */ lwc1 $f2, 0x148($s0) /* 5ED774 802192E4 44820000 */ mtc1 $v0, $f0 -/* 5ED778 802192E8 00000000 */ nop +/* 5ED778 802192E8 00000000 */ nop /* 5ED77C 802192EC 46800020 */ cvt.s.w $f0, $f0 /* 5ED780 802192F0 46001080 */ add.s $f2, $f2, $f0 /* 5ED784 802192F4 461A1081 */ sub.s $f2, $f2, $f26 @@ -197,32 +197,32 @@ glabel func_80219020_5ED4B0 /* 5ED790 80219300 46001501 */ sub.s $f20, $f2, $f0 /* 5ED794 80219304 46006004 */ sqrt.s $f0, $f12 /* 5ED798 80219308 46000032 */ c.eq.s $f0, $f0 -/* 5ED79C 8021930C 00000000 */ nop +/* 5ED79C 8021930C 00000000 */ nop /* 5ED7A0 80219310 45010003 */ bc1t .L80219320 -/* 5ED7A4 80219314 00000000 */ nop +/* 5ED7A4 80219314 00000000 */ nop /* 5ED7A8 80219318 0C0187BC */ jal sqrtf -/* 5ED7AC 8021931C 00000000 */ nop +/* 5ED7AC 8021931C 00000000 */ nop .L80219320: /* 5ED7B0 80219320 4614C03C */ c.lt.s $f24, $f20 -/* 5ED7B4 80219324 00000000 */ nop +/* 5ED7B4 80219324 00000000 */ nop /* 5ED7B8 80219328 45000013 */ bc1f .L80219378 /* 5ED7BC 8021932C 46000106 */ mov.s $f4, $f0 /* 5ED7C0 80219330 92020191 */ lbu $v0, 0x191($s0) /* 5ED7C4 80219334 44820000 */ mtc1 $v0, $f0 -/* 5ED7C8 80219338 00000000 */ nop +/* 5ED7C8 80219338 00000000 */ nop /* 5ED7CC 8021933C 46800020 */ cvt.s.w $f0, $f0 /* 5ED7D0 80219340 4600A03C */ c.lt.s $f20, $f0 -/* 5ED7D4 80219344 00000000 */ nop +/* 5ED7D4 80219344 00000000 */ nop /* 5ED7D8 80219348 4500000B */ bc1f .L80219378 -/* 5ED7DC 8021934C 00000000 */ nop +/* 5ED7DC 8021934C 00000000 */ nop /* 5ED7E0 80219350 92020190 */ lbu $v0, 0x190($s0) /* 5ED7E4 80219354 44820000 */ mtc1 $v0, $f0 -/* 5ED7E8 80219358 00000000 */ nop +/* 5ED7E8 80219358 00000000 */ nop /* 5ED7EC 8021935C 46800020 */ cvt.s.w $f0, $f0 /* 5ED7F0 80219360 46160002 */ mul.s $f0, $f0, $f22 -/* 5ED7F4 80219364 00000000 */ nop +/* 5ED7F4 80219364 00000000 */ nop /* 5ED7F8 80219368 4600203C */ c.lt.s $f4, $f0 -/* 5ED7FC 8021936C 00000000 */ nop +/* 5ED7FC 8021936C 00000000 */ nop /* 5ED800 80219370 4501FFBE */ bc1t .L8021926C /* 5ED804 80219374 24020001 */ addiu $v0, $zero, 1 .L80219378: @@ -235,21 +235,21 @@ glabel func_80219020_5ED4B0 /* 5ED81C 8021938C 14400034 */ bnez $v0, .L80219460 /* 5ED820 80219390 00751024 */ and $v0, $v1, $s5 /* 5ED824 80219394 10400032 */ beqz $v0, .L80219460 -/* 5ED828 80219398 00000000 */ nop +/* 5ED828 80219398 00000000 */ nop /* 5ED82C 8021939C C6020058 */ lwc1 $f2, 0x58($s0) /* 5ED830 802193A0 C6200098 */ lwc1 $f0, 0x98($s1) /* 5ED834 802193A4 46001081 */ sub.s $f2, $f2, $f0 /* 5ED838 802193A8 46021182 */ mul.s $f6, $f2, $f2 -/* 5ED83C 802193AC 00000000 */ nop +/* 5ED83C 802193AC 00000000 */ nop /* 5ED840 802193B0 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 5ED844 802193B4 C6020060 */ lwc1 $f2, 0x60($s0) /* 5ED848 802193B8 46001081 */ sub.s $f2, $f2, $f0 /* 5ED84C 802193BC 46021102 */ mul.s $f4, $f2, $f2 -/* 5ED850 802193C0 00000000 */ nop +/* 5ED850 802193C0 00000000 */ nop /* 5ED854 802193C4 92020073 */ lbu $v0, 0x73($s0) /* 5ED858 802193C8 C600005C */ lwc1 $f0, 0x5c($s0) /* 5ED85C 802193CC 44821000 */ mtc1 $v0, $f2 -/* 5ED860 802193D0 00000000 */ nop +/* 5ED860 802193D0 00000000 */ nop /* 5ED864 802193D4 468010A0 */ cvt.s.w $f2, $f2 /* 5ED868 802193D8 46020000 */ add.s $f0, $f0, $f2 /* 5ED86C 802193DC 461A0001 */ sub.s $f0, $f0, $f26 @@ -258,38 +258,38 @@ glabel func_80219020_5ED4B0 /* 5ED878 802193E8 46020501 */ sub.s $f20, $f0, $f2 /* 5ED87C 802193EC 46006004 */ sqrt.s $f0, $f12 /* 5ED880 802193F0 46000032 */ c.eq.s $f0, $f0 -/* 5ED884 802193F4 00000000 */ nop +/* 5ED884 802193F4 00000000 */ nop /* 5ED888 802193F8 45010003 */ bc1t .L80219408 -/* 5ED88C 802193FC 00000000 */ nop +/* 5ED88C 802193FC 00000000 */ nop /* 5ED890 80219400 0C0187BC */ jal sqrtf -/* 5ED894 80219404 00000000 */ nop +/* 5ED894 80219404 00000000 */ nop .L80219408: /* 5ED898 80219408 4614C03C */ c.lt.s $f24, $f20 -/* 5ED89C 8021940C 00000000 */ nop +/* 5ED89C 8021940C 00000000 */ nop /* 5ED8A0 80219410 45000013 */ bc1f .L80219460 /* 5ED8A4 80219414 46000106 */ mov.s $f4, $f0 /* 5ED8A8 80219418 92020073 */ lbu $v0, 0x73($s0) /* 5ED8AC 8021941C 44820000 */ mtc1 $v0, $f0 -/* 5ED8B0 80219420 00000000 */ nop +/* 5ED8B0 80219420 00000000 */ nop /* 5ED8B4 80219424 46800020 */ cvt.s.w $f0, $f0 /* 5ED8B8 80219428 4600A03C */ c.lt.s $f20, $f0 -/* 5ED8BC 8021942C 00000000 */ nop +/* 5ED8BC 8021942C 00000000 */ nop /* 5ED8C0 80219430 4500000B */ bc1f .L80219460 -/* 5ED8C4 80219434 00000000 */ nop +/* 5ED8C4 80219434 00000000 */ nop /* 5ED8C8 80219438 92020072 */ lbu $v0, 0x72($s0) /* 5ED8CC 8021943C 44820000 */ mtc1 $v0, $f0 -/* 5ED8D0 80219440 00000000 */ nop +/* 5ED8D0 80219440 00000000 */ nop /* 5ED8D4 80219444 46800020 */ cvt.s.w $f0, $f0 /* 5ED8D8 80219448 46160002 */ mul.s $f0, $f0, $f22 -/* 5ED8DC 8021944C 00000000 */ nop +/* 5ED8DC 8021944C 00000000 */ nop /* 5ED8E0 80219450 4600203C */ c.lt.s $f4, $f0 -/* 5ED8E4 80219454 00000000 */ nop +/* 5ED8E4 80219454 00000000 */ nop /* 5ED8E8 80219458 4501FF86 */ bc1t .L80219274 /* 5ED8EC 8021945C 24020001 */ addiu $v0, $zero, 1 .L80219460: /* 5ED8F0 80219460 8E10000C */ lw $s0, 0xc($s0) /* 5ED8F4 80219464 1600FFC7 */ bnez $s0, .L80219384 -/* 5ED8F8 80219468 00000000 */ nop +/* 5ED8F8 80219468 00000000 */ nop /* 5ED8FC 8021946C 26730001 */ addiu $s3, $s3, 1 .L80219470: /* 5ED900 80219470 2A620018 */ slti $v0, $s3, 0x18 @@ -310,6 +310,6 @@ glabel func_80219020_5ED4B0 /* 5ED938 802194A8 D7B40030 */ ldc1 $f20, 0x30($sp) /* 5ED93C 802194AC 03E00008 */ jr $ra /* 5ED940 802194B0 27BD0050 */ addiu $sp, $sp, 0x50 -/* 5ED944 802194B4 00000000 */ nop -/* 5ED948 802194B8 00000000 */ nop -/* 5ED94C 802194BC 00000000 */ nop +/* 5ED944 802194B4 00000000 */ nop +/* 5ED948 802194B8 00000000 */ nop +/* 5ED94C 802194BC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_tik/5ED950/func_802194C0_5ED950.s b/asm/nonmatchings/battle/area_tik/5ED950/func_802194C0_5ED950.s index 8f5f0c26e4..88eae3b66f 100644 --- a/asm/nonmatchings/battle/area_tik/5ED950/func_802194C0_5ED950.s +++ b/asm/nonmatchings/battle/area_tik/5ED950/func_802194C0_5ED950.s @@ -32,58 +32,58 @@ glabel func_802194C0_5ED950 /* 5ED9BC 8021952C C6200098 */ lwc1 $f0, 0x98($s1) /* 5ED9C0 80219530 46001081 */ sub.s $f2, $f2, $f0 /* 5ED9C4 80219534 46021182 */ mul.s $f6, $f2, $f2 -/* 5ED9C8 80219538 00000000 */ nop +/* 5ED9C8 80219538 00000000 */ nop /* 5ED9CC 8021953C C62000A0 */ lwc1 $f0, 0xa0($s1) /* 5ED9D0 80219540 C602014C */ lwc1 $f2, 0x14c($s0) /* 5ED9D4 80219544 46001081 */ sub.s $f2, $f2, $f0 /* 5ED9D8 80219548 46021102 */ mul.s $f4, $f2, $f2 -/* 5ED9DC 8021954C 00000000 */ nop +/* 5ED9DC 8021954C 00000000 */ nop /* 5ED9E0 80219550 92020191 */ lbu $v0, 0x191($s0) /* 5ED9E4 80219554 C6020148 */ lwc1 $f2, 0x148($s0) /* 5ED9E8 80219558 44820000 */ mtc1 $v0, $f0 -/* 5ED9EC 8021955C 00000000 */ nop +/* 5ED9EC 8021955C 00000000 */ nop /* 5ED9F0 80219560 46800020 */ cvt.s.w $f0, $f0 /* 5ED9F4 80219564 46001080 */ add.s $f2, $f2, $f0 /* 5ED9F8 80219568 3C013FC0 */ lui $at, 0x3fc0 /* 5ED9FC 8021956C 44810000 */ mtc1 $at, $f0 -/* 5EDA00 80219570 00000000 */ nop +/* 5EDA00 80219570 00000000 */ nop /* 5EDA04 80219574 46001081 */ sub.s $f2, $f2, $f0 /* 5EDA08 80219578 46043300 */ add.s $f12, $f6, $f4 /* 5EDA0C 8021957C C620009C */ lwc1 $f0, 0x9c($s1) /* 5EDA10 80219580 46001501 */ sub.s $f20, $f2, $f0 /* 5EDA14 80219584 46006084 */ sqrt.s $f2, $f12 /* 5EDA18 80219588 46021032 */ c.eq.s $f2, $f2 -/* 5EDA1C 8021958C 00000000 */ nop +/* 5EDA1C 8021958C 00000000 */ nop /* 5EDA20 80219590 45010004 */ bc1t .L802195A4 -/* 5EDA24 80219594 00000000 */ nop +/* 5EDA24 80219594 00000000 */ nop /* 5EDA28 80219598 0C0187BC */ jal sqrtf -/* 5EDA2C 8021959C 00000000 */ nop +/* 5EDA2C 8021959C 00000000 */ nop /* 5EDA30 802195A0 46000086 */ mov.s $f2, $f0 .L802195A4: /* 5EDA34 802195A4 44800000 */ mtc1 $zero, $f0 -/* 5EDA38 802195A8 00000000 */ nop +/* 5EDA38 802195A8 00000000 */ nop /* 5EDA3C 802195AC 4614003C */ c.lt.s $f0, $f20 -/* 5EDA40 802195B0 00000000 */ nop +/* 5EDA40 802195B0 00000000 */ nop /* 5EDA44 802195B4 45000017 */ bc1f .L80219614 /* 5EDA48 802195B8 46001106 */ mov.s $f4, $f2 /* 5EDA4C 802195BC 92020191 */ lbu $v0, 0x191($s0) /* 5EDA50 802195C0 44820000 */ mtc1 $v0, $f0 -/* 5EDA54 802195C4 00000000 */ nop +/* 5EDA54 802195C4 00000000 */ nop /* 5EDA58 802195C8 46800020 */ cvt.s.w $f0, $f0 /* 5EDA5C 802195CC 4600A03C */ c.lt.s $f20, $f0 -/* 5EDA60 802195D0 00000000 */ nop +/* 5EDA60 802195D0 00000000 */ nop /* 5EDA64 802195D4 4500000F */ bc1f .L80219614 -/* 5EDA68 802195D8 00000000 */ nop +/* 5EDA68 802195D8 00000000 */ nop /* 5EDA6C 802195DC 92020190 */ lbu $v0, 0x190($s0) /* 5EDA70 802195E0 3C013F00 */ lui $at, 0x3f00 /* 5EDA74 802195E4 44811000 */ mtc1 $at, $f2 /* 5EDA78 802195E8 44820000 */ mtc1 $v0, $f0 -/* 5EDA7C 802195EC 00000000 */ nop +/* 5EDA7C 802195EC 00000000 */ nop /* 5EDA80 802195F0 46800020 */ cvt.s.w $f0, $f0 /* 5EDA84 802195F4 46020002 */ mul.s $f0, $f0, $f2 -/* 5EDA88 802195F8 00000000 */ nop +/* 5EDA88 802195F8 00000000 */ nop /* 5EDA8C 802195FC 4600203C */ c.lt.s $f4, $f0 -/* 5EDA90 80219600 00000000 */ nop +/* 5EDA90 80219600 00000000 */ nop /* 5EDA94 80219604 45000003 */ bc1f .L80219614 /* 5EDA98 80219608 24020001 */ addiu $v0, $zero, 1 /* 5EDA9C 8021960C 08086647 */ j .L8021991C @@ -96,58 +96,58 @@ glabel func_802194C0_5ED950 /* 5EDAB4 80219624 C6200098 */ lwc1 $f0, 0x98($s1) /* 5EDAB8 80219628 46001081 */ sub.s $f2, $f2, $f0 /* 5EDABC 8021962C 46021182 */ mul.s $f6, $f2, $f2 -/* 5EDAC0 80219630 00000000 */ nop +/* 5EDAC0 80219630 00000000 */ nop /* 5EDAC4 80219634 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 5EDAC8 80219638 C602014C */ lwc1 $f2, 0x14c($s0) /* 5EDACC 8021963C 46001081 */ sub.s $f2, $f2, $f0 /* 5EDAD0 80219640 46021102 */ mul.s $f4, $f2, $f2 -/* 5EDAD4 80219644 00000000 */ nop +/* 5EDAD4 80219644 00000000 */ nop /* 5EDAD8 80219648 92020191 */ lbu $v0, 0x191($s0) /* 5EDADC 8021964C C6020148 */ lwc1 $f2, 0x148($s0) /* 5EDAE0 80219650 44820000 */ mtc1 $v0, $f0 -/* 5EDAE4 80219654 00000000 */ nop +/* 5EDAE4 80219654 00000000 */ nop /* 5EDAE8 80219658 46800020 */ cvt.s.w $f0, $f0 /* 5EDAEC 8021965C 46001080 */ add.s $f2, $f2, $f0 /* 5EDAF0 80219660 3C013FC0 */ lui $at, 0x3fc0 /* 5EDAF4 80219664 44810000 */ mtc1 $at, $f0 -/* 5EDAF8 80219668 00000000 */ nop +/* 5EDAF8 80219668 00000000 */ nop /* 5EDAFC 8021966C 46001081 */ sub.s $f2, $f2, $f0 /* 5EDB00 80219670 46043300 */ add.s $f12, $f6, $f4 /* 5EDB04 80219674 C620009C */ lwc1 $f0, 0x9c($s1) /* 5EDB08 80219678 46001501 */ sub.s $f20, $f2, $f0 /* 5EDB0C 8021967C 46006084 */ sqrt.s $f2, $f12 /* 5EDB10 80219680 46021032 */ c.eq.s $f2, $f2 -/* 5EDB14 80219684 00000000 */ nop +/* 5EDB14 80219684 00000000 */ nop /* 5EDB18 80219688 45010004 */ bc1t .L8021969C -/* 5EDB1C 8021968C 00000000 */ nop +/* 5EDB1C 8021968C 00000000 */ nop /* 5EDB20 80219690 0C0187BC */ jal sqrtf -/* 5EDB24 80219694 00000000 */ nop +/* 5EDB24 80219694 00000000 */ nop /* 5EDB28 80219698 46000086 */ mov.s $f2, $f0 .L8021969C: /* 5EDB2C 8021969C 44800000 */ mtc1 $zero, $f0 -/* 5EDB30 802196A0 00000000 */ nop +/* 5EDB30 802196A0 00000000 */ nop /* 5EDB34 802196A4 4614003C */ c.lt.s $f0, $f20 -/* 5EDB38 802196A8 00000000 */ nop +/* 5EDB38 802196A8 00000000 */ nop /* 5EDB3C 802196AC 4500001B */ bc1f .L8021971C /* 5EDB40 802196B0 46001106 */ mov.s $f4, $f2 /* 5EDB44 802196B4 92020191 */ lbu $v0, 0x191($s0) /* 5EDB48 802196B8 44820000 */ mtc1 $v0, $f0 -/* 5EDB4C 802196BC 00000000 */ nop +/* 5EDB4C 802196BC 00000000 */ nop /* 5EDB50 802196C0 46800020 */ cvt.s.w $f0, $f0 /* 5EDB54 802196C4 4600A03C */ c.lt.s $f20, $f0 -/* 5EDB58 802196C8 00000000 */ nop +/* 5EDB58 802196C8 00000000 */ nop /* 5EDB5C 802196CC 45000014 */ bc1f .L80219720 /* 5EDB60 802196D0 0000982D */ daddu $s3, $zero, $zero /* 5EDB64 802196D4 92020190 */ lbu $v0, 0x190($s0) /* 5EDB68 802196D8 3C013F00 */ lui $at, 0x3f00 /* 5EDB6C 802196DC 44811000 */ mtc1 $at, $f2 /* 5EDB70 802196E0 44820000 */ mtc1 $v0, $f0 -/* 5EDB74 802196E4 00000000 */ nop +/* 5EDB74 802196E4 00000000 */ nop /* 5EDB78 802196E8 46800020 */ cvt.s.w $f0, $f0 /* 5EDB7C 802196EC 46020002 */ mul.s $f0, $f0, $f2 -/* 5EDB80 802196F0 00000000 */ nop +/* 5EDB80 802196F0 00000000 */ nop /* 5EDB84 802196F4 4600203C */ c.lt.s $f4, $f0 -/* 5EDB88 802196F8 00000000 */ nop +/* 5EDB88 802196F8 00000000 */ nop /* 5EDB8C 802196FC 45000008 */ bc1f .L80219720 /* 5EDB90 80219700 24020001 */ addiu $v0, $zero, 1 /* 5EDB94 80219704 08086647 */ j .L8021991C @@ -179,16 +179,16 @@ glabel func_802194C0_5ED950 /* 5EDBE8 80219758 C6200098 */ lwc1 $f0, 0x98($s1) /* 5EDBEC 8021975C 46001081 */ sub.s $f2, $f2, $f0 /* 5EDBF0 80219760 46021182 */ mul.s $f6, $f2, $f2 -/* 5EDBF4 80219764 00000000 */ nop +/* 5EDBF4 80219764 00000000 */ nop /* 5EDBF8 80219768 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 5EDBFC 8021976C C602014C */ lwc1 $f2, 0x14c($s0) /* 5EDC00 80219770 46001081 */ sub.s $f2, $f2, $f0 /* 5EDC04 80219774 46021102 */ mul.s $f4, $f2, $f2 -/* 5EDC08 80219778 00000000 */ nop +/* 5EDC08 80219778 00000000 */ nop /* 5EDC0C 8021977C 92020191 */ lbu $v0, 0x191($s0) /* 5EDC10 80219780 C6020148 */ lwc1 $f2, 0x148($s0) /* 5EDC14 80219784 44820000 */ mtc1 $v0, $f0 -/* 5EDC18 80219788 00000000 */ nop +/* 5EDC18 80219788 00000000 */ nop /* 5EDC1C 8021978C 46800020 */ cvt.s.w $f0, $f0 /* 5EDC20 80219790 46001080 */ add.s $f2, $f2, $f0 /* 5EDC24 80219794 461A1081 */ sub.s $f2, $f2, $f26 @@ -197,32 +197,32 @@ glabel func_802194C0_5ED950 /* 5EDC30 802197A0 46001501 */ sub.s $f20, $f2, $f0 /* 5EDC34 802197A4 46006004 */ sqrt.s $f0, $f12 /* 5EDC38 802197A8 46000032 */ c.eq.s $f0, $f0 -/* 5EDC3C 802197AC 00000000 */ nop +/* 5EDC3C 802197AC 00000000 */ nop /* 5EDC40 802197B0 45010003 */ bc1t .L802197C0 -/* 5EDC44 802197B4 00000000 */ nop +/* 5EDC44 802197B4 00000000 */ nop /* 5EDC48 802197B8 0C0187BC */ jal sqrtf -/* 5EDC4C 802197BC 00000000 */ nop +/* 5EDC4C 802197BC 00000000 */ nop .L802197C0: /* 5EDC50 802197C0 4614C03C */ c.lt.s $f24, $f20 -/* 5EDC54 802197C4 00000000 */ nop +/* 5EDC54 802197C4 00000000 */ nop /* 5EDC58 802197C8 45000013 */ bc1f .L80219818 /* 5EDC5C 802197CC 46000106 */ mov.s $f4, $f0 /* 5EDC60 802197D0 92020191 */ lbu $v0, 0x191($s0) /* 5EDC64 802197D4 44820000 */ mtc1 $v0, $f0 -/* 5EDC68 802197D8 00000000 */ nop +/* 5EDC68 802197D8 00000000 */ nop /* 5EDC6C 802197DC 46800020 */ cvt.s.w $f0, $f0 /* 5EDC70 802197E0 4600A03C */ c.lt.s $f20, $f0 -/* 5EDC74 802197E4 00000000 */ nop +/* 5EDC74 802197E4 00000000 */ nop /* 5EDC78 802197E8 4500000B */ bc1f .L80219818 -/* 5EDC7C 802197EC 00000000 */ nop +/* 5EDC7C 802197EC 00000000 */ nop /* 5EDC80 802197F0 92020190 */ lbu $v0, 0x190($s0) /* 5EDC84 802197F4 44820000 */ mtc1 $v0, $f0 -/* 5EDC88 802197F8 00000000 */ nop +/* 5EDC88 802197F8 00000000 */ nop /* 5EDC8C 802197FC 46800020 */ cvt.s.w $f0, $f0 /* 5EDC90 80219800 46160002 */ mul.s $f0, $f0, $f22 -/* 5EDC94 80219804 00000000 */ nop +/* 5EDC94 80219804 00000000 */ nop /* 5EDC98 80219808 4600203C */ c.lt.s $f4, $f0 -/* 5EDC9C 8021980C 00000000 */ nop +/* 5EDC9C 8021980C 00000000 */ nop /* 5EDCA0 80219810 4501FFBE */ bc1t .L8021970C /* 5EDCA4 80219814 24020001 */ addiu $v0, $zero, 1 .L80219818: @@ -235,21 +235,21 @@ glabel func_802194C0_5ED950 /* 5EDCBC 8021982C 14400034 */ bnez $v0, .L80219900 /* 5EDCC0 80219830 00751024 */ and $v0, $v1, $s5 /* 5EDCC4 80219834 10400032 */ beqz $v0, .L80219900 -/* 5EDCC8 80219838 00000000 */ nop +/* 5EDCC8 80219838 00000000 */ nop /* 5EDCCC 8021983C C6020058 */ lwc1 $f2, 0x58($s0) /* 5EDCD0 80219840 C6200098 */ lwc1 $f0, 0x98($s1) /* 5EDCD4 80219844 46001081 */ sub.s $f2, $f2, $f0 /* 5EDCD8 80219848 46021182 */ mul.s $f6, $f2, $f2 -/* 5EDCDC 8021984C 00000000 */ nop +/* 5EDCDC 8021984C 00000000 */ nop /* 5EDCE0 80219850 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 5EDCE4 80219854 C6020060 */ lwc1 $f2, 0x60($s0) /* 5EDCE8 80219858 46001081 */ sub.s $f2, $f2, $f0 /* 5EDCEC 8021985C 46021102 */ mul.s $f4, $f2, $f2 -/* 5EDCF0 80219860 00000000 */ nop +/* 5EDCF0 80219860 00000000 */ nop /* 5EDCF4 80219864 92020073 */ lbu $v0, 0x73($s0) /* 5EDCF8 80219868 C600005C */ lwc1 $f0, 0x5c($s0) /* 5EDCFC 8021986C 44821000 */ mtc1 $v0, $f2 -/* 5EDD00 80219870 00000000 */ nop +/* 5EDD00 80219870 00000000 */ nop /* 5EDD04 80219874 468010A0 */ cvt.s.w $f2, $f2 /* 5EDD08 80219878 46020000 */ add.s $f0, $f0, $f2 /* 5EDD0C 8021987C 461A0001 */ sub.s $f0, $f0, $f26 @@ -258,38 +258,38 @@ glabel func_802194C0_5ED950 /* 5EDD18 80219888 46020501 */ sub.s $f20, $f0, $f2 /* 5EDD1C 8021988C 46006004 */ sqrt.s $f0, $f12 /* 5EDD20 80219890 46000032 */ c.eq.s $f0, $f0 -/* 5EDD24 80219894 00000000 */ nop +/* 5EDD24 80219894 00000000 */ nop /* 5EDD28 80219898 45010003 */ bc1t .L802198A8 -/* 5EDD2C 8021989C 00000000 */ nop +/* 5EDD2C 8021989C 00000000 */ nop /* 5EDD30 802198A0 0C0187BC */ jal sqrtf -/* 5EDD34 802198A4 00000000 */ nop +/* 5EDD34 802198A4 00000000 */ nop .L802198A8: /* 5EDD38 802198A8 4614C03C */ c.lt.s $f24, $f20 -/* 5EDD3C 802198AC 00000000 */ nop +/* 5EDD3C 802198AC 00000000 */ nop /* 5EDD40 802198B0 45000013 */ bc1f .L80219900 /* 5EDD44 802198B4 46000106 */ mov.s $f4, $f0 /* 5EDD48 802198B8 92020073 */ lbu $v0, 0x73($s0) /* 5EDD4C 802198BC 44820000 */ mtc1 $v0, $f0 -/* 5EDD50 802198C0 00000000 */ nop +/* 5EDD50 802198C0 00000000 */ nop /* 5EDD54 802198C4 46800020 */ cvt.s.w $f0, $f0 /* 5EDD58 802198C8 4600A03C */ c.lt.s $f20, $f0 -/* 5EDD5C 802198CC 00000000 */ nop +/* 5EDD5C 802198CC 00000000 */ nop /* 5EDD60 802198D0 4500000B */ bc1f .L80219900 -/* 5EDD64 802198D4 00000000 */ nop +/* 5EDD64 802198D4 00000000 */ nop /* 5EDD68 802198D8 92020072 */ lbu $v0, 0x72($s0) /* 5EDD6C 802198DC 44820000 */ mtc1 $v0, $f0 -/* 5EDD70 802198E0 00000000 */ nop +/* 5EDD70 802198E0 00000000 */ nop /* 5EDD74 802198E4 46800020 */ cvt.s.w $f0, $f0 /* 5EDD78 802198E8 46160002 */ mul.s $f0, $f0, $f22 -/* 5EDD7C 802198EC 00000000 */ nop +/* 5EDD7C 802198EC 00000000 */ nop /* 5EDD80 802198F0 4600203C */ c.lt.s $f4, $f0 -/* 5EDD84 802198F4 00000000 */ nop +/* 5EDD84 802198F4 00000000 */ nop /* 5EDD88 802198F8 4501FF86 */ bc1t .L80219714 /* 5EDD8C 802198FC 24020001 */ addiu $v0, $zero, 1 .L80219900: /* 5EDD90 80219900 8E10000C */ lw $s0, 0xc($s0) /* 5EDD94 80219904 1600FFC7 */ bnez $s0, .L80219824 -/* 5EDD98 80219908 00000000 */ nop +/* 5EDD98 80219908 00000000 */ nop /* 5EDD9C 8021990C 26730001 */ addiu $s3, $s3, 1 .L80219910: /* 5EDDA0 80219910 2A620018 */ slti $v0, $s3, 0x18 @@ -310,6 +310,6 @@ glabel func_802194C0_5ED950 /* 5EDDD8 80219948 D7B40030 */ ldc1 $f20, 0x30($sp) /* 5EDDDC 8021994C 03E00008 */ jr $ra /* 5EDDE0 80219950 27BD0050 */ addiu $sp, $sp, 0x50 -/* 5EDDE4 80219954 00000000 */ nop -/* 5EDDE8 80219958 00000000 */ nop -/* 5EDDEC 8021995C 00000000 */ nop +/* 5EDDE4 80219954 00000000 */ nop +/* 5EDDE8 80219958 00000000 */ nop +/* 5EDDEC 8021995C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_tik/5EDDF0/func_80219960_5EDDF0.s b/asm/nonmatchings/battle/area_tik/5EDDF0/func_80219960_5EDDF0.s index 0de2a53027..35d4b9aeb6 100644 --- a/asm/nonmatchings/battle/area_tik/5EDDF0/func_80219960_5EDDF0.s +++ b/asm/nonmatchings/battle/area_tik/5EDDF0/func_80219960_5EDDF0.s @@ -26,14 +26,14 @@ glabel func_80219960_5EDDF0 /* 5EDE44 802199B4 12200009 */ beqz $s1, .L802199DC /* 5EDE48 802199B8 2402008E */ addiu $v0, $zero, 0x8e /* 5EDE4C 802199BC 08086758 */ j .L80219D60 -/* 5EDE50 802199C0 00000000 */ nop +/* 5EDE50 802199C0 00000000 */ nop .L802199C4: /* 5EDE54 802199C4 12220085 */ beq $s1, $v0, .L80219BDC /* 5EDE58 802199C8 24020003 */ addiu $v0, $zero, 3 /* 5EDE5C 802199CC 12220013 */ beq $s1, $v0, .L80219A1C /* 5EDE60 802199D0 2403005B */ addiu $v1, $zero, 0x5b /* 5EDE64 802199D4 08086758 */ j .L80219D60 -/* 5EDE68 802199D8 00000000 */ nop +/* 5EDE68 802199D8 00000000 */ nop .L802199DC: /* 5EDE6C 802199DC 3C01430E */ lui $at, 0x430e /* 5EDE70 802199E0 44812000 */ mtc1 $at, $f4 @@ -77,7 +77,7 @@ glabel func_80219960_5EDDF0 /* 5EDEFC 80219A6C AE0200A8 */ sw $v0, 0xa8($s0) /* 5EDF00 80219A70 2842002E */ slti $v0, $v0, 0x2e /* 5EDF04 80219A74 14400003 */ bnez $v0, .L80219A84 -/* 5EDF08 80219A78 00000000 */ nop +/* 5EDF08 80219A78 00000000 */ nop /* 5EDF0C 80219A7C 2402002D */ addiu $v0, $zero, 0x2d /* 5EDF10 80219A80 AE0200A8 */ sw $v0, 0xa8($s0) .L80219A84: @@ -95,7 +95,7 @@ glabel func_80219960_5EDDF0 /* 5EDF40 80219AB0 C61E0098 */ lwc1 $f30, 0x98($s0) /* 5EDF44 80219AB4 4680F7A0 */ cvt.s.w $f30, $f30 /* 5EDF48 80219AB8 461A6302 */ mul.s $f12, $f12, $f26 -/* 5EDF4C 80219ABC 00000000 */ nop +/* 5EDF4C 80219ABC 00000000 */ nop /* 5EDF50 80219AC0 C61C009C */ lwc1 $f28, 0x9c($s0) /* 5EDF54 80219AC4 4680E720 */ cvt.s.w $f28, $f28 /* 5EDF58 80219AC8 3C0143B4 */ lui $at, 0x43b4 @@ -113,22 +113,22 @@ glabel func_80219960_5EDDF0 /* 5EDF88 80219AF8 4620B001 */ sub.d $f0, $f22, $f0 /* 5EDF8C 80219AFC 46002521 */ cvt.d.s $f20, $f4 /* 5EDF90 80219B00 4620A502 */ mul.d $f20, $f20, $f0 -/* 5EDF94 80219B04 00000000 */ nop +/* 5EDF94 80219B04 00000000 */ nop /* 5EDF98 80219B08 C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 5EDF9C 80219B0C 46806320 */ cvt.s.w $f12, $f12 /* 5EDFA0 80219B10 461A6302 */ mul.s $f12, $f12, $f26 -/* 5EDFA4 80219B14 00000000 */ nop +/* 5EDFA4 80219B14 00000000 */ nop /* 5EDFA8 80219B18 0C00A85B */ jal sin_rad /* 5EDFAC 80219B1C 46186303 */ div.s $f12, $f12, $f24 /* 5EDFB0 80219B20 4600E002 */ mul.s $f0, $f28, $f0 -/* 5EDFB4 80219B24 00000000 */ nop +/* 5EDFB4 80219B24 00000000 */ nop /* 5EDFB8 80219B28 8E0200A8 */ lw $v0, 0xa8($s0) /* 5EDFBC 80219B2C 00021040 */ sll $v0, $v0, 1 /* 5EDFC0 80219B30 44826000 */ mtc1 $v0, $f12 -/* 5EDFC4 80219B34 00000000 */ nop +/* 5EDFC4 80219B34 00000000 */ nop /* 5EDFC8 80219B38 46806320 */ cvt.s.w $f12, $f12 /* 5EDFCC 80219B3C 461A6302 */ mul.s $f12, $f12, $f26 -/* 5EDFD0 80219B40 00000000 */ nop +/* 5EDFD0 80219B40 00000000 */ nop /* 5EDFD4 80219B44 46000021 */ cvt.d.s $f0, $f0 /* 5EDFD8 80219B48 4620A500 */ add.d $f20, $f20, $f0 /* 5EDFDC 80219B4C 46186303 */ div.s $f12, $f12, $f24 @@ -138,12 +138,12 @@ glabel func_80219960_5EDDF0 /* 5EDFEC 80219B5C C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 5EDFF0 80219B60 46806320 */ cvt.s.w $f12, $f12 /* 5EDFF4 80219B64 461A6302 */ mul.s $f12, $f12, $f26 -/* 5EDFF8 80219B68 00000000 */ nop +/* 5EDFF8 80219B68 00000000 */ nop /* 5EDFFC 80219B6C 3C0142B4 */ lui $at, 0x42b4 /* 5EE000 80219B70 44811000 */ mtc1 $at, $f2 -/* 5EE004 80219B74 00000000 */ nop +/* 5EE004 80219B74 00000000 */ nop /* 5EE008 80219B78 46020002 */ mul.s $f0, $f0, $f2 -/* 5EE00C 80219B7C 00000000 */ nop +/* 5EE00C 80219B7C 00000000 */ nop /* 5EE010 80219B80 C7A40014 */ lwc1 $f4, 0x14($sp) /* 5EE014 80219B84 46002100 */ add.s $f4, $f4, $f0 /* 5EE018 80219B88 46186303 */ div.s $f12, $f12, $f24 @@ -152,17 +152,17 @@ glabel func_80219960_5EDDF0 /* 5EE024 80219B94 C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 5EE028 80219B98 46806320 */ cvt.s.w $f12, $f12 /* 5EE02C 80219B9C 461A6302 */ mul.s $f12, $f12, $f26 -/* 5EE030 80219BA0 00000000 */ nop +/* 5EE030 80219BA0 00000000 */ nop /* 5EE034 80219BA4 46000021 */ cvt.d.s $f0, $f0 /* 5EE038 80219BA8 4620B581 */ sub.d $f22, $f22, $f0 /* 5EE03C 80219BAC 4600F521 */ cvt.d.s $f20, $f30 /* 5EE040 80219BB0 4636A502 */ mul.d $f20, $f20, $f22 -/* 5EE044 80219BB4 00000000 */ nop +/* 5EE044 80219BB4 00000000 */ nop /* 5EE048 80219BB8 0C00A85B */ jal sin_rad /* 5EE04C 80219BBC 46186303 */ div.s $f12, $f12, $f24 /* 5EE050 80219BC0 C7A40018 */ lwc1 $f4, 0x18($sp) /* 5EE054 80219BC4 46002002 */ mul.s $f0, $f4, $f0 -/* 5EE058 80219BC8 00000000 */ nop +/* 5EE058 80219BC8 00000000 */ nop /* 5EE05C 80219BCC 46000021 */ cvt.d.s $f0, $f0 /* 5EE060 80219BD0 4620A500 */ add.d $f20, $f20, $f0 /* 5EE064 80219BD4 08086754 */ j .L80219D50 @@ -191,7 +191,7 @@ glabel func_80219960_5EDDF0 /* 5EE0B8 80219C28 C61E0098 */ lwc1 $f30, 0x98($s0) /* 5EE0BC 80219C2C 4680F7A0 */ cvt.s.w $f30, $f30 /* 5EE0C0 80219C30 461A6302 */ mul.s $f12, $f12, $f26 -/* 5EE0C4 80219C34 00000000 */ nop +/* 5EE0C4 80219C34 00000000 */ nop /* 5EE0C8 80219C38 C61C009C */ lwc1 $f28, 0x9c($s0) /* 5EE0CC 80219C3C 4680E720 */ cvt.s.w $f28, $f28 /* 5EE0D0 80219C40 3C0143B4 */ lui $at, 0x43b4 @@ -209,22 +209,22 @@ glabel func_80219960_5EDDF0 /* 5EE100 80219C70 4620B001 */ sub.d $f0, $f22, $f0 /* 5EE104 80219C74 46002521 */ cvt.d.s $f20, $f4 /* 5EE108 80219C78 4620A502 */ mul.d $f20, $f20, $f0 -/* 5EE10C 80219C7C 00000000 */ nop +/* 5EE10C 80219C7C 00000000 */ nop /* 5EE110 80219C80 C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 5EE114 80219C84 46806320 */ cvt.s.w $f12, $f12 /* 5EE118 80219C88 461A6302 */ mul.s $f12, $f12, $f26 -/* 5EE11C 80219C8C 00000000 */ nop +/* 5EE11C 80219C8C 00000000 */ nop /* 5EE120 80219C90 0C00A85B */ jal sin_rad /* 5EE124 80219C94 46186303 */ div.s $f12, $f12, $f24 /* 5EE128 80219C98 4600E002 */ mul.s $f0, $f28, $f0 -/* 5EE12C 80219C9C 00000000 */ nop +/* 5EE12C 80219C9C 00000000 */ nop /* 5EE130 80219CA0 8E0200A8 */ lw $v0, 0xa8($s0) /* 5EE134 80219CA4 00021040 */ sll $v0, $v0, 1 /* 5EE138 80219CA8 44826000 */ mtc1 $v0, $f12 -/* 5EE13C 80219CAC 00000000 */ nop +/* 5EE13C 80219CAC 00000000 */ nop /* 5EE140 80219CB0 46806320 */ cvt.s.w $f12, $f12 /* 5EE144 80219CB4 461A6302 */ mul.s $f12, $f12, $f26 -/* 5EE148 80219CB8 00000000 */ nop +/* 5EE148 80219CB8 00000000 */ nop /* 5EE14C 80219CBC 46000021 */ cvt.d.s $f0, $f0 /* 5EE150 80219CC0 4620A500 */ add.d $f20, $f20, $f0 /* 5EE154 80219CC4 46186303 */ div.s $f12, $f12, $f24 @@ -234,12 +234,12 @@ glabel func_80219960_5EDDF0 /* 5EE164 80219CD4 C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 5EE168 80219CD8 46806320 */ cvt.s.w $f12, $f12 /* 5EE16C 80219CDC 461A6302 */ mul.s $f12, $f12, $f26 -/* 5EE170 80219CE0 00000000 */ nop +/* 5EE170 80219CE0 00000000 */ nop /* 5EE174 80219CE4 3C0142B4 */ lui $at, 0x42b4 /* 5EE178 80219CE8 44811000 */ mtc1 $at, $f2 -/* 5EE17C 80219CEC 00000000 */ nop +/* 5EE17C 80219CEC 00000000 */ nop /* 5EE180 80219CF0 46020002 */ mul.s $f0, $f0, $f2 -/* 5EE184 80219CF4 00000000 */ nop +/* 5EE184 80219CF4 00000000 */ nop /* 5EE188 80219CF8 C7A40014 */ lwc1 $f4, 0x14($sp) /* 5EE18C 80219CFC 46002100 */ add.s $f4, $f4, $f0 /* 5EE190 80219D00 46186303 */ div.s $f12, $f12, $f24 @@ -248,17 +248,17 @@ glabel func_80219960_5EDDF0 /* 5EE19C 80219D0C C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 5EE1A0 80219D10 46806320 */ cvt.s.w $f12, $f12 /* 5EE1A4 80219D14 461A6302 */ mul.s $f12, $f12, $f26 -/* 5EE1A8 80219D18 00000000 */ nop +/* 5EE1A8 80219D18 00000000 */ nop /* 5EE1AC 80219D1C 46000021 */ cvt.d.s $f0, $f0 /* 5EE1B0 80219D20 4620B581 */ sub.d $f22, $f22, $f0 /* 5EE1B4 80219D24 4600F521 */ cvt.d.s $f20, $f30 /* 5EE1B8 80219D28 4636A502 */ mul.d $f20, $f20, $f22 -/* 5EE1BC 80219D2C 00000000 */ nop +/* 5EE1BC 80219D2C 00000000 */ nop /* 5EE1C0 80219D30 0C00A85B */ jal sin_rad /* 5EE1C4 80219D34 46186303 */ div.s $f12, $f12, $f24 /* 5EE1C8 80219D38 C7A40018 */ lwc1 $f4, 0x18($sp) /* 5EE1CC 80219D3C 46002002 */ mul.s $f0, $f4, $f0 -/* 5EE1D0 80219D40 00000000 */ nop +/* 5EE1D0 80219D40 00000000 */ nop /* 5EE1D4 80219D44 46000021 */ cvt.d.s $f0, $f0 /* 5EE1D8 80219D48 4620A500 */ add.d $f20, $f20, $f0 /* 5EE1DC 80219D4C 2402005A */ addiu $v0, $zero, 0x5a diff --git a/asm/nonmatchings/battle/area_tik2/608AB0/func_80218058_608B08.s b/asm/nonmatchings/battle/area_tik2/608AB0/func_80218058_608B08.s index b5ff2d6bfd..ffeb0d655d 100644 --- a/asm/nonmatchings/battle/area_tik2/608AB0/func_80218058_608B08.s +++ b/asm/nonmatchings/battle/area_tik2/608AB0/func_80218058_608B08.s @@ -19,14 +19,14 @@ glabel func_80218058_608B08 /* 608B40 80218090 8E050000 */ lw $a1, ($s0) /* 608B44 80218094 26100004 */ addiu $s0, $s0, 4 /* 608B48 80218098 4482E000 */ mtc1 $v0, $f28 -/* 608B4C 8021809C 00000000 */ nop +/* 608B4C 8021809C 00000000 */ nop /* 608B50 802180A0 4680E720 */ cvt.s.w $f28, $f28 /* 608B54 802180A4 0C0B1EAF */ jal get_variable /* 608B58 802180A8 0220202D */ daddu $a0, $s1, $zero /* 608B5C 802180AC 8E050000 */ lw $a1, ($s0) /* 608B60 802180B0 26100004 */ addiu $s0, $s0, 4 /* 608B64 802180B4 4482D000 */ mtc1 $v0, $f26 -/* 608B68 802180B8 00000000 */ nop +/* 608B68 802180B8 00000000 */ nop /* 608B6C 802180BC 4680D6A0 */ cvt.s.w $f26, $f26 /* 608B70 802180C0 0C0B1EAF */ jal get_variable /* 608B74 802180C4 0220202D */ daddu $a0, $s1, $zero @@ -37,20 +37,20 @@ glabel func_80218058_608B08 /* 608B88 802180D8 8E050000 */ lw $a1, ($s0) /* 608B8C 802180DC 26100004 */ addiu $s0, $s0, 4 /* 608B90 802180E0 4482A000 */ mtc1 $v0, $f20 -/* 608B94 802180E4 00000000 */ nop +/* 608B94 802180E4 00000000 */ nop /* 608B98 802180E8 4680A520 */ cvt.s.w $f20, $f20 /* 608B9C 802180EC 0C0B1EAF */ jal get_variable /* 608BA0 802180F0 0220202D */ daddu $a0, $s1, $zero /* 608BA4 802180F4 8E050000 */ lw $a1, ($s0) /* 608BA8 802180F8 4482B000 */ mtc1 $v0, $f22 -/* 608BAC 802180FC 00000000 */ nop +/* 608BAC 802180FC 00000000 */ nop /* 608BB0 80218100 4680B5A0 */ cvt.s.w $f22, $f22 /* 608BB4 80218104 0C0B1EAF */ jal get_variable /* 608BB8 80218108 0220202D */ daddu $a0, $s1, $zero /* 608BBC 8021810C 3C014220 */ lui $at, 0x4220 /* 608BC0 80218110 44810000 */ mtc1 $at, $f0 /* 608BC4 80218114 4482C000 */ mtc1 $v0, $f24 -/* 608BC8 80218118 00000000 */ nop +/* 608BC8 80218118 00000000 */ nop /* 608BCC 8021811C 4680C620 */ cvt.s.w $f24, $f24 /* 608BD0 80218120 4600B000 */ add.s $f0, $f22, $f0 /* 608BD4 80218124 4600E306 */ mov.s $f12, $f28 @@ -105,6 +105,6 @@ glabel func_80218058_608B08 /* 608C98 802181E8 24020002 */ addiu $v0, $zero, 2 /* 608C9C 802181EC 03E00008 */ jr $ra /* 608CA0 802181F0 27BD0050 */ addiu $sp, $sp, 0x50 -/* 608CA4 802181F4 00000000 */ nop -/* 608CA8 802181F8 00000000 */ nop -/* 608CAC 802181FC 00000000 */ nop +/* 608CA4 802181F4 00000000 */ nop +/* 608CA8 802181F8 00000000 */ nop +/* 608CAC 802181FC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_tik2/608CB0/func_80218258_608D08.s b/asm/nonmatchings/battle/area_tik2/608CB0/func_80218258_608D08.s index de9506e291..ad544c2f38 100644 --- a/asm/nonmatchings/battle/area_tik2/608CB0/func_80218258_608D08.s +++ b/asm/nonmatchings/battle/area_tik2/608CB0/func_80218258_608D08.s @@ -19,15 +19,15 @@ glabel func_80218258_608D08 /* 608D40 80218290 3C0140C9 */ lui $at, 0x40c9 /* 608D44 80218294 34210FD0 */ ori $at, $at, 0xfd0 /* 608D48 80218298 44811000 */ mtc1 $at, $f2 -/* 608D4C 8021829C 00000000 */ nop +/* 608D4C 8021829C 00000000 */ nop /* 608D50 802182A0 46020002 */ mul.s $f0, $f0, $f2 -/* 608D54 802182A4 00000000 */ nop +/* 608D54 802182A4 00000000 */ nop /* 608D58 802182A8 3C0143B4 */ lui $at, 0x43b4 /* 608D5C 802182AC 44816000 */ mtc1 $at, $f12 /* 608D60 802182B0 0C00A85B */ jal sin_rad /* 608D64 802182B4 460C0303 */ div.s $f12, $f0, $f12 /* 608D68 802182B8 4600A502 */ mul.s $f20, $f20, $f0 -/* 608D6C 802182BC 00000000 */ nop +/* 608D6C 802182BC 00000000 */ nop /* 608D70 802182C0 0200202D */ daddu $a0, $s0, $zero /* 608D74 802182C4 4406A000 */ mfc1 $a2, $f20 /* 608D78 802182C8 0C0B2190 */ jal set_float_variable diff --git a/asm/nonmatchings/battle/area_tik2/608CB0/func_80218404_608EB4.s b/asm/nonmatchings/battle/area_tik2/608CB0/func_80218404_608EB4.s index 053e1db335..daae2e247a 100644 --- a/asm/nonmatchings/battle/area_tik2/608CB0/func_80218404_608EB4.s +++ b/asm/nonmatchings/battle/area_tik2/608CB0/func_80218404_608EB4.s @@ -23,20 +23,20 @@ glabel func_80218404_608EB4 /* 608EFC 8021844C 8E050000 */ lw $a1, ($s0) /* 608F00 80218450 26100004 */ addiu $s0, $s0, 4 /* 608F04 80218454 4482C000 */ mtc1 $v0, $f24 -/* 608F08 80218458 00000000 */ nop +/* 608F08 80218458 00000000 */ nop /* 608F0C 8021845C 4680C620 */ cvt.s.w $f24, $f24 /* 608F10 80218460 0C0B1EAF */ jal get_variable /* 608F14 80218464 0220202D */ daddu $a0, $s1, $zero /* 608F18 80218468 8E050000 */ lw $a1, ($s0) /* 608F1C 8021846C 26100004 */ addiu $s0, $s0, 4 /* 608F20 80218470 4482B000 */ mtc1 $v0, $f22 -/* 608F24 80218474 00000000 */ nop +/* 608F24 80218474 00000000 */ nop /* 608F28 80218478 4680B5A0 */ cvt.s.w $f22, $f22 /* 608F2C 8021847C 0C0B1EAF */ jal get_variable /* 608F30 80218480 0220202D */ daddu $a0, $s1, $zero /* 608F34 80218484 8E050000 */ lw $a1, ($s0) /* 608F38 80218488 4482A000 */ mtc1 $v0, $f20 -/* 608F3C 8021848C 00000000 */ nop +/* 608F3C 8021848C 00000000 */ nop /* 608F40 80218490 4680A520 */ cvt.s.w $f20, $f20 /* 608F44 80218494 0C0B210B */ jal get_float_variable /* 608F48 80218498 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/battle/area_tik2/608CB0/func_802184E4_608F94.s b/asm/nonmatchings/battle/area_tik2/608CB0/func_802184E4_608F94.s index a6cf38eb51..ed5a6f6967 100644 --- a/asm/nonmatchings/battle/area_tik2/608CB0/func_802184E4_608F94.s +++ b/asm/nonmatchings/battle/area_tik2/608CB0/func_802184E4_608F94.s @@ -19,14 +19,14 @@ glabel func_802184E4_608F94 /* 608FCC 8021851C 8E050000 */ lw $a1, ($s0) /* 608FD0 80218520 26100004 */ addiu $s0, $s0, 4 /* 608FD4 80218524 4482E000 */ mtc1 $v0, $f28 -/* 608FD8 80218528 00000000 */ nop +/* 608FD8 80218528 00000000 */ nop /* 608FDC 8021852C 4680E720 */ cvt.s.w $f28, $f28 /* 608FE0 80218530 0C0B1EAF */ jal get_variable /* 608FE4 80218534 0220202D */ daddu $a0, $s1, $zero /* 608FE8 80218538 8E050000 */ lw $a1, ($s0) /* 608FEC 8021853C 26100004 */ addiu $s0, $s0, 4 /* 608FF0 80218540 4482D000 */ mtc1 $v0, $f26 -/* 608FF4 80218544 00000000 */ nop +/* 608FF4 80218544 00000000 */ nop /* 608FF8 80218548 4680D6A0 */ cvt.s.w $f26, $f26 /* 608FFC 8021854C 0C0B1EAF */ jal get_variable /* 609000 80218550 0220202D */ daddu $a0, $s1, $zero @@ -37,20 +37,20 @@ glabel func_802184E4_608F94 /* 609014 80218564 8E050000 */ lw $a1, ($s0) /* 609018 80218568 26100004 */ addiu $s0, $s0, 4 /* 60901C 8021856C 4482A000 */ mtc1 $v0, $f20 -/* 609020 80218570 00000000 */ nop +/* 609020 80218570 00000000 */ nop /* 609024 80218574 4680A520 */ cvt.s.w $f20, $f20 /* 609028 80218578 0C0B1EAF */ jal get_variable /* 60902C 8021857C 0220202D */ daddu $a0, $s1, $zero /* 609030 80218580 8E050000 */ lw $a1, ($s0) /* 609034 80218584 4482B000 */ mtc1 $v0, $f22 -/* 609038 80218588 00000000 */ nop +/* 609038 80218588 00000000 */ nop /* 60903C 8021858C 4680B5A0 */ cvt.s.w $f22, $f22 /* 609040 80218590 0C0B1EAF */ jal get_variable /* 609044 80218594 0220202D */ daddu $a0, $s1, $zero /* 609048 80218598 3C014220 */ lui $at, 0x4220 /* 60904C 8021859C 44810000 */ mtc1 $at, $f0 /* 609050 802185A0 4482C000 */ mtc1 $v0, $f24 -/* 609054 802185A4 00000000 */ nop +/* 609054 802185A4 00000000 */ nop /* 609058 802185A8 4680C620 */ cvt.s.w $f24, $f24 /* 60905C 802185AC 4600B000 */ add.s $f0, $f22, $f0 /* 609060 802185B0 4600E306 */ mov.s $f12, $f28 diff --git a/asm/nonmatchings/battle/area_tik2/608CB0/func_802186D8_609188.s b/asm/nonmatchings/battle/area_tik2/608CB0/func_802186D8_609188.s index 92baca6ec6..e13d05037f 100644 --- a/asm/nonmatchings/battle/area_tik2/608CB0/func_802186D8_609188.s +++ b/asm/nonmatchings/battle/area_tik2/608CB0/func_802186D8_609188.s @@ -19,15 +19,15 @@ glabel func_802186D8_609188 /* 6091C0 80218710 3C0140C9 */ lui $at, 0x40c9 /* 6091C4 80218714 34210FD0 */ ori $at, $at, 0xfd0 /* 6091C8 80218718 44811000 */ mtc1 $at, $f2 -/* 6091CC 8021871C 00000000 */ nop +/* 6091CC 8021871C 00000000 */ nop /* 6091D0 80218720 46020002 */ mul.s $f0, $f0, $f2 -/* 6091D4 80218724 00000000 */ nop +/* 6091D4 80218724 00000000 */ nop /* 6091D8 80218728 3C0143B4 */ lui $at, 0x43b4 /* 6091DC 8021872C 44816000 */ mtc1 $at, $f12 /* 6091E0 80218730 0C00A85B */ jal sin_rad /* 6091E4 80218734 460C0303 */ div.s $f12, $f0, $f12 /* 6091E8 80218738 4600A502 */ mul.s $f20, $f20, $f0 -/* 6091EC 8021873C 00000000 */ nop +/* 6091EC 8021873C 00000000 */ nop /* 6091F0 80218740 0200202D */ daddu $a0, $s0, $zero /* 6091F4 80218744 4406A000 */ mfc1 $a2, $f20 /* 6091F8 80218748 0C0B2190 */ jal set_float_variable diff --git a/asm/nonmatchings/battle/area_tik2/608CB0/func_80218884_609334.s b/asm/nonmatchings/battle/area_tik2/608CB0/func_80218884_609334.s index 2779bd0cf5..df6a31f578 100644 --- a/asm/nonmatchings/battle/area_tik2/608CB0/func_80218884_609334.s +++ b/asm/nonmatchings/battle/area_tik2/608CB0/func_80218884_609334.s @@ -19,14 +19,14 @@ glabel func_80218884_609334 /* 60936C 802188BC 8E050000 */ lw $a1, ($s0) /* 609370 802188C0 26100004 */ addiu $s0, $s0, 4 /* 609374 802188C4 4482E000 */ mtc1 $v0, $f28 -/* 609378 802188C8 00000000 */ nop +/* 609378 802188C8 00000000 */ nop /* 60937C 802188CC 4680E720 */ cvt.s.w $f28, $f28 /* 609380 802188D0 0C0B1EAF */ jal get_variable /* 609384 802188D4 0220202D */ daddu $a0, $s1, $zero /* 609388 802188D8 8E050000 */ lw $a1, ($s0) /* 60938C 802188DC 26100004 */ addiu $s0, $s0, 4 /* 609390 802188E0 4482D000 */ mtc1 $v0, $f26 -/* 609394 802188E4 00000000 */ nop +/* 609394 802188E4 00000000 */ nop /* 609398 802188E8 4680D6A0 */ cvt.s.w $f26, $f26 /* 60939C 802188EC 0C0B1EAF */ jal get_variable /* 6093A0 802188F0 0220202D */ daddu $a0, $s1, $zero @@ -37,20 +37,20 @@ glabel func_80218884_609334 /* 6093B4 80218904 8E050000 */ lw $a1, ($s0) /* 6093B8 80218908 26100004 */ addiu $s0, $s0, 4 /* 6093BC 8021890C 4482A000 */ mtc1 $v0, $f20 -/* 6093C0 80218910 00000000 */ nop +/* 6093C0 80218910 00000000 */ nop /* 6093C4 80218914 4680A520 */ cvt.s.w $f20, $f20 /* 6093C8 80218918 0C0B1EAF */ jal get_variable /* 6093CC 8021891C 0220202D */ daddu $a0, $s1, $zero /* 6093D0 80218920 8E050000 */ lw $a1, ($s0) /* 6093D4 80218924 4482B000 */ mtc1 $v0, $f22 -/* 6093D8 80218928 00000000 */ nop +/* 6093D8 80218928 00000000 */ nop /* 6093DC 8021892C 4680B5A0 */ cvt.s.w $f22, $f22 /* 6093E0 80218930 0C0B1EAF */ jal get_variable /* 6093E4 80218934 0220202D */ daddu $a0, $s1, $zero /* 6093E8 80218938 3C014220 */ lui $at, 0x4220 /* 6093EC 8021893C 44810000 */ mtc1 $at, $f0 /* 6093F0 80218940 4482C000 */ mtc1 $v0, $f24 -/* 6093F4 80218944 00000000 */ nop +/* 6093F4 80218944 00000000 */ nop /* 6093F8 80218948 4680C620 */ cvt.s.w $f24, $f24 /* 6093FC 8021894C 4600B000 */ add.s $f0, $f22, $f0 /* 609400 80218950 4600E306 */ mov.s $f12, $f28 diff --git a/asm/nonmatchings/battle/area_tik2/608CB0/func_80218BE0_609690.s b/asm/nonmatchings/battle/area_tik2/608CB0/func_80218BE0_609690.s index 303b812e9f..b032b745ac 100644 --- a/asm/nonmatchings/battle/area_tik2/608CB0/func_80218BE0_609690.s +++ b/asm/nonmatchings/battle/area_tik2/608CB0/func_80218BE0_609690.s @@ -32,58 +32,58 @@ glabel func_80218BE0_609690 /* 6096FC 80218C4C C6200098 */ lwc1 $f0, 0x98($s1) /* 609700 80218C50 46001081 */ sub.s $f2, $f2, $f0 /* 609704 80218C54 46021182 */ mul.s $f6, $f2, $f2 -/* 609708 80218C58 00000000 */ nop +/* 609708 80218C58 00000000 */ nop /* 60970C 80218C5C C62000A0 */ lwc1 $f0, 0xa0($s1) /* 609710 80218C60 C602014C */ lwc1 $f2, 0x14c($s0) /* 609714 80218C64 46001081 */ sub.s $f2, $f2, $f0 /* 609718 80218C68 46021102 */ mul.s $f4, $f2, $f2 -/* 60971C 80218C6C 00000000 */ nop +/* 60971C 80218C6C 00000000 */ nop /* 609720 80218C70 92020191 */ lbu $v0, 0x191($s0) /* 609724 80218C74 C6020148 */ lwc1 $f2, 0x148($s0) /* 609728 80218C78 44820000 */ mtc1 $v0, $f0 -/* 60972C 80218C7C 00000000 */ nop +/* 60972C 80218C7C 00000000 */ nop /* 609730 80218C80 46800020 */ cvt.s.w $f0, $f0 /* 609734 80218C84 46001080 */ add.s $f2, $f2, $f0 /* 609738 80218C88 3C013FC0 */ lui $at, 0x3fc0 /* 60973C 80218C8C 44810000 */ mtc1 $at, $f0 -/* 609740 80218C90 00000000 */ nop +/* 609740 80218C90 00000000 */ nop /* 609744 80218C94 46001081 */ sub.s $f2, $f2, $f0 /* 609748 80218C98 46043300 */ add.s $f12, $f6, $f4 /* 60974C 80218C9C C620009C */ lwc1 $f0, 0x9c($s1) /* 609750 80218CA0 46001501 */ sub.s $f20, $f2, $f0 /* 609754 80218CA4 46006084 */ sqrt.s $f2, $f12 /* 609758 80218CA8 46021032 */ c.eq.s $f2, $f2 -/* 60975C 80218CAC 00000000 */ nop +/* 60975C 80218CAC 00000000 */ nop /* 609760 80218CB0 45010004 */ bc1t .L80218CC4 -/* 609764 80218CB4 00000000 */ nop +/* 609764 80218CB4 00000000 */ nop /* 609768 80218CB8 0C0187BC */ jal sqrtf -/* 60976C 80218CBC 00000000 */ nop +/* 60976C 80218CBC 00000000 */ nop /* 609770 80218CC0 46000086 */ mov.s $f2, $f0 .L80218CC4: /* 609774 80218CC4 44800000 */ mtc1 $zero, $f0 -/* 609778 80218CC8 00000000 */ nop +/* 609778 80218CC8 00000000 */ nop /* 60977C 80218CCC 4614003C */ c.lt.s $f0, $f20 -/* 609780 80218CD0 00000000 */ nop +/* 609780 80218CD0 00000000 */ nop /* 609784 80218CD4 45000017 */ bc1f .L80218D34 /* 609788 80218CD8 46001106 */ mov.s $f4, $f2 /* 60978C 80218CDC 92020191 */ lbu $v0, 0x191($s0) /* 609790 80218CE0 44820000 */ mtc1 $v0, $f0 -/* 609794 80218CE4 00000000 */ nop +/* 609794 80218CE4 00000000 */ nop /* 609798 80218CE8 46800020 */ cvt.s.w $f0, $f0 /* 60979C 80218CEC 4600A03C */ c.lt.s $f20, $f0 -/* 6097A0 80218CF0 00000000 */ nop +/* 6097A0 80218CF0 00000000 */ nop /* 6097A4 80218CF4 4500000F */ bc1f .L80218D34 -/* 6097A8 80218CF8 00000000 */ nop +/* 6097A8 80218CF8 00000000 */ nop /* 6097AC 80218CFC 92020190 */ lbu $v0, 0x190($s0) /* 6097B0 80218D00 3C013F00 */ lui $at, 0x3f00 /* 6097B4 80218D04 44811000 */ mtc1 $at, $f2 /* 6097B8 80218D08 44820000 */ mtc1 $v0, $f0 -/* 6097BC 80218D0C 00000000 */ nop +/* 6097BC 80218D0C 00000000 */ nop /* 6097C0 80218D10 46800020 */ cvt.s.w $f0, $f0 /* 6097C4 80218D14 46020002 */ mul.s $f0, $f0, $f2 -/* 6097C8 80218D18 00000000 */ nop +/* 6097C8 80218D18 00000000 */ nop /* 6097CC 80218D1C 4600203C */ c.lt.s $f4, $f0 -/* 6097D0 80218D20 00000000 */ nop +/* 6097D0 80218D20 00000000 */ nop /* 6097D4 80218D24 45000003 */ bc1f .L80218D34 /* 6097D8 80218D28 24020001 */ addiu $v0, $zero, 1 /* 6097DC 80218D2C 0808640F */ j .L8021903C @@ -96,58 +96,58 @@ glabel func_80218BE0_609690 /* 6097F4 80218D44 C6200098 */ lwc1 $f0, 0x98($s1) /* 6097F8 80218D48 46001081 */ sub.s $f2, $f2, $f0 /* 6097FC 80218D4C 46021182 */ mul.s $f6, $f2, $f2 -/* 609800 80218D50 00000000 */ nop +/* 609800 80218D50 00000000 */ nop /* 609804 80218D54 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 609808 80218D58 C602014C */ lwc1 $f2, 0x14c($s0) /* 60980C 80218D5C 46001081 */ sub.s $f2, $f2, $f0 /* 609810 80218D60 46021102 */ mul.s $f4, $f2, $f2 -/* 609814 80218D64 00000000 */ nop +/* 609814 80218D64 00000000 */ nop /* 609818 80218D68 92020191 */ lbu $v0, 0x191($s0) /* 60981C 80218D6C C6020148 */ lwc1 $f2, 0x148($s0) /* 609820 80218D70 44820000 */ mtc1 $v0, $f0 -/* 609824 80218D74 00000000 */ nop +/* 609824 80218D74 00000000 */ nop /* 609828 80218D78 46800020 */ cvt.s.w $f0, $f0 /* 60982C 80218D7C 46001080 */ add.s $f2, $f2, $f0 /* 609830 80218D80 3C013FC0 */ lui $at, 0x3fc0 /* 609834 80218D84 44810000 */ mtc1 $at, $f0 -/* 609838 80218D88 00000000 */ nop +/* 609838 80218D88 00000000 */ nop /* 60983C 80218D8C 46001081 */ sub.s $f2, $f2, $f0 /* 609840 80218D90 46043300 */ add.s $f12, $f6, $f4 /* 609844 80218D94 C620009C */ lwc1 $f0, 0x9c($s1) /* 609848 80218D98 46001501 */ sub.s $f20, $f2, $f0 /* 60984C 80218D9C 46006084 */ sqrt.s $f2, $f12 /* 609850 80218DA0 46021032 */ c.eq.s $f2, $f2 -/* 609854 80218DA4 00000000 */ nop +/* 609854 80218DA4 00000000 */ nop /* 609858 80218DA8 45010004 */ bc1t .L80218DBC -/* 60985C 80218DAC 00000000 */ nop +/* 60985C 80218DAC 00000000 */ nop /* 609860 80218DB0 0C0187BC */ jal sqrtf -/* 609864 80218DB4 00000000 */ nop +/* 609864 80218DB4 00000000 */ nop /* 609868 80218DB8 46000086 */ mov.s $f2, $f0 .L80218DBC: /* 60986C 80218DBC 44800000 */ mtc1 $zero, $f0 -/* 609870 80218DC0 00000000 */ nop +/* 609870 80218DC0 00000000 */ nop /* 609874 80218DC4 4614003C */ c.lt.s $f0, $f20 -/* 609878 80218DC8 00000000 */ nop +/* 609878 80218DC8 00000000 */ nop /* 60987C 80218DCC 4500001B */ bc1f .L80218E3C /* 609880 80218DD0 46001106 */ mov.s $f4, $f2 /* 609884 80218DD4 92020191 */ lbu $v0, 0x191($s0) /* 609888 80218DD8 44820000 */ mtc1 $v0, $f0 -/* 60988C 80218DDC 00000000 */ nop +/* 60988C 80218DDC 00000000 */ nop /* 609890 80218DE0 46800020 */ cvt.s.w $f0, $f0 /* 609894 80218DE4 4600A03C */ c.lt.s $f20, $f0 -/* 609898 80218DE8 00000000 */ nop +/* 609898 80218DE8 00000000 */ nop /* 60989C 80218DEC 45000014 */ bc1f .L80218E40 /* 6098A0 80218DF0 0000982D */ daddu $s3, $zero, $zero /* 6098A4 80218DF4 92020190 */ lbu $v0, 0x190($s0) /* 6098A8 80218DF8 3C013F00 */ lui $at, 0x3f00 /* 6098AC 80218DFC 44811000 */ mtc1 $at, $f2 /* 6098B0 80218E00 44820000 */ mtc1 $v0, $f0 -/* 6098B4 80218E04 00000000 */ nop +/* 6098B4 80218E04 00000000 */ nop /* 6098B8 80218E08 46800020 */ cvt.s.w $f0, $f0 /* 6098BC 80218E0C 46020002 */ mul.s $f0, $f0, $f2 -/* 6098C0 80218E10 00000000 */ nop +/* 6098C0 80218E10 00000000 */ nop /* 6098C4 80218E14 4600203C */ c.lt.s $f4, $f0 -/* 6098C8 80218E18 00000000 */ nop +/* 6098C8 80218E18 00000000 */ nop /* 6098CC 80218E1C 45000008 */ bc1f .L80218E40 /* 6098D0 80218E20 24020001 */ addiu $v0, $zero, 1 /* 6098D4 80218E24 0808640F */ j .L8021903C @@ -179,16 +179,16 @@ glabel func_80218BE0_609690 /* 609928 80218E78 C6200098 */ lwc1 $f0, 0x98($s1) /* 60992C 80218E7C 46001081 */ sub.s $f2, $f2, $f0 /* 609930 80218E80 46021182 */ mul.s $f6, $f2, $f2 -/* 609934 80218E84 00000000 */ nop +/* 609934 80218E84 00000000 */ nop /* 609938 80218E88 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 60993C 80218E8C C602014C */ lwc1 $f2, 0x14c($s0) /* 609940 80218E90 46001081 */ sub.s $f2, $f2, $f0 /* 609944 80218E94 46021102 */ mul.s $f4, $f2, $f2 -/* 609948 80218E98 00000000 */ nop +/* 609948 80218E98 00000000 */ nop /* 60994C 80218E9C 92020191 */ lbu $v0, 0x191($s0) /* 609950 80218EA0 C6020148 */ lwc1 $f2, 0x148($s0) /* 609954 80218EA4 44820000 */ mtc1 $v0, $f0 -/* 609958 80218EA8 00000000 */ nop +/* 609958 80218EA8 00000000 */ nop /* 60995C 80218EAC 46800020 */ cvt.s.w $f0, $f0 /* 609960 80218EB0 46001080 */ add.s $f2, $f2, $f0 /* 609964 80218EB4 461A1081 */ sub.s $f2, $f2, $f26 @@ -197,32 +197,32 @@ glabel func_80218BE0_609690 /* 609970 80218EC0 46001501 */ sub.s $f20, $f2, $f0 /* 609974 80218EC4 46006004 */ sqrt.s $f0, $f12 /* 609978 80218EC8 46000032 */ c.eq.s $f0, $f0 -/* 60997C 80218ECC 00000000 */ nop +/* 60997C 80218ECC 00000000 */ nop /* 609980 80218ED0 45010003 */ bc1t .L80218EE0 -/* 609984 80218ED4 00000000 */ nop +/* 609984 80218ED4 00000000 */ nop /* 609988 80218ED8 0C0187BC */ jal sqrtf -/* 60998C 80218EDC 00000000 */ nop +/* 60998C 80218EDC 00000000 */ nop .L80218EE0: /* 609990 80218EE0 4614C03C */ c.lt.s $f24, $f20 -/* 609994 80218EE4 00000000 */ nop +/* 609994 80218EE4 00000000 */ nop /* 609998 80218EE8 45000013 */ bc1f .L80218F38 /* 60999C 80218EEC 46000106 */ mov.s $f4, $f0 /* 6099A0 80218EF0 92020191 */ lbu $v0, 0x191($s0) /* 6099A4 80218EF4 44820000 */ mtc1 $v0, $f0 -/* 6099A8 80218EF8 00000000 */ nop +/* 6099A8 80218EF8 00000000 */ nop /* 6099AC 80218EFC 46800020 */ cvt.s.w $f0, $f0 /* 6099B0 80218F00 4600A03C */ c.lt.s $f20, $f0 -/* 6099B4 80218F04 00000000 */ nop +/* 6099B4 80218F04 00000000 */ nop /* 6099B8 80218F08 4500000B */ bc1f .L80218F38 -/* 6099BC 80218F0C 00000000 */ nop +/* 6099BC 80218F0C 00000000 */ nop /* 6099C0 80218F10 92020190 */ lbu $v0, 0x190($s0) /* 6099C4 80218F14 44820000 */ mtc1 $v0, $f0 -/* 6099C8 80218F18 00000000 */ nop +/* 6099C8 80218F18 00000000 */ nop /* 6099CC 80218F1C 46800020 */ cvt.s.w $f0, $f0 /* 6099D0 80218F20 46160002 */ mul.s $f0, $f0, $f22 -/* 6099D4 80218F24 00000000 */ nop +/* 6099D4 80218F24 00000000 */ nop /* 6099D8 80218F28 4600203C */ c.lt.s $f4, $f0 -/* 6099DC 80218F2C 00000000 */ nop +/* 6099DC 80218F2C 00000000 */ nop /* 6099E0 80218F30 4501FFBE */ bc1t .L80218E2C /* 6099E4 80218F34 24020001 */ addiu $v0, $zero, 1 .L80218F38: @@ -235,21 +235,21 @@ glabel func_80218BE0_609690 /* 6099FC 80218F4C 14400034 */ bnez $v0, .L80219020 /* 609A00 80218F50 00751024 */ and $v0, $v1, $s5 /* 609A04 80218F54 10400032 */ beqz $v0, .L80219020 -/* 609A08 80218F58 00000000 */ nop +/* 609A08 80218F58 00000000 */ nop /* 609A0C 80218F5C C6020058 */ lwc1 $f2, 0x58($s0) /* 609A10 80218F60 C6200098 */ lwc1 $f0, 0x98($s1) /* 609A14 80218F64 46001081 */ sub.s $f2, $f2, $f0 /* 609A18 80218F68 46021182 */ mul.s $f6, $f2, $f2 -/* 609A1C 80218F6C 00000000 */ nop +/* 609A1C 80218F6C 00000000 */ nop /* 609A20 80218F70 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 609A24 80218F74 C6020060 */ lwc1 $f2, 0x60($s0) /* 609A28 80218F78 46001081 */ sub.s $f2, $f2, $f0 /* 609A2C 80218F7C 46021102 */ mul.s $f4, $f2, $f2 -/* 609A30 80218F80 00000000 */ nop +/* 609A30 80218F80 00000000 */ nop /* 609A34 80218F84 92020073 */ lbu $v0, 0x73($s0) /* 609A38 80218F88 C600005C */ lwc1 $f0, 0x5c($s0) /* 609A3C 80218F8C 44821000 */ mtc1 $v0, $f2 -/* 609A40 80218F90 00000000 */ nop +/* 609A40 80218F90 00000000 */ nop /* 609A44 80218F94 468010A0 */ cvt.s.w $f2, $f2 /* 609A48 80218F98 46020000 */ add.s $f0, $f0, $f2 /* 609A4C 80218F9C 461A0001 */ sub.s $f0, $f0, $f26 @@ -258,38 +258,38 @@ glabel func_80218BE0_609690 /* 609A58 80218FA8 46020501 */ sub.s $f20, $f0, $f2 /* 609A5C 80218FAC 46006004 */ sqrt.s $f0, $f12 /* 609A60 80218FB0 46000032 */ c.eq.s $f0, $f0 -/* 609A64 80218FB4 00000000 */ nop +/* 609A64 80218FB4 00000000 */ nop /* 609A68 80218FB8 45010003 */ bc1t .L80218FC8 -/* 609A6C 80218FBC 00000000 */ nop +/* 609A6C 80218FBC 00000000 */ nop /* 609A70 80218FC0 0C0187BC */ jal sqrtf -/* 609A74 80218FC4 00000000 */ nop +/* 609A74 80218FC4 00000000 */ nop .L80218FC8: /* 609A78 80218FC8 4614C03C */ c.lt.s $f24, $f20 -/* 609A7C 80218FCC 00000000 */ nop +/* 609A7C 80218FCC 00000000 */ nop /* 609A80 80218FD0 45000013 */ bc1f .L80219020 /* 609A84 80218FD4 46000106 */ mov.s $f4, $f0 /* 609A88 80218FD8 92020073 */ lbu $v0, 0x73($s0) /* 609A8C 80218FDC 44820000 */ mtc1 $v0, $f0 -/* 609A90 80218FE0 00000000 */ nop +/* 609A90 80218FE0 00000000 */ nop /* 609A94 80218FE4 46800020 */ cvt.s.w $f0, $f0 /* 609A98 80218FE8 4600A03C */ c.lt.s $f20, $f0 -/* 609A9C 80218FEC 00000000 */ nop +/* 609A9C 80218FEC 00000000 */ nop /* 609AA0 80218FF0 4500000B */ bc1f .L80219020 -/* 609AA4 80218FF4 00000000 */ nop +/* 609AA4 80218FF4 00000000 */ nop /* 609AA8 80218FF8 92020072 */ lbu $v0, 0x72($s0) /* 609AAC 80218FFC 44820000 */ mtc1 $v0, $f0 -/* 609AB0 80219000 00000000 */ nop +/* 609AB0 80219000 00000000 */ nop /* 609AB4 80219004 46800020 */ cvt.s.w $f0, $f0 /* 609AB8 80219008 46160002 */ mul.s $f0, $f0, $f22 -/* 609ABC 8021900C 00000000 */ nop +/* 609ABC 8021900C 00000000 */ nop /* 609AC0 80219010 4600203C */ c.lt.s $f4, $f0 -/* 609AC4 80219014 00000000 */ nop +/* 609AC4 80219014 00000000 */ nop /* 609AC8 80219018 4501FF86 */ bc1t .L80218E34 /* 609ACC 8021901C 24020001 */ addiu $v0, $zero, 1 .L80219020: /* 609AD0 80219020 8E10000C */ lw $s0, 0xc($s0) /* 609AD4 80219024 1600FFC7 */ bnez $s0, .L80218F44 -/* 609AD8 80219028 00000000 */ nop +/* 609AD8 80219028 00000000 */ nop /* 609ADC 8021902C 26730001 */ addiu $s3, $s3, 1 .L80219030: /* 609AE0 80219030 2A620018 */ slti $v0, $s3, 0x18 @@ -310,6 +310,6 @@ glabel func_80218BE0_609690 /* 609B18 80219068 D7B40030 */ ldc1 $f20, 0x30($sp) /* 609B1C 8021906C 03E00008 */ jr $ra /* 609B20 80219070 27BD0050 */ addiu $sp, $sp, 0x50 -/* 609B24 80219074 00000000 */ nop -/* 609B28 80219078 00000000 */ nop -/* 609B2C 8021907C 00000000 */ nop +/* 609B24 80219074 00000000 */ nop +/* 609B28 80219078 00000000 */ nop +/* 609B2C 8021907C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_tik2/609B30/func_80219080_609B30.s b/asm/nonmatchings/battle/area_tik2/609B30/func_80219080_609B30.s index e01407c995..8fea9eb198 100644 --- a/asm/nonmatchings/battle/area_tik2/609B30/func_80219080_609B30.s +++ b/asm/nonmatchings/battle/area_tik2/609B30/func_80219080_609B30.s @@ -32,58 +32,58 @@ glabel func_80219080_609B30 /* 609B9C 802190EC C6200098 */ lwc1 $f0, 0x98($s1) /* 609BA0 802190F0 46001081 */ sub.s $f2, $f2, $f0 /* 609BA4 802190F4 46021182 */ mul.s $f6, $f2, $f2 -/* 609BA8 802190F8 00000000 */ nop +/* 609BA8 802190F8 00000000 */ nop /* 609BAC 802190FC C62000A0 */ lwc1 $f0, 0xa0($s1) /* 609BB0 80219100 C602014C */ lwc1 $f2, 0x14c($s0) /* 609BB4 80219104 46001081 */ sub.s $f2, $f2, $f0 /* 609BB8 80219108 46021102 */ mul.s $f4, $f2, $f2 -/* 609BBC 8021910C 00000000 */ nop +/* 609BBC 8021910C 00000000 */ nop /* 609BC0 80219110 92020191 */ lbu $v0, 0x191($s0) /* 609BC4 80219114 C6020148 */ lwc1 $f2, 0x148($s0) /* 609BC8 80219118 44820000 */ mtc1 $v0, $f0 -/* 609BCC 8021911C 00000000 */ nop +/* 609BCC 8021911C 00000000 */ nop /* 609BD0 80219120 46800020 */ cvt.s.w $f0, $f0 /* 609BD4 80219124 46001080 */ add.s $f2, $f2, $f0 /* 609BD8 80219128 3C013FC0 */ lui $at, 0x3fc0 /* 609BDC 8021912C 44810000 */ mtc1 $at, $f0 -/* 609BE0 80219130 00000000 */ nop +/* 609BE0 80219130 00000000 */ nop /* 609BE4 80219134 46001081 */ sub.s $f2, $f2, $f0 /* 609BE8 80219138 46043300 */ add.s $f12, $f6, $f4 /* 609BEC 8021913C C620009C */ lwc1 $f0, 0x9c($s1) /* 609BF0 80219140 46001501 */ sub.s $f20, $f2, $f0 /* 609BF4 80219144 46006084 */ sqrt.s $f2, $f12 /* 609BF8 80219148 46021032 */ c.eq.s $f2, $f2 -/* 609BFC 8021914C 00000000 */ nop +/* 609BFC 8021914C 00000000 */ nop /* 609C00 80219150 45010004 */ bc1t .L80219164 -/* 609C04 80219154 00000000 */ nop +/* 609C04 80219154 00000000 */ nop /* 609C08 80219158 0C0187BC */ jal sqrtf -/* 609C0C 8021915C 00000000 */ nop +/* 609C0C 8021915C 00000000 */ nop /* 609C10 80219160 46000086 */ mov.s $f2, $f0 .L80219164: /* 609C14 80219164 44800000 */ mtc1 $zero, $f0 -/* 609C18 80219168 00000000 */ nop +/* 609C18 80219168 00000000 */ nop /* 609C1C 8021916C 4614003C */ c.lt.s $f0, $f20 -/* 609C20 80219170 00000000 */ nop +/* 609C20 80219170 00000000 */ nop /* 609C24 80219174 45000017 */ bc1f .L802191D4 /* 609C28 80219178 46001106 */ mov.s $f4, $f2 /* 609C2C 8021917C 92020191 */ lbu $v0, 0x191($s0) /* 609C30 80219180 44820000 */ mtc1 $v0, $f0 -/* 609C34 80219184 00000000 */ nop +/* 609C34 80219184 00000000 */ nop /* 609C38 80219188 46800020 */ cvt.s.w $f0, $f0 /* 609C3C 8021918C 4600A03C */ c.lt.s $f20, $f0 -/* 609C40 80219190 00000000 */ nop +/* 609C40 80219190 00000000 */ nop /* 609C44 80219194 4500000F */ bc1f .L802191D4 -/* 609C48 80219198 00000000 */ nop +/* 609C48 80219198 00000000 */ nop /* 609C4C 8021919C 92020190 */ lbu $v0, 0x190($s0) /* 609C50 802191A0 3C013F00 */ lui $at, 0x3f00 /* 609C54 802191A4 44811000 */ mtc1 $at, $f2 /* 609C58 802191A8 44820000 */ mtc1 $v0, $f0 -/* 609C5C 802191AC 00000000 */ nop +/* 609C5C 802191AC 00000000 */ nop /* 609C60 802191B0 46800020 */ cvt.s.w $f0, $f0 /* 609C64 802191B4 46020002 */ mul.s $f0, $f0, $f2 -/* 609C68 802191B8 00000000 */ nop +/* 609C68 802191B8 00000000 */ nop /* 609C6C 802191BC 4600203C */ c.lt.s $f4, $f0 -/* 609C70 802191C0 00000000 */ nop +/* 609C70 802191C0 00000000 */ nop /* 609C74 802191C4 45000003 */ bc1f .L802191D4 /* 609C78 802191C8 24020001 */ addiu $v0, $zero, 1 /* 609C7C 802191CC 08086537 */ j .L802194DC @@ -96,58 +96,58 @@ glabel func_80219080_609B30 /* 609C94 802191E4 C6200098 */ lwc1 $f0, 0x98($s1) /* 609C98 802191E8 46001081 */ sub.s $f2, $f2, $f0 /* 609C9C 802191EC 46021182 */ mul.s $f6, $f2, $f2 -/* 609CA0 802191F0 00000000 */ nop +/* 609CA0 802191F0 00000000 */ nop /* 609CA4 802191F4 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 609CA8 802191F8 C602014C */ lwc1 $f2, 0x14c($s0) /* 609CAC 802191FC 46001081 */ sub.s $f2, $f2, $f0 /* 609CB0 80219200 46021102 */ mul.s $f4, $f2, $f2 -/* 609CB4 80219204 00000000 */ nop +/* 609CB4 80219204 00000000 */ nop /* 609CB8 80219208 92020191 */ lbu $v0, 0x191($s0) /* 609CBC 8021920C C6020148 */ lwc1 $f2, 0x148($s0) /* 609CC0 80219210 44820000 */ mtc1 $v0, $f0 -/* 609CC4 80219214 00000000 */ nop +/* 609CC4 80219214 00000000 */ nop /* 609CC8 80219218 46800020 */ cvt.s.w $f0, $f0 /* 609CCC 8021921C 46001080 */ add.s $f2, $f2, $f0 /* 609CD0 80219220 3C013FC0 */ lui $at, 0x3fc0 /* 609CD4 80219224 44810000 */ mtc1 $at, $f0 -/* 609CD8 80219228 00000000 */ nop +/* 609CD8 80219228 00000000 */ nop /* 609CDC 8021922C 46001081 */ sub.s $f2, $f2, $f0 /* 609CE0 80219230 46043300 */ add.s $f12, $f6, $f4 /* 609CE4 80219234 C620009C */ lwc1 $f0, 0x9c($s1) /* 609CE8 80219238 46001501 */ sub.s $f20, $f2, $f0 /* 609CEC 8021923C 46006084 */ sqrt.s $f2, $f12 /* 609CF0 80219240 46021032 */ c.eq.s $f2, $f2 -/* 609CF4 80219244 00000000 */ nop +/* 609CF4 80219244 00000000 */ nop /* 609CF8 80219248 45010004 */ bc1t .L8021925C -/* 609CFC 8021924C 00000000 */ nop +/* 609CFC 8021924C 00000000 */ nop /* 609D00 80219250 0C0187BC */ jal sqrtf -/* 609D04 80219254 00000000 */ nop +/* 609D04 80219254 00000000 */ nop /* 609D08 80219258 46000086 */ mov.s $f2, $f0 .L8021925C: /* 609D0C 8021925C 44800000 */ mtc1 $zero, $f0 -/* 609D10 80219260 00000000 */ nop +/* 609D10 80219260 00000000 */ nop /* 609D14 80219264 4614003C */ c.lt.s $f0, $f20 -/* 609D18 80219268 00000000 */ nop +/* 609D18 80219268 00000000 */ nop /* 609D1C 8021926C 4500001B */ bc1f .L802192DC /* 609D20 80219270 46001106 */ mov.s $f4, $f2 /* 609D24 80219274 92020191 */ lbu $v0, 0x191($s0) /* 609D28 80219278 44820000 */ mtc1 $v0, $f0 -/* 609D2C 8021927C 00000000 */ nop +/* 609D2C 8021927C 00000000 */ nop /* 609D30 80219280 46800020 */ cvt.s.w $f0, $f0 /* 609D34 80219284 4600A03C */ c.lt.s $f20, $f0 -/* 609D38 80219288 00000000 */ nop +/* 609D38 80219288 00000000 */ nop /* 609D3C 8021928C 45000014 */ bc1f .L802192E0 /* 609D40 80219290 0000982D */ daddu $s3, $zero, $zero /* 609D44 80219294 92020190 */ lbu $v0, 0x190($s0) /* 609D48 80219298 3C013F00 */ lui $at, 0x3f00 /* 609D4C 8021929C 44811000 */ mtc1 $at, $f2 /* 609D50 802192A0 44820000 */ mtc1 $v0, $f0 -/* 609D54 802192A4 00000000 */ nop +/* 609D54 802192A4 00000000 */ nop /* 609D58 802192A8 46800020 */ cvt.s.w $f0, $f0 /* 609D5C 802192AC 46020002 */ mul.s $f0, $f0, $f2 -/* 609D60 802192B0 00000000 */ nop +/* 609D60 802192B0 00000000 */ nop /* 609D64 802192B4 4600203C */ c.lt.s $f4, $f0 -/* 609D68 802192B8 00000000 */ nop +/* 609D68 802192B8 00000000 */ nop /* 609D6C 802192BC 45000008 */ bc1f .L802192E0 /* 609D70 802192C0 24020001 */ addiu $v0, $zero, 1 /* 609D74 802192C4 08086537 */ j .L802194DC @@ -179,16 +179,16 @@ glabel func_80219080_609B30 /* 609DC8 80219318 C6200098 */ lwc1 $f0, 0x98($s1) /* 609DCC 8021931C 46001081 */ sub.s $f2, $f2, $f0 /* 609DD0 80219320 46021182 */ mul.s $f6, $f2, $f2 -/* 609DD4 80219324 00000000 */ nop +/* 609DD4 80219324 00000000 */ nop /* 609DD8 80219328 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 609DDC 8021932C C602014C */ lwc1 $f2, 0x14c($s0) /* 609DE0 80219330 46001081 */ sub.s $f2, $f2, $f0 /* 609DE4 80219334 46021102 */ mul.s $f4, $f2, $f2 -/* 609DE8 80219338 00000000 */ nop +/* 609DE8 80219338 00000000 */ nop /* 609DEC 8021933C 92020191 */ lbu $v0, 0x191($s0) /* 609DF0 80219340 C6020148 */ lwc1 $f2, 0x148($s0) /* 609DF4 80219344 44820000 */ mtc1 $v0, $f0 -/* 609DF8 80219348 00000000 */ nop +/* 609DF8 80219348 00000000 */ nop /* 609DFC 8021934C 46800020 */ cvt.s.w $f0, $f0 /* 609E00 80219350 46001080 */ add.s $f2, $f2, $f0 /* 609E04 80219354 461A1081 */ sub.s $f2, $f2, $f26 @@ -197,32 +197,32 @@ glabel func_80219080_609B30 /* 609E10 80219360 46001501 */ sub.s $f20, $f2, $f0 /* 609E14 80219364 46006004 */ sqrt.s $f0, $f12 /* 609E18 80219368 46000032 */ c.eq.s $f0, $f0 -/* 609E1C 8021936C 00000000 */ nop +/* 609E1C 8021936C 00000000 */ nop /* 609E20 80219370 45010003 */ bc1t .L80219380 -/* 609E24 80219374 00000000 */ nop +/* 609E24 80219374 00000000 */ nop /* 609E28 80219378 0C0187BC */ jal sqrtf -/* 609E2C 8021937C 00000000 */ nop +/* 609E2C 8021937C 00000000 */ nop .L80219380: /* 609E30 80219380 4614C03C */ c.lt.s $f24, $f20 -/* 609E34 80219384 00000000 */ nop +/* 609E34 80219384 00000000 */ nop /* 609E38 80219388 45000013 */ bc1f .L802193D8 /* 609E3C 8021938C 46000106 */ mov.s $f4, $f0 /* 609E40 80219390 92020191 */ lbu $v0, 0x191($s0) /* 609E44 80219394 44820000 */ mtc1 $v0, $f0 -/* 609E48 80219398 00000000 */ nop +/* 609E48 80219398 00000000 */ nop /* 609E4C 8021939C 46800020 */ cvt.s.w $f0, $f0 /* 609E50 802193A0 4600A03C */ c.lt.s $f20, $f0 -/* 609E54 802193A4 00000000 */ nop +/* 609E54 802193A4 00000000 */ nop /* 609E58 802193A8 4500000B */ bc1f .L802193D8 -/* 609E5C 802193AC 00000000 */ nop +/* 609E5C 802193AC 00000000 */ nop /* 609E60 802193B0 92020190 */ lbu $v0, 0x190($s0) /* 609E64 802193B4 44820000 */ mtc1 $v0, $f0 -/* 609E68 802193B8 00000000 */ nop +/* 609E68 802193B8 00000000 */ nop /* 609E6C 802193BC 46800020 */ cvt.s.w $f0, $f0 /* 609E70 802193C0 46160002 */ mul.s $f0, $f0, $f22 -/* 609E74 802193C4 00000000 */ nop +/* 609E74 802193C4 00000000 */ nop /* 609E78 802193C8 4600203C */ c.lt.s $f4, $f0 -/* 609E7C 802193CC 00000000 */ nop +/* 609E7C 802193CC 00000000 */ nop /* 609E80 802193D0 4501FFBE */ bc1t .L802192CC /* 609E84 802193D4 24020001 */ addiu $v0, $zero, 1 .L802193D8: @@ -235,21 +235,21 @@ glabel func_80219080_609B30 /* 609E9C 802193EC 14400034 */ bnez $v0, .L802194C0 /* 609EA0 802193F0 00751024 */ and $v0, $v1, $s5 /* 609EA4 802193F4 10400032 */ beqz $v0, .L802194C0 -/* 609EA8 802193F8 00000000 */ nop +/* 609EA8 802193F8 00000000 */ nop /* 609EAC 802193FC C6020058 */ lwc1 $f2, 0x58($s0) /* 609EB0 80219400 C6200098 */ lwc1 $f0, 0x98($s1) /* 609EB4 80219404 46001081 */ sub.s $f2, $f2, $f0 /* 609EB8 80219408 46021182 */ mul.s $f6, $f2, $f2 -/* 609EBC 8021940C 00000000 */ nop +/* 609EBC 8021940C 00000000 */ nop /* 609EC0 80219410 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 609EC4 80219414 C6020060 */ lwc1 $f2, 0x60($s0) /* 609EC8 80219418 46001081 */ sub.s $f2, $f2, $f0 /* 609ECC 8021941C 46021102 */ mul.s $f4, $f2, $f2 -/* 609ED0 80219420 00000000 */ nop +/* 609ED0 80219420 00000000 */ nop /* 609ED4 80219424 92020073 */ lbu $v0, 0x73($s0) /* 609ED8 80219428 C600005C */ lwc1 $f0, 0x5c($s0) /* 609EDC 8021942C 44821000 */ mtc1 $v0, $f2 -/* 609EE0 80219430 00000000 */ nop +/* 609EE0 80219430 00000000 */ nop /* 609EE4 80219434 468010A0 */ cvt.s.w $f2, $f2 /* 609EE8 80219438 46020000 */ add.s $f0, $f0, $f2 /* 609EEC 8021943C 461A0001 */ sub.s $f0, $f0, $f26 @@ -258,38 +258,38 @@ glabel func_80219080_609B30 /* 609EF8 80219448 46020501 */ sub.s $f20, $f0, $f2 /* 609EFC 8021944C 46006004 */ sqrt.s $f0, $f12 /* 609F00 80219450 46000032 */ c.eq.s $f0, $f0 -/* 609F04 80219454 00000000 */ nop +/* 609F04 80219454 00000000 */ nop /* 609F08 80219458 45010003 */ bc1t .L80219468 -/* 609F0C 8021945C 00000000 */ nop +/* 609F0C 8021945C 00000000 */ nop /* 609F10 80219460 0C0187BC */ jal sqrtf -/* 609F14 80219464 00000000 */ nop +/* 609F14 80219464 00000000 */ nop .L80219468: /* 609F18 80219468 4614C03C */ c.lt.s $f24, $f20 -/* 609F1C 8021946C 00000000 */ nop +/* 609F1C 8021946C 00000000 */ nop /* 609F20 80219470 45000013 */ bc1f .L802194C0 /* 609F24 80219474 46000106 */ mov.s $f4, $f0 /* 609F28 80219478 92020073 */ lbu $v0, 0x73($s0) /* 609F2C 8021947C 44820000 */ mtc1 $v0, $f0 -/* 609F30 80219480 00000000 */ nop +/* 609F30 80219480 00000000 */ nop /* 609F34 80219484 46800020 */ cvt.s.w $f0, $f0 /* 609F38 80219488 4600A03C */ c.lt.s $f20, $f0 -/* 609F3C 8021948C 00000000 */ nop +/* 609F3C 8021948C 00000000 */ nop /* 609F40 80219490 4500000B */ bc1f .L802194C0 -/* 609F44 80219494 00000000 */ nop +/* 609F44 80219494 00000000 */ nop /* 609F48 80219498 92020072 */ lbu $v0, 0x72($s0) /* 609F4C 8021949C 44820000 */ mtc1 $v0, $f0 -/* 609F50 802194A0 00000000 */ nop +/* 609F50 802194A0 00000000 */ nop /* 609F54 802194A4 46800020 */ cvt.s.w $f0, $f0 /* 609F58 802194A8 46160002 */ mul.s $f0, $f0, $f22 -/* 609F5C 802194AC 00000000 */ nop +/* 609F5C 802194AC 00000000 */ nop /* 609F60 802194B0 4600203C */ c.lt.s $f4, $f0 -/* 609F64 802194B4 00000000 */ nop +/* 609F64 802194B4 00000000 */ nop /* 609F68 802194B8 4501FF86 */ bc1t .L802192D4 /* 609F6C 802194BC 24020001 */ addiu $v0, $zero, 1 .L802194C0: /* 609F70 802194C0 8E10000C */ lw $s0, 0xc($s0) /* 609F74 802194C4 1600FFC7 */ bnez $s0, .L802193E4 -/* 609F78 802194C8 00000000 */ nop +/* 609F78 802194C8 00000000 */ nop /* 609F7C 802194CC 26730001 */ addiu $s3, $s3, 1 .L802194D0: /* 609F80 802194D0 2A620018 */ slti $v0, $s3, 0x18 @@ -310,6 +310,6 @@ glabel func_80219080_609B30 /* 609FB8 80219508 D7B40030 */ ldc1 $f20, 0x30($sp) /* 609FBC 8021950C 03E00008 */ jr $ra /* 609FC0 80219510 27BD0050 */ addiu $sp, $sp, 0x50 -/* 609FC4 80219514 00000000 */ nop -/* 609FC8 80219518 00000000 */ nop -/* 609FCC 8021951C 00000000 */ nop +/* 609FC4 80219514 00000000 */ nop +/* 609FC8 80219518 00000000 */ nop +/* 609FCC 8021951C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_tik2/609FD0/func_80219520_609FD0.s b/asm/nonmatchings/battle/area_tik2/609FD0/func_80219520_609FD0.s index cb2736e19f..fa0feade90 100644 --- a/asm/nonmatchings/battle/area_tik2/609FD0/func_80219520_609FD0.s +++ b/asm/nonmatchings/battle/area_tik2/609FD0/func_80219520_609FD0.s @@ -32,58 +32,58 @@ glabel func_80219520_609FD0 /* 60A03C 8021958C C6200098 */ lwc1 $f0, 0x98($s1) /* 60A040 80219590 46001081 */ sub.s $f2, $f2, $f0 /* 60A044 80219594 46021182 */ mul.s $f6, $f2, $f2 -/* 60A048 80219598 00000000 */ nop +/* 60A048 80219598 00000000 */ nop /* 60A04C 8021959C C62000A0 */ lwc1 $f0, 0xa0($s1) /* 60A050 802195A0 C602014C */ lwc1 $f2, 0x14c($s0) /* 60A054 802195A4 46001081 */ sub.s $f2, $f2, $f0 /* 60A058 802195A8 46021102 */ mul.s $f4, $f2, $f2 -/* 60A05C 802195AC 00000000 */ nop +/* 60A05C 802195AC 00000000 */ nop /* 60A060 802195B0 92020191 */ lbu $v0, 0x191($s0) /* 60A064 802195B4 C6020148 */ lwc1 $f2, 0x148($s0) /* 60A068 802195B8 44820000 */ mtc1 $v0, $f0 -/* 60A06C 802195BC 00000000 */ nop +/* 60A06C 802195BC 00000000 */ nop /* 60A070 802195C0 46800020 */ cvt.s.w $f0, $f0 /* 60A074 802195C4 46001080 */ add.s $f2, $f2, $f0 /* 60A078 802195C8 3C013FC0 */ lui $at, 0x3fc0 /* 60A07C 802195CC 44810000 */ mtc1 $at, $f0 -/* 60A080 802195D0 00000000 */ nop +/* 60A080 802195D0 00000000 */ nop /* 60A084 802195D4 46001081 */ sub.s $f2, $f2, $f0 /* 60A088 802195D8 46043300 */ add.s $f12, $f6, $f4 /* 60A08C 802195DC C620009C */ lwc1 $f0, 0x9c($s1) /* 60A090 802195E0 46001501 */ sub.s $f20, $f2, $f0 /* 60A094 802195E4 46006084 */ sqrt.s $f2, $f12 /* 60A098 802195E8 46021032 */ c.eq.s $f2, $f2 -/* 60A09C 802195EC 00000000 */ nop +/* 60A09C 802195EC 00000000 */ nop /* 60A0A0 802195F0 45010004 */ bc1t .L80219604 -/* 60A0A4 802195F4 00000000 */ nop +/* 60A0A4 802195F4 00000000 */ nop /* 60A0A8 802195F8 0C0187BC */ jal sqrtf -/* 60A0AC 802195FC 00000000 */ nop +/* 60A0AC 802195FC 00000000 */ nop /* 60A0B0 80219600 46000086 */ mov.s $f2, $f0 .L80219604: /* 60A0B4 80219604 44800000 */ mtc1 $zero, $f0 -/* 60A0B8 80219608 00000000 */ nop +/* 60A0B8 80219608 00000000 */ nop /* 60A0BC 8021960C 4614003C */ c.lt.s $f0, $f20 -/* 60A0C0 80219610 00000000 */ nop +/* 60A0C0 80219610 00000000 */ nop /* 60A0C4 80219614 45000017 */ bc1f .L80219674 /* 60A0C8 80219618 46001106 */ mov.s $f4, $f2 /* 60A0CC 8021961C 92020191 */ lbu $v0, 0x191($s0) /* 60A0D0 80219620 44820000 */ mtc1 $v0, $f0 -/* 60A0D4 80219624 00000000 */ nop +/* 60A0D4 80219624 00000000 */ nop /* 60A0D8 80219628 46800020 */ cvt.s.w $f0, $f0 /* 60A0DC 8021962C 4600A03C */ c.lt.s $f20, $f0 -/* 60A0E0 80219630 00000000 */ nop +/* 60A0E0 80219630 00000000 */ nop /* 60A0E4 80219634 4500000F */ bc1f .L80219674 -/* 60A0E8 80219638 00000000 */ nop +/* 60A0E8 80219638 00000000 */ nop /* 60A0EC 8021963C 92020190 */ lbu $v0, 0x190($s0) /* 60A0F0 80219640 3C013F00 */ lui $at, 0x3f00 /* 60A0F4 80219644 44811000 */ mtc1 $at, $f2 /* 60A0F8 80219648 44820000 */ mtc1 $v0, $f0 -/* 60A0FC 8021964C 00000000 */ nop +/* 60A0FC 8021964C 00000000 */ nop /* 60A100 80219650 46800020 */ cvt.s.w $f0, $f0 /* 60A104 80219654 46020002 */ mul.s $f0, $f0, $f2 -/* 60A108 80219658 00000000 */ nop +/* 60A108 80219658 00000000 */ nop /* 60A10C 8021965C 4600203C */ c.lt.s $f4, $f0 -/* 60A110 80219660 00000000 */ nop +/* 60A110 80219660 00000000 */ nop /* 60A114 80219664 45000003 */ bc1f .L80219674 /* 60A118 80219668 24020001 */ addiu $v0, $zero, 1 /* 60A11C 8021966C 0808665F */ j .L8021997C @@ -96,58 +96,58 @@ glabel func_80219520_609FD0 /* 60A134 80219684 C6200098 */ lwc1 $f0, 0x98($s1) /* 60A138 80219688 46001081 */ sub.s $f2, $f2, $f0 /* 60A13C 8021968C 46021182 */ mul.s $f6, $f2, $f2 -/* 60A140 80219690 00000000 */ nop +/* 60A140 80219690 00000000 */ nop /* 60A144 80219694 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 60A148 80219698 C602014C */ lwc1 $f2, 0x14c($s0) /* 60A14C 8021969C 46001081 */ sub.s $f2, $f2, $f0 /* 60A150 802196A0 46021102 */ mul.s $f4, $f2, $f2 -/* 60A154 802196A4 00000000 */ nop +/* 60A154 802196A4 00000000 */ nop /* 60A158 802196A8 92020191 */ lbu $v0, 0x191($s0) /* 60A15C 802196AC C6020148 */ lwc1 $f2, 0x148($s0) /* 60A160 802196B0 44820000 */ mtc1 $v0, $f0 -/* 60A164 802196B4 00000000 */ nop +/* 60A164 802196B4 00000000 */ nop /* 60A168 802196B8 46800020 */ cvt.s.w $f0, $f0 /* 60A16C 802196BC 46001080 */ add.s $f2, $f2, $f0 /* 60A170 802196C0 3C013FC0 */ lui $at, 0x3fc0 /* 60A174 802196C4 44810000 */ mtc1 $at, $f0 -/* 60A178 802196C8 00000000 */ nop +/* 60A178 802196C8 00000000 */ nop /* 60A17C 802196CC 46001081 */ sub.s $f2, $f2, $f0 /* 60A180 802196D0 46043300 */ add.s $f12, $f6, $f4 /* 60A184 802196D4 C620009C */ lwc1 $f0, 0x9c($s1) /* 60A188 802196D8 46001501 */ sub.s $f20, $f2, $f0 /* 60A18C 802196DC 46006084 */ sqrt.s $f2, $f12 /* 60A190 802196E0 46021032 */ c.eq.s $f2, $f2 -/* 60A194 802196E4 00000000 */ nop +/* 60A194 802196E4 00000000 */ nop /* 60A198 802196E8 45010004 */ bc1t .L802196FC -/* 60A19C 802196EC 00000000 */ nop +/* 60A19C 802196EC 00000000 */ nop /* 60A1A0 802196F0 0C0187BC */ jal sqrtf -/* 60A1A4 802196F4 00000000 */ nop +/* 60A1A4 802196F4 00000000 */ nop /* 60A1A8 802196F8 46000086 */ mov.s $f2, $f0 .L802196FC: /* 60A1AC 802196FC 44800000 */ mtc1 $zero, $f0 -/* 60A1B0 80219700 00000000 */ nop +/* 60A1B0 80219700 00000000 */ nop /* 60A1B4 80219704 4614003C */ c.lt.s $f0, $f20 -/* 60A1B8 80219708 00000000 */ nop +/* 60A1B8 80219708 00000000 */ nop /* 60A1BC 8021970C 4500001B */ bc1f .L8021977C /* 60A1C0 80219710 46001106 */ mov.s $f4, $f2 /* 60A1C4 80219714 92020191 */ lbu $v0, 0x191($s0) /* 60A1C8 80219718 44820000 */ mtc1 $v0, $f0 -/* 60A1CC 8021971C 00000000 */ nop +/* 60A1CC 8021971C 00000000 */ nop /* 60A1D0 80219720 46800020 */ cvt.s.w $f0, $f0 /* 60A1D4 80219724 4600A03C */ c.lt.s $f20, $f0 -/* 60A1D8 80219728 00000000 */ nop +/* 60A1D8 80219728 00000000 */ nop /* 60A1DC 8021972C 45000014 */ bc1f .L80219780 /* 60A1E0 80219730 0000982D */ daddu $s3, $zero, $zero /* 60A1E4 80219734 92020190 */ lbu $v0, 0x190($s0) /* 60A1E8 80219738 3C013F00 */ lui $at, 0x3f00 /* 60A1EC 8021973C 44811000 */ mtc1 $at, $f2 /* 60A1F0 80219740 44820000 */ mtc1 $v0, $f0 -/* 60A1F4 80219744 00000000 */ nop +/* 60A1F4 80219744 00000000 */ nop /* 60A1F8 80219748 46800020 */ cvt.s.w $f0, $f0 /* 60A1FC 8021974C 46020002 */ mul.s $f0, $f0, $f2 -/* 60A200 80219750 00000000 */ nop +/* 60A200 80219750 00000000 */ nop /* 60A204 80219754 4600203C */ c.lt.s $f4, $f0 -/* 60A208 80219758 00000000 */ nop +/* 60A208 80219758 00000000 */ nop /* 60A20C 8021975C 45000008 */ bc1f .L80219780 /* 60A210 80219760 24020001 */ addiu $v0, $zero, 1 /* 60A214 80219764 0808665F */ j .L8021997C @@ -179,16 +179,16 @@ glabel func_80219520_609FD0 /* 60A268 802197B8 C6200098 */ lwc1 $f0, 0x98($s1) /* 60A26C 802197BC 46001081 */ sub.s $f2, $f2, $f0 /* 60A270 802197C0 46021182 */ mul.s $f6, $f2, $f2 -/* 60A274 802197C4 00000000 */ nop +/* 60A274 802197C4 00000000 */ nop /* 60A278 802197C8 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 60A27C 802197CC C602014C */ lwc1 $f2, 0x14c($s0) /* 60A280 802197D0 46001081 */ sub.s $f2, $f2, $f0 /* 60A284 802197D4 46021102 */ mul.s $f4, $f2, $f2 -/* 60A288 802197D8 00000000 */ nop +/* 60A288 802197D8 00000000 */ nop /* 60A28C 802197DC 92020191 */ lbu $v0, 0x191($s0) /* 60A290 802197E0 C6020148 */ lwc1 $f2, 0x148($s0) /* 60A294 802197E4 44820000 */ mtc1 $v0, $f0 -/* 60A298 802197E8 00000000 */ nop +/* 60A298 802197E8 00000000 */ nop /* 60A29C 802197EC 46800020 */ cvt.s.w $f0, $f0 /* 60A2A0 802197F0 46001080 */ add.s $f2, $f2, $f0 /* 60A2A4 802197F4 461A1081 */ sub.s $f2, $f2, $f26 @@ -197,32 +197,32 @@ glabel func_80219520_609FD0 /* 60A2B0 80219800 46001501 */ sub.s $f20, $f2, $f0 /* 60A2B4 80219804 46006004 */ sqrt.s $f0, $f12 /* 60A2B8 80219808 46000032 */ c.eq.s $f0, $f0 -/* 60A2BC 8021980C 00000000 */ nop +/* 60A2BC 8021980C 00000000 */ nop /* 60A2C0 80219810 45010003 */ bc1t .L80219820 -/* 60A2C4 80219814 00000000 */ nop +/* 60A2C4 80219814 00000000 */ nop /* 60A2C8 80219818 0C0187BC */ jal sqrtf -/* 60A2CC 8021981C 00000000 */ nop +/* 60A2CC 8021981C 00000000 */ nop .L80219820: /* 60A2D0 80219820 4614C03C */ c.lt.s $f24, $f20 -/* 60A2D4 80219824 00000000 */ nop +/* 60A2D4 80219824 00000000 */ nop /* 60A2D8 80219828 45000013 */ bc1f .L80219878 /* 60A2DC 8021982C 46000106 */ mov.s $f4, $f0 /* 60A2E0 80219830 92020191 */ lbu $v0, 0x191($s0) /* 60A2E4 80219834 44820000 */ mtc1 $v0, $f0 -/* 60A2E8 80219838 00000000 */ nop +/* 60A2E8 80219838 00000000 */ nop /* 60A2EC 8021983C 46800020 */ cvt.s.w $f0, $f0 /* 60A2F0 80219840 4600A03C */ c.lt.s $f20, $f0 -/* 60A2F4 80219844 00000000 */ nop +/* 60A2F4 80219844 00000000 */ nop /* 60A2F8 80219848 4500000B */ bc1f .L80219878 -/* 60A2FC 8021984C 00000000 */ nop +/* 60A2FC 8021984C 00000000 */ nop /* 60A300 80219850 92020190 */ lbu $v0, 0x190($s0) /* 60A304 80219854 44820000 */ mtc1 $v0, $f0 -/* 60A308 80219858 00000000 */ nop +/* 60A308 80219858 00000000 */ nop /* 60A30C 8021985C 46800020 */ cvt.s.w $f0, $f0 /* 60A310 80219860 46160002 */ mul.s $f0, $f0, $f22 -/* 60A314 80219864 00000000 */ nop +/* 60A314 80219864 00000000 */ nop /* 60A318 80219868 4600203C */ c.lt.s $f4, $f0 -/* 60A31C 8021986C 00000000 */ nop +/* 60A31C 8021986C 00000000 */ nop /* 60A320 80219870 4501FFBE */ bc1t .L8021976C /* 60A324 80219874 24020001 */ addiu $v0, $zero, 1 .L80219878: @@ -235,21 +235,21 @@ glabel func_80219520_609FD0 /* 60A33C 8021988C 14400034 */ bnez $v0, .L80219960 /* 60A340 80219890 00751024 */ and $v0, $v1, $s5 /* 60A344 80219894 10400032 */ beqz $v0, .L80219960 -/* 60A348 80219898 00000000 */ nop +/* 60A348 80219898 00000000 */ nop /* 60A34C 8021989C C6020058 */ lwc1 $f2, 0x58($s0) /* 60A350 802198A0 C6200098 */ lwc1 $f0, 0x98($s1) /* 60A354 802198A4 46001081 */ sub.s $f2, $f2, $f0 /* 60A358 802198A8 46021182 */ mul.s $f6, $f2, $f2 -/* 60A35C 802198AC 00000000 */ nop +/* 60A35C 802198AC 00000000 */ nop /* 60A360 802198B0 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 60A364 802198B4 C6020060 */ lwc1 $f2, 0x60($s0) /* 60A368 802198B8 46001081 */ sub.s $f2, $f2, $f0 /* 60A36C 802198BC 46021102 */ mul.s $f4, $f2, $f2 -/* 60A370 802198C0 00000000 */ nop +/* 60A370 802198C0 00000000 */ nop /* 60A374 802198C4 92020073 */ lbu $v0, 0x73($s0) /* 60A378 802198C8 C600005C */ lwc1 $f0, 0x5c($s0) /* 60A37C 802198CC 44821000 */ mtc1 $v0, $f2 -/* 60A380 802198D0 00000000 */ nop +/* 60A380 802198D0 00000000 */ nop /* 60A384 802198D4 468010A0 */ cvt.s.w $f2, $f2 /* 60A388 802198D8 46020000 */ add.s $f0, $f0, $f2 /* 60A38C 802198DC 461A0001 */ sub.s $f0, $f0, $f26 @@ -258,38 +258,38 @@ glabel func_80219520_609FD0 /* 60A398 802198E8 46020501 */ sub.s $f20, $f0, $f2 /* 60A39C 802198EC 46006004 */ sqrt.s $f0, $f12 /* 60A3A0 802198F0 46000032 */ c.eq.s $f0, $f0 -/* 60A3A4 802198F4 00000000 */ nop +/* 60A3A4 802198F4 00000000 */ nop /* 60A3A8 802198F8 45010003 */ bc1t .L80219908 -/* 60A3AC 802198FC 00000000 */ nop +/* 60A3AC 802198FC 00000000 */ nop /* 60A3B0 80219900 0C0187BC */ jal sqrtf -/* 60A3B4 80219904 00000000 */ nop +/* 60A3B4 80219904 00000000 */ nop .L80219908: /* 60A3B8 80219908 4614C03C */ c.lt.s $f24, $f20 -/* 60A3BC 8021990C 00000000 */ nop +/* 60A3BC 8021990C 00000000 */ nop /* 60A3C0 80219910 45000013 */ bc1f .L80219960 /* 60A3C4 80219914 46000106 */ mov.s $f4, $f0 /* 60A3C8 80219918 92020073 */ lbu $v0, 0x73($s0) /* 60A3CC 8021991C 44820000 */ mtc1 $v0, $f0 -/* 60A3D0 80219920 00000000 */ nop +/* 60A3D0 80219920 00000000 */ nop /* 60A3D4 80219924 46800020 */ cvt.s.w $f0, $f0 /* 60A3D8 80219928 4600A03C */ c.lt.s $f20, $f0 -/* 60A3DC 8021992C 00000000 */ nop +/* 60A3DC 8021992C 00000000 */ nop /* 60A3E0 80219930 4500000B */ bc1f .L80219960 -/* 60A3E4 80219934 00000000 */ nop +/* 60A3E4 80219934 00000000 */ nop /* 60A3E8 80219938 92020072 */ lbu $v0, 0x72($s0) /* 60A3EC 8021993C 44820000 */ mtc1 $v0, $f0 -/* 60A3F0 80219940 00000000 */ nop +/* 60A3F0 80219940 00000000 */ nop /* 60A3F4 80219944 46800020 */ cvt.s.w $f0, $f0 /* 60A3F8 80219948 46160002 */ mul.s $f0, $f0, $f22 -/* 60A3FC 8021994C 00000000 */ nop +/* 60A3FC 8021994C 00000000 */ nop /* 60A400 80219950 4600203C */ c.lt.s $f4, $f0 -/* 60A404 80219954 00000000 */ nop +/* 60A404 80219954 00000000 */ nop /* 60A408 80219958 4501FF86 */ bc1t .L80219774 /* 60A40C 8021995C 24020001 */ addiu $v0, $zero, 1 .L80219960: /* 60A410 80219960 8E10000C */ lw $s0, 0xc($s0) /* 60A414 80219964 1600FFC7 */ bnez $s0, .L80219884 -/* 60A418 80219968 00000000 */ nop +/* 60A418 80219968 00000000 */ nop /* 60A41C 8021996C 26730001 */ addiu $s3, $s3, 1 .L80219970: /* 60A420 80219970 2A620018 */ slti $v0, $s3, 0x18 @@ -310,6 +310,6 @@ glabel func_80219520_609FD0 /* 60A458 802199A8 D7B40030 */ ldc1 $f20, 0x30($sp) /* 60A45C 802199AC 03E00008 */ jr $ra /* 60A460 802199B0 27BD0050 */ addiu $sp, $sp, 0x50 -/* 60A464 802199B4 00000000 */ nop -/* 60A468 802199B8 00000000 */ nop -/* 60A46C 802199BC 00000000 */ nop +/* 60A464 802199B4 00000000 */ nop +/* 60A468 802199B8 00000000 */ nop +/* 60A46C 802199BC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_tik2/60A470/func_802199C0_60A470.s b/asm/nonmatchings/battle/area_tik2/60A470/func_802199C0_60A470.s index 70dc094092..3e71866776 100644 --- a/asm/nonmatchings/battle/area_tik2/60A470/func_802199C0_60A470.s +++ b/asm/nonmatchings/battle/area_tik2/60A470/func_802199C0_60A470.s @@ -26,14 +26,14 @@ glabel func_802199C0_60A470 /* 60A4C4 80219A14 12200009 */ beqz $s1, .L80219A3C /* 60A4C8 80219A18 2402008E */ addiu $v0, $zero, 0x8e /* 60A4CC 80219A1C 08086770 */ j .L80219DC0 -/* 60A4D0 80219A20 00000000 */ nop +/* 60A4D0 80219A20 00000000 */ nop .L80219A24: /* 60A4D4 80219A24 12220085 */ beq $s1, $v0, .L80219C3C /* 60A4D8 80219A28 24020003 */ addiu $v0, $zero, 3 /* 60A4DC 80219A2C 12220013 */ beq $s1, $v0, .L80219A7C /* 60A4E0 80219A30 2403005B */ addiu $v1, $zero, 0x5b /* 60A4E4 80219A34 08086770 */ j .L80219DC0 -/* 60A4E8 80219A38 00000000 */ nop +/* 60A4E8 80219A38 00000000 */ nop .L80219A3C: /* 60A4EC 80219A3C 3C01430E */ lui $at, 0x430e /* 60A4F0 80219A40 44812000 */ mtc1 $at, $f4 @@ -77,7 +77,7 @@ glabel func_802199C0_60A470 /* 60A57C 80219ACC AE0200A8 */ sw $v0, 0xa8($s0) /* 60A580 80219AD0 2842002E */ slti $v0, $v0, 0x2e /* 60A584 80219AD4 14400003 */ bnez $v0, .L80219AE4 -/* 60A588 80219AD8 00000000 */ nop +/* 60A588 80219AD8 00000000 */ nop /* 60A58C 80219ADC 2402002D */ addiu $v0, $zero, 0x2d /* 60A590 80219AE0 AE0200A8 */ sw $v0, 0xa8($s0) .L80219AE4: @@ -95,7 +95,7 @@ glabel func_802199C0_60A470 /* 60A5C0 80219B10 C61E0098 */ lwc1 $f30, 0x98($s0) /* 60A5C4 80219B14 4680F7A0 */ cvt.s.w $f30, $f30 /* 60A5C8 80219B18 461A6302 */ mul.s $f12, $f12, $f26 -/* 60A5CC 80219B1C 00000000 */ nop +/* 60A5CC 80219B1C 00000000 */ nop /* 60A5D0 80219B20 C61C009C */ lwc1 $f28, 0x9c($s0) /* 60A5D4 80219B24 4680E720 */ cvt.s.w $f28, $f28 /* 60A5D8 80219B28 3C0143B4 */ lui $at, 0x43b4 @@ -113,22 +113,22 @@ glabel func_802199C0_60A470 /* 60A608 80219B58 4620B001 */ sub.d $f0, $f22, $f0 /* 60A60C 80219B5C 46002521 */ cvt.d.s $f20, $f4 /* 60A610 80219B60 4620A502 */ mul.d $f20, $f20, $f0 -/* 60A614 80219B64 00000000 */ nop +/* 60A614 80219B64 00000000 */ nop /* 60A618 80219B68 C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 60A61C 80219B6C 46806320 */ cvt.s.w $f12, $f12 /* 60A620 80219B70 461A6302 */ mul.s $f12, $f12, $f26 -/* 60A624 80219B74 00000000 */ nop +/* 60A624 80219B74 00000000 */ nop /* 60A628 80219B78 0C00A85B */ jal sin_rad /* 60A62C 80219B7C 46186303 */ div.s $f12, $f12, $f24 /* 60A630 80219B80 4600E002 */ mul.s $f0, $f28, $f0 -/* 60A634 80219B84 00000000 */ nop +/* 60A634 80219B84 00000000 */ nop /* 60A638 80219B88 8E0200A8 */ lw $v0, 0xa8($s0) /* 60A63C 80219B8C 00021040 */ sll $v0, $v0, 1 /* 60A640 80219B90 44826000 */ mtc1 $v0, $f12 -/* 60A644 80219B94 00000000 */ nop +/* 60A644 80219B94 00000000 */ nop /* 60A648 80219B98 46806320 */ cvt.s.w $f12, $f12 /* 60A64C 80219B9C 461A6302 */ mul.s $f12, $f12, $f26 -/* 60A650 80219BA0 00000000 */ nop +/* 60A650 80219BA0 00000000 */ nop /* 60A654 80219BA4 46000021 */ cvt.d.s $f0, $f0 /* 60A658 80219BA8 4620A500 */ add.d $f20, $f20, $f0 /* 60A65C 80219BAC 46186303 */ div.s $f12, $f12, $f24 @@ -138,12 +138,12 @@ glabel func_802199C0_60A470 /* 60A66C 80219BBC C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 60A670 80219BC0 46806320 */ cvt.s.w $f12, $f12 /* 60A674 80219BC4 461A6302 */ mul.s $f12, $f12, $f26 -/* 60A678 80219BC8 00000000 */ nop +/* 60A678 80219BC8 00000000 */ nop /* 60A67C 80219BCC 3C0142B4 */ lui $at, 0x42b4 /* 60A680 80219BD0 44811000 */ mtc1 $at, $f2 -/* 60A684 80219BD4 00000000 */ nop +/* 60A684 80219BD4 00000000 */ nop /* 60A688 80219BD8 46020002 */ mul.s $f0, $f0, $f2 -/* 60A68C 80219BDC 00000000 */ nop +/* 60A68C 80219BDC 00000000 */ nop /* 60A690 80219BE0 C7A40014 */ lwc1 $f4, 0x14($sp) /* 60A694 80219BE4 46002100 */ add.s $f4, $f4, $f0 /* 60A698 80219BE8 46186303 */ div.s $f12, $f12, $f24 @@ -152,17 +152,17 @@ glabel func_802199C0_60A470 /* 60A6A4 80219BF4 C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 60A6A8 80219BF8 46806320 */ cvt.s.w $f12, $f12 /* 60A6AC 80219BFC 461A6302 */ mul.s $f12, $f12, $f26 -/* 60A6B0 80219C00 00000000 */ nop +/* 60A6B0 80219C00 00000000 */ nop /* 60A6B4 80219C04 46000021 */ cvt.d.s $f0, $f0 /* 60A6B8 80219C08 4620B581 */ sub.d $f22, $f22, $f0 /* 60A6BC 80219C0C 4600F521 */ cvt.d.s $f20, $f30 /* 60A6C0 80219C10 4636A502 */ mul.d $f20, $f20, $f22 -/* 60A6C4 80219C14 00000000 */ nop +/* 60A6C4 80219C14 00000000 */ nop /* 60A6C8 80219C18 0C00A85B */ jal sin_rad /* 60A6CC 80219C1C 46186303 */ div.s $f12, $f12, $f24 /* 60A6D0 80219C20 C7A40018 */ lwc1 $f4, 0x18($sp) /* 60A6D4 80219C24 46002002 */ mul.s $f0, $f4, $f0 -/* 60A6D8 80219C28 00000000 */ nop +/* 60A6D8 80219C28 00000000 */ nop /* 60A6DC 80219C2C 46000021 */ cvt.d.s $f0, $f0 /* 60A6E0 80219C30 4620A500 */ add.d $f20, $f20, $f0 /* 60A6E4 80219C34 0808676C */ j .L80219DB0 @@ -191,7 +191,7 @@ glabel func_802199C0_60A470 /* 60A738 80219C88 C61E0098 */ lwc1 $f30, 0x98($s0) /* 60A73C 80219C8C 4680F7A0 */ cvt.s.w $f30, $f30 /* 60A740 80219C90 461A6302 */ mul.s $f12, $f12, $f26 -/* 60A744 80219C94 00000000 */ nop +/* 60A744 80219C94 00000000 */ nop /* 60A748 80219C98 C61C009C */ lwc1 $f28, 0x9c($s0) /* 60A74C 80219C9C 4680E720 */ cvt.s.w $f28, $f28 /* 60A750 80219CA0 3C0143B4 */ lui $at, 0x43b4 @@ -209,22 +209,22 @@ glabel func_802199C0_60A470 /* 60A780 80219CD0 4620B001 */ sub.d $f0, $f22, $f0 /* 60A784 80219CD4 46002521 */ cvt.d.s $f20, $f4 /* 60A788 80219CD8 4620A502 */ mul.d $f20, $f20, $f0 -/* 60A78C 80219CDC 00000000 */ nop +/* 60A78C 80219CDC 00000000 */ nop /* 60A790 80219CE0 C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 60A794 80219CE4 46806320 */ cvt.s.w $f12, $f12 /* 60A798 80219CE8 461A6302 */ mul.s $f12, $f12, $f26 -/* 60A79C 80219CEC 00000000 */ nop +/* 60A79C 80219CEC 00000000 */ nop /* 60A7A0 80219CF0 0C00A85B */ jal sin_rad /* 60A7A4 80219CF4 46186303 */ div.s $f12, $f12, $f24 /* 60A7A8 80219CF8 4600E002 */ mul.s $f0, $f28, $f0 -/* 60A7AC 80219CFC 00000000 */ nop +/* 60A7AC 80219CFC 00000000 */ nop /* 60A7B0 80219D00 8E0200A8 */ lw $v0, 0xa8($s0) /* 60A7B4 80219D04 00021040 */ sll $v0, $v0, 1 /* 60A7B8 80219D08 44826000 */ mtc1 $v0, $f12 -/* 60A7BC 80219D0C 00000000 */ nop +/* 60A7BC 80219D0C 00000000 */ nop /* 60A7C0 80219D10 46806320 */ cvt.s.w $f12, $f12 /* 60A7C4 80219D14 461A6302 */ mul.s $f12, $f12, $f26 -/* 60A7C8 80219D18 00000000 */ nop +/* 60A7C8 80219D18 00000000 */ nop /* 60A7CC 80219D1C 46000021 */ cvt.d.s $f0, $f0 /* 60A7D0 80219D20 4620A500 */ add.d $f20, $f20, $f0 /* 60A7D4 80219D24 46186303 */ div.s $f12, $f12, $f24 @@ -234,12 +234,12 @@ glabel func_802199C0_60A470 /* 60A7E4 80219D34 C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 60A7E8 80219D38 46806320 */ cvt.s.w $f12, $f12 /* 60A7EC 80219D3C 461A6302 */ mul.s $f12, $f12, $f26 -/* 60A7F0 80219D40 00000000 */ nop +/* 60A7F0 80219D40 00000000 */ nop /* 60A7F4 80219D44 3C0142B4 */ lui $at, 0x42b4 /* 60A7F8 80219D48 44811000 */ mtc1 $at, $f2 -/* 60A7FC 80219D4C 00000000 */ nop +/* 60A7FC 80219D4C 00000000 */ nop /* 60A800 80219D50 46020002 */ mul.s $f0, $f0, $f2 -/* 60A804 80219D54 00000000 */ nop +/* 60A804 80219D54 00000000 */ nop /* 60A808 80219D58 C7A40014 */ lwc1 $f4, 0x14($sp) /* 60A80C 80219D5C 46002100 */ add.s $f4, $f4, $f0 /* 60A810 80219D60 46186303 */ div.s $f12, $f12, $f24 @@ -248,17 +248,17 @@ glabel func_802199C0_60A470 /* 60A81C 80219D6C C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 60A820 80219D70 46806320 */ cvt.s.w $f12, $f12 /* 60A824 80219D74 461A6302 */ mul.s $f12, $f12, $f26 -/* 60A828 80219D78 00000000 */ nop +/* 60A828 80219D78 00000000 */ nop /* 60A82C 80219D7C 46000021 */ cvt.d.s $f0, $f0 /* 60A830 80219D80 4620B581 */ sub.d $f22, $f22, $f0 /* 60A834 80219D84 4600F521 */ cvt.d.s $f20, $f30 /* 60A838 80219D88 4636A502 */ mul.d $f20, $f20, $f22 -/* 60A83C 80219D8C 00000000 */ nop +/* 60A83C 80219D8C 00000000 */ nop /* 60A840 80219D90 0C00A85B */ jal sin_rad /* 60A844 80219D94 46186303 */ div.s $f12, $f12, $f24 /* 60A848 80219D98 C7A40018 */ lwc1 $f4, 0x18($sp) /* 60A84C 80219D9C 46002002 */ mul.s $f0, $f4, $f0 -/* 60A850 80219DA0 00000000 */ nop +/* 60A850 80219DA0 00000000 */ nop /* 60A854 80219DA4 46000021 */ cvt.d.s $f0, $f0 /* 60A858 80219DA8 4620A500 */ add.d $f20, $f20, $f0 /* 60A85C 80219DAC 2402005A */ addiu $v0, $zero, 0x5a diff --git a/asm/nonmatchings/battle/area_tik3/618A00/func_80218310_618A00.s b/asm/nonmatchings/battle/area_tik3/618A00/func_80218310_618A00.s index a7739ee5ee..0c902a1d0b 100644 --- a/asm/nonmatchings/battle/area_tik3/618A00/func_80218310_618A00.s +++ b/asm/nonmatchings/battle/area_tik3/618A00/func_80218310_618A00.s @@ -32,58 +32,58 @@ glabel func_80218310_618A00 /* 618A6C 8021837C C6200098 */ lwc1 $f0, 0x98($s1) /* 618A70 80218380 46001081 */ sub.s $f2, $f2, $f0 /* 618A74 80218384 46021182 */ mul.s $f6, $f2, $f2 -/* 618A78 80218388 00000000 */ nop +/* 618A78 80218388 00000000 */ nop /* 618A7C 8021838C C62000A0 */ lwc1 $f0, 0xa0($s1) /* 618A80 80218390 C602014C */ lwc1 $f2, 0x14c($s0) /* 618A84 80218394 46001081 */ sub.s $f2, $f2, $f0 /* 618A88 80218398 46021102 */ mul.s $f4, $f2, $f2 -/* 618A8C 8021839C 00000000 */ nop +/* 618A8C 8021839C 00000000 */ nop /* 618A90 802183A0 92020191 */ lbu $v0, 0x191($s0) /* 618A94 802183A4 C6020148 */ lwc1 $f2, 0x148($s0) /* 618A98 802183A8 44820000 */ mtc1 $v0, $f0 -/* 618A9C 802183AC 00000000 */ nop +/* 618A9C 802183AC 00000000 */ nop /* 618AA0 802183B0 46800020 */ cvt.s.w $f0, $f0 /* 618AA4 802183B4 46001080 */ add.s $f2, $f2, $f0 /* 618AA8 802183B8 3C013FC0 */ lui $at, 0x3fc0 /* 618AAC 802183BC 44810000 */ mtc1 $at, $f0 -/* 618AB0 802183C0 00000000 */ nop +/* 618AB0 802183C0 00000000 */ nop /* 618AB4 802183C4 46001081 */ sub.s $f2, $f2, $f0 /* 618AB8 802183C8 46043300 */ add.s $f12, $f6, $f4 /* 618ABC 802183CC C620009C */ lwc1 $f0, 0x9c($s1) /* 618AC0 802183D0 46001501 */ sub.s $f20, $f2, $f0 /* 618AC4 802183D4 46006084 */ sqrt.s $f2, $f12 /* 618AC8 802183D8 46021032 */ c.eq.s $f2, $f2 -/* 618ACC 802183DC 00000000 */ nop +/* 618ACC 802183DC 00000000 */ nop /* 618AD0 802183E0 45010004 */ bc1t .L802183F4 -/* 618AD4 802183E4 00000000 */ nop +/* 618AD4 802183E4 00000000 */ nop /* 618AD8 802183E8 0C0187BC */ jal sqrtf -/* 618ADC 802183EC 00000000 */ nop +/* 618ADC 802183EC 00000000 */ nop /* 618AE0 802183F0 46000086 */ mov.s $f2, $f0 .L802183F4: /* 618AE4 802183F4 44800000 */ mtc1 $zero, $f0 -/* 618AE8 802183F8 00000000 */ nop +/* 618AE8 802183F8 00000000 */ nop /* 618AEC 802183FC 4614003C */ c.lt.s $f0, $f20 -/* 618AF0 80218400 00000000 */ nop +/* 618AF0 80218400 00000000 */ nop /* 618AF4 80218404 45000017 */ bc1f .L80218464 /* 618AF8 80218408 46001106 */ mov.s $f4, $f2 /* 618AFC 8021840C 92020191 */ lbu $v0, 0x191($s0) /* 618B00 80218410 44820000 */ mtc1 $v0, $f0 -/* 618B04 80218414 00000000 */ nop +/* 618B04 80218414 00000000 */ nop /* 618B08 80218418 46800020 */ cvt.s.w $f0, $f0 /* 618B0C 8021841C 4600A03C */ c.lt.s $f20, $f0 -/* 618B10 80218420 00000000 */ nop +/* 618B10 80218420 00000000 */ nop /* 618B14 80218424 4500000F */ bc1f .L80218464 -/* 618B18 80218428 00000000 */ nop +/* 618B18 80218428 00000000 */ nop /* 618B1C 8021842C 92020190 */ lbu $v0, 0x190($s0) /* 618B20 80218430 3C013F00 */ lui $at, 0x3f00 /* 618B24 80218434 44811000 */ mtc1 $at, $f2 /* 618B28 80218438 44820000 */ mtc1 $v0, $f0 -/* 618B2C 8021843C 00000000 */ nop +/* 618B2C 8021843C 00000000 */ nop /* 618B30 80218440 46800020 */ cvt.s.w $f0, $f0 /* 618B34 80218444 46020002 */ mul.s $f0, $f0, $f2 -/* 618B38 80218448 00000000 */ nop +/* 618B38 80218448 00000000 */ nop /* 618B3C 8021844C 4600203C */ c.lt.s $f4, $f0 -/* 618B40 80218450 00000000 */ nop +/* 618B40 80218450 00000000 */ nop /* 618B44 80218454 45000003 */ bc1f .L80218464 /* 618B48 80218458 24020001 */ addiu $v0, $zero, 1 /* 618B4C 8021845C 080861DB */ j .L8021876C @@ -96,58 +96,58 @@ glabel func_80218310_618A00 /* 618B64 80218474 C6200098 */ lwc1 $f0, 0x98($s1) /* 618B68 80218478 46001081 */ sub.s $f2, $f2, $f0 /* 618B6C 8021847C 46021182 */ mul.s $f6, $f2, $f2 -/* 618B70 80218480 00000000 */ nop +/* 618B70 80218480 00000000 */ nop /* 618B74 80218484 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 618B78 80218488 C602014C */ lwc1 $f2, 0x14c($s0) /* 618B7C 8021848C 46001081 */ sub.s $f2, $f2, $f0 /* 618B80 80218490 46021102 */ mul.s $f4, $f2, $f2 -/* 618B84 80218494 00000000 */ nop +/* 618B84 80218494 00000000 */ nop /* 618B88 80218498 92020191 */ lbu $v0, 0x191($s0) /* 618B8C 8021849C C6020148 */ lwc1 $f2, 0x148($s0) /* 618B90 802184A0 44820000 */ mtc1 $v0, $f0 -/* 618B94 802184A4 00000000 */ nop +/* 618B94 802184A4 00000000 */ nop /* 618B98 802184A8 46800020 */ cvt.s.w $f0, $f0 /* 618B9C 802184AC 46001080 */ add.s $f2, $f2, $f0 /* 618BA0 802184B0 3C013FC0 */ lui $at, 0x3fc0 /* 618BA4 802184B4 44810000 */ mtc1 $at, $f0 -/* 618BA8 802184B8 00000000 */ nop +/* 618BA8 802184B8 00000000 */ nop /* 618BAC 802184BC 46001081 */ sub.s $f2, $f2, $f0 /* 618BB0 802184C0 46043300 */ add.s $f12, $f6, $f4 /* 618BB4 802184C4 C620009C */ lwc1 $f0, 0x9c($s1) /* 618BB8 802184C8 46001501 */ sub.s $f20, $f2, $f0 /* 618BBC 802184CC 46006084 */ sqrt.s $f2, $f12 /* 618BC0 802184D0 46021032 */ c.eq.s $f2, $f2 -/* 618BC4 802184D4 00000000 */ nop +/* 618BC4 802184D4 00000000 */ nop /* 618BC8 802184D8 45010004 */ bc1t .L802184EC -/* 618BCC 802184DC 00000000 */ nop +/* 618BCC 802184DC 00000000 */ nop /* 618BD0 802184E0 0C0187BC */ jal sqrtf -/* 618BD4 802184E4 00000000 */ nop +/* 618BD4 802184E4 00000000 */ nop /* 618BD8 802184E8 46000086 */ mov.s $f2, $f0 .L802184EC: /* 618BDC 802184EC 44800000 */ mtc1 $zero, $f0 -/* 618BE0 802184F0 00000000 */ nop +/* 618BE0 802184F0 00000000 */ nop /* 618BE4 802184F4 4614003C */ c.lt.s $f0, $f20 -/* 618BE8 802184F8 00000000 */ nop +/* 618BE8 802184F8 00000000 */ nop /* 618BEC 802184FC 4500001B */ bc1f .L8021856C /* 618BF0 80218500 46001106 */ mov.s $f4, $f2 /* 618BF4 80218504 92020191 */ lbu $v0, 0x191($s0) /* 618BF8 80218508 44820000 */ mtc1 $v0, $f0 -/* 618BFC 8021850C 00000000 */ nop +/* 618BFC 8021850C 00000000 */ nop /* 618C00 80218510 46800020 */ cvt.s.w $f0, $f0 /* 618C04 80218514 4600A03C */ c.lt.s $f20, $f0 -/* 618C08 80218518 00000000 */ nop +/* 618C08 80218518 00000000 */ nop /* 618C0C 8021851C 45000014 */ bc1f .L80218570 /* 618C10 80218520 0000982D */ daddu $s3, $zero, $zero /* 618C14 80218524 92020190 */ lbu $v0, 0x190($s0) /* 618C18 80218528 3C013F00 */ lui $at, 0x3f00 /* 618C1C 8021852C 44811000 */ mtc1 $at, $f2 /* 618C20 80218530 44820000 */ mtc1 $v0, $f0 -/* 618C24 80218534 00000000 */ nop +/* 618C24 80218534 00000000 */ nop /* 618C28 80218538 46800020 */ cvt.s.w $f0, $f0 /* 618C2C 8021853C 46020002 */ mul.s $f0, $f0, $f2 -/* 618C30 80218540 00000000 */ nop +/* 618C30 80218540 00000000 */ nop /* 618C34 80218544 4600203C */ c.lt.s $f4, $f0 -/* 618C38 80218548 00000000 */ nop +/* 618C38 80218548 00000000 */ nop /* 618C3C 8021854C 45000008 */ bc1f .L80218570 /* 618C40 80218550 24020001 */ addiu $v0, $zero, 1 /* 618C44 80218554 080861DB */ j .L8021876C @@ -179,16 +179,16 @@ glabel func_80218310_618A00 /* 618C98 802185A8 C6200098 */ lwc1 $f0, 0x98($s1) /* 618C9C 802185AC 46001081 */ sub.s $f2, $f2, $f0 /* 618CA0 802185B0 46021182 */ mul.s $f6, $f2, $f2 -/* 618CA4 802185B4 00000000 */ nop +/* 618CA4 802185B4 00000000 */ nop /* 618CA8 802185B8 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 618CAC 802185BC C602014C */ lwc1 $f2, 0x14c($s0) /* 618CB0 802185C0 46001081 */ sub.s $f2, $f2, $f0 /* 618CB4 802185C4 46021102 */ mul.s $f4, $f2, $f2 -/* 618CB8 802185C8 00000000 */ nop +/* 618CB8 802185C8 00000000 */ nop /* 618CBC 802185CC 92020191 */ lbu $v0, 0x191($s0) /* 618CC0 802185D0 C6020148 */ lwc1 $f2, 0x148($s0) /* 618CC4 802185D4 44820000 */ mtc1 $v0, $f0 -/* 618CC8 802185D8 00000000 */ nop +/* 618CC8 802185D8 00000000 */ nop /* 618CCC 802185DC 46800020 */ cvt.s.w $f0, $f0 /* 618CD0 802185E0 46001080 */ add.s $f2, $f2, $f0 /* 618CD4 802185E4 461A1081 */ sub.s $f2, $f2, $f26 @@ -197,32 +197,32 @@ glabel func_80218310_618A00 /* 618CE0 802185F0 46001501 */ sub.s $f20, $f2, $f0 /* 618CE4 802185F4 46006004 */ sqrt.s $f0, $f12 /* 618CE8 802185F8 46000032 */ c.eq.s $f0, $f0 -/* 618CEC 802185FC 00000000 */ nop +/* 618CEC 802185FC 00000000 */ nop /* 618CF0 80218600 45010003 */ bc1t .L80218610 -/* 618CF4 80218604 00000000 */ nop +/* 618CF4 80218604 00000000 */ nop /* 618CF8 80218608 0C0187BC */ jal sqrtf -/* 618CFC 8021860C 00000000 */ nop +/* 618CFC 8021860C 00000000 */ nop .L80218610: /* 618D00 80218610 4614C03C */ c.lt.s $f24, $f20 -/* 618D04 80218614 00000000 */ nop +/* 618D04 80218614 00000000 */ nop /* 618D08 80218618 45000013 */ bc1f .L80218668 /* 618D0C 8021861C 46000106 */ mov.s $f4, $f0 /* 618D10 80218620 92020191 */ lbu $v0, 0x191($s0) /* 618D14 80218624 44820000 */ mtc1 $v0, $f0 -/* 618D18 80218628 00000000 */ nop +/* 618D18 80218628 00000000 */ nop /* 618D1C 8021862C 46800020 */ cvt.s.w $f0, $f0 /* 618D20 80218630 4600A03C */ c.lt.s $f20, $f0 -/* 618D24 80218634 00000000 */ nop +/* 618D24 80218634 00000000 */ nop /* 618D28 80218638 4500000B */ bc1f .L80218668 -/* 618D2C 8021863C 00000000 */ nop +/* 618D2C 8021863C 00000000 */ nop /* 618D30 80218640 92020190 */ lbu $v0, 0x190($s0) /* 618D34 80218644 44820000 */ mtc1 $v0, $f0 -/* 618D38 80218648 00000000 */ nop +/* 618D38 80218648 00000000 */ nop /* 618D3C 8021864C 46800020 */ cvt.s.w $f0, $f0 /* 618D40 80218650 46160002 */ mul.s $f0, $f0, $f22 -/* 618D44 80218654 00000000 */ nop +/* 618D44 80218654 00000000 */ nop /* 618D48 80218658 4600203C */ c.lt.s $f4, $f0 -/* 618D4C 8021865C 00000000 */ nop +/* 618D4C 8021865C 00000000 */ nop /* 618D50 80218660 4501FFBE */ bc1t .L8021855C /* 618D54 80218664 24020001 */ addiu $v0, $zero, 1 .L80218668: @@ -235,21 +235,21 @@ glabel func_80218310_618A00 /* 618D6C 8021867C 14400034 */ bnez $v0, .L80218750 /* 618D70 80218680 00751024 */ and $v0, $v1, $s5 /* 618D74 80218684 10400032 */ beqz $v0, .L80218750 -/* 618D78 80218688 00000000 */ nop +/* 618D78 80218688 00000000 */ nop /* 618D7C 8021868C C6020058 */ lwc1 $f2, 0x58($s0) /* 618D80 80218690 C6200098 */ lwc1 $f0, 0x98($s1) /* 618D84 80218694 46001081 */ sub.s $f2, $f2, $f0 /* 618D88 80218698 46021182 */ mul.s $f6, $f2, $f2 -/* 618D8C 8021869C 00000000 */ nop +/* 618D8C 8021869C 00000000 */ nop /* 618D90 802186A0 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 618D94 802186A4 C6020060 */ lwc1 $f2, 0x60($s0) /* 618D98 802186A8 46001081 */ sub.s $f2, $f2, $f0 /* 618D9C 802186AC 46021102 */ mul.s $f4, $f2, $f2 -/* 618DA0 802186B0 00000000 */ nop +/* 618DA0 802186B0 00000000 */ nop /* 618DA4 802186B4 92020073 */ lbu $v0, 0x73($s0) /* 618DA8 802186B8 C600005C */ lwc1 $f0, 0x5c($s0) /* 618DAC 802186BC 44821000 */ mtc1 $v0, $f2 -/* 618DB0 802186C0 00000000 */ nop +/* 618DB0 802186C0 00000000 */ nop /* 618DB4 802186C4 468010A0 */ cvt.s.w $f2, $f2 /* 618DB8 802186C8 46020000 */ add.s $f0, $f0, $f2 /* 618DBC 802186CC 461A0001 */ sub.s $f0, $f0, $f26 @@ -258,38 +258,38 @@ glabel func_80218310_618A00 /* 618DC8 802186D8 46020501 */ sub.s $f20, $f0, $f2 /* 618DCC 802186DC 46006004 */ sqrt.s $f0, $f12 /* 618DD0 802186E0 46000032 */ c.eq.s $f0, $f0 -/* 618DD4 802186E4 00000000 */ nop +/* 618DD4 802186E4 00000000 */ nop /* 618DD8 802186E8 45010003 */ bc1t .L802186F8 -/* 618DDC 802186EC 00000000 */ nop +/* 618DDC 802186EC 00000000 */ nop /* 618DE0 802186F0 0C0187BC */ jal sqrtf -/* 618DE4 802186F4 00000000 */ nop +/* 618DE4 802186F4 00000000 */ nop .L802186F8: /* 618DE8 802186F8 4614C03C */ c.lt.s $f24, $f20 -/* 618DEC 802186FC 00000000 */ nop +/* 618DEC 802186FC 00000000 */ nop /* 618DF0 80218700 45000013 */ bc1f .L80218750 /* 618DF4 80218704 46000106 */ mov.s $f4, $f0 /* 618DF8 80218708 92020073 */ lbu $v0, 0x73($s0) /* 618DFC 8021870C 44820000 */ mtc1 $v0, $f0 -/* 618E00 80218710 00000000 */ nop +/* 618E00 80218710 00000000 */ nop /* 618E04 80218714 46800020 */ cvt.s.w $f0, $f0 /* 618E08 80218718 4600A03C */ c.lt.s $f20, $f0 -/* 618E0C 8021871C 00000000 */ nop +/* 618E0C 8021871C 00000000 */ nop /* 618E10 80218720 4500000B */ bc1f .L80218750 -/* 618E14 80218724 00000000 */ nop +/* 618E14 80218724 00000000 */ nop /* 618E18 80218728 92020072 */ lbu $v0, 0x72($s0) /* 618E1C 8021872C 44820000 */ mtc1 $v0, $f0 -/* 618E20 80218730 00000000 */ nop +/* 618E20 80218730 00000000 */ nop /* 618E24 80218734 46800020 */ cvt.s.w $f0, $f0 /* 618E28 80218738 46160002 */ mul.s $f0, $f0, $f22 -/* 618E2C 8021873C 00000000 */ nop +/* 618E2C 8021873C 00000000 */ nop /* 618E30 80218740 4600203C */ c.lt.s $f4, $f0 -/* 618E34 80218744 00000000 */ nop +/* 618E34 80218744 00000000 */ nop /* 618E38 80218748 4501FF86 */ bc1t .L80218564 /* 618E3C 8021874C 24020001 */ addiu $v0, $zero, 1 .L80218750: /* 618E40 80218750 8E10000C */ lw $s0, 0xc($s0) /* 618E44 80218754 1600FFC7 */ bnez $s0, .L80218674 -/* 618E48 80218758 00000000 */ nop +/* 618E48 80218758 00000000 */ nop /* 618E4C 8021875C 26730001 */ addiu $s3, $s3, 1 .L80218760: /* 618E50 80218760 2A620018 */ slti $v0, $s3, 0x18 @@ -310,6 +310,6 @@ glabel func_80218310_618A00 /* 618E88 80218798 D7B40030 */ ldc1 $f20, 0x30($sp) /* 618E8C 8021879C 03E00008 */ jr $ra /* 618E90 802187A0 27BD0050 */ addiu $sp, $sp, 0x50 -/* 618E94 802187A4 00000000 */ nop -/* 618E98 802187A8 00000000 */ nop -/* 618E9C 802187AC 00000000 */ nop +/* 618E94 802187A4 00000000 */ nop +/* 618E98 802187A8 00000000 */ nop +/* 618E9C 802187AC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_tik3/618EA0/func_802187B0_618EA0.s b/asm/nonmatchings/battle/area_tik3/618EA0/func_802187B0_618EA0.s index eee8a21907..aa5173a239 100644 --- a/asm/nonmatchings/battle/area_tik3/618EA0/func_802187B0_618EA0.s +++ b/asm/nonmatchings/battle/area_tik3/618EA0/func_802187B0_618EA0.s @@ -32,58 +32,58 @@ glabel func_802187B0_618EA0 /* 618F0C 8021881C C6200098 */ lwc1 $f0, 0x98($s1) /* 618F10 80218820 46001081 */ sub.s $f2, $f2, $f0 /* 618F14 80218824 46021182 */ mul.s $f6, $f2, $f2 -/* 618F18 80218828 00000000 */ nop +/* 618F18 80218828 00000000 */ nop /* 618F1C 8021882C C62000A0 */ lwc1 $f0, 0xa0($s1) /* 618F20 80218830 C602014C */ lwc1 $f2, 0x14c($s0) /* 618F24 80218834 46001081 */ sub.s $f2, $f2, $f0 /* 618F28 80218838 46021102 */ mul.s $f4, $f2, $f2 -/* 618F2C 8021883C 00000000 */ nop +/* 618F2C 8021883C 00000000 */ nop /* 618F30 80218840 92020191 */ lbu $v0, 0x191($s0) /* 618F34 80218844 C6020148 */ lwc1 $f2, 0x148($s0) /* 618F38 80218848 44820000 */ mtc1 $v0, $f0 -/* 618F3C 8021884C 00000000 */ nop +/* 618F3C 8021884C 00000000 */ nop /* 618F40 80218850 46800020 */ cvt.s.w $f0, $f0 /* 618F44 80218854 46001080 */ add.s $f2, $f2, $f0 /* 618F48 80218858 3C013FC0 */ lui $at, 0x3fc0 /* 618F4C 8021885C 44810000 */ mtc1 $at, $f0 -/* 618F50 80218860 00000000 */ nop +/* 618F50 80218860 00000000 */ nop /* 618F54 80218864 46001081 */ sub.s $f2, $f2, $f0 /* 618F58 80218868 46043300 */ add.s $f12, $f6, $f4 /* 618F5C 8021886C C620009C */ lwc1 $f0, 0x9c($s1) /* 618F60 80218870 46001501 */ sub.s $f20, $f2, $f0 /* 618F64 80218874 46006084 */ sqrt.s $f2, $f12 /* 618F68 80218878 46021032 */ c.eq.s $f2, $f2 -/* 618F6C 8021887C 00000000 */ nop +/* 618F6C 8021887C 00000000 */ nop /* 618F70 80218880 45010004 */ bc1t .L80218894 -/* 618F74 80218884 00000000 */ nop +/* 618F74 80218884 00000000 */ nop /* 618F78 80218888 0C0187BC */ jal sqrtf -/* 618F7C 8021888C 00000000 */ nop +/* 618F7C 8021888C 00000000 */ nop /* 618F80 80218890 46000086 */ mov.s $f2, $f0 .L80218894: /* 618F84 80218894 44800000 */ mtc1 $zero, $f0 -/* 618F88 80218898 00000000 */ nop +/* 618F88 80218898 00000000 */ nop /* 618F8C 8021889C 4614003C */ c.lt.s $f0, $f20 -/* 618F90 802188A0 00000000 */ nop +/* 618F90 802188A0 00000000 */ nop /* 618F94 802188A4 45000017 */ bc1f .L80218904 /* 618F98 802188A8 46001106 */ mov.s $f4, $f2 /* 618F9C 802188AC 92020191 */ lbu $v0, 0x191($s0) /* 618FA0 802188B0 44820000 */ mtc1 $v0, $f0 -/* 618FA4 802188B4 00000000 */ nop +/* 618FA4 802188B4 00000000 */ nop /* 618FA8 802188B8 46800020 */ cvt.s.w $f0, $f0 /* 618FAC 802188BC 4600A03C */ c.lt.s $f20, $f0 -/* 618FB0 802188C0 00000000 */ nop +/* 618FB0 802188C0 00000000 */ nop /* 618FB4 802188C4 4500000F */ bc1f .L80218904 -/* 618FB8 802188C8 00000000 */ nop +/* 618FB8 802188C8 00000000 */ nop /* 618FBC 802188CC 92020190 */ lbu $v0, 0x190($s0) /* 618FC0 802188D0 3C013F00 */ lui $at, 0x3f00 /* 618FC4 802188D4 44811000 */ mtc1 $at, $f2 /* 618FC8 802188D8 44820000 */ mtc1 $v0, $f0 -/* 618FCC 802188DC 00000000 */ nop +/* 618FCC 802188DC 00000000 */ nop /* 618FD0 802188E0 46800020 */ cvt.s.w $f0, $f0 /* 618FD4 802188E4 46020002 */ mul.s $f0, $f0, $f2 -/* 618FD8 802188E8 00000000 */ nop +/* 618FD8 802188E8 00000000 */ nop /* 618FDC 802188EC 4600203C */ c.lt.s $f4, $f0 -/* 618FE0 802188F0 00000000 */ nop +/* 618FE0 802188F0 00000000 */ nop /* 618FE4 802188F4 45000003 */ bc1f .L80218904 /* 618FE8 802188F8 24020001 */ addiu $v0, $zero, 1 /* 618FEC 802188FC 08086303 */ j .L80218C0C @@ -96,58 +96,58 @@ glabel func_802187B0_618EA0 /* 619004 80218914 C6200098 */ lwc1 $f0, 0x98($s1) /* 619008 80218918 46001081 */ sub.s $f2, $f2, $f0 /* 61900C 8021891C 46021182 */ mul.s $f6, $f2, $f2 -/* 619010 80218920 00000000 */ nop +/* 619010 80218920 00000000 */ nop /* 619014 80218924 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 619018 80218928 C602014C */ lwc1 $f2, 0x14c($s0) /* 61901C 8021892C 46001081 */ sub.s $f2, $f2, $f0 /* 619020 80218930 46021102 */ mul.s $f4, $f2, $f2 -/* 619024 80218934 00000000 */ nop +/* 619024 80218934 00000000 */ nop /* 619028 80218938 92020191 */ lbu $v0, 0x191($s0) /* 61902C 8021893C C6020148 */ lwc1 $f2, 0x148($s0) /* 619030 80218940 44820000 */ mtc1 $v0, $f0 -/* 619034 80218944 00000000 */ nop +/* 619034 80218944 00000000 */ nop /* 619038 80218948 46800020 */ cvt.s.w $f0, $f0 /* 61903C 8021894C 46001080 */ add.s $f2, $f2, $f0 /* 619040 80218950 3C013FC0 */ lui $at, 0x3fc0 /* 619044 80218954 44810000 */ mtc1 $at, $f0 -/* 619048 80218958 00000000 */ nop +/* 619048 80218958 00000000 */ nop /* 61904C 8021895C 46001081 */ sub.s $f2, $f2, $f0 /* 619050 80218960 46043300 */ add.s $f12, $f6, $f4 /* 619054 80218964 C620009C */ lwc1 $f0, 0x9c($s1) /* 619058 80218968 46001501 */ sub.s $f20, $f2, $f0 /* 61905C 8021896C 46006084 */ sqrt.s $f2, $f12 /* 619060 80218970 46021032 */ c.eq.s $f2, $f2 -/* 619064 80218974 00000000 */ nop +/* 619064 80218974 00000000 */ nop /* 619068 80218978 45010004 */ bc1t .L8021898C -/* 61906C 8021897C 00000000 */ nop +/* 61906C 8021897C 00000000 */ nop /* 619070 80218980 0C0187BC */ jal sqrtf -/* 619074 80218984 00000000 */ nop +/* 619074 80218984 00000000 */ nop /* 619078 80218988 46000086 */ mov.s $f2, $f0 .L8021898C: /* 61907C 8021898C 44800000 */ mtc1 $zero, $f0 -/* 619080 80218990 00000000 */ nop +/* 619080 80218990 00000000 */ nop /* 619084 80218994 4614003C */ c.lt.s $f0, $f20 -/* 619088 80218998 00000000 */ nop +/* 619088 80218998 00000000 */ nop /* 61908C 8021899C 4500001B */ bc1f .L80218A0C /* 619090 802189A0 46001106 */ mov.s $f4, $f2 /* 619094 802189A4 92020191 */ lbu $v0, 0x191($s0) /* 619098 802189A8 44820000 */ mtc1 $v0, $f0 -/* 61909C 802189AC 00000000 */ nop +/* 61909C 802189AC 00000000 */ nop /* 6190A0 802189B0 46800020 */ cvt.s.w $f0, $f0 /* 6190A4 802189B4 4600A03C */ c.lt.s $f20, $f0 -/* 6190A8 802189B8 00000000 */ nop +/* 6190A8 802189B8 00000000 */ nop /* 6190AC 802189BC 45000014 */ bc1f .L80218A10 /* 6190B0 802189C0 0000982D */ daddu $s3, $zero, $zero /* 6190B4 802189C4 92020190 */ lbu $v0, 0x190($s0) /* 6190B8 802189C8 3C013F00 */ lui $at, 0x3f00 /* 6190BC 802189CC 44811000 */ mtc1 $at, $f2 /* 6190C0 802189D0 44820000 */ mtc1 $v0, $f0 -/* 6190C4 802189D4 00000000 */ nop +/* 6190C4 802189D4 00000000 */ nop /* 6190C8 802189D8 46800020 */ cvt.s.w $f0, $f0 /* 6190CC 802189DC 46020002 */ mul.s $f0, $f0, $f2 -/* 6190D0 802189E0 00000000 */ nop +/* 6190D0 802189E0 00000000 */ nop /* 6190D4 802189E4 4600203C */ c.lt.s $f4, $f0 -/* 6190D8 802189E8 00000000 */ nop +/* 6190D8 802189E8 00000000 */ nop /* 6190DC 802189EC 45000008 */ bc1f .L80218A10 /* 6190E0 802189F0 24020001 */ addiu $v0, $zero, 1 /* 6190E4 802189F4 08086303 */ j .L80218C0C @@ -179,16 +179,16 @@ glabel func_802187B0_618EA0 /* 619138 80218A48 C6200098 */ lwc1 $f0, 0x98($s1) /* 61913C 80218A4C 46001081 */ sub.s $f2, $f2, $f0 /* 619140 80218A50 46021182 */ mul.s $f6, $f2, $f2 -/* 619144 80218A54 00000000 */ nop +/* 619144 80218A54 00000000 */ nop /* 619148 80218A58 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 61914C 80218A5C C602014C */ lwc1 $f2, 0x14c($s0) /* 619150 80218A60 46001081 */ sub.s $f2, $f2, $f0 /* 619154 80218A64 46021102 */ mul.s $f4, $f2, $f2 -/* 619158 80218A68 00000000 */ nop +/* 619158 80218A68 00000000 */ nop /* 61915C 80218A6C 92020191 */ lbu $v0, 0x191($s0) /* 619160 80218A70 C6020148 */ lwc1 $f2, 0x148($s0) /* 619164 80218A74 44820000 */ mtc1 $v0, $f0 -/* 619168 80218A78 00000000 */ nop +/* 619168 80218A78 00000000 */ nop /* 61916C 80218A7C 46800020 */ cvt.s.w $f0, $f0 /* 619170 80218A80 46001080 */ add.s $f2, $f2, $f0 /* 619174 80218A84 461A1081 */ sub.s $f2, $f2, $f26 @@ -197,32 +197,32 @@ glabel func_802187B0_618EA0 /* 619180 80218A90 46001501 */ sub.s $f20, $f2, $f0 /* 619184 80218A94 46006004 */ sqrt.s $f0, $f12 /* 619188 80218A98 46000032 */ c.eq.s $f0, $f0 -/* 61918C 80218A9C 00000000 */ nop +/* 61918C 80218A9C 00000000 */ nop /* 619190 80218AA0 45010003 */ bc1t .L80218AB0 -/* 619194 80218AA4 00000000 */ nop +/* 619194 80218AA4 00000000 */ nop /* 619198 80218AA8 0C0187BC */ jal sqrtf -/* 61919C 80218AAC 00000000 */ nop +/* 61919C 80218AAC 00000000 */ nop .L80218AB0: /* 6191A0 80218AB0 4614C03C */ c.lt.s $f24, $f20 -/* 6191A4 80218AB4 00000000 */ nop +/* 6191A4 80218AB4 00000000 */ nop /* 6191A8 80218AB8 45000013 */ bc1f .L80218B08 /* 6191AC 80218ABC 46000106 */ mov.s $f4, $f0 /* 6191B0 80218AC0 92020191 */ lbu $v0, 0x191($s0) /* 6191B4 80218AC4 44820000 */ mtc1 $v0, $f0 -/* 6191B8 80218AC8 00000000 */ nop +/* 6191B8 80218AC8 00000000 */ nop /* 6191BC 80218ACC 46800020 */ cvt.s.w $f0, $f0 /* 6191C0 80218AD0 4600A03C */ c.lt.s $f20, $f0 -/* 6191C4 80218AD4 00000000 */ nop +/* 6191C4 80218AD4 00000000 */ nop /* 6191C8 80218AD8 4500000B */ bc1f .L80218B08 -/* 6191CC 80218ADC 00000000 */ nop +/* 6191CC 80218ADC 00000000 */ nop /* 6191D0 80218AE0 92020190 */ lbu $v0, 0x190($s0) /* 6191D4 80218AE4 44820000 */ mtc1 $v0, $f0 -/* 6191D8 80218AE8 00000000 */ nop +/* 6191D8 80218AE8 00000000 */ nop /* 6191DC 80218AEC 46800020 */ cvt.s.w $f0, $f0 /* 6191E0 80218AF0 46160002 */ mul.s $f0, $f0, $f22 -/* 6191E4 80218AF4 00000000 */ nop +/* 6191E4 80218AF4 00000000 */ nop /* 6191E8 80218AF8 4600203C */ c.lt.s $f4, $f0 -/* 6191EC 80218AFC 00000000 */ nop +/* 6191EC 80218AFC 00000000 */ nop /* 6191F0 80218B00 4501FFBE */ bc1t .L802189FC /* 6191F4 80218B04 24020001 */ addiu $v0, $zero, 1 .L80218B08: @@ -235,21 +235,21 @@ glabel func_802187B0_618EA0 /* 61920C 80218B1C 14400034 */ bnez $v0, .L80218BF0 /* 619210 80218B20 00751024 */ and $v0, $v1, $s5 /* 619214 80218B24 10400032 */ beqz $v0, .L80218BF0 -/* 619218 80218B28 00000000 */ nop +/* 619218 80218B28 00000000 */ nop /* 61921C 80218B2C C6020058 */ lwc1 $f2, 0x58($s0) /* 619220 80218B30 C6200098 */ lwc1 $f0, 0x98($s1) /* 619224 80218B34 46001081 */ sub.s $f2, $f2, $f0 /* 619228 80218B38 46021182 */ mul.s $f6, $f2, $f2 -/* 61922C 80218B3C 00000000 */ nop +/* 61922C 80218B3C 00000000 */ nop /* 619230 80218B40 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 619234 80218B44 C6020060 */ lwc1 $f2, 0x60($s0) /* 619238 80218B48 46001081 */ sub.s $f2, $f2, $f0 /* 61923C 80218B4C 46021102 */ mul.s $f4, $f2, $f2 -/* 619240 80218B50 00000000 */ nop +/* 619240 80218B50 00000000 */ nop /* 619244 80218B54 92020073 */ lbu $v0, 0x73($s0) /* 619248 80218B58 C600005C */ lwc1 $f0, 0x5c($s0) /* 61924C 80218B5C 44821000 */ mtc1 $v0, $f2 -/* 619250 80218B60 00000000 */ nop +/* 619250 80218B60 00000000 */ nop /* 619254 80218B64 468010A0 */ cvt.s.w $f2, $f2 /* 619258 80218B68 46020000 */ add.s $f0, $f0, $f2 /* 61925C 80218B6C 461A0001 */ sub.s $f0, $f0, $f26 @@ -258,38 +258,38 @@ glabel func_802187B0_618EA0 /* 619268 80218B78 46020501 */ sub.s $f20, $f0, $f2 /* 61926C 80218B7C 46006004 */ sqrt.s $f0, $f12 /* 619270 80218B80 46000032 */ c.eq.s $f0, $f0 -/* 619274 80218B84 00000000 */ nop +/* 619274 80218B84 00000000 */ nop /* 619278 80218B88 45010003 */ bc1t .L80218B98 -/* 61927C 80218B8C 00000000 */ nop +/* 61927C 80218B8C 00000000 */ nop /* 619280 80218B90 0C0187BC */ jal sqrtf -/* 619284 80218B94 00000000 */ nop +/* 619284 80218B94 00000000 */ nop .L80218B98: /* 619288 80218B98 4614C03C */ c.lt.s $f24, $f20 -/* 61928C 80218B9C 00000000 */ nop +/* 61928C 80218B9C 00000000 */ nop /* 619290 80218BA0 45000013 */ bc1f .L80218BF0 /* 619294 80218BA4 46000106 */ mov.s $f4, $f0 /* 619298 80218BA8 92020073 */ lbu $v0, 0x73($s0) /* 61929C 80218BAC 44820000 */ mtc1 $v0, $f0 -/* 6192A0 80218BB0 00000000 */ nop +/* 6192A0 80218BB0 00000000 */ nop /* 6192A4 80218BB4 46800020 */ cvt.s.w $f0, $f0 /* 6192A8 80218BB8 4600A03C */ c.lt.s $f20, $f0 -/* 6192AC 80218BBC 00000000 */ nop +/* 6192AC 80218BBC 00000000 */ nop /* 6192B0 80218BC0 4500000B */ bc1f .L80218BF0 -/* 6192B4 80218BC4 00000000 */ nop +/* 6192B4 80218BC4 00000000 */ nop /* 6192B8 80218BC8 92020072 */ lbu $v0, 0x72($s0) /* 6192BC 80218BCC 44820000 */ mtc1 $v0, $f0 -/* 6192C0 80218BD0 00000000 */ nop +/* 6192C0 80218BD0 00000000 */ nop /* 6192C4 80218BD4 46800020 */ cvt.s.w $f0, $f0 /* 6192C8 80218BD8 46160002 */ mul.s $f0, $f0, $f22 -/* 6192CC 80218BDC 00000000 */ nop +/* 6192CC 80218BDC 00000000 */ nop /* 6192D0 80218BE0 4600203C */ c.lt.s $f4, $f0 -/* 6192D4 80218BE4 00000000 */ nop +/* 6192D4 80218BE4 00000000 */ nop /* 6192D8 80218BE8 4501FF86 */ bc1t .L80218A04 /* 6192DC 80218BEC 24020001 */ addiu $v0, $zero, 1 .L80218BF0: /* 6192E0 80218BF0 8E10000C */ lw $s0, 0xc($s0) /* 6192E4 80218BF4 1600FFC7 */ bnez $s0, .L80218B14 -/* 6192E8 80218BF8 00000000 */ nop +/* 6192E8 80218BF8 00000000 */ nop /* 6192EC 80218BFC 26730001 */ addiu $s3, $s3, 1 .L80218C00: /* 6192F0 80218C00 2A620018 */ slti $v0, $s3, 0x18 @@ -310,6 +310,6 @@ glabel func_802187B0_618EA0 /* 619328 80218C38 D7B40030 */ ldc1 $f20, 0x30($sp) /* 61932C 80218C3C 03E00008 */ jr $ra /* 619330 80218C40 27BD0050 */ addiu $sp, $sp, 0x50 -/* 619334 80218C44 00000000 */ nop -/* 619338 80218C48 00000000 */ nop -/* 61933C 80218C4C 00000000 */ nop +/* 619334 80218C44 00000000 */ nop +/* 619338 80218C48 00000000 */ nop +/* 61933C 80218C4C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_tik3/619340/func_80218C50_619340.s b/asm/nonmatchings/battle/area_tik3/619340/func_80218C50_619340.s index 991fc3a3f6..06e6b20afb 100644 --- a/asm/nonmatchings/battle/area_tik3/619340/func_80218C50_619340.s +++ b/asm/nonmatchings/battle/area_tik3/619340/func_80218C50_619340.s @@ -32,58 +32,58 @@ glabel func_80218C50_619340 /* 6193AC 80218CBC C6200098 */ lwc1 $f0, 0x98($s1) /* 6193B0 80218CC0 46001081 */ sub.s $f2, $f2, $f0 /* 6193B4 80218CC4 46021182 */ mul.s $f6, $f2, $f2 -/* 6193B8 80218CC8 00000000 */ nop +/* 6193B8 80218CC8 00000000 */ nop /* 6193BC 80218CCC C62000A0 */ lwc1 $f0, 0xa0($s1) /* 6193C0 80218CD0 C602014C */ lwc1 $f2, 0x14c($s0) /* 6193C4 80218CD4 46001081 */ sub.s $f2, $f2, $f0 /* 6193C8 80218CD8 46021102 */ mul.s $f4, $f2, $f2 -/* 6193CC 80218CDC 00000000 */ nop +/* 6193CC 80218CDC 00000000 */ nop /* 6193D0 80218CE0 92020191 */ lbu $v0, 0x191($s0) /* 6193D4 80218CE4 C6020148 */ lwc1 $f2, 0x148($s0) /* 6193D8 80218CE8 44820000 */ mtc1 $v0, $f0 -/* 6193DC 80218CEC 00000000 */ nop +/* 6193DC 80218CEC 00000000 */ nop /* 6193E0 80218CF0 46800020 */ cvt.s.w $f0, $f0 /* 6193E4 80218CF4 46001080 */ add.s $f2, $f2, $f0 /* 6193E8 80218CF8 3C013FC0 */ lui $at, 0x3fc0 /* 6193EC 80218CFC 44810000 */ mtc1 $at, $f0 -/* 6193F0 80218D00 00000000 */ nop +/* 6193F0 80218D00 00000000 */ nop /* 6193F4 80218D04 46001081 */ sub.s $f2, $f2, $f0 /* 6193F8 80218D08 46043300 */ add.s $f12, $f6, $f4 /* 6193FC 80218D0C C620009C */ lwc1 $f0, 0x9c($s1) /* 619400 80218D10 46001501 */ sub.s $f20, $f2, $f0 /* 619404 80218D14 46006084 */ sqrt.s $f2, $f12 /* 619408 80218D18 46021032 */ c.eq.s $f2, $f2 -/* 61940C 80218D1C 00000000 */ nop +/* 61940C 80218D1C 00000000 */ nop /* 619410 80218D20 45010004 */ bc1t .L80218D34 -/* 619414 80218D24 00000000 */ nop +/* 619414 80218D24 00000000 */ nop /* 619418 80218D28 0C0187BC */ jal sqrtf -/* 61941C 80218D2C 00000000 */ nop +/* 61941C 80218D2C 00000000 */ nop /* 619420 80218D30 46000086 */ mov.s $f2, $f0 .L80218D34: /* 619424 80218D34 44800000 */ mtc1 $zero, $f0 -/* 619428 80218D38 00000000 */ nop +/* 619428 80218D38 00000000 */ nop /* 61942C 80218D3C 4614003C */ c.lt.s $f0, $f20 -/* 619430 80218D40 00000000 */ nop +/* 619430 80218D40 00000000 */ nop /* 619434 80218D44 45000017 */ bc1f .L80218DA4 /* 619438 80218D48 46001106 */ mov.s $f4, $f2 /* 61943C 80218D4C 92020191 */ lbu $v0, 0x191($s0) /* 619440 80218D50 44820000 */ mtc1 $v0, $f0 -/* 619444 80218D54 00000000 */ nop +/* 619444 80218D54 00000000 */ nop /* 619448 80218D58 46800020 */ cvt.s.w $f0, $f0 /* 61944C 80218D5C 4600A03C */ c.lt.s $f20, $f0 -/* 619450 80218D60 00000000 */ nop +/* 619450 80218D60 00000000 */ nop /* 619454 80218D64 4500000F */ bc1f .L80218DA4 -/* 619458 80218D68 00000000 */ nop +/* 619458 80218D68 00000000 */ nop /* 61945C 80218D6C 92020190 */ lbu $v0, 0x190($s0) /* 619460 80218D70 3C013F00 */ lui $at, 0x3f00 /* 619464 80218D74 44811000 */ mtc1 $at, $f2 /* 619468 80218D78 44820000 */ mtc1 $v0, $f0 -/* 61946C 80218D7C 00000000 */ nop +/* 61946C 80218D7C 00000000 */ nop /* 619470 80218D80 46800020 */ cvt.s.w $f0, $f0 /* 619474 80218D84 46020002 */ mul.s $f0, $f0, $f2 -/* 619478 80218D88 00000000 */ nop +/* 619478 80218D88 00000000 */ nop /* 61947C 80218D8C 4600203C */ c.lt.s $f4, $f0 -/* 619480 80218D90 00000000 */ nop +/* 619480 80218D90 00000000 */ nop /* 619484 80218D94 45000003 */ bc1f .L80218DA4 /* 619488 80218D98 24020001 */ addiu $v0, $zero, 1 /* 61948C 80218D9C 0808642B */ j .L802190AC @@ -96,58 +96,58 @@ glabel func_80218C50_619340 /* 6194A4 80218DB4 C6200098 */ lwc1 $f0, 0x98($s1) /* 6194A8 80218DB8 46001081 */ sub.s $f2, $f2, $f0 /* 6194AC 80218DBC 46021182 */ mul.s $f6, $f2, $f2 -/* 6194B0 80218DC0 00000000 */ nop +/* 6194B0 80218DC0 00000000 */ nop /* 6194B4 80218DC4 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 6194B8 80218DC8 C602014C */ lwc1 $f2, 0x14c($s0) /* 6194BC 80218DCC 46001081 */ sub.s $f2, $f2, $f0 /* 6194C0 80218DD0 46021102 */ mul.s $f4, $f2, $f2 -/* 6194C4 80218DD4 00000000 */ nop +/* 6194C4 80218DD4 00000000 */ nop /* 6194C8 80218DD8 92020191 */ lbu $v0, 0x191($s0) /* 6194CC 80218DDC C6020148 */ lwc1 $f2, 0x148($s0) /* 6194D0 80218DE0 44820000 */ mtc1 $v0, $f0 -/* 6194D4 80218DE4 00000000 */ nop +/* 6194D4 80218DE4 00000000 */ nop /* 6194D8 80218DE8 46800020 */ cvt.s.w $f0, $f0 /* 6194DC 80218DEC 46001080 */ add.s $f2, $f2, $f0 /* 6194E0 80218DF0 3C013FC0 */ lui $at, 0x3fc0 /* 6194E4 80218DF4 44810000 */ mtc1 $at, $f0 -/* 6194E8 80218DF8 00000000 */ nop +/* 6194E8 80218DF8 00000000 */ nop /* 6194EC 80218DFC 46001081 */ sub.s $f2, $f2, $f0 /* 6194F0 80218E00 46043300 */ add.s $f12, $f6, $f4 /* 6194F4 80218E04 C620009C */ lwc1 $f0, 0x9c($s1) /* 6194F8 80218E08 46001501 */ sub.s $f20, $f2, $f0 /* 6194FC 80218E0C 46006084 */ sqrt.s $f2, $f12 /* 619500 80218E10 46021032 */ c.eq.s $f2, $f2 -/* 619504 80218E14 00000000 */ nop +/* 619504 80218E14 00000000 */ nop /* 619508 80218E18 45010004 */ bc1t .L80218E2C -/* 61950C 80218E1C 00000000 */ nop +/* 61950C 80218E1C 00000000 */ nop /* 619510 80218E20 0C0187BC */ jal sqrtf -/* 619514 80218E24 00000000 */ nop +/* 619514 80218E24 00000000 */ nop /* 619518 80218E28 46000086 */ mov.s $f2, $f0 .L80218E2C: /* 61951C 80218E2C 44800000 */ mtc1 $zero, $f0 -/* 619520 80218E30 00000000 */ nop +/* 619520 80218E30 00000000 */ nop /* 619524 80218E34 4614003C */ c.lt.s $f0, $f20 -/* 619528 80218E38 00000000 */ nop +/* 619528 80218E38 00000000 */ nop /* 61952C 80218E3C 4500001B */ bc1f .L80218EAC /* 619530 80218E40 46001106 */ mov.s $f4, $f2 /* 619534 80218E44 92020191 */ lbu $v0, 0x191($s0) /* 619538 80218E48 44820000 */ mtc1 $v0, $f0 -/* 61953C 80218E4C 00000000 */ nop +/* 61953C 80218E4C 00000000 */ nop /* 619540 80218E50 46800020 */ cvt.s.w $f0, $f0 /* 619544 80218E54 4600A03C */ c.lt.s $f20, $f0 -/* 619548 80218E58 00000000 */ nop +/* 619548 80218E58 00000000 */ nop /* 61954C 80218E5C 45000014 */ bc1f .L80218EB0 /* 619550 80218E60 0000982D */ daddu $s3, $zero, $zero /* 619554 80218E64 92020190 */ lbu $v0, 0x190($s0) /* 619558 80218E68 3C013F00 */ lui $at, 0x3f00 /* 61955C 80218E6C 44811000 */ mtc1 $at, $f2 /* 619560 80218E70 44820000 */ mtc1 $v0, $f0 -/* 619564 80218E74 00000000 */ nop +/* 619564 80218E74 00000000 */ nop /* 619568 80218E78 46800020 */ cvt.s.w $f0, $f0 /* 61956C 80218E7C 46020002 */ mul.s $f0, $f0, $f2 -/* 619570 80218E80 00000000 */ nop +/* 619570 80218E80 00000000 */ nop /* 619574 80218E84 4600203C */ c.lt.s $f4, $f0 -/* 619578 80218E88 00000000 */ nop +/* 619578 80218E88 00000000 */ nop /* 61957C 80218E8C 45000008 */ bc1f .L80218EB0 /* 619580 80218E90 24020001 */ addiu $v0, $zero, 1 /* 619584 80218E94 0808642B */ j .L802190AC @@ -179,16 +179,16 @@ glabel func_80218C50_619340 /* 6195D8 80218EE8 C6200098 */ lwc1 $f0, 0x98($s1) /* 6195DC 80218EEC 46001081 */ sub.s $f2, $f2, $f0 /* 6195E0 80218EF0 46021182 */ mul.s $f6, $f2, $f2 -/* 6195E4 80218EF4 00000000 */ nop +/* 6195E4 80218EF4 00000000 */ nop /* 6195E8 80218EF8 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 6195EC 80218EFC C602014C */ lwc1 $f2, 0x14c($s0) /* 6195F0 80218F00 46001081 */ sub.s $f2, $f2, $f0 /* 6195F4 80218F04 46021102 */ mul.s $f4, $f2, $f2 -/* 6195F8 80218F08 00000000 */ nop +/* 6195F8 80218F08 00000000 */ nop /* 6195FC 80218F0C 92020191 */ lbu $v0, 0x191($s0) /* 619600 80218F10 C6020148 */ lwc1 $f2, 0x148($s0) /* 619604 80218F14 44820000 */ mtc1 $v0, $f0 -/* 619608 80218F18 00000000 */ nop +/* 619608 80218F18 00000000 */ nop /* 61960C 80218F1C 46800020 */ cvt.s.w $f0, $f0 /* 619610 80218F20 46001080 */ add.s $f2, $f2, $f0 /* 619614 80218F24 461A1081 */ sub.s $f2, $f2, $f26 @@ -197,32 +197,32 @@ glabel func_80218C50_619340 /* 619620 80218F30 46001501 */ sub.s $f20, $f2, $f0 /* 619624 80218F34 46006004 */ sqrt.s $f0, $f12 /* 619628 80218F38 46000032 */ c.eq.s $f0, $f0 -/* 61962C 80218F3C 00000000 */ nop +/* 61962C 80218F3C 00000000 */ nop /* 619630 80218F40 45010003 */ bc1t .L80218F50 -/* 619634 80218F44 00000000 */ nop +/* 619634 80218F44 00000000 */ nop /* 619638 80218F48 0C0187BC */ jal sqrtf -/* 61963C 80218F4C 00000000 */ nop +/* 61963C 80218F4C 00000000 */ nop .L80218F50: /* 619640 80218F50 4614C03C */ c.lt.s $f24, $f20 -/* 619644 80218F54 00000000 */ nop +/* 619644 80218F54 00000000 */ nop /* 619648 80218F58 45000013 */ bc1f .L80218FA8 /* 61964C 80218F5C 46000106 */ mov.s $f4, $f0 /* 619650 80218F60 92020191 */ lbu $v0, 0x191($s0) /* 619654 80218F64 44820000 */ mtc1 $v0, $f0 -/* 619658 80218F68 00000000 */ nop +/* 619658 80218F68 00000000 */ nop /* 61965C 80218F6C 46800020 */ cvt.s.w $f0, $f0 /* 619660 80218F70 4600A03C */ c.lt.s $f20, $f0 -/* 619664 80218F74 00000000 */ nop +/* 619664 80218F74 00000000 */ nop /* 619668 80218F78 4500000B */ bc1f .L80218FA8 -/* 61966C 80218F7C 00000000 */ nop +/* 61966C 80218F7C 00000000 */ nop /* 619670 80218F80 92020190 */ lbu $v0, 0x190($s0) /* 619674 80218F84 44820000 */ mtc1 $v0, $f0 -/* 619678 80218F88 00000000 */ nop +/* 619678 80218F88 00000000 */ nop /* 61967C 80218F8C 46800020 */ cvt.s.w $f0, $f0 /* 619680 80218F90 46160002 */ mul.s $f0, $f0, $f22 -/* 619684 80218F94 00000000 */ nop +/* 619684 80218F94 00000000 */ nop /* 619688 80218F98 4600203C */ c.lt.s $f4, $f0 -/* 61968C 80218F9C 00000000 */ nop +/* 61968C 80218F9C 00000000 */ nop /* 619690 80218FA0 4501FFBE */ bc1t .L80218E9C /* 619694 80218FA4 24020001 */ addiu $v0, $zero, 1 .L80218FA8: @@ -235,21 +235,21 @@ glabel func_80218C50_619340 /* 6196AC 80218FBC 14400034 */ bnez $v0, .L80219090 /* 6196B0 80218FC0 00751024 */ and $v0, $v1, $s5 /* 6196B4 80218FC4 10400032 */ beqz $v0, .L80219090 -/* 6196B8 80218FC8 00000000 */ nop +/* 6196B8 80218FC8 00000000 */ nop /* 6196BC 80218FCC C6020058 */ lwc1 $f2, 0x58($s0) /* 6196C0 80218FD0 C6200098 */ lwc1 $f0, 0x98($s1) /* 6196C4 80218FD4 46001081 */ sub.s $f2, $f2, $f0 /* 6196C8 80218FD8 46021182 */ mul.s $f6, $f2, $f2 -/* 6196CC 80218FDC 00000000 */ nop +/* 6196CC 80218FDC 00000000 */ nop /* 6196D0 80218FE0 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 6196D4 80218FE4 C6020060 */ lwc1 $f2, 0x60($s0) /* 6196D8 80218FE8 46001081 */ sub.s $f2, $f2, $f0 /* 6196DC 80218FEC 46021102 */ mul.s $f4, $f2, $f2 -/* 6196E0 80218FF0 00000000 */ nop +/* 6196E0 80218FF0 00000000 */ nop /* 6196E4 80218FF4 92020073 */ lbu $v0, 0x73($s0) /* 6196E8 80218FF8 C600005C */ lwc1 $f0, 0x5c($s0) /* 6196EC 80218FFC 44821000 */ mtc1 $v0, $f2 -/* 6196F0 80219000 00000000 */ nop +/* 6196F0 80219000 00000000 */ nop /* 6196F4 80219004 468010A0 */ cvt.s.w $f2, $f2 /* 6196F8 80219008 46020000 */ add.s $f0, $f0, $f2 /* 6196FC 8021900C 461A0001 */ sub.s $f0, $f0, $f26 @@ -258,38 +258,38 @@ glabel func_80218C50_619340 /* 619708 80219018 46020501 */ sub.s $f20, $f0, $f2 /* 61970C 8021901C 46006004 */ sqrt.s $f0, $f12 /* 619710 80219020 46000032 */ c.eq.s $f0, $f0 -/* 619714 80219024 00000000 */ nop +/* 619714 80219024 00000000 */ nop /* 619718 80219028 45010003 */ bc1t .L80219038 -/* 61971C 8021902C 00000000 */ nop +/* 61971C 8021902C 00000000 */ nop /* 619720 80219030 0C0187BC */ jal sqrtf -/* 619724 80219034 00000000 */ nop +/* 619724 80219034 00000000 */ nop .L80219038: /* 619728 80219038 4614C03C */ c.lt.s $f24, $f20 -/* 61972C 8021903C 00000000 */ nop +/* 61972C 8021903C 00000000 */ nop /* 619730 80219040 45000013 */ bc1f .L80219090 /* 619734 80219044 46000106 */ mov.s $f4, $f0 /* 619738 80219048 92020073 */ lbu $v0, 0x73($s0) /* 61973C 8021904C 44820000 */ mtc1 $v0, $f0 -/* 619740 80219050 00000000 */ nop +/* 619740 80219050 00000000 */ nop /* 619744 80219054 46800020 */ cvt.s.w $f0, $f0 /* 619748 80219058 4600A03C */ c.lt.s $f20, $f0 -/* 61974C 8021905C 00000000 */ nop +/* 61974C 8021905C 00000000 */ nop /* 619750 80219060 4500000B */ bc1f .L80219090 -/* 619754 80219064 00000000 */ nop +/* 619754 80219064 00000000 */ nop /* 619758 80219068 92020072 */ lbu $v0, 0x72($s0) /* 61975C 8021906C 44820000 */ mtc1 $v0, $f0 -/* 619760 80219070 00000000 */ nop +/* 619760 80219070 00000000 */ nop /* 619764 80219074 46800020 */ cvt.s.w $f0, $f0 /* 619768 80219078 46160002 */ mul.s $f0, $f0, $f22 -/* 61976C 8021907C 00000000 */ nop +/* 61976C 8021907C 00000000 */ nop /* 619770 80219080 4600203C */ c.lt.s $f4, $f0 -/* 619774 80219084 00000000 */ nop +/* 619774 80219084 00000000 */ nop /* 619778 80219088 4501FF86 */ bc1t .L80218EA4 /* 61977C 8021908C 24020001 */ addiu $v0, $zero, 1 .L80219090: /* 619780 80219090 8E10000C */ lw $s0, 0xc($s0) /* 619784 80219094 1600FFC7 */ bnez $s0, .L80218FB4 -/* 619788 80219098 00000000 */ nop +/* 619788 80219098 00000000 */ nop /* 61978C 8021909C 26730001 */ addiu $s3, $s3, 1 .L802190A0: /* 619790 802190A0 2A620018 */ slti $v0, $s3, 0x18 @@ -310,6 +310,6 @@ glabel func_80218C50_619340 /* 6197C8 802190D8 D7B40030 */ ldc1 $f20, 0x30($sp) /* 6197CC 802190DC 03E00008 */ jr $ra /* 6197D0 802190E0 27BD0050 */ addiu $sp, $sp, 0x50 -/* 6197D4 802190E4 00000000 */ nop -/* 6197D8 802190E8 00000000 */ nop -/* 6197DC 802190EC 00000000 */ nop +/* 6197D4 802190E4 00000000 */ nop +/* 6197D8 802190E8 00000000 */ nop +/* 6197DC 802190EC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_tik3/6197E0/func_802190F0_6197E0.s b/asm/nonmatchings/battle/area_tik3/6197E0/func_802190F0_6197E0.s index da3de422ab..9bdcb206f1 100644 --- a/asm/nonmatchings/battle/area_tik3/6197E0/func_802190F0_6197E0.s +++ b/asm/nonmatchings/battle/area_tik3/6197E0/func_802190F0_6197E0.s @@ -26,14 +26,14 @@ glabel func_802190F0_6197E0 /* 619834 80219144 12200009 */ beqz $s1, .L8021916C /* 619838 80219148 2402008E */ addiu $v0, $zero, 0x8e /* 61983C 8021914C 0808653C */ j .L802194F0 -/* 619840 80219150 00000000 */ nop +/* 619840 80219150 00000000 */ nop .L80219154: /* 619844 80219154 12220085 */ beq $s1, $v0, .L8021936C /* 619848 80219158 24020003 */ addiu $v0, $zero, 3 /* 61984C 8021915C 12220013 */ beq $s1, $v0, .L802191AC /* 619850 80219160 2403005B */ addiu $v1, $zero, 0x5b /* 619854 80219164 0808653C */ j .L802194F0 -/* 619858 80219168 00000000 */ nop +/* 619858 80219168 00000000 */ nop .L8021916C: /* 61985C 8021916C 3C01430E */ lui $at, 0x430e /* 619860 80219170 44812000 */ mtc1 $at, $f4 @@ -77,7 +77,7 @@ glabel func_802190F0_6197E0 /* 6198EC 802191FC AE0200A8 */ sw $v0, 0xa8($s0) /* 6198F0 80219200 2842002E */ slti $v0, $v0, 0x2e /* 6198F4 80219204 14400003 */ bnez $v0, .L80219214 -/* 6198F8 80219208 00000000 */ nop +/* 6198F8 80219208 00000000 */ nop /* 6198FC 8021920C 2402002D */ addiu $v0, $zero, 0x2d /* 619900 80219210 AE0200A8 */ sw $v0, 0xa8($s0) .L80219214: @@ -95,7 +95,7 @@ glabel func_802190F0_6197E0 /* 619930 80219240 C61E0098 */ lwc1 $f30, 0x98($s0) /* 619934 80219244 4680F7A0 */ cvt.s.w $f30, $f30 /* 619938 80219248 461A6302 */ mul.s $f12, $f12, $f26 -/* 61993C 8021924C 00000000 */ nop +/* 61993C 8021924C 00000000 */ nop /* 619940 80219250 C61C009C */ lwc1 $f28, 0x9c($s0) /* 619944 80219254 4680E720 */ cvt.s.w $f28, $f28 /* 619948 80219258 3C0143B4 */ lui $at, 0x43b4 @@ -113,22 +113,22 @@ glabel func_802190F0_6197E0 /* 619978 80219288 4620B001 */ sub.d $f0, $f22, $f0 /* 61997C 8021928C 46002521 */ cvt.d.s $f20, $f4 /* 619980 80219290 4620A502 */ mul.d $f20, $f20, $f0 -/* 619984 80219294 00000000 */ nop +/* 619984 80219294 00000000 */ nop /* 619988 80219298 C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 61998C 8021929C 46806320 */ cvt.s.w $f12, $f12 /* 619990 802192A0 461A6302 */ mul.s $f12, $f12, $f26 -/* 619994 802192A4 00000000 */ nop +/* 619994 802192A4 00000000 */ nop /* 619998 802192A8 0C00A85B */ jal sin_rad /* 61999C 802192AC 46186303 */ div.s $f12, $f12, $f24 /* 6199A0 802192B0 4600E002 */ mul.s $f0, $f28, $f0 -/* 6199A4 802192B4 00000000 */ nop +/* 6199A4 802192B4 00000000 */ nop /* 6199A8 802192B8 8E0200A8 */ lw $v0, 0xa8($s0) /* 6199AC 802192BC 00021040 */ sll $v0, $v0, 1 /* 6199B0 802192C0 44826000 */ mtc1 $v0, $f12 -/* 6199B4 802192C4 00000000 */ nop +/* 6199B4 802192C4 00000000 */ nop /* 6199B8 802192C8 46806320 */ cvt.s.w $f12, $f12 /* 6199BC 802192CC 461A6302 */ mul.s $f12, $f12, $f26 -/* 6199C0 802192D0 00000000 */ nop +/* 6199C0 802192D0 00000000 */ nop /* 6199C4 802192D4 46000021 */ cvt.d.s $f0, $f0 /* 6199C8 802192D8 4620A500 */ add.d $f20, $f20, $f0 /* 6199CC 802192DC 46186303 */ div.s $f12, $f12, $f24 @@ -138,12 +138,12 @@ glabel func_802190F0_6197E0 /* 6199DC 802192EC C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 6199E0 802192F0 46806320 */ cvt.s.w $f12, $f12 /* 6199E4 802192F4 461A6302 */ mul.s $f12, $f12, $f26 -/* 6199E8 802192F8 00000000 */ nop +/* 6199E8 802192F8 00000000 */ nop /* 6199EC 802192FC 3C0142B4 */ lui $at, 0x42b4 /* 6199F0 80219300 44811000 */ mtc1 $at, $f2 -/* 6199F4 80219304 00000000 */ nop +/* 6199F4 80219304 00000000 */ nop /* 6199F8 80219308 46020002 */ mul.s $f0, $f0, $f2 -/* 6199FC 8021930C 00000000 */ nop +/* 6199FC 8021930C 00000000 */ nop /* 619A00 80219310 C7A40014 */ lwc1 $f4, 0x14($sp) /* 619A04 80219314 46002100 */ add.s $f4, $f4, $f0 /* 619A08 80219318 46186303 */ div.s $f12, $f12, $f24 @@ -152,17 +152,17 @@ glabel func_802190F0_6197E0 /* 619A14 80219324 C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 619A18 80219328 46806320 */ cvt.s.w $f12, $f12 /* 619A1C 8021932C 461A6302 */ mul.s $f12, $f12, $f26 -/* 619A20 80219330 00000000 */ nop +/* 619A20 80219330 00000000 */ nop /* 619A24 80219334 46000021 */ cvt.d.s $f0, $f0 /* 619A28 80219338 4620B581 */ sub.d $f22, $f22, $f0 /* 619A2C 8021933C 4600F521 */ cvt.d.s $f20, $f30 /* 619A30 80219340 4636A502 */ mul.d $f20, $f20, $f22 -/* 619A34 80219344 00000000 */ nop +/* 619A34 80219344 00000000 */ nop /* 619A38 80219348 0C00A85B */ jal sin_rad /* 619A3C 8021934C 46186303 */ div.s $f12, $f12, $f24 /* 619A40 80219350 C7A40018 */ lwc1 $f4, 0x18($sp) /* 619A44 80219354 46002002 */ mul.s $f0, $f4, $f0 -/* 619A48 80219358 00000000 */ nop +/* 619A48 80219358 00000000 */ nop /* 619A4C 8021935C 46000021 */ cvt.d.s $f0, $f0 /* 619A50 80219360 4620A500 */ add.d $f20, $f20, $f0 /* 619A54 80219364 08086538 */ j .L802194E0 @@ -191,7 +191,7 @@ glabel func_802190F0_6197E0 /* 619AA8 802193B8 C61E0098 */ lwc1 $f30, 0x98($s0) /* 619AAC 802193BC 4680F7A0 */ cvt.s.w $f30, $f30 /* 619AB0 802193C0 461A6302 */ mul.s $f12, $f12, $f26 -/* 619AB4 802193C4 00000000 */ nop +/* 619AB4 802193C4 00000000 */ nop /* 619AB8 802193C8 C61C009C */ lwc1 $f28, 0x9c($s0) /* 619ABC 802193CC 4680E720 */ cvt.s.w $f28, $f28 /* 619AC0 802193D0 3C0143B4 */ lui $at, 0x43b4 @@ -209,22 +209,22 @@ glabel func_802190F0_6197E0 /* 619AF0 80219400 4620B001 */ sub.d $f0, $f22, $f0 /* 619AF4 80219404 46002521 */ cvt.d.s $f20, $f4 /* 619AF8 80219408 4620A502 */ mul.d $f20, $f20, $f0 -/* 619AFC 8021940C 00000000 */ nop +/* 619AFC 8021940C 00000000 */ nop /* 619B00 80219410 C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 619B04 80219414 46806320 */ cvt.s.w $f12, $f12 /* 619B08 80219418 461A6302 */ mul.s $f12, $f12, $f26 -/* 619B0C 8021941C 00000000 */ nop +/* 619B0C 8021941C 00000000 */ nop /* 619B10 80219420 0C00A85B */ jal sin_rad /* 619B14 80219424 46186303 */ div.s $f12, $f12, $f24 /* 619B18 80219428 4600E002 */ mul.s $f0, $f28, $f0 -/* 619B1C 8021942C 00000000 */ nop +/* 619B1C 8021942C 00000000 */ nop /* 619B20 80219430 8E0200A8 */ lw $v0, 0xa8($s0) /* 619B24 80219434 00021040 */ sll $v0, $v0, 1 /* 619B28 80219438 44826000 */ mtc1 $v0, $f12 -/* 619B2C 8021943C 00000000 */ nop +/* 619B2C 8021943C 00000000 */ nop /* 619B30 80219440 46806320 */ cvt.s.w $f12, $f12 /* 619B34 80219444 461A6302 */ mul.s $f12, $f12, $f26 -/* 619B38 80219448 00000000 */ nop +/* 619B38 80219448 00000000 */ nop /* 619B3C 8021944C 46000021 */ cvt.d.s $f0, $f0 /* 619B40 80219450 4620A500 */ add.d $f20, $f20, $f0 /* 619B44 80219454 46186303 */ div.s $f12, $f12, $f24 @@ -234,12 +234,12 @@ glabel func_802190F0_6197E0 /* 619B54 80219464 C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 619B58 80219468 46806320 */ cvt.s.w $f12, $f12 /* 619B5C 8021946C 461A6302 */ mul.s $f12, $f12, $f26 -/* 619B60 80219470 00000000 */ nop +/* 619B60 80219470 00000000 */ nop /* 619B64 80219474 3C0142B4 */ lui $at, 0x42b4 /* 619B68 80219478 44811000 */ mtc1 $at, $f2 -/* 619B6C 8021947C 00000000 */ nop +/* 619B6C 8021947C 00000000 */ nop /* 619B70 80219480 46020002 */ mul.s $f0, $f0, $f2 -/* 619B74 80219484 00000000 */ nop +/* 619B74 80219484 00000000 */ nop /* 619B78 80219488 C7A40014 */ lwc1 $f4, 0x14($sp) /* 619B7C 8021948C 46002100 */ add.s $f4, $f4, $f0 /* 619B80 80219490 46186303 */ div.s $f12, $f12, $f24 @@ -248,17 +248,17 @@ glabel func_802190F0_6197E0 /* 619B8C 8021949C C60C00A8 */ lwc1 $f12, 0xa8($s0) /* 619B90 802194A0 46806320 */ cvt.s.w $f12, $f12 /* 619B94 802194A4 461A6302 */ mul.s $f12, $f12, $f26 -/* 619B98 802194A8 00000000 */ nop +/* 619B98 802194A8 00000000 */ nop /* 619B9C 802194AC 46000021 */ cvt.d.s $f0, $f0 /* 619BA0 802194B0 4620B581 */ sub.d $f22, $f22, $f0 /* 619BA4 802194B4 4600F521 */ cvt.d.s $f20, $f30 /* 619BA8 802194B8 4636A502 */ mul.d $f20, $f20, $f22 -/* 619BAC 802194BC 00000000 */ nop +/* 619BAC 802194BC 00000000 */ nop /* 619BB0 802194C0 0C00A85B */ jal sin_rad /* 619BB4 802194C4 46186303 */ div.s $f12, $f12, $f24 /* 619BB8 802194C8 C7A40018 */ lwc1 $f4, 0x18($sp) /* 619BBC 802194CC 46002002 */ mul.s $f0, $f4, $f0 -/* 619BC0 802194D0 00000000 */ nop +/* 619BC0 802194D0 00000000 */ nop /* 619BC4 802194D4 46000021 */ cvt.d.s $f0, $f0 /* 619BC8 802194D8 4620A500 */ add.d $f20, $f20, $f0 /* 619BCC 802194DC 2402005A */ addiu $v0, $zero, 0x5a diff --git a/asm/nonmatchings/battle/area_trd_part_1/4A12C0/func_80218220_4A12C0.s b/asm/nonmatchings/battle/area_trd_part_1/4A12C0/func_80218220_4A12C0.s index 96ad8dd273..0d4e16a1a0 100644 --- a/asm/nonmatchings/battle/area_trd_part_1/4A12C0/func_80218220_4A12C0.s +++ b/asm/nonmatchings/battle/area_trd_part_1/4A12C0/func_80218220_4A12C0.s @@ -21,7 +21,7 @@ glabel func_80218220_4A12C0 /* 4A1300 80218260 0C0B1EAF */ jal get_variable /* 4A1304 80218264 26100004 */ addiu $s0, $s0, 4 /* 4A1308 80218268 44820000 */ mtc1 $v0, $f0 -/* 4A130C 8021826C 00000000 */ nop +/* 4A130C 8021826C 00000000 */ nop /* 4A1310 80218270 46800021 */ cvt.d.w $f0, $f0 /* 4A1314 80218274 8E110000 */ lw $s1, ($s0) /* 4A1318 80218278 26100004 */ addiu $s0, $s0, 4 @@ -35,7 +35,7 @@ glabel func_80218220_4A12C0 /* 4A1338 80218298 46220003 */ div.d $f0, $f0, $f2 /* 4A133C 8021829C 462007A0 */ cvt.s.d $f30, $f0 /* 4A1340 802182A0 4614F502 */ mul.s $f20, $f30, $f20 -/* 4A1344 802182A4 00000000 */ nop +/* 4A1344 802182A4 00000000 */ nop /* 4A1348 802182A8 26100004 */ addiu $s0, $s0, 4 /* 4A134C 802182AC 8E120000 */ lw $s2, ($s0) /* 4A1350 802182B0 3C0143B4 */ lui $at, 0x43b4 @@ -46,28 +46,28 @@ glabel func_80218220_4A12C0 /* 4A1364 802182C4 4600A306 */ mov.s $f12, $f20 /* 4A1368 802182C8 3C014100 */ lui $at, 0x4100 /* 4A136C 802182CC 44816000 */ mtc1 $at, $f12 -/* 4A1370 802182D0 00000000 */ nop +/* 4A1370 802182D0 00000000 */ nop /* 4A1374 802182D4 460CA302 */ mul.s $f12, $f20, $f12 -/* 4A1378 802182D8 00000000 */ nop +/* 4A1378 802182D8 00000000 */ nop /* 4A137C 802182DC 3C014316 */ lui $at, 0x4316 /* 4A1380 802182E0 4481E000 */ mtc1 $at, $f28 -/* 4A1384 802182E4 00000000 */ nop +/* 4A1384 802182E4 00000000 */ nop /* 4A1388 802182E8 461C0582 */ mul.s $f22, $f0, $f28 -/* 4A138C 802182EC 00000000 */ nop +/* 4A138C 802182EC 00000000 */ nop /* 4A1390 802182F0 4480D000 */ mtc1 $zero, $f26 /* 4A1394 802182F4 0C00A85B */ jal sin_rad /* 4A1398 802182F8 461AB580 */ add.s $f22, $f22, $f26 /* 4A139C 802182FC 3C014120 */ lui $at, 0x4120 /* 4A13A0 80218300 44811000 */ mtc1 $at, $f2 -/* 4A13A4 80218304 00000000 */ nop +/* 4A13A4 80218304 00000000 */ nop /* 4A13A8 80218308 46020602 */ mul.s $f24, $f0, $f2 -/* 4A13AC 8021830C 00000000 */ nop +/* 4A13AC 8021830C 00000000 */ nop /* 4A13B0 80218310 4600A306 */ mov.s $f12, $f20 /* 4A13B4 80218314 0C00A874 */ jal cos_rad /* 4A13B8 80218318 461AC600 */ add.s $f24, $f24, $f26 /* 4A13BC 8021831C 0280202D */ daddu $a0, $s4, $zero /* 4A13C0 80218320 461C0502 */ mul.s $f20, $f0, $f28 -/* 4A13C4 80218324 00000000 */ nop +/* 4A13C4 80218324 00000000 */ nop /* 4A13C8 80218328 0220282D */ daddu $a1, $s1, $zero /* 4A13CC 8021832C 4406B000 */ mfc1 $a2, $f22 /* 4A13D0 80218330 3C0141A0 */ lui $at, 0x41a0 @@ -87,34 +87,34 @@ glabel func_80218220_4A12C0 /* 4A1408 80218368 0240282D */ daddu $a1, $s2, $zero /* 4A140C 8021836C 3C0142B4 */ lui $at, 0x42b4 /* 4A1410 80218370 44810000 */ mtc1 $at, $f0 -/* 4A1414 80218374 00000000 */ nop +/* 4A1414 80218374 00000000 */ nop /* 4A1418 80218378 461E003C */ c.lt.s $f0, $f30 -/* 4A141C 8021837C 00000000 */ nop +/* 4A141C 8021837C 00000000 */ nop /* 4A1420 80218380 4500000B */ bc1f .L802183B0 /* 4A1424 80218384 0000302D */ daddu $a2, $zero, $zero /* 4A1428 80218388 3C014387 */ lui $at, 0x4387 /* 4A142C 8021838C 44810000 */ mtc1 $at, $f0 -/* 4A1430 80218390 00000000 */ nop +/* 4A1430 80218390 00000000 */ nop /* 4A1434 80218394 4600F03C */ c.lt.s $f30, $f0 -/* 4A1438 80218398 00000000 */ nop +/* 4A1438 80218398 00000000 */ nop /* 4A143C 8021839C 45030001 */ bc1tl .L802183A4 /* 4A1440 802183A0 240600B4 */ addiu $a2, $zero, 0xb4 .L802183A4: /* 4A1444 802183A4 3C0142B4 */ lui $at, 0x42b4 /* 4A1448 802183A8 44810000 */ mtc1 $at, $f0 -/* 4A144C 802183AC 00000000 */ nop +/* 4A144C 802183AC 00000000 */ nop .L802183B0: /* 4A1450 802183B0 461E0001 */ sub.s $f0, $f0, $f30 /* 4A1454 802183B4 46000005 */ abs.s $f0, $f0 /* 4A1458 802183B8 4600010D */ trunc.w.s $f4, $f0 /* 4A145C 802183BC 44022000 */ mfc1 $v0, $f4 -/* 4A1460 802183C0 00000000 */ nop +/* 4A1460 802183C0 00000000 */ nop /* 4A1464 802183C4 2842002D */ slti $v0, $v0, 0x2d /* 4A1468 802183C8 10400008 */ beqz $v0, .L802183EC -/* 4A146C 802183CC 00000000 */ nop +/* 4A146C 802183CC 00000000 */ nop /* 4A1470 802183D0 3C014234 */ lui $at, 0x4234 /* 4A1474 802183D4 44810000 */ mtc1 $at, $f0 -/* 4A1478 802183D8 00000000 */ nop +/* 4A1478 802183D8 00000000 */ nop /* 4A147C 802183DC 4600F001 */ sub.s $f0, $f30, $f0 /* 4A1480 802183E0 46000000 */ add.s $f0, $f0, $f0 /* 4A1484 802183E4 4600010D */ trunc.w.s $f4, $f0 @@ -122,23 +122,23 @@ glabel func_80218220_4A12C0 .L802183EC: /* 4A148C 802183EC 3C014387 */ lui $at, 0x4387 /* 4A1490 802183F0 44810000 */ mtc1 $at, $f0 -/* 4A1494 802183F4 00000000 */ nop +/* 4A1494 802183F4 00000000 */ nop /* 4A1498 802183F8 461E0001 */ sub.s $f0, $f0, $f30 /* 4A149C 802183FC 46000005 */ abs.s $f0, $f0 /* 4A14A0 80218400 4600010D */ trunc.w.s $f4, $f0 /* 4A14A4 80218404 44022000 */ mfc1 $v0, $f4 -/* 4A14A8 80218408 00000000 */ nop +/* 4A14A8 80218408 00000000 */ nop /* 4A14AC 8021840C 2842002D */ slti $v0, $v0, 0x2d /* 4A14B0 80218410 1040000C */ beqz $v0, .L80218444 /* 4A14B4 80218414 0280202D */ daddu $a0, $s4, $zero /* 4A14B8 80218418 3C014361 */ lui $at, 0x4361 /* 4A14BC 8021841C 44810000 */ mtc1 $at, $f0 -/* 4A14C0 80218420 00000000 */ nop +/* 4A14C0 80218420 00000000 */ nop /* 4A14C4 80218424 4600F001 */ sub.s $f0, $f30, $f0 /* 4A14C8 80218428 46000000 */ add.s $f0, $f0, $f0 /* 4A14CC 8021842C 3C014334 */ lui $at, 0x4334 /* 4A14D0 80218430 44811000 */ mtc1 $at, $f2 -/* 4A14D4 80218434 00000000 */ nop +/* 4A14D4 80218434 00000000 */ nop /* 4A14D8 80218438 46020000 */ add.s $f0, $f0, $f2 /* 4A14DC 8021843C 4600010D */ trunc.w.s $f4, $f0 /* 4A14E0 80218440 44062000 */ mfc1 $a2, $f4 @@ -160,5 +160,5 @@ glabel func_80218220_4A12C0 /* 4A151C 8021847C 24020002 */ addiu $v0, $zero, 2 /* 4A1520 80218480 03E00008 */ jr $ra /* 4A1524 80218484 27BD0058 */ addiu $sp, $sp, 0x58 -/* 4A1528 80218488 00000000 */ nop -/* 4A152C 8021848C 00000000 */ nop +/* 4A1528 80218488 00000000 */ nop +/* 4A152C 8021848C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_trd_part_2/4B11F0/func_80218058_4B1248.s b/asm/nonmatchings/battle/area_trd_part_2/4B11F0/func_80218058_4B1248.s index 23f8074ef9..8c178c95b8 100644 --- a/asm/nonmatchings/battle/area_trd_part_2/4B11F0/func_80218058_4B1248.s +++ b/asm/nonmatchings/battle/area_trd_part_2/4B11F0/func_80218058_4B1248.s @@ -37,12 +37,12 @@ glabel func_80218058_4B1248 /* 4B12C4 802180D4 12400007 */ beqz $s2, .L802180F4 /* 4B12C8 802180D8 3412FFFF */ ori $s2, $zero, 0xffff /* 4B12CC 802180DC 08086059 */ j .L80218164 -/* 4B12D0 802180E0 00000000 */ nop +/* 4B12D0 802180E0 00000000 */ nop .L802180E4: /* 4B12D4 802180E4 1242001B */ beq $s2, $v0, .L80218154 /* 4B12D8 802180E8 24020002 */ addiu $v0, $zero, 2 /* 4B12DC 802180EC 08086059 */ j .L80218164 -/* 4B12E0 802180F0 00000000 */ nop +/* 4B12E0 802180F0 00000000 */ nop .L802180F4: /* 4B12E4 802180F4 8E040000 */ lw $a0, ($s0) /* 4B12E8 802180F8 1092001A */ beq $a0, $s2, .L80218164 @@ -56,7 +56,7 @@ glabel func_80218058_4B1248 /* 4B1308 80218118 0C046F1F */ jal func_8011BC7C /* 4B130C 8021811C 0220302D */ daddu $a2, $s1, $zero /* 4B1310 80218120 0808603D */ j .L802180F4 -/* 4B1314 80218124 00000000 */ nop +/* 4B1314 80218124 00000000 */ nop .L80218128: /* 4B1318 80218128 3412FFFF */ ori $s2, $zero, 0xffff .L8021812C: @@ -69,7 +69,7 @@ glabel func_80218058_4B1248 /* 4B1334 80218144 0C046E54 */ jal func_8011B950 /* 4B1338 80218148 0000382D */ daddu $a3, $zero, $zero /* 4B133C 8021814C 0808604B */ j .L8021812C -/* 4B1340 80218150 00000000 */ nop +/* 4B1340 80218150 00000000 */ nop .L80218154: /* 4B1344 80218154 3C028015 */ lui $v0, %hi(D_801512F0) /* 4B1348 80218158 8C4212F0 */ lw $v0, %lo(D_801512F0)($v0) diff --git a/asm/nonmatchings/battle/area_trd_part_2/4B11F0/func_8021817C_4B136C.s b/asm/nonmatchings/battle/area_trd_part_2/4B11F0/func_8021817C_4B136C.s index c10f868688..36532ec737 100644 --- a/asm/nonmatchings/battle/area_trd_part_2/4B11F0/func_8021817C_4B136C.s +++ b/asm/nonmatchings/battle/area_trd_part_2/4B11F0/func_8021817C_4B136C.s @@ -71,20 +71,20 @@ glabel func_8021817C_4B136C /* 4B1474 80218284 12620008 */ beq $s3, $v0, .L802182A8 /* 4B1478 80218288 32C400FF */ andi $a0, $s6, 0xff /* 4B147C 8021828C 080860C7 */ j .L8021831C -/* 4B1480 80218290 00000000 */ nop +/* 4B1480 80218290 00000000 */ nop .L80218294: /* 4B1484 80218294 24020003 */ addiu $v0, $zero, 3 /* 4B1488 80218298 12620018 */ beq $s3, $v0, .L802182FC /* 4B148C 8021829C 32C400FF */ andi $a0, $s6, 0xff /* 4B1490 802182A0 080860C7 */ j .L8021831C -/* 4B1494 802182A4 00000000 */ nop +/* 4B1494 802182A4 00000000 */ nop .L802182A8: /* 4B1498 802182A8 32A500FF */ andi $a1, $s5, 0xff /* 4B149C 802182AC 328600FF */ andi $a2, $s4, 0xff /* 4B14A0 802182B0 0C046F97 */ jal set_background_color_blend /* 4B14A4 802182B4 324700FF */ andi $a3, $s2, 0xff /* 4B14A8 802182B8 080860C7 */ j .L8021831C -/* 4B14AC 802182BC 00000000 */ nop +/* 4B14AC 802182BC 00000000 */ nop .L802182C0: /* 4B14B0 802182C0 32C400FF */ andi $a0, $s6, 0xff /* 4B14B4 802182C4 32A500FF */ andi $a1, $s5, 0xff @@ -100,7 +100,7 @@ glabel func_8021817C_4B136C /* 4B14DC 802182EC 0C046FAD */ jal func_8011BEB4 /* 4B14E0 802182F0 AFA20018 */ sw $v0, 0x18($sp) /* 4B14E4 802182F4 080860C7 */ j .L8021831C -/* 4B14E8 802182F8 00000000 */ nop +/* 4B14E8 802182F8 00000000 */ nop .L802182FC: /* 4B14EC 802182FC 32A500FF */ andi $a1, $s5, 0xff /* 4B14F0 80218300 328600FF */ andi $a2, $s4, 0xff diff --git a/asm/nonmatchings/battle/area_trd_part_2/4B11F0/func_80218350_4B1540.s b/asm/nonmatchings/battle/area_trd_part_2/4B11F0/func_80218350_4B1540.s index 78ab801ac0..57261e2ecf 100644 --- a/asm/nonmatchings/battle/area_trd_part_2/4B11F0/func_80218350_4B1540.s +++ b/asm/nonmatchings/battle/area_trd_part_2/4B11F0/func_80218350_4B1540.s @@ -8,7 +8,7 @@ glabel func_80218350_4B1540 /* 4B154C 8021835C 0C052BE3 */ jal func_8014AF8C /* 4B1550 80218360 0000282D */ daddu $a1, $zero, $zero /* 4B1554 80218364 0C052BBE */ jal func_8014AEF8 -/* 4B1558 80218368 00000000 */ nop +/* 4B1558 80218368 00000000 */ nop /* 4B155C 8021836C 8FBF0010 */ lw $ra, 0x10($sp) /* 4B1560 80218370 24020002 */ addiu $v0, $zero, 2 /* 4B1564 80218374 03E00008 */ jr $ra diff --git a/asm/nonmatchings/battle/area_trd_part_2/4B11F0/func_8021837C_4B156C.s b/asm/nonmatchings/battle/area_trd_part_2/4B11F0/func_8021837C_4B156C.s index 14224e9e1f..490fd468c6 100644 --- a/asm/nonmatchings/battle/area_trd_part_2/4B11F0/func_8021837C_4B156C.s +++ b/asm/nonmatchings/battle/area_trd_part_2/4B11F0/func_8021837C_4B156C.s @@ -24,6 +24,6 @@ glabel func_8021837C_4B156C /* 4B15B8 802183C8 24020002 */ addiu $v0, $zero, 2 /* 4B15BC 802183CC 03E00008 */ jr $ra /* 4B15C0 802183D0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 4B15C4 802183D4 00000000 */ nop -/* 4B15C8 802183D8 00000000 */ nop -/* 4B15CC 802183DC 00000000 */ nop +/* 4B15C4 802183D4 00000000 */ nop +/* 4B15C8 802183D8 00000000 */ nop +/* 4B15CC 802183DC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_trd_part_2/4B15D0/func_80218438_4B1628.s b/asm/nonmatchings/battle/area_trd_part_2/4B15D0/func_80218438_4B1628.s index cb478ca1d9..60a0ed0142 100644 --- a/asm/nonmatchings/battle/area_trd_part_2/4B15D0/func_80218438_4B1628.s +++ b/asm/nonmatchings/battle/area_trd_part_2/4B15D0/func_80218438_4B1628.s @@ -31,11 +31,11 @@ glabel func_80218438_4B1628 /* 4B1690 802184A0 3C058023 */ lui $a1, %hi(D_80236040) /* 4B1694 802184A4 24A56040 */ addiu $a1, $a1, %lo(D_80236040) /* 4B1698 802184A8 44930000 */ mtc1 $s3, $f0 -/* 4B169C 802184AC 00000000 */ nop +/* 4B169C 802184AC 00000000 */ nop /* 4B16A0 802184B0 46800020 */ cvt.s.w $f0, $f0 /* 4B16A4 802184B4 E4A00028 */ swc1 $f0, 0x28($a1) /* 4B16A8 802184B8 44920000 */ mtc1 $s2, $f0 -/* 4B16AC 802184BC 00000000 */ nop +/* 4B16AC 802184BC 00000000 */ nop /* 4B16B0 802184C0 46800020 */ cvt.s.w $f0, $f0 /* 4B16B4 802184C4 0040382D */ daddu $a3, $v0, $zero /* 4B16B8 802184C8 3C014120 */ lui $at, 0x4120 @@ -43,7 +43,7 @@ glabel func_80218438_4B1628 /* 4B16C0 802184D0 3C063F80 */ lui $a2, 0x3f80 /* 4B16C4 802184D4 46020001 */ sub.s $f0, $f0, $f2 /* 4B16C8 802184D8 44901000 */ mtc1 $s0, $f2 -/* 4B16CC 802184DC 00000000 */ nop +/* 4B16CC 802184DC 00000000 */ nop /* 4B16D0 802184E0 468010A0 */ cvt.s.w $f2, $f2 /* 4B16D4 802184E4 E4A20030 */ swc1 $f2, 0x30($a1) /* 4B16D8 802184E8 0C01C4B4 */ jal func_800712D0 diff --git a/asm/nonmatchings/battle/area_trd_part_2/4B15D0/func_80218510_4B1700.s b/asm/nonmatchings/battle/area_trd_part_2/4B15D0/func_80218510_4B1700.s index ec818135c8..88d6b1abd1 100644 --- a/asm/nonmatchings/battle/area_trd_part_2/4B15D0/func_80218510_4B1700.s +++ b/asm/nonmatchings/battle/area_trd_part_2/4B15D0/func_80218510_4B1700.s @@ -10,7 +10,7 @@ glabel func_80218510_4B1700 /* 4B1714 80218524 24040200 */ addiu $a0, $zero, 0x200 /* 4B1718 80218528 0040202D */ daddu $a0, $v0, $zero /* 4B171C 8021852C 10800004 */ beqz $a0, .L80218540 -/* 4B1720 80218530 00000000 */ nop +/* 4B1720 80218530 00000000 */ nop /* 4B1724 80218534 8C82008C */ lw $v0, 0x8c($a0) /* 4B1728 80218538 10500019 */ beq $v0, $s0, .L802185A0 /* 4B172C 8021853C 0080102D */ daddu $v0, $a0, $zero @@ -19,7 +19,7 @@ glabel func_80218510_4B1700 /* 4B1734 80218544 24040201 */ addiu $a0, $zero, 0x201 /* 4B1738 80218548 0040202D */ daddu $a0, $v0, $zero /* 4B173C 8021854C 10800004 */ beqz $a0, .L80218560 -/* 4B1740 80218550 00000000 */ nop +/* 4B1740 80218550 00000000 */ nop /* 4B1744 80218554 8C82008C */ lw $v0, 0x8c($a0) /* 4B1748 80218558 10500011 */ beq $v0, $s0, .L802185A0 /* 4B174C 8021855C 0080102D */ daddu $v0, $a0, $zero @@ -28,7 +28,7 @@ glabel func_80218510_4B1700 /* 4B1754 80218564 24040202 */ addiu $a0, $zero, 0x202 /* 4B1758 80218568 0040202D */ daddu $a0, $v0, $zero /* 4B175C 8021856C 10800004 */ beqz $a0, .L80218580 -/* 4B1760 80218570 00000000 */ nop +/* 4B1760 80218570 00000000 */ nop /* 4B1764 80218574 8C82008C */ lw $v0, 0x8c($a0) /* 4B1768 80218578 10500009 */ beq $v0, $s0, .L802185A0 /* 4B176C 8021857C 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/battle/area_trd_part_2/4B15D0/func_802185B0_4B17A0.s b/asm/nonmatchings/battle/area_trd_part_2/4B15D0/func_802185B0_4B17A0.s index 67e1e9e2ef..2b49946a5e 100644 --- a/asm/nonmatchings/battle/area_trd_part_2/4B15D0/func_802185B0_4B17A0.s +++ b/asm/nonmatchings/battle/area_trd_part_2/4B15D0/func_802185B0_4B17A0.s @@ -125,7 +125,7 @@ glabel func_802185B0_4B17A0 /* 4B1960 80218770 C4A20000 */ lwc1 $f2, ($a1) /* 4B1964 80218774 C4600000 */ lwc1 $f0, ($v1) /* 4B1968 80218778 4600103C */ c.lt.s $f2, $f0 -/* 4B196C 8021877C 00000000 */ nop +/* 4B196C 8021877C 00000000 */ nop /* 4B1970 80218780 45000013 */ bc1f .L802187D0 /* 4B1974 80218784 24C60001 */ addiu $a2, $a2, 1 /* 4B1978 80218788 8CAA0000 */ lw $t2, ($a1) @@ -158,7 +158,7 @@ glabel func_802185B0_4B17A0 .L802187EC: /* 4B19DC 802187EC 8E440148 */ lw $a0, 0x148($s2) /* 4B19E0 802187F0 0C09A75B */ jal get_actor -/* 4B19E4 802187F4 00000000 */ nop +/* 4B19E4 802187F4 00000000 */ nop /* 4B19E8 802187F8 24040003 */ addiu $a0, $zero, 3 /* 4B19EC 802187FC 8C43008C */ lw $v1, 0x8c($v0) /* 4B19F0 80218800 12240034 */ beq $s1, $a0, .L802188D4 @@ -166,22 +166,22 @@ glabel func_802185B0_4B17A0 /* 4B19F8 80218808 10400005 */ beqz $v0, .L80218820 /* 4B19FC 8021880C 24020002 */ addiu $v0, $zero, 2 /* 4B1A00 80218810 12220008 */ beq $s1, $v0, .L80218834 -/* 4B1A04 80218814 00000000 */ nop +/* 4B1A04 80218814 00000000 */ nop /* 4B1A08 80218818 080862CB */ j .L80218B2C -/* 4B1A0C 8021881C 00000000 */ nop +/* 4B1A0C 8021881C 00000000 */ nop .L80218820: /* 4B1A10 80218820 24020004 */ addiu $v0, $zero, 4 /* 4B1A14 80218824 1222006B */ beq $s1, $v0, .L802189D4 -/* 4B1A18 80218828 00000000 */ nop +/* 4B1A18 80218828 00000000 */ nop /* 4B1A1C 8021882C 080862CB */ j .L80218B2C -/* 4B1A20 80218830 00000000 */ nop +/* 4B1A20 80218830 00000000 */ nop .L80218834: /* 4B1A24 80218834 10640005 */ beq $v1, $a0, .L8021884C /* 4B1A28 80218838 24020006 */ addiu $v0, $zero, 6 /* 4B1A2C 8021883C 10620014 */ beq $v1, $v0, .L80218890 -/* 4B1A30 80218840 00000000 */ nop +/* 4B1A30 80218840 00000000 */ nop /* 4B1A34 80218844 080862CB */ j .L80218B2C -/* 4B1A38 80218848 00000000 */ nop +/* 4B1A38 80218848 00000000 */ nop .L8021884C: /* 4B1A3C 8021884C 8E050000 */ lw $a1, ($s0) /* 4B1A40 80218850 26100004 */ addiu $s0, $s0, 4 @@ -225,14 +225,14 @@ glabel func_802185B0_4B17A0 /* 4B1AD0 802188E0 10400005 */ beqz $v0, .L802188F8 /* 4B1AD4 802188E4 24020006 */ addiu $v0, $zero, 6 /* 4B1AD8 802188E8 10640007 */ beq $v1, $a0, .L80218908 -/* 4B1ADC 802188EC 00000000 */ nop +/* 4B1ADC 802188EC 00000000 */ nop /* 4B1AE0 802188F0 080862CB */ j .L80218B2C -/* 4B1AE4 802188F4 00000000 */ nop +/* 4B1AE4 802188F4 00000000 */ nop .L802188F8: /* 4B1AE8 802188F8 10620025 */ beq $v1, $v0, .L80218990 -/* 4B1AEC 802188FC 00000000 */ nop +/* 4B1AEC 802188FC 00000000 */ nop /* 4B1AF0 80218900 080862CB */ j .L80218B2C -/* 4B1AF4 80218904 00000000 */ nop +/* 4B1AF4 80218904 00000000 */ nop .L80218908: /* 4B1AF8 80218908 8E050000 */ lw $a1, ($s0) /* 4B1AFC 8021890C 26100004 */ addiu $s0, $s0, 4 @@ -293,16 +293,16 @@ glabel func_802185B0_4B17A0 /* 4B1BCC 802189DC 10400005 */ beqz $v0, .L802189F4 /* 4B1BD0 802189E0 24020005 */ addiu $v0, $zero, 5 /* 4B1BD4 802189E4 10640009 */ beq $v1, $a0, .L80218A0C -/* 4B1BD8 802189E8 00000000 */ nop +/* 4B1BD8 802189E8 00000000 */ nop /* 4B1BDC 802189EC 080862CB */ j .L80218B2C -/* 4B1BE0 802189F0 00000000 */ nop +/* 4B1BE0 802189F0 00000000 */ nop .L802189F4: /* 4B1BE4 802189F4 10620027 */ beq $v1, $v0, .L80218A94 /* 4B1BE8 802189F8 24020006 */ addiu $v0, $zero, 6 /* 4B1BEC 802189FC 10620036 */ beq $v1, $v0, .L80218AD8 -/* 4B1BF0 80218A00 00000000 */ nop +/* 4B1BF0 80218A00 00000000 */ nop /* 4B1BF4 80218A04 080862CB */ j .L80218B2C -/* 4B1BF8 80218A08 00000000 */ nop +/* 4B1BF8 80218A08 00000000 */ nop .L80218A0C: /* 4B1BFC 80218A0C 8E050000 */ lw $a1, ($s0) /* 4B1C00 80218A10 26100004 */ addiu $s0, $s0, 4 @@ -379,7 +379,7 @@ glabel func_802185B0_4B17A0 /* 4B1D0C 80218B1C 4600010D */ trunc.w.s $f4, $f0 /* 4B1D10 80218B20 44062000 */ mfc1 $a2, $f4 /* 4B1D14 80218B24 0C0B2026 */ jal set_variable -/* 4B1D18 80218B28 00000000 */ nop +/* 4B1D18 80218B28 00000000 */ nop .L80218B2C: /* 4B1D1C 80218B2C 8FBF005C */ lw $ra, 0x5c($sp) /* 4B1D20 80218B30 8FB20058 */ lw $s2, 0x58($sp) diff --git a/asm/nonmatchings/battle/area_trd_part_2/4B15D0/func_80218B48_4B1D38.s b/asm/nonmatchings/battle/area_trd_part_2/4B15D0/func_80218B48_4B1D38.s index 7d5b141d64..667e614841 100644 --- a/asm/nonmatchings/battle/area_trd_part_2/4B15D0/func_80218B48_4B1D38.s +++ b/asm/nonmatchings/battle/area_trd_part_2/4B15D0/func_80218B48_4B1D38.s @@ -21,6 +21,6 @@ glabel func_80218B48_4B1D38 /* 4B1D78 80218B88 24020002 */ addiu $v0, $zero, 2 /* 4B1D7C 80218B8C 03E00008 */ jr $ra /* 4B1D80 80218B90 27BD0020 */ addiu $sp, $sp, 0x20 -/* 4B1D84 80218B94 00000000 */ nop -/* 4B1D88 80218B98 00000000 */ nop -/* 4B1D8C 80218B9C 00000000 */ nop +/* 4B1D84 80218B94 00000000 */ nop +/* 4B1D88 80218B98 00000000 */ nop +/* 4B1D8C 80218B9C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_trd_part_2/4B1D90/func_80218BF8_4B1DE8.s b/asm/nonmatchings/battle/area_trd_part_2/4B1D90/func_80218BF8_4B1DE8.s index 730619fde0..23ec217da0 100644 --- a/asm/nonmatchings/battle/area_trd_part_2/4B1D90/func_80218BF8_4B1DE8.s +++ b/asm/nonmatchings/battle/area_trd_part_2/4B1D90/func_80218BF8_4B1DE8.s @@ -31,11 +31,11 @@ glabel func_80218BF8_4B1DE8 /* 4B1E50 80218C60 3C058023 */ lui $a1, %hi(D_802362D0) /* 4B1E54 80218C64 24A562D0 */ addiu $a1, $a1, %lo(D_802362D0) /* 4B1E58 80218C68 44930000 */ mtc1 $s3, $f0 -/* 4B1E5C 80218C6C 00000000 */ nop +/* 4B1E5C 80218C6C 00000000 */ nop /* 4B1E60 80218C70 46800020 */ cvt.s.w $f0, $f0 /* 4B1E64 80218C74 E4A00028 */ swc1 $f0, 0x28($a1) /* 4B1E68 80218C78 44920000 */ mtc1 $s2, $f0 -/* 4B1E6C 80218C7C 00000000 */ nop +/* 4B1E6C 80218C7C 00000000 */ nop /* 4B1E70 80218C80 46800020 */ cvt.s.w $f0, $f0 /* 4B1E74 80218C84 0040382D */ daddu $a3, $v0, $zero /* 4B1E78 80218C88 3C014120 */ lui $at, 0x4120 @@ -43,7 +43,7 @@ glabel func_80218BF8_4B1DE8 /* 4B1E80 80218C90 3C063F80 */ lui $a2, 0x3f80 /* 4B1E84 80218C94 46020001 */ sub.s $f0, $f0, $f2 /* 4B1E88 80218C98 44901000 */ mtc1 $s0, $f2 -/* 4B1E8C 80218C9C 00000000 */ nop +/* 4B1E8C 80218C9C 00000000 */ nop /* 4B1E90 80218CA0 468010A0 */ cvt.s.w $f2, $f2 /* 4B1E94 80218CA4 E4A20030 */ swc1 $f2, 0x30($a1) /* 4B1E98 80218CA8 0C01C4B4 */ jal func_800712D0 diff --git a/asm/nonmatchings/battle/area_trd_part_2/4B1D90/func_80218CD0_4B1EC0.s b/asm/nonmatchings/battle/area_trd_part_2/4B1D90/func_80218CD0_4B1EC0.s index 8b5f2e2a9b..839c297963 100644 --- a/asm/nonmatchings/battle/area_trd_part_2/4B1D90/func_80218CD0_4B1EC0.s +++ b/asm/nonmatchings/battle/area_trd_part_2/4B1D90/func_80218CD0_4B1EC0.s @@ -10,7 +10,7 @@ glabel func_80218CD0_4B1EC0 /* 4B1ED4 80218CE4 24040200 */ addiu $a0, $zero, 0x200 /* 4B1ED8 80218CE8 0040202D */ daddu $a0, $v0, $zero /* 4B1EDC 80218CEC 10800004 */ beqz $a0, .L80218D00 -/* 4B1EE0 80218CF0 00000000 */ nop +/* 4B1EE0 80218CF0 00000000 */ nop /* 4B1EE4 80218CF4 8C82008C */ lw $v0, 0x8c($a0) /* 4B1EE8 80218CF8 10500019 */ beq $v0, $s0, .L80218D60 /* 4B1EEC 80218CFC 0080102D */ daddu $v0, $a0, $zero @@ -19,7 +19,7 @@ glabel func_80218CD0_4B1EC0 /* 4B1EF4 80218D04 24040201 */ addiu $a0, $zero, 0x201 /* 4B1EF8 80218D08 0040202D */ daddu $a0, $v0, $zero /* 4B1EFC 80218D0C 10800004 */ beqz $a0, .L80218D20 -/* 4B1F00 80218D10 00000000 */ nop +/* 4B1F00 80218D10 00000000 */ nop /* 4B1F04 80218D14 8C82008C */ lw $v0, 0x8c($a0) /* 4B1F08 80218D18 10500011 */ beq $v0, $s0, .L80218D60 /* 4B1F0C 80218D1C 0080102D */ daddu $v0, $a0, $zero @@ -28,7 +28,7 @@ glabel func_80218CD0_4B1EC0 /* 4B1F14 80218D24 24040202 */ addiu $a0, $zero, 0x202 /* 4B1F18 80218D28 0040202D */ daddu $a0, $v0, $zero /* 4B1F1C 80218D2C 10800004 */ beqz $a0, .L80218D40 -/* 4B1F20 80218D30 00000000 */ nop +/* 4B1F20 80218D30 00000000 */ nop /* 4B1F24 80218D34 8C82008C */ lw $v0, 0x8c($a0) /* 4B1F28 80218D38 10500009 */ beq $v0, $s0, .L80218D60 /* 4B1F2C 80218D3C 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/battle/area_trd_part_2/4B1D90/func_80218D70_4B1F60.s b/asm/nonmatchings/battle/area_trd_part_2/4B1D90/func_80218D70_4B1F60.s index 0e8ee9c1d6..e47b5b012c 100644 --- a/asm/nonmatchings/battle/area_trd_part_2/4B1D90/func_80218D70_4B1F60.s +++ b/asm/nonmatchings/battle/area_trd_part_2/4B1D90/func_80218D70_4B1F60.s @@ -125,7 +125,7 @@ glabel func_80218D70_4B1F60 /* 4B2120 80218F30 C4A20000 */ lwc1 $f2, ($a1) /* 4B2124 80218F34 C4600000 */ lwc1 $f0, ($v1) /* 4B2128 80218F38 4600103C */ c.lt.s $f2, $f0 -/* 4B212C 80218F3C 00000000 */ nop +/* 4B212C 80218F3C 00000000 */ nop /* 4B2130 80218F40 45000013 */ bc1f .L80218F90 /* 4B2134 80218F44 24C60001 */ addiu $a2, $a2, 1 /* 4B2138 80218F48 8CAA0000 */ lw $t2, ($a1) @@ -158,7 +158,7 @@ glabel func_80218D70_4B1F60 .L80218FAC: /* 4B219C 80218FAC 8E440148 */ lw $a0, 0x148($s2) /* 4B21A0 80218FB0 0C09A75B */ jal get_actor -/* 4B21A4 80218FB4 00000000 */ nop +/* 4B21A4 80218FB4 00000000 */ nop /* 4B21A8 80218FB8 24040003 */ addiu $a0, $zero, 3 /* 4B21AC 80218FBC 8C43008C */ lw $v1, 0x8c($v0) /* 4B21B0 80218FC0 12240034 */ beq $s1, $a0, .L80219094 @@ -166,22 +166,22 @@ glabel func_80218D70_4B1F60 /* 4B21B8 80218FC8 10400005 */ beqz $v0, .L80218FE0 /* 4B21BC 80218FCC 24020002 */ addiu $v0, $zero, 2 /* 4B21C0 80218FD0 12220008 */ beq $s1, $v0, .L80218FF4 -/* 4B21C4 80218FD4 00000000 */ nop +/* 4B21C4 80218FD4 00000000 */ nop /* 4B21C8 80218FD8 080864BB */ j .L802192EC -/* 4B21CC 80218FDC 00000000 */ nop +/* 4B21CC 80218FDC 00000000 */ nop .L80218FE0: /* 4B21D0 80218FE0 24020004 */ addiu $v0, $zero, 4 /* 4B21D4 80218FE4 1222006B */ beq $s1, $v0, .L80219194 -/* 4B21D8 80218FE8 00000000 */ nop +/* 4B21D8 80218FE8 00000000 */ nop /* 4B21DC 80218FEC 080864BB */ j .L802192EC -/* 4B21E0 80218FF0 00000000 */ nop +/* 4B21E0 80218FF0 00000000 */ nop .L80218FF4: /* 4B21E4 80218FF4 10640005 */ beq $v1, $a0, .L8021900C /* 4B21E8 80218FF8 24020006 */ addiu $v0, $zero, 6 /* 4B21EC 80218FFC 10620014 */ beq $v1, $v0, .L80219050 -/* 4B21F0 80219000 00000000 */ nop +/* 4B21F0 80219000 00000000 */ nop /* 4B21F4 80219004 080864BB */ j .L802192EC -/* 4B21F8 80219008 00000000 */ nop +/* 4B21F8 80219008 00000000 */ nop .L8021900C: /* 4B21FC 8021900C 8E050000 */ lw $a1, ($s0) /* 4B2200 80219010 26100004 */ addiu $s0, $s0, 4 @@ -225,14 +225,14 @@ glabel func_80218D70_4B1F60 /* 4B2290 802190A0 10400005 */ beqz $v0, .L802190B8 /* 4B2294 802190A4 24020006 */ addiu $v0, $zero, 6 /* 4B2298 802190A8 10640007 */ beq $v1, $a0, .L802190C8 -/* 4B229C 802190AC 00000000 */ nop +/* 4B229C 802190AC 00000000 */ nop /* 4B22A0 802190B0 080864BB */ j .L802192EC -/* 4B22A4 802190B4 00000000 */ nop +/* 4B22A4 802190B4 00000000 */ nop .L802190B8: /* 4B22A8 802190B8 10620025 */ beq $v1, $v0, .L80219150 -/* 4B22AC 802190BC 00000000 */ nop +/* 4B22AC 802190BC 00000000 */ nop /* 4B22B0 802190C0 080864BB */ j .L802192EC -/* 4B22B4 802190C4 00000000 */ nop +/* 4B22B4 802190C4 00000000 */ nop .L802190C8: /* 4B22B8 802190C8 8E050000 */ lw $a1, ($s0) /* 4B22BC 802190CC 26100004 */ addiu $s0, $s0, 4 @@ -293,16 +293,16 @@ glabel func_80218D70_4B1F60 /* 4B238C 8021919C 10400005 */ beqz $v0, .L802191B4 /* 4B2390 802191A0 24020005 */ addiu $v0, $zero, 5 /* 4B2394 802191A4 10640009 */ beq $v1, $a0, .L802191CC -/* 4B2398 802191A8 00000000 */ nop +/* 4B2398 802191A8 00000000 */ nop /* 4B239C 802191AC 080864BB */ j .L802192EC -/* 4B23A0 802191B0 00000000 */ nop +/* 4B23A0 802191B0 00000000 */ nop .L802191B4: /* 4B23A4 802191B4 10620027 */ beq $v1, $v0, .L80219254 /* 4B23A8 802191B8 24020006 */ addiu $v0, $zero, 6 /* 4B23AC 802191BC 10620036 */ beq $v1, $v0, .L80219298 -/* 4B23B0 802191C0 00000000 */ nop +/* 4B23B0 802191C0 00000000 */ nop /* 4B23B4 802191C4 080864BB */ j .L802192EC -/* 4B23B8 802191C8 00000000 */ nop +/* 4B23B8 802191C8 00000000 */ nop .L802191CC: /* 4B23BC 802191CC 8E050000 */ lw $a1, ($s0) /* 4B23C0 802191D0 26100004 */ addiu $s0, $s0, 4 @@ -379,7 +379,7 @@ glabel func_80218D70_4B1F60 /* 4B24CC 802192DC 4600010D */ trunc.w.s $f4, $f0 /* 4B24D0 802192E0 44062000 */ mfc1 $a2, $f4 /* 4B24D4 802192E4 0C0B2026 */ jal set_variable -/* 4B24D8 802192E8 00000000 */ nop +/* 4B24D8 802192E8 00000000 */ nop .L802192EC: /* 4B24DC 802192EC 8FBF005C */ lw $ra, 0x5c($sp) /* 4B24E0 802192F0 8FB20058 */ lw $s2, 0x58($sp) diff --git a/asm/nonmatchings/battle/area_trd_part_2/4B1D90/func_80219308_4B24F8.s b/asm/nonmatchings/battle/area_trd_part_2/4B1D90/func_80219308_4B24F8.s index 5899652683..de62fc8f75 100644 --- a/asm/nonmatchings/battle/area_trd_part_2/4B1D90/func_80219308_4B24F8.s +++ b/asm/nonmatchings/battle/area_trd_part_2/4B1D90/func_80219308_4B24F8.s @@ -21,6 +21,6 @@ glabel func_80219308_4B24F8 /* 4B2538 80219348 24020002 */ addiu $v0, $zero, 2 /* 4B253C 8021934C 03E00008 */ jr $ra /* 4B2540 80219350 27BD0020 */ addiu $sp, $sp, 0x20 -/* 4B2544 80219354 00000000 */ nop -/* 4B2548 80219358 00000000 */ nop -/* 4B254C 8021935C 00000000 */ nop +/* 4B2544 80219354 00000000 */ nop +/* 4B2548 80219358 00000000 */ nop +/* 4B254C 8021935C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_trd_part_2/4B2550/func_802193B8_4B25A8.s b/asm/nonmatchings/battle/area_trd_part_2/4B2550/func_802193B8_4B25A8.s index 9678e1373a..5653edd685 100644 --- a/asm/nonmatchings/battle/area_trd_part_2/4B2550/func_802193B8_4B25A8.s +++ b/asm/nonmatchings/battle/area_trd_part_2/4B2550/func_802193B8_4B25A8.s @@ -31,11 +31,11 @@ glabel func_802193B8_4B25A8 /* 4B2610 80219420 3C058023 */ lui $a1, %hi(D_80236560) /* 4B2614 80219424 24A56560 */ addiu $a1, $a1, %lo(D_80236560) /* 4B2618 80219428 44930000 */ mtc1 $s3, $f0 -/* 4B261C 8021942C 00000000 */ nop +/* 4B261C 8021942C 00000000 */ nop /* 4B2620 80219430 46800020 */ cvt.s.w $f0, $f0 /* 4B2624 80219434 E4A00028 */ swc1 $f0, 0x28($a1) /* 4B2628 80219438 44920000 */ mtc1 $s2, $f0 -/* 4B262C 8021943C 00000000 */ nop +/* 4B262C 8021943C 00000000 */ nop /* 4B2630 80219440 46800020 */ cvt.s.w $f0, $f0 /* 4B2634 80219444 0040382D */ daddu $a3, $v0, $zero /* 4B2638 80219448 3C014120 */ lui $at, 0x4120 @@ -43,7 +43,7 @@ glabel func_802193B8_4B25A8 /* 4B2640 80219450 3C063F80 */ lui $a2, 0x3f80 /* 4B2644 80219454 46020001 */ sub.s $f0, $f0, $f2 /* 4B2648 80219458 44901000 */ mtc1 $s0, $f2 -/* 4B264C 8021945C 00000000 */ nop +/* 4B264C 8021945C 00000000 */ nop /* 4B2650 80219460 468010A0 */ cvt.s.w $f2, $f2 /* 4B2654 80219464 E4A20030 */ swc1 $f2, 0x30($a1) /* 4B2658 80219468 0C01C4B4 */ jal func_800712D0 diff --git a/asm/nonmatchings/battle/area_trd_part_2/4B2550/func_80219490_4B2680.s b/asm/nonmatchings/battle/area_trd_part_2/4B2550/func_80219490_4B2680.s index 7e251dedd7..33b7f41f3b 100644 --- a/asm/nonmatchings/battle/area_trd_part_2/4B2550/func_80219490_4B2680.s +++ b/asm/nonmatchings/battle/area_trd_part_2/4B2550/func_80219490_4B2680.s @@ -10,7 +10,7 @@ glabel func_80219490_4B2680 /* 4B2694 802194A4 24040200 */ addiu $a0, $zero, 0x200 /* 4B2698 802194A8 0040202D */ daddu $a0, $v0, $zero /* 4B269C 802194AC 10800004 */ beqz $a0, .L802194C0 -/* 4B26A0 802194B0 00000000 */ nop +/* 4B26A0 802194B0 00000000 */ nop /* 4B26A4 802194B4 8C82008C */ lw $v0, 0x8c($a0) /* 4B26A8 802194B8 10500019 */ beq $v0, $s0, .L80219520 /* 4B26AC 802194BC 0080102D */ daddu $v0, $a0, $zero @@ -19,7 +19,7 @@ glabel func_80219490_4B2680 /* 4B26B4 802194C4 24040201 */ addiu $a0, $zero, 0x201 /* 4B26B8 802194C8 0040202D */ daddu $a0, $v0, $zero /* 4B26BC 802194CC 10800004 */ beqz $a0, .L802194E0 -/* 4B26C0 802194D0 00000000 */ nop +/* 4B26C0 802194D0 00000000 */ nop /* 4B26C4 802194D4 8C82008C */ lw $v0, 0x8c($a0) /* 4B26C8 802194D8 10500011 */ beq $v0, $s0, .L80219520 /* 4B26CC 802194DC 0080102D */ daddu $v0, $a0, $zero @@ -28,7 +28,7 @@ glabel func_80219490_4B2680 /* 4B26D4 802194E4 24040202 */ addiu $a0, $zero, 0x202 /* 4B26D8 802194E8 0040202D */ daddu $a0, $v0, $zero /* 4B26DC 802194EC 10800004 */ beqz $a0, .L80219500 -/* 4B26E0 802194F0 00000000 */ nop +/* 4B26E0 802194F0 00000000 */ nop /* 4B26E4 802194F4 8C82008C */ lw $v0, 0x8c($a0) /* 4B26E8 802194F8 10500009 */ beq $v0, $s0, .L80219520 /* 4B26EC 802194FC 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/battle/area_trd_part_2/4B2550/func_80219530_4B2720.s b/asm/nonmatchings/battle/area_trd_part_2/4B2550/func_80219530_4B2720.s index 0d80e62116..5050f7cb42 100644 --- a/asm/nonmatchings/battle/area_trd_part_2/4B2550/func_80219530_4B2720.s +++ b/asm/nonmatchings/battle/area_trd_part_2/4B2550/func_80219530_4B2720.s @@ -125,7 +125,7 @@ glabel func_80219530_4B2720 /* 4B28E0 802196F0 C4A20000 */ lwc1 $f2, ($a1) /* 4B28E4 802196F4 C4600000 */ lwc1 $f0, ($v1) /* 4B28E8 802196F8 4600103C */ c.lt.s $f2, $f0 -/* 4B28EC 802196FC 00000000 */ nop +/* 4B28EC 802196FC 00000000 */ nop /* 4B28F0 80219700 45000013 */ bc1f .L80219750 /* 4B28F4 80219704 24C60001 */ addiu $a2, $a2, 1 /* 4B28F8 80219708 8CAA0000 */ lw $t2, ($a1) @@ -158,7 +158,7 @@ glabel func_80219530_4B2720 .L8021976C: /* 4B295C 8021976C 8E440148 */ lw $a0, 0x148($s2) /* 4B2960 80219770 0C09A75B */ jal get_actor -/* 4B2964 80219774 00000000 */ nop +/* 4B2964 80219774 00000000 */ nop /* 4B2968 80219778 24040003 */ addiu $a0, $zero, 3 /* 4B296C 8021977C 8C43008C */ lw $v1, 0x8c($v0) /* 4B2970 80219780 12240034 */ beq $s1, $a0, .L80219854 @@ -166,22 +166,22 @@ glabel func_80219530_4B2720 /* 4B2978 80219788 10400005 */ beqz $v0, .L802197A0 /* 4B297C 8021978C 24020002 */ addiu $v0, $zero, 2 /* 4B2980 80219790 12220008 */ beq $s1, $v0, .L802197B4 -/* 4B2984 80219794 00000000 */ nop +/* 4B2984 80219794 00000000 */ nop /* 4B2988 80219798 080866AB */ j .L80219AAC -/* 4B298C 8021979C 00000000 */ nop +/* 4B298C 8021979C 00000000 */ nop .L802197A0: /* 4B2990 802197A0 24020004 */ addiu $v0, $zero, 4 /* 4B2994 802197A4 1222006B */ beq $s1, $v0, .L80219954 -/* 4B2998 802197A8 00000000 */ nop +/* 4B2998 802197A8 00000000 */ nop /* 4B299C 802197AC 080866AB */ j .L80219AAC -/* 4B29A0 802197B0 00000000 */ nop +/* 4B29A0 802197B0 00000000 */ nop .L802197B4: /* 4B29A4 802197B4 10640005 */ beq $v1, $a0, .L802197CC /* 4B29A8 802197B8 24020006 */ addiu $v0, $zero, 6 /* 4B29AC 802197BC 10620014 */ beq $v1, $v0, .L80219810 -/* 4B29B0 802197C0 00000000 */ nop +/* 4B29B0 802197C0 00000000 */ nop /* 4B29B4 802197C4 080866AB */ j .L80219AAC -/* 4B29B8 802197C8 00000000 */ nop +/* 4B29B8 802197C8 00000000 */ nop .L802197CC: /* 4B29BC 802197CC 8E050000 */ lw $a1, ($s0) /* 4B29C0 802197D0 26100004 */ addiu $s0, $s0, 4 @@ -225,14 +225,14 @@ glabel func_80219530_4B2720 /* 4B2A50 80219860 10400005 */ beqz $v0, .L80219878 /* 4B2A54 80219864 24020006 */ addiu $v0, $zero, 6 /* 4B2A58 80219868 10640007 */ beq $v1, $a0, .L80219888 -/* 4B2A5C 8021986C 00000000 */ nop +/* 4B2A5C 8021986C 00000000 */ nop /* 4B2A60 80219870 080866AB */ j .L80219AAC -/* 4B2A64 80219874 00000000 */ nop +/* 4B2A64 80219874 00000000 */ nop .L80219878: /* 4B2A68 80219878 10620025 */ beq $v1, $v0, .L80219910 -/* 4B2A6C 8021987C 00000000 */ nop +/* 4B2A6C 8021987C 00000000 */ nop /* 4B2A70 80219880 080866AB */ j .L80219AAC -/* 4B2A74 80219884 00000000 */ nop +/* 4B2A74 80219884 00000000 */ nop .L80219888: /* 4B2A78 80219888 8E050000 */ lw $a1, ($s0) /* 4B2A7C 8021988C 26100004 */ addiu $s0, $s0, 4 @@ -293,16 +293,16 @@ glabel func_80219530_4B2720 /* 4B2B4C 8021995C 10400005 */ beqz $v0, .L80219974 /* 4B2B50 80219960 24020005 */ addiu $v0, $zero, 5 /* 4B2B54 80219964 10640009 */ beq $v1, $a0, .L8021998C -/* 4B2B58 80219968 00000000 */ nop +/* 4B2B58 80219968 00000000 */ nop /* 4B2B5C 8021996C 080866AB */ j .L80219AAC -/* 4B2B60 80219970 00000000 */ nop +/* 4B2B60 80219970 00000000 */ nop .L80219974: /* 4B2B64 80219974 10620027 */ beq $v1, $v0, .L80219A14 /* 4B2B68 80219978 24020006 */ addiu $v0, $zero, 6 /* 4B2B6C 8021997C 10620036 */ beq $v1, $v0, .L80219A58 -/* 4B2B70 80219980 00000000 */ nop +/* 4B2B70 80219980 00000000 */ nop /* 4B2B74 80219984 080866AB */ j .L80219AAC -/* 4B2B78 80219988 00000000 */ nop +/* 4B2B78 80219988 00000000 */ nop .L8021998C: /* 4B2B7C 8021998C 8E050000 */ lw $a1, ($s0) /* 4B2B80 80219990 26100004 */ addiu $s0, $s0, 4 @@ -379,7 +379,7 @@ glabel func_80219530_4B2720 /* 4B2C8C 80219A9C 4600010D */ trunc.w.s $f4, $f0 /* 4B2C90 80219AA0 44062000 */ mfc1 $a2, $f4 /* 4B2C94 80219AA4 0C0B2026 */ jal set_variable -/* 4B2C98 80219AA8 00000000 */ nop +/* 4B2C98 80219AA8 00000000 */ nop .L80219AAC: /* 4B2C9C 80219AAC 8FBF005C */ lw $ra, 0x5c($sp) /* 4B2CA0 80219AB0 8FB20058 */ lw $s2, 0x58($sp) diff --git a/asm/nonmatchings/battle/area_trd_part_2/4B2550/func_80219AC8_4B2CB8.s b/asm/nonmatchings/battle/area_trd_part_2/4B2550/func_80219AC8_4B2CB8.s index 7c1bc91b0e..d3a7178a2d 100644 --- a/asm/nonmatchings/battle/area_trd_part_2/4B2550/func_80219AC8_4B2CB8.s +++ b/asm/nonmatchings/battle/area_trd_part_2/4B2550/func_80219AC8_4B2CB8.s @@ -21,6 +21,6 @@ glabel func_80219AC8_4B2CB8 /* 4B2CF8 80219B08 24020002 */ addiu $v0, $zero, 2 /* 4B2CFC 80219B0C 03E00008 */ jr $ra /* 4B2D00 80219B10 27BD0020 */ addiu $sp, $sp, 0x20 -/* 4B2D04 80219B14 00000000 */ nop -/* 4B2D08 80219B18 00000000 */ nop -/* 4B2D0C 80219B1C 00000000 */ nop +/* 4B2D04 80219B14 00000000 */ nop +/* 4B2D08 80219B18 00000000 */ nop +/* 4B2D0C 80219B1C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_trd_part_2/4B2D10/func_80219B78_4B2D68.s b/asm/nonmatchings/battle/area_trd_part_2/4B2D10/func_80219B78_4B2D68.s index f823578ef5..2e6d967cf8 100644 --- a/asm/nonmatchings/battle/area_trd_part_2/4B2D10/func_80219B78_4B2D68.s +++ b/asm/nonmatchings/battle/area_trd_part_2/4B2D10/func_80219B78_4B2D68.s @@ -31,11 +31,11 @@ glabel func_80219B78_4B2D68 /* 4B2DD0 80219BE0 3C058023 */ lui $a1, %hi(D_802367F0) /* 4B2DD4 80219BE4 24A567F0 */ addiu $a1, $a1, %lo(D_802367F0) /* 4B2DD8 80219BE8 44930000 */ mtc1 $s3, $f0 -/* 4B2DDC 80219BEC 00000000 */ nop +/* 4B2DDC 80219BEC 00000000 */ nop /* 4B2DE0 80219BF0 46800020 */ cvt.s.w $f0, $f0 /* 4B2DE4 80219BF4 E4A00028 */ swc1 $f0, 0x28($a1) /* 4B2DE8 80219BF8 44920000 */ mtc1 $s2, $f0 -/* 4B2DEC 80219BFC 00000000 */ nop +/* 4B2DEC 80219BFC 00000000 */ nop /* 4B2DF0 80219C00 46800020 */ cvt.s.w $f0, $f0 /* 4B2DF4 80219C04 0040382D */ daddu $a3, $v0, $zero /* 4B2DF8 80219C08 3C014120 */ lui $at, 0x4120 @@ -43,7 +43,7 @@ glabel func_80219B78_4B2D68 /* 4B2E00 80219C10 3C063F80 */ lui $a2, 0x3f80 /* 4B2E04 80219C14 46020001 */ sub.s $f0, $f0, $f2 /* 4B2E08 80219C18 44901000 */ mtc1 $s0, $f2 -/* 4B2E0C 80219C1C 00000000 */ nop +/* 4B2E0C 80219C1C 00000000 */ nop /* 4B2E10 80219C20 468010A0 */ cvt.s.w $f2, $f2 /* 4B2E14 80219C24 E4A20030 */ swc1 $f2, 0x30($a1) /* 4B2E18 80219C28 0C01C4B4 */ jal func_800712D0 diff --git a/asm/nonmatchings/battle/area_trd_part_2/4B2D10/func_80219C50_4B2E40.s b/asm/nonmatchings/battle/area_trd_part_2/4B2D10/func_80219C50_4B2E40.s index 127e9d8208..e8f8239e8a 100644 --- a/asm/nonmatchings/battle/area_trd_part_2/4B2D10/func_80219C50_4B2E40.s +++ b/asm/nonmatchings/battle/area_trd_part_2/4B2D10/func_80219C50_4B2E40.s @@ -10,7 +10,7 @@ glabel func_80219C50_4B2E40 /* 4B2E54 80219C64 24040200 */ addiu $a0, $zero, 0x200 /* 4B2E58 80219C68 0040202D */ daddu $a0, $v0, $zero /* 4B2E5C 80219C6C 10800004 */ beqz $a0, .L80219C80 -/* 4B2E60 80219C70 00000000 */ nop +/* 4B2E60 80219C70 00000000 */ nop /* 4B2E64 80219C74 8C82008C */ lw $v0, 0x8c($a0) /* 4B2E68 80219C78 10500019 */ beq $v0, $s0, .L80219CE0 /* 4B2E6C 80219C7C 0080102D */ daddu $v0, $a0, $zero @@ -19,7 +19,7 @@ glabel func_80219C50_4B2E40 /* 4B2E74 80219C84 24040201 */ addiu $a0, $zero, 0x201 /* 4B2E78 80219C88 0040202D */ daddu $a0, $v0, $zero /* 4B2E7C 80219C8C 10800004 */ beqz $a0, .L80219CA0 -/* 4B2E80 80219C90 00000000 */ nop +/* 4B2E80 80219C90 00000000 */ nop /* 4B2E84 80219C94 8C82008C */ lw $v0, 0x8c($a0) /* 4B2E88 80219C98 10500011 */ beq $v0, $s0, .L80219CE0 /* 4B2E8C 80219C9C 0080102D */ daddu $v0, $a0, $zero @@ -28,7 +28,7 @@ glabel func_80219C50_4B2E40 /* 4B2E94 80219CA4 24040202 */ addiu $a0, $zero, 0x202 /* 4B2E98 80219CA8 0040202D */ daddu $a0, $v0, $zero /* 4B2E9C 80219CAC 10800004 */ beqz $a0, .L80219CC0 -/* 4B2EA0 80219CB0 00000000 */ nop +/* 4B2EA0 80219CB0 00000000 */ nop /* 4B2EA4 80219CB4 8C82008C */ lw $v0, 0x8c($a0) /* 4B2EA8 80219CB8 10500009 */ beq $v0, $s0, .L80219CE0 /* 4B2EAC 80219CBC 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/battle/area_trd_part_2/4B2D10/func_80219CF0_4B2EE0.s b/asm/nonmatchings/battle/area_trd_part_2/4B2D10/func_80219CF0_4B2EE0.s index ebc0840360..8043f2849b 100644 --- a/asm/nonmatchings/battle/area_trd_part_2/4B2D10/func_80219CF0_4B2EE0.s +++ b/asm/nonmatchings/battle/area_trd_part_2/4B2D10/func_80219CF0_4B2EE0.s @@ -125,7 +125,7 @@ glabel func_80219CF0_4B2EE0 /* 4B30A0 80219EB0 C4A20000 */ lwc1 $f2, ($a1) /* 4B30A4 80219EB4 C4600000 */ lwc1 $f0, ($v1) /* 4B30A8 80219EB8 4600103C */ c.lt.s $f2, $f0 -/* 4B30AC 80219EBC 00000000 */ nop +/* 4B30AC 80219EBC 00000000 */ nop /* 4B30B0 80219EC0 45000013 */ bc1f .L80219F10 /* 4B30B4 80219EC4 24C60001 */ addiu $a2, $a2, 1 /* 4B30B8 80219EC8 8CAA0000 */ lw $t2, ($a1) @@ -158,7 +158,7 @@ glabel func_80219CF0_4B2EE0 .L80219F2C: /* 4B311C 80219F2C 8E440148 */ lw $a0, 0x148($s2) /* 4B3120 80219F30 0C09A75B */ jal get_actor -/* 4B3124 80219F34 00000000 */ nop +/* 4B3124 80219F34 00000000 */ nop /* 4B3128 80219F38 24040003 */ addiu $a0, $zero, 3 /* 4B312C 80219F3C 8C43008C */ lw $v1, 0x8c($v0) /* 4B3130 80219F40 12240034 */ beq $s1, $a0, .L8021A014 @@ -166,22 +166,22 @@ glabel func_80219CF0_4B2EE0 /* 4B3138 80219F48 10400005 */ beqz $v0, .L80219F60 /* 4B313C 80219F4C 24020002 */ addiu $v0, $zero, 2 /* 4B3140 80219F50 12220008 */ beq $s1, $v0, .L80219F74 -/* 4B3144 80219F54 00000000 */ nop +/* 4B3144 80219F54 00000000 */ nop /* 4B3148 80219F58 0808689B */ j .L8021A26C -/* 4B314C 80219F5C 00000000 */ nop +/* 4B314C 80219F5C 00000000 */ nop .L80219F60: /* 4B3150 80219F60 24020004 */ addiu $v0, $zero, 4 /* 4B3154 80219F64 1222006B */ beq $s1, $v0, .L8021A114 -/* 4B3158 80219F68 00000000 */ nop +/* 4B3158 80219F68 00000000 */ nop /* 4B315C 80219F6C 0808689B */ j .L8021A26C -/* 4B3160 80219F70 00000000 */ nop +/* 4B3160 80219F70 00000000 */ nop .L80219F74: /* 4B3164 80219F74 10640005 */ beq $v1, $a0, .L80219F8C /* 4B3168 80219F78 24020006 */ addiu $v0, $zero, 6 /* 4B316C 80219F7C 10620014 */ beq $v1, $v0, .L80219FD0 -/* 4B3170 80219F80 00000000 */ nop +/* 4B3170 80219F80 00000000 */ nop /* 4B3174 80219F84 0808689B */ j .L8021A26C -/* 4B3178 80219F88 00000000 */ nop +/* 4B3178 80219F88 00000000 */ nop .L80219F8C: /* 4B317C 80219F8C 8E050000 */ lw $a1, ($s0) /* 4B3180 80219F90 26100004 */ addiu $s0, $s0, 4 @@ -225,14 +225,14 @@ glabel func_80219CF0_4B2EE0 /* 4B3210 8021A020 10400005 */ beqz $v0, .L8021A038 /* 4B3214 8021A024 24020006 */ addiu $v0, $zero, 6 /* 4B3218 8021A028 10640007 */ beq $v1, $a0, .L8021A048 -/* 4B321C 8021A02C 00000000 */ nop +/* 4B321C 8021A02C 00000000 */ nop /* 4B3220 8021A030 0808689B */ j .L8021A26C -/* 4B3224 8021A034 00000000 */ nop +/* 4B3224 8021A034 00000000 */ nop .L8021A038: /* 4B3228 8021A038 10620025 */ beq $v1, $v0, .L8021A0D0 -/* 4B322C 8021A03C 00000000 */ nop +/* 4B322C 8021A03C 00000000 */ nop /* 4B3230 8021A040 0808689B */ j .L8021A26C -/* 4B3234 8021A044 00000000 */ nop +/* 4B3234 8021A044 00000000 */ nop .L8021A048: /* 4B3238 8021A048 8E050000 */ lw $a1, ($s0) /* 4B323C 8021A04C 26100004 */ addiu $s0, $s0, 4 @@ -293,16 +293,16 @@ glabel func_80219CF0_4B2EE0 /* 4B330C 8021A11C 10400005 */ beqz $v0, .L8021A134 /* 4B3310 8021A120 24020005 */ addiu $v0, $zero, 5 /* 4B3314 8021A124 10640009 */ beq $v1, $a0, .L8021A14C -/* 4B3318 8021A128 00000000 */ nop +/* 4B3318 8021A128 00000000 */ nop /* 4B331C 8021A12C 0808689B */ j .L8021A26C -/* 4B3320 8021A130 00000000 */ nop +/* 4B3320 8021A130 00000000 */ nop .L8021A134: /* 4B3324 8021A134 10620027 */ beq $v1, $v0, .L8021A1D4 /* 4B3328 8021A138 24020006 */ addiu $v0, $zero, 6 /* 4B332C 8021A13C 10620036 */ beq $v1, $v0, .L8021A218 -/* 4B3330 8021A140 00000000 */ nop +/* 4B3330 8021A140 00000000 */ nop /* 4B3334 8021A144 0808689B */ j .L8021A26C -/* 4B3338 8021A148 00000000 */ nop +/* 4B3338 8021A148 00000000 */ nop .L8021A14C: /* 4B333C 8021A14C 8E050000 */ lw $a1, ($s0) /* 4B3340 8021A150 26100004 */ addiu $s0, $s0, 4 @@ -379,7 +379,7 @@ glabel func_80219CF0_4B2EE0 /* 4B344C 8021A25C 4600010D */ trunc.w.s $f4, $f0 /* 4B3450 8021A260 44062000 */ mfc1 $a2, $f4 /* 4B3454 8021A264 0C0B2026 */ jal set_variable -/* 4B3458 8021A268 00000000 */ nop +/* 4B3458 8021A268 00000000 */ nop .L8021A26C: /* 4B345C 8021A26C 8FBF005C */ lw $ra, 0x5c($sp) /* 4B3460 8021A270 8FB20058 */ lw $s2, 0x58($sp) diff --git a/asm/nonmatchings/battle/area_trd_part_2/4B2D10/func_8021A288_4B3478.s b/asm/nonmatchings/battle/area_trd_part_2/4B2D10/func_8021A288_4B3478.s index 7f174b5168..21a4e2ebf8 100644 --- a/asm/nonmatchings/battle/area_trd_part_2/4B2D10/func_8021A288_4B3478.s +++ b/asm/nonmatchings/battle/area_trd_part_2/4B2D10/func_8021A288_4B3478.s @@ -21,6 +21,6 @@ glabel func_8021A288_4B3478 /* 4B34B8 8021A2C8 24020002 */ addiu $v0, $zero, 2 /* 4B34BC 8021A2CC 03E00008 */ jr $ra /* 4B34C0 8021A2D0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 4B34C4 8021A2D4 00000000 */ nop -/* 4B34C8 8021A2D8 00000000 */ nop -/* 4B34CC 8021A2DC 00000000 */ nop +/* 4B34C4 8021A2D4 00000000 */ nop +/* 4B34C8 8021A2D8 00000000 */ nop +/* 4B34CC 8021A2DC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_trd_part_2/4B34D0/func_8021A2E0_4B34D0.s b/asm/nonmatchings/battle/area_trd_part_2/4B34D0/func_8021A2E0_4B34D0.s index dda93d9b37..a7a11457af 100644 --- a/asm/nonmatchings/battle/area_trd_part_2/4B34D0/func_8021A2E0_4B34D0.s +++ b/asm/nonmatchings/battle/area_trd_part_2/4B34D0/func_8021A2E0_4B34D0.s @@ -21,7 +21,7 @@ glabel func_8021A2E0_4B34D0 /* 4B3510 8021A320 0C0B1EAF */ jal get_variable /* 4B3514 8021A324 26100004 */ addiu $s0, $s0, 4 /* 4B3518 8021A328 44820000 */ mtc1 $v0, $f0 -/* 4B351C 8021A32C 00000000 */ nop +/* 4B351C 8021A32C 00000000 */ nop /* 4B3520 8021A330 46800021 */ cvt.d.w $f0, $f0 /* 4B3524 8021A334 8E110000 */ lw $s1, ($s0) /* 4B3528 8021A338 26100004 */ addiu $s0, $s0, 4 @@ -35,7 +35,7 @@ glabel func_8021A2E0_4B34D0 /* 4B3548 8021A358 46220003 */ div.d $f0, $f0, $f2 /* 4B354C 8021A35C 462007A0 */ cvt.s.d $f30, $f0 /* 4B3550 8021A360 4614F502 */ mul.s $f20, $f30, $f20 -/* 4B3554 8021A364 00000000 */ nop +/* 4B3554 8021A364 00000000 */ nop /* 4B3558 8021A368 26100004 */ addiu $s0, $s0, 4 /* 4B355C 8021A36C 8E120000 */ lw $s2, ($s0) /* 4B3560 8021A370 3C0143B4 */ lui $at, 0x43b4 @@ -46,28 +46,28 @@ glabel func_8021A2E0_4B34D0 /* 4B3574 8021A384 4600A306 */ mov.s $f12, $f20 /* 4B3578 8021A388 3C014100 */ lui $at, 0x4100 /* 4B357C 8021A38C 44816000 */ mtc1 $at, $f12 -/* 4B3580 8021A390 00000000 */ nop +/* 4B3580 8021A390 00000000 */ nop /* 4B3584 8021A394 460CA302 */ mul.s $f12, $f20, $f12 -/* 4B3588 8021A398 00000000 */ nop +/* 4B3588 8021A398 00000000 */ nop /* 4B358C 8021A39C 3C014316 */ lui $at, 0x4316 /* 4B3590 8021A3A0 4481E000 */ mtc1 $at, $f28 -/* 4B3594 8021A3A4 00000000 */ nop +/* 4B3594 8021A3A4 00000000 */ nop /* 4B3598 8021A3A8 461C0582 */ mul.s $f22, $f0, $f28 -/* 4B359C 8021A3AC 00000000 */ nop +/* 4B359C 8021A3AC 00000000 */ nop /* 4B35A0 8021A3B0 4480D000 */ mtc1 $zero, $f26 /* 4B35A4 8021A3B4 0C00A85B */ jal sin_rad /* 4B35A8 8021A3B8 461AB580 */ add.s $f22, $f22, $f26 /* 4B35AC 8021A3BC 3C014120 */ lui $at, 0x4120 /* 4B35B0 8021A3C0 44811000 */ mtc1 $at, $f2 -/* 4B35B4 8021A3C4 00000000 */ nop +/* 4B35B4 8021A3C4 00000000 */ nop /* 4B35B8 8021A3C8 46020602 */ mul.s $f24, $f0, $f2 -/* 4B35BC 8021A3CC 00000000 */ nop +/* 4B35BC 8021A3CC 00000000 */ nop /* 4B35C0 8021A3D0 4600A306 */ mov.s $f12, $f20 /* 4B35C4 8021A3D4 0C00A874 */ jal cos_rad /* 4B35C8 8021A3D8 461AC600 */ add.s $f24, $f24, $f26 /* 4B35CC 8021A3DC 0280202D */ daddu $a0, $s4, $zero /* 4B35D0 8021A3E0 461C0502 */ mul.s $f20, $f0, $f28 -/* 4B35D4 8021A3E4 00000000 */ nop +/* 4B35D4 8021A3E4 00000000 */ nop /* 4B35D8 8021A3E8 0220282D */ daddu $a1, $s1, $zero /* 4B35DC 8021A3EC 4406B000 */ mfc1 $a2, $f22 /* 4B35E0 8021A3F0 3C0141A0 */ lui $at, 0x41a0 @@ -87,34 +87,34 @@ glabel func_8021A2E0_4B34D0 /* 4B3618 8021A428 0240282D */ daddu $a1, $s2, $zero /* 4B361C 8021A42C 3C0142B4 */ lui $at, 0x42b4 /* 4B3620 8021A430 44810000 */ mtc1 $at, $f0 -/* 4B3624 8021A434 00000000 */ nop +/* 4B3624 8021A434 00000000 */ nop /* 4B3628 8021A438 461E003C */ c.lt.s $f0, $f30 -/* 4B362C 8021A43C 00000000 */ nop +/* 4B362C 8021A43C 00000000 */ nop /* 4B3630 8021A440 4500000B */ bc1f .L8021A470 /* 4B3634 8021A444 0000302D */ daddu $a2, $zero, $zero /* 4B3638 8021A448 3C014387 */ lui $at, 0x4387 /* 4B363C 8021A44C 44810000 */ mtc1 $at, $f0 -/* 4B3640 8021A450 00000000 */ nop +/* 4B3640 8021A450 00000000 */ nop /* 4B3644 8021A454 4600F03C */ c.lt.s $f30, $f0 -/* 4B3648 8021A458 00000000 */ nop +/* 4B3648 8021A458 00000000 */ nop /* 4B364C 8021A45C 45030001 */ bc1tl .L8021A464 /* 4B3650 8021A460 240600B4 */ addiu $a2, $zero, 0xb4 .L8021A464: /* 4B3654 8021A464 3C0142B4 */ lui $at, 0x42b4 /* 4B3658 8021A468 44810000 */ mtc1 $at, $f0 -/* 4B365C 8021A46C 00000000 */ nop +/* 4B365C 8021A46C 00000000 */ nop .L8021A470: /* 4B3660 8021A470 461E0001 */ sub.s $f0, $f0, $f30 /* 4B3664 8021A474 46000005 */ abs.s $f0, $f0 /* 4B3668 8021A478 4600010D */ trunc.w.s $f4, $f0 /* 4B366C 8021A47C 44022000 */ mfc1 $v0, $f4 -/* 4B3670 8021A480 00000000 */ nop +/* 4B3670 8021A480 00000000 */ nop /* 4B3674 8021A484 2842002D */ slti $v0, $v0, 0x2d /* 4B3678 8021A488 10400008 */ beqz $v0, .L8021A4AC -/* 4B367C 8021A48C 00000000 */ nop +/* 4B367C 8021A48C 00000000 */ nop /* 4B3680 8021A490 3C014234 */ lui $at, 0x4234 /* 4B3684 8021A494 44810000 */ mtc1 $at, $f0 -/* 4B3688 8021A498 00000000 */ nop +/* 4B3688 8021A498 00000000 */ nop /* 4B368C 8021A49C 4600F001 */ sub.s $f0, $f30, $f0 /* 4B3690 8021A4A0 46000000 */ add.s $f0, $f0, $f0 /* 4B3694 8021A4A4 4600010D */ trunc.w.s $f4, $f0 @@ -122,23 +122,23 @@ glabel func_8021A2E0_4B34D0 .L8021A4AC: /* 4B369C 8021A4AC 3C014387 */ lui $at, 0x4387 /* 4B36A0 8021A4B0 44810000 */ mtc1 $at, $f0 -/* 4B36A4 8021A4B4 00000000 */ nop +/* 4B36A4 8021A4B4 00000000 */ nop /* 4B36A8 8021A4B8 461E0001 */ sub.s $f0, $f0, $f30 /* 4B36AC 8021A4BC 46000005 */ abs.s $f0, $f0 /* 4B36B0 8021A4C0 4600010D */ trunc.w.s $f4, $f0 /* 4B36B4 8021A4C4 44022000 */ mfc1 $v0, $f4 -/* 4B36B8 8021A4C8 00000000 */ nop +/* 4B36B8 8021A4C8 00000000 */ nop /* 4B36BC 8021A4CC 2842002D */ slti $v0, $v0, 0x2d /* 4B36C0 8021A4D0 1040000C */ beqz $v0, .L8021A504 /* 4B36C4 8021A4D4 0280202D */ daddu $a0, $s4, $zero /* 4B36C8 8021A4D8 3C014361 */ lui $at, 0x4361 /* 4B36CC 8021A4DC 44810000 */ mtc1 $at, $f0 -/* 4B36D0 8021A4E0 00000000 */ nop +/* 4B36D0 8021A4E0 00000000 */ nop /* 4B36D4 8021A4E4 4600F001 */ sub.s $f0, $f30, $f0 /* 4B36D8 8021A4E8 46000000 */ add.s $f0, $f0, $f0 /* 4B36DC 8021A4EC 3C014334 */ lui $at, 0x4334 /* 4B36E0 8021A4F0 44811000 */ mtc1 $at, $f2 -/* 4B36E4 8021A4F4 00000000 */ nop +/* 4B36E4 8021A4F4 00000000 */ nop /* 4B36E8 8021A4F8 46020000 */ add.s $f0, $f0, $f2 /* 4B36EC 8021A4FC 4600010D */ trunc.w.s $f4, $f0 /* 4B36F0 8021A500 44062000 */ mfc1 $a2, $f4 @@ -160,5 +160,5 @@ glabel func_8021A2E0_4B34D0 /* 4B372C 8021A53C 24020002 */ addiu $v0, $zero, 2 /* 4B3730 8021A540 03E00008 */ jr $ra /* 4B3734 8021A544 27BD0058 */ addiu $sp, $sp, 0x58 -/* 4B3738 8021A548 00000000 */ nop -/* 4B373C 8021A54C 00000000 */ nop +/* 4B3738 8021A548 00000000 */ nop +/* 4B373C 8021A54C 00000000 */ nop diff --git a/asm/nonmatchings/code_1000_len_60/entry_point.s b/asm/nonmatchings/code_1000_len_60/entry_point.s index cbca179419..14ecb65611 100644 --- a/asm/nonmatchings/code_1000_len_60/entry_point.s +++ b/asm/nonmatchings/code_1000_len_60/entry_point.s @@ -12,18 +12,18 @@ glabel entry_point /* 1018 80025C18 21080008 */ addi $t0, $t0, 8 /* 101C 80025C1C 2129FFF8 */ addi $t1, $t1, -8 /* 1020 80025C20 1520FFFB */ bnez $t1, .L80025C10 -/* 1024 80025C24 00000000 */ nop +/* 1024 80025C24 00000000 */ nop /* 1028 80025C28 3C1D800B */ lui $sp, %hi(D_800B6590) /* 102C 80025C2C 27BD6590 */ addiu $sp, $sp, %lo(D_800B6590) -/* 1030 80025C30 3C0A8006 */ lui $t2, %hi(nuBoot) -/* 1034 80025C34 254AE8B0 */ addiu $t2, $t2, %lo(nuBoot) +/* 1030 80025C30 3C0A8006 */ lui $t2, %hi(jtbl_8005E8B0_39CB0) +/* 1034 80025C34 254AE8B0 */ addiu $t2, $t2, %lo(jtbl_8005E8B0_39CB0) /* 1038 80025C38 01400008 */ jr $t2 -/* 103C 80025C3C 00000000 */ nop -/* 1040 80025C40 00000000 */ nop -/* 1044 80025C44 00000000 */ nop -/* 1048 80025C48 00000000 */ nop -/* 104C 80025C4C 00000000 */ nop -/* 1050 80025C50 00000000 */ nop -/* 1054 80025C54 00000000 */ nop -/* 1058 80025C58 00000000 */ nop -/* 105C 80025C5C 00000000 */ nop +/* 103C 80025C3C 00000000 */ nop +/* 1040 80025C40 00000000 */ nop +/* 1044 80025C44 00000000 */ nop +/* 1048 80025C48 00000000 */ nop +/* 104C 80025C4C 00000000 */ nop +/* 1050 80025C50 00000000 */ nop +/* 1054 80025C54 00000000 */ nop +/* 1058 80025C58 00000000 */ nop +/* 105C 80025C5C 00000000 */ nop diff --git a/asm/nonmatchings/code_101b90_len_8f0/func_802DEAA0.s b/asm/nonmatchings/code_101b90_len_8f0/func_802DEAA0.s index dd19755591..243a3f98a7 100644 --- a/asm/nonmatchings/code_101b90_len_8f0/func_802DEAA0.s +++ b/asm/nonmatchings/code_101b90_len_8f0/func_802DEAA0.s @@ -32,4 +32,4 @@ glabel func_802DEAA0 /* 101BF0 802DEB00 24C60004 */ addiu $a2, $a2, 4 .L802DEB04: /* 101BF4 802DEB04 03E00008 */ jr $ra -/* 101BF8 802DEB08 00000000 */ nop +/* 101BF8 802DEB08 00000000 */ nop diff --git a/asm/nonmatchings/code_101b90_len_8f0/func_802DEEA0.s b/asm/nonmatchings/code_101b90_len_8f0/func_802DEEA0.s index 173a6b55da..7cde840a39 100644 --- a/asm/nonmatchings/code_101b90_len_8f0/func_802DEEA0.s +++ b/asm/nonmatchings/code_101b90_len_8f0/func_802DEEA0.s @@ -19,7 +19,7 @@ glabel func_802DEEA0 .L802DEED8: /* 101FC8 802DEED8 8C620000 */ lw $v0, ($v1) /* 101FCC 802DEEDC 1040000A */ beqz $v0, .L802DEF08 -/* 101FD0 802DEEE0 00000000 */ nop +/* 101FD0 802DEEE0 00000000 */ nop /* 101FD4 802DEEE4 8C620004 */ lw $v0, 4($v1) /* 101FD8 802DEEE8 1447000A */ bne $v0, $a3, .L802DEF14 /* 101FDC 802DEEEC 24840001 */ addiu $a0, $a0, 1 @@ -71,7 +71,7 @@ glabel func_802DEEA0 /* 102080 802DEF90 30C6FFF0 */ andi $a2, $a2, 0xfff0 /* 102084 802DEF94 8E02000C */ lw $v0, 0xc($s0) /* 102088 802DEF98 080B7BE9 */ j .L802DEFA4 -/* 10208C 802DEF9C 00000000 */ nop +/* 10208C 802DEF9C 00000000 */ nop .L802DEFA0: /* 102090 802DEFA0 0000102D */ daddu $v0, $zero, $zero .L802DEFA4: diff --git a/asm/nonmatchings/code_101b90_len_8f0/func_802DEFB4.s b/asm/nonmatchings/code_101b90_len_8f0/func_802DEFB4.s index ddb839cc17..d6c73a1d8a 100644 --- a/asm/nonmatchings/code_101b90_len_8f0/func_802DEFB4.s +++ b/asm/nonmatchings/code_101b90_len_8f0/func_802DEFB4.s @@ -5,7 +5,7 @@ glabel func_802DEFB4 /* 1020A4 802DEFB4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 1020A8 802DEFB8 AFBF0010 */ sw $ra, 0x10($sp) /* 1020AC 802DEFBC 0C04E934 */ jal func_8013A4D0 -/* 1020B0 802DEFC0 00000000 */ nop +/* 1020B0 802DEFC0 00000000 */ nop /* 1020B4 802DEFC4 3C02802E */ lui $v0, %hi(D_802E0C58) /* 1020B8 802DEFC8 8C420C58 */ lw $v0, %lo(D_802E0C58)($v0) /* 1020BC 802DEFCC 1840000C */ blez $v0, .L802DF000 diff --git a/asm/nonmatchings/code_101b90_len_8f0/func_802DF00C.s b/asm/nonmatchings/code_101b90_len_8f0/func_802DF00C.s index 7eeaf8bce8..26cea7f5ac 100644 --- a/asm/nonmatchings/code_101b90_len_8f0/func_802DF00C.s +++ b/asm/nonmatchings/code_101b90_len_8f0/func_802DF00C.s @@ -46,7 +46,7 @@ glabel func_802DF00C /* 102194 802DF0A4 00621821 */ addu $v1, $v1, $v0 /* 102198 802DF0A8 00031843 */ sra $v1, $v1, 1 /* 10219C 802DF0AC 18600030 */ blez $v1, .L802DF170 -/* 1021A0 802DF0B0 00000000 */ nop +/* 1021A0 802DF0B0 00000000 */ nop /* 1021A4 802DF0B4 240B7000 */ addiu $t3, $zero, 0x7000 /* 1021A8 802DF0B8 27A90010 */ addiu $t1, $sp, 0x10 /* 1021AC 802DF0BC 240A0001 */ addiu $t2, $zero, 1 @@ -58,31 +58,31 @@ glabel func_802DF00C /* 1021C0 802DF0D0 2463FFFF */ addiu $v1, $v1, -1 /* 1021C4 802DF0D4 28824001 */ slti $v0, $a0, 0x4001 /* 1021C8 802DF0D8 1040000B */ beqz $v0, .L802DF108 -/* 1021CC 802DF0DC 00000000 */ nop +/* 1021CC 802DF0DC 00000000 */ nop /* 1021D0 802DF0E0 10910015 */ beq $a0, $s1, .L802DF138 /* 1021D4 802DF0E4 28821001 */ slti $v0, $a0, 0x1001 /* 1021D8 802DF0E8 1440001F */ bnez $v0, .L802DF168 -/* 1021DC 802DF0EC 00000000 */ nop +/* 1021DC 802DF0EC 00000000 */ nop /* 1021E0 802DF0F0 1090001D */ beq $a0, $s0, .L802DF168 -/* 1021E4 802DF0F4 00000000 */ nop +/* 1021E4 802DF0F4 00000000 */ nop /* 1021E8 802DF0F8 508F0016 */ beql $a0, $t7, .L802DF154 /* 1021EC 802DF0FC 24C60002 */ addiu $a2, $a2, 2 /* 1021F0 802DF100 080B7C5A */ j .L802DF168 -/* 1021F4 802DF104 00000000 */ nop +/* 1021F4 802DF104 00000000 */ nop .L802DF108: /* 1021F8 802DF108 108E0017 */ beq $a0, $t6, .L802DF168 /* 1021FC 802DF10C 28826001 */ slti $v0, $a0, 0x6001 /* 102200 802DF110 10400005 */ beqz $v0, .L802DF128 -/* 102204 802DF114 00000000 */ nop +/* 102204 802DF114 00000000 */ nop /* 102208 802DF118 508D0012 */ beql $a0, $t5, .L802DF164 /* 10220C 802DF11C 24C60002 */ addiu $a2, $a2, 2 /* 102210 802DF120 080B7C5A */ j .L802DF168 -/* 102214 802DF124 00000000 */ nop +/* 102214 802DF124 00000000 */ nop .L802DF128: /* 102218 802DF128 508B000E */ beql $a0, $t3, .L802DF164 /* 10221C 802DF12C 24C60002 */ addiu $a2, $a2, 2 /* 102220 802DF130 080B7C5A */ j .L802DF168 -/* 102224 802DF134 00000000 */ nop +/* 102224 802DF134 00000000 */ nop .L802DF138: /* 102228 802DF138 30E400FF */ andi $a0, $a3, 0xff /* 10222C 802DF13C 28820064 */ slti $v0, $a0, 0x64 @@ -101,7 +101,7 @@ glabel func_802DF00C /* 102254 802DF164 2463FFFF */ addiu $v1, $v1, -1 .L802DF168: /* 102258 802DF168 1C60FFD5 */ bgtz $v1, .L802DF0C0 -/* 10225C 802DF16C 00000000 */ nop +/* 10225C 802DF16C 00000000 */ nop .L802DF170: /* 102260 802DF170 8D030000 */ lw $v1, ($t0) /* 102264 802DF174 146CFFC6 */ bne $v1, $t4, .L802DF090 @@ -186,7 +186,7 @@ glabel func_802DF00C /* 102378 802DF288 26310001 */ addiu $s1, $s1, 1 /* 10237C 802DF28C 2A220064 */ slti $v0, $s1, 0x64 /* 102380 802DF290 1440FFF8 */ bnez $v0, .L802DF274 -/* 102384 802DF294 00000000 */ nop +/* 102384 802DF294 00000000 */ nop .L802DF298: /* 102388 802DF298 3C048035 */ lui $a0, %hi(D_8034F800) /* 10238C 802DF29C 2484F800 */ addiu $a0, $a0, %lo(D_8034F800) diff --git a/asm/nonmatchings/code_101b90_len_8f0/func_802DF2D8.s b/asm/nonmatchings/code_101b90_len_8f0/func_802DF2D8.s index faee0f6039..2d6c7b2a5d 100644 --- a/asm/nonmatchings/code_101b90_len_8f0/func_802DF2D8.s +++ b/asm/nonmatchings/code_101b90_len_8f0/func_802DF2D8.s @@ -22,7 +22,7 @@ glabel func_802DF2D8 /* 10240C 802DF31C 2484B800 */ addiu $a0, $a0, %lo(D_802FB800) .L802DF320: /* 102410 802DF320 0C00A41B */ jal _heap_malloc -/* 102414 802DF324 00000000 */ nop +/* 102414 802DF324 00000000 */ nop /* 102418 802DF328 0040302D */ daddu $a2, $v0, $zero /* 10241C 802DF32C 00C0282D */ daddu $a1, $a2, $zero /* 102420 802DF330 0220102D */ daddu $v0, $s1, $zero @@ -51,4 +51,4 @@ glabel func_802DF2D8 /* 102470 802DF380 00C0102D */ daddu $v0, $a2, $zero /* 102474 802DF384 03E00008 */ jr $ra /* 102478 802DF388 27BD0020 */ addiu $sp, $sp, 0x20 -/* 10247C 802DF38C 00000000 */ nop +/* 10247C 802DF38C 00000000 */ nop diff --git a/asm/nonmatchings/code_101b90_len_8f0/load_sprite.s b/asm/nonmatchings/code_101b90_len_8f0/load_sprite.s index 67c196c00b..d4ca9a589b 100644 --- a/asm/nonmatchings/code_101b90_len_8f0/load_sprite.s +++ b/asm/nonmatchings/code_101b90_len_8f0/load_sprite.s @@ -50,7 +50,7 @@ glabel load_sprite /* 101CA8 802DEBB8 3C048035 */ lui $a0, %hi(D_8034F800) /* 101CAC 802DEBBC 2484F800 */ addiu $a0, $a0, %lo(D_8034F800) /* 101CB0 802DEBC0 0C00A459 */ jal _heap_malloc_tail -/* 101CB4 802DEBC4 00000000 */ nop +/* 101CB4 802DEBC4 00000000 */ nop /* 101CB8 802DEBC8 080B7AFA */ j .L802DEBE8 /* 101CBC 802DEBCC 0040882D */ daddu $s1, $v0, $zero .L802DEBD0: @@ -58,7 +58,7 @@ glabel load_sprite /* 101CC4 802DEBD4 3C048035 */ lui $a0, %hi(D_8034F800) /* 101CC8 802DEBD8 2484F800 */ addiu $a0, $a0, %lo(D_8034F800) /* 101CCC 802DEBDC 0C00A41B */ jal _heap_malloc -/* 101CD0 802DEBE0 00000000 */ nop +/* 101CD0 802DEBE0 00000000 */ nop /* 101CD4 802DEBE4 0040882D */ daddu $s1, $v0, $zero .L802DEBE8: /* 101CD8 802DEBE8 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/code_102610_len_2330/create_shadow_callback.s b/asm/nonmatchings/code_102610_len_2330/create_shadow_callback.s index d730056229..bd2b09445a 100644 --- a/asm/nonmatchings/code_102610_len_2330/create_shadow_callback.s +++ b/asm/nonmatchings/code_102610_len_2330/create_shadow_callback.s @@ -5,7 +5,7 @@ glabel create_shadow_callback /* 102610 802E0D90 3C013DCC */ lui $at, 0x3dcc /* 102614 802E0D94 3421CCCD */ ori $at, $at, 0xcccd /* 102618 802E0D98 44810000 */ mtc1 $at, $f0 -/* 10261C 802E0D9C 00000000 */ nop +/* 10261C 802E0D9C 00000000 */ nop /* 102620 802E0DA0 E480001C */ swc1 $f0, 0x1c($a0) /* 102624 802E0DA4 E4800020 */ swc1 $f0, 0x20($a0) /* 102628 802E0DA8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_102610_len_2330/entity_init_BlueSwitch.s b/asm/nonmatchings/code_102610_len_2330/entity_init_BlueSwitch.s index 412e9d7d4d..e57c0616db 100644 --- a/asm/nonmatchings/code_102610_len_2330/entity_init_BlueSwitch.s +++ b/asm/nonmatchings/code_102610_len_2330/entity_init_BlueSwitch.s @@ -17,14 +17,14 @@ glabel entity_init_BlueSwitch /* 103C30 802E23B0 3C01802F */ lui $at, %hi(D_802EB3A0) /* 103C34 802E23B4 AC30B3A0 */ sw $s0, %lo(D_802EB3A0)($at) /* 103C38 802E23B8 080B88FD */ j .L802E23F4 -/* 103C3C 802E23BC 00000000 */ nop +/* 103C3C 802E23BC 00000000 */ nop .L802E23C0: /* 103C40 802E23C0 1462000A */ bne $v1, $v0, .L802E23EC -/* 103C44 802E23C4 00000000 */ nop +/* 103C44 802E23C4 00000000 */ nop /* 103C48 802E23C8 3C02802F */ lui $v0, %hi(D_802EB3A0) /* 103C4C 802E23CC 8C42B3A0 */ lw $v0, %lo(D_802EB3A0)($v0) /* 103C50 802E23D0 10400008 */ beqz $v0, .L802E23F4 -/* 103C54 802E23D4 00000000 */ nop +/* 103C54 802E23D4 00000000 */ nop /* 103C58 802E23D8 AE220028 */ sw $v0, 0x28($s1) /* 103C5C 802E23DC 8E020000 */ lw $v0, ($s0) /* 103C60 802E23E0 34420001 */ ori $v0, $v0, 1 diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E0DB0.s b/asm/nonmatchings/code_102610_len_2330/func_802E0DB0.s index ac416f74d2..7942e8d633 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E0DB0.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E0DB0.s @@ -14,4 +14,4 @@ glabel func_802E0DB0 /* 102654 802E0DD4 0000102D */ daddu $v0, $zero, $zero .L802E0DD8: /* 102658 802E0DD8 03E00008 */ jr $ra -/* 10265C 802E0DDC 00000000 */ nop +/* 10265C 802E0DDC 00000000 */ nop diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E0DE0.s b/asm/nonmatchings/code_102610_len_2330/func_802E0DE0.s index 4d0d02c248..2060e46a0a 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E0DE0.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E0DE0.s @@ -53,7 +53,7 @@ glabel func_802E0DE0 /* 102720 802E0EA0 86420004 */ lh $v0, 4($s2) /* 102724 802E0EA4 44061000 */ mfc1 $a2, $f2 /* 102728 802E0EA8 44822000 */ mtc1 $v0, $f4 -/* 10272C 802E0EAC 00000000 */ nop +/* 10272C 802E0EAC 00000000 */ nop /* 102730 802E0EB0 46802120 */ cvt.s.w $f4, $f4 /* 102734 802E0EB4 44052000 */ mfc1 $a1, $f4 /* 102738 802E0EB8 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E10F4.s b/asm/nonmatchings/code_102610_len_2330/func_802E10F4.s index d3488dd740..e9495f3ac3 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E10F4.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E10F4.s @@ -11,7 +11,7 @@ glabel func_802E10F4 /* 10298C 802E110C 86020004 */ lh $v0, 4($s0) /* 102990 802E1110 24420006 */ addiu $v0, $v0, 6 /* 102994 802E1114 44826000 */ mtc1 $v0, $f12 -/* 102998 802E1118 00000000 */ nop +/* 102998 802E1118 00000000 */ nop /* 10299C 802E111C 0C00A6C9 */ jal clamp_angle /* 1029A0 802E1120 46806320 */ cvt.s.w $f12, $f12 /* 1029A4 802E1124 4600008D */ trunc.w.s $f2, $f0 diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E114C.s b/asm/nonmatchings/code_102610_len_2330/func_802E114C.s index 12a4fa9a70..0e73d5f4b5 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E114C.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E114C.s @@ -7,7 +7,7 @@ glabel func_802E114C /* 1029D4 802E1154 0C009C22 */ jal func_80027088 /* 1029D8 802E1158 24040001 */ addiu $a0, $zero, 1 /* 1029DC 802E115C 0C03805E */ jal disable_player_input -/* 1029E0 802E1160 00000000 */ nop +/* 1029E0 802E1160 00000000 */ nop /* 1029E4 802E1164 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 1029E8 802E1168 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* 1029EC 802E116C AC400054 */ sw $zero, 0x54($v0) diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E117C.s b/asm/nonmatchings/code_102610_len_2330/func_802E117C.s index e16680b335..3157c53805 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E117C.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E117C.s @@ -7,7 +7,7 @@ glabel func_802E117C /* 102A04 802E1184 0C009C22 */ jal func_80027088 /* 102A08 802E1188 0000202D */ daddu $a0, $zero, $zero /* 102A0C 802E118C 0C038069 */ jal enable_player_input -/* 102A10 802E1190 00000000 */ nop +/* 102A10 802E1190 00000000 */ nop /* 102A14 802E1194 8FBF0010 */ lw $ra, 0x10($sp) /* 102A18 802E1198 03E00008 */ jr $ra /* 102A1C 802E119C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E1204.s b/asm/nonmatchings/code_102610_len_2330/func_802E1204.s index c2858bdc0a..dca5976d4a 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E1204.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E1204.s @@ -10,7 +10,7 @@ glabel func_802E1204 /* 102A98 802E1218 0C05152F */ jal get_global_flag /* 102A9C 802E121C 34845BDF */ ori $a0, $a0, 0x5bdf /* 102AA0 802E1220 1440000B */ bnez $v0, .L802E1250 -/* 102AA4 802E1224 00000000 */ nop +/* 102AA4 802E1224 00000000 */ nop /* 102AA8 802E1228 3C05802F */ lui $a1, %hi(D_802EB390) /* 102AAC 802E122C 24A5B390 */ addiu $a1, $a1, %lo(D_802EB390) /* 102AB0 802E1230 ACA00000 */ sw $zero, ($a1) @@ -20,7 +20,7 @@ glabel func_802E1204 /* 102AC0 802E1240 0C051514 */ jal set_global_flag /* 102AC4 802E1244 34845BDF */ ori $a0, $a0, 0x5bdf /* 102AC8 802E1248 080B8498 */ j .L802E1260 -/* 102ACC 802E124C 00000000 */ nop +/* 102ACC 802E124C 00000000 */ nop .L802E1250: /* 102AD0 802E1250 0C043F5A */ jal func_8010FD68 /* 102AD4 802E1254 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E1270.s b/asm/nonmatchings/code_102610_len_2330/func_802E1270.s index ddc89efafa..8b73896643 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E1270.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E1270.s @@ -8,7 +8,7 @@ glabel func_802E1270 /* 102AFC 802E127C 10400003 */ beqz $v0, .L802E128C /* 102B00 802E1280 AFBF0010 */ sw $ra, 0x10($sp) /* 102B04 802E1284 0C043F5A */ jal func_8010FD68 -/* 102B08 802E1288 00000000 */ nop +/* 102B08 802E1288 00000000 */ nop .L802E128C: /* 102B0C 802E128C 8FBF0010 */ lw $ra, 0x10($sp) /* 102B10 802E1290 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E1328.s b/asm/nonmatchings/code_102610_len_2330/func_802E1328.s index be19e34b09..53e9e45649 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E1328.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E1328.s @@ -8,7 +8,7 @@ glabel func_802E1328 /* 102BB4 802E1334 10400003 */ beqz $v0, .L802E1344 /* 102BB8 802E1338 AFBF0010 */ sw $ra, 0x10($sp) /* 102BBC 802E133C 0C043F5A */ jal func_8010FD68 -/* 102BC0 802E1340 00000000 */ nop +/* 102BC0 802E1340 00000000 */ nop .L802E1344: /* 102BC4 802E1344 8FBF0010 */ lw $ra, 0x10($sp) /* 102BC8 802E1348 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E1350.s b/asm/nonmatchings/code_102610_len_2330/func_802E1350.s index 51c3de43d6..a8ad20ff3b 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E1350.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E1350.s @@ -12,21 +12,21 @@ glabel func_802E1350 /* 102BEC 802E136C 904304E8 */ lbu $v1, 0x4e8($v0) /* 102BF0 802E1370 24020001 */ addiu $v0, $zero, 1 /* 102BF4 802E1374 14620007 */ bne $v1, $v0, .L802E1394 -/* 102BF8 802E1378 00000000 */ nop +/* 102BF8 802E1378 00000000 */ nop /* 102BFC 802E137C 3C05802F */ lui $a1, %hi(D_802E99DC) /* 102C00 802E1380 24A599DC */ addiu $a1, $a1, %lo(D_802E99DC) /* 102C04 802E1384 0C043EF0 */ jal func_8010FBC0 -/* 102C08 802E1388 00000000 */ nop +/* 102C08 802E1388 00000000 */ nop /* 102C0C 802E138C 080B84E7 */ j .L802E139C -/* 102C10 802E1390 00000000 */ nop +/* 102C10 802E1390 00000000 */ nop .L802E1394: /* 102C14 802E1394 0C043F5A */ jal func_8010FD68 -/* 102C18 802E1398 00000000 */ nop +/* 102C18 802E1398 00000000 */ nop .L802E139C: /* 102C1C 802E139C 3C04802F */ lui $a0, %hi(D_802EB39C) /* 102C20 802E13A0 8C84B39C */ lw $a0, %lo(D_802EB39C)($a0) /* 102C24 802E13A4 0C04971C */ jal close_message -/* 102C28 802E13A8 00000000 */ nop +/* 102C28 802E13A8 00000000 */ nop .L802E13AC: /* 102C2C 802E13AC 8FBF0010 */ lw $ra, 0x10($sp) /* 102C30 802E13B0 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E13B8.s b/asm/nonmatchings/code_102610_len_2330/func_802E13B8.s index b2ae151b88..c8680b4091 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E13B8.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E13B8.s @@ -19,4 +19,4 @@ glabel func_802E13B8 /* 102C70 802E13F0 8FB00010 */ lw $s0, 0x10($sp) /* 102C74 802E13F4 03E00008 */ jr $ra /* 102C78 802E13F8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 102C7C 802E13FC 00000000 */ nop +/* 102C7C 802E13FC 00000000 */ nop diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E1400.s b/asm/nonmatchings/code_102610_len_2330/func_802E1400.s index a9d5b6e35a..595763abe1 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E1400.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E1400.s @@ -9,7 +9,7 @@ glabel func_802E1400 /* 102C90 802E1410 8C900040 */ lw $s0, 0x40($a0) /* 102C94 802E1414 30420001 */ andi $v0, $v0, 1 /* 102C98 802E1418 1040000D */ beqz $v0, .L802E1450 -/* 102C9C 802E141C 00000000 */ nop +/* 102C9C 802E141C 00000000 */ nop /* 102CA0 802E1420 3C028011 */ lui $v0, %hi(gPlayerStatus) /* 102CA4 802E1424 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) /* 102CA8 802E1428 804300B4 */ lb $v1, 0xb4($v0) @@ -17,10 +17,10 @@ glabel func_802E1400 /* 102CB0 802E1430 10620003 */ beq $v1, $v0, .L802E1440 /* 102CB4 802E1434 24020010 */ addiu $v0, $zero, 0x10 /* 102CB8 802E1438 14620005 */ bne $v1, $v0, .L802E1450 -/* 102CBC 802E143C 00000000 */ nop +/* 102CBC 802E143C 00000000 */ nop .L802E1440: /* 102CC0 802E1440 0C043F5A */ jal func_8010FD68 -/* 102CC4 802E1444 00000000 */ nop +/* 102CC4 802E1444 00000000 */ nop /* 102CC8 802E1448 24020008 */ addiu $v0, $zero, 8 /* 102CCC 802E144C A6020022 */ sh $v0, 0x22($s0) .L802E1450: diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E14D8.s b/asm/nonmatchings/code_102610_len_2330/func_802E14D8.s index 128d669643..692eca97a4 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E14D8.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E14D8.s @@ -21,7 +21,7 @@ glabel func_802E14D8 /* 102D98 802E1518 E480004C */ swc1 $f0, 0x4c($a0) .L802E151C: /* 102D9C 802E151C 0C043F5A */ jal func_8010FD68 -/* 102DA0 802E1520 00000000 */ nop +/* 102DA0 802E1520 00000000 */ nop /* 102DA4 802E1524 24020008 */ addiu $v0, $zero, 8 /* 102DA8 802E1528 A6020022 */ sh $v0, 0x22($s0) .L802E152C: diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E153C.s b/asm/nonmatchings/code_102610_len_2330/func_802E153C.s index 84092a317f..b83c0fe018 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E153C.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E153C.s @@ -29,13 +29,13 @@ glabel func_802E153C /* 102E1C 802E159C C600004C */ lwc1 $f0, 0x4c($s0) /* 102E20 802E15A0 C7A4001C */ lwc1 $f4, 0x1c($sp) /* 102E24 802E15A4 46040032 */ c.eq.s $f0, $f4 -/* 102E28 802E15A8 00000000 */ nop +/* 102E28 802E15A8 00000000 */ nop /* 102E2C 802E15AC 45010014 */ bc1t .L802E1600 -/* 102E30 802E15B0 00000000 */ nop +/* 102E30 802E15B0 00000000 */ nop /* 102E34 802E15B4 4600203C */ c.lt.s $f4, $f0 -/* 102E38 802E15B8 00000000 */ nop +/* 102E38 802E15B8 00000000 */ nop /* 102E3C 802E15BC 45000010 */ bc1f .L802E1600 -/* 102E40 802E15C0 00000000 */ nop +/* 102E40 802E15C0 00000000 */ nop /* 102E44 802E15C4 C6220000 */ lwc1 $f2, ($s1) /* 102E48 802E15C8 3C013FE0 */ lui $at, 0x3fe0 /* 102E4C 802E15CC 44810800 */ mtc1 $at, $f1 @@ -47,7 +47,7 @@ glabel func_802E153C /* 102E64 802E15E4 C600004C */ lwc1 $f0, 0x4c($s0) /* 102E68 802E15E8 46020001 */ sub.s $f0, $f0, $f2 /* 102E6C 802E15EC 4604003C */ c.lt.s $f0, $f4 -/* 102E70 802E15F0 00000000 */ nop +/* 102E70 802E15F0 00000000 */ nop /* 102E74 802E15F4 45000002 */ bc1f .L802E1600 /* 102E78 802E15F8 E600004C */ swc1 $f0, 0x4c($s0) /* 102E7C 802E15FC E604004C */ swc1 $f4, 0x4c($s0) diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E1614.s b/asm/nonmatchings/code_102610_len_2330/func_802E1614.s index 7f31df639b..6516709140 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E1614.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E1614.s @@ -7,7 +7,7 @@ glabel func_802E1614 /* 102E9C 802E161C 90820006 */ lbu $v0, 6($a0) /* 102EA0 802E1620 30420001 */ andi $v0, $v0, 1 /* 102EA4 802E1624 1040000B */ beqz $v0, .L802E1654 -/* 102EA8 802E1628 00000000 */ nop +/* 102EA8 802E1628 00000000 */ nop /* 102EAC 802E162C 3C028011 */ lui $v0, %hi(gPlayerStatus) /* 102EB0 802E1630 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) /* 102EB4 802E1634 804300B4 */ lb $v1, 0xb4($v0) @@ -15,10 +15,10 @@ glabel func_802E1614 /* 102EBC 802E163C 10620003 */ beq $v1, $v0, .L802E164C /* 102EC0 802E1640 24020010 */ addiu $v0, $zero, 0x10 /* 102EC4 802E1644 14620003 */ bne $v1, $v0, .L802E1654 -/* 102EC8 802E1648 00000000 */ nop +/* 102EC8 802E1648 00000000 */ nop .L802E164C: /* 102ECC 802E164C 0C043F5A */ jal func_8010FD68 -/* 102ED0 802E1650 00000000 */ nop +/* 102ED0 802E1650 00000000 */ nop .L802E1654: /* 102ED4 802E1654 8FBF0010 */ lw $ra, 0x10($sp) /* 102ED8 802E1658 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E1660.s b/asm/nonmatchings/code_102610_len_2330/func_802E1660.s index 080da0f3c1..7beb687c43 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E1660.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E1660.s @@ -25,9 +25,9 @@ glabel func_802E1660 /* 102F30 802E16B0 3C028011 */ lui $v0, %hi(gPlayerData+0x1) /* 102F34 802E16B4 8042F291 */ lb $v0, %lo(gPlayerData+0x1)($v0) /* 102F38 802E16B8 0440001A */ bltz $v0, .L802E1724 -/* 102F3C 802E16BC 00000000 */ nop +/* 102F3C 802E16BC 00000000 */ nop /* 102F40 802E16C0 080B85C2 */ j .L802E1708 -/* 102F44 802E16C4 00000000 */ nop +/* 102F44 802E16C4 00000000 */ nop .L802E16C8: /* 102F48 802E16C8 822300B4 */ lb $v1, 0xb4($s1) /* 102F4C 802E16CC 2402000D */ addiu $v0, $zero, 0xd @@ -36,25 +36,25 @@ glabel func_802E1660 /* 102F54 802E16D4 24020004 */ addiu $v0, $zero, 4 /* 102F58 802E16D8 82430003 */ lb $v1, 3($s2) /* 102F5C 802E16DC 14620004 */ bne $v1, $v0, .L802E16F0 -/* 102F60 802E16E0 00000000 */ nop +/* 102F60 802E16E0 00000000 */ nop /* 102F64 802E16E4 82420000 */ lb $v0, ($s2) /* 102F68 802E16E8 1440000E */ bnez $v0, .L802E1724 -/* 102F6C 802E16EC 00000000 */ nop +/* 102F6C 802E16EC 00000000 */ nop .L802E16F0: /* 102F70 802E16F0 92030006 */ lbu $v1, 6($s0) /* 102F74 802E16F4 30620001 */ andi $v0, $v1, 1 /* 102F78 802E16F8 14400003 */ bnez $v0, .L802E1708 /* 102F7C 802E16FC 30620080 */ andi $v0, $v1, 0x80 /* 102F80 802E1700 10400008 */ beqz $v0, .L802E1724 -/* 102F84 802E1704 00000000 */ nop +/* 102F84 802E1704 00000000 */ nop .L802E1708: /* 102F88 802E1708 0C043F5A */ jal func_8010FD68 /* 102F8C 802E170C 0200202D */ daddu $a0, $s0, $zero /* 102F90 802E1710 8E640028 */ lw $a0, 0x28($s3) /* 102F94 802E1714 10800003 */ beqz $a0, .L802E1724 -/* 102F98 802E1718 00000000 */ nop +/* 102F98 802E1718 00000000 */ nop /* 102F9C 802E171C 0C043F5A */ jal func_8010FD68 -/* 102FA0 802E1720 00000000 */ nop +/* 102FA0 802E1720 00000000 */ nop .L802E1724: /* 102FA4 802E1724 8FBF0020 */ lw $ra, 0x20($sp) /* 102FA8 802E1728 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E1740.s b/asm/nonmatchings/code_102610_len_2330/func_802E1740.s index 8793a9c7d3..c019e8b7b6 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E1740.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E1740.s @@ -7,9 +7,9 @@ glabel func_802E1740 /* 102FC8 802E1748 90820006 */ lbu $v0, 6($a0) /* 102FCC 802E174C 30420001 */ andi $v0, $v0, 1 /* 102FD0 802E1750 14400003 */ bnez $v0, .L802E1760 -/* 102FD4 802E1754 00000000 */ nop +/* 102FD4 802E1754 00000000 */ nop /* 102FD8 802E1758 0C043F5A */ jal func_8010FD68 -/* 102FDC 802E175C 00000000 */ nop +/* 102FDC 802E175C 00000000 */ nop .L802E1760: /* 102FE0 802E1760 8FBF0010 */ lw $ra, 0x10($sp) /* 102FE4 802E1764 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E17A8.s b/asm/nonmatchings/code_102610_len_2330/func_802E17A8.s index 3696b571bb..a874295f92 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E17A8.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E17A8.s @@ -18,13 +18,13 @@ glabel func_802E17A8 /* 10305C 802E17DC 00220821 */ addu $at, $at, $v0 /* 103060 802E17E0 8C22B010 */ lw $v0, %lo(D_802EB010)($at) /* 103064 802E17E4 00400008 */ jr $v0 -/* 103068 802E17E8 00000000 */ nop +/* 103068 802E17E8 00000000 */ nop /* 10306C 802E17EC C602001C */ lwc1 $f2, 0x1c($s0) /* 103070 802E17F0 3C01802F */ lui $at, %hi(D_802EB028) /* 103074 802E17F4 D420B028 */ ldc1 $f0, %lo(D_802EB028)($at) /* 103078 802E17F8 460010A1 */ cvt.d.s $f2, $f2 /* 10307C 802E17FC 46201082 */ mul.d $f2, $f2, $f0 -/* 103080 802E1800 00000000 */ nop +/* 103080 802E1800 00000000 */ nop /* 103084 802E1804 C6000014 */ lwc1 $f0, 0x14($s0) /* 103088 802E1808 462011A0 */ cvt.s.d $f6, $f2 /* 10308C 802E180C 46060000 */ add.s $f0, $f0, $f6 @@ -35,15 +35,15 @@ glabel func_802E17A8 /* 1030A0 802E1820 44801000 */ mtc1 $zero, $f2 /* 1030A4 802E1824 46000021 */ cvt.d.s $f0, $f0 /* 1030A8 802E1828 46220002 */ mul.d $f0, $f0, $f2 -/* 1030AC 802E182C 00000000 */ nop +/* 1030AC 802E182C 00000000 */ nop /* 1030B0 802E1830 3C01802F */ lui $at, %hi(D_802EB030) /* 1030B4 802E1834 D422B030 */ ldc1 $f2, %lo(D_802EB030)($at) /* 1030B8 802E1838 46200120 */ cvt.s.d $f4, $f0 /* 1030BC 802E183C 46002021 */ cvt.d.s $f0, $f4 /* 1030C0 802E1840 4622003C */ c.lt.d $f0, $f2 -/* 1030C4 802E1844 00000000 */ nop +/* 1030C4 802E1844 00000000 */ nop /* 1030C8 802E1848 45000004 */ bc1f .L802E185C -/* 1030CC 802E184C 00000000 */ nop +/* 1030CC 802E184C 00000000 */ nop /* 1030D0 802E1850 3C013C23 */ lui $at, 0x3c23 /* 1030D4 802E1854 3421D70A */ ori $at, $at, 0xd70a /* 1030D8 802E1858 44812000 */ mtc1 $at, $f4 @@ -57,17 +57,17 @@ glabel func_802E17A8 /* 1030F4 802E1874 C6000014 */ lwc1 $f0, 0x14($s0) /* 1030F8 802E1878 46060000 */ add.s $f0, $f0, $f6 /* 1030FC 802E187C 4602003E */ c.le.s $f0, $f2 -/* 103100 802E1880 00000000 */ nop +/* 103100 802E1880 00000000 */ nop /* 103104 802E1884 450000A5 */ bc1f .L802E1B1C -/* 103108 802E1888 00000000 */ nop +/* 103108 802E1888 00000000 */ nop /* 10310C 802E188C 080B86C1 */ j .L802E1B04 -/* 103110 802E1890 00000000 */ nop +/* 103110 802E1890 00000000 */ nop /* 103114 802E1894 C602001C */ lwc1 $f2, 0x1c($s0) /* 103118 802E1898 3C01802F */ lui $at, %hi(D_802EB038) /* 10311C 802E189C D420B038 */ ldc1 $f0, %lo(D_802EB038)($at) /* 103120 802E18A0 460010A1 */ cvt.d.s $f2, $f2 /* 103124 802E18A4 46201082 */ mul.d $f2, $f2, $f0 -/* 103128 802E18A8 00000000 */ nop +/* 103128 802E18A8 00000000 */ nop /* 10312C 802E18AC C6000014 */ lwc1 $f0, 0x14($s0) /* 103130 802E18B0 462011A0 */ cvt.s.d $f6, $f2 /* 103134 802E18B4 46060000 */ add.s $f0, $f0, $f6 @@ -83,9 +83,9 @@ glabel func_802E17A8 /* 10315C 802E18DC D422B040 */ ldc1 $f2, %lo(D_802EB040)($at) /* 103160 802E18E0 46002021 */ cvt.d.s $f0, $f4 /* 103164 802E18E4 4620103C */ c.lt.d $f2, $f0 -/* 103168 802E18E8 00000000 */ nop +/* 103168 802E18E8 00000000 */ nop /* 10316C 802E18EC 45000004 */ bc1f .L802E1900 -/* 103170 802E18F0 00000000 */ nop +/* 103170 802E18F0 00000000 */ nop /* 103174 802E18F4 3C01BC23 */ lui $at, 0xbc23 /* 103178 802E18F8 3421D70A */ ori $at, $at, 0xd70a /* 10317C 802E18FC 44812000 */ mtc1 $at, $f4 @@ -99,17 +99,17 @@ glabel func_802E17A8 /* 103198 802E1918 C6000014 */ lwc1 $f0, 0x14($s0) /* 10319C 802E191C 46060000 */ add.s $f0, $f0, $f6 /* 1031A0 802E1920 4600103E */ c.le.s $f2, $f0 -/* 1031A4 802E1924 00000000 */ nop +/* 1031A4 802E1924 00000000 */ nop /* 1031A8 802E1928 4500007C */ bc1f .L802E1B1C -/* 1031AC 802E192C 00000000 */ nop +/* 1031AC 802E192C 00000000 */ nop /* 1031B0 802E1930 080B86C1 */ j .L802E1B04 -/* 1031B4 802E1934 00000000 */ nop +/* 1031B4 802E1934 00000000 */ nop /* 1031B8 802E1938 C602001C */ lwc1 $f2, 0x1c($s0) /* 1031BC 802E193C 3C01802F */ lui $at, %hi(D_802EB048) /* 1031C0 802E1940 D420B048 */ ldc1 $f0, %lo(D_802EB048)($at) /* 1031C4 802E1944 460010A1 */ cvt.d.s $f2, $f2 /* 1031C8 802E1948 46201082 */ mul.d $f2, $f2, $f0 -/* 1031CC 802E194C 00000000 */ nop +/* 1031CC 802E194C 00000000 */ nop /* 1031D0 802E1950 C6000014 */ lwc1 $f0, 0x14($s0) /* 1031D4 802E1954 462011A0 */ cvt.s.d $f6, $f2 /* 1031D8 802E1958 46060000 */ add.s $f0, $f0, $f6 @@ -120,15 +120,15 @@ glabel func_802E17A8 /* 1031EC 802E196C 44801000 */ mtc1 $zero, $f2 /* 1031F0 802E1970 46000021 */ cvt.d.s $f0, $f0 /* 1031F4 802E1974 46220002 */ mul.d $f0, $f0, $f2 -/* 1031F8 802E1978 00000000 */ nop +/* 1031F8 802E1978 00000000 */ nop /* 1031FC 802E197C 3C01802F */ lui $at, %hi(D_802EB050) /* 103200 802E1980 D422B050 */ ldc1 $f2, %lo(D_802EB050)($at) /* 103204 802E1984 46200120 */ cvt.s.d $f4, $f0 /* 103208 802E1988 46002021 */ cvt.d.s $f0, $f4 /* 10320C 802E198C 4622003C */ c.lt.d $f0, $f2 -/* 103210 802E1990 00000000 */ nop +/* 103210 802E1990 00000000 */ nop /* 103214 802E1994 45000004 */ bc1f .L802E19A8 -/* 103218 802E1998 00000000 */ nop +/* 103218 802E1998 00000000 */ nop /* 10321C 802E199C 3C013C23 */ lui $at, 0x3c23 /* 103220 802E19A0 3421D70A */ ori $at, $at, 0xd70a /* 103224 802E19A4 44812000 */ mtc1 $at, $f4 @@ -142,17 +142,17 @@ glabel func_802E17A8 /* 103240 802E19C0 C6000014 */ lwc1 $f0, 0x14($s0) /* 103244 802E19C4 46060000 */ add.s $f0, $f0, $f6 /* 103248 802E19C8 4602003E */ c.le.s $f0, $f2 -/* 10324C 802E19CC 00000000 */ nop +/* 10324C 802E19CC 00000000 */ nop /* 103250 802E19D0 45000052 */ bc1f .L802E1B1C -/* 103254 802E19D4 00000000 */ nop +/* 103254 802E19D4 00000000 */ nop /* 103258 802E19D8 080B86C1 */ j .L802E1B04 -/* 10325C 802E19DC 00000000 */ nop +/* 10325C 802E19DC 00000000 */ nop /* 103260 802E19E0 C602001C */ lwc1 $f2, 0x1c($s0) /* 103264 802E19E4 3C01802F */ lui $at, %hi(D_802EB058) /* 103268 802E19E8 D420B058 */ ldc1 $f0, %lo(D_802EB058)($at) /* 10326C 802E19EC 460010A1 */ cvt.d.s $f2, $f2 /* 103270 802E19F0 46201082 */ mul.d $f2, $f2, $f0 -/* 103274 802E19F4 00000000 */ nop +/* 103274 802E19F4 00000000 */ nop /* 103278 802E19F8 C6000014 */ lwc1 $f0, 0x14($s0) /* 10327C 802E19FC 462011A0 */ cvt.s.d $f6, $f2 /* 103280 802E1A00 46060000 */ add.s $f0, $f0, $f6 @@ -168,9 +168,9 @@ glabel func_802E17A8 /* 1032A8 802E1A28 D422B060 */ ldc1 $f2, %lo(D_802EB060)($at) /* 1032AC 802E1A2C 46002021 */ cvt.d.s $f0, $f4 /* 1032B0 802E1A30 4620103C */ c.lt.d $f2, $f0 -/* 1032B4 802E1A34 00000000 */ nop +/* 1032B4 802E1A34 00000000 */ nop /* 1032B8 802E1A38 45000004 */ bc1f .L802E1A4C -/* 1032BC 802E1A3C 00000000 */ nop +/* 1032BC 802E1A3C 00000000 */ nop /* 1032C0 802E1A40 3C01BC23 */ lui $at, 0xbc23 /* 1032C4 802E1A44 3421D70A */ ori $at, $at, 0xd70a /* 1032C8 802E1A48 44812000 */ mtc1 $at, $f4 @@ -184,11 +184,11 @@ glabel func_802E17A8 /* 1032E4 802E1A64 C6000014 */ lwc1 $f0, 0x14($s0) /* 1032E8 802E1A68 46060000 */ add.s $f0, $f0, $f6 /* 1032EC 802E1A6C 4600103E */ c.le.s $f2, $f0 -/* 1032F0 802E1A70 00000000 */ nop +/* 1032F0 802E1A70 00000000 */ nop /* 1032F4 802E1A74 45000029 */ bc1f .L802E1B1C -/* 1032F8 802E1A78 00000000 */ nop +/* 1032F8 802E1A78 00000000 */ nop /* 1032FC 802E1A7C 080B86C1 */ j .L802E1B04 -/* 103300 802E1A80 00000000 */ nop +/* 103300 802E1A80 00000000 */ nop /* 103304 802E1A84 C6000014 */ lwc1 $f0, 0x14($s0) /* 103308 802E1A88 C6220054 */ lwc1 $f2, 0x54($s1) /* 10330C 802E1A8C 46020001 */ sub.s $f0, $f0, $f2 @@ -197,15 +197,15 @@ glabel func_802E17A8 /* 103318 802E1A98 44801000 */ mtc1 $zero, $f2 /* 10331C 802E1A9C 46000021 */ cvt.d.s $f0, $f0 /* 103320 802E1AA0 46220002 */ mul.d $f0, $f0, $f2 -/* 103324 802E1AA4 00000000 */ nop +/* 103324 802E1AA4 00000000 */ nop /* 103328 802E1AA8 3C01802F */ lui $at, %hi(D_802EB068) /* 10332C 802E1AAC D422B068 */ ldc1 $f2, %lo(D_802EB068)($at) /* 103330 802E1AB0 46200120 */ cvt.s.d $f4, $f0 /* 103334 802E1AB4 46002021 */ cvt.d.s $f0, $f4 /* 103338 802E1AB8 4622003C */ c.lt.d $f0, $f2 -/* 10333C 802E1ABC 00000000 */ nop +/* 10333C 802E1ABC 00000000 */ nop /* 103340 802E1AC0 45000004 */ bc1f .L802E1AD4 -/* 103344 802E1AC4 00000000 */ nop +/* 103344 802E1AC4 00000000 */ nop /* 103348 802E1AC8 3C013C23 */ lui $at, 0x3c23 /* 10334C 802E1ACC 3421D70A */ ori $at, $at, 0xd70a /* 103350 802E1AD0 44812000 */ mtc1 $at, $f4 @@ -218,9 +218,9 @@ glabel func_802E17A8 /* 103368 802E1AE8 E6220054 */ swc1 $f2, 0x54($s1) /* 10336C 802E1AEC C6000014 */ lwc1 $f0, 0x14($s0) /* 103370 802E1AF0 4602003E */ c.le.s $f0, $f2 -/* 103374 802E1AF4 00000000 */ nop +/* 103374 802E1AF4 00000000 */ nop /* 103378 802E1AF8 45000008 */ bc1f .L802E1B1C -/* 10337C 802E1AFC 00000000 */ nop +/* 10337C 802E1AFC 00000000 */ nop /* 103380 802E1B00 E6200054 */ swc1 $f0, 0x54($s1) .L802E1B04: /* 103384 802E1B04 92020010 */ lbu $v0, 0x10($s0) @@ -240,14 +240,14 @@ glabel func_802E17A8 /* 1033B8 802E1B38 00220821 */ addu $at, $at, $v0 /* 1033BC 802E1B3C 8C22B070 */ lw $v0, %lo(D_802EB070)($at) /* 1033C0 802E1B40 00400008 */ jr $v0 -/* 1033C4 802E1B44 00000000 */ nop +/* 1033C4 802E1B44 00000000 */ nop /* 1033C8 802E1B48 C602001C */ lwc1 $f2, 0x1c($s0) /* 1033CC 802E1B4C 3C01BFE0 */ lui $at, 0xbfe0 /* 1033D0 802E1B50 44810800 */ mtc1 $at, $f1 /* 1033D4 802E1B54 44800000 */ mtc1 $zero, $f0 /* 1033D8 802E1B58 460010A1 */ cvt.d.s $f2, $f2 /* 1033DC 802E1B5C 46201082 */ mul.d $f2, $f2, $f0 -/* 1033E0 802E1B60 00000000 */ nop +/* 1033E0 802E1B60 00000000 */ nop /* 1033E4 802E1B64 C6000018 */ lwc1 $f0, 0x18($s0) /* 1033E8 802E1B68 462011A0 */ cvt.s.d $f6, $f2 /* 1033EC 802E1B6C 46060000 */ add.s $f0, $f0, $f6 @@ -263,9 +263,9 @@ glabel func_802E17A8 /* 103414 802E1B94 D422B088 */ ldc1 $f2, %lo(D_802EB088)($at) /* 103418 802E1B98 46002021 */ cvt.d.s $f0, $f4 /* 10341C 802E1B9C 4620103C */ c.lt.d $f2, $f0 -/* 103420 802E1BA0 00000000 */ nop +/* 103420 802E1BA0 00000000 */ nop /* 103424 802E1BA4 45000004 */ bc1f .L802E1BB8 -/* 103428 802E1BA8 00000000 */ nop +/* 103428 802E1BA8 00000000 */ nop /* 10342C 802E1BAC 3C01BC23 */ lui $at, 0xbc23 /* 103430 802E1BB0 3421D70A */ ori $at, $at, 0xd70a /* 103434 802E1BB4 44812000 */ mtc1 $at, $f4 @@ -279,17 +279,17 @@ glabel func_802E17A8 /* 103450 802E1BD0 C6000018 */ lwc1 $f0, 0x18($s0) /* 103454 802E1BD4 46060000 */ add.s $f0, $f0, $f6 /* 103458 802E1BD8 4600103E */ c.le.s $f2, $f0 -/* 10345C 802E1BDC 00000000 */ nop +/* 10345C 802E1BDC 00000000 */ nop /* 103460 802E1BE0 450000A3 */ bc1f .L802E1E70 -/* 103464 802E1BE4 00000000 */ nop +/* 103464 802E1BE4 00000000 */ nop /* 103468 802E1BE8 080B8796 */ j .L802E1E58 -/* 10346C 802E1BEC 00000000 */ nop +/* 10346C 802E1BEC 00000000 */ nop /* 103470 802E1BF0 C602001C */ lwc1 $f2, 0x1c($s0) /* 103474 802E1BF4 3C01802F */ lui $at, %hi(D_802EB090) /* 103478 802E1BF8 D420B090 */ ldc1 $f0, %lo(D_802EB090)($at) /* 10347C 802E1BFC 460010A1 */ cvt.d.s $f2, $f2 /* 103480 802E1C00 46201082 */ mul.d $f2, $f2, $f0 -/* 103484 802E1C04 00000000 */ nop +/* 103484 802E1C04 00000000 */ nop /* 103488 802E1C08 C6000018 */ lwc1 $f0, 0x18($s0) /* 10348C 802E1C0C 462011A0 */ cvt.s.d $f6, $f2 /* 103490 802E1C10 46060000 */ add.s $f0, $f0, $f6 @@ -305,9 +305,9 @@ glabel func_802E17A8 /* 1034B8 802E1C38 D422B098 */ ldc1 $f2, %lo(D_802EB098)($at) /* 1034BC 802E1C3C 46002021 */ cvt.d.s $f0, $f4 /* 1034C0 802E1C40 4622003C */ c.lt.d $f0, $f2 -/* 1034C4 802E1C44 00000000 */ nop +/* 1034C4 802E1C44 00000000 */ nop /* 1034C8 802E1C48 45000004 */ bc1f .L802E1C5C -/* 1034CC 802E1C4C 00000000 */ nop +/* 1034CC 802E1C4C 00000000 */ nop /* 1034D0 802E1C50 3C013C23 */ lui $at, 0x3c23 /* 1034D4 802E1C54 3421D70A */ ori $at, $at, 0xd70a /* 1034D8 802E1C58 44812000 */ mtc1 $at, $f4 @@ -321,17 +321,17 @@ glabel func_802E17A8 /* 1034F4 802E1C74 C6000018 */ lwc1 $f0, 0x18($s0) /* 1034F8 802E1C78 46060000 */ add.s $f0, $f0, $f6 /* 1034FC 802E1C7C 4602003E */ c.le.s $f0, $f2 -/* 103500 802E1C80 00000000 */ nop +/* 103500 802E1C80 00000000 */ nop /* 103504 802E1C84 4500007A */ bc1f .L802E1E70 -/* 103508 802E1C88 00000000 */ nop +/* 103508 802E1C88 00000000 */ nop /* 10350C 802E1C8C 080B8796 */ j .L802E1E58 -/* 103510 802E1C90 00000000 */ nop +/* 103510 802E1C90 00000000 */ nop /* 103514 802E1C94 C602001C */ lwc1 $f2, 0x1c($s0) /* 103518 802E1C98 3C01802F */ lui $at, %hi(D_802EB0A0) /* 10351C 802E1C9C D420B0A0 */ ldc1 $f0, %lo(D_802EB0A0)($at) /* 103520 802E1CA0 460010A1 */ cvt.d.s $f2, $f2 /* 103524 802E1CA4 46201082 */ mul.d $f2, $f2, $f0 -/* 103528 802E1CA8 00000000 */ nop +/* 103528 802E1CA8 00000000 */ nop /* 10352C 802E1CAC C6000018 */ lwc1 $f0, 0x18($s0) /* 103530 802E1CB0 462011A0 */ cvt.s.d $f6, $f2 /* 103534 802E1CB4 46060000 */ add.s $f0, $f0, $f6 @@ -347,9 +347,9 @@ glabel func_802E17A8 /* 10355C 802E1CDC D422B0A8 */ ldc1 $f2, %lo(D_802EB0A8)($at) /* 103560 802E1CE0 46002021 */ cvt.d.s $f0, $f4 /* 103564 802E1CE4 4620103C */ c.lt.d $f2, $f0 -/* 103568 802E1CE8 00000000 */ nop +/* 103568 802E1CE8 00000000 */ nop /* 10356C 802E1CEC 45000004 */ bc1f .L802E1D00 -/* 103570 802E1CF0 00000000 */ nop +/* 103570 802E1CF0 00000000 */ nop /* 103574 802E1CF4 3C01BC23 */ lui $at, 0xbc23 /* 103578 802E1CF8 3421D70A */ ori $at, $at, 0xd70a /* 10357C 802E1CFC 44812000 */ mtc1 $at, $f4 @@ -363,17 +363,17 @@ glabel func_802E17A8 /* 103598 802E1D18 C6000018 */ lwc1 $f0, 0x18($s0) /* 10359C 802E1D1C 46060000 */ add.s $f0, $f0, $f6 /* 1035A0 802E1D20 4600103E */ c.le.s $f2, $f0 -/* 1035A4 802E1D24 00000000 */ nop +/* 1035A4 802E1D24 00000000 */ nop /* 1035A8 802E1D28 45000051 */ bc1f .L802E1E70 -/* 1035AC 802E1D2C 00000000 */ nop +/* 1035AC 802E1D2C 00000000 */ nop /* 1035B0 802E1D30 080B8796 */ j .L802E1E58 -/* 1035B4 802E1D34 00000000 */ nop +/* 1035B4 802E1D34 00000000 */ nop /* 1035B8 802E1D38 C602001C */ lwc1 $f2, 0x1c($s0) /* 1035BC 802E1D3C 44800000 */ mtc1 $zero, $f0 /* 1035C0 802E1D40 44800800 */ mtc1 $zero, $f1 /* 1035C4 802E1D44 460010A1 */ cvt.d.s $f2, $f2 /* 1035C8 802E1D48 46201082 */ mul.d $f2, $f2, $f0 -/* 1035CC 802E1D4C 00000000 */ nop +/* 1035CC 802E1D4C 00000000 */ nop /* 1035D0 802E1D50 C6000018 */ lwc1 $f0, 0x18($s0) /* 1035D4 802E1D54 462011A0 */ cvt.s.d $f6, $f2 /* 1035D8 802E1D58 46060000 */ add.s $f0, $f0, $f6 @@ -389,9 +389,9 @@ glabel func_802E17A8 /* 103600 802E1D80 D422B0B0 */ ldc1 $f2, %lo(D_802EB0B0)($at) /* 103604 802E1D84 46002021 */ cvt.d.s $f0, $f4 /* 103608 802E1D88 4622003C */ c.lt.d $f0, $f2 -/* 10360C 802E1D8C 00000000 */ nop +/* 10360C 802E1D8C 00000000 */ nop /* 103610 802E1D90 45000004 */ bc1f .L802E1DA4 -/* 103614 802E1D94 00000000 */ nop +/* 103614 802E1D94 00000000 */ nop /* 103618 802E1D98 3C013C23 */ lui $at, 0x3c23 /* 10361C 802E1D9C 3421D70A */ ori $at, $at, 0xd70a /* 103620 802E1DA0 44812000 */ mtc1 $at, $f4 @@ -405,11 +405,11 @@ glabel func_802E17A8 /* 10363C 802E1DBC C6000018 */ lwc1 $f0, 0x18($s0) /* 103640 802E1DC0 46060000 */ add.s $f0, $f0, $f6 /* 103644 802E1DC4 4602003E */ c.le.s $f0, $f2 -/* 103648 802E1DC8 00000000 */ nop +/* 103648 802E1DC8 00000000 */ nop /* 10364C 802E1DCC 45000028 */ bc1f .L802E1E70 -/* 103650 802E1DD0 00000000 */ nop +/* 103650 802E1DD0 00000000 */ nop /* 103654 802E1DD4 080B8796 */ j .L802E1E58 -/* 103658 802E1DD8 00000000 */ nop +/* 103658 802E1DD8 00000000 */ nop /* 10365C 802E1DDC C6000018 */ lwc1 $f0, 0x18($s0) /* 103660 802E1DE0 C6220058 */ lwc1 $f2, 0x58($s1) /* 103664 802E1DE4 46020001 */ sub.s $f0, $f0, $f2 @@ -423,9 +423,9 @@ glabel func_802E17A8 /* 103684 802E1E04 D422B0B8 */ ldc1 $f2, %lo(D_802EB0B8)($at) /* 103688 802E1E08 46002021 */ cvt.d.s $f0, $f4 /* 10368C 802E1E0C 4620103C */ c.lt.d $f2, $f0 -/* 103690 802E1E10 00000000 */ nop +/* 103690 802E1E10 00000000 */ nop /* 103694 802E1E14 45000004 */ bc1f .L802E1E28 -/* 103698 802E1E18 00000000 */ nop +/* 103698 802E1E18 00000000 */ nop /* 10369C 802E1E1C 3C01BC23 */ lui $at, 0xbc23 /* 1036A0 802E1E20 3421D70A */ ori $at, $at, 0xd70a /* 1036A4 802E1E24 44812000 */ mtc1 $at, $f4 @@ -438,9 +438,9 @@ glabel func_802E17A8 /* 1036BC 802E1E3C E6220058 */ swc1 $f2, 0x58($s1) /* 1036C0 802E1E40 C6000018 */ lwc1 $f0, 0x18($s0) /* 1036C4 802E1E44 4600103E */ c.le.s $f2, $f0 -/* 1036C8 802E1E48 00000000 */ nop +/* 1036C8 802E1E48 00000000 */ nop /* 1036CC 802E1E4C 45000008 */ bc1f .L802E1E70 -/* 1036D0 802E1E50 00000000 */ nop +/* 1036D0 802E1E50 00000000 */ nop /* 1036D4 802E1E54 E6200058 */ swc1 $f0, 0x58($s1) .L802E1E58: /* 1036D8 802E1E58 92020011 */ lbu $v0, 0x11($s0) diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E1EDC.s b/asm/nonmatchings/code_102610_len_2330/func_802E1EDC.s index 17b5f0e587..3098cf311a 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E1EDC.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E1EDC.s @@ -18,13 +18,13 @@ glabel func_802E1EDC /* 103790 802E1F10 00220821 */ addu $at, $at, $v0 /* 103794 802E1F14 8C22B0C0 */ lw $v0, %lo(D_802EB0C0)($at) /* 103798 802E1F18 00400008 */ jr $v0 -/* 10379C 802E1F1C 00000000 */ nop +/* 10379C 802E1F1C 00000000 */ nop /* 1037A0 802E1F20 C602001C */ lwc1 $f2, 0x1c($s0) /* 1037A4 802E1F24 3C01802F */ lui $at, %hi(D_802EB0D8) /* 1037A8 802E1F28 D420B0D8 */ ldc1 $f0, %lo(D_802EB0D8)($at) /* 1037AC 802E1F2C 460010A1 */ cvt.d.s $f2, $f2 /* 1037B0 802E1F30 46201082 */ mul.d $f2, $f2, $f0 -/* 1037B4 802E1F34 00000000 */ nop +/* 1037B4 802E1F34 00000000 */ nop /* 1037B8 802E1F38 C6000014 */ lwc1 $f0, 0x14($s0) /* 1037BC 802E1F3C 462011A0 */ cvt.s.d $f6, $f2 /* 1037C0 802E1F40 46060000 */ add.s $f0, $f0, $f6 @@ -35,15 +35,15 @@ glabel func_802E1EDC /* 1037D4 802E1F54 44801000 */ mtc1 $zero, $f2 /* 1037D8 802E1F58 46000021 */ cvt.d.s $f0, $f0 /* 1037DC 802E1F5C 46220002 */ mul.d $f0, $f0, $f2 -/* 1037E0 802E1F60 00000000 */ nop +/* 1037E0 802E1F60 00000000 */ nop /* 1037E4 802E1F64 3C01802F */ lui $at, %hi(D_802EB0E0) /* 1037E8 802E1F68 D422B0E0 */ ldc1 $f2, %lo(D_802EB0E0)($at) /* 1037EC 802E1F6C 46200120 */ cvt.s.d $f4, $f0 /* 1037F0 802E1F70 46002021 */ cvt.d.s $f0, $f4 /* 1037F4 802E1F74 4622003C */ c.lt.d $f0, $f2 -/* 1037F8 802E1F78 00000000 */ nop +/* 1037F8 802E1F78 00000000 */ nop /* 1037FC 802E1F7C 45000004 */ bc1f .L802E1F90 -/* 103800 802E1F80 00000000 */ nop +/* 103800 802E1F80 00000000 */ nop /* 103804 802E1F84 3C013C23 */ lui $at, 0x3c23 /* 103808 802E1F88 3421D70A */ ori $at, $at, 0xd70a /* 10380C 802E1F8C 44812000 */ mtc1 $at, $f4 @@ -58,7 +58,7 @@ glabel func_802E1EDC /* 10382C 802E1FAC 46060000 */ add.s $f0, $f0, $f6 /* 103830 802E1FB0 4602003E */ c.le.s $f0, $f2 /* 103834 802E1FB4 080B8840 */ j .L802E2100 -/* 103838 802E1FB8 00000000 */ nop +/* 103838 802E1FB8 00000000 */ nop /* 10383C 802E1FBC C602001C */ lwc1 $f2, 0x1c($s0) /* 103840 802E1FC0 3C01802F */ lui $at, %hi(D_802EB0E8) /* 103844 802E1FC4 D420B0E8 */ ldc1 $f0, %lo(D_802EB0E8)($at) @@ -69,7 +69,7 @@ glabel func_802E1EDC /* 103858 802E1FD8 D420B0F0 */ ldc1 $f0, %lo(D_802EB0F0)($at) /* 10385C 802E1FDC 460010A1 */ cvt.d.s $f2, $f2 /* 103860 802E1FE0 46201082 */ mul.d $f2, $f2, $f0 -/* 103864 802E1FE4 00000000 */ nop +/* 103864 802E1FE4 00000000 */ nop /* 103868 802E1FE8 C6000014 */ lwc1 $f0, 0x14($s0) /* 10386C 802E1FEC 462011A0 */ cvt.s.d $f6, $f2 /* 103870 802E1FF0 46060000 */ add.s $f0, $f0, $f6 @@ -80,15 +80,15 @@ glabel func_802E1EDC /* 103884 802E2004 44801000 */ mtc1 $zero, $f2 /* 103888 802E2008 46000021 */ cvt.d.s $f0, $f0 /* 10388C 802E200C 46220002 */ mul.d $f0, $f0, $f2 -/* 103890 802E2010 00000000 */ nop +/* 103890 802E2010 00000000 */ nop /* 103894 802E2014 3C01802F */ lui $at, %hi(D_802EB0F8) /* 103898 802E2018 D422B0F8 */ ldc1 $f2, %lo(D_802EB0F8)($at) /* 10389C 802E201C 46200120 */ cvt.s.d $f4, $f0 /* 1038A0 802E2020 46002021 */ cvt.d.s $f0, $f4 /* 1038A4 802E2024 4622003C */ c.lt.d $f0, $f2 -/* 1038A8 802E2028 00000000 */ nop +/* 1038A8 802E2028 00000000 */ nop /* 1038AC 802E202C 45000004 */ bc1f .L802E2040 -/* 1038B0 802E2030 00000000 */ nop +/* 1038B0 802E2030 00000000 */ nop /* 1038B4 802E2034 3C013C23 */ lui $at, 0x3c23 /* 1038B8 802E2038 3421D70A */ ori $at, $at, 0xd70a /* 1038BC 802E203C 44812000 */ mtc1 $at, $f4 @@ -103,14 +103,14 @@ glabel func_802E1EDC /* 1038DC 802E205C 46060000 */ add.s $f0, $f0, $f6 /* 1038E0 802E2060 4602003E */ c.le.s $f0, $f2 /* 1038E4 802E2064 080B8840 */ j .L802E2100 -/* 1038E8 802E2068 00000000 */ nop +/* 1038E8 802E2068 00000000 */ nop /* 1038EC 802E206C C602001C */ lwc1 $f2, 0x1c($s0) /* 1038F0 802E2070 3C01802F */ lui $at, %hi(D_802EB100) /* 1038F4 802E2074 D420B100 */ ldc1 $f0, %lo(D_802EB100)($at) /* 1038F8 802E2078 460010A1 */ cvt.d.s $f2, $f2 .L802E207C: /* 1038FC 802E207C 46201082 */ mul.d $f2, $f2, $f0 -/* 103900 802E2080 00000000 */ nop +/* 103900 802E2080 00000000 */ nop /* 103904 802E2084 C6000014 */ lwc1 $f0, 0x14($s0) /* 103908 802E2088 462011A0 */ cvt.s.d $f6, $f2 /* 10390C 802E208C 46060000 */ add.s $f0, $f0, $f6 @@ -126,9 +126,9 @@ glabel func_802E1EDC /* 103934 802E20B4 D422B108 */ ldc1 $f2, %lo(D_802EB108)($at) /* 103938 802E20B8 46002021 */ cvt.d.s $f0, $f4 /* 10393C 802E20BC 4620103C */ c.lt.d $f2, $f0 -/* 103940 802E20C0 00000000 */ nop +/* 103940 802E20C0 00000000 */ nop /* 103944 802E20C4 45000004 */ bc1f .L802E20D8 -/* 103948 802E20C8 00000000 */ nop +/* 103948 802E20C8 00000000 */ nop /* 10394C 802E20CC 3C01BC23 */ lui $at, 0xbc23 /* 103950 802E20D0 3421D70A */ ori $at, $at, 0xd70a /* 103954 802E20D4 44812000 */ mtc1 $at, $f4 @@ -142,10 +142,10 @@ glabel func_802E1EDC /* 103970 802E20F0 C6000014 */ lwc1 $f0, 0x14($s0) /* 103974 802E20F4 46060000 */ add.s $f0, $f0, $f6 /* 103978 802E20F8 4600103E */ c.le.s $f2, $f0 -/* 10397C 802E20FC 00000000 */ nop +/* 10397C 802E20FC 00000000 */ nop .L802E2100: /* 103980 802E2100 45000007 */ bc1f .L802E2120 -/* 103984 802E2104 00000000 */ nop +/* 103984 802E2104 00000000 */ nop /* 103988 802E2108 92020010 */ lbu $v0, 0x10($s0) /* 10398C 802E210C AE000004 */ sw $zero, 4($s0) /* 103990 802E2110 24420001 */ addiu $v0, $v0, 1 @@ -162,16 +162,16 @@ glabel func_802E1EDC /* 1039B8 802E2138 10400005 */ beqz $v0, .L802E2150 /* 1039BC 802E213C 24020002 */ addiu $v0, $zero, 2 /* 1039C0 802E2140 10600009 */ beqz $v1, .L802E2168 -/* 1039C4 802E2144 00000000 */ nop +/* 1039C4 802E2144 00000000 */ nop /* 1039C8 802E2148 080B88B1 */ j .L802E22C4 -/* 1039CC 802E214C 00000000 */ nop +/* 1039CC 802E214C 00000000 */ nop .L802E2150: /* 1039D0 802E2150 10620031 */ beq $v1, $v0, .L802E2218 /* 1039D4 802E2154 24020003 */ addiu $v0, $zero, 3 /* 1039D8 802E2158 5062005A */ beql $v1, $v0, .L802E22C4 /* 1039DC 802E215C 26520001 */ addiu $s2, $s2, 1 /* 1039E0 802E2160 080B88B1 */ j .L802E22C4 -/* 1039E4 802E2164 00000000 */ nop +/* 1039E4 802E2164 00000000 */ nop .L802E2168: /* 1039E8 802E2168 C602001C */ lwc1 $f2, 0x1c($s0) /* 1039EC 802E216C 3C01BFE0 */ lui $at, 0xbfe0 @@ -185,7 +185,7 @@ glabel func_802E1EDC /* 103A08 802E2188 D420B110 */ ldc1 $f0, %lo(D_802EB110)($at) /* 103A0C 802E218C 460010A1 */ cvt.d.s $f2, $f2 /* 103A10 802E2190 46201082 */ mul.d $f2, $f2, $f0 -/* 103A14 802E2194 00000000 */ nop +/* 103A14 802E2194 00000000 */ nop /* 103A18 802E2198 C6000018 */ lwc1 $f0, 0x18($s0) /* 103A1C 802E219C 462011A0 */ cvt.s.d $f6, $f2 /* 103A20 802E21A0 46060000 */ add.s $f0, $f0, $f6 @@ -201,9 +201,9 @@ glabel func_802E1EDC /* 103A48 802E21C8 D422B118 */ ldc1 $f2, %lo(D_802EB118)($at) /* 103A4C 802E21CC 46002021 */ cvt.d.s $f0, $f4 /* 103A50 802E21D0 4622003C */ c.lt.d $f0, $f2 -/* 103A54 802E21D4 00000000 */ nop +/* 103A54 802E21D4 00000000 */ nop /* 103A58 802E21D8 45000004 */ bc1f .L802E21EC -/* 103A5C 802E21DC 00000000 */ nop +/* 103A5C 802E21DC 00000000 */ nop /* 103A60 802E21E0 3C013C23 */ lui $at, 0x3c23 /* 103A64 802E21E4 3421D70A */ ori $at, $at, 0xd70a /* 103A68 802E21E8 44812000 */ mtc1 $at, $f4 @@ -218,7 +218,7 @@ glabel func_802E1EDC /* 103A88 802E2208 46060000 */ add.s $f0, $f0, $f6 /* 103A8C 802E220C 4602003E */ c.le.s $f0, $f2 /* 103A90 802E2210 080B88AB */ j .L802E22AC -/* 103A94 802E2214 00000000 */ nop +/* 103A94 802E2214 00000000 */ nop .L802E2218: /* 103A98 802E2218 C602001C */ lwc1 $f2, 0x1c($s0) /* 103A9C 802E221C 3C01802F */ lui $at, %hi(D_802EB120) @@ -226,7 +226,7 @@ glabel func_802E1EDC /* 103AA4 802E2224 460010A1 */ cvt.d.s $f2, $f2 .L802E2228: /* 103AA8 802E2228 46201082 */ mul.d $f2, $f2, $f0 -/* 103AAC 802E222C 00000000 */ nop +/* 103AAC 802E222C 00000000 */ nop /* 103AB0 802E2230 C6000018 */ lwc1 $f0, 0x18($s0) /* 103AB4 802E2234 462011A0 */ cvt.s.d $f6, $f2 /* 103AB8 802E2238 46060000 */ add.s $f0, $f0, $f6 @@ -242,9 +242,9 @@ glabel func_802E1EDC /* 103AE0 802E2260 D422B128 */ ldc1 $f2, %lo(D_802EB128)($at) /* 103AE4 802E2264 46002021 */ cvt.d.s $f0, $f4 /* 103AE8 802E2268 4620103C */ c.lt.d $f2, $f0 -/* 103AEC 802E226C 00000000 */ nop +/* 103AEC 802E226C 00000000 */ nop /* 103AF0 802E2270 45000004 */ bc1f .L802E2284 -/* 103AF4 802E2274 00000000 */ nop +/* 103AF4 802E2274 00000000 */ nop /* 103AF8 802E2278 3C01BC23 */ lui $at, 0xbc23 /* 103AFC 802E227C 3421D70A */ ori $at, $at, 0xd70a /* 103B00 802E2280 44812000 */ mtc1 $at, $f4 @@ -258,10 +258,10 @@ glabel func_802E1EDC /* 103B1C 802E229C C6000018 */ lwc1 $f0, 0x18($s0) /* 103B20 802E22A0 46060000 */ add.s $f0, $f0, $f6 /* 103B24 802E22A4 4600103E */ c.le.s $f2, $f0 -/* 103B28 802E22A8 00000000 */ nop +/* 103B28 802E22A8 00000000 */ nop .L802E22AC: /* 103B2C 802E22AC 45000005 */ bc1f .L802E22C4 -/* 103B30 802E22B0 00000000 */ nop +/* 103B30 802E22B0 00000000 */ nop /* 103B34 802E22B4 92020011 */ lbu $v0, 0x11($s0) /* 103B38 802E22B8 AE000008 */ sw $zero, 8($s0) /* 103B3C 802E22BC 24420001 */ addiu $v0, $v0, 1 @@ -283,7 +283,7 @@ glabel func_802E1EDC /* 103B74 802E22F4 00021400 */ sll $v0, $v0, 0x10 /* 103B78 802E22F8 00021403 */ sra $v0, $v0, 0x10 /* 103B7C 802E22FC 1443000D */ bne $v0, $v1, .L802E2334 -/* 103B80 802E2300 00000000 */ nop +/* 103B80 802E2300 00000000 */ nop /* 103B84 802E2304 8E020028 */ lw $v0, 0x28($s0) /* 103B88 802E2308 1440000A */ bnez $v0, .L802E2334 /* 103B8C 802E230C 2402003C */ addiu $v0, $zero, 0x3c diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E2450.s b/asm/nonmatchings/code_102610_len_2330/func_802E2450.s index b914bc79fb..88e270f22b 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E2450.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E2450.s @@ -5,7 +5,7 @@ glabel func_802E2450 /* 103CD0 802E2450 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 103CD4 802E2454 AFBF0010 */ sw $ra, 0x10($sp) /* 103CD8 802E2458 0C0B8D94 */ jal func_802E3650 -/* 103CDC 802E245C 00000000 */ nop +/* 103CDC 802E245C 00000000 */ nop /* 103CE0 802E2460 8FBF0010 */ lw $ra, 0x10($sp) /* 103CE4 802E2464 03E00008 */ jr $ra /* 103CE8 802E2468 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E246C.s b/asm/nonmatchings/code_102610_len_2330/func_802E246C.s index d0247ed57a..f2f5be683a 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E246C.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E246C.s @@ -99,7 +99,7 @@ glabel func_802E246C /* 103E50 802E25D0 D422B130 */ ldc1 $f2, %lo(D_802EB130)($at) /* 103E54 802E25D4 46000021 */ cvt.d.s $f0, $f0 /* 103E58 802E25D8 46220002 */ mul.d $f0, $f0, $f2 -/* 103E5C 802E25DC 00000000 */ nop +/* 103E5C 802E25DC 00000000 */ nop /* 103E60 802E25E0 46200020 */ cvt.s.d $f0, $f0 /* 103E64 802E25E4 4600A000 */ add.s $f0, $f20, $f0 /* 103E68 802E25E8 26940001 */ addiu $s4, $s4, 1 diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E263C.s b/asm/nonmatchings/code_102610_len_2330/func_802E263C.s index 38906e00ee..6131c7b660 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E263C.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E263C.s @@ -47,16 +47,16 @@ glabel func_802E263C /* 103F60 802E26E0 50400005 */ beql $v0, $zero, .L802E26F8 /* 103F64 802E26E4 24020002 */ addiu $v0, $zero, 2 /* 103F68 802E26E8 10600009 */ beqz $v1, .L802E2710 -/* 103F6C 802E26EC 00000000 */ nop +/* 103F6C 802E26EC 00000000 */ nop /* 103F70 802E26F0 080B89F7 */ j .L802E27DC -/* 103F74 802E26F4 00000000 */ nop +/* 103F74 802E26F4 00000000 */ nop .L802E26F8: /* 103F78 802E26F8 10620021 */ beq $v1, $v0, .L802E2780 /* 103F7C 802E26FC 24020003 */ addiu $v0, $zero, 3 /* 103F80 802E2700 1062002E */ beq $v1, $v0, .L802E27BC -/* 103F84 802E2704 00000000 */ nop +/* 103F84 802E2704 00000000 */ nop /* 103F88 802E2708 080B89F7 */ j .L802E27DC -/* 103F8C 802E270C 00000000 */ nop +/* 103F8C 802E270C 00000000 */ nop .L802E2710: /* 103F90 802E2710 96620000 */ lhu $v0, ($s3) /* 103F94 802E2714 3C014019 */ lui $at, 0x4019 @@ -64,7 +64,7 @@ glabel func_802E263C /* 103F9C 802E271C 4481B000 */ mtc1 $at, $f22 /* 103FA0 802E2720 30420001 */ andi $v0, $v0, 1 /* 103FA4 802E2724 10400003 */ beqz $v0, .L802E2734 -/* 103FA8 802E2728 00000000 */ nop +/* 103FA8 802E2728 00000000 */ nop /* 103FAC 802E272C 3C013FC0 */ lui $at, 0x3fc0 /* 103FB0 802E2730 4481B000 */ mtc1 $at, $f22 .L802E2734: @@ -72,7 +72,7 @@ glabel func_802E263C /* 103FB8 802E2738 3C0140C0 */ lui $at, 0x40c0 /* 103FBC 802E273C 4481D000 */ mtc1 $at, $f26 /* 103FC0 802E2740 4482C000 */ mtc1 $v0, $f24 -/* 103FC4 802E2744 00000000 */ nop +/* 103FC4 802E2744 00000000 */ nop /* 103FC8 802E2748 080B89F7 */ j .L802E27DC /* 103FCC 802E274C 4680C620 */ cvt.s.w $f24, $f24 .L802E2750: @@ -85,7 +85,7 @@ glabel func_802E263C /* 103FE8 802E2768 00021600 */ sll $v0, $v0, 0x18 /* 103FEC 802E276C 00021683 */ sra $v0, $v0, 0x1a /* 103FF0 802E2770 4482C000 */ mtc1 $v0, $f24 -/* 103FF4 802E2774 00000000 */ nop +/* 103FF4 802E2774 00000000 */ nop /* 103FF8 802E2778 080B89F7 */ j .L802E27DC /* 103FFC 802E277C 4680C620 */ cvt.s.w $f24, $f24 .L802E2780: @@ -98,7 +98,7 @@ glabel func_802E263C /* 104018 802E2798 00021600 */ sll $v0, $v0, 0x18 /* 10401C 802E279C 00021683 */ sra $v0, $v0, 0x1a /* 104020 802E27A0 4482C000 */ mtc1 $v0, $f24 -/* 104024 802E27A4 00000000 */ nop +/* 104024 802E27A4 00000000 */ nop /* 104028 802E27A8 4680C620 */ cvt.s.w $f24, $f24 /* 10402C 802E27AC 1460000B */ bnez $v1, .L802E27DC /* 104030 802E27B0 24820001 */ addiu $v0, $a0, 1 @@ -124,13 +124,13 @@ glabel func_802E263C /* 104078 802E27F8 46200020 */ cvt.s.d $f0, $f0 /* 10407C 802E27FC 460000A1 */ cvt.d.s $f2, $f0 /* 104080 802E2800 4624103C */ c.lt.d $f2, $f4 -/* 104084 802E2804 00000000 */ nop +/* 104084 802E2804 00000000 */ nop /* 104088 802E2808 45000006 */ bc1f .L802E2824 /* 10408C 802E280C E60001EC */ swc1 $f0, 0x1ec($s0) /* 104090 802E2810 3C01C143 */ lui $at, 0xc143 /* 104094 802E2814 34213333 */ ori $at, $at, 0x3333 /* 104098 802E2818 44810000 */ mtc1 $at, $f0 -/* 10409C 802E281C 00000000 */ nop +/* 10409C 802E281C 00000000 */ nop /* 1040A0 802E2820 E60001EC */ swc1 $f0, 0x1ec($s0) .L802E2824: /* 1040A4 802E2824 C6000124 */ lwc1 $f0, 0x124($s0) @@ -139,22 +139,22 @@ glabel func_802E263C /* 1040B0 802E2830 E6000124 */ swc1 $f0, 0x124($s0) /* 1040B4 802E2834 92220072 */ lbu $v0, 0x72($s1) /* 1040B8 802E2838 4482A000 */ mtc1 $v0, $f20 -/* 1040BC 802E283C 00000000 */ nop +/* 1040BC 802E283C 00000000 */ nop /* 1040C0 802E2840 4680A521 */ cvt.d.w $f20, $f20 /* 1040C4 802E2844 463CA502 */ mul.d $f20, $f20, $f28 -/* 1040C8 802E2848 00000000 */ nop +/* 1040C8 802E2848 00000000 */ nop /* 1040CC 802E284C 3C013F70 */ lui $at, 0x3f70 /* 1040D0 802E2850 44814800 */ mtc1 $at, $f9 /* 1040D4 802E2854 44804000 */ mtc1 $zero, $f8 -/* 1040D8 802E2858 00000000 */ nop +/* 1040D8 802E2858 00000000 */ nop /* 1040DC 802E285C 4628A502 */ mul.d $f20, $f20, $f8 -/* 1040E0 802E2860 00000000 */ nop +/* 1040E0 802E2860 00000000 */ nop /* 1040E4 802E2864 3C0140C9 */ lui $at, 0x40c9 /* 1040E8 802E2868 34210FD0 */ ori $at, $at, 0xfd0 /* 1040EC 802E286C 44816000 */ mtc1 $at, $f12 /* 1040F0 802E2870 4620A520 */ cvt.s.d $f20, $f20 /* 1040F4 802E2874 460CA302 */ mul.s $f12, $f20, $f12 -/* 1040F8 802E2878 00000000 */ nop +/* 1040F8 802E2878 00000000 */ nop /* 1040FC 802E287C 03C0302D */ daddu $a2, $fp, $zero /* 104100 802E2880 3C0143B4 */ lui $at, 0x43b4 /* 104104 802E2884 44810000 */ mtc1 $at, $f0 @@ -163,10 +163,10 @@ glabel func_802E263C /* 104110 802E2890 46006303 */ div.s $f12, $f12, $f0 /* 104114 802E2894 C7A00020 */ lwc1 $f0, 0x20($sp) /* 104118 802E2898 4600B002 */ mul.s $f0, $f22, $f0 -/* 10411C 802E289C 00000000 */ nop +/* 10411C 802E289C 00000000 */ nop /* 104120 802E28A0 C7A20024 */ lwc1 $f2, 0x24($sp) /* 104124 802E28A4 4602B082 */ mul.s $f2, $f22, $f2 -/* 104128 802E28A8 00000000 */ nop +/* 104128 802E28A8 00000000 */ nop /* 10412C 802E28AC C60400C0 */ lwc1 $f4, 0xc0($s0) /* 104130 802E28B0 46002100 */ add.s $f4, $f4, $f0 /* 104134 802E28B4 C6000188 */ lwc1 $f0, 0x188($s0) @@ -202,20 +202,20 @@ glabel func_802E263C /* 1041AC 802E292C A2220072 */ sb $v0, 0x72($s1) /* 1041B0 802E2930 304200FF */ andi $v0, $v0, 0xff /* 1041B4 802E2934 44826000 */ mtc1 $v0, $f12 -/* 1041B8 802E2938 00000000 */ nop +/* 1041B8 802E2938 00000000 */ nop /* 1041BC 802E293C 46806321 */ cvt.d.w $f12, $f12 /* 1041C0 802E2940 463C6302 */ mul.d $f12, $f12, $f28 -/* 1041C4 802E2944 00000000 */ nop +/* 1041C4 802E2944 00000000 */ nop /* 1041C8 802E2948 3C013F70 */ lui $at, 0x3f70 /* 1041CC 802E294C 44814800 */ mtc1 $at, $f9 /* 1041D0 802E2950 44804000 */ mtc1 $zero, $f8 -/* 1041D4 802E2954 00000000 */ nop +/* 1041D4 802E2954 00000000 */ nop /* 1041D8 802E2958 46286302 */ mul.d $f12, $f12, $f8 -/* 1041DC 802E295C 00000000 */ nop +/* 1041DC 802E295C 00000000 */ nop /* 1041E0 802E2960 3C01802F */ lui $at, %hi(D_802EB158) /* 1041E4 802E2964 D420B158 */ ldc1 $f0, %lo(D_802EB158)($at) /* 1041E8 802E2968 46206302 */ mul.d $f12, $f12, $f0 -/* 1041EC 802E296C 00000000 */ nop +/* 1041EC 802E296C 00000000 */ nop /* 1041F0 802E2970 8FA50038 */ lw $a1, 0x38($sp) /* 1041F4 802E2974 463C6303 */ div.d $f12, $f12, $f28 /* 1041F8 802E2978 0C00A82D */ jal sin_cos_rad @@ -223,12 +223,12 @@ glabel func_802E263C /* 104200 802E2980 C7A00020 */ lwc1 $f0, 0x20($sp) /* 104204 802E2984 3C014100 */ lui $at, 0x4100 /* 104208 802E2988 4481B000 */ mtc1 $at, $f22 -/* 10420C 802E298C 00000000 */ nop +/* 10420C 802E298C 00000000 */ nop /* 104210 802E2990 46160002 */ mul.s $f0, $f0, $f22 -/* 104214 802E2994 00000000 */ nop +/* 104214 802E2994 00000000 */ nop /* 104218 802E2998 C7A40024 */ lwc1 $f4, 0x24($sp) /* 10421C 802E299C 46162102 */ mul.s $f4, $f4, $f22 -/* 104220 802E29A0 00000000 */ nop +/* 104220 802E29A0 00000000 */ nop /* 104224 802E29A4 C60200C0 */ lwc1 $f2, 0xc0($s0) /* 104228 802E29A8 46001080 */ add.s $f2, $f2, $f0 /* 10422C 802E29AC C6000188 */ lwc1 $f0, 0x188($s0) @@ -253,17 +253,17 @@ glabel func_802E263C /* 104274 802E29F4 0C0372DF */ jal func_800DCB7C /* 104278 802E29F8 AFA20010 */ sw $v0, 0x10($sp) /* 10427C 802E29FC 1440000B */ bnez $v0, .L802E2A2C -/* 104280 802E2A00 00000000 */ nop +/* 104280 802E2A00 00000000 */ nop /* 104284 802E2A04 C6400038 */ lwc1 $f0, 0x38($s2) /* 104288 802E2A08 3C014348 */ lui $at, 0x4348 /* 10428C 802E2A0C 44811000 */ mtc1 $at, $f2 -/* 104290 802E2A10 00000000 */ nop +/* 104290 802E2A10 00000000 */ nop /* 104294 802E2A14 46020001 */ sub.s $f0, $f0, $f2 /* 104298 802E2A18 C7A2002C */ lwc1 $f2, 0x2c($sp) /* 10429C 802E2A1C 4600103C */ c.lt.s $f2, $f0 -/* 1042A0 802E2A20 00000000 */ nop +/* 1042A0 802E2A20 00000000 */ nop /* 1042A4 802E2A24 4500000F */ bc1f .L802E2A64 -/* 1042A8 802E2A28 00000000 */ nop +/* 1042A8 802E2A28 00000000 */ nop .L802E2A2C: /* 1042AC 802E2A2C 92220040 */ lbu $v0, 0x40($s1) /* 1042B0 802E2A30 24420001 */ addiu $v0, $v0, 1 @@ -274,7 +274,7 @@ glabel func_802E263C /* 1042C4 802E2A44 44810000 */ mtc1 $at, $f0 /* 1042C8 802E2A48 46001085 */ abs.s $f2, $f2 /* 1042CC 802E2A4C 46001082 */ mul.s $f2, $f2, $f0 -/* 1042D0 802E2A50 00000000 */ nop +/* 1042D0 802E2A50 00000000 */ nop /* 1042D4 802E2A54 C7A0002C */ lwc1 $f0, 0x2c($sp) /* 1042D8 802E2A58 46020000 */ add.s $f0, $f0, $f2 /* 1042DC 802E2A5C E61A01EC */ swc1 $f26, 0x1ec($s0) @@ -282,11 +282,11 @@ glabel func_802E263C .L802E2A64: /* 1042E4 802E2A64 9222008B */ lbu $v0, 0x8b($s1) /* 1042E8 802E2A68 44820000 */ mtc1 $v0, $f0 -/* 1042EC 802E2A6C 00000000 */ nop +/* 1042EC 802E2A6C 00000000 */ nop /* 1042F0 802E2A70 46800020 */ cvt.s.w $f0, $f0 /* 1042F4 802E2A74 46180000 */ add.s $f0, $f0, $f24 /* 1042F8 802E2A78 4600F03E */ c.le.s $f30, $f0 -/* 1042FC 802E2A7C 00000000 */ nop +/* 1042FC 802E2A7C 00000000 */ nop /* 104300 802E2A80 45010005 */ bc1t .L802E2A98 /* 104304 802E2A84 2623008B */ addiu $v1, $s1, 0x8b /* 104308 802E2A88 4600020D */ trunc.w.s $f8, $f0 @@ -303,11 +303,11 @@ glabel func_802E263C .L802E2AB0: /* 104330 802E2AB0 922200A4 */ lbu $v0, 0xa4($s1) /* 104334 802E2AB4 44820000 */ mtc1 $v0, $f0 -/* 104338 802E2AB8 00000000 */ nop +/* 104338 802E2AB8 00000000 */ nop /* 10433C 802E2ABC 46800020 */ cvt.s.w $f0, $f0 /* 104340 802E2AC0 46180001 */ sub.s $f0, $f0, $f24 /* 104344 802E2AC4 4600F03E */ c.le.s $f30, $f0 -/* 104348 802E2AC8 00000000 */ nop +/* 104348 802E2AC8 00000000 */ nop /* 10434C 802E2ACC 45010005 */ bc1t .L802E2AE4 /* 104350 802E2AD0 262300A4 */ addiu $v1, $s1, 0xa4 /* 104354 802E2AD4 4600020D */ trunc.w.s $f8, $f0 @@ -342,7 +342,7 @@ glabel func_802E263C /* 1043C0 802E2B40 A642003C */ sh $v0, 0x3c($s2) /* 1043C4 802E2B44 00021400 */ sll $v0, $v0, 0x10 /* 1043C8 802E2B48 1C400004 */ bgtz $v0, .L802E2B5C -/* 1043CC 802E2B4C 00000000 */ nop +/* 1043CC 802E2B4C 00000000 */ nop /* 1043D0 802E2B50 A640003C */ sh $zero, 0x3c($s2) /* 1043D4 802E2B54 0C043F5A */ jal func_8010FD68 /* 1043D8 802E2B58 8FA40098 */ lw $a0, 0x98($sp) diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E2BA4.s b/asm/nonmatchings/code_102610_len_2330/func_802E2BA4.s index 8ba2741900..f55f1b92fb 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E2BA4.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E2BA4.s @@ -90,12 +90,12 @@ glabel func_802E2BA4 /* 10456C 802E2CEC 02978021 */ addu $s0, $s4, $s7 /* 104570 802E2CF0 9202008B */ lbu $v0, 0x8b($s0) /* 104574 802E2CF4 44820000 */ mtc1 $v0, $f0 -/* 104578 802E2CF8 00000000 */ nop +/* 104578 802E2CF8 00000000 */ nop /* 10457C 802E2CFC 46800020 */ cvt.s.w $f0, $f0 /* 104580 802E2D00 461A0002 */ mul.s $f0, $f0, $f26 -/* 104584 802E2D04 00000000 */ nop +/* 104584 802E2D04 00000000 */ nop /* 104588 802E2D08 46180002 */ mul.s $f0, $f0, $f24 -/* 10458C 802E2D0C 00000000 */ nop +/* 10458C 802E2D0C 00000000 */ nop /* 104590 802E2D10 4406B000 */ mfc1 $a2, $f22 /* 104594 802E2D14 4407A000 */ mfc1 $a3, $f20 /* 104598 802E2D18 8FA40120 */ lw $a0, 0x120($sp) @@ -104,13 +104,13 @@ glabel func_802E2BA4 /* 1045A4 802E2D24 E7B40010 */ swc1 $f20, 0x10($sp) /* 1045A8 802E2D28 920200A4 */ lbu $v0, 0xa4($s0) /* 1045AC 802E2D2C 44820000 */ mtc1 $v0, $f0 -/* 1045B0 802E2D30 00000000 */ nop +/* 1045B0 802E2D30 00000000 */ nop /* 1045B4 802E2D34 46800020 */ cvt.s.w $f0, $f0 /* 1045B8 802E2D38 461A0002 */ mul.s $f0, $f0, $f26 -/* 1045BC 802E2D3C 00000000 */ nop +/* 1045BC 802E2D3C 00000000 */ nop /* 1045C0 802E2D40 26310008 */ addiu $s1, $s1, 8 /* 1045C4 802E2D44 46180002 */ mul.s $f0, $f0, $f24 -/* 1045C8 802E2D48 00000000 */ nop +/* 1045C8 802E2D48 00000000 */ nop /* 1045CC 802E2D4C 26520018 */ addiu $s2, $s2, 0x18 /* 1045D0 802E2D50 26F70001 */ addiu $s7, $s7, 1 /* 1045D4 802E2D54 4406A000 */ mfc1 $a2, $f20 @@ -199,4 +199,4 @@ glabel func_802E2BA4 /* 104720 802E2EA0 D7B40150 */ ldc1 $f20, 0x150($sp) /* 104724 802E2EA4 03E00008 */ jr $ra /* 104728 802E2EA8 27BD0180 */ addiu $sp, $sp, 0x180 -/* 10472C 802E2EAC 00000000 */ nop +/* 10472C 802E2EAC 00000000 */ nop diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E2EB0.s b/asm/nonmatchings/code_102610_len_2330/func_802E2EB0.s index 15e44b45cb..a04b486d95 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E2EB0.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E2EB0.s @@ -22,7 +22,7 @@ glabel func_802E2EB0 /* 104774 802E2EF4 2463FFF3 */ addiu $v1, $v1, -0xd /* 104778 802E2EF8 3C013F00 */ lui $at, 0x3f00 /* 10477C 802E2EFC 44810000 */ mtc1 $at, $f0 -/* 104780 802E2F00 00000000 */ nop +/* 104780 802E2F00 00000000 */ nop /* 104784 802E2F04 E6200054 */ swc1 $f0, 0x54($s1) /* 104788 802E2F08 E6200058 */ swc1 $f0, 0x58($s1) /* 10478C 802E2F0C E620005C */ swc1 $f0, 0x5c($s1) @@ -34,25 +34,25 @@ glabel func_802E2EB0 /* 1047A0 802E2F20 00220821 */ addu $at, $at, $v0 /* 1047A4 802E2F24 8C22B160 */ lw $v0, %lo(D_802EB160)($at) /* 1047A8 802E2F28 00400008 */ jr $v0 -/* 1047AC 802E2F2C 00000000 */ nop +/* 1047AC 802E2F2C 00000000 */ nop /* 1047B0 802E2F30 3C120A00 */ lui $s2, 0xa00 /* 1047B4 802E2F34 265231E0 */ addiu $s2, $s2, 0x31e0 /* 1047B8 802E2F38 3C100A00 */ lui $s0, 0xa00 /* 1047BC 802E2F3C 26101508 */ addiu $s0, $s0, 0x1508 /* 1047C0 802E2F40 080B8BE9 */ j .L802E2FA4 -/* 1047C4 802E2F44 00000000 */ nop +/* 1047C4 802E2F44 00000000 */ nop /* 1047C8 802E2F48 3C120A00 */ lui $s2, 0xa00 /* 1047CC 802E2F4C 265231B0 */ addiu $s2, $s2, 0x31b0 /* 1047D0 802E2F50 3C100A00 */ lui $s0, 0xa00 /* 1047D4 802E2F54 261014D8 */ addiu $s0, $s0, 0x14d8 /* 1047D8 802E2F58 080B8BE9 */ j .L802E2FA4 -/* 1047DC 802E2F5C 00000000 */ nop +/* 1047DC 802E2F5C 00000000 */ nop /* 1047E0 802E2F60 3C120A00 */ lui $s2, 0xa00 /* 1047E4 802E2F64 26522F78 */ addiu $s2, $s2, 0x2f78 /* 1047E8 802E2F68 3C100A00 */ lui $s0, 0xa00 /* 1047EC 802E2F6C 26101218 */ addiu $s0, $s0, 0x1218 /* 1047F0 802E2F70 080B8BE9 */ j .L802E2FA4 -/* 1047F4 802E2F74 00000000 */ nop +/* 1047F4 802E2F74 00000000 */ nop /* 1047F8 802E2F78 24040158 */ addiu $a0, $zero, 0x158 /* 1047FC 802E2F7C C6200050 */ lwc1 $f0, 0x50($s1) /* 104800 802E2F80 3C120A00 */ lui $s2, 0xa00 diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E2FD0.s b/asm/nonmatchings/code_102610_len_2330/func_802E2FD0.s index 73f938c522..af26f64ddc 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E2FD0.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E2FD0.s @@ -18,7 +18,7 @@ glabel func_802E2FD0 /* 104884 802E3004 00220821 */ addu $at, $at, $v0 /* 104888 802E3008 8C22B198 */ lw $v0, %lo(D_802EB198)($at) /* 10488C 802E300C 00400008 */ jr $v0 -/* 104890 802E3010 00000000 */ nop +/* 104890 802E3010 00000000 */ nop /* 104894 802E3014 3C10802F */ lui $s0, %hi(D_802E9C8C) /* 104898 802E3018 080B8C19 */ j .L802E3064 /* 10489C 802E301C 26109C8C */ addiu $s0, $s0, %lo(D_802E9C8C) @@ -61,6 +61,6 @@ glabel func_802E2FD0 /* 104928 802E30A8 8FB00018 */ lw $s0, 0x18($sp) /* 10492C 802E30AC 03E00008 */ jr $ra /* 104930 802E30B0 27BD0028 */ addiu $sp, $sp, 0x28 -/* 104934 802E30B4 00000000 */ nop -/* 104938 802E30B8 00000000 */ nop -/* 10493C 802E30BC 00000000 */ nop +/* 104934 802E30B4 00000000 */ nop +/* 104938 802E30B8 00000000 */ nop +/* 10493C 802E30BC 00000000 */ nop diff --git a/asm/nonmatchings/code_10400_len_d30/func_80035000.s b/asm/nonmatchings/code_10400_len_d30/func_80035000.s index 6af980ce37..6a9cdc897a 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_80035000.s +++ b/asm/nonmatchings/code_10400_len_d30/func_80035000.s @@ -15,7 +15,7 @@ glabel func_80035000 /* 10428 80035028 24040002 */ addiu $a0, $zero, 2 /* 1042C 8003502C 86020000 */ lh $v0, ($s0) /* 10430 80035030 44820000 */ mtc1 $v0, $f0 -/* 10434 80035034 00000000 */ nop +/* 10434 80035034 00000000 */ nop /* 10438 80035038 46800020 */ cvt.s.w $f0, $f0 /* 1043C 8003503C 44050000 */ mfc1 $a1, $f0 /* 10440 80035040 0C04DF62 */ jal func_80137D88 diff --git a/asm/nonmatchings/code_10400_len_d30/func_80035058.s b/asm/nonmatchings/code_10400_len_d30/func_80035058.s index e37bfe5fc3..cfdae22457 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_80035058.s +++ b/asm/nonmatchings/code_10400_len_d30/func_80035058.s @@ -11,16 +11,16 @@ glabel func_80035058 /* 10470 80035070 3C01800A */ lui $at, %hi(D_800A0932) /* 10474 80035074 A4200932 */ sh $zero, %lo(D_800A0932)($at) /* 10478 80035078 0C03805E */ jal disable_player_input -/* 1047C 8003507C 00000000 */ nop +/* 1047C 8003507C 00000000 */ nop /* 10480 80035080 0C009C22 */ jal func_80027088 /* 10484 80035084 24040002 */ addiu $a0, $zero, 2 /* 10488 80035088 0C00AB00 */ jal general_heap_create -/* 1048C 8003508C 00000000 */ nop +/* 1048C 8003508C 00000000 */ nop /* 10490 80035090 0000202D */ daddu $a0, $zero, $zero /* 10494 80035094 0C0514BA */ jal func_801452E8 /* 10498 80035098 0080282D */ daddu $a1, $a0, $zero /* 1049C 8003509C 0C050440 */ jal func_80141100 -/* 104A0 800350A0 00000000 */ nop +/* 104A0 800350A0 00000000 */ nop /* 104A4 800350A4 0000202D */ daddu $a0, $zero, $zero /* 104A8 800350A8 0080282D */ daddu $a1, $a0, $zero /* 104AC 800350AC 0C045709 */ jal load_model_textures diff --git a/asm/nonmatchings/code_10400_len_d30/func_800351C8.s b/asm/nonmatchings/code_10400_len_d30/func_800351C8.s index 2be2194af7..998ae3c971 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_800351C8.s +++ b/asm/nonmatchings/code_10400_len_d30/func_800351C8.s @@ -17,25 +17,25 @@ glabel func_800351C8 /* 105F8 800351F8 10400005 */ beqz $v0, .L80035210 /* 105FC 800351FC 24130002 */ addiu $s3, $zero, 2 /* 10600 80035200 10600009 */ beqz $v1, .L80035228 -/* 10604 80035204 00000000 */ nop +/* 10604 80035204 00000000 */ nop /* 10608 80035208 0800D534 */ j .L800354D0 -/* 1060C 8003520C 00000000 */ nop +/* 1060C 8003520C 00000000 */ nop .L80035210: /* 10610 80035210 10730033 */ beq $v1, $s3, .L800352E0 /* 10614 80035214 24020003 */ addiu $v0, $zero, 3 /* 10618 80035218 10620055 */ beq $v1, $v0, .L80035370 -/* 1061C 8003521C 00000000 */ nop +/* 1061C 8003521C 00000000 */ nop /* 10620 80035220 0800D534 */ j .L800354D0 -/* 10624 80035224 00000000 */ nop +/* 10624 80035224 00000000 */ nop .L80035228: /* 10628 80035228 0C037DD0 */ jal update_player -/* 1062C 8003522C 00000000 */ nop +/* 1062C 8003522C 00000000 */ nop /* 10630 80035230 0C00E64C */ jal update_npcs -/* 10634 80035234 00000000 */ nop +/* 10634 80035234 00000000 */ nop /* 10638 80035238 0C00F949 */ jal func_8003E524 -/* 1063C 8003523C 00000000 */ nop +/* 1063C 8003523C 00000000 */ nop /* 10640 80035240 0C016754 */ jal func_80059D50 -/* 10644 80035244 00000000 */ nop +/* 10644 80035244 00000000 */ nop /* 10648 80035248 3C10800A */ lui $s0, %hi(D_800A0932) /* 1064C 8003524C 26100932 */ addiu $s0, $s0, %lo(D_800A0932) /* 10650 80035250 86020000 */ lh $v0, ($s0) @@ -53,7 +53,7 @@ glabel func_800351C8 .L80035280: /* 10680 80035280 86020000 */ lh $v0, ($s0) /* 10684 80035284 44820000 */ mtc1 $v0, $f0 -/* 10688 80035288 00000000 */ nop +/* 10688 80035288 00000000 */ nop /* 1068C 8003528C 46800020 */ cvt.s.w $f0, $f0 /* 10690 80035290 44050000 */ mfc1 $a1, $f0 /* 10694 80035294 0C04DF62 */ jal func_80137D88 @@ -61,7 +61,7 @@ glabel func_800351C8 /* 1069C 8003529C 86030000 */ lh $v1, ($s0) /* 106A0 800352A0 240200FF */ addiu $v0, $zero, 0xff /* 106A4 800352A4 1462008A */ bne $v1, $v0, .L800354D0 -/* 106A8 800352A8 00000000 */ nop +/* 106A8 800352A8 00000000 */ nop .L800352AC: /* 106AC 800352AC 0800D534 */ j .L800354D0 /* 106B0 800352B0 A2320000 */ sb $s2, ($s1) @@ -85,7 +85,7 @@ glabel func_800351C8 /* 106F0 800352F0 A2020000 */ sb $v0, ($s0) /* 106F4 800352F4 00021600 */ sll $v0, $v0, 0x18 /* 106F8 800352F8 14400075 */ bnez $v0, .L800354D0 -/* 106FC 800352FC 00000000 */ nop +/* 106FC 800352FC 00000000 */ nop /* 10700 80035300 3C048007 */ lui $a0, %hi(D_80077980) /* 10704 80035304 24847980 */ addiu $a0, $a0, %lo(D_80077980) /* 10708 80035308 0C017CBC */ jal nuGfxSetCfb @@ -129,47 +129,47 @@ glabel func_800351C8 /* 10798 80035398 0C05260E */ jal func_80149838 /* 1079C 8003539C A2020000 */ sb $v0, ($s0) /* 107A0 800353A0 0C00EC6A */ jal func_8003B1A8 -/* 107A4 800353A4 00000000 */ nop +/* 107A4 800353A4 00000000 */ nop /* 107A8 800353A8 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 107AC 800353AC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 107B0 800353B0 0C016BA8 */ jal allocate_hit_tables /* 107B4 800353B4 A0530070 */ sb $s3, 0x70($v0) /* 107B8 800353B8 0C00AB28 */ jal battle_heap_create -/* 107BC 800353BC 00000000 */ nop +/* 107BC 800353BC 00000000 */ nop /* 107C0 800353C0 0C05259C */ jal func_80149670 /* 107C4 800353C4 0000202D */ daddu $a0, $zero, $zero /* 107C8 800353C8 0C0B763E */ jal func_802DD8F8 /* 107CC 800353CC 0000202D */ daddu $a0, $zero, $zero /* 107D0 800353D0 0C045751 */ jal clear_model_data -/* 107D4 800353D4 00000000 */ nop +/* 107D4 800353D4 00000000 */ nop /* 107D8 800353D8 0C052010 */ jal func_80148040 -/* 107DC 800353DC 00000000 */ nop +/* 107DC 800353DC 00000000 */ nop /* 107E0 800353E0 0C05177E */ jal func_80145DF8 -/* 107E4 800353E4 00000000 */ nop +/* 107E4 800353E4 00000000 */ nop /* 107E8 800353E8 0C0482EC */ jal clear_virtual_models -/* 107EC 800353EC 00000000 */ nop +/* 107EC 800353EC 00000000 */ nop /* 107F0 800353F0 0C047889 */ jal func_8011E224 -/* 107F4 800353F4 00000000 */ nop +/* 107F4 800353F4 00000000 */ nop /* 107F8 800353F8 0C048C2E */ jal clear_dynamic_entity_list -/* 107FC 800353FC 00000000 */ nop +/* 107FC 800353FC 00000000 */ nop /* 10800 80035400 3C048020 */ lui $a0, %hi(gBackgroundImage) /* 10804 80035404 24840000 */ addiu $a0, $a0, %lo(gBackgroundImage) /* 10808 80035408 0C0514BA */ jal func_801452E8 /* 1080C 8003540C 3C050002 */ lui $a1, 2 /* 10810 80035410 0C050440 */ jal func_80141100 -/* 10814 80035414 00000000 */ nop +/* 10814 80035414 00000000 */ nop /* 10818 80035418 0C03A6EC */ jal reset_status_menu -/* 1081C 8003541C 00000000 */ nop +/* 1081C 8003541C 00000000 */ nop /* 10820 80035420 0C04C3FC */ jal clear_item_entity_data -/* 10824 80035424 00000000 */ nop +/* 10824 80035424 00000000 */ nop /* 10828 80035428 0C0B0C77 */ jal clear_script_list -/* 1082C 8003542C 00000000 */ nop +/* 1082C 8003542C 00000000 */ nop /* 10830 80035430 0C00E12F */ jal clear_npcs -/* 10834 80035434 00000000 */ nop +/* 10834 80035434 00000000 */ nop /* 10838 80035438 0C04432E */ jal clear_entity_data /* 1083C 8003543C 0000202D */ daddu $a0, $zero, $zero /* 10840 80035440 0C0515A0 */ jal clear_trigger_data -/* 10844 80035444 00000000 */ nop +/* 10844 80035444 00000000 */ nop /* 10848 80035448 3C048007 */ lui $a0, %hi(D_8007798C) /* 1084C 8003544C 0C018038 */ jal nuPiReadRomOverlay /* 10850 80035450 2484798C */ addiu $a0, $a0, %lo(D_8007798C) @@ -187,10 +187,10 @@ glabel func_800351C8 .L80035480: /* 10880 80035480 82020000 */ lb $v0, ($s0) /* 10884 80035484 04410012 */ bgez $v0, .L800354D0 -/* 10888 80035488 00000000 */ nop +/* 10888 80035488 00000000 */ nop .L8003548C: /* 1088C 8003548C 0C090C68 */ jal func_802431A0 -/* 10890 80035490 00000000 */ nop +/* 10890 80035490 00000000 */ nop /* 10894 80035494 3C03800A */ lui $v1, %hi(D_800A0932) /* 10898 80035498 24630932 */ addiu $v1, $v1, %lo(D_800A0932) /* 1089C 8003549C 94620000 */ lhu $v0, ($v1) @@ -202,7 +202,7 @@ glabel func_800351C8 .L800354B4: /* 108B4 800354B4 84620000 */ lh $v0, ($v1) /* 108B8 800354B8 44820000 */ mtc1 $v0, $f0 -/* 108BC 800354BC 00000000 */ nop +/* 108BC 800354BC 00000000 */ nop /* 108C0 800354C0 46800020 */ cvt.s.w $f0, $f0 /* 108C4 800354C4 44050000 */ mfc1 $a1, $f0 /* 108C8 800354C8 0C04DF62 */ jal func_80137D88 diff --git a/asm/nonmatchings/code_10400_len_d30/func_800354EC.s b/asm/nonmatchings/code_10400_len_d30/func_800354EC.s index 71b519204a..2bee8969a0 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_800354EC.s +++ b/asm/nonmatchings/code_10400_len_d30/func_800354EC.s @@ -17,12 +17,12 @@ glabel func_800354EC /* 1091C 8003551C 52000024 */ beql $s0, $zero, .L800355B0 /* 10920 80035520 A2230000 */ sb $v1, ($s1) /* 10924 80035524 0800D56C */ j .L800355B0 -/* 10928 80035528 00000000 */ nop +/* 10928 80035528 00000000 */ nop .L8003552C: /* 1092C 8003552C 1202000A */ beq $s0, $v0, .L80035558 -/* 10930 80035530 00000000 */ nop +/* 10930 80035530 00000000 */ nop /* 10934 80035534 0800D56C */ j .L800355B0 -/* 10938 80035538 00000000 */ nop +/* 10938 80035538 00000000 */ nop .L8003553C: /* 1093C 8003553C 0C051FB1 */ jal func_80147EC4 /* 10940 80035540 24040003 */ addiu $a0, $zero, 3 @@ -52,10 +52,10 @@ glabel func_800354EC .L8003559C: /* 1099C 8003559C 82020000 */ lb $v0, ($s0) /* 109A0 800355A0 04410003 */ bgez $v0, .L800355B0 -/* 109A4 800355A4 00000000 */ nop +/* 109A4 800355A4 00000000 */ nop .L800355A8: /* 109A8 800355A8 0C090C68 */ jal func_802431A0 -/* 109AC 800355AC 00000000 */ nop +/* 109AC 800355AC 00000000 */ nop .L800355B0: /* 109B0 800355B0 8FBF0018 */ lw $ra, 0x18($sp) /* 109B4 800355B4 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_10400_len_d30/func_800355D4.s b/asm/nonmatchings/code_10400_len_d30/func_800355D4.s index 1438bcaf03..b52b7dfbf9 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_800355D4.s +++ b/asm/nonmatchings/code_10400_len_d30/func_800355D4.s @@ -8,7 +8,7 @@ glabel func_800355D4 /* 109E0 800355E0 18A00009 */ blez $a1, .L80035608 /* 109E4 800355E4 AFBF0010 */ sw $ra, 0x10($sp) /* 109E8 800355E8 44850000 */ mtc1 $a1, $f0 -/* 109EC 800355EC 00000000 */ nop +/* 109EC 800355EC 00000000 */ nop /* 109F0 800355F0 46800020 */ cvt.s.w $f0, $f0 /* 109F4 800355F4 44050000 */ mfc1 $a1, $f0 /* 109F8 800355F8 3C01800A */ lui $at, %hi(D_800A0931) @@ -18,7 +18,7 @@ glabel func_800355D4 .L80035608: /* 10A08 80035608 24020001 */ addiu $v0, $zero, 1 /* 10A0C 8003560C 44850000 */ mtc1 $a1, $f0 -/* 10A10 80035610 00000000 */ nop +/* 10A10 80035610 00000000 */ nop /* 10A14 80035614 46800020 */ cvt.s.w $f0, $f0 /* 10A18 80035618 44050000 */ mfc1 $a1, $f0 /* 10A1C 8003561C 0000202D */ daddu $a0, $zero, $zero @@ -26,7 +26,7 @@ glabel func_800355D4 /* 10A24 80035624 A0220931 */ sb $v0, %lo(D_800A0931)($at) .L80035628: /* 10A28 80035628 0C04DF62 */ jal func_80137D88 -/* 10A2C 8003562C 00000000 */ nop +/* 10A2C 8003562C 00000000 */ nop /* 10A30 80035630 24020001 */ addiu $v0, $zero, 1 /* 10A34 80035634 3C04800A */ lui $a0, %hi(D_8009A650) /* 10A38 80035638 2484A650 */ addiu $a0, $a0, %lo(D_8009A650) diff --git a/asm/nonmatchings/code_10400_len_d30/func_80035660.s b/asm/nonmatchings/code_10400_len_d30/func_80035660.s index 23b209e191..4251953073 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_80035660.s +++ b/asm/nonmatchings/code_10400_len_d30/func_80035660.s @@ -11,13 +11,13 @@ glabel func_80035660 /* 10A78 80035678 3C01800A */ lui $at, %hi(D_800A0930) /* 10A7C 8003567C A0200930 */ sb $zero, %lo(D_800A0930)($at) /* 10A80 80035680 0C0912F1 */ jal func_80244BC4 -/* 10A84 80035684 00000000 */ nop +/* 10A84 80035684 00000000 */ nop /* 10A88 80035688 14400005 */ bnez $v0, .L800356A0 -/* 10A8C 8003568C 00000000 */ nop +/* 10A8C 8003568C 00000000 */ nop /* 10A90 80035690 0C04E0A8 */ jal set_map_transition_effect /* 10A94 80035694 24040007 */ addiu $a0, $zero, 7 /* 10A98 80035698 0800D5B8 */ j .L800356E0 -/* 10A9C 8003569C 00000000 */ nop +/* 10A9C 8003569C 00000000 */ nop .L800356A0: /* 10AA0 800356A0 0C04E0A8 */ jal set_map_transition_effect /* 10AA4 800356A4 24040008 */ addiu $a0, $zero, 8 diff --git a/asm/nonmatchings/code_10400_len_d30/func_80035704.s b/asm/nonmatchings/code_10400_len_d30/func_80035704.s index b94fed1b39..00836fef17 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_80035704.s +++ b/asm/nonmatchings/code_10400_len_d30/func_80035704.s @@ -12,11 +12,12 @@ glabel func_80035704 /* 10B20 80035720 10400101 */ beqz $v0, .L80035B28 /* 10B24 80035724 AFB00018 */ sw $s0, 0x18($sp) /* 10B28 80035728 00031080 */ sll $v0, $v1, 2 -/* 10B2C 8003572C 3C01800A */ lui $at, %hi(D_800982E8) +/* 10B2C 8003572C 3C01800A */ lui $at, %hi(jtbl_800982E8_736E8) /* 10B30 80035730 00220821 */ addu $at, $at, $v0 -/* 10B34 80035734 8C2282E8 */ lw $v0, %lo(D_800982E8)($at) +/* 10B34 80035734 8C2282E8 */ lw $v0, %lo(jtbl_800982E8_736E8)($at) /* 10B38 80035738 00400008 */ jr $v0 -/* 10B3C 8003573C 00000000 */ nop +/* 10B3C 8003573C 00000000 */ nop +glabel L80035740_10B40 /* 10B40 80035740 3C10800A */ lui $s0, %hi(D_800A0932) /* 10B44 80035744 26100932 */ addiu $s0, $s0, %lo(D_800A0932) /* 10B48 80035748 86020000 */ lh $v0, ($s0) @@ -30,20 +31,21 @@ glabel func_80035704 .L80035768: /* 10B68 80035768 86020000 */ lh $v0, ($s0) /* 10B6C 8003576C 44820000 */ mtc1 $v0, $f0 -/* 10B70 80035770 00000000 */ nop +/* 10B70 80035770 00000000 */ nop /* 10B74 80035774 46800020 */ cvt.s.w $f0, $f0 /* 10B78 80035778 44050000 */ mfc1 $a1, $f0 /* 10B7C 8003577C 0C04DF62 */ jal func_80137D88 /* 10B80 80035780 0000202D */ daddu $a0, $zero, $zero /* 10B84 80035784 86020000 */ lh $v0, ($s0) /* 10B88 80035788 144000E7 */ bnez $v0, .L80035B28 -/* 10B8C 8003578C 00000000 */ nop +/* 10B8C 8003578C 00000000 */ nop .L80035790: /* 10B90 80035790 24020001 */ addiu $v0, $zero, 1 /* 10B94 80035794 3C01800A */ lui $at, %hi(D_800A0931) /* 10B98 80035798 A0220931 */ sb $v0, %lo(D_800A0931)($at) /* 10B9C 8003579C 0800D6CA */ j .L80035B28 -/* 10BA0 800357A0 00000000 */ nop +/* 10BA0 800357A0 00000000 */ nop +glabel L800357A4_10BA4 /* 10BA4 800357A4 3C10800A */ lui $s0, %hi(D_800A0932) /* 10BA8 800357A8 26100932 */ addiu $s0, $s0, %lo(D_800A0932) /* 10BAC 800357AC 241100FF */ addiu $s1, $zero, 0xff @@ -60,26 +62,27 @@ glabel func_80035704 .L800357D8: /* 10BD8 800357D8 86020000 */ lh $v0, ($s0) /* 10BDC 800357DC 44820000 */ mtc1 $v0, $f0 -/* 10BE0 800357E0 00000000 */ nop +/* 10BE0 800357E0 00000000 */ nop /* 10BE4 800357E4 46800020 */ cvt.s.w $f0, $f0 /* 10BE8 800357E8 44050000 */ mfc1 $a1, $f0 /* 10BEC 800357EC 0C04DF62 */ jal func_80137D88 /* 10BF0 800357F0 0000202D */ daddu $a0, $zero, $zero /* 10BF4 800357F4 86020000 */ lh $v0, ($s0) /* 10BF8 800357F8 145100CB */ bne $v0, $s1, .L80035B28 -/* 10BFC 800357FC 00000000 */ nop +/* 10BFC 800357FC 00000000 */ nop .L80035800: /* 10C00 80035800 24020002 */ addiu $v0, $zero, 2 /* 10C04 80035804 3C01800A */ lui $at, %hi(D_800A0931) /* 10C08 80035808 A0220931 */ sb $v0, %lo(D_800A0931)($at) /* 10C0C 8003580C 0800D6CA */ j .L80035B28 -/* 10C10 80035810 00000000 */ nop +/* 10C10 80035810 00000000 */ nop +glabel L80035814_10C14 /* 10C14 80035814 3C06800A */ lui $a2, %hi(D_800A0930) /* 10C18 80035818 24C60930 */ addiu $a2, $a2, %lo(D_800A0930) /* 10C1C 8003581C 80C30000 */ lb $v1, ($a2) /* 10C20 80035820 24020003 */ addiu $v0, $zero, 3 /* 10C24 80035824 14620006 */ bne $v1, $v0, .L80035840 -/* 10C28 80035828 00000000 */ nop +/* 10C28 80035828 00000000 */ nop /* 10C2C 8003582C 3C03800A */ lui $v1, %hi(D_8009A650) /* 10C30 80035830 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) /* 10C34 80035834 8C620000 */ lw $v0, ($v1) @@ -100,7 +103,7 @@ glabel func_80035704 /* 10C6C 8003586C 0C017CBC */ jal nuGfxSetCfb /* 10C70 80035870 A0C20000 */ sb $v0, ($a2) /* 10C74 80035874 0C0912C0 */ jal func_80244B00 -/* 10C78 80035878 00000000 */ nop +/* 10C78 80035878 00000000 */ nop /* 10C7C 8003587C 3C04800A */ lui $a0, %hi(D_8009A650) /* 10C80 80035880 2484A650 */ addiu $a0, $a0, %lo(D_8009A650) /* 10C84 80035884 8C820000 */ lw $v0, ($a0) @@ -123,37 +126,37 @@ glabel func_80035704 /* 10CC8 800358C8 0C016BE1 */ jal func_8005AF84 /* 10CCC 800358CC 00A38821 */ addu $s1, $a1, $v1 /* 10CD0 800358D0 0C00AB37 */ jal func_8002ACDC -/* 10CD4 800358D4 00000000 */ nop +/* 10CD4 800358D4 00000000 */ nop /* 10CD8 800358D8 0C05259C */ jal func_80149670 /* 10CDC 800358DC 24040001 */ addiu $a0, $zero, 1 /* 10CE0 800358E0 8E020000 */ lw $v0, ($s0) /* 10CE4 800358E4 0C0B763E */ jal func_802DD8F8 /* 10CE8 800358E8 80440084 */ lb $a0, 0x84($v0) /* 10CEC 800358EC 0C0457FA */ jal init_model_data -/* 10CF0 800358F0 00000000 */ nop +/* 10CF0 800358F0 00000000 */ nop /* 10CF4 800358F4 0C05203C */ jal func_801480F0 -/* 10CF8 800358F8 00000000 */ nop +/* 10CF8 800358F8 00000000 */ nop /* 10CFC 800358FC 0C048316 */ jal init_virtual_models -/* 10D00 80035900 00000000 */ nop +/* 10D00 80035900 00000000 */ nop /* 10D04 80035904 0C0478C4 */ jal func_8011E310 -/* 10D08 80035908 00000000 */ nop +/* 10D08 80035908 00000000 */ nop /* 10D0C 8003590C 0C048C45 */ jal init_dynamic_entity_list -/* 10D10 80035910 00000000 */ nop +/* 10D10 80035910 00000000 */ nop /* 10D14 80035914 0000202D */ daddu $a0, $zero, $zero /* 10D18 80035918 0C0514BA */ jal func_801452E8 /* 10D1C 8003591C 0080282D */ daddu $a1, $a0, $zero /* 10D20 80035920 0C0504C0 */ jal init_menu_icon_list -/* 10D24 80035924 00000000 */ nop +/* 10D24 80035924 00000000 */ nop /* 10D28 80035928 0C04C433 */ jal init_item_entity_list -/* 10D2C 8003592C 00000000 */ nop +/* 10D2C 8003592C 00000000 */ nop /* 10D30 80035930 0C0B0CBB */ jal init_script_list -/* 10D34 80035934 00000000 */ nop +/* 10D34 80035934 00000000 */ nop /* 10D38 80035938 0C00E14B */ jal init_npc_list -/* 10D3C 8003593C 00000000 */ nop +/* 10D3C 8003593C 00000000 */ nop /* 10D40 80035940 0C044396 */ jal func_80110E58 -/* 10D44 80035944 00000000 */ nop +/* 10D44 80035944 00000000 */ nop /* 10D48 80035948 0C0515CA */ jal init_trigger_list -/* 10D4C 8003594C 00000000 */ nop +/* 10D4C 8003594C 00000000 */ nop /* 10D50 80035950 3C04800E */ lui $a0, %hi(D_800D9230) /* 10D54 80035954 24849230 */ addiu $a0, $a0, %lo(D_800D9230) /* 10D58 80035958 0C016B3A */ jal load_asset_by_name @@ -166,12 +169,12 @@ glabel func_80035704 /* 10D74 80035974 0C00AB1E */ jal general_heap_free /* 10D78 80035978 0200202D */ daddu $a0, $s0, $zero /* 10D7C 8003597C 0C016BE5 */ jal initialize_collision -/* 10D80 80035980 00000000 */ nop +/* 10D80 80035980 00000000 */ nop /* 10D84 80035984 0C016C16 */ jal load_collision -/* 10D88 80035988 00000000 */ nop +/* 10D88 80035988 00000000 */ nop /* 10D8C 8003598C 8E240008 */ lw $a0, 8($s1) /* 10D90 80035990 10800004 */ beqz $a0, .L800359A4 -/* 10D94 80035994 00000000 */ nop +/* 10D94 80035994 00000000 */ nop /* 10D98 80035998 8E25000C */ lw $a1, 0xc($s1) /* 10D9C 8003599C 0C00A5CF */ jal dma_copy /* 10DA0 800359A0 8E260010 */ lw $a2, 0x10($s1) @@ -182,9 +185,9 @@ glabel func_80035704 /* 10DB0 800359B0 50800005 */ beql $a0, $zero, .L800359C8 /* 10DB4 800359B4 24040128 */ addiu $a0, $zero, 0x128 /* 10DB8 800359B8 0C05178A */ jal read_background_size -/* 10DBC 800359BC 00000000 */ nop +/* 10DBC 800359BC 00000000 */ nop /* 10DC0 800359C0 0800D676 */ j .L800359D8 -/* 10DC4 800359C4 00000000 */ nop +/* 10DC4 800359C4 00000000 */ nop .L800359C8: /* 10DC8 800359C8 240500C8 */ addiu $a1, $zero, 0xc8 /* 10DCC 800359CC 2406000C */ addiu $a2, $zero, 0xc @@ -192,11 +195,11 @@ glabel func_80035704 /* 10DD4 800359D4 24070014 */ addiu $a3, $zero, 0x14 .L800359D8: /* 10DD8 800359D8 0C04584B */ jal calculate_model_sizes -/* 10DDC 800359DC 00000000 */ nop +/* 10DDC 800359DC 00000000 */ nop /* 10DE0 800359E0 0C00EC6C */ jal func_8003B1B0 -/* 10DE4 800359E4 00000000 */ nop +/* 10DE4 800359E4 00000000 */ nop /* 10DE8 800359E8 0C03A631 */ jal func_800E98C4 -/* 10DEC 800359EC 00000000 */ nop +/* 10DEC 800359EC 00000000 */ nop /* 10DF0 800359F0 0C009C22 */ jal func_80027088 /* 10DF4 800359F4 24040001 */ addiu $a0, $zero, 1 .L800359F8: @@ -206,13 +209,13 @@ glabel func_80035704 /* 10E04 80035A04 3C01800A */ lui $at, %hi(D_800A0931) /* 10E08 80035A08 A0220931 */ sb $v0, %lo(D_800A0931)($at) /* 10E0C 80035A0C 0C037DD0 */ jal update_player -/* 10E10 80035A10 00000000 */ nop +/* 10E10 80035A10 00000000 */ nop /* 10E14 80035A14 0C00E64C */ jal update_npcs -/* 10E18 80035A18 00000000 */ nop +/* 10E18 80035A18 00000000 */ nop /* 10E1C 80035A1C 0C00F949 */ jal func_8003E524 -/* 10E20 80035A20 00000000 */ nop +/* 10E20 80035A20 00000000 */ nop /* 10E24 80035A24 0C016754 */ jal func_80059D50 -/* 10E28 80035A28 00000000 */ nop +/* 10E28 80035A28 00000000 */ nop /* 10E2C 80035A2C 3C03800A */ lui $v1, %hi(D_800A0932) /* 10E30 80035A30 24630932 */ addiu $v1, $v1, %lo(D_800A0932) /* 10E34 80035A34 94620000 */ lhu $v0, ($v1) @@ -224,19 +227,20 @@ glabel func_80035704 .L80035A4C: /* 10E4C 80035A4C 84620000 */ lh $v0, ($v1) /* 10E50 80035A50 44820000 */ mtc1 $v0, $f0 -/* 10E54 80035A54 00000000 */ nop +/* 10E54 80035A54 00000000 */ nop /* 10E58 80035A58 46800020 */ cvt.s.w $f0, $f0 /* 10E5C 80035A5C 44050000 */ mfc1 $a1, $f0 /* 10E60 80035A60 0800D6C8 */ j .L80035B20 /* 10E64 80035A64 0000202D */ daddu $a0, $zero, $zero +glabel L80035A68_10E68 /* 10E68 80035A68 0C037DD0 */ jal update_player -/* 10E6C 80035A6C 00000000 */ nop +/* 10E6C 80035A6C 00000000 */ nop /* 10E70 80035A70 0C00E64C */ jal update_npcs -/* 10E74 80035A74 00000000 */ nop +/* 10E74 80035A74 00000000 */ nop /* 10E78 80035A78 0C00F949 */ jal func_8003E524 -/* 10E7C 80035A7C 00000000 */ nop +/* 10E7C 80035A7C 00000000 */ nop /* 10E80 80035A80 0C016754 */ jal func_80059D50 -/* 10E84 80035A84 00000000 */ nop +/* 10E84 80035A84 00000000 */ nop /* 10E88 80035A88 3C04800A */ lui $a0, %hi(D_800A0932) /* 10E8C 80035A8C 24840932 */ addiu $a0, $a0, %lo(D_800A0932) /* 10E90 80035A90 84820000 */ lh $v0, ($a0) @@ -247,7 +251,7 @@ glabel func_80035704 /* 10EA4 80035AA4 3C01800A */ lui $at, %hi(D_800A0931) /* 10EA8 80035AA8 A0220931 */ sb $v0, %lo(D_800A0931)($at) /* 10EAC 80035AAC 0800D6CA */ j .L80035B28 -/* 10EB0 80035AB0 00000000 */ nop +/* 10EB0 80035AB0 00000000 */ nop .L80035AB4: /* 10EB4 80035AB4 A4820000 */ sh $v0, ($a0) /* 10EB8 80035AB8 00021400 */ sll $v0, $v0, 0x10 @@ -256,30 +260,31 @@ glabel func_80035704 .L80035AC4: /* 10EC4 80035AC4 84820000 */ lh $v0, ($a0) /* 10EC8 80035AC8 44820000 */ mtc1 $v0, $f0 -/* 10ECC 80035ACC 00000000 */ nop +/* 10ECC 80035ACC 00000000 */ nop /* 10ED0 80035AD0 46800020 */ cvt.s.w $f0, $f0 /* 10ED4 80035AD4 44050000 */ mfc1 $a1, $f0 /* 10ED8 80035AD8 0800D6C8 */ j .L80035B20 /* 10EDC 80035ADC 0000202D */ daddu $a0, $zero, $zero +glabel L80035AE0_10EE0 /* 10EE0 80035AE0 0C009C22 */ jal func_80027088 /* 10EE4 80035AE4 0000202D */ daddu $a0, $zero, $zero /* 10EE8 80035AE8 0C037DD0 */ jal update_player -/* 10EEC 80035AEC 00000000 */ nop +/* 10EEC 80035AEC 00000000 */ nop /* 10EF0 80035AF0 0C00E64C */ jal update_npcs -/* 10EF4 80035AF4 00000000 */ nop +/* 10EF4 80035AF4 00000000 */ nop /* 10EF8 80035AF8 0C00F949 */ jal func_8003E524 -/* 10EFC 80035AFC 00000000 */ nop +/* 10EFC 80035AFC 00000000 */ nop /* 10F00 80035B00 0C016754 */ jal func_80059D50 -/* 10F04 80035B04 00000000 */ nop +/* 10F04 80035B04 00000000 */ nop /* 10F08 80035B08 0C038069 */ jal enable_player_input -/* 10F0C 80035B0C 00000000 */ nop +/* 10F0C 80035B0C 00000000 */ nop /* 10F10 80035B10 0C00CD3C */ jal set_game_mode /* 10F14 80035B14 24040004 */ addiu $a0, $zero, 4 /* 10F18 80035B18 3C05BF80 */ lui $a1, 0xbf80 /* 10F1C 80035B1C 240400FF */ addiu $a0, $zero, 0xff .L80035B20: /* 10F20 80035B20 0C04DF62 */ jal func_80137D88 -/* 10F24 80035B24 00000000 */ nop +/* 10F24 80035B24 00000000 */ nop .L80035B28: /* 10F28 80035B28 8FBF0024 */ lw $ra, 0x24($sp) /* 10F2C 80035B2C 8FB20020 */ lw $s2, 0x20($sp) diff --git a/asm/nonmatchings/code_10400_len_d30/func_80035B40.s b/asm/nonmatchings/code_10400_len_d30/func_80035B40.s index 39f7746217..8050f3b5f7 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_80035B40.s +++ b/asm/nonmatchings/code_10400_len_d30/func_80035B40.s @@ -12,11 +12,12 @@ glabel func_80035B40 /* 10F5C 80035B5C 2C620007 */ sltiu $v0, $v1, 7 /* 10F60 80035B60 10400069 */ beqz $v0, .L80035D08 /* 10F64 80035B64 00031080 */ sll $v0, $v1, 2 -/* 10F68 80035B68 3C01800A */ lui $at, %hi(D_80098300) +/* 10F68 80035B68 3C01800A */ lui $at, %hi(jtbl_80098300_73700) /* 10F6C 80035B6C 00220821 */ addu $at, $at, $v0 -/* 10F70 80035B70 8C228300 */ lw $v0, %lo(D_80098300)($at) +/* 10F70 80035B70 8C228300 */ lw $v0, %lo(jtbl_80098300_73700)($at) /* 10F74 80035B74 00400008 */ jr $v0 -/* 10F78 80035B78 00000000 */ nop +/* 10F78 80035B78 00000000 */ nop +glabel L80035B7C_10F7C /* 10F7C 80035B7C 0000282D */ daddu $a1, $zero, $zero /* 10F80 80035B80 2404002C */ addiu $a0, $zero, 0x2c /* 10F84 80035B84 0080382D */ daddu $a3, $a0, $zero @@ -26,7 +27,7 @@ glabel func_80035B40 .L80035B94: /* 10F94 80035B94 80620003 */ lb $v0, 3($v1) /* 10F98 80035B98 10470003 */ beq $v0, $a3, .L80035BA8 -/* 10F9C 80035B9C 00000000 */ nop +/* 10F9C 80035B9C 00000000 */ nop /* 10FA0 80035BA0 54460005 */ bnel $v0, $a2, .L80035BB8 /* 10FA4 80035BA4 24840001 */ addiu $a0, $a0, 1 .L80035BA8: @@ -43,13 +44,14 @@ glabel func_80035B40 /* 10FCC 80035BCC 3C01800A */ lui $at, %hi(D_800A0931) /* 10FD0 80035BD0 A0220931 */ sb $v0, %lo(D_800A0931)($at) /* 10FD4 80035BD4 0800D742 */ j .L80035D08 -/* 10FD8 80035BD8 00000000 */ nop +/* 10FD8 80035BD8 00000000 */ nop +glabel L80035BDC_10FDC /* 10FDC 80035BDC 12000008 */ beqz $s0, .L80035C00 /* 10FE0 80035BE0 24020002 */ addiu $v0, $zero, 2 /* 10FE4 80035BE4 3C04800A */ lui $a0, %hi(D_800A0932) /* 10FE8 80035BE8 24840932 */ addiu $a0, $a0, %lo(D_800A0932) /* 10FEC 80035BEC 0C04E0AB */ jal func_801382AC -/* 10FF0 80035BF0 00000000 */ nop +/* 10FF0 80035BF0 00000000 */ nop /* 10FF4 80035BF4 00021400 */ sll $v0, $v0, 0x10 /* 10FF8 80035BF8 10400043 */ beqz $v0, .L80035D08 /* 10FFC 80035BFC 24020002 */ addiu $v0, $zero, 2 @@ -57,14 +59,16 @@ glabel func_80035B40 /* 11000 80035C00 3C01800A */ lui $at, %hi(D_800A0931) /* 11004 80035C04 A0220931 */ sb $v0, %lo(D_800A0931)($at) /* 11008 80035C08 0800D742 */ j .L80035D08 -/* 1100C 80035C0C 00000000 */ nop +/* 1100C 80035C0C 00000000 */ nop +glabel L80035C10_11010 /* 11010 80035C10 0C0912C0 */ jal func_80244B00 -/* 11014 80035C14 00000000 */ nop +/* 11014 80035C14 00000000 */ nop /* 11018 80035C18 0C051FB1 */ jal func_80147EC4 /* 1101C 80035C1C 0000202D */ daddu $a0, $zero, $zero /* 11020 80035C20 24020003 */ addiu $v0, $zero, 3 /* 11024 80035C24 3C01800A */ lui $at, %hi(D_800A0931) /* 11028 80035C28 A0220931 */ sb $v0, %lo(D_800A0931)($at) +glabel L80035C2C_1102C /* 1102C 80035C2C 0C009C22 */ jal func_80027088 /* 11030 80035C30 0000202D */ daddu $a0, $zero, $zero /* 11034 80035C34 1600000B */ bnez $s0, .L80035C64 @@ -86,7 +90,8 @@ glabel func_80035B40 /* 11070 80035C70 3C01800A */ lui $at, %hi(D_800A0931) /* 11074 80035C74 A0220931 */ sb $v0, %lo(D_800A0931)($at) /* 11078 80035C78 0800D742 */ j .L80035D08 -/* 1107C 80035C7C 00000000 */ nop +/* 1107C 80035C7C 00000000 */ nop +glabel L80035C80_11080 /* 11080 80035C80 3C10800A */ lui $s0, %hi(D_800A0930) /* 11084 80035C84 26100930 */ addiu $s0, $s0, %lo(D_800A0930) /* 11088 80035C88 82020000 */ lb $v0, ($s0) @@ -99,14 +104,15 @@ glabel func_80035B40 /* 110A0 80035CA0 3C014000 */ lui $at, 0x4000 /* 110A4 80035CA4 44816000 */ mtc1 $at, $f12 /* 110A8 80035CA8 0C00AFB7 */ jal set_curtain_scale_goal -/* 110AC 80035CAC 00000000 */ nop +/* 110AC 80035CAC 00000000 */ nop /* 110B0 80035CB0 2402000A */ addiu $v0, $zero, 0xa /* 110B4 80035CB4 A2020000 */ sb $v0, ($s0) /* 110B8 80035CB8 24020005 */ addiu $v0, $zero, 5 /* 110BC 80035CBC 3C01800A */ lui $at, %hi(D_800A0931) /* 110C0 80035CC0 A0220931 */ sb $v0, %lo(D_800A0931)($at) /* 110C4 80035CC4 0800D742 */ j .L80035D08 -/* 110C8 80035CC8 00000000 */ nop +/* 110C8 80035CC8 00000000 */ nop +glabel L80035CCC_110CC /* 110CC 80035CCC 3C04800A */ lui $a0, %hi(D_800A0930) /* 110D0 80035CD0 24840930 */ addiu $a0, $a0, %lo(D_800A0930) /* 110D4 80035CD4 80820000 */ lb $v0, ($a0) @@ -120,7 +126,8 @@ glabel func_80035B40 /* 110F0 80035CF0 3C01800A */ lui $at, %hi(D_800A0931) /* 110F4 80035CF4 A0220931 */ sb $v0, %lo(D_800A0931)($at) /* 110F8 80035CF8 0800D742 */ j .L80035D08 -/* 110FC 80035CFC 00000000 */ nop +/* 110FC 80035CFC 00000000 */ nop +glabel L80035D00_11100 /* 11100 80035D00 0C00CD3C */ jal set_game_mode /* 11104 80035D04 24040007 */ addiu $a0, $zero, 7 .L80035D08: diff --git a/asm/nonmatchings/code_104940_len_dc0/entity_init_HammerBlock_small.s b/asm/nonmatchings/code_104940_len_dc0/entity_init_HammerBlock_small.s index 3e3fc2099b..92f930c759 100644 --- a/asm/nonmatchings/code_104940_len_dc0/entity_init_HammerBlock_small.s +++ b/asm/nonmatchings/code_104940_len_dc0/entity_init_HammerBlock_small.s @@ -19,6 +19,6 @@ glabel entity_init_HammerBlock_small /* 1056E8 802E3E68 E480005C */ swc1 $f0, 0x5c($a0) /* 1056EC 802E3E6C 03E00008 */ jr $ra /* 1056F0 802E3E70 AC820000 */ sw $v0, ($a0) -/* 1056F4 802E3E74 00000000 */ nop -/* 1056F8 802E3E78 00000000 */ nop -/* 1056FC 802E3E7C 00000000 */ nop +/* 1056F4 802E3E74 00000000 */ nop +/* 1056F8 802E3E78 00000000 */ nop +/* 1056FC 802E3E7C 00000000 */ nop diff --git a/asm/nonmatchings/code_104940_len_dc0/func_802E30C0.s b/asm/nonmatchings/code_104940_len_dc0/func_802E30C0.s index 93a7ee397d..b278b9f0b3 100644 --- a/asm/nonmatchings/code_104940_len_dc0/func_802E30C0.s +++ b/asm/nonmatchings/code_104940_len_dc0/func_802E30C0.s @@ -8,7 +8,7 @@ glabel func_802E30C0 /* 10494C 802E30CC 8E10A66C */ lw $s0, %lo(gMasterGfxPos)($s0) /* 104950 802E30D0 AFBF0014 */ sw $ra, 0x14($sp) /* 104954 802E30D4 0C04417A */ jal get_entity_by_index -/* 104958 802E30D8 00000000 */ nop +/* 104958 802E30D8 00000000 */ nop /* 10495C 802E30DC 3C04E300 */ lui $a0, 0xe300 /* 104960 802E30E0 34841001 */ ori $a0, $a0, 0x1001 /* 104964 802E30E4 3C05D700 */ lui $a1, 0xd700 diff --git a/asm/nonmatchings/code_104940_len_dc0/func_802E31EC.s b/asm/nonmatchings/code_104940_len_dc0/func_802E31EC.s index aa6f51b097..6d035d0cf1 100644 --- a/asm/nonmatchings/code_104940_len_dc0/func_802E31EC.s +++ b/asm/nonmatchings/code_104940_len_dc0/func_802E31EC.s @@ -11,7 +11,7 @@ glabel func_802E31EC /* 104A84 802E3204 2442FFE8 */ addiu $v0, $v0, -0x18 /* 104A88 802E3208 2C420003 */ sltiu $v0, $v0, 3 /* 104A8C 802E320C 1040000D */ beqz $v0, .L802E3244 -/* 104A90 802E3210 00000000 */ nop +/* 104A90 802E3210 00000000 */ nop /* 104A94 802E3214 3C013E6B */ lui $at, 0x3e6b /* 104A98 802E3218 3421851F */ ori $at, $at, 0x851f /* 104A9C 802E321C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_104940_len_dc0/func_802E328C.s b/asm/nonmatchings/code_104940_len_dc0/func_802E328C.s index d114cd9266..37644ff04a 100644 --- a/asm/nonmatchings/code_104940_len_dc0/func_802E328C.s +++ b/asm/nonmatchings/code_104940_len_dc0/func_802E328C.s @@ -11,7 +11,7 @@ glabel func_802E328C /* 104B24 802E32A4 2442FFE8 */ addiu $v0, $v0, -0x18 /* 104B28 802E32A8 2C420003 */ sltiu $v0, $v0, 3 /* 104B2C 802E32AC 10400012 */ beqz $v0, .L802E32F8 -/* 104B30 802E32B0 00000000 */ nop +/* 104B30 802E32B0 00000000 */ nop /* 104B34 802E32B4 C6000054 */ lwc1 $f0, 0x54($s0) /* 104B38 802E32B8 3C01802F */ lui $at, %hi(D_802EB1D0) /* 104B3C 802E32BC D424B1D0 */ ldc1 $f4, %lo(D_802EB1D0)($at) diff --git a/asm/nonmatchings/code_104940_len_dc0/func_802E3370.s b/asm/nonmatchings/code_104940_len_dc0/func_802E3370.s index 12015016b3..94ba4fce2b 100644 --- a/asm/nonmatchings/code_104940_len_dc0/func_802E3370.s +++ b/asm/nonmatchings/code_104940_len_dc0/func_802E3370.s @@ -28,36 +28,36 @@ glabel func_802E3370 /* 104C48 802E33C8 C6220014 */ lwc1 $f2, 0x14($s1) /* 104C4C 802E33CC 3C0141C8 */ lui $at, 0x41c8 /* 104C50 802E33D0 44810000 */ mtc1 $at, $f0 -/* 104C54 802E33D4 00000000 */ nop +/* 104C54 802E33D4 00000000 */ nop /* 104C58 802E33D8 46001001 */ sub.s $f0, $f2, $f0 /* 104C5C 802E33DC C604004C */ lwc1 $f4, 0x4c($s0) /* 104C60 802E33E0 4600203C */ c.lt.s $f4, $f0 -/* 104C64 802E33E4 00000000 */ nop +/* 104C64 802E33E4 00000000 */ nop /* 104C68 802E33E8 4502000A */ bc1fl .L802E3414 /* 104C6C 802E33EC 46041081 */ sub.s $f2, $f2, $f4 /* 104C70 802E33F0 46022001 */ sub.s $f0, $f4, $f2 /* 104C74 802E33F4 3C014248 */ lui $at, 0x4248 /* 104C78 802E33F8 44811000 */ mtc1 $at, $f2 -/* 104C7C 802E33FC 00000000 */ nop +/* 104C7C 802E33FC 00000000 */ nop /* 104C80 802E3400 46020000 */ add.s $f0, $f0, $f2 /* 104C84 802E3404 3C013E00 */ lui $at, 0x3e00 /* 104C88 802E3408 44811000 */ mtc1 $at, $f2 /* 104C8C 802E340C 080B8D08 */ j .L802E3420 -/* 104C90 802E3410 00000000 */ nop +/* 104C90 802E3410 00000000 */ nop .L802E3414: /* 104C94 802E3414 3C013E00 */ lui $at, 0x3e00 /* 104C98 802E3418 44810000 */ mtc1 $at, $f0 -/* 104C9C 802E341C 00000000 */ nop +/* 104C9C 802E341C 00000000 */ nop .L802E3420: /* 104CA0 802E3420 46001102 */ mul.s $f4, $f2, $f0 -/* 104CA4 802E3424 00000000 */ nop +/* 104CA4 802E3424 00000000 */ nop /* 104CA8 802E3428 3C01802F */ lui $at, %hi(D_802EB1F0) /* 104CAC 802E342C D422B1F0 */ ldc1 $f2, %lo(D_802EB1F0)($at) /* 104CB0 802E3430 46002021 */ cvt.d.s $f0, $f4 /* 104CB4 802E3434 4620103C */ c.lt.d $f2, $f0 -/* 104CB8 802E3438 00000000 */ nop +/* 104CB8 802E3438 00000000 */ nop /* 104CBC 802E343C 45000004 */ bc1f .L802E3450 -/* 104CC0 802E3440 00000000 */ nop +/* 104CC0 802E3440 00000000 */ nop /* 104CC4 802E3444 3C013F99 */ lui $at, 0x3f99 /* 104CC8 802E3448 3421999A */ ori $at, $at, 0x999a /* 104CCC 802E344C 44812000 */ mtc1 $at, $f4 @@ -66,9 +66,9 @@ glabel func_802E3370 /* 104CD4 802E3454 D422B1F8 */ ldc1 $f2, %lo(D_802EB1F8)($at) /* 104CD8 802E3458 46002021 */ cvt.d.s $f0, $f4 /* 104CDC 802E345C 4622003C */ c.lt.d $f0, $f2 -/* 104CE0 802E3460 00000000 */ nop +/* 104CE0 802E3460 00000000 */ nop /* 104CE4 802E3464 45000004 */ bc1f .L802E3478 -/* 104CE8 802E3468 00000000 */ nop +/* 104CE8 802E3468 00000000 */ nop /* 104CEC 802E346C 3C013E99 */ lui $at, 0x3e99 /* 104CF0 802E3470 3421999A */ ori $at, $at, 0x999a /* 104CF4 802E3474 44812000 */ mtc1 $at, $f4 @@ -78,7 +78,7 @@ glabel func_802E3370 /* 104D00 802E3480 E600004C */ swc1 $f0, 0x4c($s0) /* 104D04 802E3484 C6220014 */ lwc1 $f2, 0x14($s1) /* 104D08 802E3488 4600103C */ c.lt.s $f2, $f0 -/* 104D0C 802E348C 00000000 */ nop +/* 104D0C 802E348C 00000000 */ nop /* 104D10 802E3490 45000069 */ bc1f .L802E3638 /* 104D14 802E3494 3C03FFDF */ lui $v1, 0xffdf /* 104D18 802E3498 2402FFFF */ addiu $v0, $zero, -1 @@ -94,16 +94,16 @@ glabel func_802E3370 /* 104D38 802E34B8 92020006 */ lbu $v0, 6($s0) /* 104D3C 802E34BC 30420004 */ andi $v0, $v0, 4 /* 104D40 802E34C0 10400014 */ beqz $v0, .L802E3514 -/* 104D44 802E34C4 00000000 */ nop +/* 104D44 802E34C4 00000000 */ nop /* 104D48 802E34C8 8CA20000 */ lw $v0, ($a1) /* 104D4C 802E34CC 30420002 */ andi $v0, $v0, 2 /* 104D50 802E34D0 14400058 */ bnez $v0, .L802E3634 /* 104D54 802E34D4 24020001 */ addiu $v0, $zero, 1 /* 104D58 802E34D8 86040016 */ lh $a0, 0x16($s0) /* 104D5C 802E34DC 0C044181 */ jal get_shadow_by_index -/* 104D60 802E34E0 00000000 */ nop +/* 104D60 802E34E0 00000000 */ nop /* 104D64 802E34E4 10400017 */ beqz $v0, .L802E3544 -/* 104D68 802E34E8 00000000 */ nop +/* 104D68 802E34E8 00000000 */ nop /* 104D6C 802E34EC C600004C */ lwc1 $f0, 0x4c($s0) /* 104D70 802E34F0 C4420014 */ lwc1 $f2, 0x14($v0) /* 104D74 802E34F4 46020081 */ sub.s $f2, $f0, $f2 @@ -111,19 +111,19 @@ glabel func_802E3370 /* 104D7C 802E34FC 46020001 */ sub.s $f0, $f0, $f2 /* 104D80 802E3500 24420001 */ addiu $v0, $v0, 1 /* 104D84 802E3504 44821000 */ mtc1 $v0, $f2 -/* 104D88 802E3508 00000000 */ nop +/* 104D88 802E3508 00000000 */ nop /* 104D8C 802E350C 080B8D4B */ j .L802E352C /* 104D90 802E3510 468010A0 */ cvt.s.w $f2, $f2 .L802E3514: /* 104D94 802E3514 0C044181 */ jal get_shadow_by_index /* 104D98 802E3518 86040016 */ lh $a0, 0x16($s0) /* 104D9C 802E351C 10400009 */ beqz $v0, .L802E3544 -/* 104DA0 802E3520 00000000 */ nop +/* 104DA0 802E3520 00000000 */ nop /* 104DA4 802E3524 C600004C */ lwc1 $f0, 0x4c($s0) /* 104DA8 802E3528 C4420014 */ lwc1 $f2, 0x14($v0) .L802E352C: /* 104DAC 802E352C 4602003E */ c.le.s $f0, $f2 -/* 104DB0 802E3530 00000000 */ nop +/* 104DB0 802E3530 00000000 */ nop /* 104DB4 802E3534 45000003 */ bc1f .L802E3544 /* 104DB8 802E3538 24020001 */ addiu $v0, $zero, 1 /* 104DBC 802E353C E602004C */ swc1 $f2, 0x4c($s0) @@ -136,36 +136,36 @@ glabel func_802E3370 /* 104DD4 802E3554 C6220014 */ lwc1 $f2, 0x14($s1) /* 104DD8 802E3558 3C0141C8 */ lui $at, 0x41c8 /* 104DDC 802E355C 44810000 */ mtc1 $at, $f0 -/* 104DE0 802E3560 00000000 */ nop +/* 104DE0 802E3560 00000000 */ nop /* 104DE4 802E3564 46001001 */ sub.s $f0, $f2, $f0 /* 104DE8 802E3568 C604004C */ lwc1 $f4, 0x4c($s0) /* 104DEC 802E356C 4600203C */ c.lt.s $f4, $f0 -/* 104DF0 802E3570 00000000 */ nop +/* 104DF0 802E3570 00000000 */ nop /* 104DF4 802E3574 4502000A */ bc1fl .L802E35A0 /* 104DF8 802E3578 46041081 */ sub.s $f2, $f2, $f4 /* 104DFC 802E357C 46022001 */ sub.s $f0, $f4, $f2 /* 104E00 802E3580 3C014248 */ lui $at, 0x4248 /* 104E04 802E3584 44811000 */ mtc1 $at, $f2 -/* 104E08 802E3588 00000000 */ nop +/* 104E08 802E3588 00000000 */ nop /* 104E0C 802E358C 46020000 */ add.s $f0, $f0, $f2 /* 104E10 802E3590 3C013E00 */ lui $at, 0x3e00 /* 104E14 802E3594 44811000 */ mtc1 $at, $f2 /* 104E18 802E3598 080B8D6B */ j .L802E35AC -/* 104E1C 802E359C 00000000 */ nop +/* 104E1C 802E359C 00000000 */ nop .L802E35A0: /* 104E20 802E35A0 3C013E00 */ lui $at, 0x3e00 /* 104E24 802E35A4 44810000 */ mtc1 $at, $f0 -/* 104E28 802E35A8 00000000 */ nop +/* 104E28 802E35A8 00000000 */ nop .L802E35AC: /* 104E2C 802E35AC 46001102 */ mul.s $f4, $f2, $f0 -/* 104E30 802E35B0 00000000 */ nop +/* 104E30 802E35B0 00000000 */ nop /* 104E34 802E35B4 3C01802F */ lui $at, %hi(D_802EB200) /* 104E38 802E35B8 D422B200 */ ldc1 $f2, %lo(D_802EB200)($at) /* 104E3C 802E35BC 46002021 */ cvt.d.s $f0, $f4 /* 104E40 802E35C0 4620103C */ c.lt.d $f2, $f0 -/* 104E44 802E35C4 00000000 */ nop +/* 104E44 802E35C4 00000000 */ nop /* 104E48 802E35C8 45000004 */ bc1f .L802E35DC -/* 104E4C 802E35CC 00000000 */ nop +/* 104E4C 802E35CC 00000000 */ nop /* 104E50 802E35D0 3C013F99 */ lui $at, 0x3f99 /* 104E54 802E35D4 3421999A */ ori $at, $at, 0x999a /* 104E58 802E35D8 44812000 */ mtc1 $at, $f4 @@ -174,9 +174,9 @@ glabel func_802E3370 /* 104E60 802E35E0 D422B208 */ ldc1 $f2, %lo(D_802EB208)($at) /* 104E64 802E35E4 46002021 */ cvt.d.s $f0, $f4 /* 104E68 802E35E8 4622003C */ c.lt.d $f0, $f2 -/* 104E6C 802E35EC 00000000 */ nop +/* 104E6C 802E35EC 00000000 */ nop /* 104E70 802E35F0 45000004 */ bc1f .L802E3604 -/* 104E74 802E35F4 00000000 */ nop +/* 104E74 802E35F4 00000000 */ nop /* 104E78 802E35F8 3C013E99 */ lui $at, 0x3e99 /* 104E7C 802E35FC 3421999A */ ori $at, $at, 0x999a /* 104E80 802E3600 44812000 */ mtc1 $at, $f4 @@ -189,7 +189,7 @@ glabel func_802E3370 /* 104E98 802E3618 C6240014 */ lwc1 $f4, 0x14($s1) /* 104E9C 802E361C 46022101 */ sub.s $f4, $f4, $f2 /* 104EA0 802E3620 4604003C */ c.lt.s $f0, $f4 -/* 104EA4 802E3624 00000000 */ nop +/* 104EA4 802E3624 00000000 */ nop /* 104EA8 802E3628 45000003 */ bc1f .L802E3638 /* 104EAC 802E362C 24020001 */ addiu $v0, $zero, 1 /* 104EB0 802E3630 E604004C */ swc1 $f4, 0x4c($s0) diff --git a/asm/nonmatchings/code_104940_len_dc0/func_802E3650.s b/asm/nonmatchings/code_104940_len_dc0/func_802E3650.s index 775a4b6e9d..92d98129a7 100644 --- a/asm/nonmatchings/code_104940_len_dc0/func_802E3650.s +++ b/asm/nonmatchings/code_104940_len_dc0/func_802E3650.s @@ -25,11 +25,11 @@ glabel func_802E3650 /* 104F20 802E36A0 1082000A */ beq $a0, $v0, .L802E36CC /* 104F24 802E36A4 0240102D */ daddu $v0, $s2, $zero /* 104F28 802E36A8 0C04C3D6 */ jal get_item_entity -/* 104F2C 802E36AC 00000000 */ nop +/* 104F2C 802E36AC 00000000 */ nop /* 104F30 802E36B0 C600004C */ lwc1 $f0, 0x4c($s0) /* 104F34 802E36B4 3C014080 */ lui $at, 0x4080 /* 104F38 802E36B8 44811000 */ mtc1 $at, $f2 -/* 104F3C 802E36BC 00000000 */ nop +/* 104F3C 802E36BC 00000000 */ nop /* 104F40 802E36C0 46020000 */ add.s $f0, $f0, $f2 /* 104F44 802E36C4 E440000C */ swc1 $f0, 0xc($v0) .L802E36C8: diff --git a/asm/nonmatchings/code_104940_len_dc0/func_802E3728.s b/asm/nonmatchings/code_104940_len_dc0/func_802E3728.s index 43c9031f21..5994386aec 100644 --- a/asm/nonmatchings/code_104940_len_dc0/func_802E3728.s +++ b/asm/nonmatchings/code_104940_len_dc0/func_802E3728.s @@ -15,7 +15,7 @@ glabel func_802E3728 /* 104FD0 802E3750 44810000 */ mtc1 $at, $f0 /* 104FD4 802E3754 C60C0018 */ lwc1 $f12, 0x18($s0) /* 104FD8 802E3758 46006302 */ mul.s $f12, $f12, $f0 -/* 104FDC 802E375C 00000000 */ nop +/* 104FDC 802E375C 00000000 */ nop /* 104FE0 802E3760 C634004C */ lwc1 $f20, 0x4c($s1) /* 104FE4 802E3764 3C0143B4 */ lui $at, 0x43b4 /* 104FE8 802E3768 44810000 */ mtc1 $at, $f0 @@ -33,13 +33,13 @@ glabel func_802E3728 /* 105018 802E3798 46001300 */ add.s $f12, $f2, $f0 /* 10501C 802E379C 3C0143E1 */ lui $at, 0x43e1 /* 105020 802E37A0 44810000 */ mtc1 $at, $f0 -/* 105024 802E37A4 00000000 */ nop +/* 105024 802E37A4 00000000 */ nop /* 105028 802E37A8 460C003C */ c.lt.s $f0, $f12 -/* 10502C 802E37AC 00000000 */ nop +/* 10502C 802E37AC 00000000 */ nop /* 105030 802E37B0 45000006 */ bc1f .L802E37CC /* 105034 802E37B4 E60C0018 */ swc1 $f12, 0x18($s0) /* 105038 802E37B8 0C00A6C9 */ jal clamp_angle -/* 10503C 802E37BC 00000000 */ nop +/* 10503C 802E37BC 00000000 */ nop /* 105040 802E37C0 E6000018 */ swc1 $f0, 0x18($s0) /* 105044 802E37C4 0C043F5A */ jal func_8010FD68 /* 105048 802E37C8 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/code_104940_len_dc0/func_802E37E4.s b/asm/nonmatchings/code_104940_len_dc0/func_802E37E4.s index e45d82eaac..8a45518bb5 100644 --- a/asm/nonmatchings/code_104940_len_dc0/func_802E37E4.s +++ b/asm/nonmatchings/code_104940_len_dc0/func_802E37E4.s @@ -16,7 +16,7 @@ glabel func_802E37E4 /* 105090 802E3810 44810000 */ mtc1 $at, $f0 /* 105094 802E3814 C60C0018 */ lwc1 $f12, 0x18($s0) /* 105098 802E3818 46006302 */ mul.s $f12, $f12, $f0 -/* 10509C 802E381C 00000000 */ nop +/* 10509C 802E381C 00000000 */ nop /* 1050A0 802E3820 C634004C */ lwc1 $f20, 0x4c($s1) /* 1050A4 802E3824 3C0143B4 */ lui $at, 0x43b4 /* 1050A8 802E3828 4481B000 */ mtc1 $at, $f22 @@ -32,7 +32,7 @@ glabel func_802E37E4 /* 1050D0 802E3850 C6000018 */ lwc1 $f0, 0x18($s0) /* 1050D4 802E3854 46020000 */ add.s $f0, $f0, $f2 /* 1050D8 802E3858 4600B03E */ c.le.s $f22, $f0 -/* 1050DC 802E385C 00000000 */ nop +/* 1050DC 802E385C 00000000 */ nop /* 1050E0 802E3860 45000006 */ bc1f .L802E387C /* 1050E4 802E3864 E6000018 */ swc1 $f0, 0x18($s0) /* 1050E8 802E3868 C6000014 */ lwc1 $f0, 0x14($s0) diff --git a/asm/nonmatchings/code_104940_len_dc0/func_802E38D8.s b/asm/nonmatchings/code_104940_len_dc0/func_802E38D8.s index 8eb0d2ab10..572a534dcc 100644 --- a/asm/nonmatchings/code_104940_len_dc0/func_802E38D8.s +++ b/asm/nonmatchings/code_104940_len_dc0/func_802E38D8.s @@ -39,10 +39,10 @@ glabel func_802E38D8 .L802E3958: /* 1051D8 802E3958 86020004 */ lh $v0, 4($s0) /* 1051DC 802E395C 10400004 */ beqz $v0, .L802E3970 -/* 1051E0 802E3960 00000000 */ nop +/* 1051E0 802E3960 00000000 */ nop /* 1051E4 802E3964 86020006 */ lh $v0, 6($s0) /* 1051E8 802E3968 14400020 */ bnez $v0, .L802E39EC -/* 1051EC 802E396C 00000000 */ nop +/* 1051EC 802E396C 00000000 */ nop .L802E3970: /* 1051F0 802E3970 3C04802F */ lui $a0, %hi(D_802EA07C) /* 1051F4 802E3974 2484A07C */ addiu $a0, $a0, %lo(D_802EA07C) @@ -63,7 +63,7 @@ glabel func_802E38D8 /* 105230 802E39B0 4600320D */ trunc.w.s $f8, $f6 /* 105234 802E39B4 44074000 */ mfc1 $a3, $f8 /* 105238 802E39B8 0C044631 */ jal create_entity -/* 10523C 802E39BC 00000000 */ nop +/* 10523C 802E39BC 00000000 */ nop /* 105240 802E39C0 0C04417A */ jal get_entity_by_index /* 105244 802E39C4 0040202D */ daddu $a0, $v0, $zero /* 105248 802E39C8 3C05802F */ lui $a1, %hi(D_802E9E54) diff --git a/asm/nonmatchings/code_104940_len_dc0/func_802E3A00.s b/asm/nonmatchings/code_104940_len_dc0/func_802E3A00.s index c817d28a9c..f10e044435 100644 --- a/asm/nonmatchings/code_104940_len_dc0/func_802E3A00.s +++ b/asm/nonmatchings/code_104940_len_dc0/func_802E3A00.s @@ -9,7 +9,7 @@ glabel func_802E3A00 /* 105290 802E3A10 2402000A */ addiu $v0, $zero, 0xa /* 105294 802E3A14 84830004 */ lh $v1, 4($a0) /* 105298 802E3A18 10620009 */ beq $v1, $v0, .L802E3A40 -/* 10529C 802E3A1C 00000000 */ nop +/* 10529C 802E3A1C 00000000 */ nop /* 1052A0 802E3A20 94820006 */ lhu $v0, 6($a0) /* 1052A4 802E3A24 2442FFFF */ addiu $v0, $v0, -1 /* 1052A8 802E3A28 A4820006 */ sh $v0, 6($a0) @@ -20,4 +20,4 @@ glabel func_802E3A00 /* 1052BC 802E3A3C A4820004 */ sh $v0, 4($a0) .L802E3A40: /* 1052C0 802E3A40 03E00008 */ jr $ra -/* 1052C4 802E3A44 00000000 */ nop +/* 1052C4 802E3A44 00000000 */ nop diff --git a/asm/nonmatchings/code_104940_len_dc0/func_802E3A48.s b/asm/nonmatchings/code_104940_len_dc0/func_802E3A48.s index 554721fdcb..d045aee7d4 100644 --- a/asm/nonmatchings/code_104940_len_dc0/func_802E3A48.s +++ b/asm/nonmatchings/code_104940_len_dc0/func_802E3A48.s @@ -11,11 +11,11 @@ glabel func_802E3A48 /* 1052E0 802E3A60 8E110040 */ lw $s1, 0x40($s0) /* 1052E4 802E3A64 30420080 */ andi $v0, $v0, 0x80 /* 1052E8 802E3A68 10400005 */ beqz $v0, .L802E3A80 -/* 1052EC 802E3A6C 00000000 */ nop +/* 1052EC 802E3A6C 00000000 */ nop /* 1052F0 802E3A70 0C043F5A */ jal func_8010FD68 -/* 1052F4 802E3A74 00000000 */ nop +/* 1052F4 802E3A74 00000000 */ nop /* 1052F8 802E3A78 080B8EBD */ j .L802E3AF4 -/* 1052FC 802E3A7C 00000000 */ nop +/* 1052FC 802E3A7C 00000000 */ nop .L802E3A80: /* 105300 802E3A80 0C0B8E80 */ jal func_802E3A00 /* 105304 802E3A84 0200202D */ daddu $a0, $s0, $zero @@ -40,7 +40,7 @@ glabel func_802E3A48 /* 105350 802E3AD0 4600320D */ trunc.w.s $f8, $f6 /* 105354 802E3AD4 44074000 */ mfc1 $a3, $f8 /* 105358 802E3AD8 0C044631 */ jal create_entity -/* 10535C 802E3ADC 00000000 */ nop +/* 10535C 802E3ADC 00000000 */ nop /* 105360 802E3AE0 3C032000 */ lui $v1, 0x2000 /* 105364 802E3AE4 8E020000 */ lw $v0, ($s0) /* 105368 802E3AE8 34630020 */ ori $v1, $v1, 0x20 diff --git a/asm/nonmatchings/code_104940_len_dc0/func_802E3B08.s b/asm/nonmatchings/code_104940_len_dc0/func_802E3B08.s index fe8a599c21..4d0ae4b943 100644 --- a/asm/nonmatchings/code_104940_len_dc0/func_802E3B08.s +++ b/asm/nonmatchings/code_104940_len_dc0/func_802E3B08.s @@ -10,7 +10,7 @@ glabel func_802E3B08 /* 10539C 802E3B1C 9483000A */ lhu $v1, 0xa($a0) /* 1053A0 802E3B20 3402FFFF */ ori $v0, $zero, 0xffff /* 1053A4 802E3B24 1062001B */ beq $v1, $v0, .L802E3B94 -/* 1053A8 802E3B28 00000000 */ nop +/* 1053A8 802E3B28 00000000 */ nop /* 1053AC 802E3B2C 0C05152F */ jal get_global_flag /* 1053B0 802E3B30 0060202D */ daddu $a0, $v1, $zero /* 1053B4 802E3B34 10400017 */ beqz $v0, .L802E3B94 @@ -31,7 +31,7 @@ glabel func_802E3B08 /* 1053F0 802E3B70 4600320D */ trunc.w.s $f8, $f6 /* 1053F4 802E3B74 44074000 */ mfc1 $a3, $f8 /* 1053F8 802E3B78 0C044631 */ jal create_entity -/* 1053FC 802E3B7C 00000000 */ nop +/* 1053FC 802E3B7C 00000000 */ nop /* 105400 802E3B80 3C032000 */ lui $v1, 0x2000 /* 105404 802E3B84 8E020000 */ lw $v0, ($s0) /* 105408 802E3B88 34630020 */ ori $v1, $v1, 0x20 diff --git a/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s b/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s index e07745f763..c8b69f6df0 100644 --- a/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s +++ b/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s @@ -12,7 +12,7 @@ glabel func_802E3BA4 /* 105440 802E3BC0 3C128011 */ lui $s2, %hi(gPlayerStatus) /* 105444 802E3BC4 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) /* 105448 802E3BC8 14400005 */ bnez $v0, .L802E3BE0 -/* 10544C 802E3BCC 00000000 */ nop +/* 10544C 802E3BCC 00000000 */ nop /* 105450 802E3BD0 92220006 */ lbu $v0, 6($s1) /* 105454 802E3BD4 30420001 */ andi $v0, $v0, 1 /* 105458 802E3BD8 14400083 */ bnez $v0, .L802E3DE8 @@ -24,7 +24,7 @@ glabel func_802E3BA4 /* 10546C 802E3BEC 30620080 */ andi $v0, $v1, 0x80 /* 105470 802E3BF0 92240004 */ lbu $a0, 4($s1) /* 105474 802E3BF4 0C0441A9 */ jal get_entity_type -/* 105478 802E3BF8 00000000 */ nop +/* 105478 802E3BF8 00000000 */ nop /* 10547C 802E3BFC 0040182D */ daddu $v1, $v0, $zero /* 105480 802E3C00 2402000C */ addiu $v0, $zero, 0xc /* 105484 802E3C04 10620019 */ beq $v1, $v0, .L802E3C6C @@ -78,7 +78,7 @@ glabel func_802E3BA4 .L802E3CA8: /* 105528 802E3CA8 92240004 */ lbu $a0, 4($s1) /* 10552C 802E3CAC 0C0441A9 */ jal get_entity_type -/* 105530 802E3CB0 00000000 */ nop +/* 105530 802E3CB0 00000000 */ nop /* 105534 802E3CB4 2443FFF5 */ addiu $v1, $v0, -0xb /* 105538 802E3CB8 2C620015 */ sltiu $v0, $v1, 0x15 /* 10553C 802E3CBC 10400049 */ beqz $v0, .L802E3DE4 @@ -87,15 +87,15 @@ glabel func_802E3BA4 /* 105548 802E3CC8 00220821 */ addu $at, $at, $v0 /* 10554C 802E3CCC 8C22B210 */ lw $v0, %lo(D_802EB210)($at) /* 105550 802E3CD0 00400008 */ jr $v0 -/* 105554 802E3CD4 00000000 */ nop +/* 105554 802E3CD4 00000000 */ nop /* 105558 802E3CD8 12000007 */ beqz $s0, .L802E3CF8 -/* 10555C 802E3CDC 00000000 */ nop +/* 10555C 802E3CDC 00000000 */ nop /* 105560 802E3CE0 3C028011 */ lui $v0, %hi(gPlayerData) /* 105564 802E3CE4 8042F290 */ lb $v0, %lo(gPlayerData)($v0) /* 105568 802E3CE8 58400007 */ blezl $v0, .L802E3D08 /* 10556C 802E3CEC 0000802D */ daddu $s0, $zero, $zero /* 105570 802E3CF0 080B8F42 */ j .L802E3D08 -/* 105574 802E3CF4 00000000 */ nop +/* 105574 802E3CF4 00000000 */ nop .L802E3CF8: /* 105578 802E3CF8 3C028011 */ lui $v0, %hi(gPlayerData+0x1) /* 10557C 802E3CFC 8042F291 */ lb $v0, %lo(gPlayerData+0x1)($v0) @@ -112,14 +112,14 @@ glabel func_802E3BA4 /* 1055A4 802E3D24 080B8F6C */ j .L802E3DB0 /* 1055A8 802E3D28 2404014F */ addiu $a0, $zero, 0x14f /* 1055AC 802E3D2C 12000008 */ beqz $s0, .L802E3D50 -/* 1055B0 802E3D30 00000000 */ nop +/* 1055B0 802E3D30 00000000 */ nop /* 1055B4 802E3D34 3C028011 */ lui $v0, %hi(gPlayerData) /* 1055B8 802E3D38 8042F290 */ lb $v0, %lo(gPlayerData)($v0) /* 1055BC 802E3D3C 28420002 */ slti $v0, $v0, 2 /* 1055C0 802E3D40 54400007 */ bnel $v0, $zero, .L802E3D60 /* 1055C4 802E3D44 0000802D */ daddu $s0, $zero, $zero /* 1055C8 802E3D48 080B8F58 */ j .L802E3D60 -/* 1055CC 802E3D4C 00000000 */ nop +/* 1055CC 802E3D4C 00000000 */ nop .L802E3D50: /* 1055D0 802E3D50 3C028011 */ lui $v0, %hi(gPlayerData+0x1) /* 1055D4 802E3D54 8042F291 */ lb $v0, %lo(gPlayerData+0x1)($v0) @@ -157,7 +157,7 @@ glabel func_802E3BA4 /* 10564C 802E3DCC 0C04419E */ jal func_80110678 /* 105650 802E3DD0 0220202D */ daddu $a0, $s1, $zero /* 105654 802E3DD4 080B8F0D */ j .L802E3C34 -/* 105658 802E3DD8 00000000 */ nop +/* 105658 802E3DD8 00000000 */ nop /* 10565C 802E3DDC 0C04419E */ jal func_80110678 /* 105660 802E3DE0 0220202D */ daddu $a0, $s1, $zero .L802E3DE4: diff --git a/asm/nonmatchings/code_1060_len_310/func_80025D74.s b/asm/nonmatchings/code_1060_len_310/func_80025D74.s index ed05a829a7..ac017a4851 100644 --- a/asm/nonmatchings/code_1060_len_310/func_80025D74.s +++ b/asm/nonmatchings/code_1060_len_310/func_80025D74.s @@ -53,7 +53,7 @@ glabel func_80025D74 /* 1234 80025E34 10400008 */ beqz $v0, .L80025E58 /* 1238 80025E38 24020001 */ addiu $v0, $zero, 1 /* 123C 80025E3C 080097C5 */ j .L80025F14 -/* 1240 80025E40 00000000 */ nop +/* 1240 80025E40 00000000 */ nop .L80025E44: /* 1244 80025E44 0250102A */ slt $v0, $s2, $s0 /* 1248 80025E48 10400003 */ beqz $v0, .L80025E58 diff --git a/asm/nonmatchings/code_1060_len_310/func_80025F44.s b/asm/nonmatchings/code_1060_len_310/func_80025F44.s index 5b3e8f85b6..b51f3b3b1a 100644 --- a/asm/nonmatchings/code_1060_len_310/func_80025F44.s +++ b/asm/nonmatchings/code_1060_len_310/func_80025F44.s @@ -8,9 +8,9 @@ glabel func_80025F44 /* 1350 80025F50 3C048009 */ lui $a0, %hi(D_80097D30) /* 1354 80025F54 24847D30 */ addiu $a0, $a0, %lo(D_80097D30) /* 1358 80025F58 0C00973F */ jal func_80025CFC -/* 135C 80025F5C 00000000 */ nop +/* 135C 80025F5C 00000000 */ nop .L80025F60: /* 1360 80025F60 080097D8 */ j .L80025F60 -/* 1364 80025F64 00000000 */ nop -/* 1368 80025F68 00000000 */ nop -/* 136C 80025F6C 00000000 */ nop +/* 1364 80025F64 00000000 */ nop +/* 1368 80025F68 00000000 */ nop +/* 136C 80025F6C 00000000 */ nop diff --git a/asm/nonmatchings/code_109660_len_1270/func_802E7DE0.s b/asm/nonmatchings/code_109660_len_1270/func_802E7DE0.s index f9e09e7897..103dd56686 100644 --- a/asm/nonmatchings/code_109660_len_1270/func_802E7DE0.s +++ b/asm/nonmatchings/code_109660_len_1270/func_802E7DE0.s @@ -69,7 +69,7 @@ glabel func_802E7DE0 /* 10975C 802E7EDC 02A31023 */ subu $v0, $s5, $v1 .L802E7EE0: /* 109760 802E7EE0 44820000 */ mtc1 $v0, $f0 -/* 109764 802E7EE4 00000000 */ nop +/* 109764 802E7EE4 00000000 */ nop /* 109768 802E7EE8 46800020 */ cvt.s.w $f0, $f0 /* 10976C 802E7EEC E60000C4 */ swc1 $f0, 0xc4($s0) /* 109770 802E7EF0 E6140304 */ swc1 $f20, 0x304($s0) diff --git a/asm/nonmatchings/code_109660_len_1270/func_802E7FA0.s b/asm/nonmatchings/code_109660_len_1270/func_802E7FA0.s index a416708435..86e149ac1c 100644 --- a/asm/nonmatchings/code_109660_len_1270/func_802E7FA0.s +++ b/asm/nonmatchings/code_109660_len_1270/func_802E7FA0.s @@ -41,16 +41,16 @@ glabel func_802E7FA0 /* 1098AC 802E802C 10400005 */ beqz $v0, .L802E8044 /* 1098B0 802E8030 24020002 */ addiu $v0, $zero, 2 /* 1098B4 802E8034 10600009 */ beqz $v1, .L802E805C -/* 1098B8 802E8038 00000000 */ nop +/* 1098B8 802E8038 00000000 */ nop /* 1098BC 802E803C 080BA05A */ j .L802E8168 -/* 1098C0 802E8040 00000000 */ nop +/* 1098C0 802E8040 00000000 */ nop .L802E8044: /* 1098C4 802E8044 10620029 */ beq $v1, $v0, .L802E80EC /* 1098C8 802E8048 24020003 */ addiu $v0, $zero, 3 /* 1098CC 802E804C 50620046 */ beql $v1, $v0, .L802E8168 /* 1098D0 802E8050 26730001 */ addiu $s3, $s3, 1 /* 1098D4 802E8054 080BA05A */ j .L802E8168 -/* 1098D8 802E8058 00000000 */ nop +/* 1098D8 802E8058 00000000 */ nop .L802E805C: /* 1098DC 802E805C 3C014000 */ lui $at, 0x4000 /* 1098E0 802E8060 4481F000 */ mtc1 $at, $f30 @@ -60,10 +60,10 @@ glabel func_802E7FA0 /* 1098F0 802E8070 44810000 */ mtc1 $at, $f0 /* 1098F4 802E8074 44801000 */ mtc1 $zero, $f2 /* 1098F8 802E8078 44822000 */ mtc1 $v0, $f4 -/* 1098FC 802E807C 00000000 */ nop +/* 1098FC 802E807C 00000000 */ nop /* 109900 802E8080 46802120 */ cvt.s.w $f4, $f4 /* 109904 802E8084 4618103E */ c.le.s $f2, $f24 -/* 109908 802E8088 00000000 */ nop +/* 109908 802E8088 00000000 */ nop /* 10990C 802E808C 45000006 */ bc1f .L802E80A8 /* 109910 802E8090 46002683 */ div.s $f26, $f4, $f0 /* 109914 802E8094 3C01802F */ lui $at, %hi(D_802EB350) @@ -90,18 +90,18 @@ glabel func_802E7FA0 /* 10995C 802E80DC 4480F000 */ mtc1 $zero, $f30 /* 109960 802E80E0 46001602 */ mul.s $f24, $f2, $f0 /* 109964 802E80E4 080BA05A */ j .L802E8168 -/* 109968 802E80E8 00000000 */ nop +/* 109968 802E80E8 00000000 */ nop .L802E80EC: /* 10996C 802E80EC C60200C4 */ lwc1 $f2, 0xc4($s0) /* 109970 802E80F0 3C013F80 */ lui $at, 0x3f80 /* 109974 802E80F4 44810000 */ mtc1 $at, $f0 -/* 109978 802E80F8 00000000 */ nop +/* 109978 802E80F8 00000000 */ nop /* 10997C 802E80FC 46001080 */ add.s $f2, $f2, $f0 /* 109980 802E8100 3C0141A0 */ lui $at, 0x41a0 /* 109984 802E8104 44810000 */ mtc1 $at, $f0 -/* 109988 802E8108 00000000 */ nop +/* 109988 802E8108 00000000 */ nop /* 10998C 802E810C 4602003C */ c.lt.s $f0, $f2 -/* 109990 802E8110 00000000 */ nop +/* 109990 802E8110 00000000 */ nop /* 109994 802E8114 45000002 */ bc1f .L802E8120 /* 109998 802E8118 E60200C4 */ swc1 $f2, 0xc4($s0) /* 10999C 802E811C E60000C4 */ swc1 $f0, 0xc4($s0) @@ -119,7 +119,7 @@ glabel func_802E7FA0 /* 1099C8 802E8148 304200FF */ andi $v0, $v0, 0xff /* 1099CC 802E814C 2C420006 */ sltiu $v0, $v0, 6 /* 1099D0 802E8150 10400005 */ beqz $v0, .L802E8168 -/* 1099D4 802E8154 00000000 */ nop +/* 1099D4 802E8154 00000000 */ nop /* 1099D8 802E8158 92220010 */ lbu $v0, 0x10($s1) /* 1099DC 802E815C A2200034 */ sb $zero, 0x34($s1) /* 1099E0 802E8160 24420001 */ addiu $v0, $v0, 1 @@ -131,7 +131,7 @@ glabel func_802E7FA0 /* 1099F4 802E8174 26310001 */ addiu $s1, $s1, 1 /* 1099F8 802E8178 C6020304 */ lwc1 $f2, 0x304($s0) /* 1099FC 802E817C 44800000 */ mtc1 $zero, $f0 -/* 109A00 802E8180 00000000 */ nop +/* 109A00 802E8180 00000000 */ nop /* 109A04 802E8184 4602003E */ c.le.s $f0, $f2 /* 109A08 802E8188 3C01802F */ lui $at, %hi(D_802EB358) /* 109A0C 802E818C D420B358 */ ldc1 $f0, %lo(D_802EB358)($at) @@ -146,13 +146,13 @@ glabel func_802E7FA0 /* 109A2C 802E81AC 462010A0 */ cvt.s.d $f2, $f2 /* 109A30 802E81B0 46001021 */ cvt.d.s $f0, $f2 /* 109A34 802E81B4 4624003C */ c.lt.d $f0, $f4 -/* 109A38 802E81B8 00000000 */ nop +/* 109A38 802E81B8 00000000 */ nop /* 109A3C 802E81BC 45000006 */ bc1f .L802E81D8 /* 109A40 802E81C0 E6020304 */ swc1 $f2, 0x304($s0) /* 109A44 802E81C4 3C01C123 */ lui $at, 0xc123 /* 109A48 802E81C8 34213333 */ ori $at, $at, 0x3333 /* 109A4C 802E81CC 44810000 */ mtc1 $at, $f0 -/* 109A50 802E81D0 00000000 */ nop +/* 109A50 802E81D0 00000000 */ nop /* 109A54 802E81D4 E6000304 */ swc1 $f0, 0x304($s0) .L802E81D8: /* 109A58 802E81D8 C60001E4 */ lwc1 $f0, 0x1e4($s0) @@ -163,36 +163,36 @@ glabel func_802E7FA0 /* 109A6C 802E81EC 3C0143B4 */ lui $at, 0x43b4 /* 109A70 802E81F0 44814000 */ mtc1 $at, $f8 /* 109A74 802E81F4 4482A000 */ mtc1 $v0, $f20 -/* 109A78 802E81F8 00000000 */ nop +/* 109A78 802E81F8 00000000 */ nop /* 109A7C 802E81FC 4680A520 */ cvt.s.w $f20, $f20 /* 109A80 802E8200 4608A502 */ mul.s $f20, $f20, $f8 -/* 109A84 802E8204 00000000 */ nop +/* 109A84 802E8204 00000000 */ nop /* 109A88 802E8208 3C013B80 */ lui $at, 0x3b80 /* 109A8C 802E820C 44814000 */ mtc1 $at, $f8 -/* 109A90 802E8210 00000000 */ nop +/* 109A90 802E8210 00000000 */ nop /* 109A94 802E8214 4608A502 */ mul.s $f20, $f20, $f8 -/* 109A98 802E8218 00000000 */ nop +/* 109A98 802E8218 00000000 */ nop /* 109A9C 802E821C 3C0140C9 */ lui $at, 0x40c9 /* 109AA0 802E8220 34210FD0 */ ori $at, $at, 0xfd0 /* 109AA4 802E8224 44814000 */ mtc1 $at, $f8 -/* 109AA8 802E8228 00000000 */ nop +/* 109AA8 802E8228 00000000 */ nop /* 109AAC 802E822C 4608A002 */ mul.s $f0, $f20, $f8 -/* 109AB0 802E8230 00000000 */ nop +/* 109AB0 802E8230 00000000 */ nop /* 109AB4 802E8234 3C0143B4 */ lui $at, 0x43b4 /* 109AB8 802E8238 44814000 */ mtc1 $at, $f8 -/* 109ABC 802E823C 00000000 */ nop +/* 109ABC 802E823C 00000000 */ nop /* 109AC0 802E8240 46080583 */ div.s $f22, $f0, $f8 /* 109AC4 802E8244 0C00A85B */ jal sin_rad /* 109AC8 802E8248 4600B306 */ mov.s $f12, $f22 /* 109ACC 802E824C 4600D002 */ mul.s $f0, $f26, $f0 -/* 109AD0 802E8250 00000000 */ nop +/* 109AD0 802E8250 00000000 */ nop /* 109AD4 802E8254 C6020154 */ lwc1 $f2, 0x154($s0) /* 109AD8 802E8258 46001080 */ add.s $f2, $f2, $f0 /* 109ADC 802E825C 4600B306 */ mov.s $f12, $f22 /* 109AE0 802E8260 0C00A874 */ jal cos_rad /* 109AE4 802E8264 E6020154 */ swc1 $f2, 0x154($s0) /* 109AE8 802E8268 4600D002 */ mul.s $f0, $f26, $f0 -/* 109AEC 802E826C 00000000 */ nop +/* 109AEC 802E826C 00000000 */ nop /* 109AF0 802E8270 3C040004 */ lui $a0, 4 /* 109AF4 802E8274 C6020274 */ lwc1 $f2, 0x274($s0) /* 109AF8 802E8278 02C0282D */ daddu $a1, $s6, $zero @@ -226,36 +226,36 @@ glabel func_802E7FA0 /* 109B68 802E82E8 A2220034 */ sb $v0, 0x34($s1) /* 109B6C 802E82EC 304200FF */ andi $v0, $v0, 0xff /* 109B70 802E82F0 44820000 */ mtc1 $v0, $f0 -/* 109B74 802E82F4 00000000 */ nop +/* 109B74 802E82F4 00000000 */ nop /* 109B78 802E82F8 46800020 */ cvt.s.w $f0, $f0 /* 109B7C 802E82FC 46080002 */ mul.s $f0, $f0, $f8 -/* 109B80 802E8300 00000000 */ nop +/* 109B80 802E8300 00000000 */ nop /* 109B84 802E8304 3C013B80 */ lui $at, 0x3b80 /* 109B88 802E8308 44814000 */ mtc1 $at, $f8 -/* 109B8C 802E830C 00000000 */ nop +/* 109B8C 802E830C 00000000 */ nop /* 109B90 802E8310 46080002 */ mul.s $f0, $f0, $f8 -/* 109B94 802E8314 00000000 */ nop +/* 109B94 802E8314 00000000 */ nop /* 109B98 802E8318 3C0140C9 */ lui $at, 0x40c9 /* 109B9C 802E831C 34210FD0 */ ori $at, $at, 0xfd0 /* 109BA0 802E8320 44814000 */ mtc1 $at, $f8 -/* 109BA4 802E8324 00000000 */ nop +/* 109BA4 802E8324 00000000 */ nop /* 109BA8 802E8328 46080002 */ mul.s $f0, $f0, $f8 -/* 109BAC 802E832C 00000000 */ nop +/* 109BAC 802E832C 00000000 */ nop /* 109BB0 802E8330 3C0143B4 */ lui $at, 0x43b4 /* 109BB4 802E8334 44814000 */ mtc1 $at, $f8 -/* 109BB8 802E8338 00000000 */ nop +/* 109BB8 802E8338 00000000 */ nop /* 109BBC 802E833C 46080583 */ div.s $f22, $f0, $f8 /* 109BC0 802E8340 0C00A85B */ jal sin_rad /* 109BC4 802E8344 4600B306 */ mov.s $f12, $f22 /* 109BC8 802E8348 461C0002 */ mul.s $f0, $f0, $f28 -/* 109BCC 802E834C 00000000 */ nop +/* 109BCC 802E834C 00000000 */ nop /* 109BD0 802E8350 C6020154 */ lwc1 $f2, 0x154($s0) /* 109BD4 802E8354 46001080 */ add.s $f2, $f2, $f0 /* 109BD8 802E8358 4600B306 */ mov.s $f12, $f22 /* 109BDC 802E835C 0C00A874 */ jal cos_rad /* 109BE0 802E8360 E6020154 */ swc1 $f2, 0x154($s0) /* 109BE4 802E8364 461C0002 */ mul.s $f0, $f0, $f28 -/* 109BE8 802E8368 00000000 */ nop +/* 109BE8 802E8368 00000000 */ nop /* 109BEC 802E836C C6020274 */ lwc1 $f2, 0x274($s0) /* 109BF0 802E8370 46001080 */ add.s $f2, $f2, $f0 /* 109BF4 802E8374 4600E686 */ mov.s $f26, $f28 @@ -279,17 +279,17 @@ glabel func_802E7FA0 /* 109C38 802E83B8 0C0372DF */ jal func_800DCB7C /* 109C3C 802E83BC AFA20010 */ sw $v0, 0x10($sp) /* 109C40 802E83C0 1440000B */ bnez $v0, .L802E83F0 -/* 109C44 802E83C4 00000000 */ nop +/* 109C44 802E83C4 00000000 */ nop /* 109C48 802E83C8 C640000C */ lwc1 $f0, 0xc($s2) /* 109C4C 802E83CC 3C014348 */ lui $at, 0x4348 /* 109C50 802E83D0 44811000 */ mtc1 $at, $f2 -/* 109C54 802E83D4 00000000 */ nop +/* 109C54 802E83D4 00000000 */ nop /* 109C58 802E83D8 46020001 */ sub.s $f0, $f0, $f2 /* 109C5C 802E83DC C7A20024 */ lwc1 $f2, 0x24($sp) /* 109C60 802E83E0 4600103C */ c.lt.s $f2, $f0 -/* 109C64 802E83E4 00000000 */ nop +/* 109C64 802E83E4 00000000 */ nop /* 109C68 802E83E8 45000010 */ bc1f .L802E842C -/* 109C6C 802E83EC 00000000 */ nop +/* 109C6C 802E83EC 00000000 */ nop .L802E83F0: /* 109C70 802E83F0 92220010 */ lbu $v0, 0x10($s1) /* 109C74 802E83F4 24420001 */ addiu $v0, $v0, 1 @@ -309,14 +309,14 @@ glabel func_802E7FA0 .L802E842C: /* 109CAC 802E842C 92220058 */ lbu $v0, 0x58($s1) /* 109CB0 802E8430 44820000 */ mtc1 $v0, $f0 -/* 109CB4 802E8434 00000000 */ nop +/* 109CB4 802E8434 00000000 */ nop /* 109CB8 802E8438 46800020 */ cvt.s.w $f0, $f0 /* 109CBC 802E843C 46180000 */ add.s $f0, $f0, $f24 /* 109CC0 802E8440 3C014F00 */ lui $at, 0x4f00 /* 109CC4 802E8444 44814000 */ mtc1 $at, $f8 -/* 109CC8 802E8448 00000000 */ nop +/* 109CC8 802E8448 00000000 */ nop /* 109CCC 802E844C 4600403E */ c.le.s $f8, $f0 -/* 109CD0 802E8450 00000000 */ nop +/* 109CD0 802E8450 00000000 */ nop /* 109CD4 802E8454 45010005 */ bc1t .L802E846C /* 109CD8 802E8458 26230058 */ addiu $v1, $s1, 0x58 /* 109CDC 802E845C 4600020D */ trunc.w.s $f8, $f0 @@ -327,20 +327,20 @@ glabel func_802E7FA0 /* 109CEC 802E846C 46080001 */ sub.s $f0, $f0, $f8 /* 109CF0 802E8470 4600020D */ trunc.w.s $f8, $f0 /* 109CF4 802E8474 44024000 */ mfc1 $v0, $f8 -/* 109CF8 802E8478 00000000 */ nop +/* 109CF8 802E8478 00000000 */ nop /* 109CFC 802E847C 00571025 */ or $v0, $v0, $s7 /* 109D00 802E8480 A0620000 */ sb $v0, ($v1) .L802E8484: /* 109D04 802E8484 9222007C */ lbu $v0, 0x7c($s1) /* 109D08 802E8488 44820000 */ mtc1 $v0, $f0 -/* 109D0C 802E848C 00000000 */ nop +/* 109D0C 802E848C 00000000 */ nop /* 109D10 802E8490 46800020 */ cvt.s.w $f0, $f0 /* 109D14 802E8494 46180001 */ sub.s $f0, $f0, $f24 /* 109D18 802E8498 3C014F00 */ lui $at, 0x4f00 /* 109D1C 802E849C 44814000 */ mtc1 $at, $f8 -/* 109D20 802E84A0 00000000 */ nop +/* 109D20 802E84A0 00000000 */ nop /* 109D24 802E84A4 4600403E */ c.le.s $f8, $f0 -/* 109D28 802E84A8 00000000 */ nop +/* 109D28 802E84A8 00000000 */ nop /* 109D2C 802E84AC 45010005 */ bc1t .L802E84C4 /* 109D30 802E84B0 2623007C */ addiu $v1, $s1, 0x7c /* 109D34 802E84B4 4600020D */ trunc.w.s $f8, $f0 @@ -351,7 +351,7 @@ glabel func_802E7FA0 /* 109D44 802E84C4 46080001 */ sub.s $f0, $f0, $f8 /* 109D48 802E84C8 4600020D */ trunc.w.s $f8, $f0 /* 109D4C 802E84CC 44024000 */ mfc1 $v0, $f8 -/* 109D50 802E84D0 00000000 */ nop +/* 109D50 802E84D0 00000000 */ nop /* 109D54 802E84D4 00571025 */ or $v0, $v0, $s7 /* 109D58 802E84D8 A0620000 */ sb $v0, ($v1) .L802E84DC: @@ -363,7 +363,7 @@ glabel func_802E7FA0 /* 109D6C 802E84EC 26100004 */ addiu $s0, $s0, 4 /* 109D70 802E84F0 2A620023 */ slti $v0, $s3, 0x23 /* 109D74 802E84F4 14400003 */ bnez $v0, .L802E8504 -/* 109D78 802E84F8 00000000 */ nop +/* 109D78 802E84F8 00000000 */ nop /* 109D7C 802E84FC 0C043F5A */ jal func_8010FD68 /* 109D80 802E8500 03C0202D */ daddu $a0, $fp, $zero .L802E8504: diff --git a/asm/nonmatchings/code_109660_len_1270/func_802E854C.s b/asm/nonmatchings/code_109660_len_1270/func_802E854C.s index 28f5e45f2a..8319a5a00d 100644 --- a/asm/nonmatchings/code_109660_len_1270/func_802E854C.s +++ b/asm/nonmatchings/code_109660_len_1270/func_802E854C.s @@ -91,12 +91,12 @@ glabel func_802E854C /* 109F18 802E8698 27A40018 */ addiu $a0, $sp, 0x18 /* 109F1C 802E869C 92420058 */ lbu $v0, 0x58($s2) /* 109F20 802E86A0 44820000 */ mtc1 $v0, $f0 -/* 109F24 802E86A4 00000000 */ nop +/* 109F24 802E86A4 00000000 */ nop /* 109F28 802E86A8 46800020 */ cvt.s.w $f0, $f0 /* 109F2C 802E86AC 461A0002 */ mul.s $f0, $f0, $f26 -/* 109F30 802E86B0 00000000 */ nop +/* 109F30 802E86B0 00000000 */ nop /* 109F34 802E86B4 46180002 */ mul.s $f0, $f0, $f24 -/* 109F38 802E86B8 00000000 */ nop +/* 109F38 802E86B8 00000000 */ nop /* 109F3C 802E86BC 4406B000 */ mfc1 $a2, $f22 /* 109F40 802E86C0 4407A000 */ mfc1 $a3, $f20 /* 109F44 802E86C4 8FA4011C */ lw $a0, 0x11c($sp) @@ -105,14 +105,14 @@ glabel func_802E854C /* 109F50 802E86D0 E7B40010 */ swc1 $f20, 0x10($sp) /* 109F54 802E86D4 9242007C */ lbu $v0, 0x7c($s2) /* 109F58 802E86D8 44820000 */ mtc1 $v0, $f0 -/* 109F5C 802E86DC 00000000 */ nop +/* 109F5C 802E86DC 00000000 */ nop /* 109F60 802E86E0 46800020 */ cvt.s.w $f0, $f0 /* 109F64 802E86E4 461A0002 */ mul.s $f0, $f0, $f26 -/* 109F68 802E86E8 00000000 */ nop +/* 109F68 802E86E8 00000000 */ nop /* 109F6C 802E86EC 26100008 */ addiu $s0, $s0, 8 /* 109F70 802E86F0 26310018 */ addiu $s1, $s1, 0x18 /* 109F74 802E86F4 46180002 */ mul.s $f0, $f0, $f24 -/* 109F78 802E86F8 00000000 */ nop +/* 109F78 802E86F8 00000000 */ nop /* 109F7C 802E86FC 27DE0001 */ addiu $fp, $fp, 1 /* 109F80 802E8700 02A0202D */ daddu $a0, $s5, $zero /* 109F84 802E8704 4406A000 */ mfc1 $a2, $f20 diff --git a/asm/nonmatchings/code_109660_len_1270/func_802E8858.s b/asm/nonmatchings/code_109660_len_1270/func_802E8858.s index 292aa49699..95d89c9ed4 100644 --- a/asm/nonmatchings/code_109660_len_1270/func_802E8858.s +++ b/asm/nonmatchings/code_109660_len_1270/func_802E8858.s @@ -17,14 +17,14 @@ glabel func_802E8858 /* 10A108 802E8888 10620003 */ beq $v1, $v0, .L802E8898 /* 10A10C 802E888C 24020010 */ addiu $v0, $zero, 0x10 /* 10A110 802E8890 14620004 */ bne $v1, $v0, .L802E88A4 -/* 10A114 802E8894 00000000 */ nop +/* 10A114 802E8894 00000000 */ nop .L802E8898: /* 10A118 802E8898 0C039769 */ jal set_action_state /* 10A11C 802E889C 24040008 */ addiu $a0, $zero, 8 /* 10A120 802E88A0 24040001 */ addiu $a0, $zero, 1 .L802E88A4: /* 10A124 802E88A4 1080000D */ beqz $a0, .L802E88DC -/* 10A128 802E88A8 00000000 */ nop +/* 10A128 802E88A8 00000000 */ nop /* 10A12C 802E88AC 0C0B9FDB */ jal func_802E7F6C /* 10A130 802E88B0 0200202D */ daddu $a0, $s0, $zero /* 10A134 802E88B4 3C05802F */ lui $a1, %hi(D_802EAE7C) diff --git a/asm/nonmatchings/code_109660_len_1270/func_802E88EC.s b/asm/nonmatchings/code_109660_len_1270/func_802E88EC.s index b56a938885..0c0e355f78 100644 --- a/asm/nonmatchings/code_109660_len_1270/func_802E88EC.s +++ b/asm/nonmatchings/code_109660_len_1270/func_802E88EC.s @@ -18,16 +18,16 @@ glabel func_802E88EC /* 10A1A0 802E8920 0000802D */ daddu $s0, $zero, $zero /* 10A1A4 802E8924 96240004 */ lhu $a0, 4($s1) /* 10A1A8 802E8928 0C05152F */ jal get_global_flag -/* 10A1AC 802E892C 00000000 */ nop +/* 10A1AC 802E892C 00000000 */ nop /* 10A1B0 802E8930 14400002 */ bnez $v0, .L802E893C -/* 10A1B4 802E8934 00000000 */ nop +/* 10A1B4 802E8934 00000000 */ nop .L802E8938: /* 10A1B8 802E8938 24100001 */ addiu $s0, $zero, 1 .L802E893C: /* 10A1BC 802E893C 12000016 */ beqz $s0, .L802E8998 -/* 10A1C0 802E8940 00000000 */ nop +/* 10A1C0 802E8940 00000000 */ nop /* 10A1C4 802E8944 0C03951B */ jal func_800E546C -/* 10A1C8 802E8948 00000000 */ nop +/* 10A1C8 802E8948 00000000 */ nop /* 10A1CC 802E894C C642004C */ lwc1 $f2, 0x4c($s2) /* 10A1D0 802E8950 4600010D */ trunc.w.s $f4, $f0 /* 10A1D4 802E8954 E7A40018 */ swc1 $f4, 0x18($sp) @@ -46,7 +46,7 @@ glabel func_802E88EC /* 10A208 802E8988 462010A0 */ cvt.s.d $f2, $f2 /* 10A20C 802E898C 44061000 */ mfc1 $a2, $f2 /* 10A210 802E8990 0C04C4FD */ jal make_item_entity -/* 10A214 802E8994 00000000 */ nop +/* 10A214 802E8994 00000000 */ nop .L802E8998: /* 10A218 802E8998 8FBF002C */ lw $ra, 0x2c($sp) /* 10A21C 802E899C 8FB20028 */ lw $s2, 0x28($sp) diff --git a/asm/nonmatchings/code_109660_len_1270/func_802E89F8.s b/asm/nonmatchings/code_109660_len_1270/func_802E89F8.s index 4a1d436624..7bc5e34925 100644 --- a/asm/nonmatchings/code_109660_len_1270/func_802E89F8.s +++ b/asm/nonmatchings/code_109660_len_1270/func_802E89F8.s @@ -12,7 +12,7 @@ glabel func_802E89F8 /* 10A294 802E8A14 ACA20004 */ sw $v0, 4($a1) /* 10A298 802E8A18 8CA20008 */ lw $v0, 8($a1) /* 10A29C 802E8A1C 14400009 */ bnez $v0, .L802E8A44 -/* 10A2A0 802E8A20 00000000 */ nop +/* 10A2A0 802E8A20 00000000 */ nop /* 10A2A4 802E8A24 C480004C */ lwc1 $f0, 0x4c($a0) /* 10A2A8 802E8A28 3C01802F */ lui $at, %hi(D_802EB380) /* 10A2AC 802E8A2C D422B380 */ ldc1 $f2, %lo(D_802EB380)($at) diff --git a/asm/nonmatchings/code_109660_len_1270/func_802E8A58.s b/asm/nonmatchings/code_109660_len_1270/func_802E8A58.s index 5b46f26299..c3977801a6 100644 --- a/asm/nonmatchings/code_109660_len_1270/func_802E8A58.s +++ b/asm/nonmatchings/code_109660_len_1270/func_802E8A58.s @@ -10,14 +10,14 @@ glabel func_802E8A58 /* 10A2EC 802E8A6C 8443008E */ lh $v1, 0x8e($v0) /* 10A2F0 802E8A70 8CA2000C */ lw $v0, 0xc($a1) /* 10A2F4 802E8A74 14430014 */ bne $v0, $v1, .L802E8AC8 -/* 10A2F8 802E8A78 00000000 */ nop +/* 10A2F8 802E8A78 00000000 */ nop /* 10A2FC 802E8A7C 8CA30004 */ lw $v1, 4($a1) /* 10A300 802E8A80 10600005 */ beqz $v1, .L802E8A98 /* 10A304 802E8A84 24020001 */ addiu $v0, $zero, 1 /* 10A308 802E8A88 10620009 */ beq $v1, $v0, .L802E8AB0 -/* 10A30C 802E8A8C 00000000 */ nop +/* 10A30C 802E8A8C 00000000 */ nop /* 10A310 802E8A90 080BA2B2 */ j .L802E8AC8 -/* 10A314 802E8A94 00000000 */ nop +/* 10A314 802E8A94 00000000 */ nop .L802E8A98: /* 10A318 802E8A98 3C028016 */ lui $v0, %hi(gCollisionStatus+0x2) /* 10A31C 802E8A9C 8442A552 */ lh $v0, %lo(gCollisionStatus+0x2)($v0) @@ -34,7 +34,7 @@ glabel func_802E8A58 /* 10A344 802E8AC4 ACA20004 */ sw $v0, 4($a1) .L802E8AC8: /* 10A348 802E8AC8 0C043F5A */ jal func_8010FD68 -/* 10A34C 802E8ACC 00000000 */ nop +/* 10A34C 802E8ACC 00000000 */ nop .L802E8AD0: /* 10A350 802E8AD0 8FBF0010 */ lw $ra, 0x10($sp) /* 10A354 802E8AD4 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_109660_len_1270/func_802E8ADC.s b/asm/nonmatchings/code_109660_len_1270/func_802E8ADC.s index 233293dbdd..59d9fef8b7 100644 --- a/asm/nonmatchings/code_109660_len_1270/func_802E8ADC.s +++ b/asm/nonmatchings/code_109660_len_1270/func_802E8ADC.s @@ -26,16 +26,16 @@ glabel func_802E8ADC /* 10A3B0 802E8B30 00021023 */ negu $v0, $v0 .L802E8B34: /* 10A3B4 802E8B34 14400003 */ bnez $v0, .L802E8B44 -/* 10A3B8 802E8B38 00000000 */ nop +/* 10A3B8 802E8B38 00000000 */ nop /* 10A3BC 802E8B3C 1080001C */ beqz $a0, .L802E8BB0 -/* 10A3C0 802E8B40 00000000 */ nop +/* 10A3C0 802E8B40 00000000 */ nop .L802E8B44: /* 10A3C4 802E8B44 44822000 */ mtc1 $v0, $f4 -/* 10A3C8 802E8B48 00000000 */ nop +/* 10A3C8 802E8B48 00000000 */ nop /* 10A3CC 802E8B4C 46802120 */ cvt.s.w $f4, $f4 /* 10A3D0 802E8B50 44062000 */ mfc1 $a2, $f4 /* 10A3D4 802E8B54 44842000 */ mtc1 $a0, $f4 -/* 10A3D8 802E8B58 00000000 */ nop +/* 10A3D8 802E8B58 00000000 */ nop /* 10A3DC 802E8B5C 46802120 */ cvt.s.w $f4, $f4 /* 10A3E0 802E8B60 44806000 */ mtc1 $zero, $f12 /* 10A3E4 802E8B64 44072000 */ mfc1 $a3, $f4 @@ -43,15 +43,15 @@ glabel func_802E8ADC /* 10A3EC 802E8B6C 46006386 */ mov.s $f14, $f12 /* 10A3F0 802E8B70 3C014270 */ lui $at, 0x4270 /* 10A3F4 802E8B74 44811000 */ mtc1 $at, $f2 -/* 10A3F8 802E8B78 00000000 */ nop +/* 10A3F8 802E8B78 00000000 */ nop /* 10A3FC 802E8B7C 4602003C */ c.lt.s $f0, $f2 -/* 10A400 802E8B80 00000000 */ nop +/* 10A400 802E8B80 00000000 */ nop /* 10A404 802E8B84 4500000A */ bc1f .L802E8BB0 -/* 10A408 802E8B88 00000000 */ nop +/* 10A408 802E8B88 00000000 */ nop /* 10A40C 802E8B8C 0C043F5A */ jal func_8010FD68 /* 10A410 802E8B90 0200202D */ daddu $a0, $s0, $zero /* 10A414 802E8B94 080BA2EC */ j .L802E8BB0 -/* 10A418 802E8B98 00000000 */ nop +/* 10A418 802E8B98 00000000 */ nop .L802E8B9C: /* 10A41C 802E8B9C 3C02800A */ lui $v0, %hi(D_8009A650) /* 10A420 802E8BA0 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) diff --git a/asm/nonmatchings/code_109660_len_1270/func_802E8BC0.s b/asm/nonmatchings/code_109660_len_1270/func_802E8BC0.s index 6de4c7211c..cd420350b8 100644 --- a/asm/nonmatchings/code_109660_len_1270/func_802E8BC0.s +++ b/asm/nonmatchings/code_109660_len_1270/func_802E8BC0.s @@ -25,7 +25,7 @@ glabel func_802E8BC0 /* 10A490 802E8C10 46020003 */ div.s $f0, $f0, $f2 /* 10A494 802E8C14 4600010D */ trunc.w.s $f4, $f0 /* 10A498 802E8C18 44022000 */ mfc1 $v0, $f4 -/* 10A49C 802E8C1C 00000000 */ nop +/* 10A49C 802E8C1C 00000000 */ nop /* 10A4A0 802E8C20 14400003 */ bnez $v0, .L802E8C30 /* 10A4A4 802E8C24 AE020004 */ sw $v0, 4($s0) /* 10A4A8 802E8C28 24020001 */ addiu $v0, $zero, 1 @@ -43,12 +43,12 @@ glabel func_802E8BC0 /* 10A4D4 802E8C54 0C03805E */ jal disable_player_input /* 10A4D8 802E8C58 46000506 */ mov.s $f20, $f0 /* 10A4DC 802E8C5C 0C038045 */ jal disable_player_static_collisions -/* 10A4E0 802E8C60 00000000 */ nop +/* 10A4E0 802E8C60 00000000 */ nop /* 10A4E4 802E8C64 8E26005C */ lw $a2, 0x5c($s1) /* 10A4E8 802E8C68 8E040004 */ lw $a0, 4($s0) /* 10A4EC 802E8C6C 4405A000 */ mfc1 $a1, $f20 /* 10A4F0 802E8C70 0C0389DE */ jal move_player -/* 10A4F4 802E8C74 00000000 */ nop +/* 10A4F4 802E8C74 00000000 */ nop /* 10A4F8 802E8C78 8FBF001C */ lw $ra, 0x1c($sp) /* 10A4FC 802E8C7C 8FB20018 */ lw $s2, 0x18($sp) /* 10A500 802E8C80 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_109660_len_1270/func_802E8C94.s b/asm/nonmatchings/code_109660_len_1270/func_802E8C94.s index 0601185bd2..11cb38c00f 100644 --- a/asm/nonmatchings/code_109660_len_1270/func_802E8C94.s +++ b/asm/nonmatchings/code_109660_len_1270/func_802E8C94.s @@ -10,9 +10,9 @@ glabel func_802E8C94 /* 10A528 802E8CA8 AC430004 */ sw $v1, 4($v0) /* 10A52C 802E8CAC 2402FFFF */ addiu $v0, $zero, -1 /* 10A530 802E8CB0 14620003 */ bne $v1, $v0, .L802E8CC0 -/* 10A534 802E8CB4 00000000 */ nop +/* 10A534 802E8CB4 00000000 */ nop /* 10A538 802E8CB8 0C043F5A */ jal func_8010FD68 -/* 10A53C 802E8CBC 00000000 */ nop +/* 10A53C 802E8CBC 00000000 */ nop .L802E8CC0: /* 10A540 802E8CC0 8FBF0010 */ lw $ra, 0x10($sp) /* 10A544 802E8CC4 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_109660_len_1270/func_802E8F94.s b/asm/nonmatchings/code_109660_len_1270/func_802E8F94.s index 4f5127430a..74a19aeab7 100644 --- a/asm/nonmatchings/code_109660_len_1270/func_802E8F94.s +++ b/asm/nonmatchings/code_109660_len_1270/func_802E8F94.s @@ -36,7 +36,7 @@ glabel func_802E8F94 /* 10A890 802E9010 3C01402E */ lui $at, 0x402e /* 10A894 802E9014 44810800 */ mtc1 $at, $f1 /* 10A898 802E9018 44800000 */ mtc1 $zero, $f0 -/* 10A89C 802E901C 00000000 */ nop +/* 10A89C 802E901C 00000000 */ nop /* 10A8A0 802E9020 46201001 */ sub.d $f0, $f2, $f0 .L802E9024: /* 10A8A4 802E9024 46200020 */ cvt.s.d $f0, $f0 @@ -47,6 +47,6 @@ glabel func_802E8F94 /* 10A8B8 802E9038 8FB00010 */ lw $s0, 0x10($sp) /* 10A8BC 802E903C 03E00008 */ jr $ra /* 10A8C0 802E9040 27BD0020 */ addiu $sp, $sp, 0x20 -/* 10A8C4 802E9044 00000000 */ nop -/* 10A8C8 802E9048 00000000 */ nop -/* 10A8CC 802E904C 00000000 */ nop +/* 10A8C4 802E9044 00000000 */ nop +/* 10A8C8 802E9048 00000000 */ nop +/* 10A8CC 802E904C 00000000 */ nop diff --git a/asm/nonmatchings/code_111f0_len_860/func_8003617C.s b/asm/nonmatchings/code_111f0_len_860/func_8003617C.s index 6ca959b7dc..16b935ea25 100644 --- a/asm/nonmatchings/code_111f0_len_860/func_8003617C.s +++ b/asm/nonmatchings/code_111f0_len_860/func_8003617C.s @@ -11,11 +11,12 @@ glabel func_8003617C /* 11594 80036194 10400094 */ beqz $v0, .L800363E8 /* 11598 80036198 AFB00010 */ sw $s0, 0x10($sp) /* 1159C 8003619C 00031080 */ sll $v0, $v1, 2 -/* 115A0 800361A0 3C01800A */ lui $at, %hi(D_80098320) +/* 115A0 800361A0 3C01800A */ lui $at, %hi(jtbl_80098320_73720) /* 115A4 800361A4 00220821 */ addu $at, $at, $v0 -/* 115A8 800361A8 8C228320 */ lw $v0, %lo(D_80098320)($at) +/* 115A8 800361A8 8C228320 */ lw $v0, %lo(jtbl_80098320_73720)($at) /* 115AC 800361AC 00400008 */ jr $v0 /* 115B0 800361B0 00000000 */ nop +glabel L800361B4_115B4 /* 115B4 800361B4 0C00E64C */ jal update_npcs /* 115B8 800361B8 00000000 */ nop /* 115BC 800361BC 0C037DD0 */ jal update_player @@ -37,6 +38,7 @@ glabel func_8003617C /* 115FC 800361FC 24420001 */ addiu $v0, $v0, 1 /* 11600 80036200 0800D8FA */ j .L800363E8 /* 11604 80036204 A4620000 */ sh $v0, ($v1) +glabel L80036208_11608 /* 11608 80036208 3C03800A */ lui $v1, %hi(D_8009A650) /* 1160C 8003620C 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) /* 11610 80036210 8C620000 */ lw $v0, ($v1) @@ -52,6 +54,7 @@ glabel func_8003617C /* 11638 80036238 24420001 */ addiu $v0, $v0, 1 /* 1163C 8003623C 0800D8FA */ j .L800363E8 /* 11640 80036240 A4820000 */ sh $v0, ($a0) +glabel L80036244_11644 /* 11644 80036244 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* 11648 80036248 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 1164C 8003624C 8E020000 */ lw $v0, ($s0) @@ -100,6 +103,7 @@ glabel func_8003617C /* 116EC 800362EC 24630001 */ addiu $v1, $v1, 1 /* 116F0 800362F0 0800D8FA */ j .L800363E8 /* 116F4 800362F4 A4430000 */ sh $v1, ($v0) +glabel L800362F8_116F8 /* 116F8 800362F8 0C00F949 */ jal func_8003E524 /* 116FC 800362FC 00000000 */ nop /* 11700 80036300 0C00E64C */ jal update_npcs @@ -134,6 +138,7 @@ glabel func_8003617C /* 11770 80036370 AC820000 */ sw $v0, ($a0) /* 11774 80036374 0800D8FA */ j .L800363E8 /* 11778 80036378 A4C30000 */ sh $v1, ($a2) +glabel L8003637C_1177C /* 1177C 8003637C 0C00E64C */ jal update_npcs /* 11780 80036380 00000000 */ nop /* 11784 80036384 0C037DD0 */ jal update_player diff --git a/asm/nonmatchings/code_11a50_len_7a0/step_intro.s b/asm/nonmatchings/code_11a50_len_7a0/step_intro.s index dc7360f7b1..701a50095a 100644 --- a/asm/nonmatchings/code_11a50_len_7a0/step_intro.s +++ b/asm/nonmatchings/code_11a50_len_7a0/step_intro.s @@ -47,7 +47,7 @@ glabel step_intro /* 11CF4 800368F4 8C630964 */ lw $v1, %lo(D_800A0964)($v1) .L800368F8: /* 11CF8 800368F8 14620011 */ bne $v1, $v0, .L80036940 -/* 11CFC 800368FC 00000000 */ nop +/* 11CFC 800368FC 00000000 */ nop /* 11D00 80036900 3C048007 */ lui $a0, %hi(gGameStatusPtr) /* 11D04 80036904 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) /* 11D08 80036908 908300AC */ lbu $v1, 0xac($a0) @@ -57,7 +57,7 @@ glabel step_intro /* 11D18 80036918 00021603 */ sra $v0, $v0, 0x18 /* 11D1C 8003691C 24030004 */ addiu $v1, $zero, 4 /* 11D20 80036920 14430007 */ bne $v0, $v1, .L80036940 -/* 11D24 80036924 00000000 */ nop +/* 11D24 80036924 00000000 */ nop .L80036928: /* 11D28 80036928 908200A8 */ lbu $v0, 0xa8($a0) /* 11D2C 8003692C 24420001 */ addiu $v0, $v0, 1 @@ -65,7 +65,7 @@ glabel step_intro /* 11D30 80036930 0C00D994 */ jal begin_state_intro /* 11D34 80036934 A08200A8 */ sb $v0, 0xa8($a0) /* 11D38 80036938 0800DB72 */ j .L80036DC8 -/* 11D3C 8003693C 00000000 */ nop +/* 11D3C 8003693C 00000000 */ nop .L80036940: /* 11D40 80036940 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 11D44 80036944 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) @@ -73,29 +73,30 @@ glabel step_intro /* 11D4C 8003694C 2C620016 */ sltiu $v0, $v1, 0x16 /* 11D50 80036950 10400109 */ beqz $v0, .L80036D78 /* 11D54 80036954 00031080 */ sll $v0, $v1, 2 -/* 11D58 80036958 3C01800A */ lui $at, %hi(D_80098338) +/* 11D58 80036958 3C01800A */ lui $at, %hi(jtbl_80098338_73738) /* 11D5C 8003695C 00220821 */ addu $at, $at, $v0 -/* 11D60 80036960 8C228338 */ lw $v0, %lo(D_80098338)($at) +/* 11D60 80036960 8C228338 */ lw $v0, %lo(jtbl_80098338_73738)($at) /* 11D64 80036964 00400008 */ jr $v0 -/* 11D68 80036968 00000000 */ nop +/* 11D68 80036968 00000000 */ nop +glabel L8003696C_11D6C /* 11D6C 8003696C 0C016754 */ jal func_80059D50 -/* 11D70 80036970 00000000 */ nop +/* 11D70 80036970 00000000 */ nop /* 11D74 80036974 0C00B500 */ jal update_cameras -/* 11D78 80036978 00000000 */ nop +/* 11D78 80036978 00000000 */ nop /* 11D7C 8003697C 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* 11D80 80036980 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 11D84 80036984 8E060000 */ lw $a2, ($s0) /* 11D88 80036988 80C300A8 */ lb $v1, 0xa8($a2) /* 11D8C 8003698C 2402FFFF */ addiu $v0, $zero, -1 /* 11D90 80036990 14620010 */ bne $v1, $v0, .L800369D4 -/* 11D94 80036994 00000000 */ nop +/* 11D94 80036994 00000000 */ nop /* 11D98 80036998 44806000 */ mtc1 $zero, $f12 /* 11D9C 8003699C 0C00AFC5 */ jal set_curtain_fade_goal -/* 11DA0 800369A0 00000000 */ nop +/* 11DA0 800369A0 00000000 */ nop /* 11DA4 800369A4 3C04800A */ lui $a0, %hi(D_800A0956) /* 11DA8 800369A8 84840956 */ lh $a0, %lo(D_800A0956)($a0) /* 11DAC 800369AC 0C00CE0C */ jal intro_logos_fade_out -/* 11DB0 800369B0 00000000 */ nop +/* 11DB0 800369B0 00000000 */ nop /* 11DB4 800369B4 104000F0 */ beqz $v0, .L80036D78 /* 11DB8 800369B8 24020001 */ addiu $v0, $zero, 1 /* 11DBC 800369BC 0000202D */ daddu $a0, $zero, $zero @@ -103,7 +104,7 @@ glabel step_intro /* 11DC4 800369C4 0C00AFC1 */ jal set_curtain_draw_callback /* 11DC8 800369C8 A06200AC */ sb $v0, 0xac($v1) /* 11DCC 800369CC 0800DB5E */ j .L80036D78 -/* 11DD0 800369D0 00000000 */ nop +/* 11DD0 800369D0 00000000 */ nop .L800369D4: /* 11DD4 800369D4 3C05800A */ lui $a1, %hi(D_800A0954) /* 11DD8 800369D8 24A50954 */ addiu $a1, $a1, %lo(D_800A0954) @@ -123,7 +124,8 @@ glabel step_intro /* 11E10 80036A10 0C00AFC1 */ jal set_curtain_draw_callback /* 11E14 80036A14 A0C200AC */ sb $v0, 0xac($a2) /* 11E18 80036A18 0800DB5E */ j .L80036D78 -/* 11E1C 80036A1C 00000000 */ nop +/* 11E1C 80036A1C 00000000 */ nop +glabel L80036A20_11E20 /* 11E20 80036A20 3C04800A */ lui $a0, %hi(D_8009A650) /* 11E24 80036A24 2484A650 */ addiu $a0, $a0, %lo(D_8009A650) /* 11E28 80036A28 8C820000 */ lw $v0, ($a0) @@ -136,9 +138,10 @@ glabel step_intro /* 11E44 80036A44 8C630960 */ lw $v1, %lo(D_800A0960)($v1) /* 11E48 80036A48 2402000E */ addiu $v0, $zero, 0xe /* 11E4C 80036A4C 106200CA */ beq $v1, $v0, .L80036D78 -/* 11E50 80036A50 00000000 */ nop +/* 11E50 80036A50 00000000 */ nop /* 11E54 80036A54 0800DAA3 */ j .L80036A8C -/* 11E58 80036A58 00000000 */ nop +/* 11E58 80036A58 00000000 */ nop +glabel L80036A5C_11E5C /* 11E5C 80036A5C 3C03800A */ lui $v1, %hi(D_800A0950) /* 11E60 80036A60 24630950 */ addiu $v1, $v1, %lo(D_800A0950) /* 11E64 80036A64 8C620000 */ lw $v0, ($v1) @@ -157,6 +160,7 @@ glabel step_intro /* 11E94 80036A94 24020002 */ addiu $v0, $zero, 2 /* 11E98 80036A98 0800DB5E */ j .L80036D78 /* 11E9C 80036A9C A06200AC */ sb $v0, 0xac($v1) +glabel L80036AA0_11EA0 /* 11EA0 80036AA0 0C00AFC1 */ jal set_curtain_draw_callback /* 11EA4 80036AA4 0000202D */ daddu $a0, $zero, $zero /* 11EA8 80036AA8 3C038007 */ lui $v1, %hi(gGameStatusPtr) @@ -175,59 +179,59 @@ glabel step_intro /* 11EDC 80036ADC 14450037 */ bne $v0, $a1, .L80036BBC /* 11EE0 80036AE0 2404000B */ addiu $a0, $zero, 0xb /* 11EE4 80036AE4 0C00AB00 */ jal general_heap_create -/* 11EE8 80036AE8 00000000 */ nop +/* 11EE8 80036AE8 00000000 */ nop /* 11EEC 80036AEC 0C047624 */ jal func_8011D890 -/* 11EF0 80036AF0 00000000 */ nop +/* 11EF0 80036AF0 00000000 */ nop /* 11EF4 80036AF4 0C048C2E */ jal clear_dynamic_entity_list -/* 11EF8 80036AF8 00000000 */ nop +/* 11EF8 80036AF8 00000000 */ nop /* 11EFC 80036AFC 0C0B0C77 */ jal clear_script_list -/* 11F00 80036B00 00000000 */ nop +/* 11F00 80036B00 00000000 */ nop /* 11F04 80036B04 0C00B7BD */ jal create_cameras_a -/* 11F08 80036B08 00000000 */ nop +/* 11F08 80036B08 00000000 */ nop /* 11F0C 80036B0C 0C0B763E */ jal func_802DD8F8 /* 11F10 80036B10 0000202D */ daddu $a0, $zero, $zero /* 11F14 80036B14 0C0482EC */ jal clear_virtual_models -/* 11F18 80036B18 00000000 */ nop +/* 11F18 80036B18 00000000 */ nop /* 11F1C 80036B1C 0C047889 */ jal func_8011E224 -/* 11F20 80036B20 00000000 */ nop +/* 11F20 80036B20 00000000 */ nop /* 11F24 80036B24 0C045751 */ jal clear_model_data -/* 11F28 80036B28 00000000 */ nop +/* 11F28 80036B28 00000000 */ nop /* 11F2C 80036B2C 0C052010 */ jal func_80148040 -/* 11F30 80036B30 00000000 */ nop +/* 11F30 80036B30 00000000 */ nop /* 11F34 80036B34 0C05177E */ jal func_80145DF8 -/* 11F38 80036B38 00000000 */ nop +/* 11F38 80036B38 00000000 */ nop /* 11F3C 80036B3C 0C050440 */ jal func_80141100 -/* 11F40 80036B40 00000000 */ nop +/* 11F40 80036B40 00000000 */ nop /* 11F44 80036B44 0C0515A0 */ jal clear_trigger_data -/* 11F48 80036B48 00000000 */ nop +/* 11F48 80036B48 00000000 */ nop /* 11F4C 80036B4C 0C048D9D */ jal clear_printers -/* 11F50 80036B50 00000000 */ nop +/* 11F50 80036B50 00000000 */ nop /* 11F54 80036B54 0C04432E */ jal clear_entity_data /* 11F58 80036B58 0000202D */ daddu $a0, $zero, $zero /* 11F5C 80036B5C 0C04E042 */ jal func_80138108 -/* 11F60 80036B60 00000000 */ nop +/* 11F60 80036B60 00000000 */ nop /* 11F64 80036B64 0C037F14 */ jal clear_player_status -/* 11F68 80036B68 00000000 */ nop +/* 11F68 80036B68 00000000 */ nop /* 11F6C 80036B6C 0C00E12F */ jal clear_npcs -/* 11F70 80036B70 00000000 */ nop +/* 11F70 80036B70 00000000 */ nop /* 11F74 80036B74 0C039CE8 */ jal clear_player_data -/* 11F78 80036B78 00000000 */ nop +/* 11F78 80036B78 00000000 */ nop /* 11F7C 80036B7C 0C01CACC */ jal func_80072B30 -/* 11F80 80036B80 00000000 */ nop +/* 11F80 80036B80 00000000 */ nop /* 11F84 80036B84 0C00F8CE */ jal func_8003E338 -/* 11F88 80036B88 00000000 */ nop +/* 11F88 80036B88 00000000 */ nop /* 11F8C 80036B8C 0C016727 */ jal func_80059C9C -/* 11F90 80036B90 00000000 */ nop +/* 11F90 80036B90 00000000 */ nop /* 11F94 80036B94 0C04C3FC */ jal clear_item_entity_data -/* 11F98 80036B98 00000000 */ nop +/* 11F98 80036B98 00000000 */ nop /* 11F9C 80036B9C 0C0514C8 */ jal clear_saved_variables -/* 11FA0 80036BA0 00000000 */ nop +/* 11FA0 80036BA0 00000000 */ nop /* 11FA4 80036BA4 0C016BE5 */ jal initialize_collision -/* 11FA8 80036BA8 00000000 */ nop +/* 11FA8 80036BA8 00000000 */ nop /* 11FAC 80036BAC 0C00CD3C */ jal set_game_mode /* 11FB0 80036BB0 24040002 */ addiu $a0, $zero, 2 /* 11FB4 80036BB4 0800DB72 */ j .L80036DC8 -/* 11FB8 80036BB8 00000000 */ nop +/* 11FB8 80036BB8 00000000 */ nop .L80036BBC: /* 11FBC 80036BBC 26230058 */ addiu $v1, $s1, 0x58 /* 11FC0 80036BC0 2402000A */ addiu $v0, $zero, 0xa @@ -262,7 +266,8 @@ glabel step_intro /* 12030 80036C30 0C03805E */ jal disable_player_input /* 12034 80036C34 A06200AC */ sb $v0, 0xac($v1) /* 12038 80036C38 0800DB5E */ j .L80036D78 -/* 1203C 80036C3C 00000000 */ nop +/* 1203C 80036C3C 00000000 */ nop +glabel L80036C40_12040 /* 12040 80036C40 3C04800A */ lui $a0, %hi(D_800A0960) /* 12044 80036C44 24840960 */ addiu $a0, $a0, %lo(D_800A0960) /* 12048 80036C48 8C830000 */ lw $v1, ($a0) @@ -294,13 +299,13 @@ glabel step_intro /* 120AC 80036CAC 0C037DD0 */ jal update_player /* 120B0 80036CB0 AC830000 */ sw $v1, ($a0) /* 120B4 80036CB4 0C00F949 */ jal func_8003E524 -/* 120B8 80036CB8 00000000 */ nop +/* 120B8 80036CB8 00000000 */ nop /* 120BC 80036CBC 0C00E64C */ jal update_npcs -/* 120C0 80036CC0 00000000 */ nop +/* 120C0 80036CC0 00000000 */ nop /* 120C4 80036CC4 0C016754 */ jal func_80059D50 -/* 120C8 80036CC8 00000000 */ nop +/* 120C8 80036CC8 00000000 */ nop /* 120CC 80036CCC 0C00B500 */ jal update_cameras -/* 120D0 80036CD0 00000000 */ nop +/* 120D0 80036CD0 00000000 */ nop /* 120D4 80036CD4 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* 120D8 80036CD8 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 120DC 80036CDC 8E020000 */ lw $v0, ($s0) @@ -313,12 +318,13 @@ glabel step_intro /* 120F8 80036CF8 A04300AC */ sb $v1, 0xac($v0) /* 120FC 80036CFC 0800DB5E */ j .L80036D78 /* 12100 80036D00 A4440088 */ sh $a0, 0x88($v0) +glabel L80036D04_12104 /* 12104 80036D04 0C016754 */ jal func_80059D50 -/* 12108 80036D08 00000000 */ nop +/* 12108 80036D08 00000000 */ nop /* 1210C 80036D0C 0C00B500 */ jal update_cameras -/* 12110 80036D10 00000000 */ nop +/* 12110 80036D10 00000000 */ nop /* 12114 80036D14 0C00E64C */ jal update_npcs -/* 12118 80036D18 00000000 */ nop +/* 12118 80036D18 00000000 */ nop /* 1211C 80036D1C 3C04800A */ lui $a0, %hi(D_800A0954) /* 12120 80036D20 24840954 */ addiu $a0, $a0, %lo(D_800A0954) /* 12124 80036D24 84820000 */ lh $v0, ($a0) @@ -326,7 +332,7 @@ glabel step_intro /* 1212C 80036D2C 94830000 */ lhu $v1, ($a0) /* 12130 80036D30 3C01BF80 */ lui $at, 0xbf80 /* 12134 80036D34 4481A000 */ mtc1 $at, $f20 -/* 12138 80036D38 00000000 */ nop +/* 12138 80036D38 00000000 */ nop /* 1213C 80036D3C 4405A000 */ mfc1 $a1, $f20 /* 12140 80036D40 0C04DF62 */ jal func_80137D88 /* 12144 80036D44 240400FF */ addiu $a0, $zero, 0xff @@ -334,7 +340,7 @@ glabel step_intro /* 1214C 80036D4C 0C04DF69 */ jal func_80137DA4 /* 12150 80036D50 240400FF */ addiu $a0, $zero, 0xff /* 12154 80036D54 0800DB5E */ j .L80036D78 -/* 12158 80036D58 00000000 */ nop +/* 12158 80036D58 00000000 */ nop .L80036D5C: /* 1215C 80036D5C 3C02800A */ lui $v0, %hi(D_800A0958) /* 12160 80036D60 94420958 */ lhu $v0, %lo(D_800A0958)($v0) @@ -344,16 +350,17 @@ glabel step_intro /* 12170 80036D70 04420001 */ bltzl $v0, .L80036D78 /* 12174 80036D74 A4800000 */ sh $zero, ($a0) .L80036D78: +glabel L80036D78_12178 /* 12178 80036D78 3C02800A */ lui $v0, %hi(D_800A0954) /* 1217C 80036D7C 84420954 */ lh $v0, %lo(D_800A0954)($v0) /* 12180 80036D80 3C04800A */ lui $a0, %hi(D_800A0963) /* 12184 80036D84 90840963 */ lbu $a0, %lo(D_800A0963)($a0) /* 12188 80036D88 44820000 */ mtc1 $v0, $f0 -/* 1218C 80036D8C 00000000 */ nop +/* 1218C 80036D8C 00000000 */ nop /* 12190 80036D90 46800020 */ cvt.s.w $f0, $f0 /* 12194 80036D94 44050000 */ mfc1 $a1, $f0 /* 12198 80036D98 0C04DF69 */ jal func_80137DA4 -/* 1219C 80036D9C 00000000 */ nop +/* 1219C 80036D9C 00000000 */ nop /* 121A0 80036DA0 3C05800A */ lui $a1, %hi(D_800A095B) /* 121A4 80036DA4 90A5095B */ lbu $a1, %lo(D_800A095B)($a1) /* 121A8 80036DA8 3C06800A */ lui $a2, %hi(D_800A095D) @@ -363,7 +370,7 @@ glabel step_intro /* 121B8 80036DB8 0C04DF84 */ jal func_80137E10 /* 121BC 80036DBC 24040001 */ addiu $a0, $zero, 1 /* 121C0 80036DC0 0C00CE1D */ jal intro_logos_update_fade -/* 121C4 80036DC4 00000000 */ nop +/* 121C4 80036DC4 00000000 */ nop .L80036DC8: /* 121C8 80036DC8 8FBF0018 */ lw $ra, 0x18($sp) /* 121CC 80036DCC 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_121f0_len_1290/begin_state_title_screen.s b/asm/nonmatchings/code_121f0_len_1290/begin_state_title_screen.s index 52a55caac3..88b2d7bd7e 100644 --- a/asm/nonmatchings/code_121f0_len_1290/begin_state_title_screen.s +++ b/asm/nonmatchings/code_121f0_len_1290/begin_state_title_screen.s @@ -17,9 +17,9 @@ glabel begin_state_title_screen /* 12220 80036E20 3C018015 */ lui $at, %hi(D_8014C248) /* 12224 80036E24 A022C248 */ sb $v0, %lo(D_8014C248)($at) /* 12228 80036E28 0C00AB00 */ jal general_heap_create -/* 1222C 80036E2C 00000000 */ nop +/* 1222C 80036E2C 00000000 */ nop /* 12230 80036E30 0C048D9D */ jal clear_printers -/* 12234 80036E34 00000000 */ nop +/* 12234 80036E34 00000000 */ nop /* 12238 80036E38 0C0525FF */ jal func_801497FC /* 1223C 80036E3C 0000202D */ daddu $a0, $zero, $zero /* 12240 80036E40 3C038007 */ lui $v1, %hi(gGameStatusPtr) @@ -63,7 +63,7 @@ glabel begin_state_title_screen /* 122D8 80036ED8 3C01800A */ lui $at, %hi(D_800A097C) /* 122DC 80036EDC AC22097C */ sw $v0, %lo(D_800A097C)($at) /* 122E0 80036EE0 0C00B7BD */ jal create_cameras_a -/* 122E4 80036EE4 00000000 */ nop +/* 122E4 80036EE4 00000000 */ nop /* 122E8 80036EE8 0000202D */ daddu $a0, $zero, $zero /* 122EC 80036EEC 2405000C */ addiu $a1, $zero, 0xc /* 122F0 80036EF0 2406001C */ addiu $a2, $zero, 0x1c @@ -124,25 +124,25 @@ glabel begin_state_title_screen /* 123CC 80036FCC 0C0B0C77 */ jal clear_script_list /* 123D0 80036FD0 E606005C */ swc1 $f6, 0x5c($s0) /* 123D4 80036FD4 0C048C2E */ jal clear_dynamic_entity_list -/* 123D8 80036FD8 00000000 */ nop +/* 123D8 80036FD8 00000000 */ nop /* 123DC 80036FDC 0C047624 */ jal func_8011D890 -/* 123E0 80036FE0 00000000 */ nop +/* 123E0 80036FE0 00000000 */ nop /* 123E4 80036FE4 0C0B763E */ jal func_802DD8F8 /* 123E8 80036FE8 0000202D */ daddu $a0, $zero, $zero /* 123EC 80036FEC 0C047889 */ jal func_8011E224 -/* 123F0 80036FF0 00000000 */ nop +/* 123F0 80036FF0 00000000 */ nop /* 123F4 80036FF4 0C0482EC */ jal clear_virtual_models -/* 123F8 80036FF8 00000000 */ nop +/* 123F8 80036FF8 00000000 */ nop /* 123FC 80036FFC 0C00E12F */ jal clear_npcs -/* 12400 80037000 00000000 */ nop +/* 12400 80037000 00000000 */ nop /* 12404 80037004 0C050440 */ jal func_80141100 -/* 12408 80037008 00000000 */ nop +/* 12408 80037008 00000000 */ nop /* 1240C 8003700C 0C05177E */ jal func_80145DF8 -/* 12410 80037010 00000000 */ nop +/* 12410 80037010 00000000 */ nop /* 12414 80037014 0C04432E */ jal clear_entity_data /* 12418 80037018 24040001 */ addiu $a0, $zero, 1 /* 1241C 8003701C 0C016727 */ jal func_80059C9C -/* 12420 80037020 00000000 */ nop +/* 12420 80037020 00000000 */ nop /* 12424 80037024 8E420000 */ lw $v0, ($s2) /* 12428 80037028 34420002 */ ori $v0, $v0, 2 /* 1242C 8003702C 0C039CE8 */ jal clear_player_data @@ -161,7 +161,7 @@ glabel begin_state_title_screen /* 12460 80037060 3C048020 */ lui $a0, %hi(gBackgroundImage) /* 12464 80037064 24840000 */ addiu $a0, $a0, %lo(gBackgroundImage) /* 12468 80037068 0C05178A */ jal read_background_size -/* 1246C 8003706C 00000000 */ nop +/* 1246C 8003706C 00000000 */ nop /* 12470 80037070 0000202D */ daddu $a0, $zero, $zero /* 12474 80037074 2405006A */ addiu $a1, $zero, 0x6a /* 12478 80037078 0080302D */ daddu $a2, $a0, $zero diff --git a/asm/nonmatchings/code_121f0_len_1290/func_800375A4.s b/asm/nonmatchings/code_121f0_len_1290/func_800375A4.s index e7d2e85f14..c1bd4ff010 100644 --- a/asm/nonmatchings/code_121f0_len_1290/func_800375A4.s +++ b/asm/nonmatchings/code_121f0_len_1290/func_800375A4.s @@ -10,11 +10,12 @@ glabel func_800375A4 /* 129B8 800375B8 2C620006 */ sltiu $v0, $v1, 6 /* 129BC 800375BC 1040001B */ beqz $v0, .L8003762C /* 129C0 800375C0 00031080 */ sll $v0, $v1, 2 -/* 129C4 800375C4 3C01800A */ lui $at, %hi(D_800983C8) +/* 129C4 800375C4 3C01800A */ lui $at, %hi(jtbl_800983C8_737C8) /* 129C8 800375C8 00220821 */ addu $at, $at, $v0 -/* 129CC 800375CC 8C2283C8 */ lw $v0, %lo(D_800983C8)($at) +/* 129CC 800375CC 8C2283C8 */ lw $v0, %lo(jtbl_800983C8_737C8)($at) /* 129D0 800375D0 00400008 */ jr $v0 -/* 129D4 800375D4 00000000 */ nop +/* 129D4 800375D4 00000000 */ nop +glabel L800375D8_129D8 /* 129D8 800375D8 3C018007 */ lui $at, %hi(D_80077A28) /* 129DC 800375DC AC207A28 */ sw $zero, %lo(D_80077A28)($at) /* 129E0 800375E0 3C018007 */ lui $at, %hi(D_80077A2C) @@ -22,22 +23,25 @@ glabel func_800375A4 /* 129E8 800375E8 3C018007 */ lui $at, %hi(D_80077A30) /* 129EC 800375EC 0800DD89 */ j .L80037624 /* 129F0 800375F0 AC207A30 */ sw $zero, %lo(D_80077A30)($at) +glabel L800375F4_129F4 /* 129F4 800375F4 0C00DE58 */ jal func_80037960 -/* 129F8 800375F8 00000000 */ nop +/* 129F8 800375F8 00000000 */ nop /* 129FC 800375FC 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 12A00 80037600 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 12A04 80037604 90420073 */ lbu $v0, 0x73($v0) /* 12A08 80037608 30420001 */ andi $v0, $v0, 1 /* 12A0C 8003760C 10400007 */ beqz $v0, .L8003762C -/* 12A10 80037610 00000000 */ nop +/* 12A10 80037610 00000000 */ nop /* 12A14 80037614 0C00DEF2 */ jal func_80037BC8 -/* 12A18 80037618 00000000 */ nop +/* 12A18 80037618 00000000 */ nop /* 12A1C 8003761C 0800DD8B */ j .L8003762C -/* 12A20 80037620 00000000 */ nop +/* 12A20 80037620 00000000 */ nop .L80037624: +glabel L80037624_12A24 /* 12A24 80037624 0C00DE58 */ jal func_80037960 -/* 12A28 80037628 00000000 */ nop +/* 12A28 80037628 00000000 */ nop .L8003762C: +glabel L8003762C_12A2C /* 12A2C 8003762C 8FBF0010 */ lw $ra, 0x10($sp) /* 12A30 80037630 03E00008 */ jr $ra /* 12A34 80037634 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_121f0_len_1290/func_80037638.s b/asm/nonmatchings/code_121f0_len_1290/func_80037638.s index 0e672b1160..202289e55c 100644 --- a/asm/nonmatchings/code_121f0_len_1290/func_80037638.s +++ b/asm/nonmatchings/code_121f0_len_1290/func_80037638.s @@ -18,29 +18,33 @@ glabel func_80037638 /* 12A6C 8003766C 2C620006 */ sltiu $v0, $v1, 6 /* 12A70 80037670 10400029 */ beqz $v0, .L80037718 /* 12A74 80037674 00031080 */ sll $v0, $v1, 2 -/* 12A78 80037678 3C01800A */ lui $at, %hi(D_800983E0) +/* 12A78 80037678 3C01800A */ lui $at, %hi(jtbl_800983E0_737E0) /* 12A7C 8003767C 00220821 */ addu $at, $at, $v0 -/* 12A80 80037680 8C2283E0 */ lw $v0, %lo(D_800983E0)($at) +/* 12A80 80037680 8C2283E0 */ lw $v0, %lo(jtbl_800983E0_737E0)($at) /* 12A84 80037684 00400008 */ jr $v0 -/* 12A88 80037688 00000000 */ nop +/* 12A88 80037688 00000000 */ nop +glabel L8003768C_12A8C /* 12A8C 8003768C 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 12A90 80037690 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 12A94 80037694 804300AF */ lb $v1, 0xaf($v0) /* 12A98 80037698 804200B0 */ lb $v0, 0xb0($v0) /* 12A9C 8003769C 44836000 */ mtc1 $v1, $f12 -/* 12AA0 800376A0 00000000 */ nop +/* 12AA0 800376A0 00000000 */ nop /* 12AA4 800376A4 46806320 */ cvt.s.w $f12, $f12 /* 12AA8 800376A8 44820000 */ mtc1 $v0, $f0 -/* 12AAC 800376AC 00000000 */ nop +/* 12AAC 800376AC 00000000 */ nop /* 12AB0 800376B0 46800020 */ cvt.s.w $f0, $f0 /* 12AB4 800376B4 0800DDC2 */ j .L80037708 /* 12AB8 800376B8 46006303 */ div.s $f12, $f12, $f0 +glabel L800376BC_12ABC /* 12ABC 800376BC 44806000 */ mtc1 $zero, $f12 /* 12AC0 800376C0 0800DDC4 */ j .L80037710 -/* 12AC4 800376C4 00000000 */ nop +/* 12AC4 800376C4 00000000 */ nop +glabel L800376C8_12AC8 /* 12AC8 800376C8 44806000 */ mtc1 $zero, $f12 /* 12ACC 800376CC 0800DDC4 */ j .L80037710 -/* 12AD0 800376D0 00000000 */ nop +/* 12AD0 800376D0 00000000 */ nop +glabel L800376D4_12AD4 /* 12AD4 800376D4 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* 12AD8 800376D8 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 12ADC 800376DC 806200AF */ lb $v0, 0xaf($v1) @@ -48,19 +52,20 @@ glabel func_80037638 /* 12AE4 800376E4 2442FFFF */ addiu $v0, $v0, -1 /* 12AE8 800376E8 00621023 */ subu $v0, $v1, $v0 /* 12AEC 800376EC 44826000 */ mtc1 $v0, $f12 -/* 12AF0 800376F0 00000000 */ nop +/* 12AF0 800376F0 00000000 */ nop /* 12AF4 800376F4 46806320 */ cvt.s.w $f12, $f12 /* 12AF8 800376F8 44830000 */ mtc1 $v1, $f0 -/* 12AFC 800376FC 00000000 */ nop +/* 12AFC 800376FC 00000000 */ nop /* 12B00 80037700 46800020 */ cvt.s.w $f0, $f0 /* 12B04 80037704 46006303 */ div.s $f12, $f12, $f0 .L80037708: /* 12B08 80037708 460C6302 */ mul.s $f12, $f12, $f12 -/* 12B0C 8003770C 00000000 */ nop +/* 12B0C 8003770C 00000000 */ nop .L80037710: /* 12B10 80037710 0C00DE5A */ jal func_80037968 /* 12B14 80037714 46006386 */ mov.s $f14, $f12 .L80037718: +glabel L80037718_12B18 /* 12B18 80037718 3C03FF10 */ lui $v1, 0xff10 /* 12B1C 8003771C 3463013F */ ori $v1, $v1, 0x13f /* 12B20 80037720 3C10800A */ lui $s0, %hi(gMasterGfxPos) diff --git a/asm/nonmatchings/code_121f0_len_1290/func_80037994.s b/asm/nonmatchings/code_121f0_len_1290/func_80037994.s index df0de7233c..ba7fe6188b 100644 --- a/asm/nonmatchings/code_121f0_len_1290/func_80037994.s +++ b/asm/nonmatchings/code_121f0_len_1290/func_80037994.s @@ -29,14 +29,14 @@ glabel func_80037994 /* 12DF4 800379F4 AC820004 */ sw $v0, 4($a0) /* 12DF8 800379F8 24620008 */ addiu $v0, $v1, 8 /* 12DFC 800379FC 46006302 */ mul.s $f12, $f12, $f0 -/* 12E00 80037A00 00000000 */ nop +/* 12E00 80037A00 00000000 */ nop /* 12E04 80037A04 AD020000 */ sw $v0, ($t0) /* 12E08 80037A08 3C02E700 */ lui $v0, 0xe700 /* 12E0C 80037A0C AC620000 */ sw $v0, ($v1) /* 12E10 80037A10 AC600004 */ sw $zero, 4($v1) /* 12E14 80037A14 4600608D */ trunc.w.s $f2, $f12 /* 12E18 80037A18 440E1000 */ mfc1 $t6, $f2 -/* 12E1C 80037A1C 00000000 */ nop +/* 12E1C 80037A1C 00000000 */ nop /* 12E20 80037A20 25C9000F */ addiu $t1, $t6, 0xf .L80037A24: /* 12E24 80037A24 3C04FD18 */ lui $a0, 0xfd18 diff --git a/asm/nonmatchings/code_121f0_len_1290/func_80037E14.s b/asm/nonmatchings/code_121f0_len_1290/func_80037E14.s index bfc8f95315..e17aa96af1 100644 --- a/asm/nonmatchings/code_121f0_len_1290/func_80037E14.s +++ b/asm/nonmatchings/code_121f0_len_1290/func_80037E14.s @@ -24,7 +24,7 @@ glabel func_80037E14 /* 13260 80037E60 3C028007 */ lui $v0, %hi(D_80077A50) /* 13264 80037E64 24427A50 */ addiu $v0, $v0, %lo(D_80077A50) /* 13268 80037E68 46006302 */ mul.s $f12, $f12, $f0 -/* 1326C 80037E6C 00000000 */ nop +/* 1326C 80037E6C 00000000 */ nop /* 13270 80037E70 AC620004 */ sw $v0, 4($v1) /* 13274 80037E74 24A20008 */ addiu $v0, $a1, 8 /* 13278 80037E78 ACE20000 */ sw $v0, ($a3) @@ -33,7 +33,7 @@ glabel func_80037E14 /* 13284 80037E84 ACA20000 */ sw $v0, ($a1) /* 13288 80037E88 4600008D */ trunc.w.s $f2, $f0 /* 1328C 80037E8C 44061000 */ mfc1 $a2, $f2 -/* 13290 80037E90 00000000 */ nop +/* 13290 80037E90 00000000 */ nop /* 13294 80037E94 28C200FF */ slti $v0, $a2, 0xff /* 13298 80037E98 10400011 */ beqz $v0, .L80037EE0 /* 1329C 80037E9C ACA00004 */ sw $zero, 4($a1) @@ -158,5 +158,5 @@ glabel func_80037E14 /* 1346C 8003806C 8FB00000 */ lw $s0, ($sp) /* 13470 80038070 03E00008 */ jr $ra /* 13474 80038074 27BD0020 */ addiu $sp, $sp, 0x20 -/* 13478 80038078 00000000 */ nop -/* 1347C 8003807C 00000000 */ nop +/* 13478 80038078 00000000 */ nop +/* 1347C 8003807C 00000000 */ nop diff --git a/asm/nonmatchings/code_121f0_len_1290/step_title_screen.s b/asm/nonmatchings/code_121f0_len_1290/step_title_screen.s index 27d175274d..a0f2d53a50 100644 --- a/asm/nonmatchings/code_121f0_len_1290/step_title_screen.s +++ b/asm/nonmatchings/code_121f0_len_1290/step_title_screen.s @@ -15,7 +15,7 @@ glabel step_title_screen /* 124DC 800370DC 8C510010 */ lw $s1, 0x10($v0) /* 124E0 800370E0 44806000 */ mtc1 $zero, $f12 /* 124E4 800370E4 0C00AFC9 */ jal set_curtain_fade -/* 124E8 800370E8 00000000 */ nop +/* 124E8 800370E8 00000000 */ nop /* 124EC 800370EC 3C04800A */ lui $a0, %hi(D_800A0988) /* 124F0 800370F0 24840988 */ addiu $a0, $a0, %lo(D_800A0988) /* 124F4 800370F4 84820000 */ lh $v0, ($a0) @@ -29,11 +29,12 @@ glabel step_title_screen /* 12510 80037110 2C620007 */ sltiu $v0, $v1, 7 /* 12514 80037114 10400115 */ beqz $v0, .L8003756C /* 12518 80037118 00031080 */ sll $v0, $v1, 2 -/* 1251C 8003711C 3C01800A */ lui $at, %hi(D_800983A8) +/* 1251C 8003711C 3C01800A */ lui $at, %hi(jtbl_800983A8_737A8) /* 12520 80037120 00220821 */ addu $at, $at, $v0 -/* 12524 80037124 8C2283A8 */ lw $v0, %lo(D_800983A8)($at) +/* 12524 80037124 8C2283A8 */ lw $v0, %lo(jtbl_800983A8_737A8)($at) /* 12528 80037128 00400008 */ jr $v0 -/* 1252C 8003712C 00000000 */ nop +/* 1252C 8003712C 00000000 */ nop +glabel L80037130_12530 /* 12530 80037130 3C04800A */ lui $a0, %hi(D_8009A650) /* 12534 80037134 2484A650 */ addiu $a0, $a0, %lo(D_8009A650) /* 12538 80037138 8C820000 */ lw $v0, ($a0) @@ -55,6 +56,7 @@ glabel step_title_screen /* 12578 80037178 24420001 */ addiu $v0, $v0, 1 /* 1257C 8003717C 0800DD5B */ j .L8003756C /* 12580 80037180 A06200AC */ sb $v0, 0xac($v1) +glabel L80037184_12584 /* 12584 80037184 3C04800A */ lui $a0, %hi(D_800A0970) /* 12588 80037188 24840970 */ addiu $a0, $a0, %lo(D_800A0970) /* 1258C 8003718C 84820000 */ lh $v0, ($a0) @@ -82,13 +84,14 @@ glabel step_title_screen /* 125DC 800371DC 0C00CDFE */ jal intro_logos_fade_in /* 125E0 800371E0 AC430000 */ sw $v1, ($v0) /* 125E4 800371E4 10400074 */ beqz $v0, .L800373B8 -/* 125E8 800371E8 00000000 */ nop +/* 125E8 800371E8 00000000 */ nop /* 125EC 800371EC 8E030000 */ lw $v1, ($s0) /* 125F0 800371F0 806200AF */ lb $v0, 0xaf($v1) /* 125F4 800371F4 14400070 */ bnez $v0, .L800373B8 /* 125F8 800371F8 24020002 */ addiu $v0, $zero, 2 /* 125FC 800371FC 0800DCEE */ j .L800373B8 /* 12600 80037200 A06200AC */ sb $v0, 0xac($v1) +glabel L80037204_12604 /* 12604 80037204 3C028007 */ lui $v0, %hi(D_80077A34) /* 12608 80037208 8C427A34 */ lw $v0, %lo(D_80077A34)($v0) /* 1260C 8003720C 1040000B */ beqz $v0, .L8003723C @@ -145,7 +148,8 @@ glabel step_title_screen /* 126CC 800372CC 0C052A46 */ jal set_music_track /* 126D0 800372D0 AFA20010 */ sw $v0, 0x10($sp) /* 126D4 800372D4 0800DD64 */ j .L80037590 -/* 126D8 800372D8 00000000 */ nop +/* 126D8 800372D8 00000000 */ nop +glabel L800372DC_126DC /* 126DC 800372DC 240400D0 */ addiu $a0, $zero, 0xd0 /* 126E0 800372E0 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* 126E4 800372E4 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) @@ -172,6 +176,7 @@ glabel step_title_screen /* 12730 80037330 906200B0 */ lbu $v0, 0xb0($v1) /* 12734 80037334 0800DD5B */ j .L8003756C /* 12738 80037338 A06200AF */ sb $v0, 0xaf($v1) +glabel L8003733C_1273C /* 1273C 8003733C 3C038007 */ lui $v1, %hi(D_800779C0) /* 12740 80037340 946379C0 */ lhu $v1, %lo(D_800779C0)($v1) /* 12744 80037344 2462FFF7 */ addiu $v0, $v1, -9 @@ -190,7 +195,7 @@ glabel step_title_screen /* 12774 80037374 0C00CE0C */ jal intro_logos_fade_out /* 12778 80037378 2404000A */ addiu $a0, $zero, 0xa /* 1277C 8003737C 1040000E */ beqz $v0, .L800373B8 -/* 12780 80037380 00000000 */ nop +/* 12780 80037380 00000000 */ nop /* 12784 80037384 8E030000 */ lw $v1, ($s0) /* 12788 80037388 806200AF */ lb $v0, 0xaf($v1) /* 1278C 8003738C 1440000A */ bnez $v0, .L800373B8 @@ -206,9 +211,9 @@ glabel step_title_screen /* 127B4 800373B4 A06200AC */ sb $v0, 0xac($v1) .L800373B8: /* 127B8 800373B8 0C00CE1D */ jal intro_logos_update_fade -/* 127BC 800373BC 00000000 */ nop +/* 127BC 800373BC 00000000 */ nop /* 127C0 800373C0 0800DD5B */ j .L8003756C -/* 127C4 800373C4 00000000 */ nop +/* 127C4 800373C4 00000000 */ nop .L800373C8: /* 127C8 800373C8 00021403 */ sra $v0, $v0, 0x10 /* 127CC 800373CC 24030005 */ addiu $v1, $zero, 5 @@ -246,6 +251,7 @@ glabel step_title_screen .L80037448: /* 12848 80037448 0800DD5B */ j .L8003756C /* 1284C 8003744C A06200AC */ sb $v0, 0xac($v1) +glabel L80037450_12850 /* 12850 80037450 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* 12854 80037454 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 12858 80037458 8E040000 */ lw $a0, ($s0) @@ -258,25 +264,25 @@ glabel step_title_screen /* 12870 80037470 A08200AF */ sb $v0, 0xaf($a0) .L80037474: /* 12874 80037474 0C00AB00 */ jal general_heap_create -/* 12878 80037478 00000000 */ nop +/* 12878 80037478 00000000 */ nop /* 1287C 8003747C 0C047624 */ jal func_8011D890 -/* 12880 80037480 00000000 */ nop +/* 12880 80037480 00000000 */ nop /* 12884 80037484 0C00B7BD */ jal create_cameras_a -/* 12888 80037488 00000000 */ nop +/* 12888 80037488 00000000 */ nop /* 1288C 8003748C 0C0482EC */ jal clear_virtual_models -/* 12890 80037490 00000000 */ nop +/* 12890 80037490 00000000 */ nop /* 12894 80037494 0C047889 */ jal func_8011E224 -/* 12898 80037498 00000000 */ nop +/* 12898 80037498 00000000 */ nop /* 1289C 8003749C 0C00E12F */ jal clear_npcs -/* 128A0 800374A0 00000000 */ nop +/* 128A0 800374A0 00000000 */ nop /* 128A4 800374A4 0C050440 */ jal func_80141100 -/* 128A8 800374A8 00000000 */ nop +/* 128A8 800374A8 00000000 */ nop /* 128AC 800374AC 0C0B763E */ jal func_802DD8F8 /* 128B0 800374B0 0000202D */ daddu $a0, $zero, $zero /* 128B4 800374B4 0C04432E */ jal clear_entity_data /* 128B8 800374B8 24040001 */ addiu $a0, $zero, 1 /* 128BC 800374BC 0C051CFC */ jal func_801473F0 -/* 128C0 800374C0 00000000 */ nop +/* 128C0 800374C0 00000000 */ nop /* 128C4 800374C4 3C04800A */ lui $a0, %hi(D_8009A650) /* 128C8 800374C8 2484A650 */ addiu $a0, $a0, %lo(D_8009A650) /* 128CC 800374CC 2403FFF7 */ addiu $v1, $zero, -9 @@ -297,24 +303,24 @@ glabel step_title_screen /* 12908 80037508 10620011 */ beq $v1, $v0, .L80037550 /* 1290C 8003750C 2404000E */ addiu $a0, $zero, 0xe /* 12910 80037510 0800DD64 */ j .L80037590 -/* 12914 80037514 00000000 */ nop +/* 12914 80037514 00000000 */ nop .L80037518: /* 12918 80037518 2402000A */ addiu $v0, $zero, 0xa /* 1291C 8003751C 10620008 */ beq $v1, $v0, .L80037540 -/* 12920 80037520 00000000 */ nop +/* 12920 80037520 00000000 */ nop /* 12924 80037524 0800DD64 */ j .L80037590 -/* 12928 80037528 00000000 */ nop +/* 12928 80037528 00000000 */ nop .L8003752C: /* 1292C 8003752C A0A000A8 */ sb $zero, 0xa8($a1) /* 12930 80037530 0C00CD3C */ jal set_game_mode /* 12934 80037534 24040010 */ addiu $a0, $zero, 0x10 /* 12938 80037538 0800DD64 */ j .L80037590 -/* 1293C 8003753C 00000000 */ nop +/* 1293C 8003753C 00000000 */ nop .L80037540: /* 12940 80037540 0C00CD3C */ jal set_game_mode /* 12944 80037544 24040011 */ addiu $a0, $zero, 0x11 /* 12948 80037548 0800DD64 */ j .L80037590 -/* 1294C 8003754C 00000000 */ nop +/* 1294C 8003754C 00000000 */ nop .L80037550: /* 12950 80037550 2402000B */ addiu $v0, $zero, 0xb /* 12954 80037554 A4A00086 */ sh $zero, 0x86($a1) @@ -322,17 +328,18 @@ glabel step_title_screen /* 1295C 8003755C 0C00CD3C */ jal set_game_mode /* 12960 80037560 A4A0008E */ sh $zero, 0x8e($a1) /* 12964 80037564 0800DD64 */ j .L80037590 -/* 12968 80037568 00000000 */ nop +/* 12968 80037568 00000000 */ nop .L8003756C: +glabel L8003756C_1296C /* 1296C 8003756C 3C02800A */ lui $v0, %hi(D_8009A650) /* 12970 80037570 8C42A650 */ lw $v0, %lo(D_8009A650)($v0) /* 12974 80037574 30420008 */ andi $v0, $v0, 8 /* 12978 80037578 14400005 */ bnez $v0, .L80037590 -/* 1297C 8003757C 00000000 */ nop +/* 1297C 8003757C 00000000 */ nop /* 12980 80037580 0C00E64C */ jal update_npcs -/* 12984 80037584 00000000 */ nop +/* 12984 80037584 00000000 */ nop /* 12988 80037588 0C00B500 */ jal update_cameras -/* 1298C 8003758C 00000000 */ nop +/* 1298C 8003758C 00000000 */ nop .L80037590: /* 12990 80037590 8FBF0020 */ lw $ra, 0x20($sp) /* 12994 80037594 8FB1001C */ lw $s1, 0x1c($sp) diff --git a/asm/nonmatchings/code_13480_len_3f0/next_demo_scene.s b/asm/nonmatchings/code_13480_len_3f0/next_demo_scene.s index 4f6754cc2f..08e7f827fc 100644 --- a/asm/nonmatchings/code_13480_len_3f0/next_demo_scene.s +++ b/asm/nonmatchings/code_13480_len_3f0/next_demo_scene.s @@ -33,11 +33,12 @@ glabel next_demo_scene /* 1355C 8003815C 2C620005 */ sltiu $v0, $v1, 5 /* 13560 80038160 104000AC */ beqz $v0, .L80038414 /* 13564 80038164 00031080 */ sll $v0, $v1, 2 -/* 13568 80038168 3C01800A */ lui $at, %hi(D_80098460) +/* 13568 80038168 3C01800A */ lui $at, %hi(jtbl_80098460_73860) /* 1356C 8003816C 00220821 */ addu $at, $at, $v0 -/* 13570 80038170 8C228460 */ lw $v0, %lo(D_80098460)($at) +/* 13570 80038170 8C228460 */ lw $v0, %lo(jtbl_80098460_73860)($at) /* 13574 80038174 00400008 */ jr $v0 -/* 13578 80038178 00000000 */ nop +/* 13578 80038178 00000000 */ nop +glabel L8003817C_1357C /* 1357C 8003817C 0C00CDF4 */ jal intro_logos_set_fade_alpha /* 13580 80038180 240400FF */ addiu $a0, $zero, 0xff /* 13584 80038184 0C00CDF8 */ jal intro_logos_set_fade_color @@ -57,6 +58,7 @@ glabel next_demo_scene /* 135BC 800381BC 24020005 */ addiu $v0, $zero, 5 /* 135C0 800381C0 0800E105 */ j .L80038414 /* 135C4 800381C4 A0620071 */ sb $v0, 0x71($v1) +glabel L800381C8_135C8 /* 135C8 800381C8 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* 135CC 800381CC 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 135D0 800381D0 8E040000 */ lw $a0, ($s0) @@ -68,7 +70,7 @@ glabel next_demo_scene /* 135E8 800381E8 8E020000 */ lw $v0, ($s0) /* 135EC 800381EC 804200AC */ lb $v0, 0xac($v0) /* 135F0 800381F0 14400094 */ bnez $v0, .L80038444 -/* 135F4 800381F4 00000000 */ nop +/* 135F4 800381F4 00000000 */ nop .L800381F8: /* 135F8 800381F8 8E020000 */ lw $v0, ($s0) /* 135FC 800381FC A0400072 */ sb $zero, 0x72($v0) @@ -93,57 +95,58 @@ glabel next_demo_scene /* 13648 80038248 0C00AB00 */ jal general_heap_create /* 1364C 8003824C AC820000 */ sw $v0, ($a0) /* 13650 80038250 0C047624 */ jal func_8011D890 -/* 13654 80038254 00000000 */ nop +/* 13654 80038254 00000000 */ nop /* 13658 80038258 0C048C2E */ jal clear_dynamic_entity_list -/* 1365C 8003825C 00000000 */ nop +/* 1365C 8003825C 00000000 */ nop /* 13660 80038260 0C0B0C77 */ jal clear_script_list -/* 13664 80038264 00000000 */ nop +/* 13664 80038264 00000000 */ nop /* 13668 80038268 0C00B7BD */ jal create_cameras_a -/* 1366C 8003826C 00000000 */ nop +/* 1366C 8003826C 00000000 */ nop /* 13670 80038270 0C0B763E */ jal func_802DD8F8 /* 13674 80038274 0000202D */ daddu $a0, $zero, $zero /* 13678 80038278 0C0482EC */ jal clear_virtual_models -/* 1367C 8003827C 00000000 */ nop +/* 1367C 8003827C 00000000 */ nop /* 13680 80038280 0C047889 */ jal func_8011E224 -/* 13684 80038284 00000000 */ nop +/* 13684 80038284 00000000 */ nop /* 13688 80038288 0C045751 */ jal clear_model_data -/* 1368C 8003828C 00000000 */ nop +/* 1368C 8003828C 00000000 */ nop /* 13690 80038290 0C052010 */ jal func_80148040 -/* 13694 80038294 00000000 */ nop +/* 13694 80038294 00000000 */ nop /* 13698 80038298 0C05177E */ jal func_80145DF8 -/* 1369C 8003829C 00000000 */ nop +/* 1369C 8003829C 00000000 */ nop /* 136A0 800382A0 0C050440 */ jal func_80141100 -/* 136A4 800382A4 00000000 */ nop +/* 136A4 800382A4 00000000 */ nop /* 136A8 800382A8 0C0515A0 */ jal clear_trigger_data -/* 136AC 800382AC 00000000 */ nop +/* 136AC 800382AC 00000000 */ nop /* 136B0 800382B0 0C048D9D */ jal clear_printers -/* 136B4 800382B4 00000000 */ nop +/* 136B4 800382B4 00000000 */ nop /* 136B8 800382B8 0C04432E */ jal clear_entity_data /* 136BC 800382BC 0000202D */ daddu $a0, $zero, $zero /* 136C0 800382C0 0C04E042 */ jal func_80138108 -/* 136C4 800382C4 00000000 */ nop +/* 136C4 800382C4 00000000 */ nop /* 136C8 800382C8 0C037F14 */ jal clear_player_status -/* 136CC 800382CC 00000000 */ nop +/* 136CC 800382CC 00000000 */ nop /* 136D0 800382D0 0C00E12F */ jal clear_npcs -/* 136D4 800382D4 00000000 */ nop +/* 136D4 800382D4 00000000 */ nop /* 136D8 800382D8 0C039CE8 */ jal clear_player_data -/* 136DC 800382DC 00000000 */ nop +/* 136DC 800382DC 00000000 */ nop /* 136E0 800382E0 0C01CACC */ jal func_80072B30 -/* 136E4 800382E4 00000000 */ nop +/* 136E4 800382E4 00000000 */ nop /* 136E8 800382E8 0C00F8CE */ jal func_8003E338 -/* 136EC 800382EC 00000000 */ nop +/* 136EC 800382EC 00000000 */ nop /* 136F0 800382F0 0C016727 */ jal func_80059C9C -/* 136F4 800382F4 00000000 */ nop +/* 136F4 800382F4 00000000 */ nop /* 136F8 800382F8 0C04C3FC */ jal clear_item_entity_data -/* 136FC 800382FC 00000000 */ nop +/* 136FC 800382FC 00000000 */ nop /* 13700 80038300 0C0514C8 */ jal clear_saved_variables -/* 13704 80038304 00000000 */ nop +/* 13704 80038304 00000000 */ nop /* 13708 80038308 0C016BE5 */ jal initialize_collision -/* 1370C 8003830C 00000000 */ nop +/* 1370C 8003830C 00000000 */ nop /* 13710 80038310 0C00CD3C */ jal set_game_mode /* 13714 80038314 24040002 */ addiu $a0, $zero, 2 /* 13718 80038318 0800E111 */ j .L80038444 -/* 1371C 8003831C 00000000 */ nop +/* 1371C 8003831C 00000000 */ nop +glabel L80038320_13720 /* 13720 80038320 27A50018 */ addiu $a1, $sp, 0x18 /* 13724 80038324 8E240008 */ lw $a0, 8($s1) /* 13728 80038328 0C016AFE */ jal get_map_IDs_by_name @@ -163,6 +166,7 @@ glabel next_demo_scene /* 13760 80038360 A040007E */ sb $zero, 0x7e($v0) /* 13764 80038364 0800E0EE */ j .L800383B8 /* 13768 80038368 A443008E */ sh $v1, 0x8e($v0) +glabel L8003836C_1376C /* 1376C 8003836C 27A50018 */ addiu $a1, $sp, 0x18 /* 13770 80038370 8E240008 */ lw $a0, 8($s1) /* 13774 80038374 0C016AFE */ jal get_map_IDs_by_name @@ -200,11 +204,12 @@ glabel next_demo_scene /* 137F0 800383F0 24040003 */ addiu $a0, $zero, 3 .L800383F4: /* 137F4 800383F4 0C04E0A8 */ jal set_map_transition_effect -/* 137F8 800383F8 00000000 */ nop +/* 137F8 800383F8 00000000 */ nop /* 137FC 800383FC 0C00CD3C */ jal set_game_mode /* 13800 80038400 24040003 */ addiu $a0, $zero, 3 /* 13804 80038404 0800E105 */ j .L80038414 -/* 13808 80038408 00000000 */ nop +/* 13808 80038408 00000000 */ nop +glabel L8003840C_1380C /* 1380C 8003840C 0C01CB85 */ jal load_demo_battle /* 13810 80038410 96240002 */ lhu $a0, 2($s1) .L80038414: diff --git a/asm/nonmatchings/code_135EE0/func_80242BAC.s b/asm/nonmatchings/code_135EE0/func_80242BAC.s index b1a9e84ada..84d9b24c9e 100644 --- a/asm/nonmatchings/code_135EE0/func_80242BAC.s +++ b/asm/nonmatchings/code_135EE0/func_80242BAC.s @@ -20,23 +20,23 @@ glabel func_80242BAC /* 135F28 80242BE8 14400012 */ bnez $v0, .L80242C34 /* 135F2C 80242BEC 00948021 */ addu $s0, $a0, $s4 /* 135F30 80242BF0 0C00CD4A */ jal get_game_mode -/* 135F34 80242BF4 00000000 */ nop +/* 135F34 80242BF4 00000000 */ nop /* 135F38 80242BF8 00021400 */ sll $v0, $v0, 0x10 /* 135F3C 80242BFC 00021403 */ sra $v0, $v0, 0x10 /* 135F40 80242C00 2403000F */ addiu $v1, $zero, 0xf /* 135F44 80242C04 10430008 */ beq $v0, $v1, .L80242C28 -/* 135F48 80242C08 00000000 */ nop +/* 135F48 80242C08 00000000 */ nop /* 135F4C 80242C0C 0C00CD4A */ jal get_game_mode -/* 135F50 80242C10 00000000 */ nop +/* 135F50 80242C10 00000000 */ nop /* 135F54 80242C14 00021400 */ sll $v0, $v0, 0x10 /* 135F58 80242C18 00021403 */ sra $v0, $v0, 0x10 /* 135F5C 80242C1C 2403000D */ addiu $v1, $zero, 0xd /* 135F60 80242C20 1443001C */ bne $v0, $v1, .L80242C94 -/* 135F64 80242C24 00000000 */ nop +/* 135F64 80242C24 00000000 */ nop .L80242C28: /* 135F68 80242C28 8E420000 */ lw $v0, ($s2) /* 135F6C 80242C2C 10400025 */ beqz $v0, .L80242CC4 -/* 135F70 80242C30 00000000 */ nop +/* 135F70 80242C30 00000000 */ nop .L80242C34: /* 135F74 80242C34 24040016 */ addiu $a0, $zero, 0x16 /* 135F78 80242C38 2406FFFF */ addiu $a2, $zero, -1 @@ -46,7 +46,7 @@ glabel func_80242BAC .L80242C48: /* 135F88 80242C48 80620003 */ lb $v0, 3($v1) /* 135F8C 80242C4C 10460003 */ beq $v0, $a2, .L80242C5C -/* 135F90 80242C50 00000000 */ nop +/* 135F90 80242C50 00000000 */ nop /* 135F94 80242C54 54450006 */ bnel $v0, $a1, .L80242C70 /* 135F98 80242C58 24840001 */ addiu $a0, $a0, 1 .L80242C5C: @@ -62,7 +62,7 @@ glabel func_80242BAC /* 135FBC 80242C7C 2882002C */ slti $v0, $a0, 0x2c .L80242C80: /* 135FC0 80242C80 14400010 */ bnez $v0, .L80242CC4 -/* 135FC4 80242C84 00000000 */ nop +/* 135FC4 80242C84 00000000 */ nop /* 135FC8 80242C88 3C018025 */ lui $at, %hi(D_8024EFB4) /* 135FCC 80242C8C 08090B31 */ j .L80242CC4 /* 135FD0 80242C90 AC20EFB4 */ sw $zero, %lo(D_8024EFB4)($at) @@ -78,7 +78,7 @@ glabel func_80242BAC /* 135FF4 80242CB4 90420000 */ lbu $v0, ($v0) /* 135FF8 80242CB8 30420008 */ andi $v0, $v0, 8 /* 135FFC 80242CBC 14400009 */ bnez $v0, .L80242CE4 -/* 136000 80242CC0 00000000 */ nop +/* 136000 80242CC0 00000000 */ nop .L80242CC4: /* 136004 80242CC4 3C018025 */ lui $at, %hi(gPauseMenuTargetPosX) /* 136008 80242CC8 AC31EFA8 */ sw $s1, %lo(gPauseMenuTargetPosX)($at) diff --git a/asm/nonmatchings/code_135EE0/func_80242D04.s b/asm/nonmatchings/code_135EE0/func_80242D04.s index 6cf618431f..d7c2df8a0e 100644 --- a/asm/nonmatchings/code_135EE0/func_80242D04.s +++ b/asm/nonmatchings/code_135EE0/func_80242D04.s @@ -20,23 +20,23 @@ glabel func_80242D04 /* 136080 80242D40 14400012 */ bnez $v0, .L80242D8C /* 136084 80242D44 00948021 */ addu $s0, $a0, $s4 /* 136088 80242D48 0C00CD4A */ jal get_game_mode -/* 13608C 80242D4C 00000000 */ nop +/* 13608C 80242D4C 00000000 */ nop /* 136090 80242D50 00021400 */ sll $v0, $v0, 0x10 /* 136094 80242D54 00021403 */ sra $v0, $v0, 0x10 /* 136098 80242D58 2403000F */ addiu $v1, $zero, 0xf /* 13609C 80242D5C 10430008 */ beq $v0, $v1, .L80242D80 -/* 1360A0 80242D60 00000000 */ nop +/* 1360A0 80242D60 00000000 */ nop /* 1360A4 80242D64 0C00CD4A */ jal get_game_mode -/* 1360A8 80242D68 00000000 */ nop +/* 1360A8 80242D68 00000000 */ nop /* 1360AC 80242D6C 00021400 */ sll $v0, $v0, 0x10 /* 1360B0 80242D70 00021403 */ sra $v0, $v0, 0x10 /* 1360B4 80242D74 2403000D */ addiu $v1, $zero, 0xd /* 1360B8 80242D78 14430024 */ bne $v0, $v1, .L80242E0C -/* 1360BC 80242D7C 00000000 */ nop +/* 1360BC 80242D7C 00000000 */ nop .L80242D80: /* 1360C0 80242D80 8E220000 */ lw $v0, ($s1) /* 1360C4 80242D84 10400018 */ beqz $v0, .L80242DE8 -/* 1360C8 80242D88 00000000 */ nop +/* 1360C8 80242D88 00000000 */ nop .L80242D8C: /* 1360CC 80242D8C 24040016 */ addiu $a0, $zero, 0x16 /* 1360D0 80242D90 2406FFFF */ addiu $a2, $zero, -1 @@ -46,7 +46,7 @@ glabel func_80242D04 .L80242DA0: /* 1360E0 80242DA0 80620003 */ lb $v0, 3($v1) /* 1360E4 80242DA4 10460003 */ beq $v0, $a2, .L80242DB4 -/* 1360E8 80242DA8 00000000 */ nop +/* 1360E8 80242DA8 00000000 */ nop /* 1360EC 80242DAC 54450006 */ bnel $v0, $a1, .L80242DC8 /* 1360F0 80242DB0 24840001 */ addiu $a0, $a0, 1 .L80242DB4: @@ -62,7 +62,7 @@ glabel func_80242D04 /* 136114 80242DD4 2882002C */ slti $v0, $a0, 0x2c .L80242DD8: /* 136118 80242DD8 14400003 */ bnez $v0, .L80242DE8 -/* 13611C 80242DDC 00000000 */ nop +/* 13611C 80242DDC 00000000 */ nop /* 136120 80242DE0 3C018025 */ lui $at, %hi(D_8024EFB4) /* 136124 80242DE4 AC20EFB4 */ sw $zero, %lo(D_8024EFB4)($at) .L80242DE8: @@ -87,7 +87,7 @@ glabel func_80242D04 /* 13616C 80242E2C 90420000 */ lbu $v0, ($v0) /* 136170 80242E30 30420008 */ andi $v0, $v0, 8 /* 136174 80242E34 14400005 */ bnez $v0, .L80242E4C -/* 136178 80242E38 00000000 */ nop +/* 136178 80242E38 00000000 */ nop .L80242E3C: /* 13617C 80242E3C 3C018025 */ lui $at, %hi(gPauseMenuTargetPosX) /* 136180 80242E40 AC32EFA8 */ sw $s2, %lo(gPauseMenuTargetPosX)($at) diff --git a/asm/nonmatchings/code_135EE0/func_80242FF4.s b/asm/nonmatchings/code_135EE0/func_80242FF4.s index a6aaf8a6ee..f56b050171 100644 --- a/asm/nonmatchings/code_135EE0/func_80242FF4.s +++ b/asm/nonmatchings/code_135EE0/func_80242FF4.s @@ -24,7 +24,7 @@ glabel func_80242FF4 /* 13637C 8024303C 2A22000A */ slti $v0, $s1, 0xa /* 136380 80243040 92050002 */ lbu $a1, 2($s0) /* 136384 80243044 0C051F5C */ jal func_80147D70 -/* 136388 80243048 00000000 */ nop +/* 136388 80243048 00000000 */ nop /* 13638C 8024304C 2A22000A */ slti $v0, $s1, 0xa .L80243050: /* 136390 80243050 10400004 */ beqz $v0, .L80243064 diff --git a/asm/nonmatchings/code_135EE0/func_80243090.s b/asm/nonmatchings/code_135EE0/func_80243090.s index e5905e1062..8b58e922bd 100644 --- a/asm/nonmatchings/code_135EE0/func_80243090.s +++ b/asm/nonmatchings/code_135EE0/func_80243090.s @@ -11,7 +11,7 @@ glabel func_80243090 /* 1363E8 802430A8 AFBF0014 */ sw $ra, 0x14($sp) /* 1363EC 802430AC 9202001C */ lbu $v0, 0x1c($s0) /* 1363F0 802430B0 14400008 */ bnez $v0, .L802430D4 -/* 1363F4 802430B4 00000000 */ nop +/* 1363F4 802430B4 00000000 */ nop /* 1363F8 802430B8 0C051F5C */ jal func_80147D70 /* 1363FC 802430BC 92050002 */ lbu $a1, 2($s0) /* 136400 802430C0 8FA20040 */ lw $v0, 0x40($sp) diff --git a/asm/nonmatchings/code_135EE0/func_80243188.s b/asm/nonmatchings/code_135EE0/func_80243188.s index c38eaa4fa9..588014d45a 100644 --- a/asm/nonmatchings/code_135EE0/func_80243188.s +++ b/asm/nonmatchings/code_135EE0/func_80243188.s @@ -16,7 +16,7 @@ glabel func_80243188 /* 1364F4 802431B4 28620007 */ slti $v0, $v1, 7 .L802431B8: /* 1364F8 802431B8 10400010 */ beqz $v0, .L802431FC -/* 1364FC 802431BC 00000000 */ nop +/* 1364FC 802431BC 00000000 */ nop /* 136500 802431C0 3C028025 */ lui $v0, %hi(D_8024EFC4) /* 136504 802431C4 00431021 */ addu $v0, $v0, $v1 /* 136508 802431C8 9042EFC4 */ lbu $v0, %lo(D_8024EFC4)($v0) @@ -27,7 +27,7 @@ glabel func_80243188 /* 13651C 802431DC 8422EFCC */ lh $v0, %lo(D_8024EFCC)($at) /* 136520 802431E0 C4C00000 */ lwc1 $f0, ($a2) /* 136524 802431E4 44821000 */ mtc1 $v0, $f2 -/* 136528 802431E8 00000000 */ nop +/* 136528 802431E8 00000000 */ nop /* 13652C 802431EC 468010A0 */ cvt.s.w $f2, $f2 /* 136530 802431F0 46020000 */ add.s $f0, $f0, $f2 /* 136534 802431F4 03E00008 */ jr $ra @@ -40,7 +40,7 @@ glabel func_80243188 /* 13654C 8024320C 8442EFD8 */ lh $v0, %lo(D_8024EFD8)($v0) /* 136550 80243210 C4C00000 */ lwc1 $f0, ($a2) /* 136554 80243214 44821000 */ mtc1 $v0, $f2 -/* 136558 80243218 00000000 */ nop +/* 136558 80243218 00000000 */ nop /* 13655C 8024321C 468010A0 */ cvt.s.w $f2, $f2 /* 136560 80243220 46020000 */ add.s $f0, $f0, $f2 /* 136564 80243224 E4C00000 */ swc1 $f0, ($a2) diff --git a/asm/nonmatchings/code_135EE0/func_80243238.s b/asm/nonmatchings/code_135EE0/func_80243238.s index e55293605e..831001013e 100644 --- a/asm/nonmatchings/code_135EE0/func_80243238.s +++ b/asm/nonmatchings/code_135EE0/func_80243238.s @@ -16,7 +16,7 @@ glabel func_80243238 /* 1365A4 80243264 28620007 */ slti $v0, $v1, 7 .L80243268: /* 1365A8 80243268 10400010 */ beqz $v0, .L802432AC -/* 1365AC 8024326C 00000000 */ nop +/* 1365AC 8024326C 00000000 */ nop /* 1365B0 80243270 3C028025 */ lui $v0, %hi(D_8024EFC4) /* 1365B4 80243274 00431021 */ addu $v0, $v0, $v1 /* 1365B8 80243278 9042EFC4 */ lbu $v0, %lo(D_8024EFC4)($v0) @@ -27,7 +27,7 @@ glabel func_80243238 /* 1365CC 8024328C 8422EFD8 */ lh $v0, %lo(D_8024EFD8)($at) /* 1365D0 80243290 C4C00000 */ lwc1 $f0, ($a2) /* 1365D4 80243294 44821000 */ mtc1 $v0, $f2 -/* 1365D8 80243298 00000000 */ nop +/* 1365D8 80243298 00000000 */ nop /* 1365DC 8024329C 468010A0 */ cvt.s.w $f2, $f2 /* 1365E0 802432A0 46020000 */ add.s $f0, $f0, $f2 /* 1365E4 802432A4 03E00008 */ jr $ra @@ -40,7 +40,7 @@ glabel func_80243238 /* 1365FC 802432BC 8442EFE4 */ lh $v0, %lo(D_8024EFE4)($v0) /* 136600 802432C0 C4C00000 */ lwc1 $f0, ($a2) /* 136604 802432C4 44821000 */ mtc1 $v0, $f2 -/* 136608 802432C8 00000000 */ nop +/* 136608 802432C8 00000000 */ nop /* 13660C 802432CC 468010A0 */ cvt.s.w $f2, $f2 /* 136610 802432D0 46020000 */ add.s $f0, $f0, $f2 /* 136614 802432D4 E4C00000 */ swc1 $f0, ($a2) diff --git a/asm/nonmatchings/code_135EE0/func_802432E8.s b/asm/nonmatchings/code_135EE0/func_802432E8.s index 89cfb5cc53..116cb43b04 100644 --- a/asm/nonmatchings/code_135EE0/func_802432E8.s +++ b/asm/nonmatchings/code_135EE0/func_802432E8.s @@ -10,7 +10,7 @@ glabel func_802432E8 /* 13663C 802432FC 8FA6001C */ lw $a2, 0x1c($sp) /* 136640 80243300 28620005 */ slti $v0, $v1, 5 /* 136644 80243304 10400010 */ beqz $v0, .L80243348 -/* 136648 80243308 00000000 */ nop +/* 136648 80243308 00000000 */ nop /* 13664C 8024330C 3C028025 */ lui $v0, %hi(D_8024EFE4) /* 136650 80243310 00431021 */ addu $v0, $v0, $v1 /* 136654 80243314 9042EFE4 */ lbu $v0, %lo(D_8024EFE4)($v0) @@ -21,7 +21,7 @@ glabel func_802432E8 /* 136668 80243328 8422F000 */ lh $v0, %lo(D_8024F000)($at) /* 13666C 8024332C C4C00000 */ lwc1 $f0, ($a2) /* 136670 80243330 44821000 */ mtc1 $v0, $f2 -/* 136674 80243334 00000000 */ nop +/* 136674 80243334 00000000 */ nop /* 136678 80243338 468010A0 */ cvt.s.w $f2, $f2 /* 13667C 8024333C 46020000 */ add.s $f0, $f0, $f2 /* 136680 80243340 03E00008 */ jr $ra @@ -34,7 +34,7 @@ glabel func_802432E8 /* 136698 80243358 8442F008 */ lh $v0, %lo(D_8024F008)($v0) /* 13669C 8024335C C4C00000 */ lwc1 $f0, ($a2) /* 1366A0 80243360 44821000 */ mtc1 $v0, $f2 -/* 1366A4 80243364 00000000 */ nop +/* 1366A4 80243364 00000000 */ nop /* 1366A8 80243368 468010A0 */ cvt.s.w $f2, $f2 /* 1366AC 8024336C 46020000 */ add.s $f0, $f0, $f2 /* 1366B0 80243370 E4C00000 */ swc1 $f0, ($a2) diff --git a/asm/nonmatchings/code_135EE0/func_80243388.s b/asm/nonmatchings/code_135EE0/func_80243388.s index 3ec89cc2ef..3dc9414e4c 100644 --- a/asm/nonmatchings/code_135EE0/func_80243388.s +++ b/asm/nonmatchings/code_135EE0/func_80243388.s @@ -10,7 +10,7 @@ glabel func_80243388 /* 1366DC 8024339C 8FA6001C */ lw $a2, 0x1c($sp) /* 1366E0 802433A0 28620005 */ slti $v0, $v1, 5 /* 1366E4 802433A4 1040000E */ beqz $v0, .L802433E0 -/* 1366E8 802433A8 00000000 */ nop +/* 1366E8 802433A8 00000000 */ nop /* 1366EC 802433AC 3C028025 */ lui $v0, %hi(D_8024EFE4) /* 1366F0 802433B0 00431021 */ addu $v0, $v0, $v1 /* 1366F4 802433B4 9042EFE4 */ lbu $v0, %lo(D_8024EFE4)($v0) @@ -20,7 +20,7 @@ glabel func_80243388 /* 136704 802433C4 00220821 */ addu $at, $at, $v0 /* 136708 802433C8 8422F00C */ lh $v0, %lo(D_8024F00C)($at) /* 13670C 802433CC 44820000 */ mtc1 $v0, $f0 -/* 136710 802433D0 00000000 */ nop +/* 136710 802433D0 00000000 */ nop /* 136714 802433D4 46800020 */ cvt.s.w $f0, $f0 /* 136718 802433D8 03E00008 */ jr $ra /* 13671C 802433DC E4C00000 */ swc1 $f0, ($a2) @@ -31,7 +31,7 @@ glabel func_80243388 /* 13672C 802433EC 3C028025 */ lui $v0, %hi(D_8024F014) /* 136730 802433F0 8442F014 */ lh $v0, %lo(D_8024F014)($v0) /* 136734 802433F4 44820000 */ mtc1 $v0, $f0 -/* 136738 802433F8 00000000 */ nop +/* 136738 802433F8 00000000 */ nop /* 13673C 802433FC 46800020 */ cvt.s.w $f0, $f0 /* 136740 80243400 E4C00000 */ swc1 $f0, ($a2) /* 136744 80243404 90820000 */ lbu $v0, ($a0) diff --git a/asm/nonmatchings/code_135EE0/pause_cleanup.s b/asm/nonmatchings/code_135EE0/pause_cleanup.s index a8e6782cfb..55bd55bd0a 100644 --- a/asm/nonmatchings/code_135EE0/pause_cleanup.s +++ b/asm/nonmatchings/code_135EE0/pause_cleanup.s @@ -31,7 +31,7 @@ glabel pause_cleanup /* 137AA8 80244768 26100001 */ addiu $s0, $s0, 1 /* 137AAC 8024476C 2A020003 */ slti $v0, $s0, 3 /* 137AB0 80244770 1440FFFA */ bnez $v0, .L8024475C -/* 137AB4 80244774 00000000 */ nop +/* 137AB4 80244774 00000000 */ nop .L80244778: /* 137AB8 80244778 3C118025 */ lui $s1, %hi(gPauseMenuTabs) /* 137ABC 8024477C 2631EF80 */ addiu $s1, $s1, %lo(gPauseMenuTabs) @@ -43,9 +43,9 @@ glabel pause_cleanup /* 137AD0 80244790 26100001 */ addiu $s0, $s0, 1 /* 137AD4 80244794 8C820018 */ lw $v0, 0x18($a0) /* 137AD8 80244798 10400003 */ beqz $v0, .L802447A8 -/* 137ADC 8024479C 00000000 */ nop +/* 137ADC 8024479C 00000000 */ nop /* 137AE0 802447A0 0040F809 */ jalr $v0 -/* 137AE4 802447A4 00000000 */ nop +/* 137AE4 802447A4 00000000 */ nop .L802447A8: /* 137AE8 802447A8 2A020007 */ slti $v0, $s0, 7 /* 137AEC 802447AC 1440FFF5 */ bnez $v0, .L80244784 diff --git a/asm/nonmatchings/code_135EE0/pause_draw_rect.s b/asm/nonmatchings/code_135EE0/pause_draw_rect.s index c7369c62ac..6dc62c141e 100644 --- a/asm/nonmatchings/code_135EE0/pause_draw_rect.s +++ b/asm/nonmatchings/code_135EE0/pause_draw_rect.s @@ -10,9 +10,9 @@ glabel pause_draw_rect /* 137BAC 8024486C 14400075 */ bnez $v0, .L80244A44 /* 137BB0 80244870 28A2F581 */ slti $v0, $a1, -0xa7f /* 137BB4 80244874 14400073 */ bnez $v0, .L80244A44 -/* 137BB8 80244878 00000000 */ nop +/* 137BB8 80244878 00000000 */ nop /* 137BBC 8024487C 18C00071 */ blez $a2, .L80244A44 -/* 137BC0 80244880 00000000 */ nop +/* 137BC0 80244880 00000000 */ nop /* 137BC4 80244884 18E0006F */ blez $a3, .L80244A44 /* 137BC8 80244888 28820500 */ slti $v0, $a0, 0x500 /* 137BCC 8024488C 1040006D */ beqz $v0, .L80244A44 @@ -22,7 +22,7 @@ glabel pause_draw_rect /* 137BDC 8024489C 10400069 */ beqz $v0, .L80244A44 /* 137BE0 802448A0 28E20A80 */ slti $v0, $a3, 0xa80 /* 137BE4 802448A4 10400067 */ beqz $v0, .L80244A44 -/* 137BE8 802448A8 00000000 */ nop +/* 137BE8 802448A8 00000000 */ nop /* 137BEC 802448AC 3C02800A */ lui $v0, %hi(gMasterGfxPos) /* 137BF0 802448B0 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 137BF4 802448B4 8C480000 */ lw $t0, ($v0) @@ -141,4 +141,4 @@ glabel pause_draw_rect /* 137D80 80244A40 AC820004 */ sw $v0, 4($a0) .L80244A44: /* 137D84 80244A44 03E00008 */ jr $ra -/* 137D88 80244A48 00000000 */ nop +/* 137D88 80244A48 00000000 */ nop diff --git a/asm/nonmatchings/code_135EE0/pause_handle_input.s b/asm/nonmatchings/code_135EE0/pause_handle_input.s index 5b6115032c..7f03b0f0a1 100644 --- a/asm/nonmatchings/code_135EE0/pause_handle_input.s +++ b/asm/nonmatchings/code_135EE0/pause_handle_input.s @@ -41,7 +41,7 @@ glabel pause_handle_input /* 1377F0 802444B0 26100001 */ addiu $s0, $s0, 1 /* 1377F4 802444B4 2A020003 */ slti $v0, $s0, 3 /* 1377F8 802444B8 1440FFF7 */ bnez $v0, .L80244498 -/* 1377FC 802444BC 00000000 */ nop +/* 1377FC 802444BC 00000000 */ nop .L802444C0: /* 137800 802444C0 0000202D */ daddu $a0, $zero, $zero /* 137804 802444C4 3C05F840 */ lui $a1, 0xf840 @@ -61,22 +61,22 @@ glabel pause_handle_input /* 137838 802444F8 8E040000 */ lw $a0, ($s0) /* 13783C 802444FC 30821000 */ andi $v0, $a0, 0x1000 /* 137840 80244500 14400007 */ bnez $v0, .L80244520 -/* 137844 80244504 00000000 */ nop +/* 137844 80244504 00000000 */ nop /* 137848 80244508 3C028027 */ lui $v0, %hi(gPauseMenuCurrentTab) /* 13784C 8024450C 804200D4 */ lb $v0, %lo(gPauseMenuCurrentTab)($v0) /* 137850 80244510 1440000B */ bnez $v0, .L80244540 /* 137854 80244514 30824000 */ andi $v0, $a0, 0x4000 /* 137858 80244518 10400009 */ beqz $v0, .L80244540 -/* 13785C 8024451C 00000000 */ nop +/* 13785C 8024451C 00000000 */ nop .L80244520: /* 137860 80244520 0C039E1B */ jal enforce_hpfp_limits -/* 137864 80244524 00000000 */ nop +/* 137864 80244524 00000000 */ nop /* 137868 80244528 0C05272D */ jal play_sound /* 13786C 8024452C 240400C6 */ addiu $a0, $zero, 0xc6 /* 137870 80244530 0C00CD3C */ jal set_game_mode /* 137874 80244534 2404000B */ addiu $a0, $zero, 0xb /* 137878 80244538 080911B8 */ j .L802446E0 -/* 13787C 8024453C 00000000 */ nop +/* 13787C 8024453C 00000000 */ nop .L80244540: /* 137880 80244540 3C048027 */ lui $a0, %hi(D_80270118) /* 137884 80244544 24840118 */ addiu $a0, $a0, %lo(D_80270118) @@ -90,7 +90,7 @@ glabel pause_handle_input /* 1378A0 80244560 24630108 */ addiu $v1, $v1, %lo(D_80270108) /* 1378A4 80244564 8C620000 */ lw $v0, ($v1) /* 1378A8 80244568 12620020 */ beq $s3, $v0, .L802445EC -/* 1378AC 8024456C 00000000 */ nop +/* 1378AC 8024456C 00000000 */ nop /* 1378B0 80244570 AC730000 */ sw $s3, ($v1) /* 1378B4 80244574 3C018027 */ lui $at, %hi(D_80270110) /* 1378B8 80244578 AC200110 */ sw $zero, %lo(D_80270110)($at) @@ -129,7 +129,7 @@ glabel pause_handle_input /* 137930 802445F0 8C4200C0 */ lw $v0, %lo(gPauseMenuHeldButtons)($v0) /* 137934 802445F4 30420008 */ andi $v0, $v0, 8 /* 137938 802445F8 10400008 */ beqz $v0, .L8024461C -/* 13793C 802445FC 00000000 */ nop +/* 13793C 802445FC 00000000 */ nop /* 137940 80244600 3C038027 */ lui $v1, %hi(D_80270110) /* 137944 80244604 24630110 */ addiu $v1, $v1, %lo(D_80270110) /* 137948 80244608 8C620000 */ lw $v0, ($v1) @@ -142,7 +142,7 @@ glabel pause_handle_input /* 137960 80244620 8C4200C0 */ lw $v0, %lo(gPauseMenuHeldButtons)($v0) /* 137964 80244624 30420004 */ andi $v0, $v0, 4 /* 137968 80244628 1040000B */ beqz $v0, .L80244658 -/* 13796C 8024462C 00000000 */ nop +/* 13796C 8024462C 00000000 */ nop /* 137970 80244630 3C038027 */ lui $v1, %hi(D_80270110) /* 137974 80244634 24630110 */ addiu $v1, $v1, %lo(D_80270110) /* 137978 80244638 8C620000 */ lw $v0, ($v1) @@ -167,10 +167,10 @@ glabel pause_handle_input /* 1379C0 80244680 AE030000 */ sw $v1, ($s0) /* 1379C4 80244684 92820000 */ lbu $v0, ($s4) /* 1379C8 80244688 10400006 */ beqz $v0, .L802446A4 -/* 1379CC 8024468C 00000000 */ nop +/* 1379CC 8024468C 00000000 */ nop /* 1379D0 80244690 8E820010 */ lw $v0, 0x10($s4) /* 1379D4 80244694 10400003 */ beqz $v0, .L802446A4 -/* 1379D8 80244698 00000000 */ nop +/* 1379D8 80244698 00000000 */ nop /* 1379DC 8024469C 0040F809 */ jalr $v0 /* 1379E0 802446A0 0280202D */ daddu $a0, $s4, $zero .L802446A4: @@ -184,9 +184,9 @@ glabel pause_handle_input /* 1379FC 802446BC 26100001 */ addiu $s0, $s0, 1 /* 137A00 802446C0 8C820014 */ lw $v0, 0x14($a0) /* 137A04 802446C4 10400003 */ beqz $v0, .L802446D4 -/* 137A08 802446C8 00000000 */ nop +/* 137A08 802446C8 00000000 */ nop /* 137A0C 802446CC 0040F809 */ jalr $v0 -/* 137A10 802446D0 00000000 */ nop +/* 137A10 802446D0 00000000 */ nop .L802446D4: /* 137A14 802446D4 2A020007 */ slti $v0, $s0, 7 /* 137A18 802446D8 1440FFF5 */ bnez $v0, .L802446B0 diff --git a/asm/nonmatchings/code_135EE0/pause_init.s b/asm/nonmatchings/code_135EE0/pause_init.s index 33cba95c9e..b8c6a4c1b1 100644 --- a/asm/nonmatchings/code_135EE0/pause_init.s +++ b/asm/nonmatchings/code_135EE0/pause_init.s @@ -74,7 +74,7 @@ glabel pause_init /* 1374A8 80244168 10400003 */ beqz $v0, .L80244178 /* 1374AC 8024416C 26310001 */ addiu $s1, $s1, 1 /* 1374B0 80244170 0040F809 */ jalr $v0 -/* 1374B4 80244174 00000000 */ nop +/* 1374B4 80244174 00000000 */ nop .L80244178: /* 1374B8 80244178 2A220007 */ slti $v0, $s1, 7 /* 1374BC 8024417C 1440FFF8 */ bnez $v0, .L80244160 diff --git a/asm/nonmatchings/code_135EE0/pause_interp_text_scroll.s b/asm/nonmatchings/code_135EE0/pause_interp_text_scroll.s index af9dda7eb9..ee13fca4e6 100644 --- a/asm/nonmatchings/code_135EE0/pause_interp_text_scroll.s +++ b/asm/nonmatchings/code_135EE0/pause_interp_text_scroll.s @@ -10,7 +10,7 @@ glabel pause_interp_text_scroll .L8024342C: /* 13676C 8024342C AFBF0014 */ sw $ra, 0x14($sp) /* 136770 80243430 0C00A52C */ jal sign -/* 136774 80243434 00000000 */ nop +/* 136774 80243434 00000000 */ nop /* 136778 80243438 0040182D */ daddu $v1, $v0, $zero /* 13677C 8024343C 2A020010 */ slti $v0, $s0, 0x10 /* 136780 80243440 10400004 */ beqz $v0, .L80243454 diff --git a/asm/nonmatchings/code_135EE0/pause_sort_item_list.s b/asm/nonmatchings/code_135EE0/pause_sort_item_list.s index 95ae239e90..e24c7ad0e0 100644 --- a/asm/nonmatchings/code_135EE0/pause_sort_item_list.s +++ b/asm/nonmatchings/code_135EE0/pause_sort_item_list.s @@ -22,7 +22,7 @@ glabel pause_sort_item_list /* 137DD0 80244A90 02E0F809 */ jalr $s7 /* 137DD4 80244A94 02C22821 */ addu $a1, $s6, $v0 /* 137DD8 80244A98 18400031 */ blez $v0, .L80244B60 -/* 137DDC 80244A9C 00000000 */ nop +/* 137DDC 80244A9C 00000000 */ nop /* 137DE0 80244AA0 96C20002 */ lhu $v0, 2($s6) /* 137DE4 80244AA4 96C30000 */ lhu $v1, ($s6) /* 137DE8 80244AA8 A6C20000 */ sh $v0, ($s6) @@ -93,4 +93,4 @@ glabel pause_sort_item_list /* 137EC0 80244B80 8FB00010 */ lw $s0, 0x10($sp) /* 137EC4 80244B84 03E00008 */ jr $ra /* 137EC8 80244B88 27BD0038 */ addiu $sp, $sp, 0x38 -/* 137ECC 80244B8C 00000000 */ nop +/* 137ECC 80244B8C 00000000 */ nop diff --git a/asm/nonmatchings/code_135EE0/pause_tabs_draw_badges.s b/asm/nonmatchings/code_135EE0/pause_tabs_draw_badges.s index 7086125ae5..898ace6779 100644 --- a/asm/nonmatchings/code_135EE0/pause_tabs_draw_badges.s +++ b/asm/nonmatchings/code_135EE0/pause_tabs_draw_badges.s @@ -23,10 +23,10 @@ glabel pause_tabs_draw_badges /* 138048 80244D08 44811800 */ mtc1 $at, $f3 /* 13804C 80244D0C 44801000 */ mtc1 $zero, $f2 /* 138050 80244D10 44910000 */ mtc1 $s1, $f0 -/* 138054 80244D14 00000000 */ nop +/* 138054 80244D14 00000000 */ nop /* 138058 80244D18 46800021 */ cvt.d.w $f0, $f0 /* 13805C 80244D1C 46220002 */ mul.d $f0, $f0, $f2 -/* 138060 80244D20 00000000 */ nop +/* 138060 80244D20 00000000 */ nop /* 138064 80244D24 3C018027 */ lui $at, %hi(D_8026FF88) /* 138068 80244D28 D422FF88 */ ldc1 $f2, %lo(D_8026FF88)($at) /* 13806C 80244D2C 46201081 */ sub.d $f2, $f2, $f0 @@ -34,7 +34,7 @@ glabel pause_tabs_draw_badges /* 138074 80244D34 4620110D */ trunc.w.d $f4, $f2 /* 138078 80244D38 44052000 */ mfc1 $a1, $f4 /* 13807C 80244D3C 08091358 */ j .L80244D60 -/* 138080 80244D40 00000000 */ nop +/* 138080 80244D40 00000000 */ nop .L80244D44: /* 138084 80244D44 3C108027 */ lui $s0, %hi(gPauseMenuTabIconIDs) /* 138088 80244D48 26100130 */ addiu $s0, $s0, %lo(gPauseMenuTabIconIDs) @@ -45,7 +45,7 @@ glabel pause_tabs_draw_badges /* 13809C 80244D5C 240500FF */ addiu $a1, $zero, 0xff .L80244D60: /* 1380A0 80244D60 0C0513AC */ jal icon_set_opacity -/* 1380A4 80244D64 00000000 */ nop +/* 1380A4 80244D64 00000000 */ nop /* 1380A8 80244D68 26450016 */ addiu $a1, $s2, 0x16 /* 1380AC 80244D6C 3C108027 */ lui $s0, %hi(gPauseMenuTabIconIDs) /* 1380B0 80244D70 26100130 */ addiu $s0, $s0, %lo(gPauseMenuTabIconIDs) @@ -54,11 +54,11 @@ glabel pause_tabs_draw_badges /* 1380BC 80244D7C 26660007 */ addiu $a2, $s3, 7 /* 1380C0 80244D80 8E040004 */ lw $a0, 4($s0) /* 1380C4 80244D84 0C0511F8 */ jal draw_icon_2 -/* 1380C8 80244D88 00000000 */ nop +/* 1380C8 80244D88 00000000 */ nop /* 1380CC 80244D8C 3C028027 */ lui $v0, %hi(gPauseMenuCurrentTab) /* 1380D0 80244D90 804200D4 */ lb $v0, %lo(gPauseMenuCurrentTab)($v0) /* 1380D4 80244D94 1440000C */ bnez $v0, .L80244DC8 -/* 1380D8 80244D98 00000000 */ nop +/* 1380D8 80244D98 00000000 */ nop /* 1380DC 80244D9C 82830001 */ lb $v1, 1($s4) /* 1380E0 80244DA0 3C028025 */ lui $v0, %hi(D_8024F1D8) /* 1380E4 80244DA4 2442F1D8 */ addiu $v0, $v0, %lo(D_8024F1D8) diff --git a/asm/nonmatchings/code_135EE0/pause_tabs_draw_items.s b/asm/nonmatchings/code_135EE0/pause_tabs_draw_items.s index f38eb55d6f..3ae83b8b35 100644 --- a/asm/nonmatchings/code_135EE0/pause_tabs_draw_items.s +++ b/asm/nonmatchings/code_135EE0/pause_tabs_draw_items.s @@ -23,10 +23,10 @@ glabel pause_tabs_draw_items /* 138170 80244E30 44811800 */ mtc1 $at, $f3 /* 138174 80244E34 44801000 */ mtc1 $zero, $f2 /* 138178 80244E38 44910000 */ mtc1 $s1, $f0 -/* 13817C 80244E3C 00000000 */ nop +/* 13817C 80244E3C 00000000 */ nop /* 138180 80244E40 46800021 */ cvt.d.w $f0, $f0 /* 138184 80244E44 46220002 */ mul.d $f0, $f0, $f2 -/* 138188 80244E48 00000000 */ nop +/* 138188 80244E48 00000000 */ nop /* 13818C 80244E4C 3C018027 */ lui $at, %hi(D_8026FF90) /* 138190 80244E50 D422FF90 */ ldc1 $f2, %lo(D_8026FF90)($at) /* 138194 80244E54 46201081 */ sub.d $f2, $f2, $f0 @@ -34,7 +34,7 @@ glabel pause_tabs_draw_items /* 13819C 80244E5C 4620110D */ trunc.w.d $f4, $f2 /* 1381A0 80244E60 44052000 */ mfc1 $a1, $f4 /* 1381A4 80244E64 080913A2 */ j .L80244E88 -/* 1381A8 80244E68 00000000 */ nop +/* 1381A8 80244E68 00000000 */ nop .L80244E6C: /* 1381AC 80244E6C 3C108027 */ lui $s0, %hi(gPauseMenuTabIconIDs) /* 1381B0 80244E70 26100130 */ addiu $s0, $s0, %lo(gPauseMenuTabIconIDs) @@ -45,7 +45,7 @@ glabel pause_tabs_draw_items /* 1381C4 80244E84 240500FF */ addiu $a1, $zero, 0xff .L80244E88: /* 1381C8 80244E88 0C0513AC */ jal icon_set_opacity -/* 1381CC 80244E8C 00000000 */ nop +/* 1381CC 80244E8C 00000000 */ nop /* 1381D0 80244E90 26450016 */ addiu $a1, $s2, 0x16 /* 1381D4 80244E94 3C108027 */ lui $s0, %hi(gPauseMenuTabIconIDs) /* 1381D8 80244E98 26100130 */ addiu $s0, $s0, %lo(gPauseMenuTabIconIDs) @@ -54,11 +54,11 @@ glabel pause_tabs_draw_items /* 1381E4 80244EA4 26660007 */ addiu $a2, $s3, 7 /* 1381E8 80244EA8 8E040008 */ lw $a0, 8($s0) /* 1381EC 80244EAC 0C0511F8 */ jal draw_icon_2 -/* 1381F0 80244EB0 00000000 */ nop +/* 1381F0 80244EB0 00000000 */ nop /* 1381F4 80244EB4 3C028027 */ lui $v0, %hi(gPauseMenuCurrentTab) /* 1381F8 80244EB8 804200D4 */ lb $v0, %lo(gPauseMenuCurrentTab)($v0) /* 1381FC 80244EBC 1440000C */ bnez $v0, .L80244EF0 -/* 138200 80244EC0 00000000 */ nop +/* 138200 80244EC0 00000000 */ nop /* 138204 80244EC4 82830001 */ lb $v1, 1($s4) /* 138208 80244EC8 3C028025 */ lui $v0, %hi(D_8024F1D8) /* 13820C 80244ECC 2442F1D8 */ addiu $v0, $v0, %lo(D_8024F1D8) diff --git a/asm/nonmatchings/code_135EE0/pause_tabs_draw_map.s b/asm/nonmatchings/code_135EE0/pause_tabs_draw_map.s index 9ff5a9429b..acb824128b 100644 --- a/asm/nonmatchings/code_135EE0/pause_tabs_draw_map.s +++ b/asm/nonmatchings/code_135EE0/pause_tabs_draw_map.s @@ -23,10 +23,10 @@ glabel pause_tabs_draw_map /* 1384E8 802451A8 44811800 */ mtc1 $at, $f3 /* 1384EC 802451AC 44801000 */ mtc1 $zero, $f2 /* 1384F0 802451B0 44910000 */ mtc1 $s1, $f0 -/* 1384F4 802451B4 00000000 */ nop +/* 1384F4 802451B4 00000000 */ nop /* 1384F8 802451B8 46800021 */ cvt.d.w $f0, $f0 /* 1384FC 802451BC 46220002 */ mul.d $f0, $f0, $f2 -/* 138500 802451C0 00000000 */ nop +/* 138500 802451C0 00000000 */ nop /* 138504 802451C4 3C018027 */ lui $at, %hi(D_8026FFA8) /* 138508 802451C8 D422FFA8 */ ldc1 $f2, %lo(D_8026FFA8)($at) /* 13850C 802451CC 46201081 */ sub.d $f2, $f2, $f0 @@ -34,7 +34,7 @@ glabel pause_tabs_draw_map /* 138514 802451D4 4620110D */ trunc.w.d $f4, $f2 /* 138518 802451D8 44052000 */ mfc1 $a1, $f4 /* 13851C 802451DC 08091480 */ j .L80245200 -/* 138520 802451E0 00000000 */ nop +/* 138520 802451E0 00000000 */ nop .L802451E4: /* 138524 802451E4 3C108027 */ lui $s0, %hi(gPauseMenuTabIconIDs) /* 138528 802451E8 26100130 */ addiu $s0, $s0, %lo(gPauseMenuTabIconIDs) @@ -45,7 +45,7 @@ glabel pause_tabs_draw_map /* 13853C 802451FC 240500FF */ addiu $a1, $zero, 0xff .L80245200: /* 138540 80245200 0C0513AC */ jal icon_set_opacity -/* 138544 80245204 00000000 */ nop +/* 138544 80245204 00000000 */ nop /* 138548 80245208 26450017 */ addiu $a1, $s2, 0x17 /* 13854C 8024520C 3C108027 */ lui $s0, %hi(gPauseMenuTabIconIDs) /* 138550 80245210 26100130 */ addiu $s0, $s0, %lo(gPauseMenuTabIconIDs) @@ -54,11 +54,11 @@ glabel pause_tabs_draw_map /* 13855C 8024521C 26660007 */ addiu $a2, $s3, 7 /* 138560 80245220 8E040014 */ lw $a0, 0x14($s0) /* 138564 80245224 0C0511F8 */ jal draw_icon_2 -/* 138568 80245228 00000000 */ nop +/* 138568 80245228 00000000 */ nop /* 13856C 8024522C 3C028027 */ lui $v0, %hi(gPauseMenuCurrentTab) /* 138570 80245230 804200D4 */ lb $v0, %lo(gPauseMenuCurrentTab)($v0) /* 138574 80245234 1440000C */ bnez $v0, .L80245268 -/* 138578 80245238 00000000 */ nop +/* 138578 80245238 00000000 */ nop /* 13857C 8024523C 82830001 */ lb $v1, 1($s4) /* 138580 80245240 3C028025 */ lui $v0, %hi(D_8024F1D8) /* 138584 80245244 2442F1D8 */ addiu $v0, $v0, %lo(D_8024F1D8) diff --git a/asm/nonmatchings/code_135EE0/pause_tabs_draw_party.s b/asm/nonmatchings/code_135EE0/pause_tabs_draw_party.s index 9316224823..50960d12d3 100644 --- a/asm/nonmatchings/code_135EE0/pause_tabs_draw_party.s +++ b/asm/nonmatchings/code_135EE0/pause_tabs_draw_party.s @@ -23,10 +23,10 @@ glabel pause_tabs_draw_party /* 138298 80244F58 44811800 */ mtc1 $at, $f3 /* 13829C 80244F5C 44801000 */ mtc1 $zero, $f2 /* 1382A0 80244F60 44910000 */ mtc1 $s1, $f0 -/* 1382A4 80244F64 00000000 */ nop +/* 1382A4 80244F64 00000000 */ nop /* 1382A8 80244F68 46800021 */ cvt.d.w $f0, $f0 /* 1382AC 80244F6C 46220002 */ mul.d $f0, $f0, $f2 -/* 1382B0 80244F70 00000000 */ nop +/* 1382B0 80244F70 00000000 */ nop /* 1382B4 80244F74 3C018027 */ lui $at, %hi(D_8026FF98) /* 1382B8 80244F78 D422FF98 */ ldc1 $f2, %lo(D_8026FF98)($at) /* 1382BC 80244F7C 46201081 */ sub.d $f2, $f2, $f0 @@ -34,7 +34,7 @@ glabel pause_tabs_draw_party /* 1382C4 80244F84 4620110D */ trunc.w.d $f4, $f2 /* 1382C8 80244F88 44052000 */ mfc1 $a1, $f4 /* 1382CC 80244F8C 080913EC */ j .L80244FB0 -/* 1382D0 80244F90 00000000 */ nop +/* 1382D0 80244F90 00000000 */ nop .L80244F94: /* 1382D4 80244F94 3C108027 */ lui $s0, %hi(gPauseMenuTabIconIDs) /* 1382D8 80244F98 26100130 */ addiu $s0, $s0, %lo(gPauseMenuTabIconIDs) @@ -45,7 +45,7 @@ glabel pause_tabs_draw_party /* 1382EC 80244FAC 240500FF */ addiu $a1, $zero, 0xff .L80244FB0: /* 1382F0 80244FB0 0C0513AC */ jal icon_set_opacity -/* 1382F4 80244FB4 00000000 */ nop +/* 1382F4 80244FB4 00000000 */ nop /* 1382F8 80244FB8 26450016 */ addiu $a1, $s2, 0x16 /* 1382FC 80244FBC 3C108027 */ lui $s0, %hi(gPauseMenuTabIconIDs) /* 138300 80244FC0 26100130 */ addiu $s0, $s0, %lo(gPauseMenuTabIconIDs) @@ -54,11 +54,11 @@ glabel pause_tabs_draw_party /* 13830C 80244FCC 26660007 */ addiu $a2, $s3, 7 /* 138310 80244FD0 8E04000C */ lw $a0, 0xc($s0) /* 138314 80244FD4 0C0511F8 */ jal draw_icon_2 -/* 138318 80244FD8 00000000 */ nop +/* 138318 80244FD8 00000000 */ nop /* 13831C 80244FDC 3C028027 */ lui $v0, %hi(gPauseMenuCurrentTab) /* 138320 80244FE0 804200D4 */ lb $v0, %lo(gPauseMenuCurrentTab)($v0) /* 138324 80244FE4 1440000C */ bnez $v0, .L80245018 -/* 138328 80244FE8 00000000 */ nop +/* 138328 80244FE8 00000000 */ nop /* 13832C 80244FEC 82830001 */ lb $v1, 1($s4) /* 138330 80244FF0 3C028025 */ lui $v0, %hi(D_8024F1D8) /* 138334 80244FF4 2442F1D8 */ addiu $v0, $v0, %lo(D_8024F1D8) diff --git a/asm/nonmatchings/code_135EE0/pause_tabs_draw_spirits.s b/asm/nonmatchings/code_135EE0/pause_tabs_draw_spirits.s index 67f44ba176..c427d93a65 100644 --- a/asm/nonmatchings/code_135EE0/pause_tabs_draw_spirits.s +++ b/asm/nonmatchings/code_135EE0/pause_tabs_draw_spirits.s @@ -23,10 +23,10 @@ glabel pause_tabs_draw_spirits /* 1383C0 80245080 44811800 */ mtc1 $at, $f3 /* 1383C4 80245084 44801000 */ mtc1 $zero, $f2 /* 1383C8 80245088 44910000 */ mtc1 $s1, $f0 -/* 1383CC 8024508C 00000000 */ nop +/* 1383CC 8024508C 00000000 */ nop /* 1383D0 80245090 46800021 */ cvt.d.w $f0, $f0 /* 1383D4 80245094 46220002 */ mul.d $f0, $f0, $f2 -/* 1383D8 80245098 00000000 */ nop +/* 1383D8 80245098 00000000 */ nop /* 1383DC 8024509C 3C018027 */ lui $at, %hi(D_8026FFA0) /* 1383E0 802450A0 D422FFA0 */ ldc1 $f2, %lo(D_8026FFA0)($at) /* 1383E4 802450A4 46201081 */ sub.d $f2, $f2, $f0 @@ -34,7 +34,7 @@ glabel pause_tabs_draw_spirits /* 1383EC 802450AC 4620110D */ trunc.w.d $f4, $f2 /* 1383F0 802450B0 44052000 */ mfc1 $a1, $f4 /* 1383F4 802450B4 08091436 */ j .L802450D8 -/* 1383F8 802450B8 00000000 */ nop +/* 1383F8 802450B8 00000000 */ nop .L802450BC: /* 1383FC 802450BC 3C108027 */ lui $s0, %hi(gPauseMenuTabIconIDs) /* 138400 802450C0 26100130 */ addiu $s0, $s0, %lo(gPauseMenuTabIconIDs) @@ -45,7 +45,7 @@ glabel pause_tabs_draw_spirits /* 138414 802450D4 240500FF */ addiu $a1, $zero, 0xff .L802450D8: /* 138418 802450D8 0C0513AC */ jal icon_set_opacity -/* 13841C 802450DC 00000000 */ nop +/* 13841C 802450DC 00000000 */ nop /* 138420 802450E0 26450016 */ addiu $a1, $s2, 0x16 /* 138424 802450E4 3C108027 */ lui $s0, %hi(gPauseMenuTabIconIDs) /* 138428 802450E8 26100130 */ addiu $s0, $s0, %lo(gPauseMenuTabIconIDs) @@ -54,11 +54,11 @@ glabel pause_tabs_draw_spirits /* 138434 802450F4 26660007 */ addiu $a2, $s3, 7 /* 138438 802450F8 8E040010 */ lw $a0, 0x10($s0) /* 13843C 802450FC 0C0511F8 */ jal draw_icon_2 -/* 138440 80245100 00000000 */ nop +/* 138440 80245100 00000000 */ nop /* 138444 80245104 3C028027 */ lui $v0, %hi(gPauseMenuCurrentTab) /* 138448 80245108 804200D4 */ lb $v0, %lo(gPauseMenuCurrentTab)($v0) /* 13844C 8024510C 1440000C */ bnez $v0, .L80245140 -/* 138450 80245110 00000000 */ nop +/* 138450 80245110 00000000 */ nop /* 138454 80245114 82830001 */ lb $v1, 1($s4) /* 138458 80245118 3C028025 */ lui $v0, %hi(D_8024F1D8) /* 13845C 8024511C 2442F1D8 */ addiu $v0, $v0, %lo(D_8024F1D8) diff --git a/asm/nonmatchings/code_135EE0/pause_tabs_draw_stats.s b/asm/nonmatchings/code_135EE0/pause_tabs_draw_stats.s index a1ff626ffa..edc2fea4a1 100644 --- a/asm/nonmatchings/code_135EE0/pause_tabs_draw_stats.s +++ b/asm/nonmatchings/code_135EE0/pause_tabs_draw_stats.s @@ -23,10 +23,10 @@ glabel pause_tabs_draw_stats /* 137F20 80244BE0 44811800 */ mtc1 $at, $f3 /* 137F24 80244BE4 44801000 */ mtc1 $zero, $f2 /* 137F28 80244BE8 44910000 */ mtc1 $s1, $f0 -/* 137F2C 80244BEC 00000000 */ nop +/* 137F2C 80244BEC 00000000 */ nop /* 137F30 80244BF0 46800021 */ cvt.d.w $f0, $f0 /* 137F34 80244BF4 46220002 */ mul.d $f0, $f0, $f2 -/* 137F38 80244BF8 00000000 */ nop +/* 137F38 80244BF8 00000000 */ nop /* 137F3C 80244BFC 3C018027 */ lui $at, %hi(D_8026FF80) /* 137F40 80244C00 D422FF80 */ ldc1 $f2, %lo(D_8026FF80)($at) /* 137F44 80244C04 46201081 */ sub.d $f2, $f2, $f0 @@ -34,7 +34,7 @@ glabel pause_tabs_draw_stats /* 137F4C 80244C0C 4620110D */ trunc.w.d $f4, $f2 /* 137F50 80244C10 44052000 */ mfc1 $a1, $f4 /* 137F54 80244C14 0809130E */ j .L80244C38 -/* 137F58 80244C18 00000000 */ nop +/* 137F58 80244C18 00000000 */ nop .L80244C1C: /* 137F5C 80244C1C 3C108027 */ lui $s0, %hi(gPauseMenuTabIconIDs) /* 137F60 80244C20 26100130 */ addiu $s0, $s0, %lo(gPauseMenuTabIconIDs) @@ -45,7 +45,7 @@ glabel pause_tabs_draw_stats /* 137F74 80244C34 240500FF */ addiu $a1, $zero, 0xff .L80244C38: /* 137F78 80244C38 0C0513AC */ jal icon_set_opacity -/* 137F7C 80244C3C 00000000 */ nop +/* 137F7C 80244C3C 00000000 */ nop /* 137F80 80244C40 26450016 */ addiu $a1, $s2, 0x16 /* 137F84 80244C44 3C108027 */ lui $s0, %hi(gPauseMenuTabIconIDs) /* 137F88 80244C48 26100130 */ addiu $s0, $s0, %lo(gPauseMenuTabIconIDs) @@ -54,11 +54,11 @@ glabel pause_tabs_draw_stats /* 137F94 80244C54 26660007 */ addiu $a2, $s3, 7 /* 137F98 80244C58 8E040000 */ lw $a0, ($s0) /* 137F9C 80244C5C 0C0511F8 */ jal draw_icon_2 -/* 137FA0 80244C60 00000000 */ nop +/* 137FA0 80244C60 00000000 */ nop /* 137FA4 80244C64 3C028027 */ lui $v0, %hi(gPauseMenuCurrentTab) /* 137FA8 80244C68 804200D4 */ lb $v0, %lo(gPauseMenuCurrentTab)($v0) /* 137FAC 80244C6C 1440000C */ bnez $v0, .L80244CA0 -/* 137FB0 80244C70 00000000 */ nop +/* 137FB0 80244C70 00000000 */ nop /* 137FB4 80244C74 82830001 */ lb $v1, 1($s4) /* 137FB8 80244C78 3C028025 */ lui $v0, %hi(D_8024F1D8) /* 137FBC 80244C7C 2442F1D8 */ addiu $v0, $v0, %lo(D_8024F1D8) diff --git a/asm/nonmatchings/code_135EE0/pause_tabs_handle_input.s b/asm/nonmatchings/code_135EE0/pause_tabs_handle_input.s index 0614b30d66..d59af70319 100644 --- a/asm/nonmatchings/code_135EE0/pause_tabs_handle_input.s +++ b/asm/nonmatchings/code_135EE0/pause_tabs_handle_input.s @@ -26,7 +26,7 @@ glabel pause_tabs_handle_input /* 1386E4 802453A4 A2020001 */ sb $v0, 1($s0) /* 1386E8 802453A8 00021600 */ sll $v0, $v0, 0x18 /* 1386EC 802453AC 04410007 */ bgez $v0, .L802453CC -/* 1386F0 802453B0 00000000 */ nop +/* 1386F0 802453B0 00000000 */ nop /* 1386F4 802453B4 A2070001 */ sb $a3, 1($s0) /* 1386F8 802453B8 8C830000 */ lw $v1, ($a0) /* 1386FC 802453BC 28620708 */ slti $v0, $v1, 0x708 @@ -42,7 +42,7 @@ glabel pause_tabs_handle_input /* 138720 802453E0 8C420000 */ lw $v0, ($v0) /* 138724 802453E4 90420000 */ lbu $v0, ($v0) /* 138728 802453E8 1040FFEC */ beqz $v0, .L8024539C -/* 13872C 802453EC 00000000 */ nop +/* 13872C 802453EC 00000000 */ nop .L802453F0: /* 138730 802453F0 3C030008 */ lui $v1, 8 /* 138734 802453F4 3C028027 */ lui $v0, %hi(gPauseMenuHeldButtons) @@ -50,7 +50,7 @@ glabel pause_tabs_handle_input /* 13873C 802453FC 34630010 */ ori $v1, $v1, 0x10 /* 138740 80245400 00431024 */ and $v0, $v0, $v1 /* 138744 80245404 1040001D */ beqz $v0, .L8024547C -/* 138748 80245408 00000000 */ nop +/* 138748 80245408 00000000 */ nop /* 13874C 8024540C 3C038027 */ lui $v1, %hi(D_8027014C) /* 138750 80245410 2463014C */ addiu $v1, $v1, %lo(D_8027014C) /* 138754 80245414 3C058025 */ lui $a1, %hi(gPauseMenuTabs) @@ -65,7 +65,7 @@ glabel pause_tabs_handle_input /* 138774 80245434 00021603 */ sra $v0, $v0, 0x18 /* 138778 80245438 28420006 */ slti $v0, $v0, 6 /* 13877C 8024543C 14400006 */ bnez $v0, .L80245458 -/* 138780 80245440 00000000 */ nop +/* 138780 80245440 00000000 */ nop /* 138784 80245444 A2000001 */ sb $zero, 1($s0) /* 138788 80245448 8C620000 */ lw $v0, ($v1) /* 13878C 8024544C 18400002 */ blez $v0, .L80245458 @@ -80,14 +80,14 @@ glabel pause_tabs_handle_input /* 1387AC 8024546C 8C420000 */ lw $v0, ($v0) /* 1387B0 80245470 90420000 */ lbu $v0, ($v0) /* 1387B4 80245474 1040FFEB */ beqz $v0, .L80245424 -/* 1387B8 80245478 00000000 */ nop +/* 1387B8 80245478 00000000 */ nop .L8024547C: /* 1387BC 8024547C 3C118025 */ lui $s1, %hi(D_8024F2E4) /* 1387C0 80245480 2631F2E4 */ addiu $s1, $s1, %lo(D_8024F2E4) /* 1387C4 80245484 82030001 */ lb $v1, 1($s0) /* 1387C8 80245488 8E220000 */ lw $v0, ($s1) /* 1387CC 8024548C 10620022 */ beq $v1, $v0, .L80245518 -/* 1387D0 80245490 00000000 */ nop +/* 1387D0 80245490 00000000 */ nop /* 1387D4 80245494 3C048025 */ lui $a0, %hi(D_8024F1D8) /* 1387D8 80245498 00832021 */ addu $a0, $a0, $v1 /* 1387DC 8024549C 9084F1D8 */ lbu $a0, %lo(D_8024F1D8)($a0) @@ -126,7 +126,7 @@ glabel pause_tabs_handle_input /* 13885C 8024551C 8C4200C4 */ lw $v0, %lo(gPauseMenuPressedButtons)($v0) /* 138860 80245520 30428000 */ andi $v0, $v0, 0x8000 /* 138864 80245524 10400016 */ beqz $v0, .L80245580 -/* 138868 80245528 00000000 */ nop +/* 138868 80245528 00000000 */ nop /* 13886C 8024552C 82020001 */ lb $v0, 1($s0) /* 138870 80245530 3C018025 */ lui $at, %hi(D_8024F1D0) /* 138874 80245534 00220821 */ addu $at, $at, $v0 @@ -140,7 +140,7 @@ glabel pause_tabs_handle_input /* 138894 80245554 90430000 */ lbu $v1, ($v0) /* 138898 80245558 24020001 */ addiu $v0, $zero, 1 /* 13889C 8024555C 14620008 */ bne $v1, $v0, .L80245580 -/* 1388A0 80245560 00000000 */ nop +/* 1388A0 80245560 00000000 */ nop /* 1388A4 80245564 0C05272D */ jal play_sound /* 1388A8 80245568 240400C9 */ addiu $a0, $zero, 0xc9 /* 1388AC 8024556C 82020001 */ lb $v0, 1($s0) diff --git a/asm/nonmatchings/code_135EE0/pause_tabs_update.s b/asm/nonmatchings/code_135EE0/pause_tabs_update.s index abf06f606c..c9c21fcf71 100644 --- a/asm/nonmatchings/code_135EE0/pause_tabs_update.s +++ b/asm/nonmatchings/code_135EE0/pause_tabs_update.s @@ -24,51 +24,51 @@ glabel pause_tabs_update /* 138948 80245608 00021080 */ sll $v0, $v0, 2 /* 13894C 8024560C 00431023 */ subu $v0, $v0, $v1 /* 138950 80245610 44820000 */ mtc1 $v0, $f0 -/* 138954 80245614 00000000 */ nop +/* 138954 80245614 00000000 */ nop /* 138958 80245618 46800020 */ cvt.s.w $f0, $f0 /* 13895C 8024561C 4600018D */ trunc.w.s $f6, $f0 /* 138960 80245620 44043000 */ mfc1 $a0, $f6 -/* 138964 80245624 00000000 */ nop +/* 138964 80245624 00000000 */ nop /* 138968 80245628 04810002 */ bgez $a0, .L80245634 /* 13896C 8024562C 0080802D */ daddu $s0, $a0, $zero /* 138970 80245630 00108023 */ negu $s0, $s0 .L80245634: /* 138974 80245634 0C00A52C */ jal sign -/* 138978 80245638 00000000 */ nop +/* 138978 80245638 00000000 */ nop /* 13897C 8024563C 0040182D */ daddu $v1, $v0, $zero /* 138980 80245640 2A020010 */ slti $v0, $s0, 0x10 /* 138984 80245644 14400012 */ bnez $v0, .L80245690 -/* 138988 80245648 00000000 */ nop +/* 138988 80245648 00000000 */ nop /* 13898C 8024564C 3C013FE0 */ lui $at, 0x3fe0 /* 138990 80245650 44811800 */ mtc1 $at, $f3 /* 138994 80245654 44801000 */ mtc1 $zero, $f2 /* 138998 80245658 44900000 */ mtc1 $s0, $f0 -/* 13899C 8024565C 00000000 */ nop +/* 13899C 8024565C 00000000 */ nop /* 1389A0 80245660 46800021 */ cvt.d.w $f0, $f0 /* 1389A4 80245664 46220002 */ mul.d $f0, $f0, $f2 -/* 1389A8 80245668 00000000 */ nop +/* 1389A8 80245668 00000000 */ nop /* 1389AC 8024566C 3C014200 */ lui $at, 0x4200 /* 1389B0 80245670 44812000 */ mtc1 $at, $f4 /* 1389B4 80245674 462000A0 */ cvt.s.d $f2, $f0 /* 1389B8 80245678 4602203C */ c.lt.s $f4, $f2 -/* 1389BC 8024567C 00000000 */ nop +/* 1389BC 8024567C 00000000 */ nop /* 1389C0 80245680 45030009 */ bc1tl .L802456A8 /* 1389C4 80245684 46002086 */ mov.s $f2, $f4 /* 1389C8 80245688 080915AA */ j .L802456A8 -/* 1389CC 8024568C 00000000 */ nop +/* 1389CC 8024568C 00000000 */ nop .L80245690: /* 1389D0 80245690 3C028025 */ lui $v0, %hi(D_8024F300) /* 1389D4 80245694 00501021 */ addu $v0, $v0, $s0 /* 1389D8 80245698 9042F300 */ lbu $v0, %lo(D_8024F300)($v0) /* 1389DC 8024569C 44821000 */ mtc1 $v0, $f2 -/* 1389E0 802456A0 00000000 */ nop +/* 1389E0 802456A0 00000000 */ nop /* 1389E4 802456A4 468010A0 */ cvt.s.w $f2, $f2 .L802456A8: /* 1389E8 802456A8 44830000 */ mtc1 $v1, $f0 -/* 1389EC 802456AC 00000000 */ nop +/* 1389EC 802456AC 00000000 */ nop /* 1389F0 802456B0 46800020 */ cvt.s.w $f0, $f0 /* 1389F4 802456B4 46001082 */ mul.s $f2, $f2, $f0 -/* 1389F8 802456B8 00000000 */ nop +/* 1389F8 802456B8 00000000 */ nop /* 1389FC 802456BC 3C028027 */ lui $v0, %hi(D_8027014C) /* 138A00 802456C0 2442014C */ addiu $v0, $v0, %lo(D_8027014C) /* 138A04 802456C4 C4400000 */ lwc1 $f0, ($v0) @@ -82,16 +82,16 @@ glabel pause_tabs_update /* 138A24 802456E4 24020005 */ addiu $v0, $zero, 5 /* 138A28 802456E8 82630001 */ lb $v1, 1($s3) /* 138A2C 802456EC 10620011 */ beq $v1, $v0, .L80245734 -/* 138A30 802456F0 00000000 */ nop +/* 138A30 802456F0 00000000 */ nop .L802456F4: /* 138A34 802456F4 82630001 */ lb $v1, 1($s3) /* 138A38 802456F8 0083102A */ slt $v0, $a0, $v1 /* 138A3C 802456FC 14400005 */ bnez $v0, .L80245714 /* 138A40 80245700 24020005 */ addiu $v0, $zero, 5 /* 138A44 80245704 1482000B */ bne $a0, $v0, .L80245734 -/* 138A48 80245708 00000000 */ nop +/* 138A48 80245708 00000000 */ nop /* 138A4C 8024570C 14600009 */ bnez $v1, .L80245734 -/* 138A50 80245710 00000000 */ nop +/* 138A50 80245710 00000000 */ nop .L80245714: /* 138A54 80245714 3C148024 */ lui $s4, %hi(func_80243238) /* 138A58 80245718 26943238 */ addiu $s4, $s4, %lo(func_80243238) @@ -174,11 +174,11 @@ glabel pause_tabs_update /* 138B70 80245830 5203000E */ beql $s0, $v1, .L8024586C /* 138B74 80245834 26100001 */ addiu $s0, $s0, 1 /* 138B78 80245838 105E0007 */ beq $v0, $fp, .L80245858 -/* 138B7C 8024583C 00000000 */ nop +/* 138B7C 8024583C 00000000 */ nop /* 138B80 80245840 10570005 */ beq $v0, $s7, .L80245858 -/* 138B84 80245844 00000000 */ nop +/* 138B84 80245844 00000000 */ nop /* 138B88 80245848 10560003 */ beq $v0, $s6, .L80245858 -/* 138B8C 8024584C 00000000 */ nop +/* 138B8C 8024584C 00000000 */ nop /* 138B90 80245850 54550006 */ bnel $v0, $s5, .L8024586C /* 138B94 80245854 26100001 */ addiu $s0, $s0, 1 .L80245858: @@ -192,7 +192,7 @@ glabel pause_tabs_update /* 138BB0 80245870 1440FFDC */ bnez $v0, .L802457E4 /* 138BB4 80245874 26310001 */ addiu $s1, $s1, 1 /* 138BB8 80245878 14800021 */ bnez $a0, .L80245900 -/* 138BBC 8024587C 00000000 */ nop +/* 138BBC 8024587C 00000000 */ nop /* 138BC0 80245880 82620001 */ lb $v0, 1($s3) /* 138BC4 80245884 3C018025 */ lui $at, %hi(D_8024F1E0) /* 138BC8 80245888 00220821 */ addu $at, $at, $v0 @@ -204,19 +204,19 @@ glabel pause_tabs_update /* 138BE0 802458A0 3C028024 */ lui $v0, %hi(func_802432E8) /* 138BE4 802458A4 244232E8 */ addiu $v0, $v0, %lo(func_802432E8) /* 138BE8 802458A8 10620007 */ beq $v1, $v0, .L802458C8 -/* 138BEC 802458AC 00000000 */ nop +/* 138BEC 802458AC 00000000 */ nop /* 138BF0 802458B0 3C028024 */ lui $v0, %hi(func_80243388) /* 138BF4 802458B4 24423388 */ addiu $v0, $v0, %lo(func_80243388) /* 138BF8 802458B8 10620003 */ beq $v1, $v0, .L802458C8 /* 138BFC 802458BC 24020002 */ addiu $v0, $zero, 2 /* 138C00 802458C0 1462000F */ bne $v1, $v0, .L80245900 -/* 138C04 802458C4 00000000 */ nop +/* 138C04 802458C4 00000000 */ nop .L802458C8: /* 138C08 802458C8 3C038025 */ lui $v1, %hi(D_8024F310) /* 138C0C 802458CC 2463F310 */ addiu $v1, $v1, %lo(D_8024F310) /* 138C10 802458D0 8C620000 */ lw $v0, ($v1) /* 138C14 802458D4 10400004 */ beqz $v0, .L802458E8 -/* 138C18 802458D8 00000000 */ nop +/* 138C18 802458D8 00000000 */ nop /* 138C1C 802458DC 3C148014 */ lui $s4, %hi(func_80147474) /* 138C20 802458E0 26947474 */ addiu $s4, $s4, %lo(func_80147474) /* 138C24 802458E4 AC600000 */ sw $zero, ($v1) diff --git a/asm/nonmatchings/code_135EE0/pause_textbox_draw_contents.s b/asm/nonmatchings/code_135EE0/pause_textbox_draw_contents.s index 6460e8f5dc..3480a14fba 100644 --- a/asm/nonmatchings/code_135EE0/pause_textbox_draw_contents.s +++ b/asm/nonmatchings/code_135EE0/pause_textbox_draw_contents.s @@ -31,7 +31,7 @@ glabel pause_textbox_draw_contents /* 136918 802435D8 26860004 */ addiu $a2, $s4, 4 /* 13691C 802435DC 8E040004 */ lw $a0, 4($s0) /* 136920 802435E0 0C0511F8 */ jal draw_icon_2 -/* 136924 802435E4 00000000 */ nop +/* 136924 802435E4 00000000 */ nop /* 136928 802435E8 8E220000 */ lw $v0, ($s1) .L802435EC: /* 13692C 802435EC 3C038027 */ lui $v1, %hi(D_8027010C) @@ -48,7 +48,7 @@ glabel pause_textbox_draw_contents /* 136958 80243618 24C6FFFC */ addiu $a2, $a2, -4 /* 13695C 8024361C 8E040008 */ lw $a0, 8($s0) /* 136960 80243620 0C0511F8 */ jal draw_icon_2 -/* 136964 80243624 00000000 */ nop +/* 136964 80243624 00000000 */ nop .L80243628: /* 136968 80243628 0240202D */ daddu $a0, $s2, $zero /* 13696C 8024362C 3C11800A */ lui $s1, %hi(gMasterGfxPos) @@ -68,54 +68,54 @@ glabel pause_textbox_draw_contents /* 1369A4 80243664 AC620000 */ sw $v0, ($v1) /* 1369A8 80243668 26620001 */ addiu $v0, $s3, 1 /* 1369AC 8024366C 44821000 */ mtc1 $v0, $f2 -/* 1369B0 80243670 00000000 */ nop +/* 1369B0 80243670 00000000 */ nop /* 1369B4 80243674 468010A0 */ cvt.s.w $f2, $f2 /* 1369B8 80243678 AC600004 */ sw $zero, 4($v1) /* 1369BC 8024367C 25030008 */ addiu $v1, $t0, 8 /* 1369C0 80243680 46041082 */ mul.s $f2, $f2, $f4 -/* 1369C4 80243684 00000000 */ nop +/* 1369C4 80243684 00000000 */ nop /* 1369C8 80243688 26820001 */ addiu $v0, $s4, 1 /* 1369CC 8024368C 44820000 */ mtc1 $v0, $f0 -/* 1369D0 80243690 00000000 */ nop +/* 1369D0 80243690 00000000 */ nop /* 1369D4 80243694 46800020 */ cvt.s.w $f0, $f0 /* 1369D8 80243698 02751021 */ addu $v0, $s3, $s5 /* 1369DC 8024369C 2442FFFF */ addiu $v0, $v0, -1 /* 1369E0 802436A0 46040002 */ mul.s $f0, $f0, $f4 -/* 1369E4 802436A4 00000000 */ nop +/* 1369E4 802436A4 00000000 */ nop /* 1369E8 802436A8 AE230000 */ sw $v1, ($s1) /* 1369EC 802436AC 4600118D */ trunc.w.s $f6, $f2 /* 1369F0 802436B0 44033000 */ mfc1 $v1, $f6 -/* 1369F4 802436B4 00000000 */ nop +/* 1369F4 802436B4 00000000 */ nop /* 1369F8 802436B8 30630FFF */ andi $v1, $v1, 0xfff /* 1369FC 802436BC 00031B00 */ sll $v1, $v1, 0xc /* 136A00 802436C0 4600018D */ trunc.w.s $f6, $f0 /* 136A04 802436C4 44073000 */ mfc1 $a3, $f6 -/* 136A08 802436C8 00000000 */ nop +/* 136A08 802436C8 00000000 */ nop /* 136A0C 802436CC 30E70FFF */ andi $a3, $a3, 0xfff /* 136A10 802436D0 00F03825 */ or $a3, $a3, $s0 /* 136A14 802436D4 44821000 */ mtc1 $v0, $f2 -/* 136A18 802436D8 00000000 */ nop +/* 136A18 802436D8 00000000 */ nop /* 136A1C 802436DC 468010A0 */ cvt.s.w $f2, $f2 /* 136A20 802436E0 00671825 */ or $v1, $v1, $a3 /* 136A24 802436E4 46041082 */ mul.s $f2, $f2, $f4 -/* 136A28 802436E8 00000000 */ nop +/* 136A28 802436E8 00000000 */ nop /* 136A2C 802436EC 02961021 */ addu $v0, $s4, $s6 /* 136A30 802436F0 2442FFFF */ addiu $v0, $v0, -1 /* 136A34 802436F4 44820000 */ mtc1 $v0, $f0 -/* 136A38 802436F8 00000000 */ nop +/* 136A38 802436F8 00000000 */ nop /* 136A3C 802436FC 46800020 */ cvt.s.w $f0, $f0 /* 136A40 80243700 240700FF */ addiu $a3, $zero, 0xff /* 136A44 80243704 46040002 */ mul.s $f0, $f0, $f4 -/* 136A48 80243708 00000000 */ nop +/* 136A48 80243708 00000000 */ nop /* 136A4C 8024370C AD030000 */ sw $v1, ($t0) /* 136A50 80243710 4600118D */ trunc.w.s $f6, $f2 /* 136A54 80243714 44023000 */ mfc1 $v0, $f6 -/* 136A58 80243718 00000000 */ nop +/* 136A58 80243718 00000000 */ nop /* 136A5C 8024371C 30420FFF */ andi $v0, $v0, 0xfff /* 136A60 80243720 00021300 */ sll $v0, $v0, 0xc /* 136A64 80243724 4600018D */ trunc.w.s $f6, $f0 /* 136A68 80243728 44033000 */ mfc1 $v1, $f6 -/* 136A6C 8024372C 00000000 */ nop +/* 136A6C 8024372C 00000000 */ nop /* 136A70 80243730 30630FFF */ andi $v1, $v1, 0xfff /* 136A74 80243734 00431025 */ or $v0, $v0, $v1 /* 136A78 80243738 AD020004 */ sw $v0, 4($t0) diff --git a/asm/nonmatchings/code_135EE0/pause_tutorial_draw_contents.s b/asm/nonmatchings/code_135EE0/pause_tutorial_draw_contents.s index 26b7cce4e0..5cb39cd61b 100644 --- a/asm/nonmatchings/code_135EE0/pause_tutorial_draw_contents.s +++ b/asm/nonmatchings/code_135EE0/pause_tutorial_draw_contents.s @@ -182,7 +182,7 @@ glabel pause_tutorial_draw_contents /* 136DF4 80243AB4 12E2000B */ beq $s7, $v0, .L80243AE4 /* 136DF8 80243AB8 27A40028 */ addiu $a0, $sp, 0x28 /* 136DFC 80243ABC 08090EC0 */ j .L80243B00 -/* 136E00 80243AC0 00000000 */ nop +/* 136E00 80243AC0 00000000 */ nop .L80243AC4: /* 136E04 80243AC4 27A40028 */ addiu $a0, $sp, 0x28 /* 136E08 80243AC8 3C054220 */ lui $a1, 0x4220 @@ -346,57 +346,57 @@ glabel pause_tutorial_draw_contents /* 137074 80243D34 8FAF0128 */ lw $t7, 0x128($sp) /* 137078 80243D38 01D41821 */ addu $v1, $t6, $s4 /* 13707C 80243D3C 44831000 */ mtc1 $v1, $f2 -/* 137080 80243D40 00000000 */ nop +/* 137080 80243D40 00000000 */ nop /* 137084 80243D44 468010A0 */ cvt.s.w $f2, $f2 /* 137088 80243D48 00C0382D */ daddu $a3, $a2, $zero /* 13708C 80243D4C 46041082 */ mul.s $f2, $f2, $f4 -/* 137090 80243D50 00000000 */ nop +/* 137090 80243D50 00000000 */ nop /* 137094 80243D54 01F41821 */ addu $v1, $t7, $s4 /* 137098 80243D58 44830000 */ mtc1 $v1, $f0 -/* 13709C 80243D5C 00000000 */ nop +/* 13709C 80243D5C 00000000 */ nop /* 1370A0 80243D60 46800020 */ cvt.s.w $f0, $f0 /* 1370A4 80243D64 24C60008 */ addiu $a2, $a2, 8 /* 1370A8 80243D68 3C03ED00 */ lui $v1, 0xed00 /* 1370AC 80243D6C 46040002 */ mul.s $f0, $f0, $f4 -/* 1370B0 80243D70 00000000 */ nop +/* 1370B0 80243D70 00000000 */ nop /* 1370B4 80243D74 8FAF0124 */ lw $t7, 0x124($sp) /* 1370B8 80243D78 4600118D */ trunc.w.s $f6, $f2 /* 1370BC 80243D7C 44043000 */ mfc1 $a0, $f6 -/* 1370C0 80243D80 00000000 */ nop +/* 1370C0 80243D80 00000000 */ nop /* 1370C4 80243D84 30840FFF */ andi $a0, $a0, 0xfff /* 1370C8 80243D88 00042300 */ sll $a0, $a0, 0xc /* 1370CC 80243D8C 4600018D */ trunc.w.s $f6, $f0 /* 1370D0 80243D90 44053000 */ mfc1 $a1, $f6 -/* 1370D4 80243D94 00000000 */ nop +/* 1370D4 80243D94 00000000 */ nop /* 1370D8 80243D98 30A50FFF */ andi $a1, $a1, 0xfff /* 1370DC 80243D9C 8FAE012C */ lw $t6, 0x12c($sp) /* 1370E0 80243DA0 00A32825 */ or $a1, $a1, $v1 /* 1370E4 80243DA4 01EE1821 */ addu $v1, $t7, $t6 /* 1370E8 80243DA8 2463FFFF */ addiu $v1, $v1, -1 /* 1370EC 80243DAC 44831000 */ mtc1 $v1, $f2 -/* 1370F0 80243DB0 00000000 */ nop +/* 1370F0 80243DB0 00000000 */ nop /* 1370F4 80243DB4 468010A0 */ cvt.s.w $f2, $f2 /* 1370F8 80243DB8 46041082 */ mul.s $f2, $f2, $f4 -/* 1370FC 80243DBC 00000000 */ nop +/* 1370FC 80243DBC 00000000 */ nop /* 137100 80243DC0 8FAF0128 */ lw $t7, 0x128($sp) /* 137104 80243DC4 8FAE0130 */ lw $t6, 0x130($sp) /* 137108 80243DC8 00852025 */ or $a0, $a0, $a1 /* 13710C 80243DCC 01EE1821 */ addu $v1, $t7, $t6 /* 137110 80243DD0 2463FFFF */ addiu $v1, $v1, -1 /* 137114 80243DD4 44830000 */ mtc1 $v1, $f0 -/* 137118 80243DD8 00000000 */ nop +/* 137118 80243DD8 00000000 */ nop /* 13711C 80243DDC 46800020 */ cvt.s.w $f0, $f0 /* 137120 80243DE0 46040002 */ mul.s $f0, $f0, $f4 -/* 137124 80243DE4 00000000 */ nop +/* 137124 80243DE4 00000000 */ nop /* 137128 80243DE8 ACE40000 */ sw $a0, ($a3) /* 13712C 80243DEC 4600118D */ trunc.w.s $f6, $f2 /* 137130 80243DF0 44033000 */ mfc1 $v1, $f6 -/* 137134 80243DF4 00000000 */ nop +/* 137134 80243DF4 00000000 */ nop /* 137138 80243DF8 30630FFF */ andi $v1, $v1, 0xfff /* 13713C 80243DFC 00031B00 */ sll $v1, $v1, 0xc /* 137140 80243E00 4600018D */ trunc.w.s $f6, $f0 /* 137144 80243E04 44043000 */ mfc1 $a0, $f6 -/* 137148 80243E08 00000000 */ nop +/* 137148 80243E08 00000000 */ nop /* 13714C 80243E0C 30840FFF */ andi $a0, $a0, 0xfff /* 137150 80243E10 00641825 */ or $v1, $v1, $a0 /* 137154 80243E14 ACE30004 */ sw $v1, 4($a3) @@ -487,7 +487,7 @@ glabel pause_tutorial_draw_contents /* 1372A8 80243F68 00822021 */ addu $a0, $a0, $v0 /* 1372AC 80243F6C 8C8400E8 */ lw $a0, %lo(gPauseMenuCommonIconIDs)($a0) /* 1372B0 80243F70 0C051308 */ jal func_80144C20 -/* 1372B4 80243F74 00000000 */ nop +/* 1372B4 80243F74 00000000 */ nop /* 1372B8 80243F78 8EA20000 */ lw $v0, ($s5) /* 1372BC 80243F7C 00021080 */ sll $v0, $v0, 2 /* 1372C0 80243F80 3C018025 */ lui $at, %hi(D_8024F090) @@ -498,7 +498,7 @@ glabel pause_tutorial_draw_contents /* 1372D4 80243F94 00822021 */ addu $a0, $a0, $v0 /* 1372D8 80243F98 8C8400E8 */ lw $a0, %lo(gPauseMenuCommonIconIDs)($a0) /* 1372DC 80243F9C 0C0511F8 */ jal draw_icon_2 -/* 1372E0 80243FA0 00000000 */ nop +/* 1372E0 80243FA0 00000000 */ nop /* 1372E4 80243FA4 8EA20000 */ lw $v0, ($s5) /* 1372E8 80243FA8 3C108027 */ lui $s0, %hi(gPauseMenuCommonIconIDs) /* 1372EC 80243FAC 261000E8 */ addiu $s0, $s0, %lo(gPauseMenuCommonIconIDs) @@ -515,7 +515,7 @@ glabel pause_tutorial_draw_contents /* 137318 80243FD8 25E60032 */ addiu $a2, $t7, 0x32 /* 13731C 80243FDC 8E04001C */ lw $a0, 0x1c($s0) /* 137320 80243FE0 0C0511F8 */ jal draw_icon_2 -/* 137324 80243FE4 00000000 */ nop +/* 137324 80243FE4 00000000 */ nop .L80243FE8: /* 137328 80243FE8 8EA20000 */ lw $v0, ($s5) /* 13732C 80243FEC 00021080 */ sll $v0, $v0, 2 diff --git a/asm/nonmatchings/code_135EE0/pause_tutorial_input.s b/asm/nonmatchings/code_135EE0/pause_tutorial_input.s index 99cbba1024..6ef706edaf 100644 --- a/asm/nonmatchings/code_135EE0/pause_tutorial_input.s +++ b/asm/nonmatchings/code_135EE0/pause_tutorial_input.s @@ -22,7 +22,7 @@ glabel pause_tutorial_input /* 137624 802442E4 00220821 */ addu $at, $at, $v0 /* 137628 802442E8 8C22FF60 */ lw $v0, %lo(D_8026FF60)($at) /* 13762C 802442EC 00400008 */ jr $v0 -/* 137630 802442F0 00000000 */ nop +/* 137630 802442F0 00000000 */ nop /* 137634 802442F4 3C028025 */ lui $v0, %hi(D_8024F018) /* 137638 802442F8 8C42F018 */ lw $v0, %lo(D_8024F018)($v0) /* 13763C 802442FC 00021080 */ sll $v0, $v0, 2 @@ -37,9 +37,9 @@ glabel pause_tutorial_input /* 137660 80244320 AC22F01C */ sw $v0, %lo(D_8024F01C)($at) .L80244324: /* 137664 80244324 10800005 */ beqz $a0, .L8024433C -/* 137668 80244328 00000000 */ nop +/* 137668 80244328 00000000 */ nop /* 13766C 8024432C 16000003 */ bnez $s0, .L8024433C -/* 137670 80244330 00000000 */ nop +/* 137670 80244330 00000000 */ nop /* 137674 80244334 0C05272D */ jal play_sound /* 137678 80244338 2404021D */ addiu $a0, $zero, 0x21d .L8024433C: diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003B47C.s b/asm/nonmatchings/code_13870_len_6980/func_8003B47C.s index 6a4b479453..84238c774a 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003B47C.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003B47C.s @@ -9,27 +9,32 @@ glabel func_8003B47C /* 1688C 8003B48C 10400019 */ beqz $v0, .L8003B4F4 /* 16890 8003B490 00C0382D */ daddu $a3, $a2, $zero /* 16894 8003B494 00031080 */ sll $v0, $v1, 2 -/* 16898 8003B498 3C01800A */ lui $at, %hi(D_800984C8) +/* 16898 8003B498 3C01800A */ lui $at, %hi(jtbl_800984C8_738C8) /* 1689C 8003B49C 00220821 */ addu $at, $at, $v0 -/* 168A0 8003B4A0 8C2284C8 */ lw $v0, %lo(D_800984C8)($at) +/* 168A0 8003B4A0 8C2284C8 */ lw $v0, %lo(jtbl_800984C8_738C8)($at) /* 168A4 8003B4A4 00400008 */ jr $v0 /* 168A8 8003B4A8 00000000 */ nop +glabel L8003B4AC_168AC /* 168AC 8003B4AC 0C00ED40 */ jal func_8003B500 /* 168B0 8003B4B0 00E0302D */ daddu $a2, $a3, $zero /* 168B4 8003B4B4 0800ED3D */ j .L8003B4F4 /* 168B8 8003B4B8 00000000 */ nop +glabel L8003B4BC_168BC /* 168BC 8003B4BC 0C00ED6D */ jal func_8003B5B4 /* 168C0 8003B4C0 00E0302D */ daddu $a2, $a3, $zero /* 168C4 8003B4C4 0800ED3D */ j .L8003B4F4 /* 168C8 8003B4C8 00000000 */ nop +glabel L8003B4CC_168CC /* 168CC 8003B4CC 0C00EE98 */ jal func_8003BA60 /* 168D0 8003B4D0 0000302D */ daddu $a2, $zero, $zero /* 168D4 8003B4D4 0800ED3D */ j .L8003B4F4 /* 168D8 8003B4D8 00000000 */ nop +glabel L8003B4DC_168DC /* 168DC 8003B4DC 0C00EE98 */ jal func_8003BA60 /* 168E0 8003B4E0 24060001 */ addiu $a2, $zero, 1 /* 168E4 8003B4E4 0800ED3D */ j .L8003B4F4 /* 168E8 8003B4E8 00000000 */ nop +glabel L8003B4EC_168EC /* 168EC 8003B4EC 0C00EFB6 */ jal func_8003BED8 /* 168F0 8003B4F0 00E0302D */ daddu $a2, $a3, $zero .L8003B4F4: diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003C53C.s b/asm/nonmatchings/code_13870_len_6980/func_8003C53C.s index 48bbc68e34..4a1063d36b 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003C53C.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003C53C.s @@ -13,41 +13,48 @@ glabel func_8003C53C /* 1795C 8003C55C 2C620007 */ sltiu $v0, $v1, 7 /* 17960 8003C560 10400027 */ beqz $v0, .L8003C600 /* 17964 8003C564 00031080 */ sll $v0, $v1, 2 -/* 17968 8003C568 3C01800A */ lui $at, %hi(D_80098500) +/* 17968 8003C568 3C01800A */ lui $at, %hi(jtbl_80098500_73900) /* 1796C 8003C56C 00220821 */ addu $at, $at, $v0 -/* 17970 8003C570 8C228500 */ lw $v0, %lo(D_80098500)($at) +/* 17970 8003C570 8C228500 */ lw $v0, %lo(jtbl_80098500_73900)($at) /* 17974 8003C574 00400008 */ jr $v0 /* 17978 8003C578 00000000 */ nop +glabel L8003C57C_1797C /* 1797C 8003C57C 0200202D */ daddu $a0, $s0, $zero /* 17980 8003C580 0C00F198 */ jal func_8003C660 /* 17984 8003C584 0220282D */ daddu $a1, $s1, $zero /* 17988 8003C588 0800F181 */ j .L8003C604 /* 1798C 8003C58C 02111021 */ addu $v0, $s0, $s1 +glabel L8003C590_17990 /* 17990 8003C590 0200202D */ daddu $a0, $s0, $zero /* 17994 8003C594 0C00F1E3 */ jal func_8003C78C /* 17998 8003C598 0220282D */ daddu $a1, $s1, $zero /* 1799C 8003C59C 0800F181 */ j .L8003C604 /* 179A0 8003C5A0 02111021 */ addu $v0, $s0, $s1 +glabel L8003C5A4_179A4 /* 179A4 8003C5A4 0200202D */ daddu $a0, $s0, $zero /* 179A8 8003C5A8 0C00F22B */ jal func_8003C8AC /* 179AC 8003C5AC 0220282D */ daddu $a1, $s1, $zero /* 179B0 8003C5B0 0800F181 */ j .L8003C604 /* 179B4 8003C5B4 02111021 */ addu $v0, $s0, $s1 +glabel L8003C5B8_179B8 /* 179B8 8003C5B8 0200202D */ daddu $a0, $s0, $zero /* 179BC 8003C5BC 0C00F261 */ jal func_8003C984 /* 179C0 8003C5C0 0220282D */ daddu $a1, $s1, $zero /* 179C4 8003C5C4 0800F181 */ j .L8003C604 /* 179C8 8003C5C8 02111021 */ addu $v0, $s0, $s1 +glabel L8003C5CC_179CC /* 179CC 8003C5CC 0200202D */ daddu $a0, $s0, $zero /* 179D0 8003C5D0 0C00F2C8 */ jal func_8003CB20 /* 179D4 8003C5D4 0220282D */ daddu $a1, $s1, $zero /* 179D8 8003C5D8 0800F181 */ j .L8003C604 /* 179DC 8003C5DC 02111021 */ addu $v0, $s0, $s1 +glabel L8003C5E0_179E0 /* 179E0 8003C5E0 0200202D */ daddu $a0, $s0, $zero /* 179E4 8003C5E4 0C00F323 */ jal func_8003CC8C /* 179E8 8003C5E8 0220282D */ daddu $a1, $s1, $zero /* 179EC 8003C5EC 0800F181 */ j .L8003C604 /* 179F0 8003C5F0 02111021 */ addu $v0, $s0, $s1 +glabel L8003C5F4_179F4 /* 179F4 8003C5F4 0200202D */ daddu $a0, $s0, $zero /* 179F8 8003C5F8 0C00F3E8 */ jal func_8003CFA0 /* 179FC 8003C5FC 0220282D */ daddu $a1, $s1, $zero diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003D3BC.s b/asm/nonmatchings/code_13870_len_6980/func_8003D3BC.s index 5ea9ad56da..332067c533 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003D3BC.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003D3BC.s @@ -29,11 +29,12 @@ glabel func_8003D3BC /* 1881C 8003D41C 2E820011 */ sltiu $v0, $s4, 0x11 /* 18820 8003D420 10400076 */ beqz $v0, .L8003D5FC /* 18824 8003D424 00141080 */ sll $v0, $s4, 2 -/* 18828 8003D428 3C01800A */ lui $at, %hi(D_80098548) +/* 18828 8003D428 3C01800A */ lui $at, %hi(jtbl_80098548_73948) /* 1882C 8003D42C 00220821 */ addu $at, $at, $v0 -/* 18830 8003D430 8C228548 */ lw $v0, %lo(D_80098548)($at) +/* 18830 8003D430 8C228548 */ lw $v0, %lo(jtbl_80098548_73948)($at) /* 18834 8003D434 00400008 */ jr $v0 /* 18838 8003D438 00000000 */ nop +glabel L8003D43C_1883C /* 1883C 8003D43C 0000282D */ daddu $a1, $zero, $zero /* 18840 8003D440 00A0302D */ daddu $a2, $a1, $zero /* 18844 8003D444 2402000D */ addiu $v0, $zero, 0xd @@ -44,8 +45,10 @@ glabel func_8003D3BC /* 18858 8003D458 8E240024 */ lw $a0, 0x24($s1) /* 1885C 8003D45C 0800F57D */ j .L8003D5F4 /* 18860 8003D460 00A0382D */ daddu $a3, $a1, $zero +glabel L8003D464_18864 /* 18864 8003D464 2402000D */ addiu $v0, $zero, 0xd /* 18868 8003D468 A22200AA */ sb $v0, 0xaa($s1) +glabel L8003D46C_1886C /* 1886C 8003D46C 0280282D */ daddu $a1, $s4, $zero /* 18870 8003D470 0000302D */ daddu $a2, $zero, $zero /* 18874 8003D474 AFA00010 */ sw $zero, 0x10($sp) @@ -54,6 +57,7 @@ glabel func_8003D3BC /* 18880 8003D480 8E240024 */ lw $a0, 0x24($s1) /* 18884 8003D484 0800F57D */ j .L8003D5F4 /* 18888 8003D488 00C0382D */ daddu $a3, $a2, $zero +glabel L8003D48C_1888C /* 1888C 8003D48C 24050004 */ addiu $a1, $zero, 4 /* 18890 8003D490 0200302D */ daddu $a2, $s0, $zero /* 18894 8003D494 2402000D */ addiu $v0, $zero, 0xd @@ -61,6 +65,7 @@ glabel func_8003D3BC /* 1889C 8003D49C AFB20010 */ sw $s2, 0x10($sp) /* 188A0 8003D4A0 0800F57A */ j .L8003D5E8 /* 188A4 8003D4A4 AFA00014 */ sw $zero, 0x14($sp) +glabel L8003D4A8_188A8 /* 188A8 8003D4A8 24050006 */ addiu $a1, $zero, 6 /* 188AC 8003D4AC 0200302D */ daddu $a2, $s0, $zero /* 188B0 8003D4B0 2402000D */ addiu $v0, $zero, 0xd @@ -69,6 +74,7 @@ glabel func_8003D3BC /* 188BC 8003D4BC AFB20010 */ sw $s2, 0x10($sp) /* 188C0 8003D4C0 0800F57A */ j .L8003D5E8 /* 188C4 8003D4C4 AFA20014 */ sw $v0, 0x14($sp) +glabel L8003D4C8_188C8 /* 188C8 8003D4C8 24050007 */ addiu $a1, $zero, 7 /* 188CC 8003D4CC 240600FF */ addiu $a2, $zero, 0xff /* 188D0 8003D4D0 24020016 */ addiu $v0, $zero, 0x16 @@ -80,6 +86,7 @@ glabel func_8003D3BC /* 188E8 8003D4E8 8E240024 */ lw $a0, 0x24($s1) /* 188EC 8003D4EC 0800F57D */ j .L8003D5F4 /* 188F0 8003D4F0 00C0382D */ daddu $a3, $a2, $zero +glabel L8003D4F4_188F4 /* 188F4 8003D4F4 24050008 */ addiu $a1, $zero, 8 /* 188F8 8003D4F8 0200302D */ daddu $a2, $s0, $zero /* 188FC 8003D4FC 24020016 */ addiu $v0, $zero, 0x16 @@ -87,6 +94,7 @@ glabel func_8003D3BC /* 18904 8003D504 AFB20010 */ sw $s2, 0x10($sp) /* 18908 8003D508 0800F57A */ j .L8003D5E8 /* 1890C 8003D50C AFB60014 */ sw $s6, 0x14($sp) +glabel L8003D510_18910 /* 18910 8003D510 24050009 */ addiu $a1, $zero, 9 /* 18914 8003D514 0200302D */ daddu $a2, $s0, $zero /* 18918 8003D518 2402000D */ addiu $v0, $zero, 0xd @@ -95,6 +103,7 @@ glabel func_8003D3BC /* 18924 8003D524 AFB20010 */ sw $s2, 0x10($sp) /* 18928 8003D528 0800F57A */ j .L8003D5E8 /* 1892C 8003D52C AFA20014 */ sw $v0, 0x14($sp) +glabel L8003D530_18930 /* 18930 8003D530 2405000A */ addiu $a1, $zero, 0xa /* 18934 8003D534 0200302D */ daddu $a2, $s0, $zero /* 18938 8003D538 24020016 */ addiu $v0, $zero, 0x16 @@ -102,6 +111,7 @@ glabel func_8003D3BC /* 18940 8003D540 AFB20010 */ sw $s2, 0x10($sp) /* 18944 8003D544 0800F57A */ j .L8003D5E8 /* 18948 8003D548 AFB60014 */ sw $s6, 0x14($sp) +glabel L8003D54C_1894C /* 1894C 8003D54C 24050005 */ addiu $a1, $zero, 5 /* 18950 8003D550 0200302D */ daddu $a2, $s0, $zero /* 18954 8003D554 2402000D */ addiu $v0, $zero, 0xd @@ -109,6 +119,7 @@ glabel func_8003D3BC /* 1895C 8003D55C AFB20010 */ sw $s2, 0x10($sp) /* 18960 8003D560 0800F57A */ j .L8003D5E8 /* 18964 8003D564 AFA00014 */ sw $zero, 0x14($sp) +glabel L8003D568_18968 /* 18968 8003D568 2405000D */ addiu $a1, $zero, 0xd /* 1896C 8003D56C 0200302D */ daddu $a2, $s0, $zero /* 18970 8003D570 24020016 */ addiu $v0, $zero, 0x16 @@ -116,6 +127,7 @@ glabel func_8003D3BC /* 18978 8003D578 AFB20010 */ sw $s2, 0x10($sp) /* 1897C 8003D57C 0800F57A */ j .L8003D5E8 /* 18980 8003D580 AFB60014 */ sw $s6, 0x14($sp) +glabel L8003D584_18984 /* 18984 8003D584 2405000E */ addiu $a1, $zero, 0xe /* 18988 8003D588 0200302D */ daddu $a2, $s0, $zero /* 1898C 8003D58C 2402000D */ addiu $v0, $zero, 0xd @@ -124,6 +136,7 @@ glabel func_8003D3BC /* 18998 8003D598 AFB20010 */ sw $s2, 0x10($sp) /* 1899C 8003D59C 0800F57A */ j .L8003D5E8 /* 189A0 8003D5A0 AFA20014 */ sw $v0, 0x14($sp) +glabel L8003D5A4_189A4 /* 189A4 8003D5A4 2405000F */ addiu $a1, $zero, 0xf /* 189A8 8003D5A8 0200302D */ daddu $a2, $s0, $zero /* 189AC 8003D5AC 2402000D */ addiu $v0, $zero, 0xd @@ -135,6 +148,7 @@ glabel func_8003D3BC /* 189C4 8003D5C4 8E240024 */ lw $a0, 0x24($s1) /* 189C8 8003D5C8 0800F57D */ j .L8003D5F4 /* 189CC 8003D5CC 0040382D */ daddu $a3, $v0, $zero +glabel L8003D5D0_189D0 /* 189D0 8003D5D0 2405000F */ addiu $a1, $zero, 0xf /* 189D4 8003D5D4 0200302D */ daddu $a2, $s0, $zero /* 189D8 8003D5D8 24020016 */ addiu $v0, $zero, 0x16 @@ -149,6 +163,7 @@ glabel func_8003D3BC /* 189F4 8003D5F4 0C0B7A25 */ jal func_802DE894 /* 189F8 8003D5F8 00000000 */ nop .L8003D5FC: +glabel L8003D5FC_189FC /* 189FC 8003D5FC 8FBF003C */ lw $ra, 0x3c($sp) /* 18A00 8003D600 8FB60038 */ lw $s6, 0x38($sp) /* 18A04 8003D604 8FB50034 */ lw $s5, 0x34($sp) diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003D660.s b/asm/nonmatchings/code_13870_len_6980/func_8003D660.s index f771f5ea3a..9eff43c017 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003D660.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003D660.s @@ -31,21 +31,24 @@ glabel func_8003D660 /* 18AC8 8003D6C8 2C620009 */ sltiu $v0, $v1, 9 /* 18ACC 8003D6CC 10400025 */ beqz $v0, .L8003D764 /* 18AD0 8003D6D0 00031080 */ sll $v0, $v1, 2 -/* 18AD4 8003D6D4 3C01800A */ lui $at, %hi(D_80098590) +/* 18AD4 8003D6D4 3C01800A */ lui $at, %hi(jtbl_80098590_73990) /* 18AD8 8003D6D8 00220821 */ addu $at, $at, $v0 -/* 18ADC 8003D6DC 8C228590 */ lw $v0, %lo(D_80098590)($at) +/* 18ADC 8003D6DC 8C228590 */ lw $v0, %lo(jtbl_80098590_73990)($at) /* 18AE0 8003D6E0 00400008 */ jr $v0 /* 18AE4 8003D6E4 00000000 */ nop +glabel L8003D6E8_18AE8 /* 18AE8 8003D6E8 0200202D */ daddu $a0, $s0, $zero /* 18AEC 8003D6EC 0C00F68E */ jal func_8003DA38 /* 18AF0 8003D6F0 0220282D */ daddu $a1, $s1, $zero /* 18AF4 8003D6F4 0800F5DC */ j .L8003D770 /* 18AF8 8003D6F8 00000000 */ nop +glabel L8003D6FC_18AFC /* 18AFC 8003D6FC 0200202D */ daddu $a0, $s0, $zero /* 18B00 8003D700 0C00F70E */ jal func_8003DC38 /* 18B04 8003D704 0220282D */ daddu $a1, $s1, $zero /* 18B08 8003D708 0800F5DC */ j .L8003D770 /* 18B0C 8003D70C 00000000 */ nop +glabel L8003D710_18B10 /* 18B10 8003D710 82420000 */ lb $v0, ($s2) /* 18B14 8003D714 10400004 */ beqz $v0, .L8003D728 /* 18B18 8003D718 24020008 */ addiu $v0, $zero, 8 @@ -58,17 +61,20 @@ glabel func_8003D660 /* 18B30 8003D730 0220282D */ daddu $a1, $s1, $zero /* 18B34 8003D734 0800F5DC */ j .L8003D770 /* 18B38 8003D738 00000000 */ nop +glabel L8003D73C_18B3C /* 18B3C 8003D73C 0200202D */ daddu $a0, $s0, $zero /* 18B40 8003D740 0C00F835 */ jal func_8003E0D4 /* 18B44 8003D744 0220282D */ daddu $a1, $s1, $zero /* 18B48 8003D748 0800F5DC */ j .L8003D770 /* 18B4C 8003D74C 00000000 */ nop +glabel L8003D750_18B50 /* 18B50 8003D750 0200202D */ daddu $a0, $s0, $zero /* 18B54 8003D754 0C00F874 */ jal func_8003E1D0 /* 18B58 8003D758 0220282D */ daddu $a1, $s1, $zero /* 18B5C 8003D75C 0800F5DC */ j .L8003D770 /* 18B60 8003D760 00000000 */ nop .L8003D764: +glabel L8003D764_18B64 /* 18B64 8003D764 0200202D */ daddu $a0, $s0, $zero /* 18B68 8003D768 0C00F5E2 */ jal func_8003D788 /* 18B6C 8003D76C 0220282D */ daddu $a1, $s1, $zero diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003E524.s b/asm/nonmatchings/code_13870_len_6980/func_8003E524.s index a1fe14b5e6..1e8cc36b18 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003E524.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003E524.s @@ -9,30 +9,36 @@ glabel func_8003E524 /* 19934 8003E534 10400019 */ beqz $v0, .L8003E59C /* 19938 8003E538 AFBF0010 */ sw $ra, 0x10($sp) /* 1993C 8003E53C 00031080 */ sll $v0, $v1, 2 -/* 19940 8003E540 3C01800A */ lui $at, %hi(D_800985C0) +/* 19940 8003E540 3C01800A */ lui $at, %hi(jtbl_800985C0_739C0) /* 19944 8003E544 00220821 */ addu $at, $at, $v0 -/* 19948 8003E548 8C2285C0 */ lw $v0, %lo(D_800985C0)($at) +/* 19948 8003E548 8C2285C0 */ lw $v0, %lo(jtbl_800985C0_739C0)($at) /* 1994C 8003E54C 00400008 */ jr $v0 /* 19950 8003E550 00000000 */ nop +glabel L8003E554_19954 /* 19954 8003E554 0C010DAC */ jal create_npcs /* 19958 8003E558 00000000 */ nop /* 1995C 8003E55C 0800F967 */ j .L8003E59C /* 19960 8003E560 00000000 */ nop +glabel L8003E564_19964 /* 19964 8003E564 0C00FDF3 */ jal func_8003F7CC /* 19968 8003E568 00000000 */ nop /* 1996C 8003E56C 0800F967 */ j .L8003E59C /* 19970 8003E570 00000000 */ nop +glabel L8003E574_19974 /* 19974 8003E574 0C0104D9 */ jal func_80041364 /* 19978 8003E578 00000000 */ nop /* 1997C 8003E57C 0800F967 */ j .L8003E59C /* 19980 8003E580 00000000 */ nop +glabel L8003E584_19984 /* 19984 8003E584 0C010C27 */ jal func_8004309C /* 19988 8003E588 00000000 */ nop /* 1998C 8003E58C 0800F967 */ j .L8003E59C /* 19990 8003E590 00000000 */ nop +glabel L8003E594_19994 /* 19994 8003E594 0C0107C4 */ jal func_80041F10 /* 19998 8003E598 00000000 */ nop .L8003E59C: +glabel L8003E59C_1999C /* 1999C 8003E59C 0C0116DA */ jal func_80045B68 /* 199A0 8003E5A0 00000000 */ nop /* 199A4 8003E5A4 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003E5B0.s b/asm/nonmatchings/code_13870_len_6980/func_8003E5B0.s index 5f578c2194..56172581ef 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003E5B0.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003E5B0.s @@ -9,30 +9,36 @@ glabel func_8003E5B0 /* 199C0 8003E5C0 10400019 */ beqz $v0, .L8003E628 /* 199C4 8003E5C4 AFBF0010 */ sw $ra, 0x10($sp) /* 199C8 8003E5C8 00031080 */ sll $v0, $v1, 2 -/* 199CC 8003E5CC 3C01800A */ lui $at, %hi(D_800985D8) +/* 199CC 8003E5CC 3C01800A */ lui $at, %hi(jtbl_800985D8_739D8) /* 199D0 8003E5D0 00220821 */ addu $at, $at, $v0 -/* 199D4 8003E5D4 8C2285D8 */ lw $v0, %lo(D_800985D8)($at) +/* 199D4 8003E5D4 8C2285D8 */ lw $v0, %lo(jtbl_800985D8_739D8)($at) /* 199D8 8003E5D8 00400008 */ jr $v0 /* 199DC 8003E5DC 00000000 */ nop +glabel L8003E5E0_199E0 /* 199E0 8003E5E0 0C011050 */ jal func_80044140 /* 199E4 8003E5E4 00000000 */ nop /* 199E8 8003E5E8 0800F98A */ j .L8003E628 /* 199EC 8003E5EC 00000000 */ nop +glabel L8003E5F0_199F0 /* 199F0 8003E5F0 0C0104D7 */ jal func_8004135C /* 199F4 8003E5F4 00000000 */ nop /* 199F8 8003E5F8 0800F98A */ j .L8003E628 /* 199FC 8003E5FC 00000000 */ nop +glabel L8003E600_19A00 /* 19A00 8003E600 0C010659 */ jal func_80041964 /* 19A04 8003E604 00000000 */ nop /* 19A08 8003E608 0800F98A */ j .L8003E628 /* 19A0C 8003E60C 00000000 */ nop +glabel L8003E610_19A10 /* 19A10 8003E610 0C010C75 */ jal func_800431D4 /* 19A14 8003E614 00000000 */ nop /* 19A18 8003E618 0800F98A */ j .L8003E628 /* 19A1C 8003E61C 00000000 */ nop +glabel L8003E620_19A20 /* 19A20 8003E620 0C010C13 */ jal func_8004304C /* 19A24 8003E624 00000000 */ nop .L8003E628: +glabel L8003E628_19A28 /* 19A28 8003E628 0C01170A */ jal func_80045C28 /* 19A2C 8003E62C 00000000 */ nop /* 19A30 8003E630 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_13CAF0/pause_items_cleanup.s b/asm/nonmatchings/code_13CAF0/pause_items_cleanup.s index f63249b77b..99cf7adb77 100644 --- a/asm/nonmatchings/code_13CAF0/pause_items_cleanup.s +++ b/asm/nonmatchings/code_13CAF0/pause_items_cleanup.s @@ -16,10 +16,10 @@ glabel pause_items_cleanup /* 13E0F8 8024ADB8 26310001 */ addiu $s1, $s1, 1 /* 13E0FC 8024ADBC 2A220014 */ slti $v0, $s1, 0x14 /* 13E100 8024ADC0 1440FFFA */ bnez $v0, .L8024ADAC -/* 13E104 8024ADC4 00000000 */ nop +/* 13E104 8024ADC4 00000000 */ nop /* 13E108 8024ADC8 8FBF0018 */ lw $ra, 0x18($sp) /* 13E10C 8024ADCC 8FB10014 */ lw $s1, 0x14($sp) /* 13E110 8024ADD0 8FB00010 */ lw $s0, 0x10($sp) /* 13E114 8024ADD4 03E00008 */ jr $ra /* 13E118 8024ADD8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 13E11C 8024ADDC 00000000 */ nop +/* 13E11C 8024ADDC 00000000 */ nop diff --git a/asm/nonmatchings/code_13CAF0/pause_items_draw_contents.s b/asm/nonmatchings/code_13CAF0/pause_items_draw_contents.s index 3b6a3f20f1..bf12d4f582 100644 --- a/asm/nonmatchings/code_13CAF0/pause_items_draw_contents.s +++ b/asm/nonmatchings/code_13CAF0/pause_items_draw_contents.s @@ -58,7 +58,7 @@ glabel pause_items_draw_contents /* 13CD80 80249A40 15010004 */ bne $t0, $at, .L80249A54 /* 13CD84 80249A44 3C018000 */ lui $at, 0x8000 /* 13CD88 80249A48 14610002 */ bne $v1, $at, .L80249A54 -/* 13CD8C 80249A4C 00000000 */ nop +/* 13CD8C 80249A4C 00000000 */ nop /* 13CD90 80249A50 0006000D */ break 6 .L80249A54: /* 13CD94 80249A54 00005012 */ mflo $t2 @@ -94,7 +94,7 @@ glabel pause_items_draw_contents /* 13CE08 80249AC8 24060001 */ addiu $a2, $zero, 1 .L80249ACC: /* 13CE0C 80249ACC 18E00277 */ blez $a3, .L8024A4AC -/* 13CE10 80249AD0 00000000 */ nop +/* 13CE10 80249AD0 00000000 */ nop /* 13CE14 80249AD4 19000275 */ blez $t0, .L8024A4AC /* 13CE18 80249AD8 2882013F */ slti $v0, $a0, 0x13f /* 13CE1C 80249ADC 10400273 */ beqz $v0, .L8024A4AC @@ -111,10 +111,10 @@ glabel pause_items_draw_contents /* 13CE40 80249B00 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* 13CE44 80249B04 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 13CE48 80249B08 44841000 */ mtc1 $a0, $f2 -/* 13CE4C 80249B0C 00000000 */ nop +/* 13CE4C 80249B0C 00000000 */ nop /* 13CE50 80249B10 468010A0 */ cvt.s.w $f2, $f2 /* 13CE54 80249B14 44860000 */ mtc1 $a2, $f0 -/* 13CE58 80249B18 00000000 */ nop +/* 13CE58 80249B18 00000000 */ nop /* 13CE5C 80249B1C 46800020 */ cvt.s.w $f0, $f0 /* 13CE60 80249B20 8FAA00AC */ lw $t2, 0xac($sp) /* 13CE64 80249B24 8FAB00B0 */ lw $t3, 0xb0($sp) @@ -125,45 +125,45 @@ glabel pause_items_draw_contents /* 13CE78 80249B38 AFA00050 */ sw $zero, 0x50($sp) /* 13CE7C 80249B3C 254A0077 */ addiu $t2, $t2, 0x77 /* 13CE80 80249B40 46041082 */ mul.s $f2, $f2, $f4 -/* 13CE84 80249B44 00000000 */ nop +/* 13CE84 80249B44 00000000 */ nop /* 13CE88 80249B48 256B0011 */ addiu $t3, $t3, 0x11 /* 13CE8C 80249B4C AFAA006C */ sw $t2, 0x6c($sp) /* 13CE90 80249B50 AFAB0070 */ sw $t3, 0x70($sp) /* 13CE94 80249B54 8C620000 */ lw $v0, ($v1) /* 13CE98 80249B58 46040002 */ mul.s $f0, $f0, $f4 -/* 13CE9C 80249B5C 00000000 */ nop +/* 13CE9C 80249B5C 00000000 */ nop /* 13CEA0 80249B60 0040282D */ daddu $a1, $v0, $zero /* 13CEA4 80249B64 24420008 */ addiu $v0, $v0, 8 /* 13CEA8 80249B68 AC620000 */ sw $v0, ($v1) /* 13CEAC 80249B6C 4600118D */ trunc.w.s $f6, $f2 /* 13CEB0 80249B70 44023000 */ mfc1 $v0, $f6 -/* 13CEB4 80249B74 00000000 */ nop +/* 13CEB4 80249B74 00000000 */ nop /* 13CEB8 80249B78 30420FFF */ andi $v0, $v0, 0xfff /* 13CEBC 80249B7C 00021300 */ sll $v0, $v0, 0xc /* 13CEC0 80249B80 4600018D */ trunc.w.s $f6, $f0 /* 13CEC4 80249B84 44033000 */ mfc1 $v1, $f6 /* 13CEC8 80249B88 44871000 */ mtc1 $a3, $f2 -/* 13CECC 80249B8C 00000000 */ nop +/* 13CECC 80249B8C 00000000 */ nop /* 13CED0 80249B90 468010A0 */ cvt.s.w $f2, $f2 /* 13CED4 80249B94 46041082 */ mul.s $f2, $f2, $f4 -/* 13CED8 80249B98 00000000 */ nop +/* 13CED8 80249B98 00000000 */ nop /* 13CEDC 80249B9C 30630FFF */ andi $v1, $v1, 0xfff /* 13CEE0 80249BA0 00641825 */ or $v1, $v1, $a0 /* 13CEE4 80249BA4 00431025 */ or $v0, $v0, $v1 /* 13CEE8 80249BA8 44880000 */ mtc1 $t0, $f0 -/* 13CEEC 80249BAC 00000000 */ nop +/* 13CEEC 80249BAC 00000000 */ nop /* 13CEF0 80249BB0 46800020 */ cvt.s.w $f0, $f0 /* 13CEF4 80249BB4 46040002 */ mul.s $f0, $f0, $f4 -/* 13CEF8 80249BB8 00000000 */ nop +/* 13CEF8 80249BB8 00000000 */ nop /* 13CEFC 80249BBC ACA20000 */ sw $v0, ($a1) /* 13CF00 80249BC0 4600118D */ trunc.w.s $f6, $f2 /* 13CF04 80249BC4 44023000 */ mfc1 $v0, $f6 -/* 13CF08 80249BC8 00000000 */ nop +/* 13CF08 80249BC8 00000000 */ nop /* 13CF0C 80249BCC 30420FFF */ andi $v0, $v0, 0xfff /* 13CF10 80249BD0 00021300 */ sll $v0, $v0, 0xc /* 13CF14 80249BD4 4600018D */ trunc.w.s $f6, $f0 /* 13CF18 80249BD8 44033000 */ mfc1 $v1, $f6 -/* 13CF1C 80249BDC 00000000 */ nop +/* 13CF1C 80249BDC 00000000 */ nop /* 13CF20 80249BE0 30630FFF */ andi $v1, $v1, 0xfff /* 13CF24 80249BE4 00431025 */ or $v0, $v0, $v1 /* 13CF28 80249BE8 ACA20004 */ sw $v0, 4($a1) @@ -176,7 +176,7 @@ glabel pause_items_draw_contents /* 13CF3C 80249BFC 8FAA007C */ lw $t2, 0x7c($sp) /* 13CF40 80249C00 91420000 */ lbu $v0, ($t2) /* 13CF44 80249C04 104000E2 */ beqz $v0, .L80249F90 -/* 13CF48 80249C08 00000000 */ nop +/* 13CF48 80249C08 00000000 */ nop /* 13CF4C 80249C0C 03C0202D */ daddu $a0, $fp, $zero /* 13CF50 80249C10 0C09260A */ jal pause_items_get_pos_y /* 13CF54 80249C14 0000282D */ daddu $a1, $zero, $zero @@ -255,10 +255,10 @@ glabel pause_items_draw_contents /* 13D068 80249D28 0C09264C */ jal pause_items_is_visible /* 13D06C 80249D2C 02E0202D */ daddu $a0, $s7, $zero /* 13D070 80249D30 1040008B */ beqz $v0, .L80249F60 -/* 13D074 80249D34 00000000 */ nop +/* 13D074 80249D34 00000000 */ nop /* 13D078 80249D38 8FAB0050 */ lw $t3, 0x50($sp) /* 13D07C 80249D3C 15600035 */ bnez $t3, .L80249E14 -/* 13D080 80249D40 00000000 */ nop +/* 13D080 80249D40 00000000 */ nop /* 13D084 80249D44 8FAA0074 */ lw $t2, 0x74($sp) /* 13D088 80249D48 11400016 */ beqz $t2, .L80249DA4 /* 13D08C 80249D4C 00161400 */ sll $v0, $s6, 0x10 @@ -290,9 +290,9 @@ glabel pause_items_draw_contents /* 13D0F0 80249DB0 004B8821 */ addu $s1, $v0, $t3 /* 13D0F4 80249DB4 8E220000 */ lw $v0, ($s1) /* 13D0F8 80249DB8 10400016 */ beqz $v0, .L80249E14 -/* 13D0FC 80249DBC 00000000 */ nop +/* 13D0FC 80249DBC 00000000 */ nop /* 13D100 80249DC0 18400014 */ blez $v0, .L80249E14 -/* 13D104 80249DC4 00000000 */ nop +/* 13D104 80249DC4 00000000 */ nop /* 13D108 80249DC8 0C09265A */ jal pause_items_scroll_offset_x /* 13D10C 80249DCC 8FA40068 */ lw $a0, 0x68($sp) /* 13D110 80249DD0 8FAA006C */ lw $t2, 0x6c($sp) @@ -312,7 +312,7 @@ glabel pause_items_draw_contents /* 13D148 80249E08 00553021 */ addu $a2, $v0, $s5 .L80249E0C: /* 13D14C 80249E0C 0C04993B */ jal draw_string -/* 13D150 80249E10 00000000 */ nop +/* 13D150 80249E10 00000000 */ nop .L80249E14: /* 13D154 80249E14 8FAA0050 */ lw $t2, 0x50($sp) /* 13D158 80249E18 240B0001 */ addiu $t3, $zero, 1 @@ -327,11 +327,11 @@ glabel pause_items_draw_contents /* 13D17C 80249E3C 34058000 */ ori $a1, $zero, 0x8000 /* 13D180 80249E40 8FAB0074 */ lw $t3, 0x74($sp) /* 13D184 80249E44 11600005 */ beqz $t3, .L80249E5C -/* 13D188 80249E48 00000000 */ nop +/* 13D188 80249E48 00000000 */ nop /* 13D18C 80249E4C 3C118027 */ lui $s1, %hi(D_80270634) /* 13D190 80249E50 8E310634 */ lw $s1, %lo(D_80270634)($s1) /* 13D194 80249E54 080927B9 */ j .L80249EE4 -/* 13D198 80249E58 00000000 */ nop +/* 13D198 80249E58 00000000 */ nop .L80249E5C: /* 13D19C 80249E5C 12600010 */ beqz $s3, .L80249EA0 /* 13D1A0 80249E60 0220202D */ daddu $a0, $s1, $zero @@ -371,7 +371,7 @@ glabel pause_items_draw_contents .L80249EE4: /* 13D224 80249EE4 8FA40068 */ lw $a0, 0x68($sp) /* 13D228 80249EE8 0C09265A */ jal pause_items_scroll_offset_x -/* 13D22C 80249EEC 00000000 */ nop +/* 13D22C 80249EEC 00000000 */ nop /* 13D230 80249EF0 02E0202D */ daddu $a0, $s7, $zero /* 13D234 80249EF4 8FAA00AC */ lw $t2, 0xac($sp) /* 13D238 80249EF8 24500069 */ addiu $s0, $v0, 0x69 @@ -387,11 +387,11 @@ glabel pause_items_draw_contents /* 13D260 80249F20 00553021 */ addu $a2, $v0, $s5 /* 13D264 80249F24 8FAA0054 */ lw $t2, 0x54($sp) /* 13D268 80249F28 15400005 */ bnez $t2, .L80249F40 -/* 13D26C 80249F2C 00000000 */ nop +/* 13D26C 80249F2C 00000000 */ nop /* 13D270 80249F30 0C0511F8 */ jal draw_icon_2 /* 13D274 80249F34 0220202D */ daddu $a0, $s1, $zero /* 13D278 80249F38 080927D2 */ j .L80249F48 -/* 13D27C 80249F3C 00000000 */ nop +/* 13D27C 80249F3C 00000000 */ nop .L80249F40: /* 13D280 80249F40 0C0511F1 */ jal draw_icon_1 /* 13D284 80249F44 0220202D */ daddu $a0, $s1, $zero @@ -408,7 +408,7 @@ glabel pause_items_draw_contents /* 13D2A8 80249F68 26520001 */ addiu $s2, $s2, 1 /* 13D2AC 80249F6C 0242102A */ slt $v0, $s2, $v0 /* 13D2B0 80249F70 1440FF33 */ bnez $v0, .L80249C40 -/* 13D2B4 80249F74 00000000 */ nop +/* 13D2B4 80249F74 00000000 */ nop .L80249F78: /* 13D2B8 80249F78 27DE0001 */ addiu $fp, $fp, 1 /* 13D2BC 80249F7C 8FAA007C */ lw $t2, 0x7c($sp) @@ -449,7 +449,7 @@ glabel pause_items_draw_contents /* 13D340 8024A000 24060001 */ addiu $a2, $zero, 1 .L8024A004: /* 13D344 8024A004 18E00129 */ blez $a3, .L8024A4AC -/* 13D348 8024A008 00000000 */ nop +/* 13D348 8024A008 00000000 */ nop /* 13D34C 8024A00C 19000127 */ blez $t0, .L8024A4AC /* 13D350 8024A010 2882013F */ slti $v0, $a0, 0x13f /* 13D354 8024A014 10400125 */ beqz $v0, .L8024A4AC @@ -466,47 +466,47 @@ glabel pause_items_draw_contents /* 13D378 8024A038 3C014080 */ lui $at, 0x4080 /* 13D37C 8024A03C 44812000 */ mtc1 $at, $f4 /* 13D380 8024A040 44840000 */ mtc1 $a0, $f0 -/* 13D384 8024A044 00000000 */ nop +/* 13D384 8024A044 00000000 */ nop /* 13D388 8024A048 46800020 */ cvt.s.w $f0, $f0 /* 13D38C 8024A04C 46040002 */ mul.s $f0, $f0, $f4 -/* 13D390 8024A050 00000000 */ nop +/* 13D390 8024A050 00000000 */ nop /* 13D394 8024A054 24A20008 */ addiu $v0, $a1, 8 /* 13D398 8024A058 44861000 */ mtc1 $a2, $f2 -/* 13D39C 8024A05C 00000000 */ nop +/* 13D39C 8024A05C 00000000 */ nop /* 13D3A0 8024A060 468010A0 */ cvt.s.w $f2, $f2 /* 13D3A4 8024A064 3C04ED00 */ lui $a0, 0xed00 /* 13D3A8 8024A068 46041082 */ mul.s $f2, $f2, $f4 -/* 13D3AC 8024A06C 00000000 */ nop +/* 13D3AC 8024A06C 00000000 */ nop /* 13D3B0 8024A070 AD220000 */ sw $v0, ($t1) /* 13D3B4 8024A074 4600018D */ trunc.w.s $f6, $f0 /* 13D3B8 8024A078 44023000 */ mfc1 $v0, $f6 -/* 13D3BC 8024A07C 00000000 */ nop +/* 13D3BC 8024A07C 00000000 */ nop /* 13D3C0 8024A080 30420FFF */ andi $v0, $v0, 0xfff /* 13D3C4 8024A084 00021300 */ sll $v0, $v0, 0xc /* 13D3C8 8024A088 4600118D */ trunc.w.s $f6, $f2 /* 13D3CC 8024A08C 44033000 */ mfc1 $v1, $f6 /* 13D3D0 8024A090 44871000 */ mtc1 $a3, $f2 -/* 13D3D4 8024A094 00000000 */ nop +/* 13D3D4 8024A094 00000000 */ nop /* 13D3D8 8024A098 468010A0 */ cvt.s.w $f2, $f2 /* 13D3DC 8024A09C 46041082 */ mul.s $f2, $f2, $f4 -/* 13D3E0 8024A0A0 00000000 */ nop +/* 13D3E0 8024A0A0 00000000 */ nop /* 13D3E4 8024A0A4 30630FFF */ andi $v1, $v1, 0xfff /* 13D3E8 8024A0A8 00641825 */ or $v1, $v1, $a0 /* 13D3EC 8024A0AC 00431025 */ or $v0, $v0, $v1 /* 13D3F0 8024A0B0 44880000 */ mtc1 $t0, $f0 -/* 13D3F4 8024A0B4 00000000 */ nop +/* 13D3F4 8024A0B4 00000000 */ nop /* 13D3F8 8024A0B8 46800020 */ cvt.s.w $f0, $f0 /* 13D3FC 8024A0BC 46040002 */ mul.s $f0, $f0, $f4 -/* 13D400 8024A0C0 00000000 */ nop +/* 13D400 8024A0C0 00000000 */ nop /* 13D404 8024A0C4 ACA20000 */ sw $v0, ($a1) /* 13D408 8024A0C8 4600118D */ trunc.w.s $f6, $f2 /* 13D40C 8024A0CC 44023000 */ mfc1 $v0, $f6 -/* 13D410 8024A0D0 00000000 */ nop +/* 13D410 8024A0D0 00000000 */ nop /* 13D414 8024A0D4 30420FFF */ andi $v0, $v0, 0xfff /* 13D418 8024A0D8 00021300 */ sll $v0, $v0, 0xc /* 13D41C 8024A0DC 4600018D */ trunc.w.s $f6, $f0 /* 13D420 8024A0E0 44033000 */ mfc1 $v1, $f6 -/* 13D424 8024A0E4 00000000 */ nop +/* 13D424 8024A0E4 00000000 */ nop /* 13D428 8024A0E8 30630FFF */ andi $v1, $v1, 0xfff /* 13D42C 8024A0EC 00431025 */ or $v0, $v0, $v1 /* 13D430 8024A0F0 3C038027 */ lui $v1, %hi(gPauseMenuCurrentTab) @@ -518,7 +518,7 @@ glabel pause_items_draw_contents /* 13D448 8024A108 3C038027 */ lui $v1, %hi(gItemMenuLevel) /* 13D44C 8024A10C 8C6305E0 */ lw $v1, %lo(gItemMenuLevel)($v1) /* 13D450 8024A110 14620026 */ bne $v1, $v0, .L8024A1AC -/* 13D454 8024A114 00000000 */ nop +/* 13D454 8024A114 00000000 */ nop /* 13D458 8024A118 3C118027 */ lui $s1, %hi(gItemMenuCurrentPage) /* 13D45C 8024A11C 263104C8 */ addiu $s1, $s1, %lo(gItemMenuCurrentPage) /* 13D460 8024A120 8E220000 */ lw $v0, ($s1) @@ -534,7 +534,7 @@ glabel pause_items_draw_contents /* 13D488 8024A148 2546000E */ addiu $a2, $t2, 0xe /* 13D48C 8024A14C 8E040040 */ lw $a0, 0x40($s0) /* 13D490 8024A150 0C0511F8 */ jal draw_icon_2 -/* 13D494 8024A154 00000000 */ nop +/* 13D494 8024A154 00000000 */ nop /* 13D498 8024A158 8E220000 */ lw $v0, ($s1) /* 13D49C 8024A15C 24420001 */ addiu $v0, $v0, 1 .L8024A160: @@ -545,7 +545,7 @@ glabel pause_items_draw_contents /* 13D4B0 8024A170 00431021 */ addu $v0, $v0, $v1 /* 13D4B4 8024A174 904204D0 */ lbu $v0, %lo(gItemMenuPages)($v0) /* 13D4B8 8024A178 1040000C */ beqz $v0, .L8024A1AC -/* 13D4BC 8024A17C 00000000 */ nop +/* 13D4BC 8024A17C 00000000 */ nop /* 13D4C0 8024A180 3C108027 */ lui $s0, %hi(D_802705E8) /* 13D4C4 8024A184 261005E8 */ addiu $s0, $s0, %lo(D_802705E8) /* 13D4C8 8024A188 8FAB00AC */ lw $t3, 0xac($sp) @@ -556,7 +556,7 @@ glabel pause_items_draw_contents /* 13D4DC 8024A19C 25460092 */ addiu $a2, $t2, 0x92 /* 13D4E0 8024A1A0 8E040044 */ lw $a0, 0x44($s0) /* 13D4E4 8024A1A4 0C0511F8 */ jal draw_icon_2 -/* 13D4E8 8024A1A8 00000000 */ nop +/* 13D4E8 8024A1A8 00000000 */ nop .L8024A1AC: /* 13D4EC 8024A1AC 3C038027 */ lui $v1, %hi(gItemMenuCurrentTab) /* 13D4F0 8024A1B0 8C6305E4 */ lw $v1, %lo(gItemMenuCurrentTab)($v1) @@ -682,7 +682,7 @@ glabel pause_items_draw_contents /* 13D6A8 8024A368 806300D4 */ lb $v1, %lo(gPauseMenuCurrentTab)($v1) /* 13D6AC 8024A36C 24020003 */ addiu $v0, $zero, 3 /* 13D6B0 8024A370 1462004E */ bne $v1, $v0, .L8024A4AC -/* 13D6B4 8024A374 00000000 */ nop +/* 13D6B4 8024A374 00000000 */ nop /* 13D6B8 8024A378 3C028027 */ lui $v0, %hi(gItemMenuLevel) /* 13D6BC 8024A37C 8C4205E0 */ lw $v0, %lo(gItemMenuLevel)($v0) /* 13D6C0 8024A380 14400008 */ bnez $v0, .L8024A3A4 @@ -755,7 +755,7 @@ glabel pause_items_draw_contents /* 13D7C0 8024A480 0C090AEB */ jal func_80242BAC /* 13D7C4 8024A484 01463021 */ addu $a2, $t2, $a2 /* 13D7C8 8024A488 0809292B */ j .L8024A4AC -/* 13D7CC 8024A48C 00000000 */ nop +/* 13D7CC 8024A48C 00000000 */ nop .L8024A490: /* 13D7D0 8024A490 26050055 */ addiu $a1, $s0, 0x55 /* 13D7D4 8024A494 24C60017 */ addiu $a2, $a2, 0x17 diff --git a/asm/nonmatchings/code_13CAF0/pause_items_handle_input.s b/asm/nonmatchings/code_13CAF0/pause_items_handle_input.s index 1973c51931..465ea10270 100644 --- a/asm/nonmatchings/code_13CAF0/pause_items_handle_input.s +++ b/asm/nonmatchings/code_13CAF0/pause_items_handle_input.s @@ -26,13 +26,13 @@ glabel pause_items_handle_input /* 13DB68 8024A828 14610004 */ bne $v1, $at, .L8024A83C /* 13DB6C 8024A82C 3C018000 */ lui $at, 0x8000 /* 13DB70 8024A830 15210002 */ bne $t1, $at, .L8024A83C -/* 13DB74 8024A834 00000000 */ nop +/* 13DB74 8024A834 00000000 */ nop /* 13DB78 8024A838 0006000D */ break 6 .L8024A83C: /* 13DB7C 8024A83C 00002812 */ mflo $a1 /* 13DB80 8024A840 00004010 */ mfhi $t0 /* 13DB84 8024A844 10400015 */ beqz $v0, .L8024A89C -/* 13DB88 8024A848 00000000 */ nop +/* 13DB88 8024A848 00000000 */ nop /* 13DB8C 8024A84C 3C048027 */ lui $a0, %hi(gItemMenuLevel) /* 13DB90 8024A850 248405E0 */ addiu $a0, $a0, %lo(gItemMenuLevel) /* 13DB94 8024A854 8C820000 */ lw $v0, ($a0) @@ -47,18 +47,18 @@ glabel pause_items_handle_input /* 13DBB8 8024A878 0C05272D */ jal play_sound /* 13DBBC 8024A87C 2404021D */ addiu $a0, $zero, 0x21d /* 13DBC0 8024A880 08092B11 */ j .L8024AC44 -/* 13DBC4 8024A884 00000000 */ nop +/* 13DBC4 8024A884 00000000 */ nop .L8024A888: /* 13DBC8 8024A888 AC820000 */ sw $v0, ($a0) /* 13DBCC 8024A88C 0C05272D */ jal play_sound /* 13DBD0 8024A890 240400C9 */ addiu $a0, $zero, 0xc9 /* 13DBD4 8024A894 08092B11 */ j .L8024AC44 -/* 13DBD8 8024A898 00000000 */ nop +/* 13DBD8 8024A898 00000000 */ nop .L8024A89C: /* 13DBDC 8024A89C 3C028027 */ lui $v0, %hi(gItemMenuNumItems) /* 13DBE0 8024A8A0 844205CC */ lh $v0, %lo(gItemMenuNumItems)($v0) /* 13DBE4 8024A8A4 104000B1 */ beqz $v0, .L8024AB6C -/* 13DBE8 8024A8A8 00000000 */ nop +/* 13DBE8 8024A8A8 00000000 */ nop /* 13DBEC 8024A8AC 3C028027 */ lui $v0, %hi(gItemMenuLevel) /* 13DBF0 8024A8B0 8C4205E0 */ lw $v0, %lo(gItemMenuLevel)($v0) /* 13DBF4 8024A8B4 14400015 */ bnez $v0, .L8024A90C @@ -76,14 +76,14 @@ glabel pause_items_handle_input .L8024A8E4: /* 13DC24 8024A8E4 8E020000 */ lw $v0, ($s0) /* 13DC28 8024A8E8 106200A0 */ beq $v1, $v0, .L8024AB6C -/* 13DC2C 8024A8EC 00000000 */ nop +/* 13DC2C 8024A8EC 00000000 */ nop /* 13DC30 8024A8F0 0C05272D */ jal play_sound /* 13DC34 8024A8F4 240400C8 */ addiu $a0, $zero, 0xc8 /* 13DC38 8024A8F8 8E040000 */ lw $a0, ($s0) /* 13DC3C 8024A8FC 0C092937 */ jal pause_items_load_items -/* 13DC40 8024A900 00000000 */ nop +/* 13DC40 8024A900 00000000 */ nop /* 13DC44 8024A904 08092ADB */ j .L8024AB6C -/* 13DC48 8024A908 00000000 */ nop +/* 13DC48 8024A908 00000000 */ nop .L8024A90C: /* 13DC4C 8024A90C 3C038027 */ lui $v1, %hi(gPauseMenuHeldButtons) /* 13DC50 8024A910 8C6300C0 */ lw $v1, %lo(gPauseMenuHeldButtons)($v1) @@ -137,7 +137,7 @@ glabel pause_items_handle_input /* 13DD00 8024A9C0 3C020002 */ lui $v0, 2 /* 13DD04 8024A9C4 00621024 */ and $v0, $v1, $v0 /* 13DD08 8024A9C8 1040001C */ beqz $v0, .L8024AA3C -/* 13DD0C 8024A9CC 00000000 */ nop +/* 13DD0C 8024A9CC 00000000 */ nop /* 13DD10 8024A9D0 3C068027 */ lui $a2, %hi(gItemMenuCurrentPage) /* 13DD14 8024A9D4 24C604C8 */ addiu $a2, $a2, %lo(gItemMenuCurrentPage) /* 13DD18 8024A9D8 8CC40000 */ lw $a0, ($a2) @@ -161,7 +161,7 @@ glabel pause_items_handle_input /* 13DD60 8024AA20 ACC20000 */ sw $v0, ($a2) /* 13DD64 8024AA24 90620000 */ lbu $v0, ($v1) /* 13DD68 8024AA28 14400015 */ bnez $v0, .L8024AA80 -/* 13DD6C 8024AA2C 00000000 */ nop +/* 13DD6C 8024AA2C 00000000 */ nop /* 13DD70 8024AA30 ACC40000 */ sw $a0, ($a2) /* 13DD74 8024AA34 08092AA0 */ j .L8024AA80 /* 13DD78 8024AA38 24A5FFFF */ addiu $a1, $a1, -1 @@ -179,7 +179,7 @@ glabel pause_items_handle_input /* 13DDA4 8024AA64 00441821 */ addu $v1, $v0, $a0 /* 13DDA8 8024AA68 90620000 */ lbu $v0, ($v1) /* 13DDAC 8024AA6C 14400003 */ bnez $v0, .L8024AA7C -/* 13DDB0 8024AA70 00000000 */ nop +/* 13DDB0 8024AA70 00000000 */ nop /* 13DDB4 8024AA74 08092AA0 */ j .L8024AA80 /* 13DDB8 8024AA78 ACC70000 */ sw $a3, ($a2) .L8024AA7C: @@ -211,15 +211,15 @@ glabel pause_items_handle_input /* 13DE1C 8024AADC 0502000B */ bltzl $t0, .L8024AB0C /* 13DE20 8024AAE0 2488FFFF */ addiu $t0, $a0, -1 /* 13DE24 8024AAE4 08092AC3 */ j .L8024AB0C -/* 13DE28 8024AAE8 00000000 */ nop +/* 13DE28 8024AAE8 00000000 */ nop .L8024AAEC: /* 13DE2C 8024AAEC 00621024 */ and $v0, $v1, $v0 /* 13DE30 8024AAF0 10400006 */ beqz $v0, .L8024AB0C -/* 13DE34 8024AAF4 00000000 */ nop +/* 13DE34 8024AAF4 00000000 */ nop /* 13DE38 8024AAF8 25080001 */ addiu $t0, $t0, 1 /* 13DE3C 8024AAFC 0104102A */ slt $v0, $t0, $a0 /* 13DE40 8024AB00 14400002 */ bnez $v0, .L8024AB0C -/* 13DE44 8024AB04 00000000 */ nop +/* 13DE44 8024AB04 00000000 */ nop .L8024AB08: /* 13DE48 8024AB08 0000402D */ daddu $t0, $zero, $zero .L8024AB0C: @@ -253,13 +253,13 @@ glabel pause_items_handle_input /* 13DEB0 8024AB70 8C4205E0 */ lw $v0, %lo(gItemMenuLevel)($v0) /* 13DEB4 8024AB74 24030001 */ addiu $v1, $zero, 1 /* 13DEB8 8024AB78 14430014 */ bne $v0, $v1, .L8024ABCC -/* 13DEBC 8024AB7C 00000000 */ nop +/* 13DEBC 8024AB7C 00000000 */ nop /* 13DEC0 8024AB80 3C038027 */ lui $v1, %hi(gItemMenuSelectedItemID) /* 13DEC4 8024AB84 8C6305C8 */ lw $v1, %lo(gItemMenuSelectedItemID)($v1) /* 13DEC8 8024AB88 24628002 */ addiu $v0, $v1, -0x7ffe /* 13DECC 8024AB8C 2C420002 */ sltiu $v0, $v0, 2 /* 13DED0 8024AB90 1440000A */ bnez $v0, .L8024ABBC -/* 13DED4 8024AB94 00000000 */ nop +/* 13DED4 8024AB94 00000000 */ nop /* 13DED8 8024AB98 10600008 */ beqz $v1, .L8024ABBC /* 13DEDC 8024AB9C 00031140 */ sll $v0, $v1, 5 /* 13DEE0 8024ABA0 3C018008 */ lui $at, %hi(gItemTable+0x10) @@ -268,12 +268,12 @@ glabel pause_items_handle_input /* 13DEEC 8024ABAC 3C018027 */ lui $at, %hi(gPauseMenuCurrentDescString) /* 13DEF0 8024ABB0 AC2200C8 */ sw $v0, %lo(gPauseMenuCurrentDescString)($at) /* 13DEF4 8024ABB4 08092AFE */ j .L8024ABF8 -/* 13DEF8 8024ABB8 00000000 */ nop +/* 13DEF8 8024ABB8 00000000 */ nop .L8024ABBC: /* 13DEFC 8024ABBC 3C018027 */ lui $at, %hi(gPauseMenuCurrentDescString) /* 13DF00 8024ABC0 AC2000C8 */ sw $zero, %lo(gPauseMenuCurrentDescString)($at) /* 13DF04 8024ABC4 08092AFC */ j .L8024ABF0 -/* 13DF08 8024ABC8 00000000 */ nop +/* 13DF08 8024ABC8 00000000 */ nop .L8024ABCC: /* 13DF0C 8024ABCC 3C028027 */ lui $v0, %hi(gItemMenuCurrentTab) /* 13DF10 8024ABD0 8C4205E4 */ lw $v0, %lo(gItemMenuCurrentTab)($v0) @@ -282,7 +282,7 @@ glabel pause_items_handle_input /* 13DF1C 8024ABDC 24040051 */ addiu $a0, $zero, 0x51 .L8024ABE0: /* 13DF20 8024ABE0 0C093BA0 */ jal pause_get_menu_string -/* 13DF24 8024ABE4 00000000 */ nop +/* 13DF24 8024ABE4 00000000 */ nop /* 13DF28 8024ABE8 3C018027 */ lui $at, %hi(gPauseMenuCurrentDescString) /* 13DF2C 8024ABEC AC2200C8 */ sw $v0, %lo(gPauseMenuCurrentDescString)($at) .L8024ABF0: @@ -293,18 +293,18 @@ glabel pause_items_handle_input /* 13DF3C 8024ABFC 8C4200C4 */ lw $v0, %lo(gPauseMenuPressedButtons)($v0) /* 13DF40 8024AC00 30424000 */ andi $v0, $v0, 0x4000 /* 13DF44 8024AC04 1040000F */ beqz $v0, .L8024AC44 -/* 13DF48 8024AC08 00000000 */ nop +/* 13DF48 8024AC08 00000000 */ nop /* 13DF4C 8024AC0C 3C108027 */ lui $s0, %hi(gItemMenuLevel) /* 13DF50 8024AC10 261005E0 */ addiu $s0, $s0, %lo(gItemMenuLevel) /* 13DF54 8024AC14 8E020000 */ lw $v0, ($s0) /* 13DF58 8024AC18 14400007 */ bnez $v0, .L8024AC38 -/* 13DF5C 8024AC1C 00000000 */ nop +/* 13DF5C 8024AC1C 00000000 */ nop /* 13DF60 8024AC20 0C05272D */ jal play_sound /* 13DF64 8024AC24 240400CA */ addiu $a0, $zero, 0xca /* 13DF68 8024AC28 3C018027 */ lui $at, %hi(gPauseMenuCurrentTab) /* 13DF6C 8024AC2C A02000D4 */ sb $zero, %lo(gPauseMenuCurrentTab)($at) /* 13DF70 8024AC30 08092B11 */ j .L8024AC44 -/* 13DF74 8024AC34 00000000 */ nop +/* 13DF74 8024AC34 00000000 */ nop .L8024AC38: /* 13DF78 8024AC38 0C05272D */ jal play_sound /* 13DF7C 8024AC3C 240400CA */ addiu $a0, $zero, 0xca diff --git a/asm/nonmatchings/code_13CAF0/pause_items_load_items.s b/asm/nonmatchings/code_13CAF0/pause_items_load_items.s index 0441bc247e..2970e35a19 100644 --- a/asm/nonmatchings/code_13CAF0/pause_items_load_items.s +++ b/asm/nonmatchings/code_13CAF0/pause_items_load_items.s @@ -29,7 +29,7 @@ glabel pause_items_load_items /* 13D874 8024A534 1440FFF7 */ bnez $v0, .L8024A514 /* 13D878 8024A538 24C60002 */ addiu $a2, $a2, 2 /* 13D87C 8024A53C 0809295F */ j .L8024A57C -/* 13D880 8024A540 00000000 */ nop +/* 13D880 8024A540 00000000 */ nop .L8024A544: /* 13D884 8024A544 0000202D */ daddu $a0, $zero, $zero /* 13D888 8024A548 0060302D */ daddu $a2, $v1, $zero diff --git a/asm/nonmatchings/code_13CAF0/pause_items_update.s b/asm/nonmatchings/code_13CAF0/pause_items_update.s index 0150768b79..9b26c82319 100644 --- a/asm/nonmatchings/code_13CAF0/pause_items_update.s +++ b/asm/nonmatchings/code_13CAF0/pause_items_update.s @@ -24,7 +24,7 @@ glabel pause_items_update /* 13DFDC 8024AC9C 14610004 */ bne $v1, $at, .L8024ACB0 /* 13DFE0 8024ACA0 3C018000 */ lui $at, 0x8000 /* 13DFE4 8024ACA4 14410002 */ bne $v0, $at, .L8024ACB0 -/* 13DFE8 8024ACA8 00000000 */ nop +/* 13DFE8 8024ACA8 00000000 */ nop /* 13DFEC 8024ACAC 0006000D */ break 6 .L8024ACB0: /* 13DFF0 8024ACB0 00001012 */ mflo $v0 @@ -32,16 +32,16 @@ glabel pause_items_update /* 13DFF8 8024ACB8 00432023 */ subu $a0, $v0, $v1 /* 13DFFC 8024ACBC 28820002 */ slti $v0, $a0, 2 /* 13E000 8024ACC0 14400005 */ bnez $v0, .L8024ACD8 -/* 13E004 8024ACC4 00000000 */ nop +/* 13E004 8024ACC4 00000000 */ nop /* 13E008 8024ACC8 90C20003 */ lbu $v0, 3($a2) /* 13E00C 8024ACCC 2C420009 */ sltiu $v0, $v0, 9 /* 13E010 8024ACD0 10400005 */ beqz $v0, .L8024ACE8 -/* 13E014 8024ACD4 00000000 */ nop +/* 13E014 8024ACD4 00000000 */ nop .L8024ACD8: /* 13E018 8024ACD8 3C018027 */ lui $at, %hi(D_802705DC) /* 13E01C 8024ACDC AC2005DC */ sw $zero, %lo(D_802705DC)($at) /* 13E020 8024ACE0 08092B4D */ j .L8024AD34 -/* 13E024 8024ACE4 00000000 */ nop +/* 13E024 8024ACE4 00000000 */ nop .L8024ACE8: /* 13E028 8024ACE8 90C30003 */ lbu $v1, 3($a2) /* 13E02C 8024ACEC 2462FFFE */ addiu $v0, $v1, -2 @@ -51,7 +51,7 @@ glabel pause_items_update /* 13E03C 8024ACFC 3C018027 */ lui $at, %hi(D_802705DC) /* 13E040 8024AD00 AC2205DC */ sw $v0, %lo(D_802705DC)($at) /* 13E044 8024AD04 08092B4D */ j .L8024AD34 -/* 13E048 8024AD08 00000000 */ nop +/* 13E048 8024AD08 00000000 */ nop .L8024AD0C: /* 13E04C 8024AD0C 3C058027 */ lui $a1, %hi(D_802705DC) /* 13E050 8024AD10 24A505DC */ addiu $a1, $a1, %lo(D_802705DC) @@ -73,7 +73,7 @@ glabel pause_items_update /* 13E088 8024AD48 8C8404C8 */ lw $a0, %lo(gItemMenuCurrentPage)($a0) /* 13E08C 8024AD4C 00002812 */ mflo $a1 /* 13E090 8024AD50 0C09260A */ jal pause_items_get_pos_y -/* 13E094 8024AD54 00000000 */ nop +/* 13E094 8024AD54 00000000 */ nop /* 13E098 8024AD58 3C108027 */ lui $s0, %hi(gItemMenuCurrentScrollPos) /* 13E09C 8024AD5C 261005D4 */ addiu $s0, $s0, %lo(gItemMenuCurrentScrollPos) /* 13E0A0 8024AD60 8E040000 */ lw $a0, ($s0) diff --git a/asm/nonmatchings/code_13E120/pause_partners_cleanup.s b/asm/nonmatchings/code_13E120/pause_partners_cleanup.s index 39682a135d..cbf044421c 100644 --- a/asm/nonmatchings/code_13E120/pause_partners_cleanup.s +++ b/asm/nonmatchings/code_13E120/pause_partners_cleanup.s @@ -16,7 +16,7 @@ glabel pause_partners_cleanup /* 13FCEC 8024C9AC 26100001 */ addiu $s0, $s0, 1 /* 13FCF0 8024C9B0 2A020008 */ slti $v0, $s0, 8 /* 13FCF4 8024C9B4 1440FFFA */ bnez $v0, .L8024C9A0 -/* 13FCF8 8024C9B8 00000000 */ nop +/* 13FCF8 8024C9B8 00000000 */ nop /* 13FCFC 8024C9BC 0000802D */ daddu $s0, $zero, $zero /* 13FD00 8024C9C0 3C118027 */ lui $s1, %hi(D_80270660) /* 13FD04 8024C9C4 26310660 */ addiu $s1, $s1, %lo(D_80270660) @@ -27,11 +27,11 @@ glabel pause_partners_cleanup /* 13FD14 8024C9D4 26100001 */ addiu $s0, $s0, 1 /* 13FD18 8024C9D8 2A020008 */ slti $v0, $s0, 8 /* 13FD1C 8024C9DC 1440FFFA */ bnez $v0, .L8024C9C8 -/* 13FD20 8024C9E0 00000000 */ nop +/* 13FD20 8024C9E0 00000000 */ nop /* 13FD24 8024C9E4 8FBF0018 */ lw $ra, 0x18($sp) /* 13FD28 8024C9E8 8FB10014 */ lw $s1, 0x14($sp) /* 13FD2C 8024C9EC 8FB00010 */ lw $s0, 0x10($sp) /* 13FD30 8024C9F0 03E00008 */ jr $ra /* 13FD34 8024C9F4 27BD0020 */ addiu $sp, $sp, 0x20 -/* 13FD38 8024C9F8 00000000 */ nop -/* 13FD3C 8024C9FC 00000000 */ nop +/* 13FD38 8024C9F8 00000000 */ nop +/* 13FD3C 8024C9FC 00000000 */ nop diff --git a/asm/nonmatchings/code_13E120/pause_partners_draw_contents.s b/asm/nonmatchings/code_13E120/pause_partners_draw_contents.s index 3296dca062..52ab98e1ba 100644 --- a/asm/nonmatchings/code_13E120/pause_partners_draw_contents.s +++ b/asm/nonmatchings/code_13E120/pause_partners_draw_contents.s @@ -125,19 +125,19 @@ glabel pause_partners_draw_contents /* 13E410 8024B0D0 14410004 */ bne $v0, $at, .L8024B0E4 /* 13E414 8024B0D4 3C018000 */ lui $at, 0x8000 /* 13E418 8024B0D8 16610002 */ bne $s3, $at, .L8024B0E4 -/* 13E41C 8024B0DC 00000000 */ nop +/* 13E41C 8024B0DC 00000000 */ nop /* 13E420 8024B0E0 0006000D */ break 6 .L8024B0E4: /* 13E424 8024B0E4 00001012 */ mflo $v0 /* 13E428 8024B0E8 3C018027 */ lui $at, %hi(D_802706A8) /* 13E42C 8024B0EC C42006A8 */ lwc1 $f0, %lo(D_802706A8)($at) /* 13E430 8024B0F0 44826000 */ mtc1 $v0, $f12 -/* 13E434 8024B0F4 00000000 */ nop +/* 13E434 8024B0F4 00000000 */ nop /* 13E438 8024B0F8 46806320 */ cvt.s.w $f12, $f12 /* 13E43C 8024B0FC 0C00A8D4 */ jal cos_deg /* 13E440 8024B100 46006301 */ sub.s $f12, $f12, $f0 /* 13E444 8024B104 46160002 */ mul.s $f0, $f0, $f22 -/* 13E448 8024B108 00000000 */ nop +/* 13E448 8024B108 00000000 */ nop /* 13E44C 8024B10C 0000882D */ daddu $s1, $zero, $zero /* 13E450 8024B110 1A00000B */ blez $s0, .L8024B140 /* 13E454 8024B114 46140080 */ add.s $f2, $f0, $f20 @@ -145,9 +145,9 @@ glabel pause_partners_draw_contents .L8024B11C: /* 13E45C 8024B11C C4600000 */ lwc1 $f0, ($v1) /* 13E460 8024B120 4600103C */ c.lt.s $f2, $f0 -/* 13E464 8024B124 00000000 */ nop +/* 13E464 8024B124 00000000 */ nop /* 13E468 8024B128 45010005 */ bc1t .L8024B140 -/* 13E46C 8024B12C 00000000 */ nop +/* 13E46C 8024B12C 00000000 */ nop /* 13E470 8024B130 26310001 */ addiu $s1, $s1, 1 /* 13E474 8024B134 0230102A */ slt $v0, $s1, $s0 /* 13E478 8024B138 1440FFF8 */ bnez $v0, .L8024B11C @@ -214,26 +214,26 @@ glabel pause_partners_draw_contents /* 13E554 8024B214 14810004 */ bne $a0, $at, .L8024B228 /* 13E558 8024B218 3C018000 */ lui $at, 0x8000 /* 13E55C 8024B21C 14410002 */ bne $v0, $at, .L8024B228 -/* 13E560 8024B220 00000000 */ nop +/* 13E560 8024B220 00000000 */ nop /* 13E564 8024B224 0006000D */ break 6 .L8024B228: /* 13E568 8024B228 00001012 */ mflo $v0 /* 13E56C 8024B22C 3C018027 */ lui $at, %hi(D_802706A8) /* 13E570 8024B230 C42006A8 */ lwc1 $f0, %lo(D_802706A8)($at) /* 13E574 8024B234 4482A000 */ mtc1 $v0, $f20 -/* 13E578 8024B238 00000000 */ nop +/* 13E578 8024B238 00000000 */ nop /* 13E57C 8024B23C 4680A520 */ cvt.s.w $f20, $f20 /* 13E580 8024B240 00041040 */ sll $v0, $a0, 1 /* 13E584 8024B244 00441021 */ addu $v0, $v0, $a0 /* 13E588 8024B248 4600A501 */ sub.s $f20, $f20, $f0 /* 13E58C 8024B24C 24420011 */ addiu $v0, $v0, 0x11 /* 13E590 8024B250 4482B000 */ mtc1 $v0, $f22 -/* 13E594 8024B254 00000000 */ nop +/* 13E594 8024B254 00000000 */ nop /* 13E598 8024B258 4680B5A0 */ cvt.s.w $f22, $f22 /* 13E59C 8024B25C 0C00A8BB */ jal sin_deg /* 13E5A0 8024B260 4600A306 */ mov.s $f12, $f20 /* 13E5A4 8024B264 4600B582 */ mul.s $f22, $f22, $f0 -/* 13E5A8 8024B268 00000000 */ nop +/* 13E5A8 8024B268 00000000 */ nop /* 13E5AC 8024B26C 3C014228 */ lui $at, 0x4228 /* 13E5B0 8024B270 44810000 */ mtc1 $at, $f0 /* 13E5B4 8024B274 4600A306 */ mov.s $f12, $f20 @@ -241,21 +241,21 @@ glabel pause_partners_draw_contents /* 13E5BC 8024B27C 4600B580 */ add.s $f22, $f22, $f0 /* 13E5C0 8024B280 3C0141F0 */ lui $at, 0x41f0 /* 13E5C4 8024B284 44811000 */ mtc1 $at, $f2 -/* 13E5C8 8024B288 00000000 */ nop +/* 13E5C8 8024B288 00000000 */ nop /* 13E5CC 8024B28C 46020002 */ mul.s $f0, $f0, $f2 -/* 13E5D0 8024B290 00000000 */ nop +/* 13E5D0 8024B290 00000000 */ nop /* 13E5D4 8024B294 4600A306 */ mov.s $f12, $f20 /* 13E5D8 8024B298 0C00A8D4 */ jal cos_deg /* 13E5DC 8024B29C 46001601 */ sub.s $f24, $f2, $f0 /* 13E5E0 8024B2A0 3C0141A0 */ lui $at, 0x41a0 /* 13E5E4 8024B2A4 44811000 */ mtc1 $at, $f2 -/* 13E5E8 8024B2A8 00000000 */ nop +/* 13E5E8 8024B2A8 00000000 */ nop /* 13E5EC 8024B2AC 46020002 */ mul.s $f0, $f0, $f2 -/* 13E5F0 8024B2B0 00000000 */ nop +/* 13E5F0 8024B2B0 00000000 */ nop /* 13E5F4 8024B2B4 8FAC018C */ lw $t4, 0x18c($sp) /* 13E5F8 8024B2B8 25820016 */ addiu $v0, $t4, 0x16 /* 13E5FC 8024B2BC 44821000 */ mtc1 $v0, $f2 -/* 13E600 8024B2C0 00000000 */ nop +/* 13E600 8024B2C0 00000000 */ nop /* 13E604 8024B2C4 468010A0 */ cvt.s.w $f2, $f2 /* 13E608 8024B2C8 46161080 */ add.s $f2, $f2, $f22 /* 13E60C 8024B2CC 44051000 */ mfc1 $a1, $f2 @@ -270,7 +270,7 @@ glabel pause_partners_draw_contents /* 13E630 8024B2F0 461A0000 */ add.s $f0, $f0, $f26 /* 13E634 8024B2F4 25A20051 */ addiu $v0, $t5, 0x51 /* 13E638 8024B2F8 44822000 */ mtc1 $v0, $f4 -/* 13E63C 8024B2FC 00000000 */ nop +/* 13E63C 8024B2FC 00000000 */ nop /* 13E640 8024B300 46802120 */ cvt.s.w $f4, $f4 /* 13E644 8024B304 4600C287 */ neg.s $f10, $f24 /* 13E648 8024B308 460010A1 */ cvt.d.s $f2, $f2 @@ -305,24 +305,24 @@ glabel pause_partners_draw_contents /* 13E6BC 8024B37C 00A0302D */ daddu $a2, $a1, $zero /* 13E6C0 8024B380 3C014100 */ lui $at, 0x4100 /* 13E6C4 8024B384 44810000 */ mtc1 $at, $f0 -/* 13E6C8 8024B388 00000000 */ nop +/* 13E6C8 8024B388 00000000 */ nop /* 13E6CC 8024B38C 4618003C */ c.lt.s $f0, $f24 -/* 13E6D0 8024B390 00000000 */ nop +/* 13E6D0 8024B390 00000000 */ nop /* 13E6D4 8024B394 45010011 */ bc1t .L8024B3DC /* 13E6D8 8024B398 240600A0 */ addiu $a2, $zero, 0xa0 /* 13E6DC 8024B39C 3C0142BE */ lui $at, 0x42be /* 13E6E0 8024B3A0 44811000 */ mtc1 $at, $f2 -/* 13E6E4 8024B3A4 00000000 */ nop +/* 13E6E4 8024B3A4 00000000 */ nop /* 13E6E8 8024B3A8 4602C082 */ mul.s $f2, $f24, $f2 -/* 13E6EC 8024B3AC 00000000 */ nop +/* 13E6EC 8024B3AC 00000000 */ nop /* 13E6F0 8024B3B0 3C013E00 */ lui $at, 0x3e00 /* 13E6F4 8024B3B4 44810000 */ mtc1 $at, $f0 -/* 13E6F8 8024B3B8 00000000 */ nop +/* 13E6F8 8024B3B8 00000000 */ nop /* 13E6FC 8024B3BC 46001082 */ mul.s $f2, $f2, $f0 -/* 13E700 8024B3C0 00000000 */ nop +/* 13E700 8024B3C0 00000000 */ nop /* 13E704 8024B3C4 3C01437F */ lui $at, 0x437f /* 13E708 8024B3C8 44810000 */ mtc1 $at, $f0 -/* 13E70C 8024B3CC 00000000 */ nop +/* 13E70C 8024B3CC 00000000 */ nop /* 13E710 8024B3D0 46020001 */ sub.s $f0, $f0, $f2 /* 13E714 8024B3D4 4600028D */ trunc.w.s $f10, $f0 /* 13E718 8024B3D8 44065000 */ mfc1 $a2, $f10 @@ -377,7 +377,7 @@ glabel pause_partners_draw_contents /* 13E7D4 8024B494 82500000 */ lb $s0, ($s2) /* 13E7D8 8024B498 24020004 */ addiu $v0, $zero, 4 /* 13E7DC 8024B49C 16020014 */ bne $s0, $v0, .L8024B4F0 -/* 13E7E0 8024B4A0 00000000 */ nop +/* 13E7E0 8024B4A0 00000000 */ nop /* 13E7E4 8024B4A4 3C118027 */ lui $s1, %hi(D_802706AC) /* 13E7E8 8024B4A8 263106AC */ addiu $s1, $s1, %lo(D_802706AC) /* 13E7EC 8024B4AC 8E220000 */ lw $v0, ($s1) @@ -391,7 +391,7 @@ glabel pause_partners_draw_contents .L8024B4CC: /* 13E80C 8024B4CC 82420000 */ lb $v0, ($s2) /* 13E810 8024B4D0 14500007 */ bne $v0, $s0, .L8024B4F0 -/* 13E814 8024B4D4 00000000 */ nop +/* 13E814 8024B4D4 00000000 */ nop /* 13E818 8024B4D8 8E220000 */ lw $v0, ($s1) /* 13E81C 8024B4DC 14400004 */ bnez $v0, .L8024B4F0 /* 13E820 8024B4E0 24040008 */ addiu $a0, $zero, 8 @@ -412,7 +412,7 @@ glabel pause_partners_draw_contents /* 13E854 8024B514 24090001 */ addiu $t1, $zero, 1 .L8024B518: /* 13E858 8024B518 19400193 */ blez $t2, .L8024BB68 -/* 13E85C 8024B51C 00000000 */ nop +/* 13E85C 8024B51C 00000000 */ nop /* 13E860 8024B520 19600191 */ blez $t3, .L8024BB68 /* 13E864 8024B524 28A2013F */ slti $v0, $a1, 0x13f /* 13E868 8024B528 1040018F */ beqz $v0, .L8024BB68 @@ -430,27 +430,27 @@ glabel pause_partners_draw_contents /* 13E890 8024B550 C42006A8 */ lwc1 $f0, %lo(D_802706A8)($at) /* 13E894 8024B554 3C0143B4 */ lui $at, 0x43b4 /* 13E898 8024B558 44812000 */ mtc1 $at, $f4 -/* 13E89C 8024B55C 00000000 */ nop +/* 13E89C 8024B55C 00000000 */ nop /* 13E8A0 8024B560 46040000 */ add.s $f0, $f0, $f4 /* 13E8A4 8024B564 3C01466A */ lui $at, 0x466a /* 13E8A8 8024B568 34216000 */ ori $at, $at, 0x6000 /* 13E8AC 8024B56C 44811000 */ mtc1 $at, $f2 -/* 13E8B0 8024B570 00000000 */ nop +/* 13E8B0 8024B570 00000000 */ nop /* 13E8B4 8024B574 46020002 */ mul.s $f0, $f0, $f2 -/* 13E8B8 8024B578 00000000 */ nop +/* 13E8B8 8024B578 00000000 */ nop /* 13E8BC 8024B57C 3C038027 */ lui $v1, %hi(D_802706B0) /* 13E8C0 8024B580 8C6306B0 */ lw $v1, %lo(D_802706B0)($v1) /* 13E8C4 8024B584 44831000 */ mtc1 $v1, $f2 -/* 13E8C8 8024B588 00000000 */ nop +/* 13E8C8 8024B588 00000000 */ nop /* 13E8CC 8024B58C 468010A0 */ cvt.s.w $f2, $f2 /* 13E8D0 8024B590 46020002 */ mul.s $f0, $f0, $f2 -/* 13E8D4 8024B594 00000000 */ nop +/* 13E8D4 8024B594 00000000 */ nop /* 13E8D8 8024B598 3C0245E7 */ lui $v0, 0x45e7 /* 13E8DC 8024B59C 3442B273 */ ori $v0, $v0, 0xb273 /* 13E8E0 8024B5A0 46040003 */ div.s $f0, $f0, $f4 /* 13E8E4 8024B5A4 4600028D */ trunc.w.s $f10, $f0 /* 13E8E8 8024B5A8 44075000 */ mfc1 $a3, $f10 -/* 13E8EC 8024B5AC 00000000 */ nop +/* 13E8EC 8024B5AC 00000000 */ nop /* 13E8F0 8024B5B0 00E20018 */ mult $a3, $v0 /* 13E8F4 8024B5B4 000717C3 */ sra $v0, $a3, 0x1f /* 13E8F8 8024B5B8 00004010 */ mfhi $t0 @@ -464,55 +464,55 @@ glabel pause_partners_draw_contents /* 13E914 8024B5D4 14610004 */ bne $v1, $at, .L8024B5E8 /* 13E918 8024B5D8 3C018000 */ lui $at, 0x8000 /* 13E91C 8024B5DC 14C10002 */ bne $a2, $at, .L8024B5E8 -/* 13E920 8024B5E0 00000000 */ nop +/* 13E920 8024B5E0 00000000 */ nop /* 13E924 8024B5E4 0006000D */ break 6 .L8024B5E8: /* 13E928 8024B5E8 00002010 */ mfhi $a0 /* 13E92C 8024B5EC 3C014080 */ lui $at, 0x4080 /* 13E930 8024B5F0 44814000 */ mtc1 $at, $f8 /* 13E934 8024B5F4 448B3000 */ mtc1 $t3, $f6 -/* 13E938 8024B5F8 00000000 */ nop +/* 13E938 8024B5F8 00000000 */ nop /* 13E93C 8024B5FC 468031A0 */ cvt.s.w $f6, $f6 /* 13E940 8024B600 46083182 */ mul.s $f6, $f6, $f8 -/* 13E944 8024B604 00000000 */ nop +/* 13E944 8024B604 00000000 */ nop /* 13E948 8024B608 3C19E700 */ lui $t9, 0xe700 /* 13E94C 8024B60C 3C1E8025 */ lui $fp, %hi(D_8024F73C) /* 13E950 8024B610 27DEF73C */ addiu $fp, $fp, %lo(D_8024F73C) /* 13E954 8024B614 44851000 */ mtc1 $a1, $f2 -/* 13E958 8024B618 00000000 */ nop +/* 13E958 8024B618 00000000 */ nop /* 13E95C 8024B61C 468010A0 */ cvt.s.w $f2, $f2 /* 13E960 8024B620 3C05ED00 */ lui $a1, 0xed00 /* 13E964 8024B624 46081082 */ mul.s $f2, $f2, $f8 -/* 13E968 8024B628 00000000 */ nop +/* 13E968 8024B628 00000000 */ nop /* 13E96C 8024B62C 3C0CF548 */ lui $t4, 0xf548 /* 13E970 8024B630 358C2600 */ ori $t4, $t4, 0x2600 /* 13E974 8024B634 44890000 */ mtc1 $t1, $f0 -/* 13E978 8024B638 00000000 */ nop +/* 13E978 8024B638 00000000 */ nop /* 13E97C 8024B63C 46800020 */ cvt.s.w $f0, $f0 /* 13E980 8024B640 448A2000 */ mtc1 $t2, $f4 -/* 13E984 8024B644 00000000 */ nop +/* 13E984 8024B644 00000000 */ nop /* 13E988 8024B648 46802120 */ cvt.s.w $f4, $f4 /* 13E98C 8024B64C 46080002 */ mul.s $f0, $f0, $f8 -/* 13E990 8024B650 00000000 */ nop +/* 13E990 8024B650 00000000 */ nop /* 13E994 8024B654 AFAC0110 */ sw $t4, 0x110($sp) /* 13E998 8024B658 3C02800A */ lui $v0, %hi(gMasterGfxPos) /* 13E99C 8024B65C 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 13E9A0 8024B660 0040882D */ daddu $s1, $v0, $zero /* 13E9A4 8024B664 8E220000 */ lw $v0, ($s1) /* 13E9A8 8024B668 46082102 */ mul.s $f4, $f4, $f8 -/* 13E9AC 8024B66C 00000000 */ nop +/* 13E9AC 8024B66C 00000000 */ nop /* 13E9B0 8024B670 AFA00114 */ sw $zero, 0x114($sp) /* 13E9B4 8024B674 0040402D */ daddu $t0, $v0, $zero /* 13E9B8 8024B678 24420008 */ addiu $v0, $v0, 8 /* 13E9BC 8024B67C AE220000 */ sw $v0, ($s1) /* 13E9C0 8024B680 4600128D */ trunc.w.s $f10, $f2 /* 13E9C4 8024B684 44025000 */ mfc1 $v0, $f10 -/* 13E9C8 8024B688 00000000 */ nop +/* 13E9C8 8024B688 00000000 */ nop /* 13E9CC 8024B68C 30420FFF */ andi $v0, $v0, 0xfff /* 13E9D0 8024B690 00021300 */ sll $v0, $v0, 0xc /* 13E9D4 8024B694 4600028D */ trunc.w.s $f10, $f0 /* 13E9D8 8024B698 44035000 */ mfc1 $v1, $f10 -/* 13E9DC 8024B69C 00000000 */ nop +/* 13E9DC 8024B69C 00000000 */ nop /* 13E9E0 8024B6A0 30630FFF */ andi $v1, $v1, 0xfff /* 13E9E4 8024B6A4 00651825 */ or $v1, $v1, $a1 /* 13E9E8 8024B6A8 00431025 */ or $v0, $v0, $v1 @@ -526,19 +526,19 @@ glabel pause_partners_draw_contents /* 13EA08 8024B6C8 000318C0 */ sll $v1, $v1, 3 /* 13EA0C 8024B6CC 0067B823 */ subu $s7, $v1, $a3 /* 13EA10 8024B6D0 44971000 */ mtc1 $s7, $f2 -/* 13EA14 8024B6D4 00000000 */ nop +/* 13EA14 8024B6D4 00000000 */ nop /* 13EA18 8024B6D8 468010A1 */ cvt.d.w $f2, $f2 /* 13EA1C 8024B6DC 3C018027 */ lui $at, %hi(D_80270040) /* 13EA20 8024B6E0 D4200040 */ ldc1 $f0, %lo(D_80270040)($at) /* 13EA24 8024B6E4 4600228D */ trunc.w.s $f10, $f4 /* 13EA28 8024B6E8 44025000 */ mfc1 $v0, $f10 /* 13EA2C 8024B6EC 46201082 */ mul.d $f2, $f2, $f0 -/* 13EA30 8024B6F0 00000000 */ nop +/* 13EA30 8024B6F0 00000000 */ nop /* 13EA34 8024B6F4 30420FFF */ andi $v0, $v0, 0xfff /* 13EA38 8024B6F8 00021300 */ sll $v0, $v0, 0xc /* 13EA3C 8024B6FC 4600328D */ trunc.w.s $f10, $f6 /* 13EA40 8024B700 44035000 */ mfc1 $v1, $f10 -/* 13EA44 8024B704 00000000 */ nop +/* 13EA44 8024B704 00000000 */ nop /* 13EA48 8024B708 30630FFF */ andi $v1, $v1, 0xfff /* 13EA4C 8024B70C 00431025 */ or $v0, $v0, $v1 /* 13EA50 8024B710 AD020004 */ sw $v0, 4($t0) @@ -730,7 +730,7 @@ glabel pause_partners_draw_contents /* 13ED24 8024B9E4 24080001 */ addiu $t0, $zero, 1 .L8024B9E8: /* 13ED28 8024B9E8 1940005F */ blez $t2, .L8024BB68 -/* 13ED2C 8024B9EC 00000000 */ nop +/* 13ED2C 8024B9EC 00000000 */ nop /* 13ED30 8024B9F0 1960005D */ blez $t3, .L8024BB68 /* 13ED34 8024B9F4 28E2013F */ slti $v0, $a3, 0x13f /* 13ED38 8024B9F8 1040005B */ beqz $v0, .L8024BB68 @@ -747,10 +747,10 @@ glabel pause_partners_draw_contents /* 13ED5C 8024BA1C 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* 13ED60 8024BA20 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 13ED64 8024BA24 44871000 */ mtc1 $a3, $f2 -/* 13ED68 8024BA28 00000000 */ nop +/* 13ED68 8024BA28 00000000 */ nop /* 13ED6C 8024BA2C 468010A0 */ cvt.s.w $f2, $f2 /* 13ED70 8024BA30 44880000 */ mtc1 $t0, $f0 -/* 13ED74 8024BA34 00000000 */ nop +/* 13ED74 8024BA34 00000000 */ nop /* 13ED78 8024BA38 46800020 */ cvt.s.w $f0, $f0 /* 13ED7C 8024BA3C 3C08ED00 */ lui $t0, 0xed00 /* 13ED80 8024BA40 8FAD018C */ lw $t5, 0x18c($sp) @@ -759,43 +759,43 @@ glabel pause_partners_draw_contents /* 13ED8C 8024BA4C 44812000 */ mtc1 $at, $f4 /* 13ED90 8024BA50 8FAF0190 */ lw $t7, 0x190($sp) /* 13ED94 8024BA54 46041082 */ mul.s $f2, $f2, $f4 -/* 13ED98 8024BA58 00000000 */ nop +/* 13ED98 8024BA58 00000000 */ nop /* 13ED9C 8024BA5C 25A6007A */ addiu $a2, $t5, 0x7a /* 13EDA0 8024BA60 25E70010 */ addiu $a3, $t7, 0x10 /* 13EDA4 8024BA64 0040482D */ daddu $t1, $v0, $zero /* 13EDA8 8024BA68 24420008 */ addiu $v0, $v0, 8 /* 13EDAC 8024BA6C 46040002 */ mul.s $f0, $f0, $f4 -/* 13EDB0 8024BA70 00000000 */ nop +/* 13EDB0 8024BA70 00000000 */ nop /* 13EDB4 8024BA74 AC620000 */ sw $v0, ($v1) /* 13EDB8 8024BA78 4600128D */ trunc.w.s $f10, $f2 /* 13EDBC 8024BA7C 44025000 */ mfc1 $v0, $f10 -/* 13EDC0 8024BA80 00000000 */ nop +/* 13EDC0 8024BA80 00000000 */ nop /* 13EDC4 8024BA84 30420FFF */ andi $v0, $v0, 0xfff /* 13EDC8 8024BA88 00021300 */ sll $v0, $v0, 0xc /* 13EDCC 8024BA8C 4600028D */ trunc.w.s $f10, $f0 /* 13EDD0 8024BA90 44035000 */ mfc1 $v1, $f10 /* 13EDD4 8024BA94 448A1000 */ mtc1 $t2, $f2 -/* 13EDD8 8024BA98 00000000 */ nop +/* 13EDD8 8024BA98 00000000 */ nop /* 13EDDC 8024BA9C 468010A0 */ cvt.s.w $f2, $f2 /* 13EDE0 8024BAA0 46041082 */ mul.s $f2, $f2, $f4 -/* 13EDE4 8024BAA4 00000000 */ nop +/* 13EDE4 8024BAA4 00000000 */ nop /* 13EDE8 8024BAA8 30630FFF */ andi $v1, $v1, 0xfff /* 13EDEC 8024BAAC 00681825 */ or $v1, $v1, $t0 /* 13EDF0 8024BAB0 00431025 */ or $v0, $v0, $v1 /* 13EDF4 8024BAB4 448B0000 */ mtc1 $t3, $f0 -/* 13EDF8 8024BAB8 00000000 */ nop +/* 13EDF8 8024BAB8 00000000 */ nop /* 13EDFC 8024BABC 46800020 */ cvt.s.w $f0, $f0 /* 13EE00 8024BAC0 46040002 */ mul.s $f0, $f0, $f4 -/* 13EE04 8024BAC4 00000000 */ nop +/* 13EE04 8024BAC4 00000000 */ nop /* 13EE08 8024BAC8 AD220000 */ sw $v0, ($t1) /* 13EE0C 8024BACC 4600128D */ trunc.w.s $f10, $f2 /* 13EE10 8024BAD0 44025000 */ mfc1 $v0, $f10 -/* 13EE14 8024BAD4 00000000 */ nop +/* 13EE14 8024BAD4 00000000 */ nop /* 13EE18 8024BAD8 30420FFF */ andi $v0, $v0, 0xfff /* 13EE1C 8024BADC 00021300 */ sll $v0, $v0, 0xc /* 13EE20 8024BAE0 4600028D */ trunc.w.s $f10, $f0 /* 13EE24 8024BAE4 44035000 */ mfc1 $v1, $f10 -/* 13EE28 8024BAE8 00000000 */ nop +/* 13EE28 8024BAE8 00000000 */ nop /* 13EE2C 8024BAEC 30630FFF */ andi $v1, $v1, 0xfff /* 13EE30 8024BAF0 00431025 */ or $v0, $v0, $v1 /* 13EE34 8024BAF4 AD220004 */ sw $v0, 4($t1) diff --git a/asm/nonmatchings/code_13E120/pause_partners_draw_movelist.s b/asm/nonmatchings/code_13E120/pause_partners_draw_movelist.s index cde2c71af7..219566ee24 100644 --- a/asm/nonmatchings/code_13E120/pause_partners_draw_movelist.s +++ b/asm/nonmatchings/code_13E120/pause_partners_draw_movelist.s @@ -36,7 +36,7 @@ glabel pause_partners_draw_movelist /* 13F0F4 8024BDB4 24150004 */ addiu $s5, $zero, 4 .L8024BDB8: /* 13F0F8 8024BDB8 16A20003 */ bne $s5, $v0, .L8024BDC8 -/* 13F0FC 8024BDBC 00000000 */ nop +/* 13F0FC 8024BDBC 00000000 */ nop /* 13F100 8024BDC0 08092F74 */ j .L8024BDD0 /* 13F104 8024BDC4 24150003 */ addiu $s5, $zero, 3 .L8024BDC8: @@ -56,7 +56,7 @@ glabel pause_partners_draw_movelist /* 13F134 8024BDF4 1040006D */ beqz $v0, .L8024BFAC /* 13F138 8024BDF8 03D43021 */ addu $a2, $fp, $s4 /* 13F13C 8024BDFC 16400011 */ bnez $s2, .L8024BE44 -/* 13F140 8024BE00 00000000 */ nop +/* 13F140 8024BE00 00000000 */ nop /* 13F144 8024BE04 3C028027 */ lui $v0, %hi(D_802706A0) /* 13F148 8024BE08 8C4206A0 */ lw $v0, %lo(D_802706A0)($v0) /* 13F14C 8024BE0C 3C088027 */ lui $t0, %hi(D_80270680) @@ -142,7 +142,7 @@ glabel pause_partners_draw_movelist /* 13F27C 8024BF3C 2505000C */ addiu $a1, $t0, 0xc /* 13F280 8024BF40 8E040000 */ lw $a0, ($s0) /* 13F284 8024BF44 0C0511F8 */ jal draw_icon_2 -/* 13F288 8024BF48 00000000 */ nop +/* 13F288 8024BF48 00000000 */ nop /* 13F28C 8024BF4C 12200017 */ beqz $s1, .L8024BFAC /* 13F290 8024BF50 0220202D */ daddu $a0, $s1, $zero /* 13F294 8024BF54 03D43021 */ addu $a2, $fp, $s4 @@ -166,7 +166,7 @@ glabel pause_partners_draw_movelist /* 13F2DC 8024BF9C 3C048027 */ lui $a0, %hi(D_80270640) /* 13F2E0 8024BFA0 8C840640 */ lw $a0, %lo(D_80270640)($a0) /* 13F2E4 8024BFA4 0C0511F8 */ jal draw_icon_2 -/* 13F2E8 8024BFA8 00000000 */ nop +/* 13F2E8 8024BFA8 00000000 */ nop .L8024BFAC: /* 13F2EC 8024BFAC 26F7000D */ addiu $s7, $s7, 0xd /* 13F2F0 8024BFB0 2694000D */ addiu $s4, $s4, 0xd diff --git a/asm/nonmatchings/code_13E120/pause_partners_draw_movelist_flower.s b/asm/nonmatchings/code_13E120/pause_partners_draw_movelist_flower.s index 39ad752c62..0ec4b36e6e 100644 --- a/asm/nonmatchings/code_13E120/pause_partners_draw_movelist_flower.s +++ b/asm/nonmatchings/code_13E120/pause_partners_draw_movelist_flower.s @@ -13,7 +13,7 @@ glabel pause_partners_draw_movelist_flower /* 13F400 8024C0C0 24C60010 */ addiu $a2, $a2, 0x10 /* 13F404 8024C0C4 8E040004 */ lw $a0, 4($s0) /* 13F408 8024C0C8 0C0511F8 */ jal draw_icon_2 -/* 13F40C 8024C0CC 00000000 */ nop +/* 13F40C 8024C0CC 00000000 */ nop /* 13F410 8024C0D0 8FBF0014 */ lw $ra, 0x14($sp) /* 13F414 8024C0D4 8FB00010 */ lw $s0, 0x10($sp) /* 13F418 8024C0D8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_13E120/pause_partners_draw_title.s b/asm/nonmatchings/code_13E120/pause_partners_draw_title.s index 995d324a2e..f682b8d61b 100644 --- a/asm/nonmatchings/code_13E120/pause_partners_draw_title.s +++ b/asm/nonmatchings/code_13E120/pause_partners_draw_title.s @@ -76,7 +76,7 @@ glabel pause_partners_draw_title /* 13F000 8024BCC0 2666000A */ addiu $a2, $s3, 0xa /* 13F004 8024BCC4 8E040008 */ lw $a0, 8($s0) /* 13F008 8024BCC8 08092F44 */ j .L8024BD10 -/* 13F00C 8024BCCC 00000000 */ nop +/* 13F00C 8024BCCC 00000000 */ nop .L8024BCD0: /* 13F010 8024BCD0 16020011 */ bne $s0, $v0, .L8024BD18 /* 13F014 8024BCD4 2645005B */ addiu $a1, $s2, 0x5b @@ -88,7 +88,7 @@ glabel pause_partners_draw_title /* 13F02C 8024BCEC 0220302D */ daddu $a2, $s1, $zero /* 13F030 8024BCF0 8E040008 */ lw $a0, 8($s0) /* 13F034 8024BCF4 0C0511F8 */ jal draw_icon_2 -/* 13F038 8024BCF8 00000000 */ nop +/* 13F038 8024BCF8 00000000 */ nop /* 13F03C 8024BCFC 26450065 */ addiu $a1, $s2, 0x65 /* 13F040 8024BD00 8E04000C */ lw $a0, 0xc($s0) /* 13F044 8024BD04 0C051261 */ jal set_icon_render_pos @@ -96,7 +96,7 @@ glabel pause_partners_draw_title /* 13F04C 8024BD0C 8E04000C */ lw $a0, 0xc($s0) .L8024BD10: /* 13F050 8024BD10 0C0511F8 */ jal draw_icon_2 -/* 13F054 8024BD14 00000000 */ nop +/* 13F054 8024BD14 00000000 */ nop .L8024BD18: /* 13F058 8024BD18 8FBF002C */ lw $ra, 0x2c($sp) /* 13F05C 8024BD1C 8FB40028 */ lw $s4, 0x28($sp) diff --git a/asm/nonmatchings/code_13E120/pause_partners_handle_input.s b/asm/nonmatchings/code_13E120/pause_partners_handle_input.s index ccd1459c0c..b7b433619c 100644 --- a/asm/nonmatchings/code_13E120/pause_partners_handle_input.s +++ b/asm/nonmatchings/code_13E120/pause_partners_handle_input.s @@ -11,16 +11,16 @@ glabel pause_partners_handle_input /* 13F690 8024C350 8E220000 */ lw $v0, ($s1) /* 13F694 8024C354 28420002 */ slti $v0, $v0, 2 /* 13F698 8024C358 14400047 */ bnez $v0, .L8024C478 -/* 13F69C 8024C35C 00000000 */ nop +/* 13F69C 8024C35C 00000000 */ nop /* 13F6A0 8024C360 3C028027 */ lui $v0, %hi(D_802706AC) /* 13F6A4 8024C364 8C4206AC */ lw $v0, %lo(D_802706AC)($v0) /* 13F6A8 8024C368 10400006 */ beqz $v0, .L8024C384 -/* 13F6AC 8024C36C 00000000 */ nop +/* 13F6AC 8024C36C 00000000 */ nop /* 13F6B0 8024C370 3C028027 */ lui $v0, %hi(gPauseMenuHeldButtons) /* 13F6B4 8024C374 8C4200C0 */ lw $v0, %lo(gPauseMenuHeldButtons)($v0) /* 13F6B8 8024C378 30422010 */ andi $v0, $v0, 0x2010 /* 13F6BC 8024C37C 1040003E */ beqz $v0, .L8024C478 -/* 13F6C0 8024C380 00000000 */ nop +/* 13F6C0 8024C380 00000000 */ nop .L8024C384: /* 13F6C4 8024C384 3C038027 */ lui $v1, %hi(gPauseMenuHeldButtons) /* 13F6C8 8024C388 8C6300C0 */ lw $v1, %lo(gPauseMenuHeldButtons)($v1) @@ -44,7 +44,7 @@ glabel pause_partners_handle_input /* 13F704 8024C3C4 26100001 */ addiu $s0, $s0, 1 .L8024C3C8: /* 13F708 8024C3C8 1200002B */ beqz $s0, .L8024C478 -/* 13F70C 8024C3CC 00000000 */ nop +/* 13F70C 8024C3CC 00000000 */ nop /* 13F710 8024C3D0 0C05272D */ jal play_sound /* 13F714 8024C3D4 240400C7 */ addiu $a0, $zero, 0xc7 /* 13F718 8024C3D8 3C048027 */ lui $a0, %hi(D_802706A0) @@ -61,7 +61,7 @@ glabel pause_partners_handle_input /* 13F744 8024C404 44811000 */ mtc1 $at, $f2 /* 13F748 8024C408 2442FFFF */ addiu $v0, $v0, -1 /* 13F74C 8024C40C 4602003C */ c.lt.s $f0, $f2 -/* 13F750 8024C410 00000000 */ nop +/* 13F750 8024C410 00000000 */ nop /* 13F754 8024C414 45000016 */ bc1f .L8024C470 /* 13F758 8024C418 AC820000 */ sw $v0, ($a0) /* 13F75C 8024C41C 46020000 */ add.s $f0, $f0, $f2 @@ -71,19 +71,19 @@ glabel pause_partners_handle_input /* 13F768 8024C428 8E220000 */ lw $v0, ($s1) /* 13F76C 8024C42C 0062102A */ slt $v0, $v1, $v0 /* 13F770 8024C430 1440000F */ bnez $v0, .L8024C470 -/* 13F774 8024C434 00000000 */ nop +/* 13F774 8024C434 00000000 */ nop /* 13F778 8024C438 3C028027 */ lui $v0, %hi(D_802706A8) /* 13F77C 8024C43C 244206A8 */ addiu $v0, $v0, %lo(D_802706A8) /* 13F780 8024C440 C4420000 */ lwc1 $f2, ($v0) /* 13F784 8024C444 44800000 */ mtc1 $zero, $f0 -/* 13F788 8024C448 00000000 */ nop +/* 13F788 8024C448 00000000 */ nop /* 13F78C 8024C44C 4602003C */ c.lt.s $f0, $f2 -/* 13F790 8024C450 00000000 */ nop +/* 13F790 8024C450 00000000 */ nop /* 13F794 8024C454 45000006 */ bc1f .L8024C470 /* 13F798 8024C458 AC800000 */ sw $zero, ($a0) /* 13F79C 8024C45C 3C0143B4 */ lui $at, 0x43b4 /* 13F7A0 8024C460 44810000 */ mtc1 $at, $f0 -/* 13F7A4 8024C464 00000000 */ nop +/* 13F7A4 8024C464 00000000 */ nop /* 13F7A8 8024C468 46001001 */ sub.s $f0, $f2, $f0 /* 13F7AC 8024C46C E4400000 */ swc1 $f0, ($v0) .L8024C470: @@ -91,7 +91,7 @@ glabel pause_partners_handle_input /* 13F7B4 8024C474 AC2006A4 */ sw $zero, %lo(D_802706A4)($at) .L8024C478: /* 13F7B8 8024C478 0C039D59 */ jal get_player_data -/* 13F7BC 8024C47C 00000000 */ nop +/* 13F7BC 8024C47C 00000000 */ nop /* 13F7C0 8024C480 3C038027 */ lui $v1, %hi(D_802706A0) /* 13F7C4 8024C484 8C6306A0 */ lw $v1, %lo(D_802706A0)($v1) /* 13F7C8 8024C488 00031880 */ sll $v1, $v1, 2 @@ -112,7 +112,7 @@ glabel pause_partners_handle_input /* 13F804 8024C4C4 24030004 */ addiu $v1, $zero, 4 .L8024C4C8: /* 13F808 8024C4C8 14620003 */ bne $v1, $v0, .L8024C4D8 -/* 13F80C 8024C4CC 00000000 */ nop +/* 13F80C 8024C4CC 00000000 */ nop /* 13F810 8024C4D0 08093138 */ j .L8024C4E0 /* 13F814 8024C4D4 24030003 */ addiu $v1, $zero, 3 .L8024C4D8: @@ -130,11 +130,11 @@ glabel pause_partners_handle_input /* 13F840 8024C500 A422A1E2 */ sh $v0, %lo(D_8015A1E2)($at) /* 13F844 8024C504 24020001 */ addiu $v0, $zero, 1 /* 13F848 8024C508 16020043 */ bne $s0, $v0, .L8024C618 -/* 13F84C 8024C50C 00000000 */ nop +/* 13F84C 8024C50C 00000000 */ nop /* 13F850 8024C510 3C118027 */ lui $s1, %hi(D_802706A4) /* 13F854 8024C514 8E3106A4 */ lw $s1, %lo(D_802706A4)($s1) /* 13F858 8024C518 0C039D59 */ jal get_player_data -/* 13F85C 8024C51C 00000000 */ nop +/* 13F85C 8024C51C 00000000 */ nop /* 13F860 8024C520 3C038027 */ lui $v1, %hi(D_802706A0) /* 13F864 8024C524 8C6306A0 */ lw $v1, %lo(D_802706A0)($v1) /* 13F868 8024C528 00031880 */ sll $v1, $v1, 2 @@ -150,12 +150,12 @@ glabel pause_partners_handle_input /* 13F890 8024C550 80440015 */ lb $a0, 0x15($v0) /* 13F894 8024C554 24020002 */ addiu $v0, $zero, 2 /* 13F898 8024C558 14820003 */ bne $a0, $v0, .L8024C568 -/* 13F89C 8024C55C 00000000 */ nop +/* 13F89C 8024C55C 00000000 */ nop /* 13F8A0 8024C560 08093160 */ j .L8024C580 /* 13F8A4 8024C564 24040004 */ addiu $a0, $zero, 4 .L8024C568: /* 13F8A8 8024C568 14900003 */ bne $a0, $s0, .L8024C578 -/* 13F8AC 8024C56C 00000000 */ nop +/* 13F8AC 8024C56C 00000000 */ nop /* 13F8B0 8024C570 08093160 */ j .L8024C580 /* 13F8B4 8024C574 24040003 */ addiu $a0, $zero, 3 .L8024C578: @@ -168,7 +168,7 @@ glabel pause_partners_handle_input /* 13F8CC 8024C58C 3C030001 */ lui $v1, 1 /* 13F8D0 8024C590 00431024 */ and $v0, $v0, $v1 /* 13F8D4 8024C594 10400006 */ beqz $v0, .L8024C5B0 -/* 13F8D8 8024C598 00000000 */ nop +/* 13F8D8 8024C598 00000000 */ nop /* 13F8DC 8024C59C 3C038027 */ lui $v1, %hi(D_802706A4) /* 13F8E0 8024C5A0 246306A4 */ addiu $v1, $v1, %lo(D_802706A4) /* 13F8E4 8024C5A4 8C620000 */ lw $v0, ($v1) @@ -179,7 +179,7 @@ glabel pause_partners_handle_input /* 13F8F4 8024C5B4 3C030002 */ lui $v1, 2 /* 13F8F8 8024C5B8 00431024 */ and $v0, $v0, $v1 /* 13F8FC 8024C5BC 10400006 */ beqz $v0, .L8024C5D8 -/* 13F900 8024C5C0 00000000 */ nop +/* 13F900 8024C5C0 00000000 */ nop /* 13F904 8024C5C4 3C038027 */ lui $v1, %hi(D_802706A4) /* 13F908 8024C5C8 246306A4 */ addiu $v1, $v1, %lo(D_802706A4) /* 13F90C 8024C5CC 8C620000 */ lw $v0, ($v1) @@ -201,7 +201,7 @@ glabel pause_partners_handle_input /* 13F940 8024C600 3C028027 */ lui $v0, %hi(D_802706A4) /* 13F944 8024C604 8C4206A4 */ lw $v0, %lo(D_802706A4)($v0) /* 13F948 8024C608 10510003 */ beq $v0, $s1, .L8024C618 -/* 13F94C 8024C60C 00000000 */ nop +/* 13F94C 8024C60C 00000000 */ nop /* 13F950 8024C610 0C05272D */ jal play_sound /* 13F954 8024C614 240400C7 */ addiu $a0, $zero, 0xc7 .L8024C618: @@ -209,7 +209,7 @@ glabel pause_partners_handle_input /* 13F95C 8024C61C 8C4200C4 */ lw $v0, %lo(gPauseMenuPressedButtons)($v0) /* 13F960 8024C620 30428000 */ andi $v0, $v0, 0x8000 /* 13F964 8024C624 1040000E */ beqz $v0, .L8024C660 -/* 13F968 8024C628 00000000 */ nop +/* 13F968 8024C628 00000000 */ nop /* 13F96C 8024C62C 3C038027 */ lui $v1, %hi(D_802706AC) /* 13F970 8024C630 246306AC */ addiu $v1, $v1, %lo(D_802706AC) /* 13F974 8024C634 8C620000 */ lw $v0, ($v1) @@ -222,13 +222,13 @@ glabel pause_partners_handle_input /* 13F990 8024C650 0C051F9F */ jal func_80147E7C /* 13F994 8024C654 24050001 */ addiu $a1, $zero, 1 /* 13F998 8024C658 080931E4 */ j .L8024C790 -/* 13F99C 8024C65C 00000000 */ nop +/* 13F99C 8024C65C 00000000 */ nop .L8024C660: /* 13F9A0 8024C660 3C028027 */ lui $v0, %hi(gPauseMenuPressedButtons) /* 13F9A4 8024C664 8C4200C4 */ lw $v0, %lo(gPauseMenuPressedButtons)($v0) /* 13F9A8 8024C668 30424000 */ andi $v0, $v0, 0x4000 /* 13F9AC 8024C66C 10400013 */ beqz $v0, .L8024C6BC -/* 13F9B0 8024C670 00000000 */ nop +/* 13F9B0 8024C670 00000000 */ nop /* 13F9B4 8024C674 3C038027 */ lui $v1, %hi(D_802706AC) /* 13F9B8 8024C678 246306AC */ addiu $v1, $v1, %lo(D_802706AC) /* 13F9BC 8024C67C 8C620000 */ lw $v0, ($v1) @@ -239,7 +239,7 @@ glabel pause_partners_handle_input /* 13F9D0 8024C690 0C05272D */ jal play_sound /* 13F9D4 8024C694 240400CA */ addiu $a0, $zero, 0xca /* 13F9D8 8024C698 080931E4 */ j .L8024C790 -/* 13F9DC 8024C69C 00000000 */ nop +/* 13F9DC 8024C69C 00000000 */ nop .L8024C6A0: /* 13F9E0 8024C6A0 0C05272D */ jal play_sound /* 13F9E4 8024C6A4 240400CA */ addiu $a0, $zero, 0xca @@ -247,14 +247,14 @@ glabel pause_partners_handle_input /* 13F9EC 8024C6AC 0C051F9F */ jal func_80147E7C /* 13F9F0 8024C6B0 24050002 */ addiu $a1, $zero, 2 /* 13F9F4 8024C6B4 080931E4 */ j .L8024C790 -/* 13F9F8 8024C6B8 00000000 */ nop +/* 13F9F8 8024C6B8 00000000 */ nop .L8024C6BC: /* 13F9FC 8024C6BC 3C028027 */ lui $v0, %hi(D_802706AC) /* 13FA00 8024C6C0 8C4206AC */ lw $v0, %lo(D_802706AC)($v0) /* 13FA04 8024C6C4 3C018027 */ lui $at, %hi(gPauseMenuCurrentDescIconScript) /* 13FA08 8024C6C8 AC2000CC */ sw $zero, %lo(gPauseMenuCurrentDescIconScript)($at) /* 13FA0C 8024C6CC 1440000C */ bnez $v0, .L8024C700 -/* 13FA10 8024C6D0 00000000 */ nop +/* 13FA10 8024C6D0 00000000 */ nop /* 13FA14 8024C6D4 3C028027 */ lui $v0, %hi(D_802706A0) /* 13FA18 8024C6D8 8C4206A0 */ lw $v0, %lo(D_802706A0)($v0) /* 13FA1C 8024C6DC 00021080 */ sll $v0, $v0, 2 @@ -270,7 +270,7 @@ glabel pause_partners_handle_input /* 13FA40 8024C700 3C048027 */ lui $a0, %hi(D_802706A4) /* 13FA44 8024C704 8C8406A4 */ lw $a0, %lo(D_802706A4)($a0) /* 13FA48 8024C708 1480000D */ bnez $a0, .L8024C740 -/* 13FA4C 8024C70C 00000000 */ nop +/* 13FA4C 8024C70C 00000000 */ nop /* 13FA50 8024C710 3C028027 */ lui $v0, %hi(D_802706A0) /* 13FA54 8024C714 8C4206A0 */ lw $v0, %lo(D_802706A0)($v0) /* 13FA58 8024C718 00021080 */ sll $v0, $v0, 2 diff --git a/asm/nonmatchings/code_13E120/pause_partners_init.s b/asm/nonmatchings/code_13E120/pause_partners_init.s index 54b2347097..11f449f28f 100644 --- a/asm/nonmatchings/code_13E120/pause_partners_init.s +++ b/asm/nonmatchings/code_13E120/pause_partners_init.s @@ -52,7 +52,7 @@ glabel pause_partners_init /* 13F4D0 8024C190 3C018027 */ lui $at, %hi(D_802706A0) /* 13F4D4 8024C194 AC3006A0 */ sw $s0, %lo(D_802706A0)($at) /* 13F4D8 8024C198 080930A6 */ j .L8024C298 -/* 13F4DC 8024C19C 00000000 */ nop +/* 13F4DC 8024C19C 00000000 */ nop .L8024C1A0: /* 13F4E0 8024C1A0 3C128027 */ lui $s2, %hi(D_80270660) /* 13F4E4 8024C1A4 26520660 */ addiu $s2, $s2, %lo(D_80270660) @@ -115,7 +115,7 @@ glabel pause_partners_init /* 13F5B8 8024C278 00461021 */ addu $v0, $v0, $a2 /* 13F5BC 8024C27C 8C420000 */ lw $v0, ($v0) /* 13F5C0 8024C280 10A2FFC3 */ beq $a1, $v0, .L8024C190 -/* 13F5C4 8024C284 00000000 */ nop +/* 13F5C4 8024C284 00000000 */ nop /* 13F5C8 8024C288 26100001 */ addiu $s0, $s0, 1 /* 13F5CC 8024C28C 0204102A */ slt $v0, $s0, $a0 /* 13F5D0 8024C290 1440FFF7 */ bnez $v0, .L8024C270 @@ -138,7 +138,7 @@ glabel pause_partners_init /* 13F60C 8024C2CC 14610004 */ bne $v1, $at, .L8024C2E0 /* 13F610 8024C2D0 3C018000 */ lui $at, 0x8000 /* 13F614 8024C2D4 14410002 */ bne $v0, $at, .L8024C2E0 -/* 13F618 8024C2D8 00000000 */ nop +/* 13F618 8024C2D8 00000000 */ nop /* 13F61C 8024C2DC 0006000D */ break 6 .L8024C2E0: /* 13F620 8024C2E0 00001012 */ mflo $v0 @@ -147,7 +147,7 @@ glabel pause_partners_init /* 13F62C 8024C2EC 3C018027 */ lui $at, %hi(D_802706AC) /* 13F630 8024C2F0 AC2006AC */ sw $zero, %lo(D_802706AC)($at) /* 13F634 8024C2F4 44820000 */ mtc1 $v0, $f0 -/* 13F638 8024C2F8 00000000 */ nop +/* 13F638 8024C2F8 00000000 */ nop /* 13F63C 8024C2FC 46800020 */ cvt.s.w $f0, $f0 /* 13F640 8024C300 3C018027 */ lui $at, %hi(D_802706A8) /* 13F644 8024C304 E42006A8 */ swc1 $f0, %lo(D_802706A8)($at) diff --git a/asm/nonmatchings/code_13E120/pause_partners_load_portrait.s b/asm/nonmatchings/code_13E120/pause_partners_load_portrait.s index de247993af..8281f555fb 100644 --- a/asm/nonmatchings/code_13E120/pause_partners_load_portrait.s +++ b/asm/nonmatchings/code_13E120/pause_partners_load_portrait.s @@ -44,7 +44,7 @@ glabel pause_partners_load_portrait /* 13E1B4 8024AE74 14610004 */ bne $v1, $at, .L8024AE88 /* 13E1B8 8024AE78 3C018000 */ lui $at, 0x8000 /* 13E1BC 8024AE7C 14410002 */ bne $v0, $at, .L8024AE88 -/* 13E1C0 8024AE80 00000000 */ nop +/* 13E1C0 8024AE80 00000000 */ nop /* 13E1C4 8024AE84 0006000D */ break 6 .L8024AE88: /* 13E1C8 8024AE88 00001810 */ mfhi $v1 diff --git a/asm/nonmatchings/code_13E120/pause_partners_update.s b/asm/nonmatchings/code_13E120/pause_partners_update.s index 90259c0c15..2f14341306 100644 --- a/asm/nonmatchings/code_13E120/pause_partners_update.s +++ b/asm/nonmatchings/code_13E120/pause_partners_update.s @@ -19,7 +19,7 @@ glabel pause_partners_update /* 13FB18 8024C7D8 14610004 */ bne $v1, $at, .L8024C7EC /* 13FB1C 8024C7DC 3C018000 */ lui $at, 0x8000 /* 13FB20 8024C7E0 14410002 */ bne $v0, $at, .L8024C7EC -/* 13FB24 8024C7E4 00000000 */ nop +/* 13FB24 8024C7E4 00000000 */ nop /* 13FB28 8024C7E8 0006000D */ break 6 .L8024C7EC: /* 13FB2C 8024C7EC 00001012 */ mflo $v0 @@ -34,27 +34,27 @@ glabel pause_partners_update /* 13FB50 8024C810 F7B40028 */ sdc1 $f20, 0x28($sp) /* 13FB54 8024C814 C6220000 */ lwc1 $f2, ($s1) /* 13FB58 8024C818 44820000 */ mtc1 $v0, $f0 -/* 13FB5C 8024C81C 00000000 */ nop +/* 13FB5C 8024C81C 00000000 */ nop /* 13FB60 8024C820 46800020 */ cvt.s.w $f0, $f0 /* 13FB64 8024C824 46020501 */ sub.s $f20, $f0, $f2 /* 13FB68 8024C828 4600A10D */ trunc.w.s $f4, $f20 /* 13FB6C 8024C82C 44042000 */ mfc1 $a0, $f4 -/* 13FB70 8024C830 00000000 */ nop +/* 13FB70 8024C830 00000000 */ nop /* 13FB74 8024C834 04810002 */ bgez $a0, .L8024C840 /* 13FB78 8024C838 0080802D */ daddu $s0, $a0, $zero /* 13FB7C 8024C83C 00108023 */ negu $s0, $s0 .L8024C840: /* 13FB80 8024C840 0C00A52C */ jal sign -/* 13FB84 8024C844 00000000 */ nop +/* 13FB84 8024C844 00000000 */ nop /* 13FB88 8024C848 0040182D */ daddu $v1, $v0, $zero /* 13FB8C 8024C84C 2A020010 */ slti $v0, $s0, 0x10 /* 13FB90 8024C850 14400008 */ bnez $v0, .L8024C874 -/* 13FB94 8024C854 00000000 */ nop +/* 13FB94 8024C854 00000000 */ nop /* 13FB98 8024C858 3C018027 */ lui $at, %hi(D_80270048) /* 13FB9C 8024C85C D4220048 */ ldc1 $f2, %lo(D_80270048)($at) /* 13FBA0 8024C860 4600A021 */ cvt.d.s $f0, $f20 /* 13FBA4 8024C864 46220002 */ mul.d $f0, $f0, $f2 -/* 13FBA8 8024C868 00000000 */ nop +/* 13FBA8 8024C868 00000000 */ nop /* 13FBAC 8024C86C 0809322D */ j .L8024C8B4 /* 13FBB0 8024C870 462000A0 */ cvt.s.d $f2, $f0 .L8024C874: @@ -65,14 +65,14 @@ glabel pause_partners_update /* 13FBC4 8024C884 00620018 */ mult $v1, $v0 /* 13FBC8 8024C888 4600010D */ trunc.w.s $f4, $f0 /* 13FBCC 8024C88C 44022000 */ mfc1 $v0, $f4 -/* 13FBD0 8024C890 00000000 */ nop +/* 13FBD0 8024C890 00000000 */ nop /* 13FBD4 8024C894 44820000 */ mtc1 $v0, $f0 -/* 13FBD8 8024C898 00000000 */ nop +/* 13FBD8 8024C898 00000000 */ nop /* 13FBDC 8024C89C 46800020 */ cvt.s.w $f0, $f0 /* 13FBE0 8024C8A0 E6200000 */ swc1 $f0, ($s1) /* 13FBE4 8024C8A4 00003812 */ mflo $a3 /* 13FBE8 8024C8A8 44871000 */ mtc1 $a3, $f2 -/* 13FBEC 8024C8AC 00000000 */ nop +/* 13FBEC 8024C8AC 00000000 */ nop /* 13FBF0 8024C8B0 468010A0 */ cvt.s.w $f2, $f2 .L8024C8B4: /* 13FBF4 8024C8B4 3C028027 */ lui $v0, %hi(D_802706A8) @@ -94,7 +94,7 @@ glabel pause_partners_update /* 13FC30 8024C8F0 3C028027 */ lui $v0, %hi(D_802706A0) /* 13FC34 8024C8F4 8C4206A0 */ lw $v0, %lo(D_802706A0)($v0) /* 13FC38 8024C8F8 1622000A */ bne $s1, $v0, .L8024C924 -/* 13FC3C 8024C8FC 00000000 */ nop +/* 13FC3C 8024C8FC 00000000 */ nop /* 13FC40 8024C900 8E030000 */ lw $v1, ($s0) /* 13FC44 8024C904 3C063F80 */ lui $a2, 0x3f80 /* 13FC48 8024C908 00031080 */ sll $v0, $v1, 2 @@ -121,7 +121,7 @@ glabel pause_partners_update /* 13FC94 8024C954 26310001 */ addiu $s1, $s1, 1 /* 13FC98 8024C958 0222102A */ slt $v0, $s1, $v0 /* 13FC9C 8024C95C 1440FFE4 */ bnez $v0, .L8024C8F0 -/* 13FCA0 8024C960 00000000 */ nop +/* 13FCA0 8024C960 00000000 */ nop .L8024C964: /* 13FCA4 8024C964 8FBF0020 */ lw $ra, 0x20($sp) /* 13FCA8 8024C968 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/code_1421C0/pause_draw_menu_label.s b/asm/nonmatchings/code_1421C0/pause_draw_menu_label.s index bfd2f1e35d..07edf96df2 100644 --- a/asm/nonmatchings/code_1421C0/pause_draw_menu_label.s +++ b/asm/nonmatchings/code_1421C0/pause_draw_menu_label.s @@ -57,4 +57,4 @@ glabel pause_draw_menu_label /* 142290 8024EF50 8FBF0028 */ lw $ra, 0x28($sp) /* 142294 8024EF54 03E00008 */ jr $ra /* 142298 8024EF58 27BD0030 */ addiu $sp, $sp, 0x30 -/* 14229C 8024EF5C 00000000 */ nop +/* 14229C 8024EF5C 00000000 */ nop diff --git a/asm/nonmatchings/code_163400/func_80242D94.s b/asm/nonmatchings/code_163400/func_80242D94.s index 4218ead90a..95b58a3fb6 100644 --- a/asm/nonmatchings/code_163400/func_80242D94.s +++ b/asm/nonmatchings/code_163400/func_80242D94.s @@ -7,7 +7,7 @@ glabel func_80242D94 /* 1635FC 80242D9C 00430018 */ mult $v0, $v1 /* 163600 80242DA0 00003812 */ mflo $a3 /* 163604 80242DA4 80820006 */ lb $v0, 6($a0) -/* 163608 80242DA8 00000000 */ nop +/* 163608 80242DA8 00000000 */ nop /* 16360C 80242DAC 00E20018 */ mult $a3, $v0 /* 163610 80242DB0 00003812 */ mflo $a3 /* 163614 80242DB4 00061600 */ sll $v0, $a2, 0x18 diff --git a/asm/nonmatchings/code_163400/func_80242E00.s b/asm/nonmatchings/code_163400/func_80242E00.s index 41b2339646..b9f4e37066 100644 --- a/asm/nonmatchings/code_163400/func_80242E00.s +++ b/asm/nonmatchings/code_163400/func_80242E00.s @@ -20,23 +20,23 @@ glabel func_80242E00 /* 16369C 80242E3C 14400012 */ bnez $v0, .L80242E88 /* 1636A0 80242E40 00948021 */ addu $s0, $a0, $s4 /* 1636A4 80242E44 0C00CD4A */ jal get_game_mode -/* 1636A8 80242E48 00000000 */ nop +/* 1636A8 80242E48 00000000 */ nop /* 1636AC 80242E4C 00021400 */ sll $v0, $v0, 0x10 /* 1636B0 80242E50 00021403 */ sra $v0, $v0, 0x10 /* 1636B4 80242E54 2403000F */ addiu $v1, $zero, 0xf /* 1636B8 80242E58 10430008 */ beq $v0, $v1, .L80242E7C -/* 1636BC 80242E5C 00000000 */ nop +/* 1636BC 80242E5C 00000000 */ nop /* 1636C0 80242E60 0C00CD4A */ jal get_game_mode -/* 1636C4 80242E64 00000000 */ nop +/* 1636C4 80242E64 00000000 */ nop /* 1636C8 80242E68 00021400 */ sll $v0, $v0, 0x10 /* 1636CC 80242E6C 00021403 */ sra $v0, $v0, 0x10 /* 1636D0 80242E70 2403000D */ addiu $v1, $zero, 0xd /* 1636D4 80242E74 14430024 */ bne $v0, $v1, .L80242F08 -/* 1636D8 80242E78 00000000 */ nop +/* 1636D8 80242E78 00000000 */ nop .L80242E7C: /* 1636DC 80242E7C 8E220000 */ lw $v0, ($s1) /* 1636E0 80242E80 10400018 */ beqz $v0, .L80242EE4 -/* 1636E4 80242E84 00000000 */ nop +/* 1636E4 80242E84 00000000 */ nop .L80242E88: /* 1636E8 80242E88 2404002C */ addiu $a0, $zero, 0x2c /* 1636EC 80242E8C 2406FFFF */ addiu $a2, $zero, -1 @@ -46,7 +46,7 @@ glabel func_80242E00 .L80242E9C: /* 1636FC 80242E9C 80620003 */ lb $v0, 3($v1) /* 163700 80242EA0 10460003 */ beq $v0, $a2, .L80242EB0 -/* 163704 80242EA4 00000000 */ nop +/* 163704 80242EA4 00000000 */ nop /* 163708 80242EA8 54450006 */ bnel $v0, $a1, .L80242EC4 /* 16370C 80242EAC 24840001 */ addiu $a0, $a0, 1 .L80242EB0: @@ -62,7 +62,7 @@ glabel func_80242E00 /* 163730 80242ED0 28820040 */ slti $v0, $a0, 0x40 .L80242ED4: /* 163734 80242ED4 14400003 */ bnez $v0, .L80242EE4 -/* 163738 80242ED8 00000000 */ nop +/* 163738 80242ED8 00000000 */ nop /* 16373C 80242EDC 3C018025 */ lui $at, %hi(D_80249BB0) /* 163740 80242EE0 AC209BB0 */ sw $zero, %lo(D_80249BB0)($at) .L80242EE4: @@ -87,7 +87,7 @@ glabel func_80242E00 /* 163788 80242F28 90420000 */ lbu $v0, ($v0) /* 16378C 80242F2C 30420008 */ andi $v0, $v0, 8 /* 163790 80242F30 14400005 */ bnez $v0, .L80242F48 -/* 163794 80242F34 00000000 */ nop +/* 163794 80242F34 00000000 */ nop .L80242F38: /* 163798 80242F38 3C018025 */ lui $at, %hi(D_80249BA0) /* 16379C 80242F3C AC329BA0 */ sw $s2, %lo(D_80249BA0)($at) diff --git a/asm/nonmatchings/code_163400/func_80242F68.s b/asm/nonmatchings/code_163400/func_80242F68.s index 92b5036d3e..8c66a3a1fa 100644 --- a/asm/nonmatchings/code_163400/func_80242F68.s +++ b/asm/nonmatchings/code_163400/func_80242F68.s @@ -12,10 +12,10 @@ glabel func_80242F68 /* 1637E4 80242F84 44802000 */ mtc1 $zero, $f4 /* 1637E8 80242F88 00A31023 */ subu $v0, $a1, $v1 /* 1637EC 80242F8C 44821000 */ mtc1 $v0, $f2 -/* 1637F0 80242F90 00000000 */ nop +/* 1637F0 80242F90 00000000 */ nop /* 1637F4 80242F94 468010A1 */ cvt.d.w $f2, $f2 /* 1637F8 80242F98 46241082 */ mul.d $f2, $f2, $f4 -/* 1637FC 80242F9C 00000000 */ nop +/* 1637FC 80242F9C 00000000 */ nop /* 163800 80242FA0 3C098025 */ lui $t1, %hi(D_80249B98) /* 163804 80242FA4 25299B98 */ addiu $t1, $t1, %lo(D_80249B98) /* 163808 80242FA8 3C048025 */ lui $a0, %hi(D_80249BA4) @@ -23,23 +23,23 @@ glabel func_80242F68 /* 163810 80242FB0 8D260000 */ lw $a2, ($t1) /* 163814 80242FB4 00861023 */ subu $v0, $a0, $a2 /* 163818 80242FB8 44820000 */ mtc1 $v0, $f0 -/* 16381C 80242FBC 00000000 */ nop +/* 16381C 80242FBC 00000000 */ nop /* 163820 80242FC0 46800021 */ cvt.d.w $f0, $f0 /* 163824 80242FC4 46240002 */ mul.d $f0, $f0, $f4 -/* 163828 80242FC8 00000000 */ nop +/* 163828 80242FC8 00000000 */ nop /* 16382C 80242FCC 4620118D */ trunc.w.d $f6, $f2 /* 163830 80242FD0 44073000 */ mfc1 $a3, $f6 /* 163834 80242FD4 4620018D */ trunc.w.d $f6, $f0 /* 163838 80242FD8 44083000 */ mfc1 $t0, $f6 /* 16383C 80242FDC 14A30003 */ bne $a1, $v1, .L80242FEC -/* 163840 80242FE0 00000000 */ nop +/* 163840 80242FE0 00000000 */ nop /* 163844 80242FE4 10860007 */ beq $a0, $a2, .L80243004 -/* 163848 80242FE8 00000000 */ nop +/* 163848 80242FE8 00000000 */ nop .L80242FEC: /* 16384C 80242FEC 14E00005 */ bnez $a3, .L80243004 -/* 163850 80242FF0 00000000 */ nop +/* 163850 80242FF0 00000000 */ nop /* 163854 80242FF4 15000003 */ bnez $t0, .L80243004 -/* 163858 80242FF8 00000000 */ nop +/* 163858 80242FF8 00000000 */ nop /* 16385C 80242FFC AD450000 */ sw $a1, ($t2) /* 163860 80243000 AD240000 */ sw $a0, ($t1) .L80243004: @@ -85,14 +85,14 @@ glabel func_80242F68 .L80243094: /* 1638F4 80243094 80620003 */ lb $v0, 3($v1) /* 1638F8 80243098 10460003 */ beq $v0, $a2, .L802430A8 -/* 1638FC 8024309C 00000000 */ nop +/* 1638FC 8024309C 00000000 */ nop /* 163900 802430A0 54450006 */ bnel $v0, $a1, .L802430BC /* 163904 802430A4 24840001 */ addiu $a0, $a0, 1 .L802430A8: /* 163908 802430A8 90620000 */ lbu $v0, ($v1) /* 16390C 802430AC 30420008 */ andi $v0, $v0, 8 /* 163910 802430B0 14400005 */ bnez $v0, .L802430C8 -/* 163914 802430B4 00000000 */ nop +/* 163914 802430B4 00000000 */ nop /* 163918 802430B8 24840001 */ addiu $a0, $a0, 1 .L802430BC: /* 16391C 802430BC 28820040 */ slti $v0, $a0, 0x40 @@ -117,7 +117,7 @@ glabel func_80242F68 /* 163960 80243100 3C038025 */ lui $v1, %hi(D_80249BAC) /* 163964 80243104 8C639BAC */ lw $v1, %lo(D_80249BAC)($v1) /* 163968 80243108 14620010 */ bne $v1, $v0, .L8024314C -/* 16396C 8024310C 00000000 */ nop +/* 16396C 8024310C 00000000 */ nop /* 163970 80243110 3C038025 */ lui $v1, %hi(D_80249BB8) /* 163974 80243114 24639BB8 */ addiu $v1, $v1, %lo(D_80249BB8) /* 163978 80243118 8C620000 */ lw $v0, ($v1) diff --git a/asm/nonmatchings/code_163400/func_802431A0.s b/asm/nonmatchings/code_163400/func_802431A0.s index 136057adcd..249dfabf1e 100644 --- a/asm/nonmatchings/code_163400/func_802431A0.s +++ b/asm/nonmatchings/code_163400/func_802431A0.s @@ -20,7 +20,7 @@ glabel func_802431A0 .L802431DC: /* 163A3C 802431DC 80620003 */ lb $v0, 3($v1) /* 163A40 802431E0 10460003 */ beq $v0, $a2, .L802431F0 -/* 163A44 802431E4 00000000 */ nop +/* 163A44 802431E4 00000000 */ nop /* 163A48 802431E8 54450006 */ bnel $v0, $a1, .L80243204 /* 163A4C 802431EC 26100001 */ addiu $s0, $s0, 1 .L802431F0: @@ -36,7 +36,7 @@ glabel func_802431A0 /* 163A70 80243210 2A020040 */ slti $v0, $s0, 0x40 .L80243214: /* 163A74 80243214 1440000B */ bnez $v0, .L80243244 -/* 163A78 80243218 00000000 */ nop +/* 163A78 80243218 00000000 */ nop /* 163A7C 8024321C 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 163A80 80243220 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 163A84 80243224 8C430020 */ lw $v1, 0x20($v0) @@ -46,7 +46,7 @@ glabel func_802431A0 /* 163A94 80243234 3C018025 */ lui $at, %hi(D_8024C084) /* 163A98 80243238 AC22C084 */ sw $v0, %lo(D_8024C084)($at) /* 163A9C 8024323C 08090C95 */ j .L80243254 -/* 163AA0 80243240 00000000 */ nop +/* 163AA0 80243240 00000000 */ nop .L80243244: /* 163AA4 80243244 3C018025 */ lui $at, %hi(D_8024C08C) /* 163AA8 80243248 AC20C08C */ sw $zero, %lo(D_8024C08C)($at) @@ -75,12 +75,12 @@ glabel func_802431A0 .L8024329C: /* 163AFC 8024329C 90820000 */ lbu $v0, ($a0) /* 163B00 802432A0 10400006 */ beqz $v0, .L802432BC -/* 163B04 802432A4 00000000 */ nop +/* 163B04 802432A4 00000000 */ nop /* 163B08 802432A8 8C820010 */ lw $v0, 0x10($a0) /* 163B0C 802432AC 10400003 */ beqz $v0, .L802432BC -/* 163B10 802432B0 00000000 */ nop +/* 163B10 802432B0 00000000 */ nop /* 163B14 802432B4 0040F809 */ jalr $v0 -/* 163B18 802432B8 00000000 */ nop +/* 163B18 802432B8 00000000 */ nop .L802432BC: /* 163B1C 802432BC 3C118025 */ lui $s1, %hi(D_80249B84) /* 163B20 802432C0 26319B84 */ addiu $s1, $s1, %lo(D_80249B84) @@ -92,9 +92,9 @@ glabel func_802431A0 /* 163B34 802432D4 26100001 */ addiu $s0, $s0, 1 /* 163B38 802432D8 8C820014 */ lw $v0, 0x14($a0) /* 163B3C 802432DC 10400003 */ beqz $v0, .L802432EC -/* 163B40 802432E0 00000000 */ nop +/* 163B40 802432E0 00000000 */ nop /* 163B44 802432E4 0040F809 */ jalr $v0 -/* 163B48 802432E8 00000000 */ nop +/* 163B48 802432E8 00000000 */ nop .L802432EC: /* 163B4C 802432EC 2A020004 */ slti $v0, $s0, 4 /* 163B50 802432F0 1440FFF5 */ bnez $v0, .L802432C8 diff --git a/asm/nonmatchings/code_163400/func_8024381C.s b/asm/nonmatchings/code_163400/func_8024381C.s index e5256a7796..d39a9836ca 100644 --- a/asm/nonmatchings/code_163400/func_8024381C.s +++ b/asm/nonmatchings/code_163400/func_8024381C.s @@ -23,7 +23,7 @@ glabel func_8024381C /* 1640C0 80243860 84229CF4 */ lh $v0, %lo(D_80249CF4)($at) /* 1640C4 80243864 C4C00000 */ lwc1 $f0, ($a2) /* 1640C8 80243868 44821000 */ mtc1 $v0, $f2 -/* 1640CC 8024386C 00000000 */ nop +/* 1640CC 8024386C 00000000 */ nop /* 1640D0 80243870 468010A0 */ cvt.s.w $f2, $f2 /* 1640D4 80243874 46020000 */ add.s $f0, $f0, $f2 /* 1640D8 80243878 24020009 */ addiu $v0, $zero, 9 diff --git a/asm/nonmatchings/code_163400/func_80243898.s b/asm/nonmatchings/code_163400/func_80243898.s index c535f0ae04..bbcba0e18b 100644 --- a/asm/nonmatchings/code_163400/func_80243898.s +++ b/asm/nonmatchings/code_163400/func_80243898.s @@ -18,7 +18,7 @@ glabel func_80243898 /* 16412C 802438CC C4C00000 */ lwc1 $f0, ($a2) /* 164130 802438D0 00021023 */ negu $v0, $v0 /* 164134 802438D4 44821000 */ mtc1 $v0, $f2 -/* 164138 802438D8 00000000 */ nop +/* 164138 802438D8 00000000 */ nop /* 16413C 802438DC 468010A0 */ cvt.s.w $f2, $f2 /* 164140 802438E0 46020000 */ add.s $f0, $f0, $f2 /* 164144 802438E4 24020009 */ addiu $v0, $zero, 9 diff --git a/asm/nonmatchings/code_163400/func_80243908.s b/asm/nonmatchings/code_163400/func_80243908.s index cbeecc37d8..de08d9dee2 100644 --- a/asm/nonmatchings/code_163400/func_80243908.s +++ b/asm/nonmatchings/code_163400/func_80243908.s @@ -14,12 +14,12 @@ glabel func_80243908 /* 16418C 8024392C 00052940 */ sll $a1, $a1, 5 /* 164190 80243930 00A22821 */ addu $a1, $a1, $v0 /* 164194 80243934 44861000 */ mtc1 $a2, $f2 -/* 164198 80243938 00000000 */ nop +/* 164198 80243938 00000000 */ nop /* 16419C 8024393C 468010A0 */ cvt.s.w $f2, $f2 /* 1641A0 80243940 28C60010 */ slti $a2, $a2, 0x10 /* 1641A4 80243944 94A20010 */ lhu $v0, 0x10($a1) /* 1641A8 80243948 46001102 */ mul.s $f4, $f2, $f0 -/* 1641AC 8024394C 00000000 */ nop +/* 1641AC 8024394C 00000000 */ nop /* 1641B0 80243950 00021400 */ sll $v0, $v0, 0x10 /* 1641B4 80243954 00022403 */ sra $a0, $v0, 0x10 /* 1641B8 80243958 000217C2 */ srl $v0, $v0, 0x1f @@ -50,17 +50,17 @@ glabel func_80243908 /* 16421C 802439BC 8503000C */ lh $v1, 0xc($t0) /* 164220 802439C0 00A31023 */ subu $v0, $a1, $v1 /* 164224 802439C4 44820000 */ mtc1 $v0, $f0 -/* 164228 802439C8 00000000 */ nop +/* 164228 802439C8 00000000 */ nop /* 16422C 802439CC 46800020 */ cvt.s.w $f0, $f0 /* 164230 802439D0 46040002 */ mul.s $f0, $f0, $f4 -/* 164234 802439D4 00000000 */ nop +/* 164234 802439D4 00000000 */ nop /* 164238 802439D8 44831000 */ mtc1 $v1, $f2 -/* 16423C 802439DC 00000000 */ nop +/* 16423C 802439DC 00000000 */ nop /* 164240 802439E0 468010A0 */ cvt.s.w $f2, $f2 /* 164244 802439E4 46020000 */ add.s $f0, $f0, $f2 /* 164248 802439E8 00031823 */ negu $v1, $v1 /* 16424C 802439EC 44831000 */ mtc1 $v1, $f2 -/* 164250 802439F0 00000000 */ nop +/* 164250 802439F0 00000000 */ nop /* 164254 802439F4 468010A0 */ cvt.s.w $f2, $f2 /* 164258 802439F8 46001080 */ add.s $f2, $f2, $f0 /* 16425C 802439FC C5200000 */ lwc1 $f0, ($t1) @@ -71,17 +71,17 @@ glabel func_80243908 /* 164270 80243A10 8503000E */ lh $v1, 0xe($t0) /* 164274 80243A14 00831023 */ subu $v0, $a0, $v1 /* 164278 80243A18 44820000 */ mtc1 $v0, $f0 -/* 16427C 80243A1C 00000000 */ nop +/* 16427C 80243A1C 00000000 */ nop /* 164280 80243A20 46800020 */ cvt.s.w $f0, $f0 /* 164284 80243A24 46040002 */ mul.s $f0, $f0, $f4 -/* 164288 80243A28 00000000 */ nop +/* 164288 80243A28 00000000 */ nop /* 16428C 80243A2C 44831000 */ mtc1 $v1, $f2 -/* 164290 80243A30 00000000 */ nop +/* 164290 80243A30 00000000 */ nop /* 164294 80243A34 468010A0 */ cvt.s.w $f2, $f2 /* 164298 80243A38 46020000 */ add.s $f0, $f0, $f2 /* 16429C 80243A3C 00031823 */ negu $v1, $v1 /* 1642A0 80243A40 44831000 */ mtc1 $v1, $f2 -/* 1642A4 80243A44 00000000 */ nop +/* 1642A4 80243A44 00000000 */ nop /* 1642A8 80243A48 468010A0 */ cvt.s.w $f2, $f2 /* 1642AC 80243A4C 46001080 */ add.s $f2, $f2, $f0 /* 1642B0 80243A50 C4E00000 */ lwc1 $f0, ($a3) @@ -94,15 +94,15 @@ glabel func_80243908 /* 1642C8 80243A68 8502000C */ lh $v0, 0xc($t0) /* 1642CC 80243A6C 00A21823 */ subu $v1, $a1, $v0 /* 1642D0 80243A70 44832000 */ mtc1 $v1, $f4 -/* 1642D4 80243A74 00000000 */ nop +/* 1642D4 80243A74 00000000 */ nop /* 1642D8 80243A78 46802120 */ cvt.s.w $f4, $f4 /* 1642DC 80243A7C 44820000 */ mtc1 $v0, $f0 -/* 1642E0 80243A80 00000000 */ nop +/* 1642E0 80243A80 00000000 */ nop /* 1642E4 80243A84 46800020 */ cvt.s.w $f0, $f0 /* 1642E8 80243A88 46002100 */ add.s $f4, $f4, $f0 /* 1642EC 80243A8C 00021023 */ negu $v0, $v0 /* 1642F0 80243A90 44821000 */ mtc1 $v0, $f2 -/* 1642F4 80243A94 00000000 */ nop +/* 1642F4 80243A94 00000000 */ nop /* 1642F8 80243A98 468010A0 */ cvt.s.w $f2, $f2 /* 1642FC 80243A9C 46041080 */ add.s $f2, $f2, $f4 /* 164300 80243AA0 C5200000 */ lwc1 $f0, ($t1) @@ -113,15 +113,15 @@ glabel func_80243908 /* 164314 80243AB4 8502000E */ lh $v0, 0xe($t0) /* 164318 80243AB8 00821823 */ subu $v1, $a0, $v0 /* 16431C 80243ABC 44832000 */ mtc1 $v1, $f4 -/* 164320 80243AC0 00000000 */ nop +/* 164320 80243AC0 00000000 */ nop /* 164324 80243AC4 46802120 */ cvt.s.w $f4, $f4 /* 164328 80243AC8 44820000 */ mtc1 $v0, $f0 -/* 16432C 80243ACC 00000000 */ nop +/* 16432C 80243ACC 00000000 */ nop /* 164330 80243AD0 46800020 */ cvt.s.w $f0, $f0 /* 164334 80243AD4 46002100 */ add.s $f4, $f4, $f0 /* 164338 80243AD8 00021023 */ negu $v0, $v0 /* 16433C 80243ADC 44821000 */ mtc1 $v0, $f2 -/* 164340 80243AE0 00000000 */ nop +/* 164340 80243AE0 00000000 */ nop /* 164344 80243AE4 468010A0 */ cvt.s.w $f2, $f2 /* 164348 80243AE8 46041080 */ add.s $f2, $f2, $f4 /* 16434C 80243AEC C4E00000 */ lwc1 $f0, ($a3) diff --git a/asm/nonmatchings/code_163400/func_80243B10.s b/asm/nonmatchings/code_163400/func_80243B10.s index 9f5e8534eb..14be8f5f48 100644 --- a/asm/nonmatchings/code_163400/func_80243B10.s +++ b/asm/nonmatchings/code_163400/func_80243B10.s @@ -10,10 +10,10 @@ glabel func_80243B10 /* 164384 80243B24 3C013D80 */ lui $at, 0x3d80 /* 164388 80243B28 44811000 */ mtc1 $at, $f2 /* 16438C 80243B2C 44820000 */ mtc1 $v0, $f0 -/* 164390 80243B30 00000000 */ nop +/* 164390 80243B30 00000000 */ nop /* 164394 80243B34 46800020 */ cvt.s.w $f0, $f0 /* 164398 80243B38 46020002 */ mul.s $f0, $f0, $f2 -/* 16439C 80243B3C 00000000 */ nop +/* 16439C 80243B3C 00000000 */ nop /* 1643A0 80243B40 3C013F80 */ lui $at, 0x3f80 /* 1643A4 80243B44 44811000 */ mtc1 $at, $f2 /* 1643A8 80243B48 28420010 */ slti $v0, $v0, 0x10 @@ -23,17 +23,17 @@ glabel func_80243B10 /* 1643B8 80243B58 24020050 */ addiu $v0, $zero, 0x50 /* 1643BC 80243B5C 00431023 */ subu $v0, $v0, $v1 /* 1643C0 80243B60 44820000 */ mtc1 $v0, $f0 -/* 1643C4 80243B64 00000000 */ nop +/* 1643C4 80243B64 00000000 */ nop /* 1643C8 80243B68 46800020 */ cvt.s.w $f0, $f0 /* 1643CC 80243B6C 46040002 */ mul.s $f0, $f0, $f4 -/* 1643D0 80243B70 00000000 */ nop +/* 1643D0 80243B70 00000000 */ nop /* 1643D4 80243B74 44831000 */ mtc1 $v1, $f2 -/* 1643D8 80243B78 00000000 */ nop +/* 1643D8 80243B78 00000000 */ nop /* 1643DC 80243B7C 468010A0 */ cvt.s.w $f2, $f2 /* 1643E0 80243B80 46020000 */ add.s $f0, $f0, $f2 /* 1643E4 80243B84 00031823 */ negu $v1, $v1 /* 1643E8 80243B88 44831000 */ mtc1 $v1, $f2 -/* 1643EC 80243B8C 00000000 */ nop +/* 1643EC 80243B8C 00000000 */ nop /* 1643F0 80243B90 468010A0 */ cvt.s.w $f2, $f2 /* 1643F4 80243B94 46001080 */ add.s $f2, $f2, $f0 /* 1643F8 80243B98 C4C00000 */ lwc1 $f0, ($a2) @@ -45,17 +45,17 @@ glabel func_80243B10 /* 164410 80243BB0 24020024 */ addiu $v0, $zero, 0x24 /* 164414 80243BB4 00431023 */ subu $v0, $v0, $v1 /* 164418 80243BB8 44820000 */ mtc1 $v0, $f0 -/* 16441C 80243BBC 00000000 */ nop +/* 16441C 80243BBC 00000000 */ nop /* 164420 80243BC0 46800020 */ cvt.s.w $f0, $f0 /* 164424 80243BC4 46040002 */ mul.s $f0, $f0, $f4 -/* 164428 80243BC8 00000000 */ nop +/* 164428 80243BC8 00000000 */ nop /* 16442C 80243BCC 44831000 */ mtc1 $v1, $f2 -/* 164430 80243BD0 00000000 */ nop +/* 164430 80243BD0 00000000 */ nop /* 164434 80243BD4 468010A0 */ cvt.s.w $f2, $f2 /* 164438 80243BD8 46020000 */ add.s $f0, $f0, $f2 /* 16443C 80243BDC 00031823 */ negu $v1, $v1 /* 164440 80243BE0 44831000 */ mtc1 $v1, $f2 -/* 164444 80243BE4 00000000 */ nop +/* 164444 80243BE4 00000000 */ nop /* 164448 80243BE8 468010A0 */ cvt.s.w $f2, $f2 /* 16444C 80243BEC 46001080 */ add.s $f2, $f2, $f0 /* 164450 80243BF0 C4E00000 */ lwc1 $f0, ($a3) @@ -70,17 +70,17 @@ glabel func_80243B10 /* 164470 80243C10 44802000 */ mtc1 $zero, $f4 /* 164474 80243C14 00431023 */ subu $v0, $v0, $v1 /* 164478 80243C18 44820000 */ mtc1 $v0, $f0 -/* 16447C 80243C1C 00000000 */ nop +/* 16447C 80243C1C 00000000 */ nop /* 164480 80243C20 46800020 */ cvt.s.w $f0, $f0 /* 164484 80243C24 46040002 */ mul.s $f0, $f0, $f4 -/* 164488 80243C28 00000000 */ nop +/* 164488 80243C28 00000000 */ nop /* 16448C 80243C2C 44831000 */ mtc1 $v1, $f2 -/* 164490 80243C30 00000000 */ nop +/* 164490 80243C30 00000000 */ nop /* 164494 80243C34 468010A0 */ cvt.s.w $f2, $f2 /* 164498 80243C38 46020000 */ add.s $f0, $f0, $f2 /* 16449C 80243C3C 00031823 */ negu $v1, $v1 /* 1644A0 80243C40 44831000 */ mtc1 $v1, $f2 -/* 1644A4 80243C44 00000000 */ nop +/* 1644A4 80243C44 00000000 */ nop /* 1644A8 80243C48 468010A0 */ cvt.s.w $f2, $f2 /* 1644AC 80243C4C 46001080 */ add.s $f2, $f2, $f0 /* 1644B0 80243C50 C4C00000 */ lwc1 $f0, ($a2) @@ -92,17 +92,17 @@ glabel func_80243B10 /* 1644C8 80243C68 24020024 */ addiu $v0, $zero, 0x24 /* 1644CC 80243C6C 00431023 */ subu $v0, $v0, $v1 /* 1644D0 80243C70 44820000 */ mtc1 $v0, $f0 -/* 1644D4 80243C74 00000000 */ nop +/* 1644D4 80243C74 00000000 */ nop /* 1644D8 80243C78 46800020 */ cvt.s.w $f0, $f0 /* 1644DC 80243C7C 46040002 */ mul.s $f0, $f0, $f4 -/* 1644E0 80243C80 00000000 */ nop +/* 1644E0 80243C80 00000000 */ nop /* 1644E4 80243C84 44831000 */ mtc1 $v1, $f2 -/* 1644E8 80243C88 00000000 */ nop +/* 1644E8 80243C88 00000000 */ nop /* 1644EC 80243C8C 468010A0 */ cvt.s.w $f2, $f2 /* 1644F0 80243C90 46020000 */ add.s $f0, $f0, $f2 /* 1644F4 80243C94 00031823 */ negu $v1, $v1 /* 1644F8 80243C98 44831000 */ mtc1 $v1, $f2 -/* 1644FC 80243C9C 00000000 */ nop +/* 1644FC 80243C9C 00000000 */ nop /* 164500 80243CA0 468010A0 */ cvt.s.w $f2, $f2 /* 164504 80243CA4 46001080 */ add.s $f2, $f2, $f0 /* 164508 80243CA8 C4E00000 */ lwc1 $f0, ($a3) diff --git a/asm/nonmatchings/code_163400/func_80243CCC.s b/asm/nonmatchings/code_163400/func_80243CCC.s index 8fb9f1c8fe..9b018c4370 100644 --- a/asm/nonmatchings/code_163400/func_80243CCC.s +++ b/asm/nonmatchings/code_163400/func_80243CCC.s @@ -128,7 +128,7 @@ glabel func_80243CCC /* 164710 80243EB0 2A620014 */ slti $v0, $s3, 0x14 .L80243EB4: /* 164714 80243EB4 14400004 */ bnez $v0, .L80243EC8 -/* 164718 80243EB8 00000000 */ nop +/* 164718 80243EB8 00000000 */ nop /* 16471C 80243EBC 92820000 */ lbu $v0, ($s4) /* 164720 80243EC0 304200F7 */ andi $v0, $v0, 0xf7 /* 164724 80243EC4 A2820000 */ sb $v0, ($s4) diff --git a/asm/nonmatchings/code_163400/func_80244030.s b/asm/nonmatchings/code_163400/func_80244030.s index a41fb2eb78..e466f07569 100644 --- a/asm/nonmatchings/code_163400/func_80244030.s +++ b/asm/nonmatchings/code_163400/func_80244030.s @@ -31,7 +31,7 @@ glabel func_80244030 /* 1648F4 80244094 02463021 */ addu $a2, $s2, $a2 /* 1648F8 80244098 8E040000 */ lw $a0, ($s0) /* 1648FC 8024409C 0C0511F8 */ jal draw_icon_2 -/* 164900 802440A0 00000000 */ nop +/* 164900 802440A0 00000000 */ nop .L802440A4: /* 164904 802440A4 8FBF001C */ lw $ra, 0x1c($sp) /* 164908 802440A8 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/code_163400/func_802440BC.s b/asm/nonmatchings/code_163400/func_802440BC.s index 5c87aeb3c0..fd7ed13784 100644 --- a/asm/nonmatchings/code_163400/func_802440BC.s +++ b/asm/nonmatchings/code_163400/func_802440BC.s @@ -24,11 +24,11 @@ glabel func_802440BC /* 164968 80244108 80830004 */ lb $v1, 4($a0) /* 16496C 8024410C 24020004 */ addiu $v0, $zero, 4 /* 164970 80244110 146201E1 */ bne $v1, $v0, .L80244898 -/* 164974 80244114 00000000 */ nop +/* 164974 80244114 00000000 */ nop /* 164978 80244118 90820003 */ lbu $v0, 3($a0) /* 16497C 8024411C 2C420004 */ sltiu $v0, $v0, 4 /* 164980 80244120 104001DD */ beqz $v0, .L80244898 -/* 164984 80244124 00000000 */ nop +/* 164984 80244124 00000000 */ nop /* 164988 80244128 90820003 */ lbu $v0, 3($a0) /* 16498C 8024412C 3C038025 */ lui $v1, %hi(D_8024C094) /* 164990 80244130 8C63C094 */ lw $v1, %lo(D_8024C094)($v1) @@ -41,35 +41,35 @@ glabel func_802440BC /* 1649AC 8024414C 10620011 */ beq $v1, $v0, .L80244194 /* 1649B0 80244150 0064102A */ slt $v0, $v1, $a0 /* 1649B4 80244154 10400005 */ beqz $v0, .L8024416C -/* 1649B8 80244158 00000000 */ nop +/* 1649B8 80244158 00000000 */ nop /* 1649BC 8024415C 10600007 */ beqz $v1, .L8024417C -/* 1649C0 80244160 00000000 */ nop +/* 1649C0 80244160 00000000 */ nop /* 1649C4 80244164 0809106F */ j .L802441BC -/* 1649C8 80244168 00000000 */ nop +/* 1649C8 80244168 00000000 */ nop .L8024416C: /* 1649CC 8024416C 1064000F */ beq $v1, $a0, .L802441AC -/* 1649D0 80244170 00000000 */ nop +/* 1649D0 80244170 00000000 */ nop /* 1649D4 80244174 0809106F */ j .L802441BC -/* 1649D8 80244178 00000000 */ nop +/* 1649D8 80244178 00000000 */ nop .L8024417C: /* 1649DC 8024417C 3C014302 */ lui $at, 0x4302 /* 1649E0 80244180 4481C000 */ mtc1 $at, $f24 /* 1649E4 80244184 3C0142B4 */ lui $at, 0x42b4 /* 1649E8 80244188 4481B000 */ mtc1 $at, $f22 /* 1649EC 8024418C 08091073 */ j .L802441CC -/* 1649F0 80244190 00000000 */ nop +/* 1649F0 80244190 00000000 */ nop .L80244194: /* 1649F4 80244194 3C01433E */ lui $at, 0x433e /* 1649F8 80244198 4481C000 */ mtc1 $at, $f24 /* 1649FC 8024419C 3C0142B4 */ lui $at, 0x42b4 /* 164A00 802441A0 4481B000 */ mtc1 $at, $f22 /* 164A04 802441A4 08091073 */ j .L802441CC -/* 164A08 802441A8 00000000 */ nop +/* 164A08 802441A8 00000000 */ nop .L802441AC: /* 164A0C 802441AC 3C014302 */ lui $at, 0x4302 /* 164A10 802441B0 4481C000 */ mtc1 $at, $f24 /* 164A14 802441B4 08091071 */ j .L802441C4 -/* 164A18 802441B8 00000000 */ nop +/* 164A18 802441B8 00000000 */ nop .L802441BC: /* 164A1C 802441BC 3C01433E */ lui $at, 0x433e /* 164A20 802441C0 4481C000 */ mtc1 $at, $f24 @@ -82,19 +82,19 @@ glabel func_802440BC /* 164A34 802441D4 90430003 */ lbu $v1, 3($v0) /* 164A38 802441D8 24020001 */ addiu $v0, $zero, 1 /* 164A3C 802441DC 10620012 */ beq $v1, $v0, .L80244228 -/* 164A40 802441E0 00000000 */ nop +/* 164A40 802441E0 00000000 */ nop /* 164A44 802441E4 28620002 */ slti $v0, $v1, 2 /* 164A48 802441E8 50400005 */ beql $v0, $zero, .L80244200 /* 164A4C 802441EC 24020002 */ addiu $v0, $zero, 2 /* 164A50 802441F0 10600007 */ beqz $v1, .L80244210 -/* 164A54 802441F4 00000000 */ nop +/* 164A54 802441F4 00000000 */ nop /* 164A58 802441F8 08091094 */ j .L80244250 -/* 164A5C 802441FC 00000000 */ nop +/* 164A5C 802441FC 00000000 */ nop .L80244200: /* 164A60 80244200 1062000F */ beq $v1, $v0, .L80244240 -/* 164A64 80244204 00000000 */ nop +/* 164A64 80244204 00000000 */ nop /* 164A68 80244208 08091094 */ j .L80244250 -/* 164A6C 8024420C 00000000 */ nop +/* 164A6C 8024420C 00000000 */ nop .L80244210: /* 164A70 80244210 3C014302 */ lui $at, 0x4302 /* 164A74 80244214 44811000 */ mtc1 $at, $f2 @@ -113,7 +113,7 @@ glabel func_802440BC /* 164AA0 80244240 3C014302 */ lui $at, 0x4302 /* 164AA4 80244244 44811000 */ mtc1 $at, $f2 /* 164AA8 80244248 08091096 */ j .L80244258 -/* 164AAC 8024424C 00000000 */ nop +/* 164AAC 8024424C 00000000 */ nop .L80244250: /* 164AB0 80244250 3C01433E */ lui $at, 0x433e /* 164AB4 80244254 44811000 */ mtc1 $at, $f2 diff --git a/asm/nonmatchings/code_163400/func_802448E0.s b/asm/nonmatchings/code_163400/func_802448E0.s index 823ef020b4..25a752f9dd 100644 --- a/asm/nonmatchings/code_163400/func_802448E0.s +++ b/asm/nonmatchings/code_163400/func_802448E0.s @@ -40,7 +40,7 @@ glabel func_802448E0 /* 1651C8 80244968 3C018025 */ lui $at, %hi(D_8024C088) /* 1651CC 8024496C AC22C088 */ sw $v0, %lo(D_8024C088)($at) /* 1651D0 80244970 16800004 */ bnez $s4, .L80244984 -/* 1651D4 80244974 00000000 */ nop +/* 1651D4 80244974 00000000 */ nop /* 1651D8 80244978 3C028025 */ lui $v0, %hi(D_80249DCC) /* 1651DC 8024497C 8C429DCC */ lw $v0, %lo(D_80249DCC)($v0) /* 1651E0 80244980 AC400000 */ sw $zero, ($v0) @@ -75,7 +75,7 @@ glabel func_802448E0 /* 165244 802449E4 0C00ACB4 */ jal fio_load_game /* 165248 802449E8 0200202D */ daddu $a0, $s0, $zero /* 16524C 802449EC 14400003 */ bnez $v0, .L802449FC -/* 165250 802449F0 00000000 */ nop +/* 165250 802449F0 00000000 */ nop /* 165254 802449F4 0809128C */ j .L80244A30 /* 165258 802449F8 A2200000 */ sb $zero, ($s1) .L802449FC: @@ -102,7 +102,7 @@ glabel func_802448E0 /* 1652A8 80244A48 1440000E */ bnez $v0, .L80244A84 /* 1652AC 80244A4C 0260202D */ daddu $a0, $s3, $zero /* 1652B0 80244A50 0C00ABF6 */ jal fio_has_valid_backup -/* 1652B4 80244A54 00000000 */ nop +/* 1652B4 80244A54 00000000 */ nop /* 1652B8 80244A58 3C04800E */ lui $a0, %hi(D_800D95E8) /* 1652BC 80244A5C 248495E8 */ addiu $a0, $a0, %lo(D_800D95E8) /* 1652C0 80244A60 8C82003C */ lw $v0, 0x3c($a0) @@ -132,7 +132,7 @@ glabel func_802448E0 /* 165314 80244AB4 10400003 */ beqz $v0, .L80244AC4 /* 165318 80244AB8 26100001 */ addiu $s0, $s0, 1 /* 16531C 80244ABC 0040F809 */ jalr $v0 -/* 165320 80244AC0 00000000 */ nop +/* 165320 80244AC0 00000000 */ nop .L80244AC4: /* 165324 80244AC4 2A020004 */ slti $v0, $s0, 4 /* 165328 80244AC8 1440FFF8 */ bnez $v0, .L80244AAC diff --git a/asm/nonmatchings/code_163400/func_80244B00.s b/asm/nonmatchings/code_163400/func_80244B00.s index e3aedf5194..7ba40cf21f 100644 --- a/asm/nonmatchings/code_163400/func_80244B00.s +++ b/asm/nonmatchings/code_163400/func_80244B00.s @@ -15,7 +15,7 @@ glabel func_80244B00 /* 165384 80244B24 0C05123D */ jal free_icon /* 165388 80244B28 26100001 */ addiu $s0, $s0, 1 /* 16538C 80244B2C 1A00FFFB */ blez $s0, .L80244B1C -/* 165390 80244B30 00000000 */ nop +/* 165390 80244B30 00000000 */ nop /* 165394 80244B34 3C118025 */ lui $s1, %hi(D_80249B84) /* 165398 80244B38 26319B84 */ addiu $s1, $s1, %lo(D_80249B84) /* 16539C 80244B3C 0000802D */ daddu $s0, $zero, $zero @@ -26,9 +26,9 @@ glabel func_80244B00 /* 1653AC 80244B4C 26100001 */ addiu $s0, $s0, 1 /* 1653B0 80244B50 8C820018 */ lw $v0, 0x18($a0) /* 1653B4 80244B54 10400003 */ beqz $v0, .L80244B64 -/* 1653B8 80244B58 00000000 */ nop +/* 1653B8 80244B58 00000000 */ nop /* 1653BC 80244B5C 0040F809 */ jalr $v0 -/* 1653C0 80244B60 00000000 */ nop +/* 1653C0 80244B60 00000000 */ nop .L80244B64: /* 1653C4 80244B64 2A020004 */ slti $v0, $s0, 4 /* 1653C8 80244B68 1440FFF5 */ bnez $v0, .L80244B40 @@ -49,7 +49,7 @@ glabel func_80244B00 /* 165400 80244BA0 0C051F9F */ jal func_80147E7C /* 165404 80244BA4 24050002 */ addiu $a1, $zero, 2 /* 165408 80244BA8 0C0912F1 */ jal func_80244BC4 -/* 16540C 80244BAC 00000000 */ nop +/* 16540C 80244BAC 00000000 */ nop /* 165410 80244BB0 8FBF0018 */ lw $ra, 0x18($sp) /* 165414 80244BB4 8FB10014 */ lw $s1, 0x14($sp) /* 165418 80244BB8 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_163400/func_80244BC4.s b/asm/nonmatchings/code_163400/func_80244BC4.s index e87cb75576..fae7cd2d87 100644 --- a/asm/nonmatchings/code_163400/func_80244BC4.s +++ b/asm/nonmatchings/code_163400/func_80244BC4.s @@ -11,7 +11,7 @@ glabel func_80244BC4 /* 16543C 80244BDC 3C038025 */ lui $v1, %hi(D_8024C098) /* 165440 80244BE0 8063C098 */ lb $v1, %lo(D_8024C098)($v1) /* 165444 80244BE4 14620005 */ bne $v1, $v0, .L80244BFC -/* 165448 80244BE8 00000000 */ nop +/* 165448 80244BE8 00000000 */ nop /* 16544C 80244BEC 8C820004 */ lw $v0, 4($a0) /* 165450 80244BF0 90420003 */ lbu $v0, 3($v0) /* 165454 80244BF4 1040000B */ beqz $v0, .L80244C24 @@ -29,5 +29,5 @@ glabel func_80244BC4 /* 165480 80244C20 0000102D */ daddu $v0, $zero, $zero .L80244C24: /* 165484 80244C24 03E00008 */ jr $ra -/* 165488 80244C28 00000000 */ nop -/* 16548C 80244C2C 00000000 */ nop +/* 165488 80244C28 00000000 */ nop +/* 16548C 80244C2C 00000000 */ nop diff --git a/asm/nonmatchings/code_163400/pause_set_cursor_opacity.s b/asm/nonmatchings/code_163400/pause_set_cursor_opacity.s index a78cbd6abc..315205be0b 100644 --- a/asm/nonmatchings/code_163400/pause_set_cursor_opacity.s +++ b/asm/nonmatchings/code_163400/pause_set_cursor_opacity.s @@ -10,9 +10,9 @@ glabel pause_set_cursor_opacity /* 163414 80242BB4 14400075 */ bnez $v0, .L80242D8C /* 163418 80242BB8 28A2F581 */ slti $v0, $a1, -0xa7f /* 16341C 80242BBC 14400073 */ bnez $v0, .L80242D8C -/* 163420 80242BC0 00000000 */ nop +/* 163420 80242BC0 00000000 */ nop /* 163424 80242BC4 18C00071 */ blez $a2, .L80242D8C -/* 163428 80242BC8 00000000 */ nop +/* 163428 80242BC8 00000000 */ nop /* 16342C 80242BCC 18E0006F */ blez $a3, .L80242D8C /* 163430 80242BD0 28820500 */ slti $v0, $a0, 0x500 /* 163434 80242BD4 1040006D */ beqz $v0, .L80242D8C @@ -22,7 +22,7 @@ glabel pause_set_cursor_opacity /* 163444 80242BE4 10400069 */ beqz $v0, .L80242D8C /* 163448 80242BE8 28E20A80 */ slti $v0, $a3, 0xa80 /* 16344C 80242BEC 10400067 */ beqz $v0, .L80242D8C -/* 163450 80242BF0 00000000 */ nop +/* 163450 80242BF0 00000000 */ nop /* 163454 80242BF4 3C02800A */ lui $v0, %hi(gMasterGfxPos) /* 163458 80242BF8 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) /* 16345C 80242BFC 8C480000 */ lw $t0, ($v0) @@ -141,4 +141,4 @@ glabel pause_set_cursor_opacity /* 1635E8 80242D88 AC820004 */ sw $v0, 4($a0) .L80242D8C: /* 1635EC 80242D8C 03E00008 */ jr $ra -/* 1635F0 80242D90 00000000 */ nop +/* 1635F0 80242D90 00000000 */ nop diff --git a/asm/nonmatchings/code_165490/func_80244C30.s b/asm/nonmatchings/code_165490/func_80244C30.s index fadab4cfa4..d205d91a5e 100644 --- a/asm/nonmatchings/code_165490/func_80244C30.s +++ b/asm/nonmatchings/code_165490/func_80244C30.s @@ -14,24 +14,29 @@ glabel func_80244C30 /* 1654B4 80244C54 10400013 */ beqz $v0, .L80244CA4 /* 1654B8 80244C58 00C0982D */ daddu $s3, $a2, $zero /* 1654BC 80244C5C 00031080 */ sll $v0, $v1, 2 -/* 1654C0 80244C60 3C018025 */ lui $at, %hi(D_8024BF70) +/* 1654C0 80244C60 3C018025 */ lui $at, %hi(jtbl_8024BF70_16C7D0) /* 1654C4 80244C64 00220821 */ addu $at, $at, $v0 -/* 1654C8 80244C68 8C22BF70 */ lw $v0, %lo(D_8024BF70)($at) +/* 1654C8 80244C68 8C22BF70 */ lw $v0, %lo(jtbl_8024BF70_16C7D0)($at) /* 1654CC 80244C6C 00400008 */ jr $v0 /* 1654D0 80244C70 00000000 */ nop +glabel L80244C74_1654D4 /* 1654D4 80244C74 24040001 */ addiu $a0, $zero, 1 /* 1654D8 80244C78 0809132B */ j .L80244CAC /* 1654DC 80244C7C 24110009 */ addiu $s1, $zero, 9 +glabel L80244C80_1654E0 /* 1654E0 80244C80 24040002 */ addiu $a0, $zero, 2 /* 1654E4 80244C84 0809132B */ j .L80244CAC /* 1654E8 80244C88 24110008 */ addiu $s1, $zero, 8 +glabel L80244C8C_1654EC /* 1654EC 80244C8C 24040004 */ addiu $a0, $zero, 4 /* 1654F0 80244C90 0809132B */ j .L80244CAC /* 1654F4 80244C94 24110019 */ addiu $s1, $zero, 0x19 +glabel L80244C98_1654F8 /* 1654F8 80244C98 24040005 */ addiu $a0, $zero, 5 /* 1654FC 80244C9C 0809132B */ j .L80244CAC /* 165500 80244CA0 24110010 */ addiu $s1, $zero, 0x10 .L80244CA4: +glabel L80244CA4_165504 /* 165504 80244CA4 24040003 */ addiu $a0, $zero, 3 /* 165508 80244CA8 2411000A */ addiu $s1, $zero, 0xa .L80244CAC: diff --git a/asm/nonmatchings/code_165490/func_80245A40.s b/asm/nonmatchings/code_165490/func_80245A40.s index 7da1564c0c..e4c2595426 100644 --- a/asm/nonmatchings/code_165490/func_80245A40.s +++ b/asm/nonmatchings/code_165490/func_80245A40.s @@ -117,14 +117,15 @@ glabel func_80245A40 /* 166448 80245BE8 2C620005 */ sltiu $v0, $v1, 5 /* 16644C 80245BEC 1040001F */ beqz $v0, .L80245C6C /* 166450 80245BF0 00031080 */ sll $v0, $v1, 2 -/* 166454 80245BF4 3C018025 */ lui $at, %hi(D_8024BF88) +/* 166454 80245BF4 3C018025 */ lui $at, %hi(jtbl_8024BF88_16C7E8) /* 166458 80245BF8 00220821 */ addu $at, $at, $v0 -/* 16645C 80245BFC 8C22BF88 */ lw $v0, %lo(D_8024BF88)($at) +/* 16645C 80245BFC 8C22BF88 */ lw $v0, %lo(jtbl_8024BF88_16C7E8)($at) /* 166460 80245C00 00400008 */ jr $v0 /* 166464 80245C04 00000000 */ nop .L80245C08: /* 166468 80245C08 080916DC */ j .L80245B70 /* 16646C 80245C0C A2620001 */ sb $v0, 1($s3) +glabel L80245C10_166470 /* 166470 80245C10 82630001 */ lb $v1, 1($s3) /* 166474 80245C14 24020001 */ addiu $v0, $zero, 1 /* 166478 80245C18 14620014 */ bne $v1, $v0, .L80245C6C @@ -135,6 +136,7 @@ glabel func_80245A40 /* 16648C 80245C2C A2600001 */ sb $zero, 1($s3) /* 166490 80245C30 0809171B */ j .L80245C6C /* 166494 80245C34 00000000 */ nop +glabel L80245C38_166498 /* 166498 80245C38 82630001 */ lb $v1, 1($s3) /* 16649C 80245C3C 24020001 */ addiu $v0, $zero, 1 /* 1664A0 80245C40 14620005 */ bne $v1, $v0, .L80245C58 @@ -240,11 +242,12 @@ glabel func_80245A40 /* 166610 80245DB0 104002CD */ beqz $v0, .L802468E8 /* 166614 80245DB4 0000202D */ daddu $a0, $zero, $zero /* 166618 80245DB8 00031080 */ sll $v0, $v1, 2 -/* 16661C 80245DBC 3C018025 */ lui $at, %hi(D_8024BFA0) +/* 16661C 80245DBC 3C018025 */ lui $at, %hi(jtbl_8024BFA0_16C800) /* 166620 80245DC0 00220821 */ addu $at, $at, $v0 -/* 166624 80245DC4 8C22BFA0 */ lw $v0, %lo(D_8024BFA0)($at) +/* 166624 80245DC4 8C22BFA0 */ lw $v0, %lo(jtbl_8024BFA0_16C800)($at) /* 166628 80245DC8 00400008 */ jr $v0 /* 16662C 80245DCC 00000000 */ nop +glabel L80245DD0_166630 /* 166630 80245DD0 92620003 */ lbu $v0, 3($s3) /* 166634 80245DD4 2C420004 */ sltiu $v0, $v0, 4 /* 166638 80245DD8 10400007 */ beqz $v0, .L80245DF8 @@ -518,6 +521,7 @@ glabel func_80245A40 /* 166A3C 802461DC A022C098 */ sb $v0, %lo(D_8024C098)($at) /* 166A40 802461E0 08091A37 */ j .L802468DC /* 166A44 802461E4 24020004 */ addiu $v0, $zero, 4 +glabel L802461E8_166A48 /* 166A48 802461E8 92630003 */ lbu $v1, 3($s3) /* 166A4C 802461EC 24020006 */ addiu $v0, $zero, 6 /* 166A50 802461F0 14620018 */ bne $v1, $v0, .L80246254 @@ -621,6 +625,7 @@ glabel func_80245A40 /* 166BC4 80246364 A022C098 */ sb $v0, %lo(D_8024C098)($at) /* 166BC8 80246368 08091A38 */ j .L802468E0 /* 166BCC 8024636C A0800004 */ sb $zero, 4($a0) +glabel L80246370_166BD0 /* 166BD0 80246370 92630003 */ lbu $v1, 3($s3) /* 166BD4 80246374 24020006 */ addiu $v0, $zero, 6 /* 166BD8 80246378 14620018 */ bne $v1, $v0, .L802463DC @@ -666,6 +671,7 @@ glabel func_80245A40 /* 166C74 80246414 AC23C094 */ sw $v1, %lo(D_8024C094)($at) /* 166C78 80246418 08091A3A */ j .L802468E8 /* 166C7C 8024641C 00000000 */ nop +glabel L80246420_166C80 /* 166C80 80246420 92630003 */ lbu $v1, 3($s3) /* 166C84 80246424 24020006 */ addiu $v0, $zero, 6 /* 166C88 80246428 14620009 */ bne $v1, $v0, .L80246450 @@ -873,6 +879,7 @@ glabel func_80245A40 /* 166F80 80246720 A022C098 */ sb $v0, %lo(D_8024C098)($at) /* 166F84 80246724 08091A37 */ j .L802468DC /* 166F88 80246728 24020003 */ addiu $v0, $zero, 3 +glabel L8024672C_166F8C /* 166F8C 8024672C 92630003 */ lbu $v1, 3($s3) /* 166F90 80246730 24020006 */ addiu $v0, $zero, 6 /* 166F94 80246734 14620007 */ bne $v1, $v0, .L80246754 @@ -1002,14 +1009,16 @@ glabel func_80245A40 /* 167160 80246900 2C620005 */ sltiu $v0, $v1, 5 /* 167164 80246904 1040000E */ beqz $v0, .L80246940 /* 167168 80246908 00031080 */ sll $v0, $v1, 2 -/* 16716C 8024690C 3C018025 */ lui $at, %hi(D_8024BFB8) +/* 16716C 8024690C 3C018025 */ lui $at, %hi(jtbl_8024BFB8_16C818) /* 167170 80246910 00220821 */ addu $at, $at, $v0 -/* 167174 80246914 8C22BFB8 */ lw $v0, %lo(D_8024BFB8)($at) +/* 167174 80246914 8C22BFB8 */ lw $v0, %lo(jtbl_8024BFB8_16C818)($at) /* 167178 80246918 00400008 */ jr $v0 /* 16717C 8024691C 00000000 */ nop +glabel L80246920_167180 /* 167180 80246920 0260202D */ daddu $a0, $s3, $zero /* 167184 80246924 08091A4D */ j .L80246934 /* 167188 80246928 24050002 */ addiu $a1, $zero, 2 +glabel L8024692C_16718C /* 16718C 8024692C 0260202D */ daddu $a0, $s3, $zero /* 167190 80246930 24050001 */ addiu $a1, $zero, 1 .L80246934: @@ -1020,11 +1029,12 @@ glabel func_80245A40 /* 1671A0 80246940 2C620005 */ sltiu $v0, $v1, 5 /* 1671A4 80246944 10400072 */ beqz $v0, .L80246B10 /* 1671A8 80246948 00031080 */ sll $v0, $v1, 2 -/* 1671AC 8024694C 3C018025 */ lui $at, %hi(D_8024BFD0) +/* 1671AC 8024694C 3C018025 */ lui $at, %hi(jtbl_8024BFD0_16C830) /* 1671B0 80246950 00220821 */ addu $at, $at, $v0 -/* 1671B4 80246954 8C22BFD0 */ lw $v0, %lo(D_8024BFD0)($at) +/* 1671B4 80246954 8C22BFD0 */ lw $v0, %lo(jtbl_8024BFD0_16C830)($at) /* 1671B8 80246958 00400008 */ jr $v0 /* 1671BC 8024695C 00000000 */ nop +glabel L80246960_1671C0 /* 1671C0 80246960 24040033 */ addiu $a0, $zero, 0x33 /* 1671C4 80246964 3C128024 */ lui $s2, %hi(func_8024368C) /* 1671C8 80246968 2652368C */ addiu $s2, $s2, %lo(func_8024368C) @@ -1066,6 +1076,7 @@ glabel func_80245A40 /* 167258 802469F8 240400D6 */ addiu $a0, $zero, 0xd6 /* 16725C 802469FC 08091AC2 */ j .L80246B08 /* 167260 80246A00 2404000F */ addiu $a0, $zero, 0xf +glabel L80246A04_167264 /* 167264 80246A04 A2600004 */ sb $zero, 4($s3) /* 167268 80246A08 0260202D */ daddu $a0, $s3, $zero /* 16726C 80246A0C 0000282D */ daddu $a1, $zero, $zero @@ -1089,6 +1100,7 @@ glabel func_80245A40 /* 1672B4 80246A54 0200282D */ daddu $a1, $s0, $zero /* 1672B8 80246A58 08091ABB */ j .L80246AEC /* 1672BC 80246A5C 00000000 */ nop +glabel L80246A60_1672C0 /* 1672C0 80246A60 A2600004 */ sb $zero, 4($s3) /* 1672C4 80246A64 0260202D */ daddu $a0, $s3, $zero /* 1672C8 80246A68 24050001 */ addiu $a1, $zero, 1 @@ -1112,6 +1124,7 @@ glabel func_80245A40 /* 167310 80246AB0 0200282D */ daddu $a1, $s0, $zero /* 167314 80246AB4 08091ABB */ j .L80246AEC /* 167318 80246AB8 00000000 */ nop +glabel L80246ABC_16731C /* 16731C 80246ABC 24020003 */ addiu $v0, $zero, 3 /* 167320 80246AC0 A2620004 */ sb $v0, 4($s3) /* 167324 80246AC4 3C058025 */ lui $a1, %hi(D_8024C094) @@ -1129,6 +1142,7 @@ glabel func_80245A40 /* 167350 80246AF0 240400CA */ addiu $a0, $zero, 0xca /* 167354 80246AF4 08091AC4 */ j .L80246B10 /* 167358 80246AF8 00000000 */ nop +glabel L80246AFC_16735C /* 16735C 80246AFC 0C05272D */ jal play_sound /* 167360 80246B00 240400CA */ addiu $a0, $zero, 0xca /* 167364 80246B04 2404000D */ addiu $a0, $zero, 0xd diff --git a/asm/nonmatchings/code_167570/func_80246D10.s b/asm/nonmatchings/code_167570/func_80246D10.s index 678a8bd829..8a8d0d5c79 100644 --- a/asm/nonmatchings/code_167570/func_80246D10.s +++ b/asm/nonmatchings/code_167570/func_80246D10.s @@ -18,11 +18,12 @@ glabel func_80246D10 /* 1675A4 80246D44 1040000B */ beqz $v0, .L80246D74 /* 1675A8 80246D48 00C0A82D */ daddu $s5, $a2, $zero /* 1675AC 80246D4C 00031080 */ sll $v0, $v1, 2 -/* 1675B0 80246D50 3C018025 */ lui $at, %hi(D_8024BFE8) +/* 1675B0 80246D50 3C018025 */ lui $at, %hi(jtbl_8024BFE8_16C848) /* 1675B4 80246D54 00220821 */ addu $at, $at, $v0 -/* 1675B8 80246D58 8C22BFE8 */ lw $v0, %lo(D_8024BFE8)($at) +/* 1675B8 80246D58 8C22BFE8 */ lw $v0, %lo(jtbl_8024BFE8_16C848)($at) /* 1675BC 80246D5C 00400008 */ jr $v0 -/* 1675C0 80246D60 00000000 */ nop +/* 1675C0 80246D60 00000000 */ nop +glabel L80246D64_1675C4 /* 1675C4 80246D64 2413001C */ addiu $s3, $zero, 0x1c /* 1675C8 80246D68 24120004 */ addiu $s2, $zero, 4 /* 1675CC 80246D6C 0260882D */ daddu $s1, $s3, $zero @@ -50,7 +51,7 @@ glabel func_80246D10 /* 167620 80246DC0 8063C098 */ lb $v1, %lo(D_8024C098)($v1) /* 167624 80246DC4 24020001 */ addiu $v0, $zero, 1 /* 167628 80246DC8 1462000C */ bne $v1, $v0, .L80246DFC -/* 16762C 80246DCC 00000000 */ nop +/* 16762C 80246DCC 00000000 */ nop /* 167630 80246DD0 92C20003 */ lbu $v0, 3($s6) /* 167634 80246DD4 14400004 */ bnez $v0, .L80246DE8 /* 167638 80246DD8 2623FFF6 */ addiu $v1, $s1, -0xa diff --git a/asm/nonmatchings/code_167570/func_80246E24.s b/asm/nonmatchings/code_167570/func_80246E24.s index 9da9f3d63e..f723989983 100644 --- a/asm/nonmatchings/code_167570/func_80246E24.s +++ b/asm/nonmatchings/code_167570/func_80246E24.s @@ -15,11 +15,12 @@ glabel func_80246E24 /* 1676AC 80246E4C 104000CA */ beqz $v0, .L80247178 /* 1676B0 80246E50 00C0A02D */ daddu $s4, $a2, $zero /* 1676B4 80246E54 00031080 */ sll $v0, $v1, 2 -/* 1676B8 80246E58 3C018025 */ lui $at, %hi(D_8024C000) +/* 1676B8 80246E58 3C018025 */ lui $at, %hi(jtbl_8024C000_16C860) /* 1676BC 80246E5C 00220821 */ addu $at, $at, $v0 -/* 1676C0 80246E60 8C22C000 */ lw $v0, %lo(D_8024C000)($at) +/* 1676C0 80246E60 8C22C000 */ lw $v0, %lo(jtbl_8024C000_16C860)($at) /* 1676C4 80246E64 00400008 */ jr $v0 -/* 1676C8 80246E68 00000000 */ nop +/* 1676C8 80246E68 00000000 */ nop +glabel L80246E6C_1676CC /* 1676CC 80246E6C 0C0926A9 */ jal func_80249AA4 /* 1676D0 80246E70 24040010 */ addiu $a0, $zero, 0x10 /* 1676D4 80246E74 0040202D */ daddu $a0, $v0, $zero @@ -57,6 +58,7 @@ glabel func_80246E24 /* 167754 80246EF4 0040202D */ daddu $a0, $v0, $zero /* 167758 80246EF8 08091C59 */ j .L80247164 /* 16775C 80246EFC 26650063 */ addiu $a1, $s3, 0x63 +glabel L80246F00_167760 /* 167760 80246F00 0C0926A9 */ jal func_80249AA4 /* 167764 80246F04 24040016 */ addiu $a0, $zero, 0x16 /* 167768 80246F08 0040202D */ daddu $a0, $v0, $zero @@ -96,6 +98,7 @@ glabel func_80246E24 /* 1677F0 80246F90 0220282D */ daddu $a1, $s1, $zero /* 1677F4 80246F94 08091C5A */ j .L80247168 /* 1677F8 80246F98 26860012 */ addiu $a2, $s4, 0x12 +glabel L80246F9C_1677FC /* 1677FC 80246F9C 0C0926A9 */ jal func_80249AA4 /* 167800 80246FA0 24040011 */ addiu $a0, $zero, 0x11 /* 167804 80246FA4 0040202D */ daddu $a0, $v0, $zero @@ -112,6 +115,7 @@ glabel func_80246E24 /* 167830 80246FD0 0200282D */ daddu $a1, $s0, $zero /* 167834 80246FD4 08091C5A */ j .L80247168 /* 167838 80246FD8 26860012 */ addiu $a2, $s4, 0x12 +glabel L80246FDC_16783C /* 16783C 80246FDC 0C0926A9 */ jal func_80249AA4 /* 167840 80246FE0 24040013 */ addiu $a0, $zero, 0x13 /* 167844 80246FE4 0040202D */ daddu $a0, $v0, $zero @@ -176,6 +180,7 @@ glabel func_80246E24 /* 167928 802470C8 26650046 */ addiu $a1, $s3, 0x46 /* 16792C 802470CC 08091C5A */ j .L80247168 /* 167930 802470D0 26860026 */ addiu $a2, $s4, 0x26 +glabel L802470D4_167934 /* 167934 802470D4 0C0926A9 */ jal func_80249AA4 /* 167938 802470D8 24040019 */ addiu $a0, $zero, 0x19 /* 16793C 802470DC 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_167570/func_802471EC.s b/asm/nonmatchings/code_167570/func_802471EC.s index 1ab3f7932f..f2f8595b30 100644 --- a/asm/nonmatchings/code_167570/func_802471EC.s +++ b/asm/nonmatchings/code_167570/func_802471EC.s @@ -14,7 +14,7 @@ glabel func_802471EC /* 167A70 80247210 92450003 */ lbu $a1, 3($s2) /* 167A74 80247214 00431024 */ and $v0, $v0, $v1 /* 167A78 80247218 10400007 */ beqz $v0, .L80247238 -/* 167A7C 8024721C 00000000 */ nop +/* 167A7C 8024721C 00000000 */ nop /* 167A80 80247220 92420002 */ lbu $v0, 2($s2) /* 167A84 80247224 2442FFFF */ addiu $v0, $v0, -1 /* 167A88 80247228 A2420002 */ sb $v0, 2($s2) @@ -27,7 +27,7 @@ glabel func_802471EC /* 167AA0 80247240 3C030002 */ lui $v1, 2 /* 167AA4 80247244 00431024 */ and $v0, $v0, $v1 /* 167AA8 80247248 1040000C */ beqz $v0, .L8024727C -/* 167AAC 8024724C 00000000 */ nop +/* 167AAC 8024724C 00000000 */ nop /* 167AB0 80247250 92420002 */ lbu $v0, 2($s2) /* 167AB4 80247254 82430006 */ lb $v1, 6($s2) /* 167AB8 80247258 24420001 */ addiu $v0, $v0, 1 @@ -45,11 +45,11 @@ glabel func_802471EC /* 167AE4 80247284 00430018 */ mult $v0, $v1 /* 167AE8 80247288 00003812 */ mflo $a3 /* 167AEC 8024728C 82420006 */ lb $v0, 6($s2) -/* 167AF0 80247290 00000000 */ nop +/* 167AF0 80247290 00000000 */ nop /* 167AF4 80247294 00E20018 */ mult $a3, $v0 /* 167AF8 80247298 00002012 */ mflo $a0 /* 167AFC 8024729C 82420002 */ lb $v0, 2($s2) -/* 167B00 802472A0 00000000 */ nop +/* 167B00 802472A0 00000000 */ nop /* 167B04 802472A4 00620018 */ mult $v1, $v0 /* 167B08 802472A8 00001812 */ mflo $v1 /* 167B0C 802472AC 00831821 */ addu $v1, $a0, $v1 @@ -61,7 +61,7 @@ glabel func_802471EC /* 167B24 802472C4 A2420003 */ sb $v0, 3($s2) /* 167B28 802472C8 304200FF */ andi $v0, $v0, 0xff /* 167B2C 802472CC 10A20003 */ beq $a1, $v0, .L802472DC -/* 167B30 802472D0 00000000 */ nop +/* 167B30 802472D0 00000000 */ nop /* 167B34 802472D4 0C05272D */ jal play_sound /* 167B38 802472D8 240400C7 */ addiu $a0, $zero, 0xc7 .L802472DC: @@ -84,26 +84,27 @@ glabel func_802471EC /* 167B78 80247318 8C42C084 */ lw $v0, %lo(D_8024C084)($v0) /* 167B7C 8024731C 30428000 */ andi $v0, $v0, 0x8000 /* 167B80 80247320 10400225 */ beqz $v0, .L80247BB8 -/* 167B84 80247324 00000000 */ nop +/* 167B84 80247324 00000000 */ nop /* 167B88 80247328 0C05272D */ jal play_sound /* 167B8C 8024732C 240400C9 */ addiu $a0, $zero, 0xc9 /* 167B90 80247330 92430003 */ lbu $v1, 3($s2) /* 167B94 80247334 10600005 */ beqz $v1, .L8024734C /* 167B98 80247338 24020001 */ addiu $v0, $zero, 1 /* 167B9C 8024733C 106201D8 */ beq $v1, $v0, .L80247AA0 -/* 167BA0 80247340 00000000 */ nop +/* 167BA0 80247340 00000000 */ nop /* 167BA4 80247344 08091EEE */ j .L80247BB8 -/* 167BA8 80247348 00000000 */ nop +/* 167BA8 80247348 00000000 */ nop .L8024734C: /* 167BAC 8024734C 82430004 */ lb $v1, 4($s2) /* 167BB0 80247350 2C620005 */ sltiu $v0, $v1, 5 /* 167BB4 80247354 10400218 */ beqz $v0, .L80247BB8 /* 167BB8 80247358 00031080 */ sll $v0, $v1, 2 -/* 167BBC 8024735C 3C018025 */ lui $at, %hi(D_8024C018) +/* 167BBC 8024735C 3C018025 */ lui $at, %hi(jtbl_8024C018_16C878) /* 167BC0 80247360 00220821 */ addu $at, $at, $v0 -/* 167BC4 80247364 8C22C018 */ lw $v0, %lo(D_8024C018)($at) +/* 167BC4 80247364 8C22C018 */ lw $v0, %lo(jtbl_8024C018_16C878)($at) /* 167BC8 80247368 00400008 */ jr $v0 -/* 167BCC 8024736C 00000000 */ nop +/* 167BCC 8024736C 00000000 */ nop +glabel L80247370_167BD0 /* 167BD0 80247370 24020002 */ addiu $v0, $zero, 2 /* 167BD4 80247374 3C038025 */ lui $v1, %hi(D_80249B8C) /* 167BD8 80247378 8C639B8C */ lw $v1, %lo(D_80249B8C)($v1) @@ -201,7 +202,8 @@ glabel func_802471EC /* 167D34 802474D4 00300821 */ addu $at, $at, $s0 /* 167D38 802474D8 A0207A24 */ sb $zero, %lo(D_80077A24)($at) /* 167D3C 802474DC 08091EEE */ j .L80247BB8 -/* 167D40 802474E0 00000000 */ nop +/* 167D40 802474E0 00000000 */ nop +glabel L802474E4_167D44 /* 167D44 802474E4 24020002 */ addiu $v0, $zero, 2 /* 167D48 802474E8 3C018025 */ lui $at, %hi(D_8024C098) /* 167D4C 802474EC A022C098 */ sb $v0, %lo(D_8024C098)($at) @@ -302,6 +304,7 @@ glabel func_802471EC /* 167EB8 80247658 8E030000 */ lw $v1, ($s0) /* 167EBC 8024765C 08091DF9 */ j .L802477E4 /* 167EC0 80247660 24020001 */ addiu $v0, $zero, 1 +glabel L80247664_167EC4 /* 167EC4 80247664 24020002 */ addiu $v0, $zero, 2 /* 167EC8 80247668 3C018025 */ lui $at, %hi(D_8024C098) /* 167ECC 8024766C A022C098 */ sb $v0, %lo(D_8024C098)($at) @@ -407,11 +410,12 @@ glabel func_802471EC /* 168048 802477E8 00230821 */ addu $at, $at, $v1 /* 16804C 802477EC A0227A24 */ sb $v0, %lo(D_80077A24)($at) /* 168050 802477F0 08091EEE */ j .L80247BB8 -/* 168054 802477F4 00000000 */ nop +/* 168054 802477F4 00000000 */ nop +glabel L802477F8_168058 /* 168058 802477F8 0C039CE8 */ jal clear_player_data -/* 16805C 802477FC 00000000 */ nop +/* 16805C 802477FC 00000000 */ nop /* 168060 80247800 0C0514C8 */ jal clear_saved_variables -/* 168064 80247804 00000000 */ nop +/* 168064 80247804 00000000 */ nop /* 168068 80247808 0000202D */ daddu $a0, $zero, $zero /* 16806C 8024780C 3C05F5DE */ lui $a1, 0xf5de /* 168070 80247810 34A50180 */ ori $a1, $a1, 0x180 @@ -558,6 +562,7 @@ glabel func_802471EC /* 168290 80247A30 2404002F */ addiu $a0, $zero, 0x2f /* 168294 80247A34 08091EEC */ j .L80247BB0 /* 168298 80247A38 24050001 */ addiu $a1, $zero, 1 +glabel L80247A3C_16829C /* 16829C 80247A3C 3C05800E */ lui $a1, %hi(D_800D95E8) /* 1682A0 80247A40 24A595E8 */ addiu $a1, $a1, %lo(D_800D95E8) /* 1682A4 80247A44 24060001 */ addiu $a2, $zero, 1 @@ -584,23 +589,25 @@ glabel func_802471EC /* 1682F0 80247A90 0C00CD3C */ jal set_game_mode /* 1682F4 80247A94 2404000F */ addiu $a0, $zero, 0xf /* 1682F8 80247A98 08091EEE */ j .L80247BB8 -/* 1682FC 80247A9C 00000000 */ nop +/* 1682FC 80247A9C 00000000 */ nop .L80247AA0: /* 168300 80247AA0 82430004 */ lb $v1, 4($s2) /* 168304 80247AA4 2C620005 */ sltiu $v0, $v1, 5 /* 168308 80247AA8 10400043 */ beqz $v0, .L80247BB8 /* 16830C 80247AAC 00031080 */ sll $v0, $v1, 2 -/* 168310 80247AB0 3C018025 */ lui $at, %hi(D_8024C030) +/* 168310 80247AB0 3C018025 */ lui $at, %hi(jtbl_8024C030_16C890) /* 168314 80247AB4 00220821 */ addu $at, $at, $v0 -/* 168318 80247AB8 8C22C030 */ lw $v0, %lo(D_8024C030)($at) +/* 168318 80247AB8 8C22C030 */ lw $v0, %lo(jtbl_8024C030_16C890)($at) /* 16831C 80247ABC 00400008 */ jr $v0 -/* 168320 80247AC0 00000000 */ nop +/* 168320 80247AC0 00000000 */ nop +glabel L80247AC4_168324 /* 168324 80247AC4 3C018025 */ lui $at, %hi(D_8024C098) /* 168328 80247AC8 A020C098 */ sb $zero, %lo(D_8024C098)($at) /* 16832C 80247ACC 3C058024 */ lui $a1, %hi(func_80243EEC) /* 168330 80247AD0 24A53EEC */ addiu $a1, $a1, %lo(func_80243EEC) /* 168334 80247AD4 08091EEC */ j .L80247BB0 /* 168338 80247AD8 24040032 */ addiu $a0, $zero, 0x32 +glabel L80247ADC_16833C /* 16833C 80247ADC 24020003 */ addiu $v0, $zero, 3 /* 168340 80247AE0 3C018025 */ lui $at, %hi(D_8024C098) /* 168344 80247AE4 A022C098 */ sb $v0, %lo(D_8024C098)($at) @@ -608,6 +615,7 @@ glabel func_802471EC /* 16834C 80247AEC 24A53EEC */ addiu $a1, $a1, %lo(func_80243EEC) /* 168350 80247AF0 08091EEC */ j .L80247BB0 /* 168354 80247AF4 24040032 */ addiu $a0, $zero, 0x32 +glabel L80247AF8_168358 /* 168358 80247AF8 2404002D */ addiu $a0, $zero, 0x2d /* 16835C 80247AFC 3C108024 */ lui $s0, %hi(func_8024381C) /* 168360 80247B00 2610381C */ addiu $s0, $s0, %lo(func_8024381C) @@ -656,13 +664,13 @@ glabel func_802471EC /* 16840C 80247BAC 24050002 */ addiu $a1, $zero, 2 .L80247BB0: /* 168410 80247BB0 0C051F9F */ jal func_80147E7C -/* 168414 80247BB4 00000000 */ nop +/* 168414 80247BB4 00000000 */ nop .L80247BB8: /* 168418 80247BB8 3C028025 */ lui $v0, %hi(D_8024C084) /* 16841C 80247BBC 8C42C084 */ lw $v0, %lo(D_8024C084)($v0) /* 168420 80247BC0 30424000 */ andi $v0, $v0, 0x4000 /* 168424 80247BC4 1040004D */ beqz $v0, .L80247CFC -/* 168428 80247BC8 00000000 */ nop +/* 168428 80247BC8 00000000 */ nop /* 16842C 80247BCC 0C05272D */ jal play_sound /* 168430 80247BD0 240400CA */ addiu $a0, $zero, 0xca /* 168434 80247BD4 0240202D */ daddu $a0, $s2, $zero @@ -673,17 +681,19 @@ glabel func_802471EC /* 168448 80247BE8 2C820005 */ sltiu $v0, $a0, 5 /* 16844C 80247BEC 10400043 */ beqz $v0, .L80247CFC /* 168450 80247BF0 00041080 */ sll $v0, $a0, 2 -/* 168454 80247BF4 3C018025 */ lui $at, %hi(pause_partners_draw_movelist_title) +/* 168454 80247BF4 3C018025 */ lui $at, %hi(jtbl_8024C048_16C8A8) /* 168458 80247BF8 00220821 */ addu $at, $at, $v0 -/* 16845C 80247BFC 8C22C048 */ lw $v0, %lo(pause_partners_draw_movelist_title)($at) +/* 16845C 80247BFC 8C22C048 */ lw $v0, %lo(jtbl_8024C048_16C8A8)($at) /* 168460 80247C00 00400008 */ jr $v0 -/* 168464 80247C04 00000000 */ nop +/* 168464 80247C04 00000000 */ nop +glabel L80247C08_168468 /* 168468 80247C08 3C018025 */ lui $at, %hi(D_8024C098) /* 16846C 80247C0C A020C098 */ sb $zero, %lo(D_8024C098)($at) /* 168470 80247C10 3C058024 */ lui $a1, %hi(func_80243EEC) /* 168474 80247C14 24A53EEC */ addiu $a1, $a1, %lo(func_80243EEC) /* 168478 80247C18 08091F3D */ j .L80247CF4 /* 16847C 80247C1C 24040032 */ addiu $a0, $zero, 0x32 +glabel L80247C20_168480 /* 168480 80247C20 24020003 */ addiu $v0, $zero, 3 /* 168484 80247C24 3C018025 */ lui $at, %hi(D_8024C098) /* 168488 80247C28 A022C098 */ sb $v0, %lo(D_8024C098)($at) @@ -691,6 +701,7 @@ glabel func_802471EC /* 168490 80247C30 24A53EEC */ addiu $a1, $a1, %lo(func_80243EEC) /* 168494 80247C34 08091F3D */ j .L80247CF4 /* 168498 80247C38 24040032 */ addiu $a0, $zero, 0x32 +glabel L80247C3C_16849C /* 16849C 80247C3C 2404002D */ addiu $a0, $zero, 0x2d /* 1684A0 80247C40 3C108024 */ lui $s0, %hi(func_8024381C) /* 1684A4 80247C44 2610381C */ addiu $s0, $s0, %lo(func_8024381C) @@ -739,7 +750,7 @@ glabel func_802471EC /* 168550 80247CF0 24050002 */ addiu $a1, $zero, 2 .L80247CF4: /* 168554 80247CF4 0C051F9F */ jal func_80147E7C -/* 168558 80247CF8 00000000 */ nop +/* 168558 80247CF8 00000000 */ nop .L80247CFC: /* 16855C 80247CFC 8FBF001C */ lw $ra, 0x1c($sp) /* 168560 80247D00 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/code_168590/func_80248BF4.s b/asm/nonmatchings/code_168590/func_80248BF4.s index 2f235bfed7..b238647361 100644 --- a/asm/nonmatchings/code_168590/func_80248BF4.s +++ b/asm/nonmatchings/code_168590/func_80248BF4.s @@ -152,11 +152,12 @@ glabel func_80248BF4 /* 169674 80248E14 2C620005 */ sltiu $v0, $v1, 5 /* 169678 80248E18 1040006D */ beqz $v0, .L80248FD0 /* 16967C 80248E1C 00031080 */ sll $v0, $v1, 2 -/* 169680 80248E20 3C018025 */ lui $at, %hi(D_8024C060) +/* 169680 80248E20 3C018025 */ lui $at, %hi(jtbl_8024C060_16C8C0) /* 169684 80248E24 00220821 */ addu $at, $at, $v0 -/* 169688 80248E28 8C22C060 */ lw $v0, %lo(D_8024C060)($at) +/* 169688 80248E28 8C22C060 */ lw $v0, %lo(jtbl_8024C060_16C8C0)($at) /* 16968C 80248E2C 00400008 */ jr $v0 /* 169690 80248E30 00000000 */ nop +glabel L80248E34_169694 /* 169694 80248E34 0C05272D */ jal play_sound /* 169698 80248E38 24042103 */ addiu $a0, $zero, 0x2103 /* 16969C 80248E3C 3C048025 */ lui $a0, %hi(D_8024C090) @@ -170,6 +171,7 @@ glabel func_80248BF4 /* 1696B8 80248E58 80830000 */ lb $v1, ($a0) /* 1696BC 80248E5C 08092402 */ j .L80249008 /* 1696C0 80248E60 240200F7 */ addiu $v0, $zero, 0xf7 +glabel L80248E64_1696C4 /* 1696C4 80248E64 82020004 */ lb $v0, 4($s0) /* 1696C8 80248E68 24110001 */ addiu $s1, $zero, 1 /* 1696CC 80248E6C 10510071 */ beq $v0, $s1, .L80249034 @@ -181,6 +183,7 @@ glabel func_80248BF4 /* 1696E4 80248E84 0200202D */ daddu $a0, $s0, $zero /* 1696E8 80248E88 080923AD */ j .L80248EB4 /* 1696EC 80248E8C A2110004 */ sb $s1, 4($s0) +glabel L80248E90_1696F0 /* 1696F0 80248E90 82020004 */ lb $v0, 4($s0) /* 1696F4 80248E94 10400067 */ beqz $v0, .L80249034 /* 1696F8 80248E98 00000000 */ nop @@ -199,6 +202,7 @@ glabel func_80248BF4 /* 169728 80248EC8 24040031 */ addiu $a0, $zero, 0x31 /* 16972C 80248ECC 0809240D */ j .L80249034 /* 169730 80248ED0 00000000 */ nop +glabel L80248ED4_169734 /* 169734 80248ED4 0000182D */ daddu $v1, $zero, $zero /* 169738 80248ED8 3C058025 */ lui $a1, %hi(D_8024C110) /* 16973C 80248EDC 24A5C110 */ addiu $a1, $a1, %lo(D_8024C110) @@ -296,6 +300,7 @@ glabel func_80248BF4 /* 16988C 8024902C 50400001 */ beql $v0, $zero, .L80249034 /* 169890 80249030 A0850000 */ sb $a1, ($a0) .L80249034: +glabel L80249034_169894 /* 169894 80249034 92020003 */ lbu $v0, 3($s0) /* 169898 80249038 24420039 */ addiu $v0, $v0, 0x39 /* 16989C 8024903C 304200FF */ andi $v0, $v0, 0xff diff --git a/asm/nonmatchings/code_169BE0/func_80249380.s b/asm/nonmatchings/code_169BE0/func_80249380.s index dec5f4afdb..2809dd9be5 100644 --- a/asm/nonmatchings/code_169BE0/func_80249380.s +++ b/asm/nonmatchings/code_169BE0/func_80249380.s @@ -170,7 +170,7 @@ glabel func_80249380 /* 169E58 802495F8 14C10004 */ bne $a2, $at, .L8024960C /* 169E5C 802495FC 3C018000 */ lui $at, 0x8000 /* 169E60 80249600 14610002 */ bne $v1, $at, .L8024960C -/* 169E64 80249604 00000000 */ nop +/* 169E64 80249604 00000000 */ nop /* 169E68 80249608 0006000D */ break 6 .L8024960C: /* 169E6C 8024960C 00001012 */ mflo $v0 @@ -373,7 +373,7 @@ glabel func_80249380 /* 16A164 80249904 1122000A */ beq $t1, $v0, .L80249930 /* 16A168 80249908 0000102D */ daddu $v0, $zero, $zero /* 16A16C 8024990C 08092655 */ j .L80249954 -/* 16A170 80249910 00000000 */ nop +/* 16A170 80249910 00000000 */ nop .L80249914: /* 16A174 80249914 240200F5 */ addiu $v0, $zero, 0xf5 /* 16A178 80249918 11220009 */ beq $t1, $v0, .L80249940 @@ -381,7 +381,7 @@ glabel func_80249380 /* 16A180 80249920 11220009 */ beq $t1, $v0, .L80249948 /* 16A184 80249924 0000102D */ daddu $v0, $zero, $zero /* 16A188 80249928 08092655 */ j .L80249954 -/* 16A18C 8024992C 00000000 */ nop +/* 16A18C 8024992C 00000000 */ nop .L80249930: /* 16A190 80249930 08092654 */ j .L80249950 /* 16A194 80249934 ACA00000 */ sw $zero, ($a1) diff --git a/asm/nonmatchings/code_169BE0/func_8024997C.s b/asm/nonmatchings/code_169BE0/func_8024997C.s index e079ec86d2..cf3af7ade6 100644 --- a/asm/nonmatchings/code_169BE0/func_8024997C.s +++ b/asm/nonmatchings/code_169BE0/func_8024997C.s @@ -37,7 +37,7 @@ glabel func_8024997C /* 16A258 802499F8 0C0924E0 */ jal func_80249380 /* 16A25C 802499FC AFB30014 */ sw $s3, 0x14($sp) /* 16A260 80249A00 0809269F */ j .L80249A7C -/* 16A264 80249A04 00000000 */ nop +/* 16A264 80249A04 00000000 */ nop .L80249A08: /* 16A268 80249A08 14400005 */ bnez $v0, .L80249A20 /* 16A26C 80249A0C 2602FF3A */ addiu $v0, $s0, -0xc6 diff --git a/asm/nonmatchings/code_169BE0/func_80249AB8.s b/asm/nonmatchings/code_169BE0/func_80249AB8.s index 93084b5dbc..2f6168b80e 100644 --- a/asm/nonmatchings/code_169BE0/func_80249AB8.s +++ b/asm/nonmatchings/code_169BE0/func_80249AB8.s @@ -53,5 +53,5 @@ glabel func_80249AB8 /* 16A3CC 80249B6C 8FB00018 */ lw $s0, 0x18($sp) /* 16A3D0 80249B70 03E00008 */ jr $ra /* 16A3D4 80249B74 27BD0040 */ addiu $sp, $sp, 0x40 -/* 16A3D8 80249B78 00000000 */ nop -/* 16A3DC 80249B7C 00000000 */ nop +/* 16A3D8 80249B78 00000000 */ nop +/* 16A3DC 80249B7C 00000000 */ nop diff --git a/asm/nonmatchings/code_16F740/begin_battle.s b/asm/nonmatchings/code_16F740/begin_battle.s index fa816ce9ed..bfbaaa81be 100644 --- a/asm/nonmatchings/code_16F740/begin_battle.s +++ b/asm/nonmatchings/code_16F740/begin_battle.s @@ -39,11 +39,12 @@ glabel begin_battle /* 16FB74 80241294 104001FC */ beqz $v0, .L80241A88 /* 16FB78 80241298 AE950438 */ sw $s5, 0x438($s4) /* 16FB7C 8024129C 00031080 */ sll $v0, $v1, 2 -/* 16FB80 802412A0 3C01802A */ lui $at, %hi(D_8029CA88) +/* 16FB80 802412A0 3C01802A */ lui $at, %hi(jtbl_8029CA88_1CB368) /* 16FB84 802412A4 00220821 */ addu $at, $at, $v0 -/* 16FB88 802412A8 8C22CA88 */ lw $v0, %lo(D_8029CA88)($at) +/* 16FB88 802412A8 8C22CA88 */ lw $v0, %lo(jtbl_8029CA88_1CB368)($at) /* 16FB8C 802412AC 00400008 */ jr $v0 /* 16FB90 802412B0 00000000 */ nop +glabel L802412B4_16FB94 /* 16FB94 802412B4 3C05BF80 */ lui $a1, 0xbf80 /* 16FB98 802412B8 8EC20004 */ lw $v0, 4($s6) /* 16FB9C 802412BC 3C01802A */ lui $at, %hi(D_8029F240) @@ -235,6 +236,7 @@ glabel begin_battle /* 16FE64 80241584 AC30C4DC */ sw $s0, %lo(gBattleStatus+0x46C)($at) /* 16FE68 80241588 080906A2 */ j .L80241A88 /* 16FE6C 8024158C AE8200C8 */ sw $v0, 0xc8($s4) +glabel L80241590_16FE70 /* 16FE70 80241590 8E8400C8 */ lw $a0, 0xc8($s4) /* 16FE74 80241594 0C0B1059 */ jal does_script_exist /* 16FE78 80241598 00000000 */ nop @@ -398,6 +400,7 @@ glabel begin_battle .L802417D4: /* 1700B4 802417D4 08090608 */ j .L80241820 /* 1700B8 802417D8 24130001 */ addiu $s3, $zero, 1 +glabel L802417DC_1700BC /* 1700BC 802417DC 0000882D */ daddu $s1, $zero, $zero /* 1700C0 802417E0 3C02802A */ lui $v0, %hi(D_8029F240) /* 1700C4 802417E4 8C42F240 */ lw $v0, %lo(D_8029F240)($v0) @@ -534,6 +537,7 @@ glabel begin_battle /* 1702A0 802419C0 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 1702A4 802419C4 080906A2 */ j .L80241A88 /* 1702A8 802419C8 00000000 */ nop +glabel L802419CC_1702AC /* 1702AC 802419CC 3C108028 */ lui $s0, %hi(D_80280A30) /* 1702B0 802419D0 26100A30 */ addiu $s0, $s0, %lo(D_80280A30) /* 1702B4 802419D4 8E020000 */ lw $v0, ($s0) @@ -576,6 +580,7 @@ glabel begin_battle /* 170338 80241A58 AC600000 */ sw $zero, ($v1) /* 17033C 80241A5C 080906A2 */ j .L80241A88 /* 170340 80241A60 00000000 */ nop +glabel L80241A64_170344 /* 170344 80241A64 8282008C */ lb $v0, 0x8c($s4) /* 170348 80241A68 14400007 */ bnez $v0, .L80241A88 /* 17034C 80241A6C 00000000 */ nop @@ -587,6 +592,7 @@ glabel begin_battle /* 170360 80241A80 0C090464 */ jal func_80241190 /* 170364 80241A84 00000000 */ nop .L80241A88: +glabel L80241A88_170368 /* 170368 80241A88 8FBF0044 */ lw $ra, 0x44($sp) /* 17036C 80241A8C 8FBE0040 */ lw $fp, 0x40($sp) /* 170370 80241A90 8FB7003C */ lw $s7, 0x3c($sp) diff --git a/asm/nonmatchings/code_16F740/end_battle.s b/asm/nonmatchings/code_16F740/end_battle.s index a385400e1d..2fc0240687 100644 --- a/asm/nonmatchings/code_16F740/end_battle.s +++ b/asm/nonmatchings/code_16F740/end_battle.s @@ -19,11 +19,12 @@ glabel end_battle /* 173368 80244A88 104000BA */ beqz $v0, .L80244D74 /* 17336C 80244A8C AFB00018 */ sw $s0, 0x18($sp) /* 173370 80244A90 00031080 */ sll $v0, $v1, 2 -/* 173374 80244A94 3C01802A */ lui $at, %hi(D_8029CAB8) +/* 173374 80244A94 3C01802A */ lui $at, %hi(jtbl_8029CAB8_1CB398) /* 173378 80244A98 00220821 */ addu $at, $at, $v0 -/* 17337C 80244A9C 8C22CAB8 */ lw $v0, %lo(D_8029CAB8)($at) +/* 17337C 80244A9C 8C22CAB8 */ lw $v0, %lo(jtbl_8029CAB8_1CB398)($at) /* 173380 80244AA0 00400008 */ jr $v0 /* 173384 80244AA4 00000000 */ nop +glabel L80244AA8_173388 /* 173388 80244AA8 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 17338C 80244AAC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 173390 80244AB0 3C048028 */ lui $a0, %hi(D_80280A30) @@ -64,6 +65,7 @@ glabel end_battle /* 173414 80244B34 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 173418 80244B38 0809135D */ j .L80244D74 /* 17341C 80244B3C 00000000 */ nop +glabel L80244B40_173420 /* 173420 80244B40 3C048028 */ lui $a0, %hi(D_80280A30) /* 173424 80244B44 24840A30 */ addiu $a0, $a0, %lo(D_80280A30) /* 173428 80244B48 8C830000 */ lw $v1, ($a0) @@ -83,6 +85,7 @@ glabel end_battle /* 17345C 80244B7C AC850000 */ sw $a1, ($a0) /* 173460 80244B80 0809135D */ j .L80244D74 /* 173464 80244B84 00000000 */ nop +glabel L80244B88_173468 /* 173468 80244B88 240200FF */ addiu $v0, $zero, 0xff /* 17346C 80244B8C 3C04800E */ lui $a0, %hi(gBattleStatus) /* 173470 80244B90 2484C070 */ addiu $a0, $a0, %lo(gBattleStatus) @@ -119,6 +122,7 @@ glabel end_battle /* 1734E0 80244C00 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 1734E4 80244C04 0809135D */ j .L80244D74 /* 1734E8 80244C08 AE4300C0 */ sw $v1, 0xc0($s2) +glabel L80244C0C_1734EC /* 1734EC 80244C0C 8E4400C0 */ lw $a0, 0xc0($s2) /* 1734F0 80244C10 0C0B1059 */ jal does_script_exist /* 1734F4 80244C14 00000000 */ nop @@ -126,6 +130,7 @@ glabel end_battle /* 1734FC 80244C1C 24020004 */ addiu $v0, $zero, 4 /* 173500 80244C20 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 173504 80244C24 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) +glabel L80244C28_173508 /* 173508 80244C28 0C0B1045 */ jal kill_all_scripts /* 17350C 80244C2C 0000882D */ daddu $s1, $zero, $zero /* 173510 80244C30 0240802D */ daddu $s0, $s2, $zero diff --git a/asm/nonmatchings/code_16F740/func_80248B08.s b/asm/nonmatchings/code_16F740/func_80248B08.s index 3d3beb9a87..d73393935d 100644 --- a/asm/nonmatchings/code_16F740/func_80248B08.s +++ b/asm/nonmatchings/code_16F740/func_80248B08.s @@ -16,11 +16,12 @@ glabel func_80248B08 /* 177414 80248B34 1040008A */ beqz $v0, .L80248D60 /* 177418 80248B38 AFB00010 */ sw $s0, 0x10($sp) /* 17741C 80248B3C 00031080 */ sll $v0, $v1, 2 -/* 177420 80248B40 3C01802A */ lui $at, %hi(D_8029CBE0) +/* 177420 80248B40 3C01802A */ lui $at, %hi(jtbl_8029CBE0_1CB4C0) /* 177424 80248B44 00220821 */ addu $at, $at, $v0 -/* 177428 80248B48 8C22CBE0 */ lw $v0, %lo(D_8029CBE0)($at) +/* 177428 80248B48 8C22CBE0 */ lw $v0, %lo(jtbl_8029CBE0_1CB4C0)($at) /* 17742C 80248B4C 00400008 */ jr $v0 /* 177430 80248B50 00000000 */ nop +glabel L80248B54_177434 /* 177434 80248B54 3C038028 */ lui $v1, %hi(D_802809F6) /* 177438 80248B58 846309F6 */ lh $v1, %lo(D_802809F6)($v1) /* 17743C 80248B5C 2402FFFF */ addiu $v0, $zero, -1 @@ -43,6 +44,7 @@ glabel func_80248B08 /* 177478 80248B98 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 17747C 80248B9C 08092358 */ j .L80248D60 /* 177480 80248BA0 00000000 */ nop +glabel L80248BA4_177484 /* 177484 80248BA4 3C038028 */ lui $v1, %hi(D_802809F6) /* 177488 80248BA8 846309F6 */ lh $v1, %lo(D_802809F6)($v1) /* 17748C 80248BAC 2402FFFF */ addiu $v0, $zero, -1 @@ -72,6 +74,7 @@ glabel func_80248B08 /* 1774E0 80248C00 AC640000 */ sw $a0, ($v1) /* 1774E4 80248C04 08092358 */ j .L80248D60 /* 1774E8 80248C08 00000000 */ nop +glabel L80248C0C_1774EC /* 1774EC 80248C0C 240200FF */ addiu $v0, $zero, 0xff /* 1774F0 80248C10 3C04800E */ lui $a0, %hi(gBattleStatus) /* 1774F4 80248C14 2484C070 */ addiu $a0, $a0, %lo(gBattleStatus) @@ -108,6 +111,7 @@ glabel func_80248B08 /* 177564 80248C84 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 177568 80248C88 08092358 */ j .L80248D60 /* 17756C 80248C8C AE4300C0 */ sw $v1, 0xc0($s2) +glabel L80248C90_177570 /* 177570 80248C90 8E4400C0 */ lw $a0, 0xc0($s2) /* 177574 80248C94 0C0B1059 */ jal does_script_exist /* 177578 80248C98 00000000 */ nop @@ -115,6 +119,7 @@ glabel func_80248B08 /* 177580 80248CA0 24020004 */ addiu $v0, $zero, 4 /* 177584 80248CA4 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 177588 80248CA8 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) +glabel L80248CAC_17758C /* 17758C 80248CAC 0C0B1045 */ jal kill_all_scripts /* 177590 80248CB0 0000882D */ daddu $s1, $zero, $zero /* 177594 80248CB4 0240802D */ daddu $s0, $s2, $zero diff --git a/asm/nonmatchings/code_16F740/update_enemy_action.s b/asm/nonmatchings/code_16F740/update_enemy_action.s index 2aab9cb55c..231a081d79 100644 --- a/asm/nonmatchings/code_16F740/update_enemy_action.s +++ b/asm/nonmatchings/code_16F740/update_enemy_action.s @@ -20,11 +20,12 @@ glabel update_enemy_action /* 175E8C 802475AC 2C62000D */ sltiu $v0, $v1, 0xd /* 175E90 802475B0 10400106 */ beqz $v0, .L802479CC /* 175E94 802475B4 00031080 */ sll $v0, $v1, 2 -/* 175E98 802475B8 3C01802A */ lui $at, %hi(D_8029CB88) +/* 175E98 802475B8 3C01802A */ lui $at, %hi(jtbl_8029CB88_1CB468) /* 175E9C 802475BC 00220821 */ addu $at, $at, $v0 -/* 175EA0 802475C0 8C22CB88 */ lw $v0, %lo(D_8029CB88)($at) +/* 175EA0 802475C0 8C22CB88 */ lw $v0, %lo(jtbl_8029CB88_1CB468)($at) /* 175EA4 802475C4 00400008 */ jr $v0 /* 175EA8 802475C8 00000000 */ nop +glabel L802475CC_175EAC /* 175EAC 802475CC 3C04FFDF */ lui $a0, 0xffdf /* 175EB0 802475D0 3484FFFF */ ori $a0, $a0, 0xffff /* 175EB4 802475D4 3C05F7FF */ lui $a1, 0xf7ff @@ -116,6 +117,7 @@ glabel update_enemy_action /* 175FF4 80247714 AC430148 */ sw $v1, 0x148($v0) /* 175FF8 80247718 08091E71 */ j .L802479C4 /* 175FFC 8024771C 24020002 */ addiu $v0, $zero, 2 +glabel L80247720_176000 /* 176000 80247720 8EA201D4 */ lw $v0, 0x1d4($s5) /* 176004 80247724 10400005 */ beqz $v0, .L8024773C /* 176008 80247728 00000000 */ nop @@ -250,24 +252,31 @@ glabel update_enemy_action /* 1761DC 802478FC 2C620007 */ sltiu $v0, $v1, 7 /* 1761E0 80247900 10400012 */ beqz $v0, .L8024794C /* 1761E4 80247904 00031080 */ sll $v0, $v1, 2 -/* 1761E8 80247908 3C01802A */ lui $at, %hi(D_8029CBC0) +/* 1761E8 80247908 3C01802A */ lui $at, %hi(jtbl_8029CBC0_1CB4A0) /* 1761EC 8024790C 00220821 */ addu $at, $at, $v0 -/* 1761F0 80247910 8C22CBC0 */ lw $v0, %lo(D_8029CBC0)($at) +/* 1761F0 80247910 8C22CBC0 */ lw $v0, %lo(jtbl_8029CBC0_1CB4A0)($at) /* 1761F4 80247914 00400008 */ jr $v0 /* 1761F8 80247918 00000000 */ nop +glabel L8024791C_1761FC /* 1761FC 8024791C 08091E57 */ j .L8024795C /* 176200 80247920 2404000A */ addiu $a0, $zero, 0xa +glabel L80247924_176204 /* 176204 80247924 08091E57 */ j .L8024795C /* 176208 80247928 2404000B */ addiu $a0, $zero, 0xb +glabel L8024792C_17620C /* 17620C 8024792C 08091E57 */ j .L8024795C /* 176210 80247930 2404000C */ addiu $a0, $zero, 0xc +glabel L80247934_176214 /* 176214 80247934 08091E57 */ j .L8024795C /* 176218 80247938 2404000D */ addiu $a0, $zero, 0xd +glabel L8024793C_17621C /* 17621C 8024793C 08091E57 */ j .L8024795C /* 176220 80247940 2404000E */ addiu $a0, $zero, 0xe +glabel L80247944_176224 /* 176224 80247944 08091E57 */ j .L8024795C /* 176228 80247948 2404000F */ addiu $a0, $zero, 0xf .L8024794C: +glabel L8024794C_17622C /* 17622C 8024794C 0000202D */ daddu $a0, $zero, $zero /* 176230 80247950 24020014 */ addiu $v0, $zero, 0x14 /* 176234 80247954 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) @@ -278,6 +287,7 @@ glabel update_enemy_action /* 176244 80247964 2402000B */ addiu $v0, $zero, 0xb /* 176248 80247968 08091E71 */ j .L802479C4 /* 17624C 8024796C A2A0021C */ sb $zero, 0x21c($s5) +glabel L80247970_176250 /* 176250 80247970 0C093EAD */ jal is_popup_displayed /* 176254 80247974 00000000 */ nop /* 176258 80247978 14400014 */ bnez $v0, .L802479CC @@ -291,6 +301,7 @@ glabel update_enemy_action /* 176278 80247998 AC22F248 */ sw $v0, %lo(D_8029F248)($at) /* 17627C 8024799C 08091E71 */ j .L802479C4 /* 176280 802479A0 2402000C */ addiu $v0, $zero, 0xc +glabel L802479A4_176284 /* 176284 802479A4 3C03802A */ lui $v1, %hi(D_8029F248) /* 176288 802479A8 2463F248 */ addiu $v1, $v1, %lo(D_8029F248) /* 17628C 802479AC 8C620000 */ lw $v0, ($v1) @@ -304,6 +315,7 @@ glabel update_enemy_action /* 1762A4 802479C4 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 1762A8 802479C8 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) .L802479CC: +glabel L802479CC_1762AC /* 1762AC 802479CC 3C10800E */ lui $s0, %hi(gBattleStatus+0x46C) /* 1762B0 802479D0 2610C4DC */ addiu $s0, $s0, %lo(gBattleStatus+0x46C) /* 1762B4 802479D4 8E030000 */ lw $v1, ($s0) diff --git a/asm/nonmatchings/code_16F740/update_partner_action.s b/asm/nonmatchings/code_16F740/update_partner_action.s index 59a56d711c..612731f210 100644 --- a/asm/nonmatchings/code_16F740/update_partner_action.s +++ b/asm/nonmatchings/code_16F740/update_partner_action.s @@ -19,11 +19,12 @@ glabel update_partner_action /* 17544C 80246B6C 2C62000D */ sltiu $v0, $v1, 0xd /* 175450 80246B70 10400122 */ beqz $v0, .L80246FFC /* 175454 80246B74 00031080 */ sll $v0, $v1, 2 -/* 175458 80246B78 3C01802A */ lui $at, %hi(D_8029CB30) +/* 175458 80246B78 3C01802A */ lui $at, %hi(jtbl_8029CB30_1CB410) /* 17545C 80246B7C 00220821 */ addu $at, $at, $v0 -/* 175460 80246B80 8C22CB30 */ lw $v0, %lo(D_8029CB30)($at) +/* 175460 80246B80 8C22CB30 */ lw $v0, %lo(jtbl_8029CB30_1CB410)($at) /* 175464 80246B84 00400008 */ jr $v0 /* 175468 80246B88 00000000 */ nop +glabel L80246B8C_17546C /* 17546C 80246B8C 16800005 */ bnez $s4, .L80246BA4 /* 175470 80246B90 2402007F */ addiu $v0, $zero, 0x7f /* 175474 80246B94 0C090464 */ jal func_80241190 @@ -79,6 +80,7 @@ glabel update_partner_action /* 175530 80246C50 24040002 */ addiu $a0, $zero, 2 /* 175534 80246C54 08091BFD */ j .L80246FF4 /* 175538 80246C58 24020002 */ addiu $v0, $zero, 2 +glabel L80246C5C_17553C /* 17553C 80246C5C 0000882D */ daddu $s1, $zero, $zero /* 175540 80246C60 3C05FFF7 */ lui $a1, 0xfff7 /* 175544 80246C64 34A5FFFF */ ori $a1, $a1, 0xffff @@ -121,6 +123,7 @@ glabel update_partner_action /* 1755D0 80246CF0 AE8401E4 */ sw $a0, 0x1e4($s4) /* 1755D4 80246CF4 08091BFF */ j .L80246FFC /* 1755D8 80246CF8 AC430148 */ sw $v1, 0x148($v0) +glabel L80246CFC_1755DC /* 1755DC 80246CFC 3C02800E */ lui $v0, %hi(gBattleStatus) /* 1755E0 80246D00 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1755E4 80246D04 3C030020 */ lui $v1, 0x20 @@ -305,6 +308,7 @@ glabel update_partner_action /* 175874 80246F94 00431025 */ or $v0, $v0, $v1 /* 175878 80246F98 08091BFF */ j .L80246FFC /* 17587C 80246F9C AE820000 */ sw $v0, ($s4) +glabel L80246FA0_175880 /* 175880 80246FA0 0C093EAD */ jal is_popup_displayed /* 175884 80246FA4 00000000 */ nop /* 175888 80246FA8 14400014 */ bnez $v0, .L80246FFC @@ -318,6 +322,7 @@ glabel update_partner_action /* 1758A8 80246FC8 AC22F248 */ sw $v0, %lo(D_8029F248)($at) /* 1758AC 80246FCC 08091BFD */ j .L80246FF4 /* 1758B0 80246FD0 2402000C */ addiu $v0, $zero, 0xc +glabel L80246FD4_1758B4 /* 1758B4 80246FD4 3C03802A */ lui $v1, %hi(D_8029F248) /* 1758B8 80246FD8 2463F248 */ addiu $v1, $v1, %lo(D_8029F248) /* 1758BC 80246FDC 8C620000 */ lw $v0, ($v1) @@ -331,6 +336,7 @@ glabel update_partner_action /* 1758D4 80246FF4 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 1758D8 80246FF8 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) .L80246FFC: +glabel L80246FFC_1758DC /* 1758DC 80246FFC 3C10800E */ lui $s0, %hi(gBattleStatus+0x46C) /* 1758E0 80247000 2610C4DC */ addiu $s0, $s0, %lo(gBattleStatus+0x46C) /* 1758E4 80247004 8E030000 */ lw $v1, ($s0) @@ -380,25 +386,33 @@ glabel update_partner_action /* 17597C 8024709C 2C620008 */ sltiu $v0, $v1, 8 /* 175980 802470A0 10400016 */ beqz $v0, .L802470FC /* 175984 802470A4 00031080 */ sll $v0, $v1, 2 -/* 175988 802470A8 3C01802A */ lui $at, %hi(D_8029CB68) +/* 175988 802470A8 3C01802A */ lui $at, %hi(jtbl_8029CB68_1CB448) /* 17598C 802470AC 00220821 */ addu $at, $at, $v0 -/* 175990 802470B0 8C22CB68 */ lw $v0, %lo(D_8029CB68)($at) +/* 175990 802470B0 8C22CB68 */ lw $v0, %lo(jtbl_8029CB68_1CB448)($at) /* 175994 802470B4 00400008 */ jr $v0 /* 175998 802470B8 00000000 */ nop +glabel L802470BC_17599C /* 17599C 802470BC 08091C43 */ j .L8024710C /* 1759A0 802470C0 24100012 */ addiu $s0, $zero, 0x12 +glabel L802470C4_1759A4 /* 1759A4 802470C4 08091C43 */ j .L8024710C /* 1759A8 802470C8 24100013 */ addiu $s0, $zero, 0x13 +glabel L802470CC_1759AC /* 1759AC 802470CC 08091C43 */ j .L8024710C /* 1759B0 802470D0 24100014 */ addiu $s0, $zero, 0x14 +glabel L802470D4_1759B4 /* 1759B4 802470D4 08091C43 */ j .L8024710C /* 1759B8 802470D8 24100015 */ addiu $s0, $zero, 0x15 +glabel L802470DC_1759BC /* 1759BC 802470DC 08091C43 */ j .L8024710C /* 1759C0 802470E0 24100016 */ addiu $s0, $zero, 0x16 +glabel L802470E4_1759C4 /* 1759C4 802470E4 08091C43 */ j .L8024710C /* 1759C8 802470E8 24100017 */ addiu $s0, $zero, 0x17 +glabel L802470EC_1759CC /* 1759CC 802470EC 08091C43 */ j .L8024710C /* 1759D0 802470F0 24100018 */ addiu $s0, $zero, 0x18 +glabel L802470F4_1759D4 /* 1759D4 802470F4 08091C43 */ j .L8024710C /* 1759D8 802470F8 24100019 */ addiu $s0, $zero, 0x19 .L802470FC: diff --git a/asm/nonmatchings/code_16F740/update_player_action.s b/asm/nonmatchings/code_16F740/update_player_action.s index 141f569a5f..f0aa5aa3e8 100644 --- a/asm/nonmatchings/code_16F740/update_player_action.s +++ b/asm/nonmatchings/code_16F740/update_player_action.s @@ -471,25 +471,33 @@ glabel update_player_action /* 174A54 80246174 2C620008 */ sltiu $v0, $v1, 8 /* 174A58 80246178 10400016 */ beqz $v0, .L802461D4 /* 174A5C 8024617C 00031080 */ sll $v0, $v1, 2 -/* 174A60 80246180 3C01802A */ lui $at, %hi(D_8029CAF0) +/* 174A60 80246180 3C01802A */ lui $at, %hi(jtbl_8029CAF0_1CB3D0) /* 174A64 80246184 00220821 */ addu $at, $at, $v0 -/* 174A68 80246188 8C22CAF0 */ lw $v0, %lo(D_8029CAF0)($at) +/* 174A68 80246188 8C22CAF0 */ lw $v0, %lo(jtbl_8029CAF0_1CB3D0)($at) /* 174A6C 8024618C 00400008 */ jr $v0 /* 174A70 80246190 00000000 */ nop +glabel L80246194_174A74 /* 174A74 80246194 08091879 */ j .L802461E4 /* 174A78 80246198 24100012 */ addiu $s0, $zero, 0x12 +glabel L8024619C_174A7C /* 174A7C 8024619C 08091879 */ j .L802461E4 /* 174A80 802461A0 24100013 */ addiu $s0, $zero, 0x13 +glabel L802461A4_174A84 /* 174A84 802461A4 08091879 */ j .L802461E4 /* 174A88 802461A8 24100014 */ addiu $s0, $zero, 0x14 +glabel L802461AC_174A8C /* 174A8C 802461AC 08091879 */ j .L802461E4 /* 174A90 802461B0 24100015 */ addiu $s0, $zero, 0x15 +glabel L802461B4_174A94 /* 174A94 802461B4 08091879 */ j .L802461E4 /* 174A98 802461B8 24100016 */ addiu $s0, $zero, 0x16 +glabel L802461BC_174A9C /* 174A9C 802461BC 08091879 */ j .L802461E4 /* 174AA0 802461C0 24100017 */ addiu $s0, $zero, 0x17 +glabel L802461C4_174AA4 /* 174AA4 802461C4 08091879 */ j .L802461E4 /* 174AA8 802461C8 24100018 */ addiu $s0, $zero, 0x18 +glabel L802461CC_174AAC /* 174AAC 802461CC 08091879 */ j .L802461E4 /* 174AB0 802461D0 24100019 */ addiu $s0, $zero, 0x19 .L802461D4: @@ -578,26 +586,34 @@ glabel update_player_action /* 174BD0 802462F0 2C620008 */ sltiu $v0, $v1, 8 /* 174BD4 802462F4 10400014 */ beqz $v0, .L80246348 /* 174BD8 802462F8 00031080 */ sll $v0, $v1, 2 -/* 174BDC 802462FC 3C01802A */ lui $at, %hi(D_8029CB10) +/* 174BDC 802462FC 3C01802A */ lui $at, %hi(jtbl_8029CB10_1CB3F0) /* 174BE0 80246300 00220821 */ addu $at, $at, $v0 -/* 174BE4 80246304 8C22CB10 */ lw $v0, %lo(D_8029CB10)($at) +/* 174BE4 80246304 8C22CB10 */ lw $v0, %lo(jtbl_8029CB10_1CB3F0)($at) /* 174BE8 80246308 00400008 */ jr $v0 /* 174BEC 8024630C 00000000 */ nop +glabel L80246310_174BF0 /* 174BF0 80246310 080918D6 */ j .L80246358 /* 174BF4 80246314 2410000A */ addiu $s0, $zero, 0xa +glabel L80246318_174BF8 /* 174BF8 80246318 080918D6 */ j .L80246358 /* 174BFC 8024631C 2410000B */ addiu $s0, $zero, 0xb +glabel L80246320_174C00 /* 174C00 80246320 080918D6 */ j .L80246358 /* 174C04 80246324 2410000C */ addiu $s0, $zero, 0xc +glabel L80246328_174C08 /* 174C08 80246328 080918D6 */ j .L80246358 /* 174C0C 8024632C 2410000D */ addiu $s0, $zero, 0xd +glabel L80246330_174C10 /* 174C10 80246330 080918D6 */ j .L80246358 /* 174C14 80246334 2410000E */ addiu $s0, $zero, 0xe +glabel L80246338_174C18 /* 174C18 80246338 080918D6 */ j .L80246358 /* 174C1C 8024633C 2410000F */ addiu $s0, $zero, 0xf +glabel L80246340_174C20 /* 174C20 80246340 080918D6 */ j .L80246358 /* 174C24 80246344 24100010 */ addiu $s0, $zero, 0x10 .L80246348: +glabel L80246348_174C28 /* 174C28 80246348 0000802D */ daddu $s0, $zero, $zero /* 174C2C 8024634C 2402001E */ addiu $v0, $zero, 0x1e /* 174C30 80246350 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) diff --git a/asm/nonmatchings/code_16F740/update_swap_partner.s b/asm/nonmatchings/code_16F740/update_swap_partner.s index 2b76e29fc3..ed207a10fa 100644 --- a/asm/nonmatchings/code_16F740/update_swap_partner.s +++ b/asm/nonmatchings/code_16F740/update_swap_partner.s @@ -18,11 +18,12 @@ glabel update_swap_partner /* 17400C 8024572C 104000DF */ beqz $v0, .L80245AAC /* 174010 80245730 2613000C */ addiu $s3, $s0, 0xc /* 174014 80245734 00031080 */ sll $v0, $v1, 2 -/* 174018 80245738 3C01802A */ lui $at, %hi(D_8029CAD0) +/* 174018 80245738 3C01802A */ lui $at, %hi(jtbl_8029CAD0_1CB3B0) /* 17401C 8024573C 00220821 */ addu $at, $at, $v0 -/* 174020 80245740 8C22CAD0 */ lw $v0, %lo(D_8029CAD0)($at) +/* 174020 80245740 8C22CAD0 */ lw $v0, %lo(jtbl_8029CAD0_1CB3B0)($at) /* 174024 80245744 00400008 */ jr $v0 /* 174028 80245748 00000000 */ nop +glabel L8024574C_17402C /* 17402C 8024574C 3C03F7FF */ lui $v1, 0xf7ff /* 174030 80245750 8E020000 */ lw $v0, ($s0) /* 174034 80245754 3463FFFF */ ori $v1, $v1, 0xffff @@ -80,6 +81,7 @@ glabel update_swap_partner /* 1740FC 8024581C 24020002 */ addiu $v0, $zero, 2 /* 174100 80245820 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 174104 80245824 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) +glabel L80245828_174108 /* 174108 80245828 3C03802A */ lui $v1, %hi(D_8029F248) /* 17410C 8024582C 2463F248 */ addiu $v1, $v1, %lo(D_8029F248) /* 174110 80245830 8C620000 */ lw $v0, ($v1) @@ -110,6 +112,7 @@ glabel update_swap_partner /* 174170 80245890 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 174174 80245894 080916AB */ j .L80245AAC /* 174178 80245898 E6600020 */ swc1 $f0, 0x20($s3) +glabel L8024589C_17417C /* 17417C 8024589C 8E4400C0 */ lw $a0, 0xc0($s2) /* 174180 802458A0 0C0B1059 */ jal does_script_exist /* 174184 802458A4 00000000 */ nop @@ -149,6 +152,7 @@ glabel update_swap_partner /* 17420C 8024592C AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 174210 80245930 080916AB */ j .L80245AAC /* 174214 80245934 E620014C */ swc1 $f0, 0x14c($s1) +glabel L80245938_174218 /* 174218 80245938 8E5100DC */ lw $s1, 0xdc($s2) /* 17421C 8024593C 12200006 */ beqz $s1, .L80245958 /* 174220 80245940 00000000 */ nop @@ -173,6 +177,7 @@ glabel update_swap_partner /* 174268 80245988 24020100 */ addiu $v0, $zero, 0x100 /* 17426C 8024598C 080916AB */ j .L80245AAC /* 174270 80245990 AC820148 */ sw $v0, 0x148($a0) +glabel L80245994_174274 /* 174274 80245994 8E4400C0 */ lw $a0, 0xc0($s2) /* 174278 80245998 0C0B1059 */ jal does_script_exist /* 17427C 8024599C 00000000 */ nop @@ -202,6 +207,7 @@ glabel update_swap_partner /* 1742D4 802459F4 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 1742D8 802459F8 080916AB */ j .L80245AAC /* 1742DC 802459FC 00000000 */ nop +glabel L80245A00_1742E0 /* 1742E0 80245A00 8E5100DC */ lw $s1, 0xdc($s2) /* 1742E4 80245A04 12200008 */ beqz $s1, .L80245A28 /* 1742E8 80245A08 00000000 */ nop @@ -220,6 +226,7 @@ glabel update_swap_partner /* 174318 80245A38 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 17431C 80245A3C 080916AB */ j .L80245AAC /* 174320 80245A40 00000000 */ nop +glabel L80245A44_174324 /* 174324 80245A44 8242008C */ lb $v0, 0x8c($s2) /* 174328 80245A48 14400018 */ bnez $v0, .L80245AAC /* 17432C 80245A4C 2403FFEF */ addiu $v1, $zero, -0x11 @@ -249,6 +256,7 @@ glabel update_swap_partner /* 174384 80245AA4 0C090464 */ jal func_80241190 /* 174388 80245AA8 00000000 */ nop .L80245AAC: +glabel L80245AAC_17438C /* 17438C 80245AAC 8FBF0020 */ lw $ra, 0x20($sp) /* 174390 80245AB0 8FB3001C */ lw $s3, 0x1c($sp) /* 174394 80245AB4 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/code_16c8e0/delete_actor.s b/asm/nonmatchings/code_16c8e0/delete_actor.s index e25b813df7..e6e356d30d 100644 --- a/asm/nonmatchings/code_16c8e0/delete_actor.s +++ b/asm/nonmatchings/code_16c8e0/delete_actor.s @@ -19,13 +19,13 @@ glabel delete_actor /* 16F4D0 80240BF0 0220202D */ daddu $a0, $s1, $zero /* 16F4D4 80240BF4 8E2201D0 */ lw $v0, 0x1d0($s1) /* 16F4D8 80240BF8 10400003 */ beqz $v0, .L80240C08 -/* 16F4DC 80240BFC 00000000 */ nop +/* 16F4DC 80240BFC 00000000 */ nop /* 16F4E0 80240C00 0C0B102B */ jal kill_script_by_ID /* 16F4E4 80240C04 8E2401E0 */ lw $a0, 0x1e0($s1) .L80240C08: /* 16F4E8 80240C08 8E2201D8 */ lw $v0, 0x1d8($s1) /* 16F4EC 80240C0C 10400003 */ beqz $v0, .L80240C1C -/* 16F4F0 80240C10 00000000 */ nop +/* 16F4F0 80240C10 00000000 */ nop /* 16F4F4 80240C14 0C0B102B */ jal kill_script_by_ID /* 16F4F8 80240C18 8E2401E8 */ lw $a0, 0x1e8($s1) .L80240C1C: @@ -34,20 +34,20 @@ glabel delete_actor /* 16F504 80240C24 0220202D */ daddu $a0, $s1, $zero /* 16F508 80240C28 8E2401E4 */ lw $a0, 0x1e4($s1) /* 16F50C 80240C2C 0C0B102B */ jal kill_script_by_ID -/* 16F510 80240C30 00000000 */ nop +/* 16F510 80240C30 00000000 */ nop /* 16F514 80240C34 0220202D */ daddu $a0, $s1, $zero .L80240C38: /* 16F518 80240C38 0C099BBA */ jal func_80266EE8 /* 16F51C 80240C3C 0000282D */ daddu $a1, $zero, $zero /* 16F520 80240C40 8E3001F4 */ lw $s0, 0x1f4($s1) /* 16F524 80240C44 1200002B */ beqz $s0, .L80240CF4 -/* 16F528 80240C48 00000000 */ nop +/* 16F528 80240C48 00000000 */ nop /* 16F52C 80240C4C 3C128000 */ lui $s2, 0x8000 .L80240C50: /* 16F530 80240C50 8E020000 */ lw $v0, ($s0) /* 16F534 80240C54 30420004 */ andi $v0, $v0, 4 /* 16F538 80240C58 14400003 */ bnez $v0, .L80240C68 -/* 16F53C 80240C5C 00000000 */ nop +/* 16F53C 80240C5C 00000000 */ nop /* 16F540 80240C60 0C0448CA */ jal func_80112328 /* 16F544 80240C64 8E04009C */ lw $a0, 0x9c($s0) .L80240C68: @@ -63,17 +63,17 @@ glabel delete_actor /* 16F56C 80240C8C 00A0382D */ daddu $a3, $a1, $zero /* 16F570 80240C90 8E040084 */ lw $a0, 0x84($s0) /* 16F574 80240C94 0C0B797A */ jal func_802DE5E8 -/* 16F578 80240C98 00000000 */ nop +/* 16F578 80240C98 00000000 */ nop /* 16F57C 80240C9C 10400003 */ beqz $v0, .L80240CAC -/* 16F580 80240CA0 00000000 */ nop +/* 16F580 80240CA0 00000000 */ nop .L80240CA4: /* 16F584 80240CA4 08090329 */ j .L80240CA4 -/* 16F588 80240CA8 00000000 */ nop +/* 16F588 80240CA8 00000000 */ nop .L80240CAC: /* 16F58C 80240CAC 8E020000 */ lw $v0, ($s0) /* 16F590 80240CB0 00521024 */ and $v0, $v0, $s2 /* 16F594 80240CB4 14400003 */ bnez $v0, .L80240CC4 -/* 16F598 80240CB8 00000000 */ nop +/* 16F598 80240CB8 00000000 */ nop /* 16F59C 80240CBC 0C00AB4B */ jal heap_free /* 16F5A0 80240CC0 8E040010 */ lw $a0, 0x10($s0) .L80240CC4: @@ -83,14 +83,14 @@ glabel delete_actor /* 16F5B0 80240CD0 0200202D */ daddu $a0, $s0, $zero /* 16F5B4 80240CD4 8E0400C0 */ lw $a0, 0xc0($s0) /* 16F5B8 80240CD8 0C00AB4B */ jal heap_free -/* 16F5BC 80240CDC 00000000 */ nop +/* 16F5BC 80240CDC 00000000 */ nop .L80240CE0: /* 16F5C0 80240CE0 0200202D */ daddu $a0, $s0, $zero .L80240CE4: /* 16F5C4 80240CE4 0C00AB4B */ jal heap_free /* 16F5C8 80240CE8 8C90000C */ lw $s0, 0xc($a0) /* 16F5CC 80240CEC 1600FFD8 */ bnez $s0, .L80240C50 -/* 16F5D0 80240CF0 00000000 */ nop +/* 16F5D0 80240CF0 00000000 */ nop .L80240CF4: /* 16F5D4 80240CF4 0C0448CA */ jal func_80112328 /* 16F5D8 80240CF8 8E24042C */ lw $a0, 0x42c($s1) diff --git a/asm/nonmatchings/code_16c8e0/draw_enemy_health_bars.s b/asm/nonmatchings/code_16c8e0/draw_enemy_health_bars.s index 02be5f4d96..cbb7eb6b7f 100644 --- a/asm/nonmatchings/code_16c8e0/draw_enemy_health_bars.s +++ b/asm/nonmatchings/code_16c8e0/draw_enemy_health_bars.s @@ -17,7 +17,7 @@ glabel draw_enemy_health_bars /* 16E8B0 8023FFD0 AFB00030 */ sw $s0, 0x30($sp) /* 16E8B4 8023FFD4 8042007C */ lb $v0, 0x7c($v0) /* 16E8B8 8023FFD8 104000EC */ beqz $v0, .L8024038C -/* 16E8BC 8023FFDC 00000000 */ nop +/* 16E8BC 8023FFDC 00000000 */ nop /* 16E8C0 8023FFE0 3C02800E */ lui $v0, %hi(gBattleStatus) /* 16E8C4 8023FFE4 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 16E8C8 8023FFE8 30420001 */ andi $v0, $v0, 1 @@ -48,7 +48,7 @@ glabel draw_enemy_health_bars /* 16E924 80240044 14610004 */ bne $v1, $at, .L80240058 /* 16E928 80240048 3C018000 */ lui $at, 0x8000 /* 16E92C 8024004C 14410002 */ bne $v0, $at, .L80240058 -/* 16E930 80240050 00000000 */ nop +/* 16E930 80240050 00000000 */ nop /* 16E934 80240054 0006000D */ break 6 .L80240058: /* 16E938 80240058 00008812 */ mflo $s1 @@ -100,14 +100,14 @@ glabel draw_enemy_health_bars /* 16E9E0 80240100 86620156 */ lh $v0, 0x156($s3) /* 16E9E4 80240104 8663015A */ lh $v1, 0x15a($s3) /* 16E9E8 80240108 44822000 */ mtc1 $v0, $f4 -/* 16E9EC 8024010C 00000000 */ nop +/* 16E9EC 8024010C 00000000 */ nop /* 16E9F0 80240110 46802120 */ cvt.s.w $f4, $f4 /* 16E9F4 80240114 86620158 */ lh $v0, 0x158($s3) /* 16E9F8 80240118 44831000 */ mtc1 $v1, $f2 -/* 16E9FC 8024011C 00000000 */ nop +/* 16E9FC 8024011C 00000000 */ nop /* 16EA00 80240120 468010A0 */ cvt.s.w $f2, $f2 /* 16EA04 80240124 44820000 */ mtc1 $v0, $f0 -/* 16EA08 80240128 00000000 */ nop +/* 16EA08 80240128 00000000 */ nop /* 16EA0C 8024012C 46800020 */ cvt.s.w $f0, $f0 /* 16EA10 80240130 2842FE0C */ slti $v0, $v0, -0x1f4 /* 16EA14 80240134 54400092 */ bnel $v0, $zero, .L80240380 diff --git a/asm/nonmatchings/code_16c8e0/draw_main_battle_ui.s b/asm/nonmatchings/code_16c8e0/draw_main_battle_ui.s index 6ed7b184f2..a99ce5bc25 100644 --- a/asm/nonmatchings/code_16c8e0/draw_main_battle_ui.s +++ b/asm/nonmatchings/code_16c8e0/draw_main_battle_ui.s @@ -21,171 +21,206 @@ glabel draw_main_battle_ui .L8023EABC: /* 16D39C 8023EABC 2402FFFF */ addiu $v0, $zero, -1 /* 16D3A0 8023EAC0 16020007 */ bne $s0, $v0, .L8023EAE0 -/* 16D3A4 8023EAC4 00000000 */ nop +/* 16D3A4 8023EAC4 00000000 */ nop /* 16D3A8 8023EAC8 0C0900EF */ jal update_starpoints_display -/* 16D3AC 8023EACC 00000000 */ nop +/* 16D3AC 8023EACC 00000000 */ nop /* 16D3B0 8023EAD0 0C08FFE8 */ jal draw_enemy_health_bars -/* 16D3B4 8023EAD4 00000000 */ nop +/* 16D3B4 8023EAD4 00000000 */ nop /* 16D3B8 8023EAD8 0808FB50 */ j .L8023ED40 -/* 16D3BC 8023EADC 00000000 */ nop +/* 16D3BC 8023EADC 00000000 */ nop .L8023EAE0: /* 16D3C0 8023EAE0 12000099 */ beqz $s0, .L8023ED48 -/* 16D3C4 8023EAE4 00000000 */ nop +/* 16D3C4 8023EAE4 00000000 */ nop .L8023EAE8: /* 16D3C8 8023EAE8 0C0900EF */ jal update_starpoints_display -/* 16D3CC 8023EAEC 00000000 */ nop +/* 16D3CC 8023EAEC 00000000 */ nop /* 16D3D0 8023EAF0 0C08FFE8 */ jal draw_enemy_health_bars -/* 16D3D4 8023EAF4 00000000 */ nop +/* 16D3D4 8023EAF4 00000000 */ nop /* 16D3D8 8023EAF8 1620008F */ bnez $s1, .L8023ED38 /* 16D3DC 8023EAFC 2603FFFF */ addiu $v1, $s0, -1 /* 16D3E0 8023EB00 2C620023 */ sltiu $v0, $v1, 0x23 /* 16D3E4 8023EB04 1040008C */ beqz $v0, .L8023ED38 /* 16D3E8 8023EB08 00031080 */ sll $v0, $v1, 2 -/* 16D3EC 8023EB0C 3C01802A */ lui $at, %hi(D_8029C9F8) +/* 16D3EC 8023EB0C 3C01802A */ lui $at, %hi(jtbl_8029C9F8_1CB2D8) /* 16D3F0 8023EB10 00220821 */ addu $at, $at, $v0 -/* 16D3F4 8023EB14 8C22C9F8 */ lw $v0, %lo(D_8029C9F8)($at) +/* 16D3F4 8023EB14 8C22C9F8 */ lw $v0, %lo(jtbl_8029C9F8_1CB2D8)($at) /* 16D3F8 8023EB18 00400008 */ jr $v0 -/* 16D3FC 8023EB1C 00000000 */ nop +/* 16D3FC 8023EB1C 00000000 */ nop +glabel L8023EB20_16D400 /* 16D400 8023EB20 0C0906AE */ jal func_80241AB8 -/* 16D404 8023EB24 00000000 */ nop +/* 16D404 8023EB24 00000000 */ nop /* 16D408 8023EB28 0808FB4E */ j .L8023ED38 -/* 16D40C 8023EB2C 00000000 */ nop +/* 16D40C 8023EB2C 00000000 */ nop +glabel L8023EB30_16D410 /* 16D410 8023EB30 0C090AB0 */ jal func_80242AC0 -/* 16D414 8023EB34 00000000 */ nop +/* 16D414 8023EB34 00000000 */ nop /* 16D418 8023EB38 0808FB4E */ j .L8023ED38 -/* 16D41C 8023EB3C 00000000 */ nop +/* 16D41C 8023EB3C 00000000 */ nop +glabel L8023EB40_16D420 /* 16D420 8023EB40 0C090BBE */ jal func_80242EF8 -/* 16D424 8023EB44 00000000 */ nop +/* 16D424 8023EB44 00000000 */ nop /* 16D428 8023EB48 0808FB4E */ j .L8023ED38 -/* 16D42C 8023EB4C 00000000 */ nop +/* 16D42C 8023EB4C 00000000 */ nop +glabel L8023EB50_16D430 /* 16D430 8023EB50 0C090E44 */ jal func_80243910 -/* 16D434 8023EB54 00000000 */ nop +/* 16D434 8023EB54 00000000 */ nop /* 16D438 8023EB58 0808FB4E */ j .L8023ED38 -/* 16D43C 8023EB5C 00000000 */ nop +/* 16D43C 8023EB5C 00000000 */ nop +glabel L8023EB60_16D440 /* 16D440 8023EB60 0C090807 */ jal func_8024201C -/* 16D444 8023EB64 00000000 */ nop +/* 16D444 8023EB64 00000000 */ nop /* 16D448 8023EB68 0808FB4E */ j .L8023ED38 -/* 16D44C 8023EB6C 00000000 */ nop +/* 16D44C 8023EB6C 00000000 */ nop +glabel L8023EB70_16D450 /* 16D450 8023EB70 0C090FF5 */ jal func_80243FD4 -/* 16D454 8023EB74 00000000 */ nop +/* 16D454 8023EB74 00000000 */ nop /* 16D458 8023EB78 0808FB4E */ j .L8023ED38 -/* 16D45C 8023EB7C 00000000 */ nop +/* 16D45C 8023EB7C 00000000 */ nop +glabel L8023EB80_16D460 /* 16D460 8023EB80 0C090AEA */ jal func_80242BA8 -/* 16D464 8023EB84 00000000 */ nop +/* 16D464 8023EB84 00000000 */ nop /* 16D468 8023EB88 0808FB4E */ j .L8023ED38 -/* 16D46C 8023EB8C 00000000 */ nop +/* 16D46C 8023EB8C 00000000 */ nop +glabel L8023EB90_16D470 /* 16D470 8023EB90 0C090BF6 */ jal func_80242FD8 -/* 16D474 8023EB94 00000000 */ nop +/* 16D474 8023EB94 00000000 */ nop /* 16D478 8023EB98 0808FB4E */ j .L8023ED38 -/* 16D47C 8023EB9C 00000000 */ nop +/* 16D47C 8023EB9C 00000000 */ nop +glabel L8023EBA0_16D480 /* 16D480 8023EBA0 0C090E74 */ jal func_802439D0 -/* 16D484 8023EBA4 00000000 */ nop +/* 16D484 8023EBA4 00000000 */ nop /* 16D488 8023EBA8 0808FB4E */ j .L8023ED38 -/* 16D48C 8023EBAC 00000000 */ nop +/* 16D48C 8023EBAC 00000000 */ nop +glabel L8023EBB0_16D490 /* 16D490 8023EBB0 0C0AA060 */ jal func_802A8180 -/* 16D494 8023EBB4 00000000 */ nop +/* 16D494 8023EBB4 00000000 */ nop /* 16D498 8023EBB8 0808FB4E */ j .L8023ED38 -/* 16D49C 8023EBBC 00000000 */ nop +/* 16D49C 8023EBBC 00000000 */ nop +glabel L8023EBC0_16D4A0 /* 16D4A0 8023EBC0 0C0AA6BA */ jal func_802A9AE8 -/* 16D4A4 8023EBC4 00000000 */ nop +/* 16D4A4 8023EBC4 00000000 */ nop /* 16D4A8 8023EBC8 0808FB4E */ j .L8023ED38 -/* 16D4AC 8023EBCC 00000000 */ nop +/* 16D4AC 8023EBCC 00000000 */ nop +glabel L8023EBD0_16D4B0 /* 16D4B0 8023EBD0 0C0AA990 */ jal func_802AA640 -/* 16D4B4 8023EBD4 00000000 */ nop +/* 16D4B4 8023EBD4 00000000 */ nop /* 16D4B8 8023EBD8 0808FB4E */ j .L8023ED38 -/* 16D4BC 8023EBDC 00000000 */ nop +/* 16D4BC 8023EBDC 00000000 */ nop +glabel L8023EBE0_16D4C0 /* 16D4C0 8023EBE0 0C0AA817 */ jal func_802AA05C -/* 16D4C4 8023EBE4 00000000 */ nop +/* 16D4C4 8023EBE4 00000000 */ nop /* 16D4C8 8023EBE8 0808FB4E */ j .L8023ED38 -/* 16D4CC 8023EBEC 00000000 */ nop +/* 16D4CC 8023EBEC 00000000 */ nop +glabel L8023EBF0_16D4D0 /* 16D4D0 8023EBF0 0C0AAB36 */ jal func_802AACD8 -/* 16D4D4 8023EBF4 00000000 */ nop +/* 16D4D4 8023EBF4 00000000 */ nop /* 16D4D8 8023EBF8 0808FB4E */ j .L8023ED38 -/* 16D4DC 8023EBFC 00000000 */ nop +/* 16D4DC 8023EBFC 00000000 */ nop +glabel L8023EC00_16D4E0 /* 16D4E0 8023EC00 0C091912 */ jal func_80246448 -/* 16D4E4 8023EC04 00000000 */ nop +/* 16D4E4 8023EC04 00000000 */ nop /* 16D4E8 8023EC08 0808FB4E */ j .L8023ED38 -/* 16D4EC 8023EC0C 00000000 */ nop +/* 16D4EC 8023EC0C 00000000 */ nop +glabel L8023EC10_16D4F0 /* 16D4F0 8023EC10 0C09203C */ jal func_802480F0 -/* 16D4F4 8023EC14 00000000 */ nop +/* 16D4F4 8023EC14 00000000 */ nop /* 16D4F8 8023EC18 0808FB4E */ j .L8023ED38 -/* 16D4FC 8023EC1C 00000000 */ nop +/* 16D4FC 8023EC1C 00000000 */ nop +glabel L8023EC20_16D500 /* 16D500 8023EC20 0C091ACB */ jal func_80246B2C -/* 16D504 8023EC24 00000000 */ nop +/* 16D504 8023EC24 00000000 */ nop /* 16D508 8023EC28 0808FB4E */ j .L8023ED38 -/* 16D50C 8023EC2C 00000000 */ nop +/* 16D50C 8023EC2C 00000000 */ nop +glabel L8023EC30_16D510 /* 16D510 8023EC30 0C091CA9 */ jal func_802472A4 -/* 16D514 8023EC34 00000000 */ nop +/* 16D514 8023EC34 00000000 */ nop /* 16D518 8023EC38 0808FB4E */ j .L8023ED38 -/* 16D51C 8023EC3C 00000000 */ nop +/* 16D51C 8023EC3C 00000000 */ nop +glabel L8023EC40_16D520 /* 16D520 8023EC40 0C09217F */ jal func_802485FC -/* 16D524 8023EC44 00000000 */ nop +/* 16D524 8023EC44 00000000 */ nop /* 16D528 8023EC48 0808FB4E */ j .L8023ED38 -/* 16D52C 8023EC4C 00000000 */ nop +/* 16D52C 8023EC4C 00000000 */ nop +glabel L8023EC50_16D530 /* 16D530 8023EC50 0C091EBF */ jal func_80247AFC -/* 16D534 8023EC54 00000000 */ nop +/* 16D534 8023EC54 00000000 */ nop /* 16D538 8023EC58 0808FB4E */ j .L8023ED38 -/* 16D53C 8023EC5C 00000000 */ nop +/* 16D53C 8023EC5C 00000000 */ nop +glabel L8023EC60_16D540 /* 16D540 8023EC60 0C091D5A */ jal func_80247568 -/* 16D544 8023EC64 00000000 */ nop +/* 16D544 8023EC64 00000000 */ nop /* 16D548 8023EC68 0808FB4E */ j .L8023ED38 -/* 16D54C 8023EC6C 00000000 */ nop +/* 16D54C 8023EC6C 00000000 */ nop +glabel L8023EC70_16D550 /* 16D550 8023EC70 0C091C85 */ jal func_80247214 -/* 16D554 8023EC74 00000000 */ nop +/* 16D554 8023EC74 00000000 */ nop /* 16D558 8023EC78 0808FB4E */ j .L8023ED38 -/* 16D55C 8023EC7C 00000000 */ nop +/* 16D55C 8023EC7C 00000000 */ nop +glabel L8023EC80_16D560 /* 16D560 8023EC80 0C0911C2 */ jal pause_cleanup -/* 16D564 8023EC84 00000000 */ nop +/* 16D564 8023EC84 00000000 */ nop /* 16D568 8023EC88 0808FB4E */ j .L8023ED38 -/* 16D56C 8023EC8C 00000000 */ nop +/* 16D56C 8023EC8C 00000000 */ nop +glabel L8023EC90_16D570 /* 16D570 8023EC90 0C091364 */ jal func_80244D90 -/* 16D574 8023EC94 00000000 */ nop +/* 16D574 8023EC94 00000000 */ nop /* 16D578 8023EC98 0808FB4E */ j .L8023ED38 -/* 16D57C 8023EC9C 00000000 */ nop +/* 16D57C 8023EC9C 00000000 */ nop +glabel L8023ECA0_16D580 /* 16D580 8023ECA0 0C0916B2 */ jal func_80245AC8 -/* 16D584 8023ECA4 00000000 */ nop +/* 16D584 8023ECA4 00000000 */ nop /* 16D588 8023ECA8 0808FB4E */ j .L8023ED38 -/* 16D58C 8023ECAC 00000000 */ nop +/* 16D58C 8023ECAC 00000000 */ nop +glabel L8023ECB0_16D590 /* 16D590 8023ECB0 0C09150E */ jal func_80245438 -/* 16D594 8023ECB4 00000000 */ nop +/* 16D594 8023ECB4 00000000 */ nop /* 16D598 8023ECB8 0808FB4E */ j .L8023ED38 -/* 16D59C 8023ECBC 00000000 */ nop +/* 16D59C 8023ECBC 00000000 */ nop +glabel L8023ECC0_16D5A0 /* 16D5A0 8023ECC0 0C0913BE */ jal func_80244EF8 -/* 16D5A4 8023ECC4 00000000 */ nop +/* 16D5A4 8023ECC4 00000000 */ nop /* 16D5A8 8023ECC8 0808FB4E */ j .L8023ED38 -/* 16D5AC 8023ECCC 00000000 */ nop +/* 16D5AC 8023ECCC 00000000 */ nop +glabel L8023ECD0_16D5B0 /* 16D5B0 8023ECD0 0C0915AC */ jal func_802456B0 -/* 16D5B4 8023ECD4 00000000 */ nop +/* 16D5B4 8023ECD4 00000000 */ nop /* 16D5B8 8023ECD8 0808FB4E */ j .L8023ED38 -/* 16D5BC 8023ECDC 00000000 */ nop +/* 16D5BC 8023ECDC 00000000 */ nop +glabel L8023ECE0_16D5C0 /* 16D5C0 8023ECE0 0C091000 */ jal func_80244000 -/* 16D5C4 8023ECE4 00000000 */ nop +/* 16D5C4 8023ECE4 00000000 */ nop /* 16D5C8 8023ECE8 0808FB4E */ j .L8023ED38 -/* 16D5CC 8023ECEC 00000000 */ nop +/* 16D5CC 8023ECEC 00000000 */ nop +glabel L8023ECF0_16D5D0 /* 16D5D0 8023ECF0 0C091292 */ jal func_80244A48 -/* 16D5D4 8023ECF4 00000000 */ nop +/* 16D5D4 8023ECF4 00000000 */ nop /* 16D5D8 8023ECF8 0808FB4E */ j .L8023ED38 -/* 16D5DC 8023ECFC 00000000 */ nop +/* 16D5DC 8023ECFC 00000000 */ nop +glabel L8023ED00_16D5E0 /* 16D5E0 8023ED00 0C0922A9 */ jal func_80248AA4 -/* 16D5E4 8023ED04 00000000 */ nop +/* 16D5E4 8023ED04 00000000 */ nop /* 16D5E8 8023ED08 0808FB4E */ j .L8023ED38 -/* 16D5EC 8023ED0C 00000000 */ nop +/* 16D5EC 8023ED0C 00000000 */ nop +glabel L8023ED10_16D5F0 /* 16D5F0 8023ED10 0C0AACCE */ jal func_802AB338 -/* 16D5F4 8023ED14 00000000 */ nop +/* 16D5F4 8023ED14 00000000 */ nop /* 16D5F8 8023ED18 0808FB4E */ j .L8023ED38 -/* 16D5FC 8023ED1C 00000000 */ nop +/* 16D5FC 8023ED1C 00000000 */ nop +glabel L8023ED20_16D600 /* 16D600 8023ED20 0C09806F */ jal func_802601BC -/* 16D604 8023ED24 00000000 */ nop +/* 16D604 8023ED24 00000000 */ nop /* 16D608 8023ED28 0808FB4E */ j .L8023ED38 -/* 16D60C 8023ED2C 00000000 */ nop +/* 16D60C 8023ED2C 00000000 */ nop +glabel L8023ED30_16D610 /* 16D610 8023ED30 0C09235E */ jal func_80248D78 -/* 16D614 8023ED34 00000000 */ nop +/* 16D614 8023ED34 00000000 */ nop .L8023ED38: +glabel L8023ED38_16D618 /* 16D618 8023ED38 0C093BC2 */ jal func_8024EF08 -/* 16D61C 8023ED3C 00000000 */ nop +/* 16D61C 8023ED3C 00000000 */ nop .L8023ED40: /* 16D620 8023ED40 0C03A5CF */ jal draw_status_ui -/* 16D624 8023ED44 00000000 */ nop +/* 16D624 8023ED44 00000000 */ nop .L8023ED48: /* 16D628 8023ED48 8FBF0018 */ lw $ra, 0x18($sp) /* 16D62C 8023ED4C 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_16c8e0/func_8023ED5C.s b/asm/nonmatchings/code_16c8e0/func_8023ED5C.s index a623318e40..9bc698294f 100644 --- a/asm/nonmatchings/code_16c8e0/func_8023ED5C.s +++ b/asm/nonmatchings/code_16c8e0/func_8023ED5C.s @@ -19,19 +19,19 @@ glabel func_8023ED5C /* 16D674 8023ED94 104000A7 */ beqz $v0, .L8023F034 /* 16D678 8023ED98 AFB10024 */ sw $s1, 0x24($sp) /* 16D67C 8023ED9C 0C093BAA */ jal func_8024EEA8 -/* 16D680 8023EDA0 00000000 */ nop +/* 16D680 8023EDA0 00000000 */ nop /* 16D684 8023EDA4 8E8200B8 */ lw $v0, 0xb8($s4) /* 16D688 8023EDA8 10400003 */ beqz $v0, .L8023EDB8 -/* 16D68C 8023EDAC 00000000 */ nop +/* 16D68C 8023EDAC 00000000 */ nop /* 16D690 8023EDB0 0040F809 */ jalr $v0 -/* 16D694 8023EDB4 00000000 */ nop +/* 16D694 8023EDB4 00000000 */ nop .L8023EDB8: /* 16D698 8023EDB8 8E820000 */ lw $v0, ($s4) /* 16D69C 8023EDBC 30420001 */ andi $v0, $v0, 1 /* 16D6A0 8023EDC0 1040009C */ beqz $v0, .L8023F034 -/* 16D6A4 8023EDC4 00000000 */ nop +/* 16D6A4 8023EDC4 00000000 */ nop /* 16D6A8 8023EDC8 0C0957F6 */ jal func_80255FD8 -/* 16D6AC 8023EDCC 00000000 */ nop +/* 16D6AC 8023EDCC 00000000 */ nop /* 16D6B0 8023EDD0 3C02800A */ lui $v0, %hi(D_8009A634) /* 16D6B4 8023EDD4 9442A634 */ lhu $v0, %lo(D_8009A634)($v0) /* 16D6B8 8023EDD8 2442FFFF */ addiu $v0, $v0, -1 @@ -96,7 +96,7 @@ glabel func_8023ED5C /* 16D798 8023EEB8 26730004 */ addiu $s3, $s3, 4 /* 16D79C 8023EEBC 8E9100DC */ lw $s1, 0xdc($s4) /* 16D7A0 8023EEC0 1220002D */ beqz $s1, .L8023EF78 -/* 16D7A4 8023EEC4 00000000 */ nop +/* 16D7A4 8023EEC4 00000000 */ nop /* 16D7A8 8023EEC8 8E220000 */ lw $v0, ($s1) /* 16D7AC 8023EECC 30420001 */ andi $v0, $v0, 1 /* 16D7B0 8023EED0 14400029 */ bnez $v0, .L8023EF78 @@ -115,7 +115,7 @@ glabel func_8023ED5C /* 16D7E4 8023EF04 3C031000 */ lui $v1, 0x1000 /* 16D7E8 8023EF08 00431024 */ and $v0, $v0, $v1 /* 16D7EC 8023EF0C 1040000C */ beqz $v0, .L8023EF40 -/* 16D7F0 8023EF10 00000000 */ nop +/* 16D7F0 8023EF10 00000000 */ nop /* 16D7F4 8023EF14 3C028025 */ lui $v0, %hi(D_8025599C) /* 16D7F8 8023EF18 2442599C */ addiu $v0, $v0, %lo(D_8025599C) /* 16D7FC 8023EF1C AE110008 */ sw $s1, 8($s0) @@ -145,7 +145,7 @@ glabel func_8023ED5C .L8023EF78: /* 16D858 8023EF78 8E9100D8 */ lw $s1, 0xd8($s4) /* 16D85C 8023EF7C 1220002D */ beqz $s1, .L8023F034 -/* 16D860 8023EF80 00000000 */ nop +/* 16D860 8023EF80 00000000 */ nop /* 16D864 8023EF84 8E220000 */ lw $v0, ($s1) /* 16D868 8023EF88 30420001 */ andi $v0, $v0, 1 /* 16D86C 8023EF8C 14400029 */ bnez $v0, .L8023F034 @@ -164,7 +164,7 @@ glabel func_8023ED5C /* 16D8A0 8023EFC0 3C031000 */ lui $v1, 0x1000 /* 16D8A4 8023EFC4 00431024 */ and $v0, $v0, $v1 /* 16D8A8 8023EFC8 1040000C */ beqz $v0, .L8023EFFC -/* 16D8AC 8023EFCC 00000000 */ nop +/* 16D8AC 8023EFCC 00000000 */ nop /* 16D8B0 8023EFD0 3C028025 */ lui $v0, %hi(D_80254C50) /* 16D8B4 8023EFD4 24424C50 */ addiu $v0, $v0, %lo(D_80254C50) /* 16D8B8 8023EFD8 AE110008 */ sw $s1, 8($s0) diff --git a/asm/nonmatchings/code_16c8e0/func_8023F088.s b/asm/nonmatchings/code_16c8e0/func_8023F088.s index d73aa716d5..452ac0cc6b 100644 --- a/asm/nonmatchings/code_16c8e0/func_8023F088.s +++ b/asm/nonmatchings/code_16c8e0/func_8023F088.s @@ -28,7 +28,7 @@ glabel func_8023F088 /* 16D9C4 8023F0E4 0C099EF7 */ jal hide_foreground_models_unsafe /* 16D9C8 8023F0E8 0044B821 */ addu $s7, $v0, $a0 /* 16D9CC 8023F0EC 0C046EE9 */ jal is_world_fog_enabled -/* 16D9D0 8023F0F0 00000000 */ nop +/* 16D9D0 8023F0F0 00000000 */ nop /* 16D9D4 8023F0F4 10400043 */ beqz $v0, .L8023F204 /* 16D9D8 8023F0F8 27A40010 */ addiu $a0, $sp, 0x10 /* 16D9DC 8023F0FC 24140001 */ addiu $s4, $zero, 1 @@ -59,7 +59,7 @@ glabel func_8023F088 /* 16DA3C 8023F15C 0641FFFD */ bgez $s2, .L8023F154 /* 16DA40 8023F160 2442FFFE */ addiu $v0, $v0, -2 /* 16DA44 8023F164 0808FC81 */ j .L8023F204 -/* 16DA48 8023F168 00000000 */ nop +/* 16DA48 8023F168 00000000 */ nop .L8023F16C: /* 16DA4C 8023F16C 3C13802A */ lui $s3, %hi(D_8029F038) /* 16DA50 8023F170 2673F038 */ addiu $s3, $s3, %lo(D_8029F038) @@ -157,27 +157,27 @@ glabel func_8023F088 /* 16DBB8 8023F2D8 25430028 */ addiu $v1, $t2, 0x28 /* 16DBBC 8023F2DC AD630000 */ sw $v1, ($t3) /* 16DBC0 8023F2E0 44821000 */ mtc1 $v0, $f2 -/* 16DBC4 8023F2E4 00000000 */ nop +/* 16DBC4 8023F2E4 00000000 */ nop /* 16DBC8 8023F2E8 468010A0 */ cvt.s.w $f2, $f2 /* 16DBCC 8023F2EC 46041082 */ mul.s $f2, $f2, $f4 -/* 16DBD0 8023F2F0 00000000 */ nop +/* 16DBD0 8023F2F0 00000000 */ nop /* 16DBD4 8023F2F4 25430030 */ addiu $v1, $t2, 0x30 /* 16DBD8 8023F2F8 86E20010 */ lh $v0, 0x10($s7) /* 16DBDC 8023F2FC 3C04ED00 */ lui $a0, 0xed00 /* 16DBE0 8023F300 44820000 */ mtc1 $v0, $f0 -/* 16DBE4 8023F304 00000000 */ nop +/* 16DBE4 8023F304 00000000 */ nop /* 16DBE8 8023F308 46800020 */ cvt.s.w $f0, $f0 /* 16DBEC 8023F30C 46040002 */ mul.s $f0, $f0, $f4 -/* 16DBF0 8023F310 00000000 */ nop +/* 16DBF0 8023F310 00000000 */ nop /* 16DBF4 8023F314 AD630000 */ sw $v1, ($t3) /* 16DBF8 8023F318 4600118D */ trunc.w.s $f6, $f2 /* 16DBFC 8023F31C 44023000 */ mfc1 $v0, $f6 -/* 16DC00 8023F320 00000000 */ nop +/* 16DC00 8023F320 00000000 */ nop /* 16DC04 8023F324 30420FFF */ andi $v0, $v0, 0xfff /* 16DC08 8023F328 00021300 */ sll $v0, $v0, 0xc /* 16DC0C 8023F32C 4600018D */ trunc.w.s $f6, $f0 /* 16DC10 8023F330 44033000 */ mfc1 $v1, $f6 -/* 16DC14 8023F334 00000000 */ nop +/* 16DC14 8023F334 00000000 */ nop /* 16DC18 8023F338 30630FFF */ andi $v1, $v1, 0xfff /* 16DC1C 8023F33C 00641825 */ or $v1, $v1, $a0 /* 16DC20 8023F340 00431025 */ or $v0, $v0, $v1 @@ -190,29 +190,29 @@ glabel func_8023F088 /* 16DC3C 8023F35C 00441021 */ addu $v0, $v0, $a0 /* 16DC40 8023F360 2442FFFF */ addiu $v0, $v0, -1 /* 16DC44 8023F364 44821000 */ mtc1 $v0, $f2 -/* 16DC48 8023F368 00000000 */ nop +/* 16DC48 8023F368 00000000 */ nop /* 16DC4C 8023F36C 468010A0 */ cvt.s.w $f2, $f2 /* 16DC50 8023F370 25440040 */ addiu $a0, $t2, 0x40 /* 16DC54 8023F374 86E20010 */ lh $v0, 0x10($s7) /* 16DC58 8023F378 46041082 */ mul.s $f2, $f2, $f4 -/* 16DC5C 8023F37C 00000000 */ nop +/* 16DC5C 8023F37C 00000000 */ nop /* 16DC60 8023F380 AD640000 */ sw $a0, ($t3) /* 16DC64 8023F384 00431021 */ addu $v0, $v0, $v1 /* 16DC68 8023F388 2442FFFF */ addiu $v0, $v0, -1 /* 16DC6C 8023F38C 44820000 */ mtc1 $v0, $f0 -/* 16DC70 8023F390 00000000 */ nop +/* 16DC70 8023F390 00000000 */ nop /* 16DC74 8023F394 46800020 */ cvt.s.w $f0, $f0 /* 16DC78 8023F398 46040002 */ mul.s $f0, $f0, $f4 -/* 16DC7C 8023F39C 00000000 */ nop +/* 16DC7C 8023F39C 00000000 */ nop /* 16DC80 8023F3A0 AD4C0038 */ sw $t4, 0x38($t2) /* 16DC84 8023F3A4 4600118D */ trunc.w.s $f6, $f2 /* 16DC88 8023F3A8 44023000 */ mfc1 $v0, $f6 -/* 16DC8C 8023F3AC 00000000 */ nop +/* 16DC8C 8023F3AC 00000000 */ nop /* 16DC90 8023F3B0 30420FFF */ andi $v0, $v0, 0xfff /* 16DC94 8023F3B4 00021300 */ sll $v0, $v0, 0xc /* 16DC98 8023F3B8 4600018D */ trunc.w.s $f6, $f0 /* 16DC9C 8023F3BC 44033000 */ mfc1 $v1, $f6 -/* 16DCA0 8023F3C0 00000000 */ nop +/* 16DCA0 8023F3C0 00000000 */ nop /* 16DCA4 8023F3C4 30630FFF */ andi $v1, $v1, 0xfff /* 16DCA8 8023F3C8 00431025 */ or $v0, $v0, $v1 /* 16DCAC 8023F3CC AD420034 */ sw $v0, 0x34($t2) @@ -302,7 +302,7 @@ glabel func_8023F088 /* 16DDF0 8023F510 15C10004 */ bne $t6, $at, .L8023F524 /* 16DDF4 8023F514 3C018000 */ lui $at, 0x8000 /* 16DDF8 8023F518 14410002 */ bne $v0, $at, .L8023F524 -/* 16DDFC 8023F51C 00000000 */ nop +/* 16DDFC 8023F51C 00000000 */ nop /* 16DE00 8023F520 0006000D */ break 6 .L8023F524: /* 16DE04 8023F524 00006812 */ mflo $t5 @@ -315,7 +315,7 @@ glabel func_8023F088 /* 16DE1C 8023F53C 15A10004 */ bne $t5, $at, .L8023F550 /* 16DE20 8023F540 3C018000 */ lui $at, 0x8000 /* 16DE24 8023F544 14610002 */ bne $v1, $at, .L8023F550 -/* 16DE28 8023F548 00000000 */ nop +/* 16DE28 8023F548 00000000 */ nop /* 16DE2C 8023F54C 0006000D */ break 6 .L8023F550: /* 16DE30 8023F550 0000B012 */ mflo $s6 @@ -692,27 +692,27 @@ glabel func_8023F088 /* 16E3E8 8023FB08 86E2000E */ lh $v0, 0xe($s7) /* 16E3EC 8023FB0C 86E30010 */ lh $v1, 0x10($s7) /* 16E3F0 8023FB10 44821000 */ mtc1 $v0, $f2 -/* 16E3F4 8023FB14 00000000 */ nop +/* 16E3F4 8023FB14 00000000 */ nop /* 16E3F8 8023FB18 468010A0 */ cvt.s.w $f2, $f2 /* 16E3FC 8023FB1C 46041082 */ mul.s $f2, $f2, $f4 -/* 16E400 8023FB20 00000000 */ nop +/* 16E400 8023FB20 00000000 */ nop /* 16E404 8023FB24 26020030 */ addiu $v0, $s0, 0x30 /* 16E408 8023FB28 44830000 */ mtc1 $v1, $f0 -/* 16E40C 8023FB2C 00000000 */ nop +/* 16E40C 8023FB2C 00000000 */ nop /* 16E410 8023FB30 46800020 */ cvt.s.w $f0, $f0 /* 16E414 8023FB34 AFC20000 */ sw $v0, ($fp) /* 16E418 8023FB38 26020038 */ addiu $v0, $s0, 0x38 /* 16E41C 8023FB3C 46040002 */ mul.s $f0, $f0, $f4 -/* 16E420 8023FB40 00000000 */ nop +/* 16E420 8023FB40 00000000 */ nop /* 16E424 8023FB44 AFC20000 */ sw $v0, ($fp) /* 16E428 8023FB48 4600118D */ trunc.w.s $f6, $f2 /* 16E42C 8023FB4C 44023000 */ mfc1 $v0, $f6 -/* 16E430 8023FB50 00000000 */ nop +/* 16E430 8023FB50 00000000 */ nop /* 16E434 8023FB54 30420FFF */ andi $v0, $v0, 0xfff /* 16E438 8023FB58 00021300 */ sll $v0, $v0, 0xc /* 16E43C 8023FB5C 4600018D */ trunc.w.s $f6, $f0 /* 16E440 8023FB60 44033000 */ mfc1 $v1, $f6 -/* 16E444 8023FB64 00000000 */ nop +/* 16E444 8023FB64 00000000 */ nop /* 16E448 8023FB68 30630FFF */ andi $v1, $v1, 0xfff /* 16E44C 8023FB6C 00641825 */ or $v1, $v1, $a0 /* 16E450 8023FB70 00431025 */ or $v0, $v0, $v1 @@ -727,27 +727,27 @@ glabel func_8023F088 /* 16E474 8023FB94 AE00002C */ sw $zero, 0x2c($s0) /* 16E478 8023FB98 00651821 */ addu $v1, $v1, $a1 /* 16E47C 8023FB9C 44831000 */ mtc1 $v1, $f2 -/* 16E480 8023FBA0 00000000 */ nop +/* 16E480 8023FBA0 00000000 */ nop /* 16E484 8023FBA4 468010A0 */ cvt.s.w $f2, $f2 /* 16E488 8023FBA8 46041082 */ mul.s $f2, $f2, $f4 -/* 16E48C 8023FBAC 00000000 */ nop +/* 16E48C 8023FBAC 00000000 */ nop /* 16E490 8023FBB0 AE080030 */ sw $t0, 0x30($s0) /* 16E494 8023FBB4 AE000034 */ sw $zero, 0x34($s0) /* 16E498 8023FBB8 00862021 */ addu $a0, $a0, $a2 /* 16E49C 8023FBBC 44840000 */ mtc1 $a0, $f0 -/* 16E4A0 8023FBC0 00000000 */ nop +/* 16E4A0 8023FBC0 00000000 */ nop /* 16E4A4 8023FBC4 46800020 */ cvt.s.w $f0, $f0 /* 16E4A8 8023FBC8 46040002 */ mul.s $f0, $f0, $f4 -/* 16E4AC 8023FBCC 00000000 */ nop +/* 16E4AC 8023FBCC 00000000 */ nop /* 16E4B0 8023FBD0 AE090038 */ sw $t1, 0x38($s0) /* 16E4B4 8023FBD4 4600118D */ trunc.w.s $f6, $f2 /* 16E4B8 8023FBD8 44023000 */ mfc1 $v0, $f6 -/* 16E4BC 8023FBDC 00000000 */ nop +/* 16E4BC 8023FBDC 00000000 */ nop /* 16E4C0 8023FBE0 30420FFF */ andi $v0, $v0, 0xfff /* 16E4C4 8023FBE4 00021300 */ sll $v0, $v0, 0xc /* 16E4C8 8023FBE8 4600018D */ trunc.w.s $f6, $f0 /* 16E4CC 8023FBEC 44033000 */ mfc1 $v1, $f6 -/* 16E4D0 8023FBF0 00000000 */ nop +/* 16E4D0 8023FBF0 00000000 */ nop /* 16E4D4 8023FBF4 30630FFF */ andi $v1, $v1, 0xfff /* 16E4D8 8023FBF8 00431025 */ or $v0, $v0, $v1 /* 16E4DC 8023FBFC AE020024 */ sw $v0, 0x24($s0) diff --git a/asm/nonmatchings/code_16c8e0/func_80240AA8.s b/asm/nonmatchings/code_16c8e0/func_80240AA8.s index b759bc4fdf..f2272247f3 100644 --- a/asm/nonmatchings/code_16c8e0/func_80240AA8.s +++ b/asm/nonmatchings/code_16c8e0/func_80240AA8.s @@ -67,7 +67,7 @@ glabel func_80240AA8 /* 16F470 80240B90 8C42C074 */ lw $v0, %lo(gBattleStatus+0x4)($v0) /* 16F474 80240B94 30420040 */ andi $v0, $v0, 0x40 /* 16F478 80240B98 10400006 */ beqz $v0, .L80240BB4 -/* 16F47C 80240B9C 00000000 */ nop +/* 16F47C 80240B9C 00000000 */ nop /* 16F480 80240BA0 3C03802A */ lui $v1, %hi(D_8029DA33) /* 16F484 80240BA4 9063DA33 */ lbu $v1, %lo(D_8029DA33)($v1) /* 16F488 80240BA8 3C028011 */ lui $v0, %hi(gPlayerData) @@ -75,4 +75,4 @@ glabel func_80240AA8 /* 16F490 80240BB0 A0430012 */ sb $v1, 0x12($v0) .L80240BB4: /* 16F494 80240BB4 03E00008 */ jr $ra -/* 16F498 80240BB8 00000000 */ nop +/* 16F498 80240BB8 00000000 */ nop diff --git a/asm/nonmatchings/code_16c8e0/initialize_battle.s b/asm/nonmatchings/code_16c8e0/initialize_battle.s index e730b4db30..9c728eea25 100644 --- a/asm/nonmatchings/code_16c8e0/initialize_battle.s +++ b/asm/nonmatchings/code_16c8e0/initialize_battle.s @@ -79,7 +79,7 @@ glabel initialize_battle /* 16CB28 8023E248 0C03A6D5 */ jal increment_status_menu_disabled /* 16CB2C 8023E24C AC620004 */ sw $v0, 4($v1) /* 16CB30 8023E250 0808F89B */ j .L8023E26C -/* 16CB34 8023E254 00000000 */ nop +/* 16CB34 8023E254 00000000 */ nop .L8023E258: /* 16CB38 8023E258 3C02800E */ lui $v0, %hi(gBattleStatus) /* 16CB3C 8023E25C 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) @@ -94,13 +94,13 @@ glabel initialize_battle /* 16CB5C 8023E27C 0C093B70 */ jal func_8024EDC0 /* 16CB60 8023E280 0000882D */ daddu $s1, $zero, $zero /* 16CB64 8023E284 0C09A3A2 */ jal func_80268E88 -/* 16CB68 8023E288 00000000 */ nop +/* 16CB68 8023E288 00000000 */ nop /* 16CB6C 8023E28C 0C051FB1 */ jal func_80147EC4 /* 16CB70 8023E290 24040001 */ addiu $a0, $zero, 1 /* 16CB74 8023E294 3C048029 */ lui $a0, %hi(D_80291F80) /* 16CB78 8023E298 24841F80 */ addiu $a0, $a0, %lo(D_80291F80) /* 16CB7C 8023E29C 0C050529 */ jal create_icon -/* 16CB80 8023E2A0 00000000 */ nop +/* 16CB80 8023E2A0 00000000 */ nop /* 16CB84 8023E2A4 3C01802A */ lui $at, %hi(D_8029EFBC) /* 16CB88 8023E2A8 AC22EFBC */ sw $v0, %lo(D_8029EFBC)($at) /* 16CB8C 8023E2AC 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_16c8e0/update_battle_state.s b/asm/nonmatchings/code_16c8e0/update_battle_state.s index 094828e198..fbe82e86b1 100644 --- a/asm/nonmatchings/code_16c8e0/update_battle_state.s +++ b/asm/nonmatchings/code_16c8e0/update_battle_state.s @@ -17,12 +17,12 @@ glabel update_battle_state /* 16CD48 8023E468 8E020000 */ lw $v0, ($s0) /* 16CD4C 8023E46C 00431024 */ and $v0, $v0, $v1 /* 16CD50 8023E470 10400014 */ beqz $v0, .L8023E4C4 -/* 16CD54 8023E474 00000000 */ nop +/* 16CD54 8023E474 00000000 */ nop /* 16CD58 8023E478 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* 16CD5C 8023E47C 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 16CD60 8023E480 80620081 */ lb $v0, 0x81($v1) /* 16CD64 8023E484 1040000F */ beqz $v0, .L8023E4C4 -/* 16CD68 8023E488 00000000 */ nop +/* 16CD68 8023E488 00000000 */ nop /* 16CD6C 8023E48C 8C620004 */ lw $v0, 4($v1) /* 16CD70 8023E490 00441024 */ and $v0, $v0, $a0 /* 16CD74 8023E494 AE020210 */ sw $v0, 0x210($s0) @@ -85,9 +85,9 @@ glabel update_battle_state .L8023E570: /* 16CE50 8023E570 8E0200B4 */ lw $v0, 0xb4($s0) /* 16CE54 8023E574 10400003 */ beqz $v0, .L8023E584 -/* 16CE58 8023E578 00000000 */ nop +/* 16CE58 8023E578 00000000 */ nop /* 16CE5C 8023E57C 0040F809 */ jalr $v0 -/* 16CE60 8023E580 00000000 */ nop +/* 16CE60 8023E580 00000000 */ nop .L8023E584: /* 16CE64 8023E584 82030095 */ lb $v1, 0x95($s0) /* 16CE68 8023E588 10600005 */ beqz $v1, .L8023E5A0 @@ -95,7 +95,7 @@ glabel update_battle_state /* 16CE70 8023E590 3C02800E */ lui $v0, %hi(gBattleState) /* 16CE74 8023E594 8C42C068 */ lw $v0, %lo(gBattleState)($v0) /* 16CE78 8023E598 10620092 */ beq $v1, $v0, .L8023E7E4 -/* 16CE7C 8023E59C 00000000 */ nop +/* 16CE7C 8023E59C 00000000 */ nop .L8023E5A0: /* 16CE80 8023E5A0 3C02800E */ lui $v0, %hi(gBattleState) /* 16CE84 8023E5A4 8C42C068 */ lw $v0, %lo(gBattleState)($v0) @@ -103,146 +103,181 @@ glabel update_battle_state /* 16CE8C 8023E5AC 2C620025 */ sltiu $v0, $v1, 0x25 /* 16CE90 8023E5B0 1040008C */ beqz $v0, .L8023E7E4 /* 16CE94 8023E5B4 00031080 */ sll $v0, $v1, 2 -/* 16CE98 8023E5B8 3C01802A */ lui $at, %hi(D_8029C960) +/* 16CE98 8023E5B8 3C01802A */ lui $at, %hi(jtbl_8029C960_1CB240) /* 16CE9C 8023E5BC 00220821 */ addu $at, $at, $v0 -/* 16CEA0 8023E5C0 8C22C960 */ lw $v0, %lo(D_8029C960)($at) +/* 16CEA0 8023E5C0 8C22C960 */ lw $v0, %lo(jtbl_8029C960_1CB240)($at) /* 16CEA4 8023E5C4 00400008 */ jr $v0 -/* 16CEA8 8023E5C8 00000000 */ nop +/* 16CEA8 8023E5C8 00000000 */ nop +glabel L8023E5CC_16CEAC /* 16CEAC 8023E5CC 0C090486 */ jal begin_battle /* 16CEB0 8023E5D0 0000882D */ daddu $s1, $zero, $zero /* 16CEB4 8023E5D4 0808F9F9 */ j .L8023E7E4 -/* 16CEB8 8023E5D8 00000000 */ nop +/* 16CEB8 8023E5D8 00000000 */ nop +glabel L8023E5DC_16CEBC /* 16CEBC 8023E5DC 0C090809 */ jal update_heroes_start_turn -/* 16CEC0 8023E5E0 00000000 */ nop +/* 16CEC0 8023E5E0 00000000 */ nop /* 16CEC4 8023E5E4 0808F9F9 */ j .L8023E7E4 -/* 16CEC8 8023E5E8 00000000 */ nop +/* 16CEC8 8023E5E8 00000000 */ nop +glabel L8023E5EC_16CECC /* 16CECC 8023E5EC 0C090AEC */ jal update_end_player_turn -/* 16CED0 8023E5F0 00000000 */ nop +/* 16CED0 8023E5F0 00000000 */ nop /* 16CED4 8023E5F4 0808F9F9 */ j .L8023E7E4 -/* 16CED8 8023E5F8 00000000 */ nop +/* 16CED8 8023E5F8 00000000 */ nop +glabel L8023E5FC_16CEDC /* 16CEDC 8023E5FC 0C090BF8 */ jal func_80242FE0 -/* 16CEE0 8023E600 00000000 */ nop +/* 16CEE0 8023E600 00000000 */ nop /* 16CEE4 8023E604 0808F9F9 */ j .L8023E7E4 -/* 16CEE8 8023E608 00000000 */ nop +/* 16CEE8 8023E608 00000000 */ nop +glabel L8023E60C_16CEEC /* 16CEEC 8023E60C 0C0906C5 */ jal func_80241B14 -/* 16CEF0 8023E610 00000000 */ nop +/* 16CEF0 8023E610 00000000 */ nop /* 16CEF4 8023E614 0808F9F9 */ j .L8023E7E4 -/* 16CEF8 8023E618 00000000 */ nop +/* 16CEF8 8023E618 00000000 */ nop +glabel L8023E61C_16CEFC /* 16CEFC 8023E61C 0C090E76 */ jal func_802439D8 -/* 16CF00 8023E620 00000000 */ nop +/* 16CF00 8023E620 00000000 */ nop /* 16CF04 8023E624 0808F9F9 */ j .L8023E7E4 -/* 16CF08 8023E628 00000000 */ nop +/* 16CF08 8023E628 00000000 */ nop +glabel L8023E62C_16CF0C /* 16CF0C 8023E62C 0C090AB2 */ jal switch_to_player -/* 16CF10 8023E630 00000000 */ nop +/* 16CF10 8023E630 00000000 */ nop /* 16CF14 8023E634 0808F9F9 */ j .L8023E7E4 -/* 16CF18 8023E638 00000000 */ nop +/* 16CF18 8023E638 00000000 */ nop +glabel L8023E63C_16CF1C /* 16CF1C 8023E63C 0C090BC0 */ jal switch_to_partner -/* 16CF20 8023E640 00000000 */ nop +/* 16CF20 8023E640 00000000 */ nop /* 16CF24 8023E644 0808F9F9 */ j .L8023E7E4 -/* 16CF28 8023E648 00000000 */ nop +/* 16CF28 8023E648 00000000 */ nop +glabel L8023E64C_16CF2C /* 16CF2C 8023E64C 0C090E46 */ jal switch_order -/* 16CF30 8023E650 00000000 */ nop +/* 16CF30 8023E650 00000000 */ nop /* 16CF34 8023E654 0808F9F9 */ j .L8023E7E4 -/* 16CF38 8023E658 00000000 */ nop +/* 16CF38 8023E658 00000000 */ nop +glabel L8023E65C_16CF3C /* 16CF3C 8023E65C 0C0A9662 */ jal update_player_menu -/* 16CF40 8023E660 00000000 */ nop +/* 16CF40 8023E660 00000000 */ nop /* 16CF44 8023E664 0808F9F9 */ j .L8023E7E4 -/* 16CF48 8023E668 00000000 */ nop +/* 16CF48 8023E668 00000000 */ nop +glabel L8023E66C_16CF4C /* 16CF4C 8023E66C 0C0AA072 */ jal update_partner_menu -/* 16CF50 8023E670 00000000 */ nop +/* 16CF50 8023E670 00000000 */ nop /* 16CF54 8023E674 0808F9F9 */ j .L8023E7E4 -/* 16CF58 8023E678 00000000 */ nop +/* 16CF58 8023E678 00000000 */ nop +glabel L8023E67C_16CF5C /* 16CF5C 8023E67C 0C0AA82E */ jal func_802AA0B8 -/* 16CF60 8023E680 00000000 */ nop +/* 16CF60 8023E680 00000000 */ nop /* 16CF64 8023E684 0808F9F9 */ j .L8023E7E4 -/* 16CF68 8023E688 00000000 */ nop +/* 16CF68 8023E688 00000000 */ nop +glabel L8023E68C_16CF6C /* 16CF6C 8023E68C 0C0AA6D1 */ jal func_802A9B44 -/* 16CF70 8023E690 00000000 */ nop +/* 16CF70 8023E690 00000000 */ nop /* 16CF74 8023E694 0808F9F9 */ j .L8023E7E4 -/* 16CF78 8023E698 00000000 */ nop +/* 16CF78 8023E698 00000000 */ nop +glabel L8023E69C_16CF7C /* 16CF7C 8023E69C 0C0AA9A2 */ jal update_targeting_enemies -/* 16CF80 8023E6A0 00000000 */ nop +/* 16CF80 8023E6A0 00000000 */ nop /* 16CF84 8023E6A4 0808F9F9 */ j .L8023E7E4 -/* 16CF88 8023E6A8 00000000 */ nop +/* 16CF88 8023E6A8 00000000 */ nop +glabel L8023E6AC_16CF8C /* 16CF8C 8023E6AC 0C0916B4 */ jal update_player_action -/* 16CF90 8023E6B0 00000000 */ nop +/* 16CF90 8023E6B0 00000000 */ nop /* 16CF94 8023E6B4 0808F9F9 */ j .L8023E7E4 -/* 16CF98 8023E6B8 00000000 */ nop +/* 16CF98 8023E6B8 00000000 */ nop +glabel L8023E6BC_16CF9C /* 16CF9C 8023E6BC 0C091EC1 */ jal func_80247B04 -/* 16CFA0 8023E6C0 00000000 */ nop +/* 16CFA0 8023E6C0 00000000 */ nop /* 16CFA4 8023E6C4 0808F9F9 */ j .L8023E7E4 -/* 16CFA8 8023E6C8 00000000 */ nop +/* 16CFA8 8023E6C8 00000000 */ nop +glabel L8023E6CC_16CFAC /* 16CFAC 8023E6CC 0C091914 */ jal update_player_change_turn -/* 16CFB0 8023E6D0 00000000 */ nop +/* 16CFB0 8023E6D0 00000000 */ nop /* 16CFB4 8023E6D4 0808F9F9 */ j .L8023E7E4 -/* 16CFB8 8023E6D8 00000000 */ nop +/* 16CFB8 8023E6D8 00000000 */ nop +glabel L8023E6DC_16CFBC /* 16CFBC 8023E6DC 0C091C87 */ jal func_8024721C -/* 16CFC0 8023E6E0 00000000 */ nop +/* 16CFC0 8023E6E0 00000000 */ nop /* 16CFC4 8023E6E4 0808F9F9 */ j .L8023E7E4 -/* 16CFC8 8023E6E8 00000000 */ nop +/* 16CFC8 8023E6E8 00000000 */ nop +glabel L8023E6EC_16CFCC /* 16CFCC 8023E6EC 0C091D5C */ jal update_enemy_action -/* 16CFD0 8023E6F0 00000000 */ nop +/* 16CFD0 8023E6F0 00000000 */ nop /* 16CFD4 8023E6F4 0808F9F9 */ j .L8023E7E4 -/* 16CFD8 8023E6F8 00000000 */ nop +/* 16CFD8 8023E6F8 00000000 */ nop +glabel L8023E6FC_16CFDC /* 16CFDC 8023E6FC 0C092064 */ jal func_80248190 -/* 16CFE0 8023E700 00000000 */ nop +/* 16CFE0 8023E700 00000000 */ nop /* 16CFE4 8023E704 0808F9F9 */ j .L8023E7E4 -/* 16CFE8 8023E708 00000000 */ nop +/* 16CFE8 8023E708 00000000 */ nop +glabel L8023E70C_16CFEC /* 16CFEC 8023E70C 0C091CAB */ jal update_enemy_change_turn -/* 16CFF0 8023E710 00000000 */ nop +/* 16CFF0 8023E710 00000000 */ nop /* 16CFF4 8023E714 0808F9F9 */ j .L8023E7E4 -/* 16CFF8 8023E718 00000000 */ nop +/* 16CFF8 8023E718 00000000 */ nop +glabel L8023E71C_16CFFC /* 16CFFC 8023E71C 0C091ACD */ jal update_partner_action -/* 16D000 8023E720 00000000 */ nop +/* 16D000 8023E720 00000000 */ nop /* 16D004 8023E724 0808F9F9 */ j .L8023E7E4 -/* 16D008 8023E728 00000000 */ nop +/* 16D008 8023E728 00000000 */ nop +glabel L8023E72C_16D00C /* 16D00C 8023E72C 0C091002 */ jal func_80244008 -/* 16D010 8023E730 00000000 */ nop +/* 16D010 8023E730 00000000 */ nop /* 16D014 8023E734 0808F9F9 */ j .L8023E7E4 -/* 16D018 8023E738 00000000 */ nop +/* 16D018 8023E738 00000000 */ nop +glabel L8023E73C_16D01C /* 16D01C 8023E73C 0C091294 */ jal end_battle -/* 16D020 8023E740 00000000 */ nop +/* 16D020 8023E740 00000000 */ nop /* 16D024 8023E744 0808F9F9 */ j .L8023E7E4 -/* 16D028 8023E748 00000000 */ nop +/* 16D028 8023E748 00000000 */ nop +glabel L8023E74C_16D02C /* 16D02C 8023E74C 0C0915BE */ jal update_swap_partner -/* 16D030 8023E750 00000000 */ nop +/* 16D030 8023E750 00000000 */ nop /* 16D034 8023E754 0808F9F9 */ j .L8023E7E4 -/* 16D038 8023E758 00000000 */ nop +/* 16D038 8023E758 00000000 */ nop +glabel L8023E75C_16D03C /* 16D03C 8023E75C 0C0913C0 */ jal update_run_away -/* 16D040 8023E760 00000000 */ nop +/* 16D040 8023E760 00000000 */ nop /* 16D044 8023E764 0808F9F9 */ j .L8023E7E4 -/* 16D048 8023E768 00000000 */ nop +/* 16D048 8023E768 00000000 */ nop +glabel L8023E76C_16D04C /* 16D04C 8023E76C 0C09138E */ jal func_80244E38 -/* 16D050 8023E770 00000000 */ nop +/* 16D050 8023E770 00000000 */ nop /* 16D054 8023E774 0808F9F9 */ j .L8023E7E4 -/* 16D058 8023E778 00000000 */ nop +/* 16D058 8023E778 00000000 */ nop +glabel L8023E77C_16D05C /* 16D05C 8023E77C 0C091510 */ jal func_80245440 -/* 16D060 8023E780 00000000 */ nop +/* 16D060 8023E780 00000000 */ nop /* 16D064 8023E784 0808F9F9 */ j .L8023E7E4 -/* 16D068 8023E788 00000000 */ nop +/* 16D068 8023E788 00000000 */ nop +glabel L8023E78C_16D06C /* 16D06C 8023E78C 0C090FF7 */ jal func_80243FDC -/* 16D070 8023E790 00000000 */ nop +/* 16D070 8023E790 00000000 */ nop /* 16D074 8023E794 0808F9F9 */ j .L8023E7E4 -/* 16D078 8023E798 00000000 */ nop +/* 16D078 8023E798 00000000 */ nop +glabel L8023E79C_16D07C /* 16D07C 8023E79C 0C0911C4 */ jal func_80244710 -/* 16D080 8023E7A0 00000000 */ nop +/* 16D080 8023E7A0 00000000 */ nop /* 16D084 8023E7A4 0808F9F9 */ j .L8023E7E4 -/* 16D088 8023E7A8 00000000 */ nop +/* 16D088 8023E7A8 00000000 */ nop +glabel L8023E7AC_16D08C /* 16D08C 8023E7AC 0C092198 */ jal func_80248660 -/* 16D090 8023E7B0 00000000 */ nop +/* 16D090 8023E7B0 00000000 */ nop /* 16D094 8023E7B4 0808F9F9 */ j .L8023E7E4 -/* 16D098 8023E7B8 00000000 */ nop +/* 16D098 8023E7B8 00000000 */ nop +glabel L8023E7BC_16D09C /* 16D09C 8023E7BC 0C0AACCC */ jal func_802AB330 -/* 16D0A0 8023E7C0 00000000 */ nop +/* 16D0A0 8023E7C0 00000000 */ nop /* 16D0A4 8023E7C4 0808F9F9 */ j .L8023E7E4 -/* 16D0A8 8023E7C8 00000000 */ nop +/* 16D0A8 8023E7C8 00000000 */ nop +glabel L8023E7CC_16D0AC /* 16D0AC 8023E7CC 0C097864 */ jal func_8025E190 -/* 16D0B0 8023E7D0 00000000 */ nop +/* 16D0B0 8023E7D0 00000000 */ nop /* 16D0B4 8023E7D4 0808F9F9 */ j .L8023E7E4 -/* 16D0B8 8023E7D8 00000000 */ nop +/* 16D0B8 8023E7D8 00000000 */ nop +glabel L8023E7DC_16D0BC /* 16D0BC 8023E7DC 0C0922C2 */ jal func_80248B08 /* 16D0C0 8023E7E0 0000882D */ daddu $s1, $zero, $zero .L8023E7E4: +glabel L8023E7E4_16D0C4 /* 16D0C4 8023E7E4 96020090 */ lhu $v0, 0x90($s0) /* 16D0C8 8023E7E8 24030028 */ addiu $v1, $zero, 0x28 /* 16D0CC 8023E7EC 24420001 */ addiu $v0, $v0, 1 @@ -250,20 +285,20 @@ glabel update_battle_state /* 16D0D4 8023E7F4 00021400 */ sll $v0, $v0, 0x10 /* 16D0D8 8023E7F8 00021403 */ sra $v0, $v0, 0x10 /* 16D0DC 8023E7FC 14430003 */ bne $v0, $v1, .L8023E80C -/* 16D0E0 8023E800 00000000 */ nop +/* 16D0E0 8023E800 00000000 */ nop /* 16D0E4 8023E804 0C093DF2 */ jal func_8024F7C8 -/* 16D0E8 8023E808 00000000 */ nop +/* 16D0E8 8023E808 00000000 */ nop .L8023E80C: /* 16D0EC 8023E80C 0C0999A1 */ jal func_80266684 -/* 16D0F0 8023E810 00000000 */ nop +/* 16D0F0 8023E810 00000000 */ nop /* 16D0F4 8023E814 0C099A5E */ jal func_80266978 -/* 16D0F8 8023E818 00000000 */ nop +/* 16D0F8 8023E818 00000000 */ nop /* 16D0FC 8023E81C 0C099AC5 */ jal func_80266B14 -/* 16D100 8023E820 00000000 */ nop +/* 16D100 8023E820 00000000 */ nop /* 16D104 8023E824 0C093B92 */ jal func_8024EE48 -/* 16D108 8023E828 00000000 */ nop +/* 16D108 8023E828 00000000 */ nop /* 16D10C 8023E82C 0C08F901 */ jal update_actor_shadows -/* 16D110 8023E830 00000000 */ nop +/* 16D110 8023E830 00000000 */ nop /* 16D114 8023E834 82030432 */ lb $v1, 0x432($s0) /* 16D118 8023E838 2402FFFE */ addiu $v0, $zero, -2 /* 16D11C 8023E83C 10620089 */ beq $v1, $v0, .L8023EA64 @@ -279,7 +314,7 @@ glabel update_battle_state /* 16D144 8023E864 0C04DF84 */ jal func_80137E10 /* 16D148 8023E868 00A0382D */ daddu $a3, $a1, $zero /* 16D14C 8023E86C 16400003 */ bnez $s2, .L8023E87C -/* 16D150 8023E870 00000000 */ nop +/* 16D150 8023E870 00000000 */ nop /* 16D154 8023E874 0808FA56 */ j .L8023E958 /* 16D158 8023E878 3C054357 */ lui $a1, 0x4357 .L8023E87C: @@ -288,16 +323,16 @@ glabel update_battle_state /* 16D164 8023E884 80430012 */ lb $v1, 0x12($v0) /* 16D168 8023E888 24020006 */ addiu $v0, $zero, 6 /* 16D16C 8023E88C 1462000F */ bne $v1, $v0, .L8023E8CC -/* 16D170 8023E890 00000000 */ nop +/* 16D170 8023E890 00000000 */ nop /* 16D174 8023E894 C7A0001C */ lwc1 $f0, 0x1c($sp) /* 16D178 8023E898 3C014120 */ lui $at, 0x4120 /* 16D17C 8023E89C 44811000 */ mtc1 $at, $f2 -/* 16D180 8023E8A0 00000000 */ nop +/* 16D180 8023E8A0 00000000 */ nop /* 16D184 8023E8A4 46020001 */ sub.s $f0, $f0, $f2 /* 16D188 8023E8A8 44801000 */ mtc1 $zero, $f2 -/* 16D18C 8023E8AC 00000000 */ nop +/* 16D18C 8023E8AC 00000000 */ nop /* 16D190 8023E8B0 4602003C */ c.lt.s $f0, $f2 -/* 16D194 8023E8B4 00000000 */ nop +/* 16D194 8023E8B4 00000000 */ nop /* 16D198 8023E8B8 45000002 */ bc1f .L8023E8C4 /* 16D19C 8023E8BC E7A0001C */ swc1 $f0, 0x1c($sp) /* 16D1A0 8023E8C0 E7A2001C */ swc1 $f2, 0x1c($sp) @@ -308,13 +343,13 @@ glabel update_battle_state /* 16D1AC 8023E8CC C7A0001C */ lwc1 $f0, 0x1c($sp) /* 16D1B0 8023E8D0 3C014120 */ lui $at, 0x4120 /* 16D1B4 8023E8D4 44811000 */ mtc1 $at, $f2 -/* 16D1B8 8023E8D8 00000000 */ nop +/* 16D1B8 8023E8D8 00000000 */ nop /* 16D1BC 8023E8DC 46020000 */ add.s $f0, $f0, $f2 /* 16D1C0 8023E8E0 3C014357 */ lui $at, 0x4357 /* 16D1C4 8023E8E4 44811000 */ mtc1 $at, $f2 -/* 16D1C8 8023E8E8 00000000 */ nop +/* 16D1C8 8023E8E8 00000000 */ nop /* 16D1CC 8023E8EC 4600103C */ c.lt.s $f2, $f0 -/* 16D1D0 8023E8F0 00000000 */ nop +/* 16D1D0 8023E8F0 00000000 */ nop /* 16D1D4 8023E8F4 45000002 */ bc1f .L8023E900 /* 16D1D8 8023E8F8 E7A0001C */ swc1 $f0, 0x1c($sp) /* 16D1DC 8023E8FC E7A2001C */ swc1 $f2, 0x1c($sp) @@ -323,16 +358,16 @@ glabel update_battle_state /* 16D1E4 8023E904 8FA5001C */ lw $a1, 0x1c($sp) .L8023E908: /* 16D1E8 8023E908 04410015 */ bgez $v0, .L8023E960 -/* 16D1EC 8023E90C 00000000 */ nop +/* 16D1EC 8023E90C 00000000 */ nop /* 16D1F0 8023E910 C7A2001C */ lwc1 $f2, 0x1c($sp) /* 16D1F4 8023E914 3C014120 */ lui $at, 0x4120 /* 16D1F8 8023E918 44810000 */ mtc1 $at, $f0 -/* 16D1FC 8023E91C 00000000 */ nop +/* 16D1FC 8023E91C 00000000 */ nop /* 16D200 8023E920 46001081 */ sub.s $f2, $f2, $f0 /* 16D204 8023E924 44800000 */ mtc1 $zero, $f0 -/* 16D208 8023E928 00000000 */ nop +/* 16D208 8023E928 00000000 */ nop /* 16D20C 8023E92C 4600103C */ c.lt.s $f2, $f0 -/* 16D210 8023E930 00000000 */ nop +/* 16D210 8023E930 00000000 */ nop /* 16D214 8023E934 45000007 */ bc1f .L8023E954 /* 16D218 8023E938 E7A2001C */ swc1 $f2, 0x1c($sp) /* 16D21C 8023E93C 3C05BF80 */ lui $a1, 0xbf80 @@ -352,7 +387,7 @@ glabel update_battle_state /* 16D248 8023E968 3C038028 */ lui $v1, %hi(D_802809F6) /* 16D24C 8023E96C 846309F6 */ lh $v1, %lo(D_802809F6)($v1) /* 16D250 8023E970 1062003C */ beq $v1, $v0, .L8023EA64 -/* 16D254 8023E974 00000000 */ nop +/* 16D254 8023E974 00000000 */ nop .L8023E978: /* 16D258 8023E978 3C108028 */ lui $s0, %hi(D_802809F6) /* 16D25C 8023E97C 261009F6 */ addiu $s0, $s0, %lo(D_802809F6) @@ -373,13 +408,13 @@ glabel update_battle_state /* 16D298 8023E9B8 93A30020 */ lbu $v1, 0x20($sp) /* 16D29C 8023E9BC 240200FF */ addiu $v0, $zero, 0xff /* 16D2A0 8023E9C0 14620028 */ bne $v1, $v0, .L8023EA64 -/* 16D2A4 8023E9C4 00000000 */ nop +/* 16D2A4 8023E9C4 00000000 */ nop /* 16D2A8 8023E9C8 A6000000 */ sh $zero, ($s0) /* 16D2AC 8023E9CC 0000202D */ daddu $a0, $zero, $zero /* 16D2B0 8023E9D0 0C04DF62 */ jal func_80137D88 /* 16D2B4 8023E9D4 0000282D */ daddu $a1, $zero, $zero /* 16D2B8 8023E9D8 0808FA99 */ j .L8023EA64 -/* 16D2BC 8023E9DC 00000000 */ nop +/* 16D2BC 8023E9DC 00000000 */ nop .L8023E9E0: /* 16D2C0 8023E9E0 1485000A */ bne $a0, $a1, .L8023EA0C /* 16D2C4 8023E9E4 2462000A */ addiu $v0, $v1, 0xa @@ -387,11 +422,11 @@ glabel update_battle_state /* 16D2CC 8023E9EC 8C63C068 */ lw $v1, %lo(gBattleState)($v1) /* 16D2D0 8023E9F0 24020023 */ addiu $v0, $zero, 0x23 /* 16D2D4 8023E9F4 1062001B */ beq $v1, $v0, .L8023EA64 -/* 16D2D8 8023E9F8 00000000 */ nop +/* 16D2D8 8023E9F8 00000000 */ nop /* 16D2DC 8023E9FC 0C090464 */ jal func_80241190 /* 16D2E0 8023EA00 0040202D */ daddu $a0, $v0, $zero /* 16D2E4 8023EA04 0808FA99 */ j .L8023EA64 -/* 16D2E8 8023EA08 00000000 */ nop +/* 16D2E8 8023EA08 00000000 */ nop .L8023EA0C: /* 16D2EC 8023EA0C A6020000 */ sh $v0, ($s0) /* 16D2F0 8023EA10 00021400 */ sll $v0, $v0, 0x10 @@ -402,7 +437,7 @@ glabel update_battle_state .L8023EA24: /* 16D304 8023EA24 86020000 */ lh $v0, ($s0) /* 16D308 8023EA28 44822000 */ mtc1 $v0, $f4 -/* 16D30C 8023EA2C 00000000 */ nop +/* 16D30C 8023EA2C 00000000 */ nop /* 16D310 8023EA30 46802120 */ cvt.s.w $f4, $f4 /* 16D314 8023EA34 44052000 */ mfc1 $a1, $f4 /* 16D318 8023EA38 0C04DF62 */ jal func_80137D88 @@ -417,6 +452,7 @@ glabel update_battle_state /* 16D33C 8023EA5C 0C00CDF8 */ jal intro_logos_set_fade_color /* 16D340 8023EA60 240400E0 */ addiu $a0, $zero, 0xe0 .L8023EA64: +glabel L8023EA64_16D344 /* 16D344 8023EA64 8FBF0034 */ lw $ra, 0x34($sp) /* 16D348 8023EA68 8FB20030 */ lw $s2, 0x30($sp) /* 16D34C 8023EA6C 8FB1002C */ lw $s1, 0x2c($sp) diff --git a/asm/nonmatchings/code_16c8e0/update_starpoints_display.s b/asm/nonmatchings/code_16c8e0/update_starpoints_display.s index a01e5fb1dc..37f82b01d2 100644 --- a/asm/nonmatchings/code_16c8e0/update_starpoints_display.s +++ b/asm/nonmatchings/code_16c8e0/update_starpoints_display.s @@ -20,7 +20,7 @@ glabel update_starpoints_display /* 16ECD8 802403F8 8D620000 */ lw $v0, ($t3) /* 16ECDC 802403FC 30420001 */ andi $v0, $v0, 1 /* 16ECE0 80240400 1040016E */ beqz $v0, .L802409BC -/* 16ECE4 80240404 00000000 */ nop +/* 16ECE4 80240404 00000000 */ nop /* 16ECE8 80240408 8D620004 */ lw $v0, 4($t3) /* 16ECEC 8024040C 30420001 */ andi $v0, $v0, 1 /* 16ECF0 80240410 1440001D */ bnez $v0, .L80240488 @@ -69,7 +69,7 @@ glabel update_starpoints_display /* 16ED94 802404B4 14610004 */ bne $v1, $at, .L802404C8 /* 16ED98 802404B8 3C018000 */ lui $at, 0x8000 /* 16ED9C 802404BC 14A10002 */ bne $a1, $at, .L802404C8 -/* 16EDA0 802404C0 00000000 */ nop +/* 16EDA0 802404C0 00000000 */ nop /* 16EDA4 802404C4 0006000D */ break 6 .L802404C8: /* 16EDA8 802404C8 00002812 */ mflo $a1 @@ -86,7 +86,7 @@ glabel update_starpoints_display /* 16EDD0 802404F0 14610004 */ bne $v1, $at, .L80240504 /* 16EDD4 802404F4 3C018000 */ lui $at, 0x8000 /* 16EDD8 802404F8 14410002 */ bne $v0, $at, .L80240504 -/* 16EDDC 802404FC 00000000 */ nop +/* 16EDDC 802404FC 00000000 */ nop /* 16EDE0 80240500 0006000D */ break 6 .L80240504: /* 16EDE4 80240504 00001012 */ mflo $v0 @@ -121,7 +121,7 @@ glabel update_starpoints_display /* 16EE50 80240570 A0620000 */ sb $v0, ($v1) .L80240574: /* 16EE54 80240574 10A00111 */ beqz $a1, .L802409BC -/* 16EE58 80240578 00000000 */ nop +/* 16EE58 80240578 00000000 */ nop /* 16EE5C 8024057C 3C038028 */ lui $v1, %hi(D_802809F0) /* 16EE60 80240580 246309F0 */ addiu $v1, $v1, %lo(D_802809F0) /* 16EE64 80240584 9162007A */ lbu $v0, 0x7a($t3) @@ -138,12 +138,12 @@ glabel update_starpoints_display /* 16EE90 802405B0 A162007A */ sb $v0, 0x7a($t3) /* 16EE94 802405B4 46200020 */ cvt.s.d $f0, $f0 /* 16EE98 802405B8 4602003E */ c.le.s $f0, $f2 -/* 16EE9C 802405BC 00000000 */ nop +/* 16EE9C 802405BC 00000000 */ nop /* 16EEA0 802405C0 45000036 */ bc1f .L8024069C /* 16EEA4 802405C4 E4600000 */ swc1 $f0, ($v1) /* 16EEA8 802405C8 81620079 */ lb $v0, 0x79($t3) /* 16EEAC 802405CC 1840000D */ blez $v0, .L80240604 -/* 16EEB0 802405D0 00000000 */ nop +/* 16EEB0 802405D0 00000000 */ nop /* 16EEB4 802405D4 91620078 */ lbu $v0, 0x78($t3) /* 16EEB8 802405D8 24420001 */ addiu $v0, $v0, 1 /* 16EEBC 802405DC A1620078 */ sb $v0, 0x78($t3) @@ -163,26 +163,26 @@ glabel update_starpoints_display /* 16EEEC 8024060C 24030001 */ addiu $v1, $zero, 1 .L80240610: /* 16EEF0 80240610 44830000 */ mtc1 $v1, $f0 -/* 16EEF4 80240614 00000000 */ nop +/* 16EEF4 80240614 00000000 */ nop /* 16EEF8 80240618 46800020 */ cvt.s.w $f0, $f0 /* 16EEFC 8024061C 8162007A */ lb $v0, 0x7a($t3) /* 16EF00 80240620 3C013FF0 */ lui $at, 0x3ff0 /* 16EF04 80240624 44811800 */ mtc1 $at, $f3 /* 16EF08 80240628 44801000 */ mtc1 $zero, $f2 /* 16EF0C 8024062C 44822000 */ mtc1 $v0, $f4 -/* 16EF10 80240630 00000000 */ nop +/* 16EF10 80240630 00000000 */ nop /* 16EF14 80240634 46802120 */ cvt.s.w $f4, $f4 /* 16EF18 80240638 46002103 */ div.s $f4, $f4, $f0 /* 16EF1C 8024063C 46002021 */ cvt.d.s $f0, $f4 /* 16EF20 80240640 3C028028 */ lui $v0, %hi(D_802809F0) /* 16EF24 80240644 244209F0 */ addiu $v0, $v0, %lo(D_802809F0) /* 16EF28 80240648 4622003C */ c.lt.d $f0, $f2 -/* 16EF2C 8024064C 00000000 */ nop +/* 16EF2C 8024064C 00000000 */ nop /* 16EF30 80240650 45000005 */ bc1f .L80240668 /* 16EF34 80240654 E4440000 */ swc1 $f4, ($v0) /* 16EF38 80240658 3C013F80 */ lui $at, 0x3f80 /* 16EF3C 8024065C 44810000 */ mtc1 $at, $f0 -/* 16EF40 80240660 00000000 */ nop +/* 16EF40 80240660 00000000 */ nop /* 16EF44 80240664 E4400000 */ swc1 $f0, ($v0) .L80240668: /* 16EF48 80240668 C4400000 */ lwc1 $f0, ($v0) @@ -191,12 +191,12 @@ glabel update_starpoints_display /* 16EF54 80240674 44801000 */ mtc1 $zero, $f2 /* 16EF58 80240678 46000021 */ cvt.d.s $f0, $f0 /* 16EF5C 8024067C 4620103C */ c.lt.d $f2, $f0 -/* 16EF60 80240680 00000000 */ nop +/* 16EF60 80240680 00000000 */ nop /* 16EF64 80240684 45000006 */ bc1f .L802406A0 /* 16EF68 80240688 3C036666 */ lui $v1, 0x6666 /* 16EF6C 8024068C 3C0140C0 */ lui $at, 0x40c0 /* 16EF70 80240690 44810000 */ mtc1 $at, $f0 -/* 16EF74 80240694 00000000 */ nop +/* 16EF74 80240694 00000000 */ nop /* 16EF78 80240698 E4400000 */ swc1 $f0, ($v0) .L8024069C: /* 16EF7C 8024069C 3C036666 */ lui $v1, 0x6666 @@ -270,12 +270,12 @@ glabel update_starpoints_display /* 16F07C 8024079C 0200202D */ daddu $a0, $s0, $zero /* 16F080 802407A0 3C0141A0 */ lui $at, 0x41a0 /* 16F084 802407A4 44810000 */ mtc1 $at, $f0 -/* 16F088 802407A8 00000000 */ nop +/* 16F088 802407A8 00000000 */ nop /* 16F08C 802407AC 4600B002 */ mul.s $f0, $f22, $f0 -/* 16F090 802407B0 00000000 */ nop +/* 16F090 802407B0 00000000 */ nop /* 16F094 802407B4 26940004 */ addiu $s4, $s4, 4 /* 16F098 802407B8 44921000 */ mtc1 $s2, $f2 -/* 16F09C 802407BC 00000000 */ nop +/* 16F09C 802407BC 00000000 */ nop /* 16F0A0 802407C0 468010A0 */ cvt.s.w $f2, $f2 /* 16F0A4 802407C4 46001081 */ sub.s $f2, $f2, $f0 /* 16F0A8 802407C8 26310001 */ addiu $s1, $s1, 1 @@ -310,9 +310,9 @@ glabel update_starpoints_display .L80240834: /* 16F114 80240834 3C014160 */ lui $at, 0x4160 /* 16F118 80240838 44810000 */ mtc1 $at, $f0 -/* 16F11C 8024083C 00000000 */ nop +/* 16F11C 8024083C 00000000 */ nop /* 16F120 80240840 4600B002 */ mul.s $f0, $f22, $f0 -/* 16F124 80240844 00000000 */ nop +/* 16F124 80240844 00000000 */ nop /* 16F128 80240848 3C01802A */ lui $at, %hi(D_8029DA44) /* 16F12C 8024084C C422DA44 */ lwc1 $f2, %lo(D_8029DA44)($at) /* 16F130 80240850 468010A0 */ cvt.s.w $f2, $f2 @@ -325,7 +325,7 @@ glabel update_starpoints_display /* 16F14C 8024086C 4600118D */ trunc.w.s $f6, $f2 /* 16F150 80240870 44153000 */ mfc1 $s5, $f6 /* 16F154 80240874 1040001D */ beqz $v0, .L802408EC -/* 16F158 80240878 00000000 */ nop +/* 16F158 80240878 00000000 */ nop /* 16F15C 8024087C 8FAC0050 */ lw $t4, 0x50($sp) /* 16F160 80240880 1180001B */ beqz $t4, .L802408F0 /* 16F164 80240884 0000202D */ daddu $a0, $zero, $zero @@ -384,9 +384,9 @@ glabel update_starpoints_display /* 16F228 80240948 0C0511EA */ jal draw_icon_0 /* 16F22C 8024094C 0200202D */ daddu $a0, $s0, $zero /* 16F230 80240950 4614B082 */ mul.s $f2, $f22, $f20 -/* 16F234 80240954 00000000 */ nop +/* 16F234 80240954 00000000 */ nop /* 16F238 80240958 44920000 */ mtc1 $s2, $f0 -/* 16F23C 8024095C 00000000 */ nop +/* 16F23C 8024095C 00000000 */ nop /* 16F240 80240960 46800020 */ cvt.s.w $f0, $f0 /* 16F244 80240964 46020001 */ sub.s $f0, $f0, $f2 /* 16F248 80240968 4600018D */ trunc.w.s $f6, $f0 @@ -411,7 +411,7 @@ glabel update_starpoints_display /* 16F28C 802409AC 26310001 */ addiu $s1, $s1, 1 /* 16F290 802409B0 2A22000A */ slti $v0, $s1, 0xa /* 16F294 802409B4 1440FFF9 */ bnez $v0, .L8024099C -/* 16F298 802409B8 00000000 */ nop +/* 16F298 802409B8 00000000 */ nop .L802409BC: /* 16F29C 802409BC 8FBF007C */ lw $ra, 0x7c($sp) /* 16F2A0 802409C0 8FBE0078 */ lw $fp, 0x78($sp) diff --git a/asm/nonmatchings/code_1776B0/func_8024E748.s b/asm/nonmatchings/code_1776B0/func_8024E748.s index 236eb21463..95c6350289 100644 --- a/asm/nonmatchings/code_1776B0/func_8024E748.s +++ b/asm/nonmatchings/code_1776B0/func_8024E748.s @@ -28,26 +28,34 @@ glabel func_8024E748 /* 17D084 8024E7A4 2E020008 */ sltiu $v0, $s0, 8 /* 17D088 8024E7A8 10400016 */ beqz $v0, .L8024E804 /* 17D08C 8024E7AC 00101080 */ sll $v0, $s0, 2 -/* 17D090 8024E7B0 3C01802A */ lui $at, %hi(D_8029CD70) +/* 17D090 8024E7B0 3C01802A */ lui $at, %hi(jtbl_8029CD70_1CB650) /* 17D094 8024E7B4 00220821 */ addu $at, $at, $v0 -/* 17D098 8024E7B8 8C22CD70 */ lw $v0, %lo(D_8029CD70)($at) +/* 17D098 8024E7B8 8C22CD70 */ lw $v0, %lo(jtbl_8029CD70_1CB650)($at) /* 17D09C 8024E7BC 00400008 */ jr $v0 /* 17D0A0 8024E7C0 00000000 */ nop +glabel L8024E7C4_17D0A4 /* 17D0A4 8024E7C4 08093A01 */ j .L8024E804 /* 17D0A8 8024E7C8 A623001C */ sh $v1, 0x1c($s1) +glabel L8024E7CC_17D0AC /* 17D0AC 8024E7CC 08093A01 */ j .L8024E804 /* 17D0B0 8024E7D0 A623001E */ sh $v1, 0x1e($s1) +glabel L8024E7D4_17D0B4 /* 17D0B4 8024E7D4 08093A01 */ j .L8024E804 /* 17D0B8 8024E7D8 A6230020 */ sh $v1, 0x20($s1) +glabel L8024E7DC_17D0BC /* 17D0BC 8024E7DC 08093A01 */ j .L8024E804 /* 17D0C0 8024E7E0 A6230022 */ sh $v1, 0x22($s1) +glabel L8024E7E4_17D0C4 /* 17D0C4 8024E7E4 08093A01 */ j .L8024E804 /* 17D0C8 8024E7E8 A6230024 */ sh $v1, 0x24($s1) +glabel L8024E7EC_17D0CC /* 17D0CC 8024E7EC 00031200 */ sll $v0, $v1, 8 /* 17D0D0 8024E7F0 08093A01 */ j .L8024E804 /* 17D0D4 8024E7F4 A6220026 */ sh $v0, 0x26($s1) +glabel L8024E7F8_17D0D8 /* 17D0D8 8024E7F8 08093A01 */ j .L8024E804 /* 17D0DC 8024E7FC A6230028 */ sh $v1, 0x28($s1) +glabel L8024E800_17D0E0 /* 17D0E0 8024E800 A623002A */ sh $v1, 0x2a($s1) .L8024E804: /* 17D0E4 8024E804 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_1776B0/use_cam_preset.s b/asm/nonmatchings/code_1776B0/use_cam_preset.s index 458810bb52..4874676777 100644 --- a/asm/nonmatchings/code_1776B0/use_cam_preset.s +++ b/asm/nonmatchings/code_1776B0/use_cam_preset.s @@ -28,17 +28,20 @@ glabel use_cam_preset /* 17B870 8024CF90 A020F2A7 */ sb $zero, %lo(D_8029F2A7)($at) /* 17B874 8024CF94 104004F7 */ beqz $v0, .L8024E374 /* 17B878 8024CF98 00111080 */ sll $v0, $s1, 2 -/* 17B87C 8024CF9C 3C01802A */ lui $at, %hi(D_8029CC48) +/* 17B87C 8024CF9C 3C01802A */ lui $at, %hi(jtbl_8029CC48_1CB528) /* 17B880 8024CFA0 00220821 */ addu $at, $at, $v0 -/* 17B884 8024CFA4 8C22CC48 */ lw $v0, %lo(D_8029CC48)($at) +/* 17B884 8024CFA4 8C22CC48 */ lw $v0, %lo(jtbl_8029CC48_1CB528)($at) /* 17B888 8024CFA8 00400008 */ jr $v0 /* 17B88C 8024CFAC 00000000 */ nop +glabel L8024CFB0_17B890 /* 17B890 8024CFB0 3C108028 */ lui $s0, %hi(D_80280E54) /* 17B894 8024CFB4 080938DD */ j .L8024E374 /* 17B898 8024CFB8 26100E54 */ addiu $s0, $s0, %lo(D_80280E54) +glabel L8024CFBC_17B89C /* 17B89C 8024CFBC 3C108028 */ lui $s0, %hi(D_80280CE8) /* 17B8A0 8024CFC0 080938DD */ j .L8024E374 /* 17B8A4 8024CFC4 26100CE8 */ addiu $s0, $s0, %lo(D_80280CE8) +glabel L8024CFC8_17B8A8 /* 17B8A8 8024CFC8 3C028028 */ lui $v0, %hi(D_80280CE4) /* 17B8AC 8024CFCC 8C420CE4 */ lw $v0, %lo(D_80280CE4)($v0) /* 17B8B0 8024CFD0 105104FB */ beq $v0, $s1, .L8024E3C0 @@ -52,6 +55,7 @@ glabel use_cam_preset /* 17B8D0 8024CFF0 A422F29E */ sh $v0, %lo(D_8029F29E)($at) /* 17B8D4 8024CFF4 080938DD */ j .L8024E374 /* 17B8D8 8024CFF8 00000000 */ nop +glabel L8024CFFC_17B8DC /* 17B8DC 8024CFFC 3C028028 */ lui $v0, %hi(D_80280CE4) /* 17B8E0 8024D000 8C420CE4 */ lw $v0, %lo(D_80280CE4)($v0) /* 17B8E4 8024D004 105104EE */ beq $v0, $s1, .L8024E3C0 @@ -62,6 +66,7 @@ glabel use_cam_preset /* 17B8F8 8024D018 A422F280 */ sh $v0, %lo(D_8029F280)($at) /* 17B8FC 8024D01C 080934CC */ j .L8024D330 /* 17B900 8024D020 24020014 */ addiu $v0, $zero, 0x14 +glabel L8024D024_17B904 /* 17B904 8024D024 3C028028 */ lui $v0, %hi(D_80280CE4) /* 17B908 8024D028 8C420CE4 */ lw $v0, %lo(D_80280CE4)($v0) /* 17B90C 8024D02C 105104E4 */ beq $v0, $s1, .L8024E3C0 @@ -72,6 +77,7 @@ glabel use_cam_preset /* 17B920 8024D040 A422F280 */ sh $v0, %lo(D_8029F280)($at) /* 17B924 8024D044 080934CC */ j .L8024D330 /* 17B928 8024D048 2402000A */ addiu $v0, $zero, 0xa +glabel L8024D04C_17B92C /* 17B92C 8024D04C 3C108028 */ lui $s0, %hi(D_80280D04) /* 17B930 8024D050 26100D04 */ addiu $s0, $s0, %lo(D_80280D04) /* 17B934 8024D054 2402012C */ addiu $v0, $zero, 0x12c @@ -82,6 +88,7 @@ glabel use_cam_preset /* 17B948 8024D068 A422F29E */ sh $v0, %lo(D_8029F29E)($at) /* 17B94C 8024D06C 080938D9 */ j .L8024E364 /* 17B950 8024D070 24020001 */ addiu $v0, $zero, 1 +glabel L8024D074_17B954 /* 17B954 8024D074 3C108028 */ lui $s0, %hi(D_80280D3C) /* 17B958 8024D078 26100D3C */ addiu $s0, $s0, %lo(D_80280D3C) /* 17B95C 8024D07C 2402012C */ addiu $v0, $zero, 0x12c @@ -92,6 +99,7 @@ glabel use_cam_preset /* 17B970 8024D090 A422F29E */ sh $v0, %lo(D_8029F29E)($at) /* 17B974 8024D094 080938D9 */ j .L8024E364 /* 17B978 8024D098 24020001 */ addiu $v0, $zero, 1 +glabel L8024D09C_17B97C /* 17B97C 8024D09C 3C108028 */ lui $s0, %hi(D_80280D74) /* 17B980 8024D0A0 26100D74 */ addiu $s0, $s0, %lo(D_80280D74) /* 17B984 8024D0A4 2402012C */ addiu $v0, $zero, 0x12c @@ -102,6 +110,7 @@ glabel use_cam_preset /* 17B998 8024D0B8 A422F29E */ sh $v0, %lo(D_8029F29E)($at) /* 17B99C 8024D0BC 080938DD */ j .L8024E374 /* 17B9A0 8024D0C0 00000000 */ nop +glabel L8024D0C4_17B9A4 /* 17B9A4 8024D0C4 3C108028 */ lui $s0, %hi(D_80280D58) /* 17B9A8 8024D0C8 26100D58 */ addiu $s0, $s0, %lo(D_80280D58) /* 17B9AC 8024D0CC 2402012C */ addiu $v0, $zero, 0x12c @@ -112,6 +121,7 @@ glabel use_cam_preset /* 17B9C0 8024D0E0 A422F29E */ sh $v0, %lo(D_8029F29E)($at) /* 17B9C4 8024D0E4 080938D9 */ j .L8024E364 /* 17B9C8 8024D0E8 24020001 */ addiu $v0, $zero, 1 +glabel L8024D0EC_17B9CC /* 17B9CC 8024D0EC 3C02802A */ lui $v0, %hi(D_8029F2B4) /* 17B9D0 8024D0F0 8C42F2B4 */ lw $v0, %lo(D_8029F2B4)($v0) /* 17B9D4 8024D0F4 3C048028 */ lui $a0, %hi(D_80280DAC) @@ -125,6 +135,7 @@ glabel use_cam_preset /* 17B9F4 8024D114 A422F29E */ sh $v0, %lo(D_8029F29E)($at) /* 17B9F8 8024D118 080938DD */ j .L8024E374 /* 17B9FC 8024D11C 0080802D */ daddu $s0, $a0, $zero +glabel L8024D120_17BA00 /* 17BA00 8024D120 3C108028 */ lui $s0, %hi(D_80280D04) /* 17BA04 8024D124 26100D04 */ addiu $s0, $s0, %lo(D_80280D04) /* 17BA08 8024D128 240200C8 */ addiu $v0, $zero, 0xc8 @@ -138,6 +149,7 @@ glabel use_cam_preset /* 17BA28 8024D148 A422F29E */ sh $v0, %lo(D_8029F29E)($at) /* 17BA2C 8024D14C 080938D4 */ j .L8024E350 /* 17BA30 8024D150 2402000F */ addiu $v0, $zero, 0xf +glabel L8024D154_17BA34 /* 17BA34 8024D154 3C108028 */ lui $s0, %hi(D_80280D04) /* 17BA38 8024D158 26100D04 */ addiu $s0, $s0, %lo(D_80280D04) /* 17BA3C 8024D15C 2402012C */ addiu $v0, $zero, 0x12c @@ -148,6 +160,7 @@ glabel use_cam_preset /* 17BA50 8024D170 A422F284 */ sh $v0, %lo(D_8029F284)($at) /* 17BA54 8024D174 080938D1 */ j .L8024E344 /* 17BA58 8024D178 24020014 */ addiu $v0, $zero, 0x14 +glabel L8024D17C_17BA5C /* 17BA5C 8024D17C 3C108028 */ lui $s0, %hi(D_80280D04) /* 17BA60 8024D180 26100D04 */ addiu $s0, $s0, %lo(D_80280D04) /* 17BA64 8024D184 24020190 */ addiu $v0, $zero, 0x190 @@ -161,6 +174,7 @@ glabel use_cam_preset /* 17BA84 8024D1A4 A422F29E */ sh $v0, %lo(D_8029F29E)($at) /* 17BA88 8024D1A8 080938D4 */ j .L8024E350 /* 17BA8C 8024D1AC 2402001E */ addiu $v0, $zero, 0x1e +glabel L8024D1B0_17BA90 /* 17BA90 8024D1B0 3C108028 */ lui $s0, %hi(D_80280D58) /* 17BA94 8024D1B4 26100D58 */ addiu $s0, $s0, %lo(D_80280D58) /* 17BA98 8024D1B8 240200C8 */ addiu $v0, $zero, 0xc8 @@ -174,6 +188,7 @@ glabel use_cam_preset /* 17BAB8 8024D1D8 A422F29E */ sh $v0, %lo(D_8029F29E)($at) /* 17BABC 8024D1DC 080938D4 */ j .L8024E350 /* 17BAC0 8024D1E0 2402000F */ addiu $v0, $zero, 0xf +glabel L8024D1E4_17BAC4 /* 17BAC4 8024D1E4 3C108028 */ lui $s0, %hi(D_80280D58) /* 17BAC8 8024D1E8 26100D58 */ addiu $s0, $s0, %lo(D_80280D58) /* 17BACC 8024D1EC 2402012C */ addiu $v0, $zero, 0x12c @@ -184,6 +199,7 @@ glabel use_cam_preset /* 17BAE0 8024D200 A422F284 */ sh $v0, %lo(D_8029F284)($at) /* 17BAE4 8024D204 080938D1 */ j .L8024E344 /* 17BAE8 8024D208 24020014 */ addiu $v0, $zero, 0x14 +glabel L8024D20C_17BAEC /* 17BAEC 8024D20C 3C108028 */ lui $s0, %hi(D_80280D58) /* 17BAF0 8024D210 26100D58 */ addiu $s0, $s0, %lo(D_80280D58) /* 17BAF4 8024D214 24020190 */ addiu $v0, $zero, 0x190 @@ -197,6 +213,7 @@ glabel use_cam_preset /* 17BB14 8024D234 A422F29E */ sh $v0, %lo(D_8029F29E)($at) /* 17BB18 8024D238 080938D4 */ j .L8024E350 /* 17BB1C 8024D23C 2402001E */ addiu $v0, $zero, 0x1e +glabel L8024D240_17BB20 /* 17BB20 8024D240 3C108028 */ lui $s0, %hi(D_80280D74) /* 17BB24 8024D244 26100D74 */ addiu $s0, $s0, %lo(D_80280D74) /* 17BB28 8024D248 2402010B */ addiu $v0, $zero, 0x10b @@ -215,6 +232,7 @@ glabel use_cam_preset /* 17BB5C 8024D27C A422F286 */ sh $v0, %lo(D_8029F286)($at) /* 17BB60 8024D280 080938DD */ j .L8024E374 /* 17BB64 8024D284 00000000 */ nop +glabel L8024D288_17BB68 /* 17BB68 8024D288 3C108028 */ lui $s0, %hi(D_80280D74) /* 17BB6C 8024D28C 26100D74 */ addiu $s0, $s0, %lo(D_80280D74) /* 17BB70 8024D290 2402012C */ addiu $v0, $zero, 0x12c @@ -232,6 +250,7 @@ glabel use_cam_preset /* 17BBA0 8024D2C0 A423F286 */ sh $v1, %lo(D_8029F286)($at) /* 17BBA4 8024D2C4 080938DD */ j .L8024E374 /* 17BBA8 8024D2C8 00000000 */ nop +glabel L8024D2CC_17BBAC /* 17BBAC 8024D2CC 3C108028 */ lui $s0, %hi(D_80280D74) /* 17BBB0 8024D2D0 26100D74 */ addiu $s0, $s0, %lo(D_80280D74) /* 17BBB4 8024D2D4 24020190 */ addiu $v0, $zero, 0x190 @@ -244,16 +263,19 @@ glabel use_cam_preset /* 17BBD0 8024D2F0 A420F282 */ sh $zero, %lo(D_8029F282)($at) /* 17BBD4 8024D2F4 080934CC */ j .L8024D330 /* 17BBD8 8024D2F8 24020014 */ addiu $v0, $zero, 0x14 +glabel L8024D2FC_17BBDC /* 17BBDC 8024D2FC 24020014 */ addiu $v0, $zero, 0x14 /* 17BBE0 8024D300 3C01802A */ lui $at, %hi(D_8029F29E) /* 17BBE4 8024D304 A422F29E */ sh $v0, %lo(D_8029F29E)($at) /* 17BBE8 8024D308 3C108028 */ lui $s0, %hi(D_80280E00) /* 17BBEC 8024D30C 080938DD */ j .L8024E374 /* 17BBF0 8024D310 26100E00 */ addiu $s0, $s0, %lo(D_80280E00) +glabel L8024D314_17BBF4 /* 17BBF4 8024D314 3C108028 */ lui $s0, %hi(D_80280E1C) /* 17BBF8 8024D318 26100E1C */ addiu $s0, $s0, %lo(D_80280E1C) /* 17BBFC 8024D31C 080934CC */ j .L8024D330 /* 17BC00 8024D320 24020014 */ addiu $v0, $zero, 0x14 +glabel L8024D324_17BC04 /* 17BC04 8024D324 3C108028 */ lui $s0, %hi(D_80280E38) /* 17BC08 8024D328 26100E38 */ addiu $s0, $s0, %lo(D_80280E38) /* 17BC0C 8024D32C 24020014 */ addiu $v0, $zero, 0x14 @@ -264,6 +286,7 @@ glabel use_cam_preset /* 17BC1C 8024D33C A420F286 */ sh $zero, %lo(D_8029F286)($at) /* 17BC20 8024D340 080938DD */ j .L8024E374 /* 17BC24 8024D344 00000000 */ nop +glabel L8024D348_17BC28 /* 17BC28 8024D348 3C108028 */ lui $s0, %hi(D_80280E00) /* 17BC2C 8024D34C 26100E00 */ addiu $s0, $s0, %lo(D_80280E00) /* 17BC30 8024D350 3C01C2A0 */ lui $at, 0xc2a0 @@ -291,6 +314,7 @@ glabel use_cam_preset /* 17BC88 8024D3A8 A420F27C */ sh $zero, %lo(D_8029F27C)($at) /* 17BC8C 8024D3AC 080938DD */ j .L8024E374 /* 17BC90 8024D3B0 00000000 */ nop +glabel L8024D3B4_17BC94 /* 17BC94 8024D3B4 3C108028 */ lui $s0, %hi(D_80280D58) /* 17BC98 8024D3B8 26100D58 */ addiu $s0, $s0, %lo(D_80280D58) /* 17BC9C 8024D3BC 240200FA */ addiu $v0, $zero, 0xfa @@ -319,6 +343,7 @@ glabel use_cam_preset /* 17BCF8 8024D418 3C018028 */ lui $at, %hi(D_80280CE0) /* 17BCFC 8024D41C 080938DD */ j .L8024E374 /* 17BD00 8024D420 A0220CE0 */ sb $v0, %lo(D_80280CE0)($at) +glabel L8024D424_17BD04 /* 17BD04 8024D424 3C108028 */ lui $s0, %hi(D_80280E00) /* 17BD08 8024D428 26100E00 */ addiu $s0, $s0, %lo(D_80280E00) /* 17BD0C 8024D42C 3C01C2BE */ lui $at, 0xc2be @@ -350,6 +375,7 @@ glabel use_cam_preset /* 17BD74 8024D494 A420F27C */ sh $zero, %lo(D_8029F27C)($at) /* 17BD78 8024D498 080938DD */ j .L8024E374 /* 17BD7C 8024D49C 00000000 */ nop +glabel L8024D4A0_17BD80 /* 17BD80 8024D4A0 3C108028 */ lui $s0, %hi(D_80280E00) /* 17BD84 8024D4A4 26100E00 */ addiu $s0, $s0, %lo(D_80280E00) /* 17BD88 8024D4A8 240200E6 */ addiu $v0, $zero, 0xe6 @@ -369,6 +395,7 @@ glabel use_cam_preset /* 17BDC0 8024D4E0 A420F27C */ sh $zero, %lo(D_8029F27C)($at) /* 17BDC4 8024D4E4 080938DD */ j .L8024E374 /* 17BDC8 8024D4E8 00000000 */ nop +glabel L8024D4EC_17BDCC /* 17BDCC 8024D4EC 3C108028 */ lui $s0, %hi(D_80280D20) /* 17BDD0 8024D4F0 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17BDD4 8024D4F4 24020136 */ addiu $v0, $zero, 0x136 @@ -392,6 +419,7 @@ glabel use_cam_preset /* 17BE1C 8024D53C A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) /* 17BE20 8024D540 0809369A */ j .L8024DA68 /* 17BE24 8024D544 00000000 */ nop +glabel L8024D548_17BE28 /* 17BE28 8024D548 3C108028 */ lui $s0, %hi(D_80280D20) /* 17BE2C 8024D54C 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17BE30 8024D550 24020140 */ addiu $v0, $zero, 0x140 @@ -414,6 +442,7 @@ glabel use_cam_preset /* 17BE74 8024D594 A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) /* 17BE78 8024D598 08093659 */ j .L8024D964 /* 17BE7C 8024D59C 00000000 */ nop +glabel L8024D5A0_17BE80 /* 17BE80 8024D5A0 3C108028 */ lui $s0, %hi(D_80280D20) /* 17BE84 8024D5A4 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17BE88 8024D5A8 24020154 */ addiu $v0, $zero, 0x154 @@ -431,6 +460,7 @@ glabel use_cam_preset /* 17BEB8 8024D5D8 A420F286 */ sh $zero, %lo(D_8029F286)($at) /* 17BEBC 8024D5DC 080935C6 */ j .L8024D718 /* 17BEC0 8024D5E0 24020001 */ addiu $v0, $zero, 1 +glabel L8024D5E4_17BEC4 /* 17BEC4 8024D5E4 3C108028 */ lui $s0, %hi(D_80280D58) /* 17BEC8 8024D5E8 26100D58 */ addiu $s0, $s0, %lo(D_80280D58) /* 17BECC 8024D5EC 2402012C */ addiu $v0, $zero, 0x12c @@ -459,6 +489,7 @@ glabel use_cam_preset /* 17BF28 8024D648 A420F27C */ sh $zero, %lo(D_8029F27C)($at) /* 17BF2C 8024D64C 080938DD */ j .L8024E374 /* 17BF30 8024D650 00000000 */ nop +glabel L8024D654_17BF34 /* 17BF34 8024D654 3C108028 */ lui $s0, %hi(D_80280D90) /* 17BF38 8024D658 26100D90 */ addiu $s0, $s0, %lo(D_80280D90) /* 17BF3C 8024D65C 3C01C282 */ lui $at, 0xc282 @@ -478,6 +509,7 @@ glabel use_cam_preset /* 17BF74 8024D694 A422F29E */ sh $v0, %lo(D_8029F29E)($at) /* 17BF78 8024D698 08093825 */ j .L8024E094 /* 17BF7C 8024D69C 00000000 */ nop +glabel L8024D6A0_17BF80 /* 17BF80 8024D6A0 3C108028 */ lui $s0, %hi(D_80280D58) /* 17BF84 8024D6A4 26100D58 */ addiu $s0, $s0, %lo(D_80280D58) /* 17BF88 8024D6A8 240200DC */ addiu $v0, $zero, 0xdc @@ -491,6 +523,7 @@ glabel use_cam_preset /* 17BFA8 8024D6C8 A422F29E */ sh $v0, %lo(D_8029F29E)($at) /* 17BFAC 8024D6CC 08093650 */ j .L8024D940 /* 17BFB0 8024D6D0 24020018 */ addiu $v0, $zero, 0x18 +glabel L8024D6D4_17BFB4 /* 17BFB4 8024D6D4 3C108028 */ lui $s0, %hi(D_80280D20) /* 17BFB8 8024D6D8 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17BFBC 8024D6DC 24020118 */ addiu $v0, $zero, 0x118 @@ -519,6 +552,7 @@ glabel use_cam_preset /* 17C014 8024D734 A020F2A6 */ sb $zero, %lo(D_8029F2A6)($at) /* 17C018 8024D738 080938DD */ j .L8024E374 /* 17C01C 8024D73C 00000000 */ nop +glabel L8024D740_17C020 /* 17C020 8024D740 3C108028 */ lui $s0, %hi(D_80280D20) /* 17C024 8024D744 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17C028 8024D748 2402017C */ addiu $v0, $zero, 0x17c @@ -543,6 +577,7 @@ glabel use_cam_preset /* 17C074 8024D794 A022F2A5 */ sb $v0, %lo(D_8029F2A5)($at) /* 17C078 8024D798 08093659 */ j .L8024D964 /* 17C07C 8024D79C 00000000 */ nop +glabel L8024D7A0_17C080 /* 17C080 8024D7A0 3C108028 */ lui $s0, %hi(D_80280D20) /* 17C084 8024D7A4 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17C088 8024D7A8 24020140 */ addiu $v0, $zero, 0x140 @@ -566,6 +601,7 @@ glabel use_cam_preset /* 17C0D0 8024D7F0 A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) /* 17C0D4 8024D7F4 08093659 */ j .L8024D964 /* 17C0D8 8024D7F8 00000000 */ nop +glabel L8024D7FC_17C0DC /* 17C0DC 8024D7FC 3C108028 */ lui $s0, %hi(D_80280D20) /* 17C0E0 8024D800 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17C0E4 8024D804 2402012C */ addiu $v0, $zero, 0x12c @@ -590,6 +626,7 @@ glabel use_cam_preset /* 17C130 8024D850 A022F2A5 */ sb $v0, %lo(D_8029F2A5)($at) /* 17C134 8024D854 08093659 */ j .L8024D964 /* 17C138 8024D858 00000000 */ nop +glabel L8024D85C_17C13C /* 17C13C 8024D85C 3C108028 */ lui $s0, %hi(D_80280D20) /* 17C140 8024D860 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17C144 8024D864 24020140 */ addiu $v0, $zero, 0x140 @@ -613,6 +650,7 @@ glabel use_cam_preset /* 17C18C 8024D8AC A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) /* 17C190 8024D8B0 08093659 */ j .L8024D964 /* 17C194 8024D8B4 00000000 */ nop +glabel L8024D8B8_17C198 /* 17C198 8024D8B8 3C108028 */ lui $s0, %hi(D_80280D20) /* 17C19C 8024D8BC 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17C1A0 8024D8C0 24020140 */ addiu $v0, $zero, 0x140 @@ -635,6 +673,7 @@ glabel use_cam_preset /* 17C1E4 8024D904 A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) /* 17C1E8 8024D908 08093659 */ j .L8024D964 /* 17C1EC 8024D90C 00000000 */ nop +glabel L8024D910_17C1F0 /* 17C1F0 8024D910 3C108028 */ lui $s0, %hi(D_80280D20) /* 17C1F4 8024D914 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17C1F8 8024D918 24020168 */ addiu $v0, $zero, 0x168 @@ -664,6 +703,7 @@ glabel use_cam_preset /* 17C250 8024D970 A420F27C */ sh $zero, %lo(D_8029F27C)($at) /* 17C254 8024D974 080938DD */ j .L8024E374 /* 17C258 8024D978 00000000 */ nop +glabel L8024D97C_17C25C /* 17C25C 8024D97C 3C10802A */ lui $s0, %hi(D_8029F2B4) /* 17C260 8024D980 8E10F2B4 */ lw $s0, %lo(D_8029F2B4)($s0) /* 17C264 8024D984 240200C8 */ addiu $v0, $zero, 0xc8 @@ -680,6 +720,7 @@ glabel use_cam_preset /* 17C290 8024D9B0 A020F2A6 */ sb $zero, %lo(D_8029F2A6)($at) /* 17C294 8024D9B4 080938DD */ j .L8024E374 /* 17C298 8024D9B8 00000000 */ nop +glabel L8024D9BC_17C29C /* 17C29C 8024D9BC 3C108028 */ lui $s0, %hi(D_80280D20) /* 17C2A0 8024D9C0 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17C2A4 8024D9C4 240200D6 */ addiu $v0, $zero, 0xd6 @@ -703,6 +744,7 @@ glabel use_cam_preset /* 17C2EC 8024DA0C A420F27C */ sh $zero, %lo(D_8029F27C)($at) /* 17C2F0 8024DA10 0809369A */ j .L8024DA68 /* 17C2F4 8024DA14 24020001 */ addiu $v0, $zero, 1 +glabel L8024DA18_17C2F8 /* 17C2F8 8024DA18 3C108028 */ lui $s0, %hi(D_80280D20) /* 17C2FC 8024DA1C 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17C300 8024DA20 2402012C */ addiu $v0, $zero, 0x12c @@ -730,6 +772,7 @@ glabel use_cam_preset /* 17C354 8024DA74 A020F2A6 */ sb $zero, %lo(D_8029F2A6)($at) /* 17C358 8024DA78 080938DD */ j .L8024E374 /* 17C35C 8024DA7C 00000000 */ nop +glabel L8024DA80_17C360 /* 17C360 8024DA80 3C108028 */ lui $s0, %hi(D_80280D90) /* 17C364 8024DA84 26100D90 */ addiu $s0, $s0, %lo(D_80280D90) /* 17C368 8024DA88 3C014270 */ lui $at, 0x4270 @@ -754,6 +797,7 @@ glabel use_cam_preset /* 17C3B4 8024DAD4 A420F27C */ sh $zero, %lo(D_8029F27C)($at) /* 17C3B8 8024DAD8 08093827 */ j .L8024E09C /* 17C3BC 8024DADC 00000000 */ nop +glabel L8024DAE0_17C3C0 /* 17C3C0 8024DAE0 3C108028 */ lui $s0, %hi(D_80280D90) /* 17C3C4 8024DAE4 26100D90 */ addiu $s0, $s0, %lo(D_80280D90) /* 17C3C8 8024DAE8 3C014270 */ lui $at, 0x4270 @@ -780,6 +824,7 @@ glabel use_cam_preset /* 17C41C 8024DB3C A020F2A2 */ sb $zero, %lo(D_8029F2A2)($at) /* 17C420 8024DB40 0809382B */ j .L8024E0AC /* 17C424 8024DB44 00000000 */ nop +glabel L8024DB48_17C428 /* 17C428 8024DB48 3C108028 */ lui $s0, %hi(D_80280E00) /* 17C42C 8024DB4C 26100E00 */ addiu $s0, $s0, %lo(D_80280E00) /* 17C430 8024DB50 3C01C28C */ lui $at, 0xc28c @@ -802,6 +847,7 @@ glabel use_cam_preset /* 17C474 8024DB94 00000000 */ nop /* 17C478 8024DB98 08093710 */ j .L8024DC40 /* 17C47C 8024DB9C 2402000A */ addiu $v0, $zero, 0xa +glabel L8024DBA0_17C480 /* 17C480 8024DBA0 3C108028 */ lui $s0, %hi(D_80280E00) /* 17C484 8024DBA4 26100E00 */ addiu $s0, $s0, %lo(D_80280E00) /* 17C488 8024DBA8 44806000 */ mtc1 $zero, $f12 @@ -821,6 +867,7 @@ glabel use_cam_preset /* 17C4C0 8024DBE0 46006386 */ mov.s $f14, $f12 /* 17C4C4 8024DBE4 08093710 */ j .L8024DC40 /* 17C4C8 8024DBE8 24020028 */ addiu $v0, $zero, 0x28 +glabel L8024DBEC_17C4CC /* 17C4CC 8024DBEC 3C108028 */ lui $s0, %hi(D_80280E00) /* 17C4D0 8024DBF0 26100E00 */ addiu $s0, $s0, %lo(D_80280E00) /* 17C4D4 8024DBF4 3C01C248 */ lui $at, 0xc248 @@ -849,6 +896,7 @@ glabel use_cam_preset /* 17C52C 8024DC4C A020F2A6 */ sb $zero, %lo(D_8029F2A6)($at) /* 17C530 8024DC50 080938DD */ j .L8024E374 /* 17C534 8024DC54 00000000 */ nop +glabel L8024DC58_17C538 /* 17C538 8024DC58 3C108028 */ lui $s0, %hi(D_80280D90) /* 17C53C 8024DC5C 26100D90 */ addiu $s0, $s0, %lo(D_80280D90) /* 17C540 8024DC60 3C01C296 */ lui $at, 0xc296 @@ -866,6 +914,7 @@ glabel use_cam_preset /* 17C570 8024DC90 A422F29E */ sh $v0, %lo(D_8029F29E)($at) /* 17C574 8024DC94 08093823 */ j .L8024E08C /* 17C578 8024DC98 24020011 */ addiu $v0, $zero, 0x11 +glabel L8024DC9C_17C57C /* 17C57C 8024DC9C 3C108028 */ lui $s0, %hi(D_80280D20) /* 17C580 8024DCA0 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17C584 8024DCA4 24020136 */ addiu $v0, $zero, 0x136 @@ -887,6 +936,7 @@ glabel use_cam_preset /* 17C5C4 8024DCE4 A022F2A3 */ sb $v0, %lo(D_8029F2A3)($at) /* 17C5C8 8024DCE8 08093849 */ j .L8024E124 /* 17C5CC 8024DCEC 24020100 */ addiu $v0, $zero, 0x100 +glabel L8024DCF0_17C5D0 /* 17C5D0 8024DCF0 3C108028 */ lui $s0, %hi(D_80280D20) /* 17C5D4 8024DCF4 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17C5D8 8024DCF8 240200FA */ addiu $v0, $zero, 0xfa @@ -910,6 +960,7 @@ glabel use_cam_preset /* 17C620 8024DD40 A022F2A5 */ sb $v0, %lo(D_8029F2A5)($at) /* 17C624 8024DD44 080937CF */ j .L8024DF3C /* 17C628 8024DD48 24020100 */ addiu $v0, $zero, 0x100 +glabel L8024DD4C_17C62C /* 17C62C 8024DD4C 3C108028 */ lui $s0, %hi(D_80280D58) /* 17C630 8024DD50 26100D58 */ addiu $s0, $s0, %lo(D_80280D58) /* 17C634 8024DD54 2402012C */ addiu $v0, $zero, 0x12c @@ -933,6 +984,7 @@ glabel use_cam_preset /* 17C67C 8024DD9C A022F2A5 */ sb $v0, %lo(D_8029F2A5)($at) /* 17C680 8024DDA0 080937CF */ j .L8024DF3C /* 17C684 8024DDA4 24020100 */ addiu $v0, $zero, 0x100 +glabel L8024DDA8_17C688 /* 17C688 8024DDA8 3C108028 */ lui $s0, %hi(D_80280D20) /* 17C68C 8024DDAC 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17C690 8024DDB0 24020140 */ addiu $v0, $zero, 0x140 @@ -955,6 +1007,7 @@ glabel use_cam_preset /* 17C6D4 8024DDF4 A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) /* 17C6D8 8024DDF8 0809384B */ j .L8024E12C /* 17C6DC 8024DDFC 24020100 */ addiu $v0, $zero, 0x100 +glabel L8024DE00_17C6E0 /* 17C6E0 8024DE00 3C108028 */ lui $s0, %hi(D_80280DC8) /* 17C6E4 8024DE04 26100DC8 */ addiu $s0, $s0, %lo(D_80280DC8) /* 17C6E8 8024DE08 24020032 */ addiu $v0, $zero, 0x32 @@ -967,6 +1020,7 @@ glabel use_cam_preset /* 17C704 8024DE24 A420F286 */ sh $zero, %lo(D_8029F286)($at) /* 17C708 8024DE28 080938DD */ j .L8024E374 /* 17C70C 8024DE2C 00000000 */ nop +glabel L8024DE30_17C710 /* 17C710 8024DE30 3C108028 */ lui $s0, %hi(D_80280D20) /* 17C714 8024DE34 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17C718 8024DE38 24020118 */ addiu $v0, $zero, 0x118 @@ -990,6 +1044,7 @@ glabel use_cam_preset /* 17C760 8024DE80 A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) /* 17C764 8024DE84 080937D1 */ j .L8024DF44 /* 17C768 8024DE88 24020100 */ addiu $v0, $zero, 0x100 +glabel L8024DE8C_17C76C /* 17C76C 8024DE8C 3C108028 */ lui $s0, %hi(D_80280D20) /* 17C770 8024DE90 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17C774 8024DE94 2402017C */ addiu $v0, $zero, 0x17c @@ -1014,6 +1069,7 @@ glabel use_cam_preset /* 17C7C0 8024DEE0 A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) /* 17C7C4 8024DEE4 080937D1 */ j .L8024DF44 /* 17C7C8 8024DEE8 24020100 */ addiu $v0, $zero, 0x100 +glabel L8024DEEC_17C7CC /* 17C7CC 8024DEEC 3C108028 */ lui $s0, %hi(D_80280D58) /* 17C7D0 8024DEF0 26100D58 */ addiu $s0, $s0, %lo(D_80280D58) /* 17C7D4 8024DEF4 240200DC */ addiu $v0, $zero, 0xdc @@ -1044,6 +1100,7 @@ glabel use_cam_preset /* 17C830 8024DF50 A422F27C */ sh $v0, %lo(D_8029F27C)($at) /* 17C834 8024DF54 080938DD */ j .L8024E374 /* 17C838 8024DF58 00000000 */ nop +glabel L8024DF5C_17C83C /* 17C83C 8024DF5C 3C108028 */ lui $s0, %hi(D_80280D90) /* 17C840 8024DF60 26100D90 */ addiu $s0, $s0, %lo(D_80280D90) /* 17C844 8024DF64 3C01C2BE */ lui $at, 0xc2be @@ -1058,6 +1115,7 @@ glabel use_cam_preset /* 17C868 8024DF88 A422F284 */ sh $v0, %lo(D_8029F284)($at) /* 17C86C 8024DF8C 08093820 */ j .L8024E080 /* 17C870 8024DF90 24020014 */ addiu $v0, $zero, 0x14 +glabel L8024DF94_17C874 /* 17C874 8024DF94 3C108028 */ lui $s0, %hi(D_80280D20) /* 17C878 8024DF98 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17C87C 8024DF9C 24020140 */ addiu $v0, $zero, 0x140 @@ -1079,6 +1137,7 @@ glabel use_cam_preset /* 17C8BC 8024DFDC A420F282 */ sh $zero, %lo(D_8029F282)($at) /* 17C8C0 8024DFE0 0809380D */ j .L8024E034 /* 17C8C4 8024DFE4 24020100 */ addiu $v0, $zero, 0x100 +glabel L8024DFE8_17C8C8 /* 17C8C8 8024DFE8 3C108028 */ lui $s0, %hi(D_80280D20) /* 17C8CC 8024DFEC 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17C8D0 8024DFF0 24020140 */ addiu $v0, $zero, 0x140 @@ -1105,6 +1164,7 @@ glabel use_cam_preset /* 17C920 8024E040 A422F27C */ sh $v0, %lo(D_8029F27C)($at) /* 17C924 8024E044 080938DD */ j .L8024E374 /* 17C928 8024E048 00000000 */ nop +glabel L8024E04C_17C92C /* 17C92C 8024E04C 3C108028 */ lui $s0, %hi(D_80280D90) /* 17C930 8024E050 26100D90 */ addiu $s0, $s0, %lo(D_80280D90) /* 17C934 8024E054 3C0141C8 */ lui $at, 0x41c8 @@ -1142,6 +1202,7 @@ glabel use_cam_preset /* 17C9A0 8024E0C0 E422F274 */ swc1 $f2, %lo(D_8029F274)($at) /* 17C9A4 8024E0C4 080938DD */ j .L8024E374 /* 17C9A8 8024E0C8 00000000 */ nop +glabel L8024E0CC_17C9AC /* 17C9AC 8024E0CC 3C108028 */ lui $s0, %hi(D_80280D58) /* 17C9B0 8024E0D0 26100D58 */ addiu $s0, $s0, %lo(D_80280D58) /* 17C9B4 8024E0D4 240200C8 */ addiu $v0, $zero, 0xc8 @@ -1174,6 +1235,7 @@ glabel use_cam_preset /* 17CA18 8024E138 A020F2A6 */ sb $zero, %lo(D_8029F2A6)($at) /* 17CA1C 8024E13C 080938DD */ j .L8024E374 /* 17CA20 8024E140 00000000 */ nop +glabel L8024E144_17CA24 /* 17CA24 8024E144 3C108028 */ lui $s0, %hi(D_80280D58) /* 17CA28 8024E148 26100D58 */ addiu $s0, $s0, %lo(D_80280D58) /* 17CA2C 8024E14C 2402012C */ addiu $v0, $zero, 0x12c @@ -1198,6 +1260,7 @@ glabel use_cam_preset /* 17CA78 8024E198 A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) /* 17CA7C 8024E19C 080938DD */ j .L8024E374 /* 17CA80 8024E1A0 00000000 */ nop +glabel L8024E1A4_17CA84 /* 17CA84 8024E1A4 3C108028 */ lui $s0, %hi(D_80280D58) /* 17CA88 8024E1A8 26100D58 */ addiu $s0, $s0, %lo(D_80280D58) /* 17CA8C 8024E1AC 2402012C */ addiu $v0, $zero, 0x12c @@ -1227,6 +1290,7 @@ glabel use_cam_preset /* 17CAEC 8024E20C A422F27C */ sh $v0, %lo(D_8029F27C)($at) /* 17CAF0 8024E210 080938DD */ j .L8024E374 /* 17CAF4 8024E214 00000000 */ nop +glabel L8024E218_17CAF8 /* 17CAF8 8024E218 3C108028 */ lui $s0, %hi(D_80280D04) /* 17CAFC 8024E21C 26100D04 */ addiu $s0, $s0, %lo(D_80280D04) /* 17CB00 8024E220 24020190 */ addiu $v0, $zero, 0x190 @@ -1240,6 +1304,7 @@ glabel use_cam_preset /* 17CB20 8024E240 A422F29E */ sh $v0, %lo(D_8029F29E)($at) /* 17CB24 8024E244 080938D4 */ j .L8024E350 /* 17CB28 8024E248 2402001B */ addiu $v0, $zero, 0x1b +glabel L8024E24C_17CB2C /* 17CB2C 8024E24C 3C108028 */ lui $s0, %hi(D_80280D04) /* 17CB30 8024E250 26100D04 */ addiu $s0, $s0, %lo(D_80280D04) /* 17CB34 8024E254 24020166 */ addiu $v0, $zero, 0x166 @@ -1250,6 +1315,7 @@ glabel use_cam_preset /* 17CB48 8024E268 A422F284 */ sh $v0, %lo(D_8029F284)($at) /* 17CB4C 8024E26C 080938B0 */ j .L8024E2C0 /* 17CB50 8024E270 2402000A */ addiu $v0, $zero, 0xa +glabel L8024E274_17CB54 /* 17CB54 8024E274 3C108028 */ lui $s0, %hi(D_80280DAC) /* 17CB58 8024E278 26100DAC */ addiu $s0, $s0, %lo(D_80280DAC) /* 17CB5C 8024E27C 24020032 */ addiu $v0, $zero, 0x32 @@ -1260,6 +1326,7 @@ glabel use_cam_preset /* 17CB70 8024E290 A422F280 */ sh $v0, %lo(D_8029F280)($at) /* 17CB74 8024E294 080938DD */ j .L8024E374 /* 17CB78 8024E298 00000000 */ nop +glabel L8024E29C_17CB7C /* 17CB7C 8024E29C 3C108028 */ lui $s0, %hi(D_80280D04) /* 17CB80 8024E2A0 26100D04 */ addiu $s0, $s0, %lo(D_80280D04) /* 17CB84 8024E2A4 2402010B */ addiu $v0, $zero, 0x10b @@ -1284,6 +1351,7 @@ glabel use_cam_preset /* 17CBCC 8024E2EC A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) /* 17CBD0 8024E2F0 080938DD */ j .L8024E374 /* 17CBD4 8024E2F4 00000000 */ nop +glabel L8024E2F8_17CBD8 /* 17CBD8 8024E2F8 3C108028 */ lui $s0, %hi(D_80280D04) /* 17CBDC 8024E2FC 26100D04 */ addiu $s0, $s0, %lo(D_80280D04) /* 17CBE0 8024E300 240200D6 */ addiu $v0, $zero, 0xd6 @@ -1294,6 +1362,7 @@ glabel use_cam_preset /* 17CBF4 8024E314 A422F284 */ sh $v0, %lo(D_8029F284)($at) /* 17CBF8 8024E318 080938D1 */ j .L8024E344 /* 17CBFC 8024E31C 24020014 */ addiu $v0, $zero, 0x14 +glabel L8024E320_17CC00 /* 17CC00 8024E320 3C108028 */ lui $s0, %hi(D_80280D04) /* 17CC04 8024E324 26100D04 */ addiu $s0, $s0, %lo(D_80280D04) /* 17CC08 8024E328 2402012C */ addiu $v0, $zero, 0x12c diff --git a/asm/nonmatchings/code_17D6A0/func_8024FB3C.s b/asm/nonmatchings/code_17D6A0/func_8024FB3C.s index a6b5a01ff8..60b676dcb6 100644 --- a/asm/nonmatchings/code_17D6A0/func_8024FB3C.s +++ b/asm/nonmatchings/code_17D6A0/func_8024FB3C.s @@ -15,26 +15,29 @@ glabel func_8024FB3C /* 17E444 8024FB64 1040031D */ beqz $v0, .L802507DC /* 17E448 8024FB68 0000902D */ daddu $s2, $zero, $zero /* 17E44C 8024FB6C 00031080 */ sll $v0, $v1, 2 -/* 17E450 8024FB70 3C01802A */ lui $at, %hi(D_8029CD98) +/* 17E450 8024FB70 3C01802A */ lui $at, %hi(jtbl_8029CD98_1CB678) /* 17E454 8024FB74 00220821 */ addu $at, $at, $v0 -/* 17E458 8024FB78 8C22CD98 */ lw $v0, %lo(D_8029CD98)($at) +/* 17E458 8024FB78 8C22CD98 */ lw $v0, %lo(jtbl_8029CD98_1CB678)($at) /* 17E45C 8024FB7C 00400008 */ jr $v0 /* 17E460 8024FB80 00000000 */ nop +glabel L8024FB84_17E464 /* 17E464 8024FB84 82230016 */ lb $v1, 0x16($s1) /* 17E468 8024FB88 2C620005 */ sltiu $v0, $v1, 5 /* 17E46C 8024FB8C 10400313 */ beqz $v0, .L802507DC /* 17E470 8024FB90 00031080 */ sll $v0, $v1, 2 -/* 17E474 8024FB94 3C01802A */ lui $at, %hi(D_8029CEF0) +/* 17E474 8024FB94 3C01802A */ lui $at, %hi(jtbl_8029CEF0_1CB7D0) /* 17E478 8024FB98 00220821 */ addu $at, $at, $v0 -/* 17E47C 8024FB9C 8C22CEF0 */ lw $v0, %lo(D_8029CEF0)($at) +/* 17E47C 8024FB9C 8C22CEF0 */ lw $v0, %lo(jtbl_8029CEF0_1CB7D0)($at) /* 17E480 8024FBA0 00400008 */ jr $v0 /* 17E484 8024FBA4 00000000 */ nop +glabel L8024FBA8_17E488 /* 17E488 8024FBA8 8C820214 */ lw $v0, 0x214($a0) /* 17E48C 8024FBAC 3042C000 */ andi $v0, $v0, 0xc000 /* 17E490 8024FBB0 544002B8 */ bnel $v0, $zero, .L80250694 /* 17E494 8024FBB4 A6200014 */ sh $zero, 0x14($s1) /* 17E498 8024FBB8 080941A5 */ j .L80250694 /* 17E49C 8024FBBC 00000000 */ nop +glabel L8024FBC0_17E4A0 /* 17E4A0 8024FBC0 3C03802A */ lui $v1, %hi(D_8029F64A) /* 17E4A4 8024FBC4 2463F64A */ addiu $v1, $v1, %lo(D_8029F64A) /* 17E4A8 8024FBC8 80840083 */ lb $a0, 0x83($a0) @@ -42,6 +45,7 @@ glabel func_8024FB3C /* 17E4B0 8024FBD0 14800004 */ bnez $a0, .L8024FBE4 /* 17E4B4 8024FBD4 A4620000 */ sh $v0, ($v1) /* 17E4B8 8024FBD8 A4600000 */ sh $zero, ($v1) +glabel L8024FBDC_17E4BC /* 17E4BC 8024FBDC 080941F7 */ j .L802507DC /* 17E4C0 8024FBE0 24120001 */ addiu $s2, $zero, 1 .L8024FBE4: @@ -75,15 +79,17 @@ glabel func_8024FB3C /* 17E528 8024FC48 2C620015 */ sltiu $v0, $v1, 0x15 /* 17E52C 8024FC4C 104002D6 */ beqz $v0, .L802507A8 /* 17E530 8024FC50 00031080 */ sll $v0, $v1, 2 -/* 17E534 8024FC54 3C01802A */ lui $at, %hi(D_8029CF08) +/* 17E534 8024FC54 3C01802A */ lui $at, %hi(jtbl_8029CF08_1CB7E8) /* 17E538 8024FC58 00220821 */ addu $at, $at, $v0 -/* 17E53C 8024FC5C 8C22CF08 */ lw $v0, %lo(D_8029CF08)($at) +/* 17E53C 8024FC5C 8C22CF08 */ lw $v0, %lo(jtbl_8029CF08_1CB7E8)($at) /* 17E540 8024FC60 00400008 */ jr $v0 /* 17E544 8024FC64 00000000 */ nop +glabel L8024FC68_17E548 /* 17E548 8024FC68 3C048011 */ lui $a0, %hi(D_80108E1C) /* 17E54C 8024FC6C 24848E1C */ addiu $a0, $a0, %lo(D_80108E1C) /* 17E550 8024FC70 08094060 */ j .L80250180 /* 17E554 8024FC74 00000000 */ nop +glabel L8024FC78_17E558 /* 17E558 8024FC78 3C048011 */ lui $a0, %hi(D_80108E1C) /* 17E55C 8024FC7C 24848E1C */ addiu $a0, $a0, %lo(D_80108E1C) /* 17E560 8024FC80 0C050529 */ jal create_icon @@ -109,6 +115,7 @@ glabel func_8024FB3C /* 17E5B0 8024FCD0 2610F644 */ addiu $s0, $s0, %lo(D_8029F644) /* 17E5B4 8024FCD4 080941E3 */ j .L8025078C /* 17E5B8 8024FCD8 24050080 */ addiu $a1, $zero, 0x80 +glabel L8024FCDC_17E5BC /* 17E5BC 8024FCDC 3C048011 */ lui $a0, %hi(D_80108E1C) /* 17E5C0 8024FCE0 24848E1C */ addiu $a0, $a0, %lo(D_80108E1C) /* 17E5C4 8024FCE4 0C050529 */ jal create_icon @@ -134,6 +141,7 @@ glabel func_8024FB3C /* 17E614 8024FD34 2610F644 */ addiu $s0, $s0, %lo(D_8029F644) /* 17E618 8024FD38 08094044 */ j .L80250110 /* 17E61C 8024FD3C 34058080 */ ori $a1, $zero, 0x8080 +glabel L8024FD40_17E620 /* 17E620 8024FD40 3C048029 */ lui $a0, %hi(D_8029259C) /* 17E624 8024FD44 2484259C */ addiu $a0, $a0, %lo(D_8029259C) /* 17E628 8024FD48 0C050529 */ jal create_icon @@ -189,10 +197,12 @@ glabel func_8024FB3C /* 17E6F0 8024FE10 2610F648 */ addiu $s0, $s0, %lo(D_8029F648) /* 17E6F4 8024FE14 080941E3 */ j .L8025078C /* 17E6F8 8024FE18 24050080 */ addiu $a1, $zero, 0x80 +glabel L8024FE1C_17E6FC /* 17E6FC 8024FE1C 3C048011 */ lui $a0, %hi(D_80108E1C) /* 17E700 8024FE20 24848E1C */ addiu $a0, $a0, %lo(D_80108E1C) /* 17E704 8024FE24 08094060 */ j .L80250180 /* 17E708 8024FE28 00000000 */ nop +glabel L8024FE2C_17E70C /* 17E70C 8024FE2C 3C048011 */ lui $a0, %hi(D_80108B28) /* 17E710 8024FE30 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) /* 17E714 8024FE34 0C050529 */ jal create_icon @@ -233,10 +243,12 @@ glabel func_8024FB3C /* 17E7A0 8024FEC0 2610F646 */ addiu $s0, $s0, %lo(D_8029F646) /* 17E7A4 8024FEC4 080941E3 */ j .L8025078C /* 17E7A8 8024FEC8 34058080 */ ori $a1, $zero, 0x8080 +glabel L8024FECC_17E7AC /* 17E7AC 8024FECC 3C048011 */ lui $a0, %hi(D_80108E1C) /* 17E7B0 8024FED0 24848E1C */ addiu $a0, $a0, %lo(D_80108E1C) /* 17E7B4 8024FED4 08094060 */ j .L80250180 /* 17E7B8 8024FED8 00000000 */ nop +glabel L8024FEDC_17E7BC /* 17E7BC 8024FEDC 3C048029 */ lui $a0, %hi(D_80292788) /* 17E7C0 8024FEE0 24842788 */ addiu $a0, $a0, %lo(D_80292788) /* 17E7C4 8024FEE4 0C050529 */ jal create_icon @@ -262,6 +274,7 @@ glabel func_8024FB3C /* 17E814 8024FF34 2610F644 */ addiu $s0, $s0, %lo(D_8029F644) /* 17E818 8024FF38 080941E3 */ j .L8025078C /* 17E81C 8024FF3C 34058080 */ ori $a1, $zero, 0x8080 +glabel L8024FF40_17E820 /* 17E820 8024FF40 3C048011 */ lui $a0, %hi(D_80108B28) /* 17E824 8024FF44 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) /* 17E828 8024FF48 0C050529 */ jal create_icon @@ -286,6 +299,7 @@ glabel func_8024FB3C /* 17E874 8024FF94 A422F644 */ sh $v0, %lo(D_8029F644)($at) /* 17E878 8024FF98 080941E4 */ j .L80250790 /* 17E87C 8024FF9C 34058080 */ ori $a1, $zero, 0x8080 +glabel L8024FFA0_17E880 /* 17E880 8024FFA0 3C048011 */ lui $a0, %hi(D_80108B28) /* 17E884 8024FFA4 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) /* 17E888 8024FFA8 0C050529 */ jal create_icon @@ -311,6 +325,7 @@ glabel func_8024FB3C /* 17E8D8 8024FFF8 2610F644 */ addiu $s0, $s0, %lo(D_8029F644) /* 17E8DC 8024FFFC 080941E3 */ j .L8025078C /* 17E8E0 80250000 34058080 */ ori $a1, $zero, 0x8080 +glabel L80250004_17E8E4 /* 17E8E4 80250004 3C048029 */ lui $a0, %hi(D_80292788) /* 17E8E8 80250008 24842788 */ addiu $a0, $a0, %lo(D_80292788) /* 17E8EC 8025000C 0C050529 */ jal create_icon @@ -336,6 +351,7 @@ glabel func_8024FB3C /* 17E93C 8025005C 2610F644 */ addiu $s0, $s0, %lo(D_8029F644) /* 17E940 80250060 080941E3 */ j .L8025078C /* 17E944 80250064 34058080 */ ori $a1, $zero, 0x8080 +glabel L80250068_17E948 /* 17E948 80250068 3C048011 */ lui $a0, %hi(D_80108E1C) /* 17E94C 8025006C 24848E1C */ addiu $a0, $a0, %lo(D_80108E1C) /* 17E950 80250070 0C050529 */ jal create_icon @@ -390,6 +406,7 @@ glabel func_8024FB3C /* 17EA10 80250130 00000000 */ nop /* 17EA14 80250134 080941EB */ j .L802507AC /* 17EA18 80250138 24020001 */ addiu $v0, $zero, 1 +glabel L8025013C_17EA1C /* 17EA1C 8025013C 3C048011 */ lui $a0, %hi(D_80108B28) /* 17EA20 80250140 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) /* 17EA24 80250144 0C050529 */ jal create_icon @@ -405,6 +422,7 @@ glabel func_8024FB3C /* 17EA4C 8025016C 86040000 */ lh $a0, ($s0) /* 17EA50 80250170 0C051261 */ jal set_icon_render_pos /* 17EA54 80250174 00A0302D */ daddu $a2, $a1, $zero +glabel L80250178_17EA58 /* 17EA58 80250178 3C048011 */ lui $a0, %hi(D_80108B28) /* 17EA5C 8025017C 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) .L80250180: @@ -446,23 +464,26 @@ glabel func_8024FB3C /* 17EAE4 80250204 2C620015 */ sltiu $v0, $v1, 0x15 /* 17EAE8 80250208 104000AC */ beqz $v0, .L802504BC /* 17EAEC 8025020C 00031080 */ sll $v0, $v1, 2 -/* 17EAF0 80250210 3C01802A */ lui $at, %hi(D_8029CF60) +/* 17EAF0 80250210 3C01802A */ lui $at, %hi(jtbl_8029CF60_1CB840) /* 17EAF4 80250214 00220821 */ addu $at, $at, $v0 -/* 17EAF8 80250218 8C22CF60 */ lw $v0, %lo(D_8029CF60)($at) +/* 17EAF8 80250218 8C22CF60 */ lw $v0, %lo(jtbl_8029CF60_1CB840)($at) /* 17EAFC 8025021C 00400008 */ jr $v0 /* 17EB00 80250220 00000000 */ nop +glabel L80250224_17EB04 /* 17EB04 80250224 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EB08 80250228 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17EB0C 8025022C 3C058011 */ lui $a1, %hi(D_80108B80) /* 17EB10 80250230 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) /* 17EB14 80250234 0809412D */ j .L802504B4 /* 17EB18 80250238 00000000 */ nop +glabel L8025023C_17EB1C /* 17EB1C 8025023C 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EB20 80250240 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17EB24 80250244 3C058011 */ lui $a1, %hi(D_80108F30) /* 17EB28 80250248 24A58F30 */ addiu $a1, $a1, %lo(D_80108F30) /* 17EB2C 8025024C 0809412D */ j .L802504B4 /* 17EB30 80250250 00000000 */ nop +glabel L80250254_17EB34 /* 17EB34 80250254 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EB38 80250258 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17EB3C 8025025C 3C058011 */ lui $a1, %hi(D_80108F90) @@ -475,6 +496,7 @@ glabel func_8024FB3C /* 17EB58 80250278 24A527B4 */ addiu $a1, $a1, %lo(D_802927B4) /* 17EB5C 8025027C 0809412D */ j .L802504B4 /* 17EB60 80250280 00000000 */ nop +glabel L80250284_17EB64 /* 17EB64 80250284 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EB68 80250288 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17EB6C 8025028C 3C058011 */ lui $a1, %hi(D_80108F90) @@ -487,6 +509,7 @@ glabel func_8024FB3C /* 17EB88 802502A8 24A536D4 */ addiu $a1, $a1, %lo(D_802936D4) /* 17EB8C 802502AC 0809412D */ j .L802504B4 /* 17EB90 802502B0 00000000 */ nop +glabel L802502B4_17EB94 /* 17EB94 802502B4 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EB98 802502B8 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17EB9C 802502BC 3C058029 */ lui $a1, %hi(D_802925F4) @@ -511,12 +534,14 @@ glabel func_8024FB3C /* 17EBE8 80250308 24A52524 */ addiu $a1, $a1, %lo(D_80292524) /* 17EBEC 8025030C 0809412D */ j .L802504B4 /* 17EBF0 80250310 00000000 */ nop +glabel L80250314_17EBF4 /* 17EBF4 80250314 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EBF8 80250318 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17EBFC 8025031C 3C058011 */ lui $a1, %hi(D_80108E80) /* 17EC00 80250320 24A58E80 */ addiu $a1, $a1, %lo(D_80108E80) /* 17EC04 80250324 0809412D */ j .L802504B4 /* 17EC08 80250328 00000000 */ nop +glabel L8025032C_17EC0C /* 17EC0C 8025032C 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EC10 80250330 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17EC14 80250334 3C058011 */ lui $a1, %hi(D_80108BBC) @@ -535,12 +560,14 @@ glabel func_8024FB3C /* 17EC48 80250368 24A526C4 */ addiu $a1, $a1, %lo(D_802926C4) /* 17EC4C 8025036C 0809412D */ j .L802504B4 /* 17EC50 80250370 00000000 */ nop +glabel L80250374_17EC54 /* 17EC54 80250374 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EC58 80250378 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17EC5C 8025037C 3C058011 */ lui $a1, %hi(D_80108D6C) /* 17EC60 80250380 24A58D6C */ addiu $a1, $a1, %lo(D_80108D6C) /* 17EC64 80250384 0809412D */ j .L802504B4 /* 17EC68 80250388 00000000 */ nop +glabel L8025038C_17EC6C /* 17EC6C 8025038C 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EC70 80250390 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17EC74 80250394 3C058029 */ lui $a1, %hi(D_802927B4) @@ -553,6 +580,7 @@ glabel func_8024FB3C /* 17EC90 802503B0 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) /* 17EC94 802503B4 0809412D */ j .L802504B4 /* 17EC98 802503B8 00000000 */ nop +glabel L802503BC_17EC9C /* 17EC9C 802503BC 3C04802A */ lui $a0, %hi(D_8029F642) /* 17ECA0 802503C0 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17ECA4 802503C4 3C058011 */ lui $a1, %hi(D_80108B80) @@ -565,6 +593,7 @@ glabel func_8024FB3C /* 17ECC0 802503E0 24A523FC */ addiu $a1, $a1, %lo(D_802923FC) /* 17ECC4 802503E4 0809412D */ j .L802504B4 /* 17ECC8 802503E8 00000000 */ nop +glabel L802503EC_17ECCC /* 17ECCC 802503EC 3C04802A */ lui $a0, %hi(D_8029F642) /* 17ECD0 802503F0 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17ECD4 802503F4 3C058011 */ lui $a1, %hi(D_80108B80) @@ -577,12 +606,14 @@ glabel func_8024FB3C /* 17ECF0 80250410 24A52374 */ addiu $a1, $a1, %lo(D_80292374) /* 17ECF4 80250414 0809412D */ j .L802504B4 /* 17ECF8 80250418 00000000 */ nop +glabel L8025041C_17ECFC /* 17ECFC 8025041C 3C04802A */ lui $a0, %hi(D_8029F642) /* 17ED00 80250420 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17ED04 80250424 3C058011 */ lui $a1, %hi(D_80108B80) /* 17ED08 80250428 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) /* 17ED0C 8025042C 0809412D */ j .L802504B4 /* 17ED10 80250430 00000000 */ nop +glabel L80250434_17ED14 /* 17ED14 80250434 3C04802A */ lui $a0, %hi(D_8029F642) /* 17ED18 80250438 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17ED1C 8025043C 3C058029 */ lui $a1, %hi(D_802927B4) @@ -593,24 +624,28 @@ glabel func_8024FB3C /* 17ED30 80250450 8484F644 */ lh $a0, %lo(D_8029F644)($a0) /* 17ED34 80250454 0809412B */ j .L802504AC /* 17ED38 80250458 00000000 */ nop +glabel L8025045C_17ED3C /* 17ED3C 8025045C 3C04802A */ lui $a0, %hi(D_8029F642) /* 17ED40 80250460 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17ED44 80250464 3C058011 */ lui $a1, %hi(D_801091E4) /* 17ED48 80250468 24A591E4 */ addiu $a1, $a1, %lo(D_801091E4) /* 17ED4C 8025046C 0809412D */ j .L802504B4 /* 17ED50 80250470 00000000 */ nop +glabel L80250474_17ED54 /* 17ED54 80250474 3C04802A */ lui $a0, %hi(D_8029F642) /* 17ED58 80250478 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17ED5C 8025047C 3C058011 */ lui $a1, %hi(D_80108B80) /* 17ED60 80250480 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) /* 17ED64 80250484 0809412D */ j .L802504B4 /* 17ED68 80250488 00000000 */ nop +glabel L8025048C_17ED6C /* 17ED6C 8025048C 3C04802A */ lui $a0, %hi(D_8029F642) /* 17ED70 80250490 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17ED74 80250494 3C058011 */ lui $a1, %hi(D_80108BBC) /* 17ED78 80250498 24A58BBC */ addiu $a1, $a1, %lo(D_80108BBC) /* 17ED7C 8025049C 0C0511FF */ jal set_menu_icon_script /* 17ED80 802504A0 00000000 */ nop +glabel L802504A4_17ED84 /* 17ED84 802504A4 3C04802A */ lui $a0, %hi(D_8029F642) /* 17ED88 802504A8 8484F642 */ lh $a0, %lo(D_8029F642)($a0) .L802504AC: @@ -677,15 +712,17 @@ glabel func_8024FB3C /* 17EE64 80250584 2C620015 */ sltiu $v0, $v1, 0x15 /* 17EE68 80250588 1040002E */ beqz $v0, .L80250644 /* 17EE6C 8025058C 00031080 */ sll $v0, $v1, 2 -/* 17EE70 80250590 3C01802A */ lui $at, %hi(D_8029CFB8) +/* 17EE70 80250590 3C01802A */ lui $at, %hi(jtbl_8029CFB8_1CB898) /* 17EE74 80250594 00220821 */ addu $at, $at, $v0 -/* 17EE78 80250598 8C22CFB8 */ lw $v0, %lo(D_8029CFB8)($at) +/* 17EE78 80250598 8C22CFB8 */ lw $v0, %lo(jtbl_8029CFB8_1CB898)($at) /* 17EE7C 8025059C 00400008 */ jr $v0 /* 17EE80 802505A0 00000000 */ nop +glabel L802505A4_17EE84 /* 17EE84 802505A4 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EE88 802505A8 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17EE8C 802505AC 0809418F */ j .L8025063C /* 17EE90 802505B0 00000000 */ nop +glabel L802505B4_17EE94 /* 17EE94 802505B4 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EE98 802505B8 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17EE9C 802505BC 0C05123D */ jal free_icon @@ -694,6 +731,7 @@ glabel func_8024FB3C /* 17EEA8 802505C8 8484F644 */ lh $a0, %lo(D_8029F644)($a0) /* 17EEAC 802505CC 0809418F */ j .L8025063C /* 17EEB0 802505D0 00000000 */ nop +glabel L802505D4_17EEB4 /* 17EEB4 802505D4 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EEB8 802505D8 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17EEBC 802505DC 0C05123D */ jal free_icon @@ -706,6 +744,7 @@ glabel func_8024FB3C /* 17EED8 802505F8 8484F646 */ lh $a0, %lo(D_8029F646)($a0) /* 17EEDC 802505FC 0809418F */ j .L8025063C /* 17EEE0 80250600 00000000 */ nop +glabel L80250604_17EEE4 /* 17EEE4 80250604 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EEE8 80250608 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17EEEC 8025060C 0C05123D */ jal free_icon @@ -728,19 +767,22 @@ glabel func_8024FB3C /* 17EF28 80250648 A420F64A */ sh $zero, %lo(D_8029F64A)($at) /* 17EF2C 8025064C 080941F7 */ j .L802507DC /* 17EF30 80250650 24120001 */ addiu $s2, $zero, 1 +glabel L80250654_17EF34 /* 17EF34 80250654 82230016 */ lb $v1, 0x16($s1) /* 17EF38 80250658 2C620005 */ sltiu $v0, $v1, 5 /* 17EF3C 8025065C 1040005F */ beqz $v0, .L802507DC /* 17EF40 80250660 00031080 */ sll $v0, $v1, 2 -/* 17EF44 80250664 3C01802A */ lui $at, %hi(D_8029D010) +/* 17EF44 80250664 3C01802A */ lui $at, %hi(jtbl_8029D010_1CB8F0) /* 17EF48 80250668 00220821 */ addu $at, $at, $v0 -/* 17EF4C 8025066C 8C22D010 */ lw $v0, %lo(D_8029D010)($at) +/* 17EF4C 8025066C 8C22D010 */ lw $v0, %lo(jtbl_8029D010_1CB8F0)($at) /* 17EF50 80250670 00400008 */ jr $v0 /* 17EF54 80250674 00000000 */ nop .L80250678: +glabel L80250678_17EF58 /* 17EF58 80250678 24020002 */ addiu $v0, $zero, 2 /* 17EF5C 8025067C 080941F7 */ j .L802507DC /* 17EF60 80250680 A2220016 */ sb $v0, 0x16($s1) +glabel L80250684_17EF64 /* 17EF64 80250684 8C820214 */ lw $v0, 0x214($a0) /* 17EF68 80250688 3042C000 */ andi $v0, $v0, 0xc000 /* 17EF6C 8025068C 54400001 */ bnel $v0, $zero, .L80250694 @@ -753,9 +795,11 @@ glabel func_8024FB3C /* 17EF84 802506A4 24020003 */ addiu $v0, $zero, 3 /* 17EF88 802506A8 080941F7 */ j .L802507DC /* 17EF8C 802506AC A2220016 */ sb $v0, 0x16($s1) +glabel L802506B0_17EF90 /* 17EF90 802506B0 24020004 */ addiu $v0, $zero, 4 /* 17EF94 802506B4 080941F7 */ j .L802507DC /* 17EF98 802506B8 A2220016 */ sb $v0, 0x16($s1) +glabel L802506BC_17EF9C /* 17EF9C 802506BC 82230016 */ lb $v1, 0x16($s1) /* 17EFA0 802506C0 10600005 */ beqz $v1, .L802506D8 /* 17EFA4 802506C4 24020001 */ addiu $v0, $zero, 1 @@ -771,35 +815,42 @@ glabel func_8024FB3C /* 17EFC8 802506E8 2C620007 */ sltiu $v0, $v1, 7 /* 17EFCC 802506EC 1040002E */ beqz $v0, .L802507A8 /* 17EFD0 802506F0 00031080 */ sll $v0, $v1, 2 -/* 17EFD4 802506F4 3C01802A */ lui $at, %hi(D_8029D028) +/* 17EFD4 802506F4 3C01802A */ lui $at, %hi(jtbl_8029D028_1CB908) /* 17EFD8 802506F8 00220821 */ addu $at, $at, $v0 -/* 17EFDC 802506FC 8C22D028 */ lw $v0, %lo(D_8029D028)($at) +/* 17EFDC 802506FC 8C22D028 */ lw $v0, %lo(jtbl_8029D028_1CB908)($at) /* 17EFE0 80250700 00400008 */ jr $v0 /* 17EFE4 80250704 00000000 */ nop +glabel L80250708_17EFE8 /* 17EFE8 80250708 3C048008 */ lui $a0, %hi(D_800806A0) /* 17EFEC 8025070C 248406A0 */ addiu $a0, $a0, %lo(D_800806A0) /* 17EFF0 80250710 080941DC */ j .L80250770 /* 17EFF4 80250714 00000000 */ nop +glabel L80250718_17EFF8 /* 17EFF8 80250718 3C048008 */ lui $a0, %hi(D_800806D0) /* 17EFFC 8025071C 248406D0 */ addiu $a0, $a0, %lo(D_800806D0) /* 17F000 80250720 080941DC */ j .L80250770 /* 17F004 80250724 00000000 */ nop +glabel L80250728_17F008 /* 17F008 80250728 3C048008 */ lui $a0, %hi(D_80080700) /* 17F00C 8025072C 24840700 */ addiu $a0, $a0, %lo(D_80080700) /* 17F010 80250730 080941DC */ j .L80250770 /* 17F014 80250734 00000000 */ nop +glabel L80250738_17F018 /* 17F018 80250738 3C048008 */ lui $a0, %hi(D_80080730) /* 17F01C 8025073C 24840730 */ addiu $a0, $a0, %lo(D_80080730) /* 17F020 80250740 080941DC */ j .L80250770 /* 17F024 80250744 00000000 */ nop +glabel L80250748_17F028 /* 17F028 80250748 3C048008 */ lui $a0, %hi(D_80080760) /* 17F02C 8025074C 24840760 */ addiu $a0, $a0, %lo(D_80080760) /* 17F030 80250750 080941DC */ j .L80250770 /* 17F034 80250754 00000000 */ nop +glabel L80250758_17F038 /* 17F038 80250758 3C048008 */ lui $a0, %hi(D_80080790) /* 17F03C 8025075C 24840790 */ addiu $a0, $a0, %lo(D_80080790) /* 17F040 80250760 080941DC */ j .L80250770 /* 17F044 80250764 00000000 */ nop +glabel L80250768_17F048 /* 17F048 80250768 3C048008 */ lui $a0, %hi(D_800807C0) /* 17F04C 8025076C 248407C0 */ addiu $a0, $a0, %lo(D_800807C0) .L80250770: @@ -821,6 +872,7 @@ glabel func_8024FB3C /* 17F080 802507A0 0C051261 */ jal set_icon_render_pos /* 17F084 802507A4 00A0302D */ daddu $a2, $a1, $zero .L802507A8: +glabel L802507A8_17F088 /* 17F088 802507A8 24020001 */ addiu $v0, $zero, 1 .L802507AC: /* 17F08C 802507AC 080941F7 */ j .L802507DC diff --git a/asm/nonmatchings/code_17D6A0/func_80250818.s b/asm/nonmatchings/code_17D6A0/func_80250818.s index 6498de415c..28e3cc84c2 100644 --- a/asm/nonmatchings/code_17D6A0/func_80250818.s +++ b/asm/nonmatchings/code_17D6A0/func_80250818.s @@ -17,11 +17,12 @@ glabel func_80250818 /* 17F128 80250848 1040018D */ beqz $v0, .L80250E80 /* 17F12C 8025084C 24D10006 */ addiu $s1, $a2, 6 /* 17F130 80250850 00031080 */ sll $v0, $v1, 2 -/* 17F134 80250854 3C01802A */ lui $at, %hi(D_8029D048) +/* 17F134 80250854 3C01802A */ lui $at, %hi(jtbl_8029D048_1CB928) /* 17F138 80250858 00220821 */ addu $at, $at, $v0 -/* 17F13C 8025085C 8C22D048 */ lw $v0, %lo(D_8029D048)($at) +/* 17F13C 8025085C 8C22D048 */ lw $v0, %lo(jtbl_8029D048_1CB928)($at) /* 17F140 80250860 00400008 */ jr $v0 /* 17F144 80250864 00000000 */ nop +glabel L80250868_17F148 /* 17F148 80250868 86620012 */ lh $v0, 0x12($s3) /* 17F14C 8025086C 00021080 */ sll $v0, $v0, 2 /* 17F150 80250870 3C108028 */ lui $s0, %hi(D_80283770) @@ -44,6 +45,7 @@ glabel func_80250818 /* 17F194 802508B4 02263021 */ addu $a2, $s1, $a2 /* 17F198 802508B8 080943A0 */ j .L80250E80 /* 17F19C 802508BC 00000000 */ nop +glabel L802508C0_17F1A0 /* 17F1A0 802508C0 86620012 */ lh $v0, 0x12($s3) /* 17F1A4 802508C4 00021080 */ sll $v0, $v0, 2 /* 17F1A8 802508C8 3C108028 */ lui $s0, %hi(D_80283770) @@ -63,6 +65,7 @@ glabel func_80250818 /* 17F1E0 80250900 02228821 */ addu $s1, $s1, $v0 /* 17F1E4 80250904 08094259 */ j .L80250964 /* 17F1E8 80250908 0200202D */ daddu $a0, $s0, $zero +glabel L8025090C_17F1EC /* 17F1EC 8025090C 86620012 */ lh $v0, 0x12($s3) /* 17F1F0 80250910 00021080 */ sll $v0, $v0, 2 /* 17F1F4 80250914 3C108028 */ lui $s0, %hi(D_80283770) @@ -95,6 +98,7 @@ glabel func_80250818 /* 17F25C 8025097C AFA00014 */ sw $zero, 0x14($sp) /* 17F260 80250980 080943A0 */ j .L80250E80 /* 17F264 80250984 00000000 */ nop +glabel L80250988_17F268 /* 17F268 80250988 2645001D */ addiu $a1, $s2, 0x1d /* 17F26C 8025098C 26260006 */ addiu $a2, $s1, 6 /* 17F270 80250990 86620012 */ lh $v0, 0x12($s3) @@ -116,6 +120,7 @@ glabel func_80250818 /* 17F2B0 802509D0 2626000E */ addiu $a2, $s1, 0xe /* 17F2B4 802509D4 0809439D */ j .L80250E74 /* 17F2B8 802509D8 00000000 */ nop +glabel L802509DC_17F2BC /* 17F2BC 802509DC 82620016 */ lb $v0, 0x16($s3) /* 17F2C0 802509E0 28420002 */ slti $v0, $v0, 2 /* 17F2C4 802509E4 10400002 */ beqz $v0, .L802509F0 @@ -156,17 +161,19 @@ glabel func_80250818 /* 17F348 80250A68 2C620014 */ sltiu $v0, $v1, 0x14 /* 17F34C 80250A6C 10400104 */ beqz $v0, .L80250E80 /* 17F350 80250A70 00031080 */ sll $v0, $v1, 2 -/* 17F354 80250A74 3C01802A */ lui $at, %hi(D_8029D1A0) +/* 17F354 80250A74 3C01802A */ lui $at, %hi(jtbl_8029D1A0_1CBA80) /* 17F358 80250A78 00220821 */ addu $at, $at, $v0 -/* 17F35C 80250A7C 8C22D1A0 */ lw $v0, %lo(D_8029D1A0)($at) +/* 17F35C 80250A7C 8C22D1A0 */ lw $v0, %lo(jtbl_8029D1A0_1CBA80)($at) /* 17F360 80250A80 00400008 */ jr $v0 /* 17F364 80250A84 00000000 */ nop +glabel L80250A88_17F368 /* 17F368 80250A88 26450041 */ addiu $a1, $s2, 0x41 /* 17F36C 80250A8C 3C10802A */ lui $s0, %hi(D_8029F642) /* 17F370 80250A90 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) /* 17F374 80250A94 86040000 */ lh $a0, ($s0) /* 17F378 80250A98 08094394 */ j .L80250E50 /* 17F37C 80250A9C 2626000E */ addiu $a2, $s1, 0xe +glabel L80250AA0_17F380 /* 17F380 80250AA0 26450037 */ addiu $a1, $s2, 0x37 /* 17F384 80250AA4 3C10802A */ lui $s0, %hi(D_8029F642) /* 17F388 80250AA8 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) @@ -191,18 +198,21 @@ glabel func_80250818 /* 17F3D4 80250AF4 2626001F */ addiu $a2, $s1, 0x1f /* 17F3D8 80250AF8 0809439A */ j .L80250E68 /* 17F3DC 80250AFC 00000000 */ nop +glabel L80250B00_17F3E0 /* 17F3E0 80250B00 26450040 */ addiu $a1, $s2, 0x40 /* 17F3E4 80250B04 3C10802A */ lui $s0, %hi(D_8029F642) /* 17F3E8 80250B08 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) /* 17F3EC 80250B0C 86040000 */ lh $a0, ($s0) /* 17F3F0 80250B10 08094394 */ j .L80250E50 /* 17F3F4 80250B14 2626000E */ addiu $a2, $s1, 0xe +glabel L80250B18_17F3F8 /* 17F3F8 80250B18 26450043 */ addiu $a1, $s2, 0x43 /* 17F3FC 80250B1C 3C10802A */ lui $s0, %hi(D_8029F642) /* 17F400 80250B20 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) /* 17F404 80250B24 86040000 */ lh $a0, ($s0) /* 17F408 80250B28 08094394 */ j .L80250E50 /* 17F40C 80250B2C 2626000E */ addiu $a2, $s1, 0xe +glabel L80250B30_17F410 /* 17F410 80250B30 26450038 */ addiu $a1, $s2, 0x38 /* 17F414 80250B34 3C10802A */ lui $s0, %hi(D_8029F642) /* 17F418 80250B38 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) @@ -213,6 +223,7 @@ glabel func_80250818 /* 17F42C 80250B4C 3C053F19 */ lui $a1, 0x3f19 /* 17F430 80250B50 08094398 */ j .L80250E60 /* 17F434 80250B54 34A5999A */ ori $a1, $a1, 0x999a +glabel L80250B58_17F438 /* 17F438 80250B58 26450041 */ addiu $a1, $s2, 0x41 /* 17F43C 80250B5C 3C10802A */ lui $s0, %hi(D_8029F642) /* 17F440 80250B60 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) @@ -235,6 +246,7 @@ glabel func_80250818 /* 17F484 80250BA4 86040000 */ lh $a0, ($s0) /* 17F488 80250BA8 08094381 */ j .L80250E04 /* 17F48C 80250BAC 26260020 */ addiu $a2, $s1, 0x20 +glabel L80250BB0_17F490 /* 17F490 80250BB0 26450056 */ addiu $a1, $s2, 0x56 /* 17F494 80250BB4 3C10802A */ lui $s0, %hi(D_8029F642) /* 17F498 80250BB8 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) @@ -276,6 +288,7 @@ glabel func_80250818 /* 17F528 80250C48 86040000 */ lh $a0, ($s0) /* 17F52C 80250C4C 08094394 */ j .L80250E50 /* 17F530 80250C50 0220302D */ daddu $a2, $s1, $zero +glabel L80250C54_17F534 /* 17F534 80250C54 26450069 */ addiu $a1, $s2, 0x69 /* 17F538 80250C58 3C10802A */ lui $s0, %hi(D_8029F642) /* 17F53C 80250C5C 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) @@ -294,6 +307,7 @@ glabel func_80250818 /* 17F570 80250C90 86040000 */ lh $a0, ($s0) /* 17F574 80250C94 08094394 */ j .L80250E50 /* 17F578 80250C98 2626000E */ addiu $a2, $s1, 0xe +glabel L80250C9C_17F57C /* 17F57C 80250C9C 2645003F */ addiu $a1, $s2, 0x3f /* 17F580 80250CA0 3C10802A */ lui $s0, %hi(D_8029F642) /* 17F584 80250CA4 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) @@ -319,12 +333,14 @@ glabel func_80250818 /* 17F5D4 80250CF4 86040000 */ lh $a0, ($s0) /* 17F5D8 80250CF8 08094394 */ j .L80250E50 /* 17F5DC 80250CFC 0220302D */ daddu $a2, $s1, $zero +glabel L80250D00_17F5E0 /* 17F5E0 80250D00 2645007C */ addiu $a1, $s2, 0x7c /* 17F5E4 80250D04 3C10802A */ lui $s0, %hi(D_8029F642) /* 17F5E8 80250D08 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) /* 17F5EC 80250D0C 86040000 */ lh $a0, ($s0) /* 17F5F0 80250D10 08094394 */ j .L80250E50 /* 17F5F4 80250D14 2626000E */ addiu $a2, $s1, 0xe +glabel L80250D18_17F5F8 /* 17F5F8 80250D18 26450038 */ addiu $a1, $s2, 0x38 /* 17F5FC 80250D1C 3C10802A */ lui $s0, %hi(D_8029F642) /* 17F600 80250D20 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) @@ -343,6 +359,7 @@ glabel func_80250818 /* 17F634 80250D54 86040000 */ lh $a0, ($s0) /* 17F638 80250D58 08094394 */ j .L80250E50 /* 17F63C 80250D5C 2626000E */ addiu $a2, $s1, 0xe +glabel L80250D60_17F640 /* 17F640 80250D60 2645006B */ addiu $a1, $s2, 0x6b /* 17F644 80250D64 3C10802A */ lui $s0, %hi(D_8029F642) /* 17F648 80250D68 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) @@ -399,6 +416,7 @@ glabel func_80250818 /* 17F710 80250E30 00000000 */ nop /* 17F714 80250E34 080943A0 */ j .L80250E80 /* 17F718 80250E38 00000000 */ nop +glabel L80250E3C_17F71C /* 17F71C 80250E3C 26450040 */ addiu $a1, $s2, 0x40 /* 17F720 80250E40 3C10802A */ lui $s0, %hi(D_8029F642) /* 17F724 80250E44 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) @@ -421,6 +439,7 @@ glabel func_80250818 /* 17F758 80250E78 0C0511EA */ jal draw_icon_0 /* 17F75C 80250E7C 00000000 */ nop .L80250E80: +glabel L80250E80_17F760 /* 17F760 80250E80 8FBF002C */ lw $ra, 0x2c($sp) /* 17F764 80250E84 8FB40028 */ lw $s4, 0x28($sp) /* 17F768 80250E88 8FB30024 */ lw $s3, 0x24($sp) diff --git a/asm/nonmatchings/code_17D6A0/show_message_popup.s b/asm/nonmatchings/code_17D6A0/show_message_popup.s index 7a2f78a296..d02f09bf70 100644 --- a/asm/nonmatchings/code_17D6A0/show_message_popup.s +++ b/asm/nonmatchings/code_17D6A0/show_message_popup.s @@ -15,11 +15,12 @@ glabel show_message_popup /* 17F7AC 80250ECC 104000F1 */ beqz $v0, .L80251294 /* 17F7B0 80250ED0 24140050 */ addiu $s4, $zero, 0x50 /* 17F7B4 80250ED4 00031080 */ sll $v0, $v1, 2 -/* 17F7B8 80250ED8 3C01802A */ lui $at, %hi(D_8029D1F0) +/* 17F7B8 80250ED8 3C01802A */ lui $at, %hi(jtbl_8029D1F0_1CBAD0) /* 17F7BC 80250EDC 00220821 */ addu $at, $at, $v0 -/* 17F7C0 80250EE0 8C22D1F0 */ lw $v0, %lo(D_8029D1F0)($at) +/* 17F7C0 80250EE0 8C22D1F0 */ lw $v0, %lo(jtbl_8029D1F0_1CBAD0)($at) /* 17F7C4 80250EE4 00400008 */ jr $v0 /* 17F7C8 80250EE8 00000000 */ nop +glabel L80250EEC_17F7CC /* 17F7CC 80250EEC 82620017 */ lb $v0, 0x17($s3) /* 17F7D0 80250EF0 104000E8 */ beqz $v0, .L80251294 /* 17F7D4 80250EF4 0000282D */ daddu $a1, $zero, $zero @@ -61,6 +62,7 @@ glabel show_message_popup /* 17F864 80250F84 24040009 */ addiu $a0, $zero, 9 /* 17F868 80250F88 080944A3 */ j .L8025128C /* 17F86C 80250F8C 24050001 */ addiu $a1, $zero, 1 +glabel L80250F90_17F870 /* 17F870 80250F90 82620017 */ lb $v0, 0x17($s3) /* 17F874 80250F94 104000BF */ beqz $v0, .L80251294 /* 17F878 80250F98 00000000 */ nop @@ -93,6 +95,7 @@ glabel show_message_popup /* 17F8E4 80251004 24040009 */ addiu $a0, $zero, 9 /* 17F8E8 80251008 080944A3 */ j .L8025128C /* 17F8EC 8025100C 24050001 */ addiu $a1, $zero, 1 +glabel L80251010_17F8F0 /* 17F8F0 80251010 82620017 */ lb $v0, 0x17($s3) /* 17F8F4 80251014 1040009F */ beqz $v0, .L80251294 /* 17F8F8 80251018 00000000 */ nop @@ -139,6 +142,7 @@ glabel show_message_popup /* 17F99C 802510BC 24040009 */ addiu $a0, $zero, 9 /* 17F9A0 802510C0 080944A3 */ j .L8025128C /* 17F9A4 802510C4 24050001 */ addiu $a1, $zero, 1 +glabel L802510C8_17F9A8 /* 17F9A8 802510C8 82620017 */ lb $v0, 0x17($s3) /* 17F9AC 802510CC 10400071 */ beqz $v0, .L80251294 /* 17F9B0 802510D0 00000000 */ nop @@ -189,6 +193,7 @@ glabel show_message_popup /* 17FA64 80251184 24040009 */ addiu $a0, $zero, 9 /* 17FA68 80251188 080944A3 */ j .L8025128C /* 17FA6C 8025118C 24050001 */ addiu $a1, $zero, 1 +glabel L80251190_17FA70 /* 17FA70 80251190 82620017 */ lb $v0, 0x17($s3) /* 17FA74 80251194 1040003F */ beqz $v0, .L80251294 /* 17FA78 80251198 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/code_17FEB0/calc_item_damage_enemy.s b/asm/nonmatchings/code_17FEB0/calc_item_damage_enemy.s index 8f33a1dc9d..3dacbfccfe 100644 --- a/asm/nonmatchings/code_17FEB0/calc_item_damage_enemy.s +++ b/asm/nonmatchings/code_17FEB0/calc_item_damage_enemy.s @@ -47,7 +47,7 @@ glabel calc_item_damage_enemy /* 18006C 8025178C 32310700 */ andi $s1, $s1, 0x700 .L80251790: /* 180070 80251790 080945E4 */ j .L80251790 -/* 180074 80251794 00000000 */ nop +/* 180074 80251794 00000000 */ nop .L80251798: /* 180078 80251798 A66001F8 */ sh $zero, 0x1f8($s3) /* 18007C 8025179C 3C02800E */ lui $v0, %hi(gBattleStatus) @@ -84,7 +84,7 @@ glabel calc_item_damage_enemy /* 1800EC 8025180C 8E820188 */ lw $v0, 0x188($s4) /* 1800F0 80251810 30420020 */ andi $v0, $v0, 0x20 /* 1800F4 80251814 10400005 */ beqz $v0, .L8025182C -/* 1800F8 80251818 00000000 */ nop +/* 1800F8 80251818 00000000 */ nop /* 1800FC 8025181C 0C09451D */ jal func_80251474 /* 180100 80251820 0260202D */ daddu $a0, $s3, $zero /* 180104 80251824 24080001 */ addiu $t0, $zero, 1 @@ -115,7 +115,7 @@ glabel calc_item_damage_enemy /* 180160 80251880 C6220014 */ lwc1 $f2, 0x14($s1) /* 180164 80251884 3C0140A0 */ lui $at, 0x40a0 /* 180168 80251888 44810000 */ mtc1 $at, $f0 -/* 18016C 8025188C 00000000 */ nop +/* 18016C 8025188C 00000000 */ nop /* 180170 80251890 46001080 */ add.s $f2, $f2, $f0 /* 180174 80251894 8E25000C */ lw $a1, 0xc($s1) /* 180178 80251898 8E260010 */ lw $a2, 0x10($s1) @@ -128,7 +128,7 @@ glabel calc_item_damage_enemy /* 180190 802518B0 3C020040 */ lui $v0, 0x40 /* 180194 802518B4 00A21024 */ and $v0, $a1, $v0 /* 180198 802518B8 1440000F */ bnez $v0, .L802518F8 -/* 18019C 802518BC 00000000 */ nop +/* 18019C 802518BC 00000000 */ nop /* 1801A0 802518C0 8EE4007C */ lw $a0, 0x7c($s7) /* 1801A4 802518C4 30820020 */ andi $v0, $a0, 0x20 /* 1801A8 802518C8 1440038B */ bnez $v0, .L802526F8 @@ -140,7 +140,7 @@ glabel calc_item_damage_enemy /* 1801C0 802518E0 10400005 */ beqz $v0, .L802518F8 /* 1801C4 802518E4 30A20800 */ andi $v0, $a1, 0x800 /* 1801C8 802518E8 14400003 */ bnez $v0, .L802518F8 -/* 1801CC 802518EC 00000000 */ nop +/* 1801CC 802518EC 00000000 */ nop .L802518F0: /* 1801D0 802518F0 080949BE */ j .L802526F8 /* 1801D4 802518F4 24020006 */ addiu $v0, $zero, 6 @@ -198,7 +198,7 @@ glabel calc_item_damage_enemy /* 180298 802519B8 3C030800 */ lui $v1, 0x800 /* 18029C 802519BC 00431024 */ and $v0, $v0, $v1 /* 1802A0 802519C0 14400003 */ bnez $v0, .L802519D0 -/* 1802A4 802519C4 00000000 */ nop +/* 1802A4 802519C4 00000000 */ nop /* 1802A8 802519C8 82620222 */ lb $v0, 0x222($s3) /* 1802AC 802519CC 02028021 */ addu $s0, $s0, $v0 .L802519D0: @@ -248,17 +248,17 @@ glabel calc_item_damage_enemy /* 18034C 80251A6C 0000F02D */ daddu $fp, $zero, $zero /* 180350 80251A70 8FA80018 */ lw $t0, 0x18($sp) /* 180354 80251A74 1500000D */ bnez $t0, .L80251AAC -/* 180358 80251A78 00000000 */ nop +/* 180358 80251A78 00000000 */ nop /* 18035C 80251A7C 8EE20004 */ lw $v0, 4($s7) /* 180360 80251A80 30420004 */ andi $v0, $v0, 4 /* 180364 80251A84 14400009 */ bnez $v0, .L80251AAC -/* 180368 80251A88 00000000 */ nop +/* 180368 80251A88 00000000 */ nop /* 18036C 80251A8C 926201B8 */ lbu $v0, 0x1b8($s3) /* 180370 80251A90 00441023 */ subu $v0, $v0, $a0 /* 180374 80251A94 A26201B8 */ sb $v0, 0x1b8($s3) /* 180378 80251A98 00021600 */ sll $v0, $v0, 0x18 /* 18037C 80251A9C 1C400003 */ bgtz $v0, .L80251AAC -/* 180380 80251AA0 00000000 */ nop +/* 180380 80251AA0 00000000 */ nop /* 180384 80251AA4 A26001B8 */ sb $zero, 0x1b8($s3) /* 180388 80251AA8 24120020 */ addiu $s2, $zero, 0x20 .L80251AAC: @@ -296,7 +296,7 @@ glabel calc_item_damage_enemy /* 180400 80251B20 8E820188 */ lw $v0, 0x188($s4) /* 180404 80251B24 30422000 */ andi $v0, $v0, 0x2000 /* 180408 80251B28 10400004 */ beqz $v0, .L80251B3C -/* 18040C 80251B2C 00000000 */ nop +/* 18040C 80251B2C 00000000 */ nop /* 180410 80251B30 A6800180 */ sh $zero, 0x180($s4) /* 180414 80251B34 24120020 */ addiu $s2, $zero, 0x20 /* 180418 80251B38 0000F02D */ daddu $fp, $zero, $zero @@ -319,7 +319,7 @@ glabel calc_item_damage_enemy /* 180450 80251B70 52420006 */ beql $s2, $v0, .L80251B8C /* 180454 80251B74 24120020 */ addiu $s2, $zero, 0x20 /* 180458 80251B78 080946E3 */ j .L80251B8C -/* 18045C 80251B7C 00000000 */ nop +/* 18045C 80251B7C 00000000 */ nop .L80251B80: /* 180460 80251B80 24020020 */ addiu $v0, $zero, 0x20 /* 180464 80251B84 52420001 */ beql $s2, $v0, .L80251B8C @@ -357,24 +357,24 @@ glabel calc_item_damage_enemy /* 1804D0 80251BF0 3C030040 */ lui $v1, 0x40 /* 1804D4 80251BF4 00431024 */ and $v0, $v0, $v1 /* 1804D8 80251BF8 10400025 */ beqz $v0, .L80251C90 -/* 1804DC 80251BFC 00000000 */ nop +/* 1804DC 80251BFC 00000000 */ nop /* 1804E0 80251C00 3C02800E */ lui $v0, %hi(gBattleStatus) /* 1804E4 80251C04 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1804E8 80251C08 30420020 */ andi $v0, $v0, 0x20 /* 1804EC 80251C0C 104000F4 */ beqz $v0, .L80251FE0 -/* 1804F0 80251C10 00000000 */ nop +/* 1804F0 80251C10 00000000 */ nop /* 1804F4 80251C14 82620221 */ lb $v0, 0x221($s3) /* 1804F8 80251C18 1C40000A */ bgtz $v0, .L80251C44 -/* 1804FC 80251C1C 00000000 */ nop +/* 1804FC 80251C1C 00000000 */ nop /* 180500 80251C20 82620222 */ lb $v0, 0x222($s3) /* 180504 80251C24 1C400007 */ bgtz $v0, .L80251C44 -/* 180508 80251C28 00000000 */ nop +/* 180508 80251C28 00000000 */ nop /* 18050C 80251C2C 82620212 */ lb $v0, 0x212($s3) /* 180510 80251C30 54400006 */ bnel $v0, $zero, .L80251C4C /* 180514 80251C34 2412000A */ addiu $s2, $zero, 0xa /* 180518 80251C38 82620218 */ lb $v0, 0x218($s3) /* 18051C 80251C3C 10400014 */ beqz $v0, .L80251C90 -/* 180520 80251C40 00000000 */ nop +/* 180520 80251C40 00000000 */ nop .L80251C44: /* 180524 80251C44 82620212 */ lb $v0, 0x212($s3) /* 180528 80251C48 2412000A */ addiu $s2, $zero, 0xa @@ -418,7 +418,7 @@ glabel calc_item_damage_enemy /* 1805AC 80251CCC 3C020008 */ lui $v0, 8 /* 1805B0 80251CD0 00621024 */ and $v0, $v1, $v0 /* 1805B4 80251CD4 10400003 */ beqz $v0, .L80251CE4 -/* 1805B8 80251CD8 00000000 */ nop +/* 1805B8 80251CD8 00000000 */ nop /* 1805BC 80251CDC 24120014 */ addiu $s2, $zero, 0x14 /* 1805C0 80251CE0 24150001 */ addiu $s5, $zero, 1 .L80251CE4: @@ -442,11 +442,11 @@ glabel calc_item_damage_enemy /* 180600 80251D20 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 180604 80251D24 30420020 */ andi $v0, $v0, 0x20 /* 180608 80251D28 104000AD */ beqz $v0, .L80251FE0 -/* 18060C 80251D2C 00000000 */ nop +/* 18060C 80251D2C 00000000 */ nop /* 180610 80251D30 8E820188 */ lw $v0, 0x188($s4) /* 180614 80251D34 30420480 */ andi $v0, $v0, 0x480 /* 180618 80251D38 1040000A */ beqz $v0, .L80251D64 -/* 18061C 80251D3C 00000000 */ nop +/* 18061C 80251D3C 00000000 */ nop /* 180620 80251D40 8EE2007C */ lw $v0, 0x7c($s7) /* 180624 80251D44 30424000 */ andi $v0, $v0, 0x4000 /* 180628 80251D48 10400006 */ beqz $v0, .L80251D64 @@ -462,7 +462,7 @@ glabel calc_item_damage_enemy /* 180648 80251D68 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 18064C 80251D6C 30420020 */ andi $v0, $v0, 0x20 /* 180650 80251D70 1040009B */ beqz $v0, .L80251FE0 -/* 180654 80251D74 00000000 */ nop +/* 180654 80251D74 00000000 */ nop /* 180658 80251D78 8E820188 */ lw $v0, 0x188($s4) /* 18065C 80251D7C 30420400 */ andi $v0, $v0, 0x400 /* 180660 80251D80 1040000A */ beqz $v0, .L80251DAC @@ -482,11 +482,11 @@ glabel calc_item_damage_enemy /* 180690 80251DB0 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 180694 80251DB4 30420020 */ andi $v0, $v0, 0x20 /* 180698 80251DB8 10400089 */ beqz $v0, .L80251FE0 -/* 18069C 80251DBC 00000000 */ nop +/* 18069C 80251DBC 00000000 */ nop /* 1806A0 80251DC0 8E820188 */ lw $v0, 0x188($s4) /* 1806A4 80251DC4 30420C80 */ andi $v0, $v0, 0xc80 /* 1806A8 80251DC8 1040000A */ beqz $v0, .L80251DF4 -/* 1806AC 80251DCC 00000000 */ nop +/* 1806AC 80251DCC 00000000 */ nop /* 1806B0 80251DD0 8EE2007C */ lw $v0, 0x7c($s7) /* 1806B4 80251DD4 30421000 */ andi $v0, $v0, 0x1000 /* 1806B8 80251DD8 10400006 */ beqz $v0, .L80251DF4 @@ -502,7 +502,7 @@ glabel calc_item_damage_enemy /* 1806D8 80251DF8 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1806DC 80251DFC 30420020 */ andi $v0, $v0, 0x20 /* 1806E0 80251E00 10400077 */ beqz $v0, .L80251FE0 -/* 1806E4 80251E04 00000000 */ nop +/* 1806E4 80251E04 00000000 */ nop /* 1806E8 80251E08 8E820188 */ lw $v0, 0x188($s4) /* 1806EC 80251E0C 30420002 */ andi $v0, $v0, 2 /* 1806F0 80251E10 10400008 */ beqz $v0, .L80251E34 @@ -521,7 +521,7 @@ glabel calc_item_damage_enemy /* 180718 80251E38 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 18071C 80251E3C 30420020 */ andi $v0, $v0, 0x20 /* 180720 80251E40 10400067 */ beqz $v0, .L80251FE0 -/* 180724 80251E44 00000000 */ nop +/* 180724 80251E44 00000000 */ nop /* 180728 80251E48 86820180 */ lh $v0, 0x180($s4) /* 18072C 80251E4C 04400064 */ bltz $v0, .L80251FE0 /* 180730 80251E50 24020020 */ addiu $v0, $zero, 0x20 @@ -669,7 +669,7 @@ glabel calc_item_damage_enemy /* 18093C 8025205C 8E620000 */ lw $v0, ($s3) /* 180940 80252060 30420400 */ andi $v0, $v0, 0x400 /* 180944 80252064 14400015 */ bnez $v0, .L802520BC -/* 180948 80252068 00000000 */ nop +/* 180948 80252068 00000000 */ nop /* 18094C 8025206C 24120039 */ addiu $s2, $zero, 0x39 /* 180950 80252070 0000F02D */ daddu $fp, $zero, $zero /* 180954 80252074 8EC20000 */ lw $v0, ($s6) @@ -696,12 +696,12 @@ glabel calc_item_damage_enemy .L802520C0: /* 1809A0 802520C0 8FA8001C */ lw $t0, 0x1c($sp) /* 1809A4 802520C4 11000006 */ beqz $t0, .L802520E0 -/* 1809A8 802520C8 00000000 */ nop +/* 1809A8 802520C8 00000000 */ nop /* 1809AC 802520CC 3C02800E */ lui $v0, %hi(gBattleStatus) /* 1809B0 802520D0 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1809B4 802520D4 30420240 */ andi $v0, $v0, 0x240 /* 1809B8 802520D8 14400008 */ bnez $v0, .L802520FC -/* 1809BC 802520DC 00000000 */ nop +/* 1809BC 802520DC 00000000 */ nop .L802520E0: /* 1809C0 802520E0 3C03800E */ lui $v1, %hi(gBattleStatus) /* 1809C4 802520E4 8C63C070 */ lw $v1, %lo(gBattleStatus)($v1) @@ -709,11 +709,11 @@ glabel calc_item_damage_enemy /* 1809CC 802520EC 10400027 */ beqz $v0, .L8025218C /* 1809D0 802520F0 30620080 */ andi $v0, $v1, 0x80 /* 1809D4 802520F4 14400025 */ bnez $v0, .L8025218C -/* 1809D8 802520F8 00000000 */ nop +/* 1809D8 802520F8 00000000 */ nop .L802520FC: /* 1809DC 802520FC 86820180 */ lh $v0, 0x180($s4) /* 1809E0 80252100 1840000B */ blez $v0, .L80252130 -/* 1809E4 80252104 00000000 */ nop +/* 1809E4 80252104 00000000 */ nop /* 1809E8 80252108 C6200014 */ lwc1 $f0, 0x14($s1) /* 1809EC 8025210C 24040231 */ addiu $a0, $zero, 0x231 /* 1809F0 80252110 E7A00010 */ swc1 $f0, 0x10($sp) @@ -723,16 +723,16 @@ glabel calc_item_damage_enemy /* 180A00 80252120 0000282D */ daddu $a1, $zero, $zero /* 180A04 80252124 86820180 */ lh $v0, 0x180($s4) /* 180A08 80252128 1C400009 */ bgtz $v0, .L80252150 -/* 180A0C 8025212C 00000000 */ nop +/* 180A0C 8025212C 00000000 */ nop .L80252130: /* 180A10 80252130 8E820188 */ lw $v0, 0x188($s4) /* 180A14 80252134 3C034000 */ lui $v1, 0x4000 /* 180A18 80252138 00431024 */ and $v0, $v0, $v1 /* 180A1C 8025213C 10400013 */ beqz $v0, .L8025218C -/* 180A20 80252140 00000000 */ nop +/* 180A20 80252140 00000000 */ nop /* 180A24 80252144 8FA8001C */ lw $t0, 0x1c($sp) /* 180A28 80252148 11000010 */ beqz $t0, .L8025218C -/* 180A2C 8025214C 00000000 */ nop +/* 180A2C 8025214C 00000000 */ nop .L80252150: /* 180A30 80252150 3C02800E */ lui $v0, %hi(gBattleStatus) /* 180A34 80252154 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) @@ -767,10 +767,10 @@ glabel calc_item_damage_enemy /* 180A98 802521B8 8FA80020 */ lw $t0, 0x20($sp) /* 180A9C 802521BC 24020100 */ addiu $v0, $zero, 0x100 /* 180AA0 802521C0 1502000A */ bne $t0, $v0, .L802521EC -/* 180AA4 802521C4 00000000 */ nop +/* 180AA4 802521C4 00000000 */ nop /* 180AA8 802521C8 86860180 */ lh $a2, 0x180($s4) /* 180AAC 802521CC 18C00007 */ blez $a2, .L802521EC -/* 180AB0 802521D0 00000000 */ nop +/* 180AB0 802521D0 00000000 */ nop /* 180AB4 802521D4 8E020000 */ lw $v0, ($s0) /* 180AB8 802521D8 30420020 */ andi $v0, $v0, 0x20 /* 180ABC 802521DC 10400003 */ beqz $v0, .L802521EC @@ -782,13 +782,13 @@ glabel calc_item_damage_enemy /* 180AD0 802521F0 3C030200 */ lui $v1, 0x200 /* 180AD4 802521F4 00431024 */ and $v0, $v0, $v1 /* 180AD8 802521F8 14400030 */ bnez $v0, .L802522BC -/* 180ADC 802521FC 00000000 */ nop +/* 180ADC 802521FC 00000000 */ nop /* 180AE0 80252200 86870180 */ lh $a3, 0x180($s4) /* 180AE4 80252204 14E00010 */ bnez $a3, .L80252248 -/* 180AE8 80252208 00000000 */ nop +/* 180AE8 80252208 00000000 */ nop /* 180AEC 8025220C 8FA8001C */ lw $t0, 0x1c($sp) /* 180AF0 80252210 1500002A */ bnez $t0, .L802522BC -/* 180AF4 80252214 00000000 */ nop +/* 180AF4 80252214 00000000 */ nop /* 180AF8 80252218 16A00028 */ bnez $s5, .L802522BC /* 180AFC 8025221C 24020001 */ addiu $v0, $zero, 1 /* 180B00 80252220 AFA20010 */ sw $v0, 0x10($sp) @@ -800,7 +800,7 @@ glabel calc_item_damage_enemy /* 180B18 80252238 0C093BF8 */ jal func_8024EFE0 /* 180B1C 8025223C 0000382D */ daddu $a3, $zero, $zero /* 180B20 80252240 080948AF */ j .L802522BC -/* 180B24 80252244 00000000 */ nop +/* 180B24 80252244 00000000 */ nop .L80252248: /* 180B28 80252248 8FA80018 */ lw $t0, 0x18($sp) /* 180B2C 8025224C 1500001B */ bnez $t0, .L802522BC @@ -815,7 +815,7 @@ glabel calc_item_damage_enemy /* 180B50 80252270 0C09996B */ jal show_damage_popup /* 180B54 80252274 8E260014 */ lw $a2, 0x14($s1) /* 180B58 80252278 080948A4 */ j .L80252290 -/* 180B5C 8025227C 00000000 */ nop +/* 180B5C 8025227C 00000000 */ nop .L80252280: /* 180B60 80252280 C62C000C */ lwc1 $f12, 0xc($s1) /* 180B64 80252284 C62E0010 */ lwc1 $f14, 0x10($s1) @@ -825,7 +825,7 @@ glabel calc_item_damage_enemy /* 180B70 80252290 8EE20004 */ lw $v0, 4($s7) /* 180B74 80252294 30420004 */ andi $v0, $v0, 4 /* 180B78 80252298 14400008 */ bnez $v0, .L802522BC -/* 180B7C 8025229C 00000000 */ nop +/* 180B7C 8025229C 00000000 */ nop /* 180B80 802522A0 86820180 */ lh $v0, 0x180($s4) /* 180B84 802522A4 AFA20010 */ sw $v0, 0x10($sp) /* 180B88 802522A8 8E25000C */ lw $a1, 0xc($s1) @@ -836,7 +836,7 @@ glabel calc_item_damage_enemy .L802522BC: /* 180B9C 802522BC 86820180 */ lh $v0, 0x180($s4) /* 180BA0 802522C0 18400022 */ blez $v0, .L8025234C -/* 180BA4 802522C4 00000000 */ nop +/* 180BA4 802522C4 00000000 */ nop /* 180BA8 802522C8 8FA80018 */ lw $t0, 0x18($sp) /* 180BAC 802522CC 1500001D */ bnez $t0, .L80252344 /* 180BB0 802522D0 0260202D */ daddu $a0, $s3, $zero @@ -874,15 +874,15 @@ glabel calc_item_damage_enemy /* 180C20 80252340 86820180 */ lh $v0, 0x180($s4) .L80252344: /* 180C24 80252344 1C400003 */ bgtz $v0, .L80252354 -/* 180C28 80252348 00000000 */ nop +/* 180C28 80252348 00000000 */ nop .L8025234C: /* 180C2C 8025234C 12A00005 */ beqz $s5, .L80252364 -/* 180C30 80252350 00000000 */ nop +/* 180C30 80252350 00000000 */ nop .L80252354: /* 180C34 80252354 8EE20000 */ lw $v0, ($s7) /* 180C38 80252358 30422000 */ andi $v0, $v0, 0x2000 /* 180C3C 8025235C 10400008 */ beqz $v0, .L80252380 -/* 180C40 80252360 00000000 */ nop +/* 180C40 80252360 00000000 */ nop .L80252364: /* 180C44 80252364 C6200014 */ lwc1 $f0, 0x14($s1) /* 180C48 80252368 2404010C */ addiu $a0, $zero, 0x10c @@ -895,9 +895,9 @@ glabel calc_item_damage_enemy /* 180C60 80252380 8E820190 */ lw $v0, 0x190($s4) /* 180C64 80252384 30421000 */ andi $v0, $v0, 0x1000 /* 180C68 80252388 10400018 */ beqz $v0, .L802523EC -/* 180C6C 8025238C 00000000 */ nop +/* 180C6C 8025238C 00000000 */ nop /* 180C70 80252390 12A00016 */ beqz $s5, .L802523EC -/* 180C74 80252394 00000000 */ nop +/* 180C74 80252394 00000000 */ nop /* 180C78 80252398 3C048029 */ lui $a0, %hi(DoSleepHit) /* 180C7C 8025239C 248445E0 */ addiu $a0, $a0, %lo(DoSleepHit) /* 180C80 802523A0 2405000A */ addiu $a1, $zero, 0xa @@ -924,9 +924,9 @@ glabel calc_item_damage_enemy /* 180CD0 802523F0 3C030004 */ lui $v1, 4 /* 180CD4 802523F4 00431024 */ and $v0, $v0, $v1 /* 180CD8 802523F8 10400018 */ beqz $v0, .L8025245C -/* 180CDC 802523FC 00000000 */ nop +/* 180CDC 802523FC 00000000 */ nop /* 180CE0 80252400 12A00016 */ beqz $s5, .L8025245C -/* 180CE4 80252404 00000000 */ nop +/* 180CE4 80252404 00000000 */ nop /* 180CE8 80252408 3C048029 */ lui $a0, %hi(DoDizzyHit) /* 180CEC 8025240C 248445FC */ addiu $a0, $a0, %lo(DoDizzyHit) /* 180CF0 80252410 2405000A */ addiu $a1, $zero, 0xa @@ -953,9 +953,9 @@ glabel calc_item_damage_enemy /* 180D40 80252460 3C030001 */ lui $v1, 1 /* 180D44 80252464 00431024 */ and $v0, $v0, $v1 /* 180D48 80252468 10400018 */ beqz $v0, .L802524CC -/* 180D4C 8025246C 00000000 */ nop +/* 180D4C 8025246C 00000000 */ nop /* 180D50 80252470 12A00016 */ beqz $s5, .L802524CC -/* 180D54 80252474 00000000 */ nop +/* 180D54 80252474 00000000 */ nop /* 180D58 80252478 3C048029 */ lui $a0, %hi(DoParalyzeHit) /* 180D5C 8025247C 24844618 */ addiu $a0, $a0, %lo(DoParalyzeHit) /* 180D60 80252480 2405000A */ addiu $a1, $zero, 0xa @@ -982,9 +982,9 @@ glabel calc_item_damage_enemy /* 180DB0 802524D0 3C030002 */ lui $v1, 2 /* 180DB4 802524D4 00431024 */ and $v0, $v0, $v1 /* 180DB8 802524D8 10400018 */ beqz $v0, .L8025253C -/* 180DBC 802524DC 00000000 */ nop +/* 180DBC 802524DC 00000000 */ nop /* 180DC0 802524E0 12A00016 */ beqz $s5, .L8025253C -/* 180DC4 802524E4 00000000 */ nop +/* 180DC4 802524E4 00000000 */ nop /* 180DC8 802524E8 3C048029 */ lui $a0, %hi(DoPoisonHit) /* 180DCC 802524EC 24844634 */ addiu $a0, $a0, %lo(DoPoisonHit) /* 180DD0 802524F0 2405000A */ addiu $a1, $zero, 0xa @@ -1011,9 +1011,9 @@ glabel calc_item_damage_enemy /* 180E20 80252540 3C030020 */ lui $v1, 0x20 /* 180E24 80252544 00431024 */ and $v0, $v0, $v1 /* 180E28 80252548 10400018 */ beqz $v0, .L802525AC -/* 180E2C 8025254C 00000000 */ nop +/* 180E2C 8025254C 00000000 */ nop /* 180E30 80252550 12A00016 */ beqz $s5, .L802525AC -/* 180E34 80252554 00000000 */ nop +/* 180E34 80252554 00000000 */ nop /* 180E38 80252558 3C048029 */ lui $a0, %hi(DoStopHit) /* 180E3C 8025255C 24844650 */ addiu $a0, $a0, %lo(DoStopHit) /* 180E40 80252560 2405000A */ addiu $a1, $zero, 0xa @@ -1039,9 +1039,9 @@ glabel calc_item_damage_enemy /* 180E8C 802525AC 8E820190 */ lw $v0, 0x190($s4) /* 180E90 802525B0 30424000 */ andi $v0, $v0, 0x4000 /* 180E94 802525B4 10400019 */ beqz $v0, .L8025261C -/* 180E98 802525B8 00000000 */ nop +/* 180E98 802525B8 00000000 */ nop /* 180E9C 802525BC 12A00017 */ beqz $s5, .L8025261C -/* 180EA0 802525C0 00000000 */ nop +/* 180EA0 802525C0 00000000 */ nop /* 180EA4 802525C4 3C048029 */ lui $a0, %hi(DoFreezeHit) /* 180EA8 802525C8 2484466C */ addiu $a0, $a0, %lo(DoFreezeHit) /* 180EAC 802525CC 2405000A */ addiu $a1, $zero, 0xa @@ -1069,9 +1069,9 @@ glabel calc_item_damage_enemy /* 180F00 80252620 3C030008 */ lui $v1, 8 /* 180F04 80252624 00431024 */ and $v0, $v0, $v1 /* 180F08 80252628 10400019 */ beqz $v0, .L80252690 -/* 180F0C 8025262C 00000000 */ nop +/* 180F0C 8025262C 00000000 */ nop /* 180F10 80252630 12A00017 */ beqz $s5, .L80252690 -/* 180F14 80252634 00000000 */ nop +/* 180F14 80252634 00000000 */ nop /* 180F18 80252638 3C048029 */ lui $a0, %hi(DoShinkHit) /* 180F1C 8025263C 248446B8 */ addiu $a0, $a0, %lo(DoShinkHit) /* 180F20 80252640 2405000A */ addiu $a1, $zero, 0xa diff --git a/asm/nonmatchings/code_181810/EndActorSpeech.s b/asm/nonmatchings/code_181810/EndActorSpeech.s index 722d351baf..59ad1f59ea 100644 --- a/asm/nonmatchings/code_181810/EndActorSpeech.s +++ b/asm/nonmatchings/code_181810/EndActorSpeech.s @@ -33,7 +33,7 @@ glabel EndActorSpeech /* 181C20 80253340 AC22FA70 */ sw $v0, %lo(gSpeakingActorIdleAnim)($at) /* 181C24 80253344 2402FF81 */ addiu $v0, $zero, -0x7f /* 181C28 80253348 16220002 */ bne $s1, $v0, .L80253354 -/* 181C2C 8025334C 00000000 */ nop +/* 181C2C 8025334C 00000000 */ nop /* 181C30 80253350 8E510148 */ lw $s1, 0x148($s2) .L80253354: /* 181C34 80253354 0C09A75B */ jal get_actor @@ -49,7 +49,7 @@ glabel EndActorSpeech /* 181C5C 8025337C 3C01802A */ lui $at, %hi(gSpeakingActorPart) /* 181C60 80253380 AC22FA78 */ sw $v0, %lo(gSpeakingActorPart)($at) /* 181C64 80253384 0C04971C */ jal close_message -/* 181C68 80253388 00000000 */ nop +/* 181C68 80253388 00000000 */ nop /* 181C6C 8025338C 0C03A6D5 */ jal increment_status_menu_disabled /* 181C70 80253390 AE400070 */ sw $zero, 0x70($s2) .L80253394: @@ -63,7 +63,7 @@ glabel EndActorSpeech /* 181C90 802533B0 86220150 */ lh $v0, 0x150($s1) /* 181C94 802533B4 C6200144 */ lwc1 $f0, 0x144($s1) /* 181C98 802533B8 44821000 */ mtc1 $v0, $f2 -/* 181C9C 802533BC 00000000 */ nop +/* 181C9C 802533BC 00000000 */ nop /* 181CA0 802533C0 468010A0 */ cvt.s.w $f2, $f2 /* 181CA4 802533C4 8E220000 */ lw $v0, ($s1) /* 181CA8 802533C8 30428000 */ andi $v0, $v0, 0x8000 @@ -72,12 +72,12 @@ glabel EndActorSpeech /* 181CB4 802533D4 86220152 */ lh $v0, 0x152($s1) /* 181CB8 802533D8 C6200148 */ lwc1 $f0, 0x148($s1) /* 181CBC 802533DC 44821000 */ mtc1 $v0, $f2 -/* 181CC0 802533E0 00000000 */ nop +/* 181CC0 802533E0 00000000 */ nop /* 181CC4 802533E4 468010A0 */ cvt.s.w $f2, $f2 /* 181CC8 802533E8 92220191 */ lbu $v0, 0x191($s1) /* 181CCC 802533EC 46020000 */ add.s $f0, $f0, $f2 /* 181CD0 802533F0 44821000 */ mtc1 $v0, $f2 -/* 181CD4 802533F4 00000000 */ nop +/* 181CD4 802533F4 00000000 */ nop /* 181CD8 802533F8 468010A0 */ cvt.s.w $f2, $f2 /* 181CDC 802533FC 08094D0D */ j .L80253434 /* 181CE0 80253400 46001000 */ add.s $f0, $f2, $f0 @@ -85,13 +85,13 @@ glabel EndActorSpeech /* 181CE4 80253404 86220152 */ lh $v0, 0x152($s1) /* 181CE8 80253408 C6220148 */ lwc1 $f2, 0x148($s1) /* 181CEC 8025340C 44820000 */ mtc1 $v0, $f0 -/* 181CF0 80253410 00000000 */ nop +/* 181CF0 80253410 00000000 */ nop /* 181CF4 80253414 46800020 */ cvt.s.w $f0, $f0 /* 181CF8 80253418 92220191 */ lbu $v0, 0x191($s1) /* 181CFC 8025341C 46001080 */ add.s $f2, $f2, $f0 /* 181D00 80253420 00021042 */ srl $v0, $v0, 1 /* 181D04 80253424 44820000 */ mtc1 $v0, $f0 -/* 181D08 80253428 00000000 */ nop +/* 181D08 80253428 00000000 */ nop /* 181D0C 8025342C 46800020 */ cvt.s.w $f0, $f0 /* 181D10 80253430 46001000 */ add.s $f0, $f2, $f0 .L80253434: @@ -103,7 +103,7 @@ glabel EndActorSpeech /* 181D28 80253448 27A20020 */ addiu $v0, $sp, 0x20 /* 181D2C 8025344C AFA20010 */ sw $v0, 0x10($sp) /* 181D30 80253450 44830000 */ mtc1 $v1, $f0 -/* 181D34 80253454 00000000 */ nop +/* 181D34 80253454 00000000 */ nop /* 181D38 80253458 46800020 */ cvt.s.w $f0, $f0 /* 181D3C 8025345C 46001080 */ add.s $f2, $f2, $f0 /* 181D40 80253460 27A20024 */ addiu $v0, $sp, 0x24 @@ -124,16 +124,16 @@ glabel EndActorSpeech /* 181D7C 8025349C 10400005 */ beqz $v0, .L802534B4 /* 181D80 802534A0 30620080 */ andi $v0, $v1, 0x80 /* 181D84 802534A4 0C03A6CC */ jal decrement_status_menu_disabled -/* 181D88 802534A8 00000000 */ nop +/* 181D88 802534A8 00000000 */ nop /* 181D8C 802534AC 08094D47 */ j .L8025351C /* 181D90 802534B0 24020001 */ addiu $v0, $zero, 1 .L802534B4: /* 181D94 802534B4 10400005 */ beqz $v0, .L802534CC -/* 181D98 802534B8 00000000 */ nop +/* 181D98 802534B8 00000000 */ nop /* 181D9C 802534BC 3C06802A */ lui $a2, %hi(gSpeakingActorTalkAnim) /* 181DA0 802534C0 8CC6FA6C */ lw $a2, %lo(gSpeakingActorTalkAnim)($a2) /* 181DA4 802534C4 08094D35 */ j .L802534D4 -/* 181DA8 802534C8 00000000 */ nop +/* 181DA8 802534C8 00000000 */ nop .L802534CC: /* 181DAC 802534CC 3C06802A */ lui $a2, %hi(gSpeakingActorIdleAnim) /* 181DB0 802534D0 8CC6FA70 */ lw $a2, %lo(gSpeakingActorIdleAnim)($a2) @@ -149,7 +149,7 @@ glabel EndActorSpeech /* 181DD0 802534F0 1462000A */ bne $v1, $v0, .L8025351C /* 181DD4 802534F4 0000102D */ daddu $v0, $zero, $zero /* 181DD8 802534F8 0C03A6CC */ jal decrement_status_menu_disabled -/* 181DDC 802534FC 00000000 */ nop +/* 181DDC 802534FC 00000000 */ nop /* 181DE0 80253500 24020001 */ addiu $v0, $zero, 1 /* 181DE4 80253504 3C03800A */ lui $v1, %hi(D_8009A650) /* 181DE8 80253508 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) diff --git a/asm/nonmatchings/code_181810/LoadBattleDmaData.s b/asm/nonmatchings/code_181810/LoadBattleDmaData.s index 1c9b45d80a..a4cf4927a4 100644 --- a/asm/nonmatchings/code_181810/LoadBattleDmaData.s +++ b/asm/nonmatchings/code_181810/LoadBattleDmaData.s @@ -22,7 +22,7 @@ glabel LoadBattleDmaData /* 181F48 80253668 3C068028 */ lui $a2, %hi(gBattleDmaDest) /* 181F4C 8025366C 8CC64000 */ lw $a2, %lo(gBattleDmaDest)($a2) /* 181F50 80253670 14C00005 */ bnez $a2, .L80253688 -/* 181F54 80253674 00000000 */ nop +/* 181F54 80253674 00000000 */ nop /* 181F58 80253678 8C440000 */ lw $a0, ($v0) /* 181F5C 8025367C 8C450004 */ lw $a1, 4($v0) /* 181F60 80253680 08094DA4 */ j .L80253690 @@ -32,7 +32,7 @@ glabel LoadBattleDmaData /* 181F6C 8025368C 8C450004 */ lw $a1, 4($v0) .L80253690: /* 181F70 80253690 0C00A5CF */ jal dma_copy -/* 181F74 80253694 00000000 */ nop +/* 181F74 80253694 00000000 */ nop /* 181F78 80253698 24020002 */ addiu $v0, $zero, 2 .L8025369C: /* 181F7C 8025369C 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_181810/load_tattle_flags.s b/asm/nonmatchings/code_181810/load_tattle_flags.s index 58446ac6de..c4b7ba2f38 100644 --- a/asm/nonmatchings/code_181810/load_tattle_flags.s +++ b/asm/nonmatchings/code_181810/load_tattle_flags.s @@ -20,7 +20,7 @@ glabel load_tattle_flags .L80253EB4: /* 182794 80253EB4 8CA40000 */ lw $a0, ($a1) /* 182798 80253EB8 10800025 */ beqz $a0, .L80253F50 -/* 18279C 80253EBC 00000000 */ nop +/* 18279C 80253EBC 00000000 */ nop /* 1827A0 80253EC0 90820000 */ lbu $v0, ($a0) /* 1827A4 80253EC4 10460020 */ beq $v0, $a2, .L80253F48 /* 1827A8 80253EC8 0080182D */ daddu $v1, $a0, $zero @@ -52,13 +52,13 @@ glabel load_tattle_flags /* 182804 80253F24 A2020440 */ sb $v0, 0x440($s0) /* 182808 80253F28 92220000 */ lbu $v0, ($s1) /* 18280C 80253F2C 10530017 */ beq $v0, $s3, .L80253F8C -/* 182810 80253F30 00000000 */ nop +/* 182810 80253F30 00000000 */ nop /* 182814 80253F34 08094FBA */ j .L80253EE8 -/* 182818 80253F38 00000000 */ nop +/* 182818 80253F38 00000000 */ nop .L80253F3C: /* 18281C 80253F3C 90620000 */ lbu $v0, ($v1) /* 182820 80253F40 1446FFE2 */ bne $v0, $a2, .L80253ECC -/* 182824 80253F44 00000000 */ nop +/* 182824 80253F44 00000000 */ nop .L80253F48: /* 182828 80253F48 08094FAD */ j .L80253EB4 /* 18282C 80253F4C 24A50004 */ addiu $a1, $a1, 4 diff --git a/asm/nonmatchings/code_181810/save_tattle_flags.s b/asm/nonmatchings/code_181810/save_tattle_flags.s index 137def100f..7d97c5b98a 100644 --- a/asm/nonmatchings/code_181810/save_tattle_flags.s +++ b/asm/nonmatchings/code_181810/save_tattle_flags.s @@ -22,7 +22,7 @@ glabel save_tattle_flags .L80253D54: /* 182634 80253D54 8CA40000 */ lw $a0, ($a1) /* 182638 80253D58 10800029 */ beqz $a0, .L80253E00 -/* 18263C 80253D5C 00000000 */ nop +/* 18263C 80253D5C 00000000 */ nop /* 182640 80253D60 90820000 */ lbu $v0, ($a0) /* 182644 80253D64 10460024 */ beq $v0, $a2, .L80253DF8 /* 182648 80253D68 0080182D */ daddu $v1, $a0, $zero @@ -58,13 +58,13 @@ glabel save_tattle_flags /* 1826B4 80253DD4 A2020440 */ sb $v0, 0x440($s0) /* 1826B8 80253DD8 92620000 */ lbu $v0, ($s3) /* 1826BC 80253DDC 1055001B */ beq $v0, $s5, .L80253E4C -/* 1826C0 80253DE0 00000000 */ nop +/* 1826C0 80253DE0 00000000 */ nop /* 1826C4 80253DE4 08094F62 */ j .L80253D88 -/* 1826C8 80253DE8 00000000 */ nop +/* 1826C8 80253DE8 00000000 */ nop .L80253DEC: /* 1826CC 80253DEC 90620000 */ lbu $v0, ($v1) /* 1826D0 80253DF0 1446FFDE */ bne $v0, $a2, .L80253D6C -/* 1826D4 80253DF4 00000000 */ nop +/* 1826D4 80253DF4 00000000 */ nop .L80253DF8: /* 1826D8 80253DF8 08094F55 */ j .L80253D54 /* 1826DC 80253DFC 24A50004 */ addiu $a1, $a1, 4 diff --git a/asm/nonmatchings/code_182B30/_remove_part_decoration.s b/asm/nonmatchings/code_182B30/_remove_part_decoration.s index 04eff44610..e5fa464cc9 100644 --- a/asm/nonmatchings/code_182B30/_remove_part_decoration.s +++ b/asm/nonmatchings/code_182B30/_remove_part_decoration.s @@ -13,55 +13,67 @@ glabel _remove_part_decoration /* 18B93C 8025D05C 2C62000C */ sltiu $v0, $v1, 0xc /* 18B940 8025D060 10400034 */ beqz $v0, .L8025D134 /* 18B944 8025D064 00031080 */ sll $v0, $v1, 2 -/* 18B948 8025D068 3C01802A */ lui $at, %hi(D_8029D4B8) +/* 18B948 8025D068 3C01802A */ lui $at, %hi(jtbl_8029D4B8_1CBD98) /* 18B94C 8025D06C 00220821 */ addu $at, $at, $v0 -/* 18B950 8025D070 8C22D4B8 */ lw $v0, %lo(D_8029D4B8)($at) +/* 18B950 8025D070 8C22D4B8 */ lw $v0, %lo(jtbl_8029D4B8_1CBD98)($at) /* 18B954 8025D074 00400008 */ jr $v0 -/* 18B958 8025D078 00000000 */ nop +/* 18B958 8025D078 00000000 */ nop +glabel L8025D07C_18B95C /* 18B95C 8025D07C 0C097456 */ jal func_8025D158 /* 18B960 8025D080 0200282D */ daddu $a1, $s0, $zero /* 18B964 8025D084 0809744E */ j .L8025D138 /* 18B968 8025D088 02301021 */ addu $v0, $s1, $s0 +glabel L8025D08C_18B96C /* 18B96C 8025D08C 0C0974A4 */ jal func_8025D290 /* 18B970 8025D090 0200282D */ daddu $a1, $s0, $zero /* 18B974 8025D094 0809744E */ j .L8025D138 /* 18B978 8025D098 02301021 */ addu $v0, $s1, $s0 +glabel L8025D09C_18B97C /* 18B97C 8025D09C 0C0974F1 */ jal func_8025D3C4 /* 18B980 8025D0A0 0200282D */ daddu $a1, $s0, $zero /* 18B984 8025D0A4 0809744E */ j .L8025D138 /* 18B988 8025D0A8 02301021 */ addu $v0, $s1, $s0 +glabel L8025D0AC_18B98C /* 18B98C 8025D0AC 0C097528 */ jal func_8025D4A0 /* 18B990 8025D0B0 0200282D */ daddu $a1, $s0, $zero /* 18B994 8025D0B4 0809744E */ j .L8025D138 /* 18B998 8025D0B8 02301021 */ addu $v0, $s1, $s0 +glabel L8025D0BC_18B99C /* 18B99C 8025D0BC 0C097588 */ jal func_8025D620 /* 18B9A0 8025D0C0 0200282D */ daddu $a1, $s0, $zero /* 18B9A4 8025D0C4 0809744E */ j .L8025D138 /* 18B9A8 8025D0C8 02301021 */ addu $v0, $s1, $s0 +glabel L8025D0CC_18B9AC /* 18B9AC 8025D0CC 0C0975BF */ jal func_8025D6FC /* 18B9B0 8025D0D0 0200282D */ daddu $a1, $s0, $zero /* 18B9B4 8025D0D4 0809744E */ j .L8025D138 /* 18B9B8 8025D0D8 02301021 */ addu $v0, $s1, $s0 +glabel L8025D0DC_18B9BC /* 18B9BC 8025D0DC 0C097604 */ jal func_8025D810 /* 18B9C0 8025D0E0 0200282D */ daddu $a1, $s0, $zero /* 18B9C4 8025D0E4 0809744E */ j .L8025D138 /* 18B9C8 8025D0E8 02301021 */ addu $v0, $s1, $s0 +glabel L8025D0EC_18B9CC /* 18B9CC 8025D0EC 0C09763B */ jal func_8025D8EC /* 18B9D0 8025D0F0 0200282D */ daddu $a1, $s0, $zero /* 18B9D4 8025D0F4 0809744E */ j .L8025D138 /* 18B9D8 8025D0F8 02301021 */ addu $v0, $s1, $s0 +glabel L8025D0FC_18B9DC /* 18B9DC 8025D0FC 0C097698 */ jal func_8025DA60 /* 18B9E0 8025D100 0200282D */ daddu $a1, $s0, $zero /* 18B9E4 8025D104 0809744E */ j .L8025D138 /* 18B9E8 8025D108 02301021 */ addu $v0, $s1, $s0 +glabel L8025D10C_18B9EC /* 18B9EC 8025D10C 0C0976F2 */ jal func_8025DBC8 /* 18B9F0 8025D110 0200282D */ daddu $a1, $s0, $zero /* 18B9F4 8025D114 0809744E */ j .L8025D138 /* 18B9F8 8025D118 02301021 */ addu $v0, $s1, $s0 +glabel L8025D11C_18B9FC /* 18B9FC 8025D11C 0C097750 */ jal func_8025DD40 /* 18BA00 8025D120 0200282D */ daddu $a1, $s0, $zero /* 18BA04 8025D124 0809744E */ j .L8025D138 /* 18BA08 8025D128 02301021 */ addu $v0, $s1, $s0 +glabel L8025D12C_18BA0C /* 18BA0C 8025D12C 0C0977A2 */ jal func_8025DE88 /* 18BA10 8025D130 0200282D */ daddu $a1, $s0, $zero .L8025D134: diff --git a/asm/nonmatchings/code_182B30/disable_actor_blur.s b/asm/nonmatchings/code_182B30/disable_actor_blur.s index 546d0a6268..7ab34c05be 100644 --- a/asm/nonmatchings/code_182B30/disable_actor_blur.s +++ b/asm/nonmatchings/code_182B30/disable_actor_blur.s @@ -5,11 +5,11 @@ glabel disable_actor_blur /* 182E3C 8025455C 8C8301F4 */ lw $v1, 0x1f4($a0) /* 182E40 80254560 8C620094 */ lw $v0, 0x94($v1) /* 182E44 80254564 1040000F */ beqz $v0, .L802545A4 -/* 182E48 80254568 00000000 */ nop +/* 182E48 80254568 00000000 */ nop /* 182E4C 8025456C 8C620000 */ lw $v0, ($v1) /* 182E50 80254570 30420002 */ andi $v0, $v0, 2 /* 182E54 80254574 1440000B */ bnez $v0, .L802545A4 -/* 182E58 80254578 00000000 */ nop +/* 182E58 80254578 00000000 */ nop /* 182E5C 8025457C 8C6400C0 */ lw $a0, 0xc0($v1) /* 182E60 80254580 808207DB */ lb $v0, 0x7db($a0) /* 182E64 80254584 908307DB */ lbu $v1, 0x7db($a0) @@ -22,4 +22,4 @@ glabel disable_actor_blur /* 182E80 802545A0 A08208AC */ sb $v0, 0x8ac($a0) .L802545A4: /* 182E84 802545A4 03E00008 */ jr $ra -/* 182E88 802545A8 00000000 */ nop +/* 182E88 802545A8 00000000 */ nop diff --git a/asm/nonmatchings/code_182B30/disable_partner_blur.s b/asm/nonmatchings/code_182B30/disable_partner_blur.s index 9554234bfa..38079dd9b5 100644 --- a/asm/nonmatchings/code_182B30/disable_partner_blur.s +++ b/asm/nonmatchings/code_182B30/disable_partner_blur.s @@ -7,7 +7,7 @@ glabel disable_partner_blur /* 182F50 80254670 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 182F54 80254674 AFBF0010 */ sw $ra, 0x10($sp) /* 182F58 80254678 0C095157 */ jal disable_actor_blur -/* 182F5C 8025467C 00000000 */ nop +/* 182F5C 8025467C 00000000 */ nop /* 182F60 80254680 8FBF0010 */ lw $ra, 0x10($sp) /* 182F64 80254684 03E00008 */ jr $ra /* 182F68 80254688 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_182B30/disable_player_blur.s b/asm/nonmatchings/code_182B30/disable_player_blur.s index d41964a3ab..2c3a68d918 100644 --- a/asm/nonmatchings/code_182B30/disable_player_blur.s +++ b/asm/nonmatchings/code_182B30/disable_player_blur.s @@ -17,4 +17,4 @@ glabel disable_player_blur /* 183224 80254944 A08208AC */ sb $v0, 0x8ac($a0) .L80254948: /* 183228 80254948 03E00008 */ jr $ra -/* 18322C 8025494C 00000000 */ nop +/* 18322C 8025494C 00000000 */ nop diff --git a/asm/nonmatchings/code_182B30/enable_actor_blur.s b/asm/nonmatchings/code_182B30/enable_actor_blur.s index 7c3c9b52a5..e4a2ad5e32 100644 --- a/asm/nonmatchings/code_182B30/enable_actor_blur.s +++ b/asm/nonmatchings/code_182B30/enable_actor_blur.s @@ -37,11 +37,11 @@ glabel enable_actor_blur .L8025434C: /* 182C2C 8025434C 8E420094 */ lw $v0, 0x94($s2) /* 182C30 80254350 10400070 */ beqz $v0, .L80254514 -/* 182C34 80254354 00000000 */ nop +/* 182C34 80254354 00000000 */ nop /* 182C38 80254358 8E420000 */ lw $v0, ($s2) /* 182C3C 8025435C 30420002 */ andi $v0, $v0, 2 /* 182C40 80254360 1440006C */ bnez $v0, .L80254514 -/* 182C44 80254364 00000000 */ nop +/* 182C44 80254364 00000000 */ nop /* 182C48 80254368 8E4300C0 */ lw $v1, 0xc0($s2) /* 182C4C 8025436C 0000A02D */ daddu $s4, $zero, $zero /* 182C50 80254370 0060802D */ daddu $s0, $v1, $zero @@ -52,51 +52,51 @@ glabel enable_actor_blur /* 182C60 80254380 C6400058 */ lwc1 $f0, 0x58($s2) /* 182C64 80254384 4600010D */ trunc.w.s $f4, $f0 /* 182C68 80254388 44022000 */ mfc1 $v0, $f4 -/* 182C6C 8025438C 00000000 */ nop +/* 182C6C 8025438C 00000000 */ nop /* 182C70 80254390 A60207FC */ sh $v0, 0x7fc($s0) /* 182C74 80254394 C640005C */ lwc1 $f0, 0x5c($s2) /* 182C78 80254398 4600010D */ trunc.w.s $f4, $f0 /* 182C7C 8025439C 44022000 */ mfc1 $v0, $f4 -/* 182C80 802543A0 00000000 */ nop +/* 182C80 802543A0 00000000 */ nop /* 182C84 802543A4 A602081C */ sh $v0, 0x81c($s0) /* 182C88 802543A8 C6400060 */ lwc1 $f0, 0x60($s2) /* 182C8C 802543AC 4600010D */ trunc.w.s $f4, $f0 /* 182C90 802543B0 44022000 */ mfc1 $v0, $f4 -/* 182C94 802543B4 00000000 */ nop +/* 182C94 802543B4 00000000 */ nop /* 182C98 802543B8 A602083C */ sh $v0, 0x83c($s0) /* 182C9C 802543BC C660018C */ lwc1 $f0, 0x18c($s3) /* 182CA0 802543C0 4600010D */ trunc.w.s $f4, $f0 /* 182CA4 802543C4 44022000 */ mfc1 $v0, $f4 -/* 182CA8 802543C8 00000000 */ nop +/* 182CA8 802543C8 00000000 */ nop /* 182CAC 802543CC A60207DC */ sh $v0, 0x7dc($s0) /* 182CB0 802543D0 86620168 */ lh $v0, 0x168($s3) /* 182CB4 802543D4 C6620188 */ lwc1 $f2, 0x188($s3) /* 182CB8 802543D8 44820000 */ mtc1 $v0, $f0 -/* 182CBC 802543DC 00000000 */ nop +/* 182CBC 802543DC 00000000 */ nop /* 182CC0 802543E0 46800020 */ cvt.s.w $f0, $f0 /* 182CC4 802543E4 46020002 */ mul.s $f0, $f0, $f2 -/* 182CC8 802543E8 00000000 */ nop +/* 182CC8 802543E8 00000000 */ nop /* 182CCC 802543EC 4600010D */ trunc.w.s $f4, $f0 /* 182CD0 802543F0 44022000 */ mfc1 $v0, $f4 -/* 182CD4 802543F4 00000000 */ nop +/* 182CD4 802543F4 00000000 */ nop /* 182CD8 802543F8 A222085C */ sb $v0, 0x85c($s1) /* 182CDC 802543FC 8662016A */ lh $v0, 0x16a($s3) /* 182CE0 80254400 C6620188 */ lwc1 $f2, 0x188($s3) /* 182CE4 80254404 44820000 */ mtc1 $v0, $f0 -/* 182CE8 80254408 00000000 */ nop +/* 182CE8 80254408 00000000 */ nop /* 182CEC 8025440C 46800020 */ cvt.s.w $f0, $f0 /* 182CF0 80254410 46020002 */ mul.s $f0, $f0, $f2 -/* 182CF4 80254414 00000000 */ nop +/* 182CF4 80254414 00000000 */ nop /* 182CF8 80254418 4600010D */ trunc.w.s $f4, $f0 /* 182CFC 8025441C 44022000 */ mfc1 $v0, $f4 -/* 182D00 80254420 00000000 */ nop +/* 182D00 80254420 00000000 */ nop /* 182D04 80254424 A222086C */ sb $v0, 0x86c($s1) /* 182D08 80254428 0C00A6C9 */ jal clamp_angle /* 182D0C 8025442C C66C015C */ lwc1 $f12, 0x15c($s3) /* 182D10 80254430 46160002 */ mul.s $f0, $f0, $f22 -/* 182D14 80254434 00000000 */ nop +/* 182D14 80254434 00000000 */ nop /* 182D18 80254438 4600A03E */ c.le.s $f20, $f0 -/* 182D1C 8025443C 00000000 */ nop +/* 182D1C 8025443C 00000000 */ nop /* 182D20 80254440 45010005 */ bc1t .L80254458 /* 182D24 80254444 2623087C */ addiu $v1, $s1, 0x87c /* 182D28 80254448 4600010D */ trunc.w.s $f4, $f0 @@ -107,16 +107,16 @@ glabel enable_actor_blur /* 182D38 80254458 46140001 */ sub.s $f0, $f0, $f20 /* 182D3C 8025445C 4600010D */ trunc.w.s $f4, $f0 /* 182D40 80254460 44022000 */ mfc1 $v0, $f4 -/* 182D44 80254464 00000000 */ nop +/* 182D44 80254464 00000000 */ nop /* 182D48 80254468 00561025 */ or $v0, $v0, $s6 /* 182D4C 8025446C A0620000 */ sb $v0, ($v1) .L80254470: /* 182D50 80254470 0C00A6C9 */ jal clamp_angle /* 182D54 80254474 C66C0160 */ lwc1 $f12, 0x160($s3) /* 182D58 80254478 46160002 */ mul.s $f0, $f0, $f22 -/* 182D5C 8025447C 00000000 */ nop +/* 182D5C 8025447C 00000000 */ nop /* 182D60 80254480 4600A03E */ c.le.s $f20, $f0 -/* 182D64 80254484 00000000 */ nop +/* 182D64 80254484 00000000 */ nop /* 182D68 80254488 45010005 */ bc1t .L802544A0 /* 182D6C 8025448C 2623088C */ addiu $v1, $s1, 0x88c /* 182D70 80254490 4600010D */ trunc.w.s $f4, $f0 @@ -127,16 +127,16 @@ glabel enable_actor_blur /* 182D80 802544A0 46140001 */ sub.s $f0, $f0, $f20 /* 182D84 802544A4 4600010D */ trunc.w.s $f4, $f0 /* 182D88 802544A8 44022000 */ mfc1 $v0, $f4 -/* 182D8C 802544AC 00000000 */ nop +/* 182D8C 802544AC 00000000 */ nop /* 182D90 802544B0 00561025 */ or $v0, $v0, $s6 /* 182D94 802544B4 A0620000 */ sb $v0, ($v1) .L802544B8: /* 182D98 802544B8 0C00A6C9 */ jal clamp_angle /* 182D9C 802544BC C66C0164 */ lwc1 $f12, 0x164($s3) /* 182DA0 802544C0 46160002 */ mul.s $f0, $f0, $f22 -/* 182DA4 802544C4 00000000 */ nop +/* 182DA4 802544C4 00000000 */ nop /* 182DA8 802544C8 4600A03E */ c.le.s $f20, $f0 -/* 182DAC 802544CC 00000000 */ nop +/* 182DAC 802544CC 00000000 */ nop /* 182DB0 802544D0 45010005 */ bc1t .L802544E8 /* 182DB4 802544D4 2623089C */ addiu $v1, $s1, 0x89c /* 182DB8 802544D8 4600010D */ trunc.w.s $f4, $f0 @@ -147,7 +147,7 @@ glabel enable_actor_blur /* 182DC8 802544E8 46140001 */ sub.s $f0, $f0, $f20 /* 182DCC 802544EC 4600010D */ trunc.w.s $f4, $f0 /* 182DD0 802544F0 44022000 */ mfc1 $v0, $f4 -/* 182DD4 802544F4 00000000 */ nop +/* 182DD4 802544F4 00000000 */ nop /* 182DD8 802544F8 00561025 */ or $v0, $v0, $s6 /* 182DDC 802544FC A0620000 */ sb $v0, ($v1) .L80254500: @@ -161,7 +161,7 @@ glabel enable_actor_blur /* 182DF8 80254518 26B50001 */ addiu $s5, $s5, 1 /* 182DFC 8025451C 02B7102A */ slt $v0, $s5, $s7 /* 182E00 80254520 1440FF8A */ bnez $v0, .L8025434C -/* 182E04 80254524 00000000 */ nop +/* 182E04 80254524 00000000 */ nop .L80254528: /* 182E08 80254528 8FBF0030 */ lw $ra, 0x30($sp) /* 182E0C 8025452C 8FB7002C */ lw $s7, 0x2c($sp) diff --git a/asm/nonmatchings/code_182B30/enable_partner_blur.s b/asm/nonmatchings/code_182B30/enable_partner_blur.s index aad7dfd4f9..532e8411ae 100644 --- a/asm/nonmatchings/code_182B30/enable_partner_blur.s +++ b/asm/nonmatchings/code_182B30/enable_partner_blur.s @@ -7,7 +7,7 @@ glabel enable_partner_blur /* 182F2C 8025464C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 182F30 80254650 AFBF0010 */ sw $ra, 0x10($sp) /* 182F34 80254654 0C0950B3 */ jal enable_actor_blur -/* 182F38 80254658 00000000 */ nop +/* 182F38 80254658 00000000 */ nop /* 182F3C 8025465C 8FBF0010 */ lw $ra, 0x10($sp) /* 182F40 80254660 03E00008 */ jr $ra /* 182F44 80254664 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_182B30/enable_player_blur.s b/asm/nonmatchings/code_182B30/enable_player_blur.s index 50fbb76ab4..1d9f0656cc 100644 --- a/asm/nonmatchings/code_182B30/enable_player_blur.s +++ b/asm/nonmatchings/code_182B30/enable_player_blur.s @@ -38,51 +38,51 @@ glabel enable_player_blur /* 183034 80254754 C6600058 */ lwc1 $f0, 0x58($s3) /* 183038 80254758 4600010D */ trunc.w.s $f4, $f0 /* 18303C 8025475C 44022000 */ mfc1 $v0, $f4 -/* 183040 80254760 00000000 */ nop +/* 183040 80254760 00000000 */ nop /* 183044 80254764 A60207FC */ sh $v0, 0x7fc($s0) /* 183048 80254768 C660005C */ lwc1 $f0, 0x5c($s3) /* 18304C 8025476C 4600010D */ trunc.w.s $f4, $f0 /* 183050 80254770 44022000 */ mfc1 $v0, $f4 -/* 183054 80254774 00000000 */ nop +/* 183054 80254774 00000000 */ nop /* 183058 80254778 A602081C */ sh $v0, 0x81c($s0) /* 18305C 8025477C C6600060 */ lwc1 $f0, 0x60($s3) /* 183060 80254780 4600010D */ trunc.w.s $f4, $f0 /* 183064 80254784 44022000 */ mfc1 $v0, $f4 -/* 183068 80254788 00000000 */ nop +/* 183068 80254788 00000000 */ nop /* 18306C 8025478C A602083C */ sh $v0, 0x83c($s0) /* 183070 80254790 C620018C */ lwc1 $f0, 0x18c($s1) /* 183074 80254794 4600010D */ trunc.w.s $f4, $f0 /* 183078 80254798 44022000 */ mfc1 $v0, $f4 -/* 18307C 8025479C 00000000 */ nop +/* 18307C 8025479C 00000000 */ nop /* 183080 802547A0 A60207DC */ sh $v0, 0x7dc($s0) /* 183084 802547A4 86220168 */ lh $v0, 0x168($s1) /* 183088 802547A8 C6220188 */ lwc1 $f2, 0x188($s1) /* 18308C 802547AC 44820000 */ mtc1 $v0, $f0 -/* 183090 802547B0 00000000 */ nop +/* 183090 802547B0 00000000 */ nop /* 183094 802547B4 46800020 */ cvt.s.w $f0, $f0 /* 183098 802547B8 46020002 */ mul.s $f0, $f0, $f2 -/* 18309C 802547BC 00000000 */ nop +/* 18309C 802547BC 00000000 */ nop /* 1830A0 802547C0 4600010D */ trunc.w.s $f4, $f0 /* 1830A4 802547C4 44022000 */ mfc1 $v0, $f4 -/* 1830A8 802547C8 00000000 */ nop +/* 1830A8 802547C8 00000000 */ nop /* 1830AC 802547CC A242085C */ sb $v0, 0x85c($s2) /* 1830B0 802547D0 8622016A */ lh $v0, 0x16a($s1) /* 1830B4 802547D4 C6220188 */ lwc1 $f2, 0x188($s1) /* 1830B8 802547D8 44820000 */ mtc1 $v0, $f0 -/* 1830BC 802547DC 00000000 */ nop +/* 1830BC 802547DC 00000000 */ nop /* 1830C0 802547E0 46800020 */ cvt.s.w $f0, $f0 /* 1830C4 802547E4 46020002 */ mul.s $f0, $f0, $f2 -/* 1830C8 802547E8 00000000 */ nop +/* 1830C8 802547E8 00000000 */ nop /* 1830CC 802547EC 4600010D */ trunc.w.s $f4, $f0 /* 1830D0 802547F0 44022000 */ mfc1 $v0, $f4 -/* 1830D4 802547F4 00000000 */ nop +/* 1830D4 802547F4 00000000 */ nop /* 1830D8 802547F8 A242086C */ sb $v0, 0x86c($s2) /* 1830DC 802547FC 0C00A6C9 */ jal clamp_angle /* 1830E0 80254800 C62C015C */ lwc1 $f12, 0x15c($s1) /* 1830E4 80254804 46160002 */ mul.s $f0, $f0, $f22 -/* 1830E8 80254808 00000000 */ nop +/* 1830E8 80254808 00000000 */ nop /* 1830EC 8025480C 4600A03E */ c.le.s $f20, $f0 -/* 1830F0 80254810 00000000 */ nop +/* 1830F0 80254810 00000000 */ nop /* 1830F4 80254814 45010005 */ bc1t .L8025482C /* 1830F8 80254818 2643087C */ addiu $v1, $s2, 0x87c /* 1830FC 8025481C 4600010D */ trunc.w.s $f4, $f0 @@ -93,16 +93,16 @@ glabel enable_player_blur /* 18310C 8025482C 46140001 */ sub.s $f0, $f0, $f20 /* 183110 80254830 4600010D */ trunc.w.s $f4, $f0 /* 183114 80254834 44022000 */ mfc1 $v0, $f4 -/* 183118 80254838 00000000 */ nop +/* 183118 80254838 00000000 */ nop /* 18311C 8025483C 00551025 */ or $v0, $v0, $s5 /* 183120 80254840 A0620000 */ sb $v0, ($v1) .L80254844: /* 183124 80254844 0C00A6C9 */ jal clamp_angle /* 183128 80254848 C62C0160 */ lwc1 $f12, 0x160($s1) /* 18312C 8025484C 46160002 */ mul.s $f0, $f0, $f22 -/* 183130 80254850 00000000 */ nop +/* 183130 80254850 00000000 */ nop /* 183134 80254854 4600A03E */ c.le.s $f20, $f0 -/* 183138 80254858 00000000 */ nop +/* 183138 80254858 00000000 */ nop /* 18313C 8025485C 45010005 */ bc1t .L80254874 /* 183140 80254860 2643088C */ addiu $v1, $s2, 0x88c /* 183144 80254864 4600010D */ trunc.w.s $f4, $f0 @@ -113,16 +113,16 @@ glabel enable_player_blur /* 183154 80254874 46140001 */ sub.s $f0, $f0, $f20 /* 183158 80254878 4600010D */ trunc.w.s $f4, $f0 /* 18315C 8025487C 44022000 */ mfc1 $v0, $f4 -/* 183160 80254880 00000000 */ nop +/* 183160 80254880 00000000 */ nop /* 183164 80254884 00551025 */ or $v0, $v0, $s5 /* 183168 80254888 A0620000 */ sb $v0, ($v1) .L8025488C: /* 18316C 8025488C 0C00A6C9 */ jal clamp_angle /* 183170 80254890 C62C0164 */ lwc1 $f12, 0x164($s1) /* 183174 80254894 46160002 */ mul.s $f0, $f0, $f22 -/* 183178 80254898 00000000 */ nop +/* 183178 80254898 00000000 */ nop /* 18317C 8025489C 4600A03E */ c.le.s $f20, $f0 -/* 183180 802548A0 00000000 */ nop +/* 183180 802548A0 00000000 */ nop /* 183184 802548A4 45010005 */ bc1t .L802548BC /* 183188 802548A8 2643089C */ addiu $v1, $s2, 0x89c /* 18318C 802548AC 4600010D */ trunc.w.s $f4, $f0 @@ -133,7 +133,7 @@ glabel enable_player_blur /* 18319C 802548BC 46140001 */ sub.s $f0, $f0, $f20 /* 1831A0 802548C0 4600010D */ trunc.w.s $f4, $f0 /* 1831A4 802548C4 44022000 */ mfc1 $v0, $f4 -/* 1831A8 802548C8 00000000 */ nop +/* 1831A8 802548C8 00000000 */ nop /* 1831AC 802548CC 00551025 */ or $v0, $v0, $s5 /* 1831B0 802548D0 A0620000 */ sb $v0, ($v1) .L802548D4: diff --git a/asm/nonmatchings/code_182B30/func_80254610.s b/asm/nonmatchings/code_182B30/func_80254610.s index 0590f138a7..1e1a87492c 100644 --- a/asm/nonmatchings/code_182B30/func_80254610.s +++ b/asm/nonmatchings/code_182B30/func_80254610.s @@ -5,7 +5,7 @@ glabel func_80254610 /* 182EF0 80254610 8C8301F4 */ lw $v1, 0x1f4($a0) /* 182EF4 80254614 8C620094 */ lw $v0, 0x94($v1) /* 182EF8 80254618 10400008 */ beqz $v0, .L8025463C -/* 182EFC 8025461C 00000000 */ nop +/* 182EFC 8025461C 00000000 */ nop /* 182F00 80254620 8C620000 */ lw $v0, ($v1) /* 182F04 80254624 30420002 */ andi $v0, $v0, 2 /* 182F08 80254628 14400004 */ bnez $v0, .L8025463C @@ -15,4 +15,4 @@ glabel func_80254610 /* 182F18 80254638 A06208AC */ sb $v0, 0x8ac($v1) .L8025463C: /* 182F1C 8025463C 03E00008 */ jr $ra -/* 182F20 80254640 00000000 */ nop +/* 182F20 80254640 00000000 */ nop diff --git a/asm/nonmatchings/code_182B30/func_802546B0.s b/asm/nonmatchings/code_182B30/func_802546B0.s index d446d9c242..066a0d5e26 100644 --- a/asm/nonmatchings/code_182B30/func_802546B0.s +++ b/asm/nonmatchings/code_182B30/func_802546B0.s @@ -7,7 +7,7 @@ glabel func_802546B0 /* 182F98 802546B8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 182F9C 802546BC AFBF0010 */ sw $ra, 0x10($sp) /* 182FA0 802546C0 0C095184 */ jal func_80254610 -/* 182FA4 802546C4 00000000 */ nop +/* 182FA4 802546C4 00000000 */ nop /* 182FA8 802546C8 8FBF0010 */ lw $ra, 0x10($sp) /* 182FAC 802546CC 03E00008 */ jr $ra /* 182FB0 802546D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_182B30/func_80254950.s b/asm/nonmatchings/code_182B30/func_80254950.s index 32121ae51a..3f9783738b 100644 --- a/asm/nonmatchings/code_182B30/func_80254950.s +++ b/asm/nonmatchings/code_182B30/func_80254950.s @@ -22,4 +22,4 @@ glabel func_80254950 /* 183274 80254994 A0A208AC */ sb $v0, 0x8ac($a1) .L80254998: /* 183278 80254998 03E00008 */ jr $ra -/* 18327C 8025499C 00000000 */ nop +/* 18327C 8025499C 00000000 */ nop diff --git a/asm/nonmatchings/code_182B30/func_802549F4.s b/asm/nonmatchings/code_182B30/func_802549F4.s index aa53dcbe82..285db5d733 100644 --- a/asm/nonmatchings/code_182B30/func_802549F4.s +++ b/asm/nonmatchings/code_182B30/func_802549F4.s @@ -14,69 +14,69 @@ glabel func_802549F4 /* 1832F8 80254A18 8C9300C0 */ lw $s3, 0xc0($a0) /* 1832FC 80254A1C 30420001 */ andi $v0, $v0, 1 /* 183300 80254A20 14400084 */ bnez $v0, .L80254C34 -/* 183304 80254A24 00000000 */ nop +/* 183304 80254A24 00000000 */ nop /* 183308 80254A28 8C820094 */ lw $v0, 0x94($a0) /* 18330C 80254A2C 10400081 */ beqz $v0, .L80254C34 -/* 183310 80254A30 00000000 */ nop +/* 183310 80254A30 00000000 */ nop /* 183314 80254A34 827107D9 */ lb $s1, 0x7d9($s3) /* 183318 80254A38 C4800058 */ lwc1 $f0, 0x58($a0) /* 18331C 80254A3C 00111840 */ sll $v1, $s1, 1 /* 183320 80254A40 02631821 */ addu $v1, $s3, $v1 /* 183324 80254A44 4600010D */ trunc.w.s $f4, $f0 /* 183328 80254A48 44022000 */ mfc1 $v0, $f4 -/* 18332C 80254A4C 00000000 */ nop +/* 18332C 80254A4C 00000000 */ nop /* 183330 80254A50 A46207FC */ sh $v0, 0x7fc($v1) /* 183334 80254A54 C480005C */ lwc1 $f0, 0x5c($a0) /* 183338 80254A58 4600010D */ trunc.w.s $f4, $f0 /* 18333C 80254A5C 44022000 */ mfc1 $v0, $f4 -/* 183340 80254A60 00000000 */ nop +/* 183340 80254A60 00000000 */ nop /* 183344 80254A64 A462081C */ sh $v0, 0x81c($v1) /* 183348 80254A68 C4800060 */ lwc1 $f0, 0x60($a0) /* 18334C 80254A6C 4600010D */ trunc.w.s $f4, $f0 /* 183350 80254A70 44022000 */ mfc1 $v0, $f4 -/* 183354 80254A74 00000000 */ nop +/* 183354 80254A74 00000000 */ nop /* 183358 80254A78 A462083C */ sh $v0, 0x83c($v1) /* 18335C 80254A7C C640018C */ lwc1 $f0, 0x18c($s2) /* 183360 80254A80 4600010D */ trunc.w.s $f4, $f0 /* 183364 80254A84 44022000 */ mfc1 $v0, $f4 -/* 183368 80254A88 00000000 */ nop +/* 183368 80254A88 00000000 */ nop /* 18336C 80254A8C A46207DC */ sh $v0, 0x7dc($v1) /* 183370 80254A90 86420168 */ lh $v0, 0x168($s2) /* 183374 80254A94 C6420188 */ lwc1 $f2, 0x188($s2) /* 183378 80254A98 44820000 */ mtc1 $v0, $f0 -/* 18337C 80254A9C 00000000 */ nop +/* 18337C 80254A9C 00000000 */ nop /* 183380 80254AA0 46800020 */ cvt.s.w $f0, $f0 /* 183384 80254AA4 46020002 */ mul.s $f0, $f0, $f2 -/* 183388 80254AA8 00000000 */ nop +/* 183388 80254AA8 00000000 */ nop /* 18338C 80254AAC 02718021 */ addu $s0, $s3, $s1 /* 183390 80254AB0 4600010D */ trunc.w.s $f4, $f0 /* 183394 80254AB4 44022000 */ mfc1 $v0, $f4 -/* 183398 80254AB8 00000000 */ nop +/* 183398 80254AB8 00000000 */ nop /* 18339C 80254ABC A202085C */ sb $v0, 0x85c($s0) /* 1833A0 80254AC0 8642016A */ lh $v0, 0x16a($s2) /* 1833A4 80254AC4 C6420188 */ lwc1 $f2, 0x188($s2) /* 1833A8 80254AC8 44820000 */ mtc1 $v0, $f0 -/* 1833AC 80254ACC 00000000 */ nop +/* 1833AC 80254ACC 00000000 */ nop /* 1833B0 80254AD0 46800020 */ cvt.s.w $f0, $f0 /* 1833B4 80254AD4 46020002 */ mul.s $f0, $f0, $f2 -/* 1833B8 80254AD8 00000000 */ nop +/* 1833B8 80254AD8 00000000 */ nop /* 1833BC 80254ADC 4600010D */ trunc.w.s $f4, $f0 /* 1833C0 80254AE0 44022000 */ mfc1 $v0, $f4 -/* 1833C4 80254AE4 00000000 */ nop +/* 1833C4 80254AE4 00000000 */ nop /* 1833C8 80254AE8 A202086C */ sb $v0, 0x86c($s0) /* 1833CC 80254AEC C64C015C */ lwc1 $f12, 0x15c($s2) /* 1833D0 80254AF0 0C00A6C9 */ jal clamp_angle /* 1833D4 80254AF4 2610087C */ addiu $s0, $s0, 0x87c /* 1833D8 80254AF8 3C013F00 */ lui $at, 0x3f00 /* 1833DC 80254AFC 44811000 */ mtc1 $at, $f2 -/* 1833E0 80254B00 00000000 */ nop +/* 1833E0 80254B00 00000000 */ nop /* 1833E4 80254B04 46020002 */ mul.s $f0, $f0, $f2 -/* 1833E8 80254B08 00000000 */ nop +/* 1833E8 80254B08 00000000 */ nop /* 1833EC 80254B0C 3C014F00 */ lui $at, 0x4f00 /* 1833F0 80254B10 44811000 */ mtc1 $at, $f2 -/* 1833F4 80254B14 00000000 */ nop +/* 1833F4 80254B14 00000000 */ nop /* 1833F8 80254B18 4600103E */ c.le.s $f2, $f0 -/* 1833FC 80254B1C 00000000 */ nop +/* 1833FC 80254B1C 00000000 */ nop /* 183400 80254B20 45030005 */ bc1tl .L80254B38 /* 183404 80254B24 46020001 */ sub.s $f0, $f0, $f2 /* 183408 80254B28 4600010D */ trunc.w.s $f4, $f0 @@ -87,7 +87,7 @@ glabel func_802549F4 /* 183418 80254B38 3C028000 */ lui $v0, 0x8000 /* 18341C 80254B3C 4600010D */ trunc.w.s $f4, $f0 /* 183420 80254B40 44032000 */ mfc1 $v1, $f4 -/* 183424 80254B44 00000000 */ nop +/* 183424 80254B44 00000000 */ nop /* 183428 80254B48 00621825 */ or $v1, $v1, $v0 /* 18342C 80254B4C A2030000 */ sb $v1, ($s0) .L80254B50: @@ -95,15 +95,15 @@ glabel func_802549F4 /* 183434 80254B54 C64C0160 */ lwc1 $f12, 0x160($s2) /* 183438 80254B58 3C013F00 */ lui $at, 0x3f00 /* 18343C 80254B5C 44811000 */ mtc1 $at, $f2 -/* 183440 80254B60 00000000 */ nop +/* 183440 80254B60 00000000 */ nop /* 183444 80254B64 46020002 */ mul.s $f0, $f0, $f2 -/* 183448 80254B68 00000000 */ nop +/* 183448 80254B68 00000000 */ nop /* 18344C 80254B6C 02711021 */ addu $v0, $s3, $s1 /* 183450 80254B70 3C014F00 */ lui $at, 0x4f00 /* 183454 80254B74 44811000 */ mtc1 $at, $f2 -/* 183458 80254B78 00000000 */ nop +/* 183458 80254B78 00000000 */ nop /* 18345C 80254B7C 4600103E */ c.le.s $f2, $f0 -/* 183460 80254B80 00000000 */ nop +/* 183460 80254B80 00000000 */ nop /* 183464 80254B84 45010005 */ bc1t .L80254B9C /* 183468 80254B88 2444088C */ addiu $a0, $v0, 0x88c /* 18346C 80254B8C 4600010D */ trunc.w.s $f4, $f0 @@ -115,7 +115,7 @@ glabel func_802549F4 /* 183480 80254BA0 3C028000 */ lui $v0, 0x8000 /* 183484 80254BA4 4600010D */ trunc.w.s $f4, $f0 /* 183488 80254BA8 44032000 */ mfc1 $v1, $f4 -/* 18348C 80254BAC 00000000 */ nop +/* 18348C 80254BAC 00000000 */ nop /* 183490 80254BB0 00621825 */ or $v1, $v1, $v0 /* 183494 80254BB4 A0830000 */ sb $v1, ($a0) .L80254BB8: @@ -123,15 +123,15 @@ glabel func_802549F4 /* 18349C 80254BBC C64C0164 */ lwc1 $f12, 0x164($s2) /* 1834A0 80254BC0 3C013F00 */ lui $at, 0x3f00 /* 1834A4 80254BC4 44811000 */ mtc1 $at, $f2 -/* 1834A8 80254BC8 00000000 */ nop +/* 1834A8 80254BC8 00000000 */ nop /* 1834AC 80254BCC 46020002 */ mul.s $f0, $f0, $f2 -/* 1834B0 80254BD0 00000000 */ nop +/* 1834B0 80254BD0 00000000 */ nop /* 1834B4 80254BD4 02711021 */ addu $v0, $s3, $s1 /* 1834B8 80254BD8 3C014F00 */ lui $at, 0x4f00 /* 1834BC 80254BDC 44811000 */ mtc1 $at, $f2 -/* 1834C0 80254BE0 00000000 */ nop +/* 1834C0 80254BE0 00000000 */ nop /* 1834C4 80254BE4 4600103E */ c.le.s $f2, $f0 -/* 1834C8 80254BE8 00000000 */ nop +/* 1834C8 80254BE8 00000000 */ nop /* 1834CC 80254BEC 45010005 */ bc1t .L80254C04 /* 1834D0 80254BF0 2444089C */ addiu $a0, $v0, 0x89c /* 1834D4 80254BF4 4600010D */ trunc.w.s $f4, $f0 @@ -143,7 +143,7 @@ glabel func_802549F4 /* 1834E8 80254C08 3C028000 */ lui $v0, 0x8000 /* 1834EC 80254C0C 4600010D */ trunc.w.s $f4, $f0 /* 1834F0 80254C10 44032000 */ mfc1 $v1, $f4 -/* 1834F4 80254C14 00000000 */ nop +/* 1834F4 80254C14 00000000 */ nop /* 1834F8 80254C18 00621825 */ or $v1, $v1, $v0 /* 1834FC 80254C1C A0830000 */ sb $v1, ($a0) .L80254C20: diff --git a/asm/nonmatchings/code_182B30/func_802550BC.s b/asm/nonmatchings/code_182B30/func_802550BC.s index 49e177e4bd..38e5b55d04 100644 --- a/asm/nonmatchings/code_182B30/func_802550BC.s +++ b/asm/nonmatchings/code_182B30/func_802550BC.s @@ -28,12 +28,12 @@ glabel func_802550BC /* 1839F4 80255114 8E430000 */ lw $v1, ($s2) /* 1839F8 80255118 30620001 */ andi $v0, $v1, 1 /* 1839FC 8025511C 14400006 */ bnez $v0, .L80255138 -/* 183A00 80255120 00000000 */ nop +/* 183A00 80255120 00000000 */ nop /* 183A04 80255124 8E420094 */ lw $v0, 0x94($s2) /* 183A08 80255128 10400003 */ beqz $v0, .L80255138 /* 183A0C 8025512C 30620002 */ andi $v0, $v1, 2 /* 183A10 80255130 10400004 */ beqz $v0, .L80255144 -/* 183A14 80255134 00000000 */ nop +/* 183A14 80255134 00000000 */ nop .L80255138: /* 183A18 80255138 8E52000C */ lw $s2, 0xc($s2) /* 183A1C 8025513C 080954AB */ j .L802552AC @@ -50,17 +50,17 @@ glabel func_802550BC /* 183A44 80255164 C640005C */ lwc1 $f0, 0x5c($s2) /* 183A48 80255168 4600008D */ trunc.w.s $f2, $f0 /* 183A4C 8025516C 44021000 */ mfc1 $v0, $f2 -/* 183A50 80255170 00000000 */ nop +/* 183A50 80255170 00000000 */ nop /* 183A54 80255174 A462081C */ sh $v0, 0x81c($v1) /* 183A58 80255178 C6400060 */ lwc1 $f0, 0x60($s2) /* 183A5C 8025517C 4600008D */ trunc.w.s $f2, $f0 /* 183A60 80255180 44021000 */ mfc1 $v0, $f2 -/* 183A64 80255184 00000000 */ nop +/* 183A64 80255184 00000000 */ nop /* 183A68 80255188 A462083C */ sh $v0, 0x83c($v1) /* 183A6C 8025518C C6A0018C */ lwc1 $f0, 0x18c($s5) /* 183A70 80255190 4600008D */ trunc.w.s $f2, $f0 /* 183A74 80255194 44021000 */ mfc1 $v0, $f2 -/* 183A78 80255198 00000000 */ nop +/* 183A78 80255198 00000000 */ nop /* 183A7C 8025519C A46207DC */ sh $v0, 0x7dc($v1) /* 183A80 802551A0 92A20169 */ lbu $v0, 0x169($s5) /* 183A84 802551A4 02718021 */ addu $s0, $s3, $s1 @@ -71,9 +71,9 @@ glabel func_802550BC /* 183A98 802551B8 0C00A6C9 */ jal clamp_angle /* 183A9C 802551BC 2610087C */ addiu $s0, $s0, 0x87c /* 183AA0 802551C0 46160002 */ mul.s $f0, $f0, $f22 -/* 183AA4 802551C4 00000000 */ nop +/* 183AA4 802551C4 00000000 */ nop /* 183AA8 802551C8 4600A03E */ c.le.s $f20, $f0 -/* 183AAC 802551CC 00000000 */ nop +/* 183AAC 802551CC 00000000 */ nop /* 183AB0 802551D0 45030005 */ bc1tl .L802551E8 /* 183AB4 802551D4 46140001 */ sub.s $f0, $f0, $f20 /* 183AB8 802551D8 4600008D */ trunc.w.s $f2, $f0 @@ -83,17 +83,17 @@ glabel func_802550BC .L802551E8: /* 183AC8 802551E8 4600008D */ trunc.w.s $f2, $f0 /* 183ACC 802551EC 44021000 */ mfc1 $v0, $f2 -/* 183AD0 802551F0 00000000 */ nop +/* 183AD0 802551F0 00000000 */ nop /* 183AD4 802551F4 00571025 */ or $v0, $v0, $s7 /* 183AD8 802551F8 A2020000 */ sb $v0, ($s0) .L802551FC: /* 183ADC 802551FC 0C00A6C9 */ jal clamp_angle /* 183AE0 80255200 C6AC0160 */ lwc1 $f12, 0x160($s5) /* 183AE4 80255204 46160002 */ mul.s $f0, $f0, $f22 -/* 183AE8 80255208 00000000 */ nop +/* 183AE8 80255208 00000000 */ nop /* 183AEC 8025520C 02711021 */ addu $v0, $s3, $s1 /* 183AF0 80255210 4600A03E */ c.le.s $f20, $f0 -/* 183AF4 80255214 00000000 */ nop +/* 183AF4 80255214 00000000 */ nop /* 183AF8 80255218 45010005 */ bc1t .L80255230 /* 183AFC 8025521C 2442088C */ addiu $v0, $v0, 0x88c /* 183B00 80255220 4600008D */ trunc.w.s $f2, $f0 @@ -104,17 +104,17 @@ glabel func_802550BC /* 183B10 80255230 46140001 */ sub.s $f0, $f0, $f20 /* 183B14 80255234 4600008D */ trunc.w.s $f2, $f0 /* 183B18 80255238 44031000 */ mfc1 $v1, $f2 -/* 183B1C 8025523C 00000000 */ nop +/* 183B1C 8025523C 00000000 */ nop /* 183B20 80255240 00771825 */ or $v1, $v1, $s7 /* 183B24 80255244 A0430000 */ sb $v1, ($v0) .L80255248: /* 183B28 80255248 0C00A6C9 */ jal clamp_angle /* 183B2C 8025524C C6AC0164 */ lwc1 $f12, 0x164($s5) /* 183B30 80255250 46160002 */ mul.s $f0, $f0, $f22 -/* 183B34 80255254 00000000 */ nop +/* 183B34 80255254 00000000 */ nop /* 183B38 80255258 02711021 */ addu $v0, $s3, $s1 /* 183B3C 8025525C 4600A03E */ c.le.s $f20, $f0 -/* 183B40 80255260 00000000 */ nop +/* 183B40 80255260 00000000 */ nop /* 183B44 80255264 45010005 */ bc1t .L8025527C /* 183B48 80255268 2442089C */ addiu $v0, $v0, 0x89c /* 183B4C 8025526C 4600008D */ trunc.w.s $f2, $f0 @@ -125,7 +125,7 @@ glabel func_802550BC /* 183B5C 8025527C 46140001 */ sub.s $f0, $f0, $f20 /* 183B60 80255280 4600008D */ trunc.w.s $f2, $f0 /* 183B64 80255284 44031000 */ mfc1 $v1, $f2 -/* 183B68 80255288 00000000 */ nop +/* 183B68 80255288 00000000 */ nop /* 183B6C 8025528C 00771825 */ or $v1, $v1, $s7 /* 183B70 80255290 A0430000 */ sb $v1, ($v0) .L80255294: @@ -139,7 +139,7 @@ glabel func_802550BC .L802552AC: /* 183B8C 802552AC 0296102A */ slt $v0, $s4, $s6 /* 183B90 802552B0 1440FF98 */ bnez $v0, .L80255114 -/* 183B94 802552B4 00000000 */ nop +/* 183B94 802552B4 00000000 */ nop .L802552B8: /* 183B98 802552B8 8FBF0030 */ lw $ra, 0x30($sp) /* 183B9C 802552BC 8FB7002C */ lw $s7, 0x2c($sp) diff --git a/asm/nonmatchings/code_182B30/func_802552EC.s b/asm/nonmatchings/code_182B30/func_802552EC.s index cdfe919e7c..83633e629e 100644 --- a/asm/nonmatchings/code_182B30/func_802552EC.s +++ b/asm/nonmatchings/code_182B30/func_802552EC.s @@ -63,21 +63,21 @@ glabel func_802552EC /* 183CB4 802553D4 D434D358 */ ldc1 $f20, %lo(D_8029D358)($at) /* 183CB8 802553D8 46002121 */ cvt.d.s $f4, $f4 /* 183CBC 802553DC 46342102 */ mul.d $f4, $f4, $f20 -/* 183CC0 802553E0 00000000 */ nop +/* 183CC0 802553E0 00000000 */ nop /* 183CC4 802553E4 C5200174 */ lwc1 $f0, 0x174($t1) /* 183CC8 802553E8 46000021 */ cvt.d.s $f0, $f0 /* 183CCC 802553EC 46340002 */ mul.d $f0, $f0, $f20 -/* 183CD0 802553F0 00000000 */ nop +/* 183CD0 802553F0 00000000 */ nop /* 183CD4 802553F4 C5220178 */ lwc1 $f2, 0x178($t1) /* 183CD8 802553F8 460010A1 */ cvt.d.s $f2, $f2 /* 183CDC 802553FC 46341082 */ mul.d $f2, $f2, $f20 -/* 183CE0 80255400 00000000 */ nop +/* 183CE0 80255400 00000000 */ nop /* 183CE4 80255404 C5260188 */ lwc1 $f6, 0x188($t1) /* 183CE8 80255408 460031A1 */ cvt.d.s $f6, $f6 /* 183CEC 8025540C 46262102 */ mul.d $f4, $f4, $f6 -/* 183CF0 80255410 00000000 */ nop +/* 183CF0 80255410 00000000 */ nop /* 183CF4 80255414 46260002 */ mul.d $f0, $f0, $f6 -/* 183CF8 80255418 00000000 */ nop +/* 183CF8 80255418 00000000 */ nop /* 183CFC 8025541C 27B00118 */ addiu $s0, $sp, 0x118 /* 183D00 80255420 462010A0 */ cvt.s.d $f2, $f2 /* 183D04 80255424 44071000 */ mfc1 $a3, $f2 @@ -105,11 +105,11 @@ glabel func_802552EC .L8025547C: /* 183D5C 8025547C 8E420094 */ lw $v0, 0x94($s2) /* 183D60 80255480 10400013 */ beqz $v0, .L802554D0 -/* 183D64 80255484 00000000 */ nop +/* 183D64 80255484 00000000 */ nop /* 183D68 80255488 8E420000 */ lw $v0, ($s2) /* 183D6C 8025548C 30420002 */ andi $v0, $v0, 2 /* 183D70 80255490 1440000F */ bnez $v0, .L802554D0 -/* 183D74 80255494 00000000 */ nop +/* 183D74 80255494 00000000 */ nop /* 183D78 80255498 8E5500C0 */ lw $s5, 0xc0($s2) /* 183D7C 8025549C 82A208AC */ lb $v0, 0x8ac($s5) /* 183D80 802554A0 92A308AC */ lbu $v1, 0x8ac($s5) @@ -141,15 +141,15 @@ glabel func_802552EC /* 183DE0 80255500 D428D360 */ ldc1 $f8, %lo(D_8029D360)($at) /* 183DE4 80255504 46002121 */ cvt.d.s $f4, $f4 /* 183DE8 80255508 46282102 */ mul.d $f4, $f4, $f8 -/* 183DEC 8025550C 00000000 */ nop +/* 183DEC 8025550C 00000000 */ nop /* 183DF0 80255510 C5220174 */ lwc1 $f2, 0x174($t1) /* 183DF4 80255514 460010A1 */ cvt.d.s $f2, $f2 /* 183DF8 80255518 46281082 */ mul.d $f2, $f2, $f8 -/* 183DFC 8025551C 00000000 */ nop +/* 183DFC 8025551C 00000000 */ nop /* 183E00 80255520 C5200178 */ lwc1 $f0, 0x178($t1) /* 183E04 80255524 46000021 */ cvt.d.s $f0, $f0 /* 183E08 80255528 46280002 */ mul.d $f0, $f0, $f8 -/* 183E0C 8025552C 00000000 */ nop +/* 183E0C 8025552C 00000000 */ nop /* 183E10 80255530 46202120 */ cvt.s.d $f4, $f4 /* 183E14 80255534 462010A0 */ cvt.s.d $f2, $f2 /* 183E18 80255538 46200020 */ cvt.s.d $f0, $f0 @@ -177,11 +177,11 @@ glabel func_802552EC .L80255588: /* 183E68 80255588 82A207D9 */ lb $v0, 0x7d9($s5) /* 183E6C 8025558C 128200D3 */ beq $s4, $v0, .L802558DC -/* 183E70 80255590 00000000 */ nop +/* 183E70 80255590 00000000 */ nop /* 183E74 80255594 8FA90320 */ lw $t1, 0x320($sp) /* 183E78 80255598 29220003 */ slti $v0, $t1, 3 /* 183E7C 8025559C 1440FFF4 */ bnez $v0, .L80255570 -/* 183E80 802555A0 00000000 */ nop +/* 183E80 802555A0 00000000 */ nop /* 183E84 802555A4 8FA80324 */ lw $t0, 0x324($sp) /* 183E88 802555A8 AFA00320 */ sw $zero, 0x320($sp) /* 183E8C 802555AC 82A207DA */ lb $v0, 0x7da($s5) @@ -196,30 +196,30 @@ glabel func_802552EC /* 183EB0 802555D0 84A207FC */ lh $v0, 0x7fc($a1) /* 183EB4 802555D4 84A3081C */ lh $v1, 0x81c($a1) /* 183EB8 802555D8 4482D000 */ mtc1 $v0, $f26 -/* 183EBC 802555DC 00000000 */ nop +/* 183EBC 802555DC 00000000 */ nop /* 183EC0 802555E0 4680D6A0 */ cvt.s.w $f26, $f26 /* 183EC4 802555E4 4483E000 */ mtc1 $v1, $f28 -/* 183EC8 802555E8 00000000 */ nop +/* 183EC8 802555E8 00000000 */ nop /* 183ECC 802555EC 4680E720 */ cvt.s.w $f28, $f28 /* 183ED0 802555F0 84A3083C */ lh $v1, 0x83c($a1) /* 183ED4 802555F4 9082087C */ lbu $v0, 0x87c($a0) /* 183ED8 802555F8 4483B000 */ mtc1 $v1, $f22 -/* 183EDC 802555FC 00000000 */ nop +/* 183EDC 802555FC 00000000 */ nop /* 183EE0 80255600 4680B5A0 */ cvt.s.w $f22, $f22 /* 183EE4 80255604 00021040 */ sll $v0, $v0, 1 /* 183EE8 80255608 4482C000 */ mtc1 $v0, $f24 -/* 183EEC 8025560C 00000000 */ nop +/* 183EEC 8025560C 00000000 */ nop /* 183EF0 80255610 4680C620 */ cvt.s.w $f24, $f24 /* 183EF4 80255614 9083088C */ lbu $v1, 0x88c($a0) /* 183EF8 80255618 9082089C */ lbu $v0, 0x89c($a0) /* 183EFC 8025561C 00031840 */ sll $v1, $v1, 1 /* 183F00 80255620 4483F000 */ mtc1 $v1, $f30 -/* 183F04 80255624 00000000 */ nop +/* 183F04 80255624 00000000 */ nop /* 183F08 80255628 4680F7A0 */ cvt.s.w $f30, $f30 /* 183F0C 8025562C 00021040 */ sll $v0, $v0, 1 /* 183F10 80255630 86430098 */ lh $v1, 0x98($s2) /* 183F14 80255634 44824000 */ mtc1 $v0, $f8 -/* 183F18 80255638 00000000 */ nop +/* 183F18 80255638 00000000 */ nop /* 183F1C 8025563C 46804220 */ cvt.s.w $f8, $f8 /* 183F20 80255640 E7A80328 */ swc1 $f8, 0x328($sp) /* 183F24 80255644 84A507DC */ lh $a1, 0x7dc($a1) @@ -241,7 +241,7 @@ glabel func_802552EC /* 183F60 80255680 2416000A */ addiu $s6, $zero, 0xa .L80255684: /* 183F64 80255684 10400003 */ beqz $v0, .L80255694 -/* 183F68 80255688 00000000 */ nop +/* 183F68 80255688 00000000 */ nop /* 183F6C 8025568C 241E0064 */ addiu $fp, $zero, 0x64 /* 183F70 80255690 2416000F */ addiu $s6, $zero, 0xf .L80255694: @@ -251,44 +251,44 @@ glabel func_802552EC /* 183F80 802556A0 14400015 */ bnez $v0, .L802556F8 /* 183F84 802556A4 00101023 */ negu $v0, $s0 /* 183F88 802556A8 44824000 */ mtc1 $v0, $f8 -/* 183F8C 802556AC 00000000 */ nop +/* 183F8C 802556AC 00000000 */ nop /* 183F90 802556B0 46804220 */ cvt.s.w $f8, $f8 /* 183F94 802556B4 00111023 */ negu $v0, $s1 /* 183F98 802556B8 44054000 */ mfc1 $a1, $f8 /* 183F9C 802556BC 44824000 */ mtc1 $v0, $f8 -/* 183FA0 802556C0 00000000 */ nop +/* 183FA0 802556C0 00000000 */ nop /* 183FA4 802556C4 46804220 */ cvt.s.w $f8, $f8 /* 183FA8 802556C8 4407A000 */ mfc1 $a3, $f20 /* 183FAC 802556CC 44064000 */ mfc1 $a2, $f8 /* 183FB0 802556D0 0C019E40 */ jal guTranslateF /* 183FB4 802556D4 27A40218 */ addiu $a0, $sp, 0x218 /* 183FB8 802556D8 44904000 */ mtc1 $s0, $f8 -/* 183FBC 802556DC 00000000 */ nop +/* 183FBC 802556DC 00000000 */ nop /* 183FC0 802556E0 46804220 */ cvt.s.w $f8, $f8 /* 183FC4 802556E4 44054000 */ mfc1 $a1, $f8 /* 183FC8 802556E8 44914000 */ mtc1 $s1, $f8 -/* 183FCC 802556EC 00000000 */ nop +/* 183FCC 802556EC 00000000 */ nop /* 183FD0 802556F0 080955D1 */ j .L80255744 /* 183FD4 802556F4 46804220 */ cvt.s.w $f8, $f8 .L802556F8: /* 183FD8 802556F8 44824000 */ mtc1 $v0, $f8 -/* 183FDC 802556FC 00000000 */ nop +/* 183FDC 802556FC 00000000 */ nop /* 183FE0 80255700 46804220 */ cvt.s.w $f8, $f8 /* 183FE4 80255704 44054000 */ mfc1 $a1, $f8 /* 183FE8 80255708 44914000 */ mtc1 $s1, $f8 -/* 183FEC 8025570C 00000000 */ nop +/* 183FEC 8025570C 00000000 */ nop /* 183FF0 80255710 46804220 */ cvt.s.w $f8, $f8 /* 183FF4 80255714 4407A000 */ mfc1 $a3, $f20 /* 183FF8 80255718 44064000 */ mfc1 $a2, $f8 /* 183FFC 8025571C 0C019E40 */ jal guTranslateF /* 184000 80255720 27A40218 */ addiu $a0, $sp, 0x218 /* 184004 80255724 44904000 */ mtc1 $s0, $f8 -/* 184008 80255728 00000000 */ nop +/* 184008 80255728 00000000 */ nop /* 18400C 8025572C 46804220 */ cvt.s.w $f8, $f8 /* 184010 80255730 00111023 */ negu $v0, $s1 /* 184014 80255734 44054000 */ mfc1 $a1, $f8 /* 184018 80255738 44824000 */ mtc1 $v0, $f8 -/* 18401C 8025573C 00000000 */ nop +/* 18401C 8025573C 00000000 */ nop /* 184020 80255740 46804220 */ cvt.s.w $f8, $f8 .L80255744: /* 184024 80255744 4407A000 */ mfc1 $a3, $f20 @@ -331,16 +331,16 @@ glabel func_802552EC /* 1840B8 802557D8 82420074 */ lb $v0, 0x74($s2) /* 1840BC 802557DC C6420050 */ lwc1 $f2, 0x50($s2) /* 1840C0 802557E0 44820000 */ mtc1 $v0, $f0 -/* 1840C4 802557E4 00000000 */ nop +/* 1840C4 802557E4 00000000 */ nop /* 1840C8 802557E8 46800020 */ cvt.s.w $f0, $f0 /* 1840CC 802557EC 46001082 */ mul.s $f2, $f2, $f0 -/* 1840D0 802557F0 00000000 */ nop +/* 1840D0 802557F0 00000000 */ nop /* 1840D4 802557F4 8E45004C */ lw $a1, 0x4c($s2) /* 1840D8 802557F8 8E470054 */ lw $a3, 0x54($s2) /* 1840DC 802557FC 8FA4033C */ lw $a0, 0x33c($sp) /* 1840E0 80255800 44061000 */ mfc1 $a2, $f2 /* 1840E4 80255804 0C019DF0 */ jal guScaleF -/* 1840E8 80255808 00000000 */ nop +/* 1840E8 80255808 00000000 */ nop /* 1840EC 8025580C 27A50218 */ addiu $a1, $sp, 0x218 /* 1840F0 80255810 8FA4033C */ lw $a0, 0x33c($sp) /* 1840F4 80255814 0C019D80 */ jal guMtxCatF @@ -383,7 +383,7 @@ glabel func_802552EC /* 18417C 8025589C 8FA9032C */ lw $t1, 0x32c($sp) /* 184180 802558A0 252200B4 */ addiu $v0, $t1, 0xb4 /* 184184 802558A4 44826000 */ mtc1 $v0, $f12 -/* 184188 802558A8 00000000 */ nop +/* 184188 802558A8 00000000 */ nop /* 18418C 802558AC 0C00A6C9 */ jal clamp_angle /* 184190 802558B0 46806320 */ cvt.s.w $f12, $f12 /* 184194 802558B4 4600020D */ trunc.w.s $f8, $f0 @@ -396,7 +396,7 @@ glabel func_802552EC /* 1841AC 802558CC 0C0B78F6 */ jal func_802DE3D8 /* 1841B0 802558D0 00912025 */ or $a0, $a0, $s1 /* 1841B4 802558D4 0809555C */ j .L80255570 -/* 1841B8 802558D8 00000000 */ nop +/* 1841B8 802558D8 00000000 */ nop .L802558DC: /* 1841BC 802558DC 8FA9031C */ lw $t1, 0x31c($sp) /* 1841C0 802558E0 8FA80318 */ lw $t0, 0x318($sp) diff --git a/asm/nonmatchings/code_182B30/func_80255FE0.s b/asm/nonmatchings/code_182B30/func_80255FE0.s index 845baadf82..fa7b564966 100644 --- a/asm/nonmatchings/code_182B30/func_80255FE0.s +++ b/asm/nonmatchings/code_182B30/func_80255FE0.s @@ -34,7 +34,7 @@ glabel func_80255FE0 /* 18492C 8025604C 86420150 */ lh $v0, 0x150($s2) /* 184930 80256050 C6400144 */ lwc1 $f0, 0x144($s2) /* 184934 80256054 44821000 */ mtc1 $v0, $f2 -/* 184938 80256058 00000000 */ nop +/* 184938 80256058 00000000 */ nop /* 18493C 8025605C 468010A0 */ cvt.s.w $f2, $f2 /* 184940 80256060 46020000 */ add.s $f0, $f0, $f2 /* 184944 80256064 8E420000 */ lw $v0, ($s2) @@ -44,7 +44,7 @@ glabel func_80255FE0 /* 184954 80256074 86420152 */ lh $v0, 0x152($s2) /* 184958 80256078 C6400148 */ lwc1 $f0, 0x148($s2) /* 18495C 8025607C 44821000 */ mtc1 $v0, $f2 -/* 184960 80256080 00000000 */ nop +/* 184960 80256080 00000000 */ nop /* 184964 80256084 468010A0 */ cvt.s.w $f2, $f2 /* 184968 80256088 8242019A */ lb $v0, 0x19a($s2) /* 18496C 8025608C 0809582C */ j .L802560B0 @@ -53,13 +53,13 @@ glabel func_80255FE0 /* 184974 80256094 86420152 */ lh $v0, 0x152($s2) /* 184978 80256098 C6400148 */ lwc1 $f0, 0x148($s2) /* 18497C 8025609C 44821000 */ mtc1 $v0, $f2 -/* 184980 802560A0 00000000 */ nop +/* 184980 802560A0 00000000 */ nop /* 184984 802560A4 468010A0 */ cvt.s.w $f2, $f2 /* 184988 802560A8 8242019A */ lb $v0, 0x19a($s2) /* 18498C 802560AC 46020001 */ sub.s $f0, $f0, $f2 .L802560B0: /* 184990 802560B0 44821000 */ mtc1 $v0, $f2 -/* 184994 802560B4 00000000 */ nop +/* 184994 802560B4 00000000 */ nop /* 184998 802560B8 468010A0 */ cvt.s.w $f2, $f2 /* 18499C 802560BC 46020780 */ add.s $f30, $f0, $f2 /* 1849A0 802560C0 8E420008 */ lw $v0, 8($s2) @@ -68,10 +68,10 @@ glabel func_80255FE0 /* 1849AC 802560CC C6420188 */ lwc1 $f2, 0x188($s2) /* 1849B0 802560D0 00431021 */ addu $v0, $v0, $v1 /* 1849B4 802560D4 44820000 */ mtc1 $v0, $f0 -/* 1849B8 802560D8 00000000 */ nop +/* 1849B8 802560D8 00000000 */ nop /* 1849BC 802560DC 46800020 */ cvt.s.w $f0, $f0 /* 1849C0 802560E0 46020002 */ mul.s $f0, $f0, $f2 -/* 1849C4 802560E4 00000000 */ nop +/* 1849C4 802560E4 00000000 */ nop /* 1849C8 802560E8 C7AA0364 */ lwc1 $f10, 0x364($sp) /* 1849CC 802560EC 86440154 */ lh $a0, 0x154($s2) /* 1849D0 802560F0 C644014C */ lwc1 $f4, 0x14c($s2) @@ -85,16 +85,16 @@ glabel func_80255FE0 /* 1849F0 80256110 C6420188 */ lwc1 $f2, 0x188($s2) /* 1849F4 80256114 00431021 */ addu $v0, $v0, $v1 /* 1849F8 80256118 44820000 */ mtc1 $v0, $f0 -/* 1849FC 8025611C 00000000 */ nop +/* 1849FC 8025611C 00000000 */ nop /* 184A00 80256120 46800020 */ cvt.s.w $f0, $f0 /* 184A04 80256124 46020002 */ mul.s $f0, $f0, $f2 -/* 184A08 80256128 00000000 */ nop +/* 184A08 80256128 00000000 */ nop /* 184A0C 8025612C 8E420440 */ lw $v0, 0x440($s2) /* 184A10 80256130 4600F000 */ add.s $f0, $f30, $f0 /* 184A14 80256134 8C42000C */ lw $v0, 0xc($v0) /* 184A18 80256138 E440000C */ swc1 $f0, 0xc($v0) /* 184A1C 8025613C 44840000 */ mtc1 $a0, $f0 -/* 184A20 80256140 00000000 */ nop +/* 184A20 80256140 00000000 */ nop /* 184A24 80256144 46800020 */ cvt.s.w $f0, $f0 /* 184A28 80256148 46002100 */ add.s $f4, $f4, $f0 /* 184A2C 8025614C 8E420440 */ lw $v0, 0x440($s2) @@ -109,7 +109,7 @@ glabel func_80255FE0 /* 184A50 80256170 8E420000 */ lw $v0, ($s2) /* 184A54 80256174 00431024 */ and $v0, $v0, $v1 /* 184A58 80256178 10400018 */ beqz $v0, .L802561DC -/* 184A5C 8025617C 00000000 */ nop +/* 184A5C 8025617C 00000000 */ nop /* 184A60 80256180 8242021D */ lb $v0, 0x21d($s2) /* 184A64 80256184 9244021D */ lbu $a0, 0x21d($s2) /* 184A68 80256188 10400008 */ beqz $v0, .L802561AC @@ -128,7 +128,7 @@ glabel func_80255FE0 /* 184A98 802561B8 44801000 */ mtc1 $zero, $f2 /* 184A9C 802561BC 46000021 */ cvt.d.s $f0, $f0 /* 184AA0 802561C0 46220002 */ mul.d $f0, $f0, $f2 -/* 184AA4 802561C4 00000000 */ nop +/* 184AA4 802561C4 00000000 */ nop /* 184AA8 802561C8 8E420440 */ lw $v0, 0x440($s2) /* 184AAC 802561CC 8C42000C */ lw $v0, 0xc($v0) /* 184AB0 802561D0 46200020 */ cvt.s.d $f0, $f0 @@ -146,10 +146,10 @@ glabel func_80255FE0 /* 184AD8 802561F8 82430210 */ lb $v1, 0x210($s2) /* 184ADC 802561FC 24020007 */ addiu $v0, $zero, 7 /* 184AE0 80256200 1462002C */ bne $v1, $v0, .L802562B4 -/* 184AE4 80256204 00000000 */ nop +/* 184AE4 80256204 00000000 */ nop /* 184AE8 80256208 8E440228 */ lw $a0, 0x228($s2) /* 184AEC 8025620C 10800030 */ beqz $a0, .L802562D0 -/* 184AF0 80256210 00000000 */ nop +/* 184AF0 80256210 00000000 */ nop /* 184AF4 80256214 3C03800E */ lui $v1, %hi(gBattleStatus) /* 184AF8 80256218 8C63C070 */ lw $v1, %lo(gBattleStatus)($v1) /* 184AFC 8025621C 30620008 */ andi $v0, $v1, 8 @@ -160,7 +160,7 @@ glabel func_80255FE0 /* 184B10 80256230 8E420000 */ lw $v0, ($s2) /* 184B14 80256234 00431024 */ and $v0, $v0, $v1 /* 184B18 80256238 10400015 */ beqz $v0, .L80256290 -/* 184B1C 8025623C 00000000 */ nop +/* 184B1C 8025623C 00000000 */ nop .L80256240: /* 184B20 80256240 8C82000C */ lw $v0, 0xc($a0) /* 184B24 80256244 C7AA0364 */ lwc1 $f10, 0x364($sp) @@ -175,7 +175,7 @@ glabel func_80255FE0 /* 184B48 80256268 44811800 */ mtc1 $at, $f3 /* 184B4C 8025626C 44801000 */ mtc1 $zero, $f2 /* 184B50 80256270 44820000 */ mtc1 $v0, $f0 -/* 184B54 80256274 00000000 */ nop +/* 184B54 80256274 00000000 */ nop /* 184B58 80256278 46800021 */ cvt.d.w $f0, $f0 /* 184B5C 8025627C 46220003 */ div.d $f0, $f0, $f2 /* 184B60 80256280 8C82000C */ lw $v0, 0xc($a0) @@ -195,7 +195,7 @@ glabel func_80255FE0 .L802562B4: /* 184B94 802562B4 8E440228 */ lw $a0, 0x228($s2) /* 184B98 802562B8 10800005 */ beqz $a0, .L802562D0 -/* 184B9C 802562BC 00000000 */ nop +/* 184B9C 802562BC 00000000 */ nop /* 184BA0 802562C0 8C820000 */ lw $v0, ($a0) /* 184BA4 802562C4 34420010 */ ori $v0, $v0, 0x10 /* 184BA8 802562C8 AC820000 */ sw $v0, ($a0) @@ -207,10 +207,10 @@ glabel func_80255FE0 /* 184BBC 802562DC C6420188 */ lwc1 $f2, 0x188($s2) /* 184BC0 802562E0 00431021 */ addu $v0, $v0, $v1 /* 184BC4 802562E4 44820000 */ mtc1 $v0, $f0 -/* 184BC8 802562E8 00000000 */ nop +/* 184BC8 802562E8 00000000 */ nop /* 184BCC 802562EC 46800020 */ cvt.s.w $f0, $f0 /* 184BD0 802562F0 46020002 */ mul.s $f0, $f0, $f2 -/* 184BD4 802562F4 00000000 */ nop +/* 184BD4 802562F4 00000000 */ nop /* 184BD8 802562F8 86440436 */ lh $a0, 0x436($s2) /* 184BDC 802562FC 4600028D */ trunc.w.s $f10, $f0 /* 184BE0 80256300 E7AA0010 */ swc1 $f10, 0x10($sp) @@ -220,10 +220,10 @@ glabel func_80255FE0 /* 184BF0 80256310 C6420188 */ lwc1 $f2, 0x188($s2) /* 184BF4 80256314 00431021 */ addu $v0, $v0, $v1 /* 184BF8 80256318 44820000 */ mtc1 $v0, $f0 -/* 184BFC 8025631C 00000000 */ nop +/* 184BFC 8025631C 00000000 */ nop /* 184C00 80256320 46800020 */ cvt.s.w $f0, $f0 /* 184C04 80256324 46020002 */ mul.s $f0, $f0, $f2 -/* 184C08 80256328 00000000 */ nop +/* 184C08 80256328 00000000 */ nop /* 184C0C 8025632C 4600028D */ trunc.w.s $f10, $f0 /* 184C10 80256330 E7AA0014 */ swc1 $f10, 0x14($sp) /* 184C14 80256334 8E420008 */ lw $v0, 8($s2) @@ -232,10 +232,10 @@ glabel func_80255FE0 /* 184C20 80256340 C6420188 */ lwc1 $f2, 0x188($s2) /* 184C24 80256344 00431021 */ addu $v0, $v0, $v1 /* 184C28 80256348 44820000 */ mtc1 $v0, $f0 -/* 184C2C 8025634C 00000000 */ nop +/* 184C2C 8025634C 00000000 */ nop /* 184C30 80256350 46800020 */ cvt.s.w $f0, $f0 /* 184C34 80256354 46020002 */ mul.s $f0, $f0, $f2 -/* 184C38 80256358 00000000 */ nop +/* 184C38 80256358 00000000 */ nop /* 184C3C 8025635C 4600028D */ trunc.w.s $f10, $f0 /* 184C40 80256360 E7AA0018 */ swc1 $f10, 0x18($sp) /* 184C44 80256364 8E420008 */ lw $v0, 8($s2) @@ -244,10 +244,10 @@ glabel func_80255FE0 /* 184C50 80256370 C6420188 */ lwc1 $f2, 0x188($s2) /* 184C54 80256374 00431021 */ addu $v0, $v0, $v1 /* 184C58 80256378 44820000 */ mtc1 $v0, $f0 -/* 184C5C 8025637C 00000000 */ nop +/* 184C5C 8025637C 00000000 */ nop /* 184C60 80256380 46800020 */ cvt.s.w $f0, $f0 /* 184C64 80256384 46020002 */ mul.s $f0, $f0, $f2 -/* 184C68 80256388 00000000 */ nop +/* 184C68 80256388 00000000 */ nop /* 184C6C 8025638C 8FA50364 */ lw $a1, 0x364($sp) /* 184C70 80256390 4406F000 */ mfc1 $a2, $f30 /* 184C74 80256394 8FA70368 */ lw $a3, 0x368($sp) @@ -257,7 +257,7 @@ glabel func_80255FE0 /* 184C84 802563A4 8E420000 */ lw $v0, ($s2) /* 184C88 802563A8 30420800 */ andi $v0, $v0, 0x800 /* 184C8C 802563AC 14400010 */ bnez $v0, .L802563F0 -/* 184C90 802563B0 00000000 */ nop +/* 184C90 802563B0 00000000 */ nop /* 184C94 802563B4 92420191 */ lbu $v0, 0x191($s2) /* 184C98 802563B8 080958FF */ j .L802563FC /* 184C9C 802563BC C6440188 */ lwc1 $f4, 0x188($s2) @@ -270,7 +270,7 @@ glabel func_80255FE0 /* 184CB4 802563D4 3C014018 */ lui $at, 0x4018 /* 184CB8 802563D8 44812800 */ mtc1 $at, $f5 /* 184CBC 802563DC 44802000 */ mtc1 $zero, $f4 -/* 184CC0 802563E0 00000000 */ nop +/* 184CC0 802563E0 00000000 */ nop /* 184CC4 802563E4 46241083 */ div.d $f2, $f2, $f4 /* 184CC8 802563E8 08095921 */ j .L80256484 /* 184CCC 802563EC 46220000 */ add.d $f0, $f0, $f2 @@ -280,27 +280,27 @@ glabel func_80255FE0 /* 184CD8 802563F8 00021023 */ negu $v0, $v0 .L802563FC: /* 184CDC 802563FC 44821000 */ mtc1 $v0, $f2 -/* 184CE0 80256400 00000000 */ nop +/* 184CE0 80256400 00000000 */ nop /* 184CE4 80256404 468010A0 */ cvt.s.w $f2, $f2 /* 184CE8 80256408 46041082 */ mul.s $f2, $f2, $f4 -/* 184CEC 8025640C 00000000 */ nop +/* 184CEC 8025640C 00000000 */ nop /* 184CF0 80256410 92420190 */ lbu $v0, 0x190($s2) /* 184CF4 80256414 44820000 */ mtc1 $v0, $f0 -/* 184CF8 80256418 00000000 */ nop +/* 184CF8 80256418 00000000 */ nop /* 184CFC 8025641C 46800020 */ cvt.s.w $f0, $f0 /* 184D00 80256420 46040002 */ mul.s $f0, $f0, $f4 -/* 184D04 80256424 00000000 */ nop +/* 184D04 80256424 00000000 */ nop /* 184D08 80256428 86440436 */ lh $a0, 0x436($s2) /* 184D0C 8025642C 4600128D */ trunc.w.s $f10, $f2 /* 184D10 80256430 44055000 */ mfc1 $a1, $f10 /* 184D14 80256434 4600028D */ trunc.w.s $f10, $f0 /* 184D18 80256438 44065000 */ mfc1 $a2, $f10 /* 184D1C 8025643C 0C011DFD */ jal func_800477F4 -/* 184D20 80256440 00000000 */ nop +/* 184D20 80256440 00000000 */ nop /* 184D24 80256444 82430210 */ lb $v1, 0x210($s2) /* 184D28 80256448 2402000A */ addiu $v0, $zero, 0xa /* 184D2C 8025644C 1062FFDC */ beq $v1, $v0, .L802563C0 -/* 184D30 80256450 00000000 */ nop +/* 184D30 80256450 00000000 */ nop /* 184D34 80256454 C6400188 */ lwc1 $f0, 0x188($s2) /* 184D38 80256458 3C013FF0 */ lui $at, 0x3ff0 /* 184D3C 8025645C 44812800 */ mtc1 $at, $f5 @@ -310,7 +310,7 @@ glabel func_80255FE0 /* 184D4C 8025646C 3C014018 */ lui $at, 0x4018 /* 184D50 80256470 44811800 */ mtc1 $at, $f3 /* 184D54 80256474 44801000 */ mtc1 $zero, $f2 -/* 184D58 80256478 00000000 */ nop +/* 184D58 80256478 00000000 */ nop /* 184D5C 8025647C 46222103 */ div.d $f4, $f4, $f2 /* 184D60 80256480 46240000 */ add.d $f0, $f0, $f4 .L80256484: @@ -319,41 +319,41 @@ glabel func_80255FE0 /* 184D6C 8025648C 8E420000 */ lw $v0, ($s2) /* 184D70 80256490 30420800 */ andi $v0, $v0, 0x800 /* 184D74 80256494 14400025 */ bnez $v0, .L8025652C -/* 184D78 80256498 00000000 */ nop +/* 184D78 80256498 00000000 */ nop /* 184D7C 8025649C 86420168 */ lh $v0, 0x168($s2) /* 184D80 802564A0 C6420188 */ lwc1 $f2, 0x188($s2) /* 184D84 802564A4 00021023 */ negu $v0, $v0 /* 184D88 802564A8 44820000 */ mtc1 $v0, $f0 -/* 184D8C 802564AC 00000000 */ nop +/* 184D8C 802564AC 00000000 */ nop /* 184D90 802564B0 46800020 */ cvt.s.w $f0, $f0 /* 184D94 802564B4 46020002 */ mul.s $f0, $f0, $f2 -/* 184D98 802564B8 00000000 */ nop +/* 184D98 802564B8 00000000 */ nop /* 184D9C 802564BC 8642016A */ lh $v0, 0x16a($s2) /* 184DA0 802564C0 00021023 */ negu $v0, $v0 /* 184DA4 802564C4 44050000 */ mfc1 $a1, $f0 /* 184DA8 802564C8 44820000 */ mtc1 $v0, $f0 -/* 184DAC 802564CC 00000000 */ nop +/* 184DAC 802564CC 00000000 */ nop /* 184DB0 802564D0 46800020 */ cvt.s.w $f0, $f0 /* 184DB4 802564D4 46020002 */ mul.s $f0, $f0, $f2 -/* 184DB8 802564D8 00000000 */ nop +/* 184DB8 802564D8 00000000 */ nop /* 184DBC 802564DC 8642016C */ lh $v0, 0x16c($s2) /* 184DC0 802564E0 00021023 */ negu $v0, $v0 /* 184DC4 802564E4 44060000 */ mfc1 $a2, $f0 /* 184DC8 802564E8 44820000 */ mtc1 $v0, $f0 -/* 184DCC 802564EC 00000000 */ nop +/* 184DCC 802564EC 00000000 */ nop /* 184DD0 802564F0 46800020 */ cvt.s.w $f0, $f0 /* 184DD4 802564F4 46020002 */ mul.s $f0, $f0, $f2 -/* 184DD8 802564F8 00000000 */ nop +/* 184DD8 802564F8 00000000 */ nop /* 184DDC 802564FC 44070000 */ mfc1 $a3, $f0 /* 184DE0 80256500 0C019E40 */ jal guTranslateF /* 184DE4 80256504 27A401A0 */ addiu $a0, $sp, 0x1a0 /* 184DE8 80256508 86420168 */ lh $v0, 0x168($s2) /* 184DEC 8025650C C6420188 */ lwc1 $f2, 0x188($s2) /* 184DF0 80256510 44820000 */ mtc1 $v0, $f0 -/* 184DF4 80256514 00000000 */ nop +/* 184DF4 80256514 00000000 */ nop /* 184DF8 80256518 46800020 */ cvt.s.w $f0, $f0 /* 184DFC 8025651C 46020002 */ mul.s $f0, $f0, $f2 -/* 184E00 80256520 00000000 */ nop +/* 184E00 80256520 00000000 */ nop /* 184E04 80256524 0809596E */ j .L802565B8 /* 184E08 80256528 8642016A */ lh $v0, 0x16a($s2) .L8025652C: @@ -361,51 +361,51 @@ glabel func_80255FE0 /* 184E10 80256530 C6420188 */ lwc1 $f2, 0x188($s2) /* 184E14 80256534 00021023 */ negu $v0, $v0 /* 184E18 80256538 44820000 */ mtc1 $v0, $f0 -/* 184E1C 8025653C 00000000 */ nop +/* 184E1C 8025653C 00000000 */ nop /* 184E20 80256540 46800020 */ cvt.s.w $f0, $f0 /* 184E24 80256544 46020002 */ mul.s $f0, $f0, $f2 -/* 184E28 80256548 00000000 */ nop +/* 184E28 80256548 00000000 */ nop /* 184E2C 8025654C 8642016A */ lh $v0, 0x16a($s2) /* 184E30 80256550 44050000 */ mfc1 $a1, $f0 /* 184E34 80256554 44820000 */ mtc1 $v0, $f0 -/* 184E38 80256558 00000000 */ nop +/* 184E38 80256558 00000000 */ nop /* 184E3C 8025655C 46800020 */ cvt.s.w $f0, $f0 /* 184E40 80256560 46020002 */ mul.s $f0, $f0, $f2 -/* 184E44 80256564 00000000 */ nop +/* 184E44 80256564 00000000 */ nop /* 184E48 80256568 8642016C */ lh $v0, 0x16c($s2) /* 184E4C 8025656C 00021023 */ negu $v0, $v0 /* 184E50 80256570 44060000 */ mfc1 $a2, $f0 /* 184E54 80256574 44820000 */ mtc1 $v0, $f0 -/* 184E58 80256578 00000000 */ nop +/* 184E58 80256578 00000000 */ nop /* 184E5C 8025657C 46800020 */ cvt.s.w $f0, $f0 /* 184E60 80256580 46020002 */ mul.s $f0, $f0, $f2 -/* 184E64 80256584 00000000 */ nop +/* 184E64 80256584 00000000 */ nop /* 184E68 80256588 44070000 */ mfc1 $a3, $f0 /* 184E6C 8025658C 0C019E40 */ jal guTranslateF /* 184E70 80256590 27A401A0 */ addiu $a0, $sp, 0x1a0 /* 184E74 80256594 86420168 */ lh $v0, 0x168($s2) /* 184E78 80256598 C6420188 */ lwc1 $f2, 0x188($s2) /* 184E7C 8025659C 44820000 */ mtc1 $v0, $f0 -/* 184E80 802565A0 00000000 */ nop +/* 184E80 802565A0 00000000 */ nop /* 184E84 802565A4 46800020 */ cvt.s.w $f0, $f0 /* 184E88 802565A8 46020002 */ mul.s $f0, $f0, $f2 -/* 184E8C 802565AC 00000000 */ nop +/* 184E8C 802565AC 00000000 */ nop /* 184E90 802565B0 8642016A */ lh $v0, 0x16a($s2) /* 184E94 802565B4 00021023 */ negu $v0, $v0 .L802565B8: /* 184E98 802565B8 44050000 */ mfc1 $a1, $f0 /* 184E9C 802565BC 44820000 */ mtc1 $v0, $f0 -/* 184EA0 802565C0 00000000 */ nop +/* 184EA0 802565C0 00000000 */ nop /* 184EA4 802565C4 46800020 */ cvt.s.w $f0, $f0 /* 184EA8 802565C8 46020002 */ mul.s $f0, $f0, $f2 -/* 184EAC 802565CC 00000000 */ nop +/* 184EAC 802565CC 00000000 */ nop /* 184EB0 802565D0 8642016C */ lh $v0, 0x16c($s2) /* 184EB4 802565D4 44060000 */ mfc1 $a2, $f0 /* 184EB8 802565D8 44820000 */ mtc1 $v0, $f0 -/* 184EBC 802565DC 00000000 */ nop +/* 184EBC 802565DC 00000000 */ nop /* 184EC0 802565E0 46800020 */ cvt.s.w $f0, $f0 /* 184EC4 802565E4 46020002 */ mul.s $f0, $f0, $f2 -/* 184EC8 802565E8 00000000 */ nop +/* 184EC8 802565E8 00000000 */ nop /* 184ECC 802565EC 44070000 */ mfc1 $a3, $f0 /* 184ED0 802565F0 0C019E40 */ jal guTranslateF /* 184ED4 802565F4 27A401E0 */ addiu $a0, $sp, 0x1e0 @@ -447,21 +447,21 @@ glabel func_80255FE0 /* 184F64 80256684 D428D370 */ ldc1 $f8, %lo(D_8029D370)($at) /* 184F68 80256688 46002121 */ cvt.d.s $f4, $f4 /* 184F6C 8025668C 46282102 */ mul.d $f4, $f4, $f8 -/* 184F70 80256690 00000000 */ nop +/* 184F70 80256690 00000000 */ nop /* 184F74 80256694 C6400174 */ lwc1 $f0, 0x174($s2) /* 184F78 80256698 46000021 */ cvt.d.s $f0, $f0 /* 184F7C 8025669C 46280002 */ mul.d $f0, $f0, $f8 -/* 184F80 802566A0 00000000 */ nop +/* 184F80 802566A0 00000000 */ nop /* 184F84 802566A4 C6420178 */ lwc1 $f2, 0x178($s2) /* 184F88 802566A8 460010A1 */ cvt.d.s $f2, $f2 /* 184F8C 802566AC 46281082 */ mul.d $f2, $f2, $f8 -/* 184F90 802566B0 00000000 */ nop +/* 184F90 802566B0 00000000 */ nop /* 184F94 802566B4 C6460188 */ lwc1 $f6, 0x188($s2) /* 184F98 802566B8 460031A1 */ cvt.d.s $f6, $f6 /* 184F9C 802566BC 46262102 */ mul.d $f4, $f4, $f6 -/* 184FA0 802566C0 00000000 */ nop +/* 184FA0 802566C0 00000000 */ nop /* 184FA4 802566C4 46260002 */ mul.d $f0, $f0, $f6 -/* 184FA8 802566C8 00000000 */ nop +/* 184FA8 802566C8 00000000 */ nop /* 184FAC 802566CC 27B00120 */ addiu $s0, $sp, 0x120 /* 184FB0 802566D0 462010A0 */ cvt.s.d $f2, $f2 /* 184FB4 802566D4 44071000 */ mfc1 $a3, $f2 @@ -513,12 +513,12 @@ glabel func_80255FE0 /* 185068 80256788 86220014 */ lh $v0, 0x14($s1) /* 18506C 8025678C C7AA0364 */ lwc1 $f10, 0x364($sp) /* 185070 80256790 44820000 */ mtc1 $v0, $f0 -/* 185074 80256794 00000000 */ nop +/* 185074 80256794 00000000 */ nop /* 185078 80256798 46800020 */ cvt.s.w $f0, $f0 /* 18507C 8025679C 8622001A */ lh $v0, 0x1a($s1) /* 185080 802567A0 46005000 */ add.s $f0, $f10, $f0 /* 185084 802567A4 44821000 */ mtc1 $v0, $f2 -/* 185088 802567A8 00000000 */ nop +/* 185088 802567A8 00000000 */ nop /* 18508C 802567AC 468010A0 */ cvt.s.w $f2, $f2 /* 185090 802567B0 8E420000 */ lw $v0, ($s2) /* 185094 802567B4 30420800 */ andi $v0, $v0, 0x800 @@ -526,24 +526,24 @@ glabel func_80255FE0 /* 18509C 802567BC 46020680 */ add.s $f26, $f0, $f2 /* 1850A0 802567C0 86220016 */ lh $v0, 0x16($s1) /* 1850A4 802567C4 44821000 */ mtc1 $v0, $f2 -/* 1850A8 802567C8 00000000 */ nop +/* 1850A8 802567C8 00000000 */ nop /* 1850AC 802567CC 468010A0 */ cvt.s.w $f2, $f2 /* 1850B0 802567D0 8622001C */ lh $v0, 0x1c($s1) /* 1850B4 802567D4 4602F080 */ add.s $f2, $f30, $f2 /* 1850B8 802567D8 44820000 */ mtc1 $v0, $f0 -/* 1850BC 802567DC 00000000 */ nop +/* 1850BC 802567DC 00000000 */ nop /* 1850C0 802567E0 46800020 */ cvt.s.w $f0, $f0 /* 1850C4 802567E4 08095A05 */ j .L80256814 /* 1850C8 802567E8 46001500 */ add.s $f20, $f2, $f0 .L802567EC: /* 1850CC 802567EC 86220016 */ lh $v0, 0x16($s1) /* 1850D0 802567F0 44821000 */ mtc1 $v0, $f2 -/* 1850D4 802567F4 00000000 */ nop +/* 1850D4 802567F4 00000000 */ nop /* 1850D8 802567F8 468010A0 */ cvt.s.w $f2, $f2 /* 1850DC 802567FC 8622001C */ lh $v0, 0x1c($s1) /* 1850E0 80256800 4602F081 */ sub.s $f2, $f30, $f2 /* 1850E4 80256804 44820000 */ mtc1 $v0, $f0 -/* 1850E8 80256808 00000000 */ nop +/* 1850E8 80256808 00000000 */ nop /* 1850EC 8025680C 46800020 */ cvt.s.w $f0, $f0 /* 1850F0 80256810 46001501 */ sub.s $f20, $f2, $f0 .L80256814: @@ -552,13 +552,13 @@ glabel func_80255FE0 /* 1850FC 8025681C C7AA0368 */ lwc1 $f10, 0x368($sp) /* 185100 80256820 46000606 */ mov.s $f24, $f0 /* 185104 80256824 44821000 */ mtc1 $v0, $f2 -/* 185108 80256828 00000000 */ nop +/* 185108 80256828 00000000 */ nop /* 18510C 8025682C 468010A0 */ cvt.s.w $f2, $f2 /* 185110 80256830 8622001E */ lh $v0, 0x1e($s1) /* 185114 80256834 46025080 */ add.s $f2, $f10, $f2 /* 185118 80256838 E6380064 */ swc1 $f24, 0x64($s1) /* 18511C 8025683C 44820000 */ mtc1 $v0, $f0 -/* 185120 80256840 00000000 */ nop +/* 185120 80256840 00000000 */ nop /* 185124 80256844 46800020 */ cvt.s.w $f0, $f0 /* 185128 80256848 08095A3C */ j .L802568F0 /* 18512C 8025684C 46001580 */ add.s $f22, $f2, $f0 @@ -568,31 +568,31 @@ glabel func_80255FE0 /* 185138 80256858 D420D378 */ ldc1 $f0, %lo(D_8029D378)($at) /* 18513C 8025685C 46004221 */ cvt.d.s $f8, $f8 /* 185140 80256860 46204202 */ mul.d $f8, $f8, $f0 -/* 185144 80256864 00000000 */ nop +/* 185144 80256864 00000000 */ nop /* 185148 80256868 C6460174 */ lwc1 $f6, 0x174($s2) /* 18514C 8025686C 460031A1 */ cvt.d.s $f6, $f6 /* 185150 80256870 46203182 */ mul.d $f6, $f6, $f0 -/* 185154 80256874 00000000 */ nop +/* 185154 80256874 00000000 */ nop /* 185158 80256878 C6420178 */ lwc1 $f2, 0x178($s2) /* 18515C 8025687C 460010A1 */ cvt.d.s $f2, $f2 /* 185160 80256880 46201082 */ mul.d $f2, $f2, $f0 -/* 185164 80256884 00000000 */ nop +/* 185164 80256884 00000000 */ nop /* 185168 80256888 8622001A */ lh $v0, 0x1a($s1) /* 18516C 8025688C C624002C */ lwc1 $f4, 0x2c($s1) /* 185170 80256890 44820000 */ mtc1 $v0, $f0 -/* 185174 80256894 00000000 */ nop +/* 185174 80256894 00000000 */ nop /* 185178 80256898 46800020 */ cvt.s.w $f0, $f0 /* 18517C 8025689C 46002680 */ add.s $f26, $f4, $f0 /* 185180 802568A0 8622001C */ lh $v0, 0x1c($s1) /* 185184 802568A4 C6240030 */ lwc1 $f4, 0x30($s1) /* 185188 802568A8 44820000 */ mtc1 $v0, $f0 -/* 18518C 802568AC 00000000 */ nop +/* 18518C 802568AC 00000000 */ nop /* 185190 802568B0 46800020 */ cvt.s.w $f0, $f0 /* 185194 802568B4 46002500 */ add.s $f20, $f4, $f0 /* 185198 802568B8 8622001E */ lh $v0, 0x1e($s1) /* 18519C 802568BC C6240034 */ lwc1 $f4, 0x34($s1) /* 1851A0 802568C0 44820000 */ mtc1 $v0, $f0 -/* 1851A4 802568C4 00000000 */ nop +/* 1851A4 802568C4 00000000 */ nop /* 1851A8 802568C8 46800020 */ cvt.s.w $f0, $f0 /* 1851AC 802568CC 46204220 */ cvt.s.d $f8, $f8 /* 1851B0 802568D0 462031A0 */ cvt.s.d $f6, $f6 @@ -633,7 +633,7 @@ glabel func_80255FE0 /* 185230 80256950 24030004 */ addiu $v1, $zero, 4 /* 185234 80256954 30420014 */ andi $v0, $v0, 0x14 /* 185238 80256958 14430015 */ bne $v0, $v1, .L802569B0 -/* 18523C 8025695C 00000000 */ nop +/* 18523C 8025695C 00000000 */ nop /* 185240 80256960 82420216 */ lb $v0, 0x216($s2) /* 185244 80256964 14400009 */ bnez $v0, .L8025698C /* 185248 80256968 24050012 */ addiu $a1, $zero, 0x12 @@ -661,7 +661,7 @@ glabel func_80255FE0 /* 185298 802569B8 3C038011 */ lui $v1, %hi(gPlayerData+0x12) /* 18529C 802569BC 8063F2A2 */ lb $v1, %lo(gPlayerData+0x12)($v1) /* 1852A0 802569C0 14620007 */ bne $v1, $v0, .L802569E0 -/* 1852A4 802569C4 00000000 */ nop +/* 1852A4 802569C4 00000000 */ nop /* 1852A8 802569C8 16000005 */ bnez $s0, .L802569E0 /* 1852AC 802569CC 24100001 */ addiu $s0, $zero, 1 /* 1852B0 802569D0 0240202D */ daddu $a0, $s2, $zero @@ -671,7 +671,7 @@ glabel func_80255FE0 .L802569E0: /* 1852C0 802569E0 82420220 */ lb $v0, 0x220($s2) /* 1852C4 802569E4 10400007 */ beqz $v0, .L80256A04 -/* 1852C8 802569E8 00000000 */ nop +/* 1852C8 802569E8 00000000 */ nop /* 1852CC 802569EC 16800005 */ bnez $s4, .L80256A04 /* 1852D0 802569F0 24140001 */ addiu $s4, $zero, 1 /* 1852D4 802569F4 0240202D */ daddu $a0, $s2, $zero @@ -693,7 +693,7 @@ glabel func_80255FE0 /* 185310 80256A30 24020005 */ addiu $v0, $zero, 5 .L80256A34: /* 185314 80256A34 14620007 */ bne $v1, $v0, .L80256A54 -/* 185318 80256A38 00000000 */ nop +/* 185318 80256A38 00000000 */ nop /* 18531C 80256A3C 16000005 */ bnez $s0, .L80256A54 /* 185320 80256A40 24100001 */ addiu $s0, $zero, 1 /* 185324 80256A44 0240202D */ daddu $a0, $s2, $zero @@ -704,7 +704,7 @@ glabel func_80255FE0 /* 185334 80256A54 82430210 */ lb $v1, 0x210($s2) /* 185338 80256A58 24020003 */ addiu $v0, $zero, 3 /* 18533C 80256A5C 14620007 */ bne $v1, $v0, .L80256A7C -/* 185340 80256A60 00000000 */ nop +/* 185340 80256A60 00000000 */ nop /* 185344 80256A64 16000005 */ bnez $s0, .L80256A7C /* 185348 80256A68 24100001 */ addiu $s0, $zero, 1 /* 18534C 80256A6C 0240202D */ daddu $a0, $s2, $zero @@ -715,7 +715,7 @@ glabel func_80255FE0 /* 18535C 80256A7C 82430212 */ lb $v1, 0x212($s2) /* 185360 80256A80 2402000B */ addiu $v0, $zero, 0xb /* 185364 80256A84 14620007 */ bne $v1, $v0, .L80256AA4 -/* 185368 80256A88 00000000 */ nop +/* 185368 80256A88 00000000 */ nop /* 18536C 80256A8C 16000005 */ bnez $s0, .L80256AA4 /* 185370 80256A90 24100001 */ addiu $s0, $zero, 1 /* 185374 80256A94 0240202D */ daddu $a0, $s2, $zero @@ -752,24 +752,24 @@ glabel func_80255FE0 /* 1853E4 80256B04 24020007 */ addiu $v0, $zero, 7 /* 1853E8 80256B08 82430210 */ lb $v1, 0x210($s2) /* 1853EC 80256B0C 10620012 */ beq $v1, $v0, .L80256B58 -/* 1853F0 80256B10 00000000 */ nop +/* 1853F0 80256B10 00000000 */ nop /* 1853F4 80256B14 2402000A */ addiu $v0, $zero, 0xa /* 1853F8 80256B18 10620015 */ beq $v1, $v0, .L80256B70 /* 1853FC 80256B1C 24020009 */ addiu $v0, $zero, 9 /* 185400 80256B20 1062000D */ beq $v1, $v0, .L80256B58 -/* 185404 80256B24 00000000 */ nop +/* 185404 80256B24 00000000 */ nop /* 185408 80256B28 24020004 */ addiu $v0, $zero, 4 /* 18540C 80256B2C 1062000A */ beq $v1, $v0, .L80256B58 -/* 185410 80256B30 00000000 */ nop +/* 185410 80256B30 00000000 */ nop /* 185414 80256B34 24020003 */ addiu $v0, $zero, 3 /* 185418 80256B38 10620007 */ beq $v1, $v0, .L80256B58 -/* 18541C 80256B3C 00000000 */ nop +/* 18541C 80256B3C 00000000 */ nop /* 185420 80256B40 24020006 */ addiu $v0, $zero, 6 /* 185424 80256B44 10620004 */ beq $v1, $v0, .L80256B58 -/* 185428 80256B48 00000000 */ nop +/* 185428 80256B48 00000000 */ nop /* 18542C 80256B4C 24020005 */ addiu $v0, $zero, 5 /* 185430 80256B50 14620007 */ bne $v1, $v0, .L80256B70 -/* 185434 80256B54 00000000 */ nop +/* 185434 80256B54 00000000 */ nop .L80256B58: /* 185438 80256B58 16600005 */ bnez $s3, .L80256B70 /* 18543C 80256B5C 0040282D */ daddu $a1, $v0, $zero @@ -781,7 +781,7 @@ glabel func_80255FE0 /* 185450 80256B70 82430212 */ lb $v1, 0x212($s2) /* 185454 80256B74 2402000B */ addiu $v0, $zero, 0xb /* 185458 80256B78 14620007 */ bne $v1, $v0, .L80256B98 -/* 18545C 80256B7C 00000000 */ nop +/* 18545C 80256B7C 00000000 */ nop /* 185460 80256B80 16600005 */ bnez $s3, .L80256B98 /* 185464 80256B84 0040282D */ daddu $a1, $v0, $zero /* 185468 80256B88 8E240094 */ lw $a0, 0x94($s1) @@ -790,7 +790,7 @@ glabel func_80255FE0 /* 185474 80256B94 AE220088 */ sw $v0, 0x88($s1) .L80256B98: /* 185478 80256B98 16600005 */ bnez $s3, .L80256BB0 -/* 18547C 80256B9C 00000000 */ nop +/* 18547C 80256B9C 00000000 */ nop /* 185480 80256BA0 8E240094 */ lw $a0, 0x94($s1) /* 185484 80256BA4 0C09973A */ jal func_80265CE8 /* 185488 80256BA8 24050001 */ addiu $a1, $zero, 1 @@ -818,13 +818,13 @@ glabel func_80255FE0 /* 1854D8 80256BF8 8E240094 */ lw $a0, 0x94($s1) .L80256BFC: /* 1854DC 80256BFC 0C09973A */ jal func_80265CE8 -/* 1854E0 80256C00 00000000 */ nop +/* 1854E0 80256C00 00000000 */ nop /* 1854E4 80256C04 AE220088 */ sw $v0, 0x88($s1) .L80256C08: /* 1854E8 80256C08 82430210 */ lb $v1, 0x210($s2) /* 1854EC 80256C0C 24020008 */ addiu $v0, $zero, 8 /* 1854F0 80256C10 14620019 */ bne $v1, $v0, .L80256C78 -/* 1854F4 80256C14 00000000 */ nop +/* 1854F4 80256C14 00000000 */ nop /* 1854F8 80256C18 8E240094 */ lw $a0, 0x94($s1) /* 1854FC 80256C1C 0C09973A */ jal func_80265CE8 /* 185500 80256C20 0040282D */ daddu $a1, $v0, $zero @@ -833,7 +833,7 @@ glabel func_80255FE0 /* 18550C 80256C2C 0C011E08 */ jal func_80047820 /* 185510 80256C30 24050008 */ addiu $a1, $zero, 8 /* 185514 80256C34 08095B2D */ j .L80256CB4 -/* 185518 80256C38 00000000 */ nop +/* 185518 80256C38 00000000 */ nop .L80256C3C: /* 18551C 80256C3C 86440436 */ lh $a0, 0x436($s2) /* 185520 80256C40 08095B44 */ j .L80256D10 @@ -856,7 +856,7 @@ glabel func_80255FE0 /* 185554 80256C74 2405000A */ addiu $a1, $zero, 0xa .L80256C78: /* 185558 80256C78 1660000E */ bnez $s3, .L80256CB4 -/* 18555C 80256C7C 00000000 */ nop +/* 18555C 80256C7C 00000000 */ nop /* 185560 80256C80 8E240094 */ lw $a0, 0x94($s1) /* 185564 80256C84 0C09973A */ jal func_80265CE8 /* 185568 80256C88 24050001 */ addiu $a1, $zero, 1 @@ -865,7 +865,7 @@ glabel func_80255FE0 /* 185574 80256C94 0C09973A */ jal func_80265CE8 /* 185578 80256C98 24050008 */ addiu $a1, $zero, 8 /* 18557C 80256C9C 16020005 */ bne $s0, $v0, .L80256CB4 -/* 185580 80256CA0 00000000 */ nop +/* 185580 80256CA0 00000000 */ nop /* 185584 80256CA4 8E240094 */ lw $a0, 0x94($s1) /* 185588 80256CA8 0C09973A */ jal func_80265CE8 /* 18558C 80256CAC 24050001 */ addiu $a1, $zero, 1 @@ -896,12 +896,12 @@ glabel func_80255FE0 /* 1855EC 80256D0C 86440436 */ lh $a0, 0x436($s2) .L80256D10: /* 1855F0 80256D10 0C011E08 */ jal func_80047820 -/* 1855F4 80256D14 00000000 */ nop +/* 1855F4 80256D14 00000000 */ nop .L80256D18: /* 1855F8 80256D18 82430212 */ lb $v1, 0x212($s2) /* 1855FC 80256D1C 2402000B */ addiu $v0, $zero, 0xb /* 185600 80256D20 14620004 */ bne $v1, $v0, .L80256D34 -/* 185604 80256D24 00000000 */ nop +/* 185604 80256D24 00000000 */ nop /* 185608 80256D28 86440436 */ lh $a0, 0x436($s2) /* 18560C 80256D2C 0C011E4A */ jal func_80047928 /* 185610 80256D30 0040282D */ daddu $a1, $v0, $zero @@ -909,11 +909,11 @@ glabel func_80255FE0 /* 185614 80256D34 82430218 */ lb $v1, 0x218($s2) /* 185618 80256D38 2402000E */ addiu $v0, $zero, 0xe /* 18561C 80256D3C 10620005 */ beq $v1, $v0, .L80256D54 -/* 185620 80256D40 00000000 */ nop +/* 185620 80256D40 00000000 */ nop /* 185624 80256D44 8E220000 */ lw $v0, ($s1) /* 185628 80256D48 30420100 */ andi $v0, $v0, 0x100 /* 18562C 80256D4C 10400004 */ beqz $v0, .L80256D60 -/* 185630 80256D50 00000000 */ nop +/* 185630 80256D50 00000000 */ nop .L80256D54: /* 185634 80256D54 86440436 */ lh $a0, 0x436($s2) /* 185638 80256D58 0C011E8C */ jal func_80047A30 @@ -921,11 +921,11 @@ glabel func_80255FE0 .L80256D60: /* 185640 80256D60 82420223 */ lb $v0, 0x223($s2) /* 185644 80256D64 1040000D */ beqz $v0, .L80256D9C -/* 185648 80256D68 00000000 */ nop +/* 185648 80256D68 00000000 */ nop /* 18564C 80256D6C 0C011ECE */ jal func_80047B38 /* 185650 80256D70 86440436 */ lh $a0, 0x436($s2) /* 185654 80256D74 08095B67 */ j .L80256D9C -/* 185658 80256D78 00000000 */ nop +/* 185658 80256D78 00000000 */ nop .L80256D7C: /* 18565C 80256D7C 0C011E3E */ jal func_800478F8 /* 185660 80256D80 86440436 */ lh $a0, 0x436($s2) @@ -938,10 +938,10 @@ glabel func_80255FE0 .L80256D9C: /* 18567C 80256D9C 8E240084 */ lw $a0, 0x84($s1) /* 185680 80256DA0 04800009 */ bltz $a0, .L80256DC8 -/* 185684 80256DA4 00000000 */ nop +/* 185684 80256DA4 00000000 */ nop /* 185688 80256DA8 8E250088 */ lw $a1, 0x88($s1) /* 18568C 80256DAC 13C50006 */ beq $fp, $a1, .L80256DC8 -/* 185690 80256DB0 00000000 */ nop +/* 185690 80256DB0 00000000 */ nop /* 185694 80256DB4 0C0B78AB */ jal func_802DE2AC /* 185698 80256DB8 8E260090 */ lw $a2, 0x90($s1) /* 18569C 80256DBC 0C0B7972 */ jal func_802DE5C8 @@ -951,41 +951,41 @@ glabel func_80255FE0 /* 1856A8 80256DC8 8E420000 */ lw $v0, ($s2) /* 1856AC 80256DCC 30420800 */ andi $v0, $v0, 0x800 /* 1856B0 80256DD0 14400025 */ bnez $v0, .L80256E68 -/* 1856B4 80256DD4 00000000 */ nop +/* 1856B4 80256DD4 00000000 */ nop /* 1856B8 80256DD8 86220044 */ lh $v0, 0x44($s1) /* 1856BC 80256DDC C6420188 */ lwc1 $f2, 0x188($s2) /* 1856C0 80256DE0 00021023 */ negu $v0, $v0 /* 1856C4 80256DE4 44820000 */ mtc1 $v0, $f0 -/* 1856C8 80256DE8 00000000 */ nop +/* 1856C8 80256DE8 00000000 */ nop /* 1856CC 80256DEC 46800020 */ cvt.s.w $f0, $f0 /* 1856D0 80256DF0 46020002 */ mul.s $f0, $f0, $f2 -/* 1856D4 80256DF4 00000000 */ nop +/* 1856D4 80256DF4 00000000 */ nop /* 1856D8 80256DF8 86220046 */ lh $v0, 0x46($s1) /* 1856DC 80256DFC 00021023 */ negu $v0, $v0 /* 1856E0 80256E00 44050000 */ mfc1 $a1, $f0 /* 1856E4 80256E04 44820000 */ mtc1 $v0, $f0 -/* 1856E8 80256E08 00000000 */ nop +/* 1856E8 80256E08 00000000 */ nop /* 1856EC 80256E0C 46800020 */ cvt.s.w $f0, $f0 /* 1856F0 80256E10 46020002 */ mul.s $f0, $f0, $f2 -/* 1856F4 80256E14 00000000 */ nop +/* 1856F4 80256E14 00000000 */ nop /* 1856F8 80256E18 86220048 */ lh $v0, 0x48($s1) /* 1856FC 80256E1C 00021023 */ negu $v0, $v0 /* 185700 80256E20 44060000 */ mfc1 $a2, $f0 /* 185704 80256E24 44820000 */ mtc1 $v0, $f0 -/* 185708 80256E28 00000000 */ nop +/* 185708 80256E28 00000000 */ nop /* 18570C 80256E2C 46800020 */ cvt.s.w $f0, $f0 /* 185710 80256E30 46020002 */ mul.s $f0, $f0, $f2 -/* 185714 80256E34 00000000 */ nop +/* 185714 80256E34 00000000 */ nop /* 185718 80256E38 44070000 */ mfc1 $a3, $f0 /* 18571C 80256E3C 0C019E40 */ jal guTranslateF /* 185720 80256E40 27A401A0 */ addiu $a0, $sp, 0x1a0 /* 185724 80256E44 86220044 */ lh $v0, 0x44($s1) /* 185728 80256E48 C6420188 */ lwc1 $f2, 0x188($s2) /* 18572C 80256E4C 44820000 */ mtc1 $v0, $f0 -/* 185730 80256E50 00000000 */ nop +/* 185730 80256E50 00000000 */ nop /* 185734 80256E54 46800020 */ cvt.s.w $f0, $f0 /* 185738 80256E58 46020002 */ mul.s $f0, $f0, $f2 -/* 18573C 80256E5C 00000000 */ nop +/* 18573C 80256E5C 00000000 */ nop /* 185740 80256E60 08095BBD */ j .L80256EF4 /* 185744 80256E64 86220046 */ lh $v0, 0x46($s1) .L80256E68: @@ -993,63 +993,63 @@ glabel func_80255FE0 /* 18574C 80256E6C C6420188 */ lwc1 $f2, 0x188($s2) /* 185750 80256E70 00021023 */ negu $v0, $v0 /* 185754 80256E74 44820000 */ mtc1 $v0, $f0 -/* 185758 80256E78 00000000 */ nop +/* 185758 80256E78 00000000 */ nop /* 18575C 80256E7C 46800020 */ cvt.s.w $f0, $f0 /* 185760 80256E80 46020002 */ mul.s $f0, $f0, $f2 -/* 185764 80256E84 00000000 */ nop +/* 185764 80256E84 00000000 */ nop /* 185768 80256E88 86220046 */ lh $v0, 0x46($s1) /* 18576C 80256E8C 44050000 */ mfc1 $a1, $f0 /* 185770 80256E90 44820000 */ mtc1 $v0, $f0 -/* 185774 80256E94 00000000 */ nop +/* 185774 80256E94 00000000 */ nop /* 185778 80256E98 46800020 */ cvt.s.w $f0, $f0 /* 18577C 80256E9C 46020002 */ mul.s $f0, $f0, $f2 -/* 185780 80256EA0 00000000 */ nop +/* 185780 80256EA0 00000000 */ nop /* 185784 80256EA4 86220048 */ lh $v0, 0x48($s1) /* 185788 80256EA8 00021023 */ negu $v0, $v0 /* 18578C 80256EAC 44060000 */ mfc1 $a2, $f0 /* 185790 80256EB0 44820000 */ mtc1 $v0, $f0 -/* 185794 80256EB4 00000000 */ nop +/* 185794 80256EB4 00000000 */ nop /* 185798 80256EB8 46800020 */ cvt.s.w $f0, $f0 /* 18579C 80256EBC 46020002 */ mul.s $f0, $f0, $f2 -/* 1857A0 80256EC0 00000000 */ nop +/* 1857A0 80256EC0 00000000 */ nop /* 1857A4 80256EC4 44070000 */ mfc1 $a3, $f0 /* 1857A8 80256EC8 0C019E40 */ jal guTranslateF /* 1857AC 80256ECC 27A401A0 */ addiu $a0, $sp, 0x1a0 /* 1857B0 80256ED0 86220044 */ lh $v0, 0x44($s1) /* 1857B4 80256ED4 C6420188 */ lwc1 $f2, 0x188($s2) /* 1857B8 80256ED8 44820000 */ mtc1 $v0, $f0 -/* 1857BC 80256EDC 00000000 */ nop +/* 1857BC 80256EDC 00000000 */ nop /* 1857C0 80256EE0 46800020 */ cvt.s.w $f0, $f0 /* 1857C4 80256EE4 46020002 */ mul.s $f0, $f0, $f2 -/* 1857C8 80256EE8 00000000 */ nop +/* 1857C8 80256EE8 00000000 */ nop /* 1857CC 80256EEC 86220046 */ lh $v0, 0x46($s1) /* 1857D0 80256EF0 00021023 */ negu $v0, $v0 .L80256EF4: /* 1857D4 80256EF4 44050000 */ mfc1 $a1, $f0 /* 1857D8 80256EF8 44820000 */ mtc1 $v0, $f0 -/* 1857DC 80256EFC 00000000 */ nop +/* 1857DC 80256EFC 00000000 */ nop /* 1857E0 80256F00 46800020 */ cvt.s.w $f0, $f0 /* 1857E4 80256F04 46020002 */ mul.s $f0, $f0, $f2 -/* 1857E8 80256F08 00000000 */ nop +/* 1857E8 80256F08 00000000 */ nop /* 1857EC 80256F0C 86220048 */ lh $v0, 0x48($s1) /* 1857F0 80256F10 44060000 */ mfc1 $a2, $f0 /* 1857F4 80256F14 44820000 */ mtc1 $v0, $f0 -/* 1857F8 80256F18 00000000 */ nop +/* 1857F8 80256F18 00000000 */ nop /* 1857FC 80256F1C 46800020 */ cvt.s.w $f0, $f0 /* 185800 80256F20 46020002 */ mul.s $f0, $f0, $f2 -/* 185804 80256F24 00000000 */ nop +/* 185804 80256F24 00000000 */ nop /* 185808 80256F28 44070000 */ mfc1 $a3, $f0 /* 18580C 80256F2C 0C019E40 */ jal guTranslateF /* 185810 80256F30 27A401E0 */ addiu $a0, $sp, 0x1e0 /* 185814 80256F34 86220068 */ lh $v0, 0x68($s1) /* 185818 80256F38 44820000 */ mtc1 $v0, $f0 -/* 18581C 80256F3C 00000000 */ nop +/* 18581C 80256F3C 00000000 */ nop /* 185820 80256F40 46800020 */ cvt.s.w $f0, $f0 /* 185824 80256F44 4600D000 */ add.s $f0, $f26, $f0 /* 185828 80256F48 8622006A */ lh $v0, 0x6a($s1) /* 18582C 80256F4C 44050000 */ mfc1 $a1, $f0 /* 185830 80256F50 44820000 */ mtc1 $v0, $f0 -/* 185834 80256F54 00000000 */ nop +/* 185834 80256F54 00000000 */ nop /* 185838 80256F58 46800020 */ cvt.s.w $f0, $f0 /* 18583C 80256F5C 4600A000 */ add.s $f0, $f20, $f0 /* 185840 80256F60 4407B000 */ mfc1 $a3, $f22 @@ -1088,10 +1088,10 @@ glabel func_80255FE0 /* 1858C4 80256FE4 82220074 */ lb $v0, 0x74($s1) /* 1858C8 80256FE8 C6220050 */ lwc1 $f2, 0x50($s1) /* 1858CC 80256FEC 44820000 */ mtc1 $v0, $f0 -/* 1858D0 80256FF0 00000000 */ nop +/* 1858D0 80256FF0 00000000 */ nop /* 1858D4 80256FF4 46800020 */ cvt.s.w $f0, $f0 /* 1858D8 80256FF8 46001082 */ mul.s $f2, $f2, $f0 -/* 1858DC 80256FFC 00000000 */ nop +/* 1858DC 80256FFC 00000000 */ nop /* 1858E0 80257000 27B00120 */ addiu $s0, $sp, 0x120 /* 1858E4 80257004 8E25004C */ lw $a1, 0x4c($s1) /* 1858E8 80257008 8E270054 */ lw $a3, 0x54($s1) @@ -1128,12 +1128,12 @@ glabel func_80255FE0 /* 18595C 8025707C 02A0302D */ daddu $a2, $s5, $zero /* 185960 80257080 86220068 */ lh $v0, 0x68($s1) /* 185964 80257084 44821000 */ mtc1 $v0, $f2 -/* 185968 80257088 00000000 */ nop +/* 185968 80257088 00000000 */ nop /* 18596C 8025708C 468010A0 */ cvt.s.w $f2, $f2 /* 185970 80257090 8622006A */ lh $v0, 0x6a($s1) /* 185974 80257094 4602D080 */ add.s $f2, $f26, $f2 /* 185978 80257098 44820000 */ mtc1 $v0, $f0 -/* 18597C 8025709C 00000000 */ nop +/* 18597C 8025709C 00000000 */ nop /* 185980 802570A0 46800020 */ cvt.s.w $f0, $f0 /* 185984 802570A4 8E220084 */ lw $v0, 0x84($s1) /* 185988 802570A8 4600A000 */ add.s $f0, $f20, $f0 @@ -1147,7 +1147,7 @@ glabel func_80255FE0 /* 1859A8 802570C8 24040001 */ addiu $a0, $zero, 1 /* 1859AC 802570CC 4600C28D */ trunc.w.s $f10, $f24 /* 1859B0 802570D0 44105000 */ mfc1 $s0, $f10 -/* 1859B4 802570D4 00000000 */ nop +/* 1859B4 802570D4 00000000 */ nop /* 1859B8 802570D8 0200302D */ daddu $a2, $s0, $zero /* 1859BC 802570DC 0C097210 */ jal func_8025C840 /* 1859C0 802570E0 0000382D */ daddu $a3, $zero, $zero @@ -1165,7 +1165,7 @@ glabel func_80255FE0 .L80257110: /* 1859F0 80257110 3C014334 */ lui $at, 0x4334 /* 1859F4 80257114 4481A000 */ mtc1 $at, $f20 -/* 1859F8 80257118 00000000 */ nop +/* 1859F8 80257118 00000000 */ nop /* 1859FC 8025711C 4618A501 */ sub.s $f20, $f20, $f24 /* 185A00 80257120 0C00A6C9 */ jal clamp_angle /* 185A04 80257124 4600A306 */ mov.s $f12, $f20 @@ -1193,7 +1193,7 @@ glabel func_80255FE0 /* 185A5C 8025717C AFA00010 */ sw $zero, 0x10($sp) .L80257180: /* 185A60 80257180 0C09647B */ jal func_802591EC -/* 185A64 80257184 00000000 */ nop +/* 185A64 80257184 00000000 */ nop /* 185A68 80257188 0C0973B2 */ jal func_8025CEC8 /* 185A6C 8025718C 0220202D */ daddu $a0, $s1, $zero .L80257190: @@ -1202,7 +1202,7 @@ glabel func_80255FE0 /* 185A78 80257198 26F70001 */ addiu $s7, $s7, 1 /* 185A7C 8025719C 02E8102A */ slt $v0, $s7, $t0 /* 185A80 802571A0 1440FD74 */ bnez $v0, .L80256774 -/* 185A84 802571A4 00000000 */ nop +/* 185A84 802571A4 00000000 */ nop .L802571A8: /* 185A88 802571A8 8FBF039C */ lw $ra, 0x39c($sp) /* 185A8C 802571AC 8FBE0398 */ lw $fp, 0x398($sp) diff --git a/asm/nonmatchings/code_182B30/func_802571F0.s b/asm/nonmatchings/code_182B30/func_802571F0.s index 89a9dd0fae..4bd6d05448 100644 --- a/asm/nonmatchings/code_182B30/func_802571F0.s +++ b/asm/nonmatchings/code_182B30/func_802571F0.s @@ -24,7 +24,7 @@ glabel func_802571F0 /* 185B1C 8025723C 86420150 */ lh $v0, 0x150($s2) /* 185B20 80257240 C6400144 */ lwc1 $f0, 0x144($s2) /* 185B24 80257244 44821000 */ mtc1 $v0, $f2 -/* 185B28 80257248 00000000 */ nop +/* 185B28 80257248 00000000 */ nop /* 185B2C 8025724C 468010A0 */ cvt.s.w $f2, $f2 /* 185B30 80257250 46020000 */ add.s $f0, $f0, $f2 /* 185B34 80257254 8E420000 */ lw $v0, ($s2) @@ -34,7 +34,7 @@ glabel func_802571F0 /* 185B44 80257264 86420152 */ lh $v0, 0x152($s2) /* 185B48 80257268 C6420148 */ lwc1 $f2, 0x148($s2) /* 185B4C 8025726C 44820000 */ mtc1 $v0, $f0 -/* 185B50 80257270 00000000 */ nop +/* 185B50 80257270 00000000 */ nop /* 185B54 80257274 46800020 */ cvt.s.w $f0, $f0 /* 185B58 80257278 08095CA6 */ j .L80257298 /* 185B5C 8025727C 46001080 */ add.s $f2, $f2, $f0 @@ -42,7 +42,7 @@ glabel func_802571F0 /* 185B60 80257280 86420152 */ lh $v0, 0x152($s2) /* 185B64 80257284 C6420148 */ lwc1 $f2, 0x148($s2) /* 185B68 80257288 44820000 */ mtc1 $v0, $f0 -/* 185B6C 8025728C 00000000 */ nop +/* 185B6C 8025728C 00000000 */ nop /* 185B70 80257290 46800020 */ cvt.s.w $f0, $f0 /* 185B74 80257294 46001081 */ sub.s $f2, $f2, $f0 .L80257298: @@ -50,7 +50,7 @@ glabel func_802571F0 /* 185B7C 8025729C 86420154 */ lh $v0, 0x154($s2) /* 185B80 802572A0 C642014C */ lwc1 $f2, 0x14c($s2) /* 185B84 802572A4 44820000 */ mtc1 $v0, $f0 -/* 185B88 802572A8 00000000 */ nop +/* 185B88 802572A8 00000000 */ nop /* 185B8C 802572AC 46800020 */ cvt.s.w $f0, $f0 /* 185B90 802572B0 46001080 */ add.s $f2, $f2, $f0 /* 185B94 802572B4 3C0140A0 */ lui $at, 0x40a0 @@ -64,36 +64,36 @@ glabel func_802571F0 /* 185BB4 802572D4 C6420188 */ lwc1 $f2, 0x188($s2) /* 185BB8 802572D8 00021023 */ negu $v0, $v0 /* 185BBC 802572DC 44820000 */ mtc1 $v0, $f0 -/* 185BC0 802572E0 00000000 */ nop +/* 185BC0 802572E0 00000000 */ nop /* 185BC4 802572E4 46800020 */ cvt.s.w $f0, $f0 /* 185BC8 802572E8 46020002 */ mul.s $f0, $f0, $f2 -/* 185BCC 802572EC 00000000 */ nop +/* 185BCC 802572EC 00000000 */ nop /* 185BD0 802572F0 8642016A */ lh $v0, 0x16a($s2) /* 185BD4 802572F4 00021023 */ negu $v0, $v0 /* 185BD8 802572F8 44050000 */ mfc1 $a1, $f0 /* 185BDC 802572FC 44820000 */ mtc1 $v0, $f0 -/* 185BE0 80257300 00000000 */ nop +/* 185BE0 80257300 00000000 */ nop /* 185BE4 80257304 46800020 */ cvt.s.w $f0, $f0 /* 185BE8 80257308 46020002 */ mul.s $f0, $f0, $f2 -/* 185BEC 8025730C 00000000 */ nop +/* 185BEC 8025730C 00000000 */ nop /* 185BF0 80257310 8642016C */ lh $v0, 0x16c($s2) /* 185BF4 80257314 00021023 */ negu $v0, $v0 /* 185BF8 80257318 44060000 */ mfc1 $a2, $f0 /* 185BFC 8025731C 44820000 */ mtc1 $v0, $f0 -/* 185C00 80257320 00000000 */ nop +/* 185C00 80257320 00000000 */ nop /* 185C04 80257324 46800020 */ cvt.s.w $f0, $f0 /* 185C08 80257328 46020002 */ mul.s $f0, $f0, $f2 -/* 185C0C 8025732C 00000000 */ nop +/* 185C0C 8025732C 00000000 */ nop /* 185C10 80257330 44070000 */ mfc1 $a3, $f0 /* 185C14 80257334 0C019E40 */ jal guTranslateF /* 185C18 80257338 27A40158 */ addiu $a0, $sp, 0x158 /* 185C1C 8025733C 86420168 */ lh $v0, 0x168($s2) /* 185C20 80257340 C6420188 */ lwc1 $f2, 0x188($s2) /* 185C24 80257344 44820000 */ mtc1 $v0, $f0 -/* 185C28 80257348 00000000 */ nop +/* 185C28 80257348 00000000 */ nop /* 185C2C 8025734C 46800020 */ cvt.s.w $f0, $f0 /* 185C30 80257350 46020002 */ mul.s $f0, $f0, $f2 -/* 185C34 80257354 00000000 */ nop +/* 185C34 80257354 00000000 */ nop /* 185C38 80257358 08095CFB */ j .L802573EC /* 185C3C 8025735C 8642016A */ lh $v0, 0x16a($s2) .L80257360: @@ -101,51 +101,51 @@ glabel func_802571F0 /* 185C44 80257364 C6420188 */ lwc1 $f2, 0x188($s2) /* 185C48 80257368 00021023 */ negu $v0, $v0 /* 185C4C 8025736C 44820000 */ mtc1 $v0, $f0 -/* 185C50 80257370 00000000 */ nop +/* 185C50 80257370 00000000 */ nop /* 185C54 80257374 46800020 */ cvt.s.w $f0, $f0 /* 185C58 80257378 46020002 */ mul.s $f0, $f0, $f2 -/* 185C5C 8025737C 00000000 */ nop +/* 185C5C 8025737C 00000000 */ nop /* 185C60 80257380 8642016A */ lh $v0, 0x16a($s2) /* 185C64 80257384 44050000 */ mfc1 $a1, $f0 /* 185C68 80257388 44820000 */ mtc1 $v0, $f0 -/* 185C6C 8025738C 00000000 */ nop +/* 185C6C 8025738C 00000000 */ nop /* 185C70 80257390 46800020 */ cvt.s.w $f0, $f0 /* 185C74 80257394 46020002 */ mul.s $f0, $f0, $f2 -/* 185C78 80257398 00000000 */ nop +/* 185C78 80257398 00000000 */ nop /* 185C7C 8025739C 8642016C */ lh $v0, 0x16c($s2) /* 185C80 802573A0 00021023 */ negu $v0, $v0 /* 185C84 802573A4 44060000 */ mfc1 $a2, $f0 /* 185C88 802573A8 44820000 */ mtc1 $v0, $f0 -/* 185C8C 802573AC 00000000 */ nop +/* 185C8C 802573AC 00000000 */ nop /* 185C90 802573B0 46800020 */ cvt.s.w $f0, $f0 /* 185C94 802573B4 46020002 */ mul.s $f0, $f0, $f2 -/* 185C98 802573B8 00000000 */ nop +/* 185C98 802573B8 00000000 */ nop /* 185C9C 802573BC 44070000 */ mfc1 $a3, $f0 /* 185CA0 802573C0 0C019E40 */ jal guTranslateF /* 185CA4 802573C4 27A40158 */ addiu $a0, $sp, 0x158 /* 185CA8 802573C8 86420168 */ lh $v0, 0x168($s2) /* 185CAC 802573CC C6420188 */ lwc1 $f2, 0x188($s2) /* 185CB0 802573D0 44820000 */ mtc1 $v0, $f0 -/* 185CB4 802573D4 00000000 */ nop +/* 185CB4 802573D4 00000000 */ nop /* 185CB8 802573D8 46800020 */ cvt.s.w $f0, $f0 /* 185CBC 802573DC 46020002 */ mul.s $f0, $f0, $f2 -/* 185CC0 802573E0 00000000 */ nop +/* 185CC0 802573E0 00000000 */ nop /* 185CC4 802573E4 8642016A */ lh $v0, 0x16a($s2) /* 185CC8 802573E8 00021023 */ negu $v0, $v0 .L802573EC: /* 185CCC 802573EC 44050000 */ mfc1 $a1, $f0 /* 185CD0 802573F0 44820000 */ mtc1 $v0, $f0 -/* 185CD4 802573F4 00000000 */ nop +/* 185CD4 802573F4 00000000 */ nop /* 185CD8 802573F8 46800020 */ cvt.s.w $f0, $f0 /* 185CDC 802573FC 46020002 */ mul.s $f0, $f0, $f2 -/* 185CE0 80257400 00000000 */ nop +/* 185CE0 80257400 00000000 */ nop /* 185CE4 80257404 8642016C */ lh $v0, 0x16c($s2) /* 185CE8 80257408 44060000 */ mfc1 $a2, $f0 /* 185CEC 8025740C 44820000 */ mtc1 $v0, $f0 -/* 185CF0 80257410 00000000 */ nop +/* 185CF0 80257410 00000000 */ nop /* 185CF4 80257414 46800020 */ cvt.s.w $f0, $f0 /* 185CF8 80257418 46020002 */ mul.s $f0, $f0, $f2 -/* 185CFC 8025741C 00000000 */ nop +/* 185CFC 8025741C 00000000 */ nop /* 185D00 80257420 44070000 */ mfc1 $a3, $f0 /* 185D04 80257424 0C019E40 */ jal guTranslateF /* 185D08 80257428 27A40198 */ addiu $a0, $sp, 0x198 @@ -187,21 +187,21 @@ glabel func_802571F0 /* 185D98 802574B8 D434D380 */ ldc1 $f20, %lo(D_8029D380)($at) /* 185D9C 802574BC 46002121 */ cvt.d.s $f4, $f4 /* 185DA0 802574C0 46342102 */ mul.d $f4, $f4, $f20 -/* 185DA4 802574C4 00000000 */ nop +/* 185DA4 802574C4 00000000 */ nop /* 185DA8 802574C8 C6400174 */ lwc1 $f0, 0x174($s2) /* 185DAC 802574CC 46000021 */ cvt.d.s $f0, $f0 /* 185DB0 802574D0 46340002 */ mul.d $f0, $f0, $f20 -/* 185DB4 802574D4 00000000 */ nop +/* 185DB4 802574D4 00000000 */ nop /* 185DB8 802574D8 C6420178 */ lwc1 $f2, 0x178($s2) /* 185DBC 802574DC 460010A1 */ cvt.d.s $f2, $f2 /* 185DC0 802574E0 46341082 */ mul.d $f2, $f2, $f20 -/* 185DC4 802574E4 00000000 */ nop +/* 185DC4 802574E4 00000000 */ nop /* 185DC8 802574E8 C6460188 */ lwc1 $f6, 0x188($s2) /* 185DCC 802574EC 460031A1 */ cvt.d.s $f6, $f6 /* 185DD0 802574F0 46262102 */ mul.d $f4, $f4, $f6 -/* 185DD4 802574F4 00000000 */ nop +/* 185DD4 802574F4 00000000 */ nop /* 185DD8 802574F8 46260002 */ mul.d $f0, $f0, $f6 -/* 185DDC 802574FC 00000000 */ nop +/* 185DDC 802574FC 00000000 */ nop /* 185DE0 80257500 27B40118 */ addiu $s4, $sp, 0x118 /* 185DE4 80257504 462010A0 */ cvt.s.d $f2, $f2 /* 185DE8 80257508 44071000 */ mfc1 $a3, $f2 @@ -245,12 +245,12 @@ glabel func_802571F0 /* 185E7C 8025759C 86220014 */ lh $v0, 0x14($s1) /* 185E80 802575A0 C7AA0358 */ lwc1 $f10, 0x358($sp) /* 185E84 802575A4 44820000 */ mtc1 $v0, $f0 -/* 185E88 802575A8 00000000 */ nop +/* 185E88 802575A8 00000000 */ nop /* 185E8C 802575AC 46800020 */ cvt.s.w $f0, $f0 /* 185E90 802575B0 8622001A */ lh $v0, 0x1a($s1) /* 185E94 802575B4 46005000 */ add.s $f0, $f10, $f0 /* 185E98 802575B8 44821000 */ mtc1 $v0, $f2 -/* 185E9C 802575BC 00000000 */ nop +/* 185E9C 802575BC 00000000 */ nop /* 185EA0 802575C0 468010A0 */ cvt.s.w $f2, $f2 /* 185EA4 802575C4 8E420000 */ lw $v0, ($s2) /* 185EA8 802575C8 30420800 */ andi $v0, $v0, 0x800 @@ -259,12 +259,12 @@ glabel func_802571F0 /* 185EB4 802575D4 86220016 */ lh $v0, 0x16($s1) /* 185EB8 802575D8 C7AA035C */ lwc1 $f10, 0x35c($sp) /* 185EBC 802575DC 44821000 */ mtc1 $v0, $f2 -/* 185EC0 802575E0 00000000 */ nop +/* 185EC0 802575E0 00000000 */ nop /* 185EC4 802575E4 468010A0 */ cvt.s.w $f2, $f2 /* 185EC8 802575E8 8622001C */ lh $v0, 0x1c($s1) /* 185ECC 802575EC 46025080 */ add.s $f2, $f10, $f2 /* 185ED0 802575F0 44820000 */ mtc1 $v0, $f0 -/* 185ED4 802575F4 00000000 */ nop +/* 185ED4 802575F4 00000000 */ nop /* 185ED8 802575F8 46800020 */ cvt.s.w $f0, $f0 /* 185EDC 802575FC 08095D8C */ j .L80257630 /* 185EE0 80257600 46001500 */ add.s $f20, $f2, $f0 @@ -272,12 +272,12 @@ glabel func_802571F0 /* 185EE4 80257604 86220016 */ lh $v0, 0x16($s1) /* 185EE8 80257608 C7AA035C */ lwc1 $f10, 0x35c($sp) /* 185EEC 8025760C 44821000 */ mtc1 $v0, $f2 -/* 185EF0 80257610 00000000 */ nop +/* 185EF0 80257610 00000000 */ nop /* 185EF4 80257614 468010A0 */ cvt.s.w $f2, $f2 /* 185EF8 80257618 8622001C */ lh $v0, 0x1c($s1) /* 185EFC 8025761C 46025081 */ sub.s $f2, $f10, $f2 /* 185F00 80257620 44820000 */ mtc1 $v0, $f0 -/* 185F04 80257624 00000000 */ nop +/* 185F04 80257624 00000000 */ nop /* 185F08 80257628 46800020 */ cvt.s.w $f0, $f0 /* 185F0C 8025762C 46001501 */ sub.s $f20, $f2, $f0 .L80257630: @@ -286,13 +286,13 @@ glabel func_802571F0 /* 185F18 80257638 C7AA0360 */ lwc1 $f10, 0x360($sp) /* 185F1C 8025763C 46000586 */ mov.s $f22, $f0 /* 185F20 80257640 44821000 */ mtc1 $v0, $f2 -/* 185F24 80257644 00000000 */ nop +/* 185F24 80257644 00000000 */ nop /* 185F28 80257648 468010A0 */ cvt.s.w $f2, $f2 /* 185F2C 8025764C 8622001E */ lh $v0, 0x1e($s1) /* 185F30 80257650 46025080 */ add.s $f2, $f10, $f2 /* 185F34 80257654 E6360064 */ swc1 $f22, 0x64($s1) /* 185F38 80257658 44820000 */ mtc1 $v0, $f0 -/* 185F3C 8025765C 00000000 */ nop +/* 185F3C 8025765C 00000000 */ nop /* 185F40 80257660 46800020 */ cvt.s.w $f0, $f0 /* 185F44 80257664 08095DC1 */ j .L80257704 /* 185F48 80257668 46001600 */ add.s $f24, $f2, $f0 @@ -300,31 +300,31 @@ glabel func_802571F0 /* 185F4C 8025766C C6480170 */ lwc1 $f8, 0x170($s2) /* 185F50 80257670 46004221 */ cvt.d.s $f8, $f8 /* 185F54 80257674 463E4202 */ mul.d $f8, $f8, $f30 -/* 185F58 80257678 00000000 */ nop +/* 185F58 80257678 00000000 */ nop /* 185F5C 8025767C C6460174 */ lwc1 $f6, 0x174($s2) /* 185F60 80257680 460031A1 */ cvt.d.s $f6, $f6 /* 185F64 80257684 463E3182 */ mul.d $f6, $f6, $f30 -/* 185F68 80257688 00000000 */ nop +/* 185F68 80257688 00000000 */ nop /* 185F6C 8025768C C6420178 */ lwc1 $f2, 0x178($s2) /* 185F70 80257690 460010A1 */ cvt.d.s $f2, $f2 /* 185F74 80257694 463E1082 */ mul.d $f2, $f2, $f30 -/* 185F78 80257698 00000000 */ nop +/* 185F78 80257698 00000000 */ nop /* 185F7C 8025769C 8622001A */ lh $v0, 0x1a($s1) /* 185F80 802576A0 C624002C */ lwc1 $f4, 0x2c($s1) /* 185F84 802576A4 44820000 */ mtc1 $v0, $f0 -/* 185F88 802576A8 00000000 */ nop +/* 185F88 802576A8 00000000 */ nop /* 185F8C 802576AC 46800020 */ cvt.s.w $f0, $f0 /* 185F90 802576B0 46002680 */ add.s $f26, $f4, $f0 /* 185F94 802576B4 8622001C */ lh $v0, 0x1c($s1) /* 185F98 802576B8 C6240030 */ lwc1 $f4, 0x30($s1) /* 185F9C 802576BC 44820000 */ mtc1 $v0, $f0 -/* 185FA0 802576C0 00000000 */ nop +/* 185FA0 802576C0 00000000 */ nop /* 185FA4 802576C4 46800020 */ cvt.s.w $f0, $f0 /* 185FA8 802576C8 46002500 */ add.s $f20, $f4, $f0 /* 185FAC 802576CC 8622001E */ lh $v0, 0x1e($s1) /* 185FB0 802576D0 C6240034 */ lwc1 $f4, 0x34($s1) /* 185FB4 802576D4 44820000 */ mtc1 $v0, $f0 -/* 185FB8 802576D8 00000000 */ nop +/* 185FB8 802576D8 00000000 */ nop /* 185FBC 802576DC 46800020 */ cvt.s.w $f0, $f0 /* 185FC0 802576E0 46204220 */ cvt.s.d $f8, $f8 /* 185FC4 802576E4 462031A0 */ cvt.s.d $f6, $f6 @@ -339,48 +339,48 @@ glabel func_802571F0 /* 185FE4 80257704 8E220000 */ lw $v0, ($s1) /* 185FE8 80257708 30420001 */ andi $v0, $v0, 1 /* 185FEC 8025770C 144000EE */ bnez $v0, .L80257AC8 -/* 185FF0 80257710 00000000 */ nop +/* 185FF0 80257710 00000000 */ nop /* 185FF4 80257714 8E220094 */ lw $v0, 0x94($s1) /* 185FF8 80257718 104000EB */ beqz $v0, .L80257AC8 -/* 185FFC 8025771C 00000000 */ nop +/* 185FFC 8025771C 00000000 */ nop /* 186000 80257720 8E420000 */ lw $v0, ($s2) /* 186004 80257724 30420800 */ andi $v0, $v0, 0x800 /* 186008 80257728 14400025 */ bnez $v0, .L802577C0 -/* 18600C 8025772C 00000000 */ nop +/* 18600C 8025772C 00000000 */ nop /* 186010 80257730 86220044 */ lh $v0, 0x44($s1) /* 186014 80257734 C6420188 */ lwc1 $f2, 0x188($s2) /* 186018 80257738 00021023 */ negu $v0, $v0 /* 18601C 8025773C 44820000 */ mtc1 $v0, $f0 -/* 186020 80257740 00000000 */ nop +/* 186020 80257740 00000000 */ nop /* 186024 80257744 46800020 */ cvt.s.w $f0, $f0 /* 186028 80257748 46020002 */ mul.s $f0, $f0, $f2 -/* 18602C 8025774C 00000000 */ nop +/* 18602C 8025774C 00000000 */ nop /* 186030 80257750 86220046 */ lh $v0, 0x46($s1) /* 186034 80257754 00021023 */ negu $v0, $v0 /* 186038 80257758 44050000 */ mfc1 $a1, $f0 /* 18603C 8025775C 44820000 */ mtc1 $v0, $f0 -/* 186040 80257760 00000000 */ nop +/* 186040 80257760 00000000 */ nop /* 186044 80257764 46800020 */ cvt.s.w $f0, $f0 /* 186048 80257768 46020002 */ mul.s $f0, $f0, $f2 -/* 18604C 8025776C 00000000 */ nop +/* 18604C 8025776C 00000000 */ nop /* 186050 80257770 86220048 */ lh $v0, 0x48($s1) /* 186054 80257774 00021023 */ negu $v0, $v0 /* 186058 80257778 44060000 */ mfc1 $a2, $f0 /* 18605C 8025777C 44820000 */ mtc1 $v0, $f0 -/* 186060 80257780 00000000 */ nop +/* 186060 80257780 00000000 */ nop /* 186064 80257784 46800020 */ cvt.s.w $f0, $f0 /* 186068 80257788 46020002 */ mul.s $f0, $f0, $f2 -/* 18606C 8025778C 00000000 */ nop +/* 18606C 8025778C 00000000 */ nop /* 186070 80257790 44070000 */ mfc1 $a3, $f0 /* 186074 80257794 0C019E40 */ jal guTranslateF /* 186078 80257798 27A40158 */ addiu $a0, $sp, 0x158 /* 18607C 8025779C 86220044 */ lh $v0, 0x44($s1) /* 186080 802577A0 C6420188 */ lwc1 $f2, 0x188($s2) /* 186084 802577A4 44820000 */ mtc1 $v0, $f0 -/* 186088 802577A8 00000000 */ nop +/* 186088 802577A8 00000000 */ nop /* 18608C 802577AC 46800020 */ cvt.s.w $f0, $f0 /* 186090 802577B0 46020002 */ mul.s $f0, $f0, $f2 -/* 186094 802577B4 00000000 */ nop +/* 186094 802577B4 00000000 */ nop /* 186098 802577B8 08095E13 */ j .L8025784C /* 18609C 802577BC 86220046 */ lh $v0, 0x46($s1) .L802577C0: @@ -388,51 +388,51 @@ glabel func_802571F0 /* 1860A4 802577C4 C6420188 */ lwc1 $f2, 0x188($s2) /* 1860A8 802577C8 00021023 */ negu $v0, $v0 /* 1860AC 802577CC 44820000 */ mtc1 $v0, $f0 -/* 1860B0 802577D0 00000000 */ nop +/* 1860B0 802577D0 00000000 */ nop /* 1860B4 802577D4 46800020 */ cvt.s.w $f0, $f0 /* 1860B8 802577D8 46020002 */ mul.s $f0, $f0, $f2 -/* 1860BC 802577DC 00000000 */ nop +/* 1860BC 802577DC 00000000 */ nop /* 1860C0 802577E0 86220046 */ lh $v0, 0x46($s1) /* 1860C4 802577E4 44050000 */ mfc1 $a1, $f0 /* 1860C8 802577E8 44820000 */ mtc1 $v0, $f0 -/* 1860CC 802577EC 00000000 */ nop +/* 1860CC 802577EC 00000000 */ nop /* 1860D0 802577F0 46800020 */ cvt.s.w $f0, $f0 /* 1860D4 802577F4 46020002 */ mul.s $f0, $f0, $f2 -/* 1860D8 802577F8 00000000 */ nop +/* 1860D8 802577F8 00000000 */ nop /* 1860DC 802577FC 86220048 */ lh $v0, 0x48($s1) /* 1860E0 80257800 00021023 */ negu $v0, $v0 /* 1860E4 80257804 44060000 */ mfc1 $a2, $f0 /* 1860E8 80257808 44820000 */ mtc1 $v0, $f0 -/* 1860EC 8025780C 00000000 */ nop +/* 1860EC 8025780C 00000000 */ nop /* 1860F0 80257810 46800020 */ cvt.s.w $f0, $f0 /* 1860F4 80257814 46020002 */ mul.s $f0, $f0, $f2 -/* 1860F8 80257818 00000000 */ nop +/* 1860F8 80257818 00000000 */ nop /* 1860FC 8025781C 44070000 */ mfc1 $a3, $f0 /* 186100 80257820 0C019E40 */ jal guTranslateF /* 186104 80257824 27A40158 */ addiu $a0, $sp, 0x158 /* 186108 80257828 86220044 */ lh $v0, 0x44($s1) /* 18610C 8025782C C6420188 */ lwc1 $f2, 0x188($s2) /* 186110 80257830 44820000 */ mtc1 $v0, $f0 -/* 186114 80257834 00000000 */ nop +/* 186114 80257834 00000000 */ nop /* 186118 80257838 46800020 */ cvt.s.w $f0, $f0 /* 18611C 8025783C 46020002 */ mul.s $f0, $f0, $f2 -/* 186120 80257840 00000000 */ nop +/* 186120 80257840 00000000 */ nop /* 186124 80257844 86220046 */ lh $v0, 0x46($s1) /* 186128 80257848 00021023 */ negu $v0, $v0 .L8025784C: /* 18612C 8025784C 44050000 */ mfc1 $a1, $f0 /* 186130 80257850 44820000 */ mtc1 $v0, $f0 -/* 186134 80257854 00000000 */ nop +/* 186134 80257854 00000000 */ nop /* 186138 80257858 46800020 */ cvt.s.w $f0, $f0 /* 18613C 8025785C 46020002 */ mul.s $f0, $f0, $f2 -/* 186140 80257860 00000000 */ nop +/* 186140 80257860 00000000 */ nop /* 186144 80257864 86220048 */ lh $v0, 0x48($s1) /* 186148 80257868 44060000 */ mfc1 $a2, $f0 /* 18614C 8025786C 44820000 */ mtc1 $v0, $f0 -/* 186150 80257870 00000000 */ nop +/* 186150 80257870 00000000 */ nop /* 186154 80257874 46800020 */ cvt.s.w $f0, $f0 /* 186158 80257878 46020002 */ mul.s $f0, $f0, $f2 -/* 18615C 8025787C 00000000 */ nop +/* 18615C 8025787C 00000000 */ nop /* 186160 80257880 44070000 */ mfc1 $a3, $f0 /* 186164 80257884 0C019E40 */ jal guTranslateF /* 186168 80257888 27A40198 */ addiu $a0, $sp, 0x198 @@ -441,12 +441,12 @@ glabel func_802571F0 /* 186174 80257894 86220068 */ lh $v0, 0x68($s1) /* 186178 80257898 460AC281 */ sub.s $f10, $f24, $f10 /* 18617C 8025789C 44820000 */ mtc1 $v0, $f0 -/* 186180 802578A0 00000000 */ nop +/* 186180 802578A0 00000000 */ nop /* 186184 802578A4 46800020 */ cvt.s.w $f0, $f0 /* 186188 802578A8 4600D680 */ add.s $f26, $f26, $f0 /* 18618C 802578AC 8622006A */ lh $v0, 0x6a($s1) /* 186190 802578B0 44820000 */ mtc1 $v0, $f0 -/* 186194 802578B4 00000000 */ nop +/* 186194 802578B4 00000000 */ nop /* 186198 802578B8 46800020 */ cvt.s.w $f0, $f0 /* 18619C 802578BC 4600A500 */ add.s $f20, $f20, $f0 /* 1861A0 802578C0 44075000 */ mfc1 $a3, $f10 @@ -485,10 +485,10 @@ glabel func_802571F0 /* 186224 80257944 82220074 */ lb $v0, 0x74($s1) /* 186228 80257948 C6220050 */ lwc1 $f2, 0x50($s1) /* 18622C 8025794C 44820000 */ mtc1 $v0, $f0 -/* 186230 80257950 00000000 */ nop +/* 186230 80257950 00000000 */ nop /* 186234 80257954 46800020 */ cvt.s.w $f0, $f0 /* 186238 80257958 46001082 */ mul.s $f2, $f2, $f0 -/* 18623C 8025795C 00000000 */ nop +/* 18623C 8025795C 00000000 */ nop /* 186240 80257960 8E25004C */ lw $a1, 0x4c($s1) /* 186244 80257964 8E270054 */ lw $a3, 0x54($s1) /* 186248 80257968 44061000 */ mfc1 $a2, $f2 @@ -534,7 +534,7 @@ glabel func_802571F0 /* 1862E0 80257A00 0220282D */ daddu $a1, $s1, $zero /* 1862E4 80257A04 4600B28D */ trunc.w.s $f10, $f22 /* 1862E8 80257A08 44105000 */ mfc1 $s0, $f10 -/* 1862EC 80257A0C 00000000 */ nop +/* 1862EC 80257A0C 00000000 */ nop /* 1862F0 80257A10 0200302D */ daddu $a2, $s0, $zero /* 1862F4 80257A14 0C097210 */ jal func_8025C840 /* 1862F8 80257A18 0080382D */ daddu $a3, $a0, $zero @@ -553,7 +553,7 @@ glabel func_802571F0 .L80257A4C: /* 18632C 80257A4C 3C014334 */ lui $at, 0x4334 /* 186330 80257A50 4481A000 */ mtc1 $at, $f20 -/* 186334 80257A54 00000000 */ nop +/* 186334 80257A54 00000000 */ nop /* 186338 80257A58 4614B500 */ add.s $f20, $f22, $f20 /* 18633C 80257A5C 0C00A6C9 */ jal clamp_angle /* 186340 80257A60 4600A306 */ mov.s $f12, $f20 @@ -582,14 +582,14 @@ glabel func_802571F0 /* 18639C 80257ABC AFA20010 */ sw $v0, 0x10($sp) .L80257AC0: /* 1863A0 80257AC0 0C09647B */ jal func_802591EC -/* 1863A4 80257AC4 00000000 */ nop +/* 1863A4 80257AC4 00000000 */ nop .L80257AC8: /* 1863A8 80257AC8 8E31000C */ lw $s1, 0xc($s1) /* 1863AC 80257ACC 8FA80364 */ lw $t0, 0x364($sp) /* 1863B0 80257AD0 27DE0001 */ addiu $fp, $fp, 1 /* 1863B4 80257AD4 03C8102A */ slt $v0, $fp, $t0 /* 1863B8 80257AD8 1440FEAB */ bnez $v0, .L80257588 -/* 1863BC 80257ADC 00000000 */ nop +/* 1863BC 80257ADC 00000000 */ nop .L80257AE0: /* 1863C0 80257AE0 8FBF0394 */ lw $ra, 0x394($sp) /* 1863C4 80257AE4 8FBE0390 */ lw $fp, 0x390($sp) diff --git a/asm/nonmatchings/code_182B30/func_802591EC.s b/asm/nonmatchings/code_182B30/func_802591EC.s index dd4ea10257..c0215be126 100644 --- a/asm/nonmatchings/code_182B30/func_802591EC.s +++ b/asm/nonmatchings/code_182B30/func_802591EC.s @@ -65,7 +65,7 @@ glabel func_802591EC /* 187BA4 802592C4 00882025 */ or $a0, $a0, $t0 .L802592C8: /* 187BA8 802592C8 0C0B78F6 */ jal func_802DE3D8 -/* 187BAC 802592CC 00000000 */ nop +/* 187BAC 802592CC 00000000 */ nop /* 187BB0 802592D0 08096522 */ j .L80259488 /* 187BB4 802592D4 0000102D */ daddu $v0, $zero, $zero .L802592D8: @@ -74,11 +74,12 @@ glabel func_802591EC /* 187BC0 802592E0 2C620011 */ sltiu $v0, $v1, 0x11 /* 187BC4 802592E4 10400067 */ beqz $v0, .L80259484 /* 187BC8 802592E8 00031080 */ sll $v0, $v1, 2 -/* 187BCC 802592EC 3C01802A */ lui $at, %hi(D_8029D3A0) +/* 187BCC 802592EC 3C01802A */ lui $at, %hi(jtbl_8029D3A0_1CBC80) /* 187BD0 802592F0 00220821 */ addu $at, $at, $v0 -/* 187BD4 802592F4 8C22D3A0 */ lw $v0, %lo(D_8029D3A0)($at) +/* 187BD4 802592F4 8C22D3A0 */ lw $v0, %lo(jtbl_8029D3A0_1CBC80)($at) /* 187BD8 802592F8 00400008 */ jr $v0 -/* 187BDC 802592FC 00000000 */ nop +/* 187BDC 802592FC 00000000 */ nop +glabel L80259300_187BE0 /* 187BE0 80259300 AFA80010 */ sw $t0, 0x10($sp) /* 187BE4 80259304 0120282D */ daddu $a1, $t1, $zero /* 187BE8 80259308 0140302D */ daddu $a2, $t2, $zero @@ -86,6 +87,7 @@ glabel func_802591EC /* 187BF0 80259310 0160382D */ daddu $a3, $t3, $zero /* 187BF4 80259314 08096522 */ j .L80259488 /* 187BF8 80259318 0000102D */ daddu $v0, $zero, $zero +glabel L8025931C_187BFC /* 187BFC 8025931C AFA80010 */ sw $t0, 0x10($sp) /* 187C00 80259320 0120282D */ daddu $a1, $t1, $zero /* 187C04 80259324 0140302D */ daddu $a2, $t2, $zero @@ -93,6 +95,7 @@ glabel func_802591EC /* 187C0C 8025932C 0160382D */ daddu $a3, $t3, $zero /* 187C10 80259330 08096522 */ j .L80259488 /* 187C14 80259334 0000102D */ daddu $v0, $zero, $zero +glabel L80259338_187C18 /* 187C18 80259338 AFA80010 */ sw $t0, 0x10($sp) /* 187C1C 8025933C 0120282D */ daddu $a1, $t1, $zero /* 187C20 80259340 0140302D */ daddu $a2, $t2, $zero @@ -100,6 +103,7 @@ glabel func_802591EC /* 187C28 80259348 0160382D */ daddu $a3, $t3, $zero /* 187C2C 8025934C 08096522 */ j .L80259488 /* 187C30 80259350 0000102D */ daddu $v0, $zero, $zero +glabel L80259354_187C34 /* 187C34 80259354 AFA80010 */ sw $t0, 0x10($sp) /* 187C38 80259358 0120282D */ daddu $a1, $t1, $zero /* 187C3C 8025935C 0140302D */ daddu $a2, $t2, $zero @@ -107,6 +111,7 @@ glabel func_802591EC /* 187C44 80259364 0160382D */ daddu $a3, $t3, $zero /* 187C48 80259368 08096522 */ j .L80259488 /* 187C4C 8025936C 0000102D */ daddu $v0, $zero, $zero +glabel L80259370_187C50 /* 187C50 80259370 AFA80010 */ sw $t0, 0x10($sp) /* 187C54 80259374 0120282D */ daddu $a1, $t1, $zero /* 187C58 80259378 0140302D */ daddu $a2, $t2, $zero @@ -114,6 +119,7 @@ glabel func_802591EC /* 187C60 80259380 0160382D */ daddu $a3, $t3, $zero /* 187C64 80259384 08096522 */ j .L80259488 /* 187C68 80259388 0000102D */ daddu $v0, $zero, $zero +glabel L8025938C_187C6C /* 187C6C 8025938C AFA80010 */ sw $t0, 0x10($sp) /* 187C70 80259390 0120282D */ daddu $a1, $t1, $zero /* 187C74 80259394 0140302D */ daddu $a2, $t2, $zero @@ -121,6 +127,7 @@ glabel func_802591EC /* 187C7C 8025939C 0160382D */ daddu $a3, $t3, $zero /* 187C80 802593A0 08096522 */ j .L80259488 /* 187C84 802593A4 0000102D */ daddu $v0, $zero, $zero +glabel L802593A8_187C88 /* 187C88 802593A8 AFA80010 */ sw $t0, 0x10($sp) /* 187C8C 802593AC 0120282D */ daddu $a1, $t1, $zero /* 187C90 802593B0 0140302D */ daddu $a2, $t2, $zero @@ -128,6 +135,7 @@ glabel func_802591EC /* 187C98 802593B8 0160382D */ daddu $a3, $t3, $zero /* 187C9C 802593BC 08096522 */ j .L80259488 /* 187CA0 802593C0 0000102D */ daddu $v0, $zero, $zero +glabel L802593C4_187CA4 /* 187CA4 802593C4 AFA80010 */ sw $t0, 0x10($sp) /* 187CA8 802593C8 0120282D */ daddu $a1, $t1, $zero /* 187CAC 802593CC 0140302D */ daddu $a2, $t2, $zero @@ -135,6 +143,7 @@ glabel func_802591EC /* 187CB4 802593D4 0160382D */ daddu $a3, $t3, $zero /* 187CB8 802593D8 08096522 */ j .L80259488 /* 187CBC 802593DC 0000102D */ daddu $v0, $zero, $zero +glabel L802593E0_187CC0 /* 187CC0 802593E0 AFA80010 */ sw $t0, 0x10($sp) /* 187CC4 802593E4 0120282D */ daddu $a1, $t1, $zero /* 187CC8 802593E8 0140302D */ daddu $a2, $t2, $zero @@ -142,6 +151,7 @@ glabel func_802591EC /* 187CD0 802593F0 0160382D */ daddu $a3, $t3, $zero /* 187CD4 802593F4 08096522 */ j .L80259488 /* 187CD8 802593F8 0000102D */ daddu $v0, $zero, $zero +glabel L802593FC_187CDC /* 187CDC 802593FC 0120282D */ daddu $a1, $t1, $zero /* 187CE0 80259400 0140302D */ daddu $a2, $t2, $zero /* 187CE4 80259404 0160382D */ daddu $a3, $t3, $zero @@ -150,6 +160,7 @@ glabel func_802591EC /* 187CF0 80259410 AFA00014 */ sw $zero, 0x14($sp) /* 187CF4 80259414 08096522 */ j .L80259488 /* 187CF8 80259418 0000102D */ daddu $v0, $zero, $zero +glabel L8025941C_187CFC /* 187CFC 8025941C 0120282D */ daddu $a1, $t1, $zero /* 187D00 80259420 0140302D */ daddu $a2, $t2, $zero /* 187D04 80259424 0160382D */ daddu $a3, $t3, $zero @@ -159,10 +170,12 @@ glabel func_802591EC /* 187D14 80259434 AFA20014 */ sw $v0, 0x14($sp) /* 187D18 80259438 08096522 */ j .L80259488 /* 187D1C 8025943C 0000102D */ daddu $v0, $zero, $zero +glabel L80259440_187D20 /* 187D20 80259440 0120282D */ daddu $a1, $t1, $zero /* 187D24 80259444 0140302D */ daddu $a2, $t2, $zero /* 187D28 80259448 08096517 */ j .L8025945C /* 187D2C 8025944C 0000382D */ daddu $a3, $zero, $zero +glabel L80259450_187D30 /* 187D30 80259450 0120282D */ daddu $a1, $t1, $zero /* 187D34 80259454 0140302D */ daddu $a2, $t2, $zero /* 187D38 80259458 24070001 */ addiu $a3, $zero, 1 @@ -172,12 +185,14 @@ glabel func_802591EC /* 187D44 80259464 AFA80014 */ sw $t0, 0x14($sp) /* 187D48 80259468 08096522 */ j .L80259488 /* 187D4C 8025946C 0000102D */ daddu $v0, $zero, $zero +glabel L80259470_187D50 /* 187D50 80259470 AFA80010 */ sw $t0, 0x10($sp) /* 187D54 80259474 0120282D */ daddu $a1, $t1, $zero /* 187D58 80259478 0140302D */ daddu $a2, $t2, $zero /* 187D5C 8025947C 0C097048 */ jal func_8025C120 /* 187D60 80259480 0160382D */ daddu $a3, $t3, $zero .L80259484: +glabel L80259484_187D64 /* 187D64 80259484 0000102D */ daddu $v0, $zero, $zero .L80259488: /* 187D68 80259488 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/asm/nonmatchings/code_182B30/func_80259494.s b/asm/nonmatchings/code_182B30/func_80259494.s index e64498508d..016ed28806 100644 --- a/asm/nonmatchings/code_182B30/func_80259494.s +++ b/asm/nonmatchings/code_182B30/func_80259494.s @@ -35,4 +35,4 @@ glabel func_80259494 /* 187DE0 80259500 24C60004 */ addiu $a2, $a2, 4 .L80259504: /* 187DE4 80259504 03E00008 */ jr $ra -/* 187DE8 80259508 00000000 */ nop +/* 187DE8 80259508 00000000 */ nop diff --git a/asm/nonmatchings/code_182B30/func_8025950C.s b/asm/nonmatchings/code_182B30/func_8025950C.s index 891148c087..0dd8d96755 100644 --- a/asm/nonmatchings/code_182B30/func_8025950C.s +++ b/asm/nonmatchings/code_182B30/func_8025950C.s @@ -41,14 +41,14 @@ glabel func_8025950C /* 187E74 80259594 0240282D */ daddu $a1, $s2, $zero /* 187E78 80259598 96240088 */ lhu $a0, 0x88($s1) /* 187E7C 8025959C 0C0B7A90 */ jal func_802DEA40 -/* 187E80 802595A0 00000000 */ nop +/* 187E80 802595A0 00000000 */ nop /* 187E84 802595A4 AE0206D0 */ sw $v0, 0x6d0($s0) /* 187E88 802595A8 0040202D */ daddu $a0, $v0, $zero /* 187E8C 802595AC A20006CD */ sb $zero, 0x6cd($s0) /* 187E90 802595B0 8C830000 */ lw $v1, ($a0) /* 187E94 802595B4 2402FFFF */ addiu $v0, $zero, -1 /* 187E98 802595B8 1062000C */ beq $v1, $v0, .L802595EC -/* 187E9C 802595BC 00000000 */ nop +/* 187E9C 802595BC 00000000 */ nop /* 187EA0 802595C0 0080182D */ daddu $v1, $a0, $zero /* 187EA4 802595C4 0040202D */ daddu $a0, $v0, $zero .L802595C8: @@ -60,7 +60,7 @@ glabel func_8025950C /* 187EBC 802595DC 00431021 */ addu $v0, $v0, $v1 /* 187EC0 802595E0 8C420000 */ lw $v0, ($v0) /* 187EC4 802595E4 1444FFF8 */ bne $v0, $a0, .L802595C8 -/* 187EC8 802595E8 00000000 */ nop +/* 187EC8 802595E8 00000000 */ nop .L802595EC: /* 187ECC 802595EC 820206CD */ lb $v0, 0x6cd($s0) /* 187ED0 802595F0 18400016 */ blez $v0, .L8025964C @@ -87,7 +87,7 @@ glabel func_8025950C /* 187F18 80259638 24C60001 */ addiu $a2, $a2, 1 /* 187F1C 8025963C 00C2102A */ slt $v0, $a2, $v0 /* 187F20 80259640 1440FFED */ bnez $v0, .L802595F8 -/* 187F24 80259644 00000000 */ nop +/* 187F24 80259644 00000000 */ nop /* 187F28 80259648 820206CD */ lb $v0, 0x6cd($s0) .L8025964C: /* 187F2C 8025964C 1840000A */ blez $v0, .L80259678 @@ -108,7 +108,7 @@ glabel func_8025950C /* 187F60 80259680 0C0965B0 */ jal func_802596C0 /* 187F64 80259684 0260302D */ daddu $a2, $s3, $zero /* 187F68 80259688 080965A9 */ j .L802596A4 -/* 187F6C 8025968C 00000000 */ nop +/* 187F6C 8025968C 00000000 */ nop .L80259690: /* 187F70 80259690 8E240084 */ lw $a0, 0x84($s1) /* 187F74 80259694 AFB30010 */ sw $s3, 0x10($sp) diff --git a/asm/nonmatchings/code_182B30/func_802597B0.s b/asm/nonmatchings/code_182B30/func_802597B0.s index 0bdac851f7..4a57d483f4 100644 --- a/asm/nonmatchings/code_182B30/func_802597B0.s +++ b/asm/nonmatchings/code_182B30/func_802597B0.s @@ -41,14 +41,14 @@ glabel func_802597B0 /* 188118 80259838 AFB20010 */ sw $s2, 0x10($sp) /* 18811C 8025983C 96240088 */ lhu $a0, 0x88($s1) /* 188120 80259840 0C0B7830 */ jal func_802DE0C0 -/* 188124 80259844 00000000 */ nop +/* 188124 80259844 00000000 */ nop /* 188128 80259848 AE0206D0 */ sw $v0, 0x6d0($s0) /* 18812C 8025984C 0040202D */ daddu $a0, $v0, $zero /* 188130 80259850 A20006CD */ sb $zero, 0x6cd($s0) /* 188134 80259854 8C830000 */ lw $v1, ($a0) /* 188138 80259858 2402FFFF */ addiu $v0, $zero, -1 /* 18813C 8025985C 1062000C */ beq $v1, $v0, .L80259890 -/* 188140 80259860 00000000 */ nop +/* 188140 80259860 00000000 */ nop /* 188144 80259864 0080182D */ daddu $v1, $a0, $zero /* 188148 80259868 0040202D */ daddu $a0, $v0, $zero .L8025986C: @@ -60,7 +60,7 @@ glabel func_802597B0 /* 188160 80259880 00431021 */ addu $v0, $v0, $v1 /* 188164 80259884 8C420000 */ lw $v0, ($v0) /* 188168 80259888 1444FFF8 */ bne $v0, $a0, .L8025986C -/* 18816C 8025988C 00000000 */ nop +/* 18816C 8025988C 00000000 */ nop .L80259890: /* 188170 80259890 820206CD */ lb $v0, 0x6cd($s0) /* 188174 80259894 18400016 */ blez $v0, .L802598F0 @@ -87,7 +87,7 @@ glabel func_802597B0 /* 1881BC 802598DC 24C60001 */ addiu $a2, $a2, 1 /* 1881C0 802598E0 00C2102A */ slt $v0, $a2, $v0 /* 1881C4 802598E4 1440FFED */ bnez $v0, .L8025989C -/* 1881C8 802598E8 00000000 */ nop +/* 1881C8 802598E8 00000000 */ nop /* 1881CC 802598EC 820206CD */ lb $v0, 0x6cd($s0) .L802598F0: /* 1881D0 802598F0 1840000A */ blez $v0, .L8025991C @@ -108,7 +108,7 @@ glabel func_802597B0 /* 188204 80259924 0C096657 */ jal func_8025995C /* 188208 80259928 0240302D */ daddu $a2, $s2, $zero /* 18820C 8025992C 08096650 */ j .L80259940 -/* 188210 80259930 00000000 */ nop +/* 188210 80259930 00000000 */ nop .L80259934: /* 188214 80259934 0260282D */ daddu $a1, $s3, $zero /* 188218 80259938 0C0B7710 */ jal render_sprite diff --git a/asm/nonmatchings/code_182B30/func_8025995C.s b/asm/nonmatchings/code_182B30/func_8025995C.s index cbf290d07a..a3de6d19d3 100644 --- a/asm/nonmatchings/code_182B30/func_8025995C.s +++ b/asm/nonmatchings/code_182B30/func_8025995C.s @@ -40,7 +40,7 @@ glabel func_8025995C /* 1882C0 802599E0 5040000A */ beql $v0, $zero, .L80259A0C /* 1882C4 802599E4 AFB30010 */ sw $s3, 0x10($sp) /* 1882C8 802599E8 0C096525 */ jal func_80259494 -/* 1882CC 802599EC 00000000 */ nop +/* 1882CC 802599EC 00000000 */ nop /* 1882D0 802599F0 AFB30010 */ sw $s3, 0x10($sp) /* 1882D4 802599F4 3C042000 */ lui $a0, 0x2000 /* 1882D8 802599F8 02042025 */ or $a0, $s0, $a0 @@ -56,7 +56,7 @@ glabel func_8025995C /* 1882FC 80259A1C 264706D4 */ addiu $a3, $s2, 0x6d4 .L80259A20: /* 188300 80259A20 0C0B7710 */ jal render_sprite -/* 188304 80259A24 00000000 */ nop +/* 188304 80259A24 00000000 */ nop /* 188308 80259A28 8FBF002C */ lw $ra, 0x2c($sp) /* 18830C 80259A2C 8FB40028 */ lw $s4, 0x28($sp) /* 188310 80259A30 8FB30024 */ lw $s3, 0x24($sp) diff --git a/asm/nonmatchings/code_182B30/func_80259A48.s b/asm/nonmatchings/code_182B30/func_80259A48.s index e010029998..325f7c12a3 100644 --- a/asm/nonmatchings/code_182B30/func_80259A48.s +++ b/asm/nonmatchings/code_182B30/func_80259A48.s @@ -18,14 +18,14 @@ glabel func_80259A48 /* 18835C 80259A7C A06006C1 */ sb $zero, 0x6c1($v1) .L80259A80: /* 188360 80259A80 15000005 */ bnez $t0, .L80259A98 -/* 188364 80259A84 00000000 */ nop +/* 188364 80259A84 00000000 */ nop /* 188368 80259A88 0C0965EC */ jal func_802597B0 -/* 18836C 80259A8C 00000000 */ nop +/* 18836C 80259A8C 00000000 */ nop /* 188370 80259A90 080966A8 */ j .L80259AA0 -/* 188374 80259A94 00000000 */ nop +/* 188374 80259A94 00000000 */ nop .L80259A98: /* 188378 80259A98 0C096543 */ jal func_8025950C -/* 18837C 80259A9C 00000000 */ nop +/* 18837C 80259A9C 00000000 */ nop .L80259AA0: /* 188380 80259AA0 8FBF0010 */ lw $ra, 0x10($sp) /* 188384 80259AA4 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_182B30/func_80259AAC.s b/asm/nonmatchings/code_182B30/func_80259AAC.s index 10db1d88c2..a21d1dca85 100644 --- a/asm/nonmatchings/code_182B30/func_80259AAC.s +++ b/asm/nonmatchings/code_182B30/func_80259AAC.s @@ -17,7 +17,7 @@ glabel func_80259AAC /* 1883BC 80259ADC 1040002E */ beqz $v0, .L80259B98 /* 1883C0 80259AE0 00E0A02D */ daddu $s4, $a3, $zero /* 1883C4 80259AE4 16400016 */ bnez $s2, .L80259B40 -/* 1883C8 80259AE8 00000000 */ nop +/* 1883C8 80259AE8 00000000 */ nop /* 1883CC 80259AEC 0C0B7830 */ jal func_802DE0C0 /* 1883D0 80259AF0 96240088 */ lhu $a0, 0x88($s1) /* 1883D4 80259AF4 AE0206D0 */ sw $v0, 0x6d0($s0) @@ -37,13 +37,13 @@ glabel func_80259AAC /* 188408 80259B28 00431021 */ addu $v0, $v0, $v1 /* 18840C 80259B2C 8C420000 */ lw $v0, ($v0) /* 188410 80259B30 1444FFF8 */ bne $v0, $a0, .L80259B14 -/* 188414 80259B34 00000000 */ nop +/* 188414 80259B34 00000000 */ nop /* 188418 80259B38 080966E5 */ j .L80259B94 /* 18841C 80259B3C A20006C2 */ sb $zero, 0x6c2($s0) .L80259B40: /* 188420 80259B40 96240088 */ lhu $a0, 0x88($s1) /* 188424 80259B44 0C0B7A90 */ jal func_802DEA40 -/* 188428 80259B48 00000000 */ nop +/* 188428 80259B48 00000000 */ nop /* 18842C 80259B4C AE0206D0 */ sw $v0, 0x6d0($s0) /* 188430 80259B50 0040202D */ daddu $a0, $v0, $zero /* 188434 80259B54 A20006CD */ sb $zero, 0x6cd($s0) @@ -61,7 +61,7 @@ glabel func_80259AAC /* 188460 80259B80 00431021 */ addu $v0, $v0, $v1 /* 188464 80259B84 8C420000 */ lw $v0, ($v0) /* 188468 80259B88 1444FFF8 */ bne $v0, $a0, .L80259B6C -/* 18846C 80259B8C 00000000 */ nop +/* 18846C 80259B8C 00000000 */ nop .L80259B90: /* 188470 80259B90 A20006C2 */ sb $zero, 0x6c2($s0) .L80259B94: @@ -95,10 +95,10 @@ glabel func_80259AAC /* 1884D4 80259BF4 94E30000 */ lhu $v1, ($a3) /* 1884D8 80259BF8 000312C2 */ srl $v0, $v1, 0xb /* 1884DC 80259BFC 44820000 */ mtc1 $v0, $f0 -/* 1884E0 80259C00 00000000 */ nop +/* 1884E0 80259C00 00000000 */ nop /* 1884E4 80259C04 46800021 */ cvt.d.w $f0, $f0 /* 1884E8 80259C08 46280002 */ mul.d $f0, $f0, $f8 -/* 1884EC 80259C0C 00000000 */ nop +/* 1884EC 80259C0C 00000000 */ nop /* 1884F0 80259C10 90E40001 */ lbu $a0, 1($a3) /* 1884F4 80259C14 24E70002 */ addiu $a3, $a3, 2 /* 1884F8 80259C18 00031182 */ srl $v0, $v1, 6 @@ -106,7 +106,7 @@ glabel func_80259AAC /* 188500 80259C20 00031842 */ srl $v1, $v1, 1 /* 188504 80259C24 3066001F */ andi $a2, $v1, 0x1f /* 188508 80259C28 4620103E */ c.le.d $f2, $f0 -/* 18850C 80259C2C 00000000 */ nop +/* 18850C 80259C2C 00000000 */ nop /* 188510 80259C30 45010005 */ bc1t .L80259C48 /* 188514 80259C34 30840001 */ andi $a0, $a0, 1 /* 188518 80259C38 4620028D */ trunc.w.d $f10, $f0 @@ -117,17 +117,17 @@ glabel func_80259AAC /* 188528 80259C48 46220001 */ sub.d $f0, $f0, $f2 /* 18852C 80259C4C 4620028D */ trunc.w.d $f10, $f0 /* 188530 80259C50 44035000 */ mfc1 $v1, $f10 -/* 188534 80259C54 00000000 */ nop +/* 188534 80259C54 00000000 */ nop /* 188538 80259C58 006B1825 */ or $v1, $v1, $t3 /* 18853C 80259C5C 304200FF */ andi $v0, $v0, 0xff .L80259C60: /* 188540 80259C60 44820000 */ mtc1 $v0, $f0 -/* 188544 80259C64 00000000 */ nop +/* 188544 80259C64 00000000 */ nop /* 188548 80259C68 46800021 */ cvt.d.w $f0, $f0 /* 18854C 80259C6C 46260002 */ mul.d $f0, $f0, $f6 -/* 188550 80259C70 00000000 */ nop +/* 188550 80259C70 00000000 */ nop /* 188554 80259C74 4620103E */ c.le.d $f2, $f0 -/* 188558 80259C78 00000000 */ nop +/* 188558 80259C78 00000000 */ nop /* 18855C 80259C7C 45030005 */ bc1tl .L80259C94 /* 188560 80259C80 46220001 */ sub.d $f0, $f0, $f2 /* 188564 80259C84 4620028D */ trunc.w.d $f10, $f0 @@ -137,17 +137,17 @@ glabel func_80259AAC .L80259C94: /* 188574 80259C94 4620028D */ trunc.w.d $f10, $f0 /* 188578 80259C98 44055000 */ mfc1 $a1, $f10 -/* 18857C 80259C9C 00000000 */ nop +/* 18857C 80259C9C 00000000 */ nop /* 188580 80259CA0 00AB2825 */ or $a1, $a1, $t3 /* 188584 80259CA4 30C200FF */ andi $v0, $a2, 0xff .L80259CA8: /* 188588 80259CA8 44820000 */ mtc1 $v0, $f0 -/* 18858C 80259CAC 00000000 */ nop +/* 18858C 80259CAC 00000000 */ nop /* 188590 80259CB0 46800021 */ cvt.d.w $f0, $f0 /* 188594 80259CB4 46240002 */ mul.d $f0, $f0, $f4 -/* 188598 80259CB8 00000000 */ nop +/* 188598 80259CB8 00000000 */ nop /* 18859C 80259CBC 4620103E */ c.le.d $f2, $f0 -/* 1885A0 80259CC0 00000000 */ nop +/* 1885A0 80259CC0 00000000 */ nop /* 1885A4 80259CC4 45010005 */ bc1t .L80259CDC /* 1885A8 80259CC8 00A0102D */ daddu $v0, $a1, $zero /* 1885AC 80259CCC 4620028D */ trunc.w.d $f10, $f0 @@ -158,7 +158,7 @@ glabel func_80259AAC /* 1885BC 80259CDC 46220001 */ sub.d $f0, $f0, $f2 /* 1885C0 80259CE0 4620028D */ trunc.w.d $f10, $f0 /* 1885C4 80259CE4 44055000 */ mfc1 $a1, $f10 -/* 1885C8 80259CE8 00000000 */ nop +/* 1885C8 80259CE8 00000000 */ nop /* 1885CC 80259CEC 00AB2825 */ or $a1, $a1, $t3 /* 1885D0 80259CF0 306300FF */ andi $v1, $v1, 0xff .L80259CF4: @@ -185,16 +185,16 @@ glabel func_80259AAC /* 18861C 80259D3C 820306C2 */ lb $v1, 0x6c2($s0) /* 188620 80259D40 28620002 */ slti $v0, $v1, 2 /* 188624 80259D44 1040000D */ beqz $v0, .L80259D7C -/* 188628 80259D48 00000000 */ nop +/* 188628 80259D48 00000000 */ nop /* 18862C 80259D4C 0460000B */ bltz $v1, .L80259D7C -/* 188630 80259D50 00000000 */ nop +/* 188630 80259D50 00000000 */ nop /* 188634 80259D54 16400006 */ bnez $s2, .L80259D70 /* 188638 80259D58 0220202D */ daddu $a0, $s1, $zero /* 18863C 80259D5C 0260282D */ daddu $a1, $s3, $zero /* 188640 80259D60 0C096657 */ jal func_8025995C /* 188644 80259D64 0280302D */ daddu $a2, $s4, $zero /* 188648 80259D68 0809675F */ j .L80259D7C -/* 18864C 80259D6C 00000000 */ nop +/* 18864C 80259D6C 00000000 */ nop .L80259D70: /* 188650 80259D70 0260282D */ daddu $a1, $s3, $zero /* 188654 80259D74 0C0965B0 */ jal func_802596C0 diff --git a/asm/nonmatchings/code_182B30/func_80259D9C.s b/asm/nonmatchings/code_182B30/func_80259D9C.s index 26183f2884..99a992ecf9 100644 --- a/asm/nonmatchings/code_182B30/func_80259D9C.s +++ b/asm/nonmatchings/code_182B30/func_80259D9C.s @@ -19,7 +19,7 @@ glabel func_80259D9C /* 1886B4 80259DD4 1040004B */ beqz $v0, .L80259F04 /* 1886B8 80259DD8 00E0A02D */ daddu $s4, $a3, $zero /* 1886BC 80259DDC 16400016 */ bnez $s2, .L80259E38 -/* 1886C0 80259DE0 00000000 */ nop +/* 1886C0 80259DE0 00000000 */ nop /* 1886C4 80259DE4 0C0B7830 */ jal func_802DE0C0 /* 1886C8 80259DE8 96240088 */ lhu $a0, 0x88($s1) /* 1886CC 80259DEC AE0206D0 */ sw $v0, 0x6d0($s0) @@ -39,14 +39,14 @@ glabel func_80259D9C /* 188700 80259E20 00431021 */ addu $v0, $v0, $v1 /* 188704 80259E24 8C420000 */ lw $v0, ($v0) /* 188708 80259E28 1444FFF8 */ bne $v0, $a0, .L80259E0C -/* 18870C 80259E2C 00000000 */ nop +/* 18870C 80259E2C 00000000 */ nop .L80259E30: /* 188710 80259E30 080967A4 */ j .L80259E90 /* 188714 80259E34 24020006 */ addiu $v0, $zero, 6 .L80259E38: /* 188718 80259E38 96240088 */ lhu $a0, 0x88($s1) /* 18871C 80259E3C 0C0B7A90 */ jal func_802DEA40 -/* 188720 80259E40 00000000 */ nop +/* 188720 80259E40 00000000 */ nop /* 188724 80259E44 AE0206D0 */ sw $v0, 0x6d0($s0) /* 188728 80259E48 0040202D */ daddu $a0, $v0, $zero /* 18872C 80259E4C A20006CD */ sb $zero, 0x6cd($s0) @@ -64,7 +64,7 @@ glabel func_80259D9C /* 188758 80259E78 00431021 */ addu $v0, $v0, $v1 /* 18875C 80259E7C 8C420000 */ lw $v0, ($v0) /* 188760 80259E80 1444FFF8 */ bne $v0, $a0, .L80259E64 -/* 188764 80259E84 00000000 */ nop +/* 188764 80259E84 00000000 */ nop .L80259E88: /* 188768 80259E88 0C0B7A9B */ jal func_802DEA6C /* 18876C 80259E8C 96240088 */ lhu $a0, 0x88($s1) @@ -95,7 +95,7 @@ glabel func_80259D9C /* 1887C0 80259EE0 25290001 */ addiu $t1, $t1, 1 /* 1887C4 80259EE4 0122102A */ slt $v0, $t1, $v0 /* 1887C8 80259EE8 1440FFED */ bnez $v0, .L80259EA0 -/* 1887CC 80259EEC 00000000 */ nop +/* 1887CC 80259EEC 00000000 */ nop .L80259EF0: /* 1887D0 80259EF0 2402FFFE */ addiu $v0, $zero, -2 /* 1887D4 80259EF4 A20206C2 */ sb $v0, 0x6c2($s0) @@ -104,10 +104,10 @@ glabel func_80259D9C /* 1887E0 80259F00 A60006C8 */ sh $zero, 0x6c8($s0) .L80259F04: /* 1887E4 80259F04 16A0001E */ bnez $s5, .L80259F80 -/* 1887E8 80259F08 00000000 */ nop +/* 1887E8 80259F08 00000000 */ nop /* 1887EC 80259F0C 860206C8 */ lh $v0, 0x6c8($s0) /* 1887F0 80259F10 14400013 */ bnez $v0, .L80259F60 -/* 1887F4 80259F14 00000000 */ nop +/* 1887F4 80259F14 00000000 */ nop /* 1887F8 80259F18 920206C2 */ lbu $v0, 0x6c2($s0) /* 1887FC 80259F1C 3C048028 */ lui $a0, %hi(D_80284080) /* 188800 80259F20 24844080 */ addiu $a0, $a0, %lo(D_80284080) @@ -148,14 +148,14 @@ glabel func_80259D9C /* 18887C 80259F9C 10400005 */ beqz $v0, .L80259FB4 /* 188880 80259FA0 24020002 */ addiu $v0, $zero, 2 /* 188884 80259FA4 10600007 */ beqz $v1, .L80259FC4 -/* 188888 80259FA8 00000000 */ nop +/* 188888 80259FA8 00000000 */ nop /* 18888C 80259FAC 0809688D */ j .L8025A234 -/* 188890 80259FB0 00000000 */ nop +/* 188890 80259FB0 00000000 */ nop .L80259FB4: /* 188894 80259FB4 1062003C */ beq $v1, $v0, .L8025A0A8 -/* 188898 80259FB8 00000000 */ nop +/* 188898 80259FB8 00000000 */ nop /* 18889C 80259FBC 0809688D */ j .L8025A234 -/* 1888A0 80259FC0 00000000 */ nop +/* 1888A0 80259FC0 00000000 */ nop .L80259FC4: /* 1888A4 80259FC4 820206CC */ lb $v0, 0x6cc($s0) /* 1888A8 80259FC8 1840009A */ blez $v0, .L8025A234 @@ -182,9 +182,9 @@ glabel func_80259D9C /* 1888F0 8025A010 25290001 */ addiu $t1, $t1, 1 /* 1888F4 8025A014 0122102A */ slt $v0, $t1, $v0 /* 1888F8 8025A018 10400086 */ beqz $v0, .L8025A234 -/* 1888FC 8025A01C 00000000 */ nop +/* 1888FC 8025A01C 00000000 */ nop /* 188900 8025A020 080967F4 */ j .L80259FD0 -/* 188904 8025A024 00000000 */ nop +/* 188904 8025A024 00000000 */ nop .L8025A028: /* 188908 8025A028 820206CC */ lb $v0, 0x6cc($s0) /* 18890C 8025A02C 920306CC */ lbu $v1, 0x6cc($s0) @@ -220,7 +220,7 @@ glabel func_80259D9C /* 188978 8025A098 1440FFE8 */ bnez $v0, .L8025A03C /* 18897C 8025A09C 00031E00 */ sll $v1, $v1, 0x18 /* 188980 8025A0A0 0809688D */ j .L8025A234 -/* 188984 8025A0A4 00000000 */ nop +/* 188984 8025A0A4 00000000 */ nop .L8025A0A8: /* 188988 8025A0A8 820206CC */ lb $v0, 0x6cc($s0) /* 18898C 8025A0AC 18400061 */ blez $v0, .L8025A234 @@ -244,10 +244,10 @@ glabel func_80259D9C /* 1889CC 8025A0EC 94C30000 */ lhu $v1, ($a2) /* 1889D0 8025A0F0 000312C2 */ srl $v0, $v1, 0xb /* 1889D4 8025A0F4 44820000 */ mtc1 $v0, $f0 -/* 1889D8 8025A0F8 00000000 */ nop +/* 1889D8 8025A0F8 00000000 */ nop /* 1889DC 8025A0FC 46800021 */ cvt.d.w $f0, $f0 /* 1889E0 8025A100 46240002 */ mul.d $f0, $f0, $f4 -/* 1889E4 8025A104 00000000 */ nop +/* 1889E4 8025A104 00000000 */ nop /* 1889E8 8025A108 90C40001 */ lbu $a0, 1($a2) /* 1889EC 8025A10C 24C60002 */ addiu $a2, $a2, 2 /* 1889F0 8025A110 00031182 */ srl $v0, $v1, 6 @@ -255,7 +255,7 @@ glabel func_80259D9C /* 1889F8 8025A118 00031842 */ srl $v1, $v1, 1 /* 1889FC 8025A11C 306A001F */ andi $t2, $v1, 0x1f /* 188A00 8025A120 4620103E */ c.le.d $f2, $f0 -/* 188A04 8025A124 00000000 */ nop +/* 188A04 8025A124 00000000 */ nop /* 188A08 8025A128 45010005 */ bc1t .L8025A140 /* 188A0C 8025A12C 30840001 */ andi $a0, $a0, 1 /* 188A10 8025A130 4620018D */ trunc.w.d $f6, $f0 @@ -266,17 +266,17 @@ glabel func_80259D9C /* 188A20 8025A140 46220001 */ sub.d $f0, $f0, $f2 /* 188A24 8025A144 4620018D */ trunc.w.d $f6, $f0 /* 188A28 8025A148 44033000 */ mfc1 $v1, $f6 -/* 188A2C 8025A14C 00000000 */ nop +/* 188A2C 8025A14C 00000000 */ nop /* 188A30 8025A150 006B1825 */ or $v1, $v1, $t3 /* 188A34 8025A154 304200FF */ andi $v0, $v0, 0xff .L8025A158: /* 188A38 8025A158 44820000 */ mtc1 $v0, $f0 -/* 188A3C 8025A15C 00000000 */ nop +/* 188A3C 8025A15C 00000000 */ nop /* 188A40 8025A160 46800021 */ cvt.d.w $f0, $f0 /* 188A44 8025A164 46240002 */ mul.d $f0, $f0, $f4 -/* 188A48 8025A168 00000000 */ nop +/* 188A48 8025A168 00000000 */ nop /* 188A4C 8025A16C 4620103E */ c.le.d $f2, $f0 -/* 188A50 8025A170 00000000 */ nop +/* 188A50 8025A170 00000000 */ nop /* 188A54 8025A174 45030005 */ bc1tl .L8025A18C /* 188A58 8025A178 46220001 */ sub.d $f0, $f0, $f2 /* 188A5C 8025A17C 4620018D */ trunc.w.d $f6, $f0 @@ -286,17 +286,17 @@ glabel func_80259D9C .L8025A18C: /* 188A6C 8025A18C 4620018D */ trunc.w.d $f6, $f0 /* 188A70 8025A190 44053000 */ mfc1 $a1, $f6 -/* 188A74 8025A194 00000000 */ nop +/* 188A74 8025A194 00000000 */ nop /* 188A78 8025A198 00AB2825 */ or $a1, $a1, $t3 /* 188A7C 8025A19C 314200FF */ andi $v0, $t2, 0xff .L8025A1A0: /* 188A80 8025A1A0 44820000 */ mtc1 $v0, $f0 -/* 188A84 8025A1A4 00000000 */ nop +/* 188A84 8025A1A4 00000000 */ nop /* 188A88 8025A1A8 46800021 */ cvt.d.w $f0, $f0 /* 188A8C 8025A1AC 46240002 */ mul.d $f0, $f0, $f4 -/* 188A90 8025A1B0 00000000 */ nop +/* 188A90 8025A1B0 00000000 */ nop /* 188A94 8025A1B4 4620103E */ c.le.d $f2, $f0 -/* 188A98 8025A1B8 00000000 */ nop +/* 188A98 8025A1B8 00000000 */ nop /* 188A9C 8025A1BC 45010005 */ bc1t .L8025A1D4 /* 188AA0 8025A1C0 00A0102D */ daddu $v0, $a1, $zero /* 188AA4 8025A1C4 4620018D */ trunc.w.d $f6, $f0 @@ -307,7 +307,7 @@ glabel func_80259D9C /* 188AB4 8025A1D4 46220001 */ sub.d $f0, $f0, $f2 /* 188AB8 8025A1D8 4620018D */ trunc.w.d $f6, $f0 /* 188ABC 8025A1DC 44053000 */ mfc1 $a1, $f6 -/* 188AC0 8025A1E0 00000000 */ nop +/* 188AC0 8025A1E0 00000000 */ nop /* 188AC4 8025A1E4 00AB2825 */ or $a1, $a1, $t3 /* 188AC8 8025A1E8 306300FF */ andi $v1, $v1, 0xff .L8025A1EC: @@ -329,7 +329,7 @@ glabel func_80259D9C /* 188B04 8025A224 25290001 */ addiu $t1, $t1, 1 /* 188B08 8025A228 0122102A */ slt $v0, $t1, $v0 /* 188B0C 8025A22C 1440FFA7 */ bnez $v0, .L8025A0CC -/* 188B10 8025A230 00000000 */ nop +/* 188B10 8025A230 00000000 */ nop .L8025A234: /* 188B14 8025A234 820206CD */ lb $v0, 0x6cd($s0) /* 188B18 8025A238 1840000A */ blez $v0, .L8025A264 @@ -351,14 +351,14 @@ glabel func_80259D9C /* 188B50 8025A270 0C096657 */ jal func_8025995C /* 188B54 8025A274 0280302D */ daddu $a2, $s4, $zero /* 188B58 8025A278 080968A3 */ j .L8025A28C -/* 188B5C 8025A27C 00000000 */ nop +/* 188B5C 8025A27C 00000000 */ nop .L8025A280: /* 188B60 8025A280 0260282D */ daddu $a1, $s3, $zero /* 188B64 8025A284 0C0965B0 */ jal func_802596C0 /* 188B68 8025A288 0280302D */ daddu $a2, $s4, $zero .L8025A28C: /* 188B6C 8025A28C 16A00004 */ bnez $s5, .L8025A2A0 -/* 188B70 8025A290 00000000 */ nop +/* 188B70 8025A290 00000000 */ nop /* 188B74 8025A294 960206CA */ lhu $v0, 0x6ca($s0) /* 188B78 8025A298 2442FFFF */ addiu $v0, $v0, -1 /* 188B7C 8025A29C A60206CA */ sh $v0, 0x6ca($s0) diff --git a/asm/nonmatchings/code_182B30/func_8025A2C4.s b/asm/nonmatchings/code_182B30/func_8025A2C4.s index a3c5c37a8d..f65e8c2f88 100644 --- a/asm/nonmatchings/code_182B30/func_8025A2C4.s +++ b/asm/nonmatchings/code_182B30/func_8025A2C4.s @@ -19,7 +19,7 @@ glabel func_8025A2C4 /* 188BDC 8025A2FC 10400033 */ beqz $v0, .L8025A3CC /* 188BE0 8025A300 00E0A02D */ daddu $s4, $a3, $zero /* 188BE4 8025A304 16400018 */ bnez $s2, .L8025A368 -/* 188BE8 8025A308 00000000 */ nop +/* 188BE8 8025A308 00000000 */ nop /* 188BEC 8025A30C 0C0B7830 */ jal func_802DE0C0 /* 188BF0 8025A310 96240088 */ lhu $a0, 0x88($s1) /* 188BF4 8025A314 AE0206D0 */ sw $v0, 0x6d0($s0) @@ -41,13 +41,13 @@ glabel func_8025A2C4 /* 188C30 8025A350 00431021 */ addu $v0, $v0, $v1 /* 188C34 8025A354 8C420000 */ lw $v0, ($v0) /* 188C38 8025A358 1444FFF8 */ bne $v0, $a0, .L8025A33C -/* 188C3C 8025A35C 00000000 */ nop +/* 188C3C 8025A35C 00000000 */ nop /* 188C40 8025A360 080968F0 */ j .L8025A3C0 /* 188C44 8025A364 A20006C2 */ sb $zero, 0x6c2($s0) .L8025A368: /* 188C48 8025A368 96240088 */ lhu $a0, 0x88($s1) /* 188C4C 8025A36C 0C0B7A90 */ jal func_802DEA40 -/* 188C50 8025A370 00000000 */ nop +/* 188C50 8025A370 00000000 */ nop /* 188C54 8025A374 AE0206D0 */ sw $v0, 0x6d0($s0) /* 188C58 8025A378 0040202D */ daddu $a0, $v0, $zero /* 188C5C 8025A37C A20006CD */ sb $zero, 0x6cd($s0) @@ -66,7 +66,7 @@ glabel func_8025A2C4 /* 188C8C 8025A3AC 00431021 */ addu $v0, $v0, $v1 /* 188C90 8025A3B0 8C420000 */ lw $v0, ($v0) /* 188C94 8025A3B4 1444FFF8 */ bne $v0, $a0, .L8025A398 -/* 188C98 8025A3B8 00000000 */ nop +/* 188C98 8025A3B8 00000000 */ nop /* 188C9C 8025A3BC A20006C2 */ sb $zero, 0x6c2($s0) .L8025A3C0: /* 188CA0 8025A3C0 A60006CA */ sh $zero, 0x6ca($s0) @@ -136,7 +136,7 @@ glabel func_8025A2C4 /* 188D88 8025A4A8 A60206C8 */ sh $v0, 0x6c8($s0) .L8025A4AC: /* 188D8C 8025A4AC 16A00004 */ bnez $s5, .L8025A4C0 -/* 188D90 8025A4B0 00000000 */ nop +/* 188D90 8025A4B0 00000000 */ nop /* 188D94 8025A4B4 960206C8 */ lhu $v0, 0x6c8($s0) /* 188D98 8025A4B8 2442FFFF */ addiu $v0, $v0, -1 /* 188D9C 8025A4BC A60206C8 */ sh $v0, 0x6c8($s0) @@ -147,7 +147,7 @@ glabel func_8025A2C4 /* 188DAC 8025A4CC 0C096657 */ jal func_8025995C /* 188DB0 8025A4D0 0280302D */ daddu $a2, $s4, $zero /* 188DB4 8025A4D4 0809693A */ j .L8025A4E8 -/* 188DB8 8025A4D8 00000000 */ nop +/* 188DB8 8025A4D8 00000000 */ nop .L8025A4DC: /* 188DBC 8025A4DC 0260282D */ daddu $a1, $s3, $zero /* 188DC0 8025A4E0 0C0965B0 */ jal func_802596C0 diff --git a/asm/nonmatchings/code_182B30/func_8025A50C.s b/asm/nonmatchings/code_182B30/func_8025A50C.s index 73f4709658..a0553ca9b5 100644 --- a/asm/nonmatchings/code_182B30/func_8025A50C.s +++ b/asm/nonmatchings/code_182B30/func_8025A50C.s @@ -17,7 +17,7 @@ glabel func_8025A50C /* 188E1C 8025A53C 10400032 */ beqz $v0, .L8025A608 /* 188E20 8025A540 00E0A02D */ daddu $s4, $a3, $zero /* 188E24 8025A544 16400016 */ bnez $s2, .L8025A5A0 -/* 188E28 8025A548 00000000 */ nop +/* 188E28 8025A548 00000000 */ nop /* 188E2C 8025A54C 0C0B7830 */ jal func_802DE0C0 /* 188E30 8025A550 96240088 */ lhu $a0, 0x88($s1) /* 188E34 8025A554 AE0206D0 */ sw $v0, 0x6d0($s0) @@ -37,14 +37,14 @@ glabel func_8025A50C /* 188E68 8025A588 00431021 */ addu $v0, $v0, $v1 /* 188E6C 8025A58C 8C420000 */ lw $v0, ($v0) /* 188E70 8025A590 1444FFF8 */ bne $v0, $a0, .L8025A574 -/* 188E74 8025A594 00000000 */ nop +/* 188E74 8025A594 00000000 */ nop .L8025A598: /* 188E78 8025A598 0809697E */ j .L8025A5F8 /* 188E7C 8025A59C 24020006 */ addiu $v0, $zero, 6 .L8025A5A0: /* 188E80 8025A5A0 96240088 */ lhu $a0, 0x88($s1) /* 188E84 8025A5A4 0C0B7A90 */ jal func_802DEA40 -/* 188E88 8025A5A8 00000000 */ nop +/* 188E88 8025A5A8 00000000 */ nop /* 188E8C 8025A5AC AE0206D0 */ sw $v0, 0x6d0($s0) /* 188E90 8025A5B0 0040202D */ daddu $a0, $v0, $zero /* 188E94 8025A5B4 A20006CD */ sb $zero, 0x6cd($s0) @@ -62,7 +62,7 @@ glabel func_8025A50C /* 188EC0 8025A5E0 00431021 */ addu $v0, $v0, $v1 /* 188EC4 8025A5E4 8C420000 */ lw $v0, ($v0) /* 188EC8 8025A5E8 1444FFF8 */ bne $v0, $a0, .L8025A5CC -/* 188ECC 8025A5EC 00000000 */ nop +/* 188ECC 8025A5EC 00000000 */ nop .L8025A5F0: /* 188ED0 8025A5F0 0C0B7A9B */ jal func_802DEA6C /* 188ED4 8025A5F4 96240088 */ lhu $a0, 0x88($s1) @@ -97,7 +97,7 @@ glabel func_8025A50C /* 188F34 8025A654 24C60001 */ addiu $a2, $a2, 1 /* 188F38 8025A658 00C2102A */ slt $v0, $a2, $v0 /* 188F3C 8025A65C 1440FFED */ bnez $v0, .L8025A614 -/* 188F40 8025A660 00000000 */ nop +/* 188F40 8025A660 00000000 */ nop .L8025A664: /* 188F44 8025A664 820206CC */ lb $v0, 0x6cc($s0) /* 188F48 8025A668 920306CC */ lbu $v1, 0x6cc($s0) @@ -151,7 +151,7 @@ glabel func_8025A50C /* 188FF0 8025A710 0C096657 */ jal func_8025995C /* 188FF4 8025A714 0280302D */ daddu $a2, $s4, $zero /* 188FF8 8025A718 080969CB */ j .L8025A72C -/* 188FFC 8025A71C 00000000 */ nop +/* 188FFC 8025A71C 00000000 */ nop .L8025A720: /* 189000 8025A720 0260282D */ daddu $a1, $s3, $zero /* 189004 8025A724 0C0965B0 */ jal func_802596C0 diff --git a/asm/nonmatchings/code_182B30/func_8025A74C.s b/asm/nonmatchings/code_182B30/func_8025A74C.s index f7421dc2be..1d16e294f6 100644 --- a/asm/nonmatchings/code_182B30/func_8025A74C.s +++ b/asm/nonmatchings/code_182B30/func_8025A74C.s @@ -19,7 +19,7 @@ glabel func_8025A74C /* 189064 8025A784 10400032 */ beqz $v0, .L8025A850 /* 189068 8025A788 00E0982D */ daddu $s3, $a3, $zero /* 18906C 8025A78C 16800017 */ bnez $s4, .L8025A7EC -/* 189070 8025A790 00000000 */ nop +/* 189070 8025A790 00000000 */ nop /* 189074 8025A794 0C0B7830 */ jal func_802DE0C0 /* 189078 8025A798 96240088 */ lhu $a0, 0x88($s1) /* 18907C 8025A79C AE0206D0 */ sw $v0, 0x6d0($s0) @@ -46,7 +46,7 @@ glabel func_8025A74C .L8025A7EC: /* 1890CC 8025A7EC 96240088 */ lhu $a0, 0x88($s1) /* 1890D0 8025A7F0 0C0B7A90 */ jal func_802DEA40 -/* 1890D4 8025A7F4 00000000 */ nop +/* 1890D4 8025A7F4 00000000 */ nop /* 1890D8 8025A7F8 AE0206D0 */ sw $v0, 0x6d0($s0) /* 1890DC 8025A7FC 0040202D */ daddu $a0, $v0, $zero /* 1890E0 8025A800 A20006CD */ sb $zero, 0x6cd($s0) @@ -126,7 +126,7 @@ glabel func_8025A74C /* 1891E0 8025A900 24E70001 */ addiu $a3, $a3, 1 /* 1891E4 8025A904 00E2102A */ slt $v0, $a3, $v0 /* 1891E8 8025A908 1440FFD4 */ bnez $v0, .L8025A85C -/* 1891EC 8025A90C 00000000 */ nop +/* 1891EC 8025A90C 00000000 */ nop /* 1891F0 8025A910 820206CD */ lb $v0, 0x6cd($s0) .L8025A914: /* 1891F4 8025A914 1840000A */ blez $v0, .L8025A940 @@ -145,9 +145,9 @@ glabel func_8025A74C /* 189220 8025A940 820306C2 */ lb $v1, 0x6c2($s0) /* 189224 8025A944 28620002 */ slti $v0, $v1, 2 /* 189228 8025A948 10400044 */ beqz $v0, .L8025AA5C -/* 18922C 8025A94C 00000000 */ nop +/* 18922C 8025A94C 00000000 */ nop /* 189230 8025A950 04600042 */ bltz $v1, .L8025AA5C -/* 189234 8025A954 00000000 */ nop +/* 189234 8025A954 00000000 */ nop /* 189238 8025A958 860206C8 */ lh $v0, 0x6c8($s0) /* 18923C 8025A95C 1C400010 */ bgtz $v0, .L8025A9A0 /* 189240 8025A960 240300FF */ addiu $v1, $zero, 0xff @@ -169,7 +169,7 @@ glabel func_8025A74C /* 18927C 8025A99C A60206C8 */ sh $v0, 0x6c8($s0) .L8025A9A0: /* 189280 8025A9A0 16A00004 */ bnez $s5, .L8025A9B4 -/* 189284 8025A9A4 00000000 */ nop +/* 189284 8025A9A4 00000000 */ nop /* 189288 8025A9A8 960206C8 */ lhu $v0, 0x6c8($s0) /* 18928C 8025A9AC 2442FFFF */ addiu $v0, $v0, -1 /* 189290 8025A9B0 A60206C8 */ sh $v0, 0x6c8($s0) @@ -181,15 +181,15 @@ glabel func_8025A74C /* 1892A4 8025A9C4 10400005 */ beqz $v0, .L8025A9DC /* 1892A8 8025A9C8 2402000A */ addiu $v0, $zero, 0xa /* 1892AC 8025A9CC 10620008 */ beq $v1, $v0, .L8025A9F0 -/* 1892B0 8025A9D0 00000000 */ nop +/* 1892B0 8025A9D0 00000000 */ nop /* 1892B4 8025A9D4 08096A88 */ j .L8025AA20 -/* 1892B8 8025A9D8 00000000 */ nop +/* 1892B8 8025A9D8 00000000 */ nop .L8025A9DC: /* 1892BC 8025A9DC 2402000D */ addiu $v0, $zero, 0xd /* 1892C0 8025A9E0 5062000F */ beql $v1, $v0, .L8025AA20 /* 1892C4 8025A9E4 A60006CA */ sh $zero, 0x6ca($s0) /* 1892C8 8025A9E8 08096A88 */ j .L8025AA20 -/* 1892CC 8025A9EC 00000000 */ nop +/* 1892CC 8025A9EC 00000000 */ nop .L8025A9F0: /* 1892D0 8025A9F0 16800006 */ bnez $s4, .L8025AA0C /* 1892D4 8025A9F4 0220202D */ daddu $a0, $s1, $zero @@ -197,13 +197,13 @@ glabel func_8025A74C /* 1892DC 8025A9FC 0C096657 */ jal func_8025995C /* 1892E0 8025AA00 0260302D */ daddu $a2, $s3, $zero /* 1892E4 8025AA04 08096A92 */ j .L8025AA48 -/* 1892E8 8025AA08 00000000 */ nop +/* 1892E8 8025AA08 00000000 */ nop .L8025AA0C: /* 1892EC 8025AA0C 0240282D */ daddu $a1, $s2, $zero /* 1892F0 8025AA10 0C0965B0 */ jal func_802596C0 /* 1892F4 8025AA14 0260302D */ daddu $a2, $s3, $zero /* 1892F8 8025AA18 08096A92 */ j .L8025AA48 -/* 1892FC 8025AA1C 00000000 */ nop +/* 1892FC 8025AA1C 00000000 */ nop .L8025AA20: /* 189300 8025AA20 16800006 */ bnez $s4, .L8025AA3C /* 189304 8025AA24 0220202D */ daddu $a0, $s1, $zero @@ -211,14 +211,14 @@ glabel func_8025A74C /* 18930C 8025AA2C 0C0965EC */ jal func_802597B0 /* 189310 8025AA30 0260302D */ daddu $a2, $s3, $zero /* 189314 8025AA34 08096A92 */ j .L8025AA48 -/* 189318 8025AA38 00000000 */ nop +/* 189318 8025AA38 00000000 */ nop .L8025AA3C: /* 18931C 8025AA3C 0240282D */ daddu $a1, $s2, $zero /* 189320 8025AA40 0C096543 */ jal func_8025950C /* 189324 8025AA44 0260302D */ daddu $a2, $s3, $zero .L8025AA48: /* 189328 8025AA48 16A00004 */ bnez $s5, .L8025AA5C -/* 18932C 8025AA4C 00000000 */ nop +/* 18932C 8025AA4C 00000000 */ nop /* 189330 8025AA50 960206CA */ lhu $v0, 0x6ca($s0) /* 189334 8025AA54 24420001 */ addiu $v0, $v0, 1 /* 189338 8025AA58 A60206CA */ sh $v0, 0x6ca($s0) diff --git a/asm/nonmatchings/code_182B30/func_8025AA80.s b/asm/nonmatchings/code_182B30/func_8025AA80.s index a917b890dd..86956e89a2 100644 --- a/asm/nonmatchings/code_182B30/func_8025AA80.s +++ b/asm/nonmatchings/code_182B30/func_8025AA80.s @@ -17,7 +17,7 @@ glabel func_8025AA80 /* 189390 8025AAB0 10400032 */ beqz $v0, .L8025AB7C /* 189394 8025AAB4 00E0A02D */ daddu $s4, $a3, $zero /* 189398 8025AAB8 16400017 */ bnez $s2, .L8025AB18 -/* 18939C 8025AABC 00000000 */ nop +/* 18939C 8025AABC 00000000 */ nop /* 1893A0 8025AAC0 0C0B7830 */ jal func_802DE0C0 /* 1893A4 8025AAC4 96240088 */ lhu $a0, 0x88($s1) /* 1893A8 8025AAC8 AE0206D0 */ sw $v0, 0x6d0($s0) @@ -38,13 +38,13 @@ glabel func_8025AA80 /* 1893E0 8025AB00 00431021 */ addu $v0, $v0, $v1 /* 1893E4 8025AB04 8C420000 */ lw $v0, ($v0) /* 1893E8 8025AB08 1444FFF8 */ bne $v0, $a0, .L8025AAEC -/* 1893EC 8025AB0C 00000000 */ nop +/* 1893EC 8025AB0C 00000000 */ nop /* 1893F0 8025AB10 08096ADC */ j .L8025AB70 /* 1893F4 8025AB14 A20006C2 */ sb $zero, 0x6c2($s0) .L8025AB18: /* 1893F8 8025AB18 96240088 */ lhu $a0, 0x88($s1) /* 1893FC 8025AB1C 0C0B7A90 */ jal func_802DEA40 -/* 189400 8025AB20 00000000 */ nop +/* 189400 8025AB20 00000000 */ nop /* 189404 8025AB24 AE0206D0 */ sw $v0, 0x6d0($s0) /* 189408 8025AB28 0040202D */ daddu $a0, $v0, $zero /* 18940C 8025AB2C A20006CD */ sb $zero, 0x6cd($s0) @@ -63,7 +63,7 @@ glabel func_8025AA80 /* 18943C 8025AB5C 00431021 */ addu $v0, $v0, $v1 /* 189440 8025AB60 8C420000 */ lw $v0, ($v0) /* 189444 8025AB64 1444FFF8 */ bne $v0, $a0, .L8025AB48 -/* 189448 8025AB68 00000000 */ nop +/* 189448 8025AB68 00000000 */ nop /* 18944C 8025AB6C A20006C2 */ sb $zero, 0x6c2($s0) .L8025AB70: /* 189450 8025AB70 A60006CA */ sh $zero, 0x6ca($s0) @@ -96,10 +96,10 @@ glabel func_8025AA80 /* 1894B0 8025ABD0 94E30000 */ lhu $v1, ($a3) /* 1894B4 8025ABD4 000312C2 */ srl $v0, $v1, 0xb /* 1894B8 8025ABD8 44820000 */ mtc1 $v0, $f0 -/* 1894BC 8025ABDC 00000000 */ nop +/* 1894BC 8025ABDC 00000000 */ nop /* 1894C0 8025ABE0 46800021 */ cvt.d.w $f0, $f0 /* 1894C4 8025ABE4 46280002 */ mul.d $f0, $f0, $f8 -/* 1894C8 8025ABE8 00000000 */ nop +/* 1894C8 8025ABE8 00000000 */ nop /* 1894CC 8025ABEC 90E40001 */ lbu $a0, 1($a3) /* 1894D0 8025ABF0 24E70002 */ addiu $a3, $a3, 2 /* 1894D4 8025ABF4 00031182 */ srl $v0, $v1, 6 @@ -107,7 +107,7 @@ glabel func_8025AA80 /* 1894DC 8025ABFC 00031842 */ srl $v1, $v1, 1 /* 1894E0 8025AC00 3066001F */ andi $a2, $v1, 0x1f /* 1894E4 8025AC04 4620103E */ c.le.d $f2, $f0 -/* 1894E8 8025AC08 00000000 */ nop +/* 1894E8 8025AC08 00000000 */ nop /* 1894EC 8025AC0C 45010005 */ bc1t .L8025AC24 /* 1894F0 8025AC10 30840001 */ andi $a0, $a0, 1 /* 1894F4 8025AC14 4620028D */ trunc.w.d $f10, $f0 @@ -118,17 +118,17 @@ glabel func_8025AA80 /* 189504 8025AC24 46220001 */ sub.d $f0, $f0, $f2 /* 189508 8025AC28 4620028D */ trunc.w.d $f10, $f0 /* 18950C 8025AC2C 44035000 */ mfc1 $v1, $f10 -/* 189510 8025AC30 00000000 */ nop +/* 189510 8025AC30 00000000 */ nop /* 189514 8025AC34 006B1825 */ or $v1, $v1, $t3 /* 189518 8025AC38 304200FF */ andi $v0, $v0, 0xff .L8025AC3C: /* 18951C 8025AC3C 44820000 */ mtc1 $v0, $f0 -/* 189520 8025AC40 00000000 */ nop +/* 189520 8025AC40 00000000 */ nop /* 189524 8025AC44 46800021 */ cvt.d.w $f0, $f0 /* 189528 8025AC48 46260002 */ mul.d $f0, $f0, $f6 -/* 18952C 8025AC4C 00000000 */ nop +/* 18952C 8025AC4C 00000000 */ nop /* 189530 8025AC50 4620103E */ c.le.d $f2, $f0 -/* 189534 8025AC54 00000000 */ nop +/* 189534 8025AC54 00000000 */ nop /* 189538 8025AC58 45030005 */ bc1tl .L8025AC70 /* 18953C 8025AC5C 46220001 */ sub.d $f0, $f0, $f2 /* 189540 8025AC60 4620028D */ trunc.w.d $f10, $f0 @@ -138,17 +138,17 @@ glabel func_8025AA80 .L8025AC70: /* 189550 8025AC70 4620028D */ trunc.w.d $f10, $f0 /* 189554 8025AC74 44055000 */ mfc1 $a1, $f10 -/* 189558 8025AC78 00000000 */ nop +/* 189558 8025AC78 00000000 */ nop /* 18955C 8025AC7C 00AB2825 */ or $a1, $a1, $t3 /* 189560 8025AC80 30C200FF */ andi $v0, $a2, 0xff .L8025AC84: /* 189564 8025AC84 44820000 */ mtc1 $v0, $f0 -/* 189568 8025AC88 00000000 */ nop +/* 189568 8025AC88 00000000 */ nop /* 18956C 8025AC8C 46800021 */ cvt.d.w $f0, $f0 /* 189570 8025AC90 46240002 */ mul.d $f0, $f0, $f4 -/* 189574 8025AC94 00000000 */ nop +/* 189574 8025AC94 00000000 */ nop /* 189578 8025AC98 4620103E */ c.le.d $f2, $f0 -/* 18957C 8025AC9C 00000000 */ nop +/* 18957C 8025AC9C 00000000 */ nop /* 189580 8025ACA0 45010005 */ bc1t .L8025ACB8 /* 189584 8025ACA4 00A0102D */ daddu $v0, $a1, $zero /* 189588 8025ACA8 4620028D */ trunc.w.d $f10, $f0 @@ -159,7 +159,7 @@ glabel func_8025AA80 /* 189598 8025ACB8 46220001 */ sub.d $f0, $f0, $f2 /* 18959C 8025ACBC 4620028D */ trunc.w.d $f10, $f0 /* 1895A0 8025ACC0 44055000 */ mfc1 $a1, $f10 -/* 1895A4 8025ACC4 00000000 */ nop +/* 1895A4 8025ACC4 00000000 */ nop /* 1895A8 8025ACC8 00AB2825 */ or $a1, $a1, $t3 /* 1895AC 8025ACCC 306300FF */ andi $v1, $v1, 0xff .L8025ACD0: @@ -181,7 +181,7 @@ glabel func_8025AA80 /* 1895E8 8025AD08 25080001 */ addiu $t0, $t0, 1 /* 1895EC 8025AD0C 0102102A */ slt $v0, $t0, $v0 /* 1895F0 8025AD10 1440FFA7 */ bnez $v0, .L8025ABB0 -/* 1895F4 8025AD14 00000000 */ nop +/* 1895F4 8025AD14 00000000 */ nop /* 1895F8 8025AD18 820206CD */ lb $v0, 0x6cd($s0) .L8025AD1C: /* 1895FC 8025AD1C 1840000A */ blez $v0, .L8025AD48 @@ -203,7 +203,7 @@ glabel func_8025AA80 /* 189634 8025AD54 0C096657 */ jal func_8025995C /* 189638 8025AD58 0280302D */ daddu $a2, $s4, $zero /* 18963C 8025AD5C 08096B5C */ j .L8025AD70 -/* 189640 8025AD60 00000000 */ nop +/* 189640 8025AD60 00000000 */ nop .L8025AD64: /* 189644 8025AD64 0260282D */ daddu $a1, $s3, $zero /* 189648 8025AD68 0C0965B0 */ jal func_802596C0 diff --git a/asm/nonmatchings/code_182B30/func_8025AD90.s b/asm/nonmatchings/code_182B30/func_8025AD90.s index 91672d4c26..a911458ab5 100644 --- a/asm/nonmatchings/code_182B30/func_8025AD90.s +++ b/asm/nonmatchings/code_182B30/func_8025AD90.s @@ -19,7 +19,7 @@ glabel func_8025AD90 /* 1896A8 8025ADC8 1040004B */ beqz $v0, .L8025AEF8 /* 1896AC 8025ADCC 00E0A02D */ daddu $s4, $a3, $zero /* 1896B0 8025ADD0 16400016 */ bnez $s2, .L8025AE2C -/* 1896B4 8025ADD4 00000000 */ nop +/* 1896B4 8025ADD4 00000000 */ nop /* 1896B8 8025ADD8 0C0B7830 */ jal func_802DE0C0 /* 1896BC 8025ADDC 96240088 */ lhu $a0, 0x88($s1) /* 1896C0 8025ADE0 AE0206D0 */ sw $v0, 0x6d0($s0) @@ -39,14 +39,14 @@ glabel func_8025AD90 /* 1896F4 8025AE14 00431021 */ addu $v0, $v0, $v1 /* 1896F8 8025AE18 8C420000 */ lw $v0, ($v0) /* 1896FC 8025AE1C 1444FFF8 */ bne $v0, $a0, .L8025AE00 -/* 189700 8025AE20 00000000 */ nop +/* 189700 8025AE20 00000000 */ nop .L8025AE24: /* 189704 8025AE24 08096BA1 */ j .L8025AE84 /* 189708 8025AE28 24020006 */ addiu $v0, $zero, 6 .L8025AE2C: /* 18970C 8025AE2C 96240088 */ lhu $a0, 0x88($s1) /* 189710 8025AE30 0C0B7A90 */ jal func_802DEA40 -/* 189714 8025AE34 00000000 */ nop +/* 189714 8025AE34 00000000 */ nop /* 189718 8025AE38 AE0206D0 */ sw $v0, 0x6d0($s0) /* 18971C 8025AE3C 0040202D */ daddu $a0, $v0, $zero /* 189720 8025AE40 A20006CD */ sb $zero, 0x6cd($s0) @@ -64,7 +64,7 @@ glabel func_8025AD90 /* 18974C 8025AE6C 00431021 */ addu $v0, $v0, $v1 /* 189750 8025AE70 8C420000 */ lw $v0, ($v0) /* 189754 8025AE74 1444FFF8 */ bne $v0, $a0, .L8025AE58 -/* 189758 8025AE78 00000000 */ nop +/* 189758 8025AE78 00000000 */ nop .L8025AE7C: /* 18975C 8025AE7C 0C0B7A9B */ jal func_802DEA6C /* 189760 8025AE80 96240088 */ lhu $a0, 0x88($s1) @@ -95,7 +95,7 @@ glabel func_8025AD90 /* 1897B4 8025AED4 24C60001 */ addiu $a2, $a2, 1 /* 1897B8 8025AED8 00C2102A */ slt $v0, $a2, $v0 /* 1897BC 8025AEDC 1440FFED */ bnez $v0, .L8025AE94 -/* 1897C0 8025AEE0 00000000 */ nop +/* 1897C0 8025AEE0 00000000 */ nop .L8025AEE4: /* 1897C4 8025AEE4 2402FFFE */ addiu $v0, $zero, -2 /* 1897C8 8025AEE8 A20206C2 */ sb $v0, 0x6c2($s0) @@ -104,10 +104,10 @@ glabel func_8025AD90 /* 1897D4 8025AEF4 A60006C8 */ sh $zero, 0x6c8($s0) .L8025AEF8: /* 1897D8 8025AEF8 16A0001E */ bnez $s5, .L8025AF74 -/* 1897DC 8025AEFC 00000000 */ nop +/* 1897DC 8025AEFC 00000000 */ nop /* 1897E0 8025AF00 860206C8 */ lh $v0, 0x6c8($s0) /* 1897E4 8025AF04 14400013 */ bnez $v0, .L8025AF54 -/* 1897E8 8025AF08 00000000 */ nop +/* 1897E8 8025AF08 00000000 */ nop /* 1897EC 8025AF0C 920206C2 */ lbu $v0, 0x6c2($s0) /* 1897F0 8025AF10 3C048028 */ lui $a0, %hi(D_80284104) /* 1897F4 8025AF14 24844104 */ addiu $a0, $a0, %lo(D_80284104) @@ -148,14 +148,14 @@ glabel func_8025AD90 /* 189870 8025AF90 10400005 */ beqz $v0, .L8025AFA8 /* 189874 8025AF94 24020002 */ addiu $v0, $zero, 2 /* 189878 8025AF98 10600007 */ beqz $v1, .L8025AFB8 -/* 18987C 8025AF9C 00000000 */ nop +/* 18987C 8025AF9C 00000000 */ nop /* 189880 8025AFA0 08096C46 */ j .L8025B118 -/* 189884 8025AFA4 00000000 */ nop +/* 189884 8025AFA4 00000000 */ nop .L8025AFA8: /* 189888 8025AFA8 1062003C */ beq $v1, $v0, .L8025B09C -/* 18988C 8025AFAC 00000000 */ nop +/* 18988C 8025AFAC 00000000 */ nop /* 189890 8025AFB0 08096C46 */ j .L8025B118 -/* 189894 8025AFB4 00000000 */ nop +/* 189894 8025AFB4 00000000 */ nop .L8025AFB8: /* 189898 8025AFB8 820206CC */ lb $v0, 0x6cc($s0) /* 18989C 8025AFBC 18400056 */ blez $v0, .L8025B118 @@ -182,9 +182,9 @@ glabel func_8025AD90 /* 1898E4 8025B004 24C60001 */ addiu $a2, $a2, 1 /* 1898E8 8025B008 00C2102A */ slt $v0, $a2, $v0 /* 1898EC 8025B00C 10400042 */ beqz $v0, .L8025B118 -/* 1898F0 8025B010 00000000 */ nop +/* 1898F0 8025B010 00000000 */ nop /* 1898F4 8025B014 08096BF1 */ j .L8025AFC4 -/* 1898F8 8025B018 00000000 */ nop +/* 1898F8 8025B018 00000000 */ nop .L8025B01C: /* 1898FC 8025B01C 820206CC */ lb $v0, 0x6cc($s0) /* 189900 8025B020 920306CC */ lbu $v1, 0x6cc($s0) @@ -220,7 +220,7 @@ glabel func_8025AD90 /* 18996C 8025B08C 5440FFE8 */ bnel $v0, $zero, .L8025B030 /* 189970 8025B090 00031E00 */ sll $v1, $v1, 0x18 /* 189974 8025B094 08096C46 */ j .L8025B118 -/* 189978 8025B098 00000000 */ nop +/* 189978 8025B098 00000000 */ nop .L8025B09C: /* 18997C 8025B09C 820206CC */ lb $v0, 0x6cc($s0) /* 189980 8025B0A0 920306CC */ lbu $v1, 0x6cc($s0) @@ -277,14 +277,14 @@ glabel func_8025AD90 /* 189A34 8025B154 0C096657 */ jal func_8025995C /* 189A38 8025B158 0280302D */ daddu $a2, $s4, $zero /* 189A3C 8025B15C 08096C5C */ j .L8025B170 -/* 189A40 8025B160 00000000 */ nop +/* 189A40 8025B160 00000000 */ nop .L8025B164: /* 189A44 8025B164 0260282D */ daddu $a1, $s3, $zero /* 189A48 8025B168 0C0965B0 */ jal func_802596C0 /* 189A4C 8025B16C 0280302D */ daddu $a2, $s4, $zero .L8025B170: /* 189A50 8025B170 16A00004 */ bnez $s5, .L8025B184 -/* 189A54 8025B174 00000000 */ nop +/* 189A54 8025B174 00000000 */ nop /* 189A58 8025B178 960206CA */ lhu $v0, 0x6ca($s0) /* 189A5C 8025B17C 2442FFFF */ addiu $v0, $v0, -1 /* 189A60 8025B180 A60206CA */ sh $v0, 0x6ca($s0) diff --git a/asm/nonmatchings/code_182B30/func_8025B1A8.s b/asm/nonmatchings/code_182B30/func_8025B1A8.s index 53e8165d42..9805dc96e6 100644 --- a/asm/nonmatchings/code_182B30/func_8025B1A8.s +++ b/asm/nonmatchings/code_182B30/func_8025B1A8.s @@ -19,7 +19,7 @@ glabel func_8025B1A8 /* 189AC0 8025B1E0 1040004B */ beqz $v0, .L8025B310 /* 189AC4 8025B1E4 00E0A02D */ daddu $s4, $a3, $zero /* 189AC8 8025B1E8 16400016 */ bnez $s2, .L8025B244 -/* 189ACC 8025B1EC 00000000 */ nop +/* 189ACC 8025B1EC 00000000 */ nop /* 189AD0 8025B1F0 0C0B7830 */ jal func_802DE0C0 /* 189AD4 8025B1F4 96240088 */ lhu $a0, 0x88($s1) /* 189AD8 8025B1F8 AE0206D0 */ sw $v0, 0x6d0($s0) @@ -39,14 +39,14 @@ glabel func_8025B1A8 /* 189B0C 8025B22C 00431021 */ addu $v0, $v0, $v1 /* 189B10 8025B230 8C420000 */ lw $v0, ($v0) /* 189B14 8025B234 1444FFF8 */ bne $v0, $a0, .L8025B218 -/* 189B18 8025B238 00000000 */ nop +/* 189B18 8025B238 00000000 */ nop .L8025B23C: /* 189B1C 8025B23C 08096CA7 */ j .L8025B29C /* 189B20 8025B240 24020006 */ addiu $v0, $zero, 6 .L8025B244: /* 189B24 8025B244 96240088 */ lhu $a0, 0x88($s1) /* 189B28 8025B248 0C0B7A90 */ jal func_802DEA40 -/* 189B2C 8025B24C 00000000 */ nop +/* 189B2C 8025B24C 00000000 */ nop /* 189B30 8025B250 AE0206D0 */ sw $v0, 0x6d0($s0) /* 189B34 8025B254 0040202D */ daddu $a0, $v0, $zero /* 189B38 8025B258 A20006CD */ sb $zero, 0x6cd($s0) @@ -64,7 +64,7 @@ glabel func_8025B1A8 /* 189B64 8025B284 00431021 */ addu $v0, $v0, $v1 /* 189B68 8025B288 8C420000 */ lw $v0, ($v0) /* 189B6C 8025B28C 1444FFF8 */ bne $v0, $a0, .L8025B270 -/* 189B70 8025B290 00000000 */ nop +/* 189B70 8025B290 00000000 */ nop .L8025B294: /* 189B74 8025B294 0C0B7A9B */ jal func_802DEA6C /* 189B78 8025B298 96240088 */ lhu $a0, 0x88($s1) @@ -95,7 +95,7 @@ glabel func_8025B1A8 /* 189BCC 8025B2EC 24C60001 */ addiu $a2, $a2, 1 /* 189BD0 8025B2F0 00C2102A */ slt $v0, $a2, $v0 /* 189BD4 8025B2F4 1440FFED */ bnez $v0, .L8025B2AC -/* 189BD8 8025B2F8 00000000 */ nop +/* 189BD8 8025B2F8 00000000 */ nop .L8025B2FC: /* 189BDC 8025B2FC 2402FFFE */ addiu $v0, $zero, -2 /* 189BE0 8025B300 A20206C2 */ sb $v0, 0x6c2($s0) @@ -104,10 +104,10 @@ glabel func_8025B1A8 /* 189BEC 8025B30C A60006C8 */ sh $zero, 0x6c8($s0) .L8025B310: /* 189BF0 8025B310 16A0001E */ bnez $s5, .L8025B38C -/* 189BF4 8025B314 00000000 */ nop +/* 189BF4 8025B314 00000000 */ nop /* 189BF8 8025B318 860206C8 */ lh $v0, 0x6c8($s0) /* 189BFC 8025B31C 14400013 */ bnez $v0, .L8025B36C -/* 189C00 8025B320 00000000 */ nop +/* 189C00 8025B320 00000000 */ nop /* 189C04 8025B324 920206C2 */ lbu $v0, 0x6c2($s0) /* 189C08 8025B328 3C048028 */ lui $a0, %hi(D_80284120) /* 189C0C 8025B32C 24844120 */ addiu $a0, $a0, %lo(D_80284120) @@ -148,14 +148,14 @@ glabel func_8025B1A8 /* 189C88 8025B3A8 10400005 */ beqz $v0, .L8025B3C0 /* 189C8C 8025B3AC 24020002 */ addiu $v0, $zero, 2 /* 189C90 8025B3B0 10600007 */ beqz $v1, .L8025B3D0 -/* 189C94 8025B3B4 00000000 */ nop +/* 189C94 8025B3B4 00000000 */ nop /* 189C98 8025B3B8 08096D4C */ j .L8025B530 -/* 189C9C 8025B3BC 00000000 */ nop +/* 189C9C 8025B3BC 00000000 */ nop .L8025B3C0: /* 189CA0 8025B3C0 1062003C */ beq $v1, $v0, .L8025B4B4 -/* 189CA4 8025B3C4 00000000 */ nop +/* 189CA4 8025B3C4 00000000 */ nop /* 189CA8 8025B3C8 08096D4C */ j .L8025B530 -/* 189CAC 8025B3CC 00000000 */ nop +/* 189CAC 8025B3CC 00000000 */ nop .L8025B3D0: /* 189CB0 8025B3D0 820206CC */ lb $v0, 0x6cc($s0) /* 189CB4 8025B3D4 18400056 */ blez $v0, .L8025B530 @@ -182,9 +182,9 @@ glabel func_8025B1A8 /* 189CFC 8025B41C 24C60001 */ addiu $a2, $a2, 1 /* 189D00 8025B420 00C2102A */ slt $v0, $a2, $v0 /* 189D04 8025B424 10400042 */ beqz $v0, .L8025B530 -/* 189D08 8025B428 00000000 */ nop +/* 189D08 8025B428 00000000 */ nop /* 189D0C 8025B42C 08096CF7 */ j .L8025B3DC -/* 189D10 8025B430 00000000 */ nop +/* 189D10 8025B430 00000000 */ nop .L8025B434: /* 189D14 8025B434 820206CC */ lb $v0, 0x6cc($s0) /* 189D18 8025B438 920306CC */ lbu $v1, 0x6cc($s0) @@ -220,7 +220,7 @@ glabel func_8025B1A8 /* 189D84 8025B4A4 5440FFE8 */ bnel $v0, $zero, .L8025B448 /* 189D88 8025B4A8 00031E00 */ sll $v1, $v1, 0x18 /* 189D8C 8025B4AC 08096D4C */ j .L8025B530 -/* 189D90 8025B4B0 00000000 */ nop +/* 189D90 8025B4B0 00000000 */ nop .L8025B4B4: /* 189D94 8025B4B4 820206CC */ lb $v0, 0x6cc($s0) /* 189D98 8025B4B8 920306CC */ lbu $v1, 0x6cc($s0) @@ -277,14 +277,14 @@ glabel func_8025B1A8 /* 189E4C 8025B56C 0C096657 */ jal func_8025995C /* 189E50 8025B570 0280302D */ daddu $a2, $s4, $zero /* 189E54 8025B574 08096D62 */ j .L8025B588 -/* 189E58 8025B578 00000000 */ nop +/* 189E58 8025B578 00000000 */ nop .L8025B57C: /* 189E5C 8025B57C 0260282D */ daddu $a1, $s3, $zero /* 189E60 8025B580 0C0965B0 */ jal func_802596C0 /* 189E64 8025B584 0280302D */ daddu $a2, $s4, $zero .L8025B588: /* 189E68 8025B588 16A00004 */ bnez $s5, .L8025B59C -/* 189E6C 8025B58C 00000000 */ nop +/* 189E6C 8025B58C 00000000 */ nop /* 189E70 8025B590 960206CA */ lhu $v0, 0x6ca($s0) /* 189E74 8025B594 2442FFFF */ addiu $v0, $v0, -1 /* 189E78 8025B598 A60206CA */ sh $v0, 0x6ca($s0) diff --git a/asm/nonmatchings/code_182B30/func_8025B5C0.s b/asm/nonmatchings/code_182B30/func_8025B5C0.s index 60e4bbab40..21a08538af 100644 --- a/asm/nonmatchings/code_182B30/func_8025B5C0.s +++ b/asm/nonmatchings/code_182B30/func_8025B5C0.s @@ -22,7 +22,7 @@ glabel func_8025B5C0 /* 189EE4 8025B604 10400078 */ beqz $v0, .L8025B7E8 /* 189EE8 8025B608 00E0B02D */ daddu $s6, $a3, $zero /* 189EEC 8025B60C 1680001B */ bnez $s4, .L8025B67C -/* 189EF0 8025B610 00000000 */ nop +/* 189EF0 8025B610 00000000 */ nop /* 189EF4 8025B614 0C0B7830 */ jal func_802DE0C0 /* 189EF8 8025B618 96240088 */ lhu $a0, 0x88($s1) /* 189EFC 8025B61C AE0206D0 */ sw $v0, 0x6d0($s0) @@ -42,7 +42,7 @@ glabel func_8025B5C0 /* 189F30 8025B650 00431021 */ addu $v0, $v0, $v1 /* 189F34 8025B654 8C420000 */ lw $v0, ($v0) /* 189F38 8025B658 1444FFF8 */ bne $v0, $a0, .L8025B63C -/* 189F3C 8025B65C 00000000 */ nop +/* 189F3C 8025B65C 00000000 */ nop .L8025B660: /* 189F40 8025B660 3C02800E */ lui $v0, %hi(gBattleStatus+0x4) /* 189F44 8025B664 8C42C074 */ lw $v0, %lo(gBattleStatus+0x4)($v0) @@ -54,7 +54,7 @@ glabel func_8025B5C0 .L8025B67C: /* 189F5C 8025B67C 96240088 */ lhu $a0, 0x88($s1) /* 189F60 8025B680 0C0B7A90 */ jal func_802DEA40 -/* 189F64 8025B684 00000000 */ nop +/* 189F64 8025B684 00000000 */ nop /* 189F68 8025B688 AE0206D0 */ sw $v0, 0x6d0($s0) /* 189F6C 8025B68C 0040202D */ daddu $a0, $v0, $zero /* 189F70 8025B690 A20006CD */ sb $zero, 0x6cd($s0) @@ -72,7 +72,7 @@ glabel func_8025B5C0 /* 189F9C 8025B6BC 00431021 */ addu $v0, $v0, $v1 /* 189FA0 8025B6C0 8C420000 */ lw $v0, ($v0) /* 189FA4 8025B6C4 1444FFF8 */ bne $v0, $a0, .L8025B6A8 -/* 189FA8 8025B6C8 00000000 */ nop +/* 189FA8 8025B6C8 00000000 */ nop .L8025B6CC: /* 189FAC 8025B6CC 0C0B7A9B */ jal func_802DEA6C /* 189FB0 8025B6D0 96240088 */ lhu $a0, 0x88($s1) @@ -159,7 +159,7 @@ glabel func_8025B5C0 .L8025B7E8: /* 18A0C8 8025B7E8 820206C2 */ lb $v0, 0x6c2($s0) /* 18A0CC 8025B7EC 14400085 */ bnez $v0, .L8025BA04 -/* 18A0D0 8025B7F0 00000000 */ nop +/* 18A0D0 8025B7F0 00000000 */ nop /* 18A0D4 8025B7F4 56600011 */ bnel $s3, $zero, .L8025B83C /* 18A0D8 8025B7F8 3C0451EB */ lui $a0, 0x51eb /* 18A0DC 8025B7FC 860206C8 */ lh $v0, 0x6c8($s0) @@ -228,11 +228,11 @@ glabel func_8025B5C0 /* 18A1C0 8025B8E0 95240000 */ lhu $a0, ($t1) /* 18A1C4 8025B8E4 00002812 */ mflo $a1 /* 18A1C8 8025B8E8 000412C2 */ srl $v0, $a0, 0xb -/* 18A1CC 8025B8EC 00000000 */ nop +/* 18A1CC 8025B8EC 00000000 */ nop /* 18A1D0 8025B8F0 004E0018 */ mult $v0, $t6 /* 18A1D4 8025B8F4 00006012 */ mflo $t4 /* 18A1D8 8025B8F8 00AC2821 */ addu $a1, $a1, $t4 -/* 18A1DC 8025B8FC 00000000 */ nop +/* 18A1DC 8025B8FC 00000000 */ nop /* 18A1E0 8025B900 00AF0018 */ mult $a1, $t7 /* 18A1E4 8025B904 00009810 */ mfhi $s3 /* 18A1E8 8025B908 00031182 */ srl $v0, $v1, 6 @@ -292,7 +292,7 @@ glabel func_8025B5C0 /* 18A2C0 8025B9E0 254A0001 */ addiu $t2, $t2, 1 /* 18A2C4 8025B9E4 0142102A */ slt $v0, $t2, $v0 /* 18A2C8 8025B9E8 1440FFA5 */ bnez $v0, .L8025B880 -/* 18A2CC 8025B9EC 00000000 */ nop +/* 18A2CC 8025B9EC 00000000 */ nop .L8025B9F0: /* 18A2D0 8025B9F0 332300FF */ andi $v1, $t9, 0xff /* 18A2D4 8025B9F4 240200FF */ addiu $v0, $zero, 0xff @@ -317,16 +317,16 @@ glabel func_8025B5C0 /* 18A314 8025BA34 820306C2 */ lb $v1, 0x6c2($s0) /* 18A318 8025BA38 28620002 */ slti $v0, $v1, 2 /* 18A31C 8025BA3C 1040000D */ beqz $v0, .L8025BA74 -/* 18A320 8025BA40 00000000 */ nop +/* 18A320 8025BA40 00000000 */ nop /* 18A324 8025BA44 0460000B */ bltz $v1, .L8025BA74 -/* 18A328 8025BA48 00000000 */ nop +/* 18A328 8025BA48 00000000 */ nop /* 18A32C 8025BA4C 16800006 */ bnez $s4, .L8025BA68 /* 18A330 8025BA50 0220202D */ daddu $a0, $s1, $zero /* 18A334 8025BA54 02A0282D */ daddu $a1, $s5, $zero /* 18A338 8025BA58 0C096657 */ jal func_8025995C /* 18A33C 8025BA5C 02C0302D */ daddu $a2, $s6, $zero /* 18A340 8025BA60 08096E9D */ j .L8025BA74 -/* 18A344 8025BA64 00000000 */ nop +/* 18A344 8025BA64 00000000 */ nop .L8025BA68: /* 18A348 8025BA68 02A0282D */ daddu $a1, $s5, $zero /* 18A34C 8025BA6C 0C0965B0 */ jal func_802596C0 diff --git a/asm/nonmatchings/code_182B30/func_8025BAA0.s b/asm/nonmatchings/code_182B30/func_8025BAA0.s index bad36397fb..34af527f8f 100644 --- a/asm/nonmatchings/code_182B30/func_8025BAA0.s +++ b/asm/nonmatchings/code_182B30/func_8025BAA0.s @@ -22,7 +22,7 @@ glabel func_8025BAA0 /* 18A3C4 8025BAE4 1040005A */ beqz $v0, .L8025BC50 /* 18A3C8 8025BAE8 00E0982D */ daddu $s3, $a3, $zero /* 18A3CC 8025BAEC 16800016 */ bnez $s4, .L8025BB48 -/* 18A3D0 8025BAF0 00000000 */ nop +/* 18A3D0 8025BAF0 00000000 */ nop /* 18A3D4 8025BAF4 0C0B7830 */ jal func_802DE0C0 /* 18A3D8 8025BAF8 96440088 */ lhu $a0, 0x88($s2) /* 18A3DC 8025BAFC AE0206D0 */ sw $v0, 0x6d0($s0) @@ -42,9 +42,9 @@ glabel func_8025BAA0 /* 18A410 8025BB30 00431021 */ addu $v0, $v0, $v1 /* 18A414 8025BB34 8C420000 */ lw $v0, ($v0) /* 18A418 8025BB38 10440016 */ beq $v0, $a0, .L8025BB94 -/* 18A41C 8025BB3C 00000000 */ nop +/* 18A41C 8025BB3C 00000000 */ nop /* 18A420 8025BB40 08096EC7 */ j .L8025BB1C -/* 18A424 8025BB44 00000000 */ nop +/* 18A424 8025BB44 00000000 */ nop .L8025BB48: /* 18A428 8025BB48 0C0B7A90 */ jal func_802DEA40 /* 18A42C 8025BB4C 96440088 */ lhu $a0, 0x88($s2) @@ -65,7 +65,7 @@ glabel func_8025BAA0 /* 18A464 8025BB84 00431021 */ addu $v0, $v0, $v1 /* 18A468 8025BB88 8C420000 */ lw $v0, ($v0) /* 18A46C 8025BB8C 1444FFF8 */ bne $v0, $a0, .L8025BB70 -/* 18A470 8025BB90 00000000 */ nop +/* 18A470 8025BB90 00000000 */ nop .L8025BB94: /* 18A474 8025BB94 820306C1 */ lb $v1, 0x6c1($s0) /* 18A478 8025BB98 24020001 */ addiu $v0, $zero, 1 @@ -108,7 +108,7 @@ glabel func_8025BAA0 /* 18A4F8 8025BC18 24A50004 */ addiu $a1, $a1, 4 .L8025BC1C: /* 18A4FC 8025BC1C 16600007 */ bnez $s3, .L8025BC3C -/* 18A500 8025BC20 00000000 */ nop +/* 18A500 8025BC20 00000000 */ nop /* 18A504 8025BC24 96020744 */ lhu $v0, 0x744($s0) /* 18A508 8025BC28 A6000744 */ sh $zero, 0x744($s0) /* 18A50C 8025BC2C A6020746 */ sh $v0, 0x746($s0) @@ -128,10 +128,10 @@ glabel func_8025BAA0 /* 18A53C 8025BC5C 1062000E */ beq $v1, $v0, .L8025BC98 /* 18A540 8025BC60 24020002 */ addiu $v0, $zero, 2 /* 18A544 8025BC64 08096FA3 */ j .L8025BE8C -/* 18A548 8025BC68 00000000 */ nop +/* 18A548 8025BC68 00000000 */ nop .L8025BC6C: /* 18A54C 8025BC6C 16200085 */ bnez $s1, .L8025BE84 -/* 18A550 8025BC70 00000000 */ nop +/* 18A550 8025BC70 00000000 */ nop /* 18A554 8025BC74 860206C8 */ lh $v0, 0x6c8($s0) /* 18A558 8025BC78 960306C8 */ lhu $v1, 0x6c8($s0) /* 18A55C 8025BC7C 10400003 */ beqz $v0, .L8025BC8C @@ -155,7 +155,7 @@ glabel func_8025BAA0 /* 18A598 8025BCB8 14410004 */ bne $v0, $at, .L8025BCCC /* 18A59C 8025BCBC 3C018000 */ lui $at, 0x8000 /* 18A5A0 8025BCC0 14610002 */ bne $v1, $at, .L8025BCCC -/* 18A5A4 8025BCC4 00000000 */ nop +/* 18A5A4 8025BCC4 00000000 */ nop /* 18A5A8 8025BCC8 0006000D */ break 6 .L8025BCCC: /* 18A5AC 8025BCCC 00001812 */ mflo $v1 @@ -205,11 +205,11 @@ glabel func_8025BAA0 /* 18A650 8025BD70 95240000 */ lhu $a0, ($t1) /* 18A654 8025BD74 00002812 */ mflo $a1 /* 18A658 8025BD78 000412C2 */ srl $v0, $a0, 0xb -/* 18A65C 8025BD7C 00000000 */ nop +/* 18A65C 8025BD7C 00000000 */ nop /* 18A660 8025BD80 004C0018 */ mult $v0, $t4 /* 18A664 8025BD84 00004012 */ mflo $t0 /* 18A668 8025BD88 00A82821 */ addu $a1, $a1, $t0 -/* 18A66C 8025BD8C 00000000 */ nop +/* 18A66C 8025BD8C 00000000 */ nop /* 18A670 8025BD90 00AF0018 */ mult $a1, $t7 /* 18A674 8025BD94 00009810 */ mfhi $s3 /* 18A678 8025BD98 00031182 */ srl $v0, $v1, 6 @@ -278,12 +278,12 @@ glabel func_8025BAA0 /* 18A76C 8025BE8C 10620005 */ beq $v1, $v0, .L8025BEA4 /* 18A770 8025BE90 24020003 */ addiu $v0, $zero, 3 /* 18A774 8025BE94 1062000C */ beq $v1, $v0, .L8025BEC8 -/* 18A778 8025BE98 00000000 */ nop +/* 18A778 8025BE98 00000000 */ nop /* 18A77C 8025BE9C 0809702D */ j .L8025C0B4 -/* 18A780 8025BEA0 00000000 */ nop +/* 18A780 8025BEA0 00000000 */ nop .L8025BEA4: /* 18A784 8025BEA4 16200083 */ bnez $s1, .L8025C0B4 -/* 18A788 8025BEA8 00000000 */ nop +/* 18A788 8025BEA8 00000000 */ nop /* 18A78C 8025BEAC 860206C8 */ lh $v0, 0x6c8($s0) /* 18A790 8025BEB0 960306C8 */ lhu $v1, 0x6c8($s0) /* 18A794 8025BEB4 1440007E */ bnez $v0, .L8025C0B0 @@ -304,7 +304,7 @@ glabel func_8025BAA0 /* 18A7C8 8025BEE8 14410004 */ bne $v0, $at, .L8025BEFC /* 18A7CC 8025BEEC 3C018000 */ lui $at, 0x8000 /* 18A7D0 8025BEF0 14610002 */ bne $v1, $at, .L8025BEFC -/* 18A7D4 8025BEF4 00000000 */ nop +/* 18A7D4 8025BEF4 00000000 */ nop /* 18A7D8 8025BEF8 0006000D */ break 6 .L8025BEFC: /* 18A7DC 8025BEFC 00001812 */ mflo $v1 @@ -354,11 +354,11 @@ glabel func_8025BAA0 /* 18A880 8025BFA0 95240000 */ lhu $a0, ($t1) /* 18A884 8025BFA4 00002812 */ mflo $a1 /* 18A888 8025BFA8 000412C2 */ srl $v0, $a0, 0xb -/* 18A88C 8025BFAC 00000000 */ nop +/* 18A88C 8025BFAC 00000000 */ nop /* 18A890 8025BFB0 004C0018 */ mult $v0, $t4 /* 18A894 8025BFB4 00004012 */ mflo $t0 /* 18A898 8025BFB8 00A82821 */ addu $a1, $a1, $t0 -/* 18A89C 8025BFBC 00000000 */ nop +/* 18A89C 8025BFBC 00000000 */ nop /* 18A8A0 8025BFC0 00AF0018 */ mult $a1, $t7 /* 18A8A4 8025BFC4 00008810 */ mfhi $s1 /* 18A8A8 8025BFC8 00031182 */ srl $v0, $v1, 6 @@ -416,7 +416,7 @@ glabel func_8025BAA0 /* 18A978 8025C098 330300FF */ andi $v1, $t8, 0xff /* 18A97C 8025C09C 240200FF */ addiu $v0, $zero, 0xff /* 18A980 8025C0A0 14620004 */ bne $v1, $v0, .L8025C0B4 -/* 18A984 8025C0A4 00000000 */ nop +/* 18A984 8025C0A4 00000000 */ nop /* 18A988 8025C0A8 96020744 */ lhu $v0, 0x744($s0) /* 18A98C 8025C0AC A20006C2 */ sb $zero, 0x6c2($s0) .L8025C0B0: @@ -425,16 +425,16 @@ glabel func_8025BAA0 /* 18A994 8025C0B4 820306C2 */ lb $v1, 0x6c2($s0) /* 18A998 8025C0B8 28620004 */ slti $v0, $v1, 4 /* 18A99C 8025C0BC 1040000D */ beqz $v0, .L8025C0F4 -/* 18A9A0 8025C0C0 00000000 */ nop +/* 18A9A0 8025C0C0 00000000 */ nop /* 18A9A4 8025C0C4 0460000B */ bltz $v1, .L8025C0F4 -/* 18A9A8 8025C0C8 00000000 */ nop +/* 18A9A8 8025C0C8 00000000 */ nop /* 18A9AC 8025C0CC 16800006 */ bnez $s4, .L8025C0E8 /* 18A9B0 8025C0D0 0240202D */ daddu $a0, $s2, $zero /* 18A9B4 8025C0D4 02A0282D */ daddu $a1, $s5, $zero /* 18A9B8 8025C0D8 0C096657 */ jal func_8025995C /* 18A9BC 8025C0DC 02C0302D */ daddu $a2, $s6, $zero /* 18A9C0 8025C0E0 0809703D */ j .L8025C0F4 -/* 18A9C4 8025C0E4 00000000 */ nop +/* 18A9C4 8025C0E4 00000000 */ nop .L8025C0E8: /* 18A9C8 8025C0E8 02A0282D */ daddu $a1, $s5, $zero /* 18A9CC 8025C0EC 0C0965B0 */ jal func_802596C0 diff --git a/asm/nonmatchings/code_182B30/func_8025C120.s b/asm/nonmatchings/code_182B30/func_8025C120.s index bb48f9db38..60b5f6b0a3 100644 --- a/asm/nonmatchings/code_182B30/func_8025C120.s +++ b/asm/nonmatchings/code_182B30/func_8025C120.s @@ -21,7 +21,7 @@ glabel func_8025C120 /* 18AA40 8025C160 10400055 */ beqz $v0, .L8025C2B8 /* 18AA44 8025C164 00E0B02D */ daddu $s6, $a3, $zero /* 18AA48 8025C168 16800016 */ bnez $s4, .L8025C1C4 -/* 18AA4C 8025C16C 00000000 */ nop +/* 18AA4C 8025C16C 00000000 */ nop /* 18AA50 8025C170 0C0B7830 */ jal func_802DE0C0 /* 18AA54 8025C174 96640088 */ lhu $a0, 0x88($s3) /* 18AA58 8025C178 AE0206D0 */ sw $v0, 0x6d0($s0) @@ -41,9 +41,9 @@ glabel func_8025C120 /* 18AA8C 8025C1AC 00431021 */ addu $v0, $v0, $v1 /* 18AA90 8025C1B0 8C420000 */ lw $v0, ($v0) /* 18AA94 8025C1B4 10440019 */ beq $v0, $a0, .L8025C21C -/* 18AA98 8025C1B8 00000000 */ nop +/* 18AA98 8025C1B8 00000000 */ nop /* 18AA9C 8025C1BC 08097066 */ j .L8025C198 -/* 18AAA0 8025C1C0 00000000 */ nop +/* 18AAA0 8025C1C0 00000000 */ nop .L8025C1C4: /* 18AAA4 8025C1C4 0C0B7A90 */ jal func_802DEA40 /* 18AAA8 8025C1C8 96640088 */ lhu $a0, 0x88($s3) @@ -64,7 +64,7 @@ glabel func_8025C120 /* 18AAE0 8025C200 00431021 */ addu $v0, $v0, $v1 /* 18AAE4 8025C204 8C420000 */ lw $v0, ($v0) /* 18AAE8 8025C208 1444FFF8 */ bne $v0, $a0, .L8025C1EC -/* 18AAEC 8025C20C 00000000 */ nop +/* 18AAEC 8025C20C 00000000 */ nop .L8025C210: /* 18AAF0 8025C210 0C0B7A9B */ jal func_802DEA6C /* 18AAF4 8025C214 96640088 */ lhu $a0, 0x88($s3) @@ -122,10 +122,10 @@ glabel func_8025C120 /* 18ABA4 8025C2C4 1062000E */ beq $v1, $v0, .L8025C300 /* 18ABA8 8025C2C8 24020002 */ addiu $v0, $zero, 2 /* 18ABAC 8025C2CC 08097156 */ j .L8025C558 -/* 18ABB0 8025C2D0 00000000 */ nop +/* 18ABB0 8025C2D0 00000000 */ nop .L8025C2D4: /* 18ABB4 8025C2D4 1640009E */ bnez $s2, .L8025C550 -/* 18ABB8 8025C2D8 00000000 */ nop +/* 18ABB8 8025C2D8 00000000 */ nop /* 18ABBC 8025C2DC 860206C8 */ lh $v0, 0x6c8($s0) /* 18ABC0 8025C2E0 960306C8 */ lhu $v1, 0x6c8($s0) /* 18ABC4 8025C2E4 10400003 */ beqz $v0, .L8025C2F4 @@ -149,7 +149,7 @@ glabel func_8025C120 /* 18AC00 8025C320 14410004 */ bne $v0, $at, .L8025C334 /* 18AC04 8025C324 3C018000 */ lui $at, 0x8000 /* 18AC08 8025C328 14610002 */ bne $v1, $at, .L8025C334 -/* 18AC0C 8025C32C 00000000 */ nop +/* 18AC0C 8025C32C 00000000 */ nop /* 18AC10 8025C330 0006000D */ break 6 .L8025C334: /* 18AC14 8025C334 00001812 */ mflo $v1 @@ -214,11 +214,11 @@ glabel func_8025C120 /* 18ACF0 8025C410 95240000 */ lhu $a0, ($t1) /* 18ACF4 8025C414 00002812 */ mflo $a1 /* 18ACF8 8025C418 000412C2 */ srl $v0, $a0, 0xb -/* 18ACFC 8025C41C 00000000 */ nop +/* 18ACFC 8025C41C 00000000 */ nop /* 18AD00 8025C420 004E0018 */ mult $v0, $t6 /* 18AD04 8025C424 00004012 */ mflo $t0 /* 18AD08 8025C428 00A82821 */ addu $a1, $a1, $t0 -/* 18AD0C 8025C42C 00000000 */ nop +/* 18AD0C 8025C42C 00000000 */ nop /* 18AD10 8025C430 00AF0018 */ mult $a1, $t7 /* 18AD14 8025C434 0000B810 */ mfhi $s7 /* 18AD18 8025C438 00031182 */ srl $v0, $v1, 6 @@ -299,12 +299,12 @@ glabel func_8025C120 /* 18AE38 8025C558 10620005 */ beq $v1, $v0, .L8025C570 /* 18AE3C 8025C55C 24020003 */ addiu $v0, $zero, 3 /* 18AE40 8025C560 1062000C */ beq $v1, $v0, .L8025C594 -/* 18AE44 8025C564 00000000 */ nop +/* 18AE44 8025C564 00000000 */ nop /* 18AE48 8025C568 080971F5 */ j .L8025C7D4 -/* 18AE4C 8025C56C 00000000 */ nop +/* 18AE4C 8025C56C 00000000 */ nop .L8025C570: /* 18AE50 8025C570 16400098 */ bnez $s2, .L8025C7D4 -/* 18AE54 8025C574 00000000 */ nop +/* 18AE54 8025C574 00000000 */ nop /* 18AE58 8025C578 860206C8 */ lh $v0, 0x6c8($s0) /* 18AE5C 8025C57C 960306C8 */ lhu $v1, 0x6c8($s0) /* 18AE60 8025C580 14400093 */ bnez $v0, .L8025C7D0 @@ -325,7 +325,7 @@ glabel func_8025C120 /* 18AE94 8025C5B4 14410004 */ bne $v0, $at, .L8025C5C8 /* 18AE98 8025C5B8 3C018000 */ lui $at, 0x8000 /* 18AE9C 8025C5BC 14610002 */ bne $v1, $at, .L8025C5C8 -/* 18AEA0 8025C5C0 00000000 */ nop +/* 18AEA0 8025C5C0 00000000 */ nop /* 18AEA4 8025C5C4 0006000D */ break 6 .L8025C5C8: /* 18AEA8 8025C5C8 00001812 */ mflo $v1 @@ -390,11 +390,11 @@ glabel func_8025C120 /* 18AF84 8025C6A4 95240000 */ lhu $a0, ($t1) /* 18AF88 8025C6A8 00002812 */ mflo $a1 /* 18AF8C 8025C6AC 000412C2 */ srl $v0, $a0, 0xb -/* 18AF90 8025C6B0 00000000 */ nop +/* 18AF90 8025C6B0 00000000 */ nop /* 18AF94 8025C6B4 004E0018 */ mult $v0, $t6 /* 18AF98 8025C6B8 00004012 */ mflo $t0 /* 18AF9C 8025C6BC 00A82821 */ addu $a1, $a1, $t0 -/* 18AFA0 8025C6C0 00000000 */ nop +/* 18AFA0 8025C6C0 00000000 */ nop /* 18AFA4 8025C6C4 00AF0018 */ mult $a1, $t7 /* 18AFA8 8025C6C8 00009010 */ mfhi $s2 /* 18AFAC 8025C6CC 00031182 */ srl $v0, $v1, 6 @@ -460,7 +460,7 @@ glabel func_8025C120 /* 18B098 8025C7B8 322300FF */ andi $v1, $s1, 0xff /* 18B09C 8025C7BC 240200FF */ addiu $v0, $zero, 0xff /* 18B0A0 8025C7C0 14620004 */ bne $v1, $v0, .L8025C7D4 -/* 18B0A4 8025C7C4 00000000 */ nop +/* 18B0A4 8025C7C4 00000000 */ nop /* 18B0A8 8025C7C8 96020744 */ lhu $v0, 0x744($s0) /* 18B0AC 8025C7CC A20006C2 */ sb $zero, 0x6c2($s0) .L8025C7D0: @@ -469,16 +469,16 @@ glabel func_8025C120 /* 18B0B4 8025C7D4 820306C2 */ lb $v1, 0x6c2($s0) /* 18B0B8 8025C7D8 28620004 */ slti $v0, $v1, 4 /* 18B0BC 8025C7DC 1040000D */ beqz $v0, .L8025C814 -/* 18B0C0 8025C7E0 00000000 */ nop +/* 18B0C0 8025C7E0 00000000 */ nop /* 18B0C4 8025C7E4 0460000B */ bltz $v1, .L8025C814 -/* 18B0C8 8025C7E8 00000000 */ nop +/* 18B0C8 8025C7E8 00000000 */ nop /* 18B0CC 8025C7EC 16800006 */ bnez $s4, .L8025C808 /* 18B0D0 8025C7F0 0260202D */ daddu $a0, $s3, $zero /* 18B0D4 8025C7F4 02A0282D */ daddu $a1, $s5, $zero /* 18B0D8 8025C7F8 0C096657 */ jal func_8025995C /* 18B0DC 8025C7FC 02C0302D */ daddu $a2, $s6, $zero /* 18B0E0 8025C800 08097205 */ j .L8025C814 -/* 18B0E4 8025C804 00000000 */ nop +/* 18B0E4 8025C804 00000000 */ nop .L8025C808: /* 18B0E8 8025C808 02A0282D */ daddu $a1, $s5, $zero /* 18B0EC 8025C80C 0C0965B0 */ jal func_802596C0 diff --git a/asm/nonmatchings/code_182B30/func_8025C840.s b/asm/nonmatchings/code_182B30/func_8025C840.s index 8f66d9650f..ccace86e64 100644 --- a/asm/nonmatchings/code_182B30/func_8025C840.s +++ b/asm/nonmatchings/code_182B30/func_8025C840.s @@ -15,15 +15,15 @@ glabel func_8025C840 /* 18B148 8025C868 10620007 */ beq $v1, $v0, .L8025C888 /* 18B14C 8025C86C 0000102D */ daddu $v0, $zero, $zero /* 18B150 8025C870 08097225 */ j .L8025C894 -/* 18B154 8025C874 00000000 */ nop +/* 18B154 8025C874 00000000 */ nop .L8025C878: /* 18B158 8025C878 0C097228 */ jal func_8025C8A0 -/* 18B15C 8025C87C 00000000 */ nop +/* 18B15C 8025C87C 00000000 */ nop /* 18B160 8025C880 08097225 */ j .L8025C894 /* 18B164 8025C884 0000102D */ daddu $v0, $zero, $zero .L8025C888: /* 18B168 8025C888 0C097246 */ jal func_8025C918 -/* 18B16C 8025C88C 00000000 */ nop +/* 18B16C 8025C88C 00000000 */ nop /* 18B170 8025C890 0000102D */ daddu $v0, $zero, $zero .L8025C894: /* 18B174 8025C894 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_182B30/func_8025C8A0.s b/asm/nonmatchings/code_182B30/func_8025C8A0.s index f1e34740cf..6dd3142d9c 100644 --- a/asm/nonmatchings/code_182B30/func_8025C8A0.s +++ b/asm/nonmatchings/code_182B30/func_8025C8A0.s @@ -8,7 +8,7 @@ glabel func_8025C8A0 /* 18B18C 8025C8AC 8CE300C0 */ lw $v1, 0xc0($a3) /* 18B190 8025C8B0 80620751 */ lb $v0, 0x751($v1) /* 18B194 8025C8B4 10400015 */ beqz $v0, .L8025C90C -/* 18B198 8025C8B8 00000000 */ nop +/* 18B198 8025C8B8 00000000 */ nop /* 18B19C 8025C8BC 1480000B */ bnez $a0, .L8025C8EC /* 18B1A0 8025C8C0 A0600751 */ sb $zero, 0x751($v1) /* 18B1A4 8025C8C4 0000202D */ daddu $a0, $zero, $zero @@ -20,7 +20,7 @@ glabel func_8025C8A0 /* 18B1BC 8025C8DC 0C0B77FE */ jal func_802DDFF8 /* 18B1C0 8025C8E0 AFA00018 */ sw $zero, 0x18($sp) /* 18B1C4 8025C8E4 08097243 */ j .L8025C90C -/* 18B1C8 8025C8E8 00000000 */ nop +/* 18B1C8 8025C8E8 00000000 */ nop .L8025C8EC: /* 18B1CC 8025C8EC 0000282D */ daddu $a1, $zero, $zero /* 18B1D0 8025C8F0 00A0302D */ daddu $a2, $a1, $zero diff --git a/asm/nonmatchings/code_182B30/func_8025C918.s b/asm/nonmatchings/code_182B30/func_8025C918.s index f589dba2e3..ad2ca399a1 100644 --- a/asm/nonmatchings/code_182B30/func_8025C918.s +++ b/asm/nonmatchings/code_182B30/func_8025C918.s @@ -38,7 +38,7 @@ glabel func_8025C918 /* 18B27C 8025C99C 0C0B77FE */ jal func_802DDFF8 /* 18B280 8025C9A0 AFA00018 */ sw $zero, 0x18($sp) /* 18B284 8025C9A4 08097274 */ j .L8025C9D0 -/* 18B288 8025C9A8 00000000 */ nop +/* 18B288 8025C9A8 00000000 */ nop .L8025C9AC: /* 18B28C 8025C9AC 24050011 */ addiu $a1, $zero, 0x11 /* 18B290 8025C9B0 24060014 */ addiu $a2, $zero, 0x14 @@ -94,10 +94,10 @@ glabel func_8025C918 /* 18B34C 8025CA6C 46000021 */ cvt.d.s $f0, $f0 /* 18B350 8025CA70 46380000 */ add.d $f0, $f0, $f24 /* 18B354 8025CA74 46360002 */ mul.d $f0, $f0, $f22 -/* 18B358 8025CA78 00000000 */ nop +/* 18B358 8025CA78 00000000 */ nop /* 18B35C 8025CA7C 27A20020 */ addiu $v0, $sp, 0x20 /* 18B360 8025CA80 4620A03E */ c.le.d $f20, $f0 -/* 18B364 8025CA84 00000000 */ nop +/* 18B364 8025CA84 00000000 */ nop /* 18B368 8025CA88 45010005 */ bc1t .L8025CAA0 /* 18B36C 8025CA8C 00501021 */ addu $v0, $v0, $s0 /* 18B370 8025CA90 4620008D */ trunc.w.d $f2, $f0 @@ -108,7 +108,7 @@ glabel func_8025C918 /* 18B380 8025CAA0 46340001 */ sub.d $f0, $f0, $f20 /* 18B384 8025CAA4 4620008D */ trunc.w.d $f2, $f0 /* 18B388 8025CAA8 44031000 */ mfc1 $v1, $f2 -/* 18B38C 8025CAAC 00000000 */ nop +/* 18B38C 8025CAAC 00000000 */ nop /* 18B390 8025CAB0 00731825 */ or $v1, $v1, $s3 /* 18B394 8025CAB4 A0430000 */ sb $v1, ($v0) .L8025CAB8: @@ -121,10 +121,10 @@ glabel func_8025C918 /* 18B3B0 8025CAD0 46000021 */ cvt.d.s $f0, $f0 /* 18B3B4 8025CAD4 46380000 */ add.d $f0, $f0, $f24 /* 18B3B8 8025CAD8 46360002 */ mul.d $f0, $f0, $f22 -/* 18B3BC 8025CADC 00000000 */ nop +/* 18B3BC 8025CADC 00000000 */ nop /* 18B3C0 8025CAE0 27A20038 */ addiu $v0, $sp, 0x38 /* 18B3C4 8025CAE4 4620A03E */ c.le.d $f20, $f0 -/* 18B3C8 8025CAE8 00000000 */ nop +/* 18B3C8 8025CAE8 00000000 */ nop /* 18B3CC 8025CAEC 45010005 */ bc1t .L8025CB04 /* 18B3D0 8025CAF0 00501021 */ addu $v0, $v0, $s0 /* 18B3D4 8025CAF4 4620008D */ trunc.w.d $f2, $f0 @@ -135,7 +135,7 @@ glabel func_8025C918 /* 18B3E4 8025CB04 46340001 */ sub.d $f0, $f0, $f20 /* 18B3E8 8025CB08 4620008D */ trunc.w.d $f2, $f0 /* 18B3EC 8025CB0C 44031000 */ mfc1 $v1, $f2 -/* 18B3F0 8025CB10 00000000 */ nop +/* 18B3F0 8025CB10 00000000 */ nop /* 18B3F4 8025CB14 00731825 */ or $v1, $v1, $s3 /* 18B3F8 8025CB18 A0430000 */ sb $v1, ($v0) .L8025CB1C: @@ -148,10 +148,10 @@ glabel func_8025C918 /* 18B414 8025CB34 46000021 */ cvt.d.s $f0, $f0 /* 18B418 8025CB38 46380000 */ add.d $f0, $f0, $f24 /* 18B41C 8025CB3C 46360002 */ mul.d $f0, $f0, $f22 -/* 18B420 8025CB40 00000000 */ nop +/* 18B420 8025CB40 00000000 */ nop /* 18B424 8025CB44 27A20050 */ addiu $v0, $sp, 0x50 /* 18B428 8025CB48 4620A03E */ c.le.d $f20, $f0 -/* 18B42C 8025CB4C 00000000 */ nop +/* 18B42C 8025CB4C 00000000 */ nop /* 18B430 8025CB50 45010005 */ bc1t .L8025CB68 /* 18B434 8025CB54 00501021 */ addu $v0, $v0, $s0 /* 18B438 8025CB58 4620008D */ trunc.w.d $f2, $f0 @@ -162,7 +162,7 @@ glabel func_8025C918 /* 18B448 8025CB68 46340001 */ sub.d $f0, $f0, $f20 /* 18B44C 8025CB6C 4620008D */ trunc.w.d $f2, $f0 /* 18B450 8025CB70 44031000 */ mfc1 $v1, $f2 -/* 18B454 8025CB74 00000000 */ nop +/* 18B454 8025CB74 00000000 */ nop /* 18B458 8025CB78 00731825 */ or $v1, $v1, $s3 /* 18B45C 8025CB7C A0430000 */ sb $v1, ($v0) .L8025CB80: @@ -234,7 +234,7 @@ glabel func_8025C918 /* 18B550 8025CC70 02D01021 */ addu $v0, $s6, $s0 /* 18B554 8025CC74 8FA800B4 */ lw $t0, 0xb4($sp) /* 18B558 8025CC78 15000004 */ bnez $t0, .L8025CC8C -/* 18B55C 8025CC7C 00000000 */ nop +/* 18B55C 8025CC7C 00000000 */ nop /* 18B560 8025CC80 9642075A */ lhu $v0, 0x75a($s2) /* 18B564 8025CC84 2442FFFF */ addiu $v0, $v0, -1 /* 18B568 8025CC88 A642075A */ sh $v0, 0x75a($s2) diff --git a/asm/nonmatchings/code_182B30/func_8025CCC8.s b/asm/nonmatchings/code_182B30/func_8025CCC8.s index 17f512c267..bba2b4e153 100644 --- a/asm/nonmatchings/code_182B30/func_8025CCC8.s +++ b/asm/nonmatchings/code_182B30/func_8025CCC8.s @@ -15,15 +15,15 @@ glabel func_8025CCC8 /* 18B5D0 8025CCF0 10620007 */ beq $v1, $v0, .L8025CD10 /* 18B5D4 8025CCF4 0000102D */ daddu $v0, $zero, $zero /* 18B5D8 8025CCF8 08097347 */ j .L8025CD1C -/* 18B5DC 8025CCFC 00000000 */ nop +/* 18B5DC 8025CCFC 00000000 */ nop .L8025CD00: /* 18B5E0 8025CD00 0C09734A */ jal func_8025CD28 -/* 18B5E4 8025CD04 00000000 */ nop +/* 18B5E4 8025CD04 00000000 */ nop /* 18B5E8 8025CD08 08097347 */ j .L8025CD1C /* 18B5EC 8025CD0C 0000102D */ daddu $v0, $zero, $zero .L8025CD10: /* 18B5F0 8025CD10 0C097350 */ jal func_8025CD40 -/* 18B5F4 8025CD14 00000000 */ nop +/* 18B5F4 8025CD14 00000000 */ nop /* 18B5F8 8025CD18 0000102D */ daddu $v0, $zero, $zero .L8025CD1C: /* 18B5FC 8025CD1C 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_182B30/func_8025CD40.s b/asm/nonmatchings/code_182B30/func_8025CD40.s index be361358dd..02079285c1 100644 --- a/asm/nonmatchings/code_182B30/func_8025CD40.s +++ b/asm/nonmatchings/code_182B30/func_8025CD40.s @@ -43,7 +43,7 @@ glabel func_8025CD40 /* 18B6A4 8025CDC4 82020766 */ lb $v0, 0x766($s0) /* 18B6A8 8025CDC8 24120003 */ addiu $s2, $zero, 3 /* 18B6AC 8025CDCC 14520004 */ bne $v0, $s2, .L8025CDE0 -/* 18B6B0 8025CDD0 00000000 */ nop +/* 18B6B0 8025CDD0 00000000 */ nop /* 18B6B4 8025CDD4 A2000768 */ sb $zero, 0x768($s0) /* 18B6B8 8025CDD8 0C099C27 */ jal func_8026709C /* 18B6BC 8025CDDC 0220202D */ daddu $a0, $s1, $zero @@ -55,14 +55,14 @@ glabel func_8025CD40 /* 18B6D0 8025CDF0 50400005 */ beql $v0, $zero, .L8025CE08 /* 18B6D4 8025CDF4 24020002 */ addiu $v0, $zero, 2 /* 18B6D8 8025CDF8 10600007 */ beqz $v1, .L8025CE18 -/* 18B6DC 8025CDFC 00000000 */ nop +/* 18B6DC 8025CDFC 00000000 */ nop /* 18B6E0 8025CE00 080973AB */ j .L8025CEAC -/* 18B6E4 8025CE04 00000000 */ nop +/* 18B6E4 8025CE04 00000000 */ nop .L8025CE08: /* 18B6E8 8025CE08 10620013 */ beq $v1, $v0, .L8025CE58 -/* 18B6EC 8025CE0C 00000000 */ nop +/* 18B6EC 8025CE0C 00000000 */ nop /* 18B6F0 8025CE10 080973AB */ j .L8025CEAC -/* 18B6F4 8025CE14 00000000 */ nop +/* 18B6F4 8025CE14 00000000 */ nop .L8025CE18: /* 18B6F8 8025CE18 82020767 */ lb $v0, 0x767($s0) /* 18B6FC 8025CE1C 5440001E */ bnel $v0, $zero, .L8025CE98 @@ -76,31 +76,34 @@ glabel func_8025CD40 /* 18B718 8025CE38 2C620009 */ sltiu $v0, $v1, 9 /* 18B71C 8025CE3C 10400016 */ beqz $v0, .L8025CE98 /* 18B720 8025CE40 00031080 */ sll $v0, $v1, 2 -/* 18B724 8025CE44 3C01802A */ lui $at, %hi(D_8029D420) +/* 18B724 8025CE44 3C01802A */ lui $at, %hi(jtbl_8029D420_1CBD00) /* 18B728 8025CE48 00220821 */ addu $at, $at, $v0 -/* 18B72C 8025CE4C 8C22D420 */ lw $v0, %lo(D_8029D420)($at) +/* 18B72C 8025CE4C 8C22D420 */ lw $v0, %lo(jtbl_8029D420_1CBD00)($at) /* 18B730 8025CE50 00400008 */ jr $v0 -/* 18B734 8025CE54 00000000 */ nop +/* 18B734 8025CE54 00000000 */ nop .L8025CE58: /* 18B738 8025CE58 82030767 */ lb $v1, 0x767($s0) /* 18B73C 8025CE5C 2C62000F */ sltiu $v0, $v1, 0xf /* 18B740 8025CE60 1040000D */ beqz $v0, .L8025CE98 /* 18B744 8025CE64 00031080 */ sll $v0, $v1, 2 -/* 18B748 8025CE68 3C01802A */ lui $at, %hi(D_8029D448) +/* 18B748 8025CE68 3C01802A */ lui $at, %hi(jtbl_8029D448_1CBD28) /* 18B74C 8025CE6C 00220821 */ addu $at, $at, $v0 -/* 18B750 8025CE70 8C22D448 */ lw $v0, %lo(D_8029D448)($at) +/* 18B750 8025CE70 8C22D448 */ lw $v0, %lo(jtbl_8029D448_1CBD28)($at) /* 18B754 8025CE74 00400008 */ jr $v0 -/* 18B758 8025CE78 00000000 */ nop +/* 18B758 8025CE78 00000000 */ nop +glabel L8025CE7C_18B75C /* 18B75C 8025CE7C 080973A6 */ j .L8025CE98 /* 18B760 8025CE80 A2000768 */ sb $zero, 0x768($s0) +glabel L8025CE84_18B764 /* 18B764 8025CE84 240200FF */ addiu $v0, $zero, 0xff /* 18B768 8025CE88 080973A6 */ j .L8025CE98 /* 18B76C 8025CE8C A2020768 */ sb $v0, 0x768($s0) +glabel L8025CE90_18B770 /* 18B770 8025CE90 24020003 */ addiu $v0, $zero, 3 /* 18B774 8025CE94 A2020766 */ sb $v0, 0x766($s0) .L8025CE98: /* 18B778 8025CE98 16600004 */ bnez $s3, .L8025CEAC -/* 18B77C 8025CE9C 00000000 */ nop +/* 18B77C 8025CE9C 00000000 */ nop /* 18B780 8025CEA0 92020767 */ lbu $v0, 0x767($s0) /* 18B784 8025CEA4 2442FFFF */ addiu $v0, $v0, -1 /* 18B788 8025CEA8 A2020767 */ sb $v0, 0x767($s0) diff --git a/asm/nonmatchings/code_182B30/func_8025CEC8.s b/asm/nonmatchings/code_182B30/func_8025CEC8.s index bf02c39811..a18cf19593 100644 --- a/asm/nonmatchings/code_182B30/func_8025CEC8.s +++ b/asm/nonmatchings/code_182B30/func_8025CEC8.s @@ -26,7 +26,7 @@ glabel func_8025CEC8 /* 18B7F8 8025CF18 00531021 */ addu $v0, $v0, $s3 /* 18B7FC 8025CF1C 8C420000 */ lw $v0, ($v0) /* 18B800 8025CF20 00400008 */ jr $v0 -/* 18B804 8025CF24 00000000 */ nop +/* 18B804 8025CF24 00000000 */ nop /* 18B808 8025CF28 0220202D */ daddu $a0, $s1, $zero /* 18B80C 8025CF2C 0C097454 */ jal func_8025D150 /* 18B810 8025CF30 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/code_182B30/func_8025D160.s b/asm/nonmatchings/code_182B30/func_8025D160.s index 443824e1cb..065880cb3c 100644 --- a/asm/nonmatchings/code_182B30/func_8025D160.s +++ b/asm/nonmatchings/code_182B30/func_8025D160.s @@ -17,7 +17,7 @@ glabel func_8025D160 /* 18BA70 8025D190 10620019 */ beq $v1, $v0, .L8025D1F8 /* 18BA74 8025D194 00111080 */ sll $v0, $s1, 2 /* 18BA78 8025D198 0809749E */ j .L8025D278 -/* 18BA7C 8025D19C 00000000 */ nop +/* 18BA7C 8025D19C 00000000 */ nop .L8025D1A0: /* 18BA80 8025D1A0 00111080 */ sll $v0, $s1, 2 /* 18BA84 8025D1A4 244208B0 */ addiu $v0, $v0, 0x8b0 @@ -48,7 +48,7 @@ glabel func_8025D160 /* 18BAE4 8025D204 848308CA */ lh $v1, 0x8ca($a0) /* 18BAE8 8025D208 C4E00058 */ lwc1 $f0, 0x58($a3) /* 18BAEC 8025D20C 44831000 */ mtc1 $v1, $f2 -/* 18BAF0 8025D210 00000000 */ nop +/* 18BAF0 8025D210 00000000 */ nop /* 18BAF4 8025D214 468010A0 */ cvt.s.w $f2, $f2 /* 18BAF8 8025D218 8C4308B0 */ lw $v1, 0x8b0($v0) /* 18BAFC 8025D21C 46020000 */ add.s $f0, $f0, $f2 @@ -62,14 +62,14 @@ glabel func_8025D160 /* 18BB1C 8025D23C 3C0142C8 */ lui $at, 0x42c8 /* 18BB20 8025D240 44810000 */ mtc1 $at, $f0 /* 18BB24 8025D244 44821000 */ mtc1 $v0, $f2 -/* 18BB28 8025D248 00000000 */ nop +/* 18BB28 8025D248 00000000 */ nop /* 18BB2C 8025D24C 468010A0 */ cvt.s.w $f2, $f2 /* 18BB30 8025D250 8C62000C */ lw $v0, 0xc($v1) /* 18BB34 8025D254 46001083 */ div.s $f2, $f2, $f0 /* 18BB38 8025D258 E442001C */ swc1 $f2, 0x1c($v0) /* 18BB3C 8025D25C 848208C8 */ lh $v0, 0x8c8($a0) /* 18BB40 8025D260 44821000 */ mtc1 $v0, $f2 -/* 18BB44 8025D264 00000000 */ nop +/* 18BB44 8025D264 00000000 */ nop /* 18BB48 8025D268 468010A0 */ cvt.s.w $f2, $f2 /* 18BB4C 8025D26C 8C62000C */ lw $v0, 0xc($v1) /* 18BB50 8025D270 46001083 */ div.s $f2, $f2, $f0 diff --git a/asm/nonmatchings/code_182B30/func_8025D2B0.s b/asm/nonmatchings/code_182B30/func_8025D2B0.s index 946df36bcb..685859d013 100644 --- a/asm/nonmatchings/code_182B30/func_8025D2B0.s +++ b/asm/nonmatchings/code_182B30/func_8025D2B0.s @@ -15,14 +15,14 @@ glabel func_8025D2B0 /* 18BBB8 8025D2D8 1062002D */ beq $v1, $v0, .L8025D390 /* 18BBBC 8025D2DC 00111040 */ sll $v0, $s1, 1 /* 18BBC0 8025D2E0 080974EC */ j .L8025D3B0 -/* 18BBC4 8025D2E4 00000000 */ nop +/* 18BBC4 8025D2E4 00000000 */ nop .L8025D2E8: /* 18BBC8 8025D2E8 C4820064 */ lwc1 $f2, 0x64($a0) /* 18BBCC 8025D2EC 3C0142B4 */ lui $at, 0x42b4 /* 18BBD0 8025D2F0 44810000 */ mtc1 $at, $f0 -/* 18BBD4 8025D2F4 00000000 */ nop +/* 18BBD4 8025D2F4 00000000 */ nop /* 18BBD8 8025D2F8 4602003C */ c.lt.s $f0, $f2 -/* 18BBDC 8025D2FC 00000000 */ nop +/* 18BBDC 8025D2FC 00000000 */ nop /* 18BBE0 8025D300 45000009 */ bc1f .L8025D328 /* 18BBE4 8025D304 24020014 */ addiu $v0, $zero, 0x14 /* 18BBE8 8025D308 90830073 */ lbu $v1, 0x73($a0) @@ -43,7 +43,7 @@ glabel func_8025D2B0 /* 18BC20 8025D340 AFA20018 */ sw $v0, 0x18($sp) .L8025D344: /* 18BC24 8025D344 44830000 */ mtc1 $v1, $f0 -/* 18BC28 8025D348 00000000 */ nop +/* 18BC28 8025D348 00000000 */ nop /* 18BC2C 8025D34C 46800020 */ cvt.s.w $f0, $f0 /* 18BC30 8025D350 46003180 */ add.s $f6, $f6, $f0 /* 18BC34 8025D354 E7A20010 */ swc1 $f2, 0x10($sp) diff --git a/asm/nonmatchings/code_182B30/func_8025D3CC.s b/asm/nonmatchings/code_182B30/func_8025D3CC.s index 753c7ef9c6..64f73440f6 100644 --- a/asm/nonmatchings/code_182B30/func_8025D3CC.s +++ b/asm/nonmatchings/code_182B30/func_8025D3CC.s @@ -13,7 +13,7 @@ glabel func_8025D3CC /* 18BCCC 8025D3EC 1062001A */ beq $v1, $v0, .L8025D458 /* 18BCD0 8025D3F0 00051080 */ sll $v0, $a1, 2 /* 18BCD4 8025D3F4 08097524 */ j .L8025D490 -/* 18BCD8 8025D3F8 00000000 */ nop +/* 18BCD8 8025D3F8 00000000 */ nop .L8025D3FC: /* 18BCDC 8025D3FC 90830073 */ lbu $v1, 0x73($a0) /* 18BCE0 8025D400 C482005C */ lwc1 $f2, 0x5c($a0) @@ -27,7 +27,7 @@ glabel func_8025D3CC /* 18BD00 8025D420 AFA20018 */ sw $v0, 0x18($sp) /* 18BD04 8025D424 E7A00010 */ swc1 $f0, 0x10($sp) /* 18BD08 8025D428 44830000 */ mtc1 $v1, $f0 -/* 18BD0C 8025D42C 00000000 */ nop +/* 18BD0C 8025D42C 00000000 */ nop /* 18BD10 8025D430 46800020 */ cvt.s.w $f0, $f0 /* 18BD14 8025D434 46001080 */ add.s $f2, $f2, $f0 /* 18BD18 8025D438 8C850058 */ lw $a1, 0x58($a0) @@ -47,7 +47,7 @@ glabel func_8025D3CC /* 18BD4C 8025D46C 90820073 */ lbu $v0, 0x73($a0) /* 18BD50 8025D470 C480005C */ lwc1 $f0, 0x5c($a0) /* 18BD54 8025D474 44821000 */ mtc1 $v0, $f2 -/* 18BD58 8025D478 00000000 */ nop +/* 18BD58 8025D478 00000000 */ nop /* 18BD5C 8025D47C 468010A0 */ cvt.s.w $f2, $f2 /* 18BD60 8025D480 46020000 */ add.s $f0, $f0, $f2 /* 18BD64 8025D484 E4600008 */ swc1 $f0, 8($v1) diff --git a/asm/nonmatchings/code_182B30/func_8025D4C8.s b/asm/nonmatchings/code_182B30/func_8025D4C8.s index c357cf21c4..6ff1d642f2 100644 --- a/asm/nonmatchings/code_182B30/func_8025D4C8.s +++ b/asm/nonmatchings/code_182B30/func_8025D4C8.s @@ -18,7 +18,7 @@ glabel func_8025D4C8 /* 18BDDC 8025D4FC 1062001E */ beq $v1, $v0, .L8025D578 /* 18BDE0 8025D500 00131080 */ sll $v0, $s3, 2 /* 18BDE4 8025D504 08097581 */ j .L8025D604 -/* 18BDE8 8025D508 00000000 */ nop +/* 18BDE8 8025D508 00000000 */ nop .L8025D50C: /* 18BDEC 8025D50C 00131080 */ sll $v0, $s3, 2 /* 18BDF0 8025D510 244208B0 */ addiu $v0, $v0, 0x8b0 @@ -60,7 +60,7 @@ glabel func_8025D4C8 /* 18BE7C 8025D59C 848208CC */ lh $v0, 0x8cc($a0) /* 18BE80 8025D5A0 C6200060 */ lwc1 $f0, 0x60($s1) /* 18BE84 8025D5A4 44821000 */ mtc1 $v0, $f2 -/* 18BE88 8025D5A8 00000000 */ nop +/* 18BE88 8025D5A8 00000000 */ nop /* 18BE8C 8025D5AC 468010A0 */ cvt.s.w $f2, $f2 /* 18BE90 8025D5B0 46020000 */ add.s $f0, $f0, $f2 /* 18BE94 8025D5B4 E460000C */ swc1 $f0, 0xc($v1) @@ -68,14 +68,14 @@ glabel func_8025D4C8 /* 18BE9C 8025D5BC 3C0142C8 */ lui $at, 0x42c8 /* 18BEA0 8025D5C0 44810000 */ mtc1 $at, $f0 /* 18BEA4 8025D5C4 44821000 */ mtc1 $v0, $f2 -/* 18BEA8 8025D5C8 00000000 */ nop +/* 18BEA8 8025D5C8 00000000 */ nop /* 18BEAC 8025D5CC 468010A0 */ cvt.s.w $f2, $f2 /* 18BEB0 8025D5D0 8CA2000C */ lw $v0, 0xc($a1) /* 18BEB4 8025D5D4 46001083 */ div.s $f2, $f2, $f0 /* 18BEB8 8025D5D8 E442001C */ swc1 $f2, 0x1c($v0) /* 18BEBC 8025D5DC 848208C8 */ lh $v0, 0x8c8($a0) /* 18BEC0 8025D5E0 44821000 */ mtc1 $v0, $f2 -/* 18BEC4 8025D5E4 00000000 */ nop +/* 18BEC4 8025D5E4 00000000 */ nop /* 18BEC8 8025D5E8 468010A0 */ cvt.s.w $f2, $f2 /* 18BECC 8025D5EC 8CA2000C */ lw $v0, 0xc($a1) /* 18BED0 8025D5F0 46001083 */ div.s $f2, $f2, $f0 diff --git a/asm/nonmatchings/code_182B30/func_8025D640.s b/asm/nonmatchings/code_182B30/func_8025D640.s index 2034771e11..f429c02233 100644 --- a/asm/nonmatchings/code_182B30/func_8025D640.s +++ b/asm/nonmatchings/code_182B30/func_8025D640.s @@ -16,7 +16,7 @@ glabel func_8025D640 /* 18BF4C 8025D66C 10620012 */ beq $v1, $v0, .L8025D6B8 /* 18BF50 8025D670 00111080 */ sll $v0, $s1, 2 /* 18BF54 8025D674 080975B9 */ j .L8025D6E4 -/* 18BF58 8025D678 00000000 */ nop +/* 18BF58 8025D678 00000000 */ nop .L8025D67C: /* 18BF5C 8025D67C 3C013F80 */ lui $at, 0x3f80 /* 18BF60 8025D680 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_182B30/func_8025D71C.s b/asm/nonmatchings/code_182B30/func_8025D71C.s index 854a514088..7aaa1a0a76 100644 --- a/asm/nonmatchings/code_182B30/func_8025D71C.s +++ b/asm/nonmatchings/code_182B30/func_8025D71C.s @@ -16,7 +16,7 @@ glabel func_8025D71C /* 18C028 8025D748 10620015 */ beq $v1, $v0, .L8025D7A0 /* 18C02C 8025D74C 00111080 */ sll $v0, $s1, 2 /* 18C030 8025D750 080975FE */ j .L8025D7F8 -/* 18C034 8025D754 00000000 */ nop +/* 18C034 8025D754 00000000 */ nop .L8025D758: /* 18C038 8025D758 3C013F80 */ lui $at, 0x3f80 /* 18C03C 8025D75C 44810000 */ mtc1 $at, $f0 @@ -54,7 +54,7 @@ glabel func_8025D71C /* 18C0B8 8025D7D8 3C0142C8 */ lui $at, 0x42c8 /* 18C0BC 8025D7DC 44811000 */ mtc1 $at, $f2 /* 18C0C0 8025D7E0 44820000 */ mtc1 $v0, $f0 -/* 18C0C4 8025D7E4 00000000 */ nop +/* 18C0C4 8025D7E4 00000000 */ nop /* 18C0C8 8025D7E8 46800020 */ cvt.s.w $f0, $f0 /* 18C0CC 8025D7EC 8C62000C */ lw $v0, 0xc($v1) /* 18C0D0 8025D7F0 46020003 */ div.s $f0, $f0, $f2 diff --git a/asm/nonmatchings/code_182B30/func_8025D830.s b/asm/nonmatchings/code_182B30/func_8025D830.s index aab25aa9fe..d47a8e1f38 100644 --- a/asm/nonmatchings/code_182B30/func_8025D830.s +++ b/asm/nonmatchings/code_182B30/func_8025D830.s @@ -16,7 +16,7 @@ glabel func_8025D830 /* 18C13C 8025D85C 10620012 */ beq $v1, $v0, .L8025D8A8 /* 18C140 8025D860 00111080 */ sll $v0, $s1, 2 /* 18C144 8025D864 08097635 */ j .L8025D8D4 -/* 18C148 8025D868 00000000 */ nop +/* 18C148 8025D868 00000000 */ nop .L8025D86C: /* 18C14C 8025D86C 3C013F80 */ lui $at, 0x3f80 /* 18C150 8025D870 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_182B30/func_8025D90C.s b/asm/nonmatchings/code_182B30/func_8025D90C.s index 302ca40eff..5cf7aa99cf 100644 --- a/asm/nonmatchings/code_182B30/func_8025D90C.s +++ b/asm/nonmatchings/code_182B30/func_8025D90C.s @@ -15,7 +15,7 @@ glabel func_8025D90C /* 18C214 8025D934 10620009 */ beq $v1, $v0, .L8025D95C /* 18C218 8025D938 00051040 */ sll $v0, $a1, 1 /* 18C21C 8025D93C 08097693 */ j .L8025DA4C -/* 18C220 8025D940 00000000 */ nop +/* 18C220 8025D940 00000000 */ nop .L8025D944: /* 18C224 8025D944 00051040 */ sll $v0, $a1, 1 /* 18C228 8025D948 00821021 */ addu $v0, $a0, $v0 @@ -32,7 +32,7 @@ glabel func_8025D90C /* 18C250 8025D970 00021403 */ sra $v0, $v0, 0x10 /* 18C254 8025D974 28420004 */ slti $v0, $v0, 4 /* 18C258 8025D978 14400034 */ bnez $v0, .L8025DA4C -/* 18C25C 8025D97C 00000000 */ nop +/* 18C25C 8025D97C 00000000 */ nop /* 18C260 8025D980 A46008BE */ sh $zero, 0x8be($v1) /* 18C264 8025D984 C60C0064 */ lwc1 $f12, 0x64($s0) /* 18C268 8025D988 0C00A6C9 */ jal clamp_angle @@ -40,12 +40,12 @@ glabel func_8025D90C /* 18C270 8025D990 3C0140C9 */ lui $at, 0x40c9 /* 18C274 8025D994 34210FD0 */ ori $at, $at, 0xfd0 /* 18C278 8025D998 44811000 */ mtc1 $at, $f2 -/* 18C27C 8025D99C 00000000 */ nop +/* 18C27C 8025D99C 00000000 */ nop /* 18C280 8025D9A0 46020502 */ mul.s $f20, $f0, $f2 -/* 18C284 8025D9A4 00000000 */ nop +/* 18C284 8025D9A4 00000000 */ nop /* 18C288 8025D9A8 3C0143B4 */ lui $at, 0x43b4 /* 18C28C 8025D9AC 44810000 */ mtc1 $at, $f0 -/* 18C290 8025D9B0 00000000 */ nop +/* 18C290 8025D9B0 00000000 */ nop /* 18C294 8025D9B4 4600A503 */ div.s $f20, $f20, $f0 /* 18C298 8025D9B8 0C00A85B */ jal sin_rad /* 18C29C 8025D9BC 4600A306 */ mov.s $f12, $f20 @@ -54,20 +54,20 @@ glabel func_8025D90C /* 18C2A8 8025D9C8 46000506 */ mov.s $f20, $f0 /* 18C2AC 8025D9CC 92020072 */ lbu $v0, 0x72($s0) /* 18C2B0 8025D9D0 44822000 */ mtc1 $v0, $f4 -/* 18C2B4 8025D9D4 00000000 */ nop +/* 18C2B4 8025D9D4 00000000 */ nop /* 18C2B8 8025D9D8 46802120 */ cvt.s.w $f4, $f4 /* 18C2BC 8025D9DC 46142182 */ mul.s $f6, $f4, $f20 -/* 18C2C0 8025D9E0 00000000 */ nop +/* 18C2C0 8025D9E0 00000000 */ nop /* 18C2C4 8025D9E4 46002102 */ mul.s $f4, $f4, $f0 -/* 18C2C8 8025D9E8 00000000 */ nop +/* 18C2C8 8025D9E8 00000000 */ nop /* 18C2CC 8025D9EC 3C013E4C */ lui $at, 0x3e4c /* 18C2D0 8025D9F0 3421CCCD */ ori $at, $at, 0xcccd /* 18C2D4 8025D9F4 44811000 */ mtc1 $at, $f2 -/* 18C2D8 8025D9F8 00000000 */ nop +/* 18C2D8 8025D9F8 00000000 */ nop /* 18C2DC 8025D9FC 46023182 */ mul.s $f6, $f6, $f2 -/* 18C2E0 8025DA00 00000000 */ nop +/* 18C2E0 8025DA00 00000000 */ nop /* 18C2E4 8025DA04 46022102 */ mul.s $f4, $f4, $f2 -/* 18C2E8 8025DA08 00000000 */ nop +/* 18C2E8 8025DA08 00000000 */ nop /* 18C2EC 8025DA0C C6020058 */ lwc1 $f2, 0x58($s0) /* 18C2F0 8025DA10 46061080 */ add.s $f2, $f2, $f6 /* 18C2F4 8025DA14 C6060060 */ lwc1 $f6, 0x60($s0) @@ -76,7 +76,7 @@ glabel func_8025D90C /* 18C300 8025DA20 44051000 */ mfc1 $a1, $f2 /* 18C304 8025DA24 3C013FC0 */ lui $at, 0x3fc0 /* 18C308 8025DA28 44811000 */ mtc1 $at, $f2 -/* 18C30C 8025DA2C 00000000 */ nop +/* 18C30C 8025DA2C 00000000 */ nop /* 18C310 8025DA30 46024200 */ add.s $f8, $f8, $f2 /* 18C314 8025DA34 44073000 */ mfc1 $a3, $f6 /* 18C318 8025DA38 44064000 */ mfc1 $a2, $f8 diff --git a/asm/nonmatchings/code_182B30/func_8025DA68.s b/asm/nonmatchings/code_182B30/func_8025DA68.s index cbc6bd4cbd..a3542a6dd1 100644 --- a/asm/nonmatchings/code_182B30/func_8025DA68.s +++ b/asm/nonmatchings/code_182B30/func_8025DA68.s @@ -24,9 +24,9 @@ glabel func_8025DA68 /* 18C394 8025DAB4 10600005 */ beqz $v1, .L8025DACC /* 18C398 8025DAB8 24020001 */ addiu $v0, $zero, 1 /* 18C39C 8025DABC 10620008 */ beq $v1, $v0, .L8025DAE0 -/* 18C3A0 8025DAC0 00000000 */ nop +/* 18C3A0 8025DAC0 00000000 */ nop /* 18C3A4 8025DAC4 080976EA */ j .L8025DBA8 -/* 18C3A8 8025DAC8 00000000 */ nop +/* 18C3A8 8025DAC8 00000000 */ nop .L8025DACC: /* 18C3AC 8025DACC 00111040 */ sll $v0, $s1, 1 /* 18C3B0 8025DAD0 02021021 */ addu $v0, $s0, $v0 @@ -39,7 +39,7 @@ glabel func_8025DA68 /* 18C3C8 8025DAE8 C4940058 */ lwc1 $f20, 0x58($a0) /* 18C3CC 8025DAEC 00021042 */ srl $v0, $v0, 1 /* 18C3D0 8025DAF0 44820000 */ mtc1 $v0, $f0 -/* 18C3D4 8025DAF4 00000000 */ nop +/* 18C3D4 8025DAF4 00000000 */ nop /* 18C3D8 8025DAF8 46800020 */ cvt.s.w $f0, $f0 /* 18C3DC 8025DAFC 46001600 */ add.s $f24, $f2, $f0 /* 18C3E0 8025DB00 3C028007 */ lui $v0, %hi(gGameStatusPtr) diff --git a/asm/nonmatchings/code_182B30/func_8025DBD0.s b/asm/nonmatchings/code_182B30/func_8025DBD0.s index c9981215ad..6a7e83ded1 100644 --- a/asm/nonmatchings/code_182B30/func_8025DBD0.s +++ b/asm/nonmatchings/code_182B30/func_8025DBD0.s @@ -18,7 +18,7 @@ glabel func_8025DBD0 /* 18C4E4 8025DC04 1062001B */ beq $v1, $v0, .L8025DC74 /* 18C4E8 8025DC08 00131080 */ sll $v0, $s3, 2 /* 18C4EC 8025DC0C 08097749 */ j .L8025DD24 -/* 18C4F0 8025DC10 00000000 */ nop +/* 18C4F0 8025DC10 00000000 */ nop .L8025DC14: /* 18C4F4 8025DC14 00131080 */ sll $v0, $s3, 2 /* 18C4F8 8025DC18 244208B0 */ addiu $v0, $v0, 0x8b0 @@ -57,7 +57,7 @@ glabel func_8025DBD0 /* 18C578 8025DC98 848208CC */ lh $v0, 0x8cc($a0) /* 18C57C 8025DC9C C6200060 */ lwc1 $f0, 0x60($s1) /* 18C580 8025DCA0 44821000 */ mtc1 $v0, $f2 -/* 18C584 8025DCA4 00000000 */ nop +/* 18C584 8025DCA4 00000000 */ nop /* 18C588 8025DCA8 468010A0 */ cvt.s.w $f2, $f2 /* 18C58C 8025DCAC 46020000 */ add.s $f0, $f0, $f2 /* 18C590 8025DCB0 E460000C */ swc1 $f0, 0xc($v1) @@ -65,7 +65,7 @@ glabel func_8025DBD0 /* 18C598 8025DCB8 3C0142C8 */ lui $at, 0x42c8 /* 18C59C 8025DCBC 44810000 */ mtc1 $at, $f0 /* 18C5A0 8025DCC0 44822000 */ mtc1 $v0, $f4 -/* 18C5A4 8025DCC4 00000000 */ nop +/* 18C5A4 8025DCC4 00000000 */ nop /* 18C5A8 8025DCC8 46802120 */ cvt.s.w $f4, $f4 /* 18C5AC 8025DCCC 8CA2000C */ lw $v0, 0xc($a1) /* 18C5B0 8025DCD0 46002103 */ div.s $f4, $f4, $f0 @@ -74,12 +74,12 @@ glabel func_8025DBD0 /* 18C5BC 8025DCDC 3C01802A */ lui $at, %hi(D_8029D4E8) /* 18C5C0 8025DCE0 D422D4E8 */ ldc1 $f2, %lo(D_8029D4E8)($at) /* 18C5C4 8025DCE4 44822000 */ mtc1 $v0, $f4 -/* 18C5C8 8025DCE8 00000000 */ nop +/* 18C5C8 8025DCE8 00000000 */ nop /* 18C5CC 8025DCEC 46802120 */ cvt.s.w $f4, $f4 /* 18C5D0 8025DCF0 46002103 */ div.s $f4, $f4, $f0 /* 18C5D4 8025DCF4 46002021 */ cvt.d.s $f0, $f4 /* 18C5D8 8025DCF8 46220002 */ mul.d $f0, $f0, $f2 -/* 18C5DC 8025DCFC 00000000 */ nop +/* 18C5DC 8025DCFC 00000000 */ nop /* 18C5E0 8025DD00 8CA2000C */ lw $v0, 0xc($a1) /* 18C5E4 8025DD04 46200020 */ cvt.s.d $f0, $f0 /* 18C5E8 8025DD08 E4400020 */ swc1 $f0, 0x20($v0) diff --git a/asm/nonmatchings/code_182B30/func_8025DD60.s b/asm/nonmatchings/code_182B30/func_8025DD60.s index 6bcf933622..6f53d10619 100644 --- a/asm/nonmatchings/code_182B30/func_8025DD60.s +++ b/asm/nonmatchings/code_182B30/func_8025DD60.s @@ -18,7 +18,7 @@ glabel func_8025DD60 /* 18C674 8025DD94 10620018 */ beq $v1, $v0, .L8025DDF8 /* 18C678 8025DD98 00121080 */ sll $v0, $s2, 2 /* 18C67C 8025DD9C 0809779B */ j .L8025DE6C -/* 18C680 8025DDA0 00000000 */ nop +/* 18C680 8025DDA0 00000000 */ nop .L8025DDA4: /* 18C684 8025DDA4 3C013F99 */ lui $at, 0x3f99 /* 18C688 8025DDA8 3421999A */ ori $at, $at, 0x999a @@ -52,13 +52,13 @@ glabel func_8025DD60 /* 18C6F4 8025DE14 3C014224 */ lui $at, 0x4224 /* 18C6F8 8025DE18 44812000 */ mtc1 $at, $f4 /* 18C6FC 8025DE1C 44831000 */ mtc1 $v1, $f2 -/* 18C700 8025DE20 00000000 */ nop +/* 18C700 8025DE20 00000000 */ nop /* 18C704 8025DE24 468010A0 */ cvt.s.w $f2, $f2 /* 18C708 8025DE28 8C43000C */ lw $v1, 0xc($v0) /* 18C70C 8025DE2C 46001083 */ div.s $f2, $f2, $f0 /* 18C710 8025DE30 E4620044 */ swc1 $f2, 0x44($v1) /* 18C714 8025DE34 46041082 */ mul.s $f2, $f2, $f4 -/* 18C718 8025DE38 00000000 */ nop +/* 18C718 8025DE38 00000000 */ nop /* 18C71C 8025DE3C C6200058 */ lwc1 $f0, 0x58($s1) /* 18C720 8025DE40 E4600004 */ swc1 $f0, 4($v1) /* 18C724 8025DE44 C620005C */ lwc1 $f0, 0x5c($s1) @@ -67,7 +67,7 @@ glabel func_8025DD60 /* 18C730 8025DE50 848208C8 */ lh $v0, 0x8c8($a0) /* 18C734 8025DE54 C6200060 */ lwc1 $f0, 0x60($s1) /* 18C738 8025DE58 44821000 */ mtc1 $v0, $f2 -/* 18C73C 8025DE5C 00000000 */ nop +/* 18C73C 8025DE5C 00000000 */ nop /* 18C740 8025DE60 468010A0 */ cvt.s.w $f2, $f2 /* 18C744 8025DE64 46020000 */ add.s $f0, $f0, $f2 /* 18C748 8025DE68 E460000C */ swc1 $f0, 0xc($v1) diff --git a/asm/nonmatchings/code_182B30/func_8025DE88.s b/asm/nonmatchings/code_182B30/func_8025DE88.s index adaf853caf..2c767184e6 100644 --- a/asm/nonmatchings/code_182B30/func_8025DE88.s +++ b/asm/nonmatchings/code_182B30/func_8025DE88.s @@ -10,5 +10,5 @@ glabel func_8025DE88 /* 18C77C 8025DE9C 34420010 */ ori $v0, $v0, 0x10 /* 18C780 8025DEA0 03E00008 */ jr $ra /* 18C784 8025DEA4 AC620000 */ sw $v0, ($v1) -/* 18C788 8025DEA8 00000000 */ nop -/* 18C78C 8025DEAC 00000000 */ nop +/* 18C788 8025DEA8 00000000 */ nop +/* 18C78C 8025DEAC 00000000 */ nop diff --git a/asm/nonmatchings/code_182B30/reset_actor_blur.s b/asm/nonmatchings/code_182B30/reset_actor_blur.s index a17017b766..998a89f6e7 100644 --- a/asm/nonmatchings/code_182B30/reset_actor_blur.s +++ b/asm/nonmatchings/code_182B30/reset_actor_blur.s @@ -5,11 +5,11 @@ glabel reset_actor_blur /* 182E8C 802545AC 8C8301F4 */ lw $v1, 0x1f4($a0) /* 182E90 802545B0 8C620094 */ lw $v0, 0x94($v1) /* 182E94 802545B4 10400014 */ beqz $v0, .L80254608 -/* 182E98 802545B8 00000000 */ nop +/* 182E98 802545B8 00000000 */ nop /* 182E9C 802545BC 8C620000 */ lw $v0, ($v1) /* 182EA0 802545C0 30420002 */ andi $v0, $v0, 2 /* 182EA4 802545C4 14400010 */ bnez $v0, .L80254608 -/* 182EA8 802545C8 00000000 */ nop +/* 182EA8 802545C8 00000000 */ nop /* 182EAC 802545CC 8C6500C0 */ lw $a1, 0xc0($v1) /* 182EB0 802545D0 80A207DB */ lb $v0, 0x7db($a1) /* 182EB4 802545D4 90A307DB */ lbu $v1, 0x7db($a1) @@ -27,4 +27,4 @@ glabel reset_actor_blur /* 182EE4 80254604 A0A208AC */ sb $v0, 0x8ac($a1) .L80254608: /* 182EE8 80254608 03E00008 */ jr $ra -/* 182EEC 8025460C 00000000 */ nop +/* 182EEC 8025460C 00000000 */ nop diff --git a/asm/nonmatchings/code_182B30/reset_partner_blur.s b/asm/nonmatchings/code_182B30/reset_partner_blur.s index 713bd9397e..a80d2d2fdd 100644 --- a/asm/nonmatchings/code_182B30/reset_partner_blur.s +++ b/asm/nonmatchings/code_182B30/reset_partner_blur.s @@ -7,7 +7,7 @@ glabel reset_partner_blur /* 182F74 80254694 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 182F78 80254698 AFBF0010 */ sw $ra, 0x10($sp) /* 182F7C 8025469C 0C09516B */ jal reset_actor_blur -/* 182F80 802546A0 00000000 */ nop +/* 182F80 802546A0 00000000 */ nop /* 182F84 802546A4 8FBF0010 */ lw $ra, 0x10($sp) /* 182F88 802546A8 03E00008 */ jr $ra /* 182F8C 802546AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_182B30/update_actor_shadow.s b/asm/nonmatchings/code_182B30/update_actor_shadow.s index cef2fc6628..933fe3d576 100644 --- a/asm/nonmatchings/code_182B30/update_actor_shadow.s +++ b/asm/nonmatchings/code_182B30/update_actor_shadow.s @@ -19,7 +19,7 @@ glabel update_actor_shadow /* 1842D4 802559F4 0080802D */ daddu $s0, $a0, $zero /* 1842D8 802559F8 8E44042C */ lw $a0, 0x42c($s2) /* 1842DC 802559FC 0C044181 */ jal get_shadow_by_index -/* 1842E0 80255A00 00000000 */ nop +/* 1842E0 80255A00 00000000 */ nop /* 1842E4 80255A04 0040882D */ daddu $s1, $v0, $zero /* 1842E8 80255A08 8E220000 */ lw $v0, ($s1) /* 1842EC 80255A0C 34420001 */ ori $v0, $v0, 1 @@ -30,13 +30,13 @@ glabel update_actor_shadow /* 184300 80255A20 3C021000 */ lui $v0, 0x1000 /* 184304 80255A24 00621024 */ and $v0, $v1, $v0 /* 184308 80255A28 10400009 */ beqz $v0, .L80255A50 -/* 18430C 80255A2C 00000000 */ nop +/* 18430C 80255A2C 00000000 */ nop /* 184310 80255A30 16000005 */ bnez $s0, .L80255A48 -/* 184314 80255A34 00000000 */ nop +/* 184314 80255A34 00000000 */ nop /* 184318 80255A38 0C09564F */ jal func_8025593C /* 18431C 80255A3C 0240202D */ daddu $a0, $s2, $zero /* 184320 80255A40 08095694 */ j .L80255A50 -/* 184324 80255A44 00000000 */ nop +/* 184324 80255A44 00000000 */ nop .L80255A48: /* 184328 80255A48 0C09565F */ jal func_8025597C /* 18432C 80255A4C 0240202D */ daddu $a0, $s2, $zero @@ -45,7 +45,7 @@ glabel update_actor_shadow /* 184334 80255A54 C6420144 */ lwc1 $f2, 0x144($s2) /* 184338 80255A58 8E430000 */ lw $v1, ($s2) /* 18433C 80255A5C 44820000 */ mtc1 $v0, $f0 -/* 184340 80255A60 00000000 */ nop +/* 184340 80255A60 00000000 */ nop /* 184344 80255A64 46800020 */ cvt.s.w $f0, $f0 /* 184348 80255A68 2402000D */ addiu $v0, $zero, 0xd /* 18434C 80255A6C 46001080 */ add.s $f2, $f2, $f0 @@ -56,7 +56,7 @@ glabel update_actor_shadow /* 184360 80255A80 86420152 */ lh $v0, 0x152($s2) /* 184364 80255A84 C6400148 */ lwc1 $f0, 0x148($s2) /* 184368 80255A88 44821000 */ mtc1 $v0, $f2 -/* 18436C 80255A8C 00000000 */ nop +/* 18436C 80255A8C 00000000 */ nop /* 184370 80255A90 468010A0 */ cvt.s.w $f2, $f2 /* 184374 80255A94 080956AD */ j .L80255AB4 /* 184378 80255A98 46020000 */ add.s $f0, $f0, $f2 @@ -64,7 +64,7 @@ glabel update_actor_shadow /* 18437C 80255A9C 86420152 */ lh $v0, 0x152($s2) /* 184380 80255AA0 C6400148 */ lwc1 $f0, 0x148($s2) /* 184384 80255AA4 44821000 */ mtc1 $v0, $f2 -/* 184388 80255AA8 00000000 */ nop +/* 184388 80255AA8 00000000 */ nop /* 18438C 80255AAC 468010A0 */ cvt.s.w $f2, $f2 /* 184390 80255AB0 46020001 */ sub.s $f0, $f0, $f2 .L80255AB4: @@ -72,7 +72,7 @@ glabel update_actor_shadow /* 184398 80255AB8 86420154 */ lh $v0, 0x154($s2) /* 18439C 80255ABC C642014C */ lwc1 $f2, 0x14c($s2) /* 1843A0 80255AC0 44820000 */ mtc1 $v0, $f0 -/* 1843A4 80255AC4 00000000 */ nop +/* 1843A4 80255AC4 00000000 */ nop /* 1843A8 80255AC8 46800020 */ cvt.s.w $f0, $f0 /* 1843AC 80255ACC 46001080 */ add.s $f2, $f2, $f0 /* 1843B0 80255AD0 E7A20020 */ swc1 $f2, 0x20($sp) @@ -87,13 +87,13 @@ glabel update_actor_shadow /* 1843D0 80255AF0 8E020000 */ lw $v0, ($s0) /* 1843D4 80255AF4 30420001 */ andi $v0, $v0, 1 /* 1843D8 80255AF8 144000A4 */ bnez $v0, .L80255D8C -/* 1843DC 80255AFC 00000000 */ nop +/* 1843DC 80255AFC 00000000 */ nop /* 1843E0 80255B00 8E020094 */ lw $v0, 0x94($s0) /* 1843E4 80255B04 104000A1 */ beqz $v0, .L80255D8C -/* 1843E8 80255B08 00000000 */ nop +/* 1843E8 80255B08 00000000 */ nop /* 1843EC 80255B0C 8E040084 */ lw $a0, 0x84($s0) /* 1843F0 80255B10 04800007 */ bltz $a0, .L80255B30 -/* 1843F4 80255B14 00000000 */ nop +/* 1843F4 80255B14 00000000 */ nop /* 1843F8 80255B18 8E050088 */ lw $a1, 0x88($s0) /* 1843FC 80255B1C 0C0B78AB */ jal func_802DE2AC /* 184400 80255B20 8E060090 */ lw $a2, 0x90($s0) @@ -105,16 +105,16 @@ glabel update_actor_shadow /* 184414 80255B34 3C030010 */ lui $v1, 0x10 /* 184418 80255B38 00431024 */ and $v0, $v0, $v1 /* 18441C 80255B3C 14400031 */ bnez $v0, .L80255C04 -/* 184420 80255B40 00000000 */ nop +/* 184420 80255B40 00000000 */ nop /* 184424 80255B44 86020014 */ lh $v0, 0x14($s0) /* 184428 80255B48 C7A00018 */ lwc1 $f0, 0x18($sp) /* 18442C 80255B4C 44821000 */ mtc1 $v0, $f2 -/* 184430 80255B50 00000000 */ nop +/* 184430 80255B50 00000000 */ nop /* 184434 80255B54 468010A0 */ cvt.s.w $f2, $f2 /* 184438 80255B58 8602001A */ lh $v0, 0x1a($s0) /* 18443C 80255B5C 46020000 */ add.s $f0, $f0, $f2 /* 184440 80255B60 44821000 */ mtc1 $v0, $f2 -/* 184444 80255B64 00000000 */ nop +/* 184444 80255B64 00000000 */ nop /* 184448 80255B68 468010A0 */ cvt.s.w $f2, $f2 /* 18444C 80255B6C 8E420000 */ lw $v0, ($s2) /* 184450 80255B70 30420800 */ andi $v0, $v0, 0x800 @@ -123,12 +123,12 @@ glabel update_actor_shadow /* 18445C 80255B7C 86020016 */ lh $v0, 0x16($s0) /* 184460 80255B80 C7A2001C */ lwc1 $f2, 0x1c($sp) /* 184464 80255B84 44820000 */ mtc1 $v0, $f0 -/* 184468 80255B88 00000000 */ nop +/* 184468 80255B88 00000000 */ nop /* 18446C 80255B8C 46800020 */ cvt.s.w $f0, $f0 /* 184470 80255B90 8602001C */ lh $v0, 0x1c($s0) /* 184474 80255B94 46001080 */ add.s $f2, $f2, $f0 /* 184478 80255B98 44820000 */ mtc1 $v0, $f0 -/* 18447C 80255B9C 00000000 */ nop +/* 18447C 80255B9C 00000000 */ nop /* 184480 80255BA0 46800020 */ cvt.s.w $f0, $f0 /* 184484 80255BA4 080956F6 */ j .L80255BD8 /* 184488 80255BA8 46001100 */ add.s $f4, $f2, $f0 @@ -136,12 +136,12 @@ glabel update_actor_shadow /* 18448C 80255BAC 86020016 */ lh $v0, 0x16($s0) /* 184490 80255BB0 C7A2001C */ lwc1 $f2, 0x1c($sp) /* 184494 80255BB4 44820000 */ mtc1 $v0, $f0 -/* 184498 80255BB8 00000000 */ nop +/* 184498 80255BB8 00000000 */ nop /* 18449C 80255BBC 46800020 */ cvt.s.w $f0, $f0 /* 1844A0 80255BC0 8602001C */ lh $v0, 0x1c($s0) /* 1844A4 80255BC4 46001081 */ sub.s $f2, $f2, $f0 /* 1844A8 80255BC8 44820000 */ mtc1 $v0, $f0 -/* 1844AC 80255BCC 00000000 */ nop +/* 1844AC 80255BCC 00000000 */ nop /* 1844B0 80255BD0 46800020 */ cvt.s.w $f0, $f0 /* 1844B4 80255BD4 46001101 */ sub.s $f4, $f2, $f0 .L80255BD8: @@ -150,7 +150,7 @@ glabel update_actor_shadow /* 1844C0 80255BE0 C7A20020 */ lwc1 $f2, 0x20($sp) /* 1844C4 80255BE4 46000506 */ mov.s $f20, $f0 /* 1844C8 80255BE8 44820000 */ mtc1 $v0, $f0 -/* 1844CC 80255BEC 00000000 */ nop +/* 1844CC 80255BEC 00000000 */ nop /* 1844D0 80255BF0 46800020 */ cvt.s.w $f0, $f0 /* 1844D4 80255BF4 8602001E */ lh $v0, 0x1e($s0) /* 1844D8 80255BF8 46001080 */ add.s $f2, $f2, $f0 @@ -161,20 +161,20 @@ glabel update_actor_shadow /* 1844E8 80255C08 8602001A */ lh $v0, 0x1a($s0) /* 1844EC 80255C0C C602002C */ lwc1 $f2, 0x2c($s0) /* 1844F0 80255C10 44820000 */ mtc1 $v0, $f0 -/* 1844F4 80255C14 00000000 */ nop +/* 1844F4 80255C14 00000000 */ nop /* 1844F8 80255C18 46800020 */ cvt.s.w $f0, $f0 /* 1844FC 80255C1C 46001180 */ add.s $f6, $f2, $f0 /* 184500 80255C20 8602001C */ lh $v0, 0x1c($s0) /* 184504 80255C24 C6020030 */ lwc1 $f2, 0x30($s0) /* 184508 80255C28 44820000 */ mtc1 $v0, $f0 -/* 18450C 80255C2C 00000000 */ nop +/* 18450C 80255C2C 00000000 */ nop /* 184510 80255C30 46800020 */ cvt.s.w $f0, $f0 /* 184514 80255C34 46001100 */ add.s $f4, $f2, $f0 /* 184518 80255C38 8602001E */ lh $v0, 0x1e($s0) /* 18451C 80255C3C C6020034 */ lwc1 $f2, 0x34($s0) .L80255C40: /* 184520 80255C40 44820000 */ mtc1 $v0, $f0 -/* 184524 80255C44 00000000 */ nop +/* 184524 80255C44 00000000 */ nop /* 184528 80255C48 46800020 */ cvt.s.w $f0, $f0 /* 18452C 80255C4C 46001080 */ add.s $f2, $f2, $f0 /* 184530 80255C50 8E020000 */ lw $v0, ($s0) @@ -185,7 +185,7 @@ glabel update_actor_shadow /* 184544 80255C64 E6020060 */ swc1 $f2, 0x60($s0) /* 184548 80255C68 8E04009C */ lw $a0, 0x9c($s0) /* 18454C 80255C6C 0C044181 */ jal get_shadow_by_index -/* 184550 80255C70 00000000 */ nop +/* 184550 80255C70 00000000 */ nop /* 184554 80255C74 0040882D */ daddu $s1, $v0, $zero /* 184558 80255C78 8E220000 */ lw $v0, ($s1) /* 18455C 80255C7C 2403FFFE */ addiu $v1, $zero, -2 @@ -223,11 +223,11 @@ glabel update_actor_shadow /* 1845D4 80255CF4 C7A20024 */ lwc1 $f2, 0x24($sp) /* 1845D8 80255CF8 3C014348 */ lui $at, 0x4348 /* 1845DC 80255CFC 44810000 */ mtc1 $at, $f0 -/* 1845E0 80255D00 00000000 */ nop +/* 1845E0 80255D00 00000000 */ nop /* 1845E4 80255D04 4602003C */ c.lt.s $f0, $f2 -/* 1845E8 80255D08 00000000 */ nop +/* 1845E8 80255D08 00000000 */ nop /* 1845EC 80255D0C 45000004 */ bc1f .L80255D20 -/* 1845F0 80255D10 00000000 */ nop +/* 1845F0 80255D10 00000000 */ nop /* 1845F4 80255D14 8E220000 */ lw $v0, ($s1) /* 1845F8 80255D18 34420001 */ ori $v0, $v0, 1 /* 1845FC 80255D1C AE220000 */ sw $v0, ($s1) @@ -248,7 +248,7 @@ glabel update_actor_shadow /* 184634 80255D54 C620001C */ lwc1 $f0, 0x1c($s1) /* 184638 80255D58 C60200A0 */ lwc1 $f2, 0xa0($s0) /* 18463C 80255D5C 46020002 */ mul.s $f0, $f0, $f2 -/* 184640 80255D60 00000000 */ nop +/* 184640 80255D60 00000000 */ nop /* 184644 80255D64 E620001C */ swc1 $f0, 0x1c($s1) .L80255D68: /* 184648 80255D68 86020098 */ lh $v0, 0x98($s0) @@ -266,7 +266,7 @@ glabel update_actor_shadow /* 184670 80255D90 26730001 */ addiu $s3, $s3, 1 /* 184674 80255D94 0274102A */ slt $v0, $s3, $s4 /* 184678 80255D98 1440FF55 */ bnez $v0, .L80255AF0 -/* 18467C 80255D9C 00000000 */ nop +/* 18467C 80255D9C 00000000 */ nop .L80255DA0: /* 184680 80255DA0 0C044181 */ jal get_shadow_by_index /* 184684 80255DA4 8E44042C */ lw $a0, 0x42c($s2) @@ -282,7 +282,7 @@ glabel update_actor_shadow /* 1846A8 80255DC8 86420150 */ lh $v0, 0x150($s2) /* 1846AC 80255DCC C6400144 */ lwc1 $f0, 0x144($s2) /* 1846B0 80255DD0 44821000 */ mtc1 $v0, $f2 -/* 1846B4 80255DD4 00000000 */ nop +/* 1846B4 80255DD4 00000000 */ nop /* 1846B8 80255DD8 468010A0 */ cvt.s.w $f2, $f2 /* 1846BC 80255DDC 46020000 */ add.s $f0, $f0, $f2 /* 1846C0 80255DE0 8E420000 */ lw $v0, ($s2) @@ -292,7 +292,7 @@ glabel update_actor_shadow /* 1846D0 80255DF0 86420152 */ lh $v0, 0x152($s2) /* 1846D4 80255DF4 C6400148 */ lwc1 $f0, 0x148($s2) /* 1846D8 80255DF8 44821000 */ mtc1 $v0, $f2 -/* 1846DC 80255DFC 00000000 */ nop +/* 1846DC 80255DFC 00000000 */ nop /* 1846E0 80255E00 468010A0 */ cvt.s.w $f2, $f2 /* 1846E4 80255E04 08095789 */ j .L80255E24 /* 1846E8 80255E08 46020000 */ add.s $f0, $f0, $f2 @@ -300,7 +300,7 @@ glabel update_actor_shadow /* 1846EC 80255E0C 86420152 */ lh $v0, 0x152($s2) /* 1846F0 80255E10 C6400148 */ lwc1 $f0, 0x148($s2) /* 1846F4 80255E14 44821000 */ mtc1 $v0, $f2 -/* 1846F8 80255E18 00000000 */ nop +/* 1846F8 80255E18 00000000 */ nop /* 1846FC 80255E1C 468010A0 */ cvt.s.w $f2, $f2 /* 184700 80255E20 46020001 */ sub.s $f0, $f0, $f2 .L80255E24: @@ -318,7 +318,7 @@ glabel update_actor_shadow /* 184730 80255E50 86420154 */ lh $v0, 0x154($s2) /* 184734 80255E54 C642014C */ lwc1 $f2, 0x14c($s2) /* 184738 80255E58 44820000 */ mtc1 $v0, $f0 -/* 18473C 80255E5C 00000000 */ nop +/* 18473C 80255E5C 00000000 */ nop /* 184740 80255E60 46800020 */ cvt.s.w $f0, $f0 /* 184744 80255E64 46001080 */ add.s $f2, $f2, $f0 /* 184748 80255E68 3C0146FF */ lui $at, 0x46ff @@ -332,11 +332,11 @@ glabel update_actor_shadow /* 184768 80255E88 C7A20024 */ lwc1 $f2, 0x24($sp) /* 18476C 80255E8C 3C014348 */ lui $at, 0x4348 /* 184770 80255E90 44810000 */ mtc1 $at, $f0 -/* 184774 80255E94 00000000 */ nop +/* 184774 80255E94 00000000 */ nop /* 184778 80255E98 4602003C */ c.lt.s $f0, $f2 -/* 18477C 80255E9C 00000000 */ nop +/* 18477C 80255E9C 00000000 */ nop /* 184780 80255EA0 45000004 */ bc1f .L80255EB4 -/* 184784 80255EA4 00000000 */ nop +/* 184784 80255EA4 00000000 */ nop /* 184788 80255EA8 8E220000 */ lw $v0, ($s1) /* 18478C 80255EAC 34420001 */ ori $v0, $v0, 1 /* 184790 80255EB0 AE220000 */ sw $v0, ($s1) @@ -352,7 +352,7 @@ glabel update_actor_shadow /* 1847B4 80255ED4 80222EEB */ lb $v0, %lo(D_80282EEB)($at) /* 1847B8 80255ED8 C7A00020 */ lwc1 $f0, 0x20($sp) /* 1847BC 80255EDC 44821000 */ mtc1 $v0, $f2 -/* 1847C0 80255EE0 00000000 */ nop +/* 1847C0 80255EE0 00000000 */ nop /* 1847C4 80255EE4 468010A0 */ cvt.s.w $f2, $f2 /* 1847C8 80255EE8 46020000 */ add.s $f0, $f0, $f2 /* 1847CC 80255EEC E6200018 */ swc1 $f0, 0x18($s1) @@ -367,10 +367,10 @@ glabel update_actor_shadow /* 1847F0 80255F10 C6420430 */ lwc1 $f2, 0x430($s2) /* 1847F4 80255F14 C6400188 */ lwc1 $f0, 0x188($s2) /* 1847F8 80255F18 46001082 */ mul.s $f2, $f2, $f0 -/* 1847FC 80255F1C 00000000 */ nop +/* 1847FC 80255F1C 00000000 */ nop /* 184800 80255F20 C620001C */ lwc1 $f0, 0x1c($s1) /* 184804 80255F24 46020002 */ mul.s $f0, $f0, $f2 -/* 184808 80255F28 00000000 */ nop +/* 184808 80255F28 00000000 */ nop /* 18480C 80255F2C E620001C */ swc1 $f0, 0x1c($s1) .L80255F30: /* 184810 80255F30 8FBF0040 */ lw $ra, 0x40($sp) diff --git a/asm/nonmatchings/code_182B30/update_enemy_shadows.s b/asm/nonmatchings/code_182B30/update_enemy_shadows.s index 43d78f171c..bcedfc1dc1 100644 --- a/asm/nonmatchings/code_182B30/update_enemy_shadows.s +++ b/asm/nonmatchings/code_182B30/update_enemy_shadows.s @@ -17,7 +17,7 @@ glabel update_enemy_shadows /* 184868 80255F88 0000202D */ daddu $a0, $zero, $zero /* 18486C 80255F8C 2A220018 */ slti $v0, $s1, 0x18 /* 184870 80255F90 1440FFF9 */ bnez $v0, .L80255F78 -/* 184874 80255F94 00000000 */ nop +/* 184874 80255F94 00000000 */ nop /* 184878 80255F98 8FBF0018 */ lw $ra, 0x18($sp) /* 18487C 80255F9C 8FB10014 */ lw $s1, 0x14($sp) /* 184880 80255FA0 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_182B30/update_hero_shadows.s b/asm/nonmatchings/code_182B30/update_hero_shadows.s index f917fcb9ea..91b2bed1a5 100644 --- a/asm/nonmatchings/code_182B30/update_hero_shadows.s +++ b/asm/nonmatchings/code_182B30/update_hero_shadows.s @@ -9,7 +9,7 @@ glabel update_hero_shadows /* 18489C 80255FBC 0C09566F */ jal update_actor_shadow /* 1848A0 80255FC0 24040001 */ addiu $a0, $zero, 1 /* 1848A4 80255FC4 0C095EEB */ jal update_player_actor_shadow -/* 1848A8 80255FC8 00000000 */ nop +/* 1848A8 80255FC8 00000000 */ nop /* 1848AC 80255FCC 8FBF0010 */ lw $ra, 0x10($sp) /* 1848B0 80255FD0 03E00008 */ jr $ra /* 1848B4 80255FD4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_182B30/update_player_actor_shadow.s b/asm/nonmatchings/code_182B30/update_player_actor_shadow.s index c8084c240a..3d0eab7cc5 100644 --- a/asm/nonmatchings/code_182B30/update_player_actor_shadow.s +++ b/asm/nonmatchings/code_182B30/update_player_actor_shadow.s @@ -22,13 +22,13 @@ glabel update_player_actor_shadow /* 1864D0 80257BF0 3C031000 */ lui $v1, 0x1000 /* 1864D4 80257BF4 00431024 */ and $v0, $v0, $v1 /* 1864D8 80257BF8 10400003 */ beqz $v0, .L80257C08 -/* 1864DC 80257BFC 00000000 */ nop +/* 1864DC 80257BFC 00000000 */ nop /* 1864E0 80257C00 0C09527D */ jal func_802549F4 /* 1864E4 80257C04 0200202D */ daddu $a0, $s0, $zero .L80257C08: /* 1864E8 80257C08 8E04042C */ lw $a0, 0x42c($s0) /* 1864EC 80257C0C 0C044181 */ jal get_shadow_by_index -/* 1864F0 80257C10 00000000 */ nop +/* 1864F0 80257C10 00000000 */ nop /* 1864F4 80257C14 0040882D */ daddu $s1, $v0, $zero /* 1864F8 80257C18 8E220000 */ lw $v0, ($s1) /* 1864FC 80257C1C 2403FFFE */ addiu $v1, $zero, -2 @@ -52,18 +52,18 @@ glabel update_player_actor_shadow /* 186540 80257C60 C6060144 */ lwc1 $f6, 0x144($s0) /* 186544 80257C64 C604014C */ lwc1 $f4, 0x14c($s0) /* 186548 80257C68 44820000 */ mtc1 $v0, $f0 -/* 18654C 80257C6C 00000000 */ nop +/* 18654C 80257C6C 00000000 */ nop /* 186550 80257C70 46800020 */ cvt.s.w $f0, $f0 /* 186554 80257C74 46003180 */ add.s $f6, $f6, $f0 /* 186558 80257C78 86020152 */ lh $v0, 0x152($s0) /* 18655C 80257C7C C6000148 */ lwc1 $f0, 0x148($s0) /* 186560 80257C80 44821000 */ mtc1 $v0, $f2 -/* 186564 80257C84 00000000 */ nop +/* 186564 80257C84 00000000 */ nop /* 186568 80257C88 468010A0 */ cvt.s.w $f2, $f2 /* 18656C 80257C8C 86020154 */ lh $v0, 0x154($s0) /* 186570 80257C90 46020000 */ add.s $f0, $f0, $f2 /* 186574 80257C94 44821000 */ mtc1 $v0, $f2 -/* 186578 80257C98 00000000 */ nop +/* 186578 80257C98 00000000 */ nop /* 18657C 80257C9C 468010A0 */ cvt.s.w $f2, $f2 /* 186580 80257CA0 27A20024 */ addiu $v0, $sp, 0x24 /* 186584 80257CA4 46022100 */ add.s $f4, $f4, $f2 @@ -81,11 +81,11 @@ glabel update_player_actor_shadow /* 1865B4 80257CD4 C7A20024 */ lwc1 $f2, 0x24($sp) /* 1865B8 80257CD8 3C014348 */ lui $at, 0x4348 /* 1865BC 80257CDC 44810000 */ mtc1 $at, $f0 -/* 1865C0 80257CE0 00000000 */ nop +/* 1865C0 80257CE0 00000000 */ nop /* 1865C4 80257CE4 4602003C */ c.lt.s $f0, $f2 -/* 1865C8 80257CE8 00000000 */ nop +/* 1865C8 80257CE8 00000000 */ nop /* 1865CC 80257CEC 45000004 */ bc1f .L80257D00 -/* 1865D0 80257CF0 00000000 */ nop +/* 1865D0 80257CF0 00000000 */ nop /* 1865D4 80257CF4 8E220000 */ lw $v0, ($s1) /* 1865D8 80257CF8 34420001 */ ori $v0, $v0, 1 /* 1865DC 80257CFC AE220000 */ sw $v0, ($s1) @@ -109,10 +109,10 @@ glabel update_player_actor_shadow /* 186620 80257D40 C6020430 */ lwc1 $f2, 0x430($s0) /* 186624 80257D44 C6000188 */ lwc1 $f0, 0x188($s0) /* 186628 80257D48 46001082 */ mul.s $f2, $f2, $f0 -/* 18662C 80257D4C 00000000 */ nop +/* 18662C 80257D4C 00000000 */ nop /* 186630 80257D50 C620001C */ lwc1 $f0, 0x1c($s1) /* 186634 80257D54 46020002 */ mul.s $f0, $f0, $f2 -/* 186638 80257D58 00000000 */ nop +/* 186638 80257D58 00000000 */ nop /* 18663C 80257D5C E620001C */ swc1 $f0, 0x1c($s1) /* 186640 80257D60 86420098 */ lh $v0, 0x98($s2) /* 186644 80257D64 284200FF */ slti $v0, $v0, 0xff diff --git a/asm/nonmatchings/code_18C790/func_8025DEC4.s b/asm/nonmatchings/code_18C790/func_8025DEC4.s index 96390e415a..246d56731f 100644 --- a/asm/nonmatchings/code_18C790/func_8025DEC4.s +++ b/asm/nonmatchings/code_18C790/func_8025DEC4.s @@ -77,7 +77,7 @@ glabel func_8025DEC4 /* 18C8BC 8025DFDC 5C400004 */ bgtzl $v0, .L8025DFF0 /* 18C8C0 8025DFE0 00021080 */ sll $v0, $v0, 2 /* 18C8C4 8025DFE4 10A00007 */ beqz $a1, .L8025E004 -/* 18C8C8 8025DFE8 00000000 */ nop +/* 18C8C8 8025DFE8 00000000 */ nop /* 18C8CC 8025DFEC 00021080 */ sll $v0, $v0, 2 .L8025DFF0: /* 18C8D0 8025DFF0 3C018028 */ lui $at, %hi(D_80284188) diff --git a/asm/nonmatchings/code_18C790/func_8025E190.s b/asm/nonmatchings/code_18C790/func_8025E190.s index c889dae6e7..2624d0c677 100644 --- a/asm/nonmatchings/code_18C790/func_8025E190.s +++ b/asm/nonmatchings/code_18C790/func_8025E190.s @@ -24,11 +24,12 @@ glabel func_8025E190 /* 18CABC 8025E1DC 2C620017 */ sltiu $v0, $v1, 0x17 /* 18CAC0 8025E1E0 10400759 */ beqz $v0, .L8025FF48 /* 18CAC4 8025E1E4 00031080 */ sll $v0, $v1, 2 -/* 18CAC8 8025E1E8 3C01802A */ lui $at, %hi(D_8029D4F0) +/* 18CAC8 8025E1E8 3C01802A */ lui $at, %hi(jtbl_8029D4F0_1CBDD0) /* 18CACC 8025E1EC 00220821 */ addu $at, $at, $v0 -/* 18CAD0 8025E1F0 8C22D4F0 */ lw $v0, %lo(D_8029D4F0)($at) +/* 18CAD0 8025E1F0 8C22D4F0 */ lw $v0, %lo(jtbl_8029D4F0_1CBDD0)($at) /* 18CAD4 8025E1F4 00400008 */ jr $v0 -/* 18CAD8 8025E1F8 00000000 */ nop +/* 18CAD8 8025E1F8 00000000 */ nop +glabel L8025E1FC_18CADC /* 18CADC 8025E1FC 83C20079 */ lb $v0, 0x79($fp) /* 18CAE0 8025E200 1C400751 */ bgtz $v0, .L8025FF48 /* 18CAE4 8025E204 3C03F7FF */ lui $v1, 0xf7ff @@ -91,6 +92,7 @@ glabel func_8025E190 /* 18CBC0 8025E2E0 00641825 */ or $v1, $v1, $a0 /* 18CBC4 8025E2E4 08097FD2 */ j .L8025FF48 /* 18CBC8 8025E2E8 AC430004 */ sw $v1, 4($v0) +glabel L8025E2EC_18CBCC /* 18CBCC 8025E2EC 3C10802A */ lui $s0, %hi(D_8029FB4C) /* 18CBD0 8025E2F0 2610FB4C */ addiu $s0, $s0, %lo(D_8029FB4C) /* 18CBD4 8025E2F4 8E020000 */ lw $v0, ($s0) @@ -100,9 +102,9 @@ glabel func_8025E190 /* 18CBE4 8025E304 AE020000 */ sw $v0, ($s0) .L8025E308: /* 18CBE8 8025E308 0C093961 */ jal func_8024E584 -/* 18CBEC 8025E30C 00000000 */ nop +/* 18CBEC 8025E30C 00000000 */ nop /* 18CBF0 8025E310 1040070D */ beqz $v0, .L8025FF48 -/* 18CBF4 8025E314 00000000 */ nop +/* 18CBF4 8025E314 00000000 */ nop /* 18CBF8 8025E318 3C04007B */ lui $a0, 0x7b /* 18CBFC 8025E31C 248489A0 */ addiu $a0, $a0, -0x7660 /* 18CC00 8025E320 3C05007B */ lui $a1, 0x7b @@ -110,7 +112,7 @@ glabel func_8025E190 /* 18CC08 8025E328 3C06802A */ lui $a2, %hi(D_802A1000) /* 18CC0C 8025E32C 24C61000 */ addiu $a2, $a2, %lo(D_802A1000) /* 18CC10 8025E330 0C00A5CF */ jal dma_copy -/* 18CC14 8025E334 00000000 */ nop +/* 18CC14 8025E334 00000000 */ nop /* 18CC18 8025E338 3C048028 */ lui $a0, %hi(D_802842B0) /* 18CC1C 8025E33C 248442B0 */ addiu $a0, $a0, %lo(D_802842B0) /* 18CC20 8025E340 2405000A */ addiu $a1, $zero, 0xa @@ -127,7 +129,7 @@ glabel func_8025E190 /* 18CC48 8025E368 14610004 */ bne $v1, $at, .L8025E37C /* 18CC4C 8025E36C 3C018000 */ lui $at, 0x8000 /* 18CC50 8025E370 14810002 */ bne $a0, $at, .L8025E37C -/* 18CC54 8025E374 00000000 */ nop +/* 18CC54 8025E374 00000000 */ nop /* 18CC58 8025E378 0006000D */ break 6 .L8025E37C: /* 18CC5C 8025E37C 00002012 */ mflo $a0 @@ -148,7 +150,8 @@ glabel func_8025E190 /* 18CC98 8025E3B8 3C01802A */ lui $at, %hi(D_8029FB70) /* 18CC9C 8025E3BC AC24FB70 */ sw $a0, %lo(D_8029FB70)($at) /* 18CCA0 8025E3C0 08097FD2 */ j .L8025FF48 -/* 18CCA4 8025E3C4 00000000 */ nop +/* 18CCA4 8025E3C4 00000000 */ nop +glabel L8025E3C8_18CCA8 /* 18CCA8 8025E3C8 3C03802A */ lui $v1, %hi(D_8029FB4C) /* 18CCAC 8025E3CC 2463FB4C */ addiu $v1, $v1, %lo(D_8029FB4C) /* 18CCB0 8025E3D0 8C620000 */ lw $v0, ($v1) @@ -176,7 +179,7 @@ glabel func_8025E190 /* 18CD08 8025E428 00021603 */ sra $v0, $v0, 0x18 /* 18CD0C 8025E42C 00A28023 */ subu $s0, $a1, $v0 /* 18CD10 8025E430 1A000003 */ blez $s0, .L8025E440 -/* 18CD14 8025E434 00000000 */ nop +/* 18CD14 8025E434 00000000 */ nop /* 18CD18 8025E438 0C05272D */ jal play_sound /* 18CD1C 8025E43C 24040215 */ addiu $a0, $zero, 0x215 .L8025E440: @@ -193,7 +196,7 @@ glabel func_8025E190 /* 18CD48 8025E468 AC620000 */ sw $v0, ($v1) /* 18CD4C 8025E46C 83C20078 */ lb $v0, 0x78($fp) /* 18CD50 8025E470 10400004 */ beqz $v0, .L8025E484 -/* 18CD54 8025E474 00000000 */ nop +/* 18CD54 8025E474 00000000 */ nop /* 18CD58 8025E478 92A20010 */ lbu $v0, 0x10($s5) /* 18CD5C 8025E47C 24420001 */ addiu $v0, $v0, 1 /* 18CD60 8025E480 A2A20010 */ sb $v0, 0x10($s5) @@ -223,7 +226,7 @@ glabel func_8025E190 .L8025E4D4: /* 18CDB4 8025E4D4 83C20078 */ lb $v0, 0x78($fp) /* 18CDB8 8025E4D8 1440069B */ bnez $v0, .L8025FF48 -/* 18CDBC 8025E4DC 00000000 */ nop +/* 18CDBC 8025E4DC 00000000 */ nop /* 18CDC0 8025E4E0 3C03802A */ lui $v1, %hi(D_8029FB54) /* 18CDC4 8025E4E4 2463FB54 */ addiu $v1, $v1, %lo(D_8029FB54) /* 18CDC8 8025E4E8 8C620000 */ lw $v0, ($v1) @@ -271,6 +274,7 @@ glabel func_8025E190 /* 18CE68 8025E588 AC22FB4C */ sw $v0, %lo(D_8029FB4C)($at) /* 18CE6C 8025E58C 08097FD0 */ j .L8025FF40 /* 18CE70 8025E590 24020003 */ addiu $v0, $zero, 3 +glabel L8025E594_18CE74 /* 18CE74 8025E594 3C03802A */ lui $v1, %hi(D_8029FB4C) /* 18CE78 8025E598 2463FB4C */ addiu $v1, $v1, %lo(D_8029FB4C) /* 18CE7C 8025E59C 8C620000 */ lw $v0, ($v1) @@ -282,12 +286,13 @@ glabel func_8025E190 /* 18CE94 8025E5B4 24020004 */ addiu $v0, $zero, 4 /* 18CE98 8025E5B8 08097FD0 */ j .L8025FF40 /* 18CE9C 8025E5BC 24020014 */ addiu $v0, $zero, 0x14 +glabel L8025E5C0_18CEA0 /* 18CEA0 8025E5C0 3C10802A */ lui $s0, %hi(D_8029FB84) /* 18CEA4 8025E5C4 2610FB84 */ addiu $s0, $s0, %lo(D_8029FB84) /* 18CEA8 8025E5C8 8E020000 */ lw $v0, ($s0) /* 18CEAC 8025E5CC 28420063 */ slti $v0, $v0, 0x63 /* 18CEB0 8025E5D0 1440065D */ bnez $v0, .L8025FF48 -/* 18CEB4 8025E5D4 00000000 */ nop +/* 18CEB4 8025E5D4 00000000 */ nop /* 18CEB8 8025E5D8 92A20009 */ lbu $v0, 9($s5) /* 18CEBC 8025E5DC 24040002 */ addiu $a0, $zero, 2 /* 18CEC0 8025E5E0 24420001 */ addiu $v0, $v0, 1 @@ -302,13 +307,14 @@ glabel func_8025E190 /* 18CEE4 8025E604 3C06802A */ lui $a2, %hi(D_802A1000) /* 18CEE8 8025E608 24C61000 */ addiu $a2, $a2, %lo(D_802A1000) /* 18CEEC 8025E60C 0C00A5CF */ jal dma_copy -/* 18CEF0 8025E610 00000000 */ nop +/* 18CEF0 8025E610 00000000 */ nop /* 18CEF4 8025E614 3C048000 */ lui $a0, 0x8000 /* 18CEF8 8025E618 0C05272D */ jal play_sound /* 18CEFC 8025E61C 34840008 */ ori $a0, $a0, 8 /* 18CF00 8025E620 24020005 */ addiu $v0, $zero, 5 /* 18CF04 8025E624 08097FD0 */ j .L8025FF40 /* 18CF08 8025E628 AE000000 */ sw $zero, ($s0) +glabel L8025E62C_18CF0C /* 18CF0C 8025E62C 3C048028 */ lui $a0, %hi(D_80284880) /* 18CF10 8025E630 24844880 */ addiu $a0, $a0, %lo(D_80284880) /* 18CF14 8025E634 2405000A */ addiu $a1, $zero, 0xa @@ -337,7 +343,8 @@ glabel func_8025E190 /* 18CF70 8025E690 0C046F97 */ jal set_background_color_blend /* 18CF74 8025E694 A0620000 */ sb $v0, ($v1) /* 18CF78 8025E698 08097FD2 */ j .L8025FF48 -/* 18CF7C 8025E69C 00000000 */ nop +/* 18CF7C 8025E69C 00000000 */ nop +glabel L8025E6A0_18CF80 /* 18CF80 8025E6A0 3C10802A */ lui $s0, %hi(D_8029FB4C) /* 18CF84 8025E6A4 2610FB4C */ addiu $s0, $s0, %lo(D_8029FB4C) /* 18CF88 8025E6A8 8E030000 */ lw $v1, ($s0) @@ -354,9 +361,9 @@ glabel func_8025E190 /* 18CFB4 8025E6D4 82A80002 */ lb $t0, 2($s5) /* 18CFB8 8025E6D8 4600018D */ trunc.w.s $f6, $f0 /* 18CFBC 8025E6DC 44073000 */ mfc1 $a3, $f6 -/* 18CFC0 8025E6E0 00000000 */ nop +/* 18CFC0 8025E6E0 00000000 */ nop /* 18CFC4 8025E6E4 44873000 */ mtc1 $a3, $f6 -/* 18CFC8 8025E6E8 00000000 */ nop +/* 18CFC8 8025E6E8 00000000 */ nop /* 18CFCC 8025E6EC 468031A0 */ cvt.s.w $f6, $f6 /* 18CFD0 8025E6F0 46022100 */ add.s $f4, $f4, $f2 /* 18CFD4 8025E6F4 C6200148 */ lwc1 $f0, 0x148($s1) @@ -366,16 +373,16 @@ glabel func_8025E190 /* 18CFE4 8025E704 46020000 */ add.s $f0, $f0, $f2 /* 18CFE8 8025E708 4600218D */ trunc.w.s $f6, $f4 /* 18CFEC 8025E70C 44033000 */ mfc1 $v1, $f6 -/* 18CFF0 8025E710 00000000 */ nop +/* 18CFF0 8025E710 00000000 */ nop /* 18CFF4 8025E714 44833000 */ mtc1 $v1, $f6 -/* 18CFF8 8025E718 00000000 */ nop +/* 18CFF8 8025E718 00000000 */ nop /* 18CFFC 8025E71C 468031A0 */ cvt.s.w $f6, $f6 /* 18D000 8025E720 44053000 */ mfc1 $a1, $f6 /* 18D004 8025E724 4600018D */ trunc.w.s $f6, $f0 /* 18D008 8025E728 44023000 */ mfc1 $v0, $f6 -/* 18D00C 8025E72C 00000000 */ nop +/* 18D00C 8025E72C 00000000 */ nop /* 18D010 8025E730 44823000 */ mtc1 $v0, $f6 -/* 18D014 8025E734 00000000 */ nop +/* 18D014 8025E734 00000000 */ nop /* 18D018 8025E738 468031A0 */ cvt.s.w $f6, $f6 /* 18D01C 8025E73C 44063000 */ mfc1 $a2, $f6 /* 18D020 8025E740 AFA30028 */ sw $v1, 0x28($sp) @@ -389,9 +396,9 @@ glabel func_8025E190 /* 18D040 8025E760 82A80005 */ lb $t0, 5($s5) /* 18D044 8025E764 4600018D */ trunc.w.s $f6, $f0 /* 18D048 8025E768 44073000 */ mfc1 $a3, $f6 -/* 18D04C 8025E76C 00000000 */ nop +/* 18D04C 8025E76C 00000000 */ nop /* 18D050 8025E770 44873000 */ mtc1 $a3, $f6 -/* 18D054 8025E774 00000000 */ nop +/* 18D054 8025E774 00000000 */ nop /* 18D058 8025E778 468031A0 */ cvt.s.w $f6, $f6 /* 18D05C 8025E77C 46022100 */ add.s $f4, $f4, $f2 /* 18D060 8025E780 C6200148 */ lwc1 $f0, 0x148($s1) @@ -401,16 +408,16 @@ glabel func_8025E190 /* 18D070 8025E790 46020000 */ add.s $f0, $f0, $f2 /* 18D074 8025E794 4600218D */ trunc.w.s $f6, $f4 /* 18D078 8025E798 44033000 */ mfc1 $v1, $f6 -/* 18D07C 8025E79C 00000000 */ nop +/* 18D07C 8025E79C 00000000 */ nop /* 18D080 8025E7A0 44833000 */ mtc1 $v1, $f6 -/* 18D084 8025E7A4 00000000 */ nop +/* 18D084 8025E7A4 00000000 */ nop /* 18D088 8025E7A8 468031A0 */ cvt.s.w $f6, $f6 /* 18D08C 8025E7AC 44053000 */ mfc1 $a1, $f6 /* 18D090 8025E7B0 4600018D */ trunc.w.s $f6, $f0 /* 18D094 8025E7B4 44023000 */ mfc1 $v0, $f6 -/* 18D098 8025E7B8 00000000 */ nop +/* 18D098 8025E7B8 00000000 */ nop /* 18D09C 8025E7BC 44823000 */ mtc1 $v0, $f6 -/* 18D0A0 8025E7C0 00000000 */ nop +/* 18D0A0 8025E7C0 00000000 */ nop /* 18D0A4 8025E7C4 468031A0 */ cvt.s.w $f6, $f6 /* 18D0A8 8025E7C8 44063000 */ mfc1 $a2, $f6 /* 18D0AC 8025E7CC 24040001 */ addiu $a0, $zero, 1 @@ -437,7 +444,7 @@ glabel func_8025E190 /* 18D0FC 8025E81C 0C046F97 */ jal set_background_color_blend /* 18D100 8025E820 30E700F0 */ andi $a3, $a3, 0xf0 /* 18D104 8025E824 08097FD2 */ j .L8025FF48 -/* 18D108 8025E828 00000000 */ nop +/* 18D108 8025E828 00000000 */ nop .L8025E82C: /* 18D10C 8025E82C 3C04802B */ lui $a0, %hi(D_802A9F0C) /* 18D110 8025E830 24849F0C */ addiu $a0, $a0, %lo(D_802A9F0C) @@ -457,7 +464,7 @@ glabel func_8025E190 /* 18D148 8025E868 3C04802B */ lui $a0, %hi(D_802A9F5C) /* 18D14C 8025E86C 24849F5C */ addiu $a0, $a0, %lo(D_802A9F5C) /* 18D150 8025E870 0C050529 */ jal create_icon -/* 18D154 8025E874 00000000 */ nop +/* 18D154 8025E874 00000000 */ nop /* 18D158 8025E878 0040A02D */ daddu $s4, $v0, $zero /* 18D15C 8025E87C 0280202D */ daddu $a0, $s4, $zero /* 18D160 8025E880 2405009E */ addiu $a1, $zero, 0x9e @@ -470,7 +477,7 @@ glabel func_8025E190 /* 18D17C 8025E89C 3C04802B */ lui $a0, %hi(D_802A9F84) /* 18D180 8025E8A0 24849F84 */ addiu $a0, $a0, %lo(D_802A9F84) /* 18D184 8025E8A4 0C050529 */ jal create_icon -/* 18D188 8025E8A8 00000000 */ nop +/* 18D188 8025E8A8 00000000 */ nop /* 18D18C 8025E8AC 0040A02D */ daddu $s4, $v0, $zero /* 18D190 8025E8B0 0280202D */ daddu $a0, $s4, $zero /* 18D194 8025E8B4 2405009E */ addiu $a1, $zero, 0x9e @@ -483,7 +490,7 @@ glabel func_8025E190 /* 18D1B0 8025E8D0 3C04802B */ lui $a0, %hi(D_802A9FAC) /* 18D1B4 8025E8D4 24849FAC */ addiu $a0, $a0, %lo(D_802A9FAC) /* 18D1B8 8025E8D8 0C050529 */ jal create_icon -/* 18D1BC 8025E8DC 00000000 */ nop +/* 18D1BC 8025E8DC 00000000 */ nop /* 18D1C0 8025E8E0 0040A02D */ daddu $s4, $v0, $zero /* 18D1C4 8025E8E4 0280202D */ daddu $a0, $s4, $zero /* 18D1C8 8025E8E8 24050006 */ addiu $a1, $zero, 6 @@ -742,7 +749,7 @@ glabel func_8025E190 /* 18D5A8 8025ECC8 0C051261 */ jal set_icon_render_pos /* 18D5AC 8025ECCC 24C6002E */ addiu $a2, $a2, 0x2e /* 18D5B0 8025ECD0 08097B78 */ j .L8025EDE0 -/* 18D5B4 8025ECD4 00000000 */ nop +/* 18D5B4 8025ECD4 00000000 */ nop .L8025ECD8: /* 18D5B8 8025ECD8 3C036666 */ lui $v1, 0x6666 /* 18D5BC 8025ECDC 34636667 */ ori $v1, $v1, 0x6667 @@ -815,7 +822,7 @@ glabel func_8025E190 /* 18D6C0 8025EDE0 0C03A752 */ jal is_ability_active /* 18D6C4 8025EDE4 2404000C */ addiu $a0, $zero, 0xc /* 18D6C8 8025EDE8 1040001B */ beqz $v0, .L8025EE58 -/* 18D6CC 8025EDEC 00000000 */ nop +/* 18D6CC 8025EDEC 00000000 */ nop /* 18D6D0 8025EDF0 3C028009 */ lui $v0, %hi(gItemTable+0x1F04) /* 18D6D4 8025EDF4 844297E4 */ lh $v0, %lo(gItemTable+0x1F04)($v0) /* 18D6D8 8025EDF8 3C14802A */ lui $s4, %hi(D_8029FAA8) @@ -987,7 +994,7 @@ glabel func_8025E190 /* 18D964 8025F084 0C051261 */ jal set_icon_render_pos /* 18D968 8025F088 24C6002E */ addiu $a2, $a2, 0x2e /* 18D96C 8025F08C 08097C68 */ j .L8025F1A0 -/* 18D970 8025F090 00000000 */ nop +/* 18D970 8025F090 00000000 */ nop .L8025F094: /* 18D974 8025F094 3C036666 */ lui $v1, 0x6666 /* 18D978 8025F098 34636667 */ ori $v1, $v1, 0x6667 @@ -1061,7 +1068,7 @@ glabel func_8025E190 /* 18DA80 8025F1A0 0C03A752 */ jal is_ability_active /* 18DA84 8025F1A4 24040004 */ addiu $a0, $zero, 4 /* 18DA88 8025F1A8 1040001B */ beqz $v0, .L8025F218 -/* 18DA8C 8025F1AC 00000000 */ nop +/* 18DA8C 8025F1AC 00000000 */ nop /* 18DA90 8025F1B0 3C028009 */ lui $v0, %hi(gItemTable+0x1CE4) /* 18DA94 8025F1B4 844295C4 */ lh $v0, %lo(gItemTable+0x1CE4)($v0) /* 18DA98 8025F1B8 3C14802A */ lui $s4, %hi(D_8029FAC4) @@ -1232,7 +1239,7 @@ glabel func_8025E190 /* 18DD20 8025F440 0C051261 */ jal set_icon_render_pos /* 18DD24 8025F444 24C6002E */ addiu $a2, $a2, 0x2e /* 18DD28 8025F448 08097D3F */ j .L8025F4FC -/* 18DD2C 8025F44C 00000000 */ nop +/* 18DD2C 8025F44C 00000000 */ nop .L8025F450: /* 18DD30 8025F450 3C13802A */ lui $s3, %hi(D_8029FA90) /* 18DD34 8025F454 2673FA90 */ addiu $s3, $s3, %lo(D_8029FA90) @@ -1281,7 +1288,7 @@ glabel func_8025E190 /* 18DDDC 8025F4FC 3C048029 */ lui $a0, %hi(D_80292C28) /* 18DDE0 8025F500 24842C28 */ addiu $a0, $a0, %lo(D_80292C28) /* 18DDE4 8025F504 0C050529 */ jal create_icon -/* 18DDE8 8025F508 00000000 */ nop +/* 18DDE8 8025F508 00000000 */ nop /* 18DDEC 8025F50C 0040A02D */ daddu $s4, $v0, $zero /* 18DDF0 8025F510 3C01802A */ lui $at, %hi(D_8029FAE8) /* 18DDF4 8025F514 AC34FAE8 */ sw $s4, %lo(D_8029FAE8)($at) @@ -1322,7 +1329,7 @@ glabel func_8025E190 /* 18DE80 8025F5A0 3C04802B */ lui $a0, %hi(D_802AAA30) /* 18DE84 8025F5A4 2484AA30 */ addiu $a0, $a0, %lo(D_802AAA30) /* 18DE88 8025F5A8 0C050529 */ jal create_icon -/* 18DE8C 8025F5AC 00000000 */ nop +/* 18DE8C 8025F5AC 00000000 */ nop /* 18DE90 8025F5B0 0040A02D */ daddu $s4, $v0, $zero /* 18DE94 8025F5B4 0280202D */ daddu $a0, $s4, $zero /* 18DE98 8025F5B8 0000282D */ daddu $a1, $zero, $zero @@ -1340,6 +1347,7 @@ glabel func_8025E190 /* 18DEC8 8025F5E8 AC22FB4C */ sw $v0, %lo(D_8029FB4C)($at) /* 18DECC 8025F5EC 08097FD0 */ j .L8025FF40 /* 18DED0 8025F5F0 24020007 */ addiu $v0, $zero, 7 +glabel L8025F5F4_18DED4 /* 18DED4 8025F5F4 27A50028 */ addiu $a1, $sp, 0x28 /* 18DED8 8025F5F8 27A6002C */ addiu $a2, $sp, 0x2c /* 18DEDC 8025F5FC 0000982D */ daddu $s3, $zero, $zero @@ -1483,17 +1491,18 @@ glabel func_8025E190 /* 18E0F8 8025F818 24050001 */ addiu $a1, $zero, 1 /* 18E0FC 8025F81C 08097FD0 */ j .L8025FF40 /* 18E100 8025F820 24020008 */ addiu $v0, $zero, 8 +glabel L8025F824_18E104 /* 18E104 8025F824 8FC20214 */ lw $v0, 0x214($fp) /* 18E108 8025F828 30428000 */ andi $v0, $v0, 0x8000 /* 18E10C 8025F82C 10400012 */ beqz $v0, .L8025F878 -/* 18E110 8025F830 00000000 */ nop +/* 18E110 8025F830 00000000 */ nop /* 18E114 8025F834 83C20048 */ lb $v0, 0x48($fp) /* 18E118 8025F838 00021080 */ sll $v0, $v0, 2 /* 18E11C 8025F83C 3C01802A */ lui $at, %hi(D_8029FB60) /* 18E120 8025F840 00220821 */ addu $at, $at, $v0 /* 18E124 8025F844 8C22FB60 */ lw $v0, %lo(D_8029FB60)($at) /* 18E128 8025F848 14400007 */ bnez $v0, .L8025F868 -/* 18E12C 8025F84C 00000000 */ nop +/* 18E12C 8025F84C 00000000 */ nop /* 18E130 8025F850 0C05272D */ jal play_sound /* 18E134 8025F854 240400C9 */ addiu $a0, $zero, 0xc9 /* 18E138 8025F858 0C05272D */ jal play_sound @@ -1529,7 +1538,7 @@ glabel func_8025E190 .L8025F8BC: /* 18E19C 8025F8BC 00041603 */ sra $v0, $a0, 0x18 /* 18E1A0 8025F8C0 12020004 */ beq $s0, $v0, .L8025F8D4 -/* 18E1A4 8025F8C4 00000000 */ nop +/* 18E1A4 8025F8C4 00000000 */ nop /* 18E1A8 8025F8C8 0C05272D */ jal play_sound /* 18E1AC 8025F8CC 240400C7 */ addiu $a0, $zero, 0xc7 /* 18E1B0 8025F8D0 A3D00048 */ sb $s0, 0x48($fp) @@ -1554,10 +1563,11 @@ glabel func_8025E190 /* 18E1F8 8025F918 E7A00010 */ swc1 $f0, 0x10($sp) /* 18E1FC 8025F91C 08097FD2 */ j .L8025FF48 /* 18E200 8025F920 AE000000 */ sw $zero, ($s0) +glabel L8025F924_18E204 /* 18E204 8025F924 3C04802A */ lui $a0, %hi(D_8029FAE8) /* 18E208 8025F928 8C84FAE8 */ lw $a0, %lo(D_8029FAE8)($a0) /* 18E20C 8025F92C 0C05123D */ jal free_icon -/* 18E210 8025F930 00000000 */ nop +/* 18E210 8025F930 00000000 */ nop /* 18E214 8025F934 24040008 */ addiu $a0, $zero, 8 /* 18E218 8025F938 0C051F9F */ jal func_80147E7C /* 18E21C 8025F93C 24050002 */ addiu $a1, $zero, 2 @@ -1676,6 +1686,7 @@ glabel func_8025E190 /* 18E3B0 8025FAD0 AC204150 */ sw $zero, %lo(D_80284150)($at) /* 18E3B4 8025FAD4 08097FD0 */ j .L8025FF40 /* 18E3B8 8025FAD8 2402000A */ addiu $v0, $zero, 0xa +glabel L8025FADC_18E3BC /* 18E3BC 8025FADC 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 18E3C0 8025FAE0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 18E3C4 8025FAE4 94420134 */ lhu $v0, 0x134($v0) @@ -1688,19 +1699,19 @@ glabel func_8025E190 /* 18E3E0 8025FB00 10400005 */ beqz $v0, .L8025FB18 /* 18E3E4 8025FB04 24020002 */ addiu $v0, $zero, 2 /* 18E3E8 8025FB08 10600007 */ beqz $v1, .L8025FB28 -/* 18E3EC 8025FB0C 00000000 */ nop +/* 18E3EC 8025FB0C 00000000 */ nop /* 18E3F0 8025FB10 08097EF9 */ j .L8025FBE4 -/* 18E3F4 8025FB14 00000000 */ nop +/* 18E3F4 8025FB14 00000000 */ nop .L8025FB18: /* 18E3F8 8025FB18 1062000F */ beq $v1, $v0, .L8025FB58 -/* 18E3FC 8025FB1C 00000000 */ nop +/* 18E3FC 8025FB1C 00000000 */ nop /* 18E400 8025FB20 08097EF9 */ j .L8025FBE4 -/* 18E404 8025FB24 00000000 */ nop +/* 18E404 8025FB24 00000000 */ nop .L8025FB28: /* 18E408 8025FB28 3C04802A */ lui $a0, %hi(D_8029FA80) /* 18E40C 8025FB2C 8C84FA80 */ lw $a0, %lo(D_8029FA80)($a0) /* 18E410 8025FB30 08097ED8 */ j .L8025FB60 -/* 18E414 8025FB34 00000000 */ nop +/* 18E414 8025FB34 00000000 */ nop .L8025FB38: /* 18E418 8025FB38 3C10802A */ lui $s0, %hi(D_8029FA80) /* 18E41C 8025FB3C 2610FA80 */ addiu $s0, $s0, %lo(D_8029FA80) @@ -1709,7 +1720,7 @@ glabel func_8025E190 /* 18E428 8025FB48 24050002 */ addiu $a1, $zero, 2 /* 18E42C 8025FB4C 8E04000C */ lw $a0, 0xc($s0) /* 18E430 8025FB50 08097ED8 */ j .L8025FB60 -/* 18E434 8025FB54 00000000 */ nop +/* 18E434 8025FB54 00000000 */ nop .L8025FB58: /* 18E438 8025FB58 3C04802A */ lui $a0, %hi(D_8029FA88) /* 18E43C 8025FB5C 8C84FA88 */ lw $a0, %lo(D_8029FA88)($a0) @@ -1717,7 +1728,7 @@ glabel func_8025E190 /* 18E440 8025FB60 0C051280 */ jal set_icon_flags /* 18E444 8025FB64 24050002 */ addiu $a1, $zero, 2 /* 18E448 8025FB68 08097EF9 */ j .L8025FBE4 -/* 18E44C 8025FB6C 00000000 */ nop +/* 18E44C 8025FB6C 00000000 */ nop .L8025FB70: /* 18E450 8025FB70 83C30048 */ lb $v1, 0x48($fp) /* 18E454 8025FB74 1062000F */ beq $v1, $v0, .L8025FBB4 @@ -1725,19 +1736,19 @@ glabel func_8025E190 /* 18E45C 8025FB7C 10400005 */ beqz $v0, .L8025FB94 /* 18E460 8025FB80 24020002 */ addiu $v0, $zero, 2 /* 18E464 8025FB84 10600007 */ beqz $v1, .L8025FBA4 -/* 18E468 8025FB88 00000000 */ nop +/* 18E468 8025FB88 00000000 */ nop /* 18E46C 8025FB8C 08097EF9 */ j .L8025FBE4 -/* 18E470 8025FB90 00000000 */ nop +/* 18E470 8025FB90 00000000 */ nop .L8025FB94: /* 18E474 8025FB94 1062000F */ beq $v1, $v0, .L8025FBD4 -/* 18E478 8025FB98 00000000 */ nop +/* 18E478 8025FB98 00000000 */ nop /* 18E47C 8025FB9C 08097EF9 */ j .L8025FBE4 -/* 18E480 8025FBA0 00000000 */ nop +/* 18E480 8025FBA0 00000000 */ nop .L8025FBA4: /* 18E484 8025FBA4 3C04802A */ lui $a0, %hi(D_8029FA80) /* 18E488 8025FBA8 8C84FA80 */ lw $a0, %lo(D_8029FA80)($a0) /* 18E48C 8025FBAC 08097EF7 */ j .L8025FBDC -/* 18E490 8025FBB0 00000000 */ nop +/* 18E490 8025FBB0 00000000 */ nop .L8025FBB4: /* 18E494 8025FBB4 3C10802A */ lui $s0, %hi(D_8029FA80) /* 18E498 8025FBB8 2610FA80 */ addiu $s0, $s0, %lo(D_8029FA80) @@ -1746,7 +1757,7 @@ glabel func_8025E190 /* 18E4A4 8025FBC4 24050002 */ addiu $a1, $zero, 2 /* 18E4A8 8025FBC8 8E04000C */ lw $a0, 0xc($s0) /* 18E4AC 8025FBCC 08097EF7 */ j .L8025FBDC -/* 18E4B0 8025FBD0 00000000 */ nop +/* 18E4B0 8025FBD0 00000000 */ nop .L8025FBD4: /* 18E4B4 8025FBD4 3C04802A */ lui $a0, %hi(D_8029FA88) /* 18E4B8 8025FBD8 8C84FA88 */ lw $a0, %lo(D_8029FA88)($a0) @@ -1762,6 +1773,7 @@ glabel func_8025E190 /* 18E4D8 8025FBF8 2442000A */ addiu $v0, $v0, 0xa /* 18E4DC 8025FBFC 08097FD0 */ j .L8025FF40 /* 18E4E0 8025FC00 2402000B */ addiu $v0, $zero, 0xb +glabel L8025FC04_18E4E4 /* 18E4E4 8025FC04 3C10802A */ lui $s0, %hi(D_8029FA80) /* 18E4E8 8025FC08 2610FA80 */ addiu $s0, $s0, %lo(D_8029FA80) /* 18E4EC 8025FC0C 8E040000 */ lw $a0, ($s0) @@ -1774,7 +1786,7 @@ glabel func_8025E190 /* 18E508 8025FC28 3C14802A */ lui $s4, %hi(D_8029FA90) /* 18E50C 8025FC2C 2694FA90 */ addiu $s4, $s4, %lo(D_8029FA90) /* 18E510 8025FC30 0C05123D */ jal free_icon -/* 18E514 8025FC34 00000000 */ nop +/* 18E514 8025FC34 00000000 */ nop /* 18E518 8025FC38 0C05123D */ jal free_icon /* 18E51C 8025FC3C 8E040008 */ lw $a0, 8($s0) .L8025FC40: @@ -1796,14 +1808,15 @@ glabel func_8025E190 /* 18E558 8025FC78 3C04802A */ lui $a0, %hi(D_8029FB48) /* 18E55C 8025FC7C 8C84FB48 */ lw $a0, %lo(D_8029FB48)($a0) /* 18E560 8025FC80 0C05123D */ jal free_icon -/* 18E564 8025FC84 00000000 */ nop +/* 18E564 8025FC84 00000000 */ nop /* 18E568 8025FC88 0000202D */ daddu $a0, $zero, $zero /* 18E56C 8025FC8C 0080282D */ daddu $a1, $a0, $zero /* 18E570 8025FC90 0080302D */ daddu $a2, $a0, $zero /* 18E574 8025FC94 0C046F97 */ jal set_background_color_blend /* 18E578 8025FC98 0080382D */ daddu $a3, $a0, $zero /* 18E57C 8025FC9C 08097FCD */ j .L8025FF34 -/* 18E580 8025FCA0 00000000 */ nop +/* 18E580 8025FCA0 00000000 */ nop +glabel L8025FCA4_18E584 /* 18E584 8025FCA4 3C04001D */ lui $a0, 0x1d /* 18E588 8025FCA8 348400AB */ ori $a0, $a0, 0xab /* 18E58C 8025FCAC 0C04991D */ jal get_string_width @@ -1838,12 +1851,13 @@ glabel func_8025E190 /* 18E600 8025FD20 AC22FB4C */ sw $v0, %lo(D_8029FB4C)($at) /* 18E604 8025FD24 08097FD0 */ j .L8025FF40 /* 18E608 8025FD28 24020010 */ addiu $v0, $zero, 0x10 +glabel L8025FD2C_18E60C /* 18E60C 8025FD2C 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 18E610 8025FD30 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 18E614 8025FD34 8C420010 */ lw $v0, 0x10($v0) /* 18E618 8025FD38 3042C000 */ andi $v0, $v0, 0xc000 /* 18E61C 8025FD3C 10400003 */ beqz $v0, .L8025FD4C -/* 18E620 8025FD40 00000000 */ nop +/* 18E620 8025FD40 00000000 */ nop /* 18E624 8025FD44 3C01802A */ lui $at, %hi(D_8029FB4C) /* 18E628 8025FD48 AC20FB4C */ sw $zero, %lo(D_8029FB4C)($at) .L8025FD4C: @@ -1861,6 +1875,7 @@ glabel func_8025E190 /* 18E650 8025FD70 24050002 */ addiu $a1, $zero, 2 /* 18E654 8025FD74 08097FD0 */ j .L8025FF40 /* 18E658 8025FD78 24020008 */ addiu $v0, $zero, 8 +glabel L8025FD7C_18E65C /* 18E65C 8025FD7C 8FC20214 */ lw $v0, 0x214($fp) /* 18E660 8025FD80 3042C000 */ andi $v0, $v0, 0xc000 /* 18E664 8025FD84 10400003 */ beqz $v0, .L8025FD94 @@ -1919,6 +1934,7 @@ glabel func_8025E190 /* 18E72C 8025FE4C AC22FB4C */ sw $v0, %lo(D_8029FB4C)($at) /* 18E730 8025FE50 08097FD0 */ j .L8025FF40 /* 18E734 8025FE54 24020015 */ addiu $v0, $zero, 0x15 +glabel L8025FE58_18E738 /* 18E738 8025FE58 3C03802A */ lui $v1, %hi(D_8029FB4C) /* 18E73C 8025FE5C 2463FB4C */ addiu $v1, $v1, %lo(D_8029FB4C) /* 18E740 8025FE60 8C620000 */ lw $v0, ($v1) @@ -1932,7 +1948,7 @@ glabel func_8025E190 /* 18E760 8025FE80 0C098F3F */ jal set_animation /* 18E764 8025FE84 34C60004 */ ori $a2, $a2, 4 /* 18E768 8025FE88 08097FB1 */ j .L8025FEC4 -/* 18E76C 8025FE8C 00000000 */ nop +/* 18E76C 8025FE8C 00000000 */ nop .L8025FE90: /* 18E770 8025FE90 12400002 */ beqz $s2, .L8025FE9C /* 18E774 8025FE94 AE20018C */ sw $zero, 0x18c($s1) @@ -1941,7 +1957,7 @@ glabel func_8025E190 /* 18E77C 8025FE9C C6200144 */ lwc1 $f0, 0x144($s1) /* 18E780 8025FEA0 3C014080 */ lui $at, 0x4080 /* 18E784 8025FEA4 44811000 */ mtc1 $at, $f2 -/* 18E788 8025FEA8 00000000 */ nop +/* 18E788 8025FEA8 00000000 */ nop /* 18E78C 8025FEAC 46020000 */ add.s $f0, $f0, $f2 /* 18E790 8025FEB0 12400004 */ beqz $s2, .L8025FEC4 /* 18E794 8025FEB4 E6200144 */ swc1 $f0, 0x144($s1) @@ -1963,20 +1979,21 @@ glabel func_8025E190 /* 18E7CC 8025FEEC 50400016 */ beql $v0, $zero, .L8025FF48 /* 18E7D0 8025FEF0 AC640000 */ sw $a0, ($v1) /* 18E7D4 8025FEF4 08097FD2 */ j .L8025FF48 -/* 18E7D8 8025FEF8 00000000 */ nop +/* 18E7D8 8025FEF8 00000000 */ nop +glabel L8025FEFC_18E7DC /* 18E7DC 8025FEFC 0C0B1059 */ jal does_script_exist /* 18E7E0 8025FF00 8E2401E4 */ lw $a0, 0x1e4($s1) /* 18E7E4 8025FF04 10400003 */ beqz $v0, .L8025FF14 -/* 18E7E8 8025FF08 00000000 */ nop +/* 18E7E8 8025FF08 00000000 */ nop /* 18E7EC 8025FF0C 0C0B102B */ jal kill_script_by_ID /* 18E7F0 8025FF10 8E2401E4 */ lw $a0, 0x1e4($s1) .L8025FF14: /* 18E7F4 8025FF14 12400007 */ beqz $s2, .L8025FF34 -/* 18E7F8 8025FF18 00000000 */ nop +/* 18E7F8 8025FF18 00000000 */ nop /* 18E7FC 8025FF1C 0C0B1059 */ jal does_script_exist /* 18E800 8025FF20 8E4401E4 */ lw $a0, 0x1e4($s2) /* 18E804 8025FF24 10400003 */ beqz $v0, .L8025FF34 -/* 18E808 8025FF28 00000000 */ nop +/* 18E808 8025FF28 00000000 */ nop /* 18E80C 8025FF2C 0C0B102B */ jal kill_script_by_ID /* 18E810 8025FF30 8E4401E4 */ lw $a0, 0x1e4($s2) .L8025FF34: @@ -1987,6 +2004,7 @@ glabel func_8025E190 /* 18E820 8025FF40 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 18E824 8025FF44 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) .L8025FF48: +glabel L8025FF48_18E828 /* 18E828 8025FF48 3C03802A */ lui $v1, %hi(D_8029FB84) /* 18E82C 8025FF4C 2463FB84 */ addiu $v1, $v1, %lo(D_8029FB84) /* 18E830 8025FF50 8C620000 */ lw $v0, ($v1) diff --git a/asm/nonmatchings/code_18C790/func_802601BC.s b/asm/nonmatchings/code_18C790/func_802601BC.s index 7133121b23..6cca9c0562 100644 --- a/asm/nonmatchings/code_18C790/func_802601BC.s +++ b/asm/nonmatchings/code_18C790/func_802601BC.s @@ -16,11 +16,12 @@ glabel func_802601BC /* 18EAC8 802601E8 10400193 */ beqz $v0, .L80260838 /* 18EACC 802601EC AFB00010 */ sw $s0, 0x10($sp) /* 18EAD0 802601F0 00031080 */ sll $v0, $v1, 2 -/* 18EAD4 802601F4 3C01802A */ lui $at, %hi(D_8029D550) +/* 18EAD4 802601F4 3C01802A */ lui $at, %hi(jtbl_8029D550_1CBE30) /* 18EAD8 802601F8 00220821 */ addu $at, $at, $v0 -/* 18EADC 802601FC 8C22D550 */ lw $v0, %lo(D_8029D550)($at) +/* 18EADC 802601FC 8C22D550 */ lw $v0, %lo(jtbl_8029D550_1CBE30)($at) /* 18EAE0 80260200 00400008 */ jr $v0 -/* 18EAE4 80260204 00000000 */ nop +/* 18EAE4 80260204 00000000 */ nop +glabel L80260208_18EAE8 /* 18EAE8 80260208 0C097FE3 */ jal func_8025FF8C /* 18EAEC 8026020C 0000202D */ daddu $a0, $zero, $zero /* 18EAF0 80260210 24050080 */ addiu $a1, $zero, 0x80 @@ -84,7 +85,8 @@ glabel func_802601BC /* 18EBD0 802602F0 1440FFED */ bnez $v0, .L802602A8 /* 18EBD4 802602F4 2694001C */ addiu $s4, $s4, 0x1c /* 18EBD8 802602F8 0809820E */ j .L80260838 -/* 18EBDC 802602FC 00000000 */ nop +/* 18EBDC 802602FC 00000000 */ nop +glabel L80260300_18EBE0 /* 18EBE0 80260300 3C02800E */ lui $v0, %hi(gBattleStatus) /* 18EBE4 80260304 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) /* 18EBE8 80260308 80430048 */ lb $v1, 0x48($v0) @@ -131,7 +133,7 @@ glabel func_802601BC /* 18EC88 802603A8 26520001 */ addiu $s2, $s2, 1 /* 18EC8C 802603AC 2A420007 */ slti $v0, $s2, 7 /* 18EC90 802603B0 1440FFF7 */ bnez $v0, .L80260390 -/* 18EC94 802603B4 00000000 */ nop +/* 18EC94 802603B4 00000000 */ nop /* 18EC98 802603B8 0000902D */ daddu $s2, $zero, $zero /* 18EC9C 802603BC 3C10802A */ lui $s0, %hi(D_8029FA90) /* 18ECA0 802603C0 2610FA90 */ addiu $s0, $s0, %lo(D_8029FA90) @@ -145,7 +147,7 @@ glabel func_802601BC /* 18ECBC 802603DC 26520001 */ addiu $s2, $s2, 1 /* 18ECC0 802603E0 2A420007 */ slti $v0, $s2, 7 /* 18ECC4 802603E4 1440FFF7 */ bnez $v0, .L802603C4 -/* 18ECC8 802603E8 00000000 */ nop +/* 18ECC8 802603E8 00000000 */ nop /* 18ECCC 802603EC 0000902D */ daddu $s2, $zero, $zero /* 18ECD0 802603F0 3C10802A */ lui $s0, %hi(D_8029FA90) /* 18ECD4 802603F4 2610FA90 */ addiu $s0, $s0, %lo(D_8029FA90) @@ -159,7 +161,7 @@ glabel func_802601BC /* 18ECF0 80260410 26520001 */ addiu $s2, $s2, 1 /* 18ECF4 80260414 2A420007 */ slti $v0, $s2, 7 /* 18ECF8 80260418 1440FFF7 */ bnez $v0, .L802603F8 -/* 18ECFC 8026041C 00000000 */ nop +/* 18ECFC 8026041C 00000000 */ nop /* 18ED00 80260420 3C10802A */ lui $s0, %hi(D_8029FA80) /* 18ED04 80260424 2610FA80 */ addiu $s0, $s0, %lo(D_8029FA80) /* 18ED08 80260428 8E110000 */ lw $s1, ($s0) @@ -168,7 +170,7 @@ glabel func_802601BC /* 18ED14 80260434 3C05802B */ lui $a1, %hi(D_802A9F34) /* 18ED18 80260438 24A59F34 */ addiu $a1, $a1, %lo(D_802A9F34) /* 18ED1C 8026043C 10450003 */ beq $v0, $a1, .L8026044C -/* 18ED20 80260440 00000000 */ nop +/* 18ED20 80260440 00000000 */ nop /* 18ED24 80260444 0C0511FF */ jal set_menu_icon_script /* 18ED28 80260448 0220202D */ daddu $a0, $s1, $zero .L8026044C: @@ -178,7 +180,7 @@ glabel func_802601BC /* 18ED38 80260458 3C05802B */ lui $a1, %hi(D_802A9F84) /* 18ED3C 8026045C 24A59F84 */ addiu $a1, $a1, %lo(D_802A9F84) /* 18ED40 80260460 10450003 */ beq $v0, $a1, .L80260470 -/* 18ED44 80260464 00000000 */ nop +/* 18ED44 80260464 00000000 */ nop /* 18ED48 80260468 0C0511FF */ jal set_menu_icon_script /* 18ED4C 8026046C 0220202D */ daddu $a0, $s1, $zero .L80260470: @@ -188,7 +190,7 @@ glabel func_802601BC /* 18ED5C 8026047C 3C05802B */ lui $a1, %hi(D_802A9F5C) /* 18ED60 80260480 24A59F5C */ addiu $a1, $a1, %lo(D_802A9F5C) /* 18ED64 80260484 10450003 */ beq $v0, $a1, .L80260494 -/* 18ED68 80260488 00000000 */ nop +/* 18ED68 80260488 00000000 */ nop /* 18ED6C 8026048C 0C0511FF */ jal set_menu_icon_script /* 18ED70 80260490 0220202D */ daddu $a0, $s1, $zero .L80260494: @@ -198,11 +200,11 @@ glabel func_802601BC /* 18ED80 802604A0 3C05802B */ lui $a1, %hi(D_802A9FAC) /* 18ED84 802604A4 24A59FAC */ addiu $a1, $a1, %lo(D_802A9FAC) /* 18ED88 802604A8 10450082 */ beq $v0, $a1, .L802606B4 -/* 18ED8C 802604AC 00000000 */ nop +/* 18ED8C 802604AC 00000000 */ nop /* 18ED90 802604B0 0C0511FF */ jal set_menu_icon_script /* 18ED94 802604B4 0220202D */ daddu $a0, $s1, $zero /* 18ED98 802604B8 080981AD */ j .L802606B4 -/* 18ED9C 802604BC 00000000 */ nop +/* 18ED9C 802604BC 00000000 */ nop .L802604C0: /* 18EDA0 802604C0 241500B4 */ addiu $s5, $zero, 0xb4 /* 18EDA4 802604C4 24050080 */ addiu $a1, $zero, 0x80 @@ -240,7 +242,7 @@ glabel func_802601BC /* 18EE20 80260540 26520001 */ addiu $s2, $s2, 1 /* 18EE24 80260544 2A420007 */ slti $v0, $s2, 7 /* 18EE28 80260548 1440FFF7 */ bnez $v0, .L80260528 -/* 18EE2C 8026054C 00000000 */ nop +/* 18EE2C 8026054C 00000000 */ nop /* 18EE30 80260550 0000902D */ daddu $s2, $zero, $zero /* 18EE34 80260554 3C10802A */ lui $s0, %hi(D_8029FA90) /* 18EE38 80260558 2610FA90 */ addiu $s0, $s0, %lo(D_8029FA90) @@ -254,7 +256,7 @@ glabel func_802601BC /* 18EE54 80260574 26520001 */ addiu $s2, $s2, 1 /* 18EE58 80260578 2A420007 */ slti $v0, $s2, 7 /* 18EE5C 8026057C 1440FFF7 */ bnez $v0, .L8026055C -/* 18EE60 80260580 00000000 */ nop +/* 18EE60 80260580 00000000 */ nop /* 18EE64 80260584 0000902D */ daddu $s2, $zero, $zero /* 18EE68 80260588 3C10802A */ lui $s0, %hi(D_8029FA90) /* 18EE6C 8026058C 2610FA90 */ addiu $s0, $s0, %lo(D_8029FA90) @@ -268,9 +270,9 @@ glabel func_802601BC /* 18EE88 802605A8 26520001 */ addiu $s2, $s2, 1 /* 18EE8C 802605AC 2A420007 */ slti $v0, $s2, 7 /* 18EE90 802605B0 10400040 */ beqz $v0, .L802606B4 -/* 18EE94 802605B4 00000000 */ nop +/* 18EE94 802605B4 00000000 */ nop /* 18EE98 802605B8 08098164 */ j .L80260590 -/* 18EE9C 802605BC 00000000 */ nop +/* 18EE9C 802605BC 00000000 */ nop .L802605C0: /* 18EEA0 802605C0 24050080 */ addiu $a1, $zero, 0x80 .L802605C4: @@ -308,7 +310,7 @@ glabel func_802601BC /* 18EF1C 8026063C 26520001 */ addiu $s2, $s2, 1 /* 18EF20 80260640 2A420007 */ slti $v0, $s2, 7 /* 18EF24 80260644 1440FFF7 */ bnez $v0, .L80260624 -/* 18EF28 80260648 00000000 */ nop +/* 18EF28 80260648 00000000 */ nop /* 18EF2C 8026064C 0000902D */ daddu $s2, $zero, $zero /* 18EF30 80260650 3C10802A */ lui $s0, %hi(D_8029FA90) /* 18EF34 80260654 2610FA90 */ addiu $s0, $s0, %lo(D_8029FA90) @@ -322,7 +324,7 @@ glabel func_802601BC /* 18EF50 80260670 26520001 */ addiu $s2, $s2, 1 /* 18EF54 80260674 2A420007 */ slti $v0, $s2, 7 /* 18EF58 80260678 1440FFF7 */ bnez $v0, .L80260658 -/* 18EF5C 8026067C 00000000 */ nop +/* 18EF5C 8026067C 00000000 */ nop /* 18EF60 80260680 0000902D */ daddu $s2, $zero, $zero /* 18EF64 80260684 3C10802A */ lui $s0, %hi(D_8029FA90) /* 18EF68 80260688 2610FA90 */ addiu $s0, $s0, %lo(D_8029FA90) @@ -336,7 +338,7 @@ glabel func_802601BC /* 18EF84 802606A4 26520001 */ addiu $s2, $s2, 1 /* 18EF88 802606A8 2A420007 */ slti $v0, $s2, 7 /* 18EF8C 802606AC 1440FFF7 */ bnez $v0, .L8026068C -/* 18EF90 802606B0 00000000 */ nop +/* 18EF90 802606B0 00000000 */ nop .L802606B4: /* 18EF94 802606B4 0C097FE3 */ jal func_8025FF8C /* 18EF98 802606B8 24040001 */ addiu $a0, $zero, 1 @@ -352,7 +354,7 @@ glabel func_802601BC /* 18EFC0 802606E0 3C14802A */ lui $s4, %hi(D_8029FA90) /* 18EFC4 802606E4 2694FA90 */ addiu $s4, $s4, %lo(D_8029FA90) /* 18EFC8 802606E8 0C0511EA */ jal draw_icon_0 -/* 18EFCC 802606EC 00000000 */ nop +/* 18EFCC 802606EC 00000000 */ nop /* 18EFD0 802606F0 0C0511EA */ jal draw_icon_0 /* 18EFD4 802606F4 8E040008 */ lw $a0, 8($s0) .L802606F8: @@ -374,7 +376,7 @@ glabel func_802601BC /* 18F010 80260730 0C051086 */ jal func_80144218 /* 18F014 80260734 2404FFFF */ addiu $a0, $zero, -1 /* 18F018 80260738 44951000 */ mtc1 $s5, $f2 -/* 18F01C 8026073C 00000000 */ nop +/* 18F01C 8026073C 00000000 */ nop /* 18F020 80260740 468010A0 */ cvt.s.w $f2, $f2 /* 18F024 80260744 44071000 */ mfc1 $a3, $f2 /* 18F028 80260748 44800000 */ mtc1 $zero, $f0 @@ -387,7 +389,8 @@ glabel func_802601BC /* 18F044 80260764 0C05108E */ jal func_80144238 /* 18F048 80260768 0220202D */ daddu $a0, $s1, $zero /* 18F04C 8026076C 0809820E */ j .L80260838 -/* 18F050 80260770 00000000 */ nop +/* 18F050 80260770 00000000 */ nop +glabel L80260774_18F054 /* 18F054 80260774 0C097FE3 */ jal func_8025FF8C /* 18F058 80260778 24040001 */ addiu $a0, $zero, 1 /* 18F05C 8026077C 3C10802A */ lui $s0, %hi(D_8029FA80) @@ -402,7 +405,7 @@ glabel func_802601BC /* 18F080 802607A0 3C14802A */ lui $s4, %hi(D_8029FA90) /* 18F084 802607A4 2694FA90 */ addiu $s4, $s4, %lo(D_8029FA90) /* 18F088 802607A8 0C0511EA */ jal draw_icon_0 -/* 18F08C 802607AC 00000000 */ nop +/* 18F08C 802607AC 00000000 */ nop /* 18F090 802607B0 0C0511EA */ jal draw_icon_0 /* 18F094 802607B4 8E040008 */ lw $a0, 8($s0) .L802607B8: @@ -425,22 +428,25 @@ glabel func_802601BC /* 18F0D4 802607F4 C4224150 */ lwc1 $f2, %lo(D_80284150)($at) /* 18F0D8 802607F8 0809820B */ j .L8026082C /* 18F0DC 802607FC 468010A0 */ cvt.s.w $f2, $f2 +glabel L80260800_18F0E0 /* 18F0E0 80260800 3C018028 */ lui $at, %hi(D_80284150) /* 18F0E4 80260804 C4224150 */ lwc1 $f2, %lo(D_80284150)($at) /* 18F0E8 80260808 0809820B */ j .L8026082C /* 18F0EC 8026080C 468010A0 */ cvt.s.w $f2, $f2 +glabel L80260810_18F0F0 /* 18F0F0 80260810 3C058028 */ lui $a1, %hi(D_80284150) /* 18F0F4 80260814 8CA54150 */ lw $a1, %lo(D_80284150)($a1) /* 18F0F8 80260818 10A00007 */ beqz $a1, .L80260838 -/* 18F0FC 8026081C 00000000 */ nop +/* 18F0FC 8026081C 00000000 */ nop /* 18F100 80260820 44851000 */ mtc1 $a1, $f2 -/* 18F104 80260824 00000000 */ nop +/* 18F104 80260824 00000000 */ nop /* 18F108 80260828 468010A0 */ cvt.s.w $f2, $f2 .L8026082C: /* 18F10C 8026082C 44051000 */ mfc1 $a1, $f2 /* 18F110 80260830 0C04DF62 */ jal func_80137D88 /* 18F114 80260834 0000202D */ daddu $a0, $zero, $zero .L80260838: +glabel L80260838_18F118 /* 18F118 80260838 3C03800E */ lui $v1, %hi(gBattleStatus+0x46C) /* 18F11C 8026083C 8C63C4DC */ lw $v1, %lo(gBattleStatus+0x46C)($v1) /* 18F120 80260840 28620007 */ slti $v0, $v1, 7 @@ -449,9 +455,9 @@ glabel func_802601BC /* 18F12C 8026084C 14400005 */ bnez $v0, .L80260864 /* 18F130 80260850 2402000A */ addiu $v0, $zero, 0xa /* 18F134 80260854 1062001B */ beq $v1, $v0, .L802608C4 -/* 18F138 80260858 00000000 */ nop +/* 18F138 80260858 00000000 */ nop /* 18F13C 8026085C 08098249 */ j .L80260924 -/* 18F140 80260860 00000000 */ nop +/* 18F140 80260860 00000000 */ nop .L80260864: /* 18F144 80260864 3C06802A */ lui $a2, %hi(D_8029FB8C) /* 18F148 80260868 24C6FB8C */ addiu $a2, $a2, %lo(D_8029FB8C) diff --git a/asm/nonmatchings/code_18C790/func_80260948.s b/asm/nonmatchings/code_18C790/func_80260948.s index 362ccabd64..68c4dd9253 100644 --- a/asm/nonmatchings/code_18C790/func_80260948.s +++ b/asm/nonmatchings/code_18C790/func_80260948.s @@ -14,7 +14,7 @@ glabel func_80260948 /* 18F24C 8026096C 10400029 */ beqz $v0, .L80260A14 /* 18F250 80260970 2862000F */ slti $v0, $v1, 0xf /* 18F254 80260974 14400027 */ bnez $v0, .L80260A14 -/* 18F258 80260978 00000000 */ nop +/* 18F258 80260978 00000000 */ nop .L8026097C: /* 18F25C 8026097C 3C02800E */ lui $v0, %hi(gBattleStatus) /* 18F260 80260980 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) @@ -24,7 +24,7 @@ glabel func_80260948 /* 18F270 80260990 1062000B */ beq $v1, $v0, .L802609C0 /* 18F274 80260994 3C04001D */ lui $a0, 0x1d /* 18F278 80260998 08098277 */ j .L802609DC -/* 18F27C 8026099C 00000000 */ nop +/* 18F27C 8026099C 00000000 */ nop .L802609A0: /* 18F280 802609A0 3C04001D */ lui $a0, 0x1d /* 18F284 802609A4 3C02802A */ lui $v0, %hi(D_8029FB60) diff --git a/asm/nonmatchings/code_18C790/func_80260A20.s b/asm/nonmatchings/code_18C790/func_80260A20.s index 83c0206999..dbaf171c2b 100644 --- a/asm/nonmatchings/code_18C790/func_80260A20.s +++ b/asm/nonmatchings/code_18C790/func_80260A20.s @@ -16,5 +16,5 @@ glabel func_80260A20 /* 18F32C 80260A4C 8FBF0018 */ lw $ra, 0x18($sp) /* 18F330 80260A50 03E00008 */ jr $ra /* 18F334 80260A54 27BD0020 */ addiu $sp, $sp, 0x20 -/* 18F338 80260A58 00000000 */ nop -/* 18F33C 80260A5C 00000000 */ nop +/* 18F338 80260A58 00000000 */ nop +/* 18F33C 80260A5C 00000000 */ nop diff --git a/asm/nonmatchings/code_18F340/FXRecoverFP.s b/asm/nonmatchings/code_18F340/FXRecoverFP.s index 60917c6f39..c35e126479 100644 --- a/asm/nonmatchings/code_18F340/FXRecoverFP.s +++ b/asm/nonmatchings/code_18F340/FXRecoverFP.s @@ -28,15 +28,15 @@ glabel FXRecoverFP /* 1905A4 80261CC4 0C0B1EAF */ jal get_variable /* 1905A8 80261CC8 0040802D */ daddu $s0, $v0, $zero /* 1905AC 80261CCC 44930000 */ mtc1 $s3, $f0 -/* 1905B0 80261CD0 00000000 */ nop +/* 1905B0 80261CD0 00000000 */ nop /* 1905B4 80261CD4 46800020 */ cvt.s.w $f0, $f0 /* 1905B8 80261CD8 44050000 */ mfc1 $a1, $f0 /* 1905BC 80261CDC 44920000 */ mtc1 $s2, $f0 -/* 1905C0 80261CE0 00000000 */ nop +/* 1905C0 80261CE0 00000000 */ nop /* 1905C4 80261CE4 46800020 */ cvt.s.w $f0, $f0 /* 1905C8 80261CE8 44060000 */ mfc1 $a2, $f0 /* 1905CC 80261CEC 44900000 */ mtc1 $s0, $f0 -/* 1905D0 80261CF0 00000000 */ nop +/* 1905D0 80261CF0 00000000 */ nop /* 1905D4 80261CF4 46800020 */ cvt.s.w $f0, $f0 /* 1905D8 80261CF8 44070000 */ mfc1 $a3, $f0 /* 1905DC 80261CFC 24040001 */ addiu $a0, $zero, 1 diff --git a/asm/nonmatchings/code_18F340/FXRecoverHP.s b/asm/nonmatchings/code_18F340/FXRecoverHP.s index a1505a681c..250d999dcf 100644 --- a/asm/nonmatchings/code_18F340/FXRecoverHP.s +++ b/asm/nonmatchings/code_18F340/FXRecoverHP.s @@ -28,15 +28,15 @@ glabel FXRecoverHP /* 1904E4 80261C04 0C0B1EAF */ jal get_variable /* 1904E8 80261C08 0040802D */ daddu $s0, $v0, $zero /* 1904EC 80261C0C 44930000 */ mtc1 $s3, $f0 -/* 1904F0 80261C10 00000000 */ nop +/* 1904F0 80261C10 00000000 */ nop /* 1904F4 80261C14 46800020 */ cvt.s.w $f0, $f0 /* 1904F8 80261C18 44050000 */ mfc1 $a1, $f0 /* 1904FC 80261C1C 44920000 */ mtc1 $s2, $f0 -/* 190500 80261C20 00000000 */ nop +/* 190500 80261C20 00000000 */ nop /* 190504 80261C24 46800020 */ cvt.s.w $f0, $f0 /* 190508 80261C28 44060000 */ mfc1 $a2, $f0 /* 19050C 80261C2C 44900000 */ mtc1 $s0, $f0 -/* 190510 80261C30 00000000 */ nop +/* 190510 80261C30 00000000 */ nop /* 190514 80261C34 46800020 */ cvt.s.w $f0, $f0 /* 190518 80261C38 44070000 */ mfc1 $a3, $f0 /* 19051C 80261C3C 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/code_18F340/func_80260A60.s b/asm/nonmatchings/code_18F340/func_80260A60.s index b5ffcd62e9..696a1376ee 100644 --- a/asm/nonmatchings/code_18F340/func_80260A60.s +++ b/asm/nonmatchings/code_18F340/func_80260A60.s @@ -21,11 +21,11 @@ glabel func_80260A60 /* 18F380 80260AA0 0C098F3F */ jal set_animation /* 18F384 80260AA4 0080282D */ daddu $a1, $a0, $zero /* 18F388 80260AA8 080982B2 */ j .L80260AC8 -/* 18F38C 80260AAC 00000000 */ nop +/* 18F38C 80260AAC 00000000 */ nop .L80260AB0: /* 18F390 80260AB0 8082009A */ lb $v0, 0x9a($a0) /* 18F394 80260AB4 14400004 */ bnez $v0, .L80260AC8 -/* 18F398 80260AB8 00000000 */ nop +/* 18F398 80260AB8 00000000 */ nop /* 18F39C 80260ABC 3C028028 */ lui $v0, %hi(D_80283238) /* 18F3A0 80260AC0 24423238 */ addiu $v0, $v0, %lo(D_80283238) /* 18F3A4 80260AC4 AC620094 */ sw $v0, 0x94($v1) diff --git a/asm/nonmatchings/code_18F340/func_80260BF4.s b/asm/nonmatchings/code_18F340/func_80260BF4.s index 0385ec3741..7c4f95fe80 100644 --- a/asm/nonmatchings/code_18F340/func_80260BF4.s +++ b/asm/nonmatchings/code_18F340/func_80260BF4.s @@ -30,7 +30,7 @@ glabel func_80260BF4 /* 18F534 80260C54 1440FFFB */ bnez $v0, .L80260C44 /* 18F538 80260C58 24A50008 */ addiu $a1, $a1, 8 /* 18F53C 80260C5C 0C00A67F */ jal rand_int -/* 18F540 80260C60 00000000 */ nop +/* 18F540 80260C60 00000000 */ nop /* 18F544 80260C64 0040202D */ daddu $a0, $v0, $zero /* 18F548 80260C68 0000182D */ daddu $v1, $zero, $zero /* 18F54C 80260C6C 0200282D */ daddu $a1, $s0, $zero @@ -51,10 +51,10 @@ glabel func_80260BF4 /* 18F57C 80260C9C 82220002 */ lb $v0, 2($s1) /* 18F580 80260CA0 82230003 */ lb $v1, 3($s1) /* 18F584 80260CA4 44820000 */ mtc1 $v0, $f0 -/* 18F588 80260CA8 00000000 */ nop +/* 18F588 80260CA8 00000000 */ nop /* 18F58C 80260CAC 46800020 */ cvt.s.w $f0, $f0 /* 18F590 80260CB0 44831000 */ mtc1 $v1, $f2 -/* 18F594 80260CB4 00000000 */ nop +/* 18F594 80260CB4 00000000 */ nop /* 18F598 80260CB8 468010A0 */ cvt.s.w $f2, $f2 /* 18F59C 80260CBC 46020003 */ div.s $f0, $f0, $f2 /* 18F5A0 80260CC0 3C013FD0 */ lui $at, 0x3fd0 @@ -62,29 +62,29 @@ glabel func_80260BF4 /* 18F5A8 80260CC8 44801000 */ mtc1 $zero, $f2 /* 18F5AC 80260CCC 46000121 */ cvt.d.s $f4, $f0 /* 18F5B0 80260CD0 4622203E */ c.le.d $f4, $f2 -/* 18F5B4 80260CD4 00000000 */ nop +/* 18F5B4 80260CD4 00000000 */ nop /* 18F5B8 80260CD8 45000003 */ bc1f .L80260CE8 -/* 18F5BC 80260CDC 00000000 */ nop +/* 18F5BC 80260CDC 00000000 */ nop /* 18F5C0 80260CE0 0809834D */ j .L80260D34 /* 18F5C4 80260CE4 26100044 */ addiu $s0, $s0, 0x44 .L80260CE8: /* 18F5C8 80260CE8 3C013FE0 */ lui $at, 0x3fe0 /* 18F5CC 80260CEC 44810800 */ mtc1 $at, $f1 /* 18F5D0 80260CF0 44800000 */ mtc1 $zero, $f0 -/* 18F5D4 80260CF4 00000000 */ nop +/* 18F5D4 80260CF4 00000000 */ nop /* 18F5D8 80260CF8 4620203E */ c.le.d $f4, $f0 -/* 18F5DC 80260CFC 00000000 */ nop +/* 18F5DC 80260CFC 00000000 */ nop /* 18F5E0 80260D00 45000003 */ bc1f .L80260D10 -/* 18F5E4 80260D04 00000000 */ nop +/* 18F5E4 80260D04 00000000 */ nop /* 18F5E8 80260D08 0809834D */ j .L80260D34 /* 18F5EC 80260D0C 26100084 */ addiu $s0, $s0, 0x84 .L80260D10: /* 18F5F0 80260D10 3C013FE8 */ lui $at, 0x3fe8 /* 18F5F4 80260D14 44810800 */ mtc1 $at, $f1 /* 18F5F8 80260D18 44800000 */ mtc1 $zero, $f0 -/* 18F5FC 80260D1C 00000000 */ nop +/* 18F5FC 80260D1C 00000000 */ nop /* 18F600 80260D20 4620203E */ c.le.d $f4, $f0 -/* 18F604 80260D24 00000000 */ nop +/* 18F604 80260D24 00000000 */ nop /* 18F608 80260D28 45020002 */ bc1fl .L80260D34 /* 18F60C 80260D2C 26100104 */ addiu $s0, $s0, 0x104 /* 18F610 80260D30 261000C4 */ addiu $s0, $s0, 0xc4 @@ -100,7 +100,7 @@ glabel func_80260BF4 /* 18F630 80260D50 1440FFFB */ bnez $v0, .L80260D40 /* 18F634 80260D54 24A50008 */ addiu $a1, $a1, 8 /* 18F638 80260D58 0C00A67F */ jal rand_int -/* 18F63C 80260D5C 00000000 */ nop +/* 18F63C 80260D5C 00000000 */ nop /* 18F640 80260D60 0040202D */ daddu $a0, $v0, $zero /* 18F644 80260D64 0000182D */ daddu $v1, $zero, $zero /* 18F648 80260D68 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/code_18F340/func_80260E90.s b/asm/nonmatchings/code_18F340/func_80260E90.s index 9bc79ad661..b1debb2aba 100644 --- a/asm/nonmatchings/code_18F340/func_80260E90.s +++ b/asm/nonmatchings/code_18F340/func_80260E90.s @@ -29,7 +29,7 @@ glabel func_80260E90 /* 18F7D0 80260EF0 92620191 */ lbu $v0, 0x191($s3) /* 18F7D4 80260EF4 C6620148 */ lwc1 $f2, 0x148($s3) /* 18F7D8 80260EF8 44820000 */ mtc1 $v0, $f0 -/* 18F7DC 80260EFC 00000000 */ nop +/* 18F7DC 80260EFC 00000000 */ nop /* 18F7E0 80260F00 46800020 */ cvt.s.w $f0, $f0 /* 18F7E4 80260F04 0C099CAB */ jal heroes_is_ability_active /* 18F7E8 80260F08 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_80260E90 /* 18F884 80260FA4 24040001 */ addiu $a0, $zero, 1 /* 18F888 80260FA8 0212102A */ slt $v0, $s0, $s2 /* 18F88C 80260FAC 1440FFED */ bnez $v0, .L80260F64 -/* 18F890 80260FB0 00000000 */ nop +/* 18F890 80260FB0 00000000 */ nop .L80260FB4: /* 18F894 80260FB4 00101040 */ sll $v0, $s0, 1 /* 18F898 80260FB8 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_80260E90 /* 18F8DC 80260FFC 3C048011 */ lui $a0, %hi(D_80108A64) /* 18F8E0 80261000 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 18F8E4 80261004 0C050529 */ jal create_icon -/* 18F8E8 80261008 00000000 */ nop +/* 18F8E8 80261008 00000000 */ nop /* 18F8EC 8026100C 8FA50020 */ lw $a1, 0x20($sp) /* 18F8F0 80261010 8FA60024 */ lw $a2, 0x24($sp) /* 18F8F4 80261014 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_18F340/func_80261064.s b/asm/nonmatchings/code_18F340/func_80261064.s index 9e8f6ca1e5..ac74225ad9 100644 --- a/asm/nonmatchings/code_18F340/func_80261064.s +++ b/asm/nonmatchings/code_18F340/func_80261064.s @@ -16,13 +16,13 @@ glabel func_80261064 /* 18F970 80261090 0C099CAB */ jal heroes_is_ability_active /* 18F974 80261094 2405001D */ addiu $a1, $zero, 0x1d /* 18F978 80261098 10400007 */ beqz $v0, .L802610B8 -/* 18F97C 8026109C 00000000 */ nop +/* 18F97C 8026109C 00000000 */ nop /* 18F980 802610A0 1A000005 */ blez $s0, .L802610B8 -/* 18F984 802610A4 00000000 */ nop +/* 18F984 802610A4 00000000 */ nop /* 18F988 802610A8 3C04802A */ lui $a0, %hi(D_8029FBA0) /* 18F98C 802610AC 8C84FBA0 */ lw $a0, %lo(D_8029FBA0)($a0) /* 18F990 802610B0 0C05123D */ jal free_icon -/* 18F994 802610B4 00000000 */ nop +/* 18F994 802610B4 00000000 */ nop .L802610B8: /* 18F998 802610B8 8FBF0014 */ lw $ra, 0x14($sp) /* 18F99C 802610BC 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_18F340/func_8026127C.s b/asm/nonmatchings/code_18F340/func_8026127C.s index 3cccabaaba..b22aee1f6f 100644 --- a/asm/nonmatchings/code_18F340/func_8026127C.s +++ b/asm/nonmatchings/code_18F340/func_8026127C.s @@ -32,7 +32,7 @@ glabel func_8026127C /* 18FBC8 802612E8 82220002 */ lb $v0, 2($s1) /* 18FBCC 802612EC 28420002 */ slti $v0, $v0, 2 /* 18FBD0 802612F0 1040000B */ beqz $v0, .L80261320 -/* 18FBD4 802612F4 00000000 */ nop +/* 18FBD4 802612F4 00000000 */ nop /* 18FBD8 802612F8 0C03A752 */ jal is_ability_active /* 18FBDC 802612FC 24040014 */ addiu $a0, $zero, 0x14 /* 18FBE0 80261300 10400007 */ beqz $v0, .L80261320 @@ -47,11 +47,11 @@ glabel func_8026127C /* 18FC00 80261320 82220002 */ lb $v0, 2($s1) /* 18FC04 80261324 28420006 */ slti $v0, $v0, 6 /* 18FC08 80261328 10400011 */ beqz $v0, .L80261370 -/* 18FC0C 8026132C 00000000 */ nop +/* 18FC0C 8026132C 00000000 */ nop /* 18FC10 80261330 0C03A752 */ jal is_ability_active /* 18FC14 80261334 2404001E */ addiu $a0, $zero, 0x1e /* 18FC18 80261338 1040000D */ beqz $v0, .L80261370 -/* 18FC1C 8026133C 00000000 */ nop +/* 18FC1C 8026133C 00000000 */ nop /* 18FC20 80261340 92020099 */ lbu $v0, 0x99($s0) /* 18FC24 80261344 30420001 */ andi $v0, $v0, 1 /* 18FC28 80261348 14400009 */ bnez $v0, .L80261370 diff --git a/asm/nonmatchings/code_18F340/func_802613BC.s b/asm/nonmatchings/code_18F340/func_802613BC.s index 55bf0e102f..c4e001539e 100644 --- a/asm/nonmatchings/code_18F340/func_802613BC.s +++ b/asm/nonmatchings/code_18F340/func_802613BC.s @@ -23,16 +23,16 @@ glabel func_802613BC /* 18FCE4 80261404 0040802D */ daddu $s0, $v0, $zero /* 18FCE8 80261408 24040006 */ addiu $a0, $zero, 6 /* 18FCEC 8026140C 44921000 */ mtc1 $s2, $f2 -/* 18FCF0 80261410 00000000 */ nop +/* 18FCF0 80261410 00000000 */ nop /* 18FCF4 80261414 468010A0 */ cvt.s.w $f2, $f2 /* 18FCF8 80261418 2610000F */ addiu $s0, $s0, 0xf /* 18FCFC 8026141C 44051000 */ mfc1 $a1, $f2 /* 18FD00 80261420 44901000 */ mtc1 $s0, $f2 -/* 18FD04 80261424 00000000 */ nop +/* 18FD04 80261424 00000000 */ nop /* 18FD08 80261428 468010A0 */ cvt.s.w $f2, $f2 /* 18FD0C 8026142C 44061000 */ mfc1 $a2, $f2 /* 18FD10 80261430 44821000 */ mtc1 $v0, $f2 -/* 18FD14 80261434 00000000 */ nop +/* 18FD14 80261434 00000000 */ nop /* 18FD18 80261438 468010A0 */ cvt.s.w $f2, $f2 /* 18FD1C 8026143C 3C013F99 */ lui $at, 0x3f99 /* 18FD20 80261440 3421999A */ ori $at, $at, 0x999a diff --git a/asm/nonmatchings/code_18F340/func_80261478.s b/asm/nonmatchings/code_18F340/func_80261478.s index ce25136900..52a39674be 100644 --- a/asm/nonmatchings/code_18F340/func_80261478.s +++ b/asm/nonmatchings/code_18F340/func_80261478.s @@ -22,17 +22,17 @@ glabel func_80261478 /* 18FD9C 802614BC 0C0B1EAF */ jal get_variable /* 18FDA0 802614C0 0040802D */ daddu $s0, $v0, $zero /* 18FDA4 802614C4 44921000 */ mtc1 $s2, $f2 -/* 18FDA8 802614C8 00000000 */ nop +/* 18FDA8 802614C8 00000000 */ nop /* 18FDAC 802614CC 468010A0 */ cvt.s.w $f2, $f2 /* 18FDB0 802614D0 2403000F */ addiu $v1, $zero, 0xf /* 18FDB4 802614D4 02038021 */ addu $s0, $s0, $v1 /* 18FDB8 802614D8 44051000 */ mfc1 $a1, $f2 /* 18FDBC 802614DC 44901000 */ mtc1 $s0, $f2 -/* 18FDC0 802614E0 00000000 */ nop +/* 18FDC0 802614E0 00000000 */ nop /* 18FDC4 802614E4 468010A0 */ cvt.s.w $f2, $f2 /* 18FDC8 802614E8 44061000 */ mfc1 $a2, $f2 /* 18FDCC 802614EC 44821000 */ mtc1 $v0, $f2 -/* 18FDD0 802614F0 00000000 */ nop +/* 18FDD0 802614F0 00000000 */ nop /* 18FDD4 802614F4 468010A0 */ cvt.s.w $f2, $f2 /* 18FDD8 802614F8 3C0140A0 */ lui $at, 0x40a0 /* 18FDDC 802614FC 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_18F340/func_802616F4.s b/asm/nonmatchings/code_18F340/func_802616F4.s index b743238267..9897af8998 100644 --- a/asm/nonmatchings/code_18F340/func_802616F4.s +++ b/asm/nonmatchings/code_18F340/func_802616F4.s @@ -55,16 +55,16 @@ glabel func_802616F4 /* 190098 802617B8 C64C0074 */ lwc1 $f12, 0x74($s2) /* 19009C 802617BC 46806320 */ cvt.s.w $f12, $f12 /* 1900A0 802617C0 46006302 */ mul.s $f12, $f12, $f0 -/* 1900A4 802617C4 00000000 */ nop +/* 1900A4 802617C4 00000000 */ nop /* 1900A8 802617C8 3C0143B4 */ lui $at, 0x43b4 /* 1900AC 802617CC 44810000 */ mtc1 $at, $f0 /* 1900B0 802617D0 0C00A85B */ jal sin_rad /* 1900B4 802617D4 46006303 */ div.s $f12, $f12, $f0 /* 1900B8 802617D8 3C014040 */ lui $at, 0x4040 /* 1900BC 802617DC 44811000 */ mtc1 $at, $f2 -/* 1900C0 802617E0 00000000 */ nop +/* 1900C0 802617E0 00000000 */ nop /* 1900C4 802617E4 46020002 */ mul.s $f0, $f0, $f2 -/* 1900C8 802617E8 00000000 */ nop +/* 1900C8 802617E8 00000000 */ nop /* 1900CC 802617EC 3C01802A */ lui $at, %hi(D_8029FB94) /* 1900D0 802617F0 C422FB94 */ lwc1 $f2, %lo(D_8029FB94)($at) /* 1900D4 802617F4 46001080 */ add.s $f2, $f2, $f0 @@ -72,7 +72,7 @@ glabel func_802616F4 /* 1900DC 802617FC 8E420074 */ lw $v0, 0x74($s2) /* 1900E0 80261800 2442000A */ addiu $v0, $v0, 0xa /* 1900E4 80261804 44826000 */ mtc1 $v0, $f12 -/* 1900E8 80261808 00000000 */ nop +/* 1900E8 80261808 00000000 */ nop /* 1900EC 8026180C 46806320 */ cvt.s.w $f12, $f12 /* 1900F0 80261810 0C00A6C9 */ jal clamp_angle /* 1900F4 80261814 AE420074 */ sw $v0, 0x74($s2) @@ -114,7 +114,7 @@ glabel func_802616F4 /* 190184 802618A4 3C013727 */ lui $at, 0x3727 /* 190188 802618A8 3421C5AC */ ori $at, $at, 0xc5ac /* 19018C 802618AC 44810000 */ mtc1 $at, $f0 -/* 190190 802618B0 00000000 */ nop +/* 190190 802618B0 00000000 */ nop /* 190194 802618B4 E4400030 */ swc1 $f0, 0x30($v0) /* 190198 802618B8 8C82000C */ lw $v0, 0xc($a0) /* 19019C 802618BC E4400030 */ swc1 $f0, 0x30($v0) @@ -141,12 +141,12 @@ glabel func_802616F4 /* 1901EC 8026190C 46200020 */ cvt.s.d $f0, $f0 /* 1901F0 80261910 460000A1 */ cvt.d.s $f2, $f0 /* 1901F4 80261914 4622203C */ c.lt.d $f4, $f2 -/* 1901F8 80261918 00000000 */ nop +/* 1901F8 80261918 00000000 */ nop /* 1901FC 8026191C 45000005 */ bc1f .L80261934 /* 190200 80261920 E4400030 */ swc1 $f0, 0x30($v0) /* 190204 80261924 3C014060 */ lui $at, 0x4060 /* 190208 80261928 44810000 */ mtc1 $at, $f0 -/* 19020C 8026192C 00000000 */ nop +/* 19020C 8026192C 00000000 */ nop /* 190210 80261930 E4400030 */ swc1 $f0, 0x30($v0) .L80261934: /* 190214 80261934 3C03802A */ lui $v1, %hi(D_8029FB90) @@ -171,7 +171,7 @@ glabel func_802616F4 /* 19025C 8026197C 46200020 */ cvt.s.d $f0, $f0 /* 190260 80261980 460000A1 */ cvt.d.s $f2, $f0 /* 190264 80261984 4622203C */ c.lt.d $f4, $f2 -/* 190268 80261988 00000000 */ nop +/* 190268 80261988 00000000 */ nop /* 19026C 8026198C 45000002 */ bc1f .L80261998 /* 190270 80261990 E4400030 */ swc1 $f0, 0x30($v0) /* 190274 80261994 A4E60000 */ sh $a2, ($a3) diff --git a/asm/nonmatchings/code_18F340/func_802619E8.s b/asm/nonmatchings/code_18F340/func_802619E8.s index 082c0bc86a..76fae2085d 100644 --- a/asm/nonmatchings/code_18F340/func_802619E8.s +++ b/asm/nonmatchings/code_18F340/func_802619E8.s @@ -22,15 +22,15 @@ glabel func_802619E8 /* 19030C 80261A2C 0C0B1EAF */ jal get_variable /* 190310 80261A30 0040802D */ daddu $s0, $v0, $zero /* 190314 80261A34 44910000 */ mtc1 $s1, $f0 -/* 190318 80261A38 00000000 */ nop +/* 190318 80261A38 00000000 */ nop /* 19031C 80261A3C 46800020 */ cvt.s.w $f0, $f0 /* 190320 80261A40 44050000 */ mfc1 $a1, $f0 /* 190324 80261A44 44900000 */ mtc1 $s0, $f0 -/* 190328 80261A48 00000000 */ nop +/* 190328 80261A48 00000000 */ nop /* 19032C 80261A4C 46800020 */ cvt.s.w $f0, $f0 /* 190330 80261A50 44060000 */ mfc1 $a2, $f0 /* 190334 80261A54 44820000 */ mtc1 $v0, $f0 -/* 190338 80261A58 00000000 */ nop +/* 190338 80261A58 00000000 */ nop /* 19033C 80261A5C 46800020 */ cvt.s.w $f0, $f0 /* 190340 80261A60 3C048007 */ lui $a0, %hi(gCurrentCameraID) /* 190344 80261A64 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) @@ -53,36 +53,36 @@ glabel func_802619E8 /* 190388 80261AA8 3C048011 */ lui $a0, %hi(D_80108AD4) /* 19038C 80261AAC 24848AD4 */ addiu $a0, $a0, %lo(D_80108AD4) /* 190390 80261AB0 0C050529 */ jal create_icon -/* 190394 80261AB4 00000000 */ nop +/* 190394 80261AB4 00000000 */ nop /* 190398 80261AB8 8FA50020 */ lw $a1, 0x20($sp) /* 19039C 80261ABC 8FA60024 */ lw $a2, 0x24($sp) /* 1903A0 80261AC0 0040202D */ daddu $a0, $v0, $zero /* 1903A4 80261AC4 3C01802A */ lui $at, %hi(D_8029FBAC) /* 1903A8 80261AC8 AC24FBAC */ sw $a0, %lo(D_8029FBAC)($at) /* 1903AC 80261ACC 0C051261 */ jal set_icon_render_pos -/* 1903B0 80261AD0 00000000 */ nop +/* 1903B0 80261AD0 00000000 */ nop /* 1903B4 80261AD4 8FA20024 */ lw $v0, 0x24($sp) /* 1903B8 80261AD8 24420009 */ addiu $v0, $v0, 9 /* 1903BC 80261ADC AFA20024 */ sw $v0, 0x24($sp) .L80261AE0: /* 1903C0 80261AE0 8E4200B0 */ lw $v0, 0xb0($s2) /* 1903C4 80261AE4 1C400004 */ bgtz $v0, .L80261AF8 -/* 1903C8 80261AE8 00000000 */ nop +/* 1903C8 80261AE8 00000000 */ nop /* 1903CC 80261AEC 8E4200B4 */ lw $v0, 0xb4($s2) /* 1903D0 80261AF0 1840000C */ blez $v0, .L80261B24 -/* 1903D4 80261AF4 00000000 */ nop +/* 1903D4 80261AF4 00000000 */ nop .L80261AF8: /* 1903D8 80261AF8 3C048011 */ lui $a0, %hi(D_80108AAC) /* 1903DC 80261AFC 24848AAC */ addiu $a0, $a0, %lo(D_80108AAC) /* 1903E0 80261B00 0C050529 */ jal create_icon -/* 1903E4 80261B04 00000000 */ nop +/* 1903E4 80261B04 00000000 */ nop /* 1903E8 80261B08 8FA50020 */ lw $a1, 0x20($sp) /* 1903EC 80261B0C 8FA60024 */ lw $a2, 0x24($sp) /* 1903F0 80261B10 0040202D */ daddu $a0, $v0, $zero /* 1903F4 80261B14 3C01802A */ lui $at, %hi(D_8029FBA8) /* 1903F8 80261B18 AC24FBA8 */ sw $a0, %lo(D_8029FBA8)($at) /* 1903FC 80261B1C 0C051261 */ jal set_icon_render_pos -/* 190400 80261B20 00000000 */ nop +/* 190400 80261B20 00000000 */ nop .L80261B24: /* 190404 80261B24 8FBF003C */ lw $ra, 0x3c($sp) /* 190408 80261B28 8FB20038 */ lw $s2, 0x38($sp) diff --git a/asm/nonmatchings/code_18F340/func_80261B40.s b/asm/nonmatchings/code_18F340/func_80261B40.s index e6ee352caf..35b29e08ef 100644 --- a/asm/nonmatchings/code_18F340/func_80261B40.s +++ b/asm/nonmatchings/code_18F340/func_80261B40.s @@ -8,23 +8,23 @@ glabel func_80261B40 /* 19042C 80261B4C AFBF0014 */ sw $ra, 0x14($sp) /* 190430 80261B50 8E0200AC */ lw $v0, 0xac($s0) /* 190434 80261B54 18400005 */ blez $v0, .L80261B6C -/* 190438 80261B58 00000000 */ nop +/* 190438 80261B58 00000000 */ nop /* 19043C 80261B5C 3C04802A */ lui $a0, %hi(D_8029FBAC) /* 190440 80261B60 8C84FBAC */ lw $a0, %lo(D_8029FBAC)($a0) /* 190444 80261B64 0C05123D */ jal free_icon -/* 190448 80261B68 00000000 */ nop +/* 190448 80261B68 00000000 */ nop .L80261B6C: /* 19044C 80261B6C 8E0200B0 */ lw $v0, 0xb0($s0) /* 190450 80261B70 1C400004 */ bgtz $v0, .L80261B84 -/* 190454 80261B74 00000000 */ nop +/* 190454 80261B74 00000000 */ nop /* 190458 80261B78 8E0200B4 */ lw $v0, 0xb4($s0) /* 19045C 80261B7C 18400005 */ blez $v0, .L80261B94 -/* 190460 80261B80 00000000 */ nop +/* 190460 80261B80 00000000 */ nop .L80261B84: /* 190464 80261B84 3C04802A */ lui $a0, %hi(D_8029FBA8) /* 190468 80261B88 8C84FBA8 */ lw $a0, %lo(D_8029FBA8)($a0) /* 19046C 80261B8C 0C05123D */ jal free_icon -/* 190470 80261B90 00000000 */ nop +/* 190470 80261B90 00000000 */ nop .L80261B94: /* 190474 80261B94 8FBF0014 */ lw $ra, 0x14($sp) /* 190478 80261B98 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_18F340/func_80261DF4.s b/asm/nonmatchings/code_18F340/func_80261DF4.s index 37d4676fc0..9b6856609c 100644 --- a/asm/nonmatchings/code_18F340/func_80261DF4.s +++ b/asm/nonmatchings/code_18F340/func_80261DF4.s @@ -24,27 +24,27 @@ glabel func_80261DF4 /* 19071C 80261E3C 10600009 */ beqz $v1, .L80261E64 /* 190720 80261E40 0000102D */ daddu $v0, $zero, $zero /* 190724 80261E44 080987E8 */ j .L80261FA0 -/* 190728 80261E48 00000000 */ nop +/* 190728 80261E48 00000000 */ nop .L80261E4C: /* 19072C 80261E4C 10620033 */ beq $v1, $v0, .L80261F1C /* 190730 80261E50 24020003 */ addiu $v0, $zero, 3 /* 190734 80261E54 10620049 */ beq $v1, $v0, .L80261F7C /* 190738 80261E58 0000102D */ daddu $v0, $zero, $zero /* 19073C 80261E5C 080987E8 */ j .L80261FA0 -/* 190740 80261E60 00000000 */ nop +/* 190740 80261E60 00000000 */ nop .L80261E64: /* 190744 80261E64 8E220070 */ lw $v0, 0x70($s1) /* 190748 80261E68 2442FFFF */ addiu $v0, $v0, -1 /* 19074C 80261E6C AE220070 */ sw $v0, 0x70($s1) /* 190750 80261E70 C480000C */ lwc1 $f0, 0xc($a0) /* 190754 80261E74 44821000 */ mtc1 $v0, $f2 -/* 190758 80261E78 00000000 */ nop +/* 190758 80261E78 00000000 */ nop /* 19075C 80261E7C 468010A0 */ cvt.s.w $f2, $f2 /* 190760 80261E80 46020000 */ add.s $f0, $f0, $f2 /* 190764 80261E84 44801000 */ mtc1 $zero, $f2 -/* 190768 80261E88 00000000 */ nop +/* 190768 80261E88 00000000 */ nop /* 19076C 80261E8C 4602003C */ c.lt.s $f0, $f2 -/* 190770 80261E90 00000000 */ nop +/* 190770 80261E90 00000000 */ nop /* 190774 80261E94 45000041 */ bc1f .L80261F9C /* 190778 80261E98 E480000C */ swc1 $f0, 0xc($a0) /* 19077C 80261E9C 24020008 */ addiu $v0, $zero, 8 @@ -58,7 +58,7 @@ glabel func_80261DF4 /* 190798 80261EB8 AE220070 */ sw $v0, 0x70($s1) /* 19079C 80261EBC C480000C */ lwc1 $f0, 0xc($a0) /* 1907A0 80261EC0 44821000 */ mtc1 $v0, $f2 -/* 1907A4 80261EC4 00000000 */ nop +/* 1907A4 80261EC4 00000000 */ nop /* 1907A8 80261EC8 468010A0 */ cvt.s.w $f2, $f2 /* 1907AC 80261ECC 46020000 */ add.s $f0, $f0, $f2 /* 1907B0 80261ED0 44802000 */ mtc1 $zero, $f4 @@ -86,7 +86,7 @@ glabel func_80261DF4 /* 190804 80261F24 AE220070 */ sw $v0, 0x70($s1) /* 190808 80261F28 C480000C */ lwc1 $f0, 0xc($a0) /* 19080C 80261F2C 44821000 */ mtc1 $v0, $f2 -/* 190810 80261F30 00000000 */ nop +/* 190810 80261F30 00000000 */ nop /* 190814 80261F34 468010A0 */ cvt.s.w $f2, $f2 /* 190818 80261F38 46020000 */ add.s $f0, $f0, $f2 /* 19081C 80261F3C 44802000 */ mtc1 $zero, $f4 diff --git a/asm/nonmatchings/code_18F340/func_80261FB4.s b/asm/nonmatchings/code_18F340/func_80261FB4.s index b02f50a857..a220471ccc 100644 --- a/asm/nonmatchings/code_18F340/func_80261FB4.s +++ b/asm/nonmatchings/code_18F340/func_80261FB4.s @@ -26,7 +26,7 @@ glabel func_80261FB4 /* 1908E4 80262004 10620032 */ beq $v1, $v0, .L802620D0 /* 1908E8 80262008 0000102D */ daddu $v0, $zero, $zero /* 1908EC 8026200C 08098837 */ j .L802620DC -/* 1908F0 80262010 00000000 */ nop +/* 1908F0 80262010 00000000 */ nop .L80262014: /* 1908F4 80262014 C4880144 */ lwc1 $f8, 0x144($a0) /* 1908F8 80262018 C62A0008 */ lwc1 $f10, 8($s1) @@ -38,7 +38,7 @@ glabel func_80261FB4 /* 190910 80262030 460C2100 */ add.s $f4, $f4, $f12 /* 190914 80262034 3C0140A0 */ lui $at, 0x40a0 /* 190918 80262038 4481A000 */ mtc1 $at, $f20 -/* 19091C 8026203C 00000000 */ nop +/* 19091C 8026203C 00000000 */ nop /* 190920 80262040 46141081 */ sub.s $f2, $f2, $f20 /* 190924 80262044 C620000C */ lwc1 $f0, 0xc($s1) /* 190928 80262048 46002101 */ sub.s $f4, $f4, $f0 diff --git a/asm/nonmatchings/code_18F340/func_802620F8.s b/asm/nonmatchings/code_18F340/func_802620F8.s index d80e049ba8..cdfd2ac099 100644 --- a/asm/nonmatchings/code_18F340/func_802620F8.s +++ b/asm/nonmatchings/code_18F340/func_802620F8.s @@ -16,4 +16,4 @@ glabel func_802620F8 /* 190A00 80262120 AC620000 */ sw $v0, ($v1) /* 190A04 80262124 03E00008 */ jr $ra /* 190A08 80262128 0000102D */ daddu $v0, $zero, $zero -/* 190A0C 8026212C 00000000 */ nop +/* 190A0C 8026212C 00000000 */ nop diff --git a/asm/nonmatchings/code_18F340/func_80262130.s b/asm/nonmatchings/code_18F340/func_80262130.s index 319986f688..08fe887885 100644 --- a/asm/nonmatchings/code_18F340/func_80262130.s +++ b/asm/nonmatchings/code_18F340/func_80262130.s @@ -31,9 +31,9 @@ glabel func_80262130 /* 190A78 80262198 24020001 */ addiu $v0, $zero, 1 /* 190A7C 8026219C C7A0002C */ lwc1 $f0, 0x2c($sp) /* 190A80 802621A0 4614003E */ c.le.s $f0, $f20 -/* 190A84 802621A4 00000000 */ nop +/* 190A84 802621A4 00000000 */ nop /* 190A88 802621A8 4500000E */ bc1f .L802621E4 -/* 190A8C 802621AC 00000000 */ nop +/* 190A8C 802621AC 00000000 */ nop /* 190A90 802621B0 3C118011 */ lui $s1, %hi(D_8010C98C) /* 190A94 802621B4 2631C98C */ addiu $s1, $s1, %lo(D_8010C98C) /* 190A98 802621B8 0C016F6A */ jal get_collider_type_by_id diff --git a/asm/nonmatchings/code_18F340/func_8026220C.s b/asm/nonmatchings/code_18F340/func_8026220C.s index dc46912086..ea38780daf 100644 --- a/asm/nonmatchings/code_18F340/func_8026220C.s +++ b/asm/nonmatchings/code_18F340/func_8026220C.s @@ -4,15 +4,15 @@ glabel func_8026220C /* 190AEC 8026220C 3C0142C8 */ lui $at, 0x42c8 /* 190AF0 80262210 44810000 */ mtc1 $at, $f0 -/* 190AF4 80262214 00000000 */ nop +/* 190AF4 80262214 00000000 */ nop /* 190AF8 80262218 460E003C */ c.lt.s $f0, $f14 -/* 190AFC 8026221C 00000000 */ nop +/* 190AFC 8026221C 00000000 */ nop /* 190B00 80262220 45000002 */ bc1f .L8026222C /* 190B04 80262224 0000102D */ daddu $v0, $zero, $zero /* 190B08 80262228 2402001C */ addiu $v0, $zero, 0x1c .L8026222C: /* 190B0C 8026222C 03E00008 */ jr $ra -/* 190B10 80262230 00000000 */ nop -/* 190B14 80262234 00000000 */ nop -/* 190B18 80262238 00000000 */ nop -/* 190B1C 8026223C 00000000 */ nop +/* 190B10 80262230 00000000 */ nop +/* 190B14 80262234 00000000 */ nop +/* 190B18 80262238 00000000 */ nop +/* 190B1C 8026223C 00000000 */ nop diff --git a/asm/nonmatchings/code_190B20/add_xz_vec3f.s b/asm/nonmatchings/code_190B20/add_xz_vec3f.s index dd324affe9..62c2b49eae 100644 --- a/asm/nonmatchings/code_190B20/add_xz_vec3f.s +++ b/asm/nonmatchings/code_190B20/add_xz_vec3f.s @@ -11,7 +11,7 @@ glabel add_xz_vec3f /* 192A20 80264140 44862000 */ mtc1 $a2, $f4 /* 192A24 80264144 F7B40018 */ sdc1 $f20, 0x18($sp) /* 192A28 80264148 46002502 */ mul.s $f20, $f4, $f0 -/* 192A2C 8026414C 00000000 */ nop +/* 192A2C 8026414C 00000000 */ nop /* 192A30 80264150 AFB00010 */ sw $s0, 0x10($sp) /* 192A34 80264154 3C0143B4 */ lui $at, 0x43b4 /* 192A38 80264158 44810000 */ mtc1 $at, $f0 @@ -24,10 +24,10 @@ glabel add_xz_vec3f /* 192A54 80264174 0C00A874 */ jal cos_rad /* 192A58 80264178 46000506 */ mov.s $f20, $f0 /* 192A5C 8026417C 4614B502 */ mul.s $f20, $f22, $f20 -/* 192A60 80264180 00000000 */ nop +/* 192A60 80264180 00000000 */ nop /* 192A64 80264184 4600B587 */ neg.s $f22, $f22 /* 192A68 80264188 4600B582 */ mul.s $f22, $f22, $f0 -/* 192A6C 8026418C 00000000 */ nop +/* 192A6C 8026418C 00000000 */ nop /* 192A70 80264190 C6020000 */ lwc1 $f2, ($s0) /* 192A74 80264194 46141080 */ add.s $f2, $f2, $f20 /* 192A78 80264198 C6000008 */ lwc1 $f0, 8($s0) diff --git a/asm/nonmatchings/code_190B20/add_xz_vec3f_copy1.s b/asm/nonmatchings/code_190B20/add_xz_vec3f_copy1.s index 9d7c052afe..8324d13531 100644 --- a/asm/nonmatchings/code_190B20/add_xz_vec3f_copy1.s +++ b/asm/nonmatchings/code_190B20/add_xz_vec3f_copy1.s @@ -11,7 +11,7 @@ glabel add_xz_vec3f_copy1 /* 192AB8 802641D8 44862000 */ mtc1 $a2, $f4 /* 192ABC 802641DC F7B40018 */ sdc1 $f20, 0x18($sp) /* 192AC0 802641E0 46002502 */ mul.s $f20, $f4, $f0 -/* 192AC4 802641E4 00000000 */ nop +/* 192AC4 802641E4 00000000 */ nop /* 192AC8 802641E8 AFB00010 */ sw $s0, 0x10($sp) /* 192ACC 802641EC 3C0143B4 */ lui $at, 0x43b4 /* 192AD0 802641F0 44810000 */ mtc1 $at, $f0 @@ -24,10 +24,10 @@ glabel add_xz_vec3f_copy1 /* 192AEC 8026420C 0C00A874 */ jal cos_rad /* 192AF0 80264210 46000506 */ mov.s $f20, $f0 /* 192AF4 80264214 4614B502 */ mul.s $f20, $f22, $f20 -/* 192AF8 80264218 00000000 */ nop +/* 192AF8 80264218 00000000 */ nop /* 192AFC 8026421C 4600B587 */ neg.s $f22, $f22 /* 192B00 80264220 4600B582 */ mul.s $f22, $f22, $f0 -/* 192B04 80264224 00000000 */ nop +/* 192B04 80264224 00000000 */ nop /* 192B08 80264228 C6020000 */ lwc1 $f2, ($s0) /* 192B0C 8026422C 46141080 */ add.s $f2, $f2, $f20 /* 192B10 80264230 C6000008 */ lwc1 $f0, 8($s0) diff --git a/asm/nonmatchings/code_190B20/add_xz_vec3f_copy2.s b/asm/nonmatchings/code_190B20/add_xz_vec3f_copy2.s index 5d8f970db3..a906b1f394 100644 --- a/asm/nonmatchings/code_190B20/add_xz_vec3f_copy2.s +++ b/asm/nonmatchings/code_190B20/add_xz_vec3f_copy2.s @@ -11,7 +11,7 @@ glabel add_xz_vec3f_copy2 /* 192B50 80264270 44862000 */ mtc1 $a2, $f4 /* 192B54 80264274 F7B40018 */ sdc1 $f20, 0x18($sp) /* 192B58 80264278 46002502 */ mul.s $f20, $f4, $f0 -/* 192B5C 8026427C 00000000 */ nop +/* 192B5C 8026427C 00000000 */ nop /* 192B60 80264280 AFB00010 */ sw $s0, 0x10($sp) /* 192B64 80264284 3C0143B4 */ lui $at, 0x43b4 /* 192B68 80264288 44810000 */ mtc1 $at, $f0 @@ -24,10 +24,10 @@ glabel add_xz_vec3f_copy2 /* 192B84 802642A4 0C00A874 */ jal cos_rad /* 192B88 802642A8 46000506 */ mov.s $f20, $f0 /* 192B8C 802642AC 4614B502 */ mul.s $f20, $f22, $f20 -/* 192B90 802642B0 00000000 */ nop +/* 192B90 802642B0 00000000 */ nop /* 192B94 802642B4 4600B587 */ neg.s $f22, $f22 /* 192B98 802642B8 4600B582 */ mul.s $f22, $f22, $f0 -/* 192B9C 802642BC 00000000 */ nop +/* 192B9C 802642BC 00000000 */ nop /* 192BA0 802642C0 C6020000 */ lwc1 $f2, ($s0) /* 192BA4 802642C4 46141080 */ add.s $f2, $f2, $f20 /* 192BA8 802642C8 C6000008 */ lwc1 $f0, 8($s0) diff --git a/asm/nonmatchings/code_190B20/create_actor.s b/asm/nonmatchings/code_190B20/create_actor.s index 5b177efc93..26fb60fe08 100644 --- a/asm/nonmatchings/code_190B20/create_actor.s +++ b/asm/nonmatchings/code_190B20/create_actor.s @@ -31,15 +31,15 @@ glabel create_actor /* 193CEC 8026540C 00431021 */ addu $v0, $v0, $v1 /* 193CF0 80265410 84430000 */ lh $v1, ($v0) /* 193CF4 80265414 4483C000 */ mtc1 $v1, $f24 -/* 193CF8 80265418 00000000 */ nop +/* 193CF8 80265418 00000000 */ nop /* 193CFC 8026541C 4680C620 */ cvt.s.w $f24, $f24 /* 193D00 80265420 84430002 */ lh $v1, 2($v0) /* 193D04 80265424 84420004 */ lh $v0, 4($v0) /* 193D08 80265428 4483A000 */ mtc1 $v1, $f20 -/* 193D0C 8026542C 00000000 */ nop +/* 193D0C 8026542C 00000000 */ nop /* 193D10 80265430 4680A520 */ cvt.s.w $f20, $f20 /* 193D14 80265434 4482B000 */ mtc1 $v0, $f22 -/* 193D18 80265438 00000000 */ nop +/* 193D18 80265438 00000000 */ nop /* 193D1C 8026543C 08099517 */ j .L8026545C /* 193D20 80265440 4680B5A0 */ cvt.s.w $f22, $f22 .L80265444: @@ -56,7 +56,7 @@ glabel create_actor .L80265468: /* 193D48 80265468 8C6200E0 */ lw $v0, 0xe0($v1) /* 193D4C 8026546C 10400005 */ beqz $v0, .L80265484 -/* 193D50 80265470 00000000 */ nop +/* 193D50 80265470 00000000 */ nop /* 193D54 80265474 26100001 */ addiu $s0, $s0, 1 /* 193D58 80265478 2A020018 */ slti $v0, $s0, 0x18 /* 193D5C 8026547C 1440FFFA */ bnez $v0, .L80265468 @@ -71,7 +71,7 @@ glabel create_actor /* 193D7C 8026549C AC6200E0 */ sw $v0, 0xe0($v1) .L802654A0: /* 193D80 802654A0 08099528 */ j .L802654A0 -/* 193D84 802654A4 00000000 */ nop +/* 193D84 802654A4 00000000 */ nop .L802654A8: /* 193D88 802654A8 92430093 */ lbu $v1, 0x93($s2) /* 193D8C 802654AC 3C013F80 */ lui $at, 0x3f80 @@ -142,22 +142,22 @@ glabel create_actor /* 193E90 802655B0 82820022 */ lb $v0, 0x22($s4) /* 193E94 802655B4 4600C006 */ mov.s $f0, $f24 /* 193E98 802655B8 44821000 */ mtc1 $v0, $f2 -/* 193E9C 802655BC 00000000 */ nop +/* 193E9C 802655BC 00000000 */ nop /* 193EA0 802655C0 468010A0 */ cvt.s.w $f2, $f2 /* 193EA4 802655C4 46020000 */ add.s $f0, $f0, $f2 /* 193EA8 802655C8 4600010D */ trunc.w.s $f4, $f0 /* 193EAC 802655CC 44022000 */ mfc1 $v0, $f4 -/* 193EB0 802655D0 00000000 */ nop +/* 193EB0 802655D0 00000000 */ nop /* 193EB4 802655D4 A6220156 */ sh $v0, 0x156($s1) /* 193EB8 802655D8 82820023 */ lb $v0, 0x23($s4) /* 193EBC 802655DC 4600A006 */ mov.s $f0, $f20 /* 193EC0 802655E0 44821000 */ mtc1 $v0, $f2 -/* 193EC4 802655E4 00000000 */ nop +/* 193EC4 802655E4 00000000 */ nop /* 193EC8 802655E8 468010A0 */ cvt.s.w $f2, $f2 /* 193ECC 802655EC 46020000 */ add.s $f0, $f0, $f2 /* 193ED0 802655F0 4600010D */ trunc.w.s $f4, $f0 /* 193ED4 802655F4 44022000 */ mfc1 $v0, $f4 -/* 193ED8 802655F8 00000000 */ nop +/* 193ED8 802655F8 00000000 */ nop /* 193EDC 802655FC A6220158 */ sh $v0, 0x158($s1) /* 193EE0 80265600 4600B006 */ mov.s $f0, $f22 /* 193EE4 80265604 8E220000 */ lw $v0, ($s1) @@ -169,17 +169,17 @@ glabel create_actor /* 193EFC 8026561C 92220191 */ lbu $v0, 0x191($s1) /* 193F00 80265620 4600A006 */ mov.s $f0, $f20 /* 193F04 80265624 44821000 */ mtc1 $v0, $f2 -/* 193F08 80265628 00000000 */ nop +/* 193F08 80265628 00000000 */ nop /* 193F0C 8026562C 468010A0 */ cvt.s.w $f2, $f2 /* 193F10 80265630 82820023 */ lb $v0, 0x23($s4) /* 193F14 80265634 46020001 */ sub.s $f0, $f0, $f2 /* 193F18 80265638 44821000 */ mtc1 $v0, $f2 -/* 193F1C 8026563C 00000000 */ nop +/* 193F1C 8026563C 00000000 */ nop /* 193F20 80265640 468010A0 */ cvt.s.w $f2, $f2 /* 193F24 80265644 46020001 */ sub.s $f0, $f0, $f2 /* 193F28 80265648 4600010D */ trunc.w.s $f4, $f0 /* 193F2C 8026564C 44022000 */ mfc1 $v0, $f4 -/* 193F30 80265650 00000000 */ nop +/* 193F30 80265650 00000000 */ nop /* 193F34 80265654 A6220158 */ sh $v0, 0x158($s1) .L80265658: /* 193F38 80265658 8E820014 */ lw $v0, 0x14($s4) @@ -284,7 +284,7 @@ glabel create_actor /* 1940C0 802657E0 AE3001F4 */ sw $s0, 0x1f4($s1) .L802657E4: /* 1940C4 802657E4 080995F9 */ j .L802657E4 -/* 1940C8 802657E8 00000000 */ nop +/* 1940C8 802657E8 00000000 */ nop .L802657EC: /* 1940CC 802657EC 1AC00106 */ blez $s6, .L80265C08 /* 1940D0 802657F0 0000982D */ daddu $s3, $zero, $zero @@ -309,7 +309,7 @@ glabel create_actor /* 194118 80265838 00021400 */ sll $v0, $v0, 0x10 /* 19411C 8026583C 00021403 */ sra $v0, $v0, 0x10 /* 194120 80265840 44820000 */ mtc1 $v0, $f0 -/* 194124 80265844 00000000 */ nop +/* 194124 80265844 00000000 */ nop /* 194128 80265848 46800020 */ cvt.s.w $f0, $f0 /* 19412C 8026584C E6000020 */ swc1 $f0, 0x20($s0) /* 194130 80265850 90620006 */ lbu $v0, 6($v1) @@ -319,7 +319,7 @@ glabel create_actor /* 194140 80265860 00021400 */ sll $v0, $v0, 0x10 /* 194144 80265864 00021403 */ sra $v0, $v0, 0x10 /* 194148 80265868 44820000 */ mtc1 $v0, $f0 -/* 19414C 8026586C 00000000 */ nop +/* 19414C 8026586C 00000000 */ nop /* 194150 80265870 46800020 */ cvt.s.w $f0, $f0 /* 194154 80265874 E6000024 */ swc1 $f0, 0x24($s0) /* 194158 80265878 90620007 */ lbu $v0, 7($v1) @@ -332,7 +332,7 @@ glabel create_actor /* 194174 80265894 00021400 */ sll $v0, $v0, 0x10 /* 194178 80265898 00021403 */ sra $v0, $v0, 0x10 /* 19417C 8026589C 44820000 */ mtc1 $v0, $f0 -/* 194180 802658A0 00000000 */ nop +/* 194180 802658A0 00000000 */ nop /* 194184 802658A4 46800020 */ cvt.s.w $f0, $f0 /* 194188 802658A8 E6000028 */ swc1 $f0, 0x28($s0) /* 19418C 802658AC C6200144 */ lwc1 $f0, 0x144($s1) @@ -456,7 +456,7 @@ glabel create_actor /* 194360 80265A80 8E020000 */ lw $v0, ($s0) /* 194364 80265A84 30420002 */ andi $v0, $v0, 2 /* 194368 80265A88 14400030 */ bnez $v0, .L80265B4C -/* 19436C 80265A8C 00000000 */ nop +/* 19436C 80265A8C 00000000 */ nop /* 194370 80265A90 0C00AB39 */ jal heap_malloc /* 194374 80265A94 240408E8 */ addiu $a0, $zero, 0x8e8 /* 194378 80265A98 0040202D */ daddu $a0, $v0, $zero @@ -464,7 +464,7 @@ glabel create_actor /* 194380 80265AA0 AE0200C0 */ sw $v0, 0xc0($s0) .L80265AA4: /* 194384 80265AA4 080996A9 */ j .L80265AA4 -/* 194388 80265AA8 00000000 */ nop +/* 194388 80265AA8 00000000 */ nop .L80265AAC: /* 19438C 80265AAC 0000282D */ daddu $a1, $zero, $zero /* 194390 80265AB0 0080182D */ daddu $v1, $a0, $zero @@ -478,18 +478,18 @@ glabel create_actor /* 1943AC 80265ACC C6200144 */ lwc1 $f0, 0x144($s1) /* 1943B0 80265AD0 4600010D */ trunc.w.s $f4, $f0 /* 1943B4 80265AD4 44022000 */ mfc1 $v0, $f4 -/* 1943B8 80265AD8 00000000 */ nop +/* 1943B8 80265AD8 00000000 */ nop /* 1943BC 80265ADC A46207FC */ sh $v0, 0x7fc($v1) /* 1943C0 80265AE0 C6200148 */ lwc1 $f0, 0x148($s1) /* 1943C4 80265AE4 4600010D */ trunc.w.s $f4, $f0 /* 1943C8 80265AE8 44022000 */ mfc1 $v0, $f4 -/* 1943CC 80265AEC 00000000 */ nop +/* 1943CC 80265AEC 00000000 */ nop /* 1943D0 80265AF0 A462081C */ sh $v0, 0x81c($v1) /* 1943D4 80265AF4 C620014C */ lwc1 $f0, 0x14c($s1) /* 1943D8 80265AF8 24A50001 */ addiu $a1, $a1, 1 /* 1943DC 80265AFC 4600010D */ trunc.w.s $f4, $f0 /* 1943E0 80265B00 44022000 */ mfc1 $v0, $f4 -/* 1943E4 80265B04 00000000 */ nop +/* 1943E4 80265B04 00000000 */ nop /* 1943E8 80265B08 A462083C */ sh $v0, 0x83c($v1) /* 1943EC 80265B0C 28A20010 */ slti $v0, $a1, 0x10 /* 1943F0 80265B10 1440FFEE */ bnez $v0, .L80265ACC @@ -511,19 +511,19 @@ glabel create_actor .L80265B4C: /* 19442C 80265B4C 8E020000 */ lw $v0, ($s0) /* 194430 80265B50 04400007 */ bltz $v0, .L80265B70 -/* 194434 80265B54 00000000 */ nop +/* 194434 80265B54 00000000 */ nop /* 194438 80265B58 0C00AB39 */ jal heap_malloc /* 19443C 80265B5C 2404008C */ addiu $a0, $zero, 0x8c /* 194440 80265B60 14400003 */ bnez $v0, .L80265B70 /* 194444 80265B64 AE020010 */ sw $v0, 0x10($s0) .L80265B68: /* 194448 80265B68 080996DA */ j .L80265B68 -/* 19444C 80265B6C 00000000 */ nop +/* 19444C 80265B6C 00000000 */ nop .L80265B70: /* 194450 80265B70 8E220000 */ lw $v0, ($s1) /* 194454 80265B74 30424000 */ andi $v0, $v0, 0x4000 /* 194458 80265B78 10400004 */ beqz $v0, .L80265B8C -/* 19445C 80265B7C 00000000 */ nop +/* 19445C 80265B7C 00000000 */ nop /* 194460 80265B80 8E020000 */ lw $v0, ($s0) /* 194464 80265B84 34424000 */ ori $v0, $v0, 0x4000 /* 194468 80265B88 AE020000 */ sw $v0, ($s0) @@ -556,7 +556,7 @@ glabel create_actor /* 1944CC 80265BEC AE00000C */ sw $zero, 0xc($s0) .L80265BF0: /* 1944D0 80265BF0 080996FC */ j .L80265BF0 -/* 1944D4 80265BF4 00000000 */ nop +/* 1944D4 80265BF4 00000000 */ nop .L80265BF8: /* 1944D8 80265BF8 26730001 */ addiu $s3, $s3, 1 /* 1944DC 80265BFC 0276102A */ slt $v0, $s3, $s6 @@ -594,7 +594,7 @@ glabel create_actor /* 194558 80265C78 44811800 */ mtc1 $at, $f3 /* 19455C 80265C7C 44801000 */ mtc1 $zero, $f2 /* 194560 80265C80 44820000 */ mtc1 $v0, $f0 -/* 194564 80265C84 00000000 */ nop +/* 194564 80265C84 00000000 */ nop /* 194568 80265C88 46800021 */ cvt.d.w $f0, $f0 /* 19456C 80265C8C 46220003 */ div.d $f0, $f0, $f2 /* 194570 80265C90 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/code_190B20/create_target_list.s b/asm/nonmatchings/code_190B20/create_target_list.s index b3534e382c..f2720f5ad9 100644 --- a/asm/nonmatchings/code_190B20/create_target_list.s +++ b/asm/nonmatchings/code_190B20/create_target_list.s @@ -37,39 +37,39 @@ glabel create_target_list /* 190B9C 802622BC 3C01802A */ lui $at, %hi(D_8029D5A0) /* 190BA0 802622C0 D420D5A0 */ ldc1 $f0, %lo(D_8029D5A0)($at) /* 190BA4 802622C4 44821000 */ mtc1 $v0, $f2 -/* 190BA8 802622C8 00000000 */ nop +/* 190BA8 802622C8 00000000 */ nop /* 190BAC 802622CC 468010A1 */ cvt.d.w $f2, $f2 /* 190BB0 802622D0 46201082 */ mul.d $f2, $f2, $f0 -/* 190BB4 802622D4 00000000 */ nop +/* 190BB4 802622D4 00000000 */ nop /* 190BB8 802622D8 C4600188 */ lwc1 $f0, 0x188($v1) /* 190BBC 802622DC 46000021 */ cvt.d.s $f0, $f0 /* 190BC0 802622E0 46201082 */ mul.d $f2, $f2, $f0 -/* 190BC4 802622E4 00000000 */ nop +/* 190BC4 802622E4 00000000 */ nop /* 190BC8 802622E8 C4600144 */ lwc1 $f0, 0x144($v1) /* 190BCC 802622EC 46000021 */ cvt.d.s $f0, $f0 /* 190BD0 802622F0 46220000 */ add.d $f0, $f0, $f2 /* 190BD4 802622F4 4620048D */ trunc.w.d $f18, $f0 /* 190BD8 802622F8 44029000 */ mfc1 $v0, $f18 -/* 190BDC 802622FC 00000000 */ nop +/* 190BDC 802622FC 00000000 */ nop /* 190BE0 80262300 A5620230 */ sh $v0, 0x230($t3) /* 190BE4 80262304 90620191 */ lbu $v0, 0x191($v1) /* 190BE8 80262308 3C01802A */ lui $at, %hi(D_8029D5A8) /* 190BEC 8026230C D420D5A8 */ ldc1 $f0, %lo(D_8029D5A8)($at) /* 190BF0 80262310 44821000 */ mtc1 $v0, $f2 -/* 190BF4 80262314 00000000 */ nop +/* 190BF4 80262314 00000000 */ nop /* 190BF8 80262318 468010A1 */ cvt.d.w $f2, $f2 /* 190BFC 8026231C 46201082 */ mul.d $f2, $f2, $f0 -/* 190C00 80262320 00000000 */ nop +/* 190C00 80262320 00000000 */ nop /* 190C04 80262324 C4600188 */ lwc1 $f0, 0x188($v1) /* 190C08 80262328 46000021 */ cvt.d.s $f0, $f0 /* 190C0C 8026232C 46201082 */ mul.d $f2, $f2, $f0 -/* 190C10 80262330 00000000 */ nop +/* 190C10 80262330 00000000 */ nop /* 190C14 80262334 C4600148 */ lwc1 $f0, 0x148($v1) /* 190C18 80262338 46000021 */ cvt.d.s $f0, $f0 /* 190C1C 8026233C 46220000 */ add.d $f0, $f0, $f2 /* 190C20 80262340 4620048D */ trunc.w.d $f18, $f0 /* 190C24 80262344 44029000 */ mfc1 $v0, $f18 -/* 190C28 80262348 00000000 */ nop +/* 190C28 80262348 00000000 */ nop /* 190C2C 8026234C A5620232 */ sh $v0, 0x232($t3) /* 190C30 80262350 080988FD */ j .L802623F4 /* 190C34 80262354 C460014C */ lwc1 $f0, 0x14c($v1) @@ -78,45 +78,45 @@ glabel create_target_list /* 190C3C 8026235C 3C01802A */ lui $at, %hi(D_8029D5B0) /* 190C40 80262360 D420D5B0 */ ldc1 $f0, %lo(D_8029D5B0)($at) /* 190C44 80262364 44821000 */ mtc1 $v0, $f2 -/* 190C48 80262368 00000000 */ nop +/* 190C48 80262368 00000000 */ nop /* 190C4C 8026236C 468010A1 */ cvt.d.w $f2, $f2 /* 190C50 80262370 46201082 */ mul.d $f2, $f2, $f0 -/* 190C54 80262374 00000000 */ nop +/* 190C54 80262374 00000000 */ nop /* 190C58 80262378 C4600188 */ lwc1 $f0, 0x188($v1) /* 190C5C 8026237C 46000021 */ cvt.d.s $f0, $f0 /* 190C60 80262380 46201082 */ mul.d $f2, $f2, $f0 -/* 190C64 80262384 00000000 */ nop +/* 190C64 80262384 00000000 */ nop /* 190C68 80262388 C4600138 */ lwc1 $f0, 0x138($v1) /* 190C6C 8026238C 46000021 */ cvt.d.s $f0, $f0 /* 190C70 80262390 46220000 */ add.d $f0, $f0, $f2 /* 190C74 80262394 4620048D */ trunc.w.d $f18, $f0 /* 190C78 80262398 44029000 */ mfc1 $v0, $f18 -/* 190C7C 8026239C 00000000 */ nop +/* 190C7C 8026239C 00000000 */ nop /* 190C80 802623A0 A5620230 */ sh $v0, 0x230($t3) /* 190C84 802623A4 90620191 */ lbu $v0, 0x191($v1) /* 190C88 802623A8 3C01802A */ lui $at, %hi(D_8029D5B8) /* 190C8C 802623AC D420D5B8 */ ldc1 $f0, %lo(D_8029D5B8)($at) /* 190C90 802623B0 44821000 */ mtc1 $v0, $f2 -/* 190C94 802623B4 00000000 */ nop +/* 190C94 802623B4 00000000 */ nop /* 190C98 802623B8 468010A1 */ cvt.d.w $f2, $f2 /* 190C9C 802623BC 46201082 */ mul.d $f2, $f2, $f0 -/* 190CA0 802623C0 00000000 */ nop +/* 190CA0 802623C0 00000000 */ nop /* 190CA4 802623C4 C4600188 */ lwc1 $f0, 0x188($v1) /* 190CA8 802623C8 46000021 */ cvt.d.s $f0, $f0 /* 190CAC 802623CC 46201082 */ mul.d $f2, $f2, $f0 -/* 190CB0 802623D0 00000000 */ nop +/* 190CB0 802623D0 00000000 */ nop /* 190CB4 802623D4 C460013C */ lwc1 $f0, 0x13c($v1) /* 190CB8 802623D8 46000021 */ cvt.d.s $f0, $f0 /* 190CBC 802623DC 46220000 */ add.d $f0, $f0, $f2 /* 190CC0 802623E0 4620048D */ trunc.w.d $f18, $f0 /* 190CC4 802623E4 44029000 */ mfc1 $v0, $f18 -/* 190CC8 802623E8 00000000 */ nop +/* 190CC8 802623E8 00000000 */ nop /* 190CCC 802623EC A5620232 */ sh $v0, 0x232($t3) /* 190CD0 802623F0 C4600140 */ lwc1 $f0, 0x140($v1) .L802623F4: /* 190CD4 802623F4 4600048D */ trunc.w.s $f18, $f0 /* 190CD8 802623F8 44029000 */ mfc1 $v0, $f18 -/* 190CDC 802623FC 00000000 */ nop +/* 190CDC 802623FC 00000000 */ nop /* 190CE0 80262400 A5620234 */ sh $v0, 0x234($t3) /* 190CE4 80262404 2402FF9C */ addiu $v0, $zero, -0x64 /* 190CE8 80262408 A2E20010 */ sb $v0, 0x10($s7) @@ -137,39 +137,39 @@ glabel create_target_list /* 190D20 80262440 3C01802A */ lui $at, %hi(D_8029D5C0) /* 190D24 80262444 D420D5C0 */ ldc1 $f0, %lo(D_8029D5C0)($at) /* 190D28 80262448 44821000 */ mtc1 $v0, $f2 -/* 190D2C 8026244C 00000000 */ nop +/* 190D2C 8026244C 00000000 */ nop /* 190D30 80262450 468010A1 */ cvt.d.w $f2, $f2 /* 190D34 80262454 46201082 */ mul.d $f2, $f2, $f0 -/* 190D38 80262458 00000000 */ nop +/* 190D38 80262458 00000000 */ nop /* 190D3C 8026245C C4800188 */ lwc1 $f0, 0x188($a0) /* 190D40 80262460 46000021 */ cvt.d.s $f0, $f0 /* 190D44 80262464 46201082 */ mul.d $f2, $f2, $f0 -/* 190D48 80262468 00000000 */ nop +/* 190D48 80262468 00000000 */ nop /* 190D4C 8026246C C4800144 */ lwc1 $f0, 0x144($a0) /* 190D50 80262470 46000021 */ cvt.d.s $f0, $f0 /* 190D54 80262474 46220000 */ add.d $f0, $f0, $f2 /* 190D58 80262478 4620048D */ trunc.w.d $f18, $f0 /* 190D5C 8026247C 44029000 */ mfc1 $v0, $f18 -/* 190D60 80262480 00000000 */ nop +/* 190D60 80262480 00000000 */ nop /* 190D64 80262484 A6E20004 */ sh $v0, 4($s7) /* 190D68 80262488 90820191 */ lbu $v0, 0x191($a0) /* 190D6C 8026248C 3C01802A */ lui $at, %hi(D_8029D5C8) /* 190D70 80262490 D420D5C8 */ ldc1 $f0, %lo(D_8029D5C8)($at) /* 190D74 80262494 44821000 */ mtc1 $v0, $f2 -/* 190D78 80262498 00000000 */ nop +/* 190D78 80262498 00000000 */ nop /* 190D7C 8026249C 468010A1 */ cvt.d.w $f2, $f2 /* 190D80 802624A0 46201082 */ mul.d $f2, $f2, $f0 -/* 190D84 802624A4 00000000 */ nop +/* 190D84 802624A4 00000000 */ nop /* 190D88 802624A8 C4800188 */ lwc1 $f0, 0x188($a0) /* 190D8C 802624AC 46000021 */ cvt.d.s $f0, $f0 /* 190D90 802624B0 46201082 */ mul.d $f2, $f2, $f0 -/* 190D94 802624B4 00000000 */ nop +/* 190D94 802624B4 00000000 */ nop /* 190D98 802624B8 C4800148 */ lwc1 $f0, 0x148($a0) /* 190D9C 802624BC 46000021 */ cvt.d.s $f0, $f0 /* 190DA0 802624C0 46220000 */ add.d $f0, $f0, $f2 /* 190DA4 802624C4 4620048D */ trunc.w.d $f18, $f0 /* 190DA8 802624C8 44029000 */ mfc1 $v0, $f18 -/* 190DAC 802624CC 00000000 */ nop +/* 190DAC 802624CC 00000000 */ nop /* 190DB0 802624D0 A6E20006 */ sh $v0, 6($s7) /* 190DB4 802624D4 0809895E */ j .L80262578 /* 190DB8 802624D8 C480014C */ lwc1 $f0, 0x14c($a0) @@ -178,45 +178,45 @@ glabel create_target_list /* 190DC0 802624E0 3C01802A */ lui $at, %hi(D_8029D5D0) /* 190DC4 802624E4 D420D5D0 */ ldc1 $f0, %lo(D_8029D5D0)($at) /* 190DC8 802624E8 44821000 */ mtc1 $v0, $f2 -/* 190DCC 802624EC 00000000 */ nop +/* 190DCC 802624EC 00000000 */ nop /* 190DD0 802624F0 468010A1 */ cvt.d.w $f2, $f2 /* 190DD4 802624F4 46201082 */ mul.d $f2, $f2, $f0 -/* 190DD8 802624F8 00000000 */ nop +/* 190DD8 802624F8 00000000 */ nop /* 190DDC 802624FC C4800188 */ lwc1 $f0, 0x188($a0) /* 190DE0 80262500 46000021 */ cvt.d.s $f0, $f0 /* 190DE4 80262504 46201082 */ mul.d $f2, $f2, $f0 -/* 190DE8 80262508 00000000 */ nop +/* 190DE8 80262508 00000000 */ nop /* 190DEC 8026250C C4800138 */ lwc1 $f0, 0x138($a0) /* 190DF0 80262510 46000021 */ cvt.d.s $f0, $f0 /* 190DF4 80262514 46220000 */ add.d $f0, $f0, $f2 /* 190DF8 80262518 4620048D */ trunc.w.d $f18, $f0 /* 190DFC 8026251C 44029000 */ mfc1 $v0, $f18 -/* 190E00 80262520 00000000 */ nop +/* 190E00 80262520 00000000 */ nop /* 190E04 80262524 A6E20004 */ sh $v0, 4($s7) /* 190E08 80262528 90820191 */ lbu $v0, 0x191($a0) /* 190E0C 8026252C 3C01802A */ lui $at, %hi(D_8029D5D8) /* 190E10 80262530 D420D5D8 */ ldc1 $f0, %lo(D_8029D5D8)($at) /* 190E14 80262534 44821000 */ mtc1 $v0, $f2 -/* 190E18 80262538 00000000 */ nop +/* 190E18 80262538 00000000 */ nop /* 190E1C 8026253C 468010A1 */ cvt.d.w $f2, $f2 /* 190E20 80262540 46201082 */ mul.d $f2, $f2, $f0 -/* 190E24 80262544 00000000 */ nop +/* 190E24 80262544 00000000 */ nop /* 190E28 80262548 C4800188 */ lwc1 $f0, 0x188($a0) /* 190E2C 8026254C 46000021 */ cvt.d.s $f0, $f0 /* 190E30 80262550 46201082 */ mul.d $f2, $f2, $f0 -/* 190E34 80262554 00000000 */ nop +/* 190E34 80262554 00000000 */ nop /* 190E38 80262558 C480013C */ lwc1 $f0, 0x13c($a0) /* 190E3C 8026255C 46000021 */ cvt.d.s $f0, $f0 /* 190E40 80262560 46220000 */ add.d $f0, $f0, $f2 /* 190E44 80262564 4620048D */ trunc.w.d $f18, $f0 /* 190E48 80262568 44029000 */ mfc1 $v0, $f18 -/* 190E4C 8026256C 00000000 */ nop +/* 190E4C 8026256C 00000000 */ nop /* 190E50 80262570 A6E20006 */ sh $v0, 6($s7) /* 190E54 80262574 C4800140 */ lwc1 $f0, 0x140($a0) .L80262578: /* 190E58 80262578 4600048D */ trunc.w.s $f18, $f0 /* 190E5C 8026257C 44029000 */ mfc1 $v0, $f18 -/* 190E60 80262580 00000000 */ nop +/* 190E60 80262580 00000000 */ nop /* 190E64 80262584 A6E20008 */ sh $v0, 8($s7) /* 190E68 80262588 2402FFCE */ addiu $v0, $zero, -0x32 /* 190E6C 8026258C A2E20010 */ sb $v0, 0x10($s7) @@ -252,9 +252,9 @@ glabel create_target_list /* 190ED8 802625F8 8E240008 */ lw $a0, 8($s1) /* 190EDC 802625FC 00621024 */ and $v0, $v1, $v0 /* 190EE0 80262600 14400036 */ bnez $v0, .L802626DC -/* 190EE4 80262604 00000000 */ nop +/* 190EE4 80262604 00000000 */ nop /* 190EE8 80262608 14A00005 */ bnez $a1, .L80262620 -/* 190EEC 8026260C 00000000 */ nop +/* 190EEC 8026260C 00000000 */ nop /* 190EF0 80262610 C6460144 */ lwc1 $f6, 0x144($s2) /* 190EF4 80262614 C6480148 */ lwc1 $f8, 0x148($s2) /* 190EF8 80262618 0809898B */ j .L8026262C @@ -267,34 +267,34 @@ glabel create_target_list /* 190F0C 8026262C 86220014 */ lh $v0, 0x14($s1) /* 190F10 80262630 C6440188 */ lwc1 $f4, 0x188($s2) /* 190F14 80262634 44820000 */ mtc1 $v0, $f0 -/* 190F18 80262638 00000000 */ nop +/* 190F18 80262638 00000000 */ nop /* 190F1C 8026263C 46800020 */ cvt.s.w $f0, $f0 /* 190F20 80262640 46040002 */ mul.s $f0, $f0, $f4 -/* 190F24 80262644 00000000 */ nop +/* 190F24 80262644 00000000 */ nop /* 190F28 80262648 8E420000 */ lw $v0, ($s2) /* 190F2C 8026264C 30430800 */ andi $v1, $v0, 0x800 /* 190F30 80262650 14600008 */ bnez $v1, .L80262674 /* 190F34 80262654 46003180 */ add.s $f6, $f6, $f0 /* 190F38 80262658 86220016 */ lh $v0, 0x16($s1) /* 190F3C 8026265C 44820000 */ mtc1 $v0, $f0 -/* 190F40 80262660 00000000 */ nop +/* 190F40 80262660 00000000 */ nop /* 190F44 80262664 46800020 */ cvt.s.w $f0, $f0 /* 190F48 80262668 46040002 */ mul.s $f0, $f0, $f4 -/* 190F4C 8026266C 00000000 */ nop +/* 190F4C 8026266C 00000000 */ nop /* 190F50 80262670 46004200 */ add.s $f8, $f8, $f0 .L80262674: /* 190F54 80262674 86220018 */ lh $v0, 0x18($s1) /* 190F58 80262678 44821000 */ mtc1 $v0, $f2 -/* 190F5C 8026267C 00000000 */ nop +/* 190F5C 8026267C 00000000 */ nop /* 190F60 80262680 468010A0 */ cvt.s.w $f2, $f2 /* 190F64 80262684 46041082 */ mul.s $f2, $f2, $f4 -/* 190F68 80262688 00000000 */ nop +/* 190F68 80262688 00000000 */ nop /* 190F6C 8026268C 8622006C */ lh $v0, 0x6c($s1) /* 190F70 80262690 44820000 */ mtc1 $v0, $f0 -/* 190F74 80262694 00000000 */ nop +/* 190F74 80262694 00000000 */ nop /* 190F78 80262698 46800020 */ cvt.s.w $f0, $f0 /* 190F7C 8026269C 46040002 */ mul.s $f0, $f0, $f4 -/* 190F80 802626A0 00000000 */ nop +/* 190F80 802626A0 00000000 */ nop /* 190F84 802626A4 46025280 */ add.s $f10, $f10, $f2 /* 190F88 802626A8 46003306 */ mov.s $f12, $f6 /* 190F8C 802626AC 46006180 */ add.s $f6, $f12, $f0 @@ -303,10 +303,10 @@ glabel create_target_list /* 190F98 802626B8 46105380 */ add.s $f14, $f10, $f16 /* 190F9C 802626BC 8622006E */ lh $v0, 0x6e($s1) /* 190FA0 802626C0 44820000 */ mtc1 $v0, $f0 -/* 190FA4 802626C4 00000000 */ nop +/* 190FA4 802626C4 00000000 */ nop /* 190FA8 802626C8 46800020 */ cvt.s.w $f0, $f0 /* 190FAC 802626CC 46040002 */ mul.s $f0, $f0, $f4 -/* 190FB0 802626D0 00000000 */ nop +/* 190FB0 802626D0 00000000 */ nop /* 190FB4 802626D4 080989C9 */ j .L80262724 /* 190FB8 802626D8 46001200 */ add.s $f8, $f2, $f0 .L802626DC: @@ -317,7 +317,7 @@ glabel create_target_list /* 190FCC 802626EC 46004086 */ mov.s $f2, $f8 /* 190FD0 802626F0 46105380 */ add.s $f14, $f10, $f16 /* 190FD4 802626F4 44820000 */ mtc1 $v0, $f0 -/* 190FD8 802626F8 00000000 */ nop +/* 190FD8 802626F8 00000000 */ nop /* 190FDC 802626FC 46800020 */ cvt.s.w $f0, $f0 /* 190FE0 80262700 8E420000 */ lw $v0, ($s2) /* 190FE4 80262704 30420800 */ andi $v0, $v0, 0x800 @@ -325,7 +325,7 @@ glabel create_target_list /* 190FEC 8026270C 46006180 */ add.s $f6, $f12, $f0 /* 190FF0 80262710 8622006E */ lh $v0, 0x6e($s1) /* 190FF4 80262714 44820000 */ mtc1 $v0, $f0 -/* 190FF8 80262718 00000000 */ nop +/* 190FF8 80262718 00000000 */ nop /* 190FFC 8026271C 46800020 */ cvt.s.w $f0, $f0 /* 191000 80262720 46001200 */ add.s $f8, $f2, $f0 .L80262724: @@ -334,15 +334,15 @@ glabel create_target_list /* 19100C 8026272C 90830004 */ lbu $v1, 4($a0) /* 191010 80262730 4600348D */ trunc.w.s $f18, $f6 /* 191014 80262734 44029000 */ mfc1 $v0, $f18 -/* 191018 80262738 00000000 */ nop +/* 191018 80262738 00000000 */ nop /* 19101C 8026273C A4C2FFF1 */ sh $v0, -0xf($a2) /* 191020 80262740 4600448D */ trunc.w.s $f18, $f8 /* 191024 80262744 44029000 */ mfc1 $v0, $f18 -/* 191028 80262748 00000000 */ nop +/* 191028 80262748 00000000 */ nop /* 19102C 8026274C A4C2FFF3 */ sh $v0, -0xd($a2) /* 191030 80262750 4600548D */ trunc.w.s $f18, $f10 /* 191034 80262754 44029000 */ mfc1 $v0, $f18 -/* 191038 80262758 00000000 */ nop +/* 191038 80262758 00000000 */ nop /* 19103C 8026275C A4C2FFF5 */ sh $v0, -0xb($a2) /* 191040 80262760 A0C0FFFD */ sb $zero, -3($a2) /* 191044 80262764 00031E00 */ sll $v1, $v1, 0x18 @@ -359,11 +359,11 @@ glabel create_target_list /* 19106C 8026278C 90C4FFFD */ lbu $a0, -3($a2) /* 191070 80262790 4600148D */ trunc.w.s $f18, $f2 /* 191074 80262794 44029000 */ mfc1 $v0, $f18 -/* 191078 80262798 00000000 */ nop +/* 191078 80262798 00000000 */ nop /* 19107C 8026279C A4C2FFF9 */ sh $v0, -7($a2) /* 191080 802627A0 4600748D */ trunc.w.s $f18, $f14 /* 191084 802627A4 44029000 */ mfc1 $v0, $f18 -/* 191088 802627A8 00000000 */ nop +/* 191088 802627A8 00000000 */ nop /* 19108C 802627AC A4C2FFFB */ sh $v0, -5($a2) /* 191090 802627B0 00832021 */ addu $a0, $a0, $v1 /* 191094 802627B4 00041E00 */ sll $v1, $a0, 0x18 @@ -374,14 +374,14 @@ glabel create_target_list /* 1910A8 802627C8 00431021 */ addu $v0, $v0, $v1 /* 1910AC 802627CC 00021080 */ sll $v0, $v0, 2 /* 1910B0 802627D0 44820000 */ mtc1 $v0, $f0 -/* 1910B4 802627D4 00000000 */ nop +/* 1910B4 802627D4 00000000 */ nop /* 1910B8 802627D8 46800020 */ cvt.s.w $f0, $f0 /* 1910BC 802627DC 46006000 */ add.s $f0, $f12, $f0 /* 1910C0 802627E0 84C3FFF9 */ lh $v1, -7($a2) /* 1910C4 802627E4 A0C4FFFD */ sb $a0, -3($a2) /* 1910C8 802627E8 4600048D */ trunc.w.s $f18, $f0 /* 1910CC 802627EC 44029000 */ mfc1 $v0, $f18 -/* 1910D0 802627F0 00000000 */ nop +/* 1910D0 802627F0 00000000 */ nop /* 1910D4 802627F4 A4C2FFF7 */ sh $v0, -9($a2) /* 1910D8 802627F8 28620028 */ slti $v0, $v1, 0x28 /* 1910DC 802627FC 10400003 */ beqz $v0, .L8026280C @@ -428,7 +428,7 @@ glabel create_target_list /* 191160 80262880 24E70001 */ addiu $a3, $a3, 1 /* 191164 80262884 00E8102A */ slt $v0, $a3, $t0 /* 191168 80262888 1440FF56 */ bnez $v0, .L802625E4 -/* 19116C 8026288C 00000000 */ nop +/* 19116C 8026288C 00000000 */ nop .L80262890: /* 191170 80262890 26730001 */ addiu $s3, $s3, 1 .L80262894: @@ -476,7 +476,7 @@ glabel create_target_list /* 19120C 8026292C 8C42C074 */ lw $v0, %lo(gBattleStatus+0x4)($v0) /* 191210 80262930 30424000 */ andi $v0, $v0, 0x4000 /* 191214 80262934 14400013 */ bnez $v0, .L80262984 -/* 191218 80262938 00000000 */ nop +/* 191218 80262938 00000000 */ nop /* 19121C 8026293C 82C20432 */ lb $v0, 0x432($s6) /* 191220 80262940 18400010 */ blez $v0, .L80262984 /* 191224 80262944 24040001 */ addiu $a0, $zero, 1 @@ -489,7 +489,7 @@ glabel create_target_list /* 191240 80262960 44810000 */ mtc1 $at, $f0 /* 191244 80262964 8FAB0020 */ lw $t3, 0x20($sp) /* 191248 80262968 4602003E */ c.le.s $f0, $f2 -/* 19124C 8026296C 00000000 */ nop +/* 19124C 8026296C 00000000 */ nop /* 191250 80262970 45000004 */ bc1f .L80262984 /* 191254 80262974 24040001 */ addiu $a0, $zero, 1 /* 191258 80262978 0080782D */ daddu $t7, $a0, $zero @@ -511,7 +511,7 @@ glabel create_target_list /* 191294 802629B4 50400004 */ beql $v0, $zero, .L802629C8 /* 191298 802629B8 0000202D */ daddu $a0, $zero, $zero /* 19129C 802629BC 08098A72 */ j .L802629C8 -/* 1912A0 802629C0 00000000 */ nop +/* 1912A0 802629C0 00000000 */ nop .L802629C4: /* 1912A4 802629C4 0000202D */ daddu $a0, $zero, $zero .L802629C8: @@ -590,7 +590,7 @@ glabel create_target_list /* 1913B0 80262AD0 8EC20184 */ lw $v0, 0x184($s6) /* 1913B4 80262AD4 30420800 */ andi $v0, $v0, 0x800 /* 1913B8 80262AD8 10400005 */ beqz $v0, .L80262AF0 -/* 1913BC 80262ADC 00000000 */ nop +/* 1913BC 80262ADC 00000000 */ nop /* 1913C0 80262AE0 8E220004 */ lw $v0, 4($s1) /* 1913C4 80262AE4 30420001 */ andi $v0, $v0, 1 /* 1913C8 80262AE8 544000CE */ bnel $v0, $zero, .L80262E24 @@ -599,7 +599,7 @@ glabel create_target_list /* 1913D0 80262AF0 8EC20184 */ lw $v0, 0x184($s6) /* 1913D4 80262AF4 30421000 */ andi $v0, $v0, 0x1000 /* 1913D8 80262AF8 10400005 */ beqz $v0, .L80262B10 -/* 1913DC 80262AFC 00000000 */ nop +/* 1913DC 80262AFC 00000000 */ nop /* 1913E0 80262B00 8E220004 */ lw $v0, 4($s1) /* 1913E4 80262B04 30420002 */ andi $v0, $v0, 2 /* 1913E8 80262B08 544000C6 */ bnel $v0, $zero, .L80262E24 @@ -609,7 +609,7 @@ glabel create_target_list /* 1913F4 80262B14 3C030002 */ lui $v1, 2 /* 1913F8 80262B18 00431024 */ and $v0, $v0, $v1 /* 1913FC 80262B1C 10400009 */ beqz $v0, .L80262B44 -/* 191400 80262B20 00000000 */ nop +/* 191400 80262B20 00000000 */ nop /* 191404 80262B24 8E420000 */ lw $v0, ($s2) /* 191408 80262B28 30420080 */ andi $v0, $v0, 0x80 /* 19140C 80262B2C 544000BD */ bnel $v0, $zero, .L80262E24 @@ -622,7 +622,7 @@ glabel create_target_list /* 191424 80262B44 8EC20184 */ lw $v0, 0x184($s6) /* 191428 80262B48 30420400 */ andi $v0, $v0, 0x400 /* 19142C 80262B4C 10400005 */ beqz $v0, .L80262B64 -/* 191430 80262B50 00000000 */ nop +/* 191430 80262B50 00000000 */ nop /* 191434 80262B54 8E420000 */ lw $v0, ($s2) /* 191438 80262B58 30420800 */ andi $v0, $v0, 0x800 /* 19143C 80262B5C 544000B1 */ bnel $v0, $zero, .L80262E24 @@ -632,7 +632,7 @@ glabel create_target_list /* 191448 80262B68 3C030001 */ lui $v1, 1 /* 19144C 80262B6C 00431024 */ and $v0, $v0, $v1 /* 191450 80262B70 14400005 */ bnez $v0, .L80262B88 -/* 191454 80262B74 00000000 */ nop +/* 191454 80262B74 00000000 */ nop /* 191458 80262B78 8E420000 */ lw $v0, ($s2) /* 19145C 80262B7C 30424000 */ andi $v0, $v0, 0x4000 /* 191460 80262B80 544000A8 */ bnel $v0, $zero, .L80262E24 @@ -642,7 +642,7 @@ glabel create_target_list /* 19146C 80262B8C 3C030004 */ lui $v1, 4 /* 191470 80262B90 00431024 */ and $v0, $v0, $v1 /* 191474 80262B94 10400005 */ beqz $v0, .L80262BAC -/* 191478 80262B98 00000000 */ nop +/* 191478 80262B98 00000000 */ nop /* 19147C 80262B9C 8E420000 */ lw $v0, ($s2) /* 191480 80262BA0 30420800 */ andi $v0, $v0, 0x800 /* 191484 80262BA4 5440009F */ bnel $v0, $zero, .L80262E24 @@ -651,7 +651,7 @@ glabel create_target_list /* 19148C 80262BAC 8EC20184 */ lw $v0, 0x184($s6) /* 191490 80262BB0 30420004 */ andi $v0, $v0, 4 /* 191494 80262BB4 10400004 */ beqz $v0, .L80262BC8 -/* 191498 80262BB8 00000000 */ nop +/* 191498 80262BB8 00000000 */ nop /* 19149C 80262BBC 82020012 */ lb $v0, 0x12($s0) /* 1914A0 80262BC0 54400098 */ bnel $v0, $zero, .L80262E24 /* 1914A4 80262BC4 24040001 */ addiu $a0, $zero, 1 @@ -659,7 +659,7 @@ glabel create_target_list /* 1914A8 80262BC8 8EC20184 */ lw $v0, 0x184($s6) /* 1914AC 80262BCC 30420010 */ andi $v0, $v0, 0x10 /* 1914B0 80262BD0 10400005 */ beqz $v0, .L80262BE8 -/* 1914B4 80262BD4 00000000 */ nop +/* 1914B4 80262BD4 00000000 */ nop /* 1914B8 80262BD8 82020012 */ lb $v0, 0x12($s0) /* 1914BC 80262BDC 28420002 */ slti $v0, $v0, 2 /* 1914C0 80262BE0 50400090 */ beql $v0, $zero, .L80262E24 @@ -668,7 +668,7 @@ glabel create_target_list /* 1914C8 80262BE8 8EC20184 */ lw $v0, 0x184($s6) /* 1914CC 80262BEC 30420040 */ andi $v0, $v0, 0x40 /* 1914D0 80262BF0 10400004 */ beqz $v0, .L80262C04 -/* 1914D4 80262BF4 00000000 */ nop +/* 1914D4 80262BF4 00000000 */ nop /* 1914D8 80262BF8 82020012 */ lb $v0, 0x12($s0) /* 1914DC 80262BFC 18400089 */ blez $v0, .L80262E24 /* 1914E0 80262C00 24040001 */ addiu $a0, $zero, 1 @@ -676,7 +676,7 @@ glabel create_target_list /* 1914E4 80262C04 8EC20184 */ lw $v0, 0x184($s6) /* 1914E8 80262C08 30424000 */ andi $v0, $v0, 0x4000 /* 1914EC 80262C0C 1040001D */ beqz $v0, .L80262C84 -/* 1914F0 80262C10 00000000 */ nop +/* 1914F0 80262C10 00000000 */ nop /* 1914F4 80262C14 8E220000 */ lw $v0, ($s1) /* 1914F8 80262C18 30420020 */ andi $v0, $v0, 0x20 /* 1914FC 80262C1C 14400019 */ bnez $v0, .L80262C84 @@ -695,7 +695,7 @@ glabel create_target_list /* 19152C 80262C4C 82030011 */ lb $v1, 0x11($s0) /* 191530 80262C50 80A20011 */ lb $v0, 0x11($a1) /* 191534 80262C54 14620006 */ bne $v1, $v0, .L80262C70 -/* 191538 80262C58 00000000 */ nop +/* 191538 80262C58 00000000 */ nop /* 19153C 80262C5C 82030012 */ lb $v1, 0x12($s0) /* 191540 80262C60 80A20012 */ lb $v0, 0x12($a1) /* 191544 80262C64 0062182A */ slt $v1, $v1, $v0 @@ -723,7 +723,7 @@ glabel create_target_list /* 19158C 80262CAC 96030012 */ lhu $v1, 0x12($s0) /* 191590 80262CB0 94A20012 */ lhu $v0, 0x12($a1) /* 191594 80262CB4 14620006 */ bne $v1, $v0, .L80262CD0 -/* 191598 80262CB8 00000000 */ nop +/* 191598 80262CB8 00000000 */ nop /* 19159C 80262CBC 82030011 */ lb $v1, 0x11($s0) /* 1915A0 80262CC0 80A20011 */ lb $v0, 0x11($a1) /* 1915A4 80262CC4 0043102A */ slt $v0, $v0, $v1 @@ -740,7 +740,7 @@ glabel create_target_list /* 1915C4 80262CE4 8EC20184 */ lw $v0, 0x184($s6) /* 1915C8 80262CE8 30420020 */ andi $v0, $v0, 0x20 /* 1915CC 80262CEC 10400005 */ beqz $v0, .L80262D04 -/* 1915D0 80262CF0 00000000 */ nop +/* 1915D0 80262CF0 00000000 */ nop /* 1915D4 80262CF4 8E420000 */ lw $v0, ($s2) /* 1915D8 80262CF8 30420200 */ andi $v0, $v0, 0x200 /* 1915DC 80262CFC 54400049 */ bnel $v0, $zero, .L80262E24 @@ -768,7 +768,7 @@ glabel create_target_list /* 191628 80262D48 3C030040 */ lui $v1, 0x40 /* 19162C 80262D4C 00431024 */ and $v0, $v0, $v1 /* 191630 80262D50 10400006 */ beqz $v0, .L80262D6C -/* 191634 80262D54 00000000 */ nop +/* 191634 80262D54 00000000 */ nop /* 191638 80262D58 8FB8001C */ lw $t8, 0x1c($sp) /* 19163C 80262D5C 82030011 */ lb $v1, 0x11($s0) /* 191640 80262D60 2702FFFF */ addiu $v0, $t8, -1 @@ -779,7 +779,7 @@ glabel create_target_list /* 191650 80262D70 3C030080 */ lui $v1, 0x80 /* 191654 80262D74 00431024 */ and $v0, $v0, $v1 /* 191658 80262D78 10400006 */ beqz $v0, .L80262D94 -/* 19165C 80262D7C 00000000 */ nop +/* 19165C 80262D7C 00000000 */ nop /* 191660 80262D80 8FB9001C */ lw $t9, 0x1c($sp) /* 191664 80262D84 82030011 */ lb $v1, 0x11($s0) /* 191668 80262D88 27220001 */ addiu $v0, $t9, 1 @@ -790,7 +790,7 @@ glabel create_target_list /* 191678 80262D98 3C030010 */ lui $v1, 0x10 /* 19167C 80262D9C 00431024 */ and $v0, $v0, $v1 /* 191680 80262DA0 10400005 */ beqz $v0, .L80262DB8 -/* 191684 80262DA4 00000000 */ nop +/* 191684 80262DA4 00000000 */ nop /* 191688 80262DA8 82020012 */ lb $v0, 0x12($s0) /* 19168C 80262DAC 005E102A */ slt $v0, $v0, $fp /* 191690 80262DB0 5440001C */ bnel $v0, $zero, .L80262E24 @@ -800,7 +800,7 @@ glabel create_target_list /* 19169C 80262DBC 3C030020 */ lui $v1, 0x20 /* 1916A0 80262DC0 00431024 */ and $v0, $v0, $v1 /* 1916A4 80262DC4 10400005 */ beqz $v0, .L80262DDC -/* 1916A8 80262DC8 00000000 */ nop +/* 1916A8 80262DC8 00000000 */ nop /* 1916AC 80262DCC 82020012 */ lb $v0, 0x12($s0) /* 1916B0 80262DD0 03C2102A */ slt $v0, $fp, $v0 /* 1916B4 80262DD4 54400013 */ bnel $v0, $zero, .L80262E24 @@ -810,7 +810,7 @@ glabel create_target_list /* 1916C0 80262DE0 3C030040 */ lui $v1, 0x40 /* 1916C4 80262DE4 00431024 */ and $v0, $v0, $v1 /* 1916C8 80262DE8 10400006 */ beqz $v0, .L80262E04 -/* 1916CC 80262DEC 00000000 */ nop +/* 1916CC 80262DEC 00000000 */ nop /* 1916D0 80262DF0 82020011 */ lb $v0, 0x11($s0) /* 1916D4 80262DF4 8FAE001C */ lw $t6, 0x1c($sp) /* 1916D8 80262DF8 01C2102A */ slt $v0, $t6, $v0 @@ -880,7 +880,7 @@ glabel create_target_list /* 1917BC 80262EDC A175040C */ sb $s5, 0x40c($t3) /* 1917C0 80262EE0 8FB80018 */ lw $t8, 0x18($sp) /* 1917C4 80262EE4 13000007 */ beqz $t8, .L80262F04 -/* 1917C8 80262EE8 00000000 */ nop +/* 1917C8 80262EE8 00000000 */ nop /* 1917CC 80262EEC 3C03800E */ lui $v1, %hi(gBattleStatus) /* 1917D0 80262EF0 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) /* 1917D4 80262EF4 8C620004 */ lw $v0, 4($v1) diff --git a/asm/nonmatchings/code_190B20/func_80263064.s b/asm/nonmatchings/code_190B20/func_80263064.s index 9310bdd578..56d6a8a111 100644 --- a/asm/nonmatchings/code_190B20/func_80263064.s +++ b/asm/nonmatchings/code_190B20/func_80263064.s @@ -27,13 +27,13 @@ glabel func_80263064 /* 191994 802630B4 8CCB0008 */ lw $t3, 8($a2) /* 191998 802630B8 006D1024 */ and $v0, $v1, $t5 /* 19199C 802630BC 14400026 */ bnez $v0, .L80263158 -/* 1919A0 802630C0 00000000 */ nop +/* 1919A0 802630C0 00000000 */ nop /* 1919A4 802630C4 C4A40144 */ lwc1 $f4, 0x144($a1) /* 1919A8 802630C8 C4A20148 */ lwc1 $f2, 0x148($a1) /* 1919AC 802630CC 84C20014 */ lh $v0, 0x14($a2) /* 1919B0 802630D0 C4A6014C */ lwc1 $f6, 0x14c($a1) /* 1919B4 802630D4 44820000 */ mtc1 $v0, $f0 -/* 1919B8 802630D8 00000000 */ nop +/* 1919B8 802630D8 00000000 */ nop /* 1919BC 802630DC 46800020 */ cvt.s.w $f0, $f0 /* 1919C0 802630E0 8CA20000 */ lw $v0, ($a1) /* 1919C4 802630E4 30420800 */ andi $v0, $v0, 0x800 @@ -41,39 +41,39 @@ glabel func_80263064 /* 1919CC 802630EC 46002100 */ add.s $f4, $f4, $f0 /* 1919D0 802630F0 84C20016 */ lh $v0, 0x16($a2) /* 1919D4 802630F4 44820000 */ mtc1 $v0, $f0 -/* 1919D8 802630F8 00000000 */ nop +/* 1919D8 802630F8 00000000 */ nop /* 1919DC 802630FC 46800020 */ cvt.s.w $f0, $f0 /* 1919E0 80263100 08098C47 */ j .L8026311C /* 1919E4 80263104 46001080 */ add.s $f2, $f2, $f0 .L80263108: /* 1919E8 80263108 84C20016 */ lh $v0, 0x16($a2) /* 1919EC 8026310C 44820000 */ mtc1 $v0, $f0 -/* 1919F0 80263110 00000000 */ nop +/* 1919F0 80263110 00000000 */ nop /* 1919F4 80263114 46800020 */ cvt.s.w $f0, $f0 /* 1919F8 80263118 46001081 */ sub.s $f2, $f2, $f0 .L8026311C: /* 1919FC 8026311C 84C20018 */ lh $v0, 0x18($a2) /* 191A00 80263120 44820000 */ mtc1 $v0, $f0 -/* 191A04 80263124 00000000 */ nop +/* 191A04 80263124 00000000 */ nop /* 191A08 80263128 46800020 */ cvt.s.w $f0, $f0 /* 191A0C 8026312C 84C2006C */ lh $v0, 0x6c($a2) /* 191A10 80263130 46003180 */ add.s $f6, $f6, $f0 /* 191A14 80263134 44820000 */ mtc1 $v0, $f0 -/* 191A18 80263138 00000000 */ nop +/* 191A18 80263138 00000000 */ nop /* 191A1C 8026313C 46800020 */ cvt.s.w $f0, $f0 /* 191A20 80263140 8CA20000 */ lw $v0, ($a1) /* 191A24 80263144 30420800 */ andi $v0, $v0, 0x800 /* 191A28 80263148 1040000E */ beqz $v0, .L80263184 /* 191A2C 8026314C 46002100 */ add.s $f4, $f4, $f0 /* 191A30 80263150 08098C67 */ j .L8026319C -/* 191A34 80263154 00000000 */ nop +/* 191A34 80263154 00000000 */ nop .L80263158: /* 191A38 80263158 C4C4002C */ lwc1 $f4, 0x2c($a2) /* 191A3C 8026315C C4C20030 */ lwc1 $f2, 0x30($a2) /* 191A40 80263160 84C2006C */ lh $v0, 0x6c($a2) /* 191A44 80263164 C4C60034 */ lwc1 $f6, 0x34($a2) /* 191A48 80263168 44820000 */ mtc1 $v0, $f0 -/* 191A4C 8026316C 00000000 */ nop +/* 191A4C 8026316C 00000000 */ nop /* 191A50 80263170 46800020 */ cvt.s.w $f0, $f0 /* 191A54 80263174 8CA20000 */ lw $v0, ($a1) /* 191A58 80263178 30420800 */ andi $v0, $v0, 0x800 @@ -82,14 +82,14 @@ glabel func_80263064 .L80263184: /* 191A64 80263184 84C2006E */ lh $v0, 0x6e($a2) /* 191A68 80263188 44820000 */ mtc1 $v0, $f0 -/* 191A6C 8026318C 00000000 */ nop +/* 191A6C 8026318C 00000000 */ nop /* 191A70 80263190 46800020 */ cvt.s.w $f0, $f0 /* 191A74 80263194 08098C6C */ j .L802631B0 /* 191A78 80263198 46001080 */ add.s $f2, $f2, $f0 .L8026319C: /* 191A7C 8026319C 84C2006E */ lh $v0, 0x6e($a2) /* 191A80 802631A0 44820000 */ mtc1 $v0, $f0 -/* 191A84 802631A4 00000000 */ nop +/* 191A84 802631A4 00000000 */ nop /* 191A88 802631A8 46800020 */ cvt.s.w $f0, $f0 /* 191A8C 802631AC 46001081 */ sub.s $f2, $f2, $f0 .L802631B0: @@ -105,15 +105,15 @@ glabel func_80263064 /* 191AB4 802631D4 A0820426 */ sb $v0, 0x426($a0) /* 191AB8 802631D8 4600220D */ trunc.w.s $f8, $f4 /* 191ABC 802631DC 44024000 */ mfc1 $v0, $f8 -/* 191AC0 802631E0 00000000 */ nop +/* 191AC0 802631E0 00000000 */ nop /* 191AC4 802631E4 A4E2FFF4 */ sh $v0, -0xc($a3) /* 191AC8 802631E8 4600120D */ trunc.w.s $f8, $f2 /* 191ACC 802631EC 44024000 */ mfc1 $v0, $f8 -/* 191AD0 802631F0 00000000 */ nop +/* 191AD0 802631F0 00000000 */ nop /* 191AD4 802631F4 A4E2FFF6 */ sh $v0, -0xa($a3) /* 191AD8 802631F8 4600320D */ trunc.w.s $f8, $f6 /* 191ADC 802631FC 44024000 */ mfc1 $v0, $f8 -/* 191AE0 80263200 00000000 */ nop +/* 191AE0 80263200 00000000 */ nop /* 191AE4 80263204 A4E2FFF8 */ sh $v0, -8($a3) /* 191AE8 80263208 A0E00000 */ sb $zero, ($a3) /* 191AEC 8026320C 24E70014 */ addiu $a3, $a3, 0x14 @@ -123,7 +123,7 @@ glabel func_80263064 .L80263218: /* 191AF8 80263218 012C102A */ slt $v0, $t1, $t4 /* 191AFC 8026321C 1440FF9F */ bnez $v0, .L8026309C -/* 191B00 80263220 00000000 */ nop +/* 191B00 80263220 00000000 */ nop .L80263224: /* 191B04 80263224 A088040C */ sb $t0, 0x40c($a0) /* 191B08 80263228 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_190B20/func_80263268.s b/asm/nonmatchings/code_190B20/func_80263268.s index 9f5bf596f1..4ef4514c45 100644 --- a/asm/nonmatchings/code_190B20/func_80263268.s +++ b/asm/nonmatchings/code_190B20/func_80263268.s @@ -39,11 +39,11 @@ glabel func_80263268 /* 191BC0 802632E0 24020005 */ addiu $v0, $zero, 5 /* 191BC4 802632E4 81030012 */ lb $v1, 0x12($t0) /* 191BC8 802632E8 14620003 */ bne $v1, $v0, .L802632F8 -/* 191BCC 802632EC 00000000 */ nop +/* 191BCC 802632EC 00000000 */ nop .L802632F0: /* 191BD0 802632F0 2402FFFF */ addiu $v0, $zero, -1 .L802632F4: /* 191BD4 802632F4 A0E2007C */ sb $v0, 0x7c($a3) .L802632F8: /* 191BD8 802632F8 03E00008 */ jr $ra -/* 191BDC 802632FC 00000000 */ nop +/* 191BDC 802632FC 00000000 */ nop diff --git a/asm/nonmatchings/code_190B20/func_80263434.s b/asm/nonmatchings/code_190B20/func_80263434.s index 1a967d619d..59ef42e1f5 100644 --- a/asm/nonmatchings/code_190B20/func_80263434.s +++ b/asm/nonmatchings/code_190B20/func_80263434.s @@ -5,7 +5,7 @@ glabel func_80263434 /* 191D14 80263434 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 191D18 80263438 AFBF0010 */ sw $ra, 0x10($sp) /* 191D1C 8026343C 0C098CFA */ jal func_802633E8 -/* 191D20 80263440 00000000 */ nop +/* 191D20 80263440 00000000 */ nop /* 191D24 80263444 10400004 */ beqz $v0, .L80263458 /* 191D28 80263448 0000102D */ daddu $v0, $zero, $zero /* 191D2C 8026344C 0C090464 */ jal func_80241190 diff --git a/asm/nonmatchings/code_190B20/func_802634B8.s b/asm/nonmatchings/code_190B20/func_802634B8.s index 1776956b4d..5e2a64b3ad 100644 --- a/asm/nonmatchings/code_190B20/func_802634B8.s +++ b/asm/nonmatchings/code_190B20/func_802634B8.s @@ -58,7 +58,7 @@ glabel func_802634B8 /* 191E60 80263580 00498821 */ addu $s1, $v0, $t1 /* 191E64 80263584 82220010 */ lb $v0, 0x10($s1) /* 191E68 80263588 14470007 */ bne $v0, $a3, .L802635A8 -/* 191E6C 8026358C 00000000 */ nop +/* 191E6C 8026358C 00000000 */ nop /* 191E70 80263590 02861021 */ addu $v0, $s4, $a2 /* 191E74 80263594 A04301DE */ sb $v1, 0x1de($v0) /* 191E78 80263598 94820208 */ lhu $v0, 0x208($a0) @@ -109,7 +109,7 @@ glabel func_802634B8 /* 191F20 80263640 AE820184 */ sw $v0, 0x184($s4) /* 191F24 80263644 82A2040C */ lb $v0, 0x40c($s5) /* 191F28 80263648 10400003 */ beqz $v0, .L80263658 -/* 191F2C 8026364C 00000000 */ nop +/* 191F2C 8026364C 00000000 */ nop /* 191F30 80263650 24160001 */ addiu $s6, $zero, 1 /* 191F34 80263654 A27601F6 */ sb $s6, 0x1f6($s3) .L80263658: diff --git a/asm/nonmatchings/code_190B20/func_802636E4.s b/asm/nonmatchings/code_190B20/func_802636E4.s index c738387ce4..0f0f713d61 100644 --- a/asm/nonmatchings/code_190B20/func_802636E4.s +++ b/asm/nonmatchings/code_190B20/func_802636E4.s @@ -58,7 +58,7 @@ glabel func_802636E4 /* 19208C 802637AC 00498821 */ addu $s1, $v0, $t1 /* 192090 802637B0 82220010 */ lb $v0, 0x10($s1) /* 192094 802637B4 14470007 */ bne $v0, $a3, .L802637D4 -/* 192098 802637B8 00000000 */ nop +/* 192098 802637B8 00000000 */ nop /* 19209C 802637BC 02861021 */ addu $v0, $s4, $a2 /* 1920A0 802637C0 A04301DE */ sb $v1, 0x1de($v0) /* 1920A4 802637C4 94820208 */ lhu $v0, 0x208($a0) @@ -110,7 +110,7 @@ glabel func_802636E4 /* 192150 80263870 AE820184 */ sw $v0, 0x184($s4) /* 192154 80263874 82A2040C */ lb $v0, 0x40c($s5) /* 192158 80263878 10400003 */ beqz $v0, .L80263888 -/* 19215C 8026387C 00000000 */ nop +/* 19215C 8026387C 00000000 */ nop /* 192160 80263880 24160001 */ addiu $s6, $zero, 1 /* 192164 80263884 A27601F6 */ sb $s6, 0x1f6($s3) .L80263888: diff --git a/asm/nonmatchings/code_190B20/func_80263914.s b/asm/nonmatchings/code_190B20/func_80263914.s index 19b5c83b11..a717d66f50 100644 --- a/asm/nonmatchings/code_190B20/func_80263914.s +++ b/asm/nonmatchings/code_190B20/func_80263914.s @@ -56,7 +56,7 @@ glabel func_80263914 /* 1922B8 802639D8 26310001 */ addiu $s1, $s1, 1 /* 1922BC 802639DC 0222102A */ slt $v0, $s1, $v0 /* 1922C0 802639E0 1440FFF4 */ bnez $v0, .L802639B4 -/* 1922C4 802639E4 00000000 */ nop +/* 1922C4 802639E4 00000000 */ nop .L802639E8: /* 1922C8 802639E8 0000882D */ daddu $s1, $zero, $zero /* 1922CC 802639EC 9282020E */ lbu $v0, 0x20e($s4) diff --git a/asm/nonmatchings/code_190B20/func_80263C60.s b/asm/nonmatchings/code_190B20/func_80263C60.s index 3ba6640e3c..b76767d6b0 100644 --- a/asm/nonmatchings/code_190B20/func_80263C60.s +++ b/asm/nonmatchings/code_190B20/func_80263C60.s @@ -23,10 +23,10 @@ glabel func_80263C60 /* 192580 80263CA0 A0400204 */ sb $zero, 0x204($v0) /* 192584 80263CA4 8CA200DC */ lw $v0, 0xdc($a1) /* 192588 80263CA8 10400004 */ beqz $v0, .L80263CBC -/* 19258C 80263CAC 00000000 */ nop +/* 19258C 80263CAC 00000000 */ nop /* 192590 80263CB0 A44001FA */ sh $zero, 0x1fa($v0) /* 192594 80263CB4 A44001FC */ sh $zero, 0x1fc($v0) /* 192598 80263CB8 A0400204 */ sb $zero, 0x204($v0) .L80263CBC: /* 19259C 80263CBC 03E00008 */ jr $ra -/* 1925A0 80263CC0 00000000 */ nop +/* 1925A0 80263CC0 00000000 */ nop diff --git a/asm/nonmatchings/code_190B20/func_80263E08.s b/asm/nonmatchings/code_190B20/func_80263E08.s index d60f33274d..390240fa99 100644 --- a/asm/nonmatchings/code_190B20/func_80263E08.s +++ b/asm/nonmatchings/code_190B20/func_80263E08.s @@ -16,14 +16,14 @@ glabel func_80263E08 /* 192714 80263E34 50400005 */ beql $v0, $zero, .L80263E4C /* 192718 80263E38 24020200 */ addiu $v0, $zero, 0x200 /* 19271C 80263E3C 10600007 */ beqz $v1, .L80263E5C -/* 192720 80263E40 00000000 */ nop +/* 192720 80263E40 00000000 */ nop /* 192724 80263E44 08098FAA */ j .L80263EA8 -/* 192728 80263E48 00000000 */ nop +/* 192728 80263E48 00000000 */ nop .L80263E4C: /* 19272C 80263E4C 1062000B */ beq $v1, $v0, .L80263E7C -/* 192730 80263E50 00000000 */ nop +/* 192730 80263E50 00000000 */ nop /* 192734 80263E54 08098FAA */ j .L80263EA8 -/* 192738 80263E58 00000000 */ nop +/* 192738 80263E58 00000000 */ nop .L80263E5C: /* 19273C 80263E5C 8E020088 */ lw $v0, 0x88($s0) /* 192740 80263E60 10450011 */ beq $v0, $a1, .L80263EA8 @@ -32,18 +32,18 @@ glabel func_80263E08 /* 19274C 80263E6C 0C0B76A3 */ jal func_802DDA8C /* 192750 80263E70 AE050088 */ sw $a1, 0x88($s0) /* 192754 80263E74 08098FAA */ j .L80263EA8 -/* 192758 80263E78 00000000 */ nop +/* 192758 80263E78 00000000 */ nop .L80263E7C: /* 19275C 80263E7C 8E020088 */ lw $v0, 0x88($s0) /* 192760 80263E80 10450009 */ beq $v0, $a1, .L80263EA8 -/* 192764 80263E84 00000000 */ nop +/* 192764 80263E84 00000000 */ nop /* 192768 80263E88 8E040084 */ lw $a0, 0x84($s0) /* 19276C 80263E8C 8E060090 */ lw $a2, 0x90($s0) /* 192770 80263E90 0C0B78AB */ jal func_802DE2AC /* 192774 80263E94 AE050088 */ sw $a1, 0x88($s0) /* 192778 80263E98 8E040084 */ lw $a0, 0x84($s0) /* 19277C 80263E9C 0C0B7972 */ jal func_802DE5C8 -/* 192780 80263EA0 00000000 */ nop +/* 192780 80263EA0 00000000 */ nop /* 192784 80263EA4 AE02008C */ sw $v0, 0x8c($s0) .L80263EA8: /* 192788 80263EA8 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/code_190B20/func_80263FE8.s b/asm/nonmatchings/code_190B20/func_80263FE8.s index a3e3f6a71d..46e829fc89 100644 --- a/asm/nonmatchings/code_190B20/func_80263FE8.s +++ b/asm/nonmatchings/code_190B20/func_80263FE8.s @@ -19,15 +19,15 @@ glabel func_80263FE8 /* 192900 80264020 50400005 */ beql $v0, $zero, .L80264038 /* 192904 80264024 24020200 */ addiu $v0, $zero, 0x200 /* 192908 80264028 12000007 */ beqz $s0, .L80264048 -/* 19290C 8026402C 00000000 */ nop +/* 19290C 8026402C 00000000 */ nop /* 192910 80264030 0809901B */ j .L8026406C -/* 192914 80264034 00000000 */ nop +/* 192914 80264034 00000000 */ nop .L80264038: /* 192918 80264038 1602000C */ bne $s0, $v0, .L8026406C -/* 19291C 8026403C 00000000 */ nop +/* 19291C 8026403C 00000000 */ nop .L80264040: /* 192920 80264040 16400005 */ bnez $s2, .L80264058 -/* 192924 80264044 00000000 */ nop +/* 192924 80264044 00000000 */ nop .L80264048: /* 192928 80264048 8C820000 */ lw $v0, ($a0) /* 19292C 8026404C 00511025 */ or $v0, $v0, $s1 diff --git a/asm/nonmatchings/code_190B20/func_80264084.s b/asm/nonmatchings/code_190B20/func_80264084.s index 9420d69bb4..d8f01f38c4 100644 --- a/asm/nonmatchings/code_190B20/func_80264084.s +++ b/asm/nonmatchings/code_190B20/func_80264084.s @@ -19,15 +19,15 @@ glabel func_80264084 /* 19299C 802640BC 50400005 */ beql $v0, $zero, .L802640D4 /* 1929A0 802640C0 24020200 */ addiu $v0, $zero, 0x200 /* 1929A4 802640C4 12000007 */ beqz $s0, .L802640E4 -/* 1929A8 802640C8 00000000 */ nop +/* 1929A8 802640C8 00000000 */ nop /* 1929AC 802640CC 08099044 */ j .L80264110 -/* 1929B0 802640D0 00000000 */ nop +/* 1929B0 802640D0 00000000 */ nop .L802640D4: /* 1929B4 802640D4 1602000E */ bne $s0, $v0, .L80264110 -/* 1929B8 802640D8 00000000 */ nop +/* 1929B8 802640D8 00000000 */ nop .L802640DC: /* 1929BC 802640DC 16400006 */ bnez $s2, .L802640F8 -/* 1929C0 802640E0 00000000 */ nop +/* 1929C0 802640E0 00000000 */ nop .L802640E4: /* 1929C4 802640E4 8C820000 */ lw $v0, ($a0) /* 1929C8 802640E8 00111827 */ nor $v1, $zero, $s1 diff --git a/asm/nonmatchings/code_190B20/func_80265CE8.s b/asm/nonmatchings/code_190B20/func_80265CE8.s index e70b55d663..cb53cf4f4b 100644 --- a/asm/nonmatchings/code_190B20/func_80265CE8.s +++ b/asm/nonmatchings/code_190B20/func_80265CE8.s @@ -5,7 +5,7 @@ glabel func_80265CE8 /* 1945C8 80265CE8 14800006 */ bnez $a0, .L80265D04 /* 1945CC 80265CEC 0000102D */ daddu $v0, $zero, $zero /* 1945D0 80265CF0 03E00008 */ jr $ra -/* 1945D4 80265CF4 00000000 */ nop +/* 1945D4 80265CF4 00000000 */ nop .L80265CF8: /* 1945D8 80265CF8 8C830004 */ lw $v1, 4($a0) /* 1945DC 80265CFC 03E00008 */ jr $ra @@ -18,15 +18,15 @@ glabel func_80265CE8 /* 1945F4 80265D14 8C820000 */ lw $v0, ($a0) .L80265D18: /* 1945F8 80265D18 14460002 */ bne $v0, $a2, .L80265D24 -/* 1945FC 80265D1C 00000000 */ nop +/* 1945FC 80265D1C 00000000 */ nop /* 194600 80265D20 8C830004 */ lw $v1, 4($a0) .L80265D24: /* 194604 80265D24 1045FFF4 */ beq $v0, $a1, .L80265CF8 -/* 194608 80265D28 00000000 */ nop +/* 194608 80265D28 00000000 */ nop /* 19460C 80265D2C 24840008 */ addiu $a0, $a0, 8 /* 194610 80265D30 8C820000 */ lw $v0, ($a0) /* 194614 80265D34 1440FFF8 */ bnez $v0, .L80265D18 -/* 194618 80265D38 00000000 */ nop +/* 194618 80265D38 00000000 */ nop .L80265D3C: /* 19461C 80265D3C 03E00008 */ jr $ra /* 194620 80265D40 0060102D */ daddu $v0, $v1, $zero diff --git a/asm/nonmatchings/code_190B20/func_80265D44.s b/asm/nonmatchings/code_190B20/func_80265D44.s index 0c2b7ea1d3..8a54f80a68 100644 --- a/asm/nonmatchings/code_190B20/func_80265D44.s +++ b/asm/nonmatchings/code_190B20/func_80265D44.s @@ -10,7 +10,7 @@ glabel func_80265D44 /* 194638 80265D58 14A00006 */ bnez $a1, .L80265D74 /* 19463C 80265D5C 0000102D */ daddu $v0, $zero, $zero /* 194640 80265D60 03E00008 */ jr $ra -/* 194644 80265D64 00000000 */ nop +/* 194644 80265D64 00000000 */ nop .L80265D68: /* 194648 80265D68 8CA70004 */ lw $a3, 4($a1) /* 19464C 80265D6C 03E00008 */ jr $ra @@ -67,15 +67,15 @@ glabel func_80265D44 /* 1946F4 80265E14 8CA20000 */ lw $v0, ($a1) .L80265E18: /* 1946F8 80265E18 14430002 */ bne $v0, $v1, .L80265E24 -/* 1946FC 80265E1C 00000000 */ nop +/* 1946FC 80265E1C 00000000 */ nop /* 194700 80265E20 8CA70004 */ lw $a3, 4($a1) .L80265E24: /* 194704 80265E24 1044FFD0 */ beq $v0, $a0, .L80265D68 -/* 194708 80265E28 00000000 */ nop +/* 194708 80265E28 00000000 */ nop /* 19470C 80265E2C 24A50008 */ addiu $a1, $a1, 8 /* 194710 80265E30 8CA20000 */ lw $v0, ($a1) /* 194714 80265E34 1440FFF8 */ bnez $v0, .L80265E18 -/* 194718 80265E38 00000000 */ nop +/* 194718 80265E38 00000000 */ nop .L80265E3C: /* 19471C 80265E3C 03E00008 */ jr $ra /* 194720 80265E40 00E0102D */ daddu $v0, $a3, $zero diff --git a/asm/nonmatchings/code_190B20/func_802664DC.s b/asm/nonmatchings/code_190B20/func_802664DC.s index bfb37a1b46..1603f2aae6 100644 --- a/asm/nonmatchings/code_190B20/func_802664DC.s +++ b/asm/nonmatchings/code_190B20/func_802664DC.s @@ -14,13 +14,13 @@ glabel func_802664DC .L80266500: /* 194DE0 80266500 8C620000 */ lw $v0, ($v1) /* 194DE4 80266504 10400004 */ beqz $v0, .L80266518 -/* 194DE8 80266508 00000000 */ nop +/* 194DE8 80266508 00000000 */ nop /* 194DEC 8026650C 26100001 */ addiu $s0, $s0, 1 /* 194DF0 80266510 1A00FFFB */ blez $s0, .L80266500 /* 194DF4 80266514 24630004 */ addiu $v1, $v1, 4 .L80266518: /* 194DF8 80266518 1A000007 */ blez $s0, .L80266538 -/* 194DFC 8026651C 00000000 */ nop +/* 194DFC 8026651C 00000000 */ nop /* 194E00 80266520 8CA20000 */ lw $v0, ($a1) /* 194E04 80266524 0000802D */ daddu $s0, $zero, $zero /* 194E08 80266528 8C43000C */ lw $v1, 0xc($v0) @@ -33,7 +33,7 @@ glabel func_802664DC /* 194E20 80266540 2404FFC9 */ addiu $a0, $zero, -0x37 .L80266544: /* 194E24 80266544 44840000 */ mtc1 $a0, $f0 -/* 194E28 80266548 00000000 */ nop +/* 194E28 80266548 00000000 */ nop /* 194E2C 8026654C 46800020 */ cvt.s.w $f0, $f0 /* 194E30 80266550 3C028029 */ lui $v0, %hi(D_802938AC) /* 194E34 80266554 244238AC */ addiu $v0, $v0, %lo(D_802938AC) diff --git a/asm/nonmatchings/code_190B20/func_80266684.s b/asm/nonmatchings/code_190B20/func_80266684.s index f35c7f1082..f53f7614ac 100644 --- a/asm/nonmatchings/code_190B20/func_80266684.s +++ b/asm/nonmatchings/code_190B20/func_80266684.s @@ -28,4 +28,4 @@ glabel func_80266684 /* 194FB4 802666D4 1440FFF1 */ bnez $v0, .L8026669C /* 194FB8 802666D8 24840004 */ addiu $a0, $a0, 4 /* 194FBC 802666DC 03E00008 */ jr $ra -/* 194FC0 802666E0 00000000 */ nop +/* 194FC0 802666E0 00000000 */ nop diff --git a/asm/nonmatchings/code_190B20/func_802666E4.s b/asm/nonmatchings/code_190B20/func_802666E4.s index f5c8cc5e74..7824bee8c6 100644 --- a/asm/nonmatchings/code_190B20/func_802666E4.s +++ b/asm/nonmatchings/code_190B20/func_802666E4.s @@ -19,7 +19,7 @@ glabel func_802666E4 /* 194FF8 80266718 1040001E */ beqz $v0, .L80266794 /* 194FFC 8026671C 24080001 */ addiu $t0, $zero, 1 /* 195000 80266720 080999E9 */ j .L802667A4 -/* 195004 80266724 00000000 */ nop +/* 195004 80266724 00000000 */ nop .L80266728: /* 195008 80266728 0000202D */ daddu $a0, $zero, $zero /* 19500C 8026672C 44050000 */ mfc1 $a1, $f0 @@ -32,12 +32,12 @@ glabel func_802666E4 /* 195028 80266748 0C01C184 */ jal func_80070610 /* 19502C 8026674C E7A00010 */ swc1 $f0, 0x10($sp) /* 195030 80266750 080999F9 */ j .L802667E4 -/* 195034 80266754 00000000 */ nop +/* 195034 80266754 00000000 */ nop .L80266758: /* 195038 80266758 0C09451D */ jal func_80251474 -/* 19503C 8026675C 00000000 */ nop +/* 19503C 8026675C 00000000 */ nop /* 195040 80266760 080999F9 */ j .L802667E4 -/* 195044 80266764 00000000 */ nop +/* 195044 80266764 00000000 */ nop .L80266768: /* 195048 80266768 44050000 */ mfc1 $a1, $f0 /* 19504C 8026676C 44061000 */ mfc1 $a2, $f2 @@ -49,7 +49,7 @@ glabel func_802666E4 /* 195064 80266784 0C01C70C */ jal func_80071C30 /* 195068 80266788 E7A00010 */ swc1 $f0, 0x10($sp) /* 19506C 8026678C 080999F9 */ j .L802667E4 -/* 195070 80266790 00000000 */ nop +/* 195070 80266790 00000000 */ nop .L80266794: /* 195074 80266794 28620009 */ slti $v0, $v1, 9 /* 195078 80266798 10400002 */ beqz $v0, .L802667A4 diff --git a/asm/nonmatchings/code_190B20/func_802667F0.s b/asm/nonmatchings/code_190B20/func_802667F0.s index 20521ccb0e..7d0c53eb89 100644 --- a/asm/nonmatchings/code_190B20/func_802667F0.s +++ b/asm/nonmatchings/code_190B20/func_802667F0.s @@ -18,24 +18,29 @@ glabel func_802667F0 /* 195104 80266824 1040003E */ beqz $v0, .L80266920 /* 195108 80266828 0000202D */ daddu $a0, $zero, $zero /* 19510C 8026682C 00031080 */ sll $v0, $v1, 2 -/* 195110 80266830 3C01802A */ lui $at, %hi(D_8029D640) +/* 195110 80266830 3C01802A */ lui $at, %hi(jtbl_8029D640_1CBF20) /* 195114 80266834 00220821 */ addu $at, $at, $v0 -/* 195118 80266838 8C22D640 */ lw $v0, %lo(D_8029D640)($at) +/* 195118 80266838 8C22D640 */ lw $v0, %lo(jtbl_8029D640_1CBF20)($at) /* 19511C 8026683C 00400008 */ jr $v0 -/* 195120 80266840 00000000 */ nop +/* 195120 80266840 00000000 */ nop +glabel L80266844_195124 /* 195124 80266844 0000202D */ daddu $a0, $zero, $zero /* 195128 80266848 24020001 */ addiu $v0, $zero, 1 /* 19512C 8026684C 08099A48 */ j .L80266920 /* 195130 80266850 A2020204 */ sb $v0, 0x204($s0) +glabel L80266854_195134 /* 195134 80266854 24040004 */ addiu $a0, $zero, 4 /* 195138 80266858 08099A48 */ j .L80266920 /* 19513C 8026685C A2000204 */ sb $zero, 0x204($s0) +glabel L80266860_195140 /* 195140 80266860 24040003 */ addiu $a0, $zero, 3 /* 195144 80266864 08099A48 */ j .L80266920 /* 195148 80266868 A2000204 */ sb $zero, 0x204($s0) +glabel L8026686C_19514C /* 19514C 8026686C 24040002 */ addiu $a0, $zero, 2 /* 195150 80266870 08099A48 */ j .L80266920 /* 195154 80266874 A2040204 */ sb $a0, 0x204($s0) +glabel L80266878_195158 /* 195158 80266878 0000202D */ daddu $a0, $zero, $zero /* 19515C 8026687C 08099A48 */ j .L80266920 /* 195160 80266880 A2000204 */ sb $zero, 0x204($s0) @@ -46,11 +51,12 @@ glabel func_802667F0 /* 195170 80266890 82040204 */ lb $a0, 0x204($s0) /* 195174 80266894 10400022 */ beqz $v0, .L80266920 /* 195178 80266898 00031080 */ sll $v0, $v1, 2 -/* 19517C 8026689C 3C01802A */ lui $at, %hi(D_8029D658) +/* 19517C 8026689C 3C01802A */ lui $at, %hi(jtbl_8029D658_1CBF38) /* 195180 802668A0 00220821 */ addu $at, $at, $v0 -/* 195184 802668A4 8C22D658 */ lw $v0, %lo(D_8029D658)($at) +/* 195184 802668A4 8C22D658 */ lw $v0, %lo(jtbl_8029D658_1CBF38)($at) /* 195188 802668A8 00400008 */ jr $v0 -/* 19518C 802668AC 00000000 */ nop +/* 19518C 802668AC 00000000 */ nop +glabel L802668B0_195190 /* 195190 802668B0 92020204 */ lbu $v0, 0x204($s0) /* 195194 802668B4 24420001 */ addiu $v0, $v0, 1 /* 195198 802668B8 A2020204 */ sb $v0, 0x204($s0) @@ -61,14 +67,19 @@ glabel func_802667F0 /* 1951AC 802668CC 24020002 */ addiu $v0, $zero, 2 /* 1951B0 802668D0 08099A48 */ j .L80266920 /* 1951B4 802668D4 A2020204 */ sb $v0, 0x204($s0) +glabel L802668D8_1951B8 /* 1951B8 802668D8 08099A48 */ j .L80266920 /* 1951BC 802668DC 24040004 */ addiu $a0, $zero, 4 +glabel L802668E0_1951C0 /* 1951C0 802668E0 08099A48 */ j .L80266920 /* 1951C4 802668E4 24040003 */ addiu $a0, $zero, 3 +glabel L802668E8_1951C8 /* 1951C8 802668E8 08099A48 */ j .L80266920 /* 1951CC 802668EC 24040002 */ addiu $a0, $zero, 2 +glabel L802668F0_1951D0 /* 1951D0 802668F0 08099A48 */ j .L80266920 /* 1951D4 802668F4 0000202D */ daddu $a0, $zero, $zero +glabel L802668F8_1951D8 /* 1951D8 802668F8 90A20204 */ lbu $v0, 0x204($a1) /* 1951DC 802668FC 80A40204 */ lb $a0, 0x204($a1) /* 1951E0 80266900 24420001 */ addiu $v0, $v0, 1 @@ -83,7 +94,7 @@ glabel func_802667F0 /* 195200 80266920 44050000 */ mfc1 $a1, $f0 /* 195204 80266924 3C014120 */ lui $at, 0x4120 /* 195208 80266928 44810000 */ mtc1 $at, $f0 -/* 19520C 8026692C 00000000 */ nop +/* 19520C 8026692C 00000000 */ nop /* 195210 80266930 46002101 */ sub.s $f4, $f4, $f0 /* 195214 80266934 44061000 */ mfc1 $a2, $f2 /* 195218 80266938 3C014140 */ lui $at, 0x4140 diff --git a/asm/nonmatchings/code_190B20/func_80266978.s b/asm/nonmatchings/code_190B20/func_80266978.s index f30f14a390..549c602b30 100644 --- a/asm/nonmatchings/code_190B20/func_80266978.s +++ b/asm/nonmatchings/code_190B20/func_80266978.s @@ -14,20 +14,20 @@ glabel func_80266978 /* 195278 80266998 24C60001 */ addiu $a2, $a2, 1 /* 19527C 8026699C 80820205 */ lb $v0, 0x205($a0) /* 195280 802669A0 14490007 */ bne $v0, $t1, .L802669C0 -/* 195284 802669A4 00000000 */ nop +/* 195284 802669A4 00000000 */ nop /* 195288 802669A8 8C820200 */ lw $v0, 0x200($a0) /* 19528C 802669AC 10400003 */ beqz $v0, .L802669BC -/* 195290 802669B0 00000000 */ nop +/* 195290 802669B0 00000000 */ nop /* 195294 802669B4 8C42000C */ lw $v0, 0xc($v0) /* 195298 802669B8 AC400024 */ sw $zero, 0x24($v0) .L802669BC: /* 19529C 802669BC 80820205 */ lb $v0, 0x205($a0) .L802669C0: /* 1952A0 802669C0 14480007 */ bne $v0, $t0, .L802669E0 -/* 1952A4 802669C4 00000000 */ nop +/* 1952A4 802669C4 00000000 */ nop /* 1952A8 802669C8 8C820200 */ lw $v0, 0x200($a0) /* 1952AC 802669CC 10400004 */ beqz $v0, .L802669E0 -/* 1952B0 802669D0 00000000 */ nop +/* 1952B0 802669D0 00000000 */ nop /* 1952B4 802669D4 8C42000C */ lw $v0, 0xc($v0) /* 1952B8 802669D8 AC400018 */ sw $zero, 0x18($v0) /* 1952BC 802669DC AC800200 */ sw $zero, 0x200($a0) @@ -57,10 +57,10 @@ glabel func_80266978 /* 195314 80266A34 24020005 */ addiu $v0, $zero, 5 .L80266A38: /* 195318 80266A38 14620007 */ bne $v1, $v0, .L80266A58 -/* 19531C 80266A3C 00000000 */ nop +/* 19531C 80266A3C 00000000 */ nop /* 195320 80266A40 8C820200 */ lw $v0, 0x200($a0) /* 195324 80266A44 10400004 */ beqz $v0, .L80266A58 -/* 195328 80266A48 00000000 */ nop +/* 195328 80266A48 00000000 */ nop /* 19532C 80266A4C 8C42000C */ lw $v0, 0xc($v0) /* 195330 80266A50 AC400018 */ sw $zero, 0x18($v0) /* 195334 80266A54 AC800200 */ sw $zero, 0x200($a0) @@ -86,10 +86,10 @@ glabel func_80266978 /* 19537C 80266A9C 24020005 */ addiu $v0, $zero, 5 .L80266AA0: /* 195380 80266AA0 14620007 */ bne $v1, $v0, .L80266AC0 -/* 195384 80266AA4 00000000 */ nop +/* 195384 80266AA4 00000000 */ nop /* 195388 80266AA8 8C820200 */ lw $v0, 0x200($a0) /* 19538C 80266AAC 10400004 */ beqz $v0, .L80266AC0 -/* 195390 80266AB0 00000000 */ nop +/* 195390 80266AB0 00000000 */ nop /* 195394 80266AB4 8C42000C */ lw $v0, 0xc($v0) /* 195398 80266AB8 AC400018 */ sw $zero, 0x18($v0) /* 19539C 80266ABC AC800200 */ sw $zero, 0x200($a0) @@ -101,4 +101,4 @@ glabel func_80266978 /* 1953B0 80266AD0 A0820205 */ sb $v0, 0x205($a0) .L80266AD4: /* 1953B4 80266AD4 03E00008 */ jr $ra -/* 1953B8 80266AD8 00000000 */ nop +/* 1953B8 80266AD8 00000000 */ nop diff --git a/asm/nonmatchings/code_190B20/func_80266B14.s b/asm/nonmatchings/code_190B20/func_80266B14.s index 16466393d4..8a590f9988 100644 --- a/asm/nonmatchings/code_190B20/func_80266B14.s +++ b/asm/nonmatchings/code_190B20/func_80266B14.s @@ -19,7 +19,7 @@ glabel func_80266B14 /* 195428 80266B48 A0820206 */ sb $v0, 0x206($a0) /* 19542C 80266B4C 00021600 */ sll $v0, $v0, 0x18 /* 195430 80266B50 14400004 */ bnez $v0, .L80266B64 -/* 195434 80266B54 00000000 */ nop +/* 195434 80266B54 00000000 */ nop /* 195438 80266B58 8C820000 */ lw $v0, ($a0) /* 19543C 80266B5C 00471024 */ and $v0, $v0, $a3 /* 195440 80266B60 AC820000 */ sw $v0, ($a0) @@ -28,4 +28,4 @@ glabel func_80266B14 /* 195448 80266B68 1440FFEF */ bnez $v0, .L80266B28 /* 19544C 80266B6C 24A50004 */ addiu $a1, $a1, 4 /* 195450 80266B70 03E00008 */ jr $ra -/* 195454 80266B74 00000000 */ nop +/* 195454 80266B74 00000000 */ nop diff --git a/asm/nonmatchings/code_190B20/func_80266D6C.s b/asm/nonmatchings/code_190B20/func_80266D6C.s index 95884d5284..83a6f503a3 100644 --- a/asm/nonmatchings/code_190B20/func_80266D6C.s +++ b/asm/nonmatchings/code_190B20/func_80266D6C.s @@ -4,11 +4,11 @@ glabel func_80266D6C /* 19564C 80266D6C 8C820094 */ lw $v0, 0x94($a0) /* 195650 80266D70 1040000C */ beqz $v0, .L80266DA4 -/* 195654 80266D74 00000000 */ nop +/* 195654 80266D74 00000000 */ nop /* 195658 80266D78 8C820000 */ lw $v0, ($a0) /* 19565C 80266D7C 30420002 */ andi $v0, $v0, 2 /* 195660 80266D80 14400008 */ bnez $v0, .L80266DA4 -/* 195664 80266D84 00000000 */ nop +/* 195664 80266D84 00000000 */ nop /* 195668 80266D88 8C8400C0 */ lw $a0, 0xc0($a0) /* 19566C 80266D8C 808206C0 */ lb $v0, 0x6c0($a0) /* 195670 80266D90 10450004 */ beq $v0, $a1, .L80266DA4 @@ -18,4 +18,4 @@ glabel func_80266D6C /* 195680 80266DA0 A08206C1 */ sb $v0, 0x6c1($a0) .L80266DA4: /* 195684 80266DA4 03E00008 */ jr $ra -/* 195688 80266DA8 00000000 */ nop +/* 195688 80266DA8 00000000 */ nop diff --git a/asm/nonmatchings/code_190B20/func_80266DAC.s b/asm/nonmatchings/code_190B20/func_80266DAC.s index 3034d8d3fe..fcdbbad8ae 100644 --- a/asm/nonmatchings/code_190B20/func_80266DAC.s +++ b/asm/nonmatchings/code_190B20/func_80266DAC.s @@ -13,7 +13,7 @@ glabel func_80266DAC /* 1956A8 80266DC8 8E030000 */ lw $v1, ($s0) /* 1956AC 80266DCC 30620001 */ andi $v0, $v1, 1 /* 1956B0 80266DD0 14400008 */ bnez $v0, .L80266DF4 -/* 1956B4 80266DD4 00000000 */ nop +/* 1956B4 80266DD4 00000000 */ nop /* 1956B8 80266DD8 8E020094 */ lw $v0, 0x94($s0) /* 1956BC 80266DDC 10400005 */ beqz $v0, .L80266DF4 /* 1956C0 80266DE0 30620002 */ andi $v0, $v1, 2 @@ -24,7 +24,7 @@ glabel func_80266DAC .L80266DF4: /* 1956D4 80266DF4 8E10000C */ lw $s0, 0xc($s0) /* 1956D8 80266DF8 1600FFF3 */ bnez $s0, .L80266DC8 -/* 1956DC 80266DFC 00000000 */ nop +/* 1956DC 80266DFC 00000000 */ nop .L80266E00: /* 1956E0 80266E00 8FBF0018 */ lw $ra, 0x18($sp) /* 1956E4 80266E04 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_190B20/func_80266E14.s b/asm/nonmatchings/code_190B20/func_80266E14.s index 3a993dc19a..b56695b2a6 100644 --- a/asm/nonmatchings/code_190B20/func_80266E14.s +++ b/asm/nonmatchings/code_190B20/func_80266E14.s @@ -4,13 +4,13 @@ glabel func_80266E14 /* 1956F4 80266E14 8C820094 */ lw $v0, 0x94($a0) /* 1956F8 80266E18 10400007 */ beqz $v0, .L80266E38 -/* 1956FC 80266E1C 00000000 */ nop +/* 1956FC 80266E1C 00000000 */ nop /* 195700 80266E20 8C820000 */ lw $v0, ($a0) /* 195704 80266E24 30420002 */ andi $v0, $v0, 2 /* 195708 80266E28 14400003 */ bnez $v0, .L80266E38 -/* 19570C 80266E2C 00000000 */ nop +/* 19570C 80266E2C 00000000 */ nop /* 195710 80266E30 8C8200C0 */ lw $v0, 0xc0($a0) /* 195714 80266E34 A04006C0 */ sb $zero, 0x6c0($v0) .L80266E38: /* 195718 80266E38 03E00008 */ jr $ra -/* 19571C 80266E3C 00000000 */ nop +/* 19571C 80266E3C 00000000 */ nop diff --git a/asm/nonmatchings/code_190B20/func_80266E40.s b/asm/nonmatchings/code_190B20/func_80266E40.s index bfaee19663..6757216109 100644 --- a/asm/nonmatchings/code_190B20/func_80266E40.s +++ b/asm/nonmatchings/code_190B20/func_80266E40.s @@ -13,21 +13,21 @@ glabel func_80266E40 /* 19573C 80266E5C 8C830000 */ lw $v1, ($a0) /* 195740 80266E60 00661024 */ and $v0, $v1, $a2 /* 195744 80266E64 1440000B */ bnez $v0, .L80266E94 -/* 195748 80266E68 00000000 */ nop +/* 195748 80266E68 00000000 */ nop /* 19574C 80266E6C 8C820094 */ lw $v0, 0x94($a0) /* 195750 80266E70 10400008 */ beqz $v0, .L80266E94 /* 195754 80266E74 30620002 */ andi $v0, $v1, 2 /* 195758 80266E78 14400006 */ bnez $v0, .L80266E94 -/* 19575C 80266E7C 00000000 */ nop +/* 19575C 80266E7C 00000000 */ nop /* 195760 80266E80 80A206C0 */ lb $v0, 0x6c0($a1) /* 195764 80266E84 10480003 */ beq $v0, $t0, .L80266E94 -/* 195768 80266E88 00000000 */ nop +/* 195768 80266E88 00000000 */ nop /* 19576C 80266E8C 54470001 */ bnel $v0, $a3, .L80266E94 /* 195770 80266E90 A0A006C0 */ sb $zero, 0x6c0($a1) .L80266E94: /* 195774 80266E94 8C84000C */ lw $a0, 0xc($a0) /* 195778 80266E98 1480FFEF */ bnez $a0, .L80266E58 -/* 19577C 80266E9C 00000000 */ nop +/* 19577C 80266E9C 00000000 */ nop .L80266EA0: /* 195780 80266EA0 03E00008 */ jr $ra -/* 195784 80266EA4 00000000 */ nop +/* 195784 80266EA4 00000000 */ nop diff --git a/asm/nonmatchings/code_190B20/func_80266EA8.s b/asm/nonmatchings/code_190B20/func_80266EA8.s index 7358adac84..c5ebe0273f 100644 --- a/asm/nonmatchings/code_190B20/func_80266EA8.s +++ b/asm/nonmatchings/code_190B20/func_80266EA8.s @@ -4,11 +4,11 @@ glabel func_80266EA8 /* 195788 80266EA8 8C820094 */ lw $v0, 0x94($a0) /* 19578C 80266EAC 1040000C */ beqz $v0, .L80266EE0 -/* 195790 80266EB0 00000000 */ nop +/* 195790 80266EB0 00000000 */ nop /* 195794 80266EB4 8C820000 */ lw $v0, ($a0) /* 195798 80266EB8 30420002 */ andi $v0, $v0, 2 /* 19579C 80266EBC 14400008 */ bnez $v0, .L80266EE0 -/* 1957A0 80266EC0 00000000 */ nop +/* 1957A0 80266EC0 00000000 */ nop /* 1957A4 80266EC4 8C8400C0 */ lw $a0, 0xc0($a0) /* 1957A8 80266EC8 80820750 */ lb $v0, 0x750($a0) /* 1957AC 80266ECC 10450004 */ beq $v0, $a1, .L80266EE0 @@ -18,4 +18,4 @@ glabel func_80266EA8 /* 1957BC 80266EDC A0820751 */ sb $v0, 0x751($a0) .L80266EE0: /* 1957C0 80266EE0 03E00008 */ jr $ra -/* 1957C4 80266EE4 00000000 */ nop +/* 1957C4 80266EE4 00000000 */ nop diff --git a/asm/nonmatchings/code_190B20/func_80266EE8.s b/asm/nonmatchings/code_190B20/func_80266EE8.s index b0b3c106dd..fceb7c8ae5 100644 --- a/asm/nonmatchings/code_190B20/func_80266EE8.s +++ b/asm/nonmatchings/code_190B20/func_80266EE8.s @@ -16,7 +16,7 @@ glabel func_80266EE8 /* 1957F0 80266F10 8E030000 */ lw $v1, ($s0) /* 1957F4 80266F14 00711024 */ and $v0, $v1, $s1 /* 1957F8 80266F18 14400008 */ bnez $v0, .L80266F3C -/* 1957FC 80266F1C 00000000 */ nop +/* 1957FC 80266F1C 00000000 */ nop /* 195800 80266F20 8E020094 */ lw $v0, 0x94($s0) /* 195804 80266F24 10400005 */ beqz $v0, .L80266F3C /* 195808 80266F28 30620002 */ andi $v0, $v1, 2 @@ -27,7 +27,7 @@ glabel func_80266EE8 .L80266F3C: /* 19581C 80266F3C 8E10000C */ lw $s0, 0xc($s0) /* 195820 80266F40 1600FFF3 */ bnez $s0, .L80266F10 -/* 195824 80266F44 00000000 */ nop +/* 195824 80266F44 00000000 */ nop .L80266F48: /* 195828 80266F48 8FBF001C */ lw $ra, 0x1c($sp) /* 19582C 80266F4C 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/code_190B20/func_80266F60.s b/asm/nonmatchings/code_190B20/func_80266F60.s index 2cf8e08df8..49830291ed 100644 --- a/asm/nonmatchings/code_190B20/func_80266F60.s +++ b/asm/nonmatchings/code_190B20/func_80266F60.s @@ -4,13 +4,13 @@ glabel func_80266F60 /* 195840 80266F60 8C820094 */ lw $v0, 0x94($a0) /* 195844 80266F64 10400007 */ beqz $v0, .L80266F84 -/* 195848 80266F68 00000000 */ nop +/* 195848 80266F68 00000000 */ nop /* 19584C 80266F6C 8C820000 */ lw $v0, ($a0) /* 195850 80266F70 30420002 */ andi $v0, $v0, 2 /* 195854 80266F74 14400003 */ bnez $v0, .L80266F84 -/* 195858 80266F78 00000000 */ nop +/* 195858 80266F78 00000000 */ nop /* 19585C 80266F7C 8C8200C0 */ lw $v0, 0xc0($a0) /* 195860 80266F80 A0400750 */ sb $zero, 0x750($v0) .L80266F84: /* 195864 80266F84 03E00008 */ jr $ra -/* 195868 80266F88 00000000 */ nop +/* 195868 80266F88 00000000 */ nop diff --git a/asm/nonmatchings/code_190B20/func_80266F8C.s b/asm/nonmatchings/code_190B20/func_80266F8C.s index 936efdab72..5cdfcd96e7 100644 --- a/asm/nonmatchings/code_190B20/func_80266F8C.s +++ b/asm/nonmatchings/code_190B20/func_80266F8C.s @@ -11,7 +11,7 @@ glabel func_80266F8C /* 195880 80266FA0 8C830000 */ lw $v1, ($a0) /* 195884 80266FA4 00661024 */ and $v0, $v1, $a2 /* 195888 80266FA8 14400006 */ bnez $v0, .L80266FC4 -/* 19588C 80266FAC 00000000 */ nop +/* 19588C 80266FAC 00000000 */ nop /* 195890 80266FB0 8C820094 */ lw $v0, 0x94($a0) /* 195894 80266FB4 10400003 */ beqz $v0, .L80266FC4 /* 195898 80266FB8 30620002 */ andi $v0, $v1, 2 @@ -20,7 +20,7 @@ glabel func_80266F8C .L80266FC4: /* 1958A4 80266FC4 8C84000C */ lw $a0, 0xc($a0) /* 1958A8 80266FC8 1480FFF4 */ bnez $a0, .L80266F9C -/* 1958AC 80266FCC 00000000 */ nop +/* 1958AC 80266FCC 00000000 */ nop .L80266FD0: /* 1958B0 80266FD0 03E00008 */ jr $ra -/* 1958B4 80266FD4 00000000 */ nop +/* 1958B4 80266FD4 00000000 */ nop diff --git a/asm/nonmatchings/code_190B20/func_80266FD8.s b/asm/nonmatchings/code_190B20/func_80266FD8.s index 531f377007..53f818345b 100644 --- a/asm/nonmatchings/code_190B20/func_80266FD8.s +++ b/asm/nonmatchings/code_190B20/func_80266FD8.s @@ -4,11 +4,11 @@ glabel func_80266FD8 /* 1958B8 80266FD8 8C820094 */ lw $v0, 0x94($a0) /* 1958BC 80266FDC 1040000C */ beqz $v0, .L80267010 -/* 1958C0 80266FE0 00000000 */ nop +/* 1958C0 80266FE0 00000000 */ nop /* 1958C4 80266FE4 8C820000 */ lw $v0, ($a0) /* 1958C8 80266FE8 30420002 */ andi $v0, $v0, 2 /* 1958CC 80266FEC 14400008 */ bnez $v0, .L80267010 -/* 1958D0 80266FF0 00000000 */ nop +/* 1958D0 80266FF0 00000000 */ nop /* 1958D4 80266FF4 8C8400C0 */ lw $a0, 0xc0($a0) /* 1958D8 80266FF8 80820764 */ lb $v0, 0x764($a0) /* 1958DC 80266FFC 10450004 */ beq $v0, $a1, .L80267010 @@ -18,4 +18,4 @@ glabel func_80266FD8 /* 1958EC 8026700C A0820765 */ sb $v0, 0x765($a0) .L80267010: /* 1958F0 80267010 03E00008 */ jr $ra -/* 1958F4 80267014 00000000 */ nop +/* 1958F4 80267014 00000000 */ nop diff --git a/asm/nonmatchings/code_190B20/func_80267018.s b/asm/nonmatchings/code_190B20/func_80267018.s index e9f40a3585..54ee9642cc 100644 --- a/asm/nonmatchings/code_190B20/func_80267018.s +++ b/asm/nonmatchings/code_190B20/func_80267018.s @@ -16,12 +16,12 @@ glabel func_80267018 /* 195920 80267040 8E030000 */ lw $v1, ($s0) /* 195924 80267044 00711024 */ and $v0, $v1, $s1 /* 195928 80267048 1440000B */ bnez $v0, .L80267078 -/* 19592C 8026704C 00000000 */ nop +/* 19592C 8026704C 00000000 */ nop /* 195930 80267050 8E0200C0 */ lw $v0, 0xc0($s0) /* 195934 80267054 10400008 */ beqz $v0, .L80267078 /* 195938 80267058 30620002 */ andi $v0, $v1, 2 /* 19593C 8026705C 14400006 */ bnez $v0, .L80267078 -/* 195940 80267060 00000000 */ nop +/* 195940 80267060 00000000 */ nop /* 195944 80267064 8E020094 */ lw $v0, 0x94($s0) /* 195948 80267068 10400003 */ beqz $v0, .L80267078 /* 19594C 8026706C 0200202D */ daddu $a0, $s0, $zero @@ -30,7 +30,7 @@ glabel func_80267018 .L80267078: /* 195958 80267078 8E10000C */ lw $s0, 0xc($s0) /* 19595C 8026707C 1600FFF0 */ bnez $s0, .L80267040 -/* 195960 80267080 00000000 */ nop +/* 195960 80267080 00000000 */ nop .L80267084: /* 195964 80267084 8FBF001C */ lw $ra, 0x1c($sp) /* 195968 80267088 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/code_190B20/func_8026709C.s b/asm/nonmatchings/code_190B20/func_8026709C.s index 0e685f1e80..fa2320fb6a 100644 --- a/asm/nonmatchings/code_190B20/func_8026709C.s +++ b/asm/nonmatchings/code_190B20/func_8026709C.s @@ -4,13 +4,13 @@ glabel func_8026709C /* 19597C 8026709C 8C820094 */ lw $v0, 0x94($a0) /* 195980 802670A0 10400007 */ beqz $v0, .L802670C0 -/* 195984 802670A4 00000000 */ nop +/* 195984 802670A4 00000000 */ nop /* 195988 802670A8 8C820000 */ lw $v0, ($a0) /* 19598C 802670AC 30420002 */ andi $v0, $v0, 2 /* 195990 802670B0 14400003 */ bnez $v0, .L802670C0 -/* 195994 802670B4 00000000 */ nop +/* 195994 802670B4 00000000 */ nop /* 195998 802670B8 8C8200C0 */ lw $v0, 0xc0($a0) /* 19599C 802670BC A0400764 */ sb $zero, 0x764($v0) .L802670C0: /* 1959A0 802670C0 03E00008 */ jr $ra -/* 1959A4 802670C4 00000000 */ nop +/* 1959A4 802670C4 00000000 */ nop diff --git a/asm/nonmatchings/code_190B20/func_802670C8.s b/asm/nonmatchings/code_190B20/func_802670C8.s index 373d4fb81c..7e632d088e 100644 --- a/asm/nonmatchings/code_190B20/func_802670C8.s +++ b/asm/nonmatchings/code_190B20/func_802670C8.s @@ -11,7 +11,7 @@ glabel func_802670C8 /* 1959BC 802670DC 8C830000 */ lw $v1, ($a0) /* 1959C0 802670E0 00661024 */ and $v0, $v1, $a2 /* 1959C4 802670E4 14400006 */ bnez $v0, .L80267100 -/* 1959C8 802670E8 00000000 */ nop +/* 1959C8 802670E8 00000000 */ nop /* 1959CC 802670EC 8C820094 */ lw $v0, 0x94($a0) /* 1959D0 802670F0 10400003 */ beqz $v0, .L80267100 /* 1959D4 802670F4 30620002 */ andi $v0, $v1, 2 @@ -20,7 +20,7 @@ glabel func_802670C8 .L80267100: /* 1959E0 80267100 8C84000C */ lw $a0, 0xc($a0) /* 1959E4 80267104 1480FFF4 */ bnez $a0, .L802670D8 -/* 1959E8 80267108 00000000 */ nop +/* 1959E8 80267108 00000000 */ nop .L8026710C: /* 1959EC 8026710C 03E00008 */ jr $ra -/* 1959F0 80267110 00000000 */ nop +/* 1959F0 80267110 00000000 */ nop diff --git a/asm/nonmatchings/code_190B20/func_8026777C.s b/asm/nonmatchings/code_190B20/func_8026777C.s index bd42123db9..55d1c99bf0 100644 --- a/asm/nonmatchings/code_190B20/func_8026777C.s +++ b/asm/nonmatchings/code_190B20/func_8026777C.s @@ -57,7 +57,7 @@ glabel func_8026777C /* 196118 80267838 A0820217 */ sb $v0, 0x217($a0) /* 19611C 8026783C 00021600 */ sll $v0, $v0, 0x18 /* 196120 80267840 18400006 */ blez $v0, .L8026785C -/* 196124 80267844 00000000 */ nop +/* 196124 80267844 00000000 */ nop /* 196128 80267848 8C820440 */ lw $v0, 0x440($a0) /* 19612C 8026784C A0870216 */ sb $a3, 0x216($a0) /* 196130 80267850 8C43000C */ lw $v1, 0xc($v0) diff --git a/asm/nonmatchings/code_190B20/inflict_status.s b/asm/nonmatchings/code_190B20/inflict_status.s index 4eb7bda8f5..146ede9332 100644 --- a/asm/nonmatchings/code_190B20/inflict_status.s +++ b/asm/nonmatchings/code_190B20/inflict_status.s @@ -13,14 +13,15 @@ glabel inflict_status /* 194840 80265F60 104000B5 */ beqz $v0, .L80266238 /* 194844 80265F64 AFBF0024 */ sw $ra, 0x24($sp) /* 194848 80265F68 00111080 */ sll $v0, $s1, 2 -/* 19484C 80265F6C 3C01802A */ lui $at, %hi(D_8029D5E0) +/* 19484C 80265F6C 3C01802A */ lui $at, %hi(jtbl_8029D5E0_1CBEC0) /* 194850 80265F70 00220821 */ addu $at, $at, $v0 -/* 194854 80265F74 8C22D5E0 */ lw $v0, %lo(D_8029D5E0)($at) +/* 194854 80265F74 8C22D5E0 */ lw $v0, %lo(jtbl_8029D5E0_1CBEC0)($at) /* 194858 80265F78 00400008 */ jr $v0 -/* 19485C 80265F7C 00000000 */ nop +/* 19485C 80265F7C 00000000 */ nop +glabel L80265F80_194860 /* 194860 80265F80 86020192 */ lh $v0, 0x192($s0) /* 194864 80265F84 1440000E */ bnez $v0, .L80265FC0 -/* 194868 80265F88 00000000 */ nop +/* 194868 80265F88 00000000 */ nop /* 19486C 80265F8C 0C03A752 */ jal is_ability_active /* 194870 80265F90 2404000E */ addiu $a0, $zero, 0xe /* 194874 80265F94 144000A9 */ bnez $v0, .L8026623C @@ -59,18 +60,19 @@ glabel inflict_status /* 1948EC 8026600C 2CA20008 */ sltiu $v0, $a1, 8 /* 1948F0 80266010 10400089 */ beqz $v0, .L80266238 /* 1948F4 80266014 00051080 */ sll $v0, $a1, 2 -/* 1948F8 80266018 3C01802A */ lui $at, %hi(D_8029D620) +/* 1948F8 80266018 3C01802A */ lui $at, %hi(jtbl_8029D620_1CBF00) /* 1948FC 8026601C 00220821 */ addu $at, $at, $v0 -/* 194900 80266020 8C22D620 */ lw $v0, %lo(D_8029D620)($at) +/* 194900 80266020 8C22D620 */ lw $v0, %lo(jtbl_8029D620_1CBF00)($at) /* 194904 80266024 00400008 */ jr $v0 -/* 194908 80266028 00000000 */ nop +/* 194908 80266028 00000000 */ nop +glabel L8026602C_19490C /* 19490C 8026602C 86030192 */ lh $v1, 0x192($s0) /* 194910 80266030 24020100 */ addiu $v0, $zero, 0x100 /* 194914 80266034 10620081 */ beq $v1, $v0, .L8026623C /* 194918 80266038 24020001 */ addiu $v0, $zero, 1 /* 19491C 8026603C 8E030228 */ lw $v1, 0x228($s0) /* 194920 80266040 10600004 */ beqz $v1, .L80266054 -/* 194924 80266044 00000000 */ nop +/* 194924 80266044 00000000 */ nop /* 194928 80266048 8C620000 */ lw $v0, ($v1) /* 19492C 8026604C 34420010 */ ori $v0, $v0, 0x10 /* 194930 80266050 AC620000 */ sw $v0, ($v1) @@ -90,6 +92,7 @@ glabel inflict_status /* 194964 80266084 AE020228 */ sw $v0, 0x228($s0) /* 194968 80266088 0809988F */ j .L8026623C /* 19496C 8026608C 24020001 */ addiu $v0, $zero, 1 +glabel L80266090_194970 /* 194970 80266090 0200202D */ daddu $a0, $s0, $zero /* 194974 80266094 0C099B6B */ jal func_80266DAC /* 194978 80266098 24050003 */ addiu $a1, $zero, 3 @@ -98,6 +101,7 @@ glabel inflict_status /* 194984 802660A4 24050006 */ addiu $a1, $zero, 6 /* 194988 802660A8 0809988F */ j .L8026623C /* 19498C 802660AC 24020001 */ addiu $v0, $zero, 1 +glabel L802660B0_194990 /* 194990 802660B0 0200202D */ daddu $a0, $s0, $zero /* 194994 802660B4 0C099B6B */ jal func_80266DAC /* 194998 802660B8 24050007 */ addiu $a1, $zero, 7 @@ -106,11 +110,13 @@ glabel inflict_status /* 1949A4 802660C4 24050005 */ addiu $a1, $zero, 5 /* 1949A8 802660C8 0809988F */ j .L8026623C /* 1949AC 802660CC 24020001 */ addiu $v0, $zero, 1 +glabel L802660D0_1949B0 /* 1949B0 802660D0 86040436 */ lh $a0, 0x436($s0) /* 1949B4 802660D4 0C011E08 */ jal func_80047820 /* 1949B8 802660D8 24050004 */ addiu $a1, $zero, 4 /* 1949BC 802660DC 0809988F */ j .L8026623C /* 1949C0 802660E0 24020001 */ addiu $v0, $zero, 1 +glabel L802660E4_1949C4 /* 1949C4 802660E4 0200202D */ daddu $a0, $s0, $zero /* 1949C8 802660E8 0C099B6B */ jal func_80266DAC /* 1949CC 802660EC 24050005 */ addiu $a1, $zero, 5 @@ -119,6 +125,7 @@ glabel inflict_status /* 1949D8 802660F8 24050003 */ addiu $a1, $zero, 3 /* 1949DC 802660FC 0809988F */ j .L8026623C /* 1949E0 80266100 24020001 */ addiu $v0, $zero, 1 +glabel L80266104_1949E4 /* 1949E4 80266104 0200202D */ daddu $a0, $s0, $zero /* 1949E8 80266108 0C099B6B */ jal func_80266DAC /* 1949EC 8026610C 24050006 */ addiu $a1, $zero, 6 @@ -127,11 +134,13 @@ glabel inflict_status /* 1949F8 80266118 24050009 */ addiu $a1, $zero, 9 /* 1949FC 8026611C 0809988F */ j .L8026623C /* 194A00 80266120 24020001 */ addiu $v0, $zero, 1 +glabel L80266124_194A04 /* 194A04 80266124 86040436 */ lh $a0, 0x436($s0) /* 194A08 80266128 0C011E08 */ jal func_80047820 /* 194A0C 8026612C 2405000A */ addiu $a1, $zero, 0xa /* 194A10 80266130 0809988F */ j .L8026623C /* 194A14 80266134 24020001 */ addiu $v0, $zero, 1 +glabel L80266138_194A18 /* 194A18 80266138 86030192 */ lh $v1, 0x192($s0) /* 194A1C 8026613C 24020100 */ addiu $v0, $zero, 0x100 /* 194A20 80266140 1062003D */ beq $v1, $v0, .L80266238 @@ -154,6 +163,7 @@ glabel inflict_status /* 194A60 80266180 2405000B */ addiu $a1, $zero, 0xb /* 194A64 80266184 0809988F */ j .L8026623C /* 194A68 80266188 24020001 */ addiu $v0, $zero, 1 +glabel L8026618C_194A6C /* 194A6C 8026618C 86030192 */ lh $v1, 0x192($s0) /* 194A70 80266190 24020100 */ addiu $v0, $zero, 0x100 /* 194A74 80266194 10620028 */ beq $v1, $v0, .L80266238 @@ -167,6 +177,7 @@ glabel inflict_status /* 194A94 802661B4 24020009 */ addiu $v0, $zero, 9 /* 194A98 802661B8 0809987C */ j .L802661F0 /* 194A9C 802661BC A2020215 */ sb $v0, 0x215($s0) +glabel L802661C0_194AA0 /* 194AA0 802661C0 82020216 */ lb $v0, 0x216($s0) /* 194AA4 802661C4 0051102A */ slt $v0, $v0, $s1 /* 194AA8 802661C8 1040001B */ beqz $v0, .L80266238 @@ -182,6 +193,7 @@ glabel inflict_status .L802661F0: /* 194AD0 802661F0 0809988E */ j .L80266238 /* 194AD4 802661F4 A203021C */ sb $v1, 0x21c($s0) +glabel L802661F8_194AD8 /* 194AD8 802661F8 86030192 */ lh $v1, 0x192($s0) /* 194ADC 802661FC 24020100 */ addiu $v0, $zero, 0x100 /* 194AE0 80266200 1062000D */ beq $v1, $v0, .L80266238 @@ -200,6 +212,7 @@ glabel inflict_status /* 194B10 80266230 0C011E8C */ jal func_80047A30 /* 194B14 80266234 A203021C */ sb $v1, 0x21c($s0) .L80266238: +glabel L80266238_194B18 /* 194B18 80266238 24020001 */ addiu $v0, $zero, 1 .L8026623C: /* 194B1C 8026623C 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/asm/nonmatchings/code_190B20/inflict_status_set_duration.s b/asm/nonmatchings/code_190B20/inflict_status_set_duration.s index c47e3f733e..06d358086d 100644 --- a/asm/nonmatchings/code_190B20/inflict_status_set_duration.s +++ b/asm/nonmatchings/code_190B20/inflict_status_set_duration.s @@ -15,9 +15,9 @@ glabel inflict_status_set_duration /* 1955F8 80266D18 10800005 */ beqz $a0, .L80266D30 /* 1955FC 80266D1C 0000802D */ daddu $s0, $zero, $zero /* 195600 80266D20 0C0997A6 */ jal lookup_status_chance -/* 195604 80266D24 00000000 */ nop +/* 195604 80266D24 00000000 */ nop /* 195608 80266D28 18400002 */ blez $v0, .L80266D34 -/* 19560C 80266D2C 00000000 */ nop +/* 19560C 80266D2C 00000000 */ nop .L80266D30: /* 195610 80266D30 0220802D */ daddu $s0, $s1, $zero .L80266D34: diff --git a/asm/nonmatchings/code_190B20/load_partner_actor.s b/asm/nonmatchings/code_190B20/load_partner_actor.s index 83b7dcecad..ab70a6a1a2 100644 --- a/asm/nonmatchings/code_190B20/load_partner_actor.s +++ b/asm/nonmatchings/code_190B20/load_partner_actor.s @@ -29,10 +29,10 @@ glabel load_partner_actor /* 1934B4 80264BD4 00438021 */ addu $s0, $v0, $v1 /* 1934B8 80264BD8 8E14000C */ lw $s4, 0xc($s0) /* 1934BC 80264BDC 16800003 */ bnez $s4, .L80264BEC -/* 1934C0 80264BE0 00000000 */ nop +/* 1934C0 80264BE0 00000000 */ nop .L80264BE4: /* 1934C4 80264BE4 080992F9 */ j .L80264BE4 -/* 1934C8 80264BE8 00000000 */ nop +/* 1934C8 80264BE8 00000000 */ nop .L80264BEC: /* 1934CC 80264BEC 8E040000 */ lw $a0, ($s0) /* 1934D0 80264BF0 8E060004 */ lw $a2, 4($s0) @@ -44,13 +44,13 @@ glabel load_partner_actor /* 1934E8 80264C08 8C820004 */ lw $v0, 4($a0) /* 1934EC 80264C0C 30420040 */ andi $v0, $v0, 0x40 /* 1934F0 80264C10 14400007 */ bnez $v0, .L80264C30 -/* 1934F4 80264C14 00000000 */ nop +/* 1934F4 80264C14 00000000 */ nop /* 1934F8 80264C18 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 1934FC 80264C1C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 193500 80264C20 904200AA */ lbu $v0, 0xaa($v0) /* 193504 80264C24 30420002 */ andi $v0, $v0, 2 /* 193508 80264C28 1040000B */ beqz $v0, .L80264C58 -/* 19350C 80264C2C 00000000 */ nop +/* 19350C 80264C2C 00000000 */ nop .L80264C30: /* 193510 80264C30 C6180010 */ lwc1 $f24, 0x10($s0) /* 193514 80264C34 4680C620 */ cvt.s.w $f24, $f24 @@ -78,7 +78,7 @@ glabel load_partner_actor /* 193564 80264C84 AE4200DC */ sw $v0, 0xdc($s2) .L80264C88: /* 193568 80264C88 08099322 */ j .L80264C88 -/* 19356C 80264C8C 00000000 */ nop +/* 19356C 80264C8C 00000000 */ nop .L80264C90: /* 193570 80264C90 82620012 */ lb $v0, 0x12($s3) /* 193574 80264C94 000210C0 */ sll $v0, $v0, 3 @@ -145,11 +145,11 @@ glabel load_partner_actor /* 193668 80264D88 A6220156 */ sh $v0, 0x156($s1) /* 19366C 80264D8C 4600018D */ trunc.w.s $f6, $f0 /* 193670 80264D90 44023000 */ mfc1 $v0, $f6 -/* 193674 80264D94 00000000 */ nop +/* 193674 80264D94 00000000 */ nop /* 193678 80264D98 A6220158 */ sh $v0, 0x158($s1) /* 19367C 80264D9C 4600218D */ trunc.w.s $f6, $f4 /* 193680 80264DA0 44023000 */ mfc1 $v0, $f6 -/* 193684 80264DA4 00000000 */ nop +/* 193684 80264DA4 00000000 */ nop /* 193688 80264DA8 A622015A */ sh $v0, 0x15a($s1) /* 19368C 80264DAC 2402000D */ addiu $v0, $zero, 0xd /* 193690 80264DB0 E6220188 */ swc1 $f2, 0x188($s1) @@ -255,7 +255,7 @@ glabel load_partner_actor /* 19381C 80264F3C AE3001F4 */ sw $s0, 0x1f4($s1) .L80264F40: /* 193820 80264F40 080993D0 */ j .L80264F40 -/* 193824 80264F44 00000000 */ nop +/* 193824 80264F44 00000000 */ nop .L80264F48: /* 193828 80264F48 1AC000E7 */ blez $s6, .L802652E8 /* 19382C 80264F4C 0000982D */ daddu $s3, $zero, $zero @@ -280,7 +280,7 @@ glabel load_partner_actor /* 193874 80264F94 00021400 */ sll $v0, $v0, 0x10 /* 193878 80264F98 00021403 */ sra $v0, $v0, 0x10 /* 19387C 80264F9C 44820000 */ mtc1 $v0, $f0 -/* 193880 80264FA0 00000000 */ nop +/* 193880 80264FA0 00000000 */ nop /* 193884 80264FA4 46800020 */ cvt.s.w $f0, $f0 /* 193888 80264FA8 E6000020 */ swc1 $f0, 0x20($s0) /* 19388C 80264FAC 90620006 */ lbu $v0, 6($v1) @@ -290,7 +290,7 @@ glabel load_partner_actor /* 19389C 80264FBC 00021400 */ sll $v0, $v0, 0x10 /* 1938A0 80264FC0 00021403 */ sra $v0, $v0, 0x10 /* 1938A4 80264FC4 44820000 */ mtc1 $v0, $f0 -/* 1938A8 80264FC8 00000000 */ nop +/* 1938A8 80264FC8 00000000 */ nop /* 1938AC 80264FCC 46800020 */ cvt.s.w $f0, $f0 /* 1938B0 80264FD0 E6000024 */ swc1 $f0, 0x24($s0) /* 1938B4 80264FD4 90620007 */ lbu $v0, 7($v1) @@ -306,7 +306,7 @@ glabel load_partner_actor /* 1938DC 80264FFC 00021400 */ sll $v0, $v0, 0x10 /* 1938E0 80265000 00021403 */ sra $v0, $v0, 0x10 /* 1938E4 80265004 44820000 */ mtc1 $v0, $f0 -/* 1938E8 80265008 00000000 */ nop +/* 1938E8 80265008 00000000 */ nop /* 1938EC 8026500C 46800020 */ cvt.s.w $f0, $f0 /* 1938F0 80265010 E6000028 */ swc1 $f0, 0x28($s0) /* 1938F4 80265014 8C620010 */ lw $v0, 0x10($v1) @@ -411,7 +411,7 @@ glabel load_partner_actor /* 193A80 802651A0 AE0200C0 */ sw $v0, 0xc0($s0) .L802651A4: /* 193A84 802651A4 08099469 */ j .L802651A4 -/* 193A88 802651A8 00000000 */ nop +/* 193A88 802651A8 00000000 */ nop .L802651AC: /* 193A8C 802651AC 0000282D */ daddu $a1, $zero, $zero /* 193A90 802651B0 0080182D */ daddu $v1, $a0, $zero @@ -425,18 +425,18 @@ glabel load_partner_actor /* 193AAC 802651CC C6200144 */ lwc1 $f0, 0x144($s1) /* 193AB0 802651D0 4600018D */ trunc.w.s $f6, $f0 /* 193AB4 802651D4 44023000 */ mfc1 $v0, $f6 -/* 193AB8 802651D8 00000000 */ nop +/* 193AB8 802651D8 00000000 */ nop /* 193ABC 802651DC A46207FC */ sh $v0, 0x7fc($v1) /* 193AC0 802651E0 C6200148 */ lwc1 $f0, 0x148($s1) /* 193AC4 802651E4 4600018D */ trunc.w.s $f6, $f0 /* 193AC8 802651E8 44023000 */ mfc1 $v0, $f6 -/* 193ACC 802651EC 00000000 */ nop +/* 193ACC 802651EC 00000000 */ nop /* 193AD0 802651F0 A462081C */ sh $v0, 0x81c($v1) /* 193AD4 802651F4 C620014C */ lwc1 $f0, 0x14c($s1) /* 193AD8 802651F8 24A50001 */ addiu $a1, $a1, 1 /* 193ADC 802651FC 4600018D */ trunc.w.s $f6, $f0 /* 193AE0 80265200 44023000 */ mfc1 $v0, $f6 -/* 193AE4 80265204 00000000 */ nop +/* 193AE4 80265204 00000000 */ nop /* 193AE8 80265208 A462083C */ sh $v0, 0x83c($v1) /* 193AEC 8026520C 28A20010 */ slti $v0, $a1, 0x10 /* 193AF0 80265210 1440FFEE */ bnez $v0, .L802651CC @@ -458,14 +458,14 @@ glabel load_partner_actor .L8026524C: /* 193B2C 8026524C 8E020000 */ lw $v0, ($s0) /* 193B30 80265250 04400007 */ bltz $v0, .L80265270 -/* 193B34 80265254 00000000 */ nop +/* 193B34 80265254 00000000 */ nop /* 193B38 80265258 0C00AB39 */ jal heap_malloc /* 193B3C 8026525C 2404008C */ addiu $a0, $zero, 0x8c /* 193B40 80265260 14400003 */ bnez $v0, .L80265270 /* 193B44 80265264 AE020010 */ sw $v0, 0x10($s0) .L80265268: /* 193B48 80265268 0809949A */ j .L80265268 -/* 193B4C 8026526C 00000000 */ nop +/* 193B4C 8026526C 00000000 */ nop .L80265270: /* 193B50 80265270 8E040094 */ lw $a0, 0x94($s0) /* 193B54 80265274 2402FFFF */ addiu $v0, $zero, -1 @@ -494,7 +494,7 @@ glabel load_partner_actor /* 193BAC 802652CC AE00000C */ sw $zero, 0xc($s0) .L802652D0: /* 193BB0 802652D0 080994B4 */ j .L802652D0 -/* 193BB4 802652D4 00000000 */ nop +/* 193BB4 802652D4 00000000 */ nop .L802652D8: /* 193BB8 802652D8 26730001 */ addiu $s3, $s3, 1 /* 193BBC 802652DC 0276102A */ slt $v0, $s3, $s6 @@ -512,7 +512,7 @@ glabel load_partner_actor /* 193BE8 80265308 44811800 */ mtc1 $at, $f3 /* 193BEC 8026530C 44801000 */ mtc1 $zero, $f2 /* 193BF0 80265310 44820000 */ mtc1 $v0, $f0 -/* 193BF4 80265314 00000000 */ nop +/* 193BF4 80265314 00000000 */ nop /* 193BF8 80265318 46800021 */ cvt.d.w $f0, $f0 /* 193BFC 8026531C 46220003 */ div.d $f0, $f0, $f2 /* 193C00 80265320 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/code_190B20/load_player_actor.s b/asm/nonmatchings/code_190B20/load_player_actor.s index 7cdbb14876..5207800b36 100644 --- a/asm/nonmatchings/code_190B20/load_player_actor.s +++ b/asm/nonmatchings/code_190B20/load_player_actor.s @@ -15,7 +15,7 @@ glabel load_player_actor /* 192DAC 802644CC AE2200D8 */ sw $v0, 0xd8($s1) .L802644D0: /* 192DB0 802644D0 08099134 */ j .L802644D0 -/* 192DB4 802644D4 00000000 */ nop +/* 192DB4 802644D4 00000000 */ nop .L802644D8: /* 192DB8 802644D8 92230093 */ lbu $v1, 0x93($s1) /* 192DBC 802644DC 24620001 */ addiu $v0, $v1, 1 @@ -32,13 +32,13 @@ glabel load_player_actor /* 192DE8 80264508 8C42C074 */ lw $v0, %lo(gBattleStatus+0x4)($v0) /* 192DEC 8026450C 30420040 */ andi $v0, $v0, 0x40 /* 192DF0 80264510 14400007 */ bnez $v0, .L80264530 -/* 192DF4 80264514 00000000 */ nop +/* 192DF4 80264514 00000000 */ nop /* 192DF8 80264518 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 192DFC 8026451C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 192E00 80264520 904200AA */ lbu $v0, 0xaa($v0) /* 192E04 80264524 30420002 */ andi $v0, $v0, 2 /* 192E08 80264528 1040000D */ beqz $v0, .L80264560 -/* 192E0C 8026452C 00000000 */ nop +/* 192E0C 8026452C 00000000 */ nop .L80264530: /* 192E10 80264530 3C01C302 */ lui $at, 0xc302 /* 192E14 80264534 44810000 */ mtc1 $at, $f0 @@ -99,11 +99,11 @@ glabel load_player_actor /* 192EE8 80264608 AE000200 */ sw $zero, 0x200($s0) /* 192EEC 8026460C 4600118D */ trunc.w.s $f6, $f2 /* 192EF0 80264610 44023000 */ mfc1 $v0, $f6 -/* 192EF4 80264614 00000000 */ nop +/* 192EF4 80264614 00000000 */ nop /* 192EF8 80264618 A6020158 */ sh $v0, 0x158($s0) /* 192EFC 8026461C 4600218D */ trunc.w.s $f6, $f4 /* 192F00 80264620 44023000 */ mfc1 $v0, $f6 -/* 192F04 80264624 00000000 */ nop +/* 192F04 80264624 00000000 */ nop /* 192F08 80264628 A602015A */ sh $v0, 0x15a($s0) /* 192F0C 8026462C A2030191 */ sb $v1, 0x191($s0) /* 192F10 80264630 A2000204 */ sb $zero, 0x204($s0) @@ -213,7 +213,7 @@ glabel load_player_actor /* 1930AC 802647CC AE1101F4 */ sw $s1, 0x1f4($s0) .L802647D0: /* 1930B0 802647D0 080991F4 */ j .L802647D0 -/* 1930B4 802647D4 00000000 */ nop +/* 1930B4 802647D4 00000000 */ nop .L802647D8: /* 1930B8 802647D8 24020001 */ addiu $v0, $zero, 1 /* 1930BC 802647DC A20201F3 */ sb $v0, 0x1f3($s0) @@ -251,7 +251,7 @@ glabel load_player_actor /* 19313C 8026485C 8C42C074 */ lw $v0, %lo(gBattleStatus+0x4)($v0) /* 193140 80264860 30420040 */ andi $v0, $v0, 0x40 /* 193144 80264864 10400005 */ beqz $v0, .L8026487C -/* 193148 80264868 00000000 */ nop +/* 193148 80264868 00000000 */ nop /* 19314C 8026486C 3C028028 */ lui $v0, %hi(D_8028340C) /* 193150 80264870 2442340C */ addiu $v0, $v0, %lo(D_8028340C) /* 193154 80264874 08099222 */ j .L80264888 @@ -364,7 +364,7 @@ glabel load_player_actor /* 1932F8 80264A18 AE2200C0 */ sw $v0, 0xc0($s1) .L80264A1C: /* 1932FC 80264A1C 08099287 */ j .L80264A1C -/* 193300 80264A20 00000000 */ nop +/* 193300 80264A20 00000000 */ nop .L80264A24: /* 193304 80264A24 0000182D */ daddu $v1, $zero, $zero /* 193308 80264A28 00A0202D */ daddu $a0, $a1, $zero @@ -378,18 +378,18 @@ glabel load_player_actor /* 193324 80264A44 C6000144 */ lwc1 $f0, 0x144($s0) /* 193328 80264A48 4600018D */ trunc.w.s $f6, $f0 /* 19332C 80264A4C 44023000 */ mfc1 $v0, $f6 -/* 193330 80264A50 00000000 */ nop +/* 193330 80264A50 00000000 */ nop /* 193334 80264A54 A48207FC */ sh $v0, 0x7fc($a0) /* 193338 80264A58 C6000148 */ lwc1 $f0, 0x148($s0) /* 19333C 80264A5C 4600018D */ trunc.w.s $f6, $f0 /* 193340 80264A60 44023000 */ mfc1 $v0, $f6 -/* 193344 80264A64 00000000 */ nop +/* 193344 80264A64 00000000 */ nop /* 193348 80264A68 A482081C */ sh $v0, 0x81c($a0) /* 19334C 80264A6C C600014C */ lwc1 $f0, 0x14c($s0) /* 193350 80264A70 24630001 */ addiu $v1, $v1, 1 /* 193354 80264A74 4600018D */ trunc.w.s $f6, $f0 /* 193358 80264A78 44023000 */ mfc1 $v0, $f6 -/* 19335C 80264A7C 00000000 */ nop +/* 19335C 80264A7C 00000000 */ nop /* 193360 80264A80 A482083C */ sh $v0, 0x83c($a0) /* 193364 80264A84 28620010 */ slti $v0, $v1, 0x10 /* 193368 80264A88 1440FFEE */ bnez $v0, .L80264A44 @@ -415,7 +415,7 @@ glabel load_player_actor /* 1933B0 80264AD0 AE220010 */ sw $v0, 0x10($s1) .L80264AD4: /* 1933B4 80264AD4 080992B5 */ j .L80264AD4 -/* 1933B8 80264AD8 00000000 */ nop +/* 1933B8 80264AD8 00000000 */ nop .L80264ADC: /* 1933BC 80264ADC 8E050144 */ lw $a1, 0x144($s0) /* 1933C0 80264AE0 8E060148 */ lw $a2, 0x148($s0) @@ -428,7 +428,7 @@ glabel load_player_actor /* 1933DC 80264AFC 44811800 */ mtc1 $at, $f3 /* 1933E0 80264B00 44801000 */ mtc1 $zero, $f2 /* 1933E4 80264B04 44820000 */ mtc1 $v0, $f0 -/* 1933E8 80264B08 00000000 */ nop +/* 1933E8 80264B08 00000000 */ nop /* 1933EC 80264B0C 46800021 */ cvt.d.w $f0, $f0 /* 1933F0 80264B10 46220003 */ div.d $f0, $f0, $f2 /* 1933F4 80264B14 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/code_190B20/lookup_status_chance.s b/asm/nonmatchings/code_190B20/lookup_status_chance.s index cba3b0d500..6fa37d3ede 100644 --- a/asm/nonmatchings/code_190B20/lookup_status_chance.s +++ b/asm/nonmatchings/code_190B20/lookup_status_chance.s @@ -11,7 +11,7 @@ glabel lookup_status_chance /* 194790 80265EB0 8C620000 */ lw $v0, ($v1) .L80265EB4: /* 194794 80265EB4 14470002 */ bne $v0, $a3, .L80265EC0 -/* 194798 80265EB8 00000000 */ nop +/* 194798 80265EB8 00000000 */ nop /* 19479C 80265EBC 8C860000 */ lw $a2, ($a0) .L80265EC0: /* 1947A0 80265EC0 14450004 */ bne $v0, $a1, .L80265ED4 @@ -26,4 +26,4 @@ glabel lookup_status_chance .L80265EE0: /* 1947C0 80265EE0 00C0102D */ daddu $v0, $a2, $zero /* 1947C4 80265EE4 03E00008 */ jr $ra -/* 1947C8 80265EE8 00000000 */ nop +/* 1947C8 80265EE8 00000000 */ nop diff --git a/asm/nonmatchings/code_190B20/lookup_status_duration_mod.s b/asm/nonmatchings/code_190B20/lookup_status_duration_mod.s index 654d321f00..b4a300e5c8 100644 --- a/asm/nonmatchings/code_190B20/lookup_status_duration_mod.s +++ b/asm/nonmatchings/code_190B20/lookup_status_duration_mod.s @@ -11,7 +11,7 @@ glabel lookup_status_duration_mod /* 1947E4 80265F04 8C620000 */ lw $v0, ($v1) .L80265F08: /* 1947E8 80265F08 14470002 */ bne $v0, $a3, .L80265F14 -/* 1947EC 80265F0C 00000000 */ nop +/* 1947EC 80265F0C 00000000 */ nop /* 1947F0 80265F10 8C860000 */ lw $a2, ($a0) .L80265F14: /* 1947F4 80265F14 14450004 */ bne $v0, $a1, .L80265F28 @@ -26,4 +26,4 @@ glabel lookup_status_duration_mod .L80265F34: /* 194814 80265F34 00C0102D */ daddu $v0, $a2, $zero /* 194818 80265F38 03E00008 */ jr $ra -/* 19481C 80265F3C 00000000 */ nop +/* 19481C 80265F3C 00000000 */ nop diff --git a/asm/nonmatchings/code_190B20/play_movement_dust_effects.s b/asm/nonmatchings/code_190B20/play_movement_dust_effects.s index f75a709992..1f5f92d6ed 100644 --- a/asm/nonmatchings/code_190B20/play_movement_dust_effects.s +++ b/asm/nonmatchings/code_190B20/play_movement_dust_effects.s @@ -15,7 +15,7 @@ glabel play_movement_dust_effects /* 192BF8 80264318 1482000C */ bne $a0, $v0, .L8026434C /* 192BFC 8026431C 24020001 */ addiu $v0, $zero, 1 /* 192C00 80264320 44800000 */ mtc1 $zero, $f0 -/* 192C04 80264324 00000000 */ nop +/* 192C04 80264324 00000000 */ nop /* 192C08 80264328 4600C600 */ add.s $f24, $f24, $f0 /* 192C0C 8026432C 3C018029 */ lui $at, %hi(D_802938A4) /* 192C10 80264330 C42038A4 */ lwc1 $f0, %lo(D_802938A4)($at) @@ -24,7 +24,7 @@ glabel play_movement_dust_effects /* 192C1C 8026433C 0C01BEB4 */ jal fx_walk_large /* 192C20 80264340 E7A00010 */ swc1 $f0, 0x10($sp) /* 192C24 80264344 08099110 */ j .L80264440 -/* 192C28 80264348 00000000 */ nop +/* 192C28 80264348 00000000 */ nop .L8026434C: /* 192C2C 8026434C 14820004 */ bne $a0, $v0, .L80264360 /* 192C30 80264350 24020004 */ addiu $v0, $zero, 4 @@ -48,12 +48,12 @@ glabel play_movement_dust_effects /* 192C74 80264394 3C0140C9 */ lui $at, 0x40c9 /* 192C78 80264398 34210FD0 */ ori $at, $at, 0xfd0 /* 192C7C 8026439C 44811000 */ mtc1 $at, $f2 -/* 192C80 802643A0 00000000 */ nop +/* 192C80 802643A0 00000000 */ nop /* 192C84 802643A4 46020502 */ mul.s $f20, $f0, $f2 -/* 192C88 802643A8 00000000 */ nop +/* 192C88 802643A8 00000000 */ nop /* 192C8C 802643AC 3C0143B4 */ lui $at, 0x43b4 /* 192C90 802643B0 44810000 */ mtc1 $at, $f0 -/* 192C94 802643B4 00000000 */ nop +/* 192C94 802643B4 00000000 */ nop /* 192C98 802643B8 4600A503 */ div.s $f20, $f20, $f0 /* 192C9C 802643BC 0C00A85B */ jal sin_rad /* 192CA0 802643C0 4600A306 */ mov.s $f12, $f20 @@ -62,22 +62,22 @@ glabel play_movement_dust_effects /* 192CAC 802643CC 46000506 */ mov.s $f20, $f0 /* 192CB0 802643D0 3C0141C0 */ lui $at, 0x41c0 /* 192CB4 802643D4 44812000 */ mtc1 $at, $f4 -/* 192CB8 802643D8 00000000 */ nop +/* 192CB8 802643D8 00000000 */ nop /* 192CBC 802643DC 4604A182 */ mul.s $f6, $f20, $f4 -/* 192CC0 802643E0 00000000 */ nop +/* 192CC0 802643E0 00000000 */ nop /* 192CC4 802643E4 46040102 */ mul.s $f4, $f0, $f4 -/* 192CC8 802643E8 00000000 */ nop +/* 192CC8 802643E8 00000000 */ nop /* 192CCC 802643EC 3C013E4C */ lui $at, 0x3e4c /* 192CD0 802643F0 3421CCCD */ ori $at, $at, 0xcccd /* 192CD4 802643F4 44811000 */ mtc1 $at, $f2 -/* 192CD8 802643F8 00000000 */ nop +/* 192CD8 802643F8 00000000 */ nop /* 192CDC 802643FC 46023182 */ mul.s $f6, $f6, $f2 -/* 192CE0 80264400 00000000 */ nop +/* 192CE0 80264400 00000000 */ nop /* 192CE4 80264404 46022102 */ mul.s $f4, $f4, $f2 -/* 192CE8 80264408 00000000 */ nop +/* 192CE8 80264408 00000000 */ nop /* 192CEC 8026440C 3C013FC0 */ lui $at, 0x3fc0 /* 192CF0 80264410 44811000 */ mtc1 $at, $f2 -/* 192CF4 80264414 00000000 */ nop +/* 192CF4 80264414 00000000 */ nop /* 192CF8 80264418 4602C600 */ add.s $f24, $f24, $f2 /* 192CFC 8026441C 4606B580 */ add.s $f22, $f22, $f6 /* 192D00 80264420 4604D680 */ add.s $f26, $f26, $f4 diff --git a/asm/nonmatchings/code_190B20/reset_all_actor_sounds.s b/asm/nonmatchings/code_190B20/reset_all_actor_sounds.s index 8e5ce994f4..9d75044ff5 100644 --- a/asm/nonmatchings/code_190B20/reset_all_actor_sounds.s +++ b/asm/nonmatchings/code_190B20/reset_all_actor_sounds.s @@ -80,7 +80,7 @@ glabel reset_all_actor_sounds /* 1964A4 80267BC4 A4A200BE */ sh $v0, 0xbe($a1) /* 1964A8 80267BC8 8CA5000C */ lw $a1, 0xc($a1) /* 1964AC 80267BCC 14A0FFEE */ bnez $a1, .L80267B88 -/* 1964B0 80267BD0 00000000 */ nop +/* 1964B0 80267BD0 00000000 */ nop .L80267BD4: /* 1964B4 80267BD4 03E00008 */ jr $ra -/* 1964B8 80267BD8 00000000 */ nop +/* 1964B8 80267BD8 00000000 */ nop diff --git a/asm/nonmatchings/code_190B20/set_animation.s b/asm/nonmatchings/code_190B20/set_animation.s index 1b05f1eef5..545e521fd5 100644 --- a/asm/nonmatchings/code_190B20/set_animation.s +++ b/asm/nonmatchings/code_190B20/set_animation.s @@ -13,7 +13,7 @@ glabel set_animation /* 1925FC 80263D1C 06400033 */ bltz $s2, .L80263DEC /* 192600 80263D20 AFB10014 */ sw $s1, 0x14($sp) /* 192604 80263D24 0C09A75B */ jal get_actor -/* 192608 80263D28 00000000 */ nop +/* 192608 80263D28 00000000 */ nop /* 19260C 80263D2C 0040882D */ daddu $s1, $v0, $zero /* 192610 80263D30 32040700 */ andi $a0, $s0, 0x700 /* 192614 80263D34 24020100 */ addiu $v0, $zero, 0x100 @@ -22,14 +22,14 @@ glabel set_animation /* 192620 80263D40 50400005 */ beql $v0, $zero, .L80263D58 /* 192624 80263D44 24020200 */ addiu $v0, $zero, 0x200 /* 192628 80263D48 10800007 */ beqz $a0, .L80263D68 -/* 19262C 80263D4C 00000000 */ nop +/* 19262C 80263D4C 00000000 */ nop /* 192630 80263D50 08098F7B */ j .L80263DEC -/* 192634 80263D54 00000000 */ nop +/* 192634 80263D54 00000000 */ nop .L80263D58: /* 192638 80263D58 10820016 */ beq $a0, $v0, .L80263DB4 /* 19263C 80263D5C 0220202D */ daddu $a0, $s1, $zero /* 192640 80263D60 08098F7B */ j .L80263DEC -/* 192644 80263D64 00000000 */ nop +/* 192644 80263D64 00000000 */ nop .L80263D68: /* 192648 80263D68 8E3001F4 */ lw $s0, 0x1f4($s1) /* 19264C 80263D6C 8E020088 */ lw $v0, 0x88($s0) @@ -40,7 +40,7 @@ glabel set_animation /* 192660 80263D80 0C0B76A3 */ jal func_802DDA8C /* 192664 80263D84 AE050088 */ sw $a1, 0x88($s0) /* 192668 80263D88 08098F7B */ j .L80263DEC -/* 19266C 80263D8C 00000000 */ nop +/* 19266C 80263D8C 00000000 */ nop .L80263D90: /* 192670 80263D90 12600006 */ beqz $s3, .L80263DAC /* 192674 80263D94 0220202D */ daddu $a0, $s1, $zero @@ -48,7 +48,7 @@ glabel set_animation /* 19267C 80263D9C 0260282D */ daddu $a1, $s3, $zero /* 192680 80263DA0 0040802D */ daddu $s0, $v0, $zero /* 192684 80263DA4 16000006 */ bnez $s0, .L80263DC0 -/* 192688 80263DA8 00000000 */ nop +/* 192688 80263DA8 00000000 */ nop .L80263DAC: /* 19268C 80263DAC 08098F70 */ j .L80263DC0 /* 192690 80263DB0 8E3001F4 */ lw $s0, 0x1f4($s1) @@ -66,7 +66,7 @@ glabel set_animation /* 1926B8 80263DD8 AE050088 */ sw $a1, 0x88($s0) /* 1926BC 80263DDC 8E040084 */ lw $a0, 0x84($s0) /* 1926C0 80263DE0 0C0B7972 */ jal func_802DE5C8 -/* 1926C4 80263DE4 00000000 */ nop +/* 1926C4 80263DE4 00000000 */ nop /* 1926C8 80263DE8 AE02008C */ sw $v0, 0x8c($s0) .L80263DEC: /* 1926CC 80263DEC 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/code_190B20/set_animation_rate.s b/asm/nonmatchings/code_190B20/set_animation_rate.s index afd00cf8bd..02c2d27ba7 100644 --- a/asm/nonmatchings/code_190B20/set_animation_rate.s +++ b/asm/nonmatchings/code_190B20/set_animation_rate.s @@ -22,12 +22,12 @@ glabel set_animation_rate /* 1927DC 80263EFC 12000010 */ beqz $s0, .L80263F40 /* 1927E0 80263F00 0220202D */ daddu $a0, $s1, $zero /* 1927E4 80263F04 08098FD3 */ j .L80263F4C -/* 1927E8 80263F08 00000000 */ nop +/* 1927E8 80263F08 00000000 */ nop .L80263F0C: /* 1927EC 80263F0C 1202000C */ beq $s0, $v0, .L80263F40 /* 1927F0 80263F10 0220202D */ daddu $a0, $s1, $zero /* 1927F4 80263F14 08098FD3 */ j .L80263F4C -/* 1927F8 80263F18 00000000 */ nop +/* 1927F8 80263F18 00000000 */ nop .L80263F1C: /* 1927FC 80263F1C 12400005 */ beqz $s2, .L80263F34 /* 192800 80263F20 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/code_190B20/show_damage_popup.s b/asm/nonmatchings/code_190B20/show_damage_popup.s index 6b3a3b0990..74cf569a76 100644 --- a/asm/nonmatchings/code_190B20/show_damage_popup.s +++ b/asm/nonmatchings/code_190B20/show_damage_popup.s @@ -22,7 +22,7 @@ glabel show_damage_popup /* 194ECC 802665EC 2A020018 */ slti $v0, $s0, 0x18 .L802665F0: /* 194ED0 802665F0 14400007 */ bnez $v0, .L80266610 -/* 194ED4 802665F4 00000000 */ nop +/* 194ED4 802665F4 00000000 */ nop /* 194ED8 802665F8 8CA20000 */ lw $v0, ($a1) /* 194EDC 802665FC 0000802D */ daddu $s0, $zero, $zero /* 194EE0 80266600 8C43000C */ lw $v1, 0xc($v0) @@ -35,7 +35,7 @@ glabel show_damage_popup /* 194EF8 80266618 2404FFC9 */ addiu $a0, $zero, -0x37 .L8026661C: /* 194EFC 8026661C 44840000 */ mtc1 $a0, $f0 -/* 194F00 80266620 00000000 */ nop +/* 194F00 80266620 00000000 */ nop /* 194F04 80266624 46800020 */ cvt.s.w $f0, $f0 /* 194F08 80266628 3C028029 */ lui $v0, %hi(D_802938AC) /* 194F0C 8026662C 244238AC */ addiu $v0, $v0, %lo(D_802938AC) diff --git a/asm/nonmatchings/code_190B20/start_rumble_type.s b/asm/nonmatchings/code_190B20/start_rumble_type.s index 0390509c78..1f8925e66d 100644 --- a/asm/nonmatchings/code_190B20/start_rumble_type.s +++ b/asm/nonmatchings/code_190B20/start_rumble_type.s @@ -10,40 +10,47 @@ glabel start_rumble_type /* 1966E8 80267E08 10800003 */ beqz $a0, .L80267E18 /* 1966EC 80267E0C AFBF0014 */ sw $ra, 0x14($sp) /* 1966F0 80267E10 0C0B102B */ jal kill_script_by_ID -/* 1966F4 80267E14 00000000 */ nop +/* 1966F4 80267E14 00000000 */ nop .L80267E18: /* 1966F8 80267E18 2E02000C */ sltiu $v0, $s0, 0xc /* 1966FC 80267E1C 10400026 */ beqz $v0, .L80267EB8 /* 196700 80267E20 00101080 */ sll $v0, $s0, 2 -/* 196704 80267E24 3C01802A */ lui $at, %hi(D_8029D670) +/* 196704 80267E24 3C01802A */ lui $at, %hi(jtbl_8029D670_1CBF50) /* 196708 80267E28 00220821 */ addu $at, $at, $v0 -/* 19670C 80267E2C 8C22D670 */ lw $v0, %lo(D_8029D670)($at) +/* 19670C 80267E2C 8C22D670 */ lw $v0, %lo(jtbl_8029D670_1CBF50)($at) /* 196710 80267E30 00400008 */ jr $v0 -/* 196714 80267E34 00000000 */ nop +/* 196714 80267E34 00000000 */ nop +glabel L80267E38_196718 /* 196718 80267E38 3C048029 */ lui $a0, %hi(D_802939C4) /* 19671C 80267E3C 248439C4 */ addiu $a0, $a0, %lo(D_802939C4) /* 196720 80267E40 08099FA9 */ j .L80267EA4 /* 196724 80267E44 2405000A */ addiu $a1, $zero, 0xa +glabel L80267E48_196728 /* 196728 80267E48 3C048029 */ lui $a0, %hi(D_80293A10) /* 19672C 80267E4C 24843A10 */ addiu $a0, $a0, %lo(D_80293A10) /* 196730 80267E50 08099FA9 */ j .L80267EA4 /* 196734 80267E54 2405000A */ addiu $a1, $zero, 0xa +glabel L80267E58_196738 /* 196738 80267E58 3C048029 */ lui $a0, %hi(D_80293A34) /* 19673C 80267E5C 24843A34 */ addiu $a0, $a0, %lo(D_80293A34) /* 196740 80267E60 08099FA9 */ j .L80267EA4 /* 196744 80267E64 2405000A */ addiu $a1, $zero, 0xa +glabel L80267E68_196748 /* 196748 80267E68 3C048029 */ lui $a0, %hi(D_80293A58) /* 19674C 80267E6C 24843A58 */ addiu $a0, $a0, %lo(D_80293A58) /* 196750 80267E70 08099FA9 */ j .L80267EA4 /* 196754 80267E74 2405000A */ addiu $a1, $zero, 0xa +glabel L80267E78_196758 /* 196758 80267E78 3C048029 */ lui $a0, %hi(D_80293A7C) /* 19675C 80267E7C 24843A7C */ addiu $a0, $a0, %lo(D_80293A7C) /* 196760 80267E80 08099FA9 */ j .L80267EA4 /* 196764 80267E84 2405000A */ addiu $a1, $zero, 0xa +glabel L80267E88_196768 /* 196768 80267E88 3C048029 */ lui $a0, %hi(D_80293AA0) /* 19676C 80267E8C 24843AA0 */ addiu $a0, $a0, %lo(D_80293AA0) /* 196770 80267E90 08099FA9 */ j .L80267EA4 /* 196774 80267E94 2405000A */ addiu $a1, $zero, 0xa +glabel L80267E98_196778 /* 196778 80267E98 3C048029 */ lui $a0, %hi(D_80293AC4) /* 19677C 80267E9C 24843AC4 */ addiu $a0, $a0, %lo(D_80293AC4) /* 196780 80267EA0 2405000A */ addiu $a1, $zero, 0xa @@ -54,9 +61,10 @@ glabel start_rumble_type /* 196790 80267EB0 3C018029 */ lui $at, %hi(D_802939C0) /* 196794 80267EB4 AC2239C0 */ sw $v0, %lo(D_802939C0)($at) .L80267EB8: +glabel L80267EB8_196798 /* 196798 80267EB8 8FBF0014 */ lw $ra, 0x14($sp) /* 19679C 80267EBC 8FB00010 */ lw $s0, 0x10($sp) /* 1967A0 80267EC0 03E00008 */ jr $ra /* 1967A4 80267EC4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 1967A8 80267EC8 00000000 */ nop -/* 1967AC 80267ECC 00000000 */ nop +/* 1967A8 80267EC8 00000000 */ nop +/* 1967AC 80267ECC 00000000 */ nop diff --git a/asm/nonmatchings/code_190B20/try_inflict_status.s b/asm/nonmatchings/code_190B20/try_inflict_status.s index 5aa90ed404..39125e3888 100644 --- a/asm/nonmatchings/code_190B20/try_inflict_status.s +++ b/asm/nonmatchings/code_190B20/try_inflict_status.s @@ -28,7 +28,7 @@ glabel try_inflict_status /* 1954B4 80266BD4 0C099B3C */ jal inflict_status_set_duration /* 1954B8 80266BD8 02223821 */ addu $a3, $s1, $v0 /* 1954BC 80266BDC 08099B33 */ j .L80266CCC -/* 1954C0 80266BE0 00000000 */ nop +/* 1954C0 80266BE0 00000000 */ nop .L80266BE4: /* 1954C4 80266BE4 8E44020C */ lw $a0, 0x20c($s2) /* 1954C8 80266BE8 10800026 */ beqz $a0, .L80266C84 @@ -37,7 +37,7 @@ glabel try_inflict_status /* 1954D4 80266BF4 3C034000 */ lui $v1, 0x4000 /* 1954D8 80266BF8 00431024 */ and $v0, $v0, $v1 /* 1954DC 80266BFC 14400005 */ bnez $v0, .L80266C14 -/* 1954E0 80266C00 00000000 */ nop +/* 1954E0 80266C00 00000000 */ nop /* 1954E4 80266C04 0C0997A6 */ jal lookup_status_chance /* 1954E8 80266C08 0280282D */ daddu $a1, $s4, $zero /* 1954EC 80266C0C 08099B09 */ j .L80266C24 @@ -54,19 +54,19 @@ glabel try_inflict_status /* 195510 80266C30 02020018 */ mult $s0, $v0 /* 195514 80266C34 00001012 */ mflo $v0 /* 195518 80266C38 3463851F */ ori $v1, $v1, 0x851f -/* 19551C 80266C3C 00000000 */ nop +/* 19551C 80266C3C 00000000 */ nop /* 195520 80266C40 00430018 */ mult $v0, $v1 /* 195524 80266C44 000217C3 */ sra $v0, $v0, 0x1f /* 195528 80266C48 00001810 */ mfhi $v1 /* 19552C 80266C4C 00031943 */ sra $v1, $v1, 5 /* 195530 80266C50 00628023 */ subu $s0, $v1, $v0 /* 195534 80266C54 1A00000C */ blez $s0, .L80266C88 -/* 195538 80266C58 00000000 */ nop +/* 195538 80266C58 00000000 */ nop /* 19553C 80266C5C 0C00A67F */ jal rand_int /* 195540 80266C60 24040064 */ addiu $a0, $zero, 0x64 /* 195544 80266C64 0202102A */ slt $v0, $s0, $v0 /* 195548 80266C68 14400007 */ bnez $v0, .L80266C88 -/* 19554C 80266C6C 00000000 */ nop +/* 19554C 80266C6C 00000000 */ nop /* 195550 80266C70 8E44020C */ lw $a0, 0x20c($s2) /* 195554 80266C74 0C0997BB */ jal lookup_status_duration_mod /* 195558 80266C78 02A0282D */ daddu $a1, $s5, $zero diff --git a/asm/nonmatchings/code_1967B0/LoadFreeItemScript.s b/asm/nonmatchings/code_1967B0/LoadFreeItemScript.s index 4e8405e15b..c98a11c473 100644 --- a/asm/nonmatchings/code_1967B0/LoadFreeItemScript.s +++ b/asm/nonmatchings/code_1967B0/LoadFreeItemScript.s @@ -49,7 +49,7 @@ glabel LoadFreeItemScript /* 1969A8 802680C8 8C620000 */ lw $v0, ($v1) .L802680CC: /* 1969AC 802680CC 14400004 */ bnez $v0, .L802680E0 -/* 1969B0 802680D0 00000000 */ nop +/* 1969B0 802680D0 00000000 */ nop .L802680D4: /* 1969B4 802680D4 96420018 */ lhu $v0, 0x18($s2) /* 1969B8 802680D8 30420080 */ andi $v0, $v0, 0x80 diff --git a/asm/nonmatchings/code_1967B0/LoadItemScript.s b/asm/nonmatchings/code_1967B0/LoadItemScript.s index a6fe57a13f..27c4489f32 100644 --- a/asm/nonmatchings/code_1967B0/LoadItemScript.s +++ b/asm/nonmatchings/code_1967B0/LoadItemScript.s @@ -38,9 +38,9 @@ glabel LoadItemScript /* 19682C 80267F4C 82230088 */ lb $v1, 0x88($s1) /* 196830 80267F50 24020002 */ addiu $v0, $zero, 2 /* 196834 80267F54 14620003 */ bne $v1, $v0, .L80267F64 -/* 196838 80267F58 00000000 */ nop +/* 196838 80267F58 00000000 */ nop /* 19683C 80267F5C 0C098EF2 */ jal deduct_current_move_fp -/* 196840 80267F60 00000000 */ nop +/* 196840 80267F60 00000000 */ nop .L80267F64: /* 196844 80267F64 8623017C */ lh $v1, 0x17c($s1) /* 196848 80267F68 24020036 */ addiu $v0, $zero, 0x36 @@ -49,9 +49,9 @@ glabel LoadItemScript /* 196850 80267F70 24020003 */ addiu $v0, $zero, 3 /* 196854 80267F74 82230088 */ lb $v1, 0x88($s1) /* 196858 80267F78 14620003 */ bne $v1, $v0, .L80267F88 -/* 19685C 80267F7C 00000000 */ nop +/* 19685C 80267F7C 00000000 */ nop /* 196860 80267F80 0C098EF2 */ jal deduct_current_move_fp -/* 196864 80267F84 00000000 */ nop +/* 196864 80267F84 00000000 */ nop .L80267F88: /* 196868 80267F88 3C038029 */ lui $v1, %hi(D_80293B80) /* 19686C 80267F8C 24633B80 */ addiu $v1, $v1, %lo(D_80293B80) @@ -69,7 +69,7 @@ glabel LoadItemScript /* 196898 80267FB8 8C620000 */ lw $v0, ($v1) .L80267FBC: /* 19689C 80267FBC 14400004 */ bnez $v0, .L80267FD0 -/* 1968A0 80267FC0 00000000 */ nop +/* 1968A0 80267FC0 00000000 */ nop .L80267FC4: /* 1968A4 80267FC4 96420018 */ lhu $v0, 0x18($s2) /* 1968A8 80267FC8 30420080 */ andi $v0, $v0, 0x80 diff --git a/asm/nonmatchings/code_196AA0/CloseActionCommandInfo.s b/asm/nonmatchings/code_196AA0/CloseActionCommandInfo.s index 77bb19726b..331c148628 100644 --- a/asm/nonmatchings/code_196AA0/CloseActionCommandInfo.s +++ b/asm/nonmatchings/code_196AA0/CloseActionCommandInfo.s @@ -15,7 +15,7 @@ glabel CloseActionCommandInfo /* 197D18 80269438 24020002 */ addiu $v0, $zero, 2 .L8026943C: /* 197D1C 8026943C 0C09A327 */ jal func_80268C9C -/* 197D20 80269440 00000000 */ nop +/* 197D20 80269440 00000000 */ nop /* 197D24 80269444 0809A519 */ j .L80269464 /* 197D28 80269448 0000102D */ daddu $v0, $zero, $zero .L8026944C: @@ -23,7 +23,7 @@ glabel CloseActionCommandInfo /* 197D30 80269450 0C05271B */ jal stop_sound /* 197D34 80269454 34840041 */ ori $a0, $a0, 0x41 /* 197D38 80269458 0C093EC3 */ jal close_action_command_instruction_popup -/* 197D3C 8026945C 00000000 */ nop +/* 197D3C 8026945C 00000000 */ nop /* 197D40 80269460 24020002 */ addiu $v0, $zero, 2 .L80269464: /* 197D44 80269464 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_196AA0/func_80268284.s b/asm/nonmatchings/code_196AA0/func_80268284.s index f056733c50..dd30fa3e1b 100644 --- a/asm/nonmatchings/code_196AA0/func_80268284.s +++ b/asm/nonmatchings/code_196AA0/func_80268284.s @@ -58,7 +58,7 @@ glabel func_80268284 /* 196C28 80268348 15A10004 */ bne $t5, $at, .L8026835C /* 196C2C 8026834C 3C018000 */ lui $at, 0x8000 /* 196C30 80268350 14610002 */ bne $v1, $at, .L8026835C -/* 196C34 80268354 00000000 */ nop +/* 196C34 80268354 00000000 */ nop /* 196C38 80268358 0006000D */ break 6 .L8026835C: /* 196C3C 8026835C 00001812 */ mflo $v1 @@ -98,7 +98,7 @@ glabel func_80268284 /* 196CB8 802683D8 14810004 */ bne $a0, $at, .L802683EC /* 196CBC 802683DC 3C018000 */ lui $at, 0x8000 /* 196CC0 802683E0 16A10002 */ bne $s5, $at, .L802683EC -/* 196CC4 802683E4 00000000 */ nop +/* 196CC4 802683E4 00000000 */ nop /* 196CC8 802683E8 0006000D */ break 6 .L802683EC: /* 196CCC 802683EC 00001012 */ mflo $v0 @@ -133,7 +133,7 @@ glabel func_80268284 /* 196D34 80268454 15A10004 */ bne $t5, $at, .L80268468 /* 196D38 80268458 3C018000 */ lui $at, 0x8000 /* 196D3C 8026845C 14610002 */ bne $v1, $at, .L80268468 -/* 196D40 80268460 00000000 */ nop +/* 196D40 80268460 00000000 */ nop /* 196D44 80268464 0006000D */ break 6 .L80268468: /* 196D48 80268468 00001812 */ mflo $v1 @@ -266,7 +266,7 @@ glabel func_80268284 /* 196F1C 8026863C 15A10004 */ bne $t5, $at, .L80268650 /* 196F20 80268640 3C018000 */ lui $at, 0x8000 /* 196F24 80268644 14810002 */ bne $a0, $at, .L80268650 -/* 196F28 80268648 00000000 */ nop +/* 196F28 80268648 00000000 */ nop /* 196F2C 8026864C 0006000D */ break 6 .L80268650: /* 196F30 80268650 00002012 */ mflo $a0 diff --git a/asm/nonmatchings/code_196AA0/func_802687BC.s b/asm/nonmatchings/code_196AA0/func_802687BC.s index 6984f94fd9..293f3456be 100644 --- a/asm/nonmatchings/code_196AA0/func_802687BC.s +++ b/asm/nonmatchings/code_196AA0/func_802687BC.s @@ -8,7 +8,7 @@ glabel func_802687BC /* 1970A8 802687C8 3C01802A */ lui $at, %hi(D_8029FBC0) /* 1970AC 802687CC AC22FBC0 */ sw $v0, %lo(D_8029FBC0)($at) /* 1970B0 802687D0 0C09A0A1 */ jal func_80268284 -/* 1970B4 802687D4 00000000 */ nop +/* 1970B4 802687D4 00000000 */ nop /* 1970B8 802687D8 8FBF0010 */ lw $ra, 0x10($sp) /* 1970BC 802687DC 03E00008 */ jr $ra /* 1970C0 802687E0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_196AA0/func_802687E4.s b/asm/nonmatchings/code_196AA0/func_802687E4.s index fabce05eab..4c8b75d667 100644 --- a/asm/nonmatchings/code_196AA0/func_802687E4.s +++ b/asm/nonmatchings/code_196AA0/func_802687E4.s @@ -8,7 +8,7 @@ glabel func_802687E4 /* 1970D0 802687F0 8FA70028 */ lw $a3, 0x28($sp) /* 1970D4 802687F4 AFBF0010 */ sw $ra, 0x10($sp) /* 1970D8 802687F8 0C09A0A1 */ jal func_80268284 -/* 1970DC 802687FC 00000000 */ nop +/* 1970DC 802687FC 00000000 */ nop /* 1970E0 80268800 8FBF0010 */ lw $ra, 0x10($sp) /* 1970E4 80268804 03E00008 */ jr $ra /* 1970E8 80268808 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_196AA0/func_80268858.s b/asm/nonmatchings/code_196AA0/func_80268858.s index e163b54807..cfd930d2cd 100644 --- a/asm/nonmatchings/code_196AA0/func_80268858.s +++ b/asm/nonmatchings/code_196AA0/func_80268858.s @@ -17,7 +17,7 @@ glabel func_80268858 /* 197168 80268888 3C110008 */ lui $s1, 8 /* 19716C 8026888C 00511024 */ and $v0, $v0, $s1 /* 197170 80268890 14400015 */ bnez $v0, .L802688E8 -/* 197174 80268894 00000000 */ nop +/* 197174 80268894 00000000 */ nop /* 197178 80268898 0C03A752 */ jal is_ability_active /* 19717C 8026889C 24040016 */ addiu $a0, $zero, 0x16 /* 197180 802688A0 10400002 */ beqz $v0, .L802688AC @@ -27,7 +27,7 @@ glabel func_80268858 /* 19718C 802688AC 8E420000 */ lw $v0, ($s2) /* 197190 802688B0 00511024 */ and $v0, $v0, $s1 /* 197194 802688B4 1440000C */ bnez $v0, .L802688E8 -/* 197198 802688B8 00000000 */ nop +/* 197198 802688B8 00000000 */ nop /* 19719C 802688BC 0C03A752 */ jal is_ability_active /* 1971A0 802688C0 24040015 */ addiu $a0, $zero, 0x15 /* 1971A4 802688C4 10400008 */ beqz $v0, .L802688E8 diff --git a/asm/nonmatchings/code_196AA0/func_80268938.s b/asm/nonmatchings/code_196AA0/func_80268938.s index 4af9bef725..9dd8900b21 100644 --- a/asm/nonmatchings/code_196AA0/func_80268938.s +++ b/asm/nonmatchings/code_196AA0/func_80268938.s @@ -9,7 +9,7 @@ glabel func_80268938 /* 197228 80268948 10400003 */ beqz $v0, .L80268958 /* 19722C 8026894C AFBF0010 */ sw $ra, 0x10($sp) /* 197230 80268950 0C09A327 */ jal func_80268C9C -/* 197234 80268954 00000000 */ nop +/* 197234 80268954 00000000 */ nop .L80268958: /* 197238 80268958 3C02802A */ lui $v0, %hi(D_8029FBE0) /* 19723C 8026895C 2442FBE0 */ addiu $v0, $v0, %lo(D_8029FBE0) @@ -17,102 +17,126 @@ glabel func_80268938 /* 197244 80268964 2C620018 */ sltiu $v0, $v1, 0x18 /* 197248 80268968 10400060 */ beqz $v0, .L80268AEC /* 19724C 8026896C 00031080 */ sll $v0, $v1, 2 -/* 197250 80268970 3C01802A */ lui $at, %hi(D_8029D6A0) +/* 197250 80268970 3C01802A */ lui $at, %hi(jtbl_8029D6A0_1CBF80) /* 197254 80268974 00220821 */ addu $at, $at, $v0 -/* 197258 80268978 8C22D6A0 */ lw $v0, %lo(D_8029D6A0)($at) +/* 197258 80268978 8C22D6A0 */ lw $v0, %lo(jtbl_8029D6A0_1CBF80)($at) /* 19725C 8026897C 00400008 */ jr $v0 -/* 197260 80268980 00000000 */ nop +/* 197260 80268980 00000000 */ nop +glabel L80268984_197264 /* 197264 80268984 0C0AA48D */ jal func_802A9234 -/* 197268 80268988 00000000 */ nop +/* 197268 80268988 00000000 */ nop /* 19726C 8026898C 0809A2BB */ j .L80268AEC -/* 197270 80268990 00000000 */ nop +/* 197270 80268990 00000000 */ nop +glabel L80268994_197274 /* 197274 80268994 0C0AA4DB */ jal func_802A936C -/* 197278 80268998 00000000 */ nop +/* 197278 80268998 00000000 */ nop /* 19727C 8026899C 0809A2BB */ j .L80268AEC -/* 197280 802689A0 00000000 */ nop +/* 197280 802689A0 00000000 */ nop +glabel L802689A4_197284 /* 197284 802689A4 0C0AA4DE */ jal func_802A9378 -/* 197288 802689A8 00000000 */ nop +/* 197288 802689A8 00000000 */ nop /* 19728C 802689AC 0809A2BB */ j .L80268AEC -/* 197290 802689B0 00000000 */ nop +/* 197290 802689B0 00000000 */ nop +glabel L802689B4_197294 /* 197294 802689B4 0C0AA4B7 */ jal func_802A92DC -/* 197298 802689B8 00000000 */ nop +/* 197298 802689B8 00000000 */ nop /* 19729C 802689BC 0809A2BB */ j .L80268AEC -/* 1972A0 802689C0 00000000 */ nop +/* 1972A0 802689C0 00000000 */ nop +glabel L802689C4_1972A4 /* 1972A4 802689C4 0C0AA4BC */ jal func_802A92F0 -/* 1972A8 802689C8 00000000 */ nop +/* 1972A8 802689C8 00000000 */ nop /* 1972AC 802689CC 0809A2BB */ j .L80268AEC -/* 1972B0 802689D0 00000000 */ nop +/* 1972B0 802689D0 00000000 */ nop +glabel L802689D4_1972B4 /* 1972B4 802689D4 0C0AA47E */ jal func_802A91F8 -/* 1972B8 802689D8 00000000 */ nop +/* 1972B8 802689D8 00000000 */ nop /* 1972BC 802689DC 0809A2BB */ j .L80268AEC -/* 1972C0 802689E0 00000000 */ nop +/* 1972C0 802689E0 00000000 */ nop +glabel L802689E4_1972C4 /* 1972C4 802689E4 0C0AA48A */ jal func_802A9228 -/* 1972C8 802689E8 00000000 */ nop +/* 1972C8 802689E8 00000000 */ nop /* 1972CC 802689EC 0809A2BB */ j .L80268AEC -/* 1972D0 802689F0 00000000 */ nop +/* 1972D0 802689F0 00000000 */ nop +glabel L802689F4_1972D4 /* 1972D4 802689F4 0C0AA4A3 */ jal func_802A928C -/* 1972D8 802689F8 00000000 */ nop +/* 1972D8 802689F8 00000000 */ nop /* 1972DC 802689FC 0809A2BB */ j .L80268AEC -/* 1972E0 80268A00 00000000 */ nop +/* 1972E0 80268A00 00000000 */ nop +glabel L80268A04_1972E4 /* 1972E4 80268A04 0C0AA4A5 */ jal func_802A9294 -/* 1972E8 80268A08 00000000 */ nop +/* 1972E8 80268A08 00000000 */ nop /* 1972EC 80268A0C 0809A2BB */ j .L80268AEC -/* 1972F0 80268A10 00000000 */ nop +/* 1972F0 80268A10 00000000 */ nop +glabel L80268A14_1972F4 /* 1972F4 80268A14 0C0AA4A3 */ jal func_802A928C -/* 1972F8 80268A18 00000000 */ nop +/* 1972F8 80268A18 00000000 */ nop /* 1972FC 80268A1C 0809A2BB */ j .L80268AEC -/* 197300 80268A20 00000000 */ nop +/* 197300 80268A20 00000000 */ nop +glabel L80268A24_197304 /* 197304 80268A24 0C0AA4A3 */ jal func_802A928C -/* 197308 80268A28 00000000 */ nop +/* 197308 80268A28 00000000 */ nop /* 19730C 80268A2C 0809A2BB */ j .L80268AEC -/* 197310 80268A30 00000000 */ nop +/* 197310 80268A30 00000000 */ nop +glabel L80268A34_197314 /* 197314 80268A34 0C0AA4B5 */ jal func_802A92D4 -/* 197318 80268A38 00000000 */ nop +/* 197318 80268A38 00000000 */ nop /* 19731C 80268A3C 0809A2BB */ j .L80268AEC -/* 197320 80268A40 00000000 */ nop +/* 197320 80268A40 00000000 */ nop +glabel L80268A44_197324 /* 197324 80268A44 0C0AA49E */ jal func_802A9278 -/* 197328 80268A48 00000000 */ nop +/* 197328 80268A48 00000000 */ nop /* 19732C 80268A4C 0809A2BB */ j .L80268AEC -/* 197330 80268A50 00000000 */ nop +/* 197330 80268A50 00000000 */ nop +glabel L80268A54_197334 /* 197334 80268A54 0C0AA4A5 */ jal func_802A9294 -/* 197338 80268A58 00000000 */ nop +/* 197338 80268A58 00000000 */ nop /* 19733C 80268A5C 0809A2BB */ j .L80268AEC -/* 197340 80268A60 00000000 */ nop +/* 197340 80268A60 00000000 */ nop +glabel L80268A64_197344 /* 197344 80268A64 0C0AA482 */ jal func_802A9208 -/* 197348 80268A68 00000000 */ nop +/* 197348 80268A68 00000000 */ nop /* 19734C 80268A6C 0809A2BB */ j .L80268AEC -/* 197350 80268A70 00000000 */ nop +/* 197350 80268A70 00000000 */ nop +glabel L80268A74_197354 /* 197354 80268A74 0C0AA4C4 */ jal func_802A9310 -/* 197358 80268A78 00000000 */ nop +/* 197358 80268A78 00000000 */ nop /* 19735C 80268A7C 0809A2BB */ j .L80268AEC -/* 197360 80268A80 00000000 */ nop +/* 197360 80268A80 00000000 */ nop +glabel L80268A84_197364 /* 197364 80268A84 0C0AA4A8 */ jal func_802A92A0 -/* 197368 80268A88 00000000 */ nop +/* 197368 80268A88 00000000 */ nop /* 19736C 80268A8C 0809A2BB */ j .L80268AEC -/* 197370 80268A90 00000000 */ nop +/* 197370 80268A90 00000000 */ nop +glabel L80268A94_197374 /* 197374 80268A94 0C0AA4A6 */ jal func_802A9298 -/* 197378 80268A98 00000000 */ nop +/* 197378 80268A98 00000000 */ nop /* 19737C 80268A9C 0809A2BB */ j .L80268AEC -/* 197380 80268AA0 00000000 */ nop +/* 197380 80268AA0 00000000 */ nop +glabel L80268AA4_197384 /* 197384 80268AA4 0C0AA495 */ jal func_802A9254 -/* 197388 80268AA8 00000000 */ nop +/* 197388 80268AA8 00000000 */ nop /* 19738C 80268AAC 0809A2BB */ j .L80268AEC -/* 197390 80268AB0 00000000 */ nop +/* 197390 80268AB0 00000000 */ nop +glabel L80268AB4_197394 /* 197394 80268AB4 0C0AA4A8 */ jal func_802A92A0 -/* 197398 80268AB8 00000000 */ nop +/* 197398 80268AB8 00000000 */ nop /* 19739C 80268ABC 0809A2BB */ j .L80268AEC -/* 1973A0 80268AC0 00000000 */ nop +/* 1973A0 80268AC0 00000000 */ nop +glabel L80268AC4_1973A4 /* 1973A4 80268AC4 0C0AA4A6 */ jal func_802A9298 -/* 1973A8 80268AC8 00000000 */ nop +/* 1973A8 80268AC8 00000000 */ nop /* 1973AC 80268ACC 0809A2BB */ j .L80268AEC -/* 1973B0 80268AD0 00000000 */ nop +/* 1973B0 80268AD0 00000000 */ nop +glabel L80268AD4_1973B4 /* 1973B4 80268AD4 0C0AA523 */ jal func_802A948C -/* 1973B8 80268AD8 00000000 */ nop +/* 1973B8 80268AD8 00000000 */ nop /* 1973BC 80268ADC 0809A2BB */ j .L80268AEC -/* 1973C0 80268AE0 00000000 */ nop +/* 1973C0 80268AE0 00000000 */ nop +glabel L80268AE4_1973C4 /* 1973C4 80268AE4 0C0AA48A */ jal func_802A9228 -/* 1973C8 80268AE8 00000000 */ nop +/* 1973C8 80268AE8 00000000 */ nop .L80268AEC: +glabel L80268AEC_1973CC /* 1973CC 80268AEC 8FBF0010 */ lw $ra, 0x10($sp) /* 1973D0 80268AF0 03E00008 */ jr $ra /* 1973D4 80268AF4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_196AA0/func_80268AF8.s b/asm/nonmatchings/code_196AA0/func_80268AF8.s index d9f164245d..7d418c9c0a 100644 --- a/asm/nonmatchings/code_196AA0/func_80268AF8.s +++ b/asm/nonmatchings/code_196AA0/func_80268AF8.s @@ -9,102 +9,126 @@ glabel func_80268AF8 /* 1973E8 80268B08 10400061 */ beqz $v0, .L80268C90 /* 1973EC 80268B0C AFBF0010 */ sw $ra, 0x10($sp) /* 1973F0 80268B10 00031080 */ sll $v0, $v1, 2 -/* 1973F4 80268B14 3C01802A */ lui $at, %hi(D_8029D700) +/* 1973F4 80268B14 3C01802A */ lui $at, %hi(jtbl_8029D700_1CBFE0) /* 1973F8 80268B18 00220821 */ addu $at, $at, $v0 -/* 1973FC 80268B1C 8C22D700 */ lw $v0, %lo(D_8029D700)($at) +/* 1973FC 80268B1C 8C22D700 */ lw $v0, %lo(jtbl_8029D700_1CBFE0)($at) /* 197400 80268B20 00400008 */ jr $v0 -/* 197404 80268B24 00000000 */ nop +/* 197404 80268B24 00000000 */ nop +glabel L80268B28_197408 /* 197408 80268B28 0C0AA551 */ jal func_802A9544 -/* 19740C 80268B2C 00000000 */ nop +/* 19740C 80268B2C 00000000 */ nop /* 197410 80268B30 0809A324 */ j .L80268C90 -/* 197414 80268B34 00000000 */ nop +/* 197414 80268B34 00000000 */ nop +glabel L80268B38_197418 /* 197418 80268B38 0C0AA675 */ jal func_802A99D4 -/* 19741C 80268B3C 00000000 */ nop +/* 19741C 80268B3C 00000000 */ nop /* 197420 80268B40 0809A324 */ j .L80268C90 -/* 197424 80268B44 00000000 */ nop +/* 197424 80268B44 00000000 */ nop +glabel L80268B48_197428 /* 197428 80268B48 0C0AA5BD */ jal func_802A96F4 -/* 19742C 80268B4C 00000000 */ nop +/* 19742C 80268B4C 00000000 */ nop /* 197430 80268B50 0809A324 */ j .L80268C90 -/* 197434 80268B54 00000000 */ nop +/* 197434 80268B54 00000000 */ nop +glabel L80268B58_197438 /* 197438 80268B58 0C0AA5AE */ jal func_802A96B8 -/* 19743C 80268B5C 00000000 */ nop +/* 19743C 80268B5C 00000000 */ nop /* 197440 80268B60 0809A324 */ j .L80268C90 -/* 197444 80268B64 00000000 */ nop +/* 197444 80268B64 00000000 */ nop +glabel L80268B68_197448 /* 197448 80268B68 0C0AA5D1 */ jal func_802A9744 -/* 19744C 80268B6C 00000000 */ nop +/* 19744C 80268B6C 00000000 */ nop /* 197450 80268B70 0809A324 */ j .L80268C90 -/* 197454 80268B74 00000000 */ nop +/* 197454 80268B74 00000000 */ nop +glabel L80268B78_197458 /* 197458 80268B78 0C0AA529 */ jal func_802A94A4 -/* 19745C 80268B7C 00000000 */ nop +/* 19745C 80268B7C 00000000 */ nop /* 197460 80268B80 0809A324 */ j .L80268C90 -/* 197464 80268B84 00000000 */ nop +/* 197464 80268B84 00000000 */ nop +glabel L80268B88_197468 /* 197468 80268B88 0C0AA536 */ jal func_802A94D8 -/* 19746C 80268B8C 00000000 */ nop +/* 19746C 80268B8C 00000000 */ nop /* 197470 80268B90 0809A324 */ j .L80268C90 -/* 197474 80268B94 00000000 */ nop +/* 197474 80268B94 00000000 */ nop +glabel L80268B98_197478 /* 197478 80268B98 0C0AA5B7 */ jal func_802A96DC -/* 19747C 80268B9C 00000000 */ nop +/* 19747C 80268B9C 00000000 */ nop /* 197480 80268BA0 0809A324 */ j .L80268C90 -/* 197484 80268BA4 00000000 */ nop +/* 197484 80268BA4 00000000 */ nop +glabel L80268BA8_197488 /* 197488 80268BA8 0C0AA60D */ jal func_802A9834 -/* 19748C 80268BAC 00000000 */ nop +/* 19748C 80268BAC 00000000 */ nop /* 197490 80268BB0 0809A324 */ j .L80268C90 -/* 197494 80268BB4 00000000 */ nop +/* 197494 80268BB4 00000000 */ nop +glabel L80268BB8_197498 /* 197498 80268BB8 0C0AA557 */ jal func_802A955C -/* 19749C 80268BBC 00000000 */ nop +/* 19749C 80268BBC 00000000 */ nop /* 1974A0 80268BC0 0809A324 */ j .L80268C90 -/* 1974A4 80268BC4 00000000 */ nop +/* 1974A4 80268BC4 00000000 */ nop +glabel L80268BC8_1974A8 /* 1974A8 80268BC8 0C0AA5BB */ jal func_802A96EC -/* 1974AC 80268BCC 00000000 */ nop +/* 1974AC 80268BCC 00000000 */ nop /* 1974B0 80268BD0 0809A324 */ j .L80268C90 -/* 1974B4 80268BD4 00000000 */ nop +/* 1974B4 80268BD4 00000000 */ nop +glabel L80268BD8_1974B8 /* 1974B8 80268BD8 0C0AA599 */ jal func_802A9664 -/* 1974BC 80268BDC 00000000 */ nop +/* 1974BC 80268BDC 00000000 */ nop /* 1974C0 80268BE0 0809A324 */ j .L80268C90 -/* 1974C4 80268BE4 00000000 */ nop +/* 1974C4 80268BE4 00000000 */ nop +glabel L80268BE8_1974C8 /* 1974C8 80268BE8 0C0AA5BB */ jal func_802A96EC -/* 1974CC 80268BEC 00000000 */ nop +/* 1974CC 80268BEC 00000000 */ nop /* 1974D0 80268BF0 0809A324 */ j .L80268C90 -/* 1974D4 80268BF4 00000000 */ nop +/* 1974D4 80268BF4 00000000 */ nop +glabel L80268BF8_1974D8 /* 1974D8 80268BF8 0C0AA613 */ jal func_802A984C -/* 1974DC 80268BFC 00000000 */ nop +/* 1974DC 80268BFC 00000000 */ nop /* 1974E0 80268C00 0809A324 */ j .L80268C90 -/* 1974E4 80268C04 00000000 */ nop +/* 1974E4 80268C04 00000000 */ nop +glabel L80268C08_1974E8 /* 1974E8 80268C08 0C0AA58D */ jal func_802A9634 -/* 1974EC 80268C0C 00000000 */ nop +/* 1974EC 80268C0C 00000000 */ nop /* 1974F0 80268C10 0809A324 */ j .L80268C90 -/* 1974F4 80268C14 00000000 */ nop +/* 1974F4 80268C14 00000000 */ nop +glabel L80268C18_1974F8 /* 1974F8 80268C18 0C0AA634 */ jal func_802A98D0 -/* 1974FC 80268C1C 00000000 */ nop +/* 1974FC 80268C1C 00000000 */ nop /* 197500 80268C20 0809A324 */ j .L80268C90 -/* 197504 80268C24 00000000 */ nop +/* 197504 80268C24 00000000 */ nop +glabel L80268C28_197508 /* 197508 80268C28 0C0AA5FE */ jal func_802A97F8 -/* 19750C 80268C2C 00000000 */ nop +/* 19750C 80268C2C 00000000 */ nop /* 197510 80268C30 0809A324 */ j .L80268C90 -/* 197514 80268C34 00000000 */ nop +/* 197514 80268C34 00000000 */ nop +glabel L80268C38_197518 /* 197518 80268C38 0C0AA62C */ jal func_802A98B0 -/* 19751C 80268C3C 00000000 */ nop +/* 19751C 80268C3C 00000000 */ nop /* 197520 80268C40 0809A324 */ j .L80268C90 -/* 197524 80268C44 00000000 */ nop +/* 197524 80268C44 00000000 */ nop +glabel L80268C48_197528 /* 197528 80268C48 0C0AA5CF */ jal func_802A973C -/* 19752C 80268C4C 00000000 */ nop +/* 19752C 80268C4C 00000000 */ nop /* 197530 80268C50 0809A324 */ j .L80268C90 -/* 197534 80268C54 00000000 */ nop +/* 197534 80268C54 00000000 */ nop +glabel L80268C58_197538 /* 197538 80268C58 0C0AA5EB */ jal func_802A97AC -/* 19753C 80268C5C 00000000 */ nop +/* 19753C 80268C5C 00000000 */ nop /* 197540 80268C60 0809A324 */ j .L80268C90 -/* 197544 80268C64 00000000 */ nop +/* 197544 80268C64 00000000 */ nop +glabel L80268C68_197548 /* 197548 80268C68 0C0AA5FF */ jal func_802A97FC -/* 19754C 80268C6C 00000000 */ nop +/* 19754C 80268C6C 00000000 */ nop /* 197550 80268C70 0809A324 */ j .L80268C90 -/* 197554 80268C74 00000000 */ nop +/* 197554 80268C74 00000000 */ nop +glabel L80268C78_197558 /* 197558 80268C78 0C0AA805 */ jal func_802AA014 -/* 19755C 80268C7C 00000000 */ nop +/* 19755C 80268C7C 00000000 */ nop /* 197560 80268C80 0809A324 */ j .L80268C90 -/* 197564 80268C84 00000000 */ nop +/* 197564 80268C84 00000000 */ nop +glabel L80268C88_197568 /* 197568 80268C88 0C0AA5C6 */ jal func_802A9718 -/* 19756C 80268C8C 00000000 */ nop +/* 19756C 80268C8C 00000000 */ nop .L80268C90: +glabel L80268C90_197570 /* 197570 80268C90 8FBF0010 */ lw $ra, 0x10($sp) /* 197574 80268C94 03E00008 */ jr $ra /* 197578 80268C98 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_196AA0/func_80268C9C.s b/asm/nonmatchings/code_196AA0/func_80268C9C.s index 13db48efa4..44838a3cf7 100644 --- a/asm/nonmatchings/code_196AA0/func_80268C9C.s +++ b/asm/nonmatchings/code_196AA0/func_80268C9C.s @@ -11,102 +11,126 @@ glabel func_80268C9C /* 197594 80268CB4 2C620018 */ sltiu $v0, $v1, 0x18 /* 197598 80268CB8 10400060 */ beqz $v0, .L80268E3C /* 19759C 80268CBC 00031080 */ sll $v0, $v1, 2 -/* 1975A0 80268CC0 3C01802A */ lui $at, %hi(D_8029D760) +/* 1975A0 80268CC0 3C01802A */ lui $at, %hi(jtbl_8029D760_1CC040) /* 1975A4 80268CC4 00220821 */ addu $at, $at, $v0 -/* 1975A8 80268CC8 8C22D760 */ lw $v0, %lo(D_8029D760)($at) +/* 1975A8 80268CC8 8C22D760 */ lw $v0, %lo(jtbl_8029D760_1CC040)($at) /* 1975AC 80268CCC 00400008 */ jr $v0 -/* 1975B0 80268CD0 00000000 */ nop +/* 1975B0 80268CD0 00000000 */ nop +glabel L80268CD4_1975B4 /* 1975B4 80268CD4 0C0AA564 */ jal func_802A9590 -/* 1975B8 80268CD8 00000000 */ nop +/* 1975B8 80268CD8 00000000 */ nop /* 1975BC 80268CDC 0809A390 */ j .L80268E40 /* 1975C0 80268CE0 3C05FFFF */ lui $a1, 0xffff +glabel L80268CE4_1975C4 /* 1975C4 80268CE4 0C0AA68C */ jal func_802A9A30 -/* 1975C8 80268CE8 00000000 */ nop +/* 1975C8 80268CE8 00000000 */ nop /* 1975CC 80268CEC 0809A390 */ j .L80268E40 /* 1975D0 80268CF0 3C05FFFF */ lui $a1, 0xffff +glabel L80268CF4_1975D4 /* 1975D4 80268CF4 0C0AA625 */ jal func_802A9894 -/* 1975D8 80268CF8 00000000 */ nop +/* 1975D8 80268CF8 00000000 */ nop /* 1975DC 80268CFC 0809A390 */ j .L80268E40 /* 1975E0 80268D00 3C05FFFF */ lui $a1, 0xffff +glabel L80268D04_1975E4 /* 1975E4 80268D04 0C0AA5FF */ jal func_802A97FC -/* 1975E8 80268D08 00000000 */ nop +/* 1975E8 80268D08 00000000 */ nop /* 1975EC 80268D0C 0809A390 */ j .L80268E40 /* 1975F0 80268D10 3C05FFFF */ lui $a1, 0xffff +glabel L80268D14_1975F4 /* 1975F4 80268D14 0C0AA626 */ jal func_802A9898 -/* 1975F8 80268D18 00000000 */ nop +/* 1975F8 80268D18 00000000 */ nop /* 1975FC 80268D1C 0809A390 */ j .L80268E40 /* 197600 80268D20 3C05FFFF */ lui $a1, 0xffff +glabel L80268D24_197604 /* 197604 80268D24 0C0AA551 */ jal func_802A9544 -/* 197608 80268D28 00000000 */ nop +/* 197608 80268D28 00000000 */ nop /* 19760C 80268D2C 0809A390 */ j .L80268E40 /* 197610 80268D30 3C05FFFF */ lui $a1, 0xffff +glabel L80268D34_197614 /* 197614 80268D34 0C0AA567 */ jal func_802A959C -/* 197618 80268D38 00000000 */ nop +/* 197618 80268D38 00000000 */ nop /* 19761C 80268D3C 0809A390 */ j .L80268E40 /* 197620 80268D40 3C05FFFF */ lui $a1, 0xffff +glabel L80268D44_197624 /* 197624 80268D44 0C0AA5EF */ jal func_802A97BC -/* 197628 80268D48 00000000 */ nop +/* 197628 80268D48 00000000 */ nop /* 19762C 80268D4C 0809A390 */ j .L80268E40 /* 197630 80268D50 3C05FFFF */ lui $a1, 0xffff +glabel L80268D54_197634 /* 197634 80268D54 0C0AA645 */ jal func_802A9914 -/* 197638 80268D58 00000000 */ nop +/* 197638 80268D58 00000000 */ nop /* 19763C 80268D5C 0809A390 */ j .L80268E40 /* 197640 80268D60 3C05FFFF */ lui $a1, 0xffff +glabel L80268D64_197644 /* 197644 80268D64 0C0AA58F */ jal func_802A963C -/* 197648 80268D68 00000000 */ nop +/* 197648 80268D68 00000000 */ nop /* 19764C 80268D6C 0809A390 */ j .L80268E40 /* 197650 80268D70 3C05FFFF */ lui $a1, 0xffff +glabel L80268D74_197654 /* 197654 80268D74 0C0AA5F3 */ jal func_802A97CC -/* 197658 80268D78 00000000 */ nop +/* 197658 80268D78 00000000 */ nop /* 19765C 80268D7C 0809A390 */ j .L80268E40 /* 197660 80268D80 3C05FFFF */ lui $a1, 0xffff +glabel L80268D84_197664 /* 197664 80268D84 0C0AA5C2 */ jal func_802A9708 -/* 197668 80268D88 00000000 */ nop +/* 197668 80268D88 00000000 */ nop /* 19766C 80268D8C 0809A390 */ j .L80268E40 /* 197670 80268D90 3C05FFFF */ lui $a1, 0xffff +glabel L80268D94_197674 /* 197674 80268D94 0C0AA604 */ jal func_802A9810 -/* 197678 80268D98 00000000 */ nop +/* 197678 80268D98 00000000 */ nop /* 19767C 80268D9C 0809A390 */ j .L80268E40 /* 197680 80268DA0 3C05FFFF */ lui $a1, 0xffff +glabel L80268DA4_197684 /* 197684 80268DA4 0C0AA64B */ jal func_802A992C -/* 197688 80268DA8 00000000 */ nop +/* 197688 80268DA8 00000000 */ nop /* 19768C 80268DAC 0809A390 */ j .L80268E40 /* 197690 80268DB0 3C05FFFF */ lui $a1, 0xffff +glabel L80268DB4_197694 /* 197694 80268DB4 0C0AA5C8 */ jal func_802A9720 -/* 197698 80268DB8 00000000 */ nop +/* 197698 80268DB8 00000000 */ nop /* 19769C 80268DBC 0809A390 */ j .L80268E40 /* 1976A0 80268DC0 3C05FFFF */ lui $a1, 0xffff +glabel L80268DC4_1976A4 /* 1976A4 80268DC4 0C0AA695 */ jal func_802A9A54 -/* 1976A8 80268DC8 00000000 */ nop +/* 1976A8 80268DC8 00000000 */ nop /* 1976AC 80268DCC 0809A390 */ j .L80268E40 /* 1976B0 80268DD0 3C05FFFF */ lui $a1, 0xffff +glabel L80268DD4_1976B4 /* 1976B4 80268DD4 0C0AA638 */ jal func_802A98E0 -/* 1976B8 80268DD8 00000000 */ nop +/* 1976B8 80268DD8 00000000 */ nop /* 1976BC 80268DDC 0809A390 */ j .L80268E40 /* 1976C0 80268DE0 3C05FFFF */ lui $a1, 0xffff +glabel L80268DE4_1976C4 /* 1976C4 80268DE4 0C0AA664 */ jal func_802A9990 -/* 1976C8 80268DE8 00000000 */ nop +/* 1976C8 80268DE8 00000000 */ nop /* 1976CC 80268DEC 0809A390 */ j .L80268E40 /* 1976D0 80268DF0 3C05FFFF */ lui $a1, 0xffff +glabel L80268DF4_1976D4 /* 1976D4 80268DF4 0C0AA607 */ jal func_802A981C -/* 1976D8 80268DF8 00000000 */ nop +/* 1976D8 80268DF8 00000000 */ nop /* 1976DC 80268DFC 0809A390 */ j .L80268E40 /* 1976E0 80268E00 3C05FFFF */ lui $a1, 0xffff +glabel L80268E04_1976E4 /* 1976E4 80268E04 0C0AA625 */ jal func_802A9894 -/* 1976E8 80268E08 00000000 */ nop +/* 1976E8 80268E08 00000000 */ nop /* 1976EC 80268E0C 0809A390 */ j .L80268E40 /* 1976F0 80268E10 3C05FFFF */ lui $a1, 0xffff +glabel L80268E14_1976F4 /* 1976F4 80268E14 0C0AA637 */ jal func_802A98DC -/* 1976F8 80268E18 00000000 */ nop +/* 1976F8 80268E18 00000000 */ nop /* 1976FC 80268E1C 0809A390 */ j .L80268E40 /* 197700 80268E20 3C05FFFF */ lui $a1, 0xffff +glabel L80268E24_197704 /* 197704 80268E24 0C0AA836 */ jal func_802AA0D8 -/* 197708 80268E28 00000000 */ nop +/* 197708 80268E28 00000000 */ nop /* 19770C 80268E2C 0809A390 */ j .L80268E40 /* 197710 80268E30 3C05FFFF */ lui $a1, 0xffff +glabel L80268E34_197714 /* 197714 80268E34 0C0AA5D9 */ jal func_802A9764 -/* 197718 80268E38 00000000 */ nop +/* 197718 80268E38 00000000 */ nop .L80268E3C: +glabel L80268E3C_19771C /* 19771C 80268E3C 3C05FFFF */ lui $a1, 0xffff .L80268E40: /* 197720 80268E40 34A57FFF */ ori $a1, $a1, 0x7fff diff --git a/asm/nonmatchings/code_196AA0/func_80268E88.s b/asm/nonmatchings/code_196AA0/func_80268E88.s index 1b6e0126f3..03a81d98e7 100644 --- a/asm/nonmatchings/code_196AA0/func_80268E88.s +++ b/asm/nonmatchings/code_196AA0/func_80268E88.s @@ -12,7 +12,7 @@ glabel func_80268E88 /* 197784 80268EA4 24A58AF8 */ addiu $a1, $a1, %lo(func_80268AF8) /* 197788 80268EA8 AFBF0014 */ sw $ra, 0x14($sp) /* 19778C 80268EAC 0C048C8F */ jal bind_dynamic_entity_7 -/* 197790 80268EB0 00000000 */ nop +/* 197790 80268EB0 00000000 */ nop /* 197794 80268EB4 AE020000 */ sw $v0, ($s0) /* 197798 80268EB8 A600004A */ sh $zero, 0x4a($s0) /* 19779C 80268EBC 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/code_196AA0/func_80269118.s b/asm/nonmatchings/code_196AA0/func_80269118.s index 3de4b2776a..a93a6c37f8 100644 --- a/asm/nonmatchings/code_196AA0/func_80269118.s +++ b/asm/nonmatchings/code_196AA0/func_80269118.s @@ -21,4 +21,4 @@ glabel func_80269118 /* 197A34 80269154 A4C2006E */ sh $v0, 0x6e($a2) .L80269158: /* 197A38 80269158 03E00008 */ jr $ra -/* 197A3C 8026915C 00000000 */ nop +/* 197A3C 8026915C 00000000 */ nop diff --git a/asm/nonmatchings/code_196AA0/func_80269160.s b/asm/nonmatchings/code_196AA0/func_80269160.s index 84d76f3780..b6b760d543 100644 --- a/asm/nonmatchings/code_196AA0/func_80269160.s +++ b/asm/nonmatchings/code_196AA0/func_80269160.s @@ -8,13 +8,13 @@ glabel func_80269160 /* 197A4C 8026916C 3C048011 */ lui $a0, %hi(gPlayerData) /* 197A50 80269170 2484F290 */ addiu $a0, $a0, %lo(gPlayerData) /* 197A54 80269174 14400007 */ bnez $v0, .L80269194 -/* 197A58 80269178 00000000 */ nop +/* 197A58 80269178 00000000 */ nop /* 197A5C 8026917C 8462006E */ lh $v0, 0x6e($v1) /* 197A60 80269180 10400004 */ beqz $v0, .L80269194 -/* 197A64 80269184 00000000 */ nop +/* 197A64 80269184 00000000 */ nop /* 197A68 80269188 94820296 */ lhu $v0, 0x296($a0) /* 197A6C 8026918C 24420001 */ addiu $v0, $v0, 1 /* 197A70 80269190 A4820296 */ sh $v0, 0x296($a0) .L80269194: /* 197A74 80269194 03E00008 */ jr $ra -/* 197A78 80269198 00000000 */ nop +/* 197A78 80269198 00000000 */ nop diff --git a/asm/nonmatchings/code_196AA0/func_80269470.s b/asm/nonmatchings/code_196AA0/func_80269470.s index c41a83ab2f..e51c8c1ff9 100644 --- a/asm/nonmatchings/code_196AA0/func_80269470.s +++ b/asm/nonmatchings/code_196AA0/func_80269470.s @@ -6,12 +6,12 @@ glabel func_80269470 /* 197D54 80269474 14A00005 */ bnez $a1, .L8026948C /* 197D58 80269478 AFBF0010 */ sw $ra, 0x10($sp) /* 197D5C 8026947C 0C093EC3 */ jal close_action_command_instruction_popup -/* 197D60 80269480 00000000 */ nop +/* 197D60 80269480 00000000 */ nop /* 197D64 80269484 0809A526 */ j .L80269498 /* 197D68 80269488 24020002 */ addiu $v0, $zero, 2 .L8026948C: /* 197D6C 8026948C 0C09A327 */ jal func_80268C9C -/* 197D70 80269490 00000000 */ nop +/* 197D70 80269490 00000000 */ nop /* 197D74 80269494 0000102D */ daddu $v0, $zero, $zero .L80269498: /* 197D78 80269498 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_197F40/AddActorDecoration.s b/asm/nonmatchings/code_197F40/AddActorDecoration.s index 3bd3f7bde5..b534823f88 100644 --- a/asm/nonmatchings/code_197F40/AddActorDecoration.s +++ b/asm/nonmatchings/code_197F40/AddActorDecoration.s @@ -31,7 +31,7 @@ glabel AddActorDecoration /* 19D7D0 8026EEF0 0040802D */ daddu $s0, $v0, $zero /* 19D7D4 8026EEF4 2402FF81 */ addiu $v0, $zero, -0x7f /* 19D7D8 8026EEF8 16220002 */ bne $s1, $v0, .L8026EF04 -/* 19D7DC 8026EEFC 00000000 */ nop +/* 19D7DC 8026EEFC 00000000 */ nop /* 19D7E0 8026EF00 8E510148 */ lw $s1, 0x148($s2) .L8026EF04: /* 19D7E4 8026EF04 0C09A75B */ jal get_actor diff --git a/asm/nonmatchings/code_197F40/BoostAttack.s b/asm/nonmatchings/code_197F40/BoostAttack.s index 04b4f9104c..70958e1cfd 100644 --- a/asm/nonmatchings/code_197F40/BoostAttack.s +++ b/asm/nonmatchings/code_197F40/BoostAttack.s @@ -17,7 +17,7 @@ glabel BoostAttack .L8026FD04: /* 19E5E4 8026FD04 8E420070 */ lw $v0, 0x70($s2) /* 19E5E8 8026FD08 1440002D */ bnez $v0, .L8026FDC0 -/* 19E5EC 8026FD0C 00000000 */ nop +/* 19E5EC 8026FD0C 00000000 */ nop /* 19E5F0 8026FD10 8E250000 */ lw $a1, ($s1) /* 19E5F4 8026FD14 26310004 */ addiu $s1, $s1, 4 /* 19E5F8 8026FD18 0C0B1EAF */ jal get_variable @@ -25,7 +25,7 @@ glabel BoostAttack /* 19E600 8026FD20 0040802D */ daddu $s0, $v0, $zero /* 19E604 8026FD24 2402FF81 */ addiu $v0, $zero, -0x7f /* 19E608 8026FD28 16020002 */ bne $s0, $v0, .L8026FD34 -/* 19E60C 8026FD2C 00000000 */ nop +/* 19E60C 8026FD2C 00000000 */ nop /* 19E610 8026FD30 8E500148 */ lw $s0, 0x148($s2) .L8026FD34: /* 19E614 8026FD34 8E250000 */ lw $a1, ($s1) @@ -43,13 +43,13 @@ glabel BoostAttack /* 19E644 8026FD64 2404000C */ addiu $a0, $zero, 0xc /* 19E648 8026FD68 86040192 */ lh $a0, 0x192($s0) /* 19E64C 8026FD6C 0C09390F */ jal cam_target_actor -/* 19E650 8026FD70 00000000 */ nop +/* 19E650 8026FD70 00000000 */ nop /* 19E654 8026FD74 0C093965 */ jal set_cam_zoom /* 19E658 8026FD78 240400FA */ addiu $a0, $zero, 0xfa /* 19E65C 8026FD7C 0C093936 */ jal move_cam_over /* 19E660 8026FD80 2404000A */ addiu $a0, $zero, 0xa /* 19E664 8026FD84 0C093983 */ jal func_8024E60C -/* 19E668 8026FD88 00000000 */ nop +/* 19E668 8026FD88 00000000 */ nop /* 19E66C 8026FD8C 8E020000 */ lw $v0, ($s0) /* 19E670 8026FD90 30420800 */ andi $v0, $v0, 0x800 /* 19E674 8026FD94 10400004 */ beqz $v0, .L8026FDA8 @@ -73,7 +73,7 @@ glabel BoostAttack /* 19E6B4 8026FDD4 8E030000 */ lw $v1, ($s0) /* 19E6B8 8026FDD8 C6000144 */ lwc1 $f0, 0x144($s0) /* 19E6BC 8026FDDC 44821000 */ mtc1 $v0, $f2 -/* 19E6C0 8026FDE0 00000000 */ nop +/* 19E6C0 8026FDE0 00000000 */ nop /* 19E6C4 8026FDE4 468010A0 */ cvt.s.w $f2, $f2 /* 19E6C8 8026FDE8 30620800 */ andi $v0, $v1, 0x800 /* 19E6CC 8026FDEC 1040000E */ beqz $v0, .L8026FE28 @@ -81,30 +81,30 @@ glabel BoostAttack /* 19E6D4 8026FDF4 86020152 */ lh $v0, 0x152($s0) /* 19E6D8 8026FDF8 C6020148 */ lwc1 $f2, 0x148($s0) /* 19E6DC 8026FDFC 44820000 */ mtc1 $v0, $f0 -/* 19E6E0 8026FE00 00000000 */ nop +/* 19E6E0 8026FE00 00000000 */ nop /* 19E6E4 8026FE04 46800020 */ cvt.s.w $f0, $f0 /* 19E6E8 8026FE08 92020191 */ lbu $v0, 0x191($s0) /* 19E6EC 8026FE0C 46001080 */ add.s $f2, $f2, $f0 /* 19E6F0 8026FE10 00021042 */ srl $v0, $v0, 1 /* 19E6F4 8026FE14 44820000 */ mtc1 $v0, $f0 -/* 19E6F8 8026FE18 00000000 */ nop +/* 19E6F8 8026FE18 00000000 */ nop /* 19E6FC 8026FE1C 46800020 */ cvt.s.w $f0, $f0 /* 19E700 8026FE20 0809BFA5 */ j .L8026FE94 /* 19E704 8026FE24 46001181 */ sub.s $f6, $f2, $f0 .L8026FE28: /* 19E708 8026FE28 30628000 */ andi $v0, $v1, 0x8000 /* 19E70C 8026FE2C 1440000E */ bnez $v0, .L8026FE68 -/* 19E710 8026FE30 00000000 */ nop +/* 19E710 8026FE30 00000000 */ nop /* 19E714 8026FE34 86020152 */ lh $v0, 0x152($s0) /* 19E718 8026FE38 C6020148 */ lwc1 $f2, 0x148($s0) /* 19E71C 8026FE3C 44820000 */ mtc1 $v0, $f0 -/* 19E720 8026FE40 00000000 */ nop +/* 19E720 8026FE40 00000000 */ nop /* 19E724 8026FE44 46800020 */ cvt.s.w $f0, $f0 /* 19E728 8026FE48 92020191 */ lbu $v0, 0x191($s0) /* 19E72C 8026FE4C 46001080 */ add.s $f2, $f2, $f0 /* 19E730 8026FE50 00021042 */ srl $v0, $v0, 1 /* 19E734 8026FE54 44820000 */ mtc1 $v0, $f0 -/* 19E738 8026FE58 00000000 */ nop +/* 19E738 8026FE58 00000000 */ nop /* 19E73C 8026FE5C 46800020 */ cvt.s.w $f0, $f0 /* 19E740 8026FE60 0809BFA5 */ j .L8026FE94 /* 19E744 8026FE64 46020180 */ add.s $f6, $f0, $f2 @@ -112,12 +112,12 @@ glabel BoostAttack /* 19E748 8026FE68 86020152 */ lh $v0, 0x152($s0) /* 19E74C 8026FE6C C6000148 */ lwc1 $f0, 0x148($s0) /* 19E750 8026FE70 44821000 */ mtc1 $v0, $f2 -/* 19E754 8026FE74 00000000 */ nop +/* 19E754 8026FE74 00000000 */ nop /* 19E758 8026FE78 468010A0 */ cvt.s.w $f2, $f2 /* 19E75C 8026FE7C 92020191 */ lbu $v0, 0x191($s0) /* 19E760 8026FE80 46020000 */ add.s $f0, $f0, $f2 /* 19E764 8026FE84 44821000 */ mtc1 $v0, $f2 -/* 19E768 8026FE88 00000000 */ nop +/* 19E768 8026FE88 00000000 */ nop /* 19E76C 8026FE8C 468010A0 */ cvt.s.w $f2, $f2 /* 19E770 8026FE90 46020180 */ add.s $f6, $f0, $f2 .L8026FE94: @@ -125,10 +125,10 @@ glabel BoostAttack /* 19E778 8026FE98 86030150 */ lh $v1, 0x150($s0) /* 19E77C 8026FE9C C600014C */ lwc1 $f0, 0x14c($s0) /* 19E780 8026FEA0 44821000 */ mtc1 $v0, $f2 -/* 19E784 8026FEA4 00000000 */ nop +/* 19E784 8026FEA4 00000000 */ nop /* 19E788 8026FEA8 468010A0 */ cvt.s.w $f2, $f2 /* 19E78C 8026FEAC 44832000 */ mtc1 $v1, $f4 -/* 19E790 8026FEB0 00000000 */ nop +/* 19E790 8026FEB0 00000000 */ nop /* 19E794 8026FEB4 46802120 */ cvt.s.w $f4, $f4 /* 19E798 8026FEB8 92020190 */ lbu $v0, 0x190($s0) /* 19E79C 8026FEBC 46020000 */ add.s $f0, $f0, $f2 @@ -140,7 +140,7 @@ glabel BoostAttack /* 19E7B4 8026FED4 00021042 */ srl $v0, $v0, 1 /* 19E7B8 8026FED8 46040000 */ add.s $f0, $f0, $f4 /* 19E7BC 8026FEDC 44821000 */ mtc1 $v0, $f2 -/* 19E7C0 8026FEE0 00000000 */ nop +/* 19E7C0 8026FEE0 00000000 */ nop /* 19E7C4 8026FEE4 468010A0 */ cvt.s.w $f2, $f2 /* 19E7C8 8026FEE8 30620800 */ andi $v0, $v1, 0x800 /* 19E7CC 8026FEEC 1040000D */ beqz $v0, .L8026FF24 @@ -148,28 +148,28 @@ glabel BoostAttack /* 19E7D4 8026FEF4 86020152 */ lh $v0, 0x152($s0) /* 19E7D8 8026FEF8 C6000148 */ lwc1 $f0, 0x148($s0) /* 19E7DC 8026FEFC 44821000 */ mtc1 $v0, $f2 -/* 19E7E0 8026FF00 00000000 */ nop +/* 19E7E0 8026FF00 00000000 */ nop /* 19E7E4 8026FF04 468010A0 */ cvt.s.w $f2, $f2 /* 19E7E8 8026FF08 92020191 */ lbu $v0, 0x191($s0) /* 19E7EC 8026FF0C 46020000 */ add.s $f0, $f0, $f2 /* 19E7F0 8026FF10 44821000 */ mtc1 $v0, $f2 -/* 19E7F4 8026FF14 00000000 */ nop +/* 19E7F4 8026FF14 00000000 */ nop /* 19E7F8 8026FF18 468010A0 */ cvt.s.w $f2, $f2 /* 19E7FC 8026FF1C 0809BFE4 */ j .L8026FF90 /* 19E800 8026FF20 46020501 */ sub.s $f20, $f0, $f2 .L8026FF24: /* 19E804 8026FF24 30628000 */ andi $v0, $v1, 0x8000 /* 19E808 8026FF28 1440000D */ bnez $v0, .L8026FF60 -/* 19E80C 8026FF2C 00000000 */ nop +/* 19E80C 8026FF2C 00000000 */ nop /* 19E810 8026FF30 86020152 */ lh $v0, 0x152($s0) /* 19E814 8026FF34 C6000148 */ lwc1 $f0, 0x148($s0) /* 19E818 8026FF38 44821000 */ mtc1 $v0, $f2 -/* 19E81C 8026FF3C 00000000 */ nop +/* 19E81C 8026FF3C 00000000 */ nop /* 19E820 8026FF40 468010A0 */ cvt.s.w $f2, $f2 /* 19E824 8026FF44 92020191 */ lbu $v0, 0x191($s0) /* 19E828 8026FF48 46020000 */ add.s $f0, $f0, $f2 /* 19E82C 8026FF4C 44821000 */ mtc1 $v0, $f2 -/* 19E830 8026FF50 00000000 */ nop +/* 19E830 8026FF50 00000000 */ nop /* 19E834 8026FF54 468010A0 */ cvt.s.w $f2, $f2 /* 19E838 8026FF58 0809BFE4 */ j .L8026FF90 /* 19E83C 8026FF5C 46001500 */ add.s $f20, $f2, $f0 @@ -177,20 +177,20 @@ glabel BoostAttack /* 19E840 8026FF60 86020152 */ lh $v0, 0x152($s0) /* 19E844 8026FF64 C6020148 */ lwc1 $f2, 0x148($s0) /* 19E848 8026FF68 44820000 */ mtc1 $v0, $f0 -/* 19E84C 8026FF6C 00000000 */ nop +/* 19E84C 8026FF6C 00000000 */ nop /* 19E850 8026FF70 46800020 */ cvt.s.w $f0, $f0 /* 19E854 8026FF74 92020191 */ lbu $v0, 0x191($s0) /* 19E858 8026FF78 46001080 */ add.s $f2, $f2, $f0 /* 19E85C 8026FF7C 00021040 */ sll $v0, $v0, 1 /* 19E860 8026FF80 44820000 */ mtc1 $v0, $f0 -/* 19E864 8026FF84 00000000 */ nop +/* 19E864 8026FF84 00000000 */ nop /* 19E868 8026FF88 46800020 */ cvt.s.w $f0, $f0 /* 19E86C 8026FF8C 46001500 */ add.s $f20, $f2, $f0 .L8026FF90: /* 19E870 8026FF90 86020154 */ lh $v0, 0x154($s0) /* 19E874 8026FF94 C600014C */ lwc1 $f0, 0x14c($s0) /* 19E878 8026FF98 44821000 */ mtc1 $v0, $f2 -/* 19E87C 8026FF9C 00000000 */ nop +/* 19E87C 8026FF9C 00000000 */ nop /* 19E880 8026FFA0 468010A0 */ cvt.s.w $f2, $f2 /* 19E884 8026FFA4 46020000 */ add.s $f0, $f0, $f2 /* 19E888 8026FFA8 8E420070 */ lw $v0, 0x70($s2) @@ -201,11 +201,12 @@ glabel BoostAttack /* 19E89C 8026FFBC 10400063 */ beqz $v0, .L8027014C /* 19E8A0 8026FFC0 46020580 */ add.s $f22, $f0, $f2 /* 19E8A4 8026FFC4 00031080 */ sll $v0, $v1, 2 -/* 19E8A8 8026FFC8 3C01802A */ lui $at, %hi(D_8029D808) +/* 19E8A8 8026FFC8 3C01802A */ lui $at, %hi(jtbl_8029D808_1CC0E8) /* 19E8AC 8026FFCC 00220821 */ addu $at, $at, $v0 -/* 19E8B0 8026FFD0 8C22D808 */ lw $v0, %lo(D_8029D808)($at) +/* 19E8B0 8026FFD0 8C22D808 */ lw $v0, %lo(jtbl_8029D808_1CC0E8)($at) /* 19E8B4 8026FFD4 00400008 */ jr $v0 -/* 19E8B8 8026FFD8 00000000 */ nop +/* 19E8B8 8026FFD8 00000000 */ nop +glabel L8026FFDC_19E8BC /* 19E8BC 8026FFDC 8E42007C */ lw $v0, 0x7c($s2) /* 19E8C0 8026FFE0 1440004D */ bnez $v0, .L80270118 /* 19E8C4 8026FFE4 2442FFFF */ addiu $v0, $v0, -1 @@ -225,6 +226,7 @@ glabel BoostAttack /* 19E8FC 8027001C AE50007C */ sw $s0, 0x7c($s2) /* 19E900 80270020 0809C053 */ j .L8027014C /* 19E904 80270024 AE420070 */ sw $v0, 0x70($s2) +glabel L80270028_19E908 /* 19E908 80270028 8E42007C */ lw $v0, 0x7c($s2) /* 19E90C 8027002C 1440003A */ bnez $v0, .L80270118 /* 19E910 80270030 2442FFFF */ addiu $v0, $v0, -1 @@ -262,6 +264,7 @@ glabel BoostAttack /* 19E98C 802700AC 24020003 */ addiu $v0, $zero, 3 /* 19E990 802700B0 0809C053 */ j .L8027014C /* 19E994 802700B4 AE420070 */ sw $v0, 0x70($s2) +glabel L802700B8_19E998 /* 19E998 802700B8 8E42007C */ lw $v0, 0x7c($s2) /* 19E99C 802700BC 14400016 */ bnez $v0, .L80270118 /* 19E9A0 802700C0 2442FFFF */ addiu $v0, $v0, -1 @@ -272,8 +275,9 @@ glabel BoostAttack /* 19E9B4 802700D4 24020004 */ addiu $v0, $zero, 4 /* 19E9B8 802700D8 0809C053 */ j .L8027014C /* 19E9BC 802700DC AE420070 */ sw $v0, 0x70($s2) +glabel L802700E0_19E9C0 /* 19E9C0 802700E0 0C093EAD */ jal is_popup_displayed -/* 19E9C4 802700E4 00000000 */ nop +/* 19E9C4 802700E4 00000000 */ nop /* 19E9C8 802700E8 14400019 */ bnez $v0, .L80270150 /* 19E9CC 802700EC 0000102D */ daddu $v0, $zero, $zero /* 19E9D0 802700F0 0C093903 */ jal func_8024E40C @@ -283,6 +287,7 @@ glabel BoostAttack /* 19E9E0 80270100 24020005 */ addiu $v0, $zero, 5 /* 19E9E4 80270104 0809C053 */ j .L8027014C /* 19E9E8 80270108 AE420070 */ sw $v0, 0x70($s2) +glabel L8027010C_19E9EC /* 19E9EC 8027010C 8E42007C */ lw $v0, 0x7c($s2) /* 19E9F0 80270110 10400003 */ beqz $v0, .L80270120 /* 19E9F4 80270114 2442FFFF */ addiu $v0, $v0, -1 @@ -292,7 +297,7 @@ glabel BoostAttack .L80270120: /* 19EA00 80270120 8E0201D8 */ lw $v0, 0x1d8($s0) /* 19EA04 80270124 10400005 */ beqz $v0, .L8027013C -/* 19EA08 80270128 00000000 */ nop +/* 19EA08 80270128 00000000 */ nop /* 19EA0C 8027012C 0C0B1059 */ jal does_script_exist /* 19EA10 80270130 8E0401E8 */ lw $a0, 0x1e8($s0) /* 19EA14 80270134 14400006 */ bnez $v0, .L80270150 diff --git a/asm/nonmatchings/code_197F40/BoostDefense.s b/asm/nonmatchings/code_197F40/BoostDefense.s index b8911e0eb7..de7d94c90a 100644 --- a/asm/nonmatchings/code_197F40/BoostDefense.s +++ b/asm/nonmatchings/code_197F40/BoostDefense.s @@ -17,7 +17,7 @@ glabel BoostDefense .L802701A4: /* 19EA84 802701A4 8E420070 */ lw $v0, 0x70($s2) /* 19EA88 802701A8 1440002D */ bnez $v0, .L80270260 -/* 19EA8C 802701AC 00000000 */ nop +/* 19EA8C 802701AC 00000000 */ nop /* 19EA90 802701B0 8E250000 */ lw $a1, ($s1) /* 19EA94 802701B4 26310004 */ addiu $s1, $s1, 4 /* 19EA98 802701B8 0C0B1EAF */ jal get_variable @@ -25,7 +25,7 @@ glabel BoostDefense /* 19EAA0 802701C0 0040802D */ daddu $s0, $v0, $zero /* 19EAA4 802701C4 2402FF81 */ addiu $v0, $zero, -0x7f /* 19EAA8 802701C8 16020002 */ bne $s0, $v0, .L802701D4 -/* 19EAAC 802701CC 00000000 */ nop +/* 19EAAC 802701CC 00000000 */ nop /* 19EAB0 802701D0 8E500148 */ lw $s0, 0x148($s2) .L802701D4: /* 19EAB4 802701D4 8E250000 */ lw $a1, ($s1) @@ -43,13 +43,13 @@ glabel BoostDefense /* 19EAE4 80270204 2404000C */ addiu $a0, $zero, 0xc /* 19EAE8 80270208 86040192 */ lh $a0, 0x192($s0) /* 19EAEC 8027020C 0C09390F */ jal cam_target_actor -/* 19EAF0 80270210 00000000 */ nop +/* 19EAF0 80270210 00000000 */ nop /* 19EAF4 80270214 0C093965 */ jal set_cam_zoom /* 19EAF8 80270218 240400FA */ addiu $a0, $zero, 0xfa /* 19EAFC 8027021C 0C093936 */ jal move_cam_over /* 19EB00 80270220 2404000A */ addiu $a0, $zero, 0xa /* 19EB04 80270224 0C093983 */ jal func_8024E60C -/* 19EB08 80270228 00000000 */ nop +/* 19EB08 80270228 00000000 */ nop /* 19EB0C 8027022C 8E020000 */ lw $v0, ($s0) /* 19EB10 80270230 30420800 */ andi $v0, $v0, 0x800 /* 19EB14 80270234 10400004 */ beqz $v0, .L80270248 @@ -73,7 +73,7 @@ glabel BoostDefense /* 19EB54 80270274 8E030000 */ lw $v1, ($s0) /* 19EB58 80270278 C6000144 */ lwc1 $f0, 0x144($s0) /* 19EB5C 8027027C 44821000 */ mtc1 $v0, $f2 -/* 19EB60 80270280 00000000 */ nop +/* 19EB60 80270280 00000000 */ nop /* 19EB64 80270284 468010A0 */ cvt.s.w $f2, $f2 /* 19EB68 80270288 30620800 */ andi $v0, $v1, 0x800 /* 19EB6C 8027028C 1040000E */ beqz $v0, .L802702C8 @@ -81,30 +81,30 @@ glabel BoostDefense /* 19EB74 80270294 86020152 */ lh $v0, 0x152($s0) /* 19EB78 80270298 C6020148 */ lwc1 $f2, 0x148($s0) /* 19EB7C 8027029C 44820000 */ mtc1 $v0, $f0 -/* 19EB80 802702A0 00000000 */ nop +/* 19EB80 802702A0 00000000 */ nop /* 19EB84 802702A4 46800020 */ cvt.s.w $f0, $f0 /* 19EB88 802702A8 92020191 */ lbu $v0, 0x191($s0) /* 19EB8C 802702AC 46001080 */ add.s $f2, $f2, $f0 /* 19EB90 802702B0 00021042 */ srl $v0, $v0, 1 /* 19EB94 802702B4 44820000 */ mtc1 $v0, $f0 -/* 19EB98 802702B8 00000000 */ nop +/* 19EB98 802702B8 00000000 */ nop /* 19EB9C 802702BC 46800020 */ cvt.s.w $f0, $f0 /* 19EBA0 802702C0 0809C0CD */ j .L80270334 /* 19EBA4 802702C4 46001181 */ sub.s $f6, $f2, $f0 .L802702C8: /* 19EBA8 802702C8 30628000 */ andi $v0, $v1, 0x8000 /* 19EBAC 802702CC 1440000E */ bnez $v0, .L80270308 -/* 19EBB0 802702D0 00000000 */ nop +/* 19EBB0 802702D0 00000000 */ nop /* 19EBB4 802702D4 86020152 */ lh $v0, 0x152($s0) /* 19EBB8 802702D8 C6020148 */ lwc1 $f2, 0x148($s0) /* 19EBBC 802702DC 44820000 */ mtc1 $v0, $f0 -/* 19EBC0 802702E0 00000000 */ nop +/* 19EBC0 802702E0 00000000 */ nop /* 19EBC4 802702E4 46800020 */ cvt.s.w $f0, $f0 /* 19EBC8 802702E8 92020191 */ lbu $v0, 0x191($s0) /* 19EBCC 802702EC 46001080 */ add.s $f2, $f2, $f0 /* 19EBD0 802702F0 00021042 */ srl $v0, $v0, 1 /* 19EBD4 802702F4 44820000 */ mtc1 $v0, $f0 -/* 19EBD8 802702F8 00000000 */ nop +/* 19EBD8 802702F8 00000000 */ nop /* 19EBDC 802702FC 46800020 */ cvt.s.w $f0, $f0 /* 19EBE0 80270300 0809C0CD */ j .L80270334 /* 19EBE4 80270304 46020180 */ add.s $f6, $f0, $f2 @@ -112,12 +112,12 @@ glabel BoostDefense /* 19EBE8 80270308 86020152 */ lh $v0, 0x152($s0) /* 19EBEC 8027030C C6000148 */ lwc1 $f0, 0x148($s0) /* 19EBF0 80270310 44821000 */ mtc1 $v0, $f2 -/* 19EBF4 80270314 00000000 */ nop +/* 19EBF4 80270314 00000000 */ nop /* 19EBF8 80270318 468010A0 */ cvt.s.w $f2, $f2 /* 19EBFC 8027031C 92020191 */ lbu $v0, 0x191($s0) /* 19EC00 80270320 46020000 */ add.s $f0, $f0, $f2 /* 19EC04 80270324 44821000 */ mtc1 $v0, $f2 -/* 19EC08 80270328 00000000 */ nop +/* 19EC08 80270328 00000000 */ nop /* 19EC0C 8027032C 468010A0 */ cvt.s.w $f2, $f2 /* 19EC10 80270330 46020180 */ add.s $f6, $f0, $f2 .L80270334: @@ -125,10 +125,10 @@ glabel BoostDefense /* 19EC18 80270338 86030150 */ lh $v1, 0x150($s0) /* 19EC1C 8027033C C600014C */ lwc1 $f0, 0x14c($s0) /* 19EC20 80270340 44821000 */ mtc1 $v0, $f2 -/* 19EC24 80270344 00000000 */ nop +/* 19EC24 80270344 00000000 */ nop /* 19EC28 80270348 468010A0 */ cvt.s.w $f2, $f2 /* 19EC2C 8027034C 44832000 */ mtc1 $v1, $f4 -/* 19EC30 80270350 00000000 */ nop +/* 19EC30 80270350 00000000 */ nop /* 19EC34 80270354 46802120 */ cvt.s.w $f4, $f4 /* 19EC38 80270358 92020190 */ lbu $v0, 0x190($s0) /* 19EC3C 8027035C 46020000 */ add.s $f0, $f0, $f2 @@ -140,7 +140,7 @@ glabel BoostDefense /* 19EC54 80270374 00021042 */ srl $v0, $v0, 1 /* 19EC58 80270378 46040000 */ add.s $f0, $f0, $f4 /* 19EC5C 8027037C 44821000 */ mtc1 $v0, $f2 -/* 19EC60 80270380 00000000 */ nop +/* 19EC60 80270380 00000000 */ nop /* 19EC64 80270384 468010A0 */ cvt.s.w $f2, $f2 /* 19EC68 80270388 30620800 */ andi $v0, $v1, 0x800 /* 19EC6C 8027038C 1040000D */ beqz $v0, .L802703C4 @@ -148,28 +148,28 @@ glabel BoostDefense /* 19EC74 80270394 86020152 */ lh $v0, 0x152($s0) /* 19EC78 80270398 C6000148 */ lwc1 $f0, 0x148($s0) /* 19EC7C 8027039C 44821000 */ mtc1 $v0, $f2 -/* 19EC80 802703A0 00000000 */ nop +/* 19EC80 802703A0 00000000 */ nop /* 19EC84 802703A4 468010A0 */ cvt.s.w $f2, $f2 /* 19EC88 802703A8 92020191 */ lbu $v0, 0x191($s0) /* 19EC8C 802703AC 46020000 */ add.s $f0, $f0, $f2 /* 19EC90 802703B0 44821000 */ mtc1 $v0, $f2 -/* 19EC94 802703B4 00000000 */ nop +/* 19EC94 802703B4 00000000 */ nop /* 19EC98 802703B8 468010A0 */ cvt.s.w $f2, $f2 /* 19EC9C 802703BC 0809C10C */ j .L80270430 /* 19ECA0 802703C0 46020501 */ sub.s $f20, $f0, $f2 .L802703C4: /* 19ECA4 802703C4 30628000 */ andi $v0, $v1, 0x8000 /* 19ECA8 802703C8 1440000D */ bnez $v0, .L80270400 -/* 19ECAC 802703CC 00000000 */ nop +/* 19ECAC 802703CC 00000000 */ nop /* 19ECB0 802703D0 86020152 */ lh $v0, 0x152($s0) /* 19ECB4 802703D4 C6000148 */ lwc1 $f0, 0x148($s0) /* 19ECB8 802703D8 44821000 */ mtc1 $v0, $f2 -/* 19ECBC 802703DC 00000000 */ nop +/* 19ECBC 802703DC 00000000 */ nop /* 19ECC0 802703E0 468010A0 */ cvt.s.w $f2, $f2 /* 19ECC4 802703E4 92020191 */ lbu $v0, 0x191($s0) /* 19ECC8 802703E8 46020000 */ add.s $f0, $f0, $f2 /* 19ECCC 802703EC 44821000 */ mtc1 $v0, $f2 -/* 19ECD0 802703F0 00000000 */ nop +/* 19ECD0 802703F0 00000000 */ nop /* 19ECD4 802703F4 468010A0 */ cvt.s.w $f2, $f2 /* 19ECD8 802703F8 0809C10C */ j .L80270430 /* 19ECDC 802703FC 46001500 */ add.s $f20, $f2, $f0 @@ -177,20 +177,20 @@ glabel BoostDefense /* 19ECE0 80270400 86020152 */ lh $v0, 0x152($s0) /* 19ECE4 80270404 C6020148 */ lwc1 $f2, 0x148($s0) /* 19ECE8 80270408 44820000 */ mtc1 $v0, $f0 -/* 19ECEC 8027040C 00000000 */ nop +/* 19ECEC 8027040C 00000000 */ nop /* 19ECF0 80270410 46800020 */ cvt.s.w $f0, $f0 /* 19ECF4 80270414 92020191 */ lbu $v0, 0x191($s0) /* 19ECF8 80270418 46001080 */ add.s $f2, $f2, $f0 /* 19ECFC 8027041C 00021040 */ sll $v0, $v0, 1 /* 19ED00 80270420 44820000 */ mtc1 $v0, $f0 -/* 19ED04 80270424 00000000 */ nop +/* 19ED04 80270424 00000000 */ nop /* 19ED08 80270428 46800020 */ cvt.s.w $f0, $f0 /* 19ED0C 8027042C 46001500 */ add.s $f20, $f2, $f0 .L80270430: /* 19ED10 80270430 86020154 */ lh $v0, 0x154($s0) /* 19ED14 80270434 C600014C */ lwc1 $f0, 0x14c($s0) /* 19ED18 80270438 44821000 */ mtc1 $v0, $f2 -/* 19ED1C 8027043C 00000000 */ nop +/* 19ED1C 8027043C 00000000 */ nop /* 19ED20 80270440 468010A0 */ cvt.s.w $f2, $f2 /* 19ED24 80270444 46020000 */ add.s $f0, $f0, $f2 /* 19ED28 80270448 8E420070 */ lw $v0, 0x70($s2) @@ -201,11 +201,12 @@ glabel BoostDefense /* 19ED3C 8027045C 10400063 */ beqz $v0, .L802705EC /* 19ED40 80270460 46020580 */ add.s $f22, $f0, $f2 /* 19ED44 80270464 00031080 */ sll $v0, $v1, 2 -/* 19ED48 80270468 3C01802A */ lui $at, %hi(D_8029D820) +/* 19ED48 80270468 3C01802A */ lui $at, %hi(jtbl_8029D820_1CC100) /* 19ED4C 8027046C 00220821 */ addu $at, $at, $v0 -/* 19ED50 80270470 8C22D820 */ lw $v0, %lo(D_8029D820)($at) +/* 19ED50 80270470 8C22D820 */ lw $v0, %lo(jtbl_8029D820_1CC100)($at) /* 19ED54 80270474 00400008 */ jr $v0 -/* 19ED58 80270478 00000000 */ nop +/* 19ED58 80270478 00000000 */ nop +glabel L8027047C_19ED5C /* 19ED5C 8027047C 8E42007C */ lw $v0, 0x7c($s2) /* 19ED60 80270480 1440004D */ bnez $v0, .L802705B8 /* 19ED64 80270484 2442FFFF */ addiu $v0, $v0, -1 @@ -225,6 +226,7 @@ glabel BoostDefense /* 19ED9C 802704BC AE50007C */ sw $s0, 0x7c($s2) /* 19EDA0 802704C0 0809C17B */ j .L802705EC /* 19EDA4 802704C4 AE420070 */ sw $v0, 0x70($s2) +glabel L802704C8_19EDA8 /* 19EDA8 802704C8 8E42007C */ lw $v0, 0x7c($s2) /* 19EDAC 802704CC 1440003A */ bnez $v0, .L802705B8 /* 19EDB0 802704D0 2442FFFF */ addiu $v0, $v0, -1 @@ -262,6 +264,7 @@ glabel BoostDefense /* 19EE2C 8027054C 24020003 */ addiu $v0, $zero, 3 /* 19EE30 80270550 0809C17B */ j .L802705EC /* 19EE34 80270554 AE420070 */ sw $v0, 0x70($s2) +glabel L80270558_19EE38 /* 19EE38 80270558 8E42007C */ lw $v0, 0x7c($s2) /* 19EE3C 8027055C 14400016 */ bnez $v0, .L802705B8 /* 19EE40 80270560 2442FFFF */ addiu $v0, $v0, -1 @@ -272,8 +275,9 @@ glabel BoostDefense /* 19EE54 80270574 24020004 */ addiu $v0, $zero, 4 /* 19EE58 80270578 0809C17B */ j .L802705EC /* 19EE5C 8027057C AE420070 */ sw $v0, 0x70($s2) +glabel L80270580_19EE60 /* 19EE60 80270580 0C093EAD */ jal is_popup_displayed -/* 19EE64 80270584 00000000 */ nop +/* 19EE64 80270584 00000000 */ nop /* 19EE68 80270588 14400019 */ bnez $v0, .L802705F0 /* 19EE6C 8027058C 0000102D */ daddu $v0, $zero, $zero /* 19EE70 80270590 0C093903 */ jal func_8024E40C @@ -283,6 +287,7 @@ glabel BoostDefense /* 19EE80 802705A0 24020005 */ addiu $v0, $zero, 5 /* 19EE84 802705A4 0809C17B */ j .L802705EC /* 19EE88 802705A8 AE420070 */ sw $v0, 0x70($s2) +glabel L802705AC_19EE8C /* 19EE8C 802705AC 8E42007C */ lw $v0, 0x7c($s2) /* 19EE90 802705B0 10400003 */ beqz $v0, .L802705C0 /* 19EE94 802705B4 2442FFFF */ addiu $v0, $v0, -1 @@ -292,7 +297,7 @@ glabel BoostDefense .L802705C0: /* 19EEA0 802705C0 8E0201D8 */ lw $v0, 0x1d8($s0) /* 19EEA4 802705C4 10400005 */ beqz $v0, .L802705DC -/* 19EEA8 802705C8 00000000 */ nop +/* 19EEA8 802705C8 00000000 */ nop /* 19EEAC 802705CC 0C0B1059 */ jal does_script_exist /* 19EEB0 802705D0 8E0401E8 */ lw $a0, 0x1e8($s0) /* 19EEB4 802705D4 14400006 */ bnez $v0, .L802705F0 diff --git a/asm/nonmatchings/code_197F40/CancelablePlayerRunToGoal.s b/asm/nonmatchings/code_197F40/CancelablePlayerRunToGoal.s index e4c64d88fb..dd24334abe 100644 --- a/asm/nonmatchings/code_197F40/CancelablePlayerRunToGoal.s +++ b/asm/nonmatchings/code_197F40/CancelablePlayerRunToGoal.s @@ -24,7 +24,7 @@ glabel CancelablePlayerRunToGoal .L80273F48: /* 1A2828 80273F48 8E620070 */ lw $v0, 0x70($s3) /* 1A282C 80273F4C 14400046 */ bnez $v0, .L80274068 -/* 1A2830 80273F50 00000000 */ nop +/* 1A2830 80273F50 00000000 */ nop /* 1A2834 80273F54 8E250000 */ lw $a1, ($s1) /* 1A2838 80273F58 26310004 */ addiu $s1, $s1, 4 /* 1A283C 80273F5C 0C0B1EAF */ jal get_variable @@ -60,15 +60,15 @@ glabel CancelablePlayerRunToGoal /* 1A28B4 80273FD4 46001003 */ div.s $f0, $f2, $f0 /* 1A28B8 80273FD8 4600020D */ trunc.w.s $f8, $f0 /* 1A28BC 80273FDC 44034000 */ mfc1 $v1, $f8 -/* 1A28C0 80273FE0 00000000 */ nop +/* 1A28C0 80273FE0 00000000 */ nop /* 1A28C4 80273FE4 00031400 */ sll $v0, $v1, 0x10 /* 1A28C8 80273FE8 00021403 */ sra $v0, $v0, 0x10 /* 1A28CC 80273FEC C602004C */ lwc1 $f2, 0x4c($s0) /* 1A28D0 80273FF0 44823000 */ mtc1 $v0, $f6 -/* 1A28D4 80273FF4 00000000 */ nop +/* 1A28D4 80273FF4 00000000 */ nop /* 1A28D8 80273FF8 468031A0 */ cvt.s.w $f6, $f6 /* 1A28DC 80273FFC 46023102 */ mul.s $f4, $f6, $f2 -/* 1A28E0 80274000 00000000 */ nop +/* 1A28E0 80274000 00000000 */ nop /* 1A28E4 80274004 C6000058 */ lwc1 $f0, 0x58($s0) /* 1A28E8 80274008 46040001 */ sub.s $f0, $f0, $f4 /* 1A28EC 8027400C 46060003 */ div.s $f0, $f0, $f6 @@ -78,7 +78,7 @@ glabel CancelablePlayerRunToGoal /* 1A28FC 8027401C E602004C */ swc1 $f2, 0x4c($s0) .L80274020: /* 1A2900 80274020 44820000 */ mtc1 $v0, $f0 -/* 1A2904 80274024 00000000 */ nop +/* 1A2904 80274024 00000000 */ nop /* 1A2908 80274028 46800020 */ cvt.s.w $f0, $f0 /* 1A290C 8027402C 46001003 */ div.s $f0, $f2, $f0 /* 1A2910 80274030 E600004C */ swc1 $f0, 0x4c($s0) @@ -87,7 +87,7 @@ glabel CancelablePlayerRunToGoal /* 1A2918 80274038 86430064 */ lh $v1, 0x64($s2) /* 1A291C 8027403C 24420001 */ addiu $v0, $v0, 1 /* 1A2920 80274040 44820000 */ mtc1 $v0, $f0 -/* 1A2924 80274044 00000000 */ nop +/* 1A2924 80274044 00000000 */ nop /* 1A2928 80274048 46800020 */ cvt.s.w $f0, $f0 /* 1A292C 8027404C E640004C */ swc1 $f0, 0x4c($s2) /* 1A2930 80274050 1060006C */ beqz $v1, .L80274204 @@ -110,9 +110,9 @@ glabel CancelablePlayerRunToGoal /* 1A2970 80274090 C6420040 */ lwc1 $f2, 0x40($s2) /* 1A2974 80274094 3C014080 */ lui $at, 0x4080 /* 1A2978 80274098 44810000 */ mtc1 $at, $f0 -/* 1A297C 8027409C 00000000 */ nop +/* 1A297C 8027409C 00000000 */ nop /* 1A2980 802740A0 4600103C */ c.lt.s $f2, $f0 -/* 1A2984 802740A4 00000000 */ nop +/* 1A2984 802740A4 00000000 */ nop /* 1A2988 802740A8 45000007 */ bc1f .L802740C8 /* 1A298C 802740AC 0000202D */ daddu $a0, $zero, $zero /* 1A2990 802740B0 C600018C */ lwc1 $f0, 0x18c($s0) @@ -130,19 +130,19 @@ glabel CancelablePlayerRunToGoal /* 1A29BC 802740DC 24040001 */ addiu $a0, $zero, 1 .L802740E0: /* 1A29C0 802740E0 0C0990BC */ jal play_movement_dust_effects -/* 1A29C4 802740E4 00000000 */ nop +/* 1A29C4 802740E4 00000000 */ nop /* 1A29C8 802740E8 C642004C */ lwc1 $f2, 0x4c($s2) /* 1A29CC 802740EC C6400040 */ lwc1 $f0, 0x40($s2) /* 1A29D0 802740F0 46001080 */ add.s $f2, $f2, $f0 /* 1A29D4 802740F4 E642004C */ swc1 $f2, 0x4c($s2) /* 1A29D8 802740F8 860201B4 */ lh $v0, 0x1b4($s0) /* 1A29DC 802740FC 44820000 */ mtc1 $v0, $f0 -/* 1A29E0 80274100 00000000 */ nop +/* 1A29E0 80274100 00000000 */ nop /* 1A29E4 80274104 46800020 */ cvt.s.w $f0, $f0 /* 1A29E8 80274108 4602003C */ c.lt.s $f0, $f2 -/* 1A29EC 8027410C 00000000 */ nop +/* 1A29EC 8027410C 00000000 */ nop /* 1A29F0 80274110 45000013 */ bc1f .L80274160 -/* 1A29F4 80274114 00000000 */ nop +/* 1A29F4 80274114 00000000 */ nop /* 1A29F8 80274118 92020135 */ lbu $v0, 0x135($s0) /* 1A29FC 8027411C 24420001 */ addiu $v0, $v0, 1 /* 1A2A00 80274120 A2020135 */ sb $v0, 0x135($s0) @@ -167,10 +167,10 @@ glabel CancelablePlayerRunToGoal /* 1A2A40 80274160 8E62007C */ lw $v0, 0x7c($s3) /* 1A2A44 80274164 2842000D */ slti $v0, $v0, 0xd /* 1A2A48 80274168 14400013 */ bnez $v0, .L802741B8 -/* 1A2A4C 8027416C 00000000 */ nop +/* 1A2A4C 8027416C 00000000 */ nop /* 1A2A50 80274170 8E620078 */ lw $v0, 0x78($s3) /* 1A2A54 80274174 14400009 */ bnez $v0, .L8027419C -/* 1A2A58 80274178 00000000 */ nop +/* 1A2A58 80274178 00000000 */ nop /* 1A2A5C 8027417C 8E820210 */ lw $v0, 0x210($s4) /* 1A2A60 80274180 30428000 */ andi $v0, $v0, 0x8000 /* 1A2A64 80274184 14400002 */ bnez $v0, .L80274190 @@ -179,7 +179,7 @@ glabel CancelablePlayerRunToGoal .L80274190: /* 1A2A70 80274190 8E620078 */ lw $v0, 0x78($s3) /* 1A2A74 80274194 10400008 */ beqz $v0, .L802741B8 -/* 1A2A78 80274198 00000000 */ nop +/* 1A2A78 80274198 00000000 */ nop .L8027419C: /* 1A2A7C 8027419C 8E820214 */ lw $v0, 0x214($s4) /* 1A2A80 802741A0 30428000 */ andi $v0, $v0, 0x8000 @@ -207,7 +207,7 @@ glabel CancelablePlayerRunToGoal /* 1A2AD4 802741F4 0000302D */ daddu $a2, $zero, $zero .L802741F8: /* 1A2AD8 802741F8 0C0B2026 */ jal set_variable -/* 1A2ADC 802741FC 00000000 */ nop +/* 1A2ADC 802741FC 00000000 */ nop /* 1A2AE0 80274200 24020002 */ addiu $v0, $zero, 2 .L80274204: /* 1A2AE4 80274204 8FBF002C */ lw $ra, 0x2c($sp) diff --git a/asm/nonmatchings/code_197F40/ChooseNextTarget.s b/asm/nonmatchings/code_197F40/ChooseNextTarget.s index ae6a995450..9cf7ec5098 100644 --- a/asm/nonmatchings/code_197F40/ChooseNextTarget.s +++ b/asm/nonmatchings/code_197F40/ChooseNextTarget.s @@ -26,7 +26,7 @@ glabel ChooseNextTarget /* 19CD48 8026E468 A2200425 */ sb $zero, 0x425($s1) .L8026E46C: /* 19CD4C 8026E46C 14820013 */ bne $a0, $v0, .L8026E4BC -/* 19CD50 8026E470 00000000 */ nop +/* 19CD50 8026E470 00000000 */ nop /* 19CD54 8026E474 9222040C */ lbu $v0, 0x40c($s1) /* 19CD58 8026E478 2442FFFF */ addiu $v0, $v0, -1 /* 19CD5C 8026E47C A2220425 */ sb $v0, 0x425($s1) diff --git a/asm/nonmatchings/code_197F40/CopyBuffs.s b/asm/nonmatchings/code_197F40/CopyBuffs.s index d8a3804da2..458dc2d1e4 100644 --- a/asm/nonmatchings/code_197F40/CopyBuffs.s +++ b/asm/nonmatchings/code_197F40/CopyBuffs.s @@ -14,7 +14,7 @@ glabel CopyBuffs /* 19FA64 80271184 26100004 */ addiu $s0, $s0, 4 /* 19FA68 80271188 2412FF81 */ addiu $s2, $zero, -0x7f /* 19FA6C 8027118C 14520002 */ bne $v0, $s2, .L80271198 -/* 19FA70 80271190 00000000 */ nop +/* 19FA70 80271190 00000000 */ nop /* 19FA74 80271194 8E220148 */ lw $v0, 0x148($s1) .L80271198: /* 19FA78 80271198 0C09A75B */ jal get_actor @@ -24,7 +24,7 @@ glabel CopyBuffs /* 19FA88 802711A8 0C0B1EAF */ jal get_variable /* 19FA8C 802711AC 0040802D */ daddu $s0, $v0, $zero /* 19FA90 802711B0 14520002 */ bne $v0, $s2, .L802711BC -/* 19FA94 802711B4 00000000 */ nop +/* 19FA94 802711B4 00000000 */ nop /* 19FA98 802711B8 8E220148 */ lw $v0, 0x148($s1) .L802711BC: /* 19FA9C 802711BC 0C09A75B */ jal get_actor @@ -47,4 +47,4 @@ glabel CopyBuffs /* 19FAE0 80271200 24020002 */ addiu $v0, $zero, 2 /* 19FAE4 80271204 03E00008 */ jr $ra /* 19FAE8 80271208 27BD0020 */ addiu $sp, $sp, 0x20 -/* 19FAEC 8027120C 00000000 */ nop +/* 19FAEC 8027120C 00000000 */ nop diff --git a/asm/nonmatchings/code_197F40/CreatePartShadow.s b/asm/nonmatchings/code_197F40/CreatePartShadow.s index eb8a1f594c..bdb49543f9 100644 --- a/asm/nonmatchings/code_197F40/CreatePartShadow.s +++ b/asm/nonmatchings/code_197F40/CreatePartShadow.s @@ -19,7 +19,7 @@ glabel CreatePartShadow /* 19DE44 8026F564 0040282D */ daddu $a1, $v0, $zero /* 19DE48 8026F568 2402FF81 */ addiu $v0, $zero, -0x7f /* 19DE4C 8026F56C 16220002 */ bne $s1, $v0, .L8026F578 -/* 19DE50 8026F570 00000000 */ nop +/* 19DE50 8026F570 00000000 */ nop /* 19DE54 8026F574 8E510148 */ lw $s1, 0x148($s2) .L8026F578: /* 19DE58 8026F578 0C099CC7 */ jal create_part_shadow diff --git a/asm/nonmatchings/code_197F40/DidActionSucceed.s b/asm/nonmatchings/code_197F40/DidActionSucceed.s index 310ad28e96..d11d5a9d96 100644 --- a/asm/nonmatchings/code_197F40/DidActionSucceed.s +++ b/asm/nonmatchings/code_197F40/DidActionSucceed.s @@ -17,7 +17,7 @@ glabel DidActionSucceed /* 1A57C0 80276EE0 0060302D */ daddu $a2, $v1, $zero .L80276EE4: /* 1A57C4 80276EE4 0C0B2026 */ jal set_variable -/* 1A57C8 80276EE8 00000000 */ nop +/* 1A57C8 80276EE8 00000000 */ nop /* 1A57CC 80276EEC 8FBF0010 */ lw $ra, 0x10($sp) /* 1A57D0 80276EF0 24020002 */ addiu $v0, $zero, 2 /* 1A57D4 80276EF4 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_197F40/ElectrifyActor.s b/asm/nonmatchings/code_197F40/ElectrifyActor.s index a5b412dea6..16e1b93ee0 100644 --- a/asm/nonmatchings/code_197F40/ElectrifyActor.s +++ b/asm/nonmatchings/code_197F40/ElectrifyActor.s @@ -14,7 +14,7 @@ glabel ElectrifyActor .L80270980: /* 19F260 80270980 8E420070 */ lw $v0, 0x70($s2) /* 19F264 80270984 1440002D */ bnez $v0, .L80270A3C -/* 19F268 80270988 00000000 */ nop +/* 19F268 80270988 00000000 */ nop /* 19F26C 8027098C 8E250000 */ lw $a1, ($s1) /* 19F270 80270990 26310004 */ addiu $s1, $s1, 4 /* 19F274 80270994 0C0B1EAF */ jal get_variable @@ -22,7 +22,7 @@ glabel ElectrifyActor /* 19F27C 8027099C 0040802D */ daddu $s0, $v0, $zero /* 19F280 802709A0 2402FF81 */ addiu $v0, $zero, -0x7f /* 19F284 802709A4 16020002 */ bne $s0, $v0, .L802709B0 -/* 19F288 802709A8 00000000 */ nop +/* 19F288 802709A8 00000000 */ nop /* 19F28C 802709AC 8E500148 */ lw $s0, 0x148($s2) .L802709B0: /* 19F290 802709B0 8E250000 */ lw $a1, ($s1) @@ -40,13 +40,13 @@ glabel ElectrifyActor /* 19F2C0 802709E0 2404000C */ addiu $a0, $zero, 0xc /* 19F2C4 802709E4 86040192 */ lh $a0, 0x192($s0) /* 19F2C8 802709E8 0C09390F */ jal cam_target_actor -/* 19F2CC 802709EC 00000000 */ nop +/* 19F2CC 802709EC 00000000 */ nop /* 19F2D0 802709F0 0C093965 */ jal set_cam_zoom /* 19F2D4 802709F4 240400FA */ addiu $a0, $zero, 0xfa /* 19F2D8 802709F8 0C093936 */ jal move_cam_over /* 19F2DC 802709FC 2404000A */ addiu $a0, $zero, 0xa /* 19F2E0 80270A00 0C093983 */ jal func_8024E60C -/* 19F2E4 80270A04 00000000 */ nop +/* 19F2E4 80270A04 00000000 */ nop /* 19F2E8 80270A08 8E020000 */ lw $v0, ($s0) /* 19F2EC 80270A0C 30420800 */ andi $v0, $v0, 0x800 /* 19F2F0 80270A10 10400004 */ beqz $v0, .L80270A24 @@ -70,7 +70,7 @@ glabel ElectrifyActor /* 19F330 80270A50 8E030000 */ lw $v1, ($s0) /* 19F334 80270A54 C6000144 */ lwc1 $f0, 0x144($s0) /* 19F338 80270A58 44821000 */ mtc1 $v0, $f2 -/* 19F33C 80270A5C 00000000 */ nop +/* 19F33C 80270A5C 00000000 */ nop /* 19F340 80270A60 468010A0 */ cvt.s.w $f2, $f2 /* 19F344 80270A64 30620800 */ andi $v0, $v1, 0x800 /* 19F348 80270A68 1040000E */ beqz $v0, .L80270AA4 @@ -78,30 +78,30 @@ glabel ElectrifyActor /* 19F350 80270A70 86020152 */ lh $v0, 0x152($s0) /* 19F354 80270A74 C6020148 */ lwc1 $f2, 0x148($s0) /* 19F358 80270A78 44820000 */ mtc1 $v0, $f0 -/* 19F35C 80270A7C 00000000 */ nop +/* 19F35C 80270A7C 00000000 */ nop /* 19F360 80270A80 46800020 */ cvt.s.w $f0, $f0 /* 19F364 80270A84 92020191 */ lbu $v0, 0x191($s0) /* 19F368 80270A88 46001080 */ add.s $f2, $f2, $f0 /* 19F36C 80270A8C 00021042 */ srl $v0, $v0, 1 /* 19F370 80270A90 44820000 */ mtc1 $v0, $f0 -/* 19F374 80270A94 00000000 */ nop +/* 19F374 80270A94 00000000 */ nop /* 19F378 80270A98 46800020 */ cvt.s.w $f0, $f0 /* 19F37C 80270A9C 0809C2C4 */ j .L80270B10 /* 19F380 80270AA0 46001101 */ sub.s $f4, $f2, $f0 .L80270AA4: /* 19F384 80270AA4 30628000 */ andi $v0, $v1, 0x8000 /* 19F388 80270AA8 1440000E */ bnez $v0, .L80270AE4 -/* 19F38C 80270AAC 00000000 */ nop +/* 19F38C 80270AAC 00000000 */ nop /* 19F390 80270AB0 86020152 */ lh $v0, 0x152($s0) /* 19F394 80270AB4 C6020148 */ lwc1 $f2, 0x148($s0) /* 19F398 80270AB8 44820000 */ mtc1 $v0, $f0 -/* 19F39C 80270ABC 00000000 */ nop +/* 19F39C 80270ABC 00000000 */ nop /* 19F3A0 80270AC0 46800020 */ cvt.s.w $f0, $f0 /* 19F3A4 80270AC4 92020191 */ lbu $v0, 0x191($s0) /* 19F3A8 80270AC8 46001080 */ add.s $f2, $f2, $f0 /* 19F3AC 80270ACC 00021042 */ srl $v0, $v0, 1 /* 19F3B0 80270AD0 44820000 */ mtc1 $v0, $f0 -/* 19F3B4 80270AD4 00000000 */ nop +/* 19F3B4 80270AD4 00000000 */ nop /* 19F3B8 80270AD8 46800020 */ cvt.s.w $f0, $f0 /* 19F3BC 80270ADC 0809C2C4 */ j .L80270B10 /* 19F3C0 80270AE0 46020100 */ add.s $f4, $f0, $f2 @@ -109,19 +109,19 @@ glabel ElectrifyActor /* 19F3C4 80270AE4 86020152 */ lh $v0, 0x152($s0) /* 19F3C8 80270AE8 C6000148 */ lwc1 $f0, 0x148($s0) /* 19F3CC 80270AEC 44821000 */ mtc1 $v0, $f2 -/* 19F3D0 80270AF0 00000000 */ nop +/* 19F3D0 80270AF0 00000000 */ nop /* 19F3D4 80270AF4 468010A0 */ cvt.s.w $f2, $f2 /* 19F3D8 80270AF8 92020191 */ lbu $v0, 0x191($s0) /* 19F3DC 80270AFC 46020000 */ add.s $f0, $f0, $f2 /* 19F3E0 80270B00 44821000 */ mtc1 $v0, $f2 -/* 19F3E4 80270B04 00000000 */ nop +/* 19F3E4 80270B04 00000000 */ nop /* 19F3E8 80270B08 468010A0 */ cvt.s.w $f2, $f2 /* 19F3EC 80270B0C 46020100 */ add.s $f4, $f0, $f2 .L80270B10: /* 19F3F0 80270B10 86020154 */ lh $v0, 0x154($s0) /* 19F3F4 80270B14 C600014C */ lwc1 $f0, 0x14c($s0) /* 19F3F8 80270B18 44821000 */ mtc1 $v0, $f2 -/* 19F3FC 80270B1C 00000000 */ nop +/* 19F3FC 80270B1C 00000000 */ nop /* 19F400 80270B20 468010A0 */ cvt.s.w $f2, $f2 /* 19F404 80270B24 46020000 */ add.s $f0, $f0, $f2 /* 19F408 80270B28 8E420070 */ lw $v0, 0x70($s2) @@ -132,11 +132,12 @@ glabel ElectrifyActor /* 19F41C 80270B3C 10400052 */ beqz $v0, .L80270C88 /* 19F420 80270B40 46020080 */ add.s $f2, $f0, $f2 /* 19F424 80270B44 00031080 */ sll $v0, $v1, 2 -/* 19F428 80270B48 3C01802A */ lui $at, %hi(D_8029D850) +/* 19F428 80270B48 3C01802A */ lui $at, %hi(jtbl_8029D850_1CC130) /* 19F42C 80270B4C 00220821 */ addu $at, $at, $v0 -/* 19F430 80270B50 8C22D850 */ lw $v0, %lo(D_8029D850)($at) +/* 19F430 80270B50 8C22D850 */ lw $v0, %lo(jtbl_8029D850_1CC130)($at) /* 19F434 80270B54 00400008 */ jr $v0 -/* 19F438 80270B58 00000000 */ nop +/* 19F438 80270B58 00000000 */ nop +glabel L80270B5C_19F43C /* 19F43C 80270B5C 8E42007C */ lw $v0, 0x7c($s2) /* 19F440 80270B60 1440003C */ bnez $v0, .L80270C54 /* 19F444 80270B64 2442FFFF */ addiu $v0, $v0, -1 @@ -156,6 +157,7 @@ glabel ElectrifyActor /* 19F47C 80270B9C AE50007C */ sw $s0, 0x7c($s2) /* 19F480 80270BA0 0809C322 */ j .L80270C88 /* 19F484 80270BA4 AE420070 */ sw $v0, 0x70($s2) +glabel L80270BA8_19F488 /* 19F488 80270BA8 8E42007C */ lw $v0, 0x7c($s2) /* 19F48C 80270BAC 14400029 */ bnez $v0, .L80270C54 /* 19F490 80270BB0 2442FFFF */ addiu $v0, $v0, -1 @@ -175,6 +177,7 @@ glabel ElectrifyActor /* 19F4C8 80270BE8 24020003 */ addiu $v0, $zero, 3 /* 19F4CC 80270BEC 0809C322 */ j .L80270C88 /* 19F4D0 80270BF0 AE420070 */ sw $v0, 0x70($s2) +glabel L80270BF4_19F4D4 /* 19F4D4 80270BF4 8E42007C */ lw $v0, 0x7c($s2) /* 19F4D8 80270BF8 14400016 */ bnez $v0, .L80270C54 /* 19F4DC 80270BFC 2442FFFF */ addiu $v0, $v0, -1 @@ -185,8 +188,9 @@ glabel ElectrifyActor /* 19F4F0 80270C10 24020004 */ addiu $v0, $zero, 4 /* 19F4F4 80270C14 0809C322 */ j .L80270C88 /* 19F4F8 80270C18 AE420070 */ sw $v0, 0x70($s2) +glabel L80270C1C_19F4FC /* 19F4FC 80270C1C 0C093EAD */ jal is_popup_displayed -/* 19F500 80270C20 00000000 */ nop +/* 19F500 80270C20 00000000 */ nop /* 19F504 80270C24 14400019 */ bnez $v0, .L80270C8C /* 19F508 80270C28 0000102D */ daddu $v0, $zero, $zero /* 19F50C 80270C2C 0C093903 */ jal func_8024E40C @@ -196,6 +200,7 @@ glabel ElectrifyActor /* 19F51C 80270C3C 24020005 */ addiu $v0, $zero, 5 /* 19F520 80270C40 0809C322 */ j .L80270C88 /* 19F524 80270C44 AE420070 */ sw $v0, 0x70($s2) +glabel L80270C48_19F528 /* 19F528 80270C48 8E42007C */ lw $v0, 0x7c($s2) /* 19F52C 80270C4C 10400003 */ beqz $v0, .L80270C5C /* 19F530 80270C50 2442FFFF */ addiu $v0, $v0, -1 @@ -205,7 +210,7 @@ glabel ElectrifyActor .L80270C5C: /* 19F53C 80270C5C 8E0201D8 */ lw $v0, 0x1d8($s0) /* 19F540 80270C60 10400005 */ beqz $v0, .L80270C78 -/* 19F544 80270C64 00000000 */ nop +/* 19F544 80270C64 00000000 */ nop /* 19F548 80270C68 0C0B1059 */ jal does_script_exist /* 19F54C 80270C6C 8E0401E8 */ lw $a0, 0x1e8($s0) /* 19F550 80270C70 14400006 */ bnez $v0, .L80270C8C diff --git a/asm/nonmatchings/code_197F40/EnablePlayerBlur.s b/asm/nonmatchings/code_197F40/EnablePlayerBlur.s index 9f666510a4..313ba7fc13 100644 --- a/asm/nonmatchings/code_197F40/EnablePlayerBlur.s +++ b/asm/nonmatchings/code_197F40/EnablePlayerBlur.s @@ -11,19 +11,19 @@ glabel EnablePlayerBlur /* 1A3270 80274990 14600005 */ bnez $v1, .L802749A8 /* 1A3274 80274994 24020001 */ addiu $v0, $zero, 1 /* 1A3278 80274998 0C095245 */ jal disable_player_blur -/* 1A327C 8027499C 00000000 */ nop +/* 1A327C 8027499C 00000000 */ nop /* 1A3280 802749A0 0809D272 */ j .L802749C8 -/* 1A3284 802749A4 00000000 */ nop +/* 1A3284 802749A4 00000000 */ nop .L802749A8: /* 1A3288 802749A8 14620005 */ bne $v1, $v0, .L802749C0 -/* 1A328C 802749AC 00000000 */ nop +/* 1A328C 802749AC 00000000 */ nop /* 1A3290 802749B0 0C0951B5 */ jal enable_player_blur -/* 1A3294 802749B4 00000000 */ nop +/* 1A3294 802749B4 00000000 */ nop /* 1A3298 802749B8 0809D272 */ j .L802749C8 -/* 1A329C 802749BC 00000000 */ nop +/* 1A329C 802749BC 00000000 */ nop .L802749C0: /* 1A32A0 802749C0 0C095254 */ jal func_80254950 -/* 1A32A4 802749C4 00000000 */ nop +/* 1A32A4 802749C4 00000000 */ nop .L802749C8: /* 1A32A8 802749C8 8FBF0010 */ lw $ra, 0x10($sp) /* 1A32AC 802749CC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_197F40/GetActorAttackBoost.s b/asm/nonmatchings/code_197F40/GetActorAttackBoost.s index e2deca95c9..86074bcbe9 100644 --- a/asm/nonmatchings/code_197F40/GetActorAttackBoost.s +++ b/asm/nonmatchings/code_197F40/GetActorAttackBoost.s @@ -14,7 +14,7 @@ glabel GetActorAttackBoost /* 19E508 8026FC28 0040202D */ daddu $a0, $v0, $zero /* 19E50C 8026FC2C 2402FF81 */ addiu $v0, $zero, -0x7f /* 19E510 8026FC30 14820002 */ bne $a0, $v0, .L8026FC3C -/* 19E514 8026FC34 00000000 */ nop +/* 19E514 8026FC34 00000000 */ nop /* 19E518 8026FC38 8E240148 */ lw $a0, 0x148($s1) .L8026FC3C: /* 19E51C 8026FC3C 0C09A75B */ jal get_actor diff --git a/asm/nonmatchings/code_197F40/GetActorDefenseBoost.s b/asm/nonmatchings/code_197F40/GetActorDefenseBoost.s index 594195f33b..ccf3b46ddc 100644 --- a/asm/nonmatchings/code_197F40/GetActorDefenseBoost.s +++ b/asm/nonmatchings/code_197F40/GetActorDefenseBoost.s @@ -14,7 +14,7 @@ glabel GetActorDefenseBoost /* 19E570 8026FC90 0040202D */ daddu $a0, $v0, $zero /* 19E574 8026FC94 2402FF81 */ addiu $v0, $zero, -0x7f /* 19E578 8026FC98 14820002 */ bne $a0, $v0, .L8026FCA4 -/* 19E57C 8026FC9C 00000000 */ nop +/* 19E57C 8026FC9C 00000000 */ nop /* 19E580 8026FCA0 8E240148 */ lw $a0, 0x148($s1) .L8026FCA4: /* 19E584 8026FCA4 0C09A75B */ jal get_actor diff --git a/asm/nonmatchings/code_197F40/GetDistanceToGoal.s b/asm/nonmatchings/code_197F40/GetDistanceToGoal.s index 3315b2e05f..1873d8c6ed 100644 --- a/asm/nonmatchings/code_197F40/GetDistanceToGoal.s +++ b/asm/nonmatchings/code_197F40/GetDistanceToGoal.s @@ -18,7 +18,7 @@ glabel GetDistanceToGoal /* 19D310 8026EA30 8E240148 */ lw $a0, 0x148($s1) .L8026EA34: /* 19D314 8026EA34 0C09A75B */ jal get_actor -/* 19D318 8026EA38 00000000 */ nop +/* 19D318 8026EA38 00000000 */ nop /* 19D31C 8026EA3C 8C460018 */ lw $a2, 0x18($v0) /* 19D320 8026EA40 C44C0144 */ lwc1 $f12, 0x144($v0) /* 19D324 8026EA44 C44E014C */ lwc1 $f14, 0x14c($v0) diff --git a/asm/nonmatchings/code_197F40/GetStatusFlags.s b/asm/nonmatchings/code_197F40/GetStatusFlags.s index 26886c8028..a41536a4ad 100644 --- a/asm/nonmatchings/code_197F40/GetStatusFlags.s +++ b/asm/nonmatchings/code_197F40/GetStatusFlags.s @@ -112,9 +112,9 @@ glabel GetStatusFlags /* 19DC7C 8026F39C 10C20005 */ beq $a2, $v0, .L8026F3B4 /* 19DC80 8026F3A0 28C20101 */ slti $v0, $a2, 0x101 /* 19DC84 8026F3A4 10400009 */ beqz $v0, .L8026F3CC -/* 19DC88 8026F3A8 00000000 */ nop +/* 19DC88 8026F3A8 00000000 */ nop /* 19DC8C 8026F3AC 14C00007 */ bnez $a2, .L8026F3CC -/* 19DC90 8026F3B0 00000000 */ nop +/* 19DC90 8026F3B0 00000000 */ nop .L8026F3B4: /* 19DC94 8026F3B4 3C02800E */ lui $v0, %hi(gBattleStatus) /* 19DC98 8026F3B8 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) diff --git a/asm/nonmatchings/code_197F40/HealActor.s b/asm/nonmatchings/code_197F40/HealActor.s index 215356c4ee..6e8f7af90e 100644 --- a/asm/nonmatchings/code_197F40/HealActor.s +++ b/asm/nonmatchings/code_197F40/HealActor.s @@ -21,7 +21,7 @@ glabel HealActor .L80270CE4: /* 19F5C4 80270CE4 8E420070 */ lw $v0, 0x70($s2) /* 19F5C8 80270CE8 1440002B */ bnez $v0, .L80270D98 -/* 19F5CC 80270CEC 00000000 */ nop +/* 19F5CC 80270CEC 00000000 */ nop /* 19F5D0 80270CF0 8E050000 */ lw $a1, ($s0) /* 19F5D4 80270CF4 26100004 */ addiu $s0, $s0, 4 /* 19F5D8 80270CF8 0C0B1EAF */ jal get_variable @@ -29,7 +29,7 @@ glabel HealActor /* 19F5E0 80270D00 0040882D */ daddu $s1, $v0, $zero /* 19F5E4 80270D04 2402FF81 */ addiu $v0, $zero, -0x7f /* 19F5E8 80270D08 16220002 */ bne $s1, $v0, .L80270D14 -/* 19F5EC 80270D0C 00000000 */ nop +/* 19F5EC 80270D0C 00000000 */ nop /* 19F5F0 80270D10 8E510148 */ lw $s1, 0x148($s2) .L80270D14: /* 19F5F4 80270D14 8E050000 */ lw $a1, ($s0) @@ -53,11 +53,11 @@ glabel HealActor /* 19F63C 80270D5C 2404000C */ addiu $a0, $zero, 0xc /* 19F640 80270D60 86040192 */ lh $a0, 0x192($s0) /* 19F644 80270D64 0C09390F */ jal cam_target_actor -/* 19F648 80270D68 00000000 */ nop +/* 19F648 80270D68 00000000 */ nop /* 19F64C 80270D6C 0C093936 */ jal move_cam_over /* 19F650 80270D70 2404000A */ addiu $a0, $zero, 0xa /* 19F654 80270D74 0C093983 */ jal func_8024E60C -/* 19F658 80270D78 00000000 */ nop +/* 19F658 80270D78 00000000 */ nop /* 19F65C 80270D7C 24020001 */ addiu $v0, $zero, 1 /* 19F660 80270D80 3C01802A */ lui $at, %hi(D_8029FBD4) /* 19F664 80270D84 A022FBD4 */ sb $v0, %lo(D_8029FBD4)($at) @@ -74,7 +74,7 @@ glabel HealActor /* 19F68C 80270DAC 8E030000 */ lw $v1, ($s0) /* 19F690 80270DB0 C6000144 */ lwc1 $f0, 0x144($s0) /* 19F694 80270DB4 44821000 */ mtc1 $v0, $f2 -/* 19F698 80270DB8 00000000 */ nop +/* 19F698 80270DB8 00000000 */ nop /* 19F69C 80270DBC 468010A0 */ cvt.s.w $f2, $f2 /* 19F6A0 80270DC0 30620800 */ andi $v0, $v1, 0x800 /* 19F6A4 80270DC4 1040000E */ beqz $v0, .L80270E00 @@ -82,30 +82,30 @@ glabel HealActor /* 19F6AC 80270DCC 86020152 */ lh $v0, 0x152($s0) /* 19F6B0 80270DD0 C6020148 */ lwc1 $f2, 0x148($s0) /* 19F6B4 80270DD4 44820000 */ mtc1 $v0, $f0 -/* 19F6B8 80270DD8 00000000 */ nop +/* 19F6B8 80270DD8 00000000 */ nop /* 19F6BC 80270DDC 46800020 */ cvt.s.w $f0, $f0 /* 19F6C0 80270DE0 92020191 */ lbu $v0, 0x191($s0) /* 19F6C4 80270DE4 46001080 */ add.s $f2, $f2, $f0 /* 19F6C8 80270DE8 00021042 */ srl $v0, $v0, 1 /* 19F6CC 80270DEC 44820000 */ mtc1 $v0, $f0 -/* 19F6D0 80270DF0 00000000 */ nop +/* 19F6D0 80270DF0 00000000 */ nop /* 19F6D4 80270DF4 46800020 */ cvt.s.w $f0, $f0 /* 19F6D8 80270DF8 0809C39B */ j .L80270E6C /* 19F6DC 80270DFC 46001601 */ sub.s $f24, $f2, $f0 .L80270E00: /* 19F6E0 80270E00 30628000 */ andi $v0, $v1, 0x8000 /* 19F6E4 80270E04 1440000E */ bnez $v0, .L80270E40 -/* 19F6E8 80270E08 00000000 */ nop +/* 19F6E8 80270E08 00000000 */ nop /* 19F6EC 80270E0C 86020152 */ lh $v0, 0x152($s0) /* 19F6F0 80270E10 C6020148 */ lwc1 $f2, 0x148($s0) /* 19F6F4 80270E14 44820000 */ mtc1 $v0, $f0 -/* 19F6F8 80270E18 00000000 */ nop +/* 19F6F8 80270E18 00000000 */ nop /* 19F6FC 80270E1C 46800020 */ cvt.s.w $f0, $f0 /* 19F700 80270E20 92020191 */ lbu $v0, 0x191($s0) /* 19F704 80270E24 46001080 */ add.s $f2, $f2, $f0 /* 19F708 80270E28 00021042 */ srl $v0, $v0, 1 /* 19F70C 80270E2C 44820000 */ mtc1 $v0, $f0 -/* 19F710 80270E30 00000000 */ nop +/* 19F710 80270E30 00000000 */ nop /* 19F714 80270E34 46800020 */ cvt.s.w $f0, $f0 /* 19F718 80270E38 0809C39B */ j .L80270E6C /* 19F71C 80270E3C 46020600 */ add.s $f24, $f0, $f2 @@ -113,12 +113,12 @@ glabel HealActor /* 19F720 80270E40 86020152 */ lh $v0, 0x152($s0) /* 19F724 80270E44 C6000148 */ lwc1 $f0, 0x148($s0) /* 19F728 80270E48 44821000 */ mtc1 $v0, $f2 -/* 19F72C 80270E4C 00000000 */ nop +/* 19F72C 80270E4C 00000000 */ nop /* 19F730 80270E50 468010A0 */ cvt.s.w $f2, $f2 /* 19F734 80270E54 92020191 */ lbu $v0, 0x191($s0) /* 19F738 80270E58 46020000 */ add.s $f0, $f0, $f2 /* 19F73C 80270E5C 44821000 */ mtc1 $v0, $f2 -/* 19F740 80270E60 00000000 */ nop +/* 19F740 80270E60 00000000 */ nop /* 19F744 80270E64 468010A0 */ cvt.s.w $f2, $f2 /* 19F748 80270E68 46020600 */ add.s $f24, $f0, $f2 .L80270E6C: @@ -126,10 +126,10 @@ glabel HealActor /* 19F750 80270E70 86030150 */ lh $v1, 0x150($s0) /* 19F754 80270E74 C600014C */ lwc1 $f0, 0x14c($s0) /* 19F758 80270E78 44821000 */ mtc1 $v0, $f2 -/* 19F75C 80270E7C 00000000 */ nop +/* 19F75C 80270E7C 00000000 */ nop /* 19F760 80270E80 468010A0 */ cvt.s.w $f2, $f2 /* 19F764 80270E84 44832000 */ mtc1 $v1, $f4 -/* 19F768 80270E88 00000000 */ nop +/* 19F768 80270E88 00000000 */ nop /* 19F76C 80270E8C 46802120 */ cvt.s.w $f4, $f4 /* 19F770 80270E90 92020190 */ lbu $v0, 0x190($s0) /* 19F774 80270E94 46020000 */ add.s $f0, $f0, $f2 @@ -141,7 +141,7 @@ glabel HealActor /* 19F78C 80270EAC 00021042 */ srl $v0, $v0, 1 /* 19F790 80270EB0 46040000 */ add.s $f0, $f0, $f4 /* 19F794 80270EB4 44821000 */ mtc1 $v0, $f2 -/* 19F798 80270EB8 00000000 */ nop +/* 19F798 80270EB8 00000000 */ nop /* 19F79C 80270EBC 468010A0 */ cvt.s.w $f2, $f2 /* 19F7A0 80270EC0 30620800 */ andi $v0, $v1, 0x800 /* 19F7A4 80270EC4 1040000D */ beqz $v0, .L80270EFC @@ -149,28 +149,28 @@ glabel HealActor /* 19F7AC 80270ECC 86020152 */ lh $v0, 0x152($s0) /* 19F7B0 80270ED0 C6000148 */ lwc1 $f0, 0x148($s0) /* 19F7B4 80270ED4 44821000 */ mtc1 $v0, $f2 -/* 19F7B8 80270ED8 00000000 */ nop +/* 19F7B8 80270ED8 00000000 */ nop /* 19F7BC 80270EDC 468010A0 */ cvt.s.w $f2, $f2 /* 19F7C0 80270EE0 92020191 */ lbu $v0, 0x191($s0) /* 19F7C4 80270EE4 46020000 */ add.s $f0, $f0, $f2 /* 19F7C8 80270EE8 44821000 */ mtc1 $v0, $f2 -/* 19F7CC 80270EEC 00000000 */ nop +/* 19F7CC 80270EEC 00000000 */ nop /* 19F7D0 80270EF0 468010A0 */ cvt.s.w $f2, $f2 /* 19F7D4 80270EF4 0809C3DA */ j .L80270F68 /* 19F7D8 80270EF8 46020501 */ sub.s $f20, $f0, $f2 .L80270EFC: /* 19F7DC 80270EFC 30628000 */ andi $v0, $v1, 0x8000 /* 19F7E0 80270F00 1440000D */ bnez $v0, .L80270F38 -/* 19F7E4 80270F04 00000000 */ nop +/* 19F7E4 80270F04 00000000 */ nop /* 19F7E8 80270F08 86020152 */ lh $v0, 0x152($s0) /* 19F7EC 80270F0C C6000148 */ lwc1 $f0, 0x148($s0) /* 19F7F0 80270F10 44821000 */ mtc1 $v0, $f2 -/* 19F7F4 80270F14 00000000 */ nop +/* 19F7F4 80270F14 00000000 */ nop /* 19F7F8 80270F18 468010A0 */ cvt.s.w $f2, $f2 /* 19F7FC 80270F1C 92020191 */ lbu $v0, 0x191($s0) /* 19F800 80270F20 46020000 */ add.s $f0, $f0, $f2 /* 19F804 80270F24 44821000 */ mtc1 $v0, $f2 -/* 19F808 80270F28 00000000 */ nop +/* 19F808 80270F28 00000000 */ nop /* 19F80C 80270F2C 468010A0 */ cvt.s.w $f2, $f2 /* 19F810 80270F30 0809C3DA */ j .L80270F68 /* 19F814 80270F34 46001500 */ add.s $f20, $f2, $f0 @@ -178,20 +178,20 @@ glabel HealActor /* 19F818 80270F38 86020152 */ lh $v0, 0x152($s0) /* 19F81C 80270F3C C6020148 */ lwc1 $f2, 0x148($s0) /* 19F820 80270F40 44820000 */ mtc1 $v0, $f0 -/* 19F824 80270F44 00000000 */ nop +/* 19F824 80270F44 00000000 */ nop /* 19F828 80270F48 46800020 */ cvt.s.w $f0, $f0 /* 19F82C 80270F4C 92020191 */ lbu $v0, 0x191($s0) /* 19F830 80270F50 46001080 */ add.s $f2, $f2, $f0 /* 19F834 80270F54 00021040 */ sll $v0, $v0, 1 /* 19F838 80270F58 44820000 */ mtc1 $v0, $f0 -/* 19F83C 80270F5C 00000000 */ nop +/* 19F83C 80270F5C 00000000 */ nop /* 19F840 80270F60 46800020 */ cvt.s.w $f0, $f0 /* 19F844 80270F64 46001500 */ add.s $f20, $f2, $f0 .L80270F68: /* 19F848 80270F68 86020154 */ lh $v0, 0x154($s0) /* 19F84C 80270F6C C600014C */ lwc1 $f0, 0x14c($s0) /* 19F850 80270F70 44821000 */ mtc1 $v0, $f2 -/* 19F854 80270F74 00000000 */ nop +/* 19F854 80270F74 00000000 */ nop /* 19F858 80270F78 468010A0 */ cvt.s.w $f2, $f2 /* 19F85C 80270F7C 46020000 */ add.s $f0, $f0, $f2 /* 19F860 80270F80 8E420070 */ lw $v0, 0x70($s2) @@ -202,11 +202,12 @@ glabel HealActor /* 19F874 80270F94 1040005F */ beqz $v0, .L80271114 /* 19F878 80270F98 46020580 */ add.s $f22, $f0, $f2 /* 19F87C 80270F9C 00031080 */ sll $v0, $v1, 2 -/* 19F880 80270FA0 3C01802A */ lui $at, %hi(D_8029D868) +/* 19F880 80270FA0 3C01802A */ lui $at, %hi(jtbl_8029D868_1CC148) /* 19F884 80270FA4 00220821 */ addu $at, $at, $v0 -/* 19F888 80270FA8 8C22D868 */ lw $v0, %lo(D_8029D868)($at) +/* 19F888 80270FA8 8C22D868 */ lw $v0, %lo(jtbl_8029D868_1CC148)($at) /* 19F88C 80270FAC 00400008 */ jr $v0 -/* 19F890 80270FB0 00000000 */ nop +/* 19F890 80270FB0 00000000 */ nop +glabel L80270FB4_19F894 /* 19F894 80270FB4 8E42007C */ lw $v0, 0x7c($s2) /* 19F898 80270FB8 14400049 */ bnez $v0, .L802710E0 /* 19F89C 80270FBC 2442FFFF */ addiu $v0, $v0, -1 @@ -229,6 +230,7 @@ glabel HealActor /* 19F8E0 80271000 24020002 */ addiu $v0, $zero, 2 /* 19F8E4 80271004 0809C445 */ j .L80271114 /* 19F8E8 80271008 AE420070 */ sw $v0, 0x70($s2) +glabel L8027100C_19F8EC /* 19F8EC 8027100C 8E42007C */ lw $v0, 0x7c($s2) /* 19F8F0 80271010 14400033 */ bnez $v0, .L802710E0 /* 19F8F4 80271014 2442FFFF */ addiu $v0, $v0, -1 @@ -257,6 +259,7 @@ glabel HealActor /* 19F94C 8027106C 24020003 */ addiu $v0, $zero, 3 /* 19F950 80271070 0809C445 */ j .L80271114 /* 19F954 80271074 AE420070 */ sw $v0, 0x70($s2) +glabel L80271078_19F958 /* 19F958 80271078 8E42007C */ lw $v0, 0x7c($s2) /* 19F95C 8027107C 14400018 */ bnez $v0, .L802710E0 /* 19F960 80271080 2442FFFF */ addiu $v0, $v0, -1 @@ -272,8 +275,9 @@ glabel HealActor /* 19F984 802710A4 24020004 */ addiu $v0, $zero, 4 /* 19F988 802710A8 0809C445 */ j .L80271114 /* 19F98C 802710AC AE420070 */ sw $v0, 0x70($s2) +glabel L802710B0_19F990 /* 19F990 802710B0 0C093EAD */ jal is_popup_displayed -/* 19F994 802710B4 00000000 */ nop +/* 19F994 802710B4 00000000 */ nop /* 19F998 802710B8 14400017 */ bnez $v0, .L80271118 /* 19F99C 802710BC 0000102D */ daddu $v0, $zero, $zero /* 19F9A0 802710C0 2402000A */ addiu $v0, $zero, 0xa @@ -281,6 +285,7 @@ glabel HealActor /* 19F9A8 802710C8 24020005 */ addiu $v0, $zero, 5 /* 19F9AC 802710CC 0809C445 */ j .L80271114 /* 19F9B0 802710D0 AE420070 */ sw $v0, 0x70($s2) +glabel L802710D4_19F9B4 /* 19F9B4 802710D4 8E42007C */ lw $v0, 0x7c($s2) /* 19F9B8 802710D8 10400003 */ beqz $v0, .L802710E8 /* 19F9BC 802710DC 2442FFFF */ addiu $v0, $v0, -1 @@ -290,7 +295,7 @@ glabel HealActor .L802710E8: /* 19F9C8 802710E8 8E0201D8 */ lw $v0, 0x1d8($s0) /* 19F9CC 802710EC 10400005 */ beqz $v0, .L80271104 -/* 19F9D0 802710F0 00000000 */ nop +/* 19F9D0 802710F0 00000000 */ nop /* 19F9D4 802710F4 0C0B1059 */ jal does_script_exist /* 19F9D8 802710F8 8E0401E8 */ lw $a0, 0x1e8($s0) /* 19F9DC 802710FC 14400006 */ bnez $v0, .L80271118 diff --git a/asm/nonmatchings/code_197F40/ModifyActorDecoration.s b/asm/nonmatchings/code_197F40/ModifyActorDecoration.s index 1a2ba3cb97..0b35fa0ae7 100644 --- a/asm/nonmatchings/code_197F40/ModifyActorDecoration.s +++ b/asm/nonmatchings/code_197F40/ModifyActorDecoration.s @@ -27,7 +27,7 @@ glabel ModifyActorDecoration /* 19D928 8026F048 0040A02D */ daddu $s4, $v0, $zero /* 19D92C 8026F04C 2402FF81 */ addiu $v0, $zero, -0x7f /* 19D930 8026F050 16020002 */ bne $s0, $v0, .L8026F05C -/* 19D934 8026F054 00000000 */ nop +/* 19D934 8026F054 00000000 */ nop /* 19D938 8026F058 8E500148 */ lw $s0, 0x148($s2) .L8026F05C: /* 19D93C 8026F05C 0C09A75B */ jal get_actor diff --git a/asm/nonmatchings/code_197F40/PlayerFallToGoal.s b/asm/nonmatchings/code_197F40/PlayerFallToGoal.s index 6b3ba3c25d..4364dd2180 100644 --- a/asm/nonmatchings/code_197F40/PlayerFallToGoal.s +++ b/asm/nonmatchings/code_197F40/PlayerFallToGoal.s @@ -23,7 +23,7 @@ glabel PlayerFallToGoal .L802738DC: /* 1A21BC 802738DC 8E420070 */ lw $v0, 0x70($s2) /* 1A21C0 802738E0 14400046 */ bnez $v0, .L802739FC -/* 1A21C4 802738E4 00000000 */ nop +/* 1A21C4 802738E4 00000000 */ nop /* 1A21C8 802738E8 8C650000 */ lw $a1, ($v1) /* 1A21CC 802738EC 0C0B1EAF */ jal get_variable /* 1A21D0 802738F0 0240202D */ daddu $a0, $s2, $zero @@ -63,7 +63,7 @@ glabel PlayerFallToGoal /* 1A2258 80273978 A6020070 */ sh $v0, 0x70($s0) .L8027397C: /* 1A225C 8027397C 44820000 */ mtc1 $v0, $f0 -/* 1A2260 80273980 00000000 */ nop +/* 1A2260 80273980 00000000 */ nop /* 1A2264 80273984 46800020 */ cvt.s.w $f0, $f0 /* 1A2268 80273988 46001003 */ div.s $f0, $f2, $f0 /* 1A226C 8027398C E600004C */ swc1 $f0, 0x4c($s0) @@ -74,15 +74,15 @@ glabel PlayerFallToGoal /* 1A227C 8027399C 44800000 */ mtc1 $zero, $f0 /* 1A2280 802739A0 00031023 */ negu $v0, $v1 /* 1A2284 802739A4 44821000 */ mtc1 $v0, $f2 -/* 1A2288 802739A8 00000000 */ nop +/* 1A2288 802739A8 00000000 */ nop /* 1A228C 802739AC 468010A1 */ cvt.d.w $f2, $f2 /* 1A2290 802739B0 46201082 */ mul.d $f2, $f2, $f0 -/* 1A2294 802739B4 00000000 */ nop +/* 1A2294 802739B4 00000000 */ nop /* 1A2298 802739B8 0000202D */ daddu $a0, $zero, $zero /* 1A229C 802739BC AE200044 */ sw $zero, 0x44($s1) /* 1A22A0 802739C0 C6240044 */ lwc1 $f4, 0x44($s1) /* 1A22A4 802739C4 44830000 */ mtc1 $v1, $f0 -/* 1A22A8 802739C8 00000000 */ nop +/* 1A22A8 802739C8 00000000 */ nop /* 1A22AC 802739CC 46800020 */ cvt.s.w $f0, $f0 /* 1A22B0 802739D0 4600F003 */ div.s $f0, $f30, $f0 /* 1A22B4 802739D4 46040001 */ sub.s $f0, $f0, $f4 @@ -98,9 +98,9 @@ glabel PlayerFallToGoal .L802739FC: /* 1A22DC 802739FC C6220044 */ lwc1 $f2, 0x44($s1) /* 1A22E0 80273A00 44800000 */ mtc1 $zero, $f0 -/* 1A22E4 80273A04 00000000 */ nop +/* 1A22E4 80273A04 00000000 */ nop /* 1A22E8 80273A08 4600103C */ c.lt.s $f2, $f0 -/* 1A22EC 80273A0C 00000000 */ nop +/* 1A22EC 80273A0C 00000000 */ nop /* 1A22F0 80273A10 45000004 */ bc1f .L80273A24 /* 1A22F4 80273A14 0000202D */ daddu $a0, $zero, $zero /* 1A22F8 80273A18 8E26005C */ lw $a2, 0x5c($s1) diff --git a/asm/nonmatchings/code_197F40/PlayerLandJump.s b/asm/nonmatchings/code_197F40/PlayerLandJump.s index 001eff80e5..37fd99e455 100644 --- a/asm/nonmatchings/code_197F40/PlayerLandJump.s +++ b/asm/nonmatchings/code_197F40/PlayerLandJump.s @@ -25,11 +25,11 @@ glabel PlayerLandJump .L80273B50: /* 1A2430 80273B50 C6020050 */ lwc1 $f2, 0x50($s0) /* 1A2434 80273B54 44800000 */ mtc1 $zero, $f0 -/* 1A2438 80273B58 00000000 */ nop +/* 1A2438 80273B58 00000000 */ nop /* 1A243C 80273B5C 4602003C */ c.lt.s $f0, $f2 -/* 1A2440 80273B60 00000000 */ nop +/* 1A2440 80273B60 00000000 */ nop /* 1A2444 80273B64 45000006 */ bc1f .L80273B80 -/* 1A2448 80273B68 00000000 */ nop +/* 1A2448 80273B68 00000000 */ nop /* 1A244C 80273B6C 8E060064 */ lw $a2, 0x64($s0) /* 1A2450 80273B70 10C00003 */ beqz $a2, .L80273B80 /* 1A2454 80273B74 0000202D */ daddu $a0, $zero, $zero @@ -38,11 +38,11 @@ glabel PlayerLandJump .L80273B80: /* 1A2460 80273B80 C6220044 */ lwc1 $f2, 0x44($s1) /* 1A2464 80273B84 44800000 */ mtc1 $zero, $f0 -/* 1A2468 80273B88 00000000 */ nop +/* 1A2468 80273B88 00000000 */ nop /* 1A246C 80273B8C 4600103C */ c.lt.s $f2, $f0 -/* 1A2470 80273B90 00000000 */ nop +/* 1A2470 80273B90 00000000 */ nop /* 1A2474 80273B94 45000006 */ bc1f .L80273BB0 -/* 1A2478 80273B98 00000000 */ nop +/* 1A2478 80273B98 00000000 */ nop /* 1A247C 80273B9C 8E26005C */ lw $a2, 0x5c($s1) /* 1A2480 80273BA0 10C00003 */ beqz $a2, .L80273BB0 /* 1A2484 80273BA4 0000202D */ daddu $a0, $zero, $zero @@ -68,7 +68,7 @@ glabel PlayerLandJump /* 1A24D0 80273BF0 46000086 */ mov.s $f2, $f0 /* 1A24D4 80273BF4 C6200008 */ lwc1 $f0, 8($s1) /* 1A24D8 80273BF8 4604103C */ c.lt.s $f2, $f4 -/* 1A24DC 80273BFC 00000000 */ nop +/* 1A24DC 80273BFC 00000000 */ nop /* 1A24E0 80273C00 45010003 */ bc1t .L80273C10 /* 1A24E4 80273C04 E600014C */ swc1 $f0, 0x14c($s0) /* 1A24E8 80273C08 0809CF14 */ j .L80273C50 diff --git a/asm/nonmatchings/code_197F40/PlayerRunToGoal.s b/asm/nonmatchings/code_197F40/PlayerRunToGoal.s index 09ef0b75cc..1d944045c5 100644 --- a/asm/nonmatchings/code_197F40/PlayerRunToGoal.s +++ b/asm/nonmatchings/code_197F40/PlayerRunToGoal.s @@ -21,7 +21,7 @@ glabel PlayerRunToGoal .L80273CA4: /* 1A2584 80273CA4 8E420070 */ lw $v0, 0x70($s2) /* 1A2588 80273CA8 14400041 */ bnez $v0, .L80273DB0 -/* 1A258C 80273CAC 00000000 */ nop +/* 1A258C 80273CAC 00000000 */ nop /* 1A2590 80273CB0 8C650000 */ lw $a1, ($v1) /* 1A2594 80273CB4 0C0B1EAF */ jal get_variable /* 1A2598 80273CB8 0240202D */ daddu $a0, $s2, $zero @@ -54,7 +54,7 @@ glabel PlayerRunToGoal /* 1A2604 80273D24 46001003 */ div.s $f0, $f2, $f0 /* 1A2608 80273D28 4600020D */ trunc.w.s $f8, $f0 /* 1A260C 80273D2C 44024000 */ mfc1 $v0, $f8 -/* 1A2610 80273D30 00000000 */ nop +/* 1A2610 80273D30 00000000 */ nop /* 1A2614 80273D34 A6020070 */ sh $v0, 0x70($s0) /* 1A2618 80273D38 00021400 */ sll $v0, $v0, 0x10 /* 1A261C 80273D3C 14400002 */ bnez $v0, .L80273D48 @@ -64,10 +64,10 @@ glabel PlayerRunToGoal /* 1A2628 80273D48 86020070 */ lh $v0, 0x70($s0) /* 1A262C 80273D4C C602004C */ lwc1 $f2, 0x4c($s0) /* 1A2630 80273D50 44823000 */ mtc1 $v0, $f6 -/* 1A2634 80273D54 00000000 */ nop +/* 1A2634 80273D54 00000000 */ nop /* 1A2638 80273D58 468031A0 */ cvt.s.w $f6, $f6 /* 1A263C 80273D5C 46023102 */ mul.s $f4, $f6, $f2 -/* 1A2640 80273D60 00000000 */ nop +/* 1A2640 80273D60 00000000 */ nop /* 1A2644 80273D64 C6000058 */ lwc1 $f0, 0x58($s0) /* 1A2648 80273D68 46040001 */ sub.s $f0, $f0, $f4 /* 1A264C 80273D6C 46060003 */ div.s $f0, $f0, $f6 @@ -76,7 +76,7 @@ glabel PlayerRunToGoal /* 1A2658 80273D78 E602004C */ swc1 $f2, 0x4c($s0) .L80273D7C: /* 1A265C 80273D7C 44820000 */ mtc1 $v0, $f0 -/* 1A2660 80273D80 00000000 */ nop +/* 1A2660 80273D80 00000000 */ nop /* 1A2664 80273D84 46800020 */ cvt.s.w $f0, $f0 /* 1A2668 80273D88 46001003 */ div.s $f0, $f2, $f0 /* 1A266C 80273D8C E600004C */ swc1 $f0, 0x4c($s0) @@ -84,7 +84,7 @@ glabel PlayerRunToGoal /* 1A2670 80273D90 860201B4 */ lh $v0, 0x1b4($s0) /* 1A2674 80273D94 24420001 */ addiu $v0, $v0, 1 /* 1A2678 80273D98 44820000 */ mtc1 $v0, $f0 -/* 1A267C 80273D9C 00000000 */ nop +/* 1A267C 80273D9C 00000000 */ nop /* 1A2680 80273DA0 46800020 */ cvt.s.w $f0, $f0 /* 1A2684 80273DA4 24020001 */ addiu $v0, $zero, 1 /* 1A2688 80273DA8 E620004C */ swc1 $f0, 0x4c($s1) @@ -103,9 +103,9 @@ glabel PlayerRunToGoal /* 1A26B8 80273DD8 C6220040 */ lwc1 $f2, 0x40($s1) /* 1A26BC 80273DDC 3C014080 */ lui $at, 0x4080 /* 1A26C0 80273DE0 44810000 */ mtc1 $at, $f0 -/* 1A26C4 80273DE4 00000000 */ nop +/* 1A26C4 80273DE4 00000000 */ nop /* 1A26C8 80273DE8 4600103C */ c.lt.s $f2, $f0 -/* 1A26CC 80273DEC 00000000 */ nop +/* 1A26CC 80273DEC 00000000 */ nop /* 1A26D0 80273DF0 45000007 */ bc1f .L80273E10 /* 1A26D4 80273DF4 0000202D */ daddu $a0, $zero, $zero /* 1A26D8 80273DF8 C600018C */ lwc1 $f0, 0x18c($s0) @@ -123,19 +123,19 @@ glabel PlayerRunToGoal /* 1A2704 80273E24 24040001 */ addiu $a0, $zero, 1 .L80273E28: /* 1A2708 80273E28 0C0990BC */ jal play_movement_dust_effects -/* 1A270C 80273E2C 00000000 */ nop +/* 1A270C 80273E2C 00000000 */ nop /* 1A2710 80273E30 C622004C */ lwc1 $f2, 0x4c($s1) /* 1A2714 80273E34 C6200040 */ lwc1 $f0, 0x40($s1) /* 1A2718 80273E38 46001080 */ add.s $f2, $f2, $f0 /* 1A271C 80273E3C E622004C */ swc1 $f2, 0x4c($s1) /* 1A2720 80273E40 860201B4 */ lh $v0, 0x1b4($s0) /* 1A2724 80273E44 44820000 */ mtc1 $v0, $f0 -/* 1A2728 80273E48 00000000 */ nop +/* 1A2728 80273E48 00000000 */ nop /* 1A272C 80273E4C 46800020 */ cvt.s.w $f0, $f0 /* 1A2730 80273E50 4602003C */ c.lt.s $f0, $f2 -/* 1A2734 80273E54 00000000 */ nop +/* 1A2734 80273E54 00000000 */ nop /* 1A2738 80273E58 45000013 */ bc1f .L80273EA8 -/* 1A273C 80273E5C 00000000 */ nop +/* 1A273C 80273E5C 00000000 */ nop /* 1A2740 80273E60 92020135 */ lbu $v0, 0x135($s0) /* 1A2744 80273E64 24420001 */ addiu $v0, $v0, 1 /* 1A2748 80273E68 A2020135 */ sb $v0, 0x135($s0) diff --git a/asm/nonmatchings/code_197F40/RemoveActorDecoration.s b/asm/nonmatchings/code_197F40/RemoveActorDecoration.s index ec1c9e2655..28e92f0f64 100644 --- a/asm/nonmatchings/code_197F40/RemoveActorDecoration.s +++ b/asm/nonmatchings/code_197F40/RemoveActorDecoration.s @@ -25,7 +25,7 @@ glabel RemoveActorDecoration /* 19D87C 8026EF9C 0040982D */ daddu $s3, $v0, $zero /* 19D880 8026EFA0 2402FF81 */ addiu $v0, $zero, -0x7f /* 19D884 8026EFA4 16220002 */ bne $s1, $v0, .L8026EFB0 -/* 19D888 8026EFA8 00000000 */ nop +/* 19D888 8026EFA8 00000000 */ nop /* 19D88C 8026EFAC 8E510148 */ lw $s1, 0x148($s2) .L8026EFB0: /* 19D890 8026EFB0 0C09A75B */ jal get_actor diff --git a/asm/nonmatchings/code_197F40/RemovePartShadow.s b/asm/nonmatchings/code_197F40/RemovePartShadow.s index 850c55cfcd..e6e1f61a07 100644 --- a/asm/nonmatchings/code_197F40/RemovePartShadow.s +++ b/asm/nonmatchings/code_197F40/RemovePartShadow.s @@ -19,7 +19,7 @@ glabel RemovePartShadow /* 19DEB4 8026F5D4 0040282D */ daddu $a1, $v0, $zero /* 19DEB8 8026F5D8 2402FF81 */ addiu $v0, $zero, -0x7f /* 19DEBC 8026F5DC 16220002 */ bne $s1, $v0, .L8026F5E8 -/* 19DEC0 8026F5E0 00000000 */ nop +/* 19DEC0 8026F5E0 00000000 */ nop /* 19DEC4 8026F5E4 8E510148 */ lw $s1, 0x148($s2) .L8026F5E8: /* 19DEC8 8026F5E8 0C099CE8 */ jal remove_part_shadow diff --git a/asm/nonmatchings/code_197F40/ResetActorSounds.s b/asm/nonmatchings/code_197F40/ResetActorSounds.s index 97fa596e64..5a0211d556 100644 --- a/asm/nonmatchings/code_197F40/ResetActorSounds.s +++ b/asm/nonmatchings/code_197F40/ResetActorSounds.s @@ -16,7 +16,7 @@ glabel ResetActorSounds /* 19E144 8026F864 0040882D */ daddu $s1, $v0, $zero /* 19E148 8026F868 2402FF81 */ addiu $v0, $zero, -0x7f /* 19E14C 8026F86C 16220002 */ bne $s1, $v0, .L8026F878 -/* 19E150 8026F870 00000000 */ nop +/* 19E150 8026F870 00000000 */ nop /* 19E154 8026F874 8E510148 */ lw $s1, 0x148($s2) .L8026F878: /* 19E158 8026F878 8E050000 */ lw $a1, ($s0) @@ -37,11 +37,12 @@ glabel ResetActorSounds /* 19E194 8026F8B4 2E620006 */ sltiu $v0, $s3, 6 /* 19E198 8026F8B8 10400049 */ beqz $v0, .L8026F9E0 /* 19E19C 8026F8BC 00131080 */ sll $v0, $s3, 2 -/* 19E1A0 8026F8C0 3C01802A */ lui $at, %hi(D_8029D7D8) +/* 19E1A0 8026F8C0 3C01802A */ lui $at, %hi(jtbl_8029D7D8_1CC0B8) /* 19E1A4 8026F8C4 00220821 */ addu $at, $at, $v0 -/* 19E1A8 8026F8C8 8C22D7D8 */ lw $v0, %lo(D_8029D7D8)($at) +/* 19E1A8 8026F8C8 8C22D7D8 */ lw $v0, %lo(jtbl_8029D7D8_1CC0B8)($at) /* 19E1AC 8026F8CC 00400008 */ jr $v0 -/* 19E1B0 8026F8D0 00000000 */ nop +/* 19E1B0 8026F8D0 00000000 */ nop +glabel L8026F8D4_19E1B4 /* 19E1B4 8026F8D4 90830136 */ lbu $v1, 0x136($a0) /* 19E1B8 8026F8D8 000310C0 */ sll $v0, $v1, 3 /* 19E1BC 8026F8DC 00431023 */ subu $v0, $v0, $v1 @@ -58,6 +59,7 @@ glabel ResetActorSounds /* 19E1E8 8026F908 8C22146C */ lw $v0, %lo(D_8028146C)($at) /* 19E1EC 8026F90C 0809BE78 */ j .L8026F9E0 /* 19E1F0 8026F910 AC8201A0 */ sw $v0, 0x1a0($a0) +glabel L8026F914_19E1F4 /* 19E1F4 8026F914 90830136 */ lbu $v1, 0x136($a0) /* 19E1F8 8026F918 000310C0 */ sll $v0, $v1, 3 /* 19E1FC 8026F91C 00431023 */ subu $v0, $v0, $v1 @@ -74,6 +76,7 @@ glabel ResetActorSounds /* 19E228 8026F948 8C221474 */ lw $v0, %lo(D_80281474)($at) /* 19E22C 8026F94C 0809BE78 */ j .L8026F9E0 /* 19E230 8026F950 AC8201A8 */ sw $v0, 0x1a8($a0) +glabel L8026F954_19E234 /* 19E234 8026F954 90820136 */ lbu $v0, 0x136($a0) /* 19E238 8026F958 000218C0 */ sll $v1, $v0, 3 /* 19E23C 8026F95C 00621823 */ subu $v1, $v1, $v0 @@ -83,6 +86,7 @@ glabel ResetActorSounds /* 19E24C 8026F96C 8C421478 */ lw $v0, %lo(D_80281478)($v0) /* 19E250 8026F970 0809BE78 */ j .L8026F9E0 /* 19E254 8026F974 AC8201AC */ sw $v0, 0x1ac($a0) +glabel L8026F978_19E258 /* 19E258 8026F978 90820136 */ lbu $v0, 0x136($a0) /* 19E25C 8026F97C 000218C0 */ sll $v1, $v0, 3 /* 19E260 8026F980 00621823 */ subu $v1, $v1, $v0 @@ -92,6 +96,7 @@ glabel ResetActorSounds /* 19E270 8026F990 8C42147C */ lw $v0, %lo(D_8028147C)($v0) /* 19E274 8026F994 0809BE78 */ j .L8026F9E0 /* 19E278 8026F998 AC8201B0 */ sw $v0, 0x1b0($a0) +glabel L8026F99C_19E27C /* 19E27C 8026F99C 90820136 */ lbu $v0, 0x136($a0) /* 19E280 8026F9A0 000218C0 */ sll $v1, $v0, 3 /* 19E284 8026F9A4 00621823 */ subu $v1, $v1, $v0 @@ -101,6 +106,7 @@ glabel ResetActorSounds /* 19E294 8026F9B4 94421480 */ lhu $v0, %lo(D_80281480)($v0) /* 19E298 8026F9B8 0809BE78 */ j .L8026F9E0 /* 19E29C 8026F9BC A48201B4 */ sh $v0, 0x1b4($a0) +glabel L8026F9C0_19E2A0 /* 19E2A0 8026F9C0 90820136 */ lbu $v0, 0x136($a0) /* 19E2A4 8026F9C4 000218C0 */ sll $v1, $v0, 3 /* 19E2A8 8026F9C8 00621823 */ subu $v1, $v1, $v0 diff --git a/asm/nonmatchings/code_197F40/SetActorSounds.s b/asm/nonmatchings/code_197F40/SetActorSounds.s index 093400bb0d..8582d01f32 100644 --- a/asm/nonmatchings/code_197F40/SetActorSounds.s +++ b/asm/nonmatchings/code_197F40/SetActorSounds.s @@ -16,7 +16,7 @@ glabel SetActorSounds /* 19E04C 8026F76C 0040882D */ daddu $s1, $v0, $zero /* 19E050 8026F770 2402FF81 */ addiu $v0, $zero, -0x7f /* 19E054 8026F774 16220002 */ bne $s1, $v0, .L8026F780 -/* 19E058 8026F778 00000000 */ nop +/* 19E058 8026F778 00000000 */ nop /* 19E05C 8026F77C 8E510148 */ lw $s1, 0x148($s2) .L8026F780: /* 19E060 8026F780 8E050000 */ lw $a1, ($s0) @@ -39,23 +39,29 @@ glabel SetActorSounds /* 19E0A4 8026F7C4 2E620006 */ sltiu $v0, $s3, 6 /* 19E0A8 8026F7C8 10400013 */ beqz $v0, .L8026F818 /* 19E0AC 8026F7CC 00131080 */ sll $v0, $s3, 2 -/* 19E0B0 8026F7D0 3C01802A */ lui $at, %hi(D_8029D7C0) +/* 19E0B0 8026F7D0 3C01802A */ lui $at, %hi(jtbl_8029D7C0_1CC0A0) /* 19E0B4 8026F7D4 00220821 */ addu $at, $at, $v0 -/* 19E0B8 8026F7D8 8C22D7C0 */ lw $v0, %lo(D_8029D7C0)($at) +/* 19E0B8 8026F7D8 8C22D7C0 */ lw $v0, %lo(jtbl_8029D7C0_1CC0A0)($at) /* 19E0BC 8026F7DC 00400008 */ jr $v0 -/* 19E0C0 8026F7E0 00000000 */ nop +/* 19E0C0 8026F7E0 00000000 */ nop +glabel L8026F7E4_19E0C4 /* 19E0C4 8026F7E4 AC70019C */ sw $s0, 0x19c($v1) /* 19E0C8 8026F7E8 0809BE06 */ j .L8026F818 /* 19E0CC 8026F7EC AC7101A0 */ sw $s1, 0x1a0($v1) +glabel L8026F7F0_19E0D0 /* 19E0D0 8026F7F0 AC7001A4 */ sw $s0, 0x1a4($v1) /* 19E0D4 8026F7F4 0809BE06 */ j .L8026F818 /* 19E0D8 8026F7F8 AC7101A8 */ sw $s1, 0x1a8($v1) +glabel L8026F7FC_19E0DC /* 19E0DC 8026F7FC 0809BE06 */ j .L8026F818 /* 19E0E0 8026F800 AC7001AC */ sw $s0, 0x1ac($v1) +glabel L8026F804_19E0E4 /* 19E0E4 8026F804 0809BE06 */ j .L8026F818 /* 19E0E8 8026F808 AC7001B0 */ sw $s0, 0x1b0($v1) +glabel L8026F80C_19E0EC /* 19E0EC 8026F80C 0809BE06 */ j .L8026F818 /* 19E0F0 8026F810 A47001B4 */ sh $s0, 0x1b4($v1) +glabel L8026F814_19E0F4 /* 19E0F4 8026F814 A47001B6 */ sh $s0, 0x1b6($v1) .L8026F818: /* 19E0F8 8026F818 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/code_197F40/SetActorType.s b/asm/nonmatchings/code_197F40/SetActorType.s index 5048936e63..6e9cadd686 100644 --- a/asm/nonmatchings/code_197F40/SetActorType.s +++ b/asm/nonmatchings/code_197F40/SetActorType.s @@ -15,7 +15,7 @@ glabel SetActorType /* 19E428 8026FB48 0040802D */ daddu $s0, $v0, $zero /* 19E42C 8026FB4C 2402FF81 */ addiu $v0, $zero, -0x7f /* 19E430 8026FB50 16020002 */ bne $s0, $v0, .L8026FB5C -/* 19E434 8026FB54 00000000 */ nop +/* 19E434 8026FB54 00000000 */ nop /* 19E438 8026FB58 8E500148 */ lw $s0, 0x148($s2) .L8026FB5C: /* 19E43C 8026FB5C 8E250000 */ lw $a1, ($s1) diff --git a/asm/nonmatchings/code_197F40/SetGoalToIndex.s b/asm/nonmatchings/code_197F40/SetGoalToIndex.s index 1079aeacea..6b05a45553 100644 --- a/asm/nonmatchings/code_197F40/SetGoalToIndex.s +++ b/asm/nonmatchings/code_197F40/SetGoalToIndex.s @@ -19,7 +19,7 @@ glabel SetGoalToIndex /* 1988AC 80269FCC 0040802D */ daddu $s0, $v0, $zero /* 1988B0 80269FD0 2402FF81 */ addiu $v0, $zero, -0x7f /* 1988B4 80269FD4 16220002 */ bne $s1, $v0, .L80269FE0 -/* 1988B8 80269FD8 00000000 */ nop +/* 1988B8 80269FD8 00000000 */ nop /* 1988BC 80269FDC 8E510148 */ lw $s1, 0x148($s2) .L80269FE0: /* 1988C0 80269FE0 0C09A75B */ jal get_actor @@ -33,17 +33,17 @@ glabel SetGoalToIndex /* 1988E0 8026A000 84640000 */ lh $a0, ($v1) /* 1988E4 8026A004 0040282D */ daddu $a1, $v0, $zero /* 1988E8 8026A008 44840000 */ mtc1 $a0, $f0 -/* 1988EC 8026A00C 00000000 */ nop +/* 1988EC 8026A00C 00000000 */ nop /* 1988F0 8026A010 46800020 */ cvt.s.w $f0, $f0 /* 1988F4 8026A014 E4A00018 */ swc1 $f0, 0x18($a1) /* 1988F8 8026A018 84620002 */ lh $v0, 2($v1) /* 1988FC 8026A01C 44820000 */ mtc1 $v0, $f0 -/* 198900 8026A020 00000000 */ nop +/* 198900 8026A020 00000000 */ nop /* 198904 8026A024 46800020 */ cvt.s.w $f0, $f0 /* 198908 8026A028 E4A0001C */ swc1 $f0, 0x1c($a1) /* 19890C 8026A02C 84630004 */ lh $v1, 4($v1) /* 198910 8026A030 44830000 */ mtc1 $v1, $f0 -/* 198914 8026A034 00000000 */ nop +/* 198914 8026A034 00000000 */ nop /* 198918 8026A038 46800020 */ cvt.s.w $f0, $f0 /* 19891C 8026A03C E4A00020 */ swc1 $f0, 0x20($a1) /* 198920 8026A040 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/code_197F40/SetPartAlpha.s b/asm/nonmatchings/code_197F40/SetPartAlpha.s index fc1034c87c..2e22f2d6cf 100644 --- a/asm/nonmatchings/code_197F40/SetPartAlpha.s +++ b/asm/nonmatchings/code_197F40/SetPartAlpha.s @@ -26,7 +26,7 @@ glabel SetPartAlpha /* 19DDA4 8026F4C4 0040982D */ daddu $s3, $v0, $zero /* 19DDA8 8026F4C8 2402FF81 */ addiu $v0, $zero, -0x7f /* 19DDAC 8026F4CC 16220002 */ bne $s1, $v0, .L8026F4D8 -/* 19DDB0 8026F4D0 00000000 */ nop +/* 19DDB0 8026F4D0 00000000 */ nop /* 19DDB4 8026F4D4 8E510148 */ lw $s1, 0x148($s2) .L8026F4D8: /* 19DDB8 8026F4D8 0C09A75B */ jal get_actor diff --git a/asm/nonmatchings/code_197F40/SetPartSounds.s b/asm/nonmatchings/code_197F40/SetPartSounds.s index 6ffcc3b605..c6f52929d1 100644 --- a/asm/nonmatchings/code_197F40/SetPartSounds.s +++ b/asm/nonmatchings/code_197F40/SetPartSounds.s @@ -17,7 +17,7 @@ glabel SetPartSounds /* 19E310 8026FA30 0040982D */ daddu $s3, $v0, $zero /* 19E314 8026FA34 2402FF81 */ addiu $v0, $zero, -0x7f /* 19E318 8026FA38 16620002 */ bne $s3, $v0, .L8026FA44 -/* 19E31C 8026FA3C 00000000 */ nop +/* 19E31C 8026FA3C 00000000 */ nop /* 19E320 8026FA40 8E530148 */ lw $s3, 0x148($s2) .L8026FA44: /* 19E324 8026FA44 8E250000 */ lw $a1, ($s1) @@ -48,23 +48,29 @@ glabel SetPartSounds /* 19E388 8026FAA8 2E820006 */ sltiu $v0, $s4, 6 /* 19E38C 8026FAAC 10400013 */ beqz $v0, .L8026FAFC /* 19E390 8026FAB0 00141080 */ sll $v0, $s4, 2 -/* 19E394 8026FAB4 3C01802A */ lui $at, %hi(D_8029D7F0) +/* 19E394 8026FAB4 3C01802A */ lui $at, %hi(jtbl_8029D7F0_1CC0D0) /* 19E398 8026FAB8 00220821 */ addu $at, $at, $v0 -/* 19E39C 8026FABC 8C22D7F0 */ lw $v0, %lo(D_8029D7F0)($at) +/* 19E39C 8026FABC 8C22D7F0 */ lw $v0, %lo(jtbl_8029D7F0_1CC0D0)($at) /* 19E3A0 8026FAC0 00400008 */ jr $v0 -/* 19E3A4 8026FAC4 00000000 */ nop +/* 19E3A4 8026FAC4 00000000 */ nop +glabel L8026FAC8_19E3A8 /* 19E3A8 8026FAC8 AC7100A4 */ sw $s1, 0xa4($v1) /* 19E3AC 8026FACC 0809BEBF */ j .L8026FAFC /* 19E3B0 8026FAD0 AC7200A8 */ sw $s2, 0xa8($v1) +glabel L8026FAD4_19E3B4 /* 19E3B4 8026FAD4 AC7100AC */ sw $s1, 0xac($v1) /* 19E3B8 8026FAD8 0809BEBF */ j .L8026FAFC /* 19E3BC 8026FADC AC7200B0 */ sw $s2, 0xb0($v1) +glabel L8026FAE0_19E3C0 /* 19E3C0 8026FAE0 0809BEBF */ j .L8026FAFC /* 19E3C4 8026FAE4 AC7100B4 */ sw $s1, 0xb4($v1) +glabel L8026FAE8_19E3C8 /* 19E3C8 8026FAE8 0809BEBF */ j .L8026FAFC /* 19E3CC 8026FAEC AC7100B8 */ sw $s1, 0xb8($v1) +glabel L8026FAF0_19E3D0 /* 19E3D0 8026FAF0 0809BEBF */ j .L8026FAFC /* 19E3D4 8026FAF4 A47100BC */ sh $s1, 0xbc($v1) +glabel L8026FAF8_19E3D8 /* 19E3D8 8026FAF8 A47100BE */ sh $s1, 0xbe($v1) .L8026FAFC: /* 19E3DC 8026FAFC 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/asm/nonmatchings/code_197F40/SummonEnemy.s b/asm/nonmatchings/code_197F40/SummonEnemy.s index 32d9e7e512..76744cb1f4 100644 --- a/asm/nonmatchings/code_197F40/SummonEnemy.s +++ b/asm/nonmatchings/code_197F40/SummonEnemy.s @@ -20,7 +20,7 @@ glabel SummonEnemy /* 19C47C 8026DB9C 10620011 */ beq $v1, $v0, .L8026DBE4 /* 19C480 8026DBA0 0000102D */ daddu $v0, $zero, $zero /* 19C484 8026DBA4 0809B77A */ j .L8026DDE8 -/* 19C488 8026DBA8 00000000 */ nop +/* 19C488 8026DBA8 00000000 */ nop .L8026DBAC: /* 19C48C 8026DBAC 8E050000 */ lw $a1, ($s0) /* 19C490 8026DBB0 26100004 */ addiu $s0, $s0, 4 @@ -116,7 +116,7 @@ glabel SummonEnemy /* 19C5D0 8026DCF0 1440FFDE */ bnez $v0, .L8026DC6C /* 19C5D4 8026DCF4 25AD0002 */ addiu $t5, $t5, 2 /* 19C5D8 8026DCF8 0809B775 */ j .L8026DDD4 -/* 19C5DC 8026DCFC 00000000 */ nop +/* 19C5DC 8026DCFC 00000000 */ nop .L8026DD00: /* 19C5E0 8026DD00 822B0171 */ lb $t3, 0x171($s1) /* 19C5E4 8026DD04 1960000D */ blez $t3, .L8026DD3C diff --git a/asm/nonmatchings/code_197F40/UseIdleAnimation.s b/asm/nonmatchings/code_197F40/UseIdleAnimation.s index e1ebfb7478..7d94ce700c 100644 --- a/asm/nonmatchings/code_197F40/UseIdleAnimation.s +++ b/asm/nonmatchings/code_197F40/UseIdleAnimation.s @@ -19,7 +19,7 @@ glabel UseIdleAnimation /* 19DA04 8026F124 0040802D */ daddu $s0, $v0, $zero /* 19DA08 8026F128 2402FF81 */ addiu $v0, $zero, -0x7f /* 19DA0C 8026F12C 16220002 */ bne $s1, $v0, .L8026F138 -/* 19DA10 8026F130 00000000 */ nop +/* 19DA10 8026F130 00000000 */ nop /* 19DA14 8026F134 8E510148 */ lw $s1, 0x148($s2) .L8026F138: /* 19DA18 8026F138 0C09A75B */ jal get_actor @@ -36,7 +36,7 @@ glabel UseIdleAnimation /* 19DA44 8026F164 0C099B90 */ jal func_80266E40 /* 19DA48 8026F168 AC820000 */ sw $v0, ($a0) /* 19DA4C 8026F16C 0809BC61 */ j .L8026F184 -/* 19DA50 8026F170 00000000 */ nop +/* 19DA50 8026F170 00000000 */ nop .L8026F174: /* 19DA54 8026F174 8C820000 */ lw $v0, ($a0) /* 19DA58 8026F178 3C030400 */ lui $v1, 0x400 diff --git a/asm/nonmatchings/code_197F40/VanishActor.s b/asm/nonmatchings/code_197F40/VanishActor.s index 008d53ec38..1768401d01 100644 --- a/asm/nonmatchings/code_197F40/VanishActor.s +++ b/asm/nonmatchings/code_197F40/VanishActor.s @@ -14,7 +14,7 @@ glabel VanishActor .L80270638: /* 19EF18 80270638 8E420070 */ lw $v0, 0x70($s2) /* 19EF1C 8027063C 1440002D */ bnez $v0, .L802706F4 -/* 19EF20 80270640 00000000 */ nop +/* 19EF20 80270640 00000000 */ nop /* 19EF24 80270644 8E250000 */ lw $a1, ($s1) /* 19EF28 80270648 26310004 */ addiu $s1, $s1, 4 /* 19EF2C 8027064C 0C0B1EAF */ jal get_variable @@ -22,7 +22,7 @@ glabel VanishActor /* 19EF34 80270654 0040802D */ daddu $s0, $v0, $zero /* 19EF38 80270658 2402FF81 */ addiu $v0, $zero, -0x7f /* 19EF3C 8027065C 16020002 */ bne $s0, $v0, .L80270668 -/* 19EF40 80270660 00000000 */ nop +/* 19EF40 80270660 00000000 */ nop /* 19EF44 80270664 8E500148 */ lw $s0, 0x148($s2) .L80270668: /* 19EF48 80270668 8E250000 */ lw $a1, ($s1) @@ -40,13 +40,13 @@ glabel VanishActor /* 19EF78 80270698 2404000C */ addiu $a0, $zero, 0xc /* 19EF7C 8027069C 86040192 */ lh $a0, 0x192($s0) /* 19EF80 802706A0 0C09390F */ jal cam_target_actor -/* 19EF84 802706A4 00000000 */ nop +/* 19EF84 802706A4 00000000 */ nop /* 19EF88 802706A8 0C093965 */ jal set_cam_zoom /* 19EF8C 802706AC 240400FA */ addiu $a0, $zero, 0xfa /* 19EF90 802706B0 0C093936 */ jal move_cam_over /* 19EF94 802706B4 2404000A */ addiu $a0, $zero, 0xa /* 19EF98 802706B8 0C093983 */ jal func_8024E60C -/* 19EF9C 802706BC 00000000 */ nop +/* 19EF9C 802706BC 00000000 */ nop /* 19EFA0 802706C0 8E020000 */ lw $v0, ($s0) /* 19EFA4 802706C4 30420800 */ andi $v0, $v0, 0x800 /* 19EFA8 802706C8 10400004 */ beqz $v0, .L802706DC @@ -70,7 +70,7 @@ glabel VanishActor /* 19EFE8 80270708 8E030000 */ lw $v1, ($s0) /* 19EFEC 8027070C C6000144 */ lwc1 $f0, 0x144($s0) /* 19EFF0 80270710 44821000 */ mtc1 $v0, $f2 -/* 19EFF4 80270714 00000000 */ nop +/* 19EFF4 80270714 00000000 */ nop /* 19EFF8 80270718 468010A0 */ cvt.s.w $f2, $f2 /* 19EFFC 8027071C 30620800 */ andi $v0, $v1, 0x800 /* 19F000 80270720 1040000E */ beqz $v0, .L8027075C @@ -78,30 +78,30 @@ glabel VanishActor /* 19F008 80270728 86020152 */ lh $v0, 0x152($s0) /* 19F00C 8027072C C6020148 */ lwc1 $f2, 0x148($s0) /* 19F010 80270730 44820000 */ mtc1 $v0, $f0 -/* 19F014 80270734 00000000 */ nop +/* 19F014 80270734 00000000 */ nop /* 19F018 80270738 46800020 */ cvt.s.w $f0, $f0 /* 19F01C 8027073C 92020191 */ lbu $v0, 0x191($s0) /* 19F020 80270740 46001080 */ add.s $f2, $f2, $f0 /* 19F024 80270744 00021042 */ srl $v0, $v0, 1 /* 19F028 80270748 44820000 */ mtc1 $v0, $f0 -/* 19F02C 8027074C 00000000 */ nop +/* 19F02C 8027074C 00000000 */ nop /* 19F030 80270750 46800020 */ cvt.s.w $f0, $f0 /* 19F034 80270754 0809C1F2 */ j .L802707C8 /* 19F038 80270758 46001101 */ sub.s $f4, $f2, $f0 .L8027075C: /* 19F03C 8027075C 30628000 */ andi $v0, $v1, 0x8000 /* 19F040 80270760 1440000E */ bnez $v0, .L8027079C -/* 19F044 80270764 00000000 */ nop +/* 19F044 80270764 00000000 */ nop /* 19F048 80270768 86020152 */ lh $v0, 0x152($s0) /* 19F04C 8027076C C6020148 */ lwc1 $f2, 0x148($s0) /* 19F050 80270770 44820000 */ mtc1 $v0, $f0 -/* 19F054 80270774 00000000 */ nop +/* 19F054 80270774 00000000 */ nop /* 19F058 80270778 46800020 */ cvt.s.w $f0, $f0 /* 19F05C 8027077C 92020191 */ lbu $v0, 0x191($s0) /* 19F060 80270780 46001080 */ add.s $f2, $f2, $f0 /* 19F064 80270784 00021042 */ srl $v0, $v0, 1 /* 19F068 80270788 44820000 */ mtc1 $v0, $f0 -/* 19F06C 8027078C 00000000 */ nop +/* 19F06C 8027078C 00000000 */ nop /* 19F070 80270790 46800020 */ cvt.s.w $f0, $f0 /* 19F074 80270794 0809C1F2 */ j .L802707C8 /* 19F078 80270798 46020100 */ add.s $f4, $f0, $f2 @@ -109,19 +109,19 @@ glabel VanishActor /* 19F07C 8027079C 86020152 */ lh $v0, 0x152($s0) /* 19F080 802707A0 C6000148 */ lwc1 $f0, 0x148($s0) /* 19F084 802707A4 44821000 */ mtc1 $v0, $f2 -/* 19F088 802707A8 00000000 */ nop +/* 19F088 802707A8 00000000 */ nop /* 19F08C 802707AC 468010A0 */ cvt.s.w $f2, $f2 /* 19F090 802707B0 92020191 */ lbu $v0, 0x191($s0) /* 19F094 802707B4 46020000 */ add.s $f0, $f0, $f2 /* 19F098 802707B8 44821000 */ mtc1 $v0, $f2 -/* 19F09C 802707BC 00000000 */ nop +/* 19F09C 802707BC 00000000 */ nop /* 19F0A0 802707C0 468010A0 */ cvt.s.w $f2, $f2 /* 19F0A4 802707C4 46020100 */ add.s $f4, $f0, $f2 .L802707C8: /* 19F0A8 802707C8 86020154 */ lh $v0, 0x154($s0) /* 19F0AC 802707CC C600014C */ lwc1 $f0, 0x14c($s0) /* 19F0B0 802707D0 44821000 */ mtc1 $v0, $f2 -/* 19F0B4 802707D4 00000000 */ nop +/* 19F0B4 802707D4 00000000 */ nop /* 19F0B8 802707D8 468010A0 */ cvt.s.w $f2, $f2 /* 19F0BC 802707DC 46020000 */ add.s $f0, $f0, $f2 /* 19F0C0 802707E0 8E420070 */ lw $v0, 0x70($s2) @@ -132,11 +132,12 @@ glabel VanishActor /* 19F0D4 802707F4 10400052 */ beqz $v0, .L80270940 /* 19F0D8 802707F8 46020080 */ add.s $f2, $f0, $f2 /* 19F0DC 802707FC 00031080 */ sll $v0, $v1, 2 -/* 19F0E0 80270800 3C01802A */ lui $at, %hi(D_8029D838) +/* 19F0E0 80270800 3C01802A */ lui $at, %hi(jtbl_8029D838_1CC118) /* 19F0E4 80270804 00220821 */ addu $at, $at, $v0 -/* 19F0E8 80270808 8C22D838 */ lw $v0, %lo(D_8029D838)($at) +/* 19F0E8 80270808 8C22D838 */ lw $v0, %lo(jtbl_8029D838_1CC118)($at) /* 19F0EC 8027080C 00400008 */ jr $v0 -/* 19F0F0 80270810 00000000 */ nop +/* 19F0F0 80270810 00000000 */ nop +glabel L80270814_19F0F4 /* 19F0F4 80270814 8E42007C */ lw $v0, 0x7c($s2) /* 19F0F8 80270818 1440003C */ bnez $v0, .L8027090C /* 19F0FC 8027081C 2442FFFF */ addiu $v0, $v0, -1 @@ -156,6 +157,7 @@ glabel VanishActor /* 19F134 80270854 AE50007C */ sw $s0, 0x7c($s2) /* 19F138 80270858 0809C250 */ j .L80270940 /* 19F13C 8027085C AE420070 */ sw $v0, 0x70($s2) +glabel L80270860_19F140 /* 19F140 80270860 8E42007C */ lw $v0, 0x7c($s2) /* 19F144 80270864 14400029 */ bnez $v0, .L8027090C /* 19F148 80270868 2442FFFF */ addiu $v0, $v0, -1 @@ -175,6 +177,7 @@ glabel VanishActor /* 19F180 802708A0 24020003 */ addiu $v0, $zero, 3 /* 19F184 802708A4 0809C250 */ j .L80270940 /* 19F188 802708A8 AE420070 */ sw $v0, 0x70($s2) +glabel L802708AC_19F18C /* 19F18C 802708AC 8E42007C */ lw $v0, 0x7c($s2) /* 19F190 802708B0 14400016 */ bnez $v0, .L8027090C /* 19F194 802708B4 2442FFFF */ addiu $v0, $v0, -1 @@ -185,8 +188,9 @@ glabel VanishActor /* 19F1A8 802708C8 24020004 */ addiu $v0, $zero, 4 /* 19F1AC 802708CC 0809C250 */ j .L80270940 /* 19F1B0 802708D0 AE420070 */ sw $v0, 0x70($s2) +glabel L802708D4_19F1B4 /* 19F1B4 802708D4 0C093EAD */ jal is_popup_displayed -/* 19F1B8 802708D8 00000000 */ nop +/* 19F1B8 802708D8 00000000 */ nop /* 19F1BC 802708DC 14400019 */ bnez $v0, .L80270944 /* 19F1C0 802708E0 0000102D */ daddu $v0, $zero, $zero /* 19F1C4 802708E4 0C093903 */ jal func_8024E40C @@ -196,6 +200,7 @@ glabel VanishActor /* 19F1D4 802708F4 24020005 */ addiu $v0, $zero, 5 /* 19F1D8 802708F8 0809C250 */ j .L80270940 /* 19F1DC 802708FC AE420070 */ sw $v0, 0x70($s2) +glabel L80270900_19F1E0 /* 19F1E0 80270900 8E42007C */ lw $v0, 0x7c($s2) /* 19F1E4 80270904 10400003 */ beqz $v0, .L80270914 /* 19F1E8 80270908 2442FFFF */ addiu $v0, $v0, -1 @@ -205,7 +210,7 @@ glabel VanishActor .L80270914: /* 19F1F4 80270914 8E0201D8 */ lw $v0, 0x1d8($s0) /* 19F1F8 80270918 10400005 */ beqz $v0, .L80270930 -/* 19F1FC 8027091C 00000000 */ nop +/* 19F1FC 8027091C 00000000 */ nop /* 19F200 80270920 0C0B1059 */ jal does_script_exist /* 19F204 80270924 8E0401E8 */ lw $a0, 0x1e8($s0) /* 19F208 80270928 14400006 */ bnez $v0, .L80270944 diff --git a/asm/nonmatchings/code_197F40/calc_player_damage_enemy.s b/asm/nonmatchings/code_197F40/calc_player_damage_enemy.s index 1e18a665a6..720bca38f6 100644 --- a/asm/nonmatchings/code_197F40/calc_player_damage_enemy.s +++ b/asm/nonmatchings/code_197F40/calc_player_damage_enemy.s @@ -51,7 +51,7 @@ glabel calc_player_damage_enemy /* 1A02D8 802719F8 A66001F8 */ sh $zero, 0x1f8($s3) .L802719FC: /* 1A02DC 802719FC 0809C67F */ j .L802719FC -/* 1A02E0 80271A00 00000000 */ nop +/* 1A02E0 80271A00 00000000 */ nop .L80271A04: /* 1A02E4 80271A04 3C02800E */ lui $v0, %hi(gBattleStatus) /* 1A02E8 80271A08 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) @@ -81,11 +81,11 @@ glabel calc_player_damage_enemy /* 1A0340 80271A60 10620007 */ beq $v1, $v0, .L80271A80 /* 1A0344 80271A64 30820800 */ andi $v0, $a0, 0x800 /* 1A0348 80271A68 10400007 */ beqz $v0, .L80271A88 -/* 1A034C 80271A6C 00000000 */ nop +/* 1A034C 80271A6C 00000000 */ nop /* 1A0350 80271A70 8E820188 */ lw $v0, 0x188($s4) /* 1A0354 80271A74 30420800 */ andi $v0, $v0, 0x800 /* 1A0358 80271A78 14400003 */ bnez $v0, .L80271A88 -/* 1A035C 80271A7C 00000000 */ nop +/* 1A035C 80271A7C 00000000 */ nop .L80271A80: /* 1A0360 80271A80 0809CC63 */ j .L8027318C /* 1A0364 80271A84 24020006 */ addiu $v0, $zero, 6 @@ -132,7 +132,7 @@ glabel calc_player_damage_enemy /* 1A03FC 80271B1C 8FC2007C */ lw $v0, 0x7c($fp) /* 1A0400 80271B20 30420010 */ andi $v0, $v0, 0x10 /* 1A0404 80271B24 10400006 */ beqz $v0, .L80271B40 -/* 1A0408 80271B28 00000000 */ nop +/* 1A0408 80271B28 00000000 */ nop /* 1A040C 80271B2C 8FA40018 */ lw $a0, 0x18($sp) /* 1A0410 80271B30 0C099CAB */ jal heroes_is_ability_active /* 1A0414 80271B34 24050002 */ addiu $a1, $zero, 2 @@ -143,7 +143,7 @@ glabel calc_player_damage_enemy /* 1A0424 80271B44 34630040 */ ori $v1, $v1, 0x40 /* 1A0428 80271B48 00431024 */ and $v0, $v0, $v1 /* 1A042C 80271B4C 1440002E */ bnez $v0, .L80271C08 -/* 1A0430 80271B50 00000000 */ nop +/* 1A0430 80271B50 00000000 */ nop /* 1A0434 80271B54 8FC3007C */ lw $v1, 0x7c($fp) /* 1A0438 80271B58 30628000 */ andi $v0, $v1, 0x8000 /* 1A043C 80271B5C 1040000D */ beqz $v0, .L80271B94 @@ -163,16 +163,16 @@ glabel calc_player_damage_enemy .L80271B94: /* 1A0474 80271B94 30620002 */ andi $v0, $v1, 2 /* 1A0478 80271B98 1040001B */ beqz $v0, .L80271C08 -/* 1A047C 80271B9C 00000000 */ nop +/* 1A047C 80271B9C 00000000 */ nop /* 1A0480 80271BA0 8E82018C */ lw $v0, 0x18c($s4) /* 1A0484 80271BA4 30420010 */ andi $v0, $v0, 0x10 /* 1A0488 80271BA8 14400017 */ bnez $v0, .L80271C08 -/* 1A048C 80271BAC 00000000 */ nop +/* 1A048C 80271BAC 00000000 */ nop /* 1A0490 80271BB0 8FA40018 */ lw $a0, 0x18($sp) /* 1A0494 80271BB4 0C099CAB */ jal heroes_is_ability_active /* 1A0498 80271BB8 24050007 */ addiu $a1, $zero, 7 /* 1A049C 80271BBC 14400012 */ bnez $v0, .L80271C08 -/* 1A04A0 80271BC0 00000000 */ nop +/* 1A04A0 80271BC0 00000000 */ nop /* 1A04A4 80271BC4 8FA40018 */ lw $a0, 0x18($sp) /* 1A04A8 80271BC8 0C099CAB */ jal heroes_is_ability_active /* 1A04AC 80271BCC 2405000D */ addiu $a1, $zero, 0xd @@ -200,7 +200,7 @@ glabel calc_player_damage_enemy /* 1A0500 80271C20 8E820188 */ lw $v0, 0x188($s4) /* 1A0504 80271C24 30420002 */ andi $v0, $v0, 2 /* 1A0508 80271C28 1040000E */ beqz $v0, .L80271C64 -/* 1A050C 80271C2C 00000000 */ nop +/* 1A050C 80271C2C 00000000 */ nop /* 1A0510 80271C30 8FC2007C */ lw $v0, 0x7c($fp) /* 1A0514 80271C34 30420600 */ andi $v0, $v0, 0x600 /* 1A0518 80271C38 1040000A */ beqz $v0, .L80271C64 @@ -223,16 +223,16 @@ glabel calc_player_damage_enemy /* 1A0558 80271C78 8FC2007C */ lw $v0, 0x7c($fp) /* 1A055C 80271C7C 00431024 */ and $v0, $v0, $v1 /* 1A0560 80271C80 1040001A */ beqz $v0, .L80271CEC -/* 1A0564 80271C84 00000000 */ nop +/* 1A0564 80271C84 00000000 */ nop /* 1A0568 80271C88 8E82018C */ lw $v0, 0x18c($s4) /* 1A056C 80271C8C 30420080 */ andi $v0, $v0, 0x80 /* 1A0570 80271C90 14400016 */ bnez $v0, .L80271CEC -/* 1A0574 80271C94 00000000 */ nop +/* 1A0574 80271C94 00000000 */ nop /* 1A0578 80271C98 8FA40018 */ lw $a0, 0x18($sp) /* 1A057C 80271C9C 0C099CAB */ jal heroes_is_ability_active /* 1A0580 80271CA0 24050002 */ addiu $a1, $zero, 2 /* 1A0584 80271CA4 14400011 */ bnez $v0, .L80271CEC -/* 1A0588 80271CA8 00000000 */ nop +/* 1A0588 80271CA8 00000000 */ nop .L80271CAC: /* 1A058C 80271CAC C6400014 */ lwc1 $f0, 0x14($s2) /* 1A0590 80271CB0 24040108 */ addiu $a0, $zero, 0x108 @@ -248,7 +248,7 @@ glabel calc_player_damage_enemy /* 1A05B8 80271CD8 2405001B */ addiu $a1, $zero, 0x1b .L80271CDC: /* 1A05BC 80271CDC 0C09DC58 */ jal dispatch_event_actor -/* 1A05C0 80271CE0 00000000 */ nop +/* 1A05C0 80271CE0 00000000 */ nop /* 1A05C4 80271CE4 0809CC63 */ j .L8027318C /* 1A05C8 80271CE8 2402FFFF */ addiu $v0, $zero, -1 .L80271CEC: @@ -263,7 +263,7 @@ glabel calc_player_damage_enemy /* 1A05EC 80271D0C 3C013F80 */ lui $at, 0x3f80 /* 1A05F0 80271D10 44811000 */ mtc1 $at, $f2 /* 1A05F4 80271D14 46002102 */ mul.s $f4, $f4, $f0 -/* 1A05F8 80271D18 00000000 */ nop +/* 1A05F8 80271D18 00000000 */ nop /* 1A05FC 80271D1C AFA20014 */ sw $v0, 0x14($sp) /* 1A0600 80271D20 E7A20010 */ swc1 $f2, 0x10($sp) /* 1A0604 80271D24 8E45000C */ lw $a1, 0xc($s2) @@ -276,7 +276,7 @@ glabel calc_player_damage_enemy /* 1A061C 80271D3C 8E820188 */ lw $v0, 0x188($s4) /* 1A0620 80271D40 30420020 */ andi $v0, $v0, 0x20 /* 1A0624 80271D44 10400005 */ beqz $v0, .L80271D5C -/* 1A0628 80271D48 00000000 */ nop +/* 1A0628 80271D48 00000000 */ nop /* 1A062C 80271D4C 0C09451D */ jal func_80251474 /* 1A0630 80271D50 0260202D */ daddu $a0, $s3, $zero /* 1A0634 80271D54 24080001 */ addiu $t0, $zero, 1 @@ -307,7 +307,7 @@ glabel calc_player_damage_enemy /* 1A0690 80271DB0 C6420014 */ lwc1 $f2, 0x14($s2) /* 1A0694 80271DB4 3C0140A0 */ lui $at, 0x40a0 /* 1A0698 80271DB8 44810000 */ mtc1 $at, $f0 -/* 1A069C 80271DBC 00000000 */ nop +/* 1A069C 80271DBC 00000000 */ nop /* 1A06A0 80271DC0 46001080 */ add.s $f2, $f2, $f0 /* 1A06A4 80271DC4 8E45000C */ lw $a1, 0xc($s2) /* 1A06A8 80271DC8 8E460010 */ lw $a2, 0x10($s2) @@ -339,26 +339,32 @@ glabel calc_player_damage_enemy /* 1A070C 80271E2C 2C620006 */ sltiu $v0, $v1, 6 /* 1A0710 80271E30 1040001C */ beqz $v0, .L80271EA4 /* 1A0714 80271E34 00031080 */ sll $v0, $v1, 2 -/* 1A0718 80271E38 3C01802A */ lui $at, %hi(D_8029D880) +/* 1A0718 80271E38 3C01802A */ lui $at, %hi(jtbl_8029D880_1CC160) /* 1A071C 80271E3C 00220821 */ addu $at, $at, $v0 -/* 1A0720 80271E40 8C22D880 */ lw $v0, %lo(D_8029D880)($at) +/* 1A0720 80271E40 8C22D880 */ lw $v0, %lo(jtbl_8029D880_1CC160)($at) /* 1A0724 80271E44 00400008 */ jr $v0 -/* 1A0728 80271E48 00000000 */ nop +/* 1A0728 80271E48 00000000 */ nop +glabel L80271E4C_1A072C /* 1A072C 80271E4C C6400014 */ lwc1 $f0, 0x14($s2) /* 1A0730 80271E50 0809C7A4 */ j .L80271E90 /* 1A0734 80271E54 24040372 */ addiu $a0, $zero, 0x372 +glabel L80271E58_1A0738 /* 1A0738 80271E58 C6400014 */ lwc1 $f0, 0x14($s2) /* 1A073C 80271E5C 0809C7A4 */ j .L80271E90 /* 1A0740 80271E60 240400F1 */ addiu $a0, $zero, 0xf1 +glabel L80271E64_1A0744 /* 1A0744 80271E64 C6400014 */ lwc1 $f0, 0x14($s2) /* 1A0748 80271E68 0809C7A4 */ j .L80271E90 /* 1A074C 80271E6C 240400DC */ addiu $a0, $zero, 0xdc +glabel L80271E70_1A0750 /* 1A0750 80271E70 C6400014 */ lwc1 $f0, 0x14($s2) /* 1A0754 80271E74 0809C7A4 */ j .L80271E90 /* 1A0758 80271E78 24042072 */ addiu $a0, $zero, 0x2072 +glabel L80271E7C_1A075C /* 1A075C 80271E7C C6400014 */ lwc1 $f0, 0x14($s2) /* 1A0760 80271E80 0809C7A4 */ j .L80271E90 /* 1A0764 80271E84 24042073 */ addiu $a0, $zero, 0x2073 +glabel L80271E88_1A0768 /* 1A0768 80271E88 C6400014 */ lwc1 $f0, 0x14($s2) /* 1A076C 80271E8C 2404205B */ addiu $a0, $zero, 0x205b .L80271E90: @@ -375,20 +381,20 @@ glabel calc_player_damage_enemy /* 1A0794 80271EB4 8FA80018 */ lw $t0, 0x18($sp) /* 1A0798 80271EB8 81020212 */ lb $v0, 0x212($t0) /* 1A079C 80271EBC 10430017 */ beq $v0, $v1, .L80271F1C -/* 1A07A0 80271EC0 00000000 */ nop +/* 1A07A0 80271EC0 00000000 */ nop /* 1A07A4 80271EC4 82620212 */ lb $v0, 0x212($s3) /* 1A07A8 80271EC8 10430005 */ beq $v0, $v1, .L80271EE0 /* 1A07AC 80271ECC 3C031000 */ lui $v1, 0x1000 /* 1A07B0 80271ED0 8FC2007C */ lw $v0, 0x7c($fp) /* 1A07B4 80271ED4 30420080 */ andi $v0, $v0, 0x80 /* 1A07B8 80271ED8 10400010 */ beqz $v0, .L80271F1C -/* 1A07BC 80271EDC 00000000 */ nop +/* 1A07BC 80271EDC 00000000 */ nop .L80271EE0: /* 1A07C0 80271EE0 8E820188 */ lw $v0, 0x188($s4) /* 1A07C4 80271EE4 34630020 */ ori $v1, $v1, 0x20 /* 1A07C8 80271EE8 00431024 */ and $v0, $v0, $v1 /* 1A07CC 80271EEC 1440000B */ bnez $v0, .L80271F1C -/* 1A07D0 80271EF0 00000000 */ nop +/* 1A07D0 80271EF0 00000000 */ nop /* 1A07D4 80271EF4 8E82018C */ lw $v0, 0x18c($s4) /* 1A07D8 80271EF8 30420008 */ andi $v0, $v0, 8 /* 1A07DC 80271EFC 14400007 */ bnez $v0, .L80271F1C @@ -419,7 +425,7 @@ glabel calc_player_damage_enemy /* 1A0838 80271F58 3C020800 */ lui $v0, 0x800 /* 1A083C 80271F5C 00821024 */ and $v0, $a0, $v0 /* 1A0840 80271F60 14400003 */ bnez $v0, .L80271F70 -/* 1A0844 80271F64 00000000 */ nop +/* 1A0844 80271F64 00000000 */ nop /* 1A0848 80271F68 82620222 */ lb $v0, 0x222($s3) /* 1A084C 80271F6C 02A2A821 */ addu $s5, $s5, $v0 .L80271F70: @@ -430,7 +436,7 @@ glabel calc_player_damage_enemy .L80271F80: /* 1A0860 80271F80 8690017E */ lh $s0, 0x17e($s4) /* 1A0864 80271F84 0C098EC4 */ jal count_power_plus -/* 1A0868 80271F88 00000000 */ nop +/* 1A0868 80271F88 00000000 */ nop /* 1A086C 80271F8C 828300AC */ lb $v1, 0xac($s4) /* 1A0870 80271F90 1860000A */ blez $v1, .L80271FBC /* 1A0874 80271F94 02028021 */ addu $s0, $s0, $v0 @@ -446,7 +452,7 @@ glabel calc_player_damage_enemy .L80271FBC: /* 1A089C 80271FBC 82830097 */ lb $v1, 0x97($s4) /* 1A08A0 80271FC0 1060000C */ beqz $v1, .L80271FF4 -/* 1A08A4 80271FC4 00000000 */ nop +/* 1A08A4 80271FC4 00000000 */ nop /* 1A08A8 80271FC8 8E820188 */ lw $v0, 0x188($s4) /* 1A08AC 80271FCC 30420080 */ andi $v0, $v0, 0x80 /* 1A08B0 80271FD0 10400008 */ beqz $v0, .L80271FF4 @@ -466,7 +472,7 @@ glabel calc_player_damage_enemy /* 1A08E4 80272004 34630040 */ ori $v1, $v1, 0x40 /* 1A08E8 80272008 00431024 */ and $v0, $v0, $v1 /* 1A08EC 8027200C 10400009 */ beqz $v0, .L80272034 -/* 1A08F0 80272010 00000000 */ nop +/* 1A08F0 80272010 00000000 */ nop /* 1A08F4 80272014 02048021 */ addu $s0, $s0, $a0 /* 1A08F8 80272018 3C04EFFF */ lui $a0, 0xefff /* 1A08FC 8027201C 3C03800E */ lui $v1, %hi(gBattleStatus) @@ -508,7 +514,7 @@ glabel calc_player_damage_enemy /* 1A0974 80272094 0C099CAB */ jal heroes_is_ability_active /* 1A0978 80272098 02028021 */ addu $s0, $s0, $v0 /* 1A097C 8027209C 10400013 */ beqz $v0, .L802720EC -/* 1A0980 802720A0 00000000 */ nop +/* 1A0980 802720A0 00000000 */ nop /* 1A0984 802720A4 92820089 */ lbu $v0, 0x89($s4) /* 1A0988 802720A8 2610FFFF */ addiu $s0, $s0, -1 /* 1A098C 802720AC 24420001 */ addiu $v0, $v0, 1 @@ -533,7 +539,7 @@ glabel calc_player_damage_enemy /* 1A09D0 802720F0 0C099CAB */ jal heroes_is_ability_active /* 1A09D4 802720F4 24050024 */ addiu $a1, $zero, 0x24 /* 1A09D8 802720F8 10400013 */ beqz $v0, .L80272148 -/* 1A09DC 802720FC 00000000 */ nop +/* 1A09DC 802720FC 00000000 */ nop /* 1A09E0 80272100 92820089 */ lbu $v0, 0x89($s4) /* 1A09E4 80272104 2610FFFE */ addiu $s0, $s0, -2 /* 1A09E8 80272108 24420002 */ addiu $v0, $v0, 2 @@ -560,15 +566,15 @@ glabel calc_player_damage_enemy /* 1A0A34 80272154 3C030800 */ lui $v1, 0x800 /* 1A0A38 80272158 00431024 */ and $v0, $v0, $v1 /* 1A0A3C 8027215C 1040001A */ beqz $v0, .L802721C8 -/* 1A0A40 80272160 00000000 */ nop +/* 1A0A40 80272160 00000000 */ nop /* 1A0A44 80272164 8C820000 */ lw $v0, ($a0) /* 1A0A48 80272168 30420010 */ andi $v0, $v0, 0x10 /* 1A0A4C 8027216C 14400005 */ bnez $v0, .L80272184 -/* 1A0A50 80272170 00000000 */ nop +/* 1A0A50 80272170 00000000 */ nop /* 1A0A54 80272174 8E820188 */ lw $v0, 0x188($s4) /* 1A0A58 80272178 30420080 */ andi $v0, $v0, 0x80 /* 1A0A5C 8027217C 10400012 */ beqz $v0, .L802721C8 -/* 1A0A60 80272180 00000000 */ nop +/* 1A0A60 80272180 00000000 */ nop .L80272184: /* 1A0A64 80272184 92830099 */ lbu $v1, 0x99($s4) /* 1A0A68 80272188 30620002 */ andi $v0, $v1, 2 @@ -596,12 +602,12 @@ glabel calc_player_damage_enemy /* 1A0AB4 802721D4 3C030100 */ lui $v1, 0x100 /* 1A0AB8 802721D8 00431024 */ and $v0, $v0, $v1 /* 1A0ABC 802721DC 14400016 */ bnez $v0, .L80272238 -/* 1A0AC0 802721E0 00000000 */ nop +/* 1A0AC0 802721E0 00000000 */ nop /* 1A0AC4 802721E4 8FA40018 */ lw $a0, 0x18($sp) /* 1A0AC8 802721E8 0C099CAB */ jal heroes_is_ability_active /* 1A0ACC 802721EC 2405000A */ addiu $a1, $zero, 0xa /* 1A0AD0 802721F0 10400011 */ beqz $v0, .L80272238 -/* 1A0AD4 802721F4 00000000 */ nop +/* 1A0AD4 802721F4 00000000 */ nop /* 1A0AD8 802721F8 8E230000 */ lw $v1, ($s1) /* 1A0ADC 802721FC 30620240 */ andi $v0, $v1, 0x240 /* 1A0AE0 80272200 1440000D */ bnez $v0, .L80272238 @@ -623,7 +629,7 @@ glabel calc_player_damage_enemy /* 1A0B1C 8027223C 81030210 */ lb $v1, 0x210($t0) /* 1A0B20 80272240 2402000A */ addiu $v0, $zero, 0xa /* 1A0B24 80272244 14620007 */ bne $v1, $v0, .L80272264 -/* 1A0B28 80272248 00000000 */ nop +/* 1A0B28 80272248 00000000 */ nop /* 1A0B2C 8027224C 1A000005 */ blez $s0, .L80272264 /* 1A0B30 80272250 001017C2 */ srl $v0, $s0, 0x1f /* 1A0B34 80272254 02021021 */ addu $v0, $s0, $v0 @@ -635,15 +641,15 @@ glabel calc_player_damage_enemy /* 1A0B48 80272268 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1A0B4C 8027226C 30420020 */ andi $v0, $v0, 0x20 /* 1A0B50 80272270 1040000B */ beqz $v0, .L802722A0 -/* 1A0B54 80272274 00000000 */ nop +/* 1A0B54 80272274 00000000 */ nop /* 1A0B58 80272278 8E820188 */ lw $v0, 0x188($s4) /* 1A0B5C 8027227C 30420200 */ andi $v0, $v0, 0x200 /* 1A0B60 80272280 10400007 */ beqz $v0, .L802722A0 -/* 1A0B64 80272284 00000000 */ nop +/* 1A0B64 80272284 00000000 */ nop /* 1A0B68 80272288 8FC2007C */ lw $v0, 0x7c($fp) /* 1A0B6C 8027228C 30420200 */ andi $v0, $v0, 0x200 /* 1A0B70 80272290 10400003 */ beqz $v0, .L802722A0 -/* 1A0B74 80272294 00000000 */ nop +/* 1A0B74 80272294 00000000 */ nop /* 1A0B78 80272298 0000A82D */ daddu $s5, $zero, $zero /* 1A0B7C 8027229C 827001B8 */ lb $s0, 0x1b8($s3) .L802722A0: @@ -671,9 +677,9 @@ glabel calc_player_damage_enemy /* 1A0BC4 802722E4 3C030010 */ lui $v1, 0x10 /* 1A0BC8 802722E8 00431024 */ and $v0, $v0, $v1 /* 1A0BCC 802722EC 10400007 */ beqz $v0, .L8027230C -/* 1A0BD0 802722F0 00000000 */ nop +/* 1A0BD0 802722F0 00000000 */ nop /* 1A0BD4 802722F4 1A000005 */ blez $s0, .L8027230C -/* 1A0BD8 802722F8 00000000 */ nop +/* 1A0BD8 802722F8 00000000 */ nop /* 1A0BDC 802722FC 82820198 */ lb $v0, 0x198($s4) /* 1A0BE0 80272300 02028021 */ addu $s0, $s0, $v0 /* 1A0BE4 80272304 5A000001 */ blezl $s0, .L8027230C @@ -722,20 +728,20 @@ glabel calc_player_damage_enemy /* 1A0C80 802723A0 3C030200 */ lui $v1, 0x200 /* 1A0C84 802723A4 00431024 */ and $v0, $v0, $v1 /* 1A0C88 802723A8 14400010 */ bnez $v0, .L802723EC -/* 1A0C8C 802723AC 00000000 */ nop +/* 1A0C8C 802723AC 00000000 */ nop /* 1A0C90 802723B0 8FA8001C */ lw $t0, 0x1c($sp) /* 1A0C94 802723B4 1500000D */ bnez $t0, .L802723EC -/* 1A0C98 802723B8 00000000 */ nop +/* 1A0C98 802723B8 00000000 */ nop /* 1A0C9C 802723BC 8FC20004 */ lw $v0, 4($fp) /* 1A0CA0 802723C0 30420004 */ andi $v0, $v0, 4 /* 1A0CA4 802723C4 14400009 */ bnez $v0, .L802723EC -/* 1A0CA8 802723C8 00000000 */ nop +/* 1A0CA8 802723C8 00000000 */ nop /* 1A0CAC 802723CC 926201B8 */ lbu $v0, 0x1b8($s3) /* 1A0CB0 802723D0 00501023 */ subu $v0, $v0, $s0 /* 1A0CB4 802723D4 A26201B8 */ sb $v0, 0x1b8($s3) /* 1A0CB8 802723D8 00021600 */ sll $v0, $v0, 0x18 /* 1A0CBC 802723DC 1C400003 */ bgtz $v0, .L802723EC -/* 1A0CC0 802723E0 00000000 */ nop +/* 1A0CC0 802723E0 00000000 */ nop /* 1A0CC4 802723E4 A26001B8 */ sb $zero, 0x1b8($s3) /* 1A0CC8 802723E8 24110020 */ addiu $s1, $zero, 0x20 .L802723EC: @@ -748,7 +754,7 @@ glabel calc_player_damage_enemy /* 1A0CE0 80272400 8FC20000 */ lw $v0, ($fp) /* 1A0CE4 80272404 30422000 */ andi $v0, $v0, 0x2000 /* 1A0CE8 80272408 10400037 */ beqz $v0, .L802724E8 -/* 1A0CEC 8027240C 00000000 */ nop +/* 1A0CEC 8027240C 00000000 */ nop /* 1A0CF0 80272410 0C03A752 */ jal is_ability_active /* 1A0CF4 80272414 24040013 */ addiu $a0, $zero, 0x13 /* 1A0CF8 80272418 14400017 */ bnez $v0, .L80272478 @@ -756,26 +762,26 @@ glabel calc_player_damage_enemy /* 1A0D00 80272420 8FA80018 */ lw $t0, 0x18($sp) /* 1A0D04 80272424 81020212 */ lb $v0, 0x212($t0) /* 1A0D08 80272428 10430013 */ beq $v0, $v1, .L80272478 -/* 1A0D0C 8027242C 00000000 */ nop +/* 1A0D0C 8027242C 00000000 */ nop /* 1A0D10 80272430 82620212 */ lb $v0, 0x212($s3) /* 1A0D14 80272434 10430005 */ beq $v0, $v1, .L8027244C -/* 1A0D18 80272438 00000000 */ nop +/* 1A0D18 80272438 00000000 */ nop /* 1A0D1C 8027243C 8FC2007C */ lw $v0, 0x7c($fp) /* 1A0D20 80272440 30420080 */ andi $v0, $v0, 0x80 /* 1A0D24 80272444 1040000C */ beqz $v0, .L80272478 -/* 1A0D28 80272448 00000000 */ nop +/* 1A0D28 80272448 00000000 */ nop .L8027244C: /* 1A0D2C 8027244C 8E830188 */ lw $v1, 0x188($s4) /* 1A0D30 80272450 3C021000 */ lui $v0, 0x1000 /* 1A0D34 80272454 00621024 */ and $v0, $v1, $v0 /* 1A0D38 80272458 14400007 */ bnez $v0, .L80272478 -/* 1A0D3C 8027245C 00000000 */ nop +/* 1A0D3C 8027245C 00000000 */ nop /* 1A0D40 80272460 8E82018C */ lw $v0, 0x18c($s4) /* 1A0D44 80272464 30420008 */ andi $v0, $v0, 8 /* 1A0D48 80272468 14400003 */ bnez $v0, .L80272478 /* 1A0D4C 8027246C 30620020 */ andi $v0, $v1, 0x20 /* 1A0D50 80272470 10400338 */ beqz $v0, .L80273154 -/* 1A0D54 80272474 00000000 */ nop +/* 1A0D54 80272474 00000000 */ nop .L80272478: /* 1A0D58 80272478 3C10800E */ lui $s0, %hi(gBattleStatus) /* 1A0D5C 8027247C 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) @@ -805,7 +811,7 @@ glabel calc_player_damage_enemy /* 1A0DB8 802724D8 0C093BF8 */ jal func_8024EFE0 /* 1A0DBC 802724DC 0000382D */ daddu $a3, $zero, $zero /* 1A0DC0 802724E0 0809C961 */ j .L80272584 -/* 1A0DC4 802724E4 00000000 */ nop +/* 1A0DC4 802724E4 00000000 */ nop .L802724E8: /* 1A0DC8 802724E8 3C10800E */ lui $s0, %hi(gBattleStatus) /* 1A0DCC 802724EC 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) @@ -816,7 +822,7 @@ glabel calc_player_damage_enemy /* 1A0DE0 80272500 8E820188 */ lw $v0, 0x188($s4) /* 1A0DE4 80272504 30421000 */ andi $v0, $v0, 0x1000 /* 1A0DE8 80272508 10400022 */ beqz $v0, .L80272594 -/* 1A0DEC 8027250C 00000000 */ nop +/* 1A0DEC 8027250C 00000000 */ nop /* 1A0DF0 80272510 0C00A67F */ jal rand_int /* 1A0DF4 80272514 24040063 */ addiu $a0, $zero, 0x63 /* 1A0DF8 80272518 8E630008 */ lw $v1, 8($s3) @@ -833,12 +839,12 @@ glabel calc_player_damage_enemy /* 1A0E24 80272544 00641823 */ subu $v1, $v1, $a0 /* 1A0E28 80272548 0043102A */ slt $v0, $v0, $v1 /* 1A0E2C 8027254C 10400011 */ beqz $v0, .L80272594 -/* 1A0E30 80272550 00000000 */ nop +/* 1A0E30 80272550 00000000 */ nop /* 1A0E34 80272554 92620210 */ lbu $v0, 0x210($s3) /* 1A0E38 80272558 2442FFFD */ addiu $v0, $v0, -3 /* 1A0E3C 8027255C 2C420006 */ sltiu $v0, $v0, 6 /* 1A0E40 80272560 1440000C */ bnez $v0, .L80272594 -/* 1A0E44 80272564 00000000 */ nop +/* 1A0E44 80272564 00000000 */ nop /* 1A0E48 80272568 8E620000 */ lw $v0, ($s3) /* 1A0E4C 8027256C 30420400 */ andi $v0, $v0, 0x400 /* 1A0E50 80272570 14400008 */ bnez $v0, .L80272594 @@ -846,7 +852,7 @@ glabel calc_player_damage_enemy /* 1A0E58 80272578 24050039 */ addiu $a1, $zero, 0x39 .L8027257C: /* 1A0E5C 8027257C 0C09DC58 */ jal dispatch_event_actor -/* 1A0E60 80272580 00000000 */ nop +/* 1A0E60 80272580 00000000 */ nop .L80272584: /* 1A0E64 80272584 8E020000 */ lw $v0, ($s0) /* 1A0E68 80272588 30420240 */ andi $v0, $v0, 0x240 @@ -872,7 +878,7 @@ glabel calc_player_damage_enemy /* 1A0EA8 802725C8 52220006 */ beql $s1, $v0, .L802725E4 /* 1A0EAC 802725CC 24110020 */ addiu $s1, $zero, 0x20 /* 1A0EB0 802725D0 0809C979 */ j .L802725E4 -/* 1A0EB4 802725D4 00000000 */ nop +/* 1A0EB4 802725D4 00000000 */ nop .L802725D8: /* 1A0EB8 802725D8 24020020 */ addiu $v0, $zero, 0x20 .L802725DC: @@ -884,13 +890,13 @@ glabel calc_player_damage_enemy /* 1A0ECC 802725EC 8E020000 */ lw $v0, ($s0) /* 1A0ED0 802725F0 30420020 */ andi $v0, $v0, 0x20 /* 1A0ED4 802725F4 14400007 */ bnez $v0, .L80272614 -/* 1A0ED8 802725F8 00000000 */ nop +/* 1A0ED8 802725F8 00000000 */ nop /* 1A0EDC 802725FC 0C099B85 */ jal func_80266E14 /* 1A0EE0 80272600 03C0202D */ daddu $a0, $fp, $zero /* 1A0EE4 80272604 8E020000 */ lw $v0, ($s0) /* 1A0EE8 80272608 30420020 */ andi $v0, $v0, 0x20 /* 1A0EEC 8027260C 1040006F */ beqz $v0, .L802727CC -/* 1A0EF0 80272610 00000000 */ nop +/* 1A0EF0 80272610 00000000 */ nop .L80272614: /* 1A0EF4 80272614 8E820188 */ lw $v0, 0x188($s4) /* 1A0EF8 80272618 3C030400 */ lui $v1, 0x400 @@ -900,17 +906,17 @@ glabel calc_player_damage_enemy /* 1A0F08 80272628 8E640008 */ lw $a0, 8($s3) /* 1A0F0C 8027262C 9083001D */ lbu $v1, 0x1d($a0) /* 1A0F10 80272630 1062001D */ beq $v1, $v0, .L802726A8 -/* 1A0F14 80272634 00000000 */ nop +/* 1A0F14 80272634 00000000 */ nop /* 1A0F18 80272638 3C028011 */ lui $v0, %hi(gPlayerData) /* 1A0F1C 8027263C 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) /* 1A0F20 80272640 80420001 */ lb $v0, 1($v0) /* 1A0F24 80272644 24420001 */ addiu $v0, $v0, 1 /* 1A0F28 80272648 0043102A */ slt $v0, $v0, $v1 /* 1A0F2C 8027264C 14400016 */ bnez $v0, .L802726A8 -/* 1A0F30 80272650 00000000 */ nop +/* 1A0F30 80272650 00000000 */ nop /* 1A0F34 80272654 86820180 */ lh $v0, 0x180($s4) /* 1A0F38 80272658 18400013 */ blez $v0, .L802726A8 -/* 1A0F3C 8027265C 00000000 */ nop +/* 1A0F3C 8027265C 00000000 */ nop /* 1A0F40 80272660 8E020000 */ lw $v0, ($s0) /* 1A0F44 80272664 30420040 */ andi $v0, $v0, 0x40 /* 1A0F48 80272668 1040000F */ beqz $v0, .L802726A8 @@ -970,11 +976,11 @@ glabel calc_player_damage_enemy /* 1A0FF8 80272718 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1A0FFC 8027271C 30420020 */ andi $v0, $v0, 0x20 /* 1A1000 80272720 1040002A */ beqz $v0, .L802727CC -/* 1A1004 80272724 00000000 */ nop +/* 1A1004 80272724 00000000 */ nop /* 1A1008 80272728 8E820188 */ lw $v0, 0x188($s4) /* 1A100C 8027272C 30420480 */ andi $v0, $v0, 0x480 /* 1A1010 80272730 1040000B */ beqz $v0, .L80272760 -/* 1A1014 80272734 00000000 */ nop +/* 1A1014 80272734 00000000 */ nop /* 1A1018 80272738 8FC2007C */ lw $v0, 0x7c($fp) /* 1A101C 8027273C 30424000 */ andi $v0, $v0, 0x4000 /* 1A1020 80272740 10400007 */ beqz $v0, .L80272760 @@ -992,11 +998,11 @@ glabel calc_player_damage_enemy /* 1A1044 80272764 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1A1048 80272768 30420020 */ andi $v0, $v0, 0x20 /* 1A104C 8027276C 10400017 */ beqz $v0, .L802727CC -/* 1A1050 80272770 00000000 */ nop +/* 1A1050 80272770 00000000 */ nop /* 1A1054 80272774 8E820188 */ lw $v0, 0x188($s4) /* 1A1058 80272778 30420C80 */ andi $v0, $v0, 0xc80 /* 1A105C 8027277C 1040000E */ beqz $v0, .L802727B8 -/* 1A1060 80272780 00000000 */ nop +/* 1A1060 80272780 00000000 */ nop /* 1A1064 80272784 8FC2007C */ lw $v0, 0x7c($fp) /* 1A1068 80272788 30421000 */ andi $v0, $v0, 0x1000 /* 1A106C 8027278C 1040000A */ beqz $v0, .L802727B8 @@ -1017,12 +1023,12 @@ glabel calc_player_damage_enemy /* 1A109C 802727BC 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1A10A0 802727C0 30420020 */ andi $v0, $v0, 0x20 /* 1A10A4 802727C4 14400017 */ bnez $v0, .L80272824 -/* 1A10A8 802727C8 00000000 */ nop +/* 1A10A8 802727C8 00000000 */ nop .L802727CC: /* 1A10AC 802727CC 8E820188 */ lw $v0, 0x188($s4) /* 1A10B0 802727D0 30420C80 */ andi $v0, $v0, 0xc80 /* 1A10B4 802727D4 1040000E */ beqz $v0, .L80272810 -/* 1A10B8 802727D8 00000000 */ nop +/* 1A10B8 802727D8 00000000 */ nop /* 1A10BC 802727DC 8FC2007C */ lw $v0, 0x7c($fp) /* 1A10C0 802727E0 30421000 */ andi $v0, $v0, 0x1000 /* 1A10C4 802727E4 1040000A */ beqz $v0, .L80272810 @@ -1049,7 +1055,7 @@ glabel calc_player_damage_enemy /* 1A1108 80272828 3C030002 */ lui $v1, 2 /* 1A110C 8027282C 00431024 */ and $v0, $v0, $v1 /* 1A1110 80272830 1040000B */ beqz $v0, .L80272860 -/* 1A1114 80272834 00000000 */ nop +/* 1A1114 80272834 00000000 */ nop /* 1A1118 80272838 8FC2007C */ lw $v0, 0x7c($fp) /* 1A111C 8027283C 30421000 */ andi $v0, $v0, 0x1000 /* 1A1120 80272840 10400007 */ beqz $v0, .L80272860 @@ -1108,7 +1114,7 @@ glabel calc_player_damage_enemy /* 1A11DC 802728FC 0C099ADE */ jal try_inflict_status /* 1A11E0 80272900 24060027 */ addiu $a2, $zero, 0x27 /* 1A11E4 80272904 10400003 */ beqz $v0, .L80272914 -/* 1A11E8 80272908 00000000 */ nop +/* 1A11E8 80272908 00000000 */ nop /* 1A11EC 8027290C 24160001 */ addiu $s6, $zero, 1 /* 1A11F0 80272910 02C0B82D */ daddu $s7, $s6, $zero .L80272914: @@ -1121,7 +1127,7 @@ glabel calc_player_damage_enemy /* 1A120C 8027292C 0C099ADE */ jal try_inflict_status /* 1A1210 80272930 24060025 */ addiu $a2, $zero, 0x25 /* 1A1214 80272934 10400003 */ beqz $v0, .L80272944 -/* 1A1218 80272938 00000000 */ nop +/* 1A1218 80272938 00000000 */ nop /* 1A121C 8027293C 24160001 */ addiu $s6, $zero, 1 /* 1A1220 80272940 02C0B82D */ daddu $s7, $s6, $zero .L80272944: @@ -1134,7 +1140,7 @@ glabel calc_player_damage_enemy /* 1A123C 8027295C 0C099ADE */ jal try_inflict_status /* 1A1240 80272960 24060028 */ addiu $a2, $zero, 0x28 /* 1A1244 80272964 10400003 */ beqz $v0, .L80272974 -/* 1A1248 80272968 00000000 */ nop +/* 1A1248 80272968 00000000 */ nop /* 1A124C 8027296C 24160001 */ addiu $s6, $zero, 1 /* 1A1250 80272970 02C0B82D */ daddu $s7, $s6, $zero .L80272974: @@ -1146,7 +1152,7 @@ glabel calc_player_damage_enemy /* 1A1268 80272988 0C099ADE */ jal try_inflict_status /* 1A126C 8027298C 24060020 */ addiu $a2, $zero, 0x20 /* 1A1270 80272990 10400003 */ beqz $v0, .L802729A0 -/* 1A1274 80272994 00000000 */ nop +/* 1A1274 80272994 00000000 */ nop /* 1A1278 80272998 24160001 */ addiu $s6, $zero, 1 /* 1A127C 8027299C 02C0B82D */ daddu $s7, $s6, $zero .L802729A0: @@ -1159,7 +1165,7 @@ glabel calc_player_damage_enemy /* 1A1298 802729B8 0C099ADE */ jal try_inflict_status /* 1A129C 802729BC 24060029 */ addiu $a2, $zero, 0x29 /* 1A12A0 802729C0 10400003 */ beqz $v0, .L802729D0 -/* 1A12A4 802729C4 00000000 */ nop +/* 1A12A4 802729C4 00000000 */ nop /* 1A12A8 802729C8 24160001 */ addiu $s6, $zero, 1 /* 1A12AC 802729CC 02C0B82D */ daddu $s7, $s6, $zero .L802729D0: @@ -1171,7 +1177,7 @@ glabel calc_player_damage_enemy /* 1A12C4 802729E4 0C099ADE */ jal try_inflict_status /* 1A12C8 802729E8 24060021 */ addiu $a2, $zero, 0x21 /* 1A12CC 802729EC 10400003 */ beqz $v0, .L802729FC -/* 1A12D0 802729F0 00000000 */ nop +/* 1A12D0 802729F0 00000000 */ nop /* 1A12D4 802729F4 24160001 */ addiu $s6, $zero, 1 /* 1A12D8 802729F8 02C0B82D */ daddu $s7, $s6, $zero .L802729FC: @@ -1183,7 +1189,7 @@ glabel calc_player_damage_enemy /* 1A12F0 80272A10 0C099ADE */ jal try_inflict_status /* 1A12F4 80272A14 24060023 */ addiu $a2, $zero, 0x23 /* 1A12F8 80272A18 10400003 */ beqz $v0, .L80272A28 -/* 1A12FC 80272A1C 00000000 */ nop +/* 1A12FC 80272A1C 00000000 */ nop /* 1A1300 80272A20 24160001 */ addiu $s6, $zero, 1 /* 1A1304 80272A24 02C0B82D */ daddu $s7, $s6, $zero .L80272A28: @@ -1196,7 +1202,7 @@ glabel calc_player_damage_enemy /* 1A1320 80272A40 0C099ADE */ jal try_inflict_status /* 1A1324 80272A44 24060026 */ addiu $a2, $zero, 0x26 /* 1A1328 80272A48 10400003 */ beqz $v0, .L80272A58 -/* 1A132C 80272A4C 00000000 */ nop +/* 1A132C 80272A4C 00000000 */ nop /* 1A1330 80272A50 24160001 */ addiu $s6, $zero, 1 /* 1A1334 80272A54 02C0B82D */ daddu $s7, $s6, $zero .L80272A58: @@ -1209,7 +1215,7 @@ glabel calc_player_damage_enemy /* 1A1350 80272A70 0C099ADE */ jal try_inflict_status /* 1A1354 80272A74 24060024 */ addiu $a2, $zero, 0x24 /* 1A1358 80272A78 10400003 */ beqz $v0, .L80272A88 -/* 1A135C 80272A7C 00000000 */ nop +/* 1A135C 80272A7C 00000000 */ nop /* 1A1360 80272A80 24160001 */ addiu $s6, $zero, 1 /* 1A1364 80272A84 02C0B82D */ daddu $s7, $s6, $zero .L80272A88: @@ -1231,12 +1237,12 @@ glabel calc_player_damage_enemy /* 1A1398 80272AB8 3C030200 */ lui $v1, 0x200 /* 1A139C 80272ABC 00431024 */ and $v0, $v0, $v1 /* 1A13A0 80272AC0 1440002F */ bnez $v0, .L80272B80 -/* 1A13A4 80272AC4 00000000 */ nop +/* 1A13A4 80272AC4 00000000 */ nop /* 1A13A8 80272AC8 86870180 */ lh $a3, 0x180($s4) /* 1A13AC 80272ACC 14E0000F */ bnez $a3, .L80272B0C -/* 1A13B0 80272AD0 00000000 */ nop +/* 1A13B0 80272AD0 00000000 */ nop /* 1A13B4 80272AD4 16C0002C */ bnez $s6, .L80272B88 -/* 1A13B8 80272AD8 00000000 */ nop +/* 1A13B8 80272AD8 00000000 */ nop /* 1A13BC 80272ADC 16E00028 */ bnez $s7, .L80272B80 /* 1A13C0 80272AE0 24020001 */ addiu $v0, $zero, 1 /* 1A13C4 80272AE4 AFA20010 */ sw $v0, 0x10($sp) @@ -1248,7 +1254,7 @@ glabel calc_player_damage_enemy /* 1A13DC 80272AFC 0C093BF8 */ jal func_8024EFE0 /* 1A13E0 80272B00 0000382D */ daddu $a3, $zero, $zero /* 1A13E4 80272B04 0809CAE0 */ j .L80272B80 -/* 1A13E8 80272B08 00000000 */ nop +/* 1A13E8 80272B08 00000000 */ nop .L80272B0C: /* 1A13EC 80272B0C 8FA8001C */ lw $t0, 0x1c($sp) /* 1A13F0 80272B10 1500001B */ bnez $t0, .L80272B80 @@ -1263,7 +1269,7 @@ glabel calc_player_damage_enemy /* 1A1414 80272B34 0C09996B */ jal show_damage_popup /* 1A1418 80272B38 8E460014 */ lw $a2, 0x14($s2) /* 1A141C 80272B3C 0809CAD5 */ j .L80272B54 -/* 1A1420 80272B40 00000000 */ nop +/* 1A1420 80272B40 00000000 */ nop .L80272B44: /* 1A1424 80272B44 C64C000C */ lwc1 $f12, 0xc($s2) /* 1A1428 80272B48 C64E0010 */ lwc1 $f14, 0x10($s2) @@ -1273,7 +1279,7 @@ glabel calc_player_damage_enemy /* 1A1434 80272B54 8FC20004 */ lw $v0, 4($fp) /* 1A1438 80272B58 30420004 */ andi $v0, $v0, 4 /* 1A143C 80272B5C 14400008 */ bnez $v0, .L80272B80 -/* 1A1440 80272B60 00000000 */ nop +/* 1A1440 80272B60 00000000 */ nop /* 1A1444 80272B64 86820180 */ lh $v0, 0x180($s4) /* 1A1448 80272B68 AFA20010 */ sw $v0, 0x10($sp) /* 1A144C 80272B6C 8E45000C */ lw $a1, 0xc($s2) @@ -1283,29 +1289,29 @@ glabel calc_player_damage_enemy /* 1A145C 80272B7C 0260202D */ daddu $a0, $s3, $zero .L80272B80: /* 1A1460 80272B80 12C00006 */ beqz $s6, .L80272B9C -/* 1A1464 80272B84 00000000 */ nop +/* 1A1464 80272B84 00000000 */ nop .L80272B88: /* 1A1468 80272B88 3C02800E */ lui $v0, %hi(gBattleStatus) /* 1A146C 80272B8C 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1A1470 80272B90 30420040 */ andi $v0, $v0, 0x40 /* 1A1474 80272B94 14400006 */ bnez $v0, .L80272BB0 -/* 1A1478 80272B98 00000000 */ nop +/* 1A1478 80272B98 00000000 */ nop .L80272B9C: /* 1A147C 80272B9C 3C02800E */ lui $v0, %hi(gBattleStatus) /* 1A1480 80272BA0 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1A1484 80272BA4 30420040 */ andi $v0, $v0, 0x40 /* 1A1488 80272BA8 1040002E */ beqz $v0, .L80272C64 -/* 1A148C 80272BAC 00000000 */ nop +/* 1A148C 80272BAC 00000000 */ nop .L80272BB0: /* 1A1490 80272BB0 3C02800E */ lui $v0, %hi(gBattleStatus) /* 1A1494 80272BB4 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1A1498 80272BB8 30420080 */ andi $v0, $v0, 0x80 /* 1A149C 80272BBC 14400029 */ bnez $v0, .L80272C64 -/* 1A14A0 80272BC0 00000000 */ nop +/* 1A14A0 80272BC0 00000000 */ nop /* 1A14A4 80272BC4 8FA80018 */ lw $t0, 0x18($sp) /* 1A14A8 80272BC8 8D0201B0 */ lw $v0, 0x1b0($t0) /* 1A14AC 80272BCC 10400008 */ beqz $v0, .L80272BF0 -/* 1A14B0 80272BD0 00000000 */ nop +/* 1A14B0 80272BD0 00000000 */ nop /* 1A14B4 80272BD4 C6400014 */ lwc1 $f0, 0x14($s2) /* 1A14B8 80272BD8 E7A00010 */ swc1 $f0, 0x10($sp) /* 1A14BC 80272BDC 8D0401B0 */ lw $a0, 0x1b0($t0) @@ -1316,20 +1322,20 @@ glabel calc_player_damage_enemy .L80272BF0: /* 1A14D0 80272BF0 86820180 */ lh $v0, 0x180($s4) /* 1A14D4 80272BF4 18400006 */ blez $v0, .L80272C10 -/* 1A14D8 80272BF8 00000000 */ nop +/* 1A14D8 80272BF8 00000000 */ nop /* 1A14DC 80272BFC 0C05272D */ jal play_sound /* 1A14E0 80272C00 24040231 */ addiu $a0, $zero, 0x231 /* 1A14E4 80272C04 86820180 */ lh $v0, 0x180($s4) /* 1A14E8 80272C08 1C400008 */ bgtz $v0, .L80272C2C -/* 1A14EC 80272C0C 00000000 */ nop +/* 1A14EC 80272C0C 00000000 */ nop .L80272C10: /* 1A14F0 80272C10 8E820188 */ lw $v0, 0x188($s4) /* 1A14F4 80272C14 3C034000 */ lui $v1, 0x4000 /* 1A14F8 80272C18 00431024 */ and $v0, $v0, $v1 /* 1A14FC 80272C1C 10400011 */ beqz $v0, .L80272C64 -/* 1A1500 80272C20 00000000 */ nop +/* 1A1500 80272C20 00000000 */ nop /* 1A1504 80272C24 12C0000F */ beqz $s6, .L80272C64 -/* 1A1508 80272C28 00000000 */ nop +/* 1A1508 80272C28 00000000 */ nop .L80272C2C: /* 1A150C 80272C2C 8E820188 */ lw $v0, 0x188($s4) /* 1A1510 80272C30 3C030100 */ lui $v1, 0x100 @@ -1362,15 +1368,15 @@ glabel calc_player_damage_enemy /* 1A156C 80272C8C 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1A1570 80272C90 30420020 */ andi $v0, $v0, 0x20 /* 1A1574 80272C94 10400003 */ beqz $v0, .L80272CA4 -/* 1A1578 80272C98 00000000 */ nop +/* 1A1578 80272C98 00000000 */ nop /* 1A157C 80272C9C 0C099A5C */ jal func_80266970 /* 1A1580 80272CA0 0260202D */ daddu $a0, $s3, $zero .L80272CA4: /* 1A1584 80272CA4 86820180 */ lh $v0, 0x180($s4) /* 1A1588 80272CA8 1C400003 */ bgtz $v0, .L80272CB8 -/* 1A158C 80272CAC 00000000 */ nop +/* 1A158C 80272CAC 00000000 */ nop /* 1A1590 80272CB0 12C00020 */ beqz $s6, .L80272D34 -/* 1A1594 80272CB4 00000000 */ nop +/* 1A1594 80272CB4 00000000 */ nop .L80272CB8: /* 1A1598 80272CB8 8FA8001C */ lw $t0, 0x1c($sp) /* 1A159C 80272CBC 1500001C */ bnez $t0, .L80272D30 @@ -1410,17 +1416,17 @@ glabel calc_player_damage_enemy /* 1A1610 80272D30 86820180 */ lh $v0, 0x180($s4) .L80272D34: /* 1A1614 80272D34 1C400006 */ bgtz $v0, .L80272D50 -/* 1A1618 80272D38 00000000 */ nop +/* 1A1618 80272D38 00000000 */ nop /* 1A161C 80272D3C 16C00004 */ bnez $s6, .L80272D50 -/* 1A1620 80272D40 00000000 */ nop +/* 1A1620 80272D40 00000000 */ nop /* 1A1624 80272D44 8FA80020 */ lw $t0, 0x20($sp) /* 1A1628 80272D48 11000005 */ beqz $t0, .L80272D60 -/* 1A162C 80272D4C 00000000 */ nop +/* 1A162C 80272D4C 00000000 */ nop .L80272D50: /* 1A1630 80272D50 8FC20000 */ lw $v0, ($fp) /* 1A1634 80272D54 30422000 */ andi $v0, $v0, 0x2000 /* 1A1638 80272D58 10400008 */ beqz $v0, .L80272D7C -/* 1A163C 80272D5C 00000000 */ nop +/* 1A163C 80272D5C 00000000 */ nop .L80272D60: /* 1A1640 80272D60 C6400014 */ lwc1 $f0, 0x14($s2) /* 1A1644 80272D64 2404010C */ addiu $a0, $zero, 0x10c @@ -1433,9 +1439,9 @@ glabel calc_player_damage_enemy /* 1A165C 80272D7C 8E820190 */ lw $v0, 0x190($s4) /* 1A1660 80272D80 30421000 */ andi $v0, $v0, 0x1000 /* 1A1664 80272D84 10400018 */ beqz $v0, .L80272DE8 -/* 1A1668 80272D88 00000000 */ nop +/* 1A1668 80272D88 00000000 */ nop /* 1A166C 80272D8C 12E00016 */ beqz $s7, .L80272DE8 -/* 1A1670 80272D90 00000000 */ nop +/* 1A1670 80272D90 00000000 */ nop /* 1A1674 80272D94 3C048029 */ lui $a0, %hi(DoSleepHit) /* 1A1678 80272D98 248445E0 */ addiu $a0, $a0, %lo(DoSleepHit) /* 1A167C 80272D9C 2405000A */ addiu $a1, $zero, 0xa @@ -1462,9 +1468,9 @@ glabel calc_player_damage_enemy /* 1A16CC 80272DEC 3C030004 */ lui $v1, 4 /* 1A16D0 80272DF0 00431024 */ and $v0, $v0, $v1 /* 1A16D4 80272DF4 10400018 */ beqz $v0, .L80272E58 -/* 1A16D8 80272DF8 00000000 */ nop +/* 1A16D8 80272DF8 00000000 */ nop /* 1A16DC 80272DFC 12E00016 */ beqz $s7, .L80272E58 -/* 1A16E0 80272E00 00000000 */ nop +/* 1A16E0 80272E00 00000000 */ nop /* 1A16E4 80272E04 3C048029 */ lui $a0, %hi(DoDizzyHit) /* 1A16E8 80272E08 248445FC */ addiu $a0, $a0, %lo(DoDizzyHit) /* 1A16EC 80272E0C 2405000A */ addiu $a1, $zero, 0xa @@ -1491,9 +1497,9 @@ glabel calc_player_damage_enemy /* 1A173C 80272E5C 3C030001 */ lui $v1, 1 /* 1A1740 80272E60 00431024 */ and $v0, $v0, $v1 /* 1A1744 80272E64 10400018 */ beqz $v0, .L80272EC8 -/* 1A1748 80272E68 00000000 */ nop +/* 1A1748 80272E68 00000000 */ nop /* 1A174C 80272E6C 12E00016 */ beqz $s7, .L80272EC8 -/* 1A1750 80272E70 00000000 */ nop +/* 1A1750 80272E70 00000000 */ nop /* 1A1754 80272E74 3C048029 */ lui $a0, %hi(DoParalyzeHit) /* 1A1758 80272E78 24844618 */ addiu $a0, $a0, %lo(DoParalyzeHit) /* 1A175C 80272E7C 2405000A */ addiu $a1, $zero, 0xa @@ -1520,9 +1526,9 @@ glabel calc_player_damage_enemy /* 1A17AC 80272ECC 3C030002 */ lui $v1, 2 /* 1A17B0 80272ED0 00431024 */ and $v0, $v0, $v1 /* 1A17B4 80272ED4 10400018 */ beqz $v0, .L80272F38 -/* 1A17B8 80272ED8 00000000 */ nop +/* 1A17B8 80272ED8 00000000 */ nop /* 1A17BC 80272EDC 12E00016 */ beqz $s7, .L80272F38 -/* 1A17C0 80272EE0 00000000 */ nop +/* 1A17C0 80272EE0 00000000 */ nop /* 1A17C4 80272EE4 3C048029 */ lui $a0, %hi(DoPoisonHit) /* 1A17C8 80272EE8 24844634 */ addiu $a0, $a0, %lo(DoPoisonHit) /* 1A17CC 80272EEC 2405000A */ addiu $a1, $zero, 0xa @@ -1549,9 +1555,9 @@ glabel calc_player_damage_enemy /* 1A181C 80272F3C 3C030020 */ lui $v1, 0x20 /* 1A1820 80272F40 00431024 */ and $v0, $v0, $v1 /* 1A1824 80272F44 10400018 */ beqz $v0, .L80272FA8 -/* 1A1828 80272F48 00000000 */ nop +/* 1A1828 80272F48 00000000 */ nop /* 1A182C 80272F4C 12E00016 */ beqz $s7, .L80272FA8 -/* 1A1830 80272F50 00000000 */ nop +/* 1A1830 80272F50 00000000 */ nop /* 1A1834 80272F54 3C048029 */ lui $a0, %hi(DoStopHit) /* 1A1838 80272F58 24844650 */ addiu $a0, $a0, %lo(DoStopHit) /* 1A183C 80272F5C 2405000A */ addiu $a1, $zero, 0xa @@ -1577,9 +1583,9 @@ glabel calc_player_damage_enemy /* 1A1888 80272FA8 8E820190 */ lw $v0, 0x190($s4) /* 1A188C 80272FAC 30424000 */ andi $v0, $v0, 0x4000 /* 1A1890 80272FB0 10400019 */ beqz $v0, .L80273018 -/* 1A1894 80272FB4 00000000 */ nop +/* 1A1894 80272FB4 00000000 */ nop /* 1A1898 80272FB8 12E00017 */ beqz $s7, .L80273018 -/* 1A189C 80272FBC 00000000 */ nop +/* 1A189C 80272FBC 00000000 */ nop /* 1A18A0 80272FC0 3C048029 */ lui $a0, %hi(DoFreezeHit) /* 1A18A4 80272FC4 2484466C */ addiu $a0, $a0, %lo(DoFreezeHit) /* 1A18A8 80272FC8 2405000A */ addiu $a1, $zero, 0xa @@ -1607,9 +1613,9 @@ glabel calc_player_damage_enemy /* 1A18FC 8027301C 3C030008 */ lui $v1, 8 /* 1A1900 80273020 00431024 */ and $v0, $v0, $v1 /* 1A1904 80273024 10400019 */ beqz $v0, .L8027308C -/* 1A1908 80273028 00000000 */ nop +/* 1A1908 80273028 00000000 */ nop /* 1A190C 8027302C 12E00017 */ beqz $s7, .L8027308C -/* 1A1910 80273030 00000000 */ nop +/* 1A1910 80273030 00000000 */ nop /* 1A1914 80273034 3C048029 */ lui $a0, %hi(DoShinkHit) /* 1A1918 80273038 248446B8 */ addiu $a0, $a0, %lo(DoShinkHit) /* 1A191C 8027303C 2405000A */ addiu $a1, $zero, 0xa @@ -1653,7 +1659,7 @@ glabel calc_player_damage_enemy /* 1A19AC 802730CC 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1A19B0 802730D0 30420240 */ andi $v0, $v0, 0x240 /* 1A19B4 802730D4 10400006 */ beqz $v0, .L802730F0 -/* 1A19B8 802730D8 00000000 */ nop +/* 1A19B8 802730D8 00000000 */ nop /* 1A19BC 802730DC 52A00001 */ beql $s5, $zero, .L802730E4 /* 1A19C0 802730E0 24150001 */ addiu $s5, $zero, 1 .L802730E4: @@ -1697,7 +1703,7 @@ glabel calc_player_damage_enemy /* 1A1A4C 8027316C 0000282D */ daddu $a1, $zero, $zero /* 1A1A50 80273170 8FA40018 */ lw $a0, 0x18($sp) /* 1A1A54 80273174 0C09451D */ jal func_80251474 -/* 1A1A58 80273178 00000000 */ nop +/* 1A1A58 80273178 00000000 */ nop /* 1A1A5C 8027317C 24040001 */ addiu $a0, $zero, 1 /* 1A1A60 80273180 0C09CCEA */ jal dispatch_damage_event_player_1 /* 1A1A64 80273184 2405002F */ addiu $a1, $zero, 0x2f diff --git a/asm/nonmatchings/code_197F40/calc_player_test_enemy.s b/asm/nonmatchings/code_197F40/calc_player_test_enemy.s index fdca7b38f4..f626ab0278 100644 --- a/asm/nonmatchings/code_197F40/calc_player_test_enemy.s +++ b/asm/nonmatchings/code_197F40/calc_player_test_enemy.s @@ -27,10 +27,10 @@ glabel calc_player_test_enemy /* 1A008C 802717AC 0220282D */ daddu $a1, $s1, $zero /* 1A0090 802717B0 0040882D */ daddu $s1, $v0, $zero /* 1A0094 802717B4 16200003 */ bnez $s1, .L802717C4 -/* 1A0098 802717B8 00000000 */ nop +/* 1A0098 802717B8 00000000 */ nop .L802717BC: /* 1A009C 802717BC 0809C5EF */ j .L802717BC -/* 1A00A0 802717C0 00000000 */ nop +/* 1A00A0 802717C0 00000000 */ nop .L802717C4: /* 1A00A4 802717C4 8E24007C */ lw $a0, 0x7c($s1) /* 1A00A8 802717C8 30820020 */ andi $v0, $a0, 0x20 @@ -41,11 +41,11 @@ glabel calc_player_test_enemy /* 1A00BC 802717DC 10620007 */ beq $v1, $v0, .L802717FC /* 1A00C0 802717E0 30820800 */ andi $v0, $a0, 0x800 /* 1A00C4 802717E4 10400007 */ beqz $v0, .L80271804 -/* 1A00C8 802717E8 00000000 */ nop +/* 1A00C8 802717E8 00000000 */ nop /* 1A00CC 802717EC 8E420188 */ lw $v0, 0x188($s2) /* 1A00D0 802717F0 30420800 */ andi $v0, $v0, 0x800 /* 1A00D4 802717F4 14400003 */ bnez $v0, .L80271804 -/* 1A00D8 802717F8 00000000 */ nop +/* 1A00D8 802717F8 00000000 */ nop .L802717FC: /* 1A00DC 802717FC 0809C649 */ j .L80271924 /* 1A00E0 80271800 24020006 */ addiu $v0, $zero, 6 @@ -93,7 +93,7 @@ glabel calc_player_test_enemy /* 1A017C 8027189C 8E22007C */ lw $v0, 0x7c($s1) /* 1A0180 802718A0 00431024 */ and $v0, $v0, $v1 /* 1A0184 802718A4 10400017 */ beqz $v0, .L80271904 -/* 1A0188 802718A8 00000000 */ nop +/* 1A0188 802718A8 00000000 */ nop /* 1A018C 802718AC 8E42018C */ lw $v0, 0x18c($s2) /* 1A0190 802718B0 30420004 */ andi $v0, $v0, 4 /* 1A0194 802718B4 14400013 */ bnez $v0, .L80271904 diff --git a/asm/nonmatchings/code_197F40/dispatch_event_player.s b/asm/nonmatchings/code_197F40/dispatch_event_player.s index 1da96774dd..22e6468c67 100644 --- a/asm/nonmatchings/code_197F40/dispatch_event_player.s +++ b/asm/nonmatchings/code_197F40/dispatch_event_player.s @@ -23,13 +23,13 @@ glabel dispatch_event_player /* 19FF80 802716A0 AC400148 */ sw $zero, 0x148($v0) /* 19FF84 802716A4 8E0201D4 */ lw $v0, 0x1d4($s0) /* 19FF88 802716A8 10400004 */ beqz $v0, .L802716BC -/* 19FF8C 802716AC 00000000 */ nop +/* 19FF8C 802716AC 00000000 */ nop /* 19FF90 802716B0 0C0B102B */ jal kill_script_by_ID /* 19FF94 802716B4 8E0401E4 */ lw $a0, 0x1e4($s0) /* 19FF98 802716B8 AE0001D4 */ sw $zero, 0x1d4($s0) .L802716BC: /* 19FF9C 802716BC 12200003 */ beqz $s1, .L802716CC -/* 19FFA0 802716C0 00000000 */ nop +/* 19FFA0 802716C0 00000000 */ nop /* 19FFA4 802716C4 0C0B102B */ jal kill_script_by_ID /* 19FFA8 802716C8 0240202D */ daddu $a0, $s2, $zero .L802716CC: diff --git a/asm/nonmatchings/code_197F40/func_8026E208.s b/asm/nonmatchings/code_197F40/func_8026E208.s index c3de010593..dcb145d69d 100644 --- a/asm/nonmatchings/code_197F40/func_8026E208.s +++ b/asm/nonmatchings/code_197F40/func_8026E208.s @@ -16,7 +16,7 @@ glabel func_8026E208 /* 19CB14 8026E234 10620004 */ beq $v1, $v0, .L8026E248 /* 19CB18 8026E238 2402FFFF */ addiu $v0, $zero, -1 /* 19CB1C 8026E23C 0809B893 */ j .L8026E24C -/* 19CB20 8026E240 00000000 */ nop +/* 19CB20 8026E240 00000000 */ nop .L8026E244: /* 19CB24 8026E244 24020001 */ addiu $v0, $zero, 1 .L8026E248: diff --git a/asm/nonmatchings/code_197F40/func_8026E260.s b/asm/nonmatchings/code_197F40/func_8026E260.s index e7cc029a86..832cdbab80 100644 --- a/asm/nonmatchings/code_197F40/func_8026E260.s +++ b/asm/nonmatchings/code_197F40/func_8026E260.s @@ -18,7 +18,7 @@ glabel func_8026E260 /* 19CB74 8026E294 0240202D */ daddu $a0, $s2, $zero /* 19CB78 8026E298 2402FF81 */ addiu $v0, $zero, -0x7f /* 19CB7C 8026E29C 16220002 */ bne $s1, $v0, .L8026E2A8 -/* 19CB80 8026E2A0 00000000 */ nop +/* 19CB80 8026E2A0 00000000 */ nop /* 19CB84 8026E2A4 8E510148 */ lw $s1, 0x148($s2) .L8026E2A8: /* 19CB88 8026E2A8 0C09A75B */ jal get_actor diff --git a/asm/nonmatchings/code_197F40/func_8026E558.s b/asm/nonmatchings/code_197F40/func_8026E558.s index e80967e003..2024b2f1a3 100644 --- a/asm/nonmatchings/code_197F40/func_8026E558.s +++ b/asm/nonmatchings/code_197F40/func_8026E558.s @@ -33,7 +33,7 @@ glabel func_8026E558 /* 19CEA4 8026E5C4 C4840144 */ lwc1 $f4, 0x144($a0) /* 19CEA8 8026E5C8 C486014C */ lwc1 $f6, 0x14c($a0) /* 19CEAC 8026E5CC 4600103C */ c.lt.s $f2, $f0 -/* 19CEB0 8026E5D0 00000000 */ nop +/* 19CEB0 8026E5D0 00000000 */ nop /* 19CEB4 8026E5D4 45000003 */ bc1f .L8026E5E4 /* 19CEB8 8026E5D8 2406FFFF */ addiu $a2, $zero, -1 /* 19CEBC 8026E5DC 0809B988 */ j .L8026E620 @@ -41,64 +41,64 @@ glabel func_8026E558 .L8026E5E4: /* 19CEC4 8026E5E4 3C0142AA */ lui $at, 0x42aa /* 19CEC8 8026E5E8 44810000 */ mtc1 $at, $f0 -/* 19CECC 8026E5EC 00000000 */ nop +/* 19CECC 8026E5EC 00000000 */ nop /* 19CED0 8026E5F0 4600103C */ c.lt.s $f2, $f0 -/* 19CED4 8026E5F4 00000000 */ nop +/* 19CED4 8026E5F4 00000000 */ nop /* 19CED8 8026E5F8 45010009 */ bc1t .L8026E620 /* 19CEDC 8026E5FC 24080001 */ addiu $t0, $zero, 1 /* 19CEE0 8026E600 3C0142C8 */ lui $at, 0x42c8 /* 19CEE4 8026E604 44810000 */ mtc1 $at, $f0 -/* 19CEE8 8026E608 00000000 */ nop +/* 19CEE8 8026E608 00000000 */ nop /* 19CEEC 8026E60C 4600103C */ c.lt.s $f2, $f0 -/* 19CEF0 8026E610 00000000 */ nop +/* 19CEF0 8026E610 00000000 */ nop /* 19CEF4 8026E614 45000002 */ bc1f .L8026E620 /* 19CEF8 8026E618 24080003 */ addiu $t0, $zero, 3 /* 19CEFC 8026E61C 24080002 */ addiu $t0, $zero, 2 .L8026E620: /* 19CF00 8026E620 3C0141C8 */ lui $at, 0x41c8 /* 19CF04 8026E624 44810000 */ mtc1 $at, $f0 -/* 19CF08 8026E628 00000000 */ nop +/* 19CF08 8026E628 00000000 */ nop /* 19CF0C 8026E62C 4600203C */ c.lt.s $f4, $f0 -/* 19CF10 8026E630 00000000 */ nop +/* 19CF10 8026E630 00000000 */ nop /* 19CF14 8026E634 45010010 */ bc1t .L8026E678 /* 19CF18 8026E638 0000282D */ daddu $a1, $zero, $zero /* 19CF1C 8026E63C 3C014282 */ lui $at, 0x4282 /* 19CF20 8026E640 44810000 */ mtc1 $at, $f0 -/* 19CF24 8026E644 00000000 */ nop +/* 19CF24 8026E644 00000000 */ nop /* 19CF28 8026E648 4600203C */ c.lt.s $f4, $f0 -/* 19CF2C 8026E64C 00000000 */ nop +/* 19CF2C 8026E64C 00000000 */ nop /* 19CF30 8026E650 45010009 */ bc1t .L8026E678 /* 19CF34 8026E654 24050001 */ addiu $a1, $zero, 1 /* 19CF38 8026E658 3C0142D2 */ lui $at, 0x42d2 /* 19CF3C 8026E65C 44810000 */ mtc1 $at, $f0 -/* 19CF40 8026E660 00000000 */ nop +/* 19CF40 8026E660 00000000 */ nop /* 19CF44 8026E664 4600203C */ c.lt.s $f4, $f0 -/* 19CF48 8026E668 00000000 */ nop +/* 19CF48 8026E668 00000000 */ nop /* 19CF4C 8026E66C 45000002 */ bc1f .L8026E678 /* 19CF50 8026E670 24050003 */ addiu $a1, $zero, 3 /* 19CF54 8026E674 24050002 */ addiu $a1, $zero, 2 .L8026E678: /* 19CF58 8026E678 3C01C1F0 */ lui $at, 0xc1f0 /* 19CF5C 8026E67C 44810000 */ mtc1 $at, $f0 -/* 19CF60 8026E680 00000000 */ nop +/* 19CF60 8026E680 00000000 */ nop /* 19CF64 8026E684 4600303C */ c.lt.s $f6, $f0 -/* 19CF68 8026E688 00000000 */ nop +/* 19CF68 8026E688 00000000 */ nop /* 19CF6C 8026E68C 45000002 */ bc1f .L8026E698 /* 19CF70 8026E690 24070001 */ addiu $a3, $zero, 1 /* 19CF74 8026E694 0000382D */ daddu $a3, $zero, $zero .L8026E698: /* 19CF78 8026E698 1240000C */ beqz $s2, .L8026E6CC -/* 19CF7C 8026E69C 00000000 */ nop +/* 19CF7C 8026E69C 00000000 */ nop /* 19CF80 8026E6A0 1E400006 */ bgtz $s2, .L8026E6BC /* 19CF84 8026E6A4 24020001 */ addiu $v0, $zero, 1 /* 19CF88 8026E6A8 2402FFFF */ addiu $v0, $zero, -1 /* 19CF8C 8026E6AC 12420045 */ beq $s2, $v0, .L8026E7C4 -/* 19CF90 8026E6B0 00000000 */ nop +/* 19CF90 8026E6B0 00000000 */ nop /* 19CF94 8026E6B4 0809BA0F */ j .L8026E83C /* 19CF98 8026E6B8 0260202D */ daddu $a0, $s3, $zero .L8026E6BC: /* 19CF9C 8026E6BC 12420022 */ beq $s2, $v0, .L8026E748 -/* 19CFA0 8026E6C0 00000000 */ nop +/* 19CFA0 8026E6C0 00000000 */ nop /* 19CFA4 8026E6C4 0809BA0F */ j .L8026E83C /* 19CFA8 8026E6C8 0260202D */ daddu $a0, $s3, $zero .L8026E6CC: @@ -123,7 +123,7 @@ glabel func_8026E558 /* 19CFF0 8026E710 80620012 */ lb $v0, 0x12($v1) /* 19CFF4 8026E714 0048102A */ slt $v0, $v0, $t0 /* 19CFF8 8026E718 10400006 */ beqz $v0, .L8026E734 -/* 19CFFC 8026E71C 00000000 */ nop +/* 19CFFC 8026E71C 00000000 */ nop /* 19D000 8026E720 94620000 */ lhu $v0, ($v1) /* 19D004 8026E724 A4820428 */ sh $v0, 0x428($a0) /* 19D008 8026E728 90620003 */ lbu $v0, 3($v1) @@ -157,7 +157,7 @@ glabel func_8026E558 /* 19D06C 8026E78C 80620012 */ lb $v0, 0x12($v1) /* 19D070 8026E790 0048102A */ slt $v0, $v0, $t0 /* 19D074 8026E794 10400006 */ beqz $v0, .L8026E7B0 -/* 19D078 8026E798 00000000 */ nop +/* 19D078 8026E798 00000000 */ nop /* 19D07C 8026E79C 94620000 */ lhu $v0, ($v1) /* 19D080 8026E7A0 A4820428 */ sh $v0, 0x428($a0) /* 19D084 8026E7A4 90620003 */ lbu $v0, 3($v1) @@ -191,7 +191,7 @@ glabel func_8026E558 /* 19D0E8 8026E808 80620012 */ lb $v0, 0x12($v1) /* 19D0EC 8026E80C 0048102A */ slt $v0, $v0, $t0 /* 19D0F0 8026E810 10400006 */ beqz $v0, .L8026E82C -/* 19D0F4 8026E814 00000000 */ nop +/* 19D0F4 8026E814 00000000 */ nop /* 19D0F8 8026E818 94620000 */ lhu $v0, ($v1) /* 19D0FC 8026E81C A4820428 */ sh $v0, 0x428($a0) /* 19D100 8026E820 90620003 */ lbu $v0, 3($v1) diff --git a/asm/nonmatchings/code_197F40/func_8026EA7C.s b/asm/nonmatchings/code_197F40/func_8026EA7C.s index 792e2a33e4..d983a33b17 100644 --- a/asm/nonmatchings/code_197F40/func_8026EA7C.s +++ b/asm/nonmatchings/code_197F40/func_8026EA7C.s @@ -25,7 +25,7 @@ glabel func_8026EA7C /* 19D3AC 8026EACC 0040982D */ daddu $s3, $v0, $zero /* 19D3B0 8026EAD0 2402FF81 */ addiu $v0, $zero, -0x7f /* 19D3B4 8026EAD4 16220002 */ bne $s1, $v0, .L8026EAE0 -/* 19D3B8 8026EAD8 00000000 */ nop +/* 19D3B8 8026EAD8 00000000 */ nop /* 19D3BC 8026EADC 8E510148 */ lw $s1, 0x148($s2) .L8026EAE0: /* 19D3C0 8026EAE0 0C09A75B */ jal get_actor diff --git a/asm/nonmatchings/code_197F40/func_8026EB20.s b/asm/nonmatchings/code_197F40/func_8026EB20.s index 947abbb3d8..eca04b7bc4 100644 --- a/asm/nonmatchings/code_197F40/func_8026EB20.s +++ b/asm/nonmatchings/code_197F40/func_8026EB20.s @@ -21,7 +21,7 @@ glabel func_8026EB20 /* 19D440 8026EB60 0040982D */ daddu $s3, $v0, $zero /* 19D444 8026EB64 2402FF81 */ addiu $v0, $zero, -0x7f /* 19D448 8026EB68 16020002 */ bne $s0, $v0, .L8026EB74 -/* 19D44C 8026EB6C 00000000 */ nop +/* 19D44C 8026EB6C 00000000 */ nop /* 19D450 8026EB70 8E500148 */ lw $s0, 0x148($s2) .L8026EB74: /* 19D454 8026EB74 0C09A75B */ jal get_actor diff --git a/asm/nonmatchings/code_197F40/func_8026EBF8.s b/asm/nonmatchings/code_197F40/func_8026EBF8.s index 1f6f589c39..b096a68993 100644 --- a/asm/nonmatchings/code_197F40/func_8026EBF8.s +++ b/asm/nonmatchings/code_197F40/func_8026EBF8.s @@ -21,7 +21,7 @@ glabel func_8026EBF8 /* 19D518 8026EC38 0040982D */ daddu $s3, $v0, $zero /* 19D51C 8026EC3C 2402FF81 */ addiu $v0, $zero, -0x7f /* 19D520 8026EC40 16020002 */ bne $s0, $v0, .L8026EC4C -/* 19D524 8026EC44 00000000 */ nop +/* 19D524 8026EC44 00000000 */ nop /* 19D528 8026EC48 8E500148 */ lw $s0, 0x148($s2) .L8026EC4C: /* 19D52C 8026EC4C 0C09A75B */ jal get_actor diff --git a/asm/nonmatchings/code_197F40/func_8026ED20.s b/asm/nonmatchings/code_197F40/func_8026ED20.s index eae78b2c76..9eccdf80cb 100644 --- a/asm/nonmatchings/code_197F40/func_8026ED20.s +++ b/asm/nonmatchings/code_197F40/func_8026ED20.s @@ -25,7 +25,7 @@ glabel func_8026ED20 /* 19D650 8026ED70 0040982D */ daddu $s3, $v0, $zero /* 19D654 8026ED74 2402FF81 */ addiu $v0, $zero, -0x7f /* 19D658 8026ED78 16220002 */ bne $s1, $v0, .L8026ED84 -/* 19D65C 8026ED7C 00000000 */ nop +/* 19D65C 8026ED7C 00000000 */ nop /* 19D660 8026ED80 8E510148 */ lw $s1, 0x148($s2) .L8026ED84: /* 19D664 8026ED84 0C09A75B */ jal get_actor diff --git a/asm/nonmatchings/code_197F40/func_8026EDE4.s b/asm/nonmatchings/code_197F40/func_8026EDE4.s index 851b21b96e..09320b6237 100644 --- a/asm/nonmatchings/code_197F40/func_8026EDE4.s +++ b/asm/nonmatchings/code_197F40/func_8026EDE4.s @@ -25,7 +25,7 @@ glabel func_8026EDE4 /* 19D714 8026EE34 0040982D */ daddu $s3, $v0, $zero /* 19D718 8026EE38 2402FF81 */ addiu $v0, $zero, -0x7f /* 19D71C 8026EE3C 16220002 */ bne $s1, $v0, .L8026EE48 -/* 19D720 8026EE40 00000000 */ nop +/* 19D720 8026EE40 00000000 */ nop /* 19D724 8026EE44 8E510148 */ lw $s1, 0x148($s2) .L8026EE48: /* 19D728 8026EE48 0C09A75B */ jal get_actor diff --git a/asm/nonmatchings/code_197F40/func_8026F1A0.s b/asm/nonmatchings/code_197F40/func_8026F1A0.s index c364bf7c69..6985ae4a36 100644 --- a/asm/nonmatchings/code_197F40/func_8026F1A0.s +++ b/asm/nonmatchings/code_197F40/func_8026F1A0.s @@ -19,7 +19,7 @@ glabel func_8026F1A0 /* 19DAB8 8026F1D8 0040802D */ daddu $s0, $v0, $zero /* 19DABC 8026F1DC 2402FF81 */ addiu $v0, $zero, -0x7f /* 19DAC0 8026F1E0 16220002 */ bne $s1, $v0, .L8026F1EC -/* 19DAC4 8026F1E4 00000000 */ nop +/* 19DAC4 8026F1E4 00000000 */ nop /* 19DAC8 8026F1E8 8E510148 */ lw $s1, 0x148($s2) .L8026F1EC: /* 19DACC 8026F1EC 0C09A75B */ jal get_actor diff --git a/asm/nonmatchings/code_197F40/func_80271484.s b/asm/nonmatchings/code_197F40/func_80271484.s index 76a9c20303..978377ece7 100644 --- a/asm/nonmatchings/code_197F40/func_80271484.s +++ b/asm/nonmatchings/code_197F40/func_80271484.s @@ -32,11 +32,11 @@ glabel func_80271484 /* 19FDD0 802714F0 AFB2001C */ sw $s2, 0x1c($sp) /* 19FDD4 802714F4 AFB10020 */ sw $s1, 0x20($sp) /* 19FDD8 802714F8 4483B000 */ mtc1 $v1, $f22 -/* 19FDDC 802714FC 00000000 */ nop +/* 19FDDC 802714FC 00000000 */ nop /* 19FDE0 80271500 4680B5A0 */ cvt.s.w $f22, $f22 /* 19FDE4 80271504 00021042 */ srl $v0, $v0, 1 /* 19FDE8 80271508 4482A000 */ mtc1 $v0, $f20 -/* 19FDEC 8027150C 00000000 */ nop +/* 19FDEC 8027150C 00000000 */ nop /* 19FDF0 80271510 4680A520 */ cvt.s.w $f20, $f20 /* 19FDF4 80271514 E7B60010 */ swc1 $f22, 0x10($sp) /* 19FDF8 80271518 0C01C8D4 */ jal func_80072350 diff --git a/asm/nonmatchings/code_197F40/func_80271588.s b/asm/nonmatchings/code_197F40/func_80271588.s index d94997880a..015d1789d5 100644 --- a/asm/nonmatchings/code_197F40/func_80271588.s +++ b/asm/nonmatchings/code_197F40/func_80271588.s @@ -22,7 +22,7 @@ glabel func_80271588 /* 19FEA8 802715C8 00621821 */ addu $v1, $v1, $v0 /* 19FEAC 802715CC 2463FFF1 */ addiu $v1, $v1, -0xf /* 19FEB0 802715D0 4483A000 */ mtc1 $v1, $f20 -/* 19FEB4 802715D4 00000000 */ nop +/* 19FEB4 802715D4 00000000 */ nop /* 19FEB8 802715D8 4680A520 */ cvt.s.w $f20, $f20 /* 19FEBC 802715DC 0C00A67F */ jal rand_int /* 19FEC0 802715E0 26100001 */ addiu $s0, $s0, 1 @@ -33,11 +33,11 @@ glabel func_80271588 /* 19FED4 802715F4 2463FFF1 */ addiu $v1, $v1, -0xf /* 19FED8 802715F8 24E70005 */ addiu $a3, $a3, 5 /* 19FEDC 802715FC 44830000 */ mtc1 $v1, $f0 -/* 19FEE0 80271600 00000000 */ nop +/* 19FEE0 80271600 00000000 */ nop /* 19FEE4 80271604 46800020 */ cvt.s.w $f0, $f0 /* 19FEE8 80271608 44060000 */ mfc1 $a2, $f0 /* 19FEEC 8027160C 44870000 */ mtc1 $a3, $f0 -/* 19FEF0 80271610 00000000 */ nop +/* 19FEF0 80271610 00000000 */ nop /* 19FEF4 80271614 46800020 */ cvt.s.w $f0, $f0 /* 19FEF8 80271618 44070000 */ mfc1 $a3, $f0 /* 19FEFC 8027161C 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/code_197F40/func_80273444.s b/asm/nonmatchings/code_197F40/func_80273444.s index 6f797a2deb..e53c8bc692 100644 --- a/asm/nonmatchings/code_197F40/func_80273444.s +++ b/asm/nonmatchings/code_197F40/func_80273444.s @@ -24,7 +24,7 @@ glabel func_80273444 .L80273490: /* 1A1D70 80273490 8E620070 */ lw $v0, 0x70($s3) /* 1A1D74 80273494 14400081 */ bnez $v0, .L8027369C -/* 1A1D78 80273498 00000000 */ nop +/* 1A1D78 80273498 00000000 */ nop /* 1A1D7C 8027349C 8E050000 */ lw $a1, ($s0) /* 1A1D80 802734A0 26100004 */ addiu $s0, $s0, 4 /* 1A1D84 802734A4 0C0B1EAF */ jal get_variable @@ -71,29 +71,29 @@ glabel func_80273444 /* 1A1E28 80273548 46002003 */ div.s $f0, $f4, $f0 /* 1A1E2C 8027354C 4600028D */ trunc.w.s $f10, $f0 /* 1A1E30 80273550 44035000 */ mfc1 $v1, $f10 -/* 1A1E34 80273554 00000000 */ nop +/* 1A1E34 80273554 00000000 */ nop /* 1A1E38 80273558 00031400 */ sll $v0, $v1, 0x10 /* 1A1E3C 8027355C 00021403 */ sra $v0, $v0, 0x10 /* 1A1E40 80273560 44820000 */ mtc1 $v0, $f0 -/* 1A1E44 80273564 00000000 */ nop +/* 1A1E44 80273564 00000000 */ nop /* 1A1E48 80273568 46800020 */ cvt.s.w $f0, $f0 /* 1A1E4C 8027356C 46020002 */ mul.s $f0, $f0, $f2 -/* 1A1E50 80273570 00000000 */ nop +/* 1A1E50 80273570 00000000 */ nop /* 1A1E54 80273574 46002086 */ mov.s $f2, $f4 /* 1A1E58 80273578 A6430070 */ sh $v1, 0x70($s2) /* 1A1E5C 8027357C 0809CD6E */ j .L802735B8 /* 1A1E60 80273580 46001201 */ sub.s $f8, $f2, $f0 .L80273584: /* 1A1E64 80273584 44821000 */ mtc1 $v0, $f2 -/* 1A1E68 80273588 00000000 */ nop +/* 1A1E68 80273588 00000000 */ nop /* 1A1E6C 8027358C 468010A0 */ cvt.s.w $f2, $f2 /* 1A1E70 80273590 86420070 */ lh $v0, 0x70($s2) /* 1A1E74 80273594 46022083 */ div.s $f2, $f4, $f2 /* 1A1E78 80273598 44820000 */ mtc1 $v0, $f0 -/* 1A1E7C 8027359C 00000000 */ nop +/* 1A1E7C 8027359C 00000000 */ nop /* 1A1E80 802735A0 46800020 */ cvt.s.w $f0, $f0 /* 1A1E84 802735A4 46020002 */ mul.s $f0, $f0, $f2 -/* 1A1E88 802735A8 00000000 */ nop +/* 1A1E88 802735A8 00000000 */ nop /* 1A1E8C 802735AC C6440058 */ lwc1 $f4, 0x58($s2) /* 1A1E90 802735B0 E642004C */ swc1 $f2, 0x4c($s2) /* 1A1E94 802735B4 46002201 */ sub.s $f8, $f4, $f0 @@ -101,15 +101,15 @@ glabel func_80273444 /* 1A1E98 802735B8 86220064 */ lh $v0, 0x64($s1) /* 1A1E9C 802735BC C622003C */ lwc1 $f2, 0x3c($s1) /* 1A1EA0 802735C0 44823000 */ mtc1 $v0, $f6 -/* 1A1EA4 802735C4 00000000 */ nop +/* 1A1EA4 802735C4 00000000 */ nop /* 1A1EA8 802735C8 468031A0 */ cvt.s.w $f6, $f6 /* 1A1EAC 802735CC 46061082 */ mul.s $f2, $f2, $f6 -/* 1A1EB0 802735D0 00000000 */ nop +/* 1A1EB0 802735D0 00000000 */ nop /* 1A1EB4 802735D4 3C013F00 */ lui $at, 0x3f00 /* 1A1EB8 802735D8 44810000 */ mtc1 $at, $f0 -/* 1A1EBC 802735DC 00000000 */ nop +/* 1A1EBC 802735DC 00000000 */ nop /* 1A1EC0 802735E0 46001082 */ mul.s $f2, $f2, $f0 -/* 1A1EC4 802735E4 00000000 */ nop +/* 1A1EC4 802735E4 00000000 */ nop /* 1A1EC8 802735E8 0000202D */ daddu $a0, $zero, $zero /* 1A1ECC 802735EC C6240040 */ lwc1 $f4, 0x40($s1) /* 1A1ED0 802735F0 46003006 */ mov.s $f0, $f6 @@ -132,7 +132,7 @@ glabel func_80273444 /* 1A1F10 80273630 14610004 */ bne $v1, $at, .L80273644 /* 1A1F14 80273634 3C018000 */ lui $at, 0x8000 /* 1A1F18 80273638 14410002 */ bne $v0, $at, .L80273644 -/* 1A1F1C 8027363C 00000000 */ nop +/* 1A1F1C 8027363C 00000000 */ nop /* 1A1F20 80273640 0006000D */ break 6 .L80273644: /* 1A1F24 80273644 00001012 */ mflo $v0 @@ -142,7 +142,7 @@ glabel func_80273444 /* 1A1F34 80273654 E6200024 */ swc1 $f0, 0x24($s1) /* 1A1F38 80273658 E622002C */ swc1 $f2, 0x2c($s1) /* 1A1F3C 8027365C 44820000 */ mtc1 $v0, $f0 -/* 1A1F40 80273660 00000000 */ nop +/* 1A1F40 80273660 00000000 */ nop /* 1A1F44 80273664 46800020 */ cvt.s.w $f0, $f0 /* 1A1F48 80273668 E6200028 */ swc1 $f0, 0x28($s1) /* 1A1F4C 8027366C 8E630074 */ lw $v1, 0x74($s3) @@ -161,9 +161,9 @@ glabel func_80273444 .L8027369C: /* 1A1F7C 8027369C C6220044 */ lwc1 $f2, 0x44($s1) /* 1A1F80 802736A0 44800000 */ mtc1 $zero, $f0 -/* 1A1F84 802736A4 00000000 */ nop +/* 1A1F84 802736A4 00000000 */ nop /* 1A1F88 802736A8 4600103C */ c.lt.s $f2, $f0 -/* 1A1F8C 802736AC 00000000 */ nop +/* 1A1F8C 802736AC 00000000 */ nop /* 1A1F90 802736B0 45000004 */ bc1f .L802736C4 /* 1A1F94 802736B4 0000202D */ daddu $a0, $zero, $zero /* 1A1F98 802736B8 8E26005C */ lw $a2, 0x5c($s1) @@ -178,19 +178,19 @@ glabel func_80273444 /* 1A1FB8 802736D8 1440001D */ bnez $v0, .L80273750 /* 1A1FBC 802736DC 24020002 */ addiu $v0, $zero, 2 /* 1A1FC0 802736E0 1062000C */ beq $v1, $v0, .L80273714 -/* 1A1FC4 802736E4 00000000 */ nop +/* 1A1FC4 802736E4 00000000 */ nop /* 1A1FC8 802736E8 0809CDD4 */ j .L80273750 -/* 1A1FCC 802736EC 00000000 */ nop +/* 1A1FCC 802736EC 00000000 */ nop .L802736F0: /* 1A1FD0 802736F0 C6200004 */ lwc1 $f0, 4($s1) /* 1A1FD4 802736F4 C622002C */ lwc1 $f2, 0x2c($s1) /* 1A1FD8 802736F8 46020001 */ sub.s $f0, $f0, $f2 /* 1A1FDC 802736FC 3C014234 */ lui $at, 0x4234 /* 1A1FE0 80273700 44811000 */ mtc1 $at, $f2 -/* 1A1FE4 80273704 00000000 */ nop +/* 1A1FE4 80273704 00000000 */ nop /* 1A1FE8 80273708 4600103C */ c.lt.s $f2, $f0 /* 1A1FEC 8027370C 0809CDCD */ j .L80273734 -/* 1A1FF0 80273710 00000000 */ nop +/* 1A1FF0 80273710 00000000 */ nop .L80273714: /* 1A1FF4 80273714 C6200004 */ lwc1 $f0, 4($s1) /* 1A1FF8 80273718 C622002C */ lwc1 $f2, 0x2c($s1) @@ -199,15 +199,15 @@ glabel func_80273444 /* 1A2004 80273724 D422D898 */ ldc1 $f2, %lo(D_8029D898)($at) /* 1A2008 80273728 46000021 */ cvt.d.s $f0, $f0 /* 1A200C 8027372C 4620103C */ c.lt.d $f2, $f0 -/* 1A2010 80273730 00000000 */ nop +/* 1A2010 80273730 00000000 */ nop .L80273734: /* 1A2014 80273734 45000006 */ bc1f .L80273750 -/* 1A2018 80273738 00000000 */ nop +/* 1A2018 80273738 00000000 */ nop /* 1A201C 8027373C 3C013E80 */ lui $at, 0x3e80 /* 1A2020 80273740 44810000 */ mtc1 $at, $f0 -/* 1A2024 80273744 00000000 */ nop +/* 1A2024 80273744 00000000 */ nop /* 1A2028 80273748 46003182 */ mul.s $f6, $f6, $f0 -/* 1A202C 8027374C 00000000 */ nop +/* 1A202C 8027374C 00000000 */ nop .L80273750: /* 1A2030 80273750 C6240004 */ lwc1 $f4, 4($s1) /* 1A2034 80273754 C6220044 */ lwc1 $f2, 0x44($s1) @@ -220,7 +220,7 @@ glabel func_80273444 /* 1A2050 80273770 44810000 */ mtc1 $at, $f0 /* 1A2054 80273774 C6340040 */ lwc1 $f20, 0x40($s1) /* 1A2058 80273778 46006302 */ mul.s $f12, $f12, $f0 -/* 1A205C 8027377C 00000000 */ nop +/* 1A205C 8027377C 00000000 */ nop /* 1A2060 80273780 3C0143B4 */ lui $at, 0x43b4 /* 1A2064 80273784 44810000 */ mtc1 $at, $f0 /* 1A2068 80273788 4600A521 */ cvt.d.s $f20, $f20 diff --git a/asm/nonmatchings/code_197F40/func_80274A18.s b/asm/nonmatchings/code_197F40/func_80274A18.s index 08f8a1ee3c..6f9b0a18a1 100644 --- a/asm/nonmatchings/code_197F40/func_80274A18.s +++ b/asm/nonmatchings/code_197F40/func_80274A18.s @@ -38,7 +38,7 @@ glabel func_80274A18 .L80274A9C: /* 1A337C 80274A9C 8E620070 */ lw $v0, 0x70($s3) /* 1A3380 80274AA0 144000FC */ bnez $v0, .L80274E94 -/* 1A3384 80274AA4 00000000 */ nop +/* 1A3384 80274AA4 00000000 */ nop /* 1A3388 80274AA8 C6400144 */ lwc1 $f0, 0x144($s2) /* 1A338C 80274AAC C618000C */ lwc1 $f24, 0xc($s0) /* 1A3390 80274AB0 C61A0014 */ lwc1 $f26, 0x14($s0) @@ -68,29 +68,29 @@ glabel func_80274A18 /* 1A33F0 80274B10 46002003 */ div.s $f0, $f4, $f0 /* 1A33F4 80274B14 4600028D */ trunc.w.s $f10, $f0 /* 1A33F8 80274B18 44035000 */ mfc1 $v1, $f10 -/* 1A33FC 80274B1C 00000000 */ nop +/* 1A33FC 80274B1C 00000000 */ nop /* 1A3400 80274B20 00031400 */ sll $v0, $v1, 0x10 /* 1A3404 80274B24 00021403 */ sra $v0, $v0, 0x10 /* 1A3408 80274B28 44820000 */ mtc1 $v0, $f0 -/* 1A340C 80274B2C 00000000 */ nop +/* 1A340C 80274B2C 00000000 */ nop /* 1A3410 80274B30 46800020 */ cvt.s.w $f0, $f0 /* 1A3414 80274B34 46020002 */ mul.s $f0, $f0, $f2 -/* 1A3418 80274B38 00000000 */ nop +/* 1A3418 80274B38 00000000 */ nop /* 1A341C 80274B3C 46002086 */ mov.s $f2, $f4 /* 1A3420 80274B40 A6030064 */ sh $v1, 0x64($s0) /* 1A3424 80274B44 0809D2E0 */ j .L80274B80 /* 1A3428 80274B48 46001201 */ sub.s $f8, $f2, $f0 .L80274B4C: /* 1A342C 80274B4C 44821000 */ mtc1 $v0, $f2 -/* 1A3430 80274B50 00000000 */ nop +/* 1A3430 80274B50 00000000 */ nop /* 1A3434 80274B54 468010A0 */ cvt.s.w $f2, $f2 /* 1A3438 80274B58 86020064 */ lh $v0, 0x64($s0) /* 1A343C 80274B5C 46022083 */ div.s $f2, $f4, $f2 /* 1A3440 80274B60 44820000 */ mtc1 $v0, $f0 -/* 1A3444 80274B64 00000000 */ nop +/* 1A3444 80274B64 00000000 */ nop /* 1A3448 80274B68 46800020 */ cvt.s.w $f0, $f0 /* 1A344C 80274B6C 46020002 */ mul.s $f0, $f0, $f2 -/* 1A3450 80274B70 00000000 */ nop +/* 1A3450 80274B70 00000000 */ nop /* 1A3454 80274B74 C604004C */ lwc1 $f4, 0x4c($s0) /* 1A3458 80274B78 E6020040 */ swc1 $f2, 0x40($s0) /* 1A345C 80274B7C 46002201 */ sub.s $f8, $f4, $f0 @@ -105,13 +105,13 @@ glabel func_80274A18 /* 1A347C 80274B9C 44810000 */ mtc1 $at, $f0 /* 1A3480 80274BA0 C6040000 */ lwc1 $f4, ($s0) /* 1A3484 80274BA4 44823000 */ mtc1 $v0, $f6 -/* 1A3488 80274BA8 00000000 */ nop +/* 1A3488 80274BA8 00000000 */ nop /* 1A348C 80274BAC 468031A0 */ cvt.s.w $f6, $f6 /* 1A3490 80274BB0 46060003 */ div.s $f0, $f0, $f6 /* 1A3494 80274BB4 46041081 */ sub.s $f2, $f2, $f4 /* 1A3498 80274BB8 E600003C */ swc1 $f0, 0x3c($s0) /* 1A349C 80274BBC 44830000 */ mtc1 $v1, $f0 -/* 1A34A0 80274BC0 00000000 */ nop +/* 1A34A0 80274BC0 00000000 */ nop /* 1A34A4 80274BC4 46800020 */ cvt.s.w $f0, $f0 /* 1A34A8 80274BC8 46001083 */ div.s $f2, $f2, $f0 /* 1A34AC 80274BCC C6000010 */ lwc1 $f0, 0x10($s0) @@ -145,7 +145,7 @@ glabel func_80274A18 /* 1A3518 80274C38 14410004 */ bne $v0, $at, .L80274C4C /* 1A351C 80274C3C 3C018000 */ lui $at, 0x8000 /* 1A3520 80274C40 14610002 */ bne $v1, $at, .L80274C4C -/* 1A3524 80274C44 00000000 */ nop +/* 1A3524 80274C44 00000000 */ nop /* 1A3528 80274C48 0006000D */ break 6 .L80274C4C: /* 1A352C 80274C4C 00001812 */ mflo $v1 @@ -170,7 +170,7 @@ glabel func_80274A18 /* 1A3578 80274C98 44811000 */ mtc1 $at, $f2 /* 1A357C 80274C9C 46200220 */ cvt.s.d $f8, $f0 /* 1A3580 80274CA0 44830000 */ mtc1 $v1, $f0 -/* 1A3584 80274CA4 00000000 */ nop +/* 1A3584 80274CA4 00000000 */ nop /* 1A3588 80274CA8 46800020 */ cvt.s.w $f0, $f0 /* 1A358C 80274CAC 86030066 */ lh $v1, 0x66($s0) /* 1A3590 80274CB0 24020002 */ addiu $v0, $zero, 2 @@ -182,7 +182,7 @@ glabel func_80274A18 /* 1A35A8 80274CC8 D422D8A8 */ ldc1 $f2, %lo(D_8029D8A8)($at) /* 1A35AC 80274CCC 46004021 */ cvt.d.s $f0, $f8 /* 1A35B0 80274CD0 46220002 */ mul.d $f0, $f0, $f2 -/* 1A35B4 80274CD4 00000000 */ nop +/* 1A35B4 80274CD4 00000000 */ nop /* 1A35B8 80274CD8 46200020 */ cvt.s.d $f0, $f0 /* 1A35BC 80274CDC E6000050 */ swc1 $f0, 0x50($s0) .L80274CE0: @@ -194,7 +194,7 @@ glabel func_80274A18 /* 1A35D4 80274CF4 C616003C */ lwc1 $f22, 0x3c($s0) /* 1A35D8 80274CF8 AE000018 */ sw $zero, 0x18($s0) /* 1A35DC 80274CFC 46006302 */ mul.s $f12, $f12, $f0 -/* 1A35E0 80274D00 00000000 */ nop +/* 1A35E0 80274D00 00000000 */ nop /* 1A35E4 80274D04 AE00001C */ sw $zero, 0x1c($s0) /* 1A35E8 80274D08 4600A521 */ cvt.d.s $f20, $f20 /* 1A35EC 80274D0C 3C0143B4 */ lui $at, 0x43b4 @@ -217,7 +217,7 @@ glabel func_80274A18 /* 1A3628 80274D48 14410004 */ bne $v0, $at, .L80274D5C /* 1A362C 80274D4C 3C018000 */ lui $at, 0x8000 /* 1A3630 80274D50 14610002 */ bne $v1, $at, .L80274D5C -/* 1A3634 80274D54 00000000 */ nop +/* 1A3634 80274D54 00000000 */ nop /* 1A3638 80274D58 0006000D */ break 6 .L80274D5C: /* 1A363C 80274D5C 00001812 */ mflo $v1 @@ -242,7 +242,7 @@ glabel func_80274A18 /* 1A3688 80274DA8 44811000 */ mtc1 $at, $f2 /* 1A368C 80274DAC 46200220 */ cvt.s.d $f8, $f0 /* 1A3690 80274DB0 44830000 */ mtc1 $v1, $f0 -/* 1A3694 80274DB4 00000000 */ nop +/* 1A3694 80274DB4 00000000 */ nop /* 1A3698 80274DB8 46800020 */ cvt.s.w $f0, $f0 /* 1A369C 80274DBC 86030066 */ lh $v1, 0x66($s0) /* 1A36A0 80274DC0 24020004 */ addiu $v0, $zero, 4 @@ -255,7 +255,7 @@ glabel func_80274A18 /* 1A36BC 80274DDC 44801000 */ mtc1 $zero, $f2 /* 1A36C0 80274DE0 46004021 */ cvt.d.s $f0, $f8 /* 1A36C4 80274DE4 46220002 */ mul.d $f0, $f0, $f2 -/* 1A36C8 80274DE8 00000000 */ nop +/* 1A36C8 80274DE8 00000000 */ nop /* 1A36CC 80274DEC 46200020 */ cvt.s.d $f0, $f0 /* 1A36D0 80274DF0 E6000050 */ swc1 $f0, 0x50($s0) .L80274DF4: @@ -267,7 +267,7 @@ glabel func_80274A18 /* 1A36E8 80274E08 C616003C */ lwc1 $f22, 0x3c($s0) /* 1A36EC 80274E0C AE000018 */ sw $zero, 0x18($s0) /* 1A36F0 80274E10 46006302 */ mul.s $f12, $f12, $f0 -/* 1A36F4 80274E14 00000000 */ nop +/* 1A36F4 80274E14 00000000 */ nop /* 1A36F8 80274E18 AE00001C */ sw $zero, 0x1c($s0) /* 1A36FC 80274E1C 4600A521 */ cvt.d.s $f20, $f20 /* 1A3700 80274E20 3C0143B4 */ lui $at, 0x43b4 @@ -280,9 +280,9 @@ glabel func_80274A18 /* 1A371C 80274E3C 46000021 */ cvt.d.s $f0, $f0 .L80274E40: /* 1A3720 80274E40 46220002 */ mul.d $f0, $f0, $f2 -/* 1A3724 80274E44 00000000 */ nop +/* 1A3724 80274E44 00000000 */ nop /* 1A3728 80274E48 46360002 */ mul.d $f0, $f0, $f22 -/* 1A372C 80274E4C 00000000 */ nop +/* 1A372C 80274E4C 00000000 */ nop /* 1A3730 80274E50 46360000 */ add.d $f0, $f0, $f22 /* 1A3734 80274E54 4620A500 */ add.d $f20, $f20, $f0 /* 1A3738 80274E58 4620A520 */ cvt.s.d $f20, $f20 @@ -310,21 +310,21 @@ glabel func_80274A18 /* 1A378C 80274EAC 10620008 */ beq $v1, $v0, .L80274ED0 /* 1A3790 80274EB0 0000102D */ daddu $v0, $zero, $zero /* 1A3794 80274EB4 0809D49F */ j .L8027527C -/* 1A3798 80274EB8 00000000 */ nop +/* 1A3798 80274EB8 00000000 */ nop .L80274EBC: /* 1A379C 80274EBC 24020003 */ addiu $v0, $zero, 3 /* 1A37A0 80274EC0 106200B2 */ beq $v1, $v0, .L8027518C /* 1A37A4 80274EC4 0000102D */ daddu $v0, $zero, $zero /* 1A37A8 80274EC8 0809D49F */ j .L8027527C -/* 1A37AC 80274ECC 00000000 */ nop +/* 1A37AC 80274ECC 00000000 */ nop .L80274ED0: /* 1A37B0 80274ED0 C6020044 */ lwc1 $f2, 0x44($s0) /* 1A37B4 80274ED4 3C013FC9 */ lui $at, 0x3fc9 /* 1A37B8 80274ED8 34210FD0 */ ori $at, $at, 0xfd0 /* 1A37BC 80274EDC 44810000 */ mtc1 $at, $f0 -/* 1A37C0 80274EE0 00000000 */ nop +/* 1A37C0 80274EE0 00000000 */ nop /* 1A37C4 80274EE4 4602003C */ c.lt.s $f0, $f2 -/* 1A37C8 80274EE8 00000000 */ nop +/* 1A37C8 80274EE8 00000000 */ nop /* 1A37CC 80274EEC 45000004 */ bc1f .L80274F00 /* 1A37D0 80274EF0 0000202D */ daddu $a0, $zero, $zero /* 1A37D4 80274EF4 8E06005C */ lw $a2, 0x5c($s0) @@ -351,7 +351,7 @@ glabel func_80274A18 /* 1A3824 80274F44 C60C0044 */ lwc1 $f12, 0x44($s0) /* 1A3828 80274F48 C6020050 */ lwc1 $f2, 0x50($s0) /* 1A382C 80274F4C 46001082 */ mul.s $f2, $f2, $f0 -/* 1A3830 80274F50 00000000 */ nop +/* 1A3830 80274F50 00000000 */ nop /* 1A3834 80274F54 C6000004 */ lwc1 $f0, 4($s0) /* 1A3838 80274F58 46020000 */ add.s $f0, $f0, $f2 /* 1A383C 80274F5C E6400148 */ swc1 $f0, 0x148($s2) @@ -360,9 +360,9 @@ glabel func_80274A18 /* 1A3848 80274F68 C6020010 */ lwc1 $f2, 0x10($s0) /* 1A384C 80274F6C C6400148 */ lwc1 $f0, 0x148($s2) /* 1A3850 80274F70 4602003C */ c.lt.s $f0, $f2 -/* 1A3854 80274F74 00000000 */ nop +/* 1A3854 80274F74 00000000 */ nop /* 1A3858 80274F78 45000005 */ bc1f .L80274F90 -/* 1A385C 80274F7C 00000000 */ nop +/* 1A385C 80274F7C 00000000 */ nop /* 1A3860 80274F80 86020064 */ lh $v0, 0x64($s0) /* 1A3864 80274F84 28420003 */ slti $v0, $v0, 3 /* 1A3868 80274F88 54400001 */ bnel $v0, $zero, .L80274F90 @@ -379,7 +379,7 @@ glabel func_80274A18 /* 1A3890 80274FB0 44810000 */ mtc1 $at, $f0 /* 1A3894 80274FB4 C6140044 */ lwc1 $f20, 0x44($s0) /* 1A3898 80274FB8 46006302 */ mul.s $f12, $f12, $f0 -/* 1A389C 80274FBC 00000000 */ nop +/* 1A389C 80274FBC 00000000 */ nop /* 1A38A0 80274FC0 C616003C */ lwc1 $f22, 0x3c($s0) /* 1A38A4 80274FC4 4600A521 */ cvt.d.s $f20, $f20 /* 1A38A8 80274FC8 3C0143B4 */ lui $at, 0x43b4 @@ -398,7 +398,7 @@ glabel func_80274A18 /* 1A38D8 80274FF8 44810000 */ mtc1 $at, $f0 /* 1A38DC 80274FFC C6140044 */ lwc1 $f20, 0x44($s0) /* 1A38E0 80275000 46006302 */ mul.s $f12, $f12, $f0 -/* 1A38E4 80275004 00000000 */ nop +/* 1A38E4 80275004 00000000 */ nop /* 1A38E8 80275008 C616003C */ lwc1 $f22, 0x3c($s0) /* 1A38EC 8027500C 4600A521 */ cvt.d.s $f20, $f20 /* 1A38F0 80275010 3C0143B4 */ lui $at, 0x43b4 @@ -411,9 +411,9 @@ glabel func_80274A18 /* 1A390C 8027502C 46000021 */ cvt.d.s $f0, $f0 .L80275030: /* 1A3910 80275030 46220002 */ mul.d $f0, $f0, $f2 -/* 1A3914 80275034 00000000 */ nop +/* 1A3914 80275034 00000000 */ nop /* 1A3918 80275038 46360002 */ mul.d $f0, $f0, $f22 -/* 1A391C 8027503C 00000000 */ nop +/* 1A391C 8027503C 00000000 */ nop /* 1A3920 80275040 46360000 */ add.d $f0, $f0, $f22 /* 1A3924 80275044 4620A500 */ add.d $f20, $f20, $f0 /* 1A3928 80275048 4620A520 */ cvt.s.d $f20, $f20 @@ -462,7 +462,7 @@ glabel func_80274A18 /* 1A39CC 802750EC 14410004 */ bne $v0, $at, .L80275100 /* 1A39D0 802750F0 3C018000 */ lui $at, 0x8000 /* 1A39D4 802750F4 14610002 */ bne $v1, $at, .L80275100 -/* 1A39D8 802750F8 00000000 */ nop +/* 1A39D8 802750F8 00000000 */ nop /* 1A39DC 802750FC 0006000D */ break 6 .L80275100: /* 1A39E0 80275100 00001812 */ mflo $v1 @@ -489,7 +489,7 @@ glabel func_80274A18 /* 1A3A34 80275154 46200020 */ cvt.s.d $f0, $f0 /* 1A3A38 80275158 E6000050 */ swc1 $f0, 0x50($s0) /* 1A3A3C 8027515C 44830000 */ mtc1 $v1, $f0 -/* 1A3A40 80275160 00000000 */ nop +/* 1A3A40 80275160 00000000 */ nop /* 1A3A44 80275164 46800020 */ cvt.s.w $f0, $f0 /* 1A3A48 80275168 E6000028 */ swc1 $f0, 0x28($s0) /* 1A3A4C 8027516C C6400144 */ lwc1 $f0, 0x144($s2) @@ -505,9 +505,9 @@ glabel func_80274A18 /* 1A3A70 80275190 3C0140C9 */ lui $at, 0x40c9 /* 1A3A74 80275194 34210FD0 */ ori $at, $at, 0xfd0 /* 1A3A78 80275198 4481B000 */ mtc1 $at, $f22 -/* 1A3A7C 8027519C 00000000 */ nop +/* 1A3A7C 8027519C 00000000 */ nop /* 1A3A80 802751A0 46166302 */ mul.s $f12, $f12, $f22 -/* 1A3A84 802751A4 00000000 */ nop +/* 1A3A84 802751A4 00000000 */ nop /* 1A3A88 802751A8 C6140000 */ lwc1 $f20, ($s0) /* 1A3A8C 802751AC 3C0143B4 */ lui $at, 0x43b4 /* 1A3A90 802751B0 4481C000 */ mtc1 $at, $f24 @@ -516,10 +516,10 @@ glabel func_80274A18 /* 1A3A9C 802751BC 46186303 */ div.s $f12, $f12, $f24 /* 1A3AA0 802751C0 C6020050 */ lwc1 $f2, 0x50($s0) /* 1A3AA4 802751C4 46001082 */ mul.s $f2, $f2, $f0 -/* 1A3AA8 802751C8 00000000 */ nop +/* 1A3AA8 802751C8 00000000 */ nop /* 1A3AAC 802751CC C60C0024 */ lwc1 $f12, 0x24($s0) /* 1A3AB0 802751D0 46166302 */ mul.s $f12, $f12, $f22 -/* 1A3AB4 802751D4 00000000 */ nop +/* 1A3AB4 802751D4 00000000 */ nop /* 1A3AB8 802751D8 3C01802A */ lui $at, %hi(D_8029D8E0) /* 1A3ABC 802751DC D420D8E0 */ ldc1 $f0, %lo(D_8029D8E0)($at) /* 1A3AC0 802751E0 460010A1 */ cvt.d.s $f2, $f2 @@ -531,7 +531,7 @@ glabel func_80274A18 /* 1A3AD8 802751F8 E6140000 */ swc1 $f20, ($s0) /* 1A3ADC 802751FC C6020050 */ lwc1 $f2, 0x50($s0) /* 1A3AE0 80275200 46001082 */ mul.s $f2, $f2, $f0 -/* 1A3AE4 80275204 00000000 */ nop +/* 1A3AE4 80275204 00000000 */ nop /* 1A3AE8 80275208 C60C0024 */ lwc1 $f12, 0x24($s0) /* 1A3AEC 8027520C C6000028 */ lwc1 $f0, 0x28($s0) /* 1A3AF0 80275210 46006300 */ add.s $f12, $f12, $f0 @@ -551,7 +551,7 @@ glabel func_80274A18 /* 1A3B28 80275248 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1A3B2C 8027524C 30422000 */ andi $v0, $v0, 0x2000 /* 1A3B30 80275250 10400003 */ beqz $v0, .L80275260 -/* 1A3B34 80275254 00000000 */ nop +/* 1A3B34 80275254 00000000 */ nop .L80275258: /* 1A3B38 80275258 0809D49F */ j .L8027527C /* 1A3B3C 8027525C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_197F40/func_802752AC.s b/asm/nonmatchings/code_197F40/func_802752AC.s index e4b446edf9..4f293abb0f 100644 --- a/asm/nonmatchings/code_197F40/func_802752AC.s +++ b/asm/nonmatchings/code_197F40/func_802752AC.s @@ -34,7 +34,7 @@ glabel func_802752AC /* 1A3C00 80275320 10620003 */ beq $v1, $v0, .L80275330 /* 1A3C04 80275324 24020006 */ addiu $v0, $zero, 6 /* 1A3C08 80275328 14620003 */ bne $v1, $v0, .L80275338 -/* 1A3C0C 8027532C 00000000 */ nop +/* 1A3C0C 8027532C 00000000 */ nop .L80275330: /* 1A3C10 80275330 2402000A */ addiu $v0, $zero, 0xa /* 1A3C14 80275334 AE620070 */ sw $v0, 0x70($s3) @@ -54,12 +54,12 @@ glabel func_802752AC /* 1A3C44 80275364 10600007 */ beqz $v1, .L80275384 /* 1A3C48 80275368 24020002 */ addiu $v0, $zero, 2 /* 1A3C4C 8027536C 0809D679 */ j .L802759E4 -/* 1A3C50 80275370 00000000 */ nop +/* 1A3C50 80275370 00000000 */ nop .L80275374: /* 1A3C54 80275374 10620172 */ beq $v1, $v0, .L80275940 /* 1A3C58 80275378 24020001 */ addiu $v0, $zero, 1 /* 1A3C5C 8027537C 0809D677 */ j .L802759DC -/* 1A3C60 80275380 00000000 */ nop +/* 1A3C60 80275380 00000000 */ nop .L80275384: /* 1A3C64 80275384 C6400144 */ lwc1 $f0, 0x144($s2) /* 1A3C68 80275388 C618000C */ lwc1 $f24, 0xc($s0) @@ -91,29 +91,29 @@ glabel func_802752AC /* 1A3CD0 802753F0 46002003 */ div.s $f0, $f4, $f0 /* 1A3CD4 802753F4 4600028D */ trunc.w.s $f10, $f0 /* 1A3CD8 802753F8 44035000 */ mfc1 $v1, $f10 -/* 1A3CDC 802753FC 00000000 */ nop +/* 1A3CDC 802753FC 00000000 */ nop /* 1A3CE0 80275400 00031400 */ sll $v0, $v1, 0x10 /* 1A3CE4 80275404 00021403 */ sra $v0, $v0, 0x10 /* 1A3CE8 80275408 44820000 */ mtc1 $v0, $f0 -/* 1A3CEC 8027540C 00000000 */ nop +/* 1A3CEC 8027540C 00000000 */ nop /* 1A3CF0 80275410 46800020 */ cvt.s.w $f0, $f0 /* 1A3CF4 80275414 46020002 */ mul.s $f0, $f0, $f2 -/* 1A3CF8 80275418 00000000 */ nop +/* 1A3CF8 80275418 00000000 */ nop /* 1A3CFC 8027541C 46002086 */ mov.s $f2, $f4 /* 1A3D00 80275420 A6030064 */ sh $v1, 0x64($s0) /* 1A3D04 80275424 0809D518 */ j .L80275460 /* 1A3D08 80275428 46001201 */ sub.s $f8, $f2, $f0 .L8027542C: /* 1A3D0C 8027542C 44821000 */ mtc1 $v0, $f2 -/* 1A3D10 80275430 00000000 */ nop +/* 1A3D10 80275430 00000000 */ nop /* 1A3D14 80275434 468010A0 */ cvt.s.w $f2, $f2 /* 1A3D18 80275438 86020064 */ lh $v0, 0x64($s0) /* 1A3D1C 8027543C 46022083 */ div.s $f2, $f4, $f2 /* 1A3D20 80275440 44820000 */ mtc1 $v0, $f0 -/* 1A3D24 80275444 00000000 */ nop +/* 1A3D24 80275444 00000000 */ nop /* 1A3D28 80275448 46800020 */ cvt.s.w $f0, $f0 /* 1A3D2C 8027544C 46020002 */ mul.s $f0, $f0, $f2 -/* 1A3D30 80275450 00000000 */ nop +/* 1A3D30 80275450 00000000 */ nop /* 1A3D34 80275454 C604004C */ lwc1 $f4, 0x4c($s0) /* 1A3D38 80275458 E6020040 */ swc1 $f2, 0x40($s0) /* 1A3D3C 8027545C 46002201 */ sub.s $f8, $f4, $f0 @@ -128,13 +128,13 @@ glabel func_802752AC /* 1A3D5C 8027547C 44810000 */ mtc1 $at, $f0 /* 1A3D60 80275480 C6040000 */ lwc1 $f4, ($s0) /* 1A3D64 80275484 44823000 */ mtc1 $v0, $f6 -/* 1A3D68 80275488 00000000 */ nop +/* 1A3D68 80275488 00000000 */ nop /* 1A3D6C 8027548C 468031A0 */ cvt.s.w $f6, $f6 /* 1A3D70 80275490 46060003 */ div.s $f0, $f0, $f6 /* 1A3D74 80275494 46041081 */ sub.s $f2, $f2, $f4 /* 1A3D78 80275498 E600003C */ swc1 $f0, 0x3c($s0) /* 1A3D7C 8027549C 44830000 */ mtc1 $v1, $f0 -/* 1A3D80 802754A0 00000000 */ nop +/* 1A3D80 802754A0 00000000 */ nop /* 1A3D84 802754A4 46800020 */ cvt.s.w $f0, $f0 /* 1A3D88 802754A8 46001083 */ div.s $f2, $f2, $f0 /* 1A3D8C 802754AC C6000010 */ lwc1 $f0, 0x10($s0) @@ -176,7 +176,7 @@ glabel func_802752AC /* 1A3E18 80275538 14610004 */ bne $v1, $at, .L8027554C /* 1A3E1C 8027553C 3C018000 */ lui $at, 0x8000 /* 1A3E20 80275540 14410002 */ bne $v0, $at, .L8027554C -/* 1A3E24 80275544 00000000 */ nop +/* 1A3E24 80275544 00000000 */ nop /* 1A3E28 80275548 0006000D */ break 6 .L8027554C: /* 1A3E2C 8027554C 00001012 */ mflo $v0 @@ -188,14 +188,14 @@ glabel func_802752AC /* 1A3E44 80275564 E6000024 */ swc1 $f0, 0x24($s0) /* 1A3E48 80275568 E6020050 */ swc1 $f2, 0x50($s0) /* 1A3E4C 8027556C 44820000 */ mtc1 $v0, $f0 -/* 1A3E50 80275570 00000000 */ nop +/* 1A3E50 80275570 00000000 */ nop /* 1A3E54 80275574 46800020 */ cvt.s.w $f0, $f0 /* 1A3E58 80275578 24020004 */ addiu $v0, $zero, 4 /* 1A3E5C 8027557C 14620005 */ bne $v1, $v0, .L80275594 /* 1A3E60 80275580 E6000028 */ swc1 $f0, 0x28($s0) /* 1A3E64 80275584 3C014261 */ lui $at, 0x4261 /* 1A3E68 80275588 44810000 */ mtc1 $at, $f0 -/* 1A3E6C 8027558C 00000000 */ nop +/* 1A3E6C 8027558C 00000000 */ nop /* 1A3E70 80275590 E6000050 */ swc1 $f0, 0x50($s0) .L80275594: /* 1A3E74 80275594 86020066 */ lh $v0, 0x66($s0) @@ -208,7 +208,7 @@ glabel func_802752AC /* 1A3E90 802755B0 44810000 */ mtc1 $at, $f0 /* 1A3E94 802755B4 C6140044 */ lwc1 $f20, 0x44($s0) /* 1A3E98 802755B8 46006302 */ mul.s $f12, $f12, $f0 -/* 1A3E9C 802755BC 00000000 */ nop +/* 1A3E9C 802755BC 00000000 */ nop /* 1A3EA0 802755C0 C616003C */ lwc1 $f22, 0x3c($s0) /* 1A3EA4 802755C4 4600A521 */ cvt.d.s $f20, $f20 /* 1A3EA8 802755C8 3C0143B4 */ lui $at, 0x43b4 @@ -227,7 +227,7 @@ glabel func_802752AC /* 1A3ED8 802755F8 44810000 */ mtc1 $at, $f0 /* 1A3EDC 802755FC C6140044 */ lwc1 $f20, 0x44($s0) /* 1A3EE0 80275600 46006302 */ mul.s $f12, $f12, $f0 -/* 1A3EE4 80275604 00000000 */ nop +/* 1A3EE4 80275604 00000000 */ nop /* 1A3EE8 80275608 C616003C */ lwc1 $f22, 0x3c($s0) /* 1A3EEC 8027560C 4600A521 */ cvt.d.s $f20, $f20 /* 1A3EF0 80275610 3C0143B4 */ lui $at, 0x43b4 @@ -240,9 +240,9 @@ glabel func_802752AC /* 1A3F0C 8027562C 46000021 */ cvt.d.s $f0, $f0 .L80275630: /* 1A3F10 80275630 46220002 */ mul.d $f0, $f0, $f2 -/* 1A3F14 80275634 00000000 */ nop +/* 1A3F14 80275634 00000000 */ nop /* 1A3F18 80275638 46360002 */ mul.d $f0, $f0, $f22 -/* 1A3F1C 8027563C 00000000 */ nop +/* 1A3F1C 8027563C 00000000 */ nop /* 1A3F20 80275640 46360000 */ add.d $f0, $f0, $f22 /* 1A3F24 80275644 4620A500 */ add.d $f20, $f20, $f0 /* 1A3F28 80275648 4620A520 */ cvt.s.d $f20, $f20 @@ -280,29 +280,29 @@ glabel func_802752AC /* 1A3FA4 802756C4 46002003 */ div.s $f0, $f4, $f0 /* 1A3FA8 802756C8 4600028D */ trunc.w.s $f10, $f0 /* 1A3FAC 802756CC 44035000 */ mfc1 $v1, $f10 -/* 1A3FB0 802756D0 00000000 */ nop +/* 1A3FB0 802756D0 00000000 */ nop /* 1A3FB4 802756D4 00031400 */ sll $v0, $v1, 0x10 /* 1A3FB8 802756D8 00021403 */ sra $v0, $v0, 0x10 /* 1A3FBC 802756DC 44820000 */ mtc1 $v0, $f0 -/* 1A3FC0 802756E0 00000000 */ nop +/* 1A3FC0 802756E0 00000000 */ nop /* 1A3FC4 802756E4 46800020 */ cvt.s.w $f0, $f0 /* 1A3FC8 802756E8 46020002 */ mul.s $f0, $f0, $f2 -/* 1A3FCC 802756EC 00000000 */ nop +/* 1A3FCC 802756EC 00000000 */ nop /* 1A3FD0 802756F0 46002086 */ mov.s $f2, $f4 /* 1A3FD4 802756F4 A6030064 */ sh $v1, 0x64($s0) /* 1A3FD8 802756F8 0809D5CD */ j .L80275734 /* 1A3FDC 802756FC 46001201 */ sub.s $f8, $f2, $f0 .L80275700: /* 1A3FE0 80275700 44821000 */ mtc1 $v0, $f2 -/* 1A3FE4 80275704 00000000 */ nop +/* 1A3FE4 80275704 00000000 */ nop /* 1A3FE8 80275708 468010A0 */ cvt.s.w $f2, $f2 /* 1A3FEC 8027570C 86020064 */ lh $v0, 0x64($s0) /* 1A3FF0 80275710 46022083 */ div.s $f2, $f4, $f2 /* 1A3FF4 80275714 44820000 */ mtc1 $v0, $f0 -/* 1A3FF8 80275718 00000000 */ nop +/* 1A3FF8 80275718 00000000 */ nop /* 1A3FFC 8027571C 46800020 */ cvt.s.w $f0, $f0 /* 1A4000 80275720 46020002 */ mul.s $f0, $f0, $f2 -/* 1A4004 80275724 00000000 */ nop +/* 1A4004 80275724 00000000 */ nop /* 1A4008 80275728 C604004C */ lwc1 $f4, 0x4c($s0) /* 1A400C 8027572C E6020040 */ swc1 $f2, 0x40($s0) /* 1A4010 80275730 46002201 */ sub.s $f8, $f4, $f0 @@ -319,7 +319,7 @@ glabel func_802752AC /* 1A4038 80275758 C6040000 */ lwc1 $f4, ($s0) /* 1A403C 8027575C 24420001 */ addiu $v0, $v0, 1 /* 1A4040 80275760 44823000 */ mtc1 $v0, $f6 -/* 1A4044 80275764 00000000 */ nop +/* 1A4044 80275764 00000000 */ nop /* 1A4048 80275768 468031A0 */ cvt.s.w $f6, $f6 /* 1A404C 8027576C 46041081 */ sub.s $f2, $f2, $f4 /* 1A4050 80275770 E6000044 */ swc1 $f0, 0x44($s0) @@ -330,7 +330,7 @@ glabel func_802752AC /* 1A4064 80275784 46060003 */ div.s $f0, $f0, $f6 /* 1A4068 80275788 E600003C */ swc1 $f0, 0x3c($s0) /* 1A406C 8027578C 44830000 */ mtc1 $v1, $f0 -/* 1A4070 80275790 00000000 */ nop +/* 1A4070 80275790 00000000 */ nop /* 1A4074 80275794 46800020 */ cvt.s.w $f0, $f0 /* 1A4078 80275798 46001083 */ div.s $f2, $f2, $f0 /* 1A407C 8027579C C6000010 */ lwc1 $f0, 0x10($s0) @@ -339,7 +339,7 @@ glabel func_802752AC /* 1A4088 802757A8 C6040014 */ lwc1 $f4, 0x14($s0) /* 1A408C 802757AC 46020001 */ sub.s $f0, $f0, $f2 /* 1A4090 802757B0 44821000 */ mtc1 $v0, $f2 -/* 1A4094 802757B4 00000000 */ nop +/* 1A4094 802757B4 00000000 */ nop /* 1A4098 802757B8 468010A0 */ cvt.s.w $f2, $f2 /* 1A409C 802757BC 46001186 */ mov.s $f6, $f2 /* 1A40A0 802757C0 46020003 */ div.s $f0, $f0, $f2 @@ -365,7 +365,7 @@ glabel func_802752AC /* 1A40EC 8027580C 14610004 */ bne $v1, $at, .L80275820 /* 1A40F0 80275810 3C018000 */ lui $at, 0x8000 /* 1A40F4 80275814 14410002 */ bne $v0, $at, .L80275820 -/* 1A40F8 80275818 00000000 */ nop +/* 1A40F8 80275818 00000000 */ nop /* 1A40FC 8027581C 0006000D */ break 6 .L80275820: /* 1A4100 80275820 00001012 */ mflo $v0 @@ -377,14 +377,14 @@ glabel func_802752AC /* 1A4118 80275838 E6000024 */ swc1 $f0, 0x24($s0) /* 1A411C 8027583C E6020050 */ swc1 $f2, 0x50($s0) /* 1A4120 80275840 44820000 */ mtc1 $v0, $f0 -/* 1A4124 80275844 00000000 */ nop +/* 1A4124 80275844 00000000 */ nop /* 1A4128 80275848 46800020 */ cvt.s.w $f0, $f0 /* 1A412C 8027584C 24020005 */ addiu $v0, $zero, 5 /* 1A4130 80275850 14620005 */ bne $v1, $v0, .L80275868 /* 1A4134 80275854 E6000028 */ swc1 $f0, 0x28($s0) /* 1A4138 80275858 3C014261 */ lui $at, 0x4261 /* 1A413C 8027585C 44810000 */ mtc1 $at, $f0 -/* 1A4140 80275860 00000000 */ nop +/* 1A4140 80275860 00000000 */ nop /* 1A4144 80275864 E6000050 */ swc1 $f0, 0x50($s0) .L80275868: /* 1A4148 80275868 86030066 */ lh $v1, 0x66($s0) @@ -398,7 +398,7 @@ glabel func_802752AC /* 1A4168 80275888 44810000 */ mtc1 $at, $f0 /* 1A416C 8027588C C6140044 */ lwc1 $f20, 0x44($s0) /* 1A4170 80275890 46006302 */ mul.s $f12, $f12, $f0 -/* 1A4174 80275894 00000000 */ nop +/* 1A4174 80275894 00000000 */ nop /* 1A4178 80275898 C616003C */ lwc1 $f22, 0x3c($s0) /* 1A417C 8027589C 4600A521 */ cvt.d.s $f20, $f20 /* 1A4180 802758A0 3C0143B4 */ lui $at, 0x43b4 @@ -417,7 +417,7 @@ glabel func_802752AC /* 1A41B0 802758D0 44810000 */ mtc1 $at, $f0 /* 1A41B4 802758D4 C6140044 */ lwc1 $f20, 0x44($s0) /* 1A41B8 802758D8 46006302 */ mul.s $f12, $f12, $f0 -/* 1A41BC 802758DC 00000000 */ nop +/* 1A41BC 802758DC 00000000 */ nop /* 1A41C0 802758E0 C616003C */ lwc1 $f22, 0x3c($s0) /* 1A41C4 802758E4 4600A521 */ cvt.d.s $f20, $f20 /* 1A41C8 802758E8 3C0143B4 */ lui $at, 0x43b4 @@ -430,9 +430,9 @@ glabel func_802752AC /* 1A41E4 80275904 46000021 */ cvt.d.s $f0, $f0 .L80275908: /* 1A41E8 80275908 46220002 */ mul.d $f0, $f0, $f2 -/* 1A41EC 8027590C 00000000 */ nop +/* 1A41EC 8027590C 00000000 */ nop /* 1A41F0 80275910 46360002 */ mul.d $f0, $f0, $f22 -/* 1A41F4 80275914 00000000 */ nop +/* 1A41F4 80275914 00000000 */ nop /* 1A41F8 80275918 46360000 */ add.d $f0, $f0, $f22 /* 1A41FC 8027591C 4620A500 */ add.d $f20, $f20, $f0 /* 1A4200 80275920 4620A520 */ cvt.s.d $f20, $f20 @@ -455,7 +455,7 @@ glabel func_802752AC /* 1A423C 8027595C 14410004 */ bne $v0, $at, .L80275970 /* 1A4240 80275960 3C018000 */ lui $at, 0x8000 /* 1A4244 80275964 14610002 */ bne $v1, $at, .L80275970 -/* 1A4248 80275968 00000000 */ nop +/* 1A4248 80275968 00000000 */ nop /* 1A424C 8027596C 0006000D */ break 6 .L80275970: /* 1A4250 80275970 00001812 */ mflo $v1 @@ -464,7 +464,7 @@ glabel func_802752AC /* 1A425C 8027597C 46020001 */ sub.s $f0, $f0, $f2 /* 1A4260 80275980 3C0142B4 */ lui $at, 0x42b4 /* 1A4264 80275984 44811000 */ mtc1 $at, $f2 -/* 1A4268 80275988 00000000 */ nop +/* 1A4268 80275988 00000000 */ nop /* 1A426C 8027598C E6020024 */ swc1 $f2, 0x24($s0) /* 1A4270 80275990 3C01802A */ lui $at, %hi(D_8029D908) /* 1A4274 80275994 D422D908 */ ldc1 $f2, %lo(D_8029D908)($at) @@ -474,7 +474,7 @@ glabel func_802752AC /* 1A4284 802759A4 46200020 */ cvt.s.d $f0, $f0 /* 1A4288 802759A8 E6000050 */ swc1 $f0, 0x50($s0) /* 1A428C 802759AC 44830000 */ mtc1 $v1, $f0 -/* 1A4290 802759B0 00000000 */ nop +/* 1A4290 802759B0 00000000 */ nop /* 1A4294 802759B4 46800020 */ cvt.s.w $f0, $f0 /* 1A4298 802759B8 E6000028 */ swc1 $f0, 0x28($s0) /* 1A429C 802759BC C6400144 */ lwc1 $f0, 0x144($s2) @@ -497,7 +497,7 @@ glabel func_802752AC /* 1A42D4 802759F4 1062000A */ beq $v1, $v0, .L80275A20 /* 1A42D8 802759F8 0000102D */ daddu $v0, $zero, $zero /* 1A42DC 802759FC 0809D7B5 */ j .L80275ED4 -/* 1A42E0 80275A00 00000000 */ nop +/* 1A42E0 80275A00 00000000 */ nop .L80275A04: /* 1A42E4 80275A04 2402000B */ addiu $v0, $zero, 0xb /* 1A42E8 80275A08 10620090 */ beq $v1, $v0, .L80275C4C @@ -505,18 +505,18 @@ glabel func_802752AC /* 1A42F0 80275A10 106200F4 */ beq $v1, $v0, .L80275DE4 /* 1A42F4 80275A14 0000102D */ daddu $v0, $zero, $zero /* 1A42F8 80275A18 0809D7B5 */ j .L80275ED4 -/* 1A42FC 80275A1C 00000000 */ nop +/* 1A42FC 80275A1C 00000000 */ nop .L80275A20: /* 1A4300 80275A20 86020066 */ lh $v0, 0x66($s0) /* 1A4304 80275A24 14400013 */ bnez $v0, .L80275A74 -/* 1A4308 80275A28 00000000 */ nop +/* 1A4308 80275A28 00000000 */ nop /* 1A430C 80275A2C C60C0024 */ lwc1 $f12, 0x24($s0) /* 1A4310 80275A30 3C0140C9 */ lui $at, 0x40c9 /* 1A4314 80275A34 34210FD0 */ ori $at, $at, 0xfd0 /* 1A4318 80275A38 44810000 */ mtc1 $at, $f0 /* 1A431C 80275A3C C6140044 */ lwc1 $f20, 0x44($s0) /* 1A4320 80275A40 46006302 */ mul.s $f12, $f12, $f0 -/* 1A4324 80275A44 00000000 */ nop +/* 1A4324 80275A44 00000000 */ nop /* 1A4328 80275A48 C616003C */ lwc1 $f22, 0x3c($s0) /* 1A432C 80275A4C 4600A521 */ cvt.d.s $f20, $f20 /* 1A4330 80275A50 3C0143B4 */ lui $at, 0x43b4 @@ -535,7 +535,7 @@ glabel func_802752AC /* 1A4360 80275A80 44810000 */ mtc1 $at, $f0 /* 1A4364 80275A84 C6140044 */ lwc1 $f20, 0x44($s0) /* 1A4368 80275A88 46006302 */ mul.s $f12, $f12, $f0 -/* 1A436C 80275A8C 00000000 */ nop +/* 1A436C 80275A8C 00000000 */ nop /* 1A4370 80275A90 C616003C */ lwc1 $f22, 0x3c($s0) /* 1A4374 80275A94 4600A521 */ cvt.d.s $f20, $f20 /* 1A4378 80275A98 3C0143B4 */ lui $at, 0x43b4 @@ -548,9 +548,9 @@ glabel func_802752AC /* 1A4394 80275AB4 46000021 */ cvt.d.s $f0, $f0 .L80275AB8: /* 1A4398 80275AB8 46220002 */ mul.d $f0, $f0, $f2 -/* 1A439C 80275ABC 00000000 */ nop +/* 1A439C 80275ABC 00000000 */ nop /* 1A43A0 80275AC0 46360002 */ mul.d $f0, $f0, $f22 -/* 1A43A4 80275AC4 00000000 */ nop +/* 1A43A4 80275AC4 00000000 */ nop /* 1A43A8 80275AC8 46360000 */ add.d $f0, $f0, $f22 /* 1A43AC 80275ACC 4620A500 */ add.d $f20, $f20, $f0 /* 1A43B0 80275AD0 4620A520 */ cvt.s.d $f20, $f20 @@ -576,16 +576,16 @@ glabel func_802752AC /* 1A4400 80275B20 34210FD0 */ ori $at, $at, 0xfd0 /* 1A4404 80275B24 4481A000 */ mtc1 $at, $f20 /* 1A4408 80275B28 0C00A85B */ jal sin_rad -/* 1A440C 80275B2C 00000000 */ nop +/* 1A440C 80275B2C 00000000 */ nop /* 1A4410 80275B30 46140302 */ mul.s $f12, $f0, $f20 /* 1A4414 80275B34 0C00A85B */ jal sin_rad -/* 1A4418 80275B38 00000000 */ nop +/* 1A4418 80275B38 00000000 */ nop /* 1A441C 80275B3C 46140302 */ mul.s $f12, $f0, $f20 /* 1A4420 80275B40 0C00A85B */ jal sin_rad -/* 1A4424 80275B44 00000000 */ nop +/* 1A4424 80275B44 00000000 */ nop /* 1A4428 80275B48 C6020050 */ lwc1 $f2, 0x50($s0) /* 1A442C 80275B4C 46001082 */ mul.s $f2, $f2, $f0 -/* 1A4430 80275B50 00000000 */ nop +/* 1A4430 80275B50 00000000 */ nop /* 1A4434 80275B54 C6000004 */ lwc1 $f0, 4($s0) /* 1A4438 80275B58 46020000 */ add.s $f0, $f0, $f2 /* 1A443C 80275B5C E6400148 */ swc1 $f0, 0x148($s2) @@ -632,7 +632,7 @@ glabel func_802752AC /* 1A44DC 80275BFC C6420164 */ lwc1 $f2, 0x164($s2) /* 1A44E0 80275C00 3C014284 */ lui $at, 0x4284 /* 1A44E4 80275C04 44810000 */ mtc1 $at, $f0 -/* 1A44E8 80275C08 00000000 */ nop +/* 1A44E8 80275C08 00000000 */ nop /* 1A44EC 80275C0C 46001081 */ sub.s $f2, $f2, $f0 /* 1A44F0 80275C10 2402000E */ addiu $v0, $zero, 0xe /* 1A44F4 80275C14 A642016A */ sh $v0, 0x16a($s2) @@ -670,7 +670,7 @@ glabel func_802752AC /* 1A4570 80275C90 C60C0044 */ lwc1 $f12, 0x44($s0) /* 1A4574 80275C94 C6020050 */ lwc1 $f2, 0x50($s0) /* 1A4578 80275C98 46001082 */ mul.s $f2, $f2, $f0 -/* 1A457C 80275C9C 00000000 */ nop +/* 1A457C 80275C9C 00000000 */ nop /* 1A4580 80275CA0 C6000004 */ lwc1 $f0, 4($s0) /* 1A4584 80275CA4 46020000 */ add.s $f0, $f0, $f2 /* 1A4588 80275CA8 E6400148 */ swc1 $f0, 0x148($s2) @@ -679,7 +679,7 @@ glabel func_802752AC /* 1A4594 80275CB4 C6020010 */ lwc1 $f2, 0x10($s0) /* 1A4598 80275CB8 C6400148 */ lwc1 $f0, 0x148($s2) /* 1A459C 80275CBC 4602003C */ c.lt.s $f0, $f2 -/* 1A45A0 80275CC0 00000000 */ nop +/* 1A45A0 80275CC0 00000000 */ nop /* 1A45A4 80275CC4 45030001 */ bc1tl .L80275CCC /* 1A45A8 80275CC8 E6420148 */ swc1 $f2, 0x148($s2) .L80275CCC: @@ -694,7 +694,7 @@ glabel func_802752AC /* 1A45CC 80275CEC 44810000 */ mtc1 $at, $f0 /* 1A45D0 80275CF0 C6140044 */ lwc1 $f20, 0x44($s0) /* 1A45D4 80275CF4 46006302 */ mul.s $f12, $f12, $f0 -/* 1A45D8 80275CF8 00000000 */ nop +/* 1A45D8 80275CF8 00000000 */ nop /* 1A45DC 80275CFC C616003C */ lwc1 $f22, 0x3c($s0) /* 1A45E0 80275D00 4600A521 */ cvt.d.s $f20, $f20 /* 1A45E4 80275D04 3C0143B4 */ lui $at, 0x43b4 @@ -713,7 +713,7 @@ glabel func_802752AC /* 1A4614 80275D34 44810000 */ mtc1 $at, $f0 /* 1A4618 80275D38 C6140044 */ lwc1 $f20, 0x44($s0) /* 1A461C 80275D3C 46006302 */ mul.s $f12, $f12, $f0 -/* 1A4620 80275D40 00000000 */ nop +/* 1A4620 80275D40 00000000 */ nop /* 1A4624 80275D44 C616003C */ lwc1 $f22, 0x3c($s0) /* 1A4628 80275D48 4600A521 */ cvt.d.s $f20, $f20 /* 1A462C 80275D4C 3C0143B4 */ lui $at, 0x43b4 @@ -726,9 +726,9 @@ glabel func_802752AC /* 1A4648 80275D68 46000021 */ cvt.d.s $f0, $f0 .L80275D6C: /* 1A464C 80275D6C 46220002 */ mul.d $f0, $f0, $f2 -/* 1A4650 80275D70 00000000 */ nop +/* 1A4650 80275D70 00000000 */ nop /* 1A4654 80275D74 46360002 */ mul.d $f0, $f0, $f22 -/* 1A4658 80275D78 00000000 */ nop +/* 1A4658 80275D78 00000000 */ nop /* 1A465C 80275D7C 46360000 */ add.d $f0, $f0, $f22 /* 1A4660 80275D80 4620A500 */ add.d $f20, $f20, $f0 /* 1A4664 80275D84 4620A520 */ cvt.s.d $f20, $f20 @@ -753,7 +753,7 @@ glabel func_802752AC /* 1A46B0 80275DD0 E6400148 */ swc1 $f0, 0x148($s2) .L80275DD4: /* 1A46B4 80275DD4 0C098F3F */ jal set_animation -/* 1A46B8 80275DD8 00000000 */ nop +/* 1A46B8 80275DD8 00000000 */ nop /* 1A46BC 80275DDC 0809D7B5 */ j .L80275ED4 /* 1A46C0 80275DE0 24020001 */ addiu $v0, $zero, 1 .L80275DE4: @@ -761,9 +761,9 @@ glabel func_802752AC /* 1A46C8 80275DE8 3C0140C9 */ lui $at, 0x40c9 /* 1A46CC 80275DEC 34210FD0 */ ori $at, $at, 0xfd0 /* 1A46D0 80275DF0 4481B000 */ mtc1 $at, $f22 -/* 1A46D4 80275DF4 00000000 */ nop +/* 1A46D4 80275DF4 00000000 */ nop /* 1A46D8 80275DF8 46166302 */ mul.s $f12, $f12, $f22 -/* 1A46DC 80275DFC 00000000 */ nop +/* 1A46DC 80275DFC 00000000 */ nop /* 1A46E0 80275E00 C6140000 */ lwc1 $f20, ($s0) /* 1A46E4 80275E04 3C0143B4 */ lui $at, 0x43b4 /* 1A46E8 80275E08 4481C000 */ mtc1 $at, $f24 @@ -772,10 +772,10 @@ glabel func_802752AC /* 1A46F4 80275E14 46186303 */ div.s $f12, $f12, $f24 /* 1A46F8 80275E18 C6020050 */ lwc1 $f2, 0x50($s0) /* 1A46FC 80275E1C 46001082 */ mul.s $f2, $f2, $f0 -/* 1A4700 80275E20 00000000 */ nop +/* 1A4700 80275E20 00000000 */ nop /* 1A4704 80275E24 C60C0024 */ lwc1 $f12, 0x24($s0) /* 1A4708 80275E28 46166302 */ mul.s $f12, $f12, $f22 -/* 1A470C 80275E2C 00000000 */ nop +/* 1A470C 80275E2C 00000000 */ nop /* 1A4710 80275E30 3C01802A */ lui $at, %hi(D_8029D930) /* 1A4714 80275E34 D420D930 */ ldc1 $f0, %lo(D_8029D930)($at) /* 1A4718 80275E38 460010A1 */ cvt.d.s $f2, $f2 @@ -787,7 +787,7 @@ glabel func_802752AC /* 1A4730 80275E50 E6140000 */ swc1 $f20, ($s0) /* 1A4734 80275E54 C6020050 */ lwc1 $f2, 0x50($s0) /* 1A4738 80275E58 46001082 */ mul.s $f2, $f2, $f0 -/* 1A473C 80275E5C 00000000 */ nop +/* 1A473C 80275E5C 00000000 */ nop /* 1A4740 80275E60 C60C0024 */ lwc1 $f12, 0x24($s0) /* 1A4744 80275E64 C6000028 */ lwc1 $f0, 0x28($s0) /* 1A4748 80275E68 46006300 */ add.s $f12, $f12, $f0 @@ -807,7 +807,7 @@ glabel func_802752AC /* 1A4780 80275EA0 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1A4784 80275EA4 30422000 */ andi $v0, $v0, 0x2000 /* 1A4788 80275EA8 10400003 */ beqz $v0, .L80275EB8 -/* 1A478C 80275EAC 00000000 */ nop +/* 1A478C 80275EAC 00000000 */ nop .L80275EB0: /* 1A4790 80275EB0 0809D7B5 */ j .L80275ED4 /* 1A4794 80275EB4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_197F40/func_80275F00.s b/asm/nonmatchings/code_197F40/func_80275F00.s index e65efb9f5b..b9a269f070 100644 --- a/asm/nonmatchings/code_197F40/func_80275F00.s +++ b/asm/nonmatchings/code_197F40/func_80275F00.s @@ -46,7 +46,7 @@ glabel func_80275F00 /* 1A487C 80275F9C 10620003 */ beq $v1, $v0, .L80275FAC /* 1A4880 80275FA0 24020004 */ addiu $v0, $zero, 4 /* 1A4884 80275FA4 14620003 */ bne $v1, $v0, .L80275FB4 -/* 1A4888 80275FA8 00000000 */ nop +/* 1A4888 80275FA8 00000000 */ nop .L80275FAC: /* 1A488C 80275FAC 2402001E */ addiu $v0, $zero, 0x1e /* 1A4890 80275FB0 AE620070 */ sw $v0, 0x70($s3) @@ -58,16 +58,16 @@ glabel func_80275F00 /* 1A48A4 80275FC4 10400005 */ beqz $v0, .L80275FDC /* 1A48A8 80275FC8 24020014 */ addiu $v0, $zero, 0x14 /* 1A48AC 80275FCC 10600009 */ beqz $v1, .L80275FF4 -/* 1A48B0 80275FD0 00000000 */ nop +/* 1A48B0 80275FD0 00000000 */ nop /* 1A48B4 80275FD4 0809DA2C */ j .L802768B0 -/* 1A48B8 80275FD8 00000000 */ nop +/* 1A48B8 80275FD8 00000000 */ nop .L80275FDC: /* 1A48BC 80275FDC 10620163 */ beq $v1, $v0, .L8027656C /* 1A48C0 80275FE0 2402001E */ addiu $v0, $zero, 0x1e /* 1A48C4 80275FE4 1062018F */ beq $v1, $v0, .L80276624 -/* 1A48C8 80275FE8 00000000 */ nop +/* 1A48C8 80275FE8 00000000 */ nop /* 1A48CC 80275FEC 0809DA2C */ j .L802768B0 -/* 1A48D0 80275FF0 00000000 */ nop +/* 1A48D0 80275FF0 00000000 */ nop .L80275FF4: /* 1A48D4 80275FF4 C6400144 */ lwc1 $f0, 0x144($s2) /* 1A48D8 80275FF8 C618000C */ lwc1 $f24, 0xc($s0) @@ -99,29 +99,29 @@ glabel func_80275F00 /* 1A4940 80276060 46002003 */ div.s $f0, $f4, $f0 /* 1A4944 80276064 4600028D */ trunc.w.s $f10, $f0 /* 1A4948 80276068 44035000 */ mfc1 $v1, $f10 -/* 1A494C 8027606C 00000000 */ nop +/* 1A494C 8027606C 00000000 */ nop /* 1A4950 80276070 00031400 */ sll $v0, $v1, 0x10 /* 1A4954 80276074 00021403 */ sra $v0, $v0, 0x10 /* 1A4958 80276078 44820000 */ mtc1 $v0, $f0 -/* 1A495C 8027607C 00000000 */ nop +/* 1A495C 8027607C 00000000 */ nop /* 1A4960 80276080 46800020 */ cvt.s.w $f0, $f0 /* 1A4964 80276084 46020002 */ mul.s $f0, $f0, $f2 -/* 1A4968 80276088 00000000 */ nop +/* 1A4968 80276088 00000000 */ nop /* 1A496C 8027608C 46002086 */ mov.s $f2, $f4 /* 1A4970 80276090 A6030064 */ sh $v1, 0x64($s0) /* 1A4974 80276094 0809D834 */ j .L802760D0 /* 1A4978 80276098 46001201 */ sub.s $f8, $f2, $f0 .L8027609C: /* 1A497C 8027609C 44821000 */ mtc1 $v0, $f2 -/* 1A4980 802760A0 00000000 */ nop +/* 1A4980 802760A0 00000000 */ nop /* 1A4984 802760A4 468010A0 */ cvt.s.w $f2, $f2 /* 1A4988 802760A8 86020064 */ lh $v0, 0x64($s0) /* 1A498C 802760AC 46022083 */ div.s $f2, $f4, $f2 /* 1A4990 802760B0 44820000 */ mtc1 $v0, $f0 -/* 1A4994 802760B4 00000000 */ nop +/* 1A4994 802760B4 00000000 */ nop /* 1A4998 802760B8 46800020 */ cvt.s.w $f0, $f0 /* 1A499C 802760BC 46020002 */ mul.s $f0, $f0, $f2 -/* 1A49A0 802760C0 00000000 */ nop +/* 1A49A0 802760C0 00000000 */ nop /* 1A49A4 802760C4 C604004C */ lwc1 $f4, 0x4c($s0) /* 1A49A8 802760C8 E6020040 */ swc1 $f2, 0x40($s0) /* 1A49AC 802760CC 46002201 */ sub.s $f8, $f4, $f0 @@ -132,14 +132,14 @@ glabel func_80275F00 /* 1A49BC 802760DC 44812000 */ mtc1 $at, $f4 /* 1A49C0 802760E0 C602000C */ lwc1 $f2, 0xc($s0) /* 1A49C4 802760E4 44820000 */ mtc1 $v0, $f0 -/* 1A49C8 802760E8 00000000 */ nop +/* 1A49C8 802760E8 00000000 */ nop /* 1A49CC 802760EC 46800020 */ cvt.s.w $f0, $f0 /* 1A49D0 802760F0 46002103 */ div.s $f4, $f4, $f0 /* 1A49D4 802760F4 C6000000 */ lwc1 $f0, ($s0) /* 1A49D8 802760F8 46001081 */ sub.s $f2, $f2, $f0 /* 1A49DC 802760FC 8E06005C */ lw $a2, 0x5c($s0) /* 1A49E0 80276100 44820000 */ mtc1 $v0, $f0 -/* 1A49E4 80276104 00000000 */ nop +/* 1A49E4 80276104 00000000 */ nop /* 1A49E8 80276108 46800020 */ cvt.s.w $f0, $f0 /* 1A49EC 8027610C 46001083 */ div.s $f2, $f2, $f0 /* 1A49F0 80276110 C6000010 */ lwc1 $f0, 0x10($s0) @@ -150,7 +150,7 @@ glabel func_80275F00 /* 1A4A04 80276124 C6040014 */ lwc1 $f4, 0x14($s0) /* 1A4A08 80276128 46020001 */ sub.s $f0, $f0, $f2 /* 1A4A0C 8027612C 44821000 */ mtc1 $v0, $f2 -/* 1A4A10 80276130 00000000 */ nop +/* 1A4A10 80276130 00000000 */ nop /* 1A4A14 80276134 468010A0 */ cvt.s.w $f2, $f2 /* 1A4A18 80276138 46001186 */ mov.s $f6, $f2 /* 1A4A1C 8027613C 46020003 */ div.s $f0, $f0, $f2 @@ -191,7 +191,7 @@ glabel func_80275F00 /* 1A4AA4 802761C4 14410004 */ bne $v0, $at, .L802761D8 /* 1A4AA8 802761C8 3C018000 */ lui $at, 0x8000 /* 1A4AAC 802761CC 14610002 */ bne $v1, $at, .L802761D8 -/* 1A4AB0 802761D0 00000000 */ nop +/* 1A4AB0 802761D0 00000000 */ nop /* 1A4AB4 802761D4 0006000D */ break 6 .L802761D8: /* 1A4AB8 802761D8 00001812 */ mflo $v1 @@ -225,7 +225,7 @@ glabel func_80275F00 /* 1A4B28 80276248 44810000 */ mtc1 $at, $f0 /* 1A4B2C 8027624C 4600A521 */ cvt.d.s $f20, $f20 /* 1A4B30 80276250 46006302 */ mul.s $f12, $f12, $f0 -/* 1A4B34 80276254 00000000 */ nop +/* 1A4B34 80276254 00000000 */ nop /* 1A4B38 80276258 4600B5A1 */ cvt.d.s $f22, $f22 /* 1A4B3C 8027625C 3C0143B4 */ lui $at, 0x43b4 /* 1A4B40 80276260 44810000 */ mtc1 $at, $f0 @@ -233,7 +233,7 @@ glabel func_80275F00 /* 1A4B48 80276268 E6080050 */ swc1 $f8, 0x50($s0) /* 1A4B4C 8027626C 46006303 */ div.s $f12, $f12, $f0 /* 1A4B50 80276270 44830000 */ mtc1 $v1, $f0 -/* 1A4B54 80276274 00000000 */ nop +/* 1A4B54 80276274 00000000 */ nop /* 1A4B58 80276278 46800020 */ cvt.s.w $f0, $f0 /* 1A4B5C 8027627C 0C00A85B */ jal sin_rad /* 1A4B60 80276280 E6000028 */ swc1 $f0, 0x28($s0) @@ -241,9 +241,9 @@ glabel func_80275F00 /* 1A4B68 80276288 D422D940 */ ldc1 $f2, %lo(D_8029D940)($at) /* 1A4B6C 8027628C 46000021 */ cvt.d.s $f0, $f0 /* 1A4B70 80276290 46220002 */ mul.d $f0, $f0, $f2 -/* 1A4B74 80276294 00000000 */ nop +/* 1A4B74 80276294 00000000 */ nop /* 1A4B78 80276298 46360002 */ mul.d $f0, $f0, $f22 -/* 1A4B7C 8027629C 00000000 */ nop +/* 1A4B7C 8027629C 00000000 */ nop /* 1A4B80 802762A0 46360000 */ add.d $f0, $f0, $f22 /* 1A4B84 802762A4 4620A500 */ add.d $f20, $f20, $f0 /* 1A4B88 802762A8 0809DA29 */ j .L802768A4 @@ -279,29 +279,29 @@ glabel func_80275F00 /* 1A4BFC 8027631C 46002003 */ div.s $f0, $f4, $f0 /* 1A4C00 80276320 4600028D */ trunc.w.s $f10, $f0 /* 1A4C04 80276324 44035000 */ mfc1 $v1, $f10 -/* 1A4C08 80276328 00000000 */ nop +/* 1A4C08 80276328 00000000 */ nop /* 1A4C0C 8027632C 00031400 */ sll $v0, $v1, 0x10 /* 1A4C10 80276330 00021403 */ sra $v0, $v0, 0x10 /* 1A4C14 80276334 44820000 */ mtc1 $v0, $f0 -/* 1A4C18 80276338 00000000 */ nop +/* 1A4C18 80276338 00000000 */ nop /* 1A4C1C 8027633C 46800020 */ cvt.s.w $f0, $f0 /* 1A4C20 80276340 46020002 */ mul.s $f0, $f0, $f2 -/* 1A4C24 80276344 00000000 */ nop +/* 1A4C24 80276344 00000000 */ nop /* 1A4C28 80276348 46002086 */ mov.s $f2, $f4 /* 1A4C2C 8027634C A6030064 */ sh $v1, 0x64($s0) /* 1A4C30 80276350 0809D8E3 */ j .L8027638C /* 1A4C34 80276354 46001201 */ sub.s $f8, $f2, $f0 .L80276358: /* 1A4C38 80276358 44821000 */ mtc1 $v0, $f2 -/* 1A4C3C 8027635C 00000000 */ nop +/* 1A4C3C 8027635C 00000000 */ nop /* 1A4C40 80276360 468010A0 */ cvt.s.w $f2, $f2 /* 1A4C44 80276364 86020064 */ lh $v0, 0x64($s0) /* 1A4C48 80276368 46022083 */ div.s $f2, $f4, $f2 /* 1A4C4C 8027636C 44820000 */ mtc1 $v0, $f0 -/* 1A4C50 80276370 00000000 */ nop +/* 1A4C50 80276370 00000000 */ nop /* 1A4C54 80276374 46800020 */ cvt.s.w $f0, $f0 /* 1A4C58 80276378 46020002 */ mul.s $f0, $f0, $f2 -/* 1A4C5C 8027637C 00000000 */ nop +/* 1A4C5C 8027637C 00000000 */ nop /* 1A4C60 80276380 C604004C */ lwc1 $f4, 0x4c($s0) /* 1A4C64 80276384 E6020040 */ swc1 $f2, 0x40($s0) /* 1A4C68 80276388 46002201 */ sub.s $f8, $f4, $f0 @@ -312,14 +312,14 @@ glabel func_80275F00 /* 1A4C78 80276398 44812000 */ mtc1 $at, $f4 /* 1A4C7C 8027639C C602000C */ lwc1 $f2, 0xc($s0) /* 1A4C80 802763A0 44820000 */ mtc1 $v0, $f0 -/* 1A4C84 802763A4 00000000 */ nop +/* 1A4C84 802763A4 00000000 */ nop /* 1A4C88 802763A8 46800020 */ cvt.s.w $f0, $f0 /* 1A4C8C 802763AC 46002103 */ div.s $f4, $f4, $f0 /* 1A4C90 802763B0 C6000000 */ lwc1 $f0, ($s0) /* 1A4C94 802763B4 46001081 */ sub.s $f2, $f2, $f0 /* 1A4C98 802763B8 8E060058 */ lw $a2, 0x58($s0) /* 1A4C9C 802763BC 44820000 */ mtc1 $v0, $f0 -/* 1A4CA0 802763C0 00000000 */ nop +/* 1A4CA0 802763C0 00000000 */ nop /* 1A4CA4 802763C4 46800020 */ cvt.s.w $f0, $f0 /* 1A4CA8 802763C8 46001083 */ div.s $f2, $f2, $f0 /* 1A4CAC 802763CC C6000010 */ lwc1 $f0, 0x10($s0) @@ -330,7 +330,7 @@ glabel func_80275F00 /* 1A4CC0 802763E0 C6040014 */ lwc1 $f4, 0x14($s0) /* 1A4CC4 802763E4 46020001 */ sub.s $f0, $f0, $f2 /* 1A4CC8 802763E8 44821000 */ mtc1 $v0, $f2 -/* 1A4CCC 802763EC 00000000 */ nop +/* 1A4CCC 802763EC 00000000 */ nop /* 1A4CD0 802763F0 468010A0 */ cvt.s.w $f2, $f2 /* 1A4CD4 802763F4 46001186 */ mov.s $f6, $f2 /* 1A4CD8 802763F8 46020003 */ div.s $f0, $f0, $f2 @@ -371,7 +371,7 @@ glabel func_80275F00 /* 1A4D60 80276480 14410004 */ bne $v0, $at, .L80276494 /* 1A4D64 80276484 3C018000 */ lui $at, 0x8000 /* 1A4D68 80276488 14610002 */ bne $v1, $at, .L80276494 -/* 1A4D6C 8027648C 00000000 */ nop +/* 1A4D6C 8027648C 00000000 */ nop /* 1A4D70 80276490 0006000D */ break 6 .L80276494: /* 1A4D74 80276494 00001812 */ mflo $v1 @@ -405,7 +405,7 @@ glabel func_80275F00 /* 1A4DE4 80276504 44810000 */ mtc1 $at, $f0 /* 1A4DE8 80276508 4600A521 */ cvt.d.s $f20, $f20 /* 1A4DEC 8027650C 46006302 */ mul.s $f12, $f12, $f0 -/* 1A4DF0 80276510 00000000 */ nop +/* 1A4DF0 80276510 00000000 */ nop /* 1A4DF4 80276514 4600B5A1 */ cvt.d.s $f22, $f22 /* 1A4DF8 80276518 3C0143B4 */ lui $at, 0x43b4 /* 1A4DFC 8027651C 44810000 */ mtc1 $at, $f0 @@ -413,7 +413,7 @@ glabel func_80275F00 /* 1A4E04 80276524 E6080050 */ swc1 $f8, 0x50($s0) /* 1A4E08 80276528 46006303 */ div.s $f12, $f12, $f0 /* 1A4E0C 8027652C 44830000 */ mtc1 $v1, $f0 -/* 1A4E10 80276530 00000000 */ nop +/* 1A4E10 80276530 00000000 */ nop /* 1A4E14 80276534 46800020 */ cvt.s.w $f0, $f0 /* 1A4E18 80276538 0C00A85B */ jal sin_rad /* 1A4E1C 8027653C E6000028 */ swc1 $f0, 0x28($s0) @@ -421,9 +421,9 @@ glabel func_80275F00 /* 1A4E24 80276544 D422D950 */ ldc1 $f2, %lo(D_8029D950)($at) /* 1A4E28 80276548 46000021 */ cvt.d.s $f0, $f0 /* 1A4E2C 8027654C 46220002 */ mul.d $f0, $f0, $f2 -/* 1A4E30 80276550 00000000 */ nop +/* 1A4E30 80276550 00000000 */ nop /* 1A4E34 80276554 46360002 */ mul.d $f0, $f0, $f22 -/* 1A4E38 80276558 00000000 */ nop +/* 1A4E38 80276558 00000000 */ nop /* 1A4E3C 8027655C 46360000 */ add.d $f0, $f0, $f22 /* 1A4E40 80276560 4620A500 */ add.d $f20, $f20, $f0 /* 1A4E44 80276564 0809DA29 */ j .L802768A4 @@ -447,7 +447,7 @@ glabel func_80275F00 /* 1A4E84 802765A4 14410004 */ bne $v0, $at, .L802765B8 /* 1A4E88 802765A8 3C018000 */ lui $at, 0x8000 /* 1A4E8C 802765AC 14610002 */ bne $v1, $at, .L802765B8 -/* 1A4E90 802765B0 00000000 */ nop +/* 1A4E90 802765B0 00000000 */ nop /* 1A4E94 802765B4 0006000D */ break 6 .L802765B8: /* 1A4E98 802765B8 00001812 */ mflo $v1 @@ -456,7 +456,7 @@ glabel func_80275F00 /* 1A4EA4 802765C4 46020001 */ sub.s $f0, $f0, $f2 /* 1A4EA8 802765C8 3C0142B4 */ lui $at, 0x42b4 /* 1A4EAC 802765CC 44811000 */ mtc1 $at, $f2 -/* 1A4EB0 802765D0 00000000 */ nop +/* 1A4EB0 802765D0 00000000 */ nop /* 1A4EB4 802765D4 E6020024 */ swc1 $f2, 0x24($s0) /* 1A4EB8 802765D8 3C01802A */ lui $at, %hi(D_8029D958) /* 1A4EBC 802765DC D422D958 */ ldc1 $f2, %lo(D_8029D958)($at) @@ -466,7 +466,7 @@ glabel func_80275F00 /* 1A4ECC 802765EC 46200020 */ cvt.s.d $f0, $f0 /* 1A4ED0 802765F0 E6000050 */ swc1 $f0, 0x50($s0) /* 1A4ED4 802765F4 44830000 */ mtc1 $v1, $f0 -/* 1A4ED8 802765F8 00000000 */ nop +/* 1A4ED8 802765F8 00000000 */ nop /* 1A4EDC 802765FC 46800020 */ cvt.s.w $f0, $f0 /* 1A4EE0 80276600 E6000028 */ swc1 $f0, 0x28($s0) /* 1A4EE4 80276604 C6400144 */ lwc1 $f0, 0x144($s2) @@ -508,29 +508,29 @@ glabel func_80275F00 /* 1A4F70 80276690 46002003 */ div.s $f0, $f4, $f0 /* 1A4F74 80276694 4600028D */ trunc.w.s $f10, $f0 /* 1A4F78 80276698 44035000 */ mfc1 $v1, $f10 -/* 1A4F7C 8027669C 00000000 */ nop +/* 1A4F7C 8027669C 00000000 */ nop /* 1A4F80 802766A0 00031400 */ sll $v0, $v1, 0x10 /* 1A4F84 802766A4 00021403 */ sra $v0, $v0, 0x10 /* 1A4F88 802766A8 44820000 */ mtc1 $v0, $f0 -/* 1A4F8C 802766AC 00000000 */ nop +/* 1A4F8C 802766AC 00000000 */ nop /* 1A4F90 802766B0 46800020 */ cvt.s.w $f0, $f0 /* 1A4F94 802766B4 46020002 */ mul.s $f0, $f0, $f2 -/* 1A4F98 802766B8 00000000 */ nop +/* 1A4F98 802766B8 00000000 */ nop /* 1A4F9C 802766BC 46002086 */ mov.s $f2, $f4 /* 1A4FA0 802766C0 A6030064 */ sh $v1, 0x64($s0) /* 1A4FA4 802766C4 0809D9C0 */ j .L80276700 /* 1A4FA8 802766C8 46001201 */ sub.s $f8, $f2, $f0 .L802766CC: /* 1A4FAC 802766CC 44821000 */ mtc1 $v0, $f2 -/* 1A4FB0 802766D0 00000000 */ nop +/* 1A4FB0 802766D0 00000000 */ nop /* 1A4FB4 802766D4 468010A0 */ cvt.s.w $f2, $f2 /* 1A4FB8 802766D8 86020064 */ lh $v0, 0x64($s0) /* 1A4FBC 802766DC 46022083 */ div.s $f2, $f4, $f2 /* 1A4FC0 802766E0 44820000 */ mtc1 $v0, $f0 -/* 1A4FC4 802766E4 00000000 */ nop +/* 1A4FC4 802766E4 00000000 */ nop /* 1A4FC8 802766E8 46800020 */ cvt.s.w $f0, $f0 /* 1A4FCC 802766EC 46020002 */ mul.s $f0, $f0, $f2 -/* 1A4FD0 802766F0 00000000 */ nop +/* 1A4FD0 802766F0 00000000 */ nop /* 1A4FD4 802766F4 C604004C */ lwc1 $f4, 0x4c($s0) /* 1A4FD8 802766F8 E6020040 */ swc1 $f2, 0x40($s0) /* 1A4FDC 802766FC 46002201 */ sub.s $f8, $f4, $f0 @@ -542,7 +542,7 @@ glabel func_80275F00 /* 1A4FF0 80276710 C602000C */ lwc1 $f2, 0xc($s0) /* 1A4FF4 80276714 24420001 */ addiu $v0, $v0, 1 /* 1A4FF8 80276718 44820000 */ mtc1 $v0, $f0 -/* 1A4FFC 8027671C 00000000 */ nop +/* 1A4FFC 8027671C 00000000 */ nop /* 1A5000 80276720 46800020 */ cvt.s.w $f0, $f0 /* 1A5004 80276724 46002103 */ div.s $f4, $f4, $f0 /* 1A5008 80276728 C6000000 */ lwc1 $f0, ($s0) @@ -550,7 +550,7 @@ glabel func_80275F00 /* 1A5010 80276730 46001081 */ sub.s $f2, $f2, $f0 /* 1A5014 80276734 8E060058 */ lw $a2, 0x58($s0) /* 1A5018 80276738 44820000 */ mtc1 $v0, $f0 -/* 1A501C 8027673C 00000000 */ nop +/* 1A501C 8027673C 00000000 */ nop /* 1A5020 80276740 46800020 */ cvt.s.w $f0, $f0 /* 1A5024 80276744 46001083 */ div.s $f2, $f2, $f0 /* 1A5028 80276748 C6000010 */ lwc1 $f0, 0x10($s0) @@ -561,7 +561,7 @@ glabel func_80275F00 /* 1A503C 8027675C C6040014 */ lwc1 $f4, 0x14($s0) /* 1A5040 80276760 46020001 */ sub.s $f0, $f0, $f2 /* 1A5044 80276764 44821000 */ mtc1 $v0, $f2 -/* 1A5048 80276768 00000000 */ nop +/* 1A5048 80276768 00000000 */ nop /* 1A504C 8027676C 468010A0 */ cvt.s.w $f2, $f2 /* 1A5050 80276770 46001186 */ mov.s $f6, $f2 /* 1A5054 80276774 46020003 */ div.s $f0, $f0, $f2 @@ -595,7 +595,7 @@ glabel func_80275F00 /* 1A50C0 802767E0 14610004 */ bne $v1, $at, .L802767F4 /* 1A50C4 802767E4 3C018000 */ lui $at, 0x8000 /* 1A50C8 802767E8 14410002 */ bne $v0, $at, .L802767F4 -/* 1A50CC 802767EC 00000000 */ nop +/* 1A50CC 802767EC 00000000 */ nop /* 1A50D0 802767F0 0006000D */ break 6 .L802767F4: /* 1A50D4 802767F4 00001012 */ mflo $v0 @@ -607,14 +607,14 @@ glabel func_80275F00 /* 1A50EC 8027680C E6000024 */ swc1 $f0, 0x24($s0) /* 1A50F0 80276810 E6020050 */ swc1 $f2, 0x50($s0) /* 1A50F4 80276814 44820000 */ mtc1 $v0, $f0 -/* 1A50F8 80276818 00000000 */ nop +/* 1A50F8 80276818 00000000 */ nop /* 1A50FC 8027681C 46800020 */ cvt.s.w $f0, $f0 /* 1A5100 80276820 24020004 */ addiu $v0, $zero, 4 /* 1A5104 80276824 14620005 */ bne $v1, $v0, .L8027683C /* 1A5108 80276828 E6000028 */ swc1 $f0, 0x28($s0) /* 1A510C 8027682C 3C014261 */ lui $at, 0x4261 /* 1A5110 80276830 44810000 */ mtc1 $at, $f0 -/* 1A5114 80276834 00000000 */ nop +/* 1A5114 80276834 00000000 */ nop /* 1A5118 80276838 E6000050 */ swc1 $f0, 0x50($s0) .L8027683C: /* 1A511C 8027683C C60C0024 */ lwc1 $f12, 0x24($s0) @@ -625,7 +625,7 @@ glabel func_80275F00 /* 1A5130 80276850 C616003C */ lwc1 $f22, 0x3c($s0) /* 1A5134 80276854 AE000018 */ sw $zero, 0x18($s0) /* 1A5138 80276858 46006302 */ mul.s $f12, $f12, $f0 -/* 1A513C 8027685C 00000000 */ nop +/* 1A513C 8027685C 00000000 */ nop /* 1A5140 80276860 AE00001C */ sw $zero, 0x1c($s0) /* 1A5144 80276864 4600A521 */ cvt.d.s $f20, $f20 /* 1A5148 80276868 3C0143B4 */ lui $at, 0x43b4 @@ -637,9 +637,9 @@ glabel func_80275F00 /* 1A5160 80276880 D422D960 */ ldc1 $f2, %lo(D_8029D960)($at) /* 1A5164 80276884 46000021 */ cvt.d.s $f0, $f0 /* 1A5168 80276888 46220002 */ mul.d $f0, $f0, $f2 -/* 1A516C 8027688C 00000000 */ nop +/* 1A516C 8027688C 00000000 */ nop /* 1A5170 80276890 46360002 */ mul.d $f0, $f0, $f22 -/* 1A5174 80276894 00000000 */ nop +/* 1A5174 80276894 00000000 */ nop /* 1A5178 80276898 46360000 */ add.d $f0, $f0, $f22 /* 1A517C 8027689C 4620A500 */ add.d $f20, $f20, $f0 /* 1A5180 802768A0 2402001F */ addiu $v0, $zero, 0x1f @@ -658,7 +658,7 @@ glabel func_80275F00 /* 1A51A8 802768C8 1082000A */ beq $a0, $v0, .L802768F4 /* 1A51AC 802768CC 0000102D */ daddu $v0, $zero, $zero /* 1A51B0 802768D0 0809DBA2 */ j .L80276E88 -/* 1A51B4 802768D4 00000000 */ nop +/* 1A51B4 802768D4 00000000 */ nop .L802768D8: /* 1A51B8 802768D8 24020015 */ addiu $v0, $zero, 0x15 /* 1A51BC 802768DC 108200C7 */ beq $a0, $v0, .L80276BFC @@ -666,7 +666,7 @@ glabel func_80275F00 /* 1A51C4 802768E4 10820100 */ beq $a0, $v0, .L80276CE8 /* 1A51C8 802768E8 0000102D */ daddu $v0, $zero, $zero /* 1A51CC 802768EC 0809DBA2 */ j .L80276E88 -/* 1A51D0 802768F0 00000000 */ nop +/* 1A51D0 802768F0 00000000 */ nop .L802768F4: /* 1A51D4 802768F4 C60C0024 */ lwc1 $f12, 0x24($s0) /* 1A51D8 802768F8 3C0140C9 */ lui $at, 0x40c9 @@ -674,7 +674,7 @@ glabel func_80275F00 /* 1A51E0 80276900 44810000 */ mtc1 $at, $f0 /* 1A51E4 80276904 C6160044 */ lwc1 $f22, 0x44($s0) /* 1A51E8 80276908 46006302 */ mul.s $f12, $f12, $f0 -/* 1A51EC 8027690C 00000000 */ nop +/* 1A51EC 8027690C 00000000 */ nop /* 1A51F0 80276910 C614003C */ lwc1 $f20, 0x3c($s0) /* 1A51F4 80276914 4600B5A1 */ cvt.d.s $f22, $f22 /* 1A51F8 80276918 3C0143B4 */ lui $at, 0x43b4 @@ -686,9 +686,9 @@ glabel func_80275F00 /* 1A5210 80276930 D422D968 */ ldc1 $f2, %lo(D_8029D968)($at) /* 1A5214 80276934 46000021 */ cvt.d.s $f0, $f0 /* 1A5218 80276938 46220002 */ mul.d $f0, $f0, $f2 -/* 1A521C 8027693C 00000000 */ nop +/* 1A521C 8027693C 00000000 */ nop /* 1A5220 80276940 46340002 */ mul.d $f0, $f0, $f20 -/* 1A5224 80276944 00000000 */ nop +/* 1A5224 80276944 00000000 */ nop /* 1A5228 80276948 C6080000 */ lwc1 $f8, ($s0) /* 1A522C 8027694C C6020030 */ lwc1 $f2, 0x30($s0) /* 1A5230 80276950 C6060004 */ lwc1 $f6, 4($s0) @@ -713,7 +713,7 @@ glabel func_80275F00 /* 1A527C 8027699C C60C0044 */ lwc1 $f12, 0x44($s0) /* 1A5280 802769A0 C6020050 */ lwc1 $f2, 0x50($s0) /* 1A5284 802769A4 46001082 */ mul.s $f2, $f2, $f0 -/* 1A5288 802769A8 00000000 */ nop +/* 1A5288 802769A8 00000000 */ nop /* 1A528C 802769AC C6000004 */ lwc1 $f0, 4($s0) /* 1A5290 802769B0 46020000 */ add.s $f0, $f0, $f2 /* 1A5294 802769B4 E6400148 */ swc1 $f0, 0x148($s2) @@ -730,7 +730,7 @@ glabel func_80275F00 /* 1A52C0 802769E0 C64C0160 */ lwc1 $f12, 0x160($s2) /* 1A52C4 802769E4 3C014305 */ lui $at, 0x4305 /* 1A52C8 802769E8 44810000 */ mtc1 $at, $f0 -/* 1A52CC 802769EC 00000000 */ nop +/* 1A52CC 802769EC 00000000 */ nop /* 1A52D0 802769F0 46006300 */ add.s $f12, $f12, $f0 /* 1A52D4 802769F4 0C00A6C9 */ jal clamp_angle /* 1A52D8 802769F8 E64C0160 */ swc1 $f12, 0x160($s2) @@ -757,7 +757,7 @@ glabel func_80275F00 /* 1A5328 80276A48 44810000 */ mtc1 $at, $f0 /* 1A532C 80276A4C C6160044 */ lwc1 $f22, 0x44($s0) /* 1A5330 80276A50 46006302 */ mul.s $f12, $f12, $f0 -/* 1A5334 80276A54 00000000 */ nop +/* 1A5334 80276A54 00000000 */ nop /* 1A5338 80276A58 C614003C */ lwc1 $f20, 0x3c($s0) /* 1A533C 80276A5C 4600B5A1 */ cvt.d.s $f22, $f22 /* 1A5340 80276A60 3C0143B4 */ lui $at, 0x43b4 @@ -769,9 +769,9 @@ glabel func_80275F00 /* 1A5358 80276A78 D422D970 */ ldc1 $f2, %lo(D_8029D970)($at) /* 1A535C 80276A7C 46000021 */ cvt.d.s $f0, $f0 /* 1A5360 80276A80 46220002 */ mul.d $f0, $f0, $f2 -/* 1A5364 80276A84 00000000 */ nop +/* 1A5364 80276A84 00000000 */ nop /* 1A5368 80276A88 46340002 */ mul.d $f0, $f0, $f20 -/* 1A536C 80276A8C 00000000 */ nop +/* 1A536C 80276A8C 00000000 */ nop /* 1A5370 80276A90 C6080000 */ lwc1 $f8, ($s0) /* 1A5374 80276A94 C6020030 */ lwc1 $f2, 0x30($s0) /* 1A5378 80276A98 C6060004 */ lwc1 $f6, 4($s0) @@ -796,7 +796,7 @@ glabel func_80275F00 /* 1A53C4 80276AE4 C60C0044 */ lwc1 $f12, 0x44($s0) /* 1A53C8 80276AE8 C6020050 */ lwc1 $f2, 0x50($s0) /* 1A53CC 80276AEC 46001082 */ mul.s $f2, $f2, $f0 -/* 1A53D0 80276AF0 00000000 */ nop +/* 1A53D0 80276AF0 00000000 */ nop /* 1A53D4 80276AF4 C6000004 */ lwc1 $f0, 4($s0) /* 1A53D8 80276AF8 46020000 */ add.s $f0, $f0, $f2 /* 1A53DC 80276AFC E6400148 */ swc1 $f0, 0x148($s2) @@ -805,9 +805,9 @@ glabel func_80275F00 /* 1A53E8 80276B08 C6020010 */ lwc1 $f2, 0x10($s0) /* 1A53EC 80276B0C C6400148 */ lwc1 $f0, 0x148($s2) /* 1A53F0 80276B10 4602003C */ c.lt.s $f0, $f2 -/* 1A53F4 80276B14 00000000 */ nop +/* 1A53F4 80276B14 00000000 */ nop /* 1A53F8 80276B18 45000005 */ bc1f .L80276B30 -/* 1A53FC 80276B1C 00000000 */ nop +/* 1A53FC 80276B1C 00000000 */ nop /* 1A5400 80276B20 86020064 */ lh $v0, 0x64($s0) /* 1A5404 80276B24 28420003 */ slti $v0, $v0, 3 /* 1A5408 80276B28 54400001 */ bnel $v0, $zero, .L80276B30 @@ -828,7 +828,7 @@ glabel func_80275F00 /* 1A5440 80276B60 C64C0160 */ lwc1 $f12, 0x160($s2) /* 1A5444 80276B64 3C014305 */ lui $at, 0x4305 /* 1A5448 80276B68 44810000 */ mtc1 $at, $f0 -/* 1A544C 80276B6C 00000000 */ nop +/* 1A544C 80276B6C 00000000 */ nop /* 1A5450 80276B70 46006300 */ add.s $f12, $f12, $f0 /* 1A5454 80276B74 0C00A6C9 */ jal clamp_angle /* 1A5458 80276B78 E64C0160 */ swc1 $f12, 0x160($s2) @@ -869,9 +869,9 @@ glabel func_80275F00 /* 1A54E0 80276C00 3C0140C9 */ lui $at, 0x40c9 /* 1A54E4 80276C04 34210FD0 */ ori $at, $at, 0xfd0 /* 1A54E8 80276C08 4481B000 */ mtc1 $at, $f22 -/* 1A54EC 80276C0C 00000000 */ nop +/* 1A54EC 80276C0C 00000000 */ nop /* 1A54F0 80276C10 46166302 */ mul.s $f12, $f12, $f22 -/* 1A54F4 80276C14 00000000 */ nop +/* 1A54F4 80276C14 00000000 */ nop /* 1A54F8 80276C18 C6140000 */ lwc1 $f20, ($s0) /* 1A54FC 80276C1C 3C0143B4 */ lui $at, 0x43b4 /* 1A5500 80276C20 4481C000 */ mtc1 $at, $f24 @@ -880,10 +880,10 @@ glabel func_80275F00 /* 1A550C 80276C2C 46186303 */ div.s $f12, $f12, $f24 /* 1A5510 80276C30 C6020050 */ lwc1 $f2, 0x50($s0) /* 1A5514 80276C34 46001082 */ mul.s $f2, $f2, $f0 -/* 1A5518 80276C38 00000000 */ nop +/* 1A5518 80276C38 00000000 */ nop /* 1A551C 80276C3C C60C0024 */ lwc1 $f12, 0x24($s0) /* 1A5520 80276C40 46166302 */ mul.s $f12, $f12, $f22 -/* 1A5524 80276C44 00000000 */ nop +/* 1A5524 80276C44 00000000 */ nop /* 1A5528 80276C48 3C01802A */ lui $at, %hi(D_8029D978) /* 1A552C 80276C4C D420D978 */ ldc1 $f0, %lo(D_8029D978)($at) /* 1A5530 80276C50 460010A1 */ cvt.d.s $f2, $f2 @@ -895,7 +895,7 @@ glabel func_80275F00 /* 1A5548 80276C68 E6140000 */ swc1 $f20, ($s0) /* 1A554C 80276C6C C6020050 */ lwc1 $f2, 0x50($s0) /* 1A5550 80276C70 46001082 */ mul.s $f2, $f2, $f0 -/* 1A5554 80276C74 00000000 */ nop +/* 1A5554 80276C74 00000000 */ nop /* 1A5558 80276C78 C60C0024 */ lwc1 $f12, 0x24($s0) /* 1A555C 80276C7C C6000028 */ lwc1 $f0, 0x28($s0) /* 1A5560 80276C80 46006300 */ add.s $f12, $f12, $f0 @@ -931,7 +931,7 @@ glabel func_80275F00 /* 1A55D4 80276CF4 44810000 */ mtc1 $at, $f0 /* 1A55D8 80276CF8 C6160044 */ lwc1 $f22, 0x44($s0) /* 1A55DC 80276CFC 46006302 */ mul.s $f12, $f12, $f0 -/* 1A55E0 80276D00 00000000 */ nop +/* 1A55E0 80276D00 00000000 */ nop /* 1A55E4 80276D04 C614003C */ lwc1 $f20, 0x3c($s0) /* 1A55E8 80276D08 4600B5A1 */ cvt.d.s $f22, $f22 /* 1A55EC 80276D0C 3C0143B4 */ lui $at, 0x43b4 @@ -943,9 +943,9 @@ glabel func_80275F00 /* 1A5604 80276D24 D422D980 */ ldc1 $f2, %lo(D_8029D980)($at) /* 1A5608 80276D28 46000021 */ cvt.d.s $f0, $f0 /* 1A560C 80276D2C 46220002 */ mul.d $f0, $f0, $f2 -/* 1A5610 80276D30 00000000 */ nop +/* 1A5610 80276D30 00000000 */ nop /* 1A5614 80276D34 46340002 */ mul.d $f0, $f0, $f20 -/* 1A5618 80276D38 00000000 */ nop +/* 1A5618 80276D38 00000000 */ nop /* 1A561C 80276D3C C6080000 */ lwc1 $f8, ($s0) /* 1A5620 80276D40 C6020030 */ lwc1 $f2, 0x30($s0) /* 1A5624 80276D44 C6060004 */ lwc1 $f6, 4($s0) @@ -970,7 +970,7 @@ glabel func_80275F00 /* 1A5670 80276D90 C60C0044 */ lwc1 $f12, 0x44($s0) /* 1A5674 80276D94 C6020050 */ lwc1 $f2, 0x50($s0) /* 1A5678 80276D98 46001082 */ mul.s $f2, $f2, $f0 -/* 1A567C 80276D9C 00000000 */ nop +/* 1A567C 80276D9C 00000000 */ nop /* 1A5680 80276DA0 C6000004 */ lwc1 $f0, 4($s0) /* 1A5684 80276DA4 46020000 */ add.s $f0, $f0, $f2 /* 1A5688 80276DA8 E6400148 */ swc1 $f0, 0x148($s2) @@ -979,9 +979,9 @@ glabel func_80275F00 /* 1A5694 80276DB4 C6020010 */ lwc1 $f2, 0x10($s0) /* 1A5698 80276DB8 C6400148 */ lwc1 $f0, 0x148($s2) /* 1A569C 80276DBC 4602003C */ c.lt.s $f0, $f2 -/* 1A56A0 80276DC0 00000000 */ nop +/* 1A56A0 80276DC0 00000000 */ nop /* 1A56A4 80276DC4 45000005 */ bc1f .L80276DDC -/* 1A56A8 80276DC8 00000000 */ nop +/* 1A56A8 80276DC8 00000000 */ nop /* 1A56AC 80276DCC 86020064 */ lh $v0, 0x64($s0) /* 1A56B0 80276DD0 28420003 */ slti $v0, $v0, 3 /* 1A56B4 80276DD4 54400001 */ bnel $v0, $zero, .L80276DDC @@ -1002,7 +1002,7 @@ glabel func_80275F00 /* 1A56EC 80276E0C C64C0160 */ lwc1 $f12, 0x160($s2) /* 1A56F0 80276E10 3C014305 */ lui $at, 0x4305 /* 1A56F4 80276E14 44810000 */ mtc1 $at, $f0 -/* 1A56F8 80276E18 00000000 */ nop +/* 1A56F8 80276E18 00000000 */ nop /* 1A56FC 80276E1C 46006300 */ add.s $f12, $f12, $f0 /* 1A5700 80276E20 0C00A6C9 */ jal clamp_angle /* 1A5704 80276E24 E64C0160 */ swc1 $f12, 0x160($s2) diff --git a/asm/nonmatchings/code_197F40/set_goal_pos_to_part.s b/asm/nonmatchings/code_197F40/set_goal_pos_to_part.s index 95b4606b8b..22decddf82 100644 --- a/asm/nonmatchings/code_197F40/set_goal_pos_to_part.s +++ b/asm/nonmatchings/code_197F40/set_goal_pos_to_part.s @@ -22,12 +22,12 @@ glabel set_goal_pos_to_part /* 198078 80269798 12000007 */ beqz $s0, .L802697B8 /* 19807C 8026979C 0220202D */ daddu $a0, $s1, $zero /* 198080 802697A0 0809A66F */ j .L802699BC -/* 198084 802697A4 00000000 */ nop +/* 198084 802697A4 00000000 */ nop .L802697A8: /* 198088 802697A8 1202002E */ beq $s0, $v0, .L80269864 /* 19808C 802697AC 0220202D */ daddu $a0, $s1, $zero /* 198090 802697B0 0809A66F */ j .L802699BC -/* 198094 802697B4 00000000 */ nop +/* 198094 802697B4 00000000 */ nop .L802697B8: /* 198098 802697B8 0C099117 */ jal get_actor_part /* 19809C 802697BC 0000282D */ daddu $a1, $zero, $zero @@ -35,20 +35,20 @@ glabel set_goal_pos_to_part /* 1980A4 802697C4 84820014 */ lh $v0, 0x14($a0) /* 1980A8 802697C8 C6200188 */ lwc1 $f0, 0x188($s1) /* 1980AC 802697CC 44821000 */ mtc1 $v0, $f2 -/* 1980B0 802697D0 00000000 */ nop +/* 1980B0 802697D0 00000000 */ nop /* 1980B4 802697D4 468010A0 */ cvt.s.w $f2, $f2 /* 1980B8 802697D8 46001082 */ mul.s $f2, $f2, $f0 -/* 1980BC 802697DC 00000000 */ nop +/* 1980BC 802697DC 00000000 */ nop /* 1980C0 802697E0 C6200144 */ lwc1 $f0, 0x144($s1) /* 1980C4 802697E4 46020000 */ add.s $f0, $f0, $f2 /* 1980C8 802697E8 E640000C */ swc1 $f0, 0xc($s2) /* 1980CC 802697EC 84820016 */ lh $v0, 0x16($a0) /* 1980D0 802697F0 C6200188 */ lwc1 $f0, 0x188($s1) /* 1980D4 802697F4 44821000 */ mtc1 $v0, $f2 -/* 1980D8 802697F8 00000000 */ nop +/* 1980D8 802697F8 00000000 */ nop /* 1980DC 802697FC 468010A0 */ cvt.s.w $f2, $f2 /* 1980E0 80269800 46001082 */ mul.s $f2, $f2, $f0 -/* 1980E4 80269804 00000000 */ nop +/* 1980E4 80269804 00000000 */ nop /* 1980E8 80269808 C6200148 */ lwc1 $f0, 0x148($s1) /* 1980EC 8026980C 46020000 */ add.s $f0, $f0, $f2 /* 1980F0 80269810 3C014120 */ lui $at, 0x4120 @@ -60,13 +60,13 @@ glabel set_goal_pos_to_part /* 198108 80269828 82230214 */ lb $v1, 0x214($s1) /* 19810C 8026982C 2402000C */ addiu $v0, $zero, 0xc /* 198110 80269830 14620062 */ bne $v1, $v0, .L802699BC -/* 198114 80269834 00000000 */ nop +/* 198114 80269834 00000000 */ nop /* 198118 80269838 C6200188 */ lwc1 $f0, 0x188($s1) /* 19811C 8026983C 3C0140A0 */ lui $at, 0x40a0 /* 198120 80269840 44811000 */ mtc1 $at, $f2 -/* 198124 80269844 00000000 */ nop +/* 198124 80269844 00000000 */ nop /* 198128 80269848 46020002 */ mul.s $f0, $f0, $f2 -/* 19812C 8026984C 00000000 */ nop +/* 19812C 8026984C 00000000 */ nop /* 198130 80269850 C6420010 */ lwc1 $f2, 0x10($s2) /* 198134 80269854 46001081 */ sub.s $f2, $f2, $f0 /* 198138 80269858 0809A66F */ j .L802699BC @@ -81,23 +81,23 @@ glabel set_goal_pos_to_part /* 198154 80269874 3C030010 */ lui $v1, 0x10 /* 198158 80269878 00431024 */ and $v0, $v0, $v1 /* 19815C 8026987C 1440002A */ bnez $v0, .L80269928 -/* 198160 80269880 00000000 */ nop +/* 198160 80269880 00000000 */ nop /* 198164 80269884 84820014 */ lh $v0, 0x14($a0) /* 198168 80269888 8483006C */ lh $v1, 0x6c($a0) /* 19816C 8026988C C6200188 */ lwc1 $f0, 0x188($s1) /* 198170 80269890 00431021 */ addu $v0, $v0, $v1 /* 198174 80269894 44821000 */ mtc1 $v0, $f2 -/* 198178 80269898 00000000 */ nop +/* 198178 80269898 00000000 */ nop /* 19817C 8026989C 468010A0 */ cvt.s.w $f2, $f2 /* 198180 802698A0 46001082 */ mul.s $f2, $f2, $f0 -/* 198184 802698A4 00000000 */ nop +/* 198184 802698A4 00000000 */ nop /* 198188 802698A8 C6200144 */ lwc1 $f0, 0x144($s1) /* 19818C 802698AC 46020000 */ add.s $f0, $f0, $f2 /* 198190 802698B0 E640000C */ swc1 $f0, 0xc($s2) /* 198194 802698B4 8E220000 */ lw $v0, ($s1) /* 198198 802698B8 30420800 */ andi $v0, $v0, 0x800 /* 19819C 802698BC 14400006 */ bnez $v0, .L802698D8 -/* 1981A0 802698C0 00000000 */ nop +/* 1981A0 802698C0 00000000 */ nop /* 1981A4 802698C4 84820016 */ lh $v0, 0x16($a0) /* 1981A8 802698C8 8483006E */ lh $v1, 0x6e($a0) /* 1981AC 802698CC C6200188 */ lwc1 $f0, 0x188($s1) @@ -111,17 +111,17 @@ glabel set_goal_pos_to_part /* 1981C8 802698E8 00431023 */ subu $v0, $v0, $v1 .L802698EC: /* 1981CC 802698EC 44821000 */ mtc1 $v0, $f2 -/* 1981D0 802698F0 00000000 */ nop +/* 1981D0 802698F0 00000000 */ nop /* 1981D4 802698F4 468010A0 */ cvt.s.w $f2, $f2 /* 1981D8 802698F8 46001082 */ mul.s $f2, $f2, $f0 -/* 1981DC 802698FC 00000000 */ nop +/* 1981DC 802698FC 00000000 */ nop /* 1981E0 80269900 C6200148 */ lwc1 $f0, 0x148($s1) /* 1981E4 80269904 46020000 */ add.s $f0, $f0, $f2 /* 1981E8 80269908 E6400010 */ swc1 $f0, 0x10($s2) /* 1981EC 8026990C 84820018 */ lh $v0, 0x18($a0) /* 1981F0 80269910 C620014C */ lwc1 $f0, 0x14c($s1) /* 1981F4 80269914 44821000 */ mtc1 $v0, $f2 -/* 1981F8 80269918 00000000 */ nop +/* 1981F8 80269918 00000000 */ nop /* 1981FC 8026991C 468010A0 */ cvt.s.w $f2, $f2 /* 198200 80269920 0809A66A */ j .L802699A8 /* 198204 80269924 46020000 */ add.s $f0, $f0, $f2 @@ -129,21 +129,21 @@ glabel set_goal_pos_to_part /* 198208 80269928 8482006C */ lh $v0, 0x6c($a0) /* 19820C 8026992C C480002C */ lwc1 $f0, 0x2c($a0) /* 198210 80269930 44821000 */ mtc1 $v0, $f2 -/* 198214 80269934 00000000 */ nop +/* 198214 80269934 00000000 */ nop /* 198218 80269938 468010A0 */ cvt.s.w $f2, $f2 /* 19821C 8026993C 46020000 */ add.s $f0, $f0, $f2 /* 198220 80269940 E640000C */ swc1 $f0, 0xc($s2) /* 198224 80269944 8E220000 */ lw $v0, ($s1) /* 198228 80269948 30420800 */ andi $v0, $v0, 0x800 /* 19822C 8026994C 1440000B */ bnez $v0, .L8026997C -/* 198230 80269950 00000000 */ nop +/* 198230 80269950 00000000 */ nop /* 198234 80269954 8482006E */ lh $v0, 0x6e($a0) /* 198238 80269958 C6200188 */ lwc1 $f0, 0x188($s1) /* 19823C 8026995C 44821000 */ mtc1 $v0, $f2 -/* 198240 80269960 00000000 */ nop +/* 198240 80269960 00000000 */ nop /* 198244 80269964 468010A0 */ cvt.s.w $f2, $f2 /* 198248 80269968 46001082 */ mul.s $f2, $f2, $f0 -/* 19824C 8026996C 00000000 */ nop +/* 19824C 8026996C 00000000 */ nop /* 198250 80269970 C4800030 */ lwc1 $f0, 0x30($a0) /* 198254 80269974 0809A668 */ j .L802699A0 /* 198258 80269978 46020000 */ add.s $f0, $f0, $f2 @@ -151,10 +151,10 @@ glabel set_goal_pos_to_part /* 19825C 8026997C 8482006E */ lh $v0, 0x6e($a0) /* 198260 80269980 C6200188 */ lwc1 $f0, 0x188($s1) /* 198264 80269984 44821000 */ mtc1 $v0, $f2 -/* 198268 80269988 00000000 */ nop +/* 198268 80269988 00000000 */ nop /* 19826C 8026998C 468010A0 */ cvt.s.w $f2, $f2 /* 198270 80269990 46001082 */ mul.s $f2, $f2, $f0 -/* 198274 80269994 00000000 */ nop +/* 198274 80269994 00000000 */ nop /* 198278 80269998 C4800030 */ lwc1 $f0, 0x30($a0) /* 19827C 8026999C 46020001 */ sub.s $f0, $f0, $f2 .L802699A0: @@ -163,7 +163,7 @@ glabel set_goal_pos_to_part .L802699A8: /* 198288 802699A8 3C014120 */ lui $at, 0x4120 /* 19828C 802699AC 44811000 */ mtc1 $at, $f2 -/* 198290 802699B0 00000000 */ nop +/* 198290 802699B0 00000000 */ nop /* 198294 802699B4 46020000 */ add.s $f0, $f0, $f2 /* 198298 802699B8 E6400014 */ swc1 $f0, 0x14($s2) .L802699BC: diff --git a/asm/nonmatchings/code_197F40/set_part_goal_to_actor_part.s b/asm/nonmatchings/code_197F40/set_part_goal_to_actor_part.s index 534203e94c..c238f99336 100644 --- a/asm/nonmatchings/code_197F40/set_part_goal_to_actor_part.s +++ b/asm/nonmatchings/code_197F40/set_part_goal_to_actor_part.s @@ -20,12 +20,12 @@ glabel set_part_goal_to_actor_part /* 1982F4 80269A14 12000007 */ beqz $s0, .L80269A34 /* 1982F8 80269A18 0220202D */ daddu $a0, $s1, $zero /* 1982FC 80269A1C 0809A703 */ j .L80269C0C -/* 198300 80269A20 00000000 */ nop +/* 198300 80269A20 00000000 */ nop .L80269A24: /* 198304 80269A24 12020021 */ beq $s0, $v0, .L80269AAC /* 198308 80269A28 0220202D */ daddu $a0, $s1, $zero /* 19830C 80269A2C 0809A703 */ j .L80269C0C -/* 198310 80269A30 00000000 */ nop +/* 198310 80269A30 00000000 */ nop .L80269A34: /* 198314 80269A34 0C099117 */ jal get_actor_part /* 198318 80269A38 0000282D */ daddu $a1, $zero, $zero @@ -33,10 +33,10 @@ glabel set_part_goal_to_actor_part /* 198320 80269A40 84820014 */ lh $v0, 0x14($a0) /* 198324 80269A44 C6220188 */ lwc1 $f2, 0x188($s1) /* 198328 80269A48 44820000 */ mtc1 $v0, $f0 -/* 19832C 80269A4C 00000000 */ nop +/* 19832C 80269A4C 00000000 */ nop /* 198330 80269A50 46800020 */ cvt.s.w $f0, $f0 /* 198334 80269A54 46020002 */ mul.s $f0, $f0, $f2 -/* 198338 80269A58 00000000 */ nop +/* 198338 80269A58 00000000 */ nop /* 19833C 80269A5C C6220144 */ lwc1 $f2, 0x144($s1) /* 198340 80269A60 46001080 */ add.s $f2, $f2, $f0 /* 198344 80269A64 8C820010 */ lw $v0, 0x10($a0) @@ -44,10 +44,10 @@ glabel set_part_goal_to_actor_part /* 19834C 80269A6C 84820016 */ lh $v0, 0x16($a0) /* 198350 80269A70 C6220188 */ lwc1 $f2, 0x188($s1) /* 198354 80269A74 44820000 */ mtc1 $v0, $f0 -/* 198358 80269A78 00000000 */ nop +/* 198358 80269A78 00000000 */ nop /* 19835C 80269A7C 46800020 */ cvt.s.w $f0, $f0 /* 198360 80269A80 46020002 */ mul.s $f0, $f0, $f2 -/* 198364 80269A84 00000000 */ nop +/* 198364 80269A84 00000000 */ nop /* 198368 80269A88 C6220148 */ lwc1 $f2, 0x148($s1) /* 19836C 80269A8C 46001080 */ add.s $f2, $f2, $f0 /* 198370 80269A90 8C820010 */ lw $v0, 0x10($a0) @@ -66,16 +66,16 @@ glabel set_part_goal_to_actor_part /* 19839C 80269ABC 3C030010 */ lui $v1, 0x10 /* 1983A0 80269AC0 00431024 */ and $v0, $v0, $v1 /* 1983A4 80269AC4 1440002D */ bnez $v0, .L80269B7C -/* 1983A8 80269AC8 00000000 */ nop +/* 1983A8 80269AC8 00000000 */ nop /* 1983AC 80269ACC 84820014 */ lh $v0, 0x14($a0) /* 1983B0 80269AD0 8483006C */ lh $v1, 0x6c($a0) /* 1983B4 80269AD4 C6220188 */ lwc1 $f2, 0x188($s1) /* 1983B8 80269AD8 00431021 */ addu $v0, $v0, $v1 /* 1983BC 80269ADC 44820000 */ mtc1 $v0, $f0 -/* 1983C0 80269AE0 00000000 */ nop +/* 1983C0 80269AE0 00000000 */ nop /* 1983C4 80269AE4 46800020 */ cvt.s.w $f0, $f0 /* 1983C8 80269AE8 46020002 */ mul.s $f0, $f0, $f2 -/* 1983CC 80269AEC 00000000 */ nop +/* 1983CC 80269AEC 00000000 */ nop /* 1983D0 80269AF0 C6220144 */ lwc1 $f2, 0x144($s1) /* 1983D4 80269AF4 46001080 */ add.s $f2, $f2, $f0 /* 1983D8 80269AF8 8C820010 */ lw $v0, 0x10($a0) @@ -83,7 +83,7 @@ glabel set_part_goal_to_actor_part /* 1983E0 80269B00 8E220000 */ lw $v0, ($s1) /* 1983E4 80269B04 30420800 */ andi $v0, $v0, 0x800 /* 1983E8 80269B08 14400006 */ bnez $v0, .L80269B24 -/* 1983EC 80269B0C 00000000 */ nop +/* 1983EC 80269B0C 00000000 */ nop /* 1983F0 80269B10 84820016 */ lh $v0, 0x16($a0) /* 1983F4 80269B14 8483006E */ lh $v1, 0x6e($a0) /* 1983F8 80269B18 C6220188 */ lwc1 $f2, 0x188($s1) @@ -97,10 +97,10 @@ glabel set_part_goal_to_actor_part /* 198414 80269B34 00431023 */ subu $v0, $v0, $v1 .L80269B38: /* 198418 80269B38 44820000 */ mtc1 $v0, $f0 -/* 19841C 80269B3C 00000000 */ nop +/* 19841C 80269B3C 00000000 */ nop /* 198420 80269B40 46800020 */ cvt.s.w $f0, $f0 /* 198424 80269B44 46020002 */ mul.s $f0, $f0, $f2 -/* 198428 80269B48 00000000 */ nop +/* 198428 80269B48 00000000 */ nop /* 19842C 80269B4C C6220148 */ lwc1 $f2, 0x148($s1) /* 198430 80269B50 46001080 */ add.s $f2, $f2, $f0 /* 198434 80269B54 8C820010 */ lw $v0, 0x10($a0) @@ -108,7 +108,7 @@ glabel set_part_goal_to_actor_part /* 19843C 80269B5C 84820018 */ lh $v0, 0x18($a0) /* 198440 80269B60 C620014C */ lwc1 $f0, 0x14c($s1) /* 198444 80269B64 44821000 */ mtc1 $v0, $f2 -/* 198448 80269B68 00000000 */ nop +/* 198448 80269B68 00000000 */ nop /* 19844C 80269B6C 468010A0 */ cvt.s.w $f2, $f2 /* 198450 80269B70 8C820010 */ lw $v0, 0x10($a0) /* 198454 80269B74 0809A702 */ j .L80269C08 @@ -117,7 +117,7 @@ glabel set_part_goal_to_actor_part /* 19845C 80269B7C 8482006C */ lh $v0, 0x6c($a0) /* 198460 80269B80 C480002C */ lwc1 $f0, 0x2c($a0) /* 198464 80269B84 44821000 */ mtc1 $v0, $f2 -/* 198468 80269B88 00000000 */ nop +/* 198468 80269B88 00000000 */ nop /* 19846C 80269B8C 468010A0 */ cvt.s.w $f2, $f2 /* 198470 80269B90 46020000 */ add.s $f0, $f0, $f2 /* 198474 80269B94 8C820010 */ lw $v0, 0x10($a0) @@ -125,14 +125,14 @@ glabel set_part_goal_to_actor_part /* 19847C 80269B9C 8E220000 */ lw $v0, ($s1) /* 198480 80269BA0 30420800 */ andi $v0, $v0, 0x800 /* 198484 80269BA4 1440000B */ bnez $v0, .L80269BD4 -/* 198488 80269BA8 00000000 */ nop +/* 198488 80269BA8 00000000 */ nop /* 19848C 80269BAC 8482006E */ lh $v0, 0x6e($a0) /* 198490 80269BB0 C6220188 */ lwc1 $f2, 0x188($s1) /* 198494 80269BB4 44820000 */ mtc1 $v0, $f0 -/* 198498 80269BB8 00000000 */ nop +/* 198498 80269BB8 00000000 */ nop /* 19849C 80269BBC 46800020 */ cvt.s.w $f0, $f0 /* 1984A0 80269BC0 46020002 */ mul.s $f0, $f0, $f2 -/* 1984A4 80269BC4 00000000 */ nop +/* 1984A4 80269BC4 00000000 */ nop /* 1984A8 80269BC8 C4820030 */ lwc1 $f2, 0x30($a0) /* 1984AC 80269BCC 0809A6FE */ j .L80269BF8 /* 1984B0 80269BD0 46001080 */ add.s $f2, $f2, $f0 @@ -140,10 +140,10 @@ glabel set_part_goal_to_actor_part /* 1984B4 80269BD4 8482006E */ lh $v0, 0x6e($a0) /* 1984B8 80269BD8 C6220188 */ lwc1 $f2, 0x188($s1) /* 1984BC 80269BDC 44820000 */ mtc1 $v0, $f0 -/* 1984C0 80269BE0 00000000 */ nop +/* 1984C0 80269BE0 00000000 */ nop /* 1984C4 80269BE4 46800020 */ cvt.s.w $f0, $f0 /* 1984C8 80269BE8 46020002 */ mul.s $f0, $f0, $f2 -/* 1984CC 80269BEC 00000000 */ nop +/* 1984CC 80269BEC 00000000 */ nop /* 1984D0 80269BF0 C4820030 */ lwc1 $f2, 0x30($a0) /* 1984D4 80269BF4 46001081 */ sub.s $f2, $f2, $f0 .L80269BF8: diff --git a/asm/nonmatchings/code_1A5830/AfflictActor.s b/asm/nonmatchings/code_1A5830/AfflictActor.s index 6859d03ba3..9fa556eb9c 100644 --- a/asm/nonmatchings/code_1A5830/AfflictActor.s +++ b/asm/nonmatchings/code_1A5830/AfflictActor.s @@ -25,7 +25,7 @@ glabel AfflictActor /* 1ABFAC 8027D6CC 0040982D */ daddu $s3, $v0, $zero /* 1ABFB0 8027D6D0 2402FF81 */ addiu $v0, $zero, -0x7f /* 1ABFB4 8027D6D4 16220002 */ bne $s1, $v0, .L8027D6E0 -/* 1ABFB8 8027D6D8 00000000 */ nop +/* 1ABFB8 8027D6D8 00000000 */ nop /* 1ABFBC 8027D6DC 8E510148 */ lw $s1, 0x148($s2) .L8027D6E0: /* 1ABFC0 8027D6E0 0C09A75B */ jal get_actor diff --git a/asm/nonmatchings/code_1A5830/ClearStatusEffects.s b/asm/nonmatchings/code_1A5830/ClearStatusEffects.s index 7afab9acfa..7adad6de63 100644 --- a/asm/nonmatchings/code_1A5830/ClearStatusEffects.s +++ b/asm/nonmatchings/code_1A5830/ClearStatusEffects.s @@ -12,15 +12,15 @@ glabel ClearStatusEffects /* 1AC69C 8027DDBC 0040202D */ daddu $a0, $v0, $zero /* 1AC6A0 8027DDC0 2402FF81 */ addiu $v0, $zero, -0x7f /* 1AC6A4 8027DDC4 14820002 */ bne $a0, $v0, .L8027DDD0 -/* 1AC6A8 8027DDC8 00000000 */ nop +/* 1AC6A8 8027DDC8 00000000 */ nop /* 1AC6AC 8027DDCC 8E040148 */ lw $a0, 0x148($s0) .L8027DDD0: /* 1AC6B0 8027DDD0 0C09A75B */ jal get_actor -/* 1AC6B4 8027DDD4 00000000 */ nop +/* 1AC6B4 8027DDD4 00000000 */ nop /* 1AC6B8 8027DDD8 0040802D */ daddu $s0, $v0, $zero /* 1AC6BC 8027DDDC 82020210 */ lb $v0, 0x210($s0) /* 1AC6C0 8027DDE0 10400005 */ beqz $v0, .L8027DDF8 -/* 1AC6C4 8027DDE4 00000000 */ nop +/* 1AC6C4 8027DDE4 00000000 */ nop /* 1AC6C8 8027DDE8 86040436 */ lh $a0, 0x436($s0) /* 1AC6CC 8027DDEC A2000211 */ sb $zero, 0x211($s0) /* 1AC6D0 8027DDF0 0C011E26 */ jal func_80047898 @@ -28,7 +28,7 @@ glabel ClearStatusEffects .L8027DDF8: /* 1AC6D8 8027DDF8 82020212 */ lb $v0, 0x212($s0) /* 1AC6DC 8027DDFC 10400005 */ beqz $v0, .L8027DE14 -/* 1AC6E0 8027DE00 00000000 */ nop +/* 1AC6E0 8027DE00 00000000 */ nop /* 1AC6E4 8027DE04 86040436 */ lh $a0, 0x436($s0) /* 1AC6E8 8027DE08 A2000213 */ sb $zero, 0x213($s0) /* 1AC6EC 8027DE0C 0C011E68 */ jal func_800479A0 @@ -36,7 +36,7 @@ glabel ClearStatusEffects .L8027DE14: /* 1AC6F4 8027DE14 82020218 */ lb $v0, 0x218($s0) /* 1AC6F8 8027DE18 10400005 */ beqz $v0, .L8027DE30 -/* 1AC6FC 8027DE1C 00000000 */ nop +/* 1AC6FC 8027DE1C 00000000 */ nop /* 1AC700 8027DE20 86040436 */ lh $a0, 0x436($s0) /* 1AC704 8027DE24 A2000219 */ sb $zero, 0x219($s0) /* 1AC708 8027DE28 0C011EAA */ jal func_80047AA8 @@ -44,7 +44,7 @@ glabel ClearStatusEffects .L8027DE30: /* 1AC710 8027DE30 82020214 */ lb $v0, 0x214($s0) /* 1AC714 8027DE34 10400003 */ beqz $v0, .L8027DE44 -/* 1AC718 8027DE38 00000000 */ nop +/* 1AC718 8027DE38 00000000 */ nop /* 1AC71C 8027DE3C A2000215 */ sb $zero, 0x215($s0) /* 1AC720 8027DE40 A2000214 */ sb $zero, 0x214($s0) .L8027DE44: @@ -61,5 +61,5 @@ glabel ClearStatusEffects /* 1AC74C 8027DE6C 24020002 */ addiu $v0, $zero, 2 /* 1AC750 8027DE70 03E00008 */ jr $ra /* 1AC754 8027DE74 27BD0018 */ addiu $sp, $sp, 0x18 -/* 1AC758 8027DE78 00000000 */ nop -/* 1AC75C 8027DE7C 00000000 */ nop +/* 1AC758 8027DE78 00000000 */ nop +/* 1AC75C 8027DE7C 00000000 */ nop diff --git a/asm/nonmatchings/code_1A5830/CopyStatusEffects.s b/asm/nonmatchings/code_1A5830/CopyStatusEffects.s index 79c9b5e17c..3d9470619b 100644 --- a/asm/nonmatchings/code_1A5830/CopyStatusEffects.s +++ b/asm/nonmatchings/code_1A5830/CopyStatusEffects.s @@ -15,7 +15,7 @@ glabel CopyStatusEffects /* 1AC5C4 8027DCE4 26100004 */ addiu $s0, $s0, 4 /* 1AC5C8 8027DCE8 2413FF81 */ addiu $s3, $zero, -0x7f /* 1AC5CC 8027DCEC 14530002 */ bne $v0, $s3, .L8027DCF8 -/* 1AC5D0 8027DCF0 00000000 */ nop +/* 1AC5D0 8027DCF0 00000000 */ nop /* 1AC5D4 8027DCF4 8E420148 */ lw $v0, 0x148($s2) .L8027DCF8: /* 1AC5D8 8027DCF8 0C09A75B */ jal get_actor @@ -25,7 +25,7 @@ glabel CopyStatusEffects /* 1AC5E8 8027DD08 0C0B1EAF */ jal get_variable /* 1AC5EC 8027DD0C 0040882D */ daddu $s1, $v0, $zero /* 1AC5F0 8027DD10 14530002 */ bne $v0, $s3, .L8027DD1C -/* 1AC5F4 8027DD14 00000000 */ nop +/* 1AC5F4 8027DD14 00000000 */ nop /* 1AC5F8 8027DD18 8E420148 */ lw $v0, 0x148($s2) .L8027DD1C: /* 1AC5FC 8027DD1C 0C09A75B */ jal get_actor diff --git a/asm/nonmatchings/code_1A5830/DropStarPoints.s b/asm/nonmatchings/code_1A5830/DropStarPoints.s index bfce0b274e..597f2763b3 100644 --- a/asm/nonmatchings/code_1A5830/DropStarPoints.s +++ b/asm/nonmatchings/code_1A5830/DropStarPoints.s @@ -18,22 +18,22 @@ glabel DropStarPoints /* 1AB1B8 8027C8D8 2694C070 */ addiu $s4, $s4, %lo(gBattleStatus) /* 1AB1BC 8027C8DC 2402FF81 */ addiu $v0, $zero, -0x7f /* 1AB1C0 8027C8E0 14820002 */ bne $a0, $v0, .L8027C8EC -/* 1AB1C4 8027C8E4 00000000 */ nop +/* 1AB1C4 8027C8E4 00000000 */ nop /* 1AB1C8 8027C8E8 8E040148 */ lw $a0, 0x148($s0) .L8027C8EC: /* 1AB1CC 8027C8EC 0C09A75B */ jal get_actor -/* 1AB1D0 8027C8F0 00000000 */ nop +/* 1AB1D0 8027C8F0 00000000 */ nop /* 1AB1D4 8027C8F4 0040882D */ daddu $s1, $v0, $zero /* 1AB1D8 8027C8F8 8E220008 */ lw $v0, 8($s1) /* 1AB1DC 8027C8FC 90420006 */ lbu $v0, 6($v0) /* 1AB1E0 8027C900 44800000 */ mtc1 $zero, $f0 /* 1AB1E4 8027C904 44823000 */ mtc1 $v0, $f6 -/* 1AB1E8 8027C908 00000000 */ nop +/* 1AB1E8 8027C908 00000000 */ nop /* 1AB1EC 8027C90C 468031A0 */ cvt.s.w $f6, $f6 /* 1AB1F0 8027C910 46003032 */ c.eq.s $f6, $f0 -/* 1AB1F4 8027C914 00000000 */ nop +/* 1AB1F4 8027C914 00000000 */ nop /* 1AB1F8 8027C918 45000003 */ bc1f .L8027C928 -/* 1AB1FC 8027C91C 00000000 */ nop +/* 1AB1FC 8027C91C 00000000 */ nop /* 1AB200 8027C920 3C013F80 */ lui $at, 0x3f80 /* 1AB204 8027C924 44813000 */ mtc1 $at, $f6 .L8027C928: @@ -41,26 +41,26 @@ glabel DropStarPoints /* 1AB20C 8027C92C 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) /* 1AB210 8027C930 80430009 */ lb $v1, 9($v0) /* 1AB214 8027C934 44832000 */ mtc1 $v1, $f4 -/* 1AB218 8027C938 00000000 */ nop +/* 1AB218 8027C938 00000000 */ nop /* 1AB21C 8027C93C 46802120 */ cvt.s.w $f4, $f4 /* 1AB220 8027C940 46002032 */ c.eq.s $f4, $f0 -/* 1AB224 8027C944 00000000 */ nop +/* 1AB224 8027C944 00000000 */ nop /* 1AB228 8027C948 45000004 */ bc1f .L8027C95C -/* 1AB22C 8027C94C 00000000 */ nop +/* 1AB22C 8027C94C 00000000 */ nop /* 1AB230 8027C950 3C013F80 */ lui $at, 0x3f80 /* 1AB234 8027C954 44812000 */ mtc1 $at, $f4 -/* 1AB238 8027C958 00000000 */ nop +/* 1AB238 8027C958 00000000 */ nop .L8027C95C: /* 1AB23C 8027C95C 4604303C */ c.lt.s $f6, $f4 -/* 1AB240 8027C960 00000000 */ nop +/* 1AB240 8027C960 00000000 */ nop /* 1AB244 8027C964 45010017 */ bc1t .L8027C9C4 /* 1AB248 8027C968 46000086 */ mov.s $f2, $f0 /* 1AB24C 8027C96C 46043081 */ sub.s $f2, $f6, $f4 /* 1AB250 8027C970 3C013F00 */ lui $at, 0x3f00 /* 1AB254 8027C974 44810000 */ mtc1 $at, $f0 -/* 1AB258 8027C978 00000000 */ nop +/* 1AB258 8027C978 00000000 */ nop /* 1AB25C 8027C97C 46001082 */ mul.s $f2, $f2, $f0 -/* 1AB260 8027C980 00000000 */ nop +/* 1AB260 8027C980 00000000 */ nop /* 1AB264 8027C984 8282008E */ lb $v0, 0x8e($s4) /* 1AB268 8027C988 00021080 */ sll $v0, $v0, 2 /* 1AB26C 8027C98C 3C018029 */ lui $at, %hi(D_802946E0) @@ -68,21 +68,21 @@ glabel DropStarPoints /* 1AB274 8027C994 C42046E0 */ lwc1 $f0, %lo(D_802946E0)($at) /* 1AB278 8027C998 46800020 */ cvt.s.w $f0, $f0 /* 1AB27C 8027C99C 46001082 */ mul.s $f2, $f2, $f0 -/* 1AB280 8027C9A0 00000000 */ nop +/* 1AB280 8027C9A0 00000000 */ nop /* 1AB284 8027C9A4 3C014248 */ lui $at, 0x4248 /* 1AB288 8027C9A8 44810000 */ mtc1 $at, $f0 -/* 1AB28C 8027C9AC 00000000 */ nop +/* 1AB28C 8027C9AC 00000000 */ nop /* 1AB290 8027C9B0 46001000 */ add.s $f0, $f2, $f0 /* 1AB294 8027C9B4 3C0142C8 */ lui $at, 0x42c8 /* 1AB298 8027C9B8 44811000 */ mtc1 $at, $f2 -/* 1AB29C 8027C9BC 00000000 */ nop +/* 1AB29C 8027C9BC 00000000 */ nop /* 1AB2A0 8027C9C0 46020083 */ div.s $f2, $f0, $f2 .L8027C9C4: /* 1AB2A4 8027C9C4 4600120D */ trunc.w.s $f8, $f2 /* 1AB2A8 8027C9C8 44134000 */ mfc1 $s3, $f8 /* 1AB2AC 8027C9CC 2862001B */ slti $v0, $v1, 0x1b /* 1AB2B0 8027C9D0 10400019 */ beqz $v0, .L8027CA38 -/* 1AB2B4 8027C9D4 00000000 */ nop +/* 1AB2B4 8027C9D4 00000000 */ nop /* 1AB2B8 8027C9D8 8E220000 */ lw $v0, ($s1) /* 1AB2BC 8027C9DC 30420800 */ andi $v0, $v0, 0x800 /* 1AB2C0 8027C9E0 10400002 */ beqz $v0, .L8027C9EC diff --git a/asm/nonmatchings/code_1A5830/EnableActorGlow.s b/asm/nonmatchings/code_1A5830/EnableActorGlow.s index 85b0b75435..8191d8e759 100644 --- a/asm/nonmatchings/code_1A5830/EnableActorGlow.s +++ b/asm/nonmatchings/code_1A5830/EnableActorGlow.s @@ -15,7 +15,7 @@ glabel EnableActorGlow /* 1AC4AC 8027DBCC 0040802D */ daddu $s0, $v0, $zero /* 1AC4B0 8027DBD0 2402FF81 */ addiu $v0, $zero, -0x7f /* 1AC4B4 8027DBD4 16020002 */ bne $s0, $v0, .L8027DBE0 -/* 1AC4B8 8027DBD8 00000000 */ nop +/* 1AC4B8 8027DBD8 00000000 */ nop /* 1AC4BC 8027DBDC 8E500148 */ lw $s0, 0x148($s2) .L8027DBE0: /* 1AC4C0 8027DBE0 8E250000 */ lw $a1, ($s1) diff --git a/asm/nonmatchings/code_1A5830/EnableIdleScript.s b/asm/nonmatchings/code_1A5830/EnableIdleScript.s index 18961df1d0..385fb2f7e1 100644 --- a/asm/nonmatchings/code_1A5830/EnableIdleScript.s +++ b/asm/nonmatchings/code_1A5830/EnableIdleScript.s @@ -15,7 +15,7 @@ glabel EnableIdleScript /* 1A7454 80278B74 0040802D */ daddu $s0, $v0, $zero /* 1A7458 80278B78 2402FF81 */ addiu $v0, $zero, -0x7f /* 1A745C 80278B7C 16020002 */ bne $s0, $v0, .L80278B88 -/* 1A7460 80278B80 00000000 */ nop +/* 1A7460 80278B80 00000000 */ nop /* 1A7464 80278B84 8E500148 */ lw $s0, 0x148($s2) .L80278B88: /* 1A7468 80278B88 8E250000 */ lw $a1, ($s1) @@ -27,29 +27,29 @@ glabel EnableIdleScript /* 1A7480 80278BA0 0040882D */ daddu $s1, $v0, $zero /* 1A7484 80278BA4 8E2401D0 */ lw $a0, 0x1d0($s1) /* 1A7488 80278BA8 10800016 */ beqz $a0, .L80278C04 -/* 1A748C 80278BAC 00000000 */ nop +/* 1A748C 80278BAC 00000000 */ nop /* 1A7490 80278BB0 12000012 */ beqz $s0, .L80278BFC -/* 1A7494 80278BB4 00000000 */ nop +/* 1A7494 80278BB4 00000000 */ nop /* 1A7498 80278BB8 1E000006 */ bgtz $s0, .L80278BD4 /* 1A749C 80278BBC 24020001 */ addiu $v0, $zero, 1 /* 1A74A0 80278BC0 2402FFFF */ addiu $v0, $zero, -1 /* 1A74A4 80278BC4 12020007 */ beq $s0, $v0, .L80278BE4 -/* 1A74A8 80278BC8 00000000 */ nop +/* 1A74A8 80278BC8 00000000 */ nop /* 1A74AC 80278BCC 0809E301 */ j .L80278C04 -/* 1A74B0 80278BD0 00000000 */ nop +/* 1A74B0 80278BD0 00000000 */ nop .L80278BD4: /* 1A74B4 80278BD4 12020005 */ beq $s0, $v0, .L80278BEC -/* 1A74B8 80278BD8 00000000 */ nop +/* 1A74B8 80278BD8 00000000 */ nop /* 1A74BC 80278BDC 0809E301 */ j .L80278C04 -/* 1A74C0 80278BE0 00000000 */ nop +/* 1A74C0 80278BE0 00000000 */ nop .L80278BE4: /* 1A74C4 80278BE4 0C0B0F41 */ jal restart_script -/* 1A74C8 80278BE8 00000000 */ nop +/* 1A74C8 80278BE8 00000000 */ nop .L80278BEC: /* 1A74CC 80278BEC 0C0B1123 */ jal resume_all_script /* 1A74D0 80278BF0 8E2401E0 */ lw $a0, 0x1e0($s1) /* 1A74D4 80278BF4 0809E301 */ j .L80278C04 -/* 1A74D8 80278BF8 00000000 */ nop +/* 1A74D8 80278BF8 00000000 */ nop .L80278BFC: /* 1A74DC 80278BFC 0C0B1108 */ jal suspend_all_script /* 1A74E0 80278C00 8E2401E0 */ lw $a0, 0x1e0($s1) diff --git a/asm/nonmatchings/code_1A5830/EnemyDamageTarget.s b/asm/nonmatchings/code_1A5830/EnemyDamageTarget.s index e20afb3403..8216cb83e1 100644 --- a/asm/nonmatchings/code_1A5830/EnemyDamageTarget.s +++ b/asm/nonmatchings/code_1A5830/EnemyDamageTarget.s @@ -19,11 +19,11 @@ glabel EnemyDamageTarget /* 1AB5CC 8027CCEC 2631C070 */ addiu $s1, $s1, %lo(gBattleStatus) /* 1AB5D0 8027CCF0 2402FF81 */ addiu $v0, $zero, -0x7f /* 1AB5D4 8027CCF4 14820002 */ bne $a0, $v0, .L8027CD00 -/* 1AB5D8 8027CCF8 00000000 */ nop +/* 1AB5D8 8027CCF8 00000000 */ nop /* 1AB5DC 8027CCFC 8E640148 */ lw $a0, 0x148($s3) .L8027CD00: /* 1AB5E0 8027CD00 0C09A75B */ jal get_actor -/* 1AB5E4 8027CD04 00000000 */ nop +/* 1AB5E4 8027CD04 00000000 */ nop /* 1AB5E8 8027CD08 8E140000 */ lw $s4, ($s0) /* 1AB5EC 8027CD0C 26100004 */ addiu $s0, $s0, 4 /* 1AB5F0 8027CD10 8E030000 */ lw $v1, ($s0) diff --git a/asm/nonmatchings/code_1A5830/EnemyFollowupAfflictTarget.s b/asm/nonmatchings/code_1A5830/EnemyFollowupAfflictTarget.s index 61ee9404bd..8120fe550d 100644 --- a/asm/nonmatchings/code_1A5830/EnemyFollowupAfflictTarget.s +++ b/asm/nonmatchings/code_1A5830/EnemyFollowupAfflictTarget.s @@ -22,7 +22,7 @@ glabel EnemyFollowupAfflictTarget /* 1AB7F8 8027CF18 8E440148 */ lw $a0, 0x148($s2) .L8027CF1C: /* 1AB7FC 8027CF1C 0C09A75B */ jal get_actor -/* 1AB800 8027CF20 00000000 */ nop +/* 1AB800 8027CF20 00000000 */ nop /* 1AB804 8027CF24 0040202D */ daddu $a0, $v0, $zero /* 1AB808 8027CF28 94820428 */ lhu $v0, 0x428($a0) /* 1AB80C 8027CF2C 8E100000 */ lw $s0, ($s0) diff --git a/asm/nonmatchings/code_1A5830/EnemyTestTarget.s b/asm/nonmatchings/code_1A5830/EnemyTestTarget.s index 193aad8d39..19a8f258fd 100644 --- a/asm/nonmatchings/code_1A5830/EnemyTestTarget.s +++ b/asm/nonmatchings/code_1A5830/EnemyTestTarget.s @@ -19,11 +19,11 @@ glabel EnemyTestTarget /* 1AB8D0 8027CFF0 2631C070 */ addiu $s1, $s1, %lo(gBattleStatus) /* 1AB8D4 8027CFF4 2402FF81 */ addiu $v0, $zero, -0x7f /* 1AB8D8 8027CFF8 14820002 */ bne $a0, $v0, .L8027D004 -/* 1AB8DC 8027CFFC 00000000 */ nop +/* 1AB8DC 8027CFFC 00000000 */ nop /* 1AB8E0 8027D000 8E640148 */ lw $a0, 0x148($s3) .L8027D004: /* 1AB8E4 8027D004 0C09A75B */ jal get_actor -/* 1AB8E8 8027D008 00000000 */ nop +/* 1AB8E8 8027D008 00000000 */ nop /* 1AB8EC 8027D00C 8E140000 */ lw $s4, ($s0) /* 1AB8F0 8027D010 26100004 */ addiu $s0, $s0, 4 /* 1AB8F4 8027D014 8E030000 */ lw $v1, ($s0) diff --git a/asm/nonmatchings/code_1A5830/FallPartTo.s b/asm/nonmatchings/code_1A5830/FallPartTo.s index 66a5e662fd..49ac0ef5e5 100644 --- a/asm/nonmatchings/code_1A5830/FallPartTo.s +++ b/asm/nonmatchings/code_1A5830/FallPartTo.s @@ -21,7 +21,7 @@ glabel FallPartTo .L8027A894: /* 1A9174 8027A894 8E620070 */ lw $v0, 0x70($s3) /* 1A9178 8027A898 1440007C */ bnez $v0, .L8027AA8C -/* 1A917C 8027A89C 00000000 */ nop +/* 1A917C 8027A89C 00000000 */ nop /* 1A9180 8027A8A0 8E450000 */ lw $a1, ($s2) /* 1A9184 8027A8A4 26520004 */ addiu $s2, $s2, 4 /* 1A9188 8027A8A8 0C0B1EAF */ jal get_variable @@ -29,7 +29,7 @@ glabel FallPartTo /* 1A9190 8027A8B0 0040802D */ daddu $s0, $v0, $zero /* 1A9194 8027A8B4 2402FF81 */ addiu $v0, $zero, -0x7f /* 1A9198 8027A8B8 16020002 */ bne $s0, $v0, .L8027A8C4 -/* 1A919C 8027A8BC 00000000 */ nop +/* 1A919C 8027A8BC 00000000 */ nop /* 1A91A0 8027A8C0 8E700148 */ lw $s0, 0x148($s3) .L8027A8C4: /* 1A91A4 8027A8C4 8E450000 */ lw $a1, ($s2) @@ -52,21 +52,21 @@ glabel FallPartTo /* 1A91E8 8027A908 0C0B1EAF */ jal get_variable /* 1A91EC 8027A90C 0260202D */ daddu $a0, $s3, $zero /* 1A91F0 8027A910 4482E000 */ mtc1 $v0, $f28 -/* 1A91F4 8027A914 00000000 */ nop +/* 1A91F4 8027A914 00000000 */ nop /* 1A91F8 8027A918 4680E720 */ cvt.s.w $f28, $f28 /* 1A91FC 8027A91C 8E450000 */ lw $a1, ($s2) /* 1A9200 8027A920 26520004 */ addiu $s2, $s2, 4 /* 1A9204 8027A924 0C0B1EAF */ jal get_variable /* 1A9208 8027A928 0260202D */ daddu $a0, $s3, $zero /* 1A920C 8027A92C 4482F000 */ mtc1 $v0, $f30 -/* 1A9210 8027A930 00000000 */ nop +/* 1A9210 8027A930 00000000 */ nop /* 1A9214 8027A934 4680F7A0 */ cvt.s.w $f30, $f30 /* 1A9218 8027A938 8E450000 */ lw $a1, ($s2) /* 1A921C 8027A93C 26520004 */ addiu $s2, $s2, 4 /* 1A9220 8027A940 0C0B1EAF */ jal get_variable /* 1A9224 8027A944 0260202D */ daddu $a0, $s3, $zero /* 1A9228 8027A948 44820000 */ mtc1 $v0, $f0 -/* 1A922C 8027A94C 00000000 */ nop +/* 1A922C 8027A94C 00000000 */ nop /* 1A9230 8027A950 46800020 */ cvt.s.w $f0, $f0 /* 1A9234 8027A954 E61C000C */ swc1 $f28, 0xc($s0) /* 1A9238 8027A958 E61E0010 */ swc1 $f30, 0x10($s0) @@ -110,7 +110,7 @@ glabel FallPartTo /* 1A92D0 8027A9F0 A6020038 */ sh $v0, 0x38($s0) .L8027A9F4: /* 1A92D4 8027A9F4 44820000 */ mtc1 $v0, $f0 -/* 1A92D8 8027A9F8 00000000 */ nop +/* 1A92D8 8027A9F8 00000000 */ nop /* 1A92DC 8027A9FC 46800020 */ cvt.s.w $f0, $f0 /* 1A92E0 8027AA00 46001003 */ div.s $f0, $f2, $f0 /* 1A92E4 8027AA04 E6000028 */ swc1 $f0, 0x28($s0) @@ -121,14 +121,14 @@ glabel FallPartTo /* 1A92F4 8027AA14 44800000 */ mtc1 $zero, $f0 /* 1A92F8 8027AA18 00031023 */ negu $v0, $v1 /* 1A92FC 8027AA1C 44821000 */ mtc1 $v0, $f2 -/* 1A9300 8027AA20 00000000 */ nop +/* 1A9300 8027AA20 00000000 */ nop /* 1A9304 8027AA24 468010A1 */ cvt.d.w $f2, $f2 /* 1A9308 8027AA28 46201082 */ mul.d $f2, $f2, $f0 -/* 1A930C 8027AA2C 00000000 */ nop +/* 1A930C 8027AA2C 00000000 */ nop /* 1A9310 8027AA30 AE00002C */ sw $zero, 0x2c($s0) /* 1A9314 8027AA34 C604002C */ lwc1 $f4, 0x2c($s0) /* 1A9318 8027AA38 44830000 */ mtc1 $v1, $f0 -/* 1A931C 8027AA3C 00000000 */ nop +/* 1A931C 8027AA3C 00000000 */ nop /* 1A9320 8027AA40 46800020 */ cvt.s.w $f0, $f0 /* 1A9324 8027AA44 4600F003 */ div.s $f0, $f30, $f0 /* 1A9328 8027AA48 46040001 */ sub.s $f0, $f0, $f4 diff --git a/asm/nonmatchings/code_1A5830/FallToGoal.s b/asm/nonmatchings/code_1A5830/FallToGoal.s index 0ce3c59112..fb98ec67ce 100644 --- a/asm/nonmatchings/code_1A5830/FallToGoal.s +++ b/asm/nonmatchings/code_1A5830/FallToGoal.s @@ -20,7 +20,7 @@ glabel FallToGoal .L80279C28: /* 1A8508 80279C28 8E420070 */ lw $v0, 0x70($s2) /* 1A850C 80279C2C 1440005A */ bnez $v0, .L80279D98 -/* 1A8510 80279C30 00000000 */ nop +/* 1A8510 80279C30 00000000 */ nop /* 1A8514 80279C34 8E250000 */ lw $a1, ($s1) /* 1A8518 80279C38 26310004 */ addiu $s1, $s1, 4 /* 1A851C 80279C3C 0C0B1EAF */ jal get_variable @@ -28,11 +28,11 @@ glabel FallToGoal /* 1A8524 80279C44 0040202D */ daddu $a0, $v0, $zero /* 1A8528 80279C48 2402FF81 */ addiu $v0, $zero, -0x7f /* 1A852C 80279C4C 14820002 */ bne $a0, $v0, .L80279C58 -/* 1A8530 80279C50 00000000 */ nop +/* 1A8530 80279C50 00000000 */ nop /* 1A8534 80279C54 8E440148 */ lw $a0, 0x148($s2) .L80279C58: /* 1A8538 80279C58 0C09A75B */ jal get_actor -/* 1A853C 80279C5C 00000000 */ nop +/* 1A853C 80279C5C 00000000 */ nop /* 1A8540 80279C60 0040802D */ daddu $s0, $v0, $zero /* 1A8544 80279C64 AE500074 */ sw $s0, 0x74($s2) /* 1A8548 80279C68 8E250000 */ lw $a1, ($s1) @@ -75,7 +75,7 @@ glabel FallToGoal /* 1A85DC 80279CFC A6020070 */ sh $v0, 0x70($s0) .L80279D00: /* 1A85E0 80279D00 44820000 */ mtc1 $v0, $f0 -/* 1A85E4 80279D04 00000000 */ nop +/* 1A85E4 80279D04 00000000 */ nop /* 1A85E8 80279D08 46800020 */ cvt.s.w $f0, $f0 /* 1A85EC 80279D0C 46001003 */ div.s $f0, $f2, $f0 /* 1A85F0 80279D10 E600004C */ swc1 $f0, 0x4c($s0) @@ -86,14 +86,14 @@ glabel FallToGoal /* 1A8600 80279D20 44800000 */ mtc1 $zero, $f0 /* 1A8604 80279D24 00031023 */ negu $v0, $v1 /* 1A8608 80279D28 44821000 */ mtc1 $v0, $f2 -/* 1A860C 80279D2C 00000000 */ nop +/* 1A860C 80279D2C 00000000 */ nop /* 1A8610 80279D30 468010A1 */ cvt.d.w $f2, $f2 /* 1A8614 80279D34 46201082 */ mul.d $f2, $f2, $f0 -/* 1A8618 80279D38 00000000 */ nop +/* 1A8618 80279D38 00000000 */ nop /* 1A861C 80279D3C AE200044 */ sw $zero, 0x44($s1) /* 1A8620 80279D40 C6240044 */ lwc1 $f4, 0x44($s1) /* 1A8624 80279D44 44830000 */ mtc1 $v1, $f0 -/* 1A8628 80279D48 00000000 */ nop +/* 1A8628 80279D48 00000000 */ nop /* 1A862C 80279D4C 46800020 */ cvt.s.w $f0, $f0 /* 1A8630 80279D50 4600F003 */ div.s $f0, $f30, $f0 /* 1A8634 80279D54 46040001 */ sub.s $f0, $f0, $f4 diff --git a/asm/nonmatchings/code_1A5830/FlyPartTo.s b/asm/nonmatchings/code_1A5830/FlyPartTo.s index ebc41b3705..54931c9d20 100644 --- a/asm/nonmatchings/code_1A5830/FlyPartTo.s +++ b/asm/nonmatchings/code_1A5830/FlyPartTo.s @@ -19,7 +19,7 @@ glabel FlyPartTo /* 1AA850 8027BF70 0040802D */ daddu $s0, $v0, $zero /* 1AA854 8027BF74 2402FF81 */ addiu $v0, $zero, -0x7f /* 1AA858 8027BF78 16020002 */ bne $s0, $v0, .L8027BF84 -/* 1AA85C 8027BF7C 00000000 */ nop +/* 1AA85C 8027BF7C 00000000 */ nop /* 1AA860 8027BF80 8E700148 */ lw $s0, 0x148($s3) .L8027BF84: /* 1AA864 8027BF84 8E250000 */ lw $a1, ($s1) @@ -42,7 +42,7 @@ glabel FlyPartTo /* 1AA8A8 8027BFC8 0C0B1EAF */ jal get_variable /* 1AA8AC 8027BFCC 0260202D */ daddu $a0, $s3, $zero /* 1AA8B0 8027BFD0 44820000 */ mtc1 $v0, $f0 -/* 1AA8B4 8027BFD4 00000000 */ nop +/* 1AA8B4 8027BFD4 00000000 */ nop /* 1AA8B8 8027BFD8 46800020 */ cvt.s.w $f0, $f0 /* 1AA8BC 8027BFDC E600000C */ swc1 $f0, 0xc($s0) /* 1AA8C0 8027BFE0 8E250000 */ lw $a1, ($s1) @@ -50,7 +50,7 @@ glabel FlyPartTo /* 1AA8C8 8027BFE8 0C0B1EAF */ jal get_variable /* 1AA8CC 8027BFEC 0260202D */ daddu $a0, $s3, $zero /* 1AA8D0 8027BFF0 44820000 */ mtc1 $v0, $f0 -/* 1AA8D4 8027BFF4 00000000 */ nop +/* 1AA8D4 8027BFF4 00000000 */ nop /* 1AA8D8 8027BFF8 46800020 */ cvt.s.w $f0, $f0 /* 1AA8DC 8027BFFC E6000010 */ swc1 $f0, 0x10($s0) /* 1AA8E0 8027C000 8E250000 */ lw $a1, ($s1) @@ -58,7 +58,7 @@ glabel FlyPartTo /* 1AA8E8 8027C008 0C0B1EAF */ jal get_variable /* 1AA8EC 8027C00C 0260202D */ daddu $a0, $s3, $zero /* 1AA8F0 8027C010 44820000 */ mtc1 $v0, $f0 -/* 1AA8F4 8027C014 00000000 */ nop +/* 1AA8F4 8027C014 00000000 */ nop /* 1AA8F8 8027C018 46800020 */ cvt.s.w $f0, $f0 /* 1AA8FC 8027C01C E6000014 */ swc1 $f0, 0x14($s0) /* 1AA900 8027C020 8E250000 */ lw $a1, ($s1) @@ -80,30 +80,30 @@ glabel FlyPartTo /* 1AA940 8027C060 46020081 */ sub.s $f2, $f0, $f2 /* 1AA944 8027C064 E6000000 */ swc1 $f0, ($s0) /* 1AA948 8027C068 46021102 */ mul.s $f4, $f2, $f2 -/* 1AA94C 8027C06C 00000000 */ nop +/* 1AA94C 8027C06C 00000000 */ nop /* 1AA950 8027C070 E6000018 */ swc1 $f0, 0x18($s0) /* 1AA954 8027C074 C6400030 */ lwc1 $f0, 0x30($s2) /* 1AA958 8027C078 C6020010 */ lwc1 $f2, 0x10($s0) /* 1AA95C 8027C07C 46020081 */ sub.s $f2, $f0, $f2 /* 1AA960 8027C080 E6000004 */ swc1 $f0, 4($s0) /* 1AA964 8027C084 46021182 */ mul.s $f6, $f2, $f2 -/* 1AA968 8027C088 00000000 */ nop +/* 1AA968 8027C088 00000000 */ nop /* 1AA96C 8027C08C E600001C */ swc1 $f0, 0x1c($s0) /* 1AA970 8027C090 C6400034 */ lwc1 $f0, 0x34($s2) /* 1AA974 8027C094 C6020014 */ lwc1 $f2, 0x14($s0) /* 1AA978 8027C098 46020081 */ sub.s $f2, $f0, $f2 /* 1AA97C 8027C09C 46021082 */ mul.s $f2, $f2, $f2 -/* 1AA980 8027C0A0 00000000 */ nop +/* 1AA980 8027C0A0 00000000 */ nop /* 1AA984 8027C0A4 46062100 */ add.s $f4, $f4, $f6 /* 1AA988 8027C0A8 46022300 */ add.s $f12, $f4, $f2 /* 1AA98C 8027C0AC E6000008 */ swc1 $f0, 8($s0) /* 1AA990 8027C0B0 46006084 */ sqrt.s $f2, $f12 /* 1AA994 8027C0B4 46021032 */ c.eq.s $f2, $f2 -/* 1AA998 8027C0B8 00000000 */ nop +/* 1AA998 8027C0B8 00000000 */ nop /* 1AA99C 8027C0BC 45010004 */ bc1t .L8027C0D0 /* 1AA9A0 8027C0C0 E6000020 */ swc1 $f0, 0x20($s0) /* 1AA9A4 8027C0C4 0C0187BC */ jal sqrtf -/* 1AA9A8 8027C0C8 00000000 */ nop +/* 1AA9A8 8027C0C8 00000000 */ nop /* 1AA9AC 8027C0CC 46000086 */ mov.s $f2, $f0 .L8027C0D0: /* 1AA9B0 8027C0D0 86020038 */ lh $v0, 0x38($s0) @@ -117,14 +117,14 @@ glabel FlyPartTo /* 1AA9D0 8027C0F0 A6020038 */ sh $v0, 0x38($s0) .L8027C0F4: /* 1AA9D4 8027C0F4 44820000 */ mtc1 $v0, $f0 -/* 1AA9D8 8027C0F8 00000000 */ nop +/* 1AA9D8 8027C0F8 00000000 */ nop /* 1AA9DC 8027C0FC 46800020 */ cvt.s.w $f0, $f0 /* 1AA9E0 8027C100 46001003 */ div.s $f0, $f2, $f0 /* 1AA9E4 8027C104 E6000028 */ swc1 $f0, 0x28($s0) .L8027C108: /* 1AA9E8 8027C108 86020038 */ lh $v0, 0x38($s0) /* 1AA9EC 8027C10C 14400003 */ bnez $v0, .L8027C11C -/* 1AA9F0 8027C110 00000000 */ nop +/* 1AA9F0 8027C110 00000000 */ nop .L8027C114: /* 1AA9F4 8027C114 0809F12F */ j .L8027C4BC /* 1AA9F8 8027C118 24020002 */ addiu $v0, $zero, 2 @@ -147,7 +147,7 @@ glabel FlyPartTo /* 1AAA34 8027C154 AE000030 */ sw $zero, 0x30($s0) /* 1AAA38 8027C158 864200BE */ lh $v0, 0xbe($s2) /* 1AAA3C 8027C15C 04400004 */ bltz $v0, .L8027C170 -/* 1AAA40 8027C160 00000000 */ nop +/* 1AAA40 8027C160 00000000 */ nop /* 1AAA44 8027C164 868201B6 */ lh $v0, 0x1b6($s4) /* 1AAA48 8027C168 0809F05E */ j .L8027C178 /* 1AAA4C 8027C16C 24420001 */ addiu $v0, $v0, 1 @@ -156,7 +156,7 @@ glabel FlyPartTo /* 1AAA54 8027C174 00021027 */ nor $v0, $zero, $v0 .L8027C178: /* 1AAA58 8027C178 44820000 */ mtc1 $v0, $f0 -/* 1AAA5C 8027C17C 00000000 */ nop +/* 1AAA5C 8027C17C 00000000 */ nop /* 1AAA60 8027C180 46800020 */ cvt.s.w $f0, $f0 /* 1AAA64 8027C184 E600002C */ swc1 $f0, 0x2c($s0) .L8027C188: @@ -205,31 +205,31 @@ glabel FlyPartTo /* 1AAB10 8027C230 144000A2 */ bnez $v0, .L8027C4BC /* 1AAB14 8027C234 24020002 */ addiu $v0, $zero, 2 /* 1AAB18 8027C238 0C0154F0 */ jal func_800553C0 -/* 1AAB1C 8027C23C 00000000 */ nop +/* 1AAB1C 8027C23C 00000000 */ nop /* 1AAB20 8027C240 0809F12F */ j .L8027C4BC /* 1AAB24 8027C244 24020002 */ addiu $v0, $zero, 2 .L8027C248: /* 1AAB28 8027C248 8E4200AC */ lw $v0, 0xac($s2) /* 1AAB2C 8027C24C 1040004A */ beqz $v0, .L8027C378 -/* 1AAB30 8027C250 00000000 */ nop +/* 1AAB30 8027C250 00000000 */ nop /* 1AAB34 8027C254 8E4200B0 */ lw $v0, 0xb0($s2) /* 1AAB38 8027C258 10400047 */ beqz $v0, .L8027C378 -/* 1AAB3C 8027C25C 00000000 */ nop +/* 1AAB3C 8027C25C 00000000 */ nop /* 1AAB40 8027C260 864200BE */ lh $v0, 0xbe($s2) /* 1AAB44 8027C264 0440001C */ bltz $v0, .L8027C2D8 -/* 1AAB48 8027C268 00000000 */ nop +/* 1AAB48 8027C268 00000000 */ nop /* 1AAB4C 8027C26C C602002C */ lwc1 $f2, 0x2c($s0) /* 1AAB50 8027C270 C6000028 */ lwc1 $f0, 0x28($s0) /* 1AAB54 8027C274 46001080 */ add.s $f2, $f2, $f0 /* 1AAB58 8027C278 E602002C */ swc1 $f2, 0x2c($s0) /* 1AAB5C 8027C27C 864200BE */ lh $v0, 0xbe($s2) /* 1AAB60 8027C280 44820000 */ mtc1 $v0, $f0 -/* 1AAB64 8027C284 00000000 */ nop +/* 1AAB64 8027C284 00000000 */ nop /* 1AAB68 8027C288 46800020 */ cvt.s.w $f0, $f0 /* 1AAB6C 8027C28C 4602003C */ c.lt.s $f0, $f2 -/* 1AAB70 8027C290 00000000 */ nop +/* 1AAB70 8027C290 00000000 */ nop /* 1AAB74 8027C294 45000038 */ bc1f .L8027C378 -/* 1AAB78 8027C298 00000000 */ nop +/* 1AAB78 8027C298 00000000 */ nop /* 1AAB7C 8027C29C 92820135 */ lbu $v0, 0x135($s4) /* 1AAB80 8027C2A0 24420001 */ addiu $v0, $v0, 1 /* 1AAB84 8027C2A4 A2820135 */ sb $v0, 0x135($s4) @@ -237,10 +237,10 @@ glabel FlyPartTo /* 1AAB8C 8027C2AC 92820135 */ lbu $v0, 0x135($s4) /* 1AAB90 8027C2B0 30420001 */ andi $v0, $v0, 1 /* 1AAB94 8027C2B4 10400026 */ beqz $v0, .L8027C350 -/* 1AAB98 8027C2B8 00000000 */ nop +/* 1AAB98 8027C2B8 00000000 */ nop /* 1AAB9C 8027C2BC 8E4200AC */ lw $v0, 0xac($s2) /* 1AABA0 8027C2C0 1040002D */ beqz $v0, .L8027C378 -/* 1AABA4 8027C2C4 00000000 */ nop +/* 1AABA4 8027C2C4 00000000 */ nop /* 1AABA8 8027C2C8 C6400034 */ lwc1 $f0, 0x34($s2) /* 1AABAC 8027C2CC E7A00010 */ swc1 $f0, 0x10($sp) /* 1AABB0 8027C2D0 0809F0DA */ j .L8027C368 @@ -249,18 +249,18 @@ glabel FlyPartTo /* 1AABB8 8027C2D8 C602002C */ lwc1 $f2, 0x2c($s0) /* 1AABBC 8027C2DC 3C013F80 */ lui $at, 0x3f80 /* 1AABC0 8027C2E0 44810000 */ mtc1 $at, $f0 -/* 1AABC4 8027C2E4 00000000 */ nop +/* 1AABC4 8027C2E4 00000000 */ nop /* 1AABC8 8027C2E8 46001080 */ add.s $f2, $f2, $f0 /* 1AABCC 8027C2EC E602002C */ swc1 $f2, 0x2c($s0) /* 1AABD0 8027C2F0 864200BE */ lh $v0, 0xbe($s2) /* 1AABD4 8027C2F4 00021023 */ negu $v0, $v0 /* 1AABD8 8027C2F8 44820000 */ mtc1 $v0, $f0 -/* 1AABDC 8027C2FC 00000000 */ nop +/* 1AABDC 8027C2FC 00000000 */ nop /* 1AABE0 8027C300 46800020 */ cvt.s.w $f0, $f0 /* 1AABE4 8027C304 4602003E */ c.le.s $f0, $f2 -/* 1AABE8 8027C308 00000000 */ nop +/* 1AABE8 8027C308 00000000 */ nop /* 1AABEC 8027C30C 4500001A */ bc1f .L8027C378 -/* 1AABF0 8027C310 00000000 */ nop +/* 1AABF0 8027C310 00000000 */ nop /* 1AABF4 8027C314 92820135 */ lbu $v0, 0x135($s4) /* 1AABF8 8027C318 24420001 */ addiu $v0, $v0, 1 /* 1AABFC 8027C31C A2820135 */ sb $v0, 0x135($s4) @@ -268,10 +268,10 @@ glabel FlyPartTo /* 1AAC04 8027C324 92820135 */ lbu $v0, 0x135($s4) /* 1AAC08 8027C328 30420001 */ andi $v0, $v0, 1 /* 1AAC0C 8027C32C 10400008 */ beqz $v0, .L8027C350 -/* 1AAC10 8027C330 00000000 */ nop +/* 1AAC10 8027C330 00000000 */ nop /* 1AAC14 8027C334 8E4200AC */ lw $v0, 0xac($s2) /* 1AAC18 8027C338 1040000F */ beqz $v0, .L8027C378 -/* 1AAC1C 8027C33C 00000000 */ nop +/* 1AAC1C 8027C33C 00000000 */ nop /* 1AAC20 8027C340 C6400034 */ lwc1 $f0, 0x34($s2) /* 1AAC24 8027C344 E7A00010 */ swc1 $f0, 0x10($sp) /* 1AAC28 8027C348 0809F0DA */ j .L8027C368 @@ -279,7 +279,7 @@ glabel FlyPartTo .L8027C350: /* 1AAC30 8027C350 8E4200B0 */ lw $v0, 0xb0($s2) /* 1AAC34 8027C354 10400008 */ beqz $v0, .L8027C378 -/* 1AAC38 8027C358 00000000 */ nop +/* 1AAC38 8027C358 00000000 */ nop /* 1AAC3C 8027C35C C6400034 */ lwc1 $f0, 0x34($s2) /* 1AAC40 8027C360 E7A00010 */ swc1 $f0, 0x10($sp) /* 1AAC44 8027C364 8E4400B0 */ lw $a0, 0xb0($s2) @@ -293,44 +293,44 @@ glabel FlyPartTo /* 1AAC5C 8027C37C C6000000 */ lwc1 $f0, ($s0) /* 1AAC60 8027C380 46001081 */ sub.s $f2, $f2, $f0 /* 1AAC64 8027C384 46021102 */ mul.s $f4, $f2, $f2 -/* 1AAC68 8027C388 00000000 */ nop +/* 1AAC68 8027C388 00000000 */ nop /* 1AAC6C 8027C38C C6000004 */ lwc1 $f0, 4($s0) /* 1AAC70 8027C390 C6020010 */ lwc1 $f2, 0x10($s0) /* 1AAC74 8027C394 46001081 */ sub.s $f2, $f2, $f0 /* 1AAC78 8027C398 46021182 */ mul.s $f6, $f2, $f2 -/* 1AAC7C 8027C39C 00000000 */ nop +/* 1AAC7C 8027C39C 00000000 */ nop /* 1AAC80 8027C3A0 C6000008 */ lwc1 $f0, 8($s0) /* 1AAC84 8027C3A4 C6020014 */ lwc1 $f2, 0x14($s0) /* 1AAC88 8027C3A8 46001081 */ sub.s $f2, $f2, $f0 /* 1AAC8C 8027C3AC 46021002 */ mul.s $f0, $f2, $f2 -/* 1AAC90 8027C3B0 00000000 */ nop +/* 1AAC90 8027C3B0 00000000 */ nop /* 1AAC94 8027C3B4 46062100 */ add.s $f4, $f4, $f6 /* 1AAC98 8027C3B8 46002300 */ add.s $f12, $f4, $f0 /* 1AAC9C 8027C3BC 46006004 */ sqrt.s $f0, $f12 /* 1AACA0 8027C3C0 46000032 */ c.eq.s $f0, $f0 -/* 1AACA4 8027C3C4 00000000 */ nop +/* 1AACA4 8027C3C4 00000000 */ nop /* 1AACA8 8027C3C8 45010003 */ bc1t .L8027C3D8 -/* 1AACAC 8027C3CC 00000000 */ nop +/* 1AACAC 8027C3CC 00000000 */ nop /* 1AACB0 8027C3D0 0C0187BC */ jal sqrtf -/* 1AACB4 8027C3D4 00000000 */ nop +/* 1AACB4 8027C3D4 00000000 */ nop .L8027C3D8: /* 1AACB8 8027C3D8 4480A000 */ mtc1 $zero, $f20 /* 1AACBC 8027C3DC 46000086 */ mov.s $f2, $f0 /* 1AACC0 8027C3E0 46141032 */ c.eq.s $f2, $f20 -/* 1AACC4 8027C3E4 00000000 */ nop +/* 1AACC4 8027C3E4 00000000 */ nop /* 1AACC8 8027C3E8 45000003 */ bc1f .L8027C3F8 -/* 1AACCC 8027C3EC 00000000 */ nop +/* 1AACCC 8027C3EC 00000000 */ nop /* 1AACD0 8027C3F0 3C013F80 */ lui $at, 0x3f80 /* 1AACD4 8027C3F4 44811000 */ mtc1 $at, $f2 .L8027C3F8: /* 1AACD8 8027C3F8 C6000034 */ lwc1 $f0, 0x34($s0) /* 1AACDC 8027C3FC 46140032 */ c.eq.s $f0, $f20 -/* 1AACE0 8027C400 00000000 */ nop +/* 1AACE0 8027C400 00000000 */ nop /* 1AACE4 8027C404 45000006 */ bc1f .L8027C420 -/* 1AACE8 8027C408 00000000 */ nop +/* 1AACE8 8027C408 00000000 */ nop /* 1AACEC 8027C40C 3C013F80 */ lui $at, 0x3f80 /* 1AACF0 8027C410 44810000 */ mtc1 $at, $f0 -/* 1AACF4 8027C414 00000000 */ nop +/* 1AACF4 8027C414 00000000 */ nop /* 1AACF8 8027C418 E6000034 */ swc1 $f0, 0x34($s0) /* 1AACFC 8027C41C C6000034 */ lwc1 $f0, 0x34($s0) .L8027C420: @@ -343,7 +343,7 @@ glabel FlyPartTo /* 1AAD18 8027C438 3C01802A */ lui $at, %hi(D_8029DA20) /* 1AAD1C 8027C43C D420DA20 */ ldc1 $f0, %lo(D_8029DA20)($at) /* 1AAD20 8027C440 46206302 */ mul.d $f12, $f12, $f0 -/* 1AAD24 8027C444 00000000 */ nop +/* 1AAD24 8027C444 00000000 */ nop /* 1AAD28 8027C448 0C00A8BB */ jal sin_deg /* 1AAD2C 8027C44C 46206320 */ cvt.s.d $f12, $f12 /* 1AAD30 8027C450 8603003A */ lh $v1, 0x3a($s0) @@ -354,19 +354,19 @@ glabel FlyPartTo /* 1AAD40 8027C460 04610007 */ bgez $v1, .L8027C480 /* 1AAD44 8027C464 00031023 */ negu $v0, $v1 /* 1AAD48 8027C468 44821000 */ mtc1 $v0, $f2 -/* 1AAD4C 8027C46C 00000000 */ nop +/* 1AAD4C 8027C46C 00000000 */ nop /* 1AAD50 8027C470 468010A0 */ cvt.s.w $f2, $f2 /* 1AAD54 8027C474 46002007 */ neg.s $f0, $f4 /* 1AAD58 8027C478 46020102 */ mul.s $f4, $f0, $f2 -/* 1AAD5C 8027C47C 00000000 */ nop +/* 1AAD5C 8027C47C 00000000 */ nop .L8027C480: /* 1AAD60 8027C480 18600006 */ blez $v1, .L8027C49C -/* 1AAD64 8027C484 00000000 */ nop +/* 1AAD64 8027C484 00000000 */ nop /* 1AAD68 8027C488 44830000 */ mtc1 $v1, $f0 -/* 1AAD6C 8027C48C 00000000 */ nop +/* 1AAD6C 8027C48C 00000000 */ nop /* 1AAD70 8027C490 46800020 */ cvt.s.w $f0, $f0 /* 1AAD74 8027C494 46002102 */ mul.s $f4, $f4, $f0 -/* 1AAD78 8027C498 00000000 */ nop +/* 1AAD78 8027C498 00000000 */ nop .L8027C49C: /* 1AAD7C 8027C49C C6000000 */ lwc1 $f0, ($s0) /* 1AAD80 8027C4A0 E640002C */ swc1 $f0, 0x2c($s2) diff --git a/asm/nonmatchings/code_1A5830/FlyToGoal.s b/asm/nonmatchings/code_1A5830/FlyToGoal.s index 9f2e0a001b..c5dceca92a 100644 --- a/asm/nonmatchings/code_1A5830/FlyToGoal.s +++ b/asm/nonmatchings/code_1A5830/FlyToGoal.s @@ -17,11 +17,11 @@ glabel FlyToGoal /* 1A9F34 8027B654 0040202D */ daddu $a0, $v0, $zero /* 1A9F38 8027B658 2402FF81 */ addiu $v0, $zero, -0x7f /* 1A9F3C 8027B65C 14820002 */ bne $a0, $v0, .L8027B668 -/* 1A9F40 8027B660 00000000 */ nop +/* 1A9F40 8027B660 00000000 */ nop /* 1A9F44 8027B664 8E440148 */ lw $a0, 0x148($s2) .L8027B668: /* 1A9F48 8027B668 0C09A75B */ jal get_actor -/* 1A9F4C 8027B66C 00000000 */ nop +/* 1A9F4C 8027B66C 00000000 */ nop /* 1A9F50 8027B670 0040802D */ daddu $s0, $v0, $zero /* 1A9F54 8027B674 AE500074 */ sw $s0, 0x74($s2) /* 1A9F58 8027B678 8E250000 */ lw $a1, ($s1) @@ -52,17 +52,17 @@ glabel FlyToGoal /* 1A9FB8 8027B6D8 C6060144 */ lwc1 $f6, 0x144($s0) /* 1A9FBC 8027B6DC 46003081 */ sub.s $f2, $f6, $f0 /* 1A9FC0 8027B6E0 46021202 */ mul.s $f8, $f2, $f2 -/* 1A9FC4 8027B6E4 00000000 */ nop +/* 1A9FC4 8027B6E4 00000000 */ nop /* 1A9FC8 8027B6E8 C6040148 */ lwc1 $f4, 0x148($s0) /* 1A9FCC 8027B6EC C600001C */ lwc1 $f0, 0x1c($s0) /* 1A9FD0 8027B6F0 46002081 */ sub.s $f2, $f4, $f0 /* 1A9FD4 8027B6F4 46021282 */ mul.s $f10, $f2, $f2 -/* 1A9FD8 8027B6F8 00000000 */ nop +/* 1A9FD8 8027B6F8 00000000 */ nop /* 1A9FDC 8027B6FC C6000020 */ lwc1 $f0, 0x20($s0) /* 1A9FE0 8027B700 C602014C */ lwc1 $f2, 0x14c($s0) /* 1A9FE4 8027B704 46001001 */ sub.s $f0, $f2, $f0 /* 1A9FE8 8027B708 46000002 */ mul.s $f0, $f0, $f0 -/* 1A9FEC 8027B70C 00000000 */ nop +/* 1A9FEC 8027B70C 00000000 */ nop /* 1A9FF0 8027B710 E606000C */ swc1 $f6, 0xc($s0) /* 1A9FF4 8027B714 E6060024 */ swc1 $f6, 0x24($s0) /* 1A9FF8 8027B718 460A4200 */ add.s $f8, $f8, $f10 @@ -73,11 +73,11 @@ glabel FlyToGoal /* 1AA00C 8027B72C E602002C */ swc1 $f2, 0x2c($s0) /* 1AA010 8027B730 46006084 */ sqrt.s $f2, $f12 /* 1AA014 8027B734 46021032 */ c.eq.s $f2, $f2 -/* 1AA018 8027B738 00000000 */ nop +/* 1AA018 8027B738 00000000 */ nop /* 1AA01C 8027B73C 45010004 */ bc1t .L8027B750 -/* 1AA020 8027B740 00000000 */ nop +/* 1AA020 8027B740 00000000 */ nop /* 1AA024 8027B744 0C0187BC */ jal sqrtf -/* 1AA028 8027B748 00000000 */ nop +/* 1AA028 8027B748 00000000 */ nop /* 1AA02C 8027B74C 46000086 */ mov.s $f2, $f0 .L8027B750: /* 1AA030 8027B750 86020070 */ lh $v0, 0x70($s0) @@ -91,7 +91,7 @@ glabel FlyToGoal /* 1AA050 8027B770 A6020070 */ sh $v0, 0x70($s0) .L8027B774: /* 1AA054 8027B774 44820000 */ mtc1 $v0, $f0 -/* 1AA058 8027B778 00000000 */ nop +/* 1AA058 8027B778 00000000 */ nop /* 1AA05C 8027B77C 46800020 */ cvt.s.w $f0, $f0 /* 1AA060 8027B780 46001003 */ div.s $f0, $f2, $f0 /* 1AA064 8027B784 E600004C */ swc1 $f0, 0x4c($s0) @@ -110,15 +110,15 @@ glabel FlyToGoal /* 1AA08C 8027B7AC 24420001 */ addiu $v0, $v0, 1 .L8027B7B0: /* 1AA090 8027B7B0 44820000 */ mtc1 $v0, $f0 -/* 1AA094 8027B7B4 00000000 */ nop +/* 1AA094 8027B7B4 00000000 */ nop /* 1AA098 8027B7B8 46800020 */ cvt.s.w $f0, $f0 /* 1AA09C 8027B7BC E6200044 */ swc1 $f0, 0x44($s1) /* 1AA0A0 8027B7C0 8E0201A4 */ lw $v0, 0x1a4($s0) /* 1AA0A4 8027B7C4 1040000B */ beqz $v0, .L8027B7F4 -/* 1AA0A8 8027B7C8 00000000 */ nop +/* 1AA0A8 8027B7C8 00000000 */ nop /* 1AA0AC 8027B7CC 8E0201A8 */ lw $v0, 0x1a8($s0) /* 1AA0B0 8027B7D0 14400008 */ bnez $v0, .L8027B7F4 -/* 1AA0B4 8027B7D4 00000000 */ nop +/* 1AA0B4 8027B7D4 00000000 */ nop /* 1AA0B8 8027B7D8 C600014C */ lwc1 $f0, 0x14c($s0) /* 1AA0BC 8027B7DC E7A00010 */ swc1 $f0, 0x10($sp) /* 1AA0C0 8027B7E0 8E0401A4 */ lw $a0, 0x1a4($s0) @@ -148,7 +148,7 @@ glabel FlyToGoal /* 1AA11C 8027B83C 4600138D */ trunc.w.s $f14, $f2 /* 1AA120 8027B840 44077000 */ mfc1 $a3, $f14 /* 1AA124 8027B844 0C09EC37 */ jal update_lerp_battle -/* 1AA128 8027B848 00000000 */ nop +/* 1AA128 8027B848 00000000 */ nop /* 1AA12C 8027B84C C602005C */ lwc1 $f2, 0x5c($s0) /* 1AA130 8027B850 86020070 */ lh $v0, 0x70($s0) /* 1AA134 8027B854 E6000010 */ swc1 $f0, 0x10($s0) @@ -159,23 +159,23 @@ glabel FlyToGoal /* 1AA148 8027B868 4600138D */ trunc.w.s $f14, $f2 /* 1AA14C 8027B86C 44077000 */ mfc1 $a3, $f14 /* 1AA150 8027B870 0C09EC37 */ jal update_lerp_battle -/* 1AA154 8027B874 00000000 */ nop +/* 1AA154 8027B874 00000000 */ nop /* 1AA158 8027B878 8E020078 */ lw $v0, 0x78($s0) /* 1AA15C 8027B87C 10400012 */ beqz $v0, .L8027B8C8 /* 1AA160 8027B880 E6000014 */ swc1 $f0, 0x14($s0) /* 1AA164 8027B884 C6000010 */ lwc1 $f0, 0x10($s0) /* 1AA168 8027B888 44801000 */ mtc1 $zero, $f2 -/* 1AA16C 8027B88C 00000000 */ nop +/* 1AA16C 8027B88C 00000000 */ nop /* 1AA170 8027B890 4602003C */ c.lt.s $f0, $f2 -/* 1AA174 8027B894 00000000 */ nop +/* 1AA174 8027B894 00000000 */ nop /* 1AA178 8027B898 4500000B */ bc1f .L8027B8C8 -/* 1AA17C 8027B89C 00000000 */ nop +/* 1AA17C 8027B89C 00000000 */ nop /* 1AA180 8027B8A0 86020070 */ lh $v0, 0x70($s0) /* 1AA184 8027B8A4 E602001C */ swc1 $f2, 0x1c($s0) /* 1AA188 8027B8A8 C602000C */ lwc1 $f2, 0xc($s0) /* 1AA18C 8027B8AC C6040014 */ lwc1 $f4, 0x14($s0) /* 1AA190 8027B8B0 44820000 */ mtc1 $v0, $f0 -/* 1AA194 8027B8B4 00000000 */ nop +/* 1AA194 8027B8B4 00000000 */ nop /* 1AA198 8027B8B8 46800020 */ cvt.s.w $f0, $f0 /* 1AA19C 8027B8BC E600005C */ swc1 $f0, 0x5c($s0) /* 1AA1A0 8027B8C0 E6020018 */ swc1 $f2, 0x18($s0) @@ -187,10 +187,10 @@ glabel FlyToGoal /* 1AA1B4 8027B8D4 86220064 */ lh $v0, 0x64($s1) /* 1AA1B8 8027B8D8 46040000 */ add.s $f0, $f0, $f4 /* 1AA1BC 8027B8DC 44821000 */ mtc1 $v0, $f2 -/* 1AA1C0 8027B8E0 00000000 */ nop +/* 1AA1C0 8027B8E0 00000000 */ nop /* 1AA1C4 8027B8E4 468010A0 */ cvt.s.w $f2, $f2 /* 1AA1C8 8027B8E8 4600103C */ c.lt.s $f2, $f0 -/* 1AA1CC 8027B8EC 00000000 */ nop +/* 1AA1CC 8027B8EC 00000000 */ nop /* 1AA1D0 8027B8F0 45000010 */ bc1f .L8027B934 /* 1AA1D4 8027B8F4 E6200050 */ swc1 $f0, 0x50($s1) /* 1AA1D8 8027B8F8 C620000C */ lwc1 $f0, 0xc($s1) @@ -205,31 +205,31 @@ glabel FlyToGoal /* 1AA1FC 8027B91C 1440009F */ bnez $v0, .L8027BB9C /* 1AA200 8027B920 24020002 */ addiu $v0, $zero, 2 /* 1AA204 8027B924 0C0154F0 */ jal func_800553C0 -/* 1AA208 8027B928 00000000 */ nop +/* 1AA208 8027B928 00000000 */ nop /* 1AA20C 8027B92C 0809EEE7 */ j .L8027BB9C /* 1AA210 8027B930 24020002 */ addiu $v0, $zero, 2 .L8027B934: /* 1AA214 8027B934 8E0201A4 */ lw $v0, 0x1a4($s0) /* 1AA218 8027B938 10400047 */ beqz $v0, .L8027BA58 -/* 1AA21C 8027B93C 00000000 */ nop +/* 1AA21C 8027B93C 00000000 */ nop /* 1AA220 8027B940 8E0201A8 */ lw $v0, 0x1a8($s0) /* 1AA224 8027B944 10400044 */ beqz $v0, .L8027BA58 -/* 1AA228 8027B948 00000000 */ nop +/* 1AA228 8027B948 00000000 */ nop /* 1AA22C 8027B94C 860201B6 */ lh $v0, 0x1b6($s0) /* 1AA230 8027B950 0440001C */ bltz $v0, .L8027B9C4 -/* 1AA234 8027B954 00000000 */ nop +/* 1AA234 8027B954 00000000 */ nop /* 1AA238 8027B958 C6220044 */ lwc1 $f2, 0x44($s1) /* 1AA23C 8027B95C C6200040 */ lwc1 $f0, 0x40($s1) /* 1AA240 8027B960 46001080 */ add.s $f2, $f2, $f0 /* 1AA244 8027B964 E6220044 */ swc1 $f2, 0x44($s1) /* 1AA248 8027B968 860201B6 */ lh $v0, 0x1b6($s0) /* 1AA24C 8027B96C 44820000 */ mtc1 $v0, $f0 -/* 1AA250 8027B970 00000000 */ nop +/* 1AA250 8027B970 00000000 */ nop /* 1AA254 8027B974 46800020 */ cvt.s.w $f0, $f0 /* 1AA258 8027B978 4602003C */ c.lt.s $f0, $f2 -/* 1AA25C 8027B97C 00000000 */ nop +/* 1AA25C 8027B97C 00000000 */ nop /* 1AA260 8027B980 45000035 */ bc1f .L8027BA58 -/* 1AA264 8027B984 00000000 */ nop +/* 1AA264 8027B984 00000000 */ nop /* 1AA268 8027B988 92020135 */ lbu $v0, 0x135($s0) /* 1AA26C 8027B98C 24420001 */ addiu $v0, $v0, 1 /* 1AA270 8027B990 A2020135 */ sb $v0, 0x135($s0) @@ -237,10 +237,10 @@ glabel FlyToGoal /* 1AA278 8027B998 92020135 */ lbu $v0, 0x135($s0) /* 1AA27C 8027B99C 30420001 */ andi $v0, $v0, 1 /* 1AA280 8027B9A0 10400023 */ beqz $v0, .L8027BA30 -/* 1AA284 8027B9A4 00000000 */ nop +/* 1AA284 8027B9A4 00000000 */ nop /* 1AA288 8027B9A8 8E0201A4 */ lw $v0, 0x1a4($s0) /* 1AA28C 8027B9AC 1040002A */ beqz $v0, .L8027BA58 -/* 1AA290 8027B9B0 00000000 */ nop +/* 1AA290 8027B9B0 00000000 */ nop /* 1AA294 8027B9B4 C600014C */ lwc1 $f0, 0x14c($s0) /* 1AA298 8027B9B8 E7A00010 */ swc1 $f0, 0x10($sp) /* 1AA29C 8027B9BC 0809EE92 */ j .L8027BA48 @@ -252,12 +252,12 @@ glabel FlyToGoal /* 1AA2B0 8027B9D0 860201B6 */ lh $v0, 0x1b6($s0) /* 1AA2B4 8027B9D4 00021023 */ negu $v0, $v0 /* 1AA2B8 8027B9D8 44821000 */ mtc1 $v0, $f2 -/* 1AA2BC 8027B9DC 00000000 */ nop +/* 1AA2BC 8027B9DC 00000000 */ nop /* 1AA2C0 8027B9E0 468010A0 */ cvt.s.w $f2, $f2 /* 1AA2C4 8027B9E4 4600103E */ c.le.s $f2, $f0 -/* 1AA2C8 8027B9E8 00000000 */ nop +/* 1AA2C8 8027B9E8 00000000 */ nop /* 1AA2CC 8027B9EC 4500001A */ bc1f .L8027BA58 -/* 1AA2D0 8027B9F0 00000000 */ nop +/* 1AA2D0 8027B9F0 00000000 */ nop /* 1AA2D4 8027B9F4 92020135 */ lbu $v0, 0x135($s0) /* 1AA2D8 8027B9F8 24420001 */ addiu $v0, $v0, 1 /* 1AA2DC 8027B9FC A2020135 */ sb $v0, 0x135($s0) @@ -265,10 +265,10 @@ glabel FlyToGoal /* 1AA2E4 8027BA04 92020135 */ lbu $v0, 0x135($s0) /* 1AA2E8 8027BA08 30420001 */ andi $v0, $v0, 1 /* 1AA2EC 8027BA0C 10400008 */ beqz $v0, .L8027BA30 -/* 1AA2F0 8027BA10 00000000 */ nop +/* 1AA2F0 8027BA10 00000000 */ nop /* 1AA2F4 8027BA14 8E0201A4 */ lw $v0, 0x1a4($s0) /* 1AA2F8 8027BA18 1040000F */ beqz $v0, .L8027BA58 -/* 1AA2FC 8027BA1C 00000000 */ nop +/* 1AA2FC 8027BA1C 00000000 */ nop /* 1AA300 8027BA20 C600014C */ lwc1 $f0, 0x14c($s0) /* 1AA304 8027BA24 E7A00010 */ swc1 $f0, 0x10($sp) /* 1AA308 8027BA28 0809EE92 */ j .L8027BA48 @@ -276,7 +276,7 @@ glabel FlyToGoal .L8027BA30: /* 1AA310 8027BA30 8E0201A8 */ lw $v0, 0x1a8($s0) /* 1AA314 8027BA34 10400008 */ beqz $v0, .L8027BA58 -/* 1AA318 8027BA38 00000000 */ nop +/* 1AA318 8027BA38 00000000 */ nop /* 1AA31C 8027BA3C C600014C */ lwc1 $f0, 0x14c($s0) /* 1AA320 8027BA40 E7A00010 */ swc1 $f0, 0x10($sp) /* 1AA324 8027BA44 8E0401A8 */ lw $a0, 0x1a8($s0) @@ -290,44 +290,44 @@ glabel FlyToGoal /* 1AA33C 8027BA5C C6200000 */ lwc1 $f0, ($s1) /* 1AA340 8027BA60 46001081 */ sub.s $f2, $f2, $f0 /* 1AA344 8027BA64 46021102 */ mul.s $f4, $f2, $f2 -/* 1AA348 8027BA68 00000000 */ nop +/* 1AA348 8027BA68 00000000 */ nop /* 1AA34C 8027BA6C C6200004 */ lwc1 $f0, 4($s1) /* 1AA350 8027BA70 C6220010 */ lwc1 $f2, 0x10($s1) /* 1AA354 8027BA74 46001081 */ sub.s $f2, $f2, $f0 /* 1AA358 8027BA78 46021182 */ mul.s $f6, $f2, $f2 -/* 1AA35C 8027BA7C 00000000 */ nop +/* 1AA35C 8027BA7C 00000000 */ nop /* 1AA360 8027BA80 C6200008 */ lwc1 $f0, 8($s1) /* 1AA364 8027BA84 C6220014 */ lwc1 $f2, 0x14($s1) /* 1AA368 8027BA88 46001001 */ sub.s $f0, $f2, $f0 /* 1AA36C 8027BA8C 46000002 */ mul.s $f0, $f0, $f0 -/* 1AA370 8027BA90 00000000 */ nop +/* 1AA370 8027BA90 00000000 */ nop /* 1AA374 8027BA94 46062100 */ add.s $f4, $f4, $f6 /* 1AA378 8027BA98 46002300 */ add.s $f12, $f4, $f0 /* 1AA37C 8027BA9C 46006004 */ sqrt.s $f0, $f12 /* 1AA380 8027BAA0 46000032 */ c.eq.s $f0, $f0 -/* 1AA384 8027BAA4 00000000 */ nop +/* 1AA384 8027BAA4 00000000 */ nop /* 1AA388 8027BAA8 45010003 */ bc1t .L8027BAB8 -/* 1AA38C 8027BAAC 00000000 */ nop +/* 1AA38C 8027BAAC 00000000 */ nop /* 1AA390 8027BAB0 0C0187BC */ jal sqrtf -/* 1AA394 8027BAB4 00000000 */ nop +/* 1AA394 8027BAB4 00000000 */ nop .L8027BAB8: /* 1AA398 8027BAB8 4480A000 */ mtc1 $zero, $f20 /* 1AA39C 8027BABC 46000086 */ mov.s $f2, $f0 /* 1AA3A0 8027BAC0 46141032 */ c.eq.s $f2, $f20 -/* 1AA3A4 8027BAC4 00000000 */ nop +/* 1AA3A4 8027BAC4 00000000 */ nop /* 1AA3A8 8027BAC8 45000003 */ bc1f .L8027BAD8 -/* 1AA3AC 8027BACC 00000000 */ nop +/* 1AA3AC 8027BACC 00000000 */ nop /* 1AA3B0 8027BAD0 3C013F80 */ lui $at, 0x3f80 /* 1AA3B4 8027BAD4 44811000 */ mtc1 $at, $f2 .L8027BAD8: /* 1AA3B8 8027BAD8 C620004C */ lwc1 $f0, 0x4c($s1) /* 1AA3BC 8027BADC 46140032 */ c.eq.s $f0, $f20 -/* 1AA3C0 8027BAE0 00000000 */ nop +/* 1AA3C0 8027BAE0 00000000 */ nop /* 1AA3C4 8027BAE4 45000006 */ bc1f .L8027BB00 -/* 1AA3C8 8027BAE8 00000000 */ nop +/* 1AA3C8 8027BAE8 00000000 */ nop /* 1AA3CC 8027BAEC 3C013F80 */ lui $at, 0x3f80 /* 1AA3D0 8027BAF0 44810000 */ mtc1 $at, $f0 -/* 1AA3D4 8027BAF4 00000000 */ nop +/* 1AA3D4 8027BAF4 00000000 */ nop /* 1AA3D8 8027BAF8 E620004C */ swc1 $f0, 0x4c($s1) /* 1AA3DC 8027BAFC C620004C */ lwc1 $f0, 0x4c($s1) .L8027BB00: @@ -340,7 +340,7 @@ glabel FlyToGoal /* 1AA3F8 8027BB18 3C01802A */ lui $at, %hi(D_8029DA10) /* 1AA3FC 8027BB1C D420DA10 */ ldc1 $f0, %lo(D_8029DA10)($at) /* 1AA400 8027BB20 46206302 */ mul.d $f12, $f12, $f0 -/* 1AA404 8027BB24 00000000 */ nop +/* 1AA404 8027BB24 00000000 */ nop /* 1AA408 8027BB28 0C00A8BB */ jal sin_deg /* 1AA40C 8027BB2C 46206320 */ cvt.s.d $f12, $f12 /* 1AA410 8027BB30 86230066 */ lh $v1, 0x66($s1) @@ -351,19 +351,19 @@ glabel FlyToGoal /* 1AA420 8027BB40 04610007 */ bgez $v1, .L8027BB60 /* 1AA424 8027BB44 00031023 */ negu $v0, $v1 /* 1AA428 8027BB48 44821000 */ mtc1 $v0, $f2 -/* 1AA42C 8027BB4C 00000000 */ nop +/* 1AA42C 8027BB4C 00000000 */ nop /* 1AA430 8027BB50 468010A0 */ cvt.s.w $f2, $f2 /* 1AA434 8027BB54 46002007 */ neg.s $f0, $f4 /* 1AA438 8027BB58 46020102 */ mul.s $f4, $f0, $f2 -/* 1AA43C 8027BB5C 00000000 */ nop +/* 1AA43C 8027BB5C 00000000 */ nop .L8027BB60: /* 1AA440 8027BB60 18600006 */ blez $v1, .L8027BB7C -/* 1AA444 8027BB64 00000000 */ nop +/* 1AA444 8027BB64 00000000 */ nop /* 1AA448 8027BB68 44830000 */ mtc1 $v1, $f0 -/* 1AA44C 8027BB6C 00000000 */ nop +/* 1AA44C 8027BB6C 00000000 */ nop /* 1AA450 8027BB70 46800020 */ cvt.s.w $f0, $f0 /* 1AA454 8027BB74 46002102 */ mul.s $f4, $f4, $f0 -/* 1AA458 8027BB78 00000000 */ nop +/* 1AA458 8027BB78 00000000 */ nop .L8027BB7C: /* 1AA45C 8027BB7C C6200000 */ lwc1 $f0, ($s1) /* 1AA460 8027BB80 E6000144 */ swc1 $f0, 0x144($s0) diff --git a/asm/nonmatchings/code_1A5830/GetActorHP.s b/asm/nonmatchings/code_1A5830/GetActorHP.s index 81753984e3..15f035b64c 100644 --- a/asm/nonmatchings/code_1A5830/GetActorHP.s +++ b/asm/nonmatchings/code_1A5830/GetActorHP.s @@ -15,7 +15,7 @@ glabel GetActorHP /* 1AAFA8 8027C6C8 0040802D */ daddu $s0, $v0, $zero /* 1AAFAC 8027C6CC 2402FF81 */ addiu $v0, $zero, -0x7f /* 1AAFB0 8027C6D0 16020002 */ bne $s0, $v0, .L8027C6DC -/* 1AAFB4 8027C6D4 00000000 */ nop +/* 1AAFB4 8027C6D4 00000000 */ nop /* 1AAFB8 8027C6D8 8E500148 */ lw $s0, 0x148($s2) .L8027C6DC: /* 1AAFBC 8027C6DC 8E310000 */ lw $s1, ($s1) @@ -28,7 +28,7 @@ glabel GetActorHP /* 1AAFD8 8027C6F8 50820009 */ beql $a0, $v0, .L8027C720 /* 1AAFDC 8027C6FC 24060063 */ addiu $a2, $zero, 0x63 /* 1AAFE0 8027C700 0809F1C7 */ j .L8027C71C -/* 1AAFE4 8027C704 00000000 */ nop +/* 1AAFE4 8027C704 00000000 */ nop .L8027C708: /* 1AAFE8 8027C708 3C028011 */ lui $v0, %hi(gPlayerData) /* 1AAFEC 8027C70C 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) diff --git a/asm/nonmatchings/code_1A5830/IdleFlyToGoal.s b/asm/nonmatchings/code_1A5830/IdleFlyToGoal.s index 0ecb1c0dfa..ab822d6706 100644 --- a/asm/nonmatchings/code_1A5830/IdleFlyToGoal.s +++ b/asm/nonmatchings/code_1A5830/IdleFlyToGoal.s @@ -18,11 +18,11 @@ glabel IdleFlyToGoal /* 1AA4CC 8027BBEC 0040202D */ daddu $a0, $v0, $zero /* 1AA4D0 8027BBF0 2402FF81 */ addiu $v0, $zero, -0x7f /* 1AA4D4 8027BBF4 14820002 */ bne $a0, $v0, .L8027BC00 -/* 1AA4D8 8027BBF8 00000000 */ nop +/* 1AA4D8 8027BBF8 00000000 */ nop /* 1AA4DC 8027BBFC 8E440148 */ lw $a0, 0x148($s2) .L8027BC00: /* 1AA4E0 8027BC00 0C09A75B */ jal get_actor -/* 1AA4E4 8027BC04 00000000 */ nop +/* 1AA4E4 8027BC04 00000000 */ nop /* 1AA4E8 8027BC08 0040802D */ daddu $s0, $v0, $zero /* 1AA4EC 8027BC0C AE500074 */ sw $s0, 0x74($s2) /* 1AA4F0 8027BC10 8E250000 */ lw $a1, ($s1) @@ -43,17 +43,17 @@ glabel IdleFlyToGoal /* 1AA52C 8027BC4C C6060144 */ lwc1 $f6, 0x144($s0) /* 1AA530 8027BC50 46003081 */ sub.s $f2, $f6, $f0 /* 1AA534 8027BC54 46021202 */ mul.s $f8, $f2, $f2 -/* 1AA538 8027BC58 00000000 */ nop +/* 1AA538 8027BC58 00000000 */ nop /* 1AA53C 8027BC5C C6040148 */ lwc1 $f4, 0x148($s0) /* 1AA540 8027BC60 C60000D8 */ lwc1 $f0, 0xd8($s0) /* 1AA544 8027BC64 46002081 */ sub.s $f2, $f4, $f0 /* 1AA548 8027BC68 46021282 */ mul.s $f10, $f2, $f2 -/* 1AA54C 8027BC6C 00000000 */ nop +/* 1AA54C 8027BC6C 00000000 */ nop /* 1AA550 8027BC70 C60000DC */ lwc1 $f0, 0xdc($s0) /* 1AA554 8027BC74 C602014C */ lwc1 $f2, 0x14c($s0) /* 1AA558 8027BC78 46001001 */ sub.s $f0, $f2, $f0 /* 1AA55C 8027BC7C 46000002 */ mul.s $f0, $f0, $f0 -/* 1AA560 8027BC80 00000000 */ nop +/* 1AA560 8027BC80 00000000 */ nop /* 1AA564 8027BC84 E60600C8 */ swc1 $f6, 0xc8($s0) /* 1AA568 8027BC88 E60600E0 */ swc1 $f6, 0xe0($s0) /* 1AA56C 8027BC8C 460A4200 */ add.s $f8, $f8, $f10 @@ -64,11 +64,11 @@ glabel IdleFlyToGoal /* 1AA580 8027BCA0 E60200E8 */ swc1 $f2, 0xe8($s0) /* 1AA584 8027BCA4 46006084 */ sqrt.s $f2, $f12 /* 1AA588 8027BCA8 46021032 */ c.eq.s $f2, $f2 -/* 1AA58C 8027BCAC 00000000 */ nop +/* 1AA58C 8027BCAC 00000000 */ nop /* 1AA590 8027BCB0 45010004 */ bc1t .L8027BCC4 /* 1AA594 8027BCB4 261100C8 */ addiu $s1, $s0, 0xc8 /* 1AA598 8027BCB8 0C0187BC */ jal sqrtf -/* 1AA59C 8027BCBC 00000000 */ nop +/* 1AA59C 8027BCBC 00000000 */ nop /* 1AA5A0 8027BCC0 46000086 */ mov.s $f2, $f0 .L8027BCC4: /* 1AA5A4 8027BCC4 86020120 */ lh $v0, 0x120($s0) @@ -82,7 +82,7 @@ glabel IdleFlyToGoal /* 1AA5C4 8027BCE4 A6020120 */ sh $v0, 0x120($s0) .L8027BCE8: /* 1AA5C8 8027BCE8 44820000 */ mtc1 $v0, $f0 -/* 1AA5CC 8027BCEC 00000000 */ nop +/* 1AA5CC 8027BCEC 00000000 */ nop /* 1AA5D0 8027BCF0 46800020 */ cvt.s.w $f0, $f0 /* 1AA5D4 8027BCF4 46001003 */ div.s $f0, $f2, $f0 /* 1AA5D8 8027BCF8 E6000108 */ swc1 $f0, 0x108($s0) @@ -106,7 +106,7 @@ glabel IdleFlyToGoal /* 1AA614 8027BD34 4600038D */ trunc.w.s $f14, $f0 /* 1AA618 8027BD38 44077000 */ mfc1 $a3, $f14 /* 1AA61C 8027BD3C 0C09EC37 */ jal update_lerp_battle -/* 1AA620 8027BD40 00000000 */ nop +/* 1AA620 8027BD40 00000000 */ nop /* 1AA624 8027BD44 C6020118 */ lwc1 $f2, 0x118($s0) /* 1AA628 8027BD48 86020120 */ lh $v0, 0x120($s0) /* 1AA62C 8027BD4C E60000C8 */ swc1 $f0, 0xc8($s0) @@ -117,7 +117,7 @@ glabel IdleFlyToGoal /* 1AA640 8027BD60 4600138D */ trunc.w.s $f14, $f2 /* 1AA644 8027BD64 44077000 */ mfc1 $a3, $f14 /* 1AA648 8027BD68 0C09EC37 */ jal update_lerp_battle -/* 1AA64C 8027BD6C 00000000 */ nop +/* 1AA64C 8027BD6C 00000000 */ nop /* 1AA650 8027BD70 C6020118 */ lwc1 $f2, 0x118($s0) /* 1AA654 8027BD74 86020120 */ lh $v0, 0x120($s0) /* 1AA658 8027BD78 E60000CC */ swc1 $f0, 0xcc($s0) @@ -128,7 +128,7 @@ glabel IdleFlyToGoal /* 1AA66C 8027BD8C 4600138D */ trunc.w.s $f14, $f2 /* 1AA670 8027BD90 44077000 */ mfc1 $a3, $f14 /* 1AA674 8027BD94 0C09EC37 */ jal update_lerp_battle -/* 1AA678 8027BD98 00000000 */ nop +/* 1AA678 8027BD98 00000000 */ nop /* 1AA67C 8027BD9C C6020118 */ lwc1 $f2, 0x118($s0) /* 1AA680 8027BDA0 3C013F80 */ lui $at, 0x3f80 /* 1AA684 8027BDA4 4481B000 */ mtc1 $at, $f22 @@ -136,10 +136,10 @@ glabel IdleFlyToGoal /* 1AA68C 8027BDAC 46161080 */ add.s $f2, $f2, $f22 /* 1AA690 8027BDB0 E60000D0 */ swc1 $f0, 0xd0($s0) /* 1AA694 8027BDB4 44820000 */ mtc1 $v0, $f0 -/* 1AA698 8027BDB8 00000000 */ nop +/* 1AA698 8027BDB8 00000000 */ nop /* 1AA69C 8027BDBC 46800020 */ cvt.s.w $f0, $f0 /* 1AA6A0 8027BDC0 4602003C */ c.lt.s $f0, $f2 -/* 1AA6A4 8027BDC4 00000000 */ nop +/* 1AA6A4 8027BDC4 00000000 */ nop /* 1AA6A8 8027BDC8 45000009 */ bc1f .L8027BDF0 /* 1AA6AC 8027BDCC E6020118 */ swc1 $f2, 0x118($s0) /* 1AA6B0 8027BDD0 C60000D4 */ lwc1 $f0, 0xd4($s0) @@ -155,37 +155,37 @@ glabel IdleFlyToGoal /* 1AA6D4 8027BDF4 C60000C8 */ lwc1 $f0, 0xc8($s0) /* 1AA6D8 8027BDF8 46001081 */ sub.s $f2, $f2, $f0 /* 1AA6DC 8027BDFC 46021102 */ mul.s $f4, $f2, $f2 -/* 1AA6E0 8027BE00 00000000 */ nop +/* 1AA6E0 8027BE00 00000000 */ nop /* 1AA6E4 8027BE04 C60000CC */ lwc1 $f0, 0xcc($s0) /* 1AA6E8 8027BE08 C60200D8 */ lwc1 $f2, 0xd8($s0) /* 1AA6EC 8027BE0C 46001081 */ sub.s $f2, $f2, $f0 /* 1AA6F0 8027BE10 46021182 */ mul.s $f6, $f2, $f2 -/* 1AA6F4 8027BE14 00000000 */ nop +/* 1AA6F4 8027BE14 00000000 */ nop /* 1AA6F8 8027BE18 C60000D0 */ lwc1 $f0, 0xd0($s0) /* 1AA6FC 8027BE1C C60200DC */ lwc1 $f2, 0xdc($s0) /* 1AA700 8027BE20 46001001 */ sub.s $f0, $f2, $f0 /* 1AA704 8027BE24 46000002 */ mul.s $f0, $f0, $f0 -/* 1AA708 8027BE28 00000000 */ nop +/* 1AA708 8027BE28 00000000 */ nop /* 1AA70C 8027BE2C 46062100 */ add.s $f4, $f4, $f6 /* 1AA710 8027BE30 46002300 */ add.s $f12, $f4, $f0 /* 1AA714 8027BE34 46006004 */ sqrt.s $f0, $f12 /* 1AA718 8027BE38 46000032 */ c.eq.s $f0, $f0 -/* 1AA71C 8027BE3C 00000000 */ nop +/* 1AA71C 8027BE3C 00000000 */ nop /* 1AA720 8027BE40 45010003 */ bc1t .L8027BE50 -/* 1AA724 8027BE44 00000000 */ nop +/* 1AA724 8027BE44 00000000 */ nop /* 1AA728 8027BE48 0C0187BC */ jal sqrtf -/* 1AA72C 8027BE4C 00000000 */ nop +/* 1AA72C 8027BE4C 00000000 */ nop .L8027BE50: /* 1AA730 8027BE50 4480A000 */ mtc1 $zero, $f20 /* 1AA734 8027BE54 46000086 */ mov.s $f2, $f0 /* 1AA738 8027BE58 46141032 */ c.eq.s $f2, $f20 -/* 1AA73C 8027BE5C 00000000 */ nop +/* 1AA73C 8027BE5C 00000000 */ nop /* 1AA740 8027BE60 45030001 */ bc1tl .L8027BE68 /* 1AA744 8027BE64 4600B086 */ mov.s $f2, $f22 .L8027BE68: /* 1AA748 8027BE68 C6000114 */ lwc1 $f0, 0x114($s0) /* 1AA74C 8027BE6C 46140032 */ c.eq.s $f0, $f20 -/* 1AA750 8027BE70 00000000 */ nop +/* 1AA750 8027BE70 00000000 */ nop /* 1AA754 8027BE74 45030001 */ bc1tl .L8027BE7C /* 1AA758 8027BE78 E6160114 */ swc1 $f22, 0x114($s0) .L8027BE7C: @@ -199,7 +199,7 @@ glabel IdleFlyToGoal /* 1AA778 8027BE98 3C01802A */ lui $at, %hi(D_8029DA18) /* 1AA77C 8027BE9C D420DA18 */ ldc1 $f0, %lo(D_8029DA18)($at) /* 1AA780 8027BEA0 46206302 */ mul.d $f12, $f12, $f0 -/* 1AA784 8027BEA4 00000000 */ nop +/* 1AA784 8027BEA4 00000000 */ nop /* 1AA788 8027BEA8 0C00A8BB */ jal sin_deg /* 1AA78C 8027BEAC 46206320 */ cvt.s.d $f12, $f12 /* 1AA790 8027BEB0 86030122 */ lh $v1, 0x122($s0) @@ -210,19 +210,19 @@ glabel IdleFlyToGoal /* 1AA7A0 8027BEC0 04610007 */ bgez $v1, .L8027BEE0 /* 1AA7A4 8027BEC4 00031023 */ negu $v0, $v1 /* 1AA7A8 8027BEC8 44821000 */ mtc1 $v0, $f2 -/* 1AA7AC 8027BECC 00000000 */ nop +/* 1AA7AC 8027BECC 00000000 */ nop /* 1AA7B0 8027BED0 468010A0 */ cvt.s.w $f2, $f2 /* 1AA7B4 8027BED4 46003007 */ neg.s $f0, $f6 /* 1AA7B8 8027BED8 46020182 */ mul.s $f6, $f0, $f2 -/* 1AA7BC 8027BEDC 00000000 */ nop +/* 1AA7BC 8027BEDC 00000000 */ nop .L8027BEE0: /* 1AA7C0 8027BEE0 18600006 */ blez $v1, .L8027BEFC /* 1AA7C4 8027BEE4 0000102D */ daddu $v0, $zero, $zero /* 1AA7C8 8027BEE8 44830000 */ mtc1 $v1, $f0 -/* 1AA7CC 8027BEEC 00000000 */ nop +/* 1AA7CC 8027BEEC 00000000 */ nop /* 1AA7D0 8027BEF0 46800020 */ cvt.s.w $f0, $f0 /* 1AA7D4 8027BEF4 46003182 */ mul.s $f6, $f6, $f0 -/* 1AA7D8 8027BEF8 00000000 */ nop +/* 1AA7D8 8027BEF8 00000000 */ nop .L8027BEFC: /* 1AA7DC 8027BEFC C60000C8 */ lwc1 $f0, 0xc8($s0) /* 1AA7E0 8027BF00 C60200CC */ lwc1 $f2, 0xcc($s0) diff --git a/asm/nonmatchings/code_1A5830/IdleJumpToGoal.s b/asm/nonmatchings/code_1A5830/IdleJumpToGoal.s index 97a1c12b0b..dcb030eb5c 100644 --- a/asm/nonmatchings/code_1A5830/IdleJumpToGoal.s +++ b/asm/nonmatchings/code_1A5830/IdleJumpToGoal.s @@ -20,7 +20,7 @@ glabel IdleJumpToGoal .L80279148: /* 1A7A28 80279148 8E420070 */ lw $v0, 0x70($s2) /* 1A7A2C 8027914C 14400073 */ bnez $v0, .L8027931C -/* 1A7A30 80279150 00000000 */ nop +/* 1A7A30 80279150 00000000 */ nop /* 1A7A34 80279154 8E250000 */ lw $a1, ($s1) /* 1A7A38 80279158 26310004 */ addiu $s1, $s1, 4 /* 1A7A3C 8027915C 0C0B1EAF */ jal get_variable @@ -28,11 +28,11 @@ glabel IdleJumpToGoal /* 1A7A44 80279164 0040202D */ daddu $a0, $v0, $zero /* 1A7A48 80279168 2402FF81 */ addiu $v0, $zero, -0x7f /* 1A7A4C 8027916C 14820002 */ bne $a0, $v0, .L80279178 -/* 1A7A50 80279170 00000000 */ nop +/* 1A7A50 80279170 00000000 */ nop /* 1A7A54 80279174 8E440148 */ lw $a0, 0x148($s2) .L80279178: /* 1A7A58 80279178 0C09A75B */ jal get_actor -/* 1A7A5C 8027917C 00000000 */ nop +/* 1A7A5C 8027917C 00000000 */ nop /* 1A7A60 80279180 0040802D */ daddu $s0, $v0, $zero /* 1A7A64 80279184 AE500074 */ sw $s0, 0x74($s2) /* 1A7A68 80279188 8E250000 */ lw $a1, ($s1) @@ -82,54 +82,54 @@ glabel IdleJumpToGoal /* 1A7B18 80279238 46002003 */ div.s $f0, $f4, $f0 /* 1A7B1C 8027923C 4600028D */ trunc.w.s $f10, $f0 /* 1A7B20 80279240 44035000 */ mfc1 $v1, $f10 -/* 1A7B24 80279244 00000000 */ nop +/* 1A7B24 80279244 00000000 */ nop /* 1A7B28 80279248 00031400 */ sll $v0, $v1, 0x10 /* 1A7B2C 8027924C 00021403 */ sra $v0, $v0, 0x10 /* 1A7B30 80279250 44820000 */ mtc1 $v0, $f0 -/* 1A7B34 80279254 00000000 */ nop +/* 1A7B34 80279254 00000000 */ nop /* 1A7B38 80279258 46800020 */ cvt.s.w $f0, $f0 /* 1A7B3C 8027925C 46020002 */ mul.s $f0, $f0, $f2 -/* 1A7B40 80279260 00000000 */ nop +/* 1A7B40 80279260 00000000 */ nop /* 1A7B44 80279264 46002086 */ mov.s $f2, $f4 /* 1A7B48 80279268 A6030120 */ sh $v1, 0x120($s0) /* 1A7B4C 8027926C 0809E4AA */ j .L802792A8 /* 1A7B50 80279270 46001201 */ sub.s $f8, $f2, $f0 .L80279274: /* 1A7B54 80279274 44821000 */ mtc1 $v0, $f2 -/* 1A7B58 80279278 00000000 */ nop +/* 1A7B58 80279278 00000000 */ nop /* 1A7B5C 8027927C 468010A0 */ cvt.s.w $f2, $f2 /* 1A7B60 80279280 86020120 */ lh $v0, 0x120($s0) /* 1A7B64 80279284 46022083 */ div.s $f2, $f4, $f2 /* 1A7B68 80279288 44820000 */ mtc1 $v0, $f0 -/* 1A7B6C 8027928C 00000000 */ nop +/* 1A7B6C 8027928C 00000000 */ nop /* 1A7B70 80279290 46800020 */ cvt.s.w $f0, $f0 /* 1A7B74 80279294 46020002 */ mul.s $f0, $f0, $f2 -/* 1A7B78 80279298 00000000 */ nop +/* 1A7B78 80279298 00000000 */ nop /* 1A7B7C 8027929C C6040114 */ lwc1 $f4, 0x114($s0) /* 1A7B80 802792A0 E6020108 */ swc1 $f2, 0x108($s0) /* 1A7B84 802792A4 46002201 */ sub.s $f8, $f4, $f0 .L802792A8: /* 1A7B88 802792A8 86220058 */ lh $v0, 0x58($s1) /* 1A7B8C 802792AC 14400003 */ bnez $v0, .L802792BC -/* 1A7B90 802792B0 00000000 */ nop +/* 1A7B90 802792B0 00000000 */ nop /* 1A7B94 802792B4 0809E4FC */ j .L802793F0 /* 1A7B98 802792B8 24020002 */ addiu $v0, $zero, 2 .L802792BC: /* 1A7B9C 802792BC C622003C */ lwc1 $f2, 0x3c($s1) /* 1A7BA0 802792C0 44823000 */ mtc1 $v0, $f6 -/* 1A7BA4 802792C4 00000000 */ nop +/* 1A7BA4 802792C4 00000000 */ nop /* 1A7BA8 802792C8 468031A0 */ cvt.s.w $f6, $f6 /* 1A7BAC 802792CC 46061082 */ mul.s $f2, $f2, $f6 -/* 1A7BB0 802792D0 00000000 */ nop +/* 1A7BB0 802792D0 00000000 */ nop /* 1A7BB4 802792D4 3C013F00 */ lui $at, 0x3f00 /* 1A7BB8 802792D8 44810000 */ mtc1 $at, $f0 -/* 1A7BBC 802792DC 00000000 */ nop +/* 1A7BBC 802792DC 00000000 */ nop /* 1A7BC0 802792E0 46001082 */ mul.s $f2, $f2, $f0 -/* 1A7BC4 802792E4 00000000 */ nop +/* 1A7BC4 802792E4 00000000 */ nop /* 1A7BC8 802792E8 86220058 */ lh $v0, 0x58($s1) /* 1A7BCC 802792EC C6240040 */ lwc1 $f4, 0x40($s1) /* 1A7BD0 802792F0 44820000 */ mtc1 $v0, $f0 -/* 1A7BD4 802792F4 00000000 */ nop +/* 1A7BD4 802792F4 00000000 */ nop /* 1A7BD8 802792F8 46800020 */ cvt.s.w $f0, $f0 /* 1A7BDC 802792FC 46004003 */ div.s $f0, $f8, $f0 /* 1A7BE0 80279300 46002100 */ add.s $f4, $f4, $f0 @@ -151,13 +151,13 @@ glabel IdleJumpToGoal /* 1A7C1C 8027933C 261100C8 */ addiu $s1, $s0, 0xc8 /* 1A7C20 80279340 E60400CC */ swc1 $f4, 0xcc($s0) /* 1A7C24 80279344 4600103C */ c.lt.s $f2, $f0 -/* 1A7C28 80279348 00000000 */ nop +/* 1A7C28 80279348 00000000 */ nop /* 1A7C2C 8027934C 45000007 */ bc1f .L8027936C /* 1A7C30 80279350 E602010C */ swc1 $f2, 0x10c($s0) /* 1A7C34 80279354 C60200D8 */ lwc1 $f2, 0xd8($s0) /* 1A7C38 80279358 46002006 */ mov.s $f0, $f4 /* 1A7C3C 8027935C 4602003C */ c.lt.s $f0, $f2 -/* 1A7C40 80279360 00000000 */ nop +/* 1A7C40 80279360 00000000 */ nop /* 1A7C44 80279364 45030001 */ bc1tl .L8027936C /* 1A7C48 80279368 E60200CC */ swc1 $f2, 0xcc($s0) .L8027936C: @@ -179,7 +179,7 @@ glabel IdleJumpToGoal /* 1A7C88 802793A8 0000102D */ daddu $v0, $zero, $zero /* 1A7C8C 802793AC 8E42007C */ lw $v0, 0x7c($s2) /* 1A7C90 802793B0 10400008 */ beqz $v0, .L802793D4 -/* 1A7C94 802793B4 00000000 */ nop +/* 1A7C94 802793B4 00000000 */ nop /* 1A7C98 802793B8 C6200048 */ lwc1 $f0, 0x48($s1) /* 1A7C9C 802793BC E7A00010 */ swc1 $f0, 0x10($sp) /* 1A7CA0 802793C0 8E25000C */ lw $a1, 0xc($s1) diff --git a/asm/nonmatchings/code_1A5830/IdleRunToGoal.s b/asm/nonmatchings/code_1A5830/IdleRunToGoal.s index aa8dc8b92b..54acb364d8 100644 --- a/asm/nonmatchings/code_1A5830/IdleRunToGoal.s +++ b/asm/nonmatchings/code_1A5830/IdleRunToGoal.s @@ -18,7 +18,7 @@ glabel IdleRunToGoal .L8027A298: /* 1A8B78 8027A298 8E420070 */ lw $v0, 0x70($s2) /* 1A8B7C 8027A29C 14400055 */ bnez $v0, .L8027A3F4 -/* 1A8B80 8027A2A0 00000000 */ nop +/* 1A8B80 8027A2A0 00000000 */ nop /* 1A8B84 8027A2A4 8E250000 */ lw $a1, ($s1) /* 1A8B88 8027A2A8 26310004 */ addiu $s1, $s1, 4 /* 1A8B8C 8027A2AC 0C0B1EAF */ jal get_variable @@ -26,11 +26,11 @@ glabel IdleRunToGoal /* 1A8B94 8027A2B4 0040202D */ daddu $a0, $v0, $zero /* 1A8B98 8027A2B8 2402FF81 */ addiu $v0, $zero, -0x7f /* 1A8B9C 8027A2BC 14820002 */ bne $a0, $v0, .L8027A2C8 -/* 1A8BA0 8027A2C0 00000000 */ nop +/* 1A8BA0 8027A2C0 00000000 */ nop /* 1A8BA4 8027A2C4 8E440148 */ lw $a0, 0x148($s2) .L8027A2C8: /* 1A8BA8 8027A2C8 0C09A75B */ jal get_actor -/* 1A8BAC 8027A2CC 00000000 */ nop +/* 1A8BAC 8027A2CC 00000000 */ nop /* 1A8BB0 8027A2D0 0040802D */ daddu $s0, $v0, $zero /* 1A8BB4 8027A2D4 AE500074 */ sw $s0, 0x74($s2) /* 1A8BB8 8027A2D8 8E250000 */ lw $a1, ($s1) @@ -70,7 +70,7 @@ glabel IdleRunToGoal /* 1A8C40 8027A360 46001003 */ div.s $f0, $f2, $f0 /* 1A8C44 8027A364 4600020D */ trunc.w.s $f8, $f0 /* 1A8C48 8027A368 44024000 */ mfc1 $v0, $f8 -/* 1A8C4C 8027A36C 00000000 */ nop +/* 1A8C4C 8027A36C 00000000 */ nop /* 1A8C50 8027A370 A6020120 */ sh $v0, 0x120($s0) /* 1A8C54 8027A374 00021400 */ sll $v0, $v0, 0x10 /* 1A8C58 8027A378 14400002 */ bnez $v0, .L8027A384 @@ -80,10 +80,10 @@ glabel IdleRunToGoal /* 1A8C64 8027A384 86020120 */ lh $v0, 0x120($s0) /* 1A8C68 8027A388 C6020108 */ lwc1 $f2, 0x108($s0) /* 1A8C6C 8027A38C 44823000 */ mtc1 $v0, $f6 -/* 1A8C70 8027A390 00000000 */ nop +/* 1A8C70 8027A390 00000000 */ nop /* 1A8C74 8027A394 468031A0 */ cvt.s.w $f6, $f6 /* 1A8C78 8027A398 46023102 */ mul.s $f4, $f6, $f2 -/* 1A8C7C 8027A39C 00000000 */ nop +/* 1A8C7C 8027A39C 00000000 */ nop /* 1A8C80 8027A3A0 C6000114 */ lwc1 $f0, 0x114($s0) /* 1A8C84 8027A3A4 46040001 */ sub.s $f0, $f0, $f4 /* 1A8C88 8027A3A8 46060003 */ div.s $f0, $f0, $f6 @@ -92,7 +92,7 @@ glabel IdleRunToGoal /* 1A8C94 8027A3B4 E6020108 */ swc1 $f2, 0x108($s0) .L8027A3B8: /* 1A8C98 8027A3B8 44820000 */ mtc1 $v0, $f0 -/* 1A8C9C 8027A3BC 00000000 */ nop +/* 1A8C9C 8027A3BC 00000000 */ nop /* 1A8CA0 8027A3C0 46800020 */ cvt.s.w $f0, $f0 /* 1A8CA4 8027A3C4 46001003 */ div.s $f0, $f2, $f0 /* 1A8CA8 8027A3C8 E6000108 */ swc1 $f0, 0x108($s0) @@ -103,7 +103,7 @@ glabel IdleRunToGoal /* 1A8CB8 8027A3D8 24420001 */ addiu $v0, $v0, 1 .L8027A3DC: /* 1A8CBC 8027A3DC 44820000 */ mtc1 $v0, $f0 -/* 1A8CC0 8027A3E0 00000000 */ nop +/* 1A8CC0 8027A3E0 00000000 */ nop /* 1A8CC4 8027A3E4 46800020 */ cvt.s.w $f0, $f0 /* 1A8CC8 8027A3E8 E620004C */ swc1 $f0, 0x4c($s1) /* 1A8CCC 8027A3EC 24020001 */ addiu $v0, $zero, 1 @@ -118,9 +118,9 @@ glabel IdleRunToGoal /* 1A8CEC 8027A40C C6020108 */ lwc1 $f2, 0x108($s0) /* 1A8CF0 8027A410 3C014080 */ lui $at, 0x4080 /* 1A8CF4 8027A414 44810000 */ mtc1 $at, $f0 -/* 1A8CF8 8027A418 00000000 */ nop +/* 1A8CF8 8027A418 00000000 */ nop /* 1A8CFC 8027A41C 4600103C */ c.lt.s $f2, $f0 -/* 1A8D00 8027A420 00000000 */ nop +/* 1A8D00 8027A420 00000000 */ nop /* 1A8D04 8027A424 45000007 */ bc1f .L8027A444 /* 1A8D08 8027A428 0000202D */ daddu $a0, $zero, $zero /* 1A8D0C 8027A42C C6000110 */ lwc1 $f0, 0x110($s0) @@ -138,7 +138,7 @@ glabel IdleRunToGoal /* 1A8D38 8027A458 24040001 */ addiu $a0, $zero, 1 .L8027A45C: /* 1A8D3C 8027A45C 0C0990BC */ jal play_movement_dust_effects -/* 1A8D40 8027A460 00000000 */ nop +/* 1A8D40 8027A460 00000000 */ nop /* 1A8D44 8027A464 C6200000 */ lwc1 $f0, ($s1) /* 1A8D48 8027A468 E6000144 */ swc1 $f0, 0x144($s0) /* 1A8D4C 8027A46C C6200008 */ lwc1 $f0, 8($s1) @@ -159,7 +159,7 @@ glabel IdleRunToGoal /* 1A8D88 8027A4A8 14400004 */ bnez $v0, .L8027A4BC /* 1A8D8C 8027A4AC 24020001 */ addiu $v0, $zero, 1 /* 1A8D90 8027A4B0 0C0154F0 */ jal func_800553C0 -/* 1A8D94 8027A4B4 00000000 */ nop +/* 1A8D94 8027A4B4 00000000 */ nop .L8027A4B8: /* 1A8D98 8027A4B8 24020001 */ addiu $v0, $zero, 1 .L8027A4BC: diff --git a/asm/nonmatchings/code_1A5830/JumpPartTo.s b/asm/nonmatchings/code_1A5830/JumpPartTo.s index 2fb5913b2b..c5a3adc243 100644 --- a/asm/nonmatchings/code_1A5830/JumpPartTo.s +++ b/asm/nonmatchings/code_1A5830/JumpPartTo.s @@ -21,7 +21,7 @@ glabel JumpPartTo .L8027A524: /* 1A8E04 8027A524 8E620070 */ lw $v0, 0x70($s3) /* 1A8E08 8027A528 14400093 */ bnez $v0, .L8027A778 -/* 1A8E0C 8027A52C 00000000 */ nop +/* 1A8E0C 8027A52C 00000000 */ nop /* 1A8E10 8027A530 8E450000 */ lw $a1, ($s2) /* 1A8E14 8027A534 26520004 */ addiu $s2, $s2, 4 /* 1A8E18 8027A538 0C0B1EAF */ jal get_variable @@ -29,7 +29,7 @@ glabel JumpPartTo /* 1A8E20 8027A540 0040802D */ daddu $s0, $v0, $zero /* 1A8E24 8027A544 2402FF81 */ addiu $v0, $zero, -0x7f /* 1A8E28 8027A548 16020002 */ bne $s0, $v0, .L8027A554 -/* 1A8E2C 8027A54C 00000000 */ nop +/* 1A8E2C 8027A54C 00000000 */ nop /* 1A8E30 8027A550 8E700148 */ lw $s0, 0x148($s3) .L8027A554: /* 1A8E34 8027A554 8E450000 */ lw $a1, ($s2) @@ -52,21 +52,21 @@ glabel JumpPartTo /* 1A8E78 8027A598 0C0B1EAF */ jal get_variable /* 1A8E7C 8027A59C 0260202D */ daddu $a0, $s3, $zero /* 1A8E80 8027A5A0 4482E000 */ mtc1 $v0, $f28 -/* 1A8E84 8027A5A4 00000000 */ nop +/* 1A8E84 8027A5A4 00000000 */ nop /* 1A8E88 8027A5A8 4680E720 */ cvt.s.w $f28, $f28 /* 1A8E8C 8027A5AC 8E450000 */ lw $a1, ($s2) /* 1A8E90 8027A5B0 26520004 */ addiu $s2, $s2, 4 /* 1A8E94 8027A5B4 0C0B1EAF */ jal get_variable /* 1A8E98 8027A5B8 0260202D */ daddu $a0, $s3, $zero /* 1A8E9C 8027A5BC 4482F000 */ mtc1 $v0, $f30 -/* 1A8EA0 8027A5C0 00000000 */ nop +/* 1A8EA0 8027A5C0 00000000 */ nop /* 1A8EA4 8027A5C4 4680F7A0 */ cvt.s.w $f30, $f30 /* 1A8EA8 8027A5C8 8E450000 */ lw $a1, ($s2) /* 1A8EAC 8027A5CC 26520004 */ addiu $s2, $s2, 4 /* 1A8EB0 8027A5D0 0C0B1EAF */ jal get_variable /* 1A8EB4 8027A5D4 0260202D */ daddu $a0, $s3, $zero /* 1A8EB8 8027A5D8 44820000 */ mtc1 $v0, $f0 -/* 1A8EBC 8027A5DC 00000000 */ nop +/* 1A8EBC 8027A5DC 00000000 */ nop /* 1A8EC0 8027A5E0 46800020 */ cvt.s.w $f0, $f0 /* 1A8EC4 8027A5E4 E61C000C */ swc1 $f28, 0xc($s0) /* 1A8EC8 8027A5E8 E61E0010 */ swc1 $f30, 0x10($s0) @@ -112,29 +112,29 @@ glabel JumpPartTo /* 1A8F68 8027A688 46002003 */ div.s $f0, $f4, $f0 /* 1A8F6C 8027A68C 4600028D */ trunc.w.s $f10, $f0 /* 1A8F70 8027A690 44035000 */ mfc1 $v1, $f10 -/* 1A8F74 8027A694 00000000 */ nop +/* 1A8F74 8027A694 00000000 */ nop /* 1A8F78 8027A698 00031400 */ sll $v0, $v1, 0x10 /* 1A8F7C 8027A69C 00021403 */ sra $v0, $v0, 0x10 /* 1A8F80 8027A6A0 44820000 */ mtc1 $v0, $f0 -/* 1A8F84 8027A6A4 00000000 */ nop +/* 1A8F84 8027A6A4 00000000 */ nop /* 1A8F88 8027A6A8 46800020 */ cvt.s.w $f0, $f0 /* 1A8F8C 8027A6AC 46020002 */ mul.s $f0, $f0, $f2 -/* 1A8F90 8027A6B0 00000000 */ nop +/* 1A8F90 8027A6B0 00000000 */ nop /* 1A8F94 8027A6B4 46002086 */ mov.s $f2, $f4 /* 1A8F98 8027A6B8 A6030038 */ sh $v1, 0x38($s0) /* 1A8F9C 8027A6BC 0809E9BE */ j .L8027A6F8 /* 1A8FA0 8027A6C0 46001201 */ sub.s $f8, $f2, $f0 .L8027A6C4: /* 1A8FA4 8027A6C4 44821000 */ mtc1 $v0, $f2 -/* 1A8FA8 8027A6C8 00000000 */ nop +/* 1A8FA8 8027A6C8 00000000 */ nop /* 1A8FAC 8027A6CC 468010A0 */ cvt.s.w $f2, $f2 /* 1A8FB0 8027A6D0 86020038 */ lh $v0, 0x38($s0) /* 1A8FB4 8027A6D4 46022083 */ div.s $f2, $f4, $f2 /* 1A8FB8 8027A6D8 44820000 */ mtc1 $v0, $f0 -/* 1A8FBC 8027A6DC 00000000 */ nop +/* 1A8FBC 8027A6DC 00000000 */ nop /* 1A8FC0 8027A6E0 46800020 */ cvt.s.w $f0, $f0 /* 1A8FC4 8027A6E4 46020002 */ mul.s $f0, $f0, $f2 -/* 1A8FC8 8027A6E8 00000000 */ nop +/* 1A8FC8 8027A6E8 00000000 */ nop /* 1A8FCC 8027A6EC C6040034 */ lwc1 $f4, 0x34($s0) /* 1A8FD0 8027A6F0 E6020028 */ swc1 $f2, 0x28($s0) /* 1A8FD4 8027A6F4 46002201 */ sub.s $f8, $f4, $f0 @@ -142,15 +142,15 @@ glabel JumpPartTo /* 1A8FD8 8027A6F8 86020038 */ lh $v0, 0x38($s0) /* 1A8FDC 8027A6FC C6020024 */ lwc1 $f2, 0x24($s0) /* 1A8FE0 8027A700 44823000 */ mtc1 $v0, $f6 -/* 1A8FE4 8027A704 00000000 */ nop +/* 1A8FE4 8027A704 00000000 */ nop /* 1A8FE8 8027A708 468031A0 */ cvt.s.w $f6, $f6 /* 1A8FEC 8027A70C 46061082 */ mul.s $f2, $f2, $f6 -/* 1A8FF0 8027A710 00000000 */ nop +/* 1A8FF0 8027A710 00000000 */ nop /* 1A8FF4 8027A714 3C013F00 */ lui $at, 0x3f00 /* 1A8FF8 8027A718 44810000 */ mtc1 $at, $f0 -/* 1A8FFC 8027A71C 00000000 */ nop +/* 1A8FFC 8027A71C 00000000 */ nop /* 1A9000 8027A720 46001082 */ mul.s $f2, $f2, $f0 -/* 1A9004 8027A724 00000000 */ nop +/* 1A9004 8027A724 00000000 */ nop /* 1A9008 8027A728 C6040028 */ lwc1 $f4, 0x28($s0) /* 1A900C 8027A72C 46003006 */ mov.s $f0, $f6 /* 1A9010 8027A730 46004003 */ div.s $f0, $f8, $f0 @@ -200,7 +200,7 @@ glabel JumpPartTo /* 1A90B8 8027A7D8 0000102D */ daddu $v0, $zero, $zero /* 1A90BC 8027A7DC 8E62007C */ lw $v0, 0x7c($s3) /* 1A90C0 8027A7E0 10400008 */ beqz $v0, .L8027A804 -/* 1A90C4 8027A7E4 00000000 */ nop +/* 1A90C4 8027A7E4 00000000 */ nop /* 1A90C8 8027A7E8 C6000030 */ lwc1 $f0, 0x30($s0) /* 1A90CC 8027A7EC E7A00010 */ swc1 $f0, 0x10($sp) /* 1A90D0 8027A7F0 8E05000C */ lw $a1, 0xc($s0) diff --git a/asm/nonmatchings/code_1A5830/JumpToGoal.s b/asm/nonmatchings/code_1A5830/JumpToGoal.s index 4058d4bf3b..dc31dc073a 100644 --- a/asm/nonmatchings/code_1A5830/JumpToGoal.s +++ b/asm/nonmatchings/code_1A5830/JumpToGoal.s @@ -21,7 +21,7 @@ glabel JumpToGoal .L80278D48: /* 1A7628 80278D48 8E620070 */ lw $v0, 0x70($s3) /* 1A762C 80278D4C 14400096 */ bnez $v0, .L80278FA8 -/* 1A7630 80278D50 00000000 */ nop +/* 1A7630 80278D50 00000000 */ nop /* 1A7634 80278D54 8E250000 */ lw $a1, ($s1) /* 1A7638 80278D58 26310004 */ addiu $s1, $s1, 4 /* 1A763C 80278D5C 0C0B1EAF */ jal get_variable @@ -29,11 +29,11 @@ glabel JumpToGoal /* 1A7644 80278D64 0040202D */ daddu $a0, $v0, $zero /* 1A7648 80278D68 2402FF81 */ addiu $v0, $zero, -0x7f /* 1A764C 80278D6C 14820002 */ bne $a0, $v0, .L80278D78 -/* 1A7650 80278D70 00000000 */ nop +/* 1A7650 80278D70 00000000 */ nop /* 1A7654 80278D74 8E640148 */ lw $a0, 0x148($s3) .L80278D78: /* 1A7658 80278D78 0C09A75B */ jal get_actor -/* 1A765C 80278D7C 00000000 */ nop +/* 1A765C 80278D7C 00000000 */ nop /* 1A7660 80278D80 0040802D */ daddu $s0, $v0, $zero /* 1A7664 80278D84 2612000C */ addiu $s2, $s0, 0xc /* 1A7668 80278D88 AE700074 */ sw $s0, 0x74($s3) @@ -53,7 +53,7 @@ glabel JumpToGoal /* 1A76A0 80278DC0 0C0B1EAF */ jal get_variable /* 1A76A4 80278DC4 0260202D */ daddu $a0, $s3, $zero /* 1A76A8 80278DC8 10400004 */ beqz $v0, .L80278DDC -/* 1A76AC 80278DCC 00000000 */ nop +/* 1A76AC 80278DCC 00000000 */ nop /* 1A76B0 80278DD0 8E62007C */ lw $v0, 0x7c($s3) /* 1A76B4 80278DD4 34420001 */ ori $v0, $v0, 1 /* 1A76B8 80278DD8 AE62007C */ sw $v0, 0x7c($s3) @@ -62,7 +62,7 @@ glabel JumpToGoal /* 1A76C0 80278DE0 0C0B1EAF */ jal get_variable /* 1A76C4 80278DE4 0260202D */ daddu $a0, $s3, $zero /* 1A76C8 80278DE8 10400004 */ beqz $v0, .L80278DFC -/* 1A76CC 80278DEC 00000000 */ nop +/* 1A76CC 80278DEC 00000000 */ nop /* 1A76D0 80278DF0 8E62007C */ lw $v0, 0x7c($s3) /* 1A76D4 80278DF4 34420002 */ ori $v0, $v0, 2 /* 1A76D8 80278DF8 AE62007C */ sw $v0, 0x7c($s3) @@ -99,54 +99,54 @@ glabel JumpToGoal /* 1A7750 80278E70 46002003 */ div.s $f0, $f4, $f0 /* 1A7754 80278E74 4600028D */ trunc.w.s $f10, $f0 /* 1A7758 80278E78 44035000 */ mfc1 $v1, $f10 -/* 1A775C 80278E7C 00000000 */ nop +/* 1A775C 80278E7C 00000000 */ nop /* 1A7760 80278E80 00031400 */ sll $v0, $v1, 0x10 /* 1A7764 80278E84 00021403 */ sra $v0, $v0, 0x10 /* 1A7768 80278E88 44820000 */ mtc1 $v0, $f0 -/* 1A776C 80278E8C 00000000 */ nop +/* 1A776C 80278E8C 00000000 */ nop /* 1A7770 80278E90 46800020 */ cvt.s.w $f0, $f0 /* 1A7774 80278E94 46020002 */ mul.s $f0, $f0, $f2 -/* 1A7778 80278E98 00000000 */ nop +/* 1A7778 80278E98 00000000 */ nop /* 1A777C 80278E9C 46002086 */ mov.s $f2, $f4 /* 1A7780 80278EA0 A6030070 */ sh $v1, 0x70($s0) /* 1A7784 80278EA4 0809E3B8 */ j .L80278EE0 /* 1A7788 80278EA8 46001201 */ sub.s $f8, $f2, $f0 .L80278EAC: /* 1A778C 80278EAC 44821000 */ mtc1 $v0, $f2 -/* 1A7790 80278EB0 00000000 */ nop +/* 1A7790 80278EB0 00000000 */ nop /* 1A7794 80278EB4 468010A0 */ cvt.s.w $f2, $f2 /* 1A7798 80278EB8 86020070 */ lh $v0, 0x70($s0) /* 1A779C 80278EBC 46022083 */ div.s $f2, $f4, $f2 /* 1A77A0 80278EC0 44820000 */ mtc1 $v0, $f0 -/* 1A77A4 80278EC4 00000000 */ nop +/* 1A77A4 80278EC4 00000000 */ nop /* 1A77A8 80278EC8 46800020 */ cvt.s.w $f0, $f0 /* 1A77AC 80278ECC 46020002 */ mul.s $f0, $f0, $f2 -/* 1A77B0 80278ED0 00000000 */ nop +/* 1A77B0 80278ED0 00000000 */ nop /* 1A77B4 80278ED4 C6040058 */ lwc1 $f4, 0x58($s0) /* 1A77B8 80278ED8 E602004C */ swc1 $f2, 0x4c($s0) /* 1A77BC 80278EDC 46002201 */ sub.s $f8, $f4, $f0 .L80278EE0: /* 1A77C0 80278EE0 86420064 */ lh $v0, 0x64($s2) /* 1A77C4 80278EE4 14400003 */ bnez $v0, .L80278EF4 -/* 1A77C8 80278EE8 00000000 */ nop +/* 1A77C8 80278EE8 00000000 */ nop /* 1A77CC 80278EEC 0809E436 */ j .L802790D8 /* 1A77D0 80278EF0 24020002 */ addiu $v0, $zero, 2 .L80278EF4: /* 1A77D4 80278EF4 C642003C */ lwc1 $f2, 0x3c($s2) /* 1A77D8 80278EF8 44823000 */ mtc1 $v0, $f6 -/* 1A77DC 80278EFC 00000000 */ nop +/* 1A77DC 80278EFC 00000000 */ nop /* 1A77E0 80278F00 468031A0 */ cvt.s.w $f6, $f6 /* 1A77E4 80278F04 46061082 */ mul.s $f2, $f2, $f6 -/* 1A77E8 80278F08 00000000 */ nop +/* 1A77E8 80278F08 00000000 */ nop /* 1A77EC 80278F0C 3C013F00 */ lui $at, 0x3f00 /* 1A77F0 80278F10 44810000 */ mtc1 $at, $f0 -/* 1A77F4 80278F14 00000000 */ nop +/* 1A77F4 80278F14 00000000 */ nop /* 1A77F8 80278F18 46001082 */ mul.s $f2, $f2, $f0 -/* 1A77FC 80278F1C 00000000 */ nop +/* 1A77FC 80278F1C 00000000 */ nop /* 1A7800 80278F20 86420064 */ lh $v0, 0x64($s2) /* 1A7804 80278F24 C6440040 */ lwc1 $f4, 0x40($s2) /* 1A7808 80278F28 44820000 */ mtc1 $v0, $f0 -/* 1A780C 80278F2C 00000000 */ nop +/* 1A780C 80278F2C 00000000 */ nop /* 1A7810 80278F30 46800020 */ cvt.s.w $f0, $f0 /* 1A7814 80278F34 46004003 */ div.s $f0, $f8, $f0 /* 1A7818 80278F38 46002100 */ add.s $f4, $f4, $f0 @@ -156,7 +156,7 @@ glabel JumpToGoal /* 1A7828 80278F48 E6420044 */ swc1 $f2, 0x44($s2) /* 1A782C 80278F4C 8E620078 */ lw $v0, 0x78($s3) /* 1A7830 80278F50 10400005 */ beqz $v0, .L80278F68 -/* 1A7834 80278F54 00000000 */ nop +/* 1A7834 80278F54 00000000 */ nop /* 1A7838 80278F58 86040192 */ lh $a0, 0x192($s0) /* 1A783C 80278F5C 82050077 */ lb $a1, 0x77($s0) /* 1A7840 80278F60 0C098F3F */ jal set_animation @@ -193,11 +193,11 @@ glabel JumpToGoal /* 1A78B0 80278FD0 1040000B */ beqz $v0, .L80279000 /* 1A78B4 80278FD4 2612000C */ addiu $s2, $s0, 0xc /* 1A78B8 80278FD8 44800000 */ mtc1 $zero, $f0 -/* 1A78BC 80278FDC 00000000 */ nop +/* 1A78BC 80278FDC 00000000 */ nop /* 1A78C0 80278FE0 4600203C */ c.lt.s $f4, $f0 -/* 1A78C4 80278FE4 00000000 */ nop +/* 1A78C4 80278FE4 00000000 */ nop /* 1A78C8 80278FE8 45000005 */ bc1f .L80279000 -/* 1A78CC 80278FEC 00000000 */ nop +/* 1A78CC 80278FEC 00000000 */ nop /* 1A78D0 80278FF0 86040192 */ lh $a0, 0x192($s0) /* 1A78D4 80278FF4 82050077 */ lb $a1, 0x77($s0) /* 1A78D8 80278FF8 0C098F3F */ jal set_animation @@ -205,15 +205,15 @@ glabel JumpToGoal .L80279000: /* 1A78E0 80279000 C6420044 */ lwc1 $f2, 0x44($s2) /* 1A78E4 80279004 44800000 */ mtc1 $zero, $f0 -/* 1A78E8 80279008 00000000 */ nop +/* 1A78E8 80279008 00000000 */ nop /* 1A78EC 8027900C 4600103C */ c.lt.s $f2, $f0 -/* 1A78F0 80279010 00000000 */ nop +/* 1A78F0 80279010 00000000 */ nop /* 1A78F4 80279014 45000007 */ bc1f .L80279034 -/* 1A78F8 80279018 00000000 */ nop +/* 1A78F8 80279018 00000000 */ nop /* 1A78FC 8027901C C6400004 */ lwc1 $f0, 4($s2) /* 1A7900 80279020 C6420010 */ lwc1 $f2, 0x10($s2) /* 1A7904 80279024 4602003C */ c.lt.s $f0, $f2 -/* 1A7908 80279028 00000000 */ nop +/* 1A7908 80279028 00000000 */ nop /* 1A790C 8027902C 45030001 */ bc1tl .L80279034 /* 1A7910 80279030 E6420004 */ swc1 $f2, 4($s2) .L80279034: @@ -236,7 +236,7 @@ glabel JumpToGoal /* 1A7954 80279074 8E62007C */ lw $v0, 0x7c($s3) /* 1A7958 80279078 30420001 */ andi $v0, $v0, 1 /* 1A795C 8027907C 10400008 */ beqz $v0, .L802790A0 -/* 1A7960 80279080 00000000 */ nop +/* 1A7960 80279080 00000000 */ nop /* 1A7964 80279084 C6400048 */ lwc1 $f0, 0x48($s2) /* 1A7968 80279088 E7A00010 */ swc1 $f0, 0x10($sp) /* 1A796C 8027908C 8E45000C */ lw $a1, 0xc($s2) diff --git a/asm/nonmatchings/code_1A5830/JumpToGoalSimple2.s b/asm/nonmatchings/code_1A5830/JumpToGoalSimple2.s index c1048e0b26..dc36174fe8 100644 --- a/asm/nonmatchings/code_1A5830/JumpToGoalSimple2.s +++ b/asm/nonmatchings/code_1A5830/JumpToGoalSimple2.s @@ -20,7 +20,7 @@ glabel JumpToGoalSimple2 .L8027945C: /* 1A7D3C 8027945C 8E420070 */ lw $v0, 0x70($s2) /* 1A7D40 80279460 14400073 */ bnez $v0, .L80279630 -/* 1A7D44 80279464 00000000 */ nop +/* 1A7D44 80279464 00000000 */ nop /* 1A7D48 80279468 8E250000 */ lw $a1, ($s1) /* 1A7D4C 8027946C 26310004 */ addiu $s1, $s1, 4 /* 1A7D50 80279470 0C0B1EAF */ jal get_variable @@ -28,11 +28,11 @@ glabel JumpToGoalSimple2 /* 1A7D58 80279478 0040202D */ daddu $a0, $v0, $zero /* 1A7D5C 8027947C 2402FF81 */ addiu $v0, $zero, -0x7f /* 1A7D60 80279480 14820002 */ bne $a0, $v0, .L8027948C -/* 1A7D64 80279484 00000000 */ nop +/* 1A7D64 80279484 00000000 */ nop /* 1A7D68 80279488 8E440148 */ lw $a0, 0x148($s2) .L8027948C: /* 1A7D6C 8027948C 0C09A75B */ jal get_actor -/* 1A7D70 80279490 00000000 */ nop +/* 1A7D70 80279490 00000000 */ nop /* 1A7D74 80279494 0040802D */ daddu $s0, $v0, $zero /* 1A7D78 80279498 AE500074 */ sw $s0, 0x74($s2) /* 1A7D7C 8027949C 8E250000 */ lw $a1, ($s1) @@ -72,54 +72,54 @@ glabel JumpToGoalSimple2 /* 1A7E04 80279524 46002003 */ div.s $f0, $f4, $f0 /* 1A7E08 80279528 4600028D */ trunc.w.s $f10, $f0 /* 1A7E0C 8027952C 44035000 */ mfc1 $v1, $f10 -/* 1A7E10 80279530 00000000 */ nop +/* 1A7E10 80279530 00000000 */ nop /* 1A7E14 80279534 00031400 */ sll $v0, $v1, 0x10 /* 1A7E18 80279538 00021403 */ sra $v0, $v0, 0x10 /* 1A7E1C 8027953C 44820000 */ mtc1 $v0, $f0 -/* 1A7E20 80279540 00000000 */ nop +/* 1A7E20 80279540 00000000 */ nop /* 1A7E24 80279544 46800020 */ cvt.s.w $f0, $f0 /* 1A7E28 80279548 46020002 */ mul.s $f0, $f0, $f2 -/* 1A7E2C 8027954C 00000000 */ nop +/* 1A7E2C 8027954C 00000000 */ nop /* 1A7E30 80279550 46002086 */ mov.s $f2, $f4 /* 1A7E34 80279554 A6030070 */ sh $v1, 0x70($s0) /* 1A7E38 80279558 0809E565 */ j .L80279594 /* 1A7E3C 8027955C 46001201 */ sub.s $f8, $f2, $f0 .L80279560: /* 1A7E40 80279560 44821000 */ mtc1 $v0, $f2 -/* 1A7E44 80279564 00000000 */ nop +/* 1A7E44 80279564 00000000 */ nop /* 1A7E48 80279568 468010A0 */ cvt.s.w $f2, $f2 /* 1A7E4C 8027956C 86020070 */ lh $v0, 0x70($s0) /* 1A7E50 80279570 46022083 */ div.s $f2, $f4, $f2 /* 1A7E54 80279574 44820000 */ mtc1 $v0, $f0 -/* 1A7E58 80279578 00000000 */ nop +/* 1A7E58 80279578 00000000 */ nop /* 1A7E5C 8027957C 46800020 */ cvt.s.w $f0, $f0 /* 1A7E60 80279580 46020002 */ mul.s $f0, $f0, $f2 -/* 1A7E64 80279584 00000000 */ nop +/* 1A7E64 80279584 00000000 */ nop /* 1A7E68 80279588 C6040058 */ lwc1 $f4, 0x58($s0) /* 1A7E6C 8027958C E602004C */ swc1 $f2, 0x4c($s0) /* 1A7E70 80279590 46002201 */ sub.s $f8, $f4, $f0 .L80279594: /* 1A7E74 80279594 86220064 */ lh $v0, 0x64($s1) /* 1A7E78 80279598 14400003 */ bnez $v0, .L802795A8 -/* 1A7E7C 8027959C 00000000 */ nop +/* 1A7E7C 8027959C 00000000 */ nop /* 1A7E80 802795A0 0809E5BE */ j .L802796F8 /* 1A7E84 802795A4 24020002 */ addiu $v0, $zero, 2 .L802795A8: /* 1A7E88 802795A8 C622003C */ lwc1 $f2, 0x3c($s1) /* 1A7E8C 802795AC 44823000 */ mtc1 $v0, $f6 -/* 1A7E90 802795B0 00000000 */ nop +/* 1A7E90 802795B0 00000000 */ nop /* 1A7E94 802795B4 468031A0 */ cvt.s.w $f6, $f6 /* 1A7E98 802795B8 46061082 */ mul.s $f2, $f2, $f6 -/* 1A7E9C 802795BC 00000000 */ nop +/* 1A7E9C 802795BC 00000000 */ nop /* 1A7EA0 802795C0 3C013F00 */ lui $at, 0x3f00 /* 1A7EA4 802795C4 44810000 */ mtc1 $at, $f0 -/* 1A7EA8 802795C8 00000000 */ nop +/* 1A7EA8 802795C8 00000000 */ nop /* 1A7EAC 802795CC 46001082 */ mul.s $f2, $f2, $f0 -/* 1A7EB0 802795D0 00000000 */ nop +/* 1A7EB0 802795D0 00000000 */ nop /* 1A7EB4 802795D4 86220064 */ lh $v0, 0x64($s1) /* 1A7EB8 802795D8 C6240040 */ lwc1 $f4, 0x40($s1) /* 1A7EBC 802795DC 44820000 */ mtc1 $v0, $f0 -/* 1A7EC0 802795E0 00000000 */ nop +/* 1A7EC0 802795E0 00000000 */ nop /* 1A7EC4 802795E4 46800020 */ cvt.s.w $f0, $f0 /* 1A7EC8 802795E8 46004003 */ div.s $f0, $f8, $f0 /* 1A7ECC 802795EC 46002100 */ add.s $f4, $f4, $f0 @@ -152,13 +152,13 @@ glabel JumpToGoalSimple2 /* 1A7F30 80279650 2611000C */ addiu $s1, $s0, 0xc /* 1A7F34 80279654 E6040010 */ swc1 $f4, 0x10($s0) /* 1A7F38 80279658 4602003C */ c.lt.s $f0, $f2 -/* 1A7F3C 8027965C 00000000 */ nop +/* 1A7F3C 8027965C 00000000 */ nop /* 1A7F40 80279660 45000007 */ bc1f .L80279680 /* 1A7F44 80279664 E6020050 */ swc1 $f2, 0x50($s0) /* 1A7F48 80279668 C602001C */ lwc1 $f2, 0x1c($s0) /* 1A7F4C 8027966C 46002006 */ mov.s $f0, $f4 /* 1A7F50 80279670 4600103C */ c.lt.s $f2, $f0 -/* 1A7F54 80279674 00000000 */ nop +/* 1A7F54 80279674 00000000 */ nop /* 1A7F58 80279678 45030001 */ bc1tl .L80279680 /* 1A7F5C 8027967C E6020010 */ swc1 $f2, 0x10($s0) .L80279680: diff --git a/asm/nonmatchings/code_1A5830/JumpWithBounce.s b/asm/nonmatchings/code_1A5830/JumpWithBounce.s index 95382e56c7..861a252147 100644 --- a/asm/nonmatchings/code_1A5830/JumpWithBounce.s +++ b/asm/nonmatchings/code_1A5830/JumpWithBounce.s @@ -28,11 +28,11 @@ glabel JumpWithBounce /* 1A8060 80279780 0040202D */ daddu $a0, $v0, $zero /* 1A8064 80279784 2402FF81 */ addiu $v0, $zero, -0x7f /* 1A8068 80279788 14820002 */ bne $a0, $v0, .L80279794 -/* 1A806C 8027978C 00000000 */ nop +/* 1A806C 8027978C 00000000 */ nop /* 1A8070 80279790 8E440148 */ lw $a0, 0x148($s2) .L80279794: /* 1A8074 80279794 0C09A75B */ jal get_actor -/* 1A8078 80279798 00000000 */ nop +/* 1A8078 80279798 00000000 */ nop /* 1A807C 8027979C 0040802D */ daddu $s0, $v0, $zero /* 1A8080 802797A0 AE500074 */ sw $s0, 0x74($s2) /* 1A8084 802797A4 8E250000 */ lw $a1, ($s1) @@ -77,54 +77,54 @@ glabel JumpWithBounce /* 1A8120 80279840 46002003 */ div.s $f0, $f4, $f0 /* 1A8124 80279844 4600028D */ trunc.w.s $f10, $f0 /* 1A8128 80279848 44035000 */ mfc1 $v1, $f10 -/* 1A812C 8027984C 00000000 */ nop +/* 1A812C 8027984C 00000000 */ nop /* 1A8130 80279850 00031400 */ sll $v0, $v1, 0x10 /* 1A8134 80279854 00021403 */ sra $v0, $v0, 0x10 /* 1A8138 80279858 44820000 */ mtc1 $v0, $f0 -/* 1A813C 8027985C 00000000 */ nop +/* 1A813C 8027985C 00000000 */ nop /* 1A8140 80279860 46800020 */ cvt.s.w $f0, $f0 /* 1A8144 80279864 46020002 */ mul.s $f0, $f0, $f2 -/* 1A8148 80279868 00000000 */ nop +/* 1A8148 80279868 00000000 */ nop /* 1A814C 8027986C 46002086 */ mov.s $f2, $f4 /* 1A8150 80279870 A6030070 */ sh $v1, 0x70($s0) /* 1A8154 80279874 0809E62C */ j .L802798B0 /* 1A8158 80279878 46001201 */ sub.s $f8, $f2, $f0 .L8027987C: /* 1A815C 8027987C 44821000 */ mtc1 $v0, $f2 -/* 1A8160 80279880 00000000 */ nop +/* 1A8160 80279880 00000000 */ nop /* 1A8164 80279884 468010A0 */ cvt.s.w $f2, $f2 /* 1A8168 80279888 86020070 */ lh $v0, 0x70($s0) /* 1A816C 8027988C 46022083 */ div.s $f2, $f4, $f2 /* 1A8170 80279890 44820000 */ mtc1 $v0, $f0 -/* 1A8174 80279894 00000000 */ nop +/* 1A8174 80279894 00000000 */ nop /* 1A8178 80279898 46800020 */ cvt.s.w $f0, $f0 /* 1A817C 8027989C 46020002 */ mul.s $f0, $f0, $f2 -/* 1A8180 802798A0 00000000 */ nop +/* 1A8180 802798A0 00000000 */ nop /* 1A8184 802798A4 C6040058 */ lwc1 $f4, 0x58($s0) /* 1A8188 802798A8 E602004C */ swc1 $f2, 0x4c($s0) /* 1A818C 802798AC 46002201 */ sub.s $f8, $f4, $f0 .L802798B0: /* 1A8190 802798B0 86220064 */ lh $v0, 0x64($s1) /* 1A8194 802798B4 14400003 */ bnez $v0, .L802798C4 -/* 1A8198 802798B8 00000000 */ nop +/* 1A8198 802798B8 00000000 */ nop /* 1A819C 802798BC 0809E6A9 */ j .L80279AA4 /* 1A81A0 802798C0 24020002 */ addiu $v0, $zero, 2 .L802798C4: /* 1A81A4 802798C4 C622003C */ lwc1 $f2, 0x3c($s1) /* 1A81A8 802798C8 44823000 */ mtc1 $v0, $f6 -/* 1A81AC 802798CC 00000000 */ nop +/* 1A81AC 802798CC 00000000 */ nop /* 1A81B0 802798D0 468031A0 */ cvt.s.w $f6, $f6 /* 1A81B4 802798D4 46061082 */ mul.s $f2, $f2, $f6 -/* 1A81B8 802798D8 00000000 */ nop +/* 1A81B8 802798D8 00000000 */ nop /* 1A81BC 802798DC 3C013F00 */ lui $at, 0x3f00 /* 1A81C0 802798E0 44810000 */ mtc1 $at, $f0 -/* 1A81C4 802798E4 00000000 */ nop +/* 1A81C4 802798E4 00000000 */ nop /* 1A81C8 802798E8 46001082 */ mul.s $f2, $f2, $f0 -/* 1A81CC 802798EC 00000000 */ nop +/* 1A81CC 802798EC 00000000 */ nop /* 1A81D0 802798F0 86220064 */ lh $v0, 0x64($s1) /* 1A81D4 802798F4 C6240040 */ lwc1 $f4, 0x40($s1) /* 1A81D8 802798F8 44820000 */ mtc1 $v0, $f0 -/* 1A81DC 802798FC 00000000 */ nop +/* 1A81DC 802798FC 00000000 */ nop /* 1A81E0 80279900 46800020 */ cvt.s.w $f0, $f0 /* 1A81E4 80279904 46004003 */ div.s $f0, $f8, $f0 /* 1A81E8 80279908 46002100 */ add.s $f4, $f4, $f0 @@ -155,15 +155,15 @@ glabel JumpWithBounce /* 1A8244 80279964 10400005 */ beqz $v0, .L8027997C /* 1A8248 80279968 24020001 */ addiu $v0, $zero, 1 /* 1A824C 8027996C 10620008 */ beq $v1, $v0, .L80279990 -/* 1A8250 80279970 00000000 */ nop +/* 1A8250 80279970 00000000 */ nop /* 1A8254 80279974 0809E6A2 */ j .L80279A88 -/* 1A8258 80279978 00000000 */ nop +/* 1A8258 80279978 00000000 */ nop .L8027997C: /* 1A825C 8027997C 24020003 */ addiu $v0, $zero, 3 /* 1A8260 80279980 10620048 */ beq $v1, $v0, .L80279AA4 /* 1A8264 80279984 24020002 */ addiu $v0, $zero, 2 /* 1A8268 80279988 0809E6A2 */ j .L80279A88 -/* 1A826C 8027998C 00000000 */ nop +/* 1A826C 8027998C 00000000 */ nop .L80279990: /* 1A8270 80279990 C6000050 */ lwc1 $f0, 0x50($s0) /* 1A8274 80279994 C6040010 */ lwc1 $f4, 0x10($s0) @@ -174,15 +174,15 @@ glabel JumpWithBounce /* 1A8288 802799A8 44800000 */ mtc1 $zero, $f0 /* 1A828C 802799AC E6040010 */ swc1 $f4, 0x10($s0) /* 1A8290 802799B0 4600103C */ c.lt.s $f2, $f0 -/* 1A8294 802799B4 00000000 */ nop +/* 1A8294 802799B4 00000000 */ nop /* 1A8298 802799B8 4500000F */ bc1f .L802799F8 /* 1A829C 802799BC E6020050 */ swc1 $f2, 0x50($s0) /* 1A82A0 802799C0 C600001C */ lwc1 $f0, 0x1c($s0) /* 1A82A4 802799C4 46002086 */ mov.s $f2, $f4 /* 1A82A8 802799C8 4600103C */ c.lt.s $f2, $f0 -/* 1A82AC 802799CC 00000000 */ nop +/* 1A82AC 802799CC 00000000 */ nop /* 1A82B0 802799D0 45000009 */ bc1f .L802799F8 -/* 1A82B4 802799D4 00000000 */ nop +/* 1A82B4 802799D4 00000000 */ nop /* 1A82B8 802799D8 C6020050 */ lwc1 $f2, 0x50($s0) /* 1A82BC 802799DC C604005C */ lwc1 $f4, 0x5c($s0) /* 1A82C0 802799E0 C6000048 */ lwc1 $f0, 0x48($s0) @@ -197,7 +197,7 @@ glabel JumpWithBounce /* 1A82E0 80279A00 0C09904A */ jal add_xz_vec3f /* 1A82E4 80279A04 0220202D */ daddu $a0, $s1, $zero /* 1A82E8 80279A08 0809E6A2 */ j .L80279A88 -/* 1A82EC 80279A0C 00000000 */ nop +/* 1A82EC 80279A0C 00000000 */ nop .L80279A10: /* 1A82F0 80279A10 C6000050 */ lwc1 $f0, 0x50($s0) /* 1A82F4 80279A14 C6040010 */ lwc1 $f4, 0x10($s0) @@ -208,13 +208,13 @@ glabel JumpWithBounce /* 1A8308 80279A28 44800000 */ mtc1 $zero, $f0 /* 1A830C 80279A2C E6040010 */ swc1 $f4, 0x10($s0) /* 1A8310 80279A30 4602003C */ c.lt.s $f0, $f2 -/* 1A8314 80279A34 00000000 */ nop +/* 1A8314 80279A34 00000000 */ nop /* 1A8318 80279A38 45000009 */ bc1f .L80279A60 /* 1A831C 80279A3C E6020050 */ swc1 $f2, 0x50($s0) /* 1A8320 80279A40 C602001C */ lwc1 $f2, 0x1c($s0) /* 1A8324 80279A44 46002006 */ mov.s $f0, $f4 /* 1A8328 80279A48 4600103C */ c.lt.s $f2, $f0 -/* 1A832C 80279A4C 00000000 */ nop +/* 1A832C 80279A4C 00000000 */ nop /* 1A8330 80279A50 45000003 */ bc1f .L80279A60 /* 1A8334 80279A54 24020003 */ addiu $v0, $zero, 3 /* 1A8338 80279A58 E6020010 */ swc1 $f2, 0x10($s0) diff --git a/asm/nonmatchings/code_1A5830/LandJump.s b/asm/nonmatchings/code_1A5830/LandJump.s index df7cc8c802..34b49d86cc 100644 --- a/asm/nonmatchings/code_1A5830/LandJump.s +++ b/asm/nonmatchings/code_1A5830/LandJump.s @@ -13,18 +13,18 @@ glabel LandJump .L80279AF4: /* 1A83D4 80279AF4 8E220070 */ lw $v0, 0x70($s1) /* 1A83D8 80279AF8 14400015 */ bnez $v0, .L80279B50 -/* 1A83DC 80279AFC 00000000 */ nop +/* 1A83DC 80279AFC 00000000 */ nop /* 1A83E0 80279B00 8C650000 */ lw $a1, ($v1) /* 1A83E4 80279B04 0C0B1EAF */ jal get_variable /* 1A83E8 80279B08 0220202D */ daddu $a0, $s1, $zero /* 1A83EC 80279B0C 0040202D */ daddu $a0, $v0, $zero /* 1A83F0 80279B10 2402FF81 */ addiu $v0, $zero, -0x7f /* 1A83F4 80279B14 14820002 */ bne $a0, $v0, .L80279B20 -/* 1A83F8 80279B18 00000000 */ nop +/* 1A83F8 80279B18 00000000 */ nop /* 1A83FC 80279B1C 8E240148 */ lw $a0, 0x148($s1) .L80279B20: /* 1A8400 80279B20 0C09A75B */ jal get_actor -/* 1A8404 80279B24 00000000 */ nop +/* 1A8404 80279B24 00000000 */ nop /* 1A8408 80279B28 0040802D */ daddu $s0, $v0, $zero /* 1A840C 80279B2C AE300074 */ sw $s0, 0x74($s1) /* 1A8410 80279B30 C6000144 */ lwc1 $f0, 0x144($s0) @@ -56,7 +56,7 @@ glabel LandJump /* 1A8474 80279B94 C6040148 */ lwc1 $f4, 0x148($s0) /* 1A8478 80279B98 E602014C */ swc1 $f2, 0x14c($s0) /* 1A847C 80279B9C 4606203C */ c.lt.s $f4, $f6 -/* 1A8480 80279BA0 00000000 */ nop +/* 1A8480 80279BA0 00000000 */ nop /* 1A8484 80279BA4 45010003 */ bc1t .L80279BB4 /* 1A8488 80279BA8 E6000144 */ swc1 $f0, 0x144($s0) /* 1A848C 80279BAC 0809E6F6 */ j .L80279BD8 diff --git a/asm/nonmatchings/code_1A5830/LandJumpPart.s b/asm/nonmatchings/code_1A5830/LandJumpPart.s index 465c346243..4b1ffc0db5 100644 --- a/asm/nonmatchings/code_1A5830/LandJumpPart.s +++ b/asm/nonmatchings/code_1A5830/LandJumpPart.s @@ -14,7 +14,7 @@ glabel LandJumpPart .L8027AB80: /* 1A9460 8027AB80 8E420070 */ lw $v0, 0x70($s2) /* 1A9464 8027AB84 14400020 */ bnez $v0, .L8027AC08 -/* 1A9468 8027AB88 00000000 */ nop +/* 1A9468 8027AB88 00000000 */ nop /* 1A946C 8027AB8C 8E250000 */ lw $a1, ($s1) /* 1A9470 8027AB90 26310004 */ addiu $s1, $s1, 4 /* 1A9474 8027AB94 0C0B1EAF */ jal get_variable @@ -26,7 +26,7 @@ glabel LandJumpPart /* 1A948C 8027ABAC 0040882D */ daddu $s1, $v0, $zero /* 1A9490 8027ABB0 2402FF81 */ addiu $v0, $zero, -0x7f /* 1A9494 8027ABB4 16020002 */ bne $s0, $v0, .L8027ABC0 -/* 1A9498 8027ABB8 00000000 */ nop +/* 1A9498 8027ABB8 00000000 */ nop /* 1A949C 8027ABBC 8E500148 */ lw $s0, 0x148($s2) .L8027ABC0: /* 1A94A0 8027ABC0 0C09A75B */ jal get_actor @@ -69,7 +69,7 @@ glabel LandJumpPart /* 1A9530 8027AC50 C6220030 */ lwc1 $f2, 0x30($s1) /* 1A9534 8027AC54 C6000008 */ lwc1 $f0, 8($s0) /* 1A9538 8027AC58 4604103C */ c.lt.s $f2, $f4 -/* 1A953C 8027AC5C 00000000 */ nop +/* 1A953C 8027AC5C 00000000 */ nop /* 1A9540 8027AC60 45010003 */ bc1t .L8027AC70 /* 1A9544 8027AC64 E6200034 */ swc1 $f0, 0x34($s1) /* 1A9548 8027AC68 0809EB25 */ j .L8027AC94 diff --git a/asm/nonmatchings/code_1A5830/RemoveActor.s b/asm/nonmatchings/code_1A5830/RemoveActor.s index 9e7aedb30d..13292f98b2 100644 --- a/asm/nonmatchings/code_1A5830/RemoveActor.s +++ b/asm/nonmatchings/code_1A5830/RemoveActor.s @@ -19,7 +19,7 @@ glabel RemoveActor /* 1AB0C8 8027C7E8 26730F10 */ addiu $s3, $s3, %lo(gCurrentEncounter) /* 1AB0CC 8027C7EC 2402FF81 */ addiu $v0, $zero, -0x7f /* 1AB0D0 8027C7F0 16220002 */ bne $s1, $v0, .L8027C7FC -/* 1AB0D4 8027C7F4 00000000 */ nop +/* 1AB0D4 8027C7F4 00000000 */ nop /* 1AB0D8 8027C7F8 8E110148 */ lw $s1, 0x148($s0) .L8027C7FC: /* 1AB0DC 8027C7FC 0C09A75B */ jal get_actor diff --git a/asm/nonmatchings/code_1A5830/RunPartTo.s b/asm/nonmatchings/code_1A5830/RunPartTo.s index 1c6d7891d4..e20d56b1b9 100644 --- a/asm/nonmatchings/code_1A5830/RunPartTo.s +++ b/asm/nonmatchings/code_1A5830/RunPartTo.s @@ -20,7 +20,7 @@ glabel RunPartTo .L8027ACE8: /* 1A95C8 8027ACE8 8E820070 */ lw $v0, 0x70($s4) /* 1A95CC 8027ACEC 1440006F */ bnez $v0, .L8027AEAC -/* 1A95D0 8027ACF0 00000000 */ nop +/* 1A95D0 8027ACF0 00000000 */ nop /* 1A95D4 8027ACF4 8E250000 */ lw $a1, ($s1) /* 1A95D8 8027ACF8 26310004 */ addiu $s1, $s1, 4 /* 1A95DC 8027ACFC 0C0B1EAF */ jal get_variable @@ -28,7 +28,7 @@ glabel RunPartTo /* 1A95E4 8027AD04 0040802D */ daddu $s0, $v0, $zero /* 1A95E8 8027AD08 2402FF81 */ addiu $v0, $zero, -0x7f /* 1A95EC 8027AD0C 16020002 */ bne $s0, $v0, .L8027AD18 -/* 1A95F0 8027AD10 00000000 */ nop +/* 1A95F0 8027AD10 00000000 */ nop /* 1A95F4 8027AD14 8E900148 */ lw $s0, 0x148($s4) .L8027AD18: /* 1A95F8 8027AD18 8E250000 */ lw $a1, ($s1) @@ -51,7 +51,7 @@ glabel RunPartTo /* 1A963C 8027AD5C 0C0B1EAF */ jal get_variable /* 1A9640 8027AD60 0280202D */ daddu $a0, $s4, $zero /* 1A9644 8027AD64 4482D000 */ mtc1 $v0, $f26 -/* 1A9648 8027AD68 00000000 */ nop +/* 1A9648 8027AD68 00000000 */ nop /* 1A964C 8027AD6C 4680D6A0 */ cvt.s.w $f26, $f26 /* 1A9650 8027AD70 8E250000 */ lw $a1, ($s1) /* 1A9654 8027AD74 26310004 */ addiu $s1, $s1, 4 @@ -60,12 +60,12 @@ glabel RunPartTo /* 1A9660 8027AD80 8E250000 */ lw $a1, ($s1) /* 1A9664 8027AD84 26310004 */ addiu $s1, $s1, 4 /* 1A9668 8027AD88 4482A000 */ mtc1 $v0, $f20 -/* 1A966C 8027AD8C 00000000 */ nop +/* 1A966C 8027AD8C 00000000 */ nop /* 1A9670 8027AD90 4680A520 */ cvt.s.w $f20, $f20 /* 1A9674 8027AD94 0C0B1EAF */ jal get_variable /* 1A9678 8027AD98 0280202D */ daddu $a0, $s4, $zero /* 1A967C 8027AD9C 44820000 */ mtc1 $v0, $f0 -/* 1A9680 8027ADA0 00000000 */ nop +/* 1A9680 8027ADA0 00000000 */ nop /* 1A9684 8027ADA4 46800020 */ cvt.s.w $f0, $f0 /* 1A9688 8027ADA8 E61A000C */ swc1 $f26, 0xc($s0) /* 1A968C 8027ADAC E6140010 */ swc1 $f20, 0x10($s0) @@ -106,7 +106,7 @@ glabel RunPartTo /* 1A9718 8027AE38 A6020038 */ sh $v0, 0x38($s0) .L8027AE3C: /* 1A971C 8027AE3C 44820000 */ mtc1 $v0, $f0 -/* 1A9720 8027AE40 00000000 */ nop +/* 1A9720 8027AE40 00000000 */ nop /* 1A9724 8027AE44 46800020 */ cvt.s.w $f0, $f0 /* 1A9728 8027AE48 46001003 */ div.s $f0, $f2, $f0 /* 1A972C 8027AE4C E6000028 */ swc1 $f0, 0x28($s0) @@ -117,7 +117,7 @@ glabel RunPartTo /* 1A973C 8027AE5C 24420001 */ addiu $v0, $v0, 1 .L8027AE60: /* 1A9740 8027AE60 44820000 */ mtc1 $v0, $f0 -/* 1A9744 8027AE64 00000000 */ nop +/* 1A9744 8027AE64 00000000 */ nop /* 1A9748 8027AE68 46800020 */ cvt.s.w $f0, $f0 /* 1A974C 8027AE6C E6000034 */ swc1 $f0, 0x34($s0) /* 1A9750 8027AE70 8E4200A4 */ lw $v0, 0xa4($s2) @@ -147,9 +147,9 @@ glabel RunPartTo /* 1A97A8 8027AEC8 C6020028 */ lwc1 $f2, 0x28($s0) /* 1A97AC 8027AECC 3C014080 */ lui $at, 0x4080 /* 1A97B0 8027AED0 44810000 */ mtc1 $at, $f0 -/* 1A97B4 8027AED4 00000000 */ nop +/* 1A97B4 8027AED4 00000000 */ nop /* 1A97B8 8027AED8 4600103C */ c.lt.s $f2, $f0 -/* 1A97BC 8027AEDC 00000000 */ nop +/* 1A97BC 8027AEDC 00000000 */ nop /* 1A97C0 8027AEE0 45000007 */ bc1f .L8027AF00 /* 1A97C4 8027AEE4 0000202D */ daddu $a0, $zero, $zero /* 1A97C8 8027AEE8 C6000030 */ lwc1 $f0, 0x30($s0) @@ -167,7 +167,7 @@ glabel RunPartTo /* 1A97F4 8027AF14 24040001 */ addiu $a0, $zero, 1 .L8027AF18: /* 1A97F8 8027AF18 0C0990BC */ jal play_movement_dust_effects -/* 1A97FC 8027AF1C 00000000 */ nop +/* 1A97FC 8027AF1C 00000000 */ nop /* 1A9800 8027AF20 C6000000 */ lwc1 $f0, ($s0) /* 1A9804 8027AF24 8E4200A4 */ lw $v0, 0xa4($s2) /* 1A9808 8027AF28 E640002C */ swc1 $f0, 0x2c($s2) @@ -178,22 +178,22 @@ glabel RunPartTo /* 1A981C 8027AF3C E6400034 */ swc1 $f0, 0x34($s2) /* 1A9820 8027AF40 8E4200A8 */ lw $v0, 0xa8($s2) /* 1A9824 8027AF44 10400047 */ beqz $v0, .L8027B064 -/* 1A9828 8027AF48 00000000 */ nop +/* 1A9828 8027AF48 00000000 */ nop /* 1A982C 8027AF4C 864200BC */ lh $v0, 0xbc($s2) /* 1A9830 8027AF50 0440001C */ bltz $v0, .L8027AFC4 -/* 1A9834 8027AF54 00000000 */ nop +/* 1A9834 8027AF54 00000000 */ nop /* 1A9838 8027AF58 C6020034 */ lwc1 $f2, 0x34($s0) /* 1A983C 8027AF5C C6000028 */ lwc1 $f0, 0x28($s0) /* 1A9840 8027AF60 46001080 */ add.s $f2, $f2, $f0 /* 1A9844 8027AF64 E6020034 */ swc1 $f2, 0x34($s0) /* 1A9848 8027AF68 864200BC */ lh $v0, 0xbc($s2) /* 1A984C 8027AF6C 44820000 */ mtc1 $v0, $f0 -/* 1A9850 8027AF70 00000000 */ nop +/* 1A9850 8027AF70 00000000 */ nop /* 1A9854 8027AF74 46800020 */ cvt.s.w $f0, $f0 /* 1A9858 8027AF78 4602003C */ c.lt.s $f0, $f2 -/* 1A985C 8027AF7C 00000000 */ nop +/* 1A985C 8027AF7C 00000000 */ nop /* 1A9860 8027AF80 45000038 */ bc1f .L8027B064 -/* 1A9864 8027AF84 00000000 */ nop +/* 1A9864 8027AF84 00000000 */ nop /* 1A9868 8027AF88 92620135 */ lbu $v0, 0x135($s3) /* 1A986C 8027AF8C 24420001 */ addiu $v0, $v0, 1 /* 1A9870 8027AF90 A2620135 */ sb $v0, 0x135($s3) @@ -201,10 +201,10 @@ glabel RunPartTo /* 1A9878 8027AF98 92620135 */ lbu $v0, 0x135($s3) /* 1A987C 8027AF9C 30420001 */ andi $v0, $v0, 1 /* 1A9880 8027AFA0 10400026 */ beqz $v0, .L8027B03C -/* 1A9884 8027AFA4 00000000 */ nop +/* 1A9884 8027AFA4 00000000 */ nop /* 1A9888 8027AFA8 8E4200A4 */ lw $v0, 0xa4($s2) /* 1A988C 8027AFAC 1040002D */ beqz $v0, .L8027B064 -/* 1A9890 8027AFB0 00000000 */ nop +/* 1A9890 8027AFB0 00000000 */ nop /* 1A9894 8027AFB4 C6400034 */ lwc1 $f0, 0x34($s2) /* 1A9898 8027AFB8 E7A00010 */ swc1 $f0, 0x10($sp) /* 1A989C 8027AFBC 0809EC15 */ j .L8027B054 @@ -213,18 +213,18 @@ glabel RunPartTo /* 1A98A4 8027AFC4 C6020034 */ lwc1 $f2, 0x34($s0) /* 1A98A8 8027AFC8 3C013F80 */ lui $at, 0x3f80 /* 1A98AC 8027AFCC 44810000 */ mtc1 $at, $f0 -/* 1A98B0 8027AFD0 00000000 */ nop +/* 1A98B0 8027AFD0 00000000 */ nop /* 1A98B4 8027AFD4 46001080 */ add.s $f2, $f2, $f0 /* 1A98B8 8027AFD8 E6020034 */ swc1 $f2, 0x34($s0) /* 1A98BC 8027AFDC 864200BC */ lh $v0, 0xbc($s2) /* 1A98C0 8027AFE0 00021023 */ negu $v0, $v0 /* 1A98C4 8027AFE4 44820000 */ mtc1 $v0, $f0 -/* 1A98C8 8027AFE8 00000000 */ nop +/* 1A98C8 8027AFE8 00000000 */ nop /* 1A98CC 8027AFEC 46800020 */ cvt.s.w $f0, $f0 /* 1A98D0 8027AFF0 4602003E */ c.le.s $f0, $f2 -/* 1A98D4 8027AFF4 00000000 */ nop +/* 1A98D4 8027AFF4 00000000 */ nop /* 1A98D8 8027AFF8 4500001A */ bc1f .L8027B064 -/* 1A98DC 8027AFFC 00000000 */ nop +/* 1A98DC 8027AFFC 00000000 */ nop /* 1A98E0 8027B000 92620135 */ lbu $v0, 0x135($s3) /* 1A98E4 8027B004 24420001 */ addiu $v0, $v0, 1 /* 1A98E8 8027B008 A2620135 */ sb $v0, 0x135($s3) @@ -232,10 +232,10 @@ glabel RunPartTo /* 1A98F0 8027B010 92620135 */ lbu $v0, 0x135($s3) /* 1A98F4 8027B014 30420001 */ andi $v0, $v0, 1 /* 1A98F8 8027B018 10400008 */ beqz $v0, .L8027B03C -/* 1A98FC 8027B01C 00000000 */ nop +/* 1A98FC 8027B01C 00000000 */ nop /* 1A9900 8027B020 8E4200A4 */ lw $v0, 0xa4($s2) /* 1A9904 8027B024 1040000F */ beqz $v0, .L8027B064 -/* 1A9908 8027B028 00000000 */ nop +/* 1A9908 8027B028 00000000 */ nop /* 1A990C 8027B02C C6400034 */ lwc1 $f0, 0x34($s2) /* 1A9910 8027B030 E7A00010 */ swc1 $f0, 0x10($sp) /* 1A9914 8027B034 0809EC15 */ j .L8027B054 @@ -243,7 +243,7 @@ glabel RunPartTo .L8027B03C: /* 1A991C 8027B03C 8E4200A8 */ lw $v0, 0xa8($s2) /* 1A9920 8027B040 10400008 */ beqz $v0, .L8027B064 -/* 1A9924 8027B044 00000000 */ nop +/* 1A9924 8027B044 00000000 */ nop /* 1A9928 8027B048 C6400034 */ lwc1 $f0, 0x34($s2) /* 1A992C 8027B04C E7A00010 */ swc1 $f0, 0x10($sp) /* 1A9930 8027B050 8E4400A8 */ lw $a0, 0xa8($s2) @@ -269,7 +269,7 @@ glabel RunPartTo /* 1A9978 8027B098 14400004 */ bnez $v0, .L8027B0AC /* 1A997C 8027B09C 24020001 */ addiu $v0, $zero, 1 /* 1A9980 8027B0A0 0C0154F0 */ jal func_800553C0 -/* 1A9984 8027B0A4 00000000 */ nop +/* 1A9984 8027B0A4 00000000 */ nop .L8027B0A8: /* 1A9988 8027B0A8 24020001 */ addiu $v0, $zero, 1 .L8027B0AC: diff --git a/asm/nonmatchings/code_1A5830/RunToGoal.s b/asm/nonmatchings/code_1A5830/RunToGoal.s index 92ca3378c3..b6aa78effc 100644 --- a/asm/nonmatchings/code_1A5830/RunToGoal.s +++ b/asm/nonmatchings/code_1A5830/RunToGoal.s @@ -18,7 +18,7 @@ glabel RunToGoal .L80279E98: /* 1A8778 80279E98 8E420070 */ lw $v0, 0x70($s2) /* 1A877C 80279E9C 14400067 */ bnez $v0, .L8027A03C -/* 1A8780 80279EA0 00000000 */ nop +/* 1A8780 80279EA0 00000000 */ nop /* 1A8784 80279EA4 8E250000 */ lw $a1, ($s1) /* 1A8788 80279EA8 26310004 */ addiu $s1, $s1, 4 /* 1A878C 80279EAC 0C0B1EAF */ jal get_variable @@ -26,11 +26,11 @@ glabel RunToGoal /* 1A8794 80279EB4 0040202D */ daddu $a0, $v0, $zero /* 1A8798 80279EB8 2402FF81 */ addiu $v0, $zero, -0x7f /* 1A879C 80279EBC 14820002 */ bne $a0, $v0, .L80279EC8 -/* 1A87A0 80279EC0 00000000 */ nop +/* 1A87A0 80279EC0 00000000 */ nop /* 1A87A4 80279EC4 8E440148 */ lw $a0, 0x148($s2) .L80279EC8: /* 1A87A8 80279EC8 0C09A75B */ jal get_actor -/* 1A87AC 80279ECC 00000000 */ nop +/* 1A87AC 80279ECC 00000000 */ nop /* 1A87B0 80279ED0 0040802D */ daddu $s0, $v0, $zero /* 1A87B4 80279ED4 AE500074 */ sw $s0, 0x74($s2) /* 1A87B8 80279ED8 8E250000 */ lw $a1, ($s1) @@ -75,7 +75,7 @@ glabel RunToGoal /* 1A8854 80279F74 46001003 */ div.s $f0, $f2, $f0 /* 1A8858 80279F78 4600020D */ trunc.w.s $f8, $f0 /* 1A885C 80279F7C 44024000 */ mfc1 $v0, $f8 -/* 1A8860 80279F80 00000000 */ nop +/* 1A8860 80279F80 00000000 */ nop /* 1A8864 80279F84 A6020070 */ sh $v0, 0x70($s0) /* 1A8868 80279F88 00021400 */ sll $v0, $v0, 0x10 /* 1A886C 80279F8C 14400002 */ bnez $v0, .L80279F98 @@ -85,10 +85,10 @@ glabel RunToGoal /* 1A8878 80279F98 86020070 */ lh $v0, 0x70($s0) /* 1A887C 80279F9C C602004C */ lwc1 $f2, 0x4c($s0) /* 1A8880 80279FA0 44823000 */ mtc1 $v0, $f6 -/* 1A8884 80279FA4 00000000 */ nop +/* 1A8884 80279FA4 00000000 */ nop /* 1A8888 80279FA8 468031A0 */ cvt.s.w $f6, $f6 /* 1A888C 80279FAC 46023102 */ mul.s $f4, $f6, $f2 -/* 1A8890 80279FB0 00000000 */ nop +/* 1A8890 80279FB0 00000000 */ nop /* 1A8894 80279FB4 C6000058 */ lwc1 $f0, 0x58($s0) /* 1A8898 80279FB8 46040001 */ sub.s $f0, $f0, $f4 /* 1A889C 80279FBC 46060003 */ div.s $f0, $f0, $f6 @@ -97,7 +97,7 @@ glabel RunToGoal /* 1A88A8 80279FC8 E602004C */ swc1 $f2, 0x4c($s0) .L80279FCC: /* 1A88AC 80279FCC 44820000 */ mtc1 $v0, $f0 -/* 1A88B0 80279FD0 00000000 */ nop +/* 1A88B0 80279FD0 00000000 */ nop /* 1A88B4 80279FD4 46800020 */ cvt.s.w $f0, $f0 /* 1A88B8 80279FD8 46001003 */ div.s $f0, $f2, $f0 /* 1A88BC 80279FDC E600004C */ swc1 $f0, 0x4c($s0) @@ -108,7 +108,7 @@ glabel RunToGoal /* 1A88CC 80279FEC 24420001 */ addiu $v0, $v0, 1 .L80279FF0: /* 1A88D0 80279FF0 44820000 */ mtc1 $v0, $f0 -/* 1A88D4 80279FF4 00000000 */ nop +/* 1A88D4 80279FF4 00000000 */ nop /* 1A88D8 80279FF8 46800020 */ cvt.s.w $f0, $f0 /* 1A88DC 80279FFC E620004C */ swc1 $f0, 0x4c($s1) /* 1A88E0 8027A000 8E02019C */ lw $v0, 0x19c($s0) @@ -136,13 +136,13 @@ glabel RunToGoal /* 1A8930 8027A050 0220202D */ daddu $a0, $s1, $zero /* 1A8934 8027A054 8E420078 */ lw $v0, 0x78($s2) /* 1A8938 8027A058 14400017 */ bnez $v0, .L8027A0B8 -/* 1A893C 8027A05C 00000000 */ nop +/* 1A893C 8027A05C 00000000 */ nop /* 1A8940 8027A060 C602004C */ lwc1 $f2, 0x4c($s0) /* 1A8944 8027A064 3C014080 */ lui $at, 0x4080 /* 1A8948 8027A068 44810000 */ mtc1 $at, $f0 -/* 1A894C 8027A06C 00000000 */ nop +/* 1A894C 8027A06C 00000000 */ nop /* 1A8950 8027A070 4600103C */ c.lt.s $f2, $f0 -/* 1A8954 8027A074 00000000 */ nop +/* 1A8954 8027A074 00000000 */ nop /* 1A8958 8027A078 45000007 */ bc1f .L8027A098 /* 1A895C 8027A07C 0000202D */ daddu $a0, $zero, $zero /* 1A8960 8027A080 C6000054 */ lwc1 $f0, 0x54($s0) @@ -160,7 +160,7 @@ glabel RunToGoal /* 1A898C 8027A0AC 24040001 */ addiu $a0, $zero, 1 .L8027A0B0: /* 1A8990 8027A0B0 0C0990BC */ jal play_movement_dust_effects -/* 1A8994 8027A0B4 00000000 */ nop +/* 1A8994 8027A0B4 00000000 */ nop .L8027A0B8: /* 1A8998 8027A0B8 C6200000 */ lwc1 $f0, ($s1) /* 1A899C 8027A0BC 8E02019C */ lw $v0, 0x19c($s0) @@ -170,22 +170,22 @@ glabel RunToGoal /* 1A89AC 8027A0CC E600014C */ swc1 $f0, 0x14c($s0) /* 1A89B0 8027A0D0 8E0201A0 */ lw $v0, 0x1a0($s0) /* 1A89B4 8027A0D4 10400047 */ beqz $v0, .L8027A1F4 -/* 1A89B8 8027A0D8 00000000 */ nop +/* 1A89B8 8027A0D8 00000000 */ nop /* 1A89BC 8027A0DC 860201B4 */ lh $v0, 0x1b4($s0) /* 1A89C0 8027A0E0 0440001C */ bltz $v0, .L8027A154 -/* 1A89C4 8027A0E4 00000000 */ nop +/* 1A89C4 8027A0E4 00000000 */ nop /* 1A89C8 8027A0E8 C622004C */ lwc1 $f2, 0x4c($s1) /* 1A89CC 8027A0EC C6200040 */ lwc1 $f0, 0x40($s1) /* 1A89D0 8027A0F0 46001080 */ add.s $f2, $f2, $f0 /* 1A89D4 8027A0F4 E622004C */ swc1 $f2, 0x4c($s1) /* 1A89D8 8027A0F8 860201B4 */ lh $v0, 0x1b4($s0) /* 1A89DC 8027A0FC 44820000 */ mtc1 $v0, $f0 -/* 1A89E0 8027A100 00000000 */ nop +/* 1A89E0 8027A100 00000000 */ nop /* 1A89E4 8027A104 46800020 */ cvt.s.w $f0, $f0 /* 1A89E8 8027A108 4602003C */ c.lt.s $f0, $f2 -/* 1A89EC 8027A10C 00000000 */ nop +/* 1A89EC 8027A10C 00000000 */ nop /* 1A89F0 8027A110 45000038 */ bc1f .L8027A1F4 -/* 1A89F4 8027A114 00000000 */ nop +/* 1A89F4 8027A114 00000000 */ nop /* 1A89F8 8027A118 92020135 */ lbu $v0, 0x135($s0) /* 1A89FC 8027A11C 24420001 */ addiu $v0, $v0, 1 /* 1A8A00 8027A120 A2020135 */ sb $v0, 0x135($s0) @@ -193,10 +193,10 @@ glabel RunToGoal /* 1A8A08 8027A128 92020135 */ lbu $v0, 0x135($s0) /* 1A8A0C 8027A12C 30420001 */ andi $v0, $v0, 1 /* 1A8A10 8027A130 10400026 */ beqz $v0, .L8027A1CC -/* 1A8A14 8027A134 00000000 */ nop +/* 1A8A14 8027A134 00000000 */ nop /* 1A8A18 8027A138 8E02019C */ lw $v0, 0x19c($s0) /* 1A8A1C 8027A13C 1040002D */ beqz $v0, .L8027A1F4 -/* 1A8A20 8027A140 00000000 */ nop +/* 1A8A20 8027A140 00000000 */ nop /* 1A8A24 8027A144 C600014C */ lwc1 $f0, 0x14c($s0) /* 1A8A28 8027A148 E7A00010 */ swc1 $f0, 0x10($sp) /* 1A8A2C 8027A14C 0809E879 */ j .L8027A1E4 @@ -205,18 +205,18 @@ glabel RunToGoal /* 1A8A34 8027A154 C622004C */ lwc1 $f2, 0x4c($s1) /* 1A8A38 8027A158 3C013F80 */ lui $at, 0x3f80 /* 1A8A3C 8027A15C 44810000 */ mtc1 $at, $f0 -/* 1A8A40 8027A160 00000000 */ nop +/* 1A8A40 8027A160 00000000 */ nop /* 1A8A44 8027A164 46001080 */ add.s $f2, $f2, $f0 /* 1A8A48 8027A168 E622004C */ swc1 $f2, 0x4c($s1) /* 1A8A4C 8027A16C 860201B4 */ lh $v0, 0x1b4($s0) /* 1A8A50 8027A170 00021023 */ negu $v0, $v0 /* 1A8A54 8027A174 44820000 */ mtc1 $v0, $f0 -/* 1A8A58 8027A178 00000000 */ nop +/* 1A8A58 8027A178 00000000 */ nop /* 1A8A5C 8027A17C 46800020 */ cvt.s.w $f0, $f0 /* 1A8A60 8027A180 4602003E */ c.le.s $f0, $f2 -/* 1A8A64 8027A184 00000000 */ nop +/* 1A8A64 8027A184 00000000 */ nop /* 1A8A68 8027A188 4500001A */ bc1f .L8027A1F4 -/* 1A8A6C 8027A18C 00000000 */ nop +/* 1A8A6C 8027A18C 00000000 */ nop /* 1A8A70 8027A190 92020135 */ lbu $v0, 0x135($s0) /* 1A8A74 8027A194 24420001 */ addiu $v0, $v0, 1 /* 1A8A78 8027A198 A2020135 */ sb $v0, 0x135($s0) @@ -224,10 +224,10 @@ glabel RunToGoal /* 1A8A80 8027A1A0 92020135 */ lbu $v0, 0x135($s0) /* 1A8A84 8027A1A4 30420001 */ andi $v0, $v0, 1 /* 1A8A88 8027A1A8 10400008 */ beqz $v0, .L8027A1CC -/* 1A8A8C 8027A1AC 00000000 */ nop +/* 1A8A8C 8027A1AC 00000000 */ nop /* 1A8A90 8027A1B0 8E02019C */ lw $v0, 0x19c($s0) /* 1A8A94 8027A1B4 1040000F */ beqz $v0, .L8027A1F4 -/* 1A8A98 8027A1B8 00000000 */ nop +/* 1A8A98 8027A1B8 00000000 */ nop /* 1A8A9C 8027A1BC C600014C */ lwc1 $f0, 0x14c($s0) /* 1A8AA0 8027A1C0 E7A00010 */ swc1 $f0, 0x10($sp) /* 1A8AA4 8027A1C4 0809E879 */ j .L8027A1E4 @@ -235,7 +235,7 @@ glabel RunToGoal .L8027A1CC: /* 1A8AAC 8027A1CC 8E0201A0 */ lw $v0, 0x1a0($s0) /* 1A8AB0 8027A1D0 10400008 */ beqz $v0, .L8027A1F4 -/* 1A8AB4 8027A1D4 00000000 */ nop +/* 1A8AB4 8027A1D4 00000000 */ nop /* 1A8AB8 8027A1D8 C600014C */ lwc1 $f0, 0x14c($s0) /* 1A8ABC 8027A1DC E7A00010 */ swc1 $f0, 0x10($sp) /* 1A8AC0 8027A1E0 8E0401A0 */ lw $a0, 0x1a0($s0) @@ -261,7 +261,7 @@ glabel RunToGoal /* 1A8B08 8027A228 14400004 */ bnez $v0, .L8027A23C /* 1A8B0C 8027A22C 24020001 */ addiu $v0, $zero, 1 /* 1A8B10 8027A230 0C0154F0 */ jal func_800553C0 -/* 1A8B14 8027A234 00000000 */ nop +/* 1A8B14 8027A234 00000000 */ nop .L8027A238: /* 1A8B18 8027A238 24020001 */ addiu $v0, $zero, 1 .L8027A23C: diff --git a/asm/nonmatchings/code_1A5830/SetActorSize.s b/asm/nonmatchings/code_1A5830/SetActorSize.s index c62f3610cf..0031ea738e 100644 --- a/asm/nonmatchings/code_1A5830/SetActorSize.s +++ b/asm/nonmatchings/code_1A5830/SetActorSize.s @@ -25,7 +25,7 @@ glabel SetActorSize /* 1AC140 8027D860 0040982D */ daddu $s3, $v0, $zero /* 1AC144 8027D864 2402FF81 */ addiu $v0, $zero, -0x7f /* 1AC148 8027D868 16220002 */ bne $s1, $v0, .L8027D874 -/* 1AC14C 8027D86C 00000000 */ nop +/* 1AC14C 8027D86C 00000000 */ nop /* 1AC150 8027D870 8E510148 */ lw $s1, 0x148($s2) .L8027D874: /* 1AC154 8027D874 0C09A75B */ jal get_actor @@ -44,7 +44,7 @@ glabel SetActorSize /* 1AC180 8027D8A0 44811800 */ mtc1 $at, $f3 /* 1AC184 8027D8A4 44801000 */ mtc1 $zero, $f2 /* 1AC188 8027D8A8 44830000 */ mtc1 $v1, $f0 -/* 1AC18C 8027D8AC 00000000 */ nop +/* 1AC18C 8027D8AC 00000000 */ nop /* 1AC190 8027D8B0 46800021 */ cvt.d.w $f0, $f0 /* 1AC194 8027D8B4 46220003 */ div.d $f0, $f0, $f2 /* 1AC198 8027D8B8 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/code_1A5830/SetEnemyHP.s b/asm/nonmatchings/code_1A5830/SetEnemyHP.s index 5fb8bc5201..bbc10464c2 100644 --- a/asm/nonmatchings/code_1A5830/SetEnemyHP.s +++ b/asm/nonmatchings/code_1A5830/SetEnemyHP.s @@ -15,7 +15,7 @@ glabel SetEnemyHP /* 1AAED0 8027C5F0 0040802D */ daddu $s0, $v0, $zero /* 1AAED4 8027C5F4 2402FF81 */ addiu $v0, $zero, -0x7f /* 1AAED8 8027C5F8 16020002 */ bne $s0, $v0, .L8027C604 -/* 1AAEDC 8027C5FC 00000000 */ nop +/* 1AAEDC 8027C5FC 00000000 */ nop /* 1AAEE0 8027C600 8E500148 */ lw $s0, 0x148($s2) .L8027C604: /* 1AAEE4 8027C604 8E250000 */ lw $a1, ($s1) @@ -48,7 +48,7 @@ glabel SetEnemyHP /* 1AAF48 8027C668 14810004 */ bne $a0, $at, .L8027C67C /* 1AAF4C 8027C66C 3C018000 */ lui $at, 0x8000 /* 1AAF50 8027C670 14610002 */ bne $v1, $at, .L8027C67C -/* 1AAF54 8027C674 00000000 */ nop +/* 1AAF54 8027C674 00000000 */ nop /* 1AAF58 8027C678 0006000D */ break 6 .L8027C67C: /* 1AAF5C 8027C67C 00001812 */ mflo $v1 diff --git a/asm/nonmatchings/code_1A5830/SetPartSize.s b/asm/nonmatchings/code_1A5830/SetPartSize.s index 27a5d86d9b..ce7d2718d4 100644 --- a/asm/nonmatchings/code_1A5830/SetPartSize.s +++ b/asm/nonmatchings/code_1A5830/SetPartSize.s @@ -31,7 +31,7 @@ glabel SetPartSize /* 1AC2B8 8027D9D8 0040982D */ daddu $s3, $v0, $zero /* 1AC2BC 8027D9DC 2402FF81 */ addiu $v0, $zero, -0x7f /* 1AC2C0 8027D9E0 16220002 */ bne $s1, $v0, .L8027D9EC -/* 1AC2C4 8027D9E4 00000000 */ nop +/* 1AC2C4 8027D9E4 00000000 */ nop /* 1AC2C8 8027D9E8 8E510148 */ lw $s1, 0x148($s2) .L8027D9EC: /* 1AC2CC 8027D9EC 0C09A75B */ jal get_actor @@ -53,7 +53,7 @@ glabel SetPartSize /* 1AC304 8027DA24 44811800 */ mtc1 $at, $f3 /* 1AC308 8027DA28 44801000 */ mtc1 $zero, $f2 /* 1AC30C 8027DA2C 44830000 */ mtc1 $v1, $f0 -/* 1AC310 8027DA30 00000000 */ nop +/* 1AC310 8027DA30 00000000 */ nop /* 1AC314 8027DA34 46800021 */ cvt.d.w $f0, $f0 /* 1AC318 8027DA38 46220003 */ div.d $f0, $f0, $f2 /* 1AC31C 8027DA3C 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/code_1A5830/SetTargetOffset.s b/asm/nonmatchings/code_1A5830/SetTargetOffset.s index e1e95d2c97..05538cceb0 100644 --- a/asm/nonmatchings/code_1A5830/SetTargetOffset.s +++ b/asm/nonmatchings/code_1A5830/SetTargetOffset.s @@ -16,7 +16,7 @@ glabel SetTargetOffset /* 1ABC8C 8027D3AC 0040802D */ daddu $s0, $v0, $zero /* 1ABC90 8027D3B0 2402FF81 */ addiu $v0, $zero, -0x7f /* 1ABC94 8027D3B4 16020002 */ bne $s0, $v0, .L8027D3C0 -/* 1ABC98 8027D3B8 00000000 */ nop +/* 1ABC98 8027D3B8 00000000 */ nop /* 1ABC9C 8027D3BC 8E700148 */ lw $s0, 0x148($s3) .L8027D3C0: /* 1ABCA0 8027D3C0 8E450000 */ lw $a1, ($s2) diff --git a/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s b/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s index 48e88bc850..c5a8467df5 100644 --- a/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s +++ b/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s @@ -45,7 +45,7 @@ glabel calc_enemy_damage_target /* 1A5DA8 802774C8 AFA20018 */ sw $v0, 0x18($sp) .L802774CC: /* 1A5DAC 802774CC 0809DD33 */ j .L802774CC -/* 1A5DB0 802774D0 00000000 */ nop +/* 1A5DB0 802774D0 00000000 */ nop .L802774D4: /* 1A5DB4 802774D4 32160700 */ andi $s6, $s0, 0x700 /* 1A5DB8 802774D8 24020100 */ addiu $v0, $zero, 0x100 @@ -53,9 +53,9 @@ glabel calc_enemy_damage_target /* 1A5DC0 802774E0 A66001F8 */ sh $zero, 0x1f8($s3) /* 1A5DC4 802774E4 2AC20101 */ slti $v0, $s6, 0x101 /* 1A5DC8 802774E8 10400009 */ beqz $v0, .L80277510 -/* 1A5DCC 802774EC 00000000 */ nop +/* 1A5DCC 802774EC 00000000 */ nop /* 1A5DD0 802774F0 16C00007 */ bnez $s6, .L80277510 -/* 1A5DD4 802774F4 00000000 */ nop +/* 1A5DD4 802774F4 00000000 */ nop /* 1A5DD8 802774F8 3C028011 */ lui $v0, %hi(gPlayerData+0x2) /* 1A5DDC 802774FC 9042F292 */ lbu $v0, %lo(gPlayerData+0x2)($v0) /* 1A5DE0 80277500 0809DD44 */ j .L80277510 @@ -74,11 +74,11 @@ glabel calc_enemy_damage_target /* 1A5E0C 8027752C 10620007 */ beq $v1, $v0, .L8027754C /* 1A5E10 80277530 30820800 */ andi $v0, $a0, 0x800 /* 1A5E14 80277534 10400007 */ beqz $v0, .L80277554 -/* 1A5E18 80277538 00000000 */ nop +/* 1A5E18 80277538 00000000 */ nop /* 1A5E1C 8027753C 8E820188 */ lw $v0, 0x188($s4) /* 1A5E20 80277540 30420800 */ andi $v0, $v0, 0x800 /* 1A5E24 80277544 14400003 */ bnez $v0, .L80277554 -/* 1A5E28 80277548 00000000 */ nop +/* 1A5E28 80277548 00000000 */ nop .L8027754C: /* 1A5E2C 8027754C 0809E1A9 */ j .L802786A4 /* 1A5E30 80277550 24020006 */ addiu $v0, $zero, 6 @@ -119,7 +119,7 @@ glabel calc_enemy_damage_target /* 1A5EB4 802775D4 3C021000 */ lui $v0, 0x1000 /* 1A5EB8 802775D8 00621024 */ and $v0, $v1, $v0 /* 1A5EBC 802775DC 14400011 */ bnez $v0, .L80277624 -/* 1A5EC0 802775E0 00000000 */ nop +/* 1A5EC0 802775E0 00000000 */ nop /* 1A5EC4 802775E4 8FA80018 */ lw $t0, 0x18($sp) /* 1A5EC8 802775E8 8D02007C */ lw $v0, 0x7c($t0) /* 1A5ECC 802775EC 30420200 */ andi $v0, $v0, 0x200 @@ -140,7 +140,7 @@ glabel calc_enemy_damage_target /* 1A5F04 80277624 8E820188 */ lw $v0, 0x188($s4) /* 1A5F08 80277628 30420800 */ andi $v0, $v0, 0x800 /* 1A5F0C 8027762C 1040000D */ beqz $v0, .L80277664 -/* 1A5F10 80277630 00000000 */ nop +/* 1A5F10 80277630 00000000 */ nop /* 1A5F14 80277634 8E620000 */ lw $v0, ($s3) /* 1A5F18 80277638 30420200 */ andi $v0, $v0, 0x200 /* 1A5F1C 8027763C 10400009 */ beqz $v0, .L80277664 @@ -177,7 +177,7 @@ glabel calc_enemy_damage_target /* 1A5F90 802776B0 8E820188 */ lw $v0, 0x188($s4) /* 1A5F94 802776B4 30420020 */ andi $v0, $v0, 0x20 /* 1A5F98 802776B8 10400005 */ beqz $v0, .L802776D0 -/* 1A5F9C 802776BC 00000000 */ nop +/* 1A5F9C 802776BC 00000000 */ nop /* 1A5FA0 802776C0 0C09451D */ jal func_80251474 /* 1A5FA4 802776C4 0260202D */ daddu $a0, $s3, $zero /* 1A5FA8 802776C8 24080001 */ addiu $t0, $zero, 1 @@ -204,11 +204,11 @@ glabel calc_enemy_damage_target /* 1A5FF4 80277714 8E820188 */ lw $v0, 0x188($s4) /* 1A5FF8 80277718 30420008 */ andi $v0, $v0, 8 /* 1A5FFC 8027771C 1040000B */ beqz $v0, .L8027774C -/* 1A6000 80277720 00000000 */ nop +/* 1A6000 80277720 00000000 */ nop /* 1A6004 80277724 C6220014 */ lwc1 $f2, 0x14($s1) /* 1A6008 80277728 3C0140A0 */ lui $at, 0x40a0 /* 1A600C 8027772C 44810000 */ mtc1 $at, $f0 -/* 1A6010 80277730 00000000 */ nop +/* 1A6010 80277730 00000000 */ nop /* 1A6014 80277734 46001080 */ add.s $f2, $f2, $f0 /* 1A6018 80277738 8E25000C */ lw $a1, 0xc($s1) /* 1A601C 8027773C 8E260010 */ lw $a2, 0x10($s1) @@ -241,7 +241,7 @@ glabel calc_enemy_damage_target /* 1A6080 802777A0 3484FFFF */ ori $a0, $a0, 0xffff /* 1A6084 802777A4 8FA40058 */ lw $a0, 0x58($sp) /* 1A6088 802777A8 0C09DBD4 */ jal func_80276F50 -/* 1A608C 802777AC 00000000 */ nop +/* 1A608C 802777AC 00000000 */ nop /* 1A6090 802777B0 14400008 */ bnez $v0, .L802777D4 /* 1A6094 802777B4 3C047FFF */ lui $a0, 0x7fff /* 1A6098 802777B8 3C03800E */ lui $v1, %hi(gBattleStatus) @@ -269,7 +269,7 @@ glabel calc_enemy_damage_target /* 1A60E8 80277808 3C020800 */ lui $v0, 0x800 /* 1A60EC 8027780C 00621024 */ and $v0, $v1, $v0 /* 1A60F0 80277810 14400010 */ bnez $v0, .L80277854 -/* 1A60F4 80277814 00000000 */ nop +/* 1A60F4 80277814 00000000 */ nop /* 1A60F8 80277818 82620222 */ lb $v0, 0x222($s3) /* 1A60FC 8027781C 16C0000D */ bnez $s6, .L80277854 /* 1A6100 80277820 00822021 */ addu $a0, $a0, $v0 @@ -292,9 +292,9 @@ glabel calc_enemy_damage_target /* 1A613C 8027785C 12C20007 */ beq $s6, $v0, .L8027787C /* 1A6140 80277860 2AC20101 */ slti $v0, $s6, 0x101 /* 1A6144 80277864 10400005 */ beqz $v0, .L8027787C -/* 1A6148 80277868 00000000 */ nop +/* 1A6148 80277868 00000000 */ nop /* 1A614C 8027786C 16C00003 */ bnez $s6, .L8027787C -/* 1A6150 80277870 00000000 */ nop +/* 1A6150 80277870 00000000 */ nop /* 1A6154 80277874 828200AD */ lb $v0, 0xad($s4) /* 1A6158 80277878 02028023 */ subu $s0, $s0, $v0 .L8027787C: @@ -363,15 +363,15 @@ glabel calc_enemy_damage_target /* 1A6238 80277958 12C00005 */ beqz $s6, .L80277970 /* 1A623C 8027795C 24020100 */ addiu $v0, $zero, 0x100 /* 1A6240 80277960 12C20021 */ beq $s6, $v0, .L802779E8 -/* 1A6244 80277964 00000000 */ nop +/* 1A6244 80277964 00000000 */ nop /* 1A6248 80277968 0809DEA0 */ j .L80277A80 -/* 1A624C 8027796C 00000000 */ nop +/* 1A624C 8027796C 00000000 */ nop .L80277970: /* 1A6250 80277970 82620210 */ lb $v0, 0x210($s3) /* 1A6254 80277974 10400003 */ beqz $v0, .L80277984 /* 1A6258 80277978 28420009 */ slti $v0, $v0, 9 /* 1A625C 8027797C 14400040 */ bnez $v0, .L80277A80 -/* 1A6260 80277980 00000000 */ nop +/* 1A6260 80277980 00000000 */ nop .L80277984: /* 1A6264 80277984 82620214 */ lb $v0, 0x214($s3) /* 1A6268 80277988 1440003D */ bnez $v0, .L80277A80 @@ -379,16 +379,16 @@ glabel calc_enemy_damage_target /* 1A6270 80277990 8E820188 */ lw $v0, 0x188($s4) /* 1A6274 80277994 00431024 */ and $v0, $v0, $v1 /* 1A6278 80277998 14400039 */ bnez $v0, .L80277A80 -/* 1A627C 8027799C 00000000 */ nop +/* 1A627C 8027799C 00000000 */ nop /* 1A6280 802779A0 0260202D */ daddu $a0, $s3, $zero /* 1A6284 802779A4 0C099CAB */ jal heroes_is_ability_active /* 1A6288 802779A8 24050015 */ addiu $a1, $zero, 0x15 /* 1A628C 802779AC 10400005 */ beqz $v0, .L802779C4 -/* 1A6290 802779B0 00000000 */ nop +/* 1A6290 802779B0 00000000 */ nop /* 1A6294 802779B4 0C00A67F */ jal rand_int /* 1A6298 802779B8 24040001 */ addiu $a0, $zero, 1 /* 1A629C 802779BC 0809DE73 */ j .L802779CC -/* 1A62A0 802779C0 00000000 */ nop +/* 1A62A0 802779C0 00000000 */ nop .L802779C4: /* 1A62A4 802779C4 0C09A3B3 */ jal check_block_input /* 1A62A8 802779C8 34048000 */ ori $a0, $zero, 0x8000 @@ -403,18 +403,18 @@ glabel calc_enemy_damage_target .L802779E8: /* 1A62C8 802779E8 82620214 */ lb $v0, 0x214($s3) /* 1A62CC 802779EC 14400024 */ bnez $v0, .L80277A80 -/* 1A62D0 802779F0 00000000 */ nop +/* 1A62D0 802779F0 00000000 */ nop /* 1A62D4 802779F4 82620216 */ lb $v0, 0x216($s3) /* 1A62D8 802779F8 14400021 */ bnez $v0, .L80277A80 /* 1A62DC 802779FC 3C030200 */ lui $v1, 0x200 /* 1A62E0 80277A00 8E820188 */ lw $v0, 0x188($s4) /* 1A62E4 80277A04 00431024 */ and $v0, $v0, $v1 /* 1A62E8 80277A08 1440001D */ bnez $v0, .L80277A80 -/* 1A62EC 80277A0C 00000000 */ nop +/* 1A62EC 80277A0C 00000000 */ nop /* 1A62F0 80277A10 0C09A3B3 */ jal check_block_input /* 1A62F4 80277A14 34048000 */ ori $a0, $zero, 0x8000 /* 1A62F8 80277A18 10400017 */ beqz $v0, .L80277A78 -/* 1A62FC 80277A1C 00000000 */ nop +/* 1A62FC 80277A1C 00000000 */ nop /* 1A6300 80277A20 0000802D */ daddu $s0, $zero, $zero .L80277A24: /* 1A6304 80277A24 C6200014 */ lwc1 $f0, 0x14($s1) @@ -447,7 +447,7 @@ glabel calc_enemy_damage_target /* 1A6368 80277A88 8FC20000 */ lw $v0, ($fp) /* 1A636C 80277A8C 30420020 */ andi $v0, $v0, 0x20 /* 1A6370 80277A90 10400003 */ beqz $v0, .L80277AA0 -/* 1A6374 80277A94 00000000 */ nop +/* 1A6374 80277A94 00000000 */ nop /* 1A6378 80277A98 0C099A5C */ jal func_80266970 /* 1A637C 80277A9C 0260202D */ daddu $a0, $s3, $zero .L80277AA0: @@ -492,14 +492,14 @@ glabel calc_enemy_damage_target /* 1A640C 80277B2C 8E620000 */ lw $v0, ($s3) /* 1A6410 80277B30 00431024 */ and $v0, $v0, $v1 /* 1A6414 80277B34 14400004 */ bnez $v0, .L80277B48 -/* 1A6418 80277B38 00000000 */ nop +/* 1A6418 80277B38 00000000 */ nop /* 1A641C 80277B3C 926201B8 */ lbu $v0, 0x1b8($s3) /* 1A6420 80277B40 00501023 */ subu $v0, $v0, $s0 /* 1A6424 80277B44 A26201B8 */ sb $v0, 0x1b8($s3) .L80277B48: /* 1A6428 80277B48 826201B8 */ lb $v0, 0x1b8($s3) /* 1A642C 80277B4C 1C400003 */ bgtz $v0, .L80277B5C -/* 1A6430 80277B50 00000000 */ nop +/* 1A6430 80277B50 00000000 */ nop /* 1A6434 80277B54 A26001B8 */ sb $zero, 0x1b8($s3) /* 1A6438 80277B58 24120020 */ addiu $s2, $zero, 0x20 .L80277B5C: @@ -534,7 +534,7 @@ glabel calc_enemy_damage_target /* 1A64A0 80277BC0 52420006 */ beql $s2, $v0, .L80277BDC /* 1A64A4 80277BC4 24120020 */ addiu $s2, $zero, 0x20 /* 1A64A8 80277BC8 0809DEF7 */ j .L80277BDC -/* 1A64AC 80277BCC 00000000 */ nop +/* 1A64AC 80277BCC 00000000 */ nop .L80277BD0: /* 1A64B0 80277BD0 24020020 */ addiu $v0, $zero, 0x20 /* 1A64B4 80277BD4 52420001 */ beql $s2, $v0, .L80277BDC @@ -545,18 +545,18 @@ glabel calc_enemy_damage_target /* 1A64C4 80277BE4 8E020000 */ lw $v0, ($s0) /* 1A64C8 80277BE8 30420020 */ andi $v0, $v0, 0x20 /* 1A64CC 80277BEC 14400007 */ bnez $v0, .L80277C0C -/* 1A64D0 80277BF0 00000000 */ nop +/* 1A64D0 80277BF0 00000000 */ nop /* 1A64D4 80277BF4 0C099B85 */ jal func_80266E14 /* 1A64D8 80277BF8 8FA40018 */ lw $a0, 0x18($sp) /* 1A64DC 80277BFC 8E020000 */ lw $v0, ($s0) /* 1A64E0 80277C00 30420020 */ andi $v0, $v0, 0x20 /* 1A64E4 80277C04 10400014 */ beqz $v0, .L80277C58 -/* 1A64E8 80277C08 00000000 */ nop +/* 1A64E8 80277C08 00000000 */ nop .L80277C0C: /* 1A64EC 80277C0C 8E820188 */ lw $v0, 0x188($s4) /* 1A64F0 80277C10 30420C80 */ andi $v0, $v0, 0xc80 /* 1A64F4 80277C14 1040000B */ beqz $v0, .L80277C44 -/* 1A64F8 80277C18 00000000 */ nop +/* 1A64F8 80277C18 00000000 */ nop /* 1A64FC 80277C1C 8FA80018 */ lw $t0, 0x18($sp) /* 1A6500 80277C20 8D02007C */ lw $v0, 0x7c($t0) /* 1A6504 80277C24 30421000 */ andi $v0, $v0, 0x1000 @@ -573,12 +573,12 @@ glabel calc_enemy_damage_target /* 1A6528 80277C48 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1A652C 80277C4C 30420020 */ andi $v0, $v0, 0x20 /* 1A6530 80277C50 14400014 */ bnez $v0, .L80277CA4 -/* 1A6534 80277C54 00000000 */ nop +/* 1A6534 80277C54 00000000 */ nop .L80277C58: /* 1A6538 80277C58 8E820188 */ lw $v0, 0x188($s4) /* 1A653C 80277C5C 30420C80 */ andi $v0, $v0, 0xc80 /* 1A6540 80277C60 1040000B */ beqz $v0, .L80277C90 -/* 1A6544 80277C64 00000000 */ nop +/* 1A6544 80277C64 00000000 */ nop /* 1A6548 80277C68 8FA80018 */ lw $t0, 0x18($sp) /* 1A654C 80277C6C 8D02007C */ lw $v0, 0x7c($t0) /* 1A6550 80277C70 30421000 */ andi $v0, $v0, 0x1000 @@ -595,7 +595,7 @@ glabel calc_enemy_damage_target /* 1A6574 80277C94 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1A6578 80277C98 30420020 */ andi $v0, $v0, 0x20 /* 1A657C 80277C9C 1040000C */ beqz $v0, .L80277CD0 -/* 1A6580 80277CA0 00000000 */ nop +/* 1A6580 80277CA0 00000000 */ nop .L80277CA4: /* 1A6584 80277CA4 8E820188 */ lw $v0, 0x188($s4) /* 1A6588 80277CA8 30424202 */ andi $v0, $v0, 0x4202 @@ -656,11 +656,11 @@ glabel calc_enemy_damage_target /* 1A6644 80277D64 144000A3 */ bnez $v0, .L80277FF4 /* 1A6648 80277D68 24020100 */ addiu $v0, $zero, 0x100 /* 1A664C 80277D6C 16C0000A */ bnez $s6, .L80277D98 -/* 1A6650 80277D70 00000000 */ nop +/* 1A6650 80277D70 00000000 */ nop /* 1A6654 80277D74 0C03A752 */ jal is_ability_active /* 1A6658 80277D78 24040037 */ addiu $a0, $zero, 0x37 /* 1A665C 80277D7C 10400006 */ beqz $v0, .L80277D98 -/* 1A6660 80277D80 00000000 */ nop +/* 1A6660 80277D80 00000000 */ nop /* 1A6664 80277D84 0C00A67F */ jal rand_int /* 1A6668 80277D88 24040064 */ addiu $a0, $zero, 0x64 /* 1A666C 80277D8C 28420032 */ slti $v0, $v0, 0x32 @@ -676,7 +676,7 @@ glabel calc_enemy_damage_target /* 1A6690 80277DB0 0C099ADE */ jal try_inflict_status /* 1A6694 80277DB4 24060027 */ addiu $a2, $zero, 0x27 /* 1A6698 80277DB8 10400003 */ beqz $v0, .L80277DC8 -/* 1A669C 80277DBC 00000000 */ nop +/* 1A669C 80277DBC 00000000 */ nop /* 1A66A0 80277DC0 24150001 */ addiu $s5, $zero, 1 /* 1A66A4 80277DC4 02A0B82D */ daddu $s7, $s5, $zero .L80277DC8: @@ -689,7 +689,7 @@ glabel calc_enemy_damage_target /* 1A66C0 80277DE0 0C099ADE */ jal try_inflict_status /* 1A66C4 80277DE4 24060025 */ addiu $a2, $zero, 0x25 /* 1A66C8 80277DE8 10400003 */ beqz $v0, .L80277DF8 -/* 1A66CC 80277DEC 00000000 */ nop +/* 1A66CC 80277DEC 00000000 */ nop /* 1A66D0 80277DF0 24150001 */ addiu $s5, $zero, 1 /* 1A66D4 80277DF4 02A0B82D */ daddu $s7, $s5, $zero .L80277DF8: @@ -702,7 +702,7 @@ glabel calc_enemy_damage_target /* 1A66F0 80277E10 0C099ADE */ jal try_inflict_status /* 1A66F4 80277E14 24060028 */ addiu $a2, $zero, 0x28 /* 1A66F8 80277E18 10400003 */ beqz $v0, .L80277E28 -/* 1A66FC 80277E1C 00000000 */ nop +/* 1A66FC 80277E1C 00000000 */ nop /* 1A6700 80277E20 24150001 */ addiu $s5, $zero, 1 /* 1A6704 80277E24 02A0B82D */ daddu $s7, $s5, $zero .L80277E28: @@ -714,7 +714,7 @@ glabel calc_enemy_damage_target /* 1A671C 80277E3C 0C099ADE */ jal try_inflict_status /* 1A6720 80277E40 24060020 */ addiu $a2, $zero, 0x20 /* 1A6724 80277E44 10400003 */ beqz $v0, .L80277E54 -/* 1A6728 80277E48 00000000 */ nop +/* 1A6728 80277E48 00000000 */ nop /* 1A672C 80277E4C 24150001 */ addiu $s5, $zero, 1 /* 1A6730 80277E50 02A0B82D */ daddu $s7, $s5, $zero .L80277E54: @@ -727,7 +727,7 @@ glabel calc_enemy_damage_target /* 1A674C 80277E6C 0C099ADE */ jal try_inflict_status /* 1A6750 80277E70 24060024 */ addiu $a2, $zero, 0x24 /* 1A6754 80277E74 10400003 */ beqz $v0, .L80277E84 -/* 1A6758 80277E78 00000000 */ nop +/* 1A6758 80277E78 00000000 */ nop /* 1A675C 80277E7C 24150001 */ addiu $s5, $zero, 1 /* 1A6760 80277E80 02A0B82D */ daddu $s7, $s5, $zero .L80277E84: @@ -740,7 +740,7 @@ glabel calc_enemy_damage_target /* 1A677C 80277E9C 0C099ADE */ jal try_inflict_status /* 1A6780 80277EA0 24060029 */ addiu $a2, $zero, 0x29 /* 1A6784 80277EA4 10400003 */ beqz $v0, .L80277EB4 -/* 1A6788 80277EA8 00000000 */ nop +/* 1A6788 80277EA8 00000000 */ nop /* 1A678C 80277EAC 24150001 */ addiu $s5, $zero, 1 /* 1A6790 80277EB0 02A0B82D */ daddu $s7, $s5, $zero .L80277EB4: @@ -752,7 +752,7 @@ glabel calc_enemy_damage_target /* 1A67A8 80277EC8 0C099ADE */ jal try_inflict_status /* 1A67AC 80277ECC 24060021 */ addiu $a2, $zero, 0x21 /* 1A67B0 80277ED0 10400003 */ beqz $v0, .L80277EE0 -/* 1A67B4 80277ED4 00000000 */ nop +/* 1A67B4 80277ED4 00000000 */ nop /* 1A67B8 80277ED8 24150001 */ addiu $s5, $zero, 1 /* 1A67BC 80277EDC 02A0B82D */ daddu $s7, $s5, $zero .L80277EE0: @@ -765,7 +765,7 @@ glabel calc_enemy_damage_target /* 1A67D8 80277EF8 0C099ADE */ jal try_inflict_status /* 1A67DC 80277EFC 24060026 */ addiu $a2, $zero, 0x26 /* 1A67E0 80277F00 10400003 */ beqz $v0, .L80277F10 -/* 1A67E4 80277F04 00000000 */ nop +/* 1A67E4 80277F04 00000000 */ nop /* 1A67E8 80277F08 24150001 */ addiu $s5, $zero, 1 /* 1A67EC 80277F0C 02A0B82D */ daddu $s7, $s5, $zero .L80277F10: @@ -777,7 +777,7 @@ glabel calc_enemy_damage_target /* 1A6804 80277F24 0C099ADE */ jal try_inflict_status /* 1A6808 80277F28 24060023 */ addiu $a2, $zero, 0x23 /* 1A680C 80277F2C 10400003 */ beqz $v0, .L80277F3C -/* 1A6810 80277F30 00000000 */ nop +/* 1A6810 80277F30 00000000 */ nop /* 1A6814 80277F34 24150001 */ addiu $s5, $zero, 1 /* 1A6818 80277F38 02A0B82D */ daddu $s7, $s5, $zero .L80277F3C: @@ -790,7 +790,7 @@ glabel calc_enemy_damage_target /* 1A6834 80277F54 0C099ADE */ jal try_inflict_status /* 1A6838 80277F58 24060026 */ addiu $a2, $zero, 0x26 /* 1A683C 80277F5C 10400003 */ beqz $v0, .L80277F6C -/* 1A6840 80277F60 00000000 */ nop +/* 1A6840 80277F60 00000000 */ nop /* 1A6844 80277F64 24150001 */ addiu $s5, $zero, 1 /* 1A6848 80277F68 02A0B82D */ daddu $s7, $s5, $zero .L80277F6C: @@ -803,7 +803,7 @@ glabel calc_enemy_damage_target /* 1A6864 80277F84 0C099ADE */ jal try_inflict_status /* 1A6868 80277F88 24060024 */ addiu $a2, $zero, 0x24 /* 1A686C 80277F8C 10400003 */ beqz $v0, .L80277F9C -/* 1A6870 80277F90 00000000 */ nop +/* 1A6870 80277F90 00000000 */ nop /* 1A6874 80277F94 24150001 */ addiu $s5, $zero, 1 /* 1A6878 80277F98 02A0B82D */ daddu $s7, $s5, $zero .L80277F9C: @@ -818,7 +818,7 @@ glabel calc_enemy_damage_target /* 1A689C 80277FBC 0C099ADE */ jal try_inflict_status /* 1A68A0 80277FC0 24060022 */ addiu $a2, $zero, 0x22 /* 1A68A4 80277FC4 10400003 */ beqz $v0, .L80277FD4 -/* 1A68A8 80277FC8 00000000 */ nop +/* 1A68A8 80277FC8 00000000 */ nop /* 1A68AC 80277FCC 24150001 */ addiu $s5, $zero, 1 /* 1A68B0 80277FD0 02A0B82D */ daddu $s7, $s5, $zero .L80277FD4: @@ -841,12 +841,12 @@ glabel calc_enemy_damage_target /* 1A68E8 80278008 12C00007 */ beqz $s6, .L80278028 /* 1A68EC 8027800C 24020100 */ addiu $v0, $zero, 0x100 /* 1A68F0 80278010 0809E016 */ j .L80278058 -/* 1A68F4 80278014 00000000 */ nop +/* 1A68F4 80278014 00000000 */ nop .L80278018: /* 1A68F8 80278018 12C2000B */ beq $s6, $v0, .L80278048 /* 1A68FC 8027801C 24020100 */ addiu $v0, $zero, 0x100 /* 1A6900 80278020 0809E016 */ j .L80278058 -/* 1A6904 80278024 00000000 */ nop +/* 1A6904 80278024 00000000 */ nop .L80278028: /* 1A6908 80278028 0C09C596 */ jal dispatch_event_player /* 1A690C 8027802C 0240202D */ daddu $a0, $s2, $zero @@ -864,10 +864,10 @@ glabel calc_enemy_damage_target /* 1A6934 80278054 24020100 */ addiu $v0, $zero, 0x100 .L80278058: /* 1A6938 80278058 16C2000F */ bne $s6, $v0, .L80278098 -/* 1A693C 8027805C 00000000 */ nop +/* 1A693C 8027805C 00000000 */ nop /* 1A6940 80278060 86860180 */ lh $a2, 0x180($s4) /* 1A6944 80278064 18C0000C */ blez $a2, .L80278098 -/* 1A6948 80278068 00000000 */ nop +/* 1A6948 80278068 00000000 */ nop /* 1A694C 8027806C 3C02800E */ lui $v0, %hi(gBattleStatus) /* 1A6950 80278070 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1A6954 80278074 30420020 */ andi $v0, $v0, 0x20 @@ -890,20 +890,20 @@ glabel calc_enemy_damage_target /* 1A6994 802780B4 10400005 */ beqz $v0, .L802780CC /* 1A6998 802780B8 24020200 */ addiu $v0, $zero, 0x200 /* 1A699C 802780BC 12C00007 */ beqz $s6, .L802780DC -/* 1A69A0 802780C0 00000000 */ nop +/* 1A69A0 802780C0 00000000 */ nop /* 1A69A4 802780C4 0809E076 */ j .L802781D8 -/* 1A69A8 802780C8 00000000 */ nop +/* 1A69A8 802780C8 00000000 */ nop .L802780CC: /* 1A69AC 802780CC 12C2001B */ beq $s6, $v0, .L8027813C -/* 1A69B0 802780D0 00000000 */ nop +/* 1A69B0 802780D0 00000000 */ nop /* 1A69B4 802780D4 0809E076 */ j .L802781D8 -/* 1A69B8 802780D8 00000000 */ nop +/* 1A69B8 802780D8 00000000 */ nop .L802780DC: /* 1A69BC 802780DC 86870180 */ lh $a3, 0x180($s4) /* 1A69C0 802780E0 14E00008 */ bnez $a3, .L80278104 /* 1A69C4 802780E4 3C032000 */ lui $v1, 0x2000 /* 1A69C8 802780E8 16E0003B */ bnez $s7, .L802781D8 -/* 1A69CC 802780EC 00000000 */ nop +/* 1A69CC 802780EC 00000000 */ nop /* 1A69D0 802780F0 16A00039 */ bnez $s5, .L802781D8 /* 1A69D4 802780F4 24020001 */ addiu $v0, $zero, 1 /* 1A69D8 802780F8 AFA20010 */ sw $v0, 0x10($sp) @@ -921,7 +921,7 @@ glabel calc_enemy_damage_target /* 1A6A04 80278124 0C09996B */ jal show_damage_popup /* 1A6A08 80278128 8E260014 */ lw $a2, 0x14($s1) /* 1A6A0C 8027812C 0809E06F */ j .L802781BC -/* 1A6A10 80278130 00000000 */ nop +/* 1A6A10 80278130 00000000 */ nop .L80278134: /* 1A6A14 80278134 0809E06B */ j .L802781AC /* 1A6A18 80278138 AFA20010 */ sw $v0, 0x10($sp) @@ -930,7 +930,7 @@ glabel calc_enemy_damage_target /* 1A6A20 80278140 14E0000F */ bnez $a3, .L80278180 /* 1A6A24 80278144 3C032000 */ lui $v1, 0x2000 /* 1A6A28 80278148 16E00023 */ bnez $s7, .L802781D8 -/* 1A6A2C 8027814C 00000000 */ nop +/* 1A6A2C 8027814C 00000000 */ nop /* 1A6A30 80278150 16A00021 */ bnez $s5, .L802781D8 /* 1A6A34 80278154 24020001 */ addiu $v0, $zero, 1 /* 1A6A38 80278158 AFA20010 */ sw $v0, 0x10($sp) @@ -943,7 +943,7 @@ glabel calc_enemy_damage_target /* 1A6A50 80278170 0C093BF8 */ jal func_8024EFE0 /* 1A6A54 80278174 0000382D */ daddu $a3, $zero, $zero /* 1A6A58 80278178 0809E076 */ j .L802781D8 -/* 1A6A5C 8027817C 00000000 */ nop +/* 1A6A5C 8027817C 00000000 */ nop .L80278180: /* 1A6A60 80278180 8E820188 */ lw $v0, 0x188($s4) /* 1A6A64 80278184 34630040 */ ori $v1, $v1, 0x40 @@ -955,7 +955,7 @@ glabel calc_enemy_damage_target /* 1A6A7C 8027819C 0C09996B */ jal show_damage_popup /* 1A6A80 802781A0 8E260014 */ lw $a2, 0x14($s1) /* 1A6A84 802781A4 0809E06F */ j .L802781BC -/* 1A6A88 802781A8 00000000 */ nop +/* 1A6A88 802781A8 00000000 */ nop .L802781AC: /* 1A6A8C 802781AC C62C000C */ lwc1 $f12, 0xc($s1) /* 1A6A90 802781B0 C62E0010 */ lwc1 $f14, 0x10($s1) @@ -972,14 +972,14 @@ glabel calc_enemy_damage_target .L802781D8: /* 1A6AB8 802781D8 86820180 */ lh $v0, 0x180($s4) /* 1A6ABC 802781DC 1840001F */ blez $v0, .L8027825C -/* 1A6AC0 802781E0 00000000 */ nop +/* 1A6AC0 802781E0 00000000 */ nop /* 1A6AC4 802781E4 0260202D */ daddu $a0, $s3, $zero /* 1A6AC8 802781E8 0C099C06 */ jal func_80267018 /* 1A6ACC 802781EC 24050001 */ addiu $a1, $zero, 1 /* 1A6AD0 802781F0 8FA80058 */ lw $t0, 0x58($sp) /* 1A6AD4 802781F4 8D0201B0 */ lw $v0, 0x1b0($t0) /* 1A6AD8 802781F8 10400008 */ beqz $v0, .L8027821C -/* 1A6ADC 802781FC 00000000 */ nop +/* 1A6ADC 802781FC 00000000 */ nop /* 1A6AE0 80278200 C6200014 */ lwc1 $f0, 0x14($s1) /* 1A6AE4 80278204 E7A00010 */ swc1 $f0, 0x10($sp) /* 1A6AE8 80278208 8D0401B0 */ lw $a0, 0x1b0($t0) @@ -1004,19 +1004,19 @@ glabel calc_enemy_damage_target /* 1A6B2C 8027824C 0260202D */ daddu $a0, $s3, $zero /* 1A6B30 80278250 86820180 */ lh $v0, 0x180($s4) /* 1A6B34 80278254 1C400006 */ bgtz $v0, .L80278270 -/* 1A6B38 80278258 00000000 */ nop +/* 1A6B38 80278258 00000000 */ nop .L8027825C: /* 1A6B3C 8027825C 16E00004 */ bnez $s7, .L80278270 -/* 1A6B40 80278260 00000000 */ nop +/* 1A6B40 80278260 00000000 */ nop /* 1A6B44 80278264 8FA80028 */ lw $t0, 0x28($sp) /* 1A6B48 80278268 11000006 */ beqz $t0, .L80278284 -/* 1A6B4C 8027826C 00000000 */ nop +/* 1A6B4C 8027826C 00000000 */ nop .L80278270: /* 1A6B50 80278270 8FA80018 */ lw $t0, 0x18($sp) /* 1A6B54 80278274 8D020000 */ lw $v0, ($t0) /* 1A6B58 80278278 30422000 */ andi $v0, $v0, 0x2000 /* 1A6B5C 8027827C 10400008 */ beqz $v0, .L802782A0 -/* 1A6B60 80278280 00000000 */ nop +/* 1A6B60 80278280 00000000 */ nop .L80278284: /* 1A6B64 80278284 C6200014 */ lwc1 $f0, 0x14($s1) /* 1A6B68 80278288 2404010C */ addiu $a0, $zero, 0x10c @@ -1029,9 +1029,9 @@ glabel calc_enemy_damage_target /* 1A6B80 802782A0 8E820190 */ lw $v0, 0x190($s4) /* 1A6B84 802782A4 30421000 */ andi $v0, $v0, 0x1000 /* 1A6B88 802782A8 10400018 */ beqz $v0, .L8027830C -/* 1A6B8C 802782AC 00000000 */ nop +/* 1A6B8C 802782AC 00000000 */ nop /* 1A6B90 802782B0 12A00016 */ beqz $s5, .L8027830C -/* 1A6B94 802782B4 00000000 */ nop +/* 1A6B94 802782B4 00000000 */ nop /* 1A6B98 802782B8 3C048029 */ lui $a0, %hi(DoSleepHit) /* 1A6B9C 802782BC 248445E0 */ addiu $a0, $a0, %lo(DoSleepHit) /* 1A6BA0 802782C0 2405000A */ addiu $a1, $zero, 0xa @@ -1058,9 +1058,9 @@ glabel calc_enemy_damage_target /* 1A6BF0 80278310 3C030004 */ lui $v1, 4 /* 1A6BF4 80278314 00431024 */ and $v0, $v0, $v1 /* 1A6BF8 80278318 10400018 */ beqz $v0, .L8027837C -/* 1A6BFC 8027831C 00000000 */ nop +/* 1A6BFC 8027831C 00000000 */ nop /* 1A6C00 80278320 12A00016 */ beqz $s5, .L8027837C -/* 1A6C04 80278324 00000000 */ nop +/* 1A6C04 80278324 00000000 */ nop /* 1A6C08 80278328 3C048029 */ lui $a0, %hi(DoDizzyHit) /* 1A6C0C 8027832C 248445FC */ addiu $a0, $a0, %lo(DoDizzyHit) /* 1A6C10 80278330 2405000A */ addiu $a1, $zero, 0xa @@ -1087,9 +1087,9 @@ glabel calc_enemy_damage_target /* 1A6C60 80278380 3C030001 */ lui $v1, 1 /* 1A6C64 80278384 00431024 */ and $v0, $v0, $v1 /* 1A6C68 80278388 10400018 */ beqz $v0, .L802783EC -/* 1A6C6C 8027838C 00000000 */ nop +/* 1A6C6C 8027838C 00000000 */ nop /* 1A6C70 80278390 12A00016 */ beqz $s5, .L802783EC -/* 1A6C74 80278394 00000000 */ nop +/* 1A6C74 80278394 00000000 */ nop /* 1A6C78 80278398 3C048029 */ lui $a0, %hi(DoParalyzeHit) /* 1A6C7C 8027839C 24844618 */ addiu $a0, $a0, %lo(DoParalyzeHit) /* 1A6C80 802783A0 2405000A */ addiu $a1, $zero, 0xa @@ -1116,9 +1116,9 @@ glabel calc_enemy_damage_target /* 1A6CD0 802783F0 3C030002 */ lui $v1, 2 /* 1A6CD4 802783F4 00431024 */ and $v0, $v0, $v1 /* 1A6CD8 802783F8 10400018 */ beqz $v0, .L8027845C -/* 1A6CDC 802783FC 00000000 */ nop +/* 1A6CDC 802783FC 00000000 */ nop /* 1A6CE0 80278400 12A00016 */ beqz $s5, .L8027845C -/* 1A6CE4 80278404 00000000 */ nop +/* 1A6CE4 80278404 00000000 */ nop /* 1A6CE8 80278408 3C048029 */ lui $a0, %hi(DoPoisonHit) /* 1A6CEC 8027840C 24844634 */ addiu $a0, $a0, %lo(DoPoisonHit) /* 1A6CF0 80278410 2405000A */ addiu $a1, $zero, 0xa @@ -1145,9 +1145,9 @@ glabel calc_enemy_damage_target /* 1A6D40 80278460 3C030020 */ lui $v1, 0x20 /* 1A6D44 80278464 00431024 */ and $v0, $v0, $v1 /* 1A6D48 80278468 10400018 */ beqz $v0, .L802784CC -/* 1A6D4C 8027846C 00000000 */ nop +/* 1A6D4C 8027846C 00000000 */ nop /* 1A6D50 80278470 12A00016 */ beqz $s5, .L802784CC -/* 1A6D54 80278474 00000000 */ nop +/* 1A6D54 80278474 00000000 */ nop /* 1A6D58 80278478 3C048029 */ lui $a0, %hi(DoStopHit) /* 1A6D5C 8027847C 24844650 */ addiu $a0, $a0, %lo(DoStopHit) /* 1A6D60 80278480 2405000A */ addiu $a1, $zero, 0xa @@ -1173,9 +1173,9 @@ glabel calc_enemy_damage_target /* 1A6DAC 802784CC 8E820190 */ lw $v0, 0x190($s4) /* 1A6DB0 802784D0 30424000 */ andi $v0, $v0, 0x4000 /* 1A6DB4 802784D4 10400019 */ beqz $v0, .L8027853C -/* 1A6DB8 802784D8 00000000 */ nop +/* 1A6DB8 802784D8 00000000 */ nop /* 1A6DBC 802784DC 12A00017 */ beqz $s5, .L8027853C -/* 1A6DC0 802784E0 00000000 */ nop +/* 1A6DC0 802784E0 00000000 */ nop /* 1A6DC4 802784E4 3C048029 */ lui $a0, %hi(DoFreezeHit) /* 1A6DC8 802784E8 2484466C */ addiu $a0, $a0, %lo(DoFreezeHit) /* 1A6DCC 802784EC 2405000A */ addiu $a1, $zero, 0xa @@ -1203,9 +1203,9 @@ glabel calc_enemy_damage_target /* 1A6E20 80278540 3C030008 */ lui $v1, 8 /* 1A6E24 80278544 00431024 */ and $v0, $v0, $v1 /* 1A6E28 80278548 10400019 */ beqz $v0, .L802785B0 -/* 1A6E2C 8027854C 00000000 */ nop +/* 1A6E2C 8027854C 00000000 */ nop /* 1A6E30 80278550 12A00017 */ beqz $s5, .L802785B0 -/* 1A6E34 80278554 00000000 */ nop +/* 1A6E34 80278554 00000000 */ nop /* 1A6E38 80278558 3C048029 */ lui $a0, %hi(DoShinkHit) /* 1A6E3C 8027855C 248446B8 */ addiu $a0, $a0, %lo(DoShinkHit) /* 1A6E40 80278560 2405000A */ addiu $a1, $zero, 0xa @@ -1249,21 +1249,21 @@ glabel calc_enemy_damage_target /* 1A6ED0 802785F0 81020212 */ lb $v0, 0x212($t0) /* 1A6ED4 802785F4 2403000B */ addiu $v1, $zero, 0xb /* 1A6ED8 802785F8 10430029 */ beq $v0, $v1, .L802786A0 -/* 1A6EDC 802785FC 00000000 */ nop +/* 1A6EDC 802785FC 00000000 */ nop /* 1A6EE0 80278600 82620212 */ lb $v0, 0x212($s3) /* 1A6EE4 80278604 10430006 */ beq $v0, $v1, .L80278620 -/* 1A6EE8 80278608 00000000 */ nop +/* 1A6EE8 80278608 00000000 */ nop /* 1A6EEC 8027860C 8FA80018 */ lw $t0, 0x18($sp) /* 1A6EF0 80278610 8D02007C */ lw $v0, 0x7c($t0) /* 1A6EF4 80278614 30420080 */ andi $v0, $v0, 0x80 /* 1A6EF8 80278618 10400021 */ beqz $v0, .L802786A0 -/* 1A6EFC 8027861C 00000000 */ nop +/* 1A6EFC 8027861C 00000000 */ nop .L80278620: /* 1A6F00 80278620 8E820188 */ lw $v0, 0x188($s4) /* 1A6F04 80278624 3C031000 */ lui $v1, 0x1000 /* 1A6F08 80278628 00431024 */ and $v0, $v0, $v1 /* 1A6F0C 8027862C 1440001C */ bnez $v0, .L802786A0 -/* 1A6F10 80278630 00000000 */ nop +/* 1A6F10 80278630 00000000 */ nop /* 1A6F14 80278634 8E82018C */ lw $v0, 0x18c($s4) /* 1A6F18 80278638 30420008 */ andi $v0, $v0, 8 /* 1A6F1C 8027863C 14400018 */ bnez $v0, .L802786A0 @@ -1271,7 +1271,7 @@ glabel calc_enemy_damage_target /* 1A6F24 80278644 8FA80058 */ lw $t0, 0x58($sp) /* 1A6F28 80278648 81030218 */ lb $v1, 0x218($t0) /* 1A6F2C 8027864C 10620014 */ beq $v1, $v0, .L802786A0 -/* 1A6F30 80278650 00000000 */ nop +/* 1A6F30 80278650 00000000 */ nop /* 1A6F34 80278654 0C09DBD4 */ jal func_80276F50 /* 1A6F38 80278658 0100202D */ daddu $a0, $t0, $zero /* 1A6F3C 8027865C 14400010 */ bnez $v0, .L802786A0 @@ -1284,7 +1284,7 @@ glabel calc_enemy_damage_target /* 1A6F58 80278678 0000282D */ daddu $a1, $zero, $zero /* 1A6F5C 8027867C 8FA40058 */ lw $a0, 0x58($sp) /* 1A6F60 80278680 0C09451D */ jal func_80251474 -/* 1A6F64 80278684 00000000 */ nop +/* 1A6F64 80278684 00000000 */ nop /* 1A6F68 80278688 24050001 */ addiu $a1, $zero, 1 /* 1A6F6C 8027868C 8FA40058 */ lw $a0, 0x58($sp) /* 1A6F70 80278690 0C09E245 */ jal dispatch_damage_event_actor_1 diff --git a/asm/nonmatchings/code_1A5830/calc_enemy_test_target.s b/asm/nonmatchings/code_1A5830/calc_enemy_test_target.s index 7e48059257..79031c136e 100644 --- a/asm/nonmatchings/code_1A5830/calc_enemy_test_target.s +++ b/asm/nonmatchings/code_1A5830/calc_enemy_test_target.s @@ -28,15 +28,15 @@ glabel calc_enemy_test_target /* 1A5B34 80277254 32640700 */ andi $a0, $s3, 0x700 .L80277258: /* 1A5B38 80277258 0809DC96 */ j .L80277258 -/* 1A5B3C 8027725C 00000000 */ nop +/* 1A5B3C 8027725C 00000000 */ nop .L80277260: /* 1A5B40 80277260 24020100 */ addiu $v0, $zero, 0x100 /* 1A5B44 80277264 1082000A */ beq $a0, $v0, .L80277290 /* 1A5B48 80277268 28820101 */ slti $v0, $a0, 0x101 /* 1A5B4C 8027726C 1040000A */ beqz $v0, .L80277298 -/* 1A5B50 80277270 00000000 */ nop +/* 1A5B50 80277270 00000000 */ nop /* 1A5B54 80277274 14800008 */ bnez $a0, .L80277298 -/* 1A5B58 80277278 00000000 */ nop +/* 1A5B58 80277278 00000000 */ nop /* 1A5B5C 8027727C 3C028011 */ lui $v0, %hi(gPlayerData) /* 1A5B60 80277280 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) /* 1A5B64 80277284 90420002 */ lbu $v0, 2($v0) @@ -48,7 +48,7 @@ glabel calc_enemy_test_target .L80277298: /* 1A5B78 80277298 8E420188 */ lw $v0, 0x188($s2) /* 1A5B7C 8027729C 04410006 */ bgez $v0, .L802772B8 -/* 1A5B80 802772A0 00000000 */ nop +/* 1A5B80 802772A0 00000000 */ nop /* 1A5B84 802772A4 0200202D */ daddu $a0, $s0, $zero /* 1A5B88 802772A8 0C09DBE3 */ jal dispatch_event_general /* 1A5B8C 802772AC 24050037 */ addiu $a1, $zero, 0x37 @@ -75,7 +75,7 @@ glabel calc_enemy_test_target /* 1A5BD0 802772F0 24020006 */ addiu $v0, $zero, 6 .L802772F4: /* 1A5BD4 802772F4 12220046 */ beq $s1, $v0, .L80277410 -/* 1A5BD8 802772F8 00000000 */ nop +/* 1A5BD8 802772F8 00000000 */ nop /* 1A5BDC 802772FC 24020100 */ addiu $v0, $zero, 0x100 /* 1A5BE0 80277300 10820033 */ beq $a0, $v0, .L802773D0 /* 1A5BE4 80277304 0000882D */ daddu $s1, $zero, $zero @@ -83,7 +83,7 @@ glabel calc_enemy_test_target /* 1A5BEC 8027730C 10400031 */ beqz $v0, .L802773D4 /* 1A5BF0 80277310 24020006 */ addiu $v0, $zero, 6 /* 1A5BF4 80277314 1480002F */ bnez $a0, .L802773D4 -/* 1A5BF8 80277318 00000000 */ nop +/* 1A5BF8 80277318 00000000 */ nop /* 1A5BFC 8027731C 824200A4 */ lb $v0, 0xa4($s2) /* 1A5C00 80277320 10400009 */ beqz $v0, .L80277348 /* 1A5C04 80277324 0200202D */ daddu $a0, $s0, $zero @@ -114,7 +114,7 @@ glabel calc_enemy_test_target /* 1A5C60 80277380 820201B8 */ lb $v0, 0x1b8($s0) /* 1A5C64 80277384 28420006 */ slti $v0, $v0, 6 /* 1A5C68 80277388 10400007 */ beqz $v0, .L802773A8 -/* 1A5C6C 8027738C 00000000 */ nop +/* 1A5C6C 8027738C 00000000 */ nop /* 1A5C70 80277390 0C00A67F */ jal rand_int /* 1A5C74 80277394 24040064 */ addiu $a0, $zero, 0x64 /* 1A5C78 80277398 2842001E */ slti $v0, $v0, 0x1e @@ -136,10 +136,10 @@ glabel calc_enemy_test_target /* 1A5CB0 802773D0 24020006 */ addiu $v0, $zero, 6 .L802773D4: /* 1A5CB4 802773D4 1222000E */ beq $s1, $v0, .L80277410 -/* 1A5CB8 802773D8 00000000 */ nop +/* 1A5CB8 802773D8 00000000 */ nop /* 1A5CBC 802773DC 24020005 */ addiu $v0, $zero, 5 /* 1A5CC0 802773E0 1222000B */ beq $s1, $v0, .L80277410 -/* 1A5CC4 802773E4 00000000 */ nop +/* 1A5CC4 802773E4 00000000 */ nop /* 1A5CC8 802773E8 82030214 */ lb $v1, 0x214($s0) /* 1A5CCC 802773EC 2402000C */ addiu $v0, $zero, 0xc /* 1A5CD0 802773F0 10620006 */ beq $v1, $v0, .L8027740C diff --git a/asm/nonmatchings/code_1A5830/dispatch_damage_event_actor.s b/asm/nonmatchings/code_1A5830/dispatch_damage_event_actor.s index d81012d9b1..777489b199 100644 --- a/asm/nonmatchings/code_1A5830/dispatch_damage_event_actor.s +++ b/asm/nonmatchings/code_1A5830/dispatch_damage_event_actor.s @@ -81,30 +81,30 @@ glabel dispatch_damage_event_actor /* 1A70D0 802787F0 AFA00010 */ sw $zero, 0x10($sp) /* 1A70D4 802787F4 86670180 */ lh $a3, 0x180($s3) /* 1A70D8 802787F8 44826000 */ mtc1 $v0, $f12 -/* 1A70DC 802787FC 00000000 */ nop +/* 1A70DC 802787FC 00000000 */ nop /* 1A70E0 80278800 46806320 */ cvt.s.w $f12, $f12 /* 1A70E4 80278804 44840000 */ mtc1 $a0, $f0 -/* 1A70E8 80278808 00000000 */ nop +/* 1A70E8 80278808 00000000 */ nop /* 1A70EC 8027880C 46800020 */ cvt.s.w $f0, $f0 /* 1A70F0 80278810 44060000 */ mfc1 $a2, $f0 /* 1A70F4 80278814 44837000 */ mtc1 $v1, $f14 -/* 1A70F8 80278818 00000000 */ nop +/* 1A70F8 80278818 00000000 */ nop /* 1A70FC 8027881C 0C09996B */ jal show_damage_popup /* 1A7100 80278820 468073A0 */ cvt.s.w $f14, $f14 /* 1A7104 80278824 86020230 */ lh $v0, 0x230($s0) /* 1A7108 80278828 86030232 */ lh $v1, 0x232($s0) /* 1A710C 8027882C 44820000 */ mtc1 $v0, $f0 -/* 1A7110 80278830 00000000 */ nop +/* 1A7110 80278830 00000000 */ nop /* 1A7114 80278834 46800020 */ cvt.s.w $f0, $f0 /* 1A7118 80278838 44050000 */ mfc1 $a1, $f0 /* 1A711C 8027883C 44830000 */ mtc1 $v1, $f0 -/* 1A7120 80278840 00000000 */ nop +/* 1A7120 80278840 00000000 */ nop /* 1A7124 80278844 46800020 */ cvt.s.w $f0, $f0 /* 1A7128 80278848 44060000 */ mfc1 $a2, $f0 /* 1A712C 8027884C 86020234 */ lh $v0, 0x234($s0) /* 1A7130 80278850 86630180 */ lh $v1, 0x180($s3) /* 1A7134 80278854 44820000 */ mtc1 $v0, $f0 -/* 1A7138 80278858 00000000 */ nop +/* 1A7138 80278858 00000000 */ nop /* 1A713C 8027885C 46800020 */ cvt.s.w $f0, $f0 /* 1A7140 80278860 44070000 */ mfc1 $a3, $f0 /* 1A7144 80278864 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/code_1A5830/func_8027D4C8.s b/asm/nonmatchings/code_1A5830/func_8027D4C8.s index 5f4bb3c5cc..2518b24209 100644 --- a/asm/nonmatchings/code_1A5830/func_8027D4C8.s +++ b/asm/nonmatchings/code_1A5830/func_8027D4C8.s @@ -16,7 +16,7 @@ glabel func_8027D4C8 /* 1ABDD4 8027D4F4 0040802D */ daddu $s0, $v0, $zero /* 1ABDD8 8027D4F8 2402FF81 */ addiu $v0, $zero, -0x7f /* 1ABDDC 8027D4FC 16020002 */ bne $s0, $v0, .L8027D508 -/* 1ABDE0 8027D500 00000000 */ nop +/* 1ABDE0 8027D500 00000000 */ nop /* 1ABDE4 8027D504 8E700148 */ lw $s0, 0x148($s3) .L8027D508: /* 1ABDE8 8027D508 8E450000 */ lw $a1, ($s2) diff --git a/asm/nonmatchings/code_1A5830/play_hit_sound.s b/asm/nonmatchings/code_1A5830/play_hit_sound.s index 04f7dd5856..1388fbb3a3 100644 --- a/asm/nonmatchings/code_1A5830/play_hit_sound.s +++ b/asm/nonmatchings/code_1A5830/play_hit_sound.s @@ -13,15 +13,18 @@ glabel play_hit_sound /* 1A5904 80277024 2C820006 */ sltiu $v0, $a0, 6 /* 1A5908 80277028 1040004A */ beqz $v0, .L80277154 /* 1A590C 8027702C 00041080 */ sll $v0, $a0, 2 -/* 1A5910 80277030 3C01802A */ lui $at, %hi(D_8029D990) +/* 1A5910 80277030 3C01802A */ lui $at, %hi(jtbl_8029D990_1CC270) /* 1A5914 80277034 00220821 */ addu $at, $at, $v0 -/* 1A5918 80277038 8C22D990 */ lw $v0, %lo(D_8029D990)($at) +/* 1A5918 80277038 8C22D990 */ lw $v0, %lo(jtbl_8029D990_1CC270)($at) /* 1A591C 8027703C 00400008 */ jr $v0 -/* 1A5920 80277040 00000000 */ nop +/* 1A5920 80277040 00000000 */ nop +glabel L80277044_1A5924 /* 1A5924 80277044 0809DC50 */ j .L80277140 /* 1A5928 80277048 2404010C */ addiu $a0, $zero, 0x10c +glabel L8027704C_1A592C /* 1A592C 8027704C 0809DC50 */ j .L80277140 /* 1A5930 80277050 2404010D */ addiu $a0, $zero, 0x10d +glabel L80277054_1A5934 /* 1A5934 80277054 24020100 */ addiu $v0, $zero, 0x100 /* 1A5938 80277058 1062000B */ beq $v1, $v0, .L80277088 /* 1A593C 8027705C 28620101 */ slti $v0, $v1, 0x101 @@ -30,15 +33,16 @@ glabel play_hit_sound /* 1A5948 80277068 10600035 */ beqz $v1, .L80277140 /* 1A594C 8027706C 240400E1 */ addiu $a0, $zero, 0xe1 /* 1A5950 80277070 0809DC55 */ j .L80277154 -/* 1A5954 80277074 00000000 */ nop +/* 1A5954 80277074 00000000 */ nop .L80277078: /* 1A5958 80277078 10620031 */ beq $v1, $v0, .L80277140 /* 1A595C 8027707C 240400E9 */ addiu $a0, $zero, 0xe9 /* 1A5960 80277080 0809DC55 */ j .L80277154 -/* 1A5964 80277084 00000000 */ nop +/* 1A5964 80277084 00000000 */ nop .L80277088: /* 1A5968 80277088 0809DC50 */ j .L80277140 /* 1A596C 8027708C 240400E9 */ addiu $a0, $zero, 0xe9 +glabel L80277090_1A5970 /* 1A5970 80277090 24020100 */ addiu $v0, $zero, 0x100 /* 1A5974 80277094 1062000B */ beq $v1, $v0, .L802770C4 /* 1A5978 80277098 28620101 */ slti $v0, $v1, 0x101 @@ -47,15 +51,16 @@ glabel play_hit_sound /* 1A5984 802770A4 10600026 */ beqz $v1, .L80277140 /* 1A5988 802770A8 240400E2 */ addiu $a0, $zero, 0xe2 /* 1A598C 802770AC 0809DC55 */ j .L80277154 -/* 1A5990 802770B0 00000000 */ nop +/* 1A5990 802770B0 00000000 */ nop .L802770B4: /* 1A5994 802770B4 10620022 */ beq $v1, $v0, .L80277140 /* 1A5998 802770B8 240400EA */ addiu $a0, $zero, 0xea /* 1A599C 802770BC 0809DC55 */ j .L80277154 -/* 1A59A0 802770C0 00000000 */ nop +/* 1A59A0 802770C0 00000000 */ nop .L802770C4: /* 1A59A4 802770C4 0809DC50 */ j .L80277140 /* 1A59A8 802770C8 240400EA */ addiu $a0, $zero, 0xea +glabel L802770CC_1A59AC /* 1A59AC 802770CC 24020100 */ addiu $v0, $zero, 0x100 /* 1A59B0 802770D0 1062000B */ beq $v1, $v0, .L80277100 /* 1A59B4 802770D4 28620101 */ slti $v0, $v1, 0x101 @@ -64,15 +69,16 @@ glabel play_hit_sound /* 1A59C0 802770E0 10600017 */ beqz $v1, .L80277140 /* 1A59C4 802770E4 240400E3 */ addiu $a0, $zero, 0xe3 /* 1A59C8 802770E8 0809DC55 */ j .L80277154 -/* 1A59CC 802770EC 00000000 */ nop +/* 1A59CC 802770EC 00000000 */ nop .L802770F0: /* 1A59D0 802770F0 10620013 */ beq $v1, $v0, .L80277140 /* 1A59D4 802770F4 240400EB */ addiu $a0, $zero, 0xeb /* 1A59D8 802770F8 0809DC55 */ j .L80277154 -/* 1A59DC 802770FC 00000000 */ nop +/* 1A59DC 802770FC 00000000 */ nop .L80277100: /* 1A59E0 80277100 0809DC50 */ j .L80277140 /* 1A59E4 80277104 240400EB */ addiu $a0, $zero, 0xeb +glabel L80277108_1A59E8 /* 1A59E8 80277108 24020100 */ addiu $v0, $zero, 0x100 /* 1A59EC 8027710C 1062000B */ beq $v1, $v0, .L8027713C /* 1A59F0 80277110 28620101 */ slti $v0, $v1, 0x101 @@ -81,12 +87,12 @@ glabel play_hit_sound /* 1A59FC 8027711C 10600008 */ beqz $v1, .L80277140 /* 1A5A00 80277120 2404037A */ addiu $a0, $zero, 0x37a /* 1A5A04 80277124 0809DC55 */ j .L80277154 -/* 1A5A08 80277128 00000000 */ nop +/* 1A5A08 80277128 00000000 */ nop .L8027712C: /* 1A5A0C 8027712C 10620004 */ beq $v1, $v0, .L80277140 /* 1A5A10 80277130 2404037B */ addiu $a0, $zero, 0x37b /* 1A5A14 80277134 0809DC55 */ j .L80277154 -/* 1A5A18 80277138 00000000 */ nop +/* 1A5A18 80277138 00000000 */ nop .L8027713C: /* 1A5A1C 8027713C 2404037B */ addiu $a0, $zero, 0x37b .L80277140: diff --git a/asm/nonmatchings/code_1A5830/update_lerp_battle.s b/asm/nonmatchings/code_1A5830/update_lerp_battle.s index 47a4569d16..c82d885355 100644 --- a/asm/nonmatchings/code_1A5830/update_lerp_battle.s +++ b/asm/nonmatchings/code_1A5830/update_lerp_battle.s @@ -17,109 +17,115 @@ glabel update_lerp_battle /* 1A99EC 8027B10C 1040013B */ beqz $v0, .L8027B5FC /* 1A99F0 8027B110 00E0882D */ daddu $s1, $a3, $zero /* 1A99F4 8027B114 00041080 */ sll $v0, $a0, 2 -/* 1A99F8 8027B118 3C01802A */ lui $at, %hi(D_8029D9A8) +/* 1A99F8 8027B118 3C01802A */ lui $at, %hi(jtbl_8029D9A8_1CC288) /* 1A99FC 8027B11C 00220821 */ addu $at, $at, $v0 -/* 1A9A00 8027B120 8C22D9A8 */ lw $v0, %lo(D_8029D9A8)($at) +/* 1A9A00 8027B120 8C22D9A8 */ lw $v0, %lo(jtbl_8029D9A8_1CC288)($at) /* 1A9A04 8027B124 00400008 */ jr $v0 -/* 1A9A08 8027B128 00000000 */ nop +/* 1A9A08 8027B128 00000000 */ nop +glabel L8027B12C_1A9A0C /* 1A9A0C 8027B12C 4618D001 */ sub.s $f0, $f26, $f24 /* 1A9A10 8027B130 44911000 */ mtc1 $s1, $f2 -/* 1A9A14 8027B134 00000000 */ nop +/* 1A9A14 8027B134 00000000 */ nop /* 1A9A18 8027B138 468010A0 */ cvt.s.w $f2, $f2 /* 1A9A1C 8027B13C 46020002 */ mul.s $f0, $f0, $f2 -/* 1A9A20 8027B140 00000000 */ nop +/* 1A9A20 8027B140 00000000 */ nop /* 1A9A24 8027B144 44901000 */ mtc1 $s0, $f2 -/* 1A9A28 8027B148 00000000 */ nop +/* 1A9A28 8027B148 00000000 */ nop /* 1A9A2C 8027B14C 468010A0 */ cvt.s.w $f2, $f2 /* 1A9A30 8027B150 0809EC80 */ j .L8027B200 /* 1A9A34 8027B154 46020003 */ div.s $f0, $f0, $f2 +glabel L8027B158_1A9A38 /* 1A9A38 8027B158 02310018 */ mult $s1, $s1 /* 1A9A3C 8027B15C 00004012 */ mflo $t0 -/* 1A9A40 8027B160 00000000 */ nop +/* 1A9A40 8027B160 00000000 */ nop /* 1A9A44 8027B164 0809EC75 */ j .L8027B1D4 /* 1A9A48 8027B168 02100018 */ mult $s0, $s0 +glabel L8027B16C_1A9A4C /* 1A9A4C 8027B16C 02310018 */ mult $s1, $s1 /* 1A9A50 8027B170 00004012 */ mflo $t0 -/* 1A9A54 8027B174 00000000 */ nop +/* 1A9A54 8027B174 00000000 */ nop /* 1A9A58 8027B178 0809EC6D */ j .L8027B1B4 /* 1A9A5C 8027B17C 02100018 */ mult $s0, $s0 +glabel L8027B180_1A9A60 /* 1A9A60 8027B180 02310018 */ mult $s1, $s1 /* 1A9A64 8027B184 00004012 */ mflo $t0 -/* 1A9A68 8027B188 00000000 */ nop -/* 1A9A6C 8027B18C 00000000 */ nop +/* 1A9A68 8027B188 00000000 */ nop +/* 1A9A6C 8027B18C 00000000 */ nop /* 1A9A70 8027B190 02100018 */ mult $s0, $s0 /* 1A9A74 8027B194 00001012 */ mflo $v0 -/* 1A9A78 8027B198 00000000 */ nop -/* 1A9A7C 8027B19C 00000000 */ nop +/* 1A9A78 8027B198 00000000 */ nop +/* 1A9A7C 8027B19C 00000000 */ nop /* 1A9A80 8027B1A0 01110018 */ mult $t0, $s1 /* 1A9A84 8027B1A4 00004012 */ mflo $t0 -/* 1A9A88 8027B1A8 00000000 */ nop -/* 1A9A8C 8027B1AC 00000000 */ nop +/* 1A9A88 8027B1A8 00000000 */ nop +/* 1A9A8C 8027B1AC 00000000 */ nop /* 1A9A90 8027B1B0 00500018 */ mult $v0, $s0 .L8027B1B4: /* 1A9A94 8027B1B4 00001012 */ mflo $v0 -/* 1A9A98 8027B1B8 00000000 */ nop -/* 1A9A9C 8027B1BC 00000000 */ nop +/* 1A9A98 8027B1B8 00000000 */ nop +/* 1A9A9C 8027B1BC 00000000 */ nop /* 1A9AA0 8027B1C0 01110018 */ mult $t0, $s1 /* 1A9AA4 8027B1C4 00004012 */ mflo $t0 -/* 1A9AA8 8027B1C8 00000000 */ nop -/* 1A9AAC 8027B1CC 00000000 */ nop +/* 1A9AA8 8027B1C8 00000000 */ nop +/* 1A9AAC 8027B1CC 00000000 */ nop /* 1A9AB0 8027B1D0 00500018 */ mult $v0, $s0 .L8027B1D4: /* 1A9AB4 8027B1D4 4618D081 */ sub.s $f2, $f26, $f24 /* 1A9AB8 8027B1D8 44880000 */ mtc1 $t0, $f0 -/* 1A9ABC 8027B1DC 00000000 */ nop +/* 1A9ABC 8027B1DC 00000000 */ nop /* 1A9AC0 8027B1E0 46800020 */ cvt.s.w $f0, $f0 /* 1A9AC4 8027B1E4 46020002 */ mul.s $f0, $f0, $f2 -/* 1A9AC8 8027B1E8 00000000 */ nop +/* 1A9AC8 8027B1E8 00000000 */ nop /* 1A9ACC 8027B1EC 00001012 */ mflo $v0 /* 1A9AD0 8027B1F0 44821000 */ mtc1 $v0, $f2 -/* 1A9AD4 8027B1F4 00000000 */ nop +/* 1A9AD4 8027B1F4 00000000 */ nop /* 1A9AD8 8027B1F8 468010A0 */ cvt.s.w $f2, $f2 /* 1A9ADC 8027B1FC 46020003 */ div.s $f0, $f0, $f2 .L8027B200: /* 1A9AE0 8027B200 0809ED80 */ j .L8027B600 /* 1A9AE4 8027B204 4600C000 */ add.s $f0, $f24, $f0 +glabel L8027B208_1A9AE8 /* 1A9AE8 8027B208 44916000 */ mtc1 $s1, $f12 -/* 1A9AEC 8027B20C 00000000 */ nop +/* 1A9AEC 8027B20C 00000000 */ nop /* 1A9AF0 8027B210 46806320 */ cvt.s.w $f12, $f12 /* 1A9AF4 8027B214 4490B000 */ mtc1 $s0, $f22 -/* 1A9AF8 8027B218 00000000 */ nop +/* 1A9AF8 8027B218 00000000 */ nop /* 1A9AFC 8027B21C 4680B5A0 */ cvt.s.w $f22, $f22 /* 1A9B00 8027B220 46166303 */ div.s $f12, $f12, $f22 /* 1A9B04 8027B224 3C01802A */ lui $at, %hi(D_8029D9E0) /* 1A9B08 8027B228 D420D9E0 */ ldc1 $f0, %lo(D_8029D9E0)($at) /* 1A9B0C 8027B22C 46006321 */ cvt.d.s $f12, $f12 /* 1A9B10 8027B230 46206302 */ mul.d $f12, $f12, $f0 -/* 1A9B14 8027B234 00000000 */ nop +/* 1A9B14 8027B234 00000000 */ nop /* 1A9B18 8027B238 3C014010 */ lui $at, 0x4010 /* 1A9B1C 8027B23C 44810800 */ mtc1 $at, $f1 /* 1A9B20 8027B240 44800000 */ mtc1 $zero, $f0 -/* 1A9B24 8027B244 00000000 */ nop +/* 1A9B24 8027B244 00000000 */ nop /* 1A9B28 8027B248 46206302 */ mul.d $f12, $f12, $f0 -/* 1A9B2C 8027B24C 00000000 */ nop +/* 1A9B2C 8027B24C 00000000 */ nop /* 1A9B30 8027B250 0809ECAF */ j .L8027B2BC /* 1A9B34 8027B254 4618D501 */ sub.s $f20, $f26, $f24 +glabel L8027B258_1A9B38 /* 1A9B38 8027B258 02310018 */ mult $s1, $s1 /* 1A9B3C 8027B25C 4490B000 */ mtc1 $s0, $f22 -/* 1A9B40 8027B260 00000000 */ nop +/* 1A9B40 8027B260 00000000 */ nop /* 1A9B44 8027B264 4680B5A0 */ cvt.s.w $f22, $f22 /* 1A9B48 8027B268 3C01802A */ lui $at, %hi(D_8029D9E8) /* 1A9B4C 8027B26C D420D9E8 */ ldc1 $f0, %lo(D_8029D9E8)($at) /* 1A9B50 8027B270 00001812 */ mflo $v1 /* 1A9B54 8027B274 44836000 */ mtc1 $v1, $f12 -/* 1A9B58 8027B278 00000000 */ nop +/* 1A9B58 8027B278 00000000 */ nop /* 1A9B5C 8027B27C 46806320 */ cvt.s.w $f12, $f12 /* 1A9B60 8027B280 46166303 */ div.s $f12, $f12, $f22 /* 1A9B64 8027B284 46006321 */ cvt.d.s $f12, $f12 /* 1A9B68 8027B288 46206302 */ mul.d $f12, $f12, $f0 -/* 1A9B6C 8027B28C 00000000 */ nop +/* 1A9B6C 8027B28C 00000000 */ nop /* 1A9B70 8027B290 3C014010 */ lui $at, 0x4010 /* 1A9B74 8027B294 44810800 */ mtc1 $at, $f1 /* 1A9B78 8027B298 44800000 */ mtc1 $zero, $f0 -/* 1A9B7C 8027B29C 00000000 */ nop +/* 1A9B7C 8027B29C 00000000 */ nop /* 1A9B80 8027B2A0 46206302 */ mul.d $f12, $f12, $f0 -/* 1A9B84 8027B2A4 00000000 */ nop +/* 1A9B84 8027B2A4 00000000 */ nop /* 1A9B88 8027B2A8 3C01402E */ lui $at, 0x402e /* 1A9B8C 8027B2AC 44810800 */ mtc1 $at, $f1 /* 1A9B90 8027B2B0 44800000 */ mtc1 $zero, $f0 @@ -129,145 +135,150 @@ glabel update_lerp_battle /* 1A9B9C 8027B2BC 0C00A874 */ jal cos_rad /* 1A9BA0 8027B2C0 46206320 */ cvt.s.d $f12, $f12 /* 1A9BA4 8027B2C4 4600A502 */ mul.s $f20, $f20, $f0 -/* 1A9BA8 8027B2C8 00000000 */ nop +/* 1A9BA8 8027B2C8 00000000 */ nop /* 1A9BAC 8027B2CC 4616B582 */ mul.s $f22, $f22, $f22 -/* 1A9BB0 8027B2D0 00000000 */ nop +/* 1A9BB0 8027B2D0 00000000 */ nop /* 1A9BB4 8027B2D4 02111023 */ subu $v0, $s0, $s1 /* 1A9BB8 8027B2D8 44820000 */ mtc1 $v0, $f0 -/* 1A9BBC 8027B2DC 00000000 */ nop +/* 1A9BBC 8027B2DC 00000000 */ nop /* 1A9BC0 8027B2E0 46800020 */ cvt.s.w $f0, $f0 /* 1A9BC4 8027B2E4 4600A502 */ mul.s $f20, $f20, $f0 -/* 1A9BC8 8027B2E8 00000000 */ nop +/* 1A9BC8 8027B2E8 00000000 */ nop /* 1A9BCC 8027B2EC 4600A502 */ mul.s $f20, $f20, $f0 -/* 1A9BD0 8027B2F0 00000000 */ nop +/* 1A9BD0 8027B2F0 00000000 */ nop /* 1A9BD4 8027B2F4 4616A503 */ div.s $f20, $f20, $f22 /* 1A9BD8 8027B2F8 0809ED80 */ j .L8027B600 /* 1A9BDC 8027B2FC 4614D001 */ sub.s $f0, $f26, $f20 +glabel L8027B300_1A9BE0 /* 1A9BE0 8027B300 02113823 */ subu $a3, $s0, $s1 /* 1A9BE4 8027B304 00E70018 */ mult $a3, $a3 /* 1A9BE8 8027B308 4618D101 */ sub.s $f4, $f26, $f24 /* 1A9BEC 8027B30C 00001812 */ mflo $v1 /* 1A9BF0 8027B310 44830000 */ mtc1 $v1, $f0 -/* 1A9BF4 8027B314 00000000 */ nop +/* 1A9BF4 8027B314 00000000 */ nop /* 1A9BF8 8027B318 46800020 */ cvt.s.w $f0, $f0 /* 1A9BFC 8027B31C 46040002 */ mul.s $f0, $f0, $f4 -/* 1A9C00 8027B320 00000000 */ nop +/* 1A9C00 8027B320 00000000 */ nop /* 1A9C04 8027B324 02100018 */ mult $s0, $s0 /* 1A9C08 8027B328 00001812 */ mflo $v1 /* 1A9C0C 8027B32C 44831000 */ mtc1 $v1, $f2 -/* 1A9C10 8027B330 00000000 */ nop +/* 1A9C10 8027B330 00000000 */ nop /* 1A9C14 8027B334 468010A0 */ cvt.s.w $f2, $f2 /* 1A9C18 8027B338 0809ECFB */ j .L8027B3EC /* 1A9C1C 8027B33C 4604C100 */ add.s $f4, $f24, $f4 +glabel L8027B340_1A9C20 /* 1A9C20 8027B340 02113823 */ subu $a3, $s0, $s1 /* 1A9C24 8027B344 00E70018 */ mult $a3, $a3 /* 1A9C28 8027B348 00001012 */ mflo $v0 -/* 1A9C2C 8027B34C 00000000 */ nop -/* 1A9C30 8027B350 00000000 */ nop +/* 1A9C2C 8027B34C 00000000 */ nop +/* 1A9C30 8027B350 00000000 */ nop /* 1A9C34 8027B354 00470018 */ mult $v0, $a3 /* 1A9C38 8027B358 00004012 */ mflo $t0 -/* 1A9C3C 8027B35C 00000000 */ nop +/* 1A9C3C 8027B35C 00000000 */ nop /* 1A9C40 8027B360 0809ECEC */ j .L8027B3B0 /* 1A9C44 8027B364 02100018 */ mult $s0, $s0 +glabel L8027B368_1A9C48 /* 1A9C48 8027B368 02113823 */ subu $a3, $s0, $s1 /* 1A9C4C 8027B36C 00E70018 */ mult $a3, $a3 /* 1A9C50 8027B370 00001012 */ mflo $v0 -/* 1A9C54 8027B374 00000000 */ nop -/* 1A9C58 8027B378 00000000 */ nop +/* 1A9C54 8027B374 00000000 */ nop +/* 1A9C58 8027B378 00000000 */ nop /* 1A9C5C 8027B37C 00470018 */ mult $v0, $a3 /* 1A9C60 8027B380 00004012 */ mflo $t0 -/* 1A9C64 8027B384 00000000 */ nop -/* 1A9C68 8027B388 00000000 */ nop +/* 1A9C64 8027B384 00000000 */ nop +/* 1A9C68 8027B388 00000000 */ nop /* 1A9C6C 8027B38C 02100018 */ mult $s0, $s0 /* 1A9C70 8027B390 00001012 */ mflo $v0 -/* 1A9C74 8027B394 00000000 */ nop -/* 1A9C78 8027B398 00000000 */ nop +/* 1A9C74 8027B394 00000000 */ nop +/* 1A9C78 8027B398 00000000 */ nop /* 1A9C7C 8027B39C 01070018 */ mult $t0, $a3 /* 1A9C80 8027B3A0 00004012 */ mflo $t0 -/* 1A9C84 8027B3A4 00000000 */ nop -/* 1A9C88 8027B3A8 00000000 */ nop +/* 1A9C84 8027B3A4 00000000 */ nop +/* 1A9C88 8027B3A8 00000000 */ nop /* 1A9C8C 8027B3AC 00500018 */ mult $v0, $s0 .L8027B3B0: /* 1A9C90 8027B3B0 4618D101 */ sub.s $f4, $f26, $f24 /* 1A9C94 8027B3B4 44880000 */ mtc1 $t0, $f0 -/* 1A9C98 8027B3B8 00000000 */ nop +/* 1A9C98 8027B3B8 00000000 */ nop /* 1A9C9C 8027B3BC 46800020 */ cvt.s.w $f0, $f0 /* 1A9CA0 8027B3C0 46040002 */ mul.s $f0, $f0, $f4 -/* 1A9CA4 8027B3C4 00000000 */ nop +/* 1A9CA4 8027B3C4 00000000 */ nop /* 1A9CA8 8027B3C8 00001012 */ mflo $v0 -/* 1A9CAC 8027B3CC 00000000 */ nop -/* 1A9CB0 8027B3D0 00000000 */ nop +/* 1A9CAC 8027B3CC 00000000 */ nop +/* 1A9CB0 8027B3D0 00000000 */ nop /* 1A9CB4 8027B3D4 00500018 */ mult $v0, $s0 /* 1A9CB8 8027B3D8 4604C100 */ add.s $f4, $f24, $f4 /* 1A9CBC 8027B3DC 00001012 */ mflo $v0 /* 1A9CC0 8027B3E0 44821000 */ mtc1 $v0, $f2 -/* 1A9CC4 8027B3E4 00000000 */ nop +/* 1A9CC4 8027B3E4 00000000 */ nop /* 1A9CC8 8027B3E8 468010A0 */ cvt.s.w $f2, $f2 .L8027B3EC: /* 1A9CCC 8027B3EC 46020003 */ div.s $f0, $f0, $f2 /* 1A9CD0 8027B3F0 0809ED80 */ j .L8027B600 /* 1A9CD4 8027B3F4 46002001 */ sub.s $f0, $f4, $f0 +glabel L8027B3F8_1A9CD8 /* 1A9CD8 8027B3F8 02310018 */ mult $s1, $s1 /* 1A9CDC 8027B3FC 4490A000 */ mtc1 $s0, $f20 -/* 1A9CE0 8027B400 00000000 */ nop +/* 1A9CE0 8027B400 00000000 */ nop /* 1A9CE4 8027B404 4680A520 */ cvt.s.w $f20, $f20 /* 1A9CE8 8027B408 3C01802A */ lui $at, %hi(D_8029D9F0) /* 1A9CEC 8027B40C D420D9F0 */ ldc1 $f0, %lo(D_8029D9F0)($at) /* 1A9CF0 8027B410 00001812 */ mflo $v1 /* 1A9CF4 8027B414 44836000 */ mtc1 $v1, $f12 -/* 1A9CF8 8027B418 00000000 */ nop +/* 1A9CF8 8027B418 00000000 */ nop /* 1A9CFC 8027B41C 46806320 */ cvt.s.w $f12, $f12 /* 1A9D00 8027B420 46146303 */ div.s $f12, $f12, $f20 /* 1A9D04 8027B424 46006321 */ cvt.d.s $f12, $f12 /* 1A9D08 8027B428 46206302 */ mul.d $f12, $f12, $f0 -/* 1A9D0C 8027B42C 00000000 */ nop +/* 1A9D0C 8027B42C 00000000 */ nop /* 1A9D10 8027B430 3C014010 */ lui $at, 0x4010 /* 1A9D14 8027B434 44810800 */ mtc1 $at, $f1 /* 1A9D18 8027B438 44800000 */ mtc1 $zero, $f0 -/* 1A9D1C 8027B43C 00000000 */ nop +/* 1A9D1C 8027B43C 00000000 */ nop /* 1A9D20 8027B440 46206302 */ mul.d $f12, $f12, $f0 -/* 1A9D24 8027B444 00000000 */ nop +/* 1A9D24 8027B444 00000000 */ nop /* 1A9D28 8027B448 3C014044 */ lui $at, 0x4044 /* 1A9D2C 8027B44C 44810800 */ mtc1 $at, $f1 /* 1A9D30 8027B450 44800000 */ mtc1 $zero, $f0 -/* 1A9D34 8027B454 00000000 */ nop +/* 1A9D34 8027B454 00000000 */ nop /* 1A9D38 8027B458 46206303 */ div.d $f12, $f12, $f0 /* 1A9D3C 8027B45C 0C00A874 */ jal cos_rad /* 1A9D40 8027B460 46206320 */ cvt.s.d $f12, $f12 /* 1A9D44 8027B464 02111023 */ subu $v0, $s0, $s1 /* 1A9D48 8027B468 44821000 */ mtc1 $v0, $f2 -/* 1A9D4C 8027B46C 00000000 */ nop +/* 1A9D4C 8027B46C 00000000 */ nop /* 1A9D50 8027B470 468010A0 */ cvt.s.w $f2, $f2 /* 1A9D54 8027B474 46020002 */ mul.s $f0, $f0, $f2 -/* 1A9D58 8027B478 00000000 */ nop +/* 1A9D58 8027B478 00000000 */ nop /* 1A9D5C 8027B47C 4614A502 */ mul.s $f20, $f20, $f20 -/* 1A9D60 8027B480 00000000 */ nop +/* 1A9D60 8027B480 00000000 */ nop /* 1A9D64 8027B484 46020002 */ mul.s $f0, $f0, $f2 -/* 1A9D68 8027B488 00000000 */ nop +/* 1A9D68 8027B488 00000000 */ nop /* 1A9D6C 8027B48C 44801000 */ mtc1 $zero, $f2 /* 1A9D70 8027B490 46140103 */ div.s $f4, $f0, $f20 /* 1A9D74 8027B494 4602203C */ c.lt.s $f4, $f2 -/* 1A9D78 8027B498 00000000 */ nop +/* 1A9D78 8027B498 00000000 */ nop /* 1A9D7C 8027B49C 45030001 */ bc1tl .L8027B4A4 /* 1A9D80 8027B4A0 46002107 */ neg.s $f4, $f4 .L8027B4A4: /* 1A9D84 8027B4A4 4618D001 */ sub.s $f0, $f26, $f24 /* 1A9D88 8027B4A8 46040002 */ mul.s $f0, $f0, $f4 -/* 1A9D8C 8027B4AC 00000000 */ nop +/* 1A9D8C 8027B4AC 00000000 */ nop /* 1A9D90 8027B4B0 0809ED80 */ j .L8027B600 /* 1A9D94 8027B4B4 4600D001 */ sub.s $f0, $f26, $f0 +glabel L8027B4B8_1A9D98 /* 1A9D98 8027B4B8 44916000 */ mtc1 $s1, $f12 -/* 1A9D9C 8027B4BC 00000000 */ nop +/* 1A9D9C 8027B4BC 00000000 */ nop /* 1A9DA0 8027B4C0 46806320 */ cvt.s.w $f12, $f12 /* 1A9DA4 8027B4C4 3C01802A */ lui $at, %hi(D_8029D9F8) /* 1A9DA8 8027B4C8 D420D9F8 */ ldc1 $f0, %lo(D_8029D9F8)($at) /* 1A9DAC 8027B4CC 46006321 */ cvt.d.s $f12, $f12 /* 1A9DB0 8027B4D0 46206302 */ mul.d $f12, $f12, $f0 -/* 1A9DB4 8027B4D4 00000000 */ nop +/* 1A9DB4 8027B4D4 00000000 */ nop /* 1A9DB8 8027B4D8 4600C5A1 */ cvt.d.s $f22, $f24 /* 1A9DBC 8027B4DC 4618D501 */ sub.s $f20, $f26, $f24 /* 1A9DC0 8027B4E0 44900000 */ mtc1 $s0, $f0 -/* 1A9DC4 8027B4E4 00000000 */ nop +/* 1A9DC4 8027B4E4 00000000 */ nop /* 1A9DC8 8027B4E8 46800020 */ cvt.s.w $f0, $f0 /* 1A9DCC 8027B4EC 46000021 */ cvt.d.s $f0, $f0 /* 1A9DD0 8027B4F0 4600A521 */ cvt.d.s $f20, $f20 @@ -280,47 +291,49 @@ glabel update_lerp_battle /* 1A9DEC 8027B50C 46000021 */ cvt.d.s $f0, $f0 /* 1A9DF0 8027B510 46201081 */ sub.d $f2, $f2, $f0 /* 1A9DF4 8027B514 4622A502 */ mul.d $f20, $f20, $f2 -/* 1A9DF8 8027B518 00000000 */ nop +/* 1A9DF8 8027B518 00000000 */ nop /* 1A9DFC 8027B51C 3C013FE0 */ lui $at, 0x3fe0 /* 1A9E00 8027B520 44810800 */ mtc1 $at, $f1 /* 1A9E04 8027B524 44800000 */ mtc1 $zero, $f0 -/* 1A9E08 8027B528 00000000 */ nop +/* 1A9E08 8027B528 00000000 */ nop /* 1A9E0C 8027B52C 4620A502 */ mul.d $f20, $f20, $f0 -/* 1A9E10 8027B530 00000000 */ nop +/* 1A9E10 8027B530 00000000 */ nop /* 1A9E14 8027B534 0809ED7D */ j .L8027B5F4 /* 1A9E18 8027B538 4634B580 */ add.d $f22, $f22, $f20 +glabel L8027B53C_1A9E1C /* 1A9E1C 8027B53C 44916000 */ mtc1 $s1, $f12 -/* 1A9E20 8027B540 00000000 */ nop +/* 1A9E20 8027B540 00000000 */ nop /* 1A9E24 8027B544 46806320 */ cvt.s.w $f12, $f12 /* 1A9E28 8027B548 3C01802A */ lui $at, %hi(D_8029DA00) /* 1A9E2C 8027B54C D420DA00 */ ldc1 $f0, %lo(D_8029DA00)($at) /* 1A9E30 8027B550 46006321 */ cvt.d.s $f12, $f12 /* 1A9E34 8027B554 46206302 */ mul.d $f12, $f12, $f0 -/* 1A9E38 8027B558 00000000 */ nop +/* 1A9E38 8027B558 00000000 */ nop /* 1A9E3C 8027B55C 4618D501 */ sub.s $f20, $f26, $f24 /* 1A9E40 8027B560 44900000 */ mtc1 $s0, $f0 -/* 1A9E44 8027B564 00000000 */ nop +/* 1A9E44 8027B564 00000000 */ nop /* 1A9E48 8027B568 46800020 */ cvt.s.w $f0, $f0 /* 1A9E4C 8027B56C 46000021 */ cvt.d.s $f0, $f0 /* 1A9E50 8027B570 46206303 */ div.d $f12, $f12, $f0 /* 1A9E54 8027B574 0C00A85B */ jal sin_rad /* 1A9E58 8027B578 46206320 */ cvt.s.d $f12, $f12 /* 1A9E5C 8027B57C 4600A502 */ mul.s $f20, $f20, $f0 -/* 1A9E60 8027B580 00000000 */ nop +/* 1A9E60 8027B580 00000000 */ nop /* 1A9E64 8027B584 0809ED80 */ j .L8027B600 /* 1A9E68 8027B588 4614C000 */ add.s $f0, $f24, $f20 +glabel L8027B58C_1A9E6C /* 1A9E6C 8027B58C 44916000 */ mtc1 $s1, $f12 -/* 1A9E70 8027B590 00000000 */ nop +/* 1A9E70 8027B590 00000000 */ nop /* 1A9E74 8027B594 46806320 */ cvt.s.w $f12, $f12 /* 1A9E78 8027B598 3C01802A */ lui $at, %hi(D_8029DA08) /* 1A9E7C 8027B59C D420DA08 */ ldc1 $f0, %lo(D_8029DA08)($at) /* 1A9E80 8027B5A0 46006321 */ cvt.d.s $f12, $f12 /* 1A9E84 8027B5A4 46206302 */ mul.d $f12, $f12, $f0 -/* 1A9E88 8027B5A8 00000000 */ nop +/* 1A9E88 8027B5A8 00000000 */ nop /* 1A9E8C 8027B5AC 4600C5A1 */ cvt.d.s $f22, $f24 /* 1A9E90 8027B5B0 4618D501 */ sub.s $f20, $f26, $f24 /* 1A9E94 8027B5B4 44900000 */ mtc1 $s0, $f0 -/* 1A9E98 8027B5B8 00000000 */ nop +/* 1A9E98 8027B5B8 00000000 */ nop /* 1A9E9C 8027B5BC 46800020 */ cvt.s.w $f0, $f0 /* 1A9EA0 8027B5C0 46000021 */ cvt.d.s $f0, $f0 /* 1A9EA4 8027B5C4 4600A521 */ cvt.d.s $f20, $f20 @@ -333,7 +346,7 @@ glabel update_lerp_battle /* 1A9EC0 8027B5E0 46000021 */ cvt.d.s $f0, $f0 /* 1A9EC4 8027B5E4 46201081 */ sub.d $f2, $f2, $f0 /* 1A9EC8 8027B5E8 4622A502 */ mul.d $f20, $f20, $f2 -/* 1A9ECC 8027B5EC 00000000 */ nop +/* 1A9ECC 8027B5EC 00000000 */ nop /* 1A9ED0 8027B5F0 4634B580 */ add.d $f22, $f22, $f20 .L8027B5F4: /* 1A9ED4 8027B5F4 0809ED80 */ j .L8027B600 diff --git a/asm/nonmatchings/code_1AC760/DeletePartner.s b/asm/nonmatchings/code_1AC760/DeletePartner.s index 0a66214859..68aaba9b43 100644 --- a/asm/nonmatchings/code_1AC760/DeletePartner.s +++ b/asm/nonmatchings/code_1AC760/DeletePartner.s @@ -7,7 +7,7 @@ glabel DeletePartner /* 1AF090 802807B0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 1AF094 802807B4 AFBF0010 */ sw $ra, 0x10($sp) /* 1AF098 802807B8 0C0902EF */ jal delete_actor -/* 1AF09C 802807BC 00000000 */ nop +/* 1AF09C 802807BC 00000000 */ nop /* 1AF0A0 802807C0 8FBF0010 */ lw $ra, 0x10($sp) /* 1AF0A4 802807C4 24020002 */ addiu $v0, $zero, 2 /* 1AF0A8 802807C8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_1AC760/calc_partner_damage_enemy.s b/asm/nonmatchings/code_1AC760/calc_partner_damage_enemy.s index 359dad6bb8..3fc55697c7 100644 --- a/asm/nonmatchings/code_1AC760/calc_partner_damage_enemy.s +++ b/asm/nonmatchings/code_1AC760/calc_partner_damage_enemy.s @@ -50,7 +50,7 @@ glabel calc_partner_damage_enemy /* 1ACCB4 8027E3D4 A66001F8 */ sh $zero, 0x1f8($s3) .L8027E3D8: /* 1ACCB8 8027E3D8 0809F8F6 */ j .L8027E3D8 -/* 1ACCBC 8027E3DC 00000000 */ nop +/* 1ACCBC 8027E3DC 00000000 */ nop .L8027E3E0: /* 1ACCC0 8027E3E0 3C02800E */ lui $v0, %hi(gBattleStatus) /* 1ACCC4 8027E3E4 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) @@ -67,7 +67,7 @@ glabel calc_partner_damage_enemy /* 1ACCF0 8027E410 0C052757 */ jal play_sound_at_position /* 1ACCF4 8027E414 0000282D */ daddu $a1, $zero, $zero /* 1ACCF8 8027E418 0809FB1B */ j .L8027EC6C -/* 1ACCFC 8027E41C 00000000 */ nop +/* 1ACCFC 8027E41C 00000000 */ nop .L8027E420: /* 1ACD00 8027E420 8EC4007C */ lw $a0, 0x7c($s6) /* 1ACD04 8027E424 30820020 */ andi $v0, $a0, 0x20 @@ -78,11 +78,11 @@ glabel calc_partner_damage_enemy /* 1ACD18 8027E438 10620007 */ beq $v1, $v0, .L8027E458 /* 1ACD1C 8027E43C 30820800 */ andi $v0, $a0, 0x800 /* 1ACD20 8027E440 10400007 */ beqz $v0, .L8027E460 -/* 1ACD24 8027E444 00000000 */ nop +/* 1ACD24 8027E444 00000000 */ nop /* 1ACD28 8027E448 8E820188 */ lw $v0, 0x188($s4) /* 1ACD2C 8027E44C 30420800 */ andi $v0, $v0, 0x800 /* 1ACD30 8027E450 14400003 */ bnez $v0, .L8027E460 -/* 1ACD34 8027E454 00000000 */ nop +/* 1ACD34 8027E454 00000000 */ nop .L8027E458: /* 1ACD38 8027E458 0809FE67 */ j .L8027F99C /* 1ACD3C 8027E45C 24020006 */ addiu $v0, $zero, 6 @@ -125,17 +125,17 @@ glabel calc_partner_damage_enemy /* 1ACDC8 8027E4E8 AFA80020 */ sw $t0, 0x20($sp) .L8027E4EC: /* 1ACDCC 8027E4EC 10400005 */ beqz $v0, .L8027E504 -/* 1ACDD0 8027E4F0 00000000 */ nop +/* 1ACDD0 8027E4F0 00000000 */ nop /* 1ACDD4 8027E4F4 8EC2007C */ lw $v0, 0x7c($s6) /* 1ACDD8 8027E4F8 30420010 */ andi $v0, $v0, 0x10 /* 1ACDDC 8027E4FC 14400084 */ bnez $v0, .L8027E710 -/* 1ACDE0 8027E500 00000000 */ nop +/* 1ACDE0 8027E500 00000000 */ nop .L8027E504: /* 1ACDE4 8027E504 8E820188 */ lw $v0, 0x188($s4) /* 1ACDE8 8027E508 3C031000 */ lui $v1, 0x1000 /* 1ACDEC 8027E50C 00431024 */ and $v0, $v0, $v1 /* 1ACDF0 8027E510 1440001E */ bnez $v0, .L8027E58C -/* 1ACDF4 8027E514 00000000 */ nop +/* 1ACDF4 8027E514 00000000 */ nop /* 1ACDF8 8027E518 8EC2007C */ lw $v0, 0x7c($s6) /* 1ACDFC 8027E51C 30428000 */ andi $v0, $v0, 0x8000 /* 1ACE00 8027E520 1040001A */ beqz $v0, .L8027E58C @@ -175,7 +175,7 @@ glabel calc_partner_damage_enemy /* 1ACE80 8027E5A0 8EC2007C */ lw $v0, 0x7c($s6) /* 1ACE84 8027E5A4 30420002 */ andi $v0, $v0, 2 /* 1ACE88 8027E5A8 10400011 */ beqz $v0, .L8027E5F0 -/* 1ACE8C 8027E5AC 00000000 */ nop +/* 1ACE8C 8027E5AC 00000000 */ nop /* 1ACE90 8027E5B0 8E82018C */ lw $v0, 0x18c($s4) /* 1ACE94 8027E5B4 30420010 */ andi $v0, $v0, 0x10 /* 1ACE98 8027E5B8 1440000D */ bnez $v0, .L8027E5F0 @@ -201,22 +201,22 @@ glabel calc_partner_damage_enemy /* 1ACEE4 8027E604 8EC2007C */ lw $v0, 0x7c($s6) /* 1ACEE8 8027E608 00431024 */ and $v0, $v0, $v1 /* 1ACEEC 8027E60C 10400005 */ beqz $v0, .L8027E624 -/* 1ACEF0 8027E610 00000000 */ nop +/* 1ACEF0 8027E610 00000000 */ nop /* 1ACEF4 8027E614 8E82018C */ lw $v0, 0x18c($s4) /* 1ACEF8 8027E618 30420004 */ andi $v0, $v0, 4 /* 1ACEFC 8027E61C 1040003C */ beqz $v0, .L8027E710 -/* 1ACF00 8027E620 00000000 */ nop +/* 1ACF00 8027E620 00000000 */ nop .L8027E624: /* 1ACF04 8027E624 3C10800E */ lui $s0, %hi(gBattleStatus) /* 1ACF08 8027E628 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) /* 1ACF0C 8027E62C 8E020000 */ lw $v0, ($s0) /* 1ACF10 8027E630 30420020 */ andi $v0, $v0, 0x20 /* 1ACF14 8027E634 10400014 */ beqz $v0, .L8027E688 -/* 1ACF18 8027E638 00000000 */ nop +/* 1ACF18 8027E638 00000000 */ nop /* 1ACF1C 8027E63C 8E820188 */ lw $v0, 0x188($s4) /* 1ACF20 8027E640 30420002 */ andi $v0, $v0, 2 /* 1ACF24 8027E644 10400010 */ beqz $v0, .L8027E688 -/* 1ACF28 8027E648 00000000 */ nop +/* 1ACF28 8027E648 00000000 */ nop /* 1ACF2C 8027E64C 8EC2007C */ lw $v0, 0x7c($s6) /* 1ACF30 8027E650 30420600 */ andi $v0, $v0, 0x600 /* 1ACF34 8027E654 1040000C */ beqz $v0, .L8027E688 @@ -231,7 +231,7 @@ glabel calc_partner_damage_enemy /* 1ACF58 8027E678 0C09DC58 */ jal dispatch_event_actor /* 1ACF5C 8027E67C 24050022 */ addiu $a1, $zero, 0x22 /* 1ACF60 8027E680 0809FB17 */ j .L8027EC5C -/* 1ACF64 8027E684 00000000 */ nop +/* 1ACF64 8027E684 00000000 */ nop .L8027E688: /* 1ACF68 8027E688 8E820188 */ lw $v0, 0x188($s4) /* 1ACF6C 8027E68C 3C031000 */ lui $v1, 0x1000 @@ -241,33 +241,33 @@ glabel calc_partner_damage_enemy /* 1ACF7C 8027E69C 8EC2007C */ lw $v0, 0x7c($s6) /* 1ACF80 8027E6A0 00431024 */ and $v0, $v0, $v1 /* 1ACF84 8027E6A4 10400009 */ beqz $v0, .L8027E6CC -/* 1ACF88 8027E6A8 00000000 */ nop +/* 1ACF88 8027E6A8 00000000 */ nop /* 1ACF8C 8027E6AC 8E620000 */ lw $v0, ($s3) /* 1ACF90 8027E6B0 30420800 */ andi $v0, $v0, 0x800 /* 1ACF94 8027E6B4 14400005 */ bnez $v0, .L8027E6CC -/* 1ACF98 8027E6B8 00000000 */ nop +/* 1ACF98 8027E6B8 00000000 */ nop /* 1ACF9C 8027E6BC 8E82018C */ lw $v0, 0x18c($s4) /* 1ACFA0 8027E6C0 30420080 */ andi $v0, $v0, 0x80 /* 1ACFA4 8027E6C4 10400012 */ beqz $v0, .L8027E710 -/* 1ACFA8 8027E6C8 00000000 */ nop +/* 1ACFA8 8027E6C8 00000000 */ nop .L8027E6CC: /* 1ACFAC 8027E6CC 8E820188 */ lw $v0, 0x188($s4) /* 1ACFB0 8027E6D0 3C031000 */ lui $v1, 0x1000 /* 1ACFB4 8027E6D4 00431024 */ and $v0, $v0, $v1 /* 1ACFB8 8027E6D8 1440001D */ bnez $v0, .L8027E750 -/* 1ACFBC 8027E6DC 00000000 */ nop +/* 1ACFBC 8027E6DC 00000000 */ nop /* 1ACFC0 8027E6E0 8EC2007C */ lw $v0, 0x7c($s6) /* 1ACFC4 8027E6E4 30420010 */ andi $v0, $v0, 0x10 /* 1ACFC8 8027E6E8 10400019 */ beqz $v0, .L8027E750 -/* 1ACFCC 8027E6EC 00000000 */ nop +/* 1ACFCC 8027E6EC 00000000 */ nop /* 1ACFD0 8027E6F0 8E620000 */ lw $v0, ($s3) /* 1ACFD4 8027E6F4 30420800 */ andi $v0, $v0, 0x800 /* 1ACFD8 8027E6F8 14400015 */ bnez $v0, .L8027E750 -/* 1ACFDC 8027E6FC 00000000 */ nop +/* 1ACFDC 8027E6FC 00000000 */ nop /* 1ACFE0 8027E700 8E82018C */ lw $v0, 0x18c($s4) /* 1ACFE4 8027E704 30420001 */ andi $v0, $v0, 1 /* 1ACFE8 8027E708 14400011 */ bnez $v0, .L8027E750 -/* 1ACFEC 8027E70C 00000000 */ nop +/* 1ACFEC 8027E70C 00000000 */ nop .L8027E710: /* 1ACFF0 8027E710 C6400014 */ lwc1 $f0, 0x14($s2) /* 1ACFF4 8027E714 24040108 */ addiu $a0, $zero, 0x108 @@ -283,7 +283,7 @@ glabel calc_partner_damage_enemy /* 1AD01C 8027E73C 2405001B */ addiu $a1, $zero, 0x1b .L8027E740: /* 1AD020 8027E740 0C09DC58 */ jal dispatch_event_actor -/* 1AD024 8027E744 00000000 */ nop +/* 1AD024 8027E744 00000000 */ nop /* 1AD028 8027E748 0809FE67 */ j .L8027F99C /* 1AD02C 8027E74C 2402FFFF */ addiu $v0, $zero, -1 .L8027E750: @@ -292,11 +292,11 @@ glabel calc_partner_damage_enemy /* 1AD038 8027E758 8E020000 */ lw $v0, ($s0) /* 1AD03C 8027E75C 30420020 */ andi $v0, $v0, 0x20 /* 1AD040 8027E760 10400014 */ beqz $v0, .L8027E7B4 -/* 1AD044 8027E764 00000000 */ nop +/* 1AD044 8027E764 00000000 */ nop /* 1AD048 8027E768 8E820188 */ lw $v0, 0x188($s4) /* 1AD04C 8027E76C 30420002 */ andi $v0, $v0, 2 /* 1AD050 8027E770 10400010 */ beqz $v0, .L8027E7B4 -/* 1AD054 8027E774 00000000 */ nop +/* 1AD054 8027E774 00000000 */ nop /* 1AD058 8027E778 8EC2007C */ lw $v0, 0x7c($s6) /* 1AD05C 8027E77C 30420600 */ andi $v0, $v0, 0x600 /* 1AD060 8027E780 1040000C */ beqz $v0, .L8027E7B4 @@ -311,7 +311,7 @@ glabel calc_partner_damage_enemy /* 1AD084 8027E7A4 0C09DC58 */ jal dispatch_event_actor /* 1AD088 8027E7A8 24050022 */ addiu $a1, $zero, 0x22 /* 1AD08C 8027E7AC 0809FB17 */ j .L8027EC5C -/* 1AD090 8027E7B0 00000000 */ nop +/* 1AD090 8027E7B0 00000000 */ nop .L8027E7B4: /* 1AD094 8027E7B4 8E830188 */ lw $v1, 0x188($s4) /* 1AD098 8027E7B8 30628000 */ andi $v0, $v1, 0x8000 @@ -337,7 +337,7 @@ glabel calc_partner_damage_enemy /* 1AD0E4 8027E804 10400454 */ beqz $v0, .L8027F958 /* 1AD0E8 8027E808 0000102D */ daddu $v0, $zero, $zero /* 1AD0EC 8027E80C 0809FE67 */ j .L8027F99C -/* 1AD0F0 8027E810 00000000 */ nop +/* 1AD0F0 8027E810 00000000 */ nop .L8027E814: /* 1AD0F4 8027E814 30620002 */ andi $v0, $v1, 2 /* 1AD0F8 8027E818 10400010 */ beqz $v0, .L8027E85C @@ -361,7 +361,7 @@ glabel calc_partner_damage_enemy /* 1AD13C 8027E85C 8E820188 */ lw $v0, 0x188($s4) /* 1AD140 8027E860 30420020 */ andi $v0, $v0, 0x20 /* 1AD144 8027E864 10400005 */ beqz $v0, .L8027E87C -/* 1AD148 8027E868 00000000 */ nop +/* 1AD148 8027E868 00000000 */ nop /* 1AD14C 8027E86C 0C09451D */ jal func_80251474 /* 1AD150 8027E870 0260202D */ daddu $a0, $s3, $zero /* 1AD154 8027E874 24080001 */ addiu $t0, $zero, 1 @@ -392,7 +392,7 @@ glabel calc_partner_damage_enemy /* 1AD1B0 8027E8D0 C6420014 */ lwc1 $f2, 0x14($s2) /* 1AD1B4 8027E8D4 3C0140A0 */ lui $at, 0x40a0 /* 1AD1B8 8027E8D8 44810000 */ mtc1 $at, $f0 -/* 1AD1BC 8027E8DC 00000000 */ nop +/* 1AD1BC 8027E8DC 00000000 */ nop /* 1AD1C0 8027E8E0 46001080 */ add.s $f2, $f2, $f0 /* 1AD1C4 8027E8E4 8E45000C */ lw $a1, 0xc($s2) /* 1AD1C8 8027E8E8 8E460010 */ lw $a2, 0x10($s2) @@ -405,24 +405,24 @@ glabel calc_partner_damage_enemy /* 1AD1E0 8027E900 81020212 */ lb $v0, 0x212($t0) /* 1AD1E4 8027E904 2403000B */ addiu $v1, $zero, 0xb /* 1AD1E8 8027E908 10430016 */ beq $v0, $v1, .L8027E964 -/* 1AD1EC 8027E90C 00000000 */ nop +/* 1AD1EC 8027E90C 00000000 */ nop /* 1AD1F0 8027E910 82620212 */ lb $v0, 0x212($s3) /* 1AD1F4 8027E914 10430005 */ beq $v0, $v1, .L8027E92C /* 1AD1F8 8027E918 3C031000 */ lui $v1, 0x1000 /* 1AD1FC 8027E91C 8EC2007C */ lw $v0, 0x7c($s6) /* 1AD200 8027E920 30420080 */ andi $v0, $v0, 0x80 /* 1AD204 8027E924 1040000F */ beqz $v0, .L8027E964 -/* 1AD208 8027E928 00000000 */ nop +/* 1AD208 8027E928 00000000 */ nop .L8027E92C: /* 1AD20C 8027E92C 8E820188 */ lw $v0, 0x188($s4) /* 1AD210 8027E930 34630020 */ ori $v1, $v1, 0x20 /* 1AD214 8027E934 00431024 */ and $v0, $v0, $v1 /* 1AD218 8027E938 1440000A */ bnez $v0, .L8027E964 -/* 1AD21C 8027E93C 00000000 */ nop +/* 1AD21C 8027E93C 00000000 */ nop /* 1AD220 8027E940 8E82018C */ lw $v0, 0x18c($s4) /* 1AD224 8027E944 30420008 */ andi $v0, $v0, 8 /* 1AD228 8027E948 14400006 */ bnez $v0, .L8027E964 -/* 1AD22C 8027E94C 00000000 */ nop +/* 1AD22C 8027E94C 00000000 */ nop /* 1AD230 8027E950 3C03800E */ lui $v1, %hi(gBattleStatus) /* 1AD234 8027E954 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) /* 1AD238 8027E958 8C620000 */ lw $v0, ($v1) @@ -448,7 +448,7 @@ glabel calc_partner_damage_enemy /* 1AD280 8027E9A0 3C020800 */ lui $v0, 0x800 /* 1AD284 8027E9A4 00A21024 */ and $v0, $a1, $v0 /* 1AD288 8027E9A8 14400003 */ bnez $v0, .L8027E9B8 -/* 1AD28C 8027E9AC 00000000 */ nop +/* 1AD28C 8027E9AC 00000000 */ nop /* 1AD290 8027E9B0 82620222 */ lb $v0, 0x222($s3) /* 1AD294 8027E9B4 02028021 */ addu $s0, $s0, $v0 .L8027E9B8: @@ -462,11 +462,11 @@ glabel calc_partner_damage_enemy /* 1AD2B4 8027E9D4 00832021 */ addu $a0, $a0, $v1 /* 1AD2B8 8027E9D8 30A20200 */ andi $v0, $a1, 0x200 /* 1AD2BC 8027E9DC 10400007 */ beqz $v0, .L8027E9FC -/* 1AD2C0 8027E9E0 00000000 */ nop +/* 1AD2C0 8027E9E0 00000000 */ nop /* 1AD2C4 8027E9E4 8EC2007C */ lw $v0, 0x7c($s6) /* 1AD2C8 8027E9E8 30420200 */ andi $v0, $v0, 0x200 /* 1AD2CC 8027E9EC 10400003 */ beqz $v0, .L8027E9FC -/* 1AD2D0 8027E9F0 00000000 */ nop +/* 1AD2D0 8027E9F0 00000000 */ nop /* 1AD2D4 8027E9F4 0000802D */ daddu $s0, $zero, $zero /* 1AD2D8 8027E9F8 826401B8 */ lb $a0, 0x1b8($s3) .L8027E9FC: @@ -474,7 +474,7 @@ glabel calc_partner_damage_enemy /* 1AD2E0 8027EA00 3C034000 */ lui $v1, 0x4000 /* 1AD2E4 8027EA04 00431024 */ and $v0, $v0, $v1 /* 1AD2E8 8027EA08 10400003 */ beqz $v0, .L8027EA18 -/* 1AD2EC 8027EA0C 00000000 */ nop +/* 1AD2EC 8027EA0C 00000000 */ nop /* 1AD2F0 8027EA10 0000802D */ daddu $s0, $zero, $zero /* 1AD2F4 8027EA14 0200202D */ daddu $a0, $s0, $zero .L8027EA18: @@ -507,9 +507,9 @@ glabel calc_partner_damage_enemy /* 1AD34C 8027EA6C 3C030010 */ lui $v1, 0x10 /* 1AD350 8027EA70 00431024 */ and $v0, $v0, $v1 /* 1AD354 8027EA74 10400007 */ beqz $v0, .L8027EA94 -/* 1AD358 8027EA78 00000000 */ nop +/* 1AD358 8027EA78 00000000 */ nop /* 1AD35C 8027EA7C 18800005 */ blez $a0, .L8027EA94 -/* 1AD360 8027EA80 00000000 */ nop +/* 1AD360 8027EA80 00000000 */ nop /* 1AD364 8027EA84 82820198 */ lb $v0, 0x198($s4) /* 1AD368 8027EA88 00822021 */ addu $a0, $a0, $v0 /* 1AD36C 8027EA8C 58800001 */ blezl $a0, .L8027EA94 @@ -561,20 +561,20 @@ glabel calc_partner_damage_enemy /* 1AD414 8027EB34 3C030200 */ lui $v1, 0x200 /* 1AD418 8027EB38 00431024 */ and $v0, $v0, $v1 /* 1AD41C 8027EB3C 14400010 */ bnez $v0, .L8027EB80 -/* 1AD420 8027EB40 00000000 */ nop +/* 1AD420 8027EB40 00000000 */ nop /* 1AD424 8027EB44 8FA80020 */ lw $t0, 0x20($sp) /* 1AD428 8027EB48 1500000D */ bnez $t0, .L8027EB80 -/* 1AD42C 8027EB4C 00000000 */ nop +/* 1AD42C 8027EB4C 00000000 */ nop /* 1AD430 8027EB50 8EC20004 */ lw $v0, 4($s6) /* 1AD434 8027EB54 30420004 */ andi $v0, $v0, 4 /* 1AD438 8027EB58 14400009 */ bnez $v0, .L8027EB80 -/* 1AD43C 8027EB5C 00000000 */ nop +/* 1AD43C 8027EB5C 00000000 */ nop /* 1AD440 8027EB60 926201B8 */ lbu $v0, 0x1b8($s3) /* 1AD444 8027EB64 00441023 */ subu $v0, $v0, $a0 /* 1AD448 8027EB68 A26201B8 */ sb $v0, 0x1b8($s3) /* 1AD44C 8027EB6C 00021600 */ sll $v0, $v0, 0x18 /* 1AD450 8027EB70 1C400003 */ bgtz $v0, .L8027EB80 -/* 1AD454 8027EB74 00000000 */ nop +/* 1AD454 8027EB74 00000000 */ nop /* 1AD458 8027EB78 A26001B8 */ sb $zero, 0x1b8($s3) /* 1AD45C 8027EB7C 24110020 */ addiu $s1, $zero, 0x20 .L8027EB80: @@ -591,24 +591,24 @@ glabel calc_partner_damage_enemy /* 1AD484 8027EBA4 8FA80018 */ lw $t0, 0x18($sp) /* 1AD488 8027EBA8 81020212 */ lb $v0, 0x212($t0) /* 1AD48C 8027EBAC 10430011 */ beq $v0, $v1, .L8027EBF4 -/* 1AD490 8027EBB0 00000000 */ nop +/* 1AD490 8027EBB0 00000000 */ nop /* 1AD494 8027EBB4 82620212 */ lb $v0, 0x212($s3) /* 1AD498 8027EBB8 10430005 */ beq $v0, $v1, .L8027EBD0 -/* 1AD49C 8027EBBC 00000000 */ nop +/* 1AD49C 8027EBBC 00000000 */ nop /* 1AD4A0 8027EBC0 8EC2007C */ lw $v0, 0x7c($s6) /* 1AD4A4 8027EBC4 30420080 */ andi $v0, $v0, 0x80 /* 1AD4A8 8027EBC8 1040000A */ beqz $v0, .L8027EBF4 -/* 1AD4AC 8027EBCC 00000000 */ nop +/* 1AD4AC 8027EBCC 00000000 */ nop .L8027EBD0: /* 1AD4B0 8027EBD0 8E820188 */ lw $v0, 0x188($s4) /* 1AD4B4 8027EBD4 3C031000 */ lui $v1, 0x1000 /* 1AD4B8 8027EBD8 00431024 */ and $v0, $v0, $v1 /* 1AD4BC 8027EBDC 14400005 */ bnez $v0, .L8027EBF4 -/* 1AD4C0 8027EBE0 00000000 */ nop +/* 1AD4C0 8027EBE0 00000000 */ nop /* 1AD4C4 8027EBE4 8E82018C */ lw $v0, 0x18c($s4) /* 1AD4C8 8027EBE8 30420008 */ andi $v0, $v0, 8 /* 1AD4CC 8027EBEC 1040035A */ beqz $v0, .L8027F958 -/* 1AD4D0 8027EBF0 00000000 */ nop +/* 1AD4D0 8027EBF0 00000000 */ nop .L8027EBF4: /* 1AD4D4 8027EBF4 3C10800E */ lui $s0, %hi(gBattleStatus) /* 1AD4D8 8027EBF8 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) @@ -662,7 +662,7 @@ glabel calc_partner_damage_enemy /* 1AD580 8027ECA0 52220006 */ beql $s1, $v0, .L8027ECBC /* 1AD584 8027ECA4 24110020 */ addiu $s1, $zero, 0x20 /* 1AD588 8027ECA8 0809FB2F */ j .L8027ECBC -/* 1AD58C 8027ECAC 00000000 */ nop +/* 1AD58C 8027ECAC 00000000 */ nop .L8027ECB0: /* 1AD590 8027ECB0 24020020 */ addiu $v0, $zero, 0x20 /* 1AD594 8027ECB4 52220001 */ beql $s1, $v0, .L8027ECBC @@ -673,13 +673,13 @@ glabel calc_partner_damage_enemy /* 1AD5A4 8027ECC4 8E020000 */ lw $v0, ($s0) /* 1AD5A8 8027ECC8 30420020 */ andi $v0, $v0, 0x20 /* 1AD5AC 8027ECCC 14400007 */ bnez $v0, .L8027ECEC -/* 1AD5B0 8027ECD0 00000000 */ nop +/* 1AD5B0 8027ECD0 00000000 */ nop /* 1AD5B4 8027ECD4 0C099B85 */ jal func_80266E14 /* 1AD5B8 8027ECD8 02C0202D */ daddu $a0, $s6, $zero /* 1AD5BC 8027ECDC 8E020000 */ lw $v0, ($s0) /* 1AD5C0 8027ECE0 30420020 */ andi $v0, $v0, 0x20 /* 1AD5C4 8027ECE4 10400055 */ beqz $v0, .L8027EE3C -/* 1AD5C8 8027ECE8 00000000 */ nop +/* 1AD5C8 8027ECE8 00000000 */ nop .L8027ECEC: /* 1AD5CC 8027ECEC 8E820188 */ lw $v0, 0x188($s4) /* 1AD5D0 8027ECF0 3C030400 */ lui $v1, 0x400 @@ -731,11 +731,11 @@ glabel calc_partner_damage_enemy /* 1AD668 8027ED88 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1AD66C 8027ED8C 30420020 */ andi $v0, $v0, 0x20 /* 1AD670 8027ED90 1040002A */ beqz $v0, .L8027EE3C -/* 1AD674 8027ED94 00000000 */ nop +/* 1AD674 8027ED94 00000000 */ nop /* 1AD678 8027ED98 8E820188 */ lw $v0, 0x188($s4) /* 1AD67C 8027ED9C 30420080 */ andi $v0, $v0, 0x80 /* 1AD680 8027EDA0 1040000B */ beqz $v0, .L8027EDD0 -/* 1AD684 8027EDA4 00000000 */ nop +/* 1AD684 8027EDA4 00000000 */ nop /* 1AD688 8027EDA8 8EC2007C */ lw $v0, 0x7c($s6) /* 1AD68C 8027EDAC 30424000 */ andi $v0, $v0, 0x4000 /* 1AD690 8027EDB0 10400007 */ beqz $v0, .L8027EDD0 @@ -753,11 +753,11 @@ glabel calc_partner_damage_enemy /* 1AD6B4 8027EDD4 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1AD6B8 8027EDD8 30420020 */ andi $v0, $v0, 0x20 /* 1AD6BC 8027EDDC 10400017 */ beqz $v0, .L8027EE3C -/* 1AD6C0 8027EDE0 00000000 */ nop +/* 1AD6C0 8027EDE0 00000000 */ nop /* 1AD6C4 8027EDE4 8E820188 */ lw $v0, 0x188($s4) /* 1AD6C8 8027EDE8 30420080 */ andi $v0, $v0, 0x80 /* 1AD6CC 8027EDEC 1040000E */ beqz $v0, .L8027EE28 -/* 1AD6D0 8027EDF0 00000000 */ nop +/* 1AD6D0 8027EDF0 00000000 */ nop /* 1AD6D4 8027EDF4 8EC2007C */ lw $v0, 0x7c($s6) /* 1AD6D8 8027EDF8 30421000 */ andi $v0, $v0, 0x1000 /* 1AD6DC 8027EDFC 1040000A */ beqz $v0, .L8027EE28 @@ -778,12 +778,12 @@ glabel calc_partner_damage_enemy /* 1AD70C 8027EE2C 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1AD710 8027EE30 30420020 */ andi $v0, $v0, 0x20 /* 1AD714 8027EE34 14400017 */ bnez $v0, .L8027EE94 -/* 1AD718 8027EE38 00000000 */ nop +/* 1AD718 8027EE38 00000000 */ nop .L8027EE3C: /* 1AD71C 8027EE3C 8E820188 */ lw $v0, 0x188($s4) /* 1AD720 8027EE40 30420080 */ andi $v0, $v0, 0x80 /* 1AD724 8027EE44 1040000E */ beqz $v0, .L8027EE80 -/* 1AD728 8027EE48 00000000 */ nop +/* 1AD728 8027EE48 00000000 */ nop /* 1AD72C 8027EE4C 8EC2007C */ lw $v0, 0x7c($s6) /* 1AD730 8027EE50 30421000 */ andi $v0, $v0, 0x1000 /* 1AD734 8027EE54 1040000A */ beqz $v0, .L8027EE80 @@ -804,12 +804,12 @@ glabel calc_partner_damage_enemy /* 1AD764 8027EE84 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1AD768 8027EE88 30420020 */ andi $v0, $v0, 0x20 /* 1AD76C 8027EE8C 104000DA */ beqz $v0, .L8027F1F8 -/* 1AD770 8027EE90 00000000 */ nop +/* 1AD770 8027EE90 00000000 */ nop .L8027EE94: /* 1AD774 8027EE94 8E820188 */ lw $v0, 0x188($s4) /* 1AD778 8027EE98 30420200 */ andi $v0, $v0, 0x200 /* 1AD77C 8027EE9C 10400010 */ beqz $v0, .L8027EEE0 -/* 1AD780 8027EEA0 00000000 */ nop +/* 1AD780 8027EEA0 00000000 */ nop /* 1AD784 8027EEA4 8EC2007C */ lw $v0, 0x7c($s6) /* 1AD788 8027EEA8 30420200 */ andi $v0, $v0, 0x200 /* 1AD78C 8027EEAC 1040000C */ beqz $v0, .L8027EEE0 @@ -833,7 +833,7 @@ glabel calc_partner_damage_enemy /* 1AD7C4 8027EEE4 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1AD7C8 8027EEE8 30420020 */ andi $v0, $v0, 0x20 /* 1AD7CC 8027EEEC 104000C2 */ beqz $v0, .L8027F1F8 -/* 1AD7D0 8027EEF0 00000000 */ nop +/* 1AD7D0 8027EEF0 00000000 */ nop /* 1AD7D4 8027EEF4 8E820188 */ lw $v0, 0x188($s4) /* 1AD7D8 8027EEF8 30420202 */ andi $v0, $v0, 0x202 /* 1AD7DC 8027EEFC 10400008 */ beqz $v0, .L8027EF20 @@ -852,7 +852,7 @@ glabel calc_partner_damage_enemy /* 1AD804 8027EF24 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1AD808 8027EF28 30420020 */ andi $v0, $v0, 0x20 /* 1AD80C 8027EF2C 104000B2 */ beqz $v0, .L8027F1F8 -/* 1AD810 8027EF30 00000000 */ nop +/* 1AD810 8027EF30 00000000 */ nop /* 1AD814 8027EF34 86820180 */ lh $v0, 0x180($s4) /* 1AD818 8027EF38 044000AF */ bltz $v0, .L8027F1F8 /* 1AD81C 8027EF3C 24020020 */ addiu $v0, $zero, 0x20 @@ -861,7 +861,7 @@ glabel calc_partner_damage_enemy /* 1AD828 8027EF48 122200AB */ beq $s1, $v0, .L8027F1F8 /* 1AD82C 8027EF4C 24020022 */ addiu $v0, $zero, 0x22 /* 1AD830 8027EF50 122200A9 */ beq $s1, $v0, .L8027F1F8 -/* 1AD834 8027EF54 00000000 */ nop +/* 1AD834 8027EF54 00000000 */ nop /* 1AD838 8027EF58 8EC20004 */ lw $v0, 4($s6) /* 1AD83C 8027EF5C 30420004 */ andi $v0, $v0, 4 /* 1AD840 8027EF60 144000A5 */ bnez $v0, .L8027F1F8 @@ -874,7 +874,7 @@ glabel calc_partner_damage_enemy /* 1AD85C 8027EF7C 0C099ADE */ jal try_inflict_status /* 1AD860 8027EF80 24060027 */ addiu $a2, $zero, 0x27 /* 1AD864 8027EF84 10400003 */ beqz $v0, .L8027EF94 -/* 1AD868 8027EF88 00000000 */ nop +/* 1AD868 8027EF88 00000000 */ nop /* 1AD86C 8027EF8C 241E0001 */ addiu $fp, $zero, 1 /* 1AD870 8027EF90 03C0A82D */ daddu $s5, $fp, $zero .L8027EF94: @@ -887,7 +887,7 @@ glabel calc_partner_damage_enemy /* 1AD88C 8027EFAC 0C099ADE */ jal try_inflict_status /* 1AD890 8027EFB0 24060025 */ addiu $a2, $zero, 0x25 /* 1AD894 8027EFB4 10400003 */ beqz $v0, .L8027EFC4 -/* 1AD898 8027EFB8 00000000 */ nop +/* 1AD898 8027EFB8 00000000 */ nop /* 1AD89C 8027EFBC 241E0001 */ addiu $fp, $zero, 1 /* 1AD8A0 8027EFC0 03C0A82D */ daddu $s5, $fp, $zero .L8027EFC4: @@ -900,7 +900,7 @@ glabel calc_partner_damage_enemy /* 1AD8BC 8027EFDC 0C099ADE */ jal try_inflict_status /* 1AD8C0 8027EFE0 24060028 */ addiu $a2, $zero, 0x28 /* 1AD8C4 8027EFE4 10400003 */ beqz $v0, .L8027EFF4 -/* 1AD8C8 8027EFE8 00000000 */ nop +/* 1AD8C8 8027EFE8 00000000 */ nop /* 1AD8CC 8027EFEC 241E0001 */ addiu $fp, $zero, 1 /* 1AD8D0 8027EFF0 03C0A82D */ daddu $s5, $fp, $zero .L8027EFF4: @@ -912,7 +912,7 @@ glabel calc_partner_damage_enemy /* 1AD8E8 8027F008 0C099ADE */ jal try_inflict_status /* 1AD8EC 8027F00C 24060020 */ addiu $a2, $zero, 0x20 /* 1AD8F0 8027F010 10400003 */ beqz $v0, .L8027F020 -/* 1AD8F4 8027F014 00000000 */ nop +/* 1AD8F4 8027F014 00000000 */ nop /* 1AD8F8 8027F018 241E0001 */ addiu $fp, $zero, 1 /* 1AD8FC 8027F01C 03C0A82D */ daddu $s5, $fp, $zero .L8027F020: @@ -925,7 +925,7 @@ glabel calc_partner_damage_enemy /* 1AD918 8027F038 0C099ADE */ jal try_inflict_status /* 1AD91C 8027F03C 24060029 */ addiu $a2, $zero, 0x29 /* 1AD920 8027F040 10400003 */ beqz $v0, .L8027F050 -/* 1AD924 8027F044 00000000 */ nop +/* 1AD924 8027F044 00000000 */ nop /* 1AD928 8027F048 241E0001 */ addiu $fp, $zero, 1 /* 1AD92C 8027F04C 03C0A82D */ daddu $s5, $fp, $zero .L8027F050: @@ -937,7 +937,7 @@ glabel calc_partner_damage_enemy /* 1AD944 8027F064 0C099ADE */ jal try_inflict_status /* 1AD948 8027F068 24060021 */ addiu $a2, $zero, 0x21 /* 1AD94C 8027F06C 10400003 */ beqz $v0, .L8027F07C -/* 1AD950 8027F070 00000000 */ nop +/* 1AD950 8027F070 00000000 */ nop /* 1AD954 8027F074 241E0001 */ addiu $fp, $zero, 1 /* 1AD958 8027F078 03C0A82D */ daddu $s5, $fp, $zero .L8027F07C: @@ -949,7 +949,7 @@ glabel calc_partner_damage_enemy /* 1AD970 8027F090 0C099ADE */ jal try_inflict_status /* 1AD974 8027F094 24060023 */ addiu $a2, $zero, 0x23 /* 1AD978 8027F098 10400003 */ beqz $v0, .L8027F0A8 -/* 1AD97C 8027F09C 00000000 */ nop +/* 1AD97C 8027F09C 00000000 */ nop /* 1AD980 8027F0A0 241E0001 */ addiu $fp, $zero, 1 /* 1AD984 8027F0A4 03C0A82D */ daddu $s5, $fp, $zero .L8027F0A8: @@ -962,7 +962,7 @@ glabel calc_partner_damage_enemy /* 1AD9A0 8027F0C0 0C099ADE */ jal try_inflict_status /* 1AD9A4 8027F0C4 24060026 */ addiu $a2, $zero, 0x26 /* 1AD9A8 8027F0C8 10400003 */ beqz $v0, .L8027F0D8 -/* 1AD9AC 8027F0CC 00000000 */ nop +/* 1AD9AC 8027F0CC 00000000 */ nop /* 1AD9B0 8027F0D0 241E0001 */ addiu $fp, $zero, 1 /* 1AD9B4 8027F0D4 03C0A82D */ daddu $s5, $fp, $zero .L8027F0D8: @@ -975,7 +975,7 @@ glabel calc_partner_damage_enemy /* 1AD9D0 8027F0F0 0C099ADE */ jal try_inflict_status /* 1AD9D4 8027F0F4 24060024 */ addiu $a2, $zero, 0x24 /* 1AD9D8 8027F0F8 10400003 */ beqz $v0, .L8027F108 -/* 1AD9DC 8027F0FC 00000000 */ nop +/* 1AD9DC 8027F0FC 00000000 */ nop /* 1AD9E0 8027F100 241E0001 */ addiu $fp, $zero, 1 /* 1AD9E4 8027F104 03C0A82D */ daddu $s5, $fp, $zero .L8027F108: @@ -998,7 +998,7 @@ glabel calc_partner_damage_enemy /* 1ADA24 8027F144 3C030040 */ lui $v1, 0x40 /* 1ADA28 8027F148 00431024 */ and $v0, $v0, $v1 /* 1ADA2C 8027F14C 10400023 */ beqz $v0, .L8027F1DC -/* 1ADA30 8027F150 00000000 */ nop +/* 1ADA30 8027F150 00000000 */ nop /* 1ADA34 8027F154 0C00A67F */ jal rand_int /* 1ADA38 8027F158 24040063 */ addiu $a0, $zero, 0x63 /* 1ADA3C 8027F15C 0050102A */ slt $v0, $v0, $s0 @@ -1012,7 +1012,7 @@ glabel calc_partner_damage_enemy /* 1ADA5C 8027F17C 8E620000 */ lw $v0, ($s3) /* 1ADA60 8027F180 30420400 */ andi $v0, $v0, 0x400 /* 1ADA64 8027F184 14400014 */ bnez $v0, .L8027F1D8 -/* 1ADA68 8027F188 00000000 */ nop +/* 1ADA68 8027F188 00000000 */ nop /* 1ADA6C 8027F18C 24110039 */ addiu $s1, $zero, 0x39 /* 1ADA70 8027F190 24150001 */ addiu $s5, $zero, 1 /* 1ADA74 8027F194 3C02800E */ lui $v0, %hi(gBattleStatus) @@ -1030,7 +1030,7 @@ glabel calc_partner_damage_enemy /* 1ADAA4 8027F1C4 0C052757 */ jal play_sound_at_position /* 1ADAA8 8027F1C8 0000282D */ daddu $a1, $zero, $zero /* 1ADAAC 8027F1CC 0809FC77 */ j .L8027F1DC -/* 1ADAB0 8027F1D0 00000000 */ nop +/* 1ADAB0 8027F1D0 00000000 */ nop .L8027F1D4: /* 1ADAB4 8027F1D4 24080002 */ addiu $t0, $zero, 2 .L8027F1D8: @@ -1079,7 +1079,7 @@ glabel calc_partner_damage_enemy /* 1ADB54 8027F274 8E620000 */ lw $v0, ($s3) /* 1ADB58 8027F278 30420400 */ andi $v0, $v0, 0x400 /* 1ADB5C 8027F27C 14400012 */ bnez $v0, .L8027F2C8 -/* 1ADB60 8027F280 00000000 */ nop +/* 1ADB60 8027F280 00000000 */ nop /* 1ADB64 8027F284 24110039 */ addiu $s1, $zero, 0x39 /* 1ADB68 8027F288 24150001 */ addiu $s5, $zero, 1 /* 1ADB6C 8027F28C AFA0001C */ sw $zero, 0x1c($sp) @@ -1110,12 +1110,12 @@ glabel calc_partner_damage_enemy /* 1ADBC0 8027F2E0 3C030200 */ lui $v1, 0x200 /* 1ADBC4 8027F2E4 00431024 */ and $v0, $v0, $v1 /* 1ADBC8 8027F2E8 1440002F */ bnez $v0, .L8027F3A8 -/* 1ADBCC 8027F2EC 00000000 */ nop +/* 1ADBCC 8027F2EC 00000000 */ nop /* 1ADBD0 8027F2F0 86870180 */ lh $a3, 0x180($s4) /* 1ADBD4 8027F2F4 14E0000F */ bnez $a3, .L8027F334 -/* 1ADBD8 8027F2F8 00000000 */ nop +/* 1ADBD8 8027F2F8 00000000 */ nop /* 1ADBDC 8027F2FC 17C0002C */ bnez $fp, .L8027F3B0 -/* 1ADBE0 8027F300 00000000 */ nop +/* 1ADBE0 8027F300 00000000 */ nop /* 1ADBE4 8027F304 16A00028 */ bnez $s5, .L8027F3A8 /* 1ADBE8 8027F308 24020001 */ addiu $v0, $zero, 1 /* 1ADBEC 8027F30C AFA20010 */ sw $v0, 0x10($sp) @@ -1127,7 +1127,7 @@ glabel calc_partner_damage_enemy /* 1ADC04 8027F324 0C093BF8 */ jal func_8024EFE0 /* 1ADC08 8027F328 0000382D */ daddu $a3, $zero, $zero /* 1ADC0C 8027F32C 0809FCEA */ j .L8027F3A8 -/* 1ADC10 8027F330 00000000 */ nop +/* 1ADC10 8027F330 00000000 */ nop .L8027F334: /* 1ADC14 8027F334 8FA80020 */ lw $t0, 0x20($sp) /* 1ADC18 8027F338 1500001B */ bnez $t0, .L8027F3A8 @@ -1142,7 +1142,7 @@ glabel calc_partner_damage_enemy /* 1ADC3C 8027F35C 0C09996B */ jal show_damage_popup /* 1ADC40 8027F360 8E460014 */ lw $a2, 0x14($s2) /* 1ADC44 8027F364 0809FCDF */ j .L8027F37C -/* 1ADC48 8027F368 00000000 */ nop +/* 1ADC48 8027F368 00000000 */ nop .L8027F36C: /* 1ADC4C 8027F36C C64C000C */ lwc1 $f12, 0xc($s2) /* 1ADC50 8027F370 C64E0010 */ lwc1 $f14, 0x10($s2) @@ -1152,7 +1152,7 @@ glabel calc_partner_damage_enemy /* 1ADC5C 8027F37C 8EC20004 */ lw $v0, 4($s6) /* 1ADC60 8027F380 30420004 */ andi $v0, $v0, 4 /* 1ADC64 8027F384 14400008 */ bnez $v0, .L8027F3A8 -/* 1ADC68 8027F388 00000000 */ nop +/* 1ADC68 8027F388 00000000 */ nop /* 1ADC6C 8027F38C 86820180 */ lh $v0, 0x180($s4) /* 1ADC70 8027F390 AFA20010 */ sw $v0, 0x10($sp) /* 1ADC74 8027F394 8E45000C */ lw $a1, 0xc($s2) @@ -1162,13 +1162,13 @@ glabel calc_partner_damage_enemy /* 1ADC84 8027F3A4 0260202D */ daddu $a0, $s3, $zero .L8027F3A8: /* 1ADC88 8027F3A8 13C00006 */ beqz $fp, .L8027F3C4 -/* 1ADC8C 8027F3AC 00000000 */ nop +/* 1ADC8C 8027F3AC 00000000 */ nop .L8027F3B0: /* 1ADC90 8027F3B0 3C02800E */ lui $v0, %hi(gBattleStatus) /* 1ADC94 8027F3B4 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1ADC98 8027F3B8 30420240 */ andi $v0, $v0, 0x240 /* 1ADC9C 8027F3BC 14400008 */ bnez $v0, .L8027F3E0 -/* 1ADCA0 8027F3C0 00000000 */ nop +/* 1ADCA0 8027F3C0 00000000 */ nop .L8027F3C4: /* 1ADCA4 8027F3C4 3C03800E */ lui $v1, %hi(gBattleStatus) /* 1ADCA8 8027F3C8 8C63C070 */ lw $v1, %lo(gBattleStatus)($v1) @@ -1176,7 +1176,7 @@ glabel calc_partner_damage_enemy /* 1ADCB0 8027F3D0 10400025 */ beqz $v0, .L8027F468 /* 1ADCB4 8027F3D4 30620080 */ andi $v0, $v1, 0x80 /* 1ADCB8 8027F3D8 14400023 */ bnez $v0, .L8027F468 -/* 1ADCBC 8027F3DC 00000000 */ nop +/* 1ADCBC 8027F3DC 00000000 */ nop .L8027F3E0: /* 1ADCC0 8027F3E0 86820180 */ lh $v0, 0x180($s4) /* 1ADCC4 8027F3E4 1840000A */ blez $v0, .L8027F410 @@ -1189,15 +1189,15 @@ glabel calc_partner_damage_enemy /* 1ADCE0 8027F400 0000282D */ daddu $a1, $zero, $zero /* 1ADCE4 8027F404 86820180 */ lh $v0, 0x180($s4) /* 1ADCE8 8027F408 1C400008 */ bgtz $v0, .L8027F42C -/* 1ADCEC 8027F40C 00000000 */ nop +/* 1ADCEC 8027F40C 00000000 */ nop .L8027F410: /* 1ADCF0 8027F410 8E820188 */ lw $v0, 0x188($s4) /* 1ADCF4 8027F414 3C034000 */ lui $v1, 0x4000 /* 1ADCF8 8027F418 00431024 */ and $v0, $v0, $v1 /* 1ADCFC 8027F41C 10400012 */ beqz $v0, .L8027F468 -/* 1ADD00 8027F420 00000000 */ nop +/* 1ADD00 8027F420 00000000 */ nop /* 1ADD04 8027F424 13C00010 */ beqz $fp, .L8027F468 -/* 1ADD08 8027F428 00000000 */ nop +/* 1ADD08 8027F428 00000000 */ nop .L8027F42C: /* 1ADD0C 8027F42C 3C02800E */ lui $v0, %hi(gBattleStatus) /* 1ADD10 8027F430 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) @@ -1221,16 +1221,16 @@ glabel calc_partner_damage_enemy /* 1ADD4C 8027F46C 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1ADD50 8027F470 30420020 */ andi $v0, $v0, 0x20 /* 1ADD54 8027F474 10400003 */ beqz $v0, .L8027F484 -/* 1ADD58 8027F478 00000000 */ nop +/* 1ADD58 8027F478 00000000 */ nop /* 1ADD5C 8027F47C 0C099A5C */ jal func_80266970 /* 1ADD60 8027F480 0260202D */ daddu $a0, $s3, $zero .L8027F484: /* 1ADD64 8027F484 86820180 */ lh $v0, 0x180($s4) /* 1ADD68 8027F488 1840002E */ blez $v0, .L8027F544 -/* 1ADD6C 8027F48C 00000000 */ nop +/* 1ADD6C 8027F48C 00000000 */ nop /* 1ADD70 8027F490 8FA80020 */ lw $t0, 0x20($sp) /* 1ADD74 8027F494 15000029 */ bnez $t0, .L8027F53C -/* 1ADD78 8027F498 00000000 */ nop +/* 1ADD78 8027F498 00000000 */ nop /* 1ADD7C 8027F49C 8FA80018 */ lw $t0, 0x18($sp) /* 1ADD80 8027F4A0 8D0201B0 */ lw $v0, 0x1b0($t0) /* 1ADD84 8027F4A4 10400009 */ beqz $v0, .L8027F4CC @@ -1278,17 +1278,17 @@ glabel calc_partner_damage_enemy /* 1ADE18 8027F538 86820180 */ lh $v0, 0x180($s4) .L8027F53C: /* 1ADE1C 8027F53C 1C400005 */ bgtz $v0, .L8027F554 -/* 1ADE20 8027F540 00000000 */ nop +/* 1ADE20 8027F540 00000000 */ nop .L8027F544: /* 1ADE24 8027F544 17C00003 */ bnez $fp, .L8027F554 -/* 1ADE28 8027F548 00000000 */ nop +/* 1ADE28 8027F548 00000000 */ nop /* 1ADE2C 8027F54C 12A00005 */ beqz $s5, .L8027F564 -/* 1ADE30 8027F550 00000000 */ nop +/* 1ADE30 8027F550 00000000 */ nop .L8027F554: /* 1ADE34 8027F554 8EC20000 */ lw $v0, ($s6) /* 1ADE38 8027F558 30422000 */ andi $v0, $v0, 0x2000 /* 1ADE3C 8027F55C 10400008 */ beqz $v0, .L8027F580 -/* 1ADE40 8027F560 00000000 */ nop +/* 1ADE40 8027F560 00000000 */ nop .L8027F564: /* 1ADE44 8027F564 C6400014 */ lwc1 $f0, 0x14($s2) /* 1ADE48 8027F568 2404010C */ addiu $a0, $zero, 0x10c @@ -1301,9 +1301,9 @@ glabel calc_partner_damage_enemy /* 1ADE60 8027F580 8E820190 */ lw $v0, 0x190($s4) /* 1ADE64 8027F584 30421000 */ andi $v0, $v0, 0x1000 /* 1ADE68 8027F588 10400018 */ beqz $v0, .L8027F5EC -/* 1ADE6C 8027F58C 00000000 */ nop +/* 1ADE6C 8027F58C 00000000 */ nop /* 1ADE70 8027F590 12A00016 */ beqz $s5, .L8027F5EC -/* 1ADE74 8027F594 00000000 */ nop +/* 1ADE74 8027F594 00000000 */ nop /* 1ADE78 8027F598 3C048029 */ lui $a0, %hi(DoSleepHit) /* 1ADE7C 8027F59C 248445E0 */ addiu $a0, $a0, %lo(DoSleepHit) /* 1ADE80 8027F5A0 2405000A */ addiu $a1, $zero, 0xa @@ -1330,9 +1330,9 @@ glabel calc_partner_damage_enemy /* 1ADED0 8027F5F0 3C030004 */ lui $v1, 4 /* 1ADED4 8027F5F4 00431024 */ and $v0, $v0, $v1 /* 1ADED8 8027F5F8 10400018 */ beqz $v0, .L8027F65C -/* 1ADEDC 8027F5FC 00000000 */ nop +/* 1ADEDC 8027F5FC 00000000 */ nop /* 1ADEE0 8027F600 12A00016 */ beqz $s5, .L8027F65C -/* 1ADEE4 8027F604 00000000 */ nop +/* 1ADEE4 8027F604 00000000 */ nop /* 1ADEE8 8027F608 3C048029 */ lui $a0, %hi(DoDizzyHit) /* 1ADEEC 8027F60C 248445FC */ addiu $a0, $a0, %lo(DoDizzyHit) /* 1ADEF0 8027F610 2405000A */ addiu $a1, $zero, 0xa @@ -1359,9 +1359,9 @@ glabel calc_partner_damage_enemy /* 1ADF40 8027F660 3C030001 */ lui $v1, 1 /* 1ADF44 8027F664 00431024 */ and $v0, $v0, $v1 /* 1ADF48 8027F668 10400018 */ beqz $v0, .L8027F6CC -/* 1ADF4C 8027F66C 00000000 */ nop +/* 1ADF4C 8027F66C 00000000 */ nop /* 1ADF50 8027F670 12A00016 */ beqz $s5, .L8027F6CC -/* 1ADF54 8027F674 00000000 */ nop +/* 1ADF54 8027F674 00000000 */ nop /* 1ADF58 8027F678 3C048029 */ lui $a0, %hi(DoParalyzeHit) /* 1ADF5C 8027F67C 24844618 */ addiu $a0, $a0, %lo(DoParalyzeHit) /* 1ADF60 8027F680 2405000A */ addiu $a1, $zero, 0xa @@ -1388,9 +1388,9 @@ glabel calc_partner_damage_enemy /* 1ADFB0 8027F6D0 3C030002 */ lui $v1, 2 /* 1ADFB4 8027F6D4 00431024 */ and $v0, $v0, $v1 /* 1ADFB8 8027F6D8 10400018 */ beqz $v0, .L8027F73C -/* 1ADFBC 8027F6DC 00000000 */ nop +/* 1ADFBC 8027F6DC 00000000 */ nop /* 1ADFC0 8027F6E0 12A00016 */ beqz $s5, .L8027F73C -/* 1ADFC4 8027F6E4 00000000 */ nop +/* 1ADFC4 8027F6E4 00000000 */ nop /* 1ADFC8 8027F6E8 3C048029 */ lui $a0, %hi(DoPoisonHit) /* 1ADFCC 8027F6EC 24844634 */ addiu $a0, $a0, %lo(DoPoisonHit) /* 1ADFD0 8027F6F0 2405000A */ addiu $a1, $zero, 0xa @@ -1417,9 +1417,9 @@ glabel calc_partner_damage_enemy /* 1AE020 8027F740 3C030020 */ lui $v1, 0x20 /* 1AE024 8027F744 00431024 */ and $v0, $v0, $v1 /* 1AE028 8027F748 10400018 */ beqz $v0, .L8027F7AC -/* 1AE02C 8027F74C 00000000 */ nop +/* 1AE02C 8027F74C 00000000 */ nop /* 1AE030 8027F750 12A00016 */ beqz $s5, .L8027F7AC -/* 1AE034 8027F754 00000000 */ nop +/* 1AE034 8027F754 00000000 */ nop /* 1AE038 8027F758 3C048029 */ lui $a0, %hi(DoStopHit) /* 1AE03C 8027F75C 24844650 */ addiu $a0, $a0, %lo(DoStopHit) /* 1AE040 8027F760 2405000A */ addiu $a1, $zero, 0xa @@ -1445,9 +1445,9 @@ glabel calc_partner_damage_enemy /* 1AE08C 8027F7AC 8E820190 */ lw $v0, 0x190($s4) /* 1AE090 8027F7B0 30424000 */ andi $v0, $v0, 0x4000 /* 1AE094 8027F7B4 10400019 */ beqz $v0, .L8027F81C -/* 1AE098 8027F7B8 00000000 */ nop +/* 1AE098 8027F7B8 00000000 */ nop /* 1AE09C 8027F7BC 12A00017 */ beqz $s5, .L8027F81C -/* 1AE0A0 8027F7C0 00000000 */ nop +/* 1AE0A0 8027F7C0 00000000 */ nop /* 1AE0A4 8027F7C4 3C048029 */ lui $a0, %hi(DoFreezeHit) /* 1AE0A8 8027F7C8 2484466C */ addiu $a0, $a0, %lo(DoFreezeHit) /* 1AE0AC 8027F7CC 2405000A */ addiu $a1, $zero, 0xa @@ -1475,9 +1475,9 @@ glabel calc_partner_damage_enemy /* 1AE100 8027F820 3C030008 */ lui $v1, 8 /* 1AE104 8027F824 00431024 */ and $v0, $v0, $v1 /* 1AE108 8027F828 10400019 */ beqz $v0, .L8027F890 -/* 1AE10C 8027F82C 00000000 */ nop +/* 1AE10C 8027F82C 00000000 */ nop /* 1AE110 8027F830 12A00017 */ beqz $s5, .L8027F890 -/* 1AE114 8027F834 00000000 */ nop +/* 1AE114 8027F834 00000000 */ nop /* 1AE118 8027F838 3C048029 */ lui $a0, %hi(DoShinkHit) /* 1AE11C 8027F83C 248446B8 */ addiu $a0, $a0, %lo(DoShinkHit) /* 1AE120 8027F840 2405000A */ addiu $a1, $zero, 0xa @@ -1521,7 +1521,7 @@ glabel calc_partner_damage_enemy /* 1AE1B0 8027F8D0 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 1AE1B4 8027F8D4 30420240 */ andi $v0, $v0, 0x240 /* 1AE1B8 8027F8D8 1040000A */ beqz $v0, .L8027F904 -/* 1AE1BC 8027F8DC 00000000 */ nop +/* 1AE1BC 8027F8DC 00000000 */ nop /* 1AE1C0 8027F8E0 8FA8001C */ lw $t0, 0x1c($sp) /* 1AE1C4 8027F8E4 15000004 */ bnez $t0, .L8027F8F8 /* 1AE1C8 8027F8E8 24020002 */ addiu $v0, $zero, 2 @@ -1537,24 +1537,24 @@ glabel calc_partner_damage_enemy /* 1AE1E8 8027F908 81020212 */ lb $v0, 0x212($t0) /* 1AE1EC 8027F90C 2403000B */ addiu $v1, $zero, 0xb /* 1AE1F0 8027F910 10430021 */ beq $v0, $v1, .L8027F998 -/* 1AE1F4 8027F914 00000000 */ nop +/* 1AE1F4 8027F914 00000000 */ nop /* 1AE1F8 8027F918 82620212 */ lb $v0, 0x212($s3) /* 1AE1FC 8027F91C 10430005 */ beq $v0, $v1, .L8027F934 -/* 1AE200 8027F920 00000000 */ nop +/* 1AE200 8027F920 00000000 */ nop /* 1AE204 8027F924 8EC2007C */ lw $v0, 0x7c($s6) /* 1AE208 8027F928 30420080 */ andi $v0, $v0, 0x80 /* 1AE20C 8027F92C 1040001A */ beqz $v0, .L8027F998 -/* 1AE210 8027F930 00000000 */ nop +/* 1AE210 8027F930 00000000 */ nop .L8027F934: /* 1AE214 8027F934 8E820188 */ lw $v0, 0x188($s4) /* 1AE218 8027F938 3C031000 */ lui $v1, 0x1000 /* 1AE21C 8027F93C 00431024 */ and $v0, $v0, $v1 /* 1AE220 8027F940 14400015 */ bnez $v0, .L8027F998 -/* 1AE224 8027F944 00000000 */ nop +/* 1AE224 8027F944 00000000 */ nop /* 1AE228 8027F948 8E82018C */ lw $v0, 0x18c($s4) /* 1AE22C 8027F94C 30420008 */ andi $v0, $v0, 8 /* 1AE230 8027F950 14400011 */ bnez $v0, .L8027F998 -/* 1AE234 8027F954 00000000 */ nop +/* 1AE234 8027F954 00000000 */ nop .L8027F958: /* 1AE238 8027F958 C6400014 */ lwc1 $f0, 0x14($s2) /* 1AE23C 8027F95C 2404037B */ addiu $a0, $zero, 0x37b @@ -1565,12 +1565,12 @@ glabel calc_partner_damage_enemy /* 1AE250 8027F970 0000282D */ daddu $a1, $zero, $zero /* 1AE254 8027F974 8FA40018 */ lw $a0, 0x18($sp) /* 1AE258 8027F978 0C09451D */ jal func_80251474 -/* 1AE25C 8027F97C 00000000 */ nop +/* 1AE25C 8027F97C 00000000 */ nop /* 1AE260 8027F980 24040001 */ addiu $a0, $zero, 1 /* 1AE264 8027F984 2405002F */ addiu $a1, $zero, 0x2f .L8027F988: /* 1AE268 8027F988 0C09FEE7 */ jal dispatch_damage_event_partner_1 -/* 1AE26C 8027F98C 00000000 */ nop +/* 1AE26C 8027F98C 00000000 */ nop /* 1AE270 8027F990 0809FE67 */ j .L8027F99C /* 1AE274 8027F994 2402FFFF */ addiu $v0, $zero, -1 .L8027F998: diff --git a/asm/nonmatchings/code_1AC760/calc_partner_test_enemy.s b/asm/nonmatchings/code_1AC760/calc_partner_test_enemy.s index f56f1f6706..ddfbf6908d 100644 --- a/asm/nonmatchings/code_1AC760/calc_partner_test_enemy.s +++ b/asm/nonmatchings/code_1AC760/calc_partner_test_enemy.s @@ -30,7 +30,7 @@ glabel calc_partner_test_enemy /* 1AC8C0 8027DFE0 2402000C */ addiu $v0, $zero, 0xc .L8027DFE4: /* 1AC8C4 8027DFE4 0809F7F9 */ j .L8027DFE4 -/* 1AC8C8 8027DFE8 00000000 */ nop +/* 1AC8C8 8027DFE8 00000000 */ nop .L8027DFEC: /* 1AC8CC 8027DFEC 82630214 */ lb $v1, 0x214($s3) /* 1AC8D0 8027DFF0 106200C5 */ beq $v1, $v0, .L8027E308 @@ -100,15 +100,15 @@ glabel calc_partner_test_enemy /* 1AC9C4 8027E0E4 34630040 */ ori $v1, $v1, 0x40 /* 1AC9C8 8027E0E8 00431024 */ and $v0, $v0, $v1 /* 1AC9CC 8027E0EC 14400009 */ bnez $v0, .L8027E114 -/* 1AC9D0 8027E0F0 00000000 */ nop +/* 1AC9D0 8027E0F0 00000000 */ nop /* 1AC9D4 8027E0F4 8E42007C */ lw $v0, 0x7c($s2) /* 1AC9D8 8027E0F8 30420002 */ andi $v0, $v0, 2 /* 1AC9DC 8027E0FC 10400005 */ beqz $v0, .L8027E114 -/* 1AC9E0 8027E100 00000000 */ nop +/* 1AC9E0 8027E100 00000000 */ nop /* 1AC9E4 8027E104 8E22018C */ lw $v0, 0x18c($s1) /* 1AC9E8 8027E108 30420010 */ andi $v0, $v0, 0x10 /* 1AC9EC 8027E10C 1040006B */ beqz $v0, .L8027E2BC -/* 1AC9F0 8027E110 00000000 */ nop +/* 1AC9F0 8027E110 00000000 */ nop .L8027E114: /* 1AC9F4 8027E114 8E230188 */ lw $v1, 0x188($s1) /* 1AC9F8 8027E118 30628000 */ andi $v0, $v1, 0x8000 @@ -116,15 +116,15 @@ glabel calc_partner_test_enemy /* 1ACA00 8027E120 3C021000 */ lui $v0, 0x1000 /* 1ACA04 8027E124 00621024 */ and $v0, $v1, $v0 /* 1ACA08 8027E128 14400036 */ bnez $v0, .L8027E204 -/* 1ACA0C 8027E12C 00000000 */ nop +/* 1ACA0C 8027E12C 00000000 */ nop /* 1ACA10 8027E130 8E42007C */ lw $v0, 0x7c($s2) /* 1ACA14 8027E134 30420010 */ andi $v0, $v0, 0x10 /* 1ACA18 8027E138 10400015 */ beqz $v0, .L8027E190 -/* 1ACA1C 8027E13C 00000000 */ nop +/* 1ACA1C 8027E13C 00000000 */ nop /* 1ACA20 8027E140 8E620000 */ lw $v0, ($s3) /* 1ACA24 8027E144 30420800 */ andi $v0, $v0, 0x800 /* 1ACA28 8027E148 14400011 */ bnez $v0, .L8027E190 -/* 1ACA2C 8027E14C 00000000 */ nop +/* 1ACA2C 8027E14C 00000000 */ nop /* 1ACA30 8027E150 8E22018C */ lw $v0, 0x18c($s1) /* 1ACA34 8027E154 30420001 */ andi $v0, $v0, 1 /* 1ACA38 8027E158 1440000D */ bnez $v0, .L8027E190 @@ -150,11 +150,11 @@ glabel calc_partner_test_enemy /* 1ACA84 8027E1A4 8E42007C */ lw $v0, 0x7c($s2) /* 1ACA88 8027E1A8 00431024 */ and $v0, $v0, $v1 /* 1ACA8C 8027E1AC 10400015 */ beqz $v0, .L8027E204 -/* 1ACA90 8027E1B0 00000000 */ nop +/* 1ACA90 8027E1B0 00000000 */ nop /* 1ACA94 8027E1B4 8E620000 */ lw $v0, ($s3) /* 1ACA98 8027E1B8 30420800 */ andi $v0, $v0, 0x800 /* 1ACA9C 8027E1BC 14400011 */ bnez $v0, .L8027E204 -/* 1ACAA0 8027E1C0 00000000 */ nop +/* 1ACAA0 8027E1C0 00000000 */ nop /* 1ACAA4 8027E1C4 8E22018C */ lw $v0, 0x18c($s1) /* 1ACAA8 8027E1C8 30420080 */ andi $v0, $v0, 0x80 /* 1ACAAC 8027E1CC 1440000D */ bnez $v0, .L8027E204 @@ -178,7 +178,7 @@ glabel calc_partner_test_enemy /* 1ACAF0 8027E210 3C031000 */ lui $v1, 0x1000 /* 1ACAF4 8027E214 82620212 */ lb $v0, 0x212($s3) /* 1ACAF8 8027E218 10430005 */ beq $v0, $v1, .L8027E230 -/* 1ACAFC 8027E21C 00000000 */ nop +/* 1ACAFC 8027E21C 00000000 */ nop /* 1ACB00 8027E220 8E42007C */ lw $v0, 0x7c($s2) /* 1ACB04 8027E224 30420080 */ andi $v0, $v0, 0x80 /* 1ACB08 8027E228 10400017 */ beqz $v0, .L8027E288 @@ -188,7 +188,7 @@ glabel calc_partner_test_enemy /* 1ACB14 8027E234 3C031000 */ lui $v1, 0x1000 /* 1ACB18 8027E238 00431024 */ and $v0, $v0, $v1 /* 1ACB1C 8027E23C 14400012 */ bnez $v0, .L8027E288 -/* 1ACB20 8027E240 00000000 */ nop +/* 1ACB20 8027E240 00000000 */ nop /* 1ACB24 8027E244 8E22018C */ lw $v0, 0x18c($s1) /* 1ACB28 8027E248 30420008 */ andi $v0, $v0, 8 /* 1ACB2C 8027E24C 1440000E */ bnez $v0, .L8027E288 @@ -215,11 +215,11 @@ glabel calc_partner_test_enemy /* 1ACB7C 8027E29C 8E42007C */ lw $v0, 0x7c($s2) /* 1ACB80 8027E2A0 30420002 */ andi $v0, $v0, 2 /* 1ACB84 8027E2A4 10400015 */ beqz $v0, .L8027E2FC -/* 1ACB88 8027E2A8 00000000 */ nop +/* 1ACB88 8027E2A8 00000000 */ nop /* 1ACB8C 8027E2AC 8E22018C */ lw $v0, 0x18c($s1) /* 1ACB90 8027E2B0 30420010 */ andi $v0, $v0, 0x10 /* 1ACB94 8027E2B4 14400011 */ bnez $v0, .L8027E2FC -/* 1ACB98 8027E2B8 00000000 */ nop +/* 1ACB98 8027E2B8 00000000 */ nop .L8027E2BC: /* 1ACB9C 8027E2BC C6000014 */ lwc1 $f0, 0x14($s0) /* 1ACBA0 8027E2C0 240400EA */ addiu $a0, $zero, 0xea @@ -235,7 +235,7 @@ glabel calc_partner_test_enemy /* 1ACBC8 8027E2E8 2405001C */ addiu $a1, $zero, 0x1c .L8027E2EC: /* 1ACBCC 8027E2EC 0C09DC58 */ jal dispatch_event_actor -/* 1ACBD0 8027E2F0 00000000 */ nop +/* 1ACBD0 8027E2F0 00000000 */ nop /* 1ACBD4 8027E2F4 0809F8C2 */ j .L8027E308 /* 1ACBD8 8027E2F8 2402FFFF */ addiu $v0, $zero, -1 .L8027E2FC: diff --git a/asm/nonmatchings/code_1AC760/dispatch_event_partner.s b/asm/nonmatchings/code_1AC760/dispatch_event_partner.s index 87f5e60df9..fa615b6e72 100644 --- a/asm/nonmatchings/code_1AC760/dispatch_event_partner.s +++ b/asm/nonmatchings/code_1AC760/dispatch_event_partner.s @@ -23,13 +23,13 @@ glabel dispatch_event_partner /* 1AC7A8 8027DEC8 AC430148 */ sw $v1, 0x148($v0) /* 1AC7AC 8027DECC 8E0201D4 */ lw $v0, 0x1d4($s0) /* 1AC7B0 8027DED0 10400004 */ beqz $v0, .L8027DEE4 -/* 1AC7B4 8027DED4 00000000 */ nop +/* 1AC7B4 8027DED4 00000000 */ nop /* 1AC7B8 8027DED8 0C0B102B */ jal kill_script_by_ID /* 1AC7BC 8027DEDC 8E0401E4 */ lw $a0, 0x1e4($s0) /* 1AC7C0 8027DEE0 AE0001D4 */ sw $zero, 0x1d4($s0) .L8027DEE4: /* 1AC7C4 8027DEE4 12200003 */ beqz $s1, .L8027DEF4 -/* 1AC7C8 8027DEE8 00000000 */ nop +/* 1AC7C8 8027DEE8 00000000 */ nop /* 1AC7CC 8027DEEC 0C0B102B */ jal kill_script_by_ID /* 1AC7D0 8027DEF0 0240202D */ daddu $a0, $s2, $zero .L8027DEF4: diff --git a/asm/nonmatchings/code_1AC760/func_8027FC90.s b/asm/nonmatchings/code_1AC760/func_8027FC90.s index d3839cf7ac..6d83494f70 100644 --- a/asm/nonmatchings/code_1AC760/func_8027FC90.s +++ b/asm/nonmatchings/code_1AC760/func_8027FC90.s @@ -19,7 +19,7 @@ glabel func_8027FC90 /* 1AE5A8 8027FCC8 2673C070 */ addiu $s3, $s3, %lo(gBattleStatus) /* 1AE5AC 8027FCCC 2402FF81 */ addiu $v0, $zero, -0x7f /* 1AE5B0 8027FCD0 14820002 */ bne $a0, $v0, .L8027FCDC -/* 1AE5B4 8027FCD4 00000000 */ nop +/* 1AE5B4 8027FCD4 00000000 */ nop /* 1AE5B8 8027FCD8 8E840148 */ lw $a0, 0x148($s4) .L8027FCDC: /* 1AE5BC 8027FCDC 0C09A75B */ jal get_actor diff --git a/asm/nonmatchings/code_1AC760/func_802807D0.s b/asm/nonmatchings/code_1AC760/func_802807D0.s index 15927ffbe2..84ef70f0d3 100644 --- a/asm/nonmatchings/code_1AC760/func_802807D0.s +++ b/asm/nonmatchings/code_1AC760/func_802807D0.s @@ -17,7 +17,7 @@ glabel func_802807D0 /* 1AF0DC 802807FC 0060302D */ daddu $a2, $v1, $zero .L80280800: /* 1AF0E0 80280800 0C0B2026 */ jal set_variable -/* 1AF0E4 80280804 00000000 */ nop +/* 1AF0E4 80280804 00000000 */ nop /* 1AF0E8 80280808 8FBF0010 */ lw $ra, 0x10($sp) /* 1AF0EC 8028080C 24020002 */ addiu $v0, $zero, 2 /* 1AF0F0 80280810 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_1AC760/func_80280818.s b/asm/nonmatchings/code_1AC760/func_80280818.s index 283ea2da55..da20627271 100644 --- a/asm/nonmatchings/code_1AC760/func_80280818.s +++ b/asm/nonmatchings/code_1AC760/func_80280818.s @@ -10,5 +10,5 @@ glabel func_80280818 /* 1AF10C 8028082C AC430000 */ sw $v1, ($v0) /* 1AF110 80280830 03E00008 */ jr $ra /* 1AF114 80280834 24020002 */ addiu $v0, $zero, 2 -/* 1AF118 80280838 00000000 */ nop -/* 1AF11C 8028083C 00000000 */ nop +/* 1AF118 80280838 00000000 */ nop +/* 1AF11C 8028083C 00000000 */ nop diff --git a/asm/nonmatchings/code_1AF230/LoadStarPowerScript.s b/asm/nonmatchings/code_1AF230/LoadStarPowerScript.s index 8b882c5df1..d055de02c2 100644 --- a/asm/nonmatchings/code_1AF230/LoadStarPowerScript.s +++ b/asm/nonmatchings/code_1AF230/LoadStarPowerScript.s @@ -39,6 +39,6 @@ glabel LoadStarPowerScript /* 1AF2B8 802809D8 24020002 */ addiu $v0, $zero, 2 /* 1AF2BC 802809DC 03E00008 */ jr $ra /* 1AF2C0 802809E0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 1AF2C4 802809E4 00000000 */ nop -/* 1AF2C8 802809E8 00000000 */ nop -/* 1AF2CC 802809EC 00000000 */ nop +/* 1AF2C4 802809E4 00000000 */ nop +/* 1AF2C8 802809E8 00000000 */ nop +/* 1AF2CC 802809EC 00000000 */ nop diff --git a/asm/nonmatchings/code_1a1f0_len_5390/OnDefeatEnemy.s b/asm/nonmatchings/code_1a1f0_len_5390/OnDefeatEnemy.s index b7916d4417..9bea75b99b 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/OnDefeatEnemy.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/OnDefeatEnemy.s @@ -34,7 +34,7 @@ glabel OnDefeatEnemy /* 1A9E8 8003F5E8 8E430074 */ lw $v1, 0x74($s2) /* 1A9EC 8003F5EC 2402000F */ addiu $v0, $zero, 0xf /* 1A9F0 8003F5F0 1462001A */ bne $v1, $v0, .L8003F65C -/* 1A9F4 8003F5F4 00000000 */ nop +/* 1A9F4 8003F5F4 00000000 */ nop /* 1A9F8 8003F5F8 0C05272D */ jal play_sound /* 1A9FC 8003F5FC 240403E5 */ addiu $a0, $zero, 0x3e5 /* 1AA00 8003F600 962300A8 */ lhu $v1, 0xa8($s1) @@ -51,7 +51,7 @@ glabel OnDefeatEnemy /* 1AA2C 8003F62C 00431021 */ addu $v0, $v0, $v1 /* 1AA30 8003F630 00021043 */ sra $v0, $v0, 1 /* 1AA34 8003F634 44820000 */ mtc1 $v0, $f0 -/* 1AA38 8003F638 00000000 */ nop +/* 1AA38 8003F638 00000000 */ nop /* 1AA3C 8003F63C 46800020 */ cvt.s.w $f0, $f0 /* 1AA40 8003F640 46002100 */ add.s $f4, $f4, $f0 /* 1AA44 8003F644 E7A20014 */ swc1 $f2, 0x14($sp) @@ -64,7 +64,7 @@ glabel OnDefeatEnemy /* 1AA5C 8003F65C 8E500074 */ lw $s0, 0x74($s2) /* 1AA60 8003F660 2402000A */ addiu $v0, $zero, 0xa /* 1AA64 8003F664 1602000F */ bne $s0, $v0, .L8003F6A4 -/* 1AA68 8003F668 00000000 */ nop +/* 1AA68 8003F668 00000000 */ nop /* 1AA6C 8003F66C 3C014120 */ lui $at, 0x4120 /* 1AA70 8003F670 44811000 */ mtc1 $at, $f2 /* 1AA74 8003F674 C6200040 */ lwc1 $f0, 0x40($s1) diff --git a/asm/nonmatchings/code_1a1f0_len_5390/create_npcs.s b/asm/nonmatchings/code_1a1f0_len_5390/create_npcs.s index 354584ea0a..04a344646a 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/create_npcs.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/create_npcs.s @@ -28,19 +28,19 @@ glabel create_npcs /* 1EB0C 8004370C 50400005 */ beql $v0, $zero, .L80043724 /* 1EB10 80043710 24020002 */ addiu $v0, $zero, 2 /* 1EB14 80043714 10600007 */ beqz $v1, .L80043734 -/* 1EB18 80043718 00000000 */ nop +/* 1EB18 80043718 00000000 */ nop /* 1EB1C 8004371C 08011044 */ j .L80044110 -/* 1EB20 80043720 00000000 */ nop +/* 1EB20 80043720 00000000 */ nop .L80043724: /* 1EB24 80043724 106201EF */ beq $v1, $v0, .L80043EE4 /* 1EB28 80043728 0000A82D */ daddu $s5, $zero, $zero /* 1EB2C 8004372C 08011044 */ j .L80044110 -/* 1EB30 80043730 00000000 */ nop +/* 1EB30 80043730 00000000 */ nop .L80043734: /* 1EB34 80043734 3C02800B */ lui $v0, %hi(gCurrentEncounter+0x21) /* 1EB38 80043738 80420F31 */ lb $v0, %lo(gCurrentEncounter+0x21)($v0) /* 1EB3C 8004373C 1044002A */ beq $v0, $a0, .L800437E8 -/* 1EB40 80043740 00000000 */ nop +/* 1EB40 80043740 00000000 */ nop /* 1EB44 80043744 0000982D */ daddu $s3, $zero, $zero /* 1EB48 80043748 3C03800B */ lui $v1, %hi(gCurrentEncounter) /* 1EB4C 8004374C 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) @@ -110,7 +110,7 @@ glabel create_npcs /* 1EC34 80043834 AC540028 */ sw $s4, 0x28($v0) .L80043838: /* 1EC38 80043838 08010E0E */ j .L80043838 -/* 1EC3C 8004383C 00000000 */ nop +/* 1EC3C 8004383C 00000000 */ nop .L80043840: /* 1EC40 80043840 8FA80024 */ lw $t0, 0x24($sp) /* 1EC44 80043844 AE880000 */ sw $t0, ($s4) @@ -133,7 +133,7 @@ glabel create_npcs /* 1EC84 80043884 0C00FB7C */ jal get_defeated /* 1EC88 80043888 00B32821 */ addu $a1, $a1, $s3 /* 1EC8C 8004388C 10400006 */ beqz $v0, .L800438A8 -/* 1EC90 80043890 00000000 */ nop +/* 1EC90 80043890 00000000 */ nop /* 1EC94 80043894 265201F0 */ addiu $s2, $s2, 0x1f0 /* 1EC98 80043898 8FA80030 */ lw $t0, 0x30($sp) /* 1EC9C 8004389C 26F701F0 */ addiu $s7, $s7, 0x1f0 @@ -148,7 +148,7 @@ glabel create_npcs /* 1ECBC 800438BC ACE20004 */ sw $v0, 4($a3) .L800438C0: /* 1ECC0 800438C0 08010E30 */ j .L800438C0 -/* 1ECC4 800438C4 00000000 */ nop +/* 1ECC4 800438C4 00000000 */ nop .L800438C8: /* 1ECC8 800438C8 2403000F */ addiu $v1, $zero, 0xf /* 1ECCC 800438CC 2602003C */ addiu $v0, $s0, 0x3c @@ -232,7 +232,7 @@ glabel create_npcs /* 1EDF8 800439F8 10800012 */ beqz $a0, .L80043A44 /* 1EDFC 800439FC 24020001 */ addiu $v0, $zero, 1 /* 1EE00 80043A00 14820004 */ bne $a0, $v0, .L80043A14 -/* 1EE04 80043A04 00000000 */ nop +/* 1EE04 80043A04 00000000 */ nop /* 1EE08 80043A08 8E42FFFC */ lw $v0, -4($s2) /* 1EE0C 80043A0C 08010E91 */ j .L80043A44 /* 1EE10 80043A10 AE02006C */ sw $v0, 0x6c($s0) @@ -265,12 +265,12 @@ glabel create_npcs /* 1EE6C 80043A6C 3C030002 */ lui $v1, 2 /* 1EE70 80043A70 00431024 */ and $v0, $v0, $v1 /* 1EE74 80043A74 14400006 */ bnez $v0, .L80043A90 -/* 1EE78 80043A78 00000000 */ nop +/* 1EE78 80043A78 00000000 */ nop /* 1EE7C 80043A7C 8E4501C4 */ lw $a1, 0x1c4($s2) /* 1EE80 80043A80 0C00E219 */ jal create_standard_npc /* 1EE84 80043A84 03C0202D */ daddu $a0, $fp, $zero /* 1EE88 80043A88 08010EA6 */ j .L80043A98 -/* 1EE8C 80043A8C 00000000 */ nop +/* 1EE8C 80043A8C 00000000 */ nop .L80043A90: /* 1EE90 80043A90 0C00E220 */ jal create_partner_npc /* 1EE94 80043A94 03C0202D */ daddu $a0, $fp, $zero @@ -309,11 +309,11 @@ glabel create_npcs /* 1EF14 80043B14 A6220090 */ sh $v0, 0x90($s1) /* 1EF18 80043B18 4600010D */ trunc.w.s $f4, $f0 /* 1EF1C 80043B1C 44022000 */ mfc1 $v0, $f4 -/* 1EF20 80043B20 00000000 */ nop +/* 1EF20 80043B20 00000000 */ nop /* 1EF24 80043B24 A6220092 */ sh $v0, 0x92($s1) /* 1EF28 80043B28 4600110D */ trunc.w.s $f4, $f2 /* 1EF2C 80043B2C 44022000 */ mfc1 $v0, $f4 -/* 1EF30 80043B30 00000000 */ nop +/* 1EF30 80043B30 00000000 */ nop /* 1EF34 80043B34 A6220094 */ sh $v0, 0x94($s1) /* 1EF38 80043B38 C6440000 */ lwc1 $f4, ($s2) /* 1EF3C 80043B3C 46802120 */ cvt.s.w $f4, $f4 @@ -327,25 +327,25 @@ glabel create_npcs /* 1EF5C 80043B5C 44811800 */ mtc1 $at, $f3 /* 1EF60 80043B60 44801000 */ mtc1 $zero, $f2 /* 1EF64 80043B64 44820000 */ mtc1 $v0, $f0 -/* 1EF68 80043B68 00000000 */ nop +/* 1EF68 80043B68 00000000 */ nop /* 1EF6C 80043B6C 46800021 */ cvt.d.w $f0, $f0 /* 1EF70 80043B70 4620103E */ c.le.d $f2, $f0 -/* 1EF74 80043B74 00000000 */ nop +/* 1EF74 80043B74 00000000 */ nop /* 1EF78 80043B78 45000004 */ bc1f .L80043B8C -/* 1EF7C 80043B7C 00000000 */ nop +/* 1EF7C 80043B7C 00000000 */ nop /* 1EF80 80043B80 46220003 */ div.d $f0, $f0, $f2 /* 1EF84 80043B84 08010EE6 */ j .L80043B98 /* 1EF88 80043B88 46200020 */ cvt.s.d $f0, $f0 .L80043B8C: /* 1EF8C 80043B8C 3C013F80 */ lui $at, 0x3f80 /* 1EF90 80043B90 44810000 */ mtc1 $at, $f0 -/* 1EF94 80043B94 00000000 */ nop +/* 1EF94 80043B94 00000000 */ nop .L80043B98: /* 1EF98 80043B98 E620007C */ swc1 $f0, 0x7c($s1) /* 1EF9C 80043B9C 8E020000 */ lw $v0, ($s0) /* 1EFA0 80043BA0 30420100 */ andi $v0, $v0, 0x100 /* 1EFA4 80043BA4 10400004 */ beqz $v0, .L80043BB8 -/* 1EFA8 80043BA8 00000000 */ nop +/* 1EFA8 80043BA8 00000000 */ nop /* 1EFAC 80043BAC 8E220000 */ lw $v0, ($s1) /* 1EFB0 80043BB0 34420040 */ ori $v0, $v0, 0x40 /* 1EFB4 80043BB4 AE220000 */ sw $v0, ($s1) @@ -353,7 +353,7 @@ glabel create_npcs /* 1EFB8 80043BB8 8E020000 */ lw $v0, ($s0) /* 1EFBC 80043BBC 30420200 */ andi $v0, $v0, 0x200 /* 1EFC0 80043BC0 10400004 */ beqz $v0, .L80043BD4 -/* 1EFC4 80043BC4 00000000 */ nop +/* 1EFC4 80043BC4 00000000 */ nop /* 1EFC8 80043BC8 8E220000 */ lw $v0, ($s1) /* 1EFCC 80043BCC 34420100 */ ori $v0, $v0, 0x100 /* 1EFD0 80043BD0 AE220000 */ sw $v0, ($s1) @@ -361,7 +361,7 @@ glabel create_npcs /* 1EFD4 80043BD4 8E020000 */ lw $v0, ($s0) /* 1EFD8 80043BD8 30420400 */ andi $v0, $v0, 0x400 /* 1EFDC 80043BDC 10400004 */ beqz $v0, .L80043BF0 -/* 1EFE0 80043BE0 00000000 */ nop +/* 1EFE0 80043BE0 00000000 */ nop /* 1EFE4 80043BE4 8E220000 */ lw $v0, ($s1) /* 1EFE8 80043BE8 34428000 */ ori $v0, $v0, 0x8000 /* 1EFEC 80043BEC AE220000 */ sw $v0, ($s1) @@ -369,7 +369,7 @@ glabel create_npcs /* 1EFF0 80043BF0 8E020000 */ lw $v0, ($s0) /* 1EFF4 80043BF4 30420800 */ andi $v0, $v0, 0x800 /* 1EFF8 80043BF8 10400004 */ beqz $v0, .L80043C0C -/* 1EFFC 80043BFC 00000000 */ nop +/* 1EFFC 80043BFC 00000000 */ nop /* 1F000 80043C00 8E220000 */ lw $v0, ($s1) /* 1F004 80043C04 34420008 */ ori $v0, $v0, 8 /* 1F008 80043C08 AE220000 */ sw $v0, ($s1) @@ -377,7 +377,7 @@ glabel create_npcs /* 1F00C 80043C0C 8E020000 */ lw $v0, ($s0) /* 1F010 80043C10 30421000 */ andi $v0, $v0, 0x1000 /* 1F014 80043C14 10400004 */ beqz $v0, .L80043C28 -/* 1F018 80043C18 00000000 */ nop +/* 1F018 80043C18 00000000 */ nop /* 1F01C 80043C1C 8E220000 */ lw $v0, ($s1) /* 1F020 80043C20 34420200 */ ori $v0, $v0, 0x200 /* 1F024 80043C24 AE220000 */ sw $v0, ($s1) @@ -385,7 +385,7 @@ glabel create_npcs /* 1F028 80043C28 8E020000 */ lw $v0, ($s0) /* 1F02C 80043C2C 30420001 */ andi $v0, $v0, 1 /* 1F030 80043C30 14400004 */ bnez $v0, .L80043C44 -/* 1F034 80043C34 00000000 */ nop +/* 1F034 80043C34 00000000 */ nop /* 1F038 80043C38 8E220000 */ lw $v0, ($s1) /* 1F03C 80043C3C 34420100 */ ori $v0, $v0, 0x100 /* 1F040 80043C40 AE220000 */ sw $v0, ($s1) @@ -401,7 +401,7 @@ glabel create_npcs /* 1F060 80043C60 8E020000 */ lw $v0, ($s0) /* 1F064 80043C64 30422000 */ andi $v0, $v0, 0x2000 /* 1F068 80043C68 10400004 */ beqz $v0, .L80043C7C -/* 1F06C 80043C6C 00000000 */ nop +/* 1F06C 80043C6C 00000000 */ nop /* 1F070 80043C70 8E220000 */ lw $v0, ($s1) /* 1F074 80043C74 34420020 */ ori $v0, $v0, 0x20 /* 1F078 80043C78 AE220000 */ sw $v0, ($s1) @@ -426,7 +426,7 @@ glabel create_npcs /* 1F0B8 80043CB8 8E020000 */ lw $v0, ($s0) /* 1F0BC 80043CBC 30420080 */ andi $v0, $v0, 0x80 /* 1F0C0 80043CC0 10400004 */ beqz $v0, .L80043CD4 -/* 1F0C4 80043CC4 00000000 */ nop +/* 1F0C4 80043CC4 00000000 */ nop /* 1F0C8 80043CC8 8E220000 */ lw $v0, ($s1) /* 1F0CC 80043CCC 34420400 */ ori $v0, $v0, 0x400 /* 1F0D0 80043CD0 AE220000 */ sw $v0, ($s1) @@ -484,7 +484,7 @@ glabel create_npcs /* 1F188 80043D88 3C01800A */ lui $at, %hi(D_8009A5D0) /* 1F18C 80043D8C AC22A5D0 */ sw $v0, %lo(D_8009A5D0)($at) /* 1F190 80043D90 08011044 */ j .L80044110 -/* 1F194 80043D94 00000000 */ nop +/* 1F194 80043D94 00000000 */ nop .L80043D98: /* 1F198 80043D98 0000A82D */ daddu $s5, $zero, $zero /* 1F19C 80043D9C 3C02800B */ lui $v0, %hi(gCurrentEncounter+0x1C) @@ -496,7 +496,7 @@ glabel create_npcs .L80043DB4: /* 1F1B4 80043DB4 8E540028 */ lw $s4, 0x28($s2) /* 1F1B8 80043DB8 12800014 */ beqz $s4, .L80043E0C -/* 1F1BC 80043DBC 00000000 */ nop +/* 1F1BC 80043DBC 00000000 */ nop /* 1F1C0 80043DC0 8E820000 */ lw $v0, ($s4) /* 1F1C4 80043DC4 18400011 */ blez $v0, .L80043E0C /* 1F1C8 80043DC8 0000982D */ daddu $s3, $zero, $zero @@ -504,10 +504,10 @@ glabel create_npcs .L80043DD0: /* 1F1D0 80043DD0 8E300004 */ lw $s0, 4($s1) /* 1F1D4 80043DD4 12000008 */ beqz $s0, .L80043DF8 -/* 1F1D8 80043DD8 00000000 */ nop +/* 1F1D8 80043DD8 00000000 */ nop /* 1F1DC 80043DDC 8E02003C */ lw $v0, 0x3c($s0) /* 1F1E0 80043DE0 10400005 */ beqz $v0, .L80043DF8 -/* 1F1E4 80043DE4 00000000 */ nop +/* 1F1E4 80043DE4 00000000 */ nop /* 1F1E8 80043DE8 0C0B1059 */ jal does_script_exist /* 1F1EC 80043DEC 8E040054 */ lw $a0, 0x54($s0) /* 1F1F0 80043DF0 54400001 */ bnel $v0, $zero, .L80043DF8 @@ -527,7 +527,7 @@ glabel create_npcs /* 1F220 80043E20 26520004 */ addiu $s2, $s2, 4 .L80043E24: /* 1F224 80043E24 16A000BA */ bnez $s5, .L80044110 -/* 1F228 80043E28 00000000 */ nop +/* 1F228 80043E28 00000000 */ nop /* 1F22C 80043E2C 3C02800B */ lui $v0, %hi(gCurrentEncounter+0x1C) /* 1F230 80043E30 80420F2C */ lb $v0, %lo(gCurrentEncounter+0x1C)($v0) /* 1F234 80043E34 18400026 */ blez $v0, .L80043ED0 @@ -537,7 +537,7 @@ glabel create_npcs .L80043E44: /* 1F244 80043E44 8E540028 */ lw $s4, 0x28($s2) /* 1F248 80043E48 1280001B */ beqz $s4, .L80043EB8 -/* 1F24C 80043E4C 00000000 */ nop +/* 1F24C 80043E4C 00000000 */ nop /* 1F250 80043E50 8E820000 */ lw $v0, ($s4) /* 1F254 80043E54 18400018 */ blez $v0, .L80043EB8 /* 1F258 80043E58 0000982D */ daddu $s3, $zero, $zero @@ -545,7 +545,7 @@ glabel create_npcs .L80043E60: /* 1F260 80043E60 8E300004 */ lw $s0, 4($s1) /* 1F264 80043E64 1200000F */ beqz $s0, .L80043EA4 -/* 1F268 80043E68 00000000 */ nop +/* 1F268 80043E68 00000000 */ nop /* 1F26C 80043E6C 8E04001C */ lw $a0, 0x1c($s0) /* 1F270 80043E70 1080000C */ beqz $a0, .L80043EA4 /* 1F274 80043E74 2405000A */ addiu $a1, $zero, 0xa @@ -578,7 +578,7 @@ glabel create_npcs /* 1F2D4 80043ED4 3C01800A */ lui $at, %hi(D_8009A5D0) /* 1F2D8 80043ED8 AC22A5D0 */ sw $v0, %lo(D_8009A5D0)($at) /* 1F2DC 80043EDC 08011044 */ j .L80044110 -/* 1F2E0 80043EE0 00000000 */ nop +/* 1F2E0 80043EE0 00000000 */ nop .L80043EE4: /* 1F2E4 80043EE4 3C02800B */ lui $v0, %hi(gCurrentEncounter+0x1C) /* 1F2E8 80043EE8 80420F2C */ lb $v0, %lo(gCurrentEncounter+0x1C)($v0) @@ -589,7 +589,7 @@ glabel create_npcs .L80043EFC: /* 1F2FC 80043EFC 8E540028 */ lw $s4, 0x28($s2) /* 1F300 80043F00 12800015 */ beqz $s4, .L80043F58 -/* 1F304 80043F04 00000000 */ nop +/* 1F304 80043F04 00000000 */ nop /* 1F308 80043F08 8E820000 */ lw $v0, ($s4) /* 1F30C 80043F0C 18400012 */ blez $v0, .L80043F58 /* 1F310 80043F10 0000982D */ daddu $s3, $zero, $zero @@ -597,10 +597,10 @@ glabel create_npcs .L80043F18: /* 1F318 80043F18 8E300004 */ lw $s0, 4($s1) /* 1F31C 80043F1C 12000009 */ beqz $s0, .L80043F44 -/* 1F320 80043F20 00000000 */ nop +/* 1F320 80043F20 00000000 */ nop /* 1F324 80043F24 8E020034 */ lw $v0, 0x34($s0) /* 1F328 80043F28 10400006 */ beqz $v0, .L80043F44 -/* 1F32C 80043F2C 00000000 */ nop +/* 1F32C 80043F2C 00000000 */ nop /* 1F330 80043F30 0C0B1059 */ jal does_script_exist /* 1F334 80043F34 8E04004C */ lw $a0, 0x4c($s0) /* 1F338 80043F38 50400002 */ beql $v0, $zero, .L80043F44 @@ -621,7 +621,7 @@ glabel create_npcs /* 1F36C 80043F6C 26520004 */ addiu $s2, $s2, 4 .L80043F70: /* 1F370 80043F70 16A00067 */ bnez $s5, .L80044110 -/* 1F374 80043F74 00000000 */ nop +/* 1F374 80043F74 00000000 */ nop /* 1F378 80043F78 3C02800B */ lui $v0, %hi(gCurrentEncounter+0x1C) /* 1F37C 80043F7C 80420F2C */ lb $v0, %lo(gCurrentEncounter+0x1C)($v0) /* 1F380 80043F80 1840002E */ blez $v0, .L8004403C @@ -632,7 +632,7 @@ glabel create_npcs .L80043F94: /* 1F394 80043F94 8E540028 */ lw $s4, 0x28($s2) /* 1F398 80043F98 12800020 */ beqz $s4, .L8004401C -/* 1F39C 80043F9C 00000000 */ nop +/* 1F39C 80043F9C 00000000 */ nop /* 1F3A0 80043FA0 8E820000 */ lw $v0, ($s4) /* 1F3A4 80043FA4 1840001D */ blez $v0, .L8004401C /* 1F3A8 80043FA8 0000982D */ daddu $s3, $zero, $zero @@ -640,11 +640,11 @@ glabel create_npcs .L80043FB0: /* 1F3B0 80043FB0 8E300004 */ lw $s0, 4($s1) /* 1F3B4 80043FB4 12000014 */ beqz $s0, .L80044008 -/* 1F3B8 80043FB8 00000000 */ nop +/* 1F3B8 80043FB8 00000000 */ nop /* 1F3BC 80043FBC 8E020000 */ lw $v0, ($s0) /* 1F3C0 80043FC0 30420020 */ andi $v0, $v0, 0x20 /* 1F3C4 80043FC4 14400010 */ bnez $v0, .L80044008 -/* 1F3C8 80043FC8 00000000 */ nop +/* 1F3C8 80043FC8 00000000 */ nop /* 1F3CC 80043FCC 8E040024 */ lw $a0, 0x24($s0) /* 1F3D0 80043FD0 1080000D */ beqz $a0, .L80044008 /* 1F3D4 80043FD4 2405000A */ addiu $a1, $zero, 0xa @@ -683,7 +683,7 @@ glabel create_npcs .L8004404C: /* 1F44C 8004404C 8E540028 */ lw $s4, 0x28($s2) /* 1F450 80044050 1280001F */ beqz $s4, .L800440D0 -/* 1F454 80044054 00000000 */ nop +/* 1F454 80044054 00000000 */ nop /* 1F458 80044058 8E820000 */ lw $v0, ($s4) /* 1F45C 8004405C 1840001C */ blez $v0, .L800440D0 /* 1F460 80044060 0000982D */ daddu $s3, $zero, $zero @@ -691,11 +691,11 @@ glabel create_npcs .L80044068: /* 1F468 80044068 8E300004 */ lw $s0, 4($s1) /* 1F46C 8004406C 12000013 */ beqz $s0, .L800440BC -/* 1F470 80044070 00000000 */ nop +/* 1F470 80044070 00000000 */ nop /* 1F474 80044074 8E020000 */ lw $v0, ($s0) /* 1F478 80044078 30420020 */ andi $v0, $v0, 0x20 /* 1F47C 8004407C 1440000F */ bnez $v0, .L800440BC -/* 1F480 80044080 00000000 */ nop +/* 1F480 80044080 00000000 */ nop /* 1F484 80044084 8E04002C */ lw $a0, 0x2c($s0) /* 1F488 80044088 1080000C */ beqz $a0, .L800440BC /* 1F48C 8004408C 2405000A */ addiu $a1, $zero, 0xa diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_8003F0C4.s b/asm/nonmatchings/code_1a1f0_len_5390/func_8003F0C4.s index 9b03882794..e28d9c6a2b 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_8003F0C4.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/func_8003F0C4.s @@ -55,16 +55,16 @@ glabel func_8003F0C4 /* 1A588 8003F188 C64C0074 */ lwc1 $f12, 0x74($s2) /* 1A58C 8003F18C 46806320 */ cvt.s.w $f12, $f12 /* 1A590 8003F190 46006302 */ mul.s $f12, $f12, $f0 -/* 1A594 8003F194 00000000 */ nop +/* 1A594 8003F194 00000000 */ nop /* 1A598 8003F198 3C0143B4 */ lui $at, 0x43b4 /* 1A59C 8003F19C 44810000 */ mtc1 $at, $f0 /* 1A5A0 8003F1A0 0C00A85B */ jal sin_rad /* 1A5A4 8003F1A4 46006303 */ div.s $f12, $f12, $f0 /* 1A5A8 8003F1A8 3C014040 */ lui $at, 0x4040 /* 1A5AC 8003F1AC 44811000 */ mtc1 $at, $f2 -/* 1A5B0 8003F1B0 00000000 */ nop +/* 1A5B0 8003F1B0 00000000 */ nop /* 1A5B4 8003F1B4 46020002 */ mul.s $f0, $f0, $f2 -/* 1A5B8 8003F1B8 00000000 */ nop +/* 1A5B8 8003F1B8 00000000 */ nop /* 1A5BC 8003F1BC 3C01800A */ lui $at, %hi(D_800A0BA4) /* 1A5C0 8003F1C0 C4220BA4 */ lwc1 $f2, %lo(D_800A0BA4)($at) /* 1A5C4 8003F1C4 46001080 */ add.s $f2, $f2, $f0 @@ -72,7 +72,7 @@ glabel func_8003F0C4 /* 1A5CC 8003F1CC 8E420074 */ lw $v0, 0x74($s2) /* 1A5D0 8003F1D0 2442000A */ addiu $v0, $v0, 0xa /* 1A5D4 8003F1D4 44826000 */ mtc1 $v0, $f12 -/* 1A5D8 8003F1D8 00000000 */ nop +/* 1A5D8 8003F1D8 00000000 */ nop /* 1A5DC 8003F1DC 46806320 */ cvt.s.w $f12, $f12 /* 1A5E0 8003F1E0 0C00A6C9 */ jal clamp_angle /* 1A5E4 8003F1E4 AE420074 */ sw $v0, 0x74($s2) @@ -114,7 +114,7 @@ glabel func_8003F0C4 /* 1A674 8003F274 3C013727 */ lui $at, 0x3727 /* 1A678 8003F278 3421C5AC */ ori $at, $at, 0xc5ac /* 1A67C 8003F27C 44810000 */ mtc1 $at, $f0 -/* 1A680 8003F280 00000000 */ nop +/* 1A680 8003F280 00000000 */ nop /* 1A684 8003F284 E4400030 */ swc1 $f0, 0x30($v0) /* 1A688 8003F288 8C82000C */ lw $v0, 0xc($a0) /* 1A68C 8003F28C E4400030 */ swc1 $f0, 0x30($v0) @@ -141,12 +141,12 @@ glabel func_8003F0C4 /* 1A6DC 8003F2DC 46200020 */ cvt.s.d $f0, $f0 /* 1A6E0 8003F2E0 460000A1 */ cvt.d.s $f2, $f0 /* 1A6E4 8003F2E4 4622203C */ c.lt.d $f4, $f2 -/* 1A6E8 8003F2E8 00000000 */ nop +/* 1A6E8 8003F2E8 00000000 */ nop /* 1A6EC 8003F2EC 45000005 */ bc1f .L8003F304 /* 1A6F0 8003F2F0 E4400030 */ swc1 $f0, 0x30($v0) /* 1A6F4 8003F2F4 3C014060 */ lui $at, 0x4060 /* 1A6F8 8003F2F8 44810000 */ mtc1 $at, $f0 -/* 1A6FC 8003F2FC 00000000 */ nop +/* 1A6FC 8003F2FC 00000000 */ nop /* 1A700 8003F300 E4400030 */ swc1 $f0, 0x30($v0) .L8003F304: /* 1A704 8003F304 3C03800A */ lui $v1, %hi(D_800A0BA0) @@ -171,7 +171,7 @@ glabel func_8003F0C4 /* 1A74C 8003F34C 46200020 */ cvt.s.d $f0, $f0 /* 1A750 8003F350 460000A1 */ cvt.d.s $f2, $f0 /* 1A754 8003F354 4622203C */ c.lt.d $f4, $f2 -/* 1A758 8003F358 00000000 */ nop +/* 1A758 8003F358 00000000 */ nop /* 1A75C 8003F35C 45000002 */ bc1f .L8003F368 /* 1A760 8003F360 E4400030 */ swc1 $f0, 0x30($v0) /* 1A764 8003F364 A4E60000 */ sh $a2, ($a3) diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s b/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s index fcc8604575..40fecbd5fa 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s @@ -79,7 +79,7 @@ glabel func_8003F7CC /* 1ACF0 8003F8F0 460C0300 */ add.s $f12, $f0, $f12 .L8003F8F4: /* 1ACF4 8003F8F4 0C00A6C9 */ jal clamp_angle -/* 1ACF8 8003F8F8 00000000 */ nop +/* 1ACF8 8003F8F8 00000000 */ nop /* 1ACFC 8003F8FC E7A0005C */ swc1 $f0, 0x5c($sp) /* 1AD00 8003F900 8262000A */ lb $v0, 0xa($s3) /* 1AD04 8003F904 10400059 */ beqz $v0, .L8003FA6C @@ -93,7 +93,7 @@ glabel func_8003F7CC .L8003F924: /* 1AD24 8003F924 86820010 */ lh $v0, 0x10($s4) /* 1AD28 8003F928 10400050 */ beqz $v0, .L8003FA6C -/* 1AD2C 8003F92C 00000000 */ nop +/* 1AD2C 8003F92C 00000000 */ nop /* 1AD30 8003F930 8E820000 */ lw $v0, ($s4) /* 1AD34 8003F934 30422000 */ andi $v0, $v0, 0x2000 /* 1AD38 8003F938 5440004B */ bnel $v0, $zero, .L8003FA68 @@ -123,29 +123,29 @@ glabel func_8003F7CC /* 1AD90 8003F990 460C4201 */ sub.s $f8, $f8, $f12 /* 1AD94 8003F994 3C013F00 */ lui $at, 0x3f00 /* 1AD98 8003F998 44815000 */ mtc1 $at, $f10 -/* 1AD9C 8003F99C 00000000 */ nop +/* 1AD9C 8003F99C 00000000 */ nop /* 1ADA0 8003F9A0 460A4202 */ mul.s $f8, $f8, $f10 -/* 1ADA4 8003F9A4 00000000 */ nop +/* 1ADA4 8003F9A4 00000000 */ nop /* 1ADA8 8003F9A8 864200A8 */ lh $v0, 0xa8($s2) /* 1ADAC 8003F9AC C642003C */ lwc1 $f2, 0x3c($s2) /* 1ADB0 8003F9B0 44820000 */ mtc1 $v0, $f0 -/* 1ADB4 8003F9B4 00000000 */ nop +/* 1ADB4 8003F9B4 00000000 */ nop /* 1ADB8 8003F9B8 46800020 */ cvt.s.w $f0, $f0 /* 1ADBC 8003F9BC 46001080 */ add.s $f2, $f2, $f0 /* 1ADC0 8003F9C0 868200B0 */ lh $v0, 0xb0($s4) /* 1ADC4 8003F9C4 C686002C */ lwc1 $f6, 0x2c($s4) /* 1ADC8 8003F9C8 44820000 */ mtc1 $v0, $f0 -/* 1ADCC 8003F9CC 00000000 */ nop +/* 1ADCC 8003F9CC 00000000 */ nop /* 1ADD0 8003F9D0 46800020 */ cvt.s.w $f0, $f0 /* 1ADD4 8003F9D4 46003000 */ add.s $f0, $f6, $f0 /* 1ADD8 8003F9D8 46001081 */ sub.s $f2, $f2, $f0 /* 1ADDC 8003F9DC 460A1082 */ mul.s $f2, $f2, $f10 -/* 1ADE0 8003F9E0 00000000 */ nop +/* 1ADE0 8003F9E0 00000000 */ nop /* 1ADE4 8003F9E4 C6840030 */ lwc1 $f4, 0x30($s4) /* 1ADE8 8003F9E8 C6400040 */ lwc1 $f0, 0x40($s2) /* 1ADEC 8003F9EC 46040001 */ sub.s $f0, $f0, $f4 /* 1ADF0 8003F9F0 460A0002 */ mul.s $f0, $f0, $f10 -/* 1ADF4 8003F9F4 00000000 */ nop +/* 1ADF4 8003F9F4 00000000 */ nop /* 1ADF8 8003F9F8 46086300 */ add.s $f12, $f12, $f8 /* 1ADFC 8003F9FC 46023180 */ add.s $f6, $f6, $f2 /* 1AE00 8003FA00 24040003 */ addiu $a0, $zero, 3 @@ -191,7 +191,7 @@ glabel func_8003F7CC /* 1AE94 8003FA94 02621021 */ addu $v0, $s3, $v0 /* 1AE98 8003FA98 8C560028 */ lw $s6, 0x28($v0) /* 1AE9C 8003FA9C 12C00390 */ beqz $s6, .L800408E0 -/* 1AEA0 8003FAA0 00000000 */ nop +/* 1AEA0 8003FAA0 00000000 */ nop /* 1AEA4 8003FAA4 8EC20000 */ lw $v0, ($s6) /* 1AEA8 8003FAA8 1840038D */ blez $v0, .L800408E0 /* 1AEAC 8003FAAC 0000A82D */ daddu $s5, $zero, $zero @@ -202,11 +202,11 @@ glabel func_8003F7CC /* 1AEBC 8003FABC 02C21021 */ addu $v0, $s6, $v0 /* 1AEC0 8003FAC0 8C510004 */ lw $s1, 4($v0) /* 1AEC4 8003FAC4 12200380 */ beqz $s1, .L800408C8 -/* 1AEC8 8003FAC8 00000000 */ nop +/* 1AEC8 8003FAC8 00000000 */ nop /* 1AECC 8003FACC 8E220000 */ lw $v0, ($s1) /* 1AED0 8003FAD0 30420020 */ andi $v0, $v0, 0x20 /* 1AED4 8003FAD4 1440037C */ bnez $v0, .L800408C8 -/* 1AED8 8003FAD8 00000000 */ nop +/* 1AED8 8003FAD8 00000000 */ nop /* 1AEDC 8003FADC 0C00EABB */ jal get_npc_unsafe /* 1AEE0 8003FAE0 86240008 */ lh $a0, 8($s1) /* 1AEE4 8003FAE4 0040902D */ daddu $s2, $v0, $zero @@ -246,16 +246,16 @@ glabel func_8003F7CC /* 1AF60 8003FB60 8E24005C */ lw $a0, 0x5c($s1) /* 1AF64 8003FB64 0040202D */ daddu $a0, $v0, $zero /* 1AF68 8003FB68 10800003 */ beqz $a0, .L8003FB78 -/* 1AF6C 8003FB6C 00000000 */ nop +/* 1AF6C 8003FB6C 00000000 */ nop /* 1AF70 8003FB70 0C0B11FA */ jal set_script_flags /* 1AF74 8003FB74 24050080 */ addiu $a1, $zero, 0x80 .L8003FB78: /* 1AF78 8003FB78 8E240054 */ lw $a0, 0x54($s1) /* 1AF7C 8003FB7C 0C0B11EA */ jal get_script_by_id -/* 1AF80 8003FB80 00000000 */ nop +/* 1AF80 8003FB80 00000000 */ nop /* 1AF84 8003FB84 0040202D */ daddu $a0, $v0, $zero /* 1AF88 8003FB88 10800003 */ beqz $a0, .L8003FB98 -/* 1AF8C 8003FB8C 00000000 */ nop +/* 1AF8C 8003FB8C 00000000 */ nop /* 1AF90 8003FB90 0C0B11FA */ jal set_script_flags /* 1AF94 8003FB94 24050080 */ addiu $a1, $zero, 0x80 .L8003FB98: @@ -263,7 +263,7 @@ glabel func_8003F7CC /* 1AF9C 8003FB9C 3C030008 */ lui $v1, 8 /* 1AFA0 8003FBA0 00431024 */ and $v0, $v0, $v1 /* 1AFA4 8003FBA4 10400052 */ beqz $v0, .L8003FCF0 -/* 1AFA8 8003FBA8 00000000 */ nop +/* 1AFA8 8003FBA8 00000000 */ nop /* 1AFAC 8003FBAC 0800FF2D */ j .L8003FCB4 /* 1AFB0 8003FBB0 8E24005C */ lw $a0, 0x5c($s1) .L8003FBB4: @@ -286,16 +286,16 @@ glabel func_8003F7CC /* 1AFF4 8003FBF4 244200A0 */ addiu $v0, $v0, 0xa0 /* 1AFF8 8003FBF8 2C420281 */ sltiu $v0, $v0, 0x281 /* 1AFFC 8003FBFC 1040000A */ beqz $v0, .L8003FC28 -/* 1B000 8003FC00 00000000 */ nop +/* 1B000 8003FC00 00000000 */ nop /* 1B004 8003FC04 8FA30024 */ lw $v1, 0x24($sp) /* 1B008 8003FC08 2862FF88 */ slti $v0, $v1, -0x78 /* 1B00C 8003FC0C 14400006 */ bnez $v0, .L8003FC28 /* 1B010 8003FC10 28620169 */ slti $v0, $v1, 0x169 /* 1B014 8003FC14 10400004 */ beqz $v0, .L8003FC28 -/* 1B018 8003FC18 00000000 */ nop +/* 1B018 8003FC18 00000000 */ nop /* 1B01C 8003FC1C 8FA20028 */ lw $v0, 0x28($sp) /* 1B020 8003FC20 0441001C */ bgez $v0, .L8003FC94 -/* 1B024 8003FC24 00000000 */ nop +/* 1B024 8003FC24 00000000 */ nop .L8003FC28: /* 1B028 8003FC28 8E220000 */ lw $v0, ($s1) /* 1B02C 8003FC2C 30420001 */ andi $v0, $v0, 1 @@ -311,20 +311,20 @@ glabel func_8003F7CC /* 1B054 8003FC54 AE220000 */ sw $v0, ($s1) /* 1B058 8003FC58 0040202D */ daddu $a0, $v0, $zero /* 1B05C 8003FC5C 10800003 */ beqz $a0, .L8003FC6C -/* 1B060 8003FC60 00000000 */ nop +/* 1B060 8003FC60 00000000 */ nop /* 1B064 8003FC64 0C0B11FA */ jal set_script_flags /* 1B068 8003FC68 24050080 */ addiu $a1, $zero, 0x80 .L8003FC6C: /* 1B06C 8003FC6C 8E240054 */ lw $a0, 0x54($s1) /* 1B070 8003FC70 0C0B11EA */ jal get_script_by_id -/* 1B074 8003FC74 00000000 */ nop +/* 1B074 8003FC74 00000000 */ nop /* 1B078 8003FC78 0040202D */ daddu $a0, $v0, $zero /* 1B07C 8003FC7C 1080001C */ beqz $a0, .L8003FCF0 -/* 1B080 8003FC80 00000000 */ nop +/* 1B080 8003FC80 00000000 */ nop /* 1B084 8003FC84 0C0B11FA */ jal set_script_flags /* 1B088 8003FC88 24050080 */ addiu $a1, $zero, 0x80 /* 1B08C 8003FC8C 0800FF3C */ j .L8003FCF0 -/* 1B090 8003FC90 00000000 */ nop +/* 1B090 8003FC90 00000000 */ nop .L8003FC94: /* 1B094 8003FC94 8E420000 */ lw $v0, ($s2) /* 1B098 8003FC98 8FA80060 */ lw $t0, 0x60($sp) @@ -336,19 +336,19 @@ glabel func_8003F7CC /* 1B0B0 8003FCB0 AE220000 */ sw $v0, ($s1) .L8003FCB4: /* 1B0B4 8003FCB4 0C0B11EA */ jal get_script_by_id -/* 1B0B8 8003FCB8 00000000 */ nop +/* 1B0B8 8003FCB8 00000000 */ nop /* 1B0BC 8003FCBC 0040202D */ daddu $a0, $v0, $zero /* 1B0C0 8003FCC0 10800003 */ beqz $a0, .L8003FCD0 -/* 1B0C4 8003FCC4 00000000 */ nop +/* 1B0C4 8003FCC4 00000000 */ nop /* 1B0C8 8003FCC8 0C0B1220 */ jal clear_script_flags /* 1B0CC 8003FCCC 24050080 */ addiu $a1, $zero, 0x80 .L8003FCD0: /* 1B0D0 8003FCD0 8E240054 */ lw $a0, 0x54($s1) /* 1B0D4 8003FCD4 0C0B11EA */ jal get_script_by_id -/* 1B0D8 8003FCD8 00000000 */ nop +/* 1B0D8 8003FCD8 00000000 */ nop /* 1B0DC 8003FCDC 0040202D */ daddu $a0, $v0, $zero /* 1B0E0 8003FCE0 10800003 */ beqz $a0, .L8003FCF0 -/* 1B0E4 8003FCE4 00000000 */ nop +/* 1B0E4 8003FCE4 00000000 */ nop /* 1B0E8 8003FCE8 0C0B1220 */ jal clear_script_flags /* 1B0EC 8003FCEC 24050080 */ addiu $a1, $zero, 0x80 .L8003FCF0: @@ -361,14 +361,14 @@ glabel func_8003F7CC /* 1B108 8003FD08 3C020040 */ lui $v0, 0x40 /* 1B10C 8003FD0C 00621024 */ and $v0, $v1, $v0 /* 1B110 8003FD10 14400020 */ bnez $v0, .L8003FD94 -/* 1B114 8003FD14 00000000 */ nop +/* 1B114 8003FD14 00000000 */ nop /* 1B118 8003FD18 8E8200C8 */ lw $v0, 0xc8($s4) /* 1B11C 8003FD1C 16420015 */ bne $s2, $v0, .L8003FD74 /* 1B120 8003FD20 24033039 */ addiu $v1, $zero, 0x3039 /* 1B124 8003FD24 C640000C */ lwc1 $f0, 0xc($s2) /* 1B128 8003FD28 4600040D */ trunc.w.s $f16, $f0 /* 1B12C 8003FD2C 44028000 */ mfc1 $v0, $f16 -/* 1B130 8003FD30 00000000 */ nop +/* 1B130 8003FD30 00000000 */ nop /* 1B134 8003FD34 A62200E0 */ sh $v0, 0xe0($s1) /* 1B138 8003FD38 C64C0038 */ lwc1 $f12, 0x38($s2) /* 1B13C 8003FD3C C64E0040 */ lwc1 $f14, 0x40($s2) @@ -380,17 +380,17 @@ glabel func_8003F7CC /* 1B154 8003FD54 8E240054 */ lw $a0, 0x54($s1) /* 1B158 8003FD58 0040202D */ daddu $a0, $v0, $zero /* 1B15C 8003FD5C 10800014 */ beqz $a0, .L8003FDB0 -/* 1B160 8003FD60 00000000 */ nop +/* 1B160 8003FD60 00000000 */ nop /* 1B164 8003FD64 0C0B11FA */ jal set_script_flags /* 1B168 8003FD68 24050080 */ addiu $a1, $zero, 0x80 /* 1B16C 8003FD6C 0800FF6C */ j .L8003FDB0 -/* 1B170 8003FD70 00000000 */ nop +/* 1B170 8003FD70 00000000 */ nop .L8003FD74: /* 1B174 8003FD74 862200E0 */ lh $v0, 0xe0($s1) /* 1B178 8003FD78 10430006 */ beq $v0, $v1, .L8003FD94 -/* 1B17C 8003FD7C 00000000 */ nop +/* 1B17C 8003FD7C 00000000 */ nop /* 1B180 8003FD80 44820000 */ mtc1 $v0, $f0 -/* 1B184 8003FD84 00000000 */ nop +/* 1B184 8003FD84 00000000 */ nop /* 1B188 8003FD88 46800020 */ cvt.s.w $f0, $f0 /* 1B18C 8003FD8C E640000C */ swc1 $f0, 0xc($s2) /* 1B190 8003FD90 A62300E0 */ sh $v1, 0xe0($s1) @@ -399,7 +399,7 @@ glabel func_8003F7CC /* 1B198 8003FD98 8E240054 */ lw $a0, 0x54($s1) /* 1B19C 8003FD9C 0040202D */ daddu $a0, $v0, $zero /* 1B1A0 8003FDA0 10800003 */ beqz $a0, .L8003FDB0 -/* 1B1A4 8003FDA4 00000000 */ nop +/* 1B1A4 8003FDA4 00000000 */ nop /* 1B1A8 8003FDA8 0C0B1220 */ jal clear_script_flags /* 1B1AC 8003FDAC 24050080 */ addiu $a1, $zero, 0x80 .L8003FDB0: @@ -414,7 +414,7 @@ glabel func_8003F7CC /* 1B1D0 8003FDD0 8E820000 */ lw $v0, ($s4) /* 1B1D4 8003FDD4 00431024 */ and $v0, $v0, $v1 /* 1B1D8 8003FDD8 144002BB */ bnez $v0, .L800408C8 -/* 1B1DC 8003FDDC 00000000 */ nop +/* 1B1DC 8003FDDC 00000000 */ nop /* 1B1E0 8003FDE0 3C04800A */ lui $a0, %hi(D_8009A650) /* 1B1E4 8003FDE4 8C84A650 */ lw $a0, %lo(D_8009A650)($a0) /* 1B1E8 8003FDE8 30820040 */ andi $v0, $a0, 0x40 @@ -423,21 +423,21 @@ glabel func_8003F7CC /* 1B1F4 8003FDF4 3C038011 */ lui $v1, %hi(D_8010EBB3) /* 1B1F8 8003FDF8 8063EBB3 */ lb $v1, %lo(D_8010EBB3)($v1) /* 1B1FC 8003FDFC 106202B2 */ beq $v1, $v0, .L800408C8 -/* 1B200 8003FE00 00000000 */ nop +/* 1B200 8003FE00 00000000 */ nop /* 1B204 8003FE04 8E220000 */ lw $v0, ($s1) /* 1B208 8003FE08 00481024 */ and $v0, $v0, $t0 /* 1B20C 8003FE0C 144002AE */ bnez $v0, .L800408C8 /* 1B210 8003FE10 30820F00 */ andi $v0, $a0, 0xf00 /* 1B214 8003FE14 144002AC */ bnez $v0, .L800408C8 -/* 1B218 8003FE18 00000000 */ nop +/* 1B218 8003FE18 00000000 */ nop /* 1B21C 8003FE1C 0C04D07A */ jal func_801341E8 -/* 1B220 8003FE20 00000000 */ nop +/* 1B220 8003FE20 00000000 */ nop /* 1B224 8003FE24 144002A8 */ bnez $v0, .L800408C8 /* 1B228 8003FE28 3C021000 */ lui $v0, 0x1000 /* 1B22C 8003FE2C 8E230000 */ lw $v1, ($s1) /* 1B230 8003FE30 00621824 */ and $v1, $v1, $v0 /* 1B234 8003FE34 14600007 */ bnez $v1, .L8003FE54 -/* 1B238 8003FE38 00000000 */ nop +/* 1B238 8003FE38 00000000 */ nop /* 1B23C 8003FE3C 0C03AD79 */ jal partner_test_enemy_collision /* 1B240 8003FE40 0240202D */ daddu $a0, $s2, $zero /* 1B244 8003FE44 10400003 */ beqz $v0, .L8003FE54 @@ -454,7 +454,7 @@ glabel func_8003F7CC /* 1B26C 8003FE6C 864300A8 */ lh $v1, 0xa8($s2) /* 1B270 8003FE70 964200A6 */ lhu $v0, 0xa6($s2) /* 1B274 8003FE74 4483E000 */ mtc1 $v1, $f28 -/* 1B278 8003FE78 00000000 */ nop +/* 1B278 8003FE78 00000000 */ nop /* 1B27C 8003FE7C 4680E720 */ cvt.s.w $f28, $f28 /* 1B280 8003FE80 00021400 */ sll $v0, $v0, 0x10 /* 1B284 8003FE84 00021C03 */ sra $v1, $v0, 0x10 @@ -463,19 +463,19 @@ glabel func_8003F7CC /* 1B290 8003FE90 00031843 */ sra $v1, $v1, 1 /* 1B294 8003FE94 8E2200DC */ lw $v0, 0xdc($s1) /* 1B298 8003FE98 4483F000 */ mtc1 $v1, $f30 -/* 1B29C 8003FE9C 00000000 */ nop +/* 1B29C 8003FE9C 00000000 */ nop /* 1B2A0 8003FEA0 10400020 */ beqz $v0, .L8003FF24 /* 1B2A4 8003FEA4 4680F7A0 */ cvt.s.w $f30, $f30 /* 1B2A8 8003FEA8 8642008A */ lh $v0, 0x8a($s2) /* 1B2AC 8003FEAC 3C014334 */ lui $at, 0x4334 /* 1B2B0 8003FEB0 44810000 */ mtc1 $at, $f0 /* 1B2B4 8003FEB4 4482C000 */ mtc1 $v0, $f24 -/* 1B2B8 8003FEB8 00000000 */ nop +/* 1B2B8 8003FEB8 00000000 */ nop /* 1B2BC 8003FEBC 4680C620 */ cvt.s.w $f24, $f24 /* 1B2C0 8003FEC0 4600C03C */ c.lt.s $f24, $f0 -/* 1B2C4 8003FEC4 00000000 */ nop +/* 1B2C4 8003FEC4 00000000 */ nop /* 1B2C8 8003FEC8 45000007 */ bc1f .L8003FEE8 -/* 1B2CC 8003FECC 00000000 */ nop +/* 1B2CC 8003FECC 00000000 */ nop /* 1B2D0 8003FED0 8FA80048 */ lw $t0, 0x48($sp) /* 1B2D4 8003FED4 3C0142B4 */ lui $at, 0x42b4 /* 1B2D8 8003FED8 44818000 */ mtc1 $at, $f16 @@ -490,7 +490,7 @@ glabel func_8003F7CC /* 1B2F8 8003FEF8 46106300 */ add.s $f12, $f12, $f16 .L8003FEFC: /* 1B2FC 8003FEFC 0C00A6C9 */ jal clamp_angle -/* 1B300 8003FF00 00000000 */ nop +/* 1B300 8003FF00 00000000 */ nop /* 1B304 8003FF04 46000606 */ mov.s $f24, $f0 /* 1B308 8003FF08 27A4002C */ addiu $a0, $sp, 0x2c /* 1B30C 8003FF0C C63200DC */ lwc1 $f18, 0xdc($s1) @@ -504,20 +504,20 @@ glabel func_8003F7CC /* 1B328 8003FF28 C7B00050 */ lwc1 $f16, 0x50($sp) /* 1B32C 8003FF2C 46100001 */ sub.s $f0, $f0, $f16 /* 1B330 8003FF30 46000082 */ mul.s $f2, $f0, $f0 -/* 1B334 8003FF34 00000000 */ nop +/* 1B334 8003FF34 00000000 */ nop /* 1B338 8003FF38 C7B20058 */ lwc1 $f18, 0x58($sp) /* 1B33C 8003FF3C C7A00030 */ lwc1 $f0, 0x30($sp) /* 1B340 8003FF40 46120001 */ sub.s $f0, $f0, $f18 /* 1B344 8003FF44 46000002 */ mul.s $f0, $f0, $f0 -/* 1B348 8003FF48 00000000 */ nop +/* 1B348 8003FF48 00000000 */ nop /* 1B34C 8003FF4C 46001300 */ add.s $f12, $f2, $f0 /* 1B350 8003FF50 46006004 */ sqrt.s $f0, $f12 /* 1B354 8003FF54 46000032 */ c.eq.s $f0, $f0 -/* 1B358 8003FF58 00000000 */ nop +/* 1B358 8003FF58 00000000 */ nop /* 1B35C 8003FF5C 45010003 */ bc1t .L8003FF6C -/* 1B360 8003FF60 00000000 */ nop +/* 1B360 8003FF60 00000000 */ nop /* 1B364 8003FF64 0C0187BC */ jal sqrtf -/* 1B368 8003FF68 00000000 */ nop +/* 1B368 8003FF68 00000000 */ nop .L8003FF6C: /* 1B36C 8003FF6C 928200B4 */ lbu $v0, 0xb4($s4) /* 1B370 8003FF70 2442FFFD */ addiu $v0, $v0, -3 @@ -527,11 +527,12 @@ glabel func_8003F7CC /* 1B380 8003FF80 10400184 */ beqz $v0, .L80040594 /* 1B384 8003FF84 46000586 */ mov.s $f22, $f0 /* 1B388 8003FF88 00031080 */ sll $v0, $v1, 2 -/* 1B38C 8003FF8C 3C01800A */ lui $at, %hi(D_800985F8) +/* 1B38C 8003FF8C 3C01800A */ lui $at, %hi(jtbl_800985F8_739F8) /* 1B390 8003FF90 00220821 */ addu $at, $at, $v0 -/* 1B394 8003FF94 8C2285F8 */ lw $v0, %lo(D_800985F8)($at) +/* 1B394 8003FF94 8C2285F8 */ lw $v0, %lo(jtbl_800985F8_739F8)($at) /* 1B398 8003FF98 00400008 */ jr $v0 -/* 1B39C 8003FF9C 00000000 */ nop +/* 1B39C 8003FF9C 00000000 */ nop +glabel L8003FFA0_1B3A0 /* 1B3A0 8003FFA0 C7B00050 */ lwc1 $f16, 0x50($sp) /* 1B3A4 8003FFA4 C68C00A8 */ lwc1 $f12, 0xa8($s4) /* 1B3A8 8003FFA8 C7B20058 */ lwc1 $f18, 0x58($sp) @@ -542,9 +543,9 @@ glabel func_8003F7CC /* 1B3BC 8003FFBC 44811000 */ mtc1 $at, $f2 /* 1B3C0 8003FFC0 C7B40054 */ lwc1 $f20, 0x54($sp) /* 1B3C4 8003FFC4 4602003C */ c.lt.s $f0, $f2 -/* 1B3C8 8003FFC8 00000000 */ nop +/* 1B3C8 8003FFC8 00000000 */ nop /* 1B3CC 8003FFCC 45000010 */ bc1f .L80040010 -/* 1B3D0 8003FFD0 00000000 */ nop +/* 1B3D0 8003FFD0 00000000 */ nop /* 1B3D4 8003FFD4 8FA80048 */ lw $t0, 0x48($sp) /* 1B3D8 8003FFD8 3C0142B4 */ lui $at, 0x42b4 /* 1B3DC 8003FFDC 44818000 */ mtc1 $at, $f16 @@ -574,11 +575,11 @@ glabel func_8003F7CC /* 1B438 80040038 27A40034 */ addiu $a0, $sp, 0x34 /* 1B43C 8004003C 3C0141F0 */ lui $at, 0x41f0 /* 1B440 80040040 44816000 */ mtc1 $at, $f12 -/* 1B444 80040044 00000000 */ nop +/* 1B444 80040044 00000000 */ nop /* 1B448 80040048 460C0301 */ sub.s $f12, $f0, $f12 .L8004004C: /* 1B44C 8004004C 0C00A6C9 */ jal clamp_angle -/* 1B450 80040050 00000000 */ nop +/* 1B450 80040050 00000000 */ nop /* 1B454 80040054 27A40034 */ addiu $a0, $sp, 0x34 .L80040058: /* 1B458 80040058 3C0641C0 */ lui $a2, 0x41c0 @@ -589,20 +590,20 @@ glabel func_8003F7CC /* 1B46C 8004006C C7A00034 */ lwc1 $f0, 0x34($sp) /* 1B470 80040070 46001001 */ sub.s $f0, $f2, $f0 /* 1B474 80040074 46000102 */ mul.s $f4, $f0, $f0 -/* 1B478 80040078 00000000 */ nop +/* 1B478 80040078 00000000 */ nop /* 1B47C 8004007C C7A20030 */ lwc1 $f2, 0x30($sp) /* 1B480 80040080 C7A00038 */ lwc1 $f0, 0x38($sp) /* 1B484 80040084 46001001 */ sub.s $f0, $f2, $f0 /* 1B488 80040088 46000002 */ mul.s $f0, $f0, $f0 -/* 1B48C 8004008C 00000000 */ nop +/* 1B48C 8004008C 00000000 */ nop /* 1B490 80040090 46002300 */ add.s $f12, $f4, $f0 /* 1B494 80040094 46006004 */ sqrt.s $f0, $f12 /* 1B498 80040098 46000032 */ c.eq.s $f0, $f0 -/* 1B49C 8004009C 00000000 */ nop +/* 1B49C 8004009C 00000000 */ nop /* 1B4A0 800400A0 45010003 */ bc1t .L800400B0 -/* 1B4A4 800400A4 00000000 */ nop +/* 1B4A4 800400A4 00000000 */ nop /* 1B4A8 800400A8 0C0187BC */ jal sqrtf -/* 1B4AC 800400AC 00000000 */ nop +/* 1B4AC 800400AC 00000000 */ nop .L800400B0: /* 1B4B0 800400B0 8E220000 */ lw $v0, ($s1) /* 1B4B4 800400B4 3C030400 */ lui $v1, 0x400 @@ -613,28 +614,28 @@ glabel func_8003F7CC /* 1B4C8 800400C8 3C030100 */ lui $v1, 0x100 /* 1B4CC 800400CC 00431024 */ and $v0, $v0, $v1 /* 1B4D0 800400D0 10400130 */ beqz $v0, .L80040594 -/* 1B4D4 800400D4 00000000 */ nop +/* 1B4D4 800400D4 00000000 */ nop /* 1B4D8 800400D8 3C014160 */ lui $at, 0x4160 /* 1B4DC 800400DC 44819000 */ mtc1 $at, $f18 -/* 1B4E0 800400E0 00000000 */ nop +/* 1B4E0 800400E0 00000000 */ nop /* 1B4E4 800400E4 461E9000 */ add.s $f0, $f18, $f30 /* 1B4E8 800400E8 4616003E */ c.le.s $f0, $f22 -/* 1B4EC 800400EC 00000000 */ nop +/* 1B4EC 800400EC 00000000 */ nop /* 1B4F0 800400F0 45010128 */ bc1t .L80040594 -/* 1B4F4 800400F4 00000000 */ nop +/* 1B4F4 800400F4 00000000 */ nop /* 1B4F8 800400F8 461CD000 */ add.s $f0, $f26, $f28 /* 1B4FC 800400FC 4614003C */ c.lt.s $f0, $f20 -/* 1B500 80040100 00000000 */ nop +/* 1B500 80040100 00000000 */ nop /* 1B504 80040104 45010123 */ bc1t .L80040594 -/* 1B508 80040108 00000000 */ nop +/* 1B508 80040108 00000000 */ nop /* 1B50C 8004010C 3C014190 */ lui $at, 0x4190 /* 1B510 80040110 44818000 */ mtc1 $at, $f16 -/* 1B514 80040114 00000000 */ nop +/* 1B514 80040114 00000000 */ nop /* 1B518 80040118 4610A000 */ add.s $f0, $f20, $f16 /* 1B51C 8004011C 461A003C */ c.lt.s $f0, $f26 -/* 1B520 80040120 00000000 */ nop +/* 1B520 80040120 00000000 */ nop /* 1B524 80040124 4501011B */ bc1t .L80040594 -/* 1B528 80040128 00000000 */ nop +/* 1B528 80040128 00000000 */ nop /* 1B52C 8004012C 8FA60050 */ lw $a2, 0x50($sp) /* 1B530 80040130 8FA70058 */ lw $a3, 0x58($sp) /* 1B534 80040134 C7AC002C */ lwc1 $f12, 0x2c($sp) @@ -654,7 +655,7 @@ glabel func_8003F7CC /* 1B56C 8004016C 0C0376B9 */ jal func_800DDAE4 /* 1B570 80040170 E7B4001C */ swc1 $f20, 0x1c($sp) /* 1B574 80040174 10400016 */ beqz $v0, .L800401D0 -/* 1B578 80040178 00000000 */ nop +/* 1B578 80040178 00000000 */ nop /* 1B57C 8004017C C7AC0050 */ lwc1 $f12, 0x50($sp) /* 1B580 80040180 8FA6002C */ lw $a2, 0x2c($sp) /* 1B584 80040184 8FA70030 */ lw $a3, 0x30($sp) @@ -675,23 +676,23 @@ glabel func_8003F7CC /* 1B5C0 800401C0 0C0376B9 */ jal func_800DDAE4 /* 1B5C4 800401C4 E7B4001C */ swc1 $f20, 0x1c($sp) /* 1B5C8 800401C8 144000F2 */ bnez $v0, .L80040594 -/* 1B5CC 800401CC 00000000 */ nop +/* 1B5CC 800401CC 00000000 */ nop .L800401D0: /* 1B5D0 800401D0 82220007 */ lb $v0, 7($s1) /* 1B5D4 800401D4 1040000F */ beqz $v0, .L80040214 -/* 1B5D8 800401D8 00000000 */ nop +/* 1B5D8 800401D8 00000000 */ nop /* 1B5DC 800401DC 86220012 */ lh $v0, 0x12($s1) /* 1B5E0 800401E0 4482D000 */ mtc1 $v0, $f26 -/* 1B5E4 800401E4 00000000 */ nop +/* 1B5E4 800401E4 00000000 */ nop /* 1B5E8 800401E8 4680D6A0 */ cvt.s.w $f26, $f26 /* 1B5EC 800401EC 86220010 */ lh $v0, 0x10($s1) /* 1B5F0 800401F0 86230014 */ lh $v1, 0x14($s1) /* 1B5F4 800401F4 44820000 */ mtc1 $v0, $f0 -/* 1B5F8 800401F8 00000000 */ nop +/* 1B5F8 800401F8 00000000 */ nop /* 1B5FC 800401FC 46800020 */ cvt.s.w $f0, $f0 /* 1B600 80040200 E7A0002C */ swc1 $f0, 0x2c($sp) /* 1B604 80040204 44830000 */ mtc1 $v1, $f0 -/* 1B608 80040208 00000000 */ nop +/* 1B608 80040208 00000000 */ nop /* 1B60C 8004020C 46800020 */ cvt.s.w $f0, $f0 /* 1B610 80040210 E7A00030 */ swc1 $f0, 0x30($sp) .L80040214: @@ -717,37 +718,37 @@ glabel func_8003F7CC /* 1B660 80040260 44819000 */ mtc1 $at, $f18 /* 1B664 80040264 3C0142B4 */ lui $at, 0x42b4 /* 1B668 80040268 44818000 */ mtc1 $at, $f16 -/* 1B66C 8004026C 00000000 */ nop +/* 1B66C 8004026C 00000000 */ nop /* 1B670 80040270 4610A03C */ c.lt.s $f20, $f16 -/* 1B674 80040274 00000000 */ nop +/* 1B674 80040274 00000000 */ nop /* 1B678 80040278 45000008 */ bc1f .L8004029C /* 1B67C 8004027C 46000005 */ abs.s $f0, $f0 /* 1B680 80040280 4600803E */ c.le.s $f16, $f0 -/* 1B684 80040284 00000000 */ nop +/* 1B684 80040284 00000000 */ nop /* 1B688 80040288 45030004 */ bc1tl .L8004029C /* 1B68C 8004028C 24100001 */ addiu $s0, $zero, 1 /* 1B690 80040290 3C0142B4 */ lui $at, 0x42b4 /* 1B694 80040294 44819000 */ mtc1 $at, $f18 -/* 1B698 80040298 00000000 */ nop +/* 1B698 80040298 00000000 */ nop .L8004029C: /* 1B69C 8004029C 4614903E */ c.le.s $f18, $f20 -/* 1B6A0 800402A0 00000000 */ nop +/* 1B6A0 800402A0 00000000 */ nop /* 1B6A4 800402A4 45000005 */ bc1f .L800402BC -/* 1B6A8 800402A8 00000000 */ nop +/* 1B6A8 800402A8 00000000 */ nop /* 1B6AC 800402AC 4612003C */ c.lt.s $f0, $f18 -/* 1B6B0 800402B0 00000000 */ nop +/* 1B6B0 800402B0 00000000 */ nop /* 1B6B4 800402B4 45030001 */ bc1tl .L800402BC /* 1B6B8 800402B8 0000802D */ daddu $s0, $zero, $zero .L800402BC: /* 1B6BC 800402BC 3C0142B4 */ lui $at, 0x42b4 /* 1B6C0 800402C0 44818000 */ mtc1 $at, $f16 -/* 1B6C4 800402C4 00000000 */ nop +/* 1B6C4 800402C4 00000000 */ nop /* 1B6C8 800402C8 4610A03C */ c.lt.s $f20, $f16 -/* 1B6CC 800402CC 00000000 */ nop +/* 1B6CC 800402CC 00000000 */ nop /* 1B6D0 800402D0 45000005 */ bc1f .L800402E8 -/* 1B6D4 800402D4 00000000 */ nop +/* 1B6D4 800402D4 00000000 */ nop /* 1B6D8 800402D8 4610003C */ c.lt.s $f0, $f16 -/* 1B6DC 800402DC 00000000 */ nop +/* 1B6DC 800402DC 00000000 */ nop /* 1B6E0 800402E0 45030001 */ bc1tl .L800402E8 /* 1B6E4 800402E4 24100001 */ addiu $s0, $zero, 1 .L800402E8: @@ -765,6 +766,7 @@ glabel func_8003F7CC /* 1B714 80040314 A2620005 */ sb $v0, 5($s3) /* 1B718 80040318 0801015F */ j .L8004057C /* 1B71C 8004031C A2630006 */ sb $v1, 6($s3) +glabel L80040320_1B720 /* 1B720 80040320 C7B00050 */ lwc1 $f16, 0x50($sp) /* 1B724 80040324 C7B20058 */ lwc1 $f18, 0x58($sp) /* 1B728 80040328 E7B00034 */ swc1 $f16, 0x34($sp) @@ -773,29 +775,29 @@ glabel func_8003F7CC /* 1B734 80040334 3C030200 */ lui $v1, 0x200 /* 1B738 80040338 00431024 */ and $v0, $v0, $v1 /* 1B73C 8004033C 14400095 */ bnez $v0, .L80040594 -/* 1B740 80040340 00000000 */ nop +/* 1B740 80040340 00000000 */ nop /* 1B744 80040344 3C014160 */ lui $at, 0x4160 /* 1B748 80040348 44818000 */ mtc1 $at, $f16 -/* 1B74C 8004034C 00000000 */ nop +/* 1B74C 8004034C 00000000 */ nop /* 1B750 80040350 461E8000 */ add.s $f0, $f16, $f30 /* 1B754 80040354 4616003E */ c.le.s $f0, $f22 -/* 1B758 80040358 00000000 */ nop +/* 1B758 80040358 00000000 */ nop /* 1B75C 8004035C 4501015A */ bc1t .L800408C8 -/* 1B760 80040360 00000000 */ nop +/* 1B760 80040360 00000000 */ nop /* 1B764 80040364 461CD600 */ add.s $f24, $f26, $f28 /* 1B768 80040368 C7B20054 */ lwc1 $f18, 0x54($sp) /* 1B76C 8004036C 4612C03C */ c.lt.s $f24, $f18 -/* 1B770 80040370 00000000 */ nop +/* 1B770 80040370 00000000 */ nop /* 1B774 80040374 45010154 */ bc1t .L800408C8 -/* 1B778 80040378 00000000 */ nop +/* 1B778 80040378 00000000 */ nop /* 1B77C 8004037C 3C014214 */ lui $at, 0x4214 /* 1B780 80040380 44818000 */ mtc1 $at, $f16 -/* 1B784 80040384 00000000 */ nop +/* 1B784 80040384 00000000 */ nop /* 1B788 80040388 46109000 */ add.s $f0, $f18, $f16 /* 1B78C 8004038C 461A003C */ c.lt.s $f0, $f26 -/* 1B790 80040390 00000000 */ nop +/* 1B790 80040390 00000000 */ nop /* 1B794 80040394 4501014C */ bc1t .L800408C8 -/* 1B798 80040398 00000000 */ nop +/* 1B798 80040398 00000000 */ nop /* 1B79C 8004039C 8FA60050 */ lw $a2, 0x50($sp) /* 1B7A0 800403A0 8FA70058 */ lw $a3, 0x58($sp) /* 1B7A4 800403A4 C7AC002C */ lwc1 $f12, 0x2c($sp) @@ -815,7 +817,7 @@ glabel func_8003F7CC /* 1B7DC 800403DC 0C0376B9 */ jal func_800DDAE4 /* 1B7E0 800403E0 E7B4001C */ swc1 $f20, 0x1c($sp) /* 1B7E4 800403E4 10400016 */ beqz $v0, .L80040440 -/* 1B7E8 800403E8 00000000 */ nop +/* 1B7E8 800403E8 00000000 */ nop /* 1B7EC 800403EC C7AC0050 */ lwc1 $f12, 0x50($sp) /* 1B7F0 800403F0 8FA6002C */ lw $a2, 0x2c($sp) /* 1B7F4 800403F4 8FA70030 */ lw $a3, 0x30($sp) @@ -836,19 +838,19 @@ glabel func_8003F7CC /* 1B830 80040430 0C0376B9 */ jal func_800DDAE4 /* 1B834 80040434 E7B4001C */ swc1 $f20, 0x1c($sp) /* 1B838 80040438 14400056 */ bnez $v0, .L80040594 -/* 1B83C 8004043C 00000000 */ nop +/* 1B83C 8004043C 00000000 */ nop .L80040440: /* 1B840 80040440 3C014214 */ lui $at, 0x4214 /* 1B844 80040444 44819000 */ mtc1 $at, $f18 /* 1B848 80040448 3C013F00 */ lui $at, 0x3f00 /* 1B84C 8004044C 44818000 */ mtc1 $at, $f16 -/* 1B850 80040450 00000000 */ nop +/* 1B850 80040450 00000000 */ nop /* 1B854 80040454 46109002 */ mul.s $f0, $f18, $f16 -/* 1B858 80040458 00000000 */ nop +/* 1B858 80040458 00000000 */ nop /* 1B85C 8004045C C7B20054 */ lwc1 $f18, 0x54($sp) /* 1B860 80040460 46009000 */ add.s $f0, $f18, $f0 /* 1B864 80040464 4600C03C */ c.lt.s $f24, $f0 -/* 1B868 80040468 00000000 */ nop +/* 1B868 80040468 00000000 */ nop /* 1B86C 8004046C 45000015 */ bc1f .L800404C4 /* 1B870 80040470 0000802D */ daddu $s0, $zero, $zero /* 1B874 80040474 928300B4 */ lbu $v1, 0xb4($s4) @@ -866,28 +868,28 @@ glabel func_8003F7CC /* 1B8A4 800404A4 10620003 */ beq $v1, $v0, .L800404B4 /* 1B8A8 800404A8 24020010 */ addiu $v0, $zero, 0x10 /* 1B8AC 800404AC 14620005 */ bne $v1, $v0, .L800404C4 -/* 1B8B0 800404B0 00000000 */ nop +/* 1B8B0 800404B0 00000000 */ nop .L800404B4: /* 1B8B4 800404B4 24100001 */ addiu $s0, $zero, 1 /* 1B8B8 800404B8 3C013F00 */ lui $at, 0x3f00 /* 1B8BC 800404BC 44818000 */ mtc1 $at, $f16 -/* 1B8C0 800404C0 00000000 */ nop +/* 1B8C0 800404C0 00000000 */ nop .L800404C4: /* 1B8C4 800404C4 4610E002 */ mul.s $f0, $f28, $f16 -/* 1B8C8 800404C8 00000000 */ nop +/* 1B8C8 800404C8 00000000 */ nop /* 1B8CC 800404CC C7B20054 */ lwc1 $f18, 0x54($sp) /* 1B8D0 800404D0 3C014214 */ lui $at, 0x4214 /* 1B8D4 800404D4 44818000 */ mtc1 $at, $f16 -/* 1B8D8 800404D8 00000000 */ nop +/* 1B8D8 800404D8 00000000 */ nop /* 1B8DC 800404DC 46109080 */ add.s $f2, $f18, $f16 /* 1B8E0 800404E0 4600D000 */ add.s $f0, $f26, $f0 /* 1B8E4 800404E4 4600103C */ c.lt.s $f2, $f0 -/* 1B8E8 800404E8 00000000 */ nop +/* 1B8E8 800404E8 00000000 */ nop /* 1B8EC 800404EC 45030001 */ bc1tl .L800404F4 /* 1B8F0 800404F0 0000802D */ daddu $s0, $zero, $zero .L800404F4: /* 1B8F4 800404F4 12000027 */ beqz $s0, .L80040594 -/* 1B8F8 800404F8 00000000 */ nop +/* 1B8F8 800404F8 00000000 */ nop /* 1B8FC 800404FC 3C028011 */ lui $v0, %hi(gPlayerData) /* 1B900 80040500 8042F290 */ lb $v0, %lo(gPlayerData)($v0) /* 1B904 80040504 0440FD12 */ bltz $v0, .L8003F950 @@ -900,19 +902,23 @@ glabel func_8003F7CC /* 1B920 80040520 2C62000E */ sltiu $v0, $v1, 0xe /* 1B924 80040524 1040000D */ beqz $v0, .L8004055C /* 1B928 80040528 00031080 */ sll $v0, $v1, 2 -/* 1B92C 8004052C 3C01800A */ lui $at, %hi(D_80098638) +/* 1B92C 8004052C 3C01800A */ lui $at, %hi(jtbl_80098638_73A38) /* 1B930 80040530 00220821 */ addu $at, $at, $v0 -/* 1B934 80040534 8C228638 */ lw $v0, %lo(D_80098638)($at) +/* 1B934 80040534 8C228638 */ lw $v0, %lo(jtbl_80098638_73A38)($at) /* 1B938 80040538 00400008 */ jr $v0 -/* 1B93C 8004053C 00000000 */ nop +/* 1B93C 8004053C 00000000 */ nop +glabel L80040540_1B940 /* 1B940 80040540 08010157 */ j .L8004055C /* 1B944 80040544 A2600006 */ sb $zero, 6($s3) +glabel L80040548_1B948 /* 1B948 80040548 24080001 */ addiu $t0, $zero, 1 /* 1B94C 8004054C 08010157 */ j .L8004055C /* 1B950 80040550 A2680006 */ sb $t0, 6($s3) +glabel L80040554_1B954 /* 1B954 80040554 24020002 */ addiu $v0, $zero, 2 /* 1B958 80040558 A2620006 */ sb $v0, 6($s3) .L8004055C: +glabel L8004055C_1B95C /* 1B95C 8004055C 240400E1 */ addiu $a0, $zero, 0xe1 /* 1B960 80040560 8E860028 */ lw $a2, 0x28($s4) /* 1B964 80040564 8E87002C */ lw $a3, 0x2c($s4) @@ -929,60 +935,61 @@ glabel func_8003F7CC /* 1B98C 8004058C 0801023D */ j .L800408F4 /* 1B990 80040590 A2680004 */ sb $t0, 4($s3) .L80040594: +glabel L80040594_1B994 /* 1B994 80040594 8E220000 */ lw $v0, ($s1) /* 1B998 80040598 3C030100 */ lui $v1, 0x100 /* 1B99C 8004059C 00431024 */ and $v0, $v0, $v1 /* 1B9A0 800405A0 144000C9 */ bnez $v0, .L800408C8 -/* 1B9A4 800405A4 00000000 */ nop +/* 1B9A4 800405A4 00000000 */ nop /* 1B9A8 800405A8 C7A0002C */ lwc1 $f0, 0x2c($sp) /* 1B9AC 800405AC C7B00050 */ lwc1 $f16, 0x50($sp) /* 1B9B0 800405B0 46100001 */ sub.s $f0, $f0, $f16 /* 1B9B4 800405B4 46000082 */ mul.s $f2, $f0, $f0 -/* 1B9B8 800405B8 00000000 */ nop +/* 1B9B8 800405B8 00000000 */ nop /* 1B9BC 800405BC C7B20058 */ lwc1 $f18, 0x58($sp) /* 1B9C0 800405C0 C7A00030 */ lwc1 $f0, 0x30($sp) /* 1B9C4 800405C4 46120001 */ sub.s $f0, $f0, $f18 /* 1B9C8 800405C8 46000002 */ mul.s $f0, $f0, $f0 -/* 1B9CC 800405CC 00000000 */ nop +/* 1B9CC 800405CC 00000000 */ nop /* 1B9D0 800405D0 46001300 */ add.s $f12, $f2, $f0 /* 1B9D4 800405D4 46006104 */ sqrt.s $f4, $f12 /* 1B9D8 800405D8 46042032 */ c.eq.s $f4, $f4 -/* 1B9DC 800405DC 00000000 */ nop +/* 1B9DC 800405DC 00000000 */ nop /* 1B9E0 800405E0 45010004 */ bc1t .L800405F4 -/* 1B9E4 800405E4 00000000 */ nop +/* 1B9E4 800405E4 00000000 */ nop /* 1B9E8 800405E8 0C0187BC */ jal sqrtf -/* 1B9EC 800405EC 00000000 */ nop +/* 1B9EC 800405EC 00000000 */ nop /* 1B9F0 800405F0 46000106 */ mov.s $f4, $f0 .L800405F4: /* 1B9F4 800405F4 3C014160 */ lui $at, 0x4160 /* 1B9F8 800405F8 44818000 */ mtc1 $at, $f16 -/* 1B9FC 800405FC 00000000 */ nop +/* 1B9FC 800405FC 00000000 */ nop /* 1BA00 80040600 461E8000 */ add.s $f0, $f16, $f30 /* 1BA04 80040604 3C01800A */ lui $at, %hi(D_80098670) /* 1BA08 80040608 D4228670 */ ldc1 $f2, %lo(D_80098670)($at) /* 1BA0C 8004060C 46000021 */ cvt.d.s $f0, $f0 /* 1BA10 80040610 46220002 */ mul.d $f0, $f0, $f2 -/* 1BA14 80040614 00000000 */ nop +/* 1BA14 80040614 00000000 */ nop /* 1BA18 80040618 46002586 */ mov.s $f22, $f4 /* 1BA1C 8004061C 4600B0A1 */ cvt.d.s $f2, $f22 /* 1BA20 80040620 4622003E */ c.le.d $f0, $f2 -/* 1BA24 80040624 00000000 */ nop +/* 1BA24 80040624 00000000 */ nop /* 1BA28 80040628 450100A7 */ bc1t .L800408C8 -/* 1BA2C 8004062C 00000000 */ nop +/* 1BA2C 8004062C 00000000 */ nop /* 1BA30 80040630 461CD000 */ add.s $f0, $f26, $f28 /* 1BA34 80040634 C7B20054 */ lwc1 $f18, 0x54($sp) /* 1BA38 80040638 4612003C */ c.lt.s $f0, $f18 -/* 1BA3C 8004063C 00000000 */ nop +/* 1BA3C 8004063C 00000000 */ nop /* 1BA40 80040640 450100A1 */ bc1t .L800408C8 -/* 1BA44 80040644 00000000 */ nop +/* 1BA44 80040644 00000000 */ nop /* 1BA48 80040648 3C014214 */ lui $at, 0x4214 /* 1BA4C 8004064C 44818000 */ mtc1 $at, $f16 -/* 1BA50 80040650 00000000 */ nop +/* 1BA50 80040650 00000000 */ nop /* 1BA54 80040654 46109000 */ add.s $f0, $f18, $f16 /* 1BA58 80040658 461A003C */ c.lt.s $f0, $f26 -/* 1BA5C 8004065C 00000000 */ nop +/* 1BA5C 8004065C 00000000 */ nop /* 1BA60 80040660 45010099 */ bc1t .L800408C8 -/* 1BA64 80040664 00000000 */ nop +/* 1BA64 80040664 00000000 */ nop /* 1BA68 80040668 8FA60050 */ lw $a2, 0x50($sp) /* 1BA6C 8004066C 8FA70058 */ lw $a3, 0x58($sp) /* 1BA70 80040670 C7AC002C */ lwc1 $f12, 0x2c($sp) @@ -1028,14 +1035,14 @@ glabel func_8003F7CC /* 1BB0C 8004070C 0C03A752 */ jal is_ability_active /* 1BB10 80040710 24040028 */ addiu $a0, $zero, 0x28 /* 1BB14 80040714 1040000A */ beqz $v0, .L80040740 -/* 1BB18 80040718 00000000 */ nop +/* 1BB18 80040718 00000000 */ nop /* 1BB1C 8004071C 8E220018 */ lw $v0, 0x18($s1) /* 1BB20 80040720 3C038011 */ lui $v1, %hi(gPlayerData+0x9) /* 1BB24 80040724 8063F299 */ lb $v1, %lo(gPlayerData+0x9)($v1) /* 1BB28 80040728 84420028 */ lh $v0, 0x28($v0) /* 1BB2C 8004072C 0062182A */ slt $v1, $v1, $v0 /* 1BB30 80040730 14600003 */ bnez $v1, .L80040740 -/* 1BB34 80040734 00000000 */ nop +/* 1BB34 80040734 00000000 */ nop /* 1BB38 80040738 82620012 */ lb $v0, 0x12($s3) /* 1BB3C 8004073C 2C500001 */ sltiu $s0, $v0, 1 .L80040740: @@ -1072,29 +1079,29 @@ glabel func_8003F7CC /* 1BBAC 800407AC 460A3181 */ sub.s $f6, $f6, $f10 /* 1BBB0 800407B0 3C013F00 */ lui $at, 0x3f00 /* 1BBB4 800407B4 44818000 */ mtc1 $at, $f16 -/* 1BBB8 800407B8 00000000 */ nop +/* 1BBB8 800407B8 00000000 */ nop /* 1BBBC 800407BC 46103182 */ mul.s $f6, $f6, $f16 -/* 1BBC0 800407C0 00000000 */ nop +/* 1BBC0 800407C0 00000000 */ nop /* 1BBC4 800407C4 864200A8 */ lh $v0, 0xa8($s2) /* 1BBC8 800407C8 C644003C */ lwc1 $f4, 0x3c($s2) /* 1BBCC 800407CC 44820000 */ mtc1 $v0, $f0 -/* 1BBD0 800407D0 00000000 */ nop +/* 1BBD0 800407D0 00000000 */ nop /* 1BBD4 800407D4 46800020 */ cvt.s.w $f0, $f0 /* 1BBD8 800407D8 46002100 */ add.s $f4, $f4, $f0 /* 1BBDC 800407DC 868200B0 */ lh $v0, 0xb0($s4) /* 1BBE0 800407E0 C688002C */ lwc1 $f8, 0x2c($s4) /* 1BBE4 800407E4 44820000 */ mtc1 $v0, $f0 -/* 1BBE8 800407E8 00000000 */ nop +/* 1BBE8 800407E8 00000000 */ nop /* 1BBEC 800407EC 46800020 */ cvt.s.w $f0, $f0 /* 1BBF0 800407F0 46004000 */ add.s $f0, $f8, $f0 /* 1BBF4 800407F4 46002101 */ sub.s $f4, $f4, $f0 /* 1BBF8 800407F8 46102102 */ mul.s $f4, $f4, $f16 -/* 1BBFC 800407FC 00000000 */ nop +/* 1BBFC 800407FC 00000000 */ nop /* 1BC00 80040800 C6820030 */ lwc1 $f2, 0x30($s4) /* 1BC04 80040804 C6400040 */ lwc1 $f0, 0x40($s2) /* 1BC08 80040808 46020001 */ sub.s $f0, $f0, $f2 /* 1BC0C 8004080C 46100002 */ mul.s $f0, $f0, $f16 -/* 1BC10 80040810 00000000 */ nop +/* 1BC10 80040810 00000000 */ nop /* 1BC14 80040814 46065280 */ add.s $f10, $f10, $f6 /* 1BC18 80040818 46044200 */ add.s $f8, $f8, $f4 /* 1BC1C 8004081C 24040003 */ addiu $a0, $zero, 3 @@ -1161,22 +1168,23 @@ glabel func_8003F7CC /* 1BCF8 800408F8 2C620007 */ sltiu $v0, $v1, 7 /* 1BCFC 800408FC 10400285 */ beqz $v0, .L80041314 /* 1BD00 80040900 00031080 */ sll $v0, $v1, 2 -/* 1BD04 80040904 3C01800A */ lui $at, %hi(D_80098678) +/* 1BD04 80040904 3C01800A */ lui $at, %hi(jtbl_80098678_73A78) /* 1BD08 80040908 00220821 */ addu $at, $at, $v0 -/* 1BD0C 8004090C 8C228678 */ lw $v0, %lo(D_80098678)($at) +/* 1BD0C 8004090C 8C228678 */ lw $v0, %lo(jtbl_80098678_73A78)($at) /* 1BD10 80040910 00400008 */ jr $v0 -/* 1BD14 80040914 00000000 */ nop +/* 1BD14 80040914 00000000 */ nop +glabel L80040918_1BD18 /* 1BD18 80040918 8E71008C */ lw $s1, 0x8c($s3) /* 1BD1C 8004091C 8E22003C */ lw $v0, 0x3c($s1) /* 1BD20 80040920 10400004 */ beqz $v0, .L80040934 /* 1BD24 80040924 0220B82D */ daddu $s7, $s1, $zero /* 1BD28 80040928 8E240054 */ lw $a0, 0x54($s1) /* 1BD2C 8004092C 0C0B1108 */ jal suspend_all_script -/* 1BD30 80040930 00000000 */ nop +/* 1BD30 80040930 00000000 */ nop .L80040934: /* 1BD34 80040934 8E220044 */ lw $v0, 0x44($s1) /* 1BD38 80040938 10400003 */ beqz $v0, .L80040948 -/* 1BD3C 8004093C 00000000 */ nop +/* 1BD3C 8004093C 00000000 */ nop /* 1BD40 80040940 0C0B1108 */ jal suspend_all_script /* 1BD44 80040944 8E24005C */ lw $a0, 0x5c($s1) .L80040948: @@ -1189,7 +1197,7 @@ glabel func_8003F7CC .L80040960: /* 1BD60 80040960 8E110004 */ lw $s1, 4($s0) /* 1BD64 80040964 12200021 */ beqz $s1, .L800409EC -/* 1BD68 80040968 00000000 */ nop +/* 1BD68 80040968 00000000 */ nop /* 1BD6C 8004096C 8E230000 */ lw $v1, ($s1) /* 1BD70 80040970 30620008 */ andi $v0, $v1, 8 /* 1BD74 80040974 10400004 */ beqz $v0, .L80040988 @@ -1199,14 +1207,14 @@ glabel func_8003F7CC /* 1BD84 80040984 30620020 */ andi $v0, $v1, 0x20 .L80040988: /* 1BD88 80040988 14400018 */ bnez $v0, .L800409EC -/* 1BD8C 8004098C 00000000 */ nop +/* 1BD8C 8004098C 00000000 */ nop /* 1BD90 80040990 8EE20000 */ lw $v0, ($s7) /* 1BD94 80040994 30420040 */ andi $v0, $v0, 0x40 /* 1BD98 80040998 10400004 */ beqz $v0, .L800409AC -/* 1BD9C 8004099C 00000000 */ nop +/* 1BD9C 8004099C 00000000 */ nop /* 1BDA0 800409A0 8E62008C */ lw $v0, 0x8c($s3) /* 1BDA4 800409A4 16220011 */ bne $s1, $v0, .L800409EC -/* 1BDA8 800409A8 00000000 */ nop +/* 1BDA8 800409A8 00000000 */ nop .L800409AC: /* 1BDAC 800409AC 8E220028 */ lw $v0, 0x28($s1) /* 1BDB0 800409B0 1040000E */ beqz $v0, .L800409EC @@ -1232,9 +1240,9 @@ glabel func_8003F7CC /* 1BDFC 800409FC 26100004 */ addiu $s0, $s0, 4 .L80040A00: /* 1BE00 80040A00 0C03805E */ jal disable_player_input -/* 1BE04 80040A04 00000000 */ nop +/* 1BE04 80040A04 00000000 */ nop /* 1BE08 80040A08 0C03BD8A */ jal func_800EF628 -/* 1BE0C 80040A0C 00000000 */ nop +/* 1BE0C 80040A0C 00000000 */ nop /* 1BE10 80040A10 928300B4 */ lbu $v1, 0xb4($s4) /* 1BE14 80040A14 2462FFF1 */ addiu $v0, $v1, -0xf /* 1BE18 80040A18 2C420002 */ sltiu $v0, $v0, 2 @@ -1262,7 +1270,7 @@ glabel func_8003F7CC /* 1BE6C 80040A6C 2404001B */ addiu $a0, $zero, 0x1b /* 1BE70 80040A70 86240008 */ lh $a0, 8($s1) /* 1BE74 80040A74 0C00EABB */ jal get_npc_unsafe -/* 1BE78 80040A78 00000000 */ nop +/* 1BE78 80040A78 00000000 */ nop /* 1BE7C 80040A7C 0040902D */ daddu $s2, $v0, $zero /* 1BE80 80040A80 C6400040 */ lwc1 $f0, 0x40($s2) /* 1BE84 80040A84 240400E1 */ addiu $a0, $zero, 0xe1 @@ -1280,17 +1288,18 @@ glabel func_8003F7CC /* 1BEB0 80040AB0 AE600090 */ sw $zero, 0x90($s3) /* 1BEB4 80040AB4 080104C1 */ j .L80041304 /* 1BEB8 80040AB8 AE600094 */ sw $zero, 0x94($s3) +glabel L80040ABC_1BEBC /* 1BEBC 80040ABC 8E71008C */ lw $s1, 0x8c($s3) /* 1BEC0 80040AC0 8E22003C */ lw $v0, 0x3c($s1) /* 1BEC4 80040AC4 10400004 */ beqz $v0, .L80040AD8 /* 1BEC8 80040AC8 0220B82D */ daddu $s7, $s1, $zero /* 1BECC 80040ACC 8E240054 */ lw $a0, 0x54($s1) /* 1BED0 80040AD0 0C0B1108 */ jal suspend_all_script -/* 1BED4 80040AD4 00000000 */ nop +/* 1BED4 80040AD4 00000000 */ nop .L80040AD8: /* 1BED8 80040AD8 8E220044 */ lw $v0, 0x44($s1) /* 1BEDC 80040ADC 10400003 */ beqz $v0, .L80040AEC -/* 1BEE0 80040AE0 00000000 */ nop +/* 1BEE0 80040AE0 00000000 */ nop /* 1BEE4 80040AE4 0C0B1108 */ jal suspend_all_script /* 1BEE8 80040AE8 8E24005C */ lw $a0, 0x5c($s1) .L80040AEC: @@ -1303,7 +1312,7 @@ glabel func_8003F7CC .L80040B04: /* 1BF04 80040B04 8E110004 */ lw $s1, 4($s0) /* 1BF08 80040B08 12200021 */ beqz $s1, .L80040B90 -/* 1BF0C 80040B0C 00000000 */ nop +/* 1BF0C 80040B0C 00000000 */ nop /* 1BF10 80040B10 8E230000 */ lw $v1, ($s1) /* 1BF14 80040B14 30620008 */ andi $v0, $v1, 8 /* 1BF18 80040B18 10400004 */ beqz $v0, .L80040B2C @@ -1313,14 +1322,14 @@ glabel func_8003F7CC /* 1BF28 80040B28 30620020 */ andi $v0, $v1, 0x20 .L80040B2C: /* 1BF2C 80040B2C 14400018 */ bnez $v0, .L80040B90 -/* 1BF30 80040B30 00000000 */ nop +/* 1BF30 80040B30 00000000 */ nop /* 1BF34 80040B34 8EE20000 */ lw $v0, ($s7) /* 1BF38 80040B38 30420040 */ andi $v0, $v0, 0x40 /* 1BF3C 80040B3C 10400004 */ beqz $v0, .L80040B50 -/* 1BF40 80040B40 00000000 */ nop +/* 1BF40 80040B40 00000000 */ nop /* 1BF44 80040B44 8E62008C */ lw $v0, 0x8c($s3) /* 1BF48 80040B48 16220011 */ bne $s1, $v0, .L80040B90 -/* 1BF4C 80040B4C 00000000 */ nop +/* 1BF4C 80040B4C 00000000 */ nop .L80040B50: /* 1BF50 80040B50 8E220028 */ lw $v0, 0x28($s1) /* 1BF54 80040B54 1040000E */ beqz $v0, .L80040B90 @@ -1346,9 +1355,9 @@ glabel func_8003F7CC /* 1BFA0 80040BA0 26100004 */ addiu $s0, $s0, 4 .L80040BA4: /* 1BFA4 80040BA4 0C03805E */ jal disable_player_input -/* 1BFA8 80040BA8 00000000 */ nop +/* 1BFA8 80040BA8 00000000 */ nop /* 1BFAC 80040BAC 0C03BD8A */ jal func_800EF628 -/* 1BFB0 80040BB0 00000000 */ nop +/* 1BFB0 80040BB0 00000000 */ nop /* 1BFB4 80040BB4 24020003 */ addiu $v0, $zero, 3 /* 1BFB8 80040BB8 A2600012 */ sb $zero, 0x12($s3) /* 1BFBC 80040BBC 3C01800A */ lui $at, %hi(gGameState) @@ -1365,17 +1374,18 @@ glabel func_8003F7CC /* 1BFE8 80040BE8 00431025 */ or $v0, $v0, $v1 /* 1BFEC 80040BEC 080104C5 */ j .L80041314 /* 1BFF0 80040BF0 AE820000 */ sw $v0, ($s4) +glabel L80040BF4_1BFF4 /* 1BFF4 80040BF4 8E71008C */ lw $s1, 0x8c($s3) /* 1BFF8 80040BF8 8E22003C */ lw $v0, 0x3c($s1) /* 1BFFC 80040BFC 10400004 */ beqz $v0, .L80040C10 /* 1C000 80040C00 0220B82D */ daddu $s7, $s1, $zero /* 1C004 80040C04 8E240054 */ lw $a0, 0x54($s1) /* 1C008 80040C08 0C0B1108 */ jal suspend_all_script -/* 1C00C 80040C0C 00000000 */ nop +/* 1C00C 80040C0C 00000000 */ nop .L80040C10: /* 1C010 80040C10 8E220044 */ lw $v0, 0x44($s1) /* 1C014 80040C14 10400003 */ beqz $v0, .L80040C24 -/* 1C018 80040C18 00000000 */ nop +/* 1C018 80040C18 00000000 */ nop /* 1C01C 80040C1C 0C0B1108 */ jal suspend_all_script /* 1C020 80040C20 8E24005C */ lw $a0, 0x5c($s1) .L80040C24: @@ -1394,7 +1404,7 @@ glabel func_8003F7CC /* 1C050 80040C50 02C21021 */ addu $v0, $s6, $v0 /* 1C054 80040C54 8C510004 */ lw $s1, 4($v0) /* 1C058 80040C58 12200061 */ beqz $s1, .L80040DE0 -/* 1C05C 80040C5C 00000000 */ nop +/* 1C05C 80040C5C 00000000 */ nop /* 1C060 80040C60 8E230000 */ lw $v1, ($s1) /* 1C064 80040C64 30620008 */ andi $v0, $v1, 8 /* 1C068 80040C68 10400004 */ beqz $v0, .L80040C7C @@ -1404,14 +1414,14 @@ glabel func_8003F7CC /* 1C078 80040C78 30620020 */ andi $v0, $v1, 0x20 .L80040C7C: /* 1C07C 80040C7C 14400058 */ bnez $v0, .L80040DE0 -/* 1C080 80040C80 00000000 */ nop +/* 1C080 80040C80 00000000 */ nop /* 1C084 80040C84 8EE20000 */ lw $v0, ($s7) /* 1C088 80040C88 30420040 */ andi $v0, $v0, 0x40 /* 1C08C 80040C8C 10400004 */ beqz $v0, .L80040CA0 -/* 1C090 80040C90 00000000 */ nop +/* 1C090 80040C90 00000000 */ nop /* 1C094 80040C94 8E62008C */ lw $v0, 0x8c($s3) /* 1C098 80040C98 16220051 */ bne $s1, $v0, .L80040DE0 -/* 1C09C 80040C9C 00000000 */ nop +/* 1C09C 80040C9C 00000000 */ nop .L80040CA0: /* 1C0A0 80040CA0 8E220028 */ lw $v0, 0x28($s1) /* 1C0A4 80040CA4 1040001F */ beqz $v0, .L80040D24 @@ -1437,11 +1447,11 @@ glabel func_8003F7CC /* 1C0F4 80040CF4 C68A0028 */ lwc1 $f10, 0x28($s4) /* 1C0F8 80040CF8 460A3181 */ sub.s $f6, $f6, $f10 /* 1C0FC 80040CFC 46143182 */ mul.s $f6, $f6, $f20 -/* 1C100 80040D00 00000000 */ nop +/* 1C100 80040D00 00000000 */ nop /* 1C104 80040D04 864200A8 */ lh $v0, 0xa8($s2) /* 1C108 80040D08 C642003C */ lwc1 $f2, 0x3c($s2) /* 1C10C 80040D0C 44820000 */ mtc1 $v0, $f0 -/* 1C110 80040D10 00000000 */ nop +/* 1C110 80040D10 00000000 */ nop /* 1C114 80040D14 46800020 */ cvt.s.w $f0, $f0 /* 1C118 80040D18 868200B0 */ lh $v0, 0xb0($s4) /* 1C11C 80040D1C 0801035B */ j .L80040D6C @@ -1449,7 +1459,7 @@ glabel func_8003F7CC .L80040D24: /* 1C124 80040D24 30620001 */ andi $v0, $v1, 1 /* 1C128 80040D28 1440002D */ bnez $v0, .L80040DE0 -/* 1C12C 80040D2C 00000000 */ nop +/* 1C12C 80040D2C 00000000 */ nop /* 1C130 80040D30 0C00EABB */ jal get_npc_unsafe /* 1C134 80040D34 86240008 */ lh $a0, 8($s1) /* 1C138 80040D38 0040902D */ daddu $s2, $v0, $zero @@ -1457,28 +1467,28 @@ glabel func_8003F7CC /* 1C140 80040D40 C68A0028 */ lwc1 $f10, 0x28($s4) /* 1C144 80040D44 460A3181 */ sub.s $f6, $f6, $f10 /* 1C148 80040D48 46143182 */ mul.s $f6, $f6, $f20 -/* 1C14C 80040D4C 00000000 */ nop +/* 1C14C 80040D4C 00000000 */ nop /* 1C150 80040D50 864200A8 */ lh $v0, 0xa8($s2) /* 1C154 80040D54 C642003C */ lwc1 $f2, 0x3c($s2) /* 1C158 80040D58 44820000 */ mtc1 $v0, $f0 -/* 1C15C 80040D5C 00000000 */ nop +/* 1C15C 80040D5C 00000000 */ nop /* 1C160 80040D60 46800020 */ cvt.s.w $f0, $f0 /* 1C164 80040D64 868200B0 */ lh $v0, 0xb0($s4) /* 1C168 80040D68 46001080 */ add.s $f2, $f2, $f0 .L80040D6C: /* 1C16C 80040D6C C688002C */ lwc1 $f8, 0x2c($s4) /* 1C170 80040D70 44820000 */ mtc1 $v0, $f0 -/* 1C174 80040D74 00000000 */ nop +/* 1C174 80040D74 00000000 */ nop /* 1C178 80040D78 46800020 */ cvt.s.w $f0, $f0 /* 1C17C 80040D7C 46004000 */ add.s $f0, $f8, $f0 /* 1C180 80040D80 46001081 */ sub.s $f2, $f2, $f0 /* 1C184 80040D84 46141082 */ mul.s $f2, $f2, $f20 -/* 1C188 80040D88 00000000 */ nop +/* 1C188 80040D88 00000000 */ nop /* 1C18C 80040D8C C6840030 */ lwc1 $f4, 0x30($s4) /* 1C190 80040D90 C6400040 */ lwc1 $f0, 0x40($s2) /* 1C194 80040D94 46040001 */ sub.s $f0, $f0, $f4 /* 1C198 80040D98 46140002 */ mul.s $f0, $f0, $f20 -/* 1C19C 80040D9C 00000000 */ nop +/* 1C19C 80040D9C 00000000 */ nop /* 1C1A0 80040DA0 46065280 */ add.s $f10, $f10, $f6 /* 1C1A4 80040DA4 46024200 */ add.s $f8, $f8, $f2 /* 1C1A8 80040DA8 24100001 */ addiu $s0, $zero, 1 @@ -1503,33 +1513,34 @@ glabel func_8003F7CC /* 1C1F0 80040DF0 00151080 */ sll $v0, $s5, 2 .L80040DF4: /* 1C1F4 80040DF4 0C03805E */ jal disable_player_input -/* 1C1F8 80040DF8 00000000 */ nop +/* 1C1F8 80040DF8 00000000 */ nop /* 1C1FC 80040DFC 0C03BD8A */ jal func_800EF628 -/* 1C200 80040E00 00000000 */ nop +/* 1C200 80040E00 00000000 */ nop /* 1C204 80040E04 8E820000 */ lw $v0, ($s4) /* 1C208 80040E08 3C030004 */ lui $v1, 4 /* 1C20C 80040E0C 00431025 */ or $v0, $v0, $v1 /* 1C210 80040E10 12000003 */ beqz $s0, .L80040E20 /* 1C214 80040E14 AE820000 */ sw $v0, ($s4) /* 1C218 80040E18 0C03980D */ jal start_bounce_a -/* 1C21C 80040E1C 00000000 */ nop +/* 1C21C 80040E1C 00000000 */ nop .L80040E20: /* 1C220 80040E20 0000202D */ daddu $a0, $zero, $zero /* 1C224 80040E24 AE600090 */ sw $zero, 0x90($s3) /* 1C228 80040E28 AE600094 */ sw $zero, 0x94($s3) /* 1C22C 80040E2C 080104BB */ j .L800412EC /* 1C230 80040E30 A2600012 */ sb $zero, 0x12($s3) +glabel L80040E34_1C234 /* 1C234 80040E34 8E71008C */ lw $s1, 0x8c($s3) /* 1C238 80040E38 8E22003C */ lw $v0, 0x3c($s1) /* 1C23C 80040E3C 10400004 */ beqz $v0, .L80040E50 /* 1C240 80040E40 0220B82D */ daddu $s7, $s1, $zero /* 1C244 80040E44 8E240054 */ lw $a0, 0x54($s1) /* 1C248 80040E48 0C0B1108 */ jal suspend_all_script -/* 1C24C 80040E4C 00000000 */ nop +/* 1C24C 80040E4C 00000000 */ nop .L80040E50: /* 1C250 80040E50 8E220044 */ lw $v0, 0x44($s1) /* 1C254 80040E54 10400003 */ beqz $v0, .L80040E64 -/* 1C258 80040E58 00000000 */ nop +/* 1C258 80040E58 00000000 */ nop /* 1C25C 80040E5C 0C0B1108 */ jal suspend_all_script /* 1C260 80040E60 8E24005C */ lw $a0, 0x5c($s1) .L80040E64: @@ -1547,7 +1558,7 @@ glabel func_8003F7CC /* 1C28C 80040E8C 02C21021 */ addu $v0, $s6, $v0 /* 1C290 80040E90 8C510004 */ lw $s1, 4($v0) /* 1C294 80040E94 12200082 */ beqz $s1, .L800410A0 -/* 1C298 80040E98 00000000 */ nop +/* 1C298 80040E98 00000000 */ nop /* 1C29C 80040E9C 8E230000 */ lw $v1, ($s1) /* 1C2A0 80040EA0 30620008 */ andi $v0, $v1, 8 /* 1C2A4 80040EA4 10400004 */ beqz $v0, .L80040EB8 @@ -1557,14 +1568,14 @@ glabel func_8003F7CC /* 1C2B4 80040EB4 30620020 */ andi $v0, $v1, 0x20 .L80040EB8: /* 1C2B8 80040EB8 14400079 */ bnez $v0, .L800410A0 -/* 1C2BC 80040EBC 00000000 */ nop +/* 1C2BC 80040EBC 00000000 */ nop /* 1C2C0 80040EC0 8EE20000 */ lw $v0, ($s7) /* 1C2C4 80040EC4 30420040 */ andi $v0, $v0, 0x40 /* 1C2C8 80040EC8 10400004 */ beqz $v0, .L80040EDC -/* 1C2CC 80040ECC 00000000 */ nop +/* 1C2CC 80040ECC 00000000 */ nop /* 1C2D0 80040ED0 8E62008C */ lw $v0, 0x8c($s3) /* 1C2D4 80040ED4 16220072 */ bne $s1, $v0, .L800410A0 -/* 1C2D8 80040ED8 00000000 */ nop +/* 1C2D8 80040ED8 00000000 */ nop .L80040EDC: /* 1C2DC 80040EDC 8E220028 */ lw $v0, 0x28($s1) /* 1C2E0 80040EE0 1040003A */ beqz $v0, .L80040FCC @@ -1590,27 +1601,27 @@ glabel func_8003F7CC /* 1C330 80040F30 C68A0028 */ lwc1 $f10, 0x28($s4) /* 1C334 80040F34 460A4201 */ sub.s $f8, $f8, $f10 /* 1C338 80040F38 46144202 */ mul.s $f8, $f8, $f20 -/* 1C33C 80040F3C 00000000 */ nop +/* 1C33C 80040F3C 00000000 */ nop /* 1C340 80040F40 864200A8 */ lh $v0, 0xa8($s2) /* 1C344 80040F44 C644003C */ lwc1 $f4, 0x3c($s2) /* 1C348 80040F48 44820000 */ mtc1 $v0, $f0 -/* 1C34C 80040F4C 00000000 */ nop +/* 1C34C 80040F4C 00000000 */ nop /* 1C350 80040F50 46800020 */ cvt.s.w $f0, $f0 /* 1C354 80040F54 46002100 */ add.s $f4, $f4, $f0 /* 1C358 80040F58 868200B0 */ lh $v0, 0xb0($s4) /* 1C35C 80040F5C C686002C */ lwc1 $f6, 0x2c($s4) /* 1C360 80040F60 44820000 */ mtc1 $v0, $f0 -/* 1C364 80040F64 00000000 */ nop +/* 1C364 80040F64 00000000 */ nop /* 1C368 80040F68 46800020 */ cvt.s.w $f0, $f0 /* 1C36C 80040F6C 46003000 */ add.s $f0, $f6, $f0 /* 1C370 80040F70 46002101 */ sub.s $f4, $f4, $f0 /* 1C374 80040F74 46142102 */ mul.s $f4, $f4, $f20 -/* 1C378 80040F78 00000000 */ nop +/* 1C378 80040F78 00000000 */ nop /* 1C37C 80040F7C C6820030 */ lwc1 $f2, 0x30($s4) /* 1C380 80040F80 C6400040 */ lwc1 $f0, 0x40($s2) /* 1C384 80040F84 46020001 */ sub.s $f0, $f0, $f2 /* 1C388 80040F88 46140002 */ mul.s $f0, $f0, $f20 -/* 1C38C 80040F8C 00000000 */ nop +/* 1C38C 80040F8C 00000000 */ nop /* 1C390 80040F90 46085280 */ add.s $f10, $f10, $f8 /* 1C394 80040F94 46043180 */ add.s $f6, $f6, $f4 /* 1C398 80040F98 46001080 */ add.s $f2, $f2, $f0 @@ -1629,7 +1640,7 @@ glabel func_8003F7CC .L80040FCC: /* 1C3CC 80040FCC 30620001 */ andi $v0, $v1, 1 /* 1C3D0 80040FD0 14400033 */ bnez $v0, .L800410A0 -/* 1C3D4 80040FD4 00000000 */ nop +/* 1C3D4 80040FD4 00000000 */ nop /* 1C3D8 80040FD8 0C00EABB */ jal get_npc_unsafe /* 1C3DC 80040FDC 86240008 */ lh $a0, 8($s1) /* 1C3E0 80040FE0 0040902D */ daddu $s2, $v0, $zero @@ -1637,31 +1648,31 @@ glabel func_8003F7CC /* 1C3E8 80040FE8 C68E0028 */ lwc1 $f14, 0x28($s4) /* 1C3EC 80040FEC 460E6301 */ sub.s $f12, $f12, $f14 /* 1C3F0 80040FF0 46146302 */ mul.s $f12, $f12, $f20 -/* 1C3F4 80040FF4 00000000 */ nop +/* 1C3F4 80040FF4 00000000 */ nop /* 1C3F8 80040FF8 C6420040 */ lwc1 $f2, 0x40($s2) /* 1C3FC 80040FFC C6880030 */ lwc1 $f8, 0x30($s4) /* 1C400 80041000 46081081 */ sub.s $f2, $f2, $f8 /* 1C404 80041004 46141082 */ mul.s $f2, $f2, $f20 -/* 1C408 80041008 00000000 */ nop +/* 1C408 80041008 00000000 */ nop /* 1C40C 8004100C 864200A8 */ lh $v0, 0xa8($s2) /* 1C410 80041010 C646003C */ lwc1 $f6, 0x3c($s2) /* 1C414 80041014 44820000 */ mtc1 $v0, $f0 -/* 1C418 80041018 00000000 */ nop +/* 1C418 80041018 00000000 */ nop /* 1C41C 8004101C 46800020 */ cvt.s.w $f0, $f0 /* 1C420 80041020 868200B0 */ lh $v0, 0xb0($s4) /* 1C424 80041024 46003180 */ add.s $f6, $f6, $f0 /* 1C428 80041028 C68A002C */ lwc1 $f10, 0x2c($s4) /* 1C42C 8004102C 44820000 */ mtc1 $v0, $f0 -/* 1C430 80041030 00000000 */ nop +/* 1C430 80041030 00000000 */ nop /* 1C434 80041034 46800020 */ cvt.s.w $f0, $f0 /* 1C438 80041038 46005000 */ add.s $f0, $f10, $f0 /* 1C43C 8004103C 46003181 */ sub.s $f6, $f6, $f0 /* 1C440 80041040 46143182 */ mul.s $f6, $f6, $f20 -/* 1C444 80041044 00000000 */ nop +/* 1C444 80041044 00000000 */ nop /* 1C448 80041048 864200A8 */ lh $v0, 0xa8($s2) /* 1C44C 8004104C C644003C */ lwc1 $f4, 0x3c($s2) /* 1C450 80041050 44820000 */ mtc1 $v0, $f0 -/* 1C454 80041054 00000000 */ nop +/* 1C454 80041054 00000000 */ nop /* 1C458 80041058 46800020 */ cvt.s.w $f0, $f0 /* 1C45C 8004105C 46002100 */ add.s $f4, $f4, $f0 /* 1C460 80041060 460C7380 */ add.s $f14, $f14, $f12 @@ -1680,7 +1691,7 @@ glabel func_8003F7CC /* 1C494 80041094 24040003 */ addiu $a0, $zero, 3 .L80041098: /* 1C498 80041098 0C01C064 */ jal func_80070190 -/* 1C49C 8004109C 00000000 */ nop +/* 1C49C 8004109C 00000000 */ nop .L800410A0: /* 1C4A0 800410A0 8EC20000 */ lw $v0, ($s6) /* 1C4A4 800410A4 26B50001 */ addiu $s5, $s5, 1 @@ -1688,15 +1699,16 @@ glabel func_8003F7CC /* 1C4AC 800410AC 1440FF77 */ bnez $v0, .L80040E8C /* 1C4B0 800410B0 00151080 */ sll $v0, $s5, 2 /* 1C4B4 800410B4 080104AF */ j .L800412BC -/* 1C4B8 800410B8 00000000 */ nop +/* 1C4B8 800410B8 00000000 */ nop +glabel L800410BC_1C4BC /* 1C4BC 800410BC 0C0B117A */ jal suspend_all_group /* 1C4C0 800410C0 24040001 */ addiu $a0, $zero, 1 /* 1C4C4 800410C4 8E71008C */ lw $s1, 0x8c($s3) /* 1C4C8 800410C8 12200007 */ beqz $s1, .L800410E8 -/* 1C4CC 800410CC 00000000 */ nop +/* 1C4CC 800410CC 00000000 */ nop /* 1C4D0 800410D0 8E22003C */ lw $v0, 0x3c($s1) /* 1C4D4 800410D4 10400004 */ beqz $v0, .L800410E8 -/* 1C4D8 800410D8 00000000 */ nop +/* 1C4D8 800410D8 00000000 */ nop /* 1C4DC 800410DC 0C0B1108 */ jal suspend_all_script /* 1C4E0 800410E0 8E240054 */ lw $a0, 0x54($s1) /* 1C4E4 800410E4 8E71008C */ lw $s1, 0x8c($s3) @@ -1720,9 +1732,9 @@ glabel func_8003F7CC /* 1C528 80041128 A0820004 */ sb $v0, 4($a0) .L8004112C: /* 1C52C 8004112C 0C03805E */ jal disable_player_input -/* 1C530 80041130 00000000 */ nop +/* 1C530 80041130 00000000 */ nop /* 1C534 80041134 0C03BD8A */ jal func_800EF628 -/* 1C538 80041138 00000000 */ nop +/* 1C538 80041138 00000000 */ nop /* 1C53C 8004113C 0C039769 */ jal set_action_state /* 1C540 80041140 2404000C */ addiu $a0, $zero, 0xc /* 1C544 80041144 24040001 */ addiu $a0, $zero, 1 @@ -1731,17 +1743,18 @@ glabel func_8003F7CC /* 1C550 80041150 AE600094 */ sw $zero, 0x94($s3) /* 1C554 80041154 080104BE */ j .L800412F8 /* 1C558 80041158 24020004 */ addiu $v0, $zero, 4 +glabel L8004115C_1C55C /* 1C55C 8004115C 8E71008C */ lw $s1, 0x8c($s3) /* 1C560 80041160 8E22003C */ lw $v0, 0x3c($s1) /* 1C564 80041164 10400004 */ beqz $v0, .L80041178 /* 1C568 80041168 0220B82D */ daddu $s7, $s1, $zero /* 1C56C 8004116C 8E240054 */ lw $a0, 0x54($s1) /* 1C570 80041170 0C0B1108 */ jal suspend_all_script -/* 1C574 80041174 00000000 */ nop +/* 1C574 80041174 00000000 */ nop .L80041178: /* 1C578 80041178 8E220044 */ lw $v0, 0x44($s1) /* 1C57C 8004117C 10400003 */ beqz $v0, .L8004118C -/* 1C580 80041180 00000000 */ nop +/* 1C580 80041180 00000000 */ nop /* 1C584 80041184 0C0B1108 */ jal suspend_all_script /* 1C588 80041188 8E24005C */ lw $a0, 0x5c($s1) .L8004118C: @@ -1756,7 +1769,7 @@ glabel func_8003F7CC .L800411AC: /* 1C5AC 800411AC 8E110004 */ lw $s1, 4($s0) /* 1C5B0 800411B0 1220003D */ beqz $s1, .L800412A8 -/* 1C5B4 800411B4 00000000 */ nop +/* 1C5B4 800411B4 00000000 */ nop /* 1C5B8 800411B8 8E230000 */ lw $v1, ($s1) /* 1C5BC 800411BC 30620008 */ andi $v0, $v1, 8 /* 1C5C0 800411C0 10400004 */ beqz $v0, .L800411D4 @@ -1766,14 +1779,14 @@ glabel func_8003F7CC /* 1C5D0 800411D0 30620020 */ andi $v0, $v1, 0x20 .L800411D4: /* 1C5D4 800411D4 14400034 */ bnez $v0, .L800412A8 -/* 1C5D8 800411D8 00000000 */ nop +/* 1C5D8 800411D8 00000000 */ nop /* 1C5DC 800411DC 8EE20000 */ lw $v0, ($s7) /* 1C5E0 800411E0 30420040 */ andi $v0, $v0, 0x40 /* 1C5E4 800411E4 10400004 */ beqz $v0, .L800411F8 -/* 1C5E8 800411E8 00000000 */ nop +/* 1C5E8 800411E8 00000000 */ nop /* 1C5EC 800411EC 8E62008C */ lw $v0, 0x8c($s3) /* 1C5F0 800411F0 1622002D */ bne $s1, $v0, .L800412A8 -/* 1C5F4 800411F4 00000000 */ nop +/* 1C5F4 800411F4 00000000 */ nop .L800411F8: /* 1C5F8 800411F8 8E220028 */ lw $v0, 0x28($s1) /* 1C5FC 800411FC 10400010 */ beqz $v0, .L80041240 @@ -1796,7 +1809,7 @@ glabel func_8003F7CC .L80041240: /* 1C640 80041240 30620001 */ andi $v0, $v1, 1 /* 1C644 80041244 14400018 */ bnez $v0, .L800412A8 -/* 1C648 80041248 00000000 */ nop +/* 1C648 80041248 00000000 */ nop .L8004124C: /* 1C64C 8004124C 0C00EABB */ jal get_npc_unsafe /* 1C650 80041250 86240008 */ lh $a0, 8($s1) @@ -1805,7 +1818,7 @@ glabel func_8003F7CC /* 1C65C 8004125C C644003C */ lwc1 $f4, 0x3c($s2) /* 1C660 80041260 C6420040 */ lwc1 $f2, 0x40($s2) /* 1C664 80041264 44820000 */ mtc1 $v0, $f0 -/* 1C668 80041268 00000000 */ nop +/* 1C668 80041268 00000000 */ nop /* 1C66C 8004126C 46800020 */ cvt.s.w $f0, $f0 /* 1C670 80041270 46002100 */ add.s $f4, $f4, $f0 /* 1C674 80041274 C6400038 */ lwc1 $f0, 0x38($s2) @@ -1829,9 +1842,9 @@ glabel func_8003F7CC /* 1C6B8 800412B8 26100004 */ addiu $s0, $s0, 4 .L800412BC: /* 1C6BC 800412BC 0C03805E */ jal disable_player_input -/* 1C6C0 800412C0 00000000 */ nop +/* 1C6C0 800412C0 00000000 */ nop /* 1C6C4 800412C4 0C03BD8A */ jal func_800EF628 -/* 1C6C8 800412C8 00000000 */ nop +/* 1C6C8 800412C8 00000000 */ nop /* 1C6CC 800412CC 0000202D */ daddu $a0, $zero, $zero /* 1C6D0 800412D0 AE600090 */ sw $zero, 0x90($s3) /* 1C6D4 800412D4 AE600094 */ sw $zero, 0x94($s3) @@ -1842,7 +1855,7 @@ glabel func_8003F7CC /* 1C6E8 800412E8 AE820000 */ sw $v0, ($s4) .L800412EC: /* 1C6EC 800412EC 0C05272D */ jal play_sound -/* 1C6F0 800412F0 00000000 */ nop +/* 1C6F0 800412F0 00000000 */ nop /* 1C6F4 800412F4 24020003 */ addiu $v0, $zero, 3 .L800412F8: /* 1C6F8 800412F8 3C01800A */ lui $at, %hi(gGameState) @@ -1854,6 +1867,7 @@ glabel func_8003F7CC /* 1C70C 8004130C 3C01800A */ lui $at, %hi(D_8009A5D0) /* 1C710 80041310 AC20A5D0 */ sw $zero, %lo(D_8009A5D0)($at) .L80041314: +glabel L80041314_1C714 /* 1C714 80041314 8FBF008C */ lw $ra, 0x8c($sp) /* 1C718 80041318 8FBE0088 */ lw $fp, 0x88($sp) /* 1C71C 8004131C 8FB70084 */ lw $s7, 0x84($sp) diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_80041364.s b/asm/nonmatchings/code_1a1f0_len_5390/func_80041364.s index 3b5367a323..822b240e7f 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_80041364.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/func_80041364.s @@ -27,14 +27,14 @@ glabel func_80041364 /* 1C7BC 800413BC 10600009 */ beqz $v1, .L800413E4 /* 1C7C0 800413C0 2402FFFF */ addiu $v0, $zero, -1 /* 1C7C4 800413C4 0801064E */ j .L80041938 -/* 1C7C8 800413C8 00000000 */ nop +/* 1C7C8 800413C8 00000000 */ nop .L800413CC: /* 1C7CC 800413CC 1062011C */ beq $v1, $v0, .L80041840 /* 1C7D0 800413D0 24020003 */ addiu $v0, $zero, 3 /* 1C7D4 800413D4 1062014E */ beq $v1, $v0, .L80041910 /* 1C7D8 800413D8 24020004 */ addiu $v0, $zero, 4 /* 1C7DC 800413DC 0801064E */ j .L80041938 -/* 1C7E0 800413E0 00000000 */ nop +/* 1C7E0 800413E0 00000000 */ nop .L800413E4: /* 1C7E4 800413E4 AEA00090 */ sw $zero, 0x90($s5) /* 1C7E8 800413E8 AEA50094 */ sw $a1, 0x94($s5) @@ -53,7 +53,7 @@ glabel func_80041364 .L8004141C: /* 1C81C 8004141C 8ED40028 */ lw $s4, 0x28($s6) /* 1C820 80041420 1280001B */ beqz $s4, .L80041490 -/* 1C824 80041424 00000000 */ nop +/* 1C824 80041424 00000000 */ nop /* 1C828 80041428 8E820000 */ lw $v0, ($s4) /* 1C82C 8004142C 18400018 */ blez $v0, .L80041490 /* 1C830 80041430 0000882D */ daddu $s1, $zero, $zero @@ -61,20 +61,20 @@ glabel func_80041364 .L80041438: /* 1C838 80041438 8E500004 */ lw $s0, 4($s2) /* 1C83C 8004143C 1200000F */ beqz $s0, .L8004147C -/* 1C840 80041440 00000000 */ nop +/* 1C840 80041440 00000000 */ nop /* 1C844 80041444 8E020000 */ lw $v0, ($s0) /* 1C848 80041448 30420020 */ andi $v0, $v0, 0x20 /* 1C84C 8004144C 1440000B */ bnez $v0, .L8004147C -/* 1C850 80041450 00000000 */ nop +/* 1C850 80041450 00000000 */ nop /* 1C854 80041454 8E02003C */ lw $v0, 0x3c($s0) /* 1C858 80041458 10400003 */ beqz $v0, .L80041468 -/* 1C85C 8004145C 00000000 */ nop +/* 1C85C 8004145C 00000000 */ nop /* 1C860 80041460 0C0B1108 */ jal suspend_all_script /* 1C864 80041464 8E040054 */ lw $a0, 0x54($s0) .L80041468: /* 1C868 80041468 8E020044 */ lw $v0, 0x44($s0) /* 1C86C 8004146C 10400003 */ beqz $v0, .L8004147C -/* 1C870 80041470 00000000 */ nop +/* 1C870 80041470 00000000 */ nop /* 1C874 80041474 0C0B1108 */ jal suspend_all_script /* 1C878 80041478 8E04005C */ lw $a0, 0x5c($s0) .L8004147C: @@ -95,10 +95,10 @@ glabel func_80041364 /* 1C8AC 800414AC 3C030010 */ lui $v1, 0x10 /* 1C8B0 800414B0 00431024 */ and $v0, $v0, $v1 /* 1C8B4 800414B4 1040000C */ beqz $v0, .L800414E8 -/* 1C8B8 800414B8 00000000 */ nop +/* 1C8B8 800414B8 00000000 */ nop /* 1C8BC 800414BC 82A20012 */ lb $v0, 0x12($s5) /* 1C8C0 800414C0 14400009 */ bnez $v0, .L800414E8 -/* 1C8C4 800414C4 00000000 */ nop +/* 1C8C4 800414C4 00000000 */ nop /* 1C8C8 800414C8 AEA00094 */ sw $zero, 0x94($s5) /* 1C8CC 800414CC 0C03AD96 */ jal partner_handle_before_battle /* 1C8D0 800414D0 AEA0009C */ sw $zero, 0x9c($s5) @@ -106,7 +106,7 @@ glabel func_80041364 /* 1C8D8 800414D8 3C01800A */ lui $at, %hi(D_8009A5D0) /* 1C8DC 800414DC AC22A5D0 */ sw $v0, %lo(D_8009A5D0)($at) /* 1C8E0 800414E0 0801064E */ j .L80041938 -/* 1C8E4 800414E4 00000000 */ nop +/* 1C8E4 800414E4 00000000 */ nop .L800414E8: /* 1C8E8 800414E8 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 1C8EC 800414EC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) @@ -121,28 +121,28 @@ glabel func_80041364 /* 1C910 80041510 3C01800A */ lui $at, %hi(D_8009A5D0) /* 1C914 80041514 AC31A5D0 */ sw $s1, %lo(D_8009A5D0)($at) /* 1C918 80041518 0801064E */ j .L80041938 -/* 1C91C 8004151C 00000000 */ nop +/* 1C91C 8004151C 00000000 */ nop .L80041520: /* 1C920 80041520 82A30005 */ lb $v1, 5($s5) /* 1C924 80041524 8EB0008C */ lw $s0, 0x8c($s5) /* 1C928 80041528 1072001D */ beq $v1, $s2, .L800415A0 /* 1C92C 8004152C 24020003 */ addiu $v0, $zero, 3 /* 1C930 80041530 1062001B */ beq $v1, $v0, .L800415A0 -/* 1C934 80041534 00000000 */ nop +/* 1C934 80041534 00000000 */ nop /* 1C938 80041538 0C03A752 */ jal is_ability_active /* 1C93C 8004153C 0040202D */ daddu $a0, $v0, $zero /* 1C940 80041540 10400016 */ beqz $v0, .L8004159C -/* 1C944 80041544 00000000 */ nop +/* 1C944 80041544 00000000 */ nop /* 1C948 80041548 8E020018 */ lw $v0, 0x18($s0) /* 1C94C 8004154C 82E30009 */ lb $v1, 9($s7) /* 1C950 80041550 84420028 */ lh $v0, 0x28($v0) /* 1C954 80041554 0062182A */ slt $v1, $v1, $v0 /* 1C958 80041558 14600010 */ bnez $v1, .L8004159C -/* 1C95C 8004155C 00000000 */ nop +/* 1C95C 8004155C 00000000 */ nop /* 1C960 80041560 8E020000 */ lw $v0, ($s0) /* 1C964 80041564 30420040 */ andi $v0, $v0, 0x40 /* 1C968 80041568 1440000C */ bnez $v0, .L8004159C -/* 1C96C 8004156C 00000000 */ nop +/* 1C96C 8004156C 00000000 */ nop /* 1C970 80041570 82A20012 */ lb $v0, 0x12($s5) /* 1C974 80041574 14400009 */ bnez $v0, .L8004159C /* 1C978 80041578 2402000A */ addiu $v0, $zero, 0xa @@ -153,7 +153,7 @@ glabel func_80041364 /* 1C98C 8004158C 3C01800A */ lui $at, %hi(D_8009A5D0) /* 1C990 80041590 AC31A5D0 */ sw $s1, %lo(D_8009A5D0)($at) /* 1C994 80041594 0801064E */ j .L80041938 -/* 1C998 80041598 00000000 */ nop +/* 1C998 80041598 00000000 */ nop .L8004159C: /* 1C99C 8004159C 8EB0008C */ lw $s0, 0x8c($s5) .L800415A0: @@ -181,20 +181,20 @@ glabel func_80041364 /* 1C9F0 800415F0 0C03A752 */ jal is_ability_active /* 1C9F4 800415F4 24040028 */ addiu $a0, $zero, 0x28 /* 1C9F8 800415F8 10400019 */ beqz $v0, .L80041660 -/* 1C9FC 800415FC 00000000 */ nop +/* 1C9FC 800415FC 00000000 */ nop /* 1CA00 80041600 8E020018 */ lw $v0, 0x18($s0) /* 1CA04 80041604 82E30009 */ lb $v1, 9($s7) /* 1CA08 80041608 84420028 */ lh $v0, 0x28($v0) /* 1CA0C 8004160C 0062182A */ slt $v1, $v1, $v0 /* 1CA10 80041610 14600013 */ bnez $v1, .L80041660 -/* 1CA14 80041614 00000000 */ nop +/* 1CA14 80041614 00000000 */ nop /* 1CA18 80041618 8E020000 */ lw $v0, ($s0) /* 1CA1C 8004161C 30420040 */ andi $v0, $v0, 0x40 /* 1CA20 80041620 1440000F */ bnez $v0, .L80041660 -/* 1CA24 80041624 00000000 */ nop +/* 1CA24 80041624 00000000 */ nop /* 1CA28 80041628 82A20012 */ lb $v0, 0x12($s5) /* 1CA2C 8004162C 1440000C */ bnez $v0, .L80041660 -/* 1CA30 80041630 00000000 */ nop +/* 1CA30 80041630 00000000 */ nop .L80041634: /* 1CA34 80041634 2402000A */ addiu $v0, $zero, 0xa /* 1CA38 80041638 AEA2009C */ sw $v0, 0x9c($s5) @@ -206,7 +206,7 @@ glabel func_80041364 /* 1CA50 80041650 3C01800A */ lui $at, %hi(D_8009A5D0) /* 1CA54 80041654 AC22A5D0 */ sw $v0, %lo(D_8009A5D0)($at) /* 1CA58 80041658 0801064E */ j .L80041938 -/* 1CA5C 8004165C 00000000 */ nop +/* 1CA5C 8004165C 00000000 */ nop .L80041660: /* 1CA60 80041660 8EA40014 */ lw $a0, 0x14($s5) /* 1CA64 80041664 04810015 */ bgez $a0, .L800416BC @@ -220,12 +220,12 @@ glabel func_80041364 /* 1CA84 80041684 1060000D */ beqz $v1, .L800416BC /* 1CA88 80041688 24040002 */ addiu $a0, $zero, 2 /* 1CA8C 8004168C 080105B1 */ j .L800416C4 -/* 1CA90 80041690 00000000 */ nop +/* 1CA90 80041690 00000000 */ nop .L80041694: /* 1CA94 80041694 10620006 */ beq $v1, $v0, .L800416B0 /* 1CA98 80041698 24040002 */ addiu $a0, $zero, 2 /* 1CA9C 8004169C 080105B1 */ j .L800416C4 -/* 1CAA0 800416A0 00000000 */ nop +/* 1CAA0 800416A0 00000000 */ nop .L800416A4: /* 1CAA4 800416A4 24040002 */ addiu $a0, $zero, 2 /* 1CAA8 800416A8 080105AF */ j .L800416BC @@ -236,10 +236,10 @@ glabel func_80041364 /* 1CAB8 800416B8 0000282D */ daddu $a1, $zero, $zero .L800416BC: /* 1CABC 800416BC 0C052BE3 */ jal func_8014AF8C -/* 1CAC0 800416C0 00000000 */ nop +/* 1CAC0 800416C0 00000000 */ nop .L800416C4: /* 1CAC4 800416C4 0C052BBE */ jal func_8014AEF8 -/* 1CAC8 800416C8 00000000 */ nop +/* 1CAC8 800416C8 00000000 */ nop /* 1CACC 800416CC 24020001 */ addiu $v0, $zero, 1 /* 1CAD0 800416D0 3C01800A */ lui $at, %hi(D_8009A654) /* 1CAD4 800416D4 A022A654 */ sb $v0, %lo(D_8009A654)($at) @@ -252,7 +252,7 @@ glabel func_80041364 /* 1CAEC 800416EC 8EA30090 */ lw $v1, 0x90($s5) /* 1CAF0 800416F0 240200FF */ addiu $v0, $zero, 0xff /* 1CAF4 800416F4 14620090 */ bne $v1, $v0, .L80041938 -/* 1CAF8 800416F8 00000000 */ nop +/* 1CAF8 800416F8 00000000 */ nop /* 1CAFC 800416FC 8EA2009C */ lw $v0, 0x9c($s5) /* 1CB00 80041700 14400052 */ bnez $v0, .L8004184C /* 1CB04 80041704 2442FFFF */ addiu $v0, $v0, -1 @@ -264,7 +264,7 @@ glabel func_80041364 .L8004171C: /* 1CB1C 8004171C 8E300004 */ lw $s0, 4($s1) /* 1CB20 80041720 12000010 */ beqz $s0, .L80041764 -/* 1CB24 80041724 00000000 */ nop +/* 1CB24 80041724 00000000 */ nop /* 1CB28 80041728 8E030000 */ lw $v1, ($s0) /* 1CB2C 8004172C 30620008 */ andi $v0, $v1, 8 /* 1CB30 80041730 10400004 */ beqz $v0, .L80041744 @@ -274,10 +274,10 @@ glabel func_80041364 /* 1CB40 80041740 30620020 */ andi $v0, $v1, 0x20 .L80041744: /* 1CB44 80041744 14400007 */ bnez $v0, .L80041764 -/* 1CB48 80041748 00000000 */ nop +/* 1CB48 80041748 00000000 */ nop /* 1CB4C 8004174C 8E020040 */ lw $v0, 0x40($s0) /* 1CB50 80041750 10400004 */ beqz $v0, .L80041764 -/* 1CB54 80041754 00000000 */ nop +/* 1CB54 80041754 00000000 */ nop /* 1CB58 80041758 0C0B102B */ jal kill_script_by_ID /* 1CB5C 8004175C 8E040058 */ lw $a0, 0x58($s0) /* 1CB60 80041760 AE000040 */ sw $zero, 0x40($s0) @@ -289,7 +289,7 @@ glabel func_80041364 /* 1CB74 80041774 26310004 */ addiu $s1, $s1, 4 .L80041778: /* 1CB78 80041778 0C03AD96 */ jal partner_handle_before_battle -/* 1CB7C 8004177C 00000000 */ nop +/* 1CB7C 8004177C 00000000 */ nop /* 1CB80 80041780 8EB0008C */ lw $s0, 0x8c($s5) /* 1CB84 80041784 A2A000A0 */ sb $zero, 0xa0($s5) /* 1CB88 80041788 A6A000A2 */ sh $zero, 0xa2($s5) @@ -298,11 +298,11 @@ glabel func_80041364 /* 1CB94 80041794 0C03A752 */ jal is_ability_active /* 1CB98 80041798 A2A20010 */ sb $v0, 0x10($s5) /* 1CB9C 8004179C 10400008 */ beqz $v0, .L800417C0 -/* 1CBA0 800417A0 00000000 */ nop +/* 1CBA0 800417A0 00000000 */ nop /* 1CBA4 800417A4 82A30005 */ lb $v1, 5($s5) /* 1CBA8 800417A8 24020003 */ addiu $v0, $zero, 3 /* 1CBAC 800417AC 14620004 */ bne $v1, $v0, .L800417C0 -/* 1CBB0 800417B0 00000000 */ nop +/* 1CBB0 800417B0 00000000 */ nop /* 1CBB4 800417B4 24020004 */ addiu $v0, $zero, 4 /* 1CBB8 800417B8 A2A200A0 */ sb $v0, 0xa0($s5) /* 1CBBC 800417BC A6A300A2 */ sh $v1, 0xa2($s5) @@ -319,7 +319,7 @@ glabel func_80041364 /* 1CBE4 800417E4 0000202D */ daddu $a0, $zero, $zero /* 1CBE8 800417E8 86840046 */ lh $a0, 0x46($s4) /* 1CBEC 800417EC 0C01CB33 */ jal func_80072CCC -/* 1CBF0 800417F0 00000000 */ nop +/* 1CBF0 800417F0 00000000 */ nop /* 1CBF4 800417F4 0C01CB24 */ jal load_battle /* 1CBF8 800417F8 86840044 */ lh $a0, 0x44($s4) /* 1CBFC 800417FC 0000202D */ daddu $a0, $zero, $zero @@ -355,7 +355,7 @@ glabel func_80041364 .L80041868: /* 1CC68 80041868 8E300004 */ lw $s0, 4($s1) /* 1CC6C 8004186C 12000010 */ beqz $s0, .L800418B0 -/* 1CC70 80041870 00000000 */ nop +/* 1CC70 80041870 00000000 */ nop /* 1CC74 80041874 8E030000 */ lw $v1, ($s0) /* 1CC78 80041878 30620008 */ andi $v0, $v1, 8 /* 1CC7C 8004187C 10400004 */ beqz $v0, .L80041890 @@ -365,10 +365,10 @@ glabel func_80041364 /* 1CC8C 8004188C 30620020 */ andi $v0, $v1, 0x20 .L80041890: /* 1CC90 80041890 14400007 */ bnez $v0, .L800418B0 -/* 1CC94 80041894 00000000 */ nop +/* 1CC94 80041894 00000000 */ nop /* 1CC98 80041898 8E020040 */ lw $v0, 0x40($s0) /* 1CC9C 8004189C 10400004 */ beqz $v0, .L800418B0 -/* 1CCA0 800418A0 00000000 */ nop +/* 1CCA0 800418A0 00000000 */ nop /* 1CCA4 800418A4 0C0B102B */ jal kill_script_by_ID /* 1CCA8 800418A8 8E040058 */ lw $a0, 0x58($s0) /* 1CCAC 800418AC AE000040 */ sw $zero, 0x40($s0) @@ -398,7 +398,7 @@ glabel func_80041364 /* 1CD00 80041900 3C01800A */ lui $at, %hi(D_8009A5D0) /* 1CD04 80041904 AC20A5D0 */ sw $zero, %lo(D_8009A5D0)($at) /* 1CD08 80041908 0801064E */ j .L80041938 -/* 1CD0C 8004190C 00000000 */ nop +/* 1CD0C 8004190C 00000000 */ nop .L80041910: /* 1CD10 80041910 A2A20009 */ sb $v0, 9($s5) /* 1CD14 80041914 24020005 */ addiu $v0, $zero, 5 diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_80041964.s b/asm/nonmatchings/code_1a1f0_len_5390/func_80041964.s index eab6d1ca2d..5eed953e47 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_80041964.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/func_80041964.s @@ -26,7 +26,7 @@ glabel func_80041964 /* 1CDB8 800419B8 240500FF */ addiu $a1, $zero, 0xff /* 1CDBC 800419BC 8E030090 */ lw $v1, 0x90($s0) /* 1CDC0 800419C0 1065009B */ beq $v1, $a1, .L80041C30 -/* 1CDC4 800419C4 00000000 */ nop +/* 1CDC4 800419C4 00000000 */ nop /* 1CDC8 800419C8 8E020098 */ lw $v0, 0x98($s0) /* 1CDCC 800419CC 24420001 */ addiu $v0, $v0, 1 /* 1CDD0 800419D0 AE020098 */ sw $v0, 0x98($s0) @@ -52,9 +52,9 @@ glabel func_80041964 /* 1CE18 80041A18 C498002C */ lwc1 $f24, 0x2c($a0) /* 1CE1C 80041A1C C4960030 */ lwc1 $f22, 0x30($a0) /* 1CE20 80041A20 4600D03C */ c.lt.s $f26, $f0 -/* 1CE24 80041A24 00000000 */ nop +/* 1CE24 80041A24 00000000 */ nop /* 1CE28 80041A28 45000004 */ bc1f .L80041A3C -/* 1CE2C 80041A2C 00000000 */ nop +/* 1CE2C 80041A2C 00000000 */ nop /* 1CE30 80041A30 4600A786 */ mov.s $f30, $f20 /* 1CE34 80041A34 4600C686 */ mov.s $f26, $f24 /* 1CE38 80041A38 4600B706 */ mov.s $f28, $f22 @@ -64,7 +64,7 @@ glabel func_80041964 /* 1CE44 80041A44 80430071 */ lb $v1, 0x71($v0) /* 1CE48 80041A48 24020002 */ addiu $v0, $zero, 2 /* 1CE4C 80041A4C 1462003C */ bne $v1, $v0, .L80041B40 -/* 1CE50 80041A50 00000000 */ nop +/* 1CE50 80041A50 00000000 */ nop /* 1CE54 80041A54 C6020090 */ lwc1 $f2, 0x90($s0) /* 1CE58 80041A58 468010A0 */ cvt.s.w $f2, $f2 /* 1CE5C 80041A5C 44051000 */ mfc1 $a1, $f2 diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_80041F10.s b/asm/nonmatchings/code_1a1f0_len_5390/func_80041F10.s index 280993af38..70f47ec411 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_80041F10.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/func_80041F10.s @@ -36,9 +36,9 @@ glabel func_80041F10 /* 1D38C 80041F8C 1040011F */ beqz $v0, .L8004240C /* 1D390 80041F90 0000902D */ daddu $s2, $zero, $zero /* 1D394 80041F94 10600037 */ beqz $v1, .L80042074 -/* 1D398 80041F98 00000000 */ nop +/* 1D398 80041F98 00000000 */ nop /* 1D39C 80041F9C 08010BD3 */ j .L80042F4C -/* 1D3A0 80041FA0 00000000 */ nop +/* 1D3A0 80041FA0 00000000 */ nop .L80041FA4: /* 1D3A4 80041FA4 2402000B */ addiu $v0, $zero, 0xb /* 1D3A8 80041FA8 106200B3 */ beq $v1, $v0, .L80042278 @@ -46,17 +46,17 @@ glabel func_80041F10 /* 1D3B0 80041FB0 10400005 */ beqz $v0, .L80041FC8 /* 1D3B4 80041FB4 2402000A */ addiu $v0, $zero, 0xa /* 1D3B8 80041FB8 10620090 */ beq $v1, $v0, .L800421FC -/* 1D3BC 80041FBC 00000000 */ nop +/* 1D3BC 80041FBC 00000000 */ nop /* 1D3C0 80041FC0 08010BD3 */ j .L80042F4C -/* 1D3C4 80041FC4 00000000 */ nop +/* 1D3C4 80041FC4 00000000 */ nop .L80041FC8: /* 1D3C8 80041FC8 24020064 */ addiu $v0, $zero, 0x64 /* 1D3CC 80041FCC 106201B1 */ beq $v1, $v0, .L80042694 /* 1D3D0 80041FD0 24020065 */ addiu $v0, $zero, 0x65 /* 1D3D4 80041FD4 106201DB */ beq $v1, $v0, .L80042744 -/* 1D3D8 80041FD8 00000000 */ nop +/* 1D3D8 80041FD8 00000000 */ nop /* 1D3DC 80041FDC 08010BD3 */ j .L80042F4C -/* 1D3E0 80041FE0 00000000 */ nop +/* 1D3E0 80041FE0 00000000 */ nop .L80041FE4: /* 1D3E4 80041FE4 240200CB */ addiu $v0, $zero, 0xcb /* 1D3E8 80041FE8 106202F9 */ beq $v1, $v0, .L80042BD0 @@ -68,9 +68,9 @@ glabel func_80041F10 /* 1D400 80042000 10400005 */ beqz $v0, .L80042018 /* 1D404 80042004 24020067 */ addiu $v0, $zero, 0x67 /* 1D408 80042008 1062025A */ beq $v1, $v0, .L80042974 -/* 1D40C 8004200C 00000000 */ nop +/* 1D40C 8004200C 00000000 */ nop /* 1D410 80042010 08010BD3 */ j .L80042F4C -/* 1D414 80042014 00000000 */ nop +/* 1D414 80042014 00000000 */ nop .L80042018: /* 1D418 80042018 240200C9 */ addiu $v0, $zero, 0xc9 /* 1D41C 8004201C 1062029B */ beq $v1, $v0, .L80042A8C @@ -78,7 +78,7 @@ glabel func_80041F10 /* 1D424 80042024 1062029E */ beq $v1, $v0, .L80042AA0 /* 1D428 80042028 0000902D */ daddu $s2, $zero, $zero /* 1D42C 8004202C 08010BD3 */ j .L80042F4C -/* 1D430 80042030 00000000 */ nop +/* 1D430 80042030 00000000 */ nop .L80042034: /* 1D434 80042034 24020190 */ addiu $v0, $zero, 0x190 /* 1D438 80042038 1062031E */ beq $v1, $v0, .L80042CB4 @@ -86,9 +86,9 @@ glabel func_80041F10 /* 1D440 80042040 10400005 */ beqz $v0, .L80042058 /* 1D444 80042044 2402012C */ addiu $v0, $zero, 0x12c /* 1D448 80042048 106202F2 */ beq $v1, $v0, .L80042C14 -/* 1D44C 8004204C 00000000 */ nop +/* 1D44C 8004204C 00000000 */ nop /* 1D450 80042050 08010BD3 */ j .L80042F4C -/* 1D454 80042054 00000000 */ nop +/* 1D454 80042054 00000000 */ nop .L80042058: /* 1D458 80042058 24020191 */ addiu $v0, $zero, 0x191 /* 1D45C 8004205C 1062033E */ beq $v1, $v0, .L80042D58 @@ -96,11 +96,11 @@ glabel func_80041F10 /* 1D464 80042064 10620349 */ beq $v1, $v0, .L80042D8C /* 1D468 80042068 0000902D */ daddu $s2, $zero, $zero /* 1D46C 8004206C 08010BD3 */ j .L80042F4C -/* 1D470 80042070 00000000 */ nop +/* 1D470 80042070 00000000 */ nop .L80042074: /* 1D474 80042074 82C20008 */ lb $v0, 8($s6) /* 1D478 80042078 104003E8 */ beqz $v0, .L8004301C -/* 1D47C 8004207C 00000000 */ nop +/* 1D47C 8004207C 00000000 */ nop /* 1D480 80042080 A2C00008 */ sb $zero, 8($s6) /* 1D484 80042084 A6E00010 */ sh $zero, 0x10($s7) /* 1D488 80042088 0C03A5F9 */ jal func_800E97E4 @@ -118,7 +118,7 @@ glabel func_80041F10 /* 1D4B8 800420B8 14510003 */ bne $v0, $s1, .L800420C8 /* 1D4BC 800420BC A6C000AE */ sh $zero, 0xae($s6) /* 1D4C0 800420C0 0C052B9B */ jal func_8014AE6C -/* 1D4C4 800420C4 00000000 */ nop +/* 1D4C4 800420C4 00000000 */ nop .L800420C8: /* 1D4C8 800420C8 3C03FFFB */ lui $v1, 0xfffb /* 1D4CC 800420CC 3463FFFF */ ori $v1, $v1, 0xffff @@ -140,7 +140,7 @@ glabel func_80041F10 /* 1D508 80042108 14400003 */ bnez $v0, .L80042118 /* 1D50C 8004210C A2C00005 */ sb $zero, 5($s6) /* 1D510 80042110 0C03ADB1 */ jal partner_handle_after_battle -/* 1D514 80042114 00000000 */ nop +/* 1D514 80042114 00000000 */ nop .L80042118: /* 1D518 80042118 3C028011 */ lui $v0, %hi(D_8010EBB0) /* 1D51C 8004211C 2442EBB0 */ addiu $v0, $v0, %lo(D_8010EBB0) @@ -154,7 +154,7 @@ glabel func_80041F10 .L8004213C: /* 1D53C 8004213C 82020000 */ lb $v0, ($s0) /* 1D540 80042140 1440000C */ bnez $v0, .L80042174 -/* 1D544 80042144 00000000 */ nop +/* 1D544 80042144 00000000 */ nop /* 1D548 80042148 8EE20000 */ lw $v0, ($s7) /* 1D54C 8004214C 30420006 */ andi $v0, $v0, 6 /* 1D550 80042150 14400008 */ bnez $v0, .L80042174 @@ -163,7 +163,7 @@ glabel func_80041F10 /* 1D55C 8004215C 10620005 */ beq $v1, $v0, .L80042174 /* 1D560 80042160 2402001D */ addiu $v0, $zero, 0x1d /* 1D564 80042164 10620003 */ beq $v1, $v0, .L80042174 -/* 1D568 80042168 00000000 */ nop +/* 1D568 80042168 00000000 */ nop /* 1D56C 8004216C 0C039769 */ jal set_action_state /* 1D570 80042170 0000202D */ daddu $a0, $zero, $zero .L80042174: @@ -171,43 +171,48 @@ glabel func_80041F10 /* 1D578 80042178 2C620005 */ sltiu $v0, $v1, 5 /* 1D57C 8004217C 10400373 */ beqz $v0, .L80042F4C /* 1D580 80042180 00031080 */ sll $v0, $v1, 2 -/* 1D584 80042184 3C01800A */ lui $at, %hi(D_80098698) +/* 1D584 80042184 3C01800A */ lui $at, %hi(jtbl_80098698_73A98) /* 1D588 80042188 00220821 */ addu $at, $at, $v0 -/* 1D58C 8004218C 8C228698 */ lw $v0, %lo(D_80098698)($at) +/* 1D58C 8004218C 8C228698 */ lw $v0, %lo(jtbl_80098698_73A98)($at) /* 1D590 80042190 00400008 */ jr $v0 -/* 1D594 80042194 00000000 */ nop +/* 1D594 80042194 00000000 */ nop +glabel L80042198_1D598 /* 1D598 80042198 2402000A */ addiu $v0, $zero, 0xa /* 1D59C 8004219C 3C01800A */ lui $at, %hi(D_8009A5D0) /* 1D5A0 800421A0 AC22A5D0 */ sw $v0, %lo(D_8009A5D0)($at) /* 1D5A4 800421A4 08010BD3 */ j .L80042F4C -/* 1D5A8 800421A8 00000000 */ nop +/* 1D5A8 800421A8 00000000 */ nop +glabel L800421AC_1D5AC /* 1D5AC 800421AC 240200C8 */ addiu $v0, $zero, 0xc8 /* 1D5B0 800421B0 3C01800A */ lui $at, %hi(D_8009A5D0) /* 1D5B4 800421B4 AC22A5D0 */ sw $v0, %lo(D_8009A5D0)($at) /* 1D5B8 800421B8 08010BD3 */ j .L80042F4C -/* 1D5BC 800421BC 00000000 */ nop +/* 1D5BC 800421BC 00000000 */ nop +glabel L800421C0_1D5C0 /* 1D5C0 800421C0 24020064 */ addiu $v0, $zero, 0x64 /* 1D5C4 800421C4 3C01800A */ lui $at, %hi(D_8009A5D0) /* 1D5C8 800421C8 AC22A5D0 */ sw $v0, %lo(D_8009A5D0)($at) /* 1D5CC 800421CC 08010BD3 */ j .L80042F4C -/* 1D5D0 800421D0 00000000 */ nop +/* 1D5D0 800421D0 00000000 */ nop +glabel L800421D4_1D5D4 /* 1D5D4 800421D4 2402012C */ addiu $v0, $zero, 0x12c /* 1D5D8 800421D8 3C01800A */ lui $at, %hi(D_8009A5D0) /* 1D5DC 800421DC AC22A5D0 */ sw $v0, %lo(D_8009A5D0)($at) /* 1D5E0 800421E0 08010BD3 */ j .L80042F4C -/* 1D5E4 800421E4 00000000 */ nop +/* 1D5E4 800421E4 00000000 */ nop +glabel L800421E8_1D5E8 /* 1D5E8 800421E8 24020190 */ addiu $v0, $zero, 0x190 /* 1D5EC 800421EC 3C01800A */ lui $at, %hi(D_8009A5D0) /* 1D5F0 800421F0 AC22A5D0 */ sw $v0, %lo(D_8009A5D0)($at) /* 1D5F4 800421F4 08010BD3 */ j .L80042F4C -/* 1D5F8 800421F8 00000000 */ nop +/* 1D5F8 800421F8 00000000 */ nop .L800421FC: /* 1D5FC 800421FC 82C2000B */ lb $v0, 0xb($s6) /* 1D600 80042200 10400019 */ beqz $v0, .L80042268 /* 1D604 80042204 2402000B */ addiu $v0, $zero, 0xb /* 1D608 80042208 8EC4008C */ lw $a0, 0x8c($s6) /* 1D60C 8004220C 0C012354 */ jal get_coin_drop_amount -/* 1D610 80042210 00000000 */ nop +/* 1D610 80042210 00000000 */ nop /* 1D614 80042214 1040000F */ beqz $v0, .L80042254 /* 1D618 80042218 2405000A */ addiu $a1, $zero, 0xa /* 1D61C 8004221C 3C048007 */ lui $a0, %hi(D_80077C44) @@ -234,15 +239,15 @@ glabel func_80041F10 /* 1D668 80042268 3C01800A */ lui $at, %hi(D_8009A5D0) /* 1D66C 8004226C AC22A5D0 */ sw $v0, %lo(D_8009A5D0)($at) /* 1D670 80042270 08010BD3 */ j .L80042F4C -/* 1D674 80042274 00000000 */ nop +/* 1D674 80042274 00000000 */ nop .L80042278: /* 1D678 80042278 82C2000B */ lb $v0, 0xb($s6) /* 1D67C 8004227C 10400013 */ beqz $v0, .L800422CC -/* 1D680 80042280 00000000 */ nop +/* 1D680 80042280 00000000 */ nop /* 1D684 80042284 0C012354 */ jal get_coin_drop_amount /* 1D688 80042288 8EC4008C */ lw $a0, 0x8c($s6) /* 1D68C 8004228C 1040000F */ beqz $v0, .L800422CC -/* 1D690 80042290 00000000 */ nop +/* 1D690 80042290 00000000 */ nop /* 1D694 80042294 8EC20098 */ lw $v0, 0x98($s6) /* 1D698 80042298 8EC30090 */ lw $v1, 0x90($s6) /* 1D69C 8004229C 24420004 */ addiu $v0, $v0, 4 @@ -255,9 +260,9 @@ glabel func_80041F10 /* 1D6B4 800422B4 3C04800A */ lui $a0, %hi(D_800A0BB4) /* 1D6B8 800422B8 8C840BB4 */ lw $a0, %lo(D_800A0BB4)($a0) /* 1D6BC 800422BC 0C0B1059 */ jal does_script_exist -/* 1D6C0 800422C0 00000000 */ nop +/* 1D6C0 800422C0 00000000 */ nop /* 1D6C4 800422C4 14400321 */ bnez $v0, .L80042F4C -/* 1D6C8 800422C8 00000000 */ nop +/* 1D6C8 800422C8 00000000 */ nop .L800422CC: /* 1D6CC 800422CC 8ED40088 */ lw $s4, 0x88($s6) /* 1D6D0 800422D0 8E820000 */ lw $v0, ($s4) @@ -268,7 +273,7 @@ glabel func_80041F10 .L800422E4: /* 1D6E4 800422E4 8E300004 */ lw $s0, 4($s1) /* 1D6E8 800422E8 12000027 */ beqz $s0, .L80042388 -/* 1D6EC 800422EC 00000000 */ nop +/* 1D6EC 800422EC 00000000 */ nop /* 1D6F0 800422F0 8E030000 */ lw $v1, ($s0) /* 1D6F4 800422F4 30620008 */ andi $v0, $v1, 8 /* 1D6F8 800422F8 10400004 */ beqz $v0, .L8004230C @@ -278,7 +283,7 @@ glabel func_80041F10 /* 1D708 80042308 30620020 */ andi $v0, $v1, 0x20 .L8004230C: /* 1D70C 8004230C 1440001E */ bnez $v0, .L80042388 -/* 1D710 80042310 00000000 */ nop +/* 1D710 80042310 00000000 */ nop /* 1D714 80042314 8E040030 */ lw $a0, 0x30($s0) /* 1D718 80042318 1080000E */ beqz $a0, .L80042354 /* 1D71C 8004231C 2405000A */ addiu $a1, $zero, 0xa @@ -339,7 +344,7 @@ glabel func_80041F10 /* 1D7E8 800423E8 3C01800A */ lui $at, %hi(D_8009A5D0) /* 1D7EC 800423EC AC22A5D0 */ sw $v0, %lo(D_8009A5D0)($at) /* 1D7F0 800423F0 08010BD3 */ j .L80042F4C -/* 1D7F4 800423F4 00000000 */ nop +/* 1D7F4 800423F4 00000000 */ nop .L800423F8: /* 1D7F8 800423F8 8EC30090 */ lw $v1, 0x90($s6) /* 1D7FC 800423FC 1460025B */ bnez $v1, .L80042D6C @@ -355,7 +360,7 @@ glabel func_80041F10 .L80042420: /* 1D820 80042420 8E300004 */ lw $s0, 4($s1) /* 1D824 80042424 1200000F */ beqz $s0, .L80042464 -/* 1D828 80042428 00000000 */ nop +/* 1D828 80042428 00000000 */ nop /* 1D82C 8004242C 8E030000 */ lw $v1, ($s0) /* 1D830 80042430 30620008 */ andi $v0, $v1, 8 /* 1D834 80042434 10400004 */ beqz $v0, .L80042448 @@ -365,7 +370,7 @@ glabel func_80041F10 /* 1D844 80042444 30620020 */ andi $v0, $v1, 0x20 .L80042448: /* 1D848 80042448 14400006 */ bnez $v0, .L80042464 -/* 1D84C 8004244C 00000000 */ nop +/* 1D84C 8004244C 00000000 */ nop /* 1D850 80042450 0C0B1059 */ jal does_script_exist /* 1D854 80042454 8E040060 */ lw $a0, 0x60($s0) /* 1D858 80042458 50400002 */ beql $v0, $zero, .L80042464 @@ -379,18 +384,18 @@ glabel func_80041F10 /* 1D874 80042474 26310004 */ addiu $s1, $s1, 4 .L80042478: /* 1D878 80042478 164002B4 */ bnez $s2, .L80042F4C -/* 1D87C 8004247C 00000000 */ nop +/* 1D87C 8004247C 00000000 */ nop /* 1D880 80042480 8EC20000 */ lw $v0, ($s6) /* 1D884 80042484 30420001 */ andi $v0, $v0, 1 /* 1D888 80042488 1440000B */ bnez $v0, .L800424B8 -/* 1D88C 8004248C 00000000 */ nop +/* 1D88C 8004248C 00000000 */ nop /* 1D890 80042490 3C02800A */ lui $v0, %hi(D_8009A63C) /* 1D894 80042494 8042A63C */ lb $v0, %lo(D_8009A63C)($v0) /* 1D898 80042498 14400007 */ bnez $v0, .L800424B8 /* 1D89C 8004249C 24020001 */ addiu $v0, $zero, 1 /* 1D8A0 800424A0 8EC3009C */ lw $v1, 0x9c($s6) /* 1D8A4 800424A4 14620004 */ bne $v1, $v0, .L800424B8 -/* 1D8A8 800424A8 00000000 */ nop +/* 1D8A8 800424A8 00000000 */ nop /* 1D8AC 800424AC 3C040001 */ lui $a0, 1 /* 1D8B0 800424B0 0C037FBF */ jal func_800DFEFC /* 1D8B4 800424B4 34840032 */ ori $a0, $a0, 0x32 @@ -403,7 +408,7 @@ glabel func_80041F10 .L800424CC: /* 1D8CC 800424CC 8E300004 */ lw $s0, 4($s1) /* 1D8D0 800424D0 12000014 */ beqz $s0, .L80042524 -/* 1D8D4 800424D4 00000000 */ nop +/* 1D8D4 800424D4 00000000 */ nop /* 1D8D8 800424D8 8E030000 */ lw $v1, ($s0) /* 1D8DC 800424DC 30620004 */ andi $v0, $v1, 4 /* 1D8E0 800424E0 14400010 */ bnez $v0, .L80042524 @@ -417,7 +422,7 @@ glabel func_80041F10 /* 1D8FC 800424FC 14400007 */ bnez $v0, .L8004251C /* 1D900 80042500 30620010 */ andi $v0, $v1, 0x10 /* 1D904 80042504 14400005 */ bnez $v0, .L8004251C -/* 1D908 80042508 00000000 */ nop +/* 1D908 80042508 00000000 */ nop /* 1D90C 8004250C 86850048 */ lh $a1, 0x48($s4) /* 1D910 80042510 82C40020 */ lb $a0, 0x20($s6) /* 1D914 80042514 0C00FB90 */ jal set_defeated @@ -452,12 +457,12 @@ glabel func_80041F10 /* 1D974 80042574 3C01800A */ lui $at, %hi(D_8009A5D0) /* 1D978 80042578 AC22A5D0 */ sw $v0, %lo(D_8009A5D0)($at) /* 1D97C 8004257C 08010BD3 */ j .L80042F4C -/* 1D980 80042580 00000000 */ nop +/* 1D980 80042580 00000000 */ nop .L80042584: /* 1D984 80042584 8EC20000 */ lw $v0, ($s6) /* 1D988 80042588 30420002 */ andi $v0, $v0, 2 /* 1D98C 8004258C 14400009 */ bnez $v0, .L800425B4 -/* 1D990 80042590 00000000 */ nop +/* 1D990 80042590 00000000 */ nop /* 1D994 80042594 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* 1D998 80042598 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 1D99C 8004259C 80620040 */ lb $v0, 0x40($v1) @@ -480,7 +485,7 @@ glabel func_80041F10 .L800425D8: /* 1D9D8 800425D8 8EB40028 */ lw $s4, 0x28($s5) /* 1D9DC 800425DC 1280001B */ beqz $s4, .L8004264C -/* 1D9E0 800425E0 00000000 */ nop +/* 1D9E0 800425E0 00000000 */ nop /* 1D9E4 800425E4 8E820000 */ lw $v0, ($s4) /* 1D9E8 800425E8 18400018 */ blez $v0, .L8004264C /* 1D9EC 800425EC 0000882D */ daddu $s1, $zero, $zero @@ -488,20 +493,20 @@ glabel func_80041F10 .L800425F4: /* 1D9F4 800425F4 8E500004 */ lw $s0, 4($s2) /* 1D9F8 800425F8 1200000F */ beqz $s0, .L80042638 -/* 1D9FC 800425FC 00000000 */ nop +/* 1D9FC 800425FC 00000000 */ nop /* 1DA00 80042600 8E020000 */ lw $v0, ($s0) /* 1DA04 80042604 30420020 */ andi $v0, $v0, 0x20 /* 1DA08 80042608 1440000B */ bnez $v0, .L80042638 -/* 1DA0C 8004260C 00000000 */ nop +/* 1DA0C 8004260C 00000000 */ nop /* 1DA10 80042610 8E02003C */ lw $v0, 0x3c($s0) /* 1DA14 80042614 10400003 */ beqz $v0, .L80042624 -/* 1DA18 80042618 00000000 */ nop +/* 1DA18 80042618 00000000 */ nop /* 1DA1C 8004261C 0C0B1123 */ jal resume_all_script /* 1DA20 80042620 8E040054 */ lw $a0, 0x54($s0) .L80042624: /* 1DA24 80042624 8E020044 */ lw $v0, 0x44($s0) /* 1DA28 80042628 10400003 */ beqz $v0, .L80042638 -/* 1DA2C 8004262C 00000000 */ nop +/* 1DA2C 8004262C 00000000 */ nop /* 1DA30 80042630 0C0B1123 */ jal resume_all_script /* 1DA34 80042634 8E04005C */ lw $a0, 0x5c($s0) .L80042638: @@ -521,7 +526,7 @@ glabel func_80041F10 /* 1DA64 80042664 0C038069 */ jal enable_player_input /* 1DA68 80042668 A2C2000A */ sb $v0, 0xa($s6) /* 1DA6C 8004266C 0C03BD80 */ jal func_800EF600 -/* 1DA70 80042670 00000000 */ nop +/* 1DA70 80042670 00000000 */ nop /* 1DA74 80042674 3C02800A */ lui $v0, %hi(D_8009A63C) /* 1DA78 80042678 8042A63C */ lb $v0, %lo(D_8009A63C)($v0) /* 1DA7C 8004267C 14400226 */ bnez $v0, .L80042F18 @@ -529,7 +534,7 @@ glabel func_80041F10 /* 1DA84 80042684 0C037FBF */ jal func_800DFEFC /* 1DA88 80042688 34840002 */ ori $a0, $a0, 2 /* 1DA8C 8004268C 08010BC6 */ j .L80042F18 -/* 1DA90 80042690 00000000 */ nop +/* 1DA90 80042690 00000000 */ nop .L80042694: /* 1DA94 80042694 8ED40088 */ lw $s4, 0x88($s6) /* 1DA98 80042698 8E820000 */ lw $v0, ($s4) @@ -539,7 +544,7 @@ glabel func_80041F10 .L800426A8: /* 1DAA8 800426A8 8E300004 */ lw $s0, 4($s1) /* 1DAAC 800426AC 1200001B */ beqz $s0, .L8004271C -/* 1DAB0 800426B0 00000000 */ nop +/* 1DAB0 800426B0 00000000 */ nop /* 1DAB4 800426B4 8E030000 */ lw $v1, ($s0) /* 1DAB8 800426B8 30620008 */ andi $v0, $v1, 8 /* 1DABC 800426BC 10400004 */ beqz $v0, .L800426D0 @@ -549,7 +554,7 @@ glabel func_80041F10 /* 1DACC 800426CC 30620020 */ andi $v0, $v1, 0x20 .L800426D0: /* 1DAD0 800426D0 14400012 */ bnez $v0, .L8004271C -/* 1DAD4 800426D4 00000000 */ nop +/* 1DAD4 800426D4 00000000 */ nop /* 1DAD8 800426D8 8E040030 */ lw $a0, 0x30($s0) /* 1DADC 800426DC 1080000F */ beqz $a0, .L8004271C /* 1DAE0 800426E0 2405000A */ addiu $a1, $zero, 0xa @@ -578,11 +583,11 @@ glabel func_80041F10 /* 1DB34 80042734 3C01800A */ lui $at, %hi(D_8009A5D0) /* 1DB38 80042738 AC22A5D0 */ sw $v0, %lo(D_8009A5D0)($at) /* 1DB3C 8004273C 08010BD3 */ j .L80042F4C -/* 1DB40 80042740 00000000 */ nop +/* 1DB40 80042740 00000000 */ nop .L80042744: /* 1DB44 80042744 8EC30090 */ lw $v1, 0x90($s6) /* 1DB48 80042748 14600188 */ bnez $v1, .L80042D6C -/* 1DB4C 8004274C 00000000 */ nop +/* 1DB4C 8004274C 00000000 */ nop /* 1DB50 80042750 08010BD3 */ j .L80042F4C /* 1DB54 80042754 AC850000 */ sw $a1, ($a0) .L80042758: @@ -595,11 +600,11 @@ glabel func_80041F10 .L80042770: /* 1DB70 80042770 8E300004 */ lw $s0, 4($s1) /* 1DB74 80042774 1200000A */ beqz $s0, .L800427A0 -/* 1DB78 80042778 00000000 */ nop +/* 1DB78 80042778 00000000 */ nop /* 1DB7C 8004277C 8E020000 */ lw $v0, ($s0) /* 1DB80 80042780 30420020 */ andi $v0, $v0, 0x20 /* 1DB84 80042784 14400006 */ bnez $v0, .L800427A0 -/* 1DB88 80042788 00000000 */ nop +/* 1DB88 80042788 00000000 */ nop /* 1DB8C 8004278C 0C0B1059 */ jal does_script_exist /* 1DB90 80042790 8E040060 */ lw $a0, 0x60($s0) /* 1DB94 80042794 50400002 */ beql $v0, $zero, .L800427A0 @@ -613,7 +618,7 @@ glabel func_80041F10 /* 1DBB0 800427B0 26310004 */ addiu $s1, $s1, 4 .L800427B4: /* 1DBB4 800427B4 164001E5 */ bnez $s2, .L80042F4C -/* 1DBB8 800427B8 00000000 */ nop +/* 1DBB8 800427B8 00000000 */ nop /* 1DBBC 800427BC 82C2001C */ lb $v0, 0x1c($s6) /* 1DBC0 800427C0 18400024 */ blez $v0, .L80042854 /* 1DBC4 800427C4 0000982D */ daddu $s3, $zero, $zero @@ -621,7 +626,7 @@ glabel func_80041F10 .L800427CC: /* 1DBCC 800427CC 8EB40028 */ lw $s4, 0x28($s5) /* 1DBD0 800427D0 1280001B */ beqz $s4, .L80042840 -/* 1DBD4 800427D4 00000000 */ nop +/* 1DBD4 800427D4 00000000 */ nop /* 1DBD8 800427D8 8E820000 */ lw $v0, ($s4) /* 1DBDC 800427DC 18400018 */ blez $v0, .L80042840 /* 1DBE0 800427E0 0000882D */ daddu $s1, $zero, $zero @@ -629,20 +634,20 @@ glabel func_80041F10 .L800427E8: /* 1DBE8 800427E8 8E500004 */ lw $s0, 4($s2) /* 1DBEC 800427EC 1200000F */ beqz $s0, .L8004282C -/* 1DBF0 800427F0 00000000 */ nop +/* 1DBF0 800427F0 00000000 */ nop /* 1DBF4 800427F4 8E020000 */ lw $v0, ($s0) /* 1DBF8 800427F8 30420020 */ andi $v0, $v0, 0x20 /* 1DBFC 800427FC 1440000B */ bnez $v0, .L8004282C -/* 1DC00 80042800 00000000 */ nop +/* 1DC00 80042800 00000000 */ nop /* 1DC04 80042804 8E02003C */ lw $v0, 0x3c($s0) /* 1DC08 80042808 10400003 */ beqz $v0, .L80042818 -/* 1DC0C 8004280C 00000000 */ nop +/* 1DC0C 8004280C 00000000 */ nop /* 1DC10 80042810 0C0B1123 */ jal resume_all_script /* 1DC14 80042814 8E040054 */ lw $a0, 0x54($s0) .L80042818: /* 1DC18 80042818 8E020044 */ lw $v0, 0x44($s0) /* 1DC1C 8004281C 10400003 */ beqz $v0, .L8004282C -/* 1DC20 80042820 00000000 */ nop +/* 1DC20 80042820 00000000 */ nop /* 1DC24 80042824 0C0B1123 */ jal resume_all_script /* 1DC28 80042828 8E04005C */ lw $a0, 0x5c($s0) .L8004282C: @@ -677,13 +682,13 @@ glabel func_80041F10 .L80042894: /* 1DC94 80042894 8C900004 */ lw $s0, 4($a0) /* 1DC98 80042898 12000009 */ beqz $s0, .L800428C0 -/* 1DC9C 8004289C 00000000 */ nop +/* 1DC9C 8004289C 00000000 */ nop /* 1DCA0 800428A0 8E030000 */ lw $v1, ($s0) /* 1DCA4 800428A4 30620020 */ andi $v0, $v1, 0x20 /* 1DCA8 800428A8 14400005 */ bnez $v0, .L800428C0 /* 1DCAC 800428AC 30620008 */ andi $v0, $v1, 8 /* 1DCB0 800428B0 14400003 */ bnez $v0, .L800428C0 -/* 1DCB4 800428B4 00000000 */ nop +/* 1DCB4 800428B4 00000000 */ nop /* 1DCB8 800428B8 A20600B4 */ sb $a2, 0xb4($s0) /* 1DCBC 800428BC A6E50010 */ sh $a1, 0x10($s7) .L800428C0: @@ -719,7 +724,7 @@ glabel func_80041F10 /* 1DD2C 8004292C 0C038069 */ jal enable_player_input /* 1DD30 80042930 A6E20010 */ sh $v0, 0x10($s7) /* 1DD34 80042934 0C03BD80 */ jal func_800EF600 -/* 1DD38 80042938 00000000 */ nop +/* 1DD38 80042938 00000000 */ nop /* 1DD3C 8004293C 3C05BF80 */ lui $a1, 0xbf80 /* 1DD40 80042940 0C04DF62 */ jal func_80137D88 /* 1DD44 80042944 240400FF */ addiu $a0, $zero, 0xff @@ -734,7 +739,7 @@ glabel func_80041F10 /* 1DD64 80042964 3C01800A */ lui $at, %hi(D_8009A5D0) /* 1DD68 80042968 AC22A5D0 */ sw $v0, %lo(D_8009A5D0)($at) /* 1DD6C 8004296C 08010BD3 */ j .L80042F4C -/* 1DD70 80042970 00000000 */ nop +/* 1DD70 80042970 00000000 */ nop .L80042974: /* 1DD74 80042974 8EC20094 */ lw $v0, 0x94($s6) /* 1DD78 80042978 1040000D */ beqz $v0, .L800429B0 @@ -744,13 +749,13 @@ glabel func_80041F10 /* 1DD88 80042988 AEC20094 */ sw $v0, 0x94($s6) /* 1DD8C 8004298C 8C620000 */ lw $v0, ($v1) /* 1DD90 80042990 14400007 */ bnez $v0, .L800429B0 -/* 1DD94 80042994 00000000 */ nop +/* 1DD94 80042994 00000000 */ nop /* 1DD98 80042998 80620040 */ lb $v0, 0x40($v1) /* 1DD9C 8004299C 14400004 */ bnez $v0, .L800429B0 -/* 1DDA0 800429A0 00000000 */ nop +/* 1DDA0 800429A0 00000000 */ nop /* 1DDA4 800429A4 80620044 */ lb $v0, 0x44($v1) /* 1DDA8 800429A8 10400168 */ beqz $v0, .L80042F4C -/* 1DDAC 800429AC 00000000 */ nop +/* 1DDAC 800429AC 00000000 */ nop .L800429B0: /* 1DDB0 800429B0 3C02800A */ lui $v0, %hi(D_8009A63C) /* 1DDB4 800429B4 8042A63C */ lb $v0, %lo(D_8009A63C)($v0) @@ -762,7 +767,7 @@ glabel func_80041F10 /* 1DDCC 800429CC 0C037FBF */ jal func_800DFEFC /* 1DDD0 800429D0 34840002 */ ori $a0, $a0, 2 /* 1DDD4 800429D4 08010BC9 */ j .L80042F24 -/* 1DDD8 800429D8 00000000 */ nop +/* 1DDD8 800429D8 00000000 */ nop .L800429DC: /* 1DDDC 800429DC 3C040008 */ lui $a0, 8 /* 1DDE0 800429E0 0C037FBF */ jal func_800DFEFC @@ -775,7 +780,7 @@ glabel func_80041F10 .L800429FC: /* 1DDFC 800429FC 8E300004 */ lw $s0, 4($s1) /* 1DE00 80042A00 12000018 */ beqz $s0, .L80042A64 -/* 1DE04 80042A04 00000000 */ nop +/* 1DE04 80042A04 00000000 */ nop /* 1DE08 80042A08 8E030000 */ lw $v1, ($s0) /* 1DE0C 80042A0C 30620008 */ andi $v0, $v1, 8 /* 1DE10 80042A10 10400004 */ beqz $v0, .L80042A24 @@ -785,7 +790,7 @@ glabel func_80041F10 /* 1DE20 80042A20 30620020 */ andi $v0, $v1, 0x20 .L80042A24: /* 1DE24 80042A24 1440000F */ bnez $v0, .L80042A64 -/* 1DE28 80042A28 00000000 */ nop +/* 1DE28 80042A28 00000000 */ nop /* 1DE2C 80042A2C 8E040030 */ lw $a0, 0x30($s0) /* 1DE30 80042A30 1080000C */ beqz $a0, .L80042A64 /* 1DE34 80042A34 2405000A */ addiu $a1, $zero, 0xa @@ -811,11 +816,11 @@ glabel func_80041F10 /* 1DE7C 80042A7C 3C01800A */ lui $at, %hi(D_8009A5D0) /* 1DE80 80042A80 AC22A5D0 */ sw $v0, %lo(D_8009A5D0)($at) /* 1DE84 80042A84 08010BD3 */ j .L80042F4C -/* 1DE88 80042A88 00000000 */ nop +/* 1DE88 80042A88 00000000 */ nop .L80042A8C: /* 1DE8C 80042A8C 8EC30090 */ lw $v1, 0x90($s6) /* 1DE90 80042A90 146000B6 */ bnez $v1, .L80042D6C -/* 1DE94 80042A94 00000000 */ nop +/* 1DE94 80042A94 00000000 */ nop /* 1DE98 80042A98 08010BD3 */ j .L80042F4C /* 1DE9C 80042A9C AC820000 */ sw $v0, ($a0) .L80042AA0: @@ -827,11 +832,11 @@ glabel func_80041F10 .L80042AB4: /* 1DEB4 80042AB4 8E300004 */ lw $s0, 4($s1) /* 1DEB8 80042AB8 1200000A */ beqz $s0, .L80042AE4 -/* 1DEBC 80042ABC 00000000 */ nop +/* 1DEBC 80042ABC 00000000 */ nop /* 1DEC0 80042AC0 8E020000 */ lw $v0, ($s0) /* 1DEC4 80042AC4 30420020 */ andi $v0, $v0, 0x20 /* 1DEC8 80042AC8 14400006 */ bnez $v0, .L80042AE4 -/* 1DECC 80042ACC 00000000 */ nop +/* 1DECC 80042ACC 00000000 */ nop /* 1DED0 80042AD0 0C0B1059 */ jal does_script_exist /* 1DED4 80042AD4 8E040060 */ lw $a0, 0x60($s0) /* 1DED8 80042AD8 50400002 */ beql $v0, $zero, .L80042AE4 @@ -845,7 +850,7 @@ glabel func_80041F10 /* 1DEF4 80042AF4 26310004 */ addiu $s1, $s1, 4 .L80042AF8: /* 1DEF8 80042AF8 16400114 */ bnez $s2, .L80042F4C -/* 1DEFC 80042AFC 00000000 */ nop +/* 1DEFC 80042AFC 00000000 */ nop /* 1DF00 80042B00 82C2001C */ lb $v0, 0x1c($s6) /* 1DF04 80042B04 18400024 */ blez $v0, .L80042B98 /* 1DF08 80042B08 0000982D */ daddu $s3, $zero, $zero @@ -853,7 +858,7 @@ glabel func_80041F10 .L80042B10: /* 1DF10 80042B10 8EB40028 */ lw $s4, 0x28($s5) /* 1DF14 80042B14 1280001B */ beqz $s4, .L80042B84 -/* 1DF18 80042B18 00000000 */ nop +/* 1DF18 80042B18 00000000 */ nop /* 1DF1C 80042B1C 8E820000 */ lw $v0, ($s4) /* 1DF20 80042B20 18400018 */ blez $v0, .L80042B84 /* 1DF24 80042B24 0000882D */ daddu $s1, $zero, $zero @@ -861,20 +866,20 @@ glabel func_80041F10 .L80042B2C: /* 1DF2C 80042B2C 8E500004 */ lw $s0, 4($s2) /* 1DF30 80042B30 1200000F */ beqz $s0, .L80042B70 -/* 1DF34 80042B34 00000000 */ nop +/* 1DF34 80042B34 00000000 */ nop /* 1DF38 80042B38 8E020000 */ lw $v0, ($s0) /* 1DF3C 80042B3C 30420020 */ andi $v0, $v0, 0x20 /* 1DF40 80042B40 1440000B */ bnez $v0, .L80042B70 -/* 1DF44 80042B44 00000000 */ nop +/* 1DF44 80042B44 00000000 */ nop /* 1DF48 80042B48 8E02003C */ lw $v0, 0x3c($s0) /* 1DF4C 80042B4C 10400003 */ beqz $v0, .L80042B5C -/* 1DF50 80042B50 00000000 */ nop +/* 1DF50 80042B50 00000000 */ nop /* 1DF54 80042B54 0C0B1123 */ jal resume_all_script /* 1DF58 80042B58 8E040054 */ lw $a0, 0x54($s0) .L80042B5C: /* 1DF5C 80042B5C 8E020044 */ lw $v0, 0x44($s0) /* 1DF60 80042B60 10400003 */ beqz $v0, .L80042B70 -/* 1DF64 80042B64 00000000 */ nop +/* 1DF64 80042B64 00000000 */ nop /* 1DF68 80042B68 0C0B1123 */ jal resume_all_script /* 1DF6C 80042B6C 8E04005C */ lw $a0, 0x5c($s0) .L80042B70: @@ -891,9 +896,9 @@ glabel func_80041F10 /* 1DF94 80042B94 26B50004 */ addiu $s5, $s5, 4 .L80042B98: /* 1DF98 80042B98 0C038069 */ jal enable_player_input -/* 1DF9C 80042B9C 00000000 */ nop +/* 1DF9C 80042B9C 00000000 */ nop /* 1DFA0 80042BA0 0C03BD80 */ jal func_800EF600 -/* 1DFA4 80042BA4 00000000 */ nop +/* 1DFA4 80042BA4 00000000 */ nop /* 1DFA8 80042BA8 3C05BF80 */ lui $a1, 0xbf80 /* 1DFAC 80042BAC 0C04DF62 */ jal func_80137D88 /* 1DFB0 80042BB0 240400FF */ addiu $a0, $zero, 0xff @@ -903,7 +908,7 @@ glabel func_80041F10 /* 1DFC0 80042BC0 3C01800A */ lui $at, %hi(D_8009A5D0) /* 1DFC4 80042BC4 AC22A5D0 */ sw $v0, %lo(D_8009A5D0)($at) /* 1DFC8 80042BC8 08010BD3 */ j .L80042F4C -/* 1DFCC 80042BCC 00000000 */ nop +/* 1DFCC 80042BCC 00000000 */ nop .L80042BD0: /* 1DFD0 80042BD0 8EC20094 */ lw $v0, 0x94($s6) /* 1DFD4 80042BD4 104000D3 */ beqz $v0, .L80042F24 @@ -913,15 +918,15 @@ glabel func_80041F10 /* 1DFE4 80042BE4 AEC20094 */ sw $v0, 0x94($s6) /* 1DFE8 80042BE8 8C620000 */ lw $v0, ($v1) /* 1DFEC 80042BEC 144000CD */ bnez $v0, .L80042F24 -/* 1DFF0 80042BF0 00000000 */ nop +/* 1DFF0 80042BF0 00000000 */ nop /* 1DFF4 80042BF4 80620040 */ lb $v0, 0x40($v1) /* 1DFF8 80042BF8 144000CA */ bnez $v0, .L80042F24 -/* 1DFFC 80042BFC 00000000 */ nop +/* 1DFFC 80042BFC 00000000 */ nop /* 1E000 80042C00 80620044 */ lb $v0, 0x44($v1) /* 1E004 80042C04 104000D1 */ beqz $v0, .L80042F4C -/* 1E008 80042C08 00000000 */ nop +/* 1E008 80042C08 00000000 */ nop /* 1E00C 80042C0C 08010BC9 */ j .L80042F24 -/* 1E010 80042C10 00000000 */ nop +/* 1E010 80042C10 00000000 */ nop .L80042C14: /* 1E014 80042C14 82C2001C */ lb $v0, 0x1c($s6) /* 1E018 80042C18 184000BB */ blez $v0, .L80042F08 @@ -930,7 +935,7 @@ glabel func_80041F10 .L80042C24: /* 1E024 80042C24 8EB40028 */ lw $s4, 0x28($s5) /* 1E028 80042C28 1280001B */ beqz $s4, .L80042C98 -/* 1E02C 80042C2C 00000000 */ nop +/* 1E02C 80042C2C 00000000 */ nop /* 1E030 80042C30 8E820000 */ lw $v0, ($s4) /* 1E034 80042C34 18400018 */ blez $v0, .L80042C98 /* 1E038 80042C38 0000882D */ daddu $s1, $zero, $zero @@ -938,20 +943,20 @@ glabel func_80041F10 .L80042C40: /* 1E040 80042C40 8E500004 */ lw $s0, 4($s2) /* 1E044 80042C44 1200000F */ beqz $s0, .L80042C84 -/* 1E048 80042C48 00000000 */ nop +/* 1E048 80042C48 00000000 */ nop /* 1E04C 80042C4C 8E020000 */ lw $v0, ($s0) /* 1E050 80042C50 30420020 */ andi $v0, $v0, 0x20 /* 1E054 80042C54 1440000B */ bnez $v0, .L80042C84 -/* 1E058 80042C58 00000000 */ nop +/* 1E058 80042C58 00000000 */ nop /* 1E05C 80042C5C 8E02003C */ lw $v0, 0x3c($s0) /* 1E060 80042C60 10400003 */ beqz $v0, .L80042C70 -/* 1E064 80042C64 00000000 */ nop +/* 1E064 80042C64 00000000 */ nop /* 1E068 80042C68 0C0B1123 */ jal resume_all_script /* 1E06C 80042C6C 8E040054 */ lw $a0, 0x54($s0) .L80042C70: /* 1E070 80042C70 8E020044 */ lw $v0, 0x44($s0) /* 1E074 80042C74 10400003 */ beqz $v0, .L80042C84 -/* 1E078 80042C78 00000000 */ nop +/* 1E078 80042C78 00000000 */ nop /* 1E07C 80042C7C 0C0B1123 */ jal resume_all_script /* 1E080 80042C80 8E04005C */ lw $a0, 0x5c($s0) .L80042C84: @@ -967,7 +972,7 @@ glabel func_80041F10 /* 1E0A4 80042CA4 1440FFDF */ bnez $v0, .L80042C24 /* 1E0A8 80042CA8 26B50004 */ addiu $s5, $s5, 4 /* 1E0AC 80042CAC 08010BC2 */ j .L80042F08 -/* 1E0B0 80042CB0 00000000 */ nop +/* 1E0B0 80042CB0 00000000 */ nop .L80042CB4: /* 1E0B4 80042CB4 8ED40088 */ lw $s4, 0x88($s6) /* 1E0B8 80042CB8 8E820000 */ lw $v0, ($s4) @@ -977,7 +982,7 @@ glabel func_80041F10 .L80042CC8: /* 1E0C8 80042CC8 8E300004 */ lw $s0, 4($s1) /* 1E0CC 80042CCC 12000018 */ beqz $s0, .L80042D30 -/* 1E0D0 80042CD0 00000000 */ nop +/* 1E0D0 80042CD0 00000000 */ nop /* 1E0D4 80042CD4 8E030000 */ lw $v1, ($s0) /* 1E0D8 80042CD8 30620008 */ andi $v0, $v1, 8 /* 1E0DC 80042CDC 10400004 */ beqz $v0, .L80042CF0 @@ -987,7 +992,7 @@ glabel func_80041F10 /* 1E0EC 80042CEC 30620020 */ andi $v0, $v1, 0x20 .L80042CF0: /* 1E0F0 80042CF0 1440000F */ bnez $v0, .L80042D30 -/* 1E0F4 80042CF4 00000000 */ nop +/* 1E0F4 80042CF4 00000000 */ nop /* 1E0F8 80042CF8 8E040030 */ lw $a0, 0x30($s0) /* 1E0FC 80042CFC 1080000C */ beqz $a0, .L80042D30 /* 1E100 80042D00 2405000A */ addiu $a1, $zero, 0xa @@ -1013,11 +1018,11 @@ glabel func_80041F10 /* 1E148 80042D48 3C01800A */ lui $at, %hi(D_8009A5D0) /* 1E14C 80042D4C AC22A5D0 */ sw $v0, %lo(D_8009A5D0)($at) /* 1E150 80042D50 08010BD3 */ j .L80042F4C -/* 1E154 80042D54 00000000 */ nop +/* 1E154 80042D54 00000000 */ nop .L80042D58: /* 1E158 80042D58 8EC30090 */ lw $v1, 0x90($s6) /* 1E15C 80042D5C 14600003 */ bnez $v1, .L80042D6C -/* 1E160 80042D60 00000000 */ nop +/* 1E160 80042D60 00000000 */ nop /* 1E164 80042D64 08010BD3 */ j .L80042F4C /* 1E168 80042D68 AC820000 */ sw $v0, ($a0) .L80042D6C: @@ -1038,11 +1043,11 @@ glabel func_80041F10 .L80042DA0: /* 1E1A0 80042DA0 8E300004 */ lw $s0, 4($s1) /* 1E1A4 80042DA4 1200000A */ beqz $s0, .L80042DD0 -/* 1E1A8 80042DA8 00000000 */ nop +/* 1E1A8 80042DA8 00000000 */ nop /* 1E1AC 80042DAC 8E020000 */ lw $v0, ($s0) /* 1E1B0 80042DB0 30420020 */ andi $v0, $v0, 0x20 /* 1E1B4 80042DB4 14400006 */ bnez $v0, .L80042DD0 -/* 1E1B8 80042DB8 00000000 */ nop +/* 1E1B8 80042DB8 00000000 */ nop /* 1E1BC 80042DBC 0C0B1059 */ jal does_script_exist /* 1E1C0 80042DC0 8E040060 */ lw $a0, 0x60($s0) /* 1E1C4 80042DC4 50400002 */ beql $v0, $zero, .L80042DD0 @@ -1056,7 +1061,7 @@ glabel func_80041F10 /* 1E1E0 80042DE0 26310004 */ addiu $s1, $s1, 4 .L80042DE4: /* 1E1E4 80042DE4 16400059 */ bnez $s2, .L80042F4C -/* 1E1E8 80042DE8 00000000 */ nop +/* 1E1E8 80042DE8 00000000 */ nop /* 1E1EC 80042DEC 82C2001C */ lb $v0, 0x1c($s6) /* 1E1F0 80042DF0 18400024 */ blez $v0, .L80042E84 /* 1E1F4 80042DF4 0000982D */ daddu $s3, $zero, $zero @@ -1064,7 +1069,7 @@ glabel func_80041F10 .L80042DFC: /* 1E1FC 80042DFC 8EB40028 */ lw $s4, 0x28($s5) /* 1E200 80042E00 1280001B */ beqz $s4, .L80042E70 -/* 1E204 80042E04 00000000 */ nop +/* 1E204 80042E04 00000000 */ nop /* 1E208 80042E08 8E820000 */ lw $v0, ($s4) /* 1E20C 80042E0C 18400018 */ blez $v0, .L80042E70 /* 1E210 80042E10 0000882D */ daddu $s1, $zero, $zero @@ -1072,20 +1077,20 @@ glabel func_80041F10 .L80042E18: /* 1E218 80042E18 8E500004 */ lw $s0, 4($s2) /* 1E21C 80042E1C 1200000F */ beqz $s0, .L80042E5C -/* 1E220 80042E20 00000000 */ nop +/* 1E220 80042E20 00000000 */ nop /* 1E224 80042E24 8E020000 */ lw $v0, ($s0) /* 1E228 80042E28 30420020 */ andi $v0, $v0, 0x20 /* 1E22C 80042E2C 1440000B */ bnez $v0, .L80042E5C -/* 1E230 80042E30 00000000 */ nop +/* 1E230 80042E30 00000000 */ nop /* 1E234 80042E34 8E02003C */ lw $v0, 0x3c($s0) /* 1E238 80042E38 10400003 */ beqz $v0, .L80042E48 -/* 1E23C 80042E3C 00000000 */ nop +/* 1E23C 80042E3C 00000000 */ nop /* 1E240 80042E40 0C0B1123 */ jal resume_all_script /* 1E244 80042E44 8E040054 */ lw $a0, 0x54($s0) .L80042E48: /* 1E248 80042E48 8E020044 */ lw $v0, 0x44($s0) /* 1E24C 80042E4C 10400003 */ beqz $v0, .L80042E5C -/* 1E250 80042E50 00000000 */ nop +/* 1E250 80042E50 00000000 */ nop /* 1E254 80042E54 0C0B1123 */ jal resume_all_script /* 1E258 80042E58 8E04005C */ lw $a0, 0x5c($s0) .L80042E5C: @@ -1119,13 +1124,13 @@ glabel func_80041F10 .L80042EC0: /* 1E2C0 80042EC0 8C900004 */ lw $s0, 4($a0) /* 1E2C4 80042EC4 12000009 */ beqz $s0, .L80042EEC -/* 1E2C8 80042EC8 00000000 */ nop +/* 1E2C8 80042EC8 00000000 */ nop /* 1E2CC 80042ECC 8E030000 */ lw $v1, ($s0) /* 1E2D0 80042ED0 30620020 */ andi $v0, $v1, 0x20 /* 1E2D4 80042ED4 14400005 */ bnez $v0, .L80042EEC /* 1E2D8 80042ED8 30620008 */ andi $v0, $v1, 8 /* 1E2DC 80042EDC 14400003 */ bnez $v0, .L80042EEC -/* 1E2E0 80042EE0 00000000 */ nop +/* 1E2E0 80042EE0 00000000 */ nop /* 1E2E4 80042EE4 A20600B4 */ sb $a2, 0xb4($s0) /* 1E2E8 80042EE8 A6E50010 */ sh $a1, 0x10($s7) .L80042EEC: @@ -1140,9 +1145,9 @@ glabel func_80041F10 /* 1E304 80042F04 A2C2000A */ sb $v0, 0xa($s6) .L80042F08: /* 1E308 80042F08 0C038069 */ jal enable_player_input -/* 1E30C 80042F0C 00000000 */ nop +/* 1E30C 80042F0C 00000000 */ nop /* 1E310 80042F10 0C03BD80 */ jal func_800EF600 -/* 1E314 80042F14 00000000 */ nop +/* 1E314 80042F14 00000000 */ nop .L80042F18: /* 1E318 80042F18 3C05BF80 */ lui $a1, 0xbf80 /* 1E31C 80042F1C 0C04DF62 */ jal func_80137D88 @@ -1169,7 +1174,7 @@ glabel func_80041F10 .L80042F68: /* 1E368 80042F68 8EB40028 */ lw $s4, 0x28($s5) /* 1E36C 80042F6C 12800026 */ beqz $s4, .L80043008 -/* 1E370 80042F70 00000000 */ nop +/* 1E370 80042F70 00000000 */ nop /* 1E374 80042F74 8E820000 */ lw $v0, ($s4) /* 1E378 80042F78 18400023 */ blez $v0, .L80043008 /* 1E37C 80042F7C 0000882D */ daddu $s1, $zero, $zero @@ -1177,11 +1182,11 @@ glabel func_80041F10 .L80042F84: /* 1E384 80042F84 8E500004 */ lw $s0, 4($s2) /* 1E388 80042F88 1200001A */ beqz $s0, .L80042FF4 -/* 1E38C 80042F8C 00000000 */ nop +/* 1E38C 80042F8C 00000000 */ nop /* 1E390 80042F90 8E020000 */ lw $v0, ($s0) /* 1E394 80042F94 30420020 */ andi $v0, $v0, 0x20 /* 1E398 80042F98 14400016 */ bnez $v0, .L80042FF4 -/* 1E39C 80042F9C 00000000 */ nop +/* 1E39C 80042F9C 00000000 */ nop /* 1E3A0 80042FA0 0C00EABB */ jal get_npc_unsafe /* 1E3A4 80042FA4 86040008 */ lh $a0, 8($s0) /* 1E3A8 80042FA8 0040202D */ daddu $a0, $v0, $zero @@ -1190,7 +1195,7 @@ glabel func_80041F10 /* 1E3B4 80042FB4 1040000F */ beqz $v0, .L80042FF4 /* 1E3B8 80042FB8 30620001 */ andi $v0, $v1, 1 /* 1E3BC 80042FBC 10400007 */ beqz $v0, .L80042FDC -/* 1E3C0 80042FC0 00000000 */ nop +/* 1E3C0 80042FC0 00000000 */ nop /* 1E3C4 80042FC4 8C820000 */ lw $v0, ($a0) /* 1E3C8 80042FC8 005E1025 */ or $v0, $v0, $fp /* 1E3CC 80042FCC AC820000 */ sw $v0, ($a0) diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_8004309C.s b/asm/nonmatchings/code_1a1f0_len_5390/func_8004309C.s index 85d04917ab..b7fcfd818f 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_8004309C.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/func_8004309C.s @@ -13,9 +13,9 @@ glabel func_8004309C /* 1E4BC 800430BC AFB00010 */ sw $s0, 0x10($sp) /* 1E4C0 800430C0 24020001 */ addiu $v0, $zero, 1 /* 1E4C4 800430C4 1062001B */ beq $v1, $v0, .L80043134 -/* 1E4C8 800430C8 00000000 */ nop +/* 1E4C8 800430C8 00000000 */ nop /* 1E4CC 800430CC 08010C70 */ j .L800431C0 -/* 1E4D0 800430D0 00000000 */ nop +/* 1E4D0 800430D0 00000000 */ nop .L800430D4: /* 1E4D4 800430D4 8E30008C */ lw $s0, 0x8c($s1) /* 1E4D8 800430D8 8E020038 */ lw $v0, 0x38($s0) @@ -23,14 +23,14 @@ glabel func_8004309C /* 1E4E0 800430E0 0000882D */ daddu $s1, $zero, $zero /* 1E4E4 800430E4 8E040050 */ lw $a0, 0x50($s0) /* 1E4E8 800430E8 0C0B1059 */ jal does_script_exist -/* 1E4EC 800430EC 00000000 */ nop +/* 1E4EC 800430EC 00000000 */ nop /* 1E4F0 800430F0 50400002 */ beql $v0, $zero, .L800430FC /* 1E4F4 800430F4 AE000038 */ sw $zero, 0x38($s0) /* 1E4F8 800430F8 24110001 */ addiu $s1, $zero, 1 .L800430FC: /* 1E4FC 800430FC 8E020040 */ lw $v0, 0x40($s0) /* 1E500 80043100 10400006 */ beqz $v0, .L8004311C -/* 1E504 80043104 00000000 */ nop +/* 1E504 80043104 00000000 */ nop /* 1E508 80043108 0C0B1059 */ jal does_script_exist /* 1E50C 8004310C 8E040058 */ lw $a0, 0x58($s0) /* 1E510 80043110 50400002 */ beql $v0, $zero, .L8004311C @@ -42,29 +42,29 @@ glabel func_8004309C /* 1E524 80043124 3C01800A */ lui $at, %hi(D_8009A5D0) /* 1E528 80043128 AC22A5D0 */ sw $v0, %lo(D_8009A5D0)($at) /* 1E52C 8004312C 08010C70 */ j .L800431C0 -/* 1E530 80043130 00000000 */ nop +/* 1E530 80043130 00000000 */ nop .L80043134: /* 1E534 80043134 0C0B1192 */ jal resume_all_group /* 1E538 80043138 24040001 */ addiu $a0, $zero, 1 /* 1E53C 8004313C 8E30008C */ lw $s0, 0x8c($s1) /* 1E540 80043140 12000006 */ beqz $s0, .L8004315C -/* 1E544 80043144 00000000 */ nop +/* 1E544 80043144 00000000 */ nop /* 1E548 80043148 8E02003C */ lw $v0, 0x3c($s0) /* 1E54C 8004314C 10400003 */ beqz $v0, .L8004315C -/* 1E550 80043150 00000000 */ nop +/* 1E550 80043150 00000000 */ nop /* 1E554 80043154 0C0B1123 */ jal resume_all_script /* 1E558 80043158 8E040054 */ lw $a0, 0x54($s0) .L8004315C: /* 1E55C 8004315C 0C038069 */ jal enable_player_input -/* 1E560 80043160 00000000 */ nop +/* 1E560 80043160 00000000 */ nop /* 1E564 80043164 0C03BD80 */ jal func_800EF600 -/* 1E568 80043168 00000000 */ nop +/* 1E568 80043168 00000000 */ nop /* 1E56C 8004316C 3C028011 */ lui $v0, %hi(gPlayerStatus) /* 1E570 80043170 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) /* 1E574 80043174 804300B4 */ lb $v1, 0xb4($v0) /* 1E578 80043178 2402000C */ addiu $v0, $zero, 0xc /* 1E57C 8004317C 14620003 */ bne $v1, $v0, .L8004318C -/* 1E580 80043180 00000000 */ nop +/* 1E580 80043180 00000000 */ nop /* 1E584 80043184 0C039769 */ jal set_action_state /* 1E588 80043188 0000202D */ daddu $a0, $zero, $zero .L8004318C: diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_800431DC.s b/asm/nonmatchings/code_1a1f0_len_5390/func_800431DC.s index 749025b275..09952d9717 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_800431DC.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/func_800431DC.s @@ -42,7 +42,7 @@ glabel func_800431DC /* 1E670 80043270 868200B0 */ lh $v0, 0xb0($s4) /* 1E674 80043274 968300B2 */ lhu $v1, 0xb2($s4) /* 1E678 80043278 44823000 */ mtc1 $v0, $f6 -/* 1E67C 8004327C 00000000 */ nop +/* 1E67C 8004327C 00000000 */ nop /* 1E680 80043280 468031A0 */ cvt.s.w $f6, $f6 /* 1E684 80043284 00031C00 */ sll $v1, $v1, 0x10 /* 1E688 80043288 00031403 */ sra $v0, $v1, 0x10 @@ -50,7 +50,7 @@ glabel func_800431DC /* 1E690 80043290 00431021 */ addu $v0, $v0, $v1 /* 1E694 80043294 00021043 */ sra $v0, $v0, 1 /* 1E698 80043298 44824000 */ mtc1 $v0, $f8 -/* 1E69C 8004329C 00000000 */ nop +/* 1E69C 8004329C 00000000 */ nop /* 1E6A0 800432A0 46804220 */ cvt.s.w $f8, $f8 /* 1E6A4 800432A4 E7A6003C */ swc1 $f6, 0x3c($sp) /* 1E6A8 800432A8 E7A80040 */ swc1 $f8, 0x40($sp) @@ -81,7 +81,7 @@ glabel func_800431DC /* 1E708 80043308 01021021 */ addu $v0, $t0, $v0 /* 1E70C 8004330C 8C530028 */ lw $s3, 0x28($v0) /* 1E710 80043310 126000AB */ beqz $s3, .L800435C0 -/* 1E714 80043314 00000000 */ nop +/* 1E714 80043314 00000000 */ nop /* 1E718 80043318 8E620000 */ lw $v0, ($s3) /* 1E71C 8004331C 184000A8 */ blez $v0, .L800435C0 /* 1E720 80043320 0000902D */ daddu $s2, $zero, $zero @@ -100,10 +100,10 @@ glabel func_800431DC /* 1E750 80043350 3C020800 */ lui $v0, 0x800 /* 1E754 80043354 00621024 */ and $v0, $v1, $v0 /* 1E758 80043358 14400094 */ bnez $v0, .L800435AC -/* 1E75C 8004335C 00000000 */ nop +/* 1E75C 8004335C 00000000 */ nop /* 1E760 80043360 8E220020 */ lw $v0, 0x20($s1) /* 1E764 80043364 10400091 */ beqz $v0, .L800435AC -/* 1E768 80043368 00000000 */ nop +/* 1E768 80043368 00000000 */ nop /* 1E76C 8004336C 0C00EABB */ jal get_npc_unsafe /* 1E770 80043370 86240008 */ lh $a0, 8($s1) /* 1E774 80043374 0040802D */ daddu $s0, $v0, $zero @@ -111,61 +111,61 @@ glabel func_800431DC /* 1E77C 8004337C C7A60030 */ lwc1 $f6, 0x30($sp) /* 1E780 80043380 4606D081 */ sub.s $f2, $f26, $f6 /* 1E784 80043384 46021082 */ mul.s $f2, $f2, $f2 -/* 1E788 80043388 00000000 */ nop +/* 1E788 80043388 00000000 */ nop /* 1E78C 8004338C C61C0040 */ lwc1 $f28, 0x40($s0) /* 1E790 80043390 C7A80038 */ lwc1 $f8, 0x38($sp) /* 1E794 80043394 4608E001 */ sub.s $f0, $f28, $f8 /* 1E798 80043398 46000002 */ mul.s $f0, $f0, $f0 -/* 1E79C 8004339C 00000000 */ nop +/* 1E79C 8004339C 00000000 */ nop /* 1E7A0 800433A0 860200A8 */ lh $v0, 0xa8($s0) /* 1E7A4 800433A4 860300A6 */ lh $v1, 0xa6($s0) /* 1E7A8 800433A8 44823000 */ mtc1 $v0, $f6 -/* 1E7AC 800433AC 00000000 */ nop +/* 1E7AC 800433AC 00000000 */ nop /* 1E7B0 800433B0 468031A0 */ cvt.s.w $f6, $f6 /* 1E7B4 800433B4 4483F000 */ mtc1 $v1, $f30 -/* 1E7B8 800433B8 00000000 */ nop +/* 1E7B8 800433B8 00000000 */ nop /* 1E7BC 800433BC 4680F7A0 */ cvt.s.w $f30, $f30 /* 1E7C0 800433C0 46001300 */ add.s $f12, $f2, $f0 /* 1E7C4 800433C4 E7A60044 */ swc1 $f6, 0x44($sp) /* 1E7C8 800433C8 C618003C */ lwc1 $f24, 0x3c($s0) /* 1E7CC 800433CC 46006104 */ sqrt.s $f4, $f12 /* 1E7D0 800433D0 46042032 */ c.eq.s $f4, $f4 -/* 1E7D4 800433D4 00000000 */ nop +/* 1E7D4 800433D4 00000000 */ nop /* 1E7D8 800433D8 45010004 */ bc1t .L800433EC -/* 1E7DC 800433DC 00000000 */ nop +/* 1E7DC 800433DC 00000000 */ nop /* 1E7E0 800433E0 0C0187BC */ jal sqrtf -/* 1E7E4 800433E4 00000000 */ nop +/* 1E7E4 800433E4 00000000 */ nop /* 1E7E8 800433E8 46000106 */ mov.s $f4, $f0 .L800433EC: /* 1E7EC 800433EC C7A80040 */ lwc1 $f8, 0x40($sp) /* 1E7F0 800433F0 461E4000 */ add.s $f0, $f8, $f30 /* 1E7F4 800433F4 46002586 */ mov.s $f22, $f4 /* 1E7F8 800433F8 4616003E */ c.le.s $f0, $f22 -/* 1E7FC 800433FC 00000000 */ nop +/* 1E7FC 800433FC 00000000 */ nop /* 1E800 80043400 4501006A */ bc1t .L800435AC -/* 1E804 80043404 00000000 */ nop +/* 1E804 80043404 00000000 */ nop /* 1E808 80043408 C7A60044 */ lwc1 $f6, 0x44($sp) /* 1E80C 8004340C 4606C000 */ add.s $f0, $f24, $f6 /* 1E810 80043410 C7A80034 */ lwc1 $f8, 0x34($sp) /* 1E814 80043414 4608003C */ c.lt.s $f0, $f8 -/* 1E818 80043418 00000000 */ nop +/* 1E818 80043418 00000000 */ nop /* 1E81C 8004341C 45010063 */ bc1t .L800435AC -/* 1E820 80043420 00000000 */ nop +/* 1E820 80043420 00000000 */ nop /* 1E824 80043424 C7A6003C */ lwc1 $f6, 0x3c($sp) /* 1E828 80043428 46064000 */ add.s $f0, $f8, $f6 /* 1E82C 8004342C 4618003C */ c.lt.s $f0, $f24 -/* 1E830 80043430 00000000 */ nop +/* 1E830 80043430 00000000 */ nop /* 1E834 80043434 4501005D */ bc1t .L800435AC -/* 1E838 80043438 00000000 */ nop +/* 1E838 80043438 00000000 */ nop /* 1E83C 8004343C 0C00A6C9 */ jal clamp_angle /* 1E840 80043440 C68C00A8 */ lwc1 $f12, 0xa8($s4) /* 1E844 80043444 3C014334 */ lui $at, 0x4334 /* 1E848 80043448 44811000 */ mtc1 $at, $f2 -/* 1E84C 8004344C 00000000 */ nop +/* 1E84C 8004344C 00000000 */ nop /* 1E850 80043450 4602003C */ c.lt.s $f0, $f2 -/* 1E854 80043454 00000000 */ nop +/* 1E854 80043454 00000000 */ nop /* 1E858 80043458 4500000F */ bc1f .L80043498 -/* 1E85C 8004345C 00000000 */ nop +/* 1E85C 8004345C 00000000 */ nop /* 1E860 80043460 C6EC006C */ lwc1 $f12, 0x6c($s7) /* 1E864 80043464 3C0142F0 */ lui $at, 0x42f0 /* 1E868 80043468 44814000 */ mtc1 $at, $f8 @@ -193,11 +193,11 @@ glabel func_800431DC /* 1E8BC 800434BC 46000506 */ mov.s $f20, $f0 /* 1E8C0 800434C0 3C014270 */ lui $at, 0x4270 /* 1E8C4 800434C4 44813000 */ mtc1 $at, $f6 -/* 1E8C8 800434C8 00000000 */ nop +/* 1E8C8 800434C8 00000000 */ nop /* 1E8CC 800434CC 4606A301 */ sub.s $f12, $f20, $f6 .L800434D0: /* 1E8D0 800434D0 0C00A6C9 */ jal clamp_angle -/* 1E8D4 800434D4 00000000 */ nop +/* 1E8D4 800434D4 00000000 */ nop /* 1E8D8 800434D8 46000506 */ mov.s $f20, $f0 .L800434DC: /* 1E8DC 800434DC C7AC0030 */ lwc1 $f12, 0x30($sp) @@ -212,7 +212,7 @@ glabel func_800431DC /* 1E900 80043500 44811000 */ mtc1 $at, $f2 /* 1E904 80043504 46000005 */ abs.s $f0, $f0 /* 1E908 80043508 4600103C */ c.lt.s $f2, $f0 -/* 1E90C 8004350C 00000000 */ nop +/* 1E90C 8004350C 00000000 */ nop /* 1E910 80043510 45010026 */ bc1t .L800435AC /* 1E914 80043514 3C030001 */ lui $v1, 1 /* 1E918 80043518 8E220000 */ lw $v0, ($s1) @@ -242,13 +242,13 @@ glabel func_800431DC /* 1E978 80043578 0C0376B9 */ jal func_800DDAE4 /* 1E97C 8004357C E7A2001C */ swc1 $f2, 0x1c($sp) /* 1E980 80043580 1440000A */ bnez $v0, .L800435AC -/* 1E984 80043584 00000000 */ nop +/* 1E984 80043584 00000000 */ nop .L80043588: /* 1E988 80043588 C7A60048 */ lwc1 $f6, 0x48($sp) /* 1E98C 8004358C 4606B03C */ c.lt.s $f22, $f6 -/* 1E990 80043590 00000000 */ nop +/* 1E990 80043590 00000000 */ nop /* 1E994 80043594 45000005 */ bc1f .L800435AC -/* 1E998 80043598 00000000 */ nop +/* 1E998 80043598 00000000 */ nop /* 1E99C 8004359C 0200F02D */ daddu $fp, $s0, $zero /* 1E9A0 800435A0 0220B02D */ daddu $s6, $s1, $zero /* 1E9A4 800435A4 E7B60048 */ swc1 $f22, 0x48($sp) @@ -272,9 +272,9 @@ glabel func_800431DC /* 1E9E0 800435E0 14400021 */ bnez $v0, .L80043668 /* 1E9E4 800435E4 0000102D */ daddu $v0, $zero, $zero /* 1E9E8 800435E8 13C0001F */ beqz $fp, .L80043668 -/* 1E9EC 800435EC 00000000 */ nop +/* 1E9EC 800435EC 00000000 */ nop /* 1E9F0 800435F0 0C04D07A */ jal func_801341E8 -/* 1E9F4 800435F4 00000000 */ nop +/* 1E9F4 800435F4 00000000 */ nop /* 1E9F8 800435F8 1440001B */ bnez $v0, .L80043668 /* 1E9FC 800435FC 0000102D */ daddu $v0, $zero, $zero /* 1EA00 80043600 8E830000 */ lw $v1, ($s4) @@ -286,7 +286,7 @@ glabel func_800431DC /* 1EA18 80043618 10800012 */ beqz $a0, .L80043664 /* 1EA1C 8004361C AE830000 */ sw $v1, ($s4) /* 1EA20 80043620 0C03A5EE */ jal func_800E97B8 -/* 1EA24 80043624 00000000 */ nop +/* 1EA24 80043624 00000000 */ nop /* 1EA28 80043628 24020001 */ addiu $v0, $zero, 1 /* 1EA2C 8004362C 24030005 */ addiu $v1, $zero, 5 /* 1EA30 80043630 3C01800B */ lui $at, %hi(gCurrentEncounter+0x5) @@ -301,7 +301,7 @@ glabel func_800431DC /* 1EA54 80043654 3C01800B */ lui $at, %hi(gCurrentEncounter+0x88) /* 1EA58 80043658 AC280F98 */ sw $t0, %lo(gCurrentEncounter+0x88)($at) /* 1EA5C 8004365C 08010D9A */ j .L80043668 -/* 1EA60 80043660 00000000 */ nop +/* 1EA60 80043660 00000000 */ nop .L80043664: /* 1EA64 80043664 0000102D */ daddu $v0, $zero, $zero .L80043668: diff --git a/asm/nonmatchings/code_1a1f0_len_5390/show_first_strike_message.s b/asm/nonmatchings/code_1a1f0_len_5390/show_first_strike_message.s index f450985c4d..d4e5ce7227 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/show_first_strike_message.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/show_first_strike_message.s @@ -13,7 +13,7 @@ glabel show_first_strike_message /* 1D07C 80041C7C 3C01800A */ lui $at, %hi(D_8009A668) /* 1D080 80041C80 A422A668 */ sh $v0, %lo(D_8009A668)($at) /* 1D084 80041C84 080107C0 */ j .L80041F00 -/* 1D088 80041C88 00000000 */ nop +/* 1D088 80041C88 00000000 */ nop .L80041C8C: /* 1D08C 80041C8C 3C02800A */ lui $v0, %hi(D_8009A668) /* 1D090 80041C90 2442A668 */ addiu $v0, $v0, %lo(D_8009A668) @@ -33,9 +33,9 @@ glabel show_first_strike_message /* 1D0C4 80041CC4 10620005 */ beq $v1, $v0, .L80041CDC /* 1D0C8 80041CC8 24020002 */ addiu $v0, $zero, 2 /* 1D0CC 80041CCC 1062005D */ beq $v1, $v0, .L80041E44 -/* 1D0D0 80041CD0 00000000 */ nop +/* 1D0D0 80041CD0 00000000 */ nop /* 1D0D4 80041CD4 080107C0 */ j .L80041F00 -/* 1D0D8 80041CD8 00000000 */ nop +/* 1D0D8 80041CD8 00000000 */ nop .L80041CDC: /* 1D0DC 80041CDC 80A30005 */ lb $v1, 5($a1) /* 1D0E0 80041CE0 24020004 */ addiu $v0, $zero, 4 @@ -46,13 +46,13 @@ glabel show_first_strike_message /* 1D0F4 80041CF4 10620009 */ beq $v1, $v0, .L80041D1C /* 1D0F8 80041CF8 3C04001D */ lui $a0, 0x1d /* 1D0FC 80041CFC 080107C0 */ j .L80041F00 -/* 1D100 80041D00 00000000 */ nop +/* 1D100 80041D00 00000000 */ nop .L80041D04: /* 1D104 80041D04 24020006 */ addiu $v0, $zero, 6 /* 1D108 80041D08 10620029 */ beq $v1, $v0, .L80041DB0 /* 1D10C 80041D0C 3C04001D */ lui $a0, 0x1d /* 1D110 80041D10 080107C0 */ j .L80041F00 -/* 1D114 80041D14 00000000 */ nop +/* 1D114 80041D14 00000000 */ nop .L80041D18: /* 1D118 80041D18 3C04001D */ lui $a0, 0x1d .L80041D1C: diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_80027088.s b/asm/nonmatchings/code_1b40_len_20b0/func_80027088.s index 261216a6d5..c1543866e9 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_80027088.s +++ b/asm/nonmatchings/code_1b40_len_20b0/func_80027088.s @@ -8,11 +8,12 @@ glabel func_80027088 /* 2494 80027094 1040003B */ beqz $v0, .L80027184 /* 2498 80027098 AFBF0010 */ sw $ra, 0x10($sp) /* 249C 8002709C 00051080 */ sll $v0, $a1, 2 -/* 24A0 800270A0 3C018009 */ lui $at, %hi(D_80097D48) +/* 24A0 800270A0 3C018009 */ lui $at, %hi(jtbl_80097D48_73148) /* 24A4 800270A4 00220821 */ addu $at, $at, $v0 -/* 24A8 800270A8 8C227D48 */ lw $v0, %lo(D_80097D48)($at) +/* 24A8 800270A8 8C227D48 */ lw $v0, %lo(jtbl_80097D48_73148)($at) /* 24AC 800270AC 00400008 */ jr $v0 /* 24B0 800270B0 00000000 */ nop +glabel L800270B4_24B4 /* 24B4 800270B4 24040003 */ addiu $a0, $zero, 3 /* 24B8 800270B8 3C02800A */ lui $v0, %hi(D_8009A650) /* 24BC 800270BC 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) @@ -25,6 +26,7 @@ glabel func_80027088 /* 24D8 800270D8 AC430000 */ sw $v1, ($v0) /* 24DC 800270DC 08009C61 */ j .L80027184 /* 24E0 800270E0 00000000 */ nop +glabel L800270E4_24E4 /* 24E4 800270E4 24040001 */ addiu $a0, $zero, 1 /* 24E8 800270E8 3C02800A */ lui $v0, %hi(D_8009A650) /* 24EC 800270EC 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) @@ -35,6 +37,7 @@ glabel func_80027088 /* 2500 80027100 00651824 */ and $v1, $v1, $a1 /* 2504 80027104 08009C56 */ j .L80027158 /* 2508 80027108 34630100 */ ori $v1, $v1, 0x100 +glabel L8002710C_250C /* 250C 8002710C 24040002 */ addiu $a0, $zero, 2 /* 2510 80027110 3C02800A */ lui $v0, %hi(D_8009A650) /* 2514 80027114 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) @@ -45,6 +48,7 @@ glabel func_80027088 /* 2528 80027128 00651824 */ and $v1, $v1, $a1 /* 252C 8002712C 08009C56 */ j .L80027158 /* 2530 80027130 34630300 */ ori $v1, $v1, 0x300 +glabel L80027134_2534 /* 2534 80027134 24040002 */ addiu $a0, $zero, 2 /* 2538 80027138 3C02800A */ lui $v0, %hi(D_8009A650) /* 253C 8002713C 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) @@ -59,6 +63,7 @@ glabel func_80027088 /* 255C 8002715C AC430000 */ sw $v1, ($v0) /* 2560 80027160 08009C61 */ j .L80027184 /* 2564 80027164 00000000 */ nop +glabel L80027168_2568 /* 2568 80027168 3C03800A */ lui $v1, %hi(D_8009A650) /* 256C 8002716C 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) /* 2570 80027170 8C620000 */ lw $v0, ($v1) diff --git a/asm/nonmatchings/code_20ec0_len_5040/DoBasicAI.s b/asm/nonmatchings/code_20ec0_len_5040/DoBasicAI.s index 81ec216ec6..81e06f0541 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/DoBasicAI.s +++ b/asm/nonmatchings/code_20ec0_len_5040/DoBasicAI.s @@ -99,45 +99,53 @@ glabel DoBasicAI /* 259DC 8004A5DC 2C620064 */ sltiu $v0, $v1, 0x64 /* 259E0 8004A5E0 10400038 */ beqz $v0, .L8004A6C4 /* 259E4 8004A5E4 00031080 */ sll $v0, $v1, 2 -/* 259E8 8004A5E8 3C01800A */ lui $at, %hi(D_80098728) +/* 259E8 8004A5E8 3C01800A */ lui $at, %hi(jtbl_80098728_73B28) /* 259EC 8004A5EC 00220821 */ addu $at, $at, $v0 -/* 259F0 8004A5F0 8C228728 */ lw $v0, %lo(D_80098728)($at) +/* 259F0 8004A5F0 8C228728 */ lw $v0, %lo(jtbl_80098728_73B28)($at) /* 259F4 8004A5F4 00400008 */ jr $v0 /* 259F8 8004A5F8 00000000 */ nop +glabel L8004A5FC_259FC /* 259FC 8004A5FC 0240202D */ daddu $a0, $s2, $zero /* 25A00 8004A600 0260282D */ daddu $a1, $s3, $zero /* 25A04 8004A604 0C012568 */ jal func_800495A0 /* 25A08 8004A608 0280302D */ daddu $a2, $s4, $zero +glabel L8004A60C_25A0C /* 25A0C 8004A60C 0240202D */ daddu $a0, $s2, $zero /* 25A10 8004A610 0260282D */ daddu $a1, $s3, $zero /* 25A14 8004A614 0C0125AE */ jal func_800496B8 /* 25A18 8004A618 0280302D */ daddu $a2, $s4, $zero /* 25A1C 8004A61C 080129B1 */ j .L8004A6C4 /* 25A20 8004A620 00000000 */ nop +glabel L8004A624_25A24 /* 25A24 8004A624 0240202D */ daddu $a0, $s2, $zero /* 25A28 8004A628 0260282D */ daddu $a1, $s3, $zero /* 25A2C 8004A62C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 25A30 8004A630 0280302D */ daddu $a2, $s4, $zero +glabel L8004A634_25A34 /* 25A34 8004A634 0240202D */ daddu $a0, $s2, $zero /* 25A38 8004A638 0260282D */ daddu $a1, $s3, $zero /* 25A3C 8004A63C 0C012701 */ jal func_80049C04 /* 25A40 8004A640 0280302D */ daddu $a2, $s4, $zero /* 25A44 8004A644 080129B1 */ j .L8004A6C4 /* 25A48 8004A648 00000000 */ nop +glabel L8004A64C_25A4C /* 25A4C 8004A64C 0240202D */ daddu $a0, $s2, $zero /* 25A50 8004A650 0260282D */ daddu $a1, $s3, $zero /* 25A54 8004A654 0C01278F */ jal func_80049E3C /* 25A58 8004A658 0280302D */ daddu $a2, $s4, $zero +glabel L8004A65C_25A5C /* 25A5C 8004A65C 0240202D */ daddu $a0, $s2, $zero /* 25A60 8004A660 0260282D */ daddu $a1, $s3, $zero /* 25A64 8004A664 0C0127B3 */ jal func_80049ECC /* 25A68 8004A668 0280302D */ daddu $a2, $s4, $zero /* 25A6C 8004A66C 080129B1 */ j .L8004A6C4 /* 25A70 8004A670 00000000 */ nop +glabel L8004A674_25A74 /* 25A74 8004A674 0240202D */ daddu $a0, $s2, $zero /* 25A78 8004A678 0260282D */ daddu $a1, $s3, $zero /* 25A7C 8004A67C 0C0127DF */ jal func_80049F7C /* 25A80 8004A680 0280302D */ daddu $a2, $s4, $zero +glabel L8004A684_25A84 /* 25A84 8004A684 0240202D */ daddu $a0, $s2, $zero /* 25A88 8004A688 0260282D */ daddu $a1, $s3, $zero /* 25A8C 8004A68C 0C012849 */ jal func_8004A124 @@ -146,15 +154,18 @@ glabel DoBasicAI /* 25A98 8004A698 2402000E */ addiu $v0, $zero, 0xe /* 25A9C 8004A69C 14620009 */ bne $v1, $v0, .L8004A6C4 /* 25AA0 8004A6A0 00000000 */ nop +glabel L8004A6A4_25AA4 /* 25AA4 8004A6A4 0240202D */ daddu $a0, $s2, $zero /* 25AA8 8004A6A8 0260282D */ daddu $a1, $s3, $zero /* 25AAC 8004A6AC 0C0128FA */ jal func_8004A3E8 /* 25AB0 8004A6B0 0280302D */ daddu $a2, $s4, $zero /* 25AB4 8004A6B4 080129B1 */ j .L8004A6C4 /* 25AB8 8004A6B8 00000000 */ nop +glabel L8004A6BC_25ABC /* 25ABC 8004A6BC 0C0129CF */ jal func_8004A73C /* 25AC0 8004A6C0 0240202D */ daddu $a0, $s2, $zero .L8004A6C4: +glabel L8004A6C4_25AC4 /* 25AC4 8004A6C4 8FBF0048 */ lw $ra, 0x48($sp) /* 25AC8 8004A6C8 8FB50044 */ lw $s5, 0x44($sp) /* 25ACC 8004A6CC 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045AC0.s b/asm/nonmatchings/code_20ec0_len_5040/func_80045AC0.s index 647016daf9..10096abe5e 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045AC0.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045AC0.s @@ -19,7 +19,7 @@ glabel func_80045AC0 /* 20EF4 80045AF4 0C048C56 */ jal bind_dynamic_entity_3 /* 20EF8 80045AF8 0000202D */ daddu $a0, $zero, $zero /* 20EFC 80045AFC 0C0117ED */ jal func_80045FB4 -/* 20F00 80045B00 00000000 */ nop +/* 20F00 80045B00 00000000 */ nop /* 20F04 80045B04 8FBF0010 */ lw $ra, 0x10($sp) /* 20F08 80045B08 03E00008 */ jr $ra /* 20F0C 80045B0C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045B10.s b/asm/nonmatchings/code_20ec0_len_5040/func_80045B10.s index 14f58b4dc1..6dfdacfb55 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045B10.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045B10.s @@ -14,7 +14,7 @@ glabel func_80045B10 /* 20F30 80045B30 50800004 */ beql $a0, $zero, .L80045B44 /* 20F34 80045B34 A6000010 */ sh $zero, 0x10($s0) /* 20F38 80045B38 0C00AB4B */ jal heap_free -/* 20F3C 80045B3C 00000000 */ nop +/* 20F3C 80045B3C 00000000 */ nop /* 20F40 80045B40 A6000010 */ sh $zero, 0x10($s0) .L80045B44: /* 20F44 80045B44 26310001 */ addiu $s1, $s1, 1 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045CC4.s b/asm/nonmatchings/code_20ec0_len_5040/func_80045CC4.s index 62ed820798..a794ab50ad 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045CC4.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045CC4.s @@ -10,7 +10,7 @@ glabel func_80045CC4 /* 210D8 80045CD8 50800005 */ beql $a0, $zero, .L80045CF0 /* 210DC 80045CDC A6000010 */ sh $zero, 0x10($s0) /* 210E0 80045CE0 0C00AB4B */ jal heap_free -/* 210E4 80045CE4 00000000 */ nop +/* 210E4 80045CE4 00000000 */ nop /* 210E8 80045CE8 AE000018 */ sw $zero, 0x18($s0) /* 210EC 80045CEC A6000010 */ sh $zero, 0x10($s0) .L80045CF0: diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045D00.s b/asm/nonmatchings/code_20ec0_len_5040/func_80045D00.s index 46ae2beaf0..d5a90dcf6c 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045D00.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045D00.s @@ -11,7 +11,7 @@ glabel func_80045D00 /* 21118 80045D18 00A0882D */ daddu $s1, $a1, $zero /* 2111C 80045D1C 0040182D */ daddu $v1, $v0, $zero /* 21120 80045D20 10600011 */ beqz $v1, .L80045D68 -/* 21124 80045D24 00000000 */ nop +/* 21124 80045D24 00000000 */ nop /* 21128 80045D28 3C028004 */ lui $v0, %hi(func_80045D7C) /* 2112C 80045D2C 24425D7C */ addiu $v0, $v0, %lo(func_80045D7C) /* 21130 80045D30 AC620004 */ sw $v0, 4($v1) diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045D7C.s b/asm/nonmatchings/code_20ec0_len_5040/func_80045D7C.s index e0af6ca0a1..f5e45afa39 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045D7C.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045D7C.s @@ -11,17 +11,20 @@ glabel func_80045D7C /* 21194 80045D94 10400020 */ beqz $v0, .L80045E18 /* 21198 80045D98 0000202D */ daddu $a0, $zero, $zero /* 2119C 80045D9C 00031080 */ sll $v0, $v1, 2 -/* 211A0 80045DA0 3C01800A */ lui $at, %hi(D_800986B0) +/* 211A0 80045DA0 3C01800A */ lui $at, %hi(jtbl_800986B0_73AB0) /* 211A4 80045DA4 00220821 */ addu $at, $at, $v0 -/* 211A8 80045DA8 8C2286B0 */ lw $v0, %lo(D_800986B0)($at) +/* 211A8 80045DA8 8C2286B0 */ lw $v0, %lo(jtbl_800986B0_73AB0)($at) /* 211AC 80045DAC 00400008 */ jr $v0 -/* 211B0 80045DB0 00000000 */ nop +/* 211B0 80045DB0 00000000 */ nop +glabel L80045DB4_211B4 /* 211B4 80045DB4 24020001 */ addiu $v0, $zero, 1 /* 211B8 80045DB8 08011786 */ j .L80045E18 /* 211BC 80045DBC A2020016 */ sb $v0, 0x16($s0) +glabel L80045DC0_211C0 /* 211C0 80045DC0 24020002 */ addiu $v0, $zero, 2 /* 211C4 80045DC4 08011786 */ j .L80045E18 /* 211C8 80045DC8 A2020016 */ sb $v0, 0x16($s0) +glabel L80045DCC_211CC /* 211CC 80045DCC 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 211D0 80045DD0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 211D4 80045DD4 8C420010 */ lw $v0, 0x10($v0) @@ -39,13 +42,15 @@ glabel func_80045D7C /* 211FC 80045DFC 24020003 */ addiu $v0, $zero, 3 /* 21200 80045E00 08011786 */ j .L80045E18 /* 21204 80045E04 A2020016 */ sb $v0, 0x16($s0) +glabel L80045E08_21208 /* 21208 80045E08 24020004 */ addiu $v0, $zero, 4 /* 2120C 80045E0C 08011786 */ j .L80045E18 /* 21210 80045E10 A2020016 */ sb $v0, 0x16($s0) +glabel L80045E14_21214 /* 21214 80045E14 24040001 */ addiu $a0, $zero, 1 .L80045E18: /* 21218 80045E18 10800008 */ beqz $a0, .L80045E3C -/* 2121C 80045E1C 00000000 */ nop +/* 2121C 80045E1C 00000000 */ nop /* 21220 80045E20 24040009 */ addiu $a0, $zero, 9 /* 21224 80045E24 0C051F9F */ jal func_80147E7C /* 21228 80045E28 24050002 */ addiu $a1, $zero, 2 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045ED0.s b/asm/nonmatchings/code_20ec0_len_5040/func_80045ED0.s index a36e9feb0c..b50dd286b4 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045ED0.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045ED0.s @@ -10,7 +10,7 @@ glabel func_80045ED0 /* 212E4 80045EE4 AFB00028 */ sw $s0, 0x28($sp) /* 212E8 80045EE8 82420017 */ lb $v0, 0x17($s2) /* 212EC 80045EEC 10400027 */ beqz $v0, .L80045F8C -/* 212F0 80045EF0 00000000 */ nop +/* 212F0 80045EF0 00000000 */ nop /* 212F4 80045EF4 86420012 */ lh $v0, 0x12($s2) /* 212F8 80045EF8 A2400017 */ sb $zero, 0x17($s2) /* 212FC 80045EFC 00021080 */ sll $v0, $v0, 2 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045FA4.s b/asm/nonmatchings/code_20ec0_len_5040/func_80045FA4.s index 55a94cd556..af9e5888fe 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045FA4.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045FA4.s @@ -5,4 +5,4 @@ glabel func_80045FA4 /* 213A4 80045FA4 3C02800A */ lui $v0, %hi(D_800A0F40) /* 213A8 80045FA8 8C420F40 */ lw $v0, %lo(D_800A0F40)($v0) /* 213AC 80045FAC 03E00008 */ jr $ra -/* 213B0 80045FB0 00000000 */ nop +/* 213B0 80045FB0 00000000 */ nop diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045FB4.s b/asm/nonmatchings/code_20ec0_len_5040/func_80045FB4.s index e8f9147679..7abd9cff8c 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045FB4.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045FB4.s @@ -25,7 +25,7 @@ glabel func_80045FB4 /* 21404 80046004 2403003F */ addiu $v1, $zero, 0x3f .L80046008: /* 21408 80046008 08011802 */ j .L80046008 -/* 2140C 8004600C 00000000 */ nop +/* 2140C 8004600C 00000000 */ nop .L80046010: /* 21410 80046010 AC400000 */ sw $zero, ($v0) /* 21414 80046014 2463FFFF */ addiu $v1, $v1, -1 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80046030.s b/asm/nonmatchings/code_20ec0_len_5040/func_80046030.s index 41e2dd38c1..50b32c87e2 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80046030.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80046030.s @@ -26,7 +26,7 @@ glabel func_80046030 /* 21480 80046080 26B50001 */ addiu $s5, $s5, 1 /* 21484 80046084 8222FFB5 */ lb $v0, -0x4b($s1) /* 21488 80046088 1452003A */ bne $v0, $s2, .L80046174 -/* 2148C 8004608C 00000000 */ nop +/* 2148C 8004608C 00000000 */ nop /* 21490 80046090 9222FFB3 */ lbu $v0, -0x4d($s1) /* 21494 80046094 2442FFFD */ addiu $v0, $v0, -3 /* 21498 80046098 00021600 */ sll $v0, $v0, 0x18 @@ -34,49 +34,57 @@ glabel func_80046030 /* 214A0 800460A0 2C620008 */ sltiu $v0, $v1, 8 /* 214A4 800460A4 10400026 */ beqz $v0, .L80046140 /* 214A8 800460A8 00031080 */ sll $v0, $v1, 2 -/* 214AC 800460AC 3C01800A */ lui $at, %hi(D_800986C8) +/* 214AC 800460AC 3C01800A */ lui $at, %hi(jtbl_800986C8_73AC8) /* 214B0 800460B0 00220821 */ addu $at, $at, $v0 -/* 214B4 800460B4 8C2286C8 */ lw $v0, %lo(D_800986C8)($at) +/* 214B4 800460B4 8C2286C8 */ lw $v0, %lo(jtbl_800986C8_73AC8)($at) /* 214B8 800460B8 00400008 */ jr $v0 -/* 214BC 800460BC 00000000 */ nop +/* 214BC 800460BC 00000000 */ nop +glabel L800460C0_214C0 /* 214C0 800460C0 3C048010 */ lui $a0, %hi(D_80104CC4) /* 214C4 800460C4 24844CC4 */ addiu $a0, $a0, %lo(D_80104CC4) /* 214C8 800460C8 08011852 */ j .L80046148 -/* 214CC 800460CC 00000000 */ nop +/* 214CC 800460CC 00000000 */ nop +glabel L800460D0_214D0 /* 214D0 800460D0 3C048010 */ lui $a0, %hi(D_8010551C) /* 214D4 800460D4 2484551C */ addiu $a0, $a0, %lo(D_8010551C) /* 214D8 800460D8 08011852 */ j .L80046148 -/* 214DC 800460DC 00000000 */ nop +/* 214DC 800460DC 00000000 */ nop +glabel L800460E0_214E0 /* 214E0 800460E0 3C048010 */ lui $a0, %hi(D_80105900) /* 214E4 800460E4 24845900 */ addiu $a0, $a0, %lo(D_80105900) /* 214E8 800460E8 08011852 */ j .L80046148 -/* 214EC 800460EC 00000000 */ nop +/* 214EC 800460EC 00000000 */ nop +glabel L800460F0_214F0 /* 214F0 800460F0 3C048010 */ lui $a0, %hi(D_801062A0) /* 214F4 800460F4 248462A0 */ addiu $a0, $a0, %lo(D_801062A0) /* 214F8 800460F8 08011852 */ j .L80046148 -/* 214FC 800460FC 00000000 */ nop +/* 214FC 800460FC 00000000 */ nop +glabel L80046100_21500 /* 21500 80046100 3C048010 */ lui $a0, %hi(D_80106610) /* 21504 80046104 24846610 */ addiu $a0, $a0, %lo(D_80106610) /* 21508 80046108 08011852 */ j .L80046148 -/* 2150C 8004610C 00000000 */ nop +/* 2150C 8004610C 00000000 */ nop +glabel L80046110_21510 /* 21510 80046110 3C048010 */ lui $a0, %hi(D_80105C54) /* 21514 80046114 24845C54 */ addiu $a0, $a0, %lo(D_80105C54) /* 21518 80046118 08011852 */ j .L80046148 -/* 2151C 8004611C 00000000 */ nop +/* 2151C 8004611C 00000000 */ nop +glabel L80046120_21520 /* 21520 80046120 3C048010 */ lui $a0, %hi(D_80106964) /* 21524 80046124 24846964 */ addiu $a0, $a0, %lo(D_80106964) /* 21528 80046128 08011852 */ j .L80046148 -/* 2152C 8004612C 00000000 */ nop +/* 2152C 8004612C 00000000 */ nop +glabel L80046130_21530 /* 21530 80046130 3C048010 */ lui $a0, %hi(D_80105FA8) /* 21534 80046134 24845FA8 */ addiu $a0, $a0, %lo(D_80105FA8) /* 21538 80046138 08011852 */ j .L80046148 -/* 2153C 8004613C 00000000 */ nop +/* 2153C 8004613C 00000000 */ nop .L80046140: /* 21540 80046140 3C048008 */ lui $a0, %hi(D_800804F0) /* 21544 80046144 248404F0 */ addiu $a0, $a0, %lo(D_800804F0) .L80046148: /* 21548 80046148 0C050529 */ jal create_icon -/* 2154C 8004614C 00000000 */ nop +/* 2154C 8004614C 00000000 */ nop /* 21550 80046150 AE22FFBB */ sw $v0, -0x45($s1) /* 21554 80046154 0040802D */ daddu $s0, $v0, $zero /* 21558 80046158 0200202D */ daddu $a0, $s0, $zero @@ -91,11 +99,11 @@ glabel func_80046030 /* 21578 80046178 10720007 */ beq $v1, $s2, .L80046198 /* 2157C 8004617C 28620002 */ slti $v0, $v1, 2 /* 21580 80046180 1440004C */ bnez $v0, .L800462B4 -/* 21584 80046184 00000000 */ nop +/* 21584 80046184 00000000 */ nop /* 21588 80046188 10760040 */ beq $v1, $s6, .L8004628C -/* 2158C 8004618C 00000000 */ nop +/* 2158C 8004618C 00000000 */ nop /* 21590 80046190 080118AD */ j .L800462B4 -/* 21594 80046194 00000000 */ nop +/* 21594 80046194 00000000 */ nop .L80046198: /* 21598 80046198 9222FFB4 */ lbu $v0, -0x4c($s1) /* 2159C 8004619C 2442FFFD */ addiu $v0, $v0, -3 @@ -104,58 +112,66 @@ glabel func_80046030 /* 215A8 800461A8 2C620008 */ sltiu $v0, $v1, 8 /* 215AC 800461AC 1040002E */ beqz $v0, .L80046268 /* 215B0 800461B0 00031080 */ sll $v0, $v1, 2 -/* 215B4 800461B4 3C01800A */ lui $at, %hi(D_800986E8) +/* 215B4 800461B4 3C01800A */ lui $at, %hi(jtbl_800986E8_73AE8) /* 215B8 800461B8 00220821 */ addu $at, $at, $v0 -/* 215BC 800461BC 8C2286E8 */ lw $v0, %lo(D_800986E8)($at) +/* 215BC 800461BC 8C2286E8 */ lw $v0, %lo(jtbl_800986E8_73AE8)($at) /* 215C0 800461C0 00400008 */ jr $v0 -/* 215C4 800461C4 00000000 */ nop +/* 215C4 800461C4 00000000 */ nop +glabel L800461C8_215C8 /* 215C8 800461C8 8E24FFBF */ lw $a0, -0x41($s1) /* 215CC 800461CC 3C058010 */ lui $a1, %hi(D_80104E64) /* 215D0 800461D0 24A54E64 */ addiu $a1, $a1, %lo(D_80104E64) /* 215D4 800461D4 0801189D */ j .L80046274 -/* 215D8 800461D8 00000000 */ nop +/* 215D8 800461D8 00000000 */ nop +glabel L800461DC_215DC /* 215DC 800461DC 8E24FFBF */ lw $a0, -0x41($s1) /* 215E0 800461E0 3C058010 */ lui $a1, %hi(D_8010574C) /* 215E4 800461E4 24A5574C */ addiu $a1, $a1, %lo(D_8010574C) /* 215E8 800461E8 0801189D */ j .L80046274 -/* 215EC 800461EC 00000000 */ nop +/* 215EC 800461EC 00000000 */ nop +glabel L800461F0_215F0 /* 215F0 800461F0 8E24FFBF */ lw $a0, -0x41($s1) /* 215F4 800461F4 3C058010 */ lui $a1, %hi(D_80105AA0) /* 215F8 800461F8 24A55AA0 */ addiu $a1, $a1, %lo(D_80105AA0) /* 215FC 800461FC 0801189D */ j .L80046274 -/* 21600 80046200 00000000 */ nop +/* 21600 80046200 00000000 */ nop +glabel L80046204_21604 /* 21604 80046204 8E24FFBF */ lw $a0, -0x41($s1) /* 21608 80046208 3C058010 */ lui $a1, %hi(D_801062A0) /* 2160C 8004620C 24A562A0 */ addiu $a1, $a1, %lo(D_801062A0) /* 21610 80046210 0801189D */ j .L80046274 -/* 21614 80046214 00000000 */ nop +/* 21614 80046214 00000000 */ nop +glabel L80046218_21618 /* 21618 80046218 8E24FFBF */ lw $a0, -0x41($s1) /* 2161C 8004621C 3C058010 */ lui $a1, %hi(D_801067B0) /* 21620 80046220 24A567B0 */ addiu $a1, $a1, %lo(D_801067B0) /* 21624 80046224 0801189D */ j .L80046274 -/* 21628 80046228 00000000 */ nop +/* 21628 80046228 00000000 */ nop +glabel L8004622C_2162C /* 2162C 8004622C 8E24FFBF */ lw $a0, -0x41($s1) /* 21630 80046230 3C058010 */ lui $a1, %hi(D_80105DF4) /* 21634 80046234 24A55DF4 */ addiu $a1, $a1, %lo(D_80105DF4) /* 21638 80046238 0801189D */ j .L80046274 -/* 2163C 8004623C 00000000 */ nop +/* 2163C 8004623C 00000000 */ nop +glabel L80046240_21640 /* 21640 80046240 8E24FFBF */ lw $a0, -0x41($s1) /* 21644 80046244 3C058010 */ lui $a1, %hi(D_80106B04) /* 21648 80046248 24A56B04 */ addiu $a1, $a1, %lo(D_80106B04) /* 2164C 8004624C 0801189D */ j .L80046274 -/* 21650 80046250 00000000 */ nop +/* 21650 80046250 00000000 */ nop +glabel L80046254_21654 /* 21654 80046254 8E24FFBF */ lw $a0, -0x41($s1) /* 21658 80046258 3C058010 */ lui $a1, %hi(D_80106148) /* 2165C 8004625C 24A56148 */ addiu $a1, $a1, %lo(D_80106148) /* 21660 80046260 0801189D */ j .L80046274 -/* 21664 80046264 00000000 */ nop +/* 21664 80046264 00000000 */ nop .L80046268: /* 21668 80046268 8E24FFBF */ lw $a0, -0x41($s1) /* 2166C 8004626C 3C058008 */ lui $a1, %hi(D_800804F0) /* 21670 80046270 24A504F0 */ addiu $a1, $a1, %lo(D_800804F0) .L80046274: /* 21674 80046274 0C0511FF */ jal set_menu_icon_script -/* 21678 80046278 00000000 */ nop +/* 21678 80046278 00000000 */ nop /* 2167C 8004627C 2402000A */ addiu $v0, $zero, 0xa /* 21680 80046280 A222FFB8 */ sb $v0, -0x48($s1) /* 21684 80046284 080118AD */ j .L800462B4 @@ -180,12 +196,12 @@ glabel func_80046030 /* 216C4 800462C4 3C048008 */ lui $a0, %hi(D_800804F0) /* 216C8 800462C8 248404F0 */ addiu $a0, $a0, %lo(D_800804F0) /* 216CC 800462CC 14620003 */ bne $v1, $v0, .L800462DC -/* 216D0 800462D0 00000000 */ nop +/* 216D0 800462D0 00000000 */ nop /* 216D4 800462D4 3C048010 */ lui $a0, %hi(D_801050A8) /* 216D8 800462D8 248450A8 */ addiu $a0, $a0, %lo(D_801050A8) .L800462DC: /* 216DC 800462DC 0C050529 */ jal create_icon -/* 216E0 800462E0 00000000 */ nop +/* 216E0 800462E0 00000000 */ nop /* 216E4 800462E4 AE22FFCB */ sw $v0, -0x35($s1) /* 216E8 800462E8 0040802D */ daddu $s0, $v0, $zero /* 216EC 800462EC 0200202D */ daddu $a0, $s0, $zero @@ -200,28 +216,28 @@ glabel func_80046030 /* 2170C 8004630C 10720007 */ beq $v1, $s2, .L8004632C /* 21710 80046310 28620002 */ slti $v0, $v1, 2 /* 21714 80046314 14400020 */ bnez $v0, .L80046398 -/* 21718 80046318 00000000 */ nop +/* 21718 80046318 00000000 */ nop /* 2171C 8004631C 10760014 */ beq $v1, $s6, .L80046370 -/* 21720 80046320 00000000 */ nop +/* 21720 80046320 00000000 */ nop /* 21724 80046324 080118E6 */ j .L80046398 -/* 21728 80046328 00000000 */ nop +/* 21728 80046328 00000000 */ nop .L8004632C: /* 2172C 8004632C 8223FFC4 */ lb $v1, -0x3c($s1) /* 21730 80046330 2402000B */ addiu $v0, $zero, 0xb /* 21734 80046334 14620006 */ bne $v1, $v0, .L80046350 -/* 21738 80046338 00000000 */ nop +/* 21738 80046338 00000000 */ nop /* 2173C 8004633C 8E24FFCF */ lw $a0, -0x31($s1) /* 21740 80046340 3C058010 */ lui $a1, %hi(D_801052D8) /* 21744 80046344 24A552D8 */ addiu $a1, $a1, %lo(D_801052D8) /* 21748 80046348 080118D7 */ j .L8004635C -/* 2174C 8004634C 00000000 */ nop +/* 2174C 8004634C 00000000 */ nop .L80046350: /* 21750 80046350 8E24FFCF */ lw $a0, -0x31($s1) /* 21754 80046354 3C058008 */ lui $a1, %hi(D_800804F0) /* 21758 80046358 24A504F0 */ addiu $a1, $a1, %lo(D_800804F0) .L8004635C: /* 2175C 8004635C 0C0511FF */ jal set_menu_icon_script -/* 21760 80046360 00000000 */ nop +/* 21760 80046360 00000000 */ nop /* 21764 80046364 A237FFC8 */ sb $s7, -0x38($s1) /* 21768 80046368 080118E6 */ j .L80046398 /* 2176C 8004636C A233FFC6 */ sb $s3, -0x3a($s1) @@ -245,12 +261,12 @@ glabel func_80046030 /* 217A8 800463A8 3C048008 */ lui $a0, %hi(D_800804F0) /* 217AC 800463AC 248404F0 */ addiu $a0, $a0, %lo(D_800804F0) /* 217B0 800463B0 14620003 */ bne $v1, $v0, .L800463C0 -/* 217B4 800463B4 00000000 */ nop +/* 217B4 800463B4 00000000 */ nop /* 217B8 800463B8 3C048010 */ lui $a0, %hi(D_80106CD8) /* 217BC 800463BC 24846CD8 */ addiu $a0, $a0, %lo(D_80106CD8) .L800463C0: /* 217C0 800463C0 0C050529 */ jal create_icon -/* 217C4 800463C4 00000000 */ nop +/* 217C4 800463C4 00000000 */ nop /* 217C8 800463C8 AE22FFDB */ sw $v0, -0x25($s1) /* 217CC 800463CC 0040802D */ daddu $s0, $v0, $zero /* 217D0 800463D0 0200202D */ daddu $a0, $s0, $zero @@ -265,28 +281,28 @@ glabel func_80046030 /* 217F0 800463F0 10720007 */ beq $v1, $s2, .L80046410 /* 217F4 800463F4 28620002 */ slti $v0, $v1, 2 /* 217F8 800463F8 14400020 */ bnez $v0, .L8004647C -/* 217FC 800463FC 00000000 */ nop +/* 217FC 800463FC 00000000 */ nop /* 21800 80046400 10760014 */ beq $v1, $s6, .L80046454 -/* 21804 80046404 00000000 */ nop +/* 21804 80046404 00000000 */ nop /* 21808 80046408 0801191F */ j .L8004647C -/* 2180C 8004640C 00000000 */ nop +/* 2180C 8004640C 00000000 */ nop .L80046410: /* 21810 80046410 8223FFD4 */ lb $v1, -0x2c($s1) /* 21814 80046414 2402000E */ addiu $v0, $zero, 0xe /* 21818 80046418 14620006 */ bne $v1, $v0, .L80046434 -/* 2181C 8004641C 00000000 */ nop +/* 2181C 8004641C 00000000 */ nop /* 21820 80046420 8E24FFDF */ lw $a0, -0x21($s1) /* 21824 80046424 3C058010 */ lui $a1, %hi(D_80106E98) /* 21828 80046428 24A56E98 */ addiu $a1, $a1, %lo(D_80106E98) /* 2182C 8004642C 08011910 */ j .L80046440 -/* 21830 80046430 00000000 */ nop +/* 21830 80046430 00000000 */ nop .L80046434: /* 21834 80046434 8E24FFDF */ lw $a0, -0x21($s1) /* 21838 80046438 3C058008 */ lui $a1, %hi(D_800804F0) /* 2183C 8004643C 24A504F0 */ addiu $a1, $a1, %lo(D_800804F0) .L80046440: /* 21840 80046440 0C0511FF */ jal set_menu_icon_script -/* 21844 80046444 00000000 */ nop +/* 21844 80046444 00000000 */ nop /* 21848 80046448 A237FFD8 */ sb $s7, -0x28($s1) /* 2184C 8004644C 0801191F */ j .L8004647C /* 21850 80046450 A233FFD6 */ sb $s3, -0x2a($s1) @@ -305,11 +321,11 @@ glabel func_80046030 .L8004647C: /* 2187C 8004647C 8222FFE5 */ lb $v0, -0x1b($s1) /* 21880 80046480 1452000E */ bne $v0, $s2, .L800464BC -/* 21884 80046484 00000000 */ nop +/* 21884 80046484 00000000 */ nop /* 21888 80046488 3C048010 */ lui $a0, %hi(D_801062DC) /* 2188C 8004648C 248462DC */ addiu $a0, $a0, %lo(D_801062DC) /* 21890 80046490 0C050529 */ jal create_icon -/* 21894 80046494 00000000 */ nop +/* 21894 80046494 00000000 */ nop /* 21898 80046498 0040802D */ daddu $s0, $v0, $zero /* 2189C 8004649C 0040202D */ daddu $a0, $v0, $zero /* 218A0 800464A0 24050002 */ addiu $a1, $zero, 2 @@ -324,17 +340,17 @@ glabel func_80046030 /* 218C0 800464C0 10720007 */ beq $v1, $s2, .L800464E0 /* 218C4 800464C4 28620002 */ slti $v0, $v1, 2 /* 218C8 800464C8 14400017 */ bnez $v0, .L80046528 -/* 218CC 800464CC 00000000 */ nop +/* 218CC 800464CC 00000000 */ nop /* 218D0 800464D0 1076000B */ beq $v1, $s6, .L80046500 -/* 218D4 800464D4 00000000 */ nop +/* 218D4 800464D4 00000000 */ nop /* 218D8 800464D8 0801194A */ j .L80046528 -/* 218DC 800464DC 00000000 */ nop +/* 218DC 800464DC 00000000 */ nop .L800464E0: /* 218E0 800464E0 8E24FFEF */ lw $a0, -0x11($s1) /* 218E4 800464E4 3C058010 */ lui $a1, %hi(D_8010645C) /* 218E8 800464E8 24A5645C */ addiu $a1, $a1, %lo(D_8010645C) /* 218EC 800464EC 0C0511FF */ jal set_menu_icon_script -/* 218F0 800464F0 00000000 */ nop +/* 218F0 800464F0 00000000 */ nop /* 218F4 800464F4 A237FFE8 */ sb $s7, -0x18($s1) /* 218F8 800464F8 0801194A */ j .L80046528 /* 218FC 800464FC A233FFE6 */ sb $s3, -0x1a($s1) @@ -353,16 +369,16 @@ glabel func_80046030 .L80046528: /* 21928 80046528 8222FFF4 */ lb $v0, -0xc($s1) /* 2192C 8004652C 1040000D */ beqz $v0, .L80046564 -/* 21930 80046530 00000000 */ nop +/* 21930 80046530 00000000 */ nop /* 21934 80046534 1452000B */ bne $v0, $s2, .L80046564 -/* 21938 80046538 00000000 */ nop +/* 21938 80046538 00000000 */ nop /* 2193C 8004653C 8E30FFFB */ lw $s0, -5($s1) /* 21940 80046540 0C051235 */ jal get_menu_icon /* 21944 80046544 0200202D */ daddu $a0, $s0, $zero /* 21948 80046548 8C420000 */ lw $v0, ($v0) /* 2194C 8004654C 30420004 */ andi $v0, $v0, 4 /* 21950 80046550 10400004 */ beqz $v0, .L80046564 -/* 21954 80046554 00000000 */ nop +/* 21954 80046554 00000000 */ nop /* 21958 80046558 0C05123D */ jal free_icon /* 2195C 8004655C 0200202D */ daddu $a0, $s0, $zero /* 21960 80046560 A220FFF4 */ sb $zero, -0xc($s1) diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047608.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047608.s index d3f35a6faa..4f2b9bf4fc 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047608.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047608.s @@ -19,7 +19,7 @@ glabel func_80047608 /* 22A38 80047638 24030001 */ addiu $v1, $zero, 1 .L8004763C: /* 22A3C 8004763C 08011D8F */ j .L8004763C -/* 22A40 80047640 00000000 */ nop +/* 22A40 80047640 00000000 */ nop .L80047644: /* 22A44 80047644 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 22A48 80047648 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047898.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047898.s index 105766d7c9..5f5824274b 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047898.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047898.s @@ -26,4 +26,4 @@ glabel func_80047898 /* 22CEC 800478EC AC830044 */ sw $v1, 0x44($a0) .L800478F0: /* 22CF0 800478F0 03E00008 */ jr $ra -/* 22CF4 800478F4 00000000 */ nop +/* 22CF4 800478F4 00000000 */ nop diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_800479A0.s b/asm/nonmatchings/code_20ec0_len_5040/func_800479A0.s index 7a84f2c7d4..77c1544f1a 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_800479A0.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_800479A0.s @@ -26,4 +26,4 @@ glabel func_800479A0 /* 22DF4 800479F4 AC830054 */ sw $v1, 0x54($a0) .L800479F8: /* 22DF8 800479F8 03E00008 */ jr $ra -/* 22DFC 800479FC 00000000 */ nop +/* 22DFC 800479FC 00000000 */ nop diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047AA8.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047AA8.s index 6d5c507125..98fc22b044 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047AA8.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047AA8.s @@ -26,4 +26,4 @@ glabel func_80047AA8 /* 22EFC 80047AFC AC830064 */ sw $v1, 0x64($a0) .L80047B00: /* 22F00 80047B00 03E00008 */ jr $ra -/* 22F04 80047B04 00000000 */ nop +/* 22F04 80047B04 00000000 */ nop diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047B38.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047B38.s index 5f4ef026ed..aff4364fbf 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047B38.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047B38.s @@ -21,4 +21,4 @@ glabel func_80047B38 /* 22F78 80047B78 A0A2006A */ sb $v0, 0x6a($a1) .L80047B7C: /* 22F7C 80047B7C 03E00008 */ jr $ra -/* 22F80 80047B80 00000000 */ nop +/* 22F80 80047B80 00000000 */ nop diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047B84.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047B84.s index 7fff605889..59c8a3ed16 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047B84.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047B84.s @@ -26,4 +26,4 @@ glabel func_80047B84 /* 22FD8 80047BD8 AC830074 */ sw $v1, 0x74($a0) .L80047BDC: /* 22FDC 80047BDC 03E00008 */ jr $ra -/* 22FE0 80047BE0 00000000 */ nop +/* 22FE0 80047BE0 00000000 */ nop diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047DC0.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047DC0.s index e80511a2c2..60c39a35bc 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047DC0.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047DC0.s @@ -14,7 +14,7 @@ glabel func_80047DC0 /* 231E4 80047DE4 00621821 */ addu $v1, $v1, $v0 /* 231E8 80047DE8 80620084 */ lb $v0, 0x84($v1) /* 231EC 80047DEC 10400008 */ beqz $v0, .L80047E10 -/* 231F0 80047DF0 00000000 */ nop +/* 231F0 80047DF0 00000000 */ nop /* 231F4 80047DF4 8C640088 */ lw $a0, 0x88($v1) /* 231F8 80047DF8 3C058010 */ lui $a1, %hi(D_80107474) /* 231FC 80047DFC 24A57474 */ addiu $a1, $a1, %lo(D_80107474) diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047EDC.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047EDC.s index 9bdf87d651..2f535d48d2 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047EDC.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047EDC.s @@ -14,7 +14,7 @@ glabel func_80047EDC /* 23300 80047F00 00621821 */ addu $v1, $v1, $v0 /* 23304 80047F04 80620090 */ lb $v0, 0x90($v1) /* 23308 80047F08 10400004 */ beqz $v0, .L80047F1C -/* 2330C 80047F0C 00000000 */ nop +/* 2330C 80047F0C 00000000 */ nop /* 23310 80047F10 8C640094 */ lw $a0, 0x94($v1) /* 23314 80047F14 0C05123D */ jal free_icon /* 23318 80047F18 A0600090 */ sb $zero, 0x90($v1) diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047FE8.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047FE8.s index 2899502756..564a73bedd 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047FE8.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047FE8.s @@ -14,7 +14,7 @@ glabel func_80047FE8 /* 2340C 8004800C 00621821 */ addu $v1, $v1, $v0 /* 23410 80048010 80620098 */ lb $v0, 0x98($v1) /* 23414 80048014 10400004 */ beqz $v0, .L80048028 -/* 23418 80048018 00000000 */ nop +/* 23418 80048018 00000000 */ nop /* 2341C 8004801C 8C64009C */ lw $a0, 0x9c($v1) /* 23420 80048020 0C05123D */ jal free_icon /* 23424 80048024 A0600098 */ sb $zero, 0x98($v1) diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_800480F4.s b/asm/nonmatchings/code_20ec0_len_5040/func_800480F4.s index 2b09217ab3..04c660cc21 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_800480F4.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_800480F4.s @@ -14,7 +14,7 @@ glabel func_800480F4 /* 23518 80048118 00621821 */ addu $v1, $v1, $v0 /* 2351C 8004811C 806200A0 */ lb $v0, 0xa0($v1) /* 23520 80048120 10400004 */ beqz $v0, .L80048134 -/* 23524 80048124 00000000 */ nop +/* 23524 80048124 00000000 */ nop /* 23528 80048128 8C6400A4 */ lw $a0, 0xa4($v1) /* 2352C 8004812C 0C05123D */ jal free_icon /* 23530 80048130 A06000A0 */ sb $zero, 0xa0($v1) diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80048200.s b/asm/nonmatchings/code_20ec0_len_5040/func_80048200.s index 25b5f26c2d..b68a989637 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80048200.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80048200.s @@ -14,7 +14,7 @@ glabel func_80048200 /* 23624 80048224 00621821 */ addu $v1, $v1, $v0 /* 23628 80048228 806200A8 */ lb $v0, 0xa8($v1) /* 2362C 8004822C 10400004 */ beqz $v0, .L80048240 -/* 23630 80048230 00000000 */ nop +/* 23630 80048230 00000000 */ nop /* 23634 80048234 8C6400AC */ lw $a0, 0xac($v1) /* 23638 80048238 0C05123D */ jal free_icon /* 2363C 8004823C A06000A8 */ sb $zero, 0xa8($v1) diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_8004824C.s b/asm/nonmatchings/code_20ec0_len_5040/func_8004824C.s index 7277011206..d8092f0bc3 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_8004824C.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_8004824C.s @@ -14,4 +14,4 @@ glabel func_8004824C /* 23670 80048270 34420800 */ ori $v0, $v0, 0x800 /* 23674 80048274 03E00008 */ jr $ra /* 23678 80048278 AC620000 */ sw $v0, ($v1) -/* 2367C 8004827C 00000000 */ nop +/* 2367C 8004827C 00000000 */ nop diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80048E34.s b/asm/nonmatchings/code_20ec0_len_5040/func_80048E34.s index eb8de8cb49..4b76451088 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80048E34.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80048E34.s @@ -14,12 +14,12 @@ glabel func_80048E34 /* 24258 80048E58 00C0882D */ daddu $s1, $a2, $zero /* 2425C 80048E5C 8E040054 */ lw $a0, 0x54($s0) /* 24260 80048E60 0C0B102B */ jal kill_script_by_ID -/* 24264 80048E64 00000000 */ nop +/* 24264 80048E64 00000000 */ nop /* 24268 80048E68 AE00003C */ sw $zero, 0x3c($s0) .L80048E6C: /* 2426C 80048E6C 8E0200BC */ lw $v0, 0xbc($s0) /* 24270 80048E70 10400004 */ beqz $v0, .L80048E84 -/* 24274 80048E74 00000000 */ nop +/* 24274 80048E74 00000000 */ nop /* 24278 80048E78 0C0B102B */ jal kill_script_by_ID /* 2427C 80048E7C 8E0400C0 */ lw $a0, 0xc0($s0) /* 24280 80048E80 AE0000BC */ sw $zero, 0xbc($s0) diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80048F0C.s b/asm/nonmatchings/code_20ec0_len_5040/func_80048F0C.s index 09397c5a22..f5c89fea64 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80048F0C.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80048F0C.s @@ -19,7 +19,7 @@ glabel func_80048F0C .L80048F44: /* 24344 80048F44 8E920028 */ lw $s2, 0x28($s4) /* 24348 80048F48 12400013 */ beqz $s2, .L80048F98 -/* 2434C 80048F4C 00000000 */ nop +/* 2434C 80048F4C 00000000 */ nop /* 24350 80048F50 8E420000 */ lw $v0, ($s2) /* 24354 80048F54 18400010 */ blez $v0, .L80048F98 /* 24358 80048F58 0000802D */ daddu $s0, $zero, $zero @@ -27,11 +27,11 @@ glabel func_80048F0C .L80048F60: /* 24360 80048F60 8E230004 */ lw $v1, 4($s1) /* 24364 80048F64 10600007 */ beqz $v1, .L80048F84 -/* 24368 80048F68 00000000 */ nop +/* 24368 80048F68 00000000 */ nop /* 2436C 80048F6C 8C620000 */ lw $v0, ($v1) /* 24370 80048F70 30420020 */ andi $v0, $v0, 0x20 /* 24374 80048F74 14400003 */ bnez $v0, .L80048F84 -/* 24378 80048F78 00000000 */ nop +/* 24378 80048F78 00000000 */ nop /* 2437C 80048F7C 0C00EABB */ jal get_npc_unsafe /* 24380 80048F80 84640008 */ lh $a0, 8($v1) .L80048F84: diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_800490B4.s b/asm/nonmatchings/code_20ec0_len_5040/func_800490B4.s index aa897fe134..dd0c306256 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_800490B4.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_800490B4.s @@ -41,10 +41,10 @@ glabel func_800490B4 /* 24544 80049144 24020007 */ addiu $v0, $zero, 7 .L80049148: /* 24548 80049148 14620008 */ bne $v1, $v0, .L8004916C -/* 2454C 8004914C 00000000 */ nop +/* 2454C 8004914C 00000000 */ nop /* 24550 80049150 80820000 */ lb $v0, ($a0) /* 24554 80049154 10400005 */ beqz $v0, .L8004916C -/* 24558 80049158 00000000 */ nop +/* 24558 80049158 00000000 */ nop /* 2455C 8004915C 9622001C */ lhu $v0, 0x1c($s1) /* 24560 80049160 30420001 */ andi $v0, $v0, 1 /* 24564 80049164 10400096 */ beqz $v0, .L800493C0 @@ -59,9 +59,9 @@ glabel func_800490B4 /* 24584 80049184 C6220018 */ lwc1 $f2, 0x18($s1) /* 24588 80049188 46000005 */ abs.s $f0, $f0 /* 2458C 8004918C 4600103E */ c.le.s $f2, $f0 -/* 24590 80049190 00000000 */ nop +/* 24590 80049190 00000000 */ nop /* 24594 80049194 45000005 */ bc1f .L800491AC -/* 24598 80049198 00000000 */ nop +/* 24598 80049198 00000000 */ nop /* 2459C 8004919C 9622001C */ lhu $v0, 0x1c($s1) /* 245A0 800491A0 30420002 */ andi $v0, $v0, 2 /* 245A4 800491A4 10400086 */ beqz $v0, .L800493C0 @@ -71,7 +71,7 @@ glabel func_800490B4 /* 245B0 800491B0 8E230014 */ lw $v1, 0x14($s1) /* 245B4 800491B4 00431025 */ or $v0, $v0, $v1 /* 245B8 800491B8 10400014 */ beqz $v0, .L8004920C -/* 245BC 800491BC 00000000 */ nop +/* 245BC 800491BC 00000000 */ nop /* 245C0 800491C0 C6200008 */ lwc1 $f0, 8($s1) /* 245C4 800491C4 46800020 */ cvt.s.w $f0, $f0 /* 245C8 800491C8 44050000 */ mfc1 $a1, $f0 @@ -99,17 +99,17 @@ glabel func_800490B4 /* 2461C 8004921C 926200AC */ lbu $v0, 0xac($s3) /* 24620 80049220 30420001 */ andi $v0, $v0, 1 /* 24624 80049224 1040002C */ beqz $v0, .L800492D8 -/* 24628 80049228 00000000 */ nop +/* 24628 80049228 00000000 */ nop /* 2462C 8004922C C60C0038 */ lwc1 $f12, 0x38($s0) /* 24630 80049230 860200A8 */ lh $v0, 0xa8($s0) /* 24634 80049234 3C013FE0 */ lui $at, 0x3fe0 /* 24638 80049238 44810800 */ mtc1 $at, $f1 /* 2463C 8004923C 44800000 */ mtc1 $zero, $f0 /* 24640 80049240 44821000 */ mtc1 $v0, $f2 -/* 24644 80049244 00000000 */ nop +/* 24644 80049244 00000000 */ nop /* 24648 80049248 468010A1 */ cvt.d.w $f2, $f2 /* 2464C 8004924C 46201082 */ mul.d $f2, $f2, $f0 -/* 24650 80049250 00000000 */ nop +/* 24650 80049250 00000000 */ nop /* 24654 80049254 C60E0040 */ lwc1 $f14, 0x40($s0) /* 24658 80049258 8E460028 */ lw $a2, 0x28($s2) /* 2465C 8004925C 8E470030 */ lw $a3, 0x30($s2) @@ -146,7 +146,7 @@ glabel func_800490B4 .L800492D8: /* 246D8 800492D8 8E220000 */ lw $v0, ($s1) /* 246DC 800492DC 14400003 */ bnez $v0, .L800492EC -/* 246E0 800492E0 00000000 */ nop +/* 246E0 800492E0 00000000 */ nop /* 246E4 800492E4 080124BD */ j .L800492F4 /* 246E8 800492E8 0000102D */ daddu $v0, $zero, $zero .L800492EC: @@ -168,13 +168,13 @@ glabel func_800490B4 /* 24724 80049324 4600B021 */ cvt.d.s $f0, $f22 .L80049328: /* 24728 80049328 14620007 */ bne $v1, $v0, .L80049348 -/* 2472C 8004932C 00000000 */ nop +/* 2472C 8004932C 00000000 */ nop /* 24730 80049330 3C01800A */ lui $at, %hi(D_80098718) /* 24734 80049334 D4228718 */ ldc1 $f2, %lo(D_80098718)($at) /* 24738 80049338 4600B021 */ cvt.d.s $f0, $f22 .L8004933C: /* 2473C 8004933C 46220002 */ mul.d $f0, $f0, $f2 -/* 24740 80049340 00000000 */ nop +/* 24740 80049340 00000000 */ nop /* 24744 80049344 462005A0 */ cvt.s.d $f22, $f0 .L80049348: /* 24748 80049348 C6000038 */ lwc1 $f0, 0x38($s0) @@ -191,7 +191,7 @@ glabel func_800490B4 /* 24770 80049370 C6020034 */ lwc1 $f2, 0x34($s0) /* 24774 80049374 3C014387 */ lui $at, 0x4387 /* 24778 80049378 44810000 */ mtc1 $at, $f0 -/* 2477C 8004937C 00000000 */ nop +/* 2477C 8004937C 00000000 */ nop /* 24780 80049380 46020001 */ sub.s $f0, $f0, $f2 /* 24784 80049384 27A40020 */ addiu $a0, $sp, 0x20 /* 24788 80049388 4406C000 */ mfc1 $a2, $f24 @@ -205,7 +205,7 @@ glabel func_800490B4 /* 247A4 800493A4 0C00A7B5 */ jal dist2D /* 247A8 800493A8 8E470030 */ lw $a3, 0x30($s2) /* 247AC 800493AC 4616003E */ c.le.s $f0, $f22 -/* 247B0 800493B0 00000000 */ nop +/* 247B0 800493B0 00000000 */ nop /* 247B4 800493B4 45010002 */ bc1t .L800493C0 /* 247B8 800493B8 24020001 */ addiu $v0, $zero, 1 .L800493BC: diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_800493EC.s b/asm/nonmatchings/code_20ec0_len_5040/func_800493EC.s index 6d263f8582..bd31e62728 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_800493EC.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_800493EC.s @@ -44,7 +44,7 @@ glabel func_800493EC /* 24884 80049484 0C00A7B5 */ jal dist2D /* 24888 80049488 C7AE0014 */ lwc1 $f14, 0x14($sp) /* 2488C 8004948C 4616003E */ c.le.s $f0, $f22 -/* 24890 80049490 00000000 */ nop +/* 24890 80049490 00000000 */ nop /* 24894 80049494 45010002 */ bc1t .L800494A0 /* 24898 80049498 24020001 */ addiu $v0, $zero, 1 .L8004949C: diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_800495A0.s b/asm/nonmatchings/code_20ec0_len_5040/func_800495A0.s index 824b7b8d8e..cf4485b412 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_800495A0.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_800495A0.s @@ -30,7 +30,7 @@ glabel func_800495A0 /* 24A04 80049604 A603008E */ sh $v1, 0x8e($s0) /* 24A08 80049608 C60C000C */ lwc1 $f12, 0xc($s0) /* 24A0C 8004960C 44820000 */ mtc1 $v0, $f0 -/* 24A10 80049610 00000000 */ nop +/* 24A10 80049610 00000000 */ nop /* 24A14 80049614 46800020 */ cvt.s.w $f0, $f0 /* 24A18 80049618 46006300 */ add.s $f12, $f12, $f0 /* 24A1C 8004961C 3C0141F0 */ lui $at, 0x41f0 @@ -45,7 +45,7 @@ glabel func_800495A0 /* 24A40 80049640 8E2200D0 */ lw $v0, 0xd0($s1) /* 24A44 80049644 8C420014 */ lw $v0, 0x14($v0) /* 24A48 80049648 04410004 */ bgez $v0, .L8004965C -/* 24A4C 8004964C 00000000 */ nop +/* 24A4C 8004964C 00000000 */ nop /* 24A50 80049650 C6400000 */ lwc1 $f0, ($s2) /* 24A54 80049654 0801259F */ j .L8004967C /* 24A58 80049658 E6000018 */ swc1 $f0, 0x18($s0) @@ -53,7 +53,7 @@ glabel func_800495A0 /* 24A5C 8004965C 3C01800A */ lui $at, %hi(D_80098720) /* 24A60 80049660 D4228720 */ ldc1 $f2, %lo(D_80098720)($at) /* 24A64 80049664 44820000 */ mtc1 $v0, $f0 -/* 24A68 80049668 00000000 */ nop +/* 24A68 80049668 00000000 */ nop /* 24A6C 8004966C 46800021 */ cvt.d.w $f0, $f0 /* 24A70 80049670 46220003 */ div.d $f0, $f0, $f2 /* 24A74 80049674 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_800496B8.s b/asm/nonmatchings/code_20ec0_len_5040/func_800496B8.s index f385401f76..e53409d06e 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_800496B8.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_800496B8.s @@ -31,7 +31,7 @@ glabel func_800496B8 /* 24B20 80049720 0C01242D */ jal func_800490B4 /* 24B24 80049724 0220282D */ daddu $a1, $s1, $zero /* 24B28 80049728 1040004E */ beqz $v0, .L80049864 -/* 24B2C 8004972C 00000000 */ nop +/* 24B2C 8004972C 00000000 */ nop /* 24B30 80049730 C60C0038 */ lwc1 $f12, 0x38($s0) /* 24B34 80049734 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 24B38 80049738 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -52,13 +52,13 @@ glabel func_800496B8 /* 24B74 80049774 860200A8 */ lh $v0, 0xa8($s0) /* 24B78 80049778 27A50028 */ addiu $a1, $sp, 0x28 /* 24B7C 8004977C 44820000 */ mtc1 $v0, $f0 -/* 24B80 80049780 00000000 */ nop +/* 24B80 80049780 00000000 */ nop /* 24B84 80049784 46800020 */ cvt.s.w $f0, $f0 /* 24B88 80049788 E7A00018 */ swc1 $f0, 0x18($sp) /* 24B8C 8004978C 860200A6 */ lh $v0, 0xa6($s0) /* 24B90 80049790 27A6002C */ addiu $a2, $sp, 0x2c /* 24B94 80049794 44820000 */ mtc1 $v0, $f0 -/* 24B98 80049798 00000000 */ nop +/* 24B98 80049798 00000000 */ nop /* 24B9C 8004979C 46800020 */ cvt.s.w $f0, $f0 /* 24BA0 800497A0 E7A0001C */ swc1 $f0, 0x1c($sp) /* 24BA4 800497A4 8E040080 */ lw $a0, 0x80($s0) @@ -84,7 +84,7 @@ glabel func_800496B8 /* 24BF4 800497F4 2402000F */ addiu $v0, $zero, 0xf /* 24BF8 800497F8 AFA2001C */ sw $v0, 0x1c($sp) /* 24BFC 800497FC 44833000 */ mtc1 $v1, $f6 -/* 24C00 80049800 00000000 */ nop +/* 24C00 80049800 00000000 */ nop /* 24C04 80049804 468031A0 */ cvt.s.w $f6, $f6 /* 24C08 80049808 44073000 */ mfc1 $a3, $f6 /* 24C0C 8004980C 27A20034 */ addiu $v0, $sp, 0x34 @@ -137,7 +137,7 @@ glabel func_800496B8 /* 24CB8 800498B8 0C0123F5 */ jal is_point_within_region /* 24CBC 800498BC 8E070038 */ lw $a3, 0x38($s0) /* 24CC0 800498C0 10400064 */ beqz $v0, .L80049A54 -/* 24CC4 800498C4 00000000 */ nop +/* 24CC4 800498C4 00000000 */ nop /* 24CC8 800498C8 8E060038 */ lw $a2, 0x38($s0) /* 24CCC 800498CC 8E2200D0 */ lw $v0, 0xd0($s1) /* 24CD0 800498D0 8E070040 */ lw $a3, 0x40($s0) @@ -148,9 +148,9 @@ glabel func_800496B8 /* 24CE4 800498E4 468073A0 */ cvt.s.w $f14, $f14 /* 24CE8 800498E8 C6020018 */ lwc1 $f2, 0x18($s0) /* 24CEC 800498EC 4600103C */ c.lt.s $f2, $f0 -/* 24CF0 800498F0 00000000 */ nop +/* 24CF0 800498F0 00000000 */ nop /* 24CF4 800498F4 45000057 */ bc1f .L80049A54 -/* 24CF8 800498F8 00000000 */ nop +/* 24CF8 800498F8 00000000 */ nop /* 24CFC 800498FC 8E2300B0 */ lw $v1, 0xb0($s1) /* 24D00 80049900 30620020 */ andi $v0, $v1, 0x20 /* 24D04 80049904 14400002 */ bnez $v0, .L80049910 @@ -160,7 +160,7 @@ glabel func_800496B8 /* 24D10 80049910 8E2200B0 */ lw $v0, 0xb0($s1) /* 24D14 80049914 30420040 */ andi $v0, $v0, 0x40 /* 24D18 80049918 10400013 */ beqz $v0, .L80049968 -/* 24D1C 8004991C 00000000 */ nop +/* 24D1C 8004991C 00000000 */ nop /* 24D20 80049920 C60C0038 */ lwc1 $f12, 0x38($s0) /* 24D24 80049924 8E2200D0 */ lw $v0, 0xd0($s1) /* 24D28 80049928 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -171,7 +171,7 @@ glabel func_800496B8 /* 24D3C 8004993C 468031A0 */ cvt.s.w $f6, $f6 /* 24D40 80049940 44073000 */ mfc1 $a3, $f6 /* 24D44 80049944 0C00A720 */ jal atan2 -/* 24D48 80049948 00000000 */ nop +/* 24D48 80049948 00000000 */ nop /* 24D4C 8004994C 0C00A6C9 */ jal clamp_angle /* 24D50 80049950 46000306 */ mov.s $f12, $f0 /* 24D54 80049954 E600000C */ swc1 $f0, 0xc($s0) @@ -196,13 +196,13 @@ glabel func_800496B8 /* 24D9C 8004999C 860200A8 */ lh $v0, 0xa8($s0) /* 24DA0 800499A0 27A50028 */ addiu $a1, $sp, 0x28 /* 24DA4 800499A4 44820000 */ mtc1 $v0, $f0 -/* 24DA8 800499A8 00000000 */ nop +/* 24DA8 800499A8 00000000 */ nop /* 24DAC 800499AC 46800020 */ cvt.s.w $f0, $f0 /* 24DB0 800499B0 E7A00018 */ swc1 $f0, 0x18($sp) /* 24DB4 800499B4 860200A6 */ lh $v0, 0xa6($s0) /* 24DB8 800499B8 27A6002C */ addiu $a2, $sp, 0x2c /* 24DBC 800499BC 44820000 */ mtc1 $v0, $f0 -/* 24DC0 800499C0 00000000 */ nop +/* 24DC0 800499C0 00000000 */ nop /* 24DC4 800499C4 46800020 */ cvt.s.w $f0, $f0 /* 24DC8 800499C8 E7A0001C */ swc1 $f0, 0x1c($sp) /* 24DCC 800499CC 8E040080 */ lw $a0, 0x80($s0) @@ -220,7 +220,7 @@ glabel func_800496B8 /* 24DFC 800499FC 468031A0 */ cvt.s.w $f6, $f6 /* 24E00 80049A00 44073000 */ mfc1 $a3, $f6 /* 24E04 80049A04 0C00A720 */ jal atan2 -/* 24E08 80049A08 00000000 */ nop +/* 24E08 80049A08 00000000 */ nop /* 24E0C 80049A0C 0C00A6C9 */ jal clamp_angle /* 24E10 80049A10 46000306 */ mov.s $f12, $f0 /* 24E14 80049A14 0200202D */ daddu $a0, $s0, $zero @@ -255,10 +255,10 @@ glabel func_800496B8 /* 24E80 80049A80 00621825 */ or $v1, $v1, $v0 /* 24E84 80049A84 00751825 */ or $v1, $v1, $s5 /* 24E88 80049A88 10600008 */ beqz $v1, .L80049AAC -/* 24E8C 80049A8C 00000000 */ nop +/* 24E8C 80049A8C 00000000 */ nop /* 24E90 80049A90 8602008C */ lh $v0, 0x8c($s0) /* 24E94 80049A94 14400022 */ bnez $v0, .L80049B20 -/* 24E98 80049A98 00000000 */ nop +/* 24E98 80049A98 00000000 */ nop /* 24E9C 80049A9C 8E050018 */ lw $a1, 0x18($s0) /* 24EA0 80049AA0 8E06000C */ lw $a2, 0xc($s0) /* 24EA4 80049AA4 0C00EA95 */ jal npc_move_heading @@ -266,7 +266,7 @@ glabel func_800496B8 .L80049AAC: /* 24EAC 80049AAC 8E820004 */ lw $v0, 4($s4) /* 24EB0 80049AB0 1840001B */ blez $v0, .L80049B20 -/* 24EB4 80049AB4 00000000 */ nop +/* 24EB4 80049AB4 00000000 */ nop /* 24EB8 80049AB8 9602008E */ lhu $v0, 0x8e($s0) /* 24EBC 80049ABC 2442FFFF */ addiu $v0, $v0, -1 /* 24EC0 80049AC0 A602008E */ sh $v0, 0x8e($s0) diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80049C04.s b/asm/nonmatchings/code_20ec0_len_5040/func_80049C04.s index 7502639d3c..f737a68a6e 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80049C04.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80049C04.s @@ -26,7 +26,7 @@ glabel func_80049C04 /* 25058 80049C58 0C01242D */ jal func_800490B4 /* 2505C 80049C5C 0240282D */ daddu $a1, $s2, $zero /* 25060 80049C60 10400047 */ beqz $v0, .L80049D80 -/* 25064 80049C64 00000000 */ nop +/* 25064 80049C64 00000000 */ nop /* 25068 80049C68 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 2506C 80049C6C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* 25070 80049C70 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -47,13 +47,13 @@ glabel func_80049C04 /* 250AC 80049CAC 860200A8 */ lh $v0, 0xa8($s0) /* 250B0 80049CB0 27A50028 */ addiu $a1, $sp, 0x28 /* 250B4 80049CB4 44820000 */ mtc1 $v0, $f0 -/* 250B8 80049CB8 00000000 */ nop +/* 250B8 80049CB8 00000000 */ nop /* 250BC 80049CBC 46800020 */ cvt.s.w $f0, $f0 /* 250C0 80049CC0 E7A00018 */ swc1 $f0, 0x18($sp) /* 250C4 80049CC4 860200A6 */ lh $v0, 0xa6($s0) /* 250C8 80049CC8 27A6002C */ addiu $a2, $sp, 0x2c /* 250CC 80049CCC 44820000 */ mtc1 $v0, $f0 -/* 250D0 80049CD0 00000000 */ nop +/* 250D0 80049CD0 00000000 */ nop /* 250D4 80049CD4 46800020 */ cvt.s.w $f0, $f0 /* 250D8 80049CD8 E7A0001C */ swc1 $f0, 0x1c($sp) /* 250DC 80049CDC 8E040080 */ lw $a0, 0x80($s0) @@ -78,7 +78,7 @@ glabel func_80049C04 /* 25128 80049D28 2402000F */ addiu $v0, $zero, 0xf /* 2512C 80049D2C AFA2001C */ sw $v0, 0x1c($sp) /* 25130 80049D30 44833000 */ mtc1 $v1, $f6 -/* 25134 80049D34 00000000 */ nop +/* 25134 80049D34 00000000 */ nop /* 25138 80049D38 468031A0 */ cvt.s.w $f6, $f6 /* 2513C 80049D3C 44073000 */ mfc1 $a3, $f6 /* 25140 80049D40 27A20034 */ addiu $v0, $sp, 0x34 @@ -101,13 +101,13 @@ glabel func_80049C04 .L80049D80: /* 25180 80049D80 8602008C */ lh $v0, 0x8c($s0) /* 25184 80049D84 14400024 */ bnez $v0, .L80049E18 -/* 25188 80049D88 00000000 */ nop +/* 25188 80049D88 00000000 */ nop /* 2518C 80049D8C 9602008E */ lhu $v0, 0x8e($s0) /* 25190 80049D90 2442FFFF */ addiu $v0, $v0, -1 /* 25194 80049D94 A602008E */ sh $v0, 0x8e($s0) /* 25198 80049D98 00021400 */ sll $v0, $v0, 0x10 /* 2519C 80049D9C 1C40001E */ bgtz $v0, .L80049E18 -/* 251A0 80049DA0 00000000 */ nop +/* 251A0 80049DA0 00000000 */ nop /* 251A4 80049DA4 8E820074 */ lw $v0, 0x74($s4) /* 251A8 80049DA8 2442FFFF */ addiu $v0, $v0, -1 /* 251AC 80049DAC 10400019 */ beqz $v0, .L80049E14 @@ -116,7 +116,7 @@ glabel func_80049C04 /* 251B8 80049DB8 9442002A */ lhu $v0, 0x2a($v0) /* 251BC 80049DBC 30420010 */ andi $v0, $v0, 0x10 /* 251C0 80049DC0 14400007 */ bnez $v0, .L80049DE0 -/* 251C4 80049DC4 00000000 */ nop +/* 251C4 80049DC4 00000000 */ nop /* 251C8 80049DC8 C600000C */ lwc1 $f0, 0xc($s0) /* 251CC 80049DCC 3C014334 */ lui $at, 0x4334 /* 251D0 80049DD0 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80049ECC.s b/asm/nonmatchings/code_20ec0_len_5040/func_80049ECC.s index 42d699f91f..2953486c16 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80049ECC.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80049ECC.s @@ -15,15 +15,15 @@ glabel func_80049ECC /* 252F4 80049EF4 44801800 */ mtc1 $zero, $f3 /* 252F8 80049EF8 46000021 */ cvt.d.s $f0, $f0 /* 252FC 80049EFC 4622003E */ c.le.d $f0, $f2 -/* 25300 80049F00 00000000 */ nop +/* 25300 80049F00 00000000 */ nop /* 25304 80049F04 45000009 */ bc1f .L80049F2C /* 25308 80049F08 0000182D */ daddu $v1, $zero, $zero /* 2530C 80049F0C C480003C */ lwc1 $f0, 0x3c($a0) /* 25310 80049F10 C4820064 */ lwc1 $f2, 0x64($a0) /* 25314 80049F14 4602003E */ c.le.s $f0, $f2 -/* 25318 80049F18 00000000 */ nop +/* 25318 80049F18 00000000 */ nop /* 2531C 80049F1C 45000003 */ bc1f .L80049F2C -/* 25320 80049F20 00000000 */ nop +/* 25320 80049F20 00000000 */ nop /* 25324 80049F24 E482003C */ swc1 $f2, 0x3c($a0) /* 25328 80049F28 24030001 */ addiu $v1, $zero, 1 .L80049F2C: diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80049F7C.s b/asm/nonmatchings/code_20ec0_len_5040/func_80049F7C.s index 673961e602..e55a4ab24e 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80049F7C.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80049F7C.s @@ -27,7 +27,7 @@ glabel func_80049F7C /* 253D4 80049FD4 00021603 */ sra $v0, $v0, 0x18 /* 253D8 80049FD8 24030008 */ addiu $v1, $zero, 8 /* 253DC 80049FDC 1443000F */ bne $v0, $v1, .L8004A01C -/* 253E0 80049FE0 00000000 */ nop +/* 253E0 80049FE0 00000000 */ nop .L80049FE4: /* 253E4 80049FE4 C60C0038 */ lwc1 $f12, 0x38($s0) /* 253E8 80049FE8 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -37,10 +37,10 @@ glabel func_80049F7C /* 253F8 80049FF8 860200A6 */ lh $v0, 0xa6($s0) /* 253FC 80049FFC 46000021 */ cvt.d.s $f0, $f0 /* 25400 8004A000 44821000 */ mtc1 $v0, $f2 -/* 25404 8004A004 00000000 */ nop +/* 25404 8004A004 00000000 */ nop /* 25408 8004A008 468010A1 */ cvt.d.w $f2, $f2 /* 2540C 8004A00C 4622003C */ c.lt.d $f0, $f2 -/* 25410 8004A010 00000000 */ nop +/* 25410 8004A010 00000000 */ nop /* 25414 8004A014 45030001 */ bc1tl .L8004A01C /* 25418 8004A018 24110001 */ addiu $s1, $zero, 1 .L8004A01C: @@ -61,20 +61,20 @@ glabel func_80049F7C /* 25454 8004A054 8E42001C */ lw $v0, 0x1c($s2) /* 25458 8004A058 46001005 */ abs.s $f0, $f2 /* 2545C 8004A05C 44822000 */ mtc1 $v0, $f4 -/* 25460 8004A060 00000000 */ nop +/* 25460 8004A060 00000000 */ nop /* 25464 8004A064 46802120 */ cvt.s.w $f4, $f4 /* 25468 8004A068 4600203C */ c.lt.s $f4, $f0 -/* 2546C 8004A06C 00000000 */ nop +/* 2546C 8004A06C 00000000 */ nop /* 25470 8004A070 4500000D */ bc1f .L8004A0A8 -/* 25474 8004A074 00000000 */ nop +/* 25474 8004A074 00000000 */ nop /* 25478 8004A078 44800000 */ mtc1 $zero, $f0 /* 2547C 8004A07C C614000C */ lwc1 $f20, 0xc($s0) /* 25480 8004A080 4600103C */ c.lt.s $f2, $f0 -/* 25484 8004A084 00000000 */ nop +/* 25484 8004A084 00000000 */ nop /* 25488 8004A088 45000006 */ bc1f .L8004A0A4 /* 2548C 8004A08C 00021023 */ negu $v0, $v0 /* 25490 8004A090 44820000 */ mtc1 $v0, $f0 -/* 25494 8004A094 00000000 */ nop +/* 25494 8004A094 00000000 */ nop /* 25498 8004A098 46800020 */ cvt.s.w $f0, $f0 /* 2549C 8004A09C 0801282A */ j .L8004A0A8 /* 254A0 8004A0A0 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_8004A124.s b/asm/nonmatchings/code_20ec0_len_5040/func_8004A124.s index eb727478b1..1a71f3a782 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_8004A124.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_8004A124.s @@ -37,7 +37,7 @@ glabel func_8004A124 /* 255A4 8004A1A4 2402000F */ addiu $v0, $zero, 0xf /* 255A8 8004A1A8 AFA2001C */ sw $v0, 0x1c($sp) /* 255AC 8004A1AC 44833000 */ mtc1 $v1, $f6 -/* 255B0 8004A1B0 00000000 */ nop +/* 255B0 8004A1B0 00000000 */ nop /* 255B4 8004A1B4 468031A0 */ cvt.s.w $f6, $f6 /* 255B8 8004A1B8 44073000 */ mfc1 $a3, $f6 /* 255BC 8004A1BC 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,10 +72,10 @@ glabel func_8004A124 /* 2562C 8004A22C 44802000 */ mtc1 $zero, $f4 /* 25630 8004A230 460010A1 */ cvt.d.s $f2, $f2 /* 25634 8004A234 46241082 */ mul.d $f2, $f2, $f4 -/* 25638 8004A238 00000000 */ nop +/* 25638 8004A238 00000000 */ nop /* 2563C 8004A23C 46000021 */ cvt.d.s $f0, $f0 /* 25640 8004A240 4620103C */ c.lt.d $f2, $f0 -/* 25644 8004A244 00000000 */ nop +/* 25644 8004A244 00000000 */ nop /* 25648 8004A248 45000036 */ bc1f .L8004A324 /* 2564C 8004A24C 27A5002C */ addiu $a1, $sp, 0x2c /* 25650 8004A250 C6000038 */ lwc1 $f0, 0x38($s0) @@ -91,13 +91,13 @@ glabel func_8004A124 /* 25678 8004A278 E7A00014 */ swc1 $f0, 0x14($sp) /* 2567C 8004A27C 860200A8 */ lh $v0, 0xa8($s0) /* 25680 8004A280 44820000 */ mtc1 $v0, $f0 -/* 25684 8004A284 00000000 */ nop +/* 25684 8004A284 00000000 */ nop /* 25688 8004A288 46800020 */ cvt.s.w $f0, $f0 /* 2568C 8004A28C E7A00018 */ swc1 $f0, 0x18($sp) /* 25690 8004A290 860200A6 */ lh $v0, 0xa6($s0) /* 25694 8004A294 27A60030 */ addiu $a2, $sp, 0x30 /* 25698 8004A298 44820000 */ mtc1 $v0, $f0 -/* 2569C 8004A29C 00000000 */ nop +/* 2569C 8004A29C 00000000 */ nop /* 256A0 8004A2A0 46800020 */ cvt.s.w $f0, $f0 /* 256A4 8004A2A4 E7A0001C */ swc1 $f0, 0x1c($sp) /* 256A8 8004A2A8 8E040080 */ lw $a0, 0x80($s0) @@ -115,7 +115,7 @@ glabel func_8004A124 /* 256D8 8004A2D8 2402000C */ addiu $v0, $zero, 0xc /* 256DC 8004A2DC AFA2001C */ sw $v0, 0x1c($sp) /* 256E0 8004A2E0 44833000 */ mtc1 $v1, $f6 -/* 256E4 8004A2E4 00000000 */ nop +/* 256E4 8004A2E4 00000000 */ nop /* 256E8 8004A2E8 468031A0 */ cvt.s.w $f6, $f6 /* 256EC 8004A2EC 44073000 */ mfc1 $a3, $f6 /* 256F0 8004A2F0 27A20028 */ addiu $v0, $sp, 0x28 @@ -146,9 +146,9 @@ glabel func_8004A124 /* 2574C 8004A34C 44801000 */ mtc1 $zero, $f2 /* 25750 8004A350 46000021 */ cvt.d.s $f0, $f0 /* 25754 8004A354 4620103C */ c.lt.d $f2, $f0 -/* 25758 8004A358 00000000 */ nop +/* 25758 8004A358 00000000 */ nop /* 2575C 8004A35C 45000012 */ bc1f .L8004A3A8 -/* 25760 8004A360 00000000 */ nop +/* 25760 8004A360 00000000 */ nop /* 25764 8004A364 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 25768 8004A368 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 2576C 8004A36C 94430134 */ lhu $v1, 0x134($v0) diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_8004A3E8.s b/asm/nonmatchings/code_20ec0_len_5040/func_8004A3E8.s index d203efbb7f..c6cf0daf40 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_8004A3E8.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_8004A3E8.s @@ -17,7 +17,7 @@ glabel func_8004A3E8 /* 25818 8004A418 A602008E */ sh $v0, 0x8e($s0) /* 2581C 8004A41C 00021400 */ sll $v0, $v0, 0x10 /* 25820 8004A420 14400010 */ bnez $v0, .L8004A464 -/* 25824 8004A424 00000000 */ nop +/* 25824 8004A424 00000000 */ nop /* 25828 8004A428 8E2200D0 */ lw $v0, 0xd0($s1) /* 2582C 8004A42C C60C0038 */ lwc1 $f12, 0x38($s0) /* 25830 8004A430 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -28,7 +28,7 @@ glabel func_8004A3E8 /* 25844 8004A444 468010A0 */ cvt.s.w $f2, $f2 /* 25848 8004A448 44071000 */ mfc1 $a3, $f2 /* 2584C 8004A44C 0C00A720 */ jal atan2 -/* 25850 8004A450 00000000 */ nop +/* 25850 8004A450 00000000 */ nop /* 25854 8004A454 0C00A6C9 */ jal clamp_angle /* 25858 8004A458 46000306 */ mov.s $f12, $f0 /* 2585C 8004A45C E600000C */ swc1 $f0, 0xc($s0) diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_8004A6F0.s b/asm/nonmatchings/code_20ec0_len_5040/func_8004A6F0.s index a215e6ee0d..4d30c6b4fc 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_8004A6F0.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_8004A6F0.s @@ -14,7 +14,7 @@ glabel func_8004A6F0 /* 25B14 8004A714 A443008E */ sh $v1, 0x8e($v0) /* 25B18 8004A718 00031C00 */ sll $v1, $v1, 0x10 /* 25B1C 8004A71C 1C600003 */ bgtz $v1, .L8004A72C -/* 25B20 8004A720 00000000 */ nop +/* 25B20 8004A720 00000000 */ nop /* 25B24 8004A724 8E020074 */ lw $v0, 0x74($s0) /* 25B28 8004A728 AE020070 */ sw $v0, 0x70($s0) .L8004A72C: diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_8004A73C.s b/asm/nonmatchings/code_20ec0_len_5040/func_8004A73C.s index b17c30d8d3..a057be7831 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_8004A73C.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_8004A73C.s @@ -12,7 +12,7 @@ glabel func_8004A73C /* 25B58 8004A758 86040008 */ lh $a0, 8($s0) /* 25B5C 8004A75C 820200B4 */ lb $v0, 0xb4($s0) /* 25B60 8004A760 14400003 */ bnez $v0, .L8004A770 -/* 25B64 8004A764 00000000 */ nop +/* 25B64 8004A764 00000000 */ nop /* 25B68 8004A768 8E220074 */ lw $v0, 0x74($s1) /* 25B6C 8004A76C AE220070 */ sw $v0, 0x70($s1) .L8004A770: diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_8004A784.s b/asm/nonmatchings/code_20ec0_len_5040/func_8004A784.s index 33c4bb0093..af6091b438 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_8004A784.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_8004A784.s @@ -31,7 +31,7 @@ glabel func_8004A784 /* 25BEC 8004A7EC C6000018 */ lwc1 $f0, 0x18($s0) /* 25BF0 8004A7F0 C6020040 */ lwc1 $f2, 0x40($s0) /* 25BF4 8004A7F4 461C0002 */ mul.s $f0, $f0, $f28 -/* 25BF8 8004A7F8 00000000 */ nop +/* 25BF8 8004A7F8 00000000 */ nop /* 25BFC 8004A7FC E7A20028 */ swc1 $f2, 0x28($sp) /* 25C00 8004A800 C63A0000 */ lwc1 $f26, ($s1) /* 25C04 8004A804 27A70028 */ addiu $a3, $sp, 0x28 @@ -41,13 +41,13 @@ glabel func_8004A784 /* 25C14 8004A814 3C01BF80 */ lui $at, 0xbf80 /* 25C18 8004A818 4481A000 */ mtc1 $at, $f20 /* 25C1C 8004A81C 44820000 */ mtc1 $v0, $f0 -/* 25C20 8004A820 00000000 */ nop +/* 25C20 8004A820 00000000 */ nop /* 25C24 8004A824 46800020 */ cvt.s.w $f0, $f0 /* 25C28 8004A828 E7A00018 */ swc1 $f0, 0x18($sp) /* 25C2C 8004A82C 860200A6 */ lh $v0, 0xa6($s0) /* 25C30 8004A830 4600A586 */ mov.s $f22, $f20 /* 25C34 8004A834 44820000 */ mtc1 $v0, $f0 -/* 25C38 8004A838 00000000 */ nop +/* 25C38 8004A838 00000000 */ nop /* 25C3C 8004A83C 46800020 */ cvt.s.w $f0, $f0 /* 25C40 8004A840 E7A0001C */ swc1 $f0, 0x1c($sp) /* 25C44 8004A844 8E040080 */ lw $a0, 0x80($s0) @@ -55,7 +55,7 @@ glabel func_8004A784 /* 25C4C 8004A84C 4600A606 */ mov.s $f24, $f20 /* 25C50 8004A850 0040902D */ daddu $s2, $v0, $zero /* 25C54 8004A854 1240008D */ beqz $s2, .L8004AA8C -/* 25C58 8004A858 00000000 */ nop +/* 25C58 8004A858 00000000 */ nop /* 25C5C 8004A85C C60C0038 */ lwc1 $f12, 0x38($s0) /* 25C60 8004A860 C60E0040 */ lwc1 $f14, 0x40($s0) /* 25C64 8004A864 8FA60020 */ lw $a2, 0x20($sp) @@ -74,26 +74,26 @@ glabel func_8004A784 /* 25C98 8004A898 E7A00034 */ swc1 $f0, 0x34($sp) /* 25C9C 8004A89C C6020018 */ lwc1 $f2, 0x18($s0) /* 25CA0 8004A8A0 461C1082 */ mul.s $f2, $f2, $f28 -/* 25CA4 8004A8A4 00000000 */ nop +/* 25CA4 8004A8A4 00000000 */ nop /* 25CA8 8004A8A8 E7A00014 */ swc1 $f0, 0x14($sp) /* 25CAC 8004A8AC E7A20010 */ swc1 $f2, 0x10($sp) /* 25CB0 8004A8B0 860200A8 */ lh $v0, 0xa8($s0) /* 25CB4 8004A8B4 27A5002C */ addiu $a1, $sp, 0x2c /* 25CB8 8004A8B8 44820000 */ mtc1 $v0, $f0 -/* 25CBC 8004A8BC 00000000 */ nop +/* 25CBC 8004A8BC 00000000 */ nop /* 25CC0 8004A8C0 46800020 */ cvt.s.w $f0, $f0 /* 25CC4 8004A8C4 E7A00018 */ swc1 $f0, 0x18($sp) /* 25CC8 8004A8C8 860200A6 */ lh $v0, 0xa6($s0) /* 25CCC 8004A8CC 27A60030 */ addiu $a2, $sp, 0x30 /* 25CD0 8004A8D0 44820000 */ mtc1 $v0, $f0 -/* 25CD4 8004A8D4 00000000 */ nop +/* 25CD4 8004A8D4 00000000 */ nop /* 25CD8 8004A8D8 46800020 */ cvt.s.w $f0, $f0 /* 25CDC 8004A8DC E7A0001C */ swc1 $f0, 0x1c($sp) /* 25CE0 8004A8E0 8E040080 */ lw $a0, 0x80($s0) /* 25CE4 8004A8E4 0C037711 */ jal func_800DDC44 /* 25CE8 8004A8E8 27A70034 */ addiu $a3, $sp, 0x34 /* 25CEC 8004A8EC 10400007 */ beqz $v0, .L8004A90C -/* 25CF0 8004A8F0 00000000 */ nop +/* 25CF0 8004A8F0 00000000 */ nop /* 25CF4 8004A8F4 C60C0038 */ lwc1 $f12, 0x38($s0) /* 25CF8 8004A8F8 C60E0040 */ lwc1 $f14, 0x40($s0) /* 25CFC 8004A8FC 8FA6002C */ lw $a2, 0x2c($sp) @@ -111,26 +111,26 @@ glabel func_8004A784 /* 25D28 8004A928 E7A40040 */ swc1 $f4, 0x40($sp) /* 25D2C 8004A92C C6020018 */ lwc1 $f2, 0x18($s0) /* 25D30 8004A930 461C1082 */ mul.s $f2, $f2, $f28 -/* 25D34 8004A934 00000000 */ nop +/* 25D34 8004A934 00000000 */ nop /* 25D38 8004A938 E7A00014 */ swc1 $f0, 0x14($sp) /* 25D3C 8004A93C E7A20010 */ swc1 $f2, 0x10($sp) /* 25D40 8004A940 860200A8 */ lh $v0, 0xa8($s0) /* 25D44 8004A944 27A50038 */ addiu $a1, $sp, 0x38 /* 25D48 8004A948 44820000 */ mtc1 $v0, $f0 -/* 25D4C 8004A94C 00000000 */ nop +/* 25D4C 8004A94C 00000000 */ nop /* 25D50 8004A950 46800020 */ cvt.s.w $f0, $f0 /* 25D54 8004A954 E7A00018 */ swc1 $f0, 0x18($sp) /* 25D58 8004A958 860200A6 */ lh $v0, 0xa6($s0) /* 25D5C 8004A95C 27A6003C */ addiu $a2, $sp, 0x3c /* 25D60 8004A960 44820000 */ mtc1 $v0, $f0 -/* 25D64 8004A964 00000000 */ nop +/* 25D64 8004A964 00000000 */ nop /* 25D68 8004A968 46800020 */ cvt.s.w $f0, $f0 /* 25D6C 8004A96C E7A0001C */ swc1 $f0, 0x1c($sp) /* 25D70 8004A970 8E040080 */ lw $a0, 0x80($s0) /* 25D74 8004A974 0C037711 */ jal func_800DDC44 /* 25D78 8004A978 27A70040 */ addiu $a3, $sp, 0x40 /* 25D7C 8004A97C 10400007 */ beqz $v0, .L8004A99C -/* 25D80 8004A980 00000000 */ nop +/* 25D80 8004A980 00000000 */ nop /* 25D84 8004A984 C60C0038 */ lwc1 $f12, 0x38($s0) /* 25D88 8004A988 C60E0040 */ lwc1 $f14, 0x40($s0) /* 25D8C 8004A98C 8FA60038 */ lw $a2, 0x38($sp) @@ -139,43 +139,43 @@ glabel func_8004A784 /* 25D98 8004A998 46000606 */ mov.s $f24, $f0 .L8004A99C: /* 25D9C 8004A99C 4616A03C */ c.lt.s $f20, $f22 -/* 25DA0 8004A9A0 00000000 */ nop +/* 25DA0 8004A9A0 00000000 */ nop /* 25DA4 8004A9A4 45000005 */ bc1f .L8004A9BC -/* 25DA8 8004A9A8 00000000 */ nop +/* 25DA8 8004A9A8 00000000 */ nop /* 25DAC 8004A9AC 4614C03C */ c.lt.s $f24, $f20 -/* 25DB0 8004A9B0 00000000 */ nop +/* 25DB0 8004A9B0 00000000 */ nop /* 25DB4 8004A9B4 45010009 */ bc1t .L8004A9DC -/* 25DB8 8004A9B8 00000000 */ nop +/* 25DB8 8004A9B8 00000000 */ nop .L8004A9BC: /* 25DBC 8004A9BC 4616C03C */ c.lt.s $f24, $f22 -/* 25DC0 8004A9C0 00000000 */ nop +/* 25DC0 8004A9C0 00000000 */ nop /* 25DC4 8004A9C4 45000007 */ bc1f .L8004A9E4 -/* 25DC8 8004A9C8 00000000 */ nop +/* 25DC8 8004A9C8 00000000 */ nop /* 25DCC 8004A9CC 4618A03C */ c.lt.s $f20, $f24 -/* 25DD0 8004A9D0 00000000 */ nop +/* 25DD0 8004A9D0 00000000 */ nop /* 25DD4 8004A9D4 45000003 */ bc1f .L8004A9E4 -/* 25DD8 8004A9D8 00000000 */ nop +/* 25DD8 8004A9D8 00000000 */ nop .L8004A9DC: /* 25DDC 8004A9DC 08012AA3 */ j .L8004AA8C /* 25DE0 8004A9E0 C61A000C */ lwc1 $f26, 0xc($s0) .L8004A9E4: /* 25DE4 8004A9E4 4614B03C */ c.lt.s $f22, $f20 -/* 25DE8 8004A9E8 00000000 */ nop +/* 25DE8 8004A9E8 00000000 */ nop /* 25DEC 8004A9EC 45000005 */ bc1f .L8004AA04 -/* 25DF0 8004A9F0 00000000 */ nop +/* 25DF0 8004A9F0 00000000 */ nop /* 25DF4 8004A9F4 4616C03C */ c.lt.s $f24, $f22 -/* 25DF8 8004A9F8 00000000 */ nop +/* 25DF8 8004A9F8 00000000 */ nop /* 25DFC 8004A9FC 45010009 */ bc1t .L8004AA24 -/* 25E00 8004AA00 00000000 */ nop +/* 25E00 8004AA00 00000000 */ nop .L8004AA04: /* 25E04 8004AA04 4614C03C */ c.lt.s $f24, $f20 -/* 25E08 8004AA08 00000000 */ nop +/* 25E08 8004AA08 00000000 */ nop /* 25E0C 8004AA0C 4500000A */ bc1f .L8004AA38 -/* 25E10 8004AA10 00000000 */ nop +/* 25E10 8004AA10 00000000 */ nop /* 25E14 8004AA14 4618B03C */ c.lt.s $f22, $f24 -/* 25E18 8004AA18 00000000 */ nop +/* 25E18 8004AA18 00000000 */ nop /* 25E1C 8004AA1C 45000008 */ bc1f .L8004AA40 -/* 25E20 8004AA20 00000000 */ nop +/* 25E20 8004AA20 00000000 */ nop .L8004AA24: /* 25E24 8004AA24 C602000C */ lwc1 $f2, 0xc($s0) /* 25E28 8004AA28 3C01420C */ lui $at, 0x420c @@ -184,32 +184,32 @@ glabel func_8004A784 /* 25E34 8004AA34 46001680 */ add.s $f26, $f2, $f0 .L8004AA38: /* 25E38 8004AA38 4618B03C */ c.lt.s $f22, $f24 -/* 25E3C 8004AA3C 00000000 */ nop +/* 25E3C 8004AA3C 00000000 */ nop .L8004AA40: /* 25E40 8004AA40 45000005 */ bc1f .L8004AA58 -/* 25E44 8004AA44 00000000 */ nop +/* 25E44 8004AA44 00000000 */ nop /* 25E48 8004AA48 4616A03C */ c.lt.s $f20, $f22 -/* 25E4C 8004AA4C 00000000 */ nop +/* 25E4C 8004AA4C 00000000 */ nop /* 25E50 8004AA50 45010009 */ bc1t .L8004AA78 -/* 25E54 8004AA54 00000000 */ nop +/* 25E54 8004AA54 00000000 */ nop .L8004AA58: /* 25E58 8004AA58 4618A03C */ c.lt.s $f20, $f24 -/* 25E5C 8004AA5C 00000000 */ nop +/* 25E5C 8004AA5C 00000000 */ nop /* 25E60 8004AA60 4500000A */ bc1f .L8004AA8C -/* 25E64 8004AA64 00000000 */ nop +/* 25E64 8004AA64 00000000 */ nop /* 25E68 8004AA68 4614B03C */ c.lt.s $f22, $f20 -/* 25E6C 8004AA6C 00000000 */ nop +/* 25E6C 8004AA6C 00000000 */ nop /* 25E70 8004AA70 45000006 */ bc1f .L8004AA8C -/* 25E74 8004AA74 00000000 */ nop +/* 25E74 8004AA74 00000000 */ nop .L8004AA78: /* 25E78 8004AA78 C602000C */ lwc1 $f2, 0xc($s0) /* 25E7C 8004AA7C 3C01420C */ lui $at, 0x420c /* 25E80 8004AA80 44810000 */ mtc1 $at, $f0 -/* 25E84 8004AA84 00000000 */ nop +/* 25E84 8004AA84 00000000 */ nop /* 25E88 8004AA88 46001681 */ sub.s $f26, $f2, $f0 .L8004AA8C: /* 25E8C 8004AA8C 12200004 */ beqz $s1, .L8004AAA0 -/* 25E90 8004AA90 00000000 */ nop +/* 25E90 8004AA90 00000000 */ nop /* 25E94 8004AA94 0C00A6C9 */ jal clamp_angle /* 25E98 8004AA98 4600D306 */ mov.s $f12, $f26 /* 25E9C 8004AA9C E6200000 */ swc1 $f0, ($s1) @@ -239,5 +239,5 @@ glabel func_8004A784 /* 25EEC 8004AAEC D7B40068 */ ldc1 $f20, 0x68($sp) /* 25EF0 8004AAF0 03E00008 */ jr $ra /* 25EF4 8004AAF4 27BD0098 */ addiu $sp, $sp, 0x98 -/* 25EF8 8004AAF8 00000000 */ nop -/* 25EFC 8004AAFC 00000000 */ nop +/* 25EF8 8004AAF8 00000000 */ nop +/* 25EFC 8004AAFC 00000000 */ nop diff --git a/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s b/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s index 4fa3f32b25..6c6865cc64 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s +++ b/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s @@ -74,7 +74,7 @@ glabel spawn_drops /* 2378C 8004838C 00621821 */ addu $v1, $v1, $v0 /* 23790 80048390 00031843 */ sra $v1, $v1, 1 /* 23794 80048394 44830000 */ mtc1 $v1, $f0 -/* 23798 80048398 00000000 */ nop +/* 23798 80048398 00000000 */ nop /* 2379C 8004839C 46800020 */ cvt.s.w $f0, $f0 /* 237A0 800483A0 46001080 */ add.s $f2, $f2, $f0 /* 237A4 800483A4 91110001 */ lbu $s1, 1($t0) @@ -115,7 +115,7 @@ glabel spawn_drops .L80048428: /* 23828 80048428 86020002 */ lh $v0, 2($s0) /* 2382C 8004842C 10400017 */ beqz $v0, .L8004848C -/* 23830 80048430 00000000 */ nop +/* 23830 80048430 00000000 */ nop /* 23834 80048434 8FA80020 */ lw $t0, 0x20($sp) /* 23838 80048438 01131021 */ addu $v0, $t0, $s3 /* 2383C 8004843C 01141821 */ addu $v1, $t0, $s4 @@ -162,7 +162,7 @@ glabel spawn_drops /* 238D4 800484D4 0C04C4FD */ jal make_item_entity /* 238D8 800484D8 AFA80014 */ sw $t0, 0x14($sp) /* 238DC 800484DC 44960000 */ mtc1 $s6, $f0 -/* 238E0 800484E0 00000000 */ nop +/* 238E0 800484E0 00000000 */ nop /* 238E4 800484E4 46800021 */ cvt.d.w $f0, $f0 /* 238E8 800484E8 27DE0001 */ addiu $fp, $fp, 1 /* 238EC 800484EC 2BC2000C */ slti $v0, $fp, 0xc @@ -188,7 +188,7 @@ glabel spawn_drops /* 23938 80048538 01021021 */ addu $v0, $t0, $v0 /* 2393C 8004853C 84440002 */ lh $a0, 2($v0) /* 23940 80048540 04800003 */ bltz $a0, .L80048550 -/* 23944 80048544 00000000 */ nop +/* 23944 80048544 00000000 */ nop /* 23948 80048548 0C051514 */ jal set_global_flag /* 2394C 8004854C 24840715 */ addiu $a0, $a0, 0x715 .L80048550: @@ -215,7 +215,7 @@ glabel spawn_drops /* 239A0 800485A0 0C04C4FD */ jal make_item_entity /* 239A4 800485A4 AFA80014 */ sw $t0, 0x14($sp) /* 239A8 800485A8 44960000 */ mtc1 $s6, $f0 -/* 239AC 800485AC 00000000 */ nop +/* 239AC 800485AC 00000000 */ nop /* 239B0 800485B0 46800021 */ cvt.d.w $f0, $f0 /* 239B4 800485B4 27DE0001 */ addiu $fp, $fp, 1 /* 239B8 800485B8 2BC2000C */ slti $v0, $fp, 0xc @@ -252,10 +252,10 @@ glabel spawn_drops /* 23A2C 8004862C 24130002 */ addiu $s3, $zero, 2 /* 23A30 80048630 AFA00030 */ sw $zero, 0x30($sp) /* 23A34 80048634 44821000 */ mtc1 $v0, $f2 -/* 23A38 80048638 00000000 */ nop +/* 23A38 80048638 00000000 */ nop /* 23A3C 8004863C 468010A0 */ cvt.s.w $f2, $f2 /* 23A40 80048640 44830000 */ mtc1 $v1, $f0 -/* 23A44 80048644 00000000 */ nop +/* 23A44 80048644 00000000 */ nop /* 23A48 80048648 46800020 */ cvt.s.w $f0, $f0 /* 23A4C 8004864C 46001603 */ div.s $f24, $f2, $f0 .L80048650: @@ -263,69 +263,69 @@ glabel spawn_drops /* 23A54 80048654 86030032 */ lh $v1, 0x32($s0) /* 23A58 80048658 01131021 */ addu $v0, $t0, $s3 /* 23A5C 8004865C 4483B000 */ mtc1 $v1, $f22 -/* 23A60 80048660 00000000 */ nop +/* 23A60 80048660 00000000 */ nop /* 23A64 80048664 4680B5A0 */ cvt.s.w $f22, $f22 /* 23A68 80048668 461AB583 */ div.s $f22, $f22, $f26 /* 23A6C 8004866C 84420032 */ lh $v0, 0x32($v0) /* 23A70 80048670 4616C03E */ c.le.s $f24, $f22 /* 23A74 80048674 4482A000 */ mtc1 $v0, $f20 -/* 23A78 80048678 00000000 */ nop +/* 23A78 80048678 00000000 */ nop /* 23A7C 8004867C 4680A520 */ cvt.s.w $f20, $f20 /* 23A80 80048680 45000034 */ bc1f .L80048754 /* 23A84 80048684 461AA503 */ div.s $f20, $f20, $f26 /* 23A88 80048688 0C00A67F */ jal rand_int /* 23A8C 8004868C 24040064 */ addiu $a0, $zero, 0x64 /* 23A90 80048690 461CA082 */ mul.s $f2, $f20, $f28 -/* 23A94 80048694 00000000 */ nop +/* 23A94 80048694 00000000 */ nop /* 23A98 80048698 44820000 */ mtc1 $v0, $f0 -/* 23A9C 8004869C 00000000 */ nop +/* 23A9C 8004869C 00000000 */ nop /* 23AA0 800486A0 46800020 */ cvt.s.w $f0, $f0 /* 23AA4 800486A4 4602003E */ c.le.s $f0, $f2 -/* 23AA8 800486A8 00000000 */ nop +/* 23AA8 800486A8 00000000 */ nop /* 23AAC 800486AC 4502002A */ bc1fl .L80048758 /* 23AB0 800486B0 26B50008 */ addiu $s5, $s5, 8 /* 23AB4 800486B4 0000802D */ daddu $s0, $zero, $zero /* 23AB8 800486B8 8FA80020 */ lw $t0, 0x20($sp) /* 23ABC 800486BC 44900000 */ mtc1 $s0, $f0 -/* 23AC0 800486C0 00000000 */ nop +/* 23AC0 800486C0 00000000 */ nop /* 23AC4 800486C4 46800020 */ cvt.s.w $f0, $f0 /* 23AC8 800486C8 01141021 */ addu $v0, $t0, $s4 /* 23ACC 800486CC 01151821 */ addu $v1, $t0, $s5 /* 23AD0 800486D0 84420032 */ lh $v0, 0x32($v0) /* 23AD4 800486D4 84630032 */ lh $v1, 0x32($v1) /* 23AD8 800486D8 4482B000 */ mtc1 $v0, $f22 -/* 23ADC 800486DC 00000000 */ nop +/* 23ADC 800486DC 00000000 */ nop /* 23AE0 800486E0 4680B5A0 */ cvt.s.w $f22, $f22 /* 23AE4 800486E4 4483A000 */ mtc1 $v1, $f20 -/* 23AE8 800486E8 00000000 */ nop +/* 23AE8 800486E8 00000000 */ nop /* 23AEC 800486EC 4680A520 */ cvt.s.w $f20, $f20 /* 23AF0 800486F0 4616003C */ c.lt.s $f0, $f22 -/* 23AF4 800486F4 00000000 */ nop +/* 23AF4 800486F4 00000000 */ nop /* 23AF8 800486F8 4500001D */ bc1f .L80048770 /* 23AFC 800486FC 461AA503 */ div.s $f20, $f20, $f26 .L80048700: /* 23B00 80048700 0C00A67F */ jal rand_int /* 23B04 80048704 24040064 */ addiu $a0, $zero, 0x64 /* 23B08 80048708 461CA082 */ mul.s $f2, $f20, $f28 -/* 23B0C 8004870C 00000000 */ nop +/* 23B0C 8004870C 00000000 */ nop /* 23B10 80048710 44820000 */ mtc1 $v0, $f0 -/* 23B14 80048714 00000000 */ nop +/* 23B14 80048714 00000000 */ nop /* 23B18 80048718 46800020 */ cvt.s.w $f0, $f0 /* 23B1C 8004871C 4602003E */ c.le.s $f0, $f2 -/* 23B20 80048720 00000000 */ nop +/* 23B20 80048720 00000000 */ nop /* 23B24 80048724 45030001 */ bc1tl .L8004872C /* 23B28 80048728 26310001 */ addiu $s1, $s1, 1 .L8004872C: /* 23B2C 8004872C 26100001 */ addiu $s0, $s0, 1 /* 23B30 80048730 44900000 */ mtc1 $s0, $f0 -/* 23B34 80048734 00000000 */ nop +/* 23B34 80048734 00000000 */ nop /* 23B38 80048738 46800020 */ cvt.s.w $f0, $f0 /* 23B3C 8004873C 4616003C */ c.lt.s $f0, $f22 -/* 23B40 80048740 00000000 */ nop +/* 23B40 80048740 00000000 */ nop /* 23B44 80048744 4500000A */ bc1f .L80048770 -/* 23B48 80048748 00000000 */ nop +/* 23B48 80048748 00000000 */ nop /* 23B4C 8004874C 080121C0 */ j .L80048700 -/* 23B50 80048750 00000000 */ nop +/* 23B50 80048750 00000000 */ nop .L80048754: /* 23B54 80048754 26B50008 */ addiu $s5, $s5, 8 .L80048758: @@ -339,7 +339,7 @@ glabel spawn_drops /* 23B70 80048770 0C03A752 */ jal is_ability_active /* 23B74 80048774 2404002B */ addiu $a0, $zero, 0x2b /* 23B78 80048778 10400005 */ beqz $v0, .L80048790 -/* 23B7C 8004877C 00000000 */ nop +/* 23B7C 8004877C 00000000 */ nop /* 23B80 80048780 0C00A67F */ jal rand_int /* 23B84 80048784 24040002 */ addiu $a0, $zero, 2 /* 23B88 80048788 26230001 */ addiu $v1, $s1, 1 @@ -400,7 +400,7 @@ glabel spawn_drops /* 23C4C 8004884C 0C04C4FD */ jal make_item_entity /* 23C50 80048850 AFA80014 */ sw $t0, 0x14($sp) /* 23C54 80048854 44960000 */ mtc1 $s6, $f0 -/* 23C58 80048858 00000000 */ nop +/* 23C58 80048858 00000000 */ nop /* 23C5C 8004885C 46800021 */ cvt.d.w $f0, $f0 /* 23C60 80048860 27DE0001 */ addiu $fp, $fp, 1 /* 23C64 80048864 2BC2000C */ slti $v0, $fp, 0xc @@ -419,7 +419,7 @@ glabel spawn_drops .L80048898: /* 23C98 80048898 0251102A */ slt $v0, $s2, $s1 /* 23C9C 8004889C 1440FFE2 */ bnez $v0, .L80048828 -/* 23CA0 800488A0 00000000 */ nop +/* 23CA0 800488A0 00000000 */ nop .L800488A4: /* 23CA4 800488A4 0000882D */ daddu $s1, $zero, $zero /* 23CA8 800488A8 0220902D */ daddu $s2, $s1, $zero @@ -438,10 +438,10 @@ glabel spawn_drops /* 23CDC 800488DC 24130002 */ addiu $s3, $zero, 2 /* 23CE0 800488E0 AFA00030 */ sw $zero, 0x30($sp) /* 23CE4 800488E4 44821000 */ mtc1 $v0, $f2 -/* 23CE8 800488E8 00000000 */ nop +/* 23CE8 800488E8 00000000 */ nop /* 23CEC 800488EC 468010A0 */ cvt.s.w $f2, $f2 /* 23CF0 800488F0 44830000 */ mtc1 $v1, $f0 -/* 23CF4 800488F4 00000000 */ nop +/* 23CF4 800488F4 00000000 */ nop /* 23CF8 800488F8 46800020 */ cvt.s.w $f0, $f0 /* 23CFC 800488FC 46001603 */ div.s $f24, $f2, $f0 .L80048900: @@ -449,69 +449,69 @@ glabel spawn_drops /* 23D04 80048904 86030072 */ lh $v1, 0x72($s0) /* 23D08 80048908 01131021 */ addu $v0, $t0, $s3 /* 23D0C 8004890C 4483B000 */ mtc1 $v1, $f22 -/* 23D10 80048910 00000000 */ nop +/* 23D10 80048910 00000000 */ nop /* 23D14 80048914 4680B5A0 */ cvt.s.w $f22, $f22 /* 23D18 80048918 461AB583 */ div.s $f22, $f22, $f26 /* 23D1C 8004891C 84420072 */ lh $v0, 0x72($v0) /* 23D20 80048920 4616C03E */ c.le.s $f24, $f22 /* 23D24 80048924 4482A000 */ mtc1 $v0, $f20 -/* 23D28 80048928 00000000 */ nop +/* 23D28 80048928 00000000 */ nop /* 23D2C 8004892C 4680A520 */ cvt.s.w $f20, $f20 /* 23D30 80048930 45000034 */ bc1f .L80048A04 /* 23D34 80048934 461AA503 */ div.s $f20, $f20, $f26 /* 23D38 80048938 0C00A67F */ jal rand_int /* 23D3C 8004893C 24040064 */ addiu $a0, $zero, 0x64 /* 23D40 80048940 461CA082 */ mul.s $f2, $f20, $f28 -/* 23D44 80048944 00000000 */ nop +/* 23D44 80048944 00000000 */ nop /* 23D48 80048948 44820000 */ mtc1 $v0, $f0 -/* 23D4C 8004894C 00000000 */ nop +/* 23D4C 8004894C 00000000 */ nop /* 23D50 80048950 46800020 */ cvt.s.w $f0, $f0 /* 23D54 80048954 4602003E */ c.le.s $f0, $f2 -/* 23D58 80048958 00000000 */ nop +/* 23D58 80048958 00000000 */ nop /* 23D5C 8004895C 4502002A */ bc1fl .L80048A08 /* 23D60 80048960 26B50008 */ addiu $s5, $s5, 8 /* 23D64 80048964 0000802D */ daddu $s0, $zero, $zero /* 23D68 80048968 8FA80020 */ lw $t0, 0x20($sp) /* 23D6C 8004896C 44900000 */ mtc1 $s0, $f0 -/* 23D70 80048970 00000000 */ nop +/* 23D70 80048970 00000000 */ nop /* 23D74 80048974 46800020 */ cvt.s.w $f0, $f0 /* 23D78 80048978 01141021 */ addu $v0, $t0, $s4 /* 23D7C 8004897C 01151821 */ addu $v1, $t0, $s5 /* 23D80 80048980 84420072 */ lh $v0, 0x72($v0) /* 23D84 80048984 84630072 */ lh $v1, 0x72($v1) /* 23D88 80048988 4482B000 */ mtc1 $v0, $f22 -/* 23D8C 8004898C 00000000 */ nop +/* 23D8C 8004898C 00000000 */ nop /* 23D90 80048990 4680B5A0 */ cvt.s.w $f22, $f22 /* 23D94 80048994 4483A000 */ mtc1 $v1, $f20 -/* 23D98 80048998 00000000 */ nop +/* 23D98 80048998 00000000 */ nop /* 23D9C 8004899C 4680A520 */ cvt.s.w $f20, $f20 /* 23DA0 800489A0 4616003C */ c.lt.s $f0, $f22 -/* 23DA4 800489A4 00000000 */ nop +/* 23DA4 800489A4 00000000 */ nop /* 23DA8 800489A8 4500001D */ bc1f .L80048A20 /* 23DAC 800489AC 461AA503 */ div.s $f20, $f20, $f26 .L800489B0: /* 23DB0 800489B0 0C00A67F */ jal rand_int /* 23DB4 800489B4 24040064 */ addiu $a0, $zero, 0x64 /* 23DB8 800489B8 461CA082 */ mul.s $f2, $f20, $f28 -/* 23DBC 800489BC 00000000 */ nop +/* 23DBC 800489BC 00000000 */ nop /* 23DC0 800489C0 44820000 */ mtc1 $v0, $f0 -/* 23DC4 800489C4 00000000 */ nop +/* 23DC4 800489C4 00000000 */ nop /* 23DC8 800489C8 46800020 */ cvt.s.w $f0, $f0 /* 23DCC 800489CC 4602003E */ c.le.s $f0, $f2 -/* 23DD0 800489D0 00000000 */ nop +/* 23DD0 800489D0 00000000 */ nop /* 23DD4 800489D4 45030001 */ bc1tl .L800489DC /* 23DD8 800489D8 26310001 */ addiu $s1, $s1, 1 .L800489DC: /* 23DDC 800489DC 26100001 */ addiu $s0, $s0, 1 /* 23DE0 800489E0 44900000 */ mtc1 $s0, $f0 -/* 23DE4 800489E4 00000000 */ nop +/* 23DE4 800489E4 00000000 */ nop /* 23DE8 800489E8 46800020 */ cvt.s.w $f0, $f0 /* 23DEC 800489EC 4616003C */ c.lt.s $f0, $f22 -/* 23DF0 800489F0 00000000 */ nop +/* 23DF0 800489F0 00000000 */ nop /* 23DF4 800489F4 4500000A */ bc1f .L80048A20 -/* 23DF8 800489F8 00000000 */ nop +/* 23DF8 800489F8 00000000 */ nop /* 23DFC 800489FC 0801226C */ j .L800489B0 -/* 23E00 80048A00 00000000 */ nop +/* 23E00 80048A00 00000000 */ nop .L80048A04: /* 23E04 80048A04 26B50008 */ addiu $s5, $s5, 8 .L80048A08: @@ -525,7 +525,7 @@ glabel spawn_drops /* 23E20 80048A20 0C03A752 */ jal is_ability_active /* 23E24 80048A24 2404002C */ addiu $a0, $zero, 0x2c /* 23E28 80048A28 10400005 */ beqz $v0, .L80048A40 -/* 23E2C 80048A2C 00000000 */ nop +/* 23E2C 80048A2C 00000000 */ nop /* 23E30 80048A30 0C00A67F */ jal rand_int /* 23E34 80048A34 24040002 */ addiu $a0, $zero, 2 /* 23E38 80048A38 26230001 */ addiu $v1, $s1, 1 @@ -586,7 +586,7 @@ glabel spawn_drops /* 23EFC 80048AFC 0C04C4FD */ jal make_item_entity /* 23F00 80048B00 AFA80014 */ sw $t0, 0x14($sp) /* 23F04 80048B04 44960000 */ mtc1 $s6, $f0 -/* 23F08 80048B08 00000000 */ nop +/* 23F08 80048B08 00000000 */ nop /* 23F0C 80048B0C 46800021 */ cvt.d.w $f0, $f0 /* 23F10 80048B10 27DE0001 */ addiu $fp, $fp, 1 /* 23F14 80048B14 2BC2000C */ slti $v0, $fp, 0xc @@ -605,7 +605,7 @@ glabel spawn_drops .L80048B48: /* 23F48 80048B48 0251102A */ slt $v0, $s2, $s1 /* 23F4C 80048B4C 1440FFE2 */ bnez $v0, .L80048AD8 -/* 23F50 80048B50 00000000 */ nop +/* 23F50 80048B50 00000000 */ nop .L80048B54: /* 23F54 80048B54 24080157 */ addiu $t0, $zero, 0x157 /* 23F58 80048B58 AFA80030 */ sw $t0, 0x30($sp) @@ -627,7 +627,7 @@ glabel spawn_drops /* 23F90 80048B90 0220202D */ daddu $a0, $s1, $zero .L80048B94: /* 23F94 80048B94 0C00A67F */ jal rand_int -/* 23F98 80048B98 00000000 */ nop +/* 23F98 80048B98 00000000 */ nop /* 23F9C 80048B9C 080122EA */ j .L80048BA8 /* 23FA0 80048BA0 00508821 */ addu $s1, $v0, $s0 .L80048BA4: @@ -642,7 +642,7 @@ glabel spawn_drops /* 23FBC 80048BBC 0C03A752 */ jal is_ability_active /* 23FC0 80048BC0 02228821 */ addu $s1, $s1, $v0 /* 23FC4 80048BC4 10400007 */ beqz $v0, .L80048BE4 -/* 23FC8 80048BC8 00000000 */ nop +/* 23FC8 80048BC8 00000000 */ nop /* 23FCC 80048BCC 3C02800B */ lui $v0, %hi(gCurrentEncounter+0xC) /* 23FD0 80048BD0 90420F1C */ lbu $v0, %lo(gCurrentEncounter+0xC)($v0) /* 23FD4 80048BD4 3C01800B */ lui $at, %hi(gCurrentEncounter+0xC) @@ -711,7 +711,7 @@ glabel spawn_drops /* 240B0 80048CB0 0C04C4FD */ jal make_item_entity /* 240B4 80048CB4 AFA80014 */ sw $t0, 0x14($sp) /* 240B8 80048CB8 44960000 */ mtc1 $s6, $f0 -/* 240BC 80048CBC 00000000 */ nop +/* 240BC 80048CBC 00000000 */ nop /* 240C0 80048CC0 46800021 */ cvt.d.w $f0, $f0 /* 240C4 80048CC4 27DE0001 */ addiu $fp, $fp, 1 /* 240C8 80048CC8 2BC2000C */ slti $v0, $fp, 0xc @@ -730,7 +730,7 @@ glabel spawn_drops .L80048CFC: /* 240FC 80048CFC 0251102A */ slt $v0, $s2, $s1 /* 24100 80048D00 1440FFE2 */ bnez $v0, .L80048C8C -/* 24104 80048D04 00000000 */ nop +/* 24104 80048D04 00000000 */ nop .L80048D08: /* 24108 80048D08 8FBF0064 */ lw $ra, 0x64($sp) /* 2410C 80048D0C 8FBE0060 */ lw $fp, 0x60($sp) diff --git a/asm/nonmatchings/code_25f00_len_940/func_8004AB00.s b/asm/nonmatchings/code_25f00_len_940/func_8004AB00.s index f925fcdc25..516b606fb7 100644 --- a/asm/nonmatchings/code_25f00_len_940/func_8004AB00.s +++ b/asm/nonmatchings/code_25f00_len_940/func_8004AB00.s @@ -164,7 +164,7 @@ glabel func_8004AB00 /* 2616C 8004AD6C 27A50018 */ addiu $a1, $sp, 0x18 /* 26170 8004AD70 8FA40020 */ lw $a0, 0x20($sp) /* 26174 8004AD74 0C014B97 */ jal func_80052E5C -/* 26178 8004AD78 00000000 */ nop +/* 26178 8004AD78 00000000 */ nop /* 2617C 8004AD7C 3C10800A */ lui $s0, %hi(D_800A0F58) /* 26180 8004AD80 26100F58 */ addiu $s0, $s0, %lo(D_800A0F58) /* 26184 8004AD84 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/code_25f00_len_940/func_8004AE08.s b/asm/nonmatchings/code_25f00_len_940/func_8004AE08.s index b033ddf2df..a1aa70a518 100644 --- a/asm/nonmatchings/code_25f00_len_940/func_8004AE08.s +++ b/asm/nonmatchings/code_25f00_len_940/func_8004AE08.s @@ -95,14 +95,14 @@ glabel func_8004AE08 /* 2635C 8004AF5C 0000902D */ daddu $s2, $zero, $zero .L8004AF60: /* 26360 8004AF60 0C018554 */ jal osAiGetStatus -/* 26364 8004AF64 00000000 */ nop +/* 26364 8004AF64 00000000 */ nop /* 26368 8004AF68 04410003 */ bgez $v0, .L8004AF78 -/* 2636C 8004AF6C 00000000 */ nop +/* 2636C 8004AF6C 00000000 */ nop /* 26370 8004AF70 08012BA8 */ j .L8004AEA0 /* 26374 8004AF74 0000B02D */ daddu $s6, $zero, $zero .L8004AF78: /* 26378 8004AF78 0C018550 */ jal osAiGetLength -/* 2637C 8004AF7C 00000000 */ nop +/* 2637C 8004AF7C 00000000 */ nop /* 26380 8004AF80 8FA30078 */ lw $v1, 0x78($sp) /* 26384 8004AF84 10600011 */ beqz $v1, .L8004AFCC /* 26388 8004AF88 00028082 */ srl $s0, $v0, 2 @@ -126,7 +126,7 @@ glabel func_8004AE08 /* 263CC 8004AFCC 2A0200B8 */ slti $v0, $s0, 0xb8 .L8004AFD0: /* 263D0 8004AFD0 14400003 */ bnez $v0, .L8004AFE0 -/* 263D4 8004AFD4 00000000 */ nop +/* 263D4 8004AFD4 00000000 */ nop /* 263D8 8004AFD8 12C00005 */ beqz $s6, .L8004AFF0 /* 263DC 8004AFDC 24160001 */ addiu $s6, $zero, 1 .L8004AFE0: @@ -156,12 +156,12 @@ glabel func_8004AE08 /* 26434 8004B034 0060F809 */ jalr $v1 /* 26438 8004B038 24040001 */ addiu $a0, $zero, 1 /* 2643C 8004B03C 08012C19 */ j .L8004B064 -/* 26440 8004B040 00000000 */ nop +/* 26440 8004B040 00000000 */ nop .L8004B044: /* 26444 8004B044 3C028008 */ lui $v0, %hi(nuAuPreNMIFunc) /* 26448 8004B048 8C428174 */ lw $v0, %lo(nuAuPreNMIFunc)($v0) /* 2644C 8004B04C 10400005 */ beqz $v0, .L8004B064 -/* 26450 8004B050 00000000 */ nop +/* 26450 8004B050 00000000 */ nop /* 26454 8004B054 3C058008 */ lui $a1, %hi(D_80078170) /* 26458 8004B058 90A58170 */ lbu $a1, %lo(D_80078170)($a1) /* 2645C 8004B05C 0040F809 */ jalr $v0 diff --git a/asm/nonmatchings/code_25f00_len_940/nuAuDmaCallBack.s b/asm/nonmatchings/code_25f00_len_940/nuAuDmaCallBack.s index d6f1a17d0d..f3db2f4a1d 100644 --- a/asm/nonmatchings/code_25f00_len_940/nuAuDmaCallBack.s +++ b/asm/nonmatchings/code_25f00_len_940/nuAuDmaCallBack.s @@ -12,9 +12,9 @@ glabel nuAuDmaCallBack /* 26490 8004B090 14E00005 */ bnez $a3, .L8004B0A8 /* 26494 8004B094 AFB00010 */ sw $s0, 0x10($sp) /* 26498 8004B098 0C0187A4 */ jal osVirtualToPhysical -/* 2649C 8004B09C 00000000 */ nop +/* 2649C 8004B09C 00000000 */ nop /* 264A0 8004B0A0 08012C82 */ j .L8004B208 -/* 264A4 8004B0A4 00000000 */ nop +/* 264A4 8004B0A4 00000000 */ nop .L8004B0A8: /* 264A8 8004B0A8 0000802D */ daddu $s0, $zero, $zero /* 264AC 8004B0AC 3C11800A */ lui $s1, %hi(D_800A3BD4) @@ -31,7 +31,7 @@ glabel nuAuDmaCallBack /* 264D4 8004B0D4 0220802D */ daddu $s0, $s1, $zero /* 264D8 8004B0D8 8E310000 */ lw $s1, ($s1) /* 264DC 8004B0DC 1620FFF7 */ bnez $s1, .L8004B0BC -/* 264E0 8004B0E0 00000000 */ nop +/* 264E0 8004B0E0 00000000 */ nop .L8004B0E4: /* 264E4 8004B0E4 3C12800A */ lui $s2, %hi(nuAuDmaState) /* 264E8 8004B0E8 26523BD0 */ addiu $s2, $s2, %lo(nuAuDmaState) @@ -40,9 +40,9 @@ glabel nuAuDmaCallBack /* 264F4 8004B0F4 0220202D */ daddu $a0, $s1, $zero /* 264F8 8004B0F8 8E440004 */ lw $a0, 4($s2) /* 264FC 8004B0FC 0C0187A4 */ jal osVirtualToPhysical -/* 26500 8004B100 00000000 */ nop +/* 26500 8004B100 00000000 */ nop /* 26504 8004B104 08012C82 */ j .L8004B208 -/* 26508 8004B108 00000000 */ nop +/* 26508 8004B108 00000000 */ nop .L8004B10C: /* 2650C 8004B10C 8E220000 */ lw $v0, ($s1) /* 26510 8004B110 0C012D03 */ jal alUnlink @@ -52,7 +52,7 @@ glabel nuAuDmaCallBack /* 26520 8004B120 0C012CFB */ jal alLink /* 26524 8004B124 0200282D */ daddu $a1, $s0, $zero /* 26528 8004B128 08012C61 */ j .L8004B184 -/* 2652C 8004B12C 00000000 */ nop +/* 2652C 8004B12C 00000000 */ nop .L8004B130: /* 26530 8004B130 8E450004 */ lw $a1, 4($s2) /* 26534 8004B134 10A00010 */ beqz $a1, .L8004B178 @@ -72,7 +72,7 @@ glabel nuAuDmaCallBack /* 26568 8004B168 0C0187A4 */ jal osVirtualToPhysical /* 2656C 8004B16C AE23000C */ sw $v1, 0xc($s1) /* 26570 8004B170 08012C82 */ j .L8004B208 -/* 26574 8004B174 00000000 */ nop +/* 26574 8004B174 00000000 */ nop .L8004B178: /* 26578 8004B178 AE510004 */ sw $s1, 4($s2) /* 2657C 8004B17C AE200000 */ sw $zero, ($s1) diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004B62C.s b/asm/nonmatchings/code_26840_len_20d0/func_8004B62C.s index feaefadbaf..5acaab96dc 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004B62C.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004B62C.s @@ -24,11 +24,11 @@ glabel func_8004B62C /* 26A70 8004B670 90A3000E */ lbu $v1, 0xe($a1) /* 26A74 8004B674 24020001 */ addiu $v0, $zero, 1 /* 26A78 8004B678 14620005 */ bne $v1, $v0, .L8004B690 -/* 26A7C 8004B67C 00000000 */ nop +/* 26A7C 8004B67C 00000000 */ nop /* 26A80 8004B680 94A20020 */ lhu $v0, 0x20($a1) /* 26A84 8004B684 10400002 */ beqz $v0, .L8004B690 /* 26A88 8004B688 00451021 */ addu $v0, $v0, $a1 /* 26A8C 8004B68C AC82002C */ sw $v0, 0x2c($a0) .L8004B690: /* 26A90 8004B690 03E00008 */ jr $ra -/* 26A94 8004B694 00000000 */ nop +/* 26A94 8004B694 00000000 */ nop diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004B748.s b/asm/nonmatchings/code_26840_len_20d0/func_8004B748.s index d7d3e29e64..4bdc637a26 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004B748.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004B748.s @@ -17,7 +17,7 @@ glabel func_8004B748 /* 26B78 8004B778 10600004 */ beqz $v1, .L8004B78C /* 26B7C 8004B77C AE820030 */ sw $v0, 0x30($s4) /* 26B80 8004B780 0C01352F */ jal func_8004D4BC -/* 26B84 8004B784 00000000 */ nop +/* 26B84 8004B784 00000000 */ nop /* 26B88 8004B788 AE800168 */ sw $zero, 0x168($s4) .L8004B78C: /* 26B8C 8004B78C 0280802D */ daddu $s0, $s4, $zero @@ -81,7 +81,7 @@ glabel func_8004B748 /* 26C60 8004B860 A7A20010 */ sh $v0, 0x10($sp) .L8004B864: /* 26C64 8004B864 0C012E9D */ jal func_8004BA74 -/* 26C68 8004B868 00000000 */ nop +/* 26C68 8004B868 00000000 */ nop .L8004B86C: /* 26C6C 8004B86C AE000090 */ sw $zero, 0x90($s0) .L8004B870: @@ -152,7 +152,7 @@ glabel func_8004B748 /* 26D5C 8004B95C A6000000 */ sh $zero, ($s0) .L8004B960: /* 26D60 8004B960 10400004 */ beqz $v0, .L8004B974 -/* 26D64 8004B964 00000000 */ nop +/* 26D64 8004B964 00000000 */ nop /* 26D68 8004B968 96050000 */ lhu $a1, ($s0) /* 26D6C 8004B96C 0C01309A */ jal func_8004C268 /* 26D70 8004B970 0280202D */ daddu $a0, $s4, $zero diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004BA74.s b/asm/nonmatchings/code_26840_len_20d0/func_8004BA74.s index 83c160156c..8b3dec5867 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004BA74.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004BA74.s @@ -54,18 +54,18 @@ glabel func_8004BA74 /* 26F2C 8004BB2C 0601FFFB */ bgez $s0, .L8004BB1C /* 26F30 8004BB30 2463FF54 */ addiu $v1, $v1, -0xac /* 26F34 8004BB34 08012EFA */ j .L8004BBE8 -/* 26F38 8004BB38 00000000 */ nop +/* 26F38 8004BB38 00000000 */ nop .L8004BB3C: /* 26F3C 8004BB3C 08012EC3 */ j .L8004BB0C /* 26F40 8004BB40 24080001 */ addiu $t0, $zero, 1 .L8004BB44: /* 26F44 8004BB44 2C8200C0 */ sltiu $v0, $a0, 0xc0 /* 26F48 8004BB48 14400031 */ bnez $v0, .L8004BC10 -/* 26F4C 8004BB4C 00000000 */ nop +/* 26F4C 8004BB4C 00000000 */ nop /* 26F50 8004BB50 10C00007 */ beqz $a2, .L8004BB70 /* 26F54 8004BB54 00C0902D */ daddu $s2, $a2, $zero /* 26F58 8004BB58 08012EE5 */ j .L8004BB94 -/* 26F5C 8004BB5C 00000000 */ nop +/* 26F5C 8004BB5C 00000000 */ nop .L8004BB60: /* 26F60 8004BB60 08012EF0 */ j .L8004BBC0 /* 26F64 8004BB64 24080001 */ addiu $t0, $zero, 1 @@ -118,12 +118,12 @@ glabel func_8004BA74 /* 27000 8004BC00 0C013039 */ jal func_8004C0E4 /* 27004 8004BC04 AFA00014 */ sw $zero, 0x14($sp) /* 27008 8004BC08 0801302D */ j .L8004C0B4 -/* 2700C 8004BC0C 00000000 */ nop +/* 2700C 8004BC0C 00000000 */ nop .L8004BC10: /* 27010 8004BC10 10C00005 */ beqz $a2, .L8004BC28 /* 27014 8004BC14 00C0902D */ daddu $s2, $a2, $zero /* 27018 8004BC18 08012F10 */ j .L8004BC40 -/* 2701C 8004BC1C 00000000 */ nop +/* 2701C 8004BC1C 00000000 */ nop .L8004BC20: /* 27020 8004BC20 08012F28 */ j .L8004BCA0 /* 27024 8004BC24 24080001 */ addiu $t0, $zero, 1 @@ -137,7 +137,7 @@ glabel func_8004BA74 .L8004BC40: /* 27040 8004BC40 96420000 */ lhu $v0, ($s2) /* 27044 8004BC44 1040011B */ beqz $v0, .L8004C0B4 -/* 27048 8004BC48 00000000 */ nop +/* 27048 8004BC48 00000000 */ nop /* 2704C 8004BC4C 96440002 */ lhu $a0, 2($s2) /* 27050 8004BC50 30820300 */ andi $v0, $a0, 0x300 /* 27054 8004BC54 0002AA02 */ srl $s5, $v0, 8 @@ -148,7 +148,7 @@ glabel func_8004BA74 /* 27068 8004BC68 000299C2 */ srl $s3, $v0, 7 /* 2706C 8004BC6C 96E20002 */ lhu $v0, 2($s7) /* 27070 8004BC70 1040000B */ beqz $v0, .L8004BCA0 -/* 27074 8004BC74 00000000 */ nop +/* 27074 8004BC74 00000000 */ nop /* 27078 8004BC78 0000802D */ daddu $s0, $zero, $zero /* 2707C 8004BC7C 0040282D */ daddu $a1, $v0, $zero /* 27080 8004BC80 2403016C */ addiu $v1, $zero, 0x16c @@ -162,7 +162,7 @@ glabel func_8004BA74 /* 2709C 8004BC9C 246300AC */ addiu $v1, $v1, 0xac .L8004BCA0: /* 270A0 8004BCA0 1660001C */ bnez $s3, .L8004BD14 -/* 270A4 8004BCA4 00000000 */ nop +/* 270A4 8004BCA4 00000000 */ nop /* 270A8 8004BCA8 55000064 */ bnel $t0, $zero, .L8004BE3C /* 270AC 8004BCAC 0280202D */ daddu $a0, $s4, $zero /* 270B0 8004BCB0 30900007 */ andi $s0, $a0, 7 @@ -183,7 +183,7 @@ glabel func_8004BA74 /* 270EC 8004BCEC 10400054 */ beqz $v0, .L8004BE40 /* 270F0 8004BCF0 00E0282D */ daddu $a1, $a3, $zero /* 270F4 8004BCF4 0801302D */ j .L8004C0B4 -/* 270F8 8004BCF8 00000000 */ nop +/* 270F8 8004BCF8 00000000 */ nop .L8004BCFC: /* 270FC 8004BCFC 08012F58 */ j .L8004BD60 /* 27100 8004BD00 24080001 */ addiu $t0, $zero, 1 @@ -286,7 +286,7 @@ glabel func_8004BA74 /* 27254 8004BE54 0C013039 */ jal func_8004C0E4 /* 27258 8004BE58 00463021 */ addu $a2, $v0, $a2 /* 2725C 8004BE5C 0801302D */ j .L8004C0B4 -/* 27260 8004BE60 00000000 */ nop +/* 27260 8004BE60 00000000 */ nop .L8004BE64: /* 27264 8004BE64 96420000 */ lhu $v0, ($s2) /* 27268 8004BE68 8E830008 */ lw $v1, 8($s4) @@ -330,7 +330,7 @@ glabel func_8004BA74 /* 272F4 8004BEF4 0C013039 */ jal func_8004C0E4 /* 272F8 8004BEF8 00463021 */ addu $a2, $v0, $a2 /* 272FC 8004BEFC 08012FC2 */ j .L8004BF08 -/* 27300 8004BF00 00000000 */ nop +/* 27300 8004BF00 00000000 */ nop .L8004BF04: /* 27304 8004BF04 2631FFFF */ addiu $s1, $s1, -1 .L8004BF08: @@ -370,11 +370,11 @@ glabel func_8004BA74 .L8004BF7C: /* 2737C 8004BF7C 2631FFFF */ addiu $s1, $s1, -1 /* 27380 8004BF80 1A200004 */ blez $s1, .L8004BF94 -/* 27384 8004BF84 00000000 */ nop +/* 27384 8004BF84 00000000 */ nop /* 27388 8004BF88 26520004 */ addiu $s2, $s2, 4 .L8004BF8C: /* 2738C 8004BF8C 0601FFE6 */ bgez $s0, .L8004BF28 -/* 27390 8004BF90 00000000 */ nop +/* 27390 8004BF90 00000000 */ nop .L8004BF94: /* 27394 8004BF94 12200047 */ beqz $s1, .L8004C0B4 /* 27398 8004BF98 24100007 */ addiu $s0, $zero, 7 @@ -402,7 +402,7 @@ glabel func_8004BA74 /* 273EC 8004BFEC 0C013039 */ jal func_8004C0E4 /* 273F0 8004BFF0 00463021 */ addu $a2, $v0, $a2 /* 273F4 8004BFF4 08013000 */ j .L8004C000 -/* 273F8 8004BFF8 00000000 */ nop +/* 273F8 8004BFF8 00000000 */ nop .L8004BFFC: /* 273FC 8004BFFC 2631FFFF */ addiu $s1, $s1, -1 .L8004C000: @@ -413,7 +413,7 @@ glabel func_8004BA74 /* 2740C 8004C00C 0601FFE4 */ bgez $s0, .L8004BFA0 /* 27410 8004C010 2673FF54 */ addiu $s3, $s3, -0xac /* 27414 8004C014 0801302D */ j .L8004C0B4 -/* 27418 8004C018 00000000 */ nop +/* 27418 8004C018 00000000 */ nop .L8004C01C: /* 2741C 8004C01C 1A200025 */ blez $s1, .L8004C0B4 /* 27420 8004C020 0000982D */ daddu $s3, $zero, $zero @@ -456,7 +456,7 @@ glabel func_8004BA74 .L8004C0A8: /* 274A8 8004C0A8 0271102A */ slt $v0, $s3, $s1 /* 274AC 8004C0AC 1440FFDD */ bnez $v0, .L8004C024 -/* 274B0 8004C0B0 00000000 */ nop +/* 274B0 8004C0B0 00000000 */ nop .L8004C0B4: /* 274B4 8004C0B4 8FBF003C */ lw $ra, 0x3c($sp) /* 274B8 8004C0B8 8FBE0038 */ lw $fp, 0x38($sp) diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004C0E4.s b/asm/nonmatchings/code_26840_len_20d0/func_8004C0E4.s index 69d0505ed6..3def1bab14 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004C0E4.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004C0E4.s @@ -6,7 +6,7 @@ glabel func_8004C0E4 /* 274E8 8004C0E8 AFBF0010 */ sw $ra, 0x10($sp) /* 274EC 8004C0EC 908200C0 */ lbu $v0, 0xc0($a0) /* 274F0 8004C0F0 1440005A */ bnez $v0, .L8004C25C -/* 274F4 8004C0F4 00000000 */ nop +/* 274F4 8004C0F4 00000000 */ nop /* 274F8 8004C0F8 ACA60000 */ sw $a2, ($a1) /* 274FC 8004C0FC ACA60050 */ sw $a2, 0x50($a1) /* 27500 8004C100 8C820000 */ lw $v0, ($a0) @@ -70,7 +70,7 @@ glabel func_8004C0E4 /* 275E8 8004C1E8 10600007 */ beqz $v1, .L8004C208 /* 275EC 8004C1EC 00A0202D */ daddu $a0, $a1, $zero /* 275F0 8004C1F0 08013095 */ j .L8004C254 -/* 275F4 8004C1F4 00000000 */ nop +/* 275F4 8004C1F4 00000000 */ nop .L8004C1F8: /* 275F8 8004C1F8 10620005 */ beq $v1, $v0, .L8004C210 /* 275FC 8004C1FC 308200FC */ andi $v0, $a0, 0xfc diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004C268.s b/asm/nonmatchings/code_26840_len_20d0/func_8004C268.s index 22546e442c..786ee911af 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004C268.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004C268.s @@ -18,4 +18,4 @@ glabel func_8004C268 /* 27694 8004C294 1440FFF9 */ bnez $v0, .L8004C27C /* 27698 8004C298 24C600AC */ addiu $a2, $a2, 0xac /* 2769C 8004C29C 03E00008 */ jr $ra -/* 276A0 8004C2A0 00000000 */ nop +/* 276A0 8004C2A0 00000000 */ nop diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004C2A4.s b/asm/nonmatchings/code_26840_len_20d0/func_8004C2A4.s index ee5cc99ce1..8520404106 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004C2A4.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004C2A4.s @@ -26,4 +26,4 @@ glabel func_8004C2A4 /* 276F0 8004C2F0 1440FFF3 */ bnez $v0, .L8004C2C0 /* 276F4 8004C2F4 24C600AC */ addiu $a2, $a2, 0xac /* 276F8 8004C2F8 03E00008 */ jr $ra -/* 276FC 8004C2FC 00000000 */ nop +/* 276FC 8004C2FC 00000000 */ nop diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004C300.s b/asm/nonmatchings/code_26840_len_20d0/func_8004C300.s index 9913fb7dbc..efc57d0e5d 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004C300.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004C300.s @@ -25,4 +25,4 @@ glabel func_8004C300 /* 27748 8004C348 1440FFF3 */ bnez $v0, .L8004C318 /* 2774C 8004C34C 24C600AC */ addiu $a2, $a2, 0xac /* 27750 8004C350 03E00008 */ jr $ra -/* 27754 8004C354 00000000 */ nop +/* 27754 8004C354 00000000 */ nop diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004C444.s b/asm/nonmatchings/code_26840_len_20d0/func_8004C444.s index 348eeb424b..d2f2af24cf 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004C444.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004C444.s @@ -75,7 +75,7 @@ glabel func_8004C444 /* 27948 8004C548 322700FF */ andi $a3, $s1, 0xff /* 2794C 8004C54C 00F2102B */ sltu $v0, $a3, $s2 /* 27950 8004C550 1440FFD0 */ bnez $v0, .L8004C494 -/* 27954 8004C554 00000000 */ nop +/* 27954 8004C554 00000000 */ nop .L8004C558: /* 27958 8004C558 8FBF0020 */ lw $ra, 0x20($sp) /* 2795C 8004C55C 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004C578.s b/asm/nonmatchings/code_26840_len_20d0/func_8004C578.s index 1908524c67..b1dbaca95a 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004C578.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004C578.s @@ -27,7 +27,7 @@ glabel func_8004C578 /* 279CC 8004C5CC 9202009A */ lbu $v0, 0x9a($s0) /* 279D0 8004C5D0 30420010 */ andi $v0, $v0, 0x10 /* 279D4 8004C5D4 14400017 */ bnez $v0, .L8004C634 -/* 279D8 8004C5D8 00000000 */ nop +/* 279D8 8004C5D8 00000000 */ nop /* 279DC 8004C5DC 8E02001C */ lw $v0, 0x1c($s0) /* 279E0 8004C5E0 86040060 */ lh $a0, 0x60($s0) /* 279E4 8004C5E4 9442001E */ lhu $v0, 0x1e($v0) @@ -38,13 +38,13 @@ glabel func_8004C578 /* 279F8 8004C5F8 8E02001C */ lw $v0, 0x1c($s0) /* 279FC 8004C5FC C4420020 */ lwc1 $f2, 0x20($v0) /* 27A00 8004C600 46020002 */ mul.s $f0, $f0, $f2 -/* 27A04 8004C604 00000000 */ nop +/* 27A04 8004C604 00000000 */ nop /* 27A08 8004C608 E6000058 */ swc1 $f0, 0x58($s0) /* 27A0C 8004C60C C6220004 */ lwc1 $f2, 4($s1) /* 27A10 8004C610 46001032 */ c.eq.s $f2, $f0 -/* 27A14 8004C614 00000000 */ nop +/* 27A14 8004C614 00000000 */ nop /* 27A18 8004C618 45010006 */ bc1t .L8004C634 -/* 27A1C 8004C61C 00000000 */ nop +/* 27A1C 8004C61C 00000000 */ nop /* 27A20 8004C620 92220043 */ lbu $v0, 0x43($s1) /* 27A24 8004C624 34420008 */ ori $v0, $v0, 8 /* 27A28 8004C628 A2220043 */ sb $v0, 0x43($s1) @@ -54,7 +54,7 @@ glabel func_8004C578 /* 27A34 8004C634 9202009A */ lbu $v0, 0x9a($s0) /* 27A38 8004C638 30420008 */ andi $v0, $v0, 8 /* 27A3C 8004C63C 14400004 */ bnez $v0, .L8004C650 -/* 27A40 8004C640 00000000 */ nop +/* 27A40 8004C640 00000000 */ nop /* 27A44 8004C644 920200A8 */ lbu $v0, 0xa8($s0) /* 27A48 8004C648 14400002 */ bnez $v0, .L8004C654 /* 27A4C 8004C64C 0040182D */ daddu $v1, $v0, $zero @@ -76,7 +76,7 @@ glabel func_8004C578 /* 27A80 8004C680 00041400 */ sll $v0, $a0, 0x10 /* 27A84 8004C684 00021403 */ sra $v0, $v0, 0x10 /* 27A88 8004C688 10620067 */ beq $v1, $v0, .L8004C828 -/* 27A8C 8004C68C 00000000 */ nop +/* 27A8C 8004C68C 00000000 */ nop /* 27A90 8004C690 9222003D */ lbu $v0, 0x3d($s1) /* 27A94 8004C694 A6240040 */ sh $a0, 0x40($s1) /* 27A98 8004C698 34420020 */ ori $v0, $v0, 0x20 @@ -121,7 +121,7 @@ glabel func_8004C578 /* 27B28 8004C728 9202009A */ lbu $v0, 0x9a($s0) /* 27B2C 8004C72C 30420010 */ andi $v0, $v0, 0x10 /* 27B30 8004C730 10400006 */ beqz $v0, .L8004C74C -/* 27B34 8004C734 00000000 */ nop +/* 27B34 8004C734 00000000 */ nop /* 27B38 8004C738 8E02001C */ lw $v0, 0x1c($s0) /* 27B3C 8004C73C 86030060 */ lh $v1, 0x60($s0) /* 27B40 8004C740 9442001E */ lhu $v0, 0x1e($v0) @@ -140,7 +140,7 @@ glabel func_8004C578 /* 27B6C 8004C76C 8E02001C */ lw $v0, 0x1c($s0) /* 27B70 8004C770 C4420020 */ lwc1 $f2, 0x20($v0) /* 27B74 8004C774 46020002 */ mul.s $f0, $f0, $f2 -/* 27B78 8004C778 00000000 */ nop +/* 27B78 8004C778 00000000 */ nop /* 27B7C 8004C77C E6000058 */ swc1 $f0, 0x58($s0) /* 27B80 8004C780 92230045 */ lbu $v1, 0x45($s1) /* 27B84 8004C784 924200BC */ lbu $v0, 0xbc($s2) @@ -153,7 +153,7 @@ glabel func_8004C578 /* 27BA0 8004C7A0 9202009A */ lbu $v0, 0x9a($s0) /* 27BA4 8004C7A4 30420008 */ andi $v0, $v0, 8 /* 27BA8 8004C7A8 14400004 */ bnez $v0, .L8004C7BC -/* 27BAC 8004C7AC 00000000 */ nop +/* 27BAC 8004C7AC 00000000 */ nop /* 27BB0 8004C7B0 920200A8 */ lbu $v0, 0xa8($s0) /* 27BB4 8004C7B4 54400003 */ bnel $v0, $zero, .L8004C7C4 /* 27BB8 8004C7B8 A222000E */ sb $v0, 0xe($s1) diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004C884.s b/asm/nonmatchings/code_26840_len_20d0/func_8004C884.s index 2f71c5f949..f3617ef515 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004C884.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004C884.s @@ -31,7 +31,7 @@ glabel func_8004C884 /* 27CE8 8004C8E8 24020001 */ addiu $v0, $zero, 1 /* 27CEC 8004C8EC 92040085 */ lbu $a0, 0x85($s0) /* 27CF0 8004C8F0 14820005 */ bne $a0, $v0, .L8004C908 -/* 27CF4 8004C8F4 00000000 */ nop +/* 27CF4 8004C8F4 00000000 */ nop /* 27CF8 8004C8F8 AE030000 */ sw $v1, ($s0) /* 27CFC 8004C8FC AE000080 */ sw $zero, 0x80($s0) /* 27D00 8004C900 A2000085 */ sb $zero, 0x85($s0) @@ -50,7 +50,7 @@ glabel func_8004C884 /* 27D2C 8004C92C A602008E */ sh $v0, 0x8e($s0) /* 27D30 8004C930 3042FFFF */ andi $v0, $v0, 0xffff /* 27D34 8004C934 14400090 */ bnez $v0, .L8004CB78 -/* 27D38 8004C938 00000000 */ nop +/* 27D38 8004C938 00000000 */ nop /* 27D3C 8004C93C 3C158008 */ lui $s5, %hi(D_80078400) /* 27D40 8004C940 26B58400 */ addiu $s5, $s5, %lo(D_80078400) .L8004C944: @@ -120,7 +120,7 @@ glabel func_8004C884 /* 27E28 8004CA28 AE020060 */ sw $v0, 0x60($s0) /* 27E2C 8004CA2C 920200A2 */ lbu $v0, 0xa2($s0) /* 27E30 8004CA30 10400009 */ beqz $v0, .L8004CA58 -/* 27E34 8004CA34 00000000 */ nop +/* 27E34 8004CA34 00000000 */ nop /* 27E38 8004CA38 8E020000 */ lw $v0, ($s0) /* 27E3C 8004CA3C 8E440060 */ lw $a0, 0x60($s2) /* 27E40 8004CA40 90460000 */ lbu $a2, ($v0) @@ -162,7 +162,7 @@ glabel func_8004C884 /* 27EC0 8004CAC0 9202009A */ lbu $v0, 0x9a($s0) /* 27EC4 8004CAC4 30420008 */ andi $v0, $v0, 8 /* 27EC8 8004CAC8 14400004 */ bnez $v0, .L8004CADC -/* 27ECC 8004CACC 00000000 */ nop +/* 27ECC 8004CACC 00000000 */ nop /* 27ED0 8004CAD0 920200A8 */ lbu $v0, 0xa8($s0) /* 27ED4 8004CAD4 54400003 */ bnel $v0, $zero, .L8004CAE4 /* 27ED8 8004CAD8 A222000E */ sb $v0, 0xe($s1) @@ -209,7 +209,7 @@ glabel func_8004C884 .L8004CB6C: /* 27F6C 8004CB6C 9602008E */ lhu $v0, 0x8e($s0) /* 27F70 8004CB70 1040FF74 */ beqz $v0, .L8004C944 -/* 27F74 8004CB74 00000000 */ nop +/* 27F74 8004CB74 00000000 */ nop .L8004CB78: /* 27F78 8004CB78 86020074 */ lh $v0, 0x74($s0) /* 27F7C 8004CB7C 96030074 */ lhu $v1, 0x74($s0) @@ -218,7 +218,7 @@ glabel func_8004C884 /* 27F88 8004CB88 A6020074 */ sh $v0, 0x74($s0) /* 27F8C 8004CB8C 00021400 */ sll $v0, $v0, 0x10 /* 27F90 8004CB90 10400005 */ beqz $v0, .L8004CBA8 -/* 27F94 8004CB94 00000000 */ nop +/* 27F94 8004CB94 00000000 */ nop /* 27F98 8004CB98 8E02006C */ lw $v0, 0x6c($s0) /* 27F9C 8004CB9C 8E030070 */ lw $v1, 0x70($s0) /* 27FA0 8004CBA0 080132EC */ j .L8004CBB0 @@ -232,18 +232,18 @@ glabel func_8004C884 /* 27FB8 8004CBB8 A2020055 */ sb $v0, 0x55($s0) .L8004CBBC: /* 27FBC 8004CBBC 16600031 */ bnez $s3, .L8004CC84 -/* 27FC0 8004CBC0 00000000 */ nop +/* 27FC0 8004CBC0 00000000 */ nop /* 27FC4 8004CBC4 96020090 */ lhu $v0, 0x90($s0) /* 27FC8 8004CBC8 1040000C */ beqz $v0, .L8004CBFC /* 27FCC 8004CBCC 2442FFFF */ addiu $v0, $v0, -1 /* 27FD0 8004CBD0 A6020090 */ sh $v0, 0x90($s0) /* 27FD4 8004CBD4 3042FFFF */ andi $v0, $v0, 0xffff /* 27FD8 8004CBD8 14400008 */ bnez $v0, .L8004CBFC -/* 27FDC 8004CBDC 00000000 */ nop +/* 27FDC 8004CBDC 00000000 */ nop /* 27FE0 8004CBE0 92230045 */ lbu $v1, 0x45($s1) /* 27FE4 8004CBE4 924200BC */ lbu $v0, 0xbc($s2) /* 27FE8 8004CBE8 14620004 */ bne $v1, $v0, .L8004CBFC -/* 27FEC 8004CBEC 00000000 */ nop +/* 27FEC 8004CBEC 00000000 */ nop /* 27FF0 8004CBF0 9222003D */ lbu $v0, 0x3d($s1) /* 27FF4 8004CBF4 34420010 */ ori $v0, $v0, 0x10 /* 27FF8 8004CBF8 A222003D */ sb $v0, 0x3d($s1) @@ -255,7 +255,7 @@ glabel func_8004C884 /* 2800C 8004CC0C A6020068 */ sh $v0, 0x68($s0) /* 28010 8004CC10 00021400 */ sll $v0, $v0, 0x10 /* 28014 8004CC14 10400005 */ beqz $v0, .L8004CC2C -/* 28018 8004CC18 00000000 */ nop +/* 28018 8004CC18 00000000 */ nop /* 2801C 8004CC1C 8E020060 */ lw $v0, 0x60($s0) /* 28020 8004CC20 8E030064 */ lw $v1, 0x64($s0) /* 28024 8004CC24 0801330D */ j .L8004CC34 @@ -270,11 +270,11 @@ glabel func_8004C884 .L8004CC40: /* 28040 8004CC40 96020056 */ lhu $v0, 0x56($s0) /* 28044 8004CC44 1040000F */ beqz $v0, .L8004CC84 -/* 28048 8004CC48 00000000 */ nop +/* 28048 8004CC48 00000000 */ nop /* 2804C 8004CC4C 9202009A */ lbu $v0, 0x9a($s0) /* 28050 8004CC50 30420008 */ andi $v0, $v0, 8 /* 28054 8004CC54 14400004 */ bnez $v0, .L8004CC68 -/* 28058 8004CC58 00000000 */ nop +/* 28058 8004CC58 00000000 */ nop /* 2805C 8004CC5C 920200A8 */ lbu $v0, 0xa8($s0) /* 28060 8004CC60 54400003 */ bnel $v0, $zero, .L8004CC70 /* 28064 8004CC64 A222000E */ sb $v0, 0xe($s1) @@ -290,7 +290,7 @@ glabel func_8004C884 .L8004CC84: /* 28084 8004CC84 92020055 */ lbu $v0, 0x55($s0) /* 28088 8004CC88 1040000B */ beqz $v0, .L8004CCB8 -/* 2808C 8004CC8C 00000000 */ nop +/* 2808C 8004CC8C 00000000 */ nop /* 28090 8004CC90 92230045 */ lbu $v1, 0x45($s1) /* 28094 8004CC94 924200BC */ lbu $v0, 0xbc($s2) /* 28098 8004CC98 14620007 */ bne $v1, $v0, .L8004CCB8 @@ -308,7 +308,7 @@ glabel func_8004C884 /* 280C4 8004CCC4 9202009A */ lbu $v0, 0x9a($s0) /* 280C8 8004CCC8 30420010 */ andi $v0, $v0, 0x10 /* 280CC 8004CCCC 10400009 */ beqz $v0, .L8004CCF4 -/* 280D0 8004CCD0 00000000 */ nop +/* 280D0 8004CCD0 00000000 */ nop /* 280D4 8004CCD4 86020092 */ lh $v0, 0x92($s0) /* 280D8 8004CCD8 86030060 */ lh $v1, 0x60($s0) /* 280DC 8004CCDC 8E04001C */ lw $a0, 0x1c($s0) @@ -333,7 +333,7 @@ glabel func_8004C884 /* 28120 8004CD20 8E02001C */ lw $v0, 0x1c($s0) /* 28124 8004CD24 C4420020 */ lwc1 $f2, 0x20($v0) /* 28128 8004CD28 46020082 */ mul.s $f2, $f0, $f2 -/* 2812C 8004CD2C 00000000 */ nop +/* 2812C 8004CD2C 00000000 */ nop /* 28130 8004CD30 E6020058 */ swc1 $f2, 0x58($s0) /* 28134 8004CD34 92230045 */ lbu $v1, 0x45($s1) /* 28138 8004CD38 924200BC */ lbu $v0, 0xbc($s2) @@ -341,7 +341,7 @@ glabel func_8004C884 /* 28140 8004CD40 AE000054 */ sw $zero, 0x54($s0) /* 28144 8004CD44 C6200004 */ lwc1 $f0, 4($s1) /* 28148 8004CD48 46020032 */ c.eq.s $f0, $f2 -/* 2814C 8004CD4C 00000000 */ nop +/* 2814C 8004CD4C 00000000 */ nop /* 28150 8004CD50 45030007 */ bc1tl .L8004CD70 /* 28154 8004CD54 AE000054 */ sw $zero, 0x54($s0) /* 28158 8004CD58 92220043 */ lbu $v0, 0x43($s1) diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004CF3C.s b/asm/nonmatchings/code_26840_len_20d0/func_8004CF3C.s index b41e1e0dad..69817f9c43 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004CF3C.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004CF3C.s @@ -45,7 +45,7 @@ glabel func_8004CF3C /* 283DC 8004CFDC ACA2001C */ sw $v0, 0x1c($a1) /* 283E0 8004CFE0 90620000 */ lbu $v0, ($v1) /* 283E4 8004CFE4 10400007 */ beqz $v0, .L8004D004 -/* 283E8 8004CFE8 00000000 */ nop +/* 283E8 8004CFE8 00000000 */ nop /* 283EC 8004CFEC 94620004 */ lhu $v0, 4($v1) /* 283F0 8004CFF0 00431021 */ addu $v0, $v0, $v1 /* 283F4 8004CFF4 ACA20010 */ sw $v0, 0x10($a1) @@ -54,4 +54,4 @@ glabel func_8004CF3C /* 28400 8004D000 ACA20014 */ sw $v0, 0x14($a1) .L8004D004: /* 28404 8004D004 03E00008 */ jr $ra -/* 28408 8004D008 00000000 */ nop +/* 28408 8004D008 00000000 */ nop diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004D050.s b/asm/nonmatchings/code_26840_len_20d0/func_8004D050.s index ec10bf6812..90a3e6df4c 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004D050.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004D050.s @@ -13,4 +13,4 @@ glabel func_8004D050 /* 28470 8004D070 ACA20000 */ sw $v0, ($a1) .L8004D074: /* 28474 8004D074 03E00008 */ jr $ra -/* 28478 8004D078 00000000 */ nop +/* 28478 8004D078 00000000 */ nop diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004D07C.s b/asm/nonmatchings/code_26840_len_20d0/func_8004D07C.s index aaacd87c7e..82d85c6ee7 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004D07C.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004D07C.s @@ -35,7 +35,7 @@ glabel func_8004D07C /* 284EC 8004D0EC 14410004 */ bne $v0, $at, .L8004D100 /* 284F0 8004D0F0 3C018000 */ lui $at, 0x8000 /* 284F4 8004D0F4 14610002 */ bne $v1, $at, .L8004D100 -/* 284F8 8004D0F8 00000000 */ nop +/* 284F8 8004D0F8 00000000 */ nop /* 284FC 8004D0FC 0006000D */ break 6 .L8004D100: /* 28500 8004D100 00001812 */ mflo $v1 diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004D130.s b/asm/nonmatchings/code_26840_len_20d0/func_8004D130.s index b79aa94028..fe25633ab2 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004D130.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004D130.s @@ -8,10 +8,10 @@ glabel func_8004D130 /* 2853C 8004D13C A0A2008C */ sb $v0, 0x8c($a1) /* 28540 8004D140 304200FF */ andi $v0, $v0, 0xff /* 28544 8004D144 10400003 */ beqz $v0, .L8004D154 -/* 28548 8004D148 00000000 */ nop +/* 28548 8004D148 00000000 */ nop .L8004D14C: /* 2854C 8004D14C 8CA20088 */ lw $v0, 0x88($a1) /* 28550 8004D150 ACA20000 */ sw $v0, ($a1) .L8004D154: /* 28554 8004D154 03E00008 */ jr $ra -/* 28558 8004D158 00000000 */ nop +/* 28558 8004D158 00000000 */ nop diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004D15C.s b/asm/nonmatchings/code_26840_len_20d0/func_8004D15C.s index 1f573099a1..1ae58161ee 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004D15C.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004D15C.s @@ -11,4 +11,4 @@ glabel func_8004D15C /* 28574 8004D174 ACA20000 */ sw $v0, ($a1) .L8004D178: /* 28578 8004D178 03E00008 */ jr $ra -/* 2857C 8004D17C 00000000 */ nop +/* 2857C 8004D17C 00000000 */ nop diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004D1B4.s b/asm/nonmatchings/code_26840_len_20d0/func_8004D1B4.s index f38f69cfca..14bb950b6c 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004D1B4.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004D1B4.s @@ -32,7 +32,7 @@ glabel func_8004D1B4 /* 28614 8004D214 14410004 */ bne $v0, $at, .L8004D228 /* 28618 8004D218 3C018000 */ lui $at, 0x8000 /* 2861C 8004D21C 14610002 */ bne $v1, $at, .L8004D228 -/* 28620 8004D220 00000000 */ nop +/* 28620 8004D220 00000000 */ nop /* 28624 8004D224 0006000D */ break 6 .L8004D228: /* 28628 8004D228 00001812 */ mflo $v1 diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004D23C.s b/asm/nonmatchings/code_26840_len_20d0/func_8004D23C.s index 17a6d1e948..919ca2690b 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004D23C.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004D23C.s @@ -21,7 +21,7 @@ glabel func_8004D23C /* 2867C 8004D27C 10400005 */ beqz $v0, .L8004D294 /* 28680 8004D280 24020001 */ addiu $v0, $zero, 1 /* 28684 8004D284 10820006 */ beq $a0, $v0, .L8004D2A0 -/* 28688 8004D288 00000000 */ nop +/* 28688 8004D288 00000000 */ nop /* 2868C 8004D28C 03E00008 */ jr $ra /* 28690 8004D290 ACE00080 */ sw $zero, 0x80($a3) .L8004D294: @@ -33,4 +33,4 @@ glabel func_8004D23C /* 286A4 8004D2A4 ACE30080 */ sw $v1, 0x80($a3) .L8004D2A8: /* 286A8 8004D2A8 03E00008 */ jr $ra -/* 286AC 8004D2AC 00000000 */ nop +/* 286AC 8004D2AC 00000000 */ nop diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004D2B0.s b/asm/nonmatchings/code_26840_len_20d0/func_8004D2B0.s index d95e8422e6..dc25ec4d6d 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004D2B0.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004D2B0.s @@ -8,7 +8,7 @@ glabel func_8004D2B0 /* 286BC 8004D2BC 908200BC */ lbu $v0, 0xbc($a0) /* 286C0 8004D2C0 90C30045 */ lbu $v1, 0x45($a2) /* 286C4 8004D2C4 14620004 */ bne $v1, $v0, .L8004D2D8 -/* 286C8 8004D2C8 00000000 */ nop +/* 286C8 8004D2C8 00000000 */ nop /* 286CC 8004D2CC 908500BF */ lbu $a1, 0xbf($a0) /* 286D0 8004D2D0 0C014E31 */ jal func_800538C4 /* 286D4 8004D2D4 00C0202D */ daddu $a0, $a2, $zero diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004D3F8.s b/asm/nonmatchings/code_26840_len_20d0/func_8004D3F8.s index 7bd91746dd..386d412132 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004D3F8.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004D3F8.s @@ -14,4 +14,4 @@ glabel func_8004D3F8 /* 2881C 8004D41C A4A2005E */ sh $v0, 0x5e($a1) .L8004D420: /* 28820 8004D420 03E00008 */ jr $ra -/* 28824 8004D424 00000000 */ nop +/* 28824 8004D424 00000000 */ nop diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004D4BC.s b/asm/nonmatchings/code_26840_len_20d0/func_8004D4BC.s index a718017390..f7ced1a8ee 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004D4BC.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004D4BC.s @@ -22,5 +22,5 @@ glabel func_8004D4BC /* 288FC 8004D4FC 1440FFF5 */ bnez $v0, .L8004D4D4 /* 28900 8004D500 246300AC */ addiu $v1, $v1, 0xac /* 28904 8004D504 03E00008 */ jr $ra -/* 28908 8004D508 00000000 */ nop -/* 2890C 8004D50C 00000000 */ nop +/* 28908 8004D508 00000000 */ nop +/* 2890C 8004D50C 00000000 */ nop diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004D510.s b/asm/nonmatchings/code_28910_len_5090/func_8004D510.s index 2e324a5f2a..701ed81b9b 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004D510.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004D510.s @@ -63,9 +63,9 @@ glabel func_8004D510 .L8004D5E0: /* 289E0 8004D5E0 2402FFFF */ addiu $v0, $zero, -1 /* 289E4 8004D5E4 10C20064 */ beq $a2, $v0, .L8004D778 -/* 289E8 8004D5E8 00000000 */ nop +/* 289E8 8004D5E8 00000000 */ nop /* 289EC 8004D5EC 10C00058 */ beqz $a2, .L8004D750 -/* 289F0 8004D5F0 00000000 */ nop +/* 289F0 8004D5F0 00000000 */ nop /* 289F4 8004D5F4 96220058 */ lhu $v0, 0x58($s1) /* 289F8 8004D5F8 10C2005F */ beq $a2, $v0, .L8004D778 /* 289FC 8004D5FC 3C030002 */ lui $v1, 2 @@ -144,7 +144,7 @@ glabel func_8004D510 /* 28B08 8004D708 1440FFFB */ bnez $v0, .L8004D6F8 /* 28B0C 8004D70C 24840004 */ addiu $a0, $a0, 4 /* 28B10 8004D710 080135C8 */ j .L8004D720 -/* 28B14 8004D714 00000000 */ nop +/* 28B14 8004D714 00000000 */ nop .L8004D718: /* 28B18 8004D718 AE200078 */ sw $zero, 0x78($s1) /* 28B1C 8004D71C A220021C */ sb $zero, 0x21c($s1) diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004DB28.s b/asm/nonmatchings/code_28910_len_5090/func_8004DB28.s index ad1cf77184..55fdb3004f 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004DB28.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004DB28.s @@ -11,4 +11,4 @@ glabel func_8004DB28 /* 28F40 8004DB40 0000102D */ daddu $v0, $zero, $zero .L8004DB44: /* 28F44 8004DB44 03E00008 */ jr $ra -/* 28F48 8004DB48 00000000 */ nop +/* 28F48 8004DB48 00000000 */ nop diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004DB4C.s b/asm/nonmatchings/code_28910_len_5090/func_8004DB4C.s index ebdc5f27c2..2dc20d33f7 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004DB4C.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004DB4C.s @@ -56,7 +56,7 @@ glabel func_8004DB4C /* 29014 8004DC14 14410004 */ bne $v0, $at, .L8004DC28 /* 29018 8004DC18 3C018000 */ lui $at, 0x8000 /* 2901C 8004DC1C 14610002 */ bne $v1, $at, .L8004DC28 -/* 29020 8004DC20 00000000 */ nop +/* 29020 8004DC20 00000000 */ nop /* 29024 8004DC24 0006000D */ break 6 .L8004DC28: /* 29028 8004DC28 00001812 */ mflo $v1 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004DCB8.s b/asm/nonmatchings/code_28910_len_5090/func_8004DCB8.s index 0a4287f4d6..73e2981f69 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004DCB8.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004DCB8.s @@ -23,7 +23,7 @@ glabel func_8004DCB8 /* 29100 8004DD00 24130002 */ addiu $s3, $zero, 2 /* 29104 8004DD04 8E420014 */ lw $v0, 0x14($s2) /* 29108 8004DD08 14400032 */ bnez $v0, .L8004DDD4 -/* 2910C 8004DD0C 00000000 */ nop +/* 2910C 8004DD0C 00000000 */ nop /* 29110 8004DD10 0C014FD9 */ jal func_80053F64 /* 29114 8004DD14 0280202D */ daddu $a0, $s4, $zero /* 29118 8004DD18 0040402D */ daddu $t0, $v0, $zero diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004E0F4.s b/asm/nonmatchings/code_28910_len_5090/func_8004E0F4.s index af7d4687a6..ec055b6db0 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004E0F4.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004E0F4.s @@ -11,7 +11,7 @@ glabel func_8004E0F4 /* 2950C 8004E10C 1080000B */ beqz $a0, .L8004E13C /* 29510 8004E110 0000802D */ daddu $s0, $zero, $zero /* 29514 8004E114 0C0135E5 */ jal func_8004D794 -/* 29518 8004E118 00000000 */ nop +/* 29518 8004E118 00000000 */ nop /* 2951C 8004E11C 50400008 */ beql $v0, $zero, .L8004E140 /* 29520 8004E120 24100002 */ addiu $s0, $zero, 2 /* 29524 8004E124 8E250004 */ lw $a1, 4($s1) diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004E344.s b/asm/nonmatchings/code_28910_len_5090/func_8004E344.s index b9b75f57e0..39f3e6b4bf 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004E344.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004E344.s @@ -13,7 +13,7 @@ glabel func_8004E344 /* 29760 8004E360 24630001 */ addiu $v1, $v1, 1 /* 29764 8004E364 28620004 */ slti $v0, $v1, 4 /* 29768 8004E368 1440FFF7 */ bnez $v0, .L8004E348 -/* 2976C 8004E36C 00000000 */ nop +/* 2976C 8004E36C 00000000 */ nop .L8004E370: /* 29770 8004E370 24020004 */ addiu $v0, $zero, 4 /* 29774 8004E374 00432823 */ subu $a1, $v0, $v1 @@ -29,4 +29,4 @@ glabel func_8004E344 /* 29798 8004E398 24A5FFFF */ addiu $a1, $a1, -1 .L8004E39C: /* 2979C 8004E39C 03E00008 */ jr $ra -/* 297A0 8004E3A0 00000000 */ nop +/* 297A0 8004E3A0 00000000 */ nop diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004EC68.s b/asm/nonmatchings/code_28910_len_5090/func_8004EC68.s index 784f1ba471..e18e9eb0f5 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004EC68.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004EC68.s @@ -168,7 +168,7 @@ glabel func_8004EC68 /* 2A2A4 8004EEA4 A6020036 */ sh $v0, 0x36($s0) /* 2A2A8 8004EEA8 00021400 */ sll $v0, $v0, 0x10 /* 2A2AC 8004EEAC 14400004 */ bnez $v0, .L8004EEC0 -/* 2A2B0 8004EEB0 00000000 */ nop +/* 2A2B0 8004EEB0 00000000 */ nop /* 2A2B4 8004EEB4 86020034 */ lh $v0, 0x34($s0) /* 2A2B8 8004EEB8 08013BB3 */ j .L8004EECC /* 2A2BC 8004EEBC 00021400 */ sll $v0, $v0, 0x10 @@ -238,7 +238,7 @@ glabel func_8004EC68 /* 2A39C 8004EF9C A602003E */ sh $v0, 0x3e($s0) /* 2A3A0 8004EFA0 00021400 */ sll $v0, $v0, 0x10 /* 2A3A4 8004EFA4 1440021C */ bnez $v0, .L8004F818 -/* 2A3A8 8004EFA8 00000000 */ nop +/* 2A3A8 8004EFA8 00000000 */ nop /* 2A3AC 8004EFAC 8E020004 */ lw $v0, 4($s0) /* 2A3B0 8004EFB0 08013E06 */ j .L8004F818 /* 2A3B4 8004EFB4 AE020000 */ sw $v0, ($s0) @@ -258,7 +258,7 @@ glabel func_8004EC68 .L8004EFE0: /* 2A3E0 8004EFE0 2C6200D4 */ sltiu $v0, $v1, 0xd4 /* 2A3E4 8004EFE4 104001B7 */ beqz $v0, .L8004F6C4 -/* 2A3E8 8004EFE8 00000000 */ nop +/* 2A3E8 8004EFE8 00000000 */ nop /* 2A3EC 8004EFEC 8E020000 */ lw $v0, ($s0) /* 2A3F0 8004EFF0 905E0000 */ lbu $fp, ($v0) /* 2A3F4 8004EFF4 24420001 */ addiu $v0, $v0, 1 @@ -273,7 +273,7 @@ glabel func_8004EC68 /* 2A418 8004F018 A602003E */ sh $v0, 0x3e($s0) /* 2A41C 8004F01C 00021400 */ sll $v0, $v0, 0x10 /* 2A420 8004F020 14400003 */ bnez $v0, .L8004F030 -/* 2A424 8004F024 00000000 */ nop +/* 2A424 8004F024 00000000 */ nop /* 2A428 8004F028 8E020004 */ lw $v0, 4($s0) /* 2A42C 8004F02C AE020000 */ sw $v0, ($s0) .L8004F030: @@ -295,7 +295,7 @@ glabel func_8004EC68 /* 2A468 8004F068 2AC200C0 */ slti $v0, $s6, 0xc0 .L8004F06C: /* 2A46C 8004F06C 14400013 */ bnez $v0, .L8004F0BC -/* 2A470 8004F070 00000000 */ nop +/* 2A470 8004F070 00000000 */ nop /* 2A474 8004F074 8E020000 */ lw $v0, ($s0) /* 2A478 8004F078 90430000 */ lbu $v1, ($v0) /* 2A47C 8004F07C 24420001 */ addiu $v0, $v0, 1 @@ -311,7 +311,7 @@ glabel func_8004EC68 /* 2A4A4 8004F0A4 A602003E */ sh $v0, 0x3e($s0) /* 2A4A8 8004F0A8 00021400 */ sll $v0, $v0, 0x10 /* 2A4AC 8004F0AC 14400003 */ bnez $v0, .L8004F0BC -/* 2A4B0 8004F0B0 00000000 */ nop +/* 2A4B0 8004F0B0 00000000 */ nop /* 2A4B4 8004F0B4 8E020004 */ lw $v0, 4($s0) /* 2A4B8 8004F0B8 AE020000 */ sw $v0, ($s0) .L8004F0BC: @@ -346,7 +346,7 @@ glabel func_8004EC68 /* 2A524 8004F124 92020054 */ lbu $v0, 0x54($s0) /* 2A528 8004F128 2C420005 */ sltiu $v0, $v0, 5 /* 2A52C 8004F12C 14400066 */ bnez $v0, .L8004F2C8 -/* 2A530 8004F130 00000000 */ nop +/* 2A530 8004F130 00000000 */ nop /* 2A534 8004F134 92150052 */ lbu $s5, 0x52($s0) /* 2A538 8004F138 92030053 */ lbu $v1, 0x53($s0) /* 2A53C 8004F13C 32A500FF */ andi $a1, $s5, 0xff @@ -364,7 +364,7 @@ glabel func_8004EC68 /* 2A568 8004F168 92420045 */ lbu $v0, 0x45($s2) /* 2A56C 8004F16C 0043102B */ sltu $v0, $v0, $v1 /* 2A570 8004F170 1440FF93 */ bnez $v0, .L8004EFC0 -/* 2A574 8004F174 00000000 */ nop +/* 2A574 8004F174 00000000 */ nop /* 2A578 8004F178 26B50001 */ addiu $s5, $s5, 1 /* 2A57C 8004F17C 32A500FF */ andi $a1, $s5, 0xff /* 2A580 8004F180 00A6102B */ sltu $v0, $a1, $a2 @@ -397,7 +397,7 @@ glabel func_8004EC68 /* 2A5E4 8004F1E4 02829821 */ addu $s3, $s4, $v0 /* 2A5E8 8004F1E8 8E62000C */ lw $v0, 0xc($s3) /* 2A5EC 8004F1EC 1040FF78 */ beqz $v0, .L8004EFD0 -/* 2A5F0 8004F1F0 00000000 */ nop +/* 2A5F0 8004F1F0 00000000 */ nop /* 2A5F4 8004F1F4 26B50001 */ addiu $s5, $s5, 1 .L8004F1F8: /* 2A5F8 8004F1F8 32A500FF */ andi $a1, $s5, 0xff @@ -455,7 +455,7 @@ glabel func_8004EC68 /* 2A6B8 8004F2B8 0C014E31 */ jal func_800538C4 /* 2A6BC 8004F2BC 32A500FF */ andi $a1, $s5, 0xff /* 2A6C0 8004F2C0 08013CC8 */ j .L8004F320 -/* 2A6C4 8004F2C4 00000000 */ nop +/* 2A6C4 8004F2C4 00000000 */ nop .L8004F2C8: /* 2A6C8 8004F2C8 92150052 */ lbu $s5, 0x52($s0) /* 2A6CC 8004F2CC 8E830000 */ lw $v1, ($s4) @@ -475,7 +475,7 @@ glabel func_8004EC68 /* 2A704 8004F304 92820234 */ lbu $v0, 0x234($s4) /* 2A708 8004F308 0043102B */ sltu $v0, $v0, $v1 /* 2A70C 8004F30C 14400004 */ bnez $v0, .L8004F320 -/* 2A710 8004F310 00000000 */ nop +/* 2A710 8004F310 00000000 */ nop /* 2A714 8004F314 0C014E31 */ jal func_800538C4 /* 2A718 8004F318 0240202D */ daddu $a0, $s2, $zero /* 2A71C 8004F31C 24110001 */ addiu $s1, $zero, 1 @@ -500,7 +500,7 @@ glabel func_8004EC68 /* 2A758 8004F358 AE76000C */ sw $s6, 0xc($s3) /* 2A75C 8004F35C 92020058 */ lbu $v0, 0x58($s0) /* 2A760 8004F360 10400072 */ beqz $v0, .L8004F52C -/* 2A764 8004F364 00000000 */ nop +/* 2A764 8004F364 00000000 */ nop /* 2A768 8004F368 97AB0026 */ lhu $t3, 0x26($sp) /* 2A76C 8004F36C 0160202D */ daddu $a0, $t3, $zero /* 2A770 8004F370 28820048 */ slti $v0, $a0, 0x48 @@ -527,7 +527,7 @@ glabel func_8004EC68 /* 2A7BC 8004F3BC AE620000 */ sw $v0, ($s3) /* 2A7C0 8004F3C0 92220008 */ lbu $v0, 8($s1) /* 2A7C4 8004F3C4 10400008 */ beqz $v0, .L8004F3E8 -/* 2A7C8 8004F3C8 00000000 */ nop +/* 2A7C8 8004F3C8 00000000 */ nop /* 2A7CC 8004F3CC 8E840050 */ lw $a0, 0x50($s4) /* 2A7D0 8004F3D0 92250004 */ lbu $a1, 4($s1) /* 2A7D4 8004F3D4 0C014195 */ jal func_80050654 @@ -550,16 +550,16 @@ glabel func_8004EC68 /* 2A810 8004F410 8E02002C */ lw $v0, 0x2c($s0) /* 2A814 8004F414 00001812 */ mflo $v1 /* 2A818 8004F418 00021543 */ sra $v0, $v0, 0x15 -/* 2A81C 8004F41C 00000000 */ nop +/* 2A81C 8004F41C 00000000 */ nop /* 2A820 8004F420 00620018 */ mult $v1, $v0 /* 2A824 8004F424 82030049 */ lb $v1, 0x49($s0) /* 2A828 8004F428 00002012 */ mflo $a0 /* 2A82C 8004F42C 86620008 */ lh $v0, 8($s3) -/* 2A830 8004F430 00000000 */ nop +/* 2A830 8004F430 00000000 */ nop /* 2A834 8004F434 00620018 */ mult $v1, $v0 /* 2A838 8004F438 00001812 */ mflo $v1 /* 2A83C 8004F43C 00041503 */ sra $v0, $a0, 0x14 -/* 2A840 8004F440 00000000 */ nop +/* 2A840 8004F440 00000000 */ nop /* 2A844 8004F444 00430018 */ mult $v0, $v1 /* 2A848 8004F448 00001812 */ mflo $v1 /* 2A84C 8004F44C 00031403 */ sra $v0, $v1, 0x10 @@ -595,7 +595,7 @@ glabel func_8004EC68 /* 2A8C0 8004F4C0 8E620000 */ lw $v0, ($s3) /* 2A8C4 8004F4C4 C4420020 */ lwc1 $f2, 0x20($v0) /* 2A8C8 8004F4C8 46020002 */ mul.s $f0, $f0, $f2 -/* 2A8CC 8004F4CC 00000000 */ nop +/* 2A8CC 8004F4CC 00000000 */ nop /* 2A8D0 8004F4D0 E6600004 */ swc1 $f0, 4($s3) /* 2A8D4 8004F4D4 92220009 */ lbu $v0, 9($s1) /* 2A8D8 8004F4D8 10400006 */ beqz $v0, .L8004F4F4 @@ -611,7 +611,7 @@ glabel func_8004EC68 .L8004F4FC: /* 2A8FC 8004F4FC 9222000A */ lbu $v0, 0xa($s1) /* 2A900 8004F500 10400007 */ beqz $v0, .L8004F520 -/* 2A904 8004F504 00000000 */ nop +/* 2A904 8004F504 00000000 */ nop /* 2A908 8004F508 8E840050 */ lw $a0, 0x50($s4) /* 2A90C 8004F50C 92250006 */ lbu $a1, 6($s1) /* 2A910 8004F510 0C0141A3 */ jal func_8005068C @@ -631,16 +631,16 @@ glabel func_8004EC68 /* 2A940 8004F540 8E02002C */ lw $v0, 0x2c($s0) /* 2A944 8004F544 00001812 */ mflo $v1 /* 2A948 8004F548 00021543 */ sra $v0, $v0, 0x15 -/* 2A94C 8004F54C 00000000 */ nop +/* 2A94C 8004F54C 00000000 */ nop /* 2A950 8004F550 00620018 */ mult $v1, $v0 /* 2A954 8004F554 82030049 */ lb $v1, 0x49($s0) /* 2A958 8004F558 00002012 */ mflo $a0 /* 2A95C 8004F55C 92620016 */ lbu $v0, 0x16($s3) -/* 2A960 8004F560 00000000 */ nop +/* 2A960 8004F560 00000000 */ nop /* 2A964 8004F564 00620018 */ mult $v1, $v0 /* 2A968 8004F568 00001812 */ mflo $v1 /* 2A96C 8004F56C 00041503 */ sra $v0, $a0, 0x14 -/* 2A970 8004F570 00000000 */ nop +/* 2A970 8004F570 00000000 */ nop /* 2A974 8004F574 00430018 */ mult $v0, $v1 /* 2A978 8004F578 00001812 */ mflo $v1 /* 2A97C 8004F57C 00031243 */ sra $v0, $v1, 9 @@ -676,7 +676,7 @@ glabel func_8004EC68 /* 2A9F4 8004F5F4 8E02000C */ lw $v0, 0xc($s0) /* 2A9F8 8004F5F8 C4420020 */ lwc1 $f2, 0x20($v0) /* 2A9FC 8004F5FC 46020002 */ mul.s $f0, $f0, $f2 -/* 2AA00 8004F600 00000000 */ nop +/* 2AA00 8004F600 00000000 */ nop /* 2AA04 8004F604 E6600004 */ swc1 $f0, 4($s3) /* 2AA08 8004F608 92020057 */ lbu $v0, 0x57($s0) /* 2AA0C 8004F60C 10400006 */ beqz $v0, .L8004F628 @@ -827,7 +827,7 @@ glabel func_8004EC68 .L8004F818: /* 2AC18 8004F818 8E020028 */ lw $v0, 0x28($s0) /* 2AC1C 8004F81C 1040FDB5 */ beqz $v0, .L8004EEF4 -/* 2AC20 8004F820 00000000 */ nop +/* 2AC20 8004F820 00000000 */ nop .L8004F824: /* 2AC24 8004F824 08013ED6 */ j .L8004FB58 /* 2AC28 8004F828 92150052 */ lbu $s5, 0x52($s0) @@ -864,13 +864,13 @@ glabel func_8004EC68 .L8004F8A0: /* 2ACA0 8004F8A0 92020058 */ lbu $v0, 0x58($s0) /* 2ACA4 8004F8A4 1040003A */ beqz $v0, .L8004F990 -/* 2ACA8 8004F8A8 00000000 */ nop +/* 2ACA8 8004F8A8 00000000 */ nop /* 2ACAC 8004F8AC 92020040 */ lbu $v0, 0x40($s0) /* 2ACB0 8004F8B0 14400004 */ bnez $v0, .L8004F8C4 -/* 2ACB4 8004F8B4 00000000 */ nop +/* 2ACB4 8004F8B4 00000000 */ nop /* 2ACB8 8004F8B8 8682020E */ lh $v0, 0x20e($s4) /* 2ACBC 8004F8BC 10400017 */ beqz $v0, .L8004F91C -/* 2ACC0 8004F8C0 00000000 */ nop +/* 2ACC0 8004F8C0 00000000 */ nop .L8004F8C4: /* 2ACC4 8004F8C4 8664000A */ lh $a0, 0xa($s3) /* 2ACC8 8004F8C8 86620014 */ lh $v0, 0x14($s3) @@ -883,13 +883,13 @@ glabel func_8004EC68 /* 2ACE4 8004F8E4 8E620000 */ lw $v0, ($s3) /* 2ACE8 8004F8E8 C4420020 */ lwc1 $f2, 0x20($v0) /* 2ACEC 8004F8EC 46020082 */ mul.s $f2, $f0, $f2 -/* 2ACF0 8004F8F0 00000000 */ nop +/* 2ACF0 8004F8F0 00000000 */ nop /* 2ACF4 8004F8F4 E6620004 */ swc1 $f2, 4($s3) /* 2ACF8 8004F8F8 C6400004 */ lwc1 $f0, 4($s2) /* 2ACFC 8004F8FC 46020032 */ c.eq.s $f0, $f2 -/* 2AD00 8004F900 00000000 */ nop +/* 2AD00 8004F900 00000000 */ nop /* 2AD04 8004F904 45010005 */ bc1t .L8004F91C -/* 2AD08 8004F908 00000000 */ nop +/* 2AD08 8004F908 00000000 */ nop /* 2AD0C 8004F90C 92420043 */ lbu $v0, 0x43($s2) /* 2AD10 8004F910 E6420004 */ swc1 $f2, 4($s2) /* 2AD14 8004F914 34420008 */ ori $v0, $v0, 8 @@ -906,16 +906,16 @@ glabel func_8004EC68 /* 2AD3C 8004F93C 8E02002C */ lw $v0, 0x2c($s0) /* 2AD40 8004F940 00001812 */ mflo $v1 /* 2AD44 8004F944 00021543 */ sra $v0, $v0, 0x15 -/* 2AD48 8004F948 00000000 */ nop +/* 2AD48 8004F948 00000000 */ nop /* 2AD4C 8004F94C 00620018 */ mult $v1, $v0 /* 2AD50 8004F950 82030049 */ lb $v1, 0x49($s0) /* 2AD54 8004F954 00002012 */ mflo $a0 /* 2AD58 8004F958 86620008 */ lh $v0, 8($s3) -/* 2AD5C 8004F95C 00000000 */ nop +/* 2AD5C 8004F95C 00000000 */ nop /* 2AD60 8004F960 00620018 */ mult $v1, $v0 /* 2AD64 8004F964 00001812 */ mflo $v1 /* 2AD68 8004F968 00041503 */ sra $v0, $a0, 0x14 -/* 2AD6C 8004F96C 00000000 */ nop +/* 2AD6C 8004F96C 00000000 */ nop /* 2AD70 8004F970 00430018 */ mult $v0, $v1 /* 2AD74 8004F974 9242003D */ lbu $v0, 0x3d($s2) /* 2AD78 8004F978 34420020 */ ori $v0, $v0, 0x20 @@ -927,7 +927,7 @@ glabel func_8004EC68 .L8004F990: /* 2AD90 8004F990 92620012 */ lbu $v0, 0x12($s3) /* 2AD94 8004F994 10400027 */ beqz $v0, .L8004FA34 -/* 2AD98 8004F998 00000000 */ nop +/* 2AD98 8004F998 00000000 */ nop /* 2AD9C 8004F99C 96620010 */ lhu $v0, 0x10($s3) /* 2ADA0 8004F9A0 10400003 */ beqz $v0, .L8004F9B0 /* 2ADA4 8004F9A4 2442FFFF */ addiu $v0, $v0, -1 @@ -973,10 +973,10 @@ glabel func_8004EC68 .L8004FA34: /* 2AE34 8004FA34 92020040 */ lbu $v0, 0x40($s0) /* 2AE38 8004FA38 14400004 */ bnez $v0, .L8004FA4C -/* 2AE3C 8004FA3C 00000000 */ nop +/* 2AE3C 8004FA3C 00000000 */ nop /* 2AE40 8004FA40 8682020E */ lh $v0, 0x20e($s4) /* 2AE44 8004FA44 10400016 */ beqz $v0, .L8004FAA0 -/* 2AE48 8004FA48 00000000 */ nop +/* 2AE48 8004FA48 00000000 */ nop .L8004FA4C: /* 2AE4C 8004FA4C 8664000A */ lh $a0, 0xa($s3) /* 2AE50 8004FA50 86020038 */ lh $v0, 0x38($s0) @@ -985,17 +985,17 @@ glabel func_8004EC68 /* 2AE5C 8004FA5C 00832021 */ addu $a0, $a0, $v1 .L8004FA60: /* 2AE60 8004FA60 0C014E3E */ jal func_800538F8 -/* 2AE64 8004FA64 00000000 */ nop +/* 2AE64 8004FA64 00000000 */ nop /* 2AE68 8004FA68 8E620000 */ lw $v0, ($s3) /* 2AE6C 8004FA6C C4420020 */ lwc1 $f2, 0x20($v0) /* 2AE70 8004FA70 46020082 */ mul.s $f2, $f0, $f2 -/* 2AE74 8004FA74 00000000 */ nop +/* 2AE74 8004FA74 00000000 */ nop /* 2AE78 8004FA78 E6620004 */ swc1 $f2, 4($s3) /* 2AE7C 8004FA7C C6400004 */ lwc1 $f0, 4($s2) /* 2AE80 8004FA80 46020032 */ c.eq.s $f0, $f2 -/* 2AE84 8004FA84 00000000 */ nop +/* 2AE84 8004FA84 00000000 */ nop /* 2AE88 8004FA88 45010005 */ bc1t .L8004FAA0 -/* 2AE8C 8004FA8C 00000000 */ nop +/* 2AE8C 8004FA8C 00000000 */ nop /* 2AE90 8004FA90 92420043 */ lbu $v0, 0x43($s2) /* 2AE94 8004FA94 E6420004 */ swc1 $f2, 4($s2) /* 2AE98 8004FA98 34420008 */ ori $v0, $v0, 8 @@ -1003,7 +1003,7 @@ glabel func_8004EC68 .L8004FAA0: /* 2AEA0 8004FAA0 92020041 */ lbu $v0, 0x41($s0) /* 2AEA4 8004FAA4 10400020 */ beqz $v0, .L8004FB28 -/* 2AEA8 8004FAA8 00000000 */ nop +/* 2AEA8 8004FAA8 00000000 */ nop /* 2AEAC 8004FAAC 8E8300C0 */ lw $v1, 0xc0($s4) /* 2AEB0 8004FAB0 8E020018 */ lw $v0, 0x18($s0) /* 2AEB4 8004FAB4 00031D43 */ sra $v1, $v1, 0x15 @@ -1012,16 +1012,16 @@ glabel func_8004EC68 /* 2AEC0 8004FAC0 8E02002C */ lw $v0, 0x2c($s0) /* 2AEC4 8004FAC4 00001812 */ mflo $v1 /* 2AEC8 8004FAC8 00021543 */ sra $v0, $v0, 0x15 -/* 2AECC 8004FACC 00000000 */ nop +/* 2AECC 8004FACC 00000000 */ nop /* 2AED0 8004FAD0 00620018 */ mult $v1, $v0 /* 2AED4 8004FAD4 82030049 */ lb $v1, 0x49($s0) /* 2AED8 8004FAD8 00002012 */ mflo $a0 /* 2AEDC 8004FADC 92620016 */ lbu $v0, 0x16($s3) -/* 2AEE0 8004FAE0 00000000 */ nop +/* 2AEE0 8004FAE0 00000000 */ nop /* 2AEE4 8004FAE4 00620018 */ mult $v1, $v0 /* 2AEE8 8004FAE8 00001812 */ mflo $v1 /* 2AEEC 8004FAEC 00041503 */ sra $v0, $a0, 0x14 -/* 2AEF0 8004FAF0 00000000 */ nop +/* 2AEF0 8004FAF0 00000000 */ nop /* 2AEF4 8004FAF4 00430018 */ mult $v0, $v1 /* 2AEF8 8004FAF8 00001812 */ mflo $v1 /* 2AEFC 8004FAFC 00031A43 */ sra $v1, $v1, 9 @@ -1055,7 +1055,7 @@ glabel func_8004EC68 /* 2AF5C 8004FB5C 32A400FF */ andi $a0, $s5, 0xff /* 2AF60 8004FB60 0082102B */ sltu $v0, $a0, $v0 /* 2AF64 8004FB64 1440FF31 */ bnez $v0, .L8004F82C -/* 2AF68 8004FB68 00000000 */ nop +/* 2AF68 8004FB68 00000000 */ nop /* 2AF6C 8004FB6C 26F70001 */ addiu $s7, $s7, 1 .L8004FB70: /* 2AF70 8004FB70 2EE20010 */ sltiu $v0, $s7, 0x10 diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050020.s b/asm/nonmatchings/code_28910_len_5090/func_80050020.s index e5059d1f89..9af20eb5fc 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050020.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050020.s @@ -22,7 +22,7 @@ glabel func_80050020 .L80050064: /* 2B464 80050064 2CA20040 */ sltiu $v0, $a1, 0x40 /* 2B468 80050068 10400006 */ beqz $v0, .L80050084 -/* 2B46C 8005006C 00000000 */ nop +/* 2B46C 8005006C 00000000 */ nop /* 2B470 80050070 8C820000 */ lw $v0, ($a0) /* 2B474 80050074 8C430058 */ lw $v1, 0x58($v0) /* 2B478 80050078 000510C0 */ sll $v0, $a1, 3 diff --git a/asm/nonmatchings/code_28910_len_5090/func_800502F0.s b/asm/nonmatchings/code_28910_len_5090/func_800502F0.s index 084980ddcd..7b9e60cdb2 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_800502F0.s +++ b/asm/nonmatchings/code_28910_len_5090/func_800502F0.s @@ -16,11 +16,12 @@ glabel func_800502F0 /* 2B71C 8005031C 2C820006 */ sltiu $v0, $a0, 6 /* 2B720 80050320 10400088 */ beqz $v0, .L80050544 /* 2B724 80050324 00041080 */ sll $v0, $a0, 2 -/* 2B728 80050328 3C01800A */ lui $at, %hi(D_800988D8) +/* 2B728 80050328 3C01800A */ lui $at, %hi(jtbl_800988D8_73CD8) /* 2B72C 8005032C 00220821 */ addu $at, $at, $v0 -/* 2B730 80050330 8C2288D8 */ lw $v0, %lo(D_800988D8)($at) +/* 2B730 80050330 8C2288D8 */ lw $v0, %lo(jtbl_800988D8_73CD8)($at) /* 2B734 80050334 00400008 */ jr $v0 -/* 2B738 80050338 00000000 */ nop +/* 2B738 80050338 00000000 */ nop +glabel L8005033C_2B73C /* 2B73C 8005033C 2C620004 */ sltiu $v0, $v1, 4 /* 2B740 80050340 10400080 */ beqz $v0, .L80050544 /* 2B744 80050344 02431021 */ addu $v0, $s2, $v1 @@ -40,7 +41,7 @@ glabel func_800502F0 /* 2B77C 8005037C 00A0202D */ daddu $a0, $a1, $zero /* 2B780 80050380 90620053 */ lbu $v0, 0x53($v1) /* 2B784 80050384 1044006F */ beq $v0, $a0, .L80050544 -/* 2B788 80050388 00000000 */ nop +/* 2B788 80050388 00000000 */ nop .L8005038C: /* 2B78C 8005038C A0670052 */ sb $a3, 0x52($v1) /* 2B790 80050390 8E420000 */ lw $v0, ($s2) @@ -50,13 +51,14 @@ glabel func_800502F0 /* 2B79C 8005039C 8E430000 */ lw $v1, ($s2) /* 2B7A0 800503A0 90620053 */ lbu $v0, 0x53($v1) /* 2B7A4 800503A4 10400067 */ beqz $v0, .L80050544 -/* 2B7A8 800503A8 00000000 */ nop +/* 2B7A8 800503A8 00000000 */ nop /* 2B7AC 800503AC A0600053 */ sb $zero, 0x53($v1) .L800503B0: /* 2B7B0 800503B0 8E430000 */ lw $v1, ($s2) /* 2B7B4 800503B4 24020001 */ addiu $v0, $zero, 1 /* 2B7B8 800503B8 08014151 */ j .L80050544 /* 2B7BC 800503BC A0620050 */ sb $v0, 0x50($v1) +glabel L800503C0_2B7C0 /* 2B7C0 800503C0 2465FFFF */ addiu $a1, $v1, -1 /* 2B7C4 800503C4 2CA20008 */ sltiu $v0, $a1, 8 /* 2B7C8 800503C8 5040005E */ beql $v0, $zero, .L80050544 @@ -65,7 +67,8 @@ glabel func_800502F0 /* 2B7D4 800503D4 0C013A11 */ jal func_8004E844 /* 2B7D8 800503D8 0240202D */ daddu $a0, $s2, $zero /* 2B7DC 800503DC 08014151 */ j .L80050544 -/* 2B7E0 800503E0 00000000 */ nop +/* 2B7E0 800503E0 00000000 */ nop +glabel L800503E4_2B7E4 /* 2B7E4 800503E4 92500211 */ lbu $s0, 0x211($s2) /* 2B7E8 800503E8 2604FFFF */ addiu $a0, $s0, -1 /* 2B7EC 800503EC 2C820008 */ sltiu $v0, $a0, 8 @@ -98,11 +101,13 @@ glabel func_800502F0 /* 2B850 80050450 24820001 */ addiu $v0, $a0, 1 /* 2B854 80050454 08014151 */ j .L80050544 /* 2B858 80050458 A0620212 */ sb $v0, 0x212($v1) +glabel L8005045C_2B85C /* 2B85C 8005045C 2C620009 */ sltiu $v0, $v1, 9 /* 2B860 80050460 50400038 */ beql $v0, $zero, .L80050544 /* 2B864 80050464 A0A0004C */ sb $zero, 0x4c($a1) /* 2B868 80050468 08014151 */ j .L80050544 /* 2B86C 8005046C A0A3004C */ sb $v1, 0x4c($a1) +glabel L80050470_2B870 /* 2B870 80050470 8E420004 */ lw $v0, 4($s2) /* 2B874 80050474 10400033 */ beqz $v0, .L80050544 /* 2B878 80050478 0000802D */ daddu $s0, $zero, $zero @@ -117,7 +122,8 @@ glabel func_800502F0 /* 2B898 80050498 1440FFF9 */ bnez $v0, .L80050480 /* 2B89C 8005049C 24850004 */ addiu $a1, $a0, 4 /* 2B8A0 800504A0 08014151 */ j .L80050544 -/* 2B8A4 800504A4 00000000 */ nop +/* 2B8A4 800504A4 00000000 */ nop +glabel L800504A8_2B8A8 /* 2B8A8 800504A8 54600025 */ bnel $v1, $zero, .L80050540 /* 2B8AC 800504AC A0A3004F */ sb $v1, 0x4f($a1) /* 2B8B0 800504B0 90A2004E */ lbu $v0, 0x4e($a1) @@ -132,7 +138,7 @@ glabel func_800502F0 /* 2B8D0 800504D0 02512821 */ addu $a1, $s2, $s1 /* 2B8D4 800504D4 90A2004F */ lbu $v0, 0x4f($a1) /* 2B8D8 800504D8 08014139 */ j .L800504E4 -/* 2B8DC 800504DC 00000000 */ nop +/* 2B8DC 800504DC 00000000 */ nop .L800504E0: /* 2B8E0 800504E0 90A20050 */ lbu $v0, 0x50($a1) .L800504E4: @@ -148,7 +154,7 @@ glabel func_800502F0 /* 2B904 80050504 1440FFF0 */ bnez $v0, .L800504C8 /* 2B908 80050508 26310060 */ addiu $s1, $s1, 0x60 /* 2B90C 8005050C 08014151 */ j .L80050544 -/* 2B910 80050510 00000000 */ nop +/* 2B910 80050510 00000000 */ nop .L80050514: /* 2B914 80050514 A0A30090 */ sb $v1, 0x90($a1) /* 2B918 80050518 9643002C */ lhu $v1, 0x2c($s2) diff --git a/asm/nonmatchings/code_28910_len_5090/func_800506C8.s b/asm/nonmatchings/code_28910_len_5090/func_800506C8.s index 3974d9bd65..c3e11c54d2 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_800506C8.s +++ b/asm/nonmatchings/code_28910_len_5090/func_800506C8.s @@ -12,10 +12,10 @@ glabel func_800506C8 /* 2BAE4 800506E4 1080001C */ beqz $a0, .L80050758 /* 2BAE8 800506E8 AFBF001C */ sw $ra, 0x1c($sp) /* 2BAEC 800506EC 0C0135E5 */ jal func_8004D794 -/* 2BAF0 800506F0 00000000 */ nop +/* 2BAF0 800506F0 00000000 */ nop /* 2BAF4 800506F4 0040282D */ daddu $a1, $v0, $zero /* 2BAF8 800506F8 10A00017 */ beqz $a1, .L80050758 -/* 2BAFC 800506FC 00000000 */ nop +/* 2BAFC 800506FC 00000000 */ nop /* 2BB00 80050700 8CA2016C */ lw $v0, 0x16c($a1) /* 2BB04 80050704 10500014 */ beq $v0, $s0, .L80050758 /* 2BB08 80050708 324200FF */ andi $v0, $s2, 0xff diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050770.s b/asm/nonmatchings/code_28910_len_5090/func_80050770.s index 786c82266c..ecaa7902b4 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050770.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050770.s @@ -11,22 +11,22 @@ glabel func_80050770 /* 2BB88 80050788 0080802D */ daddu $s0, $a0, $zero /* 2BB8C 8005078C 460020A1 */ cvt.d.s $f2, $f4 /* 2BB90 80050790 4622003C */ c.lt.d $f0, $f2 -/* 2BB94 80050794 00000000 */ nop +/* 2BB94 80050794 00000000 */ nop /* 2BB98 80050798 45000005 */ bc1f .L800507B0 /* 2BB9C 8005079C AFBF0014 */ sw $ra, 0x14($sp) /* 2BBA0 800507A0 3C014000 */ lui $at, 0x4000 /* 2BBA4 800507A4 44812000 */ mtc1 $at, $f4 /* 2BBA8 800507A8 080141F6 */ j .L800507D8 -/* 2BBAC 800507AC 00000000 */ nop +/* 2BBAC 800507AC 00000000 */ nop .L800507B0: /* 2BBB0 800507B0 3C013FD0 */ lui $at, 0x3fd0 /* 2BBB4 800507B4 44810800 */ mtc1 $at, $f1 /* 2BBB8 800507B8 44800000 */ mtc1 $zero, $f0 -/* 2BBBC 800507BC 00000000 */ nop +/* 2BBBC 800507BC 00000000 */ nop /* 2BBC0 800507C0 4620103C */ c.lt.d $f2, $f0 -/* 2BBC4 800507C4 00000000 */ nop +/* 2BBC4 800507C4 00000000 */ nop /* 2BBC8 800507C8 45000003 */ bc1f .L800507D8 -/* 2BBCC 800507CC 00000000 */ nop +/* 2BBCC 800507CC 00000000 */ nop /* 2BBD0 800507D0 3C013E80 */ lui $at, 0x3e80 /* 2BBD4 800507D4 44812000 */ mtc1 $at, $f4 .L800507D8: diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050888.s b/asm/nonmatchings/code_28910_len_5090/func_80050888.s index 91a89565e7..d19f8f4431 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050888.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050888.s @@ -30,7 +30,7 @@ glabel func_80050888 /* 2BCD8 800508D8 14E10004 */ bne $a3, $at, .L800508EC /* 2BCDC 800508DC 3C018000 */ lui $at, 0x8000 /* 2BCE0 800508E0 14410002 */ bne $v0, $at, .L800508EC -/* 2BCE4 800508E4 00000000 */ nop +/* 2BCE4 800508E4 00000000 */ nop /* 2BCE8 800508E8 0006000D */ break 6 .L800508EC: /* 2BCEC 800508EC 00001012 */ mflo $v0 diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050900.s b/asm/nonmatchings/code_28910_len_5090/func_80050900.s index 5509cb3399..01a5ff6760 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050900.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050900.s @@ -21,7 +21,7 @@ glabel func_80050900 /* 2BD3C 8005093C 14620003 */ bne $v1, $v0, .L8005094C /* 2BD40 80050940 26100001 */ addiu $s0, $s0, 1 /* 2BD44 80050944 0C014E31 */ jal func_800538C4 -/* 2BD48 80050948 00000000 */ nop +/* 2BD48 80050948 00000000 */ nop .L8005094C: /* 2BD4C 8005094C 320200FF */ andi $v0, $s0, 0xff /* 2BD50 80050950 2C420018 */ sltiu $v0, $v0, 0x18 diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050CA0.s b/asm/nonmatchings/code_28910_len_5090/func_80050CA0.s index 2d5f63ba62..92cda6417c 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050CA0.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050CA0.s @@ -27,7 +27,7 @@ glabel func_80050CA0 /* 2C0F8 80050CF8 5440000E */ bnel $v0, $zero, .L80050D34 /* 2C0FC 80050CFC 24110001 */ addiu $s1, $zero, 1 /* 2C100 80050D00 0C014429 */ jal func_800510A4 -/* 2C104 80050D04 00000000 */ nop +/* 2C104 80050D04 00000000 */ nop /* 2C108 80050D08 1240000A */ beqz $s2, .L80050D34 /* 2C10C 80050D0C 0200202D */ daddu $a0, $s0, $zero /* 2C110 80050D10 2402007F */ addiu $v0, $zero, 0x7f diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050E18.s b/asm/nonmatchings/code_28910_len_5090/func_80050E18.s index 7df5c27e25..e6fd996388 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050E18.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050E18.s @@ -13,10 +13,10 @@ glabel func_80050E18 /* 2C238 80050E38 00621821 */ addu $v1, $v1, $v0 /* 2C23C 80050E3C 8C620004 */ lw $v0, 4($v1) /* 2C240 80050E40 1040000E */ beqz $v0, .L80050E7C -/* 2C244 80050E44 00000000 */ nop +/* 2C244 80050E44 00000000 */ nop /* 2C248 80050E48 8C620008 */ lw $v0, 8($v1) /* 2C24C 80050E4C 1040000B */ beqz $v0, .L80050E7C -/* 2C250 80050E50 00000000 */ nop +/* 2C250 80050E50 00000000 */ nop /* 2C254 80050E54 10A00008 */ beqz $a1, .L80050E78 /* 2C258 80050E58 24020003 */ addiu $v0, $zero, 3 /* 2C25C 80050E5C 240200FF */ addiu $v0, $zero, 0xff @@ -30,4 +30,4 @@ glabel func_80050E18 /* 2C278 80050E78 A0620024 */ sb $v0, 0x24($v1) .L80050E7C: /* 2C27C 80050E7C 03E00008 */ jr $ra -/* 2C280 80050E80 00000000 */ nop +/* 2C280 80050E80 00000000 */ nop diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050E84.s b/asm/nonmatchings/code_28910_len_5090/func_80050E84.s index 6c0991e65b..75f1b02c0f 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050E84.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050E84.s @@ -13,7 +13,7 @@ glabel func_80050E84 /* 2C2A4 80050EA4 00621821 */ addu $v1, $v1, $v0 /* 2C2A8 80050EA8 8C620004 */ lw $v0, 4($v1) /* 2C2AC 80050EAC 1040000E */ beqz $v0, .L80050EE8 -/* 2C2B0 80050EB0 00000000 */ nop +/* 2C2B0 80050EB0 00000000 */ nop /* 2C2B4 80050EB4 8C620008 */ lw $v0, 8($v1) /* 2C2B8 80050EB8 1040000B */ beqz $v0, .L80050EE8 /* 2C2BC 80050EBC 24020001 */ addiu $v0, $zero, 1 @@ -31,4 +31,4 @@ glabel func_80050E84 /* 2C2E4 80050EE4 A0600026 */ sb $zero, 0x26($v1) .L80050EE8: /* 2C2E8 80050EE8 03E00008 */ jr $ra -/* 2C2EC 80050EEC 00000000 */ nop +/* 2C2EC 80050EEC 00000000 */ nop diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050F64.s b/asm/nonmatchings/code_28910_len_5090/func_80050F64.s index d4ead3c231..b33439e0f0 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050F64.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050F64.s @@ -13,10 +13,10 @@ glabel func_80050F64 /* 2C384 80050F84 00621821 */ addu $v1, $v1, $v0 /* 2C388 80050F88 8C620004 */ lw $v0, 4($v1) /* 2C38C 80050F8C 1040000E */ beqz $v0, .L80050FC8 -/* 2C390 80050F90 00000000 */ nop +/* 2C390 80050F90 00000000 */ nop /* 2C394 80050F94 8C620008 */ lw $v0, 8($v1) /* 2C398 80050F98 1040000B */ beqz $v0, .L80050FC8 -/* 2C39C 80050F9C 00000000 */ nop +/* 2C39C 80050F9C 00000000 */ nop /* 2C3A0 80050FA0 10A00003 */ beqz $a1, .L80050FB0 /* 2C3A4 80050FA4 240200FA */ addiu $v0, $zero, 0xfa /* 2C3A8 80050FA8 080143ED */ j .L80050FB4 @@ -31,4 +31,4 @@ glabel func_80050F64 /* 2C3C4 80050FC4 A0620026 */ sb $v0, 0x26($v1) .L80050FC8: /* 2C3C8 80050FC8 03E00008 */ jr $ra -/* 2C3CC 80050FCC 00000000 */ nop +/* 2C3CC 80050FCC 00000000 */ nop diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050FD0.s b/asm/nonmatchings/code_28910_len_5090/func_80050FD0.s index aff3a5b105..50ea0d38f7 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050FD0.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050FD0.s @@ -13,10 +13,10 @@ glabel func_80050FD0 /* 2C3F0 80050FF0 00621821 */ addu $v1, $v1, $v0 /* 2C3F4 80050FF4 8C620004 */ lw $v0, 4($v1) /* 2C3F8 80050FF8 10400013 */ beqz $v0, .L80051048 -/* 2C3FC 80050FFC 00000000 */ nop +/* 2C3FC 80050FFC 00000000 */ nop /* 2C400 80051000 8C620008 */ lw $v0, 8($v1) /* 2C404 80051004 10400010 */ beqz $v0, .L80051048 -/* 2C408 80051008 00000000 */ nop +/* 2C408 80051008 00000000 */ nop /* 2C40C 8005100C 1CC00003 */ bgtz $a2, .L8005101C /* 2C410 80051010 28C20080 */ slti $v0, $a2, 0x80 /* 2C414 80051014 08014409 */ j .L80051024 @@ -38,4 +38,4 @@ glabel func_80050FD0 /* 2C444 80051044 A0600026 */ sb $zero, 0x26($v1) .L80051048: /* 2C448 80051048 03E00008 */ jr $ra -/* 2C44C 8005104C 00000000 */ nop +/* 2C44C 8005104C 00000000 */ nop diff --git a/asm/nonmatchings/code_28910_len_5090/func_80051334.s b/asm/nonmatchings/code_28910_len_5090/func_80051334.s index b304f46d83..36dae0e8ac 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80051334.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80051334.s @@ -5,7 +5,7 @@ glabel func_80051334 /* 2C734 80051334 8CA30000 */ lw $v1, ($a1) /* 2C738 80051338 9067000D */ lbu $a3, 0xd($v1) /* 2C73C 8005133C 10E0003B */ beqz $a3, .L8005142C -/* 2C740 80051340 00000000 */ nop +/* 2C740 80051340 00000000 */ nop /* 2C744 80051344 9462000E */ lhu $v0, 0xe($v1) /* 2C748 80051348 10400038 */ beqz $v0, .L8005142C /* 2C74C 8005134C 24E7FFFF */ addiu $a3, $a3, -1 @@ -34,7 +34,7 @@ glabel func_80051334 /* 2C7A0 800513A0 14610004 */ bne $v1, $at, .L800513B4 /* 2C7A4 800513A4 3C018000 */ lui $at, 0x8000 /* 2C7A8 800513A8 14410002 */ bne $v0, $at, .L800513B4 -/* 2C7AC 800513AC 00000000 */ nop +/* 2C7AC 800513AC 00000000 */ nop /* 2C7B0 800513B0 0006000D */ break 6 .L800513B4: /* 2C7B4 800513B4 00001012 */ mflo $v0 @@ -58,7 +58,7 @@ glabel func_80051334 /* 2C7F4 800513F4 14610004 */ bne $v1, $at, .L80051408 /* 2C7F8 800513F8 3C018000 */ lui $at, 0x8000 /* 2C7FC 800513FC 14410002 */ bne $v0, $at, .L80051408 -/* 2C800 80051400 00000000 */ nop +/* 2C800 80051400 00000000 */ nop /* 2C804 80051404 0006000D */ break 6 .L80051408: /* 2C808 80051408 00001012 */ mflo $v0 @@ -74,4 +74,4 @@ glabel func_80051334 /* 2C828 80051428 24E7FFFF */ addiu $a3, $a3, -1 .L8005142C: /* 2C82C 8005142C 03E00008 */ jr $ra -/* 2C830 80051430 00000000 */ nop +/* 2C830 80051430 00000000 */ nop diff --git a/asm/nonmatchings/code_28910_len_5090/func_80051434.s b/asm/nonmatchings/code_28910_len_5090/func_80051434.s index 09d68774f4..029e68fdef 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80051434.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80051434.s @@ -32,7 +32,7 @@ glabel func_80051434 /* 2C89C 8005149C 92A20043 */ lbu $v0, 0x43($s5) /* 2C8A0 800514A0 24100001 */ addiu $s0, $zero, 1 /* 2C8A4 800514A4 14500005 */ bne $v0, $s0, .L800514BC -/* 2C8A8 800514A8 00000000 */ nop +/* 2C8A8 800514A8 00000000 */ nop /* 2C8AC 800514AC 8FA40070 */ lw $a0, 0x70($sp) /* 2C8B0 800514B0 0C01487A */ jal func_800521E8 /* 2C8B4 800514B4 02A0282D */ daddu $a1, $s5, $zero @@ -69,7 +69,7 @@ glabel func_80051434 /* 2C928 80051528 0C01487A */ jal func_800521E8 /* 2C92C 8005152C AEA00020 */ sw $zero, 0x20($s5) /* 2C930 80051530 0801482F */ j .L800520BC -/* 2C934 80051534 00000000 */ nop +/* 2C934 80051534 00000000 */ nop .L80051538: /* 2C938 80051538 14620004 */ bne $v1, $v0, .L8005154C /* 2C93C 8005153C 24080001 */ addiu $t0, $zero, 1 @@ -93,7 +93,7 @@ glabel func_80051434 /* 2C974 80051574 A6620014 */ sh $v0, 0x14($s3) /* 2C978 80051578 00021400 */ sll $v0, $v0, 0x10 /* 2C97C 8005157C 10400005 */ beqz $v0, .L80051594 -/* 2C980 80051580 00000000 */ nop +/* 2C980 80051580 00000000 */ nop /* 2C984 80051584 8E62000C */ lw $v0, 0xc($s3) /* 2C988 80051588 8E630010 */ lw $v1, 0x10($s3) /* 2C98C 8005158C 08014567 */ j .L8005159C @@ -125,7 +125,7 @@ glabel func_80051434 /* 2C9E8 800515E8 3C08FFFF */ lui $t0, 0xffff /* 2C9EC 800515EC 00481024 */ and $v0, $v0, $t0 /* 2C9F0 800515F0 1457001C */ bne $v0, $s7, .L80051664 -/* 2C9F4 800515F4 00000000 */ nop +/* 2C9F4 800515F4 00000000 */ nop /* 2C9F8 800515F8 8FA80030 */ lw $t0, 0x30($sp) /* 2C9FC 800515FC 01148821 */ addu $s1, $t0, $s4 /* 2CA00 80051600 8FA80070 */ lw $t0, 0x70($sp) @@ -134,7 +134,7 @@ glabel func_80051434 /* 2CA0C 8005160C 14620015 */ bne $v1, $v0, .L80051664 /* 2CA10 80051610 24080009 */ addiu $t0, $zero, 9 /* 2CA14 80051614 12C80013 */ beq $s6, $t0, .L80051664 -/* 2CA18 80051618 00000000 */ nop +/* 2CA18 80051618 00000000 */ nop /* 2CA1C 8005161C 86420004 */ lh $v0, 4($s2) /* 2CA20 80051620 8664000C */ lh $a0, 0xc($s3) /* 2CA24 80051624 0C014E3E */ jal func_800538F8 @@ -142,7 +142,7 @@ glabel func_80051434 /* 2CA2C 8005162C 8E620000 */ lw $v0, ($s3) /* 2CA30 80051630 C4420020 */ lwc1 $f2, 0x20($v0) /* 2CA34 80051634 46020002 */ mul.s $f0, $f0, $f2 -/* 2CA38 80051638 00000000 */ nop +/* 2CA38 80051638 00000000 */ nop /* 2CA3C 8005163C 92220043 */ lbu $v0, 0x43($s1) /* 2CA40 80051640 34420008 */ ori $v0, $v0, 8 /* 2CA44 80051644 A2220043 */ sb $v0, 0x43($s1) @@ -176,7 +176,7 @@ glabel func_80051434 /* 2CAA8 800516A8 A6620020 */ sh $v0, 0x20($s3) /* 2CAAC 800516AC 00021400 */ sll $v0, $v0, 0x10 /* 2CAB0 800516B0 10400005 */ beqz $v0, .L800516C8 -/* 2CAB4 800516B4 00000000 */ nop +/* 2CAB4 800516B4 00000000 */ nop /* 2CAB8 800516B8 8E620018 */ lw $v0, 0x18($s3) /* 2CABC 800516BC 8E63001C */ lw $v1, 0x1c($s3) /* 2CAC0 800516C0 080145B4 */ j .L800516D0 @@ -207,14 +207,14 @@ glabel func_80051434 /* 2CB18 80051718 8E420000 */ lw $v0, ($s2) /* 2CB1C 8005171C 00461024 */ and $v0, $v0, $a2 /* 2CB20 80051720 1457001A */ bne $v0, $s7, .L8005178C -/* 2CB24 80051724 00000000 */ nop +/* 2CB24 80051724 00000000 */ nop /* 2CB28 80051728 8FA80030 */ lw $t0, 0x30($sp) /* 2CB2C 8005172C 01048821 */ addu $s1, $t0, $a0 /* 2CB30 80051730 8FA80070 */ lw $t0, 0x70($sp) /* 2CB34 80051734 92230045 */ lbu $v1, 0x45($s1) /* 2CB38 80051738 91020022 */ lbu $v0, 0x22($t0) /* 2CB3C 8005173C 14620013 */ bne $v1, $v0, .L8005178C -/* 2CB40 80051740 00000000 */ nop +/* 2CB40 80051740 00000000 */ nop /* 2CB44 80051744 92430001 */ lbu $v1, 1($s2) /* 2CB48 80051748 00031080 */ sll $v0, $v1, 2 /* 2CB4C 8005174C 00431021 */ addu $v0, $v0, $v1 @@ -225,7 +225,7 @@ glabel func_80051434 /* 2CB60 80051760 00620018 */ mult $v1, $v0 /* 2CB64 80051764 00004012 */ mflo $t0 /* 2CB68 80051768 82420006 */ lb $v0, 6($s2) -/* 2CB6C 8005176C 00000000 */ nop +/* 2CB6C 8005176C 00000000 */ nop /* 2CB70 80051770 01020018 */ mult $t0, $v0 /* 2CB74 80051774 9222003D */ lbu $v0, 0x3d($s1) /* 2CB78 80051778 34420020 */ ori $v0, $v0, 0x20 @@ -249,7 +249,7 @@ glabel func_80051434 /* 2CBB8 800517B8 1C400240 */ bgtz $v0, .L800520BC /* 2CBBC 800517BC AEA20018 */ sw $v0, 0x18($s5) /* 2CBC0 800517C0 1440023E */ bnez $v0, .L800520BC -/* 2CBC4 800517C4 00000000 */ nop +/* 2CBC4 800517C4 00000000 */ nop /* 2CBC8 800517C8 241E0001 */ addiu $fp, $zero, 1 /* 2CBCC 800517CC 27A80010 */ addiu $t0, $sp, 0x10 /* 2CBD0 800517D0 AFA80040 */ sw $t0, 0x40($sp) @@ -296,15 +296,15 @@ glabel func_80051434 /* 2CC6C 8005186C 10400005 */ beqz $v0, .L80051884 /* 2CC70 80051870 24020080 */ addiu $v0, $zero, 0x80 /* 2CC74 80051874 10620011 */ beq $v1, $v0, .L800518BC -/* 2CC78 80051878 00000000 */ nop +/* 2CC78 80051878 00000000 */ nop /* 2CC7C 8005187C 0801482C */ j .L800520B0 -/* 2CC80 80051880 00000000 */ nop +/* 2CC80 80051880 00000000 */ nop .L80051884: /* 2CC84 80051884 240200A0 */ addiu $v0, $zero, 0xa0 /* 2CC88 80051888 10620111 */ beq $v1, $v0, .L80051CD0 /* 2CC8C 8005188C 32E20080 */ andi $v0, $s7, 0x80 /* 2CC90 80051890 0801482C */ j .L800520B0 -/* 2CC94 80051894 00000000 */ nop +/* 2CC94 80051894 00000000 */ nop .L80051898: /* 2CC98 80051898 240200E0 */ addiu $v0, $zero, 0xe0 /* 2CC9C 8005189C 106201C8 */ beq $v1, $v0, .L80051FC0 @@ -312,9 +312,9 @@ glabel func_80051434 /* 2CCA4 800518A4 10400202 */ beqz $v0, .L800520B0 /* 2CCA8 800518A8 240200C0 */ addiu $v0, $zero, 0xc0 /* 2CCAC 800518AC 106201B7 */ beq $v1, $v0, .L80051F8C -/* 2CCB0 800518B0 00000000 */ nop +/* 2CCB0 800518B0 00000000 */ nop /* 2CCB4 800518B4 0801482C */ j .L800520B0 -/* 2CCB8 800518B8 00000000 */ nop +/* 2CCB8 800518B8 00000000 */ nop .L800518BC: /* 2CCBC 800518BC 92A20025 */ lbu $v0, 0x25($s5) /* 2CCC0 800518C0 144001FB */ bnez $v0, .L800520B0 @@ -340,7 +340,7 @@ glabel func_80051434 /* 2CD0C 8005190C 01021821 */ addu $v1, $t0, $v0 /* 2CD10 80051910 8C6207B4 */ lw $v0, 0x7b4($v1) /* 2CD14 80051914 1457000C */ bne $v0, $s7, .L80051948 -/* 2CD18 80051918 00000000 */ nop +/* 2CD18 80051918 00000000 */ nop /* 2CD1C 8005191C 8FA80030 */ lw $t0, 0x30($sp) /* 2CD20 80051920 A07E07B7 */ sb $fp, 0x7b7($v1) /* 2CD24 80051924 01048821 */ addu $s1, $t0, $a0 @@ -348,7 +348,7 @@ glabel func_80051434 /* 2CD2C 8005192C 92230045 */ lbu $v1, 0x45($s1) /* 2CD30 80051930 91020022 */ lbu $v0, 0x22($t0) /* 2CD34 80051934 14620004 */ bne $v1, $v0, .L80051948 -/* 2CD38 80051938 00000000 */ nop +/* 2CD38 80051938 00000000 */ nop /* 2CD3C 8005193C 9222003D */ lbu $v0, 0x3d($s1) /* 2CD40 80051940 34420010 */ ori $v0, $v0, 0x10 /* 2CD44 80051944 A222003D */ sb $v0, 0x3d($s1) @@ -359,17 +359,17 @@ glabel func_80051434 /* 2CD54 80051954 1440FFE9 */ bnez $v0, .L800518FC /* 2CD58 80051958 24840048 */ addiu $a0, $a0, 0x48 /* 2CD5C 8005195C 0801482C */ j .L800520B0 -/* 2CD60 80051960 00000000 */ nop +/* 2CD60 80051960 00000000 */ nop .L80051964: /* 2CD64 80051964 0C014E31 */ jal func_800538C4 /* 2CD68 80051968 320500FF */ andi $a1, $s0, 0xff /* 2CD6C 8005196C 0801468F */ j .L80051A3C -/* 2CD70 80051970 00000000 */ nop +/* 2CD70 80051970 00000000 */ nop .L80051974: /* 2CD74 80051974 0C014E31 */ jal func_800538C4 /* 2CD78 80051978 320500FF */ andi $a1, $s0, 0xff /* 2CD7C 8005197C 080146A8 */ j .L80051AA0 -/* 2CD80 80051980 00000000 */ nop +/* 2CD80 80051980 00000000 */ nop .L80051984: /* 2CD84 80051984 0C014874 */ jal func_800521D0 /* 2CD88 80051988 02A0202D */ daddu $a0, $s5, $zero @@ -389,7 +389,7 @@ glabel func_80051434 /* 2CDBC 800519BC 01038821 */ addu $s1, $t0, $v1 /* 2CDC0 800519C0 92220045 */ lbu $v0, 0x45($s1) /* 2CDC4 800519C4 10400005 */ beqz $v0, .L800519DC -/* 2CDC8 800519C8 00000000 */ nop +/* 2CDC8 800519C8 00000000 */ nop /* 2CDCC 800519CC 26100001 */ addiu $s0, $s0, 1 /* 2CDD0 800519D0 0204102B */ sltu $v0, $s0, $a0 /* 2CDD4 800519D4 1440FFF9 */ bnez $v0, .L800519BC @@ -398,7 +398,7 @@ glabel func_80051434 /* 2CDDC 800519DC 8EA20034 */ lw $v0, 0x34($s5) /* 2CDE0 800519E0 0202102B */ sltu $v0, $s0, $v0 /* 2CDE4 800519E4 14400032 */ bnez $v0, .L80051AB0 -/* 2CDE8 800519E8 00000000 */ nop +/* 2CDE8 800519E8 00000000 */ nop /* 2CDEC 800519EC 8EB00030 */ lw $s0, 0x30($s5) .L800519F0: /* 2CDF0 800519F0 8EA30034 */ lw $v1, 0x34($s5) @@ -425,7 +425,7 @@ glabel func_80051434 /* 2CE3C 80051A3C 8EA20034 */ lw $v0, 0x34($s5) /* 2CE40 80051A40 0202102B */ sltu $v0, $s0, $v0 /* 2CE44 80051A44 1440001A */ bnez $v0, .L80051AB0 -/* 2CE48 80051A48 00000000 */ nop +/* 2CE48 80051A48 00000000 */ nop .L80051A4C: /* 2CE4C 80051A4C 8EB00030 */ lw $s0, 0x30($s5) /* 2CE50 80051A50 8EA30034 */ lw $v1, 0x34($s5) @@ -453,7 +453,7 @@ glabel func_80051434 /* 2CEA0 80051AA0 8EA20034 */ lw $v0, 0x34($s5) /* 2CEA4 80051AA4 0202102B */ sltu $v0, $s0, $v0 /* 2CEA8 80051AA8 10400181 */ beqz $v0, .L800520B0 -/* 2CEAC 80051AAC 00000000 */ nop +/* 2CEAC 80051AAC 00000000 */ nop .L80051AB0: /* 2CEB0 80051AB0 8EA20030 */ lw $v0, 0x30($s5) /* 2CEB4 80051AB4 8FA80040 */ lw $t0, 0x40($sp) @@ -509,8 +509,8 @@ glabel func_80051434 /* 2CF74 80051B74 86620018 */ lh $v0, 0x18($s3) /* 2CF78 80051B78 00620018 */ mult $v1, $v0 /* 2CF7C 80051B7C 00004012 */ mflo $t0 -/* 2CF80 80051B80 00000000 */ nop -/* 2CF84 80051B84 00000000 */ nop +/* 2CF80 80051B80 00000000 */ nop +/* 2CF84 80051B84 00000000 */ nop /* 2CF88 80051B88 01040018 */ mult $t0, $a0 /* 2CF8C 80051B8C 00004012 */ mflo $t0 /* 2CF90 80051B90 00081383 */ sra $v0, $t0, 0xe @@ -522,7 +522,7 @@ glabel func_80051434 /* 2CFA8 80051BA8 8E620000 */ lw $v0, ($s3) /* 2CFAC 80051BAC C4420020 */ lwc1 $f2, 0x20($v0) /* 2CFB0 80051BB0 46020002 */ mul.s $f0, $f0, $f2 -/* 2CFB4 80051BB4 00000000 */ nop +/* 2CFB4 80051BB4 00000000 */ nop /* 2CFB8 80051BB8 E6200004 */ swc1 $f0, 4($s1) /* 2CFBC 80051BBC 92620024 */ lbu $v0, 0x24($s3) /* 2CFC0 80051BC0 A222000E */ sb $v0, 0xe($s1) @@ -578,7 +578,7 @@ glabel func_80051434 /* 2D084 80051C84 8E220000 */ lw $v0, ($s1) /* 2D088 80051C88 C4420020 */ lwc1 $f2, 0x20($v0) /* 2D08C 80051C8C 46020002 */ mul.s $f0, $f0, $f2 -/* 2D090 80051C90 00000000 */ nop +/* 2D090 80051C90 00000000 */ nop /* 2D094 80051C94 E6200004 */ swc1 $f0, 4($s1) /* 2D098 80051C98 92020005 */ lbu $v0, 5($s0) /* 2D09C 80051C9C A222000E */ sb $v0, 0xe($s1) @@ -620,7 +620,7 @@ glabel func_80051434 /* 2D120 80051D20 3C08FFFF */ lui $t0, 0xffff /* 2D124 80051D24 00481024 */ and $v0, $v0, $t0 /* 2D128 80051D28 1457000F */ bne $v0, $s7, .L80051D68 -/* 2D12C 80051D2C 00000000 */ nop +/* 2D12C 80051D2C 00000000 */ nop /* 2D130 80051D30 8FA80030 */ lw $t0, 0x30($sp) /* 2D134 80051D34 01048821 */ addu $s1, $t0, $a0 /* 2D138 80051D38 8FA80070 */ lw $t0, 0x70($sp) @@ -629,7 +629,7 @@ glabel func_80051434 /* 2D144 80051D44 14620008 */ bne $v1, $v0, .L80051D68 /* 2D148 80051D48 24080009 */ addiu $t0, $zero, 9 /* 2D14C 80051D4C 12C80006 */ beq $s6, $t0, .L80051D68 -/* 2D150 80051D50 00000000 */ nop +/* 2D150 80051D50 00000000 */ nop /* 2D154 80051D54 92220043 */ lbu $v0, 0x43($s1) /* 2D158 80051D58 92630024 */ lbu $v1, 0x24($s3) /* 2D15C 80051D5C 34420010 */ ori $v0, $v0, 0x10 @@ -642,7 +642,7 @@ glabel func_80051434 /* 2D174 80051D74 1440FFE4 */ bnez $v0, .L80051D08 /* 2D178 80051D78 24840048 */ addiu $a0, $a0, 0x48 /* 2D17C 80051D7C 0801482C */ j .L800520B0 -/* 2D180 80051D80 00000000 */ nop +/* 2D180 80051D80 00000000 */ nop .L80051D84: /* 2D184 80051D84 00171E00 */ sll $v1, $s7, 0x18 /* 2D188 80051D88 10600005 */ beqz $v1, .L80051DA0 @@ -674,20 +674,20 @@ glabel func_80051434 /* 2D1E8 80051DE8 3C08FFFF */ lui $t0, 0xffff /* 2D1EC 80051DEC 00481024 */ and $v0, $v0, $t0 /* 2D1F0 80051DF0 14570020 */ bne $v0, $s7, .L80051E74 -/* 2D1F4 80051DF4 00000000 */ nop +/* 2D1F4 80051DF4 00000000 */ nop /* 2D1F8 80051DF8 8FA80030 */ lw $t0, 0x30($sp) /* 2D1FC 80051DFC 01048821 */ addu $s1, $t0, $a0 /* 2D200 80051E00 8FA80070 */ lw $t0, 0x70($sp) /* 2D204 80051E04 92230045 */ lbu $v1, 0x45($s1) /* 2D208 80051E08 91020022 */ lbu $v0, 0x22($t0) /* 2D20C 80051E0C 14620019 */ bne $v1, $v0, .L80051E74 -/* 2D210 80051E10 00000000 */ nop +/* 2D210 80051E10 00000000 */ nop /* 2D214 80051E14 82A30038 */ lb $v1, 0x38($s5) /* 2D218 80051E18 86620018 */ lh $v0, 0x18($s3) /* 2D21C 80051E1C 00620018 */ mult $v1, $v0 /* 2D220 80051E20 00004012 */ mflo $t0 /* 2D224 80051E24 82420006 */ lb $v0, 6($s2) -/* 2D228 80051E28 00000000 */ nop +/* 2D228 80051E28 00000000 */ nop /* 2D22C 80051E2C 01020018 */ mult $t0, $v0 /* 2D230 80051E30 00004012 */ mflo $t0 /* 2D234 80051E34 00081383 */ sra $v0, $t0, 0xe @@ -698,7 +698,7 @@ glabel func_80051434 /* 2D248 80051E48 01021021 */ addu $v0, $t0, $v0 /* 2D24C 80051E4C 90420000 */ lbu $v0, ($v0) /* 2D250 80051E50 14400008 */ bnez $v0, .L80051E74 -/* 2D254 80051E54 00000000 */ nop +/* 2D254 80051E54 00000000 */ nop /* 2D258 80051E58 9222003D */ lbu $v0, 0x3d($s1) /* 2D25C 80051E5C 34420020 */ ori $v0, $v0, 0x20 /* 2D260 80051E60 A222003D */ sb $v0, 0x3d($s1) @@ -713,7 +713,7 @@ glabel func_80051434 /* 2D280 80051E80 1440FFD2 */ bnez $v0, .L80051DCC /* 2D284 80051E84 24840048 */ addiu $a0, $a0, 0x48 /* 2D288 80051E88 0801482C */ j .L800520B0 -/* 2D28C 80051E8C 00000000 */ nop +/* 2D28C 80051E8C 00000000 */ nop .L80051E90: /* 2D290 80051E90 0C014874 */ jal func_800521D0 /* 2D294 80051E94 02A0202D */ daddu $a0, $s5, $zero @@ -727,7 +727,7 @@ glabel func_80051434 /* 2D2B4 80051EB4 1062000A */ beq $v1, $v0, .L80051EE0 /* 2D2B8 80051EB8 32820001 */ andi $v0, $s4, 1 /* 2D2BC 80051EBC 0801482C */ j .L800520B0 -/* 2D2C0 80051EC0 00000000 */ nop +/* 2D2C0 80051EC0 00000000 */ nop .L80051EC4: /* 2D2C4 80051EC4 24020068 */ addiu $v0, $zero, 0x68 /* 2D2C8 80051EC8 10620027 */ beq $v1, $v0, .L80051F68 @@ -735,7 +735,7 @@ glabel func_80051434 /* 2D2D0 80051ED0 10620027 */ beq $v1, $v0, .L80051F70 /* 2D2D4 80051ED4 328300FF */ andi $v1, $s4, 0xff /* 2D2D8 80051ED8 0801482C */ j .L800520B0 -/* 2D2DC 80051EDC 00000000 */ nop +/* 2D2DC 80051EDC 00000000 */ nop .L80051EE0: /* 2D2E0 80051EE0 00021080 */ sll $v0, $v0, 2 /* 2D2E4 80051EE4 8EA30008 */ lw $v1, 8($s5) @@ -780,7 +780,7 @@ glabel func_80051434 .L80051F70: /* 2D370 80051F70 24020001 */ addiu $v0, $zero, 1 /* 2D374 80051F74 1462004E */ bne $v1, $v0, .L800520B0 -/* 2D378 80051F78 00000000 */ nop +/* 2D378 80051F78 00000000 */ nop /* 2D37C 80051F7C 92620026 */ lbu $v0, 0x26($s3) /* 2D380 80051F80 34420001 */ ori $v0, $v0, 1 /* 2D384 80051F84 0801482C */ j .L800520B0 @@ -829,7 +829,7 @@ glabel func_80051434 /* 2D424 80052024 3C08FFFF */ lui $t0, 0xffff /* 2D428 80052028 00481024 */ and $v0, $v0, $t0 /* 2D42C 8005202C 1457001B */ bne $v0, $s7, .L8005209C -/* 2D430 80052030 00000000 */ nop +/* 2D430 80052030 00000000 */ nop /* 2D434 80052034 8FA80030 */ lw $t0, 0x30($sp) /* 2D438 80052038 01148821 */ addu $s1, $t0, $s4 /* 2D43C 8005203C 8FA80070 */ lw $t0, 0x70($sp) @@ -838,7 +838,7 @@ glabel func_80051434 /* 2D448 80052048 14620014 */ bne $v1, $v0, .L8005209C /* 2D44C 8005204C 24080009 */ addiu $t0, $zero, 9 /* 2D450 80052050 12C80012 */ beq $s6, $t0, .L8005209C -/* 2D454 80052054 00000000 */ nop +/* 2D454 80052054 00000000 */ nop /* 2D458 80052058 86420004 */ lh $v0, 4($s2) /* 2D45C 8005205C 8664000C */ lh $a0, 0xc($s3) /* 2D460 80052060 0C014E3E */ jal func_800538F8 @@ -846,7 +846,7 @@ glabel func_80051434 /* 2D468 80052068 8E620000 */ lw $v0, ($s3) /* 2D46C 8005206C C4420020 */ lwc1 $f2, 0x20($v0) /* 2D470 80052070 46020002 */ mul.s $f0, $f0, $f2 -/* 2D474 80052074 00000000 */ nop +/* 2D474 80052074 00000000 */ nop /* 2D478 80052078 92220043 */ lbu $v0, 0x43($s1) /* 2D47C 8005207C 34420008 */ ori $v0, $v0, 8 /* 2D480 80052080 A2220043 */ sb $v0, 0x43($s1) @@ -865,11 +865,11 @@ glabel func_80051434 .L800520B0: /* 2D4B0 800520B0 8EA20018 */ lw $v0, 0x18($s5) /* 2D4B4 800520B4 1040FDC9 */ beqz $v0, .L800517DC -/* 2D4B8 800520B8 00000000 */ nop +/* 2D4B8 800520B8 00000000 */ nop .L800520BC: /* 2D4BC 800520BC 93A20034 */ lbu $v0, 0x34($sp) /* 2D4C0 800520C0 10400037 */ beqz $v0, .L800521A0 -/* 2D4C4 800520C4 00000000 */ nop +/* 2D4C4 800520C4 00000000 */ nop /* 2D4C8 800520C8 8EB00030 */ lw $s0, 0x30($s5) /* 2D4CC 800520CC 8EA20034 */ lw $v0, 0x34($s5) /* 2D4D0 800520D0 0202102B */ sltu $v0, $s0, $v0 @@ -891,7 +891,7 @@ glabel func_80051434 /* 2D50C 8005210C 8EA30014 */ lw $v1, 0x14($s5) /* 2D510 80052110 00471024 */ and $v0, $v0, $a3 /* 2D514 80052114 1443001D */ bne $v0, $v1, .L8005218C -/* 2D518 80052118 00000000 */ nop +/* 2D518 80052118 00000000 */ nop /* 2D51C 8005211C 8FA80030 */ lw $t0, 0x30($sp) /* 2D520 80052120 01058821 */ addu $s1, $t0, $a1 /* 2D524 80052124 8FA80070 */ lw $t0, 0x70($sp) @@ -901,7 +901,7 @@ glabel func_80051434 /* 2D534 80052134 00C41021 */ addu $v0, $a2, $a0 /* 2D538 80052138 90420000 */ lbu $v0, ($v0) /* 2D53C 8005213C 14400013 */ bnez $v0, .L8005218C -/* 2D540 80052140 00000000 */ nop +/* 2D540 80052140 00000000 */ nop /* 2D544 80052144 92430001 */ lbu $v1, 1($s2) /* 2D548 80052148 00031080 */ sll $v0, $v1, 2 /* 2D54C 8005214C 00431021 */ addu $v0, $v0, $v1 @@ -912,7 +912,7 @@ glabel func_80051434 /* 2D560 80052160 00620018 */ mult $v1, $v0 /* 2D564 80052164 00004012 */ mflo $t0 /* 2D568 80052168 82420006 */ lb $v0, 6($s2) -/* 2D56C 8005216C 00000000 */ nop +/* 2D56C 8005216C 00000000 */ nop /* 2D570 80052170 01020018 */ mult $t0, $v0 /* 2D574 80052174 9222003D */ lbu $v0, 0x3d($s1) /* 2D578 80052178 34420020 */ ori $v0, $v0, 0x20 diff --git a/asm/nonmatchings/code_28910_len_5090/func_800521E8.s b/asm/nonmatchings/code_28910_len_5090/func_800521E8.s index 6ec23fd17f..1ae6b9b813 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_800521E8.s +++ b/asm/nonmatchings/code_28910_len_5090/func_800521E8.s @@ -28,7 +28,7 @@ glabel func_800521E8 /* 2D640 80052240 92230000 */ lbu $v1, ($s1) /* 2D644 80052244 92620014 */ lbu $v0, 0x14($s3) /* 2D648 80052248 1462000A */ bne $v1, $v0, .L80052274 -/* 2D64C 8005224C 00000000 */ nop +/* 2D64C 8005224C 00000000 */ nop /* 2D650 80052250 8E820000 */ lw $v0, ($s4) /* 2D654 80052254 00522021 */ addu $a0, $v0, $s2 /* 2D658 80052258 90830045 */ lbu $v1, 0x45($a0) diff --git a/asm/nonmatchings/code_28910_len_5090/func_800522A8.s b/asm/nonmatchings/code_28910_len_5090/func_800522A8.s index 796ef3837b..8b439539a9 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_800522A8.s +++ b/asm/nonmatchings/code_28910_len_5090/func_800522A8.s @@ -17,7 +17,7 @@ glabel func_800522A8 /* 2D6D4 800522D4 00821821 */ addu $v1, $a0, $v0 /* 2D6D8 800522D8 90620007 */ lbu $v0, 7($v1) /* 2D6DC 800522DC 1040000C */ beqz $v0, .L80052310 -/* 2D6E0 800522E0 00000000 */ nop +/* 2D6E0 800522E0 00000000 */ nop /* 2D6E4 800522E4 90620001 */ lbu $v0, 1($v1) /* 2D6E8 800522E8 A1220000 */ sb $v0, ($t1) /* 2D6EC 800522EC 90620002 */ lbu $v0, 2($v1) @@ -34,7 +34,7 @@ glabel func_800522A8 /* 2D714 80052314 24E70001 */ addiu $a3, $a3, 1 /* 2D718 80052318 00E2102B */ sltu $v0, $a3, $v0 /* 2D71C 8005231C 1440FFE9 */ bnez $v0, .L800522C4 -/* 2D720 80052320 00000000 */ nop +/* 2D720 80052320 00000000 */ nop .L80052324: /* 2D724 80052324 03E00008 */ jr $ra -/* 2D728 80052328 00000000 */ nop +/* 2D728 80052328 00000000 */ nop diff --git a/asm/nonmatchings/code_2d9a0_len_890/func_80052660.s b/asm/nonmatchings/code_2d9a0_len_890/func_80052660.s index c822f4ad89..9ac92afc1a 100644 --- a/asm/nonmatchings/code_2d9a0_len_890/func_80052660.s +++ b/asm/nonmatchings/code_2d9a0_len_890/func_80052660.s @@ -45,10 +45,10 @@ glabel func_80052660 /* 2DAF8 800526F8 C602002C */ lwc1 $f2, 0x2c($s0) /* 2DAFC 800526FC 00441023 */ subu $v0, $v0, $a0 /* 2DB00 80052700 44820000 */ mtc1 $v0, $f0 -/* 2DB04 80052704 00000000 */ nop +/* 2DB04 80052704 00000000 */ nop /* 2DB08 80052708 46800020 */ cvt.s.w $f0, $f0 /* 2DB0C 8005270C 46001082 */ mul.s $f2, $f2, $f0 -/* 2DB10 80052710 00000000 */ nop +/* 2DB10 80052710 00000000 */ nop /* 2DB14 80052714 92020039 */ lbu $v0, 0x39($s0) /* 2DB18 80052718 4600110D */ trunc.w.s $f4, $f2 /* 2DB1C 8005271C 44032000 */ mfc1 $v1, $f4 @@ -93,11 +93,11 @@ glabel func_80052660 /* 2DBAC 800527AC 00621823 */ subu $v1, $v1, $v0 /* 2DBB0 800527B0 C602002C */ lwc1 $f2, 0x2c($s0) /* 2DBB4 800527B4 44830000 */ mtc1 $v1, $f0 -/* 2DBB8 800527B8 00000000 */ nop +/* 2DBB8 800527B8 00000000 */ nop /* 2DBBC 800527BC 46800020 */ cvt.s.w $f0, $f0 /* 2DBC0 800527C0 AE020028 */ sw $v0, 0x28($s0) /* 2DBC4 800527C4 46001082 */ mul.s $f2, $f2, $f0 -/* 2DBC8 800527C8 00000000 */ nop +/* 2DBC8 800527C8 00000000 */ nop /* 2DBCC 800527CC 9202003D */ lbu $v0, 0x3d($s0) /* 2DBD0 800527D0 92030039 */ lbu $v1, 0x39($s0) /* 2DBD4 800527D4 34420002 */ ori $v0, $v0, 2 @@ -113,7 +113,7 @@ glabel func_80052660 /* 2DBF4 800527F4 AE130008 */ sw $s3, 8($s0) .L800527F8: /* 2DBF8 800527F8 0C014AF0 */ jal func_80052BC0 -/* 2DBFC 800527FC 00000000 */ nop +/* 2DBFC 800527FC 00000000 */ nop /* 2DC00 80052800 9203003A */ lbu $v1, 0x3a($s0) /* 2DC04 80052804 AE020008 */ sw $v0, 8($s0) .L80052808: @@ -123,7 +123,7 @@ glabel func_80052660 /* 2DC14 80052814 00430018 */ mult $v0, $v1 /* 2DC18 80052818 00003012 */ mflo $a2 /* 2DC1C 8005281C 9202003F */ lbu $v0, 0x3f($s0) -/* 2DC20 80052820 00000000 */ nop +/* 2DC20 80052820 00000000 */ nop /* 2DC24 80052824 00C20018 */ mult $a2, $v0 /* 2DC28 80052828 00003012 */ mflo $a2 /* 2DC2C 8005282C 8E030030 */ lw $v1, 0x30($s0) @@ -144,7 +144,7 @@ glabel func_80052660 /* 2DC64 80052864 00620018 */ mult $v1, $v0 /* 2DC68 80052868 00003012 */ mflo $a2 /* 2DC6C 8005286C 9202003F */ lbu $v0, 0x3f($s0) -/* 2DC70 80052870 00000000 */ nop +/* 2DC70 80052870 00000000 */ nop /* 2DC74 80052874 00C20018 */ mult $a2, $v0 /* 2DC78 80052878 00003012 */ mflo $a2 /* 2DC7C 8005287C 8E030030 */ lw $v1, 0x30($s0) @@ -163,7 +163,7 @@ glabel func_80052660 /* 2DCAC 800528AC 90430000 */ lbu $v1, ($v0) /* 2DCB0 800528B0 240200FF */ addiu $v0, $zero, 0xff /* 2DCB4 800528B4 14620012 */ bne $v1, $v0, .L80052900 -/* 2DCB8 800528B8 00000000 */ nop +/* 2DCB8 800528B8 00000000 */ nop /* 2DCBC 800528BC 9202003D */ lbu $v0, 0x3d($s0) /* 2DCC0 800528C0 30420001 */ andi $v0, $v0, 1 /* 2DCC4 800528C4 10400005 */ beqz $v0, .L800528DC @@ -204,14 +204,14 @@ glabel func_80052660 /* 2DD48 80052948 9202003A */ lbu $v0, 0x3a($s0) /* 2DD4C 8005294C 92030039 */ lbu $v1, 0x39($s0) /* 2DD50 80052950 44821000 */ mtc1 $v0, $f2 -/* 2DD54 80052954 00000000 */ nop +/* 2DD54 80052954 00000000 */ nop /* 2DD58 80052958 468010A0 */ cvt.s.w $f2, $f2 /* 2DD5C 8005295C 44830000 */ mtc1 $v1, $f0 -/* 2DD60 80052960 00000000 */ nop +/* 2DD60 80052960 00000000 */ nop /* 2DD64 80052964 46800020 */ cvt.s.w $f0, $f0 /* 2DD68 80052968 46001081 */ sub.s $f2, $f2, $f0 /* 2DD6C 8005296C 44840000 */ mtc1 $a0, $f0 -/* 2DD70 80052970 00000000 */ nop +/* 2DD70 80052970 00000000 */ nop /* 2DD74 80052974 46800020 */ cvt.s.w $f0, $f0 /* 2DD78 80052978 46001083 */ div.s $f2, $f2, $f0 /* 2DD7C 8005297C 08014A62 */ j .L80052988 @@ -233,10 +233,10 @@ glabel func_80052660 /* 2DDB4 800529B4 AE020028 */ sw $v0, 0x28($s0) /* 2DDB8 800529B8 00621823 */ subu $v1, $v1, $v0 /* 2DDBC 800529BC 44830000 */ mtc1 $v1, $f0 -/* 2DDC0 800529C0 00000000 */ nop +/* 2DDC0 800529C0 00000000 */ nop /* 2DDC4 800529C4 46800020 */ cvt.s.w $f0, $f0 /* 2DDC8 800529C8 46001082 */ mul.s $f2, $f2, $f0 -/* 2DDCC 800529CC 00000000 */ nop +/* 2DDCC 800529CC 00000000 */ nop /* 2DDD0 800529D0 9202003D */ lbu $v0, 0x3d($s0) /* 2DDD4 800529D4 92030039 */ lbu $v1, 0x39($s0) /* 2DDD8 800529D8 34420002 */ ori $v0, $v0, 2 @@ -253,7 +253,7 @@ glabel func_80052660 .L800529FC: /* 2DDFC 800529FC 8E040024 */ lw $a0, 0x24($s0) /* 2DE00 80052A00 0C014AF0 */ jal func_80052BC0 -/* 2DE04 80052A04 00000000 */ nop +/* 2DE04 80052A04 00000000 */ nop /* 2DE08 80052A08 9203003A */ lbu $v1, 0x3a($s0) /* 2DE0C 80052A0C AE020008 */ sw $v0, 8($s0) .L80052A10: @@ -263,7 +263,7 @@ glabel func_80052660 /* 2DE1C 80052A1C 00430018 */ mult $v0, $v1 /* 2DE20 80052A20 00003012 */ mflo $a2 /* 2DE24 80052A24 9202003F */ lbu $v0, 0x3f($s0) -/* 2DE28 80052A28 00000000 */ nop +/* 2DE28 80052A28 00000000 */ nop /* 2DE2C 80052A2C 00C20018 */ mult $a2, $v0 /* 2DE30 80052A30 00003012 */ mflo $a2 /* 2DE34 80052A34 8E030030 */ lw $v1, 0x30($s0) @@ -288,10 +288,10 @@ glabel func_80052660 /* 2DE7C 80052A7C AE020028 */ sw $v0, 0x28($s0) /* 2DE80 80052A80 00621823 */ subu $v1, $v1, $v0 /* 2DE84 80052A84 44830000 */ mtc1 $v1, $f0 -/* 2DE88 80052A88 00000000 */ nop +/* 2DE88 80052A88 00000000 */ nop /* 2DE8C 80052A8C 46800020 */ cvt.s.w $f0, $f0 /* 2DE90 80052A90 46001082 */ mul.s $f2, $f2, $f0 -/* 2DE94 80052A94 00000000 */ nop +/* 2DE94 80052A94 00000000 */ nop /* 2DE98 80052A98 9202003D */ lbu $v0, 0x3d($s0) /* 2DE9C 80052A9C 92030039 */ lbu $v1, 0x39($s0) /* 2DEA0 80052AA0 34420002 */ ori $v0, $v0, 2 @@ -309,7 +309,7 @@ glabel func_80052660 /* 2DEC8 80052AC8 00430018 */ mult $v0, $v1 /* 2DECC 80052ACC 00003012 */ mflo $a2 /* 2DED0 80052AD0 9202003F */ lbu $v0, 0x3f($s0) -/* 2DED4 80052AD4 00000000 */ nop +/* 2DED4 80052AD4 00000000 */ nop /* 2DED8 80052AD8 00C20018 */ mult $a2, $v0 /* 2DEDC 80052ADC 00003012 */ mflo $a2 /* 2DEE0 80052AE0 8E030030 */ lw $v1, 0x30($s0) diff --git a/asm/nonmatchings/code_2d9a0_len_890/func_80052BF8.s b/asm/nonmatchings/code_2d9a0_len_890/func_80052BF8.s index 596c4b54d3..5727aa97e4 100644 --- a/asm/nonmatchings/code_2d9a0_len_890/func_80052BF8.s +++ b/asm/nonmatchings/code_2d9a0_len_890/func_80052BF8.s @@ -47,14 +47,14 @@ glabel func_80052BF8 /* 2E0A0 80052CA0 9202003A */ lbu $v0, 0x3a($s0) /* 2E0A4 80052CA4 92030039 */ lbu $v1, 0x39($s0) /* 2E0A8 80052CA8 44820000 */ mtc1 $v0, $f0 -/* 2E0AC 80052CAC 00000000 */ nop +/* 2E0AC 80052CAC 00000000 */ nop /* 2E0B0 80052CB0 46800020 */ cvt.s.w $f0, $f0 /* 2E0B4 80052CB4 44831000 */ mtc1 $v1, $f2 -/* 2E0B8 80052CB8 00000000 */ nop +/* 2E0B8 80052CB8 00000000 */ nop /* 2E0BC 80052CBC 468010A0 */ cvt.s.w $f2, $f2 /* 2E0C0 80052CC0 46020001 */ sub.s $f0, $f0, $f2 /* 2E0C4 80052CC4 44841000 */ mtc1 $a0, $f2 -/* 2E0C8 80052CC8 00000000 */ nop +/* 2E0C8 80052CC8 00000000 */ nop /* 2E0CC 80052CCC 468010A0 */ cvt.s.w $f2, $f2 /* 2E0D0 80052CD0 46020003 */ div.s $f0, $f0, $f2 /* 2E0D4 80052CD4 08014B38 */ j .L80052CE0 diff --git a/asm/nonmatchings/code_2d9a0_len_890/func_80052CFC.s b/asm/nonmatchings/code_2d9a0_len_890/func_80052CFC.s index c19b60bcad..ebe1437033 100644 --- a/asm/nonmatchings/code_2d9a0_len_890/func_80052CFC.s +++ b/asm/nonmatchings/code_2d9a0_len_890/func_80052CFC.s @@ -18,14 +18,14 @@ glabel func_80052CFC /* 2E12C 80052D2C 106A0023 */ beq $v1, $t2, .L80052DBC /* 2E130 80052D30 286200FD */ slti $v0, $v1, 0xfd /* 2E134 80052D34 10400005 */ beqz $v0, .L80052D4C -/* 2E138 80052D38 00000000 */ nop +/* 2E138 80052D38 00000000 */ nop /* 2E13C 80052D3C 10690025 */ beq $v1, $t1, .L80052DD4 /* 2E140 80052D40 24A20001 */ addiu $v0, $a1, 1 /* 2E144 80052D44 08014B80 */ j .L80052E00 -/* 2E148 80052D48 00000000 */ nop +/* 2E148 80052D48 00000000 */ nop .L80052D4C: /* 2E14C 80052D4C 1068000B */ beq $v1, $t0, .L80052D7C -/* 2E150 80052D50 00000000 */ nop +/* 2E150 80052D50 00000000 */ nop /* 2E154 80052D54 1467002A */ bne $v1, $a3, .L80052E00 /* 2E158 80052D58 24A20001 */ addiu $v0, $a1, 1 /* 2E15C 80052D5C 90A30000 */ lbu $v1, ($a1) @@ -47,14 +47,14 @@ glabel func_80052CFC /* 2E194 80052D94 AC82001C */ sw $v0, 0x1c($a0) /* 2E198 80052D98 28620081 */ slti $v0, $v1, 0x81 /* 2E19C 80052D9C 14400003 */ bnez $v0, .L80052DAC -/* 2E1A0 80052DA0 00000000 */ nop +/* 2E1A0 80052DA0 00000000 */ nop /* 2E1A4 80052DA4 08014B44 */ j .L80052D10 /* 2E1A8 80052DA8 AC860030 */ sw $a2, 0x30($a0) .L80052DAC: /* 2E1AC 80052DAC 0462FFD8 */ bltzl $v1, .L80052D10 /* 2E1B0 80052DB0 AC800030 */ sw $zero, 0x30($a0) /* 2E1B4 80052DB4 08014B44 */ j .L80052D10 -/* 2E1B8 80052DB8 00000000 */ nop +/* 2E1B8 80052DB8 00000000 */ nop .L80052DBC: /* 2E1BC 80052DBC 90A30000 */ lbu $v1, ($a1) /* 2E1C0 80052DC0 24A20001 */ addiu $v0, $a1, 1 @@ -70,7 +70,7 @@ glabel func_80052CFC /* 2E1E4 80052DE4 A0820038 */ sb $v0, 0x38($a0) /* 2E1E8 80052DE8 304200FF */ andi $v0, $v0, 0xff /* 2E1EC 80052DEC 1040FFC8 */ beqz $v0, .L80052D10 -/* 2E1F0 80052DF0 00000000 */ nop +/* 2E1F0 80052DF0 00000000 */ nop .L80052DF4: /* 2E1F4 80052DF4 8C820034 */ lw $v0, 0x34($a0) /* 2E1F8 80052DF8 08014B44 */ j .L80052D10 diff --git a/asm/nonmatchings/code_2d9a0_len_890/func_80052E18.s b/asm/nonmatchings/code_2d9a0_len_890/func_80052E18.s index c6406bea27..a3516d81b9 100644 --- a/asm/nonmatchings/code_2d9a0_len_890/func_80052E18.s +++ b/asm/nonmatchings/code_2d9a0_len_890/func_80052E18.s @@ -6,5 +6,5 @@ glabel func_80052E18 /* 2E21C 80052E1C 34420020 */ ori $v0, $v0, 0x20 /* 2E220 80052E20 03E00008 */ jr $ra /* 2E224 80052E24 A082003D */ sb $v0, 0x3d($a0) -/* 2E228 80052E28 00000000 */ nop -/* 2E22C 80052E2C 00000000 */ nop +/* 2E228 80052E28 00000000 */ nop +/* 2E22C 80052E2C 00000000 */ nop diff --git a/asm/nonmatchings/code_2e230_len_2190/al_LoadBank.s b/asm/nonmatchings/code_2e230_len_2190/al_LoadBank.s index bc6474ca5f..203175f69d 100644 --- a/asm/nonmatchings/code_2e230_len_2190/al_LoadBank.s +++ b/asm/nonmatchings/code_2e230_len_2190/al_LoadBank.s @@ -41,7 +41,7 @@ glabel al_LoadBank /* 2FC54 80054854 1062000E */ beq $v1, $v0, .L80054890 /* 2FC58 80054858 24020065 */ addiu $v0, $zero, 0x65 /* 2FC5C 8005485C 1062001A */ beq $v1, $v0, .L800548C8 -/* 2FC60 80054860 00000000 */ nop +/* 2FC60 80054860 00000000 */ nop /* 2FC64 80054864 0801526E */ j .L800549B8 /* 2FC68 80054868 0000902D */ daddu $s2, $zero, $zero .L8005486C: diff --git a/asm/nonmatchings/code_2e230_len_2190/func_800538F8.s b/asm/nonmatchings/code_2e230_len_2190/func_800538F8.s index c659842143..92d3ed8af1 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_800538F8.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_800538F8.s @@ -19,7 +19,7 @@ glabel func_800538F8 /* 2ED30 80053930 C4600480 */ lwc1 $f0, 0x480($v1) /* 2ED34 80053934 46001002 */ mul.s $f0, $f2, $f0 /* 2ED38 80053938 03E00008 */ jr $ra -/* 2ED3C 8005393C 00000000 */ nop +/* 2ED3C 8005393C 00000000 */ nop .L80053940: /* 2ED40 80053940 3C048008 */ lui $a0, %hi(D_80078730) /* 2ED44 80053944 24848730 */ addiu $a0, $a0, %lo(D_80078730) @@ -33,4 +33,4 @@ glabel func_800538F8 /* 2ED64 80053964 C4400000 */ lwc1 $f0, ($v0) /* 2ED68 80053968 46001002 */ mul.s $f0, $f2, $f0 /* 2ED6C 8005396C 03E00008 */ jr $ra -/* 2ED70 80053970 00000000 */ nop +/* 2ED70 80053970 00000000 */ nop diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80053974.s b/asm/nonmatchings/code_2e230_len_2190/func_80053974.s index ffd921925e..6e66e54c35 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80053974.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80053974.s @@ -33,7 +33,7 @@ glabel func_80053974 /* 2EDE0 800539E0 14410004 */ bne $v0, $at, .L800539F4 /* 2EDE4 800539E4 3C018000 */ lui $at, 0x8000 /* 2EDE8 800539E8 14610002 */ bne $v1, $at, .L800539F4 -/* 2EDEC 800539EC 00000000 */ nop +/* 2EDEC 800539EC 00000000 */ nop /* 2EDF0 800539F0 0006000D */ break 6 .L800539F4: /* 2EDF4 800539F4 00001812 */ mflo $v1 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80053BE8.s b/asm/nonmatchings/code_2e230_len_2190/func_80053BE8.s index 4be5a199ca..a25222f4d1 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80053BE8.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80053BE8.s @@ -14,7 +14,7 @@ glabel func_80053BE8 /* 2F00C 80053C0C 30A50003 */ andi $a1, $a1, 3 /* 2F010 80053C10 00A2102B */ sltu $v0, $a1, $v0 /* 2F014 80053C14 10400009 */ beqz $v0, .L80053C3C -/* 2F018 80053C18 00000000 */ nop +/* 2F018 80053C18 00000000 */ nop /* 2F01C 80053C1C 00051080 */ sll $v0, $a1, 2 /* 2F020 80053C20 00821021 */ addu $v0, $a0, $v0 /* 2F024 80053C24 94430004 */ lhu $v1, 4($v0) diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80053C58.s b/asm/nonmatchings/code_2e230_len_2190/func_80053C58.s index 9487cda58b..dd89b4351d 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_2e230_len_2190/func_80053CB4.s b/asm/nonmatchings/code_2e230_len_2190/func_80053CB4.s index f9fad4d648..ac58a5e082 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80053CB4.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80053CB4.s @@ -4,11 +4,11 @@ glabel func_80053CB4 /* 2F0B4 80053CB4 24020001 */ addiu $v0, $zero, 1 /* 2F0B8 80053CB8 10820009 */ beq $a0, $v0, .L80053CE0 -/* 2F0BC 80053CBC 00000000 */ nop +/* 2F0BC 80053CBC 00000000 */ nop /* 2F0C0 80053CC0 10800003 */ beqz $a0, .L80053CD0 /* 2F0C4 80053CC4 24020002 */ addiu $v0, $zero, 2 /* 2F0C8 80053CC8 14820009 */ bne $a0, $v0, .L80053CF0 -/* 2F0CC 80053CCC 00000000 */ nop +/* 2F0CC 80053CCC 00000000 */ nop .L80053CD0: /* 2F0D0 80053CD0 3C02800A */ lui $v0, %hi(D_8009A664) /* 2F0D4 80053CD4 8C42A664 */ lw $v0, %lo(D_8009A664)($v0) diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80053CF8.s b/asm/nonmatchings/code_2e230_len_2190/func_80053CF8.s index fd574839f5..166dcc3ed2 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80053CF8.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80053CF8.s @@ -30,7 +30,7 @@ glabel func_80053CF8 /* 2F15C 80053D5C 0C01511F */ jal al_CopyFileTableEntry /* 2F160 80053D60 03A53021 */ addu $a2, $sp, $a1 /* 2F164 80053D64 14400030 */ bnez $v0, .L80053E28 -/* 2F168 80053D68 00000000 */ nop +/* 2F168 80053D68 00000000 */ nop /* 2F16C 80053D6C 0C0136CA */ jal func_8004DB28 /* 2F170 80053D70 0260202D */ daddu $a0, $s3, $zero /* 2F174 80053D74 1440002C */ bnez $v0, .L80053E28 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80053F80.s b/asm/nonmatchings/code_2e230_len_2190/func_80053F80.s index 6b0d4f9f1b..651859300f 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80053F80.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80053F80.s @@ -19,7 +19,7 @@ glabel func_80053F80 /* 2F3B8 80053FB8 AFB00018 */ sw $s0, 0x18($sp) /* 2F3BC 80053FBC 8E420044 */ lw $v0, 0x44($s2) /* 2F3C0 80053FC0 14400097 */ bnez $v0, .L80054220 -/* 2F3C4 80053FC4 00000000 */ nop +/* 2F3C4 80053FC4 00000000 */ nop /* 2F3C8 80053FC8 24050040 */ addiu $a1, $zero, 0x40 /* 2F3CC 80053FCC 3C028008 */ lui $v0, %hi(D_80078580) /* 2F3D0 80053FD0 00551021 */ addu $v0, $v0, $s5 @@ -54,13 +54,13 @@ glabel func_80053F80 .L80054040: /* 2F440 80054040 24020010 */ addiu $v0, $zero, 0x10 /* 2F444 80054044 16A20076 */ bne $s5, $v0, .L80054220 -/* 2F448 80054048 00000000 */ nop +/* 2F448 80054048 00000000 */ nop /* 2F44C 8005404C 8E420044 */ lw $v0, 0x44($s2) /* 2F450 80054050 14400073 */ bnez $v0, .L80054220 -/* 2F454 80054054 00000000 */ nop +/* 2F454 80054054 00000000 */ nop /* 2F458 80054058 8E420228 */ lw $v0, 0x228($s2) /* 2F45C 8005405C 14400070 */ bnez $v0, .L80054220 -/* 2F460 80054060 00000000 */ nop +/* 2F460 80054060 00000000 */ nop /* 2F464 80054064 8E42040C */ lw $v0, 0x40c($s2) /* 2F468 80054068 1440006D */ bnez $v0, .L80054220 /* 2F46C 8005406C 0000182D */ daddu $v1, $zero, $zero @@ -108,7 +108,7 @@ glabel func_80053F80 /* 2F510 80054110 0C01511F */ jal al_CopyFileTableEntry /* 2F514 80054114 02028021 */ addu $s0, $s0, $v0 /* 2F518 80054118 14400041 */ bnez $v0, .L80054220 -/* 2F51C 8005411C 00000000 */ nop +/* 2F51C 8005411C 00000000 */ nop /* 2F520 80054120 0200282D */ daddu $a1, $s0, $zero /* 2F524 80054124 8FA60014 */ lw $a2, 0x14($sp) /* 2F528 80054128 8FA40010 */ lw $a0, 0x10($sp) @@ -129,7 +129,7 @@ glabel func_80053F80 /* 2F564 80054164 0C01511F */ jal al_CopyFileTableEntry /* 2F568 80054168 02028021 */ addu $s0, $s0, $v0 /* 2F56C 8005416C 1440002C */ bnez $v0, .L80054220 -/* 2F570 80054170 00000000 */ nop +/* 2F570 80054170 00000000 */ nop /* 2F574 80054174 0200282D */ daddu $a1, $s0, $zero /* 2F578 80054178 8FA60014 */ lw $a2, 0x14($sp) /* 2F57C 8005417C 8FA40010 */ lw $a0, 0x10($sp) @@ -150,7 +150,7 @@ glabel func_80053F80 /* 2F5B8 800541B8 0C01511F */ jal al_CopyFileTableEntry /* 2F5BC 800541BC 02028021 */ addu $s0, $s0, $v0 /* 2F5C0 800541C0 14400017 */ bnez $v0, .L80054220 -/* 2F5C4 800541C4 00000000 */ nop +/* 2F5C4 800541C4 00000000 */ nop /* 2F5C8 800541C8 0200282D */ daddu $a1, $s0, $zero /* 2F5CC 800541CC 8FA60014 */ lw $a2, 0x14($sp) /* 2F5D0 800541D0 8FA40010 */ lw $a0, 0x10($sp) @@ -169,7 +169,7 @@ glabel func_80053F80 /* 2F604 80054204 0C01511F */ jal al_CopyFileTableEntry /* 2F608 80054208 27A60010 */ addiu $a2, $sp, 0x10 /* 2F60C 8005420C 14400004 */ bnez $v0, .L80054220 -/* 2F610 80054210 00000000 */ nop +/* 2F610 80054210 00000000 */ nop /* 2F614 80054214 8FA40010 */ lw $a0, 0x10($sp) /* 2F618 80054218 0C015313 */ jal func_80054C4C /* 2F61C 8005421C 24050002 */ addiu $a1, $zero, 2 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80054744.s b/asm/nonmatchings/code_2e230_len_2190/func_80054744.s index 36a06b2924..6645fdc4ce 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80054744.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80054744.s @@ -10,26 +10,32 @@ glabel func_80054744 /* 2FB58 80054758 10400019 */ beqz $v0, .L800547C0 /* 2FB5C 8005475C 00052900 */ sll $a1, $a1, 4 /* 2FB60 80054760 00041080 */ sll $v0, $a0, 2 -/* 2FB64 80054764 3C01800A */ lui $at, %hi(D_800988F0) +/* 2FB64 80054764 3C01800A */ lui $at, %hi(jtbl_800988F0_73CF0) /* 2FB68 80054768 00220821 */ addu $at, $at, $v0 -/* 2FB6C 8005476C 8C2288F0 */ lw $v0, %lo(D_800988F0)($at) +/* 2FB6C 8005476C 8C2288F0 */ lw $v0, %lo(jtbl_800988F0_73CF0)($at) /* 2FB70 80054770 00400008 */ jr $v0 -/* 2FB74 80054774 00000000 */ nop +/* 2FB74 80054774 00000000 */ nop +glabel L80054778_2FB78 /* 2FB78 80054778 00051080 */ sll $v0, $a1, 2 /* 2FB7C 8005477C 080151EF */ j .L800547BC /* 2FB80 80054780 244204EC */ addiu $v0, $v0, 0x4ec +glabel L80054784_2FB84 /* 2FB84 80054784 00051080 */ sll $v0, $a1, 2 /* 2FB88 80054788 080151EF */ j .L800547BC /* 2FB8C 8005478C 244205EC */ addiu $v0, $v0, 0x5ec +glabel L80054790_2FB90 /* 2FB90 80054790 00051080 */ sll $v0, $a1, 2 /* 2FB94 80054794 080151EF */ j .L800547BC /* 2FB98 80054798 244209EC */ addiu $v0, $v0, 0x9ec +glabel L8005479C_2FB9C /* 2FB9C 8005479C 00051080 */ sll $v0, $a1, 2 /* 2FBA0 800547A0 080151EF */ j .L800547BC /* 2FBA4 800547A4 24420DEC */ addiu $v0, $v0, 0xdec +glabel L800547A8_2FBA8 /* 2FBA8 800547A8 00051080 */ sll $v0, $a1, 2 /* 2FBAC 800547AC 080151EF */ j .L800547BC /* 2FBB0 800547B0 244211EC */ addiu $v0, $v0, 0x11ec +glabel L800547B4_2FBB4 /* 2FBB4 800547B4 00051080 */ sll $v0, $a1, 2 /* 2FBB8 800547B8 244200EC */ addiu $v0, $v0, 0xec .L800547BC: diff --git a/asm/nonmatchings/code_2e230_len_2190/func_800549F8.s b/asm/nonmatchings/code_2e230_len_2190/func_800549F8.s index 87fc8d766b..8e088d41f3 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_800549F8.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_800549F8.s @@ -51,4 +51,4 @@ glabel func_800549F8 /* 2FE94 80054A94 A162000E */ sb $v0, 0xe($t3) .L80054A98: /* 2FE98 80054A98 03E00008 */ jr $ra -/* 2FE9C 80054A9C 00000000 */ nop +/* 2FE9C 80054A9C 00000000 */ nop diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80054C84.s b/asm/nonmatchings/code_2e230_len_2190/func_80054C84.s index 1fce13aa71..7548fbb391 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80054C84.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80054C84.s @@ -14,7 +14,7 @@ glabel func_80054C84 /* 300A8 80054CA8 0060282D */ daddu $a1, $v1, $zero /* 300AC 80054CAC 0040182D */ daddu $v1, $v0, $zero /* 300B0 80054CB0 10600007 */ beqz $v1, .L80054CD0 -/* 300B4 80054CB4 00000000 */ nop +/* 300B4 80054CB4 00000000 */ nop /* 300B8 80054CB8 0000202D */ daddu $a0, $zero, $zero .L80054CBC: /* 300BC 80054CBC AC700000 */ sw $s0, ($v1) diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80054CE0.s b/asm/nonmatchings/code_2e230_len_2190/func_80054CE0.s index e55c74dfa0..7224c45d2d 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80054CE0.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80054CE0.s @@ -29,7 +29,7 @@ glabel func_80054CE0 /* 30140 80054D40 32220010 */ andi $v0, $s1, 0x10 .L80054D44: /* 30144 80054D44 10400006 */ beqz $v0, .L80054D60 -/* 30148 80054D48 00000000 */ nop +/* 30148 80054D48 00000000 */ nop /* 3014C 80054D4C 3C02800A */ lui $v0, %hi(D_8009A640) /* 30150 80054D50 8C42A640 */ lw $v0, %lo(D_8009A640)($v0) /* 30154 80054D54 24440040 */ addiu $a0, $v0, 0x40 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80054DA8.s b/asm/nonmatchings/code_2e230_len_2190/func_80054DA8.s index 8cc588f04a..42c99b2df9 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80054DA8.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80054DA8.s @@ -5,7 +5,7 @@ glabel func_80054DA8 /* 301A8 80054DA8 30840001 */ andi $a0, $a0, 1 /* 301AC 80054DAC 24050001 */ addiu $a1, $zero, 1 /* 301B0 80054DB0 14850008 */ bne $a0, $a1, .L80054DD4 -/* 301B4 80054DB4 00000000 */ nop +/* 301B4 80054DB4 00000000 */ nop /* 301B8 80054DB8 3C03800A */ lui $v1, %hi(D_8009A5C0) /* 301BC 80054DBC 8C63A5C0 */ lw $v1, %lo(D_8009A5C0)($v1) /* 301C0 80054DC0 9062130C */ lbu $v0, 0x130c($v1) @@ -19,10 +19,10 @@ glabel func_80054DA8 /* 301DC 80054DDC 8C830000 */ lw $v1, ($a0) /* 301E0 80054DE0 9062130C */ lbu $v0, 0x130c($v1) /* 301E4 80054DE4 10400004 */ beqz $v0, .L80054DF8 -/* 301E8 80054DE8 00000000 */ nop +/* 301E8 80054DE8 00000000 */ nop /* 301EC 80054DEC A0650050 */ sb $a1, 0x50($v1) /* 301F0 80054DF0 8C820000 */ lw $v0, ($a0) /* 301F4 80054DF4 A040130C */ sb $zero, 0x130c($v0) .L80054DF8: /* 301F8 80054DF8 03E00008 */ jr $ra -/* 301FC 80054DFC 00000000 */ nop +/* 301FC 80054DFC 00000000 */ nop diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80054E90.s b/asm/nonmatchings/code_2e230_len_2190/func_80054E90.s index f2cc17d7f9..19cc0bcff3 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80054E90.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80054E90.s @@ -16,7 +16,7 @@ glabel func_80054E90 /* 302B8 80054EB8 24A5FFFF */ addiu $a1, $a1, -1 .L80054EBC: /* 302BC 80054EBC 03E00008 */ jr $ra -/* 302C0 80054EC0 00000000 */ nop +/* 302C0 80054EC0 00000000 */ nop .L80054EC4: /* 302C4 80054EC4 30870003 */ andi $a3, $a0, 3 /* 302C8 80054EC8 10E00009 */ beqz $a3, .L80054EF0 @@ -56,4 +56,4 @@ glabel func_80054E90 /* 30338 80054F38 1440FFFC */ bnez $v0, .L80054F2C /* 3033C 80054F3C 24E7FFFF */ addiu $a3, $a3, -1 /* 30340 80054F40 03E00008 */ jr $ra -/* 30344 80054F44 00000000 */ nop +/* 30344 80054F44 00000000 */ nop diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80054F48.s b/asm/nonmatchings/code_2e230_len_2190/func_80054F48.s index 5194aecc49..524874fc4e 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80054F48.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80054F48.s @@ -14,4 +14,4 @@ glabel func_80054F48 /* 30368 80054F68 24A50001 */ addiu $a1, $a1, 1 .L80054F6C: /* 3036C 80054F6C 03E00008 */ jr $ra -/* 30370 80054F70 00000000 */ nop +/* 30370 80054F70 00000000 */ nop diff --git a/asm/nonmatchings/code_303c0_len_3e10/al_LoadBKHeaders.s b/asm/nonmatchings/code_303c0_len_3e10/al_LoadBKHeaders.s index 079f52565a..a90f3fe8e8 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/al_LoadBKHeaders.s +++ b/asm/nonmatchings/code_303c0_len_3e10/al_LoadBKHeaders.s @@ -31,7 +31,7 @@ glabel al_LoadBKHeaders /* 30424 80055024 26100004 */ addiu $s0, $s0, 4 /* 30428 80055028 2A220050 */ slti $v0, $s1, 0x50 /* 3042C 8005502C 1440FFF1 */ bnez $v0, .L80054FF4 -/* 30430 80055030 00000000 */ nop +/* 30430 80055030 00000000 */ nop .L80055034: /* 30434 80055034 8FBF0164 */ lw $ra, 0x164($sp) /* 30438 80055038 8FB20160 */ lw $s2, 0x160($sp) @@ -39,4 +39,4 @@ glabel al_LoadBKHeaders /* 30440 80055040 8FB00158 */ lw $s0, 0x158($sp) /* 30444 80055044 03E00008 */ jr $ra /* 30448 80055048 27BD0168 */ addiu $sp, $sp, 0x168 -/* 3044C 8005504C 00000000 */ nop +/* 3044C 8005504C 00000000 */ nop diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055068.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055068.s index ae25ec354e..94e47cda7c 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055068.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055068.s @@ -15,11 +15,11 @@ glabel func_80055068 /* 30490 80055090 10400007 */ beqz $v0, .L800550B0 /* 30494 80055094 2C620002 */ sltiu $v0, $v1, 2 /* 30498 80055098 10400019 */ beqz $v0, .L80055100 -/* 3049C 8005509C 00000000 */ nop +/* 3049C 8005509C 00000000 */ nop /* 304A0 800550A0 1064000C */ beq $v1, $a0, .L800550D4 /* 304A4 800550A4 00102102 */ srl $a0, $s0, 4 /* 304A8 800550A8 08015440 */ j .L80055100 -/* 304AC 800550AC 00000000 */ nop +/* 304AC 800550AC 00000000 */ nop .L800550B0: /* 304B0 800550B0 24020004 */ addiu $v0, $zero, 4 /* 304B4 800550B4 14620012 */ bne $v1, $v0, .L80055100 @@ -29,7 +29,7 @@ glabel func_80055068 /* 304C4 800550C4 0C015490 */ jal func_80055240 /* 304C8 800550C8 00A0382D */ daddu $a3, $a1, $zero /* 304CC 800550CC 08015440 */ j .L80055100 -/* 304D0 800550D0 00000000 */ nop +/* 304D0 800550D0 00000000 */ nop .L800550D4: /* 304D4 800550D4 308400FF */ andi $a0, $a0, 0xff /* 304D8 800550D8 0C015635 */ jal func_800558D4 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_8005513C.s b/asm/nonmatchings/code_303c0_len_3e10/func_8005513C.s index 522ca66438..bda4d9c461 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_8005513C.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_8005513C.s @@ -11,15 +11,15 @@ glabel func_8005513C /* 30554 80055154 3C06800A */ lui $a2, %hi(D_8009A664) /* 30558 80055158 8CC6A664 */ lw $a2, %lo(D_8009A664)($a2) /* 3055C 8005515C 0801545D */ j .L80055174 -/* 30560 80055160 00000000 */ nop +/* 30560 80055160 00000000 */ nop .L80055164: /* 30564 80055164 14A20003 */ bne $a1, $v0, .L80055174 -/* 30568 80055168 00000000 */ nop +/* 30568 80055168 00000000 */ nop /* 3056C 8005516C 3C06800A */ lui $a2, %hi(D_8009A5FC) /* 30570 80055170 8CC6A5FC */ lw $a2, %lo(D_8009A5FC)($a2) .L80055174: /* 30574 80055174 10C00018 */ beqz $a2, .L800551D8 -/* 30578 80055178 00000000 */ nop +/* 30578 80055178 00000000 */ nop /* 3057C 8005517C 90C20258 */ lbu $v0, 0x258($a2) /* 30580 80055180 2C420008 */ sltiu $v0, $v0, 8 /* 30584 80055184 1040000E */ beqz $v0, .L800551C0 @@ -48,4 +48,4 @@ glabel func_8005513C /* 305D4 800551D4 A0C5025B */ sb $a1, 0x25b($a2) .L800551D8: /* 305D8 800551D8 03E00008 */ jr $ra -/* 305DC 800551DC 00000000 */ nop +/* 305DC 800551DC 00000000 */ nop diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055D38.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055D38.s index e82aa93041..e14b96bb55 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055D38.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055D38.s @@ -16,7 +16,7 @@ glabel func_80055D38 /* 31164 80055D64 8FA40014 */ lw $a0, 0x14($sp) /* 31168 80055D68 4405A000 */ mfc1 $a1, $f20 /* 3116C 80055D6C 0C0141DC */ jal func_80050770 -/* 31170 80055D70 00000000 */ nop +/* 31170 80055D70 00000000 */ nop /* 31174 80055D74 0200102D */ daddu $v0, $s0, $zero .L80055D78: /* 31178 80055D78 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_800560BC.s b/asm/nonmatchings/code_303c0_len_3e10/func_800560BC.s index 7939ab3728..d9237dbc5c 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_800560BC.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_800560BC.s @@ -22,4 +22,4 @@ glabel func_800560BC /* 31500 80056100 ACE20098 */ sw $v0, 0x98($a3) .L80056104: /* 31504 80056104 03E00008 */ jr $ra -/* 31508 80056108 00000000 */ nop +/* 31508 80056108 00000000 */ nop diff --git a/asm/nonmatchings/code_316a70/func_80200080.s b/asm/nonmatchings/code_316a70/func_80200080.s index f02f703480..ff98eb98f2 100644 --- a/asm/nonmatchings/code_316a70/func_80200080.s +++ b/asm/nonmatchings/code_316a70/func_80200080.s @@ -23,7 +23,7 @@ glabel func_80200080 /* 316AB4 802000C4 8C620000 */ lw $v0, ($v1) /* 316AB8 802000C8 30420003 */ andi $v0, $v0, 3 /* 316ABC 802000CC 1440FFFD */ bnez $v0, .L802000C4 -/* 316AC0 802000D0 00000000 */ nop +/* 316AC0 802000D0 00000000 */ nop .L802000D4: /* 316AC4 802000D4 3C02FFFE */ lui $v0, 0xfffe /* 316AC8 802000D8 34427508 */ ori $v0, $v0, 0x7508 @@ -70,7 +70,7 @@ glabel func_80200080 /* 316B60 80200170 14580010 */ bne $v0, $t8, .L802001B4 /* 316B64 80200174 00041682 */ srl $v0, $a0, 0x1a /* 316B68 80200178 144F000E */ bne $v0, $t7, .L802001B4 -/* 316B6C 8020017C 00000000 */ nop +/* 316B6C 8020017C 00000000 */ nop /* 316B70 80200180 00041542 */ srl $v0, $a0, 0x15 /* 316B74 80200184 3043001F */ andi $v1, $v0, 0x1f /* 316B78 80200188 00091402 */ srl $v0, $t1, 0x10 @@ -103,10 +103,10 @@ glabel func_80200080 /* 316BD8 802001E8 01621023 */ subu $v0, $t3, $v0 /* 316BDC 802001EC 01425021 */ addu $t2, $t2, $v0 /* 316BE0 802001F0 0140F809 */ jalr $t2 -/* 316BE4 802001F4 00000000 */ nop +/* 316BE4 802001F4 00000000 */ nop /* 316BE8 802001F8 8FBF0014 */ lw $ra, 0x14($sp) /* 316BEC 802001FC 8FB00010 */ lw $s0, 0x10($sp) /* 316BF0 80200200 03E00008 */ jr $ra /* 316BF4 80200204 27BD0018 */ addiu $sp, $sp, 0x18 -/* 316BF8 80200208 00000000 */ nop -/* 316BFC 8020020C 00000000 */ nop +/* 316BF8 80200208 00000000 */ nop +/* 316BFC 8020020C 00000000 */ nop diff --git a/asm/nonmatchings/code_325AD0/func_E0200000.s b/asm/nonmatchings/code_325AD0/func_E0200000.s index b888ac064f..7d4ff98a60 100644 --- a/asm/nonmatchings/code_325AD0/func_E0200000.s +++ b/asm/nonmatchings/code_325AD0/func_E0200000.s @@ -19,4 +19,4 @@ glabel func_E0200000 .LE0200038: /* 325B08 E0200038 00001010 */ mfhi $v0 /* 325B0C E020003C 03E00008 */ jr $ra -/* 325B10 E0200040 00000000 */ nop +/* 325B10 E0200040 00000000 */ nop diff --git a/asm/nonmatchings/code_325AD0/func_E0200044.s b/asm/nonmatchings/code_325AD0/func_E0200044.s index 78dd011262..fb52708f4a 100644 --- a/asm/nonmatchings/code_325AD0/func_E0200044.s +++ b/asm/nonmatchings/code_325AD0/func_E0200044.s @@ -26,9 +26,9 @@ glabel func_E0200044 /* 325B5C E020008C 14610004 */ bne $v1, $at, .LE02000A0 /* 325B60 E0200090 3C018000 */ lui $at, 0x8000 /* 325B64 E0200094 14410002 */ bne $v0, $at, .LE02000A0 -/* 325B68 E0200098 00000000 */ nop +/* 325B68 E0200098 00000000 */ nop /* 325B6C E020009C 0006000D */ break 6 .LE02000A0: /* 325B70 E02000A0 00001010 */ mfhi $v0 /* 325B74 E02000A4 03E00008 */ jr $ra -/* 325B78 E02000A8 00000000 */ nop +/* 325B78 E02000A8 00000000 */ nop diff --git a/asm/nonmatchings/code_325AD0/func_E02000AC.s b/asm/nonmatchings/code_325AD0/func_E02000AC.s index 3856c32c6c..43180f5cda 100644 --- a/asm/nonmatchings/code_325AD0/func_E02000AC.s +++ b/asm/nonmatchings/code_325AD0/func_E02000AC.s @@ -219,5 +219,5 @@ glabel func_E02000AC /* 325ECC E02003FC 8FB00020 */ lw $s0, 0x20($sp) /* 325ED0 E0200400 03E00008 */ jr $ra /* 325ED4 E0200404 27BD0048 */ addiu $sp, $sp, 0x48 -/* 325ED8 E0200408 00000000 */ nop -/* 325EDC E020040C 00000000 */ nop +/* 325ED8 E0200408 00000000 */ nop +/* 325EDC E020040C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200410.s b/asm/nonmatchings/code_325EE0/func_E0200410.s index 08d94d557f..e41227f24c 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200410.s +++ b/asm/nonmatchings/code_325EE0/func_E0200410.s @@ -5,4 +5,4 @@ glabel func_E0200410 /* 325EE0 E0200410 3C01E020 */ lui $at, %hi(D_E0200694) /* 325EE4 E0200414 8C210694 */ lw $at, %lo(D_E0200694)($at) /* 325EE8 E0200418 00200008 */ jr $at -/* 325EEC E020041C 00000000 */ nop +/* 325EEC E020041C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200420.s b/asm/nonmatchings/code_325EE0/func_E0200420.s index 685e9987af..6475fa3c03 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200420.s +++ b/asm/nonmatchings/code_325EE0/func_E0200420.s @@ -5,4 +5,4 @@ glabel func_E0200420 /* 325EF0 E0200420 3C01E020 */ lui $at, %hi(D_E0200698) /* 325EF4 E0200424 8C210698 */ lw $at, %lo(D_E0200698)($at) /* 325EF8 E0200428 00200008 */ jr $at -/* 325EFC E020042C 00000000 */ nop +/* 325EFC E020042C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200430.s b/asm/nonmatchings/code_325EE0/func_E0200430.s index 67e30a04e3..d4a6a6fc84 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200430.s +++ b/asm/nonmatchings/code_325EE0/func_E0200430.s @@ -5,4 +5,4 @@ glabel func_E0200430 /* 325F00 E0200430 3C01E020 */ lui $at, %hi(D_E020069C) /* 325F04 E0200434 8C21069C */ lw $at, %lo(D_E020069C)($at) /* 325F08 E0200438 00200008 */ jr $at -/* 325F0C E020043C 00000000 */ nop +/* 325F0C E020043C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200440.s b/asm/nonmatchings/code_325EE0/func_E0200440.s index 56556877a7..91b7e7d5a6 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200440.s +++ b/asm/nonmatchings/code_325EE0/func_E0200440.s @@ -5,4 +5,4 @@ glabel func_E0200440 /* 325F10 E0200440 3C01E020 */ lui $at, %hi(D_E02006A0) /* 325F14 E0200444 8C2106A0 */ lw $at, %lo(D_E02006A0)($at) /* 325F18 E0200448 00200008 */ jr $at -/* 325F1C E020044C 00000000 */ nop +/* 325F1C E020044C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200450.s b/asm/nonmatchings/code_325EE0/func_E0200450.s index dda936a9a4..34f7b34a09 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200450.s +++ b/asm/nonmatchings/code_325EE0/func_E0200450.s @@ -5,4 +5,4 @@ glabel func_E0200450 /* 325F20 E0200450 3C01E020 */ lui $at, %hi(D_E02006A4) /* 325F24 E0200454 8C2106A4 */ lw $at, %lo(D_E02006A4)($at) /* 325F28 E0200458 00200008 */ jr $at -/* 325F2C E020045C 00000000 */ nop +/* 325F2C E020045C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200460.s b/asm/nonmatchings/code_325EE0/func_E0200460.s index dc7a23dc77..472bc73993 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200460.s +++ b/asm/nonmatchings/code_325EE0/func_E0200460.s @@ -5,4 +5,4 @@ glabel func_E0200460 /* 325F30 E0200460 3C01E020 */ lui $at, %hi(D_E02006A8) /* 325F34 E0200464 8C2106A8 */ lw $at, %lo(D_E02006A8)($at) /* 325F38 E0200468 00200008 */ jr $at -/* 325F3C E020046C 00000000 */ nop +/* 325F3C E020046C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200470.s b/asm/nonmatchings/code_325EE0/func_E0200470.s index fa2645b088..c29146c5cb 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200470.s +++ b/asm/nonmatchings/code_325EE0/func_E0200470.s @@ -5,4 +5,4 @@ glabel func_E0200470 /* 325F40 E0200470 3C01E020 */ lui $at, %hi(D_E02006AC) /* 325F44 E0200474 8C2106AC */ lw $at, %lo(D_E02006AC)($at) /* 325F48 E0200478 00200008 */ jr $at -/* 325F4C E020047C 00000000 */ nop +/* 325F4C E020047C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200480.s b/asm/nonmatchings/code_325EE0/func_E0200480.s index bb3033ccd7..9cd78178b1 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200480.s +++ b/asm/nonmatchings/code_325EE0/func_E0200480.s @@ -5,4 +5,4 @@ glabel func_E0200480 /* 325F50 E0200480 3C01E020 */ lui $at, %hi(D_E02006B0) /* 325F54 E0200484 8C2106B0 */ lw $at, %lo(D_E02006B0)($at) /* 325F58 E0200488 00200008 */ jr $at -/* 325F5C E020048C 00000000 */ nop +/* 325F5C E020048C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200490.s b/asm/nonmatchings/code_325EE0/func_E0200490.s index 5ea5d301c8..8c05975a50 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200490.s +++ b/asm/nonmatchings/code_325EE0/func_E0200490.s @@ -5,4 +5,4 @@ glabel func_E0200490 /* 325F60 E0200490 3C01E020 */ lui $at, %hi(D_E02006B4) /* 325F64 E0200494 8C2106B4 */ lw $at, %lo(D_E02006B4)($at) /* 325F68 E0200498 00200008 */ jr $at -/* 325F6C E020049C 00000000 */ nop +/* 325F6C E020049C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E02004A0.s b/asm/nonmatchings/code_325EE0/func_E02004A0.s index 3642bfaa5c..4f2d651cdf 100644 --- a/asm/nonmatchings/code_325EE0/func_E02004A0.s +++ b/asm/nonmatchings/code_325EE0/func_E02004A0.s @@ -5,4 +5,4 @@ glabel func_E02004A0 /* 325F70 E02004A0 3C01E020 */ lui $at, %hi(D_E02006B8) /* 325F74 E02004A4 8C2106B8 */ lw $at, %lo(D_E02006B8)($at) /* 325F78 E02004A8 00200008 */ jr $at -/* 325F7C E02004AC 00000000 */ nop +/* 325F7C E02004AC 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E02004B0.s b/asm/nonmatchings/code_325EE0/func_E02004B0.s index f7210b45ea..85073f29ee 100644 --- a/asm/nonmatchings/code_325EE0/func_E02004B0.s +++ b/asm/nonmatchings/code_325EE0/func_E02004B0.s @@ -5,4 +5,4 @@ glabel func_E02004B0 /* 325F80 E02004B0 3C01E020 */ lui $at, %hi(D_E02006BC) /* 325F84 E02004B4 8C2106BC */ lw $at, %lo(D_E02006BC)($at) /* 325F88 E02004B8 00200008 */ jr $at -/* 325F8C E02004BC 00000000 */ nop +/* 325F8C E02004BC 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E02004C0.s b/asm/nonmatchings/code_325EE0/func_E02004C0.s index 30bceaa343..04b4a4f331 100644 --- a/asm/nonmatchings/code_325EE0/func_E02004C0.s +++ b/asm/nonmatchings/code_325EE0/func_E02004C0.s @@ -5,4 +5,4 @@ glabel func_E02004C0 /* 325F90 E02004C0 3C01E020 */ lui $at, %hi(D_E02006C0) /* 325F94 E02004C4 8C2106C0 */ lw $at, %lo(D_E02006C0)($at) /* 325F98 E02004C8 00200008 */ jr $at -/* 325F9C E02004CC 00000000 */ nop +/* 325F9C E02004CC 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E02004D0.s b/asm/nonmatchings/code_325EE0/func_E02004D0.s index 14a1e0d518..159294c630 100644 --- a/asm/nonmatchings/code_325EE0/func_E02004D0.s +++ b/asm/nonmatchings/code_325EE0/func_E02004D0.s @@ -5,4 +5,4 @@ glabel func_E02004D0 /* 325FA0 E02004D0 3C01E020 */ lui $at, %hi(D_E02006C4) /* 325FA4 E02004D4 8C2106C4 */ lw $at, %lo(D_E02006C4)($at) /* 325FA8 E02004D8 00200008 */ jr $at -/* 325FAC E02004DC 00000000 */ nop +/* 325FAC E02004DC 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E02004E0.s b/asm/nonmatchings/code_325EE0/func_E02004E0.s index bbee3483b7..d9a4c381b9 100644 --- a/asm/nonmatchings/code_325EE0/func_E02004E0.s +++ b/asm/nonmatchings/code_325EE0/func_E02004E0.s @@ -5,4 +5,4 @@ glabel func_E02004E0 /* 325FB0 E02004E0 3C01E020 */ lui $at, %hi(D_E02006C8) /* 325FB4 E02004E4 8C2106C8 */ lw $at, %lo(D_E02006C8)($at) /* 325FB8 E02004E8 00200008 */ jr $at -/* 325FBC E02004EC 00000000 */ nop +/* 325FBC E02004EC 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E02004F0.s b/asm/nonmatchings/code_325EE0/func_E02004F0.s index f7355f483e..11400d9ee8 100644 --- a/asm/nonmatchings/code_325EE0/func_E02004F0.s +++ b/asm/nonmatchings/code_325EE0/func_E02004F0.s @@ -5,4 +5,4 @@ glabel func_E02004F0 /* 325FC0 E02004F0 3C01E020 */ lui $at, %hi(D_E02006CC) /* 325FC4 E02004F4 8C2106CC */ lw $at, %lo(D_E02006CC)($at) /* 325FC8 E02004F8 00200008 */ jr $at -/* 325FCC E02004FC 00000000 */ nop +/* 325FCC E02004FC 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200500.s b/asm/nonmatchings/code_325EE0/func_E0200500.s index 1b2143097f..353915afcf 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200500.s +++ b/asm/nonmatchings/code_325EE0/func_E0200500.s @@ -5,4 +5,4 @@ glabel func_E0200500 /* 325FD0 E0200500 3C01E020 */ lui $at, %hi(D_E02006D0) /* 325FD4 E0200504 8C2106D0 */ lw $at, %lo(D_E02006D0)($at) /* 325FD8 E0200508 00200008 */ jr $at -/* 325FDC E020050C 00000000 */ nop +/* 325FDC E020050C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200510.s b/asm/nonmatchings/code_325EE0/func_E0200510.s index cd4ab2f9fc..97cd76e085 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200510.s +++ b/asm/nonmatchings/code_325EE0/func_E0200510.s @@ -5,4 +5,4 @@ glabel func_E0200510 /* 325FE0 E0200510 3C01E020 */ lui $at, %hi(D_E02006D4) /* 325FE4 E0200514 8C2106D4 */ lw $at, %lo(D_E02006D4)($at) /* 325FE8 E0200518 00200008 */ jr $at -/* 325FEC E020051C 00000000 */ nop +/* 325FEC E020051C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200520.s b/asm/nonmatchings/code_325EE0/func_E0200520.s index 14deb598a2..4cbb9882f8 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200520.s +++ b/asm/nonmatchings/code_325EE0/func_E0200520.s @@ -5,4 +5,4 @@ glabel func_E0200520 /* 325FF0 E0200520 3C01E020 */ lui $at, %hi(D_E02006D8) /* 325FF4 E0200524 8C2106D8 */ lw $at, %lo(D_E02006D8)($at) /* 325FF8 E0200528 00200008 */ jr $at -/* 325FFC E020052C 00000000 */ nop +/* 325FFC E020052C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200530.s b/asm/nonmatchings/code_325EE0/func_E0200530.s index 3a8f31c83e..1d756f7bb4 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200530.s +++ b/asm/nonmatchings/code_325EE0/func_E0200530.s @@ -5,4 +5,4 @@ glabel func_E0200530 /* 326000 E0200530 3C01E020 */ lui $at, %hi(D_E02006DC) /* 326004 E0200534 8C2106DC */ lw $at, %lo(D_E02006DC)($at) /* 326008 E0200538 00200008 */ jr $at -/* 32600C E020053C 00000000 */ nop +/* 32600C E020053C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200540.s b/asm/nonmatchings/code_325EE0/func_E0200540.s index 91aec47f0c..a8dc4b0cb5 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200540.s +++ b/asm/nonmatchings/code_325EE0/func_E0200540.s @@ -5,4 +5,4 @@ glabel func_E0200540 /* 326010 E0200540 3C01E020 */ lui $at, %hi(D_E02006E0) /* 326014 E0200544 8C2106E0 */ lw $at, %lo(D_E02006E0)($at) /* 326018 E0200548 00200008 */ jr $at -/* 32601C E020054C 00000000 */ nop +/* 32601C E020054C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200550.s b/asm/nonmatchings/code_325EE0/func_E0200550.s index 68d0977c94..0a5b559bf7 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200550.s +++ b/asm/nonmatchings/code_325EE0/func_E0200550.s @@ -5,4 +5,4 @@ glabel func_E0200550 /* 326020 E0200550 3C01E020 */ lui $at, %hi(D_E02006E4) /* 326024 E0200554 8C2106E4 */ lw $at, %lo(D_E02006E4)($at) /* 326028 E0200558 00200008 */ jr $at -/* 32602C E020055C 00000000 */ nop +/* 32602C E020055C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200560.s b/asm/nonmatchings/code_325EE0/func_E0200560.s index 66ee8b5b29..58568f0579 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200560.s +++ b/asm/nonmatchings/code_325EE0/func_E0200560.s @@ -5,4 +5,4 @@ glabel func_E0200560 /* 326030 E0200560 3C01E020 */ lui $at, %hi(D_E02006E8) /* 326034 E0200564 8C2106E8 */ lw $at, %lo(D_E02006E8)($at) /* 326038 E0200568 00200008 */ jr $at -/* 32603C E020056C 00000000 */ nop +/* 32603C E020056C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200570.s b/asm/nonmatchings/code_325EE0/func_E0200570.s index 856957f3d4..d5a299091e 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200570.s +++ b/asm/nonmatchings/code_325EE0/func_E0200570.s @@ -5,4 +5,4 @@ glabel func_E0200570 /* 326040 E0200570 3C01E020 */ lui $at, %hi(D_E02006EC) /* 326044 E0200574 8C2106EC */ lw $at, %lo(D_E02006EC)($at) /* 326048 E0200578 00200008 */ jr $at -/* 32604C E020057C 00000000 */ nop +/* 32604C E020057C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200580.s b/asm/nonmatchings/code_325EE0/func_E0200580.s index f6bb01af04..e7994ae1b8 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200580.s +++ b/asm/nonmatchings/code_325EE0/func_E0200580.s @@ -5,4 +5,4 @@ glabel func_E0200580 /* 326050 E0200580 3C01E020 */ lui $at, %hi(D_E02006F0) /* 326054 E0200584 8C2106F0 */ lw $at, %lo(D_E02006F0)($at) /* 326058 E0200588 00200008 */ jr $at -/* 32605C E020058C 00000000 */ nop +/* 32605C E020058C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200590.s b/asm/nonmatchings/code_325EE0/func_E0200590.s index 710d3b8a57..b7e9fc55f5 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200590.s +++ b/asm/nonmatchings/code_325EE0/func_E0200590.s @@ -5,4 +5,4 @@ glabel func_E0200590 /* 326060 E0200590 3C01E020 */ lui $at, %hi(D_E02006F4) /* 326064 E0200594 8C2106F4 */ lw $at, %lo(D_E02006F4)($at) /* 326068 E0200598 00200008 */ jr $at -/* 32606C E020059C 00000000 */ nop +/* 32606C E020059C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E02005A0.s b/asm/nonmatchings/code_325EE0/func_E02005A0.s index 0a1454d63f..f76a2188a0 100644 --- a/asm/nonmatchings/code_325EE0/func_E02005A0.s +++ b/asm/nonmatchings/code_325EE0/func_E02005A0.s @@ -5,4 +5,4 @@ glabel func_E02005A0 /* 326070 E02005A0 3C01E020 */ lui $at, %hi(D_E02006F8) /* 326074 E02005A4 8C2106F8 */ lw $at, %lo(D_E02006F8)($at) /* 326078 E02005A8 00200008 */ jr $at -/* 32607C E02005AC 00000000 */ nop +/* 32607C E02005AC 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E02005B0.s b/asm/nonmatchings/code_325EE0/func_E02005B0.s index acf8ad162a..8d9da04e45 100644 --- a/asm/nonmatchings/code_325EE0/func_E02005B0.s +++ b/asm/nonmatchings/code_325EE0/func_E02005B0.s @@ -5,4 +5,4 @@ glabel func_E02005B0 /* 326080 E02005B0 3C01E020 */ lui $at, %hi(D_E02006FC) /* 326084 E02005B4 8C2106FC */ lw $at, %lo(D_E02006FC)($at) /* 326088 E02005B8 00200008 */ jr $at -/* 32608C E02005BC 00000000 */ nop +/* 32608C E02005BC 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E02005C0.s b/asm/nonmatchings/code_325EE0/func_E02005C0.s index f05b1697bc..6688b044f2 100644 --- a/asm/nonmatchings/code_325EE0/func_E02005C0.s +++ b/asm/nonmatchings/code_325EE0/func_E02005C0.s @@ -5,4 +5,4 @@ glabel func_E02005C0 /* 326090 E02005C0 3C01E020 */ lui $at, %hi(D_E0200700) /* 326094 E02005C4 8C210700 */ lw $at, %lo(D_E0200700)($at) /* 326098 E02005C8 00200008 */ jr $at -/* 32609C E02005CC 00000000 */ nop +/* 32609C E02005CC 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E02005D0.s b/asm/nonmatchings/code_325EE0/func_E02005D0.s index 404a771917..50099b98d8 100644 --- a/asm/nonmatchings/code_325EE0/func_E02005D0.s +++ b/asm/nonmatchings/code_325EE0/func_E02005D0.s @@ -5,4 +5,4 @@ glabel func_E02005D0 /* 3260A0 E02005D0 3C01E020 */ lui $at, %hi(D_E0200704) /* 3260A4 E02005D4 8C210704 */ lw $at, %lo(D_E0200704)($at) /* 3260A8 E02005D8 00200008 */ jr $at -/* 3260AC E02005DC 00000000 */ nop +/* 3260AC E02005DC 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E02005E0.s b/asm/nonmatchings/code_325EE0/func_E02005E0.s index 4de48ae25b..b0bc7ef95b 100644 --- a/asm/nonmatchings/code_325EE0/func_E02005E0.s +++ b/asm/nonmatchings/code_325EE0/func_E02005E0.s @@ -5,4 +5,4 @@ glabel func_E02005E0 /* 3260B0 E02005E0 3C01E020 */ lui $at, %hi(D_E0200708) /* 3260B4 E02005E4 8C210708 */ lw $at, %lo(D_E0200708)($at) /* 3260B8 E02005E8 00200008 */ jr $at -/* 3260BC E02005EC 00000000 */ nop +/* 3260BC E02005EC 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E02005F0.s b/asm/nonmatchings/code_325EE0/func_E02005F0.s index ec30b3a6ae..bd93b5c86d 100644 --- a/asm/nonmatchings/code_325EE0/func_E02005F0.s +++ b/asm/nonmatchings/code_325EE0/func_E02005F0.s @@ -5,4 +5,4 @@ glabel func_E02005F0 /* 3260C0 E02005F0 3C01E020 */ lui $at, %hi(D_E020070C) /* 3260C4 E02005F4 8C21070C */ lw $at, %lo(D_E020070C)($at) /* 3260C8 E02005F8 00200008 */ jr $at -/* 3260CC E02005FC 00000000 */ nop +/* 3260CC E02005FC 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200600.s b/asm/nonmatchings/code_325EE0/func_E0200600.s index fa68dbd7f0..baf6ecc9eb 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200600.s +++ b/asm/nonmatchings/code_325EE0/func_E0200600.s @@ -5,4 +5,4 @@ glabel func_E0200600 /* 3260D0 E0200600 3C01E020 */ lui $at, %hi(D_E0200710) /* 3260D4 E0200604 8C210710 */ lw $at, %lo(D_E0200710)($at) /* 3260D8 E0200608 00200008 */ jr $at -/* 3260DC E020060C 00000000 */ nop +/* 3260DC E020060C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200610.s b/asm/nonmatchings/code_325EE0/func_E0200610.s index 48f37095ad..e0ce661818 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200610.s +++ b/asm/nonmatchings/code_325EE0/func_E0200610.s @@ -5,4 +5,4 @@ glabel func_E0200610 /* 3260E0 E0200610 3C01E020 */ lui $at, %hi(D_E0200714) /* 3260E4 E0200614 8C210714 */ lw $at, %lo(D_E0200714)($at) /* 3260E8 E0200618 00200008 */ jr $at -/* 3260EC E020061C 00000000 */ nop +/* 3260EC E020061C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200620.s b/asm/nonmatchings/code_325EE0/func_E0200620.s index f57f761279..a13b2f0e1f 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200620.s +++ b/asm/nonmatchings/code_325EE0/func_E0200620.s @@ -5,4 +5,4 @@ glabel func_E0200620 /* 3260F0 E0200620 3C01E020 */ lui $at, %hi(D_E0200718) /* 3260F4 E0200624 8C210718 */ lw $at, %lo(D_E0200718)($at) /* 3260F8 E0200628 00200008 */ jr $at -/* 3260FC E020062C 00000000 */ nop +/* 3260FC E020062C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200630.s b/asm/nonmatchings/code_325EE0/func_E0200630.s index b31e8d8f45..e4aca31fb6 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200630.s +++ b/asm/nonmatchings/code_325EE0/func_E0200630.s @@ -5,4 +5,4 @@ glabel func_E0200630 /* 326100 E0200630 3C01E020 */ lui $at, %hi(D_E020071C) /* 326104 E0200634 8C21071C */ lw $at, %lo(D_E020071C)($at) /* 326108 E0200638 00200008 */ jr $at -/* 32610C E020063C 00000000 */ nop +/* 32610C E020063C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200640.s b/asm/nonmatchings/code_325EE0/func_E0200640.s index 53ef21af05..67d309861e 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200640.s +++ b/asm/nonmatchings/code_325EE0/func_E0200640.s @@ -5,4 +5,4 @@ glabel func_E0200640 /* 326110 E0200640 3C01E020 */ lui $at, %hi(D_E0200720) /* 326114 E0200644 8C210720 */ lw $at, %lo(D_E0200720)($at) /* 326118 E0200648 00200008 */ jr $at -/* 32611C E020064C 00000000 */ nop +/* 32611C E020064C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200650.s b/asm/nonmatchings/code_325EE0/func_E0200650.s index 9ee01c1d19..2930efb91c 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200650.s +++ b/asm/nonmatchings/code_325EE0/func_E0200650.s @@ -5,4 +5,4 @@ glabel func_E0200650 /* 326120 E0200650 3C01E020 */ lui $at, %hi(D_E0200724) /* 326124 E0200654 8C210724 */ lw $at, %lo(D_E0200724)($at) /* 326128 E0200658 00200008 */ jr $at -/* 32612C E020065C 00000000 */ nop +/* 32612C E020065C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200660.s b/asm/nonmatchings/code_325EE0/func_E0200660.s index 0210790658..1b66493b2f 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200660.s +++ b/asm/nonmatchings/code_325EE0/func_E0200660.s @@ -5,4 +5,4 @@ glabel func_E0200660 /* 326130 E0200660 3C01E020 */ lui $at, %hi(D_E0200728) /* 326134 E0200664 8C210728 */ lw $at, %lo(D_E0200728)($at) /* 326138 E0200668 00200008 */ jr $at -/* 32613C E020066C 00000000 */ nop +/* 32613C E020066C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200670.s b/asm/nonmatchings/code_325EE0/func_E0200670.s index 5d5344afda..f500036e85 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200670.s +++ b/asm/nonmatchings/code_325EE0/func_E0200670.s @@ -5,4 +5,4 @@ glabel func_E0200670 /* 326140 E0200670 3C01E020 */ lui $at, %hi(D_E020072C) /* 326144 E0200674 8C21072C */ lw $at, %lo(D_E020072C)($at) /* 326148 E0200678 00200008 */ jr $at -/* 32614C E020067C 00000000 */ nop +/* 32614C E020067C 00000000 */ nop diff --git a/asm/nonmatchings/code_325EE0/func_E0200680.s b/asm/nonmatchings/code_325EE0/func_E0200680.s index be59648c51..4833d841e1 100644 --- a/asm/nonmatchings/code_325EE0/func_E0200680.s +++ b/asm/nonmatchings/code_325EE0/func_E0200680.s @@ -5,4 +5,4 @@ glabel func_E0200680 /* 326150 E0200680 3C01E020 */ lui $at, %hi(D_E0200730) /* 326154 E0200684 8C210730 */ lw $at, %lo(D_E0200730)($at) /* 326158 E0200688 00200008 */ jr $at -/* 32615C E020068C 00000000 */ nop +/* 32615C E020068C 00000000 */ nop diff --git a/asm/nonmatchings/code_3278F0/func_E0002000.s b/asm/nonmatchings/code_3278F0/func_E0002000.s index 1412f66db3..53192603b7 100644 --- a/asm/nonmatchings/code_3278F0/func_E0002000.s +++ b/asm/nonmatchings/code_3278F0/func_E0002000.s @@ -45,7 +45,7 @@ glabel func_E0002000 /* 327990 E00020A0 AEB1000C */ sw $s1, 0xc($s5) .LE00020A4: /* 327994 E00020A4 08000829 */ j .LE00020A4 -/* 327998 E00020A8 00000000 */ nop +/* 327998 E00020A8 00000000 */ nop .LE00020AC: /* 32799C E00020AC 8EA20008 */ lw $v0, 8($s5) /* 3279A0 E00020B0 18400030 */ blez $v0, .LE0002174 @@ -84,11 +84,11 @@ glabel func_E0002000 /* 327A20 E0002130 0C080144 */ jal func_E0200510 /* 327A24 E0002134 46000586 */ mov.s $f22, $f0 /* 327A28 E0002138 4616A582 */ mul.s $f22, $f20, $f22 -/* 327A2C E000213C 00000000 */ nop +/* 327A2C E000213C 00000000 */ nop /* 327A30 E0002140 26940004 */ addiu $s4, $s4, 4 /* 327A34 E0002144 4600A507 */ neg.s $f20, $f20 /* 327A38 E0002148 4600A502 */ mul.s $f20, $f20, $f0 -/* 327A3C E000214C 00000000 */ nop +/* 327A3C E000214C 00000000 */ nop /* 327A40 E0002150 26730004 */ addiu $s3, $s3, 4 /* 327A44 E0002154 26520001 */ addiu $s2, $s2, 1 /* 327A48 E0002158 2631002C */ addiu $s1, $s1, 0x2c diff --git a/asm/nonmatchings/code_3278F0/func_E00021BC.s b/asm/nonmatchings/code_3278F0/func_E00021BC.s index aa53632528..9b6d6915d5 100644 --- a/asm/nonmatchings/code_3278F0/func_E00021BC.s +++ b/asm/nonmatchings/code_3278F0/func_E00021BC.s @@ -64,9 +64,9 @@ glabel func_E00021BC /* 327B8C E000229C 24A5002C */ addiu $a1, $a1, 0x2c .LE00022A0: /* 327B90 E00022A0 14E00003 */ bnez $a3, .LE00022B0 -/* 327B94 E00022A4 00000000 */ nop +/* 327B94 E00022A4 00000000 */ nop /* 327B98 E00022A8 0C080128 */ jal func_E02004A0 -/* 327B9C E00022AC 00000000 */ nop +/* 327B9C E00022AC 00000000 */ nop .LE00022B0: /* 327BA0 E00022B0 8FBF0010 */ lw $ra, 0x10($sp) /* 327BA4 E00022B4 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_3278F0/func_E0002300.s b/asm/nonmatchings/code_3278F0/func_E0002300.s index 4f02fa7d29..3a342952ee 100644 --- a/asm/nonmatchings/code_3278F0/func_E0002300.s +++ b/asm/nonmatchings/code_3278F0/func_E0002300.s @@ -163,13 +163,13 @@ glabel func_E0002300 /* 327E60 E0002570 86030000 */ lh $v1, ($s0) /* 327E64 E0002574 2442FFFF */ addiu $v0, $v0, -1 /* 327E68 E0002578 44826000 */ mtc1 $v0, $f12 -/* 327E6C E000257C 00000000 */ nop +/* 327E6C E000257C 00000000 */ nop /* 327E70 E0002580 46806320 */ cvt.s.w $f12, $f12 /* 327E74 E0002584 44831000 */ mtc1 $v1, $f2 -/* 327E78 E0002588 00000000 */ nop +/* 327E78 E0002588 00000000 */ nop /* 327E7C E000258C 468010A0 */ cvt.s.w $f2, $f2 /* 327E80 E0002590 460C103E */ c.le.s $f2, $f12 -/* 327E84 E0002594 00000000 */ nop +/* 327E84 E0002594 00000000 */ nop /* 327E88 E0002598 45000004 */ bc1f .LE00025AC /* 327E8C E000259C 240700FF */ addiu $a3, $zero, 0xff /* 327E90 E00025A0 8EA80018 */ lw $t0, 0x18($s5) @@ -177,24 +177,24 @@ glabel func_E0002300 /* 327E98 E00025A8 3C06D838 */ lui $a2, 0xd838 .LE00025AC: /* 327E9C E00025AC 46146302 */ mul.s $f12, $f12, $f20 -/* 327EA0 E00025B0 00000000 */ nop +/* 327EA0 E00025B0 00000000 */ nop /* 327EA4 E00025B4 3C0142B4 */ lui $at, 0x42b4 /* 327EA8 E00025B8 44810000 */ mtc1 $at, $f0 /* 327EAC E00025BC 46026303 */ div.s $f12, $f12, $f2 /* 327EB0 E00025C0 46006302 */ mul.s $f12, $f12, $f0 -/* 327EB4 E00025C4 00000000 */ nop +/* 327EB4 E00025C4 00000000 */ nop /* 327EB8 E00025C8 0C080140 */ jal func_E0200500 /* 327EBC E00025CC 46146303 */ div.s $f12, $f12, $f20 /* 327EC0 E00025D0 46140082 */ mul.s $f2, $f0, $f20 -/* 327EC4 E00025D4 00000000 */ nop +/* 327EC4 E00025D4 00000000 */ nop /* 327EC8 E00025D8 3C01437F */ lui $at, 0x437f /* 327ECC E00025DC 44810000 */ mtc1 $at, $f0 -/* 327ED0 E00025E0 00000000 */ nop +/* 327ED0 E00025E0 00000000 */ nop /* 327ED4 E00025E4 46001002 */ mul.s $f0, $f2, $f0 -/* 327ED8 E00025E8 00000000 */ nop +/* 327ED8 E00025E8 00000000 */ nop /* 327EDC E00025EC 4600010D */ trunc.w.s $f4, $f0 /* 327EE0 E00025F0 44032000 */ mfc1 $v1, $f4 -/* 327EE4 E00025F4 00000000 */ nop +/* 327EE4 E00025F4 00000000 */ nop /* 327EE8 E00025F8 04610002 */ bgez $v1, .LE0002604 /* 327EEC E00025FC 0060102D */ daddu $v0, $v1, $zero /* 327EF0 E0002600 246200FF */ addiu $v0, $v1, 0xff @@ -204,7 +204,7 @@ glabel func_E0002300 /* 327EFC E000260C 00623823 */ subu $a3, $v1, $v0 /* 327F00 E0002610 4600110D */ trunc.w.s $f4, $f2 /* 327F04 E0002614 44022000 */ mfc1 $v0, $f4 -/* 327F08 E0002618 00000000 */ nop +/* 327F08 E0002618 00000000 */ nop /* 327F0C E000261C 00021080 */ sll $v0, $v0, 2 /* 327F10 E0002620 00551021 */ addu $v0, $v0, $s5 /* 327F14 E0002624 8C480000 */ lw $t0, ($v0) diff --git a/asm/nonmatchings/code_328110/func_E000C160.s b/asm/nonmatchings/code_328110/func_E000C160.s index 64d16290a5..b317983b27 100644 --- a/asm/nonmatchings/code_328110/func_E000C160.s +++ b/asm/nonmatchings/code_328110/func_E000C160.s @@ -79,15 +79,18 @@ glabel func_E000C160 /* 32837C E000C26C 2E420005 */ sltiu $v0, $s2, 5 /* 328380 E000C270 1040000C */ beqz $v0, .LE000C2A4 /* 328384 E000C274 00121080 */ sll $v0, $s2, 2 -/* 328388 E000C278 3C01E001 */ lui $at, %hi(D_E000CD40) +/* 328388 E000C278 3C01E001 */ lui $at, %hi(jtbl_E000CD40_328E50) /* 32838C E000C27C 00220821 */ addu $at, $at, $v0 -/* 328390 E000C280 8C22CD40 */ lw $v0, %lo(D_E000CD40)($at) +/* 328390 E000C280 8C22CD40 */ lw $v0, %lo(jtbl_E000CD40_328E50)($at) /* 328394 E000C284 00400008 */ jr $v0 /* 328398 E000C288 00000000 */ nop +glabel LE000C28C_32839C /* 32839C E000C28C 080030A9 */ j .LE000C2A4 /* 3283A0 E000C290 AE200038 */ sw $zero, 0x38($s1) +glabel LE000C294_3283A4 /* 3283A4 E000C294 080030A8 */ j .LE000C2A0 /* 3283A8 E000C298 24020002 */ addiu $v0, $zero, 2 +glabel LE000C29C_3283AC /* 3283AC E000C29C 24020003 */ addiu $v0, $zero, 3 .LE000C2A0: /* 3283B0 E000C2A0 AE220038 */ sw $v0, 0x38($s1) @@ -101,11 +104,12 @@ glabel func_E000C160 /* 3283CC E000C2BC 104000D5 */ beqz $v0, .LE000C614 /* 3283D0 E000C2C0 26310044 */ addiu $s1, $s1, 0x44 /* 3283D4 E000C2C4 00121080 */ sll $v0, $s2, 2 -/* 3283D8 E000C2C8 3C01E001 */ lui $at, %hi(D_E000CD58) +/* 3283D8 E000C2C8 3C01E001 */ lui $at, %hi(jtbl_E000CD58_328E68) /* 3283DC E000C2CC 00220821 */ addu $at, $at, $v0 -/* 3283E0 E000C2D0 8C22CD58 */ lw $v0, %lo(D_E000CD58)($at) +/* 3283E0 E000C2D0 8C22CD58 */ lw $v0, %lo(jtbl_E000CD58_328E68)($at) /* 3283E4 E000C2D4 00400008 */ jr $v0 /* 3283E8 E000C2D8 00000000 */ nop +glabel LE000C2DC_3283EC /* 3283EC E000C2DC 24120001 */ addiu $s2, $zero, 1 /* 3283F0 E000C2E0 0253102A */ slt $v0, $s2, $s3 /* 3283F4 E000C2E4 104000CB */ beqz $v0, .LE000C614 @@ -153,6 +157,7 @@ glabel func_E000C160 /* 328498 E000C388 26100044 */ addiu $s0, $s0, 0x44 /* 32849C E000C38C 08003185 */ j .LE000C614 /* 3284A0 E000C390 00000000 */ nop +glabel LE000C394_3284A4 /* 3284A4 E000C394 24120001 */ addiu $s2, $zero, 1 /* 3284A8 E000C398 0253102A */ slt $v0, $s2, $s3 /* 3284AC E000C39C 1040009D */ beqz $v0, .LE000C614 @@ -256,6 +261,7 @@ glabel func_E000C160 /* 328618 E000C508 26100044 */ addiu $s0, $s0, 0x44 /* 32861C E000C50C 08003185 */ j .LE000C614 /* 328620 E000C510 00000000 */ nop +glabel LE000C514_328624 /* 328624 E000C514 24120001 */ addiu $s2, $zero, 1 /* 328628 E000C518 0253102A */ slt $v0, $s2, $s3 /* 32862C E000C51C 1040003D */ beqz $v0, .LE000C614 @@ -324,6 +330,7 @@ glabel func_E000C160 /* 32871C E000C60C 1440FFD4 */ bnez $v0, .LE000C560 /* 328720 E000C610 26100044 */ addiu $s0, $s0, 0x44 .LE000C614: +glabel LE000C614_328724 /* 328724 E000C614 8FBF003C */ lw $ra, 0x3c($sp) /* 328728 E000C618 8FB40038 */ lw $s4, 0x38($sp) /* 32872C E000C61C 8FB30034 */ lw $s3, 0x34($sp) diff --git a/asm/nonmatchings/code_32C110/func_E000E000.s b/asm/nonmatchings/code_32C110/func_E000E000.s index ded17b7a11..70c45e4a86 100644 --- a/asm/nonmatchings/code_32C110/func_E000E000.s +++ b/asm/nonmatchings/code_32C110/func_E000E000.s @@ -44,7 +44,7 @@ glabel func_E000E000 /* 32C1AC E000E09C AE11000C */ sw $s1, 0xc($s0) .LE000E0A0: /* 32C1B0 E000E0A0 08003828 */ j .LE000E0A0 -/* 32C1B4 E000E0A4 00000000 */ nop +/* 32C1B4 E000E0A4 00000000 */ nop .LE000E0A8: /* 32C1B8 E000E0A8 0220202D */ daddu $a0, $s1, $zero /* 32C1BC E000E0AC 00122900 */ sll $a1, $s2, 4 diff --git a/asm/nonmatchings/code_32C110/func_E000E16C.s b/asm/nonmatchings/code_32C110/func_E000E16C.s index 85be6632b6..d8fcc0ae5c 100644 --- a/asm/nonmatchings/code_32C110/func_E000E16C.s +++ b/asm/nonmatchings/code_32C110/func_E000E16C.s @@ -3,4 +3,4 @@ glabel func_E000E16C /* 32C27C E000E16C 03E00008 */ jr $ra -/* 32C280 E000E170 00000000 */ nop +/* 32C280 E000E170 00000000 */ nop diff --git a/asm/nonmatchings/code_32C110/func_E000E174.s b/asm/nonmatchings/code_32C110/func_E000E174.s index 90be60e469..54f4d78947 100644 --- a/asm/nonmatchings/code_32C110/func_E000E174.s +++ b/asm/nonmatchings/code_32C110/func_E000E174.s @@ -18,9 +18,9 @@ glabel func_E000E174 /* 32C2B8 E000E1A8 04410005 */ bgez $v0, .LE000E1C0 /* 32C2BC E000E1AC ACC20074 */ sw $v0, 0x74($a2) /* 32C2C0 E000E1B0 0C080128 */ jal func_E02004A0 -/* 32C2C4 E000E1B4 00000000 */ nop +/* 32C2C4 E000E1B4 00000000 */ nop /* 32C2C8 E000E1B8 0800388E */ j .LE000E238 -/* 32C2CC E000E1BC 00000000 */ nop +/* 32C2CC E000E1BC 00000000 */ nop .LE000E1C0: /* 32C2D0 E000E1C0 8C820008 */ lw $v0, 8($a0) /* 32C2D4 E000E1C4 1840001C */ blez $v0, .LE000E238 @@ -30,11 +30,11 @@ glabel func_E000E174 /* 32C2E0 E000E1D0 C462004C */ lwc1 $f2, 0x4c($v1) /* 32C2E4 E000E1D4 C4600058 */ lwc1 $f0, 0x58($v1) /* 32C2E8 E000E1D8 46001082 */ mul.s $f2, $f2, $f0 -/* 32C2EC E000E1DC 00000000 */ nop +/* 32C2EC E000E1DC 00000000 */ nop /* 32C2F0 E000E1E0 C468004C */ lwc1 $f8, 0x4c($v1) /* 32C2F4 E000E1E4 C460005C */ lwc1 $f0, 0x5c($v1) /* 32C2F8 E000E1E8 46004202 */ mul.s $f8, $f8, $f0 -/* 32C2FC E000E1EC 00000000 */ nop +/* 32C2FC E000E1EC 00000000 */ nop /* 32C300 E000E1F0 C466FFFC */ lwc1 $f6, -4($v1) /* 32C304 E000E1F4 C4600054 */ lwc1 $f0, 0x54($v1) /* 32C308 E000E1F8 46023180 */ add.s $f6, $f6, $f2 diff --git a/asm/nonmatchings/code_32C110/func_E000E288.s b/asm/nonmatchings/code_32C110/func_E000E288.s index 6e30e654f0..14122355b5 100644 --- a/asm/nonmatchings/code_32C110/func_E000E288.s +++ b/asm/nonmatchings/code_32C110/func_E000E288.s @@ -25,17 +25,17 @@ glabel func_E000E288 /* 32C3E8 E000E2D8 3C1E0900 */ lui $fp, 0x900 /* 32C3EC E000E2DC 27DE2B20 */ addiu $fp, $fp, 0x2b20 /* 32C3F0 E000E2E0 1160000A */ beqz $t3, .LE000E30C -/* 32C3F4 E000E2E4 00000000 */ nop +/* 32C3F4 E000E2E4 00000000 */ nop .LE000E2E8: /* 32C3F8 E000E2E8 3C0A0900 */ lui $t2, 0x900 /* 32C3FC E000E2EC 254A2950 */ addiu $t2, $t2, 0x2950 /* 32C400 E000E2F0 24020001 */ addiu $v0, $zero, 1 /* 32C404 E000E2F4 15620007 */ bne $t3, $v0, .LE000E314 -/* 32C408 E000E2F8 00000000 */ nop +/* 32C408 E000E2F8 00000000 */ nop /* 32C40C E000E2FC 3C0A0900 */ lui $t2, 0x900 /* 32C410 E000E300 254A2868 */ addiu $t2, $t2, 0x2868 /* 32C414 E000E304 080038C5 */ j .LE000E314 -/* 32C418 E000E308 00000000 */ nop +/* 32C418 E000E308 00000000 */ nop .LE000E30C: /* 32C41C E000E30C 3C0A0900 */ lui $t2, 0x900 /* 32C420 E000E310 254A2780 */ addiu $t2, $t2, 0x2780 @@ -259,4 +259,4 @@ glabel func_E000E288 /* 32C760 E000E650 D7B400C0 */ ldc1 $f20, 0xc0($sp) /* 32C764 E000E654 03E00008 */ jr $ra /* 32C768 E000E658 27BD00C8 */ addiu $sp, $sp, 0xc8 -/* 32C76C E000E65C 00000000 */ nop +/* 32C76C E000E65C 00000000 */ nop diff --git a/asm/nonmatchings/code_32C7A0/func_E0010104.s b/asm/nonmatchings/code_32C7A0/func_E0010104.s index 496db02be4..f6879f25e4 100644 --- a/asm/nonmatchings/code_32C7A0/func_E0010104.s +++ b/asm/nonmatchings/code_32C7A0/func_E0010104.s @@ -7,16 +7,16 @@ glabel func_E0010104 /* 32C8AC E001010C D4220710 */ ldc1 $f2, %lo(D_E0010710)($at) /* 32C8B0 E0010110 46000021 */ cvt.d.s $f0, $f0 /* 32C8B4 E0010114 46220002 */ mul.d $f0, $f0, $f2 -/* 32C8B8 E0010118 00000000 */ nop +/* 32C8B8 E0010118 00000000 */ nop /* 32C8BC E001011C C48A0090 */ lwc1 $f10, 0x90($a0) /* 32C8C0 E0010120 46200020 */ cvt.s.d $f0, $f0 /* 32C8C4 E0010124 460A0282 */ mul.s $f10, $f0, $f10 -/* 32C8C8 E0010128 00000000 */ nop +/* 32C8C8 E0010128 00000000 */ nop /* 32C8CC E001012C E4800070 */ swc1 $f0, 0x70($a0) /* 32C8D0 E0010130 46000306 */ mov.s $f12, $f0 /* 32C8D4 E0010134 C4800094 */ lwc1 $f0, 0x94($a0) /* 32C8D8 E0010138 46006302 */ mul.s $f12, $f12, $f0 -/* 32C8DC E001013C 00000000 */ nop +/* 32C8DC E001013C 00000000 */ nop /* 32C8E0 E0010140 C4820088 */ lwc1 $f2, 0x88($a0) /* 32C8E4 E0010144 C480008C */ lwc1 $f0, 0x8c($a0) /* 32C8E8 E0010148 46001080 */ add.s $f2, $f2, $f0 @@ -42,22 +42,22 @@ glabel func_E0010104 /* 32C938 E0010198 3C013B83 */ lui $at, 0x3b83 /* 32C93C E001019C 3421126F */ ori $at, $at, 0x126f /* 32C940 E00101A0 44810000 */ mtc1 $at, $f0 -/* 32C944 E00101A4 00000000 */ nop +/* 32C944 E00101A4 00000000 */ nop /* 32C948 E00101A8 E4800088 */ swc1 $f0, 0x88($a0) .LE00101AC: /* 32C94C E00101AC C4800024 */ lwc1 $f0, 0x24($a0) /* 32C950 E00101B0 3C013F80 */ lui $at, 0x3f80 /* 32C954 E00101B4 44811000 */ mtc1 $at, $f2 -/* 32C958 E00101B8 00000000 */ nop +/* 32C958 E00101B8 00000000 */ nop /* 32C95C E00101BC 46020001 */ sub.s $f0, $f0, $f2 /* 32C960 E00101C0 3C01C2C8 */ lui $at, 0xc2c8 /* 32C964 E00101C4 44811000 */ mtc1 $at, $f2 -/* 32C968 E00101C8 00000000 */ nop +/* 32C968 E00101C8 00000000 */ nop /* 32C96C E00101CC 4602003C */ c.lt.s $f0, $f2 -/* 32C970 E00101D0 00000000 */ nop +/* 32C970 E00101D0 00000000 */ nop /* 32C974 E00101D4 45000002 */ bc1f .LE00101E0 /* 32C978 E00101D8 E4800024 */ swc1 $f0, 0x24($a0) /* 32C97C E00101DC E4820024 */ swc1 $f2, 0x24($a0) .LE00101E0: /* 32C980 E00101E0 03E00008 */ jr $ra -/* 32C984 E00101E4 00000000 */ nop +/* 32C984 E00101E4 00000000 */ nop diff --git a/asm/nonmatchings/code_32C7A0/func_E00101E8.s b/asm/nonmatchings/code_32C7A0/func_E00101E8.s index f2ac30534c..1092ca5897 100644 --- a/asm/nonmatchings/code_32C7A0/func_E00101E8.s +++ b/asm/nonmatchings/code_32C7A0/func_E00101E8.s @@ -47,7 +47,7 @@ glabel func_E00101E8 /* 32CA30 E0010290 AE11000C */ sw $s1, 0xc($s0) .LE0010294: /* 32CA34 E0010294 080040A5 */ j .LE0010294 -/* 32CA38 E0010298 00000000 */ nop +/* 32CA38 E0010298 00000000 */ nop .LE001029C: /* 32CA3C E001029C 0220202D */ daddu $a0, $s1, $zero /* 32CA40 E00102A0 00142880 */ sll $a1, $s4, 2 @@ -70,7 +70,7 @@ glabel func_E00101E8 /* 32CA84 E00102E4 4481B000 */ mtc1 $at, $f22 .LE00102E8: /* 32CA88 E00102E8 44930000 */ mtc1 $s3, $f0 -/* 32CA8C E00102EC 00000000 */ nop +/* 32CA8C E00102EC 00000000 */ nop /* 32CA90 E00102F0 46800020 */ cvt.s.w $f0, $f0 /* 32CA94 E00102F4 26730048 */ addiu $s3, $s3, 0x48 /* 32CA98 E00102F8 C7A6008C */ lwc1 $f6, 0x8c($sp) diff --git a/asm/nonmatchings/code_32C7A0/func_E00103EC.s b/asm/nonmatchings/code_32C7A0/func_E00103EC.s index 66332adb5d..ef39e25631 100644 --- a/asm/nonmatchings/code_32C7A0/func_E00103EC.s +++ b/asm/nonmatchings/code_32C7A0/func_E00103EC.s @@ -3,4 +3,4 @@ glabel func_E00103EC /* 32CB8C E00103EC 03E00008 */ jr $ra -/* 32CB90 E00103F0 00000000 */ nop +/* 32CB90 E00103F0 00000000 */ nop diff --git a/asm/nonmatchings/code_32C7A0/func_E00103F4.s b/asm/nonmatchings/code_32C7A0/func_E00103F4.s index 8eb13a8e20..67266973bc 100644 --- a/asm/nonmatchings/code_32C7A0/func_E00103F4.s +++ b/asm/nonmatchings/code_32C7A0/func_E00103F4.s @@ -43,7 +43,7 @@ glabel func_E00103F4 /* 32CC1C E001047C 26100098 */ addiu $s0, $s0, 0x98 .LE0010480: /* 32CC20 E0010480 16600003 */ bnez $s3, .LE0010490 -/* 32CC24 E0010484 00000000 */ nop +/* 32CC24 E0010484 00000000 */ nop /* 32CC28 E0010488 0C080128 */ jal func_E02004A0 /* 32CC2C E001048C 0280202D */ daddu $a0, $s4, $zero .LE0010490: diff --git a/asm/nonmatchings/code_32C7A0/func_E00104F4.s b/asm/nonmatchings/code_32C7A0/func_E00104F4.s index d3c3cc59eb..2575c81580 100644 --- a/asm/nonmatchings/code_32C7A0/func_E00104F4.s +++ b/asm/nonmatchings/code_32C7A0/func_E00104F4.s @@ -5,7 +5,7 @@ glabel func_E00104F4 /* 32CC94 E00104F4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 32CC98 E00104F8 AFBF0010 */ sw $ra, 0x10($sp) /* 32CC9C E00104FC 0C080128 */ jal func_E02004A0 -/* 32CCA0 E0010500 00000000 */ nop +/* 32CCA0 E0010500 00000000 */ nop /* 32CCA4 E0010504 8FBF0010 */ lw $ra, 0x10($sp) /* 32CCA8 E0010508 03E00008 */ jr $ra /* 32CCAC E001050C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_32C7A0/func_E0010510.s b/asm/nonmatchings/code_32C7A0/func_E0010510.s index 7e64d8a0ec..a5a636d8be 100644 --- a/asm/nonmatchings/code_32C7A0/func_E0010510.s +++ b/asm/nonmatchings/code_32C7A0/func_E0010510.s @@ -131,6 +131,6 @@ glabel func_E0010510 /* 32CE98 E00106F8 8FB00000 */ lw $s0, ($sp) /* 32CE9C E00106FC 03E00008 */ jr $ra /* 32CEA0 E0010700 27BD0020 */ addiu $sp, $sp, 0x20 -/* 32CEA4 E0010704 00000000 */ nop -/* 32CEA8 E0010708 00000000 */ nop -/* 32CEAC E001070C 00000000 */ nop +/* 32CEA4 E0010704 00000000 */ nop +/* 32CEA8 E0010708 00000000 */ nop +/* 32CEAC E001070C 00000000 */ nop diff --git a/asm/nonmatchings/code_32DD10/func_E0012104.s b/asm/nonmatchings/code_32DD10/func_E0012104.s index 97122477ed..f7c3419bc5 100644 --- a/asm/nonmatchings/code_32DD10/func_E0012104.s +++ b/asm/nonmatchings/code_32DD10/func_E0012104.s @@ -4,18 +4,18 @@ glabel func_E0012104 /* 32DE14 E0012104 94820004 */ lhu $v0, 4($a0) /* 32DE18 E0012108 14400010 */ bnez $v0, .LE001214C -/* 32DE1C E001210C 00000000 */ nop +/* 32DE1C E001210C 00000000 */ nop /* 32DE20 E0012110 C4820078 */ lwc1 $f2, 0x78($a0) /* 32DE24 E0012114 44800000 */ mtc1 $zero, $f0 -/* 32DE28 E0012118 00000000 */ nop +/* 32DE28 E0012118 00000000 */ nop /* 32DE2C E001211C 46001032 */ c.eq.s $f2, $f0 -/* 32DE30 E0012120 00000000 */ nop +/* 32DE30 E0012120 00000000 */ nop /* 32DE34 E0012124 45010009 */ bc1t .LE001214C -/* 32DE38 E0012128 00000000 */ nop +/* 32DE38 E0012128 00000000 */ nop /* 32DE3C E001212C 3C028011 */ lui $v0, %hi(gPlayerActionState) /* 32DE40 E0012130 8042F07C */ lb $v0, %lo(gPlayerActionState)($v0) /* 32DE44 E0012134 14400005 */ bnez $v0, .LE001214C -/* 32DE48 E0012138 00000000 */ nop +/* 32DE48 E0012138 00000000 */ nop /* 32DE4C E001213C 94820006 */ lhu $v0, 6($a0) /* 32DE50 E0012140 24420001 */ addiu $v0, $v0, 1 /* 32DE54 E0012144 03E00008 */ jr $ra @@ -30,23 +30,23 @@ glabel func_E0012104 /* 32DE74 E0012164 460C0000 */ add.s $f0, $f0, $f12 /* 32DE78 E0012168 C48A0070 */ lwc1 $f10, 0x70($a0) /* 32DE7C E001216C 460A0282 */ mul.s $f10, $f0, $f10 -/* 32DE80 E0012170 00000000 */ nop +/* 32DE80 E0012170 00000000 */ nop /* 32DE84 E0012174 E4800080 */ swc1 $f0, 0x80($a0) /* 32DE88 E0012178 46000186 */ mov.s $f6, $f0 /* 32DE8C E001217C C4800074 */ lwc1 $f0, 0x74($a0) /* 32DE90 E0012180 46003182 */ mul.s $f6, $f6, $f0 -/* 32DE94 E0012184 00000000 */ nop +/* 32DE94 E0012184 00000000 */ nop /* 32DE98 E0012188 C4800090 */ lwc1 $f0, 0x90($a0) /* 32DE9C E001218C 46003182 */ mul.s $f6, $f6, $f0 -/* 32DEA0 E0012190 00000000 */ nop +/* 32DEA0 E0012190 00000000 */ nop /* 32DEA4 E0012194 C4880080 */ lwc1 $f8, 0x80($a0) /* 32DEA8 E0012198 C4800074 */ lwc1 $f0, 0x74($a0) /* 32DEAC E001219C 46004202 */ mul.s $f8, $f8, $f0 -/* 32DEB0 E00121A0 00000000 */ nop +/* 32DEB0 E00121A0 00000000 */ nop /* 32DEB4 E00121A4 C4800094 */ lwc1 $f0, 0x94($a0) /* 32DEB8 E00121A8 90820008 */ lbu $v0, 8($a0) /* 32DEBC E00121AC 46004202 */ mul.s $f8, $f8, $f0 -/* 32DEC0 E00121B0 00000000 */ nop +/* 32DEC0 E00121B0 00000000 */ nop /* 32DEC4 E00121B4 C482002C */ lwc1 $f2, 0x2c($a0) /* 32DEC8 E00121B8 C484000C */ lwc1 $f4, 0xc($a0) /* 32DECC E00121BC 2442FFF4 */ addiu $v0, $v0, -0xc @@ -67,4 +67,4 @@ glabel func_E0012104 /* 32DF08 E00121F8 E48A0078 */ swc1 $f10, 0x78($a0) .LE00121FC: /* 32DF0C E00121FC 03E00008 */ jr $ra -/* 32DF10 E0012200 00000000 */ nop +/* 32DF10 E0012200 00000000 */ nop diff --git a/asm/nonmatchings/code_32DD10/func_E0012204.s b/asm/nonmatchings/code_32DD10/func_E0012204.s index 41a6d37f3d..3fc1c07f76 100644 --- a/asm/nonmatchings/code_32DD10/func_E0012204.s +++ b/asm/nonmatchings/code_32DD10/func_E0012204.s @@ -46,7 +46,7 @@ glabel func_E0012204 /* 32DFB8 E00122A8 AE11000C */ sw $s1, 0xc($s0) .LE00122AC: /* 32DFBC E00122AC 080048AB */ j .LE00122AC -/* 32DFC0 E00122B0 00000000 */ nop +/* 32DFC0 E00122B0 00000000 */ nop .LE00122B4: /* 32DFC4 E00122B4 0220202D */ daddu $a0, $s1, $zero /* 32DFC8 E00122B8 00132880 */ sll $a1, $s3, 2 @@ -91,7 +91,7 @@ glabel func_E0012204 .LE0012350: /* 32E060 E0012350 3C014120 */ lui $at, 0x4120 /* 32E064 E0012354 44810000 */ mtc1 $at, $f0 -/* 32E068 E0012358 00000000 */ nop +/* 32E068 E0012358 00000000 */ nop /* 32E06C E001235C E600FFDC */ swc1 $f0, -0x24($s0) .LE0012360: /* 32E070 E0012360 24040064 */ addiu $a0, $zero, 0x64 diff --git a/asm/nonmatchings/code_32DD10/func_E0012440.s b/asm/nonmatchings/code_32DD10/func_E0012440.s index 89d906cd35..bd356a1678 100644 --- a/asm/nonmatchings/code_32DD10/func_E0012440.s +++ b/asm/nonmatchings/code_32DD10/func_E0012440.s @@ -3,4 +3,4 @@ glabel func_E0012440 /* 32E150 E0012440 03E00008 */ jr $ra -/* 32E154 E0012444 00000000 */ nop +/* 32E154 E0012444 00000000 */ nop diff --git a/asm/nonmatchings/code_32DD10/func_E0012448.s b/asm/nonmatchings/code_32DD10/func_E0012448.s index 52b2aef96b..ddb5b8517b 100644 --- a/asm/nonmatchings/code_32DD10/func_E0012448.s +++ b/asm/nonmatchings/code_32DD10/func_E0012448.s @@ -43,7 +43,7 @@ glabel func_E0012448 /* 32E1E0 E00124D0 26100098 */ addiu $s0, $s0, 0x98 .LE00124D4: /* 32E1E4 E00124D4 16600003 */ bnez $s3, .LE00124E4 -/* 32E1E8 E00124D8 00000000 */ nop +/* 32E1E8 E00124D8 00000000 */ nop /* 32E1EC E00124DC 0C080128 */ jal func_E02004A0 /* 32E1F0 E00124E0 0280202D */ daddu $a0, $s4, $zero .LE00124E4: diff --git a/asm/nonmatchings/code_32DD10/func_E0012548.s b/asm/nonmatchings/code_32DD10/func_E0012548.s index 9eac0789e6..9dc9201234 100644 --- a/asm/nonmatchings/code_32DD10/func_E0012548.s +++ b/asm/nonmatchings/code_32DD10/func_E0012548.s @@ -5,7 +5,7 @@ glabel func_E0012548 /* 32E258 E0012548 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 32E25C E001254C AFBF0010 */ sw $ra, 0x10($sp) /* 32E260 E0012550 0C080128 */ jal func_E02004A0 -/* 32E264 E0012554 00000000 */ nop +/* 32E264 E0012554 00000000 */ nop /* 32E268 E0012558 8FBF0010 */ lw $ra, 0x10($sp) /* 32E26C E001255C 03E00008 */ jr $ra /* 32E270 E0012560 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_32DD10/func_E0012564.s b/asm/nonmatchings/code_32DD10/func_E0012564.s index 3b330df785..ee99137c64 100644 --- a/asm/nonmatchings/code_32DD10/func_E0012564.s +++ b/asm/nonmatchings/code_32DD10/func_E0012564.s @@ -141,4 +141,4 @@ glabel func_E0012564 /* 32E480 E0012770 8FB00000 */ lw $s0, ($sp) /* 32E484 E0012774 03E00008 */ jr $ra /* 32E488 E0012778 27BD0020 */ addiu $sp, $sp, 0x20 -/* 32E48C E001277C 00000000 */ nop +/* 32E48C E001277C 00000000 */ nop diff --git a/asm/nonmatchings/code_32EE30/func_E0016000.s b/asm/nonmatchings/code_32EE30/func_E0016000.s index 9c18e0b5a6..dce68b819c 100644 --- a/asm/nonmatchings/code_32EE30/func_E0016000.s +++ b/asm/nonmatchings/code_32EE30/func_E0016000.s @@ -45,7 +45,7 @@ glabel func_E0016000 /* 32EED0 E00160A0 AE11000C */ sw $s1, 0xc($s0) .LE00160A4: /* 32EED4 E00160A4 08005829 */ j .LE00160A4 -/* 32EED8 E00160A8 00000000 */ nop +/* 32EED8 E00160A8 00000000 */ nop .LE00160AC: /* 32EEDC E00160AC 0220202D */ daddu $a0, $s1, $zero /* 32EEE0 E00160B0 00132880 */ sll $a1, $s3, 2 @@ -77,10 +77,10 @@ glabel func_E0016000 /* 32EF44 E0016114 0C080138 */ jal func_E02004E0 /* 32EF48 E0016118 A2140000 */ sb $s4, ($s0) /* 32EF4C E001611C 44820000 */ mtc1 $v0, $f0 -/* 32EF50 E0016120 00000000 */ nop +/* 32EF50 E0016120 00000000 */ nop /* 32EF54 E0016124 46800021 */ cvt.d.w $f0, $f0 /* 32EF58 E0016128 46340002 */ mul.d $f0, $f0, $f20 -/* 32EF5C E001612C 00000000 */ nop +/* 32EF5C E001612C 00000000 */ nop /* 32EF60 E0016130 3C01E001 */ lui $at, %hi(D_E0016728) /* 32EF64 E0016134 D4226728 */ ldc1 $f2, %lo(D_E0016728)($at) /* 32EF68 E0016138 46220000 */ add.d $f0, $f0, $f2 @@ -89,10 +89,10 @@ glabel func_E0016000 /* 32EF74 E0016144 0C080138 */ jal func_E02004E0 /* 32EF78 E0016148 E6000020 */ swc1 $f0, 0x20($s0) /* 32EF7C E001614C 44820000 */ mtc1 $v0, $f0 -/* 32EF80 E0016150 00000000 */ nop +/* 32EF80 E0016150 00000000 */ nop /* 32EF84 E0016154 46800021 */ cvt.d.w $f0, $f0 /* 32EF88 E0016158 46340002 */ mul.d $f0, $f0, $f20 -/* 32EF8C E001615C 00000000 */ nop +/* 32EF8C E001615C 00000000 */ nop /* 32EF90 E0016160 3C013FF8 */ lui $at, 0x3ff8 /* 32EF94 E0016164 44811800 */ mtc1 $at, $f3 /* 32EF98 E0016168 44801000 */ mtc1 $zero, $f2 @@ -105,7 +105,7 @@ glabel func_E0016000 /* 32EFB4 E0016184 E6000024 */ swc1 $f0, 0x24($s0) /* 32EFB8 E0016188 24040168 */ addiu $a0, $zero, 0x168 /* 32EFBC E001618C 44820000 */ mtc1 $v0, $f0 -/* 32EFC0 E0016190 00000000 */ nop +/* 32EFC0 E0016190 00000000 */ nop /* 32EFC4 E0016194 46800020 */ cvt.s.w $f0, $f0 /* 32EFC8 E0016198 E6000028 */ swc1 $f0, 0x28($s0) /* 32EFCC E001619C 3C014000 */ lui $at, 0x4000 @@ -119,7 +119,7 @@ glabel func_E0016000 /* 32EFEC E00161BC 0C080000 */ jal func_E0200000 /* 32EFF0 E00161C0 E6020034 */ swc1 $f2, 0x34($s0) /* 32EFF4 E00161C4 44820000 */ mtc1 $v0, $f0 -/* 32EFF8 E00161C8 00000000 */ nop +/* 32EFF8 E00161C8 00000000 */ nop /* 32EFFC E00161CC 46800020 */ cvt.s.w $f0, $f0 /* 32F000 E00161D0 E6000010 */ swc1 $f0, 0x10($s0) /* 32F004 E00161D4 A2140000 */ sb $s4, ($s0) diff --git a/asm/nonmatchings/code_32EE30/func_E0016220.s b/asm/nonmatchings/code_32EE30/func_E0016220.s index 4c26e84db9..971e2e342b 100644 --- a/asm/nonmatchings/code_32EE30/func_E0016220.s +++ b/asm/nonmatchings/code_32EE30/func_E0016220.s @@ -3,4 +3,4 @@ glabel func_E0016220 /* 32F050 E0016220 03E00008 */ jr $ra -/* 32F054 E0016224 00000000 */ nop +/* 32F054 E0016224 00000000 */ nop diff --git a/asm/nonmatchings/code_32EE30/func_E0016228.s b/asm/nonmatchings/code_32EE30/func_E0016228.s index 704c900878..0d44c8e8dd 100644 --- a/asm/nonmatchings/code_32EE30/func_E0016228.s +++ b/asm/nonmatchings/code_32EE30/func_E0016228.s @@ -30,7 +30,7 @@ glabel func_E0016228 /* 32F0B8 E0016288 A602FFCE */ sh $v0, -0x32($s0) /* 32F0BC E001628C 00021400 */ sll $v0, $v0, 0x10 /* 32F0C0 E0016290 1C400003 */ bgtz $v0, .LE00162A0 -/* 32F0C4 E0016294 00000000 */ nop +/* 32F0C4 E0016294 00000000 */ nop /* 32F0C8 E0016298 080058F0 */ j .LE00163C0 /* 32F0CC E001629C AE200000 */ sw $zero, ($s1) .LE00162A0: @@ -44,7 +44,7 @@ glabel func_E0016228 /* 32F0EC E00162BC E60CFFF8 */ swc1 $f12, -8($s0) /* 32F0F0 E00162C0 46000021 */ cvt.d.s $f0, $f0 /* 32F0F4 E00162C4 46340002 */ mul.d $f0, $f0, $f20 -/* 32F0F8 E00162C8 00000000 */ nop +/* 32F0F8 E00162C8 00000000 */ nop /* 32F0FC E00162CC C602FFF0 */ lwc1 $f2, -0x10($s0) /* 32F100 E00162D0 460010A1 */ cvt.d.s $f2, $f2 /* 32F104 E00162D4 46201080 */ add.d $f2, $f2, $f0 @@ -54,7 +54,7 @@ glabel func_E0016228 /* 32F114 E00162E4 E602FFE4 */ swc1 $f2, -0x1c($s0) /* 32F118 E00162E8 46000021 */ cvt.d.s $f0, $f0 /* 32F11C E00162EC 46340002 */ mul.d $f0, $f0, $f20 -/* 32F120 E00162F0 00000000 */ nop +/* 32F120 E00162F0 00000000 */ nop /* 32F124 E00162F4 C602FFF4 */ lwc1 $f2, -0xc($s0) /* 32F128 E00162F8 460010A1 */ cvt.d.s $f2, $f2 /* 32F12C E00162FC 46201080 */ add.d $f2, $f2, $f0 @@ -79,7 +79,7 @@ glabel func_E0016228 /* 32F174 E0016344 D4206738 */ ldc1 $f0, %lo(D_E0016738)($at) /* 32F178 E0016348 46002121 */ cvt.d.s $f4, $f4 /* 32F17C E001634C 46202102 */ mul.d $f4, $f4, $f0 -/* 32F180 E0016350 00000000 */ nop +/* 32F180 E0016350 00000000 */ nop /* 32F184 E0016354 9202FFD0 */ lbu $v0, -0x30($s0) /* 32F188 E0016358 C6080004 */ lwc1 $f8, 4($s0) /* 32F18C E001635C C6020008 */ lwc1 $f2, 8($s0) @@ -117,7 +117,7 @@ glabel func_E0016228 /* 32F204 E00163D4 26310050 */ addiu $s1, $s1, 0x50 .LE00163D8: /* 32F208 E00163D8 16600003 */ bnez $s3, .LE00163E8 -/* 32F20C E00163DC 00000000 */ nop +/* 32F20C E00163DC 00000000 */ nop /* 32F210 E00163E0 0C080128 */ jal func_E02004A0 /* 32F214 E00163E4 0280202D */ daddu $a0, $s4, $zero .LE00163E8: diff --git a/asm/nonmatchings/code_32EE30/func_E0016454.s b/asm/nonmatchings/code_32EE30/func_E0016454.s index d113fb2aeb..fb40b27857 100644 --- a/asm/nonmatchings/code_32EE30/func_E0016454.s +++ b/asm/nonmatchings/code_32EE30/func_E0016454.s @@ -183,4 +183,4 @@ glabel func_E0016454 /* 32F540 E0016710 D7B400C8 */ ldc1 $f20, 0xc8($sp) /* 32F544 E0016714 03E00008 */ jr $ra /* 32F548 E0016718 27BD00D8 */ addiu $sp, $sp, 0xd8 -/* 32F54C E001671C 00000000 */ nop +/* 32F54C E001671C 00000000 */ nop diff --git a/asm/nonmatchings/code_32F580/func_E0018078.s b/asm/nonmatchings/code_32F580/func_E0018078.s index f381472f54..762700397c 100644 --- a/asm/nonmatchings/code_32F580/func_E0018078.s +++ b/asm/nonmatchings/code_32F580/func_E0018078.s @@ -44,7 +44,7 @@ glabel func_E0018078 /* 32F694 E0018114 AE11000C */ sw $s1, 0xc($s0) .LE0018118: /* 32F698 E0018118 08006046 */ j .LE0018118 -/* 32F69C E001811C 00000000 */ nop +/* 32F69C E001811C 00000000 */ nop .LE0018120: /* 32F6A0 E0018120 0220202D */ daddu $a0, $s1, $zero /* 32F6A4 E0018124 00132880 */ sll $a1, $s3, 2 @@ -59,9 +59,9 @@ glabel func_E0018078 /* 32F6C8 E0018148 26300008 */ addiu $s0, $s1, 8 /* 32F6CC E001814C 3C0141F0 */ lui $at, 0x41f0 /* 32F6D0 E0018150 44810000 */ mtc1 $at, $f0 -/* 32F6D4 E0018154 00000000 */ nop +/* 32F6D4 E0018154 00000000 */ nop /* 32F6D8 E0018158 4600F002 */ mul.s $f0, $f30, $f0 -/* 32F6DC E001815C 00000000 */ nop +/* 32F6DC E001815C 00000000 */ nop /* 32F6E0 E0018160 3C013F80 */ lui $at, 0x3f80 /* 32F6E4 E0018164 4481B000 */ mtc1 $at, $f22 /* 32F6E8 E0018168 4600E000 */ add.s $f0, $f28, $f0 @@ -103,26 +103,26 @@ glabel func_E0018078 /* 32F774 E00181F4 E6000088 */ swc1 $f0, 0x88($s0) /* 32F778 E00181F8 3C014334 */ lui $at, 0x4334 /* 32F77C E00181FC 44812000 */ mtc1 $at, $f4 -/* 32F780 E0018200 00000000 */ nop +/* 32F780 E0018200 00000000 */ nop /* 32F784 E0018204 4604F102 */ mul.s $f4, $f30, $f4 -/* 32F788 E0018208 00000000 */ nop +/* 32F788 E0018208 00000000 */ nop /* 32F78C E001820C 3C014234 */ lui $at, 0x4234 /* 32F790 E0018210 44811000 */ mtc1 $at, $f2 -/* 32F794 E0018214 00000000 */ nop +/* 32F794 E0018214 00000000 */ nop /* 32F798 E0018218 4602A500 */ add.s $f20, $f20, $f2 /* 32F79C E001821C 4604A501 */ sub.s $f20, $f20, $f4 /* 32F7A0 E0018220 E600008C */ swc1 $f0, 0x8c($s0) /* 32F7A4 E0018224 0C080140 */ jal func_E0200500 /* 32F7A8 E0018228 4600A306 */ mov.s $f12, $f20 /* 32F7AC E001822C 46180002 */ mul.s $f0, $f0, $f24 -/* 32F7B0 E0018230 00000000 */ nop +/* 32F7B0 E0018230 00000000 */ nop /* 32F7B4 E0018234 C6020004 */ lwc1 $f2, 4($s0) /* 32F7B8 E0018238 46001080 */ add.s $f2, $f2, $f0 /* 32F7BC E001823C 4600A306 */ mov.s $f12, $f20 /* 32F7C0 E0018240 0C080144 */ jal func_E0200510 /* 32F7C4 E0018244 E6020004 */ swc1 $f2, 4($s0) /* 32F7C8 E0018248 46180002 */ mul.s $f0, $f0, $f24 -/* 32F7CC E001824C 00000000 */ nop +/* 32F7CC E001824C 00000000 */ nop /* 32F7D0 E0018250 26520001 */ addiu $s2, $s2, 1 /* 32F7D4 E0018254 26310098 */ addiu $s1, $s1, 0x98 /* 32F7D8 E0018258 C602000C */ lwc1 $f2, 0xc($s0) diff --git a/asm/nonmatchings/code_32F580/func_E00182AC.s b/asm/nonmatchings/code_32F580/func_E00182AC.s index c417dc01e4..cb06dd2eb0 100644 --- a/asm/nonmatchings/code_32F580/func_E00182AC.s +++ b/asm/nonmatchings/code_32F580/func_E00182AC.s @@ -3,4 +3,4 @@ glabel func_E00182AC /* 32F82C E00182AC 03E00008 */ jr $ra -/* 32F830 E00182B0 00000000 */ nop +/* 32F830 E00182B0 00000000 */ nop diff --git a/asm/nonmatchings/code_32F580/func_E00182B4.s b/asm/nonmatchings/code_32F580/func_E00182B4.s index 3e88bc9503..91545adf64 100644 --- a/asm/nonmatchings/code_32F580/func_E00182B4.s +++ b/asm/nonmatchings/code_32F580/func_E00182B4.s @@ -25,7 +25,7 @@ glabel func_E00182B4 /* 32F880 E0018300 A602FFFE */ sh $v0, -2($s0) /* 32F884 E0018304 00021400 */ sll $v0, $v0, 0x10 /* 32F888 E0018308 1C400003 */ bgtz $v0, .LE0018318 -/* 32F88C E001830C 00000000 */ nop +/* 32F88C E001830C 00000000 */ nop /* 32F890 E0018310 080060CC */ j .LE0018330 /* 32F894 E0018314 AE200000 */ sw $zero, ($s1) .LE0018318: @@ -45,7 +45,7 @@ glabel func_E00182B4 /* 32F8C4 E0018344 26310098 */ addiu $s1, $s1, 0x98 .LE0018348: /* 32F8C8 E0018348 16600003 */ bnez $s3, .LE0018358 -/* 32F8CC E001834C 00000000 */ nop +/* 32F8CC E001834C 00000000 */ nop /* 32F8D0 E0018350 0C080128 */ jal func_E02004A0 /* 32F8D4 E0018354 0280202D */ daddu $a0, $s4, $zero .LE0018358: diff --git a/asm/nonmatchings/code_32F580/func_E00183BC.s b/asm/nonmatchings/code_32F580/func_E00183BC.s index e669f3efc8..f4e9249e41 100644 --- a/asm/nonmatchings/code_32F580/func_E00183BC.s +++ b/asm/nonmatchings/code_32F580/func_E00183BC.s @@ -5,7 +5,7 @@ glabel func_E00183BC /* 32F93C E00183BC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 32F940 E00183C0 AFBF0010 */ sw $ra, 0x10($sp) /* 32F944 E00183C4 0C080128 */ jal func_E02004A0 -/* 32F948 E00183C8 00000000 */ nop +/* 32F948 E00183C8 00000000 */ nop /* 32F94C E00183CC 8FBF0010 */ lw $ra, 0x10($sp) /* 32F950 E00183D0 03E00008 */ jr $ra /* 32F954 E00183D4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_32F580/func_E00183D8.s b/asm/nonmatchings/code_32F580/func_E00183D8.s index 448be0b915..c2a3a117a1 100644 --- a/asm/nonmatchings/code_32F580/func_E00183D8.s +++ b/asm/nonmatchings/code_32F580/func_E00183D8.s @@ -131,4 +131,4 @@ glabel func_E00183D8 /* 32FB40 E00185C0 8FB00000 */ lw $s0, ($sp) /* 32FB44 E00185C4 03E00008 */ jr $ra /* 32FB48 E00185C8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 32FB4C E00185CC 00000000 */ nop +/* 32FB4C E00185CC 00000000 */ nop diff --git a/asm/nonmatchings/code_331940/func_E001E000.s b/asm/nonmatchings/code_331940/func_E001E000.s index 20ec56f044..3c3d7680ce 100644 --- a/asm/nonmatchings/code_331940/func_E001E000.s +++ b/asm/nonmatchings/code_331940/func_E001E000.s @@ -43,7 +43,7 @@ glabel func_E001E000 /* 3319D8 E001E098 AE42000C */ sw $v0, 0xc($s2) .LE001E09C: /* 3319DC E001E09C 08007827 */ j .LE001E09C -/* 3319E0 E001E0A0 00000000 */ nop +/* 3319E0 E001E0A0 00000000 */ nop .LE001E0A4: /* 3319E4 E001E0A4 24020001 */ addiu $v0, $zero, 1 /* 3319E8 E001E0A8 AE220000 */ sw $v0, ($s1) @@ -86,21 +86,21 @@ glabel func_E001E000 /* 331A74 E001E134 C7A00078 */ lwc1 $f0, 0x78($sp) /* 331A78 E001E138 46140601 */ sub.s $f24, $f0, $f20 /* 331A7C E001E13C 4618C082 */ mul.s $f2, $f24, $f24 -/* 331A80 E001E140 00000000 */ nop +/* 331A80 E001E140 00000000 */ nop /* 331A84 E001E144 C7A0007C */ lwc1 $f0, 0x7c($sp) /* 331A88 E001E148 46160581 */ sub.s $f22, $f0, $f22 /* 331A8C E001E14C 4616B102 */ mul.s $f4, $f22, $f22 -/* 331A90 E001E150 00000000 */ nop +/* 331A90 E001E150 00000000 */ nop /* 331A94 E001E154 C7A00080 */ lwc1 $f0, 0x80($sp) /* 331A98 E001E158 461A0501 */ sub.s $f20, $f0, $f26 /* 331A9C E001E15C 4614A002 */ mul.s $f0, $f20, $f20 -/* 331AA0 E001E160 00000000 */ nop +/* 331AA0 E001E160 00000000 */ nop /* 331AA4 E001E164 46041080 */ add.s $f2, $f2, $f4 /* 331AA8 E001E168 46001680 */ add.s $f26, $f2, $f0 /* 331AAC E001E16C 4480E000 */ mtc1 $zero, $f28 -/* 331AB0 E001E170 00000000 */ nop +/* 331AB0 E001E170 00000000 */ nop /* 331AB4 E001E174 461CD032 */ c.eq.s $f26, $f28 -/* 331AB8 E001E178 00000000 */ nop +/* 331AB8 E001E178 00000000 */ nop /* 331ABC E001E17C 45010005 */ bc1t .LE001E194 /* 331AC0 E001E180 4600D106 */ mov.s $f4, $f26 /* 331AC4 E001E184 0C080154 */ jal func_E0200550 @@ -109,13 +109,13 @@ glabel func_E001E000 /* 331AD0 E001E190 461AF103 */ div.s $f4, $f30, $f26 .LE001E194: /* 331AD4 E001E194 4604C002 */ mul.s $f0, $f24, $f4 -/* 331AD8 E001E198 00000000 */ nop +/* 331AD8 E001E198 00000000 */ nop /* 331ADC E001E19C 4604B082 */ mul.s $f2, $f22, $f4 -/* 331AE0 E001E1A0 00000000 */ nop +/* 331AE0 E001E1A0 00000000 */ nop /* 331AE4 E001E1A4 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* 331AE8 E001E1A8 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* 331AEC E001E1AC 4604A102 */ mul.s $f4, $f20, $f4 -/* 331AF0 E001E1B0 00000000 */ nop +/* 331AF0 E001E1B0 00000000 */ nop /* 331AF4 E001E1B4 00031080 */ sll $v0, $v1, 2 /* 331AF8 E001E1B8 00431021 */ addu $v0, $v0, $v1 /* 331AFC E001E1BC 00021080 */ sll $v0, $v0, 2 @@ -136,35 +136,35 @@ glabel func_E001E000 /* 331B38 E001E1F8 46000587 */ neg.s $f22, $f0 /* 331B3C E001E1FC C6240010 */ lwc1 $f4, 0x10($s1) /* 331B40 E001E200 4604B102 */ mul.s $f4, $f22, $f4 -/* 331B44 E001E204 00000000 */ nop +/* 331B44 E001E204 00000000 */ nop /* 331B48 E001E208 C6220018 */ lwc1 $f2, 0x18($s1) /* 331B4C E001E20C 46000507 */ neg.s $f20, $f0 /* 331B50 E001E210 4602A082 */ mul.s $f2, $f20, $f2 -/* 331B54 E001E214 00000000 */ nop +/* 331B54 E001E214 00000000 */ nop /* 331B58 E001E218 46042102 */ mul.s $f4, $f4, $f4 -/* 331B5C E001E21C 00000000 */ nop +/* 331B5C E001E21C 00000000 */ nop /* 331B60 E001E220 46021082 */ mul.s $f2, $f2, $f2 -/* 331B64 E001E224 00000000 */ nop +/* 331B64 E001E224 00000000 */ nop /* 331B68 E001E228 46022300 */ add.s $f12, $f4, $f2 /* 331B6C E001E22C 461C6032 */ c.eq.s $f12, $f28 -/* 331B70 E001E230 00000000 */ nop +/* 331B70 E001E230 00000000 */ nop /* 331B74 E001E234 45010004 */ bc1t .LE001E248 -/* 331B78 E001E238 00000000 */ nop +/* 331B78 E001E238 00000000 */ nop /* 331B7C E001E23C 0C080154 */ jal func_E0200550 -/* 331B80 E001E240 00000000 */ nop +/* 331B80 E001E240 00000000 */ nop /* 331B84 E001E244 46000306 */ mov.s $f12, $f0 .LE001E248: /* 331B88 E001E248 C6220010 */ lwc1 $f2, 0x10($s1) /* 331B8C E001E24C 4602B082 */ mul.s $f2, $f22, $f2 -/* 331B90 E001E250 00000000 */ nop +/* 331B90 E001E250 00000000 */ nop /* 331B94 E001E254 C6200018 */ lwc1 $f0, 0x18($s1) /* 331B98 E001E258 4600A002 */ mul.s $f0, $f20, $f0 -/* 331B9C E001E25C 00000000 */ nop +/* 331B9C E001E25C 00000000 */ nop /* 331BA0 E001E260 46001080 */ add.s $f2, $f2, $f0 /* 331BA4 E001E264 461C103C */ c.lt.s $f2, $f28 -/* 331BA8 E001E268 00000000 */ nop +/* 331BA8 E001E268 00000000 */ nop /* 331BAC E001E26C 45000005 */ bc1f .LE001E284 -/* 331BB0 E001E270 00000000 */ nop +/* 331BB0 E001E270 00000000 */ nop /* 331BB4 E001E274 3C01C1A0 */ lui $at, 0xc1a0 /* 331BB8 E001E278 44810000 */ mtc1 $at, $f0 /* 331BBC E001E27C 080078A4 */ j .LE001E290 @@ -172,7 +172,7 @@ glabel func_E001E000 .LE001E284: /* 331BC4 E001E284 3C0141A0 */ lui $at, 0x41a0 /* 331BC8 E001E288 44810000 */ mtc1 $at, $f0 -/* 331BCC E001E28C 00000000 */ nop +/* 331BCC E001E28C 00000000 */ nop .LE001E290: /* 331BD0 E001E290 E620002C */ swc1 $f0, 0x2c($s1) /* 331BD4 E001E294 46006507 */ neg.s $f20, $f12 diff --git a/asm/nonmatchings/code_331940/func_E001E370.s b/asm/nonmatchings/code_331940/func_E001E370.s index 69ec85588e..f42c793667 100644 --- a/asm/nonmatchings/code_331940/func_E001E370.s +++ b/asm/nonmatchings/code_331940/func_E001E370.s @@ -3,4 +3,4 @@ glabel func_E001E370 /* 331CB0 E001E370 03E00008 */ jr $ra -/* 331CB4 E001E374 00000000 */ nop +/* 331CB4 E001E374 00000000 */ nop diff --git a/asm/nonmatchings/code_331940/func_E001E378.s b/asm/nonmatchings/code_331940/func_E001E378.s index 7fad414891..05ee3424e4 100644 --- a/asm/nonmatchings/code_331940/func_E001E378.s +++ b/asm/nonmatchings/code_331940/func_E001E378.s @@ -12,53 +12,53 @@ glabel func_E001E378 /* 331CD4 E001E394 8E020038 */ lw $v0, 0x38($s0) /* 331CD8 E001E398 28420002 */ slti $v0, $v0, 2 /* 331CDC E001E39C 144000AF */ bnez $v0, .LE001E65C -/* 331CE0 E001E3A0 00000000 */ nop +/* 331CE0 E001E3A0 00000000 */ nop /* 331CE4 E001E3A4 C6040010 */ lwc1 $f4, 0x10($s0) /* 331CE8 E001E3A8 46042102 */ mul.s $f4, $f4, $f4 -/* 331CEC E001E3AC 00000000 */ nop +/* 331CEC E001E3AC 00000000 */ nop /* 331CF0 E001E3B0 C6020014 */ lwc1 $f2, 0x14($s0) /* 331CF4 E001E3B4 46021082 */ mul.s $f2, $f2, $f2 -/* 331CF8 E001E3B8 00000000 */ nop +/* 331CF8 E001E3B8 00000000 */ nop /* 331CFC E001E3BC C6000018 */ lwc1 $f0, 0x18($s0) /* 331D00 E001E3C0 46000002 */ mul.s $f0, $f0, $f0 -/* 331D04 E001E3C4 00000000 */ nop +/* 331D04 E001E3C4 00000000 */ nop /* 331D08 E001E3C8 46022100 */ add.s $f4, $f4, $f2 /* 331D0C E001E3CC 46002300 */ add.s $f12, $f4, $f0 /* 331D10 E001E3D0 3C013C23 */ lui $at, 0x3c23 /* 331D14 E001E3D4 3421D70A */ ori $at, $at, 0xd70a /* 331D18 E001E3D8 44810000 */ mtc1 $at, $f0 -/* 331D1C E001E3DC 00000000 */ nop +/* 331D1C E001E3DC 00000000 */ nop /* 331D20 E001E3E0 460C003C */ c.lt.s $f0, $f12 -/* 331D24 E001E3E4 00000000 */ nop +/* 331D24 E001E3E4 00000000 */ nop /* 331D28 E001E3E8 45000008 */ bc1f .LE001E40C /* 331D2C E001E3EC E7AC0024 */ swc1 $f12, 0x24($sp) /* 331D30 E001E3F0 0C080154 */ jal func_E0200550 -/* 331D34 E001E3F4 00000000 */ nop +/* 331D34 E001E3F4 00000000 */ nop /* 331D38 E001E3F8 3C013F80 */ lui $at, 0x3f80 /* 331D3C E001E3FC 44811000 */ mtc1 $at, $f2 -/* 331D40 E001E400 00000000 */ nop +/* 331D40 E001E400 00000000 */ nop /* 331D44 E001E404 46001083 */ div.s $f2, $f2, $f0 /* 331D48 E001E408 E7A20024 */ swc1 $f2, 0x24($sp) .LE001E40C: /* 331D4C E001E40C C60A0010 */ lwc1 $f10, 0x10($s0) /* 331D50 E001E410 C7A00024 */ lwc1 $f0, 0x24($sp) /* 331D54 E001E414 46005282 */ mul.s $f10, $f10, $f0 -/* 331D58 E001E418 00000000 */ nop +/* 331D58 E001E418 00000000 */ nop /* 331D5C E001E41C C6040014 */ lwc1 $f4, 0x14($s0) /* 331D60 E001E420 46002102 */ mul.s $f4, $f4, $f0 -/* 331D64 E001E424 00000000 */ nop +/* 331D64 E001E424 00000000 */ nop /* 331D68 E001E428 C6060018 */ lwc1 $f6, 0x18($s0) /* 331D6C E001E42C 46003182 */ mul.s $f6, $f6, $f0 -/* 331D70 E001E430 00000000 */ nop +/* 331D70 E001E430 00000000 */ nop /* 331D74 E001E434 3C014200 */ lui $at, 0x4200 /* 331D78 E001E438 44811000 */ mtc1 $at, $f2 -/* 331D7C E001E43C 00000000 */ nop +/* 331D7C E001E43C 00000000 */ nop /* 331D80 E001E440 46025282 */ mul.s $f10, $f10, $f2 -/* 331D84 E001E444 00000000 */ nop +/* 331D84 E001E444 00000000 */ nop /* 331D88 E001E448 46022102 */ mul.s $f4, $f4, $f2 -/* 331D8C E001E44C 00000000 */ nop +/* 331D8C E001E44C 00000000 */ nop /* 331D90 E001E450 46023182 */ mul.s $f6, $f6, $f2 -/* 331D94 E001E454 00000000 */ nop +/* 331D94 E001E454 00000000 */ nop /* 331D98 E001E458 C6080004 */ lwc1 $f8, 4($s0) /* 331D9C E001E45C 3C014280 */ lui $at, 0x4280 /* 331DA0 E001E460 44810000 */ mtc1 $at, $f0 @@ -75,9 +75,9 @@ glabel func_E001E378 /* 331DCC E001E48C E7A00020 */ swc1 $f0, 0x20($sp) /* 331DD0 E001E490 C6000014 */ lwc1 $f0, 0x14($s0) /* 331DD4 E001E494 4480A000 */ mtc1 $zero, $f20 -/* 331DD8 E001E498 00000000 */ nop +/* 331DD8 E001E498 00000000 */ nop /* 331DDC E001E49C 4614003C */ c.lt.s $f0, $f20 -/* 331DE0 E001E4A0 00000000 */ nop +/* 331DE0 E001E4A0 00000000 */ nop /* 331DE4 E001E4A4 45000055 */ bc1f .LE001E5FC /* 331DE8 E001E4A8 27A20024 */ addiu $v0, $sp, 0x24 /* 331DEC E001E4AC AFA20010 */ sw $v0, 0x10($sp) @@ -87,13 +87,13 @@ glabel func_E001E378 /* 331DFC E001E4BC 0C08014C */ jal func_E0200530 /* 331E00 E001E4C0 27A70020 */ addiu $a3, $sp, 0x20 /* 331E04 E001E4C4 1040004D */ beqz $v0, .LE001E5FC -/* 331E08 E001E4C8 00000000 */ nop +/* 331E08 E001E4C8 00000000 */ nop /* 331E0C E001E4CC C7A20024 */ lwc1 $f2, 0x24($sp) /* 331E10 E001E4D0 3C014228 */ lui $at, 0x4228 /* 331E14 E001E4D4 44810000 */ mtc1 $at, $f0 -/* 331E18 E001E4D8 00000000 */ nop +/* 331E18 E001E4D8 00000000 */ nop /* 331E1C E001E4DC 4600103C */ c.lt.s $f2, $f0 -/* 331E20 E001E4E0 00000000 */ nop +/* 331E20 E001E4E0 00000000 */ nop /* 331E24 E001E4E4 45000045 */ bc1f .LE001E5FC /* 331E28 E001E4E8 24040006 */ addiu $a0, $zero, 6 /* 331E2C E001E4EC C6040014 */ lwc1 $f4, 0x14($s0) @@ -102,26 +102,26 @@ glabel func_E001E378 /* 331E38 E001E4F8 46002107 */ neg.s $f4, $f4 /* 331E3C E001E4FC 46002121 */ cvt.d.s $f4, $f4 /* 331E40 E001E500 46202102 */ mul.d $f4, $f4, $f0 -/* 331E44 E001E504 00000000 */ nop +/* 331E44 E001E504 00000000 */ nop /* 331E48 E001E508 C6060010 */ lwc1 $f6, 0x10($s0) /* 331E4C E001E50C 3C01E002 */ lui $at, %hi(D_E001ED58) /* 331E50 E001E510 D428ED58 */ ldc1 $f8, %lo(D_E001ED58)($at) /* 331E54 E001E514 460031A1 */ cvt.d.s $f6, $f6 /* 331E58 E001E518 46283182 */ mul.d $f6, $f6, $f8 -/* 331E5C E001E51C 00000000 */ nop +/* 331E5C E001E51C 00000000 */ nop /* 331E60 E001E520 C6020034 */ lwc1 $f2, 0x34($s0) /* 331E64 E001E524 460010A1 */ cvt.d.s $f2, $f2 /* 331E68 E001E528 46281082 */ mul.d $f2, $f2, $f8 -/* 331E6C E001E52C 00000000 */ nop +/* 331E6C E001E52C 00000000 */ nop /* 331E70 E001E530 C60A001C */ lwc1 $f10, 0x1c($s0) /* 331E74 E001E534 3C013F80 */ lui $at, 0x3f80 /* 331E78 E001E538 44810000 */ mtc1 $at, $f0 -/* 331E7C E001E53C 00000000 */ nop +/* 331E7C E001E53C 00000000 */ nop /* 331E80 E001E540 46005280 */ add.s $f10, $f10, $f0 /* 331E84 E001E544 C600002C */ lwc1 $f0, 0x2c($s0) /* 331E88 E001E548 46000021 */ cvt.d.s $f0, $f0 /* 331E8C E001E54C 46280002 */ mul.d $f0, $f0, $f8 -/* 331E90 E001E550 00000000 */ nop +/* 331E90 E001E550 00000000 */ nop /* 331E94 E001E554 E60A001C */ swc1 $f10, 0x1c($s0) /* 331E98 E001E558 46202120 */ cvt.s.d $f4, $f4 /* 331E9C E001E55C 462031A0 */ cvt.s.d $f6, $f6 @@ -158,9 +158,9 @@ glabel func_E001E378 /* 331F14 E001E5D4 C602001C */ lwc1 $f2, 0x1c($s0) /* 331F18 E001E5D8 3C014120 */ lui $at, 0x4120 /* 331F1C E001E5DC 44810000 */ mtc1 $at, $f0 -/* 331F20 E001E5E0 00000000 */ nop +/* 331F20 E001E5E0 00000000 */ nop /* 331F24 E001E5E4 4602003E */ c.le.s $f0, $f2 -/* 331F28 E001E5E8 00000000 */ nop +/* 331F28 E001E5E8 00000000 */ nop /* 331F2C E001E5EC 45000003 */ bc1f .LE001E5FC /* 331F30 E001E5F0 AE000000 */ sw $zero, ($s0) /* 331F34 E001E5F4 2402FFFF */ addiu $v0, $zero, -1 @@ -168,9 +168,9 @@ glabel func_E001E378 .LE001E5FC: /* 331F3C E001E5FC C600001C */ lwc1 $f0, 0x1c($s0) /* 331F40 E001E600 44806000 */ mtc1 $zero, $f12 -/* 331F44 E001E604 00000000 */ nop +/* 331F44 E001E604 00000000 */ nop /* 331F48 E001E608 460C0032 */ c.eq.s $f0, $f12 -/* 331F4C E001E60C 00000000 */ nop +/* 331F4C E001E60C 00000000 */ nop /* 331F50 E001E610 45010012 */ bc1t .LE001E65C /* 331F54 E001E614 46006386 */ mov.s $f14, $f12 /* 331F58 E001E618 C6000014 */ lwc1 $f0, 0x14($s0) @@ -198,9 +198,9 @@ glabel func_E001E378 /* 331FAC E001E66C 46020001 */ sub.s $f0, $f0, $f2 /* 331FB0 E001E670 3C014396 */ lui $at, 0x4396 /* 331FB4 E001E674 44811000 */ mtc1 $at, $f2 -/* 331FB8 E001E678 00000000 */ nop +/* 331FB8 E001E678 00000000 */ nop /* 331FBC E001E67C 4600103C */ c.lt.s $f2, $f0 -/* 331FC0 E001E680 00000000 */ nop +/* 331FC0 E001E680 00000000 */ nop /* 331FC4 E001E684 45000002 */ bc1f .LE001E690 /* 331FC8 E001E688 2402FFFF */ addiu $v0, $zero, -1 /* 331FCC E001E68C AE020030 */ sw $v0, 0x30($s0) diff --git a/asm/nonmatchings/code_331940/func_E001E730.s b/asm/nonmatchings/code_331940/func_E001E730.s index 8a29f110c3..be5b4db071 100644 --- a/asm/nonmatchings/code_331940/func_E001E730.s +++ b/asm/nonmatchings/code_331940/func_E001E730.s @@ -181,11 +181,11 @@ glabel func_E001E730 /* 332320 E001E9E0 C6C0001C */ lwc1 $f0, 0x1c($s6) /* 332324 E001E9E4 3C013F80 */ lui $at, 0x3f80 /* 332328 E001E9E8 4481B000 */ mtc1 $at, $f22 -/* 33232C E001E9EC 00000000 */ nop +/* 33232C E001E9EC 00000000 */ nop /* 332330 E001E9F0 4616003E */ c.le.s $f0, $f22 -/* 332334 E001E9F4 00000000 */ nop +/* 332334 E001E9F4 00000000 */ nop /* 332338 E001E9F8 450000C5 */ bc1f .LE001ED10 -/* 33233C E001E9FC 00000000 */ nop +/* 33233C E001E9FC 00000000 */ nop /* 332340 E001EA00 8EC2003C */ lw $v0, 0x3c($s6) /* 332344 E001EA04 24440005 */ addiu $a0, $v0, 5 /* 332348 E001EA08 04810002 */ bgez $a0, .LE001EA14 @@ -334,7 +334,7 @@ glabel func_E001E730 /* 332570 E001EC30 AD820000 */ sw $v0, ($t4) /* 332574 E001EC34 00081040 */ sll $v0, $t0, 1 /* 332578 E001EC38 14400004 */ bnez $v0, .LE001EC4C -/* 33257C E001EC3C 00000000 */ nop +/* 33257C E001EC3C 00000000 */ nop /* 332580 E001EC40 00081440 */ sll $v0, $t0, 0x11 /* 332584 E001EC44 08007B1D */ j .LE001EC74 /* 332588 E001EC48 34420204 */ ori $v0, $v0, 0x204 @@ -411,4 +411,4 @@ glabel func_E001E730 /* 332680 E001ED40 D7B400C8 */ ldc1 $f20, 0xc8($sp) /* 332684 E001ED44 03E00008 */ jr $ra /* 332688 E001ED48 27BD00E0 */ addiu $sp, $sp, 0xe0 -/* 33268C E001ED4C 00000000 */ nop +/* 33268C E001ED4C 00000000 */ nop diff --git a/asm/nonmatchings/code_337240/func_E0022000.s b/asm/nonmatchings/code_337240/func_E0022000.s index 9f314c598d..053cae6db7 100644 --- a/asm/nonmatchings/code_337240/func_E0022000.s +++ b/asm/nonmatchings/code_337240/func_E0022000.s @@ -31,14 +31,14 @@ glabel func_E0022000 /* 3372A8 E0022068 12A00009 */ beqz $s5, .LE0022090 /* 3372AC E002206C 24120008 */ addiu $s2, $zero, 8 /* 3372B0 E0022070 0800882E */ j .LE00220B8 -/* 3372B4 E0022074 00000000 */ nop +/* 3372B4 E0022074 00000000 */ nop .LE0022078: /* 3372B8 E0022078 12A2000B */ beq $s5, $v0, .LE00220A8 /* 3372BC E002207C 24020003 */ addiu $v0, $zero, 3 /* 3372C0 E0022080 12A2000C */ beq $s5, $v0, .LE00220B4 /* 3372C4 E0022084 24120008 */ addiu $s2, $zero, 8 /* 3372C8 E0022088 0800882E */ j .LE00220B8 -/* 3372CC E002208C 00000000 */ nop +/* 3372CC E002208C 00000000 */ nop .LE0022090: /* 3372D0 E0022090 C7BE0090 */ lwc1 $f30, 0x90($sp) /* 3372D4 E0022094 08008830 */ j .LE00220C0 @@ -83,7 +83,7 @@ glabel func_E0022000 /* 33735C E002211C AE04000C */ sw $a0, 0xc($s0) .LE0022120: /* 337360 E0022120 08008848 */ j .LE0022120 -/* 337364 E0022124 00000000 */ nop +/* 337364 E0022124 00000000 */ nop .LE0022128: /* 337368 E0022128 2402001E */ addiu $v0, $zero, 0x1e /* 33736C E002212C E4940004 */ swc1 $f20, 4($a0) @@ -103,7 +103,7 @@ glabel func_E0022000 /* 3373A4 E0022164 C7A60090 */ lwc1 $f6, 0x90($sp) /* 3373A8 E0022168 00151080 */ sll $v0, $s5, 2 /* 3373AC E002216C 461C3002 */ mul.s $f0, $f6, $f28 -/* 3373B0 E0022170 00000000 */ nop +/* 3373B0 E0022170 00000000 */ nop /* 3373B4 E0022174 0043B821 */ addu $s7, $v0, $v1 /* 3373B8 E0022178 2654FFFF */ addiu $s4, $s2, -1 /* 3373BC E002217C 24900020 */ addiu $s0, $a0, 0x20 @@ -114,40 +114,40 @@ glabel func_E0022000 /* 3373CC E002218C 0C080138 */ jal func_E02004E0 /* 3373D0 E0022190 02C0202D */ daddu $a0, $s6, $zero /* 3373D4 E0022194 461CF002 */ mul.s $f0, $f30, $f28 -/* 3373D8 E0022198 00000000 */ nop +/* 3373D8 E0022198 00000000 */ nop /* 3373DC E002219C 4600018D */ trunc.w.s $f6, $f0 /* 3373E0 E00221A0 44043000 */ mfc1 $a0, $f6 /* 3373E4 E00221A4 44820000 */ mtc1 $v0, $f0 -/* 3373E8 E00221A8 00000000 */ nop +/* 3373E8 E00221A8 00000000 */ nop /* 3373EC E00221AC 46800020 */ cvt.s.w $f0, $f0 /* 3373F0 E00221B0 0C080138 */ jal func_E02004E0 /* 3373F4 E00221B4 461C0503 */ div.s $f20, $f0, $f28 /* 3373F8 E00221B8 44820000 */ mtc1 $v0, $f0 -/* 3373FC E00221BC 00000000 */ nop +/* 3373FC E00221BC 00000000 */ nop /* 337400 E00221C0 46800020 */ cvt.s.w $f0, $f0 /* 337404 E00221C4 2EA20005 */ sltiu $v0, $s5, 5 /* 337408 E00221C8 10400088 */ beqz $v0, .LE00223EC /* 33740C E00221CC 461C0583 */ div.s $f22, $f0, $f28 /* 337410 E00221D0 8EE20000 */ lw $v0, ($s7) /* 337414 E00221D4 00400008 */ jr $v0 -/* 337418 E00221D8 00000000 */ nop +/* 337418 E00221D8 00000000 */ nop /* 33741C E00221DC 44942000 */ mtc1 $s4, $f4 -/* 337420 E00221E0 00000000 */ nop +/* 337420 E00221E0 00000000 */ nop /* 337424 E00221E4 46802120 */ cvt.s.w $f4, $f4 /* 337428 E00221E8 3C0143B4 */ lui $at, 0x43b4 /* 33742C E00221EC 44813000 */ mtc1 $at, $f6 /* 337430 E00221F0 44911000 */ mtc1 $s1, $f2 -/* 337434 E00221F4 00000000 */ nop +/* 337434 E00221F4 00000000 */ nop /* 337438 E00221F8 468010A0 */ cvt.s.w $f2, $f2 /* 33743C E00221FC 46043003 */ div.s $f0, $f6, $f4 /* 337440 E0022200 46020682 */ mul.s $f26, $f0, $f2 -/* 337444 E0022204 00000000 */ nop +/* 337444 E0022204 00000000 */ nop /* 337448 E0022208 3C0144E1 */ lui $at, 0x44e1 /* 33744C E002220C 4481B000 */ mtc1 $at, $f22 -/* 337450 E0022210 00000000 */ nop +/* 337450 E0022210 00000000 */ nop /* 337454 E0022214 4604B583 */ div.s $f22, $f22, $f4 /* 337458 E0022218 4602B582 */ mul.s $f22, $f22, $f2 -/* 33745C E002221C 00000000 */ nop +/* 33745C E002221C 00000000 */ nop /* 337460 E0022220 AE00FFF8 */ sw $zero, -8($s0) /* 337464 E0022224 3C0142B4 */ lui $at, 0x42b4 /* 337468 E0022228 44810000 */ mtc1 $at, $f0 @@ -159,9 +159,9 @@ glabel func_E0022000 /* 337480 E0022240 4600B306 */ mov.s $f12, $f22 /* 337484 E0022244 3C014170 */ lui $at, 0x4170 /* 337488 E0022248 44813000 */ mtc1 $at, $f6 -/* 33748C E002224C 00000000 */ nop +/* 33748C E002224C 00000000 */ nop /* 337490 E0022250 46060002 */ mul.s $f0, $f0, $f6 -/* 337494 E0022254 00000000 */ nop +/* 337494 E0022254 00000000 */ nop /* 337498 E0022258 32230001 */ andi $v1, $s1, 1 /* 33749C E002225C 3C0142AA */ lui $at, 0x42aa /* 3374A0 E0022260 44813000 */ mtc1 $at, $f6 @@ -169,18 +169,18 @@ glabel func_E0022000 /* 3374A8 E0022268 46003001 */ sub.s $f0, $f6, $f0 /* 3374AC E002226C 00431021 */ addu $v0, $v0, $v1 /* 3374B0 E0022270 4482C000 */ mtc1 $v0, $f24 -/* 3374B4 E0022274 00000000 */ nop +/* 3374B4 E0022274 00000000 */ nop /* 3374B8 E0022278 4680C620 */ cvt.s.w $f24, $f24 /* 3374BC E002227C 46180001 */ sub.s $f0, $f0, $f24 /* 3374C0 E0022280 4600A502 */ mul.s $f20, $f20, $f0 -/* 3374C4 E0022284 00000000 */ nop +/* 3374C4 E0022284 00000000 */ nop /* 3374C8 E0022288 3C0142C8 */ lui $at, 0x42c8 /* 3374CC E002228C 44813000 */ mtc1 $at, $f6 -/* 3374D0 E0022290 00000000 */ nop +/* 3374D0 E0022290 00000000 */ nop /* 3374D4 E0022294 4606A503 */ div.s $f20, $f20, $f6 /* 3374D8 E0022298 C7A60090 */ lwc1 $f6, 0x90($sp) /* 3374DC E002229C 4606A502 */ mul.s $f20, $f20, $f6 -/* 3374E0 E00222A0 00000000 */ nop +/* 3374E0 E00222A0 00000000 */ nop /* 3374E4 E00222A4 4600D306 */ mov.s $f12, $f26 /* 3374E8 E00222A8 0C080144 */ jal func_E0200510 /* 3374EC E00222AC E614FFF0 */ swc1 $f20, -0x10($s0) @@ -189,23 +189,23 @@ glabel func_E0022000 /* 3374F8 E00222B8 46000506 */ mov.s $f20, $f0 /* 3374FC E00222BC 3C014170 */ lui $at, 0x4170 /* 337500 E00222C0 44813000 */ mtc1 $at, $f6 -/* 337504 E00222C4 00000000 */ nop +/* 337504 E00222C4 00000000 */ nop /* 337508 E00222C8 46060002 */ mul.s $f0, $f0, $f6 -/* 33750C E00222CC 00000000 */ nop +/* 33750C E00222CC 00000000 */ nop /* 337510 E00222D0 3C0142AA */ lui $at, 0x42aa /* 337514 E00222D4 44813000 */ mtc1 $at, $f6 -/* 337518 E00222D8 00000000 */ nop +/* 337518 E00222D8 00000000 */ nop /* 33751C E00222DC 46003001 */ sub.s $f0, $f6, $f0 /* 337520 E00222E0 46180001 */ sub.s $f0, $f0, $f24 /* 337524 E00222E4 4600A502 */ mul.s $f20, $f20, $f0 -/* 337528 E00222E8 00000000 */ nop +/* 337528 E00222E8 00000000 */ nop /* 33752C E00222EC 3C0142C8 */ lui $at, 0x42c8 /* 337530 E00222F0 44813000 */ mtc1 $at, $f6 -/* 337534 E00222F4 00000000 */ nop +/* 337534 E00222F4 00000000 */ nop /* 337538 E00222F8 4606A503 */ div.s $f20, $f20, $f6 /* 33753C E00222FC C7A60090 */ lwc1 $f6, 0x90($sp) /* 337540 E0022300 4606A502 */ mul.s $f20, $f20, $f6 -/* 337544 E0022304 00000000 */ nop +/* 337544 E0022304 00000000 */ nop /* 337548 E0022308 AE00FFEC */ sw $zero, -0x14($s0) /* 33754C E002230C AE000008 */ sw $zero, 8($s0) /* 337550 E0022310 0800893B */ j .LE00224EC @@ -213,18 +213,18 @@ glabel func_E0022000 /* 337558 E0022318 0C080138 */ jal func_E02004E0 /* 33755C E002231C 24040167 */ addiu $a0, $zero, 0x167 /* 337560 E0022320 44941000 */ mtc1 $s4, $f2 -/* 337564 E0022324 00000000 */ nop +/* 337564 E0022324 00000000 */ nop /* 337568 E0022328 468010A0 */ cvt.s.w $f2, $f2 /* 33756C E002232C 3C0143B4 */ lui $at, 0x43b4 /* 337570 E0022330 44813000 */ mtc1 $at, $f6 /* 337574 E0022334 44910000 */ mtc1 $s1, $f0 -/* 337578 E0022338 00000000 */ nop +/* 337578 E0022338 00000000 */ nop /* 33757C E002233C 46800020 */ cvt.s.w $f0, $f0 /* 337580 E0022340 46023083 */ div.s $f2, $f6, $f2 /* 337584 E0022344 46001082 */ mul.s $f2, $f2, $f0 -/* 337588 E0022348 00000000 */ nop +/* 337588 E0022348 00000000 */ nop /* 33758C E002234C 44820000 */ mtc1 $v0, $f0 -/* 337590 E0022350 00000000 */ nop +/* 337590 E0022350 00000000 */ nop /* 337594 E0022354 46800020 */ cvt.s.w $f0, $f0 /* 337598 E0022358 32220001 */ andi $v0, $s1, 1 /* 33759C E002235C 10400014 */ beqz $v0, .LE00223B0 @@ -241,7 +241,7 @@ glabel func_E0022000 /* 3375C8 E0022388 00081983 */ sra $v1, $t0, 6 /* 3375CC E002238C 00621823 */ subu $v1, $v1, $v0 /* 3375D0 E0022390 44830000 */ mtc1 $v1, $f0 -/* 3375D4 E0022394 00000000 */ nop +/* 3375D4 E0022394 00000000 */ nop /* 3375D8 E0022398 46800021 */ cvt.d.w $f0, $f0 /* 3375DC E002239C 46220000 */ add.d $f0, $f0, $f2 /* 3375E0 E00223A0 46200007 */ neg.d $f0, $f0 @@ -256,7 +256,7 @@ glabel func_E0022000 /* 3375FC E00223BC 0C080140 */ jal func_E0200500 /* 337600 E00223C0 AE00FFF4 */ sw $zero, -0xc($s0) /* 337604 E00223C4 4600A002 */ mul.s $f0, $f20, $f0 -/* 337608 E00223C8 00000000 */ nop +/* 337608 E00223C8 00000000 */ nop /* 33760C E00223CC 4600D306 */ mov.s $f12, $f26 /* 337610 E00223D0 0C080144 */ jal func_E0200510 /* 337614 E00223D4 E600FFE4 */ swc1 $f0, -0x1c($s0) @@ -269,19 +269,19 @@ glabel func_E0022000 /* 33762C E00223EC 0C080138 */ jal func_E02004E0 /* 337630 E00223F0 24040167 */ addiu $a0, $zero, 0x167 /* 337634 E00223F4 44941000 */ mtc1 $s4, $f2 -/* 337638 E00223F8 00000000 */ nop +/* 337638 E00223F8 00000000 */ nop /* 33763C E00223FC 468010A0 */ cvt.s.w $f2, $f2 /* 337640 E0022400 3C0143B4 */ lui $at, 0x43b4 /* 337644 E0022404 44813000 */ mtc1 $at, $f6 /* 337648 E0022408 44910000 */ mtc1 $s1, $f0 -/* 33764C E002240C 00000000 */ nop +/* 33764C E002240C 00000000 */ nop /* 337650 E0022410 46800020 */ cvt.s.w $f0, $f0 /* 337654 E0022414 46023083 */ div.s $f2, $f6, $f2 /* 337658 E0022418 46001082 */ mul.s $f2, $f2, $f0 -/* 33765C E002241C 00000000 */ nop +/* 33765C E002241C 00000000 */ nop /* 337660 E0022420 24040032 */ addiu $a0, $zero, 0x32 /* 337664 E0022424 44820000 */ mtc1 $v0, $f0 -/* 337668 E0022428 00000000 */ nop +/* 337668 E0022428 00000000 */ nop /* 33766C E002242C 46800020 */ cvt.s.w $f0, $f0 /* 337670 E0022430 0C080138 */ jal func_E02004E0 /* 337674 E0022434 46001680 */ add.s $f26, $f2, $f0 @@ -296,7 +296,7 @@ glabel func_E0022000 /* 337698 E0022458 00081983 */ sra $v1, $t0, 6 /* 33769C E002245C 00621823 */ subu $v1, $v1, $v0 /* 3376A0 E0022460 44830000 */ mtc1 $v1, $f0 -/* 3376A4 E0022464 00000000 */ nop +/* 3376A4 E0022464 00000000 */ nop /* 3376A8 E0022468 46800021 */ cvt.d.w $f0, $f0 /* 3376AC E002246C 46220000 */ add.d $f0, $f0, $f2 /* 3376B0 E0022470 AE00FFF4 */ sw $zero, -0xc($s0) @@ -306,7 +306,7 @@ glabel func_E0022000 /* 3376C0 E0022480 0C080140 */ jal func_E0200500 /* 3376C4 E0022484 E600FFF8 */ swc1 $f0, -8($s0) /* 3376C8 E0022488 4600A002 */ mul.s $f0, $f20, $f0 -/* 3376CC E002248C 00000000 */ nop +/* 3376CC E002248C 00000000 */ nop /* 3376D0 E0022490 4600D306 */ mov.s $f12, $f26 /* 3376D4 E0022494 0C080144 */ jal func_E0200510 /* 3376D8 E0022498 E600FFE4 */ swc1 $f0, -0x1c($s0) @@ -319,7 +319,7 @@ glabel func_E0022000 /* 3376F0 E00224B0 3C013F80 */ lui $at, 0x3f80 /* 3376F4 E00224B4 44811000 */ mtc1 $at, $f2 /* 3376F8 E00224B8 4600B002 */ mul.s $f0, $f22, $f0 -/* 3376FC E00224BC 00000000 */ nop +/* 3376FC E00224BC 00000000 */ nop /* 337700 E00224C0 AE00FFEC */ sw $zero, -0x14($s0) /* 337704 E00224C4 AE020004 */ sw $v0, 4($s0) /* 337708 E00224C8 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/code_337240/func_E0022544.s b/asm/nonmatchings/code_337240/func_E0022544.s index d962edb69e..7b40d9d5a8 100644 --- a/asm/nonmatchings/code_337240/func_E0022544.s +++ b/asm/nonmatchings/code_337240/func_E0022544.s @@ -3,4 +3,4 @@ glabel func_E0022544 /* 337784 E0022544 03E00008 */ jr $ra -/* 337788 E0022548 00000000 */ nop +/* 337788 E0022548 00000000 */ nop diff --git a/asm/nonmatchings/code_337240/func_E002254C.s b/asm/nonmatchings/code_337240/func_E002254C.s index 356dea3465..82a728db4e 100644 --- a/asm/nonmatchings/code_337240/func_E002254C.s +++ b/asm/nonmatchings/code_337240/func_E002254C.s @@ -59,9 +59,9 @@ glabel func_E002254C /* 337858 E0022618 12600005 */ beqz $s3, .LE0022630 /* 33785C E002261C AE020010 */ sw $v0, 0x10($s0) /* 337860 E0022620 12770057 */ beq $s3, $s7, .LE0022780 -/* 337864 E0022624 00000000 */ nop +/* 337864 E0022624 00000000 */ nop /* 337868 E0022628 08008A00 */ j .LE0022800 -/* 33786C E002262C 00000000 */ nop +/* 33786C E002262C 00000000 */ nop .LE0022630: /* 337870 E0022630 C600FFFC */ lwc1 $f0, -4($s0) /* 337874 E0022634 3C01E002 */ lui $at, %hi(D_E0022D70) @@ -79,25 +79,25 @@ glabel func_E002254C /* 3378A4 E0022664 90620000 */ lbu $v0, ($v1) /* 3378A8 E0022668 C600FFF4 */ lwc1 $f0, -0xc($s0) /* 3378AC E002266C 44821000 */ mtc1 $v0, $f2 -/* 3378B0 E0022670 00000000 */ nop +/* 3378B0 E0022670 00000000 */ nop /* 3378B4 E0022674 468010A0 */ cvt.s.w $f2, $f2 /* 3378B8 E0022678 46020002 */ mul.s $f0, $f0, $f2 -/* 3378BC E002267C 00000000 */ nop +/* 3378BC E002267C 00000000 */ nop /* 3378C0 E0022680 46000021 */ cvt.d.s $f0, $f0 /* 3378C4 E0022684 463A0002 */ mul.d $f0, $f0, $f26 -/* 3378C8 E0022688 00000000 */ nop +/* 3378C8 E0022688 00000000 */ nop /* 3378CC E002268C 46200020 */ cvt.s.d $f0, $f0 /* 3378D0 E0022690 E600FFE8 */ swc1 $f0, -0x18($s0) /* 3378D4 E0022694 90620000 */ lbu $v0, ($v1) /* 3378D8 E0022698 C602FFF8 */ lwc1 $f2, -8($s0) /* 3378DC E002269C 44820000 */ mtc1 $v0, $f0 -/* 3378E0 E00226A0 00000000 */ nop +/* 3378E0 E00226A0 00000000 */ nop /* 3378E4 E00226A4 46800020 */ cvt.s.w $f0, $f0 /* 3378E8 E00226A8 46001082 */ mul.s $f2, $f2, $f0 -/* 3378EC E00226AC 00000000 */ nop +/* 3378EC E00226AC 00000000 */ nop /* 3378F0 E00226B0 460010A1 */ cvt.d.s $f2, $f2 /* 3378F4 E00226B4 463A1082 */ mul.d $f2, $f2, $f26 -/* 3378F8 E00226B8 00000000 */ nop +/* 3378F8 E00226B8 00000000 */ nop /* 3378FC E00226BC C600FFFC */ lwc1 $f0, -4($s0) /* 337900 E00226C0 46000021 */ cvt.d.s $f0, $f0 /* 337904 E00226C4 46201080 */ add.d $f2, $f2, $f0 @@ -106,11 +106,11 @@ glabel func_E002254C /* 337910 E00226D0 E602FFEC */ swc1 $f2, -0x14($s0) /* 337914 E00226D4 90420000 */ lbu $v0, ($v0) /* 337918 E00226D8 44820000 */ mtc1 $v0, $f0 -/* 33791C E00226DC 00000000 */ nop +/* 33791C E00226DC 00000000 */ nop /* 337920 E00226E0 46800020 */ cvt.s.w $f0, $f0 /* 337924 E00226E4 46000021 */ cvt.d.s $f0, $f0 /* 337928 E00226E8 463A0002 */ mul.d $f0, $f0, $f26 -/* 33792C E00226EC 00000000 */ nop +/* 33792C E00226EC 00000000 */ nop /* 337930 E00226F0 08008A35 */ j .LE00228D4 /* 337934 E00226F4 46200020 */ cvt.s.d $f0, $f0 .LE00226F8: @@ -121,12 +121,12 @@ glabel func_E002254C /* 337948 E0022708 3C013F00 */ lui $at, 0x3f00 /* 33794C E002270C 44810000 */ mtc1 $at, $f0 /* 337950 E0022710 4483A000 */ mtc1 $v1, $f20 -/* 337954 E0022714 00000000 */ nop +/* 337954 E0022714 00000000 */ nop /* 337958 E0022718 4680A520 */ cvt.s.w $f20, $f20 /* 33795C E002271C 4600A502 */ mul.s $f20, $f20, $f0 -/* 337960 E0022720 00000000 */ nop +/* 337960 E0022720 00000000 */ nop /* 337964 E0022724 4482B000 */ mtc1 $v0, $f22 -/* 337968 E0022728 00000000 */ nop +/* 337968 E0022728 00000000 */ nop /* 33796C E002272C 4680B5A0 */ cvt.s.w $f22, $f22 /* 337970 E0022730 3C013F80 */ lui $at, 0x3f80 /* 337974 E0022734 44810000 */ mtc1 $at, $f0 @@ -135,16 +135,16 @@ glabel func_E002254C /* 337980 E0022740 0C080140 */ jal func_E0200500 /* 337984 E0022744 AFD70000 */ sw $s7, ($fp) /* 337988 E0022748 4600A002 */ mul.s $f0, $f20, $f0 -/* 33798C E002274C 00000000 */ nop +/* 33798C E002274C 00000000 */ nop /* 337990 E0022750 4600B306 */ mov.s $f12, $f22 /* 337994 E0022754 0C080144 */ jal func_E0200510 /* 337998 E0022758 E600FFF4 */ swc1 $f0, -0xc($s0) /* 33799C E002275C 4600A502 */ mul.s $f20, $f20, $f0 -/* 3379A0 E0022760 00000000 */ nop +/* 3379A0 E0022760 00000000 */ nop /* 3379A4 E0022764 3C01BD4C */ lui $at, 0xbd4c /* 3379A8 E0022768 3421CCCD */ ori $at, $at, 0xcccd /* 3379AC E002276C 44810000 */ mtc1 $at, $f0 -/* 3379B0 E0022770 00000000 */ nop +/* 3379B0 E0022770 00000000 */ nop /* 3379B4 E0022774 E600FFFC */ swc1 $f0, -4($s0) /* 3379B8 E0022778 08008A36 */ j .LE00228D8 /* 3379BC E002277C E614FFF8 */ swc1 $f20, -8($s0) @@ -152,16 +152,16 @@ glabel func_E002254C /* 3379C0 E0022780 C600FFF4 */ lwc1 $f0, -0xc($s0) /* 3379C4 E0022784 46000021 */ cvt.d.s $f0, $f0 /* 3379C8 E0022788 463C0002 */ mul.d $f0, $f0, $f28 -/* 3379CC E002278C 00000000 */ nop +/* 3379CC E002278C 00000000 */ nop /* 3379D0 E0022790 C602FFF8 */ lwc1 $f2, -8($s0) /* 3379D4 E0022794 460010A1 */ cvt.d.s $f2, $f2 /* 3379D8 E0022798 463C1082 */ mul.d $f2, $f2, $f28 -/* 3379DC E002279C 00000000 */ nop +/* 3379DC E002279C 00000000 */ nop /* 3379E0 E00227A0 C6040000 */ lwc1 $f4, ($s0) /* 3379E4 E00227A4 46002121 */ cvt.d.s $f4, $f4 /* 3379E8 E00227A8 4624C181 */ sub.d $f6, $f24, $f4 /* 3379EC E00227AC 46383182 */ mul.d $f6, $f6, $f24 -/* 3379F0 E00227B0 00000000 */ nop +/* 3379F0 E00227B0 00000000 */ nop /* 3379F4 E00227B4 C608FFE8 */ lwc1 $f8, -0x18($s0) /* 3379F8 E00227B8 46200020 */ cvt.s.d $f0, $f0 /* 3379FC E00227BC E600FFF4 */ swc1 $f0, -0xc($s0) @@ -187,7 +187,7 @@ glabel func_E002254C /* 337A48 E0022808 D4222D78 */ ldc1 $f2, %lo(D_E0022D78)($at) /* 337A4C E002280C 46000021 */ cvt.d.s $f0, $f0 /* 337A50 E0022810 46220002 */ mul.d $f0, $f0, $f2 -/* 337A54 E0022814 00000000 */ nop +/* 337A54 E0022814 00000000 */ nop /* 337A58 E0022818 C604FFF8 */ lwc1 $f4, -8($s0) /* 337A5C E002281C C602FFFC */ lwc1 $f2, -4($s0) /* 337A60 E0022820 46022100 */ add.s $f4, $f4, $f2 @@ -223,11 +223,11 @@ glabel func_E002254C /* 337AD0 E0022890 00761021 */ addu $v0, $v1, $s6 /* 337AD4 E0022894 90420000 */ lbu $v0, ($v0) /* 337AD8 E0022898 44820000 */ mtc1 $v0, $f0 -/* 337ADC E002289C 00000000 */ nop +/* 337ADC E002289C 00000000 */ nop /* 337AE0 E00228A0 46800020 */ cvt.s.w $f0, $f0 /* 337AE4 E00228A4 46000021 */ cvt.d.s $f0, $f0 /* 337AE8 E00228A8 463A0002 */ mul.d $f0, $f0, $f26 -/* 337AEC E00228AC 00000000 */ nop +/* 337AEC E00228AC 00000000 */ nop /* 337AF0 E00228B0 08008A35 */ j .LE00228D4 /* 337AF4 E00228B4 46200020 */ cvt.s.d $f0, $f0 .LE00228B8: @@ -235,7 +235,7 @@ glabel func_E002254C /* 337AFC E00228BC 46000021 */ cvt.d.s $f0, $f0 /* 337B00 E00228C0 4620C081 */ sub.d $f2, $f24, $f0 /* 337B04 E00228C4 46381082 */ mul.d $f2, $f2, $f24 -/* 337B08 E00228C8 00000000 */ nop +/* 337B08 E00228C8 00000000 */ nop /* 337B0C E00228CC 46220000 */ add.d $f0, $f0, $f2 /* 337B10 E00228D0 46200020 */ cvt.s.d $f0, $f0 .LE00228D4: @@ -251,12 +251,12 @@ glabel func_E002254C /* 337B30 E00228F0 1260000A */ beqz $s3, .LE002291C /* 337B34 E00228F4 2402000A */ addiu $v0, $zero, 0xa /* 337B38 E00228F8 12620008 */ beq $s3, $v0, .LE002291C -/* 337B3C E00228FC 00000000 */ nop +/* 337B3C E00228FC 00000000 */ nop /* 337B40 E0022900 8EA20008 */ lw $v0, 8($s5) /* 337B44 E0022904 2442FFFF */ addiu $v0, $v0, -1 /* 337B48 E0022908 0282102A */ slt $v0, $s4, $v0 /* 337B4C E002290C 14400003 */ bnez $v0, .LE002291C -/* 337B50 E0022910 00000000 */ nop +/* 337B50 E0022910 00000000 */ nop .LE0022914: /* 337B54 E0022914 0C080128 */ jal func_E02004A0 /* 337B58 E0022918 02A0202D */ daddu $a0, $s5, $zero diff --git a/asm/nonmatchings/code_337240/func_E0022998.s b/asm/nonmatchings/code_337240/func_E0022998.s index dcb61d705f..05084da748 100644 --- a/asm/nonmatchings/code_337240/func_E0022998.s +++ b/asm/nonmatchings/code_337240/func_E0022998.s @@ -210,4 +210,4 @@ glabel func_E0022998 /* 337F00 E0022CC0 8FB000D8 */ lw $s0, 0xd8($sp) /* 337F04 E0022CC4 03E00008 */ jr $ra /* 337F08 E0022CC8 27BD0100 */ addiu $sp, $sp, 0x100 -/* 337F0C E0022CCC 00000000 */ nop +/* 337F0C E0022CCC 00000000 */ nop diff --git a/asm/nonmatchings/code_33B180/func_E0026000.s b/asm/nonmatchings/code_33B180/func_E0026000.s index 39e24aceef..2192a741ae 100644 --- a/asm/nonmatchings/code_33B180/func_E0026000.s +++ b/asm/nonmatchings/code_33B180/func_E0026000.s @@ -41,7 +41,7 @@ glabel func_E0026000 /* 33B210 E0026090 AE110000 */ sw $s1, ($s0) .LE0026094: /* 33B214 E0026094 08009825 */ j .LE0026094 -/* 33B218 E0026098 00000000 */ nop +/* 33B218 E0026098 00000000 */ nop .LE002609C: /* 33B21C E002609C 3C014120 */ lui $at, 0x4120 /* 33B220 E00260A0 44810000 */ mtc1 $at, $f0 @@ -67,7 +67,7 @@ glabel func_E0026000 /* 33B270 E00260F0 0C080000 */ jal func_E0200000 /* 33B274 E00260F4 E600001C */ swc1 $f0, 0x1c($s0) /* 33B278 E00260F8 44820000 */ mtc1 $v0, $f0 -/* 33B27C E00260FC 00000000 */ nop +/* 33B27C E00260FC 00000000 */ nop /* 33B280 E0026100 46800020 */ cvt.s.w $f0, $f0 /* 33B284 E0026104 3C014080 */ lui $at, 0x4080 /* 33B288 E0026108 44811000 */ mtc1 $at, $f2 @@ -86,7 +86,7 @@ glabel func_E0026000 /* 33B2B8 E0026138 D4226A20 */ ldc1 $f2, %lo(D_E0026A20)($at) /* 33B2BC E002613C 4600D021 */ cvt.d.s $f0, $f26 /* 33B2C0 E0026140 46220002 */ mul.d $f0, $f0, $f2 -/* 33B2C4 E0026144 00000000 */ nop +/* 33B2C4 E0026144 00000000 */ nop /* 33B2C8 E0026148 2402FFFE */ addiu $v0, $zero, -2 /* 33B2CC E002614C AE020044 */ sw $v0, 0x44($s0) /* 33B2D0 E0026150 2402FFFC */ addiu $v0, $zero, -4 diff --git a/asm/nonmatchings/code_33B180/func_E0026184.s b/asm/nonmatchings/code_33B180/func_E0026184.s index 0b6f1a738d..0371a2d6ec 100644 --- a/asm/nonmatchings/code_33B180/func_E0026184.s +++ b/asm/nonmatchings/code_33B180/func_E0026184.s @@ -3,4 +3,4 @@ glabel func_E0026184 /* 33B304 E0026184 03E00008 */ jr $ra -/* 33B308 E0026188 00000000 */ nop +/* 33B308 E0026188 00000000 */ nop diff --git a/asm/nonmatchings/code_33B180/func_E002618C.s b/asm/nonmatchings/code_33B180/func_E002618C.s index ba76ab1534..857be999af 100644 --- a/asm/nonmatchings/code_33B180/func_E002618C.s +++ b/asm/nonmatchings/code_33B180/func_E002618C.s @@ -20,7 +20,7 @@ glabel func_E002618C /* 33B348 E00261C8 0C080128 */ jal func_E02004A0 /* 33B34C E00261CC 0220202D */ daddu $a0, $s1, $zero /* 33B350 E00261D0 08009926 */ j .LE0026498 -/* 33B354 E00261D4 00000000 */ nop +/* 33B354 E00261D4 00000000 */ nop .LE00261D8: /* 33B358 E00261D8 2882000B */ slti $v0, $a0, 0xb /* 33B35C E00261DC 1040000B */ beqz $v0, .LE002620C @@ -50,16 +50,16 @@ glabel func_E002618C .LE0026238: /* 33B3B8 E0026238 28A2000A */ slti $v0, $a1, 0xa /* 33B3BC E002623C 1040000C */ beqz $v0, .LE0026270 -/* 33B3C0 E0026240 00000000 */ nop +/* 33B3C0 E0026240 00000000 */ nop /* 33B3C4 E0026244 8E020000 */ lw $v0, ($s0) /* 33B3C8 E0026248 14400009 */ bnez $v0, .LE0026270 -/* 33B3CC E002624C 00000000 */ nop +/* 33B3CC E002624C 00000000 */ nop /* 33B3D0 E0026250 C600001C */ lwc1 $f0, 0x1c($s0) /* 33B3D4 E0026254 3C01E002 */ lui $at, %hi(D_E0026A28) /* 33B3D8 E0026258 D4226A28 */ ldc1 $f2, %lo(D_E0026A28)($at) /* 33B3DC E002625C 46000021 */ cvt.d.s $f0, $f0 /* 33B3E0 E0026260 46220002 */ mul.d $f0, $f0, $f2 -/* 33B3E4 E0026264 00000000 */ nop +/* 33B3E4 E0026264 00000000 */ nop /* 33B3E8 E0026268 46200020 */ cvt.s.d $f0, $f0 /* 33B3EC E002626C E600001C */ swc1 $f0, 0x1c($s0) .LE0026270: @@ -70,18 +70,18 @@ glabel func_E002618C /* 33B400 E0026280 00451021 */ addu $v0, $v0, $a1 /* 33B404 E0026284 00021040 */ sll $v0, $v0, 1 /* 33B408 E0026288 44826000 */ mtc1 $v0, $f12 -/* 33B40C E002628C 00000000 */ nop +/* 33B40C E002628C 00000000 */ nop /* 33B410 E0026290 0C080140 */ jal func_E0200500 /* 33B414 E0026294 46806320 */ cvt.s.w $f12, $f12 /* 33B418 E0026298 3C01E002 */ lui $at, %hi(D_E0026A30) /* 33B41C E002629C D4226A30 */ ldc1 $f2, %lo(D_E0026A30)($at) /* 33B420 E00262A0 46000021 */ cvt.d.s $f0, $f0 /* 33B424 E00262A4 46220002 */ mul.d $f0, $f0, $f2 -/* 33B428 E00262A8 00000000 */ nop +/* 33B428 E00262A8 00000000 */ nop /* 33B42C E00262AC C6020020 */ lwc1 $f2, 0x20($s0) /* 33B430 E00262B0 460010A1 */ cvt.d.s $f2, $f2 /* 33B434 E00262B4 46220002 */ mul.d $f0, $f0, $f2 -/* 33B438 E00262B8 00000000 */ nop +/* 33B438 E00262B8 00000000 */ nop /* 33B43C E00262BC C604001C */ lwc1 $f4, 0x1c($s0) /* 33B440 E00262C0 46201080 */ add.d $f2, $f2, $f0 /* 33B444 E00262C4 46002121 */ cvt.d.s $f4, $f4 @@ -93,18 +93,18 @@ glabel func_E002618C /* 33B458 E00262D8 00451021 */ addu $v0, $v0, $a1 /* 33B45C E00262DC 00021040 */ sll $v0, $v0, 1 /* 33B460 E00262E0 44826000 */ mtc1 $v0, $f12 -/* 33B464 E00262E4 00000000 */ nop +/* 33B464 E00262E4 00000000 */ nop /* 33B468 E00262E8 0C080140 */ jal func_E0200500 /* 33B46C E00262EC 46806320 */ cvt.s.w $f12, $f12 /* 33B470 E00262F0 3C01E002 */ lui $at, %hi(D_E0026A40) /* 33B474 E00262F4 D4226A40 */ ldc1 $f2, %lo(D_E0026A40)($at) /* 33B478 E00262F8 46000021 */ cvt.d.s $f0, $f0 /* 33B47C E00262FC 46220002 */ mul.d $f0, $f0, $f2 -/* 33B480 E0026300 00000000 */ nop +/* 33B480 E0026300 00000000 */ nop /* 33B484 E0026304 C6020020 */ lwc1 $f2, 0x20($s0) /* 33B488 E0026308 460010A1 */ cvt.d.s $f2, $f2 /* 33B48C E002630C 46220002 */ mul.d $f0, $f0, $f2 -/* 33B490 E0026310 00000000 */ nop +/* 33B490 E0026310 00000000 */ nop /* 33B494 E0026314 C604001C */ lwc1 $f4, 0x1c($s0) /* 33B498 E0026318 46201080 */ add.d $f2, $f2, $f0 /* 33B49C E002631C 46002121 */ cvt.d.s $f4, $f4 @@ -113,7 +113,7 @@ glabel func_E002618C /* 33B4A8 E0026328 D4206A48 */ ldc1 $f0, %lo(D_E0026A48)($at) .LE002632C: /* 33B4AC E002632C 46201082 */ mul.d $f2, $f2, $f0 -/* 33B4B0 E0026330 00000000 */ nop +/* 33B4B0 E0026330 00000000 */ nop /* 33B4B4 E0026334 46222100 */ add.d $f4, $f4, $f2 /* 33B4B8 E0026338 46202120 */ cvt.s.d $f4, $f4 /* 33B4BC E002633C E604001C */ swc1 $f4, 0x1c($s0) @@ -148,13 +148,13 @@ glabel func_E002618C /* 33B530 E00263B0 C7A40028 */ lwc1 $f4, 0x28($sp) /* 33B534 E00263B4 4600A503 */ div.s $f20, $f20, $f0 /* 33B538 E00263B8 46142102 */ mul.s $f4, $f4, $f20 -/* 33B53C E00263BC 00000000 */ nop +/* 33B53C E00263BC 00000000 */ nop /* 33B540 E00263C0 C7A0002C */ lwc1 $f0, 0x2c($sp) /* 33B544 E00263C4 46140002 */ mul.s $f0, $f0, $f20 -/* 33B548 E00263C8 00000000 */ nop +/* 33B548 E00263C8 00000000 */ nop /* 33B54C E00263CC C7A20030 */ lwc1 $f2, 0x30($sp) /* 33B550 E00263D0 46141082 */ mul.s $f2, $f2, $f20 -/* 33B554 E00263D4 00000000 */ nop +/* 33B554 E00263D4 00000000 */ nop /* 33B558 E00263D8 AE000018 */ sw $zero, 0x18($s0) /* 33B55C E00263DC E6040010 */ swc1 $f4, 0x10($s0) /* 33B560 E00263E0 E6000014 */ swc1 $f0, 0x14($s0) diff --git a/asm/nonmatchings/code_33B180/func_E00264F4.s b/asm/nonmatchings/code_33B180/func_E00264F4.s index 530bb34491..ee7170d8df 100644 --- a/asm/nonmatchings/code_33B180/func_E00264F4.s +++ b/asm/nonmatchings/code_33B180/func_E00264F4.s @@ -95,10 +95,10 @@ glabel func_E00264F4 /* 33B7D8 E0026658 3C014680 */ lui $at, 0x4680 /* 33B7DC E002665C 44812000 */ mtc1 $at, $f4 /* 33B7E0 E0026660 44823000 */ mtc1 $v0, $f6 -/* 33B7E4 E0026664 00000000 */ nop +/* 33B7E4 E0026664 00000000 */ nop /* 33B7E8 E0026668 468031A0 */ cvt.s.w $f6, $f6 /* 33B7EC E002666C 44830000 */ mtc1 $v1, $f0 -/* 33B7F0 E0026670 00000000 */ nop +/* 33B7F0 E0026670 00000000 */ nop /* 33B7F4 E0026674 46800020 */ cvt.s.w $f0, $f0 /* 33B7F8 E0026678 46003183 */ div.s $f6, $f6, $f0 /* 33B7FC E002667C 44073000 */ mfc1 $a3, $f6 @@ -142,7 +142,7 @@ glabel func_E00264F4 /* 33B894 E0026714 1696000E */ bne $s4, $s6, .LE0026750 /* 33B898 E0026718 3C120001 */ lui $s2, 1 /* 33B89C E002671C 44800000 */ mtc1 $zero, $f0 -/* 33B8A0 E0026720 00000000 */ nop +/* 33B8A0 E0026720 00000000 */ nop /* 33B8A4 E0026724 44050000 */ mfc1 $a1, $f0 /* 33B8A8 E0026728 3C07C28C */ lui $a3, 0xc28c /* 33B8AC E002672C 080099D1 */ j .LE0026744 @@ -326,4 +326,4 @@ glabel func_E00264F4 /* 33BB60 E00269E0 D7B40110 */ ldc1 $f20, 0x110($sp) /* 33BB64 E00269E4 03E00008 */ jr $ra /* 33BB68 E00269E8 27BD0118 */ addiu $sp, $sp, 0x118 -/* 33BB6C E00269EC 00000000 */ nop +/* 33BB6C E00269EC 00000000 */ nop diff --git a/asm/nonmatchings/code_33CDF0/func_E0028000.s b/asm/nonmatchings/code_33CDF0/func_E0028000.s index affc82eb0c..4562b6b424 100644 --- a/asm/nonmatchings/code_33CDF0/func_E0028000.s +++ b/asm/nonmatchings/code_33CDF0/func_E0028000.s @@ -40,7 +40,7 @@ glabel func_E0028000 /* 33CE7C E002808C AE03000C */ sw $v1, 0xc($s0) .LE0028090: /* 33CE80 E0028090 0800A024 */ j .LE0028090 -/* 33CE84 E0028094 00000000 */ nop +/* 33CE84 E0028094 00000000 */ nop .LE0028098: /* 33CE88 E0028098 AC730000 */ sw $s3, ($v1) /* 33CE8C E002809C E4740004 */ swc1 $f20, 4($v1) @@ -59,38 +59,38 @@ glabel func_E0028000 /* 33CEC0 E00280D0 24700014 */ addiu $s0, $v1, 0x14 .LE00280D4: /* 33CEC4 E00280D4 16600026 */ bnez $s3, .LE0028170 -/* 33CEC8 E00280D8 00000000 */ nop +/* 33CEC8 E00280D8 00000000 */ nop /* 33CECC E00280DC 0C080000 */ jal func_E0200000 /* 33CED0 E00280E0 24040032 */ addiu $a0, $zero, 0x32 /* 33CED4 E00280E4 24040032 */ addiu $a0, $zero, 0x32 /* 33CED8 E00280E8 2442FFE7 */ addiu $v0, $v0, -0x19 /* 33CEDC E00280EC 44820000 */ mtc1 $v0, $f0 -/* 33CEE0 E00280F0 00000000 */ nop +/* 33CEE0 E00280F0 00000000 */ nop /* 33CEE4 E00280F4 46800020 */ cvt.s.w $f0, $f0 /* 33CEE8 E00280F8 0C080000 */ jal func_E0200000 /* 33CEEC E00280FC E600FFF0 */ swc1 $f0, -0x10($s0) /* 33CEF0 E0028100 24040168 */ addiu $a0, $zero, 0x168 /* 33CEF4 E0028104 2442FFE7 */ addiu $v0, $v0, -0x19 /* 33CEF8 E0028108 44820000 */ mtc1 $v0, $f0 -/* 33CEFC E002810C 00000000 */ nop +/* 33CEFC E002810C 00000000 */ nop /* 33CF00 E0028110 46800020 */ cvt.s.w $f0, $f0 /* 33CF04 E0028114 E600FFF4 */ swc1 $f0, -0xc($s0) /* 33CF08 E0028118 0C080000 */ jal func_E0200000 /* 33CF0C E002811C AE00FFF8 */ sw $zero, -8($s0) /* 33CF10 E0028120 24040168 */ addiu $a0, $zero, 0x168 /* 33CF14 E0028124 44820000 */ mtc1 $v0, $f0 -/* 33CF18 E0028128 00000000 */ nop +/* 33CF18 E0028128 00000000 */ nop /* 33CF1C E002812C 46800020 */ cvt.s.w $f0, $f0 /* 33CF20 E0028130 0C080000 */ jal func_E0200000 /* 33CF24 E0028134 E6000004 */ swc1 $f0, 4($s0) /* 33CF28 E0028138 24040064 */ addiu $a0, $zero, 0x64 /* 33CF2C E002813C 44820000 */ mtc1 $v0, $f0 -/* 33CF30 E0028140 00000000 */ nop +/* 33CF30 E0028140 00000000 */ nop /* 33CF34 E0028144 46800020 */ cvt.s.w $f0, $f0 /* 33CF38 E0028148 0C080000 */ jal func_E0200000 /* 33CF3C E002814C E600000C */ swc1 $f0, 0xc($s0) /* 33CF40 E0028150 44820000 */ mtc1 $v0, $f0 -/* 33CF44 E0028154 00000000 */ nop +/* 33CF44 E0028154 00000000 */ nop /* 33CF48 E0028158 46800020 */ cvt.s.w $f0, $f0 /* 33CF4C E002815C 46140003 */ div.s $f0, $f0, $f20 /* 33CF50 E0028160 E6000008 */ swc1 $f0, 8($s0) @@ -103,32 +103,32 @@ glabel func_E0028000 /* 33CF68 E0028178 2404000A */ addiu $a0, $zero, 0xa /* 33CF6C E002817C 2442FFFB */ addiu $v0, $v0, -5 /* 33CF70 E0028180 44820000 */ mtc1 $v0, $f0 -/* 33CF74 E0028184 00000000 */ nop +/* 33CF74 E0028184 00000000 */ nop /* 33CF78 E0028188 46800020 */ cvt.s.w $f0, $f0 /* 33CF7C E002818C 0C080000 */ jal func_E0200000 /* 33CF80 E0028190 E600FFF0 */ swc1 $f0, -0x10($s0) /* 33CF84 E0028194 24040168 */ addiu $a0, $zero, 0x168 /* 33CF88 E0028198 24420005 */ addiu $v0, $v0, 5 /* 33CF8C E002819C 44820000 */ mtc1 $v0, $f0 -/* 33CF90 E00281A0 00000000 */ nop +/* 33CF90 E00281A0 00000000 */ nop /* 33CF94 E00281A4 46800020 */ cvt.s.w $f0, $f0 /* 33CF98 E00281A8 E600FFF4 */ swc1 $f0, -0xc($s0) /* 33CF9C E00281AC 0C080000 */ jal func_E0200000 /* 33CFA0 E00281B0 E614FFF8 */ swc1 $f20, -8($s0) /* 33CFA4 E00281B4 24040168 */ addiu $a0, $zero, 0x168 /* 33CFA8 E00281B8 44820000 */ mtc1 $v0, $f0 -/* 33CFAC E00281BC 00000000 */ nop +/* 33CFAC E00281BC 00000000 */ nop /* 33CFB0 E00281C0 46800020 */ cvt.s.w $f0, $f0 /* 33CFB4 E00281C4 0C080000 */ jal func_E0200000 /* 33CFB8 E00281C8 E6000004 */ swc1 $f0, 4($s0) /* 33CFBC E00281CC 24040064 */ addiu $a0, $zero, 0x64 /* 33CFC0 E00281D0 44820000 */ mtc1 $v0, $f0 -/* 33CFC4 E00281D4 00000000 */ nop +/* 33CFC4 E00281D4 00000000 */ nop /* 33CFC8 E00281D8 46800020 */ cvt.s.w $f0, $f0 /* 33CFCC E00281DC 0C080000 */ jal func_E0200000 /* 33CFD0 E00281E0 E600000C */ swc1 $f0, 0xc($s0) /* 33CFD4 E00281E4 44820000 */ mtc1 $v0, $f0 -/* 33CFD8 E00281E8 00000000 */ nop +/* 33CFD8 E00281E8 00000000 */ nop /* 33CFDC E00281EC 46800020 */ cvt.s.w $f0, $f0 /* 33CFE0 E00281F0 3C014000 */ lui $at, 0x4000 /* 33CFE4 E00281F4 44811000 */ mtc1 $at, $f2 diff --git a/asm/nonmatchings/code_33CDF0/func_E0028240.s b/asm/nonmatchings/code_33CDF0/func_E0028240.s index b23abf2e20..fe4457bcee 100644 --- a/asm/nonmatchings/code_33CDF0/func_E0028240.s +++ b/asm/nonmatchings/code_33CDF0/func_E0028240.s @@ -3,4 +3,4 @@ glabel func_E0028240 /* 33D030 E0028240 03E00008 */ jr $ra -/* 33D034 E0028244 00000000 */ nop +/* 33D034 E0028244 00000000 */ nop diff --git a/asm/nonmatchings/code_33CDF0/func_E0028248.s b/asm/nonmatchings/code_33CDF0/func_E0028248.s index b4d297cb44..5cba438879 100644 --- a/asm/nonmatchings/code_33CDF0/func_E0028248.s +++ b/asm/nonmatchings/code_33CDF0/func_E0028248.s @@ -24,7 +24,7 @@ glabel func_E0028248 /* 33D084 E0028294 0C080128 */ jal func_E02004A0 /* 33D088 E0028298 0260202D */ daddu $a0, $s3, $zero /* 33D08C E002829C 0800A130 */ j .LE00284C0 -/* 33D090 E00282A0 00000000 */ nop +/* 33D090 E00282A0 00000000 */ nop .LE00282A4: /* 33D094 E00282A4 8C940000 */ lw $s4, ($a0) /* 33D098 E00282A8 2842000A */ slti $v0, $v0, 0xa @@ -35,12 +35,12 @@ glabel func_E0028248 /* 33D0AC E00282BC D42087E0 */ ldc1 $f0, %lo(D_E00287E0)($at) /* 33D0B0 E00282C0 00431023 */ subu $v0, $v0, $v1 /* 33D0B4 E00282C4 44821000 */ mtc1 $v0, $f2 -/* 33D0B8 E00282C8 00000000 */ nop +/* 33D0B8 E00282C8 00000000 */ nop /* 33D0BC E00282CC 468010A1 */ cvt.d.w $f2, $f2 /* 33D0C0 E00282D0 46201082 */ mul.d $f2, $f2, $f0 -/* 33D0C4 E00282D4 00000000 */ nop +/* 33D0C4 E00282D4 00000000 */ nop /* 33D0C8 E00282D8 44830000 */ mtc1 $v1, $f0 -/* 33D0CC E00282DC 00000000 */ nop +/* 33D0CC E00282DC 00000000 */ nop /* 33D0D0 E00282E0 46800021 */ cvt.d.w $f0, $f0 /* 33D0D4 E00282E4 46220000 */ add.d $f0, $f0, $f2 /* 33D0D8 E00282E8 4620020D */ trunc.w.d $f8, $f0 @@ -48,13 +48,13 @@ glabel func_E0028248 .LE00282F0: /* 33D0E0 E00282F0 28C2000A */ slti $v0, $a2, 0xa /* 33D0E4 E00282F4 10400009 */ beqz $v0, .LE002831C -/* 33D0E8 E00282F8 00000000 */ nop +/* 33D0E8 E00282F8 00000000 */ nop /* 33D0EC E00282FC 3C01E003 */ lui $at, %hi(D_E00287E8) /* 33D0F0 E0028300 D42287E8 */ ldc1 $f2, %lo(D_E00287E8)($at) /* 33D0F4 E0028304 C4800024 */ lwc1 $f0, 0x24($a0) /* 33D0F8 E0028308 46800021 */ cvt.d.w $f0, $f0 /* 33D0FC E002830C 46220002 */ mul.d $f0, $f0, $f2 -/* 33D100 E0028310 00000000 */ nop +/* 33D100 E0028310 00000000 */ nop /* 33D104 E0028314 4620020D */ trunc.w.d $f8, $f0 /* 33D108 E0028318 E4880024 */ swc1 $f8, 0x24($a0) .LE002831C: @@ -78,7 +78,7 @@ glabel func_E0028248 /* 33D14C E002835C D42287F0 */ ldc1 $f2, %lo(D_E00287F0)($at) /* 33D150 E0028360 46000021 */ cvt.d.s $f0, $f0 /* 33D154 E0028364 46220002 */ mul.d $f0, $f0, $f2 -/* 33D158 E0028368 00000000 */ nop +/* 33D158 E0028368 00000000 */ nop /* 33D15C E002836C C602000C */ lwc1 $f2, 0xc($s0) /* 33D160 E0028370 46161080 */ add.s $f2, $f2, $f22 /* 33D164 E0028374 C6040008 */ lwc1 $f4, 8($s0) @@ -91,7 +91,7 @@ glabel func_E0028248 /* 33D180 E0028390 D42287F8 */ ldc1 $f2, %lo(D_E00287F8)($at) /* 33D184 E0028394 46000021 */ cvt.d.s $f0, $f0 /* 33D188 E0028398 46220002 */ mul.d $f0, $f0, $f2 -/* 33D18C E002839C 00000000 */ nop +/* 33D18C E002839C 00000000 */ nop /* 33D190 E00283A0 C60C0010 */ lwc1 $f12, 0x10($s0) /* 33D194 E00283A4 46200020 */ cvt.s.d $f0, $f0 /* 33D198 E00283A8 0C080140 */ jal func_E0200500 @@ -100,14 +100,14 @@ glabel func_E0028248 /* 33D1A4 E00283B4 D4228800 */ ldc1 $f2, %lo(D_E0028800)($at) /* 33D1A8 E00283B8 46000021 */ cvt.d.s $f0, $f0 /* 33D1AC E00283BC 46220002 */ mul.d $f0, $f0, $f2 -/* 33D1B0 E00283C0 00000000 */ nop +/* 33D1B0 E00283C0 00000000 */ nop /* 33D1B4 E00283C4 3C01E003 */ lui $at, %hi(D_E0028808) /* 33D1B8 E00283C8 D4248808 */ ldc1 $f4, %lo(D_E0028808)($at) /* 33D1BC E00283CC C602000C */ lwc1 $f2, 0xc($s0) /* 33D1C0 E00283D0 46240000 */ add.d $f0, $f0, $f4 /* 33D1C4 E00283D4 460010A1 */ cvt.d.s $f2, $f2 /* 33D1C8 E00283D8 46201082 */ mul.d $f2, $f2, $f0 -/* 33D1CC E00283DC 00000000 */ nop +/* 33D1CC E00283DC 00000000 */ nop /* 33D1D0 E00283E0 462010A0 */ cvt.s.d $f2, $f2 /* 33D1D4 E00283E4 0800A106 */ j .LE0028418 /* 33D1D8 E00283E8 E602000C */ swc1 $f2, 0xc($s0) @@ -117,7 +117,7 @@ glabel func_E0028248 /* 33D1E4 E00283F4 D4228810 */ ldc1 $f2, %lo(D_E0028810)($at) /* 33D1E8 E00283F8 46000021 */ cvt.d.s $f0, $f0 /* 33D1EC E00283FC 46220002 */ mul.d $f0, $f0, $f2 -/* 33D1F0 E0028400 00000000 */ nop +/* 33D1F0 E0028400 00000000 */ nop /* 33D1F4 E0028404 C602000C */ lwc1 $f2, 0xc($s0) /* 33D1F8 E0028408 46161080 */ add.s $f2, $f2, $f22 /* 33D1FC E002840C E602000C */ swc1 $f2, 0xc($s0) @@ -130,25 +130,25 @@ glabel func_E0028248 /* 33D214 E0028424 2442FFE7 */ addiu $v0, $v0, -0x19 /* 33D218 E0028428 C60C0014 */ lwc1 $f12, 0x14($s0) /* 33D21C E002842C 44820000 */ mtc1 $v0, $f0 -/* 33D220 E0028430 00000000 */ nop +/* 33D220 E0028430 00000000 */ nop /* 33D224 E0028434 46800020 */ cvt.s.w $f0, $f0 /* 33D228 E0028438 46006300 */ add.s $f12, $f12, $f0 /* 33D22C E002843C 0C080140 */ jal func_E0200500 /* 33D230 E0028440 E60C0014 */ swc1 $f12, 0x14($s0) /* 33D234 E0028444 46140002 */ mul.s $f0, $f0, $f20 -/* 33D238 E0028448 00000000 */ nop +/* 33D238 E0028448 00000000 */ nop /* 33D23C E002844C C6020014 */ lwc1 $f2, 0x14($s0) /* 33D240 E0028450 3C013F00 */ lui $at, 0x3f00 /* 33D244 E0028454 44816000 */ mtc1 $at, $f12 -/* 33D248 E0028458 00000000 */ nop +/* 33D248 E0028458 00000000 */ nop /* 33D24C E002845C 460C1302 */ mul.s $f12, $f2, $f12 -/* 33D250 E0028460 00000000 */ nop +/* 33D250 E0028460 00000000 */ nop /* 33D254 E0028464 C6020010 */ lwc1 $f2, 0x10($s0) /* 33D258 E0028468 46001080 */ add.s $f2, $f2, $f0 /* 33D25C E002846C 0C080144 */ jal func_E0200510 /* 33D260 E0028470 E6020010 */ swc1 $f2, 0x10($s0) /* 33D264 E0028474 46140002 */ mul.s $f0, $f0, $f20 -/* 33D268 E0028478 00000000 */ nop +/* 33D268 E0028478 00000000 */ nop /* 33D26C E002847C C606FFFC */ lwc1 $f6, -4($s0) /* 33D270 E0028480 C6020008 */ lwc1 $f2, 8($s0) /* 33D274 E0028484 C6040000 */ lwc1 $f4, ($s0) diff --git a/asm/nonmatchings/code_33CDF0/func_E002852C.s b/asm/nonmatchings/code_33CDF0/func_E002852C.s index b7fc9b716c..f6824e27e1 100644 --- a/asm/nonmatchings/code_33CDF0/func_E002852C.s +++ b/asm/nonmatchings/code_33CDF0/func_E002852C.s @@ -175,5 +175,5 @@ glabel func_E002852C /* 33D5BC E00287CC D7B40100 */ ldc1 $f20, 0x100($sp) /* 33D5C0 E00287D0 03E00008 */ jr $ra /* 33D5C4 E00287D4 27BD0110 */ addiu $sp, $sp, 0x110 -/* 33D5C8 E00287D8 00000000 */ nop -/* 33D5CC E00287DC 00000000 */ nop +/* 33D5C8 E00287D8 00000000 */ nop +/* 33D5CC E00287DC 00000000 */ nop diff --git a/asm/nonmatchings/code_33E8C0/func_E002A000.s b/asm/nonmatchings/code_33E8C0/func_E002A000.s index f2f2e7fb85..484c57dd65 100644 --- a/asm/nonmatchings/code_33E8C0/func_E002A000.s +++ b/asm/nonmatchings/code_33E8C0/func_E002A000.s @@ -47,7 +47,7 @@ glabel func_E002A000 /* 33E964 E002A0A4 AE64000C */ sw $a0, 0xc($s3) .LE002A0A8: /* 33E968 E002A0A8 0800A82A */ j .LE002A0A8 -/* 33E96C E002A0AC 00000000 */ nop +/* 33E96C E002A0AC 00000000 */ nop .LE002A0B0: /* 33E970 E002A0B0 2403008C */ addiu $v1, $zero, 0x8c /* 33E974 E002A0B4 AC940000 */ sw $s4, ($a0) @@ -83,7 +83,7 @@ glabel func_E002A000 /* 33E9E8 E002A128 24040032 */ addiu $a0, $zero, 0x32 /* 33E9EC E002A12C 2442FF9C */ addiu $v0, $v0, -0x64 /* 33E9F0 E002A130 44820000 */ mtc1 $v0, $f0 -/* 33E9F4 E002A134 00000000 */ nop +/* 33E9F4 E002A134 00000000 */ nop /* 33E9F8 E002A138 46800020 */ cvt.s.w $f0, $f0 /* 33E9FC E002A13C 0C080138 */ jal func_E02004E0 /* 33EA00 E002A140 E600FFFC */ swc1 $f0, -4($s0) @@ -91,7 +91,7 @@ glabel func_E002A000 /* 33EA08 E002A148 3C01BF80 */ lui $at, 0xbf80 /* 33EA0C E002A14C 44811000 */ mtc1 $at, $f2 /* 33EA10 E002A150 44820000 */ mtc1 $v0, $f0 -/* 33EA14 E002A154 00000000 */ nop +/* 33EA14 E002A154 00000000 */ nop /* 33EA18 E002A158 46800020 */ cvt.s.w $f0, $f0 /* 33EA1C E002A15C E6000000 */ swc1 $f0, ($s0) /* 33EA20 E002A160 AE000004 */ sw $zero, 4($s0) @@ -108,7 +108,7 @@ glabel func_E002A000 /* 33EA4C E002A18C 00081983 */ sra $v1, $t0, 6 /* 33EA50 E002A190 00621823 */ subu $v1, $v1, $v0 /* 33EA54 E002A194 44830000 */ mtc1 $v1, $f0 -/* 33EA58 E002A198 00000000 */ nop +/* 33EA58 E002A198 00000000 */ nop /* 33EA5C E002A19C 46800020 */ cvt.s.w $f0, $f0 /* 33EA60 E002A1A0 12800006 */ beqz $s4, .LE002A1BC /* 33EA64 E002A1A4 E600001C */ swc1 $f0, 0x1c($s0) @@ -120,7 +120,7 @@ glabel func_E002A000 .LE002A1BC: /* 33EA7C E002A1BC 46000021 */ cvt.d.s $f0, $f0 /* 33EA80 E002A1C0 46340002 */ mul.d $f0, $f0, $f20 -/* 33EA84 E002A1C4 00000000 */ nop +/* 33EA84 E002A1C4 00000000 */ nop /* 33EA88 E002A1C8 0800A87A */ j .LE002A1E8 /* 33EA8C E002A1CC 46200020 */ cvt.s.d $f0, $f0 .LE002A1D0: @@ -128,7 +128,7 @@ glabel func_E002A000 /* 33EA94 E002A1D4 D422A728 */ ldc1 $f2, %lo(D_E002A728)($at) /* 33EA98 E002A1D8 46000021 */ cvt.d.s $f0, $f0 /* 33EA9C E002A1DC 46220002 */ mul.d $f0, $f0, $f2 -/* 33EAA0 E002A1E0 00000000 */ nop +/* 33EAA0 E002A1E0 00000000 */ nop /* 33EAA4 E002A1E4 46200020 */ cvt.s.d $f0, $f0 .LE002A1E8: /* 33EAA8 E002A1E8 0800A891 */ j .LE002A244 @@ -139,20 +139,20 @@ glabel func_E002A000 /* 33EAB8 E002A1F8 AE000008 */ sw $zero, 8($s0) /* 33EABC E002A1FC 2442FFEC */ addiu $v0, $v0, -0x14 /* 33EAC0 E002A200 44820000 */ mtc1 $v0, $f0 -/* 33EAC4 E002A204 00000000 */ nop +/* 33EAC4 E002A204 00000000 */ nop /* 33EAC8 E002A208 46800021 */ cvt.d.w $f0, $f0 /* 33EACC E002A20C 46340002 */ mul.d $f0, $f0, $f20 -/* 33EAD0 E002A210 00000000 */ nop +/* 33EAD0 E002A210 00000000 */ nop /* 33EAD4 E002A214 24040028 */ addiu $a0, $zero, 0x28 /* 33EAD8 E002A218 46200020 */ cvt.s.d $f0, $f0 /* 33EADC E002A21C 0C080138 */ jal func_E02004E0 /* 33EAE0 E002A220 E600FFFC */ swc1 $f0, -4($s0) /* 33EAE4 E002A224 2442FFEC */ addiu $v0, $v0, -0x14 /* 33EAE8 E002A228 44820000 */ mtc1 $v0, $f0 -/* 33EAEC E002A22C 00000000 */ nop +/* 33EAEC E002A22C 00000000 */ nop /* 33EAF0 E002A230 46800021 */ cvt.d.w $f0, $f0 /* 33EAF4 E002A234 46340002 */ mul.d $f0, $f0, $f20 -/* 33EAF8 E002A238 00000000 */ nop +/* 33EAF8 E002A238 00000000 */ nop /* 33EAFC E002A23C 46200020 */ cvt.s.d $f0, $f0 /* 33EB00 E002A240 E6000000 */ swc1 $f0, ($s0) .LE002A244: diff --git a/asm/nonmatchings/code_33E8C0/func_E002A284.s b/asm/nonmatchings/code_33E8C0/func_E002A284.s index a13fd83cc0..cdbcc5e511 100644 --- a/asm/nonmatchings/code_33E8C0/func_E002A284.s +++ b/asm/nonmatchings/code_33E8C0/func_E002A284.s @@ -3,4 +3,4 @@ glabel func_E002A284 /* 33EB44 E002A284 03E00008 */ jr $ra -/* 33EB48 E002A288 00000000 */ nop +/* 33EB48 E002A288 00000000 */ nop diff --git a/asm/nonmatchings/code_33E8C0/func_E002A28C.s b/asm/nonmatchings/code_33E8C0/func_E002A28C.s index 42a2bcf171..db4d95a3f0 100644 --- a/asm/nonmatchings/code_33E8C0/func_E002A28C.s +++ b/asm/nonmatchings/code_33E8C0/func_E002A28C.s @@ -10,20 +10,20 @@ glabel func_E002A28C /* 33EB60 E002A2A0 04410005 */ bgez $v0, .LE002A2B8 /* 33EB64 E002A2A4 AC62002C */ sw $v0, 0x2c($v1) /* 33EB68 E002A2A8 0C080128 */ jal func_E02004A0 -/* 33EB6C E002A2AC 00000000 */ nop +/* 33EB6C E002A2AC 00000000 */ nop /* 33EB70 E002A2B0 0800A8DD */ j .LE002A374 -/* 33EB74 E002A2B4 00000000 */ nop +/* 33EB74 E002A2B4 00000000 */ nop .LE002A2B8: /* 33EB78 E002A2B8 8C660000 */ lw $a2, ($v1) /* 33EB7C E002A2BC 28420018 */ slti $v0, $v0, 0x18 /* 33EB80 E002A2C0 10400009 */ beqz $v0, .LE002A2E8 -/* 33EB84 E002A2C4 00000000 */ nop +/* 33EB84 E002A2C4 00000000 */ nop /* 33EB88 E002A2C8 3C01E003 */ lui $at, %hi(D_E002A730) /* 33EB8C E002A2CC D422A730 */ ldc1 $f2, %lo(D_E002A730)($at) /* 33EB90 E002A2D0 C4600018 */ lwc1 $f0, 0x18($v1) /* 33EB94 E002A2D4 46800021 */ cvt.d.w $f0, $f0 /* 33EB98 E002A2D8 46220002 */ mul.d $f0, $f0, $f2 -/* 33EB9C E002A2DC 00000000 */ nop +/* 33EB9C E002A2DC 00000000 */ nop /* 33EBA0 E002A2E0 4620020D */ trunc.w.d $f8, $f0 /* 33EBA4 E002A2E4 E4680018 */ swc1 $f8, 0x18($v1) .LE002A2E8: diff --git a/asm/nonmatchings/code_33E8C0/func_E002A3C4.s b/asm/nonmatchings/code_33E8C0/func_E002A3C4.s index ec018c5c47..bd5bd54a7a 100644 --- a/asm/nonmatchings/code_33E8C0/func_E002A3C4.s +++ b/asm/nonmatchings/code_33E8C0/func_E002A3C4.s @@ -221,5 +221,5 @@ glabel func_E002A3C4 /* 33EFCC E002A70C 8FB000E0 */ lw $s0, 0xe0($sp) /* 33EFD0 E002A710 03E00008 */ jr $ra /* 33EFD4 E002A714 27BD0108 */ addiu $sp, $sp, 0x108 -/* 33EFD8 E002A718 00000000 */ nop -/* 33EFDC E002A71C 00000000 */ nop +/* 33EFD8 E002A718 00000000 */ nop +/* 33EFDC E002A71C 00000000 */ nop diff --git a/asm/nonmatchings/code_33FE80/func_E002C000.s b/asm/nonmatchings/code_33FE80/func_E002C000.s index 4acf52ca16..36bd23915b 100644 --- a/asm/nonmatchings/code_33FE80/func_E002C000.s +++ b/asm/nonmatchings/code_33FE80/func_E002C000.s @@ -43,7 +43,7 @@ glabel func_E002C000 /* 33FF18 E002C098 AE11000C */ sw $s1, 0xc($s0) .LE002C09C: /* 33FF1C E002C09C 0800B027 */ j .LE002C09C -/* 33FF20 E002C0A0 00000000 */ nop +/* 33FF20 E002C0A0 00000000 */ nop .LE002C0A4: /* 33FF24 E002C0A4 3C01C000 */ lui $at, 0xc000 /* 33FF28 E002C0A8 44811000 */ mtc1 $at, $f2 @@ -61,7 +61,7 @@ glabel func_E002C000 /* 33FF58 E002C0D8 2404003C */ addiu $a0, $zero, 0x3c /* 33FF5C E002C0DC 2442FFE2 */ addiu $v0, $v0, -0x1e /* 33FF60 E002C0E0 44820000 */ mtc1 $v0, $f0 -/* 33FF64 E002C0E4 00000000 */ nop +/* 33FF64 E002C0E4 00000000 */ nop /* 33FF68 E002C0E8 46800020 */ cvt.s.w $f0, $f0 /* 33FF6C E002C0EC 240200FF */ addiu $v0, $zero, 0xff /* 33FF70 E002C0F0 E6200034 */ swc1 $f0, 0x34($s1) @@ -69,14 +69,14 @@ glabel func_E002C000 /* 33FF78 E002C0F8 AE220028 */ sw $v0, 0x28($s1) /* 33FF7C E002C0FC 2442FFE2 */ addiu $v0, $v0, -0x1e /* 33FF80 E002C100 44822000 */ mtc1 $v0, $f4 -/* 33FF84 E002C104 00000000 */ nop +/* 33FF84 E002C104 00000000 */ nop /* 33FF88 E002C108 46802120 */ cvt.s.w $f4, $f4 /* 33FF8C E002C10C 3C013FD0 */ lui $at, 0x3fd0 /* 33FF90 E002C110 44811800 */ mtc1 $at, $f3 /* 33FF94 E002C114 44801000 */ mtc1 $zero, $f2 /* 33FF98 E002C118 46002021 */ cvt.d.s $f0, $f4 /* 33FF9C E002C11C 46220002 */ mul.d $f0, $f0, $f2 -/* 33FFA0 E002C120 00000000 */ nop +/* 33FFA0 E002C120 00000000 */ nop /* 33FFA4 E002C124 24120001 */ addiu $s2, $zero, 1 /* 33FFA8 E002C128 24020014 */ addiu $v0, $zero, 0x14 /* 33FFAC E002C12C AE220020 */ sw $v0, 0x20($s1) @@ -114,11 +114,11 @@ glabel func_E002C000 /* 340028 E002C1A8 0C080138 */ jal func_E02004E0 /* 34002C E002C1AC E600FFDC */ swc1 $f0, -0x24($s0) /* 340030 E002C1B0 44820000 */ mtc1 $v0, $f0 -/* 340034 E002C1B4 00000000 */ nop +/* 340034 E002C1B4 00000000 */ nop /* 340038 E002C1B8 46800020 */ cvt.s.w $f0, $f0 /* 34003C E002C1BC 46000021 */ cvt.d.s $f0, $f0 /* 340040 E002C1C0 46360002 */ mul.d $f0, $f0, $f22 -/* 340044 E002C1C4 00000000 */ nop +/* 340044 E002C1C4 00000000 */ nop /* 340048 E002C1C8 26940004 */ addiu $s4, $s4, 4 /* 34004C E002C1CC 26730008 */ addiu $s3, $s3, 8 /* 340050 E002C1D0 26520001 */ addiu $s2, $s2, 1 diff --git a/asm/nonmatchings/code_33FE80/func_E002C234.s b/asm/nonmatchings/code_33FE80/func_E002C234.s index 6629d65b99..08bf3032ca 100644 --- a/asm/nonmatchings/code_33FE80/func_E002C234.s +++ b/asm/nonmatchings/code_33FE80/func_E002C234.s @@ -3,4 +3,4 @@ glabel func_E002C234 /* 3400B4 E002C234 03E00008 */ jr $ra -/* 3400B8 E002C238 00000000 */ nop +/* 3400B8 E002C238 00000000 */ nop diff --git a/asm/nonmatchings/code_33FE80/func_E002C23C.s b/asm/nonmatchings/code_33FE80/func_E002C23C.s index 010696fa4e..f72b206cc3 100644 --- a/asm/nonmatchings/code_33FE80/func_E002C23C.s +++ b/asm/nonmatchings/code_33FE80/func_E002C23C.s @@ -7,7 +7,7 @@ glabel func_E002C23C /* 3400C4 E002C244 8C85000C */ lw $a1, 0xc($a0) /* 3400C8 E002C248 8CA20024 */ lw $v0, 0x24($a1) /* 3400CC E002C24C 1440001A */ bnez $v0, .LE002C2B8 -/* 3400D0 E002C250 00000000 */ nop +/* 3400D0 E002C250 00000000 */ nop /* 3400D4 E002C254 C4A00014 */ lwc1 $f0, 0x14($a1) /* 3400D8 E002C258 3C01E003 */ lui $at, %hi(D_E002C9D8) /* 3400DC E002C25C D422C9D8 */ ldc1 $f2, %lo(D_E002C9D8)($at) @@ -28,7 +28,7 @@ glabel func_E002C23C /* 340118 E002C298 E4A00014 */ swc1 $f0, 0x14($a1) /* 34011C E002C29C E4A6002C */ swc1 $f6, 0x2c($a1) /* 340120 E002C2A0 4608503E */ c.le.s $f10, $f8 -/* 340124 E002C2A4 00000000 */ nop +/* 340124 E002C2A4 00000000 */ nop /* 340128 E002C2A8 45000003 */ bc1f .LE002C2B8 /* 34012C E002C2AC E4A20030 */ swc1 $f2, 0x30($a1) /* 340130 E002C2B0 24020001 */ addiu $v0, $zero, 1 @@ -37,25 +37,25 @@ glabel func_E002C23C /* 340138 E002C2B8 8CA30024 */ lw $v1, 0x24($a1) /* 34013C E002C2BC 24020001 */ addiu $v0, $zero, 1 /* 340140 E002C2C0 14620040 */ bne $v1, $v0, .LE002C3C4 -/* 340144 E002C2C4 00000000 */ nop +/* 340144 E002C2C4 00000000 */ nop /* 340148 E002C2C8 8CA20020 */ lw $v0, 0x20($a1) /* 34014C E002C2CC 2442FFFF */ addiu $v0, $v0, -1 /* 340150 E002C2D0 04410005 */ bgez $v0, .LE002C2E8 /* 340154 E002C2D4 ACA20020 */ sw $v0, 0x20($a1) /* 340158 E002C2D8 0C080128 */ jal func_E02004A0 -/* 34015C E002C2DC 00000000 */ nop +/* 34015C E002C2DC 00000000 */ nop /* 340160 E002C2E0 0800B0F1 */ j .LE002C3C4 -/* 340164 E002C2E4 00000000 */ nop +/* 340164 E002C2E4 00000000 */ nop .LE002C2E8: /* 340168 E002C2E8 2842000A */ slti $v0, $v0, 0xa /* 34016C E002C2EC 10400009 */ beqz $v0, .LE002C314 -/* 340170 E002C2F0 00000000 */ nop +/* 340170 E002C2F0 00000000 */ nop /* 340174 E002C2F4 3C01E003 */ lui $at, %hi(D_E002C9E0) /* 340178 E002C2F8 D422C9E0 */ ldc1 $f2, %lo(D_E002C9E0)($at) /* 34017C E002C2FC C4A00028 */ lwc1 $f0, 0x28($a1) /* 340180 E002C300 46800021 */ cvt.d.w $f0, $f0 /* 340184 E002C304 46220002 */ mul.d $f0, $f0, $f2 -/* 340188 E002C308 00000000 */ nop +/* 340188 E002C308 00000000 */ nop /* 34018C E002C30C 4620038D */ trunc.w.d $f14, $f0 /* 340190 E002C310 E4AE0028 */ swc1 $f14, 0x28($a1) .LE002C314: @@ -77,7 +77,7 @@ glabel func_E002C23C /* 3401CC E002C34C C462FFDC */ lwc1 $f2, -0x24($v1) /* 3401D0 E002C350 460010A1 */ cvt.d.s $f2, $f2 /* 3401D4 E002C354 46261082 */ mul.d $f2, $f2, $f6 -/* 3401D8 E002C358 00000000 */ nop +/* 3401D8 E002C358 00000000 */ nop /* 3401DC E002C35C C460FFE0 */ lwc1 $f0, -0x20($v1) /* 3401E0 E002C360 46000021 */ cvt.d.s $f0, $f0 /* 3401E4 E002C364 46280000 */ add.d $f0, $f0, $f8 diff --git a/asm/nonmatchings/code_33FE80/func_E002C414.s b/asm/nonmatchings/code_33FE80/func_E002C414.s index 462c55b9b2..010923fdb0 100644 --- a/asm/nonmatchings/code_33FE80/func_E002C414.s +++ b/asm/nonmatchings/code_33FE80/func_E002C414.s @@ -335,4 +335,4 @@ glabel func_E002C414 /* 3407B0 E002C930 D7B40150 */ ldc1 $f20, 0x150($sp) /* 3407B4 E002C934 03E00008 */ jr $ra /* 3407B8 E002C938 27BD0160 */ addiu $sp, $sp, 0x160 -/* 3407BC E002C93C 00000000 */ nop +/* 3407BC E002C93C 00000000 */ nop diff --git a/asm/nonmatchings/code_3419E0/func_E002E000.s b/asm/nonmatchings/code_3419E0/func_E002E000.s index f2bdfc27bb..51bc960c12 100644 --- a/asm/nonmatchings/code_3419E0/func_E002E000.s +++ b/asm/nonmatchings/code_3419E0/func_E002E000.s @@ -25,7 +25,7 @@ glabel func_E002E000 /* 341A30 E002E050 12420007 */ beq $s2, $v0, .LE002E070 /* 341A34 E002E054 2413000B */ addiu $s3, $zero, 0xb /* 341A38 E002E058 0800B820 */ j .LE002E080 -/* 341A3C E002E05C 00000000 */ nop +/* 341A3C E002E05C 00000000 */ nop .LE002E060: /* 341A40 E002E060 3C014160 */ lui $at, 0x4160 /* 341A44 E002E064 4481B000 */ mtc1 $at, $f22 @@ -65,7 +65,7 @@ glabel func_E002E000 /* 341AC0 E002E0E0 AE11000C */ sw $s1, 0xc($s0) .LE002E0E4: /* 341AC4 E002E0E4 0800B839 */ j .LE002E0E4 -/* 341AC8 E002E0E8 00000000 */ nop +/* 341AC8 E002E0E8 00000000 */ nop .LE002E0EC: /* 341ACC E002E0EC 0220202D */ daddu $a0, $s1, $zero /* 341AD0 E002E0F0 00132900 */ sll $a1, $s3, 4 @@ -104,7 +104,7 @@ glabel func_E002E000 /* 341B4C E002E16C 16810004 */ bne $s4, $at, .LE002E180 /* 341B50 E002E170 3C018000 */ lui $at, 0x8000 /* 341B54 E002E174 16210002 */ bne $s1, $at, .LE002E180 -/* 341B58 E002E178 00000000 */ nop +/* 341B58 E002E178 00000000 */ nop /* 341B5C E002E17C 0006000D */ break 6 .LE002E180: /* 341B60 E002E180 00001812 */ mflo $v1 @@ -117,19 +117,19 @@ glabel func_E002E000 /* 341B7C E002E19C AE00FFF4 */ sw $zero, -0xc($s0) /* 341B80 E002E1A0 AE00FFF8 */ sw $zero, -8($s0) /* 341B84 E002E1A4 4483A000 */ mtc1 $v1, $f20 -/* 341B88 E002E1A8 00000000 */ nop +/* 341B88 E002E1A8 00000000 */ nop /* 341B8C E002E1AC 4680A520 */ cvt.s.w $f20, $f20 /* 341B90 E002E1B0 0C080140 */ jal func_E0200500 /* 341B94 E002E1B4 4600A306 */ mov.s $f12, $f20 /* 341B98 E002E1B8 46000007 */ neg.s $f0, $f0 /* 341B9C E002E1BC 46160002 */ mul.s $f0, $f0, $f22 -/* 341BA0 E002E1C0 00000000 */ nop +/* 341BA0 E002E1C0 00000000 */ nop /* 341BA4 E002E1C4 4600A306 */ mov.s $f12, $f20 /* 341BA8 E002E1C8 0C080144 */ jal func_E0200510 /* 341BAC E002E1CC E600FFD0 */ swc1 $f0, -0x30($s0) /* 341BB0 E002E1D0 46000007 */ neg.s $f0, $f0 /* 341BB4 E002E1D4 46160002 */ mul.s $f0, $f0, $f22 -/* 341BB8 E002E1D8 00000000 */ nop +/* 341BB8 E002E1D8 00000000 */ nop /* 341BBC E002E1DC 26310168 */ addiu $s1, $s1, 0x168 /* 341BC0 E002E1E0 26520001 */ addiu $s2, $s2, 1 /* 341BC4 E002E1E4 4600A306 */ mov.s $f12, $f20 diff --git a/asm/nonmatchings/code_3419E0/func_E002E248.s b/asm/nonmatchings/code_3419E0/func_E002E248.s index 9dbefbb779..ceda87657d 100644 --- a/asm/nonmatchings/code_3419E0/func_E002E248.s +++ b/asm/nonmatchings/code_3419E0/func_E002E248.s @@ -3,4 +3,4 @@ glabel func_E002E248 /* 341C28 E002E248 03E00008 */ jr $ra -/* 341C2C E002E24C 00000000 */ nop +/* 341C2C E002E24C 00000000 */ nop diff --git a/asm/nonmatchings/code_3419E0/func_E002E250.s b/asm/nonmatchings/code_3419E0/func_E002E250.s index 90d3876035..21c5841032 100644 --- a/asm/nonmatchings/code_3419E0/func_E002E250.s +++ b/asm/nonmatchings/code_3419E0/func_E002E250.s @@ -18,9 +18,9 @@ glabel func_E002E250 /* 341C64 E002E284 04410005 */ bgez $v0, .LE002E29C /* 341C68 E002E288 ACA20040 */ sw $v0, 0x40($a1) /* 341C6C E002E28C 0C080128 */ jal func_E02004A0 -/* 341C70 E002E290 00000000 */ nop +/* 341C70 E002E290 00000000 */ nop /* 341C74 E002E294 0800B8C9 */ j .LE002E324 -/* 341C78 E002E298 00000000 */ nop +/* 341C78 E002E298 00000000 */ nop .LE002E29C: /* 341C7C E002E29C 8C820008 */ lw $v0, 8($a0) /* 341C80 E002E2A0 24060001 */ addiu $a2, $zero, 1 @@ -38,12 +38,12 @@ glabel func_E002E250 /* 341CAC E002E2CC 46080000 */ add.s $f0, $f0, $f8 /* 341CB0 E002E2D0 C4620028 */ lwc1 $f2, 0x28($v1) /* 341CB4 E002E2D4 46020082 */ mul.s $f2, $f0, $f2 -/* 341CB8 E002E2D8 00000000 */ nop +/* 341CB8 E002E2D8 00000000 */ nop /* 341CBC E002E2DC E4600008 */ swc1 $f0, 8($v1) /* 341CC0 E002E2E0 46000186 */ mov.s $f6, $f0 /* 341CC4 E002E2E4 C460002C */ lwc1 $f0, 0x2c($v1) /* 341CC8 E002E2E8 46003182 */ mul.s $f6, $f6, $f0 -/* 341CCC E002E2EC 00000000 */ nop +/* 341CCC E002E2EC 00000000 */ nop /* 341CD0 E002E2F0 C464FFFC */ lwc1 $f4, -4($v1) /* 341CD4 E002E2F4 C4600000 */ lwc1 $f0, ($v1) /* 341CD8 E002E2F8 46022100 */ add.s $f4, $f4, $f2 diff --git a/asm/nonmatchings/code_342140/func_E0030000.s b/asm/nonmatchings/code_342140/func_E0030000.s index 276f4fcd10..d4a0a0b573 100644 --- a/asm/nonmatchings/code_342140/func_E0030000.s +++ b/asm/nonmatchings/code_342140/func_E0030000.s @@ -30,33 +30,33 @@ glabel func_E0030000 /* 3421A4 E0030064 1100019E */ beqz $t0, .LE00306E0 /* 3421A8 E0030068 AFA700DC */ sw $a3, 0xdc($sp) /* 3421AC E003006C 4616B002 */ mul.s $f0, $f22, $f22 -/* 3421B0 E0030070 00000000 */ nop +/* 3421B0 E0030070 00000000 */ nop /* 3421B4 E0030074 4618C082 */ mul.s $f2, $f24, $f24 -/* 3421B8 E0030078 00000000 */ nop +/* 3421B8 E0030078 00000000 */ nop /* 3421BC E003007C 461AD102 */ mul.s $f4, $f26, $f26 -/* 3421C0 E0030080 00000000 */ nop +/* 3421C0 E0030080 00000000 */ nop /* 3421C4 E0030084 46020000 */ add.s $f0, $f0, $f2 /* 3421C8 E0030088 46040300 */ add.s $f12, $f0, $f4 /* 3421CC E003008C 4480A000 */ mtc1 $zero, $f20 -/* 3421D0 E0030090 00000000 */ nop +/* 3421D0 E0030090 00000000 */ nop /* 3421D4 E0030094 46146032 */ c.eq.s $f12, $f20 -/* 3421D8 E0030098 00000000 */ nop +/* 3421D8 E0030098 00000000 */ nop /* 3421DC E003009C 45010190 */ bc1t .LE00306E0 -/* 3421E0 E00300A0 00000000 */ nop +/* 3421E0 E00300A0 00000000 */ nop /* 3421E4 E00300A4 0C080154 */ jal func_E0200550 -/* 3421E8 E00300A8 00000000 */ nop +/* 3421E8 E00300A8 00000000 */ nop /* 3421EC E00300AC 3C01BF80 */ lui $at, 0xbf80 /* 3421F0 E00300B0 44811000 */ mtc1 $at, $f2 -/* 3421F4 E00300B4 00000000 */ nop +/* 3421F4 E00300B4 00000000 */ nop /* 3421F8 E00300B8 46001303 */ div.s $f12, $f2, $f0 /* 3421FC E00300BC 460CB582 */ mul.s $f22, $f22, $f12 -/* 342200 E00300C0 00000000 */ nop +/* 342200 E00300C0 00000000 */ nop /* 342204 E00300C4 460CC602 */ mul.s $f24, $f24, $f12 -/* 342208 E00300C8 00000000 */ nop +/* 342208 E00300C8 00000000 */ nop /* 34220C E00300CC 460CD682 */ mul.s $f26, $f26, $f12 -/* 342210 E00300D0 00000000 */ nop +/* 342210 E00300D0 00000000 */ nop /* 342214 E00300D4 4614B032 */ c.eq.s $f22, $f20 -/* 342218 E00300D8 00000000 */ nop +/* 342218 E00300D8 00000000 */ nop /* 34221C E00300DC 45010007 */ bc1t .LE00300FC /* 342220 E00300E0 4600A706 */ mov.s $f28, $f20 /* 342224 E00300E4 4600C007 */ neg.s $f0, $f24 @@ -67,7 +67,7 @@ glabel func_E0030000 /* 342238 E00300F8 E7A60070 */ swc1 $f6, 0x70($sp) .LE00300FC: /* 34223C E00300FC 4614C032 */ c.eq.s $f24, $f20 -/* 342240 E0030100 00000000 */ nop +/* 342240 E0030100 00000000 */ nop /* 342244 E0030104 45010007 */ bc1t .LE0030124 /* 342248 E0030108 4600B007 */ neg.s $f0, $f22 /* 34224C E003010C 46180003 */ div.s $f0, $f0, $f24 @@ -83,51 +83,51 @@ glabel func_E0030000 /* 342270 E0030130 E7B40070 */ swc1 $f20, 0x70($sp) .LE0030134: /* 342274 E0030134 461EF002 */ mul.s $f0, $f30, $f30 -/* 342278 E0030138 00000000 */ nop +/* 342278 E0030138 00000000 */ nop /* 34227C E003013C 461CE102 */ mul.s $f4, $f28, $f28 -/* 342280 E0030140 00000000 */ nop +/* 342280 E0030140 00000000 */ nop /* 342284 E0030144 C7A80070 */ lwc1 $f8, 0x70($sp) /* 342288 E0030148 46004186 */ mov.s $f6, $f8 /* 34228C E003014C 46064082 */ mul.s $f2, $f8, $f6 -/* 342290 E0030150 00000000 */ nop +/* 342290 E0030150 00000000 */ nop /* 342294 E0030154 46020000 */ add.s $f0, $f0, $f2 /* 342298 E0030158 46040300 */ add.s $f12, $f0, $f4 /* 34229C E003015C 44800000 */ mtc1 $zero, $f0 -/* 3422A0 E0030160 00000000 */ nop +/* 3422A0 E0030160 00000000 */ nop /* 3422A4 E0030164 46006032 */ c.eq.s $f12, $f0 -/* 3422A8 E0030168 00000000 */ nop +/* 3422A8 E0030168 00000000 */ nop /* 3422AC E003016C 4501015C */ bc1t .LE00306E0 -/* 3422B0 E0030170 00000000 */ nop +/* 3422B0 E0030170 00000000 */ nop /* 3422B4 E0030174 0C080154 */ jal func_E0200550 -/* 3422B8 E0030178 00000000 */ nop +/* 3422B8 E0030178 00000000 */ nop /* 3422BC E003017C 3C013F80 */ lui $at, 0x3f80 /* 3422C0 E0030180 44811000 */ mtc1 $at, $f2 -/* 3422C4 E0030184 00000000 */ nop +/* 3422C4 E0030184 00000000 */ nop /* 3422C8 E0030188 46001303 */ div.s $f12, $f2, $f0 /* 3422CC E003018C 460CF782 */ mul.s $f30, $f30, $f12 -/* 3422D0 E0030190 00000000 */ nop +/* 3422D0 E0030190 00000000 */ nop /* 3422D4 E0030194 C7A80070 */ lwc1 $f8, 0x70($sp) /* 3422D8 E0030198 460C4202 */ mul.s $f8, $f8, $f12 -/* 3422DC E003019C 00000000 */ nop +/* 3422DC E003019C 00000000 */ nop /* 3422E0 E00301A0 460CE702 */ mul.s $f28, $f28, $f12 -/* 3422E4 E00301A4 00000000 */ nop +/* 3422E4 E00301A4 00000000 */ nop /* 3422E8 E00301A8 3C014100 */ lui $at, 0x4100 /* 3422EC E00301AC 44810000 */ mtc1 $at, $f0 -/* 3422F0 E00301B0 00000000 */ nop +/* 3422F0 E00301B0 00000000 */ nop /* 3422F4 E00301B4 4600B582 */ mul.s $f22, $f22, $f0 -/* 3422F8 E00301B8 00000000 */ nop +/* 3422F8 E00301B8 00000000 */ nop /* 3422FC E00301BC 4600C602 */ mul.s $f24, $f24, $f0 -/* 342300 E00301C0 00000000 */ nop +/* 342300 E00301C0 00000000 */ nop /* 342304 E00301C4 4600D682 */ mul.s $f26, $f26, $f0 -/* 342308 E00301C8 00000000 */ nop +/* 342308 E00301C8 00000000 */ nop /* 34230C E00301CC 4600F782 */ mul.s $f30, $f30, $f0 -/* 342310 E00301D0 00000000 */ nop +/* 342310 E00301D0 00000000 */ nop /* 342314 E00301D4 0200202D */ daddu $a0, $s0, $zero /* 342318 E00301D8 3C02E003 */ lui $v0, %hi(func_E0030728) /* 34231C E00301DC 24420728 */ addiu $v0, $v0, %lo(func_E0030728) /* 342320 E00301E0 AC820008 */ sw $v0, 8($a0) /* 342324 E00301E4 46004202 */ mul.s $f8, $f8, $f0 -/* 342328 E00301E8 00000000 */ nop +/* 342328 E00301E8 00000000 */ nop /* 34232C E00301EC 3C02E003 */ lui $v0, %hi(func_E0030730) /* 342330 E00301F0 24420730 */ addiu $v0, $v0, %lo(func_E0030730) /* 342334 E00301F4 AC82000C */ sw $v0, 0xc($a0) @@ -135,7 +135,7 @@ glabel func_E0030000 /* 34233C E00301FC 24420A24 */ addiu $v0, $v0, %lo(func_E0030A24) /* 342340 E0030200 AC800000 */ sw $zero, ($a0) /* 342344 E0030204 4600E702 */ mul.s $f28, $f28, $f0 -/* 342348 E0030208 00000000 */ nop +/* 342348 E0030208 00000000 */ nop /* 34234C E003020C E7A80070 */ swc1 $f8, 0x70($sp) /* 342350 E0030210 AC820010 */ sw $v0, 0x10($a0) /* 342354 E0030214 24020018 */ addiu $v0, $zero, 0x18 @@ -154,7 +154,7 @@ glabel func_E0030000 /* 342388 E0030248 AE13000C */ sw $s3, 0xc($s0) .LE003024C: /* 34238C E003024C 0800C093 */ j .LE003024C -/* 342390 E0030250 00000000 */ nop +/* 342390 E0030250 00000000 */ nop .LE0030254: /* 342394 E0030254 8FA800EC */ lw $t0, 0xec($sp) /* 342398 E0030258 19000112 */ blez $t0, .LE00306A4 @@ -185,7 +185,7 @@ glabel func_E0030000 /* 3423F8 E00302B8 12C2006E */ beq $s6, $v0, .LE0030474 /* 3423FC E00302BC 2EC20005 */ sltiu $v0, $s6, 5 /* 342400 E00302C0 0800C16C */ j .LE00305B0 -/* 342404 E00302C4 00000000 */ nop +/* 342404 E00302C4 00000000 */ nop .LE00302C8: /* 342408 E00302C8 06C000B8 */ bltz $s6, .LE00305AC /* 34240C E00302CC 27A40030 */ addiu $a0, $sp, 0x30 @@ -197,54 +197,54 @@ glabel func_E0030000 /* 342420 E00302E0 16210004 */ bne $s1, $at, .LE00302F4 /* 342424 E00302E4 3C018000 */ lui $at, 0x8000 /* 342428 E00302E8 16810002 */ bne $s4, $at, .LE00302F4 -/* 34242C E00302EC 00000000 */ nop +/* 34242C E00302EC 00000000 */ nop /* 342430 E00302F0 0006000D */ break 6 .LE00302F4: /* 342434 E00302F4 00001812 */ mflo $v1 /* 342438 E00302F8 4406B000 */ mfc1 $a2, $f22 /* 34243C E00302FC 4407C000 */ mfc1 $a3, $f24 /* 342440 E0030300 44833000 */ mtc1 $v1, $f6 -/* 342444 E0030304 00000000 */ nop +/* 342444 E0030304 00000000 */ nop /* 342448 E0030308 468031A0 */ cvt.s.w $f6, $f6 /* 34244C E003030C 44053000 */ mfc1 $a1, $f6 /* 342450 E0030310 0C080104 */ jal func_E0200410 /* 342454 E0030314 E7BA0010 */ swc1 $f26, 0x10($sp) /* 342458 E0030318 C7A00030 */ lwc1 $f0, 0x30($sp) /* 34245C E003031C 461E0002 */ mul.s $f0, $f0, $f30 -/* 342460 E0030320 00000000 */ nop +/* 342460 E0030320 00000000 */ nop /* 342464 E0030324 C7A40040 */ lwc1 $f4, 0x40($sp) /* 342468 E0030328 C7A80070 */ lwc1 $f8, 0x70($sp) /* 34246C E003032C 46082102 */ mul.s $f4, $f4, $f8 -/* 342470 E0030330 00000000 */ nop +/* 342470 E0030330 00000000 */ nop /* 342474 E0030334 C7A20050 */ lwc1 $f2, 0x50($sp) /* 342478 E0030338 461C1082 */ mul.s $f2, $f2, $f28 -/* 34247C E003033C 00000000 */ nop +/* 34247C E003033C 00000000 */ nop /* 342480 E0030340 4600B000 */ add.s $f0, $f22, $f0 /* 342484 E0030344 46040000 */ add.s $f0, $f0, $f4 /* 342488 E0030348 46020000 */ add.s $f0, $f0, $f2 /* 34248C E003034C E600FFEC */ swc1 $f0, -0x14($s0) /* 342490 E0030350 C7A00034 */ lwc1 $f0, 0x34($sp) /* 342494 E0030354 461E0002 */ mul.s $f0, $f0, $f30 -/* 342498 E0030358 00000000 */ nop +/* 342498 E0030358 00000000 */ nop /* 34249C E003035C C7A40044 */ lwc1 $f4, 0x44($sp) /* 3424A0 E0030360 46082102 */ mul.s $f4, $f4, $f8 -/* 3424A4 E0030364 00000000 */ nop +/* 3424A4 E0030364 00000000 */ nop /* 3424A8 E0030368 C7A20054 */ lwc1 $f2, 0x54($sp) /* 3424AC E003036C 461C1082 */ mul.s $f2, $f2, $f28 -/* 3424B0 E0030370 00000000 */ nop +/* 3424B0 E0030370 00000000 */ nop /* 3424B4 E0030374 4600C000 */ add.s $f0, $f24, $f0 /* 3424B8 E0030378 46040000 */ add.s $f0, $f0, $f4 /* 3424BC E003037C 46020000 */ add.s $f0, $f0, $f2 /* 3424C0 E0030380 E600FFF0 */ swc1 $f0, -0x10($s0) /* 3424C4 E0030384 C7A00038 */ lwc1 $f0, 0x38($sp) /* 3424C8 E0030388 461E0002 */ mul.s $f0, $f0, $f30 -/* 3424CC E003038C 00000000 */ nop +/* 3424CC E003038C 00000000 */ nop /* 3424D0 E0030390 C7A40048 */ lwc1 $f4, 0x48($sp) /* 3424D4 E0030394 46082102 */ mul.s $f4, $f4, $f8 -/* 3424D8 E0030398 00000000 */ nop +/* 3424D8 E0030398 00000000 */ nop /* 3424DC E003039C C7A20058 */ lwc1 $f2, 0x58($sp) /* 3424E0 E00303A0 461C1082 */ mul.s $f2, $f2, $f28 -/* 3424E4 E00303A4 00000000 */ nop +/* 3424E4 E00303A4 00000000 */ nop /* 3424E8 E00303A8 0800C168 */ j .LE00305A0 /* 3424EC E00303AC 4600D000 */ add.s $f0, $f26, $f0 .LE00303B0: @@ -283,13 +283,13 @@ glabel func_E0030000 /* 34256C E003042C 16210004 */ bne $s1, $at, .LE0030440 /* 342570 E0030430 3C018000 */ lui $at, 0x8000 /* 342574 E0030434 16A10002 */ bne $s5, $at, .LE0030440 -/* 342578 E0030438 00000000 */ nop +/* 342578 E0030438 00000000 */ nop /* 34257C E003043C 0006000D */ break 6 .LE0030440: /* 342580 E0030440 00001012 */ mflo $v0 /* 342584 E0030444 2442FFCE */ addiu $v0, $v0, -0x32 /* 342588 E0030448 44821000 */ mtc1 $v0, $f2 -/* 34258C E003044C 00000000 */ nop +/* 34258C E003044C 00000000 */ nop /* 342590 E0030450 0800C117 */ j .LE003045C /* 342594 E0030454 468010A0 */ cvt.s.w $f2, $f2 .LE0030458: @@ -328,15 +328,15 @@ glabel func_E0030000 /* 342610 E00304D0 3C0143B4 */ lui $at, 0x43b4 /* 342614 E00304D4 44811000 */ mtc1 $at, $f2 /* 342618 E00304D8 44922000 */ mtc1 $s2, $f4 -/* 34261C E00304DC 00000000 */ nop +/* 34261C E00304DC 00000000 */ nop /* 342620 E00304E0 46802120 */ cvt.s.w $f4, $f4 /* 342624 E00304E4 46022102 */ mul.s $f4, $f4, $f2 -/* 342628 E00304E8 00000000 */ nop +/* 342628 E00304E8 00000000 */ nop /* 34262C E00304EC 27A40030 */ addiu $a0, $sp, 0x30 /* 342630 E00304F0 46000007 */ neg.s $f0, $f0 /* 342634 E00304F4 E7A00010 */ swc1 $f0, 0x10($sp) /* 342638 E00304F8 44910000 */ mtc1 $s1, $f0 -/* 34263C E00304FC 00000000 */ nop +/* 34263C E00304FC 00000000 */ nop /* 342640 E0030500 46800020 */ cvt.s.w $f0, $f0 /* 342644 E0030504 4406A000 */ mfc1 $a2, $f20 /* 342648 E0030508 46002103 */ div.s $f4, $f4, $f0 @@ -344,40 +344,40 @@ glabel func_E0030000 /* 342650 E0030510 0000382D */ daddu $a3, $zero, $zero .LE0030514: /* 342654 E0030514 0C080104 */ jal func_E0200410 -/* 342658 E0030518 00000000 */ nop +/* 342658 E0030518 00000000 */ nop /* 34265C E003051C C7A00030 */ lwc1 $f0, 0x30($sp) /* 342660 E0030520 46160002 */ mul.s $f0, $f0, $f22 -/* 342664 E0030524 00000000 */ nop +/* 342664 E0030524 00000000 */ nop /* 342668 E0030528 C7A40040 */ lwc1 $f4, 0x40($sp) /* 34266C E003052C 46182102 */ mul.s $f4, $f4, $f24 -/* 342670 E0030530 00000000 */ nop +/* 342670 E0030530 00000000 */ nop /* 342674 E0030534 C7A20050 */ lwc1 $f2, 0x50($sp) /* 342678 E0030538 461A1082 */ mul.s $f2, $f2, $f26 -/* 34267C E003053C 00000000 */ nop +/* 34267C E003053C 00000000 */ nop /* 342680 E0030540 46040000 */ add.s $f0, $f0, $f4 /* 342684 E0030544 46020000 */ add.s $f0, $f0, $f2 /* 342688 E0030548 E600FFEC */ swc1 $f0, -0x14($s0) /* 34268C E003054C C7A00034 */ lwc1 $f0, 0x34($sp) /* 342690 E0030550 46160002 */ mul.s $f0, $f0, $f22 -/* 342694 E0030554 00000000 */ nop +/* 342694 E0030554 00000000 */ nop /* 342698 E0030558 C7A40044 */ lwc1 $f4, 0x44($sp) /* 34269C E003055C 46182102 */ mul.s $f4, $f4, $f24 -/* 3426A0 E0030560 00000000 */ nop +/* 3426A0 E0030560 00000000 */ nop /* 3426A4 E0030564 C7A20054 */ lwc1 $f2, 0x54($sp) /* 3426A8 E0030568 461A1082 */ mul.s $f2, $f2, $f26 -/* 3426AC E003056C 00000000 */ nop +/* 3426AC E003056C 00000000 */ nop /* 3426B0 E0030570 46040000 */ add.s $f0, $f0, $f4 /* 3426B4 E0030574 46020000 */ add.s $f0, $f0, $f2 /* 3426B8 E0030578 E600FFF0 */ swc1 $f0, -0x10($s0) /* 3426BC E003057C C7A00038 */ lwc1 $f0, 0x38($sp) /* 3426C0 E0030580 46160002 */ mul.s $f0, $f0, $f22 -/* 3426C4 E0030584 00000000 */ nop +/* 3426C4 E0030584 00000000 */ nop /* 3426C8 E0030588 C7A40048 */ lwc1 $f4, 0x48($sp) /* 3426CC E003058C 46182102 */ mul.s $f4, $f4, $f24 -/* 3426D0 E0030590 00000000 */ nop +/* 3426D0 E0030590 00000000 */ nop /* 3426D4 E0030594 C7A20058 */ lwc1 $f2, 0x58($sp) /* 3426D8 E0030598 461A1082 */ mul.s $f2, $f2, $f26 -/* 3426DC E003059C 00000000 */ nop +/* 3426DC E003059C 00000000 */ nop .LE00305A0: /* 3426E0 E00305A0 46040000 */ add.s $f0, $f0, $f4 /* 3426E4 E00305A4 46020000 */ add.s $f0, $f0, $f2 @@ -392,7 +392,7 @@ glabel func_E0030000 /* 342700 E00305C0 00481021 */ addu $v0, $v0, $t0 /* 342704 E00305C4 8C420000 */ lw $v0, ($v0) /* 342708 E00305C8 00400008 */ jr $v0 -/* 34270C E00305CC 00000000 */ nop +/* 34270C E00305CC 00000000 */ nop /* 342710 E00305D0 24080018 */ addiu $t0, $zero, 0x18 /* 342714 E00305D4 0800C19C */ j .LE0030670 /* 342718 E00305D8 AE00FFFC */ sw $zero, -4($s0) @@ -408,15 +408,15 @@ glabel func_E0030000 /* 342740 E0030600 44803000 */ mtc1 $zero, $f6 /* 342744 E0030604 46002121 */ cvt.d.s $f4, $f4 /* 342748 E0030608 46262102 */ mul.d $f4, $f4, $f6 -/* 34274C E003060C 00000000 */ nop +/* 34274C E003060C 00000000 */ nop /* 342750 E0030610 C602FFF0 */ lwc1 $f2, -0x10($s0) /* 342754 E0030614 460010A1 */ cvt.d.s $f2, $f2 /* 342758 E0030618 46261082 */ mul.d $f2, $f2, $f6 -/* 34275C E003061C 00000000 */ nop +/* 34275C E003061C 00000000 */ nop /* 342760 E0030620 C600FFF4 */ lwc1 $f0, -0xc($s0) /* 342764 E0030624 46000021 */ cvt.d.s $f0, $f0 /* 342768 E0030628 46260002 */ mul.d $f0, $f0, $f6 -/* 34276C E003062C 00000000 */ nop +/* 34276C E003062C 00000000 */ nop /* 342770 E0030630 3C0141A0 */ lui $at, 0x41a0 /* 342774 E0030634 44814000 */ mtc1 $at, $f8 /* 342778 E0030638 24020028 */ addiu $v0, $zero, 0x28 @@ -454,13 +454,13 @@ glabel func_E0030000 /* 3427EC E00306AC C4400000 */ lwc1 $f0, ($v0) /* 3427F0 E00306B0 3C014170 */ lui $at, 0x4170 /* 3427F4 E00306B4 44811000 */ mtc1 $at, $f2 -/* 3427F8 E00306B8 00000000 */ nop +/* 3427F8 E00306B8 00000000 */ nop /* 3427FC E00306BC 46020000 */ add.s $f0, $f0, $f2 /* 342800 E00306C0 3C0143B4 */ lui $at, 0x43b4 /* 342804 E00306C4 44811000 */ mtc1 $at, $f2 -/* 342808 E00306C8 00000000 */ nop +/* 342808 E00306C8 00000000 */ nop /* 34280C E00306CC 4600103C */ c.lt.s $f2, $f0 -/* 342810 E00306D0 00000000 */ nop +/* 342810 E00306D0 00000000 */ nop /* 342814 E00306D4 45000002 */ bc1f .LE00306E0 /* 342818 E00306D8 E4400000 */ swc1 $f0, ($v0) /* 34281C E00306DC AC400000 */ sw $zero, ($v0) diff --git a/asm/nonmatchings/code_342140/func_E0030728.s b/asm/nonmatchings/code_342140/func_E0030728.s index c53a07e380..7d4ed4aea4 100644 --- a/asm/nonmatchings/code_342140/func_E0030728.s +++ b/asm/nonmatchings/code_342140/func_E0030728.s @@ -3,4 +3,4 @@ glabel func_E0030728 /* 342868 E0030728 03E00008 */ jr $ra -/* 34286C E003072C 00000000 */ nop +/* 34286C E003072C 00000000 */ nop diff --git a/asm/nonmatchings/code_342140/func_E0030730.s b/asm/nonmatchings/code_342140/func_E0030730.s index e8f5594d39..8d373bd400 100644 --- a/asm/nonmatchings/code_342140/func_E0030730.s +++ b/asm/nonmatchings/code_342140/func_E0030730.s @@ -28,7 +28,7 @@ glabel func_E0030730 /* 3428CC E003078C 0C080128 */ jal func_E02004A0 /* 3428D0 E0030790 0280202D */ daddu $a0, $s4, $zero /* 3428D4 E0030794 0800C27B */ j .LE00309EC -/* 3428D8 E0030798 00000000 */ nop +/* 3428D8 E0030798 00000000 */ nop .LE003079C: /* 3428DC E003079C 0000902D */ daddu $s2, $zero, $zero /* 3428E0 E00307A0 8E820008 */ lw $v0, 8($s4) @@ -54,22 +54,22 @@ glabel func_E0030730 /* 34292C E00307EC 14620029 */ bne $v1, $v0, .LE0030894 /* 342930 E00307F0 2A620006 */ slti $v0, $s3, 6 /* 342934 E00307F4 44966000 */ mtc1 $s6, $f12 -/* 342938 E00307F8 00000000 */ nop +/* 342938 E00307F8 00000000 */ nop /* 34293C E00307FC 0C080144 */ jal func_E0200510 /* 342940 E0030800 46806320 */ cvt.s.w $f12, $f12 /* 342944 E0030804 C604FFF4 */ lwc1 $f4, -0xc($s0) /* 342948 E0030808 46002121 */ cvt.d.s $f4, $f4 /* 34294C E003080C 463A2102 */ mul.d $f4, $f4, $f26 -/* 342950 E0030810 00000000 */ nop +/* 342950 E0030810 00000000 */ nop /* 342954 E0030814 3C014080 */ lui $at, 0x4080 /* 342958 E0030818 44811000 */ mtc1 $at, $f2 -/* 34295C E003081C 00000000 */ nop +/* 34295C E003081C 00000000 */ nop /* 342960 E0030820 46020002 */ mul.s $f0, $f0, $f2 -/* 342964 E0030824 00000000 */ nop +/* 342964 E0030824 00000000 */ nop /* 342968 E0030828 C602FFFC */ lwc1 $f2, -4($s0) /* 34296C E003082C 460010A1 */ cvt.d.s $f2, $f2 /* 342970 E0030830 463A1082 */ mul.d $f2, $f2, $f26 -/* 342974 E0030834 00000000 */ nop +/* 342974 E0030834 00000000 */ nop /* 342978 E0030838 E600FFF8 */ swc1 $f0, -8($s0) /* 34297C E003083C 46202120 */ cvt.s.d $f4, $f4 /* 342980 E0030840 E604FFF4 */ swc1 $f4, -0xc($s0) @@ -77,17 +77,17 @@ glabel func_E0030730 /* 342988 E0030848 44800000 */ mtc1 $zero, $f0 /* 34298C E003084C 462010A0 */ cvt.s.d $f2, $f2 /* 342990 E0030850 4600203C */ c.lt.s $f4, $f0 -/* 342994 E0030854 00000000 */ nop +/* 342994 E0030854 00000000 */ nop /* 342998 E0030858 4500004E */ bc1f .LE0030994 /* 34299C E003085C E602FFFC */ swc1 $f2, -4($s0) /* 3429A0 E0030860 C6020008 */ lwc1 $f2, 8($s0) /* 3429A4 E0030864 468010A1 */ cvt.d.w $f2, $f2 /* 3429A8 E0030868 46381082 */ mul.d $f2, $f2, $f24 -/* 3429AC E003086C 00000000 */ nop +/* 3429AC E003086C 00000000 */ nop /* 3429B0 E0030870 C6000004 */ lwc1 $f0, 4($s0) /* 3429B4 E0030874 46000021 */ cvt.d.s $f0, $f0 /* 3429B8 E0030878 46340002 */ mul.d $f0, $f0, $f20 -/* 3429BC E003087C 00000000 */ nop +/* 3429BC E003087C 00000000 */ nop /* 3429C0 E0030880 4620128D */ trunc.w.d $f10, $f2 /* 3429C4 E0030884 E60A0008 */ swc1 $f10, 8($s0) /* 3429C8 E0030888 46200020 */ cvt.s.d $f0, $f0 @@ -95,19 +95,19 @@ glabel func_E0030730 /* 3429D0 E0030890 E6000004 */ swc1 $f0, 4($s0) .LE0030894: /* 3429D4 E0030894 14400013 */ bnez $v0, .LE00308E4 -/* 3429D8 E0030898 00000000 */ nop +/* 3429D8 E0030898 00000000 */ nop /* 3429DC E003089C C604FFF4 */ lwc1 $f4, -0xc($s0) /* 3429E0 E00308A0 46002121 */ cvt.d.s $f4, $f4 /* 3429E4 E00308A4 46342102 */ mul.d $f4, $f4, $f20 -/* 3429E8 E00308A8 00000000 */ nop +/* 3429E8 E00308A8 00000000 */ nop /* 3429EC E00308AC C602FFF8 */ lwc1 $f2, -8($s0) /* 3429F0 E00308B0 460010A1 */ cvt.d.s $f2, $f2 /* 3429F4 E00308B4 46341082 */ mul.d $f2, $f2, $f20 -/* 3429F8 E00308B8 00000000 */ nop +/* 3429F8 E00308B8 00000000 */ nop /* 3429FC E00308BC C600FFFC */ lwc1 $f0, -4($s0) /* 342A00 E00308C0 46000021 */ cvt.d.s $f0, $f0 /* 342A04 E00308C4 46340002 */ mul.d $f0, $f0, $f20 -/* 342A08 E00308C8 00000000 */ nop +/* 342A08 E00308C8 00000000 */ nop /* 342A0C E00308CC 46202120 */ cvt.s.d $f4, $f4 /* 342A10 E00308D0 462010A0 */ cvt.s.d $f2, $f2 /* 342A14 E00308D4 46200020 */ cvt.s.d $f0, $f0 @@ -123,7 +123,7 @@ glabel func_E0030730 /* 342A38 E00308F8 C6000004 */ lwc1 $f0, 4($s0) /* 342A3C E00308FC 3C013F80 */ lui $at, 0x3f80 /* 342A40 E0030900 44811000 */ mtc1 $at, $f2 -/* 342A44 E0030904 00000000 */ nop +/* 342A44 E0030904 00000000 */ nop /* 342A48 E0030908 46020000 */ add.s $f0, $f0, $f2 /* 342A4C E003090C 0800C265 */ j .LE0030994 /* 342A50 E0030910 E6000004 */ swc1 $f0, 4($s0) @@ -133,23 +133,23 @@ glabel func_E0030730 /* 342A5C E003091C C6080008 */ lwc1 $f8, 8($s0) /* 342A60 E0030920 46804221 */ cvt.d.w $f8, $f8 /* 342A64 E0030924 46384202 */ mul.d $f8, $f8, $f24 -/* 342A68 E0030928 00000000 */ nop +/* 342A68 E0030928 00000000 */ nop /* 342A6C E003092C C6060004 */ lwc1 $f6, 4($s0) /* 342A70 E0030930 460031A1 */ cvt.d.s $f6, $f6 /* 342A74 E0030934 46343182 */ mul.d $f6, $f6, $f20 -/* 342A78 E0030938 00000000 */ nop +/* 342A78 E0030938 00000000 */ nop /* 342A7C E003093C C604FFF4 */ lwc1 $f4, -0xc($s0) /* 342A80 E0030940 46002121 */ cvt.d.s $f4, $f4 /* 342A84 E0030944 46362102 */ mul.d $f4, $f4, $f22 -/* 342A88 E0030948 00000000 */ nop +/* 342A88 E0030948 00000000 */ nop /* 342A8C E003094C C602FFF8 */ lwc1 $f2, -8($s0) /* 342A90 E0030950 460010A1 */ cvt.d.s $f2, $f2 /* 342A94 E0030954 46361082 */ mul.d $f2, $f2, $f22 -/* 342A98 E0030958 00000000 */ nop +/* 342A98 E0030958 00000000 */ nop /* 342A9C E003095C C600FFFC */ lwc1 $f0, -4($s0) /* 342AA0 E0030960 46000021 */ cvt.d.s $f0, $f0 /* 342AA4 E0030964 46360002 */ mul.d $f0, $f0, $f22 -/* 342AA8 E0030968 00000000 */ nop +/* 342AA8 E0030968 00000000 */ nop /* 342AAC E003096C 4620428D */ trunc.w.d $f10, $f8 /* 342AB0 E0030970 E60A0008 */ swc1 $f10, 8($s0) /* 342AB4 E0030974 462031A0 */ cvt.s.d $f6, $f6 diff --git a/asm/nonmatchings/code_342140/func_E0030A68.s b/asm/nonmatchings/code_342140/func_E0030A68.s index ab9f29403d..b4d1994293 100644 --- a/asm/nonmatchings/code_342140/func_E0030A68.s +++ b/asm/nonmatchings/code_342140/func_E0030A68.s @@ -268,5 +268,5 @@ glabel func_E0030A68 /* 342FBC E0030E7C D7B400D0 */ ldc1 $f20, 0xd0($sp) /* 342FC0 E0030E80 03E00008 */ jr $ra /* 342FC4 E0030E84 27BD00E0 */ addiu $sp, $sp, 0xe0 -/* 342FC8 E0030E88 00000000 */ nop -/* 342FCC E0030E8C 00000000 */ nop +/* 342FC8 E0030E88 00000000 */ nop +/* 342FCC E0030E8C 00000000 */ nop diff --git a/asm/nonmatchings/code_343680/func_E0032000.s b/asm/nonmatchings/code_343680/func_E0032000.s index c6db358853..7e975e7ee2 100644 --- a/asm/nonmatchings/code_343680/func_E0032000.s +++ b/asm/nonmatchings/code_343680/func_E0032000.s @@ -38,7 +38,7 @@ glabel func_E0032000 /* 343704 E0032084 AE03000C */ sw $v1, 0xc($s0) .LE0032088: /* 343708 E0032088 0800C822 */ j .LE0032088 -/* 34370C E003208C 00000000 */ nop +/* 34370C E003208C 00000000 */ nop .LE0032090: /* 343710 E0032090 2402003C */ addiu $v0, $zero, 0x3c /* 343714 E0032094 E4740004 */ swc1 $f20, 4($v1) @@ -63,12 +63,12 @@ glabel func_E0032000 .LE00320DC: /* 34375C E00320DC 3C014040 */ lui $at, 0x4040 /* 343760 E00320E0 44810000 */ mtc1 $at, $f0 -/* 343764 E00320E4 00000000 */ nop +/* 343764 E00320E4 00000000 */ nop /* 343768 E00320E8 E4600020 */ swc1 $f0, 0x20($v1) /* 34376C E00320EC 24020001 */ addiu $v0, $zero, 1 .LE00320F0: /* 343770 E00320F0 16220005 */ bne $s1, $v0, .LE0032108 -/* 343774 E00320F4 00000000 */ nop +/* 343774 E00320F4 00000000 */ nop /* 343778 E00320F8 3C013F80 */ lui $at, 0x3f80 /* 34377C E00320FC 44810000 */ mtc1 $at, $f0 /* 343780 E0032100 0800C846 */ j .LE0032118 @@ -76,7 +76,7 @@ glabel func_E0032000 .LE0032108: /* 343788 E0032108 3C014040 */ lui $at, 0x4040 /* 34378C E003210C 44810000 */ mtc1 $at, $f0 -/* 343790 E0032110 00000000 */ nop +/* 343790 E0032110 00000000 */ nop /* 343794 E0032114 E4600024 */ swc1 $f0, 0x24($v1) .LE0032118: /* 343798 E0032118 2463003C */ addiu $v1, $v1, 0x3c @@ -86,9 +86,9 @@ glabel func_E0032000 /* 3437A8 E0032128 AC620038 */ sw $v0, 0x38($v1) /* 3437AC E003212C 24020001 */ addiu $v0, $zero, 1 /* 3437B0 E0032130 1222000B */ beq $s1, $v0, .LE0032160 -/* 3437B4 E0032134 00000000 */ nop +/* 3437B4 E0032134 00000000 */ nop /* 3437B8 E0032138 0800C860 */ j .LE0032180 -/* 3437BC E003213C 00000000 */ nop +/* 3437BC E003213C 00000000 */ nop .LE0032140: /* 3437C0 E0032140 3C01411E */ lui $at, 0x411e /* 3437C4 E0032144 34216666 */ ori $at, $at, 0x6666 diff --git a/asm/nonmatchings/code_343680/func_E00321D0.s b/asm/nonmatchings/code_343680/func_E00321D0.s index 2c14e4e595..12c1cab051 100644 --- a/asm/nonmatchings/code_343680/func_E00321D0.s +++ b/asm/nonmatchings/code_343680/func_E00321D0.s @@ -3,4 +3,4 @@ glabel func_E00321D0 /* 343850 E00321D0 03E00008 */ jr $ra -/* 343854 E00321D4 00000000 */ nop +/* 343854 E00321D4 00000000 */ nop diff --git a/asm/nonmatchings/code_343680/func_E00321D8.s b/asm/nonmatchings/code_343680/func_E00321D8.s index 316a14a8fd..20eccedef3 100644 --- a/asm/nonmatchings/code_343680/func_E00321D8.s +++ b/asm/nonmatchings/code_343680/func_E00321D8.s @@ -13,9 +13,9 @@ glabel func_E00321D8 /* 343878 E00321F8 04410005 */ bgez $v0, .LE0032210 /* 34387C E00321FC AE020030 */ sw $v0, 0x30($s0) /* 343880 E0032200 0C080128 */ jal func_E02004A0 -/* 343884 E0032204 00000000 */ nop +/* 343884 E0032204 00000000 */ nop /* 343888 E0032208 0800C902 */ j .LE0032408 -/* 34388C E003220C 00000000 */ nop +/* 34388C E003220C 00000000 */ nop .LE0032210: /* 343890 E0032210 8E020034 */ lw $v0, 0x34($s0) /* 343894 E0032214 8E110000 */ lw $s1, ($s0) @@ -68,7 +68,7 @@ glabel func_E00321D8 /* 343948 E00322C8 3C013FF0 */ lui $at, 0x3ff0 /* 34394C E00322CC 44810800 */ mtc1 $at, $f1 /* 343950 E00322D0 44800000 */ mtc1 $zero, $f0 -/* 343954 E00322D4 00000000 */ nop +/* 343954 E00322D4 00000000 */ nop /* 343958 E00322D8 46201000 */ add.d $f0, $f2, $f0 .LE00322DC: /* 34395C E00322DC 46200020 */ cvt.s.d $f0, $f0 @@ -79,10 +79,10 @@ glabel func_E00321D8 /* 343970 E00322F0 D42228C8 */ ldc1 $f2, %lo(D_E00328C8)($at) /* 343974 E00322F4 00431023 */ subu $v0, $v0, $v1 /* 343978 E00322F8 44820000 */ mtc1 $v0, $f0 -/* 34397C E00322FC 00000000 */ nop +/* 34397C E00322FC 00000000 */ nop /* 343980 E0032300 46800021 */ cvt.d.w $f0, $f0 /* 343984 E0032304 46220002 */ mul.d $f0, $f0, $f2 -/* 343988 E0032308 00000000 */ nop +/* 343988 E0032308 00000000 */ nop /* 34398C E003230C 4620018D */ trunc.w.d $f6, $f0 /* 343990 E0032310 E6060038 */ swc1 $f6, 0x38($s0) /* 343994 E0032314 0800C8D8 */ j .LE0032360 @@ -93,13 +93,13 @@ glabel func_E00321D8 /* 3439A4 E0032324 C6020038 */ lwc1 $f2, 0x38($s0) /* 3439A8 E0032328 468010A1 */ cvt.d.w $f2, $f2 /* 3439AC E003232C 46201082 */ mul.d $f2, $f2, $f0 -/* 3439B0 E0032330 00000000 */ nop +/* 3439B0 E0032330 00000000 */ nop /* 3439B4 E0032334 C6000024 */ lwc1 $f0, 0x24($s0) /* 3439B8 E0032338 3C01E003 */ lui $at, %hi(D_E00328D8) /* 3439BC E003233C D42428D8 */ ldc1 $f4, %lo(D_E00328D8)($at) /* 3439C0 E0032340 46000021 */ cvt.d.s $f0, $f0 /* 3439C4 E0032344 46240002 */ mul.d $f0, $f0, $f4 -/* 3439C8 E0032348 00000000 */ nop +/* 3439C8 E0032348 00000000 */ nop /* 3439CC E003234C 4620118D */ trunc.w.d $f6, $f2 /* 3439D0 E0032350 E6060038 */ swc1 $f6, 0x38($s0) /* 3439D4 E0032354 46200020 */ cvt.s.d $f0, $f0 @@ -110,10 +110,10 @@ glabel func_E00321D8 /* 3439E4 E0032364 14400024 */ bnez $v0, .LE00323F8 /* 3439E8 E0032368 24020003 */ addiu $v0, $zero, 3 /* 3439EC E003236C 16420005 */ bne $s2, $v0, .LE0032384 -/* 3439F0 E0032370 00000000 */ nop +/* 3439F0 E0032370 00000000 */ nop /* 3439F4 E0032374 3C013F80 */ lui $at, 0x3f80 /* 3439F8 E0032378 44810000 */ mtc1 $at, $f0 -/* 3439FC E003237C 00000000 */ nop +/* 3439FC E003237C 00000000 */ nop /* 343A00 E0032380 E6000020 */ swc1 $f0, 0x20($s0) .LE0032384: /* 343A04 E0032384 C6000020 */ lwc1 $f0, 0x20($s0) @@ -134,14 +134,14 @@ glabel func_E00321D8 /* 343A3C E00323BC C6020038 */ lwc1 $f2, 0x38($s0) /* 343A40 E00323C0 468010A1 */ cvt.d.w $f2, $f2 /* 343A44 E00323C4 46201082 */ mul.d $f2, $f2, $f0 -/* 343A48 E00323C8 00000000 */ nop +/* 343A48 E00323C8 00000000 */ nop /* 343A4C E00323CC C6000024 */ lwc1 $f0, 0x24($s0) /* 343A50 E00323D0 3C013FE0 */ lui $at, 0x3fe0 /* 343A54 E00323D4 44812800 */ mtc1 $at, $f5 /* 343A58 E00323D8 44802000 */ mtc1 $zero, $f4 /* 343A5C E00323DC 46000021 */ cvt.d.s $f0, $f0 /* 343A60 E00323E0 46240002 */ mul.d $f0, $f0, $f4 -/* 343A64 E00323E4 00000000 */ nop +/* 343A64 E00323E4 00000000 */ nop /* 343A68 E00323E8 4620118D */ trunc.w.d $f6, $f2 /* 343A6C E00323EC E6060038 */ swc1 $f6, 0x38($s0) .LE00323F0: diff --git a/asm/nonmatchings/code_344A10/func_E0034000.s b/asm/nonmatchings/code_344A10/func_E0034000.s index f1f1345763..8a272ee188 100644 --- a/asm/nonmatchings/code_344A10/func_E0034000.s +++ b/asm/nonmatchings/code_344A10/func_E0034000.s @@ -38,7 +38,7 @@ glabel func_E0034000 /* 344A94 E0034084 AE02000C */ sw $v0, 0xc($s0) .LE0034088: /* 344A98 E0034088 0800D022 */ j .LE0034088 -/* 344A9C E003408C 00000000 */ nop +/* 344A9C E003408C 00000000 */ nop .LE0034090: /* 344AA0 E0034090 AC710000 */ sw $s1, ($v1) /* 344AA4 E0034094 E4740004 */ swc1 $f20, 4($v1) diff --git a/asm/nonmatchings/code_344A10/func_E0034108.s b/asm/nonmatchings/code_344A10/func_E0034108.s index 32681b8ee6..481bca0691 100644 --- a/asm/nonmatchings/code_344A10/func_E0034108.s +++ b/asm/nonmatchings/code_344A10/func_E0034108.s @@ -3,4 +3,4 @@ glabel func_E0034108 /* 344B18 E0034108 03E00008 */ jr $ra -/* 344B1C E003410C 00000000 */ nop +/* 344B1C E003410C 00000000 */ nop diff --git a/asm/nonmatchings/code_344A10/func_E0034110.s b/asm/nonmatchings/code_344A10/func_E0034110.s index d27b4c2877..ea14e0bce0 100644 --- a/asm/nonmatchings/code_344A10/func_E0034110.s +++ b/asm/nonmatchings/code_344A10/func_E0034110.s @@ -16,9 +16,9 @@ glabel func_E0034110 /* 344B4C E003413C 04610005 */ bgez $v1, .LE0034154 /* 344B50 E0034140 AE020030 */ sw $v0, 0x30($s0) /* 344B54 E0034144 0C080128 */ jal func_E02004A0 -/* 344B58 E0034148 00000000 */ nop +/* 344B58 E0034148 00000000 */ nop /* 344B5C E003414C 0800D0AD */ j .LE00342B4 -/* 344B60 E0034150 00000000 */ nop +/* 344B60 E0034150 00000000 */ nop .LE0034154: /* 344B64 E0034154 28420007 */ slti $v0, $v0, 7 /* 344B68 E0034158 10400011 */ beqz $v0, .LE00341A0 @@ -30,12 +30,12 @@ glabel func_E0034110 /* 344B80 E0034170 44800000 */ mtc1 $zero, $f0 /* 344B84 E0034174 00431023 */ subu $v0, $v0, $v1 /* 344B88 E0034178 44821000 */ mtc1 $v0, $f2 -/* 344B8C E003417C 00000000 */ nop +/* 344B8C E003417C 00000000 */ nop /* 344B90 E0034180 468010A1 */ cvt.d.w $f2, $f2 /* 344B94 E0034184 46201082 */ mul.d $f2, $f2, $f0 -/* 344B98 E0034188 00000000 */ nop +/* 344B98 E0034188 00000000 */ nop /* 344B9C E003418C 44830000 */ mtc1 $v1, $f0 -/* 344BA0 E0034190 00000000 */ nop +/* 344BA0 E0034190 00000000 */ nop /* 344BA4 E0034194 46800021 */ cvt.d.w $f0, $f0 /* 344BA8 E0034198 0800D06E */ j .LE00341B8 /* 344BAC E003419C 46220000 */ add.d $f0, $f0, $f2 @@ -45,7 +45,7 @@ glabel func_E0034110 /* 344BB8 E00341A8 C6000024 */ lwc1 $f0, 0x24($s0) /* 344BBC E00341AC 46800021 */ cvt.d.w $f0, $f0 /* 344BC0 E00341B0 46220002 */ mul.d $f0, $f0, $f2 -/* 344BC4 E00341B4 00000000 */ nop +/* 344BC4 E00341B4 00000000 */ nop .LE00341B8: /* 344BC8 E00341B8 4620028D */ trunc.w.d $f10, $f0 /* 344BCC E00341BC E60A0024 */ swc1 $f10, 0x24($s0) @@ -56,7 +56,7 @@ glabel func_E0034110 /* 344BE0 E00341D0 D42247B8 */ ldc1 $f2, %lo(D_E00347B8)($at) /* 344BE4 E00341D4 46002121 */ cvt.d.s $f4, $f4 /* 344BE8 E00341D8 46222102 */ mul.d $f4, $f4, $f2 -/* 344BEC E00341DC 00000000 */ nop +/* 344BEC E00341DC 00000000 */ nop /* 344BF0 E00341E0 000210C0 */ sll $v0, $v0, 3 /* 344BF4 E00341E4 00511021 */ addu $v0, $v0, $s1 /* 344BF8 E00341E8 00021040 */ sll $v0, $v0, 1 @@ -71,7 +71,7 @@ glabel func_E0034110 /* 344C1C E003420C 46220000 */ add.d $f0, $f0, $f2 /* 344C20 E0034210 C6020010 */ lwc1 $f2, 0x10($s0) /* 344C24 E0034214 44826000 */ mtc1 $v0, $f12 -/* 344C28 E0034218 00000000 */ nop +/* 344C28 E0034218 00000000 */ nop /* 344C2C E003421C 46806320 */ cvt.s.w $f12, $f12 /* 344C30 E0034220 46081080 */ add.s $f2, $f2, $f8 /* 344C34 E0034224 E6060018 */ swc1 $f6, 0x18($s0) @@ -86,7 +86,7 @@ glabel func_E0034110 /* 344C58 E0034248 44801000 */ mtc1 $zero, $f2 /* 344C5C E003424C 46000021 */ cvt.d.s $f0, $f0 /* 344C60 E0034250 46220002 */ mul.d $f0, $f0, $f2 -/* 344C64 E0034254 00000000 */ nop +/* 344C64 E0034254 00000000 */ nop /* 344C68 E0034258 00111080 */ sll $v0, $s1, 2 /* 344C6C E003425C 3C01E003 */ lui $at, %hi(D_E00347C8) /* 344C70 E0034260 D42247C8 */ ldc1 $f2, %lo(D_E00347C8)($at) @@ -94,19 +94,19 @@ glabel func_E0034110 /* 344C78 E0034268 46220000 */ add.d $f0, $f0, $f2 /* 344C7C E003426C 000210C0 */ sll $v0, $v0, 3 /* 344C80 E0034270 44826000 */ mtc1 $v0, $f12 -/* 344C84 E0034274 00000000 */ nop +/* 344C84 E0034274 00000000 */ nop /* 344C88 E0034278 46806320 */ cvt.s.w $f12, $f12 /* 344C8C E003427C 46200020 */ cvt.s.d $f0, $f0 /* 344C90 E0034280 0C080140 */ jal func_E0200500 /* 344C94 E0034284 E6000020 */ swc1 $f0, 0x20($s0) /* 344C98 E0034288 3C014280 */ lui $at, 0x4280 /* 344C9C E003428C 44811000 */ mtc1 $at, $f2 -/* 344CA0 E0034290 00000000 */ nop +/* 344CA0 E0034290 00000000 */ nop /* 344CA4 E0034294 46020002 */ mul.s $f0, $f0, $f2 -/* 344CA8 E0034298 00000000 */ nop +/* 344CA8 E0034298 00000000 */ nop /* 344CAC E003429C 3C014310 */ lui $at, 0x4310 /* 344CB0 E00342A0 44811000 */ mtc1 $at, $f2 -/* 344CB4 E00342A4 00000000 */ nop +/* 344CB4 E00342A4 00000000 */ nop /* 344CB8 E00342A8 46020000 */ add.s $f0, $f0, $f2 /* 344CBC E00342AC 4600028D */ trunc.w.s $f10, $f0 /* 344CC0 E00342B0 E60A0028 */ swc1 $f10, 0x28($s0) diff --git a/asm/nonmatchings/code_344A10/func_E0034310.s b/asm/nonmatchings/code_344A10/func_E0034310.s index c2ce51fa6a..9ca9184c63 100644 --- a/asm/nonmatchings/code_344A10/func_E0034310.s +++ b/asm/nonmatchings/code_344A10/func_E0034310.s @@ -286,6 +286,6 @@ glabel func_E0034310 /* 345178 E0034768 D7B40108 */ ldc1 $f20, 0x108($sp) /* 34517C E003476C 03E00008 */ jr $ra /* 345180 E0034770 27BD0118 */ addiu $sp, $sp, 0x118 -/* 345184 E0034774 00000000 */ nop -/* 345188 E0034778 00000000 */ nop -/* 34518C E003477C 00000000 */ nop +/* 345184 E0034774 00000000 */ nop +/* 345188 E0034778 00000000 */ nop +/* 34518C E003477C 00000000 */ nop diff --git a/asm/nonmatchings/code_3454E0/func_E0036000.s b/asm/nonmatchings/code_3454E0/func_E0036000.s index 2b07d48f4c..b0c6ae1ceb 100644 --- a/asm/nonmatchings/code_3454E0/func_E0036000.s +++ b/asm/nonmatchings/code_3454E0/func_E0036000.s @@ -38,7 +38,7 @@ glabel func_E0036000 /* 345564 E0036084 AE02000C */ sw $v0, 0xc($s0) .LE0036088: /* 345568 E0036088 0800D822 */ j .LE0036088 -/* 34556C E003608C 00000000 */ nop +/* 34556C E003608C 00000000 */ nop .LE0036090: /* 345570 E0036090 24020064 */ addiu $v0, $zero, 0x64 /* 345574 E0036094 AC620014 */ sw $v0, 0x14($v1) diff --git a/asm/nonmatchings/code_3454E0/func_E00360DC.s b/asm/nonmatchings/code_3454E0/func_E00360DC.s index ca6495ba8a..7c270b2c16 100644 --- a/asm/nonmatchings/code_3454E0/func_E00360DC.s +++ b/asm/nonmatchings/code_3454E0/func_E00360DC.s @@ -3,4 +3,4 @@ glabel func_E00360DC /* 3455BC E00360DC 03E00008 */ jr $ra -/* 3455C0 E00360E0 00000000 */ nop +/* 3455C0 E00360E0 00000000 */ nop diff --git a/asm/nonmatchings/code_3454E0/func_E00360E4.s b/asm/nonmatchings/code_3454E0/func_E00360E4.s index 6fc8488594..e5dfffc639 100644 --- a/asm/nonmatchings/code_3454E0/func_E00360E4.s +++ b/asm/nonmatchings/code_3454E0/func_E00360E4.s @@ -12,9 +12,9 @@ glabel func_E00360E4 /* 3455E0 E0036100 04410005 */ bgez $v0, .LE0036118 /* 3455E4 E0036104 ACA20014 */ sw $v0, 0x14($a1) /* 3455E8 E0036108 0C080128 */ jal func_E02004A0 -/* 3455EC E003610C 00000000 */ nop +/* 3455EC E003610C 00000000 */ nop /* 3455F0 E0036110 0800D873 */ j .LE00361CC -/* 3455F4 E0036114 00000000 */ nop +/* 3455F4 E0036114 00000000 */ nop .LE0036118: /* 3455F8 E0036118 8CA40010 */ lw $a0, 0x10($a1) /* 3455FC E003611C 8CA30014 */ lw $v1, 0x14($a1) @@ -31,7 +31,7 @@ glabel func_E00360E4 /* 345628 E0036148 3C014316 */ lui $at, 0x4316 /* 34562C E003614C 44811000 */ mtc1 $at, $f2 /* 345630 E0036150 44820000 */ mtc1 $v0, $f0 -/* 345634 E0036154 00000000 */ nop +/* 345634 E0036154 00000000 */ nop /* 345638 E0036158 46800020 */ cvt.s.w $f0, $f0 /* 34563C E003615C 8CA2001C */ lw $v0, 0x1c($a1) /* 345640 E0036160 46020003 */ div.s $f0, $f0, $f2 @@ -44,14 +44,14 @@ glabel func_E00360E4 .LE003617C: /* 34565C E003617C 28C20007 */ slti $v0, $a2, 7 /* 345660 E0036180 1040000B */ beqz $v0, .LE00361B0 -/* 345664 E0036184 00000000 */ nop +/* 345664 E0036184 00000000 */ nop /* 345668 E0036188 3C02E003 */ lui $v0, %hi(D_E0036640) /* 34566C E003618C 00441021 */ addu $v0, $v0, $a0 /* 345670 E0036190 90426640 */ lbu $v0, %lo(D_E0036640)($v0) /* 345674 E0036194 3C014316 */ lui $at, 0x4316 /* 345678 E0036198 44811000 */ mtc1 $at, $f2 /* 34567C E003619C 44820000 */ mtc1 $v0, $f0 -/* 345680 E00361A0 00000000 */ nop +/* 345680 E00361A0 00000000 */ nop /* 345684 E00361A4 46800020 */ cvt.s.w $f0, $f0 /* 345688 E00361A8 0800D86E */ j .LE00361B8 /* 34568C E00361AC 46020003 */ div.s $f0, $f0, $f2 diff --git a/asm/nonmatchings/code_3454E0/func_E003621C.s b/asm/nonmatchings/code_3454E0/func_E003621C.s index 260bd15018..286ef708f0 100644 --- a/asm/nonmatchings/code_3454E0/func_E003621C.s +++ b/asm/nonmatchings/code_3454E0/func_E003621C.s @@ -3,4 +3,4 @@ glabel func_E003621C /* 3456FC E003621C 03E00008 */ jr $ra -/* 345700 E0036220 00000000 */ nop +/* 345700 E0036220 00000000 */ nop diff --git a/asm/nonmatchings/code_3454E0/func_E0036224.s b/asm/nonmatchings/code_3454E0/func_E0036224.s index 63280ca9e7..7701491fca 100644 --- a/asm/nonmatchings/code_3454E0/func_E0036224.s +++ b/asm/nonmatchings/code_3454E0/func_E0036224.s @@ -21,7 +21,7 @@ glabel func_E0036224 /* 345744 E0036264 C4F80018 */ lwc1 $f24, 0x18($a3) /* 345748 E0036268 8CF30000 */ lw $s3, ($a3) /* 34574C E003626C 4600C032 */ c.eq.s $f24, $f0 -/* 345750 E0036270 00000000 */ nop +/* 345750 E0036270 00000000 */ nop /* 345754 E0036274 450100E0 */ bc1t .LE00365F8 /* 345758 E0036278 3C04DB06 */ lui $a0, 0xdb06 /* 34575C E003627C 3C06800A */ lui $a2, %hi(gMasterGfxPos) @@ -125,7 +125,7 @@ glabel func_E0036224 /* 3458DC E00363FC D4226650 */ ldc1 $f2, %lo(D_E0036650)($at) /* 3458E0 E0036400 4600C021 */ cvt.d.s $f0, $f24 /* 3458E4 E0036404 46220002 */ mul.d $f0, $f0, $f2 -/* 3458E8 E0036408 00000000 */ nop +/* 3458E8 E0036408 00000000 */ nop /* 3458EC E003640C 3C120001 */ lui $s2, 1 /* 3458F0 E0036410 36521630 */ ori $s2, $s2, 0x1630 /* 3458F4 E0036414 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/code_34DD20/func_E0038000.s b/asm/nonmatchings/code_34DD20/func_E0038000.s index 0546e15ec7..b7a80db8a0 100644 --- a/asm/nonmatchings/code_34DD20/func_E0038000.s +++ b/asm/nonmatchings/code_34DD20/func_E0038000.s @@ -32,13 +32,13 @@ glabel func_E0038000 /* 34DD8C E003806C 46006706 */ mov.s $f28, $f12 /* 34DD90 E0038070 4600C303 */ div.s $f12, $f24, $f0 /* 34DD94 E0038074 46166682 */ mul.s $f26, $f12, $f22 -/* 34DD98 E0038078 00000000 */ nop +/* 34DD98 E0038078 00000000 */ nop /* 34DD9C E003807C 4600B506 */ mov.s $f20, $f22 /* 34DDA0 E0038080 27B00018 */ addiu $s0, $sp, 0x18 /* 34DDA4 E0038084 24150005 */ addiu $s5, $zero, 5 /* 34DDA8 E0038088 4600D586 */ mov.s $f22, $f26 /* 34DDAC E003808C 4614B032 */ c.eq.s $f22, $f20 -/* 34DDB0 E0038090 00000000 */ nop +/* 34DDB0 E0038090 00000000 */ nop /* 34DDB4 E0038094 45010005 */ bc1t .LE00380AC /* 34DDB8 E0038098 46006607 */ neg.s $f24, $f12 /* 34DDBC E003809C 46166003 */ div.s $f0, $f12, $f22 @@ -47,7 +47,7 @@ glabel func_E0038000 /* 34DDC8 E00380A8 4600A106 */ mov.s $f4, $f20 .LE00380AC: /* 34DDCC E00380AC 4614C032 */ c.eq.s $f24, $f20 -/* 34DDD0 E00380B0 00000000 */ nop +/* 34DDD0 E00380B0 00000000 */ nop /* 34DDD4 E00380B4 45010005 */ bc1t .LE00380CC /* 34DDD8 E00380B8 4600B007 */ neg.s $f0, $f22 /* 34DDDC E00380BC 46180083 */ div.s $f2, $f0, $f24 @@ -60,21 +60,21 @@ glabel func_E0038000 /* 34DDF4 E00380D4 4600E006 */ mov.s $f0, $f28 .LE00380D8: /* 34DDF8 E00380D8 46000002 */ mul.s $f0, $f0, $f0 -/* 34DDFC E00380DC 00000000 */ nop +/* 34DDFC E00380DC 00000000 */ nop /* 34DE00 E00380E0 46021082 */ mul.s $f2, $f2, $f2 -/* 34DE04 E00380E4 00000000 */ nop +/* 34DE04 E00380E4 00000000 */ nop /* 34DE08 E00380E8 46042102 */ mul.s $f4, $f4, $f4 -/* 34DE0C E00380EC 00000000 */ nop +/* 34DE0C E00380EC 00000000 */ nop /* 34DE10 E00380F0 46020000 */ add.s $f0, $f0, $f2 /* 34DE14 E00380F4 46040300 */ add.s $f12, $f0, $f4 /* 34DE18 E00380F8 44800000 */ mtc1 $zero, $f0 -/* 34DE1C E00380FC 00000000 */ nop +/* 34DE1C E00380FC 00000000 */ nop /* 34DE20 E0038100 46006032 */ c.eq.s $f12, $f0 -/* 34DE24 E0038104 00000000 */ nop +/* 34DE24 E0038104 00000000 */ nop /* 34DE28 E0038108 450100B2 */ bc1t .LE00383D4 -/* 34DE2C E003810C 00000000 */ nop +/* 34DE2C E003810C 00000000 */ nop /* 34DE30 E0038110 0C080154 */ jal func_E0200550 -/* 34DE34 E0038114 00000000 */ nop +/* 34DE34 E0038114 00000000 */ nop /* 34DE38 E0038118 0200202D */ daddu $a0, $s0, $zero /* 34DE3C E003811C 3C014190 */ lui $at, 0x4190 /* 34DE40 E0038120 44810000 */ mtc1 $at, $f0 @@ -82,7 +82,7 @@ glabel func_E0038000 /* 34DE48 E0038128 2442841C */ addiu $v0, $v0, %lo(func_E003841C) /* 34DE4C E003812C AC820008 */ sw $v0, 8($a0) /* 34DE50 E0038130 4600D682 */ mul.s $f26, $f26, $f0 -/* 34DE54 E0038134 00000000 */ nop +/* 34DE54 E0038134 00000000 */ nop /* 34DE58 E0038138 3C02E004 */ lui $v0, %hi(func_E0038424) /* 34DE5C E003813C 24428424 */ addiu $v0, $v0, %lo(func_E0038424) /* 34DE60 E0038140 AC82000C */ sw $v0, 0xc($a0) @@ -90,12 +90,12 @@ glabel func_E0038000 /* 34DE68 E0038148 24428704 */ addiu $v0, $v0, %lo(func_E0038704) /* 34DE6C E003814C AC820010 */ sw $v0, 0x10($a0) /* 34DE70 E0038150 4600C602 */ mul.s $f24, $f24, $f0 -/* 34DE74 E0038154 00000000 */ nop +/* 34DE74 E0038154 00000000 */ nop /* 34DE78 E0038158 2402001C */ addiu $v0, $zero, 0x1c /* 34DE7C E003815C AC800000 */ sw $zero, ($a0) /* 34DE80 E0038160 AC800014 */ sw $zero, 0x14($a0) /* 34DE84 E0038164 4600B582 */ mul.s $f22, $f22, $f0 -/* 34DE88 E0038168 00000000 */ nop +/* 34DE88 E0038168 00000000 */ nop /* 34DE8C E003816C 0C080124 */ jal func_E0200490 /* 34DE90 E0038170 AC820004 */ sw $v0, 4($a0) /* 34DE94 E0038174 00152040 */ sll $a0, $s5, 1 @@ -109,7 +109,7 @@ glabel func_E0038000 /* 34DEB4 E0038194 AE12000C */ sw $s2, 0xc($s0) .LE0038198: /* 34DEB8 E0038198 0800E066 */ j .LE0038198 -/* 34DEBC E003819C 00000000 */ nop +/* 34DEBC E003819C 00000000 */ nop .LE00381A0: /* 34DEC0 E00381A0 12A0008C */ beqz $s5, .LE00383D4 /* 34DEC4 E00381A4 0000A02D */ daddu $s4, $zero, $zero @@ -165,13 +165,13 @@ glabel func_E0038000 /* 34DF84 E0038264 16610004 */ bne $s3, $at, .LE0038278 /* 34DF88 E0038268 3C018000 */ lui $at, 0x8000 /* 34DF8C E003826C 16210002 */ bne $s1, $at, .LE0038278 -/* 34DF90 E0038270 00000000 */ nop +/* 34DF90 E0038270 00000000 */ nop /* 34DF94 E0038274 0006000D */ break 6 .LE0038278: /* 34DF98 E0038278 00001012 */ mflo $v0 /* 34DF9C E003827C 2442FFCE */ addiu $v0, $v0, -0x32 /* 34DFA0 E0038280 44821000 */ mtc1 $v0, $f2 -/* 34DFA4 E0038284 00000000 */ nop +/* 34DFA4 E0038284 00000000 */ nop /* 34DFA8 E0038288 468010A0 */ cvt.s.w $f2, $f2 /* 34DFAC E003828C 0800E0A7 */ j .LE003829C /* 34DFB0 E0038290 03C0202D */ daddu $a0, $fp, $zero @@ -192,47 +192,47 @@ glabel func_E0038000 /* 34DFE0 E00382C0 16610004 */ bne $s3, $at, .LE00382D4 /* 34DFE4 E00382C4 3C018000 */ lui $at, 0x8000 /* 34DFE8 E00382C8 16210002 */ bne $s1, $at, .LE00382D4 -/* 34DFEC E00382CC 00000000 */ nop +/* 34DFEC E00382CC 00000000 */ nop /* 34DFF0 E00382D0 0006000D */ break 6 .LE00382D4: /* 34DFF4 E00382D4 00001812 */ mflo $v1 /* 34DFF8 E00382D8 C7A00030 */ lwc1 $f0, 0x30($sp) /* 34DFFC E00382DC 461A0002 */ mul.s $f0, $f0, $f26 -/* 34E000 E00382E0 00000000 */ nop +/* 34E000 E00382E0 00000000 */ nop /* 34E004 E00382E4 C7A40040 */ lwc1 $f4, 0x40($sp) /* 34E008 E00382E8 46182102 */ mul.s $f4, $f4, $f24 -/* 34E00C E00382EC 00000000 */ nop +/* 34E00C E00382EC 00000000 */ nop /* 34E010 E00382F0 C7A20050 */ lwc1 $f2, 0x50($sp) /* 34E014 E00382F4 46161082 */ mul.s $f2, $f2, $f22 -/* 34E018 E00382F8 00000000 */ nop +/* 34E018 E00382F8 00000000 */ nop /* 34E01C E00382FC 46040000 */ add.s $f0, $f0, $f4 /* 34E020 E0038300 46020000 */ add.s $f0, $f0, $f2 /* 34E024 E0038304 46000021 */ cvt.d.s $f0, $f0 /* 34E028 E0038308 463C0002 */ mul.d $f0, $f0, $f28 -/* 34E02C E003830C 00000000 */ nop +/* 34E02C E003830C 00000000 */ nop /* 34E030 E0038310 46200020 */ cvt.s.d $f0, $f0 /* 34E034 E0038314 E600FFEC */ swc1 $f0, -0x14($s0) /* 34E038 E0038318 C7A00034 */ lwc1 $f0, 0x34($sp) /* 34E03C E003831C 461A0002 */ mul.s $f0, $f0, $f26 -/* 34E040 E0038320 00000000 */ nop +/* 34E040 E0038320 00000000 */ nop /* 34E044 E0038324 C7A40044 */ lwc1 $f4, 0x44($sp) /* 34E048 E0038328 46182102 */ mul.s $f4, $f4, $f24 -/* 34E04C E003832C 00000000 */ nop +/* 34E04C E003832C 00000000 */ nop /* 34E050 E0038330 C7A20054 */ lwc1 $f2, 0x54($sp) /* 34E054 E0038334 46161082 */ mul.s $f2, $f2, $f22 -/* 34E058 E0038338 00000000 */ nop +/* 34E058 E0038338 00000000 */ nop /* 34E05C E003833C 46040000 */ add.s $f0, $f0, $f4 /* 34E060 E0038340 46020000 */ add.s $f0, $f0, $f2 /* 34E064 E0038344 E600FFF0 */ swc1 $f0, -0x10($s0) /* 34E068 E0038348 C7A00038 */ lwc1 $f0, 0x38($sp) /* 34E06C E003834C 461A0002 */ mul.s $f0, $f0, $f26 -/* 34E070 E0038350 00000000 */ nop +/* 34E070 E0038350 00000000 */ nop /* 34E074 E0038354 C7A20048 */ lwc1 $f2, 0x48($sp) /* 34E078 E0038358 46181082 */ mul.s $f2, $f2, $f24 -/* 34E07C E003835C 00000000 */ nop +/* 34E07C E003835C 00000000 */ nop /* 34E080 E0038360 C7A40058 */ lwc1 $f4, 0x58($sp) /* 34E084 E0038364 46162102 */ mul.s $f4, $f4, $f22 -/* 34E088 E0038368 00000000 */ nop +/* 34E088 E0038368 00000000 */ nop /* 34E08C E003836C 26940001 */ addiu $s4, $s4, 1 /* 34E090 E0038370 26520030 */ addiu $s2, $s2, 0x30 /* 34E094 E0038374 26310064 */ addiu $s1, $s1, 0x64 @@ -245,13 +245,13 @@ glabel func_E0038000 /* 34E0B0 E0038390 8FA800D8 */ lw $t0, 0xd8($sp) /* 34E0B4 E0038394 46000021 */ cvt.d.s $f0, $f0 /* 34E0B8 E0038398 463C0002 */ mul.d $f0, $f0, $f28 -/* 34E0BC E003839C 00000000 */ nop +/* 34E0BC E003839C 00000000 */ nop /* 34E0C0 E00383A0 AE000008 */ sw $zero, 8($s0) /* 34E0C4 E00383A4 AE000000 */ sw $zero, ($s0) /* 34E0C8 E00383A8 AE080004 */ sw $t0, 4($s0) /* 34E0CC E00383AC 00431023 */ subu $v0, $v0, $v1 /* 34E0D0 E00383B0 44821000 */ mtc1 $v0, $f2 -/* 34E0D4 E00383B4 00000000 */ nop +/* 34E0D4 E00383B4 00000000 */ nop /* 34E0D8 E00383B8 468010A0 */ cvt.s.w $f2, $f2 /* 34E0DC E00383BC 0295102A */ slt $v0, $s4, $s5 /* 34E0E0 E00383C0 E602FFF8 */ swc1 $f2, -8($s0) diff --git a/asm/nonmatchings/code_34DD20/func_E003841C.s b/asm/nonmatchings/code_34DD20/func_E003841C.s index 95c1169189..7b9698ba1c 100644 --- a/asm/nonmatchings/code_34DD20/func_E003841C.s +++ b/asm/nonmatchings/code_34DD20/func_E003841C.s @@ -3,4 +3,4 @@ glabel func_E003841C /* 34E13C E003841C 03E00008 */ jr $ra -/* 34E140 E0038420 00000000 */ nop +/* 34E140 E0038420 00000000 */ nop diff --git a/asm/nonmatchings/code_34DD20/func_E0038424.s b/asm/nonmatchings/code_34DD20/func_E0038424.s index 78fabca0db..c7e39d290b 100644 --- a/asm/nonmatchings/code_34DD20/func_E0038424.s +++ b/asm/nonmatchings/code_34DD20/func_E0038424.s @@ -28,7 +28,7 @@ glabel func_E0038424 /* 34E1A0 E0038480 0C080128 */ jal func_E02004A0 /* 34E1A4 E0038484 0280202D */ daddu $a0, $s4, $zero /* 34E1A8 E0038488 0800E1B3 */ j .LE00386CC -/* 34E1AC E003848C 00000000 */ nop +/* 34E1AC E003848C 00000000 */ nop .LE0038490: /* 34E1B0 E0038490 0000882D */ daddu $s1, $zero, $zero /* 34E1B4 E0038494 0080982D */ daddu $s3, $a0, $zero @@ -52,29 +52,29 @@ glabel func_E0038424 /* 34E1F8 E00384D8 C6020004 */ lwc1 $f2, 4($s0) /* 34E1FC E00384DC 460010A1 */ cvt.d.s $f2, $f2 /* 34E200 E00384E0 46381082 */ mul.d $f2, $f2, $f24 -/* 34E204 E00384E4 00000000 */ nop +/* 34E204 E00384E4 00000000 */ nop /* 34E208 E00384E8 C6000008 */ lwc1 $f0, 8($s0) /* 34E20C E00384EC 46000021 */ cvt.d.s $f0, $f0 /* 34E210 E00384F0 46380002 */ mul.d $f0, $f0, $f24 -/* 34E214 E00384F4 00000000 */ nop +/* 34E214 E00384F4 00000000 */ nop /* 34E218 E00384F8 C604000C */ lwc1 $f4, 0xc($s0) /* 34E21C E00384FC 46002121 */ cvt.d.s $f4, $f4 /* 34E220 E0038500 46382102 */ mul.d $f4, $f4, $f24 -/* 34E224 E0038504 00000000 */ nop +/* 34E224 E0038504 00000000 */ nop /* 34E228 E0038508 8E030018 */ lw $v1, 0x18($s0) /* 34E22C E003850C 3C01E004 */ lui $at, %hi(D_E0038A38) /* 34E230 E0038510 D4268A38 */ ldc1 $f6, %lo(D_E0038A38)($at) /* 34E234 E0038514 02A31023 */ subu $v0, $s5, $v1 /* 34E238 E0038518 44824000 */ mtc1 $v0, $f8 -/* 34E23C E003851C 00000000 */ nop +/* 34E23C E003851C 00000000 */ nop /* 34E240 E0038520 46804221 */ cvt.d.w $f8, $f8 /* 34E244 E0038524 46264202 */ mul.d $f8, $f8, $f6 -/* 34E248 E0038528 00000000 */ nop +/* 34E248 E0038528 00000000 */ nop /* 34E24C E003852C 462010A0 */ cvt.s.d $f2, $f2 /* 34E250 E0038530 46200020 */ cvt.s.d $f0, $f0 /* 34E254 E0038534 E6000008 */ swc1 $f0, 8($s0) /* 34E258 E0038538 44830000 */ mtc1 $v1, $f0 -/* 34E25C E003853C 00000000 */ nop +/* 34E25C E003853C 00000000 */ nop /* 34E260 E0038540 46800021 */ cvt.d.w $f0, $f0 /* 34E264 E0038544 46202120 */ cvt.s.d $f4, $f4 /* 34E268 E0038548 46280000 */ add.d $f0, $f0, $f8 @@ -82,48 +82,48 @@ glabel func_E0038424 /* 34E270 E0038550 E604000C */ swc1 $f4, 0xc($s0) /* 34E274 E0038554 4620028D */ trunc.w.d $f10, $f0 /* 34E278 E0038558 44035000 */ mfc1 $v1, $f10 -/* 34E27C E003855C 00000000 */ nop +/* 34E27C E003855C 00000000 */ nop /* 34E280 E0038560 000317C2 */ srl $v0, $v1, 0x1f /* 34E284 E0038564 00621021 */ addu $v0, $v1, $v0 /* 34E288 E0038568 00021043 */ sra $v0, $v0, 1 /* 34E28C E003856C 44826000 */ mtc1 $v0, $f12 -/* 34E290 E0038570 00000000 */ nop +/* 34E290 E0038570 00000000 */ nop /* 34E294 E0038574 46806320 */ cvt.s.w $f12, $f12 /* 34E298 E0038578 0C080140 */ jal func_E0200500 /* 34E29C E003857C AE030018 */ sw $v1, 0x18($s0) /* 34E2A0 E0038580 44926000 */ mtc1 $s2, $f12 -/* 34E2A4 E0038584 00000000 */ nop +/* 34E2A4 E0038584 00000000 */ nop /* 34E2A8 E0038588 46806320 */ cvt.s.w $f12, $f12 /* 34E2AC E003858C 461A6302 */ mul.s $f12, $f12, $f26 -/* 34E2B0 E0038590 00000000 */ nop +/* 34E2B0 E0038590 00000000 */ nop /* 34E2B4 E0038594 0C080140 */ jal func_E0200500 /* 34E2B8 E0038598 46000506 */ mov.s $f20, $f0 /* 34E2BC E003859C 461CA502 */ mul.s $f20, $f20, $f28 -/* 34E2C0 E00385A0 00000000 */ nop +/* 34E2C0 E00385A0 00000000 */ nop /* 34E2C4 E00385A4 4600A500 */ add.s $f20, $f20, $f0 /* 34E2C8 E00385A8 E6140014 */ swc1 $f20, 0x14($s0) /* 34E2CC E00385AC 2A620005 */ slti $v0, $s3, 5 .LE00385B0: /* 34E2D0 E00385B0 10400035 */ beqz $v0, .LE0038688 -/* 34E2D4 E00385B4 00000000 */ nop +/* 34E2D4 E00385B4 00000000 */ nop /* 34E2D8 E00385B8 3C01E004 */ lui $at, %hi(D_E0038A40) /* 34E2DC E00385BC D4208A40 */ ldc1 $f0, %lo(D_E0038A40)($at) /* 34E2E0 E00385C0 C6060018 */ lwc1 $f6, 0x18($s0) /* 34E2E4 E00385C4 468031A1 */ cvt.d.w $f6, $f6 /* 34E2E8 E00385C8 46203182 */ mul.d $f6, $f6, $f0 -/* 34E2EC E00385CC 00000000 */ nop +/* 34E2EC E00385CC 00000000 */ nop /* 34E2F0 E00385D0 C6040004 */ lwc1 $f4, 4($s0) /* 34E2F4 E00385D4 46002121 */ cvt.d.s $f4, $f4 /* 34E2F8 E00385D8 46362102 */ mul.d $f4, $f4, $f22 -/* 34E2FC E00385DC 00000000 */ nop +/* 34E2FC E00385DC 00000000 */ nop /* 34E300 E00385E0 C602000C */ lwc1 $f2, 0xc($s0) /* 34E304 E00385E4 460010A1 */ cvt.d.s $f2, $f2 /* 34E308 E00385E8 46361082 */ mul.d $f2, $f2, $f22 -/* 34E30C E00385EC 00000000 */ nop +/* 34E30C E00385EC 00000000 */ nop /* 34E310 E00385F0 C6000008 */ lwc1 $f0, 8($s0) /* 34E314 E00385F4 46000021 */ cvt.d.s $f0, $f0 /* 34E318 E00385F8 46360002 */ mul.d $f0, $f0, $f22 -/* 34E31C E00385FC 00000000 */ nop +/* 34E31C E00385FC 00000000 */ nop /* 34E320 E0038600 4620328D */ trunc.w.d $f10, $f6 /* 34E324 E0038604 E60A0018 */ swc1 $f10, 0x18($s0) /* 34E328 E0038608 46202120 */ cvt.s.d $f4, $f4 @@ -136,24 +136,24 @@ glabel func_E0038424 /* 34E344 E0038624 00621821 */ addu $v1, $v1, $v0 /* 34E348 E0038628 00031843 */ sra $v1, $v1, 1 /* 34E34C E003862C 44836000 */ mtc1 $v1, $f12 -/* 34E350 E0038630 00000000 */ nop +/* 34E350 E0038630 00000000 */ nop /* 34E354 E0038634 46806320 */ cvt.s.w $f12, $f12 /* 34E358 E0038638 0C080140 */ jal func_E0200500 /* 34E35C E003863C E6000008 */ swc1 $f0, 8($s0) /* 34E360 E0038640 44926000 */ mtc1 $s2, $f12 -/* 34E364 E0038644 00000000 */ nop +/* 34E364 E0038644 00000000 */ nop /* 34E368 E0038648 46806320 */ cvt.s.w $f12, $f12 /* 34E36C E003864C 461A6302 */ mul.s $f12, $f12, $f26 -/* 34E370 E0038650 00000000 */ nop +/* 34E370 E0038650 00000000 */ nop /* 34E374 E0038654 0C080140 */ jal func_E0200500 /* 34E378 E0038658 46000506 */ mov.s $f20, $f0 /* 34E37C E003865C 461CA502 */ mul.s $f20, $f20, $f28 -/* 34E380 E0038660 00000000 */ nop +/* 34E380 E0038660 00000000 */ nop /* 34E384 E0038664 8E020018 */ lw $v0, 0x18($s0) /* 34E388 E0038668 02A21023 */ subu $v0, $s5, $v0 /* 34E38C E003866C 4600A500 */ add.s $f20, $f20, $f0 /* 34E390 E0038670 44820000 */ mtc1 $v0, $f0 -/* 34E394 E0038674 00000000 */ nop +/* 34E394 E0038674 00000000 */ nop /* 34E398 E0038678 46800020 */ cvt.s.w $f0, $f0 /* 34E39C E003867C 461A0003 */ div.s $f0, $f0, $f26 /* 34E3A0 E0038680 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/code_34DD20/func_E0038748.s b/asm/nonmatchings/code_34DD20/func_E0038748.s index 7016fbc1f5..e370db410a 100644 --- a/asm/nonmatchings/code_34DD20/func_E0038748.s +++ b/asm/nonmatchings/code_34DD20/func_E0038748.s @@ -171,6 +171,6 @@ glabel func_E0038748 /* 34E6F8 E00389D8 D7B400C0 */ ldc1 $f20, 0xc0($sp) /* 34E6FC E00389DC 03E00008 */ jr $ra /* 34E700 E00389E0 27BD00D0 */ addiu $sp, $sp, 0xd0 -/* 34E704 E00389E4 00000000 */ nop -/* 34E708 E00389E8 00000000 */ nop -/* 34E70C E00389EC 00000000 */ nop +/* 34E704 E00389E4 00000000 */ nop +/* 34E708 E00389E8 00000000 */ nop +/* 34E70C E00389EC 00000000 */ nop diff --git a/asm/nonmatchings/code_34EC80/func_E003A000.s b/asm/nonmatchings/code_34EC80/func_E003A000.s index 335f9b473a..d6ff47f52e 100644 --- a/asm/nonmatchings/code_34EC80/func_E003A000.s +++ b/asm/nonmatchings/code_34EC80/func_E003A000.s @@ -50,7 +50,7 @@ glabel func_E003A000 /* 34ED34 E003A0B4 AE11000C */ sw $s1, 0xc($s0) .LE003A0B8: /* 34ED38 E003A0B8 0800E82E */ j .LE003A0B8 -/* 34ED3C E003A0BC 00000000 */ nop +/* 34ED3C E003A0BC 00000000 */ nop .LE003A0C0: /* 34ED40 E003A0C0 0220202D */ daddu $a0, $s1, $zero /* 34ED44 E003A0C4 00132840 */ sll $a1, $s3, 1 @@ -88,7 +88,7 @@ glabel func_E003A000 /* 34EDBC E003A13C 16810004 */ bne $s4, $at, .LE003A150 /* 34EDC0 E003A140 3C018000 */ lui $at, 0x8000 /* 34EDC4 E003A144 16210002 */ bne $s1, $at, .LE003A150 -/* 34EDC8 E003A148 00000000 */ nop +/* 34EDC8 E003A148 00000000 */ nop /* 34EDCC E003A14C 0006000D */ break 6 .LE003A150: /* 34EDD0 E003A150 00001812 */ mflo $v1 @@ -96,7 +96,7 @@ glabel func_E003A000 /* 34EDD8 E003A158 26520001 */ addiu $s2, $s2, 1 /* 34EDDC E003A15C AE00FFEC */ sw $zero, -0x14($s0) /* 34EDE0 E003A160 4483A000 */ mtc1 $v1, $f20 -/* 34EDE4 E003A164 00000000 */ nop +/* 34EDE4 E003A164 00000000 */ nop /* 34EDE8 E003A168 4680A520 */ cvt.s.w $f20, $f20 /* 34EDEC E003A16C 4614D500 */ add.s $f20, $f26, $f20 /* 34EDF0 E003A170 AE00FFF0 */ sw $zero, -0x10($s0) diff --git a/asm/nonmatchings/code_34EC80/func_E003A1D4.s b/asm/nonmatchings/code_34EC80/func_E003A1D4.s index a479a16dfa..ccc87e567f 100644 --- a/asm/nonmatchings/code_34EC80/func_E003A1D4.s +++ b/asm/nonmatchings/code_34EC80/func_E003A1D4.s @@ -3,4 +3,4 @@ glabel func_E003A1D4 /* 34EE54 E003A1D4 03E00008 */ jr $ra -/* 34EE58 E003A1D8 00000000 */ nop +/* 34EE58 E003A1D8 00000000 */ nop diff --git a/asm/nonmatchings/code_34EC80/func_E003A1DC.s b/asm/nonmatchings/code_34EC80/func_E003A1DC.s index 611507d309..b677de0ec3 100644 --- a/asm/nonmatchings/code_34EC80/func_E003A1DC.s +++ b/asm/nonmatchings/code_34EC80/func_E003A1DC.s @@ -10,11 +10,11 @@ glabel func_E003A1DC /* 34EE70 E003A1F0 8CA20028 */ lw $v0, 0x28($a1) /* 34EE74 E003A1F4 8CA30024 */ lw $v1, 0x24($a1) /* 34EE78 E003A1F8 44821000 */ mtc1 $v0, $f2 -/* 34EE7C E003A1FC 00000000 */ nop +/* 34EE7C E003A1FC 00000000 */ nop /* 34EE80 E003A200 468010A0 */ cvt.s.w $f2, $f2 /* 34EE84 E003A204 24420001 */ addiu $v0, $v0, 1 /* 34EE88 E003A208 46001082 */ mul.s $f2, $f2, $f0 -/* 34EE8C E003A20C 00000000 */ nop +/* 34EE8C E003A20C 00000000 */ nop /* 34EE90 E003A210 2463FFFF */ addiu $v1, $v1, -1 /* 34EE94 E003A214 C4A0002C */ lwc1 $f0, 0x2c($a1) /* 34EE98 E003A218 46800020 */ cvt.s.w $f0, $f0 @@ -24,9 +24,9 @@ glabel func_E003A1DC /* 34EEA8 E003A228 04610005 */ bgez $v1, .LE003A240 /* 34EEAC E003A22C E4A20030 */ swc1 $f2, 0x30($a1) /* 34EEB0 E003A230 0C080128 */ jal func_E02004A0 -/* 34EEB4 E003A234 00000000 */ nop +/* 34EEB4 E003A234 00000000 */ nop /* 34EEB8 E003A238 0800E8C1 */ j .LE003A304 -/* 34EEBC E003A23C 00000000 */ nop +/* 34EEBC E003A23C 00000000 */ nop .LE003A240: /* 34EEC0 E003A240 C4A2001C */ lwc1 $f2, 0x1c($a1) /* 34EEC4 E003A244 C4A00020 */ lwc1 $f0, 0x20($a1) @@ -35,7 +35,7 @@ glabel func_E003A1DC /* 34EED0 E003A250 D424A820 */ ldc1 $f4, %lo(D_E003A820)($at) /* 34EED4 E003A254 46000021 */ cvt.d.s $f0, $f0 /* 34EED8 E003A258 46240002 */ mul.d $f0, $f0, $f4 -/* 34EEDC E003A25C 00000000 */ nop +/* 34EEDC E003A25C 00000000 */ nop /* 34EEE0 E003A260 460010A1 */ cvt.d.s $f2, $f2 /* 34EEE4 E003A264 46201080 */ add.d $f2, $f2, $f0 /* 34EEE8 E003A268 24060001 */ addiu $a2, $zero, 1 @@ -58,13 +58,13 @@ glabel func_E003A1DC /* 34EF28 E003A2A8 46200020 */ cvt.s.d $f0, $f0 /* 34EF2C E003A2AC 46000021 */ cvt.d.s $f0, $f0 /* 34EF30 E003A2B0 462A0002 */ mul.d $f0, $f0, $f10 -/* 34EF34 E003A2B4 00000000 */ nop +/* 34EF34 E003A2B4 00000000 */ nop /* 34EF38 E003A2B8 C4660004 */ lwc1 $f6, 4($v1) /* 34EF3C E003A2BC 46064182 */ mul.s $f6, $f8, $f6 -/* 34EF40 E003A2C0 00000000 */ nop +/* 34EF40 E003A2C0 00000000 */ nop /* 34EF44 E003A2C4 C464000C */ lwc1 $f4, 0xc($v1) /* 34EF48 E003A2C8 46044102 */ mul.s $f4, $f8, $f4 -/* 34EF4C E003A2CC 00000000 */ nop +/* 34EF4C E003A2CC 00000000 */ nop /* 34EF50 E003A2D0 46200020 */ cvt.s.d $f0, $f0 /* 34EF54 E003A2D4 E4600008 */ swc1 $f0, 8($v1) /* 34EF58 E003A2D8 C460FFFC */ lwc1 $f0, -4($v1) diff --git a/asm/nonmatchings/code_34EC80/func_E003A354.s b/asm/nonmatchings/code_34EC80/func_E003A354.s index 52043d657a..9c20c1bf55 100644 --- a/asm/nonmatchings/code_34EC80/func_E003A354.s +++ b/asm/nonmatchings/code_34EC80/func_E003A354.s @@ -41,9 +41,9 @@ glabel func_E003A354 /* 34F064 E003A3E4 3C02E700 */ lui $v0, 0xe700 /* 34F068 E003A3E8 4600110D */ trunc.w.s $f4, $f2 /* 34F06C E003A3EC 44152000 */ mfc1 $s5, $f4 -/* 34F070 E003A3F0 00000000 */ nop +/* 34F070 E003A3F0 00000000 */ nop /* 34F074 E003A3F4 44950000 */ mtc1 $s5, $f0 -/* 34F078 E003A3F8 00000000 */ nop +/* 34F078 E003A3F8 00000000 */ nop /* 34F07C E003A3FC 46800020 */ cvt.s.w $f0, $f0 /* 34F080 E003A400 46001081 */ sub.s $f2, $f2, $f0 /* 34F084 E003A404 ACA20000 */ sw $v0, ($a1) @@ -62,7 +62,7 @@ glabel func_E003A354 /* 34F0B8 E003A438 00A22821 */ addu $a1, $a1, $v0 /* 34F0BC E003A43C 3AA20007 */ xori $v0, $s5, 7 /* 34F0C0 E003A440 46001082 */ mul.s $f2, $f2, $f0 -/* 34F0C4 E003A444 00000000 */ nop +/* 34F0C4 E003A444 00000000 */ nop /* 34F0C8 E003A448 AC650004 */ sw $a1, 4($v1) /* 34F0CC E003A44C 8E850004 */ lw $a1, 4($s4) /* 34F0D0 E003A450 8E860008 */ lw $a2, 8($s4) @@ -305,6 +305,6 @@ glabel func_E003A354 /* 34F468 E003A7E8 8FB000E0 */ lw $s0, 0xe0($sp) /* 34F46C E003A7EC 03E00008 */ jr $ra /* 34F470 E003A7F0 27BD0108 */ addiu $sp, $sp, 0x108 -/* 34F474 E003A7F4 00000000 */ nop -/* 34F478 E003A7F8 00000000 */ nop -/* 34F47C E003A7FC 00000000 */ nop +/* 34F474 E003A7F4 00000000 */ nop +/* 34F478 E003A7F8 00000000 */ nop +/* 34F47C E003A7FC 00000000 */ nop diff --git a/asm/nonmatchings/code_352440/func_E003E000.s b/asm/nonmatchings/code_352440/func_E003E000.s index 7574ec809a..36a058716c 100644 --- a/asm/nonmatchings/code_352440/func_E003E000.s +++ b/asm/nonmatchings/code_352440/func_E003E000.s @@ -23,50 +23,50 @@ glabel func_E003E000 /* 352488 E003E048 AFA500BC */ sw $a1, 0xbc($sp) /* 35248C E003E04C AFA600C0 */ sw $a2, 0xc0($sp) /* 352490 E003E050 4600D032 */ c.eq.s $f26, $f0 -/* 352494 E003E054 00000000 */ nop +/* 352494 E003E054 00000000 */ nop /* 352498 E003E058 45000009 */ bc1f .LE003E080 /* 35249C E003E05C AFA700C4 */ sw $a3, 0xc4($sp) /* 3524A0 E003E060 4600F032 */ c.eq.s $f30, $f0 -/* 3524A4 E003E064 00000000 */ nop +/* 3524A4 E003E064 00000000 */ nop /* 3524A8 E003E068 45000005 */ bc1f .LE003E080 -/* 3524AC E003E06C 00000000 */ nop +/* 3524AC E003E06C 00000000 */ nop /* 3524B0 E003E070 4600E032 */ c.eq.s $f28, $f0 -/* 3524B4 E003E074 00000000 */ nop +/* 3524B4 E003E074 00000000 */ nop /* 3524B8 E003E078 450100D3 */ bc1t .LE003E3C8 /* 3524BC E003E07C 0000102D */ daddu $v0, $zero, $zero .LE003E080: /* 3524C0 E003E080 461AD002 */ mul.s $f0, $f26, $f26 -/* 3524C4 E003E084 00000000 */ nop +/* 3524C4 E003E084 00000000 */ nop /* 3524C8 E003E088 461EF082 */ mul.s $f2, $f30, $f30 -/* 3524CC E003E08C 00000000 */ nop +/* 3524CC E003E08C 00000000 */ nop /* 3524D0 E003E090 461CE102 */ mul.s $f4, $f28, $f28 -/* 3524D4 E003E094 00000000 */ nop +/* 3524D4 E003E094 00000000 */ nop /* 3524D8 E003E098 46020000 */ add.s $f0, $f0, $f2 /* 3524DC E003E09C 46040300 */ add.s $f12, $f0, $f4 /* 3524E0 E003E0A0 4480A000 */ mtc1 $zero, $f20 -/* 3524E4 E003E0A4 00000000 */ nop +/* 3524E4 E003E0A4 00000000 */ nop /* 3524E8 E003E0A8 46146032 */ c.eq.s $f12, $f20 -/* 3524EC E003E0AC 00000000 */ nop +/* 3524EC E003E0AC 00000000 */ nop /* 3524F0 E003E0B0 450100C5 */ bc1t .LE003E3C8 /* 3524F4 E003E0B4 0000102D */ daddu $v0, $zero, $zero /* 3524F8 E003E0B8 0C080154 */ jal func_E0200550 -/* 3524FC E003E0BC 00000000 */ nop +/* 3524FC E003E0BC 00000000 */ nop /* 352500 E003E0C0 3C013F80 */ lui $at, 0x3f80 /* 352504 E003E0C4 44811000 */ mtc1 $at, $f2 -/* 352508 E003E0C8 00000000 */ nop +/* 352508 E003E0C8 00000000 */ nop /* 35250C E003E0CC 46001303 */ div.s $f12, $f2, $f0 /* 352510 E003E0D0 460CD682 */ mul.s $f26, $f26, $f12 -/* 352514 E003E0D4 00000000 */ nop +/* 352514 E003E0D4 00000000 */ nop /* 352518 E003E0D8 460CF782 */ mul.s $f30, $f30, $f12 -/* 35251C E003E0DC 00000000 */ nop +/* 35251C E003E0DC 00000000 */ nop /* 352520 E003E0E0 460CE702 */ mul.s $f28, $f28, $f12 -/* 352524 E003E0E4 00000000 */ nop +/* 352524 E003E0E4 00000000 */ nop /* 352528 E003E0E8 4614D032 */ c.eq.s $f26, $f20 -/* 35252C E003E0EC 00000000 */ nop +/* 35252C E003E0EC 00000000 */ nop /* 352530 E003E0F0 45000006 */ bc1f .LE003E10C /* 352534 E003E0F4 4600E586 */ mov.s $f22, $f28 /* 352538 E003E0F8 4614E032 */ c.eq.s $f28, $f20 -/* 35253C E003E0FC 00000000 */ nop +/* 35253C E003E0FC 00000000 */ nop /* 352540 E003E100 45010005 */ bc1t .LE003E118 /* 352544 E003E104 46001586 */ mov.s $f22, $f2 /* 352548 E003E108 4600E586 */ mov.s $f22, $f28 @@ -78,79 +78,79 @@ glabel func_E003E000 /* 352558 E003E118 4600A606 */ mov.s $f24, $f20 .LE003E11C: /* 35255C E003E11C 4616B002 */ mul.s $f0, $f22, $f22 -/* 352560 E003E120 00000000 */ nop +/* 352560 E003E120 00000000 */ nop /* 352564 E003E124 4618C082 */ mul.s $f2, $f24, $f24 -/* 352568 E003E128 00000000 */ nop +/* 352568 E003E128 00000000 */ nop /* 35256C E003E12C 4614A102 */ mul.s $f4, $f20, $f20 -/* 352570 E003E130 00000000 */ nop +/* 352570 E003E130 00000000 */ nop /* 352574 E003E134 46020000 */ add.s $f0, $f0, $f2 /* 352578 E003E138 46040300 */ add.s $f12, $f0, $f4 /* 35257C E003E13C 44808000 */ mtc1 $zero, $f16 -/* 352580 E003E140 00000000 */ nop +/* 352580 E003E140 00000000 */ nop /* 352584 E003E144 46106032 */ c.eq.s $f12, $f16 -/* 352588 E003E148 00000000 */ nop +/* 352588 E003E148 00000000 */ nop /* 35258C E003E14C 4501009E */ bc1t .LE003E3C8 /* 352590 E003E150 0000102D */ daddu $v0, $zero, $zero /* 352594 E003E154 0C080154 */ jal func_E0200550 -/* 352598 E003E158 00000000 */ nop +/* 352598 E003E158 00000000 */ nop /* 35259C E003E15C 3C013F80 */ lui $at, 0x3f80 /* 3525A0 E003E160 44819000 */ mtc1 $at, $f18 -/* 3525A4 E003E164 00000000 */ nop +/* 3525A4 E003E164 00000000 */ nop /* 3525A8 E003E168 46009303 */ div.s $f12, $f18, $f0 /* 3525AC E003E16C 460CB582 */ mul.s $f22, $f22, $f12 -/* 3525B0 E003E170 00000000 */ nop +/* 3525B0 E003E170 00000000 */ nop /* 3525B4 E003E174 460CC602 */ mul.s $f24, $f24, $f12 -/* 3525B8 E003E178 00000000 */ nop +/* 3525B8 E003E178 00000000 */ nop /* 3525BC E003E17C 460CA502 */ mul.s $f20, $f20, $f12 -/* 3525C0 E003E180 00000000 */ nop +/* 3525C0 E003E180 00000000 */ nop /* 3525C4 E003E184 461CC102 */ mul.s $f4, $f24, $f28 -/* 3525C8 E003E188 00000000 */ nop +/* 3525C8 E003E188 00000000 */ nop /* 3525CC E003E18C 461EA002 */ mul.s $f0, $f20, $f30 -/* 3525D0 E003E190 00000000 */ nop +/* 3525D0 E003E190 00000000 */ nop /* 3525D4 E003E194 461AA202 */ mul.s $f8, $f20, $f26 -/* 3525D8 E003E198 00000000 */ nop +/* 3525D8 E003E198 00000000 */ nop /* 3525DC E003E19C 461CB082 */ mul.s $f2, $f22, $f28 -/* 3525E0 E003E1A0 00000000 */ nop +/* 3525E0 E003E1A0 00000000 */ nop /* 3525E4 E003E1A4 461EB282 */ mul.s $f10, $f22, $f30 -/* 3525E8 E003E1A8 00000000 */ nop +/* 3525E8 E003E1A8 00000000 */ nop /* 3525EC E003E1AC 461AC182 */ mul.s $f6, $f24, $f26 -/* 3525F0 E003E1B0 00000000 */ nop +/* 3525F0 E003E1B0 00000000 */ nop /* 3525F4 E003E1B4 46002101 */ sub.s $f4, $f4, $f0 /* 3525F8 E003E1B8 46042002 */ mul.s $f0, $f4, $f4 -/* 3525FC E003E1BC 00000000 */ nop +/* 3525FC E003E1BC 00000000 */ nop /* 352600 E003E1C0 46024201 */ sub.s $f8, $f8, $f2 /* 352604 E003E1C4 E7A40068 */ swc1 $f4, 0x68($sp) /* 352608 E003E1C8 46084102 */ mul.s $f4, $f8, $f8 -/* 35260C E003E1CC 00000000 */ nop +/* 35260C E003E1CC 00000000 */ nop /* 352610 E003E1D0 46065281 */ sub.s $f10, $f10, $f6 /* 352614 E003E1D4 460A5082 */ mul.s $f2, $f10, $f10 -/* 352618 E003E1D8 00000000 */ nop +/* 352618 E003E1D8 00000000 */ nop /* 35261C E003E1DC 46040000 */ add.s $f0, $f0, $f4 /* 352620 E003E1E0 44808000 */ mtc1 $zero, $f16 /* 352624 E003E1E4 46020300 */ add.s $f12, $f0, $f2 /* 352628 E003E1E8 E7A8006C */ swc1 $f8, 0x6c($sp) /* 35262C E003E1EC 46106032 */ c.eq.s $f12, $f16 -/* 352630 E003E1F0 00000000 */ nop +/* 352630 E003E1F0 00000000 */ nop /* 352634 E003E1F4 45000003 */ bc1f .LE003E204 /* 352638 E003E1F8 E7AA0070 */ swc1 $f10, 0x70($sp) /* 35263C E003E1FC 0800F8F2 */ j .LE003E3C8 /* 352640 E003E200 0000102D */ daddu $v0, $zero, $zero .LE003E204: /* 352644 E003E204 0C080154 */ jal func_E0200550 -/* 352648 E003E208 00000000 */ nop +/* 352648 E003E208 00000000 */ nop /* 35264C E003E20C 3C013F80 */ lui $at, 0x3f80 /* 352650 E003E210 44819000 */ mtc1 $at, $f18 /* 352654 E003E214 C7B00068 */ lwc1 $f16, 0x68($sp) /* 352658 E003E218 46009303 */ div.s $f12, $f18, $f0 /* 35265C E003E21C 460C8402 */ mul.s $f16, $f16, $f12 -/* 352660 E003E220 00000000 */ nop +/* 352660 E003E220 00000000 */ nop /* 352664 E003E224 C7B2006C */ lwc1 $f18, 0x6c($sp) /* 352668 E003E228 460C9482 */ mul.s $f18, $f18, $f12 -/* 35266C E003E22C 00000000 */ nop +/* 35266C E003E22C 00000000 */ nop /* 352670 E003E230 E7B00068 */ swc1 $f16, 0x68($sp) /* 352674 E003E234 C7B00070 */ lwc1 $f16, 0x70($sp) /* 352678 E003E238 460C8402 */ mul.s $f16, $f16, $f12 -/* 35267C E003E23C 00000000 */ nop +/* 35267C E003E23C 00000000 */ nop /* 352680 E003E240 0200202D */ daddu $a0, $s0, $zero /* 352684 E003E244 3C02E004 */ lui $v0, %hi(func_E003E3F8) /* 352688 E003E248 2442E3F8 */ addiu $v0, $v0, %lo(func_E003E3F8) @@ -179,7 +179,7 @@ glabel func_E003E000 /* 3526E4 E003E2A4 AE02000C */ sw $v0, 0xc($s0) .LE003E2A8: /* 3526E8 E003E2A8 0800F8AA */ j .LE003E2A8 -/* 3526EC E003E2AC 00000000 */ nop +/* 3526EC E003E2AC 00000000 */ nop .LE003E2B0: /* 3526F0 E003E2B0 24030010 */ addiu $v1, $zero, 0x10 /* 3526F4 E003E2B4 240500F8 */ addiu $a1, $zero, 0xf8 @@ -193,7 +193,7 @@ glabel func_E003E000 /* 352714 E003E2D4 3C01438B */ lui $at, 0x438b /* 352718 E003E2D8 44813000 */ mtc1 $at, $f6 /* 35271C E003E2DC 460A6302 */ mul.s $f12, $f12, $f10 -/* 352720 E003E2E0 00000000 */ nop +/* 352720 E003E2E0 00000000 */ nop /* 352724 E003E2E4 3C014200 */ lui $at, 0x4200 /* 352728 E003E2E8 44814000 */ mtc1 $at, $f8 /* 35272C E003E2EC 2404005C */ addiu $a0, $zero, 0x5c @@ -203,7 +203,7 @@ glabel func_E003E000 /* 35273C E003E2FC E4D00008 */ swc1 $f16, 8($a2) /* 352740 E003E300 C7B200C4 */ lwc1 $f18, 0xc4($sp) /* 352744 E003E304 460A2102 */ mul.s $f4, $f4, $f10 -/* 352748 E003E308 00000000 */ nop +/* 352748 E003E308 00000000 */ nop /* 35274C E003E30C E4D2000C */ swc1 $f18, 0xc($a2) /* 352750 E003E310 ACC3006C */ sw $v1, 0x6c($a2) /* 352754 E003E314 240300E5 */ addiu $v1, $zero, 0xe5 @@ -221,7 +221,7 @@ glabel func_E003E000 /* 352784 E003E344 44817000 */ mtc1 $at, $f14 /* 352788 E003E348 46000021 */ cvt.d.s $f0, $f0 /* 35278C E003E34C 46220002 */ mul.d $f0, $f0, $f2 -/* 352790 E003E350 00000000 */ nop +/* 352790 E003E350 00000000 */ nop /* 352794 E003E354 E4D80020 */ swc1 $f24, 0x20($a2) /* 352798 E003E358 E4D40024 */ swc1 $f20, 0x24($a2) /* 35279C E003E35C ACC00028 */ sw $zero, 0x28($a2) @@ -233,7 +233,7 @@ glabel func_E003E000 /* 3527B4 E003E374 E4D20030 */ swc1 $f18, 0x30($a2) /* 3527B8 E003E378 C7B00070 */ lwc1 $f16, 0x70($sp) /* 3527BC E003E37C 460A1082 */ mul.s $f2, $f2, $f10 -/* 3527C0 E003E380 00000000 */ nop +/* 3527C0 E003E380 00000000 */ nop /* 3527C4 E003E384 E4D00034 */ swc1 $f16, 0x34($a2) /* 3527C8 E003E388 ACC00038 */ sw $zero, 0x38($a2) /* 3527CC E003E38C E4DA003C */ swc1 $f26, 0x3c($a2) diff --git a/asm/nonmatchings/code_352440/func_E003E3F8.s b/asm/nonmatchings/code_352440/func_E003E3F8.s index de1333a43e..7e0e7b7b9b 100644 --- a/asm/nonmatchings/code_352440/func_E003E3F8.s +++ b/asm/nonmatchings/code_352440/func_E003E3F8.s @@ -3,4 +3,4 @@ glabel func_E003E3F8 /* 352838 E003E3F8 03E00008 */ jr $ra -/* 35283C E003E3FC 00000000 */ nop +/* 35283C E003E3FC 00000000 */ nop diff --git a/asm/nonmatchings/code_352440/func_E003E400.s b/asm/nonmatchings/code_352440/func_E003E400.s index 1ef922aa99..9c5ab0ccf5 100644 --- a/asm/nonmatchings/code_352440/func_E003E400.s +++ b/asm/nonmatchings/code_352440/func_E003E400.s @@ -16,9 +16,9 @@ glabel func_E003E400 /* 35286C E003E42C 04A10005 */ bgez $a1, .LE003E444 /* 352870 E003E430 AC620070 */ sw $v0, 0x70($v1) /* 352874 E003E434 0C080128 */ jal func_E02004A0 -/* 352878 E003E438 00000000 */ nop +/* 352878 E003E438 00000000 */ nop /* 35287C E003E43C 0800F978 */ j .LE003E5E0 -/* 352880 E003E440 00000000 */ nop +/* 352880 E003E440 00000000 */ nop .LE003E444: /* 352884 E003E444 8C820008 */ lw $v0, 8($a0) /* 352888 E003E448 18400065 */ blez $v0, .LE003E5E0 @@ -39,31 +39,31 @@ glabel func_E003E400 /* 3528C4 E003E484 D430E898 */ ldc1 $f16, %lo(D_E003E898)($at) .LE003E488: /* 3528C8 E003E488 15000020 */ bnez $t0, .LE003E50C -/* 3528CC E003E48C 00000000 */ nop +/* 3528CC E003E48C 00000000 */ nop /* 3528D0 E003E490 C4A2FFAC */ lwc1 $f2, -0x54($a1) /* 3528D4 E003E494 460010A1 */ cvt.d.s $f2, $f2 /* 3528D8 E003E498 462E1082 */ mul.d $f2, $f2, $f14 -/* 3528DC E003E49C 00000000 */ nop +/* 3528DC E003E49C 00000000 */ nop /* 3528E0 E003E4A0 C4A0FFB0 */ lwc1 $f0, -0x50($a1) /* 3528E4 E003E4A4 46000021 */ cvt.d.s $f0, $f0 /* 3528E8 E003E4A8 462E0002 */ mul.d $f0, $f0, $f14 -/* 3528EC E003E4AC 00000000 */ nop +/* 3528EC E003E4AC 00000000 */ nop /* 3528F0 E003E4B0 C4A4FFB4 */ lwc1 $f4, -0x4c($a1) /* 3528F4 E003E4B4 46002121 */ cvt.d.s $f4, $f4 /* 3528F8 E003E4B8 462E2102 */ mul.d $f4, $f4, $f14 -/* 3528FC E003E4BC 00000000 */ nop +/* 3528FC E003E4BC 00000000 */ nop /* 352900 E003E4C0 8CA30004 */ lw $v1, 4($a1) /* 352904 E003E4C4 01231023 */ subu $v0, $t1, $v1 /* 352908 E003E4C8 44823000 */ mtc1 $v0, $f6 -/* 35290C E003E4CC 00000000 */ nop +/* 35290C E003E4CC 00000000 */ nop /* 352910 E003E4D0 468031A1 */ cvt.d.w $f6, $f6 /* 352914 E003E4D4 46343182 */ mul.d $f6, $f6, $f20 -/* 352918 E003E4D8 00000000 */ nop +/* 352918 E003E4D8 00000000 */ nop /* 35291C E003E4DC 462010A0 */ cvt.s.d $f2, $f2 /* 352920 E003E4E0 46200020 */ cvt.s.d $f0, $f0 /* 352924 E003E4E4 E4A0FFB0 */ swc1 $f0, -0x50($a1) /* 352928 E003E4E8 44830000 */ mtc1 $v1, $f0 -/* 35292C E003E4EC 00000000 */ nop +/* 35292C E003E4EC 00000000 */ nop /* 352930 E003E4F0 46800021 */ cvt.d.w $f0, $f0 /* 352934 E003E4F4 46202120 */ cvt.s.d $f4, $f4 /* 352938 E003E4F8 46260000 */ add.d $f0, $f0, $f6 @@ -73,23 +73,23 @@ glabel func_E003E400 /* 352948 E003E508 E4B60004 */ swc1 $f22, 4($a1) .LE003E50C: /* 35294C E003E50C 10E00019 */ beqz $a3, .LE003E574 -/* 352950 E003E510 00000000 */ nop +/* 352950 E003E510 00000000 */ nop /* 352954 E003E514 C4A60004 */ lwc1 $f6, 4($a1) /* 352958 E003E518 468031A1 */ cvt.d.w $f6, $f6 /* 35295C E003E51C 46323182 */ mul.d $f6, $f6, $f18 -/* 352960 E003E520 00000000 */ nop +/* 352960 E003E520 00000000 */ nop /* 352964 E003E524 C4A4FFAC */ lwc1 $f4, -0x54($a1) /* 352968 E003E528 46002121 */ cvt.d.s $f4, $f4 /* 35296C E003E52C 462C2102 */ mul.d $f4, $f4, $f12 -/* 352970 E003E530 00000000 */ nop +/* 352970 E003E530 00000000 */ nop /* 352974 E003E534 C4A2FFB0 */ lwc1 $f2, -0x50($a1) /* 352978 E003E538 460010A1 */ cvt.d.s $f2, $f2 /* 35297C E003E53C 462C1082 */ mul.d $f2, $f2, $f12 -/* 352980 E003E540 00000000 */ nop +/* 352980 E003E540 00000000 */ nop /* 352984 E003E544 C4A0FFB4 */ lwc1 $f0, -0x4c($a1) /* 352988 E003E548 46000021 */ cvt.d.s $f0, $f0 /* 35298C E003E54C 462C0002 */ mul.d $f0, $f0, $f12 -/* 352990 E003E550 00000000 */ nop +/* 352990 E003E550 00000000 */ nop /* 352994 E003E554 4620358D */ trunc.w.d $f22, $f6 /* 352998 E003E558 E4B60004 */ swc1 $f22, 4($a1) /* 35299C E003E55C 46202120 */ cvt.s.d $f4, $f4 @@ -102,7 +102,7 @@ glabel func_E003E400 /* 3529B4 E003E574 C4A20000 */ lwc1 $f2, ($a1) /* 3529B8 E003E578 460010A1 */ cvt.d.s $f2, $f2 /* 3529BC E003E57C 46301082 */ mul.d $f2, $f2, $f16 -/* 3529C0 E003E580 00000000 */ nop +/* 3529C0 E003E580 00000000 */ nop /* 3529C4 E003E584 C4AAFFA0 */ lwc1 $f10, -0x60($a1) /* 3529C8 E003E588 C4A0FFAC */ lwc1 $f0, -0x54($a1) /* 3529CC E003E58C C4A8FFA4 */ lwc1 $f8, -0x5c($a1) diff --git a/asm/nonmatchings/code_352440/func_E003E638.s b/asm/nonmatchings/code_352440/func_E003E638.s index f63b7a1d3a..1de085138a 100644 --- a/asm/nonmatchings/code_352440/func_E003E638.s +++ b/asm/nonmatchings/code_352440/func_E003E638.s @@ -142,5 +142,5 @@ glabel func_E003E638 /* 352C9C E003E85C 8FB00090 */ lw $s0, 0x90($sp) /* 352CA0 E003E860 03E00008 */ jr $ra /* 352CA4 E003E864 27BD00B0 */ addiu $sp, $sp, 0xb0 -/* 352CA8 E003E868 00000000 */ nop -/* 352CAC E003E86C 00000000 */ nop +/* 352CA8 E003E868 00000000 */ nop +/* 352CAC E003E86C 00000000 */ nop diff --git a/asm/nonmatchings/code_353300/func_E0040000.s b/asm/nonmatchings/code_353300/func_E0040000.s index d92a4baec8..ae2942d559 100644 --- a/asm/nonmatchings/code_353300/func_E0040000.s +++ b/asm/nonmatchings/code_353300/func_E0040000.s @@ -44,7 +44,7 @@ glabel func_E0040000 /* 353398 E0040098 AE22000C */ sw $v0, 0xc($s1) .LE004009C: /* 35339C E004009C 08010027 */ j .LE004009C -/* 3533A0 E00400A0 00000000 */ nop +/* 3533A0 E00400A0 00000000 */ nop .LE00400A4: /* 3533A4 E00400A4 00101100 */ sll $v0, $s0, 4 /* 3533A8 E00400A8 AC700000 */ sw $s0, ($v1) @@ -57,15 +57,15 @@ glabel func_E0040000 /* 3533C4 E00400C4 90220848 */ lbu $v0, %lo(D_E0040848)($at) /* 3533C8 E00400C8 C7A00060 */ lwc1 $f0, 0x60($sp) /* 3533CC E00400CC 44821000 */ mtc1 $v0, $f2 -/* 3533D0 E00400D0 00000000 */ nop +/* 3533D0 E00400D0 00000000 */ nop /* 3533D4 E00400D4 468010A0 */ cvt.s.w $f2, $f2 /* 3533D8 E00400D8 46020002 */ mul.s $f0, $f0, $f2 -/* 3533DC E00400DC 00000000 */ nop +/* 3533DC E00400DC 00000000 */ nop /* 3533E0 E00400E0 3C01E004 */ lui $at, %hi(D_E0040890) /* 3533E4 E00400E4 D4220890 */ ldc1 $f2, %lo(D_E0040890)($at) /* 3533E8 E00400E8 46000021 */ cvt.d.s $f0, $f0 /* 3533EC E00400EC 46220002 */ mul.d $f0, $f0, $f2 -/* 3533F0 E00400F0 00000000 */ nop +/* 3533F0 E00400F0 00000000 */ nop /* 3533F4 E00400F4 3C013F80 */ lui $at, 0x3f80 /* 3533F8 E00400F8 44811000 */ mtc1 $at, $f2 /* 3533FC E00400FC AC60001C */ sw $zero, 0x1c($v1) diff --git a/asm/nonmatchings/code_353300/func_E0040148.s b/asm/nonmatchings/code_353300/func_E0040148.s index 94c6234e51..8222c7e627 100644 --- a/asm/nonmatchings/code_353300/func_E0040148.s +++ b/asm/nonmatchings/code_353300/func_E0040148.s @@ -3,4 +3,4 @@ glabel func_E0040148 /* 353448 E0040148 03E00008 */ jr $ra -/* 35344C E004014C 00000000 */ nop +/* 35344C E004014C 00000000 */ nop diff --git a/asm/nonmatchings/code_353300/func_E0040150.s b/asm/nonmatchings/code_353300/func_E0040150.s index ee7a99d53c..c932eb6bb1 100644 --- a/asm/nonmatchings/code_353300/func_E0040150.s +++ b/asm/nonmatchings/code_353300/func_E0040150.s @@ -17,7 +17,7 @@ glabel func_E0040150 /* 35347C E004017C C460FFFC */ lwc1 $f0, -4($v1) /* 353480 E0040180 46001000 */ add.s $f0, $f2, $f0 /* 353484 E0040184 4600303C */ c.lt.s $f6, $f0 -/* 353488 E0040188 00000000 */ nop +/* 353488 E0040188 00000000 */ nop /* 35348C E004018C 45000003 */ bc1f .LE004019C /* 353490 E0040190 E460FFF8 */ swc1 $f0, -8($v1) /* 353494 E0040194 46060001 */ sub.s $f0, $f0, $f6 @@ -25,9 +25,9 @@ glabel func_E0040150 .LE004019C: /* 35349C E004019C C460FFF8 */ lwc1 $f0, -8($v1) /* 3534A0 E00401A0 4608003C */ c.lt.s $f0, $f8 -/* 3534A4 E00401A4 00000000 */ nop +/* 3534A4 E00401A4 00000000 */ nop /* 3534A8 E00401A8 45000003 */ bc1f .LE00401B8 -/* 3534AC E00401AC 00000000 */ nop +/* 3534AC E00401AC 00000000 */ nop /* 3534B0 E00401B0 46060000 */ add.s $f0, $f0, $f6 /* 3534B4 E00401B4 E460FFF8 */ swc1 $f0, -8($v1) .LE00401B8: @@ -35,7 +35,7 @@ glabel func_E0040150 /* 3534BC E00401BC C4600004 */ lwc1 $f0, 4($v1) /* 3534C0 E00401C0 46001000 */ add.s $f0, $f2, $f0 /* 3534C4 E00401C4 4600203C */ c.lt.s $f4, $f0 -/* 3534C8 E00401C8 00000000 */ nop +/* 3534C8 E00401C8 00000000 */ nop /* 3534CC E00401CC 45000003 */ bc1f .LE00401DC /* 3534D0 E00401D0 E4600000 */ swc1 $f0, ($v1) /* 3534D4 E00401D4 46040001 */ sub.s $f0, $f0, $f4 @@ -43,7 +43,7 @@ glabel func_E0040150 .LE00401DC: /* 3534DC E00401DC C4600000 */ lwc1 $f0, ($v1) /* 3534E0 E00401E0 4608003C */ c.lt.s $f0, $f8 -/* 3534E4 E00401E4 00000000 */ nop +/* 3534E4 E00401E4 00000000 */ nop /* 3534E8 E00401E8 45000003 */ bc1f .LE00401F8 /* 3534EC E00401EC 24A50001 */ addiu $a1, $a1, 1 /* 3534F0 E00401F0 46040000 */ add.s $f0, $f0, $f4 @@ -55,4 +55,4 @@ glabel func_E0040150 /* 353504 E0040204 24630034 */ addiu $v1, $v1, 0x34 .LE0040208: /* 353508 E0040208 03E00008 */ jr $ra -/* 35350C E004020C 00000000 */ nop +/* 35350C E004020C 00000000 */ nop diff --git a/asm/nonmatchings/code_353300/func_E0040210.s b/asm/nonmatchings/code_353300/func_E0040210.s index 88edb6c948..f23bcc1b40 100644 --- a/asm/nonmatchings/code_353300/func_E0040210.s +++ b/asm/nonmatchings/code_353300/func_E0040210.s @@ -39,11 +39,11 @@ glabel func_E0040210 /* 353598 E0040298 3C01459C */ lui $at, 0x459c /* 35359C E004029C 34214000 */ ori $at, $at, 0x4000 /* 3535A0 E00402A0 44811000 */ mtc1 $at, $f2 -/* 3535A4 E00402A4 00000000 */ nop +/* 3535A4 E00402A4 00000000 */ nop /* 3535A8 E00402A8 46020000 */ add.s $f0, $f0, $f2 /* 3535AC E00402AC 4600010D */ trunc.w.s $f4, $f0 /* 3535B0 E00402B0 44032000 */ mfc1 $v1, $f4 -/* 3535B4 E00402B4 00000000 */ nop +/* 3535B4 E00402B4 00000000 */ nop /* 3535B8 E00402B8 04610003 */ bgez $v1, .LE00402C8 /* 3535BC E00402BC 27B00028 */ addiu $s0, $sp, 0x28 /* 3535C0 E00402C0 080100B5 */ j .LE00402D4 @@ -58,13 +58,13 @@ glabel func_E0040210 /* 3535DC E00402DC D4200898 */ ldc1 $f0, %lo(D_E0040898)($at) /* 3535E0 E00402E0 460010A1 */ cvt.d.s $f2, $f2 /* 3535E4 E00402E4 4620103C */ c.lt.d $f2, $f0 -/* 3535E8 E00402E8 00000000 */ nop +/* 3535E8 E00402E8 00000000 */ nop /* 3535EC E00402EC 45000008 */ bc1f .LE0040310 /* 3535F0 E00402F0 0200202D */ daddu $a0, $s0, $zero /* 3535F4 E00402F4 3C01E004 */ lui $at, %hi(D_E00408A0) /* 3535F8 E00402F8 D42008A0 */ ldc1 $f0, %lo(D_E00408A0)($at) /* 3535FC E00402FC 4622003C */ c.lt.d $f0, $f2 -/* 353600 E0040300 00000000 */ nop +/* 353600 E0040300 00000000 */ nop /* 353604 E0040304 45030002 */ bc1tl .LE0040310 /* 353608 E0040308 0000182D */ daddu $v1, $zero, $zero /* 35360C E004030C 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/code_353300/func_E0040348.s b/asm/nonmatchings/code_353300/func_E0040348.s index 361fc39e7a..171557c167 100644 --- a/asm/nonmatchings/code_353300/func_E0040348.s +++ b/asm/nonmatchings/code_353300/func_E0040348.s @@ -36,7 +36,7 @@ glabel func_E0040348 /* 3536C4 E00403C4 24E20008 */ addiu $v0, $a3, 8 /* 3536C8 E00403C8 AE820000 */ sw $v0, ($s4) /* 3536CC E00403CC 46040002 */ mul.s $f0, $f0, $f4 -/* 3536D0 E00403D0 00000000 */ nop +/* 3536D0 E00403D0 00000000 */ nop /* 3536D4 E00403D4 8C62001C */ lw $v0, 0x1c($v1) /* 3536D8 E00403D8 3C15800B */ lui $s5, %hi(gCameras) /* 3536DC E00403DC 26B51D80 */ addiu $s5, $s5, %lo(gCameras) @@ -44,7 +44,7 @@ glabel func_E0040348 /* 3536E4 E00403E4 ACE20004 */ sw $v0, 4($a3) /* 3536E8 E00403E8 8E030000 */ lw $v1, ($s0) /* 3536EC E00403EC 46041082 */ mul.s $f2, $f2, $f4 -/* 3536F0 E00403F0 00000000 */ nop +/* 3536F0 E00403F0 00000000 */ nop /* 3536F4 E00403F4 00031080 */ sll $v0, $v1, 2 /* 3536F8 E00403F8 00431021 */ addu $v0, $v0, $v1 /* 3536FC E00403FC 00021080 */ sll $v0, $v0, 2 @@ -103,27 +103,27 @@ glabel func_E0040348 /* 3537D0 E00404D0 8502000E */ lh $v0, 0xe($t0) /* 3537D4 E00404D4 24E30018 */ addiu $v1, $a3, 0x18 /* 3537D8 E00404D8 44821000 */ mtc1 $v0, $f2 -/* 3537DC E00404DC 00000000 */ nop +/* 3537DC E00404DC 00000000 */ nop /* 3537E0 E00404E0 468010A0 */ cvt.s.w $f2, $f2 /* 3537E4 E00404E4 46041082 */ mul.s $f2, $f2, $f4 -/* 3537E8 E00404E8 00000000 */ nop +/* 3537E8 E00404E8 00000000 */ nop /* 3537EC E00404EC AE830000 */ sw $v1, ($s4) /* 3537F0 E00404F0 85020010 */ lh $v0, 0x10($t0) /* 3537F4 E00404F4 24E30020 */ addiu $v1, $a3, 0x20 /* 3537F8 E00404F8 44820000 */ mtc1 $v0, $f0 -/* 3537FC E00404FC 00000000 */ nop +/* 3537FC E00404FC 00000000 */ nop /* 353800 E0040500 46800020 */ cvt.s.w $f0, $f0 /* 353804 E0040504 46040002 */ mul.s $f0, $f0, $f4 -/* 353808 E0040508 00000000 */ nop +/* 353808 E0040508 00000000 */ nop /* 35380C E004050C AE830000 */ sw $v1, ($s4) /* 353810 E0040510 4600118D */ trunc.w.s $f6, $f2 /* 353814 E0040514 44023000 */ mfc1 $v0, $f6 -/* 353818 E0040518 00000000 */ nop +/* 353818 E0040518 00000000 */ nop /* 35381C E004051C 30420FFF */ andi $v0, $v0, 0xfff /* 353820 E0040520 00021300 */ sll $v0, $v0, 0xc /* 353824 E0040524 4600018D */ trunc.w.s $f6, $f0 /* 353828 E0040528 44033000 */ mfc1 $v1, $f6 -/* 35382C E004052C 00000000 */ nop +/* 35382C E004052C 00000000 */ nop /* 353830 E0040530 30630FFF */ andi $v1, $v1, 0xfff /* 353834 E0040534 00641825 */ or $v1, $v1, $a0 /* 353838 E0040538 00431025 */ or $v0, $v0, $v1 @@ -135,27 +135,27 @@ glabel func_E0040348 /* 353850 E0040550 85020010 */ lh $v0, 0x10($t0) /* 353854 E0040554 00641821 */ addu $v1, $v1, $a0 /* 353858 E0040558 44831000 */ mtc1 $v1, $f2 -/* 35385C E004055C 00000000 */ nop +/* 35385C E004055C 00000000 */ nop /* 353860 E0040560 468010A0 */ cvt.s.w $f2, $f2 /* 353864 E0040564 46041082 */ mul.s $f2, $f2, $f4 -/* 353868 E0040568 00000000 */ nop +/* 353868 E0040568 00000000 */ nop /* 35386C E004056C 8503000C */ lh $v1, 0xc($t0) /* 353870 E0040570 24E40030 */ addiu $a0, $a3, 0x30 /* 353874 E0040574 00431021 */ addu $v0, $v0, $v1 /* 353878 E0040578 44820000 */ mtc1 $v0, $f0 -/* 35387C E004057C 00000000 */ nop +/* 35387C E004057C 00000000 */ nop /* 353880 E0040580 46800020 */ cvt.s.w $f0, $f0 /* 353884 E0040584 46040002 */ mul.s $f0, $f0, $f4 -/* 353888 E0040588 00000000 */ nop +/* 353888 E0040588 00000000 */ nop /* 35388C E004058C AE840000 */ sw $a0, ($s4) /* 353890 E0040590 4600118D */ trunc.w.s $f6, $f2 /* 353894 E0040594 44023000 */ mfc1 $v0, $f6 -/* 353898 E0040598 00000000 */ nop +/* 353898 E0040598 00000000 */ nop /* 35389C E004059C 30420FFF */ andi $v0, $v0, 0xfff /* 3538A0 E00405A0 00021300 */ sll $v0, $v0, 0xc /* 3538A4 E00405A4 4600018D */ trunc.w.s $f6, $f0 /* 3538A8 E00405A8 44033000 */ mfc1 $v1, $f6 -/* 3538AC E00405AC 00000000 */ nop +/* 3538AC E00405AC 00000000 */ nop /* 3538B0 E00405B0 30630FFF */ andi $v1, $v1, 0xfff /* 3538B4 E00405B4 00431025 */ or $v0, $v0, $v1 /* 3538B8 E00405B8 ACE2002C */ sw $v0, 0x2c($a3) @@ -251,11 +251,11 @@ glabel func_E0040348 /* 353A1C E004071C C6420010 */ lwc1 $f2, 0x10($s2) /* 353A20 E0040720 C6400030 */ lwc1 $f0, 0x30($s2) /* 353A24 E0040724 46001002 */ mul.s $f0, $f2, $f0 -/* 353A28 E0040728 00000000 */ nop +/* 353A28 E0040728 00000000 */ nop /* 353A2C E004072C 44050000 */ mfc1 $a1, $f0 /* 353A30 E0040730 C640002C */ lwc1 $f0, 0x2c($s2) /* 353A34 E0040734 46001002 */ mul.s $f0, $f2, $f0 -/* 353A38 E0040738 00000000 */ nop +/* 353A38 E0040738 00000000 */ nop /* 353A3C E004073C 0220202D */ daddu $a0, $s1, $zero /* 353A40 E0040740 44071000 */ mfc1 $a3, $f2 /* 353A44 E0040744 3C120001 */ lui $s2, 1 @@ -319,5 +319,5 @@ glabel func_E0040348 /* 353B2C E004082C 8FB000D8 */ lw $s0, 0xd8($sp) /* 353B30 E0040830 03E00008 */ jr $ra /* 353B34 E0040834 27BD00F8 */ addiu $sp, $sp, 0xf8 -/* 353B38 E0040838 00000000 */ nop -/* 353B3C E004083C 00000000 */ nop +/* 353B38 E0040838 00000000 */ nop +/* 353B3C E004083C 00000000 */ nop diff --git a/asm/nonmatchings/code_3547A0/func_E0042000.s b/asm/nonmatchings/code_3547A0/func_E0042000.s index 6960ce9a7b..3c2efa5e6e 100644 --- a/asm/nonmatchings/code_3547A0/func_E0042000.s +++ b/asm/nonmatchings/code_3547A0/func_E0042000.s @@ -49,7 +49,7 @@ glabel func_E0042000 /* 354850 E00420B0 AE11000C */ sw $s1, 0xc($s0) .LE00420B4: /* 354854 E00420B4 0801082D */ j .LE00420B4 -/* 354858 E00420B8 00000000 */ nop +/* 354858 E00420B8 00000000 */ nop .LE00420BC: /* 35485C E00420BC AE340000 */ sw $s4, ($s1) /* 354860 E00420C0 E63E0004 */ swc1 $f30, 4($s1) @@ -81,17 +81,17 @@ glabel func_E0042000 /* 3548C4 E0042124 3C013E80 */ lui $at, 0x3e80 /* 3548C8 E0042128 44811000 */ mtc1 $at, $f2 /* 3548CC E004212C 4482A000 */ mtc1 $v0, $f20 -/* 3548D0 E0042130 00000000 */ nop +/* 3548D0 E0042130 00000000 */ nop /* 3548D4 E0042134 4680A520 */ cvt.s.w $f20, $f20 /* 3548D8 E0042138 4602A502 */ mul.s $f20, $f20, $f2 -/* 3548DC E004213C 00000000 */ nop +/* 3548DC E004213C 00000000 */ nop /* 3548E0 E0042140 AE340000 */ sw $s4, ($s1) /* 3548E4 E0042144 E61EFFE0 */ swc1 $f30, -0x20($s0) /* 3548E8 E0042148 C7A200C4 */ lwc1 $f2, 0xc4($sp) /* 3548EC E004214C 00004012 */ mflo $t0 /* 3548F0 E0042150 00081080 */ sll $v0, $t0, 2 /* 3548F4 E0042154 4482C000 */ mtc1 $v0, $f24 -/* 3548F8 E0042158 00000000 */ nop +/* 3548F8 E0042158 00000000 */ nop /* 3548FC E004215C 4680C620 */ cvt.s.w $f24, $f24 /* 354900 E0042160 46181600 */ add.s $f24, $f2, $f24 /* 354904 E0042164 C7A200B8 */ lwc1 $f2, 0xb8($sp) @@ -107,7 +107,7 @@ glabel func_E0042000 /* 35492C E004218C 0C080140 */ jal func_E0200500 /* 354930 E0042190 46000586 */ mov.s $f22, $f0 /* 354934 E0042194 4600B582 */ mul.s $f22, $f22, $f0 -/* 354938 E0042198 00000000 */ nop +/* 354938 E0042198 00000000 */ nop /* 35493C E004219C 26520001 */ addiu $s2, $s2, 1 /* 354940 E00421A0 26310038 */ addiu $s1, $s1, 0x38 /* 354944 E00421A4 4600C306 */ mov.s $f12, $f24 @@ -122,7 +122,7 @@ glabel func_E0042000 /* 354968 E00421C8 E6140004 */ swc1 $f20, 4($s0) /* 35496C E00421CC 4600A521 */ cvt.d.s $f20, $f20 /* 354970 E00421D0 4600B582 */ mul.s $f22, $f22, $f0 -/* 354974 E00421D4 00000000 */ nop +/* 354974 E00421D4 00000000 */ nop /* 354978 E00421D8 463AA503 */ div.d $f20, $f20, $f26 /* 35497C E00421DC 4620A520 */ cvt.s.d $f20, $f20 /* 354980 E00421E0 0253102A */ slt $v0, $s2, $s3 diff --git a/asm/nonmatchings/code_3547A0/func_E004222C.s b/asm/nonmatchings/code_3547A0/func_E004222C.s index 80aebf4af4..c11951ea3a 100644 --- a/asm/nonmatchings/code_3547A0/func_E004222C.s +++ b/asm/nonmatchings/code_3547A0/func_E004222C.s @@ -3,4 +3,4 @@ glabel func_E004222C /* 3549CC E004222C 03E00008 */ jr $ra -/* 3549D0 E0042230 00000000 */ nop +/* 3549D0 E0042230 00000000 */ nop diff --git a/asm/nonmatchings/code_3547A0/func_E0042234.s b/asm/nonmatchings/code_3547A0/func_E0042234.s index 118638acfe..58eb00b301 100644 --- a/asm/nonmatchings/code_3547A0/func_E0042234.s +++ b/asm/nonmatchings/code_3547A0/func_E0042234.s @@ -14,19 +14,19 @@ glabel func_E0042234 /* 3549F8 E0042258 04A10005 */ bgez $a1, .LE0042270 /* 3549FC E004225C AC620034 */ sw $v0, 0x34($v1) /* 354A00 E0042260 0C080128 */ jal func_E02004A0 -/* 354A04 E0042264 00000000 */ nop +/* 354A04 E0042264 00000000 */ nop /* 354A08 E0042268 080108DA */ j .LE0042368 -/* 354A0C E004226C 00000000 */ nop +/* 354A0C E004226C 00000000 */ nop .LE0042270: /* 354A10 E0042270 28A6000A */ slti $a2, $a1, 0xa /* 354A14 E0042274 10C00009 */ beqz $a2, .LE004229C -/* 354A18 E0042278 00000000 */ nop +/* 354A18 E0042278 00000000 */ nop /* 354A1C E004227C 3C01E004 */ lui $at, %hi(D_E00427B0) /* 354A20 E0042280 D42227B0 */ ldc1 $f2, %lo(D_E00427B0)($at) /* 354A24 E0042284 C460002C */ lwc1 $f0, 0x2c($v1) /* 354A28 E0042288 46800021 */ cvt.d.w $f0, $f0 /* 354A2C E004228C 46220002 */ mul.d $f0, $f0, $f2 -/* 354A30 E0042290 00000000 */ nop +/* 354A30 E0042290 00000000 */ nop /* 354A34 E0042294 4620040D */ trunc.w.d $f16, $f0 /* 354A38 E0042298 E470002C */ swc1 $f16, 0x2c($v1) .LE004229C: @@ -45,19 +45,19 @@ glabel func_E0042234 /* 354A68 E00422C8 C4660004 */ lwc1 $f6, 4($v1) /* 354A6C E00422CC 460031A1 */ cvt.d.s $f6, $f6 /* 354A70 E00422D0 462E3182 */ mul.d $f6, $f6, $f14 -/* 354A74 E00422D4 00000000 */ nop +/* 354A74 E00422D4 00000000 */ nop /* 354A78 E00422D8 C4620004 */ lwc1 $f2, 4($v1) /* 354A7C E00422DC C460FFEC */ lwc1 $f0, -0x14($v1) /* 354A80 E00422E0 46001082 */ mul.s $f2, $f2, $f0 -/* 354A84 E00422E4 00000000 */ nop +/* 354A84 E00422E4 00000000 */ nop /* 354A88 E00422E8 C46A0004 */ lwc1 $f10, 4($v1) /* 354A8C E00422EC C460FFF0 */ lwc1 $f0, -0x10($v1) /* 354A90 E00422F0 46005282 */ mul.s $f10, $f10, $f0 -/* 354A94 E00422F4 00000000 */ nop +/* 354A94 E00422F4 00000000 */ nop /* 354A98 E00422F8 C4680004 */ lwc1 $f8, 4($v1) /* 354A9C E00422FC C460FFF4 */ lwc1 $f0, -0xc($v1) /* 354AA0 E0042300 46004202 */ mul.s $f8, $f8, $f0 -/* 354AA4 E0042304 00000000 */ nop +/* 354AA4 E0042304 00000000 */ nop /* 354AA8 E0042308 C464FFE0 */ lwc1 $f4, -0x20($v1) /* 354AAC E004230C 46022100 */ add.s $f4, $f4, $f2 /* 354AB0 E0042310 C462FFE4 */ lwc1 $f2, -0x1c($v1) diff --git a/asm/nonmatchings/code_3547A0/func_E00423B8.s b/asm/nonmatchings/code_3547A0/func_E00423B8.s index 09d91d79c0..d924682276 100644 --- a/asm/nonmatchings/code_3547A0/func_E00423B8.s +++ b/asm/nonmatchings/code_3547A0/func_E00423B8.s @@ -243,6 +243,6 @@ glabel func_E00423B8 /* 354F08 E0042768 D7B400C8 */ ldc1 $f20, 0xc8($sp) /* 354F0C E004276C 03E00008 */ jr $ra /* 354F10 E0042770 27BD00D8 */ addiu $sp, $sp, 0xd8 -/* 354F14 E0042774 00000000 */ nop -/* 354F18 E0042778 00000000 */ nop -/* 354F1C E004277C 00000000 */ nop +/* 354F14 E0042774 00000000 */ nop +/* 354F18 E0042778 00000000 */ nop +/* 354F1C E004277C 00000000 */ nop diff --git a/asm/nonmatchings/code_354F60/func_E0044000.s b/asm/nonmatchings/code_354F60/func_E0044000.s index 821840cfb1..c20dfe5ea2 100644 --- a/asm/nonmatchings/code_354F60/func_E0044000.s +++ b/asm/nonmatchings/code_354F60/func_E0044000.s @@ -50,7 +50,7 @@ glabel func_E0044000 /* 355014 E00440B4 AE03000C */ sw $v1, 0xc($s0) .LE00440B8: /* 355018 E00440B8 0801102E */ j .LE00440B8 -/* 35501C E00440BC 00000000 */ nop +/* 35501C E00440BC 00000000 */ nop .LE00440C0: /* 355020 E00440C0 24020006 */ addiu $v0, $zero, 6 /* 355024 E00440C4 56620004 */ bnel $s3, $v0, .LE00440D8 @@ -75,7 +75,7 @@ glabel func_E0044000 /* 35506C E004410C 24700018 */ addiu $s0, $v1, 0x18 /* 355070 E0044110 2654FFFF */ addiu $s4, $s2, -1 /* 355074 E0044114 44940000 */ mtc1 $s4, $f0 -/* 355078 E0044118 00000000 */ nop +/* 355078 E0044118 00000000 */ nop /* 35507C E004411C 46800020 */ cvt.s.w $f0, $f0 /* 355080 E0044120 4480D000 */ mtc1 $zero, $f26 /* 355084 E0044124 3C01E004 */ lui $at, %hi(D_E0044E20) @@ -88,26 +88,26 @@ glabel func_E0044000 /* 3550A0 E0044140 E7A20028 */ swc1 $f2, 0x28($sp) .LE0044144: /* 3550A4 E0044144 44910000 */ mtc1 $s1, $f0 -/* 3550A8 E0044148 00000000 */ nop +/* 3550A8 E0044148 00000000 */ nop /* 3550AC E004414C 46800020 */ cvt.s.w $f0, $f0 /* 3550B0 E0044150 C7AA0028 */ lwc1 $f10, 0x28($sp) /* 3550B4 E0044154 2A620002 */ slti $v0, $s3, 2 /* 3550B8 E0044158 46005582 */ mul.s $f22, $f10, $f0 -/* 3550BC E004415C 00000000 */ nop +/* 3550BC E004415C 00000000 */ nop /* 3550C0 E0044160 54400007 */ bnel $v0, $zero, .LE0044180 /* 3550C4 E0044164 461AB600 */ add.s $f24, $f22, $f26 /* 3550C8 E0044168 0C080138 */ jal func_E02004E0 /* 3550CC E004416C 24040167 */ addiu $a0, $zero, 0x167 /* 3550D0 E0044170 44820000 */ mtc1 $v0, $f0 -/* 3550D4 E0044174 00000000 */ nop +/* 3550D4 E0044174 00000000 */ nop /* 3550D8 E0044178 46800020 */ cvt.s.w $f0, $f0 /* 3550DC E004417C 4600B600 */ add.s $f24, $f22, $f0 .LE0044180: /* 3550E0 E0044180 3C014120 */ lui $at, 0x4120 /* 3550E4 E0044184 4481A000 */ mtc1 $at, $f20 -/* 3550E8 E0044188 00000000 */ nop +/* 3550E8 E0044188 00000000 */ nop /* 3550EC E004418C 4614B502 */ mul.s $f20, $f22, $f20 -/* 3550F0 E0044190 00000000 */ nop +/* 3550F0 E0044190 00000000 */ nop /* 3550F4 E0044194 3C0142B4 */ lui $at, 0x42b4 /* 3550F8 E0044198 44810000 */ mtc1 $at, $f0 /* 3550FC E004419C 4600C306 */ mov.s $f12, $f24 @@ -124,22 +124,22 @@ glabel func_E0044000 /* 355128 E00441C8 3C01E004 */ lui $at, %hi(D_E0044E30) /* 35512C E00441CC D42A4E30 */ ldc1 $f10, %lo(D_E0044E30)($at) /* 355130 E00441D0 462A1202 */ mul.d $f8, $f2, $f10 -/* 355134 E00441D4 00000000 */ nop +/* 355134 E00441D4 00000000 */ nop /* 355138 E00441D8 463E1082 */ mul.d $f2, $f2, $f30 -/* 35513C E00441DC 00000000 */ nop +/* 35513C E00441DC 00000000 */ nop /* 355140 E00441E0 C7AA0094 */ lwc1 $f10, 0x94($sp) /* 355144 E00441E4 46005121 */ cvt.d.s $f4, $f10 /* 355148 E00441E8 463E2182 */ mul.d $f6, $f4, $f30 -/* 35514C E00441EC 00000000 */ nop +/* 35514C E00441EC 00000000 */ nop /* 355150 E00441F0 3C01E004 */ lui $at, %hi(D_E0044E38) /* 355154 E00441F4 D42A4E38 */ ldc1 $f10, %lo(D_E0044E38)($at) /* 355158 E00441F8 462A2102 */ mul.d $f4, $f4, $f10 -/* 35515C E00441FC 00000000 */ nop +/* 35515C E00441FC 00000000 */ nop /* 355160 E0044200 46000021 */ cvt.d.s $f0, $f0 /* 355164 E0044204 46201082 */ mul.d $f2, $f2, $f0 -/* 355168 E0044208 00000000 */ nop +/* 355168 E0044208 00000000 */ nop /* 35516C E004420C 46203182 */ mul.d $f6, $f6, $f0 -/* 355170 E0044210 00000000 */ nop +/* 355170 E0044210 00000000 */ nop /* 355174 E0044214 2622001E */ addiu $v0, $s1, 0x1e /* 355178 E0044218 AE02000C */ sw $v0, 0xc($s0) /* 35517C E004421C 3C013F80 */ lui $at, 0x3f80 @@ -150,16 +150,16 @@ glabel func_E0044000 /* 355190 E0044230 C7AA0094 */ lwc1 $f10, 0x94($sp) /* 355194 E0044234 46224201 */ sub.d $f8, $f8, $f2 /* 355198 E0044238 44940000 */ mtc1 $s4, $f0 -/* 35519C E004423C 00000000 */ nop +/* 35519C E004423C 00000000 */ nop /* 3551A0 E0044240 46800020 */ cvt.s.w $f0, $f0 /* 3551A4 E0044244 46005003 */ div.s $f0, $f10, $f0 /* 3551A8 E0044248 46262101 */ sub.d $f4, $f4, $f6 /* 3551AC E004424C 44821000 */ mtc1 $v0, $f2 -/* 3551B0 E0044250 00000000 */ nop +/* 3551B0 E0044250 00000000 */ nop /* 3551B4 E0044254 468010A0 */ cvt.s.w $f2, $f2 /* 3551B8 E0044258 2E620006 */ sltiu $v0, $s3, 6 /* 3551BC E004425C 46020182 */ mul.s $f6, $f0, $f2 -/* 3551C0 E0044260 00000000 */ nop +/* 3551C0 E0044260 00000000 */ nop /* 3551C4 E0044264 46204220 */ cvt.s.d $f8, $f8 /* 3551C8 E0044268 10400036 */ beqz $v0, .LE0044344 /* 3551CC E004426C 46202120 */ cvt.s.d $f4, $f4 @@ -167,11 +167,11 @@ glabel func_E0044000 /* 3551D4 E0044274 00551021 */ addu $v0, $v0, $s5 /* 3551D8 E0044278 8C420000 */ lw $v0, ($v0) /* 3551DC E004427C 00400008 */ jr $v0 -/* 3551E0 E0044280 00000000 */ nop +/* 3551E0 E0044280 00000000 */ nop /* 3551E4 E0044284 4608B002 */ mul.s $f0, $f22, $f8 -/* 3551E8 E0044288 00000000 */ nop +/* 3551E8 E0044288 00000000 */ nop /* 3551EC E004428C 4604A082 */ mul.s $f2, $f20, $f4 -/* 3551F0 E0044290 00000000 */ nop +/* 3551F0 E0044290 00000000 */ nop /* 3551F4 E0044294 AE000000 */ sw $zero, ($s0) /* 3551F8 E0044298 AE00FFF4 */ sw $zero, -0xc($s0) /* 3551FC E004429C E600FFF8 */ swc1 $f0, -8($s0) @@ -181,31 +181,31 @@ glabel func_E0044000 /* 35520C E00442AC 24040064 */ addiu $a0, $zero, 0x64 /* 355210 E00442B0 C7AA0090 */ lwc1 $f10, 0x90($sp) /* 355214 E00442B4 460AB002 */ mul.s $f0, $f22, $f10 -/* 355218 E00442B8 00000000 */ nop +/* 355218 E00442B8 00000000 */ nop /* 35521C E00442BC 44821000 */ mtc1 $v0, $f2 -/* 355220 E00442C0 00000000 */ nop +/* 355220 E00442C0 00000000 */ nop /* 355224 E00442C4 468010A0 */ cvt.s.w $f2, $f2 /* 355228 E00442C8 46020002 */ mul.s $f0, $f0, $f2 -/* 35522C E00442CC 00000000 */ nop +/* 35522C E00442CC 00000000 */ nop /* 355230 E00442D0 46000021 */ cvt.d.s $f0, $f0 /* 355234 E00442D4 463C0002 */ mul.d $f0, $f0, $f28 -/* 355238 E00442D8 00000000 */ nop +/* 355238 E00442D8 00000000 */ nop /* 35523C E00442DC 24040064 */ addiu $a0, $zero, 0x64 /* 355240 E00442E0 46200020 */ cvt.s.d $f0, $f0 /* 355244 E00442E4 0C080138 */ jal func_E02004E0 /* 355248 E00442E8 E600FFEC */ swc1 $f0, -0x14($s0) /* 35524C E00442EC C7AA0094 */ lwc1 $f10, 0x94($sp) /* 355250 E00442F0 460AA002 */ mul.s $f0, $f20, $f10 -/* 355254 E00442F4 00000000 */ nop +/* 355254 E00442F4 00000000 */ nop /* 355258 E00442F8 44821000 */ mtc1 $v0, $f2 -/* 35525C E00442FC 00000000 */ nop +/* 35525C E00442FC 00000000 */ nop /* 355260 E0044300 468010A0 */ cvt.s.w $f2, $f2 /* 355264 E0044304 46020002 */ mul.s $f0, $f0, $f2 -/* 355268 E0044308 00000000 */ nop +/* 355268 E0044308 00000000 */ nop /* 35526C E004430C 8E02000C */ lw $v0, 0xc($s0) /* 355270 E0044310 46000021 */ cvt.d.s $f0, $f0 /* 355274 E0044314 463C0002 */ mul.d $f0, $f0, $f28 -/* 355278 E0044318 00000000 */ nop +/* 355278 E0044318 00000000 */ nop /* 35527C E004431C 00111840 */ sll $v1, $s1, 1 /* 355280 E0044320 AE00FFF4 */ sw $zero, -0xc($s0) /* 355284 E0044324 E61AFFFC */ swc1 $f26, -4($s0) @@ -218,9 +218,9 @@ glabel func_E0044000 /* 3552A0 E0044340 E600FFF0 */ swc1 $f0, -0x10($s0) .LE0044344: /* 3552A4 E0044344 4608B002 */ mul.s $f0, $f22, $f8 -/* 3552A8 E0044348 00000000 */ nop +/* 3552A8 E0044348 00000000 */ nop /* 3552AC E004434C 4608A082 */ mul.s $f2, $f20, $f8 -/* 3552B0 E0044350 00000000 */ nop +/* 3552B0 E0044350 00000000 */ nop /* 3552B4 E0044354 2404000A */ addiu $a0, $zero, 0xa /* 3552B8 E0044358 E606FFF0 */ swc1 $f6, -0x10($s0) /* 3552BC E004435C E600FFF8 */ swc1 $f0, -8($s0) @@ -231,10 +231,10 @@ glabel func_E0044000 /* 3552D0 E0044370 3421C28F */ ori $at, $at, 0xc28f /* 3552D4 E0044374 44811000 */ mtc1 $at, $f2 /* 3552D8 E0044378 44820000 */ mtc1 $v0, $f0 -/* 3552DC E004437C 00000000 */ nop +/* 3552DC E004437C 00000000 */ nop /* 3552E0 E0044380 46800020 */ cvt.s.w $f0, $f0 /* 3552E4 E0044384 46020002 */ mul.s $f0, $f0, $f2 -/* 3552E8 E0044388 00000000 */ nop +/* 3552E8 E0044388 00000000 */ nop /* 3552EC E004438C 2404000A */ addiu $a0, $zero, 0xa /* 3552F0 E0044390 0C080138 */ jal func_E02004E0 /* 3552F4 E0044394 E600FFFC */ swc1 $f0, -4($s0) @@ -242,10 +242,10 @@ glabel func_E0044000 /* 3552FC E004439C 3421D70A */ ori $at, $at, 0xd70a /* 355300 E00443A0 44811000 */ mtc1 $at, $f2 /* 355304 E00443A4 44820000 */ mtc1 $v0, $f0 -/* 355308 E00443A8 00000000 */ nop +/* 355308 E00443A8 00000000 */ nop /* 35530C E00443AC 46800020 */ cvt.s.w $f0, $f0 /* 355310 E00443B0 46020002 */ mul.s $f0, $f0, $f2 -/* 355314 E00443B4 00000000 */ nop +/* 355314 E00443B4 00000000 */ nop /* 355318 E00443B8 3C01E004 */ lui $at, %hi(D_E0044E58) /* 35531C E00443BC D4224E58 */ ldc1 $f2, %lo(D_E0044E58)($at) /* 355320 E00443C0 46000021 */ cvt.d.s $f0, $f0 diff --git a/asm/nonmatchings/code_354F60/func_E004441C.s b/asm/nonmatchings/code_354F60/func_E004441C.s index 216f961330..93c8e40958 100644 --- a/asm/nonmatchings/code_354F60/func_E004441C.s +++ b/asm/nonmatchings/code_354F60/func_E004441C.s @@ -3,4 +3,4 @@ glabel func_E004441C /* 35537C E004441C 03E00008 */ jr $ra -/* 355380 E0044420 00000000 */ nop +/* 355380 E0044420 00000000 */ nop diff --git a/asm/nonmatchings/code_354F60/func_E0044424.s b/asm/nonmatchings/code_354F60/func_E0044424.s index 0d861cb28e..c482268d72 100644 --- a/asm/nonmatchings/code_354F60/func_E0044424.s +++ b/asm/nonmatchings/code_354F60/func_E0044424.s @@ -64,7 +64,7 @@ glabel func_E0044424 /* 355464 E0044504 02511021 */ addu $v0, $s2, $s1 /* 355468 E0044508 8FC20000 */ lw $v0, ($fp) /* 35546C E004450C 00400008 */ jr $v0 -/* 355470 E0044510 00000000 */ nop +/* 355470 E0044510 00000000 */ nop /* 355474 E0044514 02511021 */ addu $v0, $s2, $s1 /* 355478 E0044518 30420007 */ andi $v0, $v0, 7 /* 35547C E004451C 2643FFFF */ addiu $v1, $s2, -1 @@ -82,18 +82,18 @@ glabel func_E0044424 /* 3554AC E004454C 00431021 */ addu $v0, $v0, $v1 /* 3554B0 E0044550 90424DF4 */ lbu $v0, %lo(D_E0044DF4)($v0) /* 3554B4 E0044554 44820000 */ mtc1 $v0, $f0 -/* 3554B8 E0044558 00000000 */ nop +/* 3554B8 E0044558 00000000 */ nop /* 3554BC E004455C 46800020 */ cvt.s.w $f0, $f0 /* 3554C0 E0044560 46000021 */ cvt.d.s $f0, $f0 /* 3554C4 E0044564 46380002 */ mul.d $f0, $f0, $f24 -/* 3554C8 E0044568 00000000 */ nop +/* 3554C8 E0044568 00000000 */ nop /* 3554CC E004456C C604FFFC */ lwc1 $f4, -4($s0) /* 3554D0 E0044570 46200020 */ cvt.s.d $f0, $f0 /* 3554D4 E0044574 46002102 */ mul.s $f4, $f4, $f0 -/* 3554D8 E0044578 00000000 */ nop +/* 3554D8 E0044578 00000000 */ nop /* 3554DC E004457C C6020000 */ lwc1 $f2, ($s0) /* 3554E0 E0044580 46001082 */ mul.s $f2, $f2, $f0 -/* 3554E4 E0044584 00000000 */ nop +/* 3554E4 E0044584 00000000 */ nop /* 3554E8 E0044588 C6000004 */ lwc1 $f0, 4($s0) /* 3554EC E004458C 46001080 */ add.s $f2, $f2, $f0 /* 3554F0 E0044590 00771021 */ addu $v0, $v1, $s7 @@ -106,14 +106,14 @@ glabel func_E0044424 /* 355508 E00445A8 44811000 */ mtc1 $at, $f2 /* 35550C E00445AC 2442FFFF */ addiu $v0, $v0, -1 /* 355510 E00445B0 44820000 */ mtc1 $v0, $f0 -/* 355514 E00445B4 00000000 */ nop +/* 355514 E00445B4 00000000 */ nop /* 355518 E00445B8 46800020 */ cvt.s.w $f0, $f0 /* 35551C E00445BC 46001083 */ div.s $f2, $f2, $f0 /* 355520 E00445C0 44910000 */ mtc1 $s1, $f0 -/* 355524 E00445C4 00000000 */ nop +/* 355524 E00445C4 00000000 */ nop /* 355528 E00445C8 46800020 */ cvt.s.w $f0, $f0 /* 35552C E00445CC 46001082 */ mul.s $f2, $f2, $f0 -/* 355530 E00445D0 00000000 */ nop +/* 355530 E00445D0 00000000 */ nop /* 355534 E00445D4 3C014270 */ lui $at, 0x4270 /* 355538 E00445D8 44810000 */ mtc1 $at, $f0 /* 35553C E00445DC 32220001 */ andi $v0, $s1, 1 @@ -121,7 +121,7 @@ glabel func_E0044424 /* 355544 E00445E4 46001500 */ add.s $f20, $f2, $f0 /* 355548 E00445E8 3C0142F0 */ lui $at, 0x42f0 /* 35554C E00445EC 44810000 */ mtc1 $at, $f0 -/* 355550 E00445F0 00000000 */ nop +/* 355550 E00445F0 00000000 */ nop /* 355554 E00445F4 4600A501 */ sub.s $f20, $f20, $f0 .LE00445F8: /* 355558 E00445F8 4600A306 */ mov.s $f12, $f20 @@ -140,16 +140,16 @@ glabel func_E0044424 /* 35558C E004462C C6020000 */ lwc1 $f2, ($s0) /* 355590 E0044630 460010A1 */ cvt.d.s $f2, $f2 /* 355594 E0044634 463A1082 */ mul.d $f2, $f2, $f26 -/* 355598 E0044638 00000000 */ nop +/* 355598 E0044638 00000000 */ nop /* 35559C E004463C C600FFFC */ lwc1 $f0, -4($s0) /* 3555A0 E0044640 46000021 */ cvt.d.s $f0, $f0 /* 3555A4 E0044644 463A0002 */ mul.d $f0, $f0, $f26 -/* 3555A8 E0044648 00000000 */ nop +/* 3555A8 E0044648 00000000 */ nop /* 3555AC E004464C C6040008 */ lwc1 $f4, 8($s0) /* 3555B0 E0044650 46002121 */ cvt.d.s $f4, $f4 /* 3555B4 E0044654 4624B181 */ sub.d $f6, $f22, $f4 /* 3555B8 E0044658 46363182 */ mul.d $f6, $f6, $f22 -/* 3555BC E004465C 00000000 */ nop +/* 3555BC E004465C 00000000 */ nop /* 3555C0 E0044660 02511021 */ addu $v0, $s2, $s1 /* 3555C4 E0044664 30420007 */ andi $v0, $v0, 7 /* 3555C8 E0044668 C6080004 */ lwc1 $f8, 4($s0) @@ -181,11 +181,11 @@ glabel func_E0044424 .LE00446D0: /* 355630 E00446D0 90420000 */ lbu $v0, ($v0) /* 355634 E00446D4 44820000 */ mtc1 $v0, $f0 -/* 355638 E00446D8 00000000 */ nop +/* 355638 E00446D8 00000000 */ nop /* 35563C E00446DC 46800020 */ cvt.s.w $f0, $f0 /* 355640 E00446E0 46000021 */ cvt.d.s $f0, $f0 /* 355644 E00446E4 46380002 */ mul.d $f0, $f0, $f24 -/* 355648 E00446E8 00000000 */ nop +/* 355648 E00446E8 00000000 */ nop /* 35564C E00446EC 46200020 */ cvt.s.d $f0, $f0 /* 355650 E00446F0 08011215 */ j .LE0044854 /* 355654 E00446F4 E6000008 */ swc1 $f0, 8($s0) @@ -219,11 +219,11 @@ glabel func_E0044424 /* 3556B4 E0044754 00771021 */ addu $v0, $v1, $s7 /* 3556B8 E0044758 90420000 */ lbu $v0, ($v0) /* 3556BC E004475C 44820000 */ mtc1 $v0, $f0 -/* 3556C0 E0044760 00000000 */ nop +/* 3556C0 E0044760 00000000 */ nop /* 3556C4 E0044764 46800020 */ cvt.s.w $f0, $f0 /* 3556C8 E0044768 46000021 */ cvt.d.s $f0, $f0 /* 3556CC E004476C 46380002 */ mul.d $f0, $f0, $f24 -/* 3556D0 E0044770 00000000 */ nop +/* 3556D0 E0044770 00000000 */ nop /* 3556D4 E0044774 24020005 */ addiu $v0, $zero, 5 /* 3556D8 E0044778 46200020 */ cvt.s.d $f0, $f0 /* 3556DC E004477C 16620018 */ bne $s3, $v0, .LE00447E0 @@ -241,7 +241,7 @@ glabel func_E0044424 /* 355708 E00447A8 46000021 */ cvt.d.s $f0, $f0 /* 35570C E00447AC 4620B101 */ sub.d $f4, $f22, $f0 /* 355710 E00447B0 46362102 */ mul.d $f4, $f4, $f22 -/* 355714 E00447B4 00000000 */ nop +/* 355714 E00447B4 00000000 */ nop /* 355718 E00447B8 C6060000 */ lwc1 $f6, ($s0) /* 35571C E00447BC C6020004 */ lwc1 $f2, 4($s0) /* 355720 E00447C0 46023180 */ add.s $f6, $f6, $f2 @@ -259,19 +259,19 @@ glabel func_E0044424 /* 35574C E00447EC 00521021 */ addu $v0, $v0, $s2 /* 355750 E00447F0 00021080 */ sll $v0, $v0, 2 /* 355754 E00447F4 4482A000 */ mtc1 $v0, $f20 -/* 355758 E00447F8 00000000 */ nop +/* 355758 E00447F8 00000000 */ nop /* 35575C E00447FC 4680A520 */ cvt.s.w $f20, $f20 /* 355760 E0044800 0C080140 */ jal func_E0200500 /* 355764 E0044804 4600A306 */ mov.s $f12, $f20 /* 355768 E0044808 C602FFFC */ lwc1 $f2, -4($s0) /* 35576C E004480C 46001082 */ mul.s $f2, $f2, $f0 -/* 355770 E0044810 00000000 */ nop +/* 355770 E0044810 00000000 */ nop /* 355774 E0044814 4600A306 */ mov.s $f12, $f20 /* 355778 E0044818 0C080144 */ jal func_E0200510 /* 35577C E004481C E602FFF0 */ swc1 $f2, -0x10($s0) /* 355780 E0044820 C602FFFC */ lwc1 $f2, -4($s0) /* 355784 E0044824 46001082 */ mul.s $f2, $f2, $f0 -/* 355788 E0044828 00000000 */ nop +/* 355788 E0044828 00000000 */ nop /* 35578C E004482C 0801120F */ j .LE004483C /* 355790 E0044830 E602FFF8 */ swc1 $f2, -8($s0) .LE0044834: @@ -281,7 +281,7 @@ glabel func_E0044424 /* 35579C E004483C C6000000 */ lwc1 $f0, ($s0) /* 3557A0 E0044840 46000021 */ cvt.d.s $f0, $f0 /* 3557A4 E0044844 463A0002 */ mul.d $f0, $f0, $f26 -/* 3557A8 E0044848 00000000 */ nop +/* 3557A8 E0044848 00000000 */ nop /* 3557AC E004484C 46200020 */ cvt.s.d $f0, $f0 /* 3557B0 E0044850 E6000000 */ swc1 $f0, ($s0) .LE0044854: @@ -298,12 +298,12 @@ glabel func_E0044424 /* 3557D8 E0044878 1262000A */ beq $s3, $v0, .LE00448A4 /* 3557DC E004487C 2A62000A */ slti $v0, $s3, 0xa /* 3557E0 E0044880 10400008 */ beqz $v0, .LE00448A4 -/* 3557E4 E0044884 00000000 */ nop +/* 3557E4 E0044884 00000000 */ nop /* 3557E8 E0044888 8E820008 */ lw $v0, 8($s4) /* 3557EC E004488C 2442FFFF */ addiu $v0, $v0, -1 /* 3557F0 E0044890 02A2102A */ slt $v0, $s5, $v0 /* 3557F4 E0044894 14400003 */ bnez $v0, .LE00448A4 -/* 3557F8 E0044898 00000000 */ nop +/* 3557F8 E0044898 00000000 */ nop .LE004489C: /* 3557FC E004489C 0C080128 */ jal func_E02004A0 /* 355800 E00448A0 0280202D */ daddu $a0, $s4, $zero diff --git a/asm/nonmatchings/code_354F60/func_E004491C.s b/asm/nonmatchings/code_354F60/func_E004491C.s index aff1252c22..6d6150671f 100644 --- a/asm/nonmatchings/code_354F60/func_E004491C.s +++ b/asm/nonmatchings/code_354F60/func_E004491C.s @@ -83,11 +83,12 @@ glabel func_E004491C /* 3559B4 E0044A54 2E42001F */ sltiu $v0, $s2, 0x1f /* 3559B8 E0044A58 1040002E */ beqz $v0, .LE0044B14 /* 3559BC E0044A5C 00121080 */ sll $v0, $s2, 2 -/* 3559C0 E0044A60 3C01E004 */ lui $at, %hi(D_E0044F00) +/* 3559C0 E0044A60 3C01E004 */ lui $at, %hi(jtbl_E0044F00_355E60) /* 3559C4 E0044A64 00220821 */ addu $at, $at, $v0 -/* 3559C8 E0044A68 8C224F00 */ lw $v0, %lo(D_E0044F00)($at) +/* 3559C8 E0044A68 8C224F00 */ lw $v0, %lo(jtbl_E0044F00_355E60)($at) /* 3559CC E0044A6C 00400008 */ jr $v0 -/* 3559D0 E0044A70 00000000 */ nop +/* 3559D0 E0044A70 00000000 */ nop +glabel LE0044A74_3559D4 /* 3559D4 E0044A74 3C013F80 */ lui $at, 0x3f80 /* 3559D8 E0044A78 4481C000 */ mtc1 $at, $f24 /* 3559DC E0044A7C 3C013F00 */ lui $at, 0x3f00 @@ -96,7 +97,8 @@ glabel func_E004491C /* 3559E8 E0044A88 3421CCCD */ ori $at, $at, 0xcccd /* 3559EC E0044A8C 4481A000 */ mtc1 $at, $f20 /* 3559F0 E0044A90 080112CC */ j .LE0044B30 -/* 3559F4 E0044A94 00000000 */ nop +/* 3559F4 E0044A94 00000000 */ nop +glabel LE0044A98_3559F8 /* 3559F8 E0044A98 3C013F80 */ lui $at, 0x3f80 /* 3559FC E0044A9C 4481C000 */ mtc1 $at, $f24 /* 355A00 E0044AA0 3C013F4C */ lui $at, 0x3f4c @@ -120,6 +122,7 @@ glabel func_E004491C /* 355A48 E0044AE8 AC660000 */ sw $a2, ($v1) /* 355A4C E0044AEC 080112CC */ j .LE0044B30 /* 355A50 E0044AF0 AC650004 */ sw $a1, 4($v1) +glabel LE0044AF4_355A54 /* 355A54 E0044AF4 3C013FB3 */ lui $at, 0x3fb3 /* 355A58 E0044AF8 34213333 */ ori $at, $at, 0x3333 /* 355A5C E0044AFC 4481B000 */ mtc1 $at, $f22 @@ -129,6 +132,7 @@ glabel func_E004491C /* 355A6C E0044B0C 080112CC */ j .LE0044B30 /* 355A70 E0044B10 4600B606 */ mov.s $f24, $f22 .LE0044B14: +glabel LE0044B14_355A74 /* 355A74 E0044B14 3C013F33 */ lui $at, 0x3f33 /* 355A78 E0044B18 34213333 */ ori $at, $at, 0x3333 /* 355A7C E0044B1C 4481A000 */ mtc1 $at, $f20 @@ -157,7 +161,7 @@ glabel func_E004491C .LE0044B74: /* 355AD4 E0044B74 8E34000C */ lw $s4, 0xc($s1) /* 355AD8 E0044B78 0680006E */ bltz $s4, .LE0044D34 -/* 355ADC E0044B7C 00000000 */ nop +/* 355ADC E0044B7C 00000000 */ nop /* 355AE0 E0044B80 8E25FFE8 */ lw $a1, -0x18($s1) /* 355AE4 E0044B84 8E26FFEC */ lw $a2, -0x14($s1) /* 355AE8 E0044B88 8E27FFF0 */ lw $a3, -0x10($s1) @@ -186,27 +190,27 @@ glabel func_E004491C .LE0044BE4: /* 355B44 E0044BE4 92020000 */ lbu $v0, ($s0) /* 355B48 E0044BE8 44822000 */ mtc1 $v0, $f4 -/* 355B4C E0044BEC 00000000 */ nop +/* 355B4C E0044BEC 00000000 */ nop /* 355B50 E0044BF0 46802120 */ cvt.s.w $f4, $f4 /* 355B54 E0044BF4 46182102 */ mul.s $f4, $f4, $f24 -/* 355B58 E0044BF8 00000000 */ nop +/* 355B58 E0044BF8 00000000 */ nop /* 355B5C E0044BFC 26100001 */ addiu $s0, $s0, 1 /* 355B60 E0044C00 92020000 */ lbu $v0, ($s0) /* 355B64 E0044C04 44821000 */ mtc1 $v0, $f2 -/* 355B68 E0044C08 00000000 */ nop +/* 355B68 E0044C08 00000000 */ nop /* 355B6C E0044C0C 468010A0 */ cvt.s.w $f2, $f2 /* 355B70 E0044C10 46161082 */ mul.s $f2, $f2, $f22 -/* 355B74 E0044C14 00000000 */ nop +/* 355B74 E0044C14 00000000 */ nop /* 355B78 E0044C18 26100001 */ addiu $s0, $s0, 1 /* 355B7C E0044C1C 92020000 */ lbu $v0, ($s0) /* 355B80 E0044C20 44820000 */ mtc1 $v0, $f0 -/* 355B84 E0044C24 00000000 */ nop +/* 355B84 E0044C24 00000000 */ nop /* 355B88 E0044C28 46800020 */ cvt.s.w $f0, $f0 /* 355B8C E0044C2C 46140002 */ mul.s $f0, $f0, $f20 -/* 355B90 E0044C30 00000000 */ nop +/* 355B90 E0044C30 00000000 */ nop /* 355B94 E0044C34 4600218D */ trunc.w.s $f6, $f4 /* 355B98 E0044C38 44033000 */ mfc1 $v1, $f6 -/* 355B9C E0044C3C 00000000 */ nop +/* 355B9C E0044C3C 00000000 */ nop /* 355BA0 E0044C40 28620100 */ slti $v0, $v1, 0x100 /* 355BA4 E0044C44 4600118D */ trunc.w.s $f6, $f2 /* 355BA8 E0044C48 44073000 */ mfc1 $a3, $f6 diff --git a/asm/nonmatchings/code_355EE0/func_E0046160.s b/asm/nonmatchings/code_355EE0/func_E0046160.s index 25377635ce..462f2f8ae5 100644 --- a/asm/nonmatchings/code_355EE0/func_E0046160.s +++ b/asm/nonmatchings/code_355EE0/func_E0046160.s @@ -9,7 +9,7 @@ glabel func_E0046160 /* 356050 E0046170 C4A00024 */ lwc1 $f0, 0x24($a1) /* 356054 E0046174 8CA60018 */ lw $a2, 0x18($a1) /* 356058 E0046178 4602003E */ c.le.s $f0, $f2 -/* 35605C E004617C 00000000 */ nop +/* 35605C E004617C 00000000 */ nop /* 356060 E0046180 45000031 */ bc1f .LE0046248 /* 356064 E0046184 24C2FFFF */ addiu $v0, $a2, -1 /* 356068 E0046188 ACA20018 */ sw $v0, 0x18($a1) @@ -19,9 +19,9 @@ glabel func_E0046160 /* 356078 E0046198 04610005 */ bgez $v1, .LE00461B0 /* 35607C E004619C ACA2001C */ sw $v0, 0x1c($a1) /* 356080 E00461A0 0C080128 */ jal func_E02004A0 -/* 356084 E00461A4 00000000 */ nop +/* 356084 E00461A4 00000000 */ nop /* 356088 E00461A8 0801189C */ j .LE0046270 -/* 35608C E00461AC 00000000 */ nop +/* 35608C E00461AC 00000000 */ nop .LE00461B0: /* 356090 E00461B0 28C20006 */ slti $v0, $a2, 6 /* 356094 E00461B4 14400012 */ bnez $v0, .LE0046200 @@ -32,12 +32,12 @@ glabel func_E0046160 /* 3560A8 E00461C8 D4206638 */ ldc1 $f0, %lo(D_E0046638)($at) /* 3560AC E00461CC 00431023 */ subu $v0, $v0, $v1 /* 3560B0 E00461D0 44821000 */ mtc1 $v0, $f2 -/* 3560B4 E00461D4 00000000 */ nop +/* 3560B4 E00461D4 00000000 */ nop /* 3560B8 E00461D8 468010A1 */ cvt.d.w $f2, $f2 /* 3560BC E00461DC 46201082 */ mul.d $f2, $f2, $f0 -/* 3560C0 E00461E0 00000000 */ nop +/* 3560C0 E00461E0 00000000 */ nop /* 3560C4 E00461E4 44830000 */ mtc1 $v1, $f0 -/* 3560C8 E00461E8 00000000 */ nop +/* 3560C8 E00461E8 00000000 */ nop /* 3560CC E00461EC 46800021 */ cvt.d.w $f0, $f0 /* 3560D0 E00461F0 46220000 */ add.d $f0, $f0, $f2 /* 3560D4 E00461F4 4620010D */ trunc.w.d $f4, $f0 diff --git a/asm/nonmatchings/code_356980/func_E0048000.s b/asm/nonmatchings/code_356980/func_E0048000.s index 292d8cd460..a34185bfcb 100644 --- a/asm/nonmatchings/code_356980/func_E0048000.s +++ b/asm/nonmatchings/code_356980/func_E0048000.s @@ -42,7 +42,7 @@ glabel func_E0048000 /* 356A14 E0048094 0200202D */ daddu $a0, $s0, $zero .LE0048098: /* 356A18 E0048098 08012026 */ j .LE0048098 -/* 356A1C E004809C 00000000 */ nop +/* 356A1C E004809C 00000000 */ nop .LE00480A0: /* 356A20 E00480A0 00112840 */ sll $a1, $s1, 1 /* 356A24 E00480A4 00B12821 */ addu $a1, $a1, $s1 @@ -67,7 +67,7 @@ glabel func_E0048000 .LE00480F0: /* 356A70 E00480F0 3C014220 */ lui $at, 0x4220 /* 356A74 E00480F4 44810000 */ mtc1 $at, $f0 -/* 356A78 E00480F8 00000000 */ nop +/* 356A78 E00480F8 00000000 */ nop /* 356A7C E00480FC E6000028 */ swc1 $f0, 0x28($s0) .LE0048100: /* 356A80 E0048100 8FBF0038 */ lw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_356980/func_E0048128.s b/asm/nonmatchings/code_356980/func_E0048128.s index 43705d75ad..3535fcb077 100644 --- a/asm/nonmatchings/code_356980/func_E0048128.s +++ b/asm/nonmatchings/code_356980/func_E0048128.s @@ -3,4 +3,4 @@ glabel func_E0048128 /* 356AA8 E0048128 03E00008 */ jr $ra -/* 356AAC E004812C 00000000 */ nop +/* 356AAC E004812C 00000000 */ nop diff --git a/asm/nonmatchings/code_356980/func_E0048130.s b/asm/nonmatchings/code_356980/func_E0048130.s index 9703f09694..3a95745da1 100644 --- a/asm/nonmatchings/code_356980/func_E0048130.s +++ b/asm/nonmatchings/code_356980/func_E0048130.s @@ -10,11 +10,11 @@ glabel func_E0048130 /* 356AC4 E0048144 8CA20018 */ lw $v0, 0x18($a1) /* 356AC8 E0048148 8CA30014 */ lw $v1, 0x14($a1) /* 356ACC E004814C 44821000 */ mtc1 $v0, $f2 -/* 356AD0 E0048150 00000000 */ nop +/* 356AD0 E0048150 00000000 */ nop /* 356AD4 E0048154 468010A0 */ cvt.s.w $f2, $f2 /* 356AD8 E0048158 24420001 */ addiu $v0, $v0, 1 /* 356ADC E004815C 46001082 */ mul.s $f2, $f2, $f0 -/* 356AE0 E0048160 00000000 */ nop +/* 356AE0 E0048160 00000000 */ nop /* 356AE4 E0048164 2463FFFF */ addiu $v1, $v1, -1 /* 356AE8 E0048168 C4A0001C */ lwc1 $f0, 0x1c($a1) /* 356AEC E004816C 46800020 */ cvt.s.w $f0, $f0 @@ -24,9 +24,9 @@ glabel func_E0048130 /* 356AFC E004817C 04610005 */ bgez $v1, .LE0048194 /* 356B00 E0048180 E4A20020 */ swc1 $f2, 0x20($a1) /* 356B04 E0048184 0C080128 */ jal func_E02004A0 -/* 356B08 E0048188 00000000 */ nop +/* 356B08 E0048188 00000000 */ nop /* 356B0C E004818C 08012072 */ j .LE00481C8 -/* 356B10 E0048190 00000000 */ nop +/* 356B10 E0048190 00000000 */ nop .LE0048194: /* 356B14 E0048194 C4A00024 */ lwc1 $f0, 0x24($a1) /* 356B18 E0048198 C4A20028 */ lwc1 $f2, 0x28($a1) diff --git a/asm/nonmatchings/code_356980/func_E0048218.s b/asm/nonmatchings/code_356980/func_E0048218.s index 4ba4a220d3..43b36282ef 100644 --- a/asm/nonmatchings/code_356980/func_E0048218.s +++ b/asm/nonmatchings/code_356980/func_E0048218.s @@ -46,9 +46,9 @@ glabel func_E0048218 /* 356C3C E00482BC 3C02E700 */ lui $v0, 0xe700 /* 356C40 E00482C0 4600328D */ trunc.w.s $f10, $f6 /* 356C44 E00482C4 44165000 */ mfc1 $s6, $f10 -/* 356C48 E00482C8 00000000 */ nop +/* 356C48 E00482C8 00000000 */ nop /* 356C4C E00482CC 44961000 */ mtc1 $s6, $f2 -/* 356C50 E00482D0 00000000 */ nop +/* 356C50 E00482D0 00000000 */ nop /* 356C54 E00482D4 468010A0 */ cvt.s.w $f2, $f2 /* 356C58 E00482D8 46023181 */ sub.s $f6, $f6, $f2 /* 356C5C E00482DC AC620000 */ sw $v0, ($v1) @@ -84,7 +84,7 @@ glabel func_E0048218 /* 356CD4 E0048354 C6800004 */ lwc1 $f0, 4($s4) /* 356CD8 E0048358 44064000 */ mfc1 $a2, $f8 /* 356CDC E004835C 46043182 */ mul.s $f6, $f6, $f4 -/* 356CE0 E0048360 00000000 */ nop +/* 356CE0 E0048360 00000000 */ nop /* 356CE4 E0048364 AEA20000 */ sw $v0, ($s5) /* 356CE8 E0048368 3AC20007 */ xori $v0, $s6, 7 /* 356CEC E004836C E7A00014 */ swc1 $f0, 0x14($sp) @@ -138,15 +138,15 @@ glabel func_E0048218 /* 356DAC E004842C C6800020 */ lwc1 $f0, 0x20($s4) /* 356DB0 E0048430 3C0140A0 */ lui $at, 0x40a0 /* 356DB4 E0048434 44811000 */ mtc1 $at, $f2 -/* 356DB8 E0048438 00000000 */ nop +/* 356DB8 E0048438 00000000 */ nop /* 356DBC E004843C 4600103C */ c.lt.s $f2, $f0 -/* 356DC0 E0048440 00000000 */ nop +/* 356DC0 E0048440 00000000 */ nop /* 356DC4 E0048444 45000007 */ bc1f .LE0048464 /* 356DC8 E0048448 4600B106 */ mov.s $f4, $f22 /* 356DCC E004844C 46020001 */ sub.s $f0, $f0, $f2 /* 356DD0 E0048450 46002101 */ sub.s $f4, $f4, $f0 /* 356DD4 E0048454 4614203C */ c.lt.s $f4, $f20 -/* 356DD8 E0048458 00000000 */ nop +/* 356DD8 E0048458 00000000 */ nop /* 356DDC E004845C 45030001 */ bc1tl .LE0048464 /* 356DE0 E0048460 4600A106 */ mov.s $f4, $f20 .LE0048464: @@ -160,74 +160,74 @@ glabel func_E0048218 /* 356E00 E0048480 0040202D */ daddu $a0, $v0, $zero /* 356E04 E0048484 24420008 */ addiu $v0, $v0, 8 /* 356E08 E0048488 46002002 */ mul.s $f0, $f4, $f0 -/* 356E0C E004848C 00000000 */ nop +/* 356E0C E004848C 00000000 */ nop /* 356E10 E0048490 AC620000 */ sw $v0, ($v1) /* 356E14 E0048494 3C02FA00 */ lui $v0, 0xfa00 /* 356E18 E0048498 AC820000 */ sw $v0, ($a0) /* 356E1C E004849C 4600103E */ c.le.s $f2, $f0 -/* 356E20 E00484A0 00000000 */ nop +/* 356E20 E00484A0 00000000 */ nop /* 356E24 E00484A4 45010005 */ bc1t .LE00484BC /* 356E28 E00484A8 24840004 */ addiu $a0, $a0, 4 /* 356E2C E00484AC 4600028D */ trunc.w.s $f10, $f0 /* 356E30 E00484B0 44035000 */ mfc1 $v1, $f10 /* 356E34 E00484B4 08012135 */ j .LE00484D4 -/* 356E38 E00484B8 00000000 */ nop +/* 356E38 E00484B8 00000000 */ nop .LE00484BC: /* 356E3C E00484BC 46020001 */ sub.s $f0, $f0, $f2 /* 356E40 E00484C0 3C028000 */ lui $v0, 0x8000 /* 356E44 E00484C4 4600028D */ trunc.w.s $f10, $f0 /* 356E48 E00484C8 44035000 */ mfc1 $v1, $f10 -/* 356E4C E00484CC 00000000 */ nop +/* 356E4C E00484CC 00000000 */ nop /* 356E50 E00484D0 00621825 */ or $v1, $v1, $v0 .LE00484D4: /* 356E54 E00484D4 3C014190 */ lui $at, 0x4190 /* 356E58 E00484D8 44810000 */ mtc1 $at, $f0 -/* 356E5C E00484DC 00000000 */ nop +/* 356E5C E00484DC 00000000 */ nop /* 356E60 E00484E0 46002002 */ mul.s $f0, $f4, $f0 -/* 356E64 E00484E4 00000000 */ nop +/* 356E64 E00484E4 00000000 */ nop /* 356E68 E00484E8 3C014F00 */ lui $at, 0x4f00 /* 356E6C E00484EC 44811000 */ mtc1 $at, $f2 -/* 356E70 E00484F0 00000000 */ nop +/* 356E70 E00484F0 00000000 */ nop /* 356E74 E00484F4 4600103E */ c.le.s $f2, $f0 -/* 356E78 E00484F8 00000000 */ nop +/* 356E78 E00484F8 00000000 */ nop /* 356E7C E00484FC 45010005 */ bc1t .LE0048514 /* 356E80 E0048500 00032E00 */ sll $a1, $v1, 0x18 /* 356E84 E0048504 4600028D */ trunc.w.s $f10, $f0 /* 356E88 E0048508 44035000 */ mfc1 $v1, $f10 /* 356E8C E004850C 0801214B */ j .LE004852C -/* 356E90 E0048510 00000000 */ nop +/* 356E90 E0048510 00000000 */ nop .LE0048514: /* 356E94 E0048514 46020001 */ sub.s $f0, $f0, $f2 /* 356E98 E0048518 3C028000 */ lui $v0, 0x8000 /* 356E9C E004851C 4600028D */ trunc.w.s $f10, $f0 /* 356EA0 E0048520 44035000 */ mfc1 $v1, $f10 -/* 356EA4 E0048524 00000000 */ nop +/* 356EA4 E0048524 00000000 */ nop /* 356EA8 E0048528 00621825 */ or $v1, $v1, $v0 .LE004852C: /* 356EAC E004852C 3C01426C */ lui $at, 0x426c /* 356EB0 E0048530 44810000 */ mtc1 $at, $f0 -/* 356EB4 E0048534 00000000 */ nop +/* 356EB4 E0048534 00000000 */ nop /* 356EB8 E0048538 46002002 */ mul.s $f0, $f4, $f0 -/* 356EBC E004853C 00000000 */ nop +/* 356EBC E004853C 00000000 */ nop /* 356EC0 E0048540 306200FF */ andi $v0, $v1, 0xff /* 356EC4 E0048544 00021400 */ sll $v0, $v0, 0x10 /* 356EC8 E0048548 3C014F00 */ lui $at, 0x4f00 /* 356ECC E004854C 44811000 */ mtc1 $at, $f2 -/* 356ED0 E0048550 00000000 */ nop +/* 356ED0 E0048550 00000000 */ nop /* 356ED4 E0048554 4600103E */ c.le.s $f2, $f0 -/* 356ED8 E0048558 00000000 */ nop +/* 356ED8 E0048558 00000000 */ nop /* 356EDC E004855C 45010005 */ bc1t .LE0048574 /* 356EE0 E0048560 00A23825 */ or $a3, $a1, $v0 /* 356EE4 E0048564 4600028D */ trunc.w.s $f10, $f0 /* 356EE8 E0048568 44065000 */ mfc1 $a2, $f10 /* 356EEC E004856C 08012163 */ j .LE004858C -/* 356EF0 E0048570 00000000 */ nop +/* 356EF0 E0048570 00000000 */ nop .LE0048574: /* 356EF4 E0048574 46020001 */ sub.s $f0, $f0, $f2 /* 356EF8 E0048578 3C028000 */ lui $v0, 0x8000 /* 356EFC E004857C 4600028D */ trunc.w.s $f10, $f0 /* 356F00 E0048580 44065000 */ mfc1 $a2, $f10 -/* 356F04 E0048584 00000000 */ nop +/* 356F04 E0048584 00000000 */ nop /* 356F08 E0048588 00C23025 */ or $a2, $a2, $v0 .LE004858C: /* 356F0C E004858C 3C05800A */ lui $a1, %hi(gMasterGfxPos) @@ -244,74 +244,74 @@ glabel func_E0048218 /* 356F38 E00485B8 44811000 */ mtc1 $at, $f2 /* 356F3C E00485BC 0060202D */ daddu $a0, $v1, $zero /* 356F40 E00485C0 46002002 */ mul.s $f0, $f4, $f0 -/* 356F44 E00485C4 00000000 */ nop +/* 356F44 E00485C4 00000000 */ nop /* 356F48 E00485C8 24630008 */ addiu $v1, $v1, 8 /* 356F4C E00485CC 24870004 */ addiu $a3, $a0, 4 /* 356F50 E00485D0 ACA30000 */ sw $v1, ($a1) /* 356F54 E00485D4 4600103E */ c.le.s $f2, $f0 -/* 356F58 E00485D8 00000000 */ nop +/* 356F58 E00485D8 00000000 */ nop /* 356F5C E00485DC 45010005 */ bc1t .LE00485F4 /* 356F60 E00485E0 AC820000 */ sw $v0, ($a0) /* 356F64 E00485E4 4600028D */ trunc.w.s $f10, $f0 /* 356F68 E00485E8 44035000 */ mfc1 $v1, $f10 /* 356F6C E00485EC 08012183 */ j .LE004860C -/* 356F70 E00485F0 00000000 */ nop +/* 356F70 E00485F0 00000000 */ nop .LE00485F4: /* 356F74 E00485F4 46020001 */ sub.s $f0, $f0, $f2 /* 356F78 E00485F8 3C028000 */ lui $v0, 0x8000 /* 356F7C E00485FC 4600028D */ trunc.w.s $f10, $f0 /* 356F80 E0048600 44035000 */ mfc1 $v1, $f10 -/* 356F84 E0048604 00000000 */ nop +/* 356F84 E0048604 00000000 */ nop /* 356F88 E0048608 00621825 */ or $v1, $v1, $v0 .LE004860C: /* 356F8C E004860C 3C014254 */ lui $at, 0x4254 /* 356F90 E0048610 44810000 */ mtc1 $at, $f0 -/* 356F94 E0048614 00000000 */ nop +/* 356F94 E0048614 00000000 */ nop /* 356F98 E0048618 46002002 */ mul.s $f0, $f4, $f0 -/* 356F9C E004861C 00000000 */ nop +/* 356F9C E004861C 00000000 */ nop /* 356FA0 E0048620 3C014F00 */ lui $at, 0x4f00 /* 356FA4 E0048624 44811000 */ mtc1 $at, $f2 -/* 356FA8 E0048628 00000000 */ nop +/* 356FA8 E0048628 00000000 */ nop /* 356FAC E004862C 4600103E */ c.le.s $f2, $f0 -/* 356FB0 E0048630 00000000 */ nop +/* 356FB0 E0048630 00000000 */ nop /* 356FB4 E0048634 45010005 */ bc1t .LE004864C /* 356FB8 E0048638 00032600 */ sll $a0, $v1, 0x18 /* 356FBC E004863C 4600028D */ trunc.w.s $f10, $f0 /* 356FC0 E0048640 44035000 */ mfc1 $v1, $f10 /* 356FC4 E0048644 08012199 */ j .LE0048664 -/* 356FC8 E0048648 00000000 */ nop +/* 356FC8 E0048648 00000000 */ nop .LE004864C: /* 356FCC E004864C 46020001 */ sub.s $f0, $f0, $f2 /* 356FD0 E0048650 3C028000 */ lui $v0, 0x8000 /* 356FD4 E0048654 4600028D */ trunc.w.s $f10, $f0 /* 356FD8 E0048658 44035000 */ mfc1 $v1, $f10 -/* 356FDC E004865C 00000000 */ nop +/* 356FDC E004865C 00000000 */ nop /* 356FE0 E0048660 00621825 */ or $v1, $v1, $v0 .LE0048664: /* 356FE4 E0048664 3C0141C0 */ lui $at, 0x41c0 /* 356FE8 E0048668 44810000 */ mtc1 $at, $f0 -/* 356FEC E004866C 00000000 */ nop +/* 356FEC E004866C 00000000 */ nop /* 356FF0 E0048670 46002002 */ mul.s $f0, $f4, $f0 -/* 356FF4 E0048674 00000000 */ nop +/* 356FF4 E0048674 00000000 */ nop /* 356FF8 E0048678 306200FF */ andi $v0, $v1, 0xff /* 356FFC E004867C 00021400 */ sll $v0, $v0, 0x10 /* 357000 E0048680 3C014F00 */ lui $at, 0x4f00 /* 357004 E0048684 44811000 */ mtc1 $at, $f2 -/* 357008 E0048688 00000000 */ nop +/* 357008 E0048688 00000000 */ nop /* 35700C E004868C 4600103E */ c.le.s $f2, $f0 -/* 357010 E0048690 00000000 */ nop +/* 357010 E0048690 00000000 */ nop /* 357014 E0048694 45010005 */ bc1t .LE00486AC /* 357018 E0048698 00823025 */ or $a2, $a0, $v0 /* 35701C E004869C 4600028D */ trunc.w.s $f10, $f0 /* 357020 E00486A0 44035000 */ mfc1 $v1, $f10 /* 357024 E00486A4 080121B1 */ j .LE00486C4 -/* 357028 E00486A8 00000000 */ nop +/* 357028 E00486A8 00000000 */ nop .LE00486AC: /* 35702C E00486AC 46020001 */ sub.s $f0, $f0, $f2 /* 357030 E00486B0 3C028000 */ lui $v0, 0x8000 /* 357034 E00486B4 4600028D */ trunc.w.s $f10, $f0 /* 357038 E00486B8 44035000 */ mfc1 $v1, $f10 -/* 35703C E00486BC 00000000 */ nop +/* 35703C E00486BC 00000000 */ nop /* 357040 E00486C0 00621825 */ or $v1, $v1, $v0 .LE00486C4: /* 357044 E00486C4 3C05800A */ lui $a1, %hi(gMasterGfxPos) @@ -330,24 +330,24 @@ glabel func_E0048218 /* 357078 E00486F8 44811000 */ mtc1 $at, $f2 /* 35707C E00486FC 0080182D */ daddu $v1, $a0, $zero /* 357080 E0048700 46002002 */ mul.s $f0, $f4, $f0 -/* 357084 E0048704 00000000 */ nop +/* 357084 E0048704 00000000 */ nop /* 357088 E0048708 24840008 */ addiu $a0, $a0, 8 /* 35708C E004870C 24660004 */ addiu $a2, $v1, 4 /* 357090 E0048710 ACA40000 */ sw $a0, ($a1) /* 357094 E0048714 4600103E */ c.le.s $f2, $f0 -/* 357098 E0048718 00000000 */ nop +/* 357098 E0048718 00000000 */ nop /* 35709C E004871C 45010005 */ bc1t .LE0048734 /* 3570A0 E0048720 AC620000 */ sw $v0, ($v1) /* 3570A4 E0048724 4600028D */ trunc.w.s $f10, $f0 /* 3570A8 E0048728 44055000 */ mfc1 $a1, $f10 /* 3570AC E004872C 080121D3 */ j .LE004874C -/* 3570B0 E0048730 00000000 */ nop +/* 3570B0 E0048730 00000000 */ nop .LE0048734: /* 3570B4 E0048734 46020001 */ sub.s $f0, $f0, $f2 /* 3570B8 E0048738 3C028000 */ lui $v0, 0x8000 /* 3570BC E004873C 4600028D */ trunc.w.s $f10, $f0 /* 3570C0 E0048740 44055000 */ mfc1 $a1, $f10 -/* 3570C4 E0048744 00000000 */ nop +/* 3570C4 E0048744 00000000 */ nop /* 3570C8 E0048748 00A22825 */ or $a1, $a1, $v0 .LE004874C: /* 3570CC E004874C 3C04800A */ lui $a0, %hi(gMasterGfxPos) @@ -363,36 +363,36 @@ glabel func_E0048218 /* 3570F4 E0048774 44811000 */ mtc1 $at, $f2 /* 3570F8 E0048778 0060282D */ daddu $a1, $v1, $zero /* 3570FC E004877C 46002002 */ mul.s $f0, $f4, $f0 -/* 357100 E0048780 00000000 */ nop +/* 357100 E0048780 00000000 */ nop /* 357104 E0048784 24630008 */ addiu $v1, $v1, 8 /* 357108 E0048788 24A90004 */ addiu $t1, $a1, 4 /* 35710C E004878C AC830000 */ sw $v1, ($a0) /* 357110 E0048790 4600103E */ c.le.s $f2, $f0 -/* 357114 E0048794 00000000 */ nop +/* 357114 E0048794 00000000 */ nop /* 357118 E0048798 45010005 */ bc1t .LE00487B0 /* 35711C E004879C ACA20000 */ sw $v0, ($a1) /* 357120 E00487A0 4600028D */ trunc.w.s $f10, $f0 /* 357124 E00487A4 44035000 */ mfc1 $v1, $f10 /* 357128 E00487A8 080121F2 */ j .LE00487C8 -/* 35712C E00487AC 00000000 */ nop +/* 35712C E00487AC 00000000 */ nop .LE00487B0: /* 357130 E00487B0 46020001 */ sub.s $f0, $f0, $f2 /* 357134 E00487B4 3C028000 */ lui $v0, 0x8000 /* 357138 E00487B8 4600028D */ trunc.w.s $f10, $f0 /* 35713C E00487BC 44035000 */ mfc1 $v1, $f10 -/* 357140 E00487C0 00000000 */ nop +/* 357140 E00487C0 00000000 */ nop /* 357144 E00487C4 00621825 */ or $v1, $v1, $v0 .LE00487C8: /* 357148 E00487C8 3C014358 */ lui $at, 0x4358 /* 35714C E00487CC 44810000 */ mtc1 $at, $f0 -/* 357150 E00487D0 00000000 */ nop +/* 357150 E00487D0 00000000 */ nop /* 357154 E00487D4 46002002 */ mul.s $f0, $f4, $f0 -/* 357158 E00487D8 00000000 */ nop +/* 357158 E00487D8 00000000 */ nop /* 35715C E00487DC 3C014F00 */ lui $at, 0x4f00 /* 357160 E00487E0 44811000 */ mtc1 $at, $f2 -/* 357164 E00487E4 00000000 */ nop +/* 357164 E00487E4 00000000 */ nop /* 357168 E00487E8 4600103E */ c.le.s $f2, $f0 -/* 35716C E00487EC 00000000 */ nop +/* 35716C E00487EC 00000000 */ nop /* 357170 E00487F0 45010005 */ bc1t .LE0048808 /* 357174 E00487F4 00034600 */ sll $t0, $v1, 0x18 /* 357178 E00487F8 4600028D */ trunc.w.s $f10, $f0 @@ -404,7 +404,7 @@ glabel func_E0048218 /* 35718C E004880C 3C028000 */ lui $v0, 0x8000 /* 357190 E0048810 4600028D */ trunc.w.s $f10, $f0 /* 357194 E0048814 44075000 */ mfc1 $a3, $f10 -/* 357198 E0048818 00000000 */ nop +/* 357198 E0048818 00000000 */ nop /* 35719C E004881C 00E23825 */ or $a3, $a3, $v0 /* 3571A0 E0048820 3C06FC26 */ lui $a2, 0xfc26 .LE0048824: @@ -528,6 +528,6 @@ glabel func_E0048218 /* 357368 E00489E8 D7B400D0 */ ldc1 $f20, 0xd0($sp) /* 35736C E00489EC 03E00008 */ jr $ra /* 357370 E00489F0 27BD00E0 */ addiu $sp, $sp, 0xe0 -/* 357374 E00489F4 00000000 */ nop -/* 357378 E00489F8 00000000 */ nop -/* 35737C E00489FC 00000000 */ nop +/* 357374 E00489F4 00000000 */ nop +/* 357378 E00489F8 00000000 */ nop +/* 35737C E00489FC 00000000 */ nop diff --git a/asm/nonmatchings/code_3584C0/func_E004A000.s b/asm/nonmatchings/code_3584C0/func_E004A000.s index 40cbd2b1db..efca21ab99 100644 --- a/asm/nonmatchings/code_3584C0/func_E004A000.s +++ b/asm/nonmatchings/code_3584C0/func_E004A000.s @@ -93,7 +93,7 @@ glabel func_E004A000 /* 3585F4 E004A134 AE11000C */ sw $s1, 0xc($s0) .LE004A138: /* 3585F8 E004A138 0801284E */ j .LE004A138 -/* 3585FC E004A13C 00000000 */ nop +/* 3585FC E004A13C 00000000 */ nop .LE004A140: /* 358600 E004A140 0220202D */ daddu $a0, $s1, $zero /* 358604 E004A144 00132840 */ sll $a1, $s3, 1 @@ -118,11 +118,12 @@ glabel func_E004A000 /* 35864C E004A18C 10400033 */ beqz $v0, .LE004A25C /* 358650 E004A190 E638000C */ swc1 $f24, 0xc($s1) /* 358654 E004A194 00121080 */ sll $v0, $s2, 2 -/* 358658 E004A198 3C01E005 */ lui $at, %hi(D_E004AE80) +/* 358658 E004A198 3C01E005 */ lui $at, %hi(jtbl_E004AE80_359340) /* 35865C E004A19C 00220821 */ addu $at, $at, $v0 -/* 358660 E004A1A0 8C22AE80 */ lw $v0, %lo(D_E004AE80)($at) +/* 358660 E004A1A0 8C22AE80 */ lw $v0, %lo(jtbl_E004AE80_359340)($at) /* 358664 E004A1A4 00400008 */ jr $v0 -/* 358668 E004A1A8 00000000 */ nop +/* 358668 E004A1A8 00000000 */ nop +glabel LE004A1AC_35866C /* 35866C E004A1AC 240300FF */ addiu $v1, $zero, 0xff /* 358670 E004A1B0 2402007A */ addiu $v0, $zero, 0x7a /* 358674 E004A1B4 A2220052 */ sb $v0, 0x52($s1) @@ -133,6 +134,7 @@ glabel func_E004A000 /* 358688 E004A1C8 A2230051 */ sb $v1, 0x51($s1) /* 35868C E004A1CC 080128A4 */ j .LE004A290 /* 358690 E004A1D0 A2230054 */ sb $v1, 0x54($s1) +glabel LE004A1D4_358694 /* 358694 E004A1D4 2402007D */ addiu $v0, $zero, 0x7d /* 358698 E004A1D8 A2220050 */ sb $v0, 0x50($s1) /* 35869C E004A1DC 24020078 */ addiu $v0, $zero, 0x78 @@ -144,6 +146,7 @@ glabel func_E004A000 /* 3586B4 E004A1F4 A2220054 */ sb $v0, 0x54($s1) /* 3586B8 E004A1F8 080128A4 */ j .LE004A290 /* 3586BC E004A1FC 240200F0 */ addiu $v0, $zero, 0xf0 +glabel LE004A200_3586C0 /* 3586C0 E004A200 240200DC */ addiu $v0, $zero, 0xdc /* 3586C4 E004A204 A2220050 */ sb $v0, 0x50($s1) /* 3586C8 E004A208 240200D2 */ addiu $v0, $zero, 0xd2 @@ -155,6 +158,7 @@ glabel func_E004A000 /* 3586E0 E004A220 A2220054 */ sb $v0, 0x54($s1) /* 3586E4 E004A224 080128A4 */ j .LE004A290 /* 3586E8 E004A228 240200FA */ addiu $v0, $zero, 0xfa +glabel LE004A22C_3586EC /* 3586EC E004A22C 240200E1 */ addiu $v0, $zero, 0xe1 /* 3586F0 E004A230 A2220050 */ sb $v0, 0x50($s1) /* 3586F4 E004A234 240200CC */ addiu $v0, $zero, 0xcc @@ -168,6 +172,7 @@ glabel func_E004A000 /* 358714 E004A254 080128A4 */ j .LE004A290 /* 358718 E004A258 240200AB */ addiu $v0, $zero, 0xab .LE004A25C: +glabel LE004A25C_35871C /* 35871C E004A25C 24020032 */ addiu $v0, $zero, 0x32 /* 358720 E004A260 AE220028 */ sw $v0, 0x28($s1) /* 358724 E004A264 240200D0 */ addiu $v0, $zero, 0xd0 @@ -200,7 +205,7 @@ glabel func_E004A000 /* 358788 E004A2C8 AC85001C */ sw $a1, 0x1c($a0) .LE004A2CC: /* 35878C E004A2CC 44870000 */ mtc1 $a3, $f0 -/* 358790 E004A2D0 00000000 */ nop +/* 358790 E004A2D0 00000000 */ nop /* 358794 E004A2D4 46800020 */ cvt.s.w $f0, $f0 /* 358798 E004A2D8 24E7001E */ addiu $a3, $a3, 0x1e /* 35879C E004A2DC 24C6FFFD */ addiu $a2, $a2, -3 diff --git a/asm/nonmatchings/code_3584C0/func_E004A328.s b/asm/nonmatchings/code_3584C0/func_E004A328.s index acb3d3c8a1..1f4dfd30e9 100644 --- a/asm/nonmatchings/code_3584C0/func_E004A328.s +++ b/asm/nonmatchings/code_3584C0/func_E004A328.s @@ -3,4 +3,4 @@ glabel func_E004A328 /* 3587E8 E004A328 03E00008 */ jr $ra -/* 3587EC E004A32C 00000000 */ nop +/* 3587EC E004A32C 00000000 */ nop diff --git a/asm/nonmatchings/code_3584C0/func_E004A330.s b/asm/nonmatchings/code_3584C0/func_E004A330.s index 5e54d63b25..10ae259d6e 100644 --- a/asm/nonmatchings/code_3584C0/func_E004A330.s +++ b/asm/nonmatchings/code_3584C0/func_E004A330.s @@ -27,7 +27,7 @@ glabel func_E004A330 /* 358848 E004A388 0C080128 */ jal func_E02004A0 /* 35884C E004A38C 0280202D */ daddu $a0, $s4, $zero /* 358850 E004A390 080129C4 */ j .LE004A710 -/* 358854 E004A394 00000000 */ nop +/* 358854 E004A394 00000000 */ nop .LE004A398: /* 358858 E004A398 94920000 */ lhu $s2, ($a0) /* 35885C E004A39C 8C83002C */ lw $v1, 0x2c($a0) @@ -35,22 +35,22 @@ glabel func_E004A330 /* 358864 E004A3A4 10400008 */ beqz $v0, .LE004A3C8 /* 358868 E004A3A8 28620008 */ slti $v0, $v1, 8 /* 35886C E004A3AC 06400006 */ bltz $s2, .LE004A3C8 -/* 358870 E004A3B0 00000000 */ nop +/* 358870 E004A3B0 00000000 */ nop /* 358874 E004A3B4 1440000E */ bnez $v0, .LE004A3F0 -/* 358878 E004A3B8 00000000 */ nop +/* 358878 E004A3B8 00000000 */ nop /* 35887C E004A3BC 3C01E005 */ lui $at, %hi(D_E004AE98) /* 358880 E004A3C0 080128F6 */ j .LE004A3D8 /* 358884 E004A3C4 D422AE98 */ ldc1 $f2, %lo(D_E004AE98)($at) .LE004A3C8: /* 358888 E004A3C8 14400009 */ bnez $v0, .LE004A3F0 -/* 35888C E004A3CC 00000000 */ nop +/* 35888C E004A3CC 00000000 */ nop /* 358890 E004A3D0 3C01E005 */ lui $at, %hi(D_E004AEA0) /* 358894 E004A3D4 D422AEA0 */ ldc1 $f2, %lo(D_E004AEA0)($at) .LE004A3D8: /* 358898 E004A3D8 C4800038 */ lwc1 $f0, 0x38($a0) /* 35889C E004A3DC 46800021 */ cvt.d.w $f0, $f0 /* 3588A0 E004A3E0 46220002 */ mul.d $f0, $f0, $f2 -/* 3588A4 E004A3E4 00000000 */ nop +/* 3588A4 E004A3E4 00000000 */ nop /* 3588A8 E004A3E8 4620018D */ trunc.w.d $f6, $f0 /* 3588AC E004A3EC E4860038 */ swc1 $f6, 0x38($a0) .LE004A3F0: @@ -83,7 +83,7 @@ glabel func_E004A330 /* 358914 E004A454 044000A8 */ bltz $v0, .LE004A6F8 /* 358918 E004A458 AE020010 */ sw $v0, 0x10($s0) /* 35891C E004A45C 14400060 */ bnez $v0, .LE004A5E0 -/* 358920 E004A460 00000000 */ nop +/* 358920 E004A460 00000000 */ nop /* 358924 E004A464 C60CFFF8 */ lwc1 $f12, -8($s0) /* 358928 E004A468 AE00FFC8 */ sw $zero, -0x38($s0) /* 35892C E004A46C AE00FFCC */ sw $zero, -0x34($s0) @@ -92,16 +92,16 @@ glabel func_E004A330 /* 358938 E004A478 46000007 */ neg.s $f0, $f0 /* 35893C E004A47C 46000021 */ cvt.d.s $f0, $f0 /* 358940 E004A480 46340002 */ mul.d $f0, $f0, $f20 -/* 358944 E004A484 00000000 */ nop +/* 358944 E004A484 00000000 */ nop /* 358948 E004A488 C60CFFF8 */ lwc1 $f12, -8($s0) /* 35894C E004A48C 46200020 */ cvt.s.d $f0, $f0 /* 358950 E004A490 0C080144 */ jal func_E0200510 /* 358954 E004A494 E600FFD4 */ swc1 $f0, -0x2c($s0) /* 358958 E004A498 46000021 */ cvt.d.s $f0, $f0 /* 35895C E004A49C 46340002 */ mul.d $f0, $f0, $f20 -/* 358960 E004A4A0 00000000 */ nop +/* 358960 E004A4A0 00000000 */ nop /* 358964 E004A4A4 44911000 */ mtc1 $s1, $f2 -/* 358968 E004A4A8 00000000 */ nop +/* 358968 E004A4A8 00000000 */ nop /* 35896C E004A4AC 468010A0 */ cvt.s.w $f2, $f2 /* 358970 E004A4B0 460010A1 */ cvt.d.s $f2, $f2 /* 358974 E004A4B4 3C014020 */ lui $at, 0x4020 @@ -120,34 +120,34 @@ glabel func_E004A330 /* 3589A8 E004A4E8 E600FFD8 */ swc1 $f0, -0x28($s0) /* 3589AC E004A4EC 8EA20000 */ lw $v0, ($s5) /* 3589B0 E004A4F0 00400008 */ jr $v0 -/* 3589B4 E004A4F4 00000000 */ nop +/* 3589B4 E004A4F4 00000000 */ nop /* 3589B8 E004A4F8 44910000 */ mtc1 $s1, $f0 -/* 3589BC E004A4FC 00000000 */ nop +/* 3589BC E004A4FC 00000000 */ nop /* 3589C0 E004A500 46800021 */ cvt.d.w $f0, $f0 /* 3589C4 E004A504 46340000 */ add.d $f0, $f0, $f20 /* 3589C8 E004A508 46340082 */ mul.d $f2, $f0, $f20 -/* 3589CC E004A50C 00000000 */ nop +/* 3589CC E004A50C 00000000 */ nop /* 3589D0 E004A510 46200020 */ cvt.s.d $f0, $f0 /* 3589D4 E004A514 08012975 */ j .LE004A5D4 /* 3589D8 E004A518 E600FFE0 */ swc1 $f0, -0x20($s0) /* 3589DC E004A51C 26220002 */ addiu $v0, $s1, 2 /* 3589E0 E004A520 44820000 */ mtc1 $v0, $f0 -/* 3589E4 E004A524 00000000 */ nop +/* 3589E4 E004A524 00000000 */ nop /* 3589E8 E004A528 46800021 */ cvt.d.w $f0, $f0 /* 3589EC E004A52C 46340002 */ mul.d $f0, $f0, $f20 -/* 3589F0 E004A530 00000000 */ nop +/* 3589F0 E004A530 00000000 */ nop /* 3589F4 E004A534 44821000 */ mtc1 $v0, $f2 -/* 3589F8 E004A538 00000000 */ nop +/* 3589F8 E004A538 00000000 */ nop /* 3589FC E004A53C 468010A0 */ cvt.s.w $f2, $f2 /* 358A00 E004A540 0801295E */ j .LE004A578 /* 358A04 E004A544 E602FFE0 */ swc1 $f2, -0x20($s0) /* 358A08 E004A548 44930000 */ mtc1 $s3, $f0 -/* 358A0C E004A54C 00000000 */ nop +/* 358A0C E004A54C 00000000 */ nop /* 358A10 E004A550 46800021 */ cvt.d.w $f0, $f0 /* 358A14 E004A554 46340002 */ mul.d $f0, $f0, $f20 -/* 358A18 E004A558 00000000 */ nop +/* 358A18 E004A558 00000000 */ nop /* 358A1C E004A55C 44931000 */ mtc1 $s3, $f2 -/* 358A20 E004A560 00000000 */ nop +/* 358A20 E004A560 00000000 */ nop /* 358A24 E004A564 468010A0 */ cvt.s.w $f2, $f2 /* 358A28 E004A568 E602FFE0 */ swc1 $f2, -0x20($s0) /* 358A2C E004A56C E6160000 */ swc1 $f22, ($s0) @@ -159,18 +159,18 @@ glabel func_E004A330 /* 358A40 E004A580 E600FFE8 */ swc1 $f0, -0x18($s0) .LE004A584: /* 358A44 E004A584 44932000 */ mtc1 $s3, $f4 -/* 358A48 E004A588 00000000 */ nop +/* 358A48 E004A588 00000000 */ nop /* 358A4C E004A58C 46802121 */ cvt.d.w $f4, $f4 /* 358A50 E004A590 46342102 */ mul.d $f4, $f4, $f20 -/* 358A54 E004A594 00000000 */ nop +/* 358A54 E004A594 00000000 */ nop /* 358A58 E004A598 C600FFE4 */ lwc1 $f0, -0x1c($s0) /* 358A5C E004A59C 3C01E005 */ lui $at, %hi(D_E004AEC8) /* 358A60 E004A5A0 D422AEC8 */ ldc1 $f2, %lo(D_E004AEC8)($at) /* 358A64 E004A5A4 46000021 */ cvt.d.s $f0, $f0 /* 358A68 E004A5A8 46220002 */ mul.d $f0, $f0, $f2 -/* 358A6C E004A5AC 00000000 */ nop +/* 358A6C E004A5AC 00000000 */ nop /* 358A70 E004A5B0 46342082 */ mul.d $f2, $f4, $f20 -/* 358A74 E004A5B4 00000000 */ nop +/* 358A74 E004A5B4 00000000 */ nop /* 358A78 E004A5B8 E6160000 */ swc1 $f22, ($s0) /* 358A7C E004A5BC E6160004 */ swc1 $f22, 4($s0) /* 358A80 E004A5C0 E616000C */ swc1 $f22, 0xc($s0) @@ -198,18 +198,18 @@ glabel func_E004A330 /* 358ACC E004A60C 14400005 */ bnez $v0, .LE004A624 /* 358AD0 E004A610 24020005 */ addiu $v0, $zero, 5 /* 358AD4 E004A614 1242000E */ beq $s2, $v0, .LE004A650 -/* 358AD8 E004A618 00000000 */ nop +/* 358AD8 E004A618 00000000 */ nop /* 358ADC E004A61C 0801299D */ j .LE004A674 -/* 358AE0 E004A620 00000000 */ nop +/* 358AE0 E004A620 00000000 */ nop .LE004A624: /* 358AE4 E004A624 06400013 */ bltz $s2, .LE004A674 -/* 358AE8 E004A628 00000000 */ nop +/* 358AE8 E004A628 00000000 */ nop /* 358AEC E004A62C C6000004 */ lwc1 $f0, 4($s0) /* 358AF0 E004A630 3C01E005 */ lui $at, %hi(D_E004AED0) /* 358AF4 E004A634 D422AED0 */ ldc1 $f2, %lo(D_E004AED0)($at) /* 358AF8 E004A638 46000021 */ cvt.d.s $f0, $f0 /* 358AFC E004A63C 46220002 */ mul.d $f0, $f0, $f2 -/* 358B00 E004A640 00000000 */ nop +/* 358B00 E004A640 00000000 */ nop /* 358B04 E004A644 46200020 */ cvt.s.d $f0, $f0 /* 358B08 E004A648 080129AB */ j .LE004A6AC /* 358B0C E004A64C E6000004 */ swc1 $f0, 4($s0) @@ -217,7 +217,7 @@ glabel func_E004A330 /* 358B10 E004A650 C6000004 */ lwc1 $f0, 4($s0) /* 358B14 E004A654 46000021 */ cvt.d.s $f0, $f0 /* 358B18 E004A658 463C0002 */ mul.d $f0, $f0, $f28 -/* 358B1C E004A65C 00000000 */ nop +/* 358B1C E004A65C 00000000 */ nop /* 358B20 E004A660 C602000C */ lwc1 $f2, 0xc($s0) /* 358B24 E004A664 3C01E005 */ lui $at, %hi(D_E004AED8) /* 358B28 E004A668 D424AED8 */ ldc1 $f4, %lo(D_E004AED8)($at) @@ -227,14 +227,14 @@ glabel func_E004A330 /* 358B34 E004A674 C6000004 */ lwc1 $f0, 4($s0) /* 358B38 E004A678 46000021 */ cvt.d.s $f0, $f0 /* 358B3C E004A67C 463C0002 */ mul.d $f0, $f0, $f28 -/* 358B40 E004A680 00000000 */ nop +/* 358B40 E004A680 00000000 */ nop /* 358B44 E004A684 C602000C */ lwc1 $f2, 0xc($s0) /* 358B48 E004A688 3C01E005 */ lui $at, %hi(D_E004AEE0) /* 358B4C E004A68C D424AEE0 */ ldc1 $f4, %lo(D_E004AEE0)($at) /* 358B50 E004A690 460010A1 */ cvt.d.s $f2, $f2 .LE004A694: /* 358B54 E004A694 46241082 */ mul.d $f2, $f2, $f4 -/* 358B58 E004A698 00000000 */ nop +/* 358B58 E004A698 00000000 */ nop /* 358B5C E004A69C 46200020 */ cvt.s.d $f0, $f0 /* 358B60 E004A6A0 462010A0 */ cvt.s.d $f2, $f2 /* 358B64 E004A6A4 E6000004 */ swc1 $f0, 4($s0) @@ -243,11 +243,11 @@ glabel func_E004A330 /* 358B6C E004A6AC C600FFE0 */ lwc1 $f0, -0x20($s0) /* 358B70 E004A6B0 46000021 */ cvt.d.s $f0, $f0 /* 358B74 E004A6B4 463A0002 */ mul.d $f0, $f0, $f26 -/* 358B78 E004A6B8 00000000 */ nop +/* 358B78 E004A6B8 00000000 */ nop /* 358B7C E004A6BC C602FFE8 */ lwc1 $f2, -0x18($s0) /* 358B80 E004A6C0 460010A1 */ cvt.d.s $f2, $f2 /* 358B84 E004A6C4 463A1082 */ mul.d $f2, $f2, $f26 -/* 358B88 E004A6C8 00000000 */ nop +/* 358B88 E004A6C8 00000000 */ nop /* 358B8C E004A6CC 3C014300 */ lui $at, 0x4300 /* 358B90 E004A6D0 44812000 */ mtc1 $at, $f4 /* 358B94 E004A6D4 46200020 */ cvt.s.d $f0, $f0 @@ -255,7 +255,7 @@ glabel func_E004A330 /* 358B9C E004A6DC C6000000 */ lwc1 $f0, ($s0) /* 358BA0 E004A6E0 462010A0 */ cvt.s.d $f2, $f2 /* 358BA4 E004A6E4 4600203C */ c.lt.s $f4, $f0 -/* 358BA8 E004A6E8 00000000 */ nop +/* 358BA8 E004A6E8 00000000 */ nop /* 358BAC E004A6EC 45000002 */ bc1f .LE004A6F8 /* 358BB0 E004A6F0 E602FFE8 */ swc1 $f2, -0x18($s0) /* 358BB4 E004A6F4 E6040000 */ swc1 $f4, ($s0) diff --git a/asm/nonmatchings/code_3584C0/func_E004A78C.s b/asm/nonmatchings/code_3584C0/func_E004A78C.s index ea3bda4133..2c3c7fdd7d 100644 --- a/asm/nonmatchings/code_3584C0/func_E004A78C.s +++ b/asm/nonmatchings/code_3584C0/func_E004A78C.s @@ -173,7 +173,7 @@ glabel func_E004A78C .LE004AA28: /* 358EE8 E004AA28 8E020008 */ lw $v0, 8($s0) /* 358EEC E004AA2C 0440007E */ bltz $v0, .LE004AC28 -/* 358EF0 E004AA30 00000000 */ nop +/* 358EF0 E004AA30 00000000 */ nop /* 358EF4 E004AA34 8E05FFC0 */ lw $a1, -0x40($s0) /* 358EF8 E004AA38 8E06FFC4 */ lw $a2, -0x3c($s0) /* 358EFC E004AA3C 8E07FFC8 */ lw $a3, -0x38($s0) @@ -192,15 +192,15 @@ glabel func_E004A78C /* 358F30 E004AA70 C604FFD8 */ lwc1 $f4, -0x28($s0) /* 358F34 E004AA74 46002121 */ cvt.d.s $f4, $f4 /* 358F38 E004AA78 46342102 */ mul.d $f4, $f4, $f20 -/* 358F3C E004AA7C 00000000 */ nop +/* 358F3C E004AA7C 00000000 */ nop /* 358F40 E004AA80 C602FFDC */ lwc1 $f2, -0x24($s0) /* 358F44 E004AA84 460010A1 */ cvt.d.s $f2, $f2 /* 358F48 E004AA88 46341082 */ mul.d $f2, $f2, $f20 -/* 358F4C E004AA8C 00000000 */ nop +/* 358F4C E004AA8C 00000000 */ nop /* 358F50 E004AA90 C600FFE0 */ lwc1 $f0, -0x20($s0) /* 358F54 E004AA94 46000021 */ cvt.d.s $f0, $f0 /* 358F58 E004AA98 46340002 */ mul.d $f0, $f0, $f20 -/* 358F5C E004AA9C 00000000 */ nop +/* 358F5C E004AA9C 00000000 */ nop /* 358F60 E004AAA0 46202120 */ cvt.s.d $f4, $f4 /* 358F64 E004AAA4 462010A0 */ cvt.s.d $f2, $f2 /* 358F68 E004AAA8 46200020 */ cvt.s.d $f0, $f0 @@ -243,7 +243,7 @@ glabel func_E004A78C /* 358FFC E004AB3C 24630008 */ addiu $v1, $v1, 8 /* 359000 E004AB40 4600018D */ trunc.w.s $f6, $f0 /* 359004 E004AB44 44023000 */ mfc1 $v0, $f6 -/* 359008 E004AB48 00000000 */ nop +/* 359008 E004AB48 00000000 */ nop /* 35900C E004AB4C 30420FFF */ andi $v0, $v0, 0xfff /* 359010 E004AB50 005E1025 */ or $v0, $v0, $fp /* 359014 E004AB54 AE630000 */ sw $v1, ($s3) @@ -263,7 +263,7 @@ glabel func_E004A78C /* 35904C E004AB8C AE620000 */ sw $v0, ($s3) /* 359050 E004AB90 4600018D */ trunc.w.s $f6, $f0 /* 359054 E004AB94 44023000 */ mfc1 $v0, $f6 -/* 359058 E004AB98 00000000 */ nop +/* 359058 E004AB98 00000000 */ nop /* 35905C E004AB9C 2442007C */ addiu $v0, $v0, 0x7c /* 359060 E004ABA0 30420FFF */ andi $v0, $v0, 0xfff /* 359064 E004ABA4 00461025 */ or $v0, $v0, $a2 @@ -273,7 +273,7 @@ glabel func_E004A78C /* 359074 E004ABB4 AE620000 */ sw $v0, ($s3) /* 359078 E004ABB8 4600018D */ trunc.w.s $f6, $f0 /* 35907C E004ABBC 44023000 */ mfc1 $v0, $f6 -/* 359080 E004ABC0 00000000 */ nop +/* 359080 E004ABC0 00000000 */ nop /* 359084 E004ABC4 30420FFF */ andi $v0, $v0, 0xfff /* 359088 E004ABC8 005E1025 */ or $v0, $v0, $fp /* 35908C E004ABCC AC620000 */ sw $v0, ($v1) @@ -294,7 +294,7 @@ glabel func_E004A78C /* 3590C8 E004AC08 AC62001C */ sw $v0, 0x1c($v1) /* 3590CC E004AC0C 4600018D */ trunc.w.s $f6, $f0 /* 3590D0 E004AC10 44023000 */ mfc1 $v0, $f6 -/* 3590D4 E004AC14 00000000 */ nop +/* 3590D4 E004AC14 00000000 */ nop /* 3590D8 E004AC18 2442007C */ addiu $v0, $v0, 0x7c /* 3590DC E004AC1C 30420FFF */ andi $v0, $v0, 0xfff /* 3590E0 E004AC20 00481025 */ or $v0, $v0, $t0 @@ -442,4 +442,4 @@ glabel func_E004A78C /* 359310 E004AE50 D7B40100 */ ldc1 $f20, 0x100($sp) /* 359314 E004AE54 03E00008 */ jr $ra /* 359318 E004AE58 27BD0118 */ addiu $sp, $sp, 0x118 -/* 35931C E004AE5C 00000000 */ nop +/* 35931C E004AE5C 00000000 */ nop diff --git a/asm/nonmatchings/code_35BFD0/func_E0050000.s b/asm/nonmatchings/code_35BFD0/func_E0050000.s index d7159ef47e..e12460d6bd 100644 --- a/asm/nonmatchings/code_35BFD0/func_E0050000.s +++ b/asm/nonmatchings/code_35BFD0/func_E0050000.s @@ -42,7 +42,7 @@ glabel func_E0050000 /* 35C064 E0050094 AE02000C */ sw $v0, 0xc($s0) .LE0050098: /* 35C068 E0050098 08014026 */ j .LE0050098 -/* 35C06C E005009C 00000000 */ nop +/* 35C06C E005009C 00000000 */ nop .LE00500A0: /* 35C070 E00500A0 3C108007 */ lui $s0, %hi(gCurrentCameraID) /* 35C074 E00500A4 26107410 */ addiu $s0, $s0, %lo(gCurrentCameraID) @@ -59,7 +59,7 @@ glabel func_E0050000 /* 35C0A0 E00500D0 00220821 */ addu $at, $at, $v0 /* 35C0A4 E00500D4 C42C1DEC */ lwc1 $f12, %lo(D_800B1DEC)($at) /* 35C0A8 E00500D8 0C080140 */ jal func_E0200500 -/* 35C0AC E00500DC 00000000 */ nop +/* 35C0AC E00500DC 00000000 */ nop /* 35C0B0 E00500E0 8E030000 */ lw $v1, ($s0) /* 35C0B4 E00500E4 00031080 */ sll $v0, $v1, 2 /* 35C0B8 E00500E8 00431021 */ addu $v0, $v0, $v1 @@ -87,17 +87,17 @@ glabel func_E0050000 /* 35C110 E0050140 46001080 */ add.s $f2, $f2, $f0 /* 35C114 E0050144 C7A00040 */ lwc1 $f0, 0x40($sp) /* 35C118 E0050148 46020002 */ mul.s $f0, $f0, $f2 -/* 35C11C E005014C 00000000 */ nop +/* 35C11C E005014C 00000000 */ nop /* 35C120 E0050150 4600C000 */ add.s $f0, $f24, $f0 /* 35C124 E0050154 E6200004 */ swc1 $f0, 4($s1) /* 35C128 E0050158 C7A00044 */ lwc1 $f0, 0x44($sp) /* 35C12C E005015C 46020002 */ mul.s $f0, $f0, $f2 -/* 35C130 E0050160 00000000 */ nop +/* 35C130 E0050160 00000000 */ nop /* 35C134 E0050164 4600D000 */ add.s $f0, $f26, $f0 /* 35C138 E0050168 E6200008 */ swc1 $f0, 8($s1) /* 35C13C E005016C C7A00048 */ lwc1 $f0, 0x48($sp) /* 35C140 E0050170 46020002 */ mul.s $f0, $f0, $f2 -/* 35C144 E0050174 00000000 */ nop +/* 35C144 E0050174 00000000 */ nop /* 35C148 E0050178 4600E000 */ add.s $f0, $f28, $f0 /* 35C14C E005017C E620000C */ swc1 $f0, 0xc($s1) /* 35C150 E0050180 C7A00040 */ lwc1 $f0, 0x40($sp) diff --git a/asm/nonmatchings/code_35BFD0/func_E00501D0.s b/asm/nonmatchings/code_35BFD0/func_E00501D0.s index 6d0497e5bd..e080f79e2c 100644 --- a/asm/nonmatchings/code_35BFD0/func_E00501D0.s +++ b/asm/nonmatchings/code_35BFD0/func_E00501D0.s @@ -3,4 +3,4 @@ glabel func_E00501D0 /* 35C1A0 E00501D0 03E00008 */ jr $ra -/* 35C1A4 E00501D4 00000000 */ nop +/* 35C1A4 E00501D4 00000000 */ nop diff --git a/asm/nonmatchings/code_35BFD0/func_E00501D8.s b/asm/nonmatchings/code_35BFD0/func_E00501D8.s index 283c0133f1..adaf1045f6 100644 --- a/asm/nonmatchings/code_35BFD0/func_E00501D8.s +++ b/asm/nonmatchings/code_35BFD0/func_E00501D8.s @@ -10,16 +10,16 @@ glabel func_E00501D8 /* 35C1BC E00501EC 04410005 */ bgez $v0, .LE0050204 /* 35C1C0 E00501F0 AC620024 */ sw $v0, 0x24($v1) /* 35C1C4 E00501F4 0C080128 */ jal func_E02004A0 -/* 35C1C8 E00501F8 00000000 */ nop +/* 35C1C8 E00501F8 00000000 */ nop /* 35C1CC E00501FC 080140AE */ j .LE00502B8 -/* 35C1D0 E0050200 00000000 */ nop +/* 35C1D0 E0050200 00000000 */ nop .LE0050204: /* 35C1D4 E0050204 C4620018 */ lwc1 $f2, 0x18($v1) /* 35C1D8 E0050208 3C01E005 */ lui $at, %hi(D_E0050560) /* 35C1DC E005020C D42A0560 */ ldc1 $f10, %lo(D_E0050560)($at) /* 35C1E0 E0050210 460010A1 */ cvt.d.s $f2, $f2 /* 35C1E4 E0050214 462A1082 */ mul.d $f2, $f2, $f10 -/* 35C1E8 E0050218 00000000 */ nop +/* 35C1E8 E0050218 00000000 */ nop /* 35C1EC E005021C C4640004 */ lwc1 $f4, 4($v1) /* 35C1F0 E0050220 C4600018 */ lwc1 $f0, 0x18($v1) /* 35C1F4 E0050224 C4680008 */ lwc1 $f8, 8($v1) @@ -45,19 +45,19 @@ glabel func_E00501D8 /* 35C244 E0050274 D4220570 */ ldc1 $f2, %lo(D_E0050570)($at) /* 35C248 E0050278 46000021 */ cvt.d.s $f0, $f0 /* 35C24C E005027C 4622003C */ c.lt.d $f0, $f2 -/* 35C250 E0050280 00000000 */ nop +/* 35C250 E0050280 00000000 */ nop /* 35C254 E0050284 45000006 */ bc1f .LE00502A0 -/* 35C258 E0050288 00000000 */ nop +/* 35C258 E0050288 00000000 */ nop /* 35C25C E005028C 3C01BDCC */ lui $at, 0xbdcc /* 35C260 E0050290 3421CCCD */ ori $at, $at, 0xcccd /* 35C264 E0050294 44810000 */ mtc1 $at, $f0 -/* 35C268 E0050298 00000000 */ nop +/* 35C268 E0050298 00000000 */ nop /* 35C26C E005029C E460001C */ swc1 $f0, 0x1c($v1) .LE00502A0: /* 35C270 E00502A0 C4600020 */ lwc1 $f0, 0x20($v1) /* 35C274 E00502A4 46000021 */ cvt.d.s $f0, $f0 /* 35C278 E00502A8 462A0002 */ mul.d $f0, $f0, $f10 -/* 35C27C E00502AC 00000000 */ nop +/* 35C27C E00502AC 00000000 */ nop /* 35C280 E00502B0 46200020 */ cvt.s.d $f0, $f0 /* 35C284 E00502B4 E4600020 */ swc1 $f0, 0x20($v1) .LE00502B8: diff --git a/asm/nonmatchings/code_35BFD0/func_E0050308.s b/asm/nonmatchings/code_35BFD0/func_E0050308.s index ec4cac4714..85de0aa212 100644 --- a/asm/nonmatchings/code_35BFD0/func_E0050308.s +++ b/asm/nonmatchings/code_35BFD0/func_E0050308.s @@ -104,7 +104,7 @@ glabel func_E0050308 /* 35C464 E0050494 C6600010 */ lwc1 $f0, 0x10($s3) /* 35C468 E0050498 24840001 */ addiu $a0, $a0, 1 /* 35C46C E005049C 4600A03C */ c.lt.s $f20, $f0 -/* 35C470 E00504A0 00000000 */ nop +/* 35C470 E00504A0 00000000 */ nop /* 35C474 E00504A4 4500000D */ bc1f .LE00504DC /* 35C478 E00504A8 A6040000 */ sh $a0, ($s0) /* 35C47C E00504AC 3C040900 */ lui $a0, 0x900 @@ -154,4 +154,4 @@ glabel func_E0050308 /* 35C520 E0050550 D7B400B0 */ ldc1 $f20, 0xb0($sp) /* 35C524 E0050554 03E00008 */ jr $ra /* 35C528 E0050558 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 35C52C E005055C 00000000 */ nop +/* 35C52C E005055C 00000000 */ nop diff --git a/asm/nonmatchings/code_35CA80/func_E0052000.s b/asm/nonmatchings/code_35CA80/func_E0052000.s index e298980f6d..c01aa04cc1 100644 --- a/asm/nonmatchings/code_35CA80/func_E0052000.s +++ b/asm/nonmatchings/code_35CA80/func_E0052000.s @@ -38,7 +38,7 @@ glabel func_E0052000 /* 35CB04 E0052084 AE02000C */ sw $v0, 0xc($s0) .LE0052088: /* 35CB08 E0052088 08014822 */ j .LE0052088 -/* 35CB0C E005208C 00000000 */ nop +/* 35CB0C E005208C 00000000 */ nop .LE0052090: /* 35CB10 E0052090 AC710000 */ sw $s1, ($v1) /* 35CB14 E0052094 E4740004 */ swc1 $f20, 4($v1) diff --git a/asm/nonmatchings/code_35CA80/func_E00520E8.s b/asm/nonmatchings/code_35CA80/func_E00520E8.s index 8417563611..d08a93fecf 100644 --- a/asm/nonmatchings/code_35CA80/func_E00520E8.s +++ b/asm/nonmatchings/code_35CA80/func_E00520E8.s @@ -3,4 +3,4 @@ glabel func_E00520E8 /* 35CB68 E00520E8 03E00008 */ jr $ra -/* 35CB6C E00520EC 00000000 */ nop +/* 35CB6C E00520EC 00000000 */ nop diff --git a/asm/nonmatchings/code_35CA80/func_E0052460.s b/asm/nonmatchings/code_35CA80/func_E0052460.s index 8484bc716c..87feea8984 100644 --- a/asm/nonmatchings/code_35CA80/func_E0052460.s +++ b/asm/nonmatchings/code_35CA80/func_E0052460.s @@ -306,7 +306,7 @@ glabel func_E0052460 /* 35D380 E0052900 1440FFF0 */ bnez $v0, .LE00528C4 /* 35D384 E0052904 ACA00004 */ sw $zero, 4($a1) /* 35D388 E0052908 08014A67 */ j .LE005299C -/* 35D38C E005290C 00000000 */ nop +/* 35D38C E005290C 00000000 */ nop .LE0052910: /* 35D390 E0052910 3C030500 */ lui $v1, 0x500 /* 35D394 E0052914 34630204 */ ori $v1, $v1, 0x204 @@ -359,6 +359,6 @@ glabel func_E0052460 /* 35D448 E00529C8 D7B400C8 */ ldc1 $f20, 0xc8($sp) /* 35D44C E00529CC 03E00008 */ jr $ra /* 35D450 E00529D0 27BD00D8 */ addiu $sp, $sp, 0xd8 -/* 35D454 E00529D4 00000000 */ nop -/* 35D458 E00529D8 00000000 */ nop -/* 35D45C E00529DC 00000000 */ nop +/* 35D454 E00529D4 00000000 */ nop +/* 35D458 E00529D8 00000000 */ nop +/* 35D45C E00529DC 00000000 */ nop diff --git a/asm/nonmatchings/code_35DA00/func_E0056000.s b/asm/nonmatchings/code_35DA00/func_E0056000.s index 058feb7709..a2b0c8a754 100644 --- a/asm/nonmatchings/code_35DA00/func_E0056000.s +++ b/asm/nonmatchings/code_35DA00/func_E0056000.s @@ -43,7 +43,7 @@ glabel func_E0056000 /* 35DA98 E0056098 AE03000C */ sw $v1, 0xc($s0) .LE005609C: /* 35DA9C E005609C 08015827 */ j .LE005609C -/* 35DAA0 E00560A0 00000000 */ nop +/* 35DAA0 E00560A0 00000000 */ nop .LE00560A4: /* 35DAA4 E00560A4 24020064 */ addiu $v0, $zero, 0x64 /* 35DAA8 E00560A8 AC750000 */ sw $s5, ($v1) @@ -78,22 +78,22 @@ glabel func_E0056000 /* 35DB18 E0056118 0040902D */ daddu $s2, $v0, $zero /* 35DB1C E005611C 2610004B */ addiu $s0, $s0, 0x4b /* 35DB20 E0056120 44900000 */ mtc1 $s0, $f0 -/* 35DB24 E0056124 00000000 */ nop +/* 35DB24 E0056124 00000000 */ nop /* 35DB28 E0056128 46800020 */ cvt.s.w $f0, $f0 /* 35DB2C E005612C 26310046 */ addiu $s1, $s1, 0x46 /* 35DB30 E0056130 E660FFF0 */ swc1 $f0, -0x10($s3) /* 35DB34 E0056134 44910000 */ mtc1 $s1, $f0 -/* 35DB38 E0056138 00000000 */ nop +/* 35DB38 E0056138 00000000 */ nop /* 35DB3C E005613C 46800020 */ cvt.s.w $f0, $f0 /* 35DB40 E0056140 E660FFF4 */ swc1 $f0, -0xc($s3) /* 35DB44 E0056144 44920000 */ mtc1 $s2, $f0 -/* 35DB48 E0056148 00000000 */ nop +/* 35DB48 E0056148 00000000 */ nop /* 35DB4C E005614C 46800020 */ cvt.s.w $f0, $f0 /* 35DB50 E0056150 24030168 */ addiu $v1, $zero, 0x168 /* 35DB54 E0056154 00721823 */ subu $v1, $v1, $s2 /* 35DB58 E0056158 E6600004 */ swc1 $f0, 4($s3) /* 35DB5C E005615C 44830000 */ mtc1 $v1, $f0 -/* 35DB60 E0056160 00000000 */ nop +/* 35DB60 E0056160 00000000 */ nop /* 35DB64 E0056164 46800020 */ cvt.s.w $f0, $f0 /* 35DB68 E0056168 0040182D */ daddu $v1, $v0, $zero /* 35DB6C E005616C 24020001 */ addiu $v0, $zero, 1 @@ -114,11 +114,11 @@ glabel func_E0056000 /* 35DBA4 E00561A4 26940001 */ addiu $s4, $s4, 1 .LE00561A8: /* 35DBA8 E00561A8 44830000 */ mtc1 $v1, $f0 -/* 35DBAC E00561AC 00000000 */ nop +/* 35DBAC E00561AC 00000000 */ nop /* 35DBB0 E00561B0 46800020 */ cvt.s.w $f0, $f0 /* 35DBB4 E00561B4 46000021 */ cvt.d.s $f0, $f0 /* 35DBB8 E00561B8 46340002 */ mul.d $f0, $f0, $f20 -/* 35DBBC E00561BC 00000000 */ nop +/* 35DBBC E00561BC 00000000 */ nop /* 35DBC0 E00561C0 3C01C040 */ lui $at, 0xc040 /* 35DBC4 E00561C4 44811000 */ mtc1 $at, $f2 /* 35DBC8 E00561C8 3C014040 */ lui $at, 0x4040 @@ -128,11 +128,11 @@ glabel func_E0056000 /* 35DBD8 E00561D8 AE600020 */ sw $zero, 0x20($s3) .LE00561DC: /* 35DBDC E00561DC 44830000 */ mtc1 $v1, $f0 -/* 35DBE0 E00561E0 00000000 */ nop +/* 35DBE0 E00561E0 00000000 */ nop /* 35DBE4 E00561E4 46800020 */ cvt.s.w $f0, $f0 /* 35DBE8 E00561E8 46000021 */ cvt.d.s $f0, $f0 /* 35DBEC E00561EC 46340002 */ mul.d $f0, $f0, $f20 -/* 35DBF0 E00561F0 00000000 */ nop +/* 35DBF0 E00561F0 00000000 */ nop /* 35DBF4 E00561F4 3C01C0C0 */ lui $at, 0xc0c0 /* 35DBF8 E00561F8 44811000 */ mtc1 $at, $f2 /* 35DBFC E00561FC 3C0140C0 */ lui $at, 0x40c0 @@ -149,41 +149,41 @@ glabel func_E0056000 /* 35DC24 E0056224 E6600008 */ swc1 $f0, 8($s3) .LE0056228: /* 35DC28 E0056228 44830000 */ mtc1 $v1, $f0 -/* 35DC2C E005622C 00000000 */ nop +/* 35DC2C E005622C 00000000 */ nop /* 35DC30 E0056230 46800020 */ cvt.s.w $f0, $f0 /* 35DC34 E0056234 46000021 */ cvt.d.s $f0, $f0 /* 35DC38 E0056238 46340002 */ mul.d $f0, $f0, $f20 -/* 35DC3C E005623C 00000000 */ nop +/* 35DC3C E005623C 00000000 */ nop /* 35DC40 E0056240 46200000 */ add.d $f0, $f0, $f0 /* 35DC44 E0056244 46200020 */ cvt.s.d $f0, $f0 /* 35DC48 E0056248 0C080138 */ jal func_E02004E0 /* 35DC4C E005624C E6600008 */ swc1 $f0, 8($s3) /* 35DC50 E0056250 44821000 */ mtc1 $v0, $f2 -/* 35DC54 E0056254 00000000 */ nop +/* 35DC54 E0056254 00000000 */ nop /* 35DC58 E0056258 468010A1 */ cvt.d.w $f2, $f2 /* 35DC5C E005625C 46381082 */ mul.d $f2, $f2, $f24 -/* 35DC60 E0056260 00000000 */ nop +/* 35DC60 E0056260 00000000 */ nop /* 35DC64 E0056264 46361080 */ add.d $f2, $f2, $f22 /* 35DC68 E0056268 C660FFF0 */ lwc1 $f0, -0x10($s3) /* 35DC6C E005626C 46000007 */ neg.s $f0, $f0 /* 35DC70 E0056270 46000021 */ cvt.d.s $f0, $f0 /* 35DC74 E0056274 46220002 */ mul.d $f0, $f0, $f2 -/* 35DC78 E0056278 00000000 */ nop +/* 35DC78 E0056278 00000000 */ nop /* 35DC7C E005627C 2404000A */ addiu $a0, $zero, 0xa /* 35DC80 E0056280 46200020 */ cvt.s.d $f0, $f0 /* 35DC84 E0056284 0C080138 */ jal func_E02004E0 /* 35DC88 E0056288 E660FFFC */ swc1 $f0, -4($s3) /* 35DC8C E005628C 44821000 */ mtc1 $v0, $f2 -/* 35DC90 E0056290 00000000 */ nop +/* 35DC90 E0056290 00000000 */ nop /* 35DC94 E0056294 468010A1 */ cvt.d.w $f2, $f2 /* 35DC98 E0056298 46381082 */ mul.d $f2, $f2, $f24 -/* 35DC9C E005629C 00000000 */ nop +/* 35DC9C E005629C 00000000 */ nop /* 35DCA0 E00562A0 46361080 */ add.d $f2, $f2, $f22 /* 35DCA4 E00562A4 C660FFF4 */ lwc1 $f0, -0xc($s3) /* 35DCA8 E00562A8 46000007 */ neg.s $f0, $f0 /* 35DCAC E00562AC 46000021 */ cvt.d.s $f0, $f0 /* 35DCB0 E00562B0 46220002 */ mul.d $f0, $f0, $f2 -/* 35DCB4 E00562B4 00000000 */ nop +/* 35DCB4 E00562B4 00000000 */ nop /* 35DCB8 E00562B8 46200020 */ cvt.s.d $f0, $f0 /* 35DCBC E00562BC E6600000 */ swc1 $f0, ($s3) .LE00562C0: diff --git a/asm/nonmatchings/code_35DA00/func_E0056304.s b/asm/nonmatchings/code_35DA00/func_E0056304.s index 5d18f08ec5..a419d49325 100644 --- a/asm/nonmatchings/code_35DA00/func_E0056304.s +++ b/asm/nonmatchings/code_35DA00/func_E0056304.s @@ -3,4 +3,4 @@ glabel func_E0056304 /* 35DD04 E0056304 03E00008 */ jr $ra -/* 35DD08 E0056308 00000000 */ nop +/* 35DD08 E0056308 00000000 */ nop diff --git a/asm/nonmatchings/code_35DA00/func_E005630C.s b/asm/nonmatchings/code_35DA00/func_E005630C.s index 6903d70f8e..0ea573b412 100644 --- a/asm/nonmatchings/code_35DA00/func_E005630C.s +++ b/asm/nonmatchings/code_35DA00/func_E005630C.s @@ -27,7 +27,7 @@ glabel func_E005630C /* 35DD64 E0056364 0C080128 */ jal func_E02004A0 /* 35DD68 E0056368 0280202D */ daddu $a0, $s4, $zero /* 35DD6C E005636C 08015AD6 */ j .LE0056B58 -/* 35DD70 E0056370 00000000 */ nop +/* 35DD70 E0056370 00000000 */ nop .LE0056374: /* 35DD74 E0056374 8C930000 */ lw $s3, ($a0) /* 35DD78 E0056378 2842000A */ slti $v0, $v0, 0xa @@ -38,12 +38,12 @@ glabel func_E005630C /* 35DD8C E005638C D4206EB8 */ ldc1 $f0, %lo(D_E0056EB8)($at) /* 35DD90 E0056390 00431023 */ subu $v0, $v0, $v1 /* 35DD94 E0056394 44821000 */ mtc1 $v0, $f2 -/* 35DD98 E0056398 00000000 */ nop +/* 35DD98 E0056398 00000000 */ nop /* 35DD9C E005639C 468010A1 */ cvt.d.w $f2, $f2 /* 35DDA0 E00563A0 46201082 */ mul.d $f2, $f2, $f0 -/* 35DDA4 E00563A4 00000000 */ nop +/* 35DDA4 E00563A4 00000000 */ nop /* 35DDA8 E00563A8 44830000 */ mtc1 $v1, $f0 -/* 35DDAC E00563AC 00000000 */ nop +/* 35DDAC E00563AC 00000000 */ nop /* 35DDB0 E00563B0 46800021 */ cvt.d.w $f0, $f0 /* 35DDB4 E00563B4 46220000 */ add.d $f0, $f0, $f2 /* 35DDB8 E00563B8 4620028D */ trunc.w.d $f10, $f0 @@ -57,7 +57,7 @@ glabel func_E005630C /* 35DDD4 E00563D4 C4800024 */ lwc1 $f0, 0x24($a0) /* 35DDD8 E00563D8 46800021 */ cvt.d.w $f0, $f0 /* 35DDDC E00563DC 46220002 */ mul.d $f0, $f0, $f2 -/* 35DDE0 E00563E0 00000000 */ nop +/* 35DDE0 E00563E0 00000000 */ nop /* 35DDE4 E00563E4 4620028D */ trunc.w.d $f10, $f0 /* 35DDE8 E00563E8 E48A0024 */ swc1 $f10, 0x24($a0) .LE00563EC: @@ -69,12 +69,12 @@ glabel func_E005630C /* 35DE00 E0056400 12600007 */ beqz $s3, .LE0056420 /* 35DE04 E0056404 24120001 */ addiu $s2, $zero, 1 /* 35DE08 E0056408 08015AD6 */ j .LE0056B58 -/* 35DE0C E005640C 00000000 */ nop +/* 35DE0C E005640C 00000000 */ nop .LE0056410: /* 35DE10 E0056410 1262019E */ beq $s3, $v0, .LE0056A8C /* 35DE14 E0056414 24120001 */ addiu $s2, $zero, 1 /* 35DE18 E0056418 08015AD6 */ j .LE0056B58 -/* 35DE1C E005641C 00000000 */ nop +/* 35DE1C E005641C 00000000 */ nop .LE0056420: /* 35DE20 E0056420 8E820008 */ lw $v0, 8($s4) /* 35DE24 E0056424 0242102A */ slt $v0, $s2, $v0 @@ -99,7 +99,7 @@ glabel func_E005630C /* 35DE6C E005646C D4226ED8 */ ldc1 $f2, %lo(D_E0056ED8)($at) /* 35DE70 E0056470 46000021 */ cvt.d.s $f0, $f0 /* 35DE74 E0056474 46220002 */ mul.d $f0, $f0, $f2 -/* 35DE78 E0056478 00000000 */ nop +/* 35DE78 E0056478 00000000 */ nop /* 35DE7C E005647C C6020008 */ lwc1 $f2, 8($s0) /* 35DE80 E0056480 461C1080 */ add.s $f2, $f2, $f28 /* 35DE84 E0056484 C6040004 */ lwc1 $f4, 4($s0) @@ -112,7 +112,7 @@ glabel func_E005630C /* 35DEA0 E00564A0 D4226EE0 */ ldc1 $f2, %lo(D_E0056EE0)($at) /* 35DEA4 E00564A4 46000021 */ cvt.d.s $f0, $f0 /* 35DEA8 E00564A8 46220002 */ mul.d $f0, $f0, $f2 -/* 35DEAC E00564AC 00000000 */ nop +/* 35DEAC E00564AC 00000000 */ nop /* 35DEB0 E00564B0 C60C000C */ lwc1 $f12, 0xc($s0) /* 35DEB4 E00564B4 46200020 */ cvt.s.d $f0, $f0 /* 35DEB8 E00564B8 0C080140 */ jal func_E0200500 @@ -121,14 +121,14 @@ glabel func_E005630C /* 35DEC4 E00564C4 D4226EE8 */ ldc1 $f2, %lo(D_E0056EE8)($at) /* 35DEC8 E00564C8 46000021 */ cvt.d.s $f0, $f0 /* 35DECC E00564CC 46220002 */ mul.d $f0, $f0, $f2 -/* 35DED0 E00564D0 00000000 */ nop +/* 35DED0 E00564D0 00000000 */ nop /* 35DED4 E00564D4 3C01E005 */ lui $at, %hi(D_E0056EF0) /* 35DED8 E00564D8 D4246EF0 */ ldc1 $f4, %lo(D_E0056EF0)($at) /* 35DEDC E00564DC C6020008 */ lwc1 $f2, 8($s0) /* 35DEE0 E00564E0 46240000 */ add.d $f0, $f0, $f4 /* 35DEE4 E00564E4 460010A1 */ cvt.d.s $f2, $f2 /* 35DEE8 E00564E8 46201082 */ mul.d $f2, $f2, $f0 -/* 35DEEC E00564EC 00000000 */ nop +/* 35DEEC E00564EC 00000000 */ nop /* 35DEF0 E00564F0 462010A0 */ cvt.s.d $f2, $f2 /* 35DEF4 E00564F4 0801594A */ j .LE0056528 /* 35DEF8 E00564F8 E6020008 */ swc1 $f2, 8($s0) @@ -138,7 +138,7 @@ glabel func_E005630C /* 35DF04 E0056504 D4226EF8 */ ldc1 $f2, %lo(D_E0056EF8)($at) /* 35DF08 E0056508 46000021 */ cvt.d.s $f0, $f0 /* 35DF0C E005650C 46220002 */ mul.d $f0, $f0, $f2 -/* 35DF10 E0056510 00000000 */ nop +/* 35DF10 E0056510 00000000 */ nop /* 35DF14 E0056514 C6020008 */ lwc1 $f2, 8($s0) /* 35DF18 E0056518 461C1080 */ add.s $f2, $f2, $f28 /* 35DF1C E005651C E6020008 */ swc1 $f2, 8($s0) @@ -151,7 +151,7 @@ glabel func_E005630C /* 35DF34 E0056534 2442FFE7 */ addiu $v0, $v0, -0x19 /* 35DF38 E0056538 C60C0010 */ lwc1 $f12, 0x10($s0) /* 35DF3C E005653C 44820000 */ mtc1 $v0, $f0 -/* 35DF40 E0056540 00000000 */ nop +/* 35DF40 E0056540 00000000 */ nop /* 35DF44 E0056544 46800020 */ cvt.s.w $f0, $f0 /* 35DF48 E0056548 46006300 */ add.s $f12, $f12, $f0 /* 35DF4C E005654C 0C080140 */ jal func_E0200500 @@ -162,16 +162,16 @@ glabel func_E005630C /* 35DF60 E0056560 44801000 */ mtc1 $zero, $f2 /* 35DF64 E0056564 46006321 */ cvt.d.s $f12, $f12 /* 35DF68 E0056568 46226302 */ mul.d $f12, $f12, $f2 -/* 35DF6C E005656C 00000000 */ nop +/* 35DF6C E005656C 00000000 */ nop /* 35DF70 E0056570 461A0002 */ mul.s $f0, $f0, $f26 -/* 35DF74 E0056574 00000000 */ nop +/* 35DF74 E0056574 00000000 */ nop /* 35DF78 E0056578 C602000C */ lwc1 $f2, 0xc($s0) /* 35DF7C E005657C 46001080 */ add.s $f2, $f2, $f0 /* 35DF80 E0056580 E602000C */ swc1 $f2, 0xc($s0) /* 35DF84 E0056584 0C080144 */ jal func_E0200510 /* 35DF88 E0056588 46206320 */ cvt.s.d $f12, $f12 /* 35DF8C E005658C 461A0002 */ mul.s $f0, $f0, $f26 -/* 35DF90 E0056590 00000000 */ nop +/* 35DF90 E0056590 00000000 */ nop /* 35DF94 E0056594 C606FFF8 */ lwc1 $f6, -8($s0) /* 35DF98 E0056598 C6020004 */ lwc1 $f2, 4($s0) /* 35DF9C E005659C C604FFFC */ lwc1 $f4, -4($s0) @@ -185,16 +185,16 @@ glabel func_E005630C /* 35DFBC E00565BC E606FFF8 */ swc1 $f6, -8($s0) /* 35DFC0 E00565C0 E604FFFC */ swc1 $f4, -4($s0) /* 35DFC4 E00565C4 4608203C */ c.lt.s $f4, $f8 -/* 35DFC8 E00565C8 00000000 */ nop +/* 35DFC8 E00565C8 00000000 */ nop /* 35DFCC E00565CC 45000032 */ bc1f .LE0056698 /* 35DFD0 E00565D0 E6020014 */ swc1 $f2, 0x14($s0) /* 35DFD4 E00565D4 3C01C348 */ lui $at, 0xc348 /* 35DFD8 E00565D8 44810000 */ mtc1 $at, $f0 /* 35DFDC E00565DC 46003086 */ mov.s $f2, $f6 /* 35DFE0 E00565E0 4602003C */ c.lt.s $f0, $f2 -/* 35DFE4 E00565E4 00000000 */ nop +/* 35DFE4 E00565E4 00000000 */ nop /* 35DFE8 E00565E8 45000005 */ bc1f .LE0056600 -/* 35DFEC E00565EC 00000000 */ nop +/* 35DFEC E00565EC 00000000 */ nop /* 35DFF0 E00565F0 C6000024 */ lwc1 $f0, 0x24($s0) /* 35DFF4 E00565F4 46000021 */ cvt.d.s $f0, $f0 /* 35DFF8 E00565F8 08015983 */ j .LE005660C @@ -208,9 +208,9 @@ glabel func_E005630C /* 35E010 E0056610 E6000024 */ swc1 $f0, 0x24($s0) /* 35E014 E0056614 C6000000 */ lwc1 $f0, ($s0) /* 35E018 E0056618 4600C03C */ c.lt.s $f24, $f0 -/* 35E01C E005661C 00000000 */ nop +/* 35E01C E005661C 00000000 */ nop /* 35E020 E0056620 45000005 */ bc1f .LE0056638 -/* 35E024 E0056624 00000000 */ nop +/* 35E024 E0056624 00000000 */ nop /* 35E028 E0056628 C600002C */ lwc1 $f0, 0x2c($s0) /* 35E02C E005662C 46000021 */ cvt.d.s $f0, $f0 /* 35E030 E0056630 08015991 */ j .LE0056644 @@ -225,15 +225,15 @@ glabel func_E005630C /* 35E04C E005664C C6040024 */ lwc1 $f4, 0x24($s0) /* 35E050 E0056650 46002121 */ cvt.d.s $f4, $f4 /* 35E054 E0056654 46362102 */ mul.d $f4, $f4, $f22 -/* 35E058 E0056658 00000000 */ nop +/* 35E058 E0056658 00000000 */ nop /* 35E05C E005665C C602002C */ lwc1 $f2, 0x2c($s0) /* 35E060 E0056660 460010A1 */ cvt.d.s $f2, $f2 /* 35E064 E0056664 46361082 */ mul.d $f2, $f2, $f22 -/* 35E068 E0056668 00000000 */ nop +/* 35E068 E0056668 00000000 */ nop /* 35E06C E005666C C6000008 */ lwc1 $f0, 8($s0) /* 35E070 E0056670 46000021 */ cvt.d.s $f0, $f0 /* 35E074 E0056674 46360002 */ mul.d $f0, $f0, $f22 -/* 35E078 E0056678 00000000 */ nop +/* 35E078 E0056678 00000000 */ nop /* 35E07C E005667C 46202120 */ cvt.s.d $f4, $f4 /* 35E080 E0056680 462010A0 */ cvt.s.d $f2, $f2 /* 35E084 E0056684 46200020 */ cvt.s.d $f0, $f0 @@ -244,9 +244,9 @@ glabel func_E005630C .LE0056698: /* 35E098 E0056698 C600FFF8 */ lwc1 $f0, -8($s0) /* 35E09C E005669C 4600C03C */ c.lt.s $f24, $f0 -/* 35E0A0 E00566A0 00000000 */ nop +/* 35E0A0 E00566A0 00000000 */ nop /* 35E0A4 E00566A4 45000005 */ bc1f .LE00566BC -/* 35E0A8 E00566A8 00000000 */ nop +/* 35E0A8 E00566A8 00000000 */ nop /* 35E0AC E00566AC C6000024 */ lwc1 $f0, 0x24($s0) /* 35E0B0 E00566B0 46000021 */ cvt.d.s $f0, $f0 /* 35E0B4 E00566B4 080159B2 */ j .LE00566C8 @@ -260,9 +260,9 @@ glabel func_E005630C /* 35E0CC E00566CC E6000024 */ swc1 $f0, 0x24($s0) /* 35E0D0 E00566D0 C6000000 */ lwc1 $f0, ($s0) /* 35E0D4 E00566D4 4600C03C */ c.lt.s $f24, $f0 -/* 35E0D8 E00566D8 00000000 */ nop +/* 35E0D8 E00566D8 00000000 */ nop /* 35E0DC E00566DC 45000005 */ bc1f .LE00566F4 -/* 35E0E0 E00566E0 00000000 */ nop +/* 35E0E0 E00566E0 00000000 */ nop /* 35E0E4 E00566E4 C600002C */ lwc1 $f0, 0x2c($s0) /* 35E0E8 E00566E8 46000021 */ cvt.d.s $f0, $f0 /* 35E0EC E00566EC 080159C0 */ j .LE0056700 @@ -277,11 +277,11 @@ glabel func_E005630C /* 35E108 E0056708 C6020024 */ lwc1 $f2, 0x24($s0) /* 35E10C E005670C 460010A1 */ cvt.d.s $f2, $f2 /* 35E110 E0056710 46361082 */ mul.d $f2, $f2, $f22 -/* 35E114 E0056714 00000000 */ nop +/* 35E114 E0056714 00000000 */ nop /* 35E118 E0056718 C600002C */ lwc1 $f0, 0x2c($s0) /* 35E11C E005671C 46000021 */ cvt.d.s $f0, $f0 /* 35E120 E0056720 46360002 */ mul.d $f0, $f0, $f22 -/* 35E124 E0056724 00000000 */ nop +/* 35E124 E0056724 00000000 */ nop /* 35E128 E0056728 462010A0 */ cvt.s.d $f2, $f2 /* 35E12C E005672C 46200020 */ cvt.s.d $f0, $f0 /* 35E130 E0056730 E6020024 */ swc1 $f2, 0x24($s0) @@ -306,7 +306,7 @@ glabel func_E005630C /* 35E178 E0056778 1440FF38 */ bnez $v0, .LE005645C /* 35E17C E005677C 2610003C */ addiu $s0, $s0, 0x3c /* 35E180 E0056780 08015AD6 */ j .LE0056B58 -/* 35E184 E0056784 00000000 */ nop +/* 35E184 E0056784 00000000 */ nop .LE0056788: /* 35E188 E0056788 8E820008 */ lw $v0, 8($s4) /* 35E18C E005678C 24120001 */ addiu $s2, $zero, 1 @@ -332,7 +332,7 @@ glabel func_E005630C /* 35E1D8 E00567D8 D4226F10 */ ldc1 $f2, %lo(D_E0056F10)($at) /* 35E1DC E00567DC 46000021 */ cvt.d.s $f0, $f0 /* 35E1E0 E00567E0 46220002 */ mul.d $f0, $f0, $f2 -/* 35E1E4 E00567E4 00000000 */ nop +/* 35E1E4 E00567E4 00000000 */ nop /* 35E1E8 E00567E8 46200000 */ add.d $f0, $f0, $f0 /* 35E1EC E00567EC C6020004 */ lwc1 $f2, 4($s0) /* 35E1F0 E00567F0 46200020 */ cvt.s.d $f0, $f0 @@ -342,7 +342,7 @@ glabel func_E005630C /* 35E200 E0056800 E6020004 */ swc1 $f2, 4($s0) /* 35E204 E0056804 460010A1 */ cvt.d.s $f2, $f2 /* 35E208 E0056808 46201082 */ mul.d $f2, $f2, $f0 -/* 35E20C E005680C 00000000 */ nop +/* 35E20C E005680C 00000000 */ nop /* 35E210 E0056810 C6000008 */ lwc1 $f0, 8($s0) /* 35E214 E0056814 461C0000 */ add.s $f0, $f0, $f28 /* 35E218 E0056818 E6000008 */ swc1 $f0, 8($s0) @@ -356,7 +356,7 @@ glabel func_E005630C /* 35E238 E0056838 2442FFE7 */ addiu $v0, $v0, -0x19 /* 35E23C E005683C C60C0010 */ lwc1 $f12, 0x10($s0) /* 35E240 E0056840 44820000 */ mtc1 $v0, $f0 -/* 35E244 E0056844 00000000 */ nop +/* 35E244 E0056844 00000000 */ nop /* 35E248 E0056848 46800020 */ cvt.s.w $f0, $f0 /* 35E24C E005684C 46006300 */ add.s $f12, $f12, $f0 /* 35E250 E0056850 0C080140 */ jal func_E0200500 @@ -367,16 +367,16 @@ glabel func_E005630C /* 35E264 E0056864 44801000 */ mtc1 $zero, $f2 /* 35E268 E0056868 46006321 */ cvt.d.s $f12, $f12 /* 35E26C E005686C 46226302 */ mul.d $f12, $f12, $f2 -/* 35E270 E0056870 00000000 */ nop +/* 35E270 E0056870 00000000 */ nop /* 35E274 E0056874 461A0002 */ mul.s $f0, $f0, $f26 -/* 35E278 E0056878 00000000 */ nop +/* 35E278 E0056878 00000000 */ nop /* 35E27C E005687C C602000C */ lwc1 $f2, 0xc($s0) /* 35E280 E0056880 46001080 */ add.s $f2, $f2, $f0 /* 35E284 E0056884 E602000C */ swc1 $f2, 0xc($s0) /* 35E288 E0056888 0C080144 */ jal func_E0200510 /* 35E28C E005688C 46206320 */ cvt.s.d $f12, $f12 /* 35E290 E0056890 461A0002 */ mul.s $f0, $f0, $f26 -/* 35E294 E0056894 00000000 */ nop +/* 35E294 E0056894 00000000 */ nop /* 35E298 E0056898 C606FFF8 */ lwc1 $f6, -8($s0) /* 35E29C E005689C C6020004 */ lwc1 $f2, 4($s0) /* 35E2A0 E00568A0 C604FFFC */ lwc1 $f4, -4($s0) @@ -390,16 +390,16 @@ glabel func_E005630C /* 35E2C0 E00568C0 E606FFF8 */ swc1 $f6, -8($s0) /* 35E2C4 E00568C4 E604FFFC */ swc1 $f4, -4($s0) /* 35E2C8 E00568C8 4608203C */ c.lt.s $f4, $f8 -/* 35E2CC E00568CC 00000000 */ nop +/* 35E2CC E00568CC 00000000 */ nop /* 35E2D0 E00568D0 45000032 */ bc1f .LE005699C /* 35E2D4 E00568D4 E6020014 */ swc1 $f2, 0x14($s0) /* 35E2D8 E00568D8 3C01C348 */ lui $at, 0xc348 /* 35E2DC E00568DC 44810000 */ mtc1 $at, $f0 /* 35E2E0 E00568E0 46003086 */ mov.s $f2, $f6 /* 35E2E4 E00568E4 4602003C */ c.lt.s $f0, $f2 -/* 35E2E8 E00568E8 00000000 */ nop +/* 35E2E8 E00568E8 00000000 */ nop /* 35E2EC E00568EC 45000005 */ bc1f .LE0056904 -/* 35E2F0 E00568F0 00000000 */ nop +/* 35E2F0 E00568F0 00000000 */ nop /* 35E2F4 E00568F4 C6000024 */ lwc1 $f0, 0x24($s0) /* 35E2F8 E00568F8 46000021 */ cvt.d.s $f0, $f0 /* 35E2FC E00568FC 08015A44 */ j .LE0056910 @@ -413,9 +413,9 @@ glabel func_E005630C /* 35E314 E0056914 E6000024 */ swc1 $f0, 0x24($s0) /* 35E318 E0056918 C6000000 */ lwc1 $f0, ($s0) /* 35E31C E005691C 4600C03C */ c.lt.s $f24, $f0 -/* 35E320 E0056920 00000000 */ nop +/* 35E320 E0056920 00000000 */ nop /* 35E324 E0056924 45000005 */ bc1f .LE005693C -/* 35E328 E0056928 00000000 */ nop +/* 35E328 E0056928 00000000 */ nop /* 35E32C E005692C C600002C */ lwc1 $f0, 0x2c($s0) /* 35E330 E0056930 46000021 */ cvt.d.s $f0, $f0 /* 35E334 E0056934 08015A52 */ j .LE0056948 @@ -430,15 +430,15 @@ glabel func_E005630C /* 35E350 E0056950 C6040024 */ lwc1 $f4, 0x24($s0) /* 35E354 E0056954 46002121 */ cvt.d.s $f4, $f4 /* 35E358 E0056958 46362102 */ mul.d $f4, $f4, $f22 -/* 35E35C E005695C 00000000 */ nop +/* 35E35C E005695C 00000000 */ nop /* 35E360 E0056960 C602002C */ lwc1 $f2, 0x2c($s0) /* 35E364 E0056964 460010A1 */ cvt.d.s $f2, $f2 /* 35E368 E0056968 46361082 */ mul.d $f2, $f2, $f22 -/* 35E36C E005696C 00000000 */ nop +/* 35E36C E005696C 00000000 */ nop /* 35E370 E0056970 C6000008 */ lwc1 $f0, 8($s0) /* 35E374 E0056974 46000021 */ cvt.d.s $f0, $f0 /* 35E378 E0056978 46360002 */ mul.d $f0, $f0, $f22 -/* 35E37C E005697C 00000000 */ nop +/* 35E37C E005697C 00000000 */ nop /* 35E380 E0056980 46202120 */ cvt.s.d $f4, $f4 /* 35E384 E0056984 462010A0 */ cvt.s.d $f2, $f2 /* 35E388 E0056988 46200020 */ cvt.s.d $f0, $f0 @@ -449,9 +449,9 @@ glabel func_E005630C .LE005699C: /* 35E39C E005699C C600FFF8 */ lwc1 $f0, -8($s0) /* 35E3A0 E00569A0 4600C03C */ c.lt.s $f24, $f0 -/* 35E3A4 E00569A4 00000000 */ nop +/* 35E3A4 E00569A4 00000000 */ nop /* 35E3A8 E00569A8 45000005 */ bc1f .LE00569C0 -/* 35E3AC E00569AC 00000000 */ nop +/* 35E3AC E00569AC 00000000 */ nop /* 35E3B0 E00569B0 C6000024 */ lwc1 $f0, 0x24($s0) /* 35E3B4 E00569B4 46000021 */ cvt.d.s $f0, $f0 /* 35E3B8 E00569B8 08015A73 */ j .LE00569CC @@ -465,9 +465,9 @@ glabel func_E005630C /* 35E3D0 E00569D0 E6000024 */ swc1 $f0, 0x24($s0) /* 35E3D4 E00569D4 C6000000 */ lwc1 $f0, ($s0) /* 35E3D8 E00569D8 4600C03C */ c.lt.s $f24, $f0 -/* 35E3DC E00569DC 00000000 */ nop +/* 35E3DC E00569DC 00000000 */ nop /* 35E3E0 E00569E0 45000005 */ bc1f .LE00569F8 -/* 35E3E4 E00569E4 00000000 */ nop +/* 35E3E4 E00569E4 00000000 */ nop /* 35E3E8 E00569E8 C600002C */ lwc1 $f0, 0x2c($s0) /* 35E3EC E00569EC 46000021 */ cvt.d.s $f0, $f0 /* 35E3F0 E00569F0 08015A81 */ j .LE0056A04 @@ -482,11 +482,11 @@ glabel func_E005630C /* 35E40C E0056A0C C6020024 */ lwc1 $f2, 0x24($s0) /* 35E410 E0056A10 460010A1 */ cvt.d.s $f2, $f2 /* 35E414 E0056A14 46361082 */ mul.d $f2, $f2, $f22 -/* 35E418 E0056A18 00000000 */ nop +/* 35E418 E0056A18 00000000 */ nop /* 35E41C E0056A1C C600002C */ lwc1 $f0, 0x2c($s0) /* 35E420 E0056A20 46000021 */ cvt.d.s $f0, $f0 /* 35E424 E0056A24 46360002 */ mul.d $f0, $f0, $f22 -/* 35E428 E0056A28 00000000 */ nop +/* 35E428 E0056A28 00000000 */ nop /* 35E42C E0056A2C 462010A0 */ cvt.s.d $f2, $f2 /* 35E430 E0056A30 46200020 */ cvt.s.d $f0, $f0 /* 35E434 E0056A34 E6020024 */ swc1 $f2, 0x24($s0) @@ -511,7 +511,7 @@ glabel func_E005630C /* 35E47C E0056A7C 1440FF52 */ bnez $v0, .LE00567C8 /* 35E480 E0056A80 2610003C */ addiu $s0, $s0, 0x3c /* 35E484 E0056A84 08015AD6 */ j .LE0056B58 -/* 35E488 E0056A88 00000000 */ nop +/* 35E488 E0056A88 00000000 */ nop .LE0056A8C: /* 35E48C E0056A8C 8E820008 */ lw $v0, 8($s4) /* 35E490 E0056A90 0242102A */ slt $v0, $s2, $v0 @@ -530,7 +530,7 @@ glabel func_E005630C /* 35E4C0 E0056AC0 2442FFE7 */ addiu $v0, $v0, -0x19 /* 35E4C4 E0056AC4 C60C0014 */ lwc1 $f12, 0x14($s0) /* 35E4C8 E0056AC8 44820000 */ mtc1 $v0, $f0 -/* 35E4CC E0056ACC 00000000 */ nop +/* 35E4CC E0056ACC 00000000 */ nop /* 35E4D0 E0056AD0 46800020 */ cvt.s.w $f0, $f0 /* 35E4D4 E0056AD4 46006300 */ add.s $f12, $f12, $f0 /* 35E4D8 E0056AD8 0C080140 */ jal func_E0200500 @@ -538,16 +538,16 @@ glabel func_E005630C /* 35E4E0 E0056AE0 C60C0014 */ lwc1 $f12, 0x14($s0) /* 35E4E4 E0056AE4 46006321 */ cvt.d.s $f12, $f12 /* 35E4E8 E0056AE8 46366302 */ mul.d $f12, $f12, $f22 -/* 35E4EC E0056AEC 00000000 */ nop +/* 35E4EC E0056AEC 00000000 */ nop /* 35E4F0 E0056AF0 46140002 */ mul.s $f0, $f0, $f20 -/* 35E4F4 E0056AF4 00000000 */ nop +/* 35E4F4 E0056AF4 00000000 */ nop /* 35E4F8 E0056AF8 C6020010 */ lwc1 $f2, 0x10($s0) /* 35E4FC E0056AFC 46001080 */ add.s $f2, $f2, $f0 /* 35E500 E0056B00 E6020010 */ swc1 $f2, 0x10($s0) /* 35E504 E0056B04 0C080144 */ jal func_E0200510 /* 35E508 E0056B08 46206320 */ cvt.s.d $f12, $f12 /* 35E50C E0056B0C 46140002 */ mul.s $f0, $f0, $f20 -/* 35E510 E0056B10 00000000 */ nop +/* 35E510 E0056B10 00000000 */ nop /* 35E514 E0056B14 C606FFFC */ lwc1 $f6, -4($s0) /* 35E518 E0056B18 C6020008 */ lwc1 $f2, 8($s0) /* 35E51C E0056B1C C6040000 */ lwc1 $f4, ($s0) diff --git a/asm/nonmatchings/code_35DA00/func_E0056BD0.s b/asm/nonmatchings/code_35DA00/func_E0056BD0.s index bb345c3d0a..988302f678 100644 --- a/asm/nonmatchings/code_35DA00/func_E0056BD0.s +++ b/asm/nonmatchings/code_35DA00/func_E0056BD0.s @@ -182,6 +182,6 @@ glabel func_E0056BD0 /* 35E888 E0056E88 D7B40100 */ ldc1 $f20, 0x100($sp) /* 35E88C E0056E8C 03E00008 */ jr $ra /* 35E890 E0056E90 27BD0110 */ addiu $sp, $sp, 0x110 -/* 35E894 E0056E94 00000000 */ nop -/* 35E898 E0056E98 00000000 */ nop -/* 35E89C E0056E9C 00000000 */ nop +/* 35E894 E0056E94 00000000 */ nop +/* 35E898 E0056E98 00000000 */ nop +/* 35E89C E0056E9C 00000000 */ nop diff --git a/asm/nonmatchings/code_35E920/func_E0058000.s b/asm/nonmatchings/code_35E920/func_E0058000.s index e7041aec89..fd930799c6 100644 --- a/asm/nonmatchings/code_35E920/func_E0058000.s +++ b/asm/nonmatchings/code_35E920/func_E0058000.s @@ -40,7 +40,7 @@ glabel func_E0058000 /* 35E9AC E005808C AE03000C */ sw $v1, 0xc($s0) .LE0058090: /* 35E9B0 E0058090 08016024 */ j .LE0058090 -/* 35E9B4 E0058094 00000000 */ nop +/* 35E9B4 E0058094 00000000 */ nop .LE0058098: /* 35E9B8 E0058098 24020064 */ addiu $v0, $zero, 0x64 /* 35E9BC E005809C AC710000 */ sw $s1, ($v1) @@ -63,7 +63,7 @@ glabel func_E0058000 /* 35E9FC E00580DC 2404001E */ addiu $a0, $zero, 0x1e /* 35EA00 E00580E0 2442FFF1 */ addiu $v0, $v0, -0xf /* 35EA04 E00580E4 44820000 */ mtc1 $v0, $f0 -/* 35EA08 E00580E8 00000000 */ nop +/* 35EA08 E00580E8 00000000 */ nop /* 35EA0C E00580EC 46800020 */ cvt.s.w $f0, $f0 /* 35EA10 E00580F0 E600FFF0 */ swc1 $f0, -0x10($s0) /* 35EA14 E00580F4 0C080138 */ jal func_E02004E0 @@ -71,19 +71,19 @@ glabel func_E0058000 /* 35EA1C E00580FC 24040168 */ addiu $a0, $zero, 0x168 /* 35EA20 E0058100 2442FFF1 */ addiu $v0, $v0, -0xf /* 35EA24 E0058104 44820000 */ mtc1 $v0, $f0 -/* 35EA28 E0058108 00000000 */ nop +/* 35EA28 E0058108 00000000 */ nop /* 35EA2C E005810C 46800020 */ cvt.s.w $f0, $f0 /* 35EA30 E0058110 0C080138 */ jal func_E02004E0 /* 35EA34 E0058114 E600FFF8 */ swc1 $f0, -8($s0) /* 35EA38 E0058118 24040168 */ addiu $a0, $zero, 0x168 /* 35EA3C E005811C 44820000 */ mtc1 $v0, $f0 -/* 35EA40 E0058120 00000000 */ nop +/* 35EA40 E0058120 00000000 */ nop /* 35EA44 E0058124 46800020 */ cvt.s.w $f0, $f0 /* 35EA48 E0058128 0C080138 */ jal func_E02004E0 /* 35EA4C E005812C E6000004 */ swc1 $f0, 4($s0) /* 35EA50 E0058130 24040064 */ addiu $a0, $zero, 0x64 /* 35EA54 E0058134 44820000 */ mtc1 $v0, $f0 -/* 35EA58 E0058138 00000000 */ nop +/* 35EA58 E0058138 00000000 */ nop /* 35EA5C E005813C 46800020 */ cvt.s.w $f0, $f0 /* 35EA60 E0058140 0C080138 */ jal func_E02004E0 /* 35EA64 E0058144 E600000C */ swc1 $f0, 0xc($s0) @@ -96,7 +96,7 @@ glabel func_E0058000 /* 35EA80 E0058160 00081883 */ sra $v1, $t0, 2 /* 35EA84 E0058164 00621823 */ subu $v1, $v1, $v0 /* 35EA88 E0058168 44830000 */ mtc1 $v1, $f0 -/* 35EA8C E005816C 00000000 */ nop +/* 35EA8C E005816C 00000000 */ nop /* 35EA90 E0058170 46800020 */ cvt.s.w $f0, $f0 /* 35EA94 E0058174 E6000008 */ swc1 $f0, 8($s0) /* 35EA98 E0058178 0232102A */ slt $v0, $s1, $s2 diff --git a/asm/nonmatchings/code_35E920/func_E00581AC.s b/asm/nonmatchings/code_35E920/func_E00581AC.s index 66e43ecb09..296ec7b329 100644 --- a/asm/nonmatchings/code_35E920/func_E00581AC.s +++ b/asm/nonmatchings/code_35E920/func_E00581AC.s @@ -3,4 +3,4 @@ glabel func_E00581AC /* 35EACC E00581AC 03E00008 */ jr $ra -/* 35EAD0 E00581B0 00000000 */ nop +/* 35EAD0 E00581B0 00000000 */ nop diff --git a/asm/nonmatchings/code_35E920/func_E00581B4.s b/asm/nonmatchings/code_35E920/func_E00581B4.s index 8a2fb09ba0..a7b8f92144 100644 --- a/asm/nonmatchings/code_35E920/func_E00581B4.s +++ b/asm/nonmatchings/code_35E920/func_E00581B4.s @@ -40,11 +40,11 @@ glabel func_E00581B4 .LE0058238: /* 35EB58 E0058238 8CA40028 */ lw $a0, 0x28($a1) /* 35EB5C E005823C 04810005 */ bgez $a0, .LE0058254 -/* 35EB60 E0058240 00000000 */ nop +/* 35EB60 E0058240 00000000 */ nop /* 35EB64 E0058244 0C080128 */ jal func_E02004A0 /* 35EB68 E0058248 0260202D */ daddu $a0, $s3, $zero /* 35EB6C E005824C 0801611B */ j .LE005846C -/* 35EB70 E0058250 00000000 */ nop +/* 35EB70 E0058250 00000000 */ nop .LE0058254: /* 35EB74 E0058254 8CA2002C */ lw $v0, 0x2c($a1) /* 35EB78 E0058258 2842000A */ slti $v0, $v0, 0xa @@ -55,12 +55,12 @@ glabel func_E00581B4 /* 35EB8C E005826C D4208780 */ ldc1 $f0, %lo(D_E0058780)($at) /* 35EB90 E0058270 00431023 */ subu $v0, $v0, $v1 /* 35EB94 E0058274 44821000 */ mtc1 $v0, $f2 -/* 35EB98 E0058278 00000000 */ nop +/* 35EB98 E0058278 00000000 */ nop /* 35EB9C E005827C 468010A1 */ cvt.d.w $f2, $f2 /* 35EBA0 E0058280 46201082 */ mul.d $f2, $f2, $f0 -/* 35EBA4 E0058284 00000000 */ nop +/* 35EBA4 E0058284 00000000 */ nop /* 35EBA8 E0058288 44830000 */ mtc1 $v1, $f0 -/* 35EBAC E005828C 00000000 */ nop +/* 35EBAC E005828C 00000000 */ nop /* 35EBB0 E0058290 46800021 */ cvt.d.w $f0, $f0 /* 35EBB4 E0058294 46220000 */ add.d $f0, $f0, $f2 /* 35EBB8 E0058298 4620020D */ trunc.w.d $f8, $f0 @@ -68,13 +68,13 @@ glabel func_E00581B4 .LE00582A0: /* 35EBC0 E00582A0 2882000A */ slti $v0, $a0, 0xa /* 35EBC4 E00582A4 10400009 */ beqz $v0, .LE00582CC -/* 35EBC8 E00582A8 00000000 */ nop +/* 35EBC8 E00582A8 00000000 */ nop /* 35EBCC E00582AC 3C01E006 */ lui $at, %hi(D_E0058788) /* 35EBD0 E00582B0 D4228788 */ ldc1 $f2, %lo(D_E0058788)($at) /* 35EBD4 E00582B4 C4A00024 */ lwc1 $f0, 0x24($a1) /* 35EBD8 E00582B8 46800021 */ cvt.d.w $f0, $f0 /* 35EBDC E00582BC 46220002 */ mul.d $f0, $f0, $f2 -/* 35EBE0 E00582C0 00000000 */ nop +/* 35EBE0 E00582C0 00000000 */ nop /* 35EBE4 E00582C4 4620020D */ trunc.w.d $f8, $f0 /* 35EBE8 E00582C8 E4A80024 */ swc1 $f8, 0x24($a1) .LE00582CC: @@ -97,7 +97,7 @@ glabel func_E00581B4 /* 35EC28 E0058308 D4228790 */ ldc1 $f2, %lo(D_E0058790)($at) /* 35EC2C E005830C 46000021 */ cvt.d.s $f0, $f0 /* 35EC30 E0058310 46220002 */ mul.d $f0, $f0, $f2 -/* 35EC34 E0058314 00000000 */ nop +/* 35EC34 E0058314 00000000 */ nop /* 35EC38 E0058318 C602000C */ lwc1 $f2, 0xc($s0) /* 35EC3C E005831C 46161080 */ add.s $f2, $f2, $f22 /* 35EC40 E0058320 C6040008 */ lwc1 $f4, 8($s0) @@ -110,7 +110,7 @@ glabel func_E00581B4 /* 35EC5C E005833C D4228798 */ ldc1 $f2, %lo(D_E0058798)($at) /* 35EC60 E0058340 46000021 */ cvt.d.s $f0, $f0 /* 35EC64 E0058344 46220002 */ mul.d $f0, $f0, $f2 -/* 35EC68 E0058348 00000000 */ nop +/* 35EC68 E0058348 00000000 */ nop /* 35EC6C E005834C C60C0010 */ lwc1 $f12, 0x10($s0) /* 35EC70 E0058350 46200020 */ cvt.s.d $f0, $f0 /* 35EC74 E0058354 0C080140 */ jal func_E0200500 @@ -119,14 +119,14 @@ glabel func_E00581B4 /* 35EC80 E0058360 D42287A0 */ ldc1 $f2, %lo(D_E00587A0)($at) /* 35EC84 E0058364 46000021 */ cvt.d.s $f0, $f0 /* 35EC88 E0058368 46220002 */ mul.d $f0, $f0, $f2 -/* 35EC8C E005836C 00000000 */ nop +/* 35EC8C E005836C 00000000 */ nop /* 35EC90 E0058370 3C01E006 */ lui $at, %hi(D_E00587A8) /* 35EC94 E0058374 D42487A8 */ ldc1 $f4, %lo(D_E00587A8)($at) /* 35EC98 E0058378 C602000C */ lwc1 $f2, 0xc($s0) /* 35EC9C E005837C 46240000 */ add.d $f0, $f0, $f4 /* 35ECA0 E0058380 460010A1 */ cvt.d.s $f2, $f2 /* 35ECA4 E0058384 46201082 */ mul.d $f2, $f2, $f0 -/* 35ECA8 E0058388 00000000 */ nop +/* 35ECA8 E0058388 00000000 */ nop /* 35ECAC E005838C 462010A0 */ cvt.s.d $f2, $f2 /* 35ECB0 E0058390 080160F1 */ j .LE00583C4 /* 35ECB4 E0058394 E602000C */ swc1 $f2, 0xc($s0) @@ -136,7 +136,7 @@ glabel func_E00581B4 /* 35ECC0 E00583A0 D42287B0 */ ldc1 $f2, %lo(D_E00587B0)($at) /* 35ECC4 E00583A4 46000021 */ cvt.d.s $f0, $f0 /* 35ECC8 E00583A8 46220002 */ mul.d $f0, $f0, $f2 -/* 35ECCC E00583AC 00000000 */ nop +/* 35ECCC E00583AC 00000000 */ nop /* 35ECD0 E00583B0 C602000C */ lwc1 $f2, 0xc($s0) /* 35ECD4 E00583B4 46161080 */ add.s $f2, $f2, $f22 /* 35ECD8 E00583B8 E602000C */ swc1 $f2, 0xc($s0) @@ -148,7 +148,7 @@ glabel func_E00581B4 /* 35ECEC E00583CC 3C0141C8 */ lui $at, 0x41c8 /* 35ECF0 E00583D0 44811000 */ mtc1 $at, $f2 /* 35ECF4 E00583D4 44820000 */ mtc1 $v0, $f0 -/* 35ECF8 E00583D8 00000000 */ nop +/* 35ECF8 E00583D8 00000000 */ nop /* 35ECFC E00583DC 46800020 */ cvt.s.w $f0, $f0 /* 35ED00 E00583E0 46020001 */ sub.s $f0, $f0, $f2 /* 35ED04 E00583E4 C60C0014 */ lwc1 $f12, 0x14($s0) @@ -156,19 +156,19 @@ glabel func_E00581B4 /* 35ED0C E00583EC 0C080140 */ jal func_E0200500 /* 35ED10 E00583F0 E60C0014 */ swc1 $f12, 0x14($s0) /* 35ED14 E00583F4 46140002 */ mul.s $f0, $f0, $f20 -/* 35ED18 E00583F8 00000000 */ nop +/* 35ED18 E00583F8 00000000 */ nop /* 35ED1C E00583FC C6020014 */ lwc1 $f2, 0x14($s0) /* 35ED20 E0058400 3C013F00 */ lui $at, 0x3f00 /* 35ED24 E0058404 44816000 */ mtc1 $at, $f12 -/* 35ED28 E0058408 00000000 */ nop +/* 35ED28 E0058408 00000000 */ nop /* 35ED2C E005840C 460C1302 */ mul.s $f12, $f2, $f12 -/* 35ED30 E0058410 00000000 */ nop +/* 35ED30 E0058410 00000000 */ nop /* 35ED34 E0058414 C6020010 */ lwc1 $f2, 0x10($s0) /* 35ED38 E0058418 46001080 */ add.s $f2, $f2, $f0 /* 35ED3C E005841C 0C080144 */ jal func_E0200510 /* 35ED40 E0058420 E6020010 */ swc1 $f2, 0x10($s0) /* 35ED44 E0058424 46140002 */ mul.s $f0, $f0, $f20 -/* 35ED48 E0058428 00000000 */ nop +/* 35ED48 E0058428 00000000 */ nop /* 35ED4C E005842C C606FFFC */ lwc1 $f6, -4($s0) /* 35ED50 E0058430 C6020008 */ lwc1 $f2, 8($s0) /* 35ED54 E0058434 C6040000 */ lwc1 $f4, ($s0) diff --git a/asm/nonmatchings/code_3602C0/func_E005A000.s b/asm/nonmatchings/code_3602C0/func_E005A000.s index 4dab03ae18..bec5205167 100644 --- a/asm/nonmatchings/code_3602C0/func_E005A000.s +++ b/asm/nonmatchings/code_3602C0/func_E005A000.s @@ -48,7 +48,7 @@ glabel func_E005A000 /* 36036C E005A0AC AE11000C */ sw $s1, 0xc($s0) .LE005A0B0: /* 360370 E005A0B0 0801682C */ j .LE005A0B0 -/* 360374 E005A0B4 00000000 */ nop +/* 360374 E005A0B4 00000000 */ nop .LE005A0B8: /* 360378 E005A0B8 0220202D */ daddu $a0, $s1, $zero /* 36037C E005A0BC 00132840 */ sll $a1, $s3, 1 @@ -87,7 +87,7 @@ glabel func_E005A000 /* 3603F8 E005A138 16810004 */ bne $s4, $at, .LE005A14C /* 3603FC E005A13C 3C018000 */ lui $at, 0x8000 /* 360400 E005A140 16210002 */ bne $s1, $at, .LE005A14C -/* 360404 E005A144 00000000 */ nop +/* 360404 E005A144 00000000 */ nop /* 360408 E005A148 0006000D */ break 6 .LE005A14C: /* 36040C E005A14C 00001812 */ mflo $v1 @@ -95,20 +95,20 @@ glabel func_E005A000 /* 360414 E005A154 AE00FFD8 */ sw $zero, -0x28($s0) /* 360418 E005A158 AE00FFDC */ sw $zero, -0x24($s0) /* 36041C E005A15C 4483A000 */ mtc1 $v1, $f20 -/* 360420 E005A160 00000000 */ nop +/* 360420 E005A160 00000000 */ nop /* 360424 E005A164 4680A520 */ cvt.s.w $f20, $f20 /* 360428 E005A168 0C080140 */ jal func_E0200500 /* 36042C E005A16C 4600A306 */ mov.s $f12, $f20 /* 360430 E005A170 46000021 */ cvt.d.s $f0, $f0 /* 360434 E005A174 46360002 */ mul.d $f0, $f0, $f22 -/* 360438 E005A178 00000000 */ nop +/* 360438 E005A178 00000000 */ nop /* 36043C E005A17C 4600A306 */ mov.s $f12, $f20 /* 360440 E005A180 46200020 */ cvt.s.d $f0, $f0 /* 360444 E005A184 0C080144 */ jal func_E0200510 /* 360448 E005A188 E600FFE0 */ swc1 $f0, -0x20($s0) /* 36044C E005A18C 46000021 */ cvt.d.s $f0, $f0 /* 360450 E005A190 46360002 */ mul.d $f0, $f0, $f22 -/* 360454 E005A194 00000000 */ nop +/* 360454 E005A194 00000000 */ nop /* 360458 E005A198 26310168 */ addiu $s1, $s1, 0x168 /* 36045C E005A19C 26520001 */ addiu $s2, $s2, 1 /* 360460 E005A1A0 0253102A */ slt $v0, $s2, $s3 diff --git a/asm/nonmatchings/code_3602C0/func_E005A1F4.s b/asm/nonmatchings/code_3602C0/func_E005A1F4.s index 4b428a2827..511771edb9 100644 --- a/asm/nonmatchings/code_3602C0/func_E005A1F4.s +++ b/asm/nonmatchings/code_3602C0/func_E005A1F4.s @@ -3,4 +3,4 @@ glabel func_E005A1F4 /* 3604B4 E005A1F4 03E00008 */ jr $ra -/* 3604B8 E005A1F8 00000000 */ nop +/* 3604B8 E005A1F8 00000000 */ nop diff --git a/asm/nonmatchings/code_3602C0/func_E005A1FC.s b/asm/nonmatchings/code_3602C0/func_E005A1FC.s index 79077d784e..5cae0137fc 100644 --- a/asm/nonmatchings/code_3602C0/func_E005A1FC.s +++ b/asm/nonmatchings/code_3602C0/func_E005A1FC.s @@ -13,9 +13,9 @@ glabel func_E005A1FC /* 3604DC E005A21C 04610005 */ bgez $v1, .LE005A234 /* 3604E0 E005A220 ACA30024 */ sw $v1, 0x24($a1) /* 3604E4 E005A224 0C080128 */ jal func_E02004A0 -/* 3604E8 E005A228 00000000 */ nop +/* 3604E8 E005A228 00000000 */ nop /* 3604EC E005A22C 080168E9 */ j .LE005A3A4 -/* 3604F0 E005A230 00000000 */ nop +/* 3604F0 E005A230 00000000 */ nop .LE005A234: /* 3604F4 E005A234 8CA7002C */ lw $a3, 0x2c($a1) /* 3604F8 E005A238 8C820008 */ lw $v0, 8($a0) @@ -36,19 +36,19 @@ glabel func_E005A1FC /* 360534 E005A274 D42CA760 */ ldc1 $f12, %lo(D_E005A760)($at) .LE005A278: /* 360538 E005A278 15200013 */ bnez $t1, .LE005A2C8 -/* 36053C E005A27C 00000000 */ nop +/* 36053C E005A27C 00000000 */ nop /* 360540 E005A280 C464FFF4 */ lwc1 $f4, -0xc($v1) /* 360544 E005A284 46002121 */ cvt.d.s $f4, $f4 /* 360548 E005A288 46282102 */ mul.d $f4, $f4, $f8 -/* 36054C E005A28C 00000000 */ nop +/* 36054C E005A28C 00000000 */ nop /* 360550 E005A290 C462FFF8 */ lwc1 $f2, -8($v1) /* 360554 E005A294 460010A1 */ cvt.d.s $f2, $f2 /* 360558 E005A298 46281082 */ mul.d $f2, $f2, $f8 -/* 36055C E005A29C 00000000 */ nop +/* 36055C E005A29C 00000000 */ nop /* 360560 E005A2A0 C460FFFC */ lwc1 $f0, -4($v1) /* 360564 E005A2A4 46000021 */ cvt.d.s $f0, $f0 /* 360568 E005A2A8 46280002 */ mul.d $f0, $f0, $f8 -/* 36056C E005A2AC 00000000 */ nop +/* 36056C E005A2AC 00000000 */ nop /* 360570 E005A2B0 46202120 */ cvt.s.d $f4, $f4 /* 360574 E005A2B4 462010A0 */ cvt.s.d $f2, $f2 /* 360578 E005A2B8 46200020 */ cvt.s.d $f0, $f0 @@ -57,23 +57,23 @@ glabel func_E005A1FC /* 360584 E005A2C4 E460FFFC */ swc1 $f0, -4($v1) .LE005A2C8: /* 360588 E005A2C8 11000019 */ beqz $t0, .LE005A330 -/* 36058C E005A2CC 00000000 */ nop +/* 36058C E005A2CC 00000000 */ nop /* 360590 E005A2D0 C4660004 */ lwc1 $f6, 4($v1) /* 360594 E005A2D4 460031A1 */ cvt.d.s $f6, $f6 /* 360598 E005A2D8 46283182 */ mul.d $f6, $f6, $f8 -/* 36059C E005A2DC 00000000 */ nop +/* 36059C E005A2DC 00000000 */ nop /* 3605A0 E005A2E0 C464FFF4 */ lwc1 $f4, -0xc($v1) /* 3605A4 E005A2E4 46002121 */ cvt.d.s $f4, $f4 /* 3605A8 E005A2E8 462A2102 */ mul.d $f4, $f4, $f10 -/* 3605AC E005A2EC 00000000 */ nop +/* 3605AC E005A2EC 00000000 */ nop /* 3605B0 E005A2F0 C462FFF8 */ lwc1 $f2, -8($v1) /* 3605B4 E005A2F4 460010A1 */ cvt.d.s $f2, $f2 /* 3605B8 E005A2F8 462A1082 */ mul.d $f2, $f2, $f10 -/* 3605BC E005A2FC 00000000 */ nop +/* 3605BC E005A2FC 00000000 */ nop /* 3605C0 E005A300 C460FFFC */ lwc1 $f0, -4($v1) /* 3605C4 E005A304 46000021 */ cvt.d.s $f0, $f0 /* 3605C8 E005A308 462A0002 */ mul.d $f0, $f0, $f10 -/* 3605CC E005A30C 00000000 */ nop +/* 3605CC E005A30C 00000000 */ nop /* 3605D0 E005A310 462031A0 */ cvt.s.d $f6, $f6 /* 3605D4 E005A314 46202120 */ cvt.s.d $f4, $f4 /* 3605D8 E005A318 462010A0 */ cvt.s.d $f2, $f2 @@ -84,12 +84,12 @@ glabel func_E005A1FC /* 3605EC E005A32C E460FFFC */ swc1 $f0, -4($v1) .LE005A330: /* 3605F0 E005A330 10E0000A */ beqz $a3, .LE005A35C -/* 3605F4 E005A334 00000000 */ nop +/* 3605F4 E005A334 00000000 */ nop /* 3605F8 E005A338 C4600014 */ lwc1 $f0, 0x14($v1) /* 3605FC E005A33C 46000087 */ neg.s $f2, $f0 /* 360600 E005A340 460010A1 */ cvt.d.s $f2, $f2 /* 360604 E005A344 462C1082 */ mul.d $f2, $f2, $f12 -/* 360608 E005A348 00000000 */ nop +/* 360608 E005A348 00000000 */ nop /* 36060C E005A34C 46000021 */ cvt.d.s $f0, $f0 /* 360610 E005A350 46220000 */ add.d $f0, $f0, $f2 /* 360614 E005A354 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/code_3602C0/func_E005A3F4.s b/asm/nonmatchings/code_3602C0/func_E005A3F4.s index fc74035f74..3196ddc813 100644 --- a/asm/nonmatchings/code_3602C0/func_E005A3F4.s +++ b/asm/nonmatchings/code_3602C0/func_E005A3F4.s @@ -216,6 +216,6 @@ glabel func_E005A3F4 /* 3609F8 E005A738 D7B400C0 */ ldc1 $f20, 0xc0($sp) /* 3609FC E005A73C 03E00008 */ jr $ra /* 360A00 E005A740 27BD00D8 */ addiu $sp, $sp, 0xd8 -/* 360A04 E005A744 00000000 */ nop -/* 360A08 E005A748 00000000 */ nop -/* 360A0C E005A74C 00000000 */ nop +/* 360A04 E005A744 00000000 */ nop +/* 360A08 E005A748 00000000 */ nop +/* 360A0C E005A74C 00000000 */ nop diff --git a/asm/nonmatchings/code_362a0_len_2f70/_add_hit_vert_to_buffer.s b/asm/nonmatchings/code_362a0_len_2f70/_add_hit_vert_to_buffer.s index 684bcf8712..dee058f166 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/_add_hit_vert_to_buffer.s +++ b/asm/nonmatchings/code_362a0_len_2f70/_add_hit_vert_to_buffer.s @@ -9,7 +9,7 @@ glabel _add_hit_vert_to_buffer .L8005B9B0: /* 36DB0 8005B9B0 8CE20000 */ lw $v0, ($a3) /* 36DB4 8005B9B4 10450005 */ beq $v0, $a1, .L8005B9CC -/* 36DB8 8005B9B8 00000000 */ nop +/* 36DB8 8005B9B8 00000000 */ nop /* 36DBC 8005B9BC 24630001 */ addiu $v1, $v1, 1 /* 36DC0 8005B9C0 0068102A */ slt $v0, $v1, $t0 /* 36DC4 8005B9C4 1440FFFA */ bnez $v0, .L8005B9B0 @@ -25,4 +25,4 @@ glabel _add_hit_vert_to_buffer /* 36DE8 8005B9E8 ACC20000 */ sw $v0, ($a2) .L8005B9EC: /* 36DEC 8005B9EC 03E00008 */ jr $ra -/* 36DF0 8005B9F0 00000000 */ nop +/* 36DF0 8005B9F0 00000000 */ nop diff --git a/asm/nonmatchings/code_362a0_len_2f70/_get_hit_vert_index_from_buffer.s b/asm/nonmatchings/code_362a0_len_2f70/_get_hit_vert_index_from_buffer.s index ba14801c2e..7e22a60c59 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/_get_hit_vert_index_from_buffer.s +++ b/asm/nonmatchings/code_362a0_len_2f70/_get_hit_vert_index_from_buffer.s @@ -8,7 +8,7 @@ glabel _get_hit_vert_index_from_buffer .L8005BA00: /* 36E00 8005BA00 8C820000 */ lw $v0, ($a0) /* 36E04 8005BA04 10450005 */ beq $v0, $a1, .L8005BA1C -/* 36E08 8005BA08 00000000 */ nop +/* 36E08 8005BA08 00000000 */ nop /* 36E0C 8005BA0C 24630001 */ addiu $v1, $v1, 1 /* 36E10 8005BA10 0066102A */ slt $v0, $v1, $a2 /* 36E14 8005BA14 1440FFFA */ bnez $v0, .L8005BA00 diff --git a/asm/nonmatchings/code_362a0_len_2f70/func_8005DB00.s b/asm/nonmatchings/code_362a0_len_2f70/func_8005DB00.s index aa77dbf403..e10926f661 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/func_8005DB00.s +++ b/asm/nonmatchings/code_362a0_len_2f70/func_8005DB00.s @@ -25,7 +25,7 @@ glabel func_8005DB00 /* 38F4C 8005DB4C 1082001F */ beq $a0, $v0, .L8005DBCC /* 38F50 8005DB50 0000102D */ daddu $v0, $zero, $zero /* 38F54 8005DB54 0801774E */ j .L8005DD38 -/* 38F58 8005DB58 00000000 */ nop +/* 38F58 8005DB58 00000000 */ nop .L8005DB5C: /* 38F5C 8005DB5C 0240202D */ daddu $a0, $s2, $zero /* 38F60 8005DB60 3C05FE36 */ lui $a1, 0xfe36 @@ -64,41 +64,41 @@ glabel func_8005DB00 /* 38FE0 8005DBE0 0000102D */ daddu $v0, $zero, $zero /* 38FE4 8005DBE4 8622008E */ lh $v0, 0x8e($s1) /* 38FE8 8005DBE8 10400005 */ beqz $v0, .L8005DC00 -/* 38FEC 8005DBEC 00000000 */ nop +/* 38FEC 8005DBEC 00000000 */ nop /* 38FF0 8005DBF0 1044002C */ beq $v0, $a0, .L8005DCA4 /* 38FF4 8005DBF4 0000102D */ daddu $v0, $zero, $zero /* 38FF8 8005DBF8 0801774E */ j .L8005DD38 -/* 38FFC 8005DBFC 00000000 */ nop +/* 38FFC 8005DBFC 00000000 */ nop .L8005DC00: /* 39000 8005DC00 C6620028 */ lwc1 $f2, 0x28($s3) /* 39004 8005DC04 C6200038 */ lwc1 $f0, 0x38($s1) /* 39008 8005DC08 46001081 */ sub.s $f2, $f2, $f0 /* 3900C 8005DC0C 46021082 */ mul.s $f2, $f2, $f2 -/* 39010 8005DC10 00000000 */ nop +/* 39010 8005DC10 00000000 */ nop /* 39014 8005DC14 C666002C */ lwc1 $f6, 0x2c($s3) /* 39018 8005DC18 C620003C */ lwc1 $f0, 0x3c($s1) /* 3901C 8005DC1C 46003181 */ sub.s $f6, $f6, $f0 /* 39020 8005DC20 46063182 */ mul.s $f6, $f6, $f6 -/* 39024 8005DC24 00000000 */ nop +/* 39024 8005DC24 00000000 */ nop /* 39028 8005DC28 C6240040 */ lwc1 $f4, 0x40($s1) /* 3902C 8005DC2C C6600030 */ lwc1 $f0, 0x30($s3) /* 39030 8005DC30 46040001 */ sub.s $f0, $f0, $f4 /* 39034 8005DC34 46000002 */ mul.s $f0, $f0, $f0 -/* 39038 8005DC38 00000000 */ nop +/* 39038 8005DC38 00000000 */ nop /* 3903C 8005DC3C 46061080 */ add.s $f2, $f2, $f6 /* 39040 8005DC40 46001300 */ add.s $f12, $f2, $f0 /* 39044 8005DC44 46006104 */ sqrt.s $f4, $f12 /* 39048 8005DC48 46042032 */ c.eq.s $f4, $f4 -/* 3904C 8005DC4C 00000000 */ nop +/* 3904C 8005DC4C 00000000 */ nop /* 39050 8005DC50 45010004 */ bc1t .L8005DC64 -/* 39054 8005DC54 00000000 */ nop +/* 39054 8005DC54 00000000 */ nop /* 39058 8005DC58 0C0187BC */ jal sqrtf -/* 3905C 8005DC5C 00000000 */ nop +/* 3905C 8005DC5C 00000000 */ nop /* 39060 8005DC60 46000106 */ mov.s $f4, $f0 .L8005DC64: /* 39064 8005DC64 C6200010 */ lwc1 $f0, 0x10($s1) /* 39068 8005DC68 4600203E */ c.le.s $f4, $f0 -/* 3906C 8005DC6C 00000000 */ nop +/* 3906C 8005DC6C 00000000 */ nop /* 39070 8005DC70 45000031 */ bc1f .L8005DD38 /* 39074 8005DC74 0000102D */ daddu $v0, $zero, $zero /* 39078 8005DC78 C62C0038 */ lwc1 $f12, 0x38($s1) @@ -109,9 +109,9 @@ glabel func_8005DB00 /* 3908C 8005DC8C 8E430074 */ lw $v1, 0x74($s2) /* 39090 8005DC90 2402FFFF */ addiu $v0, $zero, -1 /* 39094 8005DC94 10620016 */ beq $v1, $v0, .L8005DCF0 -/* 39098 8005DC98 00000000 */ nop +/* 39098 8005DC98 00000000 */ nop /* 3909C 8005DC9C 0801773E */ j .L8005DCF8 -/* 390A0 8005DCA0 00000000 */ nop +/* 390A0 8005DCA0 00000000 */ nop .L8005DCA4: /* 390A4 8005DCA4 C62C0038 */ lwc1 $f12, 0x38($s1) /* 390A8 8005DCA8 C62E0040 */ lwc1 $f14, 0x40($s1) @@ -120,7 +120,7 @@ glabel func_8005DB00 /* 390B4 8005DCB4 8E670030 */ lw $a3, 0x30($s3) /* 390B8 8005DCB8 C6220010 */ lwc1 $f2, 0x10($s1) /* 390BC 8005DCBC 4602003E */ c.le.s $f0, $f2 -/* 390C0 8005DCC0 00000000 */ nop +/* 390C0 8005DCC0 00000000 */ nop /* 390C4 8005DCC4 4500001C */ bc1f .L8005DD38 /* 390C8 8005DCC8 0000102D */ daddu $v0, $zero, $zero /* 390CC 8005DCCC C62C0038 */ lwc1 $f12, 0x38($s1) @@ -131,13 +131,13 @@ glabel func_8005DB00 /* 390E0 8005DCE0 8E430074 */ lw $v1, 0x74($s2) /* 390E4 8005DCE4 2402FFFF */ addiu $v0, $zero, -1 /* 390E8 8005DCE8 14620003 */ bne $v1, $v0, .L8005DCF8 -/* 390EC 8005DCEC 00000000 */ nop +/* 390EC 8005DCEC 00000000 */ nop .L8005DCF0: /* 390F0 8005DCF0 08017741 */ j .L8005DD04 /* 390F4 8005DCF4 C62C000C */ lwc1 $f12, 0xc($s1) .L8005DCF8: /* 390F8 8005DCF8 44836000 */ mtc1 $v1, $f12 -/* 390FC 8005DCFC 00000000 */ nop +/* 390FC 8005DCFC 00000000 */ nop /* 39100 8005DD00 46806320 */ cvt.s.w $f12, $f12 .L8005DD04: /* 39104 8005DD04 0C00A70A */ jal get_clamped_angle_diff @@ -146,7 +146,7 @@ glabel func_8005DB00 /* 39110 8005DD10 468010A0 */ cvt.s.w $f2, $f2 /* 39114 8005DD14 46000005 */ abs.s $f0, $f0 /* 39118 8005DD18 4602003C */ c.lt.s $f0, $f2 -/* 3911C 8005DD1C 00000000 */ nop +/* 3911C 8005DD1C 00000000 */ nop /* 39120 8005DD20 45000004 */ bc1f .L8005DD34 /* 39124 8005DD24 24020001 */ addiu $v0, $zero, 1 /* 39128 8005DD28 AE420084 */ sw $v0, 0x84($s2) diff --git a/asm/nonmatchings/code_362a0_len_2f70/func_8005DD54.s b/asm/nonmatchings/code_362a0_len_2f70/func_8005DD54.s index 56df23a7fc..775f76e565 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/func_8005DD54.s +++ b/asm/nonmatchings/code_362a0_len_2f70/func_8005DD54.s @@ -14,28 +14,28 @@ glabel func_8005DD54 /* 39178 8005DD78 4600018D */ trunc.w.s $f6, $f0 /* 3917C 8005DD7C E6060084 */ swc1 $f6, 0x84($s0) /* 39180 8005DD80 4600103E */ c.le.s $f2, $f0 -/* 39184 8005DD84 00000000 */ nop +/* 39184 8005DD84 00000000 */ nop /* 39188 8005DD88 45030001 */ bc1tl .L8005DD90 /* 3918C 8005DD8C 46020001 */ sub.s $f0, $f0, $f2 .L8005DD90: /* 39190 8005DD90 3C0142B4 */ lui $at, 0x42b4 /* 39194 8005DD94 44812000 */ mtc1 $at, $f4 -/* 39198 8005DD98 00000000 */ nop +/* 39198 8005DD98 00000000 */ nop /* 3919C 8005DD9C 4600203E */ c.le.s $f4, $f0 -/* 391A0 8005DDA0 00000000 */ nop +/* 391A0 8005DDA0 00000000 */ nop /* 391A4 8005DDA4 45030001 */ bc1tl .L8005DDAC /* 391A8 8005DDA8 46001001 */ sub.s $f0, $f2, $f0 .L8005DDAC: /* 391AC 8005DDAC 46002001 */ sub.s $f0, $f4, $f0 /* 391B0 8005DDB0 3C0142BE */ lui $at, 0x42be /* 391B4 8005DDB4 44811000 */ mtc1 $at, $f2 -/* 391B8 8005DDB8 00000000 */ nop +/* 391B8 8005DDB8 00000000 */ nop /* 391BC 8005DDBC 46020002 */ mul.s $f0, $f0, $f2 -/* 391C0 8005DDC0 00000000 */ nop +/* 391C0 8005DDC0 00000000 */ nop /* 391C4 8005DDC4 46040003 */ div.s $f0, $f0, $f4 /* 391C8 8005DDC8 4600018D */ trunc.w.s $f6, $f0 /* 391CC 8005DDCC 44023000 */ mfc1 $v0, $f6 -/* 391D0 8005DDD0 00000000 */ nop +/* 391D0 8005DDD0 00000000 */ nop /* 391D4 8005DDD4 244200A0 */ addiu $v0, $v0, 0xa0 /* 391D8 8005DDD8 AE02008C */ sw $v0, 0x8c($s0) /* 391DC 8005DDDC 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/code_362a0_len_2f70/get_collider_center.s b/asm/nonmatchings/code_362a0_len_2f70/get_collider_center.s index 3a8390dad8..8ed41b4bfd 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/get_collider_center.s +++ b/asm/nonmatchings/code_362a0_len_2f70/get_collider_center.s @@ -14,20 +14,20 @@ glabel get_collider_center /* 37234 8005BE34 46020000 */ add.s $f0, $f0, $f2 /* 37238 8005BE38 3C013F00 */ lui $at, 0x3f00 /* 3723C 8005BE3C 44812000 */ mtc1 $at, $f4 -/* 37240 8005BE40 00000000 */ nop +/* 37240 8005BE40 00000000 */ nop /* 37244 8005BE44 46040002 */ mul.s $f0, $f0, $f4 -/* 37248 8005BE48 00000000 */ nop +/* 37248 8005BE48 00000000 */ nop /* 3724C 8005BE4C E4A00000 */ swc1 $f0, ($a1) /* 37250 8005BE50 C4400004 */ lwc1 $f0, 4($v0) /* 37254 8005BE54 C4420010 */ lwc1 $f2, 0x10($v0) /* 37258 8005BE58 46020000 */ add.s $f0, $f0, $f2 /* 3725C 8005BE5C 46040002 */ mul.s $f0, $f0, $f4 -/* 37260 8005BE60 00000000 */ nop +/* 37260 8005BE60 00000000 */ nop /* 37264 8005BE64 E4C00000 */ swc1 $f0, ($a2) /* 37268 8005BE68 C4400008 */ lwc1 $f0, 8($v0) /* 3726C 8005BE6C C4420014 */ lwc1 $f2, 0x14($v0) /* 37270 8005BE70 46020000 */ add.s $f0, $f0, $f2 /* 37274 8005BE74 46040002 */ mul.s $f0, $f0, $f4 -/* 37278 8005BE78 00000000 */ nop +/* 37278 8005BE78 00000000 */ nop /* 3727C 8005BE7C 03E00008 */ jr $ra /* 37280 8005BE80 E4E00000 */ swc1 $f0, ($a3) diff --git a/asm/nonmatchings/code_362a0_len_2f70/initialize_collision.s b/asm/nonmatchings/code_362a0_len_2f70/initialize_collision.s index 949320cf0b..9524530ba1 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/initialize_collision.s +++ b/asm/nonmatchings/code_362a0_len_2f70/initialize_collision.s @@ -9,7 +9,7 @@ glabel initialize_collision /* 363A4 8005AFA4 3C01800E */ lui $at, %hi(D_800D91DC) /* 363A8 8005AFA8 A42091DC */ sh $zero, %lo(D_800D91DC)($at) /* 363AC 8005AFAC 0C00AB5D */ jal collision_heap_create -/* 363B0 8005AFB0 00000000 */ nop +/* 363B0 8005AFB0 00000000 */ nop /* 363B4 8005AFB4 8FBF0010 */ lw $ra, 0x10($sp) /* 363B8 8005AFB8 03E00008 */ jr $ra /* 363BC 8005AFBC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_362a0_len_2f70/load_collision.s b/asm/nonmatchings/code_362a0_len_2f70/load_collision.s index c663736b62..b357f15492 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/load_collision.s +++ b/asm/nonmatchings/code_362a0_len_2f70/load_collision.s @@ -74,11 +74,11 @@ glabel load_collision /* 36558 8005B158 3C04800A */ lui $a0, %hi(D_800A4264) /* 3655C 8005B15C 8C844264 */ lw $a0, %lo(D_800A4264)($a0) /* 36560 8005B160 0C00AB1E */ jal general_heap_free -/* 36564 8005B164 00000000 */ nop +/* 36564 8005B164 00000000 */ nop /* 36568 8005B168 3C04800A */ lui $a0, %hi(D_800A4268) /* 3656C 8005B16C 8C844268 */ lw $a0, %lo(D_800A4268)($a0) /* 36570 8005B170 0C00AB1E */ jal general_heap_free -/* 36574 8005B174 00000000 */ nop +/* 36574 8005B174 00000000 */ nop /* 36578 8005B178 8FBF002C */ lw $ra, 0x2c($sp) /* 3657C 8005B17C 8FB60028 */ lw $s6, 0x28($sp) /* 36580 8005B180 8FB50024 */ lw $s5, 0x24($sp) diff --git a/asm/nonmatchings/code_362a0_len_2f70/load_hit_data.s b/asm/nonmatchings/code_362a0_len_2f70/load_hit_data.s index 5a8ec559eb..96785dfb7b 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/load_hit_data.s +++ b/asm/nonmatchings/code_362a0_len_2f70/load_hit_data.s @@ -30,11 +30,11 @@ glabel load_hit_data /* 366A0 8005B2A0 1102000B */ beq $t0, $v0, .L8005B2D0 /* 366A4 8005B2A4 0000A02D */ daddu $s4, $zero, $zero /* 366A8 8005B2A8 08016CBC */ j .L8005B2F0 -/* 366AC 8005B2AC 00000000 */ nop +/* 366AC 8005B2AC 00000000 */ nop .L8005B2B0: /* 366B0 8005B2B0 8C620004 */ lw $v0, 4($v1) /* 366B4 8005B2B4 10400121 */ beqz $v0, .L8005B73C -/* 366B8 8005B2B8 00000000 */ nop +/* 366B8 8005B2B8 00000000 */ nop /* 366BC 8005B2BC 8FA80074 */ lw $t0, 0x74($sp) /* 366C0 8005B2C0 3C1E800B */ lui $fp, %hi(D_800B42E0) /* 366C4 8005B2C4 27DE42E0 */ addiu $fp, $fp, %lo(D_800B42E0) @@ -43,7 +43,7 @@ glabel load_hit_data .L8005B2D0: /* 366D0 8005B2D0 8C620008 */ lw $v0, 8($v1) /* 366D4 8005B2D4 10400119 */ beqz $v0, .L8005B73C -/* 366D8 8005B2D8 00000000 */ nop +/* 366D8 8005B2D8 00000000 */ nop /* 366DC 8005B2DC 8FA80074 */ lw $t0, 0x74($sp) /* 366E0 8005B2E0 0102B021 */ addu $s6, $t0, $v0 /* 366E4 8005B2E4 3C1E800E */ lui $fp, %hi(D_800D91D0) @@ -91,19 +91,19 @@ glabel load_hit_data /* 36778 8005B378 26100006 */ addiu $s0, $s0, 6 /* 3677C 8005B37C 26940001 */ addiu $s4, $s4, 1 /* 36780 8005B380 44820000 */ mtc1 $v0, $f0 -/* 36784 8005B384 00000000 */ nop +/* 36784 8005B384 00000000 */ nop /* 36788 8005B388 46800020 */ cvt.s.w $f0, $f0 /* 3678C 8005B38C E4A00000 */ swc1 $f0, ($a1) /* 36790 8005B390 8482FFFE */ lh $v0, -2($a0) /* 36794 8005B394 24A5000C */ addiu $a1, $a1, 0xc /* 36798 8005B398 44820000 */ mtc1 $v0, $f0 -/* 3679C 8005B39C 00000000 */ nop +/* 3679C 8005B39C 00000000 */ nop /* 367A0 8005B3A0 46800020 */ cvt.s.w $f0, $f0 /* 367A4 8005B3A4 E460FFFC */ swc1 $f0, -4($v1) /* 367A8 8005B3A8 84820000 */ lh $v0, ($a0) /* 367AC 8005B3AC 24840006 */ addiu $a0, $a0, 6 /* 367B0 8005B3B0 44820000 */ mtc1 $v0, $f0 -/* 367B4 8005B3B4 00000000 */ nop +/* 367B4 8005B3B4 00000000 */ nop /* 367B8 8005B3B8 46800020 */ cvt.s.w $f0, $f0 /* 367BC 8005B3BC E4600000 */ swc1 $f0, ($v1) /* 367C0 8005B3C0 86C20008 */ lh $v0, 8($s6) @@ -265,42 +265,42 @@ glabel load_hit_data /* 36A18 8005B618 C60AFFD8 */ lwc1 $f10, -0x28($s0) /* 36A1C 8005B61C C608FFE8 */ lwc1 $f8, -0x18($s0) /* 36A20 8005B620 46085382 */ mul.s $f14, $f10, $f8 -/* 36A24 8005B624 00000000 */ nop +/* 36A24 8005B624 00000000 */ nop /* 36A28 8005B628 C606FFDC */ lwc1 $f6, -0x24($s0) /* 36A2C 8005B62C C604FFE4 */ lwc1 $f4, -0x1c($s0) /* 36A30 8005B630 46043302 */ mul.s $f12, $f6, $f4 -/* 36A34 8005B634 00000000 */ nop +/* 36A34 8005B634 00000000 */ nop /* 36A38 8005B638 C602FFE0 */ lwc1 $f2, -0x20($s0) /* 36A3C 8005B63C 46023182 */ mul.s $f6, $f6, $f2 -/* 36A40 8005B640 00000000 */ nop +/* 36A40 8005B640 00000000 */ nop /* 36A44 8005B644 C600FFD4 */ lwc1 $f0, -0x2c($s0) /* 36A48 8005B648 46080202 */ mul.s $f8, $f0, $f8 -/* 36A4C 8005B64C 00000000 */ nop +/* 36A4C 8005B64C 00000000 */ nop /* 36A50 8005B650 46040002 */ mul.s $f0, $f0, $f4 -/* 36A54 8005B654 00000000 */ nop +/* 36A54 8005B654 00000000 */ nop /* 36A58 8005B658 46025282 */ mul.s $f10, $f10, $f2 -/* 36A5C 8005B65C 00000000 */ nop +/* 36A5C 8005B65C 00000000 */ nop /* 36A60 8005B660 460C7601 */ sub.s $f24, $f14, $f12 /* 36A64 8005B664 4618C102 */ mul.s $f4, $f24, $f24 -/* 36A68 8005B668 00000000 */ nop +/* 36A68 8005B668 00000000 */ nop /* 36A6C 8005B66C 46083501 */ sub.s $f20, $f6, $f8 /* 36A70 8005B670 4614A182 */ mul.s $f6, $f20, $f20 -/* 36A74 8005B674 00000000 */ nop +/* 36A74 8005B674 00000000 */ nop /* 36A78 8005B678 460A0581 */ sub.s $f22, $f0, $f10 /* 36A7C 8005B67C 4616B202 */ mul.s $f8, $f22, $f22 -/* 36A80 8005B680 00000000 */ nop +/* 36A80 8005B680 00000000 */ nop /* 36A84 8005B684 C4C20008 */ lwc1 $f2, 8($a2) /* 36A88 8005B688 C4A00008 */ lwc1 $f0, 8($a1) /* 36A8C 8005B68C 46001081 */ sub.s $f2, $f2, $f0 /* 36A90 8005B690 46062100 */ add.s $f4, $f4, $f6 /* 36A94 8005B694 46082300 */ add.s $f12, $f4, $f8 /* 36A98 8005B698 461C6032 */ c.eq.s $f12, $f28 -/* 36A9C 8005B69C 00000000 */ nop +/* 36A9C 8005B69C 00000000 */ nop /* 36AA0 8005B6A0 4501000B */ bc1t .L8005B6D0 /* 36AA4 8005B6A4 E602FFF4 */ swc1 $f2, -0xc($s0) /* 36AA8 8005B6A8 46006004 */ sqrt.s $f0, $f12 /* 36AAC 8005B6AC 46000032 */ c.eq.s $f0, $f0 -/* 36AB0 8005B6B0 00000000 */ nop +/* 36AB0 8005B6B0 00000000 */ nop /* 36AB4 8005B6B4 45030007 */ bc1tl .L8005B6D4 /* 36AB8 8005B6B8 4600D303 */ div.s $f12, $f26, $f0 /* 36ABC 8005B6BC 0C0187BC */ jal sqrtf @@ -312,12 +312,12 @@ glabel load_hit_data /* 36AD0 8005B6D0 4600E306 */ mov.s $f12, $f28 .L8005B6D4: /* 36AD4 8005B6D4 460CC082 */ mul.s $f2, $f24, $f12 -/* 36AD8 8005B6D8 00000000 */ nop +/* 36AD8 8005B6D8 00000000 */ nop /* 36ADC 8005B6DC 460CA102 */ mul.s $f4, $f20, $f12 -/* 36AE0 8005B6E0 00000000 */ nop +/* 36AE0 8005B6E0 00000000 */ nop /* 36AE4 8005B6E4 26310004 */ addiu $s1, $s1, 4 /* 36AE8 8005B6E8 460CB002 */ mul.s $f0, $f22, $f12 -/* 36AEC 8005B6EC 00000000 */ nop +/* 36AEC 8005B6EC 00000000 */ nop /* 36AF0 8005B6F0 26F70040 */ addiu $s7, $s7, 0x40 /* 36AF4 8005B6F4 26B50001 */ addiu $s5, $s5, 1 /* 36AF8 8005B6F8 E602FFF8 */ swc1 $f2, -8($s0) diff --git a/asm/nonmatchings/code_362a0_len_2f70/load_stage_collision.s b/asm/nonmatchings/code_362a0_len_2f70/load_stage_collision.s index cf28139b7f..def0a14449 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/load_stage_collision.s +++ b/asm/nonmatchings/code_362a0_len_2f70/load_stage_collision.s @@ -12,10 +12,10 @@ glabel load_stage_collision /* 365BC 8005B1BC 3C01800B */ lui $at, %hi(D_800B42EC) /* 365C0 8005B1C0 A42042EC */ sh $zero, %lo(D_800B42EC)($at) /* 365C4 8005B1C4 08016C89 */ j .L8005B224 -/* 365C8 8005B1C8 00000000 */ nop +/* 365C8 8005B1C8 00000000 */ nop .L8005B1CC: /* 365CC 8005B1CC 0C016AFA */ jal get_current_map_header -/* 365D0 8005B1D0 00000000 */ nop +/* 365D0 8005B1D0 00000000 */ nop /* 365D4 8005B1D4 0200202D */ daddu $a0, $s0, $zero /* 365D8 8005B1D8 27A50010 */ addiu $a1, $sp, 0x10 /* 365DC 8005B1DC 0C016B3A */ jal load_asset_by_name diff --git a/asm/nonmatchings/code_362a0_len_2f70/test_down_ray_triangle.s b/asm/nonmatchings/code_362a0_len_2f70/test_down_ray_triangle.s index 7d42642cd6..eb4ec509a2 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/test_down_ray_triangle.s +++ b/asm/nonmatchings/code_362a0_len_2f70/test_down_ray_triangle.s @@ -4,21 +4,21 @@ glabel test_down_ray_triangle /* 3789C 8005C49C C4800030 */ lwc1 $f0, 0x30($a0) /* 378A0 8005C4A0 44801000 */ mtc1 $zero, $f2 -/* 378A4 8005C4A4 00000000 */ nop +/* 378A4 8005C4A4 00000000 */ nop /* 378A8 8005C4A8 46020032 */ c.eq.s $f0, $f2 -/* 378AC 8005C4AC 00000000 */ nop +/* 378AC 8005C4AC 00000000 */ nop /* 378B0 8005C4B0 4500000B */ bc1f .L8005C4E0 -/* 378B4 8005C4B4 00000000 */ nop +/* 378B4 8005C4B4 00000000 */ nop /* 378B8 8005C4B8 C4800034 */ lwc1 $f0, 0x34($a0) /* 378BC 8005C4BC 46020032 */ c.eq.s $f0, $f2 -/* 378C0 8005C4C0 00000000 */ nop +/* 378C0 8005C4C0 00000000 */ nop /* 378C4 8005C4C4 45000006 */ bc1f .L8005C4E0 -/* 378C8 8005C4C8 00000000 */ nop +/* 378C8 8005C4C8 00000000 */ nop /* 378CC 8005C4CC C4800038 */ lwc1 $f0, 0x38($a0) /* 378D0 8005C4D0 46020032 */ c.eq.s $f0, $f2 -/* 378D4 8005C4D4 00000000 */ nop +/* 378D4 8005C4D4 00000000 */ nop /* 378D8 8005C4D8 45010050 */ bc1t .L8005C61C -/* 378DC 8005C4DC 00000000 */ nop +/* 378DC 8005C4DC 00000000 */ nop .L8005C4E0: /* 378E0 8005C4E0 8C820000 */ lw $v0, ($a0) /* 378E4 8005C4E4 3C01800A */ lui $at, %hi(D_800A4230) @@ -27,21 +27,21 @@ glabel test_down_ray_triangle /* 378F0 8005C4F0 46009301 */ sub.s $f12, $f18, $f0 /* 378F4 8005C4F4 C4840030 */ lwc1 $f4, 0x30($a0) /* 378F8 8005C4F8 460C2102 */ mul.s $f4, $f4, $f12 -/* 378FC 8005C4FC 00000000 */ nop +/* 378FC 8005C4FC 00000000 */ nop /* 37900 8005C500 3C01800A */ lui $at, %hi(D_800A4234) /* 37904 8005C504 C4224234 */ lwc1 $f2, %lo(D_800A4234)($at) /* 37908 8005C508 C4400004 */ lwc1 $f0, 4($v0) /* 3790C 8005C50C 46001081 */ sub.s $f2, $f2, $f0 /* 37910 8005C510 C4860034 */ lwc1 $f6, 0x34($a0) /* 37914 8005C514 46023082 */ mul.s $f2, $f6, $f2 -/* 37918 8005C518 00000000 */ nop +/* 37918 8005C518 00000000 */ nop /* 3791C 8005C51C 3C01800A */ lui $at, %hi(D_800A4238) /* 37920 8005C520 C42E4238 */ lwc1 $f14, %lo(D_800A4238)($at) /* 37924 8005C524 C4400008 */ lwc1 $f0, 8($v0) /* 37928 8005C528 46007201 */ sub.s $f8, $f14, $f0 /* 3792C 8005C52C C4800038 */ lwc1 $f0, 0x38($a0) /* 37930 8005C530 46080002 */ mul.s $f0, $f0, $f8 -/* 37934 8005C534 00000000 */ nop +/* 37934 8005C534 00000000 */ nop /* 37938 8005C538 8C830004 */ lw $v1, 4($a0) /* 3793C 8005C53C 46022100 */ add.s $f4, $f4, $f2 /* 37940 8005C540 8C850008 */ lw $a1, 8($a0) @@ -49,130 +49,130 @@ glabel test_down_ray_triangle /* 37948 8005C548 10400036 */ beqz $v0, .L8005C624 /* 3794C 8005C54C 46002280 */ add.s $f10, $f4, $f0 /* 37950 8005C550 44808000 */ mtc1 $zero, $f16 -/* 37954 8005C554 00000000 */ nop +/* 37954 8005C554 00000000 */ nop /* 37958 8005C558 4610503C */ c.lt.s $f10, $f16 -/* 3795C 8005C55C 00000000 */ nop +/* 3795C 8005C55C 00000000 */ nop /* 37960 8005C560 4501002E */ bc1t .L8005C61C -/* 37964 8005C564 00000000 */ nop +/* 37964 8005C564 00000000 */ nop /* 37968 8005C568 4610303E */ c.le.s $f6, $f16 -/* 3796C 8005C56C 00000000 */ nop +/* 3796C 8005C56C 00000000 */ nop /* 37970 8005C570 4501002A */ bc1t .L8005C61C -/* 37974 8005C574 00000000 */ nop +/* 37974 8005C574 00000000 */ nop /* 37978 8005C578 C482000C */ lwc1 $f2, 0xc($a0) /* 3797C 8005C57C 46024082 */ mul.s $f2, $f8, $f2 -/* 37980 8005C580 00000000 */ nop +/* 37980 8005C580 00000000 */ nop /* 37984 8005C584 C4800014 */ lwc1 $f0, 0x14($a0) /* 37988 8005C588 46006002 */ mul.s $f0, $f12, $f0 -/* 3798C 8005C58C 00000000 */ nop +/* 3798C 8005C58C 00000000 */ nop /* 37990 8005C590 46001081 */ sub.s $f2, $f2, $f0 /* 37994 8005C594 4610103C */ c.lt.s $f2, $f16 -/* 37998 8005C598 00000000 */ nop +/* 37998 8005C598 00000000 */ nop /* 3799C 8005C59C 4501001F */ bc1t .L8005C61C -/* 379A0 8005C5A0 00000000 */ nop +/* 379A0 8005C5A0 00000000 */ nop /* 379A4 8005C5A4 C4620008 */ lwc1 $f2, 8($v1) /* 379A8 8005C5A8 46027081 */ sub.s $f2, $f14, $f2 /* 379AC 8005C5AC C4800018 */ lwc1 $f0, 0x18($a0) /* 379B0 8005C5B0 46001082 */ mul.s $f2, $f2, $f0 -/* 379B4 8005C5B4 00000000 */ nop +/* 379B4 8005C5B4 00000000 */ nop /* 379B8 8005C5B8 C4600000 */ lwc1 $f0, ($v1) /* 379BC 8005C5BC 46009001 */ sub.s $f0, $f18, $f0 /* 379C0 8005C5C0 C4840020 */ lwc1 $f4, 0x20($a0) /* 379C4 8005C5C4 46040002 */ mul.s $f0, $f0, $f4 -/* 379C8 8005C5C8 00000000 */ nop +/* 379C8 8005C5C8 00000000 */ nop /* 379CC 8005C5CC 46001081 */ sub.s $f2, $f2, $f0 /* 379D0 8005C5D0 4610103C */ c.lt.s $f2, $f16 -/* 379D4 8005C5D4 00000000 */ nop +/* 379D4 8005C5D4 00000000 */ nop /* 379D8 8005C5D8 45010010 */ bc1t .L8005C61C -/* 379DC 8005C5DC 00000000 */ nop +/* 379DC 8005C5DC 00000000 */ nop /* 379E0 8005C5E0 C4A20008 */ lwc1 $f2, 8($a1) /* 379E4 8005C5E4 46027081 */ sub.s $f2, $f14, $f2 /* 379E8 8005C5E8 C4800024 */ lwc1 $f0, 0x24($a0) /* 379EC 8005C5EC 46001082 */ mul.s $f2, $f2, $f0 -/* 379F0 8005C5F0 00000000 */ nop +/* 379F0 8005C5F0 00000000 */ nop /* 379F4 8005C5F4 C4A00000 */ lwc1 $f0, ($a1) /* 379F8 8005C5F8 46009001 */ sub.s $f0, $f18, $f0 /* 379FC 8005C5FC C484002C */ lwc1 $f4, 0x2c($a0) /* 37A00 8005C600 46040002 */ mul.s $f0, $f0, $f4 -/* 37A04 8005C604 00000000 */ nop +/* 37A04 8005C604 00000000 */ nop /* 37A08 8005C608 46001081 */ sub.s $f2, $f2, $f0 /* 37A0C 8005C60C 4610103C */ c.lt.s $f2, $f16 -/* 37A10 8005C610 00000000 */ nop +/* 37A10 8005C610 00000000 */ nop .L8005C614: /* 37A14 8005C614 45000039 */ bc1f .L8005C6FC -/* 37A18 8005C618 00000000 */ nop +/* 37A18 8005C618 00000000 */ nop .L8005C61C: /* 37A1C 8005C61C 03E00008 */ jr $ra /* 37A20 8005C620 0000102D */ daddu $v0, $zero, $zero .L8005C624: /* 37A24 8005C624 460A3002 */ mul.s $f0, $f6, $f10 -/* 37A28 8005C628 00000000 */ nop +/* 37A28 8005C628 00000000 */ nop /* 37A2C 8005C62C 44803000 */ mtc1 $zero, $f6 -/* 37A30 8005C630 00000000 */ nop +/* 37A30 8005C630 00000000 */ nop /* 37A34 8005C634 4606003E */ c.le.s $f0, $f6 -/* 37A38 8005C638 00000000 */ nop +/* 37A38 8005C638 00000000 */ nop /* 37A3C 8005C63C 4501FFF7 */ bc1t .L8005C61C -/* 37A40 8005C640 00000000 */ nop +/* 37A40 8005C640 00000000 */ nop /* 37A44 8005C644 C480000C */ lwc1 $f0, 0xc($a0) /* 37A48 8005C648 46004002 */ mul.s $f0, $f8, $f0 -/* 37A4C 8005C64C 00000000 */ nop +/* 37A4C 8005C64C 00000000 */ nop /* 37A50 8005C650 C4820014 */ lwc1 $f2, 0x14($a0) /* 37A54 8005C654 46026082 */ mul.s $f2, $f12, $f2 -/* 37A58 8005C658 00000000 */ nop +/* 37A58 8005C658 00000000 */ nop /* 37A5C 8005C65C 46020001 */ sub.s $f0, $f0, $f2 /* 37A60 8005C660 460A0002 */ mul.s $f0, $f0, $f10 -/* 37A64 8005C664 00000000 */ nop +/* 37A64 8005C664 00000000 */ nop /* 37A68 8005C668 4606003C */ c.lt.s $f0, $f6 -/* 37A6C 8005C66C 00000000 */ nop +/* 37A6C 8005C66C 00000000 */ nop /* 37A70 8005C670 4501FFEA */ bc1t .L8005C61C -/* 37A74 8005C674 00000000 */ nop +/* 37A74 8005C674 00000000 */ nop /* 37A78 8005C678 C4600008 */ lwc1 $f0, 8($v1) /* 37A7C 8005C67C 46007001 */ sub.s $f0, $f14, $f0 /* 37A80 8005C680 C4820018 */ lwc1 $f2, 0x18($a0) /* 37A84 8005C684 46020002 */ mul.s $f0, $f0, $f2 -/* 37A88 8005C688 00000000 */ nop +/* 37A88 8005C688 00000000 */ nop /* 37A8C 8005C68C C4620000 */ lwc1 $f2, ($v1) /* 37A90 8005C690 46029081 */ sub.s $f2, $f18, $f2 /* 37A94 8005C694 C4840020 */ lwc1 $f4, 0x20($a0) /* 37A98 8005C698 46041082 */ mul.s $f2, $f2, $f4 -/* 37A9C 8005C69C 00000000 */ nop +/* 37A9C 8005C69C 00000000 */ nop /* 37AA0 8005C6A0 46020001 */ sub.s $f0, $f0, $f2 /* 37AA4 8005C6A4 460A0002 */ mul.s $f0, $f0, $f10 -/* 37AA8 8005C6A8 00000000 */ nop +/* 37AA8 8005C6A8 00000000 */ nop /* 37AAC 8005C6AC 4606003C */ c.lt.s $f0, $f6 -/* 37AB0 8005C6B0 00000000 */ nop +/* 37AB0 8005C6B0 00000000 */ nop /* 37AB4 8005C6B4 4501FFD9 */ bc1t .L8005C61C -/* 37AB8 8005C6B8 00000000 */ nop +/* 37AB8 8005C6B8 00000000 */ nop /* 37ABC 8005C6BC C4A00008 */ lwc1 $f0, 8($a1) /* 37AC0 8005C6C0 46007001 */ sub.s $f0, $f14, $f0 /* 37AC4 8005C6C4 C4820024 */ lwc1 $f2, 0x24($a0) /* 37AC8 8005C6C8 46020002 */ mul.s $f0, $f0, $f2 -/* 37ACC 8005C6CC 00000000 */ nop +/* 37ACC 8005C6CC 00000000 */ nop /* 37AD0 8005C6D0 C4A20000 */ lwc1 $f2, ($a1) /* 37AD4 8005C6D4 46029081 */ sub.s $f2, $f18, $f2 /* 37AD8 8005C6D8 C484002C */ lwc1 $f4, 0x2c($a0) /* 37ADC 8005C6DC 46041082 */ mul.s $f2, $f2, $f4 -/* 37AE0 8005C6E0 00000000 */ nop +/* 37AE0 8005C6E0 00000000 */ nop /* 37AE4 8005C6E4 46020001 */ sub.s $f0, $f0, $f2 /* 37AE8 8005C6E8 460A0002 */ mul.s $f0, $f0, $f10 -/* 37AEC 8005C6EC 00000000 */ nop +/* 37AEC 8005C6EC 00000000 */ nop /* 37AF0 8005C6F0 4606003C */ c.lt.s $f0, $f6 /* 37AF4 8005C6F4 08017185 */ j .L8005C614 -/* 37AF8 8005C6F8 00000000 */ nop +/* 37AF8 8005C6F8 00000000 */ nop .L8005C6FC: /* 37AFC 8005C6FC 3C01800A */ lui $at, %hi(D_800A4254) /* 37B00 8005C700 C4244254 */ lwc1 $f4, %lo(D_800A4254)($at) /* 37B04 8005C704 44800000 */ mtc1 $zero, $f0 /* 37B08 8005C708 C4820034 */ lwc1 $f2, 0x34($a0) /* 37B0C 8005C70C 4604003E */ c.le.s $f0, $f4 -/* 37B10 8005C710 00000000 */ nop +/* 37B10 8005C710 00000000 */ nop /* 37B14 8005C714 45000007 */ bc1f .L8005C734 /* 37B18 8005C718 46001207 */ neg.s $f8, $f2 /* 37B1C 8005C71C 46005007 */ neg.s $f0, $f10 /* 37B20 8005C720 46080003 */ div.s $f0, $f0, $f8 /* 37B24 8005C724 4600203E */ c.le.s $f4, $f0 -/* 37B28 8005C728 00000000 */ nop +/* 37B28 8005C728 00000000 */ nop /* 37B2C 8005C72C 4501FFBB */ bc1t .L8005C61C -/* 37B30 8005C730 00000000 */ nop +/* 37B30 8005C730 00000000 */ nop .L8005C734: /* 37B34 8005C734 3C01800A */ lui $at, %hi(D_800A4230) /* 37B38 8005C738 C4204230 */ lwc1 $f0, %lo(D_800A4230)($at) diff --git a/asm/nonmatchings/code_362a0_len_2f70/test_ray_colliders.s b/asm/nonmatchings/code_362a0_len_2f70/test_ray_colliders.s index 4def3791d7..1251b184e0 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/test_ray_colliders.s +++ b/asm/nonmatchings/code_362a0_len_2f70/test_ray_colliders.s @@ -28,15 +28,15 @@ glabel test_ray_colliders /* 3812C 8005CD2C F7B60040 */ sdc1 $f22, 0x40($sp) /* 38130 8005CD30 F7B40038 */ sdc1 $f20, 0x38($sp) /* 38134 8005CD34 46002032 */ c.eq.s $f4, $f0 -/* 38138 8005CD38 00000000 */ nop +/* 38138 8005CD38 00000000 */ nop /* 3813C 8005CD3C 45000009 */ bc1f .L8005CD64 /* 38140 8005CD40 0080B82D */ daddu $s7, $a0, $zero /* 38144 8005CD44 46003032 */ c.eq.s $f6, $f0 -/* 38148 8005CD48 00000000 */ nop +/* 38148 8005CD48 00000000 */ nop /* 3814C 8005CD4C 45000005 */ bc1f .L8005CD64 -/* 38150 8005CD50 00000000 */ nop +/* 38150 8005CD50 00000000 */ nop /* 38154 8005CD54 46005032 */ c.eq.s $f10, $f0 -/* 38158 8005CD58 00000000 */ nop +/* 38158 8005CD58 00000000 */ nop /* 3815C 8005CD5C 450100DF */ bc1t .L8005D0DC /* 38160 8005CD60 0000102D */ daddu $v0, $zero, $zero .L8005CD64: @@ -61,53 +61,53 @@ glabel test_ray_colliders /* 381AC 8005CDAC 45000006 */ bc1f .L8005CDC8 /* 381B0 8005CDB0 2414FFFF */ addiu $s4, $zero, -1 /* 381B4 8005CDB4 46022002 */ mul.s $f0, $f4, $f2 -/* 381B8 8005CDB8 00000000 */ nop +/* 381B8 8005CDB8 00000000 */ nop /* 381BC 8005CDBC 46004786 */ mov.s $f30, $f8 /* 381C0 8005CDC0 08017376 */ j .L8005CDD8 /* 381C4 8005CDC4 4600F700 */ add.s $f28, $f30, $f0 .L8005CDC8: /* 381C8 8005CDC8 46022002 */ mul.s $f0, $f4, $f2 -/* 381CC 8005CDCC 00000000 */ nop +/* 381CC 8005CDCC 00000000 */ nop /* 381D0 8005CDD0 46004706 */ mov.s $f28, $f8 /* 381D4 8005CDD4 4600E780 */ add.s $f30, $f28, $f0 .L8005CDD8: /* 381D8 8005CDD8 44800000 */ mtc1 $zero, $f0 -/* 381DC 8005CDDC 00000000 */ nop +/* 381DC 8005CDDC 00000000 */ nop /* 381E0 8005CDE0 4600303C */ c.lt.s $f6, $f0 -/* 381E4 8005CDE4 00000000 */ nop +/* 381E4 8005CDE4 00000000 */ nop /* 381E8 8005CDE8 45000007 */ bc1f .L8005CE08 /* 381EC 8005CDEC 46006686 */ mov.s $f26, $f12 /* 381F0 8005CDF0 3C01800A */ lui $at, %hi(D_800A4254) /* 381F4 8005CDF4 C4204254 */ lwc1 $f0, %lo(D_800A4254)($at) /* 381F8 8005CDF8 46003002 */ mul.s $f0, $f6, $f0 -/* 381FC 8005CDFC 00000000 */ nop +/* 381FC 8005CDFC 00000000 */ nop /* 38200 8005CE00 08017388 */ j .L8005CE20 /* 38204 8005CE04 4600D600 */ add.s $f24, $f26, $f0 .L8005CE08: /* 38208 8005CE08 3C01800A */ lui $at, %hi(D_800A4254) /* 3820C 8005CE0C C4204254 */ lwc1 $f0, %lo(D_800A4254)($at) /* 38210 8005CE10 46003002 */ mul.s $f0, $f6, $f0 -/* 38214 8005CE14 00000000 */ nop +/* 38214 8005CE14 00000000 */ nop /* 38218 8005CE18 46006606 */ mov.s $f24, $f12 /* 3821C 8005CE1C 4600C680 */ add.s $f26, $f24, $f0 .L8005CE20: /* 38220 8005CE20 44800000 */ mtc1 $zero, $f0 -/* 38224 8005CE24 00000000 */ nop +/* 38224 8005CE24 00000000 */ nop /* 38228 8005CE28 4600503C */ c.lt.s $f10, $f0 -/* 3822C 8005CE2C 00000000 */ nop +/* 3822C 8005CE2C 00000000 */ nop /* 38230 8005CE30 45000007 */ bc1f .L8005CE50 /* 38234 8005CE34 46007586 */ mov.s $f22, $f14 /* 38238 8005CE38 3C01800A */ lui $at, %hi(D_800A4254) /* 3823C 8005CE3C C4204254 */ lwc1 $f0, %lo(D_800A4254)($at) /* 38240 8005CE40 46005002 */ mul.s $f0, $f10, $f0 -/* 38244 8005CE44 00000000 */ nop +/* 38244 8005CE44 00000000 */ nop /* 38248 8005CE48 0801739A */ j .L8005CE68 /* 3824C 8005CE4C 4600B500 */ add.s $f20, $f22, $f0 .L8005CE50: /* 38250 8005CE50 3C01800A */ lui $at, %hi(D_800A4254) /* 38254 8005CE54 C4204254 */ lwc1 $f0, %lo(D_800A4254)($at) /* 38258 8005CE58 46005002 */ mul.s $f0, $f10, $f0 -/* 3825C 8005CE5C 00000000 */ nop +/* 3825C 8005CE5C 00000000 */ nop /* 38260 8005CE60 46007506 */ mov.s $f20, $f14 /* 38264 8005CE64 4600A580 */ add.s $f22, $f20, $f0 .L8005CE68: @@ -128,32 +128,32 @@ glabel test_ray_colliders /* 3829C 8005CE9C 8E420010 */ lw $v0, 0x10($s2) /* 382A0 8005CEA0 C4400000 */ lwc1 $f0, ($v0) /* 382A4 8005CEA4 4600F03C */ c.lt.s $f30, $f0 -/* 382A8 8005CEA8 00000000 */ nop +/* 382A8 8005CEA8 00000000 */ nop /* 382AC 8005CEAC 45030068 */ bc1tl .L8005D050 /* 382B0 8005CEB0 26D6001C */ addiu $s6, $s6, 0x1c /* 382B4 8005CEB4 C440000C */ lwc1 $f0, 0xc($v0) /* 382B8 8005CEB8 461C003C */ c.lt.s $f0, $f28 -/* 382BC 8005CEBC 00000000 */ nop +/* 382BC 8005CEBC 00000000 */ nop /* 382C0 8005CEC0 45030063 */ bc1tl .L8005D050 /* 382C4 8005CEC4 26D6001C */ addiu $s6, $s6, 0x1c /* 382C8 8005CEC8 C4400008 */ lwc1 $f0, 8($v0) /* 382CC 8005CECC 4600B03C */ c.lt.s $f22, $f0 -/* 382D0 8005CED0 00000000 */ nop +/* 382D0 8005CED0 00000000 */ nop /* 382D4 8005CED4 4503005E */ bc1tl .L8005D050 /* 382D8 8005CED8 26D6001C */ addiu $s6, $s6, 0x1c /* 382DC 8005CEDC C4400014 */ lwc1 $f0, 0x14($v0) /* 382E0 8005CEE0 4614003C */ c.lt.s $f0, $f20 -/* 382E4 8005CEE4 00000000 */ nop +/* 382E4 8005CEE4 00000000 */ nop /* 382E8 8005CEE8 45030059 */ bc1tl .L8005D050 /* 382EC 8005CEEC 26D6001C */ addiu $s6, $s6, 0x1c /* 382F0 8005CEF0 C4400004 */ lwc1 $f0, 4($v0) /* 382F4 8005CEF4 4600D03C */ c.lt.s $f26, $f0 -/* 382F8 8005CEF8 00000000 */ nop +/* 382F8 8005CEF8 00000000 */ nop /* 382FC 8005CEFC 45030054 */ bc1tl .L8005D050 /* 38300 8005CF00 26D6001C */ addiu $s6, $s6, 0x1c /* 38304 8005CF04 C4400010 */ lwc1 $f0, 0x10($v0) /* 38308 8005CF08 4618003C */ c.lt.s $f0, $f24 -/* 3830C 8005CF0C 00000000 */ nop +/* 3830C 8005CF0C 00000000 */ nop /* 38310 8005CF10 4503004F */ bc1tl .L8005D050 /* 38314 8005CF14 26D6001C */ addiu $s6, $s6, 0x1c /* 38318 8005CF18 3C01800A */ lui $at, %hi(D_800A423C) @@ -161,15 +161,15 @@ glabel test_ray_colliders /* 38320 8005CF20 44808000 */ mtc1 $zero, $f16 /* 38324 8005CF24 8E51000C */ lw $s1, 0xc($s2) /* 38328 8005CF28 46100032 */ c.eq.s $f0, $f16 -/* 3832C 8005CF2C 00000000 */ nop +/* 3832C 8005CF2C 00000000 */ nop /* 38330 8005CF30 45000020 */ bc1f .L8005CFB4 -/* 38334 8005CF34 00000000 */ nop +/* 38334 8005CF34 00000000 */ nop /* 38338 8005CF38 3C01800A */ lui $at, %hi(D_800A4244) /* 3833C 8005CF3C C4204244 */ lwc1 $f0, %lo(D_800A4244)($at) /* 38340 8005CF40 46100032 */ c.eq.s $f0, $f16 -/* 38344 8005CF44 00000000 */ nop +/* 38344 8005CF44 00000000 */ nop /* 38348 8005CF48 4500001A */ bc1f .L8005CFB4 -/* 3834C 8005CF4C 00000000 */ nop +/* 3834C 8005CF4C 00000000 */ nop /* 38350 8005CF50 3C01800A */ lui $at, %hi(D_800A4240) /* 38354 8005CF54 C4204240 */ lwc1 $f0, %lo(D_800A4240)($at) /* 38358 8005CF58 3C01BFF0 */ lui $at, 0xbff0 @@ -177,9 +177,9 @@ glabel test_ray_colliders /* 38360 8005CF60 44801000 */ mtc1 $zero, $f2 /* 38364 8005CF64 46000021 */ cvt.d.s $f0, $f0 /* 38368 8005CF68 46220032 */ c.eq.d $f0, $f2 -/* 3836C 8005CF6C 00000000 */ nop +/* 3836C 8005CF6C 00000000 */ nop /* 38370 8005CF70 45000010 */ bc1f .L8005CFB4 -/* 38374 8005CF74 00000000 */ nop +/* 38374 8005CF74 00000000 */ nop /* 38378 8005CF78 18600034 */ blez $v1, .L8005D04C /* 3837C 8005CF7C 0000802D */ daddu $s0, $zero, $zero /* 38380 8005CF80 0220202D */ daddu $a0, $s1, $zero @@ -201,11 +201,11 @@ glabel test_ray_colliders /* 383B4 8005CFB4 3C01800A */ lui $at, %hi(D_800A4240) /* 383B8 8005CFB8 C4204240 */ lwc1 $f0, %lo(D_800A4240)($at) /* 383BC 8005CFBC 44808000 */ mtc1 $zero, $f16 -/* 383C0 8005CFC0 00000000 */ nop +/* 383C0 8005CFC0 00000000 */ nop /* 383C4 8005CFC4 46100032 */ c.eq.s $f0, $f16 -/* 383C8 8005CFC8 00000000 */ nop +/* 383C8 8005CFC8 00000000 */ nop /* 383CC 8005CFCC 45000011 */ bc1f .L8005D014 -/* 383D0 8005CFD0 00000000 */ nop +/* 383D0 8005CFD0 00000000 */ nop /* 383D4 8005CFD4 8642000A */ lh $v0, 0xa($s2) /* 383D8 8005CFD8 1840001C */ blez $v0, .L8005D04C /* 383DC 8005CFDC 0000802D */ daddu $s0, $zero, $zero @@ -248,7 +248,7 @@ glabel test_ray_colliders /* 38454 8005D054 26730001 */ addiu $s3, $s3, 1 /* 38458 8005D058 0262102A */ slt $v0, $s3, $v0 /* 3845C 8005D05C 1440FF86 */ bnez $v0, .L8005CE78 -/* 38460 8005D060 00000000 */ nop +/* 38460 8005D060 00000000 */ nop .L8005D064: /* 38464 8005D064 0680001D */ bltz $s4, .L8005D0DC /* 38468 8005D068 0280102D */ daddu $v0, $s4, $zero 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 3462cc739e..e3d5e0a38e 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/test_ray_entities.s +++ b/asm/nonmatchings/code_362a0_len_2f70/test_ray_entities.s @@ -32,19 +32,19 @@ glabel test_ray_entities /* 388B4 8005D4B4 AFA601A8 */ sw $a2, 0x1a8($sp) /* 388B8 8005D4B8 C5360000 */ lwc1 $f22, ($t1) /* 388BC 8005D4BC 46004032 */ c.eq.s $f8, $f0 -/* 388C0 8005D4C0 00000000 */ nop +/* 388C0 8005D4C0 00000000 */ nop /* 388C4 8005D4C4 4500000E */ bc1f .L8005D500 /* 388C8 8005D4C8 4600B606 */ mov.s $f24, $f22 /* 388CC 8005D4CC C7A801B4 */ lwc1 $f8, 0x1b4($sp) /* 388D0 8005D4D0 46004032 */ c.eq.s $f8, $f0 -/* 388D4 8005D4D4 00000000 */ nop +/* 388D4 8005D4D4 00000000 */ nop /* 388D8 8005D4D8 45000009 */ bc1f .L8005D500 -/* 388DC 8005D4DC 00000000 */ nop +/* 388DC 8005D4DC 00000000 */ nop /* 388E0 8005D4E0 C7A801B0 */ lwc1 $f8, 0x1b0($sp) /* 388E4 8005D4E4 4600403C */ c.lt.s $f8, $f0 -/* 388E8 8005D4E8 00000000 */ nop +/* 388E8 8005D4E8 00000000 */ nop /* 388EC 8005D4EC 45000005 */ bc1f .L8005D504 -/* 388F0 8005D4F0 00000000 */ nop +/* 388F0 8005D4F0 00000000 */ nop /* 388F4 8005D4F4 46000586 */ mov.s $f22, $f0 /* 388F8 8005D4F8 08017547 */ j .L8005D51C /* 388FC 8005D4FC 24160001 */ addiu $s6, $zero, 1 @@ -52,7 +52,7 @@ glabel test_ray_entities /* 38900 8005D500 C7A801B0 */ lwc1 $f8, 0x1b0($sp) .L8005D504: /* 38904 8005D504 46004032 */ c.eq.s $f8, $f0 -/* 38908 8005D508 00000000 */ nop +/* 38908 8005D508 00000000 */ nop /* 3890C 8005D50C 45000004 */ bc1f .L8005D520 /* 38910 8005D510 0000F02D */ daddu $fp, $zero, $zero /* 38914 8005D514 46000606 */ mov.s $f24, $f0 @@ -87,24 +87,24 @@ glabel test_ray_entities /* 3897C 8005D57C C6240048 */ lwc1 $f4, 0x48($s1) /* 38980 8005D580 46022000 */ add.s $f0, $f4, $f2 /* 38984 8005D584 461E003C */ c.lt.s $f0, $f30 -/* 38988 8005D588 00000000 */ nop +/* 38988 8005D588 00000000 */ nop /* 3898C 8005D58C 45030146 */ bc1tl .L8005DAA8 /* 38990 8005D590 27DE0001 */ addiu $fp, $fp, 1 /* 38994 8005D594 46022001 */ sub.s $f0, $f4, $f2 /* 38998 8005D598 4600F03C */ c.lt.s $f30, $f0 -/* 3899C 8005D59C 00000000 */ nop +/* 3899C 8005D59C 00000000 */ nop /* 389A0 8005D5A0 45030141 */ bc1tl .L8005DAA8 /* 389A4 8005D5A4 27DE0001 */ addiu $fp, $fp, 1 /* 389A8 8005D5A8 C6240050 */ lwc1 $f4, 0x50($s1) /* 389AC 8005D5AC 46022000 */ add.s $f0, $f4, $f2 /* 389B0 8005D5B0 C7A801A8 */ lwc1 $f8, 0x1a8($sp) /* 389B4 8005D5B4 4608003C */ c.lt.s $f0, $f8 -/* 389B8 8005D5B8 00000000 */ nop +/* 389B8 8005D5B8 00000000 */ nop /* 389BC 8005D5BC 4503013A */ bc1tl .L8005DAA8 /* 389C0 8005D5C0 27DE0001 */ addiu $fp, $fp, 1 /* 389C4 8005D5C4 46022001 */ sub.s $f0, $f4, $f2 /* 389C8 8005D5C8 4600403C */ c.lt.s $f8, $f0 -/* 389CC 8005D5CC 00000000 */ nop +/* 389CC 8005D5CC 00000000 */ nop /* 389D0 8005D5D0 45030135 */ bc1tl .L8005DAA8 /* 389D4 8005D5D4 27DE0001 */ addiu $fp, $fp, 1 /* 389D8 8005D5D8 06C00016 */ bltz $s6, .L8005D634 @@ -125,12 +125,12 @@ glabel test_ray_entities /* 38A08 8005D608 C622004C */ lwc1 $f2, 0x4c($s1) /* 38A0C 8005D60C 46041000 */ add.s $f0, $f2, $f4 /* 38A10 8005D610 461A003C */ c.lt.s $f0, $f26 -/* 38A14 8005D614 00000000 */ nop +/* 38A14 8005D614 00000000 */ nop /* 38A18 8005D618 45030123 */ bc1tl .L8005DAA8 /* 38A1C 8005D61C 27DE0001 */ addiu $fp, $fp, 1 /* 38A20 8005D620 46041001 */ sub.s $f0, $f2, $f4 /* 38A24 8005D624 4600D03C */ c.lt.s $f26, $f0 -/* 38A28 8005D628 00000000 */ nop +/* 38A28 8005D628 00000000 */ nop /* 38A2C 8005D62C 4503011E */ bc1tl .L8005DAA8 /* 38A30 8005D630 27DE0001 */ addiu $fp, $fp, 1 .L8005D634: @@ -157,7 +157,7 @@ glabel test_ray_entities /* 38A80 8005D680 00431021 */ addu $v0, $v0, $v1 /* 38A84 8005D684 00021043 */ sra $v0, $v0, 1 /* 38A88 8005D688 44821000 */ mtc1 $v0, $f2 -/* 38A8C 8005D68C 00000000 */ nop +/* 38A8C 8005D68C 00000000 */ nop /* 38A90 8005D690 468010A0 */ cvt.s.w $f2, $f2 /* 38A94 8005D694 00084400 */ sll $t0, $t0, 0x10 /* 38A98 8005D698 00081403 */ sra $v0, $t0, 0x10 @@ -170,7 +170,7 @@ glabel test_ray_entities /* 38AB4 8005D6B4 E7A000B8 */ swc1 $f0, 0xb8($sp) /* 38AB8 8005D6B8 E7A000AC */ swc1 $f0, 0xac($sp) /* 38ABC 8005D6BC 44820000 */ mtc1 $v0, $f0 -/* 38AC0 8005D6C0 00000000 */ nop +/* 38AC0 8005D6C0 00000000 */ nop /* 38AC4 8005D6C4 46800020 */ cvt.s.w $f0, $f0 /* 38AC8 8005D6C8 E7A200F4 */ swc1 $f2, 0xf4($sp) /* 38ACC 8005D6CC E7A200D0 */ swc1 $f2, 0xd0($sp) @@ -189,7 +189,7 @@ glabel test_ray_entities /* 38B00 8005D700 E7A000CC */ swc1 $f0, 0xcc($sp) /* 38B04 8005D704 E7A000C0 */ swc1 $f0, 0xc0($sp) /* 38B08 8005D708 44830000 */ mtc1 $v1, $f0 -/* 38B0C 8005D70C 00000000 */ nop +/* 38B0C 8005D70C 00000000 */ nop /* 38B10 8005D710 46800020 */ cvt.s.w $f0, $f0 /* 38B14 8005D714 E7A000F8 */ swc1 $f0, 0xf8($sp) /* 38B18 8005D718 E7A000EC */ swc1 $f0, 0xec($sp) @@ -290,7 +290,7 @@ glabel test_ray_entities /* 38C90 8005D890 E6400038 */ swc1 $f0, 0x38($s2) /* 38C94 8005D894 0040182D */ daddu $v1, $v0, $zero /* 38C98 8005D898 14600008 */ bnez $v1, .L8005D8BC -/* 38C9C 8005D89C 00000000 */ nop +/* 38C9C 8005D89C 00000000 */ nop /* 38CA0 8005D8A0 2694000C */ addiu $s4, $s4, 0xc /* 38CA4 8005D8A4 26B50001 */ addiu $s5, $s5, 1 /* 38CA8 8005D8A8 2AA2000C */ slti $v0, $s5, 0xc @@ -305,7 +305,7 @@ glabel test_ray_entities /* 38CC8 8005D8C8 C4620000 */ lwc1 $f2, ($v1) /* 38CCC 8005D8CC C5200000 */ lwc1 $f0, ($t1) /* 38CD0 8005D8D0 4600103C */ c.lt.s $f2, $f0 -/* 38CD4 8005D8D4 00000000 */ nop +/* 38CD4 8005D8D4 00000000 */ nop /* 38CD8 8005D8D8 45020073 */ bc1fl .L8005DAA8 /* 38CDC 8005D8DC 27DE0001 */ addiu $fp, $fp, 1 /* 38CE0 8005D8E0 24020001 */ addiu $v0, $zero, 1 @@ -316,12 +316,12 @@ glabel test_ray_entities /* 38CF4 8005D8F4 10400005 */ beqz $v0, .L8005D90C /* 38CF8 8005D8F8 24020002 */ addiu $v0, $zero, 2 /* 38CFC 8005D8FC 12C00007 */ beqz $s6, .L8005D91C -/* 38D00 8005D900 00000000 */ nop +/* 38D00 8005D900 00000000 */ nop /* 38D04 8005D904 0801764F */ j .L8005D93C /* 38D08 8005D908 E7B40010 */ swc1 $f20, 0x10($sp) .L8005D90C: /* 38D0C 8005D90C 12C20009 */ beq $s6, $v0, .L8005D934 -/* 38D10 8005D910 00000000 */ nop +/* 38D10 8005D910 00000000 */ nop /* 38D14 8005D914 0801764F */ j .L8005D93C /* 38D18 8005D918 E7B40010 */ swc1 $f20, 0x10($sp) .L8005D91C: @@ -390,49 +390,49 @@ glabel test_ray_entities /* 38E04 8005DA04 26104258 */ addiu $s0, $s0, %lo(D_800A4258) /* 38E08 8005DA08 C6040000 */ lwc1 $f4, ($s0) /* 38E0C 8005DA0C 46042102 */ mul.s $f4, $f4, $f4 -/* 38E10 8005DA10 00000000 */ nop +/* 38E10 8005DA10 00000000 */ nop /* 38E14 8005DA14 3C11800A */ lui $s1, %hi(D_800A425C) /* 38E18 8005DA18 2631425C */ addiu $s1, $s1, %lo(D_800A425C) /* 38E1C 8005DA1C C6220000 */ lwc1 $f2, ($s1) /* 38E20 8005DA20 46021082 */ mul.s $f2, $f2, $f2 -/* 38E24 8005DA24 00000000 */ nop +/* 38E24 8005DA24 00000000 */ nop /* 38E28 8005DA28 3C13800A */ lui $s3, %hi(D_800A4260) /* 38E2C 8005DA2C 26734260 */ addiu $s3, $s3, %lo(D_800A4260) /* 38E30 8005DA30 C6600000 */ lwc1 $f0, ($s3) /* 38E34 8005DA34 46000002 */ mul.s $f0, $f0, $f0 -/* 38E38 8005DA38 00000000 */ nop +/* 38E38 8005DA38 00000000 */ nop /* 38E3C 8005DA3C 46022100 */ add.s $f4, $f4, $f2 /* 38E40 8005DA40 46002300 */ add.s $f12, $f4, $f0 /* 38E44 8005DA44 46006084 */ sqrt.s $f2, $f12 /* 38E48 8005DA48 46021032 */ c.eq.s $f2, $f2 -/* 38E4C 8005DA4C 00000000 */ nop +/* 38E4C 8005DA4C 00000000 */ nop /* 38E50 8005DA50 45010004 */ bc1t .L8005DA64 -/* 38E54 8005DA54 00000000 */ nop +/* 38E54 8005DA54 00000000 */ nop /* 38E58 8005DA58 0C0187BC */ jal sqrtf -/* 38E5C 8005DA5C 00000000 */ nop +/* 38E5C 8005DA5C 00000000 */ nop /* 38E60 8005DA60 46000086 */ mov.s $f2, $f0 .L8005DA64: /* 38E64 8005DA64 C6000000 */ lwc1 $f0, ($s0) /* 38E68 8005DA68 4602E083 */ div.s $f2, $f28, $f2 /* 38E6C 8005DA6C 46020002 */ mul.s $f0, $f0, $f2 -/* 38E70 8005DA70 00000000 */ nop +/* 38E70 8005DA70 00000000 */ nop /* 38E74 8005DA74 8FA901C8 */ lw $t1, 0x1c8($sp) /* 38E78 8005DA78 E5200000 */ swc1 $f0, ($t1) /* 38E7C 8005DA7C C6200000 */ lwc1 $f0, ($s1) /* 38E80 8005DA80 46020002 */ mul.s $f0, $f0, $f2 -/* 38E84 8005DA84 00000000 */ nop +/* 38E84 8005DA84 00000000 */ nop /* 38E88 8005DA88 8FA901CC */ lw $t1, 0x1cc($sp) /* 38E8C 8005DA8C E5200000 */ swc1 $f0, ($t1) /* 38E90 8005DA90 C6600000 */ lwc1 $f0, ($s3) /* 38E94 8005DA94 46020002 */ mul.s $f0, $f0, $f2 -/* 38E98 8005DA98 00000000 */ nop +/* 38E98 8005DA98 00000000 */ nop /* 38E9C 8005DA9C 8FA901D0 */ lw $t1, 0x1d0($sp) /* 38EA0 8005DAA0 E5200000 */ swc1 $f0, ($t1) /* 38EA4 8005DAA4 27DE0001 */ addiu $fp, $fp, 1 .L8005DAA8: /* 38EA8 8005DAA8 2BC2001E */ slti $v0, $fp, 0x1e /* 38EAC 8005DAAC 1440FEA6 */ bnez $v0, .L8005D548 -/* 38EB0 8005DAB0 00000000 */ nop +/* 38EB0 8005DAB0 00000000 */ nop /* 38EB4 8005DAB4 8FA20140 */ lw $v0, 0x140($sp) /* 38EB8 8005DAB8 8FBF016C */ lw $ra, 0x16c($sp) /* 38EBC 8005DABC 8FBE0168 */ lw $fp, 0x168($sp) diff --git a/asm/nonmatchings/code_362a0_len_2f70/test_ray_triangle_general.s b/asm/nonmatchings/code_362a0_len_2f70/test_ray_triangle_general.s index 7bbbf2124d..5f6dd05ddc 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/test_ray_triangle_general.s +++ b/asm/nonmatchings/code_362a0_len_2f70/test_ray_triangle_general.s @@ -11,19 +11,19 @@ glabel test_ray_triangle_general /* 3729C 8005BE9C F7B40010 */ sdc1 $f20, 0x10($sp) /* 372A0 8005BEA0 C4800030 */ lwc1 $f0, 0x30($a0) /* 372A4 8005BEA4 44801000 */ mtc1 $zero, $f2 -/* 372A8 8005BEA8 00000000 */ nop +/* 372A8 8005BEA8 00000000 */ nop /* 372AC 8005BEAC 46020032 */ c.eq.s $f0, $f2 -/* 372B0 8005BEB0 00000000 */ nop +/* 372B0 8005BEB0 00000000 */ nop /* 372B4 8005BEB4 4500000B */ bc1f .L8005BEE4 -/* 372B8 8005BEB8 00000000 */ nop +/* 372B8 8005BEB8 00000000 */ nop /* 372BC 8005BEBC C4800034 */ lwc1 $f0, 0x34($a0) /* 372C0 8005BEC0 46020032 */ c.eq.s $f0, $f2 -/* 372C4 8005BEC4 00000000 */ nop +/* 372C4 8005BEC4 00000000 */ nop /* 372C8 8005BEC8 45000006 */ bc1f .L8005BEE4 -/* 372CC 8005BECC 00000000 */ nop +/* 372CC 8005BECC 00000000 */ nop /* 372D0 8005BED0 C4800038 */ lwc1 $f0, 0x38($a0) /* 372D4 8005BED4 46020032 */ c.eq.s $f0, $f2 -/* 372D8 8005BED8 00000000 */ nop +/* 372D8 8005BED8 00000000 */ nop /* 372DC 8005BEDC 45010167 */ bc1t .L8005C47C /* 372E0 8005BEE0 0000102D */ daddu $v0, $zero, $zero .L8005BEE4: @@ -35,7 +35,7 @@ glabel test_ray_triangle_general /* 372F8 8005BEF8 E7A00008 */ swc1 $f0, 8($sp) /* 372FC 8005BEFC C48A0030 */ lwc1 $f10, 0x30($a0) /* 37300 8005BF00 46005082 */ mul.s $f2, $f10, $f0 -/* 37304 8005BF04 00000000 */ nop +/* 37304 8005BF04 00000000 */ nop /* 37308 8005BF08 3C01800A */ lui $at, %hi(D_800A4234) /* 3730C 8005BF0C C43C4234 */ lwc1 $f28, %lo(D_800A4234)($at) /* 37310 8005BF10 C4400004 */ lwc1 $f0, 4($v0) @@ -44,13 +44,13 @@ glabel test_ray_triangle_general /* 3731C 8005BF1C 3C01800A */ lui $at, %hi(D_800A4238) /* 37320 8005BF20 C4324238 */ lwc1 $f18, %lo(D_800A4238)($at) /* 37324 8005BF24 46184102 */ mul.s $f4, $f8, $f24 -/* 37328 8005BF28 00000000 */ nop +/* 37328 8005BF28 00000000 */ nop /* 3732C 8005BF2C E7B20000 */ swc1 $f18, ($sp) /* 37330 8005BF30 C4400008 */ lwc1 $f0, 8($v0) /* 37334 8005BF34 46009581 */ sub.s $f22, $f18, $f0 /* 37338 8005BF38 C4860038 */ lwc1 $f6, 0x38($a0) /* 3733C 8005BF3C 46163002 */ mul.s $f0, $f6, $f22 -/* 37340 8005BF40 00000000 */ nop +/* 37340 8005BF40 00000000 */ nop /* 37344 8005BF44 8C830004 */ lw $v1, 4($a0) /* 37348 8005BF48 46041080 */ add.s $f2, $f2, $f4 /* 3734C 8005BF4C 8C850008 */ lw $a1, 8($a0) @@ -58,127 +58,127 @@ glabel test_ray_triangle_general /* 37354 8005BF54 1040007E */ beqz $v0, .L8005C150 /* 37358 8005BF58 46001500 */ add.s $f20, $f2, $f0 /* 3735C 8005BF5C 4480F000 */ mtc1 $zero, $f30 -/* 37360 8005BF60 00000000 */ nop +/* 37360 8005BF60 00000000 */ nop /* 37364 8005BF64 461EA03C */ c.lt.s $f20, $f30 -/* 37368 8005BF68 00000000 */ nop +/* 37368 8005BF68 00000000 */ nop /* 3736C 8005BF6C 45030143 */ bc1tl .L8005C47C /* 37370 8005BF70 0000102D */ daddu $v0, $zero, $zero /* 37374 8005BF74 3C01800A */ lui $at, %hi(D_800A423C) /* 37378 8005BF78 C430423C */ lwc1 $f16, %lo(D_800A423C)($at) /* 3737C 8005BF7C 46105002 */ mul.s $f0, $f10, $f16 -/* 37380 8005BF80 00000000 */ nop +/* 37380 8005BF80 00000000 */ nop /* 37384 8005BF84 3C01800A */ lui $at, %hi(D_800A4240) /* 37388 8005BF88 C42E4240 */ lwc1 $f14, %lo(D_800A4240)($at) /* 3738C 8005BF8C 460E4102 */ mul.s $f4, $f8, $f14 -/* 37390 8005BF90 00000000 */ nop +/* 37390 8005BF90 00000000 */ nop /* 37394 8005BF94 3C01800A */ lui $at, %hi(D_800A4244) /* 37398 8005BF98 C42C4244 */ lwc1 $f12, %lo(D_800A4244)($at) /* 3739C 8005BF9C 460C3082 */ mul.s $f2, $f6, $f12 -/* 373A0 8005BFA0 00000000 */ nop +/* 373A0 8005BFA0 00000000 */ nop /* 373A4 8005BFA4 46040000 */ add.s $f0, $f0, $f4 /* 373A8 8005BFA8 46020000 */ add.s $f0, $f0, $f2 /* 373AC 8005BFAC 4600F03E */ c.le.s $f30, $f0 -/* 373B0 8005BFB0 00000000 */ nop +/* 373B0 8005BFB0 00000000 */ nop /* 373B4 8005BFB4 45010131 */ bc1t .L8005C47C /* 373B8 8005BFB8 0000102D */ daddu $v0, $zero, $zero /* 373BC 8005BFBC C4880014 */ lwc1 $f8, 0x14($a0) /* 373C0 8005BFC0 460E4102 */ mul.s $f4, $f8, $f14 -/* 373C4 8005BFC4 00000000 */ nop +/* 373C4 8005BFC4 00000000 */ nop /* 373C8 8005BFC8 C4820010 */ lwc1 $f2, 0x10($a0) /* 373CC 8005BFCC 460C1002 */ mul.s $f0, $f2, $f12 -/* 373D0 8005BFD0 00000000 */ nop +/* 373D0 8005BFD0 00000000 */ nop /* 373D4 8005BFD4 46104202 */ mul.s $f8, $f8, $f16 -/* 373D8 8005BFD8 00000000 */ nop +/* 373D8 8005BFD8 00000000 */ nop /* 373DC 8005BFDC 46101082 */ mul.s $f2, $f2, $f16 -/* 373E0 8005BFE0 00000000 */ nop +/* 373E0 8005BFE0 00000000 */ nop /* 373E4 8005BFE4 46002101 */ sub.s $f4, $f4, $f0 /* 373E8 8005BFE8 C486000C */ lwc1 $f6, 0xc($a0) /* 373EC 8005BFEC 460C3002 */ mul.s $f0, $f6, $f12 -/* 373F0 8005BFF0 00000000 */ nop +/* 373F0 8005BFF0 00000000 */ nop /* 373F4 8005BFF4 460E3182 */ mul.s $f6, $f6, $f14 -/* 373F8 8005BFF8 00000000 */ nop +/* 373F8 8005BFF8 00000000 */ nop /* 373FC 8005BFFC C7B20008 */ lwc1 $f18, 8($sp) /* 37400 8005C000 46049102 */ mul.s $f4, $f18, $f4 -/* 37404 8005C004 00000000 */ nop +/* 37404 8005C004 00000000 */ nop /* 37408 8005C008 46080001 */ sub.s $f0, $f0, $f8 /* 3740C 8005C00C 4600C002 */ mul.s $f0, $f24, $f0 -/* 37410 8005C010 00000000 */ nop +/* 37410 8005C010 00000000 */ nop /* 37414 8005C014 46061081 */ sub.s $f2, $f2, $f6 /* 37418 8005C018 4602B082 */ mul.s $f2, $f22, $f2 -/* 3741C 8005C01C 00000000 */ nop +/* 3741C 8005C01C 00000000 */ nop /* 37420 8005C020 46002100 */ add.s $f4, $f4, $f0 /* 37424 8005C024 46022100 */ add.s $f4, $f4, $f2 /* 37428 8005C028 461E203C */ c.lt.s $f4, $f30 -/* 3742C 8005C02C 00000000 */ nop +/* 3742C 8005C02C 00000000 */ nop /* 37430 8005C030 45010112 */ bc1t .L8005C47C -/* 37434 8005C034 00000000 */ nop +/* 37434 8005C034 00000000 */ nop /* 37438 8005C038 C48A0020 */ lwc1 $f10, 0x20($a0) /* 3743C 8005C03C 460E5002 */ mul.s $f0, $f10, $f14 -/* 37440 8005C040 00000000 */ nop +/* 37440 8005C040 00000000 */ nop /* 37444 8005C044 C488001C */ lwc1 $f8, 0x1c($a0) /* 37448 8005C048 460C4102 */ mul.s $f4, $f8, $f12 -/* 3744C 8005C04C 00000000 */ nop +/* 3744C 8005C04C 00000000 */ nop /* 37450 8005C050 46105282 */ mul.s $f10, $f10, $f16 -/* 37454 8005C054 00000000 */ nop +/* 37454 8005C054 00000000 */ nop /* 37458 8005C058 46104202 */ mul.s $f8, $f8, $f16 -/* 3745C 8005C05C 00000000 */ nop +/* 3745C 8005C05C 00000000 */ nop /* 37460 8005C060 C4620000 */ lwc1 $f2, ($v1) /* 37464 8005C064 4602D081 */ sub.s $f2, $f26, $f2 /* 37468 8005C068 46040001 */ sub.s $f0, $f0, $f4 /* 3746C 8005C06C 46001082 */ mul.s $f2, $f2, $f0 -/* 37470 8005C070 00000000 */ nop +/* 37470 8005C070 00000000 */ nop /* 37474 8005C074 C4860018 */ lwc1 $f6, 0x18($a0) /* 37478 8005C078 460C3002 */ mul.s $f0, $f6, $f12 -/* 3747C 8005C07C 00000000 */ nop +/* 3747C 8005C07C 00000000 */ nop /* 37480 8005C080 460E3182 */ mul.s $f6, $f6, $f14 -/* 37484 8005C084 00000000 */ nop +/* 37484 8005C084 00000000 */ nop /* 37488 8005C088 C4640004 */ lwc1 $f4, 4($v1) /* 3748C 8005C08C 4604E101 */ sub.s $f4, $f28, $f4 /* 37490 8005C090 460A0001 */ sub.s $f0, $f0, $f10 /* 37494 8005C094 46002102 */ mul.s $f4, $f4, $f0 -/* 37498 8005C098 00000000 */ nop +/* 37498 8005C098 00000000 */ nop /* 3749C 8005C09C C7B20000 */ lwc1 $f18, ($sp) /* 374A0 8005C0A0 46064201 */ sub.s $f8, $f8, $f6 /* 374A4 8005C0A4 C4600008 */ lwc1 $f0, 8($v1) /* 374A8 8005C0A8 46009001 */ sub.s $f0, $f18, $f0 /* 374AC 8005C0AC 46080002 */ mul.s $f0, $f0, $f8 -/* 374B0 8005C0B0 00000000 */ nop +/* 374B0 8005C0B0 00000000 */ nop /* 374B4 8005C0B4 46041080 */ add.s $f2, $f2, $f4 /* 374B8 8005C0B8 46001080 */ add.s $f2, $f2, $f0 /* 374BC 8005C0BC 461E103C */ c.lt.s $f2, $f30 -/* 374C0 8005C0C0 00000000 */ nop +/* 374C0 8005C0C0 00000000 */ nop /* 374C4 8005C0C4 450100ED */ bc1t .L8005C47C -/* 374C8 8005C0C8 00000000 */ nop +/* 374C8 8005C0C8 00000000 */ nop /* 374CC 8005C0CC C48A002C */ lwc1 $f10, 0x2c($a0) /* 374D0 8005C0D0 460E5002 */ mul.s $f0, $f10, $f14 -/* 374D4 8005C0D4 00000000 */ nop +/* 374D4 8005C0D4 00000000 */ nop /* 374D8 8005C0D8 C4880028 */ lwc1 $f8, 0x28($a0) /* 374DC 8005C0DC 460C4102 */ mul.s $f4, $f8, $f12 -/* 374E0 8005C0E0 00000000 */ nop +/* 374E0 8005C0E0 00000000 */ nop /* 374E4 8005C0E4 46105282 */ mul.s $f10, $f10, $f16 -/* 374E8 8005C0E8 00000000 */ nop +/* 374E8 8005C0E8 00000000 */ nop /* 374EC 8005C0EC 46104202 */ mul.s $f8, $f8, $f16 -/* 374F0 8005C0F0 00000000 */ nop +/* 374F0 8005C0F0 00000000 */ nop /* 374F4 8005C0F4 C4A20000 */ lwc1 $f2, ($a1) /* 374F8 8005C0F8 4602D081 */ sub.s $f2, $f26, $f2 /* 374FC 8005C0FC 46040001 */ sub.s $f0, $f0, $f4 /* 37500 8005C100 46001082 */ mul.s $f2, $f2, $f0 -/* 37504 8005C104 00000000 */ nop +/* 37504 8005C104 00000000 */ nop /* 37508 8005C108 C4860024 */ lwc1 $f6, 0x24($a0) /* 3750C 8005C10C 460C3002 */ mul.s $f0, $f6, $f12 -/* 37510 8005C110 00000000 */ nop +/* 37510 8005C110 00000000 */ nop /* 37514 8005C114 460E3182 */ mul.s $f6, $f6, $f14 -/* 37518 8005C118 00000000 */ nop +/* 37518 8005C118 00000000 */ nop /* 3751C 8005C11C C4A40004 */ lwc1 $f4, 4($a1) /* 37520 8005C120 4604E101 */ sub.s $f4, $f28, $f4 /* 37524 8005C124 460A0001 */ sub.s $f0, $f0, $f10 /* 37528 8005C128 46002102 */ mul.s $f4, $f4, $f0 -/* 3752C 8005C12C 00000000 */ nop +/* 3752C 8005C12C 00000000 */ nop /* 37530 8005C130 46064201 */ sub.s $f8, $f8, $f6 /* 37534 8005C134 C4A00008 */ lwc1 $f0, 8($a1) /* 37538 8005C138 46009001 */ sub.s $f0, $f18, $f0 /* 3753C 8005C13C 46080002 */ mul.s $f0, $f0, $f8 -/* 37540 8005C140 00000000 */ nop +/* 37540 8005C140 00000000 */ nop /* 37544 8005C144 46041080 */ add.s $f2, $f2, $f4 /* 37548 8005C148 080170D4 */ j .L8005C350 /* 3754C 8005C14C 46001080 */ add.s $f2, $f2, $f0 @@ -186,164 +186,164 @@ glabel test_ray_triangle_general /* 37550 8005C150 3C01800A */ lui $at, %hi(D_800A423C) /* 37554 8005C154 C430423C */ lwc1 $f16, %lo(D_800A423C)($at) /* 37558 8005C158 46105002 */ mul.s $f0, $f10, $f16 -/* 3755C 8005C15C 00000000 */ nop +/* 3755C 8005C15C 00000000 */ nop /* 37560 8005C160 3C01800A */ lui $at, %hi(D_800A4240) /* 37564 8005C164 C42E4240 */ lwc1 $f14, %lo(D_800A4240)($at) /* 37568 8005C168 460E4102 */ mul.s $f4, $f8, $f14 -/* 3756C 8005C16C 00000000 */ nop +/* 3756C 8005C16C 00000000 */ nop /* 37570 8005C170 3C01800A */ lui $at, %hi(D_800A4244) /* 37574 8005C174 C42C4244 */ lwc1 $f12, %lo(D_800A4244)($at) /* 37578 8005C178 460C3082 */ mul.s $f2, $f6, $f12 -/* 3757C 8005C17C 00000000 */ nop +/* 3757C 8005C17C 00000000 */ nop /* 37580 8005C180 46040000 */ add.s $f0, $f0, $f4 /* 37584 8005C184 46020000 */ add.s $f0, $f0, $f2 /* 37588 8005C188 46140002 */ mul.s $f0, $f0, $f20 -/* 3758C 8005C18C 00000000 */ nop +/* 3758C 8005C18C 00000000 */ nop /* 37590 8005C190 4480F000 */ mtc1 $zero, $f30 -/* 37594 8005C194 00000000 */ nop +/* 37594 8005C194 00000000 */ nop /* 37598 8005C198 4600F03E */ c.le.s $f30, $f0 -/* 3759C 8005C19C 00000000 */ nop +/* 3759C 8005C19C 00000000 */ nop /* 375A0 8005C1A0 450100B6 */ bc1t .L8005C47C /* 375A4 8005C1A4 0000102D */ daddu $v0, $zero, $zero /* 375A8 8005C1A8 C4880014 */ lwc1 $f8, 0x14($a0) /* 375AC 8005C1AC 460E4002 */ mul.s $f0, $f8, $f14 -/* 375B0 8005C1B0 00000000 */ nop +/* 375B0 8005C1B0 00000000 */ nop /* 375B4 8005C1B4 C4840010 */ lwc1 $f4, 0x10($a0) /* 375B8 8005C1B8 460C2082 */ mul.s $f2, $f4, $f12 -/* 375BC 8005C1BC 00000000 */ nop +/* 375BC 8005C1BC 00000000 */ nop /* 375C0 8005C1C0 46104202 */ mul.s $f8, $f8, $f16 -/* 375C4 8005C1C4 00000000 */ nop +/* 375C4 8005C1C4 00000000 */ nop /* 375C8 8005C1C8 46102102 */ mul.s $f4, $f4, $f16 -/* 375CC 8005C1CC 00000000 */ nop +/* 375CC 8005C1CC 00000000 */ nop /* 375D0 8005C1D0 46020001 */ sub.s $f0, $f0, $f2 /* 375D4 8005C1D4 C486000C */ lwc1 $f6, 0xc($a0) /* 375D8 8005C1D8 460C3082 */ mul.s $f2, $f6, $f12 -/* 375DC 8005C1DC 00000000 */ nop +/* 375DC 8005C1DC 00000000 */ nop /* 375E0 8005C1E0 460E3182 */ mul.s $f6, $f6, $f14 -/* 375E4 8005C1E4 00000000 */ nop +/* 375E4 8005C1E4 00000000 */ nop /* 375E8 8005C1E8 C7B20008 */ lwc1 $f18, 8($sp) /* 375EC 8005C1EC 46009002 */ mul.s $f0, $f18, $f0 -/* 375F0 8005C1F0 00000000 */ nop +/* 375F0 8005C1F0 00000000 */ nop /* 375F4 8005C1F4 46081081 */ sub.s $f2, $f2, $f8 /* 375F8 8005C1F8 4602C082 */ mul.s $f2, $f24, $f2 -/* 375FC 8005C1FC 00000000 */ nop +/* 375FC 8005C1FC 00000000 */ nop /* 37600 8005C200 46062101 */ sub.s $f4, $f4, $f6 /* 37604 8005C204 4604B102 */ mul.s $f4, $f22, $f4 -/* 37608 8005C208 00000000 */ nop +/* 37608 8005C208 00000000 */ nop /* 3760C 8005C20C 46020000 */ add.s $f0, $f0, $f2 /* 37610 8005C210 46040000 */ add.s $f0, $f0, $f4 /* 37614 8005C214 46140002 */ mul.s $f0, $f0, $f20 -/* 37618 8005C218 00000000 */ nop +/* 37618 8005C218 00000000 */ nop /* 3761C 8005C21C 461E003C */ c.lt.s $f0, $f30 -/* 37620 8005C220 00000000 */ nop +/* 37620 8005C220 00000000 */ nop /* 37624 8005C224 45010095 */ bc1t .L8005C47C -/* 37628 8005C228 00000000 */ nop +/* 37628 8005C228 00000000 */ nop /* 3762C 8005C22C C48A0020 */ lwc1 $f10, 0x20($a0) /* 37630 8005C230 460E5002 */ mul.s $f0, $f10, $f14 -/* 37634 8005C234 00000000 */ nop +/* 37634 8005C234 00000000 */ nop /* 37638 8005C238 C488001C */ lwc1 $f8, 0x1c($a0) /* 3763C 8005C23C 460C4102 */ mul.s $f4, $f8, $f12 -/* 37640 8005C240 00000000 */ nop +/* 37640 8005C240 00000000 */ nop /* 37644 8005C244 46105282 */ mul.s $f10, $f10, $f16 -/* 37648 8005C248 00000000 */ nop +/* 37648 8005C248 00000000 */ nop /* 3764C 8005C24C 46104202 */ mul.s $f8, $f8, $f16 -/* 37650 8005C250 00000000 */ nop +/* 37650 8005C250 00000000 */ nop /* 37654 8005C254 C4620000 */ lwc1 $f2, ($v1) /* 37658 8005C258 4602D081 */ sub.s $f2, $f26, $f2 /* 3765C 8005C25C 46040001 */ sub.s $f0, $f0, $f4 /* 37660 8005C260 46001082 */ mul.s $f2, $f2, $f0 -/* 37664 8005C264 00000000 */ nop +/* 37664 8005C264 00000000 */ nop /* 37668 8005C268 C4860018 */ lwc1 $f6, 0x18($a0) /* 3766C 8005C26C 460C3002 */ mul.s $f0, $f6, $f12 -/* 37670 8005C270 00000000 */ nop +/* 37670 8005C270 00000000 */ nop /* 37674 8005C274 460E3182 */ mul.s $f6, $f6, $f14 -/* 37678 8005C278 00000000 */ nop +/* 37678 8005C278 00000000 */ nop /* 3767C 8005C27C C4640004 */ lwc1 $f4, 4($v1) /* 37680 8005C280 4604E101 */ sub.s $f4, $f28, $f4 /* 37684 8005C284 460A0001 */ sub.s $f0, $f0, $f10 /* 37688 8005C288 46002102 */ mul.s $f4, $f4, $f0 -/* 3768C 8005C28C 00000000 */ nop +/* 3768C 8005C28C 00000000 */ nop /* 37690 8005C290 C7B20000 */ lwc1 $f18, ($sp) /* 37694 8005C294 46064201 */ sub.s $f8, $f8, $f6 /* 37698 8005C298 C4600008 */ lwc1 $f0, 8($v1) /* 3769C 8005C29C 46009001 */ sub.s $f0, $f18, $f0 /* 376A0 8005C2A0 46080002 */ mul.s $f0, $f0, $f8 -/* 376A4 8005C2A4 00000000 */ nop +/* 376A4 8005C2A4 00000000 */ nop /* 376A8 8005C2A8 46041080 */ add.s $f2, $f2, $f4 /* 376AC 8005C2AC 46001080 */ add.s $f2, $f2, $f0 /* 376B0 8005C2B0 46141082 */ mul.s $f2, $f2, $f20 -/* 376B4 8005C2B4 00000000 */ nop +/* 376B4 8005C2B4 00000000 */ nop /* 376B8 8005C2B8 461E103C */ c.lt.s $f2, $f30 -/* 376BC 8005C2BC 00000000 */ nop +/* 376BC 8005C2BC 00000000 */ nop /* 376C0 8005C2C0 4501006E */ bc1t .L8005C47C -/* 376C4 8005C2C4 00000000 */ nop +/* 376C4 8005C2C4 00000000 */ nop /* 376C8 8005C2C8 C48A002C */ lwc1 $f10, 0x2c($a0) /* 376CC 8005C2CC 460E5002 */ mul.s $f0, $f10, $f14 -/* 376D0 8005C2D0 00000000 */ nop +/* 376D0 8005C2D0 00000000 */ nop /* 376D4 8005C2D4 C4880028 */ lwc1 $f8, 0x28($a0) /* 376D8 8005C2D8 460C4102 */ mul.s $f4, $f8, $f12 -/* 376DC 8005C2DC 00000000 */ nop +/* 376DC 8005C2DC 00000000 */ nop /* 376E0 8005C2E0 46105282 */ mul.s $f10, $f10, $f16 -/* 376E4 8005C2E4 00000000 */ nop +/* 376E4 8005C2E4 00000000 */ nop /* 376E8 8005C2E8 46104202 */ mul.s $f8, $f8, $f16 -/* 376EC 8005C2EC 00000000 */ nop +/* 376EC 8005C2EC 00000000 */ nop /* 376F0 8005C2F0 C4A20000 */ lwc1 $f2, ($a1) /* 376F4 8005C2F4 4602D081 */ sub.s $f2, $f26, $f2 /* 376F8 8005C2F8 46040001 */ sub.s $f0, $f0, $f4 /* 376FC 8005C2FC 46001082 */ mul.s $f2, $f2, $f0 -/* 37700 8005C300 00000000 */ nop +/* 37700 8005C300 00000000 */ nop /* 37704 8005C304 C4860024 */ lwc1 $f6, 0x24($a0) /* 37708 8005C308 460C3002 */ mul.s $f0, $f6, $f12 -/* 3770C 8005C30C 00000000 */ nop +/* 3770C 8005C30C 00000000 */ nop /* 37710 8005C310 460E3182 */ mul.s $f6, $f6, $f14 -/* 37714 8005C314 00000000 */ nop +/* 37714 8005C314 00000000 */ nop /* 37718 8005C318 C4A40004 */ lwc1 $f4, 4($a1) /* 3771C 8005C31C 4604E101 */ sub.s $f4, $f28, $f4 /* 37720 8005C320 460A0001 */ sub.s $f0, $f0, $f10 /* 37724 8005C324 46002102 */ mul.s $f4, $f4, $f0 -/* 37728 8005C328 00000000 */ nop +/* 37728 8005C328 00000000 */ nop /* 3772C 8005C32C 46064201 */ sub.s $f8, $f8, $f6 /* 37730 8005C330 C4A00008 */ lwc1 $f0, 8($a1) /* 37734 8005C334 46009001 */ sub.s $f0, $f18, $f0 /* 37738 8005C338 46080002 */ mul.s $f0, $f0, $f8 -/* 3773C 8005C33C 00000000 */ nop +/* 3773C 8005C33C 00000000 */ nop /* 37740 8005C340 46041080 */ add.s $f2, $f2, $f4 /* 37744 8005C344 46001080 */ add.s $f2, $f2, $f0 /* 37748 8005C348 46141082 */ mul.s $f2, $f2, $f20 -/* 3774C 8005C34C 00000000 */ nop +/* 3774C 8005C34C 00000000 */ nop .L8005C350: /* 37750 8005C350 461E103C */ c.lt.s $f2, $f30 -/* 37754 8005C354 00000000 */ nop +/* 37754 8005C354 00000000 */ nop /* 37758 8005C358 45030048 */ bc1tl .L8005C47C /* 3775C 8005C35C 0000102D */ daddu $v0, $zero, $zero /* 37760 8005C360 C4860030 */ lwc1 $f6, 0x30($a0) /* 37764 8005C364 3C01800A */ lui $at, %hi(D_800A423C) /* 37768 8005C368 C420423C */ lwc1 $f0, %lo(D_800A423C)($at) /* 3776C 8005C36C 46003182 */ mul.s $f6, $f6, $f0 -/* 37770 8005C370 00000000 */ nop +/* 37770 8005C370 00000000 */ nop /* 37774 8005C374 C4820034 */ lwc1 $f2, 0x34($a0) /* 37778 8005C378 3C01800A */ lui $at, %hi(D_800A4240) /* 3777C 8005C37C C4204240 */ lwc1 $f0, %lo(D_800A4240)($at) /* 37780 8005C380 46001082 */ mul.s $f2, $f2, $f0 -/* 37784 8005C384 00000000 */ nop +/* 37784 8005C384 00000000 */ nop /* 37788 8005C388 C4840038 */ lwc1 $f4, 0x38($a0) /* 3778C 8005C38C 3C01800A */ lui $at, %hi(D_800A4244) /* 37790 8005C390 C4204244 */ lwc1 $f0, %lo(D_800A4244)($at) /* 37794 8005C394 46002102 */ mul.s $f4, $f4, $f0 -/* 37798 8005C398 00000000 */ nop +/* 37798 8005C398 00000000 */ nop /* 3779C 8005C39C 3C01800A */ lui $at, %hi(D_800A4254) /* 377A0 8005C3A0 C4284254 */ lwc1 $f8, %lo(D_800A4254)($at) /* 377A4 8005C3A4 46023180 */ add.s $f6, $f6, $f2 /* 377A8 8005C3A8 44800000 */ mtc1 $zero, $f0 -/* 377AC 8005C3AC 00000000 */ nop +/* 377AC 8005C3AC 00000000 */ nop /* 377B0 8005C3B0 4608003E */ c.le.s $f0, $f8 -/* 377B4 8005C3B4 00000000 */ nop +/* 377B4 8005C3B4 00000000 */ nop /* 377B8 8005C3B8 45000007 */ bc1f .L8005C3D8 /* 377BC 8005C3BC 46043180 */ add.s $f6, $f6, $f4 /* 377C0 8005C3C0 4600A007 */ neg.s $f0, $f20 /* 377C4 8005C3C4 46060003 */ div.s $f0, $f0, $f6 /* 377C8 8005C3C8 4600403E */ c.le.s $f8, $f0 -/* 377CC 8005C3CC 00000000 */ nop +/* 377CC 8005C3CC 00000000 */ nop /* 377D0 8005C3D0 4501002A */ bc1t .L8005C47C /* 377D4 8005C3D4 0000102D */ daddu $v0, $zero, $zero .L8005C3D8: @@ -352,11 +352,11 @@ glabel test_ray_triangle_general /* 377E0 8005C3E0 C422423C */ lwc1 $f2, %lo(D_800A423C)($at) /* 377E4 8005C3E4 46060003 */ div.s $f0, $f0, $f6 /* 377E8 8005C3E8 46001082 */ mul.s $f2, $f2, $f0 -/* 377EC 8005C3EC 00000000 */ nop +/* 377EC 8005C3EC 00000000 */ nop /* 377F0 8005C3F0 3C01800A */ lui $at, %hi(D_800A4240) /* 377F4 8005C3F4 C42A4240 */ lwc1 $f10, %lo(D_800A4240)($at) /* 377F8 8005C3F8 46005282 */ mul.s $f10, $f10, $f0 -/* 377FC 8005C3FC 00000000 */ nop +/* 377FC 8005C3FC 00000000 */ nop /* 37800 8005C400 3C01800A */ lui $at, %hi(D_800A4230) /* 37804 8005C404 C42C4230 */ lwc1 $f12, %lo(D_800A4230)($at) /* 37808 8005C408 3C01800A */ lui $at, %hi(D_800A4244) @@ -364,7 +364,7 @@ glabel test_ray_triangle_general /* 37810 8005C410 C4840030 */ lwc1 $f4, 0x30($a0) /* 37814 8005C414 C4860038 */ lwc1 $f6, 0x38($a0) /* 37818 8005C418 46004202 */ mul.s $f8, $f8, $f0 -/* 3781C 8005C41C 00000000 */ nop +/* 3781C 8005C41C 00000000 */ nop /* 37820 8005C420 3C01800A */ lui $at, %hi(D_800A4254) /* 37824 8005C424 E4204254 */ swc1 $f0, %lo(D_800A4254)($at) /* 37828 8005C428 3C01800A */ lui $at, %hi(D_800A4234) diff --git a/asm/nonmatchings/code_362a0_len_2f70/test_ray_zones.s b/asm/nonmatchings/code_362a0_len_2f70/test_ray_zones.s index 7c48f67733..7bb8e47716 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/test_ray_zones.s +++ b/asm/nonmatchings/code_362a0_len_2f70/test_ray_zones.s @@ -45,13 +45,13 @@ glabel test_ray_zones /* 385C0 8005D1C0 8E420000 */ lw $v0, ($s2) /* 385C4 8005D1C4 00571024 */ and $v0, $v0, $s7 /* 385C8 8005D1C8 14400015 */ bnez $v0, .L8005D220 -/* 385CC 8005D1CC 00000000 */ nop +/* 385CC 8005D1CC 00000000 */ nop /* 385D0 8005D1D0 8643000A */ lh $v1, 0xa($s2) /* 385D4 8005D1D4 10600012 */ beqz $v1, .L8005D220 -/* 385D8 8005D1D8 00000000 */ nop +/* 385D8 8005D1D8 00000000 */ nop /* 385DC 8005D1DC 8E420010 */ lw $v0, 0x10($s2) /* 385E0 8005D1E0 1040000F */ beqz $v0, .L8005D220 -/* 385E4 8005D1E4 00000000 */ nop +/* 385E4 8005D1E4 00000000 */ nop /* 385E8 8005D1E8 8E51000C */ lw $s1, 0xc($s2) /* 385EC 8005D1EC 1860000C */ blez $v1, .L8005D220 /* 385F0 8005D1F0 0000802D */ daddu $s0, $zero, $zero diff --git a/asm/nonmatchings/code_362a0_len_2f70/test_up_ray_collider.s b/asm/nonmatchings/code_362a0_len_2f70/test_up_ray_collider.s index d90814f900..5cb45def6a 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/test_up_ray_collider.s +++ b/asm/nonmatchings/code_362a0_len_2f70/test_up_ray_collider.s @@ -24,7 +24,7 @@ glabel test_up_ray_collider /* 38728 8005D328 F7B60038 */ sdc1 $f22, 0x38($sp) /* 3872C 8005D32C C7B6006C */ lwc1 $f22, 0x6c($sp) /* 38730 8005D330 46006302 */ mul.s $f12, $f12, $f0 -/* 38734 8005D334 00000000 */ nop +/* 38734 8005D334 00000000 */ nop /* 38738 8005D338 3C0143B4 */ lui $at, 0x43b4 /* 3873C 8005D33C 44810000 */ mtc1 $at, $f0 /* 38740 8005D340 27A60014 */ addiu $a2, $sp, 0x14 @@ -63,7 +63,7 @@ glabel test_up_ray_collider /* 387C4 8005D3C4 4600E006 */ mov.s $f0, $f28 /* 387C8 8005D3C8 8642000A */ lh $v0, 0xa($s2) /* 387CC 8005D3CC 10400012 */ beqz $v0, .L8005D418 -/* 387D0 8005D3D0 00000000 */ nop +/* 387D0 8005D3D0 00000000 */ nop /* 387D4 8005D3D4 8E51000C */ lw $s1, 0xc($s2) /* 387D8 8005D3D8 1840000F */ blez $v0, .L8005D418 /* 387DC 8005D3DC 0000802D */ daddu $s0, $zero, $zero @@ -73,7 +73,7 @@ glabel test_up_ray_collider /* 387E8 8005D3E8 0C0171E9 */ jal test_up_ray_triangle /* 387EC 8005D3EC 26310040 */ addiu $s1, $s1, 0x40 /* 387F0 8005D3F0 10400003 */ beqz $v0, .L8005D400 -/* 387F4 8005D3F4 00000000 */ nop +/* 387F4 8005D3F4 00000000 */ nop /* 387F8 8005D3F8 3C01800A */ lui $at, %hi(D_800A4254) /* 387FC 8005D3FC C43C4254 */ lwc1 $f28, %lo(D_800A4254)($at) .L8005D400: diff --git a/asm/nonmatchings/code_362a0_len_2f70/test_up_ray_triangle.s b/asm/nonmatchings/code_362a0_len_2f70/test_up_ray_triangle.s index 978a570537..f48b3021ec 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/test_up_ray_triangle.s +++ b/asm/nonmatchings/code_362a0_len_2f70/test_up_ray_triangle.s @@ -10,19 +10,19 @@ glabel test_up_ray_triangle /* 37BB8 8005C7B8 F7B40000 */ sdc1 $f20, ($sp) /* 37BBC 8005C7BC C4800030 */ lwc1 $f0, 0x30($a0) /* 37BC0 8005C7C0 44801000 */ mtc1 $zero, $f2 -/* 37BC4 8005C7C4 00000000 */ nop +/* 37BC4 8005C7C4 00000000 */ nop /* 37BC8 8005C7C8 46020032 */ c.eq.s $f0, $f2 -/* 37BCC 8005C7CC 00000000 */ nop +/* 37BCC 8005C7CC 00000000 */ nop /* 37BD0 8005C7D0 4500000B */ bc1f .L8005C800 -/* 37BD4 8005C7D4 00000000 */ nop +/* 37BD4 8005C7D4 00000000 */ nop /* 37BD8 8005C7D8 C4800034 */ lwc1 $f0, 0x34($a0) /* 37BDC 8005C7DC 46020032 */ c.eq.s $f0, $f2 -/* 37BE0 8005C7E0 00000000 */ nop +/* 37BE0 8005C7E0 00000000 */ nop /* 37BE4 8005C7E4 45000006 */ bc1f .L8005C800 -/* 37BE8 8005C7E8 00000000 */ nop +/* 37BE8 8005C7E8 00000000 */ nop /* 37BEC 8005C7EC C4800038 */ lwc1 $f0, 0x38($a0) /* 37BF0 8005C7F0 46020032 */ c.eq.s $f0, $f2 -/* 37BF4 8005C7F4 00000000 */ nop +/* 37BF4 8005C7F4 00000000 */ nop /* 37BF8 8005C7F8 4501012E */ bc1t .L8005CCB4 /* 37BFC 8005C7FC 0000102D */ daddu $v0, $zero, $zero .L8005C800: @@ -33,21 +33,21 @@ glabel test_up_ray_triangle /* 37C10 8005C810 4600B381 */ sub.s $f14, $f22, $f0 /* 37C14 8005C814 C4880030 */ lwc1 $f8, 0x30($a0) /* 37C18 8005C818 460E4102 */ mul.s $f4, $f8, $f14 -/* 37C1C 8005C81C 00000000 */ nop +/* 37C1C 8005C81C 00000000 */ nop /* 37C20 8005C820 3C01800A */ lui $at, %hi(D_800A4234) /* 37C24 8005C824 C4384234 */ lwc1 $f24, %lo(D_800A4234)($at) /* 37C28 8005C828 C4400004 */ lwc1 $f0, 4($v0) /* 37C2C 8005C82C 4600C501 */ sub.s $f20, $f24, $f0 /* 37C30 8005C830 C4820034 */ lwc1 $f2, 0x34($a0) /* 37C34 8005C834 46141082 */ mul.s $f2, $f2, $f20 -/* 37C38 8005C838 00000000 */ nop +/* 37C38 8005C838 00000000 */ nop /* 37C3C 8005C83C 3C01800A */ lui $at, %hi(D_800A4238) /* 37C40 8005C840 C43C4238 */ lwc1 $f28, %lo(D_800A4238)($at) /* 37C44 8005C844 C4400008 */ lwc1 $f0, 8($v0) /* 37C48 8005C848 4600E401 */ sub.s $f16, $f28, $f0 /* 37C4C 8005C84C C4860038 */ lwc1 $f6, 0x38($a0) /* 37C50 8005C850 46103002 */ mul.s $f0, $f6, $f16 -/* 37C54 8005C854 00000000 */ nop +/* 37C54 8005C854 00000000 */ nop /* 37C58 8005C858 8C830004 */ lw $v1, 4($a0) /* 37C5C 8005C85C 46022100 */ add.s $f4, $f4, $f2 /* 37C60 8005C860 8C850008 */ lw $a1, 8($a0) @@ -55,105 +55,105 @@ glabel test_up_ray_triangle /* 37C68 8005C868 10400068 */ beqz $v0, .L8005CA0C /* 37C6C 8005C86C 46002480 */ add.s $f18, $f4, $f0 /* 37C70 8005C870 4480D000 */ mtc1 $zero, $f26 -/* 37C74 8005C874 00000000 */ nop +/* 37C74 8005C874 00000000 */ nop /* 37C78 8005C878 461A903C */ c.lt.s $f18, $f26 -/* 37C7C 8005C87C 00000000 */ nop +/* 37C7C 8005C87C 00000000 */ nop /* 37C80 8005C880 4503010C */ bc1tl .L8005CCB4 /* 37C84 8005C884 0000102D */ daddu $v0, $zero, $zero /* 37C88 8005C888 3C01800A */ lui $at, %hi(D_800A423C) /* 37C8C 8005C88C C42C423C */ lwc1 $f12, %lo(D_800A423C)($at) /* 37C90 8005C890 460C4002 */ mul.s $f0, $f8, $f12 -/* 37C94 8005C894 00000000 */ nop +/* 37C94 8005C894 00000000 */ nop /* 37C98 8005C898 3C01800A */ lui $at, %hi(D_800A4244) /* 37C9C 8005C89C C42A4244 */ lwc1 $f10, %lo(D_800A4244)($at) /* 37CA0 8005C8A0 460A3082 */ mul.s $f2, $f6, $f10 -/* 37CA4 8005C8A4 00000000 */ nop +/* 37CA4 8005C8A4 00000000 */ nop /* 37CA8 8005C8A8 46020000 */ add.s $f0, $f0, $f2 /* 37CAC 8005C8AC 4600D03E */ c.le.s $f26, $f0 -/* 37CB0 8005C8B0 00000000 */ nop +/* 37CB0 8005C8B0 00000000 */ nop /* 37CB4 8005C8B4 450100FF */ bc1t .L8005CCB4 /* 37CB8 8005C8B8 0000102D */ daddu $v0, $zero, $zero /* 37CBC 8005C8BC C4860010 */ lwc1 $f6, 0x10($a0) /* 37CC0 8005C8C0 46003107 */ neg.s $f4, $f6 /* 37CC4 8005C8C4 460A2102 */ mul.s $f4, $f4, $f10 -/* 37CC8 8005C8C8 00000000 */ nop +/* 37CC8 8005C8C8 00000000 */ nop /* 37CCC 8005C8CC C480000C */ lwc1 $f0, 0xc($a0) /* 37CD0 8005C8D0 460A0002 */ mul.s $f0, $f0, $f10 -/* 37CD4 8005C8D4 00000000 */ nop +/* 37CD4 8005C8D4 00000000 */ nop /* 37CD8 8005C8D8 C4820014 */ lwc1 $f2, 0x14($a0) /* 37CDC 8005C8DC 460C1082 */ mul.s $f2, $f2, $f12 -/* 37CE0 8005C8E0 00000000 */ nop +/* 37CE0 8005C8E0 00000000 */ nop /* 37CE4 8005C8E4 460C3182 */ mul.s $f6, $f6, $f12 -/* 37CE8 8005C8E8 00000000 */ nop +/* 37CE8 8005C8E8 00000000 */ nop /* 37CEC 8005C8EC 46047102 */ mul.s $f4, $f14, $f4 -/* 37CF0 8005C8F0 00000000 */ nop +/* 37CF0 8005C8F0 00000000 */ nop /* 37CF4 8005C8F4 46068182 */ mul.s $f6, $f16, $f6 -/* 37CF8 8005C8F8 00000000 */ nop +/* 37CF8 8005C8F8 00000000 */ nop /* 37CFC 8005C8FC 46020001 */ sub.s $f0, $f0, $f2 /* 37D00 8005C900 4600A002 */ mul.s $f0, $f20, $f0 -/* 37D04 8005C904 00000000 */ nop +/* 37D04 8005C904 00000000 */ nop /* 37D08 8005C908 46002100 */ add.s $f4, $f4, $f0 /* 37D0C 8005C90C 46062100 */ add.s $f4, $f4, $f6 /* 37D10 8005C910 461A203C */ c.lt.s $f4, $f26 -/* 37D14 8005C914 00000000 */ nop +/* 37D14 8005C914 00000000 */ nop /* 37D18 8005C918 450100E6 */ bc1t .L8005CCB4 -/* 37D1C 8005C91C 00000000 */ nop +/* 37D1C 8005C91C 00000000 */ nop /* 37D20 8005C920 C488001C */ lwc1 $f8, 0x1c($a0) /* 37D24 8005C924 46004007 */ neg.s $f0, $f8 /* 37D28 8005C928 460A0002 */ mul.s $f0, $f0, $f10 -/* 37D2C 8005C92C 00000000 */ nop +/* 37D2C 8005C92C 00000000 */ nop /* 37D30 8005C930 C4840018 */ lwc1 $f4, 0x18($a0) /* 37D34 8005C934 460A2102 */ mul.s $f4, $f4, $f10 -/* 37D38 8005C938 00000000 */ nop +/* 37D38 8005C938 00000000 */ nop /* 37D3C 8005C93C 460C4202 */ mul.s $f8, $f8, $f12 -/* 37D40 8005C940 00000000 */ nop +/* 37D40 8005C940 00000000 */ nop /* 37D44 8005C944 C4620000 */ lwc1 $f2, ($v1) /* 37D48 8005C948 4602B081 */ sub.s $f2, $f22, $f2 /* 37D4C 8005C94C 46001082 */ mul.s $f2, $f2, $f0 -/* 37D50 8005C950 00000000 */ nop +/* 37D50 8005C950 00000000 */ nop /* 37D54 8005C954 C4800020 */ lwc1 $f0, 0x20($a0) /* 37D58 8005C958 460C0002 */ mul.s $f0, $f0, $f12 -/* 37D5C 8005C95C 00000000 */ nop +/* 37D5C 8005C95C 00000000 */ nop /* 37D60 8005C960 C4660004 */ lwc1 $f6, 4($v1) /* 37D64 8005C964 4606C181 */ sub.s $f6, $f24, $f6 /* 37D68 8005C968 46002101 */ sub.s $f4, $f4, $f0 /* 37D6C 8005C96C 46043182 */ mul.s $f6, $f6, $f4 -/* 37D70 8005C970 00000000 */ nop +/* 37D70 8005C970 00000000 */ nop /* 37D74 8005C974 C4600008 */ lwc1 $f0, 8($v1) /* 37D78 8005C978 4600E001 */ sub.s $f0, $f28, $f0 /* 37D7C 8005C97C 46080002 */ mul.s $f0, $f0, $f8 -/* 37D80 8005C980 00000000 */ nop +/* 37D80 8005C980 00000000 */ nop /* 37D84 8005C984 46061080 */ add.s $f2, $f2, $f6 /* 37D88 8005C988 46001080 */ add.s $f2, $f2, $f0 /* 37D8C 8005C98C 461A103C */ c.lt.s $f2, $f26 -/* 37D90 8005C990 00000000 */ nop +/* 37D90 8005C990 00000000 */ nop /* 37D94 8005C994 450100C7 */ bc1t .L8005CCB4 -/* 37D98 8005C998 00000000 */ nop +/* 37D98 8005C998 00000000 */ nop /* 37D9C 8005C99C C4880028 */ lwc1 $f8, 0x28($a0) /* 37DA0 8005C9A0 46004007 */ neg.s $f0, $f8 /* 37DA4 8005C9A4 460A0002 */ mul.s $f0, $f0, $f10 -/* 37DA8 8005C9A8 00000000 */ nop +/* 37DA8 8005C9A8 00000000 */ nop /* 37DAC 8005C9AC C4840024 */ lwc1 $f4, 0x24($a0) /* 37DB0 8005C9B0 460A2102 */ mul.s $f4, $f4, $f10 -/* 37DB4 8005C9B4 00000000 */ nop +/* 37DB4 8005C9B4 00000000 */ nop /* 37DB8 8005C9B8 460C4202 */ mul.s $f8, $f8, $f12 -/* 37DBC 8005C9BC 00000000 */ nop +/* 37DBC 8005C9BC 00000000 */ nop /* 37DC0 8005C9C0 C4A20000 */ lwc1 $f2, ($a1) /* 37DC4 8005C9C4 4602B081 */ sub.s $f2, $f22, $f2 /* 37DC8 8005C9C8 46001082 */ mul.s $f2, $f2, $f0 -/* 37DCC 8005C9CC 00000000 */ nop +/* 37DCC 8005C9CC 00000000 */ nop /* 37DD0 8005C9D0 C480002C */ lwc1 $f0, 0x2c($a0) /* 37DD4 8005C9D4 460C0002 */ mul.s $f0, $f0, $f12 -/* 37DD8 8005C9D8 00000000 */ nop +/* 37DD8 8005C9D8 00000000 */ nop /* 37DDC 8005C9DC C4A60004 */ lwc1 $f6, 4($a1) /* 37DE0 8005C9E0 4606C181 */ sub.s $f6, $f24, $f6 /* 37DE4 8005C9E4 46002101 */ sub.s $f4, $f4, $f0 /* 37DE8 8005C9E8 46043182 */ mul.s $f6, $f6, $f4 -/* 37DEC 8005C9EC 00000000 */ nop +/* 37DEC 8005C9EC 00000000 */ nop /* 37DF0 8005C9F0 C4A00008 */ lwc1 $f0, 8($a1) /* 37DF4 8005C9F4 4600E001 */ sub.s $f0, $f28, $f0 /* 37DF8 8005C9F8 46080002 */ mul.s $f0, $f0, $f8 -/* 37DFC 8005C9FC 00000000 */ nop +/* 37DFC 8005C9FC 00000000 */ nop /* 37E00 8005CA00 46061080 */ add.s $f2, $f2, $f6 /* 37E04 8005CA04 080172ED */ j .L8005CBB4 /* 37E08 8005CA08 46001080 */ add.s $f2, $f2, $f0 @@ -161,136 +161,136 @@ glabel test_up_ray_triangle /* 37E0C 8005CA0C 3C01800A */ lui $at, %hi(D_800A423C) /* 37E10 8005CA10 C42C423C */ lwc1 $f12, %lo(D_800A423C)($at) /* 37E14 8005CA14 460C4002 */ mul.s $f0, $f8, $f12 -/* 37E18 8005CA18 00000000 */ nop +/* 37E18 8005CA18 00000000 */ nop /* 37E1C 8005CA1C 3C01800A */ lui $at, %hi(D_800A4244) /* 37E20 8005CA20 C42A4244 */ lwc1 $f10, %lo(D_800A4244)($at) /* 37E24 8005CA24 460A3082 */ mul.s $f2, $f6, $f10 -/* 37E28 8005CA28 00000000 */ nop +/* 37E28 8005CA28 00000000 */ nop /* 37E2C 8005CA2C 46020000 */ add.s $f0, $f0, $f2 /* 37E30 8005CA30 46120002 */ mul.s $f0, $f0, $f18 -/* 37E34 8005CA34 00000000 */ nop +/* 37E34 8005CA34 00000000 */ nop /* 37E38 8005CA38 4480D000 */ mtc1 $zero, $f26 -/* 37E3C 8005CA3C 00000000 */ nop +/* 37E3C 8005CA3C 00000000 */ nop /* 37E40 8005CA40 4600D03E */ c.le.s $f26, $f0 -/* 37E44 8005CA44 00000000 */ nop +/* 37E44 8005CA44 00000000 */ nop /* 37E48 8005CA48 4501009A */ bc1t .L8005CCB4 /* 37E4C 8005CA4C 0000102D */ daddu $v0, $zero, $zero /* 37E50 8005CA50 C4860010 */ lwc1 $f6, 0x10($a0) /* 37E54 8005CA54 46003107 */ neg.s $f4, $f6 /* 37E58 8005CA58 460A2102 */ mul.s $f4, $f4, $f10 -/* 37E5C 8005CA5C 00000000 */ nop +/* 37E5C 8005CA5C 00000000 */ nop /* 37E60 8005CA60 C480000C */ lwc1 $f0, 0xc($a0) /* 37E64 8005CA64 460A0002 */ mul.s $f0, $f0, $f10 -/* 37E68 8005CA68 00000000 */ nop +/* 37E68 8005CA68 00000000 */ nop /* 37E6C 8005CA6C C4820014 */ lwc1 $f2, 0x14($a0) /* 37E70 8005CA70 460C1082 */ mul.s $f2, $f2, $f12 -/* 37E74 8005CA74 00000000 */ nop +/* 37E74 8005CA74 00000000 */ nop /* 37E78 8005CA78 460C3182 */ mul.s $f6, $f6, $f12 -/* 37E7C 8005CA7C 00000000 */ nop +/* 37E7C 8005CA7C 00000000 */ nop /* 37E80 8005CA80 46047102 */ mul.s $f4, $f14, $f4 -/* 37E84 8005CA84 00000000 */ nop +/* 37E84 8005CA84 00000000 */ nop /* 37E88 8005CA88 46068182 */ mul.s $f6, $f16, $f6 -/* 37E8C 8005CA8C 00000000 */ nop +/* 37E8C 8005CA8C 00000000 */ nop /* 37E90 8005CA90 46020001 */ sub.s $f0, $f0, $f2 /* 37E94 8005CA94 4600A002 */ mul.s $f0, $f20, $f0 -/* 37E98 8005CA98 00000000 */ nop +/* 37E98 8005CA98 00000000 */ nop /* 37E9C 8005CA9C 46002100 */ add.s $f4, $f4, $f0 /* 37EA0 8005CAA0 46062100 */ add.s $f4, $f4, $f6 /* 37EA4 8005CAA4 46122102 */ mul.s $f4, $f4, $f18 -/* 37EA8 8005CAA8 00000000 */ nop +/* 37EA8 8005CAA8 00000000 */ nop /* 37EAC 8005CAAC 461A203C */ c.lt.s $f4, $f26 -/* 37EB0 8005CAB0 00000000 */ nop +/* 37EB0 8005CAB0 00000000 */ nop /* 37EB4 8005CAB4 4501007F */ bc1t .L8005CCB4 -/* 37EB8 8005CAB8 00000000 */ nop +/* 37EB8 8005CAB8 00000000 */ nop /* 37EBC 8005CABC C488001C */ lwc1 $f8, 0x1c($a0) /* 37EC0 8005CAC0 46004007 */ neg.s $f0, $f8 /* 37EC4 8005CAC4 460A0002 */ mul.s $f0, $f0, $f10 -/* 37EC8 8005CAC8 00000000 */ nop +/* 37EC8 8005CAC8 00000000 */ nop /* 37ECC 8005CACC C4840018 */ lwc1 $f4, 0x18($a0) /* 37ED0 8005CAD0 460A2102 */ mul.s $f4, $f4, $f10 -/* 37ED4 8005CAD4 00000000 */ nop +/* 37ED4 8005CAD4 00000000 */ nop /* 37ED8 8005CAD8 460C4202 */ mul.s $f8, $f8, $f12 -/* 37EDC 8005CADC 00000000 */ nop +/* 37EDC 8005CADC 00000000 */ nop /* 37EE0 8005CAE0 C4620000 */ lwc1 $f2, ($v1) /* 37EE4 8005CAE4 4602B081 */ sub.s $f2, $f22, $f2 /* 37EE8 8005CAE8 46001082 */ mul.s $f2, $f2, $f0 -/* 37EEC 8005CAEC 00000000 */ nop +/* 37EEC 8005CAEC 00000000 */ nop /* 37EF0 8005CAF0 C4800020 */ lwc1 $f0, 0x20($a0) /* 37EF4 8005CAF4 460C0002 */ mul.s $f0, $f0, $f12 -/* 37EF8 8005CAF8 00000000 */ nop +/* 37EF8 8005CAF8 00000000 */ nop /* 37EFC 8005CAFC C4660004 */ lwc1 $f6, 4($v1) /* 37F00 8005CB00 4606C181 */ sub.s $f6, $f24, $f6 /* 37F04 8005CB04 46002101 */ sub.s $f4, $f4, $f0 /* 37F08 8005CB08 46043182 */ mul.s $f6, $f6, $f4 -/* 37F0C 8005CB0C 00000000 */ nop +/* 37F0C 8005CB0C 00000000 */ nop /* 37F10 8005CB10 C4600008 */ lwc1 $f0, 8($v1) /* 37F14 8005CB14 4600E001 */ sub.s $f0, $f28, $f0 /* 37F18 8005CB18 46080002 */ mul.s $f0, $f0, $f8 -/* 37F1C 8005CB1C 00000000 */ nop +/* 37F1C 8005CB1C 00000000 */ nop /* 37F20 8005CB20 46061080 */ add.s $f2, $f2, $f6 /* 37F24 8005CB24 46001080 */ add.s $f2, $f2, $f0 /* 37F28 8005CB28 46121082 */ mul.s $f2, $f2, $f18 -/* 37F2C 8005CB2C 00000000 */ nop +/* 37F2C 8005CB2C 00000000 */ nop /* 37F30 8005CB30 461A103C */ c.lt.s $f2, $f26 -/* 37F34 8005CB34 00000000 */ nop +/* 37F34 8005CB34 00000000 */ nop /* 37F38 8005CB38 4501005E */ bc1t .L8005CCB4 -/* 37F3C 8005CB3C 00000000 */ nop +/* 37F3C 8005CB3C 00000000 */ nop /* 37F40 8005CB40 C4880028 */ lwc1 $f8, 0x28($a0) /* 37F44 8005CB44 46004007 */ neg.s $f0, $f8 /* 37F48 8005CB48 460A0002 */ mul.s $f0, $f0, $f10 -/* 37F4C 8005CB4C 00000000 */ nop +/* 37F4C 8005CB4C 00000000 */ nop /* 37F50 8005CB50 C4840024 */ lwc1 $f4, 0x24($a0) /* 37F54 8005CB54 460A2102 */ mul.s $f4, $f4, $f10 -/* 37F58 8005CB58 00000000 */ nop +/* 37F58 8005CB58 00000000 */ nop /* 37F5C 8005CB5C 460C4202 */ mul.s $f8, $f8, $f12 -/* 37F60 8005CB60 00000000 */ nop +/* 37F60 8005CB60 00000000 */ nop /* 37F64 8005CB64 C4A20000 */ lwc1 $f2, ($a1) /* 37F68 8005CB68 4602B081 */ sub.s $f2, $f22, $f2 /* 37F6C 8005CB6C 46001082 */ mul.s $f2, $f2, $f0 -/* 37F70 8005CB70 00000000 */ nop +/* 37F70 8005CB70 00000000 */ nop /* 37F74 8005CB74 C480002C */ lwc1 $f0, 0x2c($a0) /* 37F78 8005CB78 460C0002 */ mul.s $f0, $f0, $f12 -/* 37F7C 8005CB7C 00000000 */ nop +/* 37F7C 8005CB7C 00000000 */ nop /* 37F80 8005CB80 C4A60004 */ lwc1 $f6, 4($a1) /* 37F84 8005CB84 4606C181 */ sub.s $f6, $f24, $f6 /* 37F88 8005CB88 46002101 */ sub.s $f4, $f4, $f0 /* 37F8C 8005CB8C 46043182 */ mul.s $f6, $f6, $f4 -/* 37F90 8005CB90 00000000 */ nop +/* 37F90 8005CB90 00000000 */ nop /* 37F94 8005CB94 C4A00008 */ lwc1 $f0, 8($a1) /* 37F98 8005CB98 4600E001 */ sub.s $f0, $f28, $f0 /* 37F9C 8005CB9C 46080002 */ mul.s $f0, $f0, $f8 -/* 37FA0 8005CBA0 00000000 */ nop +/* 37FA0 8005CBA0 00000000 */ nop /* 37FA4 8005CBA4 46061080 */ add.s $f2, $f2, $f6 /* 37FA8 8005CBA8 46001080 */ add.s $f2, $f2, $f0 /* 37FAC 8005CBAC 46121082 */ mul.s $f2, $f2, $f18 -/* 37FB0 8005CBB0 00000000 */ nop +/* 37FB0 8005CBB0 00000000 */ nop .L8005CBB4: /* 37FB4 8005CBB4 461A103C */ c.lt.s $f2, $f26 -/* 37FB8 8005CBB8 00000000 */ nop +/* 37FB8 8005CBB8 00000000 */ nop /* 37FBC 8005CBBC 4503003D */ bc1tl .L8005CCB4 /* 37FC0 8005CBC0 0000102D */ daddu $v0, $zero, $zero /* 37FC4 8005CBC4 C4840030 */ lwc1 $f4, 0x30($a0) /* 37FC8 8005CBC8 3C01800A */ lui $at, %hi(D_800A423C) /* 37FCC 8005CBCC C420423C */ lwc1 $f0, %lo(D_800A423C)($at) /* 37FD0 8005CBD0 46002102 */ mul.s $f4, $f4, $f0 -/* 37FD4 8005CBD4 00000000 */ nop +/* 37FD4 8005CBD4 00000000 */ nop /* 37FD8 8005CBD8 C4820038 */ lwc1 $f2, 0x38($a0) /* 37FDC 8005CBDC 3C01800A */ lui $at, %hi(D_800A4244) /* 37FE0 8005CBE0 C4204244 */ lwc1 $f0, %lo(D_800A4244)($at) /* 37FE4 8005CBE4 46001082 */ mul.s $f2, $f2, $f0 -/* 37FE8 8005CBE8 00000000 */ nop +/* 37FE8 8005CBE8 00000000 */ nop /* 37FEC 8005CBEC 3C01800A */ lui $at, %hi(D_800A4254) /* 37FF0 8005CBF0 C4264254 */ lwc1 $f6, %lo(D_800A4254)($at) /* 37FF4 8005CBF4 44800000 */ mtc1 $zero, $f0 -/* 37FF8 8005CBF8 00000000 */ nop +/* 37FF8 8005CBF8 00000000 */ nop /* 37FFC 8005CBFC 4606003E */ c.le.s $f0, $f6 -/* 38000 8005CC00 00000000 */ nop +/* 38000 8005CC00 00000000 */ nop /* 38004 8005CC04 45000007 */ bc1f .L8005CC24 /* 38008 8005CC08 46022100 */ add.s $f4, $f4, $f2 /* 3800C 8005CC0C 46009007 */ neg.s $f0, $f18 /* 38010 8005CC10 46040003 */ div.s $f0, $f0, $f4 /* 38014 8005CC14 4600303E */ c.le.s $f6, $f0 -/* 38018 8005CC18 00000000 */ nop +/* 38018 8005CC18 00000000 */ nop /* 3801C 8005CC1C 45010025 */ bc1t .L8005CCB4 /* 38020 8005CC20 0000102D */ daddu $v0, $zero, $zero .L8005CC24: @@ -305,13 +305,13 @@ glabel test_up_ray_triangle /* 38044 8005CC44 3C01800A */ lui $at, %hi(D_800A4244) /* 38048 8005CC48 C4244244 */ lwc1 $f4, %lo(D_800A4244)($at) /* 3804C 8005CC4C 46001082 */ mul.s $f2, $f2, $f0 -/* 38050 8005CC50 00000000 */ nop +/* 38050 8005CC50 00000000 */ nop /* 38054 8005CC54 C4880030 */ lwc1 $f8, 0x30($a0) /* 38058 8005CC58 C48A0034 */ lwc1 $f10, 0x34($a0) /* 3805C 8005CC5C 3C01800A */ lui $at, %hi(D_800A4254) /* 38060 8005CC60 E4204254 */ swc1 $f0, %lo(D_800A4254)($at) /* 38064 8005CC64 46002102 */ mul.s $f4, $f4, $f0 -/* 38068 8005CC68 00000000 */ nop +/* 38068 8005CC68 00000000 */ nop /* 3806C 8005CC6C 3C01800A */ lui $at, %hi(D_800A4238) /* 38070 8005CC70 C4204238 */ lwc1 $f0, %lo(D_800A4238)($at) /* 38074 8005CC74 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/code_362a0_len_2f70/update_collider_transform.s b/asm/nonmatchings/code_362a0_len_2f70/update_collider_transform.s index e1a4a80ba3..d24cc907fb 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/update_collider_transform.s +++ b/asm/nonmatchings/code_362a0_len_2f70/update_collider_transform.s @@ -69,34 +69,34 @@ glabel update_collider_transform /* 36F18 8005BB18 27A40020 */ addiu $a0, $sp, 0x20 /* 36F1C 8005BB1C C6200000 */ lwc1 $f0, ($s1) /* 36F20 8005BB20 4618003C */ c.lt.s $f0, $f24 -/* 36F24 8005BB24 00000000 */ nop +/* 36F24 8005BB24 00000000 */ nop /* 36F28 8005BB28 45030001 */ bc1tl .L8005BB30 /* 36F2C 8005BB2C 46000606 */ mov.s $f24, $f0 .L8005BB30: /* 36F30 8005BB30 4600E03C */ c.lt.s $f28, $f0 -/* 36F34 8005BB34 00000000 */ nop +/* 36F34 8005BB34 00000000 */ nop /* 36F38 8005BB38 45030001 */ bc1tl .L8005BB40 /* 36F3C 8005BB3C 46000706 */ mov.s $f28, $f0 .L8005BB40: /* 36F40 8005BB40 C600FFFC */ lwc1 $f0, -4($s0) /* 36F44 8005BB44 461A003C */ c.lt.s $f0, $f26 -/* 36F48 8005BB48 00000000 */ nop +/* 36F48 8005BB48 00000000 */ nop /* 36F4C 8005BB4C 45030001 */ bc1tl .L8005BB54 /* 36F50 8005BB50 46000686 */ mov.s $f26, $f0 .L8005BB54: /* 36F54 8005BB54 4600F03C */ c.lt.s $f30, $f0 -/* 36F58 8005BB58 00000000 */ nop +/* 36F58 8005BB58 00000000 */ nop /* 36F5C 8005BB5C 45030001 */ bc1tl .L8005BB64 /* 36F60 8005BB60 46000786 */ mov.s $f30, $f0 .L8005BB64: /* 36F64 8005BB64 C6000000 */ lwc1 $f0, ($s0) /* 36F68 8005BB68 4614003C */ c.lt.s $f0, $f20 -/* 36F6C 8005BB6C 00000000 */ nop +/* 36F6C 8005BB6C 00000000 */ nop /* 36F70 8005BB70 45030001 */ bc1tl .L8005BB78 /* 36F74 8005BB74 46000506 */ mov.s $f20, $f0 .L8005BB78: /* 36F78 8005BB78 4600B03C */ c.lt.s $f22, $f0 -/* 36F7C 8005BB7C 00000000 */ nop +/* 36F7C 8005BB7C 00000000 */ nop /* 36F80 8005BB80 45030001 */ bc1tl .L8005BB88 /* 36F84 8005BB84 46000586 */ mov.s $f22, $f0 .L8005BB88: @@ -155,33 +155,33 @@ glabel update_collider_transform /* 37050 8005BC50 E600FFE8 */ swc1 $f0, -0x18($s0) /* 37054 8005BC54 46000186 */ mov.s $f6, $f0 /* 37058 8005BC58 46065382 */ mul.s $f14, $f10, $f6 -/* 3705C 8005BC5C 00000000 */ nop +/* 3705C 8005BC5C 00000000 */ nop /* 37060 8005BC60 C604FFD4 */ lwc1 $f4, -0x2c($s0) /* 37064 8005BC64 46062182 */ mul.s $f6, $f4, $f6 -/* 37068 8005BC68 00000000 */ nop +/* 37068 8005BC68 00000000 */ nop /* 3706C 8005BC6C C608FFE4 */ lwc1 $f8, -0x1c($s0) /* 37070 8005BC70 46082102 */ mul.s $f4, $f4, $f8 -/* 37074 8005BC74 00000000 */ nop +/* 37074 8005BC74 00000000 */ nop /* 37078 8005BC78 C602FFE0 */ lwc1 $f2, -0x20($s0) /* 3707C 8005BC7C 46025282 */ mul.s $f10, $f10, $f2 -/* 37080 8005BC80 00000000 */ nop +/* 37080 8005BC80 00000000 */ nop /* 37084 8005BC84 C600FFDC */ lwc1 $f0, -0x24($s0) /* 37088 8005BC88 46080302 */ mul.s $f12, $f0, $f8 -/* 3708C 8005BC8C 00000000 */ nop +/* 3708C 8005BC8C 00000000 */ nop /* 37090 8005BC90 46020002 */ mul.s $f0, $f0, $f2 -/* 37094 8005BC94 00000000 */ nop +/* 37094 8005BC94 00000000 */ nop /* 37098 8005BC98 460A2501 */ sub.s $f20, $f4, $f10 /* 3709C 8005BC9C 4614A102 */ mul.s $f4, $f20, $f20 -/* 370A0 8005BCA0 00000000 */ nop +/* 370A0 8005BCA0 00000000 */ nop /* 370A4 8005BCA4 460C7601 */ sub.s $f24, $f14, $f12 /* 370A8 8005BCA8 4618C202 */ mul.s $f8, $f24, $f24 -/* 370AC 8005BCAC 00000000 */ nop +/* 370AC 8005BCAC 00000000 */ nop /* 370B0 8005BCB0 C4620000 */ lwc1 $f2, ($v1) /* 370B4 8005BCB4 46060581 */ sub.s $f22, $f0, $f6 /* 370B8 8005BCB8 C4800000 */ lwc1 $f0, ($a0) /* 370BC 8005BCBC 46001081 */ sub.s $f2, $f2, $f0 /* 370C0 8005BCC0 4616B182 */ mul.s $f6, $f22, $f22 -/* 370C4 8005BCC4 00000000 */ nop +/* 370C4 8005BCC4 00000000 */ nop /* 370C8 8005BCC8 E602FFEC */ swc1 $f2, -0x14($s0) /* 370CC 8005BCCC C4620004 */ lwc1 $f2, 4($v1) /* 370D0 8005BCD0 C4800004 */ lwc1 $f0, 4($a0) @@ -193,16 +193,16 @@ glabel update_collider_transform /* 370E8 8005BCE8 46001081 */ sub.s $f2, $f2, $f0 /* 370EC 8005BCEC 46044300 */ add.s $f12, $f8, $f4 /* 370F0 8005BCF0 461A6032 */ c.eq.s $f12, $f26 -/* 370F4 8005BCF4 00000000 */ nop +/* 370F4 8005BCF4 00000000 */ nop /* 370F8 8005BCF8 4501000D */ bc1t .L8005BD30 /* 370FC 8005BCFC E602FFF4 */ swc1 $f2, -0xc($s0) /* 37100 8005BD00 46006084 */ sqrt.s $f2, $f12 /* 37104 8005BD04 46021032 */ c.eq.s $f2, $f2 -/* 37108 8005BD08 00000000 */ nop +/* 37108 8005BD08 00000000 */ nop /* 3710C 8005BD0C 45010004 */ bc1t .L8005BD20 -/* 37110 8005BD10 00000000 */ nop +/* 37110 8005BD10 00000000 */ nop /* 37114 8005BD14 0C0187BC */ jal sqrtf -/* 37118 8005BD18 00000000 */ nop +/* 37118 8005BD18 00000000 */ nop /* 3711C 8005BD1C 46000086 */ mov.s $f2, $f0 .L8005BD20: /* 37120 8005BD20 3C013F80 */ lui $at, 0x3f80 @@ -213,11 +213,11 @@ glabel update_collider_transform /* 37130 8005BD30 4600D306 */ mov.s $f12, $f26 .L8005BD34: /* 37134 8005BD34 460CC002 */ mul.s $f0, $f24, $f12 -/* 37138 8005BD38 00000000 */ nop +/* 37138 8005BD38 00000000 */ nop /* 3713C 8005BD3C 460CB082 */ mul.s $f2, $f22, $f12 -/* 37140 8005BD40 00000000 */ nop +/* 37140 8005BD40 00000000 */ nop /* 37144 8005BD44 460CA102 */ mul.s $f4, $f20, $f12 -/* 37148 8005BD48 00000000 */ nop +/* 37148 8005BD48 00000000 */ nop /* 3714C 8005BD4C 26940040 */ addiu $s4, $s4, 0x40 /* 37150 8005BD50 26520001 */ addiu $s2, $s2, 1 /* 37154 8005BD54 E600FFF8 */ swc1 $f0, -8($s0) diff --git a/asm/nonmatchings/code_363160/func_E0060000.s b/asm/nonmatchings/code_363160/func_E0060000.s index 2cb939ef42..878f8c0f6a 100644 --- a/asm/nonmatchings/code_363160/func_E0060000.s +++ b/asm/nonmatchings/code_363160/func_E0060000.s @@ -41,7 +41,7 @@ glabel func_E0060000 /* 3631F0 E0060090 AE11000C */ sw $s1, 0xc($s0) .LE0060094: /* 3631F4 E0060094 08018025 */ j .LE0060094 -/* 3631F8 E0060098 00000000 */ nop +/* 3631F8 E0060098 00000000 */ nop .LE006009C: /* 3631FC E006009C 0220202D */ daddu $a0, $s1, $zero /* 363200 E00600A0 00132840 */ sll $a1, $s3, 1 @@ -73,27 +73,27 @@ glabel func_E0060000 /* 363264 E0060104 2404000A */ addiu $a0, $zero, 0xa /* 363268 E0060108 2442FFFB */ addiu $v0, $v0, -5 /* 36326C E006010C 44820000 */ mtc1 $v0, $f0 -/* 363270 E0060110 00000000 */ nop +/* 363270 E0060110 00000000 */ nop /* 363274 E0060114 46800020 */ cvt.s.w $f0, $f0 /* 363278 E0060118 0C080000 */ jal func_E0200000 /* 36327C E006011C E600FFF0 */ swc1 $f0, -0x10($s0) /* 363280 E0060120 24040168 */ addiu $a0, $zero, 0x168 /* 363284 E0060124 24420005 */ addiu $v0, $v0, 5 /* 363288 E0060128 44820000 */ mtc1 $v0, $f0 -/* 36328C E006012C 00000000 */ nop +/* 36328C E006012C 00000000 */ nop /* 363290 E0060130 46800020 */ cvt.s.w $f0, $f0 /* 363294 E0060134 E600FFF4 */ swc1 $f0, -0xc($s0) /* 363298 E0060138 0C080000 */ jal func_E0200000 /* 36329C E006013C E616FFF8 */ swc1 $f22, -8($s0) /* 3632A0 E0060140 24040168 */ addiu $a0, $zero, 0x168 /* 3632A4 E0060144 44820000 */ mtc1 $v0, $f0 -/* 3632A8 E0060148 00000000 */ nop +/* 3632A8 E0060148 00000000 */ nop /* 3632AC E006014C 46800020 */ cvt.s.w $f0, $f0 /* 3632B0 E0060150 0C080000 */ jal func_E0200000 /* 3632B4 E0060154 E6000004 */ swc1 $f0, 4($s0) /* 3632B8 E0060158 24040064 */ addiu $a0, $zero, 0x64 /* 3632BC E006015C 44820000 */ mtc1 $v0, $f0 -/* 3632C0 E0060160 00000000 */ nop +/* 3632C0 E0060160 00000000 */ nop /* 3632C4 E0060164 46800020 */ cvt.s.w $f0, $f0 /* 3632C8 E0060168 0C080000 */ jal func_E0200000 /* 3632CC E006016C E600000C */ swc1 $f0, 0xc($s0) @@ -106,7 +106,7 @@ glabel func_E0060000 /* 3632E8 E0060188 00081883 */ sra $v1, $t0, 2 /* 3632EC E006018C 00621823 */ subu $v1, $v1, $v0 /* 3632F0 E0060190 44830000 */ mtc1 $v1, $f0 -/* 3632F4 E0060194 00000000 */ nop +/* 3632F4 E0060194 00000000 */ nop /* 3632F8 E0060198 46800020 */ cvt.s.w $f0, $f0 /* 3632FC E006019C E6000008 */ swc1 $f0, 8($s0) /* 363300 E00601A0 0253102A */ slt $v0, $s2, $s3 diff --git a/asm/nonmatchings/code_363160/func_E00601D8.s b/asm/nonmatchings/code_363160/func_E00601D8.s index 8062315acb..fbd79e8633 100644 --- a/asm/nonmatchings/code_363160/func_E00601D8.s +++ b/asm/nonmatchings/code_363160/func_E00601D8.s @@ -3,4 +3,4 @@ glabel func_E00601D8 /* 363338 E00601D8 03E00008 */ jr $ra -/* 36333C E00601DC 00000000 */ nop +/* 36333C E00601DC 00000000 */ nop diff --git a/asm/nonmatchings/code_363160/func_E00601E0.s b/asm/nonmatchings/code_363160/func_E00601E0.s index f07b248b7d..5d3a596a02 100644 --- a/asm/nonmatchings/code_363160/func_E00601E0.s +++ b/asm/nonmatchings/code_363160/func_E00601E0.s @@ -23,7 +23,7 @@ glabel func_E00601E0 /* 363388 E0060228 0C080128 */ jal func_E02004A0 /* 36338C E006022C 0260202D */ daddu $a0, $s3, $zero /* 363390 E0060230 080180FA */ j .LE00603E8 -/* 363394 E0060234 00000000 */ nop +/* 363394 E0060234 00000000 */ nop .LE0060238: /* 363398 E0060238 2842000A */ slti $v0, $v0, 0xa /* 36339C E006023C 10400011 */ beqz $v0, .LE0060284 @@ -34,12 +34,12 @@ glabel func_E00601E0 /* 3633B0 E0060250 D4200740 */ ldc1 $f0, %lo(D_E0060740)($at) /* 3633B4 E0060254 00431023 */ subu $v0, $v0, $v1 /* 3633B8 E0060258 44821000 */ mtc1 $v0, $f2 -/* 3633BC E006025C 00000000 */ nop +/* 3633BC E006025C 00000000 */ nop /* 3633C0 E0060260 468010A1 */ cvt.d.w $f2, $f2 /* 3633C4 E0060264 46201082 */ mul.d $f2, $f2, $f0 -/* 3633C8 E0060268 00000000 */ nop +/* 3633C8 E0060268 00000000 */ nop /* 3633CC E006026C 44830000 */ mtc1 $v1, $f0 -/* 3633D0 E0060270 00000000 */ nop +/* 3633D0 E0060270 00000000 */ nop /* 3633D4 E0060274 46800021 */ cvt.d.w $f0, $f0 /* 3633D8 E0060278 46220000 */ add.d $f0, $f0, $f2 /* 3633DC E006027C 4620020D */ trunc.w.d $f8, $f0 @@ -47,13 +47,13 @@ glabel func_E00601E0 .LE0060284: /* 3633E4 E0060284 28C2000A */ slti $v0, $a2, 0xa /* 3633E8 E0060288 10400009 */ beqz $v0, .LE00602B0 -/* 3633EC E006028C 00000000 */ nop +/* 3633EC E006028C 00000000 */ nop /* 3633F0 E0060290 3C01E006 */ lui $at, %hi(D_E0060748) /* 3633F4 E0060294 D4220748 */ ldc1 $f2, %lo(D_E0060748)($at) /* 3633F8 E0060298 C4800024 */ lwc1 $f0, 0x24($a0) /* 3633FC E006029C 46800021 */ cvt.d.w $f0, $f0 /* 363400 E00602A0 46220002 */ mul.d $f0, $f0, $f2 -/* 363404 E00602A4 00000000 */ nop +/* 363404 E00602A4 00000000 */ nop /* 363408 E00602A8 4620020D */ trunc.w.d $f8, $f0 /* 36340C E00602AC E4880024 */ swc1 $f8, 0x24($a0) .LE00602B0: @@ -77,7 +77,7 @@ glabel func_E00601E0 /* 363450 E00602F0 D4220750 */ ldc1 $f2, %lo(D_E0060750)($at) /* 363454 E00602F4 46000021 */ cvt.d.s $f0, $f0 /* 363458 E00602F8 46220002 */ mul.d $f0, $f0, $f2 -/* 36345C E00602FC 00000000 */ nop +/* 36345C E00602FC 00000000 */ nop /* 363460 E0060300 C6020008 */ lwc1 $f2, 8($s0) /* 363464 E0060304 46200020 */ cvt.s.d $f0, $f0 /* 363468 E0060308 46001080 */ add.s $f2, $f2, $f0 @@ -86,7 +86,7 @@ glabel func_E00601E0 /* 363474 E0060314 E6020008 */ swc1 $f2, 8($s0) /* 363478 E0060318 460010A1 */ cvt.d.s $f2, $f2 /* 36347C E006031C 46201082 */ mul.d $f2, $f2, $f0 -/* 363480 E0060320 00000000 */ nop +/* 363480 E0060320 00000000 */ nop /* 363484 E0060324 C600000C */ lwc1 $f0, 0xc($s0) /* 363488 E0060328 46160000 */ add.s $f0, $f0, $f22 /* 36348C E006032C E600000C */ swc1 $f0, 0xc($s0) @@ -100,25 +100,25 @@ glabel func_E00601E0 /* 3634AC E006034C 2442FFE7 */ addiu $v0, $v0, -0x19 /* 3634B0 E0060350 C60C0014 */ lwc1 $f12, 0x14($s0) /* 3634B4 E0060354 44820000 */ mtc1 $v0, $f0 -/* 3634B8 E0060358 00000000 */ nop +/* 3634B8 E0060358 00000000 */ nop /* 3634BC E006035C 46800020 */ cvt.s.w $f0, $f0 /* 3634C0 E0060360 46006300 */ add.s $f12, $f12, $f0 /* 3634C4 E0060364 0C080140 */ jal func_E0200500 /* 3634C8 E0060368 E60C0014 */ swc1 $f12, 0x14($s0) /* 3634CC E006036C 46140002 */ mul.s $f0, $f0, $f20 -/* 3634D0 E0060370 00000000 */ nop +/* 3634D0 E0060370 00000000 */ nop /* 3634D4 E0060374 C6020014 */ lwc1 $f2, 0x14($s0) /* 3634D8 E0060378 3C013F00 */ lui $at, 0x3f00 /* 3634DC E006037C 44816000 */ mtc1 $at, $f12 -/* 3634E0 E0060380 00000000 */ nop +/* 3634E0 E0060380 00000000 */ nop /* 3634E4 E0060384 460C1302 */ mul.s $f12, $f2, $f12 -/* 3634E8 E0060388 00000000 */ nop +/* 3634E8 E0060388 00000000 */ nop /* 3634EC E006038C C6020010 */ lwc1 $f2, 0x10($s0) /* 3634F0 E0060390 46001080 */ add.s $f2, $f2, $f0 /* 3634F4 E0060394 0C080144 */ jal func_E0200510 /* 3634F8 E0060398 E6020010 */ swc1 $f2, 0x10($s0) /* 3634FC E006039C 46140002 */ mul.s $f0, $f0, $f20 -/* 363500 E00603A0 00000000 */ nop +/* 363500 E00603A0 00000000 */ nop /* 363504 E00603A4 C606FFFC */ lwc1 $f6, -4($s0) /* 363508 E00603A8 C6020008 */ lwc1 $f2, 8($s0) /* 36350C E00603AC C6040000 */ lwc1 $f4, ($s0) diff --git a/asm/nonmatchings/code_363160/func_E0060450.s b/asm/nonmatchings/code_363160/func_E0060450.s index f1fe7b83ca..2182aba9e0 100644 --- a/asm/nonmatchings/code_363160/func_E0060450.s +++ b/asm/nonmatchings/code_363160/func_E0060450.s @@ -188,4 +188,4 @@ glabel func_E0060450 /* 363880 E0060720 D7B40100 */ ldc1 $f20, 0x100($sp) /* 363884 E0060724 03E00008 */ jr $ra /* 363888 E0060728 27BD0110 */ addiu $sp, $sp, 0x110 -/* 36388C E006072C 00000000 */ nop +/* 36388C E006072C 00000000 */ nop diff --git a/asm/nonmatchings/code_364300/func_E0062000.s b/asm/nonmatchings/code_364300/func_E0062000.s index 672b65c118..37145d7b73 100644 --- a/asm/nonmatchings/code_364300/func_E0062000.s +++ b/asm/nonmatchings/code_364300/func_E0062000.s @@ -44,7 +44,7 @@ glabel func_E0062000 /* 36439C E006209C AE90000C */ sw $s0, 0xc($s4) .LE00620A0: /* 3643A0 E00620A0 08018828 */ j .LE00620A0 -/* 3643A4 E00620A4 00000000 */ nop +/* 3643A4 E00620A4 00000000 */ nop .LE00620A8: /* 3643A8 E00620A8 0200202D */ daddu $a0, $s0, $zero /* 3643AC E00620AC 0C080130 */ jal func_E02004C0 @@ -101,12 +101,12 @@ glabel func_E0062000 /* 364468 E0062168 16610004 */ bne $s3, $at, .LE006217C /* 36446C E006216C 3C018000 */ lui $at, 0x8000 /* 364470 E0062170 16210002 */ bne $s1, $at, .LE006217C -/* 364474 E0062174 00000000 */ nop +/* 364474 E0062174 00000000 */ nop /* 364478 E0062178 0006000D */ break 6 .LE006217C: /* 36447C E006217C 00001012 */ mflo $v0 /* 364480 E0062180 4482B000 */ mtc1 $v0, $f22 -/* 364484 E0062184 00000000 */ nop +/* 364484 E0062184 00000000 */ nop /* 364488 E0062188 4680B5A0 */ cvt.s.w $f22, $f22 /* 36448C E006218C 461AB500 */ add.s $f20, $f22, $f26 /* 364490 E0062190 26310168 */ addiu $s1, $s1, 0x168 diff --git a/asm/nonmatchings/code_364300/func_E0062218.s b/asm/nonmatchings/code_364300/func_E0062218.s index bc4d74894a..de3969b8fc 100644 --- a/asm/nonmatchings/code_364300/func_E0062218.s +++ b/asm/nonmatchings/code_364300/func_E0062218.s @@ -3,4 +3,4 @@ glabel func_E0062218 /* 364518 E0062218 03E00008 */ jr $ra -/* 36451C E006221C 00000000 */ nop +/* 36451C E006221C 00000000 */ nop diff --git a/asm/nonmatchings/code_364300/func_E0062220.s b/asm/nonmatchings/code_364300/func_E0062220.s index 463a10bc46..77660df802 100644 --- a/asm/nonmatchings/code_364300/func_E0062220.s +++ b/asm/nonmatchings/code_364300/func_E0062220.s @@ -23,18 +23,18 @@ glabel func_E0062220 /* 364568 E0062268 0C080128 */ jal func_E02004A0 /* 36456C E006226C 0260202D */ daddu $a0, $s3, $zero /* 364570 E0062270 08018920 */ j .LE0062480 -/* 364574 E0062274 00000000 */ nop +/* 364574 E0062274 00000000 */ nop .LE0062278: /* 364578 E0062278 8C920028 */ lw $s2, 0x28($a0) /* 36457C E006227C 2A42000B */ slti $v0, $s2, 0xb /* 364580 E0062280 14400009 */ bnez $v0, .LE00622A8 -/* 364584 E0062284 00000000 */ nop +/* 364584 E0062284 00000000 */ nop /* 364588 E0062288 3C01E006 */ lui $at, %hi(D_E00628D0) /* 36458C E006228C D42228D0 */ ldc1 $f2, %lo(D_E00628D0)($at) /* 364590 E0062290 C4800034 */ lwc1 $f0, 0x34($a0) /* 364594 E0062294 46800021 */ cvt.d.w $f0, $f0 /* 364598 E0062298 46220002 */ mul.d $f0, $f0, $f2 -/* 36459C E006229C 00000000 */ nop +/* 36459C E006229C 00000000 */ nop /* 3645A0 E00622A0 4620038D */ trunc.w.d $f14, $f0 /* 3645A4 E00622A4 E48E0034 */ swc1 $f14, 0x34($a0) .LE00622A8: @@ -61,30 +61,30 @@ glabel func_E0062220 /* 3645F4 E00622F4 460052A1 */ cvt.d.s $f10, $f10 /* 3645F8 E00622F8 462A6301 */ sub.d $f12, $f12, $f10 /* 3645FC E00622FC 46346302 */ mul.d $f12, $f12, $f20 -/* 364600 E0062300 00000000 */ nop +/* 364600 E0062300 00000000 */ nop /* 364604 E0062304 C6080018 */ lwc1 $f8, 0x18($s0) /* 364608 E0062308 3C014019 */ lui $at, 0x4019 /* 36460C E006230C 3421999A */ ori $at, $at, 0x999a /* 364610 E0062310 44812000 */ mtc1 $at, $f4 -/* 364614 E0062314 00000000 */ nop +/* 364614 E0062314 00000000 */ nop /* 364618 E0062318 46082101 */ sub.s $f4, $f4, $f8 /* 36461C E006231C 46002121 */ cvt.d.s $f4, $f4 /* 364620 E0062320 46342102 */ mul.d $f4, $f4, $f20 -/* 364624 E0062324 00000000 */ nop +/* 364624 E0062324 00000000 */ nop /* 364628 E0062328 C6060028 */ lwc1 $f6, 0x28($s0) /* 36462C E006232C 3C0142C8 */ lui $at, 0x42c8 /* 364630 E0062330 44811000 */ mtc1 $at, $f2 -/* 364634 E0062334 00000000 */ nop +/* 364634 E0062334 00000000 */ nop /* 364638 E0062338 46061081 */ sub.s $f2, $f2, $f6 /* 36463C E006233C 3C01E006 */ lui $at, %hi(D_E00628E8) /* 364640 E0062340 D42028E8 */ ldc1 $f0, %lo(D_E00628E8)($at) /* 364644 E0062344 460010A1 */ cvt.d.s $f2, $f2 /* 364648 E0062348 46201082 */ mul.d $f2, $f2, $f0 -/* 36464C E006234C 00000000 */ nop +/* 36464C E006234C 00000000 */ nop /* 364650 E0062350 3C01E006 */ lui $at, %hi(D_E00628F0) /* 364654 E0062354 D42028F0 */ ldc1 $f0, %lo(D_E00628F0)($at) /* 364658 E0062358 46201082 */ mul.d $f2, $f2, $f0 -/* 36465C E006235C 00000000 */ nop +/* 36465C E006235C 00000000 */ nop /* 364660 E0062360 462C5280 */ add.d $f10, $f10, $f12 /* 364664 E0062364 46004221 */ cvt.d.s $f8, $f8 /* 364668 E0062368 46244200 */ add.d $f8, $f8, $f4 @@ -98,35 +98,35 @@ glabel func_E0062220 /* 364688 E0062388 E6060028 */ swc1 $f6, 0x28($s0) .LE006238C: /* 36468C E006238C 10400029 */ beqz $v0, .LE0062434 -/* 364690 E0062390 00000000 */ nop +/* 364690 E0062390 00000000 */ nop /* 364694 E0062394 C60C0014 */ lwc1 $f12, 0x14($s0) /* 364698 E0062398 3C0140E0 */ lui $at, 0x40e0 /* 36469C E006239C 44814000 */ mtc1 $at, $f8 -/* 3646A0 E00623A0 00000000 */ nop +/* 3646A0 E00623A0 00000000 */ nop /* 3646A4 E00623A4 460C4201 */ sub.s $f8, $f8, $f12 /* 3646A8 E00623A8 46004221 */ cvt.d.s $f8, $f8 /* 3646AC E00623AC 46364202 */ mul.d $f8, $f8, $f22 -/* 3646B0 E00623B0 00000000 */ nop +/* 3646B0 E00623B0 00000000 */ nop /* 3646B4 E00623B4 C60A0018 */ lwc1 $f10, 0x18($s0) /* 3646B8 E00623B8 3C013F80 */ lui $at, 0x3f80 /* 3646BC E00623BC 44812000 */ mtc1 $at, $f4 -/* 3646C0 E00623C0 00000000 */ nop +/* 3646C0 E00623C0 00000000 */ nop /* 3646C4 E00623C4 460A2101 */ sub.s $f4, $f4, $f10 /* 3646C8 E00623C8 46002121 */ cvt.d.s $f4, $f4 /* 3646CC E00623CC 46342102 */ mul.d $f4, $f4, $f20 -/* 3646D0 E00623D0 00000000 */ nop +/* 3646D0 E00623D0 00000000 */ nop /* 3646D4 E00623D4 C6060028 */ lwc1 $f6, 0x28($s0) /* 3646D8 E00623D8 3C014120 */ lui $at, 0x4120 /* 3646DC E00623DC 44811000 */ mtc1 $at, $f2 -/* 3646E0 E00623E0 00000000 */ nop +/* 3646E0 E00623E0 00000000 */ nop /* 3646E4 E00623E4 46061081 */ sub.s $f2, $f2, $f6 /* 3646E8 E00623E8 460010A1 */ cvt.d.s $f2, $f2 /* 3646EC E00623EC 46361082 */ mul.d $f2, $f2, $f22 -/* 3646F0 E00623F0 00000000 */ nop +/* 3646F0 E00623F0 00000000 */ nop /* 3646F4 E00623F4 3C01E006 */ lui $at, %hi(D_E00628F8) /* 3646F8 E00623F8 D42028F8 */ ldc1 $f0, %lo(D_E00628F8)($at) /* 3646FC E00623FC 46201082 */ mul.d $f2, $f2, $f0 -/* 364700 E0062400 00000000 */ nop +/* 364700 E0062400 00000000 */ nop /* 364704 E0062404 46006321 */ cvt.d.s $f12, $f12 /* 364708 E0062408 46286300 */ add.d $f12, $f12, $f8 /* 36470C E006240C 460052A1 */ cvt.d.s $f10, $f10 @@ -145,14 +145,14 @@ glabel func_E0062220 /* 36473C E006243C 46186300 */ add.s $f12, $f12, $f24 /* 364740 E0062440 C6020028 */ lwc1 $f2, 0x28($s0) /* 364744 E0062444 46020002 */ mul.s $f0, $f0, $f2 -/* 364748 E0062448 00000000 */ nop +/* 364748 E0062448 00000000 */ nop /* 36474C E006244C C60C0024 */ lwc1 $f12, 0x24($s0) /* 364750 E0062450 46186300 */ add.s $f12, $f12, $f24 /* 364754 E0062454 0C080140 */ jal func_E0200500 /* 364758 E0062458 E600FFFC */ swc1 $f0, -4($s0) /* 36475C E006245C C6020028 */ lwc1 $f2, 0x28($s0) /* 364760 E0062460 46020002 */ mul.s $f0, $f0, $f2 -/* 364764 E0062464 00000000 */ nop +/* 364764 E0062464 00000000 */ nop /* 364768 E0062468 26310001 */ addiu $s1, $s1, 1 /* 36476C E006246C E6000000 */ swc1 $f0, ($s0) /* 364770 E0062470 8E620008 */ lw $v0, 8($s3) diff --git a/asm/nonmatchings/code_364300/func_E00624EC.s b/asm/nonmatchings/code_364300/func_E00624EC.s index 06ff4c36f8..3ccfae4cb4 100644 --- a/asm/nonmatchings/code_364300/func_E00624EC.s +++ b/asm/nonmatchings/code_364300/func_E00624EC.s @@ -246,6 +246,6 @@ glabel func_E00624EC /* 364BA8 E00628A8 D7B40108 */ ldc1 $f20, 0x108($sp) /* 364BAC E00628AC 03E00008 */ jr $ra /* 364BB0 E00628B0 27BD0120 */ addiu $sp, $sp, 0x120 -/* 364BB4 E00628B4 00000000 */ nop -/* 364BB8 E00628B8 00000000 */ nop -/* 364BBC E00628BC 00000000 */ nop +/* 364BB4 E00628B4 00000000 */ nop +/* 364BB8 E00628B8 00000000 */ nop +/* 364BBC E00628BC 00000000 */ nop diff --git a/asm/nonmatchings/code_364F10/func_E0064000.s b/asm/nonmatchings/code_364F10/func_E0064000.s index 679178a411..14fc4513ae 100644 --- a/asm/nonmatchings/code_364F10/func_E0064000.s +++ b/asm/nonmatchings/code_364F10/func_E0064000.s @@ -50,7 +50,7 @@ glabel func_E0064000 /* 364FC0 E00640B0 AE50000C */ sw $s0, 0xc($s2) .LE00640B4: /* 364FC4 E00640B4 0801902D */ j .LE00640B4 -/* 364FC8 E00640B8 00000000 */ nop +/* 364FC8 E00640B8 00000000 */ nop .LE00640BC: /* 364FCC E00640BC 0200202D */ daddu $a0, $s0, $zero /* 364FD0 E00640C0 00112840 */ sll $a1, $s1, 1 @@ -86,7 +86,7 @@ glabel func_E0064000 /* 365048 E0064138 2405FFFF */ addiu $a1, $zero, -1 .LE006413C: /* 36504C E006413C 44860000 */ mtc1 $a2, $f0 -/* 365050 E0064140 00000000 */ nop +/* 365050 E0064140 00000000 */ nop /* 365054 E0064144 46800020 */ cvt.s.w $f0, $f0 /* 365058 E0064148 24C6001E */ addiu $a2, $a2, 0x1e /* 36505C E006414C AC85001C */ sw $a1, 0x1c($a0) diff --git a/asm/nonmatchings/code_364F10/func_E006419C.s b/asm/nonmatchings/code_364F10/func_E006419C.s index 9e5a49a44b..f442fd2fb5 100644 --- a/asm/nonmatchings/code_364F10/func_E006419C.s +++ b/asm/nonmatchings/code_364F10/func_E006419C.s @@ -3,4 +3,4 @@ glabel func_E006419C /* 3650AC E006419C 03E00008 */ jr $ra -/* 3650B0 E00641A0 00000000 */ nop +/* 3650B0 E00641A0 00000000 */ nop diff --git a/asm/nonmatchings/code_364F10/func_E00641A4.s b/asm/nonmatchings/code_364F10/func_E00641A4.s index e7847efaea..afcc38f987 100644 --- a/asm/nonmatchings/code_364F10/func_E00641A4.s +++ b/asm/nonmatchings/code_364F10/func_E00641A4.s @@ -24,18 +24,18 @@ glabel func_E00641A4 /* 365100 E00641F0 0C080128 */ jal func_E02004A0 /* 365104 E00641F4 0240202D */ daddu $a0, $s2, $zero /* 365108 E00641F8 080190EC */ j .LE00643B0 -/* 36510C E00641FC 00000000 */ nop +/* 36510C E00641FC 00000000 */ nop .LE0064200: /* 365110 E0064200 8C82002C */ lw $v0, 0x2c($a0) /* 365114 E0064204 28420008 */ slti $v0, $v0, 8 /* 365118 E0064208 14400009 */ bnez $v0, .LE0064230 -/* 36511C E006420C 00000000 */ nop +/* 36511C E006420C 00000000 */ nop /* 365120 E0064210 3C01E006 */ lui $at, %hi(D_E0064A70) /* 365124 E0064214 D4224A70 */ ldc1 $f2, %lo(D_E0064A70)($at) /* 365128 E0064218 C4800038 */ lwc1 $f0, 0x38($a0) /* 36512C E006421C 46800021 */ cvt.d.w $f0, $f0 /* 365130 E0064220 46220002 */ mul.d $f0, $f0, $f2 -/* 365134 E0064224 00000000 */ nop +/* 365134 E0064224 00000000 */ nop /* 365138 E0064228 4620038D */ trunc.w.d $f14, $f0 /* 36513C E006422C E48E0038 */ swc1 $f14, 0x38($a0) .LE0064230: @@ -62,7 +62,7 @@ glabel func_E00641A4 /* 36518C E006427C 04400047 */ bltz $v0, .LE006439C /* 365190 E0064280 AE020010 */ sw $v0, 0x10($s0) /* 365194 E0064284 1440001D */ bnez $v0, .LE00642FC -/* 365198 E0064288 00000000 */ nop +/* 365198 E0064288 00000000 */ nop /* 36519C E006428C C60CFFF8 */ lwc1 $f12, -8($s0) /* 3651A0 E0064290 AE00FFC8 */ sw $zero, -0x38($s0) /* 3651A4 E0064294 AE00FFCC */ sw $zero, -0x34($s0) @@ -71,7 +71,7 @@ glabel func_E00641A4 /* 3651B0 E00642A0 46000007 */ neg.s $f0, $f0 /* 3651B4 E00642A4 46000021 */ cvt.d.s $f0, $f0 /* 3651B8 E00642A8 46380002 */ mul.d $f0, $f0, $f24 -/* 3651BC E00642AC 00000000 */ nop +/* 3651BC E00642AC 00000000 */ nop /* 3651C0 E00642B0 C60CFFF8 */ lwc1 $f12, -8($s0) /* 3651C4 E00642B4 46200020 */ cvt.s.d $f0, $f0 /* 3651C8 E00642B8 0C080144 */ jal func_E0200510 @@ -80,7 +80,7 @@ glabel func_E00641A4 /* 3651D4 E00642C4 3C014120 */ lui $at, 0x4120 /* 3651D8 E00642C8 44811000 */ mtc1 $at, $f2 /* 3651DC E00642CC 46380002 */ mul.d $f0, $f0, $f24 -/* 3651E0 E00642D0 00000000 */ nop +/* 3651E0 E00642D0 00000000 */ nop /* 3651E4 E00642D4 AE00FFDC */ sw $zero, -0x24($s0) /* 3651E8 E00642D8 E6160000 */ swc1 $f22, ($s0) /* 3651EC E00642DC E6160004 */ swc1 $f22, 4($s0) @@ -97,14 +97,14 @@ glabel func_E00641A4 /* 365214 E0064304 D4204A80 */ ldc1 $f0, %lo(D_E0064A80)($at) /* 365218 E0064308 460031A1 */ cvt.d.s $f6, $f6 /* 36521C E006430C 46203182 */ mul.d $f6, $f6, $f0 -/* 365220 E0064310 00000000 */ nop +/* 365220 E0064310 00000000 */ nop /* 365224 E0064314 C604FFE4 */ lwc1 $f4, -0x1c($s0) /* 365228 E0064318 3C01E006 */ lui $at, %hi(D_E0064A88) /* 36522C E006431C D42A4A88 */ ldc1 $f10, %lo(D_E0064A88)($at) /* 365230 E0064320 46002121 */ cvt.d.s $f4, $f4 /* 365234 E0064324 46245281 */ sub.d $f10, $f10, $f4 /* 365238 E0064328 46345282 */ mul.d $f10, $f10, $f20 -/* 36523C E006432C 00000000 */ nop +/* 36523C E006432C 00000000 */ nop /* 365240 E0064330 C6020004 */ lwc1 $f2, 4($s0) /* 365244 E0064334 C6000000 */ lwc1 $f0, ($s0) /* 365248 E0064338 46020000 */ add.s $f0, $f0, $f2 diff --git a/asm/nonmatchings/code_364F10/func_E0064414.s b/asm/nonmatchings/code_364F10/func_E0064414.s index ce58648b02..307e24f52c 100644 --- a/asm/nonmatchings/code_364F10/func_E0064414.s +++ b/asm/nonmatchings/code_364F10/func_E0064414.s @@ -153,7 +153,7 @@ glabel func_E0064414 .LE0064664: /* 365574 E0064664 8E020008 */ lw $v0, 8($s0) /* 365578 E0064668 0440007E */ bltz $v0, .LE0064864 -/* 36557C E006466C 00000000 */ nop +/* 36557C E006466C 00000000 */ nop /* 365580 E0064670 8E05FFC0 */ lw $a1, -0x40($s0) /* 365584 E0064674 8E06FFC4 */ lw $a2, -0x3c($s0) /* 365588 E0064678 8E07FFC8 */ lw $a3, -0x38($s0) @@ -172,15 +172,15 @@ glabel func_E0064414 /* 3655BC E00646AC C604FFD8 */ lwc1 $f4, -0x28($s0) /* 3655C0 E00646B0 46002121 */ cvt.d.s $f4, $f4 /* 3655C4 E00646B4 46342102 */ mul.d $f4, $f4, $f20 -/* 3655C8 E00646B8 00000000 */ nop +/* 3655C8 E00646B8 00000000 */ nop /* 3655CC E00646BC C602FFDC */ lwc1 $f2, -0x24($s0) /* 3655D0 E00646C0 460010A1 */ cvt.d.s $f2, $f2 /* 3655D4 E00646C4 46341082 */ mul.d $f2, $f2, $f20 -/* 3655D8 E00646C8 00000000 */ nop +/* 3655D8 E00646C8 00000000 */ nop /* 3655DC E00646CC C600FFE0 */ lwc1 $f0, -0x20($s0) /* 3655E0 E00646D0 46000021 */ cvt.d.s $f0, $f0 /* 3655E4 E00646D4 46340002 */ mul.d $f0, $f0, $f20 -/* 3655E8 E00646D8 00000000 */ nop +/* 3655E8 E00646D8 00000000 */ nop /* 3655EC E00646DC 46202120 */ cvt.s.d $f4, $f4 /* 3655F0 E00646E0 462010A0 */ cvt.s.d $f2, $f2 /* 3655F4 E00646E4 46200020 */ cvt.s.d $f0, $f0 @@ -223,7 +223,7 @@ glabel func_E0064414 /* 365688 E0064778 24630008 */ addiu $v1, $v1, 8 /* 36568C E006477C 4600018D */ trunc.w.s $f6, $f0 /* 365690 E0064780 44023000 */ mfc1 $v0, $f6 -/* 365694 E0064784 00000000 */ nop +/* 365694 E0064784 00000000 */ nop /* 365698 E0064788 30420FFF */ andi $v0, $v0, 0xfff /* 36569C E006478C 005E1025 */ or $v0, $v0, $fp /* 3656A0 E0064790 AE630000 */ sw $v1, ($s3) @@ -243,7 +243,7 @@ glabel func_E0064414 /* 3656D8 E00647C8 AE620000 */ sw $v0, ($s3) /* 3656DC E00647CC 4600018D */ trunc.w.s $f6, $f0 /* 3656E0 E00647D0 44023000 */ mfc1 $v0, $f6 -/* 3656E4 E00647D4 00000000 */ nop +/* 3656E4 E00647D4 00000000 */ nop /* 3656E8 E00647D8 2442007C */ addiu $v0, $v0, 0x7c /* 3656EC E00647DC 30420FFF */ andi $v0, $v0, 0xfff /* 3656F0 E00647E0 00461025 */ or $v0, $v0, $a2 @@ -253,7 +253,7 @@ glabel func_E0064414 /* 365700 E00647F0 AE620000 */ sw $v0, ($s3) /* 365704 E00647F4 4600018D */ trunc.w.s $f6, $f0 /* 365708 E00647F8 44023000 */ mfc1 $v0, $f6 -/* 36570C E00647FC 00000000 */ nop +/* 36570C E00647FC 00000000 */ nop /* 365710 E0064800 30420FFF */ andi $v0, $v0, 0xfff /* 365714 E0064804 005E1025 */ or $v0, $v0, $fp /* 365718 E0064808 AC620000 */ sw $v0, ($v1) @@ -274,7 +274,7 @@ glabel func_E0064414 /* 365754 E0064844 AC62001C */ sw $v0, 0x1c($v1) /* 365758 E0064848 4600018D */ trunc.w.s $f6, $f0 /* 36575C E006484C 44023000 */ mfc1 $v0, $f6 -/* 365760 E0064850 00000000 */ nop +/* 365760 E0064850 00000000 */ nop /* 365764 E0064854 2442007C */ addiu $v0, $v0, 0x7c /* 365768 E0064858 30420FFF */ andi $v0, $v0, 0xfff /* 36576C E006485C 00481025 */ or $v0, $v0, $t0 diff --git a/asm/nonmatchings/code_366030/func_E0066000.s b/asm/nonmatchings/code_366030/func_E0066000.s index 65d22b32e0..9194b5e6b3 100644 --- a/asm/nonmatchings/code_366030/func_E0066000.s +++ b/asm/nonmatchings/code_366030/func_E0066000.s @@ -86,11 +86,12 @@ glabel func_E0066000 /* 36616C E006613C 104000BB */ beqz $v0, .LE006642C /* 366170 E0066140 E4800064 */ swc1 $f0, 0x64($a0) /* 366174 E0066144 00111080 */ sll $v0, $s1, 2 -/* 366178 E0066148 3C01E006 */ lui $at, %hi(D_E0066CE0) +/* 366178 E0066148 3C01E006 */ lui $at, %hi(jtbl_E0066CE0_366D10) /* 36617C E006614C 00220821 */ addu $at, $at, $v0 -/* 366180 E0066150 8C226CE0 */ lw $v0, %lo(D_E0066CE0)($at) +/* 366180 E0066150 8C226CE0 */ lw $v0, %lo(jtbl_E0066CE0_366D10)($at) /* 366184 E0066154 00400008 */ jr $v0 /* 366188 E0066158 00000000 */ nop +glabel LE006615C_36618C /* 36618C E006615C 3C014300 */ lui $at, 0x4300 /* 366190 E0066160 44810000 */ mtc1 $at, $f0 /* 366194 E0066164 3C01428C */ lui $at, 0x428c @@ -106,6 +107,7 @@ glabel func_E0066000 /* 3661BC E006618C E4840060 */ swc1 $f4, 0x60($a0) /* 3661C0 E0066190 0801991A */ j .LE0066468 /* 3661C4 E0066194 E4860064 */ swc1 $f6, 0x64($a0) +glabel LE0066198_3661C8 /* 3661C8 E0066198 3C0140E0 */ lui $at, 0x40e0 /* 3661CC E006619C 44810000 */ mtc1 $at, $f0 /* 3661D0 E00661A0 3C01C040 */ lui $at, 0xc040 @@ -116,6 +118,7 @@ glabel func_E0066000 /* 3661E4 E00661B4 44813000 */ mtc1 $at, $f6 /* 3661E8 E00661B8 08019907 */ j .LE006641C /* 3661EC E00661BC E4800034 */ swc1 $f0, 0x34($a0) +glabel LE00661C0_3661F0 /* 3661F0 E00661C0 3C014380 */ lui $at, 0x4380 /* 3661F4 E00661C4 44810000 */ mtc1 $at, $f0 /* 3661F8 E00661C8 3C0140E0 */ lui $at, 0x40e0 @@ -135,6 +138,7 @@ glabel func_E0066000 /* 366230 E0066200 E482003C */ swc1 $f2, 0x3c($a0) /* 366234 E0066204 0801991A */ j .LE0066468 /* 366238 E0066208 E486004C */ swc1 $f6, 0x4c($a0) +glabel LE006620C_36623C /* 36623C E006620C 3C0140E0 */ lui $at, 0x40e0 /* 366240 E0066210 44811000 */ mtc1 $at, $f2 /* 366244 E0066214 3C01C040 */ lui $at, 0xc040 @@ -148,6 +152,7 @@ glabel func_E0066000 /* 366264 E0066234 24020020 */ addiu $v0, $zero, 0x20 /* 366268 E0066238 080198E6 */ j .LE0066398 /* 36626C E006623C A082006A */ sb $v0, 0x6a($a0) +glabel LE0066240_366270 /* 366270 E0066240 3C0140E0 */ lui $at, 0x40e0 /* 366274 E0066244 44810000 */ mtc1 $at, $f0 /* 366278 E0066248 3C014040 */ lui $at, 0x4040 @@ -159,6 +164,7 @@ glabel func_E0066000 /* 366290 E0066260 E482003C */ swc1 $f2, 0x3c($a0) /* 366294 E0066264 0801991A */ j .LE0066468 /* 366298 E0066268 E484004C */ swc1 $f4, 0x4c($a0) +glabel LE006626C_36629C /* 36629C E006626C 3C0140E0 */ lui $at, 0x40e0 /* 3662A0 E0066270 44810000 */ mtc1 $at, $f0 /* 3662A4 E0066274 3C014040 */ lui $at, 0x4040 @@ -172,6 +178,7 @@ glabel func_E0066000 /* 3662C4 E0066294 A0820069 */ sb $v0, 0x69($a0) /* 3662C8 E0066298 08019906 */ j .LE0066418 /* 3662CC E006629C A082006A */ sb $v0, 0x6a($a0) +glabel LE00662A0_3662D0 /* 3662D0 E00662A0 3C0140E0 */ lui $at, 0x40e0 /* 3662D4 E00662A4 44810000 */ mtc1 $at, $f0 /* 3662D8 E00662A8 3C014040 */ lui $at, 0x4040 @@ -187,6 +194,7 @@ glabel func_E0066000 /* 366300 E00662D0 24020020 */ addiu $v0, $zero, 0x20 /* 366304 E00662D4 08019906 */ j .LE0066418 /* 366308 E00662D8 A082006A */ sb $v0, 0x6a($a0) +glabel LE00662DC_36630C /* 36630C E00662DC 240300D7 */ addiu $v1, $zero, 0xd7 /* 366310 E00662E0 3C0140E0 */ lui $at, 0x40e0 /* 366314 E00662E4 44811000 */ mtc1 $at, $f2 @@ -202,6 +210,7 @@ glabel func_E0066000 /* 36633C E006630C A083006B */ sb $v1, 0x6b($a0) /* 366340 E0066310 080198E5 */ j .LE0066394 /* 366344 E0066314 A082006C */ sb $v0, 0x6c($a0) +glabel LE0066318_366348 /* 366348 E0066318 3C014300 */ lui $at, 0x4300 /* 36634C E006631C 44810000 */ mtc1 $at, $f0 /* 366350 E0066320 3C01C2C8 */ lui $at, 0xc2c8 @@ -214,6 +223,7 @@ glabel func_E0066000 /* 36636C E006633C E4800044 */ swc1 $f0, 0x44($a0) /* 366370 E0066340 0801991A */ j .LE0066468 /* 366374 E0066344 E4840064 */ swc1 $f4, 0x64($a0) +glabel LE0066348_366378 /* 366378 E0066348 24020020 */ addiu $v0, $zero, 0x20 /* 36637C E006634C 3C0140E0 */ lui $at, 0x40e0 /* 366380 E0066350 44811000 */ mtc1 $at, $f2 @@ -241,6 +251,7 @@ glabel func_E0066000 /* 3663D0 E00663A0 E480003C */ swc1 $f0, 0x3c($a0) /* 3663D4 E00663A4 0801991A */ j .LE0066468 /* 3663D8 E00663A8 E484004C */ swc1 $f4, 0x4c($a0) +glabel LE00663AC_3663DC /* 3663DC E00663AC 3C0140E0 */ lui $at, 0x40e0 /* 3663E0 E00663B0 44810000 */ mtc1 $at, $f0 /* 3663E4 E00663B4 3C014100 */ lui $at, 0x4100 @@ -260,6 +271,7 @@ glabel func_E0066000 /* 36641C E00663EC A082006C */ sb $v0, 0x6c($a0) /* 366420 E00663F0 08019906 */ j .LE0066418 /* 366424 E00663F4 A080006D */ sb $zero, 0x6d($a0) +glabel LE00663F8_366428 /* 366428 E00663F8 3C0140E0 */ lui $at, 0x40e0 /* 36642C E00663FC 44810000 */ mtc1 $at, $f0 /* 366430 E0066400 3C01C040 */ lui $at, 0xc040 @@ -276,6 +288,7 @@ glabel func_E0066000 /* 366454 E0066424 0801991A */ j .LE0066468 /* 366458 E0066428 E486004C */ swc1 $f6, 0x4c($a0) .LE006642C: +glabel LE006642C_36645C /* 36645C E006642C 3C014080 */ lui $at, 0x4080 /* 366460 E0066430 44810000 */ mtc1 $at, $f0 /* 366464 E0066434 3C0140E0 */ lui $at, 0x40e0 diff --git a/asm/nonmatchings/code_36D020/func_E006A000.s b/asm/nonmatchings/code_36D020/func_E006A000.s index 3a543d7e8d..6e49e6c459 100644 --- a/asm/nonmatchings/code_36D020/func_E006A000.s +++ b/asm/nonmatchings/code_36D020/func_E006A000.s @@ -15,19 +15,19 @@ glabel func_E006A000 /* 36D048 E006A028 240400B4 */ addiu $a0, $zero, 0xb4 /* 36D04C E006A02C 26250001 */ addiu $a1, $s1, 1 /* 36D050 E006A030 44820000 */ mtc1 $v0, $f0 -/* 36D054 E006A034 00000000 */ nop +/* 36D054 E006A034 00000000 */ nop /* 36D058 E006A038 46800020 */ cvt.s.w $f0, $f0 /* 36D05C E006A03C 0C080011 */ jal func_E0200044 /* 36D060 E006A040 E6000070 */ swc1 $f0, 0x70($s0) /* 36D064 E006A044 240400B4 */ addiu $a0, $zero, 0xb4 /* 36D068 E006A048 26250002 */ addiu $a1, $s1, 2 /* 36D06C E006A04C 44820000 */ mtc1 $v0, $f0 -/* 36D070 E006A050 00000000 */ nop +/* 36D070 E006A050 00000000 */ nop /* 36D074 E006A054 46800020 */ cvt.s.w $f0, $f0 /* 36D078 E006A058 0C080011 */ jal func_E0200044 /* 36D07C E006A05C E6000074 */ swc1 $f0, 0x74($s0) /* 36D080 E006A060 44820000 */ mtc1 $v0, $f0 -/* 36D084 E006A064 00000000 */ nop +/* 36D084 E006A064 00000000 */ nop /* 36D088 E006A068 46800020 */ cvt.s.w $f0, $f0 /* 36D08C E006A06C E6000078 */ swc1 $f0, 0x78($s0) /* 36D090 E006A070 C6000068 */ lwc1 $f0, 0x68($s0) diff --git a/asm/nonmatchings/code_36D020/func_E006A0BC.s b/asm/nonmatchings/code_36D020/func_E006A0BC.s index 4986824f7a..42e7f51569 100644 --- a/asm/nonmatchings/code_36D020/func_E006A0BC.s +++ b/asm/nonmatchings/code_36D020/func_E006A0BC.s @@ -59,7 +59,7 @@ glabel func_E006A0BC /* 36D1B4 E006A194 44801800 */ mtc1 $zero, $f3 /* 36D1B8 E006A198 46000021 */ cvt.d.s $f0, $f0 /* 36D1BC E006A19C 46220002 */ mul.d $f0, $f0, $f2 -/* 36D1C0 E006A1A0 00000000 */ nop +/* 36D1C0 E006A1A0 00000000 */ nop /* 36D1C4 E006A1A4 24630001 */ addiu $v1, $v1, 1 /* 36D1C8 E006A1A8 00031880 */ sll $v1, $v1, 2 /* 36D1CC E006A1AC 3C01E007 */ lui $at, %hi(D_E006AF50) @@ -72,7 +72,7 @@ glabel func_E006A0BC /* 36D1E8 E006A1C8 46800020 */ cvt.s.w $f0, $f0 /* 36D1EC E006A1CC 46000021 */ cvt.d.s $f0, $f0 /* 36D1F0 E006A1D0 46220002 */ mul.d $f0, $f0, $f2 -/* 36D1F4 E006A1D4 00000000 */ nop +/* 36D1F4 E006A1D4 00000000 */ nop /* 36D1F8 E006A1D8 AC800090 */ sw $zero, 0x90($a0) /* 36D1FC E006A1DC 46200020 */ cvt.s.d $f0, $f0 /* 36D200 E006A1E0 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_36D020/func_E006A1E8.s b/asm/nonmatchings/code_36D020/func_E006A1E8.s index 6ae0fc3769..9c9aa381b1 100644 --- a/asm/nonmatchings/code_36D020/func_E006A1E8.s +++ b/asm/nonmatchings/code_36D020/func_E006A1E8.s @@ -54,7 +54,7 @@ glabel func_E006A1E8 /* 36D2C8 E006A2A8 AED1000C */ sw $s1, 0xc($s6) .LE006A2AC: /* 36D2CC E006A2AC 0801A8AB */ j .LE006A2AC -/* 36D2D0 E006A2B0 00000000 */ nop +/* 36D2D0 E006A2B0 00000000 */ nop .LE006A2B4: /* 36D2D4 E006A2B4 24020064 */ addiu $v0, $zero, 0x64 /* 36D2D8 E006A2B8 AE220028 */ sw $v0, 0x28($s1) @@ -92,11 +92,11 @@ glabel func_E006A1E8 /* 36D350 E006A330 16A10004 */ bne $s5, $at, .LE006A344 /* 36D354 E006A334 3C018000 */ lui $at, 0x8000 /* 36D358 E006A338 16610002 */ bne $s3, $at, .LE006A344 -/* 36D35C E006A33C 00000000 */ nop +/* 36D35C E006A33C 00000000 */ nop /* 36D360 E006A340 0006000D */ break 6 .LE006A344: /* 36D364 E006A344 00001812 */ mflo $v1 -/* 36D368 E006A348 00000000 */ nop +/* 36D368 E006A348 00000000 */ nop /* 36D36C E006A34C 16A00002 */ bnez $s5, .LE006A358 /* 36D370 E006A350 0295001A */ div $zero, $s4, $s5 /* 36D374 E006A354 0007000D */ break 7 @@ -105,7 +105,7 @@ glabel func_E006A1E8 /* 36D37C E006A35C 16A10004 */ bne $s5, $at, .LE006A370 /* 36D380 E006A360 3C018000 */ lui $at, 0x8000 /* 36D384 E006A364 16810002 */ bne $s4, $at, .LE006A370 -/* 36D388 E006A368 00000000 */ nop +/* 36D388 E006A368 00000000 */ nop /* 36D38C E006A36C 0006000D */ break 6 .LE006A370: /* 36D390 E006A370 00003012 */ mflo $a2 @@ -117,11 +117,11 @@ glabel func_E006A1E8 /* 36D3A8 E006A388 26310094 */ addiu $s1, $s1, 0x94 /* 36D3AC E006A38C 2463FFF6 */ addiu $v1, $v1, -0xa /* 36D3B0 E006A390 44831000 */ mtc1 $v1, $f2 -/* 36D3B4 E006A394 00000000 */ nop +/* 36D3B4 E006A394 00000000 */ nop /* 36D3B8 E006A398 468010A0 */ cvt.s.w $f2, $f2 /* 36D3BC E006A39C 02E63023 */ subu $a2, $s7, $a2 /* 36D3C0 E006A3A0 44860000 */ mtc1 $a2, $f0 -/* 36D3C4 E006A3A4 00000000 */ nop +/* 36D3C4 E006A3A4 00000000 */ nop /* 36D3C8 E006A3A8 46800020 */ cvt.s.w $f0, $f0 /* 36D3CC E006A3AC 4600B003 */ div.s $f0, $f22, $f0 /* 36D3D0 E006A3B0 46000021 */ cvt.d.s $f0, $f0 @@ -136,7 +136,7 @@ glabel func_E006A1E8 /* 36D3F4 E006A3D4 1440FFD2 */ bnez $v0, .LE006A320 /* 36D3F8 E006A3D8 26520094 */ addiu $s2, $s2, 0x94 /* 36D3FC E006A3DC 0801A906 */ j .LE006A418 -/* 36D400 E006A3E0 00000000 */ nop +/* 36D400 E006A3E0 00000000 */ nop .LE006A3E4: /* 36D404 E006A3E4 8EC20008 */ lw $v0, 8($s6) /* 36D408 E006A3E8 24100001 */ addiu $s0, $zero, 1 diff --git a/asm/nonmatchings/code_36D020/func_E006A45C.s b/asm/nonmatchings/code_36D020/func_E006A45C.s index 3f3cc568ee..535e35b9bd 100644 --- a/asm/nonmatchings/code_36D020/func_E006A45C.s +++ b/asm/nonmatchings/code_36D020/func_E006A45C.s @@ -3,4 +3,4 @@ glabel func_E006A45C /* 36D47C E006A45C 03E00008 */ jr $ra -/* 36D480 E006A460 00000000 */ nop +/* 36D480 E006A460 00000000 */ nop diff --git a/asm/nonmatchings/code_36D020/func_E006A464.s b/asm/nonmatchings/code_36D020/func_E006A464.s index 09daaa31d7..cedf9289fa 100644 --- a/asm/nonmatchings/code_36D020/func_E006A464.s +++ b/asm/nonmatchings/code_36D020/func_E006A464.s @@ -7,9 +7,9 @@ glabel func_E006A464 /* 36D48C E006A46C 46001000 */ add.s $f0, $f2, $f0 /* 36D490 E006A470 3C014380 */ lui $at, 0x4380 /* 36D494 E006A474 44812000 */ mtc1 $at, $f4 -/* 36D498 E006A478 00000000 */ nop +/* 36D498 E006A478 00000000 */ nop /* 36D49C E006A47C 4600203C */ c.lt.s $f4, $f0 -/* 36D4A0 E006A480 00000000 */ nop +/* 36D4A0 E006A480 00000000 */ nop /* 36D4A4 E006A484 45000003 */ bc1f .LE006A494 /* 36D4A8 E006A488 E4800034 */ swc1 $f0, 0x34($a0) /* 36D4AC E006A48C 46040001 */ sub.s $f0, $f0, $f4 @@ -17,11 +17,11 @@ glabel func_E006A464 .LE006A494: /* 36D4B4 E006A494 C4800034 */ lwc1 $f0, 0x34($a0) /* 36D4B8 E006A498 44803000 */ mtc1 $zero, $f6 -/* 36D4BC E006A49C 00000000 */ nop +/* 36D4BC E006A49C 00000000 */ nop /* 36D4C0 E006A4A0 4606003C */ c.lt.s $f0, $f6 -/* 36D4C4 E006A4A4 00000000 */ nop +/* 36D4C4 E006A4A4 00000000 */ nop /* 36D4C8 E006A4A8 45000003 */ bc1f .LE006A4B8 -/* 36D4CC E006A4AC 00000000 */ nop +/* 36D4CC E006A4AC 00000000 */ nop /* 36D4D0 E006A4B0 46040000 */ add.s $f0, $f0, $f4 /* 36D4D4 E006A4B4 E4800034 */ swc1 $f0, 0x34($a0) .LE006A4B8: @@ -29,7 +29,7 @@ glabel func_E006A464 /* 36D4DC E006A4BC C4800050 */ lwc1 $f0, 0x50($a0) /* 36D4E0 E006A4C0 46001000 */ add.s $f0, $f2, $f0 /* 36D4E4 E006A4C4 4600203C */ c.lt.s $f4, $f0 -/* 36D4E8 E006A4C8 00000000 */ nop +/* 36D4E8 E006A4C8 00000000 */ nop /* 36D4EC E006A4CC 45000003 */ bc1f .LE006A4DC /* 36D4F0 E006A4D0 E480003C */ swc1 $f0, 0x3c($a0) /* 36D4F4 E006A4D4 46040001 */ sub.s $f0, $f0, $f4 @@ -37,9 +37,9 @@ glabel func_E006A464 .LE006A4DC: /* 36D4FC E006A4DC C480003C */ lwc1 $f0, 0x3c($a0) /* 36D500 E006A4E0 4606003C */ c.lt.s $f0, $f6 -/* 36D504 E006A4E4 00000000 */ nop +/* 36D504 E006A4E4 00000000 */ nop /* 36D508 E006A4E8 45000003 */ bc1f .LE006A4F8 -/* 36D50C E006A4EC 00000000 */ nop +/* 36D50C E006A4EC 00000000 */ nop /* 36D510 E006A4F0 46040000 */ add.s $f0, $f0, $f4 /* 36D514 E006A4F4 E480003C */ swc1 $f0, 0x3c($a0) .LE006A4F8: @@ -47,7 +47,7 @@ glabel func_E006A464 /* 36D51C E006A4FC C480004C */ lwc1 $f0, 0x4c($a0) /* 36D520 E006A500 46001000 */ add.s $f0, $f2, $f0 /* 36D524 E006A504 4600203C */ c.lt.s $f4, $f0 -/* 36D528 E006A508 00000000 */ nop +/* 36D528 E006A508 00000000 */ nop /* 36D52C E006A50C 45000003 */ bc1f .LE006A51C /* 36D530 E006A510 E4800038 */ swc1 $f0, 0x38($a0) /* 36D534 E006A514 46040001 */ sub.s $f0, $f0, $f4 @@ -55,9 +55,9 @@ glabel func_E006A464 .LE006A51C: /* 36D53C E006A51C C4800038 */ lwc1 $f0, 0x38($a0) /* 36D540 E006A520 4606003C */ c.lt.s $f0, $f6 -/* 36D544 E006A524 00000000 */ nop +/* 36D544 E006A524 00000000 */ nop /* 36D548 E006A528 45000003 */ bc1f .LE006A538 -/* 36D54C E006A52C 00000000 */ nop +/* 36D54C E006A52C 00000000 */ nop /* 36D550 E006A530 46040000 */ add.s $f0, $f0, $f4 /* 36D554 E006A534 E4800038 */ swc1 $f0, 0x38($a0) .LE006A538: @@ -65,7 +65,7 @@ glabel func_E006A464 /* 36D55C E006A53C C4800054 */ lwc1 $f0, 0x54($a0) /* 36D560 E006A540 46001000 */ add.s $f0, $f2, $f0 /* 36D564 E006A544 4600203C */ c.lt.s $f4, $f0 -/* 36D568 E006A548 00000000 */ nop +/* 36D568 E006A548 00000000 */ nop /* 36D56C E006A54C 45000003 */ bc1f .LE006A55C /* 36D570 E006A550 E4800040 */ swc1 $f0, 0x40($a0) /* 36D574 E006A554 46040001 */ sub.s $f0, $f0, $f4 @@ -73,11 +73,11 @@ glabel func_E006A464 .LE006A55C: /* 36D57C E006A55C C4800040 */ lwc1 $f0, 0x40($a0) /* 36D580 E006A560 4606003C */ c.lt.s $f0, $f6 -/* 36D584 E006A564 00000000 */ nop +/* 36D584 E006A564 00000000 */ nop /* 36D588 E006A568 45000003 */ bc1f .LE006A578 -/* 36D58C E006A56C 00000000 */ nop +/* 36D58C E006A56C 00000000 */ nop /* 36D590 E006A570 46040000 */ add.s $f0, $f0, $f4 /* 36D594 E006A574 E4800040 */ swc1 $f0, 0x40($a0) .LE006A578: /* 36D598 E006A578 03E00008 */ jr $ra -/* 36D59C E006A57C 00000000 */ nop +/* 36D59C E006A57C 00000000 */ nop diff --git a/asm/nonmatchings/code_36D020/func_E006A580.s b/asm/nonmatchings/code_36D020/func_E006A580.s index 1b61addb36..6c941b4468 100644 --- a/asm/nonmatchings/code_36D020/func_E006A580.s +++ b/asm/nonmatchings/code_36D020/func_E006A580.s @@ -36,12 +36,12 @@ glabel func_E006A580 /* 36D614 E006A5F4 0C080128 */ jal func_E02004A0 /* 36D618 E006A5F8 0280202D */ daddu $a0, $s4, $zero /* 36D61C E006A5FC 0801A9FD */ j .LE006A7F4 -/* 36D620 E006A600 00000000 */ nop +/* 36D620 E006A600 00000000 */ nop .LE006A604: /* 36D624 E006A604 8E23002C */ lw $v1, 0x2c($s1) /* 36D628 E006A608 28820002 */ slti $v0, $a0, 2 /* 36D62C E006A60C 10400030 */ beqz $v0, .LE006A6D0 -/* 36D630 E006A610 00000000 */ nop +/* 36D630 E006A610 00000000 */ nop /* 36D634 E006A614 0480002E */ bltz $a0, .LE006A6D0 /* 36D638 E006A618 24120001 */ addiu $s2, $zero, 1 /* 36D63C E006A61C 8E820008 */ lw $v0, 8($s4) @@ -92,7 +92,7 @@ glabel func_E006A580 /* 36D6E0 E006A6C0 1440FFDE */ bnez $v0, .LE006A63C /* 36D6E4 E006A6C4 26310094 */ addiu $s1, $s1, 0x94 /* 36D6E8 E006A6C8 0801A9FD */ j .LE006A7F4 -/* 36D6EC E006A6CC 00000000 */ nop +/* 36D6EC E006A6CC 00000000 */ nop .LE006A6D0: /* 36D6F0 E006A6D0 8E820008 */ lw $v0, 8($s4) /* 36D6F4 E006A6D4 24120001 */ addiu $s2, $zero, 1 @@ -135,7 +135,7 @@ glabel func_E006A580 /* 36D77C E006A75C 00730018 */ mult $v1, $s3 /* 36D780 E006A760 00001812 */ mflo $v1 /* 36D784 E006A764 34426667 */ ori $v0, $v0, 0x6667 -/* 36D788 E006A768 00000000 */ nop +/* 36D788 E006A768 00000000 */ nop /* 36D78C E006A76C 00620018 */ mult $v1, $v0 /* 36D790 E006A770 00031FC3 */ sra $v1, $v1, 0x1f /* 36D794 E006A774 00001010 */ mfhi $v0 diff --git a/asm/nonmatchings/code_36D020/func_E006A85C.s b/asm/nonmatchings/code_36D020/func_E006A85C.s index d6d5148a90..0d90c0aaf8 100644 --- a/asm/nonmatchings/code_36D020/func_E006A85C.s +++ b/asm/nonmatchings/code_36D020/func_E006A85C.s @@ -9,13 +9,13 @@ glabel func_E006A85C /* 36D88C E006A86C 44812000 */ mtc1 $at, $f4 /* 36D890 E006A870 3C08F200 */ lui $t0, 0xf200 /* 36D894 E006A874 46041082 */ mul.s $f2, $f2, $f4 -/* 36D898 E006A878 00000000 */ nop +/* 36D898 E006A878 00000000 */ nop /* 36D89C E006A87C 8C670000 */ lw $a3, ($v1) /* 36D8A0 E006A880 C4800038 */ lwc1 $f0, 0x38($a0) /* 36D8A4 E006A884 00E0482D */ daddu $t1, $a3, $zero /* 36D8A8 E006A888 24E70008 */ addiu $a3, $a3, 8 /* 36D8AC E006A88C 46040002 */ mul.s $f0, $f0, $f4 -/* 36D8B0 E006A890 00000000 */ nop +/* 36D8B0 E006A890 00000000 */ nop /* 36D8B4 E006A894 24E20008 */ addiu $v0, $a3, 8 /* 36D8B8 E006A898 AC670000 */ sw $a3, ($v1) /* 36D8BC E006A89C AC620000 */ sw $v0, ($v1) @@ -32,13 +32,13 @@ glabel func_E006A85C /* 36D8E8 E006A8C8 C480003C */ lwc1 $f0, 0x3c($a0) /* 36D8EC E006A8CC 30420FFF */ andi $v0, $v0, 0xfff /* 36D8F0 E006A8D0 46040002 */ mul.s $f0, $f0, $f4 -/* 36D8F4 E006A8D4 00000000 */ nop +/* 36D8F4 E006A8D4 00000000 */ nop /* 36D8F8 E006A8D8 00021300 */ sll $v0, $v0, 0xc /* 36D8FC E006A8DC 24C60100 */ addiu $a2, $a2, 0x100 /* 36D900 E006A8E0 C4820040 */ lwc1 $f2, 0x40($a0) /* 36D904 E006A8E4 30C60FFF */ andi $a2, $a2, 0xfff /* 36D908 E006A8E8 46041082 */ mul.s $f2, $f2, $f4 -/* 36D90C E006A8EC 00000000 */ nop +/* 36D90C E006A8EC 00000000 */ nop /* 36D910 E006A8F0 00461025 */ or $v0, $v0, $a2 /* 36D914 E006A8F4 AD250000 */ sw $a1, ($t1) /* 36D918 E006A8F8 AD220004 */ sw $v0, 4($t1) diff --git a/asm/nonmatchings/code_36D020/func_E006A94C.s b/asm/nonmatchings/code_36D020/func_E006A94C.s index 21d6f90448..5378c8a629 100644 --- a/asm/nonmatchings/code_36D020/func_E006A94C.s +++ b/asm/nonmatchings/code_36D020/func_E006A94C.s @@ -103,7 +103,7 @@ glabel func_E006A94C /* 36DAEC E006AACC 46161000 */ add.s $f0, $f2, $f22 /* 36DAF0 E006AAD0 3C014234 */ lui $at, 0x4234 /* 36DAF4 E006AAD4 44810000 */ mtc1 $at, $f0 -/* 36DAF8 E006AAD8 00000000 */ nop +/* 36DAF8 E006AAD8 00000000 */ nop /* 36DAFC E006AADC 46001000 */ add.s $f0, $f2, $f0 .LE006AAE0: /* 36DB00 E006AAE0 44050000 */ mfc1 $a1, $f0 @@ -137,14 +137,14 @@ glabel func_E006A94C /* 36DB70 E006AB50 00A0302D */ daddu $a2, $a1, $zero /* 36DB74 E006AB54 3C014040 */ lui $at, 0x4040 /* 36DB78 E006AB58 44810000 */ mtc1 $at, $f0 -/* 36DB7C E006AB5C 00000000 */ nop +/* 36DB7C E006AB5C 00000000 */ nop /* 36DB80 E006AB60 4600A000 */ add.s $f0, $f20, $f0 /* 36DB84 E006AB64 3C013FD0 */ lui $at, 0x3fd0 /* 36DB88 E006AB68 44811800 */ mtc1 $at, $f3 /* 36DB8C E006AB6C 44801000 */ mtc1 $zero, $f2 /* 36DB90 E006AB70 46000021 */ cvt.d.s $f0, $f0 /* 36DB94 E006AB74 46220002 */ mul.d $f0, $f0, $f2 -/* 36DB98 E006AB78 00000000 */ nop +/* 36DB98 E006AB78 00000000 */ nop /* 36DB9C E006AB7C 32830003 */ andi $v1, $s4, 3 /* 36DBA0 E006AB80 24020001 */ addiu $v0, $zero, 1 /* 36DBA4 E006AB84 46200120 */ cvt.s.d $f4, $f0 @@ -154,7 +154,7 @@ glabel func_E006A94C /* 36DBB4 E006AB94 10400005 */ beqz $v0, .LE006ABAC /* 36DBB8 E006AB98 24020002 */ addiu $v0, $zero, 2 /* 36DBBC E006AB9C 10600007 */ beqz $v1, .LE006ABBC -/* 36DBC0 E006ABA0 00000000 */ nop +/* 36DBC0 E006ABA0 00000000 */ nop /* 36DBC4 E006ABA4 0801AAFD */ j .LE006ABF4 /* 36DBC8 E006ABA8 4600A006 */ mov.s $f0, $f20 .LE006ABAC: @@ -178,7 +178,7 @@ glabel func_E006A94C /* 36DC04 E006ABE4 D422AF60 */ ldc1 $f2, %lo(D_E006AF60)($at) .LE006ABE8: /* 36DC08 E006ABE8 46220002 */ mul.d $f0, $f0, $f2 -/* 36DC0C E006ABEC 00000000 */ nop +/* 36DC0C E006ABEC 00000000 */ nop /* 36DC10 E006ABF0 46200020 */ cvt.s.d $f0, $f0 .LE006ABF4: /* 36DC14 E006ABF4 44053000 */ mfc1 $a1, $f6 @@ -309,5 +309,5 @@ glabel func_E006A94C /* 36DDFC E006ADDC D7B40108 */ ldc1 $f20, 0x108($sp) /* 36DE00 E006ADE0 03E00008 */ jr $ra /* 36DE04 E006ADE4 27BD0120 */ addiu $sp, $sp, 0x120 -/* 36DE08 E006ADE8 00000000 */ nop -/* 36DE0C E006ADEC 00000000 */ nop +/* 36DE08 E006ADE8 00000000 */ nop +/* 36DE0C E006ADEC 00000000 */ nop diff --git a/asm/nonmatchings/code_36E1D0/func_E006C000.s b/asm/nonmatchings/code_36E1D0/func_E006C000.s index 6dbd4f155a..cfed823ee8 100644 --- a/asm/nonmatchings/code_36E1D0/func_E006C000.s +++ b/asm/nonmatchings/code_36E1D0/func_E006C000.s @@ -42,7 +42,7 @@ glabel func_E006C000 /* 36E264 E006C094 AE62000C */ sw $v0, 0xc($s3) .LE006C098: /* 36E268 E006C098 0801B026 */ j .LE006C098 -/* 36E26C E006C09C 00000000 */ nop +/* 36E26C E006C09C 00000000 */ nop .LE006C0A0: /* 36E270 E006C0A0 2A820003 */ slti $v0, $s4, 3 /* 36E274 E006C0A4 AE140000 */ sw $s4, ($s0) @@ -86,7 +86,7 @@ glabel func_E006C000 /* 36E304 E006C134 E6020038 */ swc1 $f2, 0x38($s0) /* 36E308 E006C138 24020001 */ addiu $v0, $zero, 1 /* 36E30C E006C13C 16820019 */ bne $s4, $v0, .LE006C1A4 -/* 36E310 E006C140 00000000 */ nop +/* 36E310 E006C140 00000000 */ nop /* 36E314 E006C144 0C080150 */ jal func_E0200540 /* 36E318 E006C148 24040047 */ addiu $a0, $zero, 0x47 /* 36E31C E006C14C 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/code_36E1D0/func_E006C298.s b/asm/nonmatchings/code_36E1D0/func_E006C298.s index 95aa20e3bd..07a5ebabdb 100644 --- a/asm/nonmatchings/code_36E1D0/func_E006C298.s +++ b/asm/nonmatchings/code_36E1D0/func_E006C298.s @@ -3,4 +3,4 @@ glabel func_E006C298 /* 36E468 E006C298 03E00008 */ jr $ra -/* 36E46C E006C29C 00000000 */ nop +/* 36E46C E006C29C 00000000 */ nop diff --git a/asm/nonmatchings/code_36E1D0/func_E006C2A0.s b/asm/nonmatchings/code_36E1D0/func_E006C2A0.s index a42b791ac6..1e770284f4 100644 --- a/asm/nonmatchings/code_36E1D0/func_E006C2A0.s +++ b/asm/nonmatchings/code_36E1D0/func_E006C2A0.s @@ -30,19 +30,19 @@ glabel func_E006C2A0 /* 36E4CC E006C2FC 04A10010 */ bgez $a1, .LE006C340 /* 36E4D0 E006C300 AE020018 */ sw $v0, 0x18($s0) /* 36E4D4 E006C304 0C080128 */ jal func_E02004A0 -/* 36E4D8 E006C308 00000000 */ nop +/* 36E4D8 E006C308 00000000 */ nop /* 36E4DC E006C30C 8E040048 */ lw $a0, 0x48($s0) /* 36E4E0 E006C310 10800004 */ beqz $a0, .LE006C324 -/* 36E4E4 E006C314 00000000 */ nop +/* 36E4E4 E006C314 00000000 */ nop /* 36E4E8 E006C318 0C080128 */ jal func_E02004A0 -/* 36E4EC E006C31C 00000000 */ nop +/* 36E4EC E006C31C 00000000 */ nop /* 36E4F0 E006C320 AE000048 */ sw $zero, 0x48($s0) .LE006C324: /* 36E4F4 E006C324 8E040044 */ lw $a0, 0x44($s0) /* 36E4F8 E006C328 10800096 */ beqz $a0, .LE006C584 -/* 36E4FC E006C32C 00000000 */ nop +/* 36E4FC E006C32C 00000000 */ nop /* 36E500 E006C330 0C080128 */ jal func_E02004A0 -/* 36E504 E006C334 00000000 */ nop +/* 36E504 E006C334 00000000 */ nop /* 36E508 E006C338 0801B161 */ j .LE006C584 /* 36E50C E006C33C AE000044 */ sw $zero, 0x44($s0) .LE006C340: @@ -54,7 +54,7 @@ glabel func_E006C2A0 /* 36E524 E006C354 14400005 */ bnez $v0, .LE006C36C /* 36E528 E006C358 2A420003 */ slti $v0, $s2, 3 /* 36E52C E006C35C 0C080128 */ jal func_E02004A0 -/* 36E530 E006C360 00000000 */ nop +/* 36E530 E006C360 00000000 */ nop /* 36E534 E006C364 AE000044 */ sw $zero, 0x44($s0) .LE006C368: /* 36E538 E006C368 2A420003 */ slti $v0, $s2, 3 @@ -68,9 +68,9 @@ glabel func_E006C2A0 /* 36E550 E006C380 C602002C */ lwc1 $f2, 0x2c($s0) /* 36E554 E006C384 46020080 */ add.s $f2, $f0, $f2 /* 36E558 E006C388 44800000 */ mtc1 $zero, $f0 -/* 36E55C E006C38C 00000000 */ nop +/* 36E55C E006C38C 00000000 */ nop /* 36E560 E006C390 4600103C */ c.lt.s $f2, $f0 -/* 36E564 E006C394 00000000 */ nop +/* 36E564 E006C394 00000000 */ nop /* 36E568 E006C398 45000005 */ bc1f .LE006C3B0 /* 36E56C E006C39C E602001C */ swc1 $f2, 0x1c($s0) /* 36E570 E006C3A0 3C014380 */ lui $at, 0x4380 @@ -80,11 +80,11 @@ glabel func_E006C2A0 .LE006C3B0: /* 36E580 E006C3B0 3C014380 */ lui $at, 0x4380 /* 36E584 E006C3B4 44810000 */ mtc1 $at, $f0 -/* 36E588 E006C3B8 00000000 */ nop +/* 36E588 E006C3B8 00000000 */ nop /* 36E58C E006C3BC 4602003C */ c.lt.s $f0, $f2 -/* 36E590 E006C3C0 00000000 */ nop +/* 36E590 E006C3C0 00000000 */ nop /* 36E594 E006C3C4 45000003 */ bc1f .LE006C3D4 -/* 36E598 E006C3C8 00000000 */ nop +/* 36E598 E006C3C8 00000000 */ nop /* 36E59C E006C3CC 46001001 */ sub.s $f0, $f2, $f0 .LE006C3D0: /* 36E5A0 E006C3D0 E600001C */ swc1 $f0, 0x1c($s0) @@ -98,19 +98,19 @@ glabel func_E006C2A0 /* 36E5B8 E006C3E8 14410004 */ bne $v0, $at, .LE006C3FC /* 36E5BC E006C3EC 3C018000 */ lui $at, 0x8000 /* 36E5C0 E006C3F0 16210002 */ bne $s1, $at, .LE006C3FC -/* 36E5C4 E006C3F4 00000000 */ nop +/* 36E5C4 E006C3F4 00000000 */ nop /* 36E5C8 E006C3F8 0006000D */ break 6 .LE006C3FC: /* 36E5CC E006C3FC 00001810 */ mfhi $v1 /* 36E5D0 E006C400 14600017 */ bnez $v1, .LE006C460 -/* 36E5D4 E006C404 00000000 */ nop +/* 36E5D4 E006C404 00000000 */ nop /* 36E5D8 E006C408 C6000020 */ lwc1 $f0, 0x20($s0) /* 36E5DC E006C40C C6020030 */ lwc1 $f2, 0x30($s0) /* 36E5E0 E006C410 46020080 */ add.s $f2, $f0, $f2 /* 36E5E4 E006C414 44800000 */ mtc1 $zero, $f0 -/* 36E5E8 E006C418 00000000 */ nop +/* 36E5E8 E006C418 00000000 */ nop /* 36E5EC E006C41C 4600103C */ c.lt.s $f2, $f0 -/* 36E5F0 E006C420 00000000 */ nop +/* 36E5F0 E006C420 00000000 */ nop /* 36E5F4 E006C424 45000005 */ bc1f .LE006C43C /* 36E5F8 E006C428 E6020020 */ swc1 $f2, 0x20($s0) /* 36E5FC E006C42C 3C014280 */ lui $at, 0x4280 @@ -120,11 +120,11 @@ glabel func_E006C2A0 .LE006C43C: /* 36E60C E006C43C 3C014280 */ lui $at, 0x4280 /* 36E610 E006C440 44810000 */ mtc1 $at, $f0 -/* 36E614 E006C444 00000000 */ nop +/* 36E614 E006C444 00000000 */ nop /* 36E618 E006C448 4602003C */ c.lt.s $f0, $f2 -/* 36E61C E006C44C 00000000 */ nop +/* 36E61C E006C44C 00000000 */ nop /* 36E620 E006C450 45000003 */ bc1f .LE006C460 -/* 36E624 E006C454 00000000 */ nop +/* 36E624 E006C454 00000000 */ nop /* 36E628 E006C458 46001001 */ sub.s $f0, $f2, $f0 .LE006C45C: /* 36E62C E006C45C E6000020 */ swc1 $f0, 0x20($s0) @@ -138,19 +138,19 @@ glabel func_E006C2A0 /* 36E644 E006C474 14410004 */ bne $v0, $at, .LE006C488 /* 36E648 E006C478 3C018000 */ lui $at, 0x8000 /* 36E64C E006C47C 16210002 */ bne $s1, $at, .LE006C488 -/* 36E650 E006C480 00000000 */ nop +/* 36E650 E006C480 00000000 */ nop /* 36E654 E006C484 0006000D */ break 6 .LE006C488: /* 36E658 E006C488 00001810 */ mfhi $v1 /* 36E65C E006C48C 14600017 */ bnez $v1, .LE006C4EC -/* 36E660 E006C490 00000000 */ nop +/* 36E660 E006C490 00000000 */ nop /* 36E664 E006C494 C6000024 */ lwc1 $f0, 0x24($s0) /* 36E668 E006C498 C6020034 */ lwc1 $f2, 0x34($s0) /* 36E66C E006C49C 46020080 */ add.s $f2, $f0, $f2 /* 36E670 E006C4A0 44800000 */ mtc1 $zero, $f0 -/* 36E674 E006C4A4 00000000 */ nop +/* 36E674 E006C4A4 00000000 */ nop /* 36E678 E006C4A8 4600103C */ c.lt.s $f2, $f0 -/* 36E67C E006C4AC 00000000 */ nop +/* 36E67C E006C4AC 00000000 */ nop /* 36E680 E006C4B0 45000005 */ bc1f .LE006C4C8 /* 36E684 E006C4B4 E6020024 */ swc1 $f2, 0x24($s0) /* 36E688 E006C4B8 3C014380 */ lui $at, 0x4380 @@ -160,11 +160,11 @@ glabel func_E006C2A0 .LE006C4C8: /* 36E698 E006C4C8 3C014380 */ lui $at, 0x4380 /* 36E69C E006C4CC 44810000 */ mtc1 $at, $f0 -/* 36E6A0 E006C4D0 00000000 */ nop +/* 36E6A0 E006C4D0 00000000 */ nop /* 36E6A4 E006C4D4 4602003C */ c.lt.s $f0, $f2 -/* 36E6A8 E006C4D8 00000000 */ nop +/* 36E6A8 E006C4D8 00000000 */ nop /* 36E6AC E006C4DC 45000003 */ bc1f .LE006C4EC -/* 36E6B0 E006C4E0 00000000 */ nop +/* 36E6B0 E006C4E0 00000000 */ nop /* 36E6B4 E006C4E4 46001001 */ sub.s $f0, $f2, $f0 .LE006C4E8: /* 36E6B8 E006C4E8 E6000024 */ swc1 $f0, 0x24($s0) @@ -173,9 +173,9 @@ glabel func_E006C2A0 /* 36E6C0 E006C4F0 C6020038 */ lwc1 $f2, 0x38($s0) /* 36E6C4 E006C4F4 46020080 */ add.s $f2, $f0, $f2 /* 36E6C8 E006C4F8 44800000 */ mtc1 $zero, $f0 -/* 36E6CC E006C4FC 00000000 */ nop +/* 36E6CC E006C4FC 00000000 */ nop /* 36E6D0 E006C500 4600103C */ c.lt.s $f2, $f0 -/* 36E6D4 E006C504 00000000 */ nop +/* 36E6D4 E006C504 00000000 */ nop /* 36E6D8 E006C508 45000005 */ bc1f .LE006C520 /* 36E6DC E006C50C E6020028 */ swc1 $f2, 0x28($s0) /* 36E6E0 E006C510 3C014280 */ lui $at, 0x4280 @@ -185,9 +185,9 @@ glabel func_E006C2A0 .LE006C520: /* 36E6F0 E006C520 3C014280 */ lui $at, 0x4280 /* 36E6F4 E006C524 44810000 */ mtc1 $at, $f0 -/* 36E6F8 E006C528 00000000 */ nop +/* 36E6F8 E006C528 00000000 */ nop /* 36E6FC E006C52C 4602003C */ c.lt.s $f0, $f2 -/* 36E700 E006C530 00000000 */ nop +/* 36E700 E006C530 00000000 */ nop /* 36E704 E006C534 45000004 */ bc1f .LE006C548 /* 36E708 E006C538 2A420003 */ slti $v0, $s2, 3 /* 36E70C E006C53C 46001001 */ sub.s $f0, $f2, $f0 @@ -199,13 +199,13 @@ glabel func_E006C2A0 /* 36E71C E006C54C 2A62000A */ slti $v0, $s3, 0xa /* 36E720 E006C550 2A220007 */ slti $v0, $s1, 7 /* 36E724 E006C554 1440000B */ bnez $v0, .LE006C584 -/* 36E728 E006C558 00000000 */ nop +/* 36E728 E006C558 00000000 */ nop /* 36E72C E006C55C 8E020010 */ lw $v0, 0x10($s0) /* 36E730 E006C560 0801B15E */ j .LE006C578 /* 36E734 E006C564 2442FFF3 */ addiu $v0, $v0, -0xd .LE006C568: /* 36E738 E006C568 10400006 */ beqz $v0, .LE006C584 -/* 36E73C E006C56C 00000000 */ nop +/* 36E73C E006C56C 00000000 */ nop /* 36E740 E006C570 8E020010 */ lw $v0, 0x10($s0) /* 36E744 E006C574 2442FFE7 */ addiu $v0, $v0, -0x19 .LE006C578: diff --git a/asm/nonmatchings/code_36E1D0/func_E006C5E8.s b/asm/nonmatchings/code_36E1D0/func_E006C5E8.s index bbde3be5b5..2815ec0d86 100644 --- a/asm/nonmatchings/code_36E1D0/func_E006C5E8.s +++ b/asm/nonmatchings/code_36E1D0/func_E006C5E8.s @@ -69,20 +69,20 @@ glabel func_E006C5E8 /* 36E8B4 E006C6E4 C666001C */ lwc1 $f6, 0x1c($s3) /* 36E8B8 E006C6E8 3C014080 */ lui $at, 0x4080 /* 36E8BC E006C6EC 44814000 */ mtc1 $at, $f8 -/* 36E8C0 E006C6F0 00000000 */ nop +/* 36E8C0 E006C6F0 00000000 */ nop /* 36E8C4 E006C6F4 46083182 */ mul.s $f6, $f6, $f8 -/* 36E8C8 E006C6F8 00000000 */ nop +/* 36E8C8 E006C6F8 00000000 */ nop /* 36E8CC E006C6FC C6640020 */ lwc1 $f4, 0x20($s3) /* 36E8D0 E006C700 46082102 */ mul.s $f4, $f4, $f8 -/* 36E8D4 E006C704 00000000 */ nop +/* 36E8D4 E006C704 00000000 */ nop /* 36E8D8 E006C708 C6620024 */ lwc1 $f2, 0x24($s3) /* 36E8DC E006C70C 46081082 */ mul.s $f2, $f2, $f8 -/* 36E8E0 E006C710 00000000 */ nop +/* 36E8E0 E006C710 00000000 */ nop /* 36E8E4 E006C714 24C20010 */ addiu $v0, $a2, 0x10 /* 36E8E8 E006C718 AE820000 */ sw $v0, ($s4) /* 36E8EC E006C71C C6600028 */ lwc1 $f0, 0x28($s3) /* 36E8F0 E006C720 46080002 */ mul.s $f0, $f0, $f8 -/* 36E8F4 E006C724 00000000 */ nop +/* 36E8F4 E006C724 00000000 */ nop /* 36E8F8 E006C728 2AA20003 */ slti $v0, $s5, 3 /* 36E8FC E006C72C 4600328D */ trunc.w.s $f10, $f6 /* 36E900 E006C730 44165000 */ mfc1 $s6, $f10 @@ -105,10 +105,10 @@ glabel func_E006C5E8 /* 36E944 E006C774 3C013F80 */ lui $at, 0x3f80 /* 36E948 E006C778 44812000 */ mtc1 $at, $f4 /* 36E94C E006C77C 44823000 */ mtc1 $v0, $f6 -/* 36E950 E006C780 00000000 */ nop +/* 36E950 E006C780 00000000 */ nop /* 36E954 E006C784 468031A0 */ cvt.s.w $f6, $f6 /* 36E958 E006C788 44830000 */ mtc1 $v1, $f0 -/* 36E95C E006C78C 00000000 */ nop +/* 36E95C E006C78C 00000000 */ nop /* 36E960 E006C790 46800020 */ cvt.s.w $f0, $f0 /* 36E964 E006C794 46003183 */ div.s $f6, $f6, $f0 /* 36E968 E006C798 44073000 */ mfc1 $a3, $f6 @@ -355,6 +355,6 @@ glabel func_E006C5E8 /* 36ED18 E006CB48 D7B400D8 */ ldc1 $f20, 0xd8($sp) /* 36ED1C E006CB4C 03E00008 */ jr $ra /* 36ED20 E006CB50 27BD00E8 */ addiu $sp, $sp, 0xe8 -/* 36ED24 E006CB54 00000000 */ nop -/* 36ED28 E006CB58 00000000 */ nop -/* 36ED2C E006CB5C 00000000 */ nop +/* 36ED24 E006CB54 00000000 */ nop +/* 36ED28 E006CB58 00000000 */ nop +/* 36ED2C E006CB5C 00000000 */ nop diff --git a/asm/nonmatchings/code_3740B0/func_E0070000.s b/asm/nonmatchings/code_3740B0/func_E0070000.s index 96b4d96e6b..b0453f2bfa 100644 --- a/asm/nonmatchings/code_3740B0/func_E0070000.s +++ b/asm/nonmatchings/code_3740B0/func_E0070000.s @@ -41,7 +41,7 @@ glabel func_E0070000 /* 374140 E0070090 AE03000C */ sw $v1, 0xc($s0) .LE0070094: /* 374144 E0070094 0801C025 */ j .LE0070094 -/* 374148 E0070098 00000000 */ nop +/* 374148 E0070098 00000000 */ nop .LE007009C: /* 37414C E007009C AC730000 */ sw $s3, ($v1) /* 374150 E00700A0 1E400004 */ bgtz $s2, .LE00700B4 @@ -64,7 +64,7 @@ glabel func_E0070000 /* 37418C E00700DC AC640048 */ sw $a0, 0x48($v1) /* 374190 E00700E0 E4600060 */ swc1 $f0, 0x60($v1) /* 374194 E00700E4 44820000 */ mtc1 $v0, $f0 -/* 374198 E00700E8 00000000 */ nop +/* 374198 E00700E8 00000000 */ nop /* 37419C E00700EC 46800020 */ cvt.s.w $f0, $f0 /* 3741A0 E00700F0 E4600010 */ swc1 $f0, 0x10($v1) /* 3741A4 E00700F4 16600007 */ bnez $s3, .LE0070114 @@ -89,17 +89,17 @@ glabel func_E0070000 /* 3741E8 E0070138 3C0141A0 */ lui $at, 0x41a0 /* 3741EC E007013C 44811000 */ mtc1 $at, $f2 /* 3741F0 E0070140 44820000 */ mtc1 $v0, $f0 -/* 3741F4 E0070144 00000000 */ nop +/* 3741F4 E0070144 00000000 */ nop /* 3741F8 E0070148 46800020 */ cvt.s.w $f0, $f0 /* 3741FC E007014C 0801C05D */ j .LE0070174 /* 374200 E0070150 46001083 */ div.s $f2, $f2, $f0 .LE0070154: /* 374204 E0070154 44920000 */ mtc1 $s2, $f0 -/* 374208 E0070158 00000000 */ nop +/* 374208 E0070158 00000000 */ nop /* 37420C E007015C 46800020 */ cvt.s.w $f0, $f0 /* 374210 E0070160 2622FFFF */ addiu $v0, $s1, -1 /* 374214 E0070164 44821000 */ mtc1 $v0, $f2 -/* 374218 E0070168 00000000 */ nop +/* 374218 E0070168 00000000 */ nop /* 37421C E007016C 468010A0 */ cvt.s.w $f2, $f2 /* 374220 E0070170 46020083 */ div.s $f2, $f0, $f2 .LE0070174: @@ -109,15 +109,15 @@ glabel func_E0070000 /* 374230 E0070180 0200102D */ daddu $v0, $s0, $zero .LE0070184: /* 374234 E0070184 44840000 */ mtc1 $a0, $f0 -/* 374238 E0070188 00000000 */ nop +/* 374238 E0070188 00000000 */ nop /* 37423C E007018C 46800020 */ cvt.s.w $f0, $f0 /* 374240 E0070190 46000007 */ neg.s $f0, $f0 /* 374244 E0070194 46020002 */ mul.s $f0, $f0, $f2 -/* 374248 E0070198 00000000 */ nop +/* 374248 E0070198 00000000 */ nop /* 37424C E007019C 24840001 */ addiu $a0, $a0, 1 /* 374250 E00701A0 4600010D */ trunc.w.s $f4, $f0 /* 374254 E00701A4 44022000 */ mfc1 $v0, $f4 -/* 374258 E00701A8 00000000 */ nop +/* 374258 E00701A8 00000000 */ nop /* 37425C E00701AC 2442FFFF */ addiu $v0, $v0, -1 /* 374260 E00701B0 AC620030 */ sw $v0, 0x30($v1) /* 374264 E00701B4 0091102A */ slt $v0, $a0, $s1 diff --git a/asm/nonmatchings/code_3740B0/func_E00701EC.s b/asm/nonmatchings/code_3740B0/func_E00701EC.s index 167655b808..f70e1fee76 100644 --- a/asm/nonmatchings/code_3740B0/func_E00701EC.s +++ b/asm/nonmatchings/code_3740B0/func_E00701EC.s @@ -3,4 +3,4 @@ glabel func_E00701EC /* 37429C E00701EC 03E00008 */ jr $ra -/* 3742A0 E00701F0 00000000 */ nop +/* 3742A0 E00701F0 00000000 */ nop diff --git a/asm/nonmatchings/code_3740B0/func_E00701F4.s b/asm/nonmatchings/code_3740B0/func_E00701F4.s index 8bba5923f0..9d5b0b7286 100644 --- a/asm/nonmatchings/code_3740B0/func_E00701F4.s +++ b/asm/nonmatchings/code_3740B0/func_E00701F4.s @@ -41,7 +41,7 @@ glabel func_E00701F4 /* 37432C E007027C 0C080128 */ jal func_E02004A0 /* 374330 E0070280 0240202D */ daddu $a0, $s2, $zero /* 374334 E0070284 0801C1AE */ j .LE00706B8 -/* 374338 E0070288 00000000 */ nop +/* 374338 E0070288 00000000 */ nop .LE007028C: /* 37433C E007028C 28820008 */ slti $v0, $a0, 8 /* 374340 E0070290 10400002 */ beqz $v0, .LE007029C @@ -75,17 +75,17 @@ glabel func_E00701F4 /* 3743A4 E00702F4 044200EC */ bltzl $v0, .LE00706A8 /* 3743A8 E00702F8 26310001 */ addiu $s1, $s1, 1 /* 3743AC E00702FC 144000A6 */ bnez $v0, .LE0070598 -/* 3743B0 E0070300 00000000 */ nop +/* 3743B0 E0070300 00000000 */ nop /* 3743B4 E0070304 0C080138 */ jal func_E02004E0 /* 3743B8 E0070308 24040167 */ addiu $a0, $zero, 0x167 /* 3743BC E007030C 24040167 */ addiu $a0, $zero, 0x167 /* 3743C0 E0070310 4482C000 */ mtc1 $v0, $f24 -/* 3743C4 E0070314 00000000 */ nop +/* 3743C4 E0070314 00000000 */ nop /* 3743C8 E0070318 4680C620 */ cvt.s.w $f24, $f24 /* 3743CC E007031C 0C080138 */ jal func_E02004E0 /* 3743D0 E0070320 E7B80018 */ swc1 $f24, 0x18($sp) /* 3743D4 E0070324 4482B000 */ mtc1 $v0, $f22 -/* 3743D8 E0070328 00000000 */ nop +/* 3743D8 E0070328 00000000 */ nop /* 3743DC E007032C 1680003F */ bnez $s4, .LE007042C /* 3743E0 E0070330 4680B5A0 */ cvt.s.w $f22, $f22 /* 3743E4 E0070334 0C080140 */ jal func_E0200500 @@ -94,9 +94,9 @@ glabel func_E00701F4 /* 3743F0 E0070340 0C080144 */ jal func_E0200510 /* 3743F4 E0070344 46000506 */ mov.s $f20, $f0 /* 3743F8 E0070348 4614D502 */ mul.s $f20, $f26, $f20 -/* 3743FC E007034C 00000000 */ nop +/* 3743FC E007034C 00000000 */ nop /* 374400 E0070350 4600A502 */ mul.s $f20, $f20, $f0 -/* 374404 E0070354 00000000 */ nop +/* 374404 E0070354 00000000 */ nop /* 374408 E0070358 C7AC0018 */ lwc1 $f12, 0x18($sp) /* 37440C E007035C 0C080144 */ jal func_E0200510 /* 374410 E0070360 E614FFE4 */ swc1 $f20, -0x1c($s0) @@ -105,9 +105,9 @@ glabel func_E00701F4 /* 37441C E007036C 46000506 */ mov.s $f20, $f0 /* 374420 E0070370 C7B80010 */ lwc1 $f24, 0x10($sp) /* 374424 E0070374 4614C502 */ mul.s $f20, $f24, $f20 -/* 374428 E0070378 00000000 */ nop +/* 374428 E0070378 00000000 */ nop /* 37442C E007037C 4600A502 */ mul.s $f20, $f20, $f0 -/* 374430 E0070380 00000000 */ nop +/* 374430 E0070380 00000000 */ nop /* 374434 E0070384 4600B306 */ mov.s $f12, $f22 /* 374438 E0070388 0C080140 */ jal func_E0200500 /* 37443C E007038C E614FFE8 */ swc1 $f20, -0x18($s0) @@ -116,17 +116,17 @@ glabel func_E00701F4 /* 374448 E0070398 D4380D70 */ ldc1 $f24, %lo(D_E0070D70)($at) /* 37444C E007039C 460010A1 */ cvt.d.s $f2, $f2 /* 374450 E00703A0 46381082 */ mul.d $f2, $f2, $f24 -/* 374454 E00703A4 00000000 */ nop +/* 374454 E00703A4 00000000 */ nop /* 374458 E00703A8 C604FFE8 */ lwc1 $f4, -0x18($s0) /* 37445C E00703AC 46002121 */ cvt.d.s $f4, $f4 /* 374460 E00703B0 46382102 */ mul.d $f4, $f4, $f24 -/* 374464 E00703B4 00000000 */ nop +/* 374464 E00703B4 00000000 */ nop /* 374468 E00703B8 4600D002 */ mul.s $f0, $f26, $f0 -/* 37446C E00703BC 00000000 */ nop +/* 37446C E00703BC 00000000 */ nop /* 374470 E00703C0 E600FFEC */ swc1 $f0, -0x14($s0) /* 374474 E00703C4 46000021 */ cvt.d.s $f0, $f0 /* 374478 E00703C8 46380002 */ mul.d $f0, $f0, $f24 -/* 37447C E00703CC 00000000 */ nop +/* 37447C E00703CC 00000000 */ nop /* 374480 E00703D0 3C01E007 */ lui $at, %hi(D_E0070D78) /* 374484 E00703D4 D4380D78 */ ldc1 $f24, %lo(D_E0070D78)($at) /* 374488 E00703D8 462010A0 */ cvt.s.d $f2, $f2 @@ -134,18 +134,18 @@ glabel func_E00701F4 /* 374490 E00703E0 46001186 */ mov.s $f6, $f2 /* 374494 E00703E4 460031A1 */ cvt.d.s $f6, $f6 /* 374498 E00703E8 46383182 */ mul.d $f6, $f6, $f24 -/* 37449C E00703EC 00000000 */ nop +/* 37449C E00703EC 00000000 */ nop /* 3744A0 E00703F0 46202120 */ cvt.s.d $f4, $f4 /* 3744A4 E00703F4 E604FFFC */ swc1 $f4, -4($s0) /* 3744A8 E00703F8 46002086 */ mov.s $f2, $f4 /* 3744AC E00703FC 460010A1 */ cvt.d.s $f2, $f2 /* 3744B0 E0070400 46381082 */ mul.d $f2, $f2, $f24 -/* 3744B4 E0070404 00000000 */ nop +/* 3744B4 E0070404 00000000 */ nop /* 3744B8 E0070408 46200020 */ cvt.s.d $f0, $f0 /* 3744BC E007040C E6000000 */ swc1 $f0, ($s0) /* 3744C0 E0070410 46000021 */ cvt.d.s $f0, $f0 /* 3744C4 E0070414 46380002 */ mul.d $f0, $f0, $f24 -/* 3744C8 E0070418 00000000 */ nop +/* 3744C8 E0070418 00000000 */ nop /* 3744CC E007041C 462031A0 */ cvt.s.d $f6, $f6 /* 3744D0 E0070420 462010A0 */ cvt.s.d $f2, $f2 /* 3744D4 E0070424 0801C154 */ j .LE0070550 @@ -158,9 +158,9 @@ glabel func_E00701F4 /* 3744EC E007043C 4480C000 */ mtc1 $zero, $f24 /* 3744F0 E0070440 4600D521 */ cvt.d.s $f20, $f26 /* 3744F4 E0070444 4638A502 */ mul.d $f20, $f20, $f24 -/* 3744F8 E0070448 00000000 */ nop +/* 3744F8 E0070448 00000000 */ nop /* 3744FC E007044C 44820000 */ mtc1 $v0, $f0 -/* 374500 E0070450 00000000 */ nop +/* 374500 E0070450 00000000 */ nop /* 374504 E0070454 46800021 */ cvt.d.w $f0, $f0 /* 374508 E0070458 C7B80010 */ lwc1 $f24, 0x10($sp) /* 37450C E007045C 46340001 */ sub.d $f0, $f0, $f20 @@ -174,11 +174,11 @@ glabel func_E00701F4 /* 37452C E007047C 3C013FE0 */ lui $at, 0x3fe0 /* 374530 E0070480 4481C800 */ mtc1 $at, $f25 /* 374534 E0070484 4480C000 */ mtc1 $zero, $f24 -/* 374538 E0070488 00000000 */ nop +/* 374538 E0070488 00000000 */ nop /* 37453C E007048C 46381082 */ mul.d $f2, $f2, $f24 -/* 374540 E0070490 00000000 */ nop +/* 374540 E0070490 00000000 */ nop /* 374544 E0070494 44820000 */ mtc1 $v0, $f0 -/* 374548 E0070498 00000000 */ nop +/* 374548 E0070498 00000000 */ nop /* 37454C E007049C 46800021 */ cvt.d.w $f0, $f0 /* 374550 E00704A0 46220001 */ sub.d $f0, $f0, $f2 /* 374554 E00704A4 0260202D */ daddu $a0, $s3, $zero @@ -190,37 +190,37 @@ glabel func_E00701F4 /* 37456C E00704BC D4380D80 */ ldc1 $f24, %lo(D_E0070D80)($at) /* 374570 E00704C0 460010A1 */ cvt.d.s $f2, $f2 /* 374574 E00704C4 46381082 */ mul.d $f2, $f2, $f24 -/* 374578 E00704C8 00000000 */ nop +/* 374578 E00704C8 00000000 */ nop /* 37457C E00704CC C606FFE8 */ lwc1 $f6, -0x18($s0) /* 374580 E00704D0 460031A1 */ cvt.d.s $f6, $f6 /* 374584 E00704D4 46383182 */ mul.d $f6, $f6, $f24 -/* 374588 E00704D8 00000000 */ nop +/* 374588 E00704D8 00000000 */ nop /* 37458C E00704DC 44820000 */ mtc1 $v0, $f0 -/* 374590 E00704E0 00000000 */ nop +/* 374590 E00704E0 00000000 */ nop /* 374594 E00704E4 46800021 */ cvt.d.w $f0, $f0 /* 374598 E00704E8 46340001 */ sub.d $f0, $f0, $f20 /* 37459C E00704EC 46200020 */ cvt.s.d $f0, $f0 /* 3745A0 E00704F0 E600FFEC */ swc1 $f0, -0x14($s0) /* 3745A4 E00704F4 46000021 */ cvt.d.s $f0, $f0 /* 3745A8 E00704F8 46380002 */ mul.d $f0, $f0, $f24 -/* 3745AC E00704FC 00000000 */ nop +/* 3745AC E00704FC 00000000 */ nop /* 3745B0 E0070500 462010A0 */ cvt.s.d $f2, $f2 /* 3745B4 E0070504 E602FFF8 */ swc1 $f2, -8($s0) /* 3745B8 E0070508 46001106 */ mov.s $f4, $f2 /* 3745BC E007050C 46002121 */ cvt.d.s $f4, $f4 /* 3745C0 E0070510 463E2102 */ mul.d $f4, $f4, $f30 -/* 3745C4 E0070514 00000000 */ nop +/* 3745C4 E0070514 00000000 */ nop /* 3745C8 E0070518 462031A0 */ cvt.s.d $f6, $f6 /* 3745CC E007051C E606FFFC */ swc1 $f6, -4($s0) /* 3745D0 E0070520 46003086 */ mov.s $f2, $f6 /* 3745D4 E0070524 460010A1 */ cvt.d.s $f2, $f2 /* 3745D8 E0070528 463E1082 */ mul.d $f2, $f2, $f30 -/* 3745DC E007052C 00000000 */ nop +/* 3745DC E007052C 00000000 */ nop /* 3745E0 E0070530 46200020 */ cvt.s.d $f0, $f0 /* 3745E4 E0070534 E6000000 */ swc1 $f0, ($s0) /* 3745E8 E0070538 46000021 */ cvt.d.s $f0, $f0 /* 3745EC E007053C 463E0002 */ mul.d $f0, $f0, $f30 -/* 3745F0 E0070540 00000000 */ nop +/* 3745F0 E0070540 00000000 */ nop /* 3745F4 E0070544 46202120 */ cvt.s.d $f4, $f4 /* 3745F8 E0070548 462010A0 */ cvt.s.d $f2, $f2 /* 3745FC E007054C E6040004 */ swc1 $f4, 4($s0) @@ -232,12 +232,12 @@ glabel func_E00701F4 /* 374610 E0070560 2404000F */ addiu $a0, $zero, 0xf /* 374614 E0070564 2404000F */ addiu $a0, $zero, 0xf /* 374618 E0070568 44820000 */ mtc1 $v0, $f0 -/* 37461C E007056C 00000000 */ nop +/* 37461C E007056C 00000000 */ nop /* 374620 E0070570 46800020 */ cvt.s.w $f0, $f0 /* 374624 E0070574 0C080138 */ jal func_E02004E0 /* 374628 E0070578 E6000044 */ swc1 $f0, 0x44($s0) /* 37462C E007057C 44820000 */ mtc1 $v0, $f0 -/* 374630 E0070580 00000000 */ nop +/* 374630 E0070580 00000000 */ nop /* 374634 E0070584 46800020 */ cvt.s.w $f0, $f0 /* 374638 E0070588 240200FF */ addiu $v0, $zero, 0xff /* 37463C E007058C E6000048 */ swc1 $f0, 0x48($s0) @@ -249,19 +249,19 @@ glabel func_E00701F4 /* 374650 E00705A0 46105281 */ sub.s $f10, $f10, $f16 /* 374654 E00705A4 460052A1 */ cvt.d.s $f10, $f10 /* 374658 E00705A8 463C5282 */ mul.d $f10, $f10, $f28 -/* 37465C E00705AC 00000000 */ nop +/* 37465C E00705AC 00000000 */ nop /* 374660 E00705B0 C60EFFFC */ lwc1 $f14, -4($s0) /* 374664 E00705B4 C60C0008 */ lwc1 $f12, 8($s0) /* 374668 E00705B8 460E6301 */ sub.s $f12, $f12, $f14 /* 37466C E00705BC 46006321 */ cvt.d.s $f12, $f12 /* 374670 E00705C0 463C6302 */ mul.d $f12, $f12, $f28 -/* 374674 E00705C4 00000000 */ nop +/* 374674 E00705C4 00000000 */ nop /* 374678 E00705C8 C6060000 */ lwc1 $f6, ($s0) /* 37467C E00705CC C608000C */ lwc1 $f8, 0xc($s0) /* 374680 E00705D0 46064201 */ sub.s $f8, $f8, $f6 /* 374684 E00705D4 46004221 */ cvt.d.s $f8, $f8 /* 374688 E00705D8 463C4202 */ mul.d $f8, $f8, $f28 -/* 37468C E00705DC 00000000 */ nop +/* 37468C E00705DC 00000000 */ nop /* 374690 E00705E0 8E020010 */ lw $v0, 0x10($s0) /* 374694 E00705E4 C6160014 */ lwc1 $f22, 0x14($s0) /* 374698 E00705E8 3C014080 */ lui $at, 0x4080 diff --git a/asm/nonmatchings/code_3740B0/func_E0070738.s b/asm/nonmatchings/code_3740B0/func_E0070738.s index 9b5601f86c..4016871943 100644 --- a/asm/nonmatchings/code_3740B0/func_E0070738.s +++ b/asm/nonmatchings/code_3740B0/func_E0070738.s @@ -3,4 +3,4 @@ glabel func_E0070738 /* 3747E8 E0070738 03E00008 */ jr $ra -/* 3747EC E007073C 00000000 */ nop +/* 3747EC E007073C 00000000 */ nop diff --git a/asm/nonmatchings/code_3740B0/func_E0070740.s b/asm/nonmatchings/code_3740B0/func_E0070740.s index 019ccfba9f..98cffbd592 100644 --- a/asm/nonmatchings/code_3740B0/func_E0070740.s +++ b/asm/nonmatchings/code_3740B0/func_E0070740.s @@ -147,10 +147,10 @@ glabel func_E0070740 .LE0070978: /* 374A28 E0070978 8E02FFE4 */ lw $v0, -0x1c($s0) /* 374A2C E007097C 04400052 */ bltz $v0, .LE0070AC8 -/* 374A30 E0070980 00000000 */ nop +/* 374A30 E0070980 00000000 */ nop /* 374A34 E0070984 C6000014 */ lwc1 $f0, 0x14($s0) /* 374A38 E0070988 46140002 */ mul.s $f0, $f0, $f20 -/* 374A3C E007098C 00000000 */ nop +/* 374A3C E007098C 00000000 */ nop /* 374A40 E0070990 4405C000 */ mfc1 $a1, $f24 /* 374A44 E0070994 4406C000 */ mfc1 $a2, $f24 /* 374A48 E0070998 E7A00010 */ swc1 $f0, 0x10($sp) @@ -189,12 +189,12 @@ glabel func_E0070740 /* 374ACC E0070A1C C6000000 */ lwc1 $f0, ($s0) /* 374AD0 E0070A20 46800020 */ cvt.s.w $f0, $f0 /* 374AD4 E0070A24 46140002 */ mul.s $f0, $f0, $f20 -/* 374AD8 E0070A28 00000000 */ nop +/* 374AD8 E0070A28 00000000 */ nop /* 374ADC E0070A2C 24820008 */ addiu $v0, $a0, 8 /* 374AE0 E0070A30 24840004 */ addiu $a0, $a0, 4 /* 374AE4 E0070A34 A6E50000 */ sh $a1, ($s7) /* 374AE8 E0070A38 4600B03E */ c.le.s $f22, $f0 -/* 374AEC E0070A3C 00000000 */ nop +/* 374AEC E0070A3C 00000000 */ nop /* 374AF0 E0070A40 45010005 */ bc1t .LE0070A58 /* 374AF4 E0070A44 AE220000 */ sw $v0, ($s1) /* 374AF8 E0070A48 4600010D */ trunc.w.s $f4, $f0 @@ -206,7 +206,7 @@ glabel func_E0070740 /* 374B0C E0070A5C 3C028000 */ lui $v0, 0x8000 /* 374B10 E0070A60 4600010D */ trunc.w.s $f4, $f0 /* 374B14 E0070A64 44052000 */ mfc1 $a1, $f4 -/* 374B18 E0070A68 00000000 */ nop +/* 374B18 E0070A68 00000000 */ nop /* 374B1C E0070A6C 00A22825 */ or $a1, $a1, $v0 /* 374B20 E0070A70 3C06D838 */ lui $a2, 0xd838 .LE0070A74: diff --git a/asm/nonmatchings/code_374E50/func_E0072000.s b/asm/nonmatchings/code_374E50/func_E0072000.s index ec8c0e451c..087a28c5a8 100644 --- a/asm/nonmatchings/code_374E50/func_E0072000.s +++ b/asm/nonmatchings/code_374E50/func_E0072000.s @@ -38,7 +38,7 @@ glabel func_E0072000 /* 374ED4 E0072084 AE02000C */ sw $v0, 0xc($s0) .LE0072088: /* 374ED8 E0072088 0801C822 */ j .LE0072088 -/* 374EDC E007208C 00000000 */ nop +/* 374EDC E007208C 00000000 */ nop .LE0072090: /* 374EE0 E0072090 240300FF */ addiu $v1, $zero, 0xff /* 374EE4 E0072094 AC910000 */ sw $s1, ($a0) @@ -65,7 +65,7 @@ glabel func_E0072000 /* 374F38 E00720E8 44812000 */ mtc1 $at, $f4 /* 374F3C E00720EC 46000021 */ cvt.d.s $f0, $f0 /* 374F40 E00720F0 46220002 */ mul.d $f0, $f0, $f2 -/* 374F44 E00720F4 00000000 */ nop +/* 374F44 E00720F4 00000000 */ nop /* 374F48 E00720F8 3C013F80 */ lui $at, 0x3f80 /* 374F4C E00720FC 44813000 */ mtc1 $at, $f6 /* 374F50 E0072100 3C01BF8C */ lui $at, 0xbf8c diff --git a/asm/nonmatchings/code_374E50/func_E0072148.s b/asm/nonmatchings/code_374E50/func_E0072148.s index 12432672aa..8327a444b4 100644 --- a/asm/nonmatchings/code_374E50/func_E0072148.s +++ b/asm/nonmatchings/code_374E50/func_E0072148.s @@ -3,4 +3,4 @@ glabel func_E0072148 /* 374F98 E0072148 03E00008 */ jr $ra -/* 374F9C E007214C 00000000 */ nop +/* 374F9C E007214C 00000000 */ nop diff --git a/asm/nonmatchings/code_374E50/func_E0072150.s b/asm/nonmatchings/code_374E50/func_E0072150.s index 88b509de55..74c658e690 100644 --- a/asm/nonmatchings/code_374E50/func_E0072150.s +++ b/asm/nonmatchings/code_374E50/func_E0072150.s @@ -18,18 +18,18 @@ glabel func_E0072150 /* 374FD4 E0072184 06410005 */ bgez $s2, .LE007219C /* 374FD8 E0072188 AE11002C */ sw $s1, 0x2c($s0) /* 374FDC E007218C 0C080128 */ jal func_E02004A0 -/* 374FE0 E0072190 00000000 */ nop +/* 374FE0 E0072190 00000000 */ nop /* 374FE4 E0072194 0801C8DC */ j .LE0072370 -/* 374FE8 E0072198 00000000 */ nop +/* 374FE8 E0072198 00000000 */ nop .LE007219C: /* 374FEC E007219C 32220001 */ andi $v0, $s1, 1 /* 374FF0 E00721A0 1040001E */ beqz $v0, .LE007221C -/* 374FF4 E00721A4 00000000 */ nop +/* 374FF4 E00721A4 00000000 */ nop /* 374FF8 E00721A8 24040168 */ addiu $a0, $zero, 0x168 /* 374FFC E00721AC 0C080011 */ jal func_E0200044 /* 375000 E00721B0 0220282D */ daddu $a1, $s1, $zero /* 375004 E00721B4 4482A000 */ mtc1 $v0, $f20 -/* 375008 E00721B8 00000000 */ nop +/* 375008 E00721B8 00000000 */ nop /* 37500C E00721BC 4680A520 */ cvt.s.w $f20, $f20 /* 375010 E00721C0 0C080140 */ jal func_E0200500 /* 375014 E00721C4 4600A306 */ mov.s $f12, $f20 @@ -39,7 +39,7 @@ glabel func_E0072150 /* 375024 E00721D4 2404003A */ addiu $a0, $zero, 0x3a /* 375028 E00721D8 001110C0 */ sll $v0, $s1, 3 /* 37502C E00721DC 44820000 */ mtc1 $v0, $f0 -/* 375030 E00721E0 00000000 */ nop +/* 375030 E00721E0 00000000 */ nop /* 375034 E00721E4 46800020 */ cvt.s.w $f0, $f0 /* 375038 E00721E8 E7A00010 */ swc1 $f0, 0x10($sp) /* 37503C E00721EC 3C014120 */ lui $at, 0x4120 @@ -93,59 +93,59 @@ glabel func_E0072150 .LE00722A4: /* 3750F4 E00722A4 C6000034 */ lwc1 $f0, 0x34($s0) /* 3750F8 E00722A8 4600403C */ c.lt.s $f8, $f0 -/* 3750FC E00722AC 00000000 */ nop +/* 3750FC E00722AC 00000000 */ nop /* 375100 E00722B0 45000003 */ bc1f .LE00722C0 -/* 375104 E00722B4 00000000 */ nop +/* 375104 E00722B4 00000000 */ nop /* 375108 E00722B8 46080001 */ sub.s $f0, $f0, $f8 /* 37510C E00722BC E6000034 */ swc1 $f0, 0x34($s0) .LE00722C0: /* 375110 E00722C0 C6000038 */ lwc1 $f0, 0x38($s0) /* 375114 E00722C4 4600403C */ c.lt.s $f8, $f0 -/* 375118 E00722C8 00000000 */ nop +/* 375118 E00722C8 00000000 */ nop /* 37511C E00722CC 45000003 */ bc1f .LE00722DC -/* 375120 E00722D0 00000000 */ nop +/* 375120 E00722D0 00000000 */ nop /* 375124 E00722D4 46080001 */ sub.s $f0, $f0, $f8 /* 375128 E00722D8 E6000038 */ swc1 $f0, 0x38($s0) .LE00722DC: /* 37512C E00722DC C600003C */ lwc1 $f0, 0x3c($s0) /* 375130 E00722E0 4600403C */ c.lt.s $f8, $f0 -/* 375134 E00722E4 00000000 */ nop +/* 375134 E00722E4 00000000 */ nop /* 375138 E00722E8 45000003 */ bc1f .LE00722F8 -/* 37513C E00722EC 00000000 */ nop +/* 37513C E00722EC 00000000 */ nop /* 375140 E00722F0 46080001 */ sub.s $f0, $f0, $f8 /* 375144 E00722F4 E600003C */ swc1 $f0, 0x3c($s0) .LE00722F8: /* 375148 E00722F8 C6000030 */ lwc1 $f0, 0x30($s0) /* 37514C E00722FC 44801000 */ mtc1 $zero, $f2 -/* 375150 E0072300 00000000 */ nop +/* 375150 E0072300 00000000 */ nop /* 375154 E0072304 4602003C */ c.lt.s $f0, $f2 -/* 375158 E0072308 00000000 */ nop +/* 375158 E0072308 00000000 */ nop /* 37515C E007230C 45000003 */ bc1f .LE007231C -/* 375160 E0072310 00000000 */ nop +/* 375160 E0072310 00000000 */ nop /* 375164 E0072314 46080000 */ add.s $f0, $f0, $f8 /* 375168 E0072318 E6000030 */ swc1 $f0, 0x30($s0) .LE007231C: /* 37516C E007231C C6000034 */ lwc1 $f0, 0x34($s0) /* 375170 E0072320 4602003C */ c.lt.s $f0, $f2 -/* 375174 E0072324 00000000 */ nop +/* 375174 E0072324 00000000 */ nop /* 375178 E0072328 45000003 */ bc1f .LE0072338 -/* 37517C E007232C 00000000 */ nop +/* 37517C E007232C 00000000 */ nop /* 375180 E0072330 46080000 */ add.s $f0, $f0, $f8 /* 375184 E0072334 E6000034 */ swc1 $f0, 0x34($s0) .LE0072338: /* 375188 E0072338 C6000038 */ lwc1 $f0, 0x38($s0) /* 37518C E007233C 4602003C */ c.lt.s $f0, $f2 -/* 375190 E0072340 00000000 */ nop +/* 375190 E0072340 00000000 */ nop /* 375194 E0072344 45000003 */ bc1f .LE0072354 -/* 375198 E0072348 00000000 */ nop +/* 375198 E0072348 00000000 */ nop /* 37519C E007234C 46080000 */ add.s $f0, $f0, $f8 /* 3751A0 E0072350 E6000038 */ swc1 $f0, 0x38($s0) .LE0072354: /* 3751A4 E0072354 C600003C */ lwc1 $f0, 0x3c($s0) /* 3751A8 E0072358 4602003C */ c.lt.s $f0, $f2 -/* 3751AC E007235C 00000000 */ nop +/* 3751AC E007235C 00000000 */ nop /* 3751B0 E0072360 45000003 */ bc1f .LE0072370 -/* 3751B4 E0072364 00000000 */ nop +/* 3751B4 E0072364 00000000 */ nop /* 3751B8 E0072368 46080000 */ add.s $f0, $f0, $f8 /* 3751BC E007236C E600003C */ swc1 $f0, 0x3c($s0) .LE0072370: diff --git a/asm/nonmatchings/code_374E50/func_E00723D4.s b/asm/nonmatchings/code_374E50/func_E00723D4.s index fdc2facfc7..5290b0e34f 100644 --- a/asm/nonmatchings/code_374E50/func_E00723D4.s +++ b/asm/nonmatchings/code_374E50/func_E00723D4.s @@ -64,13 +64,13 @@ glabel func_E00723D4 /* 375310 E00724C0 AD02001C */ sw $v0, 0x1c($t0) /* 375314 E00724C4 C6020030 */ lwc1 $f2, 0x30($s0) /* 375318 E00724C8 46041082 */ mul.s $f2, $f2, $f4 -/* 37531C E00724CC 00000000 */ nop +/* 37531C E00724CC 00000000 */ nop /* 375320 E00724D0 3C130001 */ lui $s3, 1 /* 375324 E00724D4 36731630 */ ori $s3, $s3, 0x1630 /* 375328 E00724D8 C6000034 */ lwc1 $f0, 0x34($s0) /* 37532C E00724DC 3C07F200 */ lui $a3, 0xf200 /* 375330 E00724E0 46040002 */ mul.s $f0, $f0, $f4 -/* 375334 E00724E4 00000000 */ nop +/* 375334 E00724E4 00000000 */ nop /* 375338 E00724E8 27A40010 */ addiu $a0, $sp, 0x10 /* 37533C E00724EC 25020028 */ addiu $v0, $t0, 0x28 /* 375340 E00724F0 AE220000 */ sw $v0, ($s1) @@ -87,13 +87,13 @@ glabel func_E00723D4 /* 37536C E007251C C6000038 */ lwc1 $f0, 0x38($s0) /* 375370 E0072520 30420FFF */ andi $v0, $v0, 0xfff /* 375374 E0072524 46040002 */ mul.s $f0, $f0, $f4 -/* 375378 E0072528 00000000 */ nop +/* 375378 E0072528 00000000 */ nop /* 37537C E007252C 00021300 */ sll $v0, $v0, 0xc /* 375380 E0072530 24C600FC */ addiu $a2, $a2, 0xfc /* 375384 E0072534 C602003C */ lwc1 $f2, 0x3c($s0) /* 375388 E0072538 30C60FFF */ andi $a2, $a2, 0xfff /* 37538C E007253C 46041082 */ mul.s $f2, $f2, $f4 -/* 375390 E0072540 00000000 */ nop +/* 375390 E0072540 00000000 */ nop /* 375394 E0072544 00461025 */ or $v0, $v0, $a2 /* 375398 E0072548 AD050020 */ sw $a1, 0x20($t0) /* 37539C E007254C AD020024 */ sw $v0, 0x24($t0) @@ -184,4 +184,4 @@ glabel func_E00723D4 /* 3754F0 E00726A0 8FB00090 */ lw $s0, 0x90($sp) /* 3754F4 E00726A4 03E00008 */ jr $ra /* 3754F8 E00726A8 27BD00B0 */ addiu $sp, $sp, 0xb0 -/* 3754FC E00726AC 00000000 */ nop +/* 3754FC E00726AC 00000000 */ nop diff --git a/asm/nonmatchings/code_376460/func_E0074000.s b/asm/nonmatchings/code_376460/func_E0074000.s index 2b8f8775a5..f62cd94fad 100644 --- a/asm/nonmatchings/code_376460/func_E0074000.s +++ b/asm/nonmatchings/code_376460/func_E0074000.s @@ -46,7 +46,7 @@ glabel func_E0074000 /* 376504 E00740A4 AE24000C */ sw $a0, 0xc($s1) .LE00740A8: /* 376508 E00740A8 0801D02A */ j .LE00740A8 -/* 37650C E00740AC 00000000 */ nop +/* 37650C E00740AC 00000000 */ nop .LE00740B0: /* 376510 E00740B0 AC930000 */ sw $s3, ($a0) /* 376514 E00740B4 1E400004 */ bgtz $s2, .LE00740C8 @@ -84,17 +84,17 @@ glabel func_E0074000 /* 37658C E007412C 3C0141A0 */ lui $at, 0x41a0 /* 376590 E0074130 44811000 */ mtc1 $at, $f2 /* 376594 E0074134 44820000 */ mtc1 $v0, $f0 -/* 376598 E0074138 00000000 */ nop +/* 376598 E0074138 00000000 */ nop /* 37659C E007413C 46800020 */ cvt.s.w $f0, $f0 /* 3765A0 E0074140 0801D05A */ j .LE0074168 /* 3765A4 E0074144 46001083 */ div.s $f2, $f2, $f0 .LE0074148: /* 3765A8 E0074148 44920000 */ mtc1 $s2, $f0 -/* 3765AC E007414C 00000000 */ nop +/* 3765AC E007414C 00000000 */ nop /* 3765B0 E0074150 46800020 */ cvt.s.w $f0, $f0 /* 3765B4 E0074154 2602FFFF */ addiu $v0, $s0, -1 /* 3765B8 E0074158 44821000 */ mtc1 $v0, $f2 -/* 3765BC E007415C 00000000 */ nop +/* 3765BC E007415C 00000000 */ nop /* 3765C0 E0074160 468010A0 */ cvt.s.w $f2, $f2 /* 3765C4 E0074164 46020083 */ div.s $f2, $f0, $f2 .LE0074168: @@ -104,15 +104,15 @@ glabel func_E0074000 /* 3765D4 E0074174 0220102D */ daddu $v0, $s1, $zero .LE0074178: /* 3765D8 E0074178 44830000 */ mtc1 $v1, $f0 -/* 3765DC E007417C 00000000 */ nop +/* 3765DC E007417C 00000000 */ nop /* 3765E0 E0074180 46800020 */ cvt.s.w $f0, $f0 /* 3765E4 E0074184 46000007 */ neg.s $f0, $f0 /* 3765E8 E0074188 46020002 */ mul.s $f0, $f0, $f2 -/* 3765EC E007418C 00000000 */ nop +/* 3765EC E007418C 00000000 */ nop /* 3765F0 E0074190 24630001 */ addiu $v1, $v1, 1 /* 3765F4 E0074194 4600010D */ trunc.w.s $f4, $f0 /* 3765F8 E0074198 44022000 */ mfc1 $v0, $f4 -/* 3765FC E007419C 00000000 */ nop +/* 3765FC E007419C 00000000 */ nop /* 376600 E00741A0 2442FFFF */ addiu $v0, $v0, -1 /* 376604 E00741A4 AC820030 */ sw $v0, 0x30($a0) /* 376608 E00741A8 0070102A */ slt $v0, $v1, $s0 diff --git a/asm/nonmatchings/code_376460/func_E00741E0.s b/asm/nonmatchings/code_376460/func_E00741E0.s index b38d781191..e38edfbbcf 100644 --- a/asm/nonmatchings/code_376460/func_E00741E0.s +++ b/asm/nonmatchings/code_376460/func_E00741E0.s @@ -3,4 +3,4 @@ glabel func_E00741E0 /* 376640 E00741E0 03E00008 */ jr $ra -/* 376644 E00741E4 00000000 */ nop +/* 376644 E00741E4 00000000 */ nop diff --git a/asm/nonmatchings/code_376460/func_E00745E0.s b/asm/nonmatchings/code_376460/func_E00745E0.s index 9a4903a092..a8f09dca5e 100644 --- a/asm/nonmatchings/code_376460/func_E00745E0.s +++ b/asm/nonmatchings/code_376460/func_E00745E0.s @@ -147,10 +147,10 @@ glabel func_E00745E0 .LE0074818: /* 376C78 E0074818 8E02FFE4 */ lw $v0, -0x1c($s0) /* 376C7C E007481C 04400052 */ bltz $v0, .LE0074968 -/* 376C80 E0074820 00000000 */ nop +/* 376C80 E0074820 00000000 */ nop /* 376C84 E0074824 C6000014 */ lwc1 $f0, 0x14($s0) /* 376C88 E0074828 46140002 */ mul.s $f0, $f0, $f20 -/* 376C8C E007482C 00000000 */ nop +/* 376C8C E007482C 00000000 */ nop /* 376C90 E0074830 4405C000 */ mfc1 $a1, $f24 /* 376C94 E0074834 4406C000 */ mfc1 $a2, $f24 /* 376C98 E0074838 E7A00010 */ swc1 $f0, 0x10($sp) @@ -189,12 +189,12 @@ glabel func_E00745E0 /* 376D1C E00748BC C6000000 */ lwc1 $f0, ($s0) /* 376D20 E00748C0 46800020 */ cvt.s.w $f0, $f0 /* 376D24 E00748C4 46140002 */ mul.s $f0, $f0, $f20 -/* 376D28 E00748C8 00000000 */ nop +/* 376D28 E00748C8 00000000 */ nop /* 376D2C E00748CC 24820008 */ addiu $v0, $a0, 8 /* 376D30 E00748D0 24840004 */ addiu $a0, $a0, 4 /* 376D34 E00748D4 A6E50000 */ sh $a1, ($s7) /* 376D38 E00748D8 4600B03E */ c.le.s $f22, $f0 -/* 376D3C E00748DC 00000000 */ nop +/* 376D3C E00748DC 00000000 */ nop /* 376D40 E00748E0 45010005 */ bc1t .LE00748F8 /* 376D44 E00748E4 AE220000 */ sw $v0, ($s1) /* 376D48 E00748E8 4600010D */ trunc.w.s $f4, $f0 @@ -206,7 +206,7 @@ glabel func_E00745E0 /* 376D5C E00748FC 3C028000 */ lui $v0, 0x8000 /* 376D60 E0074900 4600010D */ trunc.w.s $f4, $f0 /* 376D64 E0074904 44052000 */ mfc1 $a1, $f4 -/* 376D68 E0074908 00000000 */ nop +/* 376D68 E0074908 00000000 */ nop /* 376D6C E007490C 00A22825 */ or $a1, $a1, $v0 /* 376D70 E0074910 3C06D838 */ lui $a2, 0xd838 .LE0074914: diff --git a/asm/nonmatchings/code_37C540/func_E007A000.s b/asm/nonmatchings/code_37C540/func_E007A000.s index 8ecd812fca..d4fd2188f4 100644 --- a/asm/nonmatchings/code_37C540/func_E007A000.s +++ b/asm/nonmatchings/code_37C540/func_E007A000.s @@ -26,33 +26,33 @@ glabel func_E007A000 /* 37C594 E007A054 1240011D */ beqz $s2, .LE007A4CC /* 37C598 E007A058 AFA700CC */ sw $a3, 0xcc($sp) /* 37C59C E007A05C 4616B002 */ mul.s $f0, $f22, $f22 -/* 37C5A0 E007A060 00000000 */ nop +/* 37C5A0 E007A060 00000000 */ nop /* 37C5A4 E007A064 4618C082 */ mul.s $f2, $f24, $f24 -/* 37C5A8 E007A068 00000000 */ nop +/* 37C5A8 E007A068 00000000 */ nop /* 37C5AC E007A06C 461AD102 */ mul.s $f4, $f26, $f26 -/* 37C5B0 E007A070 00000000 */ nop +/* 37C5B0 E007A070 00000000 */ nop /* 37C5B4 E007A074 46020000 */ add.s $f0, $f0, $f2 /* 37C5B8 E007A078 46040300 */ add.s $f12, $f0, $f4 /* 37C5BC E007A07C 4480A000 */ mtc1 $zero, $f20 -/* 37C5C0 E007A080 00000000 */ nop +/* 37C5C0 E007A080 00000000 */ nop /* 37C5C4 E007A084 46146032 */ c.eq.s $f12, $f20 -/* 37C5C8 E007A088 00000000 */ nop +/* 37C5C8 E007A088 00000000 */ nop /* 37C5CC E007A08C 4501010F */ bc1t .LE007A4CC /* 37C5D0 E007A090 26520001 */ addiu $s2, $s2, 1 /* 37C5D4 E007A094 0C080154 */ jal func_E0200550 -/* 37C5D8 E007A098 00000000 */ nop +/* 37C5D8 E007A098 00000000 */ nop /* 37C5DC E007A09C 3C01BF80 */ lui $at, 0xbf80 /* 37C5E0 E007A0A0 44811000 */ mtc1 $at, $f2 -/* 37C5E4 E007A0A4 00000000 */ nop +/* 37C5E4 E007A0A4 00000000 */ nop /* 37C5E8 E007A0A8 46001303 */ div.s $f12, $f2, $f0 /* 37C5EC E007A0AC 460CB582 */ mul.s $f22, $f22, $f12 -/* 37C5F0 E007A0B0 00000000 */ nop +/* 37C5F0 E007A0B0 00000000 */ nop /* 37C5F4 E007A0B4 460CC602 */ mul.s $f24, $f24, $f12 -/* 37C5F8 E007A0B8 00000000 */ nop +/* 37C5F8 E007A0B8 00000000 */ nop /* 37C5FC E007A0BC 460CD682 */ mul.s $f26, $f26, $f12 -/* 37C600 E007A0C0 00000000 */ nop +/* 37C600 E007A0C0 00000000 */ nop /* 37C604 E007A0C4 4614B032 */ c.eq.s $f22, $f20 -/* 37C608 E007A0C8 00000000 */ nop +/* 37C608 E007A0C8 00000000 */ nop /* 37C60C E007A0CC 45010007 */ bc1t .LE007A0EC /* 37C610 E007A0D0 4600A706 */ mov.s $f28, $f20 /* 37C614 E007A0D4 4600C007 */ neg.s $f0, $f24 @@ -63,7 +63,7 @@ glabel func_E007A000 /* 37C628 E007A0E8 E7AE0070 */ swc1 $f14, 0x70($sp) .LE007A0EC: /* 37C62C E007A0EC 4614C032 */ c.eq.s $f24, $f20 -/* 37C630 E007A0F0 00000000 */ nop +/* 37C630 E007A0F0 00000000 */ nop /* 37C634 E007A0F4 45010007 */ bc1t .LE007A114 /* 37C638 E007A0F8 4600B007 */ neg.s $f0, $f22 /* 37C63C E007A0FC 46180003 */ div.s $f0, $f0, $f24 @@ -79,51 +79,51 @@ glabel func_E007A000 /* 37C660 E007A120 E7B40070 */ swc1 $f20, 0x70($sp) .LE007A124: /* 37C664 E007A124 461EF002 */ mul.s $f0, $f30, $f30 -/* 37C668 E007A128 00000000 */ nop +/* 37C668 E007A128 00000000 */ nop /* 37C66C E007A12C 461CE102 */ mul.s $f4, $f28, $f28 -/* 37C670 E007A130 00000000 */ nop +/* 37C670 E007A130 00000000 */ nop /* 37C674 E007A134 C7B00070 */ lwc1 $f16, 0x70($sp) /* 37C678 E007A138 46008386 */ mov.s $f14, $f16 /* 37C67C E007A13C 460E8082 */ mul.s $f2, $f16, $f14 -/* 37C680 E007A140 00000000 */ nop +/* 37C680 E007A140 00000000 */ nop /* 37C684 E007A144 46020000 */ add.s $f0, $f0, $f2 /* 37C688 E007A148 46040300 */ add.s $f12, $f0, $f4 /* 37C68C E007A14C 44800000 */ mtc1 $zero, $f0 -/* 37C690 E007A150 00000000 */ nop +/* 37C690 E007A150 00000000 */ nop /* 37C694 E007A154 46006032 */ c.eq.s $f12, $f0 -/* 37C698 E007A158 00000000 */ nop +/* 37C698 E007A158 00000000 */ nop /* 37C69C E007A15C 450100DB */ bc1t .LE007A4CC -/* 37C6A0 E007A160 00000000 */ nop +/* 37C6A0 E007A160 00000000 */ nop /* 37C6A4 E007A164 0C080154 */ jal func_E0200550 -/* 37C6A8 E007A168 00000000 */ nop +/* 37C6A8 E007A168 00000000 */ nop /* 37C6AC E007A16C 3C013F80 */ lui $at, 0x3f80 /* 37C6B0 E007A170 44811000 */ mtc1 $at, $f2 -/* 37C6B4 E007A174 00000000 */ nop +/* 37C6B4 E007A174 00000000 */ nop /* 37C6B8 E007A178 46001303 */ div.s $f12, $f2, $f0 /* 37C6BC E007A17C 460CF782 */ mul.s $f30, $f30, $f12 -/* 37C6C0 E007A180 00000000 */ nop +/* 37C6C0 E007A180 00000000 */ nop /* 37C6C4 E007A184 C7B00070 */ lwc1 $f16, 0x70($sp) /* 37C6C8 E007A188 460C8402 */ mul.s $f16, $f16, $f12 -/* 37C6CC E007A18C 00000000 */ nop +/* 37C6CC E007A18C 00000000 */ nop /* 37C6D0 E007A190 460CE702 */ mul.s $f28, $f28, $f12 -/* 37C6D4 E007A194 00000000 */ nop +/* 37C6D4 E007A194 00000000 */ nop /* 37C6D8 E007A198 3C014100 */ lui $at, 0x4100 /* 37C6DC E007A19C 44810000 */ mtc1 $at, $f0 -/* 37C6E0 E007A1A0 00000000 */ nop +/* 37C6E0 E007A1A0 00000000 */ nop /* 37C6E4 E007A1A4 4600B582 */ mul.s $f22, $f22, $f0 -/* 37C6E8 E007A1A8 00000000 */ nop +/* 37C6E8 E007A1A8 00000000 */ nop /* 37C6EC E007A1AC 4600C602 */ mul.s $f24, $f24, $f0 -/* 37C6F0 E007A1B0 00000000 */ nop +/* 37C6F0 E007A1B0 00000000 */ nop /* 37C6F4 E007A1B4 4600D682 */ mul.s $f26, $f26, $f0 -/* 37C6F8 E007A1B8 00000000 */ nop +/* 37C6F8 E007A1B8 00000000 */ nop /* 37C6FC E007A1BC 4600F782 */ mul.s $f30, $f30, $f0 -/* 37C700 E007A1C0 00000000 */ nop +/* 37C700 E007A1C0 00000000 */ nop /* 37C704 E007A1C4 0200202D */ daddu $a0, $s0, $zero /* 37C708 E007A1C8 3C02E008 */ lui $v0, %hi(func_E007A504) /* 37C70C E007A1CC 2442A504 */ addiu $v0, $v0, %lo(func_E007A504) /* 37C710 E007A1D0 AC820008 */ sw $v0, 8($a0) /* 37C714 E007A1D4 46008402 */ mul.s $f16, $f16, $f0 -/* 37C718 E007A1D8 00000000 */ nop +/* 37C718 E007A1D8 00000000 */ nop /* 37C71C E007A1DC 3C02E008 */ lui $v0, %hi(func_E007A50C) /* 37C720 E007A1E0 2442A50C */ addiu $v0, $v0, %lo(func_E007A50C) /* 37C724 E007A1E4 AC82000C */ sw $v0, 0xc($a0) @@ -131,7 +131,7 @@ glabel func_E007A000 /* 37C72C E007A1EC 2442A840 */ addiu $v0, $v0, %lo(func_E007A840) /* 37C730 E007A1F0 AC800000 */ sw $zero, ($a0) /* 37C734 E007A1F4 4600E702 */ mul.s $f28, $f28, $f0 -/* 37C738 E007A1F8 00000000 */ nop +/* 37C738 E007A1F8 00000000 */ nop /* 37C73C E007A1FC E7B00070 */ swc1 $f16, 0x70($sp) /* 37C740 E007A200 AC820010 */ sw $v0, 0x10($a0) /* 37C744 E007A204 2402003D */ addiu $v0, $zero, 0x3d @@ -151,7 +151,7 @@ glabel func_E007A000 /* 37C77C E007A23C AE83000C */ sw $v1, 0xc($s4) .LE007A240: /* 37C780 E007A240 0801E890 */ j .LE007A240 -/* 37C784 E007A244 00000000 */ nop +/* 37C784 E007A244 00000000 */ nop .LE007A248: /* 37C788 E007A248 AC600004 */ sw $zero, 4($v1) /* 37C78C E007A24C AC710000 */ sw $s1, ($v1) @@ -175,7 +175,7 @@ glabel func_E007A000 /* 37C7D4 E007A294 4480A000 */ mtc1 $zero, $f20 .LE007A298: /* 37C7D8 E007A298 44938000 */ mtc1 $s3, $f16 -/* 37C7DC E007A29C 00000000 */ nop +/* 37C7DC E007A29C 00000000 */ nop /* 37C7E0 E007A2A0 46808420 */ cvt.s.w $f16, $f16 /* 37C7E4 E007A2A4 4406B000 */ mfc1 $a2, $f22 /* 37C7E8 E007A2A8 4407C000 */ mfc1 $a3, $f24 @@ -191,25 +191,25 @@ glabel func_E007A000 /* 37C810 E007A2D0 4600B107 */ neg.s $f4, $f22 /* 37C814 E007A2D4 46002121 */ cvt.d.s $f4, $f4 /* 37C818 E007A2D8 462E2102 */ mul.d $f4, $f4, $f14 -/* 37C81C E007A2DC 00000000 */ nop +/* 37C81C E007A2DC 00000000 */ nop /* 37C820 E007A2E0 4600C087 */ neg.s $f2, $f24 /* 37C824 E007A2E4 460010A1 */ cvt.d.s $f2, $f2 /* 37C828 E007A2E8 462E1082 */ mul.d $f2, $f2, $f14 -/* 37C82C E007A2EC 00000000 */ nop +/* 37C82C E007A2EC 00000000 */ nop /* 37C830 E007A2F0 4600D007 */ neg.s $f0, $f26 /* 37C834 E007A2F4 46000021 */ cvt.d.s $f0, $f0 /* 37C838 E007A2F8 462E0002 */ mul.d $f0, $f0, $f14 -/* 37C83C E007A2FC 00000000 */ nop +/* 37C83C E007A2FC 00000000 */ nop /* 37C840 E007A300 46342102 */ mul.d $f4, $f4, $f20 -/* 37C844 E007A304 00000000 */ nop +/* 37C844 E007A304 00000000 */ nop /* 37C848 E007A308 46341082 */ mul.d $f2, $f2, $f20 -/* 37C84C E007A30C 00000000 */ nop +/* 37C84C E007A30C 00000000 */ nop /* 37C850 E007A310 4616B180 */ add.s $f6, $f22, $f22 /* 37C854 E007A314 4618C200 */ add.s $f8, $f24, $f24 /* 37C858 E007A318 461AD280 */ add.s $f10, $f26, $f26 /* 37C85C E007A31C E606FFC4 */ swc1 $f6, -0x3c($s0) /* 37C860 E007A320 46340002 */ mul.d $f0, $f0, $f20 -/* 37C864 E007A324 00000000 */ nop +/* 37C864 E007A324 00000000 */ nop /* 37C868 E007A328 E606FFB8 */ swc1 $f6, -0x48($s0) /* 37C86C E007A32C E608FFC8 */ swc1 $f8, -0x38($s0) /* 37C870 E007A330 E608FFBC */ swc1 $f8, -0x44($s0) @@ -223,60 +223,60 @@ glabel func_E007A000 /* 37C890 E007A350 E600FFE4 */ swc1 $f0, -0x1c($s0) /* 37C894 E007A354 C7A00030 */ lwc1 $f0, 0x30($sp) /* 37C898 E007A358 461E0002 */ mul.s $f0, $f0, $f30 -/* 37C89C E007A35C 00000000 */ nop +/* 37C89C E007A35C 00000000 */ nop /* 37C8A0 E007A360 C7A40040 */ lwc1 $f4, 0x40($sp) /* 37C8A4 E007A364 C7B00070 */ lwc1 $f16, 0x70($sp) /* 37C8A8 E007A368 46102102 */ mul.s $f4, $f4, $f16 -/* 37C8AC E007A36C 00000000 */ nop +/* 37C8AC E007A36C 00000000 */ nop /* 37C8B0 E007A370 C7A20050 */ lwc1 $f2, 0x50($sp) /* 37C8B4 E007A374 461C1082 */ mul.s $f2, $f2, $f28 -/* 37C8B8 E007A378 00000000 */ nop +/* 37C8B8 E007A378 00000000 */ nop /* 37C8BC E007A37C 46040000 */ add.s $f0, $f0, $f4 /* 37C8C0 E007A380 46020000 */ add.s $f0, $f0, $f2 /* 37C8C4 E007A384 3C01E008 */ lui $at, %hi(D_E007AC08) /* 37C8C8 E007A388 D42EAC08 */ ldc1 $f14, %lo(D_E007AC08)($at) /* 37C8CC E007A38C 46000021 */ cvt.d.s $f0, $f0 /* 37C8D0 E007A390 462E0002 */ mul.d $f0, $f0, $f14 -/* 37C8D4 E007A394 00000000 */ nop +/* 37C8D4 E007A394 00000000 */ nop /* 37C8D8 E007A398 46340002 */ mul.d $f0, $f0, $f20 -/* 37C8DC E007A39C 00000000 */ nop +/* 37C8DC E007A39C 00000000 */ nop /* 37C8E0 E007A3A0 46200020 */ cvt.s.d $f0, $f0 /* 37C8E4 E007A3A4 E600FFD0 */ swc1 $f0, -0x30($s0) /* 37C8E8 E007A3A8 C7A00034 */ lwc1 $f0, 0x34($sp) /* 37C8EC E007A3AC 461E0002 */ mul.s $f0, $f0, $f30 -/* 37C8F0 E007A3B0 00000000 */ nop +/* 37C8F0 E007A3B0 00000000 */ nop /* 37C8F4 E007A3B4 C7A40044 */ lwc1 $f4, 0x44($sp) /* 37C8F8 E007A3B8 46102102 */ mul.s $f4, $f4, $f16 -/* 37C8FC E007A3BC 00000000 */ nop +/* 37C8FC E007A3BC 00000000 */ nop /* 37C900 E007A3C0 C7A20054 */ lwc1 $f2, 0x54($sp) /* 37C904 E007A3C4 461C1082 */ mul.s $f2, $f2, $f28 -/* 37C908 E007A3C8 00000000 */ nop +/* 37C908 E007A3C8 00000000 */ nop /* 37C90C E007A3CC 46040000 */ add.s $f0, $f0, $f4 /* 37C910 E007A3D0 46020000 */ add.s $f0, $f0, $f2 /* 37C914 E007A3D4 46000021 */ cvt.d.s $f0, $f0 /* 37C918 E007A3D8 462E0002 */ mul.d $f0, $f0, $f14 -/* 37C91C E007A3DC 00000000 */ nop +/* 37C91C E007A3DC 00000000 */ nop /* 37C920 E007A3E0 46340002 */ mul.d $f0, $f0, $f20 -/* 37C924 E007A3E4 00000000 */ nop +/* 37C924 E007A3E4 00000000 */ nop /* 37C928 E007A3E8 46200020 */ cvt.s.d $f0, $f0 /* 37C92C E007A3EC E600FFD4 */ swc1 $f0, -0x2c($s0) /* 37C930 E007A3F0 C7A00038 */ lwc1 $f0, 0x38($sp) /* 37C934 E007A3F4 461E0002 */ mul.s $f0, $f0, $f30 -/* 37C938 E007A3F8 00000000 */ nop +/* 37C938 E007A3F8 00000000 */ nop /* 37C93C E007A3FC C7A40048 */ lwc1 $f4, 0x48($sp) /* 37C940 E007A400 46102102 */ mul.s $f4, $f4, $f16 -/* 37C944 E007A404 00000000 */ nop +/* 37C944 E007A404 00000000 */ nop /* 37C948 E007A408 C7A20058 */ lwc1 $f2, 0x58($sp) /* 37C94C E007A40C 461C1082 */ mul.s $f2, $f2, $f28 -/* 37C950 E007A410 00000000 */ nop +/* 37C950 E007A410 00000000 */ nop /* 37C954 E007A414 46040000 */ add.s $f0, $f0, $f4 /* 37C958 E007A418 46020000 */ add.s $f0, $f0, $f2 /* 37C95C E007A41C 46000021 */ cvt.d.s $f0, $f0 /* 37C960 E007A420 462E0002 */ mul.d $f0, $f0, $f14 -/* 37C964 E007A424 00000000 */ nop +/* 37C964 E007A424 00000000 */ nop /* 37C968 E007A428 26730048 */ addiu $s3, $s3, 0x48 /* 37C96C E007A42C 46340002 */ mul.d $f0, $f0, $f20 -/* 37C970 E007A430 00000000 */ nop +/* 37C970 E007A430 00000000 */ nop /* 37C974 E007A434 3C0141A0 */ lui $at, 0x41a0 /* 37C978 E007A438 44813000 */ mtc1 $at, $f6 /* 37C97C E007A43C 3C014080 */ lui $at, 0x4080 @@ -295,7 +295,7 @@ glabel func_E007A000 /* 37C9B0 E007A470 2623FFFF */ addiu $v1, $s1, -1 /* 37C9B4 E007A474 26310001 */ addiu $s1, $s1, 1 /* 37C9B8 E007A478 44820000 */ mtc1 $v0, $f0 -/* 37C9BC E007A47C 00000000 */ nop +/* 37C9BC E007A47C 00000000 */ nop /* 37C9C0 E007A480 46800020 */ cvt.s.w $f0, $f0 /* 37C9C4 E007A484 240200FF */ addiu $v0, $zero, 0xff /* 37C9C8 E007A488 AE02FFFC */ sw $v0, -4($s0) diff --git a/asm/nonmatchings/code_37C540/func_E007A504.s b/asm/nonmatchings/code_37C540/func_E007A504.s index ab7d6714f7..82930cefd8 100644 --- a/asm/nonmatchings/code_37C540/func_E007A504.s +++ b/asm/nonmatchings/code_37C540/func_E007A504.s @@ -3,4 +3,4 @@ glabel func_E007A504 /* 37CA44 E007A504 03E00008 */ jr $ra -/* 37CA48 E007A508 00000000 */ nop +/* 37CA48 E007A508 00000000 */ nop diff --git a/asm/nonmatchings/code_37C540/func_E007A50C.s b/asm/nonmatchings/code_37C540/func_E007A50C.s index 274777d752..9d8ccfc1ad 100644 --- a/asm/nonmatchings/code_37C540/func_E007A50C.s +++ b/asm/nonmatchings/code_37C540/func_E007A50C.s @@ -15,11 +15,11 @@ glabel func_E007A50C /* 37CA74 E007A534 ACA30060 */ sw $v1, 0x60($a1) /* 37CA78 E007A538 24020002 */ addiu $v0, $zero, 2 /* 37CA7C E007A53C 14E20005 */ bne $a3, $v0, .LE007A554 -/* 37CA80 E007A540 00000000 */ nop +/* 37CA80 E007A540 00000000 */ nop /* 37CA84 E007A544 0C080128 */ jal func_E02004A0 -/* 37CA88 E007A548 00000000 */ nop +/* 37CA88 E007A548 00000000 */ nop /* 37CA8C E007A54C 0801EA0D */ j .LE007A834 -/* 37CA90 E007A550 00000000 */ nop +/* 37CA90 E007A550 00000000 */ nop .LE007A554: /* 37CA94 E007A554 8CA8005C */ lw $t0, 0x5c($a1) /* 37CA98 E007A558 8C820008 */ lw $v0, 8($a0) @@ -99,7 +99,7 @@ glabel func_E007A50C /* 37CBB0 E007A670 E462FFD0 */ swc1 $f2, -0x30($v1) .LE007A674: /* 37CBB4 E007A674 10400023 */ beqz $v0, .LE007A704 -/* 37CBB8 E007A678 00000000 */ nop +/* 37CBB8 E007A678 00000000 */ nop /* 37CBBC E007A67C C468FFF8 */ lwc1 $f8, -8($v1) /* 37CBC0 E007A680 3C014008 */ lui $at, 0x4008 /* 37CBC4 E007A684 44813800 */ mtc1 $at, $f7 @@ -107,13 +107,13 @@ glabel func_E007A50C /* 37CBCC E007A68C 46004221 */ cvt.d.s $f8, $f8 /* 37CBD0 E007A690 46283181 */ sub.d $f6, $f6, $f8 /* 37CBD4 E007A694 46303182 */ mul.d $f6, $f6, $f16 -/* 37CBD8 E007A698 00000000 */ nop +/* 37CBD8 E007A698 00000000 */ nop /* 37CBDC E007A69C 3C014020 */ lui $at, 0x4020 /* 37CBE0 E007A6A0 44810800 */ mtc1 $at, $f1 /* 37CBE4 E007A6A4 44800000 */ mtc1 $zero, $f0 -/* 37CBE8 E007A6A8 00000000 */ nop +/* 37CBE8 E007A6A8 00000000 */ nop /* 37CBEC E007A6AC 46203182 */ mul.d $f6, $f6, $f0 -/* 37CBF0 E007A6B0 00000000 */ nop +/* 37CBF0 E007A6B0 00000000 */ nop /* 37CBF4 E007A6B4 C464FFFC */ lwc1 $f4, -4($v1) /* 37CBF8 E007A6B8 3C013FE0 */ lui $at, 0x3fe0 /* 37CBFC E007A6BC 44810800 */ mtc1 $at, $f1 @@ -121,13 +121,13 @@ glabel func_E007A50C /* 37CC04 E007A6C4 46002121 */ cvt.d.s $f4, $f4 /* 37CC08 E007A6C8 46240001 */ sub.d $f0, $f0, $f4 /* 37CC0C E007A6CC 46300002 */ mul.d $f0, $f0, $f16 -/* 37CC10 E007A6D0 00000000 */ nop +/* 37CC10 E007A6D0 00000000 */ nop /* 37CC14 E007A6D4 3C014018 */ lui $at, 0x4018 /* 37CC18 E007A6D8 44811800 */ mtc1 $at, $f3 /* 37CC1C E007A6DC 44801000 */ mtc1 $zero, $f2 -/* 37CC20 E007A6E0 00000000 */ nop +/* 37CC20 E007A6E0 00000000 */ nop /* 37CC24 E007A6E4 46220002 */ mul.d $f0, $f0, $f2 -/* 37CC28 E007A6E8 00000000 */ nop +/* 37CC28 E007A6E8 00000000 */ nop /* 37CC2C E007A6EC 46264200 */ add.d $f8, $f8, $f6 /* 37CC30 E007A6F0 46202100 */ add.d $f4, $f4, $f0 /* 37CC34 E007A6F4 46204220 */ cvt.s.d $f8, $f8 @@ -152,29 +152,29 @@ glabel func_E007A50C /* 37CC7C E007A73C E464FFD0 */ swc1 $f4, -0x30($v1) /* 37CC80 E007A740 460031A1 */ cvt.d.s $f6, $f6 /* 37CC84 E007A744 462E3182 */ mul.d $f6, $f6, $f14 -/* 37CC88 E007A748 00000000 */ nop +/* 37CC88 E007A748 00000000 */ nop /* 37CC8C E007A74C C4680004 */ lwc1 $f8, 4($v1) /* 37CC90 E007A750 3C01E008 */ lui $at, %hi(D_E007AC20) /* 37CC94 E007A754 D420AC20 */ ldc1 $f0, %lo(D_E007AC20)($at) /* 37CC98 E007A758 46004221 */ cvt.d.s $f8, $f8 /* 37CC9C E007A75C 46204202 */ mul.d $f8, $f8, $f0 -/* 37CCA0 E007A760 00000000 */ nop +/* 37CCA0 E007A760 00000000 */ nop /* 37CCA4 E007A764 46001106 */ mov.s $f4, $f2 /* 37CCA8 E007A768 3C01E008 */ lui $at, %hi(D_E007AC28) /* 37CCAC E007A76C D420AC28 */ ldc1 $f0, %lo(D_E007AC28)($at) /* 37CCB0 E007A770 46002121 */ cvt.d.s $f4, $f4 /* 37CCB4 E007A774 46202102 */ mul.d $f4, $f4, $f0 -/* 37CCB8 E007A778 00000000 */ nop +/* 37CCB8 E007A778 00000000 */ nop /* 37CCBC E007A77C 3C01E008 */ lui $at, %hi(D_E007AC30) /* 37CCC0 E007A780 D420AC30 */ ldc1 $f0, %lo(D_E007AC30)($at) /* 37CCC4 E007A784 C462000C */ lwc1 $f2, 0xc($v1) /* 37CCC8 E007A788 468010A1 */ cvt.d.w $f2, $f2 /* 37CCCC E007A78C 46201082 */ mul.d $f2, $f2, $f0 -/* 37CCD0 E007A790 00000000 */ nop +/* 37CCD0 E007A790 00000000 */ nop /* 37CCD4 E007A794 C460FFD0 */ lwc1 $f0, -0x30($v1) /* 37CCD8 E007A798 46000021 */ cvt.d.s $f0, $f0 /* 37CCDC E007A79C 462E0002 */ mul.d $f0, $f0, $f14 -/* 37CCE0 E007A7A0 00000000 */ nop +/* 37CCE0 E007A7A0 00000000 */ nop /* 37CCE4 E007A7A4 462031A0 */ cvt.s.d $f6, $f6 /* 37CCE8 E007A7A8 E466FFC8 */ swc1 $f6, -0x38($v1) /* 37CCEC E007A7AC 46204220 */ cvt.s.d $f8, $f8 diff --git a/asm/nonmatchings/code_37C540/func_E007A884.s b/asm/nonmatchings/code_37C540/func_E007A884.s index 2d7f4b1bad..c23f173890 100644 --- a/asm/nonmatchings/code_37C540/func_E007A884.s +++ b/asm/nonmatchings/code_37C540/func_E007A884.s @@ -3,4 +3,4 @@ glabel func_E007A884 /* 37CDC4 E007A884 03E00008 */ jr $ra -/* 37CDC8 E007A888 00000000 */ nop +/* 37CDC8 E007A888 00000000 */ nop diff --git a/asm/nonmatchings/code_37C540/func_E007A88C.s b/asm/nonmatchings/code_37C540/func_E007A88C.s index 5bf84d4f36..ed9185eb2b 100644 --- a/asm/nonmatchings/code_37C540/func_E007A88C.s +++ b/asm/nonmatchings/code_37C540/func_E007A88C.s @@ -224,4 +224,4 @@ glabel func_E007A88C /* 37D130 E007ABF0 D7B400C0 */ ldc1 $f20, 0xc0($sp) /* 37D134 E007ABF4 03E00008 */ jr $ra /* 37D138 E007ABF8 27BD00D0 */ addiu $sp, $sp, 0xd0 -/* 37D13C E007ABFC 00000000 */ nop +/* 37D13C E007ABFC 00000000 */ nop diff --git a/asm/nonmatchings/code_37F720/func_E007E000.s b/asm/nonmatchings/code_37F720/func_E007E000.s index 86390c2094..4ab945f0fa 100644 --- a/asm/nonmatchings/code_37F720/func_E007E000.s +++ b/asm/nonmatchings/code_37F720/func_E007E000.s @@ -44,7 +44,7 @@ glabel func_E007E000 /* 37F7BC E007E09C AE71000C */ sw $s1, 0xc($s3) .LE007E0A0: /* 37F7C0 E007E0A0 0801F828 */ j .LE007E0A0 -/* 37F7C4 E007E0A4 00000000 */ nop +/* 37F7C4 E007E0A4 00000000 */ nop .LE007E0A8: /* 37F7C8 E007E0A8 AE200004 */ sw $zero, 4($s1) /* 37F7CC E007E0AC AE300000 */ sw $s0, ($s1) @@ -89,16 +89,16 @@ glabel func_E007E000 /* 37F864 E007E144 2404000A */ addiu $a0, $zero, 0xa /* 37F868 E007E148 2442FFF8 */ addiu $v0, $v0, -8 /* 37F86C E007E14C 44820000 */ mtc1 $v0, $f0 -/* 37F870 E007E150 00000000 */ nop +/* 37F870 E007E150 00000000 */ nop /* 37F874 E007E154 46800020 */ cvt.s.w $f0, $f0 /* 37F878 E007E158 0C080000 */ jal func_E0200000 /* 37F87C E007E15C E600FFDC */ swc1 $f0, -0x24($s0) /* 37F880 E007E160 2442FFFB */ addiu $v0, $v0, -5 /* 37F884 E007E164 44820000 */ mtc1 $v0, $f0 -/* 37F888 E007E168 00000000 */ nop +/* 37F888 E007E168 00000000 */ nop /* 37F88C E007E16C 46800021 */ cvt.d.w $f0, $f0 /* 37F890 E007E170 46340002 */ mul.d $f0, $f0, $f20 -/* 37F894 E007E174 00000000 */ nop +/* 37F894 E007E174 00000000 */ nop /* 37F898 E007E178 24040050 */ addiu $a0, $zero, 0x50 /* 37F89C E007E17C 2631004C */ addiu $s1, $s1, 0x4c /* 37F8A0 E007E180 46200020 */ cvt.s.d $f0, $f0 @@ -108,7 +108,7 @@ glabel func_E007E000 /* 37F8B0 E007E190 26520001 */ addiu $s2, $s2, 1 /* 37F8B4 E007E194 24420005 */ addiu $v0, $v0, 5 /* 37F8B8 E007E198 44820000 */ mtc1 $v0, $f0 -/* 37F8BC E007E19C 00000000 */ nop +/* 37F8BC E007E19C 00000000 */ nop /* 37F8C0 E007E1A0 46800020 */ cvt.s.w $f0, $f0 /* 37F8C4 E007E1A4 E600FFE4 */ swc1 $f0, -0x1c($s0) /* 37F8C8 E007E1A8 AE16FFFC */ sw $s6, -4($s0) diff --git a/asm/nonmatchings/code_37F720/func_E007E1FC.s b/asm/nonmatchings/code_37F720/func_E007E1FC.s index fb01efbfc6..d692dfd5c6 100644 --- a/asm/nonmatchings/code_37F720/func_E007E1FC.s +++ b/asm/nonmatchings/code_37F720/func_E007E1FC.s @@ -3,4 +3,4 @@ glabel func_E007E1FC /* 37F91C E007E1FC 03E00008 */ jr $ra -/* 37F920 E007E200 00000000 */ nop +/* 37F920 E007E200 00000000 */ nop diff --git a/asm/nonmatchings/code_37F720/func_E007E204.s b/asm/nonmatchings/code_37F720/func_E007E204.s index 9e56984d1e..38ffbe4609 100644 --- a/asm/nonmatchings/code_37F720/func_E007E204.s +++ b/asm/nonmatchings/code_37F720/func_E007E204.s @@ -18,18 +18,19 @@ glabel func_E007E204 /* 37F958 E007E238 14A20005 */ bne $a1, $v0, .LE007E250 /* 37F95C E007E23C AE030040 */ sw $v1, 0x40($s0) /* 37F960 E007E240 0C080128 */ jal func_E02004A0 -/* 37F964 E007E244 00000000 */ nop +/* 37F964 E007E244 00000000 */ nop /* 37F968 E007E248 0801F93D */ j .LE007E4F4 -/* 37F96C E007E24C 00000000 */ nop +/* 37F96C E007E24C 00000000 */ nop .LE007E250: /* 37F970 E007E250 2CA20007 */ sltiu $v0, $a1, 7 /* 37F974 E007E254 10400075 */ beqz $v0, .LE007E42C /* 37F978 E007E258 00051080 */ sll $v0, $a1, 2 -/* 37F97C E007E25C 3C01E008 */ lui $at, %hi(D_E007EC48) +/* 37F97C E007E25C 3C01E008 */ lui $at, %hi(jtbl_E007EC48_380368) /* 37F980 E007E260 00220821 */ addu $at, $at, $v0 -/* 37F984 E007E264 8C22EC48 */ lw $v0, %lo(D_E007EC48)($at) +/* 37F984 E007E264 8C22EC48 */ lw $v0, %lo(jtbl_E007EC48_380368)($at) /* 37F988 E007E268 00400008 */ jr $v0 -/* 37F98C E007E26C 00000000 */ nop +/* 37F98C E007E26C 00000000 */ nop +glabel LE007E270_37F990 /* 37F990 E007E270 0C080150 */ jal func_E0200540 /* 37F994 E007E274 2404002D */ addiu $a0, $zero, 0x2d /* 37F998 E007E278 C6020008 */ lwc1 $f2, 8($s0) @@ -50,9 +51,10 @@ glabel func_E007E204 /* 37F9D4 E007E2B4 AE000038 */ sw $zero, 0x38($s0) /* 37F9D8 E007E2B8 0801F909 */ j .LE007E424 /* 37F9DC E007E2BC AE000040 */ sw $zero, 0x40($s0) +glabel LE007E2C0_37F9E0 /* 37F9E0 E007E2C0 28620008 */ slti $v0, $v1, 8 /* 37F9E4 E007E2C4 14400004 */ bnez $v0, .LE007E2D8 -/* 37F9E8 E007E2C8 00000000 */ nop +/* 37F9E8 E007E2C8 00000000 */ nop /* 37F9EC E007E2CC 8E020004 */ lw $v0, 4($s0) /* 37F9F0 E007E2D0 0801F909 */ j .LE007E424 /* 37F9F4 E007E2D4 AE000040 */ sw $zero, 0x40($s0) @@ -63,15 +65,16 @@ glabel func_E007E204 /* 37FA04 E007E2E4 3C01E008 */ lui $at, %hi(D_E007EC68) /* 37FA08 E007E2E8 D422EC68 */ ldc1 $f2, %lo(D_E007EC68)($at) /* 37FA0C E007E2EC 44820000 */ mtc1 $v0, $f0 -/* 37FA10 E007E2F0 00000000 */ nop +/* 37FA10 E007E2F0 00000000 */ nop /* 37FA14 E007E2F4 46800021 */ cvt.d.w $f0, $f0 /* 37FA18 E007E2F8 46220002 */ mul.d $f0, $f0, $f2 -/* 37FA1C E007E2FC 00000000 */ nop +/* 37FA1C E007E2FC 00000000 */ nop /* 37FA20 E007E300 AE000034 */ sw $zero, 0x34($s0) /* 37FA24 E007E304 AE000038 */ sw $zero, 0x38($s0) /* 37FA28 E007E308 46200020 */ cvt.s.d $f0, $f0 /* 37FA2C E007E30C 0801F90B */ j .LE007E42C /* 37FA30 E007E310 E6000030 */ swc1 $f0, 0x30($s0) +glabel LE007E314_37FA34 /* 37FA34 E007E314 28620002 */ slti $v0, $v1, 2 /* 37FA38 E007E318 14400004 */ bnez $v0, .LE007E32C /* 37FA3C E007E31C 24020001 */ addiu $v0, $zero, 1 @@ -81,6 +84,7 @@ glabel func_E007E204 .LE007E32C: /* 37FA4C E007E32C 0801F90B */ j .LE007E42C /* 37FA50 E007E330 AE020034 */ sw $v0, 0x34($s0) +glabel LE007E334_37FA54 /* 37FA54 E007E334 2862000F */ slti $v0, $v1, 0xf /* 37FA58 E007E338 14400004 */ bnez $v0, .LE007E34C /* 37FA5C E007E33C 24020002 */ addiu $v0, $zero, 2 @@ -90,6 +94,7 @@ glabel func_E007E204 .LE007E34C: /* 37FA6C E007E34C 0801F90B */ j .LE007E42C /* 37FA70 E007E350 AE020034 */ sw $v0, 0x34($s0) +glabel LE007E354_37FA74 /* 37FA74 E007E354 2862002D */ slti $v0, $v1, 0x2d /* 37FA78 E007E358 14400004 */ bnez $v0, .LE007E36C /* 37FA7C E007E35C 24020003 */ addiu $v0, $zero, 3 @@ -111,6 +116,7 @@ glabel func_E007E204 /* 37FAB4 E007E394 44810000 */ mtc1 $at, $f0 /* 37FAB8 E007E398 0801F90B */ j .LE007E42C /* 37FABC E007E39C E6000030 */ swc1 $f0, 0x30($s0) +glabel LE007E3A0_37FAC0 /* 37FAC0 E007E3A0 2862000A */ slti $v0, $v1, 0xa /* 37FAC4 E007E3A4 54400004 */ bnel $v0, $zero, .LE007E3B8 /* 37FAC8 E007E3A8 AE000034 */ sw $zero, 0x34($s0) @@ -122,17 +128,18 @@ glabel func_E007E204 /* 37FADC E007E3BC 44810000 */ mtc1 $at, $f0 /* 37FAE0 E007E3C0 0801F90B */ j .LE007E42C /* 37FAE4 E007E3C4 E600002C */ swc1 $f0, 0x2c($s0) +glabel LE007E3C8_37FAE8 /* 37FAE8 E007E3C8 C6040028 */ lwc1 $f4, 0x28($s0) /* 37FAEC E007E3CC 3C014210 */ lui $at, 0x4210 /* 37FAF0 E007E3D0 44810000 */ mtc1 $at, $f0 -/* 37FAF4 E007E3D4 00000000 */ nop +/* 37FAF4 E007E3D4 00000000 */ nop /* 37FAF8 E007E3D8 46002100 */ add.s $f4, $f4, $f0 /* 37FAFC E007E3DC 3C01E008 */ lui $at, %hi(D_E007EC70) /* 37FB00 E007E3E0 D422EC70 */ ldc1 $f2, %lo(D_E007EC70)($at) /* 37FB04 E007E3E4 C600003C */ lwc1 $f0, 0x3c($s0) /* 37FB08 E007E3E8 46800021 */ cvt.d.w $f0, $f0 /* 37FB0C E007E3EC 46220002 */ mul.d $f0, $f0, $f2 -/* 37FB10 E007E3F0 00000000 */ nop +/* 37FB10 E007E3F0 00000000 */ nop /* 37FB14 E007E3F4 E6040028 */ swc1 $f4, 0x28($s0) /* 37FB18 E007E3F8 46002086 */ mov.s $f2, $f4 /* 37FB1C E007E3FC 3C014434 */ lui $at, 0x4434 @@ -142,7 +149,7 @@ glabel func_E007E204 /* 37FB2C E007E40C 4620028D */ trunc.w.d $f10, $f0 /* 37FB30 E007E410 E60A003C */ swc1 $f10, 0x3c($s0) /* 37FB34 E007E414 45000005 */ bc1f .LE007E42C -/* 37FB38 E007E418 00000000 */ nop +/* 37FB38 E007E418 00000000 */ nop /* 37FB3C E007E41C 8E020004 */ lw $v0, 4($s0) /* 37FB40 E007E420 E6040028 */ swc1 $f4, 0x28($s0) .LE007E424: @@ -158,7 +165,7 @@ glabel func_E007E204 /* 37FB64 E007E444 24040001 */ addiu $a0, $zero, 1 /* 37FB68 E007E448 0082102A */ slt $v0, $a0, $v0 /* 37FB6C E007E44C 10400029 */ beqz $v0, .LE007E4F4 -/* 37FB70 E007E450 00000000 */ nop +/* 37FB70 E007E450 00000000 */ nop /* 37FB74 E007E454 24060004 */ addiu $a2, $zero, 4 /* 37FB78 E007E458 3C014348 */ lui $at, 0x4348 /* 37FB7C E007E45C 44814000 */ mtc1 $at, $f8 @@ -189,7 +196,7 @@ glabel func_E007E204 /* 37FBD8 E007E4B8 E462FFFC */ swc1 $f2, -4($v1) /* 37FBDC E007E4BC 46003006 */ mov.s $f0, $f6 /* 37FBE0 E007E4C0 4600403C */ c.lt.s $f8, $f0 -/* 37FBE4 E007E4C4 00000000 */ nop +/* 37FBE4 E007E4C4 00000000 */ nop /* 37FBE8 E007E4C8 45020006 */ bc1fl .LE007E4E4 /* 37FBEC E007E4CC 24840001 */ addiu $a0, $a0, 1 /* 37FBF0 E007E4D0 AC60FFF8 */ sw $zero, -8($v1) diff --git a/asm/nonmatchings/code_37F720/func_E007E54C.s b/asm/nonmatchings/code_37F720/func_E007E54C.s index 6f50a4c982..8603b1e255 100644 --- a/asm/nonmatchings/code_37F720/func_E007E54C.s +++ b/asm/nonmatchings/code_37F720/func_E007E54C.s @@ -445,6 +445,6 @@ glabel func_E007E54C /* 380338 E007EC18 D7B400C8 */ ldc1 $f20, 0xc8($sp) /* 38033C E007EC1C 03E00008 */ jr $ra /* 380340 E007EC20 27BD00E8 */ addiu $sp, $sp, 0xe8 -/* 380344 E007EC24 00000000 */ nop -/* 380348 E007EC28 00000000 */ nop -/* 38034C E007EC2C 00000000 */ nop +/* 380344 E007EC24 00000000 */ nop +/* 380348 E007EC28 00000000 */ nop +/* 38034C E007EC2C 00000000 */ nop diff --git a/asm/nonmatchings/code_385640/func_E0082000.s b/asm/nonmatchings/code_385640/func_E0082000.s index 222ed0a2f2..29d3ac1729 100644 --- a/asm/nonmatchings/code_385640/func_E0082000.s +++ b/asm/nonmatchings/code_385640/func_E0082000.s @@ -41,7 +41,7 @@ glabel func_E0082000 /* 3856D0 E0082090 AE23000C */ sw $v1, 0xc($s1) .LE0082094: /* 3856D4 E0082094 08020825 */ j .LE0082094 -/* 3856D8 E0082098 00000000 */ nop +/* 3856D8 E0082098 00000000 */ nop .LE008209C: /* 3856DC E008209C 3C013F80 */ lui $at, 0x3f80 /* 3856E0 E00820A0 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_385640/func_E00821B0.s b/asm/nonmatchings/code_385640/func_E00821B0.s index 824d51c1a3..236d5b0de1 100644 --- a/asm/nonmatchings/code_385640/func_E00821B0.s +++ b/asm/nonmatchings/code_385640/func_E00821B0.s @@ -3,4 +3,4 @@ glabel func_E00821B0 /* 3857F0 E00821B0 03E00008 */ jr $ra -/* 3857F4 E00821B4 00000000 */ nop +/* 3857F4 E00821B4 00000000 */ nop diff --git a/asm/nonmatchings/code_385640/func_E00821B8.s b/asm/nonmatchings/code_385640/func_E00821B8.s index e3b7b35c8a..3ef831acdf 100644 --- a/asm/nonmatchings/code_385640/func_E00821B8.s +++ b/asm/nonmatchings/code_385640/func_E00821B8.s @@ -37,7 +37,7 @@ glabel func_E00821B8 /* 385870 E0082230 0C080128 */ jal func_E02004A0 /* 385874 E0082234 0280202D */ daddu $a0, $s4, $zero /* 385878 E0082238 0802093B */ j .LE00824EC -/* 38587C E008223C 00000000 */ nop +/* 38587C E008223C 00000000 */ nop .LE0082240: /* 385880 E0082240 8E02002C */ lw $v0, 0x2c($s0) /* 385884 E0082244 3463F1A0 */ ori $v1, $v1, 0xf1a0 @@ -59,7 +59,7 @@ glabel func_E00821B8 /* 3858C0 E0082280 1C400030 */ bgtz $v0, .LE0082344 /* 3858C4 E0082284 2442FFFF */ addiu $v0, $v0, -1 /* 3858C8 E0082288 1064002F */ beq $v1, $a0, .LE0082348 -/* 3858CC E008228C 00000000 */ nop +/* 3858CC E008228C 00000000 */ nop /* 3858D0 E0082290 04620001 */ bltzl $v1, .LE0082298 /* 3858D4 E0082294 0000182D */ daddu $v1, $zero, $zero .LE0082298: @@ -76,7 +76,7 @@ glabel func_E00821B8 /* 385900 E00822C0 AE000070 */ sw $zero, 0x70($s0) /* 385904 E00822C4 24420001 */ addiu $v0, $v0, 1 /* 385908 E00822C8 4602003C */ c.lt.s $f0, $f2 -/* 38590C E00822CC 00000000 */ nop +/* 38590C E00822CC 00000000 */ nop /* 385910 E00822D0 4500001B */ bc1f .LE0082340 /* 385914 E00822D4 AE020038 */ sw $v0, 0x38($s0) /* 385918 E00822D8 C6000010 */ lwc1 $f0, 0x10($s0) @@ -142,21 +142,21 @@ glabel func_E00821B8 .LE00823B4: /* 3859F4 E00823B4 3C013F80 */ lui $at, 0x3f80 /* 3859F8 E00823B8 44810000 */ mtc1 $at, $f0 -/* 3859FC E00823BC 00000000 */ nop +/* 3859FC E00823BC 00000000 */ nop /* 385A00 E00823C0 E6000008 */ swc1 $f0, 8($s0) .LE00823C4: /* 385A04 E00823C4 C6000008 */ lwc1 $f0, 8($s0) /* 385A08 E00823C8 46160002 */ mul.s $f0, $f0, $f22 -/* 385A0C E00823CC 00000000 */ nop +/* 385A0C E00823CC 00000000 */ nop /* 385A10 E00823D0 2E620002 */ sltiu $v0, $s3, 2 /* 385A14 E00823D4 10400009 */ beqz $v0, .LE00823FC /* 385A18 E00823D8 E6000008 */ swc1 $f0, 8($s0) /* 385A1C E00823DC 44966000 */ mtc1 $s6, $f12 -/* 385A20 E00823E0 00000000 */ nop +/* 385A20 E00823E0 00000000 */ nop /* 385A24 E00823E4 0C080144 */ jal func_E0200510 /* 385A28 E00823E8 46806320 */ cvt.s.w $f12, $f12 /* 385A2C E00823EC 46140002 */ mul.s $f0, $f0, $f20 -/* 385A30 E00823F0 00000000 */ nop +/* 385A30 E00823F0 00000000 */ nop /* 385A34 E00823F4 08020900 */ j .LE0082400 /* 385A38 E00823F8 E600FFF8 */ swc1 $f0, -8($s0) .LE00823FC: @@ -185,17 +185,17 @@ glabel func_E00821B8 /* 385A8C E008244C 1040001D */ beqz $v0, .LE00824C4 /* 385A90 E0082450 2A42000A */ slti $v0, $s2, 0xa /* 385A94 E0082454 44920000 */ mtc1 $s2, $f0 -/* 385A98 E0082458 00000000 */ nop +/* 385A98 E0082458 00000000 */ nop /* 385A9C E008245C 46800020 */ cvt.s.w $f0, $f0 /* 385AA0 E0082460 3C01E008 */ lui $at, %hi(D_E0082D60) /* 385AA4 E0082464 D4222D60 */ ldc1 $f2, %lo(D_E0082D60)($at) /* 385AA8 E0082468 46000021 */ cvt.d.s $f0, $f0 /* 385AAC E008246C 46220002 */ mul.d $f0, $f0, $f2 -/* 385AB0 E0082470 00000000 */ nop +/* 385AB0 E0082470 00000000 */ nop /* 385AB4 E0082474 C602FFF8 */ lwc1 $f2, -8($s0) /* 385AB8 E0082478 460010A1 */ cvt.d.s $f2, $f2 /* 385ABC E008247C 46201082 */ mul.d $f2, $f2, $f0 -/* 385AC0 E0082480 00000000 */ nop +/* 385AC0 E0082480 00000000 */ nop /* 385AC4 E0082484 3C01BFE0 */ lui $at, 0xbfe0 /* 385AC8 E0082488 44812800 */ mtc1 $at, $f5 /* 385ACC E008248C 44802000 */ mtc1 $zero, $f4 @@ -205,7 +205,7 @@ glabel func_E00821B8 /* 385ADC E008249C 46240000 */ add.d $f0, $f0, $f4 /* 385AE0 E00824A0 3C014120 */ lui $at, 0x4120 /* 385AE4 E00824A4 44812000 */ mtc1 $at, $f4 -/* 385AE8 E00824A8 00000000 */ nop +/* 385AE8 E00824A8 00000000 */ nop /* 385AEC E00824AC 46043180 */ add.s $f6, $f6, $f4 /* 385AF0 E00824B0 46200020 */ cvt.s.d $f0, $f0 /* 385AF4 E00824B4 E600FFF0 */ swc1 $f0, -0x10($s0) diff --git a/asm/nonmatchings/code_385640/func_E0082520.s b/asm/nonmatchings/code_385640/func_E0082520.s index cd2c14fda2..dc7dea9052 100644 --- a/asm/nonmatchings/code_385640/func_E0082520.s +++ b/asm/nonmatchings/code_385640/func_E0082520.s @@ -3,4 +3,4 @@ glabel func_E0082520 /* 385B60 E0082520 03E00008 */ jr $ra -/* 385B64 E0082524 00000000 */ nop +/* 385B64 E0082524 00000000 */ nop diff --git a/asm/nonmatchings/code_385640/func_E0082528.s b/asm/nonmatchings/code_385640/func_E0082528.s index d10bcd3f10..59e719390d 100644 --- a/asm/nonmatchings/code_385640/func_E0082528.s +++ b/asm/nonmatchings/code_385640/func_E0082528.s @@ -10,13 +10,13 @@ glabel func_E0082528 /* 385B7C E008253C 8E30000C */ lw $s0, 0xc($s1) /* 385B80 E0082540 8E020004 */ lw $v0, 4($s0) /* 385B84 E0082544 10400009 */ beqz $v0, .LE008256C -/* 385B88 E0082548 00000000 */ nop +/* 385B88 E0082548 00000000 */ nop /* 385B8C E008254C 0C020A2D */ jal func_E00828B4 -/* 385B90 E0082550 00000000 */ nop +/* 385B90 E0082550 00000000 */ nop /* 385B94 E0082554 8E030000 */ lw $v1, ($s0) /* 385B98 E0082558 24020001 */ addiu $v0, $zero, 1 /* 385B9C E008255C 10620003 */ beq $v1, $v0, .LE008256C -/* 385BA0 E0082560 00000000 */ nop +/* 385BA0 E0082560 00000000 */ nop /* 385BA4 E0082564 0C020AA1 */ jal func_E0082A84 /* 385BA8 E0082568 0220202D */ daddu $a0, $s1, $zero .LE008256C: diff --git a/asm/nonmatchings/code_385640/func_E00828B4.s b/asm/nonmatchings/code_385640/func_E00828B4.s index edcba3d1d0..08c0686ba4 100644 --- a/asm/nonmatchings/code_385640/func_E00828B4.s +++ b/asm/nonmatchings/code_385640/func_E00828B4.s @@ -54,7 +54,7 @@ glabel func_E00828B4 /* 385FB4 E0082974 26520001 */ addiu $s2, $s2, 1 .LE0082978: /* 385FB8 E0082978 167E0008 */ bne $s3, $fp, .LE008299C -/* 385FBC E008297C 00000000 */ nop +/* 385FBC E008297C 00000000 */ nop /* 385FC0 E0082980 8E020000 */ lw $v0, ($s0) /* 385FC4 E0082984 0040182D */ daddu $v1, $v0, $zero /* 385FC8 E0082988 24420008 */ addiu $v0, $v0, 8 diff --git a/asm/nonmatchings/code_385640/func_E0082A84.s b/asm/nonmatchings/code_385640/func_E0082A84.s index 8932e8afaf..a6d7629c40 100644 --- a/asm/nonmatchings/code_385640/func_E0082A84.s +++ b/asm/nonmatchings/code_385640/func_E0082A84.s @@ -163,6 +163,6 @@ glabel func_E0082A84 /* 386328 E0082CE8 8FB00010 */ lw $s0, 0x10($sp) /* 38632C E0082CEC 03E00008 */ jr $ra /* 386330 E0082CF0 27BD0038 */ addiu $sp, $sp, 0x38 -/* 386334 E0082CF4 00000000 */ nop -/* 386338 E0082CF8 00000000 */ nop -/* 38633C E0082CFC 00000000 */ nop +/* 386334 E0082CF4 00000000 */ nop +/* 386338 E0082CF8 00000000 */ nop +/* 38633C E0082CFC 00000000 */ nop diff --git a/asm/nonmatchings/code_389850/func_E0086000.s b/asm/nonmatchings/code_389850/func_E0086000.s index 13fe2640d3..00a343f30b 100644 --- a/asm/nonmatchings/code_389850/func_E0086000.s +++ b/asm/nonmatchings/code_389850/func_E0086000.s @@ -58,7 +58,7 @@ glabel func_E0086000 /* 389924 E00860D4 AED1000C */ sw $s1, 0xc($s6) .LE00860D8: /* 389928 E00860D8 08021836 */ j .LE00860D8 -/* 38992C E00860DC 00000000 */ nop +/* 38992C E00860DC 00000000 */ nop .LE00860E0: /* 389930 E00860E0 AE300000 */ sw $s0, ($s1) /* 389934 E00860E4 E6340004 */ swc1 $f20, 4($s1) @@ -124,19 +124,19 @@ glabel func_E0086000 /* 389A08 E00861B8 16810004 */ bne $s4, $at, .LE00861CC /* 389A0C E00861BC 3C018000 */ lui $at, 0x8000 /* 389A10 E00861C0 16410002 */ bne $s2, $at, .LE00861CC -/* 389A14 E00861C4 00000000 */ nop +/* 389A14 E00861C4 00000000 */ nop /* 389A18 E00861C8 0006000D */ break 6 .LE00861CC: /* 389A1C E00861CC 00001812 */ mflo $v1 /* 389A20 E00861D0 24040167 */ addiu $a0, $zero, 0x167 /* 389A24 E00861D4 26520168 */ addiu $s2, $s2, 0x168 /* 389A28 E00861D8 4483A000 */ mtc1 $v1, $f20 -/* 389A2C E00861DC 00000000 */ nop +/* 389A2C E00861DC 00000000 */ nop /* 389A30 E00861E0 4680A520 */ cvt.s.w $f20, $f20 /* 389A34 E00861E4 0C080138 */ jal func_E02004E0 /* 389A38 E00861E8 26730001 */ addiu $s3, $s3, 1 /* 389A3C E00861EC 44820000 */ mtc1 $v0, $f0 -/* 389A40 E00861F0 00000000 */ nop +/* 389A40 E00861F0 00000000 */ nop /* 389A44 E00861F4 46800020 */ cvt.s.w $f0, $f0 /* 389A48 E00861F8 AE00FFD8 */ sw $zero, -0x28($s0) /* 389A4C E00861FC AE00FFDC */ sw $zero, -0x24($s0) diff --git a/asm/nonmatchings/code_389850/func_E0086270.s b/asm/nonmatchings/code_389850/func_E0086270.s index ef0f0a8b4e..2ea6fee0f4 100644 --- a/asm/nonmatchings/code_389850/func_E0086270.s +++ b/asm/nonmatchings/code_389850/func_E0086270.s @@ -3,4 +3,4 @@ glabel func_E0086270 /* 389AC0 E0086270 03E00008 */ jr $ra -/* 389AC4 E0086274 00000000 */ nop +/* 389AC4 E0086274 00000000 */ nop diff --git a/asm/nonmatchings/code_389850/func_E0086278.s b/asm/nonmatchings/code_389850/func_E0086278.s index 4c95e22d52..5267395dd3 100644 --- a/asm/nonmatchings/code_389850/func_E0086278.s +++ b/asm/nonmatchings/code_389850/func_E0086278.s @@ -14,9 +14,9 @@ glabel func_E0086278 /* 389AEC E008629C 04410005 */ bgez $v0, .LE00862B4 /* 389AF0 E00862A0 AC650034 */ sw $a1, 0x34($v1) /* 389AF4 E00862A4 0C080128 */ jal func_E02004A0 -/* 389AF8 E00862A8 00000000 */ nop +/* 389AF8 E00862A8 00000000 */ nop /* 389AFC E00862AC 080218E1 */ j .LE0086384 -/* 389B00 E00862B0 00000000 */ nop +/* 389B00 E00862B0 00000000 */ nop .LE00862B4: /* 389B04 E00862B4 3C02E008 */ lui $v0, %hi(D_E0086AC0) /* 389B08 E00862B8 00481021 */ addu $v0, $v0, $t0 @@ -24,23 +24,23 @@ glabel func_E0086278 /* 389B10 E00862C0 00A0382D */ daddu $a3, $a1, $zero /* 389B14 E00862C4 0047102A */ slt $v0, $v0, $a3 /* 389B18 E00862C8 1440000D */ bnez $v0, .LE0086300 -/* 389B1C E00862CC 00000000 */ nop +/* 389B1C E00862CC 00000000 */ nop /* 389B20 E00862D0 3C02E008 */ lui $v0, %hi(D_E0086AC4) /* 389B24 E00862D4 00461021 */ addu $v0, $v0, $a2 /* 389B28 E00862D8 90426AC4 */ lbu $v0, %lo(D_E0086AC4)($v0) /* 389B2C E00862DC 3C013B80 */ lui $at, 0x3b80 /* 389B30 E00862E0 44811000 */ mtc1 $at, $f2 /* 389B34 E00862E4 44820000 */ mtc1 $v0, $f0 -/* 389B38 E00862E8 00000000 */ nop +/* 389B38 E00862E8 00000000 */ nop /* 389B3C E00862EC 46800020 */ cvt.s.w $f0, $f0 /* 389B40 E00862F0 46020002 */ mul.s $f0, $f0, $f2 -/* 389B44 E00862F4 00000000 */ nop +/* 389B44 E00862F4 00000000 */ nop /* 389B48 E00862F8 080218C4 */ j .LE0086310 /* 389B4C E00862FC E4600038 */ swc1 $f0, 0x38($v1) .LE0086300: /* 389B50 E0086300 3C013F80 */ lui $at, 0x3f80 /* 389B54 E0086304 44810000 */ mtc1 $at, $f0 -/* 389B58 E0086308 00000000 */ nop +/* 389B58 E0086308 00000000 */ nop /* 389B5C E008630C E4600038 */ swc1 $f0, 0x38($v1) .LE0086310: /* 389B60 E0086310 8C820008 */ lw $v0, 8($a0) @@ -67,7 +67,7 @@ glabel func_E0086278 /* 389BAC E008635C ACA0FFFC */ sw $zero, -4($a1) /* 389BB0 E0086360 ACA00000 */ sw $zero, ($a1) /* 389BB4 E0086364 44820000 */ mtc1 $v0, $f0 -/* 389BB8 E0086368 00000000 */ nop +/* 389BB8 E0086368 00000000 */ nop /* 389BBC E008636C 46800020 */ cvt.s.w $f0, $f0 /* 389BC0 E0086370 E4A0FFF8 */ swc1 $f0, -8($a1) /* 389BC4 E0086374 8C820008 */ lw $v0, 8($a0) diff --git a/asm/nonmatchings/code_389850/func_E0086390.s b/asm/nonmatchings/code_389850/func_E0086390.s index 9cf9db6f99..82eddced82 100644 --- a/asm/nonmatchings/code_389850/func_E0086390.s +++ b/asm/nonmatchings/code_389850/func_E0086390.s @@ -3,4 +3,4 @@ glabel func_E0086390 /* 389BE0 E0086390 03E00008 */ jr $ra -/* 389BE4 E0086394 00000000 */ nop +/* 389BE4 E0086394 00000000 */ nop diff --git a/asm/nonmatchings/code_389850/func_E0086398.s b/asm/nonmatchings/code_389850/func_E0086398.s index 1cf4474356..2504c2caca 100644 --- a/asm/nonmatchings/code_389850/func_E0086398.s +++ b/asm/nonmatchings/code_389850/func_E0086398.s @@ -5,7 +5,7 @@ glabel func_E0086398 /* 389BE8 E0086398 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 389BEC E008639C AFBF0010 */ sw $ra, 0x10($sp) /* 389BF0 E00863A0 0C0218ED */ jal func_E00863B4 -/* 389BF4 E00863A4 00000000 */ nop +/* 389BF4 E00863A4 00000000 */ nop /* 389BF8 E00863A8 8FBF0010 */ lw $ra, 0x10($sp) /* 389BFC E00863AC 03E00008 */ jr $ra /* 389C00 E00863B0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_389850/func_E00863B4.s b/asm/nonmatchings/code_389850/func_E00863B4.s index 0853674dbb..85ceaf1272 100644 --- a/asm/nonmatchings/code_389850/func_E00863B4.s +++ b/asm/nonmatchings/code_389850/func_E00863B4.s @@ -21,7 +21,7 @@ glabel func_E00863B4 /* 389C44 E00863F4 44810000 */ mtc1 $at, $f0 /* 389C48 E00863F8 C6820038 */ lwc1 $f2, 0x38($s4) /* 389C4C E00863FC 46001502 */ mul.s $f20, $f2, $f0 -/* 389C50 E0086400 00000000 */ nop +/* 389C50 E0086400 00000000 */ nop /* 389C54 E0086404 4600A10D */ trunc.w.s $f4, $f20 /* 389C58 E0086408 E7A400A4 */ swc1 $f4, 0xa4($sp) /* 389C5C E008640C 8FA900A4 */ lw $t1, 0xa4($sp) @@ -106,7 +106,7 @@ glabel func_E00863B4 /* 389D98 E0086548 3063FFFF */ andi $v1, $v1, 0xffff /* 389D9C E008654C 00031980 */ sll $v1, $v1, 6 /* 389DA0 E0086550 46020002 */ mul.s $f0, $f0, $f2 -/* 389DA4 E0086554 00000000 */ nop +/* 389DA4 E0086554 00000000 */ nop /* 389DA8 E0086558 8E420000 */ lw $v0, ($s2) /* 389DAC E008655C 00731821 */ addu $v1, $v1, $s3 /* 389DB0 E0086560 00431021 */ addu $v0, $v0, $v1 @@ -126,7 +126,7 @@ glabel func_E00863B4 /* 389DE8 E0086598 12A20028 */ beq $s5, $v0, .LE008663C /* 389DEC E008659C 32C20001 */ andi $v0, $s6, 1 /* 389DF0 E00865A0 0802199A */ j .LE0086668 -/* 389DF4 E00865A4 00000000 */ nop +/* 389DF4 E00865A4 00000000 */ nop .LE00865A8: /* 389DF8 E00865A8 26C3FFFF */ addiu $v1, $s6, -1 /* 389DFC E00865AC 2862000D */ slti $v0, $v1, 0xd @@ -140,15 +140,15 @@ glabel func_E00863B4 /* 389E18 E00865C8 00430018 */ mult $v0, $v1 /* 389E1C E00865CC 00003812 */ mflo $a3 /* 389E20 E00865D0 9282003E */ lbu $v0, 0x3e($s4) -/* 389E24 E00865D4 00000000 */ nop +/* 389E24 E00865D4 00000000 */ nop /* 389E28 E00865D8 00430018 */ mult $v0, $v1 /* 389E2C E00865DC 00003012 */ mflo $a2 /* 389E30 E00865E0 9282003F */ lbu $v0, 0x3f($s4) -/* 389E34 E00865E4 00000000 */ nop +/* 389E34 E00865E4 00000000 */ nop /* 389E38 E00865E8 00430018 */ mult $v0, $v1 /* 389E3C E00865EC 00002812 */ mflo $a1 /* 389E40 E00865F0 92820040 */ lbu $v0, 0x40($s4) -/* 389E44 E00865F4 00000000 */ nop +/* 389E44 E00865F4 00000000 */ nop /* 389E48 E00865F8 00430018 */ mult $v0, $v1 /* 389E4C E00865FC 9289003C */ lbu $t1, 0x3c($s4) /* 389E50 E0086600 00073A03 */ sra $a3, $a3, 8 @@ -453,4 +453,4 @@ glabel func_E00863B4 /* 38A2E0 E0086A90 D7B400F0 */ ldc1 $f20, 0xf0($sp) /* 38A2E4 E0086A94 03E00008 */ jr $ra /* 38A2E8 E0086A98 27BD0100 */ addiu $sp, $sp, 0x100 -/* 38A2EC E0086A9C 00000000 */ nop +/* 38A2EC E0086A9C 00000000 */ nop diff --git a/asm/nonmatchings/code_38ADF0/func_E0088000.s b/asm/nonmatchings/code_38ADF0/func_E0088000.s index a3db91c27a..3b6d441ac7 100644 --- a/asm/nonmatchings/code_38ADF0/func_E0088000.s +++ b/asm/nonmatchings/code_38ADF0/func_E0088000.s @@ -13,60 +13,60 @@ glabel func_E0088000 /* 38AE10 E0088020 3421CCCD */ ori $at, $at, 0xcccd /* 38AE14 E0088024 4481A000 */ mtc1 $at, $f20 /* 38AE18 E0088028 44820000 */ mtc1 $v0, $f0 -/* 38AE1C E008802C 00000000 */ nop +/* 38AE1C E008802C 00000000 */ nop /* 38AE20 E0088030 46800020 */ cvt.s.w $f0, $f0 /* 38AE24 E0088034 46140002 */ mul.s $f0, $f0, $f20 -/* 38AE28 E0088038 00000000 */ nop +/* 38AE28 E0088038 00000000 */ nop /* 38AE2C E008803C 3C01420C */ lui $at, 0x420c /* 38AE30 E0088040 44811000 */ mtc1 $at, $f2 -/* 38AE34 E0088044 00000000 */ nop +/* 38AE34 E0088044 00000000 */ nop /* 38AE38 E0088048 46020001 */ sub.s $f0, $f0, $f2 /* 38AE3C E008804C 2404012C */ addiu $a0, $zero, 0x12c /* 38AE40 E0088050 AE000008 */ sw $zero, 8($s0) /* 38AE44 E0088054 0C080138 */ jal func_E02004E0 /* 38AE48 E0088058 E6000004 */ swc1 $f0, 4($s0) /* 38AE4C E008805C 44820000 */ mtc1 $v0, $f0 -/* 38AE50 E0088060 00000000 */ nop +/* 38AE50 E0088060 00000000 */ nop /* 38AE54 E0088064 46800020 */ cvt.s.w $f0, $f0 /* 38AE58 E0088068 46140002 */ mul.s $f0, $f0, $f20 -/* 38AE5C E008806C 00000000 */ nop +/* 38AE5C E008806C 00000000 */ nop /* 38AE60 E0088070 3C014170 */ lui $at, 0x4170 /* 38AE64 E0088074 44811000 */ mtc1 $at, $f2 -/* 38AE68 E0088078 00000000 */ nop +/* 38AE68 E0088078 00000000 */ nop /* 38AE6C E008807C 46020001 */ sub.s $f0, $f0, $f2 /* 38AE70 E0088080 24040064 */ addiu $a0, $zero, 0x64 /* 38AE74 E0088084 0C080138 */ jal func_E02004E0 /* 38AE78 E0088088 E600000C */ swc1 $f0, 0xc($s0) /* 38AE7C E008808C 44821000 */ mtc1 $v0, $f2 -/* 38AE80 E0088090 00000000 */ nop +/* 38AE80 E0088090 00000000 */ nop /* 38AE84 E0088094 468010A0 */ cvt.s.w $f2, $f2 /* 38AE88 E0088098 46141082 */ mul.s $f2, $f2, $f20 -/* 38AE8C E008809C 00000000 */ nop +/* 38AE8C E008809C 00000000 */ nop /* 38AE90 E00880A0 C6000004 */ lwc1 $f0, 4($s0) /* 38AE94 E00880A4 46020000 */ add.s $f0, $f0, $f2 /* 38AE98 E00880A8 3C0140A0 */ lui $at, 0x40a0 /* 38AE9C E00880AC 44811000 */ mtc1 $at, $f2 -/* 38AEA0 E00880B0 00000000 */ nop +/* 38AEA0 E00880B0 00000000 */ nop /* 38AEA4 E00880B4 46020001 */ sub.s $f0, $f0, $f2 /* 38AEA8 E00880B8 3C01E009 */ lui $at, %hi(D_E0088D10) /* 38AEAC E00880BC D4228D10 */ ldc1 $f2, %lo(D_E0088D10)($at) /* 38AEB0 E00880C0 46000021 */ cvt.d.s $f0, $f0 /* 38AEB4 E00880C4 46220002 */ mul.d $f0, $f0, $f2 -/* 38AEB8 E00880C8 00000000 */ nop +/* 38AEB8 E00880C8 00000000 */ nop /* 38AEBC E00880CC 24040320 */ addiu $a0, $zero, 0x320 /* 38AEC0 E00880D0 46200020 */ cvt.s.d $f0, $f0 /* 38AEC4 E00880D4 0C080138 */ jal func_E02004E0 /* 38AEC8 E00880D8 E6000010 */ swc1 $f0, 0x10($s0) /* 38AECC E00880DC 44820000 */ mtc1 $v0, $f0 -/* 38AED0 E00880E0 00000000 */ nop +/* 38AED0 E00880E0 00000000 */ nop /* 38AED4 E00880E4 46800020 */ cvt.s.w $f0, $f0 /* 38AED8 E00880E8 46140002 */ mul.s $f0, $f0, $f20 -/* 38AEDC E00880EC 00000000 */ nop +/* 38AEDC E00880EC 00000000 */ nop /* 38AEE0 E00880F0 3C01E009 */ lui $at, %hi(D_E0088D18) /* 38AEE4 E00880F4 D4228D18 */ ldc1 $f2, %lo(D_E0088D18)($at) /* 38AEE8 E00880F8 46000021 */ cvt.d.s $f0, $f0 /* 38AEEC E00880FC 46220002 */ mul.d $f0, $f0, $f2 -/* 38AEF0 E0088100 00000000 */ nop +/* 38AEF0 E0088100 00000000 */ nop /* 38AEF4 E0088104 3C01E009 */ lui $at, %hi(D_E0088D20) /* 38AEF8 E0088108 D4228D20 */ ldc1 $f2, %lo(D_E0088D20)($at) /* 38AEFC E008810C 46201081 */ sub.d $f2, $f2, $f0 @@ -75,19 +75,19 @@ glabel func_E0088000 /* 38AF08 E0088118 0C080138 */ jal func_E02004E0 /* 38AF0C E008811C E6020014 */ swc1 $f2, 0x14($s0) /* 38AF10 E0088120 44820000 */ mtc1 $v0, $f0 -/* 38AF14 E0088124 00000000 */ nop +/* 38AF14 E0088124 00000000 */ nop /* 38AF18 E0088128 46800020 */ cvt.s.w $f0, $f0 /* 38AF1C E008812C 46140002 */ mul.s $f0, $f0, $f20 -/* 38AF20 E0088130 00000000 */ nop +/* 38AF20 E0088130 00000000 */ nop /* 38AF24 E0088134 3C014120 */ lui $at, 0x4120 /* 38AF28 E0088138 44811000 */ mtc1 $at, $f2 -/* 38AF2C E008813C 00000000 */ nop +/* 38AF2C E008813C 00000000 */ nop /* 38AF30 E0088140 46020001 */ sub.s $f0, $f0, $f2 /* 38AF34 E0088144 3C01E009 */ lui $at, %hi(D_E0088D28) /* 38AF38 E0088148 D4228D28 */ ldc1 $f2, %lo(D_E0088D28)($at) /* 38AF3C E008814C 46000021 */ cvt.d.s $f0, $f0 /* 38AF40 E0088150 46220002 */ mul.d $f0, $f0, $f2 -/* 38AF44 E0088154 00000000 */ nop +/* 38AF44 E0088154 00000000 */ nop /* 38AF48 E0088158 24020078 */ addiu $v0, $zero, 0x78 /* 38AF4C E008815C AE020020 */ sw $v0, 0x20($s0) /* 38AF50 E0088160 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/code_38ADF0/func_E008817C.s b/asm/nonmatchings/code_38ADF0/func_E008817C.s index 931537ea2e..c52839750b 100644 --- a/asm/nonmatchings/code_38ADF0/func_E008817C.s +++ b/asm/nonmatchings/code_38ADF0/func_E008817C.s @@ -27,40 +27,47 @@ glabel func_E008817C /* 38AFC4 E00881D4 1040000D */ beqz $v0, .LE008820C /* 38AFC8 E00881D8 27A40010 */ addiu $a0, $sp, 0x10 /* 38AFCC E00881DC 00151080 */ sll $v0, $s5, 2 -/* 38AFD0 E00881E0 3C01E009 */ lui $at, %hi(D_E0088D30) +/* 38AFD0 E00881E0 3C01E009 */ lui $at, %hi(jtbl_E0088D30_38BB20) /* 38AFD4 E00881E4 00220821 */ addu $at, $at, $v0 -/* 38AFD8 E00881E8 8C228D30 */ lw $v0, %lo(D_E0088D30)($at) +/* 38AFD8 E00881E8 8C228D30 */ lw $v0, %lo(jtbl_E0088D30_38BB20)($at) /* 38AFDC E00881EC 00400008 */ jr $v0 -/* 38AFE0 E00881F0 00000000 */ nop +/* 38AFE0 E00881F0 00000000 */ nop +glabel LE00881F4_38AFE4 /* 38AFE4 E00881F4 08022084 */ j .LE0088210 /* 38AFE8 E00881F8 2413000C */ addiu $s3, $zero, 0xc +glabel LE00881FC_38AFEC /* 38AFEC E00881FC 08022084 */ j .LE0088210 /* 38AFF0 E0088200 24130012 */ addiu $s3, $zero, 0x12 +glabel LE0088204_38AFF4 /* 38AFF4 E0088204 08022084 */ j .LE0088210 /* 38AFF8 E0088208 24130018 */ addiu $s3, $zero, 0x18 .LE008820C: +glabel LE008820C_38AFFC /* 38AFFC E008820C 24130030 */ addiu $s3, $zero, 0x30 .LE0088210: /* 38B000 E0088210 2EA20007 */ sltiu $v0, $s5, 7 /* 38B004 E0088214 1040000E */ beqz $v0, .LE0088250 /* 38B008 E0088218 00151080 */ sll $v0, $s5, 2 -/* 38B00C E008821C 3C01E009 */ lui $at, %hi(D_E0088D50) +/* 38B00C E008821C 3C01E009 */ lui $at, %hi(jtbl_E0088D50_38BB40) /* 38B010 E0088220 00220821 */ addu $at, $at, $v0 -/* 38B014 E0088224 8C228D50 */ lw $v0, %lo(D_E0088D50)($at) +/* 38B014 E0088224 8C228D50 */ lw $v0, %lo(jtbl_E0088D50_38BB40)($at) /* 38B018 E0088228 00400008 */ jr $v0 -/* 38B01C E008822C 00000000 */ nop +/* 38B01C E008822C 00000000 */ nop +glabel LE0088230_38B020 /* 38B020 E0088230 3C014040 */ lui $at, 0x4040 /* 38B024 E0088234 44818000 */ mtc1 $at, $f16 /* 38B028 E0088238 08022098 */ j .LE0088260 /* 38B02C E008823C E7B00028 */ swc1 $f16, 0x28($sp) +glabel LE0088240_38B030 /* 38B030 E0088240 3C014080 */ lui $at, 0x4080 /* 38B034 E0088244 44818000 */ mtc1 $at, $f16 /* 38B038 E0088248 08022098 */ j .LE0088260 /* 38B03C E008824C E7B00028 */ swc1 $f16, 0x28($sp) .LE0088250: +glabel LE0088250_38B040 /* 38B040 E0088250 3C0140A0 */ lui $at, 0x40a0 /* 38B044 E0088254 44818000 */ mtc1 $at, $f16 -/* 38B048 E0088258 00000000 */ nop +/* 38B048 E0088258 00000000 */ nop /* 38B04C E008825C E7B00028 */ swc1 $f16, 0x28($sp) .LE0088260: /* 38B050 E0088260 3C02E009 */ lui $v0, %hi(func_E00885A0) @@ -91,7 +98,7 @@ glabel func_E008817C /* 38B0B4 E00882C4 AED2000C */ sw $s2, 0xc($s6) .LE00882C8: /* 38B0B8 E00882C8 080220B2 */ j .LE00882C8 -/* 38B0BC E00882CC 00000000 */ nop +/* 38B0BC E00882CC 00000000 */ nop .LE00882D0: /* 38B0C0 E00882D0 E6540004 */ swc1 $f20, 4($s2) /* 38B0C4 E00882D4 E6560008 */ swc1 $f22, 8($s2) @@ -122,28 +129,28 @@ glabel func_E008817C /* 38B124 E0088334 3421D70A */ ori $at, $at, 0xd70a /* 38B128 E0088338 44810000 */ mtc1 $at, $f0 /* 38B12C E008833C 44821000 */ mtc1 $v0, $f2 -/* 38B130 E0088340 00000000 */ nop +/* 38B130 E0088340 00000000 */ nop /* 38B134 E0088344 468010A0 */ cvt.s.w $f2, $f2 /* 38B138 E0088348 46001082 */ mul.s $f2, $f2, $f0 -/* 38B13C E008834C 00000000 */ nop +/* 38B13C E008834C 00000000 */ nop /* 38B140 E0088350 C7B00028 */ lwc1 $f16, 0x28($sp) /* 38B144 E0088354 2EA20007 */ sltiu $v0, $s5, 7 /* 38B148 E0088358 46028782 */ mul.s $f30, $f16, $f2 -/* 38B14C E008835C 00000000 */ nop +/* 38B14C E008835C 00000000 */ nop /* 38B150 E0088360 10400006 */ beqz $v0, .LE008837C /* 38B154 E0088364 46008021 */ cvt.d.s $f0, $f16 /* 38B158 E0088368 8EE20000 */ lw $v0, ($s7) /* 38B15C E008836C 080220DF */ j .LE008837C -/* 38B160 E0088370 00000000 */ nop +/* 38B160 E0088370 00000000 */ nop /* 38B164 E0088374 C7B00028 */ lwc1 $f16, 0x28($sp) /* 38B168 E0088378 46008021 */ cvt.d.s $f0, $f16 .LE008837C: /* 38B16C E008837C 3C013FE0 */ lui $at, 0x3fe0 /* 38B170 E0088380 44818800 */ mtc1 $at, $f17 /* 38B174 E0088384 44808000 */ mtc1 $zero, $f16 -/* 38B178 E0088388 00000000 */ nop +/* 38B178 E0088388 00000000 */ nop /* 38B17C E008838C 46300002 */ mul.d $f0, $f0, $f16 -/* 38B180 E0088390 00000000 */ nop +/* 38B180 E0088390 00000000 */ nop /* 38B184 E0088394 46200000 */ add.d $f0, $f0, $f0 /* 38B188 E0088398 0220102D */ daddu $v0, $s1, $zero /* 38B18C E008839C 06210002 */ bgez $s1, .LE00883A8 @@ -152,29 +159,29 @@ glabel func_E008817C .LE00883A8: /* 38B198 E00883A8 00021083 */ sra $v0, $v0, 2 /* 38B19C E00883AC 4491A000 */ mtc1 $s1, $f20 -/* 38B1A0 E00883B0 00000000 */ nop +/* 38B1A0 E00883B0 00000000 */ nop /* 38B1A4 E00883B4 4680A520 */ cvt.s.w $f20, $f20 /* 38B1A8 E00883B8 00021080 */ sll $v0, $v0, 2 /* 38B1AC E00883BC 3C0143B4 */ lui $at, 0x43b4 /* 38B1B0 E00883C0 44810000 */ mtc1 $at, $f0 /* 38B1B4 E00883C4 02221023 */ subu $v0, $s1, $v0 /* 38B1B8 E00883C8 4600A502 */ mul.s $f20, $f20, $f0 -/* 38B1BC E00883CC 00000000 */ nop +/* 38B1BC E00883CC 00000000 */ nop /* 38B1C0 E00883D0 3C08E009 */ lui $t0, %hi(D_E0088D08) /* 38B1C4 E00883D4 25088D08 */ addiu $t0, $t0, %lo(D_E0088D08) /* 38B1C8 E00883D8 00481021 */ addu $v0, $v0, $t0 /* 38B1CC E00883DC 90420000 */ lbu $v0, ($v0) /* 38B1D0 E00883E0 44930000 */ mtc1 $s3, $f0 -/* 38B1D4 E00883E4 00000000 */ nop +/* 38B1D4 E00883E4 00000000 */ nop /* 38B1D8 E00883E8 46800020 */ cvt.s.w $f0, $f0 /* 38B1DC E00883EC 4600A503 */ div.s $f20, $f20, $f0 /* 38B1E0 E00883F0 449E0000 */ mtc1 $fp, $f0 -/* 38B1E4 E00883F4 00000000 */ nop +/* 38B1E4 E00883F4 00000000 */ nop /* 38B1E8 E00883F8 46800020 */ cvt.s.w $f0, $f0 /* 38B1EC E00883FC 4600A500 */ add.s $f20, $f20, $f0 /* 38B1F0 E0088400 AE550000 */ sw $s5, ($s2) /* 38B1F4 E0088404 4482B000 */ mtc1 $v0, $f22 -/* 38B1F8 E0088408 00000000 */ nop +/* 38B1F8 E0088408 00000000 */ nop /* 38B1FC E008840C 4680B5A0 */ cvt.s.w $f22, $f22 /* 38B200 E0088410 0C080140 */ jal func_E0200500 /* 38B204 E0088414 4600A306 */ mov.s $f12, $f20 @@ -196,27 +203,27 @@ glabel func_E008817C /* 38B244 E0088454 AE140000 */ sw $s4, ($s0) .LE0088458: /* 38B248 E0088458 4618F182 */ mul.s $f6, $f30, $f24 -/* 38B24C E008845C 00000000 */ nop +/* 38B24C E008845C 00000000 */ nop /* 38B250 E0088460 461AF202 */ mul.s $f8, $f30, $f26 -/* 38B254 E0088464 00000000 */ nop +/* 38B254 E0088464 00000000 */ nop /* 38B258 E0088468 4618E082 */ mul.s $f2, $f28, $f24 -/* 38B25C E008846C 00000000 */ nop +/* 38B25C E008846C 00000000 */ nop /* 38B260 E0088470 4614F302 */ mul.s $f12, $f30, $f20 -/* 38B264 E0088474 00000000 */ nop +/* 38B264 E0088474 00000000 */ nop /* 38B268 E0088478 461AE002 */ mul.s $f0, $f28, $f26 -/* 38B26C E008847C 00000000 */ nop +/* 38B26C E008847C 00000000 */ nop /* 38B270 E0088480 4614E102 */ mul.s $f4, $f28, $f20 -/* 38B274 E0088484 00000000 */ nop +/* 38B274 E0088484 00000000 */ nop /* 38B278 E0088488 460E3182 */ mul.s $f6, $f6, $f14 -/* 38B27C E008848C 00000000 */ nop +/* 38B27C E008848C 00000000 */ nop /* 38B280 E0088490 460E4202 */ mul.s $f8, $f8, $f14 -/* 38B284 E0088494 00000000 */ nop +/* 38B284 E0088494 00000000 */ nop /* 38B288 E0088498 460E1082 */ mul.s $f2, $f2, $f14 -/* 38B28C E008849C 00000000 */ nop +/* 38B28C E008849C 00000000 */ nop /* 38B290 E00884A0 3C013F80 */ lui $at, 0x3f80 /* 38B294 E00884A4 44815000 */ mtc1 $at, $f10 /* 38B298 E00884A8 460E0002 */ mul.s $f0, $f0, $f14 -/* 38B29C E00884AC 00000000 */ nop +/* 38B29C E00884AC 00000000 */ nop /* 38B2A0 E00884B0 2AA20004 */ slti $v0, $s5, 4 /* 38B2A4 E00884B4 E60CFFDC */ swc1 $f12, -0x24($s0) /* 38B2A8 E00884B8 E604FFE8 */ swc1 $f4, -0x18($s0) @@ -239,10 +246,10 @@ glabel func_E008817C /* 38B2EC E00884FC 00431021 */ addu $v0, $v0, $v1 /* 38B2F0 E0088500 00822023 */ subu $a0, $a0, $v0 /* 38B2F4 E0088504 44841000 */ mtc1 $a0, $f2 -/* 38B2F8 E0088508 00000000 */ nop +/* 38B2F8 E0088508 00000000 */ nop /* 38B2FC E008850C 468010A1 */ cvt.d.w $f2, $f2 /* 38B300 E0088510 46201082 */ mul.d $f2, $f2, $f0 -/* 38B304 E0088514 00000000 */ nop +/* 38B304 E0088514 00000000 */ nop /* 38B308 E0088518 3C01E009 */ lui $at, %hi(D_E0088D98) /* 38B30C E008851C D4208D98 */ ldc1 $f0, %lo(D_E0088D98)($at) /* 38B310 E0088520 46220001 */ sub.d $f0, $f0, $f2 diff --git a/asm/nonmatchings/code_38ADF0/func_E00885A0.s b/asm/nonmatchings/code_38ADF0/func_E00885A0.s index abd6334881..59dcad8385 100644 --- a/asm/nonmatchings/code_38ADF0/func_E00885A0.s +++ b/asm/nonmatchings/code_38ADF0/func_E00885A0.s @@ -3,4 +3,4 @@ glabel func_E00885A0 /* 38B390 E00885A0 03E00008 */ jr $ra -/* 38B394 E00885A4 00000000 */ nop +/* 38B394 E00885A4 00000000 */ nop diff --git a/asm/nonmatchings/code_38ADF0/func_E00885A8.s b/asm/nonmatchings/code_38ADF0/func_E00885A8.s index ebe49019d7..5bc4f65e43 100644 --- a/asm/nonmatchings/code_38ADF0/func_E00885A8.s +++ b/asm/nonmatchings/code_38ADF0/func_E00885A8.s @@ -17,9 +17,9 @@ glabel func_E00885A8 /* 38B3C8 E00885D8 04410005 */ bgez $v0, .LE00885F0 /* 38B3CC E00885DC AE220020 */ sw $v0, 0x20($s1) /* 38B3D0 E00885E0 0C080128 */ jal func_E02004A0 -/* 38B3D4 E00885E4 00000000 */ nop +/* 38B3D4 E00885E4 00000000 */ nop /* 38B3D8 E00885E8 080221E0 */ j .LE0088780 -/* 38B3DC E00885EC 00000000 */ nop +/* 38B3DC E00885EC 00000000 */ nop .LE00885F0: /* 38B3E0 E00885F0 3C030004 */ lui $v1, 4 /* 38B3E4 E00885F4 8E220024 */ lw $v0, 0x24($s1) @@ -52,7 +52,7 @@ glabel func_E00885A8 .LE0088658: /* 38B448 E0088658 24020003 */ addiu $v0, $zero, 3 /* 38B44C E008865C 16620010 */ bne $s3, $v0, .LE00886A0 -/* 38B450 E0088660 00000000 */ nop +/* 38B450 E0088660 00000000 */ nop /* 38B454 E0088664 8E020024 */ lw $v0, 0x24($s0) /* 38B458 E0088668 18400003 */ blez $v0, .LE0088678 /* 38B45C E008866C 2442FFFF */ addiu $v0, $v0, -1 @@ -82,15 +82,15 @@ glabel func_E00885A8 /* 38B4B0 E00886C0 C6040004 */ lwc1 $f4, 4($s0) /* 38B4B4 E00886C4 46002121 */ cvt.d.s $f4, $f4 /* 38B4B8 E00886C8 46342102 */ mul.d $f4, $f4, $f20 -/* 38B4BC E00886CC 00000000 */ nop +/* 38B4BC E00886CC 00000000 */ nop /* 38B4C0 E00886D0 C6020008 */ lwc1 $f2, 8($s0) /* 38B4C4 E00886D4 460010A1 */ cvt.d.s $f2, $f2 /* 38B4C8 E00886D8 46341082 */ mul.d $f2, $f2, $f20 -/* 38B4CC E00886DC 00000000 */ nop +/* 38B4CC E00886DC 00000000 */ nop /* 38B4D0 E00886E0 C600000C */ lwc1 $f0, 0xc($s0) /* 38B4D4 E00886E4 46000021 */ cvt.d.s $f0, $f0 /* 38B4D8 E00886E8 46340002 */ mul.d $f0, $f0, $f20 -/* 38B4DC E00886EC 00000000 */ nop +/* 38B4DC E00886EC 00000000 */ nop /* 38B4E0 E00886F0 46202120 */ cvt.s.d $f4, $f4 /* 38B4E4 E00886F4 462010A0 */ cvt.s.d $f2, $f2 /* 38B4E8 E00886F8 46200020 */ cvt.s.d $f0, $f0 @@ -104,9 +104,9 @@ glabel func_E00885A8 /* 38B508 E0088718 44801000 */ mtc1 $zero, $f2 /* 38B50C E008871C 46002021 */ cvt.d.s $f0, $f4 /* 38B510 E0088720 4620103C */ c.lt.d $f2, $f0 -/* 38B514 E0088724 00000000 */ nop +/* 38B514 E0088724 00000000 */ nop /* 38B518 E0088728 45000004 */ bc1f .LE008873C -/* 38B51C E008872C 00000000 */ nop +/* 38B51C E008872C 00000000 */ nop /* 38B520 E0088730 C6000010 */ lwc1 $f0, 0x10($s0) /* 38B524 E0088734 46002000 */ add.s $f0, $f4, $f0 /* 38B528 E0088738 E6000008 */ swc1 $f0, 8($s0) diff --git a/asm/nonmatchings/code_38C5F0/func_E008A000.s b/asm/nonmatchings/code_38C5F0/func_E008A000.s index 70d17885ed..b2b8f75d19 100644 --- a/asm/nonmatchings/code_38C5F0/func_E008A000.s +++ b/asm/nonmatchings/code_38C5F0/func_E008A000.s @@ -25,19 +25,19 @@ glabel func_E008A000 /* 38C640 E008A050 02038021 */ addu $s0, $s0, $v1 /* 38C644 E008A054 C600003C */ lwc1 $f0, 0x3c($s0) /* 38C648 E008A058 44821000 */ mtc1 $v0, $f2 -/* 38C64C E008A05C 00000000 */ nop +/* 38C64C E008A05C 00000000 */ nop /* 38C650 E008A060 468010A0 */ cvt.s.w $f2, $f2 /* 38C654 E008A064 46020000 */ add.s $f0, $f0, $f2 /* 38C658 E008A068 3C01447A */ lui $at, 0x447a /* 38C65C E008A06C 4481A000 */ mtc1 $at, $f20 -/* 38C660 E008A070 00000000 */ nop +/* 38C660 E008A070 00000000 */ nop /* 38C664 E008A074 46140001 */ sub.s $f0, $f0, $f20 /* 38C668 E008A078 240407D0 */ addiu $a0, $zero, 0x7d0 /* 38C66C E008A07C 0C080000 */ jal func_E0200000 /* 38C670 E008A080 E6200008 */ swc1 $f0, 8($s1) /* 38C674 E008A084 C6000040 */ lwc1 $f0, 0x40($s0) /* 38C678 E008A088 44821000 */ mtc1 $v0, $f2 -/* 38C67C E008A08C 00000000 */ nop +/* 38C67C E008A08C 00000000 */ nop /* 38C680 E008A090 468010A0 */ cvt.s.w $f2, $f2 /* 38C684 E008A094 46020000 */ add.s $f0, $f0, $f2 /* 38C688 E008A098 46140001 */ sub.s $f0, $f0, $f20 @@ -46,7 +46,7 @@ glabel func_E008A000 /* 38C694 E008A0A4 E620000C */ swc1 $f0, 0xc($s1) /* 38C698 E008A0A8 C6000044 */ lwc1 $f0, 0x44($s0) /* 38C69C E008A0AC 44821000 */ mtc1 $v0, $f2 -/* 38C6A0 E008A0B0 00000000 */ nop +/* 38C6A0 E008A0B0 00000000 */ nop /* 38C6A4 E008A0B4 468010A0 */ cvt.s.w $f2, $f2 /* 38C6A8 E008A0B8 46020000 */ add.s $f0, $f0, $f2 /* 38C6AC E008A0BC 46140001 */ sub.s $f0, $f0, $f20 @@ -56,14 +56,14 @@ glabel func_E008A000 /* 38C6BC E008A0CC 3C014120 */ lui $at, 0x4120 /* 38C6C0 E008A0D0 4481B000 */ mtc1 $at, $f22 /* 38C6C4 E008A0D4 44820000 */ mtc1 $v0, $f0 -/* 38C6C8 E008A0D8 00000000 */ nop +/* 38C6C8 E008A0D8 00000000 */ nop /* 38C6CC E008A0DC 46800020 */ cvt.s.w $f0, $f0 /* 38C6D0 E008A0E0 46160001 */ sub.s $f0, $f0, $f22 /* 38C6D4 E008A0E4 3C01E009 */ lui $at, %hi(D_E008AA60) /* 38C6D8 E008A0E8 D434AA60 */ ldc1 $f20, %lo(D_E008AA60)($at) /* 38C6DC E008A0EC 46000021 */ cvt.d.s $f0, $f0 /* 38C6E0 E008A0F0 46340002 */ mul.d $f0, $f0, $f20 -/* 38C6E4 E008A0F4 00000000 */ nop +/* 38C6E4 E008A0F4 00000000 */ nop /* 38C6E8 E008A0F8 24040050 */ addiu $a0, $zero, 0x50 /* 38C6EC E008A0FC 46200020 */ cvt.s.d $f0, $f0 /* 38C6F0 E008A100 0C080000 */ jal func_E0200000 @@ -71,10 +71,10 @@ glabel func_E008A000 /* 38C6F8 E008A108 3C01E009 */ lui $at, %hi(D_E008AA68) /* 38C6FC E008A10C D420AA68 */ ldc1 $f0, %lo(D_E008AA68)($at) /* 38C700 E008A110 44821000 */ mtc1 $v0, $f2 -/* 38C704 E008A114 00000000 */ nop +/* 38C704 E008A114 00000000 */ nop /* 38C708 E008A118 468010A1 */ cvt.d.w $f2, $f2 /* 38C70C E008A11C 46201082 */ mul.d $f2, $f2, $f0 -/* 38C710 E008A120 00000000 */ nop +/* 38C710 E008A120 00000000 */ nop /* 38C714 E008A124 3C01E009 */ lui $at, %hi(D_E008AA70) /* 38C718 E008A128 D420AA70 */ ldc1 $f0, %lo(D_E008AA70)($at) /* 38C71C E008A12C 46220001 */ sub.d $f0, $f0, $f2 @@ -83,12 +83,12 @@ glabel func_E008A000 /* 38C728 E008A138 0C080000 */ jal func_E0200000 /* 38C72C E008A13C E6200018 */ swc1 $f0, 0x18($s1) /* 38C730 E008A140 44820000 */ mtc1 $v0, $f0 -/* 38C734 E008A144 00000000 */ nop +/* 38C734 E008A144 00000000 */ nop /* 38C738 E008A148 46800020 */ cvt.s.w $f0, $f0 /* 38C73C E008A14C 46160001 */ sub.s $f0, $f0, $f22 /* 38C740 E008A150 46000021 */ cvt.d.s $f0, $f0 /* 38C744 E008A154 46340002 */ mul.d $f0, $f0, $f20 -/* 38C748 E008A158 00000000 */ nop +/* 38C748 E008A158 00000000 */ nop /* 38C74C E008A15C 240200FF */ addiu $v0, $zero, 0xff /* 38C750 E008A160 AE220028 */ sw $v0, 0x28($s1) /* 38C754 E008A164 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/code_38C5F0/func_E008A188.s b/asm/nonmatchings/code_38C5F0/func_E008A188.s index 880096abbb..4757e510cf 100644 --- a/asm/nonmatchings/code_38C5F0/func_E008A188.s +++ b/asm/nonmatchings/code_38C5F0/func_E008A188.s @@ -39,7 +39,7 @@ glabel func_E008A188 /* 38C800 E008A210 AE50000C */ sw $s0, 0xc($s2) .LE008A214: /* 38C804 E008A214 08022885 */ j .LE008A214 -/* 38C808 E008A218 00000000 */ nop +/* 38C808 E008A218 00000000 */ nop .LE008A21C: /* 38C80C E008A21C 24020064 */ addiu $v0, $zero, 0x64 /* 38C810 E008A220 AE020020 */ sw $v0, 0x20($s0) diff --git a/asm/nonmatchings/code_38C5F0/func_E008A288.s b/asm/nonmatchings/code_38C5F0/func_E008A288.s index 09f634aa3d..bb85200bf2 100644 --- a/asm/nonmatchings/code_38C5F0/func_E008A288.s +++ b/asm/nonmatchings/code_38C5F0/func_E008A288.s @@ -3,4 +3,4 @@ glabel func_E008A288 /* 38C878 E008A288 03E00008 */ jr $ra -/* 38C87C E008A28C 00000000 */ nop +/* 38C87C E008A28C 00000000 */ nop diff --git a/asm/nonmatchings/code_38C5F0/func_E008A290.s b/asm/nonmatchings/code_38C5F0/func_E008A290.s index 813ce3aec5..c99dc94057 100644 --- a/asm/nonmatchings/code_38C5F0/func_E008A290.s +++ b/asm/nonmatchings/code_38C5F0/func_E008A290.s @@ -24,7 +24,7 @@ glabel func_E008A290 /* 38C8CC E008A2DC C4460050 */ lwc1 $f6, 0x50($v0) /* 38C8D0 E008A2E0 4600030D */ trunc.w.s $f12, $f0 /* 38C8D4 E008A2E4 44046000 */ mfc1 $a0, $f12 -/* 38C8D8 E008A2E8 00000000 */ nop +/* 38C8D8 E008A2E8 00000000 */ nop /* 38C8DC E008A2EC 00A4182A */ slt $v1, $a1, $a0 /* 38C8E0 E008A2F0 10600014 */ beqz $v1, .LE008A344 /* 38C8E4 E008A2F4 00051023 */ negu $v0, $a1 @@ -36,16 +36,16 @@ glabel func_E008A290 /* 38C8F8 E008A308 14A10004 */ bne $a1, $at, .LE008A31C /* 38C8FC E008A30C 3C018000 */ lui $at, 0x8000 /* 38C900 E008A310 14810002 */ bne $a0, $at, .LE008A31C -/* 38C904 E008A314 00000000 */ nop +/* 38C904 E008A314 00000000 */ nop /* 38C908 E008A318 0006000D */ break 6 .LE008A31C: /* 38C90C E008A31C 00002010 */ mfhi $a0 /* 38C910 E008A320 44850000 */ mtc1 $a1, $f0 -/* 38C914 E008A324 00000000 */ nop +/* 38C914 E008A324 00000000 */ nop /* 38C918 E008A328 46800020 */ cvt.s.w $f0, $f0 /* 38C91C E008A32C 46001001 */ sub.s $f0, $f2, $f0 /* 38C920 E008A330 44841000 */ mtc1 $a0, $f2 -/* 38C924 E008A334 00000000 */ nop +/* 38C924 E008A334 00000000 */ nop /* 38C928 E008A338 468010A0 */ cvt.s.w $f2, $f2 /* 38C92C E008A33C 080228E6 */ j .LE008A398 /* 38C930 E008A340 46020000 */ add.s $f0, $f0, $f2 @@ -61,16 +61,16 @@ glabel func_E008A290 /* 38C950 E008A360 14A10004 */ bne $a1, $at, .LE008A374 /* 38C954 E008A364 3C018000 */ lui $at, 0x8000 /* 38C958 E008A368 14810002 */ bne $a0, $at, .LE008A374 -/* 38C95C E008A36C 00000000 */ nop +/* 38C95C E008A36C 00000000 */ nop /* 38C960 E008A370 0006000D */ break 6 .LE008A374: /* 38C964 E008A374 00002010 */ mfhi $a0 /* 38C968 E008A378 44850000 */ mtc1 $a1, $f0 -/* 38C96C E008A37C 00000000 */ nop +/* 38C96C E008A37C 00000000 */ nop /* 38C970 E008A380 46800020 */ cvt.s.w $f0, $f0 /* 38C974 E008A384 46001000 */ add.s $f0, $f2, $f0 /* 38C978 E008A388 44841000 */ mtc1 $a0, $f2 -/* 38C97C E008A38C 00000000 */ nop +/* 38C97C E008A38C 00000000 */ nop /* 38C980 E008A390 468010A0 */ cvt.s.w $f2, $f2 /* 38C984 E008A394 46020001 */ sub.s $f0, $f0, $f2 .LE008A398: @@ -79,7 +79,7 @@ glabel func_E008A290 /* 38C98C E008A39C 46044001 */ sub.s $f0, $f8, $f4 /* 38C990 E008A3A0 4600030D */ trunc.w.s $f12, $f0 /* 38C994 E008A3A4 44036000 */ mfc1 $v1, $f12 -/* 38C998 E008A3A8 00000000 */ nop +/* 38C998 E008A3A8 00000000 */ nop /* 38C99C E008A3AC 00C3102A */ slt $v0, $a2, $v1 /* 38C9A0 E008A3B0 10400014 */ beqz $v0, .LE008A404 /* 38C9A4 E008A3B4 00061023 */ negu $v0, $a2 @@ -91,16 +91,16 @@ glabel func_E008A290 /* 38C9B8 E008A3C8 14C10004 */ bne $a2, $at, .LE008A3DC /* 38C9BC E008A3CC 3C018000 */ lui $at, 0x8000 /* 38C9C0 E008A3D0 14610002 */ bne $v1, $at, .LE008A3DC -/* 38C9C4 E008A3D4 00000000 */ nop +/* 38C9C4 E008A3D4 00000000 */ nop /* 38C9C8 E008A3D8 0006000D */ break 6 .LE008A3DC: /* 38C9CC E008A3DC 00001810 */ mfhi $v1 /* 38C9D0 E008A3E0 44860000 */ mtc1 $a2, $f0 -/* 38C9D4 E008A3E4 00000000 */ nop +/* 38C9D4 E008A3E4 00000000 */ nop /* 38C9D8 E008A3E8 46800020 */ cvt.s.w $f0, $f0 /* 38C9DC E008A3EC 46002001 */ sub.s $f0, $f4, $f0 /* 38C9E0 E008A3F0 44831000 */ mtc1 $v1, $f2 -/* 38C9E4 E008A3F4 00000000 */ nop +/* 38C9E4 E008A3F4 00000000 */ nop /* 38C9E8 E008A3F8 468010A0 */ cvt.s.w $f2, $f2 /* 38C9EC E008A3FC 0802291B */ j .LE008A46C /* 38C9F0 E008A400 46020000 */ add.s $f0, $f0, $f2 @@ -122,16 +122,16 @@ glabel func_E008A290 /* 38CA24 E008A434 14C10004 */ bne $a2, $at, .LE008A448 /* 38CA28 E008A438 3C018000 */ lui $at, 0x8000 /* 38CA2C E008A43C 14610002 */ bne $v1, $at, .LE008A448 -/* 38CA30 E008A440 00000000 */ nop +/* 38CA30 E008A440 00000000 */ nop /* 38CA34 E008A444 0006000D */ break 6 .LE008A448: /* 38CA38 E008A448 00001810 */ mfhi $v1 /* 38CA3C E008A44C 44860000 */ mtc1 $a2, $f0 -/* 38CA40 E008A450 00000000 */ nop +/* 38CA40 E008A450 00000000 */ nop /* 38CA44 E008A454 46800020 */ cvt.s.w $f0, $f0 /* 38CA48 E008A458 46002000 */ add.s $f0, $f4, $f0 /* 38CA4C E008A45C 44831000 */ mtc1 $v1, $f2 -/* 38CA50 E008A460 00000000 */ nop +/* 38CA50 E008A460 00000000 */ nop /* 38CA54 E008A464 468010A0 */ cvt.s.w $f2, $f2 /* 38CA58 E008A468 46020001 */ sub.s $f0, $f0, $f2 .LE008A46C: @@ -140,7 +140,7 @@ glabel func_E008A290 /* 38CA60 E008A470 46065001 */ sub.s $f0, $f10, $f6 /* 38CA64 E008A474 4600030D */ trunc.w.s $f12, $f0 /* 38CA68 E008A478 44036000 */ mfc1 $v1, $f12 -/* 38CA6C E008A47C 00000000 */ nop +/* 38CA6C E008A47C 00000000 */ nop /* 38CA70 E008A480 00A3102A */ slt $v0, $a1, $v1 /* 38CA74 E008A484 10400015 */ beqz $v0, .LE008A4DC /* 38CA78 E008A488 00051023 */ negu $v0, $a1 @@ -152,16 +152,16 @@ glabel func_E008A290 /* 38CA8C E008A49C 14A10004 */ bne $a1, $at, .LE008A4B0 /* 38CA90 E008A4A0 3C018000 */ lui $at, 0x8000 /* 38CA94 E008A4A4 14610002 */ bne $v1, $at, .LE008A4B0 -/* 38CA98 E008A4A8 00000000 */ nop +/* 38CA98 E008A4A8 00000000 */ nop /* 38CA9C E008A4AC 0006000D */ break 6 .LE008A4B0: /* 38CAA0 E008A4B0 00001810 */ mfhi $v1 /* 38CAA4 E008A4B4 44850000 */ mtc1 $a1, $f0 -/* 38CAA8 E008A4B8 00000000 */ nop +/* 38CAA8 E008A4B8 00000000 */ nop /* 38CAAC E008A4BC 46800020 */ cvt.s.w $f0, $f0 /* 38CAB0 E008A4C0 46003001 */ sub.s $f0, $f6, $f0 /* 38CAB4 E008A4C4 44831000 */ mtc1 $v1, $f2 -/* 38CAB8 E008A4C8 00000000 */ nop +/* 38CAB8 E008A4C8 00000000 */ nop /* 38CABC E008A4CC 468010A0 */ cvt.s.w $f2, $f2 /* 38CAC0 E008A4D0 46020000 */ add.s $f0, $f0, $f2 /* 38CAC4 E008A4D4 03E00008 */ jr $ra @@ -178,19 +178,19 @@ glabel func_E008A290 /* 38CAE8 E008A4F8 14A10004 */ bne $a1, $at, .LE008A50C /* 38CAEC E008A4FC 3C018000 */ lui $at, 0x8000 /* 38CAF0 E008A500 14610002 */ bne $v1, $at, .LE008A50C -/* 38CAF4 E008A504 00000000 */ nop +/* 38CAF4 E008A504 00000000 */ nop /* 38CAF8 E008A508 0006000D */ break 6 .LE008A50C: /* 38CAFC E008A50C 00001810 */ mfhi $v1 /* 38CB00 E008A510 44850000 */ mtc1 $a1, $f0 -/* 38CB04 E008A514 00000000 */ nop +/* 38CB04 E008A514 00000000 */ nop /* 38CB08 E008A518 46800020 */ cvt.s.w $f0, $f0 /* 38CB0C E008A51C 46003000 */ add.s $f0, $f6, $f0 /* 38CB10 E008A520 44831000 */ mtc1 $v1, $f2 -/* 38CB14 E008A524 00000000 */ nop +/* 38CB14 E008A524 00000000 */ nop /* 38CB18 E008A528 468010A0 */ cvt.s.w $f2, $f2 /* 38CB1C E008A52C 46020001 */ sub.s $f0, $f0, $f2 /* 38CB20 E008A530 E5000010 */ swc1 $f0, 0x10($t0) .LE008A534: /* 38CB24 E008A534 03E00008 */ jr $ra -/* 38CB28 E008A538 00000000 */ nop +/* 38CB28 E008A538 00000000 */ nop diff --git a/asm/nonmatchings/code_38C5F0/func_E008A53C.s b/asm/nonmatchings/code_38C5F0/func_E008A53C.s index e149e8ee2a..d8418cbea1 100644 --- a/asm/nonmatchings/code_38C5F0/func_E008A53C.s +++ b/asm/nonmatchings/code_38C5F0/func_E008A53C.s @@ -33,11 +33,11 @@ glabel func_E008A53C .LE008A5AC: /* 38CB9C E008A5AC 8E220020 */ lw $v0, 0x20($s1) /* 38CBA0 E008A5B0 04410005 */ bgez $v0, .LE008A5C8 -/* 38CBA4 E008A5B4 00000000 */ nop +/* 38CBA4 E008A5B4 00000000 */ nop /* 38CBA8 E008A5B8 0C080128 */ jal func_E02004A0 /* 38CBAC E008A5BC 00A0202D */ daddu $a0, $a1, $zero /* 38CBB0 E008A5C0 080229AF */ j .LE008A6BC -/* 38CBB4 E008A5C4 00000000 */ nop +/* 38CBB4 E008A5C4 00000000 */ nop .LE008A5C8: /* 38CBB8 E008A5C8 8E220024 */ lw $v0, 0x24($s1) /* 38CBBC E008A5CC 8E330020 */ lw $s3, 0x20($s1) @@ -57,16 +57,16 @@ glabel func_E008A53C /* 38CBF0 E008A600 D422AA78 */ ldc1 $f2, %lo(D_E008AA78)($at) /* 38CBF4 E008A604 4600020D */ trunc.w.s $f8, $f0 /* 38CBF8 E008A608 44144000 */ mfc1 $s4, $f8 -/* 38CBFC E008A60C 00000000 */ nop +/* 38CBFC E008A60C 00000000 */ nop /* 38CC00 E008A610 44940000 */ mtc1 $s4, $f0 -/* 38CC04 E008A614 00000000 */ nop +/* 38CC04 E008A614 00000000 */ nop /* 38CC08 E008A618 46800021 */ cvt.d.w $f0, $f0 /* 38CC0C E008A61C 46220002 */ mul.d $f0, $f0, $f2 -/* 38CC10 E008A620 00000000 */ nop +/* 38CC10 E008A620 00000000 */ nop /* 38CC14 E008A624 3C013FF0 */ lui $at, 0x3ff0 /* 38CC18 E008A628 44811800 */ mtc1 $at, $f3 /* 38CC1C E008A62C 44801000 */ mtc1 $zero, $f2 -/* 38CC20 E008A630 00000000 */ nop +/* 38CC20 E008A630 00000000 */ nop /* 38CC24 E008A634 46220000 */ add.d $f0, $f0, $f2 /* 38CC28 E008A638 26310034 */ addiu $s1, $s1, 0x34 /* 38CC2C E008A63C 4620020D */ trunc.w.d $f8, $f0 diff --git a/asm/nonmatchings/code_38EE60/func_E008E000.s b/asm/nonmatchings/code_38EE60/func_E008E000.s index 267cfdc4bc..503f8dce3f 100644 --- a/asm/nonmatchings/code_38EE60/func_E008E000.s +++ b/asm/nonmatchings/code_38EE60/func_E008E000.s @@ -41,7 +41,7 @@ glabel func_E008E000 /* 38EEF0 E008E090 AE05000C */ sw $a1, 0xc($s0) .LE008E094: /* 38EEF4 E008E094 08023825 */ j .LE008E094 -/* 38EEF8 E008E098 00000000 */ nop +/* 38EEF8 E008E098 00000000 */ nop .LE008E09C: /* 38EEFC E008E09C ACB30004 */ sw $s3, 4($a1) /* 38EF00 E008E0A0 1E400004 */ bgtz $s2, .LE008E0B4 @@ -95,11 +95,11 @@ glabel func_E008E000 /* 38EFA8 E008E148 15210004 */ bne $t1, $at, .LE008E15C /* 38EFAC E008E14C 3C018000 */ lui $at, 0x8000 /* 38EFB0 E008E150 14E10002 */ bne $a3, $at, .LE008E15C -/* 38EFB4 E008E154 00000000 */ nop +/* 38EFB4 E008E154 00000000 */ nop /* 38EFB8 E008E158 0006000D */ break 6 .LE008E15C: /* 38EFBC E008E15C 00001812 */ mflo $v1 -/* 38EFC0 E008E160 00000000 */ nop +/* 38EFC0 E008E160 00000000 */ nop /* 38EFC4 E008E164 15200002 */ bnez $t1, .LE008E170 /* 38EFC8 E008E168 0109001A */ div $zero, $t0, $t1 /* 38EFCC E008E16C 0007000D */ break 7 @@ -108,7 +108,7 @@ glabel func_E008E000 /* 38EFD4 E008E174 15210004 */ bne $t1, $at, .LE008E188 /* 38EFD8 E008E178 3C018000 */ lui $at, 0x8000 /* 38EFDC E008E17C 15010002 */ bne $t0, $at, .LE008E188 -/* 38EFE0 E008E180 00000000 */ nop +/* 38EFE0 E008E180 00000000 */ nop /* 38EFE4 E008E184 0006000D */ break 6 .LE008E188: /* 38EFE8 E008E188 00002012 */ mflo $a0 @@ -118,11 +118,11 @@ glabel func_E008E000 /* 38EFF8 E008E198 0151102A */ slt $v0, $t2, $s1 /* 38EFFC E008E19C E4C2FFF8 */ swc1 $f2, -8($a2) /* 38F000 E008E1A0 44830000 */ mtc1 $v1, $f0 -/* 38F004 E008E1A4 00000000 */ nop +/* 38F004 E008E1A4 00000000 */ nop /* 38F008 E008E1A8 46800020 */ cvt.s.w $f0, $f0 /* 38F00C E008E1AC E4C0FFF4 */ swc1 $f0, -0xc($a2) /* 38F010 E008E1B0 44840000 */ mtc1 $a0, $f0 -/* 38F014 E008E1B4 00000000 */ nop +/* 38F014 E008E1B4 00000000 */ nop /* 38F018 E008E1B8 46800020 */ cvt.s.w $f0, $f0 /* 38F01C E008E1BC E4C00000 */ swc1 $f0, ($a2) /* 38F020 E008E1C0 24C60048 */ addiu $a2, $a2, 0x48 diff --git a/asm/nonmatchings/code_38EE60/func_E008E1FC.s b/asm/nonmatchings/code_38EE60/func_E008E1FC.s index 50d584cefa..9b94de62c7 100644 --- a/asm/nonmatchings/code_38EE60/func_E008E1FC.s +++ b/asm/nonmatchings/code_38EE60/func_E008E1FC.s @@ -3,4 +3,4 @@ glabel func_E008E1FC /* 38F05C E008E1FC 03E00008 */ jr $ra -/* 38F060 E008E200 00000000 */ nop +/* 38F060 E008E200 00000000 */ nop diff --git a/asm/nonmatchings/code_38EE60/func_E008E204.s b/asm/nonmatchings/code_38EE60/func_E008E204.s index c193ad3a13..32b240c5a3 100644 --- a/asm/nonmatchings/code_38EE60/func_E008E204.s +++ b/asm/nonmatchings/code_38EE60/func_E008E204.s @@ -30,7 +30,7 @@ glabel func_E008E204 /* 38F0C4 E008E264 0C080128 */ jal func_E02004A0 /* 38F0C8 E008E268 0260202D */ daddu $a0, $s3, $zero /* 38F0CC E008E26C 08023919 */ j .LE008E464 -/* 38F0D0 E008E270 00000000 */ nop +/* 38F0D0 E008E270 00000000 */ nop .LE008E274: /* 38F0D4 E008E274 0040182D */ daddu $v1, $v0, $zero /* 38F0D8 E008E278 28620015 */ slti $v0, $v1, 0x15 @@ -45,14 +45,14 @@ glabel func_E008E204 /* 38F0F4 E008E294 AC820014 */ sw $v0, 0x14($a0) /* 38F0F8 E008E298 30620001 */ andi $v0, $v1, 1 /* 38F0FC E008E29C 1040000A */ beqz $v0, .LE008E2C8 -/* 38F100 E008E2A0 00000000 */ nop +/* 38F100 E008E2A0 00000000 */ nop /* 38F104 E008E2A4 3C013FE0 */ lui $at, 0x3fe0 /* 38F108 E008E2A8 44811800 */ mtc1 $at, $f3 /* 38F10C E008E2AC 44801000 */ mtc1 $zero, $f2 /* 38F110 E008E2B0 C4800014 */ lwc1 $f0, 0x14($a0) /* 38F114 E008E2B4 46800021 */ cvt.d.w $f0, $f0 /* 38F118 E008E2B8 46220002 */ mul.d $f0, $f0, $f2 -/* 38F11C E008E2BC 00000000 */ nop +/* 38F11C E008E2BC 00000000 */ nop /* 38F120 E008E2C0 4620018D */ trunc.w.d $f6, $f0 /* 38F124 E008E2C4 E4860014 */ swc1 $f6, 0x14($a0) .LE008E2C8: @@ -83,24 +83,24 @@ glabel func_E008E204 /* 38F184 E008E324 0C080144 */ jal func_E0200510 /* 38F188 E008E328 46000686 */ mov.s $f26, $f0 /* 38F18C E008E32C 4616C582 */ mul.s $f22, $f24, $f22 -/* 38F190 E008E330 00000000 */ nop +/* 38F190 E008E330 00000000 */ nop /* 38F194 E008E334 4614C502 */ mul.s $f20, $f24, $f20 -/* 38F198 E008E338 00000000 */ nop +/* 38F198 E008E338 00000000 */ nop /* 38F19C E008E33C 461AC602 */ mul.s $f24, $f24, $f26 -/* 38F1A0 E008E340 00000000 */ nop +/* 38F1A0 E008E340 00000000 */ nop /* 38F1A4 E008E344 4600B582 */ mul.s $f22, $f22, $f0 -/* 38F1A8 E008E348 00000000 */ nop +/* 38F1A8 E008E348 00000000 */ nop /* 38F1AC E008E34C 4600A502 */ mul.s $f20, $f20, $f0 -/* 38F1B0 E008E350 00000000 */ nop +/* 38F1B0 E008E350 00000000 */ nop /* 38F1B4 E008E354 3C0142C8 */ lui $at, 0x42c8 /* 38F1B8 E008E358 44813000 */ mtc1 $at, $f6 /* 38F1BC E008E35C C6000008 */ lwc1 $f0, 8($s0) /* 38F1C0 E008E360 46003001 */ sub.s $f0, $f6, $f0 /* 38F1C4 E008E364 3C01437F */ lui $at, 0x437f /* 38F1C8 E008E368 44811000 */ mtc1 $at, $f2 -/* 38F1CC E008E36C 00000000 */ nop +/* 38F1CC E008E36C 00000000 */ nop /* 38F1D0 E008E370 46020002 */ mul.s $f0, $f0, $f2 -/* 38F1D4 E008E374 00000000 */ nop +/* 38F1D4 E008E374 00000000 */ nop /* 38F1D8 E008E378 E618FFEC */ swc1 $f24, -0x14($s0) /* 38F1DC E008E37C 46000000 */ add.s $f0, $f0, $f0 /* 38F1E0 E008E380 E616FFE4 */ swc1 $f22, -0x1c($s0) @@ -108,7 +108,7 @@ glabel func_E008E204 /* 38F1E8 E008E388 46060003 */ div.s $f0, $f0, $f6 /* 38F1EC E008E38C 4600018D */ trunc.w.s $f6, $f0 /* 38F1F0 E008E390 44023000 */ mfc1 $v0, $f6 -/* 38F1F4 E008E394 00000000 */ nop +/* 38F1F4 E008E394 00000000 */ nop /* 38F1F8 E008E398 AE02FFF0 */ sw $v0, -0x10($s0) /* 38F1FC E008E39C 28420100 */ slti $v0, $v0, 0x100 /* 38F200 E008E3A0 14400004 */ bnez $v0, .LE008E3B4 @@ -129,7 +129,7 @@ glabel func_E008E204 /* 38F238 E008E3D8 46220000 */ add.d $f0, $f0, $f2 /* 38F23C E008E3DC C6040008 */ lwc1 $f4, 8($s0) /* 38F240 E008E3E0 44821000 */ mtc1 $v0, $f2 -/* 38F244 E008E3E4 00000000 */ nop +/* 38F244 E008E3E4 00000000 */ nop /* 38F248 E008E3E8 468010A0 */ cvt.s.w $f2, $f2 /* 38F24C E008E3EC 46022101 */ sub.s $f4, $f4, $f2 /* 38F250 E008E3F0 46200020 */ cvt.s.d $f0, $f0 @@ -145,7 +145,7 @@ glabel func_E008E204 /* 38F274 E008E414 461E0000 */ add.s $f0, $f0, $f30 /* 38F278 E008E418 3C0140A0 */ lui $at, 0x40a0 /* 38F27C E008E41C 44813000 */ mtc1 $at, $f6 -/* 38F280 E008E420 00000000 */ nop +/* 38F280 E008E420 00000000 */ nop /* 38F284 E008E424 46060000 */ add.s $f0, $f0, $f6 .LE008E428: /* 38F288 E008E428 E600FFFC */ swc1 $f0, -4($s0) @@ -156,7 +156,7 @@ glabel func_E008E204 .LE008E43C: /* 38F29C E008E43C 3C0140A0 */ lui $at, 0x40a0 /* 38F2A0 E008E440 44813000 */ mtc1 $at, $f6 -/* 38F2A4 E008E444 00000000 */ nop +/* 38F2A4 E008E444 00000000 */ nop /* 38F2A8 E008E448 46060000 */ add.s $f0, $f0, $f6 .LE008E44C: /* 38F2AC E008E44C E6000000 */ swc1 $f0, ($s0) diff --git a/asm/nonmatchings/code_38EE60/func_E008E4E0.s b/asm/nonmatchings/code_38EE60/func_E008E4E0.s index 43a2d0268f..fb59f8c806 100644 --- a/asm/nonmatchings/code_38EE60/func_E008E4E0.s +++ b/asm/nonmatchings/code_38EE60/func_E008E4E0.s @@ -141,11 +141,11 @@ glabel func_E008E4E0 .LE008E700: /* 38F560 E008E700 C6140018 */ lwc1 $f20, 0x18($s0) /* 38F564 E008E704 44800000 */ mtc1 $zero, $f0 -/* 38F568 E008E708 00000000 */ nop +/* 38F568 E008E708 00000000 */ nop /* 38F56C E008E70C 4600A032 */ c.eq.s $f20, $f0 -/* 38F570 E008E710 00000000 */ nop +/* 38F570 E008E710 00000000 */ nop /* 38F574 E008E714 4501003F */ bc1t .LE008E814 -/* 38F578 E008E718 00000000 */ nop +/* 38F578 E008E718 00000000 */ nop /* 38F57C E008E71C 8E220000 */ lw $v0, ($s1) /* 38F580 E008E720 0040182D */ daddu $v1, $v0, $zero /* 38F584 E008E724 24420008 */ addiu $v0, $v0, 8 @@ -240,4 +240,4 @@ glabel func_E008E4E0 /* 38F6E0 E008E880 D7B40100 */ ldc1 $f20, 0x100($sp) /* 38F6E4 E008E884 03E00008 */ jr $ra /* 38F6E8 E008E888 27BD0108 */ addiu $sp, $sp, 0x108 -/* 38F6EC E008E88C 00000000 */ nop +/* 38F6EC E008E88C 00000000 */ nop diff --git a/asm/nonmatchings/code_39210_len_aa0/func_8005DECC.s b/asm/nonmatchings/code_39210_len_aa0/func_8005DECC.s index c90cfb0914..5a8ac098ee 100644 --- a/asm/nonmatchings/code_39210_len_aa0/func_8005DECC.s +++ b/asm/nonmatchings/code_39210_len_aa0/func_8005DECC.s @@ -22,7 +22,7 @@ glabel func_8005DECC /* 39310 8005DF10 AE240020 */ sw $a0, 0x20($s1) .L8005DF14: /* 39314 8005DF14 080177C5 */ j .L8005DF14 -/* 39318 8005DF18 00000000 */ nop +/* 39318 8005DF18 00000000 */ nop .L8005DF1C: /* 3931C 8005DF1C 0000282D */ daddu $a1, $zero, $zero /* 39320 8005DF20 0080182D */ daddu $v1, $a0, $zero diff --git a/asm/nonmatchings/code_39210_len_aa0/func_8005DFD4.s b/asm/nonmatchings/code_39210_len_aa0/func_8005DFD4.s index e0377bc999..368d54b4ea 100644 --- a/asm/nonmatchings/code_39210_len_aa0/func_8005DFD4.s +++ b/asm/nonmatchings/code_39210_len_aa0/func_8005DFD4.s @@ -25,10 +25,10 @@ glabel func_8005DFD4 /* 39424 8005E024 10600003 */ beqz $v1, .L8005E034 /* 39428 8005E028 0002982B */ sltu $s3, $zero, $v0 /* 3942C 8005E02C 16600038 */ bnez $s3, .L8005E110 -/* 39430 8005E030 00000000 */ nop +/* 39430 8005E030 00000000 */ nop .L8005E034: /* 39434 8005E034 1660000E */ bnez $s3, .L8005E070 -/* 39438 8005E038 00000000 */ nop +/* 39438 8005E038 00000000 */ nop /* 3943C 8005E03C 8FA60018 */ lw $a2, 0x18($sp) /* 39440 8005E040 8FA70020 */ lw $a3, 0x20($sp) /* 39444 8005E044 C64C0038 */ lwc1 $f12, 0x38($s2) @@ -36,12 +36,12 @@ glabel func_8005DFD4 /* 3944C 8005E04C C64E0040 */ lwc1 $f14, 0x40($s2) /* 39450 8005E050 C622029C */ lwc1 $f2, 0x29c($s1) /* 39454 8005E054 4602003E */ c.le.s $f0, $f2 -/* 39458 8005E058 00000000 */ nop +/* 39458 8005E058 00000000 */ nop /* 3945C 8005E05C 45000004 */ bc1f .L8005E070 -/* 39460 8005E060 00000000 */ nop +/* 39460 8005E060 00000000 */ nop /* 39464 8005E064 82020000 */ lb $v0, ($s0) /* 39468 8005E068 10400029 */ beqz $v0, .L8005E110 -/* 3946C 8005E06C 00000000 */ nop +/* 3946C 8005E06C 00000000 */ nop .L8005E070: /* 39470 8005E070 8E220280 */ lw $v0, 0x280($s1) /* 39474 8005E074 C7A00018 */ lwc1 $f0, 0x18($sp) @@ -49,27 +49,27 @@ glabel func_8005DFD4 /* 3947C 8005E07C 02228021 */ addu $s0, $s1, $v0 /* 39480 8005E080 C6020004 */ lwc1 $f2, 4($s0) /* 39484 8005E084 46001032 */ c.eq.s $f2, $f0 -/* 39488 8005E088 00000000 */ nop +/* 39488 8005E088 00000000 */ nop /* 3948C 8005E08C 4500000D */ bc1f .L8005E0C4 -/* 39490 8005E090 00000000 */ nop +/* 39490 8005E090 00000000 */ nop /* 39494 8005E094 C6020008 */ lwc1 $f2, 8($s0) /* 39498 8005E098 C7A0001C */ lwc1 $f0, 0x1c($sp) /* 3949C 8005E09C 46001032 */ c.eq.s $f2, $f0 -/* 394A0 8005E0A0 00000000 */ nop +/* 394A0 8005E0A0 00000000 */ nop /* 394A4 8005E0A4 45000007 */ bc1f .L8005E0C4 -/* 394A8 8005E0A8 00000000 */ nop +/* 394A8 8005E0A8 00000000 */ nop /* 394AC 8005E0AC C602000C */ lwc1 $f2, 0xc($s0) /* 394B0 8005E0B0 C7A00020 */ lwc1 $f0, 0x20($sp) /* 394B4 8005E0B4 46001032 */ c.eq.s $f2, $f0 -/* 394B8 8005E0B8 00000000 */ nop +/* 394B8 8005E0B8 00000000 */ nop /* 394BC 8005E0BC 45010014 */ bc1t .L8005E110 -/* 394C0 8005E0C0 00000000 */ nop +/* 394C0 8005E0C0 00000000 */ nop .L8005E0C4: /* 394C4 8005E0C4 8E220280 */ lw $v0, 0x280($s1) /* 394C8 8005E0C8 8E230284 */ lw $v1, 0x284($s1) /* 394CC 8005E0CC 24420001 */ addiu $v0, $v0, 1 /* 394D0 8005E0D0 1062000F */ beq $v1, $v0, .L8005E110 -/* 394D4 8005E0D4 00000000 */ nop +/* 394D4 8005E0D4 00000000 */ nop /* 394D8 8005E0D8 AE220280 */ sw $v0, 0x280($s1) /* 394DC 8005E0DC 28420028 */ slti $v0, $v0, 0x28 /* 394E0 8005E0E0 50400001 */ beql $v0, $zero, .L8005E0E8 diff --git a/asm/nonmatchings/code_39210_len_aa0/func_8005E12C.s b/asm/nonmatchings/code_39210_len_aa0/func_8005E12C.s index e51769f789..c18dffd150 100644 --- a/asm/nonmatchings/code_39210_len_aa0/func_8005E12C.s +++ b/asm/nonmatchings/code_39210_len_aa0/func_8005E12C.s @@ -27,16 +27,16 @@ glabel func_8005E12C /* 39584 8005E184 50400005 */ beql $v0, $zero, .L8005E19C /* 39588 8005E188 24020002 */ addiu $v0, $zero, 2 /* 3958C 8005E18C 10600015 */ beqz $v1, .L8005E1E4 -/* 39590 8005E190 00000000 */ nop +/* 39590 8005E190 00000000 */ nop /* 39594 8005E194 08017A20 */ j .L8005E880 -/* 39598 8005E198 00000000 */ nop +/* 39598 8005E198 00000000 */ nop .L8005E19C: /* 3959C 8005E19C 10620104 */ beq $v1, $v0, .L8005E5B0 /* 395A0 8005E1A0 2402000A */ addiu $v0, $zero, 0xa /* 395A4 8005E1A4 1062014C */ beq $v1, $v0, .L8005E6D8 -/* 395A8 8005E1A8 00000000 */ nop +/* 395A8 8005E1A8 00000000 */ nop /* 395AC 8005E1AC 08017A20 */ j .L8005E880 -/* 395B0 8005E1B0 00000000 */ nop +/* 395B0 8005E1B0 00000000 */ nop .L8005E1B4: /* 395B4 8005E1B4 8E220290 */ lw $v0, 0x290($s1) /* 395B8 8005E1B8 C658000C */ lwc1 $f24, 0xc($s2) @@ -72,7 +72,7 @@ glabel func_8005E12C /* 39628 8005E228 E6460018 */ swc1 $f6, 0x18($s2) /* 3962C 8005E22C C62202A0 */ lwc1 $f2, 0x2a0($s1) /* 39630 8005E230 4600103E */ c.le.s $f2, $f0 -/* 39634 8005E234 00000000 */ nop +/* 39634 8005E234 00000000 */ nop /* 39638 8005E238 45000003 */ bc1f .L8005E248 /* 3963C 8005E23C E7A00034 */ swc1 $f0, 0x34($sp) /* 39640 8005E240 C6200298 */ lwc1 $f0, 0x298($s1) @@ -93,7 +93,7 @@ glabel func_8005E12C /* 39674 8005E274 4406B000 */ mfc1 $a2, $f22 /* 39678 8005E278 4407A000 */ mfc1 $a3, $f20 /* 3967C 8005E27C 0C00A7B5 */ jal dist2D -/* 39680 8005E280 00000000 */ nop +/* 39680 8005E280 00000000 */ nop /* 39684 8005E284 C7AC0028 */ lwc1 $f12, 0x28($sp) /* 39688 8005E288 C7AE0030 */ lwc1 $f14, 0x30($sp) /* 3968C 8005E28C 4406B000 */ mfc1 $a2, $f22 @@ -103,7 +103,7 @@ glabel func_8005E12C /* 3969C 8005E29C C6440018 */ lwc1 $f4, 0x18($s2) /* 396A0 8005E2A0 C7A20034 */ lwc1 $f2, 0x34($sp) /* 396A4 8005E2A4 4602203C */ c.lt.s $f4, $f2 -/* 396A8 8005E2A8 00000000 */ nop +/* 396A8 8005E2A8 00000000 */ nop /* 396AC 8005E2AC 45000020 */ bc1f .L8005E330 /* 396B0 8005E2B0 46000606 */ mov.s $f24, $f0 /* 396B4 8005E2B4 C7AC0028 */ lwc1 $f12, 0x28($sp) @@ -114,19 +114,19 @@ glabel func_8005E12C /* 396C8 8005E2C8 E7A00034 */ swc1 $f0, 0x34($sp) /* 396CC 8005E2CC C62202A0 */ lwc1 $f2, 0x2a0($s1) /* 396D0 8005E2D0 4600103C */ c.lt.s $f2, $f0 -/* 396D4 8005E2D4 00000000 */ nop +/* 396D4 8005E2D4 00000000 */ nop /* 396D8 8005E2D8 45010036 */ bc1t .L8005E3B4 -/* 396DC 8005E2DC 00000000 */ nop +/* 396DC 8005E2DC 00000000 */ nop /* 396E0 8005E2E0 C622029C */ lwc1 $f2, 0x29c($s1) /* 396E4 8005E2E4 4600103C */ c.lt.s $f2, $f0 -/* 396E8 8005E2E8 00000000 */ nop +/* 396E8 8005E2E8 00000000 */ nop /* 396EC 8005E2EC 45000010 */ bc1f .L8005E330 -/* 396F0 8005E2F0 00000000 */ nop +/* 396F0 8005E2F0 00000000 */ nop /* 396F4 8005E2F4 46020001 */ sub.s $f0, $f0, $f2 /* 396F8 8005E2F8 E6400018 */ swc1 $f0, 0x18($s2) /* 396FC 8005E2FC C6220294 */ lwc1 $f2, 0x294($s1) /* 39700 8005E300 4600103C */ c.lt.s $f2, $f0 -/* 39704 8005E304 00000000 */ nop +/* 39704 8005E304 00000000 */ nop /* 39708 8005E308 4503002A */ bc1tl .L8005E3B4 /* 3970C 8005E30C E6420018 */ swc1 $f2, 0x18($s2) /* 39710 8005E310 3C013FF0 */ lui $at, 0x3ff0 @@ -149,7 +149,7 @@ glabel func_8005E12C /* 39750 8005E350 8FA70020 */ lw $a3, 0x20($sp) /* 39754 8005E354 C622029C */ lwc1 $f2, 0x29c($s1) /* 39758 8005E358 4602003E */ c.le.s $f0, $f2 -/* 3975C 8005E35C 00000000 */ nop +/* 3975C 8005E35C 00000000 */ nop /* 39760 8005E360 4501FF99 */ bc1t .L8005E1C8 /* 39764 8005E364 E7A00034 */ swc1 $f0, 0x34($sp) /* 39768 8005E368 8E220284 */ lw $v0, 0x284($s1) @@ -167,7 +167,7 @@ glabel func_8005E12C /* 39794 8005E394 C614000C */ lwc1 $f20, 0xc($s0) /* 39798 8005E398 30421000 */ andi $v0, $v0, 0x1000 /* 3979C 8005E39C 1040FFB3 */ beqz $v0, .L8005E26C -/* 397A0 8005E3A0 00000000 */ nop +/* 397A0 8005E3A0 00000000 */ nop /* 397A4 8005E3A4 82020000 */ lb $v0, ($s0) /* 397A8 8005E3A8 1040FFB0 */ beqz $v0, .L8005E26C /* 397AC 8005E3AC 24020001 */ addiu $v0, $zero, 1 @@ -177,13 +177,13 @@ glabel func_8005E12C /* 397B4 8005E3B4 8E420000 */ lw $v0, ($s2) /* 397B8 8005E3B8 30421000 */ andi $v0, $v0, 0x1000 /* 397BC 8005E3BC 14400008 */ bnez $v0, .L8005E3E0 -/* 397C0 8005E3C0 00000000 */ nop +/* 397C0 8005E3C0 00000000 */ nop /* 397C4 8005E3C4 C6400018 */ lwc1 $f0, 0x18($s2) /* 397C8 8005E3C8 3C013F00 */ lui $at, 0x3f00 /* 397CC 8005E3CC 44811000 */ mtc1 $at, $f2 -/* 397D0 8005E3D0 00000000 */ nop +/* 397D0 8005E3D0 00000000 */ nop /* 397D4 8005E3D4 46020002 */ mul.s $f0, $f0, $f2 -/* 397D8 8005E3D8 00000000 */ nop +/* 397D8 8005E3D8 00000000 */ nop /* 397DC 8005E3DC E6400018 */ swc1 $f0, 0x18($s2) .L8005E3E0: /* 397E0 8005E3E0 8E450018 */ lw $a1, 0x18($s2) @@ -242,7 +242,7 @@ glabel func_8005E12C /* 398AC 8005E4AC 46004186 */ mov.s $f6, $f8 /* 398B0 8005E4B0 E7A80034 */ swc1 $f8, 0x34($sp) /* 398B4 8005E4B4 4604303C */ c.lt.s $f6, $f4 -/* 398B8 8005E4B8 00000000 */ nop +/* 398B8 8005E4B8 00000000 */ nop /* 398BC 8005E4BC 45000002 */ bc1f .L8005E4C8 /* 398C0 8005E4C0 E7A4002C */ swc1 $f4, 0x2c($sp) /* 398C4 8005E4C4 E7A40034 */ swc1 $f4, 0x34($sp) @@ -250,9 +250,9 @@ glabel func_8005E12C /* 398C8 8005E4C8 C620029C */ lwc1 $f0, 0x29c($s1) /* 398CC 8005E4CC C7A20034 */ lwc1 $f2, 0x34($sp) /* 398D0 8005E4D0 4600103C */ c.lt.s $f2, $f0 -/* 398D4 8005E4D4 00000000 */ nop +/* 398D4 8005E4D4 00000000 */ nop /* 398D8 8005E4D8 4500000A */ bc1f .L8005E504 -/* 398DC 8005E4DC 00000000 */ nop +/* 398DC 8005E4DC 00000000 */ nop /* 398E0 8005E4E0 C64C0038 */ lwc1 $f12, 0x38($s2) /* 398E4 8005E4E4 C64E0040 */ lwc1 $f14, 0x40($s2) /* 398E8 8005E4E8 8FA60018 */ lw $a2, 0x18($sp) @@ -267,7 +267,7 @@ glabel func_8005E12C /* 39908 8005E508 46001003 */ div.s $f0, $f2, $f0 /* 3990C 8005E50C 4600028D */ trunc.w.s $f10, $f0 /* 39910 8005E510 44025000 */ mfc1 $v0, $f10 -/* 39914 8005E514 00000000 */ nop +/* 39914 8005E514 00000000 */ nop /* 39918 8005E518 A642008E */ sh $v0, 0x8e($s2) /* 3991C 8005E51C 00021400 */ sll $v0, $v0, 0x10 /* 39920 8005E520 00021403 */ sra $v0, $v0, 0x10 @@ -279,17 +279,17 @@ glabel func_8005E12C /* 39934 8005E534 8642008E */ lh $v0, 0x8e($s2) /* 39938 8005E538 C6420014 */ lwc1 $f2, 0x14($s2) /* 3993C 8005E53C 44823000 */ mtc1 $v0, $f6 -/* 39940 8005E540 00000000 */ nop +/* 39940 8005E540 00000000 */ nop /* 39944 8005E544 468031A0 */ cvt.s.w $f6, $f6 /* 39948 8005E548 46061082 */ mul.s $f2, $f2, $f6 -/* 3994C 8005E54C 00000000 */ nop +/* 3994C 8005E54C 00000000 */ nop /* 39950 8005E550 46061082 */ mul.s $f2, $f2, $f6 -/* 39954 8005E554 00000000 */ nop +/* 39954 8005E554 00000000 */ nop /* 39958 8005E558 3C013F00 */ lui $at, 0x3f00 /* 3995C 8005E55C 44810000 */ mtc1 $at, $f0 -/* 39960 8005E560 00000000 */ nop +/* 39960 8005E560 00000000 */ nop /* 39964 8005E564 46001082 */ mul.s $f2, $f2, $f0 -/* 39968 8005E568 00000000 */ nop +/* 39968 8005E568 00000000 */ nop /* 3996C 8005E56C 2404FDFF */ addiu $a0, $zero, -0x201 /* 39970 8005E570 C7A4002C */ lwc1 $f4, 0x2c($sp) /* 39974 8005E574 46003206 */ mov.s $f8, $f6 @@ -314,7 +314,7 @@ glabel func_8005E12C /* 399BC 8005E5BC C642003C */ lwc1 $f2, 0x3c($s2) /* 399C0 8005E5C0 46001080 */ add.s $f2, $f2, $f0 /* 399C4 8005E5C4 4480B000 */ mtc1 $zero, $f22 -/* 399C8 8005E5C8 00000000 */ nop +/* 399C8 8005E5C8 00000000 */ nop /* 399CC 8005E5CC 4616003E */ c.le.s $f0, $f22 /* 399D0 8005E5D0 E640001C */ swc1 $f0, 0x1c($s2) /* 399D4 8005E5D4 45000004 */ bc1f .L8005E5E8 @@ -329,7 +329,7 @@ glabel func_8005E12C /* 399F4 8005E5F4 0240202D */ daddu $a0, $s2, $zero /* 399F8 8005E5F8 C640001C */ lwc1 $f0, 0x1c($s2) /* 399FC 8005E5FC 4616003E */ c.le.s $f0, $f22 -/* 39A00 8005E600 00000000 */ nop +/* 39A00 8005E600 00000000 */ nop /* 39A04 8005E604 4500009E */ bc1f .L8005E880 /* 39A08 8005E608 27A50028 */ addiu $a1, $sp, 0x28 /* 39A0C 8005E60C 46000005 */ abs.s $f0, $f0 @@ -354,7 +354,7 @@ glabel func_8005E12C /* 39A58 8005E658 0C0372DF */ jal func_800DCB7C /* 39A5C 8005E65C 27A70030 */ addiu $a3, $sp, 0x30 /* 39A60 8005E660 10400087 */ beqz $v0, .L8005E880 -/* 39A64 8005E664 00000000 */ nop +/* 39A64 8005E664 00000000 */ nop /* 39A68 8005E668 C640001C */ lwc1 $f0, 0x1c($s2) /* 39A6C 8005E66C C7A20034 */ lwc1 $f2, 0x34($sp) /* 39A70 8005E670 46000005 */ abs.s $f0, $f0 @@ -362,9 +362,9 @@ glabel func_8005E12C /* 39A78 8005E678 46340000 */ add.d $f0, $f0, $f20 /* 39A7C 8005E67C 460010A1 */ cvt.d.s $f2, $f2 /* 39A80 8005E680 4620103E */ c.le.d $f2, $f0 -/* 39A84 8005E684 00000000 */ nop +/* 39A84 8005E684 00000000 */ nop /* 39A88 8005E688 4500007D */ bc1f .L8005E880 -/* 39A8C 8005E68C 00000000 */ nop +/* 39A8C 8005E68C 00000000 */ nop /* 39A90 8005E690 C7AC0028 */ lwc1 $f12, 0x28($sp) /* 39A94 8005E694 C7AE0030 */ lwc1 $f14, 0x30($sp) /* 39A98 8005E698 8FA60018 */ lw $a2, 0x18($sp) @@ -380,7 +380,7 @@ glabel func_8005E12C /* 39AC0 8005E6C0 AE430028 */ sw $v1, 0x28($s2) .L8005E6C4: /* 39AC4 8005E6C4 0C00A720 */ jal atan2 -/* 39AC8 8005E6C8 00000000 */ nop +/* 39AC8 8005E6C8 00000000 */ nop /* 39ACC 8005E6CC E640000C */ swc1 $f0, 0xc($s2) /* 39AD0 8005E6D0 08017A20 */ j .L8005E880 /* 39AD4 8005E6D4 AE200288 */ sw $zero, 0x288($s1) @@ -403,7 +403,7 @@ glabel func_8005E12C /* 39B14 8005E714 E7A40030 */ swc1 $f4, 0x30($sp) /* 39B18 8005E718 C622029C */ lwc1 $f2, 0x29c($s1) /* 39B1C 8005E71C 4602003E */ c.le.s $f0, $f2 -/* 39B20 8005E720 00000000 */ nop +/* 39B20 8005E720 00000000 */ nop /* 39B24 8005E724 45010056 */ bc1t .L8005E880 /* 39B28 8005E728 E7A00034 */ swc1 $f0, 0x34($sp) /* 39B2C 8005E72C 3C0142B4 */ lui $at, 0x42b4 @@ -411,13 +411,13 @@ glabel func_8005E12C .L8005E734: /* 39B34 8005E734 82020000 */ lb $v0, ($s0) /* 39B38 8005E738 14400028 */ bnez $v0, .L8005E7DC -/* 39B3C 8005E73C 00000000 */ nop +/* 39B3C 8005E73C 00000000 */ nop /* 39B40 8005E740 C64C0038 */ lwc1 $f12, 0x38($s2) /* 39B44 8005E744 C64E0040 */ lwc1 $f14, 0x40($s2) /* 39B48 8005E748 4406B000 */ mfc1 $a2, $f22 /* 39B4C 8005E74C 4407A000 */ mfc1 $a3, $f20 /* 39B50 8005E750 0C00A720 */ jal atan2 -/* 39B54 8005E754 00000000 */ nop +/* 39B54 8005E754 00000000 */ nop /* 39B58 8005E758 C64C0038 */ lwc1 $f12, 0x38($s2) /* 39B5C 8005E75C C64E0040 */ lwc1 $f14, 0x40($s2) /* 39B60 8005E760 8FA60018 */ lw $a2, 0x18($sp) @@ -429,9 +429,9 @@ glabel func_8005E12C /* 39B78 8005E778 46000386 */ mov.s $f14, $f0 /* 39B7C 8005E77C 46000005 */ abs.s $f0, $f0 /* 39B80 8005E780 461A003C */ c.lt.s $f0, $f26 -/* 39B84 8005E784 00000000 */ nop +/* 39B84 8005E784 00000000 */ nop /* 39B88 8005E788 4501000F */ bc1t .L8005E7C8 -/* 39B8C 8005E78C 00000000 */ nop +/* 39B8C 8005E78C 00000000 */ nop /* 39B90 8005E790 8E230284 */ lw $v1, 0x284($s1) /* 39B94 8005E794 8E220280 */ lw $v0, 0x280($s1) /* 39B98 8005E798 1062000B */ beq $v1, $v0, .L8005E7C8 @@ -450,7 +450,7 @@ glabel func_8005E12C .L8005E7C8: /* 39BC8 8005E7C8 82020000 */ lb $v0, ($s0) /* 39BCC 8005E7CC 14400003 */ bnez $v0, .L8005E7DC -/* 39BD0 8005E7D0 00000000 */ nop +/* 39BD0 8005E7D0 00000000 */ nop /* 39BD4 8005E7D4 08017A20 */ j .L8005E880 /* 39BD8 8005E7D8 AE200288 */ sw $zero, 0x288($s1) .L8005E7DC: @@ -465,7 +465,7 @@ glabel func_8005E12C /* 39BF8 8005E7F8 4406B000 */ mfc1 $a2, $f22 /* 39BFC 8005E7FC 4407A000 */ mfc1 $a3, $f20 /* 39C00 8005E800 0C00A720 */ jal atan2 -/* 39C04 8005E804 00000000 */ nop +/* 39C04 8005E804 00000000 */ nop /* 39C08 8005E808 C64C0038 */ lwc1 $f12, 0x38($s2) /* 39C0C 8005E80C C64E0040 */ lwc1 $f14, 0x40($s2) /* 39C10 8005E810 8FA60018 */ lw $a2, 0x18($sp) @@ -477,7 +477,7 @@ glabel func_8005E12C /* 39C28 8005E828 46000386 */ mov.s $f14, $f0 /* 39C2C 8005E82C 46000005 */ abs.s $f0, $f0 /* 39C30 8005E830 461A003C */ c.lt.s $f0, $f26 -/* 39C34 8005E834 00000000 */ nop +/* 39C34 8005E834 00000000 */ nop /* 39C38 8005E838 45010010 */ bc1t .L8005E87C /* 39C3C 8005E83C 24020001 */ addiu $v0, $zero, 1 /* 39C40 8005E840 8E230284 */ lw $v1, 0x284($s1) @@ -510,5 +510,5 @@ glabel func_8005E12C /* 39C9C 8005E89C D7B40048 */ ldc1 $f20, 0x48($sp) /* 39CA0 8005E8A0 03E00008 */ jr $ra /* 39CA4 8005E8A4 27BD0068 */ addiu $sp, $sp, 0x68 -/* 39CA8 8005E8A8 00000000 */ nop -/* 39CAC 8005E8AC 00000000 */ nop +/* 39CA8 8005E8A8 00000000 */ nop +/* 39CAC 8005E8AC 00000000 */ nop diff --git a/asm/nonmatchings/code_3928D0/func_E0094000.s b/asm/nonmatchings/code_3928D0/func_E0094000.s index b73d7ae0e8..a70f6b12b0 100644 --- a/asm/nonmatchings/code_3928D0/func_E0094000.s +++ b/asm/nonmatchings/code_3928D0/func_E0094000.s @@ -38,7 +38,7 @@ glabel func_E0094000 /* 392954 E0094084 AE02000C */ sw $v0, 0xc($s0) .LE0094088: /* 392958 E0094088 08025022 */ j .LE0094088 -/* 39295C E009408C 00000000 */ nop +/* 39295C E009408C 00000000 */ nop .LE0094090: /* 392960 E0094090 2402001E */ addiu $v0, $zero, 0x1e /* 392964 E0094094 AC62001C */ sw $v0, 0x1c($v1) @@ -66,11 +66,11 @@ glabel func_E0094000 /* 3929B4 E00940E4 44802000 */ mtc1 $zero, $f4 /* 3929B8 E00940E8 460010A1 */ cvt.d.s $f2, $f2 /* 3929BC E00940EC 46241082 */ mul.d $f2, $f2, $f4 -/* 3929C0 E00940F0 00000000 */ nop +/* 3929C0 E00940F0 00000000 */ nop /* 3929C4 E00940F4 C7A00064 */ lwc1 $f0, 0x64($sp) /* 3929C8 E00940F8 46000021 */ cvt.d.s $f0, $f0 /* 3929CC E00940FC 46240002 */ mul.d $f0, $f0, $f4 -/* 3929D0 E0094100 00000000 */ nop +/* 3929D0 E0094100 00000000 */ nop /* 3929D4 E0094104 462010A0 */ cvt.s.d $f2, $f2 /* 3929D8 E0094108 46200020 */ cvt.s.d $f0, $f0 /* 3929DC E009410C E4620028 */ swc1 $f2, 0x28($v1) diff --git a/asm/nonmatchings/code_3928D0/func_E0094190.s b/asm/nonmatchings/code_3928D0/func_E0094190.s index d738f3d2fc..6840ab3463 100644 --- a/asm/nonmatchings/code_3928D0/func_E0094190.s +++ b/asm/nonmatchings/code_3928D0/func_E0094190.s @@ -3,4 +3,4 @@ glabel func_E0094190 /* 392A60 E0094190 03E00008 */ jr $ra -/* 392A64 E0094194 00000000 */ nop +/* 392A64 E0094194 00000000 */ nop diff --git a/asm/nonmatchings/code_3928D0/func_E0094198.s b/asm/nonmatchings/code_3928D0/func_E0094198.s index f9f723e6bf..4ef67530d7 100644 --- a/asm/nonmatchings/code_3928D0/func_E0094198.s +++ b/asm/nonmatchings/code_3928D0/func_E0094198.s @@ -18,22 +18,22 @@ glabel func_E0094198 /* 392A98 E00941C8 04A10005 */ bgez $a1, .LE00941E0 /* 392A9C E00941CC AC620020 */ sw $v0, 0x20($v1) /* 392AA0 E00941D0 0C080128 */ jal func_E02004A0 -/* 392AA4 E00941D4 00000000 */ nop +/* 392AA4 E00941D4 00000000 */ nop /* 392AA8 E00941D8 080250AD */ j .LE00942B4 -/* 392AAC E00941DC 00000000 */ nop +/* 392AAC E00941DC 00000000 */ nop .LE00941E0: /* 392AB0 E00941E0 0040202D */ daddu $a0, $v0, $zero /* 392AB4 E00941E4 24020002 */ addiu $v0, $zero, 2 /* 392AB8 E00941E8 14C2000B */ bne $a2, $v0, .LE0094218 /* 392ABC E00941EC 28820015 */ slti $v0, $a0, 0x15 /* 392AC0 E00941F0 10400016 */ beqz $v0, .LE009424C -/* 392AC4 E00941F4 00000000 */ nop +/* 392AC4 E00941F4 00000000 */ nop /* 392AC8 E00941F8 C4600024 */ lwc1 $f0, 0x24($v1) /* 392ACC E00941FC 3C01E009 */ lui $at, %hi(D_E00947B0) /* 392AD0 E0094200 D42247B0 */ ldc1 $f2, %lo(D_E00947B0)($at) /* 392AD4 E0094204 46000021 */ cvt.d.s $f0, $f0 /* 392AD8 E0094208 46220002 */ mul.d $f0, $f0, $f2 -/* 392ADC E009420C 00000000 */ nop +/* 392ADC E009420C 00000000 */ nop /* 392AE0 E0094210 08025092 */ j .LE0094248 /* 392AE4 E0094214 46200020 */ cvt.s.d $f0, $f0 .LE0094218: @@ -46,7 +46,7 @@ glabel func_E0094198 /* 392B00 E0094230 3C01E009 */ lui $at, %hi(D_E00947B8) /* 392B04 E0094234 D42447B8 */ ldc1 $f4, %lo(D_E00947B8)($at) /* 392B08 E0094238 46241082 */ mul.d $f2, $f2, $f4 -/* 392B0C E009423C 00000000 */ nop +/* 392B0C E009423C 00000000 */ nop /* 392B10 E0094240 46220000 */ add.d $f0, $f0, $f2 /* 392B14 E0094244 46200020 */ cvt.s.d $f0, $f0 .LE0094248: @@ -57,7 +57,7 @@ glabel func_E0094198 /* 392B24 E0094254 C4600014 */ lwc1 $f0, 0x14($v1) /* 392B28 E0094258 46800021 */ cvt.d.w $f0, $f0 /* 392B2C E009425C 46220002 */ mul.d $f0, $f0, $f2 -/* 392B30 E0094260 00000000 */ nop +/* 392B30 E0094260 00000000 */ nop /* 392B34 E0094264 28A20005 */ slti $v0, $a1, 5 /* 392B38 E0094268 4620018D */ trunc.w.d $f6, $f0 /* 392B3C E009426C E4660014 */ swc1 $f6, 0x14($v1) @@ -68,12 +68,12 @@ glabel func_E0094198 /* 392B50 E0094280 C4600018 */ lwc1 $f0, 0x18($v1) /* 392B54 E0094284 46800021 */ cvt.d.w $f0, $f0 /* 392B58 E0094288 46220002 */ mul.d $f0, $f0, $f2 -/* 392B5C E009428C 00000000 */ nop +/* 392B5C E009428C 00000000 */ nop /* 392B60 E0094290 4620018D */ trunc.w.d $f6, $f0 /* 392B64 E0094294 E4660018 */ swc1 $f6, 0x18($v1) .LE0094298: /* 392B68 E0094298 14400006 */ bnez $v0, .LE00942B4 -/* 392B6C E009429C 00000000 */ nop +/* 392B6C E009429C 00000000 */ nop /* 392B70 E00942A0 8C620010 */ lw $v0, 0x10($v1) /* 392B74 E00942A4 2442FFF3 */ addiu $v0, $v0, -0xd /* 392B78 E00942A8 04410002 */ bgez $v0, .LE00942B4 diff --git a/asm/nonmatchings/code_3928D0/func_E00942FC.s b/asm/nonmatchings/code_3928D0/func_E00942FC.s index d2504ded88..d6a273668a 100644 --- a/asm/nonmatchings/code_3928D0/func_E00942FC.s +++ b/asm/nonmatchings/code_3928D0/func_E00942FC.s @@ -195,7 +195,7 @@ glabel func_E00942FC /* 392EBC E00945EC 10400059 */ beqz $v0, .LE0094754 /* 392EC0 E00945F0 24020001 */ addiu $v0, $zero, 1 /* 392EC4 E00945F4 16A2000D */ bne $s5, $v0, .LE009462C -/* 392EC8 E00945F8 00000000 */ nop +/* 392EC8 E00945F8 00000000 */ nop /* 392ECC E00945FC 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* 392ED0 E0094600 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 392ED4 E0094604 8C620000 */ lw $v0, ($v1) @@ -221,7 +221,7 @@ glabel func_E00942FC /* 392F20 E0094650 44801000 */ mtc1 $zero, $f2 /* 392F24 E0094654 46000021 */ cvt.d.s $f0, $f0 /* 392F28 E0094658 46220002 */ mul.d $f0, $f0, $f2 -/* 392F2C E009465C 00000000 */ nop +/* 392F2C E009465C 00000000 */ nop /* 392F30 E0094660 3C120001 */ lui $s2, 1 /* 392F34 E0094664 36521630 */ ori $s2, $s2, 0x1630 /* 392F38 E0094668 27B00058 */ addiu $s0, $sp, 0x58 @@ -305,5 +305,5 @@ glabel func_E00942FC /* 39306C E009479C 8FB000D8 */ lw $s0, 0xd8($sp) /* 393070 E00947A0 03E00008 */ jr $ra /* 393074 E00947A4 27BD00F8 */ addiu $sp, $sp, 0xf8 -/* 393078 E00947A8 00000000 */ nop -/* 39307C E00947AC 00000000 */ nop +/* 393078 E00947A8 00000000 */ nop +/* 39307C E00947AC 00000000 */ nop diff --git a/asm/nonmatchings/code_395BB0/func_E0098000.s b/asm/nonmatchings/code_395BB0/func_E0098000.s index d0f1bff012..cb58fd78d2 100644 --- a/asm/nonmatchings/code_395BB0/func_E0098000.s +++ b/asm/nonmatchings/code_395BB0/func_E0098000.s @@ -41,7 +41,7 @@ glabel func_E0098000 /* 395C40 E0098090 AE22000C */ sw $v0, 0xc($s1) .LE0098094: /* 395C44 E0098094 08026025 */ j .LE0098094 -/* 395C48 E0098098 00000000 */ nop +/* 395C48 E0098098 00000000 */ nop .LE009809C: /* 395C4C E009809C AE120000 */ sw $s2, ($s0) /* 395C50 E00980A0 E6140004 */ swc1 $f20, 4($s0) @@ -63,12 +63,12 @@ glabel func_E0098000 /* 395C90 E00980E0 AE020048 */ sw $v0, 0x48($s0) /* 395C94 E00980E4 24040168 */ addiu $a0, $zero, 0x168 /* 395C98 E00980E8 44820000 */ mtc1 $v0, $f0 -/* 395C9C E00980EC 00000000 */ nop +/* 395C9C E00980EC 00000000 */ nop /* 395CA0 E00980F0 46800020 */ cvt.s.w $f0, $f0 /* 395CA4 E00980F4 0C080138 */ jal func_E02004E0 /* 395CA8 E00980F8 E6000028 */ swc1 $f0, 0x28($s0) /* 395CAC E00980FC 44820000 */ mtc1 $v0, $f0 -/* 395CB0 E0098100 00000000 */ nop +/* 395CB0 E0098100 00000000 */ nop /* 395CB4 E0098104 46800020 */ cvt.s.w $f0, $f0 /* 395CB8 E0098108 0220102D */ daddu $v0, $s1, $zero /* 395CBC E009810C 240300FF */ addiu $v1, $zero, 0xff diff --git a/asm/nonmatchings/code_395BB0/func_E0098168.s b/asm/nonmatchings/code_395BB0/func_E0098168.s index 6957f386de..73969d9e93 100644 --- a/asm/nonmatchings/code_395BB0/func_E0098168.s +++ b/asm/nonmatchings/code_395BB0/func_E0098168.s @@ -3,4 +3,4 @@ glabel func_E0098168 /* 395D18 E0098168 03E00008 */ jr $ra -/* 395D1C E009816C 00000000 */ nop +/* 395D1C E009816C 00000000 */ nop diff --git a/asm/nonmatchings/code_395BB0/func_E0098170.s b/asm/nonmatchings/code_395BB0/func_E0098170.s index e2fef6f42a..fe3b266821 100644 --- a/asm/nonmatchings/code_395BB0/func_E0098170.s +++ b/asm/nonmatchings/code_395BB0/func_E0098170.s @@ -16,14 +16,14 @@ glabel func_E0098170 /* 395D4C E009819C 04610005 */ bgez $v1, .LE00981B4 /* 395D50 E00981A0 AE02004C */ sw $v0, 0x4c($s0) /* 395D54 E00981A4 0C080128 */ jal func_E02004A0 -/* 395D58 E00981A8 00000000 */ nop +/* 395D58 E00981A8 00000000 */ nop /* 395D5C E00981AC 080260A2 */ j .LE0098288 -/* 395D60 E00981B0 00000000 */ nop +/* 395D60 E00981B0 00000000 */ nop .LE00981B4: /* 395D64 E00981B4 C6020008 */ lwc1 $f2, 8($s0) /* 395D68 E00981B8 C6000010 */ lwc1 $f0, 0x10($s0) /* 395D6C E00981BC 46001032 */ c.eq.s $f2, $f0 -/* 395D70 E00981C0 00000000 */ nop +/* 395D70 E00981C0 00000000 */ nop /* 395D74 E00981C4 45010025 */ bc1t .LE009825C /* 395D78 E00981C8 0060882D */ daddu $s1, $v1, $zero /* 395D7C E00981CC C6020018 */ lwc1 $f2, 0x18($s0) @@ -47,7 +47,7 @@ glabel func_E0098170 /* 395DC4 E0098214 E6080024 */ swc1 $f8, 0x24($s0) /* 395DC8 E0098218 E606002C */ swc1 $f6, 0x2c($s0) /* 395DCC E009821C 460A203E */ c.le.s $f4, $f10 -/* 395DD0 E0098220 00000000 */ nop +/* 395DD0 E0098220 00000000 */ nop /* 395DD4 E0098224 4500000D */ bc1f .LE009825C /* 395DD8 E0098228 E6000028 */ swc1 $f0, 0x28($s0) /* 395DDC E009822C 24040015 */ addiu $a0, $zero, 0x15 @@ -65,13 +65,13 @@ glabel func_E0098170 .LE009825C: /* 395E0C E009825C 2A22000A */ slti $v0, $s1, 0xa /* 395E10 E0098260 10400009 */ beqz $v0, .LE0098288 -/* 395E14 E0098264 00000000 */ nop +/* 395E14 E0098264 00000000 */ nop /* 395E18 E0098268 3C01E00A */ lui $at, %hi(D_E0098530) /* 395E1C E009826C D4228530 */ ldc1 $f2, %lo(D_E0098530)($at) /* 395E20 E0098270 C6000044 */ lwc1 $f0, 0x44($s0) /* 395E24 E0098274 46800021 */ cvt.d.w $f0, $f0 /* 395E28 E0098278 46220002 */ mul.d $f0, $f0, $f2 -/* 395E2C E009827C 00000000 */ nop +/* 395E2C E009827C 00000000 */ nop /* 395E30 E0098280 4620030D */ trunc.w.d $f12, $f0 /* 395E34 E0098284 E60C0044 */ swc1 $f12, 0x44($s0) .LE0098288: diff --git a/asm/nonmatchings/code_395BB0/func_E00982EC.s b/asm/nonmatchings/code_395BB0/func_E00982EC.s index 727459a023..6160638926 100644 --- a/asm/nonmatchings/code_395BB0/func_E00982EC.s +++ b/asm/nonmatchings/code_395BB0/func_E00982EC.s @@ -138,6 +138,6 @@ glabel func_E00982EC /* 3960A8 E00984F8 8FB00060 */ lw $s0, 0x60($sp) /* 3960AC E00984FC 03E00008 */ jr $ra /* 3960B0 E0098500 27BD0080 */ addiu $sp, $sp, 0x80 -/* 3960B4 E0098504 00000000 */ nop -/* 3960B8 E0098508 00000000 */ nop -/* 3960BC E009850C 00000000 */ nop +/* 3960B4 E0098504 00000000 */ nop +/* 3960B8 E0098508 00000000 */ nop +/* 3960BC E009850C 00000000 */ nop diff --git a/asm/nonmatchings/code_3965B0/func_E009A140.s b/asm/nonmatchings/code_3965B0/func_E009A140.s index 256fba05e3..4f26c72f2b 100644 --- a/asm/nonmatchings/code_3965B0/func_E009A140.s +++ b/asm/nonmatchings/code_3965B0/func_E009A140.s @@ -25,11 +25,12 @@ glabel func_E009A140 /* 39673C E009A18C 2C820006 */ sltiu $v0, $a0, 6 /* 396740 E009A190 1040007B */ beqz $v0, .LE009A380 /* 396744 E009A194 00041080 */ sll $v0, $a0, 2 -/* 396748 E009A198 3C01E00A */ lui $at, %hi(D_E009AA60) +/* 396748 E009A198 3C01E00A */ lui $at, %hi(jtbl_E009AA60_397010) /* 39674C E009A19C 00220821 */ addu $at, $at, $v0 -/* 396750 E009A1A0 8C22AA60 */ lw $v0, %lo(D_E009AA60)($at) +/* 396750 E009A1A0 8C22AA60 */ lw $v0, %lo(jtbl_E009AA60_397010)($at) /* 396754 E009A1A4 00400008 */ jr $v0 /* 396758 E009A1A8 00000000 */ nop +glabel LE009A1AC_39675C /* 39675C E009A1AC 8E23003C */ lw $v1, 0x3c($s1) /* 396760 E009A1B0 8E220020 */ lw $v0, 0x20($s1) /* 396764 E009A1B4 C6200028 */ lwc1 $f0, 0x28($s1) @@ -70,6 +71,7 @@ glabel func_E009A140 /* 3967F0 E009A240 E6280010 */ swc1 $f8, 0x10($s1) /* 3967F4 E009A244 080268E0 */ j .LE009A380 /* 3967F8 E009A248 AE22002C */ sw $v0, 0x2c($s1) +glabel LE009A24C_3967FC /* 3967FC E009A24C 8E220030 */ lw $v0, 0x30($s1) /* 396800 E009A250 2442FFFF */ addiu $v0, $v0, -1 /* 396804 E009A254 1C40004A */ bgtz $v0, .LE009A380 @@ -79,6 +81,7 @@ glabel func_E009A140 /* 396814 E009A264 2402000A */ addiu $v0, $zero, 0xa /* 396818 E009A268 080268E0 */ j .LE009A380 /* 39681C E009A26C AE220030 */ sw $v0, 0x30($s1) +glabel LE009A270_396820 /* 396820 E009A270 8E220030 */ lw $v0, 0x30($s1) /* 396824 E009A274 2442FFFF */ addiu $v0, $v0, -1 /* 396828 E009A278 1C400041 */ bgtz $v0, .LE009A380 @@ -86,6 +89,7 @@ glabel func_E009A140 /* 396830 E009A280 24020003 */ addiu $v0, $zero, 3 /* 396834 E009A284 080268E0 */ j .LE009A380 /* 396838 E009A288 AE22002C */ sw $v0, 0x2c($s1) +glabel LE009A28C_39683C /* 39683C E009A28C C6200010 */ lwc1 $f0, 0x10($s1) /* 396840 E009A290 3C013F80 */ lui $at, 0x3f80 /* 396844 E009A294 44811000 */ mtc1 $at, $f2 @@ -126,6 +130,7 @@ glabel func_E009A140 /* 3968D0 E009A320 24020014 */ addiu $v0, $zero, 0x14 /* 3968D4 E009A324 080268E0 */ j .LE009A380 /* 3968D8 E009A328 AE220030 */ sw $v0, 0x30($s1) +glabel LE009A32C_3968DC /* 3968DC E009A32C 8E220030 */ lw $v0, 0x30($s1) /* 3968E0 E009A330 2442FFFF */ addiu $v0, $v0, -1 /* 3968E4 E009A334 1C400012 */ bgtz $v0, .LE009A380 @@ -133,6 +138,7 @@ glabel func_E009A140 /* 3968EC E009A33C 24020005 */ addiu $v0, $zero, 5 /* 3968F0 E009A340 080268E0 */ j .LE009A380 /* 3968F4 E009A344 AE22002C */ sw $v0, 0x2c($s1) +glabel LE009A348_3968F8 /* 3968F8 E009A348 2862000A */ slti $v0, $v1, 0xa /* 3968FC E009A34C 10400005 */ beqz $v0, .LE009A364 /* 396900 E009A350 00031040 */ sll $v0, $v1, 1 diff --git a/asm/nonmatchings/code_3A2290/func_E00A0000.s b/asm/nonmatchings/code_3A2290/func_E00A0000.s index d922a23712..d93775e2e1 100644 --- a/asm/nonmatchings/code_3A2290/func_E00A0000.s +++ b/asm/nonmatchings/code_3A2290/func_E00A0000.s @@ -111,4 +111,4 @@ glabel func_E00A0000 /* 3A2430 E00A01A0 0000102D */ daddu $v0, $zero, $zero /* 3A2434 E00A01A4 03E00008 */ jr $ra /* 3A2438 E00A01A8 27BD0030 */ addiu $sp, $sp, 0x30 -/* 3A243C E00A01AC 00000000 */ nop +/* 3A243C E00A01AC 00000000 */ nop diff --git a/asm/nonmatchings/code_3A2990/func_E00A2000.s b/asm/nonmatchings/code_3A2990/func_E00A2000.s index 1d89d104c3..9caef3f335 100644 --- a/asm/nonmatchings/code_3A2990/func_E00A2000.s +++ b/asm/nonmatchings/code_3A2990/func_E00A2000.s @@ -40,7 +40,7 @@ glabel func_E00A2000 /* 3A2A1C E00A208C AE02000C */ sw $v0, 0xc($s0) .LE00A2090: /* 3A2A20 E00A2090 08028824 */ j .LE00A2090 -/* 3A2A24 E00A2094 00000000 */ nop +/* 3A2A24 E00A2094 00000000 */ nop .LE00A2098: /* 3A2A28 E00A2098 06210004 */ bgez $s1, .LE00A20AC /* 3A2A2C E00A209C AC920000 */ sw $s2, ($a0) diff --git a/asm/nonmatchings/code_3A2990/func_E00A2234.s b/asm/nonmatchings/code_3A2990/func_E00A2234.s index 2d33744961..331c633f50 100644 --- a/asm/nonmatchings/code_3A2990/func_E00A2234.s +++ b/asm/nonmatchings/code_3A2990/func_E00A2234.s @@ -3,4 +3,4 @@ glabel func_E00A2234 /* 3A2BC4 E00A2234 03E00008 */ jr $ra -/* 3A2BC8 E00A2238 00000000 */ nop +/* 3A2BC8 E00A2238 00000000 */ nop diff --git a/asm/nonmatchings/code_3A37E0/func_E00A4000.s b/asm/nonmatchings/code_3A37E0/func_E00A4000.s index 784092da0a..f68aa85ea3 100644 --- a/asm/nonmatchings/code_3A37E0/func_E00A4000.s +++ b/asm/nonmatchings/code_3A37E0/func_E00A4000.s @@ -62,28 +62,35 @@ glabel func_E00A4000 /* 3A38B4 E00A40D4 1040001B */ beqz $v0, .LE00A4144 /* 3A38B8 E00A40D8 AC600018 */ sw $zero, 0x18($v1) /* 3A38BC E00A40DC 00111080 */ sll $v0, $s1, 2 -/* 3A38C0 E00A40E0 3C01E00A */ lui $at, %hi(D_E00A4AD0) +/* 3A38C0 E00A40E0 3C01E00A */ lui $at, %hi(jtbl_E00A4AD0_3A42B0) /* 3A38C4 E00A40E4 00220821 */ addu $at, $at, $v0 -/* 3A38C8 E00A40E8 8C224AD0 */ lw $v0, %lo(D_E00A4AD0)($at) +/* 3A38C8 E00A40E8 8C224AD0 */ lw $v0, %lo(jtbl_E00A4AD0_3A42B0)($at) /* 3A38CC E00A40EC 00400008 */ jr $v0 /* 3A38D0 E00A40F0 00000000 */ nop +glabel LE00A40F4_3A38D4 /* 3A38D4 E00A40F4 0802905E */ j .LE00A4178 /* 3A38D8 E00A40F8 AC60001C */ sw $zero, 0x1c($v1) +glabel LE00A40FC_3A38DC /* 3A38DC E00A40FC 24020002 */ addiu $v0, $zero, 2 /* 3A38E0 E00A4100 0802905E */ j .LE00A4178 /* 3A38E4 E00A4104 AC62001C */ sw $v0, 0x1c($v1) +glabel LE00A4108_3A38E8 /* 3A38E8 E00A4108 24020004 */ addiu $v0, $zero, 4 /* 3A38EC E00A410C 0802905E */ j .LE00A4178 /* 3A38F0 E00A4110 AC62001C */ sw $v0, 0x1c($v1) +glabel LE00A4114_3A38F4 /* 3A38F4 E00A4114 24020006 */ addiu $v0, $zero, 6 /* 3A38F8 E00A4118 0802905E */ j .LE00A4178 /* 3A38FC E00A411C AC62001C */ sw $v0, 0x1c($v1) +glabel LE00A4120_3A3900 /* 3A3900 E00A4120 24020007 */ addiu $v0, $zero, 7 /* 3A3904 E00A4124 0802905E */ j .LE00A4178 /* 3A3908 E00A4128 AC62001C */ sw $v0, 0x1c($v1) +glabel LE00A412C_3A390C /* 3A390C E00A412C 24020008 */ addiu $v0, $zero, 8 /* 3A3910 E00A4130 0802905E */ j .LE00A4178 /* 3A3914 E00A4134 AC62001C */ sw $v0, 0x1c($v1) +glabel LE00A4138_3A3918 /* 3A3918 E00A4138 24020009 */ addiu $v0, $zero, 9 /* 3A391C E00A413C 0802905E */ j .LE00A4178 /* 3A3920 E00A4140 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/code_3A37E0/func_E00A41AC.s b/asm/nonmatchings/code_3A37E0/func_E00A41AC.s index 6ae3f2b5ff..145cfe0ba5 100644 --- a/asm/nonmatchings/code_3A37E0/func_E00A41AC.s +++ b/asm/nonmatchings/code_3A37E0/func_E00A41AC.s @@ -55,11 +55,12 @@ glabel func_E00A41AC .LE00A4260: /* 3A3A40 E00A4260 104000C4 */ beqz $v0, .LE00A4574 /* 3A3A44 E00A4264 00041080 */ sll $v0, $a0, 2 -/* 3A3A48 E00A4268 3C01E00A */ lui $at, %hi(D_E00A4AF8) +/* 3A3A48 E00A4268 3C01E00A */ lui $at, %hi(jtbl_E00A4AF8_3A42D8) /* 3A3A4C E00A426C 00220821 */ addu $at, $at, $v0 -/* 3A3A50 E00A4270 8C224AF8 */ lw $v0, %lo(D_E00A4AF8)($at) +/* 3A3A50 E00A4270 8C224AF8 */ lw $v0, %lo(jtbl_E00A4AF8_3A42D8)($at) /* 3A3A54 E00A4274 00400008 */ jr $v0 /* 3A3A58 E00A4278 00000000 */ nop +glabel LE00A427C_3A3A5C /* 3A3A5C E00A427C 00031040 */ sll $v0, $v1, 1 /* 3A3A60 E00A4280 44826000 */ mtc1 $v0, $f12 /* 3A3A64 E00A4284 00000000 */ nop @@ -80,6 +81,7 @@ glabel func_E00A41AC /* 3A3AA0 E00A42C0 44811000 */ mtc1 $at, $f2 /* 3A3AA4 E00A42C4 080290F4 */ j .LE00A43D0 /* 3A3AA8 E00A42C8 46020000 */ add.s $f0, $f0, $f2 +glabel LE00A42CC_3A3AAC /* 3A3AAC E00A42CC 240500FF */ addiu $a1, $zero, 0xff /* 3A3AB0 E00A42D0 02250018 */ mult $s1, $a1 /* 3A3AB4 E00A42D4 3C048080 */ lui $a0, 0x8080 @@ -94,6 +96,7 @@ glabel func_E00A41AC /* 3A3AD8 E00A42F8 00003010 */ mfhi $a2 /* 3A3ADC E00A42FC 0802916E */ j .LE00A45B8 /* 3A3AE0 E00A4300 00C31021 */ addu $v0, $a2, $v1 +glabel LE00A4304_3A3AE4 /* 3A3AE4 E00A4304 00031040 */ sll $v0, $v1, 1 /* 3A3AE8 E00A4308 44826000 */ mtc1 $v0, $f12 /* 3A3AEC E00A430C 00000000 */ nop @@ -114,6 +117,7 @@ glabel func_E00A41AC /* 3A3B28 E00A4348 44811000 */ mtc1 $at, $f2 /* 3A3B2C E00A434C 080290F4 */ j .LE00A43D0 /* 3A3B30 E00A4350 46020000 */ add.s $f0, $f0, $f2 +glabel LE00A4354_3A3B34 /* 3A3B34 E00A4354 240300FF */ addiu $v1, $zero, 0xff /* 3A3B38 E00A4358 02230018 */ mult $s1, $v1 /* 3A3B3C E00A435C 3C048080 */ lui $a0, 0x8080 @@ -126,6 +130,7 @@ glabel func_E00A41AC /* 3A3B58 E00A4378 AE020024 */ sw $v0, 0x24($s0) /* 3A3B5C E00A437C 0802916B */ j .LE00A45AC /* 3A3B60 E00A4380 240200AA */ addiu $v0, $zero, 0xaa +glabel LE00A4384_3A3B64 /* 3A3B64 E00A4384 00031040 */ sll $v0, $v1, 1 /* 3A3B68 E00A4388 44826000 */ mtc1 $v0, $f12 /* 3A3B6C E00A438C 00000000 */ nop @@ -161,6 +166,7 @@ glabel func_E00A41AC /* 3A3BE0 E00A4400 00621823 */ subu $v1, $v1, $v0 /* 3A3BE4 E00A4404 08029172 */ j .LE00A45C8 /* 3A3BE8 E00A4408 AE03002C */ sw $v1, 0x2c($s0) +glabel LE00A440C_3A3BEC /* 3A3BEC E00A440C 240300FF */ addiu $v1, $zero, 0xff /* 3A3BF0 E00A4410 02230018 */ mult $s1, $v1 /* 3A3BF4 E00A4414 3C048080 */ lui $a0, 0x8080 @@ -172,6 +178,7 @@ glabel func_E00A41AC /* 3A3C0C E00A442C AE020024 */ sw $v0, 0x24($s0) /* 3A3C10 E00A4430 0802916B */ j .LE00A45AC /* 3A3C14 E00A4434 240200C8 */ addiu $v0, $zero, 0xc8 +glabel LE00A4438_3A3C18 /* 3A3C18 E00A4438 C6000030 */ lwc1 $f0, 0x30($s0) /* 3A3C1C E00A443C 3C01E00A */ lui $at, %hi(D_E00A4B20) /* 3A3C20 E00A4440 D4224B20 */ ldc1 $f2, %lo(D_E00A4B20)($at) @@ -190,6 +197,7 @@ glabel func_E00A41AC /* 3A3C54 E00A4474 AE020024 */ sw $v0, 0x24($s0) /* 3A3C58 E00A4478 08029153 */ j .LE00A454C /* 3A3C5C E00A447C 24020078 */ addiu $v0, $zero, 0x78 +glabel LE00A4480_3A3C60 /* 3A3C60 E00A4480 C6000030 */ lwc1 $f0, 0x30($s0) /* 3A3C64 E00A4484 3C01E00A */ lui $at, %hi(D_E00A4B28) /* 3A3C68 E00A4488 D4224B28 */ ldc1 $f2, %lo(D_E00A4B28)($at) @@ -206,6 +214,7 @@ glabel func_E00A41AC /* 3A3C94 E00A44B4 00640018 */ mult $v1, $a0 /* 3A3C98 E00A44B8 08029151 */ j .LE00A4544 /* 3A3C9C E00A44BC 240200BD */ addiu $v0, $zero, 0xbd +glabel LE00A44C0_3A3CA0 /* 3A3CA0 E00A44C0 C6000030 */ lwc1 $f0, 0x30($s0) /* 3A3CA4 E00A44C4 3C01E00A */ lui $at, %hi(D_E00A4B30) /* 3A3CA8 E00A44C8 D4224B30 */ ldc1 $f2, %lo(D_E00A4B30)($at) @@ -224,6 +233,7 @@ glabel func_E00A41AC /* 3A3CDC E00A44FC AE020024 */ sw $v0, 0x24($s0) /* 3A3CE0 E00A4500 08029153 */ j .LE00A454C /* 3A3CE4 E00A4504 2402006E */ addiu $v0, $zero, 0x6e +glabel LE00A4508_3A3CE8 /* 3A3CE8 E00A4508 C6000030 */ lwc1 $f0, 0x30($s0) /* 3A3CEC E00A450C 3C01E00A */ lui $at, %hi(D_E00A4B38) /* 3A3CF0 E00A4510 D4224B38 */ ldc1 $f2, %lo(D_E00A4B38)($at) diff --git a/asm/nonmatchings/code_3A5550/func_E00A6000.s b/asm/nonmatchings/code_3A5550/func_E00A6000.s index c26133316d..6b8f16d57b 100644 --- a/asm/nonmatchings/code_3A5550/func_E00A6000.s +++ b/asm/nonmatchings/code_3A5550/func_E00A6000.s @@ -38,7 +38,7 @@ glabel func_E00A6000 /* 3A55D4 E00A6084 AE02000C */ sw $v0, 0xc($s0) .LE00A6088: /* 3A55D8 E00A6088 08029822 */ j .LE00A6088 -/* 3A55DC E00A608C 00000000 */ nop +/* 3A55DC E00A608C 00000000 */ nop .LE00A6090: /* 3A55E0 E00A6090 0200102D */ daddu $v0, $s0, $zero /* 3A55E4 E00A6094 44800000 */ mtc1 $zero, $f0 diff --git a/asm/nonmatchings/code_3A5550/func_E00A611C.s b/asm/nonmatchings/code_3A5550/func_E00A611C.s index d1b88c88b1..1245aa706a 100644 --- a/asm/nonmatchings/code_3A5550/func_E00A611C.s +++ b/asm/nonmatchings/code_3A5550/func_E00A611C.s @@ -3,4 +3,4 @@ glabel func_E00A611C /* 3A566C E00A611C 03E00008 */ jr $ra -/* 3A5670 E00A6120 00000000 */ nop +/* 3A5670 E00A6120 00000000 */ nop diff --git a/asm/nonmatchings/code_3A5550/func_E00A6124.s b/asm/nonmatchings/code_3A5550/func_E00A6124.s index 9393174ee2..85559929c3 100644 --- a/asm/nonmatchings/code_3A5550/func_E00A6124.s +++ b/asm/nonmatchings/code_3A5550/func_E00A6124.s @@ -26,9 +26,9 @@ glabel func_E00A6124 /* 3A56C0 E00A6170 04610005 */ bgez $v1, .LE00A6188 /* 3A56C4 E00A6174 ACA20008 */ sw $v0, 8($a1) /* 3A56C8 E00A6178 0C080128 */ jal func_E02004A0 -/* 3A56CC E00A617C 00000000 */ nop +/* 3A56CC E00A617C 00000000 */ nop /* 3A56D0 E00A6180 080298D3 */ j .LE00A634C -/* 3A56D4 E00A6184 00000000 */ nop +/* 3A56D4 E00A6184 00000000 */ nop .LE00A6188: /* 3A56D8 E00A6188 C4A2001C */ lwc1 $f2, 0x1c($a1) /* 3A56DC E00A618C C4A0002C */ lwc1 $f0, 0x2c($a1) @@ -61,11 +61,11 @@ glabel func_E00A6124 .LE00A61F4: /* 3A5744 E00A61F4 C4A2001C */ lwc1 $f2, 0x1c($a1) /* 3A5748 E00A61F8 44800000 */ mtc1 $zero, $f0 -/* 3A574C E00A61FC 00000000 */ nop +/* 3A574C E00A61FC 00000000 */ nop /* 3A5750 E00A6200 4600103C */ c.lt.s $f2, $f0 -/* 3A5754 E00A6204 00000000 */ nop +/* 3A5754 E00A6204 00000000 */ nop /* 3A5758 E00A6208 45000005 */ bc1f .LE00A6220 -/* 3A575C E00A620C 00000000 */ nop +/* 3A575C E00A620C 00000000 */ nop /* 3A5760 E00A6210 3C014300 */ lui $at, 0x4300 /* 3A5764 E00A6214 44810000 */ mtc1 $at, $f0 /* 3A5768 E00A6218 08029890 */ j .LE00A6240 @@ -73,11 +73,11 @@ glabel func_E00A6124 .LE00A6220: /* 3A5770 E00A6220 3C014300 */ lui $at, 0x4300 /* 3A5774 E00A6224 44810000 */ mtc1 $at, $f0 -/* 3A5778 E00A6228 00000000 */ nop +/* 3A5778 E00A6228 00000000 */ nop /* 3A577C E00A622C 4602003C */ c.lt.s $f0, $f2 -/* 3A5780 E00A6230 00000000 */ nop +/* 3A5780 E00A6230 00000000 */ nop /* 3A5784 E00A6234 45000003 */ bc1f .LE00A6244 -/* 3A5788 E00A6238 00000000 */ nop +/* 3A5788 E00A6238 00000000 */ nop /* 3A578C E00A623C 46001001 */ sub.s $f0, $f2, $f0 .LE00A6240: /* 3A5790 E00A6240 E4A0001C */ swc1 $f0, 0x1c($a1) @@ -86,9 +86,9 @@ glabel func_E00A6124 /* 3A5798 E00A6248 C4A20030 */ lwc1 $f2, 0x30($a1) /* 3A579C E00A624C 46020080 */ add.s $f2, $f0, $f2 /* 3A57A0 E00A6250 44800000 */ mtc1 $zero, $f0 -/* 3A57A4 E00A6254 00000000 */ nop +/* 3A57A4 E00A6254 00000000 */ nop /* 3A57A8 E00A6258 4600103C */ c.lt.s $f2, $f0 -/* 3A57AC E00A625C 00000000 */ nop +/* 3A57AC E00A625C 00000000 */ nop /* 3A57B0 E00A6260 45000005 */ bc1f .LE00A6278 /* 3A57B4 E00A6264 E4A20020 */ swc1 $f2, 0x20($a1) /* 3A57B8 E00A6268 3C014300 */ lui $at, 0x4300 @@ -98,11 +98,11 @@ glabel func_E00A6124 .LE00A6278: /* 3A57C8 E00A6278 3C014300 */ lui $at, 0x4300 /* 3A57CC E00A627C 44810000 */ mtc1 $at, $f0 -/* 3A57D0 E00A6280 00000000 */ nop +/* 3A57D0 E00A6280 00000000 */ nop /* 3A57D4 E00A6284 4602003C */ c.lt.s $f0, $f2 -/* 3A57D8 E00A6288 00000000 */ nop +/* 3A57D8 E00A6288 00000000 */ nop /* 3A57DC E00A628C 45000003 */ bc1f .LE00A629C -/* 3A57E0 E00A6290 00000000 */ nop +/* 3A57E0 E00A6290 00000000 */ nop /* 3A57E4 E00A6294 46001001 */ sub.s $f0, $f2, $f0 .LE00A6298: /* 3A57E8 E00A6298 E4A00020 */ swc1 $f0, 0x20($a1) @@ -111,9 +111,9 @@ glabel func_E00A6124 /* 3A57F0 E00A62A0 C4A20034 */ lwc1 $f2, 0x34($a1) /* 3A57F4 E00A62A4 46020080 */ add.s $f2, $f0, $f2 /* 3A57F8 E00A62A8 44800000 */ mtc1 $zero, $f0 -/* 3A57FC E00A62AC 00000000 */ nop +/* 3A57FC E00A62AC 00000000 */ nop /* 3A5800 E00A62B0 4600103C */ c.lt.s $f2, $f0 -/* 3A5804 E00A62B4 00000000 */ nop +/* 3A5804 E00A62B4 00000000 */ nop /* 3A5808 E00A62B8 45000005 */ bc1f .LE00A62D0 /* 3A580C E00A62BC E4A20024 */ swc1 $f2, 0x24($a1) /* 3A5810 E00A62C0 3C014300 */ lui $at, 0x4300 @@ -123,11 +123,11 @@ glabel func_E00A6124 .LE00A62D0: /* 3A5820 E00A62D0 3C014300 */ lui $at, 0x4300 /* 3A5824 E00A62D4 44810000 */ mtc1 $at, $f0 -/* 3A5828 E00A62D8 00000000 */ nop +/* 3A5828 E00A62D8 00000000 */ nop /* 3A582C E00A62DC 4602003C */ c.lt.s $f0, $f2 -/* 3A5830 E00A62E0 00000000 */ nop +/* 3A5830 E00A62E0 00000000 */ nop /* 3A5834 E00A62E4 45000003 */ bc1f .LE00A62F4 -/* 3A5838 E00A62E8 00000000 */ nop +/* 3A5838 E00A62E8 00000000 */ nop /* 3A583C E00A62EC 46001001 */ sub.s $f0, $f2, $f0 .LE00A62F0: /* 3A5840 E00A62F0 E4A00024 */ swc1 $f0, 0x24($a1) @@ -136,9 +136,9 @@ glabel func_E00A6124 /* 3A5848 E00A62F8 C4A20038 */ lwc1 $f2, 0x38($a1) /* 3A584C E00A62FC 46020080 */ add.s $f2, $f0, $f2 /* 3A5850 E00A6300 44800000 */ mtc1 $zero, $f0 -/* 3A5854 E00A6304 00000000 */ nop +/* 3A5854 E00A6304 00000000 */ nop /* 3A5858 E00A6308 4600103C */ c.lt.s $f2, $f0 -/* 3A585C E00A630C 00000000 */ nop +/* 3A585C E00A630C 00000000 */ nop /* 3A5860 E00A6310 45000005 */ bc1f .LE00A6328 /* 3A5864 E00A6314 E4A20028 */ swc1 $f2, 0x28($a1) /* 3A5868 E00A6318 3C014300 */ lui $at, 0x4300 @@ -148,11 +148,11 @@ glabel func_E00A6124 .LE00A6328: /* 3A5878 E00A6328 3C014300 */ lui $at, 0x4300 /* 3A587C E00A632C 44810000 */ mtc1 $at, $f0 -/* 3A5880 E00A6330 00000000 */ nop +/* 3A5880 E00A6330 00000000 */ nop /* 3A5884 E00A6334 4602003C */ c.lt.s $f0, $f2 -/* 3A5888 E00A6338 00000000 */ nop +/* 3A5888 E00A6338 00000000 */ nop /* 3A588C E00A633C 45000003 */ bc1f .LE00A634C -/* 3A5890 E00A6340 00000000 */ nop +/* 3A5890 E00A6340 00000000 */ nop /* 3A5894 E00A6344 46001001 */ sub.s $f0, $f2, $f0 .LE00A6348: /* 3A5898 E00A6348 E4A00028 */ swc1 $f0, 0x28($a1) diff --git a/asm/nonmatchings/code_3A5550/func_E00A639C.s b/asm/nonmatchings/code_3A5550/func_E00A639C.s index 6c95f6ef69..7f8f2be6c8 100644 --- a/asm/nonmatchings/code_3A5550/func_E00A639C.s +++ b/asm/nonmatchings/code_3A5550/func_E00A639C.s @@ -3,4 +3,4 @@ glabel func_E00A639C /* 3A58EC E00A639C 03E00008 */ jr $ra -/* 3A58F0 E00A63A0 00000000 */ nop +/* 3A58F0 E00A63A0 00000000 */ nop diff --git a/asm/nonmatchings/code_3A5550/func_E00A63A4.s b/asm/nonmatchings/code_3A5550/func_E00A63A4.s index 09228ebf6a..3de8ce0256 100644 --- a/asm/nonmatchings/code_3A5550/func_E00A63A4.s +++ b/asm/nonmatchings/code_3A5550/func_E00A63A4.s @@ -112,13 +112,13 @@ glabel func_E00A63A4 /* 3A5AA0 E00A6550 AE220000 */ sw $v0, ($s1) /* 3A5AA4 E00A6554 24A20020 */ addiu $v0, $a1, 0x20 /* 3A5AA8 E00A6558 46041082 */ mul.s $f2, $f2, $f4 -/* 3A5AAC E00A655C 00000000 */ nop +/* 3A5AAC E00A655C 00000000 */ nop /* 3A5AB0 E00A6560 AE220000 */ sw $v0, ($s1) /* 3A5AB4 E00A6564 C6400020 */ lwc1 $f0, 0x20($s2) /* 3A5AB8 E00A6568 24A20028 */ addiu $v0, $a1, 0x28 /* 3A5ABC E00A656C AE220000 */ sw $v0, ($s1) /* 3A5AC0 E00A6570 46040002 */ mul.s $f0, $f0, $f4 -/* 3A5AC4 E00A6574 00000000 */ nop +/* 3A5AC4 E00A6574 00000000 */ nop /* 3A5AC8 E00A6578 24A20030 */ addiu $v0, $a1, 0x30 /* 3A5ACC E00A657C 3C04F200 */ lui $a0, 0xf200 /* 3A5AD0 E00A6580 AE220000 */ sw $v0, ($s1) @@ -142,13 +142,13 @@ glabel func_E00A63A4 /* 3A5B18 E00A65C8 C6420024 */ lwc1 $f2, 0x24($s2) /* 3A5B1C E00A65CC 24A20038 */ addiu $v0, $a1, 0x38 /* 3A5B20 E00A65D0 46041082 */ mul.s $f2, $f2, $f4 -/* 3A5B24 E00A65D4 00000000 */ nop +/* 3A5B24 E00A65D4 00000000 */ nop /* 3A5B28 E00A65D8 AE220000 */ sw $v0, ($s1) /* 3A5B2C E00A65DC C6400028 */ lwc1 $f0, 0x28($s2) /* 3A5B30 E00A65E0 24A20040 */ addiu $v0, $a1, 0x40 /* 3A5B34 E00A65E4 AE220000 */ sw $v0, ($s1) /* 3A5B38 E00A65E8 46040002 */ mul.s $f0, $f0, $f4 -/* 3A5B3C E00A65EC 00000000 */ nop +/* 3A5B3C E00A65EC 00000000 */ nop /* 3A5B40 E00A65F0 3C020900 */ lui $v0, 0x900 /* 3A5B44 E00A65F4 24421418 */ addiu $v0, $v0, 0x1418 /* 3A5B48 E00A65F8 ACA60030 */ sw $a2, 0x30($a1) diff --git a/asm/nonmatchings/code_3A70F0/func_E00A8000.s b/asm/nonmatchings/code_3A70F0/func_E00A8000.s index 5baf0ea01f..fd17d06fde 100644 --- a/asm/nonmatchings/code_3A70F0/func_E00A8000.s +++ b/asm/nonmatchings/code_3A70F0/func_E00A8000.s @@ -37,7 +37,7 @@ glabel func_E00A8000 /* 3A7170 E00A8080 AE02000C */ sw $v0, 0xc($s0) .LE00A8084: /* 3A7174 E00A8084 0802A021 */ j .LE00A8084 -/* 3A7178 E00A8088 00000000 */ nop +/* 3A7178 E00A8088 00000000 */ nop .LE00A808C: /* 3A717C E00A808C 0000202D */ daddu $a0, $zero, $zero /* 3A7180 E00A8090 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/code_3A70F0/func_E00A80FC.s b/asm/nonmatchings/code_3A70F0/func_E00A80FC.s index a961c997c9..13da3b238a 100644 --- a/asm/nonmatchings/code_3A70F0/func_E00A80FC.s +++ b/asm/nonmatchings/code_3A70F0/func_E00A80FC.s @@ -3,4 +3,4 @@ glabel func_E00A80FC /* 3A71EC E00A80FC 03E00008 */ jr $ra -/* 3A71F0 E00A8100 00000000 */ nop +/* 3A71F0 E00A8100 00000000 */ nop diff --git a/asm/nonmatchings/code_3A70F0/func_E00A8104.s b/asm/nonmatchings/code_3A70F0/func_E00A8104.s index dad4493fd2..01f81f4747 100644 --- a/asm/nonmatchings/code_3A70F0/func_E00A8104.s +++ b/asm/nonmatchings/code_3A70F0/func_E00A8104.s @@ -30,9 +30,9 @@ glabel func_E00A8104 /* 3A7250 E00A8160 04610005 */ bgez $v1, .LE00A8178 /* 3A7254 E00A8164 ACA20008 */ sw $v0, 8($a1) /* 3A7258 E00A8168 0C080128 */ jal func_E02004A0 -/* 3A725C E00A816C 00000000 */ nop +/* 3A725C E00A816C 00000000 */ nop /* 3A7260 E00A8170 0802A0AE */ j .LE00A82B8 -/* 3A7264 E00A8174 00000000 */ nop +/* 3A7264 E00A8174 00000000 */ nop .LE00A8178: /* 3A7268 E00A8178 28620010 */ slti $v0, $v1, 0x10 /* 3A726C E00A817C 10400002 */ beqz $v0, .LE00A8188 @@ -47,9 +47,9 @@ glabel func_E00A8104 .LE00A819C: /* 3A728C E00A819C 8E02001C */ lw $v0, 0x1c($s0) /* 3A7290 E00A81A0 10400005 */ beqz $v0, .LE00A81B8 -/* 3A7294 E00A81A4 00000000 */ nop +/* 3A7294 E00A81A4 00000000 */ nop /* 3A7298 E00A81A8 1052001E */ beq $v0, $s2, .LE00A8224 -/* 3A729C E00A81AC 00000000 */ nop +/* 3A729C E00A81AC 00000000 */ nop /* 3A72A0 E00A81B0 0802A0AA */ j .LE00A82A8 /* 3A72A4 E00A81B4 26100004 */ addiu $s0, $s0, 4 .LE00A81B8: @@ -68,14 +68,14 @@ glabel func_E00A8104 /* 3A72D8 E00A81E8 3C01E00B */ lui $at, %hi(D_E00A86A0) /* 3A72DC E00A81EC D42086A0 */ ldc1 $f0, %lo(D_E00A86A0)($at) /* 3A72E0 E00A81F0 44821000 */ mtc1 $v0, $f2 -/* 3A72E4 E00A81F4 00000000 */ nop +/* 3A72E4 E00A81F4 00000000 */ nop /* 3A72E8 E00A81F8 468010A1 */ cvt.d.w $f2, $f2 /* 3A72EC E00A81FC 46201082 */ mul.d $f2, $f2, $f0 -/* 3A72F0 E00A8200 00000000 */ nop +/* 3A72F0 E00A8200 00000000 */ nop /* 3A72F4 E00A8204 3C013FE0 */ lui $at, 0x3fe0 /* 3A72F8 E00A8208 44810800 */ mtc1 $at, $f1 /* 3A72FC E00A820C 44800000 */ mtc1 $zero, $f0 -/* 3A7300 E00A8210 00000000 */ nop +/* 3A7300 E00A8210 00000000 */ nop /* 3A7304 E00A8214 46201080 */ add.d $f2, $f2, $f0 /* 3A7308 E00A8218 462010A0 */ cvt.s.d $f2, $f2 /* 3A730C E00A821C 0802A0A9 */ j .LE00A82A4 @@ -97,19 +97,19 @@ glabel func_E00A8104 /* 3A7344 E00A8254 80420000 */ lb $v0, ($v0) /* 3A7348 E00A8258 C6020094 */ lwc1 $f2, 0x94($s0) /* 3A734C E00A825C 44820000 */ mtc1 $v0, $f0 -/* 3A7350 E00A8260 00000000 */ nop +/* 3A7350 E00A8260 00000000 */ nop /* 3A7354 E00A8264 46800020 */ cvt.s.w $f0, $f0 /* 3A7358 E00A8268 46020002 */ mul.s $f0, $f0, $f2 -/* 3A735C E00A826C 00000000 */ nop +/* 3A735C E00A826C 00000000 */ nop /* 3A7360 E00A8270 E60000BC */ swc1 $f0, 0xbc($s0) /* 3A7364 E00A8274 8C820000 */ lw $v0, ($a0) /* 3A7368 E00A8278 00621821 */ addu $v1, $v1, $v0 /* 3A736C E00A827C 80620001 */ lb $v0, 1($v1) /* 3A7370 E00A8280 44820000 */ mtc1 $v0, $f0 -/* 3A7374 E00A8284 00000000 */ nop +/* 3A7374 E00A8284 00000000 */ nop /* 3A7378 E00A8288 46800020 */ cvt.s.w $f0, $f0 /* 3A737C E00A828C 46020002 */ mul.s $f0, $f0, $f2 -/* 3A7380 E00A8290 00000000 */ nop +/* 3A7380 E00A8290 00000000 */ nop /* 3A7384 E00A8294 8E02006C */ lw $v0, 0x6c($s0) /* 3A7388 E00A8298 24420001 */ addiu $v0, $v0, 1 /* 3A738C E00A829C AE02006C */ sw $v0, 0x6c($s0) @@ -120,7 +120,7 @@ glabel func_E00A8104 /* 3A7398 E00A82A8 26310001 */ addiu $s1, $s1, 1 /* 3A739C E00A82AC 2A22000A */ slti $v0, $s1, 0xa /* 3A73A0 E00A82B0 1440FFBA */ bnez $v0, .LE00A819C -/* 3A73A4 E00A82B4 00000000 */ nop +/* 3A73A4 E00A82B4 00000000 */ nop .LE00A82B8: /* 3A73A8 E00A82B8 8FBF0020 */ lw $ra, 0x20($sp) /* 3A73AC E00A82BC 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/code_3A70F0/func_E00A8318.s b/asm/nonmatchings/code_3A70F0/func_E00A8318.s index f2d3b20468..bfffb9529e 100644 --- a/asm/nonmatchings/code_3A70F0/func_E00A8318.s +++ b/asm/nonmatchings/code_3A70F0/func_E00A8318.s @@ -3,4 +3,4 @@ glabel func_E00A8318 /* 3A7408 E00A8318 03E00008 */ jr $ra -/* 3A740C E00A831C 00000000 */ nop +/* 3A740C E00A831C 00000000 */ nop diff --git a/asm/nonmatchings/code_3A70F0/func_E00A8320.s b/asm/nonmatchings/code_3A70F0/func_E00A8320.s index 7eb7a629c0..10ba53ce0d 100644 --- a/asm/nonmatchings/code_3A70F0/func_E00A8320.s +++ b/asm/nonmatchings/code_3A70F0/func_E00A8320.s @@ -193,5 +193,5 @@ glabel func_E00A8320 /* 3A76FC E00A860C 8FB00098 */ lw $s0, 0x98($sp) /* 3A7700 E00A8610 03E00008 */ jr $ra /* 3A7704 E00A8614 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 3A7708 E00A8618 00000000 */ nop -/* 3A770C E00A861C 00000000 */ nop +/* 3A7708 E00A8618 00000000 */ nop +/* 3A770C E00A861C 00000000 */ nop diff --git a/asm/nonmatchings/code_3AA920/func_E00AA000.s b/asm/nonmatchings/code_3AA920/func_E00AA000.s index 26dec14384..2cef527199 100644 --- a/asm/nonmatchings/code_3AA920/func_E00AA000.s +++ b/asm/nonmatchings/code_3AA920/func_E00AA000.s @@ -38,7 +38,7 @@ glabel func_E00AA000 /* 3AA9A4 E00AA084 AE02000C */ sw $v0, 0xc($s0) .LE00AA088: /* 3AA9A8 E00AA088 0802A822 */ j .LE00AA088 -/* 3AA9AC E00AA08C 00000000 */ nop +/* 3AA9AC E00AA08C 00000000 */ nop .LE00AA090: /* 3AA9B0 E00AA090 0200102D */ daddu $v0, $s0, $zero /* 3AA9B4 E00AA094 3C014248 */ lui $at, 0x4248 diff --git a/asm/nonmatchings/code_3AA920/func_E00AA104.s b/asm/nonmatchings/code_3AA920/func_E00AA104.s index b8207f4834..549c8207e9 100644 --- a/asm/nonmatchings/code_3AA920/func_E00AA104.s +++ b/asm/nonmatchings/code_3AA920/func_E00AA104.s @@ -3,4 +3,4 @@ glabel func_E00AA104 /* 3AAA24 E00AA104 03E00008 */ jr $ra -/* 3AAA28 E00AA108 00000000 */ nop +/* 3AAA28 E00AA108 00000000 */ nop diff --git a/asm/nonmatchings/code_3AA920/func_E00AA10C.s b/asm/nonmatchings/code_3AA920/func_E00AA10C.s index 7955d1a31e..2c5a585065 100644 --- a/asm/nonmatchings/code_3AA920/func_E00AA10C.s +++ b/asm/nonmatchings/code_3AA920/func_E00AA10C.s @@ -31,9 +31,9 @@ glabel func_E00AA10C /* 3AAA8C E00AA16C 04610005 */ bgez $v1, .LE00AA184 /* 3AAA90 E00AA170 AE020008 */ sw $v0, 8($s0) /* 3AAA94 E00AA174 0C080128 */ jal func_E02004A0 -/* 3AAA98 E00AA178 00000000 */ nop +/* 3AAA98 E00AA178 00000000 */ nop /* 3AAA9C E00AA17C 0802A8E8 */ j .LE00AA3A0 -/* 3AAAA0 E00AA180 00000000 */ nop +/* 3AAAA0 E00AA180 00000000 */ nop .LE00AA184: /* 3AAAA4 E00AA184 28620010 */ slti $v0, $v1, 0x10 /* 3AAAA8 E00AA188 10400002 */ beqz $v0, .LE00AA194 @@ -47,13 +47,13 @@ glabel func_E00AA10C /* 3AAAC4 E00AA1A4 0C080138 */ jal func_E02004E0 /* 3AAAC8 E00AA1A8 24040167 */ addiu $a0, $zero, 0x167 /* 3AAACC E00AA1AC 4482A000 */ mtc1 $v0, $f20 -/* 3AAAD0 E00AA1B0 00000000 */ nop +/* 3AAAD0 E00AA1B0 00000000 */ nop /* 3AAAD4 E00AA1B4 4680A520 */ cvt.s.w $f20, $f20 /* 3AAAD8 E00AA1B8 0C080140 */ jal func_E0200500 /* 3AAADC E00AA1BC 4600A306 */ mov.s $f12, $f20 /* 3AAAE0 E00AA1C0 C6020034 */ lwc1 $f2, 0x34($s0) /* 3AAAE4 E00AA1C4 46001082 */ mul.s $f2, $f2, $f0 -/* 3AAAE8 E00AA1C8 00000000 */ nop +/* 3AAAE8 E00AA1C8 00000000 */ nop /* 3AAAEC E00AA1CC C6000038 */ lwc1 $f0, 0x38($s0) /* 3AAAF0 E00AA1D0 C6180018 */ lwc1 $f24, 0x18($s0) /* 3AAAF4 E00AA1D4 4600028D */ trunc.w.s $f10, $f0 @@ -63,13 +63,13 @@ glabel func_E00AA10C /* 3AAB04 E00AA1E4 4600A306 */ mov.s $f12, $f20 /* 3AAB08 E00AA1E8 C616001C */ lwc1 $f22, 0x1c($s0) /* 3AAB0C E00AA1EC 44820000 */ mtc1 $v0, $f0 -/* 3AAB10 E00AA1F0 00000000 */ nop +/* 3AAB10 E00AA1F0 00000000 */ nop /* 3AAB14 E00AA1F4 46800020 */ cvt.s.w $f0, $f0 /* 3AAB18 E00AA1F8 0C080144 */ jal func_E0200510 /* 3AAB1C E00AA1FC 4600B580 */ add.s $f22, $f22, $f0 /* 3AAB20 E00AA200 C6020034 */ lwc1 $f2, 0x34($s0) /* 3AAB24 E00AA204 46001082 */ mul.s $f2, $f2, $f0 -/* 3AAB28 E00AA208 00000000 */ nop +/* 3AAB28 E00AA208 00000000 */ nop /* 3AAB2C E00AA20C C6140020 */ lwc1 $f20, 0x20($s0) /* 3AAB30 E00AA210 24040064 */ addiu $a0, $zero, 0x64 /* 3AAB34 E00AA214 0C080138 */ jal func_E02004E0 @@ -83,66 +83,66 @@ glabel func_E00AA10C /* 3AAB54 E00AA234 4608A501 */ sub.s $f20, $f20, $f8 /* 3AAB58 E00AA238 2442000A */ addiu $v0, $v0, 0xa /* 3AAB5C E00AA23C 4602C032 */ c.eq.s $f24, $f2 -/* 3AAB60 E00AA240 00000000 */ nop +/* 3AAB60 E00AA240 00000000 */ nop /* 3AAB64 E00AA244 4500001E */ bc1f .LE00AA2C0 /* 3AAB68 E00AA248 AE020030 */ sw $v0, 0x30($s0) /* 3AAB6C E00AA24C 4602B032 */ c.eq.s $f22, $f2 -/* 3AAB70 E00AA250 00000000 */ nop +/* 3AAB70 E00AA250 00000000 */ nop /* 3AAB74 E00AA254 4500001A */ bc1f .LE00AA2C0 -/* 3AAB78 E00AA258 00000000 */ nop +/* 3AAB78 E00AA258 00000000 */ nop /* 3AAB7C E00AA25C 4602A032 */ c.eq.s $f20, $f2 -/* 3AAB80 E00AA260 00000000 */ nop +/* 3AAB80 E00AA260 00000000 */ nop /* 3AAB84 E00AA264 45000016 */ bc1f .LE00AA2C0 -/* 3AAB88 E00AA268 00000000 */ nop +/* 3AAB88 E00AA268 00000000 */ nop /* 3AAB8C E00AA26C C6000018 */ lwc1 $f0, 0x18($s0) /* 3AAB90 E00AA270 46040601 */ sub.s $f24, $f0, $f4 /* 3AAB94 E00AA274 C600001C */ lwc1 $f0, 0x1c($s0) /* 3AAB98 E00AA278 46060581 */ sub.s $f22, $f0, $f6 /* 3AAB9C E00AA27C C6000020 */ lwc1 $f0, 0x20($s0) /* 3AABA0 E00AA280 4602C032 */ c.eq.s $f24, $f2 -/* 3AABA4 E00AA284 00000000 */ nop +/* 3AABA4 E00AA284 00000000 */ nop /* 3AABA8 E00AA288 4500000D */ bc1f .LE00AA2C0 /* 3AABAC E00AA28C 46080501 */ sub.s $f20, $f0, $f8 /* 3AABB0 E00AA290 4602B032 */ c.eq.s $f22, $f2 -/* 3AABB4 E00AA294 00000000 */ nop +/* 3AABB4 E00AA294 00000000 */ nop /* 3AABB8 E00AA298 45000009 */ bc1f .LE00AA2C0 -/* 3AABBC E00AA29C 00000000 */ nop +/* 3AABBC E00AA29C 00000000 */ nop /* 3AABC0 E00AA2A0 4602A032 */ c.eq.s $f20, $f2 -/* 3AABC4 E00AA2A4 00000000 */ nop +/* 3AABC4 E00AA2A4 00000000 */ nop /* 3AABC8 E00AA2A8 45000005 */ bc1f .LE00AA2C0 -/* 3AABCC E00AA2AC 00000000 */ nop +/* 3AABCC E00AA2AC 00000000 */ nop /* 3AABD0 E00AA2B0 3C013F80 */ lui $at, 0x3f80 /* 3AABD4 E00AA2B4 4481C000 */ mtc1 $at, $f24 /* 3AABD8 E00AA2B8 46001506 */ mov.s $f20, $f2 /* 3AABDC E00AA2BC 46001586 */ mov.s $f22, $f2 .LE00AA2C0: /* 3AABE0 E00AA2C0 4618C002 */ mul.s $f0, $f24, $f24 -/* 3AABE4 E00AA2C4 00000000 */ nop +/* 3AABE4 E00AA2C4 00000000 */ nop /* 3AABE8 E00AA2C8 4616B082 */ mul.s $f2, $f22, $f22 -/* 3AABEC E00AA2CC 00000000 */ nop +/* 3AABEC E00AA2CC 00000000 */ nop /* 3AABF0 E00AA2D0 4614A102 */ mul.s $f4, $f20, $f20 -/* 3AABF4 E00AA2D4 00000000 */ nop +/* 3AABF4 E00AA2D4 00000000 */ nop /* 3AABF8 E00AA2D8 46020000 */ add.s $f0, $f0, $f2 /* 3AABFC E00AA2DC 46040300 */ add.s $f12, $f0, $f4 /* 3AAC00 E00AA2E0 4480D000 */ mtc1 $zero, $f26 -/* 3AAC04 E00AA2E4 00000000 */ nop +/* 3AAC04 E00AA2E4 00000000 */ nop /* 3AAC08 E00AA2E8 461A6032 */ c.eq.s $f12, $f26 -/* 3AAC0C E00AA2EC 00000000 */ nop +/* 3AAC0C E00AA2EC 00000000 */ nop /* 3AAC10 E00AA2F0 45010007 */ bc1t .LE00AA310 -/* 3AAC14 E00AA2F4 00000000 */ nop +/* 3AAC14 E00AA2F4 00000000 */ nop /* 3AAC18 E00AA2F8 0C080154 */ jal func_E0200550 -/* 3AAC1C E00AA2FC 00000000 */ nop +/* 3AAC1C E00AA2FC 00000000 */ nop /* 3AAC20 E00AA300 3C013F80 */ lui $at, 0x3f80 /* 3AAC24 E00AA304 44811000 */ mtc1 $at, $f2 -/* 3AAC28 E00AA308 00000000 */ nop +/* 3AAC28 E00AA308 00000000 */ nop /* 3AAC2C E00AA30C 46001303 */ div.s $f12, $f2, $f0 .LE00AA310: /* 3AAC30 E00AA310 460CC602 */ mul.s $f24, $f24, $f12 -/* 3AAC34 E00AA314 00000000 */ nop +/* 3AAC34 E00AA314 00000000 */ nop /* 3AAC38 E00AA318 460CA502 */ mul.s $f20, $f20, $f12 -/* 3AAC3C E00AA31C 00000000 */ nop +/* 3AAC3C E00AA31C 00000000 */ nop /* 3AAC40 E00AA320 460CB582 */ mul.s $f22, $f22, $f12 -/* 3AAC44 E00AA324 00000000 */ nop +/* 3AAC44 E00AA324 00000000 */ nop /* 3AAC48 E00AA328 4600D306 */ mov.s $f12, $f26 /* 3AAC4C E00AA32C E618003C */ swc1 $f24, 0x3c($s0) /* 3AAC50 E00AA330 4600C006 */ mov.s $f0, $f24 diff --git a/asm/nonmatchings/code_3AA920/func_E00AA404.s b/asm/nonmatchings/code_3AA920/func_E00AA404.s index 8046155ca1..bc0420b343 100644 --- a/asm/nonmatchings/code_3AA920/func_E00AA404.s +++ b/asm/nonmatchings/code_3AA920/func_E00AA404.s @@ -42,10 +42,10 @@ glabel func_E00AA404 /* 3AADB8 E00AA498 3421999A */ ori $at, $at, 0x999a /* 3AADBC E00AA49C 44811000 */ mtc1 $at, $f2 /* 3AADC0 E00AA4A0 44820000 */ mtc1 $v0, $f0 -/* 3AADC4 E00AA4A4 00000000 */ nop +/* 3AADC4 E00AA4A4 00000000 */ nop /* 3AADC8 E00AA4A8 46800020 */ cvt.s.w $f0, $f0 /* 3AADCC E00AA4AC 46020002 */ mul.s $f0, $f0, $f2 -/* 3AADD0 E00AA4B0 00000000 */ nop +/* 3AADD0 E00AA4B0 00000000 */ nop /* 3AADD4 E00AA4B4 C6620010 */ lwc1 $f2, 0x10($s3) /* 3AADD8 E00AA4B8 46001080 */ add.s $f2, $f2, $f0 /* 3AADDC E00AA4BC 8E65000C */ lw $a1, 0xc($s3) @@ -174,6 +174,6 @@ glabel func_E00AA404 /* 3AAFC8 E00AA6A8 8FB00098 */ lw $s0, 0x98($sp) /* 3AAFCC E00AA6AC 03E00008 */ jr $ra /* 3AAFD0 E00AA6B0 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 3AAFD4 E00AA6B4 00000000 */ nop -/* 3AAFD8 E00AA6B8 00000000 */ nop -/* 3AAFDC E00AA6BC 00000000 */ nop +/* 3AAFD4 E00AA6B4 00000000 */ nop +/* 3AAFD8 E00AA6B8 00000000 */ nop +/* 3AAFDC E00AA6BC 00000000 */ nop diff --git a/asm/nonmatchings/code_3B2350/func_E00AE000.s b/asm/nonmatchings/code_3B2350/func_E00AE000.s index 38a5e5e242..1dabfe1ade 100644 --- a/asm/nonmatchings/code_3B2350/func_E00AE000.s +++ b/asm/nonmatchings/code_3B2350/func_E00AE000.s @@ -41,7 +41,7 @@ glabel func_E00AE000 /* 3B23E0 E00AE090 AE04000C */ sw $a0, 0xc($s0) .LE00AE094: /* 3B23E4 E00AE094 0802B825 */ j .LE00AE094 -/* 3B23E8 E00AE098 00000000 */ nop +/* 3B23E8 E00AE098 00000000 */ nop .LE00AE09C: /* 3B23EC E00AE09C AC930000 */ sw $s3, ($a0) /* 3B23F0 E00AE0A0 1E400004 */ bgtz $s2, .LE00AE0B4 @@ -85,7 +85,7 @@ glabel func_E00AE000 /* 3B2478 E00AE128 14E10004 */ bne $a3, $at, .LE00AE13C /* 3B247C E00AE12C 3C018000 */ lui $at, 0x8000 /* 3B2480 E00AE130 14A10002 */ bne $a1, $at, .LE00AE13C -/* 3B2484 E00AE134 00000000 */ nop +/* 3B2484 E00AE134 00000000 */ nop /* 3B2488 E00AE138 0006000D */ break 6 .LE00AE13C: /* 3B248C E00AE13C 00001812 */ mflo $v1 @@ -100,7 +100,7 @@ glabel func_E00AE000 /* 3B24B0 E00AE160 AC80FFC8 */ sw $zero, -0x38($a0) /* 3B24B4 E00AE164 E482FFF4 */ swc1 $f2, -0xc($a0) /* 3B24B8 E00AE168 44830000 */ mtc1 $v1, $f0 -/* 3B24BC E00AE16C 00000000 */ nop +/* 3B24BC E00AE16C 00000000 */ nop /* 3B24C0 E00AE170 46800020 */ cvt.s.w $f0, $f0 /* 3B24C4 E00AE174 E480FFFC */ swc1 $f0, -4($a0) /* 3B24C8 E00AE178 1440FFE7 */ bnez $v0, .LE00AE118 diff --git a/asm/nonmatchings/code_3B2350/func_E00AE1AC.s b/asm/nonmatchings/code_3B2350/func_E00AE1AC.s index 958db01725..1be95dd7a7 100644 --- a/asm/nonmatchings/code_3B2350/func_E00AE1AC.s +++ b/asm/nonmatchings/code_3B2350/func_E00AE1AC.s @@ -3,4 +3,4 @@ glabel func_E00AE1AC /* 3B24FC E00AE1AC 03E00008 */ jr $ra -/* 3B2500 E00AE1B0 00000000 */ nop +/* 3B2500 E00AE1B0 00000000 */ nop diff --git a/asm/nonmatchings/code_3B2350/func_E00AE1B4.s b/asm/nonmatchings/code_3B2350/func_E00AE1B4.s index 512cee0bb2..d8f0e64f8f 100644 --- a/asm/nonmatchings/code_3B2350/func_E00AE1B4.s +++ b/asm/nonmatchings/code_3B2350/func_E00AE1B4.s @@ -38,7 +38,7 @@ glabel func_E00AE1B4 /* 3B2580 E00AE230 0C080128 */ jal func_E02004A0 /* 3B2584 E00AE234 0260202D */ daddu $a0, $s3, $zero /* 3B2588 E00AE238 0802B933 */ j .LE00AE4CC -/* 3B258C E00AE23C 00000000 */ nop +/* 3B258C E00AE23C 00000000 */ nop .LE00AE240: /* 3B2590 E00AE240 28620010 */ slti $v0, $v1, 0x10 /* 3B2594 E00AE244 10400002 */ beqz $v0, .LE00AE250 @@ -63,7 +63,7 @@ glabel func_E00AE1B4 /* 3B25D4 E00AE284 8E03FFFC */ lw $v1, -4($s0) /* 3B25D8 E00AE288 0043102A */ slt $v0, $v0, $v1 /* 3B25DC E00AE28C 1440000E */ bnez $v0, .LE00AE2C8 -/* 3B25E0 E00AE290 00000000 */ nop +/* 3B25E0 E00AE290 00000000 */ nop /* 3B25E4 E00AE294 0C080138 */ jal func_E02004E0 /* 3B25E8 E00AE298 24040032 */ addiu $a0, $zero, 0x32 /* 3B25EC E00AE29C 24040168 */ addiu $a0, $zero, 0x168 @@ -72,7 +72,7 @@ glabel func_E00AE1B4 /* 3B25F8 E00AE2A8 0C080138 */ jal func_E02004E0 /* 3B25FC E00AE2AC AE000000 */ sw $zero, ($s0) /* 3B2600 E00AE2B0 44820000 */ mtc1 $v0, $f0 -/* 3B2604 E00AE2B4 00000000 */ nop +/* 3B2604 E00AE2B4 00000000 */ nop /* 3B2608 E00AE2B8 46800020 */ cvt.s.w $f0, $f0 /* 3B260C E00AE2BC E6000028 */ swc1 $f0, 0x28($s0) /* 3B2610 E00AE2C0 AE00FFF0 */ sw $zero, -0x10($s0) @@ -82,20 +82,20 @@ glabel func_E00AE1B4 /* 3B261C E00AE2CC 24040064 */ addiu $a0, $zero, 0x64 /* 3B2620 E00AE2D0 28420033 */ slti $v0, $v0, 0x33 /* 3B2624 E00AE2D4 10400047 */ beqz $v0, .LE00AE3F4 -/* 3B2628 E00AE2D8 00000000 */ nop +/* 3B2628 E00AE2D8 00000000 */ nop /* 3B262C E00AE2DC C618FFF0 */ lwc1 $f24, -0x10($s0) /* 3B2630 E00AE2E0 C61AFFF4 */ lwc1 $f26, -0xc($s0) /* 3B2634 E00AE2E4 0C080138 */ jal func_E02004E0 /* 3B2638 E00AE2E8 24040010 */ addiu $a0, $zero, 0x10 /* 3B263C E00AE2EC 2442FFF8 */ addiu $v0, $v0, -8 /* 3B2640 E00AE2F0 4482B000 */ mtc1 $v0, $f22 -/* 3B2644 E00AE2F4 00000000 */ nop +/* 3B2644 E00AE2F4 00000000 */ nop /* 3B2648 E00AE2F8 4680B5A0 */ cvt.s.w $f22, $f22 /* 3B264C E00AE2FC 0C080138 */ jal func_E02004E0 /* 3B2650 E00AE300 24040010 */ addiu $a0, $zero, 0x10 /* 3B2654 E00AE304 2442FFF8 */ addiu $v0, $v0, -8 /* 3B2658 E00AE308 4482A000 */ mtc1 $v0, $f20 -/* 3B265C E00AE30C 00000000 */ nop +/* 3B265C E00AE30C 00000000 */ nop /* 3B2660 E00AE310 4680A520 */ cvt.s.w $f20, $f20 /* 3B2664 E00AE314 26230088 */ addiu $v1, $s1, 0x88 /* 3B2668 E00AE318 26220044 */ addiu $v0, $s1, 0x44 @@ -141,18 +141,18 @@ glabel func_E00AE1B4 /* 3B2700 E00AE3B0 0C080148 */ jal func_E0200520 /* 3B2704 E00AE3B4 E600FFF4 */ swc1 $f0, -0xc($s0) /* 3B2708 E00AE3B8 461CB032 */ c.eq.s $f22, $f28 -/* 3B270C E00AE3BC 00000000 */ nop +/* 3B270C E00AE3BC 00000000 */ nop /* 3B2710 E00AE3C0 45000005 */ bc1f .LE00AE3D8 /* 3B2714 E00AE3C4 E6000028 */ swc1 $f0, 0x28($s0) /* 3B2718 E00AE3C8 461CA032 */ c.eq.s $f20, $f28 -/* 3B271C E00AE3CC 00000000 */ nop +/* 3B271C E00AE3CC 00000000 */ nop /* 3B2720 E00AE3D0 45030008 */ bc1tl .LE00AE3F4 /* 3B2724 E00AE3D4 E61C0020 */ swc1 $f28, 0x20($s0) .LE00AE3D8: /* 3B2728 E00AE3D8 4616B002 */ mul.s $f0, $f22, $f22 -/* 3B272C E00AE3DC 00000000 */ nop +/* 3B272C E00AE3DC 00000000 */ nop /* 3B2730 E00AE3E0 4614A302 */ mul.s $f12, $f20, $f20 -/* 3B2734 E00AE3E4 00000000 */ nop +/* 3B2734 E00AE3E4 00000000 */ nop /* 3B2738 E00AE3E8 0C080154 */ jal func_E0200550 /* 3B273C E00AE3EC 460C0300 */ add.s $f12, $f0, $f12 /* 3B2740 E00AE3F0 E6000020 */ swc1 $f0, 0x20($s0) @@ -172,22 +172,22 @@ glabel func_E00AE1B4 /* 3B2770 E00AE420 14610004 */ bne $v1, $at, .LE00AE434 /* 3B2774 E00AE424 3C018000 */ lui $at, 0x8000 /* 3B2778 E00AE428 14410002 */ bne $v0, $at, .LE00AE434 -/* 3B277C E00AE42C 00000000 */ nop +/* 3B277C E00AE42C 00000000 */ nop /* 3B2780 E00AE430 0006000D */ break 6 .LE00AE434: /* 3B2784 E00AE434 00001012 */ mflo $v0 /* 3B2788 E00AE438 44826000 */ mtc1 $v0, $f12 -/* 3B278C E00AE43C 00000000 */ nop +/* 3B278C E00AE43C 00000000 */ nop /* 3B2790 E00AE440 0C080140 */ jal func_E0200500 /* 3B2794 E00AE444 46806320 */ cvt.s.w $f12, $f12 /* 3B2798 E00AE448 3C014480 */ lui $at, 0x4480 /* 3B279C E00AE44C 44811000 */ mtc1 $at, $f2 -/* 3B27A0 E00AE450 00000000 */ nop +/* 3B27A0 E00AE450 00000000 */ nop /* 3B27A4 E00AE454 46020002 */ mul.s $f0, $f0, $f2 -/* 3B27A8 E00AE458 00000000 */ nop +/* 3B27A8 E00AE458 00000000 */ nop /* 3B27AC E00AE45C 4600010D */ trunc.w.s $f4, $f0 /* 3B27B0 E00AE460 44022000 */ mfc1 $v0, $f4 -/* 3B27B4 E00AE464 00000000 */ nop +/* 3B27B4 E00AE464 00000000 */ nop /* 3B27B8 E00AE468 AE020010 */ sw $v0, 0x10($s0) /* 3B27BC E00AE46C 28420100 */ slti $v0, $v0, 0x100 /* 3B27C0 E00AE470 14400003 */ bnez $v0, .LE00AE480 diff --git a/asm/nonmatchings/code_3B2350/func_E00AE544.s b/asm/nonmatchings/code_3B2350/func_E00AE544.s index 0c9d7af8a0..b82d76cd74 100644 --- a/asm/nonmatchings/code_3B2350/func_E00AE544.s +++ b/asm/nonmatchings/code_3B2350/func_E00AE544.s @@ -3,4 +3,4 @@ glabel func_E00AE544 /* 3B2894 E00AE544 03E00008 */ jr $ra -/* 3B2898 E00AE548 00000000 */ nop +/* 3B2898 E00AE548 00000000 */ nop diff --git a/asm/nonmatchings/code_3B2350/func_E00AE54C.s b/asm/nonmatchings/code_3B2350/func_E00AE54C.s index c1e99705fd..73048171f8 100644 --- a/asm/nonmatchings/code_3B2350/func_E00AE54C.s +++ b/asm/nonmatchings/code_3B2350/func_E00AE54C.s @@ -205,9 +205,9 @@ glabel func_E00AE54C /* 3B2BB8 E00AE868 C602FFF4 */ lwc1 $f2, -0xc($s0) /* 3B2BBC E00AE86C 3C013D80 */ lui $at, 0x3d80 /* 3B2BC0 E00AE870 44810000 */ mtc1 $at, $f0 -/* 3B2BC4 E00AE874 00000000 */ nop +/* 3B2BC4 E00AE874 00000000 */ nop /* 3B2BC8 E00AE878 46001082 */ mul.s $f2, $f2, $f0 -/* 3B2BCC E00AE87C 00000000 */ nop +/* 3B2BCC E00AE87C 00000000 */ nop /* 3B2BD0 E00AE880 0260202D */ daddu $a0, $s3, $zero /* 3B2BD4 E00AE884 44051000 */ mfc1 $a1, $f2 /* 3B2BD8 E00AE888 4407B000 */ mfc1 $a3, $f22 @@ -320,4 +320,4 @@ glabel func_E00AE54C /* 3B2D80 E00AEA30 D7B400D8 */ ldc1 $f20, 0xd8($sp) /* 3B2D84 E00AEA34 03E00008 */ jr $ra /* 3B2D88 E00AEA38 27BD00E8 */ addiu $sp, $sp, 0xe8 -/* 3B2D8C E00AEA3C 00000000 */ nop +/* 3B2D8C E00AEA3C 00000000 */ nop diff --git a/asm/nonmatchings/code_3B3EB0/func_E00B0000.s b/asm/nonmatchings/code_3B3EB0/func_E00B0000.s index 5291ecdb3a..fd9846dd9f 100644 --- a/asm/nonmatchings/code_3B3EB0/func_E00B0000.s +++ b/asm/nonmatchings/code_3B3EB0/func_E00B0000.s @@ -40,7 +40,7 @@ glabel func_E00B0000 /* 3B3F3C E00B008C AE02000C */ sw $v0, 0xc($s0) .LE00B0090: /* 3B3F40 E00B0090 0802C024 */ j .LE00B0090 -/* 3B3F44 E00B0094 00000000 */ nop +/* 3B3F44 E00B0094 00000000 */ nop .LE00B0098: /* 3B3F48 E00B0098 AC920000 */ sw $s2, ($a0) /* 3B3F4C E00B009C 1E200004 */ bgtz $s1, .LE00B00B0 diff --git a/asm/nonmatchings/code_3B3EB0/func_E00B011C.s b/asm/nonmatchings/code_3B3EB0/func_E00B011C.s index 73cca202b7..34847b0be9 100644 --- a/asm/nonmatchings/code_3B3EB0/func_E00B011C.s +++ b/asm/nonmatchings/code_3B3EB0/func_E00B011C.s @@ -3,4 +3,4 @@ glabel func_E00B011C /* 3B3FCC E00B011C 03E00008 */ jr $ra -/* 3B3FD0 E00B0120 00000000 */ nop +/* 3B3FD0 E00B0120 00000000 */ nop diff --git a/asm/nonmatchings/code_3B3EB0/func_E00B0124.s b/asm/nonmatchings/code_3B3EB0/func_E00B0124.s index 61a01018e8..54c3524e51 100644 --- a/asm/nonmatchings/code_3B3EB0/func_E00B0124.s +++ b/asm/nonmatchings/code_3B3EB0/func_E00B0124.s @@ -26,9 +26,9 @@ glabel func_E00B0124 /* 3B4020 E00B0170 04C10005 */ bgez $a2, .LE00B0188 /* 3B4024 E00B0174 AC650014 */ sw $a1, 0x14($v1) /* 3B4028 E00B0178 0C080128 */ jal func_E02004A0 -/* 3B402C E00B017C 00000000 */ nop +/* 3B402C E00B017C 00000000 */ nop /* 3B4030 E00B0180 0802C07B */ j .LE00B01EC -/* 3B4034 E00B0184 00000000 */ nop +/* 3B4034 E00B0184 00000000 */ nop .LE00B0188: /* 3B4038 E00B0188 28C40008 */ slti $a0, $a2, 8 /* 3B403C E00B018C 1080000E */ beqz $a0, .LE00B01C8 @@ -37,10 +37,10 @@ glabel func_E00B0124 /* 3B4048 E00B0198 3C01E00B */ lui $at, %hi(D_E00B07E0) /* 3B404C E00B019C D42007E0 */ ldc1 $f0, %lo(D_E00B07E0)($at) /* 3B4050 E00B01A0 44821000 */ mtc1 $v0, $f2 -/* 3B4054 E00B01A4 00000000 */ nop +/* 3B4054 E00B01A4 00000000 */ nop /* 3B4058 E00B01A8 468010A1 */ cvt.d.w $f2, $f2 /* 3B405C E00B01AC 46201082 */ mul.d $f2, $f2, $f0 -/* 3B4060 E00B01B0 00000000 */ nop +/* 3B4060 E00B01B0 00000000 */ nop /* 3B4064 E00B01B4 C460002C */ lwc1 $f0, 0x2c($v1) /* 3B4068 E00B01B8 46000021 */ cvt.d.s $f0, $f0 /* 3B406C E00B01BC 46220000 */ add.d $f0, $f0, $f2 diff --git a/asm/nonmatchings/code_3B3EB0/func_E00B0234.s b/asm/nonmatchings/code_3B3EB0/func_E00B0234.s index 672078f5f5..e6c0422530 100644 --- a/asm/nonmatchings/code_3B3EB0/func_E00B0234.s +++ b/asm/nonmatchings/code_3B3EB0/func_E00B0234.s @@ -123,7 +123,7 @@ glabel func_E00B0234 .LE00B040C: /* 3B42BC E00B040C 27A40020 */ addiu $a0, $sp, 0x20 /* 3B42C0 E00B0410 44962000 */ mtc1 $s6, $f4 -/* 3B42C4 E00B0414 00000000 */ nop +/* 3B42C4 E00B0414 00000000 */ nop /* 3B42C8 E00B0418 46802120 */ cvt.s.w $f4, $f4 /* 3B42CC E00B041C 26D60048 */ addiu $s6, $s6, 0x48 /* 3B42D0 E00B0420 44052000 */ mfc1 $a1, $f4 @@ -258,13 +258,13 @@ glabel func_E00B0234 /* 3B44CC E00B061C 14610004 */ bne $v1, $at, .LE00B0630 /* 3B44D0 E00B0620 3C018000 */ lui $at, 0x8000 /* 3B44D4 E00B0624 14410002 */ bne $v0, $at, .LE00B0630 -/* 3B44D8 E00B0628 00000000 */ nop +/* 3B44D8 E00B0628 00000000 */ nop /* 3B44DC E00B062C 0006000D */ break 6 .LE00B0630: /* 3B44E0 E00B0630 00001012 */ mflo $v0 /* 3B44E4 E00B0634 02E21021 */ addu $v0, $s7, $v0 /* 3B44E8 E00B0638 44826000 */ mtc1 $v0, $f12 -/* 3B44EC E00B063C 00000000 */ nop +/* 3B44EC E00B063C 00000000 */ nop /* 3B44F0 E00B0640 46806320 */ cvt.s.w $f12, $f12 /* 3B44F4 E00B0644 0C080144 */ jal func_E0200510 /* 3B44F8 E00B0648 26300001 */ addiu $s0, $s1, 1 @@ -273,16 +273,16 @@ glabel func_E00B0234 /* 3B4504 E00B0654 D42207E8 */ ldc1 $f2, %lo(D_E00B07E8)($at) /* 3B4508 E00B0658 001110C0 */ sll $v0, $s1, 3 /* 3B450C E00B065C 46220002 */ mul.d $f0, $f0, $f2 -/* 3B4510 E00B0660 00000000 */ nop +/* 3B4510 E00B0660 00000000 */ nop /* 3B4514 E00B0664 00511021 */ addu $v0, $v0, $s1 /* 3B4518 E00B0668 00021080 */ sll $v0, $v0, 2 /* 3B451C E00B066C 44822000 */ mtc1 $v0, $f4 -/* 3B4520 E00B0670 00000000 */ nop +/* 3B4520 E00B0670 00000000 */ nop /* 3B4524 E00B0674 46802120 */ cvt.s.w $f4, $f4 /* 3B4528 E00B0678 4405A000 */ mfc1 $a1, $f20 /* 3B452C E00B067C 4406A000 */ mfc1 $a2, $f20 /* 3B4530 E00B0680 44901000 */ mtc1 $s0, $f2 -/* 3B4534 E00B0684 00000000 */ nop +/* 3B4534 E00B0684 00000000 */ nop /* 3B4538 E00B0688 468010A0 */ cvt.s.w $f2, $f2 /* 3B453C E00B068C 460010A1 */ cvt.d.s $f2, $f2 /* 3B4540 E00B0690 46201080 */ add.d $f2, $f2, $f0 @@ -290,7 +290,7 @@ glabel func_E00B0234 /* 3B4548 E00B0698 C660002C */ lwc1 $f0, 0x2c($s3) /* 3B454C E00B069C 462010A0 */ cvt.s.d $f2, $f2 /* 3B4550 E00B06A0 46001082 */ mul.s $f2, $f2, $f0 -/* 3B4554 E00B06A4 00000000 */ nop +/* 3B4554 E00B06A4 00000000 */ nop /* 3B4558 E00B06A8 27A40020 */ addiu $a0, $sp, 0x20 /* 3B455C E00B06AC E7B40014 */ swc1 $f20, 0x14($sp) /* 3B4560 E00B06B0 E7B40018 */ swc1 $f20, 0x18($sp) @@ -369,4 +369,4 @@ glabel func_E00B0234 /* 3B4680 E00B07D0 D7B400D8 */ ldc1 $f20, 0xd8($sp) /* 3B4684 E00B07D4 03E00008 */ jr $ra /* 3B4688 E00B07D8 27BD00F0 */ addiu $sp, $sp, 0xf0 -/* 3B468C E00B07DC 00000000 */ nop +/* 3B468C E00B07DC 00000000 */ nop diff --git a/asm/nonmatchings/code_3B4790/func_E00B2000.s b/asm/nonmatchings/code_3B4790/func_E00B2000.s index a361304b6d..e68b357108 100644 --- a/asm/nonmatchings/code_3B4790/func_E00B2000.s +++ b/asm/nonmatchings/code_3B4790/func_E00B2000.s @@ -40,7 +40,7 @@ glabel func_E00B2000 /* 3B481C E00B208C AE22000C */ sw $v0, 0xc($s1) .LE00B2090: /* 3B4820 E00B2090 0802C824 */ j .LE00B2090 -/* 3B4824 E00B2094 00000000 */ nop +/* 3B4824 E00B2094 00000000 */ nop .LE00B2098: /* 3B4828 E00B2098 AC720000 */ sw $s2, ($v1) /* 3B482C E00B209C 1E000003 */ bgtz $s0, .LE00B20AC diff --git a/asm/nonmatchings/code_3B4790/func_E00B21DC.s b/asm/nonmatchings/code_3B4790/func_E00B21DC.s index 4e0a5a2fa5..a69def1da6 100644 --- a/asm/nonmatchings/code_3B4790/func_E00B21DC.s +++ b/asm/nonmatchings/code_3B4790/func_E00B21DC.s @@ -3,4 +3,4 @@ glabel func_E00B21DC /* 3B496C E00B21DC 03E00008 */ jr $ra -/* 3B4970 E00B21E0 00000000 */ nop +/* 3B4970 E00B21E0 00000000 */ nop diff --git a/asm/nonmatchings/code_3B4790/func_E00B21E4.s b/asm/nonmatchings/code_3B4790/func_E00B21E4.s index 61f6936215..a4022069c7 100644 --- a/asm/nonmatchings/code_3B4790/func_E00B21E4.s +++ b/asm/nonmatchings/code_3B4790/func_E00B21E4.s @@ -36,9 +36,9 @@ glabel func_E00B21E4 /* 3B49E8 E00B2258 04610005 */ bgez $v1, .LE00B2270 /* 3B49EC E00B225C AE020030 */ sw $v0, 0x30($s0) /* 3B49F0 E00B2260 0C080128 */ jal func_E02004A0 -/* 3B49F4 E00B2264 00000000 */ nop +/* 3B49F4 E00B2264 00000000 */ nop /* 3B49F8 E00B2268 0802C90C */ j .LE00B2430 -/* 3B49FC E00B226C 00000000 */ nop +/* 3B49FC E00B226C 00000000 */ nop .LE00B2270: /* 3B4A00 E00B2270 8E020054 */ lw $v0, 0x54($s0) /* 3B4A04 E00B2274 8E130028 */ lw $s3, 0x28($s0) @@ -72,10 +72,10 @@ glabel func_E00B21E4 /* 3B4A68 E00B22D8 0260182D */ daddu $v1, $s3, $zero .LE00B22DC: /* 3B4A6C E00B22DC 44831000 */ mtc1 $v1, $f2 -/* 3B4A70 E00B22E0 00000000 */ nop +/* 3B4A70 E00B22E0 00000000 */ nop /* 3B4A74 E00B22E4 468010A0 */ cvt.s.w $f2, $f2 /* 3B4A78 E00B22E8 44930000 */ mtc1 $s3, $f0 -/* 3B4A7C E00B22EC 00000000 */ nop +/* 3B4A7C E00B22EC 00000000 */ nop /* 3B4A80 E00B22F0 46800020 */ cvt.s.w $f0, $f0 /* 3B4A84 E00B22F4 16800017 */ bnez $s4, .LE00B2354 /* 3B4A88 E00B22F8 46001503 */ div.s $f20, $f2, $f0 @@ -83,64 +83,64 @@ glabel func_E00B21E4 /* 3B4A90 E00B2300 C6020010 */ lwc1 $f2, 0x10($s0) /* 3B4A94 E00B2304 46020001 */ sub.s $f0, $f0, $f2 /* 3B4A98 E00B2308 46140002 */ mul.s $f0, $f0, $f20 -/* 3B4A9C E00B230C 00000000 */ nop +/* 3B4A9C E00B230C 00000000 */ nop /* 3B4AA0 E00B2310 46001080 */ add.s $f2, $f2, $f0 /* 3B4AA4 E00B2314 E62200E8 */ swc1 $f2, 0xe8($s1) /* 3B4AA8 E00B2318 C6000020 */ lwc1 $f0, 0x20($s0) /* 3B4AAC E00B231C C6020014 */ lwc1 $f2, 0x14($s0) /* 3B4AB0 E00B2320 46020001 */ sub.s $f0, $f0, $f2 /* 3B4AB4 E00B2324 46140002 */ mul.s $f0, $f0, $f20 -/* 3B4AB8 E00B2328 00000000 */ nop +/* 3B4AB8 E00B2328 00000000 */ nop /* 3B4ABC E00B232C 46001080 */ add.s $f2, $f2, $f0 /* 3B4AC0 E00B2330 E6220118 */ swc1 $f2, 0x118($s1) /* 3B4AC4 E00B2334 C6000024 */ lwc1 $f0, 0x24($s0) /* 3B4AC8 E00B2338 C6020018 */ lwc1 $f2, 0x18($s0) /* 3B4ACC E00B233C 46020001 */ sub.s $f0, $f0, $f2 /* 3B4AD0 E00B2340 46140002 */ mul.s $f0, $f0, $f20 -/* 3B4AD4 E00B2344 00000000 */ nop +/* 3B4AD4 E00B2344 00000000 */ nop /* 3B4AD8 E00B2348 46001080 */ add.s $f2, $f2, $f0 /* 3B4ADC E00B234C 0802C908 */ j .LE00B2420 /* 3B4AE0 E00B2350 E6220148 */ swc1 $f2, 0x148($s1) .LE00B2354: /* 3B4AE4 E00B2354 3C014334 */ lui $at, 0x4334 /* 3B4AE8 E00B2358 44816000 */ mtc1 $at, $f12 -/* 3B4AEC E00B235C 00000000 */ nop +/* 3B4AEC E00B235C 00000000 */ nop /* 3B4AF0 E00B2360 460CA302 */ mul.s $f12, $f20, $f12 -/* 3B4AF4 E00B2364 00000000 */ nop +/* 3B4AF4 E00B2364 00000000 */ nop /* 3B4AF8 E00B2368 C600001C */ lwc1 $f0, 0x1c($s0) /* 3B4AFC E00B236C C6020010 */ lwc1 $f2, 0x10($s0) /* 3B4B00 E00B2370 46020001 */ sub.s $f0, $f0, $f2 /* 3B4B04 E00B2374 46140002 */ mul.s $f0, $f0, $f20 -/* 3B4B08 E00B2378 00000000 */ nop +/* 3B4B08 E00B2378 00000000 */ nop /* 3B4B0C E00B237C 46001080 */ add.s $f2, $f2, $f0 /* 3B4B10 E00B2380 0C080140 */ jal func_E0200500 /* 3B4B14 E00B2384 E62200E8 */ swc1 $f2, 0xe8($s1) /* 3B4B18 E00B2388 3C0142F0 */ lui $at, 0x42f0 /* 3B4B1C E00B238C 44811000 */ mtc1 $at, $f2 -/* 3B4B20 E00B2390 00000000 */ nop +/* 3B4B20 E00B2390 00000000 */ nop /* 3B4B24 E00B2394 46020002 */ mul.s $f0, $f0, $f2 -/* 3B4B28 E00B2398 00000000 */ nop +/* 3B4B28 E00B2398 00000000 */ nop /* 3B4B2C E00B239C C6040020 */ lwc1 $f4, 0x20($s0) /* 3B4B30 E00B23A0 C6060014 */ lwc1 $f6, 0x14($s0) /* 3B4B34 E00B23A4 46062101 */ sub.s $f4, $f4, $f6 /* 3B4B38 E00B23A8 46142102 */ mul.s $f4, $f4, $f20 -/* 3B4B3C E00B23AC 00000000 */ nop +/* 3B4B3C E00B23AC 00000000 */ nop /* 3B4B40 E00B23B0 46043180 */ add.s $f6, $f6, $f4 /* 3B4B44 E00B23B4 46003180 */ add.s $f6, $f6, $f0 /* 3B4B48 E00B23B8 4618A102 */ mul.s $f4, $f20, $f24 -/* 3B4B4C E00B23BC 00000000 */ nop +/* 3B4B4C E00B23BC 00000000 */ nop /* 3B4B50 E00B23C0 E6260118 */ swc1 $f6, 0x118($s1) /* 3B4B54 E00B23C4 C6000024 */ lwc1 $f0, 0x24($s0) /* 3B4B58 E00B23C8 C6020018 */ lwc1 $f2, 0x18($s0) /* 3B4B5C E00B23CC 46020001 */ sub.s $f0, $f0, $f2 /* 3B4B60 E00B23D0 46140002 */ mul.s $f0, $f0, $f20 -/* 3B4B64 E00B23D4 00000000 */ nop +/* 3B4B64 E00B23D4 00000000 */ nop /* 3B4B68 E00B23D8 46001080 */ add.s $f2, $f2, $f0 /* 3B4B6C E00B23DC 02121021 */ addu $v0, $s0, $s2 /* 3B4B70 E00B23E0 4604C001 */ sub.s $f0, $f24, $f4 /* 3B4B74 E00B23E4 244201D8 */ addiu $v0, $v0, 0x1d8 /* 3B4B78 E00B23E8 4600B03E */ c.le.s $f22, $f0 -/* 3B4B7C E00B23EC 00000000 */ nop +/* 3B4B7C E00B23EC 00000000 */ nop /* 3B4B80 E00B23F0 45010005 */ bc1t .LE00B2408 /* 3B4B84 E00B23F4 E6220148 */ swc1 $f2, 0x148($s1) /* 3B4B88 E00B23F8 4600020D */ trunc.w.s $f8, $f0 @@ -151,7 +151,7 @@ glabel func_E00B21E4 /* 3B4B98 E00B2408 46160001 */ sub.s $f0, $f0, $f22 /* 3B4B9C E00B240C 4600020D */ trunc.w.s $f8, $f0 /* 3B4BA0 E00B2410 44034000 */ mfc1 $v1, $f8 -/* 3B4BA4 E00B2414 00000000 */ nop +/* 3B4BA4 E00B2414 00000000 */ nop /* 3B4BA8 E00B2418 00751825 */ or $v1, $v1, $s5 /* 3B4BAC E00B241C A0430000 */ sb $v1, ($v0) .LE00B2420: diff --git a/asm/nonmatchings/code_3B4790/func_E00B24A8.s b/asm/nonmatchings/code_3B4790/func_E00B24A8.s index 195872281b..54c86fb321 100644 --- a/asm/nonmatchings/code_3B4790/func_E00B24A8.s +++ b/asm/nonmatchings/code_3B4790/func_E00B24A8.s @@ -3,4 +3,4 @@ glabel func_E00B24A8 /* 3B4C38 E00B24A8 03E00008 */ jr $ra -/* 3B4C3C E00B24AC 00000000 */ nop +/* 3B4C3C E00B24AC 00000000 */ nop diff --git a/asm/nonmatchings/code_3B4790/func_E00B24B0.s b/asm/nonmatchings/code_3B4790/func_E00B24B0.s index ffd96a6088..b171e4cbcf 100644 --- a/asm/nonmatchings/code_3B4790/func_E00B24B0.s +++ b/asm/nonmatchings/code_3B4790/func_E00B24B0.s @@ -150,10 +150,10 @@ glabel func_E00B24B0 /* 3B4E80 E00B26F0 13150006 */ beq $t8, $s5, .LE00B270C /* 3B4E84 E00B26F4 2402000B */ addiu $v0, $zero, 0xb /* 3B4E88 E00B26F8 12A2000F */ beq $s5, $v0, .LE00B2738 -/* 3B4E8C E00B26FC 00000000 */ nop +/* 3B4E8C E00B26FC 00000000 */ nop /* 3B4E90 E00B2700 8EC20178 */ lw $v0, 0x178($s6) /* 3B4E94 E00B2704 1440000C */ bnez $v0, .LE00B2738 -/* 3B4E98 E00B2708 00000000 */ nop +/* 3B4E98 E00B2708 00000000 */ nop .LE00B270C: /* 3B4E9C E00B270C 8FB800A4 */ lw $t8, 0xa4($sp) /* 3B4EA0 E00B2710 8EC60118 */ lw $a2, 0x118($s6) @@ -169,22 +169,22 @@ glabel func_E00B24B0 .LE00B2738: /* 3B4EC8 E00B2738 8EE20000 */ lw $v0, ($s7) /* 3B4ECC E00B273C 14400015 */ bnez $v0, .LE00B2794 -/* 3B4ED0 E00B2740 00000000 */ nop +/* 3B4ED0 E00B2740 00000000 */ nop /* 3B4ED4 E00B2744 C6C001A8 */ lwc1 $f0, 0x1a8($s6) /* 3B4ED8 E00B2748 46800020 */ cvt.s.w $f0, $f0 /* 3B4EDC E00B274C 46000021 */ cvt.d.s $f0, $f0 /* 3B4EE0 E00B2750 463C0002 */ mul.d $f0, $f0, $f28 -/* 3B4EE4 E00B2754 00000000 */ nop +/* 3B4EE4 E00B2754 00000000 */ nop /* 3B4EE8 E00B2758 3C014000 */ lui $at, 0x4000 /* 3B4EEC E00B275C 44811800 */ mtc1 $at, $f3 /* 3B4EF0 E00B2760 44801000 */ mtc1 $zero, $f2 -/* 3B4EF4 E00B2764 00000000 */ nop +/* 3B4EF4 E00B2764 00000000 */ nop /* 3B4EF8 E00B2768 46220000 */ add.d $f0, $f0, $f2 /* 3B4EFC E00B276C 3C0140C0 */ lui $at, 0x40c0 /* 3B4F00 E00B2770 44812000 */ mtc1 $at, $f4 /* 3B4F04 E00B2774 462005A0 */ cvt.s.d $f22, $f0 /* 3B4F08 E00B2778 4616203C */ c.lt.s $f4, $f22 -/* 3B4F0C E00B277C 00000000 */ nop +/* 3B4F0C E00B277C 00000000 */ nop /* 3B4F10 E00B2780 45030001 */ bc1tl .LE00B2788 /* 3B4F14 E00B2784 46002586 */ mov.s $f22, $f4 .LE00B2788: @@ -196,17 +196,17 @@ glabel func_E00B24B0 /* 3B4F28 E00B2798 46800020 */ cvt.s.w $f0, $f0 /* 3B4F2C E00B279C 46000021 */ cvt.d.s $f0, $f0 /* 3B4F30 E00B27A0 463C0002 */ mul.d $f0, $f0, $f28 -/* 3B4F34 E00B27A4 00000000 */ nop +/* 3B4F34 E00B27A4 00000000 */ nop /* 3B4F38 E00B27A8 3C013FF0 */ lui $at, 0x3ff0 /* 3B4F3C E00B27AC 44811800 */ mtc1 $at, $f3 /* 3B4F40 E00B27B0 44801000 */ mtc1 $zero, $f2 -/* 3B4F44 E00B27B4 00000000 */ nop +/* 3B4F44 E00B27B4 00000000 */ nop /* 3B4F48 E00B27B8 46220000 */ add.d $f0, $f0, $f2 /* 3B4F4C E00B27BC 3C0141F0 */ lui $at, 0x41f0 /* 3B4F50 E00B27C0 44811000 */ mtc1 $at, $f2 /* 3B4F54 E00B27C4 462005A0 */ cvt.s.d $f22, $f0 /* 3B4F58 E00B27C8 4616103C */ c.lt.s $f2, $f22 -/* 3B4F5C E00B27CC 00000000 */ nop +/* 3B4F5C E00B27CC 00000000 */ nop /* 3B4F60 E00B27D0 45030001 */ bc1tl .LE00B27D8 /* 3B4F64 E00B27D4 46001586 */ mov.s $f22, $f2 .LE00B27D8: @@ -228,32 +228,32 @@ glabel func_E00B24B0 /* 3B4FA0 E00B2810 C7A40098 */ lwc1 $f4, 0x98($sp) /* 3B4FA4 E00B2814 8FB8009C */ lw $t8, 0x9c($sp) /* 3B4FA8 E00B2818 4604B582 */ mul.s $f22, $f22, $f4 -/* 3B4FAC E00B281C 00000000 */ nop +/* 3B4FAC E00B281C 00000000 */ nop /* 3B4FB0 E00B2820 4600C306 */ mov.s $f12, $f24 /* 3B4FB4 E00B2824 03158021 */ addu $s0, $t8, $s5 /* 3B4FB8 E00B2828 0C080140 */ jal func_E0200500 /* 3B4FBC E00B282C 00108180 */ sll $s0, $s0, 6 /* 3B4FC0 E00B2830 4600B502 */ mul.s $f20, $f22, $f0 -/* 3B4FC4 E00B2834 00000000 */ nop +/* 3B4FC4 E00B2834 00000000 */ nop /* 3B4FC8 E00B2838 0C080144 */ jal func_E0200510 /* 3B4FCC E00B283C 4600C306 */ mov.s $f12, $f24 /* 3B4FD0 E00B2840 C6C200E8 */ lwc1 $f2, 0xe8($s6) /* 3B4FD4 E00B2844 46141080 */ add.s $f2, $f2, $f20 /* 3B4FD8 E00B2848 461A1082 */ mul.s $f2, $f2, $f26 -/* 3B4FDC E00B284C 00000000 */ nop +/* 3B4FDC E00B284C 00000000 */ nop /* 3B4FE0 E00B2850 4600B002 */ mul.s $f0, $f22, $f0 -/* 3B4FE4 E00B2854 00000000 */ nop +/* 3B4FE4 E00B2854 00000000 */ nop /* 3B4FE8 E00B2858 4600110D */ trunc.w.s $f4, $f2 /* 3B4FEC E00B285C 44022000 */ mfc1 $v0, $f4 -/* 3B4FF0 E00B2860 00000000 */ nop +/* 3B4FF0 E00B2860 00000000 */ nop /* 3B4FF4 E00B2864 A7C20000 */ sh $v0, ($fp) /* 3B4FF8 E00B2868 C6C20118 */ lwc1 $f2, 0x118($s6) /* 3B4FFC E00B286C 46001080 */ add.s $f2, $f2, $f0 /* 3B5000 E00B2870 461A1082 */ mul.s $f2, $f2, $f26 -/* 3B5004 E00B2874 00000000 */ nop +/* 3B5004 E00B2874 00000000 */ nop /* 3B5008 E00B2878 4600110D */ trunc.w.s $f4, $f2 /* 3B500C E00B287C 44022000 */ mfc1 $v0, $f4 -/* 3B5010 E00B2880 00000000 */ nop +/* 3B5010 E00B2880 00000000 */ nop /* 3B5014 E00B2884 A682FFF3 */ sh $v0, -0xd($s4) /* 3B5018 E00B2888 32A20001 */ andi $v0, $s5, 1 /* 3B501C E00B288C 00022A00 */ sll $a1, $v0, 8 @@ -271,25 +271,25 @@ glabel func_E00B24B0 /* 3B504C E00B28BC A690FFF9 */ sh $s0, -7($s4) /* 3B5050 E00B28C0 A680FFFB */ sh $zero, -5($s4) /* 3B5054 E00B28C4 461A1082 */ mul.s $f2, $f2, $f26 -/* 3B5058 E00B28C8 00000000 */ nop +/* 3B5058 E00B28C8 00000000 */ nop /* 3B505C E00B28CC A285FFFD */ sb $a1, -3($s4) /* 3B5060 E00B28D0 A284FFFE */ sb $a0, -2($s4) /* 3B5064 E00B28D4 A283FFFF */ sb $v1, -1($s4) /* 3B5068 E00B28D8 A2910000 */ sb $s1, ($s4) /* 3B506C E00B28DC 4600110D */ trunc.w.s $f4, $f2 /* 3B5070 E00B28E0 44022000 */ mfc1 $v0, $f4 -/* 3B5074 E00B28E4 00000000 */ nop +/* 3B5074 E00B28E4 00000000 */ nop /* 3B5078 E00B28E8 A682FFF5 */ sh $v0, -0xb($s4) /* 3B507C E00B28EC C6C200E8 */ lwc1 $f2, 0xe8($s6) /* 3B5080 E00B28F0 46141081 */ sub.s $f2, $f2, $f20 /* 3B5084 E00B28F4 461A1082 */ mul.s $f2, $f2, $f26 -/* 3B5088 E00B28F8 00000000 */ nop +/* 3B5088 E00B28F8 00000000 */ nop /* 3B508C E00B28FC 27DE0010 */ addiu $fp, $fp, 0x10 /* 3B5090 E00B2900 26B50001 */ addiu $s5, $s5, 1 /* 3B5094 E00B2904 26940010 */ addiu $s4, $s4, 0x10 /* 3B5098 E00B2908 4600110D */ trunc.w.s $f4, $f2 /* 3B509C E00B290C 44022000 */ mfc1 $v0, $f4 -/* 3B50A0 E00B2910 00000000 */ nop +/* 3B50A0 E00B2910 00000000 */ nop /* 3B50A4 E00B2914 A7C20000 */ sh $v0, ($fp) /* 3B50A8 E00B2918 8FB8009C */ lw $t8, 0x9c($sp) /* 3B50AC E00B291C C6C20118 */ lwc1 $f2, 0x118($s6) @@ -300,14 +300,14 @@ glabel func_E00B24B0 /* 3B50C0 E00B2930 27180001 */ addiu $t8, $t8, 1 /* 3B50C4 E00B2934 AFB800A0 */ sw $t8, 0xa0($sp) /* 3B50C8 E00B2938 461A1082 */ mul.s $f2, $f2, $f26 -/* 3B50CC E00B293C 00000000 */ nop +/* 3B50CC E00B293C 00000000 */ nop /* 3B50D0 E00B2940 8FB800A4 */ lw $t8, 0xa4($sp) /* 3B50D4 E00B2944 27DE0010 */ addiu $fp, $fp, 0x10 /* 3B50D8 E00B2948 27180004 */ addiu $t8, $t8, 4 /* 3B50DC E00B294C AFB800A4 */ sw $t8, 0xa4($sp) /* 3B50E0 E00B2950 4600110D */ trunc.w.s $f4, $f2 /* 3B50E4 E00B2954 44022000 */ mfc1 $v0, $f4 -/* 3B50E8 E00B2958 00000000 */ nop +/* 3B50E8 E00B2958 00000000 */ nop /* 3B50EC E00B295C A682FFF3 */ sh $v0, -0xd($s4) /* 3B50F0 E00B2960 C6C00148 */ lwc1 $f0, 0x148($s6) /* 3B50F4 E00B2964 26D60004 */ addiu $s6, $s6, 4 @@ -316,14 +316,14 @@ glabel func_E00B24B0 /* 3B5100 E00B2970 A690FFF9 */ sh $s0, -7($s4) /* 3B5104 E00B2974 A682FFFB */ sh $v0, -5($s4) /* 3B5108 E00B2978 461A0002 */ mul.s $f0, $f0, $f26 -/* 3B510C E00B297C 00000000 */ nop +/* 3B510C E00B297C 00000000 */ nop /* 3B5110 E00B2980 A285FFFD */ sb $a1, -3($s4) /* 3B5114 E00B2984 A284FFFE */ sb $a0, -2($s4) /* 3B5118 E00B2988 A283FFFF */ sb $v1, -1($s4) /* 3B511C E00B298C A2910000 */ sb $s1, ($s4) /* 3B5120 E00B2990 4600010D */ trunc.w.s $f4, $f0 /* 3B5124 E00B2994 44022000 */ mfc1 $v0, $f4 -/* 3B5128 E00B2998 00000000 */ nop +/* 3B5128 E00B2998 00000000 */ nop /* 3B512C E00B299C A682FFF5 */ sh $v0, -0xb($s4) /* 3B5130 E00B29A0 2AA2000C */ slti $v0, $s5, 0xc /* 3B5134 E00B29A4 1440FF50 */ bnez $v0, .LE00B26E8 @@ -402,7 +402,7 @@ glabel func_E00B24B0 /* 3B5244 E00B2AB4 AC820000 */ sw $v0, ($a0) .LE00B2AB8: /* 3B5248 E00B2AB8 14A00003 */ bnez $a1, .LE00B2AC8 -/* 3B524C E00B2ABC 00000000 */ nop +/* 3B524C E00B2ABC 00000000 */ nop /* 3B5250 E00B2AC0 0802CABD */ j .LE00B2AF4 /* 3B5254 E00B2AC4 AC8E0004 */ sw $t6, 4($a0) .LE00B2AC8: @@ -460,6 +460,6 @@ glabel func_E00B24B0 /* 3B5318 E00B2B88 D7B400D0 */ ldc1 $f20, 0xd0($sp) /* 3B531C E00B2B8C 03E00008 */ jr $ra /* 3B5320 E00B2B90 27BD0100 */ addiu $sp, $sp, 0x100 -/* 3B5324 E00B2B94 00000000 */ nop -/* 3B5328 E00B2B98 00000000 */ nop -/* 3B532C E00B2B9C 00000000 */ nop +/* 3B5324 E00B2B94 00000000 */ nop +/* 3B5328 E00B2B98 00000000 */ nop +/* 3B532C E00B2B9C 00000000 */ nop diff --git a/asm/nonmatchings/code_3B5CF0/func_E00B4000.s b/asm/nonmatchings/code_3B5CF0/func_E00B4000.s index 22c0084a35..762b3cca7d 100644 --- a/asm/nonmatchings/code_3B5CF0/func_E00B4000.s +++ b/asm/nonmatchings/code_3B5CF0/func_E00B4000.s @@ -40,7 +40,7 @@ glabel func_E00B4000 /* 3B5D7C E00B408C AE02000C */ sw $v0, 0xc($s0) .LE00B4090: /* 3B5D80 E00B4090 0802D024 */ j .LE00B4090 -/* 3B5D84 E00B4094 00000000 */ nop +/* 3B5D84 E00B4094 00000000 */ nop .LE00B4098: /* 3B5D88 E00B4098 AC720000 */ sw $s2, ($v1) /* 3B5D8C E00B409C 1E200004 */ bgtz $s1, .LE00B40B0 diff --git a/asm/nonmatchings/code_3B5CF0/func_E00B4134.s b/asm/nonmatchings/code_3B5CF0/func_E00B4134.s index 09825e8d31..c3a5cab020 100644 --- a/asm/nonmatchings/code_3B5CF0/func_E00B4134.s +++ b/asm/nonmatchings/code_3B5CF0/func_E00B4134.s @@ -3,4 +3,4 @@ glabel func_E00B4134 /* 3B5E24 E00B4134 03E00008 */ jr $ra -/* 3B5E28 E00B4138 00000000 */ nop +/* 3B5E28 E00B4138 00000000 */ nop diff --git a/asm/nonmatchings/code_3B5CF0/func_E00B413C.s b/asm/nonmatchings/code_3B5CF0/func_E00B413C.s index 7ba8558b43..5f53143239 100644 --- a/asm/nonmatchings/code_3B5CF0/func_E00B413C.s +++ b/asm/nonmatchings/code_3B5CF0/func_E00B413C.s @@ -51,7 +51,7 @@ glabel func_E00B413C /* 3B5ED0 E00B41E0 04610020 */ bgez $v1, .LE00B4264 /* 3B5ED4 E00B41E4 24020001 */ addiu $v0, $zero, 1 /* 3B5ED8 E00B41E8 1482001A */ bne $a0, $v0, .LE00B4254 -/* 3B5EDC E00B41EC 00000000 */ nop +/* 3B5EDC E00B41EC 00000000 */ nop /* 3B5EE0 E00B41F0 0C080150 */ jal func_E0200540 /* 3B5EE4 E00B41F4 2404005F */ addiu $a0, $zero, 0x5f /* 3B5EE8 E00B41F8 C6200008 */ lwc1 $f0, 8($s1) @@ -81,7 +81,7 @@ glabel func_E00B413C /* 3B5F44 E00B4254 0C080128 */ jal func_E02004A0 /* 3B5F48 E00B4258 0240202D */ daddu $a0, $s2, $zero /* 3B5F4C E00B425C 0802D141 */ j .LE00B4504 -/* 3B5F50 E00B4260 00000000 */ nop +/* 3B5F50 E00B4260 00000000 */ nop .LE00B4264: /* 3B5F54 E00B4264 8E300014 */ lw $s0, 0x14($s1) /* 3B5F58 E00B4268 1480000B */ bnez $a0, .LE00B4298 @@ -110,30 +110,30 @@ glabel func_E00B413C /* 3B5FA4 E00B42B4 00021040 */ sll $v0, $v0, 1 /* 3B5FA8 E00B42B8 00501021 */ addu $v0, $v0, $s0 /* 3B5FAC E00B42BC 44826000 */ mtc1 $v0, $f12 -/* 3B5FB0 E00B42C0 00000000 */ nop +/* 3B5FB0 E00B42C0 00000000 */ nop /* 3B5FB4 E00B42C4 0C080140 */ jal func_E0200500 /* 3B5FB8 E00B42C8 46806320 */ cvt.s.w $f12, $f12 /* 3B5FBC E00B42CC 4490A000 */ mtc1 $s0, $f20 -/* 3B5FC0 E00B42D0 00000000 */ nop +/* 3B5FC0 E00B42D0 00000000 */ nop /* 3B5FC4 E00B42D4 4680A520 */ cvt.s.w $f20, $f20 /* 3B5FC8 E00B42D8 3C01E00B */ lui $at, %hi(D_E00B4ED0) /* 3B5FCC E00B42DC D4224ED0 */ ldc1 $f2, %lo(D_E00B4ED0)($at) /* 3B5FD0 E00B42E0 4600A521 */ cvt.d.s $f20, $f20 /* 3B5FD4 E00B42E4 4622A502 */ mul.d $f20, $f20, $f2 -/* 3B5FD8 E00B42E8 00000000 */ nop +/* 3B5FD8 E00B42E8 00000000 */ nop /* 3B5FDC E00B42EC 3C014200 */ lui $at, 0x4200 /* 3B5FE0 E00B42F0 4481C000 */ mtc1 $at, $f24 -/* 3B5FE4 E00B42F4 00000000 */ nop +/* 3B5FE4 E00B42F4 00000000 */ nop /* 3B5FE8 E00B42F8 46180002 */ mul.s $f0, $f0, $f24 -/* 3B5FEC E00B42FC 00000000 */ nop +/* 3B5FEC E00B42FC 00000000 */ nop /* 3B5FF0 E00B4300 3C0140C0 */ lui $at, 0x40c0 /* 3B5FF4 E00B4304 44816000 */ mtc1 $at, $f12 /* 3B5FF8 E00B4308 4620A520 */ cvt.s.d $f20, $f20 /* 3B5FFC E00B430C 460CA302 */ mul.s $f12, $f20, $f12 -/* 3B6000 E00B4310 00000000 */ nop +/* 3B6000 E00B4310 00000000 */ nop /* 3B6004 E00B4314 3C0142FE */ lui $at, 0x42fe /* 3B6008 E00B4318 44811000 */ mtc1 $at, $f2 -/* 3B600C E00B431C 00000000 */ nop +/* 3B600C E00B431C 00000000 */ nop /* 3B6010 E00B4320 46020000 */ add.s $f0, $f0, $f2 /* 3B6014 E00B4324 4600038D */ trunc.w.s $f14, $f0 /* 3B6018 E00B4328 0C080140 */ jal func_E0200500 @@ -148,16 +148,16 @@ glabel func_E00B413C /* 3B603C E00B434C 0C080144 */ jal func_E0200510 /* 3B6040 E00B4350 46000506 */ mov.s $f20, $f0 /* 3B6044 E00B4354 4618B582 */ mul.s $f22, $f22, $f24 -/* 3B6048 E00B4358 00000000 */ nop +/* 3B6048 E00B4358 00000000 */ nop /* 3B604C E00B435C 4618A502 */ mul.s $f20, $f20, $f24 -/* 3B6050 E00B4360 00000000 */ nop +/* 3B6050 E00B4360 00000000 */ nop /* 3B6054 E00B4364 46180002 */ mul.s $f0, $f0, $f24 -/* 3B6058 E00B4368 00000000 */ nop +/* 3B6058 E00B4368 00000000 */ nop /* 3B605C E00B436C 461AB582 */ mul.s $f22, $f22, $f26 -/* 3B6060 E00B4370 00000000 */ nop +/* 3B6060 E00B4370 00000000 */ nop /* 3B6064 E00B4374 3C014380 */ lui $at, 0x4380 /* 3B6068 E00B4378 44811000 */ mtc1 $at, $f2 -/* 3B606C E00B437C 00000000 */ nop +/* 3B606C E00B437C 00000000 */ nop /* 3B6070 E00B4380 4602B580 */ add.s $f22, $f22, $f2 /* 3B6074 E00B4384 C6220034 */ lwc1 $f2, 0x34($s1) /* 3B6078 E00B4388 3C01E00B */ lui $at, %hi(D_E00B4ED8) @@ -171,7 +171,7 @@ glabel func_E00B413C /* 3B6098 E00B43A8 462010A0 */ cvt.s.d $f2, $f2 /* 3B609C E00B43AC E6220034 */ swc1 $f2, 0x34($s1) /* 3B60A0 E00B43B0 4602203E */ c.le.s $f4, $f2 -/* 3B60A4 E00B43B4 00000000 */ nop +/* 3B60A4 E00B43B4 00000000 */ nop /* 3B60A8 E00B43B8 45000002 */ bc1f .LE00B43C4 /* 3B60AC E00B43BC E6360030 */ swc1 $f22, 0x30($s1) /* 3B60B0 E00B43C0 AE200034 */ sw $zero, 0x34($s1) @@ -194,10 +194,10 @@ glabel func_E00B413C /* 3B60EC E00B43FC 3C01E00B */ lui $at, %hi(D_E00B4EE0) /* 3B60F0 E00B4400 D4224EE0 */ ldc1 $f2, %lo(D_E00B4EE0)($at) /* 3B60F4 E00B4404 44820000 */ mtc1 $v0, $f0 -/* 3B60F8 E00B4408 00000000 */ nop +/* 3B60F8 E00B4408 00000000 */ nop /* 3B60FC E00B440C 46800021 */ cvt.d.w $f0, $f0 /* 3B6100 E00B4410 46220002 */ mul.d $f0, $f0, $f2 -/* 3B6104 E00B4414 00000000 */ nop +/* 3B6104 E00B4414 00000000 */ nop /* 3B6108 E00B4418 2404000A */ addiu $a0, $zero, 0xa /* 3B610C E00B441C 46200020 */ cvt.s.d $f0, $f0 /* 3B6110 E00B4420 0C080138 */ jal func_E02004E0 @@ -205,13 +205,13 @@ glabel func_E00B413C /* 3B6118 E00B4428 2404000A */ addiu $a0, $zero, 0xa /* 3B611C E00B442C 24420002 */ addiu $v0, $v0, 2 /* 3B6120 E00B4430 44820000 */ mtc1 $v0, $f0 -/* 3B6124 E00B4434 00000000 */ nop +/* 3B6124 E00B4434 00000000 */ nop /* 3B6128 E00B4438 46800020 */ cvt.s.w $f0, $f0 /* 3B612C E00B443C 0C080138 */ jal func_E02004E0 /* 3B6130 E00B4440 E6000068 */ swc1 $f0, 0x68($s0) /* 3B6134 E00B4444 24420001 */ addiu $v0, $v0, 1 /* 3B6138 E00B4448 44820000 */ mtc1 $v0, $f0 -/* 3B613C E00B444C 00000000 */ nop +/* 3B613C E00B444C 00000000 */ nop /* 3B6140 E00B4450 46800020 */ cvt.s.w $f0, $f0 /* 3B6144 E00B4454 E6000078 */ swc1 $f0, 0x78($s0) .LE00B4458: @@ -220,17 +220,17 @@ glabel func_E00B413C /* 3B6150 E00B4460 D4204EE8 */ ldc1 $f0, %lo(D_E00B4EE8)($at) /* 3B6154 E00B4464 460031A1 */ cvt.d.s $f6, $f6 /* 3B6158 E00B4468 46203182 */ mul.d $f6, $f6, $f0 -/* 3B615C E00B446C 00000000 */ nop +/* 3B615C E00B446C 00000000 */ nop /* 3B6160 E00B4470 C6040068 */ lwc1 $f4, 0x68($s0) /* 3B6164 E00B4474 3C014120 */ lui $at, 0x4120 /* 3B6168 E00B4478 44811000 */ mtc1 $at, $f2 -/* 3B616C E00B447C 00000000 */ nop +/* 3B616C E00B447C 00000000 */ nop /* 3B6170 E00B4480 46041081 */ sub.s $f2, $f2, $f4 /* 3B6174 E00B4484 3C01E00B */ lui $at, %hi(D_E00B4EF0) /* 3B6178 E00B4488 D4204EF0 */ ldc1 $f0, %lo(D_E00B4EF0)($at) /* 3B617C E00B448C 460010A1 */ cvt.d.s $f2, $f2 /* 3B6180 E00B4490 46201082 */ mul.d $f2, $f2, $f0 -/* 3B6184 E00B4494 00000000 */ nop +/* 3B6184 E00B4494 00000000 */ nop /* 3B6188 E00B4498 C6080048 */ lwc1 $f8, 0x48($s0) /* 3B618C E00B449C C60A0058 */ lwc1 $f10, 0x58($s0) /* 3B6190 E00B44A0 46002006 */ mov.s $f0, $f4 diff --git a/asm/nonmatchings/code_3B5CF0/func_E00B4574.s b/asm/nonmatchings/code_3B5CF0/func_E00B4574.s index 47924b787e..bcbc27a309 100644 --- a/asm/nonmatchings/code_3B5CF0/func_E00B4574.s +++ b/asm/nonmatchings/code_3B5CF0/func_E00B4574.s @@ -3,4 +3,4 @@ glabel func_E00B4574 /* 3B6264 E00B4574 03E00008 */ jr $ra -/* 3B6268 E00B4578 00000000 */ nop +/* 3B6268 E00B4578 00000000 */ nop diff --git a/asm/nonmatchings/code_3B5CF0/func_E00B457C.s b/asm/nonmatchings/code_3B5CF0/func_E00B457C.s index 52a7e84630..df019e3662 100644 --- a/asm/nonmatchings/code_3B5CF0/func_E00B457C.s +++ b/asm/nonmatchings/code_3B5CF0/func_E00B457C.s @@ -103,13 +103,13 @@ glabel func_E00B457C /* 3B63F0 E00B4700 00021040 */ sll $v0, $v0, 1 /* 3B63F4 E00B4704 82A3FFF7 */ lb $v1, -9($s5) /* 3B63F8 E00B4708 4482E000 */ mtc1 $v0, $f28 -/* 3B63FC E00B470C 00000000 */ nop +/* 3B63FC E00B470C 00000000 */ nop /* 3B6400 E00B4710 4680E720 */ cvt.s.w $f28, $f28 /* 3B6404 E00B4714 00031080 */ sll $v0, $v1, 2 /* 3B6408 E00B4718 00431021 */ addu $v0, $v0, $v1 /* 3B640C E00B471C 00021040 */ sll $v0, $v0, 1 /* 3B6410 E00B4720 4482C000 */ mtc1 $v0, $f24 -/* 3B6414 E00B4724 00000000 */ nop +/* 3B6414 E00B4724 00000000 */ nop /* 3B6418 E00B4728 4680C620 */ cvt.s.w $f24, $f24 /* 3B641C E00B472C 82A3FFF8 */ lb $v1, -8($s5) /* 3B6420 E00B4730 461EC032 */ c.eq.s $f24, $f30 @@ -117,20 +117,20 @@ glabel func_E00B457C /* 3B6428 E00B4738 00431021 */ addu $v0, $v0, $v1 /* 3B642C E00B473C 00021040 */ sll $v0, $v0, 1 /* 3B6430 E00B4740 4482D000 */ mtc1 $v0, $f26 -/* 3B6434 E00B4744 00000000 */ nop +/* 3B6434 E00B4744 00000000 */ nop /* 3B6438 E00B4748 4680D6A0 */ cvt.s.w $f26, $f26 /* 3B643C E00B474C 45010052 */ bc1t .LE00B4898 -/* 3B6440 E00B4750 00000000 */ nop +/* 3B6440 E00B4750 00000000 */ nop /* 3B6444 E00B4754 3C014120 */ lui $at, 0x4120 /* 3B6448 E00B4758 44813000 */ mtc1 $at, $f6 -/* 3B644C E00B475C 00000000 */ nop +/* 3B644C E00B475C 00000000 */ nop /* 3B6450 E00B4760 4606C002 */ mul.s $f0, $f24, $f6 -/* 3B6454 E00B4764 00000000 */ nop +/* 3B6454 E00B4764 00000000 */ nop /* 3B6458 E00B4768 3C0142C8 */ lui $at, 0x42c8 /* 3B645C E00B476C 44813000 */ mtc1 $at, $f6 -/* 3B6460 E00B4770 00000000 */ nop +/* 3B6460 E00B4770 00000000 */ nop /* 3B6464 E00B4774 4606D082 */ mul.s $f2, $f26, $f6 -/* 3B6468 E00B4778 00000000 */ nop +/* 3B6468 E00B4778 00000000 */ nop /* 3B646C E00B477C 4600E000 */ add.s $f0, $f28, $f0 /* 3B6470 E00B4780 46020000 */ add.s $f0, $f0, $f2 /* 3B6474 E00B4784 4600018D */ trunc.w.s $f6, $f0 @@ -139,81 +139,81 @@ glabel func_E00B457C /* 3B6480 E00B4790 240403E8 */ addiu $a0, $zero, 0x3e8 /* 3B6484 E00B4794 02021021 */ addu $v0, $s0, $v0 /* 3B6488 E00B4798 44826000 */ mtc1 $v0, $f12 -/* 3B648C E00B479C 00000000 */ nop +/* 3B648C E00B479C 00000000 */ nop /* 3B6490 E00B47A0 0C080140 */ jal func_E0200500 /* 3B6494 E00B47A4 46806320 */ cvt.s.w $f12, $f12 /* 3B6498 E00B47A8 3C014120 */ lui $at, 0x4120 /* 3B649C E00B47AC 44813000 */ mtc1 $at, $f6 -/* 3B64A0 E00B47B0 00000000 */ nop +/* 3B64A0 E00B47B0 00000000 */ nop /* 3B64A4 E00B47B4 4606E102 */ mul.s $f4, $f28, $f6 -/* 3B64A8 E00B47B8 00000000 */ nop +/* 3B64A8 E00B47B8 00000000 */ nop /* 3B64AC E00B47BC 3C0142C8 */ lui $at, 0x42c8 /* 3B64B0 E00B47C0 44813000 */ mtc1 $at, $f6 -/* 3B64B4 E00B47C4 00000000 */ nop +/* 3B64B4 E00B47C4 00000000 */ nop /* 3B64B8 E00B47C8 4606C082 */ mul.s $f2, $f24, $f6 -/* 3B64BC E00B47CC 00000000 */ nop +/* 3B64BC E00B47CC 00000000 */ nop /* 3B64C0 E00B47D0 46022100 */ add.s $f4, $f4, $f2 /* 3B64C4 E00B47D4 461A2100 */ add.s $f4, $f4, $f26 /* 3B64C8 E00B47D8 4600218D */ trunc.w.s $f6, $f4 /* 3B64CC E00B47DC 44053000 */ mfc1 $a1, $f6 /* 3B64D0 E00B47E0 3C0141A0 */ lui $at, 0x41a0 /* 3B64D4 E00B47E4 44813000 */ mtc1 $at, $f6 -/* 3B64D8 E00B47E8 00000000 */ nop +/* 3B64D8 E00B47E8 00000000 */ nop /* 3B64DC E00B47EC 46060582 */ mul.s $f22, $f0, $f6 -/* 3B64E0 E00B47F0 00000000 */ nop +/* 3B64E0 E00B47F0 00000000 */ nop /* 3B64E4 E00B47F4 0C080011 */ jal func_E0200044 /* 3B64E8 E00B47F8 240403E8 */ addiu $a0, $zero, 0x3e8 /* 3B64EC E00B47FC 02021021 */ addu $v0, $s0, $v0 /* 3B64F0 E00B4800 44826000 */ mtc1 $v0, $f12 -/* 3B64F4 E00B4804 00000000 */ nop +/* 3B64F4 E00B4804 00000000 */ nop /* 3B64F8 E00B4808 0C080140 */ jal func_E0200500 /* 3B64FC E00B480C 46806320 */ cvt.s.w $f12, $f12 /* 3B6500 E00B4810 3C0142C8 */ lui $at, 0x42c8 /* 3B6504 E00B4814 44813000 */ mtc1 $at, $f6 -/* 3B6508 E00B4818 00000000 */ nop +/* 3B6508 E00B4818 00000000 */ nop /* 3B650C E00B481C 4606E082 */ mul.s $f2, $f28, $f6 -/* 3B6510 E00B4820 00000000 */ nop +/* 3B6510 E00B4820 00000000 */ nop /* 3B6514 E00B4824 3C014120 */ lui $at, 0x4120 /* 3B6518 E00B4828 44813000 */ mtc1 $at, $f6 -/* 3B651C E00B482C 00000000 */ nop +/* 3B651C E00B482C 00000000 */ nop /* 3B6520 E00B4830 4606D102 */ mul.s $f4, $f26, $f6 -/* 3B6524 E00B4834 00000000 */ nop +/* 3B6524 E00B4834 00000000 */ nop /* 3B6528 E00B4838 46181080 */ add.s $f2, $f2, $f24 /* 3B652C E00B483C 46041080 */ add.s $f2, $f2, $f4 /* 3B6530 E00B4840 4600118D */ trunc.w.s $f6, $f2 /* 3B6534 E00B4844 44053000 */ mfc1 $a1, $f6 /* 3B6538 E00B4848 3C0141A0 */ lui $at, 0x41a0 /* 3B653C E00B484C 44813000 */ mtc1 $at, $f6 -/* 3B6540 E00B4850 00000000 */ nop +/* 3B6540 E00B4850 00000000 */ nop /* 3B6544 E00B4854 46060502 */ mul.s $f20, $f0, $f6 -/* 3B6548 E00B4858 00000000 */ nop +/* 3B6548 E00B4858 00000000 */ nop /* 3B654C E00B485C 0C080011 */ jal func_E0200044 /* 3B6550 E00B4860 240403E8 */ addiu $a0, $zero, 0x3e8 /* 3B6554 E00B4864 02021021 */ addu $v0, $s0, $v0 /* 3B6558 E00B4868 44826000 */ mtc1 $v0, $f12 -/* 3B655C E00B486C 00000000 */ nop +/* 3B655C E00B486C 00000000 */ nop /* 3B6560 E00B4870 0C080140 */ jal func_E0200500 /* 3B6564 E00B4874 46806320 */ cvt.s.w $f12, $f12 /* 3B6568 E00B4878 3C0141A0 */ lui $at, 0x41a0 /* 3B656C E00B487C 44813000 */ mtc1 $at, $f6 -/* 3B6570 E00B4880 00000000 */ nop +/* 3B6570 E00B4880 00000000 */ nop /* 3B6574 E00B4884 46060002 */ mul.s $f0, $f0, $f6 -/* 3B6578 E00B4888 00000000 */ nop +/* 3B6578 E00B4888 00000000 */ nop /* 3B657C E00B488C 4616E700 */ add.s $f28, $f28, $f22 /* 3B6580 E00B4890 4614C600 */ add.s $f24, $f24, $f20 /* 3B6584 E00B4894 4600D680 */ add.s $f26, $f26, $f0 .LE00B4898: /* 3B6588 E00B4898 4600E18D */ trunc.w.s $f6, $f28 /* 3B658C E00B489C 44023000 */ mfc1 $v0, $f6 -/* 3B6590 E00B48A0 00000000 */ nop +/* 3B6590 E00B48A0 00000000 */ nop /* 3B6594 E00B48A4 A7C20000 */ sh $v0, ($fp) /* 3B6598 E00B48A8 4600C18D */ trunc.w.s $f6, $f24 /* 3B659C E00B48AC 44023000 */ mfc1 $v0, $f6 -/* 3B65A0 E00B48B0 00000000 */ nop +/* 3B65A0 E00B48B0 00000000 */ nop /* 3B65A4 E00B48B4 A682FFF3 */ sh $v0, -0xd($s4) /* 3B65A8 E00B48B8 4600D18D */ trunc.w.s $f6, $f26 /* 3B65AC E00B48BC 44023000 */ mfc1 $v0, $f6 -/* 3B65B0 E00B48C0 00000000 */ nop +/* 3B65B0 E00B48C0 00000000 */ nop /* 3B65B4 E00B48C4 A682FFF5 */ sh $v0, -0xb($s4) /* 3B65B8 E00B48C8 96A2FFFA */ lhu $v0, -6($s5) /* 3B65BC E00B48CC A682FFF9 */ sh $v0, -7($s4) @@ -380,7 +380,7 @@ glabel func_E00B457C /* 3B6838 E00B4B48 3C02FA00 */ lui $v0, 0xfa00 /* 3B683C E00B4B4C 246C0004 */ addiu $t4, $v1, 4 /* 3B6840 E00B4B50 46220002 */ mul.d $f0, $f0, $f2 -/* 3B6844 E00B4B54 00000000 */ nop +/* 3B6844 E00B4B54 00000000 */ nop /* 3B6848 E00B4B58 AC620000 */ sw $v0, ($v1) /* 3B684C E00B4B5C 8FAD00A0 */ lw $t5, 0xa0($sp) /* 3B6850 E00B4B60 3C0141E0 */ lui $at, 0x41e0 @@ -394,7 +394,7 @@ glabel func_E00B457C /* 3B6870 E00B4B80 00832025 */ or $a0, $a0, $v1 /* 3B6874 E00B4B84 00021200 */ sll $v0, $v0, 8 /* 3B6878 E00B4B88 4620103E */ c.le.d $f2, $f0 -/* 3B687C E00B4B8C 00000000 */ nop +/* 3B687C E00B4B8C 00000000 */ nop /* 3B6880 E00B4B90 45010005 */ bc1t .LE00B4BA8 /* 3B6884 E00B4B94 00825825 */ or $t3, $a0, $v0 /* 3B6888 E00B4B98 4620018D */ trunc.w.d $f6, $f0 @@ -406,7 +406,7 @@ glabel func_E00B457C /* 3B689C E00B4BAC 3C028000 */ lui $v0, 0x8000 /* 3B68A0 E00B4BB0 4620018D */ trunc.w.d $f6, $f0 /* 3B68A4 E00B4BB4 440A3000 */ mfc1 $t2, $f6 -/* 3B68A8 E00B4BB8 00000000 */ nop +/* 3B68A8 E00B4BB8 00000000 */ nop /* 3B68AC E00B4BBC 01425025 */ or $t2, $t2, $v0 /* 3B68B0 E00B4BC0 3C05D9FF */ lui $a1, 0xd9ff .LE00B4BC4: diff --git a/asm/nonmatchings/code_3B7160/func_E00B6000.s b/asm/nonmatchings/code_3B7160/func_E00B6000.s index 8982e50439..d4fa7089b3 100644 --- a/asm/nonmatchings/code_3B7160/func_E00B6000.s +++ b/asm/nonmatchings/code_3B7160/func_E00B6000.s @@ -42,7 +42,7 @@ glabel func_E00B6000 /* 3B71F4 E00B6094 AE42000C */ sw $v0, 0xc($s2) .LE00B6098: /* 3B71F8 E00B6098 0802D826 */ j .LE00B6098 -/* 3B71FC E00B609C 00000000 */ nop +/* 3B71FC E00B609C 00000000 */ nop .LE00B60A0: /* 3B7200 E00B60A0 AC710000 */ sw $s1, ($v1) /* 3B7204 E00B60A4 1E000004 */ bgtz $s0, .LE00B60B8 @@ -77,11 +77,11 @@ glabel func_E00B6000 /* 3B726C E00B610C 0C080138 */ jal func_E02004E0 /* 3B7270 E00B6110 AE00002C */ sw $zero, 0x2c($s0) /* 3B7274 E00B6114 44820000 */ mtc1 $v0, $f0 -/* 3B7278 E00B6118 00000000 */ nop +/* 3B7278 E00B6118 00000000 */ nop /* 3B727C E00B611C 46800020 */ cvt.s.w $f0, $f0 /* 3B7280 E00B6120 46000021 */ cvt.d.s $f0, $f0 /* 3B7284 E00B6124 46360002 */ mul.d $f0, $f0, $f22 -/* 3B7288 E00B6128 00000000 */ nop +/* 3B7288 E00B6128 00000000 */ nop /* 3B728C E00B612C 46340000 */ add.d $f0, $f0, $f20 /* 3B7290 E00B6130 26310001 */ addiu $s1, $s1, 1 /* 3B7294 E00B6134 2A22000C */ slti $v0, $s1, 0xc diff --git a/asm/nonmatchings/code_3B7160/func_E00B6178.s b/asm/nonmatchings/code_3B7160/func_E00B6178.s index 9100e62115..5e8b37dc75 100644 --- a/asm/nonmatchings/code_3B7160/func_E00B6178.s +++ b/asm/nonmatchings/code_3B7160/func_E00B6178.s @@ -3,4 +3,4 @@ glabel func_E00B6178 /* 3B72D8 E00B6178 03E00008 */ jr $ra -/* 3B72DC E00B617C 00000000 */ nop +/* 3B72DC E00B617C 00000000 */ nop diff --git a/asm/nonmatchings/code_3B7160/func_E00B6180.s b/asm/nonmatchings/code_3B7160/func_E00B6180.s index 3273f08c1c..ef3d4ad60a 100644 --- a/asm/nonmatchings/code_3B7160/func_E00B6180.s +++ b/asm/nonmatchings/code_3B7160/func_E00B6180.s @@ -26,9 +26,9 @@ glabel func_E00B6180 /* 3B732C E00B61CC 04610005 */ bgez $v1, .LE00B61E4 /* 3B7330 E00B61D0 ACA60014 */ sw $a2, 0x14($a1) /* 3B7334 E00B61D4 0C080128 */ jal func_E02004A0 -/* 3B7338 E00B61D8 00000000 */ nop +/* 3B7338 E00B61D8 00000000 */ nop /* 3B733C E00B61DC 0802D8A4 */ j .LE00B6290 -/* 3B7340 E00B61E0 00000000 */ nop +/* 3B7340 E00B61E0 00000000 */ nop .LE00B61E4: /* 3B7344 E00B61E4 28620010 */ slti $v0, $v1, 0x10 /* 3B7348 E00B61E8 10400002 */ beqz $v0, .LE00B61F4 @@ -62,13 +62,13 @@ glabel func_E00B6180 /* 3B73AC E00B624C 462010A0 */ cvt.s.d $f2, $f2 /* 3B73B0 E00B6250 E460002C */ swc1 $f0, 0x2c($v1) /* 3B73B4 E00B6254 4602603C */ c.lt.s $f12, $f2 -/* 3B73B8 E00B6258 00000000 */ nop +/* 3B73B8 E00B6258 00000000 */ nop /* 3B73BC E00B625C 45000008 */ bc1f .LE00B6280 /* 3B73C0 E00B6260 E462005C */ swc1 $f2, 0x5c($v1) /* 3B73C4 E00B6264 460010A1 */ cvt.d.s $f2, $f2 /* 3B73C8 E00B6268 46224001 */ sub.d $f0, $f8, $f2 /* 3B73CC E00B626C 46260002 */ mul.d $f0, $f0, $f6 -/* 3B73D0 E00B6270 00000000 */ nop +/* 3B73D0 E00B6270 00000000 */ nop /* 3B73D4 E00B6274 46201080 */ add.d $f2, $f2, $f0 /* 3B73D8 E00B6278 462010A0 */ cvt.s.d $f2, $f2 /* 3B73DC E00B627C E462005C */ swc1 $f2, 0x5c($v1) diff --git a/asm/nonmatchings/code_3B7160/func_E00B62D8.s b/asm/nonmatchings/code_3B7160/func_E00B62D8.s index 407fa50018..a48f48630c 100644 --- a/asm/nonmatchings/code_3B7160/func_E00B62D8.s +++ b/asm/nonmatchings/code_3B7160/func_E00B62D8.s @@ -3,4 +3,4 @@ glabel func_E00B62D8 /* 3B7438 E00B62D8 03E00008 */ jr $ra -/* 3B743C E00B62DC 00000000 */ nop +/* 3B743C E00B62DC 00000000 */ nop diff --git a/asm/nonmatchings/code_3B7160/func_E00B62E0.s b/asm/nonmatchings/code_3B7160/func_E00B62E0.s index 71590a5225..423152a353 100644 --- a/asm/nonmatchings/code_3B7160/func_E00B62E0.s +++ b/asm/nonmatchings/code_3B7160/func_E00B62E0.s @@ -42,7 +42,7 @@ glabel func_E00B62E0 /* 3B74D4 E00B6374 3C038000 */ lui $v1, 0x8000 /* 3B74D8 E00B6378 4600A521 */ cvt.d.s $f20, $f20 /* 3B74DC E00B637C 4620A502 */ mul.d $f20, $f20, $f0 -/* 3B74E0 E00B6380 00000000 */ nop +/* 3B74E0 E00B6380 00000000 */ nop /* 3B74E4 E00B6384 00431021 */ addu $v0, $v0, $v1 /* 3B74E8 E00B6388 3C03800B */ lui $v1, %hi(gCameras) /* 3B74EC E00B638C 24631D80 */ addiu $v1, $v1, %lo(gCameras) @@ -162,7 +162,7 @@ glabel func_E00B62E0 /* 3B76B0 E00B6550 A0EB0000 */ sb $t3, ($a3) /* 3B76B4 E00B6554 4600018D */ trunc.w.s $f6, $f0 /* 3B76B8 E00B6558 44023000 */ mfc1 $v0, $f6 -/* 3B76BC E00B655C 00000000 */ nop +/* 3B76BC E00B655C 00000000 */ nop /* 3B76C0 E00B6560 00021140 */ sll $v0, $v0, 5 /* 3B76C4 E00B6564 A4E2FFFB */ sh $v0, -5($a3) /* 3B76C8 E00B6568 24E70010 */ addiu $a3, $a3, 0x10 @@ -177,14 +177,14 @@ glabel func_E00B62E0 /* 3B76EC E00B658C A4E0FFF5 */ sh $zero, -0xb($a3) /* 3B76F0 E00B6590 A4E3FFF9 */ sh $v1, -7($a3) /* 3B76F4 E00B6594 46020002 */ mul.s $f0, $f0, $f2 -/* 3B76F8 E00B6598 00000000 */ nop +/* 3B76F8 E00B6598 00000000 */ nop /* 3B76FC E00B659C A4EEFFFB */ sh $t6, -5($a3) /* 3B7700 E00B65A0 A0ECFFFD */ sb $t4, -3($a3) /* 3B7704 E00B65A4 A0ECFFFE */ sb $t4, -2($a3) /* 3B7708 E00B65A8 A0ECFFFF */ sb $t4, -1($a3) /* 3B770C E00B65AC 4600018D */ trunc.w.s $f6, $f0 /* 3B7710 E00B65B0 44023000 */ mfc1 $v0, $f6 -/* 3B7714 E00B65B4 00000000 */ nop +/* 3B7714 E00B65B4 00000000 */ nop /* 3B7718 E00B65B8 A4E2FFF3 */ sh $v0, -0xd($a3) /* 3B771C E00B65BC 2922000C */ slti $v0, $t1, 0xc /* 3B7720 E00B65C0 1440FFD7 */ bnez $v0, .LE00B6520 @@ -247,7 +247,7 @@ glabel func_E00B62E0 /* 3B77F4 E00B6694 AC820000 */ sw $v0, ($a0) .LE00B6698: /* 3B77F8 E00B6698 14A00003 */ bnez $a1, .LE00B66A8 -/* 3B77FC E00B669C 00000000 */ nop +/* 3B77FC E00B669C 00000000 */ nop /* 3B7800 E00B66A0 0802D9B5 */ j .LE00B66D4 /* 3B7804 E00B66A4 AC8F0004 */ sw $t7, 4($a0) .LE00B66A8: @@ -294,5 +294,5 @@ glabel func_E00B62E0 /* 3B789C E00B673C D7B400B8 */ ldc1 $f20, 0xb8($sp) /* 3B78A0 E00B6740 03E00008 */ jr $ra /* 3B78A4 E00B6744 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 3B78A8 E00B6748 00000000 */ nop -/* 3B78AC E00B674C 00000000 */ nop +/* 3B78A8 E00B6748 00000000 */ nop +/* 3B78AC E00B674C 00000000 */ nop diff --git a/asm/nonmatchings/code_3B7B80/func_E00B8000.s b/asm/nonmatchings/code_3B7B80/func_E00B8000.s index 7f6671ffa8..4e737be74e 100644 --- a/asm/nonmatchings/code_3B7B80/func_E00B8000.s +++ b/asm/nonmatchings/code_3B7B80/func_E00B8000.s @@ -40,7 +40,7 @@ glabel func_E00B8000 /* 3B7C0C E00B808C AE02000C */ sw $v0, 0xc($s0) .LE00B8090: /* 3B7C10 E00B8090 0802E024 */ j .LE00B8090 -/* 3B7C14 E00B8094 00000000 */ nop +/* 3B7C14 E00B8094 00000000 */ nop .LE00B8098: /* 3B7C18 E00B8098 ACB20000 */ sw $s2, ($a1) /* 3B7C1C E00B809C 1E200004 */ bgtz $s1, .LE00B80B0 diff --git a/asm/nonmatchings/code_3B7B80/func_E00B812C.s b/asm/nonmatchings/code_3B7B80/func_E00B812C.s index e6256fdfd8..a2a0db90f9 100644 --- a/asm/nonmatchings/code_3B7B80/func_E00B812C.s +++ b/asm/nonmatchings/code_3B7B80/func_E00B812C.s @@ -3,4 +3,4 @@ glabel func_E00B812C /* 3B7CAC E00B812C 03E00008 */ jr $ra -/* 3B7CB0 E00B8130 00000000 */ nop +/* 3B7CB0 E00B8130 00000000 */ nop diff --git a/asm/nonmatchings/code_3B7B80/func_E00B8134.s b/asm/nonmatchings/code_3B7B80/func_E00B8134.s index 405d856f6b..6be11b7228 100644 --- a/asm/nonmatchings/code_3B7B80/func_E00B8134.s +++ b/asm/nonmatchings/code_3B7B80/func_E00B8134.s @@ -26,9 +26,9 @@ glabel func_E00B8134 /* 3B7D00 E00B8180 04610005 */ bgez $v1, .LE00B8198 /* 3B7D04 E00B8184 ACC50014 */ sw $a1, 0x14($a2) /* 3B7D08 E00B8188 0C080128 */ jal func_E02004A0 -/* 3B7D0C E00B818C 00000000 */ nop +/* 3B7D0C E00B818C 00000000 */ nop /* 3B7D10 E00B8190 0802E06B */ j .LE00B81AC -/* 3B7D14 E00B8194 00000000 */ nop +/* 3B7D14 E00B8194 00000000 */ nop .LE00B8198: /* 3B7D18 E00B8198 28A20008 */ slti $v0, $a1, 8 /* 3B7D1C E00B819C 10400003 */ beqz $v0, .LE00B81AC diff --git a/asm/nonmatchings/code_3B7B80/func_E00B8200.s b/asm/nonmatchings/code_3B7B80/func_E00B8200.s index fabfaec9b1..4ce73d7ff1 100644 --- a/asm/nonmatchings/code_3B7B80/func_E00B8200.s +++ b/asm/nonmatchings/code_3B7B80/func_E00B8200.s @@ -3,4 +3,4 @@ glabel func_E00B8200 /* 3B7D80 E00B8200 03E00008 */ jr $ra -/* 3B7D84 E00B8204 00000000 */ nop +/* 3B7D84 E00B8204 00000000 */ nop diff --git a/asm/nonmatchings/code_3B7B80/func_E00B8208.s b/asm/nonmatchings/code_3B7B80/func_E00B8208.s index 0fd8a66f2a..ed95b82e31 100644 --- a/asm/nonmatchings/code_3B7B80/func_E00B8208.s +++ b/asm/nonmatchings/code_3B7B80/func_E00B8208.s @@ -256,7 +256,7 @@ glabel func_E00B8208 /* 3B815C E00B85DC 16C10004 */ bne $s6, $at, .LE00B85F0 /* 3B8160 E00B85E0 3C018000 */ lui $at, 0x8000 /* 3B8164 E00B85E4 15410002 */ bne $t2, $at, .LE00B85F0 -/* 3B8168 E00B85E8 00000000 */ nop +/* 3B8168 E00B85E8 00000000 */ nop /* 3B816C E00B85EC 0006000D */ break 6 .LE00B85F0: /* 3B8170 E00B85F0 00001810 */ mfhi $v1 @@ -282,12 +282,12 @@ glabel func_E00B8208 /* 3B81C0 E00B8640 44811000 */ mtc1 $at, $f2 /* 3B81C4 E00B8644 4407A000 */ mfc1 $a3, $f20 /* 3B81C8 E00B8648 44820000 */ mtc1 $v0, $f0 -/* 3B81CC E00B864C 00000000 */ nop +/* 3B81CC E00B864C 00000000 */ nop /* 3B81D0 E00B8650 46800020 */ cvt.s.w $f0, $f0 /* 3B81D4 E00B8654 82220000 */ lb $v0, ($s1) /* 3B81D8 E00B8658 46020000 */ add.s $f0, $f0, $f2 /* 3B81DC E00B865C 44822000 */ mtc1 $v0, $f4 -/* 3B81E0 E00B8660 00000000 */ nop +/* 3B81E0 E00B8660 00000000 */ nop /* 3B81E4 E00B8664 46802120 */ cvt.s.w $f4, $f4 /* 3B81E8 E00B8668 44052000 */ mfc1 $a1, $f4 /* 3B81EC E00B866C 44060000 */ mfc1 $a2, $f0 @@ -297,18 +297,18 @@ glabel func_E00B8208 /* 3B81FC E00B867C 020A8021 */ addu $s0, $s0, $t2 /* 3B8200 E00B8680 86020002 */ lh $v0, 2($s0) /* 3B8204 E00B8684 44821000 */ mtc1 $v0, $f2 -/* 3B8208 E00B8688 00000000 */ nop +/* 3B8208 E00B8688 00000000 */ nop /* 3B820C E00B868C 468010A0 */ cvt.s.w $f2, $f2 /* 3B8210 E00B8690 460010A1 */ cvt.d.s $f2, $f2 /* 3B8214 E00B8694 46361082 */ mul.d $f2, $f2, $f22 -/* 3B8218 E00B8698 00000000 */ nop +/* 3B8218 E00B8698 00000000 */ nop /* 3B821C E00B869C 86020004 */ lh $v0, 4($s0) /* 3B8220 E00B86A0 44820000 */ mtc1 $v0, $f0 -/* 3B8224 E00B86A4 00000000 */ nop +/* 3B8224 E00B86A4 00000000 */ nop /* 3B8228 E00B86A8 46800020 */ cvt.s.w $f0, $f0 /* 3B822C E00B86AC 46000021 */ cvt.d.s $f0, $f0 /* 3B8230 E00B86B0 46360002 */ mul.d $f0, $f0, $f22 -/* 3B8234 E00B86B4 00000000 */ nop +/* 3B8234 E00B86B4 00000000 */ nop /* 3B8238 E00B86B8 4407C000 */ mfc1 $a3, $f24 /* 3B823C E00B86BC 462010A0 */ cvt.s.d $f2, $f2 /* 3B8240 E00B86C0 44051000 */ mfc1 $a1, $f2 @@ -324,7 +324,7 @@ glabel func_E00B8208 /* 3B8268 E00B86E8 3C0AE00C */ lui $t2, %hi(D_E00B8CA4) /* 3B826C E00B86EC 254A8CA4 */ addiu $t2, $t2, %lo(D_E00B8CA4) /* 3B8270 E00B86F0 44821000 */ mtc1 $v0, $f2 -/* 3B8274 E00B86F4 00000000 */ nop +/* 3B8274 E00B86F4 00000000 */ nop /* 3B8278 E00B86F8 468010A0 */ cvt.s.w $f2, $f2 /* 3B827C E00B86FC 02571021 */ addu $v0, $s2, $s7 /* 3B8280 E00B8700 30420007 */ andi $v0, $v0, 7 diff --git a/asm/nonmatchings/code_3BBF60/func_E00BE000.s b/asm/nonmatchings/code_3BBF60/func_E00BE000.s index e03702a8af..6bc85dcc6f 100644 --- a/asm/nonmatchings/code_3BBF60/func_E00BE000.s +++ b/asm/nonmatchings/code_3BBF60/func_E00BE000.s @@ -55,7 +55,7 @@ glabel func_E00BE000 /* 3BC020 E00BE0C0 AE64000C */ sw $a0, 0xc($s3) .LE00BE0C4: /* 3BC024 E00BE0C4 0802F831 */ j .LE00BE0C4 -/* 3BC028 E00BE0C8 00000000 */ nop +/* 3BC028 E00BE0C8 00000000 */ nop .LE00BE0CC: /* 3BC02C E00BE0CC AC920000 */ sw $s2, ($a0) /* 3BC030 E00BE0D0 1E200004 */ bgtz $s1, .LE00BE0E4 @@ -102,36 +102,36 @@ glabel func_E00BE000 /* 3BC0C8 E00BE168 E6000004 */ swc1 $f0, 4($s0) /* 3BC0CC E00BE16C 2A420002 */ slti $v0, $s2, 2 /* 3BC0D0 E00BE170 10400005 */ beqz $v0, .LE00BE188 -/* 3BC0D4 E00BE174 00000000 */ nop +/* 3BC0D4 E00BE174 00000000 */ nop /* 3BC0D8 E00BE178 12400007 */ beqz $s2, .LE00BE198 -/* 3BC0DC E00BE17C 00000000 */ nop +/* 3BC0DC E00BE17C 00000000 */ nop /* 3BC0E0 E00BE180 0802F8B1 */ j .LE00BE2C4 -/* 3BC0E4 E00BE184 00000000 */ nop +/* 3BC0E4 E00BE184 00000000 */ nop .LE00BE188: /* 3BC0E8 E00BE188 1254002F */ beq $s2, $s4, .LE00BE248 -/* 3BC0EC E00BE18C 00000000 */ nop +/* 3BC0EC E00BE18C 00000000 */ nop /* 3BC0F0 E00BE190 0802F8B1 */ j .LE00BE2C4 -/* 3BC0F4 E00BE194 00000000 */ nop +/* 3BC0F4 E00BE194 00000000 */ nop .LE00BE198: /* 3BC0F8 E00BE198 0C080138 */ jal func_E02004E0 /* 3BC0FC E00BE19C 2404000A */ addiu $a0, $zero, 0xa /* 3BC100 E00BE1A0 2404000A */ addiu $a0, $zero, 0xa /* 3BC104 E00BE1A4 2442FFFE */ addiu $v0, $v0, -2 /* 3BC108 E00BE1A8 44820000 */ mtc1 $v0, $f0 -/* 3BC10C E00BE1AC 00000000 */ nop +/* 3BC10C E00BE1AC 00000000 */ nop /* 3BC110 E00BE1B0 46800020 */ cvt.s.w $f0, $f0 /* 3BC114 E00BE1B4 0C080138 */ jal func_E02004E0 /* 3BC118 E00BE1B8 E600FFE0 */ swc1 $f0, -0x20($s0) /* 3BC11C E00BE1BC 2404000A */ addiu $a0, $zero, 0xa /* 3BC120 E00BE1C0 2442FFFB */ addiu $v0, $v0, -5 /* 3BC124 E00BE1C4 44820000 */ mtc1 $v0, $f0 -/* 3BC128 E00BE1C8 00000000 */ nop +/* 3BC128 E00BE1C8 00000000 */ nop /* 3BC12C E00BE1CC 46800020 */ cvt.s.w $f0, $f0 /* 3BC130 E00BE1D0 0C080138 */ jal func_E02004E0 /* 3BC134 E00BE1D4 E600FFE4 */ swc1 $f0, -0x1c($s0) /* 3BC138 E00BE1D8 2442FFFB */ addiu $v0, $v0, -5 /* 3BC13C E00BE1DC 44820000 */ mtc1 $v0, $f0 -/* 3BC140 E00BE1E0 00000000 */ nop +/* 3BC140 E00BE1E0 00000000 */ nop /* 3BC144 E00BE1E4 46800020 */ cvt.s.w $f0, $f0 /* 3BC148 E00BE1E8 0802F8D4 */ j .LE00BE350 /* 3BC14C E00BE1EC E600FFE8 */ swc1 $f0, -0x18($s0) @@ -141,20 +141,20 @@ glabel func_E00BE000 /* 3BC158 E00BE1F8 2404000A */ addiu $a0, $zero, 0xa /* 3BC15C E00BE1FC 02821023 */ subu $v0, $s4, $v0 /* 3BC160 E00BE200 44820000 */ mtc1 $v0, $f0 -/* 3BC164 E00BE204 00000000 */ nop +/* 3BC164 E00BE204 00000000 */ nop /* 3BC168 E00BE208 46800020 */ cvt.s.w $f0, $f0 /* 3BC16C E00BE20C 0C080138 */ jal func_E02004E0 /* 3BC170 E00BE210 E600FFE0 */ swc1 $f0, -0x20($s0) /* 3BC174 E00BE214 2404000A */ addiu $a0, $zero, 0xa /* 3BC178 E00BE218 2442FFFB */ addiu $v0, $v0, -5 /* 3BC17C E00BE21C 44820000 */ mtc1 $v0, $f0 -/* 3BC180 E00BE220 00000000 */ nop +/* 3BC180 E00BE220 00000000 */ nop /* 3BC184 E00BE224 46800020 */ cvt.s.w $f0, $f0 /* 3BC188 E00BE228 0C080138 */ jal func_E02004E0 /* 3BC18C E00BE22C E600FFE4 */ swc1 $f0, -0x1c($s0) /* 3BC190 E00BE230 2442FFFB */ addiu $v0, $v0, -5 /* 3BC194 E00BE234 44820000 */ mtc1 $v0, $f0 -/* 3BC198 E00BE238 00000000 */ nop +/* 3BC198 E00BE238 00000000 */ nop /* 3BC19C E00BE23C 46800020 */ cvt.s.w $f0, $f0 /* 3BC1A0 E00BE240 0802F8D4 */ j .LE00BE350 /* 3BC1A4 E00BE244 E600FFE8 */ swc1 $f0, -0x18($s0) @@ -163,10 +163,10 @@ glabel func_E00BE000 /* 3BC1AC E00BE24C 24040064 */ addiu $a0, $zero, 0x64 /* 3BC1B0 E00BE250 2442FFCE */ addiu $v0, $v0, -0x32 /* 3BC1B4 E00BE254 44820000 */ mtc1 $v0, $f0 -/* 3BC1B8 E00BE258 00000000 */ nop +/* 3BC1B8 E00BE258 00000000 */ nop /* 3BC1BC E00BE25C 46800020 */ cvt.s.w $f0, $f0 /* 3BC1C0 E00BE260 46160002 */ mul.s $f0, $f0, $f22 -/* 3BC1C4 E00BE264 00000000 */ nop +/* 3BC1C4 E00BE264 00000000 */ nop /* 3BC1C8 E00BE268 24040064 */ addiu $a0, $zero, 0x64 /* 3BC1CC E00BE26C 0C080138 */ jal func_E02004E0 /* 3BC1D0 E00BE270 E600FFE0 */ swc1 $f0, -0x20($s0) @@ -175,19 +175,19 @@ glabel func_E00BE000 /* 3BC1DC E00BE27C 3421CCCD */ ori $at, $at, 0xcccd /* 3BC1E0 E00BE280 44811000 */ mtc1 $at, $f2 /* 3BC1E4 E00BE284 44820000 */ mtc1 $v0, $f0 -/* 3BC1E8 E00BE288 00000000 */ nop +/* 3BC1E8 E00BE288 00000000 */ nop /* 3BC1EC E00BE28C 46800020 */ cvt.s.w $f0, $f0 /* 3BC1F0 E00BE290 46020002 */ mul.s $f0, $f0, $f2 -/* 3BC1F4 E00BE294 00000000 */ nop +/* 3BC1F4 E00BE294 00000000 */ nop /* 3BC1F8 E00BE298 24040064 */ addiu $a0, $zero, 0x64 /* 3BC1FC E00BE29C 0C080138 */ jal func_E02004E0 /* 3BC200 E00BE2A0 E600FFE4 */ swc1 $f0, -0x1c($s0) /* 3BC204 E00BE2A4 2442FFCE */ addiu $v0, $v0, -0x32 /* 3BC208 E00BE2A8 44820000 */ mtc1 $v0, $f0 -/* 3BC20C E00BE2AC 00000000 */ nop +/* 3BC20C E00BE2AC 00000000 */ nop /* 3BC210 E00BE2B0 46800020 */ cvt.s.w $f0, $f0 /* 3BC214 E00BE2B4 46160002 */ mul.s $f0, $f0, $f22 -/* 3BC218 E00BE2B8 00000000 */ nop +/* 3BC218 E00BE2B8 00000000 */ nop /* 3BC21C E00BE2BC 0802F8D4 */ j .LE00BE350 /* 3BC220 E00BE2C0 E600FFE8 */ swc1 $f0, -0x18($s0) .LE00BE2C4: @@ -195,30 +195,30 @@ glabel func_E00BE000 /* 3BC228 E00BE2C8 2404000A */ addiu $a0, $zero, 0xa /* 3BC22C E00BE2CC 2442FFFB */ addiu $v0, $v0, -5 /* 3BC230 E00BE2D0 44820000 */ mtc1 $v0, $f0 -/* 3BC234 E00BE2D4 00000000 */ nop +/* 3BC234 E00BE2D4 00000000 */ nop /* 3BC238 E00BE2D8 46800021 */ cvt.d.w $f0, $f0 /* 3BC23C E00BE2DC 46340002 */ mul.d $f0, $f0, $f20 -/* 3BC240 E00BE2E0 00000000 */ nop +/* 3BC240 E00BE2E0 00000000 */ nop /* 3BC244 E00BE2E4 2404000A */ addiu $a0, $zero, 0xa /* 3BC248 E00BE2E8 46200020 */ cvt.s.d $f0, $f0 /* 3BC24C E00BE2EC 0C080138 */ jal func_E02004E0 /* 3BC250 E00BE2F0 E600FFE0 */ swc1 $f0, -0x20($s0) /* 3BC254 E00BE2F4 2442FFFB */ addiu $v0, $v0, -5 /* 3BC258 E00BE2F8 44820000 */ mtc1 $v0, $f0 -/* 3BC25C E00BE2FC 00000000 */ nop +/* 3BC25C E00BE2FC 00000000 */ nop /* 3BC260 E00BE300 46800021 */ cvt.d.w $f0, $f0 /* 3BC264 E00BE304 46340002 */ mul.d $f0, $f0, $f20 -/* 3BC268 E00BE308 00000000 */ nop +/* 3BC268 E00BE308 00000000 */ nop /* 3BC26C E00BE30C 2404000A */ addiu $a0, $zero, 0xa /* 3BC270 E00BE310 46200020 */ cvt.s.d $f0, $f0 /* 3BC274 E00BE314 0C080138 */ jal func_E02004E0 /* 3BC278 E00BE318 E600FFE4 */ swc1 $f0, -0x1c($s0) /* 3BC27C E00BE31C 2442FFFB */ addiu $v0, $v0, -5 /* 3BC280 E00BE320 44820000 */ mtc1 $v0, $f0 -/* 3BC284 E00BE324 00000000 */ nop +/* 3BC284 E00BE324 00000000 */ nop /* 3BC288 E00BE328 46800021 */ cvt.d.w $f0, $f0 /* 3BC28C E00BE32C 46340002 */ mul.d $f0, $f0, $f20 -/* 3BC290 E00BE330 00000000 */ nop +/* 3BC290 E00BE330 00000000 */ nop /* 3BC294 E00BE334 3C013ECC */ lui $at, 0x3ecc /* 3BC298 E00BE338 3421CCCD */ ori $at, $at, 0xcccd /* 3BC29C E00BE33C 44811000 */ mtc1 $at, $f2 diff --git a/asm/nonmatchings/code_3BBF60/func_E00BE39C.s b/asm/nonmatchings/code_3BBF60/func_E00BE39C.s index e9476f3007..c7fe383b42 100644 --- a/asm/nonmatchings/code_3BBF60/func_E00BE39C.s +++ b/asm/nonmatchings/code_3BBF60/func_E00BE39C.s @@ -3,4 +3,4 @@ glabel func_E00BE39C /* 3BC2FC E00BE39C 03E00008 */ jr $ra -/* 3BC300 E00BE3A0 00000000 */ nop +/* 3BC300 E00BE3A0 00000000 */ nop diff --git a/asm/nonmatchings/code_3BBF60/func_E00BE3A4.s b/asm/nonmatchings/code_3BBF60/func_E00BE3A4.s index ee2b35608b..8f62a5e14a 100644 --- a/asm/nonmatchings/code_3BBF60/func_E00BE3A4.s +++ b/asm/nonmatchings/code_3BBF60/func_E00BE3A4.s @@ -28,9 +28,9 @@ glabel func_E00BE3A4 /* 3BC358 E00BE3F8 04A10005 */ bgez $a1, .LE00BE410 /* 3BC35C E00BE3FC AC620020 */ sw $v0, 0x20($v1) /* 3BC360 E00BE400 0C080128 */ jal func_E02004A0 -/* 3BC364 E00BE404 00000000 */ nop +/* 3BC364 E00BE404 00000000 */ nop /* 3BC368 E00BE408 0802F95A */ j .LE00BE568 -/* 3BC36C E00BE40C 00000000 */ nop +/* 3BC36C E00BE40C 00000000 */ nop .LE00BE410: /* 3BC370 E00BE410 28A20004 */ slti $v0, $a1, 4 /* 3BC374 E00BE414 10400002 */ beqz $v0, .LE00BE420 @@ -59,7 +59,7 @@ glabel func_E00BE3A4 /* 3BC3C8 E00BE468 C464FFFC */ lwc1 $f4, -4($v1) /* 3BC3CC E00BE46C 46802121 */ cvt.d.w $f4, $f4 /* 3BC3D0 E00BE470 462A2102 */ mul.d $f4, $f4, $f10 -/* 3BC3D4 E00BE474 00000000 */ nop +/* 3BC3D4 E00BE474 00000000 */ nop /* 3BC3D8 E00BE478 C468FFD0 */ lwc1 $f8, -0x30($v1) /* 3BC3DC E00BE47C C460FFDC */ lwc1 $f0, -0x24($v1) /* 3BC3E0 E00BE480 C466FFD4 */ lwc1 $f6, -0x2c($v1) @@ -84,11 +84,11 @@ glabel func_E00BE3A4 /* 3BC428 E00BE4C8 C464FFDC */ lwc1 $f4, -0x24($v1) /* 3BC42C E00BE4CC 46002121 */ cvt.d.s $f4, $f4 /* 3BC430 E00BE4D0 462A2102 */ mul.d $f4, $f4, $f10 -/* 3BC434 E00BE4D4 00000000 */ nop +/* 3BC434 E00BE4D4 00000000 */ nop /* 3BC438 E00BE4D8 C462FFE4 */ lwc1 $f2, -0x1c($v1) /* 3BC43C E00BE4DC 460010A1 */ cvt.d.s $f2, $f2 /* 3BC440 E00BE4E0 462A1082 */ mul.d $f2, $f2, $f10 -/* 3BC444 E00BE4E4 00000000 */ nop +/* 3BC444 E00BE4E4 00000000 */ nop /* 3BC448 E00BE4E8 C460FFE0 */ lwc1 $f0, -0x20($v1) /* 3BC44C E00BE4EC 46000021 */ cvt.d.s $f0, $f0 /* 3BC450 E00BE4F0 46300000 */ add.d $f0, $f0, $f16 @@ -96,7 +96,7 @@ glabel func_E00BE3A4 /* 3BC458 E00BE4F8 E460FFE0 */ swc1 $f0, -0x20($v1) /* 3BC45C E00BE4FC 46000021 */ cvt.d.s $f0, $f0 /* 3BC460 E00BE500 462A0002 */ mul.d $f0, $f0, $f10 -/* 3BC464 E00BE504 00000000 */ nop +/* 3BC464 E00BE504 00000000 */ nop /* 3BC468 E00BE508 46202120 */ cvt.s.d $f4, $f4 /* 3BC46C E00BE50C 462010A0 */ cvt.s.d $f2, $f2 /* 3BC470 E00BE510 E464FFDC */ swc1 $f4, -0x24($v1) @@ -107,14 +107,14 @@ glabel func_E00BE3A4 /* 3BC484 E00BE524 C4600000 */ lwc1 $f0, ($v1) /* 3BC488 E00BE528 46000021 */ cvt.d.s $f0, $f0 /* 3BC48C E00BE52C 462E0002 */ mul.d $f0, $f0, $f14 -/* 3BC490 E00BE530 00000000 */ nop +/* 3BC490 E00BE530 00000000 */ nop /* 3BC494 E00BE534 0802F954 */ j .LE00BE550 /* 3BC498 E00BE538 46200020 */ cvt.s.d $f0, $f0 .LE00BE53C: /* 3BC49C E00BE53C C4600000 */ lwc1 $f0, ($v1) /* 3BC4A0 E00BE540 46000021 */ cvt.d.s $f0, $f0 /* 3BC4A4 E00BE544 462C0002 */ mul.d $f0, $f0, $f12 -/* 3BC4A8 E00BE548 00000000 */ nop +/* 3BC4A8 E00BE548 00000000 */ nop /* 3BC4AC E00BE54C 46200020 */ cvt.s.d $f0, $f0 .LE00BE550: /* 3BC4B0 E00BE550 E4600000 */ swc1 $f0, ($v1) diff --git a/asm/nonmatchings/code_3BBF60/func_E00BE5B4.s b/asm/nonmatchings/code_3BBF60/func_E00BE5B4.s index 0ad97b7956..c13b0fbd6b 100644 --- a/asm/nonmatchings/code_3BBF60/func_E00BE5B4.s +++ b/asm/nonmatchings/code_3BBF60/func_E00BE5B4.s @@ -3,4 +3,4 @@ glabel func_E00BE5B4 /* 3BC514 E00BE5B4 03E00008 */ jr $ra -/* 3BC518 E00BE5B8 00000000 */ nop +/* 3BC518 E00BE5B8 00000000 */ nop diff --git a/asm/nonmatchings/code_3BBF60/func_E00BE5BC.s b/asm/nonmatchings/code_3BBF60/func_E00BE5BC.s index 074f98ef10..d96bd5e56a 100644 --- a/asm/nonmatchings/code_3BBF60/func_E00BE5BC.s +++ b/asm/nonmatchings/code_3BBF60/func_E00BE5BC.s @@ -49,7 +49,7 @@ glabel func_E00BE5BC /* 3BC5CC E00BE66C 3C038000 */ lui $v1, 0x8000 /* 3BC5D0 E00BE670 8D820010 */ lw $v0, 0x10($t4) /* 3BC5D4 E00BE674 449E2000 */ mtc1 $fp, $f4 -/* 3BC5D8 E00BE678 00000000 */ nop +/* 3BC5D8 E00BE678 00000000 */ nop /* 3BC5DC E00BE67C 46802120 */ cvt.s.w $f4, $f4 /* 3BC5E0 E00BE680 8C42001C */ lw $v0, 0x1c($v0) /* 3BC5E4 E00BE684 44062000 */ mfc1 $a2, $f4 @@ -340,4 +340,4 @@ glabel func_E00BE5BC /* 3BCA40 E00BEAE0 8FB00098 */ lw $s0, 0x98($sp) /* 3BCA44 E00BEAE4 03E00008 */ jr $ra /* 3BCA48 E00BEAE8 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 3BCA4C E00BEAEC 00000000 */ nop +/* 3BCA4C E00BEAEC 00000000 */ nop diff --git a/asm/nonmatchings/code_3BCD60/func_E00C0000.s b/asm/nonmatchings/code_3BCD60/func_E00C0000.s index 5cb3b24932..8e3269a075 100644 --- a/asm/nonmatchings/code_3BCD60/func_E00C0000.s +++ b/asm/nonmatchings/code_3BCD60/func_E00C0000.s @@ -40,7 +40,7 @@ glabel func_E00C0000 /* 3BCDEC E00C008C AE02000C */ sw $v0, 0xc($s0) .LE00C0090: /* 3BCDF0 E00C0090 08030024 */ j .LE00C0090 -/* 3BCDF4 E00C0094 00000000 */ nop +/* 3BCDF4 E00C0094 00000000 */ nop .LE00C0098: /* 3BCDF8 E00C0098 AC920000 */ sw $s2, ($a0) /* 3BCDFC E00C009C 1E200004 */ bgtz $s1, .LE00C00B0 diff --git a/asm/nonmatchings/code_3BCD60/func_E00C0158.s b/asm/nonmatchings/code_3BCD60/func_E00C0158.s index 8b1cd8cd65..8bc000f883 100644 --- a/asm/nonmatchings/code_3BCD60/func_E00C0158.s +++ b/asm/nonmatchings/code_3BCD60/func_E00C0158.s @@ -3,4 +3,4 @@ glabel func_E00C0158 /* 3BCEB8 E00C0158 03E00008 */ jr $ra -/* 3BCEBC E00C015C 00000000 */ nop +/* 3BCEBC E00C015C 00000000 */ nop diff --git a/asm/nonmatchings/code_3BCD60/func_E00C0160.s b/asm/nonmatchings/code_3BCD60/func_E00C0160.s index 739a3c4076..a7d70f5e8a 100644 --- a/asm/nonmatchings/code_3BCD60/func_E00C0160.s +++ b/asm/nonmatchings/code_3BCD60/func_E00C0160.s @@ -28,9 +28,9 @@ glabel func_E00C0160 /* 3BCF14 E00C01B4 04A10005 */ bgez $a1, .LE00C01CC /* 3BCF18 E00C01B8 AE020014 */ sw $v0, 0x14($s0) /* 3BCF1C E00C01BC 0C080128 */ jal func_E02004A0 -/* 3BCF20 E00C01C0 00000000 */ nop +/* 3BCF20 E00C01C0 00000000 */ nop /* 3BCF24 E00C01C4 080301BF */ j .LE00C06FC -/* 3BCF28 E00C01C8 00000000 */ nop +/* 3BCF28 E00C01C8 00000000 */ nop .LE00C01CC: /* 3BCF2C E00C01CC 0040302D */ daddu $a2, $v0, $zero /* 3BCF30 E00C01D0 28A20010 */ slti $v0, $a1, 0x10 @@ -46,21 +46,21 @@ glabel func_E00C0160 .LE00C01F4: /* 3BCF54 E00C01F4 C604003C */ lwc1 $f4, 0x3c($s0) /* 3BCF58 E00C01F8 44800000 */ mtc1 $zero, $f0 -/* 3BCF5C E00C01FC 00000000 */ nop +/* 3BCF5C E00C01FC 00000000 */ nop /* 3BCF60 E00C0200 46002032 */ c.eq.s $f4, $f0 -/* 3BCF64 E00C0204 00000000 */ nop +/* 3BCF64 E00C0204 00000000 */ nop /* 3BCF68 E00C0208 45010010 */ bc1t .LE00C024C -/* 3BCF6C E00C020C 00000000 */ nop +/* 3BCF6C E00C020C 00000000 */ nop /* 3BCF70 E00C0210 C6020040 */ lwc1 $f2, 0x40($s0) /* 3BCF74 E00C0214 4600103C */ c.lt.s $f2, $f0 -/* 3BCF78 E00C0218 00000000 */ nop +/* 3BCF78 E00C0218 00000000 */ nop /* 3BCF7C E00C021C 45030001 */ bc1tl .LE00C0224 /* 3BCF80 E00C0220 46001087 */ neg.s $f2, $f2 .LE00C0224: /* 3BCF84 E00C0224 4600203C */ c.lt.s $f4, $f0 -/* 3BCF88 E00C0228 00000000 */ nop +/* 3BCF88 E00C0228 00000000 */ nop /* 3BCF8C E00C022C 45000004 */ bc1f .LE00C0240 -/* 3BCF90 E00C0230 00000000 */ nop +/* 3BCF90 E00C0230 00000000 */ nop /* 3BCF94 E00C0234 C600002C */ lwc1 $f0, 0x2c($s0) /* 3BCF98 E00C0238 08030092 */ j .LE00C0248 /* 3BCF9C E00C023C 46020001 */ sub.s $f0, $f0, $f2 @@ -95,11 +95,11 @@ glabel func_E00C0160 /* 3BCFFC E00C029C 3C01E00C */ lui $at, %hi(D_E00C0C00) /* 3BD000 E00C02A0 D4220C00 */ ldc1 $f2, %lo(D_E00C0C00)($at) /* 3BD004 E00C02A4 44820000 */ mtc1 $v0, $f0 -/* 3BD008 E00C02A8 00000000 */ nop +/* 3BD008 E00C02A8 00000000 */ nop /* 3BD00C E00C02AC 46800020 */ cvt.s.w $f0, $f0 /* 3BD010 E00C02B0 46000021 */ cvt.d.s $f0, $f0 /* 3BD014 E00C02B4 46220002 */ mul.d $f0, $f0, $f2 -/* 3BD018 E00C02B8 00000000 */ nop +/* 3BD018 E00C02B8 00000000 */ nop /* 3BD01C E00C02BC 46200020 */ cvt.s.d $f0, $f0 /* 3BD020 E00C02C0 E600004C */ swc1 $f0, 0x4c($s0) /* 3BD024 E00C02C4 46000086 */ mov.s $f2, $f0 @@ -123,11 +123,11 @@ glabel func_E00C0160 /* 3BD068 E00C0308 3C01E00C */ lui $at, %hi(D_E00C0C08) /* 3BD06C E00C030C D4220C08 */ ldc1 $f2, %lo(D_E00C0C08)($at) /* 3BD070 E00C0310 44820000 */ mtc1 $v0, $f0 -/* 3BD074 E00C0314 00000000 */ nop +/* 3BD074 E00C0314 00000000 */ nop /* 3BD078 E00C0318 46800020 */ cvt.s.w $f0, $f0 /* 3BD07C E00C031C 46000021 */ cvt.d.s $f0, $f0 /* 3BD080 E00C0320 46220002 */ mul.d $f0, $f0, $f2 -/* 3BD084 E00C0324 00000000 */ nop +/* 3BD084 E00C0324 00000000 */ nop /* 3BD088 E00C0328 46200020 */ cvt.s.d $f0, $f0 /* 3BD08C E00C032C E600004C */ swc1 $f0, 0x4c($s0) /* 3BD090 E00C0330 46000086 */ mov.s $f2, $f0 @@ -154,11 +154,11 @@ glabel func_E00C0160 /* 3BD0DC E00C037C 3C01E00C */ lui $at, %hi(D_E00C0C10) /* 3BD0E0 E00C0380 D4220C10 */ ldc1 $f2, %lo(D_E00C0C10)($at) /* 3BD0E4 E00C0384 44820000 */ mtc1 $v0, $f0 -/* 3BD0E8 E00C0388 00000000 */ nop +/* 3BD0E8 E00C0388 00000000 */ nop /* 3BD0EC E00C038C 46800020 */ cvt.s.w $f0, $f0 /* 3BD0F0 E00C0390 46000021 */ cvt.d.s $f0, $f0 /* 3BD0F4 E00C0394 46220002 */ mul.d $f0, $f0, $f2 -/* 3BD0F8 E00C0398 00000000 */ nop +/* 3BD0F8 E00C0398 00000000 */ nop /* 3BD0FC E00C039C 46200020 */ cvt.s.d $f0, $f0 /* 3BD100 E00C03A0 E600004C */ swc1 $f0, 0x4c($s0) /* 3BD104 E00C03A4 46000086 */ mov.s $f2, $f0 @@ -176,7 +176,7 @@ glabel func_E00C0160 /* 3BD134 E00C03D4 AE020054 */ sw $v0, 0x54($s0) /* 3BD138 E00C03D8 2842004A */ slti $v0, $v0, 0x4a /* 3BD13C E00C03DC 44830000 */ mtc1 $v1, $f0 -/* 3BD140 E00C03E0 00000000 */ nop +/* 3BD140 E00C03E0 00000000 */ nop /* 3BD144 E00C03E4 46800020 */ cvt.s.w $f0, $f0 /* 3BD148 E00C03E8 14400002 */ bnez $v0, .LE00C03F4 /* 3BD14C E00C03EC E600002C */ swc1 $f0, 0x2c($s0) @@ -211,11 +211,11 @@ glabel func_E00C0160 /* 3BD1B4 E00C0454 3C01E00C */ lui $at, %hi(D_E00C0C18) /* 3BD1B8 E00C0458 D4220C18 */ ldc1 $f2, %lo(D_E00C0C18)($at) /* 3BD1BC E00C045C 44820000 */ mtc1 $v0, $f0 -/* 3BD1C0 E00C0460 00000000 */ nop +/* 3BD1C0 E00C0460 00000000 */ nop /* 3BD1C4 E00C0464 46800020 */ cvt.s.w $f0, $f0 /* 3BD1C8 E00C0468 46000021 */ cvt.d.s $f0, $f0 /* 3BD1CC E00C046C 46220002 */ mul.d $f0, $f0, $f2 -/* 3BD1D0 E00C0470 00000000 */ nop +/* 3BD1D0 E00C0470 00000000 */ nop /* 3BD1D4 E00C0474 C6060030 */ lwc1 $f6, 0x30($s0) /* 3BD1D8 E00C0478 C602003C */ lwc1 $f2, 0x3c($s0) /* 3BD1DC E00C047C C6040034 */ lwc1 $f4, 0x34($s0) @@ -246,17 +246,20 @@ glabel func_E00C0160 /* 3BD240 E00C04E0 2C620005 */ sltiu $v0, $v1, 5 /* 3BD244 E00C04E4 1040002F */ beqz $v0, .LE00C05A4 /* 3BD248 E00C04E8 00031080 */ sll $v0, $v1, 2 -/* 3BD24C E00C04EC 3C01E00C */ lui $at, %hi(D_E00C0C20) +/* 3BD24C E00C04EC 3C01E00C */ lui $at, %hi(jtbl_E00C0C20_3BD980) /* 3BD250 E00C04F0 00220821 */ addu $at, $at, $v0 -/* 3BD254 E00C04F4 8C220C20 */ lw $v0, %lo(D_E00C0C20)($at) +/* 3BD254 E00C04F4 8C220C20 */ lw $v0, %lo(jtbl_E00C0C20_3BD980)($at) /* 3BD258 E00C04F8 00400008 */ jr $v0 -/* 3BD25C E00C04FC 00000000 */ nop +/* 3BD25C E00C04FC 00000000 */ nop +glabel LE00C0500_3BD260 /* 3BD260 E00C0500 0803016E */ j .LE00C05B8 /* 3BD264 E00C0504 AE000058 */ sw $zero, 0x58($s0) +glabel LE00C0508_3BD268 /* 3BD268 E00C0508 3C014000 */ lui $at, 0x4000 /* 3BD26C E00C050C 44810000 */ mtc1 $at, $f0 /* 3BD270 E00C0510 08030154 */ j .LE00C0550 -/* 3BD274 E00C0514 00000000 */ nop +/* 3BD274 E00C0514 00000000 */ nop +glabel LE00C0518_3BD278 /* 3BD278 E00C0518 3C014000 */ lui $at, 0x4000 /* 3BD27C E00C051C 44810000 */ mtc1 $at, $f0 /* 3BD280 E00C0520 3C01C000 */ lui $at, 0xc000 @@ -269,6 +272,7 @@ glabel func_E00C0160 /* 3BD29C E00C053C E6020044 */ swc1 $f2, 0x44($s0) /* 3BD2A0 E00C0540 0803016E */ j .LE00C05B8 /* 3BD2A4 E00C0544 E6040040 */ swc1 $f4, 0x40($s0) +glabel LE00C0548_3BD2A8 /* 3BD2A8 E00C0548 3C01C000 */ lui $at, 0xc000 /* 3BD2AC E00C054C 44810000 */ mtc1 $at, $f0 .LE00C0550: @@ -280,6 +284,7 @@ glabel func_E00C0160 /* 3BD2C4 E00C0564 E6000044 */ swc1 $f0, 0x44($s0) /* 3BD2C8 E00C0568 0803016E */ j .LE00C05B8 /* 3BD2CC E00C056C E6020040 */ swc1 $f2, 0x40($s0) +glabel LE00C0570_3BD2D0 /* 3BD2D0 E00C0570 3C014120 */ lui $at, 0x4120 /* 3BD2D4 E00C0574 44810000 */ mtc1 $at, $f0 /* 3BD2D8 E00C0578 3C014160 */ lui $at, 0x4160 @@ -311,7 +316,7 @@ glabel func_E00C0160 /* 3BD330 E00C05D0 24020001 */ addiu $v0, $zero, 1 .LE00C05D4: /* 3BD334 E00C05D4 14620049 */ bne $v1, $v0, .LE00C06FC -/* 3BD338 E00C05D8 00000000 */ nop +/* 3BD338 E00C05D8 00000000 */ nop /* 3BD33C E00C05DC 0C080150 */ jal func_E0200540 /* 3BD340 E00C05E0 2404006F */ addiu $a0, $zero, 0x6f /* 3BD344 E00C05E4 0C080138 */ jal func_E02004E0 @@ -320,7 +325,7 @@ glabel func_E00C0160 /* 3BD350 E00C05F0 C6000030 */ lwc1 $f0, 0x30($s0) /* 3BD354 E00C05F4 4600A500 */ add.s $f20, $f20, $f0 /* 3BD358 E00C05F8 44820000 */ mtc1 $v0, $f0 -/* 3BD35C E00C05FC 00000000 */ nop +/* 3BD35C E00C05FC 00000000 */ nop /* 3BD360 E00C0600 46800020 */ cvt.s.w $f0, $f0 /* 3BD364 E00C0604 4600A500 */ add.s $f20, $f20, $f0 /* 3BD368 E00C0608 3C0141F0 */ lui $at, 0x41f0 @@ -336,7 +341,7 @@ glabel func_E00C0160 /* 3BD390 E00C0630 C6020008 */ lwc1 $f2, 8($s0) /* 3BD394 E00C0634 46001080 */ add.s $f2, $f2, $f0 /* 3BD398 E00C0638 44820000 */ mtc1 $v0, $f0 -/* 3BD39C E00C063C 00000000 */ nop +/* 3BD39C E00C063C 00000000 */ nop /* 3BD3A0 E00C0640 46800020 */ cvt.s.w $f0, $f0 /* 3BD3A4 E00C0644 46001080 */ add.s $f2, $f2, $f0 /* 3BD3A8 E00C0648 3C014248 */ lui $at, 0x4248 diff --git a/asm/nonmatchings/code_3BCD60/func_E00C0758.s b/asm/nonmatchings/code_3BCD60/func_E00C0758.s index 58a36412d2..bd31d80ae6 100644 --- a/asm/nonmatchings/code_3BCD60/func_E00C0758.s +++ b/asm/nonmatchings/code_3BCD60/func_E00C0758.s @@ -3,4 +3,4 @@ glabel func_E00C0758 /* 3BD4B8 E00C0758 03E00008 */ jr $ra -/* 3BD4BC E00C075C 00000000 */ nop +/* 3BD4BC E00C075C 00000000 */ nop diff --git a/asm/nonmatchings/code_3BCD60/func_E00C0760.s b/asm/nonmatchings/code_3BCD60/func_E00C0760.s index 3011920e72..80b0ffe71d 100644 --- a/asm/nonmatchings/code_3BCD60/func_E00C0760.s +++ b/asm/nonmatchings/code_3BCD60/func_E00C0760.s @@ -173,4 +173,4 @@ glabel func_E00C0760 /* 3BD760 E00C0A00 8FB00098 */ lw $s0, 0x98($sp) /* 3BD764 E00C0A04 03E00008 */ jr $ra /* 3BD768 E00C0A08 27BD00B8 */ addiu $sp, $sp, 0xb8 -/* 3BD76C E00C0A0C 00000000 */ nop +/* 3BD76C E00C0A0C 00000000 */ nop diff --git a/asm/nonmatchings/code_3C11D0/func_E00C2000.s b/asm/nonmatchings/code_3C11D0/func_E00C2000.s index 1278a24524..37a05b9f5e 100644 --- a/asm/nonmatchings/code_3C11D0/func_E00C2000.s +++ b/asm/nonmatchings/code_3C11D0/func_E00C2000.s @@ -40,7 +40,7 @@ glabel func_E00C2000 /* 3C125C E00C208C AE02000C */ sw $v0, 0xc($s0) .LE00C2090: /* 3C1260 E00C2090 08030824 */ j .LE00C2090 -/* 3C1264 E00C2094 00000000 */ nop +/* 3C1264 E00C2094 00000000 */ nop .LE00C2098: /* 3C1268 E00C2098 AC920000 */ sw $s2, ($a0) /* 3C126C E00C209C 1E200004 */ bgtz $s1, .LE00C20B0 @@ -60,7 +60,7 @@ glabel func_E00C2000 /* 3C129C E00C20CC D42229A0 */ ldc1 $f2, %lo(D_E00C29A0)($at) /* 3C12A0 E00C20D0 46000021 */ cvt.d.s $f0, $f0 /* 3C12A4 E00C20D4 46220002 */ mul.d $f0, $f0, $f2 -/* 3C12A8 E00C20D8 00000000 */ nop +/* 3C12A8 E00C20D8 00000000 */ nop /* 3C12AC E00C20DC 24030046 */ addiu $v1, $zero, 0x46 /* 3C12B0 E00C20E0 AC830018 */ sw $v1, 0x18($a0) /* 3C12B4 E00C20E4 240300B4 */ addiu $v1, $zero, 0xb4 diff --git a/asm/nonmatchings/code_3C11D0/func_E00C2124.s b/asm/nonmatchings/code_3C11D0/func_E00C2124.s index ff269125d3..95cac63012 100644 --- a/asm/nonmatchings/code_3C11D0/func_E00C2124.s +++ b/asm/nonmatchings/code_3C11D0/func_E00C2124.s @@ -3,4 +3,4 @@ glabel func_E00C2124 /* 3C12F4 E00C2124 03E00008 */ jr $ra -/* 3C12F8 E00C2128 00000000 */ nop +/* 3C12F8 E00C2128 00000000 */ nop diff --git a/asm/nonmatchings/code_3C11D0/func_E00C212C.s b/asm/nonmatchings/code_3C11D0/func_E00C212C.s index 6fa74f19a8..b282381266 100644 --- a/asm/nonmatchings/code_3C11D0/func_E00C212C.s +++ b/asm/nonmatchings/code_3C11D0/func_E00C212C.s @@ -26,9 +26,9 @@ glabel func_E00C212C /* 3C1348 E00C2178 04C10005 */ bgez $a2, .LE00C2190 /* 3C134C E00C217C ACA30014 */ sw $v1, 0x14($a1) /* 3C1350 E00C2180 0C080128 */ jal func_E02004A0 -/* 3C1354 E00C2184 00000000 */ nop +/* 3C1354 E00C2184 00000000 */ nop /* 3C1358 E00C2188 08030870 */ j .LE00C21C0 -/* 3C135C E00C218C 00000000 */ nop +/* 3C135C E00C218C 00000000 */ nop .LE00C2190: /* 3C1360 E00C2190 28620010 */ slti $v0, $v1, 0x10 /* 3C1364 E00C2194 10400004 */ beqz $v0, .LE00C21A8 diff --git a/asm/nonmatchings/code_3C11D0/func_E00C2214.s b/asm/nonmatchings/code_3C11D0/func_E00C2214.s index 710c70c669..e46255ca27 100644 --- a/asm/nonmatchings/code_3C11D0/func_E00C2214.s +++ b/asm/nonmatchings/code_3C11D0/func_E00C2214.s @@ -3,4 +3,4 @@ glabel func_E00C2214 /* 3C13E4 E00C2214 03E00008 */ jr $ra -/* 3C13E8 E00C2218 00000000 */ nop +/* 3C13E8 E00C2218 00000000 */ nop diff --git a/asm/nonmatchings/code_3C11D0/func_E00C221C.s b/asm/nonmatchings/code_3C11D0/func_E00C221C.s index 8ae5b56c7f..21ed6d0485 100644 --- a/asm/nonmatchings/code_3C11D0/func_E00C221C.s +++ b/asm/nonmatchings/code_3C11D0/func_E00C221C.s @@ -177,21 +177,21 @@ glabel func_E00C221C /* 3C168C E00C24BC 3421CCCD */ ori $at, $at, 0xcccd /* 3C1690 E00C24C0 44811000 */ mtc1 $at, $f2 /* 3C1694 E00C24C4 448C0000 */ mtc1 $t4, $f0 -/* 3C1698 E00C24C8 00000000 */ nop +/* 3C1698 E00C24C8 00000000 */ nop /* 3C169C E00C24CC 46800020 */ cvt.s.w $f0, $f0 /* 3C16A0 E00C24D0 46020102 */ mul.s $f4, $f0, $f2 -/* 3C16A4 E00C24D4 00000000 */ nop +/* 3C16A4 E00C24D4 00000000 */ nop /* 3C16A8 E00C24D8 3C013F80 */ lui $at, 0x3f80 /* 3C16AC E00C24DC 44811000 */ mtc1 $at, $f2 -/* 3C16B0 E00C24E0 00000000 */ nop +/* 3C16B0 E00C24E0 00000000 */ nop /* 3C16B4 E00C24E4 46041081 */ sub.s $f2, $f2, $f4 /* 3C16B8 E00C24E8 C7A00090 */ lwc1 $f0, 0x90($sp) /* 3C16BC E00C24EC 46800020 */ cvt.s.w $f0, $f0 /* 3C16C0 E00C24F0 46020002 */ mul.s $f0, $f0, $f2 -/* 3C16C4 E00C24F4 00000000 */ nop +/* 3C16C4 E00C24F4 00000000 */ nop /* 3C16C8 E00C24F8 46000000 */ add.s $f0, $f0, $f0 /* 3C16CC E00C24FC 4600603C */ c.lt.s $f12, $f0 -/* 3C16D0 E00C2500 00000000 */ nop +/* 3C16D0 E00C2500 00000000 */ nop /* 3C16D4 E00C2504 45030001 */ bc1tl .LE00C250C /* 3C16D8 E00C2508 46006006 */ mov.s $f0, $f12 .LE00C250C: @@ -220,7 +220,7 @@ glabel func_E00C221C /* 3C1730 E00C2560 46060001 */ sub.s $f0, $f0, $f6 /* 3C1734 E00C2564 4600038D */ trunc.w.s $f14, $f0 /* 3C1738 E00C2568 44027000 */ mfc1 $v0, $f14 -/* 3C173C E00C256C 00000000 */ nop +/* 3C173C E00C256C 00000000 */ nop /* 3C1740 E00C2570 00541025 */ or $v0, $v0, $s4 /* 3C1744 E00C2574 3C05F548 */ lui $a1, 0xf548 .LE00C2578: @@ -238,7 +238,7 @@ glabel func_E00C221C /* 3C1774 E00C25A4 3C020900 */ lui $v0, 0x900 /* 3C1778 E00C25A8 24422020 */ addiu $v0, $v0, 0x2020 /* 3C177C E00C25AC 460A2002 */ mul.s $f0, $f4, $f10 -/* 3C1780 E00C25B0 00000000 */ nop +/* 3C1780 E00C25B0 00000000 */ nop /* 3C1784 E00C25B4 0060202D */ daddu $a0, $v1, $zero /* 3C1788 E00C25B8 24630008 */ addiu $v1, $v1, 8 /* 3C178C E00C25BC AD230000 */ sw $v1, ($t1) @@ -277,12 +277,12 @@ glabel func_E00C221C /* 3C1810 E00C2640 AD220000 */ sw $v0, ($t1) /* 3C1814 E00C2644 AC650028 */ sw $a1, 0x28($v1) /* 3C1818 E00C2648 46080002 */ mul.s $f0, $f0, $f8 -/* 3C181C E00C264C 00000000 */ nop +/* 3C181C E00C264C 00000000 */ nop /* 3C1820 E00C2650 AC64002C */ sw $a0, 0x2c($v1) /* 3C1824 E00C2654 24630038 */ addiu $v1, $v1, 0x38 /* 3C1828 E00C2658 0040502D */ daddu $t2, $v0, $zero /* 3C182C E00C265C 4600303E */ c.le.s $f6, $f0 -/* 3C1830 E00C2660 00000000 */ nop +/* 3C1830 E00C2660 00000000 */ nop /* 3C1834 E00C2664 45010005 */ bc1t .LE00C267C /* 3C1838 E00C2668 AD230000 */ sw $v1, ($t1) /* 3C183C E00C266C 4600038D */ trunc.w.s $f14, $f0 @@ -293,7 +293,7 @@ glabel func_E00C221C /* 3C184C E00C267C 46060001 */ sub.s $f0, $f0, $f6 /* 3C1850 E00C2680 4600038D */ trunc.w.s $f14, $f0 /* 3C1854 E00C2684 44027000 */ mfc1 $v0, $f14 -/* 3C1858 E00C2688 00000000 */ nop +/* 3C1858 E00C2688 00000000 */ nop /* 3C185C E00C268C 00541025 */ or $v0, $v0, $s4 /* 3C1860 E00C2690 3C04007D */ lui $a0, 0x7d .LE00C2694: @@ -313,7 +313,7 @@ glabel func_E00C221C /* 3C1898 E00C26C8 3C020900 */ lui $v0, 0x900 /* 3C189C E00C26CC 24420000 */ addiu $v0, $v0, 0 /* 3C18A0 E00C26D0 460A2002 */ mul.s $f0, $f4, $f10 -/* 3C18A4 E00C26D4 00000000 */ nop +/* 3C18A4 E00C26D4 00000000 */ nop /* 3C18A8 E00C26D8 AD440004 */ sw $a0, 4($t2) /* 3C18AC E00C26DC 0060202D */ daddu $a0, $v1, $zero /* 3C18B0 E00C26E0 24630008 */ addiu $v1, $v1, 8 @@ -353,12 +353,12 @@ glabel func_E00C221C /* 3C1938 E00C2768 AD220000 */ sw $v0, ($t1) /* 3C193C E00C276C AC650028 */ sw $a1, 0x28($v1) /* 3C1940 E00C2770 46080002 */ mul.s $f0, $f0, $f8 -/* 3C1944 E00C2774 00000000 */ nop +/* 3C1944 E00C2774 00000000 */ nop /* 3C1948 E00C2778 AC64002C */ sw $a0, 0x2c($v1) /* 3C194C E00C277C 24630038 */ addiu $v1, $v1, 0x38 /* 3C1950 E00C2780 0040202D */ daddu $a0, $v0, $zero /* 3C1954 E00C2784 4600303E */ c.le.s $f6, $f0 -/* 3C1958 E00C2788 00000000 */ nop +/* 3C1958 E00C2788 00000000 */ nop /* 3C195C E00C278C 45010005 */ bc1t .LE00C27A4 /* 3C1960 E00C2790 AD230000 */ sw $v1, ($t1) /* 3C1964 E00C2794 4600038D */ trunc.w.s $f14, $f0 @@ -369,7 +369,7 @@ glabel func_E00C221C /* 3C1974 E00C27A4 46060001 */ sub.s $f0, $f0, $f6 /* 3C1978 E00C27A8 4600038D */ trunc.w.s $f14, $f0 /* 3C197C E00C27AC 44037000 */ mfc1 $v1, $f14 -/* 3C1980 E00C27B0 00000000 */ nop +/* 3C1980 E00C27B0 00000000 */ nop /* 3C1984 E00C27B4 00741825 */ or $v1, $v1, $s4 /* 3C1988 E00C27B8 3C02017D */ lui $v0, 0x17d .LE00C27BC: @@ -381,11 +381,12 @@ glabel func_E00C221C /* 3C19A0 E00C27D0 1040004B */ beqz $v0, .LE00C2900 /* 3C19A4 E00C27D4 AC830000 */ sw $v1, ($a0) /* 3C19A8 E00C27D8 000C1080 */ sll $v0, $t4, 2 -/* 3C19AC E00C27DC 3C01E00C */ lui $at, %hi(D_E00C29A8) +/* 3C19AC E00C27DC 3C01E00C */ lui $at, %hi(jtbl_E00C29A8_3C1B78) /* 3C19B0 E00C27E0 00220821 */ addu $at, $at, $v0 -/* 3C19B4 E00C27E4 8C2229A8 */ lw $v0, %lo(D_E00C29A8)($at) +/* 3C19B4 E00C27E4 8C2229A8 */ lw $v0, %lo(jtbl_E00C29A8_3C1B78)($at) /* 3C19B8 E00C27E8 00400008 */ jr $v0 -/* 3C19BC E00C27EC 00000000 */ nop +/* 3C19BC E00C27EC 00000000 */ nop +glabel LE00C27F0_3C19C0 /* 3C19C0 E00C27F0 3C040600 */ lui $a0, 0x600 /* 3C19C4 E00C27F4 8D220000 */ lw $v0, ($t1) /* 3C19C8 E00C27F8 34840204 */ ori $a0, $a0, 0x204 @@ -396,54 +397,63 @@ glabel func_E00C221C /* 3C19DC E00C280C AC640000 */ sw $a0, ($v1) /* 3C19E0 E00C2810 08030A40 */ j .LE00C2900 /* 3C19E4 E00C2814 AC620004 */ sw $v0, 4($v1) +glabel LE00C2818_3C19E8 /* 3C19E8 E00C2818 3C050602 */ lui $a1, 0x602 /* 3C19EC E00C281C 34A5080A */ ori $a1, $a1, 0x80a /* 3C19F0 E00C2820 3C040002 */ lui $a0, 2 /* 3C19F4 E00C2824 8D220000 */ lw $v0, ($t1) /* 3C19F8 E00C2828 08030A3B */ j .LE00C28EC /* 3C19FC E00C282C 34840A04 */ ori $a0, $a0, 0xa04 +glabel LE00C2830_3C1A00 /* 3C1A00 E00C2830 3C050608 */ lui $a1, 0x608 /* 3C1A04 E00C2834 34A50C0E */ ori $a1, $a1, 0xc0e /* 3C1A08 E00C2838 3C040008 */ lui $a0, 8 /* 3C1A0C E00C283C 8D220000 */ lw $v0, ($t1) /* 3C1A10 E00C2840 08030A3B */ j .LE00C28EC /* 3C1A14 E00C2844 34840E0A */ ori $a0, $a0, 0xe0a +glabel LE00C2848_3C1A18 /* 3C1A18 E00C2848 3C05060C */ lui $a1, 0x60c /* 3C1A1C E00C284C 34A51012 */ ori $a1, $a1, 0x1012 /* 3C1A20 E00C2850 3C04000C */ lui $a0, 0xc /* 3C1A24 E00C2854 8D220000 */ lw $v0, ($t1) /* 3C1A28 E00C2858 08030A3B */ j .LE00C28EC /* 3C1A2C E00C285C 3484120E */ ori $a0, $a0, 0x120e +glabel LE00C2860_3C1A30 /* 3C1A30 E00C2860 3C050610 */ lui $a1, 0x610 /* 3C1A34 E00C2864 34A51416 */ ori $a1, $a1, 0x1416 /* 3C1A38 E00C2868 3C040010 */ lui $a0, 0x10 /* 3C1A3C E00C286C 8D220000 */ lw $v0, ($t1) /* 3C1A40 E00C2870 08030A3B */ j .LE00C28EC /* 3C1A44 E00C2874 34841612 */ ori $a0, $a0, 0x1612 +glabel LE00C2878_3C1A48 /* 3C1A48 E00C2878 3C050614 */ lui $a1, 0x614 /* 3C1A4C E00C287C 34A5181A */ ori $a1, $a1, 0x181a /* 3C1A50 E00C2880 3C040014 */ lui $a0, 0x14 /* 3C1A54 E00C2884 8D220000 */ lw $v0, ($t1) /* 3C1A58 E00C2888 08030A3B */ j .LE00C28EC /* 3C1A5C E00C288C 34841A16 */ ori $a0, $a0, 0x1a16 +glabel LE00C2890_3C1A60 /* 3C1A60 E00C2890 3C050618 */ lui $a1, 0x618 /* 3C1A64 E00C2894 34A51C1E */ ori $a1, $a1, 0x1c1e /* 3C1A68 E00C2898 3C040018 */ lui $a0, 0x18 /* 3C1A6C E00C289C 8D220000 */ lw $v0, ($t1) /* 3C1A70 E00C28A0 08030A3B */ j .LE00C28EC /* 3C1A74 E00C28A4 34841E1A */ ori $a0, $a0, 0x1e1a +glabel LE00C28A8_3C1A78 /* 3C1A78 E00C28A8 3C05061C */ lui $a1, 0x61c /* 3C1A7C E00C28AC 34A52022 */ ori $a1, $a1, 0x2022 /* 3C1A80 E00C28B0 3C04001C */ lui $a0, 0x1c /* 3C1A84 E00C28B4 8D220000 */ lw $v0, ($t1) /* 3C1A88 E00C28B8 08030A3B */ j .LE00C28EC /* 3C1A8C E00C28BC 3484221E */ ori $a0, $a0, 0x221e +glabel LE00C28C0_3C1A90 /* 3C1A90 E00C28C0 3C050620 */ lui $a1, 0x620 /* 3C1A94 E00C28C4 34A52426 */ ori $a1, $a1, 0x2426 /* 3C1A98 E00C28C8 3C040020 */ lui $a0, 0x20 /* 3C1A9C E00C28CC 8D220000 */ lw $v0, ($t1) /* 3C1AA0 E00C28D0 08030A3B */ j .LE00C28EC /* 3C1AA4 E00C28D4 34842622 */ ori $a0, $a0, 0x2622 +glabel LE00C28D8_3C1AA8 /* 3C1AA8 E00C28D8 3C050624 */ lui $a1, 0x624 /* 3C1AAC E00C28DC 34A5282A */ ori $a1, $a1, 0x282a /* 3C1AB0 E00C28E0 3C040024 */ lui $a0, 0x24 @@ -489,6 +499,6 @@ glabel func_E00C221C /* 3C1B48 E00C2978 8FB00098 */ lw $s0, 0x98($sp) /* 3C1B4C E00C297C 03E00008 */ jr $ra /* 3C1B50 E00C2980 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 3C1B54 E00C2984 00000000 */ nop -/* 3C1B58 E00C2988 00000000 */ nop -/* 3C1B5C E00C298C 00000000 */ nop +/* 3C1B54 E00C2984 00000000 */ nop +/* 3C1B58 E00C2988 00000000 */ nop +/* 3C1B5C E00C298C 00000000 */ nop diff --git a/asm/nonmatchings/code_3CADF0/func_E00C4000.s b/asm/nonmatchings/code_3CADF0/func_E00C4000.s index fd260904ca..fb58b01288 100644 --- a/asm/nonmatchings/code_3CADF0/func_E00C4000.s +++ b/asm/nonmatchings/code_3CADF0/func_E00C4000.s @@ -40,7 +40,7 @@ glabel func_E00C4000 /* 3CAE7C E00C408C AE02000C */ sw $v0, 0xc($s0) .LE00C4090: /* 3CAE80 E00C4090 08031024 */ j .LE00C4090 -/* 3CAE84 E00C4094 00000000 */ nop +/* 3CAE84 E00C4094 00000000 */ nop .LE00C4098: /* 3CAE88 E00C4098 AC720000 */ sw $s2, ($v1) /* 3CAE8C E00C409C 1E200004 */ bgtz $s1, .LE00C40B0 diff --git a/asm/nonmatchings/code_3CADF0/func_E00C4170.s b/asm/nonmatchings/code_3CADF0/func_E00C4170.s index 148e18998e..8fd7a63e55 100644 --- a/asm/nonmatchings/code_3CADF0/func_E00C4170.s +++ b/asm/nonmatchings/code_3CADF0/func_E00C4170.s @@ -3,4 +3,4 @@ glabel func_E00C4170 /* 3CAF60 E00C4170 03E00008 */ jr $ra -/* 3CAF64 E00C4174 00000000 */ nop +/* 3CAF64 E00C4174 00000000 */ nop diff --git a/asm/nonmatchings/code_3CADF0/func_E00C4178.s b/asm/nonmatchings/code_3CADF0/func_E00C4178.s index 6d53975cd7..3368e845c0 100644 --- a/asm/nonmatchings/code_3CADF0/func_E00C4178.s +++ b/asm/nonmatchings/code_3CADF0/func_E00C4178.s @@ -26,9 +26,9 @@ glabel func_E00C4178 /* 3CAFB4 E00C41C4 04A10005 */ bgez $a1, .LE00C41DC /* 3CAFB8 E00C41C8 AC620014 */ sw $v0, 0x14($v1) /* 3CAFBC E00C41CC 0C080128 */ jal func_E02004A0 -/* 3CAFC0 E00C41D0 00000000 */ nop +/* 3CAFC0 E00C41D0 00000000 */ nop /* 3CAFC4 E00C41D4 080310AE */ j .LE00C42B8 -/* 3CAFC8 E00C41D8 00000000 */ nop +/* 3CAFC8 E00C41D8 00000000 */ nop .LE00C41DC: /* 3CAFCC E00C41DC 00A0202D */ daddu $a0, $a1, $zero /* 3CAFD0 E00C41E0 0040282D */ daddu $a1, $v0, $zero @@ -43,7 +43,7 @@ glabel func_E00C4178 /* 3CAFF4 E00C4204 44801000 */ mtc1 $zero, $f2 /* 3CAFF8 E00C4208 46200020 */ cvt.s.d $f0, $f0 /* 3CAFFC E00C420C 4602003C */ c.lt.s $f0, $f2 -/* 3CB000 E00C4210 00000000 */ nop +/* 3CB000 E00C4210 00000000 */ nop /* 3CB004 E00C4214 45000003 */ bc1f .LE00C4224 /* 3CB008 E00C4218 E4600030 */ swc1 $f0, 0x30($v1) /* 3CB00C E00C421C E4620030 */ swc1 $f2, 0x30($v1) diff --git a/asm/nonmatchings/code_3CADF0/func_E00C4300.s b/asm/nonmatchings/code_3CADF0/func_E00C4300.s index 6657e27e54..bb8e1a1710 100644 --- a/asm/nonmatchings/code_3CADF0/func_E00C4300.s +++ b/asm/nonmatchings/code_3CADF0/func_E00C4300.s @@ -3,4 +3,4 @@ glabel func_E00C4300 /* 3CB0F0 E00C4300 03E00008 */ jr $ra -/* 3CB0F4 E00C4304 00000000 */ nop +/* 3CB0F4 E00C4304 00000000 */ nop diff --git a/asm/nonmatchings/code_3CADF0/func_E00C4308.s b/asm/nonmatchings/code_3CADF0/func_E00C4308.s index b9050d755a..410162e790 100644 --- a/asm/nonmatchings/code_3CADF0/func_E00C4308.s +++ b/asm/nonmatchings/code_3CADF0/func_E00C4308.s @@ -133,7 +133,7 @@ glabel func_E00C4308 .LE00C4508: /* 3CB2F8 E00C4508 00168140 */ sll $s0, $s6, 5 /* 3CB2FC E00C450C 44976000 */ mtc1 $s7, $f12 -/* 3CB300 E00C4510 00000000 */ nop +/* 3CB300 E00C4510 00000000 */ nop /* 3CB304 E00C4514 46806320 */ cvt.s.w $f12, $f12 /* 3CB308 E00C4518 8FAF00A4 */ lw $t7, 0xa4($sp) /* 3CB30C E00C451C C7D40030 */ lwc1 $f20, 0x30($fp) @@ -141,13 +141,13 @@ glabel func_E00C4308 /* 3CB314 E00C4524 01F08021 */ addu $s0, $t7, $s0 /* 3CB318 E00C4528 3C0143FA */ lui $at, 0x43fa /* 3CB31C E00C452C 44811000 */ mtc1 $at, $f2 -/* 3CB320 E00C4530 00000000 */ nop +/* 3CB320 E00C4530 00000000 */ nop /* 3CB324 E00C4534 46020002 */ mul.s $f0, $f0, $f2 -/* 3CB328 E00C4538 00000000 */ nop +/* 3CB328 E00C4538 00000000 */ nop /* 3CB32C E00C453C 46140002 */ mul.s $f0, $f0, $f20 -/* 3CB330 E00C4540 00000000 */ nop +/* 3CB330 E00C4540 00000000 */ nop /* 3CB334 E00C4544 44946000 */ mtc1 $s4, $f12 -/* 3CB338 E00C4548 00000000 */ nop +/* 3CB338 E00C4548 00000000 */ nop /* 3CB33C E00C454C 46806320 */ cvt.s.w $f12, $f12 /* 3CB340 E00C4550 4600010D */ trunc.w.s $f4, $f0 /* 3CB344 E00C4554 44112000 */ mfc1 $s1, $f4 @@ -157,20 +157,20 @@ glabel func_E00C4308 /* 3CB354 E00C4564 44811000 */ mtc1 $at, $f2 /* 3CB358 E00C4568 26F7003C */ addiu $s7, $s7, 0x3c /* 3CB35C E00C456C 46020002 */ mul.s $f0, $f0, $f2 -/* 3CB360 E00C4570 00000000 */ nop +/* 3CB360 E00C4570 00000000 */ nop /* 3CB364 E00C4574 001619C0 */ sll $v1, $s6, 7 /* 3CB368 E00C4578 26D60001 */ addiu $s6, $s6, 1 /* 3CB36C E00C457C 2622F380 */ addiu $v0, $s1, -0xc80 /* 3CB370 E00C4580 26310C80 */ addiu $s1, $s1, 0xc80 /* 3CB374 E00C4584 46140002 */ mul.s $f0, $f0, $f20 -/* 3CB378 E00C4588 00000000 */ nop +/* 3CB378 E00C4588 00000000 */ nop /* 3CB37C E00C458C A6020000 */ sh $v0, ($s0) /* 3CB380 E00C4590 A6000004 */ sh $zero, 4($s0) /* 3CB384 E00C4594 A6000008 */ sh $zero, 8($s0) /* 3CB388 E00C4598 A603000A */ sh $v1, 0xa($s0) /* 3CB38C E00C459C 4600010D */ trunc.w.s $f4, $f0 /* 3CB390 E00C45A0 44022000 */ mfc1 $v0, $f4 -/* 3CB394 E00C45A4 00000000 */ nop +/* 3CB394 E00C45A4 00000000 */ nop /* 3CB398 E00C45A8 02A21021 */ addu $v0, $s5, $v0 /* 3CB39C E00C45AC 2442F448 */ addiu $v0, $v0, -0xbb8 /* 3CB3A0 E00C45B0 A6020002 */ sh $v0, 2($s0) @@ -275,7 +275,7 @@ glabel func_E00C4308 /* 3CB51C E00C472C AC820000 */ sw $v0, ($a0) .LE00C4730: /* 3CB520 E00C4730 14A00003 */ bnez $a1, .LE00C4740 -/* 3CB524 E00C4734 00000000 */ nop +/* 3CB524 E00C4734 00000000 */ nop /* 3CB528 E00C4738 080311DB */ j .LE00C476C /* 3CB52C E00C473C AC8D0004 */ sw $t5, 4($a0) .LE00C4740: @@ -338,10 +338,10 @@ glabel func_E00C4308 /* 3CB600 E00C4810 3C01E00C */ lui $at, %hi(D_E00C4A98) /* 3CB604 E00C4814 D4224A98 */ ldc1 $f2, %lo(D_E00C4A98)($at) /* 3CB608 E00C4818 44820000 */ mtc1 $v0, $f0 -/* 3CB60C E00C481C 00000000 */ nop +/* 3CB60C E00C481C 00000000 */ nop /* 3CB610 E00C4820 46800021 */ cvt.d.w $f0, $f0 /* 3CB614 E00C4824 46220002 */ mul.d $f0, $f0, $f2 -/* 3CB618 E00C4828 00000000 */ nop +/* 3CB618 E00C4828 00000000 */ nop /* 3CB61C E00C482C 46200020 */ cvt.s.d $f0, $f0 /* 3CB620 E00C4830 E7A00010 */ swc1 $f0, 0x10($sp) /* 3CB624 E00C4834 C6000034 */ lwc1 $f0, 0x34($s0) diff --git a/asm/nonmatchings/code_3CC9E0/func_E00C6000.s b/asm/nonmatchings/code_3CC9E0/func_E00C6000.s index e4ab3f4884..f1070b2cb7 100644 --- a/asm/nonmatchings/code_3CC9E0/func_E00C6000.s +++ b/asm/nonmatchings/code_3CC9E0/func_E00C6000.s @@ -53,7 +53,7 @@ glabel func_E00C6000 /* 3CCA9C E00C60BC AE82000C */ sw $v0, 0xc($s4) .LE00C60C0: /* 3CCAA0 E00C60C0 08031830 */ j .LE00C60C0 -/* 3CCAA4 E00C60C4 00000000 */ nop +/* 3CCAA4 E00C60C4 00000000 */ nop .LE00C60C8: /* 3CCAA8 E00C60C8 5E400003 */ bgtzl $s2, .LE00C60D8 /* 3CCAAC E00C60CC AE120020 */ sw $s2, 0x20($s0) @@ -82,7 +82,7 @@ glabel func_E00C6000 /* 3CCB04 E00C6124 E6000018 */ swc1 $f0, 0x18($s0) /* 3CCB08 E00C6128 C7A00094 */ lwc1 $f0, 0x94($sp) /* 3CCB0C E00C612C 44952000 */ mtc1 $s5, $f4 -/* 3CCB10 E00C6130 00000000 */ nop +/* 3CCB10 E00C6130 00000000 */ nop /* 3CCB14 E00C6134 46802120 */ cvt.s.w $f4, $f4 /* 3CCB18 E00C6138 E6000048 */ swc1 $f0, 0x48($s0) /* 3CCB1C E00C613C C6000008 */ lwc1 $f0, 8($s0) @@ -119,7 +119,7 @@ glabel func_E00C6000 /* 3CCB98 E00C61B8 AE030044 */ sw $v1, 0x44($s0) /* 3CCB9C E00C61BC 24040040 */ addiu $a0, $zero, 0x40 /* 3CCBA0 E00C61C0 44820000 */ mtc1 $v0, $f0 -/* 3CCBA4 E00C61C4 00000000 */ nop +/* 3CCBA4 E00C61C4 00000000 */ nop /* 3CCBA8 E00C61C8 46800020 */ cvt.s.w $f0, $f0 /* 3CCBAC E00C61CC 0C080138 */ jal func_E02004E0 /* 3CCBB0 E00C61D0 E600004C */ swc1 $f0, 0x4c($s0) @@ -132,7 +132,7 @@ glabel func_E00C6000 /* 3CCBCC E00C61EC 3C01C120 */ lui $at, 0xc120 /* 3CCBD0 E00C61F0 44813000 */ mtc1 $at, $f6 /* 3CCBD4 E00C61F4 44820000 */ mtc1 $v0, $f0 -/* 3CCBD8 E00C61F8 00000000 */ nop +/* 3CCBD8 E00C61F8 00000000 */ nop /* 3CCBDC E00C61FC 46800020 */ cvt.s.w $f0, $f0 /* 3CCBE0 E00C6200 E6000050 */ swc1 $f0, 0x50($s0) /* 3CCBE4 E00C6204 AE000054 */ sw $zero, 0x54($s0) @@ -160,7 +160,7 @@ glabel func_E00C6000 /* 3CCC38 E00C6258 0C080138 */ jal func_E02004E0 /* 3CCC3C E00C625C AE030044 */ sw $v1, 0x44($s0) /* 3CCC40 E00C6260 4482C000 */ mtc1 $v0, $f24 -/* 3CCC44 E00C6264 00000000 */ nop +/* 3CCC44 E00C6264 00000000 */ nop /* 3CCC48 E00C6268 4680C620 */ cvt.s.w $f24, $f24 /* 3CCC4C E00C626C 12600039 */ beqz $s3, .LE00C6354 /* 3CCC50 E00C6270 0000882D */ daddu $s1, $zero, $zero @@ -177,7 +177,7 @@ glabel func_E00C6000 .LE00C629C: /* 3CCC7C E00C629C C7AA007C */ lwc1 $f10, 0x7c($sp) /* 3CCC80 E00C62A0 4492A000 */ mtc1 $s2, $f20 -/* 3CCC84 E00C62A4 00000000 */ nop +/* 3CCC84 E00C62A4 00000000 */ nop /* 3CCC88 E00C62A8 4680A520 */ cvt.s.w $f20, $f20 /* 3CCC8C E00C62AC E60AFF8C */ swc1 $f10, -0x74($s0) /* 3CCC90 E00C62B0 C7AA0080 */ lwc1 $f10, 0x80($sp) @@ -189,9 +189,9 @@ glabel func_E00C6000 /* 3CCCA8 E00C62C8 E60AFF94 */ swc1 $f10, -0x6c($s0) /* 3CCCAC E00C62CC 3C0140A0 */ lui $at, 0x40a0 /* 3CCCB0 E00C62D0 44815000 */ mtc1 $at, $f10 -/* 3CCCB4 E00C62D4 00000000 */ nop +/* 3CCCB4 E00C62D4 00000000 */ nop /* 3CCCB8 E00C62D8 460A0002 */ mul.s $f0, $f0, $f10 -/* 3CCCBC E00C62DC 00000000 */ nop +/* 3CCCBC E00C62DC 00000000 */ nop /* 3CCCC0 E00C62E0 4600A306 */ mov.s $f12, $f20 /* 3CCCC4 E00C62E4 0C080144 */ jal func_E0200510 /* 3CCCC8 E00C62E8 E600FFE8 */ swc1 $f0, -0x18($s0) @@ -204,12 +204,12 @@ glabel func_E00C6000 /* 3CCCE4 E00C6304 E600FFEC */ swc1 $f0, -0x14($s0) /* 3CCCE8 E00C6308 24040040 */ addiu $a0, $zero, 0x40 /* 3CCCEC E00C630C 44820000 */ mtc1 $v0, $f0 -/* 3CCCF0 E00C6310 00000000 */ nop +/* 3CCCF0 E00C6310 00000000 */ nop /* 3CCCF4 E00C6314 46800020 */ cvt.s.w $f0, $f0 /* 3CCCF8 E00C6318 0C080138 */ jal func_E02004E0 /* 3CCCFC E00C631C E600FFD4 */ swc1 $f0, -0x2c($s0) /* 3CCD00 E00C6320 44820000 */ mtc1 $v0, $f0 -/* 3CCD04 E00C6324 00000000 */ nop +/* 3CCD04 E00C6324 00000000 */ nop /* 3CCD08 E00C6328 46800020 */ cvt.s.w $f0, $f0 /* 3CCD0C E00C632C E600FFD8 */ swc1 $f0, -0x28($s0) /* 3CCD10 E00C6330 E616FFF8 */ swc1 $f22, -8($s0) diff --git a/asm/nonmatchings/code_3CC9E0/func_E00C6394.s b/asm/nonmatchings/code_3CC9E0/func_E00C6394.s index 78eaa49489..ac7fbaa570 100644 --- a/asm/nonmatchings/code_3CC9E0/func_E00C6394.s +++ b/asm/nonmatchings/code_3CC9E0/func_E00C6394.s @@ -3,4 +3,4 @@ glabel func_E00C6394 /* 3CCD74 E00C6394 03E00008 */ jr $ra -/* 3CCD78 E00C6398 00000000 */ nop +/* 3CCD78 E00C6398 00000000 */ nop diff --git a/asm/nonmatchings/code_3CC9E0/func_E00C639C.s b/asm/nonmatchings/code_3CC9E0/func_E00C639C.s index 4980ccca8b..a327619749 100644 --- a/asm/nonmatchings/code_3CC9E0/func_E00C639C.s +++ b/asm/nonmatchings/code_3CC9E0/func_E00C639C.s @@ -33,9 +33,9 @@ glabel func_E00C639C /* 3CCDE4 E00C6404 AE020024 */ sw $v0, 0x24($s0) /* 3CCDE8 E00C6408 24020001 */ addiu $v0, $zero, 1 /* 3CCDEC E00C640C 14620016 */ bne $v1, $v0, .LE00C6468 -/* 3CCDF0 E00C6410 00000000 */ nop +/* 3CCDF0 E00C6410 00000000 */ nop /* 3CCDF4 E00C6414 16230014 */ bne $s1, $v1, .LE00C6468 -/* 3CCDF8 E00C6418 00000000 */ nop +/* 3CCDF8 E00C6418 00000000 */ nop /* 3CCDFC E00C641C 0C080150 */ jal func_E0200540 /* 3CCE00 E00C6420 24040063 */ addiu $a0, $zero, 0x63 /* 3CCE04 E00C6424 C6000010 */ lwc1 $f0, 0x10($s0) @@ -62,7 +62,7 @@ glabel func_E00C639C /* 3CCE54 E00C6474 0C080128 */ jal func_E02004A0 /* 3CCE58 E00C6478 0240202D */ daddu $a0, $s2, $zero /* 3CCE5C E00C647C 080319D2 */ j .LE00C6748 -/* 3CCE60 E00C6480 00000000 */ nop +/* 3CCE60 E00C6480 00000000 */ nop .LE00C6484: /* 3CCE64 E00C6484 8E030024 */ lw $v1, 0x24($s0) /* 3CCE68 E00C6488 12220023 */ beq $s1, $v0, .LE00C6518 @@ -72,15 +72,15 @@ glabel func_E00C639C /* 3CCE78 E00C6498 12200007 */ beqz $s1, .LE00C64B8 /* 3CCE7C E00C649C 30620003 */ andi $v0, $v1, 3 /* 3CCE80 E00C64A0 080319D2 */ j .LE00C6748 -/* 3CCE84 E00C64A4 00000000 */ nop +/* 3CCE84 E00C64A4 00000000 */ nop .LE00C64A8: /* 3CCE88 E00C64A8 1222005F */ beq $s1, $v0, .LE00C6628 -/* 3CCE8C E00C64AC 00000000 */ nop +/* 3CCE8C E00C64AC 00000000 */ nop /* 3CCE90 E00C64B0 080319D2 */ j .LE00C6748 -/* 3CCE94 E00C64B4 00000000 */ nop +/* 3CCE94 E00C64B4 00000000 */ nop .LE00C64B8: /* 3CCE98 E00C64B8 144000A3 */ bnez $v0, .LE00C6748 -/* 3CCE9C E00C64BC 00000000 */ nop +/* 3CCE9C E00C64BC 00000000 */ nop /* 3CCEA0 E00C64C0 0C080150 */ jal func_E0200540 /* 3CCEA4 E00C64C4 24040063 */ addiu $a0, $zero, 0x63 /* 3CCEA8 E00C64C8 C6000010 */ lwc1 $f0, 0x10($s0) @@ -102,28 +102,28 @@ glabel func_E00C639C /* 3CCEE8 E00C6508 0C031800 */ jal func_E00C6000 /* 3CCEEC E00C650C 24040001 */ addiu $a0, $zero, 1 /* 3CCEF0 E00C6510 080319D2 */ j .LE00C6748 -/* 3CCEF4 E00C6514 00000000 */ nop +/* 3CCEF4 E00C6514 00000000 */ nop .LE00C6518: /* 3CCEF8 E00C6518 C6040060 */ lwc1 $f4, 0x60($s0) /* 3CCEFC E00C651C 3C01E00C */ lui $at, %hi(D_E00C6CB0) /* 3CCF00 E00C6520 D4206CB0 */ ldc1 $f0, %lo(D_E00C6CB0)($at) /* 3CCF04 E00C6524 46002121 */ cvt.d.s $f4, $f4 /* 3CCF08 E00C6528 46202102 */ mul.d $f4, $f4, $f0 -/* 3CCF0C E00C652C 00000000 */ nop +/* 3CCF0C E00C652C 00000000 */ nop /* 3CCF10 E00C6530 C6020068 */ lwc1 $f2, 0x68($s0) /* 3CCF14 E00C6534 460010A1 */ cvt.d.s $f2, $f2 /* 3CCF18 E00C6538 46201082 */ mul.d $f2, $f2, $f0 -/* 3CCF1C E00C653C 00000000 */ nop +/* 3CCF1C E00C653C 00000000 */ nop /* 3CCF20 E00C6540 C60A0064 */ lwc1 $f10, 0x64($s0) /* 3CCF24 E00C6544 3C013F80 */ lui $at, 0x3f80 /* 3CCF28 E00C6548 44814000 */ mtc1 $at, $f8 -/* 3CCF2C E00C654C 00000000 */ nop +/* 3CCF2C E00C654C 00000000 */ nop /* 3CCF30 E00C6550 460A4201 */ sub.s $f8, $f8, $f10 /* 3CCF34 E00C6554 3C01E00C */ lui $at, %hi(D_E00C6CB8) /* 3CCF38 E00C6558 D4206CB8 */ ldc1 $f0, %lo(D_E00C6CB8)($at) /* 3CCF3C E00C655C 46004221 */ cvt.d.s $f8, $f8 /* 3CCF40 E00C6560 46204202 */ mul.d $f8, $f8, $f0 -/* 3CCF44 E00C6564 00000000 */ nop +/* 3CCF44 E00C6564 00000000 */ nop /* 3CCF48 E00C6568 C60C0070 */ lwc1 $f12, 0x70($s0) /* 3CCF4C E00C656C 3C013FF0 */ lui $at, 0x3ff0 /* 3CCF50 E00C6570 44817800 */ mtc1 $at, $f15 @@ -133,14 +133,14 @@ glabel func_E00C639C /* 3CCF60 E00C6580 3C01E00C */ lui $at, %hi(D_E00C6CC0) /* 3CCF64 E00C6584 D4206CC0 */ ldc1 $f0, %lo(D_E00C6CC0)($at) /* 3CCF68 E00C6588 46209482 */ mul.d $f18, $f18, $f0 -/* 3CCF6C E00C658C 00000000 */ nop +/* 3CCF6C E00C658C 00000000 */ nop /* 3CCF70 E00C6590 C606006C */ lwc1 $f6, 0x6c($s0) /* 3CCF74 E00C6594 460031A1 */ cvt.d.s $f6, $f6 /* 3CCF78 E00C6598 46267381 */ sub.d $f14, $f14, $f6 /* 3CCF7C E00C659C 3C01E00C */ lui $at, %hi(D_E00C6CC8) /* 3CCF80 E00C65A0 D4206CC8 */ ldc1 $f0, %lo(D_E00C6CC8)($at) /* 3CCF84 E00C65A4 46207382 */ mul.d $f14, $f14, $f0 -/* 3CCF88 E00C65A8 00000000 */ nop +/* 3CCF88 E00C65A8 00000000 */ nop /* 3CCF8C E00C65AC C6100004 */ lwc1 $f16, 4($s0) /* 3CCF90 E00C65B0 46202120 */ cvt.s.d $f4, $f4 /* 3CCF94 E00C65B4 462010A0 */ cvt.s.d $f2, $f2 @@ -192,7 +192,7 @@ glabel func_E00C639C /* 3CD044 E00C6664 C462FFEC */ lwc1 $f2, -0x14($v1) /* 3CD048 E00C6668 460010A1 */ cvt.d.s $f2, $f2 /* 3CD04C E00C666C 46361082 */ mul.d $f2, $f2, $f22 -/* 3CD050 E00C6670 00000000 */ nop +/* 3CD050 E00C6670 00000000 */ nop /* 3CD054 E00C6674 C460FFF0 */ lwc1 $f0, -0x10($v1) /* 3CD058 E00C6678 46000021 */ cvt.d.s $f0, $f0 /* 3CD05C E00C667C 46340001 */ sub.d $f0, $f0, $f20 @@ -211,12 +211,12 @@ glabel func_E00C639C /* 3CD090 E00C66B0 E462FF90 */ swc1 $f2, -0x70($v1) /* 3CD094 E00C66B4 C460FFF0 */ lwc1 $f0, -0x10($v1) /* 3CD098 E00C66B8 460C003C */ c.lt.s $f0, $f12 -/* 3CD09C E00C66BC 00000000 */ nop +/* 3CD09C E00C66BC 00000000 */ nop /* 3CD0A0 E00C66C0 45000006 */ bc1f .LE00C66DC /* 3CD0A4 E00C66C4 E46CFF94 */ swc1 $f12, -0x6c($v1) /* 3CD0A8 E00C66C8 46000021 */ cvt.d.s $f0, $f0 /* 3CD0AC E00C66CC 46320002 */ mul.d $f0, $f0, $f18 -/* 3CD0B0 E00C66D0 00000000 */ nop +/* 3CD0B0 E00C66D0 00000000 */ nop /* 3CD0B4 E00C66D4 46200020 */ cvt.s.d $f0, $f0 /* 3CD0B8 E00C66D8 E460FFF0 */ swc1 $f0, -0x10($v1) .LE00C66DC: @@ -224,12 +224,12 @@ glabel func_E00C639C /* 3CD0C0 E00C66E0 46026201 */ sub.s $f8, $f12, $f2 /* 3CD0C4 E00C66E4 46004221 */ cvt.d.s $f8, $f8 /* 3CD0C8 E00C66E8 46304202 */ mul.d $f8, $f8, $f16 -/* 3CD0CC E00C66EC 00000000 */ nop +/* 3CD0CC E00C66EC 00000000 */ nop /* 3CD0D0 E00C66F0 C460FFF8 */ lwc1 $f0, -8($v1) /* 3CD0D4 E00C66F4 46006181 */ sub.s $f6, $f12, $f0 /* 3CD0D8 E00C66F8 460031A1 */ cvt.d.s $f6, $f6 /* 3CD0DC E00C66FC 462E3182 */ mul.d $f6, $f6, $f14 -/* 3CD0E0 E00C6700 00000000 */ nop +/* 3CD0E0 E00C6700 00000000 */ nop /* 3CD0E4 E00C6704 C46A0000 */ lwc1 $f10, ($v1) /* 3CD0E8 E00C6708 C4640004 */ lwc1 $f4, 4($v1) /* 3CD0EC E00C670C 46045280 */ add.s $f10, $f10, $f4 diff --git a/asm/nonmatchings/code_3CC9E0/func_E00C67B0.s b/asm/nonmatchings/code_3CC9E0/func_E00C67B0.s index e09843073c..f7e5e9f87b 100644 --- a/asm/nonmatchings/code_3CC9E0/func_E00C67B0.s +++ b/asm/nonmatchings/code_3CC9E0/func_E00C67B0.s @@ -147,7 +147,7 @@ glabel func_E00C67B0 /* 3CD3C4 E00C69E4 E640FFE0 */ swc1 $f0, -0x20($s2) /* 3CD3C8 E00C69E8 C642FFD8 */ lwc1 $f2, -0x28($s2) /* 3CD3CC E00C69EC 4616103C */ c.lt.s $f2, $f22 -/* 3CD3D0 E00C69F0 00000000 */ nop +/* 3CD3D0 E00C69F0 00000000 */ nop /* 3CD3D4 E00C69F4 45000003 */ bc1f .LE00C6A04 /* 3CD3D8 E00C69F8 E640FFE4 */ swc1 $f0, -0x1c($s2) /* 3CD3DC E00C69FC 461A1000 */ add.s $f0, $f2, $f26 @@ -155,19 +155,19 @@ glabel func_E00C67B0 .LE00C6A04: /* 3CD3E4 E00C6A04 C640FFDC */ lwc1 $f0, -0x24($s2) /* 3CD3E8 E00C6A08 4600D03C */ c.lt.s $f26, $f0 -/* 3CD3EC E00C6A0C 00000000 */ nop +/* 3CD3EC E00C6A0C 00000000 */ nop /* 3CD3F0 E00C6A10 45000003 */ bc1f .LE00C6A20 -/* 3CD3F4 E00C6A14 00000000 */ nop +/* 3CD3F4 E00C6A14 00000000 */ nop /* 3CD3F8 E00C6A18 461A0001 */ sub.s $f0, $f0, $f26 /* 3CD3FC E00C6A1C E640FFDC */ swc1 $f0, -0x24($s2) .LE00C6A20: /* 3CD400 E00C6A20 C642FFD8 */ lwc1 $f2, -0x28($s2) /* 3CD404 E00C6A24 461E1082 */ mul.s $f2, $f2, $f30 -/* 3CD408 E00C6A28 00000000 */ nop +/* 3CD408 E00C6A28 00000000 */ nop /* 3CD40C E00C6A2C 27A40018 */ addiu $a0, $sp, 0x18 /* 3CD410 E00C6A30 C640FFDC */ lwc1 $f0, -0x24($s2) /* 3CD414 E00C6A34 461E0002 */ mul.s $f0, $f0, $f30 -/* 3CD418 E00C6A38 00000000 */ nop +/* 3CD418 E00C6A38 00000000 */ nop /* 3CD41C E00C6A3C 8E45FF90 */ lw $a1, -0x70($s2) /* 3CD420 E00C6A40 8E46FF94 */ lw $a2, -0x6c($s2) /* 3CD424 E00C6A44 8E47FF98 */ lw $a3, -0x68($s2) @@ -315,6 +315,6 @@ glabel func_E00C67B0 /* 3CD658 E00C6C78 D7B400D0 */ ldc1 $f20, 0xd0($sp) /* 3CD65C E00C6C7C 03E00008 */ jr $ra /* 3CD660 E00C6C80 27BD0100 */ addiu $sp, $sp, 0x100 -/* 3CD664 E00C6C84 00000000 */ nop -/* 3CD668 E00C6C88 00000000 */ nop -/* 3CD66C E00C6C8C 00000000 */ nop +/* 3CD664 E00C6C84 00000000 */ nop +/* 3CD668 E00C6C88 00000000 */ nop +/* 3CD66C E00C6C8C 00000000 */ nop diff --git a/asm/nonmatchings/code_3CF3A0/func_E00C8000.s b/asm/nonmatchings/code_3CF3A0/func_E00C8000.s index 1e924eb57c..4eb0240918 100644 --- a/asm/nonmatchings/code_3CF3A0/func_E00C8000.s +++ b/asm/nonmatchings/code_3CF3A0/func_E00C8000.s @@ -47,7 +47,7 @@ glabel func_E00C8000 /* 3CF448 E00C80A8 AE42000C */ sw $v0, 0xc($s2) .LE00C80AC: /* 3CF44C E00C80AC 0803202B */ j .LE00C80AC -/* 3CF450 E00C80B0 00000000 */ nop +/* 3CF450 E00C80B0 00000000 */ nop .LE00C80B4: /* 3CF454 E00C80B4 AE130000 */ sw $s3, ($s0) /* 3CF458 E00C80B8 1E200003 */ bgtz $s1, .LE00C80C8 @@ -60,11 +60,11 @@ glabel func_E00C8000 /* 3CF46C E00C80CC AE020028 */ sw $v0, 0x28($s0) /* 3CF470 E00C80D0 240200FF */ addiu $v0, $zero, 0xff /* 3CF474 E00C80D4 44913000 */ mtc1 $s1, $f6 -/* 3CF478 E00C80D8 00000000 */ nop +/* 3CF478 E00C80D8 00000000 */ nop /* 3CF47C E00C80DC 468031A1 */ cvt.d.w $f6, $f6 /* 3CF480 E00C80E0 4616E201 */ sub.s $f8, $f28, $f22 /* 3CF484 E00C80E4 44912000 */ mtc1 $s1, $f4 -/* 3CF488 E00C80E8 00000000 */ nop +/* 3CF488 E00C80E8 00000000 */ nop /* 3CF48C E00C80EC 46802120 */ cvt.s.w $f4, $f4 /* 3CF490 E00C80F0 3C01E00D */ lui $at, %hi(D_E00C8730) /* 3CF494 E00C80F4 D4208730 */ ldc1 $f0, %lo(D_E00C8730)($at) @@ -72,7 +72,7 @@ glabel func_E00C8000 /* 3CF49C E00C80FC AE110068 */ sw $s1, 0x68($s0) /* 3CF4A0 E00C8100 AE02003C */ sw $v0, 0x3c($s0) /* 3CF4A4 E00C8104 46203182 */ mul.d $f6, $f6, $f0 -/* 3CF4A8 E00C8108 00000000 */ nop +/* 3CF4A8 E00C8108 00000000 */ nop /* 3CF4AC E00C810C E6140010 */ swc1 $f20, 0x10($s0) /* 3CF4B0 E00C8110 E6160014 */ swc1 $f22, 0x14($s0) /* 3CF4B4 E00C8114 E6180018 */ swc1 $f24, 0x18($s0) @@ -113,14 +113,14 @@ glabel func_E00C8000 /* 3CF538 E00C8198 E6000040 */ swc1 $f0, 0x40($s0) /* 3CF53C E00C819C 2404000A */ addiu $a0, $zero, 0xa /* 3CF540 E00C81A0 44820000 */ mtc1 $v0, $f0 -/* 3CF544 E00C81A4 00000000 */ nop +/* 3CF544 E00C81A4 00000000 */ nop /* 3CF548 E00C81A8 46800020 */ cvt.s.w $f0, $f0 /* 3CF54C E00C81AC 0C080138 */ jal func_E02004E0 /* 3CF550 E00C81B0 E6000050 */ swc1 $f0, 0x50($s0) /* 3CF554 E00C81B4 24430005 */ addiu $v1, $v0, 5 /* 3CF558 E00C81B8 0240102D */ daddu $v0, $s2, $zero /* 3CF55C E00C81BC 44830000 */ mtc1 $v1, $f0 -/* 3CF560 E00C81C0 00000000 */ nop +/* 3CF560 E00C81C0 00000000 */ nop /* 3CF564 E00C81C4 46800020 */ cvt.s.w $f0, $f0 /* 3CF568 E00C81C8 E6000054 */ swc1 $f0, 0x54($s0) /* 3CF56C E00C81CC 3C013F80 */ lui $at, 0x3f80 diff --git a/asm/nonmatchings/code_3CF3A0/func_E00C8218.s b/asm/nonmatchings/code_3CF3A0/func_E00C8218.s index b29647ca1e..3e50572209 100644 --- a/asm/nonmatchings/code_3CF3A0/func_E00C8218.s +++ b/asm/nonmatchings/code_3CF3A0/func_E00C8218.s @@ -3,4 +3,4 @@ glabel func_E00C8218 /* 3CF5B8 E00C8218 03E00008 */ jr $ra -/* 3CF5BC E00C821C 00000000 */ nop +/* 3CF5BC E00C821C 00000000 */ nop diff --git a/asm/nonmatchings/code_3CF3A0/func_E00C8220.s b/asm/nonmatchings/code_3CF3A0/func_E00C8220.s index fe17e65e8e..9ba8ccd9ab 100644 --- a/asm/nonmatchings/code_3CF3A0/func_E00C8220.s +++ b/asm/nonmatchings/code_3CF3A0/func_E00C8220.s @@ -26,15 +26,15 @@ glabel func_E00C8220 /* 3CF60C E00C826C 04610005 */ bgez $v1, .LE00C8284 /* 3CF610 E00C8270 ACA2002C */ sw $v0, 0x2c($a1) /* 3CF614 E00C8274 0C080128 */ jal func_E02004A0 -/* 3CF618 E00C8278 00000000 */ nop +/* 3CF618 E00C8278 00000000 */ nop /* 3CF61C E00C827C 080320FE */ j .LE00C83F8 -/* 3CF620 E00C8280 00000000 */ nop +/* 3CF620 E00C8280 00000000 */ nop .LE00C8284: /* 3CF624 E00C8284 8CA30060 */ lw $v1, 0x60($a1) /* 3CF628 E00C8288 0040202D */ daddu $a0, $v0, $zero /* 3CF62C E00C828C 2C620007 */ sltiu $v0, $v1, 7 /* 3CF630 E00C8290 1040001F */ beqz $v0, .LE00C8310 -/* 3CF634 E00C8294 00000000 */ nop +/* 3CF634 E00C8294 00000000 */ nop /* 3CF638 E00C8298 3C02E00D */ lui $v0, %hi(D_E00C8718) /* 3CF63C E00C829C 00431021 */ addu $v0, $v0, $v1 /* 3CF640 E00C82A0 90428718 */ lbu $v0, %lo(D_E00C8718)($v0) @@ -42,19 +42,19 @@ glabel func_E00C8220 /* 3CF648 E00C82A8 3421D70A */ ori $at, $at, 0xd70a /* 3CF64C E00C82AC 44811000 */ mtc1 $at, $f2 /* 3CF650 E00C82B0 44820000 */ mtc1 $v0, $f0 -/* 3CF654 E00C82B4 00000000 */ nop +/* 3CF654 E00C82B4 00000000 */ nop /* 3CF658 E00C82B8 46800020 */ cvt.s.w $f0, $f0 /* 3CF65C E00C82BC 46020002 */ mul.s $f0, $f0, $f2 -/* 3CF660 E00C82C0 00000000 */ nop +/* 3CF660 E00C82C0 00000000 */ nop /* 3CF664 E00C82C4 E4A00058 */ swc1 $f0, 0x58($a1) /* 3CF668 E00C82C8 3C02E00D */ lui $v0, %hi(D_E00C8720) /* 3CF66C E00C82CC 00431021 */ addu $v0, $v0, $v1 /* 3CF670 E00C82D0 90428720 */ lbu $v0, %lo(D_E00C8720)($v0) /* 3CF674 E00C82D4 44822000 */ mtc1 $v0, $f4 -/* 3CF678 E00C82D8 00000000 */ nop +/* 3CF678 E00C82D8 00000000 */ nop /* 3CF67C E00C82DC 46802120 */ cvt.s.w $f4, $f4 /* 3CF680 E00C82E0 46022102 */ mul.s $f4, $f4, $f2 -/* 3CF684 E00C82E4 00000000 */ nop +/* 3CF684 E00C82E4 00000000 */ nop /* 3CF688 E00C82E8 C4A00050 */ lwc1 $f0, 0x50($a1) /* 3CF68C E00C82EC 3C014220 */ lui $at, 0x4220 /* 3CF690 E00C82F0 44811000 */ mtc1 $at, $f2 @@ -91,7 +91,7 @@ glabel func_E00C8220 /* 3CF704 E00C8364 8CA30068 */ lw $v1, 0x68($a1) /* 3CF708 E00C8368 2482FFFF */ addiu $v0, $a0, -1 /* 3CF70C E00C836C 1443000A */ bne $v0, $v1, .LE00C8398 -/* 3CF710 E00C8370 00000000 */ nop +/* 3CF710 E00C8370 00000000 */ nop /* 3CF714 E00C8374 C4A00048 */ lwc1 $f0, 0x48($a1) /* 3CF718 E00C8378 C4A20044 */ lwc1 $f2, 0x44($a1) /* 3CF71C E00C837C 3C01C080 */ lui $at, 0xc080 @@ -104,19 +104,19 @@ glabel func_E00C8220 .LE00C8398: /* 3CF738 E00C8398 C4A40048 */ lwc1 $f4, 0x48($a1) /* 3CF73C E00C839C 44800000 */ mtc1 $zero, $f0 -/* 3CF740 E00C83A0 00000000 */ nop +/* 3CF740 E00C83A0 00000000 */ nop /* 3CF744 E00C83A4 4600203C */ c.lt.s $f4, $f0 -/* 3CF748 E00C83A8 00000000 */ nop +/* 3CF748 E00C83A8 00000000 */ nop /* 3CF74C E00C83AC 45000012 */ bc1f .LE00C83F8 -/* 3CF750 E00C83B0 00000000 */ nop +/* 3CF750 E00C83B0 00000000 */ nop /* 3CF754 E00C83B4 C4A00008 */ lwc1 $f0, 8($a1) /* 3CF758 E00C83B8 3C01E00D */ lui $at, %hi(D_E00C8738) /* 3CF75C E00C83BC D4228738 */ ldc1 $f2, %lo(D_E00C8738)($at) /* 3CF760 E00C83C0 46000021 */ cvt.d.s $f0, $f0 /* 3CF764 E00C83C4 4622003C */ c.lt.d $f0, $f2 -/* 3CF768 E00C83C8 00000000 */ nop +/* 3CF768 E00C83C8 00000000 */ nop /* 3CF76C E00C83CC 4500000A */ bc1f .LE00C83F8 -/* 3CF770 E00C83D0 00000000 */ nop +/* 3CF770 E00C83D0 00000000 */ nop /* 3CF774 E00C83D4 3C014164 */ lui $at, 0x4164 /* 3CF778 E00C83D8 34219249 */ ori $at, $at, 0x9249 /* 3CF77C E00C83DC 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_3CF3A0/func_E00C844C.s b/asm/nonmatchings/code_3CF3A0/func_E00C844C.s index 321a53cb46..1ab87b189b 100644 --- a/asm/nonmatchings/code_3CF3A0/func_E00C844C.s +++ b/asm/nonmatchings/code_3CF3A0/func_E00C844C.s @@ -3,4 +3,4 @@ glabel func_E00C844C /* 3CF7EC E00C844C 03E00008 */ jr $ra -/* 3CF7F0 E00C8450 00000000 */ nop +/* 3CF7F0 E00C8450 00000000 */ nop diff --git a/asm/nonmatchings/code_3CF3A0/func_E00C8454.s b/asm/nonmatchings/code_3CF3A0/func_E00C8454.s index 5891dc2192..f6d8a02e89 100644 --- a/asm/nonmatchings/code_3CF3A0/func_E00C8454.s +++ b/asm/nonmatchings/code_3CF3A0/func_E00C8454.s @@ -40,7 +40,7 @@ glabel func_E00C8454 /* 3CF880 E00C84E0 3C038000 */ lui $v1, 0x8000 /* 3CF884 E00C84E4 4600A521 */ cvt.d.s $f20, $f20 /* 3CF888 E00C84E8 4620A502 */ mul.d $f20, $f20, $f0 -/* 3CF88C E00C84EC 00000000 */ nop +/* 3CF88C E00C84EC 00000000 */ nop /* 3CF890 E00C84F0 00431021 */ addu $v0, $v0, $v1 /* 3CF894 E00C84F4 3C03800B */ lui $v1, %hi(gCameras) /* 3CF898 E00C84F8 24631D80 */ addiu $v1, $v1, %lo(gCameras) @@ -62,11 +62,11 @@ glabel func_E00C8454 /* 3CF8D8 E00C8538 4620A520 */ cvt.s.d $f20, $f20 /* 3CF8DC E00C853C C6400058 */ lwc1 $f0, 0x58($s2) /* 3CF8E0 E00C8540 4600A002 */ mul.s $f0, $f20, $f0 -/* 3CF8E4 E00C8544 00000000 */ nop +/* 3CF8E4 E00C8544 00000000 */ nop /* 3CF8E8 E00C8548 44050000 */ mfc1 $a1, $f0 /* 3CF8EC E00C854C C640005C */ lwc1 $f0, 0x5c($s2) /* 3CF8F0 E00C8550 4600A002 */ mul.s $f0, $f20, $f0 -/* 3CF8F4 E00C8554 00000000 */ nop +/* 3CF8F4 E00C8554 00000000 */ nop /* 3CF8F8 E00C8558 3C170001 */ lui $s7, 1 /* 3CF8FC E00C855C 27B00058 */ addiu $s0, $sp, 0x58 /* 3CF900 E00C8560 4407A000 */ mfc1 $a3, $f20 @@ -174,6 +174,6 @@ glabel func_E00C8454 /* 3CFA98 E00C86F8 D7B400C0 */ ldc1 $f20, 0xc0($sp) /* 3CFA9C E00C86FC 03E00008 */ jr $ra /* 3CFAA0 E00C8700 27BD00C8 */ addiu $sp, $sp, 0xc8 -/* 3CFAA4 E00C8704 00000000 */ nop -/* 3CFAA8 E00C8708 00000000 */ nop -/* 3CFAAC E00C870C 00000000 */ nop +/* 3CFAA4 E00C8704 00000000 */ nop +/* 3CFAA8 E00C8708 00000000 */ nop +/* 3CFAAC E00C870C 00000000 */ nop diff --git a/asm/nonmatchings/code_3D1690/func_E00CC000.s b/asm/nonmatchings/code_3D1690/func_E00CC000.s index 7c339b7e6a..5b6eeb0f26 100644 --- a/asm/nonmatchings/code_3D1690/func_E00CC000.s +++ b/asm/nonmatchings/code_3D1690/func_E00CC000.s @@ -45,7 +45,7 @@ glabel func_E00CC000 /* 3D1730 E00CC0A0 AE82000C */ sw $v0, 0xc($s4) .LE00CC0A4: /* 3D1734 E00CC0A4 08033029 */ j .LE00CC0A4 -/* 3D1738 E00CC0A8 00000000 */ nop +/* 3D1738 E00CC0A8 00000000 */ nop .LE00CC0AC: /* 3D173C E00CC0AC AC710000 */ sw $s1, ($v1) /* 3D1740 E00CC0B0 1E000004 */ bgtz $s0, .LE00CC0C4 @@ -86,7 +86,7 @@ glabel func_E00CC000 /* 3D17C0 E00CC130 000810C3 */ sra $v0, $t0, 3 /* 3D17C4 E00CC134 00431023 */ subu $v0, $v0, $v1 /* 3D17C8 E00CC138 4482A000 */ mtc1 $v0, $f20 -/* 3D17CC E00CC13C 00000000 */ nop +/* 3D17CC E00CC13C 00000000 */ nop /* 3D17D0 E00CC140 4680A520 */ cvt.s.w $f20, $f20 /* 3D17D4 E00CC144 0C080140 */ jal func_E0200500 /* 3D17D8 E00CC148 4600A306 */ mov.s $f12, $f20 @@ -97,29 +97,29 @@ glabel func_E00CC000 /* 3D17EC E00CC15C 0C080138 */ jal func_E02004E0 /* 3D17F0 E00CC160 46000586 */ mov.s $f22, $f0 /* 3D17F4 E00CC164 461AA082 */ mul.s $f2, $f20, $f26 -/* 3D17F8 E00CC168 00000000 */ nop +/* 3D17F8 E00CC168 00000000 */ nop /* 3D17FC E00CC16C 461AB102 */ mul.s $f4, $f22, $f26 -/* 3D1800 E00CC170 00000000 */ nop +/* 3D1800 E00CC170 00000000 */ nop /* 3D1804 E00CC174 2442FF4C */ addiu $v0, $v0, -0xb4 /* 3D1808 E00CC178 44820000 */ mtc1 $v0, $f0 -/* 3D180C E00CC17C 00000000 */ nop +/* 3D180C E00CC17C 00000000 */ nop /* 3D1810 E00CC180 46800020 */ cvt.s.w $f0, $f0 /* 3D1814 E00CC184 3C03E00D */ lui $v1, %hi(D_E00CCE4C) /* 3D1818 E00CC188 2463CE4C */ addiu $v1, $v1, %lo(D_E00CCE4C) /* 3D181C E00CC18C 02431821 */ addu $v1, $s2, $v1 /* 3D1820 E00CC190 4618A502 */ mul.s $f20, $f20, $f24 -/* 3D1824 E00CC194 00000000 */ nop +/* 3D1824 E00CC194 00000000 */ nop /* 3D1828 E00CC198 26310438 */ addiu $s1, $s1, 0x438 /* 3D182C E00CC19C E6000478 */ swc1 $f0, 0x478($s0) /* 3D1830 E00CC1A0 E6020284 */ swc1 $f2, 0x284($s0) /* 3D1834 E00CC1A4 80620000 */ lb $v0, ($v1) /* 3D1838 E00CC1A8 4618B582 */ mul.s $f22, $f22, $f24 -/* 3D183C E00CC1AC 00000000 */ nop +/* 3D183C E00CC1AC 00000000 */ nop /* 3D1840 E00CC1B0 E604034C */ swc1 $f4, 0x34c($s0) /* 3D1844 E00CC1B4 E6140158 */ swc1 $f20, 0x158($s0) /* 3D1848 E00CC1B8 2442000A */ addiu $v0, $v0, 0xa /* 3D184C E00CC1BC 44820000 */ mtc1 $v0, $f0 -/* 3D1850 E00CC1C0 00000000 */ nop +/* 3D1850 E00CC1C0 00000000 */ nop /* 3D1854 E00CC1C4 46800020 */ cvt.s.w $f0, $f0 /* 3D1858 E00CC1C8 E60002E8 */ swc1 $f0, 0x2e8($s0) /* 3D185C E00CC1CC 80620000 */ lb $v0, ($v1) @@ -134,7 +134,7 @@ glabel func_E00CC000 /* 3D1880 E00CC1F0 000210C0 */ sll $v0, $v0, 3 /* 3D1884 E00CC1F4 24420028 */ addiu $v0, $v0, 0x28 /* 3D1888 E00CC1F8 44820000 */ mtc1 $v0, $f0 -/* 3D188C E00CC1FC 00000000 */ nop +/* 3D188C E00CC1FC 00000000 */ nop /* 3D1890 E00CC200 46800020 */ cvt.s.w $f0, $f0 /* 3D1894 E00CC204 E60001BC */ swc1 $f0, 0x1bc($s0) /* 3D1898 E00CC208 2A420019 */ slti $v0, $s2, 0x19 diff --git a/asm/nonmatchings/code_3D1690/func_E00CC250.s b/asm/nonmatchings/code_3D1690/func_E00CC250.s index f1ee90e656..5740c63602 100644 --- a/asm/nonmatchings/code_3D1690/func_E00CC250.s +++ b/asm/nonmatchings/code_3D1690/func_E00CC250.s @@ -3,4 +3,4 @@ glabel func_E00CC250 /* 3D18E0 E00CC250 03E00008 */ jr $ra -/* 3D18E4 E00CC254 00000000 */ nop +/* 3D18E4 E00CC254 00000000 */ nop diff --git a/asm/nonmatchings/code_3D1690/func_E00CC258.s b/asm/nonmatchings/code_3D1690/func_E00CC258.s index 2cea8fa804..fc91e8d070 100644 --- a/asm/nonmatchings/code_3D1690/func_E00CC258.s +++ b/asm/nonmatchings/code_3D1690/func_E00CC258.s @@ -42,9 +42,9 @@ glabel func_E00CC258 /* 3D1974 E00CC2E4 04610005 */ bgez $v1, .LE00CC2FC /* 3D1978 E00CC2E8 AE420014 */ sw $v0, 0x14($s2) /* 3D197C E00CC2EC 0C080128 */ jal func_E02004A0 -/* 3D1980 E00CC2F0 00000000 */ nop +/* 3D1980 E00CC2F0 00000000 */ nop /* 3D1984 E00CC2F4 0803324E */ j .LE00CC938 -/* 3D1988 E00CC2F8 00000000 */ nop +/* 3D1988 E00CC2F8 00000000 */ nop .LE00CC2FC: /* 3D198C E00CC2FC 0040B02D */ daddu $s6, $v0, $zero /* 3D1990 E00CC300 0000982D */ daddu $s3, $zero, $zero @@ -82,10 +82,10 @@ glabel func_E00CC258 /* 3D1A0C E00CC37C 90420000 */ lbu $v0, ($v0) /* 3D1A10 E00CC380 C6260158 */ lwc1 $f6, 0x158($s1) /* 3D1A14 E00CC384 44820000 */ mtc1 $v0, $f0 -/* 3D1A18 E00CC388 00000000 */ nop +/* 3D1A18 E00CC388 00000000 */ nop /* 3D1A1C E00CC38C 46800020 */ cvt.s.w $f0, $f0 /* 3D1A20 E00CC390 46020002 */ mul.s $f0, $f0, $f2 -/* 3D1A24 E00CC394 00000000 */ nop +/* 3D1A24 E00CC394 00000000 */ nop /* 3D1A28 E00CC398 C62801BC */ lwc1 $f8, 0x1bc($s1) /* 3D1A2C E00CC39C C62A0220 */ lwc1 $f10, 0x220($s1) /* 3D1A30 E00CC3A0 3C014000 */ lui $at, 0x4000 @@ -97,11 +97,12 @@ glabel func_E00CC258 /* 3D1A48 E00CC3B8 10400159 */ beqz $v0, .LE00CC920 /* 3D1A4C E00CC3BC E62203B0 */ swc1 $f2, 0x3b0($s1) /* 3D1A50 E00CC3C0 00031080 */ sll $v0, $v1, 2 -/* 3D1A54 E00CC3C4 3C01E00D */ lui $at, %hi(D_E00CCE78) +/* 3D1A54 E00CC3C4 3C01E00D */ lui $at, %hi(jtbl_E00CCE78_3D2508) /* 3D1A58 E00CC3C8 00220821 */ addu $at, $at, $v0 -/* 3D1A5C E00CC3CC 8C22CE78 */ lw $v0, %lo(D_E00CCE78)($at) +/* 3D1A5C E00CC3CC 8C22CE78 */ lw $v0, %lo(jtbl_E00CCE78_3D2508)($at) /* 3D1A60 E00CC3D0 00400008 */ jr $v0 -/* 3D1A64 E00CC3D4 00000000 */ nop +/* 3D1A64 E00CC3D4 00000000 */ nop +glabel LE00CC3D8_3D1A68 /* 3D1A68 E00CC3D8 C62004DC */ lwc1 $f0, 0x4dc($s1) /* 3D1A6C E00CC3DC 8E22066C */ lw $v0, 0x66c($s1) /* 3D1A70 E00CC3E0 E626002C */ swc1 $f6, 0x2c($s1) @@ -120,10 +121,10 @@ glabel func_E00CC258 /* 3D1AA0 E00CC410 00771821 */ addu $v1, $v1, $s7 /* 3D1AA4 E00CC414 90620000 */ lbu $v0, ($v1) /* 3D1AA8 E00CC418 44820000 */ mtc1 $v0, $f0 -/* 3D1AAC E00CC41C 00000000 */ nop +/* 3D1AAC E00CC41C 00000000 */ nop /* 3D1AB0 E00CC420 46800021 */ cvt.d.w $f0, $f0 /* 3D1AB4 E00CC424 463A0002 */ mul.d $f0, $f0, $f26 -/* 3D1AB8 E00CC428 00000000 */ nop +/* 3D1AB8 E00CC428 00000000 */ nop /* 3D1ABC E00CC42C 8E220734 */ lw $v0, 0x734($s1) /* 3D1AC0 E00CC430 24420001 */ addiu $v0, $v0, 1 /* 3D1AC4 E00CC434 AE220734 */ sw $v0, 0x734($s1) @@ -131,14 +132,15 @@ glabel func_E00CC258 /* 3D1ACC E00CC43C E6200414 */ swc1 $f0, 0x414($s1) /* 3D1AD0 E00CC440 08033248 */ j .LE00CC920 /* 3D1AD4 E00CC444 E62003B0 */ swc1 $f0, 0x3b0($s1) +glabel LE00CC448_3D1AD8 /* 3D1AD8 E00CC448 8E220734 */ lw $v0, 0x734($s1) /* 3D1ADC E00CC44C 00571021 */ addu $v0, $v0, $s7 /* 3D1AE0 E00CC450 90420000 */ lbu $v0, ($v0) /* 3D1AE4 E00CC454 44820000 */ mtc1 $v0, $f0 -/* 3D1AE8 E00CC458 00000000 */ nop +/* 3D1AE8 E00CC458 00000000 */ nop /* 3D1AEC E00CC45C 46800021 */ cvt.d.w $f0, $f0 /* 3D1AF0 E00CC460 463A0002 */ mul.d $f0, $f0, $f26 -/* 3D1AF4 E00CC464 00000000 */ nop +/* 3D1AF4 E00CC464 00000000 */ nop /* 3D1AF8 E00CC468 C62204DC */ lwc1 $f2, 0x4dc($s1) /* 3D1AFC E00CC46C 8E220734 */ lw $v0, 0x734($s1) /* 3D1B00 E00CC470 461E1080 */ add.s $f2, $f2, $f30 @@ -154,6 +156,7 @@ glabel func_E00CC258 /* 3D1B28 E00CC498 24020014 */ addiu $v0, $zero, 0x14 /* 3D1B2C E00CC49C 08033176 */ j .LE00CC5D8 /* 3D1B30 E00CC4A0 24020002 */ addiu $v0, $zero, 2 +glabel LE00CC4A4_3D1B34 /* 3D1B34 E00CC4A4 C62004DC */ lwc1 $f0, 0x4dc($s1) /* 3D1B38 E00CC4A8 461E0000 */ add.s $f0, $f0, $f30 /* 3D1B3C E00CC4AC 8E220734 */ lw $v0, 0x734($s1) @@ -162,23 +165,23 @@ glabel func_E00CC258 /* 3D1B48 E00CC4B8 00220821 */ addu $at, $at, $v0 /* 3D1B4C E00CC4BC 9022CDF0 */ lbu $v0, %lo(D_E00CCDF0)($at) /* 3D1B50 E00CC4C0 44820000 */ mtc1 $v0, $f0 -/* 3D1B54 E00CC4C4 00000000 */ nop +/* 3D1B54 E00CC4C4 00000000 */ nop /* 3D1B58 E00CC4C8 46800021 */ cvt.d.w $f0, $f0 /* 3D1B5C E00CC4CC 463A0002 */ mul.d $f0, $f0, $f26 -/* 3D1B60 E00CC4D0 00000000 */ nop +/* 3D1B60 E00CC4D0 00000000 */ nop /* 3D1B64 E00CC4D4 C6240284 */ lwc1 $f4, 0x284($s1) /* 3D1B68 E00CC4D8 46062101 */ sub.s $f4, $f4, $f6 /* 3D1B6C E00CC4DC 462005A0 */ cvt.s.d $f22, $f0 /* 3D1B70 E00CC4E0 46162102 */ mul.s $f4, $f4, $f22 -/* 3D1B74 E00CC4E4 00000000 */ nop +/* 3D1B74 E00CC4E4 00000000 */ nop /* 3D1B78 E00CC4E8 C62202E8 */ lwc1 $f2, 0x2e8($s1) /* 3D1B7C E00CC4EC 46081081 */ sub.s $f2, $f2, $f8 /* 3D1B80 E00CC4F0 46161082 */ mul.s $f2, $f2, $f22 -/* 3D1B84 E00CC4F4 00000000 */ nop +/* 3D1B84 E00CC4F4 00000000 */ nop /* 3D1B88 E00CC4F8 C620034C */ lwc1 $f0, 0x34c($s1) /* 3D1B8C E00CC4FC 460A0001 */ sub.s $f0, $f0, $f10 /* 3D1B90 E00CC500 46160002 */ mul.s $f0, $f0, $f22 -/* 3D1B94 E00CC504 00000000 */ nop +/* 3D1B94 E00CC504 00000000 */ nop /* 3D1B98 E00CC508 E63C0414 */ swc1 $f28, 0x414($s1) /* 3D1B9C E00CC50C 8E220734 */ lw $v0, 0x734($s1) /* 3D1BA0 E00CC510 46043100 */ add.s $f4, $f6, $f4 @@ -192,6 +195,7 @@ glabel func_E00CC258 /* 3D1BC0 E00CC530 E6220090 */ swc1 $f2, 0x90($s1) /* 3D1BC4 E00CC534 080331CC */ j .LE00CC730 /* 3D1BC8 E00CC538 E62000F4 */ swc1 $f0, 0xf4($s1) +glabel LE00CC53C_3D1BCC /* 3D1BCC E00CC53C C62004DC */ lwc1 $f0, 0x4dc($s1) /* 3D1BD0 E00CC540 461E0000 */ add.s $f0, $f0, $f30 /* 3D1BD4 E00CC544 8E220734 */ lw $v0, 0x734($s1) @@ -200,23 +204,23 @@ glabel func_E00CC258 /* 3D1BE0 E00CC550 00220821 */ addu $at, $at, $v0 /* 3D1BE4 E00CC554 9022CDE0 */ lbu $v0, %lo(D_E00CCDE0)($at) /* 3D1BE8 E00CC558 44820000 */ mtc1 $v0, $f0 -/* 3D1BEC E00CC55C 00000000 */ nop +/* 3D1BEC E00CC55C 00000000 */ nop /* 3D1BF0 E00CC560 46800021 */ cvt.d.w $f0, $f0 /* 3D1BF4 E00CC564 463A0002 */ mul.d $f0, $f0, $f26 -/* 3D1BF8 E00CC568 00000000 */ nop +/* 3D1BF8 E00CC568 00000000 */ nop /* 3D1BFC E00CC56C C6240284 */ lwc1 $f4, 0x284($s1) /* 3D1C00 E00CC570 46062101 */ sub.s $f4, $f4, $f6 /* 3D1C04 E00CC574 462005A0 */ cvt.s.d $f22, $f0 /* 3D1C08 E00CC578 46162102 */ mul.s $f4, $f4, $f22 -/* 3D1C0C E00CC57C 00000000 */ nop +/* 3D1C0C E00CC57C 00000000 */ nop /* 3D1C10 E00CC580 C62202E8 */ lwc1 $f2, 0x2e8($s1) /* 3D1C14 E00CC584 46081081 */ sub.s $f2, $f2, $f8 /* 3D1C18 E00CC588 46161082 */ mul.s $f2, $f2, $f22 -/* 3D1C1C E00CC58C 00000000 */ nop +/* 3D1C1C E00CC58C 00000000 */ nop /* 3D1C20 E00CC590 C620034C */ lwc1 $f0, 0x34c($s1) /* 3D1C24 E00CC594 460A0001 */ sub.s $f0, $f0, $f10 /* 3D1C28 E00CC598 46160002 */ mul.s $f0, $f0, $f22 -/* 3D1C2C E00CC59C 00000000 */ nop +/* 3D1C2C E00CC59C 00000000 */ nop /* 3D1C30 E00CC5A0 E63C0414 */ swc1 $f28, 0x414($s1) /* 3D1C34 E00CC5A4 8E220734 */ lw $v0, 0x734($s1) /* 3D1C38 E00CC5A8 46043100 */ add.s $f4, $f6, $f4 @@ -235,6 +239,7 @@ glabel func_E00CC258 /* 3D1C68 E00CC5D8 AE2206D0 */ sw $v0, 0x6d0($s1) /* 3D1C6C E00CC5DC 08033248 */ j .LE00CC920 /* 3D1C70 E00CC5E0 AE200734 */ sw $zero, 0x734($s1) +glabel LE00CC5E4_3D1C74 /* 3D1C74 E00CC5E4 24020018 */ addiu $v0, $zero, 0x18 /* 3D1C78 E00CC5E8 566200CE */ bnel $s3, $v0, .LE00CC924 /* 3D1C7C E00CC5EC 26310004 */ addiu $s1, $s1, 4 @@ -248,15 +253,16 @@ glabel func_E00CC258 /* 3D1C98 E00CC608 2442FFFC */ addiu $v0, $v0, -4 /* 3D1C9C E00CC60C 08033249 */ j .LE00CC924 /* 3D1CA0 E00CC610 26310004 */ addiu $s1, $s1, 4 +glabel LE00CC614_3D1CA4 /* 3D1CA4 E00CC614 8E220734 */ lw $v0, 0x734($s1) /* 3D1CA8 E00CC618 3C01E00D */ lui $at, %hi(D_E00CCE04) /* 3D1CAC E00CC61C 00220821 */ addu $at, $at, $v0 /* 3D1CB0 E00CC620 9022CE04 */ lbu $v0, %lo(D_E00CCE04)($at) /* 3D1CB4 E00CC624 44820000 */ mtc1 $v0, $f0 -/* 3D1CB8 E00CC628 00000000 */ nop +/* 3D1CB8 E00CC628 00000000 */ nop /* 3D1CBC E00CC62C 46800021 */ cvt.d.w $f0, $f0 /* 3D1CC0 E00CC630 463A0002 */ mul.d $f0, $f0, $f26 -/* 3D1CC4 E00CC634 00000000 */ nop +/* 3D1CC4 E00CC634 00000000 */ nop /* 3D1CC8 E00CC638 3C1051EB */ lui $s0, 0x51eb /* 3D1CCC E00CC63C 3610851F */ ori $s0, $s0, 0x851f /* 3D1CD0 E00CC640 02900018 */ mult $s4, $s0 @@ -265,29 +271,29 @@ glabel func_E00CC258 /* 3D1CDC E00CC64C 000810C3 */ sra $v0, $t0, 3 /* 3D1CE0 E00CC650 00431023 */ subu $v0, $v0, $v1 /* 3D1CE4 E00CC654 44826000 */ mtc1 $v0, $f12 -/* 3D1CE8 E00CC658 00000000 */ nop +/* 3D1CE8 E00CC658 00000000 */ nop /* 3D1CEC E00CC65C 46806320 */ cvt.s.w $f12, $f12 /* 3D1CF0 E00CC660 0C080144 */ jal func_E0200510 /* 3D1CF4 E00CC664 462005A0 */ cvt.s.d $f22, $f0 /* 3D1CF8 E00CC668 4616E081 */ sub.s $f2, $f28, $f22 /* 3D1CFC E00CC66C 3C014487 */ lui $at, 0x4487 /* 3D1D00 E00CC670 44812000 */ mtc1 $at, $f4 -/* 3D1D04 E00CC674 00000000 */ nop +/* 3D1D04 E00CC674 00000000 */ nop /* 3D1D08 E00CC678 46041082 */ mul.s $f2, $f2, $f4 -/* 3D1D0C E00CC67C 00000000 */ nop +/* 3D1D0C E00CC67C 00000000 */ nop /* 3D1D10 E00CC680 460010A1 */ cvt.d.s $f2, $f2 /* 3D1D14 E00CC684 46381082 */ mul.d $f2, $f2, $f24 -/* 3D1D18 E00CC688 00000000 */ nop +/* 3D1D18 E00CC688 00000000 */ nop /* 3D1D1C E00CC68C 46000021 */ cvt.d.s $f0, $f0 /* 3D1D20 E00CC690 46201082 */ mul.d $f2, $f2, $f0 -/* 3D1D24 E00CC694 00000000 */ nop +/* 3D1D24 E00CC694 00000000 */ nop /* 3D1D28 E00CC698 02B00018 */ mult $s5, $s0 /* 3D1D2C E00CC69C 00151FC3 */ sra $v1, $s5, 0x1f /* 3D1D30 E00CC6A0 00004010 */ mfhi $t0 /* 3D1D34 E00CC6A4 000810C3 */ sra $v0, $t0, 3 /* 3D1D38 E00CC6A8 00431023 */ subu $v0, $v0, $v1 /* 3D1D3C E00CC6AC 4482A000 */ mtc1 $v0, $f20 -/* 3D1D40 E00CC6B0 00000000 */ nop +/* 3D1D40 E00CC6B0 00000000 */ nop /* 3D1D44 E00CC6B4 4680A521 */ cvt.d.w $f20, $f20 /* 3D1D48 E00CC6B8 4622A500 */ add.d $f20, $f20, $f2 /* 3D1D4C E00CC6BC 4620A520 */ cvt.s.d $f20, $f20 @@ -298,14 +304,14 @@ glabel func_E00CC258 /* 3D1D60 E00CC6D0 46000506 */ mov.s $f20, $f0 /* 3D1D64 E00CC6D4 3C014170 */ lui $at, 0x4170 /* 3D1D68 E00CC6D8 44811000 */ mtc1 $at, $f2 -/* 3D1D6C E00CC6DC 00000000 */ nop +/* 3D1D6C E00CC6DC 00000000 */ nop /* 3D1D70 E00CC6E0 46161083 */ div.s $f2, $f2, $f22 /* 3D1D74 E00CC6E4 46161083 */ div.s $f2, $f2, $f22 /* 3D1D78 E00CC6E8 46141502 */ mul.s $f20, $f2, $f20 -/* 3D1D7C E00CC6EC 00000000 */ nop +/* 3D1D7C E00CC6EC 00000000 */ nop /* 3D1D80 E00CC6F0 8E220734 */ lw $v0, 0x734($s1) /* 3D1D84 E00CC6F4 46001082 */ mul.s $f2, $f2, $f0 -/* 3D1D88 E00CC6F8 00000000 */ nop +/* 3D1D88 E00CC6F8 00000000 */ nop /* 3D1D8C E00CC6FC E634002C */ swc1 $f20, 0x2c($s1) /* 3D1D90 E00CC700 3C03E00D */ lui $v1, %hi(D_E00CCE4C) /* 3D1D94 E00CC704 00731821 */ addu $v1, $v1, $s3 @@ -316,7 +322,7 @@ glabel func_E00CC258 /* 3D1DA8 E00CC718 E62200F4 */ swc1 $f2, 0xf4($s1) /* 3D1DAC E00CC71C 2463000A */ addiu $v1, $v1, 0xa /* 3D1DB0 E00CC720 44830000 */ mtc1 $v1, $f0 -/* 3D1DB4 E00CC724 00000000 */ nop +/* 3D1DB4 E00CC724 00000000 */ nop /* 3D1DB8 E00CC728 46800020 */ cvt.s.w $f0, $f0 /* 3D1DBC E00CC72C E6200090 */ swc1 $f0, 0x90($s1) .LE00CC730: @@ -325,15 +331,15 @@ glabel func_E00CC258 /* 3D1DC8 E00CC738 C6240284 */ lwc1 $f4, 0x284($s1) /* 3D1DCC E00CC73C 46002121 */ cvt.d.s $f4, $f4 /* 3D1DD0 E00CC740 46382102 */ mul.d $f4, $f4, $f24 -/* 3D1DD4 E00CC744 00000000 */ nop +/* 3D1DD4 E00CC744 00000000 */ nop /* 3D1DD8 E00CC748 C62202E8 */ lwc1 $f2, 0x2e8($s1) /* 3D1DDC E00CC74C 460010A1 */ cvt.d.s $f2, $f2 /* 3D1DE0 E00CC750 46381082 */ mul.d $f2, $f2, $f24 -/* 3D1DE4 E00CC754 00000000 */ nop +/* 3D1DE4 E00CC754 00000000 */ nop /* 3D1DE8 E00CC758 C620034C */ lwc1 $f0, 0x34c($s1) /* 3D1DEC E00CC75C 46000021 */ cvt.d.s $f0, $f0 /* 3D1DF0 E00CC760 46380002 */ mul.d $f0, $f0, $f24 -/* 3D1DF4 E00CC764 00000000 */ nop +/* 3D1DF4 E00CC764 00000000 */ nop /* 3D1DF8 E00CC768 24020005 */ addiu $v0, $zero, 5 /* 3D1DFC E00CC76C AE2206D0 */ sw $v0, 0x6d0($s1) /* 3D1E00 E00CC770 AE200734 */ sw $zero, 0x734($s1) @@ -344,21 +350,22 @@ glabel func_E00CC258 /* 3D1E14 E00CC784 E62205A4 */ swc1 $f2, 0x5a4($s1) /* 3D1E18 E00CC788 08033248 */ j .LE00CC920 /* 3D1E1C E00CC78C E6200608 */ swc1 $f0, 0x608($s1) +glabel LE00CC790_3D1E20 /* 3D1E20 E00CC790 C6260540 */ lwc1 $f6, 0x540($s1) /* 3D1E24 E00CC794 3C01E00D */ lui $at, %hi(D_E00CCED0) /* 3D1E28 E00CC798 D42CCED0 */ ldc1 $f12, %lo(D_E00CCED0)($at) /* 3D1E2C E00CC79C 460031A1 */ cvt.d.s $f6, $f6 /* 3D1E30 E00CC7A0 462C3182 */ mul.d $f6, $f6, $f12 -/* 3D1E34 E00CC7A4 00000000 */ nop +/* 3D1E34 E00CC7A4 00000000 */ nop /* 3D1E38 E00CC7A8 C62405A4 */ lwc1 $f4, 0x5a4($s1) /* 3D1E3C E00CC7AC 46002121 */ cvt.d.s $f4, $f4 /* 3D1E40 E00CC7B0 462C2102 */ mul.d $f4, $f4, $f12 -/* 3D1E44 E00CC7B4 00000000 */ nop +/* 3D1E44 E00CC7B4 00000000 */ nop /* 3D1E48 E00CC7B8 C6280608 */ lwc1 $f8, 0x608($s1) /* 3D1E4C E00CC7BC 46004086 */ mov.s $f2, $f8 /* 3D1E50 E00CC7C0 460010A1 */ cvt.d.s $f2, $f2 /* 3D1E54 E00CC7C4 462C1082 */ mul.d $f2, $f2, $f12 -/* 3D1E58 E00CC7C8 00000000 */ nop +/* 3D1E58 E00CC7C8 00000000 */ nop /* 3D1E5C E00CC7CC C62E002C */ lwc1 $f14, 0x2c($s1) /* 3D1E60 E00CC7D0 C6200540 */ lwc1 $f0, 0x540($s1) /* 3D1E64 E00CC7D4 C62A0090 */ lwc1 $f10, 0x90($s1) @@ -397,10 +404,11 @@ glabel func_E00CC258 /* 3D1EE4 E00CC854 D422CEE0 */ ldc1 $f2, %lo(D_E00CCEE0)($at) /* 3D1EE8 E00CC858 46000021 */ cvt.d.s $f0, $f0 /* 3D1EEC E00CC85C 46220002 */ mul.d $f0, $f0, $f2 -/* 3D1EF0 E00CC860 00000000 */ nop +/* 3D1EF0 E00CC860 00000000 */ nop /* 3D1EF4 E00CC864 46200020 */ cvt.s.d $f0, $f0 /* 3D1EF8 E00CC868 08033248 */ j .LE00CC920 /* 3D1EFC E00CC86C E6200478 */ swc1 $f0, 0x478($s1) +glabel LE00CC870_3D1F00 /* 3D1F00 E00CC870 0C080150 */ jal func_E0200540 /* 3D1F04 E00CC874 24040069 */ addiu $a0, $zero, 0x69 /* 3D1F08 E00CC878 E7BE0010 */ swc1 $f30, 0x10($sp) @@ -446,6 +454,7 @@ glabel func_E00CC258 /* 3D1FA8 E00CC918 24020007 */ addiu $v0, $zero, 7 /* 3D1FAC E00CC91C AE2206D0 */ sw $v0, 0x6d0($s1) .LE00CC920: +glabel LE00CC920_3D1FB0 /* 3D1FB0 E00CC920 26310004 */ addiu $s1, $s1, 4 .LE00CC924: /* 3D1FB4 E00CC924 26B50438 */ addiu $s5, $s5, 0x438 diff --git a/asm/nonmatchings/code_3D1690/func_E00CC9C8.s b/asm/nonmatchings/code_3D1690/func_E00CC9C8.s index 63cf07f0fc..b15dec0a71 100644 --- a/asm/nonmatchings/code_3D1690/func_E00CC9C8.s +++ b/asm/nonmatchings/code_3D1690/func_E00CC9C8.s @@ -3,4 +3,4 @@ glabel func_E00CC9C8 /* 3D2058 E00CC9C8 03E00008 */ jr $ra -/* 3D205C E00CC9CC 00000000 */ nop +/* 3D205C E00CC9CC 00000000 */ nop diff --git a/asm/nonmatchings/code_3D1690/func_E00CC9D0.s b/asm/nonmatchings/code_3D1690/func_E00CC9D0.s index d665e51801..88569005f9 100644 --- a/asm/nonmatchings/code_3D1690/func_E00CC9D0.s +++ b/asm/nonmatchings/code_3D1690/func_E00CC9D0.s @@ -259,4 +259,4 @@ glabel func_E00CC9D0 /* 3D2450 E00CCDC0 D7B400C8 */ ldc1 $f20, 0xc8($sp) /* 3D2454 E00CCDC4 03E00008 */ jr $ra /* 3D2458 E00CCDC8 27BD00D8 */ addiu $sp, $sp, 0xd8 -/* 3D245C E00CCDCC 00000000 */ nop +/* 3D245C E00CCDCC 00000000 */ nop diff --git a/asm/nonmatchings/code_3D4970/func_E00D2000.s b/asm/nonmatchings/code_3D4970/func_E00D2000.s index 28a14dce89..29a85d6961 100644 --- a/asm/nonmatchings/code_3D4970/func_E00D2000.s +++ b/asm/nonmatchings/code_3D4970/func_E00D2000.s @@ -40,7 +40,7 @@ glabel func_E00D2000 /* 3D49FC E00D208C AE02000C */ sw $v0, 0xc($s0) .LE00D2090: /* 3D4A00 E00D2090 08034824 */ j .LE00D2090 -/* 3D4A04 E00D2094 00000000 */ nop +/* 3D4A04 E00D2094 00000000 */ nop .LE00D2098: /* 3D4A08 E00D2098 AC920000 */ sw $s2, ($a0) /* 3D4A0C E00D209C 1E200004 */ bgtz $s1, .LE00D20B0 diff --git a/asm/nonmatchings/code_3D4970/func_E00D2118.s b/asm/nonmatchings/code_3D4970/func_E00D2118.s index cebadc8e1c..27f9d05f6b 100644 --- a/asm/nonmatchings/code_3D4970/func_E00D2118.s +++ b/asm/nonmatchings/code_3D4970/func_E00D2118.s @@ -3,4 +3,4 @@ glabel func_E00D2118 /* 3D4A88 E00D2118 03E00008 */ jr $ra -/* 3D4A8C E00D211C 00000000 */ nop +/* 3D4A8C E00D211C 00000000 */ nop diff --git a/asm/nonmatchings/code_3D4970/func_E00D2120.s b/asm/nonmatchings/code_3D4970/func_E00D2120.s index a284c0dbd9..d92008e806 100644 --- a/asm/nonmatchings/code_3D4970/func_E00D2120.s +++ b/asm/nonmatchings/code_3D4970/func_E00D2120.s @@ -26,9 +26,9 @@ glabel func_E00D2120 /* 3D4ADC E00D216C 04610005 */ bgez $v1, .LE00D2184 /* 3D4AE0 E00D2170 ACA60014 */ sw $a2, 0x14($a1) /* 3D4AE4 E00D2174 0C080128 */ jal func_E02004A0 -/* 3D4AE8 E00D2178 00000000 */ nop +/* 3D4AE8 E00D2178 00000000 */ nop /* 3D4AEC E00D217C 0803488A */ j .LE00D2228 -/* 3D4AF0 E00D2180 00000000 */ nop +/* 3D4AF0 E00D2180 00000000 */ nop .LE00D2184: /* 3D4AF4 E00D2184 28620010 */ slti $v0, $v1, 0x10 /* 3D4AF8 E00D2188 10400002 */ beqz $v0, .LE00D2194 @@ -68,10 +68,10 @@ glabel func_E00D2120 /* 3D4B74 E00D2204 3C01E00D */ lui $at, %hi(D_E00D2518) /* 3D4B78 E00D2208 D4222518 */ ldc1 $f2, %lo(D_E00D2518)($at) /* 3D4B7C E00D220C 44820000 */ mtc1 $v0, $f0 -/* 3D4B80 E00D2210 00000000 */ nop +/* 3D4B80 E00D2210 00000000 */ nop /* 3D4B84 E00D2214 46800021 */ cvt.d.w $f0, $f0 /* 3D4B88 E00D2218 46220002 */ mul.d $f0, $f0, $f2 -/* 3D4B8C E00D221C 00000000 */ nop +/* 3D4B8C E00D221C 00000000 */ nop /* 3D4B90 E00D2220 46200020 */ cvt.s.d $f0, $f0 /* 3D4B94 E00D2224 E4A00038 */ swc1 $f0, 0x38($a1) .LE00D2228: diff --git a/asm/nonmatchings/code_3D4970/func_E00D227C.s b/asm/nonmatchings/code_3D4970/func_E00D227C.s index c86576a067..df7e107b7c 100644 --- a/asm/nonmatchings/code_3D4970/func_E00D227C.s +++ b/asm/nonmatchings/code_3D4970/func_E00D227C.s @@ -3,4 +3,4 @@ glabel func_E00D227C /* 3D4BEC E00D227C 03E00008 */ jr $ra -/* 3D4BF0 E00D2280 00000000 */ nop +/* 3D4BF0 E00D2280 00000000 */ nop diff --git a/asm/nonmatchings/code_3D4970/func_E00D2284.s b/asm/nonmatchings/code_3D4970/func_E00D2284.s index d18295ff41..1ad90556d7 100644 --- a/asm/nonmatchings/code_3D4970/func_E00D2284.s +++ b/asm/nonmatchings/code_3D4970/func_E00D2284.s @@ -38,7 +38,7 @@ glabel func_E00D2284 /* 3D4C78 E00D2308 8C62001C */ lw $v0, 0x1c($v1) /* 3D4C7C E00D230C 3C038000 */ lui $v1, 0x8000 /* 3D4C80 E00D2310 4600A502 */ mul.s $f20, $f20, $f0 -/* 3D4C84 E00D2314 00000000 */ nop +/* 3D4C84 E00D2314 00000000 */ nop /* 3D4C88 E00D2318 00431021 */ addu $v0, $v0, $v1 /* 3D4C8C E00D231C 3C03800B */ lui $v1, %hi(gCameras) /* 3D4C90 E00D2320 24631D80 */ addiu $v1, $v1, %lo(gCameras) @@ -160,4 +160,4 @@ glabel func_E00D2284 /* 3D4E60 E00D24F0 D7B400B0 */ ldc1 $f20, 0xb0($sp) /* 3D4E64 E00D24F4 03E00008 */ jr $ra /* 3D4E68 E00D24F8 27BD00B8 */ addiu $sp, $sp, 0xb8 -/* 3D4E6C E00D24FC 00000000 */ nop +/* 3D4E6C E00D24FC 00000000 */ nop diff --git a/asm/nonmatchings/code_3D5020/func_E00D6000.s b/asm/nonmatchings/code_3D5020/func_E00D6000.s index a844a037f6..cc418c9b31 100644 --- a/asm/nonmatchings/code_3D5020/func_E00D6000.s +++ b/asm/nonmatchings/code_3D5020/func_E00D6000.s @@ -131,11 +131,12 @@ glabel func_E00D6000 /* 3D5204 E00D61E4 2EE2000D */ sltiu $v0, $s7, 0xd /* 3D5208 E00D61E8 1040010C */ beqz $v0, .LE00D661C /* 3D520C E00D61EC 00171080 */ sll $v0, $s7, 2 -/* 3D5210 E00D61F0 3C01E00D */ lui $at, %hi(D_E00D6EB8) +/* 3D5210 E00D61F0 3C01E00D */ lui $at, %hi(jtbl_E00D6EB8_3D5ED8) /* 3D5214 E00D61F4 00220821 */ addu $at, $at, $v0 -/* 3D5218 E00D61F8 8C226EB8 */ lw $v0, %lo(D_E00D6EB8)($at) +/* 3D5218 E00D61F8 8C226EB8 */ lw $v0, %lo(jtbl_E00D6EB8_3D5ED8)($at) /* 3D521C E00D61FC 00400008 */ jr $v0 /* 3D5220 E00D6200 00000000 */ nop +glabel LE00D6204_3D5224 /* 3D5224 E00D6204 0C080138 */ jal func_E02004E0 /* 3D5228 E00D6208 2404000A */ addiu $a0, $zero, 0xa /* 3D522C E00D620C 44821000 */ mtc1 $v0, $f2 @@ -160,6 +161,7 @@ glabel func_E00D6000 /* 3D5278 E00D6258 AE000004 */ sw $zero, 4($s0) /* 3D527C E00D625C 08035982 */ j .LE00D6608 /* 3D5280 E00D6260 46201087 */ neg.d $f2, $f2 +glabel LE00D6264_3D5284 /* 3D5284 E00D6264 0C080138 */ jal func_E02004E0 /* 3D5288 E00D6268 2404000A */ addiu $a0, $zero, 0xa /* 3D528C E00D626C 44821000 */ mtc1 $v0, $f2 @@ -183,6 +185,7 @@ glabel func_E00D6000 /* 3D52D4 E00D62B4 AE16FFD4 */ sw $s6, -0x2c($s0) /* 3D52D8 E00D62B8 08035982 */ j .LE00D6608 /* 3D52DC E00D62BC AE000004 */ sw $zero, 4($s0) +glabel LE00D62C0_3D52E0 /* 3D52E0 E00D62C0 0C080138 */ jal func_E02004E0 /* 3D52E4 E00D62C4 2404000A */ addiu $a0, $zero, 0xa /* 3D52E8 E00D62C8 02330018 */ mult $s1, $s3 @@ -207,6 +210,7 @@ glabel func_E00D6000 /* 3D5334 E00D6314 AE1EFFD4 */ sw $fp, -0x2c($s0) /* 3D5338 E00D6318 08035985 */ j .LE00D6614 /* 3D533C E00D631C AE000004 */ sw $zero, 4($s0) +glabel LE00D6320_3D5340 /* 3D5340 E00D6320 0C080138 */ jal func_E02004E0 /* 3D5344 E00D6324 2404000A */ addiu $a0, $zero, 0xa /* 3D5348 E00D6328 02330018 */ mult $s1, $s3 @@ -231,6 +235,7 @@ glabel func_E00D6000 /* 3D5394 E00D6374 AE1EFFD4 */ sw $fp, -0x2c($s0) /* 3D5398 E00D6378 08035985 */ j .LE00D6614 /* 3D539C E00D637C AE000004 */ sw $zero, 4($s0) +glabel LE00D6380_3D53A0 /* 3D53A0 E00D6380 0C080138 */ jal func_E02004E0 /* 3D53A4 E00D6384 2404000A */ addiu $a0, $zero, 0xa /* 3D53A8 E00D6388 44821000 */ mtc1 $v0, $f2 @@ -256,6 +261,7 @@ glabel func_E00D6000 /* 3D53F8 E00D63D8 44813000 */ mtc1 $at, $f6 /* 3D53FC E00D63DC 08035980 */ j .LE00D6600 /* 3D5400 E00D63E0 46241080 */ add.d $f2, $f2, $f4 +glabel LE00D63E4_3D5404 /* 3D5404 E00D63E4 0C080138 */ jal func_E02004E0 /* 3D5408 E00D63E8 2404000A */ addiu $a0, $zero, 0xa /* 3D540C E00D63EC 44821000 */ mtc1 $v0, $f2 @@ -300,6 +306,7 @@ glabel func_E00D6000 /* 3D54A8 E00D6488 AE82002C */ sw $v0, 0x2c($s4) /* 3D54AC E00D648C 08035987 */ j .LE00D661C /* 3D54B0 E00D6490 AE9E0030 */ sw $fp, 0x30($s4) +glabel LE00D6494_3D54B4 /* 3D54B4 E00D6494 0C080138 */ jal func_E02004E0 /* 3D54B8 E00D6498 2404000A */ addiu $a0, $zero, 0xa /* 3D54BC E00D649C 44821000 */ mtc1 $v0, $f2 @@ -338,6 +345,7 @@ glabel func_E00D6000 /* 3D5540 E00D6520 46202120 */ cvt.s.d $f4, $f4 /* 3D5544 E00D6524 08035987 */ j .LE00D661C /* 3D5548 E00D6528 E604FFF8 */ swc1 $f4, -8($s0) +glabel LE00D652C_3D554C /* 3D554C E00D652C 0C080138 */ jal func_E02004E0 /* 3D5550 E00D6530 2404000A */ addiu $a0, $zero, 0xa /* 3D5554 E00D6534 3C01E00D */ lui $at, %hi(D_E00D6F00) @@ -367,6 +375,7 @@ glabel func_E00D6000 /* 3D55B4 E00D6594 2402001E */ addiu $v0, $zero, 0x1e /* 3D55B8 E00D6598 08035982 */ j .LE00D6608 /* 3D55BC E00D659C AE02FFD4 */ sw $v0, -0x2c($s0) +glabel LE00D65A0_3D55C0 /* 3D55C0 E00D65A0 0C080138 */ jal func_E02004E0 /* 3D55C4 E00D65A4 2404000A */ addiu $a0, $zero, 0xa /* 3D55C8 E00D65A8 44821000 */ mtc1 $v0, $f2 diff --git a/asm/nonmatchings/code_3D67C0/func_E00D8000.s b/asm/nonmatchings/code_3D67C0/func_E00D8000.s index c27bb4e1be..4320991feb 100644 --- a/asm/nonmatchings/code_3D67C0/func_E00D8000.s +++ b/asm/nonmatchings/code_3D67C0/func_E00D8000.s @@ -42,7 +42,7 @@ glabel func_E00D8000 /* 3D6854 E00D8094 AE02000C */ sw $v0, 0xc($s0) .LE00D8098: /* 3D6858 E00D8098 08036026 */ j .LE00D8098 -/* 3D685C E00D809C 00000000 */ nop +/* 3D685C E00D809C 00000000 */ nop .LE00D80A0: /* 3D6860 E00D80A0 AC920000 */ sw $s2, ($a0) /* 3D6864 E00D80A4 1E200004 */ bgtz $s1, .LE00D80B8 diff --git a/asm/nonmatchings/code_3D67C0/func_E00D8120.s b/asm/nonmatchings/code_3D67C0/func_E00D8120.s index fd99e732f3..8279dde38f 100644 --- a/asm/nonmatchings/code_3D67C0/func_E00D8120.s +++ b/asm/nonmatchings/code_3D67C0/func_E00D8120.s @@ -3,4 +3,4 @@ glabel func_E00D8120 /* 3D68E0 E00D8120 03E00008 */ jr $ra -/* 3D68E4 E00D8124 00000000 */ nop +/* 3D68E4 E00D8124 00000000 */ nop diff --git a/asm/nonmatchings/code_3D67C0/func_E00D8128.s b/asm/nonmatchings/code_3D67C0/func_E00D8128.s index 0b541947bb..e0e25080e1 100644 --- a/asm/nonmatchings/code_3D67C0/func_E00D8128.s +++ b/asm/nonmatchings/code_3D67C0/func_E00D8128.s @@ -26,9 +26,9 @@ glabel func_E00D8128 /* 3D6934 E00D8174 04C10005 */ bgez $a2, .LE00D818C /* 3D6938 E00D8178 ACA20014 */ sw $v0, 0x14($a1) /* 3D693C E00D817C 0C080128 */ jal func_E02004A0 -/* 3D6940 E00D8180 00000000 */ nop +/* 3D6940 E00D8180 00000000 */ nop /* 3D6944 E00D8184 08036094 */ j .LE00D8250 -/* 3D6948 E00D8188 00000000 */ nop +/* 3D6948 E00D8188 00000000 */ nop .LE00D818C: /* 3D694C E00D818C 00C0202D */ daddu $a0, $a2, $zero /* 3D6950 E00D8190 C4A00018 */ lwc1 $f0, 0x18($a1) @@ -43,7 +43,7 @@ glabel func_E00D8128 /* 3D6974 E00D81B4 00621821 */ addu $v1, $v1, $v0 /* 3D6978 E00D81B8 84620000 */ lh $v0, ($v1) /* 3D697C E00D81BC 44820000 */ mtc1 $v0, $f0 -/* 3D6980 E00D81C0 00000000 */ nop +/* 3D6980 E00D81C0 00000000 */ nop /* 3D6984 E00D81C4 46800020 */ cvt.s.w $f0, $f0 /* 3D6988 E00D81C8 E4A00030 */ swc1 $f0, 0x30($a1) /* 3D698C E00D81CC 90620002 */ lbu $v0, 2($v1) @@ -56,7 +56,7 @@ glabel func_E00D8128 /* 3D69A4 E00D81E4 24638818 */ addiu $v1, $v1, %lo(D_E00D8818) /* 3D69A8 E00D81E8 84620058 */ lh $v0, 0x58($v1) /* 3D69AC E00D81EC 44820000 */ mtc1 $v0, $f0 -/* 3D69B0 E00D81F0 00000000 */ nop +/* 3D69B0 E00D81F0 00000000 */ nop /* 3D69B4 E00D81F4 46800020 */ cvt.s.w $f0, $f0 /* 3D69B8 E00D81F8 E4A00030 */ swc1 $f0, 0x30($a1) /* 3D69BC E00D81FC 9062005A */ lbu $v0, 0x5a($v1) @@ -74,7 +74,7 @@ glabel func_E00D8128 /* 3D69E8 E00D8228 00621821 */ addu $v1, $v1, $v0 /* 3D69EC E00D822C 84620000 */ lh $v0, ($v1) /* 3D69F0 E00D8230 44820000 */ mtc1 $v0, $f0 -/* 3D69F4 E00D8234 00000000 */ nop +/* 3D69F4 E00D8234 00000000 */ nop /* 3D69F8 E00D8238 46800020 */ cvt.s.w $f0, $f0 /* 3D69FC E00D823C E4A00030 */ swc1 $f0, 0x30($a1) /* 3D6A00 E00D8240 90620002 */ lbu $v0, 2($v1) diff --git a/asm/nonmatchings/code_3D67C0/func_E00D825C.s b/asm/nonmatchings/code_3D67C0/func_E00D825C.s index 7084fe4a8a..b24f37cbc6 100644 --- a/asm/nonmatchings/code_3D67C0/func_E00D825C.s +++ b/asm/nonmatchings/code_3D67C0/func_E00D825C.s @@ -3,4 +3,4 @@ glabel func_E00D825C /* 3D6A1C E00D825C 03E00008 */ jr $ra -/* 3D6A20 E00D8260 00000000 */ nop +/* 3D6A20 E00D8260 00000000 */ nop diff --git a/asm/nonmatchings/code_3D67C0/func_E00D8264.s b/asm/nonmatchings/code_3D67C0/func_E00D8264.s index 960fb31bf2..971f5fe869 100644 --- a/asm/nonmatchings/code_3D67C0/func_E00D8264.s +++ b/asm/nonmatchings/code_3D67C0/func_E00D8264.s @@ -5,7 +5,7 @@ glabel func_E00D8264 /* 3D6A24 E00D8264 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 3D6A28 E00D8268 AFBF0010 */ sw $ra, 0x10($sp) /* 3D6A2C E00D826C 0C03618C */ jal func_E00D8630 -/* 3D6A30 E00D8270 00000000 */ nop +/* 3D6A30 E00D8270 00000000 */ nop /* 3D6A34 E00D8274 8FBF0010 */ lw $ra, 0x10($sp) /* 3D6A38 E00D8278 03E00008 */ jr $ra /* 3D6A3C E00D827C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_3D67C0/func_E00D8280.s b/asm/nonmatchings/code_3D67C0/func_E00D8280.s index 811b995825..0203d8caad 100644 --- a/asm/nonmatchings/code_3D67C0/func_E00D8280.s +++ b/asm/nonmatchings/code_3D67C0/func_E00D8280.s @@ -3,4 +3,4 @@ glabel func_E00D8280 /* 3D6A40 E00D8280 03E00008 */ jr $ra -/* 3D6A44 E00D8284 00000000 */ nop +/* 3D6A44 E00D8284 00000000 */ nop diff --git a/asm/nonmatchings/code_3D67C0/func_E00D8334.s b/asm/nonmatchings/code_3D67C0/func_E00D8334.s index a1dc0e7238..9a08671171 100644 --- a/asm/nonmatchings/code_3D67C0/func_E00D8334.s +++ b/asm/nonmatchings/code_3D67C0/func_E00D8334.s @@ -21,12 +21,12 @@ glabel func_E00D8334 /* 3D6B34 E00D8374 3C01437F */ lui $at, 0x437f /* 3D6B38 E00D8378 44811000 */ mtc1 $at, $f2 /* 3D6B3C E00D837C 44820000 */ mtc1 $v0, $f0 -/* 3D6B40 E00D8380 00000000 */ nop +/* 3D6B40 E00D8380 00000000 */ nop /* 3D6B44 E00D8384 46800020 */ cvt.s.w $f0, $f0 /* 3D6B48 E00D8388 90820035 */ lbu $v0, 0x35($a0) /* 3D6B4C E00D838C 46020103 */ div.s $f4, $f0, $f2 /* 3D6B50 E00D8390 44820000 */ mtc1 $v0, $f0 -/* 3D6B54 E00D8394 00000000 */ nop +/* 3D6B54 E00D8394 00000000 */ nop /* 3D6B58 E00D8398 46800020 */ cvt.s.w $f0, $f0 /* 3D6B5C E00D839C 8C820034 */ lw $v0, 0x34($a0) /* 3D6B60 E00D83A0 00431024 */ and $v0, $v0, $v1 @@ -64,7 +64,7 @@ glabel func_E00D8334 /* 3D6BE0 E00D8420 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* 3D6BE4 E00D8424 3C02E700 */ lui $v0, 0xe700 /* 3D6BE8 E00D8428 44940000 */ mtc1 $s4, $f0 -/* 3D6BEC E00D842C 00000000 */ nop +/* 3D6BEC E00D842C 00000000 */ nop /* 3D6BF0 E00D8430 46800020 */ cvt.s.w $f0, $f0 /* 3D6BF4 E00D8434 8FB20058 */ lw $s2, 0x58($sp) /* 3D6BF8 E00D8438 8D030000 */ lw $v1, ($t0) @@ -129,11 +129,11 @@ glabel func_E00D8334 /* 3D6CE4 E00D8524 00461021 */ addu $v0, $v0, $a2 /* 3D6CE8 E00D8528 00021043 */ sra $v0, $v0, 1 /* 3D6CEC E00D852C 4482A000 */ mtc1 $v0, $f20 -/* 3D6CF0 E00D8530 00000000 */ nop +/* 3D6CF0 E00D8530 00000000 */ nop /* 3D6CF4 E00D8534 4680A520 */ cvt.s.w $f20, $f20 /* 3D6CF8 E00D8538 24620058 */ addiu $v0, $v1, 0x58 /* 3D6CFC E00D853C 4604A502 */ mul.s $f20, $f20, $f4 -/* 3D6D00 E00D8540 00000000 */ nop +/* 3D6D00 E00D8540 00000000 */ nop /* 3D6D04 E00D8544 AD020000 */ sw $v0, ($t0) /* 3D6D08 E00D8548 3C02FA00 */ lui $v0, 0xfa00 /* 3D6D0C E00D854C AC620050 */ sw $v0, 0x50($v1) @@ -147,7 +147,7 @@ glabel func_E00D8334 /* 3D6D2C E00D856C AC770054 */ sw $s7, 0x54($v1) /* 3D6D30 E00D8570 0260282D */ daddu $a1, $s3, $zero /* 3D6D34 E00D8574 44910000 */ mtc1 $s1, $f0 -/* 3D6D38 E00D8578 00000000 */ nop +/* 3D6D38 E00D8578 00000000 */ nop /* 3D6D3C E00D857C 46800020 */ cvt.s.w $f0, $f0 /* 3D6D40 E00D8580 46140001 */ sub.s $f0, $f0, $f20 /* 3D6D44 E00D8584 0220302D */ daddu $a2, $s1, $zero @@ -156,13 +156,13 @@ glabel func_E00D8334 /* 3D6D50 E00D8590 0C0360A2 */ jal func_E00D8288 /* 3D6D54 E00D8594 0240382D */ daddu $a3, $s2, $zero /* 3D6D58 E00D8598 4490A000 */ mtc1 $s0, $f20 -/* 3D6D5C E00D859C 00000000 */ nop +/* 3D6D5C E00D859C 00000000 */ nop /* 3D6D60 E00D85A0 4680A520 */ cvt.s.w $f20, $f20 /* 3D6D64 E00D85A4 4616A502 */ mul.s $f20, $f20, $f22 -/* 3D6D68 E00D85A8 00000000 */ nop +/* 3D6D68 E00D85A8 00000000 */ nop /* 3D6D6C E00D85AC 0280202D */ daddu $a0, $s4, $zero /* 3D6D70 E00D85B0 44930000 */ mtc1 $s3, $f0 -/* 3D6D74 E00D85B4 00000000 */ nop +/* 3D6D74 E00D85B4 00000000 */ nop /* 3D6D78 E00D85B8 46800020 */ cvt.s.w $f0, $f0 /* 3D6D7C E00D85BC 46140000 */ add.s $f0, $f0, $f20 /* 3D6D80 E00D85C0 0260282D */ daddu $a1, $s3, $zero @@ -172,7 +172,7 @@ glabel func_E00D8334 /* 3D6D90 E00D85D0 0220302D */ daddu $a2, $s1, $zero /* 3D6D94 E00D85D4 0280202D */ daddu $a0, $s4, $zero /* 3D6D98 E00D85D8 44920000 */ mtc1 $s2, $f0 -/* 3D6D9C E00D85DC 00000000 */ nop +/* 3D6D9C E00D85DC 00000000 */ nop /* 3D6DA0 E00D85E0 46800020 */ cvt.s.w $f0, $f0 /* 3D6DA4 E00D85E4 46140001 */ sub.s $f0, $f0, $f20 /* 3D6DA8 E00D85E8 0220302D */ daddu $a2, $s1, $zero diff --git a/asm/nonmatchings/code_3D67C0/func_E00D8630.s b/asm/nonmatchings/code_3D67C0/func_E00D8630.s index 8f7564d391..9836bd14a1 100644 --- a/asm/nonmatchings/code_3D67C0/func_E00D8630.s +++ b/asm/nonmatchings/code_3D67C0/func_E00D8630.s @@ -28,24 +28,24 @@ glabel func_E00D8630 /* 3D6E4C E00D868C C502001C */ lwc1 $f2, 0x1c($t0) /* 3D6E50 E00D8690 24A50008 */ addiu $a1, $a1, 8 /* 3D6E54 E00D8694 46001032 */ c.eq.s $f2, $f0 -/* 3D6E58 E00D8698 00000000 */ nop +/* 3D6E58 E00D8698 00000000 */ nop /* 3D6E5C E00D869C 45000012 */ bc1f .LE00D86E8 /* 3D6E60 E00D86A0 ACC50000 */ sw $a1, ($a2) /* 3D6E64 E00D86A4 C5000020 */ lwc1 $f0, 0x20($t0) /* 3D6E68 E00D86A8 44801000 */ mtc1 $zero, $f2 -/* 3D6E6C E00D86AC 00000000 */ nop +/* 3D6E6C E00D86AC 00000000 */ nop /* 3D6E70 E00D86B0 46020032 */ c.eq.s $f0, $f2 -/* 3D6E74 E00D86B4 00000000 */ nop +/* 3D6E74 E00D86B4 00000000 */ nop /* 3D6E78 E00D86B8 4500000B */ bc1f .LE00D86E8 -/* 3D6E7C E00D86BC 00000000 */ nop +/* 3D6E7C E00D86BC 00000000 */ nop /* 3D6E80 E00D86C0 C5000024 */ lwc1 $f0, 0x24($t0) /* 3D6E84 E00D86C4 46020032 */ c.eq.s $f0, $f2 -/* 3D6E88 E00D86C8 00000000 */ nop +/* 3D6E88 E00D86C8 00000000 */ nop /* 3D6E8C E00D86CC 45000006 */ bc1f .LE00D86E8 -/* 3D6E90 E00D86D0 00000000 */ nop +/* 3D6E90 E00D86D0 00000000 */ nop /* 3D6E94 E00D86D4 C5000028 */ lwc1 $f0, 0x28($t0) /* 3D6E98 E00D86D8 46020032 */ c.eq.s $f0, $f2 -/* 3D6E9C E00D86DC 00000000 */ nop +/* 3D6E9C E00D86DC 00000000 */ nop /* 3D6EA0 E00D86E0 45030001 */ bc1tl .LE00D86E8 /* 3D6EA4 E00D86E4 0000202D */ daddu $a0, $zero, $zero .LE00D86E8: @@ -110,4 +110,4 @@ glabel func_E00D8630 /* 3D6F90 E00D87D0 8FBF0050 */ lw $ra, 0x50($sp) /* 3D6F94 E00D87D4 03E00008 */ jr $ra /* 3D6F98 E00D87D8 27BD0058 */ addiu $sp, $sp, 0x58 -/* 3D6F9C E00D87DC 00000000 */ nop +/* 3D6F9C E00D87DC 00000000 */ nop diff --git a/asm/nonmatchings/code_3D7240/func_E00DA000.s b/asm/nonmatchings/code_3D7240/func_E00DA000.s index b94425b44a..614c368f01 100644 --- a/asm/nonmatchings/code_3D7240/func_E00DA000.s +++ b/asm/nonmatchings/code_3D7240/func_E00DA000.s @@ -38,7 +38,7 @@ glabel func_E00DA000 /* 3D72C4 E00DA084 AE02000C */ sw $v0, 0xc($s0) .LE00DA088: /* 3D72C8 E00DA088 08036822 */ j .LE00DA088 -/* 3D72CC E00DA08C 00000000 */ nop +/* 3D72CC E00DA08C 00000000 */ nop .LE00DA090: /* 3D72D0 E00DA090 0200102D */ daddu $v0, $s0, $zero /* 3D72D4 E00DA094 2403000A */ addiu $v1, $zero, 0xa diff --git a/asm/nonmatchings/code_3D7240/func_E00DA0FC.s b/asm/nonmatchings/code_3D7240/func_E00DA0FC.s index f3c8c33db2..9be2706648 100644 --- a/asm/nonmatchings/code_3D7240/func_E00DA0FC.s +++ b/asm/nonmatchings/code_3D7240/func_E00DA0FC.s @@ -3,4 +3,4 @@ glabel func_E00DA0FC /* 3D733C E00DA0FC 03E00008 */ jr $ra -/* 3D7340 E00DA100 00000000 */ nop +/* 3D7340 E00DA100 00000000 */ nop diff --git a/asm/nonmatchings/code_3D7240/func_E00DA104.s b/asm/nonmatchings/code_3D7240/func_E00DA104.s index 15c24934f0..f41d79e8ed 100644 --- a/asm/nonmatchings/code_3D7240/func_E00DA104.s +++ b/asm/nonmatchings/code_3D7240/func_E00DA104.s @@ -26,20 +26,20 @@ glabel func_E00DA104 /* 3D7390 E00DA150 04A10005 */ bgez $a1, .LE00DA168 /* 3D7394 E00DA154 AC660014 */ sw $a2, 0x14($v1) /* 3D7398 E00DA158 0C080128 */ jal func_E02004A0 -/* 3D739C E00DA15C 00000000 */ nop +/* 3D739C E00DA15C 00000000 */ nop /* 3D73A0 E00DA160 08036875 */ j .LE00DA1D4 -/* 3D73A4 E00DA164 00000000 */ nop +/* 3D73A4 E00DA164 00000000 */ nop .LE00DA168: /* 3D73A8 E00DA168 28A20004 */ slti $v0, $a1, 4 /* 3D73AC E00DA16C 1040000B */ beqz $v0, .LE00DA19C -/* 3D73B0 E00DA170 00000000 */ nop +/* 3D73B0 E00DA170 00000000 */ nop /* 3D73B4 E00DA174 C460002C */ lwc1 $f0, 0x2c($v1) /* 3D73B8 E00DA178 3C013FE0 */ lui $at, 0x3fe0 /* 3D73BC E00DA17C 44811800 */ mtc1 $at, $f3 /* 3D73C0 E00DA180 44801000 */ mtc1 $zero, $f2 /* 3D73C4 E00DA184 46000021 */ cvt.d.s $f0, $f0 /* 3D73C8 E00DA188 46220002 */ mul.d $f0, $f0, $f2 -/* 3D73CC E00DA18C 00000000 */ nop +/* 3D73CC E00DA18C 00000000 */ nop /* 3D73D0 E00DA190 46200020 */ cvt.s.d $f0, $f0 /* 3D73D4 E00DA194 08036875 */ j .LE00DA1D4 /* 3D73D8 E00DA198 E460002C */ swc1 $f0, 0x2c($v1) @@ -48,10 +48,10 @@ glabel func_E00DA104 /* 3D73E0 E00DA1A0 3421CCCD */ ori $at, $at, 0xcccd /* 3D73E4 E00DA1A4 44810000 */ mtc1 $at, $f0 /* 3D73E8 E00DA1A8 44861000 */ mtc1 $a2, $f2 -/* 3D73EC E00DA1AC 00000000 */ nop +/* 3D73EC E00DA1AC 00000000 */ nop /* 3D73F0 E00DA1B0 468010A0 */ cvt.s.w $f2, $f2 /* 3D73F4 E00DA1B4 46001082 */ mul.s $f2, $f2, $f0 -/* 3D73F8 E00DA1B8 00000000 */ nop +/* 3D73F8 E00DA1B8 00000000 */ nop /* 3D73FC E00DA1BC 3C01E00E */ lui $at, %hi(D_E00DA520) /* 3D7400 E00DA1C0 D420A520 */ ldc1 $f0, %lo(D_E00DA520)($at) /* 3D7404 E00DA1C4 460010A1 */ cvt.d.s $f2, $f2 diff --git a/asm/nonmatchings/code_3D7240/func_E00DA228.s b/asm/nonmatchings/code_3D7240/func_E00DA228.s index 3ea978fe75..6ba5d9469b 100644 --- a/asm/nonmatchings/code_3D7240/func_E00DA228.s +++ b/asm/nonmatchings/code_3D7240/func_E00DA228.s @@ -3,4 +3,4 @@ glabel func_E00DA228 /* 3D7468 E00DA228 03E00008 */ jr $ra -/* 3D746C E00DA22C 00000000 */ nop +/* 3D746C E00DA22C 00000000 */ nop diff --git a/asm/nonmatchings/code_3D7240/func_E00DA230.s b/asm/nonmatchings/code_3D7240/func_E00DA230.s index 4fa85c608d..7a4ada5403 100644 --- a/asm/nonmatchings/code_3D7240/func_E00DA230.s +++ b/asm/nonmatchings/code_3D7240/func_E00DA230.s @@ -38,7 +38,7 @@ glabel func_E00DA230 /* 3D74F4 E00DA2B4 8C62001C */ lw $v0, 0x1c($v1) /* 3D74F8 E00DA2B8 3C038000 */ lui $v1, 0x8000 /* 3D74FC E00DA2BC 4600A502 */ mul.s $f20, $f20, $f0 -/* 3D7500 E00DA2C0 00000000 */ nop +/* 3D7500 E00DA2C0 00000000 */ nop /* 3D7504 E00DA2C4 00431021 */ addu $v0, $v0, $v1 /* 3D7508 E00DA2C8 3C03800B */ lui $v1, %hi(gCameras) /* 3D750C E00DA2CC 24631D80 */ addiu $v1, $v1, %lo(gCameras) @@ -180,5 +180,5 @@ glabel func_E00DA230 /* 3D772C E00DA4EC D7B400B0 */ ldc1 $f20, 0xb0($sp) /* 3D7730 E00DA4F0 03E00008 */ jr $ra /* 3D7734 E00DA4F4 27BD00B8 */ addiu $sp, $sp, 0xb8 -/* 3D7738 E00DA4F8 00000000 */ nop -/* 3D773C E00DA4FC 00000000 */ nop +/* 3D7738 E00DA4F8 00000000 */ nop +/* 3D773C E00DA4FC 00000000 */ nop diff --git a/asm/nonmatchings/code_3D7A70/func_E00DC000.s b/asm/nonmatchings/code_3D7A70/func_E00DC000.s index 34b10ac89b..6259d03f8c 100644 --- a/asm/nonmatchings/code_3D7A70/func_E00DC000.s +++ b/asm/nonmatchings/code_3D7A70/func_E00DC000.s @@ -41,7 +41,7 @@ glabel func_E00DC000 /* 3D7B00 E00DC090 AE42000C */ sw $v0, 0xc($s2) .LE00DC094: /* 3D7B04 E00DC094 08037025 */ j .LE00DC094 -/* 3D7B08 E00DC098 00000000 */ nop +/* 3D7B08 E00DC098 00000000 */ nop .LE00DC09C: /* 3D7B0C E00DC09C AE330000 */ sw $s3, ($s1) /* 3D7B10 E00DC0A0 1E000004 */ bgtz $s0, .LE00DC0B4 @@ -77,12 +77,12 @@ glabel func_E00DC000 /* 3D7B80 E00DC110 E620003C */ swc1 $f0, 0x3c($s1) /* 3D7B84 E00DC114 24040010 */ addiu $a0, $zero, 0x10 /* 3D7B88 E00DC118 44820000 */ mtc1 $v0, $f0 -/* 3D7B8C E00DC11C 00000000 */ nop +/* 3D7B8C E00DC11C 00000000 */ nop /* 3D7B90 E00DC120 46800020 */ cvt.s.w $f0, $f0 /* 3D7B94 E00DC124 0C080138 */ jal func_E02004E0 /* 3D7B98 E00DC128 E6200038 */ swc1 $f0, 0x38($s1) /* 3D7B9C E00DC12C 44820000 */ mtc1 $v0, $f0 -/* 3D7BA0 E00DC130 00000000 */ nop +/* 3D7BA0 E00DC130 00000000 */ nop /* 3D7BA4 E00DC134 46800020 */ cvt.s.w $f0, $f0 /* 3D7BA8 E00DC138 0240102D */ daddu $v0, $s2, $zero /* 3D7BAC E00DC13C 24030096 */ addiu $v1, $zero, 0x96 diff --git a/asm/nonmatchings/code_3D7A70/func_E00DC190.s b/asm/nonmatchings/code_3D7A70/func_E00DC190.s index 2f5c19d343..ba5e85303e 100644 --- a/asm/nonmatchings/code_3D7A70/func_E00DC190.s +++ b/asm/nonmatchings/code_3D7A70/func_E00DC190.s @@ -3,4 +3,4 @@ glabel func_E00DC190 /* 3D7C00 E00DC190 03E00008 */ jr $ra -/* 3D7C04 E00DC194 00000000 */ nop +/* 3D7C04 E00DC194 00000000 */ nop diff --git a/asm/nonmatchings/code_3D7A70/func_E00DC198.s b/asm/nonmatchings/code_3D7A70/func_E00DC198.s index 2749899bba..4394d74a88 100644 --- a/asm/nonmatchings/code_3D7A70/func_E00DC198.s +++ b/asm/nonmatchings/code_3D7A70/func_E00DC198.s @@ -26,9 +26,9 @@ glabel func_E00DC198 /* 3D7C54 E00DC1E4 04A10005 */ bgez $a1, .LE00DC1FC /* 3D7C58 E00DC1E8 AC660014 */ sw $a2, 0x14($v1) /* 3D7C5C E00DC1EC 0C080128 */ jal func_E02004A0 -/* 3D7C60 E00DC1F0 00000000 */ nop +/* 3D7C60 E00DC1F0 00000000 */ nop /* 3D7C64 E00DC1F4 080370AD */ j .LE00DC2B4 -/* 3D7C68 E00DC1F8 00000000 */ nop +/* 3D7C68 E00DC1F8 00000000 */ nop .LE00DC1FC: /* 3D7C6C E00DC1FC 28A20010 */ slti $v0, $a1, 0x10 /* 3D7C70 E00DC200 10400002 */ beqz $v0, .LE00DC20C @@ -46,9 +46,9 @@ glabel func_E00DC198 /* 3D7C98 E00DC228 46001000 */ add.s $f0, $f2, $f0 /* 3D7C9C E00DC22C 3C014380 */ lui $at, 0x4380 /* 3D7CA0 E00DC230 44812000 */ mtc1 $at, $f4 -/* 3D7CA4 E00DC234 00000000 */ nop +/* 3D7CA4 E00DC234 00000000 */ nop /* 3D7CA8 E00DC238 4600203E */ c.le.s $f4, $f0 -/* 3D7CAC E00DC23C 00000000 */ nop +/* 3D7CAC E00DC23C 00000000 */ nop /* 3D7CB0 E00DC240 45000003 */ bc1f .LE00DC250 /* 3D7CB4 E00DC244 E4600038 */ swc1 $f0, 0x38($v1) /* 3D7CB8 E00DC248 46040001 */ sub.s $f0, $f0, $f4 @@ -56,11 +56,11 @@ glabel func_E00DC198 .LE00DC250: /* 3D7CC0 E00DC250 C4600038 */ lwc1 $f0, 0x38($v1) /* 3D7CC4 E00DC254 44803000 */ mtc1 $zero, $f6 -/* 3D7CC8 E00DC258 00000000 */ nop +/* 3D7CC8 E00DC258 00000000 */ nop /* 3D7CCC E00DC25C 4606003C */ c.lt.s $f0, $f6 -/* 3D7CD0 E00DC260 00000000 */ nop +/* 3D7CD0 E00DC260 00000000 */ nop /* 3D7CD4 E00DC264 45000003 */ bc1f .LE00DC274 -/* 3D7CD8 E00DC268 00000000 */ nop +/* 3D7CD8 E00DC268 00000000 */ nop /* 3D7CDC E00DC26C 46040000 */ add.s $f0, $f0, $f4 /* 3D7CE0 E00DC270 E4600038 */ swc1 $f0, 0x38($v1) .LE00DC274: @@ -68,7 +68,7 @@ glabel func_E00DC198 /* 3D7CE8 E00DC278 C4600044 */ lwc1 $f0, 0x44($v1) /* 3D7CEC E00DC27C 46001000 */ add.s $f0, $f2, $f0 /* 3D7CF0 E00DC280 4600203E */ c.le.s $f4, $f0 -/* 3D7CF4 E00DC284 00000000 */ nop +/* 3D7CF4 E00DC284 00000000 */ nop /* 3D7CF8 E00DC288 45000003 */ bc1f .LE00DC298 /* 3D7CFC E00DC28C E4600040 */ swc1 $f0, 0x40($v1) /* 3D7D00 E00DC290 46040001 */ sub.s $f0, $f0, $f4 @@ -76,9 +76,9 @@ glabel func_E00DC198 .LE00DC298: /* 3D7D08 E00DC298 C4600040 */ lwc1 $f0, 0x40($v1) /* 3D7D0C E00DC29C 4606003C */ c.lt.s $f0, $f6 -/* 3D7D10 E00DC2A0 00000000 */ nop +/* 3D7D10 E00DC2A0 00000000 */ nop /* 3D7D14 E00DC2A4 45000003 */ bc1f .LE00DC2B4 -/* 3D7D18 E00DC2A8 00000000 */ nop +/* 3D7D18 E00DC2A8 00000000 */ nop /* 3D7D1C E00DC2AC 46040000 */ add.s $f0, $f0, $f4 /* 3D7D20 E00DC2B0 E4600040 */ swc1 $f0, 0x40($v1) .LE00DC2B4: diff --git a/asm/nonmatchings/code_3D7A70/func_E00DC2FC.s b/asm/nonmatchings/code_3D7A70/func_E00DC2FC.s index 76b32542ca..d83ee04762 100644 --- a/asm/nonmatchings/code_3D7A70/func_E00DC2FC.s +++ b/asm/nonmatchings/code_3D7A70/func_E00DC2FC.s @@ -3,4 +3,4 @@ glabel func_E00DC2FC /* 3D7D6C E00DC2FC 03E00008 */ jr $ra -/* 3D7D70 E00DC300 00000000 */ nop +/* 3D7D70 E00DC300 00000000 */ nop diff --git a/asm/nonmatchings/code_3D7A70/func_E00DC304.s b/asm/nonmatchings/code_3D7A70/func_E00DC304.s index 13fbd89f1b..c37eb39a80 100644 --- a/asm/nonmatchings/code_3D7A70/func_E00DC304.s +++ b/asm/nonmatchings/code_3D7A70/func_E00DC304.s @@ -38,13 +38,13 @@ glabel func_E00DC304 /* 3D7DF8 E00DC388 ACA70000 */ sw $a3, ($a1) /* 3D7DFC E00DC38C 8CC30010 */ lw $v1, 0x10($a2) /* 3D7E00 E00DC390 46001082 */ mul.s $f2, $f2, $f0 -/* 3D7E04 E00DC394 00000000 */ nop +/* 3D7E04 E00DC394 00000000 */ nop /* 3D7E08 E00DC398 24A20008 */ addiu $v0, $a1, 8 /* 3D7E0C E00DC39C AE820000 */ sw $v0, ($s4) /* 3D7E10 E00DC3A0 8C62001C */ lw $v0, 0x1c($v1) /* 3D7E14 E00DC3A4 3C038000 */ lui $v1, 0x8000 /* 3D7E18 E00DC3A8 46002102 */ mul.s $f4, $f4, $f0 -/* 3D7E1C E00DC3AC 00000000 */ nop +/* 3D7E1C E00DC3AC 00000000 */ nop /* 3D7E20 E00DC3B0 00431021 */ addu $v0, $v0, $v1 /* 3D7E24 E00DC3B4 3C03800B */ lui $v1, %hi(gCameras) /* 3D7E28 E00DC3B8 24631D80 */ addiu $v1, $v1, %lo(gCameras) @@ -207,5 +207,5 @@ glabel func_E00DC304 /* 3D809C E00DC62C 8FB000A0 */ lw $s0, 0xa0($sp) /* 3D80A0 E00DC630 03E00008 */ jr $ra /* 3D80A4 E00DC634 27BD00C8 */ addiu $sp, $sp, 0xc8 -/* 3D80A8 E00DC638 00000000 */ nop -/* 3D80AC E00DC63C 00000000 */ nop +/* 3D80A8 E00DC638 00000000 */ nop +/* 3D80AC E00DC63C 00000000 */ nop diff --git a/asm/nonmatchings/code_3D8720/func_E00DE000.s b/asm/nonmatchings/code_3D8720/func_E00DE000.s index b9aeed23c7..81d9934166 100644 --- a/asm/nonmatchings/code_3D8720/func_E00DE000.s +++ b/asm/nonmatchings/code_3D8720/func_E00DE000.s @@ -40,7 +40,7 @@ glabel func_E00DE000 /* 3D87AC E00DE08C AE02000C */ sw $v0, 0xc($s0) .LE00DE090: /* 3D87B0 E00DE090 08037824 */ j .LE00DE090 -/* 3D87B4 E00DE094 00000000 */ nop +/* 3D87B4 E00DE094 00000000 */ nop .LE00DE098: /* 3D87B8 E00DE098 AC920000 */ sw $s2, ($a0) /* 3D87BC E00DE09C 1E200004 */ bgtz $s1, .LE00DE0B0 diff --git a/asm/nonmatchings/code_3D8720/func_E00DE11C.s b/asm/nonmatchings/code_3D8720/func_E00DE11C.s index ec398639db..83a5ce67de 100644 --- a/asm/nonmatchings/code_3D8720/func_E00DE11C.s +++ b/asm/nonmatchings/code_3D8720/func_E00DE11C.s @@ -3,4 +3,4 @@ glabel func_E00DE11C /* 3D883C E00DE11C 03E00008 */ jr $ra -/* 3D8840 E00DE120 00000000 */ nop +/* 3D8840 E00DE120 00000000 */ nop diff --git a/asm/nonmatchings/code_3D8720/func_E00DE124.s b/asm/nonmatchings/code_3D8720/func_E00DE124.s index d4db72e950..8158b1bc51 100644 --- a/asm/nonmatchings/code_3D8720/func_E00DE124.s +++ b/asm/nonmatchings/code_3D8720/func_E00DE124.s @@ -27,9 +27,9 @@ glabel func_E00DE124 /* 3D8894 E00DE174 04A10005 */ bgez $a1, .LE00DE18C /* 3D8898 E00DE178 AC620014 */ sw $v0, 0x14($v1) /* 3D889C E00DE17C 0C080128 */ jal func_E02004A0 -/* 3D88A0 E00DE180 00000000 */ nop +/* 3D88A0 E00DE180 00000000 */ nop /* 3D88A4 E00DE184 08037895 */ j .LE00DE254 -/* 3D88A8 E00DE188 00000000 */ nop +/* 3D88A8 E00DE188 00000000 */ nop .LE00DE18C: /* 3D88AC E00DE18C 28A20010 */ slti $v0, $a1, 0x10 /* 3D88B0 E00DE190 10400002 */ beqz $v0, .LE00DE19C @@ -38,9 +38,9 @@ glabel func_E00DE124 .LE00DE19C: /* 3D88BC E00DE19C 28C20002 */ slti $v0, $a2, 2 /* 3D88C0 E00DE1A0 1040000A */ beqz $v0, .LE00DE1CC -/* 3D88C4 E00DE1A4 00000000 */ nop +/* 3D88C4 E00DE1A4 00000000 */ nop /* 3D88C8 E00DE1A8 04C00008 */ bltz $a2, .LE00DE1CC -/* 3D88CC E00DE1AC 00000000 */ nop +/* 3D88CC E00DE1AC 00000000 */ nop /* 3D88D0 E00DE1B0 C460003C */ lwc1 $f0, 0x3c($v1) /* 3D88D4 E00DE1B4 3C01E00E */ lui $at, %hi(D_E00DE9D0) /* 3D88D8 E00DE1B8 D422E9D0 */ ldc1 $f2, %lo(D_E00DE9D0)($at) @@ -57,12 +57,12 @@ glabel func_E00DE124 /* 3D8900 E00DE1E0 44801000 */ mtc1 $zero, $f2 /* 3D8904 E00DE1E4 46000021 */ cvt.d.s $f0, $f0 /* 3D8908 E00DE1E8 4620103C */ c.lt.d $f2, $f0 -/* 3D890C E00DE1EC 00000000 */ nop +/* 3D890C E00DE1EC 00000000 */ nop /* 3D8910 E00DE1F0 45000005 */ bc1f .LE00DE208 /* 3D8914 E00DE1F4 E4640008 */ swc1 $f4, 8($v1) /* 3D8918 E00DE1F8 3C013F00 */ lui $at, 0x3f00 /* 3D891C E00DE1FC 44810000 */ mtc1 $at, $f0 -/* 3D8920 E00DE200 00000000 */ nop +/* 3D8920 E00DE200 00000000 */ nop /* 3D8924 E00DE204 E460003C */ swc1 $f0, 0x3c($v1) .LE00DE208: /* 3D8928 E00DE208 C460003C */ lwc1 $f0, 0x3c($v1) @@ -71,18 +71,18 @@ glabel func_E00DE124 /* 3D8934 E00DE214 44801000 */ mtc1 $zero, $f2 /* 3D8938 E00DE218 46000021 */ cvt.d.s $f0, $f0 /* 3D893C E00DE21C 4622003C */ c.lt.d $f0, $f2 -/* 3D8940 E00DE220 00000000 */ nop +/* 3D8940 E00DE220 00000000 */ nop /* 3D8944 E00DE224 45000005 */ bc1f .LE00DE23C -/* 3D8948 E00DE228 00000000 */ nop +/* 3D8948 E00DE228 00000000 */ nop /* 3D894C E00DE22C 3C01BFC0 */ lui $at, 0xbfc0 /* 3D8950 E00DE230 44810000 */ mtc1 $at, $f0 -/* 3D8954 E00DE234 00000000 */ nop +/* 3D8954 E00DE234 00000000 */ nop /* 3D8958 E00DE238 E460003C */ swc1 $f0, 0x3c($v1) .LE00DE23C: /* 3D895C E00DE23C C4600038 */ lwc1 $f0, 0x38($v1) /* 3D8960 E00DE240 3C013F80 */ lui $at, 0x3f80 /* 3D8964 E00DE244 44811000 */ mtc1 $at, $f2 -/* 3D8968 E00DE248 00000000 */ nop +/* 3D8968 E00DE248 00000000 */ nop /* 3D896C E00DE24C 46020000 */ add.s $f0, $f0, $f2 /* 3D8970 E00DE250 E4600038 */ swc1 $f0, 0x38($v1) .LE00DE254: diff --git a/asm/nonmatchings/code_3D8720/func_E00DE2A8.s b/asm/nonmatchings/code_3D8720/func_E00DE2A8.s index b162709755..075a25c135 100644 --- a/asm/nonmatchings/code_3D8720/func_E00DE2A8.s +++ b/asm/nonmatchings/code_3D8720/func_E00DE2A8.s @@ -82,7 +82,7 @@ glabel func_E00DE2A8 /* 3D8AFC E00DE3DC 3C06DA38 */ lui $a2, 0xda38 /* 3D8B00 E00DE3E0 34C60001 */ ori $a2, $a2, 1 /* 3D8B04 E00DE3E4 44950000 */ mtc1 $s5, $f0 -/* 3D8B08 E00DE3E8 00000000 */ nop +/* 3D8B08 E00DE3E8 00000000 */ nop /* 3D8B0C E00DE3EC 46800021 */ cvt.d.w $f0, $f0 /* 3D8B10 E00DE3F0 8E440000 */ lw $a0, ($s2) /* 3D8B14 E00DE3F4 96220000 */ lhu $v0, ($s1) @@ -99,7 +99,7 @@ glabel func_E00DE2A8 /* 3D8B40 E00DE420 00541021 */ addu $v0, $v0, $s4 /* 3D8B44 E00DE424 2487000C */ addiu $a3, $a0, 0xc /* 3D8B48 E00DE428 46220002 */ mul.d $f0, $f0, $f2 -/* 3D8B4C E00DE42C 00000000 */ nop +/* 3D8B4C E00DE42C 00000000 */ nop /* 3D8B50 E00DE430 A6230000 */ sh $v1, ($s1) /* 3D8B54 E00DE434 8E630000 */ lw $v1, ($s3) /* 3D8B58 E00DE438 3C0141E0 */ lui $at, 0x41e0 @@ -124,7 +124,7 @@ glabel func_E00DE2A8 /* 3D8BA4 E00DE484 00822025 */ or $a0, $a0, $v0 /* 3D8BA8 E00DE488 00031A00 */ sll $v1, $v1, 8 /* 3D8BAC E00DE48C 4620103E */ c.le.d $f2, $f0 -/* 3D8BB0 E00DE490 00000000 */ nop +/* 3D8BB0 E00DE490 00000000 */ nop /* 3D8BB4 E00DE494 45010005 */ bc1t .LE00DE4AC /* 3D8BB8 E00DE498 00832025 */ or $a0, $a0, $v1 /* 3D8BBC E00DE49C 4620010D */ trunc.w.d $f4, $f0 @@ -178,7 +178,7 @@ glabel func_E00DE2A8 /* 3D8C70 E00DE550 9042E96C */ lbu $v0, %lo(D_E00DE96C)($v0) /* 3D8C74 E00DE554 44801000 */ mtc1 $zero, $f2 /* 3D8C78 E00DE558 44820000 */ mtc1 $v0, $f0 -/* 3D8C7C E00DE55C 00000000 */ nop +/* 3D8C7C E00DE55C 00000000 */ nop /* 3D8C80 E00DE560 46800020 */ cvt.s.w $f0, $f0 /* 3D8C84 E00DE564 46000007 */ neg.s $f0, $f0 /* 3D8C88 E00DE568 44070000 */ mfc1 $a3, $f0 @@ -191,17 +191,17 @@ glabel func_E00DE2A8 /* 3D8CA4 E00DE584 44810000 */ mtc1 $at, $f0 /* 3D8CA8 E00DE588 00A0302D */ daddu $a2, $a1, $zero /* 3D8CAC E00DE58C 44821000 */ mtc1 $v0, $f2 -/* 3D8CB0 E00DE590 00000000 */ nop +/* 3D8CB0 E00DE590 00000000 */ nop /* 3D8CB4 E00DE594 468010A0 */ cvt.s.w $f2, $f2 /* 3D8CB8 E00DE598 3C02E00E */ lui $v0, %hi(D_E00DE858) /* 3D8CBC E00DE59C 00501021 */ addu $v0, $v0, $s0 /* 3D8CC0 E00DE5A0 8042E858 */ lb $v0, %lo(D_E00DE858)($v0) /* 3D8CC4 E00DE5A4 46001082 */ mul.s $f2, $f2, $f0 -/* 3D8CC8 E00DE5A8 00000000 */ nop +/* 3D8CC8 E00DE5A8 00000000 */ nop /* 3D8CCC E00DE5AC AFA50018 */ sw $a1, 0x18($sp) /* 3D8CD0 E00DE5B0 AFA5001C */ sw $a1, 0x1c($sp) /* 3D8CD4 E00DE5B4 44820000 */ mtc1 $v0, $f0 -/* 3D8CD8 E00DE5B8 00000000 */ nop +/* 3D8CD8 E00DE5B8 00000000 */ nop /* 3D8CDC E00DE5BC 46800020 */ cvt.s.w $f0, $f0 /* 3D8CE0 E00DE5C0 E7A00014 */ swc1 $f0, 0x14($sp) /* 3D8CE4 E00DE5C4 0C080180 */ jal func_E0200600 @@ -238,27 +238,27 @@ glabel func_E00DE2A8 /* 3D8D60 E00DE640 3C0140A0 */ lui $at, 0x40a0 /* 3D8D64 E00DE644 44811000 */ mtc1 $at, $f2 /* 3D8D68 E00DE648 44820000 */ mtc1 $v0, $f0 -/* 3D8D6C E00DE64C 00000000 */ nop +/* 3D8D6C E00DE64C 00000000 */ nop /* 3D8D70 E00DE650 46800020 */ cvt.s.w $f0, $f0 /* 3D8D74 E00DE654 46020002 */ mul.s $f0, $f0, $f2 -/* 3D8D78 E00DE658 00000000 */ nop +/* 3D8D78 E00DE658 00000000 */ nop /* 3D8D7C E00DE65C 3C013B80 */ lui $at, 0x3b80 /* 3D8D80 E00DE660 44811000 */ mtc1 $at, $f2 -/* 3D8D84 E00DE664 00000000 */ nop +/* 3D8D84 E00DE664 00000000 */ nop /* 3D8D88 E00DE668 46020002 */ mul.s $f0, $f0, $f2 -/* 3D8D8C E00DE66C 00000000 */ nop +/* 3D8D8C E00DE66C 00000000 */ nop /* 3D8D90 E00DE670 4600010D */ trunc.w.s $f4, $f0 /* 3D8D94 E00DE674 44082000 */ mfc1 $t0, $f4 -/* 3D8D98 E00DE678 00000000 */ nop +/* 3D8D98 E00DE678 00000000 */ nop /* 3D8D9C E00DE67C 44881000 */ mtc1 $t0, $f2 -/* 3D8DA0 E00DE680 00000000 */ nop +/* 3D8DA0 E00DE680 00000000 */ nop /* 3D8DA4 E00DE684 468010A0 */ cvt.s.w $f2, $f2 /* 3D8DA8 E00DE688 46020001 */ sub.s $f0, $f0, $f2 /* 3D8DAC E00DE68C 3C014380 */ lui $at, 0x4380 /* 3D8DB0 E00DE690 44811000 */ mtc1 $at, $f2 -/* 3D8DB4 E00DE694 00000000 */ nop +/* 3D8DB4 E00DE694 00000000 */ nop /* 3D8DB8 E00DE698 46020002 */ mul.s $f0, $f0, $f2 -/* 3D8DBC E00DE69C 00000000 */ nop +/* 3D8DBC E00DE69C 00000000 */ nop /* 3D8DC0 E00DE6A0 29020004 */ slti $v0, $t0, 4 /* 3D8DC4 E00DE6A4 38430001 */ xori $v1, $v0, 1 /* 3D8DC8 E00DE6A8 29020005 */ slti $v0, $t0, 5 @@ -353,4 +353,4 @@ glabel func_E00DE2A8 /* 3D8F20 E00DE800 8FB000A0 */ lw $s0, 0xa0($sp) /* 3D8F24 E00DE804 03E00008 */ jr $ra /* 3D8F28 E00DE808 27BD00C8 */ addiu $sp, $sp, 0xc8 -/* 3D8F2C E00DE80C 00000000 */ nop +/* 3D8F2C E00DE80C 00000000 */ nop diff --git a/asm/nonmatchings/code_3E0930/func_E00E6000.s b/asm/nonmatchings/code_3E0930/func_E00E6000.s index ba905b5f10..90182afb19 100644 --- a/asm/nonmatchings/code_3E0930/func_E00E6000.s +++ b/asm/nonmatchings/code_3E0930/func_E00E6000.s @@ -44,7 +44,7 @@ glabel func_E00E6000 /* 3E09CC E00E609C AE23000C */ sw $v1, 0xc($s1) .LE00E60A0: /* 3E09D0 E00E60A0 08039828 */ j .LE00E60A0 -/* 3E09D4 E00E60A4 00000000 */ nop +/* 3E09D4 E00E60A4 00000000 */ nop .LE00E60A8: /* 3E09D8 E00E60A8 AC730000 */ sw $s3, ($v1) /* 3E09DC E00E60AC 1E400004 */ bgtz $s2, .LE00E60C0 @@ -72,7 +72,7 @@ glabel func_E00E6000 /* 3E0A2C E00E60FC 44810000 */ mtc1 $at, $f0 /* 3E0A30 E00E6100 0090102A */ slt $v0, $a0, $s0 /* 3E0A34 E00E6104 46001082 */ mul.s $f2, $f2, $f0 -/* 3E0A38 E00E6108 00000000 */ nop +/* 3E0A38 E00E6108 00000000 */ nop /* 3E0A3C E00E610C 10400010 */ beqz $v0, .LE00E6150 /* 3E0A40 E00E6110 24630038 */ addiu $v1, $v1, 0x38 /* 3E0A44 E00E6114 3C01BF80 */ lui $at, 0xbf80 @@ -80,10 +80,10 @@ glabel func_E00E6000 .LE00E611C: /* 3E0A4C E00E611C 30820001 */ andi $v0, $a0, 1 /* 3E0A50 E00E6120 44820000 */ mtc1 $v0, $f0 -/* 3E0A54 E00E6124 00000000 */ nop +/* 3E0A54 E00E6124 00000000 */ nop /* 3E0A58 E00E6128 46800020 */ cvt.s.w $f0, $f0 /* 3E0A5C E00E612C 46001002 */ mul.s $f0, $f2, $f0 -/* 3E0A60 E00E6130 00000000 */ nop +/* 3E0A60 E00E6130 00000000 */ nop /* 3E0A64 E00E6134 46002001 */ sub.s $f0, $f4, $f0 /* 3E0A68 E00E6138 24840001 */ addiu $a0, $a0, 1 /* 3E0A6C E00E613C 0090102A */ slt $v0, $a0, $s0 diff --git a/asm/nonmatchings/code_3E0930/func_E00E617C.s b/asm/nonmatchings/code_3E0930/func_E00E617C.s index 24de3efb90..e69330ba06 100644 --- a/asm/nonmatchings/code_3E0930/func_E00E617C.s +++ b/asm/nonmatchings/code_3E0930/func_E00E617C.s @@ -3,4 +3,4 @@ glabel func_E00E617C /* 3E0AAC E00E617C 03E00008 */ jr $ra -/* 3E0AB0 E00E6180 00000000 */ nop +/* 3E0AB0 E00E6180 00000000 */ nop diff --git a/asm/nonmatchings/code_3E0930/func_E00E6184.s b/asm/nonmatchings/code_3E0930/func_E00E6184.s index 829cb6f3cb..f0c142473f 100644 --- a/asm/nonmatchings/code_3E0930/func_E00E6184.s +++ b/asm/nonmatchings/code_3E0930/func_E00E6184.s @@ -43,7 +43,7 @@ glabel func_E00E6184 /* 3E0B44 E00E6214 0C080128 */ jal func_E02004A0 /* 3E0B48 E00E6218 0240202D */ daddu $a0, $s2, $zero /* 3E0B4C E00E621C 08039925 */ j .LE00E6494 -/* 3E0B50 E00E6220 00000000 */ nop +/* 3E0B50 E00E6220 00000000 */ nop .LE00E6224: /* 3E0B54 E00E6224 0040A82D */ daddu $s5, $v0, $zero /* 3E0B58 E00E6228 28820010 */ slti $v0, $a0, 0x10 @@ -60,12 +60,12 @@ glabel func_E00E6184 /* 3E0B80 E00E6250 3421CCCD */ ori $at, $at, 0xcccd /* 3E0B84 E00E6254 4481B000 */ mtc1 $at, $f22 /* 3E0B88 E00E6258 0803989D */ j .LE00E6274 -/* 3E0B8C E00E625C 00000000 */ nop +/* 3E0B8C E00E625C 00000000 */ nop .LE00E6260: /* 3E0B90 E00E6260 3C013E4C */ lui $at, 0x3e4c /* 3E0B94 E00E6264 3421CCCD */ ori $at, $at, 0xcccd /* 3E0B98 E00E6268 4481B000 */ mtc1 $at, $f22 -/* 3E0B9C E00E626C 00000000 */ nop +/* 3E0B9C E00E626C 00000000 */ nop /* 3E0BA0 E00E6270 4600B606 */ mov.s $f24, $f22 .LE00E6274: /* 3E0BA4 E00E6274 8E420008 */ lw $v0, 8($s2) @@ -98,36 +98,36 @@ glabel func_E00E6184 /* 3E0C08 E00E62D8 0442006A */ bltzl $v0, .LE00E6484 /* 3E0C0C E00E62DC 26310001 */ addiu $s1, $s1, 1 /* 3E0C10 E00E62E0 1440002A */ bnez $v0, .LE00E638C -/* 3E0C14 E00E62E4 00000000 */ nop +/* 3E0C14 E00E62E4 00000000 */ nop /* 3E0C18 E00E62E8 3C0143B4 */ lui $at, 0x43b4 /* 3E0C1C E00E62EC 44810000 */ mtc1 $at, $f0 /* 3E0C20 E00E62F0 4491A000 */ mtc1 $s1, $f20 -/* 3E0C24 E00E62F4 00000000 */ nop +/* 3E0C24 E00E62F4 00000000 */ nop /* 3E0C28 E00E62F8 4680A520 */ cvt.s.w $f20, $f20 /* 3E0C2C E00E62FC 4600A502 */ mul.s $f20, $f20, $f0 -/* 3E0C30 E00E6300 00000000 */ nop +/* 3E0C30 E00E6300 00000000 */ nop /* 3E0C34 E00E6304 8E420008 */ lw $v0, 8($s2) /* 3E0C38 E00E6308 2442FFFF */ addiu $v0, $v0, -1 /* 3E0C3C E00E630C 44820000 */ mtc1 $v0, $f0 -/* 3E0C40 E00E6310 00000000 */ nop +/* 3E0C40 E00E6310 00000000 */ nop /* 3E0C44 E00E6314 46800020 */ cvt.s.w $f0, $f0 /* 3E0C48 E00E6318 4600A503 */ div.s $f20, $f20, $f0 /* 3E0C4C E00E631C 0C080140 */ jal func_E0200500 /* 3E0C50 E00E6320 4600A306 */ mov.s $f12, $f20 /* 3E0C54 E00E6324 461C0002 */ mul.s $f0, $f0, $f28 -/* 3E0C58 E00E6328 00000000 */ nop +/* 3E0C58 E00E6328 00000000 */ nop /* 3E0C5C E00E632C 4600A306 */ mov.s $f12, $f20 /* 3E0C60 E00E6330 0C080144 */ jal func_E0200510 /* 3E0C64 E00E6334 E600FFF0 */ swc1 $f0, -0x10($s0) /* 3E0C68 E00E6338 461C0002 */ mul.s $f0, $f0, $f28 -/* 3E0C6C E00E633C 00000000 */ nop +/* 3E0C6C E00E633C 00000000 */ nop /* 3E0C70 E00E6340 C606FFF0 */ lwc1 $f6, -0x10($s0) /* 3E0C74 E00E6344 46183182 */ mul.s $f6, $f6, $f24 -/* 3E0C78 E00E6348 00000000 */ nop +/* 3E0C78 E00E6348 00000000 */ nop /* 3E0C7C E00E634C E600FFF4 */ swc1 $f0, -0xc($s0) /* 3E0C80 E00E6350 46000106 */ mov.s $f4, $f0 /* 3E0C84 E00E6354 46182102 */ mul.s $f4, $f4, $f24 -/* 3E0C88 E00E6358 00000000 */ nop +/* 3E0C88 E00E6358 00000000 */ nop /* 3E0C8C E00E635C 3C013F80 */ lui $at, 0x3f80 /* 3E0C90 E00E6360 44811000 */ mtc1 $at, $f2 /* 3E0C94 E00E6364 3C014234 */ lui $at, 0x4234 @@ -142,7 +142,7 @@ glabel func_E00E6184 /* 3E0CB8 E00E6388 E6040000 */ swc1 $f4, ($s0) .LE00E638C: /* 3E0CBC E00E638C 16600008 */ bnez $s3, .LE00E63B0 -/* 3E0CC0 E00E6390 00000000 */ nop +/* 3E0CC0 E00E6390 00000000 */ nop /* 3E0CC4 E00E6394 8E02000C */ lw $v0, 0xc($s0) /* 3E0CC8 E00E6398 3C03E00E */ lui $v1, %hi(D_E00E68F8) /* 3E0CCC E00E639C 00621821 */ addu $v1, $v1, $v0 @@ -176,11 +176,11 @@ glabel func_E00E6184 /* 3E0D30 E00E6400 C606FFFC */ lwc1 $f6, -4($s0) /* 3E0D34 E00E6404 460031A1 */ cvt.d.s $f6, $f6 /* 3E0D38 E00E6408 463A3182 */ mul.d $f6, $f6, $f26 -/* 3E0D3C E00E640C 00000000 */ nop +/* 3E0D3C E00E640C 00000000 */ nop /* 3E0D40 E00E6410 C6040000 */ lwc1 $f4, ($s0) /* 3E0D44 E00E6414 46002121 */ cvt.d.s $f4, $f4 /* 3E0D48 E00E6418 463A2102 */ mul.d $f4, $f4, $f26 -/* 3E0D4C E00E641C 00000000 */ nop +/* 3E0D4C E00E641C 00000000 */ nop /* 3E0D50 E00E6420 C600FFF0 */ lwc1 $f0, -0x10($s0) /* 3E0D54 E00E6424 C602FFF4 */ lwc1 $f2, -0xc($s0) /* 3E0D58 E00E6428 46000021 */ cvt.d.s $f0, $f0 @@ -196,12 +196,12 @@ glabel func_E00E6184 /* 3E0D7C E00E644C C606FFFC */ lwc1 $f6, -4($s0) /* 3E0D80 E00E6450 46062101 */ sub.s $f4, $f4, $f6 /* 3E0D84 E00E6454 46162102 */ mul.s $f4, $f4, $f22 -/* 3E0D88 E00E6458 00000000 */ nop +/* 3E0D88 E00E6458 00000000 */ nop /* 3E0D8C E00E645C C6000008 */ lwc1 $f0, 8($s0) /* 3E0D90 E00E6460 C6020000 */ lwc1 $f2, ($s0) /* 3E0D94 E00E6464 46020001 */ sub.s $f0, $f0, $f2 /* 3E0D98 E00E6468 46160002 */ mul.s $f0, $f0, $f22 -/* 3E0D9C E00E646C 00000000 */ nop +/* 3E0D9C E00E646C 00000000 */ nop /* 3E0DA0 E00E6470 46043180 */ add.s $f6, $f6, $f4 /* 3E0DA4 E00E6474 46001080 */ add.s $f2, $f2, $f0 /* 3E0DA8 E00E6478 E606FFFC */ swc1 $f6, -4($s0) diff --git a/asm/nonmatchings/code_3E0930/func_E00E651C.s b/asm/nonmatchings/code_3E0930/func_E00E651C.s index 3d8f181e70..48ca908408 100644 --- a/asm/nonmatchings/code_3E0930/func_E00E651C.s +++ b/asm/nonmatchings/code_3E0930/func_E00E651C.s @@ -3,4 +3,4 @@ glabel func_E00E651C /* 3E0E4C E00E651C 03E00008 */ jr $ra -/* 3E0E50 E00E6520 00000000 */ nop +/* 3E0E50 E00E6520 00000000 */ nop diff --git a/asm/nonmatchings/code_3E0930/func_E00E6524.s b/asm/nonmatchings/code_3E0930/func_E00E6524.s index bab6d8354b..f01ac5cd49 100644 --- a/asm/nonmatchings/code_3E0930/func_E00E6524.s +++ b/asm/nonmatchings/code_3E0930/func_E00E6524.s @@ -217,6 +217,6 @@ glabel func_E00E6524 /* 3E1198 E00E6868 D7B400D0 */ ldc1 $f20, 0xd0($sp) /* 3E119C E00E686C 03E00008 */ jr $ra /* 3E11A0 E00E6870 27BD00D8 */ addiu $sp, $sp, 0xd8 -/* 3E11A4 E00E6874 00000000 */ nop -/* 3E11A8 E00E6878 00000000 */ nop -/* 3E11AC E00E687C 00000000 */ nop +/* 3E11A4 E00E6874 00000000 */ nop +/* 3E11A8 E00E6878 00000000 */ nop +/* 3E11AC E00E687C 00000000 */ nop diff --git a/asm/nonmatchings/code_3E1EE0/func_E00EA000.s b/asm/nonmatchings/code_3E1EE0/func_E00EA000.s index e32a49e39d..38514d186d 100644 --- a/asm/nonmatchings/code_3E1EE0/func_E00EA000.s +++ b/asm/nonmatchings/code_3E1EE0/func_E00EA000.s @@ -40,7 +40,7 @@ glabel func_E00EA000 /* 3E1F6C E00EA08C AE02000C */ sw $v0, 0xc($s0) .LE00EA090: /* 3E1F70 E00EA090 0803A824 */ j .LE00EA090 -/* 3E1F74 E00EA094 00000000 */ nop +/* 3E1F74 E00EA094 00000000 */ nop .LE00EA098: /* 3E1F78 E00EA098 AC920000 */ sw $s2, ($a0) /* 3E1F7C E00EA09C 1E200004 */ bgtz $s1, .LE00EA0B0 diff --git a/asm/nonmatchings/code_3E1EE0/func_E00EA190.s b/asm/nonmatchings/code_3E1EE0/func_E00EA190.s index 183cba5e96..2ef6a17367 100644 --- a/asm/nonmatchings/code_3E1EE0/func_E00EA190.s +++ b/asm/nonmatchings/code_3E1EE0/func_E00EA190.s @@ -3,4 +3,4 @@ glabel func_E00EA190 /* 3E2070 E00EA190 03E00008 */ jr $ra -/* 3E2074 E00EA194 00000000 */ nop +/* 3E2074 E00EA194 00000000 */ nop diff --git a/asm/nonmatchings/code_3E1EE0/func_E00EA198.s b/asm/nonmatchings/code_3E1EE0/func_E00EA198.s index b10e77ae81..d7d60ff636 100644 --- a/asm/nonmatchings/code_3E1EE0/func_E00EA198.s +++ b/asm/nonmatchings/code_3E1EE0/func_E00EA198.s @@ -38,9 +38,9 @@ glabel func_E00EA198 /* 3E20F0 E00EA210 04610005 */ bgez $v1, .LE00EA228 /* 3E20F4 E00EA214 28620010 */ slti $v0, $v1, 0x10 /* 3E20F8 E00EA218 0C080128 */ jal func_E02004A0 -/* 3E20FC E00EA21C 00000000 */ nop +/* 3E20FC E00EA21C 00000000 */ nop /* 3E2100 E00EA220 0803A940 */ j .LE00EA500 -/* 3E2104 E00EA224 00000000 */ nop +/* 3E2104 E00EA224 00000000 */ nop .LE00EA228: /* 3E2108 E00EA228 8E040014 */ lw $a0, 0x14($s0) /* 3E210C E00EA22C 10400002 */ beqz $v0, .LE00EA238 @@ -60,37 +60,37 @@ glabel func_E00EA198 /* 3E213C E00EA25C D438AA60 */ ldc1 $f24, %lo(D_E00EAA60)($at) /* 3E2140 E00EA260 460073A1 */ cvt.d.s $f14, $f14 /* 3E2144 E00EA264 46387382 */ mul.d $f14, $f14, $f24 -/* 3E2148 E00EA268 00000000 */ nop +/* 3E2148 E00EA268 00000000 */ nop /* 3E214C E00EA26C C60C004C */ lwc1 $f12, 0x4c($s0) /* 3E2150 E00EA270 C608006C */ lwc1 $f8, 0x6c($s0) /* 3E2154 E00EA274 460C4201 */ sub.s $f8, $f8, $f12 /* 3E2158 E00EA278 46004221 */ cvt.d.s $f8, $f8 /* 3E215C E00EA27C 46384202 */ mul.d $f8, $f8, $f24 -/* 3E2160 E00EA280 00000000 */ nop +/* 3E2160 E00EA280 00000000 */ nop /* 3E2164 E00EA284 C60A0058 */ lwc1 $f10, 0x58($s0) /* 3E2168 E00EA288 C6040070 */ lwc1 $f4, 0x70($s0) /* 3E216C E00EA28C 460A2101 */ sub.s $f4, $f4, $f10 /* 3E2170 E00EA290 46002121 */ cvt.d.s $f4, $f4 /* 3E2174 E00EA294 46382102 */ mul.d $f4, $f4, $f24 -/* 3E2178 E00EA298 00000000 */ nop +/* 3E2178 E00EA298 00000000 */ nop /* 3E217C E00EA29C C610005C */ lwc1 $f16, 0x5c($s0) /* 3E2180 E00EA2A0 C6060074 */ lwc1 $f6, 0x74($s0) /* 3E2184 E00EA2A4 46103181 */ sub.s $f6, $f6, $f16 /* 3E2188 E00EA2A8 460031A1 */ cvt.d.s $f6, $f6 /* 3E218C E00EA2AC 46383182 */ mul.d $f6, $f6, $f24 -/* 3E2190 E00EA2B0 00000000 */ nop +/* 3E2190 E00EA2B0 00000000 */ nop /* 3E2194 E00EA2B4 C6140060 */ lwc1 $f20, 0x60($s0) /* 3E2198 E00EA2B8 C6020078 */ lwc1 $f2, 0x78($s0) /* 3E219C E00EA2BC 46141081 */ sub.s $f2, $f2, $f20 /* 3E21A0 E00EA2C0 460010A1 */ cvt.d.s $f2, $f2 /* 3E21A4 E00EA2C4 46381082 */ mul.d $f2, $f2, $f24 -/* 3E21A8 E00EA2C8 00000000 */ nop +/* 3E21A8 E00EA2C8 00000000 */ nop /* 3E21AC E00EA2CC C6160064 */ lwc1 $f22, 0x64($s0) /* 3E21B0 E00EA2D0 C600007C */ lwc1 $f0, 0x7c($s0) /* 3E21B4 E00EA2D4 46160001 */ sub.s $f0, $f0, $f22 /* 3E21B8 E00EA2D8 46000021 */ cvt.d.s $f0, $f0 /* 3E21BC E00EA2DC 46380002 */ mul.d $f0, $f0, $f24 -/* 3E21C0 E00EA2E0 00000000 */ nop +/* 3E21C0 E00EA2E0 00000000 */ nop /* 3E21C4 E00EA2E4 460094A1 */ cvt.d.s $f18, $f18 /* 3E21C8 E00EA2E8 462E9480 */ add.d $f18, $f18, $f14 /* 3E21CC E00EA2EC 46006321 */ cvt.d.s $f12, $f12 @@ -140,73 +140,73 @@ glabel func_E00EA198 /* 3E227C E00EA39C E6020054 */ swc1 $f2, 0x54($s0) /* 3E2280 E00EA3A0 3C014380 */ lui $at, 0x4380 /* 3E2284 E00EA3A4 44810000 */ mtc1 $at, $f0 -/* 3E2288 E00EA3A8 00000000 */ nop +/* 3E2288 E00EA3A8 00000000 */ nop /* 3E228C E00EA3AC 46003000 */ add.s $f0, $f6, $f0 /* 3E2290 E00EA3B0 E6000040 */ swc1 $f0, 0x40($s0) .LE00EA3B4: /* 3E2294 E00EA3B4 C6020044 */ lwc1 $f2, 0x44($s0) /* 3E2298 E00EA3B8 460A103C */ c.lt.s $f2, $f10 -/* 3E229C E00EA3BC 00000000 */ nop +/* 3E229C E00EA3BC 00000000 */ nop /* 3E22A0 E00EA3C0 45000006 */ bc1f .LE00EA3DC -/* 3E22A4 E00EA3C4 00000000 */ nop +/* 3E22A4 E00EA3C4 00000000 */ nop /* 3E22A8 E00EA3C8 3C014380 */ lui $at, 0x4380 /* 3E22AC E00EA3CC 44810000 */ mtc1 $at, $f0 -/* 3E22B0 E00EA3D0 00000000 */ nop +/* 3E22B0 E00EA3D0 00000000 */ nop /* 3E22B4 E00EA3D4 46001000 */ add.s $f0, $f2, $f0 /* 3E22B8 E00EA3D8 E6000044 */ swc1 $f0, 0x44($s0) .LE00EA3DC: /* 3E22BC E00EA3DC C6020050 */ lwc1 $f2, 0x50($s0) /* 3E22C0 E00EA3E0 460A103C */ c.lt.s $f2, $f10 -/* 3E22C4 E00EA3E4 00000000 */ nop +/* 3E22C4 E00EA3E4 00000000 */ nop /* 3E22C8 E00EA3E8 45000006 */ bc1f .LE00EA404 -/* 3E22CC E00EA3EC 00000000 */ nop +/* 3E22CC E00EA3EC 00000000 */ nop /* 3E22D0 E00EA3F0 3C014380 */ lui $at, 0x4380 /* 3E22D4 E00EA3F4 44810000 */ mtc1 $at, $f0 -/* 3E22D8 E00EA3F8 00000000 */ nop +/* 3E22D8 E00EA3F8 00000000 */ nop /* 3E22DC E00EA3FC 46001000 */ add.s $f0, $f2, $f0 /* 3E22E0 E00EA400 E6000050 */ swc1 $f0, 0x50($s0) .LE00EA404: /* 3E22E4 E00EA404 C6020054 */ lwc1 $f2, 0x54($s0) /* 3E22E8 E00EA408 460A103C */ c.lt.s $f2, $f10 -/* 3E22EC E00EA40C 00000000 */ nop +/* 3E22EC E00EA40C 00000000 */ nop /* 3E22F0 E00EA410 45000006 */ bc1f .LE00EA42C -/* 3E22F4 E00EA414 00000000 */ nop +/* 3E22F4 E00EA414 00000000 */ nop /* 3E22F8 E00EA418 3C014380 */ lui $at, 0x4380 /* 3E22FC E00EA41C 44810000 */ mtc1 $at, $f0 -/* 3E2300 E00EA420 00000000 */ nop +/* 3E2300 E00EA420 00000000 */ nop /* 3E2304 E00EA424 46001000 */ add.s $f0, $f2, $f0 /* 3E2308 E00EA428 E6000054 */ swc1 $f0, 0x54($s0) .LE00EA42C: /* 3E230C E00EA42C C6000040 */ lwc1 $f0, 0x40($s0) /* 3E2310 E00EA430 3C014380 */ lui $at, 0x4380 /* 3E2314 E00EA434 44811000 */ mtc1 $at, $f2 -/* 3E2318 E00EA438 00000000 */ nop +/* 3E2318 E00EA438 00000000 */ nop /* 3E231C E00EA43C 4600103C */ c.lt.s $f2, $f0 -/* 3E2320 E00EA440 00000000 */ nop +/* 3E2320 E00EA440 00000000 */ nop /* 3E2324 E00EA444 45000003 */ bc1f .LE00EA454 -/* 3E2328 E00EA448 00000000 */ nop +/* 3E2328 E00EA448 00000000 */ nop /* 3E232C E00EA44C 46020001 */ sub.s $f0, $f0, $f2 /* 3E2330 E00EA450 E6000040 */ swc1 $f0, 0x40($s0) .LE00EA454: /* 3E2334 E00EA454 C6000044 */ lwc1 $f0, 0x44($s0) /* 3E2338 E00EA458 4600103C */ c.lt.s $f2, $f0 -/* 3E233C E00EA45C 00000000 */ nop +/* 3E233C E00EA45C 00000000 */ nop /* 3E2340 E00EA460 45000003 */ bc1f .LE00EA470 -/* 3E2344 E00EA464 00000000 */ nop +/* 3E2344 E00EA464 00000000 */ nop /* 3E2348 E00EA468 46020001 */ sub.s $f0, $f0, $f2 /* 3E234C E00EA46C E6000044 */ swc1 $f0, 0x44($s0) .LE00EA470: /* 3E2350 E00EA470 C6000050 */ lwc1 $f0, 0x50($s0) /* 3E2354 E00EA474 4600103C */ c.lt.s $f2, $f0 -/* 3E2358 E00EA478 00000000 */ nop +/* 3E2358 E00EA478 00000000 */ nop /* 3E235C E00EA47C 45000003 */ bc1f .LE00EA48C -/* 3E2360 E00EA480 00000000 */ nop +/* 3E2360 E00EA480 00000000 */ nop /* 3E2364 E00EA484 46020001 */ sub.s $f0, $f0, $f2 /* 3E2368 E00EA488 E6000050 */ swc1 $f0, 0x50($s0) .LE00EA48C: /* 3E236C E00EA48C C6000054 */ lwc1 $f0, 0x54($s0) /* 3E2370 E00EA490 4600103C */ c.lt.s $f2, $f0 -/* 3E2374 E00EA494 00000000 */ nop +/* 3E2374 E00EA494 00000000 */ nop /* 3E2378 E00EA498 45000003 */ bc1f .LE00EA4A8 /* 3E237C E00EA49C 00041080 */ sll $v0, $a0, 2 /* 3E2380 E00EA4A0 46020001 */ sub.s $f0, $f0, $f2 @@ -215,21 +215,21 @@ glabel func_E00EA198 /* 3E2388 E00EA4A8 00441021 */ addu $v0, $v0, $a0 /* 3E238C E00EA4AC 00021080 */ sll $v0, $v0, 2 /* 3E2390 E00EA4B0 44826000 */ mtc1 $v0, $f12 -/* 3E2394 E00EA4B4 00000000 */ nop +/* 3E2394 E00EA4B4 00000000 */ nop /* 3E2398 E00EA4B8 0C080140 */ jal func_E0200500 /* 3E239C E00EA4BC 46806320 */ cvt.s.w $f12, $f12 /* 3E23A0 E00EA4C0 C6040060 */ lwc1 $f4, 0x60($s0) /* 3E23A4 E00EA4C4 C6020064 */ lwc1 $f2, 0x64($s0) /* 3E23A8 E00EA4C8 46041081 */ sub.s $f2, $f2, $f4 /* 3E23AC E00EA4CC 46020002 */ mul.s $f0, $f0, $f2 -/* 3E23B0 E00EA4D0 00000000 */ nop +/* 3E23B0 E00EA4D0 00000000 */ nop /* 3E23B4 E00EA4D4 46020000 */ add.s $f0, $f0, $f2 /* 3E23B8 E00EA4D8 3C013FE0 */ lui $at, 0x3fe0 /* 3E23BC E00EA4DC 44811800 */ mtc1 $at, $f3 /* 3E23C0 E00EA4E0 44801000 */ mtc1 $zero, $f2 /* 3E23C4 E00EA4E4 46000021 */ cvt.d.s $f0, $f0 /* 3E23C8 E00EA4E8 46220002 */ mul.d $f0, $f0, $f2 -/* 3E23CC E00EA4EC 00000000 */ nop +/* 3E23CC E00EA4EC 00000000 */ nop /* 3E23D0 E00EA4F0 46002121 */ cvt.d.s $f4, $f4 /* 3E23D4 E00EA4F4 46202100 */ add.d $f4, $f4, $f0 /* 3E23D8 E00EA4F8 4620268D */ trunc.w.d $f26, $f4 diff --git a/asm/nonmatchings/code_3E1EE0/func_E00EA520.s b/asm/nonmatchings/code_3E1EE0/func_E00EA520.s index ba6a66e17e..2f18fdd7d4 100644 --- a/asm/nonmatchings/code_3E1EE0/func_E00EA520.s +++ b/asm/nonmatchings/code_3E1EE0/func_E00EA520.s @@ -39,11 +39,11 @@ glabel func_E00EA520 /* 3E2488 E00EA5A8 3C01459C */ lui $at, 0x459c /* 3E248C E00EA5AC 34214000 */ ori $at, $at, 0x4000 /* 3E2490 E00EA5B0 44811000 */ mtc1 $at, $f2 -/* 3E2494 E00EA5B4 00000000 */ nop +/* 3E2494 E00EA5B4 00000000 */ nop /* 3E2498 E00EA5B8 46020000 */ add.s $f0, $f0, $f2 /* 3E249C E00EA5BC 4600010D */ trunc.w.s $f4, $f0 /* 3E24A0 E00EA5C0 44032000 */ mfc1 $v1, $f4 -/* 3E24A4 E00EA5C4 00000000 */ nop +/* 3E24A4 E00EA5C4 00000000 */ nop /* 3E24A8 E00EA5C8 04610003 */ bgez $v1, .LE00EA5D8 /* 3E24AC E00EA5CC 27B00028 */ addiu $s0, $sp, 0x28 /* 3E24B0 E00EA5D0 0803A979 */ j .LE00EA5E4 @@ -58,13 +58,13 @@ glabel func_E00EA520 /* 3E24CC E00EA5EC D420AA68 */ ldc1 $f0, %lo(D_E00EAA68)($at) /* 3E24D0 E00EA5F0 460010A1 */ cvt.d.s $f2, $f2 /* 3E24D4 E00EA5F4 4620103C */ c.lt.d $f2, $f0 -/* 3E24D8 E00EA5F8 00000000 */ nop +/* 3E24D8 E00EA5F8 00000000 */ nop /* 3E24DC E00EA5FC 45000008 */ bc1f .LE00EA620 /* 3E24E0 E00EA600 0200202D */ daddu $a0, $s0, $zero /* 3E24E4 E00EA604 3C01E00F */ lui $at, %hi(D_E00EAA70) /* 3E24E8 E00EA608 D420AA70 */ ldc1 $f0, %lo(D_E00EAA70)($at) /* 3E24EC E00EA60C 4622003C */ c.lt.d $f0, $f2 -/* 3E24F0 E00EA610 00000000 */ nop +/* 3E24F0 E00EA610 00000000 */ nop /* 3E24F4 E00EA614 45030002 */ bc1tl .LE00EA620 /* 3E24F8 E00EA618 0000182D */ daddu $v1, $zero, $zero /* 3E24FC E00EA61C 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/code_3E1EE0/func_E00EA664.s b/asm/nonmatchings/code_3E1EE0/func_E00EA664.s index eab7982fd8..59bad75e14 100644 --- a/asm/nonmatchings/code_3E1EE0/func_E00EA664.s +++ b/asm/nonmatchings/code_3E1EE0/func_E00EA664.s @@ -3,4 +3,4 @@ glabel func_E00EA664 /* 3E2544 E00EA664 03E00008 */ jr $ra -/* 3E2548 E00EA668 00000000 */ nop +/* 3E2548 E00EA668 00000000 */ nop diff --git a/asm/nonmatchings/code_3E1EE0/func_E00EA66C.s b/asm/nonmatchings/code_3E1EE0/func_E00EA66C.s index 6a01528c06..2e1eb35ed9 100644 --- a/asm/nonmatchings/code_3E1EE0/func_E00EA66C.s +++ b/asm/nonmatchings/code_3E1EE0/func_E00EA66C.s @@ -31,26 +31,26 @@ glabel func_E00EA66C /* 3E25B4 E00EA6D4 C6620040 */ lwc1 $f2, 0x40($s3) /* 3E25B8 E00EA6D8 3C02E700 */ lui $v0, 0xe700 /* 3E25BC E00EA6DC 46001082 */ mul.s $f2, $f2, $f0 -/* 3E25C0 E00EA6E0 00000000 */ nop +/* 3E25C0 E00EA6E0 00000000 */ nop /* 3E25C4 E00EA6E4 3C08800B */ lui $t0, %hi(gCameras) /* 3E25C8 E00EA6E8 25081D80 */ addiu $t0, $t0, %lo(gCameras) /* 3E25CC E00EA6EC C6640044 */ lwc1 $f4, 0x44($s3) /* 3E25D0 E00EA6F0 C6660050 */ lwc1 $f6, 0x50($s3) /* 3E25D4 E00EA6F4 C6680054 */ lwc1 $f8, 0x54($s3) /* 3E25D8 E00EA6F8 46002102 */ mul.s $f4, $f4, $f0 -/* 3E25DC E00EA6FC 00000000 */ nop +/* 3E25DC E00EA6FC 00000000 */ nop /* 3E25E0 E00EA700 ACA20000 */ sw $v0, ($a1) /* 3E25E4 E00EA704 24620008 */ addiu $v0, $v1, 8 /* 3E25E8 E00EA708 ACA00004 */ sw $zero, 4($a1) /* 3E25EC E00EA70C AE820000 */ sw $v0, ($s4) /* 3E25F0 E00EA710 46003182 */ mul.s $f6, $f6, $f0 -/* 3E25F4 E00EA714 00000000 */ nop +/* 3E25F4 E00EA714 00000000 */ nop /* 3E25F8 E00EA718 AC670000 */ sw $a3, ($v1) /* 3E25FC E00EA71C 8CC20010 */ lw $v0, 0x10($a2) /* 3E2600 E00EA720 3C058000 */ lui $a1, 0x8000 /* 3E2604 E00EA724 8C42001C */ lw $v0, 0x1c($v0) /* 3E2608 E00EA728 46004202 */ mul.s $f8, $f8, $f0 -/* 3E260C E00EA72C 00000000 */ nop +/* 3E260C E00EA72C 00000000 */ nop /* 3E2610 E00EA730 00451021 */ addu $v0, $v0, $a1 /* 3E2614 E00EA734 AC620004 */ sw $v0, 4($v1) /* 3E2618 E00EA738 8E650004 */ lw $a1, 4($s3) @@ -250,5 +250,5 @@ glabel func_E00EA66C /* 3E291C E00EAA3C 8FB000A0 */ lw $s0, 0xa0($sp) /* 3E2920 E00EAA40 03E00008 */ jr $ra /* 3E2924 E00EAA44 27BD00C8 */ addiu $sp, $sp, 0xc8 -/* 3E2928 E00EAA48 00000000 */ nop -/* 3E292C E00EAA4C 00000000 */ nop +/* 3E2928 E00EAA48 00000000 */ nop +/* 3E292C E00EAA4C 00000000 */ nop diff --git a/asm/nonmatchings/code_3E43A0/func_E010A000.s b/asm/nonmatchings/code_3E43A0/func_E010A000.s index 2cdb8840e9..4a505cf2e2 100644 --- a/asm/nonmatchings/code_3E43A0/func_E010A000.s +++ b/asm/nonmatchings/code_3E43A0/func_E010A000.s @@ -40,7 +40,7 @@ glabel func_E010A000 /* 3E442C E010A08C AE02000C */ sw $v0, 0xc($s0) .LE010A090: /* 3E4430 E010A090 08042824 */ j .LE010A090 -/* 3E4434 E010A094 00000000 */ nop +/* 3E4434 E010A094 00000000 */ nop .LE010A098: /* 3E4438 E010A098 AC920000 */ sw $s2, ($a0) /* 3E443C E010A09C 1E200003 */ bgtz $s1, .LE010A0AC diff --git a/asm/nonmatchings/code_3E43A0/func_E010A184.s b/asm/nonmatchings/code_3E43A0/func_E010A184.s index 80ad7d21bd..289da916fe 100644 --- a/asm/nonmatchings/code_3E43A0/func_E010A184.s +++ b/asm/nonmatchings/code_3E43A0/func_E010A184.s @@ -3,4 +3,4 @@ glabel func_E010A184 /* 3E4524 E010A184 03E00008 */ jr $ra -/* 3E4528 E010A188 00000000 */ nop +/* 3E4528 E010A188 00000000 */ nop diff --git a/asm/nonmatchings/code_3E43A0/func_E010A18C.s b/asm/nonmatchings/code_3E43A0/func_E010A18C.s index 3f7ff26a77..ddde276d41 100644 --- a/asm/nonmatchings/code_3E43A0/func_E010A18C.s +++ b/asm/nonmatchings/code_3E43A0/func_E010A18C.s @@ -30,9 +30,9 @@ glabel func_E010A18C /* 3E4588 E010A1E8 04A10005 */ bgez $a1, .LE010A200 /* 3E458C E010A1EC AE220020 */ sw $v0, 0x20($s1) /* 3E4590 E010A1F0 0C080128 */ jal func_E02004A0 -/* 3E4594 E010A1F4 00000000 */ nop +/* 3E4594 E010A1F4 00000000 */ nop /* 3E4598 E010A1F8 08042921 */ j .LE010A484 -/* 3E459C E010A1FC 00000000 */ nop +/* 3E459C E010A1FC 00000000 */ nop .LE010A200: /* 3E45A0 E010A200 0040902D */ daddu $s2, $v0, $zero /* 3E45A4 E010A204 28A20020 */ slti $v0, $a1, 0x20 @@ -51,16 +51,16 @@ glabel func_E010A18C /* 3E45D4 E010A234 D420AF90 */ ldc1 $f0, %lo(D_E010AF90)($at) /* 3E45D8 E010A238 46002121 */ cvt.d.s $f4, $f4 /* 3E45DC E010A23C 46202102 */ mul.d $f4, $f4, $f0 -/* 3E45E0 E010A240 00000000 */ nop +/* 3E45E0 E010A240 00000000 */ nop /* 3E45E4 E010A244 3C013F73 */ lui $at, 0x3f73 /* 3E45E8 E010A248 34213333 */ ori $at, $at, 0x3333 /* 3E45EC E010A24C 44818000 */ mtc1 $at, $f16 /* 3E45F0 E010A250 C62E0010 */ lwc1 $f14, 0x10($s1) /* 3E45F4 E010A254 46107382 */ mul.s $f14, $f14, $f16 -/* 3E45F8 E010A258 00000000 */ nop +/* 3E45F8 E010A258 00000000 */ nop /* 3E45FC E010A25C C62C0018 */ lwc1 $f12, 0x18($s1) /* 3E4600 E010A260 46106302 */ mul.s $f12, $f12, $f16 -/* 3E4604 E010A264 00000000 */ nop +/* 3E4604 E010A264 00000000 */ nop /* 3E4608 E010A268 C62A0004 */ lwc1 $f10, 4($s1) /* 3E460C E010A26C C6200010 */ lwc1 $f0, 0x10($s1) /* 3E4610 E010A270 C6280008 */ lwc1 $f8, 8($s1) @@ -75,7 +75,7 @@ glabel func_E010A18C /* 3E4634 E010A294 E62E0010 */ swc1 $f14, 0x10($s1) /* 3E4638 E010A298 E62C0018 */ swc1 $f12, 0x18($s1) /* 3E463C E010A29C 46100002 */ mul.s $f0, $f0, $f16 -/* 3E4640 E010A2A0 00000000 */ nop +/* 3E4640 E010A2A0 00000000 */ nop /* 3E4644 E010A2A4 E62A0004 */ swc1 $f10, 4($s1) /* 3E4648 E010A2A8 E6280008 */ swc1 $f8, 8($s1) /* 3E464C E010A2AC E622000C */ swc1 $f2, 0xc($s1) @@ -93,7 +93,7 @@ glabel func_E010A18C .LE010A2DC: /* 3E467C E010A2DC 00521023 */ subu $v0, $v0, $s2 /* 3E4680 E010A2E0 4482A000 */ mtc1 $v0, $f20 -/* 3E4684 E010A2E4 00000000 */ nop +/* 3E4684 E010A2E4 00000000 */ nop /* 3E4688 E010A2E8 4680A520 */ cvt.s.w $f20, $f20 /* 3E468C E010A2EC 32440003 */ andi $a0, $s2, 3 /* 3E4690 E010A2F0 00048080 */ sll $s0, $a0, 2 @@ -102,7 +102,7 @@ glabel func_E010A18C /* 3E469C E010A2FC C6200010 */ lwc1 $f0, 0x10($s1) /* 3E46A0 E010A300 00721821 */ addu $v1, $v1, $s2 /* 3E46A4 E010A304 46140002 */ mul.s $f0, $f0, $f20 -/* 3E46A8 E010A308 00000000 */ nop +/* 3E46A8 E010A308 00000000 */ nop /* 3E46AC E010A30C 00031100 */ sll $v0, $v1, 4 /* 3E46B0 E010A310 00431023 */ subu $v0, $v0, $v1 /* 3E46B4 E010A314 C6220004 */ lwc1 $f2, 4($s1) @@ -110,18 +110,18 @@ glabel func_E010A18C /* 3E46BC E010A31C 46001081 */ sub.s $f2, $f2, $f0 /* 3E46C0 E010A320 00021143 */ sra $v0, $v0, 5 /* 3E46C4 E010A324 44826000 */ mtc1 $v0, $f12 -/* 3E46C8 E010A328 00000000 */ nop +/* 3E46C8 E010A328 00000000 */ nop /* 3E46CC E010A32C 46806320 */ cvt.s.w $f12, $f12 /* 3E46D0 E010A330 0C080140 */ jal func_E0200500 /* 3E46D4 E010A334 E6020050 */ swc1 $f2, 0x50($s0) /* 3E46D8 E010A338 C6260014 */ lwc1 $f6, 0x14($s1) /* 3E46DC E010A33C 46143182 */ mul.s $f6, $f6, $f20 -/* 3E46E0 E010A340 00000000 */ nop +/* 3E46E0 E010A340 00000000 */ nop /* 3E46E4 E010A344 3C0142A0 */ lui $at, 0x42a0 /* 3E46E8 E010A348 44812000 */ mtc1 $at, $f4 -/* 3E46EC E010A34C 00000000 */ nop +/* 3E46EC E010A34C 00000000 */ nop /* 3E46F0 E010A350 46040002 */ mul.s $f0, $f0, $f4 -/* 3E46F4 E010A354 00000000 */ nop +/* 3E46F4 E010A354 00000000 */ nop /* 3E46F8 E010A358 C6220008 */ lwc1 $f2, 8($s1) /* 3E46FC E010A35C 46061081 */ sub.s $f2, $f2, $f6 /* 3E4700 E010A360 46002101 */ sub.s $f4, $f4, $f0 @@ -129,7 +129,7 @@ glabel func_E010A18C /* 3E4708 E010A368 E6020060 */ swc1 $f2, 0x60($s0) /* 3E470C E010A36C C6200018 */ lwc1 $f0, 0x18($s1) /* 3E4710 E010A370 46140002 */ mul.s $f0, $f0, $f20 -/* 3E4714 E010A374 00000000 */ nop +/* 3E4714 E010A374 00000000 */ nop /* 3E4718 E010A378 C622000C */ lwc1 $f2, 0xc($s1) /* 3E471C E010A37C 46001081 */ sub.s $f2, $f2, $f0 /* 3E4720 E010A380 2404000A */ addiu $a0, $zero, 0xa @@ -140,29 +140,29 @@ glabel func_E010A18C /* 3E4734 E010A394 3421CCCD */ ori $at, $at, 0xcccd /* 3E4738 E010A398 4481A000 */ mtc1 $at, $f20 /* 3E473C E010A39C 44820000 */ mtc1 $v0, $f0 -/* 3E4740 E010A3A0 00000000 */ nop +/* 3E4740 E010A3A0 00000000 */ nop /* 3E4744 E010A3A4 46800020 */ cvt.s.w $f0, $f0 /* 3E4748 E010A3A8 46140002 */ mul.s $f0, $f0, $f20 -/* 3E474C E010A3AC 00000000 */ nop +/* 3E474C E010A3AC 00000000 */ nop /* 3E4750 E010A3B0 2404000A */ addiu $a0, $zero, 0xa /* 3E4754 E010A3B4 0C080138 */ jal func_E02004E0 /* 3E4758 E010A3B8 E6000080 */ swc1 $f0, 0x80($s0) /* 3E475C E010A3BC 2442FFFB */ addiu $v0, $v0, -5 /* 3E4760 E010A3C0 44820000 */ mtc1 $v0, $f0 -/* 3E4764 E010A3C4 00000000 */ nop +/* 3E4764 E010A3C4 00000000 */ nop /* 3E4768 E010A3C8 46800020 */ cvt.s.w $f0, $f0 /* 3E476C E010A3CC 46140002 */ mul.s $f0, $f0, $f20 -/* 3E4770 E010A3D0 00000000 */ nop +/* 3E4770 E010A3D0 00000000 */ nop /* 3E4774 E010A3D4 2404000A */ addiu $a0, $zero, 0xa /* 3E4778 E010A3D8 0C080138 */ jal func_E02004E0 /* 3E477C E010A3DC E6000090 */ swc1 $f0, 0x90($s0) /* 3E4780 E010A3E0 0000202D */ daddu $a0, $zero, $zero /* 3E4784 E010A3E4 2442FFFB */ addiu $v0, $v0, -5 /* 3E4788 E010A3E8 44820000 */ mtc1 $v0, $f0 -/* 3E478C E010A3EC 00000000 */ nop +/* 3E478C E010A3EC 00000000 */ nop /* 3E4790 E010A3F0 46800020 */ cvt.s.w $f0, $f0 /* 3E4794 E010A3F4 46140002 */ mul.s $f0, $f0, $f20 -/* 3E4798 E010A3F8 00000000 */ nop +/* 3E4798 E010A3F8 00000000 */ nop /* 3E479C E010A3FC 2A45001B */ slti $a1, $s2, 0x1b /* 3E47A0 E010A400 3C01E011 */ lui $at, %hi(D_E010AFA0) /* 3E47A4 E010A404 D42AAFA0 */ ldc1 $f10, %lo(D_E010AFA0)($at) diff --git a/asm/nonmatchings/code_3E43A0/func_E010A4E8.s b/asm/nonmatchings/code_3E43A0/func_E010A4E8.s index 3d6492fc96..fb6f41cf9c 100644 --- a/asm/nonmatchings/code_3E43A0/func_E010A4E8.s +++ b/asm/nonmatchings/code_3E43A0/func_E010A4E8.s @@ -60,7 +60,7 @@ glabel func_E010A4E8 /* 3E4964 E010A5C4 C6000000 */ lwc1 $f0, ($s0) /* 3E4968 E010A5C8 46800021 */ cvt.d.w $f0, $f0 /* 3E496C E010A5CC 46220002 */ mul.d $f0, $f0, $f2 -/* 3E4970 E010A5D0 00000000 */ nop +/* 3E4970 E010A5D0 00000000 */ nop /* 3E4974 E010A5D4 0080282D */ daddu $a1, $a0, $zero /* 3E4978 E010A5D8 24060136 */ addiu $a2, $zero, 0x136 /* 3E497C E010A5DC 240700E6 */ addiu $a3, $zero, 0xe6 @@ -199,7 +199,7 @@ glabel func_E010A4E8 .LE010A7E0: /* 3E4B80 E010A7E0 24020001 */ addiu $v0, $zero, 1 /* 3E4B84 E010A7E4 17C20030 */ bne $fp, $v0, .LE010A8A8 -/* 3E4B88 E010A7E8 00000000 */ nop +/* 3E4B88 E010A7E8 00000000 */ nop /* 3E4B8C E010A7EC 0C080138 */ jal func_E02004E0 /* 3E4B90 E010A7F0 24040010 */ addiu $a0, $zero, 0x10 /* 3E4B94 E010A7F4 28420006 */ slti $v0, $v0, 6 @@ -208,38 +208,38 @@ glabel func_E010A4E8 /* 3E4BA0 E010A800 82830000 */ lb $v1, ($s4) /* 3E4BA4 E010A804 C7AE005C */ lwc1 $f14, 0x5c($sp) /* 3E4BA8 E010A808 44832000 */ mtc1 $v1, $f4 -/* 3E4BAC E010A80C 00000000 */ nop +/* 3E4BAC E010A80C 00000000 */ nop /* 3E4BB0 E010A810 46802120 */ cvt.s.w $f4, $f4 /* 3E4BB4 E010A814 460E2102 */ mul.s $f4, $f4, $f14 -/* 3E4BB8 E010A818 00000000 */ nop +/* 3E4BB8 E010A818 00000000 */ nop /* 3E4BBC E010A81C 82620001 */ lb $v0, 1($s3) /* 3E4BC0 E010A820 C7AE0058 */ lwc1 $f14, 0x58($sp) /* 3E4BC4 E010A824 44823000 */ mtc1 $v0, $f6 -/* 3E4BC8 E010A828 00000000 */ nop +/* 3E4BC8 E010A828 00000000 */ nop /* 3E4BCC E010A82C 468031A0 */ cvt.s.w $f6, $f6 /* 3E4BD0 E010A830 460E3002 */ mul.s $f0, $f6, $f14 -/* 3E4BD4 E010A834 00000000 */ nop +/* 3E4BD4 E010A834 00000000 */ nop /* 3E4BD8 E010A838 82620000 */ lb $v0, ($s3) /* 3E4BDC E010A83C 44821000 */ mtc1 $v0, $f2 -/* 3E4BE0 E010A840 00000000 */ nop +/* 3E4BE0 E010A840 00000000 */ nop /* 3E4BE4 E010A844 468010A0 */ cvt.s.w $f2, $f2 /* 3E4BE8 E010A848 461E1082 */ mul.s $f2, $f2, $f30 -/* 3E4BEC E010A84C 00000000 */ nop +/* 3E4BEC E010A84C 00000000 */ nop /* 3E4BF0 E010A850 46002100 */ add.s $f4, $f4, $f0 /* 3E4BF4 E010A854 00031823 */ negu $v1, $v1 /* 3E4BF8 E010A858 44830000 */ mtc1 $v1, $f0 -/* 3E4BFC E010A85C 00000000 */ nop +/* 3E4BFC E010A85C 00000000 */ nop /* 3E4C00 E010A860 46800020 */ cvt.s.w $f0, $f0 /* 3E4C04 E010A864 460E0002 */ mul.s $f0, $f0, $f14 -/* 3E4C08 E010A868 00000000 */ nop +/* 3E4C08 E010A868 00000000 */ nop /* 3E4C0C E010A86C C7AE005C */ lwc1 $f14, 0x5c($sp) /* 3E4C10 E010A870 460E3182 */ mul.s $f6, $f6, $f14 -/* 3E4C14 E010A874 00000000 */ nop +/* 3E4C14 E010A874 00000000 */ nop /* 3E4C18 E010A878 461E2102 */ mul.s $f4, $f4, $f30 -/* 3E4C1C E010A87C 00000000 */ nop +/* 3E4C1C E010A87C 00000000 */ nop /* 3E4C20 E010A880 46060000 */ add.s $f0, $f0, $f6 /* 3E4C24 E010A884 461E0002 */ mul.s $f0, $f0, $f30 -/* 3E4C28 E010A888 00000000 */ nop +/* 3E4C28 E010A888 00000000 */ nop /* 3E4C2C E010A88C C7AE0064 */ lwc1 $f14, 0x64($sp) /* 3E4C30 E010A890 460E1680 */ add.s $f26, $f2, $f14 /* 3E4C34 E010A894 C7AE0060 */ lwc1 $f14, 0x60($sp) @@ -254,41 +254,41 @@ glabel func_E010A4E8 .LE010A8B4: /* 3E4C54 E010A8B4 C7AE0018 */ lwc1 $f14, 0x18($sp) /* 3E4C58 E010A8B8 46187182 */ mul.s $f6, $f14, $f24 -/* 3E4C5C E010A8BC 00000000 */ nop +/* 3E4C5C E010A8BC 00000000 */ nop /* 3E4C60 E010A8C0 C7AE0028 */ lwc1 $f14, 0x28($sp) /* 3E4C64 E010A8C4 461A7402 */ mul.s $f16, $f14, $f26 -/* 3E4C68 E010A8C8 00000000 */ nop +/* 3E4C68 E010A8C8 00000000 */ nop /* 3E4C6C E010A8CC C7AE0038 */ lwc1 $f14, 0x38($sp) /* 3E4C70 E010A8D0 46047482 */ mul.s $f18, $f14, $f4 -/* 3E4C74 E010A8D4 00000000 */ nop +/* 3E4C74 E010A8D4 00000000 */ nop /* 3E4C78 E010A8D8 C7AE001C */ lwc1 $f14, 0x1c($sp) /* 3E4C7C E010A8DC 46187202 */ mul.s $f8, $f14, $f24 -/* 3E4C80 E010A8E0 00000000 */ nop +/* 3E4C80 E010A8E0 00000000 */ nop /* 3E4C84 E010A8E4 C7AE002C */ lwc1 $f14, 0x2c($sp) /* 3E4C88 E010A8E8 461A7302 */ mul.s $f12, $f14, $f26 -/* 3E4C8C E010A8EC 00000000 */ nop +/* 3E4C8C E010A8EC 00000000 */ nop /* 3E4C90 E010A8F0 C7AE003C */ lwc1 $f14, 0x3c($sp) /* 3E4C94 E010A8F4 46047502 */ mul.s $f20, $f14, $f4 -/* 3E4C98 E010A8F8 00000000 */ nop +/* 3E4C98 E010A8F8 00000000 */ nop /* 3E4C9C E010A8FC C7AE0020 */ lwc1 $f14, 0x20($sp) /* 3E4CA0 E010A900 46187282 */ mul.s $f10, $f14, $f24 -/* 3E4CA4 E010A904 00000000 */ nop +/* 3E4CA4 E010A904 00000000 */ nop /* 3E4CA8 E010A908 C7AE0030 */ lwc1 $f14, 0x30($sp) /* 3E4CAC E010A90C 461A7382 */ mul.s $f14, $f14, $f26 -/* 3E4CB0 E010A910 00000000 */ nop +/* 3E4CB0 E010A910 00000000 */ nop /* 3E4CB4 E010A914 E7AE0070 */ swc1 $f14, 0x70($sp) /* 3E4CB8 E010A918 C7AE0040 */ lwc1 $f14, 0x40($sp) /* 3E4CBC E010A91C 46047582 */ mul.s $f22, $f14, $f4 -/* 3E4CC0 E010A920 00000000 */ nop +/* 3E4CC0 E010A920 00000000 */ nop /* 3E4CC4 E010A924 C7AE0024 */ lwc1 $f14, 0x24($sp) /* 3E4CC8 E010A928 46187002 */ mul.s $f0, $f14, $f24 -/* 3E4CCC E010A92C 00000000 */ nop +/* 3E4CCC E010A92C 00000000 */ nop /* 3E4CD0 E010A930 C7AE0034 */ lwc1 $f14, 0x34($sp) /* 3E4CD4 E010A934 461A7082 */ mul.s $f2, $f14, $f26 -/* 3E4CD8 E010A938 00000000 */ nop +/* 3E4CD8 E010A938 00000000 */ nop /* 3E4CDC E010A93C C7AE0044 */ lwc1 $f14, 0x44($sp) /* 3E4CE0 E010A940 46047102 */ mul.s $f4, $f14, $f4 -/* 3E4CE4 E010A944 00000000 */ nop +/* 3E4CE4 E010A944 00000000 */ nop /* 3E4CE8 E010A948 46103180 */ add.s $f6, $f6, $f16 /* 3E4CEC E010A94C 46123180 */ add.s $f6, $f6, $f18 /* 3E4CF0 E010A950 460C4200 */ add.s $f8, $f8, $f12 @@ -305,79 +305,79 @@ glabel func_E010A4E8 /* 3E4D1C E010A97C 460E4200 */ add.s $f8, $f8, $f14 /* 3E4D20 E010A980 46165280 */ add.s $f10, $f10, $f22 /* 3E4D24 E010A984 44807000 */ mtc1 $zero, $f14 -/* 3E4D28 E010A988 00000000 */ nop +/* 3E4D28 E010A988 00000000 */ nop /* 3E4D2C E010A98C 460E1032 */ c.eq.s $f2, $f14 /* 3E4D30 E010A990 C7AE0050 */ lwc1 $f14, 0x50($sp) /* 3E4D34 E010A994 450100AF */ bc1t .LE010AC54 /* 3E4D38 E010A998 460E5000 */ add.s $f0, $f10, $f14 /* 3E4D3C E010A99C 4602E083 */ div.s $f2, $f28, $f2 /* 3E4D40 E010A9A0 46022602 */ mul.s $f24, $f4, $f2 -/* 3E4D44 E010A9A4 00000000 */ nop +/* 3E4D44 E010A9A4 00000000 */ nop /* 3E4D48 E010A9A8 46020102 */ mul.s $f4, $f0, $f2 -/* 3E4D4C E010A9AC 00000000 */ nop +/* 3E4D4C E010A9AC 00000000 */ nop /* 3E4D50 E010A9B0 46004007 */ neg.s $f0, $f8 /* 3E4D54 E010A9B4 46020682 */ mul.s $f26, $f0, $f2 -/* 3E4D58 E010A9B8 00000000 */ nop +/* 3E4D58 E010A9B8 00000000 */ nop /* 3E4D5C E010A9BC 3C01BF80 */ lui $at, 0xbf80 /* 3E4D60 E010A9C0 44817000 */ mtc1 $at, $f14 -/* 3E4D64 E010A9C4 00000000 */ nop +/* 3E4D64 E010A9C4 00000000 */ nop /* 3E4D68 E010A9C8 460E203E */ c.le.s $f4, $f14 -/* 3E4D6C E010A9CC 00000000 */ nop +/* 3E4D6C E010A9CC 00000000 */ nop /* 3E4D70 E010A9D0 450300A1 */ bc1tl .LE010AC58 /* 3E4D74 E010A9D4 26100004 */ addiu $s0, $s0, 4 /* 3E4D78 E010A9D8 460EC03E */ c.le.s $f24, $f14 -/* 3E4D7C E010A9DC 00000000 */ nop +/* 3E4D7C E010A9DC 00000000 */ nop /* 3E4D80 E010A9E0 4503009D */ bc1tl .LE010AC58 /* 3E4D84 E010A9E4 26100004 */ addiu $s0, $s0, 4 /* 3E4D88 E010A9E8 4618E03E */ c.le.s $f28, $f24 -/* 3E4D8C E010A9EC 00000000 */ nop +/* 3E4D8C E010A9EC 00000000 */ nop /* 3E4D90 E010A9F0 45030099 */ bc1tl .LE010AC58 /* 3E4D94 E010A9F4 26100004 */ addiu $s0, $s0, 4 /* 3E4D98 E010A9F8 460ED03E */ c.le.s $f26, $f14 -/* 3E4D9C E010A9FC 00000000 */ nop +/* 3E4D9C E010A9FC 00000000 */ nop /* 3E4DA0 E010AA00 45030095 */ bc1tl .LE010AC58 /* 3E4DA4 E010AA04 26100004 */ addiu $s0, $s0, 4 /* 3E4DA8 E010AA08 461AE03E */ c.le.s $f28, $f26 -/* 3E4DAC E010AA0C 00000000 */ nop +/* 3E4DAC E010AA0C 00000000 */ nop /* 3E4DB0 E010AA10 45030091 */ bc1tl .LE010AC58 /* 3E4DB4 E010AA14 26100004 */ addiu $s0, $s0, 4 /* 3E4DB8 E010AA18 8642000A */ lh $v0, 0xa($s2) /* 3E4DBC E010AA1C 461CC000 */ add.s $f0, $f24, $f28 /* 3E4DC0 E010AA20 44821000 */ mtc1 $v0, $f2 -/* 3E4DC4 E010AA24 00000000 */ nop +/* 3E4DC4 E010AA24 00000000 */ nop /* 3E4DC8 E010AA28 468010A0 */ cvt.s.w $f2, $f2 /* 3E4DCC E010AA2C 46020002 */ mul.s $f0, $f0, $f2 -/* 3E4DD0 E010AA30 00000000 */ nop +/* 3E4DD0 E010AA30 00000000 */ nop /* 3E4DD4 E010AA34 3C013FE0 */ lui $at, 0x3fe0 /* 3E4DD8 E010AA38 44817800 */ mtc1 $at, $f15 /* 3E4DDC E010AA3C 44807000 */ mtc1 $zero, $f14 /* 3E4DE0 E010AA40 46000021 */ cvt.d.s $f0, $f0 /* 3E4DE4 E010AA44 462E0002 */ mul.d $f0, $f0, $f14 -/* 3E4DE8 E010AA48 00000000 */ nop +/* 3E4DE8 E010AA48 00000000 */ nop /* 3E4DEC E010AA4C 8642000C */ lh $v0, 0xc($s2) /* 3E4DF0 E010AA50 461CD080 */ add.s $f2, $f26, $f28 /* 3E4DF4 E010AA54 44822000 */ mtc1 $v0, $f4 -/* 3E4DF8 E010AA58 00000000 */ nop +/* 3E4DF8 E010AA58 00000000 */ nop /* 3E4DFC E010AA5C 46802120 */ cvt.s.w $f4, $f4 /* 3E4E00 E010AA60 46041082 */ mul.s $f2, $f2, $f4 -/* 3E4E04 E010AA64 00000000 */ nop +/* 3E4E04 E010AA64 00000000 */ nop /* 3E4E08 E010AA68 460010A1 */ cvt.d.s $f2, $f2 /* 3E4E0C E010AA6C 462E1082 */ mul.d $f2, $f2, $f14 -/* 3E4E10 E010AA70 00000000 */ nop +/* 3E4E10 E010AA70 00000000 */ nop /* 3E4E14 E010AA74 8642000E */ lh $v0, 0xe($s2) /* 3E4E18 E010AA78 46200620 */ cvt.s.d $f24, $f0 /* 3E4E1C E010AA7C 44820000 */ mtc1 $v0, $f0 -/* 3E4E20 E010AA80 00000000 */ nop +/* 3E4E20 E010AA80 00000000 */ nop /* 3E4E24 E010AA84 46800020 */ cvt.s.w $f0, $f0 /* 3E4E28 E010AA88 4600C600 */ add.s $f24, $f24, $f0 /* 3E4E2C E010AA8C 3C014080 */ lui $at, 0x4080 /* 3E4E30 E010AA90 44812000 */ mtc1 $at, $f4 -/* 3E4E34 E010AA94 00000000 */ nop +/* 3E4E34 E010AA94 00000000 */ nop /* 3E4E38 E010AA98 4604C602 */ mul.s $f24, $f24, $f4 -/* 3E4E3C E010AA9C 00000000 */ nop +/* 3E4E3C E010AA9C 00000000 */ nop /* 3E4E40 E010AAA0 86420010 */ lh $v0, 0x10($s2) /* 3E4E44 E010AAA4 44820000 */ mtc1 $v0, $f0 -/* 3E4E48 E010AAA8 00000000 */ nop +/* 3E4E48 E010AAA8 00000000 */ nop /* 3E4E4C E010AAAC 46800020 */ cvt.s.w $f0, $f0 /* 3E4E50 E010AAB0 462016A0 */ cvt.s.d $f26, $f2 /* 3E4E54 E010AAB4 4600D680 */ add.s $f26, $f26, $f0 @@ -388,10 +388,10 @@ glabel func_E010A4E8 /* 3E4E68 E010AAC8 24820008 */ addiu $v0, $a0, 8 /* 3E4E6C E010AACC AEC20000 */ sw $v0, ($s6) /* 3E4E70 E010AAD0 4604D682 */ mul.s $f26, $f26, $f4 -/* 3E4E74 E010AAD4 00000000 */ nop +/* 3E4E74 E010AAD4 00000000 */ nop /* 3E4E78 E010AAD8 4600038D */ trunc.w.s $f14, $f0 /* 3E4E7C E010AADC 44027000 */ mfc1 $v0, $f14 -/* 3E4E80 E010AAE0 00000000 */ nop +/* 3E4E80 E010AAE0 00000000 */ nop /* 3E4E84 E010AAE4 00021400 */ sll $v0, $v0, 0x10 /* 3E4E88 E010AAE8 00021403 */ sra $v0, $v0, 0x10 /* 3E4E8C E010AAEC 18400005 */ blez $v0, .LE010AB04 @@ -405,11 +405,11 @@ glabel func_E010A4E8 .LE010AB08: /* 3E4EA8 E010AB08 3C014100 */ lui $at, 0x4100 /* 3E4EAC E010AB0C 44810000 */ mtc1 $at, $f0 -/* 3E4EB0 E010AB10 00000000 */ nop +/* 3E4EB0 E010AB10 00000000 */ nop /* 3E4EB4 E010AB14 4600D000 */ add.s $f0, $f26, $f0 /* 3E4EB8 E010AB18 4600038D */ trunc.w.s $f14, $f0 /* 3E4EBC E010AB1C 44027000 */ mfc1 $v0, $f14 -/* 3E4EC0 E010AB20 00000000 */ nop +/* 3E4EC0 E010AB20 00000000 */ nop /* 3E4EC4 E010AB24 00021400 */ sll $v0, $v0, 0x10 /* 3E4EC8 E010AB28 00021403 */ sra $v0, $v0, 0x10 /* 3E4ECC E010AB2C 18400004 */ blez $v0, .LE010AB40 @@ -420,7 +420,7 @@ glabel func_E010A4E8 .LE010AB40: /* 3E4EE0 E010AB40 4600C38D */ trunc.w.s $f14, $f24 /* 3E4EE4 E010AB44 44027000 */ mfc1 $v0, $f14 -/* 3E4EE8 E010AB48 00000000 */ nop +/* 3E4EE8 E010AB48 00000000 */ nop /* 3E4EEC E010AB4C 00021400 */ sll $v0, $v0, 0x10 /* 3E4EF0 E010AB50 00021403 */ sra $v0, $v0, 0x10 /* 3E4EF4 E010AB54 18400004 */ blez $v0, .LE010AB68 @@ -433,7 +433,7 @@ glabel func_E010A4E8 .LE010AB6C: /* 3E4F0C E010AB6C 4600D38D */ trunc.w.s $f14, $f26 /* 3E4F10 E010AB70 44027000 */ mfc1 $v0, $f14 -/* 3E4F14 E010AB74 00000000 */ nop +/* 3E4F14 E010AB74 00000000 */ nop /* 3E4F18 E010AB78 00021400 */ sll $v0, $v0, 0x10 /* 3E4F1C E010AB7C 00021403 */ sra $v0, $v0, 0x10 /* 3E4F20 E010AB80 18400004 */ blez $v0, .LE010AB94 @@ -450,7 +450,7 @@ glabel func_E010A4E8 /* 3E4F48 E010ABA8 AC620000 */ sw $v0, ($v1) /* 3E4F4C E010ABAC 4600C38D */ trunc.w.s $f14, $f24 /* 3E4F50 E010ABB0 44027000 */ mfc1 $v0, $f14 -/* 3E4F54 E010ABB4 00000000 */ nop +/* 3E4F54 E010ABB4 00000000 */ nop /* 3E4F58 E010ABB8 00021400 */ sll $v0, $v0, 0x10 /* 3E4F5C E010ABBC 00021403 */ sra $v0, $v0, 0x10 /* 3E4F60 E010ABC0 04410008 */ bgez $v0, .LE010ABE4 @@ -467,14 +467,14 @@ glabel func_E010A4E8 /* 3E4F84 E010ABE4 3C050080 */ lui $a1, 0x80 .LE010ABE8: /* 3E4F88 E010ABE8 44807000 */ mtc1 $zero, $f14 -/* 3E4F8C E010ABEC 00000000 */ nop +/* 3E4F8C E010ABEC 00000000 */ nop /* 3E4F90 E010ABF0 460ED03C */ c.lt.s $f26, $f14 -/* 3E4F94 E010ABF4 00000000 */ nop +/* 3E4F94 E010ABF4 00000000 */ nop /* 3E4F98 E010ABF8 4500000C */ bc1f .LE010AC2C /* 3E4F9C E010ABFC 34A20080 */ ori $v0, $a1, 0x80 /* 3E4FA0 E010AC00 4600D38D */ trunc.w.s $f14, $f26 /* 3E4FA4 E010AC04 44027000 */ mfc1 $v0, $f14 -/* 3E4FA8 E010AC08 00000000 */ nop +/* 3E4FA8 E010AC08 00000000 */ nop /* 3E4FAC E010AC0C 00021400 */ sll $v0, $v0, 0x10 /* 3E4FB0 E010AC10 00022243 */ sra $a0, $v0, 9 /* 3E4FB4 E010AC14 5C800001 */ bgtzl $a0, .LE010AC1C @@ -522,6 +522,6 @@ glabel func_E010A4E8 /* 3E5048 E010ACA8 D7B400A0 */ ldc1 $f20, 0xa0($sp) /* 3E504C E010ACAC 03E00008 */ jr $ra /* 3E5050 E010ACB0 27BD00D0 */ addiu $sp, $sp, 0xd0 -/* 3E5054 E010ACB4 00000000 */ nop -/* 3E5058 E010ACB8 00000000 */ nop -/* 3E505C E010ACBC 00000000 */ nop +/* 3E5054 E010ACB4 00000000 */ nop +/* 3E5058 E010ACB8 00000000 */ nop +/* 3E505C E010ACBC 00000000 */ nop diff --git a/asm/nonmatchings/code_3EB4E0/func_E010E000.s b/asm/nonmatchings/code_3EB4E0/func_E010E000.s index ae6e3fc224..7b1621f16c 100644 --- a/asm/nonmatchings/code_3EB4E0/func_E010E000.s +++ b/asm/nonmatchings/code_3EB4E0/func_E010E000.s @@ -12,7 +12,7 @@ glabel func_E010E000 /* 3EB4F8 E010E018 C4840014 */ lwc1 $f4, 0x14($a0) .LE010E01C: /* 3EB4FC E010E01C 10C000C1 */ beqz $a2, .LE010E324 -/* 3EB500 E010E020 00000000 */ nop +/* 3EB500 E010E020 00000000 */ nop /* 3EB504 E010E024 8CC20000 */ lw $v0, ($a2) /* 3EB508 E010E028 104000B5 */ beqz $v0, .LE010E300 /* 3EB50C E010E02C 00035080 */ sll $t2, $v1, 2 @@ -49,25 +49,25 @@ glabel func_E010E000 /* 3EB584 E010E0A4 AC820004 */ sw $v0, 4($a0) /* 3EB588 E010E0A8 84E2FFFE */ lh $v0, -2($a3) /* 3EB58C E010E0AC 44821000 */ mtc1 $v0, $f2 -/* 3EB590 E010E0B0 00000000 */ nop +/* 3EB590 E010E0B0 00000000 */ nop /* 3EB594 E010E0B4 468010A0 */ cvt.s.w $f2, $f2 /* 3EB598 E010E0B8 46023080 */ add.s $f2, $f6, $f2 /* 3EB59C E010E0BC 84E20002 */ lh $v0, 2($a3) /* 3EB5A0 E010E0C0 44820000 */ mtc1 $v0, $f0 -/* 3EB5A4 E010E0C4 00000000 */ nop +/* 3EB5A4 E010E0C4 00000000 */ nop /* 3EB5A8 E010E0C8 46800020 */ cvt.s.w $f0, $f0 /* 3EB5AC E010E0CC 46001080 */ add.s $f2, $f2, $f0 /* 3EB5B0 E010E0D0 AD040000 */ sw $a0, ($t0) /* 3EB5B4 E010E0D4 24820008 */ addiu $v0, $a0, 8 /* 3EB5B8 E010E0D8 46081082 */ mul.s $f2, $f2, $f8 -/* 3EB5BC E010E0DC 00000000 */ nop +/* 3EB5BC E010E0DC 00000000 */ nop /* 3EB5C0 E010E0E0 24840010 */ addiu $a0, $a0, 0x10 /* 3EB5C4 E010E0E4 AD020000 */ sw $v0, ($t0) /* 3EB5C8 E010E0E8 AD040000 */ sw $a0, ($t0) /* 3EB5CC E010E0EC 0040202D */ daddu $a0, $v0, $zero /* 3EB5D0 E010E0F0 4600128D */ trunc.w.s $f10, $f2 /* 3EB5D4 E010E0F4 44025000 */ mfc1 $v0, $f10 -/* 3EB5D8 E010E0F8 00000000 */ nop +/* 3EB5D8 E010E0F8 00000000 */ nop /* 3EB5DC E010E0FC 00021400 */ sll $v0, $v0, 0x10 /* 3EB5E0 E010E100 00021403 */ sra $v0, $v0, 0x10 /* 3EB5E4 E010E104 18400005 */ blez $v0, .LE010E11C @@ -81,19 +81,19 @@ glabel func_E010E000 .LE010E120: /* 3EB600 E010E120 84E20000 */ lh $v0, ($a3) /* 3EB604 E010E124 44820000 */ mtc1 $v0, $f0 -/* 3EB608 E010E128 00000000 */ nop +/* 3EB608 E010E128 00000000 */ nop /* 3EB60C E010E12C 46800020 */ cvt.s.w $f0, $f0 /* 3EB610 E010E130 84E20004 */ lh $v0, 4($a3) /* 3EB614 E010E134 46002000 */ add.s $f0, $f4, $f0 /* 3EB618 E010E138 44821000 */ mtc1 $v0, $f2 -/* 3EB61C E010E13C 00000000 */ nop +/* 3EB61C E010E13C 00000000 */ nop /* 3EB620 E010E140 468010A0 */ cvt.s.w $f2, $f2 /* 3EB624 E010E144 46020000 */ add.s $f0, $f0, $f2 /* 3EB628 E010E148 46080002 */ mul.s $f0, $f0, $f8 -/* 3EB62C E010E14C 00000000 */ nop +/* 3EB62C E010E14C 00000000 */ nop /* 3EB630 E010E150 4600028D */ trunc.w.s $f10, $f0 /* 3EB634 E010E154 44025000 */ mfc1 $v0, $f10 -/* 3EB638 E010E158 00000000 */ nop +/* 3EB638 E010E158 00000000 */ nop /* 3EB63C E010E15C 00021400 */ sll $v0, $v0, 0x10 /* 3EB640 E010E160 00021403 */ sra $v0, $v0, 0x10 /* 3EB644 E010E164 18400002 */ blez $v0, .LE010E170 @@ -103,14 +103,14 @@ glabel func_E010E000 /* 3EB650 E010E170 AC830000 */ sw $v1, ($a0) /* 3EB654 E010E174 84E2FFFE */ lh $v0, -2($a3) /* 3EB658 E010E178 44820000 */ mtc1 $v0, $f0 -/* 3EB65C E010E17C 00000000 */ nop +/* 3EB65C E010E17C 00000000 */ nop /* 3EB660 E010E180 46800020 */ cvt.s.w $f0, $f0 /* 3EB664 E010E184 46003000 */ add.s $f0, $f6, $f0 /* 3EB668 E010E188 46080002 */ mul.s $f0, $f0, $f8 -/* 3EB66C E010E18C 00000000 */ nop +/* 3EB66C E010E18C 00000000 */ nop /* 3EB670 E010E190 4600028D */ trunc.w.s $f10, $f0 /* 3EB674 E010E194 44025000 */ mfc1 $v0, $f10 -/* 3EB678 E010E198 00000000 */ nop +/* 3EB678 E010E198 00000000 */ nop /* 3EB67C E010E19C 00021400 */ sll $v0, $v0, 0x10 /* 3EB680 E010E1A0 00021403 */ sra $v0, $v0, 0x10 /* 3EB684 E010E1A4 18400004 */ blez $v0, .LE010E1B8 @@ -123,14 +123,14 @@ glabel func_E010E000 .LE010E1BC: /* 3EB69C E010E1BC 84E20000 */ lh $v0, ($a3) /* 3EB6A0 E010E1C0 44820000 */ mtc1 $v0, $f0 -/* 3EB6A4 E010E1C4 00000000 */ nop +/* 3EB6A4 E010E1C4 00000000 */ nop /* 3EB6A8 E010E1C8 46800020 */ cvt.s.w $f0, $f0 /* 3EB6AC E010E1CC 46002000 */ add.s $f0, $f4, $f0 /* 3EB6B0 E010E1D0 46080002 */ mul.s $f0, $f0, $f8 -/* 3EB6B4 E010E1D4 00000000 */ nop +/* 3EB6B4 E010E1D4 00000000 */ nop /* 3EB6B8 E010E1D8 4600028D */ trunc.w.s $f10, $f0 /* 3EB6BC E010E1DC 44025000 */ mfc1 $v0, $f10 -/* 3EB6C0 E010E1E0 00000000 */ nop +/* 3EB6C0 E010E1E0 00000000 */ nop /* 3EB6C4 E010E1E4 00021400 */ sll $v0, $v0, 0x10 /* 3EB6C8 E010E1E8 00021403 */ sra $v0, $v0, 0x10 /* 3EB6CC E010E1EC 18400003 */ blez $v0, .LE010E1FC @@ -145,16 +145,16 @@ glabel func_E010E000 /* 3EB6EC E010E20C AC820000 */ sw $v0, ($a0) /* 3EB6F0 E010E210 84E2FFFE */ lh $v0, -2($a3) /* 3EB6F4 E010E214 44820000 */ mtc1 $v0, $f0 -/* 3EB6F8 E010E218 00000000 */ nop +/* 3EB6F8 E010E218 00000000 */ nop /* 3EB6FC E010E21C 46800020 */ cvt.s.w $f0, $f0 /* 3EB700 E010E220 46003000 */ add.s $f0, $f6, $f0 /* 3EB704 E010E224 46080002 */ mul.s $f0, $f0, $f8 -/* 3EB708 E010E228 00000000 */ nop +/* 3EB708 E010E228 00000000 */ nop /* 3EB70C E010E22C 24630008 */ addiu $v1, $v1, 8 /* 3EB710 E010E230 24890004 */ addiu $t1, $a0, 4 /* 3EB714 E010E234 4600028D */ trunc.w.s $f10, $f0 /* 3EB718 E010E238 44025000 */ mfc1 $v0, $f10 -/* 3EB71C E010E23C 00000000 */ nop +/* 3EB71C E010E23C 00000000 */ nop /* 3EB720 E010E240 00021400 */ sll $v0, $v0, 0x10 /* 3EB724 E010E244 00021403 */ sra $v0, $v0, 0x10 /* 3EB728 E010E248 04410007 */ bgez $v0, .LE010E268 @@ -171,20 +171,20 @@ glabel func_E010E000 .LE010E26C: /* 3EB74C E010E26C 84E20000 */ lh $v0, ($a3) /* 3EB750 E010E270 44820000 */ mtc1 $v0, $f0 -/* 3EB754 E010E274 00000000 */ nop +/* 3EB754 E010E274 00000000 */ nop /* 3EB758 E010E278 46800020 */ cvt.s.w $f0, $f0 /* 3EB75C E010E27C 46002000 */ add.s $f0, $f4, $f0 /* 3EB760 E010E280 46080082 */ mul.s $f2, $f0, $f8 -/* 3EB764 E010E284 00000000 */ nop +/* 3EB764 E010E284 00000000 */ nop /* 3EB768 E010E288 44800000 */ mtc1 $zero, $f0 -/* 3EB76C E010E28C 00000000 */ nop +/* 3EB76C E010E28C 00000000 */ nop /* 3EB770 E010E290 4600103C */ c.lt.s $f2, $f0 -/* 3EB774 E010E294 00000000 */ nop +/* 3EB774 E010E294 00000000 */ nop /* 3EB778 E010E298 4500000C */ bc1f .LE010E2CC /* 3EB77C E010E29C 3C050400 */ lui $a1, 0x400 /* 3EB780 E010E2A0 4600128D */ trunc.w.s $f10, $f2 /* 3EB784 E010E2A4 44025000 */ mfc1 $v0, $f10 -/* 3EB788 E010E2A8 00000000 */ nop +/* 3EB788 E010E2A8 00000000 */ nop /* 3EB78C E010E2AC 00021400 */ sll $v0, $v0, 0x10 /* 3EB790 E010E2B0 00021343 */ sra $v0, $v0, 0xd /* 3EB794 E010E2B4 5C400001 */ bgtzl $v0, .LE010E2BC @@ -220,4 +220,4 @@ glabel func_E010E000 /* 3EB800 E010E320 AC800004 */ sw $zero, 4($a0) .LE010E324: /* 3EB804 E010E324 03E00008 */ jr $ra -/* 3EB808 E010E328 00000000 */ nop +/* 3EB808 E010E328 00000000 */ nop diff --git a/asm/nonmatchings/code_3EB4E0/func_E010E32C.s b/asm/nonmatchings/code_3EB4E0/func_E010E32C.s index a3c2f5dfc3..dbbc8f04da 100644 --- a/asm/nonmatchings/code_3EB4E0/func_E010E32C.s +++ b/asm/nonmatchings/code_3EB4E0/func_E010E32C.s @@ -41,7 +41,7 @@ glabel func_E010E32C /* 3EB89C E010E3BC AE22000C */ sw $v0, 0xc($s1) .LE010E3C0: /* 3EB8A0 E010E3C0 080438F0 */ j .LE010E3C0 -/* 3EB8A4 E010E3C4 00000000 */ nop +/* 3EB8A4 E010E3C4 00000000 */ nop .LE010E3C8: /* 3EB8A8 E010E3C8 AE120000 */ sw $s2, ($s0) /* 3EB8AC E010E3CC 1E600004 */ bgtz $s3, .LE010E3E0 diff --git a/asm/nonmatchings/code_3EB4E0/func_E010E4A0.s b/asm/nonmatchings/code_3EB4E0/func_E010E4A0.s index 568aeaf33c..9803c545c2 100644 --- a/asm/nonmatchings/code_3EB4E0/func_E010E4A0.s +++ b/asm/nonmatchings/code_3EB4E0/func_E010E4A0.s @@ -3,4 +3,4 @@ glabel func_E010E4A0 /* 3EB980 E010E4A0 03E00008 */ jr $ra -/* 3EB984 E010E4A4 00000000 */ nop +/* 3EB984 E010E4A4 00000000 */ nop diff --git a/asm/nonmatchings/code_3EB4E0/func_E010E4A8.s b/asm/nonmatchings/code_3EB4E0/func_E010E4A8.s index 652be943a2..ae4f73a377 100644 --- a/asm/nonmatchings/code_3EB4E0/func_E010E4A8.s +++ b/asm/nonmatchings/code_3EB4E0/func_E010E4A8.s @@ -26,7 +26,7 @@ glabel func_E010E4A8 /* 3EB9D4 E010E4F4 04610003 */ bgez $v1, .LE010E504 /* 3EB9D8 E010E4F8 ACA2001C */ sw $v0, 0x1c($a1) /* 3EB9DC E010E4FC 0C080128 */ jal func_E02004A0 -/* 3EB9E0 E010E500 00000000 */ nop +/* 3EB9E0 E010E500 00000000 */ nop .LE010E504: /* 3EB9E4 E010E504 8FBF0010 */ lw $ra, 0x10($sp) /* 3EB9E8 E010E508 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_3EB4E0/func_E010E558.s b/asm/nonmatchings/code_3EB4E0/func_E010E558.s index c7c8bfc7f1..6a796061c3 100644 --- a/asm/nonmatchings/code_3EB4E0/func_E010E558.s +++ b/asm/nonmatchings/code_3EB4E0/func_E010E558.s @@ -32,11 +32,12 @@ glabel func_E010E558 /* 3EBAA4 E010E5C4 2D020013 */ sltiu $v0, $t0, 0x13 /* 3EBAA8 E010E5C8 1040001A */ beqz $v0, .LE010E634 /* 3EBAAC E010E5CC 00081080 */ sll $v0, $t0, 2 -/* 3EBAB0 E010E5D0 3C01E011 */ lui $at, %hi(D_E010E930) +/* 3EBAB0 E010E5D0 3C01E011 */ lui $at, %hi(jtbl_E010E930_3EBE10) /* 3EBAB4 E010E5D4 00220821 */ addu $at, $at, $v0 -/* 3EBAB8 E010E5D8 8C22E930 */ lw $v0, %lo(D_E010E930)($at) +/* 3EBAB8 E010E5D8 8C22E930 */ lw $v0, %lo(jtbl_E010E930_3EBE10)($at) /* 3EBABC E010E5DC 00400008 */ jr $v0 -/* 3EBAC0 E010E5E0 00000000 */ nop +/* 3EBAC0 E010E5E0 00000000 */ nop +glabel LE010E5E4_3EBAC4 /* 3EBAC4 E010E5E4 3C06E011 */ lui $a2, %hi(D_E010E7FC) /* 3EBAC8 E010E5E8 24C6E7FC */ addiu $a2, $a2, %lo(D_E010E7FC) /* 3EBACC E010E5EC 3C04E011 */ lui $a0, %hi(D_E010E868) @@ -47,10 +48,12 @@ glabel func_E010E558 /* 3EBAE0 E010E600 000210C0 */ sll $v0, $v0, 3 /* 3EBAE4 E010E604 0804398F */ j .LE010E63C /* 3EBAE8 E010E608 00448821 */ addu $s1, $v0, $a0 +glabel LE010E60C_3EBAEC /* 3EBAEC E010E60C 3C06E011 */ lui $a2, %hi(D_E010E7D8) /* 3EBAF0 E010E610 24C6E7D8 */ addiu $a2, $a2, %lo(D_E010E7D8) /* 3EBAF4 E010E614 0804398F */ j .LE010E63C /* 3EBAF8 E010E618 0000882D */ daddu $s1, $zero, $zero +glabel LE010E61C_3EBAFC /* 3EBAFC E010E61C 3C06E011 */ lui $a2, %hi(D_E010E79C) /* 3EBB00 E010E620 24C6E79C */ addiu $a2, $a2, %lo(D_E010E79C) /* 3EBB04 E010E624 3C11E011 */ lui $s1, %hi(D_E010E838) @@ -129,6 +132,6 @@ glabel func_E010E558 /* 3EBC18 E010E738 8FB00018 */ lw $s0, 0x18($sp) /* 3EBC1C E010E73C 03E00008 */ jr $ra /* 3EBC20 E010E740 27BD0028 */ addiu $sp, $sp, 0x28 -/* 3EBC24 E010E744 00000000 */ nop -/* 3EBC28 E010E748 00000000 */ nop -/* 3EBC2C E010E74C 00000000 */ nop +/* 3EBC24 E010E744 00000000 */ nop +/* 3EBC28 E010E748 00000000 */ nop +/* 3EBC2C E010E74C 00000000 */ nop diff --git a/asm/nonmatchings/code_3F83F0/func_E0110000.s b/asm/nonmatchings/code_3F83F0/func_E0110000.s index a7b1599cf5..336f538581 100644 --- a/asm/nonmatchings/code_3F83F0/func_E0110000.s +++ b/asm/nonmatchings/code_3F83F0/func_E0110000.s @@ -41,7 +41,7 @@ glabel func_E0110000 /* 3F8480 E0110090 AE42000C */ sw $v0, 0xc($s2) .LE0110094: /* 3F8484 E0110094 08044025 */ j .LE0110094 -/* 3F8488 E0110098 00000000 */ nop +/* 3F8488 E0110098 00000000 */ nop .LE011009C: /* 3F848C E011009C AE330000 */ sw $s3, ($s1) /* 3F8490 E01100A0 1E000004 */ bgtz $s0, .LE01100B4 @@ -75,51 +75,51 @@ glabel func_E0110000 /* 3F84F8 E0110108 3C01E011 */ lui $at, %hi(D_E01108C0) /* 3F84FC E011010C D42608C0 */ ldc1 $f6, %lo(D_E01108C0)($at) /* 3F8500 E0110110 44821000 */ mtc1 $v0, $f2 -/* 3F8504 E0110114 00000000 */ nop +/* 3F8504 E0110114 00000000 */ nop /* 3F8508 E0110118 468010A1 */ cvt.d.w $f2, $f2 /* 3F850C E011011C 46261082 */ mul.d $f2, $f2, $f6 -/* 3F8510 E0110120 00000000 */ nop +/* 3F8510 E0110120 00000000 */ nop /* 3F8514 E0110124 00108040 */ sll $s0, $s0, 1 /* 3F8518 E0110128 2610FFFF */ addiu $s0, $s0, -1 /* 3F851C E011012C 3C013FD0 */ lui $at, 0x3fd0 /* 3F8520 E0110130 44812800 */ mtc1 $at, $f5 /* 3F8524 E0110134 44802000 */ mtc1 $zero, $f4 /* 3F8528 E0110138 44900000 */ mtc1 $s0, $f0 -/* 3F852C E011013C 00000000 */ nop +/* 3F852C E011013C 00000000 */ nop /* 3F8530 E0110140 46800021 */ cvt.d.w $f0, $f0 /* 3F8534 E0110144 46240002 */ mul.d $f0, $f0, $f4 -/* 3F8538 E0110148 00000000 */ nop +/* 3F8538 E0110148 00000000 */ nop /* 3F853C E011014C 46261080 */ add.d $f2, $f2, $f6 /* 3F8540 E0110150 46220002 */ mul.d $f0, $f0, $f2 -/* 3F8544 E0110154 00000000 */ nop +/* 3F8544 E0110154 00000000 */ nop /* 3F8548 E0110158 24040167 */ addiu $a0, $zero, 0x167 /* 3F854C E011015C 46200020 */ cvt.s.d $f0, $f0 /* 3F8550 E0110160 0C080138 */ jal func_E02004E0 /* 3F8554 E0110164 E6200048 */ swc1 $f0, 0x48($s1) /* 3F8558 E0110168 2404000A */ addiu $a0, $zero, 0xa /* 3F855C E011016C 44820000 */ mtc1 $v0, $f0 -/* 3F8560 E0110170 00000000 */ nop +/* 3F8560 E0110170 00000000 */ nop /* 3F8564 E0110174 46800020 */ cvt.s.w $f0, $f0 /* 3F8568 E0110178 0C080138 */ jal func_E02004E0 /* 3F856C E011017C E620003C */ swc1 $f0, 0x3c($s1) /* 3F8570 E0110180 2404000A */ addiu $a0, $zero, 0xa /* 3F8574 E0110184 2442FFFB */ addiu $v0, $v0, -5 /* 3F8578 E0110188 44820000 */ mtc1 $v0, $f0 -/* 3F857C E011018C 00000000 */ nop +/* 3F857C E011018C 00000000 */ nop /* 3F8580 E0110190 46800020 */ cvt.s.w $f0, $f0 /* 3F8584 E0110194 0C080138 */ jal func_E02004E0 /* 3F8588 E0110198 E620004C */ swc1 $f0, 0x4c($s1) /* 3F858C E011019C 2404000A */ addiu $a0, $zero, 0xa /* 3F8590 E01101A0 2442FFFB */ addiu $v0, $v0, -5 /* 3F8594 E01101A4 44820000 */ mtc1 $v0, $f0 -/* 3F8598 E01101A8 00000000 */ nop +/* 3F8598 E01101A8 00000000 */ nop /* 3F859C E01101AC 46800020 */ cvt.s.w $f0, $f0 /* 3F85A0 E01101B0 0C080138 */ jal func_E02004E0 /* 3F85A4 E01101B4 E6200050 */ swc1 $f0, 0x50($s1) /* 3F85A8 E01101B8 24040028 */ addiu $a0, $zero, 0x28 /* 3F85AC E01101BC 2442FFFB */ addiu $v0, $v0, -5 /* 3F85B0 E01101C0 44820000 */ mtc1 $v0, $f0 -/* 3F85B4 E01101C4 00000000 */ nop +/* 3F85B4 E01101C4 00000000 */ nop /* 3F85B8 E01101C8 46800020 */ cvt.s.w $f0, $f0 /* 3F85BC E01101CC 0C080138 */ jal func_E02004E0 /* 3F85C0 E01101D0 E6200054 */ swc1 $f0, 0x54($s1) @@ -129,7 +129,7 @@ glabel func_E0110000 /* 3F85D0 E01101E0 3421CCCD */ ori $at, $at, 0xcccd /* 3F85D4 E01101E4 44811000 */ mtc1 $at, $f2 /* 3F85D8 E01101E8 44830000 */ mtc1 $v1, $f0 -/* 3F85DC E01101EC 00000000 */ nop +/* 3F85DC E01101EC 00000000 */ nop /* 3F85E0 E01101F0 46800020 */ cvt.s.w $f0, $f0 /* 3F85E4 E01101F4 E6200040 */ swc1 $f0, 0x40($s1) /* 3F85E8 E01101F8 E6220058 */ swc1 $f2, 0x58($s1) diff --git a/asm/nonmatchings/code_3F83F0/func_E0110224.s b/asm/nonmatchings/code_3F83F0/func_E0110224.s index a43fc435a7..912c46e0bc 100644 --- a/asm/nonmatchings/code_3F83F0/func_E0110224.s +++ b/asm/nonmatchings/code_3F83F0/func_E0110224.s @@ -3,4 +3,4 @@ glabel func_E0110224 /* 3F8614 E0110224 03E00008 */ jr $ra -/* 3F8618 E0110228 00000000 */ nop +/* 3F8618 E0110228 00000000 */ nop diff --git a/asm/nonmatchings/code_3F83F0/func_E011022C.s b/asm/nonmatchings/code_3F83F0/func_E011022C.s index 7decc8ed0f..1ee66efc2a 100644 --- a/asm/nonmatchings/code_3F83F0/func_E011022C.s +++ b/asm/nonmatchings/code_3F83F0/func_E011022C.s @@ -27,9 +27,9 @@ glabel func_E011022C /* 3F866C E011027C 04A10005 */ bgez $a1, .LE0110294 /* 3F8670 E0110280 AC620014 */ sw $v0, 0x14($v1) /* 3F8674 E0110284 0C080128 */ jal func_E02004A0 -/* 3F8678 E0110288 00000000 */ nop +/* 3F8678 E0110288 00000000 */ nop /* 3F867C E011028C 080440E6 */ j .LE0110398 -/* 3F8680 E0110290 00000000 */ nop +/* 3F8680 E0110290 00000000 */ nop .LE0110294: /* 3F8684 E0110294 28A20010 */ slti $v0, $a1, 0x10 /* 3F8688 E0110298 10400002 */ beqz $v0, .LE01102A4 @@ -40,25 +40,25 @@ glabel func_E011022C /* 3F8698 E01102A8 C4600048 */ lwc1 $f0, 0x48($v1) /* 3F869C E01102AC 46001080 */ add.s $f2, $f2, $f0 /* 3F86A0 E01102B0 44805000 */ mtc1 $zero, $f10 -/* 3F86A4 E01102B4 00000000 */ nop +/* 3F86A4 E01102B4 00000000 */ nop /* 3F86A8 E01102B8 460A103C */ c.lt.s $f2, $f10 -/* 3F86AC E01102BC 00000000 */ nop +/* 3F86AC E01102BC 00000000 */ nop /* 3F86B0 E01102C0 45000006 */ bc1f .LE01102DC /* 3F86B4 E01102C4 E4620044 */ swc1 $f2, 0x44($v1) /* 3F86B8 E01102C8 3C013F80 */ lui $at, 0x3f80 /* 3F86BC E01102CC 44810000 */ mtc1 $at, $f0 -/* 3F86C0 E01102D0 00000000 */ nop +/* 3F86C0 E01102D0 00000000 */ nop /* 3F86C4 E01102D4 46001000 */ add.s $f0, $f2, $f0 /* 3F86C8 E01102D8 E4600044 */ swc1 $f0, 0x44($v1) .LE01102DC: /* 3F86CC E01102DC C4600044 */ lwc1 $f0, 0x44($v1) /* 3F86D0 E01102E0 3C013F80 */ lui $at, 0x3f80 /* 3F86D4 E01102E4 44811000 */ mtc1 $at, $f2 -/* 3F86D8 E01102E8 00000000 */ nop +/* 3F86D8 E01102E8 00000000 */ nop /* 3F86DC E01102EC 4600103C */ c.lt.s $f2, $f0 -/* 3F86E0 E01102F0 00000000 */ nop +/* 3F86E0 E01102F0 00000000 */ nop /* 3F86E4 E01102F4 45000003 */ bc1f .LE0110304 -/* 3F86E8 E01102F8 00000000 */ nop +/* 3F86E8 E01102F8 00000000 */ nop /* 3F86EC E01102FC 46020001 */ sub.s $f0, $f0, $f2 /* 3F86F0 E0110300 E4600044 */ swc1 $f0, 0x44($v1) .LE0110304: @@ -84,18 +84,18 @@ glabel func_E011022C /* 3F8740 E0110350 14400011 */ bnez $v0, .LE0110398 /* 3F8744 E0110354 E4600008 */ swc1 $f0, 8($v1) /* 3F8748 E0110358 460A003C */ c.lt.s $f0, $f10 -/* 3F874C E011035C 00000000 */ nop +/* 3F874C E011035C 00000000 */ nop /* 3F8750 E0110360 4500000D */ bc1f .LE0110398 /* 3F8754 E0110364 46001006 */ mov.s $f0, $f2 /* 3F8758 E0110368 460A003C */ c.lt.s $f0, $f10 -/* 3F875C E011036C 00000000 */ nop +/* 3F875C E011036C 00000000 */ nop /* 3F8760 E0110370 45000009 */ bc1f .LE0110398 -/* 3F8764 E0110374 00000000 */ nop +/* 3F8764 E0110374 00000000 */ nop /* 3F8768 E0110378 3C01E011 */ lui $at, %hi(D_E01108C8) /* 3F876C E011037C D42208C8 */ ldc1 $f2, %lo(D_E01108C8)($at) /* 3F8770 E0110380 46000021 */ cvt.d.s $f0, $f0 /* 3F8774 E0110384 46220002 */ mul.d $f0, $f0, $f2 -/* 3F8778 E0110388 00000000 */ nop +/* 3F8778 E0110388 00000000 */ nop /* 3F877C E011038C E46A0008 */ swc1 $f10, 8($v1) /* 3F8780 E0110390 46200020 */ cvt.s.d $f0, $f0 /* 3F8784 E0110394 E4600050 */ swc1 $f0, 0x50($v1) diff --git a/asm/nonmatchings/code_3F83F0/func_E01103EC.s b/asm/nonmatchings/code_3F83F0/func_E01103EC.s index 01c91bda56..2352bcd090 100644 --- a/asm/nonmatchings/code_3F83F0/func_E01103EC.s +++ b/asm/nonmatchings/code_3F83F0/func_E01103EC.s @@ -150,14 +150,14 @@ glabel func_E01103EC /* 3F8A20 E0110630 C6800044 */ lwc1 $f0, 0x44($s4) /* 3F8A24 E0110634 001319C0 */ sll $v1, $s3, 7 /* 3F8A28 E0110638 46040082 */ mul.s $f2, $f0, $f4 -/* 3F8A2C E011063C 00000000 */ nop +/* 3F8A2C E011063C 00000000 */ nop /* 3F8A30 E0110640 3463007C */ ori $v1, $v1, 0x7c /* 3F8A34 E0110644 30630FFF */ andi $v1, $v1, 0xfff /* 3F8A38 E0110648 00031B00 */ sll $v1, $v1, 0xc /* 3F8A3C E011064C AD2C0018 */ sw $t4, 0x18($t1) /* 3F8A40 E0110650 4600118D */ trunc.w.s $f6, $f2 /* 3F8A44 E0110654 44043000 */ mfc1 $a0, $f6 -/* 3F8A48 E0110658 00000000 */ nop +/* 3F8A48 E0110658 00000000 */ nop /* 3F8A4C E011065C 000411C0 */ sll $v0, $a0, 7 /* 3F8A50 E0110660 30420FFF */ andi $v0, $v0, 0xfff /* 3F8A54 E0110664 00461025 */ or $v0, $v0, $a2 @@ -191,10 +191,10 @@ glabel func_E01103EC /* 3F8AC4 E01106D4 AD220020 */ sw $v0, 0x20($t1) /* 3F8AC8 E01106D8 4600018D */ trunc.w.s $f6, $f0 /* 3F8ACC E01106DC 44023000 */ mfc1 $v0, $f6 -/* 3F8AD0 E01106E0 00000000 */ nop +/* 3F8AD0 E01106E0 00000000 */ nop /* 3F8AD4 E01106E4 00021080 */ sll $v0, $v0, 2 /* 3F8AD8 E01106E8 44820000 */ mtc1 $v0, $f0 -/* 3F8ADC E01106EC 00000000 */ nop +/* 3F8ADC E01106EC 00000000 */ nop /* 3F8AE0 E01106F0 46800020 */ cvt.s.w $f0, $f0 /* 3F8AE4 E01106F4 32C200FF */ andi $v0, $s6, 0xff /* 3F8AE8 E01106F8 46001081 */ sub.s $f2, $f2, $f0 @@ -214,14 +214,14 @@ glabel func_E01103EC /* 3F8B20 E0110730 AD2B0028 */ sw $t3, 0x28($t1) /* 3F8B24 E0110734 00021600 */ sll $v0, $v0, 0x18 /* 3F8B28 E0110738 46001082 */ mul.s $f2, $f2, $f0 -/* 3F8B2C E011073C 00000000 */ nop +/* 3F8B2C E011073C 00000000 */ nop /* 3F8B30 E0110740 00031C00 */ sll $v1, $v1, 0x10 /* 3F8B34 E0110744 00431025 */ or $v0, $v0, $v1 /* 3F8B38 E0110748 00042200 */ sll $a0, $a0, 8 /* 3F8B3C E011074C 00441025 */ or $v0, $v0, $a0 /* 3F8B40 E0110750 4600118D */ trunc.w.s $f6, $f2 /* 3F8B44 E0110754 440A3000 */ mfc1 $t2, $f6 -/* 3F8B48 E0110758 00000000 */ nop +/* 3F8B48 E0110758 00000000 */ nop /* 3F8B4C E011075C 314300FF */ andi $v1, $t2, 0xff /* 3F8B50 E0110760 00431025 */ or $v0, $v0, $v1 /* 3F8B54 E0110764 AD220024 */ sw $v0, 0x24($t1) @@ -239,11 +239,11 @@ glabel func_E01103EC /* 3F8B84 E0110794 AD270030 */ sw $a3, 0x30($t1) /* 3F8B88 E0110798 C6800044 */ lwc1 $f0, 0x44($s4) /* 3F8B8C E011079C 46040002 */ mul.s $f0, $f0, $f4 -/* 3F8B90 E01107A0 00000000 */ nop +/* 3F8B90 E01107A0 00000000 */ nop /* 3F8B94 E01107A4 24020003 */ addiu $v0, $zero, 3 /* 3F8B98 E01107A8 4600018D */ trunc.w.s $f6, $f0 /* 3F8B9C E01107AC 44033000 */ mfc1 $v1, $f6 -/* 3F8BA0 E01107B0 00000000 */ nop +/* 3F8BA0 E01107B0 00000000 */ nop /* 3F8BA4 E01107B4 14620028 */ bne $v1, $v0, .LE0110858 /* 3F8BA8 E01107B8 3C05D838 */ lui $a1, 0xd838 /* 3F8BAC E01107BC 3C088080 */ lui $t0, 0x8080 @@ -308,4 +308,4 @@ glabel func_E01103EC /* 3F8C90 E01108A0 D7B400C0 */ ldc1 $f20, 0xc0($sp) /* 3F8C94 E01108A4 03E00008 */ jr $ra /* 3F8C98 E01108A8 27BD00C8 */ addiu $sp, $sp, 0xc8 -/* 3F8C9C E01108AC 00000000 */ nop +/* 3F8C9C E01108AC 00000000 */ nop diff --git a/asm/nonmatchings/code_3FEAE0/func_E0114000.s b/asm/nonmatchings/code_3FEAE0/func_E0114000.s index 3bf7376dee..81c153bb9a 100644 --- a/asm/nonmatchings/code_3FEAE0/func_E0114000.s +++ b/asm/nonmatchings/code_3FEAE0/func_E0114000.s @@ -30,7 +30,7 @@ glabel func_E0114000 /* 3FEB44 E0114064 AE02000C */ sw $v0, 0xc($s0) .LE0114068: /* 3FEB48 E0114068 0804501A */ j .LE0114068 -/* 3FEB4C E011406C 00000000 */ nop +/* 3FEB4C E011406C 00000000 */ nop .LE0114070: /* 3FEB50 E0114070 0000202D */ daddu $a0, $zero, $zero /* 3FEB54 E0114074 24060001 */ addiu $a2, $zero, 1 diff --git a/asm/nonmatchings/code_3FEAE0/func_E01140D4.s b/asm/nonmatchings/code_3FEAE0/func_E01140D4.s index 60346d4f60..97aadc630f 100644 --- a/asm/nonmatchings/code_3FEAE0/func_E01140D4.s +++ b/asm/nonmatchings/code_3FEAE0/func_E01140D4.s @@ -3,4 +3,4 @@ glabel func_E01140D4 /* 3FEBB4 E01140D4 03E00008 */ jr $ra -/* 3FEBB8 E01140D8 00000000 */ nop +/* 3FEBB8 E01140D8 00000000 */ nop diff --git a/asm/nonmatchings/code_3FEAE0/func_E01140DC.s b/asm/nonmatchings/code_3FEAE0/func_E01140DC.s index e211b7ca25..454836c7e1 100644 --- a/asm/nonmatchings/code_3FEAE0/func_E01140DC.s +++ b/asm/nonmatchings/code_3FEAE0/func_E01140DC.s @@ -25,15 +25,18 @@ glabel func_E01140DC /* 3FEC08 E0114128 10400050 */ beqz $v0, .LE011426C /* 3FEC0C E011412C 0000982D */ daddu $s3, $zero, $zero /* 3FEC10 E0114130 00031080 */ sll $v0, $v1, 2 -/* 3FEC14 E0114134 3C01E011 */ lui $at, %hi(D_E0114750) +/* 3FEC14 E0114134 3C01E011 */ lui $at, %hi(jtbl_E0114750_3FF230) /* 3FEC18 E0114138 00220821 */ addu $at, $at, $v0 -/* 3FEC1C E011413C 8C224750 */ lw $v0, %lo(D_E0114750)($at) +/* 3FEC1C E011413C 8C224750 */ lw $v0, %lo(jtbl_E0114750_3FF230)($at) /* 3FEC20 E0114140 00400008 */ jr $v0 -/* 3FEC24 E0114144 00000000 */ nop +/* 3FEC24 E0114144 00000000 */ nop +glabel LE0114148_3FEC28 /* 3FEC28 E0114148 24020001 */ addiu $v0, $zero, 1 /* 3FEC2C E011414C A2220105 */ sb $v0, 0x105($s1) +glabel LE0114150_3FEC30 /* 3FEC30 E0114150 080450B5 */ j .LE01142D4 /* 3FEC34 E0114154 24130001 */ addiu $s3, $zero, 1 +glabel LE0114158_3FEC38 /* 3FEC38 E0114158 06010002 */ bgez $s0, .LE0114164 /* 3FEC3C E011415C 0200102D */ daddu $v0, $s0, $zero /* 3FEC40 E0114160 26020003 */ addiu $v0, $s0, 3 @@ -47,7 +50,7 @@ glabel func_E01140DC /* 3FEC5C E011417C 00031840 */ sll $v1, $v1, 1 /* 3FEC60 E0114180 90420000 */ lbu $v0, ($v0) /* 3FEC64 E0114184 44836000 */ mtc1 $v1, $f12 -/* 3FEC68 E0114188 00000000 */ nop +/* 3FEC68 E0114188 00000000 */ nop /* 3FEC6C E011418C 46806320 */ cvt.s.w $f12, $f12 /* 3FEC70 E0114190 0C080140 */ jal func_E0200500 /* 3FEC74 E0114194 A2220105 */ sb $v0, 0x105($s1) @@ -58,6 +61,7 @@ glabel func_E01140DC /* 3FEC88 E01141A8 E64200B8 */ swc1 $f2, 0xb8($s2) /* 3FEC8C E01141AC 080450B4 */ j .LE01142D0 /* 3FEC90 E01141B0 24130001 */ addiu $s3, $zero, 1 +glabel LE01141B4_3FEC94 /* 3FEC94 E01141B4 06010002 */ bgez $s0, .LE01141C0 /* 3FEC98 E01141B8 0200102D */ daddu $v0, $s0, $zero /* 3FEC9C E01141BC 26020003 */ addiu $v0, $s0, 3 @@ -71,7 +75,7 @@ glabel func_E01140DC /* 3FECB8 E01141D8 00031880 */ sll $v1, $v1, 2 /* 3FECBC E01141DC 90420000 */ lbu $v0, ($v0) /* 3FECC0 E01141E0 44836000 */ mtc1 $v1, $f12 -/* 3FECC4 E01141E4 00000000 */ nop +/* 3FECC4 E01141E4 00000000 */ nop /* 3FECC8 E01141E8 46806320 */ cvt.s.w $f12, $f12 /* 3FECCC E01141EC 0C080140 */ jal func_E0200500 /* 3FECD0 E01141F0 A2220105 */ sb $v0, 0x105($s1) @@ -82,6 +86,7 @@ glabel func_E01140DC /* 3FECE4 E0114204 E6400110 */ swc1 $f0, 0x110($s2) /* 3FECE8 E0114208 080450B4 */ j .LE01142D0 /* 3FECEC E011420C AE400110 */ sw $zero, 0x110($s2) +glabel LE0114210_3FECF0 /* 3FECF0 E0114210 06010002 */ bgez $s0, .LE011421C /* 3FECF4 E0114214 0200102D */ daddu $v0, $s0, $zero /* 3FECF8 E0114218 26020003 */ addiu $v0, $s0, 3 @@ -95,18 +100,19 @@ glabel func_E01140DC /* 3FED14 E0114234 00031880 */ sll $v1, $v1, 2 /* 3FED18 E0114238 90420000 */ lbu $v0, ($v0) /* 3FED1C E011423C 44836000 */ mtc1 $v1, $f12 -/* 3FED20 E0114240 00000000 */ nop +/* 3FED20 E0114240 00000000 */ nop /* 3FED24 E0114244 46806320 */ cvt.s.w $f12, $f12 /* 3FED28 E0114248 0C080140 */ jal func_E0200500 /* 3FED2C E011424C A2220105 */ sb $v0, 0x105($s1) /* 3FED30 E0114250 3C014080 */ lui $at, 0x4080 /* 3FED34 E0114254 44811000 */ mtc1 $at, $f2 -/* 3FED38 E0114258 00000000 */ nop +/* 3FED38 E0114258 00000000 */ nop /* 3FED3C E011425C 46020002 */ mul.s $f0, $f0, $f2 -/* 3FED40 E0114260 00000000 */ nop +/* 3FED40 E0114260 00000000 */ nop /* 3FED44 E0114264 080450B0 */ j .LE01142C0 /* 3FED48 E0114268 2A020009 */ slti $v0, $s0, 9 .LE011426C: +glabel LE011426C_3FED4C /* 3FED4C E011426C 06010002 */ bgez $s0, .LE0114278 /* 3FED50 E0114270 0200102D */ daddu $v0, $s0, $zero /* 3FED54 E0114274 26020003 */ addiu $v0, $s0, 3 @@ -119,15 +125,15 @@ glabel func_E01140DC /* 3FED6C E011428C 00701821 */ addu $v1, $v1, $s0 /* 3FED70 E0114290 90420000 */ lbu $v0, ($v0) /* 3FED74 E0114294 44836000 */ mtc1 $v1, $f12 -/* 3FED78 E0114298 00000000 */ nop +/* 3FED78 E0114298 00000000 */ nop /* 3FED7C E011429C 46806320 */ cvt.s.w $f12, $f12 /* 3FED80 E01142A0 0C080140 */ jal func_E0200500 /* 3FED84 E01142A4 A2220105 */ sb $v0, 0x105($s1) /* 3FED88 E01142A8 3C014140 */ lui $at, 0x4140 /* 3FED8C E01142AC 44811000 */ mtc1 $at, $f2 -/* 3FED90 E01142B0 00000000 */ nop +/* 3FED90 E01142B0 00000000 */ nop /* 3FED94 E01142B4 46020002 */ mul.s $f0, $f0, $f2 -/* 3FED98 E01142B8 00000000 */ nop +/* 3FED98 E01142B8 00000000 */ nop /* 3FED9C E01142BC 2A020024 */ slti $v0, $s0, 0x24 .LE01142C0: /* 3FEDA0 E01142C0 14400004 */ bnez $v0, .LE01142D4 diff --git a/asm/nonmatchings/code_3FEAE0/func_E0114388.s b/asm/nonmatchings/code_3FEAE0/func_E0114388.s index 80fb6c8215..ae7a1d2110 100644 --- a/asm/nonmatchings/code_3FEAE0/func_E0114388.s +++ b/asm/nonmatchings/code_3FEAE0/func_E0114388.s @@ -135,14 +135,14 @@ glabel func_E0114388 /* 3FF06C E011458C 1040001B */ beqz $v0, .LE01145FC /* 3FF070 E0114590 3C07D838 */ lui $a3, 0xd838 /* 3FF074 E0114594 44946000 */ mtc1 $s4, $f12 -/* 3FF078 E0114598 00000000 */ nop +/* 3FF078 E0114598 00000000 */ nop /* 3FF07C E011459C 0C080140 */ jal func_E0200500 /* 3FF080 E01145A0 46806320 */ cvt.s.w $f12, $f12 /* 3FF084 E01145A4 3C01427C */ lui $at, 0x427c /* 3FF088 E01145A8 44811000 */ mtc1 $at, $f2 /* 3FF08C E01145AC 8E420000 */ lw $v0, ($s2) /* 3FF090 E01145B0 46020002 */ mul.s $f0, $f0, $f2 -/* 3FF094 E01145B4 00000000 */ nop +/* 3FF094 E01145B4 00000000 */ nop /* 3FF098 E01145B8 0040282D */ daddu $a1, $v0, $zero /* 3FF09C E01145BC 24420008 */ addiu $v0, $v0, 8 /* 3FF0A0 E01145C0 AE420000 */ sw $v0, ($s2) @@ -151,7 +151,7 @@ glabel func_E0114388 /* 3FF0AC E01145CC ACA20000 */ sw $v0, ($a1) /* 3FF0B0 E01145D0 4600018D */ trunc.w.s $f6, $f0 /* 3FF0B4 E01145D4 44023000 */ mfc1 $v0, $f6 -/* 3FF0B8 E01145D8 00000000 */ nop +/* 3FF0B8 E01145D8 00000000 */ nop /* 3FF0BC E01145DC 304200FF */ andi $v0, $v0, 0xff /* 3FF0C0 E01145E0 00022600 */ sll $a0, $v0, 0x18 /* 3FF0C4 E01145E4 00021C00 */ sll $v1, $v0, 0x10 diff --git a/asm/nonmatchings/code_3bf0_len_6f0/update_input.s b/asm/nonmatchings/code_3bf0_len_6f0/update_input.s index 9c261675af..ddb08b6f90 100644 --- a/asm/nonmatchings/code_3bf0_len_6f0/update_input.s +++ b/asm/nonmatchings/code_3bf0_len_6f0/update_input.s @@ -26,7 +26,7 @@ glabel update_input /* 3CC4 800288C4 10400015 */ beqz $v0, .L8002891C /* 3CC8 800288C8 28420002 */ slti $v0, $v0, 2 /* 3CCC 800288CC 10400008 */ beqz $v0, .L800288F0 -/* 3CD0 800288D0 00000000 */ nop +/* 3CD0 800288D0 00000000 */ nop /* 3CD4 800288D4 96220000 */ lhu $v0, ($s1) /* 3CD8 800288D8 3042F000 */ andi $v0, $v0, 0xf000 /* 3CDC 800288DC 10400004 */ beqz $v0, .L800288F0 @@ -49,7 +49,7 @@ glabel update_input .L8002891C: /* 3D1C 8002891C 0200102D */ daddu $v0, $s0, $zero /* 3D20 80028920 10400166 */ beqz $v0, .L80028EBC -/* 3D24 80028924 00000000 */ nop +/* 3D24 80028924 00000000 */ nop /* 3D28 80028928 92230003 */ lbu $v1, 3($s1) /* 3D2C 8002892C 92220002 */ lbu $v0, 2($s1) /* 3D30 80028930 00031E00 */ sll $v1, $v1, 0x18 @@ -80,7 +80,7 @@ glabel update_input /* 3D88 80028988 0040382D */ daddu $a3, $v0, $zero /* 3D8C 8002898C 00021400 */ sll $v0, $v0, 0x10 /* 3D90 80028990 04410009 */ bgez $v0, .L800289B8 -/* 3D94 80028994 00000000 */ nop +/* 3D94 80028994 00000000 */ nop /* 3D98 80028998 0000382D */ daddu $a3, $zero, $zero .L8002899C: /* 3D9C 8002899C 00071400 */ sll $v0, $a3, 0x10 @@ -118,7 +118,7 @@ glabel update_input /* 3E14 80028A14 3C02800A */ lui $v0, %hi(D_8009A6A4) /* 3E18 80028A18 8442A6A4 */ lh $v0, %lo(D_8009A6A4)($v0) /* 3E1C 80028A1C 14400006 */ bnez $v0, .L80028A38 -/* 3E20 80028A20 00000000 */ nop +/* 3E20 80028A20 00000000 */ nop /* 3E24 80028A24 3C03800A */ lui $v1, %hi(D_8009A6A0) /* 3E28 80028A28 2463A6A0 */ addiu $v1, $v1, %lo(D_8009A6A0) /* 3E2C 80028A2C 84620000 */ lh $v0, ($v1) @@ -155,7 +155,7 @@ glabel update_input /* 3E94 80028A94 3C02800A */ lui $v0, %hi(D_8009A6A4) /* 3E98 80028A98 8442A6A4 */ lh $v0, %lo(D_8009A6A4)($v0) /* 3E9C 80028A9C 14400006 */ bnez $v0, .L80028AB8 -/* 3EA0 80028AA0 00000000 */ nop +/* 3EA0 80028AA0 00000000 */ nop /* 3EA4 80028AA4 3C03800A */ lui $v1, %hi(D_8009A6A0) /* 3EA8 80028AA8 2463A6A0 */ addiu $v1, $v1, %lo(D_8009A6A0) /* 3EAC 80028AAC 84620000 */ lh $v0, ($v1) @@ -199,7 +199,7 @@ glabel update_input /* 3F2C 80028B2C 3C02800A */ lui $v0, %hi(D_8009A6A6) /* 3F30 80028B30 8442A6A6 */ lh $v0, %lo(D_8009A6A6)($v0) /* 3F34 80028B34 14400006 */ bnez $v0, .L80028B50 -/* 3F38 80028B38 00000000 */ nop +/* 3F38 80028B38 00000000 */ nop /* 3F3C 80028B3C 3C03800A */ lui $v1, %hi(D_8009A6A2) /* 3F40 80028B40 2463A6A2 */ addiu $v1, $v1, %lo(D_8009A6A2) /* 3F44 80028B44 84620000 */ lh $v0, ($v1) @@ -236,7 +236,7 @@ glabel update_input /* 3FAC 80028BAC 3C02800A */ lui $v0, %hi(D_8009A6A6) /* 3FB0 80028BB0 8442A6A6 */ lh $v0, %lo(D_8009A6A6)($v0) /* 3FB4 80028BB4 14400014 */ bnez $v0, .L80028C08 -/* 3FB8 80028BB8 00000000 */ nop +/* 3FB8 80028BB8 00000000 */ nop /* 3FBC 80028BBC 3C03800A */ lui $v1, %hi(D_8009A6A2) /* 3FC0 80028BC0 2463A6A2 */ addiu $v1, $v1, %lo(D_8009A6A2) /* 3FC4 80028BC4 84620000 */ lh $v0, ($v1) @@ -285,7 +285,7 @@ glabel update_input /* 4054 80028C54 85030000 */ lh $v1, ($t0) /* 4058 80028C58 24020001 */ addiu $v0, $zero, 1 /* 405C 80028C5C 1462000A */ bne $v1, $v0, .L80028C88 -/* 4060 80028C60 00000000 */ nop +/* 4060 80028C60 00000000 */ nop /* 4064 80028C64 3C02800A */ lui $v0, %hi(D_8009A6A0) /* 4068 80028C68 8442A6A0 */ lh $v0, %lo(D_8009A6A0)($v0) /* 406C 80028C6C 00C21023 */ subu $v0, $a2, $v0 @@ -352,7 +352,7 @@ glabel update_input /* 414C 80028D4C 84C30000 */ lh $v1, ($a2) /* 4150 80028D50 24020001 */ addiu $v0, $zero, 1 /* 4154 80028D54 1462000A */ bne $v1, $v0, .L80028D80 -/* 4158 80028D58 00000000 */ nop +/* 4158 80028D58 00000000 */ nop /* 415C 80028D5C 3C02800A */ lui $v0, %hi(D_8009A6A2) /* 4160 80028D60 8442A6A2 */ lh $v0, %lo(D_8009A6A2)($v0) /* 4164 80028D64 00A21023 */ subu $v0, $a1, $v0 @@ -455,6 +455,6 @@ glabel update_input /* 42C8 80028EC8 8FB00010 */ lw $s0, 0x10($sp) /* 42CC 80028ECC 03E00008 */ jr $ra /* 42D0 80028ED0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 42D4 80028ED4 00000000 */ nop -/* 42D8 80028ED8 00000000 */ nop -/* 42DC 80028EDC 00000000 */ nop +/* 42D4 80028ED4 00000000 */ nop +/* 42D8 80028ED8 00000000 */ nop +/* 42DC 80028EDC 00000000 */ nop diff --git a/asm/nonmatchings/code_402640/func_E0116000.s b/asm/nonmatchings/code_402640/func_E0116000.s index 52d4e9499d..a54fe93922 100644 --- a/asm/nonmatchings/code_402640/func_E0116000.s +++ b/asm/nonmatchings/code_402640/func_E0116000.s @@ -43,7 +43,7 @@ glabel func_E0116000 /* 4026D8 E0116098 AE03000C */ sw $v1, 0xc($s0) .LE011609C: /* 4026DC E011609C 08045827 */ j .LE011609C -/* 4026E0 E01160A0 00000000 */ nop +/* 4026E0 E01160A0 00000000 */ nop .LE01160A4: /* 4026E4 E01160A4 AC730000 */ sw $s3, ($v1) /* 4026E8 E01160A8 1E400004 */ bgtz $s2, .LE01160BC @@ -71,7 +71,7 @@ glabel func_E0116000 /* 402738 E01160F8 44801000 */ mtc1 $zero, $f2 /* 40273C E01160FC 4600A021 */ cvt.d.s $f0, $f20 /* 402740 E0116100 46220002 */ mul.d $f0, $f0, $f2 -/* 402744 E0116104 00000000 */ nop +/* 402744 E0116104 00000000 */ nop /* 402748 E0116108 240500FF */ addiu $a1, $zero, 0xff /* 40274C E011610C 2463002C */ addiu $v1, $v1, 0x2c /* 402750 E0116110 3C014248 */ lui $at, 0x4248 diff --git a/asm/nonmatchings/code_402640/func_E0116184.s b/asm/nonmatchings/code_402640/func_E0116184.s index a2e77c5f04..4f1ac20901 100644 --- a/asm/nonmatchings/code_402640/func_E0116184.s +++ b/asm/nonmatchings/code_402640/func_E0116184.s @@ -3,4 +3,4 @@ glabel func_E0116184 /* 4027C4 E0116184 03E00008 */ jr $ra -/* 4027C8 E0116188 00000000 */ nop +/* 4027C8 E0116188 00000000 */ nop diff --git a/asm/nonmatchings/code_402640/func_E011618C.s b/asm/nonmatchings/code_402640/func_E011618C.s index ff1196e48c..839eb0567f 100644 --- a/asm/nonmatchings/code_402640/func_E011618C.s +++ b/asm/nonmatchings/code_402640/func_E011618C.s @@ -49,7 +49,7 @@ glabel func_E011618C /* 402874 E0116234 0C080128 */ jal func_E02004A0 /* 402878 E0116238 0280202D */ daddu $a0, $s4, $zero /* 40287C E011623C 08045997 */ j .LE011665C -/* 402880 E0116240 00000000 */ nop +/* 402880 E0116240 00000000 */ nop .LE0116244: /* 402884 E0116244 3C0142B4 */ lui $at, 0x42b4 /* 402888 E0116248 44810000 */ mtc1 $at, $f0 @@ -67,10 +67,10 @@ glabel func_E011618C /* 4028B8 E0116278 3C014080 */ lui $at, 0x4080 /* 4028BC E011627C 44811000 */ mtc1 $at, $f2 /* 4028C0 E0116280 44840000 */ mtc1 $a0, $f0 -/* 4028C4 E0116284 00000000 */ nop +/* 4028C4 E0116284 00000000 */ nop /* 4028C8 E0116288 46800020 */ cvt.s.w $f0, $f0 /* 4028CC E011628C 46020002 */ mul.s $f0, $f0, $f2 -/* 4028D0 E0116290 00000000 */ nop +/* 4028D0 E0116290 00000000 */ nop /* 4028D4 E0116294 3C158000 */ lui $s5, 0x8000 /* 4028D8 E0116298 26300014 */ addiu $s0, $s1, 0x14 /* 4028DC E011629C 0000902D */ daddu $s2, $zero, $zero @@ -79,13 +79,13 @@ glabel func_E011618C /* 4028E8 E01162A8 46000721 */ cvt.d.s $f28, $f0 .LE01162AC: /* 4028EC E01162AC 4493A000 */ mtc1 $s3, $f20 -/* 4028F0 E01162B0 00000000 */ nop +/* 4028F0 E01162B0 00000000 */ nop /* 4028F4 E01162B4 4680A520 */ cvt.s.w $f20, $f20 /* 4028F8 E01162B8 3C01E011 */ lui $at, %hi(D_E0116D90) /* 4028FC E01162BC D4206D90 */ ldc1 $f0, %lo(D_E0116D90)($at) /* 402900 E01162C0 4600A521 */ cvt.d.s $f20, $f20 /* 402904 E01162C4 4620A502 */ mul.d $f20, $f20, $f0 -/* 402908 E01162C8 00000000 */ nop +/* 402908 E01162C8 00000000 */ nop /* 40290C E01162CC 4634E500 */ add.d $f20, $f28, $f20 /* 402910 E01162D0 4620A520 */ cvt.s.d $f20, $f20 /* 402914 E01162D4 0C080140 */ jal func_E0200500 @@ -95,25 +95,25 @@ glabel func_E011618C /* 402924 E01162E4 0C080140 */ jal func_E0200500 /* 402928 E01162E8 46000606 */ mov.s $f24, $f0 /* 40292C E01162EC 4600B002 */ mul.s $f0, $f22, $f0 -/* 402930 E01162F0 00000000 */ nop +/* 402930 E01162F0 00000000 */ nop /* 402934 E01162F4 46180002 */ mul.s $f0, $f0, $f24 -/* 402938 E01162F8 00000000 */ nop +/* 402938 E01162F8 00000000 */ nop /* 40293C E01162FC C7A60010 */ lwc1 $f6, 0x10($sp) /* 402940 E0116300 46003000 */ add.s $f0, $f6, $f0 /* 402944 E0116304 4600A306 */ mov.s $f12, $f20 /* 402948 E0116308 0C080144 */ jal func_E0200510 /* 40294C E011630C E600FFF0 */ swc1 $f0, -0x10($s0) /* 402950 E0116310 4600B002 */ mul.s $f0, $f22, $f0 -/* 402954 E0116314 00000000 */ nop +/* 402954 E0116314 00000000 */ nop /* 402958 E0116318 C7A60014 */ lwc1 $f6, 0x14($sp) /* 40295C E011631C 46003000 */ add.s $f0, $f6, $f0 /* 402960 E0116320 4600F306 */ mov.s $f12, $f30 /* 402964 E0116324 0C080144 */ jal func_E0200510 /* 402968 E0116328 E600FFF4 */ swc1 $f0, -0xc($s0) /* 40296C E011632C 4600B582 */ mul.s $f22, $f22, $f0 -/* 402970 E0116330 00000000 */ nop +/* 402970 E0116330 00000000 */ nop /* 402974 E0116334 4618B582 */ mul.s $f22, $f22, $f24 -/* 402978 E0116338 00000000 */ nop +/* 402978 E0116338 00000000 */ nop /* 40297C E011633C C7A60018 */ lwc1 $f6, 0x18($sp) /* 402980 E0116340 92020015 */ lbu $v0, 0x15($s0) /* 402984 E0116344 46163580 */ add.s $f22, $f6, $f22 @@ -122,15 +122,17 @@ glabel func_E011618C /* 402990 E0116350 104000B8 */ beqz $v0, .LE0116634 /* 402994 E0116354 E616FFF8 */ swc1 $f22, -8($s0) /* 402998 E0116358 00031080 */ sll $v0, $v1, 2 -/* 40299C E011635C 3C01E011 */ lui $at, %hi(D_E0116D98) +/* 40299C E011635C 3C01E011 */ lui $at, %hi(jtbl_E0116D98_4033D8) /* 4029A0 E0116360 00220821 */ addu $at, $at, $v0 -/* 4029A4 E0116364 8C226D98 */ lw $v0, %lo(D_E0116D98)($at) +/* 4029A4 E0116364 8C226D98 */ lw $v0, %lo(jtbl_E0116D98_4033D8)($at) /* 4029A8 E0116368 00400008 */ jr $v0 -/* 4029AC E011636C 00000000 */ nop +/* 4029AC E011636C 00000000 */ nop +glabel LE0116370_4029B0 /* 4029B0 E0116370 92020015 */ lbu $v0, 0x15($s0) /* 4029B4 E0116374 AE000000 */ sw $zero, ($s0) /* 4029B8 E0116378 24420001 */ addiu $v0, $v0, 1 /* 4029BC E011637C A2020015 */ sb $v0, 0x15($s0) +glabel LE0116380_4029C0 /* 4029C0 E0116380 8E040000 */ lw $a0, ($s0) /* 4029C4 E0116384 28820029 */ slti $v0, $a0, 0x29 /* 4029C8 E0116388 10400004 */ beqz $v0, .LE011639C @@ -142,7 +144,7 @@ glabel func_E011618C /* 4029DC E011639C 86E20050 */ lh $v0, 0x50($s7) .LE01163A0: /* 4029E0 E01163A0 44820000 */ mtc1 $v0, $f0 -/* 4029E4 E01163A4 00000000 */ nop +/* 4029E4 E01163A4 00000000 */ nop /* 4029E8 E01163A8 46800020 */ cvt.s.w $f0, $f0 /* 4029EC E01163AC 2882000D */ slti $v0, $a0, 0xd /* 4029F0 E01163B0 10400006 */ beqz $v0, .LE01163CC @@ -159,7 +161,7 @@ glabel func_E011618C .LE01163D8: /* 402A18 E01163D8 28820034 */ slti $v0, $a0, 0x34 /* 402A1C E01163DC 10400006 */ beqz $v0, .LE01163F8 -/* 402A20 E01163E0 00000000 */ nop +/* 402A20 E01163E0 00000000 */ nop /* 402A24 E01163E4 3C02E011 */ lui $v0, %hi(D_E0116D08) /* 402A28 E01163E8 00441021 */ addu $v0, $v0, $a0 /* 402A2C E01163EC 90426D08 */ lbu $v0, %lo(D_E0116D08)($v0) @@ -172,7 +174,7 @@ glabel func_E011618C .LE0116404: /* 402A44 E0116404 28820030 */ slti $v0, $a0, 0x30 /* 402A48 E0116408 10400005 */ beqz $v0, .LE0116420 -/* 402A4C E011640C 00000000 */ nop +/* 402A4C E011640C 00000000 */ nop /* 402A50 E0116410 3C02E011 */ lui $v0, %hi(D_E0116D3C) /* 402A54 E0116414 00441021 */ addu $v0, $v0, $a0 /* 402A58 E0116418 0804590A */ j .LE0116428 @@ -182,23 +184,23 @@ glabel func_E011618C /* 402A64 E0116424 90426D6B */ lbu $v0, %lo(D_E0116D6B)($v0) .LE0116428: /* 402A68 E0116428 44822000 */ mtc1 $v0, $f4 -/* 402A6C E011642C 00000000 */ nop +/* 402A6C E011642C 00000000 */ nop /* 402A70 E0116430 46802120 */ cvt.s.w $f4, $f4 /* 402A74 E0116434 3C01E011 */ lui $at, %hi(D_E0116DB0) /* 402A78 E0116438 D4226DB0 */ ldc1 $f2, %lo(D_E0116DB0)($at) /* 402A7C E011643C 46002021 */ cvt.d.s $f0, $f4 /* 402A80 E0116440 46220002 */ mul.d $f0, $f0, $f2 -/* 402A84 E0116444 00000000 */ nop +/* 402A84 E0116444 00000000 */ nop /* 402A88 E0116448 02561021 */ addu $v0, $s2, $s6 /* 402A8C E011644C 90420000 */ lbu $v0, ($v0) /* 402A90 E0116450 46200120 */ cvt.s.d $f4, $f0 /* 402A94 E0116454 44820000 */ mtc1 $v0, $f0 -/* 402A98 E0116458 00000000 */ nop +/* 402A98 E0116458 00000000 */ nop /* 402A9C E011645C 46800020 */ cvt.s.w $f0, $f0 /* 402AA0 E0116460 46002002 */ mul.s $f0, $f4, $f0 -/* 402AA4 E0116464 00000000 */ nop +/* 402AA4 E0116464 00000000 */ nop /* 402AA8 E0116468 4600D03E */ c.le.s $f26, $f0 -/* 402AAC E011646C 00000000 */ nop +/* 402AAC E011646C 00000000 */ nop /* 402AB0 E0116470 45010005 */ bc1t .LE0116488 /* 402AB4 E0116474 26230026 */ addiu $v1, $s1, 0x26 /* 402AB8 E0116478 4600018D */ trunc.w.s $f6, $f0 @@ -209,19 +211,19 @@ glabel func_E011618C /* 402AC8 E0116488 461A0001 */ sub.s $f0, $f0, $f26 /* 402ACC E011648C 4600018D */ trunc.w.s $f6, $f0 /* 402AD0 E0116490 44023000 */ mfc1 $v0, $f6 -/* 402AD4 E0116494 00000000 */ nop +/* 402AD4 E0116494 00000000 */ nop /* 402AD8 E0116498 00551025 */ or $v0, $v0, $s5 /* 402ADC E011649C A0620000 */ sb $v0, ($v1) .LE01164A0: /* 402AE0 E01164A0 02561021 */ addu $v0, $s2, $s6 /* 402AE4 E01164A4 90420001 */ lbu $v0, 1($v0) /* 402AE8 E01164A8 44820000 */ mtc1 $v0, $f0 -/* 402AEC E01164AC 00000000 */ nop +/* 402AEC E01164AC 00000000 */ nop /* 402AF0 E01164B0 46800020 */ cvt.s.w $f0, $f0 /* 402AF4 E01164B4 46002002 */ mul.s $f0, $f4, $f0 -/* 402AF8 E01164B8 00000000 */ nop +/* 402AF8 E01164B8 00000000 */ nop /* 402AFC E01164BC 4600D03E */ c.le.s $f26, $f0 -/* 402B00 E01164C0 00000000 */ nop +/* 402B00 E01164C0 00000000 */ nop /* 402B04 E01164C4 45010005 */ bc1t .LE01164DC /* 402B08 E01164C8 26230027 */ addiu $v1, $s1, 0x27 /* 402B0C E01164CC 4600018D */ trunc.w.s $f6, $f0 @@ -232,19 +234,19 @@ glabel func_E011618C /* 402B1C E01164DC 461A0001 */ sub.s $f0, $f0, $f26 /* 402B20 E01164E0 4600018D */ trunc.w.s $f6, $f0 /* 402B24 E01164E4 44023000 */ mfc1 $v0, $f6 -/* 402B28 E01164E8 00000000 */ nop +/* 402B28 E01164E8 00000000 */ nop /* 402B2C E01164EC 00551025 */ or $v0, $v0, $s5 /* 402B30 E01164F0 A0620000 */ sb $v0, ($v1) .LE01164F4: /* 402B34 E01164F4 02561021 */ addu $v0, $s2, $s6 /* 402B38 E01164F8 90420002 */ lbu $v0, 2($v0) /* 402B3C E01164FC 44820000 */ mtc1 $v0, $f0 -/* 402B40 E0116500 00000000 */ nop +/* 402B40 E0116500 00000000 */ nop /* 402B44 E0116504 46800020 */ cvt.s.w $f0, $f0 /* 402B48 E0116508 46002002 */ mul.s $f0, $f4, $f0 -/* 402B4C E011650C 00000000 */ nop +/* 402B4C E011650C 00000000 */ nop /* 402B50 E0116510 4600D03E */ c.le.s $f26, $f0 -/* 402B54 E0116514 00000000 */ nop +/* 402B54 E0116514 00000000 */ nop /* 402B58 E0116518 45010005 */ bc1t .LE0116530 /* 402B5C E011651C 26230028 */ addiu $v1, $s1, 0x28 /* 402B60 E0116520 4600018D */ trunc.w.s $f6, $f0 @@ -255,13 +257,13 @@ glabel func_E011618C /* 402B70 E0116530 461A0001 */ sub.s $f0, $f0, $f26 /* 402B74 E0116534 4600018D */ trunc.w.s $f6, $f0 /* 402B78 E0116538 44023000 */ mfc1 $v0, $f6 -/* 402B7C E011653C 00000000 */ nop +/* 402B7C E011653C 00000000 */ nop /* 402B80 E0116540 00551025 */ or $v0, $v0, $s5 /* 402B84 E0116544 A0620000 */ sb $v0, ($v1) .LE0116548: /* 402B88 E0116548 28820018 */ slti $v0, $a0, 0x18 /* 402B8C E011654C 10400005 */ beqz $v0, .LE0116564 -/* 402B90 E0116550 00000000 */ nop +/* 402B90 E0116550 00000000 */ nop /* 402B94 E0116554 3C02E011 */ lui $v0, %hi(D_E0116D6C) /* 402B98 E0116558 00441021 */ addu $v0, $v0, $a0 /* 402B9C E011655C 0804595B */ j .LE011656C @@ -273,18 +275,20 @@ glabel func_E011618C /* 402BAC E011656C 3C01E011 */ lui $at, %hi(D_E0116DB8) /* 402BB0 E0116570 D4226DB8 */ ldc1 $f2, %lo(D_E0116DB8)($at) /* 402BB4 E0116574 44820000 */ mtc1 $v0, $f0 -/* 402BB8 E0116578 00000000 */ nop +/* 402BB8 E0116578 00000000 */ nop /* 402BBC E011657C 46800020 */ cvt.s.w $f0, $f0 /* 402BC0 E0116580 46000021 */ cvt.d.s $f0, $f0 /* 402BC4 E0116584 46220002 */ mul.d $f0, $f0, $f2 -/* 402BC8 E0116588 00000000 */ nop +/* 402BC8 E0116588 00000000 */ nop /* 402BCC E011658C 46200020 */ cvt.s.d $f0, $f0 /* 402BD0 E0116590 0804598D */ j .LE0116634 /* 402BD4 E0116594 E6000004 */ swc1 $f0, 4($s0) +glabel LE0116598_402BD8 /* 402BD8 E0116598 92020015 */ lbu $v0, 0x15($s0) /* 402BDC E011659C AE000000 */ sw $zero, ($s0) /* 402BE0 E01165A0 24420001 */ addiu $v0, $v0, 1 /* 402BE4 E01165A4 A2020015 */ sb $v0, 0x15($s0) +glabel LE01165A8_402BE8 /* 402BE8 E01165A8 8E040000 */ lw $a0, ($s0) /* 402BEC E01165AC 28820012 */ slti $v0, $a0, 0x12 /* 402BF0 E01165B0 1040001C */ beqz $v0, .LE0116624 @@ -294,25 +298,25 @@ glabel func_E011618C /* 402C00 E01165C0 2402005A */ addiu $v0, $zero, 0x5a /* 402C04 E01165C4 00431023 */ subu $v0, $v0, $v1 /* 402C08 E01165C8 44826000 */ mtc1 $v0, $f12 -/* 402C0C E01165CC 00000000 */ nop +/* 402C0C E01165CC 00000000 */ nop /* 402C10 E01165D0 46806320 */ cvt.s.w $f12, $f12 /* 402C14 E01165D4 0C080140 */ jal func_E0200500 /* 402C18 E01165D8 26520003 */ addiu $s2, $s2, 3 /* 402C1C E01165DC 3C013F80 */ lui $at, 0x3f80 /* 402C20 E01165E0 44811000 */ mtc1 $at, $f2 -/* 402C24 E01165E4 00000000 */ nop +/* 402C24 E01165E4 00000000 */ nop /* 402C28 E01165E8 46020000 */ add.s $f0, $f0, $f2 /* 402C2C E01165EC 3C014248 */ lui $at, 0x4248 /* 402C30 E01165F0 44811000 */ mtc1 $at, $f2 -/* 402C34 E01165F4 00000000 */ nop +/* 402C34 E01165F4 00000000 */ nop /* 402C38 E01165F8 46020002 */ mul.s $f0, $f0, $f2 -/* 402C3C E01165FC 00000000 */ nop +/* 402C3C E01165FC 00000000 */ nop /* 402C40 E0116600 3C013FE0 */ lui $at, 0x3fe0 /* 402C44 E0116604 44811800 */ mtc1 $at, $f3 /* 402C48 E0116608 44801000 */ mtc1 $zero, $f2 /* 402C4C E011660C 46000021 */ cvt.d.s $f0, $f0 /* 402C50 E0116610 46220002 */ mul.d $f0, $f0, $f2 -/* 402C54 E0116614 00000000 */ nop +/* 402C54 E0116614 00000000 */ nop /* 402C58 E0116618 46200020 */ cvt.s.d $f0, $f0 /* 402C5C E011661C 0804598E */ j .LE0116638 /* 402C60 E0116620 E6000018 */ swc1 $f0, 0x18($s0) @@ -322,6 +326,7 @@ glabel func_E011618C /* 402C6C E011662C 24420001 */ addiu $v0, $v0, 1 /* 402C70 E0116630 A2020015 */ sb $v0, 0x15($s0) .LE0116634: +glabel LE0116634_402C74 /* 402C74 E0116634 26520003 */ addiu $s2, $s2, 3 .LE0116638: /* 402C78 E0116638 26730001 */ addiu $s3, $s3, 1 diff --git a/asm/nonmatchings/code_402640/func_E01166E8.s b/asm/nonmatchings/code_402640/func_E01166E8.s index 96e16575b3..b3d3255df0 100644 --- a/asm/nonmatchings/code_402640/func_E01166E8.s +++ b/asm/nonmatchings/code_402640/func_E01166E8.s @@ -23,7 +23,7 @@ glabel func_E01166E8 /* 402D70 E0116730 00230821 */ addu $at, $at, $v1 /* 402D74 E0116734 C4261DEC */ lwc1 $f6, %lo(D_800B1DEC)($at) /* 402D78 E0116738 080459D1 */ j .LE0116744 -/* 402D7C E011673C 00000000 */ nop +/* 402D7C E011673C 00000000 */ nop .LE0116740: /* 402D80 E0116740 44803000 */ mtc1 $zero, $f6 .LE0116744: diff --git a/asm/nonmatchings/code_402640/func_E0116884.s b/asm/nonmatchings/code_402640/func_E0116884.s index 8ee013d740..ef61ca727b 100644 --- a/asm/nonmatchings/code_402640/func_E0116884.s +++ b/asm/nonmatchings/code_402640/func_E0116884.s @@ -77,18 +77,18 @@ glabel func_E0116884 /* 402FE0 E01169A0 3C014080 */ lui $at, 0x4080 /* 402FE4 E01169A4 44810000 */ mtc1 $at, $f0 /* 402FE8 E01169A8 449E1000 */ mtc1 $fp, $f2 -/* 402FEC E01169AC 00000000 */ nop +/* 402FEC E01169AC 00000000 */ nop /* 402FF0 E01169B0 468010A0 */ cvt.s.w $f2, $f2 /* 402FF4 E01169B4 46001082 */ mul.s $f2, $f2, $f0 -/* 402FF8 E01169B8 00000000 */ nop +/* 402FF8 E01169B8 00000000 */ nop /* 402FFC E01169BC 3C0142C8 */ lui $at, 0x42c8 /* 403000 E01169C0 44813000 */ mtc1 $at, $f6 -/* 403004 E01169C4 00000000 */ nop +/* 403004 E01169C4 00000000 */ nop /* 403008 E01169C8 46061182 */ mul.s $f6, $f2, $f6 -/* 40300C E01169CC 00000000 */ nop +/* 40300C E01169CC 00000000 */ nop /* 403010 E01169D0 460031A1 */ cvt.d.s $f6, $f6 /* 403014 E01169D4 46343182 */ mul.d $f6, $f6, $f20 -/* 403018 E01169D8 00000000 */ nop +/* 403018 E01169D8 00000000 */ nop /* 40301C E01169DC 8E260000 */ lw $a2, ($s1) /* 403020 E01169E0 3C014220 */ lui $at, 0x4220 /* 403024 E01169E4 44812000 */ mtc1 $at, $f4 @@ -99,7 +99,7 @@ glabel func_E0116884 /* 403038 E01169F8 AE260000 */ sw $a2, ($s1) /* 40303C E01169FC AC820000 */ sw $v0, ($a0) /* 403040 E0116A00 46041102 */ mul.s $f4, $f2, $f4 -/* 403044 E0116A04 00000000 */ nop +/* 403044 E0116A04 00000000 */ nop /* 403048 E0116A08 9203FFFF */ lbu $v1, -1($s0) /* 40304C E0116A0C 3C014348 */ lui $at, 0x4348 /* 403050 E0116A10 44810000 */ mtc1 $at, $f0 @@ -107,7 +107,7 @@ glabel func_E0116884 /* 403058 E0116A18 AE220000 */ sw $v0, ($s1) /* 40305C E0116A1C 46002121 */ cvt.d.s $f4, $f4 /* 403060 E0116A20 46342102 */ mul.d $f4, $f4, $f20 -/* 403064 E0116A24 00000000 */ nop +/* 403064 E0116A24 00000000 */ nop /* 403068 E0116A28 AC830004 */ sw $v1, 4($a0) /* 40306C E0116A2C ACD60000 */ sw $s6, ($a2) /* 403070 E0116A30 92030001 */ lbu $v1, 1($s0) @@ -116,14 +116,14 @@ glabel func_E0116884 /* 40307C E0116A3C 24C20010 */ addiu $v0, $a2, 0x10 /* 403080 E0116A40 AE220000 */ sw $v0, ($s1) /* 403084 E0116A44 46001002 */ mul.s $f0, $f2, $f0 -/* 403088 E0116A48 00000000 */ nop +/* 403088 E0116A48 00000000 */ nop /* 40308C E0116A4C 24C20018 */ addiu $v0, $a2, 0x18 /* 403090 E0116A50 ACD40008 */ sw $s4, 8($a2) /* 403094 E0116A54 AE220000 */ sw $v0, ($s1) /* 403098 E0116A58 00031E00 */ sll $v1, $v1, 0x18 /* 40309C E0116A5C 46000021 */ cvt.d.s $f0, $f0 /* 4030A0 E0116A60 46340002 */ mul.d $f0, $f0, $f20 -/* 4030A4 E0116A64 00000000 */ nop +/* 4030A4 E0116A64 00000000 */ nop /* 4030A8 E0116A68 00042400 */ sll $a0, $a0, 0x10 /* 4030AC E0116A6C 00641825 */ or $v1, $v1, $a0 /* 4030B0 E0116A70 00052A00 */ sll $a1, $a1, 8 @@ -133,14 +133,14 @@ glabel func_E0116884 /* 4030C0 E0116A80 3C03E011 */ lui $v1, %hi(D_E0116C6C) /* 4030C4 E0116A84 8C636C6C */ lw $v1, %lo(D_E0116C6C)($v1) /* 4030C8 E0116A88 46081082 */ mul.s $f2, $f2, $f8 -/* 4030CC E0116A8C 00000000 */ nop +/* 4030CC E0116A8C 00000000 */ nop /* 4030D0 E0116A90 24C20020 */ addiu $v0, $a2, 0x20 /* 4030D4 E0116A94 AE220000 */ sw $v0, ($s1) /* 4030D8 E0116A98 ACD40020 */ sw $s4, 0x20($a2) /* 4030DC E0116A9C ACC3000C */ sw $v1, 0xc($a2) /* 4030E0 E0116AA0 460010A1 */ cvt.d.s $f2, $f2 /* 4030E4 E0116AA4 46341082 */ mul.d $f2, $f2, $f20 -/* 4030E8 E0116AA8 00000000 */ nop +/* 4030E8 E0116AA8 00000000 */ nop /* 4030EC E0116AAC 4620328D */ trunc.w.d $f10, $f6 /* 4030F0 E0116AB0 44075000 */ mfc1 $a3, $f10 /* 4030F4 E0116AB4 4620228D */ trunc.w.d $f10, $f4 @@ -252,5 +252,5 @@ glabel func_E0116884 /* 40328C E0116C4C D7B40038 */ ldc1 $f20, 0x38($sp) /* 403290 E0116C50 03E00008 */ jr $ra /* 403294 E0116C54 27BD0040 */ addiu $sp, $sp, 0x40 -/* 403298 E0116C58 00000000 */ nop -/* 40329C E0116C5C 00000000 */ nop +/* 403298 E0116C58 00000000 */ nop +/* 40329C E0116C5C 00000000 */ nop diff --git a/asm/nonmatchings/code_403400/func_E0118000.s b/asm/nonmatchings/code_403400/func_E0118000.s index b86fa7b9a6..aa09331ae5 100644 --- a/asm/nonmatchings/code_403400/func_E0118000.s +++ b/asm/nonmatchings/code_403400/func_E0118000.s @@ -45,7 +45,7 @@ glabel func_E0118000 /* 4034A0 E01180A0 AE62000C */ sw $v0, 0xc($s3) .LE01180A4: /* 4034A4 E01180A4 08046029 */ j .LE01180A4 -/* 4034A8 E01180A8 00000000 */ nop +/* 4034A8 E01180A8 00000000 */ nop .LE01180AC: /* 4034AC E01180AC AC710000 */ sw $s1, ($v1) /* 4034B0 E01180B0 1E000004 */ bgtz $s0, .LE01180C4 @@ -76,10 +76,10 @@ glabel func_E0118000 /* 403508 E0118108 E61CFFE4 */ swc1 $f28, -0x1c($s0) /* 40350C E011810C 2442FFFB */ addiu $v0, $v0, -5 /* 403510 E0118110 44820000 */ mtc1 $v0, $f0 -/* 403514 E0118114 00000000 */ nop +/* 403514 E0118114 00000000 */ nop /* 403518 E0118118 46800021 */ cvt.d.w $f0, $f0 /* 40351C E011811C 46360002 */ mul.d $f0, $f0, $f22 -/* 403520 E0118120 00000000 */ nop +/* 403520 E0118120 00000000 */ nop /* 403524 E0118124 24040005 */ addiu $a0, $zero, 5 /* 403528 E0118128 46200020 */ cvt.s.d $f0, $f0 /* 40352C E011812C 0C080138 */ jal func_E02004E0 @@ -88,20 +88,20 @@ glabel func_E0118000 /* 403538 E0118138 3C01E012 */ lui $at, %hi(D_E01187D8) /* 40353C E011813C D42287D8 */ ldc1 $f2, %lo(D_E01187D8)($at) /* 403540 E0118140 44820000 */ mtc1 $v0, $f0 -/* 403544 E0118144 00000000 */ nop +/* 403544 E0118144 00000000 */ nop /* 403548 E0118148 46800021 */ cvt.d.w $f0, $f0 /* 40354C E011814C 46220002 */ mul.d $f0, $f0, $f2 -/* 403550 E0118150 00000000 */ nop +/* 403550 E0118150 00000000 */ nop /* 403554 E0118154 2404000A */ addiu $a0, $zero, 0xa /* 403558 E0118158 46200020 */ cvt.s.d $f0, $f0 /* 40355C E011815C 0C080138 */ jal func_E02004E0 /* 403560 E0118160 E600FFEC */ swc1 $f0, -0x14($s0) /* 403564 E0118164 2442FFFB */ addiu $v0, $v0, -5 /* 403568 E0118168 44820000 */ mtc1 $v0, $f0 -/* 40356C E011816C 00000000 */ nop +/* 40356C E011816C 00000000 */ nop /* 403570 E0118170 46800021 */ cvt.d.w $f0, $f0 /* 403574 E0118174 46360002 */ mul.d $f0, $f0, $f22 -/* 403578 E0118178 00000000 */ nop +/* 403578 E0118178 00000000 */ nop /* 40357C E011817C 240400FF */ addiu $a0, $zero, 0xff /* 403580 E0118180 E61EFFFC */ swc1 $f30, -4($s0) /* 403584 E0118184 46200020 */ cvt.s.d $f0, $f0 @@ -145,38 +145,38 @@ glabel func_E0118000 .LE0118214: /* 403614 E0118214 8602000C */ lh $v0, 0xc($s0) /* 403618 E0118218 44822000 */ mtc1 $v0, $f4 -/* 40361C E011821C 00000000 */ nop +/* 40361C E011821C 00000000 */ nop /* 403620 E0118220 46802121 */ cvt.d.w $f4, $f4 /* 403624 E0118224 46342102 */ mul.d $f4, $f4, $f20 -/* 403628 E0118228 00000000 */ nop +/* 403628 E0118228 00000000 */ nop /* 40362C E011822C 8602000E */ lh $v0, 0xe($s0) /* 403630 E0118230 44821000 */ mtc1 $v0, $f2 -/* 403634 E0118234 00000000 */ nop +/* 403634 E0118234 00000000 */ nop /* 403638 E0118238 468010A1 */ cvt.d.w $f2, $f2 /* 40363C E011823C 46341082 */ mul.d $f2, $f2, $f20 -/* 403640 E0118240 00000000 */ nop +/* 403640 E0118240 00000000 */ nop /* 403644 E0118244 86020010 */ lh $v0, 0x10($s0) /* 403648 E0118248 44820000 */ mtc1 $v0, $f0 -/* 40364C E011824C 00000000 */ nop +/* 40364C E011824C 00000000 */ nop /* 403650 E0118250 46800021 */ cvt.d.w $f0, $f0 /* 403654 E0118254 46340002 */ mul.d $f0, $f0, $f20 -/* 403658 E0118258 00000000 */ nop +/* 403658 E0118258 00000000 */ nop /* 40365C E011825C 24040167 */ addiu $a0, $zero, 0x167 /* 403660 E0118260 26310001 */ addiu $s1, $s1, 1 /* 403664 E0118264 4620218D */ trunc.w.d $f6, $f4 /* 403668 E0118268 44023000 */ mfc1 $v0, $f6 -/* 40366C E011826C 00000000 */ nop +/* 40366C E011826C 00000000 */ nop /* 403670 E0118270 A602000C */ sh $v0, 0xc($s0) /* 403674 E0118274 4620118D */ trunc.w.d $f6, $f2 /* 403678 E0118278 44023000 */ mfc1 $v0, $f6 -/* 40367C E011827C 00000000 */ nop +/* 40367C E011827C 00000000 */ nop /* 403680 E0118280 A602000E */ sh $v0, 0xe($s0) /* 403684 E0118284 4620018D */ trunc.w.d $f6, $f0 /* 403688 E0118288 44023000 */ mfc1 $v0, $f6 /* 40368C E011828C 0C080138 */ jal func_E02004E0 /* 403690 E0118290 A6020010 */ sh $v0, 0x10($s0) /* 403694 E0118294 44820000 */ mtc1 $v0, $f0 -/* 403698 E0118298 00000000 */ nop +/* 403698 E0118298 00000000 */ nop /* 40369C E011829C 46800020 */ cvt.s.w $f0, $f0 /* 4036A0 E01182A0 E6000000 */ swc1 $f0, ($s0) /* 4036A4 E01182A4 8E620008 */ lw $v0, 8($s3) diff --git a/asm/nonmatchings/code_403400/func_E01182EC.s b/asm/nonmatchings/code_403400/func_E01182EC.s index 1e01715647..8c4fe2bdf8 100644 --- a/asm/nonmatchings/code_403400/func_E01182EC.s +++ b/asm/nonmatchings/code_403400/func_E01182EC.s @@ -3,4 +3,4 @@ glabel func_E01182EC /* 4036EC E01182EC 03E00008 */ jr $ra -/* 4036F0 E01182F0 00000000 */ nop +/* 4036F0 E01182F0 00000000 */ nop diff --git a/asm/nonmatchings/code_403400/func_E01182F4.s b/asm/nonmatchings/code_403400/func_E01182F4.s index 819f269f56..a407e17e5d 100644 --- a/asm/nonmatchings/code_403400/func_E01182F4.s +++ b/asm/nonmatchings/code_403400/func_E01182F4.s @@ -26,9 +26,9 @@ glabel func_E01182F4 /* 403740 E0118340 04610005 */ bgez $v1, .LE0118358 /* 403744 E0118344 ACA20020 */ sw $v0, 0x20($a1) /* 403748 E0118348 0C080128 */ jal func_E02004A0 -/* 40374C E011834C 00000000 */ nop +/* 40374C E011834C 00000000 */ nop /* 403750 E0118350 08046112 */ j .LE0118448 -/* 403754 E0118354 00000000 */ nop +/* 403754 E0118354 00000000 */ nop .LE0118358: /* 403758 E0118358 28620008 */ slti $v0, $v1, 8 /* 40375C E011835C 10400002 */ beqz $v0, .LE0118368 @@ -66,12 +66,12 @@ glabel func_E01182F4 /* 4037D4 E01183D4 E4A0FFE4 */ swc1 $f0, -0x1c($a1) /* 4037D8 E01183D8 C4A0FFEC */ lwc1 $f0, -0x14($a1) /* 4037DC E01183DC 4608003C */ c.lt.s $f0, $f8 -/* 4037E0 E01183E0 00000000 */ nop +/* 4037E0 E01183E0 00000000 */ nop /* 4037E4 E01183E4 45000008 */ bc1f .LE0118408 /* 4037E8 E01183E8 30C20001 */ andi $v0, $a2, 1 /* 4037EC E01183EC 46000021 */ cvt.d.s $f0, $f0 /* 4037F0 E01183F0 462A0002 */ mul.d $f0, $f0, $f10 -/* 4037F4 E01183F4 00000000 */ nop +/* 4037F4 E01183F4 00000000 */ nop /* 4037F8 E01183F8 E4A8FFE0 */ swc1 $f8, -0x20($a1) /* 4037FC E01183FC 46200020 */ cvt.s.d $f0, $f0 /* 403800 E0118400 E4A0FFEC */ swc1 $f0, -0x14($a1) @@ -85,7 +85,7 @@ glabel func_E01182F4 /* 403818 E0118418 00031840 */ sll $v1, $v1, 1 /* 40381C E011841C C4A20000 */ lwc1 $f2, ($a1) /* 403820 E0118420 44830000 */ mtc1 $v1, $f0 -/* 403824 E0118424 00000000 */ nop +/* 403824 E0118424 00000000 */ nop /* 403828 E0118428 46800020 */ cvt.s.w $f0, $f0 /* 40382C E011842C 46001080 */ add.s $f2, $f2, $f0 /* 403830 E0118430 24C60001 */ addiu $a2, $a2, 1 diff --git a/asm/nonmatchings/code_403400/func_E011849C.s b/asm/nonmatchings/code_403400/func_E011849C.s index dcde70a27d..fe4a1b33c2 100644 --- a/asm/nonmatchings/code_403400/func_E011849C.s +++ b/asm/nonmatchings/code_403400/func_E011849C.s @@ -71,7 +71,7 @@ glabel func_E011849C /* 4039A0 E01185A0 46000021 */ cvt.d.s $f0, $f0 /* 4039A4 E01185A4 00021080 */ sll $v0, $v0, 2 /* 4039A8 E01185A8 46220002 */ mul.d $f0, $f0, $f2 -/* 4039AC E01185AC 00000000 */ nop +/* 4039AC E01185AC 00000000 */ nop /* 4039B0 E01185B0 00431023 */ subu $v0, $v0, $v1 /* 4039B4 E01185B4 000218C0 */ sll $v1, $v0, 3 /* 4039B8 E01185B8 00431021 */ addu $v0, $v0, $v1 diff --git a/asm/nonmatchings/code_404220/func_E011A000.s b/asm/nonmatchings/code_404220/func_E011A000.s index 0370ae6b8c..0fbdfffe2b 100644 --- a/asm/nonmatchings/code_404220/func_E011A000.s +++ b/asm/nonmatchings/code_404220/func_E011A000.s @@ -36,7 +36,7 @@ glabel func_E011A000 /* 40429C E011A07C AE02000C */ sw $v0, 0xc($s0) .LE011A080: /* 4042A0 E011A080 08046820 */ j .LE011A080 -/* 4042A4 E011A084 00000000 */ nop +/* 4042A4 E011A084 00000000 */ nop .LE011A088: /* 4042A8 E011A088 A4B10000 */ sh $s1, ($a1) /* 4042AC E011A08C 1E400004 */ bgtz $s2, .LE011A0A0 diff --git a/asm/nonmatchings/code_404220/func_E011A0FC.s b/asm/nonmatchings/code_404220/func_E011A0FC.s index 0d61a6452e..c032dce6fa 100644 --- a/asm/nonmatchings/code_404220/func_E011A0FC.s +++ b/asm/nonmatchings/code_404220/func_E011A0FC.s @@ -3,4 +3,4 @@ glabel func_E011A0FC /* 40431C E011A0FC 03E00008 */ jr $ra -/* 404320 E011A100 00000000 */ nop +/* 404320 E011A100 00000000 */ nop diff --git a/asm/nonmatchings/code_404220/func_E011A104.s b/asm/nonmatchings/code_404220/func_E011A104.s index e1499e578a..c607216fa1 100644 --- a/asm/nonmatchings/code_404220/func_E011A104.s +++ b/asm/nonmatchings/code_404220/func_E011A104.s @@ -34,9 +34,9 @@ glabel func_E011A104 /* 404390 E011A170 04610005 */ bgez $v1, .LE011A188 /* 404394 E011A174 AE250008 */ sw $a1, 8($s1) /* 404398 E011A178 0C080128 */ jal func_E02004A0 -/* 40439C E011A17C 00000000 */ nop +/* 40439C E011A17C 00000000 */ nop /* 4043A0 E011A180 080468DC */ j .LE011A370 -/* 4043A4 E011A184 00000000 */ nop +/* 4043A4 E011A184 00000000 */ nop .LE011A188: /* 4043A8 E011A188 3C028888 */ lui $v0, 0x8888 /* 4043AC E011A18C 34428889 */ ori $v0, $v0, 0x8889 @@ -60,9 +60,9 @@ glabel func_E011A104 /* 4043F0 E011A1D0 A6000004 */ sh $zero, 4($s0) .LE011A1D4: /* 4043F4 E011A1D4 16D40006 */ bne $s6, $s4, .LE011A1F0 -/* 4043F8 E011A1D8 00000000 */ nop +/* 4043F8 E011A1D8 00000000 */ nop /* 4043FC E011A1DC 16A00004 */ bnez $s5, .LE011A1F0 -/* 404400 E011A1E0 00000000 */ nop +/* 404400 E011A1E0 00000000 */ nop /* 404404 E011A1E4 0C080138 */ jal func_E02004E0 /* 404408 E011A1E8 24040004 */ addiu $a0, $zero, 4 /* 40440C E011A1EC A6020004 */ sh $v0, 4($s0) @@ -71,15 +71,16 @@ glabel func_E011A104 /* 404414 E011A1F4 2C620029 */ sltiu $v0, $v1, 0x29 /* 404418 E011A1F8 10400059 */ beqz $v0, .LE011A360 /* 40441C E011A1FC 00031080 */ sll $v0, $v1, 2 -/* 404420 E011A200 3C01E012 */ lui $at, %hi(D_E011AC70) +/* 404420 E011A200 3C01E012 */ lui $at, %hi(jtbl_E011AC70_404E90) /* 404424 E011A204 00220821 */ addu $at, $at, $v0 -/* 404428 E011A208 8C22AC70 */ lw $v0, %lo(D_E011AC70)($at) +/* 404428 E011A208 8C22AC70 */ lw $v0, %lo(jtbl_E011AC70_404E90)($at) /* 40442C E011A20C 00400008 */ jr $v0 -/* 404430 E011A210 00000000 */ nop +/* 404430 E011A210 00000000 */ nop +glabel LE011A214_404434 /* 404434 E011A214 86030000 */ lh $v1, ($s0) /* 404438 E011A218 240200FF */ addiu $v0, $zero, 0xff /* 40443C E011A21C 14620011 */ bne $v1, $v0, .LE011A264 -/* 404440 E011A220 00000000 */ nop +/* 404440 E011A220 00000000 */ nop /* 404444 E011A224 86040004 */ lh $a0, 4($s0) /* 404448 E011A228 86030002 */ lh $v1, 2($s0) /* 40444C E011A22C 0083102A */ slt $v0, $a0, $v1 @@ -106,9 +107,11 @@ glabel func_E011A104 /* 404494 E011A274 24020004 */ addiu $v0, $zero, 4 /* 404498 E011A278 080468D8 */ j .LE011A360 /* 40449C E011A27C A6020006 */ sh $v0, 6($s0) +glabel LE011A280_4044A0 /* 4044A0 E011A280 2402000A */ addiu $v0, $zero, 0xa /* 4044A4 E011A284 A6000008 */ sh $zero, 8($s0) /* 4044A8 E011A288 A6020006 */ sh $v0, 6($s0) +glabel LE011A28C_4044AC /* 4044AC E011A28C 96020008 */ lhu $v0, 8($s0) /* 4044B0 E011A290 24420001 */ addiu $v0, $v0, 1 /* 4044B4 E011A294 A6020008 */ sh $v0, 8($s0) @@ -123,9 +126,11 @@ glabel func_E011A104 /* 4044D8 E011A2B8 2442FFFF */ addiu $v0, $v0, -1 /* 4044DC E011A2BC 080468D8 */ j .LE011A360 /* 4044E0 E011A2C0 A6020002 */ sh $v0, 2($s0) +glabel LE011A2C4_4044E4 /* 4044E4 E011A2C4 24020014 */ addiu $v0, $zero, 0x14 /* 4044E8 E011A2C8 A6000008 */ sh $zero, 8($s0) /* 4044EC E011A2CC A6020006 */ sh $v0, 6($s0) +glabel LE011A2D0_4044F0 /* 4044F0 E011A2D0 96020008 */ lhu $v0, 8($s0) /* 4044F4 E011A2D4 24420001 */ addiu $v0, $v0, 1 /* 4044F8 E011A2D8 A6020008 */ sh $v0, 8($s0) @@ -139,6 +144,7 @@ glabel func_E011A104 /* 404518 E011A2F8 A6000006 */ sh $zero, 6($s0) /* 40451C E011A2FC 080468D8 */ j .LE011A360 /* 404520 E011A300 A6020002 */ sh $v0, 2($s0) +glabel LE011A304_404524 /* 404524 E011A304 96020000 */ lhu $v0, ($s0) /* 404528 E011A308 2442FFE0 */ addiu $v0, $v0, -0x20 /* 40452C E011A30C A6020000 */ sh $v0, ($s0) @@ -147,10 +153,12 @@ glabel func_E011A104 /* 404538 E011A318 26730001 */ addiu $s3, $s3, 1 /* 40453C E011A31C 080468D7 */ j .LE011A35C /* 404540 E011A320 A6000000 */ sh $zero, ($s0) +glabel LE011A324_404544 /* 404544 E011A324 96030004 */ lhu $v1, 4($s0) /* 404548 E011A328 24020028 */ addiu $v0, $zero, 0x28 /* 40454C E011A32C A6020006 */ sh $v0, 6($s0) /* 404550 E011A330 A6030002 */ sh $v1, 2($s0) +glabel LE011A334_404554 /* 404554 E011A334 96020000 */ lhu $v0, ($s0) /* 404558 E011A338 24420040 */ addiu $v0, $v0, 0x40 /* 40455C E011A33C A6020000 */ sh $v0, ($s0) @@ -164,6 +172,7 @@ glabel func_E011A104 .LE011A35C: /* 40457C E011A35C A6000006 */ sh $zero, 6($s0) .LE011A360: +glabel LE011A360_404580 /* 404580 E011A360 26730001 */ addiu $s3, $s3, 1 .LE011A364: /* 404584 E011A364 2A620003 */ slti $v0, $s3, 3 diff --git a/asm/nonmatchings/code_404220/func_E011A398.s b/asm/nonmatchings/code_404220/func_E011A398.s index 8fb17838f7..55ea805dce 100644 --- a/asm/nonmatchings/code_404220/func_E011A398.s +++ b/asm/nonmatchings/code_404220/func_E011A398.s @@ -3,4 +3,4 @@ glabel func_E011A398 /* 4045B8 E011A398 03E00008 */ jr $ra -/* 4045BC E011A39C 00000000 */ nop +/* 4045BC E011A39C 00000000 */ nop diff --git a/asm/nonmatchings/code_404220/func_E011A3A0.s b/asm/nonmatchings/code_404220/func_E011A3A0.s index a191a48923..4d3abd7d97 100644 --- a/asm/nonmatchings/code_404220/func_E011A3A0.s +++ b/asm/nonmatchings/code_404220/func_E011A3A0.s @@ -5,7 +5,7 @@ glabel func_E011A3A0 /* 4045C0 E011A3A0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 4045C4 E011A3A4 AFBF0010 */ sw $ra, 0x10($sp) /* 4045C8 E011A3A8 0C0469C0 */ jal func_E011A700 -/* 4045CC E011A3AC 00000000 */ nop +/* 4045CC E011A3AC 00000000 */ nop /* 4045D0 E011A3B0 8FBF0010 */ lw $ra, 0x10($sp) /* 4045D4 E011A3B4 03E00008 */ jr $ra /* 4045D8 E011A3B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_404220/func_E011A48C.s b/asm/nonmatchings/code_404220/func_E011A48C.s index ee4e34ccfb..6540bd2118 100644 --- a/asm/nonmatchings/code_404220/func_E011A48C.s +++ b/asm/nonmatchings/code_404220/func_E011A48C.s @@ -58,7 +58,7 @@ glabel func_E011A48C /* 40476C E011A54C 24840004 */ addiu $a0, $a0, 4 /* 404770 E011A550 4600218D */ trunc.w.s $f6, $f4 /* 404774 E011A554 44023000 */ mfc1 $v0, $f6 -/* 404778 E011A558 00000000 */ nop +/* 404778 E011A558 00000000 */ nop /* 40477C E011A55C 00021400 */ sll $v0, $v0, 0x10 /* 404780 E011A560 00021403 */ sra $v0, $v0, 0x10 /* 404784 E011A564 04410007 */ bgez $v0, .LE011A584 @@ -88,7 +88,7 @@ glabel func_E011A48C /* 4047D0 E011A5B0 46002007 */ neg.s $f0, $f4 /* 4047D4 E011A5B4 4600018D */ trunc.w.s $f6, $f0 /* 4047D8 E011A5B8 44023000 */ mfc1 $v0, $f6 -/* 4047DC E011A5BC 00000000 */ nop +/* 4047DC E011A5BC 00000000 */ nop /* 4047E0 E011A5C0 00021400 */ sll $v0, $v0, 0x10 /* 4047E4 E011A5C4 00021C03 */ sra $v1, $v0, 0x10 /* 4047E8 E011A5C8 0461000C */ bgez $v1, .LE011A5FC @@ -130,38 +130,38 @@ glabel func_E011A48C /* 404868 E011A648 3C02F100 */ lui $v0, 0xf100 /* 40486C E011A64C AC820000 */ sw $v0, ($a0) /* 404870 E011A650 4604003E */ c.le.s $f0, $f4 -/* 404874 E011A654 00000000 */ nop +/* 404874 E011A654 00000000 */ nop /* 404878 E011A658 45010005 */ bc1t .LE011A670 /* 40487C E011A65C 24840004 */ addiu $a0, $a0, 4 /* 404880 E011A660 4600218D */ trunc.w.s $f6, $f4 /* 404884 E011A664 44033000 */ mfc1 $v1, $f6 /* 404888 E011A668 080469A2 */ j .LE011A688 -/* 40488C E011A66C 00000000 */ nop +/* 40488C E011A66C 00000000 */ nop .LE011A670: /* 404890 E011A670 46002001 */ sub.s $f0, $f4, $f0 /* 404894 E011A674 3C028000 */ lui $v0, 0x8000 /* 404898 E011A678 4600018D */ trunc.w.s $f6, $f0 /* 40489C E011A67C 44033000 */ mfc1 $v1, $f6 -/* 4048A0 E011A680 00000000 */ nop +/* 4048A0 E011A680 00000000 */ nop /* 4048A4 E011A684 00621825 */ or $v1, $v1, $v0 .LE011A688: /* 4048A8 E011A688 3C014F00 */ lui $at, 0x4f00 /* 4048AC E011A68C 44811000 */ mtc1 $at, $f2 /* 4048B0 E011A690 46002007 */ neg.s $f0, $f4 /* 4048B4 E011A694 4600103E */ c.le.s $f2, $f0 -/* 4048B8 E011A698 00000000 */ nop +/* 4048B8 E011A698 00000000 */ nop /* 4048BC E011A69C 45010005 */ bc1t .LE011A6B4 /* 4048C0 E011A6A0 00033400 */ sll $a2, $v1, 0x10 /* 4048C4 E011A6A4 4600018D */ trunc.w.s $f6, $f0 /* 4048C8 E011A6A8 44073000 */ mfc1 $a3, $f6 /* 4048CC E011A6AC 080469B3 */ j .LE011A6CC -/* 4048D0 E011A6B0 00000000 */ nop +/* 4048D0 E011A6B0 00000000 */ nop .LE011A6B4: /* 4048D4 E011A6B4 46020001 */ sub.s $f0, $f0, $f2 /* 4048D8 E011A6B8 3C028000 */ lui $v0, 0x8000 /* 4048DC E011A6BC 4600018D */ trunc.w.s $f6, $f0 /* 4048E0 E011A6C0 44073000 */ mfc1 $a3, $f6 -/* 4048E4 E011A6C4 00000000 */ nop +/* 4048E4 E011A6C4 00000000 */ nop /* 4048E8 E011A6C8 00E23825 */ or $a3, $a3, $v0 .LE011A6CC: /* 4048EC E011A6CC 3C05800A */ lui $a1, %hi(gMasterGfxPos) diff --git a/asm/nonmatchings/code_404220/func_E011A700.s b/asm/nonmatchings/code_404220/func_E011A700.s index 83185cf098..4b0ae8a795 100644 --- a/asm/nonmatchings/code_404220/func_E011A700.s +++ b/asm/nonmatchings/code_404220/func_E011A700.s @@ -133,7 +133,7 @@ glabel func_E011A700 /* 404B10 E011A8F0 24110009 */ addiu $s1, $zero, 9 .LE011A8F4: /* 404B14 E011A8F4 0C0468EF */ jal func_E011A3BC -/* 404B18 E011A8F8 00000000 */ nop +/* 404B18 E011A8F8 00000000 */ nop /* 404B1C E011A8FC 86030006 */ lh $v1, 6($s0) /* 404B20 E011A900 2402000A */ addiu $v0, $zero, 0xa /* 404B24 E011A904 10620006 */ beq $v1, $v0, .LE011A920 @@ -170,19 +170,19 @@ glabel func_E011A700 /* 404B94 E011A974 AC640004 */ sw $a0, 4($v1) /* 404B98 E011A978 80420000 */ lb $v0, ($v0) /* 404B9C E011A97C 44820000 */ mtc1 $v0, $f0 -/* 404BA0 E011A980 00000000 */ nop +/* 404BA0 E011A980 00000000 */ nop /* 404BA4 E011A984 46800020 */ cvt.s.w $f0, $f0 /* 404BA8 E011A988 46160102 */ mul.s $f4, $f0, $f22 -/* 404BAC E011A98C 00000000 */ nop +/* 404BAC E011A98C 00000000 */ nop /* 404BB0 E011A990 3C013F80 */ lui $at, 0x3f80 /* 404BB4 E011A994 44810000 */ mtc1 $at, $f0 -/* 404BB8 E011A998 00000000 */ nop +/* 404BB8 E011A998 00000000 */ nop /* 404BBC E011A99C 46002001 */ sub.s $f0, $f4, $f0 /* 404BC0 E011A9A0 3C014180 */ lui $at, 0x4180 /* 404BC4 E011A9A4 44811000 */ mtc1 $at, $f2 /* 404BC8 E011A9A8 46000007 */ neg.s $f0, $f0 /* 404BCC E011A9AC 46020002 */ mul.s $f0, $f0, $f2 -/* 404BD0 E011A9B0 00000000 */ nop +/* 404BD0 E011A9B0 00000000 */ nop /* 404BD4 E011A9B4 3C013FE0 */ lui $at, 0x3fe0 /* 404BD8 E011A9B8 44811800 */ mtc1 $at, $f3 /* 404BDC E011A9BC 44801000 */ mtc1 $zero, $f2 @@ -192,14 +192,14 @@ glabel func_E011A700 /* 404BEC E011A9CC 44072000 */ mfc1 $a3, $f4 /* 404BF0 E011A9D0 4620018D */ trunc.w.d $f6, $f0 /* 404BF4 E011A9D4 44043000 */ mfc1 $a0, $f6 -/* 404BF8 E011A9D8 00000000 */ nop +/* 404BF8 E011A9D8 00000000 */ nop /* 404BFC E011A9DC 00931021 */ addu $v0, $a0, $s3 /* 404C00 E011A9E0 44821000 */ mtc1 $v0, $f2 -/* 404C04 E011A9E4 00000000 */ nop +/* 404C04 E011A9E4 00000000 */ nop /* 404C08 E011A9E8 468010A0 */ cvt.s.w $f2, $f2 /* 404C0C E011A9EC 24820032 */ addiu $v0, $a0, 0x32 /* 404C10 E011A9F0 44820000 */ mtc1 $v0, $f0 -/* 404C14 E011A9F4 00000000 */ nop +/* 404C14 E011A9F4 00000000 */ nop /* 404C18 E011A9F8 46800020 */ cvt.s.w $f0, $f0 /* 404C1C E011A9FC 4600118D */ trunc.w.s $f6, $f2 /* 404C20 E011AA00 44043000 */ mfc1 $a0, $f6 @@ -234,16 +234,16 @@ glabel func_E011A700 /* 404C8C E011AA6C 00022023 */ negu $a0, $v0 /* 404C90 E011AA70 00531021 */ addu $v0, $v0, $s3 /* 404C94 E011AA74 44830000 */ mtc1 $v1, $f0 -/* 404C98 E011AA78 00000000 */ nop +/* 404C98 E011AA78 00000000 */ nop /* 404C9C E011AA7C 46800020 */ cvt.s.w $f0, $f0 /* 404CA0 E011AA80 46160102 */ mul.s $f4, $f0, $f22 -/* 404CA4 E011AA84 00000000 */ nop +/* 404CA4 E011AA84 00000000 */ nop /* 404CA8 E011AA88 44821000 */ mtc1 $v0, $f2 -/* 404CAC E011AA8C 00000000 */ nop +/* 404CAC E011AA8C 00000000 */ nop /* 404CB0 E011AA90 468010A0 */ cvt.s.w $f2, $f2 /* 404CB4 E011AA94 24820032 */ addiu $v0, $a0, 0x32 /* 404CB8 E011AA98 44820000 */ mtc1 $v0, $f0 -/* 404CBC E011AA9C 00000000 */ nop +/* 404CBC E011AA9C 00000000 */ nop /* 404CC0 E011AAA0 46800020 */ cvt.s.w $f0, $f0 /* 404CC4 E011AAA4 4600118D */ trunc.w.s $f6, $f2 /* 404CC8 E011AAA8 44043000 */ mfc1 $a0, $f6 @@ -266,27 +266,27 @@ glabel func_E011A700 /* 404D04 E011AAE4 3C014080 */ lui $at, 0x4080 /* 404D08 E011AAE8 44812000 */ mtc1 $at, $f4 /* 404D0C E011AAEC 44821000 */ mtc1 $v0, $f2 -/* 404D10 E011AAF0 00000000 */ nop +/* 404D10 E011AAF0 00000000 */ nop /* 404D14 E011AAF4 468010A0 */ cvt.s.w $f2, $f2 /* 404D18 E011AAF8 46041082 */ mul.s $f2, $f2, $f4 -/* 404D1C E011AAFC 00000000 */ nop +/* 404D1C E011AAFC 00000000 */ nop /* 404D20 E011AB00 3C04ED00 */ lui $a0, 0xed00 /* 404D24 E011AB04 86E20010 */ lh $v0, 0x10($s7) /* 404D28 E011AB08 8CC50000 */ lw $a1, ($a2) /* 404D2C E011AB0C 44820000 */ mtc1 $v0, $f0 -/* 404D30 E011AB10 00000000 */ nop +/* 404D30 E011AB10 00000000 */ nop /* 404D34 E011AB14 46800020 */ cvt.s.w $f0, $f0 /* 404D38 E011AB18 46040002 */ mul.s $f0, $f0, $f4 -/* 404D3C E011AB1C 00000000 */ nop +/* 404D3C E011AB1C 00000000 */ nop /* 404D40 E011AB20 00A0382D */ daddu $a3, $a1, $zero /* 404D44 E011AB24 4600118D */ trunc.w.s $f6, $f2 /* 404D48 E011AB28 44023000 */ mfc1 $v0, $f6 -/* 404D4C E011AB2C 00000000 */ nop +/* 404D4C E011AB2C 00000000 */ nop /* 404D50 E011AB30 30420FFF */ andi $v0, $v0, 0xfff /* 404D54 E011AB34 00021300 */ sll $v0, $v0, 0xc /* 404D58 E011AB38 4600018D */ trunc.w.s $f6, $f0 /* 404D5C E011AB3C 44033000 */ mfc1 $v1, $f6 -/* 404D60 E011AB40 00000000 */ nop +/* 404D60 E011AB40 00000000 */ nop /* 404D64 E011AB44 30630FFF */ andi $v1, $v1, 0xfff /* 404D68 E011AB48 00641825 */ or $v1, $v1, $a0 /* 404D6C E011AB4C 00431025 */ or $v0, $v0, $v1 @@ -296,29 +296,29 @@ glabel func_E011A700 /* 404D7C E011AB5C 24A50008 */ addiu $a1, $a1, 8 /* 404D80 E011AB60 00431021 */ addu $v0, $v0, $v1 /* 404D84 E011AB64 44821000 */ mtc1 $v0, $f2 -/* 404D88 E011AB68 00000000 */ nop +/* 404D88 E011AB68 00000000 */ nop /* 404D8C E011AB6C 468010A0 */ cvt.s.w $f2, $f2 /* 404D90 E011AB70 86E20010 */ lh $v0, 0x10($s7) /* 404D94 E011AB74 86E3000C */ lh $v1, 0xc($s7) /* 404D98 E011AB78 46041082 */ mul.s $f2, $f2, $f4 -/* 404D9C E011AB7C 00000000 */ nop +/* 404D9C E011AB7C 00000000 */ nop /* 404DA0 E011AB80 ACC50000 */ sw $a1, ($a2) /* 404DA4 E011AB84 00431021 */ addu $v0, $v0, $v1 /* 404DA8 E011AB88 44820000 */ mtc1 $v0, $f0 -/* 404DAC E011AB8C 00000000 */ nop +/* 404DAC E011AB8C 00000000 */ nop /* 404DB0 E011AB90 46800020 */ cvt.s.w $f0, $f0 /* 404DB4 E011AB94 24A20008 */ addiu $v0, $a1, 8 /* 404DB8 E011AB98 46040002 */ mul.s $f0, $f0, $f4 -/* 404DBC E011AB9C 00000000 */ nop +/* 404DBC E011AB9C 00000000 */ nop /* 404DC0 E011ABA0 ACC20000 */ sw $v0, ($a2) /* 404DC4 E011ABA4 4600118D */ trunc.w.s $f6, $f2 /* 404DC8 E011ABA8 44023000 */ mfc1 $v0, $f6 -/* 404DCC E011ABAC 00000000 */ nop +/* 404DCC E011ABAC 00000000 */ nop /* 404DD0 E011ABB0 30420FFF */ andi $v0, $v0, 0xfff /* 404DD4 E011ABB4 00021300 */ sll $v0, $v0, 0xc /* 404DD8 E011ABB8 4600018D */ trunc.w.s $f6, $f0 /* 404DDC E011ABBC 44033000 */ mfc1 $v1, $f6 -/* 404DE0 E011ABC0 00000000 */ nop +/* 404DE0 E011ABC0 00000000 */ nop /* 404DE4 E011ABC4 30630FFF */ andi $v1, $v1, 0xfff /* 404DE8 E011ABC8 00431025 */ or $v0, $v0, $v1 /* 404DEC E011ABCC ACE20004 */ sw $v0, 4($a3) @@ -340,6 +340,6 @@ glabel func_E011A700 /* 404E28 E011AC08 D7B40038 */ ldc1 $f20, 0x38($sp) /* 404E2C E011AC0C 03E00008 */ jr $ra /* 404E30 E011AC10 27BD0048 */ addiu $sp, $sp, 0x48 -/* 404E34 E011AC14 00000000 */ nop -/* 404E38 E011AC18 00000000 */ nop -/* 404E3C E011AC1C 00000000 */ nop +/* 404E34 E011AC14 00000000 */ nop +/* 404E38 E011AC18 00000000 */ nop +/* 404E3C E011AC1C 00000000 */ nop diff --git a/asm/nonmatchings/code_406B40/func_E011C000.s b/asm/nonmatchings/code_406B40/func_E011C000.s index dc2808d973..9d14e7e81c 100644 --- a/asm/nonmatchings/code_406B40/func_E011C000.s +++ b/asm/nonmatchings/code_406B40/func_E011C000.s @@ -40,7 +40,7 @@ glabel func_E011C000 /* 406BCC E011C08C AE02000C */ sw $v0, 0xc($s0) .LE011C090: /* 406BD0 E011C090 08047024 */ j .LE011C090 -/* 406BD4 E011C094 00000000 */ nop +/* 406BD4 E011C094 00000000 */ nop .LE011C098: /* 406BD8 E011C098 AC920000 */ sw $s2, ($a0) /* 406BDC E011C09C 1E200004 */ bgtz $s1, .LE011C0B0 diff --git a/asm/nonmatchings/code_406B40/func_E011C0F4.s b/asm/nonmatchings/code_406B40/func_E011C0F4.s index 67e7717a05..8fff02ff2e 100644 --- a/asm/nonmatchings/code_406B40/func_E011C0F4.s +++ b/asm/nonmatchings/code_406B40/func_E011C0F4.s @@ -3,4 +3,4 @@ glabel func_E011C0F4 /* 406C34 E011C0F4 03E00008 */ jr $ra -/* 406C38 E011C0F8 00000000 */ nop +/* 406C38 E011C0F8 00000000 */ nop diff --git a/asm/nonmatchings/code_406B40/func_E011C0FC.s b/asm/nonmatchings/code_406B40/func_E011C0FC.s index aff503fe2f..e438e27215 100644 --- a/asm/nonmatchings/code_406B40/func_E011C0FC.s +++ b/asm/nonmatchings/code_406B40/func_E011C0FC.s @@ -26,9 +26,9 @@ glabel func_E011C0FC /* 406C88 E011C148 04A10005 */ bgez $a1, .LE011C160 /* 406C8C E011C14C AC620014 */ sw $v0, 0x14($v1) /* 406C90 E011C150 0C080128 */ jal func_E02004A0 -/* 406C94 E011C154 00000000 */ nop +/* 406C94 E011C154 00000000 */ nop /* 406C98 E011C158 0804705C */ j .LE011C170 -/* 406C9C E011C15C 00000000 */ nop +/* 406C9C E011C15C 00000000 */ nop .LE011C160: /* 406CA0 E011C160 28A20010 */ slti $v0, $a1, 0x10 /* 406CA4 E011C164 10400002 */ beqz $v0, .LE011C170 diff --git a/asm/nonmatchings/code_406B40/func_E011C1C4.s b/asm/nonmatchings/code_406B40/func_E011C1C4.s index 9c1eab9e60..7070463de5 100644 --- a/asm/nonmatchings/code_406B40/func_E011C1C4.s +++ b/asm/nonmatchings/code_406B40/func_E011C1C4.s @@ -139,7 +139,7 @@ glabel func_E011C1C4 /* 406F1C E011C3DC 10620007 */ beq $v1, $v0, .LE011C3FC /* 406F20 E011C3E0 28620002 */ slti $v0, $v1, 2 /* 406F24 E011C3E4 10400015 */ beqz $v0, .LE011C43C -/* 406F28 E011C3E8 00000000 */ nop +/* 406F28 E011C3E8 00000000 */ nop /* 406F2C E011C3EC 14600013 */ bnez $v1, .LE011C43C /* 406F30 E011C3F0 0000282D */ daddu $a1, $zero, $zero /* 406F34 E011C3F4 0804711B */ j .LE011C46C @@ -211,5 +211,5 @@ glabel func_E011C1C4 /* 40702C E011C4EC D7B400B8 */ ldc1 $f20, 0xb8($sp) /* 407030 E011C4F0 03E00008 */ jr $ra /* 407034 E011C4F4 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 407038 E011C4F8 00000000 */ nop -/* 40703C E011C4FC 00000000 */ nop +/* 407038 E011C4F8 00000000 */ nop +/* 40703C E011C4FC 00000000 */ nop diff --git a/asm/nonmatchings/code_409990/func_E011E000.s b/asm/nonmatchings/code_409990/func_E011E000.s index 431783ce3e..e5cef180c2 100644 --- a/asm/nonmatchings/code_409990/func_E011E000.s +++ b/asm/nonmatchings/code_409990/func_E011E000.s @@ -43,7 +43,7 @@ glabel func_E011E000 /* 409A28 E011E098 AE22000C */ sw $v0, 0xc($s1) .LE011E09C: /* 409A2C E011E09C 08047827 */ j .LE011E09C -/* 409A30 E011E0A0 00000000 */ nop +/* 409A30 E011E0A0 00000000 */ nop .LE011E0A4: /* 409A34 E011E0A4 AE130000 */ sw $s3, ($s0) /* 409A38 E011E0A8 1E400004 */ bgtz $s2, .LE011E0BC diff --git a/asm/nonmatchings/code_409990/func_E011E18C.s b/asm/nonmatchings/code_409990/func_E011E18C.s index c46bb71533..d1019bbde7 100644 --- a/asm/nonmatchings/code_409990/func_E011E18C.s +++ b/asm/nonmatchings/code_409990/func_E011E18C.s @@ -3,4 +3,4 @@ glabel func_E011E18C /* 409B1C E011E18C 03E00008 */ jr $ra -/* 409B20 E011E190 00000000 */ nop +/* 409B20 E011E190 00000000 */ nop diff --git a/asm/nonmatchings/code_409990/func_E011E194.s b/asm/nonmatchings/code_409990/func_E011E194.s index a790af0485..4c87717bcd 100644 --- a/asm/nonmatchings/code_409990/func_E011E194.s +++ b/asm/nonmatchings/code_409990/func_E011E194.s @@ -43,7 +43,7 @@ glabel func_E011E194 /* 409BB0 E011E220 24040014 */ addiu $a0, $zero, 0x14 /* 409BB4 E011E224 C6340004 */ lwc1 $f20, 4($s1) /* 409BB8 E011E228 44820000 */ mtc1 $v0, $f0 -/* 409BBC E011E22C 00000000 */ nop +/* 409BBC E011E22C 00000000 */ nop /* 409BC0 E011E230 46800020 */ cvt.s.w $f0, $f0 /* 409BC4 E011E234 4600A500 */ add.s $f20, $f20, $f0 /* 409BC8 E011E238 3C014120 */ lui $at, 0x4120 @@ -53,10 +53,10 @@ glabel func_E011E194 /* 409BD8 E011E248 4600A501 */ sub.s $f20, $f20, $f0 /* 409BDC E011E24C C6220020 */ lwc1 $f2, 0x20($s1) /* 409BE0 E011E250 44820000 */ mtc1 $v0, $f0 -/* 409BE4 E011E254 00000000 */ nop +/* 409BE4 E011E254 00000000 */ nop /* 409BE8 E011E258 46800020 */ cvt.s.w $f0, $f0 /* 409BEC E011E25C 46020002 */ mul.s $f0, $f0, $f2 -/* 409BF0 E011E260 00000000 */ nop +/* 409BF0 E011E260 00000000 */ nop /* 409BF4 E011E264 C6360008 */ lwc1 $f22, 8($s1) /* 409BF8 E011E268 2404000A */ addiu $a0, $zero, 0xa /* 409BFC E011E26C 0C080138 */ jal func_E02004E0 @@ -64,12 +64,12 @@ glabel func_E011E194 /* 409C04 E011E274 3C01E012 */ lui $at, %hi(D_E011E818) /* 409C08 E011E278 D422E818 */ ldc1 $f2, %lo(D_E011E818)($at) /* 409C0C E011E27C 44820000 */ mtc1 $v0, $f0 -/* 409C10 E011E280 00000000 */ nop +/* 409C10 E011E280 00000000 */ nop /* 409C14 E011E284 46800021 */ cvt.d.w $f0, $f0 /* 409C18 E011E288 46220002 */ mul.d $f0, $f0, $f2 -/* 409C1C E011E28C 00000000 */ nop +/* 409C1C E011E28C 00000000 */ nop /* 409C20 E011E290 46380002 */ mul.d $f0, $f0, $f24 -/* 409C24 E011E294 00000000 */ nop +/* 409C24 E011E294 00000000 */ nop /* 409C28 E011E298 001227C2 */ srl $a0, $s2, 0x1f /* 409C2C E011E29C 02442021 */ addu $a0, $s2, $a0 /* 409C30 E011E2A0 3C01E012 */ lui $at, %hi(D_E011E820) @@ -79,7 +79,7 @@ glabel func_E011E194 /* 409C40 E011E2B0 00042043 */ sra $a0, $a0, 1 /* 409C44 E011E2B4 46002121 */ cvt.d.s $f4, $f4 /* 409C48 E011E2B8 46202102 */ mul.d $f4, $f4, $f0 -/* 409C4C E011E2BC 00000000 */ nop +/* 409C4C E011E2BC 00000000 */ nop /* 409C50 E011E2C0 00042040 */ sll $a0, $a0, 1 /* 409C54 E011E2C4 02442023 */ subu $a0, $s2, $a0 /* 409C58 E011E2C8 24840002 */ addiu $a0, $a0, 2 @@ -99,10 +99,10 @@ glabel func_E011E194 /* 409C90 E011E300 0C080138 */ jal func_E02004E0 /* 409C94 E011E304 0040802D */ daddu $s0, $v0, $zero /* 409C98 E011E308 44820000 */ mtc1 $v0, $f0 -/* 409C9C E011E30C 00000000 */ nop +/* 409C9C E011E30C 00000000 */ nop /* 409CA0 E011E310 46800021 */ cvt.d.w $f0, $f0 /* 409CA4 E011E314 46380002 */ mul.d $f0, $f0, $f24 -/* 409CA8 E011E318 00000000 */ nop +/* 409CA8 E011E318 00000000 */ nop /* 409CAC E011E31C 2404001E */ addiu $a0, $zero, 0x1e /* 409CB0 E011E320 8E02000C */ lw $v0, 0xc($s0) /* 409CB4 E011E324 46200020 */ cvt.s.d $f0, $f0 @@ -111,10 +111,10 @@ glabel func_E011E194 /* 409CC0 E011E330 3C01E012 */ lui $at, %hi(D_E011E828) /* 409CC4 E011E334 D422E828 */ ldc1 $f2, %lo(D_E011E828)($at) /* 409CC8 E011E338 44820000 */ mtc1 $v0, $f0 -/* 409CCC E011E33C 00000000 */ nop +/* 409CCC E011E33C 00000000 */ nop /* 409CD0 E011E340 46800021 */ cvt.d.w $f0, $f0 /* 409CD4 E011E344 46220002 */ mul.d $f0, $f0, $f2 -/* 409CD8 E011E348 00000000 */ nop +/* 409CD8 E011E348 00000000 */ nop /* 409CDC E011E34C 46380000 */ add.d $f0, $f0, $f24 /* 409CE0 E011E350 24040167 */ addiu $a0, $zero, 0x167 /* 409CE4 E011E354 8E02000C */ lw $v0, 0xc($s0) @@ -124,14 +124,14 @@ glabel func_E011E194 /* 409CF4 E011E364 24040014 */ addiu $a0, $zero, 0x14 /* 409CF8 E011E368 8E03000C */ lw $v1, 0xc($s0) /* 409CFC E011E36C 44820000 */ mtc1 $v0, $f0 -/* 409D00 E011E370 00000000 */ nop +/* 409D00 E011E370 00000000 */ nop /* 409D04 E011E374 46800020 */ cvt.s.w $f0, $f0 /* 409D08 E011E378 0C080138 */ jal func_E02004E0 /* 409D0C E011E37C E460003C */ swc1 $f0, 0x3c($v1) /* 409D10 E011E380 2404000A */ addiu $a0, $zero, 0xa /* 409D14 E011E384 8E03000C */ lw $v1, 0xc($s0) /* 409D18 E011E388 44820000 */ mtc1 $v0, $f0 -/* 409D1C E011E38C 00000000 */ nop +/* 409D1C E011E38C 00000000 */ nop /* 409D20 E011E390 46800020 */ cvt.s.w $f0, $f0 /* 409D24 E011E394 0C080138 */ jal func_E02004E0 /* 409D28 E011E398 E4600040 */ swc1 $f0, 0x40($v1) @@ -139,14 +139,14 @@ glabel func_E011E194 /* 409D30 E011E3A0 2442FFFB */ addiu $v0, $v0, -5 /* 409D34 E011E3A4 8E03000C */ lw $v1, 0xc($s0) /* 409D38 E011E3A8 44820000 */ mtc1 $v0, $f0 -/* 409D3C E011E3AC 00000000 */ nop +/* 409D3C E011E3AC 00000000 */ nop /* 409D40 E011E3B0 46800020 */ cvt.s.w $f0, $f0 /* 409D44 E011E3B4 0C080138 */ jal func_E02004E0 /* 409D48 E011E3B8 E460004C */ swc1 $f0, 0x4c($v1) /* 409D4C E011E3BC 2442FFFB */ addiu $v0, $v0, -5 /* 409D50 E011E3C0 8E03000C */ lw $v1, 0xc($s0) /* 409D54 E011E3C4 44820000 */ mtc1 $v0, $f0 -/* 409D58 E011E3C8 00000000 */ nop +/* 409D58 E011E3C8 00000000 */ nop /* 409D5C E011E3CC 46800020 */ cvt.s.w $f0, $f0 /* 409D60 E011E3D0 E4600050 */ swc1 $f0, 0x50($v1) /* 409D64 E011E3D4 8E02000C */ lw $v0, 0xc($s0) @@ -159,13 +159,13 @@ glabel func_E011E194 /* 409D80 E011E3F0 E4400058 */ swc1 $f0, 0x58($v0) /* 409D84 E011E3F4 2A420014 */ slti $v0, $s2, 0x14 /* 409D88 E011E3F8 1440FF88 */ bnez $v0, .LE011E21C -/* 409D8C E011E3FC 00000000 */ nop +/* 409D8C E011E3FC 00000000 */ nop /* 409D90 E011E400 0C080128 */ jal func_E02004A0 /* 409D94 E011E404 8E240028 */ lw $a0, 0x28($s1) /* 409D98 E011E408 0C080128 */ jal func_E02004A0 /* 409D9C E011E40C 0260202D */ daddu $a0, $s3, $zero /* 409DA0 E011E410 08047942 */ j .LE011E508 -/* 409DA4 E011E414 00000000 */ nop +/* 409DA4 E011E414 00000000 */ nop .LE011E418: /* 409DA8 E011E418 0080802D */ daddu $s0, $a0, $zero /* 409DAC E011E41C 92220025 */ lbu $v0, 0x25($s1) @@ -196,15 +196,15 @@ glabel func_E011E194 /* 409E04 E011E474 14400015 */ bnez $v0, .LE011E4CC /* 409E08 E011E478 3242000F */ andi $v0, $s2, 0xf /* 409E0C E011E47C 14400013 */ bnez $v0, .LE011E4CC -/* 409E10 E011E480 00000000 */ nop +/* 409E10 E011E480 00000000 */ nop /* 409E14 E011E484 0C080150 */ jal func_E0200540 /* 409E18 E011E488 2404006F */ addiu $a0, $zero, 0x6f /* 409E1C E011E48C C6220020 */ lwc1 $f2, 0x20($s1) /* 409E20 E011E490 3C014220 */ lui $at, 0x4220 /* 409E24 E011E494 44810000 */ mtc1 $at, $f0 -/* 409E28 E011E498 00000000 */ nop +/* 409E28 E011E498 00000000 */ nop /* 409E2C E011E49C 46001002 */ mul.s $f0, $f2, $f0 -/* 409E30 E011E4A0 00000000 */ nop +/* 409E30 E011E4A0 00000000 */ nop /* 409E34 E011E4A4 C6240008 */ lwc1 $f4, 8($s1) /* 409E38 E011E4A8 2402001E */ addiu $v0, $zero, 0x1e /* 409E3C E011E4AC AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_409990/func_E011E578.s b/asm/nonmatchings/code_409990/func_E011E578.s index e89e536852..e01309d0f7 100644 --- a/asm/nonmatchings/code_409990/func_E011E578.s +++ b/asm/nonmatchings/code_409990/func_E011E578.s @@ -158,5 +158,5 @@ glabel func_E011E578 /* 40A16C E011E7DC 8FB00090 */ lw $s0, 0x90($sp) /* 40A170 E011E7E0 03E00008 */ jr $ra /* 40A174 E011E7E4 27BD00B0 */ addiu $sp, $sp, 0xb0 -/* 40A178 E011E7E8 00000000 */ nop -/* 40A17C E011E7EC 00000000 */ nop +/* 40A178 E011E7E8 00000000 */ nop +/* 40A17C E011E7EC 00000000 */ nop diff --git a/asm/nonmatchings/code_40B3F0/func_E0120000.s b/asm/nonmatchings/code_40B3F0/func_E0120000.s index fdd5917ae4..dcd8a11707 100644 --- a/asm/nonmatchings/code_40B3F0/func_E0120000.s +++ b/asm/nonmatchings/code_40B3F0/func_E0120000.s @@ -40,7 +40,7 @@ glabel func_E0120000 /* 40B47C E012008C AE02000C */ sw $v0, 0xc($s0) .LE0120090: /* 40B480 E0120090 08048024 */ j .LE0120090 -/* 40B484 E0120094 00000000 */ nop +/* 40B484 E0120094 00000000 */ nop .LE0120098: /* 40B488 E0120098 AC920000 */ sw $s2, ($a0) /* 40B48C E012009C 1E200004 */ bgtz $s1, .LE01200B0 diff --git a/asm/nonmatchings/code_40B3F0/func_E0120134.s b/asm/nonmatchings/code_40B3F0/func_E0120134.s index 211e85acd5..4fb4fc05ee 100644 --- a/asm/nonmatchings/code_40B3F0/func_E0120134.s +++ b/asm/nonmatchings/code_40B3F0/func_E0120134.s @@ -3,4 +3,4 @@ glabel func_E0120134 /* 40B524 E0120134 03E00008 */ jr $ra -/* 40B528 E0120138 00000000 */ nop +/* 40B528 E0120138 00000000 */ nop diff --git a/asm/nonmatchings/code_40B3F0/func_E012013C.s b/asm/nonmatchings/code_40B3F0/func_E012013C.s index 807fff5daf..db7efa1f98 100644 --- a/asm/nonmatchings/code_40B3F0/func_E012013C.s +++ b/asm/nonmatchings/code_40B3F0/func_E012013C.s @@ -42,9 +42,9 @@ glabel func_E012013C /* 40B5B4 E01201C4 04410005 */ bgez $v0, .LE01201DC /* 40B5B8 E01201C8 28420010 */ slti $v0, $v0, 0x10 /* 40B5BC E01201CC 0C080128 */ jal func_E02004A0 -/* 40B5C0 E01201D0 00000000 */ nop +/* 40B5C0 E01201D0 00000000 */ nop /* 40B5C4 E01201D4 080480DC */ j .LE0120370 -/* 40B5C8 E01201D8 00000000 */ nop +/* 40B5C8 E01201D8 00000000 */ nop .LE01201DC: /* 40B5CC E01201DC 10400006 */ beqz $v0, .LE01201F8 /* 40B5D0 E01201E0 8CB30014 */ lw $s3, 0x14($a1) @@ -95,22 +95,22 @@ glabel func_E012013C /* 40B66C E012027C 4481B000 */ mtc1 $at, $f22 .LE0120280: /* 40B670 E0120280 44926000 */ mtc1 $s2, $f12 -/* 40B674 E0120284 00000000 */ nop +/* 40B674 E0120284 00000000 */ nop /* 40B678 E0120288 0C080140 */ jal func_E0200500 /* 40B67C E012028C 46806320 */ cvt.s.w $f12, $f12 /* 40B680 E0120290 44936000 */ mtc1 $s3, $f12 -/* 40B684 E0120294 00000000 */ nop +/* 40B684 E0120294 00000000 */ nop /* 40B688 E0120298 46806320 */ cvt.s.w $f12, $f12 /* 40B68C E012029C 46006321 */ cvt.d.s $f12, $f12 /* 40B690 E01202A0 463A6302 */ mul.d $f12, $f12, $f26 -/* 40B694 E01202A4 00000000 */ nop +/* 40B694 E01202A4 00000000 */ nop /* 40B698 E01202A8 02310018 */ mult $s1, $s1 /* 40B69C E01202AC 00001812 */ mflo $v1 /* 40B6A0 E01202B0 00031080 */ sll $v0, $v1, 2 /* 40B6A4 E01202B4 00431021 */ addu $v0, $v0, $v1 /* 40B6A8 E01202B8 00021080 */ sll $v0, $v0, 2 /* 40B6AC E01202BC 44821000 */ mtc1 $v0, $f2 -/* 40B6B0 E01202C0 00000000 */ nop +/* 40B6B0 E01202C0 00000000 */ nop /* 40B6B4 E01202C4 468010A1 */ cvt.d.w $f2, $f2 /* 40B6B8 E01202C8 46226300 */ add.d $f12, $f12, $f2 /* 40B6BC E01202CC 46000506 */ mov.s $f20, $f0 @@ -118,26 +118,26 @@ glabel func_E012013C /* 40B6C4 E01202D4 46206320 */ cvt.s.d $f12, $f12 /* 40B6C8 E01202D8 4600A521 */ cvt.d.s $f20, $f20 /* 40B6CC E01202DC 4638A502 */ mul.d $f20, $f20, $f24 -/* 40B6D0 E01202E0 00000000 */ nop +/* 40B6D0 E01202E0 00000000 */ nop /* 40B6D4 E01202E4 3C01E012 */ lui $at, %hi(D_E01207A8) /* 40B6D8 E01202E8 D42207A8 */ ldc1 $f2, %lo(D_E01207A8)($at) /* 40B6DC E01202EC 4622A500 */ add.d $f20, $f20, $f2 /* 40B6E0 E01202F0 3C014010 */ lui $at, 0x4010 /* 40B6E4 E01202F4 44811800 */ mtc1 $at, $f3 /* 40B6E8 E01202F8 44801000 */ mtc1 $zero, $f2 -/* 40B6EC E01202FC 00000000 */ nop +/* 40B6EC E01202FC 00000000 */ nop /* 40B6F0 E0120300 4622A502 */ mul.d $f20, $f20, $f2 -/* 40B6F4 E0120304 00000000 */ nop +/* 40B6F4 E0120304 00000000 */ nop /* 40B6F8 E0120308 46000021 */ cvt.d.s $f0, $f0 /* 40B6FC E012030C 4620A502 */ mul.d $f20, $f20, $f0 -/* 40B700 E0120310 00000000 */ nop +/* 40B700 E0120310 00000000 */ nop /* 40B704 E0120314 C6000020 */ lwc1 $f0, 0x20($s0) /* 40B708 E0120318 46000021 */ cvt.d.s $f0, $f0 /* 40B70C E012031C 46340001 */ sub.d $f0, $f0, $f20 /* 40B710 E0120320 44801000 */ mtc1 $zero, $f2 /* 40B714 E0120324 46200020 */ cvt.s.d $f0, $f0 /* 40B718 E0120328 4602003C */ c.lt.s $f0, $f2 -/* 40B71C E012032C 00000000 */ nop +/* 40B71C E012032C 00000000 */ nop /* 40B720 E0120330 45000003 */ bc1f .LE0120340 /* 40B724 E0120334 E6000020 */ swc1 $f0, 0x20($s0) /* 40B728 E0120338 46160000 */ add.s $f0, $f0, $f22 @@ -145,7 +145,7 @@ glabel func_E012013C .LE0120340: /* 40B730 E0120340 C6000020 */ lwc1 $f0, 0x20($s0) /* 40B734 E0120344 4600B03C */ c.lt.s $f22, $f0 -/* 40B738 E0120348 00000000 */ nop +/* 40B738 E0120348 00000000 */ nop /* 40B73C E012034C 45020004 */ bc1fl .LE0120360 /* 40B740 E0120350 26100004 */ addiu $s0, $s0, 4 /* 40B744 E0120354 46160001 */ sub.s $f0, $f0, $f22 diff --git a/asm/nonmatchings/code_40B3F0/func_E01203E4.s b/asm/nonmatchings/code_40B3F0/func_E01203E4.s index ed888022c0..ca980b694a 100644 --- a/asm/nonmatchings/code_40B3F0/func_E01203E4.s +++ b/asm/nonmatchings/code_40B3F0/func_E01203E4.s @@ -173,14 +173,14 @@ glabel func_E01203E4 /* 40BA68 E0120678 256B0001 */ addiu $t3, $t3, 1 /* 40BA6C E012067C 0080282D */ daddu $a1, $a0, $zero /* 40BA70 E0120680 46020002 */ mul.s $f0, $f0, $f2 -/* 40BA74 E0120684 00000000 */ nop +/* 40BA74 E0120684 00000000 */ nop /* 40BA78 E0120688 24840008 */ addiu $a0, $a0, 8 /* 40BA7C E012068C 24820008 */ addiu $v0, $a0, 8 /* 40BA80 E0120690 AE040000 */ sw $a0, ($s0) /* 40BA84 E0120694 AE020000 */ sw $v0, ($s0) /* 40BA88 E0120698 4600020D */ trunc.w.s $f8, $f0 /* 40BA8C E012069C 44034000 */ mfc1 $v1, $f8 -/* 40BA90 E01206A0 00000000 */ nop +/* 40BA90 E01206A0 00000000 */ nop /* 40BA94 E01206A4 00691821 */ addu $v1, $v1, $t1 /* 40BA98 E01206A8 30620FFF */ andi $v0, $v1, 0xfff /* 40BA9C E01206AC 00021300 */ sll $v0, $v0, 0xc diff --git a/asm/nonmatchings/code_40C5A0/func_E0122000.s b/asm/nonmatchings/code_40C5A0/func_E0122000.s index 4d8b4b8c10..b67a166d39 100644 --- a/asm/nonmatchings/code_40C5A0/func_E0122000.s +++ b/asm/nonmatchings/code_40C5A0/func_E0122000.s @@ -40,7 +40,7 @@ glabel func_E0122000 /* 40C62C E012208C AE22000C */ sw $v0, 0xc($s1) .LE0122090: /* 40C630 E0122090 08048824 */ j .LE0122090 -/* 40C634 E0122094 00000000 */ nop +/* 40C634 E0122094 00000000 */ nop .LE0122098: /* 40C638 E0122098 3202FF00 */ andi $v0, $s0, 0xff00 /* 40C63C E012209C 321000FF */ andi $s0, $s0, 0xff diff --git a/asm/nonmatchings/code_40C5A0/func_E0122174.s b/asm/nonmatchings/code_40C5A0/func_E0122174.s index 2286613bcf..fafd5c090c 100644 --- a/asm/nonmatchings/code_40C5A0/func_E0122174.s +++ b/asm/nonmatchings/code_40C5A0/func_E0122174.s @@ -3,4 +3,4 @@ glabel func_E0122174 /* 40C714 E0122174 03E00008 */ jr $ra -/* 40C718 E0122178 00000000 */ nop +/* 40C718 E0122178 00000000 */ nop diff --git a/asm/nonmatchings/code_40C5A0/func_E012217C.s b/asm/nonmatchings/code_40C5A0/func_E012217C.s index 6a2198fe48..bee2d7d37e 100644 --- a/asm/nonmatchings/code_40C5A0/func_E012217C.s +++ b/asm/nonmatchings/code_40C5A0/func_E012217C.s @@ -30,9 +30,9 @@ glabel func_E012217C /* 40C778 E01221D8 04610005 */ bgez $v1, .LE01221F0 /* 40C77C E01221DC AE110018 */ sw $s1, 0x18($s0) /* 40C780 E01221E0 0C080128 */ jal func_E02004A0 -/* 40C784 E01221E4 00000000 */ nop +/* 40C784 E01221E4 00000000 */ nop /* 40C788 E01221E8 080489AB */ j .LE01226AC -/* 40C78C E01221EC 00000000 */ nop +/* 40C78C E01221EC 00000000 */ nop .LE01221F0: /* 40C790 E01221F0 28620010 */ slti $v0, $v1, 0x10 /* 40C794 E01221F4 10400002 */ beqz $v0, .LE0122200 @@ -48,22 +48,22 @@ glabel func_E012217C /* 40C7B8 E0122218 1060000B */ beqz $v1, .LE0122248 /* 40C7BC E012221C 24020001 */ addiu $v0, $zero, 1 /* 40C7C0 E0122220 10620096 */ beq $v1, $v0, .LE012247C -/* 40C7C4 E0122224 00000000 */ nop +/* 40C7C4 E0122224 00000000 */ nop /* 40C7C8 E0122228 0804898B */ j .LE012262C -/* 40C7CC E012222C 00000000 */ nop +/* 40C7CC E012222C 00000000 */ nop .LE0122230: /* 40C7D0 E0122230 106200FE */ beq $v1, $v0, .LE012262C /* 40C7D4 E0122234 24020064 */ addiu $v0, $zero, 0x64 /* 40C7D8 E0122238 10620040 */ beq $v1, $v0, .LE012233C -/* 40C7DC E012223C 00000000 */ nop +/* 40C7DC E012223C 00000000 */ nop /* 40C7E0 E0122240 0804898B */ j .LE012262C -/* 40C7E4 E0122244 00000000 */ nop +/* 40C7E4 E0122244 00000000 */ nop .LE0122248: /* 40C7E8 E0122248 00111080 */ sll $v0, $s1, 2 /* 40C7EC E012224C 00511021 */ addu $v0, $v0, $s1 /* 40C7F0 E0122250 00021080 */ sll $v0, $v0, 2 /* 40C7F4 E0122254 44826000 */ mtc1 $v0, $f12 -/* 40C7F8 E0122258 00000000 */ nop +/* 40C7F8 E0122258 00000000 */ nop /* 40C7FC E012225C 46806320 */ cvt.s.w $f12, $f12 /* 40C800 E0122260 32230003 */ andi $v1, $s1, 3 /* 40C804 E0122264 00031100 */ sll $v0, $v1, 4 @@ -79,27 +79,27 @@ glabel func_E012217C /* 40C82C E012228C D4222CA0 */ ldc1 $f2, %lo(D_E0122CA0)($at) /* 40C830 E0122290 46000021 */ cvt.d.s $f0, $f0 /* 40C834 E0122294 46220002 */ mul.d $f0, $f0, $f2 -/* 40C838 E0122298 00000000 */ nop +/* 40C838 E0122298 00000000 */ nop /* 40C83C E012229C 3C013FE0 */ lui $at, 0x3fe0 /* 40C840 E01222A0 44811800 */ mtc1 $at, $f3 /* 40C844 E01222A4 44801000 */ mtc1 $zero, $f2 -/* 40C848 E01222A8 00000000 */ nop +/* 40C848 E01222A8 00000000 */ nop /* 40C84C E01222AC 46220000 */ add.d $f0, $f0, $f2 /* 40C850 E01222B0 8E020000 */ lw $v0, ($s0) /* 40C854 E01222B4 46200020 */ cvt.s.d $f0, $f0 /* 40C858 E01222B8 104000E8 */ beqz $v0, .LE012265C /* 40C85C E01222BC E6000040 */ swc1 $f0, 0x40($s0) /* 40C860 E01222C0 44916000 */ mtc1 $s1, $f12 -/* 40C864 E01222C4 00000000 */ nop +/* 40C864 E01222C4 00000000 */ nop /* 40C868 E01222C8 0C080140 */ jal func_E0200500 /* 40C86C E01222CC 46806320 */ cvt.s.w $f12, $f12 /* 40C870 E01222D0 3C01E012 */ lui $at, %hi(D_E0122CA8) /* 40C874 E01222D4 D4222CA8 */ ldc1 $f2, %lo(D_E0122CA8)($at) /* 40C878 E01222D8 44916000 */ mtc1 $s1, $f12 -/* 40C87C E01222DC 00000000 */ nop +/* 40C87C E01222DC 00000000 */ nop /* 40C880 E01222E0 46806321 */ cvt.d.w $f12, $f12 /* 40C884 E01222E4 46226302 */ mul.d $f12, $f12, $f2 -/* 40C888 E01222E8 00000000 */ nop +/* 40C888 E01222E8 00000000 */ nop /* 40C88C E01222EC C6020008 */ lwc1 $f2, 8($s0) /* 40C890 E01222F0 46001080 */ add.s $f2, $f2, $f0 /* 40C894 E01222F4 E6020008 */ swc1 $f2, 8($s0) @@ -155,18 +155,18 @@ glabel func_E012217C /* 40C940 E01223A0 3C01E012 */ lui $at, %hi(D_E0122CB0) /* 40C944 E01223A4 D4202CB0 */ ldc1 $f0, %lo(D_E0122CB0)($at) /* 40C948 E01223A8 44821000 */ mtc1 $v0, $f2 -/* 40C94C E01223AC 00000000 */ nop +/* 40C94C E01223AC 00000000 */ nop /* 40C950 E01223B0 468010A0 */ cvt.s.w $f2, $f2 /* 40C954 E01223B4 460010A1 */ cvt.d.s $f2, $f2 /* 40C958 E01223B8 46201082 */ mul.d $f2, $f2, $f0 -/* 40C95C E01223BC 00000000 */ nop +/* 40C95C E01223BC 00000000 */ nop /* 40C960 E01223C0 3C01E012 */ lui $at, %hi(D_E0122CB8) /* 40C964 E01223C4 D4242CB8 */ ldc1 $f4, %lo(D_E0122CB8)($at) /* 40C968 E01223C8 44840000 */ mtc1 $a0, $f0 -/* 40C96C E01223CC 00000000 */ nop +/* 40C96C E01223CC 00000000 */ nop /* 40C970 E01223D0 46800021 */ cvt.d.w $f0, $f0 /* 40C974 E01223D4 46240002 */ mul.d $f0, $f0, $f4 -/* 40C978 E01223D8 00000000 */ nop +/* 40C978 E01223D8 00000000 */ nop /* 40C97C E01223DC 90620003 */ lbu $v0, 3($v1) /* 40C980 E01223E0 0804890E */ j .LE0122438 /* 40C984 E01223E4 46201080 */ add.d $f2, $f2, $f0 @@ -177,18 +177,18 @@ glabel func_E012217C /* 40C994 E01223F4 3C01E012 */ lui $at, %hi(D_E0122CC0) /* 40C998 E01223F8 D4202CC0 */ ldc1 $f0, %lo(D_E0122CC0)($at) /* 40C99C E01223FC 44821000 */ mtc1 $v0, $f2 -/* 40C9A0 E0122400 00000000 */ nop +/* 40C9A0 E0122400 00000000 */ nop /* 40C9A4 E0122404 468010A0 */ cvt.s.w $f2, $f2 /* 40C9A8 E0122408 460010A1 */ cvt.d.s $f2, $f2 /* 40C9AC E012240C 46201082 */ mul.d $f2, $f2, $f0 -/* 40C9B0 E0122410 00000000 */ nop +/* 40C9B0 E0122410 00000000 */ nop /* 40C9B4 E0122414 3C01E012 */ lui $at, %hi(D_E0122CC8) /* 40C9B8 E0122418 D4242CC8 */ ldc1 $f4, %lo(D_E0122CC8)($at) /* 40C9BC E012241C 44840000 */ mtc1 $a0, $f0 -/* 40C9C0 E0122420 00000000 */ nop +/* 40C9C0 E0122420 00000000 */ nop /* 40C9C4 E0122424 46800021 */ cvt.d.w $f0, $f0 /* 40C9C8 E0122428 46240002 */ mul.d $f0, $f0, $f4 -/* 40C9CC E012242C 00000000 */ nop +/* 40C9CC E012242C 00000000 */ nop /* 40C9D0 E0122430 46201080 */ add.d $f2, $f2, $f0 /* 40C9D4 E0122434 90620077 */ lbu $v0, 0x77($v1) .LE0122438: @@ -212,7 +212,7 @@ glabel func_E012217C .LE012247C: /* 40CA1C E012247C 8E020074 */ lw $v0, 0x74($s0) /* 40CA20 E0122480 10400005 */ beqz $v0, .LE0122498 -/* 40CA24 E0122484 00000000 */ nop +/* 40CA24 E0122484 00000000 */ nop /* 40CA28 E0122488 10430007 */ beq $v0, $v1, .LE01224A8 /* 40CA2C E012248C 240200FF */ addiu $v0, $zero, 0xff /* 40CA30 E0122490 0804892F */ j .LE01224BC @@ -241,11 +241,11 @@ glabel func_E012217C /* 40CA78 E01224D8 3C01E012 */ lui $at, %hi(D_E0122CD8) /* 40CA7C E01224DC D4202CD8 */ ldc1 $f0, %lo(D_E0122CD8)($at) /* 40CA80 E01224E0 44821000 */ mtc1 $v0, $f2 -/* 40CA84 E01224E4 00000000 */ nop +/* 40CA84 E01224E4 00000000 */ nop /* 40CA88 E01224E8 468010A0 */ cvt.s.w $f2, $f2 /* 40CA8C E01224EC 460010A1 */ cvt.d.s $f2, $f2 /* 40CA90 E01224F0 46201082 */ mul.d $f2, $f2, $f0 -/* 40CA94 E01224F4 00000000 */ nop +/* 40CA94 E01224F4 00000000 */ nop /* 40CA98 E01224F8 3C01E012 */ lui $at, %hi(D_E0122CE0) /* 40CA9C E01224FC D4242CE0 */ ldc1 $f4, %lo(D_E0122CE0)($at) /* 40CAA0 E0122500 90630003 */ lbu $v1, 3($v1) @@ -254,7 +254,7 @@ glabel func_E012217C /* 40CAAC E012250C 462010A0 */ cvt.s.d $f2, $f2 /* 40CAB0 E0122510 46001021 */ cvt.d.s $f0, $f2 /* 40CAB4 E0122514 46240002 */ mul.d $f0, $f0, $f4 -/* 40CAB8 E0122518 00000000 */ nop +/* 40CAB8 E0122518 00000000 */ nop /* 40CABC E012251C 8E020074 */ lw $v0, 0x74($s0) /* 40CAC0 E0122520 306300FF */ andi $v1, $v1, 0xff /* 40CAC4 E0122524 AE030054 */ sw $v1, 0x54($s0) @@ -310,11 +310,11 @@ glabel func_E012217C /* 40CB74 E01225D4 AE000050 */ sw $zero, 0x50($s0) /* 40CB78 E01225D8 AE000040 */ sw $zero, 0x40($s0) /* 40CB7C E01225DC 44830000 */ mtc1 $v1, $f0 -/* 40CB80 E01225E0 00000000 */ nop +/* 40CB80 E01225E0 00000000 */ nop /* 40CB84 E01225E4 46800020 */ cvt.s.w $f0, $f0 /* 40CB88 E01225E8 46000021 */ cvt.d.s $f0, $f0 /* 40CB8C E01225EC 46220002 */ mul.d $f0, $f0, $f2 -/* 40CB90 E01225F0 00000000 */ nop +/* 40CB90 E01225F0 00000000 */ nop /* 40CB94 E01225F4 AE000058 */ sw $zero, 0x58($s0) /* 40CB98 E01225F8 AE000048 */ sw $zero, 0x48($s0) /* 40CB9C E01225FC 24420001 */ addiu $v0, $v0, 1 @@ -360,7 +360,7 @@ glabel func_E012217C .LE0122688: /* 40CC28 E0122688 C4600040 */ lwc1 $f0, 0x40($v1) /* 40CC2C E012268C 4602003C */ c.lt.s $f0, $f2 -/* 40CC30 E0122690 00000000 */ nop +/* 40CC30 E0122690 00000000 */ nop /* 40CC34 E0122694 45030001 */ bc1tl .LE012269C /* 40CC38 E0122698 E4620040 */ swc1 $f2, 0x40($v1) .LE012269C: diff --git a/asm/nonmatchings/code_40C5A0/func_E012270C.s b/asm/nonmatchings/code_40C5A0/func_E012270C.s index 7653aee1f9..de7c2d8c94 100644 --- a/asm/nonmatchings/code_40C5A0/func_E012270C.s +++ b/asm/nonmatchings/code_40C5A0/func_E012270C.s @@ -131,7 +131,7 @@ glabel func_E012270C .LE0122900: /* 40CEA0 E0122900 C6400040 */ lwc1 $f0, 0x40($s2) /* 40CEA4 E0122904 46140032 */ c.eq.s $f0, $f20 -/* 40CEA8 E0122908 00000000 */ nop +/* 40CEA8 E0122908 00000000 */ nop /* 40CEAC E012290C 45010041 */ bc1t .LE0122A14 /* 40CEB0 E0122910 00148080 */ sll $s0, $s4, 2 /* 40CEB4 E0122914 8E420050 */ lw $v0, 0x50($s2) @@ -242,7 +242,7 @@ glabel func_E012270C /* 40D048 E0122AA8 24020005 */ addiu $v0, $zero, 5 .LE0122AAC: /* 40D04C E0122AAC 1462000A */ bne $v1, $v0, .LE0122AD8 -/* 40D050 E0122AB0 00000000 */ nop +/* 40D050 E0122AB0 00000000 */ nop /* 40D054 E0122AB4 8E230074 */ lw $v1, 0x74($s1) /* 40D058 E0122AB8 18600007 */ blez $v1, .LE0122AD8 /* 40D05C E0122ABC 28620009 */ slti $v0, $v1, 9 @@ -298,6 +298,6 @@ glabel func_E012270C /* 40D118 E0122B78 D7B40088 */ ldc1 $f20, 0x88($sp) /* 40D11C E0122B7C 03E00008 */ jr $ra /* 40D120 E0122B80 27BD0090 */ addiu $sp, $sp, 0x90 -/* 40D124 E0122B84 00000000 */ nop -/* 40D128 E0122B88 00000000 */ nop -/* 40D12C E0122B8C 00000000 */ nop +/* 40D124 E0122B84 00000000 */ nop +/* 40D128 E0122B88 00000000 */ nop +/* 40D12C E0122B8C 00000000 */ nop diff --git a/asm/nonmatchings/code_413360/func_E0126000.s b/asm/nonmatchings/code_413360/func_E0126000.s index 8d05041daf..992576b961 100644 --- a/asm/nonmatchings/code_413360/func_E0126000.s +++ b/asm/nonmatchings/code_413360/func_E0126000.s @@ -40,7 +40,7 @@ glabel func_E0126000 /* 4133EC E012608C AE02000C */ sw $v0, 0xc($s0) .LE0126090: /* 4133F0 E0126090 08049824 */ j .LE0126090 -/* 4133F4 E0126094 00000000 */ nop +/* 4133F4 E0126094 00000000 */ nop .LE0126098: /* 4133F8 E0126098 24020001 */ addiu $v0, $zero, 1 /* 4133FC E012609C A4A20000 */ sh $v0, ($a1) diff --git a/asm/nonmatchings/code_413360/func_E012612C.s b/asm/nonmatchings/code_413360/func_E012612C.s index ed71071af7..2fbdd44f6a 100644 --- a/asm/nonmatchings/code_413360/func_E012612C.s +++ b/asm/nonmatchings/code_413360/func_E012612C.s @@ -3,4 +3,4 @@ glabel func_E012612C /* 41348C E012612C 03E00008 */ jr $ra -/* 413490 E0126130 00000000 */ nop +/* 413490 E0126130 00000000 */ nop diff --git a/asm/nonmatchings/code_413360/func_E0126134.s b/asm/nonmatchings/code_413360/func_E0126134.s index d90af5fa29..baaf36e26e 100644 --- a/asm/nonmatchings/code_413360/func_E0126134.s +++ b/asm/nonmatchings/code_413360/func_E0126134.s @@ -33,9 +33,9 @@ glabel func_E0126134 /* 4134FC E012619C 04A10005 */ bgez $a1, .LE01261B4 /* 413500 E01261A0 AE020014 */ sw $v0, 0x14($s0) /* 413504 E01261A4 0C080128 */ jal func_E02004A0 -/* 413508 E01261A8 00000000 */ nop +/* 413508 E01261A8 00000000 */ nop /* 41350C E01261AC 08049920 */ j .LE0126480 -/* 413510 E01261B0 00000000 */ nop +/* 413510 E01261B0 00000000 */ nop .LE01261B4: /* 413514 E01261B4 0040882D */ daddu $s1, $v0, $zero /* 413518 E01261B8 28A20010 */ slti $v0, $a1, 0x10 @@ -55,7 +55,7 @@ glabel func_E0126134 /* 413548 E01261E8 2A220010 */ slti $v0, $s1, 0x10 .LE01261EC: /* 41354C E01261EC 1040000B */ beqz $v0, .LE012621C -/* 413550 E01261F0 00000000 */ nop +/* 413550 E01261F0 00000000 */ nop /* 413554 E01261F4 00111900 */ sll $v1, $s1, 4 /* 413558 E01261F8 8E020024 */ lw $v0, 0x24($s0) /* 41355C E01261FC 2463000F */ addiu $v1, $v1, 0xf @@ -81,27 +81,27 @@ glabel func_E0126134 /* 4135A4 E0126244 3C014080 */ lui $at, 0x4080 /* 4135A8 E0126248 44810000 */ mtc1 $at, $f0 /* 4135AC E012624C 4491A000 */ mtc1 $s1, $f20 -/* 4135B0 E0126250 00000000 */ nop +/* 4135B0 E0126250 00000000 */ nop /* 4135B4 E0126254 4680A520 */ cvt.s.w $f20, $f20 /* 4135B8 E0126258 4600A002 */ mul.s $f0, $f20, $f0 -/* 4135BC E012625C 00000000 */ nop +/* 4135BC E012625C 00000000 */ nop /* 4135C0 E0126260 3C01E012 */ lui $at, %hi(D_E0126BD0) /* 4135C4 E0126264 D42C6BD0 */ ldc1 $f12, %lo(D_E0126BD0)($at) /* 4135C8 E0126268 4600A521 */ cvt.d.s $f20, $f20 /* 4135CC E012626C 462CA302 */ mul.d $f12, $f20, $f12 -/* 4135D0 E0126270 00000000 */ nop +/* 4135D0 E0126270 00000000 */ nop /* 4135D4 E0126274 3C01E012 */ lui $at, %hi(D_E0126BD8) /* 4135D8 E0126278 D4246BD8 */ ldc1 $f4, %lo(D_E0126BD8)($at) /* 4135DC E012627C 46000021 */ cvt.d.s $f0, $f0 /* 4135E0 E0126280 46240102 */ mul.d $f4, $f0, $f4 -/* 4135E4 E0126284 00000000 */ nop +/* 4135E4 E0126284 00000000 */ nop /* 4135E8 E0126288 3C01E012 */ lui $at, %hi(D_E0126BE0) /* 4135EC E012628C D4226BE0 */ ldc1 $f2, %lo(D_E0126BE0)($at) /* 4135F0 E0126290 46220002 */ mul.d $f0, $f0, $f2 -/* 4135F4 E0126294 00000000 */ nop +/* 4135F4 E0126294 00000000 */ nop /* 4135F8 E0126298 00111080 */ sll $v0, $s1, 2 /* 4135FC E012629C 44821000 */ mtc1 $v0, $f2 -/* 413600 E01262A0 00000000 */ nop +/* 413600 E01262A0 00000000 */ nop /* 413604 E01262A4 468010A0 */ cvt.s.w $f2, $f2 /* 413608 E01262A8 240200FF */ addiu $v0, $zero, 0xff /* 41360C E01262AC E602003C */ swc1 $f2, 0x3c($s0) @@ -115,15 +115,15 @@ glabel func_E0126134 /* 41362C E01262CC 3C01E012 */ lui $at, %hi(D_E0126BE8) /* 413630 E01262D0 D42C6BE8 */ ldc1 $f12, %lo(D_E0126BE8)($at) /* 413634 E01262D4 462CA302 */ mul.d $f12, $f20, $f12 -/* 413638 E01262D8 00000000 */ nop +/* 413638 E01262D8 00000000 */ nop /* 41363C E01262DC 3C0142FE */ lui $at, 0x42fe /* 413640 E01262E0 4481C000 */ mtc1 $at, $f24 -/* 413644 E01262E4 00000000 */ nop +/* 413644 E01262E4 00000000 */ nop /* 413648 E01262E8 46180002 */ mul.s $f0, $f0, $f24 -/* 41364C E01262EC 00000000 */ nop +/* 41364C E01262EC 00000000 */ nop /* 413650 E01262F0 3C014300 */ lui $at, 0x4300 /* 413654 E01262F4 44811000 */ mtc1 $at, $f2 -/* 413658 E01262F8 00000000 */ nop +/* 413658 E01262F8 00000000 */ nop /* 41365C E01262FC 46020000 */ add.s $f0, $f0, $f2 /* 413660 E0126300 4600020D */ trunc.w.s $f8, $f0 /* 413664 E0126304 E6080034 */ swc1 $f8, 0x34($s0) @@ -132,12 +132,12 @@ glabel func_E0126134 /* 413670 E0126310 3C01E012 */ lui $at, %hi(D_E0126BF0) /* 413674 E0126314 D42C6BF0 */ ldc1 $f12, %lo(D_E0126BF0)($at) /* 413678 E0126318 462CA302 */ mul.d $f12, $f20, $f12 -/* 41367C E012631C 00000000 */ nop +/* 41367C E012631C 00000000 */ nop /* 413680 E0126320 46180002 */ mul.s $f0, $f0, $f24 -/* 413684 E0126324 00000000 */ nop +/* 413684 E0126324 00000000 */ nop /* 413688 E0126328 3C014357 */ lui $at, 0x4357 /* 41368C E012632C 4481B000 */ mtc1 $at, $f22 -/* 413690 E0126330 00000000 */ nop +/* 413690 E0126330 00000000 */ nop /* 413694 E0126334 46160000 */ add.s $f0, $f0, $f22 /* 413698 E0126338 4600020D */ trunc.w.s $f8, $f0 /* 41369C E012633C E6080018 */ swc1 $f8, 0x18($s0) @@ -146,9 +146,9 @@ glabel func_E0126134 /* 4136A8 E0126348 3C01E012 */ lui $at, %hi(D_E0126BF8) /* 4136AC E012634C D42C6BF8 */ ldc1 $f12, %lo(D_E0126BF8)($at) /* 4136B0 E0126350 462CA302 */ mul.d $f12, $f20, $f12 -/* 4136B4 E0126354 00000000 */ nop +/* 4136B4 E0126354 00000000 */ nop /* 4136B8 E0126358 46180002 */ mul.s $f0, $f0, $f24 -/* 4136BC E012635C 00000000 */ nop +/* 4136BC E012635C 00000000 */ nop /* 4136C0 E0126360 46160000 */ add.s $f0, $f0, $f22 /* 4136C4 E0126364 4600020D */ trunc.w.s $f8, $f0 /* 4136C8 E0126368 E608001C */ swc1 $f8, 0x1c($s0) @@ -157,9 +157,9 @@ glabel func_E0126134 /* 4136D4 E0126374 3C01E012 */ lui $at, %hi(D_E0126C00) /* 4136D8 E0126378 D42C6C00 */ ldc1 $f12, %lo(D_E0126C00)($at) /* 4136DC E012637C 462CA302 */ mul.d $f12, $f20, $f12 -/* 4136E0 E0126380 00000000 */ nop +/* 4136E0 E0126380 00000000 */ nop /* 4136E4 E0126384 46180002 */ mul.s $f0, $f0, $f24 -/* 4136E8 E0126388 00000000 */ nop +/* 4136E8 E0126388 00000000 */ nop /* 4136EC E012638C 46160000 */ add.s $f0, $f0, $f22 /* 4136F0 E0126390 4600020D */ trunc.w.s $f8, $f0 /* 4136F4 E0126394 E6080020 */ swc1 $f8, 0x20($s0) @@ -168,12 +168,12 @@ glabel func_E0126134 /* 413700 E01263A0 3C01E012 */ lui $at, %hi(D_E0126C08) /* 413704 E01263A4 D42C6C08 */ ldc1 $f12, %lo(D_E0126C08)($at) /* 413708 E01263A8 462CA302 */ mul.d $f12, $f20, $f12 -/* 41370C E01263AC 00000000 */ nop +/* 41370C E01263AC 00000000 */ nop /* 413710 E01263B0 46180002 */ mul.s $f0, $f0, $f24 -/* 413714 E01263B4 00000000 */ nop +/* 413714 E01263B4 00000000 */ nop /* 413718 E01263B8 3C01433C */ lui $at, 0x433c /* 41371C E01263BC 4481B000 */ mtc1 $at, $f22 -/* 413720 E01263C0 00000000 */ nop +/* 413720 E01263C0 00000000 */ nop /* 413724 E01263C4 46160000 */ add.s $f0, $f0, $f22 /* 413728 E01263C8 4600020D */ trunc.w.s $f8, $f0 /* 41372C E01263CC E6080028 */ swc1 $f8, 0x28($s0) @@ -182,9 +182,9 @@ glabel func_E0126134 /* 413738 E01263D8 3C01E012 */ lui $at, %hi(D_E0126C10) /* 41373C E01263DC D42C6C10 */ ldc1 $f12, %lo(D_E0126C10)($at) /* 413740 E01263E0 462CA302 */ mul.d $f12, $f20, $f12 -/* 413744 E01263E4 00000000 */ nop +/* 413744 E01263E4 00000000 */ nop /* 413748 E01263E8 46180002 */ mul.s $f0, $f0, $f24 -/* 41374C E01263EC 00000000 */ nop +/* 41374C E01263EC 00000000 */ nop /* 413750 E01263F0 46160000 */ add.s $f0, $f0, $f22 /* 413754 E01263F4 4600020D */ trunc.w.s $f8, $f0 /* 413758 E01263F8 E608002C */ swc1 $f8, 0x2c($s0) @@ -193,9 +193,9 @@ glabel func_E0126134 /* 413764 E0126404 3C01E012 */ lui $at, %hi(D_E0126C18) /* 413768 E0126408 D4226C18 */ ldc1 $f2, %lo(D_E0126C18)($at) /* 41376C E012640C 4622A502 */ mul.d $f20, $f20, $f2 -/* 413770 E0126410 00000000 */ nop +/* 413770 E0126410 00000000 */ nop /* 413774 E0126414 46180002 */ mul.s $f0, $f0, $f24 -/* 413778 E0126418 00000000 */ nop +/* 413778 E0126418 00000000 */ nop /* 41377C E012641C 46160000 */ add.s $f0, $f0, $f22 /* 413780 E0126420 4600020D */ trunc.w.s $f8, $f0 /* 413784 E0126424 E6080030 */ swc1 $f8, 0x30($s0) @@ -205,7 +205,7 @@ glabel func_E0126134 /* 413794 E0126434 D4226C20 */ ldc1 $f2, %lo(D_E0126C20)($at) /* 413798 E0126438 46000021 */ cvt.d.s $f0, $f0 /* 41379C E012643C 46220002 */ mul.d $f0, $f0, $f2 -/* 4137A0 E0126440 00000000 */ nop +/* 4137A0 E0126440 00000000 */ nop /* 4137A4 E0126444 3C01E012 */ lui $at, %hi(D_E0126C28) /* 4137A8 E0126448 D4226C28 */ ldc1 $f2, %lo(D_E0126C28)($at) /* 4137AC E012644C 46220000 */ add.d $f0, $f0, $f2 @@ -213,7 +213,7 @@ glabel func_E0126134 /* 4137B4 E0126454 E6000038 */ swc1 $f0, 0x38($s0) .LE0126458: /* 4137B8 E0126458 16320009 */ bne $s1, $s2, .LE0126480 -/* 4137BC E012645C 00000000 */ nop +/* 4137BC E012645C 00000000 */ nop /* 4137C0 E0126460 C600003C */ lwc1 $f0, 0x3c($s0) /* 4137C4 E0126464 C6020040 */ lwc1 $f2, 0x40($s0) /* 4137C8 E0126468 C6040044 */ lwc1 $f4, 0x44($s0) diff --git a/asm/nonmatchings/code_413360/func_E01264EC.s b/asm/nonmatchings/code_413360/func_E01264EC.s index fd766c823a..5b70a6b86d 100644 --- a/asm/nonmatchings/code_413360/func_E01264EC.s +++ b/asm/nonmatchings/code_413360/func_E01264EC.s @@ -134,7 +134,7 @@ glabel func_E01264EC /* 413A10 E01266B0 00431021 */ addu $v0, $v0, $v1 /* 413A14 E01266B4 00021080 */ sll $v0, $v0, 2 /* 413A18 E01266B8 46220002 */ mul.d $f0, $f0, $f2 -/* 413A1C E01266BC 00000000 */ nop +/* 413A1C E01266BC 00000000 */ nop /* 413A20 E01266C0 00431023 */ subu $v0, $v0, $v1 /* 413A24 E01266C4 000218C0 */ sll $v1, $v0, 3 /* 413A28 E01266C8 00431021 */ addu $v0, $v0, $v1 @@ -279,7 +279,7 @@ glabel func_E01264EC /* 413C48 E01268E8 00431021 */ addu $v0, $v0, $v1 /* 413C4C E01268EC 00021080 */ sll $v0, $v0, 2 /* 413C50 E01268F0 46220002 */ mul.d $f0, $f0, $f2 -/* 413C54 E01268F4 00000000 */ nop +/* 413C54 E01268F4 00000000 */ nop /* 413C58 E01268F8 00431023 */ subu $v0, $v0, $v1 /* 413C5C E01268FC 000218C0 */ sll $v1, $v0, 3 /* 413C60 E0126900 00431021 */ addu $v0, $v0, $v1 @@ -462,4 +462,4 @@ glabel func_E01264EC /* 413F10 E0126BB0 D7B400D8 */ ldc1 $f20, 0xd8($sp) /* 413F14 E0126BB4 03E00008 */ jr $ra /* 413F18 E0126BB8 27BD00E0 */ addiu $sp, $sp, 0xe0 -/* 413F1C E0126BBC 00000000 */ nop +/* 413F1C E0126BBC 00000000 */ nop diff --git a/asm/nonmatchings/code_415D90/can_switch_to_player.s b/asm/nonmatchings/code_415D90/can_switch_to_player.s index 4ebb67c160..c19f8a7c8c 100644 --- a/asm/nonmatchings/code_415D90/can_switch_to_player.s +++ b/asm/nonmatchings/code_415D90/can_switch_to_player.s @@ -58,4 +58,4 @@ glabel can_switch_to_player /* 41A654 802A58C4 38820001 */ xori $v0, $a0, 1 .L802A58C8: /* 41A658 802A58C8 03E00008 */ jr $ra -/* 41A65C 802A58CC 00000000 */ nop +/* 41A65C 802A58CC 00000000 */ nop diff --git a/asm/nonmatchings/code_415D90/draw_battle_wheel.s b/asm/nonmatchings/code_415D90/draw_battle_wheel.s index 4f35d32726..f268d9b2e6 100644 --- a/asm/nonmatchings/code_415D90/draw_battle_wheel.s +++ b/asm/nonmatchings/code_415D90/draw_battle_wheel.s @@ -25,11 +25,12 @@ glabel draw_battle_wheel /* 416A34 802A1CA4 2C620020 */ sltiu $v0, $v1, 0x20 /* 416A38 802A1CA8 10400266 */ beqz $v0, .L802A2644 /* 416A3C 802A1CAC 00031080 */ sll $v0, $v1, 2 -/* 416A40 802A1CB0 3C01802B */ lui $at, %hi(D_802AB770) +/* 416A40 802A1CB0 3C01802B */ lui $at, %hi(jtbl_802AB770_420500) /* 416A44 802A1CB4 00220821 */ addu $at, $at, $v0 -/* 416A48 802A1CB8 8C22B770 */ lw $v0, %lo(D_802AB770)($at) +/* 416A48 802A1CB8 8C22B770 */ lw $v0, %lo(jtbl_802AB770_420500)($at) /* 416A4C 802A1CBC 00400008 */ jr $v0 -/* 416A50 802A1CC0 00000000 */ nop +/* 416A50 802A1CC0 00000000 */ nop +glabel L802A1CC4_416A54 /* 416A54 802A1CC4 0C051086 */ jal func_80144218 /* 416A58 802A1CC8 2404FFFF */ addiu $a0, $zero, -1 /* 416A5C 802A1CCC 3C128080 */ lui $s2, 0x8080 @@ -89,7 +90,8 @@ glabel draw_battle_wheel /* 416B34 802A1DA4 0C05108E */ jal func_80144238 /* 416B38 802A1DA8 0260202D */ daddu $a0, $s3, $zero /* 416B3C 802A1DAC 080A8991 */ j .L802A2644 -/* 416B40 802A1DB0 00000000 */ nop +/* 416B40 802A1DB0 00000000 */ nop +glabel L802A1DB4_416B44 /* 416B44 802A1DB4 3C03802B */ lui $v1, %hi(D_802AD006) /* 416B48 802A1DB8 8463D006 */ lh $v1, %lo(D_802AD006)($v1) /* 416B4C 802A1DBC 3C02802B */ lui $v0, %hi(D_802AD008) @@ -118,10 +120,10 @@ glabel draw_battle_wheel /* 416BA8 802A1E18 2442D06C */ addiu $v0, $v0, %lo(D_802AD06C) /* 416BAC 802A1E1C C4420000 */ lwc1 $f2, ($v0) /* 416BB0 802A1E20 4483C000 */ mtc1 $v1, $f24 -/* 416BB4 802A1E24 00000000 */ nop +/* 416BB4 802A1E24 00000000 */ nop /* 416BB8 802A1E28 4680C620 */ cvt.s.w $f24, $f24 /* 416BBC 802A1E2C 4602C03C */ c.lt.s $f24, $f2 -/* 416BC0 802A1E30 00000000 */ nop +/* 416BC0 802A1E30 00000000 */ nop /* 416BC4 802A1E34 45000007 */ bc1f .L802A1E54 /* 416BC8 802A1E38 0000B82D */ daddu $s7, $zero, $zero /* 416BCC 802A1E3C 3C01802B */ lui $at, %hi(D_802AD070) @@ -132,7 +134,7 @@ glabel draw_battle_wheel /* 416BE0 802A1E50 E4400000 */ swc1 $f0, ($v0) .L802A1E54: /* 416BE4 802A1E54 4618103C */ c.lt.s $f2, $f24 -/* 416BE8 802A1E58 00000000 */ nop +/* 416BE8 802A1E58 00000000 */ nop /* 416BEC 802A1E5C 4502000B */ bc1fl .L802A1E8C /* 416BF0 802A1E60 24170001 */ addiu $s7, $zero, 1 /* 416BF4 802A1E64 3C01802B */ lui $at, %hi(D_802AD070) @@ -140,15 +142,15 @@ glabel draw_battle_wheel /* 416BFC 802A1E6C 46001000 */ add.s $f0, $f2, $f0 /* 416C00 802A1E70 E4400000 */ swc1 $f0, ($v0) /* 416C04 802A1E74 4600C03C */ c.lt.s $f24, $f0 -/* 416C08 802A1E78 00000000 */ nop +/* 416C08 802A1E78 00000000 */ nop .L802A1E7C: /* 416C0C 802A1E7C 45000003 */ bc1f .L802A1E8C -/* 416C10 802A1E80 00000000 */ nop +/* 416C10 802A1E80 00000000 */ nop /* 416C14 802A1E84 E4580000 */ swc1 $f24, ($v0) /* 416C18 802A1E88 24170001 */ addiu $s7, $zero, 1 .L802A1E8C: /* 416C1C 802A1E8C 16E00010 */ bnez $s7, .L802A1ED0 -/* 416C20 802A1E90 00000000 */ nop +/* 416C20 802A1E90 00000000 */ nop /* 416C24 802A1E94 3C02802B */ lui $v0, %hi(D_802AD070) /* 416C28 802A1E98 2442D070 */ addiu $v0, $v0, %lo(D_802AD070) /* 416C2C 802A1E9C C4400000 */ lwc1 $f0, ($v0) @@ -158,9 +160,9 @@ glabel draw_battle_wheel /* 416C3C 802A1EAC 46000021 */ cvt.d.s $f0, $f0 /* 416C40 802A1EB0 46220080 */ add.d $f2, $f0, $f2 /* 416C44 802A1EB4 46220002 */ mul.d $f0, $f0, $f2 -/* 416C48 802A1EB8 00000000 */ nop +/* 416C48 802A1EB8 00000000 */ nop /* 416C4C 802A1EBC 46220002 */ mul.d $f0, $f0, $f2 -/* 416C50 802A1EC0 00000000 */ nop +/* 416C50 802A1EC0 00000000 */ nop /* 416C54 802A1EC4 46200020 */ cvt.s.d $f0, $f0 /* 416C58 802A1EC8 080A87BB */ j .L802A1EEC /* 416C5C 802A1ECC E4400000 */ swc1 $f0, ($v0) @@ -233,13 +235,13 @@ glabel draw_battle_wheel /* 416D5C 802A1FCC 02562823 */ subu $a1, $s2, $s6 /* 416D60 802A1FD0 3C014260 */ lui $at, 0x4260 /* 416D64 802A1FD4 44810000 */ mtc1 $at, $f0 -/* 416D68 802A1FD8 00000000 */ nop +/* 416D68 802A1FD8 00000000 */ nop /* 416D6C 802A1FDC 4600C032 */ c.eq.s $f24, $f0 /* 416D70 802A1FE0 3C053F80 */ lui $a1, 0x3f80 /* 416D74 802A1FE4 45000005 */ bc1f .L802A1FFC /* 416D78 802A1FE8 24020001 */ addiu $v0, $zero, 1 /* 416D7C 802A1FEC 16E20003 */ bne $s7, $v0, .L802A1FFC -/* 416D80 802A1FF0 00000000 */ nop +/* 416D80 802A1FF0 00000000 */ nop /* 416D84 802A1FF4 3C053FCC */ lui $a1, 0x3fcc /* 416D88 802A1FF8 34A5CCCD */ ori $a1, $a1, 0xcccd .L802A1FFC: @@ -305,7 +307,7 @@ glabel draw_battle_wheel /* 416E78 802A20E8 0C051280 */ jal set_icon_flags /* 416E7C 802A20EC 24050002 */ addiu $a1, $zero, 2 /* 416E80 802A20F0 080A8840 */ j .L802A2100 -/* 416E84 802A20F4 00000000 */ nop +/* 416E84 802A20F4 00000000 */ nop .L802A20F8: /* 416E88 802A20F8 0C05128B */ jal clear_icon_flags /* 416E8C 802A20FC 24050002 */ addiu $a1, $zero, 2 @@ -335,14 +337,14 @@ glabel draw_battle_wheel /* 416EE0 802A2150 00621823 */ subu $v1, $v1, $v0 /* 416EE4 802A2154 00031880 */ sll $v1, $v1, 2 /* 416EE8 802A2158 4483C000 */ mtc1 $v1, $f24 -/* 416EEC 802A215C 00000000 */ nop +/* 416EEC 802A215C 00000000 */ nop /* 416EF0 802A2160 4680C620 */ cvt.s.w $f24, $f24 /* 416EF4 802A2164 46180001 */ sub.s $f0, $f0, $f24 /* 416EF8 802A2168 3C01802B */ lui $at, %hi(D_802AB7F0) /* 416EFC 802A216C D43AB7F0 */ ldc1 $f26, %lo(D_802AB7F0)($at) /* 416F00 802A2170 46000021 */ cvt.d.s $f0, $f0 /* 416F04 802A2174 463A0002 */ mul.d $f0, $f0, $f26 -/* 416F08 802A2178 00000000 */ nop +/* 416F08 802A2178 00000000 */ nop /* 416F0C 802A217C 3C01802B */ lui $at, %hi(D_802AB7F8) /* 416F10 802A2180 D424B7F8 */ ldc1 $f4, %lo(D_802AB7F8)($at) /* 416F14 802A2184 46200020 */ cvt.s.d $f0, $f0 @@ -414,12 +416,12 @@ glabel draw_battle_wheel /* 417018 802A2288 00621823 */ subu $v1, $v1, $v0 /* 41701C 802A228C 00031880 */ sll $v1, $v1, 2 /* 417020 802A2290 4483C000 */ mtc1 $v1, $f24 -/* 417024 802A2294 00000000 */ nop +/* 417024 802A2294 00000000 */ nop /* 417028 802A2298 4680C620 */ cvt.s.w $f24, $f24 /* 41702C 802A229C 46180001 */ sub.s $f0, $f0, $f24 /* 417030 802A22A0 46000021 */ cvt.d.s $f0, $f0 /* 417034 802A22A4 463A0002 */ mul.d $f0, $f0, $f26 -/* 417038 802A22A8 00000000 */ nop +/* 417038 802A22A8 00000000 */ nop /* 41703C 802A22AC 4405A000 */ mfc1 $a1, $f20 /* 417040 802A22B0 3C13802B */ lui $s3, %hi(D_802AD048) /* 417044 802A22B4 8E73D048 */ lw $s3, %lo(D_802AD048)($s3) @@ -604,11 +606,11 @@ glabel draw_battle_wheel /* 417300 802A2570 3C030200 */ lui $v1, 0x200 /* 417304 802A2574 00431024 */ and $v0, $v0, $v1 /* 417308 802A2578 14400005 */ bnez $v0, .L802A2590 -/* 41730C 802A257C 00000000 */ nop +/* 41730C 802A257C 00000000 */ nop /* 417310 802A2580 8C820004 */ lw $v0, 4($a0) /* 417314 802A2584 30420040 */ andi $v0, $v0, 0x40 /* 417318 802A2588 10400003 */ beqz $v0, .L802A2598 -/* 41731C 802A258C 00000000 */ nop +/* 41731C 802A258C 00000000 */ nop .L802A2590: /* 417320 802A2590 3C01802B */ lui $at, %hi(D_802AD104) /* 417324 802A2594 AC20D104 */ sw $zero, %lo(D_802AD104)($at) @@ -657,6 +659,7 @@ glabel draw_battle_wheel /* 4173CC 802A263C 0C0511EA */ jal draw_icon_0 /* 4173D0 802A2640 0260202D */ daddu $a0, $s3, $zero .L802A2644: +glabel L802A2644_4173D4 /* 4173D4 802A2644 8FBF0054 */ lw $ra, 0x54($sp) /* 4173D8 802A2648 8FBE0050 */ lw $fp, 0x50($sp) /* 4173DC 802A264C 8FB7004C */ lw $s7, 0x4c($sp) diff --git a/asm/nonmatchings/code_415D90/func_802A1000.s b/asm/nonmatchings/code_415D90/func_802A1000.s index 138c5de73d..e741d95908 100644 --- a/asm/nonmatchings/code_415D90/func_802A1000.s +++ b/asm/nonmatchings/code_415D90/func_802A1000.s @@ -13,4 +13,4 @@ glabel func_802A1000 /* 415DB0 802A1020 3C01802B */ lui $at, %hi(D_802AD068) /* 415DB4 802A1024 A022D068 */ sb $v0, %lo(D_802AD068)($at) /* 415DB8 802A1028 03E00008 */ jr $ra -/* 415DBC 802A102C 00000000 */ nop +/* 415DBC 802A102C 00000000 */ nop diff --git a/asm/nonmatchings/code_415D90/func_802A1030.s b/asm/nonmatchings/code_415D90/func_802A1030.s index d216533ff6..eb8a503d27 100644 --- a/asm/nonmatchings/code_415D90/func_802A1030.s +++ b/asm/nonmatchings/code_415D90/func_802A1030.s @@ -9,4 +9,4 @@ glabel func_802A1030 /* 415DD0 802A1040 3C01802B */ lui $at, %hi(D_802AD000) /* 415DD4 802A1044 A022D000 */ sb $v0, %lo(D_802AD000)($at) /* 415DD8 802A1048 03E00008 */ jr $ra -/* 415DDC 802A104C 00000000 */ nop +/* 415DDC 802A104C 00000000 */ nop diff --git a/asm/nonmatchings/code_415D90/func_802A1050.s b/asm/nonmatchings/code_415D90/func_802A1050.s index 30810da719..d530e05364 100644 --- a/asm/nonmatchings/code_415D90/func_802A1050.s +++ b/asm/nonmatchings/code_415D90/func_802A1050.s @@ -11,4 +11,4 @@ glabel func_802A1050 /* 415DF8 802A1068 3C01802B */ lui $at, %hi(D_802AD008) /* 415DFC 802A106C A422D008 */ sh $v0, %lo(D_802AD008)($at) /* 415E00 802A1070 03E00008 */ jr $ra -/* 415E04 802A1074 00000000 */ nop +/* 415E04 802A1074 00000000 */ nop diff --git a/asm/nonmatchings/code_415D90/func_802A1078.s b/asm/nonmatchings/code_415D90/func_802A1078.s index afc748d1cf..50d6ed2afb 100644 --- a/asm/nonmatchings/code_415D90/func_802A1078.s +++ b/asm/nonmatchings/code_415D90/func_802A1078.s @@ -9,4 +9,4 @@ glabel func_802A1078 /* 415E18 802A1088 3C01802B */ lui $at, %hi(D_802AD000) /* 415E1C 802A108C A022D000 */ sb $v0, %lo(D_802AD000)($at) /* 415E20 802A1090 03E00008 */ jr $ra -/* 415E24 802A1094 00000000 */ nop +/* 415E24 802A1094 00000000 */ nop diff --git a/asm/nonmatchings/code_415D90/func_802A1098.s b/asm/nonmatchings/code_415D90/func_802A1098.s index 9ab39d3a37..7d0e38bf81 100644 --- a/asm/nonmatchings/code_415D90/func_802A1098.s +++ b/asm/nonmatchings/code_415D90/func_802A1098.s @@ -9,4 +9,4 @@ glabel func_802A1098 /* 415E38 802A10A8 3C01802B */ lui $at, %hi(D_802AD000) /* 415E3C 802A10AC A022D000 */ sb $v0, %lo(D_802AD000)($at) /* 415E40 802A10B0 03E00008 */ jr $ra -/* 415E44 802A10B4 00000000 */ nop +/* 415E44 802A10B4 00000000 */ nop diff --git a/asm/nonmatchings/code_415D90/func_802A10B8.s b/asm/nonmatchings/code_415D90/func_802A10B8.s index 19091ac335..cfb3e62ae1 100644 --- a/asm/nonmatchings/code_415D90/func_802A10B8.s +++ b/asm/nonmatchings/code_415D90/func_802A10B8.s @@ -31,35 +31,35 @@ glabel func_802A10B8 /* 415EA8 802A1118 3C04802B */ lui $a0, %hi(D_802AD040) /* 415EAC 802A111C 8C84D040 */ lw $a0, %lo(D_802AD040)($a0) /* 415EB0 802A1120 0C05123D */ jal free_icon -/* 415EB4 802A1124 00000000 */ nop +/* 415EB4 802A1124 00000000 */ nop /* 415EB8 802A1128 3C04802B */ lui $a0, %hi(D_802AD044) /* 415EBC 802A112C 8C84D044 */ lw $a0, %lo(D_802AD044)($a0) /* 415EC0 802A1130 0C05123D */ jal free_icon -/* 415EC4 802A1134 00000000 */ nop +/* 415EC4 802A1134 00000000 */ nop /* 415EC8 802A1138 3C04802B */ lui $a0, %hi(D_802AD048) /* 415ECC 802A113C 8C84D048 */ lw $a0, %lo(D_802AD048)($a0) /* 415ED0 802A1140 0C05123D */ jal free_icon -/* 415ED4 802A1144 00000000 */ nop +/* 415ED4 802A1144 00000000 */ nop /* 415ED8 802A1148 3C04802B */ lui $a0, %hi(D_802AD04C) /* 415EDC 802A114C 8C84D04C */ lw $a0, %lo(D_802AD04C)($a0) /* 415EE0 802A1150 0C05123D */ jal free_icon -/* 415EE4 802A1154 00000000 */ nop +/* 415EE4 802A1154 00000000 */ nop /* 415EE8 802A1158 3C04802B */ lui $a0, %hi(D_802AD05C) /* 415EEC 802A115C 8C84D05C */ lw $a0, %lo(D_802AD05C)($a0) /* 415EF0 802A1160 0C05123D */ jal free_icon -/* 415EF4 802A1164 00000000 */ nop +/* 415EF4 802A1164 00000000 */ nop /* 415EF8 802A1168 3C04802B */ lui $a0, %hi(D_802AD050) /* 415EFC 802A116C 8C84D050 */ lw $a0, %lo(D_802AD050)($a0) /* 415F00 802A1170 0C05123D */ jal free_icon -/* 415F04 802A1174 00000000 */ nop +/* 415F04 802A1174 00000000 */ nop /* 415F08 802A1178 3C04802B */ lui $a0, %hi(D_802AD054) /* 415F0C 802A117C 8C84D054 */ lw $a0, %lo(D_802AD054)($a0) /* 415F10 802A1180 0C05123D */ jal free_icon -/* 415F14 802A1184 00000000 */ nop +/* 415F14 802A1184 00000000 */ nop /* 415F18 802A1188 3C04802B */ lui $a0, %hi(D_802AD058) /* 415F1C 802A118C 8C84D058 */ lw $a0, %lo(D_802AD058)($a0) /* 415F20 802A1190 0C05123D */ jal free_icon -/* 415F24 802A1194 00000000 */ nop +/* 415F24 802A1194 00000000 */ nop /* 415F28 802A1198 8FBF001C */ lw $ra, 0x1c($sp) /* 415F2C 802A119C 8FB20018 */ lw $s2, 0x18($sp) /* 415F30 802A11A0 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_415D90/func_802A11B0.s b/asm/nonmatchings/code_415D90/func_802A11B0.s index c3326461d2..20324b1704 100644 --- a/asm/nonmatchings/code_415D90/func_802A11B0.s +++ b/asm/nonmatchings/code_415D90/func_802A11B0.s @@ -19,7 +19,7 @@ glabel func_802A11B0 /* 415F78 802A11E8 82030000 */ lb $v1, ($s0) /* 415F7C 802A11EC 2402000A */ addiu $v0, $zero, 0xa /* 415F80 802A11F0 10620257 */ beq $v1, $v0, .L802A1B50 -/* 415F84 802A11F4 00000000 */ nop +/* 415F84 802A11F4 00000000 */ nop /* 415F88 802A11F8 2862000B */ slti $v0, $v1, 0xb /* 415F8C 802A11FC 50400010 */ beql $v0, $zero, .L802A1240 /* 415F90 802A1200 2402001E */ addiu $v0, $zero, 0x1e @@ -38,7 +38,7 @@ glabel func_802A11B0 /* 415FC0 802A1230 106201EC */ beq $v1, $v0, .L802A19E4 /* 415FC4 802A1234 0000102D */ daddu $v0, $zero, $zero /* 415FC8 802A1238 080A870A */ j .L802A1C28 -/* 415FCC 802A123C 00000000 */ nop +/* 415FCC 802A123C 00000000 */ nop .L802A1240: /* 415FD0 802A1240 10620262 */ beq $v1, $v0, .L802A1BCC /* 415FD4 802A1244 24020003 */ addiu $v0, $zero, 3 @@ -46,7 +46,7 @@ glabel func_802A11B0 /* 415FDC 802A124C 10400008 */ beqz $v0, .L802A1270 /* 415FE0 802A1250 2402000B */ addiu $v0, $zero, 0xb /* 415FE4 802A1254 10620248 */ beq $v1, $v0, .L802A1B78 -/* 415FE8 802A1258 00000000 */ nop +/* 415FE8 802A1258 00000000 */ nop /* 415FEC 802A125C 24020014 */ addiu $v0, $zero, 0x14 /* 415FF0 802A1260 1062024C */ beq $v1, $v0, .L802A1B94 /* 415FF4 802A1264 24020003 */ addiu $v0, $zero, 3 @@ -59,7 +59,7 @@ glabel func_802A11B0 /* 41600C 802A127C 10620260 */ beq $v1, $v0, .L802A1C00 /* 416010 802A1280 0000102D */ daddu $v0, $zero, $zero /* 416014 802A1284 080A870A */ j .L802A1C28 -/* 416018 802A1288 00000000 */ nop +/* 416018 802A1288 00000000 */ nop .L802A128C: /* 41601C 802A128C 3C01802B */ lui $at, %hi(D_802AD060) /* 416020 802A1290 AC22D060 */ sw $v0, %lo(D_802AD060)($at) @@ -122,7 +122,7 @@ glabel func_802A11B0 /* 416100 802A1370 3C048029 */ lui $a0, %hi(D_80292C00) /* 416104 802A1374 24842C00 */ addiu $a0, $a0, %lo(D_80292C00) /* 416108 802A1378 0C050529 */ jal create_icon -/* 41610C 802A137C 00000000 */ nop +/* 41610C 802A137C 00000000 */ nop /* 416110 802A1380 0040882D */ daddu $s1, $v0, $zero /* 416114 802A1384 0220202D */ daddu $a0, $s1, $zero /* 416118 802A1388 0C0513F6 */ jal func_80144FD8 @@ -148,7 +148,7 @@ glabel func_802A11B0 /* 416164 802A13D4 3C048029 */ lui $a0, %hi(D_80292C00) /* 416168 802A13D8 24842C00 */ addiu $a0, $a0, %lo(D_80292C00) /* 41616C 802A13DC 0C050529 */ jal create_icon -/* 416170 802A13E0 00000000 */ nop +/* 416170 802A13E0 00000000 */ nop /* 416174 802A13E4 0040882D */ daddu $s1, $v0, $zero /* 416178 802A13E8 3C01802B */ lui $at, %hi(D_802AD040) /* 41617C 802A13EC AC31D040 */ sw $s1, %lo(D_802AD040)($at) @@ -235,7 +235,7 @@ glabel func_802A11B0 /* 4162C0 802A1530 3C048029 */ lui $a0, %hi(D_80292C28) /* 4162C4 802A1534 24842C28 */ addiu $a0, $a0, %lo(D_80292C28) /* 4162C8 802A1538 0C050529 */ jal create_icon -/* 4162CC 802A153C 00000000 */ nop +/* 4162CC 802A153C 00000000 */ nop /* 4162D0 802A1540 0040882D */ daddu $s1, $v0, $zero /* 4162D4 802A1544 3C01802B */ lui $at, %hi(D_802AD04C) /* 4162D8 802A1548 AC31D04C */ sw $s1, %lo(D_802AD04C)($at) @@ -278,7 +278,7 @@ glabel func_802A11B0 /* 41636C 802A15DC 3C048029 */ lui $a0, %hi(D_80292CF4) /* 416370 802A15E0 24842CF4 */ addiu $a0, $a0, %lo(D_80292CF4) /* 416374 802A15E4 0C050529 */ jal create_icon -/* 416378 802A15E8 00000000 */ nop +/* 416378 802A15E8 00000000 */ nop /* 41637C 802A15EC 0040882D */ daddu $s1, $v0, $zero /* 416380 802A15F0 0220202D */ daddu $a0, $s1, $zero /* 416384 802A15F4 3C01802B */ lui $at, %hi(D_802AD05C) @@ -306,7 +306,7 @@ glabel func_802A11B0 /* 4163DC 802A164C 3C048029 */ lui $a0, %hi(D_80292C50) /* 4163E0 802A1650 24842C50 */ addiu $a0, $a0, %lo(D_80292C50) /* 4163E4 802A1654 0C050529 */ jal create_icon -/* 4163E8 802A1658 00000000 */ nop +/* 4163E8 802A1658 00000000 */ nop /* 4163EC 802A165C 0040882D */ daddu $s1, $v0, $zero /* 4163F0 802A1660 0220202D */ daddu $a0, $s1, $zero /* 4163F4 802A1664 3C01802B */ lui $at, %hi(D_802AD050) @@ -326,7 +326,7 @@ glabel func_802A11B0 /* 41642C 802A169C 3C048029 */ lui $a0, %hi(D_80292C7C) /* 416430 802A16A0 24842C7C */ addiu $a0, $a0, %lo(D_80292C7C) /* 416434 802A16A4 0C050529 */ jal create_icon -/* 416438 802A16A8 00000000 */ nop +/* 416438 802A16A8 00000000 */ nop /* 41643C 802A16AC 0040882D */ daddu $s1, $v0, $zero /* 416440 802A16B0 0220202D */ daddu $a0, $s1, $zero /* 416444 802A16B4 3C01802B */ lui $at, %hi(D_802AD054) @@ -346,7 +346,7 @@ glabel func_802A11B0 /* 41647C 802A16EC 3C048029 */ lui $a0, %hi(D_80292CB8) /* 416480 802A16F0 24842CB8 */ addiu $a0, $a0, %lo(D_80292CB8) /* 416484 802A16F4 0C050529 */ jal create_icon -/* 416488 802A16F8 00000000 */ nop +/* 416488 802A16F8 00000000 */ nop /* 41648C 802A16FC 0040882D */ daddu $s1, $v0, $zero /* 416490 802A1700 0220202D */ daddu $a0, $s1, $zero /* 416494 802A1704 3C01802B */ lui $at, %hi(D_802AD058) @@ -378,7 +378,7 @@ glabel func_802A11B0 /* 4164FC 802A176C 00431023 */ subu $v0, $v0, $v1 /* 416500 802A1770 00021080 */ sll $v0, $v0, 2 /* 416504 802A1774 4482A000 */ mtc1 $v0, $f20 -/* 416508 802A1778 00000000 */ nop +/* 416508 802A1778 00000000 */ nop /* 41650C 802A177C 4680A520 */ cvt.s.w $f20, $f20 /* 416510 802A1780 3C01802B */ lui $at, %hi(D_802AD06C) /* 416514 802A1784 E434D06C */ swc1 $f20, %lo(D_802AD06C)($at) @@ -402,9 +402,9 @@ glabel func_802A11B0 /* 416558 802A17C8 3C01802B */ lui $at, %hi(D_802AD00A) /* 41655C 802A17CC A422D00A */ sh $v0, %lo(D_802AD00A)($at) /* 416560 802A17D0 1080000A */ beqz $a0, .L802A17FC -/* 416564 802A17D4 00000000 */ nop +/* 416564 802A17D4 00000000 */ nop /* 416568 802A17D8 14850005 */ bne $a0, $a1, .L802A17F0 -/* 41656C 802A17DC 00000000 */ nop +/* 41656C 802A17DC 00000000 */ nop /* 416570 802A17E0 3C04802B */ lui $a0, %hi(D_802AD04C) /* 416574 802A17E4 8C84D04C */ lw $a0, %lo(D_802AD04C)($a0) /* 416578 802A17E8 0C05128B */ jal clear_icon_flags @@ -426,7 +426,7 @@ glabel func_802A11B0 /* 4165B0 802A1820 3C02802B */ lui $v0, %hi(D_802AD0AC) /* 4165B4 802A1824 8C42D0AC */ lw $v0, %lo(D_802AD0AC)($v0) /* 4165B8 802A1828 4483A000 */ mtc1 $v1, $f20 -/* 4165BC 802A182C 00000000 */ nop +/* 4165BC 802A182C 00000000 */ nop /* 4165C0 802A1830 4680A520 */ cvt.s.w $f20, $f20 /* 4165C4 802A1834 3C01802B */ lui $at, %hi(D_802AD06C) /* 4165C8 802A1838 E434D06C */ swc1 $f20, %lo(D_802AD06C)($at) @@ -461,7 +461,7 @@ glabel func_802A11B0 /* 416638 802A18A8 46040000 */ add.s $f0, $f0, $f4 /* 41663C 802A18AC 4600118D */ trunc.w.s $f6, $f2 /* 416640 802A18B0 44123000 */ mfc1 $s2, $f6 -/* 416644 802A18B4 00000000 */ nop +/* 416644 802A18B4 00000000 */ nop /* 416648 802A18B8 0240282D */ daddu $a1, $s2, $zero /* 41664C 802A18BC 4600018D */ trunc.w.s $f6, $f0 /* 416650 802A18C0 44103000 */ mfc1 $s0, $f6 @@ -498,7 +498,7 @@ glabel func_802A11B0 /* 4166C8 802A1938 00431023 */ subu $v0, $v0, $v1 /* 4166CC 802A193C 00021080 */ sll $v0, $v0, 2 /* 4166D0 802A1940 44823000 */ mtc1 $v0, $f6 -/* 4166D4 802A1944 00000000 */ nop +/* 4166D4 802A1944 00000000 */ nop /* 4166D8 802A1948 468031A0 */ cvt.s.w $f6, $f6 /* 4166DC 802A194C 44073000 */ mfc1 $a3, $f6 /* 4166E0 802A1950 27A50014 */ addiu $a1, $sp, 0x14 @@ -542,7 +542,7 @@ glabel func_802A11B0 /* 416774 802A19E4 8CC20214 */ lw $v0, 0x214($a2) /* 416778 802A19E8 30428000 */ andi $v0, $v0, 0x8000 /* 41677C 802A19EC 10400021 */ beqz $v0, .L802A1A74 -/* 416780 802A19F0 00000000 */ nop +/* 416780 802A19F0 00000000 */ nop /* 416784 802A19F4 3C11802B */ lui $s1, %hi(D_802AD002) /* 416788 802A19F8 2631D002 */ addiu $s1, $s1, %lo(D_802AD002) /* 41678C 802A19FC 3C12802B */ lui $s2, %hi(D_802AD06B) @@ -555,7 +555,7 @@ glabel func_802A11B0 /* 4167A8 802A1A18 00220821 */ addu $at, $at, $v0 /* 4167AC 802A1A1C 8C22D0D0 */ lw $v0, %lo(D_802AD0D0)($at) /* 4167B0 802A1A20 14450005 */ bne $v0, $a1, .L802A1A38 -/* 4167B4 802A1A24 00000000 */ nop +/* 4167B4 802A1A24 00000000 */ nop /* 4167B8 802A1A28 0C05272D */ jal play_sound /* 4167BC 802A1A2C 240400C9 */ addiu $a0, $zero, 0xc9 /* 4167C0 802A1A30 080A8708 */ j .L802A1C20 @@ -602,7 +602,7 @@ glabel func_802A11B0 /* 416858 802A1AC8 3C03000A */ lui $v1, 0xa /* 41685C 802A1ACC 00431024 */ and $v0, $v0, $v1 /* 416860 802A1AD0 1040000B */ beqz $v0, .L802A1B00 -/* 416864 802A1AD4 00000000 */ nop +/* 416864 802A1AD4 00000000 */ nop /* 416868 802A1AD8 3C04802B */ lui $a0, %hi(D_802AD002) /* 41686C 802A1ADC 2484D002 */ addiu $a0, $a0, %lo(D_802AD002) /* 416870 802A1AE0 80820000 */ lb $v0, ($a0) @@ -688,7 +688,7 @@ glabel func_802A11B0 /* 41698C 802A1BFC 24020065 */ addiu $v0, $zero, 0x65 .L802A1C00: /* 416990 802A1C00 0C093EAD */ jal is_popup_displayed -/* 416994 802A1C04 00000000 */ nop +/* 416994 802A1C04 00000000 */ nop /* 416998 802A1C08 14400007 */ bnez $v0, .L802A1C28 /* 41699C 802A1C0C 0000102D */ daddu $v0, $zero, $zero /* 4169A0 802A1C10 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/code_415D90/func_802A2684.s b/asm/nonmatchings/code_415D90/func_802A2684.s index 3ed8760cfd..2d6aae98d9 100644 --- a/asm/nonmatchings/code_415D90/func_802A2684.s +++ b/asm/nonmatchings/code_415D90/func_802A2684.s @@ -56,7 +56,7 @@ glabel func_802A2684 /* 4174D0 802A2740 81020000 */ lb $v0, ($t0) /* 4174D4 802A2744 00A2102A */ slt $v0, $a1, $v0 /* 4174D8 802A2748 14400005 */ bnez $v0, .L802A2760 -/* 4174DC 802A274C 00000000 */ nop +/* 4174DC 802A274C 00000000 */ nop /* 4174E0 802A2750 91220000 */ lbu $v0, ($t1) /* 4174E4 802A2754 2442FFFF */ addiu $v0, $v0, -1 /* 4174E8 802A2758 00821023 */ subu $v0, $a0, $v0 @@ -90,4 +90,4 @@ glabel func_802A2684 /* 417550 802A27C0 3C01802B */ lui $at, %hi(D_802AD600) /* 417554 802A27C4 AC20D600 */ sw $zero, %lo(D_802AD600)($at) /* 417558 802A27C8 03E00008 */ jr $ra -/* 41755C 802A27CC 00000000 */ nop +/* 41755C 802A27CC 00000000 */ nop diff --git a/asm/nonmatchings/code_415D90/func_802A27D0.s b/asm/nonmatchings/code_415D90/func_802A27D0.s index 5b297d83ae..e1b6665c1b 100644 --- a/asm/nonmatchings/code_415D90/func_802A27D0.s +++ b/asm/nonmatchings/code_415D90/func_802A27D0.s @@ -6,4 +6,4 @@ glabel func_802A27D0 /* 417564 802A27D4 3C01802B */ lui $at, %hi(D_802AD108) /* 417568 802A27D8 A022D108 */ sb $v0, %lo(D_802AD108)($at) /* 41756C 802A27DC 03E00008 */ jr $ra -/* 417570 802A27E0 00000000 */ nop +/* 417570 802A27E0 00000000 */ nop diff --git a/asm/nonmatchings/code_415D90/func_802A27E4.s b/asm/nonmatchings/code_415D90/func_802A27E4.s index 4cdf12d787..575b03f6f9 100644 --- a/asm/nonmatchings/code_415D90/func_802A27E4.s +++ b/asm/nonmatchings/code_415D90/func_802A27E4.s @@ -43,7 +43,7 @@ glabel func_802A27E4 /* 417600 802A2870 26100001 */ addiu $s0, $s0, 1 /* 417604 802A2874 0202102A */ slt $v0, $s0, $v0 /* 417608 802A2878 1440FFF8 */ bnez $v0, .L802A285C -/* 41760C 802A287C 00000000 */ nop +/* 41760C 802A287C 00000000 */ nop .L802A2880: /* 417610 802A2880 3C04802B */ lui $a0, %hi(D_802AD118) /* 417614 802A2884 8C84D118 */ lw $a0, %lo(D_802AD118)($a0) @@ -52,19 +52,19 @@ glabel func_802A27E4 /* 417620 802A2890 3C04802B */ lui $a0, %hi(D_802AD11C) /* 417624 802A2894 8C84D11C */ lw $a0, %lo(D_802AD11C)($a0) /* 417628 802A2898 0C05123D */ jal free_icon -/* 41762C 802A289C 00000000 */ nop +/* 41762C 802A289C 00000000 */ nop /* 417630 802A28A0 3C04802B */ lui $a0, %hi(D_802AD120) /* 417634 802A28A4 8C84D120 */ lw $a0, %lo(D_802AD120)($a0) /* 417638 802A28A8 0C05123D */ jal free_icon -/* 41763C 802A28AC 00000000 */ nop +/* 41763C 802A28AC 00000000 */ nop /* 417640 802A28B0 3C04802B */ lui $a0, %hi(D_802AD188) /* 417644 802A28B4 8C84D188 */ lw $a0, %lo(D_802AD188)($a0) /* 417648 802A28B8 0C05123D */ jal free_icon -/* 41764C 802A28BC 00000000 */ nop +/* 41764C 802A28BC 00000000 */ nop /* 417650 802A28C0 3C02802B */ lui $v0, %hi(D_802AD4A4) /* 417654 802A28C4 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) /* 417658 802A28C8 1840000C */ blez $v0, .L802A28FC -/* 41765C 802A28CC 00000000 */ nop +/* 41765C 802A28CC 00000000 */ nop /* 417660 802A28D0 3C11802B */ lui $s1, %hi(D_802AD190) /* 417664 802A28D4 2631D190 */ addiu $s1, $s1, %lo(D_802AD190) .L802A28D8: @@ -76,7 +76,7 @@ glabel func_802A27E4 /* 41767C 802A28EC 26100001 */ addiu $s0, $s0, 1 /* 417680 802A28F0 0202102A */ slt $v0, $s0, $v0 /* 417684 802A28F4 1440FFF8 */ bnez $v0, .L802A28D8 -/* 417688 802A28F8 00000000 */ nop +/* 417688 802A28F8 00000000 */ nop .L802A28FC: /* 41768C 802A28FC 8FBF0018 */ lw $ra, 0x18($sp) /* 417690 802A2900 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_415D90/func_802A2910.s b/asm/nonmatchings/code_415D90/func_802A2910.s index 5ba7c3e62e..075f6c4e0f 100644 --- a/asm/nonmatchings/code_415D90/func_802A2910.s +++ b/asm/nonmatchings/code_415D90/func_802A2910.s @@ -75,7 +75,7 @@ glabel func_802A2910 /* 4177A8 802A2A18 3C058010 */ lui $a1, %hi(D_80104A28) /* 4177AC 802A2A1C 24A54A28 */ addiu $a1, $a1, %lo(D_80104A28) /* 4177B0 802A2A20 0C0511FF */ jal set_menu_icon_script -/* 4177B4 802A2A24 00000000 */ nop +/* 4177B4 802A2A24 00000000 */ nop /* 4177B8 802A2A28 24040001 */ addiu $a0, $zero, 1 /* 4177BC 802A2A2C 0C051F9F */ jal func_80147E7C /* 4177C0 802A2A30 24050005 */ addiu $a1, $zero, 5 diff --git a/asm/nonmatchings/code_415D90/func_802A2AB8.s b/asm/nonmatchings/code_415D90/func_802A2AB8.s index df38a123f2..02ec22228b 100644 --- a/asm/nonmatchings/code_415D90/func_802A2AB8.s +++ b/asm/nonmatchings/code_415D90/func_802A2AB8.s @@ -97,7 +97,7 @@ glabel func_802A2AB8 /* 4179A0 802A2C10 3C058010 */ lui $a1, %hi(D_80104A28) /* 4179A4 802A2C14 24A54A28 */ addiu $a1, $a1, %lo(D_80104A28) /* 4179A8 802A2C18 0C0511FF */ jal set_menu_icon_script -/* 4179AC 802A2C1C 00000000 */ nop +/* 4179AC 802A2C1C 00000000 */ nop /* 4179B0 802A2C20 8FBF0018 */ lw $ra, 0x18($sp) /* 4179B4 802A2C24 8FB10014 */ lw $s1, 0x14($sp) /* 4179B8 802A2C28 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_415D90/func_802A2C84.s b/asm/nonmatchings/code_415D90/func_802A2C84.s index 2e9ab43680..4dba55e35d 100644 --- a/asm/nonmatchings/code_415D90/func_802A2C84.s +++ b/asm/nonmatchings/code_415D90/func_802A2C84.s @@ -21,11 +21,12 @@ glabel func_802A2C84 /* 417A54 802A2CC4 104003E9 */ beqz $v0, .L802A3C6C /* 417A58 802A2CC8 AFB00028 */ sw $s0, 0x28($sp) /* 417A5C 802A2CCC 00031080 */ sll $v0, $v1, 2 -/* 417A60 802A2CD0 3C01802B */ lui $at, %hi(D_802AB808) +/* 417A60 802A2CD0 3C01802B */ lui $at, %hi(jtbl_802AB808_420598) /* 417A64 802A2CD4 00220821 */ addu $at, $at, $v0 -/* 417A68 802A2CD8 8C22B808 */ lw $v0, %lo(D_802AB808)($at) +/* 417A68 802A2CD8 8C22B808 */ lw $v0, %lo(jtbl_802AB808_420598)($at) /* 417A6C 802A2CDC 00400008 */ jr $v0 -/* 417A70 802A2CE0 00000000 */ nop +/* 417A70 802A2CE0 00000000 */ nop +glabel L802A2CE4_417A74 /* 417A74 802A2CE4 3C05802B */ lui $a1, %hi(D_802AD10C) /* 417A78 802A2CE8 80A5D10C */ lb $a1, %lo(D_802AD10C)($a1) /* 417A7C 802A2CEC 3C04802B */ lui $a0, %hi(D_802AD109) @@ -68,7 +69,7 @@ glabel func_802A2C84 /* 417B08 802A2D78 3C02802B */ lui $v0, %hi(D_802AD4A0) /* 417B0C 802A2D7C 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) /* 417B10 802A2D80 14400042 */ bnez $v0, .L802A2E8C -/* 417B14 802A2D84 00000000 */ nop +/* 417B14 802A2D84 00000000 */ nop /* 417B18 802A2D88 3C03802B */ lui $v1, %hi(D_802AD4A4) /* 417B1C 802A2D8C 8C63D4A4 */ lw $v1, %lo(D_802AD4A4)($v1) /* 417B20 802A2D90 2462FFFF */ addiu $v0, $v1, -1 @@ -176,7 +177,7 @@ glabel func_802A2C84 /* 417C98 802A2F08 3C048010 */ lui $a0, %hi(D_80104A28) /* 417C9C 802A2F0C 24844A28 */ addiu $a0, $a0, %lo(D_80104A28) /* 417CA0 802A2F10 0C050529 */ jal create_icon -/* 417CA4 802A2F14 00000000 */ nop +/* 417CA4 802A2F14 00000000 */ nop /* 417CA8 802A2F18 0040902D */ daddu $s2, $v0, $zero /* 417CAC 802A2F1C 0240202D */ daddu $a0, $s2, $zero /* 417CB0 802A2F20 3C052000 */ lui $a1, 0x2000 @@ -195,7 +196,7 @@ glabel func_802A2C84 /* 417CE4 802A2F54 3C048010 */ lui $a0, %hi(D_801077E4) /* 417CE8 802A2F58 248477E4 */ addiu $a0, $a0, %lo(D_801077E4) /* 417CEC 802A2F5C 0C050529 */ jal create_icon -/* 417CF0 802A2F60 00000000 */ nop +/* 417CF0 802A2F60 00000000 */ nop /* 417CF4 802A2F64 0040902D */ daddu $s2, $v0, $zero /* 417CF8 802A2F68 0240202D */ daddu $a0, $s2, $zero /* 417CFC 802A2F6C 3C052000 */ lui $a1, 0x2000 @@ -212,7 +213,7 @@ glabel func_802A2C84 /* 417D28 802A2F98 3C048010 */ lui $a0, %hi(D_80107798) /* 417D2C 802A2F9C 24847798 */ addiu $a0, $a0, %lo(D_80107798) /* 417D30 802A2FA0 0C050529 */ jal create_icon -/* 417D34 802A2FA4 00000000 */ nop +/* 417D34 802A2FA4 00000000 */ nop /* 417D38 802A2FA8 0040902D */ daddu $s2, $v0, $zero /* 417D3C 802A2FAC 0240202D */ daddu $a0, $s2, $zero /* 417D40 802A2FB0 3C052000 */ lui $a1, 0x2000 @@ -229,11 +230,11 @@ glabel func_802A2C84 /* 417D6C 802A2FDC 3C02802B */ lui $v0, %hi(D_802AD4A0) /* 417D70 802A2FE0 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) /* 417D74 802A2FE4 1440000A */ bnez $v0, .L802A3010 -/* 417D78 802A2FE8 00000000 */ nop +/* 417D78 802A2FE8 00000000 */ nop /* 417D7C 802A2FEC 3C048011 */ lui $a0, %hi(D_80108538) /* 417D80 802A2FF0 24848538 */ addiu $a0, $a0, %lo(D_80108538) /* 417D84 802A2FF4 0C050529 */ jal create_icon -/* 417D88 802A2FF8 00000000 */ nop +/* 417D88 802A2FF8 00000000 */ nop /* 417D8C 802A2FFC 0040902D */ daddu $s2, $v0, $zero /* 417D90 802A3000 3C01802B */ lui $at, %hi(D_802AD188) /* 417D94 802A3004 AC22D188 */ sw $v0, %lo(D_802AD188)($at) @@ -243,7 +244,7 @@ glabel func_802A2C84 /* 417DA0 802A3010 3C048011 */ lui $a0, %hi(D_80108974) /* 417DA4 802A3014 24848974 */ addiu $a0, $a0, %lo(D_80108974) /* 417DA8 802A3018 0C050529 */ jal create_icon -/* 417DAC 802A301C 00000000 */ nop +/* 417DAC 802A301C 00000000 */ nop /* 417DB0 802A3020 0040902D */ daddu $s2, $v0, $zero /* 417DB4 802A3024 3C053F40 */ lui $a1, 0x3f40 /* 417DB8 802A3028 3C01802B */ lui $at, %hi(D_802AD188) @@ -276,48 +277,48 @@ glabel func_802A2C84 /* 417E1C 802A308C 3C02802B */ lui $v0, %hi(D_802AD4A0) /* 417E20 802A3090 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) /* 417E24 802A3094 14400014 */ bnez $v0, .L802A30E8 -/* 417E28 802A3098 00000000 */ nop +/* 417E28 802A3098 00000000 */ nop /* 417E2C 802A309C 8E820000 */ lw $v0, ($s4) /* 417E30 802A30A0 10400005 */ beqz $v0, .L802A30B8 -/* 417E34 802A30A4 00000000 */ nop +/* 417E34 802A30A4 00000000 */ nop /* 417E38 802A30A8 10560007 */ beq $v0, $s6, .L802A30C8 -/* 417E3C 802A30AC 00000000 */ nop +/* 417E3C 802A30AC 00000000 */ nop /* 417E40 802A30B0 080A8C36 */ j .L802A30D8 -/* 417E44 802A30B4 00000000 */ nop +/* 417E44 802A30B4 00000000 */ nop .L802A30B8: /* 417E48 802A30B8 3C048010 */ lui $a0, %hi(D_80107638) /* 417E4C 802A30BC 24847638 */ addiu $a0, $a0, %lo(D_80107638) /* 417E50 802A30C0 080A8C47 */ j .L802A311C -/* 417E54 802A30C4 00000000 */ nop +/* 417E54 802A30C4 00000000 */ nop .L802A30C8: /* 417E58 802A30C8 3C048010 */ lui $a0, %hi(D_80107664) /* 417E5C 802A30CC 24847664 */ addiu $a0, $a0, %lo(D_80107664) /* 417E60 802A30D0 080A8C47 */ j .L802A311C -/* 417E64 802A30D4 00000000 */ nop +/* 417E64 802A30D4 00000000 */ nop .L802A30D8: /* 417E68 802A30D8 3C048010 */ lui $a0, %hi(D_80107690) /* 417E6C 802A30DC 24847690 */ addiu $a0, $a0, %lo(D_80107690) /* 417E70 802A30E0 080A8C4F */ j .L802A313C -/* 417E74 802A30E4 00000000 */ nop +/* 417E74 802A30E4 00000000 */ nop .L802A30E8: /* 417E78 802A30E8 8E820000 */ lw $v0, ($s4) /* 417E7C 802A30EC 10400005 */ beqz $v0, .L802A3104 -/* 417E80 802A30F0 00000000 */ nop +/* 417E80 802A30F0 00000000 */ nop /* 417E84 802A30F4 10560007 */ beq $v0, $s6, .L802A3114 -/* 417E88 802A30F8 00000000 */ nop +/* 417E88 802A30F8 00000000 */ nop /* 417E8C 802A30FC 080A8C4D */ j .L802A3134 -/* 417E90 802A3100 00000000 */ nop +/* 417E90 802A3100 00000000 */ nop .L802A3104: /* 417E94 802A3104 3C048010 */ lui $a0, %hi(D_801076E8) /* 417E98 802A3108 248476E8 */ addiu $a0, $a0, %lo(D_801076E8) /* 417E9C 802A310C 080A8C47 */ j .L802A311C -/* 417EA0 802A3110 00000000 */ nop +/* 417EA0 802A3110 00000000 */ nop .L802A3114: /* 417EA4 802A3114 3C048010 */ lui $a0, %hi(D_80107714) /* 417EA8 802A3118 24847714 */ addiu $a0, $a0, %lo(D_80107714) .L802A311C: /* 417EAC 802A311C 0C050529 */ jal create_icon -/* 417EB0 802A3120 00000000 */ nop +/* 417EB0 802A3120 00000000 */ nop /* 417EB4 802A3124 0040902D */ daddu $s2, $v0, $zero /* 417EB8 802A3128 02351021 */ addu $v0, $s1, $s5 /* 417EBC 802A312C 080A8C53 */ j .L802A314C @@ -327,7 +328,7 @@ glabel func_802A2C84 /* 417EC8 802A3138 24847740 */ addiu $a0, $a0, %lo(D_80107740) .L802A313C: /* 417ECC 802A313C 0C050529 */ jal create_icon -/* 417ED0 802A3140 00000000 */ nop +/* 417ED0 802A3140 00000000 */ nop /* 417ED4 802A3144 0040902D */ daddu $s2, $v0, $zero /* 417ED8 802A3148 AE720000 */ sw $s2, ($s3) .L802A314C: @@ -349,7 +350,7 @@ glabel func_802A2C84 /* 417F18 802A3188 26100001 */ addiu $s0, $s0, 1 /* 417F1C 802A318C 0202102A */ slt $v0, $s0, $v0 /* 417F20 802A3190 1440FFBE */ bnez $v0, .L802A308C -/* 417F24 802A3194 00000000 */ nop +/* 417F24 802A3194 00000000 */ nop .L802A3198: /* 417F28 802A3198 3C13802B */ lui $s3, %hi(D_802AD1F0) /* 417F2C 802A319C 8673D1F0 */ lh $s3, %lo(D_802AD1F0)($s3) @@ -547,6 +548,7 @@ glabel func_802A2C84 /* 418214 802A3484 A422D112 */ sh $v0, %lo(D_802AD112)($at) /* 418218 802A3488 080A8F1C */ j .L802A3C70 /* 41821C 802A348C 0000102D */ daddu $v0, $zero, $zero +glabel L802A3490_418220 /* 418220 802A3490 3C050001 */ lui $a1, 1 /* 418224 802A3494 3C04802B */ lui $a0, %hi(D_802AD109) /* 418228 802A3498 2484D109 */ addiu $a0, $a0, %lo(D_802AD109) @@ -572,7 +574,7 @@ glabel func_802A2C84 /* 418270 802A34E0 34C60010 */ ori $a2, $a2, 0x10 /* 418274 802A34E4 00461024 */ and $v0, $v0, $a2 /* 418278 802A34E8 10400010 */ beqz $v0, .L802A352C -/* 41827C 802A34EC 00000000 */ nop +/* 41827C 802A34EC 00000000 */ nop /* 418280 802A34F0 3C05802B */ lui $a1, %hi(D_802AD109) /* 418284 802A34F4 24A5D109 */ addiu $a1, $a1, %lo(D_802AD109) /* 418288 802A34F8 3C02802B */ lui $v0, %hi(D_802AD4A4) @@ -594,7 +596,7 @@ glabel func_802A2C84 /* 4182C0 802A3530 2610D109 */ addiu $s0, $s0, %lo(D_802AD109) /* 4182C4 802A3534 82020000 */ lb $v0, ($s0) /* 4182C8 802A3538 04410005 */ bgez $v0, .L802A3550 -/* 4182CC 802A353C 00000000 */ nop +/* 4182CC 802A353C 00000000 */ nop /* 4182D0 802A3540 3C02802B */ lui $v0, %hi(D_802AD4A7) /* 4182D4 802A3544 9042D4A7 */ lbu $v0, %lo(D_802AD4A7)($v0) /* 4182D8 802A3548 2442FFFF */ addiu $v0, $v0, -1 @@ -643,7 +645,7 @@ glabel func_802A2C84 /* 418374 802A35E4 2442FFFF */ addiu $v0, $v0, -1 /* 418378 802A35E8 0062182A */ slt $v1, $v1, $v0 /* 41837C 802A35EC 14600015 */ bnez $v1, .L802A3644 -/* 418380 802A35F0 00000000 */ nop +/* 418380 802A35F0 00000000 */ nop /* 418384 802A35F4 3C04802B */ lui $a0, %hi(D_802AD10C) /* 418388 802A35F8 2484D10C */ addiu $a0, $a0, %lo(D_802AD10C) /* 41838C 802A35FC 90820000 */ lbu $v0, ($a0) @@ -657,7 +659,7 @@ glabel func_802A2C84 /* 4183AC 802A361C 2463FFFA */ addiu $v1, $v1, -6 /* 4183B0 802A3620 0062182A */ slt $v1, $v1, $v0 /* 4183B4 802A3624 10600007 */ beqz $v1, .L802A3644 -/* 4183B8 802A3628 00000000 */ nop +/* 4183B8 802A3628 00000000 */ nop /* 4183BC 802A362C 90A20003 */ lbu $v0, 3($a1) /* 4183C0 802A3630 2442FFFA */ addiu $v0, $v0, -6 /* 4183C4 802A3634 A0820000 */ sb $v0, ($a0) @@ -689,7 +691,7 @@ glabel func_802A2C84 /* 418428 802A3698 8C63D510 */ lw $v1, %lo(D_802AD510)($v1) /* 41842C 802A369C 24020001 */ addiu $v0, $zero, 1 /* 418430 802A36A0 14620005 */ bne $v1, $v0, .L802A36B8 -/* 418434 802A36A4 00000000 */ nop +/* 418434 802A36A4 00000000 */ nop /* 418438 802A36A8 0C05272D */ jal play_sound /* 41843C 802A36AC 240400C9 */ addiu $a0, $zero, 0xc9 /* 418440 802A36B0 080A8F19 */ j .L802A3C64 @@ -718,9 +720,10 @@ glabel func_802A2C84 /* 418490 802A3700 0C05272D */ jal play_sound /* 418494 802A3704 240400CA */ addiu $a0, $zero, 0xca /* 418498 802A3708 0C0A89F9 */ jal func_802A27E4 -/* 41849C 802A370C 00000000 */ nop +/* 41849C 802A370C 00000000 */ nop /* 4184A0 802A3710 080A8F19 */ j .L802A3C64 /* 4184A4 802A3714 2402FFFE */ addiu $v0, $zero, -2 +glabel L802A3718_4184A8 /* 4184A8 802A3718 3C02802B */ lui $v0, %hi(D_802AD4A4) /* 4184AC 802A371C 8C42D4A4 */ lw $v0, %lo(D_802AD4A4)($v0) /* 4184B0 802A3720 1840000F */ blez $v0, .L802A3760 @@ -790,7 +793,7 @@ glabel func_802A2C84 /* 4185A0 802A3810 3C058010 */ lui $a1, %hi(D_80104A00) /* 4185A4 802A3814 24A54A00 */ addiu $a1, $a1, %lo(D_80104A00) /* 4185A8 802A3818 0C0511FF */ jal set_menu_icon_script -/* 4185AC 802A381C 00000000 */ nop +/* 4185AC 802A381C 00000000 */ nop /* 4185B0 802A3820 24040001 */ addiu $a0, $zero, 1 /* 4185B4 802A3824 2402000D */ addiu $v0, $zero, 0xd /* 4185B8 802A3828 3C01802B */ lui $at, %hi(D_802AD114) @@ -819,29 +822,31 @@ glabel func_802A2C84 /* 41860C 802A387C 3C02802B */ lui $v0, %hi(D_802AD4A0) /* 418610 802A3880 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) /* 418614 802A3884 14400005 */ bnez $v0, .L802A389C -/* 418618 802A3888 00000000 */ nop +/* 418618 802A3888 00000000 */ nop /* 41861C 802A388C 0C03A674 */ jal status_menu_stop_blinking_fp -/* 418620 802A3890 00000000 */ nop +/* 418620 802A3890 00000000 */ nop /* 418624 802A3894 080A8E5D */ j .L802A3974 -/* 418628 802A3898 00000000 */ nop +/* 418628 802A3898 00000000 */ nop .L802A389C: /* 41862C 802A389C 0C03A6A5 */ jal status_menu_stop_blinking_sp -/* 418630 802A38A0 00000000 */ nop +/* 418630 802A38A0 00000000 */ nop /* 418634 802A38A4 080A8E5D */ j .L802A3974 -/* 418638 802A38A8 00000000 */ nop +/* 418638 802A38A8 00000000 */ nop +glabel L802A38AC_41863C /* 41863C 802A38AC 3C02802B */ lui $v0, %hi(D_802AD4A0) /* 418640 802A38B0 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) /* 418644 802A38B4 14400005 */ bnez $v0, .L802A38CC -/* 418648 802A38B8 00000000 */ nop +/* 418648 802A38B8 00000000 */ nop /* 41864C 802A38BC 0C03A674 */ jal status_menu_stop_blinking_fp -/* 418650 802A38C0 00000000 */ nop +/* 418650 802A38C0 00000000 */ nop /* 418654 802A38C4 080A8F1C */ j .L802A3C70 /* 418658 802A38C8 240200FF */ addiu $v0, $zero, 0xff .L802A38CC: /* 41865C 802A38CC 0C03A6A5 */ jal status_menu_stop_blinking_sp -/* 418660 802A38D0 00000000 */ nop +/* 418660 802A38D0 00000000 */ nop /* 418664 802A38D4 080A8F1C */ j .L802A3C70 /* 418668 802A38D8 240200FF */ addiu $v0, $zero, 0xff +glabel L802A38DC_41866C /* 41866C 802A38DC 24040001 */ addiu $a0, $zero, 1 /* 418670 802A38E0 0C051F9F */ jal func_80147E7C /* 418674 802A38E4 24050002 */ addiu $a1, $zero, 2 @@ -867,14 +872,14 @@ glabel func_802A2C84 /* 4186BC 802A392C 3C02802B */ lui $v0, %hi(D_802AD4A0) /* 4186C0 802A3930 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) /* 4186C4 802A3934 14400005 */ bnez $v0, .L802A394C -/* 4186C8 802A3938 00000000 */ nop +/* 4186C8 802A3938 00000000 */ nop /* 4186CC 802A393C 0C03A674 */ jal status_menu_stop_blinking_fp -/* 4186D0 802A3940 00000000 */ nop +/* 4186D0 802A3940 00000000 */ nop /* 4186D4 802A3944 080A8E55 */ j .L802A3954 -/* 4186D8 802A3948 00000000 */ nop +/* 4186D8 802A3948 00000000 */ nop .L802A394C: /* 4186DC 802A394C 0C03A6A5 */ jal status_menu_stop_blinking_sp -/* 4186E0 802A3950 00000000 */ nop +/* 4186E0 802A3950 00000000 */ nop .L802A3954: /* 4186E4 802A3954 3C04802B */ lui $a0, %hi(D_802AD109) /* 4186E8 802A3958 8084D109 */ lb $a0, %lo(D_802AD109)($a0) @@ -885,6 +890,7 @@ glabel func_802A2C84 /* 4186FC 802A396C 080A8E82 */ j .L802A3A08 /* 418700 802A3970 2403000B */ addiu $v1, $zero, 0xb .L802A3974: +glabel L802A3974_418704 /* 418704 802A3974 3C03802B */ lui $v1, %hi(D_802AD109) /* 418708 802A3978 8063D109 */ lb $v1, %lo(D_802AD109)($v1) /* 41870C 802A397C 00031080 */ sll $v0, $v1, 2 @@ -895,6 +901,7 @@ glabel func_802A2C84 /* 418720 802A3990 AC23D600 */ sw $v1, %lo(D_802AD600)($at) /* 418724 802A3994 080A8F1C */ j .L802A3C70 /* 418728 802A3998 24420001 */ addiu $v0, $v0, 1 +glabel L802A399C_41872C /* 41872C 802A399C 24040001 */ addiu $a0, $zero, 1 /* 418730 802A39A0 0C051F9F */ jal func_80147E7C /* 418734 802A39A4 0080282D */ daddu $a1, $a0, $zero @@ -931,6 +938,7 @@ glabel func_802A2C84 /* 4187A4 802A3A14 AC24D600 */ sw $a0, %lo(D_802AD600)($at) /* 4187A8 802A3A18 080A8F1C */ j .L802A3C70 /* 4187AC 802A3A1C 24420001 */ addiu $v0, $v0, 1 +glabel L802A3A20_4187B0 /* 4187B0 802A3A20 24040001 */ addiu $a0, $zero, 1 /* 4187B4 802A3A24 0C051F9F */ jal func_80147E7C /* 4187B8 802A3A28 24050009 */ addiu $a1, $zero, 9 @@ -955,6 +963,7 @@ glabel func_802A2C84 /* 4187FC 802A3A6C 24050002 */ addiu $a1, $zero, 2 /* 418800 802A3A70 080A8F19 */ j .L802A3C64 /* 418804 802A3A74 2402FFFF */ addiu $v0, $zero, -1 +glabel L802A3A78_418808 /* 418808 802A3A78 2402FFFF */ addiu $v0, $zero, -1 /* 41880C 802A3A7C 0040182D */ daddu $v1, $v0, $zero /* 418810 802A3A80 3C01802B */ lui $at, %hi(D_802AD600) @@ -963,7 +972,8 @@ glabel func_802A2C84 /* 41881C 802A3A8C 3C01802B */ lui $at, %hi(D_802AD108) /* 418820 802A3A90 A023D108 */ sb $v1, %lo(D_802AD108)($at) /* 418824 802A3A94 080A8F1C */ j .L802A3C70 -/* 418828 802A3A98 00000000 */ nop +/* 418828 802A3A98 00000000 */ nop +glabel L802A3A9C_41882C /* 41882C 802A3A9C 24040001 */ addiu $a0, $zero, 1 /* 418830 802A3AA0 0C051F9F */ jal func_80147E7C /* 418834 802A3AA4 24050002 */ addiu $a1, $zero, 2 @@ -1040,12 +1050,13 @@ glabel func_802A2C84 /* 418944 802A3BB4 A023D108 */ sb $v1, %lo(D_802AD108)($at) /* 418948 802A3BB8 080A8F1C */ j .L802A3C70 /* 41894C 802A3BBC 2402FFFF */ addiu $v0, $zero, -1 +glabel L802A3BC0_418950 /* 418950 802A3BC0 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 418954 802A3BC4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 418958 802A3BC8 8C420010 */ lw $v0, 0x10($v0) /* 41895C 802A3BCC 3042C000 */ andi $v0, $v0, 0xc000 /* 418960 802A3BD0 10400003 */ beqz $v0, .L802A3BE0 -/* 418964 802A3BD4 00000000 */ nop +/* 418964 802A3BD4 00000000 */ nop /* 418968 802A3BD8 3C01802B */ lui $at, %hi(D_802AD10B) /* 41896C 802A3BDC A020D10B */ sb $zero, %lo(D_802AD10B)($at) .L802A3BE0: @@ -1089,6 +1100,7 @@ glabel func_802A2C84 /* 4189F4 802A3C64 3C01802B */ lui $at, %hi(D_802AD108) /* 4189F8 802A3C68 A022D108 */ sb $v0, %lo(D_802AD108)($at) .L802A3C6C: +glabel L802A3C6C_4189FC /* 4189FC 802A3C6C 0000102D */ daddu $v0, $zero, $zero .L802A3C70: /* 418A00 802A3C70 8FBF0044 */ lw $ra, 0x44($sp) diff --git a/asm/nonmatchings/code_415D90/func_802A3C98.s b/asm/nonmatchings/code_415D90/func_802A3C98.s index 304db3232c..5e899f2172 100644 --- a/asm/nonmatchings/code_415D90/func_802A3C98.s +++ b/asm/nonmatchings/code_415D90/func_802A3C98.s @@ -23,11 +23,12 @@ glabel func_802A3C98 /* 418A70 802A3CE0 104001B2 */ beqz $v0, .L802A43AC /* 418A74 802A3CE4 AFA60050 */ sw $a2, 0x50($sp) /* 418A78 802A3CE8 00031080 */ sll $v0, $v1, 2 -/* 418A7C 802A3CEC 3C01802B */ lui $at, %hi(D_802AB8C0) +/* 418A7C 802A3CEC 3C01802B */ lui $at, %hi(jtbl_802AB8C0_420650) /* 418A80 802A3CF0 00220821 */ addu $at, $at, $v0 -/* 418A84 802A3CF4 8C22B8C0 */ lw $v0, %lo(D_802AB8C0)($at) +/* 418A84 802A3CF4 8C22B8C0 */ lw $v0, %lo(jtbl_802AB8C0_420650)($at) /* 418A88 802A3CF8 00400008 */ jr $v0 -/* 418A8C 802A3CFC 00000000 */ nop +/* 418A8C 802A3CFC 00000000 */ nop +glabel L802A3D00_418A90 /* 418A90 802A3D00 3C03802B */ lui $v1, %hi(D_802AD10C) /* 418A94 802A3D04 8063D10C */ lb $v1, %lo(D_802AD10C)($v1) /* 418A98 802A3D08 3C08802B */ lui $t0, %hi(D_802AD110) @@ -42,13 +43,13 @@ glabel func_802A3C98 /* 418ABC 802A3D2C 00438821 */ addu $s1, $v0, $v1 /* 418AC0 802A3D30 02281023 */ subu $v0, $s1, $t0 /* 418AC4 802A3D34 44820000 */ mtc1 $v0, $f0 -/* 418AC8 802A3D38 00000000 */ nop +/* 418AC8 802A3D38 00000000 */ nop /* 418ACC 802A3D3C 46800021 */ cvt.d.w $f0, $f0 /* 418AD0 802A3D40 46220002 */ mul.d $f0, $f0, $f2 -/* 418AD4 802A3D44 00000000 */ nop +/* 418AD4 802A3D44 00000000 */ nop /* 418AD8 802A3D48 4620018D */ trunc.w.d $f6, $f0 /* 418ADC 802A3D4C 44023000 */ mfc1 $v0, $f6 -/* 418AE0 802A3D50 00000000 */ nop +/* 418AE0 802A3D50 00000000 */ nop /* 418AE4 802A3D54 14400002 */ bnez $v0, .L802A3D60 /* 418AE8 802A3D58 01024021 */ addu $t0, $t0, $v0 /* 418AEC 802A3D5C 0220402D */ daddu $t0, $s1, $zero @@ -66,7 +67,7 @@ glabel func_802A3C98 /* 418B18 802A3D88 44812000 */ mtc1 $at, $f4 /* 418B1C 802A3D8C 25350002 */ addiu $s5, $t1, 2 /* 418B20 802A3D90 44951000 */ mtc1 $s5, $f2 -/* 418B24 802A3D94 00000000 */ nop +/* 418B24 802A3D94 00000000 */ nop /* 418B28 802A3D98 468010A0 */ cvt.s.w $f2, $f2 /* 418B2C 802A3D9C 00031040 */ sll $v0, $v1, 1 /* 418B30 802A3DA0 00431021 */ addu $v0, $v0, $v1 @@ -76,17 +77,17 @@ glabel func_802A3C98 /* 418B40 802A3DB0 0080382D */ daddu $a3, $a0, $zero /* 418B44 802A3DB4 8FA90050 */ lw $t1, 0x50($sp) /* 418B48 802A3DB8 46041082 */ mul.s $f2, $f2, $f4 -/* 418B4C 802A3DBC 00000000 */ nop +/* 418B4C 802A3DBC 00000000 */ nop /* 418B50 802A3DC0 25310012 */ addiu $s1, $t1, 0x12 /* 418B54 802A3DC4 8FA9004C */ lw $t1, 0x4c($sp) /* 418B58 802A3DC8 24840008 */ addiu $a0, $a0, 8 /* 418B5C 802A3DCC A4A80000 */ sh $t0, ($a1) /* 418B60 802A3DD0 02224021 */ addu $t0, $s1, $v0 /* 418B64 802A3DD4 44910000 */ mtc1 $s1, $f0 -/* 418B68 802A3DD8 00000000 */ nop +/* 418B68 802A3DD8 00000000 */ nop /* 418B6C 802A3DDC 46800020 */ cvt.s.w $f0, $f0 /* 418B70 802A3DE0 46040002 */ mul.s $f0, $f0, $f4 -/* 418B74 802A3DE4 00000000 */ nop +/* 418B74 802A3DE4 00000000 */ nop /* 418B78 802A3DE8 84A20000 */ lh $v0, ($a1) /* 418B7C 802A3DEC 2535001F */ addiu $s5, $t1, 0x1f /* 418B80 802A3DF0 8FA90050 */ lw $t1, 0x50($sp) @@ -95,39 +96,39 @@ glabel func_802A3C98 /* 418B8C 802A3DFC 01228821 */ addu $s1, $t1, $v0 /* 418B90 802A3E00 4600118D */ trunc.w.s $f6, $f2 /* 418B94 802A3E04 44033000 */ mfc1 $v1, $f6 -/* 418B98 802A3E08 00000000 */ nop +/* 418B98 802A3E08 00000000 */ nop /* 418B9C 802A3E0C 30630FFF */ andi $v1, $v1, 0xfff /* 418BA0 802A3E10 00031B00 */ sll $v1, $v1, 0xc /* 418BA4 802A3E14 4600018D */ trunc.w.s $f6, $f0 /* 418BA8 802A3E18 44043000 */ mfc1 $a0, $f6 -/* 418BAC 802A3E1C 00000000 */ nop +/* 418BAC 802A3E1C 00000000 */ nop /* 418BB0 802A3E20 30840FFF */ andi $a0, $a0, 0xfff /* 418BB4 802A3E24 8FA9004C */ lw $t1, 0x4c($sp) /* 418BB8 802A3E28 44880000 */ mtc1 $t0, $f0 -/* 418BBC 802A3E2C 00000000 */ nop +/* 418BBC 802A3E2C 00000000 */ nop /* 418BC0 802A3E30 46800020 */ cvt.s.w $f0, $f0 /* 418BC4 802A3E34 25220099 */ addiu $v0, $t1, 0x99 /* 418BC8 802A3E38 44821000 */ mtc1 $v0, $f2 -/* 418BCC 802A3E3C 00000000 */ nop +/* 418BCC 802A3E3C 00000000 */ nop /* 418BD0 802A3E40 468010A0 */ cvt.s.w $f2, $f2 /* 418BD4 802A3E44 46041082 */ mul.s $f2, $f2, $f4 -/* 418BD8 802A3E48 00000000 */ nop +/* 418BD8 802A3E48 00000000 */ nop /* 418BDC 802A3E4C 3C02ED00 */ lui $v0, 0xed00 /* 418BE0 802A3E50 00822025 */ or $a0, $a0, $v0 /* 418BE4 802A3E54 00641825 */ or $v1, $v1, $a0 /* 418BE8 802A3E58 3C04802B */ lui $a0, %hi(D_802AD4A4) /* 418BEC 802A3E5C 8C84D4A4 */ lw $a0, %lo(D_802AD4A4)($a0) /* 418BF0 802A3E60 46040002 */ mul.s $f0, $f0, $f4 -/* 418BF4 802A3E64 00000000 */ nop +/* 418BF4 802A3E64 00000000 */ nop /* 418BF8 802A3E68 ACE30000 */ sw $v1, ($a3) /* 418BFC 802A3E6C 4600118D */ trunc.w.s $f6, $f2 /* 418C00 802A3E70 44023000 */ mfc1 $v0, $f6 -/* 418C04 802A3E74 00000000 */ nop +/* 418C04 802A3E74 00000000 */ nop /* 418C08 802A3E78 30420FFF */ andi $v0, $v0, 0xfff /* 418C0C 802A3E7C 00021300 */ sll $v0, $v0, 0xc /* 418C10 802A3E80 4600018D */ trunc.w.s $f6, $f0 /* 418C14 802A3E84 44033000 */ mfc1 $v1, $f6 -/* 418C18 802A3E88 00000000 */ nop +/* 418C18 802A3E88 00000000 */ nop /* 418C1C 802A3E8C 30630FFF */ andi $v1, $v1, 0xfff /* 418C20 802A3E90 00431025 */ or $v0, $v0, $v1 /* 418C24 802A3E94 188000BC */ blez $a0, .L802A4188 @@ -191,27 +192,27 @@ glabel func_802A3C98 /* 418CFC 802A3F6C 3C02802B */ lui $v0, %hi(D_802AD4A0) /* 418D00 802A3F70 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) /* 418D04 802A3F74 14400015 */ bnez $v0, .L802A3FCC -/* 418D08 802A3F78 00000000 */ nop +/* 418D08 802A3F78 00000000 */ nop /* 418D0C 802A3F7C 3C02802B */ lui $v0, %hi(D_802AD109) /* 418D10 802A3F80 8042D109 */ lb $v0, %lo(D_802AD109)($v0) /* 418D14 802A3F84 16620025 */ bne $s3, $v0, .L802A401C /* 418D18 802A3F88 00131080 */ sll $v0, $s3, 2 /* 418D1C 802A3F8C 12400007 */ beqz $s2, .L802A3FAC -/* 418D20 802A3F90 00000000 */ nop +/* 418D20 802A3F90 00000000 */ nop /* 418D24 802A3F94 8E820000 */ lw $v0, ($s4) /* 418D28 802A3F98 00021080 */ sll $v0, $v0, 2 /* 418D2C 802A3F9C 00561021 */ addu $v0, $v0, $s6 /* 418D30 802A3FA0 8C420000 */ lw $v0, ($v0) /* 418D34 802A3FA4 1C400005 */ bgtz $v0, .L802A3FBC -/* 418D38 802A3FA8 00000000 */ nop +/* 418D38 802A3FA8 00000000 */ nop .L802A3FAC: /* 418D3C 802A3FAC 0C03A674 */ jal status_menu_stop_blinking_fp -/* 418D40 802A3FB0 00000000 */ nop +/* 418D40 802A3FB0 00000000 */ nop /* 418D44 802A3FB4 080A9007 */ j .L802A401C /* 418D48 802A3FB8 00131080 */ sll $v0, $s3, 2 .L802A3FBC: /* 418D4C 802A3FBC 0C03A663 */ jal status_menu_start_blinking_fp -/* 418D50 802A3FC0 00000000 */ nop +/* 418D50 802A3FC0 00000000 */ nop /* 418D54 802A3FC4 080A9007 */ j .L802A401C /* 418D58 802A3FC8 00131080 */ sll $v0, $s3, 2 .L802A3FCC: @@ -220,7 +221,7 @@ glabel func_802A3C98 /* 418D64 802A3FD4 16620011 */ bne $s3, $v0, .L802A401C /* 418D68 802A3FD8 00131080 */ sll $v0, $s3, 2 /* 418D6C 802A3FDC 12400007 */ beqz $s2, .L802A3FFC -/* 418D70 802A3FE0 00000000 */ nop +/* 418D70 802A3FE0 00000000 */ nop /* 418D74 802A3FE4 8E820000 */ lw $v0, ($s4) /* 418D78 802A3FE8 00021880 */ sll $v1, $v0, 2 /* 418D7C 802A3FEC 00761021 */ addu $v0, $v1, $s6 @@ -229,13 +230,13 @@ glabel func_802A3C98 /* 418D88 802A3FF8 007E1021 */ addu $v0, $v1, $fp .L802A3FFC: /* 418D8C 802A3FFC 0C03A6A5 */ jal status_menu_stop_blinking_sp -/* 418D90 802A4000 00000000 */ nop +/* 418D90 802A4000 00000000 */ nop /* 418D94 802A4004 080A9007 */ j .L802A401C /* 418D98 802A4008 00131080 */ sll $v0, $s3, 2 .L802A400C: /* 418D9C 802A400C 8C440000 */ lw $a0, ($v0) /* 418DA0 802A4010 0C03A6AE */ jal status_menu_start_blinking_sp_bars -/* 418DA4 802A4014 00000000 */ nop +/* 418DA4 802A4014 00000000 */ nop /* 418DA8 802A4018 00131080 */ sll $v0, $s3, 2 .L802A401C: /* 418DAC 802A401C 3C03802B */ lui $v1, %hi(D_802AD3E0) @@ -246,7 +247,7 @@ glabel func_802A3C98 /* 418DC0 802A4030 10620005 */ beq $v1, $v0, .L802A4048 /* 418DC4 802A4034 24080038 */ addiu $t0, $zero, 0x38 /* 418DC8 802A4038 080A9013 */ j .L802A404C -/* 418DCC 802A403C 00000000 */ nop +/* 418DCC 802A403C 00000000 */ nop .L802A4040: /* 418DD0 802A4040 080A9013 */ j .L802A404C /* 418DD4 802A4044 2408000A */ addiu $t0, $zero, 0xa @@ -401,11 +402,11 @@ glabel func_802A3C98 /* 418FF4 802A4264 00438821 */ addu $s1, $v0, $v1 /* 418FF8 802A4268 02281023 */ subu $v0, $s1, $t0 /* 418FFC 802A426C 44820000 */ mtc1 $v0, $f0 -/* 419000 802A4270 00000000 */ nop +/* 419000 802A4270 00000000 */ nop /* 419004 802A4274 46800021 */ cvt.d.w $f0, $f0 /* 419008 802A4278 4620018D */ trunc.w.d $f6, $f0 /* 41900C 802A427C 44023000 */ mfc1 $v0, $f6 -/* 419010 802A4280 00000000 */ nop +/* 419010 802A4280 00000000 */ nop /* 419014 802A4284 14400002 */ bnez $v0, .L802A4290 /* 419018 802A4288 01024021 */ addu $t0, $t0, $v0 /* 41901C 802A428C 0220402D */ daddu $t0, $s1, $zero @@ -432,7 +433,7 @@ glabel func_802A3C98 /* 41906C 802A42DC 3C02802B */ lui $v0, %hi(D_802AD10C) /* 419070 802A42E0 8042D10C */ lb $v0, %lo(D_802AD10C)($v0) /* 419074 802A42E4 1840000E */ blez $v0, .L802A4320 -/* 419078 802A42E8 00000000 */ nop +/* 419078 802A42E8 00000000 */ nop /* 41907C 802A42EC 8FA9004C */ lw $t1, 0x4c($sp) /* 419080 802A42F0 3C10802B */ lui $s0, %hi(D_802AD11C) /* 419084 802A42F4 8E10D11C */ lw $s0, %lo(D_802AD11C)($s0) @@ -453,7 +454,7 @@ glabel func_802A3C98 /* 4190BC 802A432C 8C63D4A4 */ lw $v1, %lo(D_802AD4A4)($v1) /* 4190C0 802A4330 0043102A */ slt $v0, $v0, $v1 /* 4190C4 802A4334 1040000E */ beqz $v0, .L802A4370 -/* 4190C8 802A4338 00000000 */ nop +/* 4190C8 802A4338 00000000 */ nop /* 4190CC 802A433C 8FA9004C */ lw $t1, 0x4c($sp) /* 4190D0 802A4340 3C10802B */ lui $s0, %hi(D_802AD120) /* 4190D4 802A4344 8E10D120 */ lw $s0, %lo(D_802AD120)($s0) @@ -472,19 +473,20 @@ glabel func_802A3C98 /* 419104 802A4374 8063D108 */ lb $v1, %lo(D_802AD108)($v1) /* 419108 802A4378 2402FFFF */ addiu $v0, $zero, -1 /* 41910C 802A437C 1462000B */ bne $v1, $v0, .L802A43AC -/* 419110 802A4380 00000000 */ nop +/* 419110 802A4380 00000000 */ nop /* 419114 802A4384 3C02802B */ lui $v0, %hi(D_802AD4A0) /* 419118 802A4388 8C42D4A0 */ lw $v0, %lo(D_802AD4A0)($v0) /* 41911C 802A438C 14400005 */ bnez $v0, .L802A43A4 -/* 419120 802A4390 00000000 */ nop +/* 419120 802A4390 00000000 */ nop /* 419124 802A4394 0C03A674 */ jal status_menu_stop_blinking_fp -/* 419128 802A4398 00000000 */ nop +/* 419128 802A4398 00000000 */ nop /* 41912C 802A439C 080A90EB */ j .L802A43AC -/* 419130 802A43A0 00000000 */ nop +/* 419130 802A43A0 00000000 */ nop .L802A43A4: /* 419134 802A43A4 0C03A6A5 */ jal status_menu_stop_blinking_sp -/* 419138 802A43A8 00000000 */ nop +/* 419138 802A43A8 00000000 */ nop .L802A43AC: +glabel L802A43AC_41913C /* 41913C 802A43AC 8FBF0044 */ lw $ra, 0x44($sp) /* 419140 802A43B0 8FBE0040 */ lw $fp, 0x40($sp) /* 419144 802A43B4 8FB7003C */ lw $s7, 0x3c($sp) diff --git a/asm/nonmatchings/code_415D90/func_802A4494.s b/asm/nonmatchings/code_415D90/func_802A4494.s index cbbf4b17d4..8408369040 100644 --- a/asm/nonmatchings/code_415D90/func_802A4494.s +++ b/asm/nonmatchings/code_415D90/func_802A4494.s @@ -12,15 +12,16 @@ glabel func_802A4494 /* 419240 802A44B0 1040001D */ beqz $v0, .L802A4528 /* 419244 802A44B4 AFBF0018 */ sw $ra, 0x18($sp) /* 419248 802A44B8 00031080 */ sll $v0, $v1, 2 -/* 41924C 802A44BC 3C01802B */ lui $at, %hi(D_802AB970) +/* 41924C 802A44BC 3C01802B */ lui $at, %hi(jtbl_802AB970_420700) /* 419250 802A44C0 00220821 */ addu $at, $at, $v0 -/* 419254 802A44C4 8C22B970 */ lw $v0, %lo(D_802AB970)($at) +/* 419254 802A44C4 8C22B970 */ lw $v0, %lo(jtbl_802AB970_420700)($at) /* 419258 802A44C8 00400008 */ jr $v0 -/* 41925C 802A44CC 00000000 */ nop +/* 41925C 802A44CC 00000000 */ nop +glabel L802A44D0_419260 /* 419260 802A44D0 3C02802B */ lui $v0, %hi(D_802AD10F) /* 419264 802A44D4 8042D10F */ lb $v0, %lo(D_802AD10F)($v0) /* 419268 802A44D8 10400013 */ beqz $v0, .L802A4528 -/* 41926C 802A44DC 00000000 */ nop +/* 41926C 802A44DC 00000000 */ nop /* 419270 802A44E0 3C02802B */ lui $v0, %hi(D_802AD109) /* 419274 802A44E4 8042D109 */ lb $v0, %lo(D_802AD109)($v0) /* 419278 802A44E8 3C03802B */ lui $v1, %hi(D_802AD114) @@ -40,6 +41,7 @@ glabel func_802A4494 /* 4192B0 802A4520 0C04993B */ jal draw_string /* 4192B4 802A4524 24A50008 */ addiu $a1, $a1, 8 .L802A4528: +glabel L802A4528_4192B8 /* 4192B8 802A4528 8FBF0018 */ lw $ra, 0x18($sp) /* 4192BC 802A452C 03E00008 */ jr $ra /* 4192C0 802A4530 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_415D90/func_802A45D8.s b/asm/nonmatchings/code_415D90/func_802A45D8.s index eff13594aa..029f70409d 100644 --- a/asm/nonmatchings/code_415D90/func_802A45D8.s +++ b/asm/nonmatchings/code_415D90/func_802A45D8.s @@ -50,7 +50,7 @@ glabel func_802A45D8 /* 419410 802A4680 81020000 */ lb $v0, ($t0) /* 419414 802A4684 00A2102A */ slt $v0, $a1, $v0 /* 419418 802A4688 14400005 */ bnez $v0, .L802A46A0 -/* 41941C 802A468C 00000000 */ nop +/* 41941C 802A468C 00000000 */ nop /* 419420 802A4690 91220000 */ lbu $v0, ($t1) /* 419424 802A4694 2442FFFF */ addiu $v0, $v0, -1 /* 419428 802A4698 00C21023 */ subu $v0, $a2, $v0 @@ -86,4 +86,4 @@ glabel func_802A45D8 /* 419498 802A4708 3C01802B */ lui $at, %hi(D_802AD6D4) /* 41949C 802A470C AC20D6D4 */ sw $zero, %lo(D_802AD6D4)($at) /* 4194A0 802A4710 03E00008 */ jr $ra -/* 4194A4 802A4714 00000000 */ nop +/* 4194A4 802A4714 00000000 */ nop diff --git a/asm/nonmatchings/code_415D90/func_802A4718.s b/asm/nonmatchings/code_415D90/func_802A4718.s index d0424b7acd..3a4ea4ca7d 100644 --- a/asm/nonmatchings/code_415D90/func_802A4718.s +++ b/asm/nonmatchings/code_415D90/func_802A4718.s @@ -6,4 +6,4 @@ glabel func_802A4718 /* 4194AC 802A471C 3C01802B */ lui $at, %hi(D_802AD604) /* 4194B0 802A4720 A022D604 */ sb $v0, %lo(D_802AD604)($at) /* 4194B4 802A4724 03E00008 */ jr $ra -/* 4194B8 802A4728 00000000 */ nop +/* 4194B8 802A4728 00000000 */ nop diff --git a/asm/nonmatchings/code_415D90/func_802A472C.s b/asm/nonmatchings/code_415D90/func_802A472C.s index 75a3861e02..187667da50 100644 --- a/asm/nonmatchings/code_415D90/func_802A472C.s +++ b/asm/nonmatchings/code_415D90/func_802A472C.s @@ -30,20 +30,20 @@ glabel func_802A472C /* 41951C 802A478C 26100001 */ addiu $s0, $s0, 1 /* 419520 802A4790 0202102A */ slt $v0, $s0, $v0 /* 419524 802A4794 1440FFF8 */ bnez $v0, .L802A4778 -/* 419528 802A4798 00000000 */ nop +/* 419528 802A4798 00000000 */ nop .L802A479C: /* 41952C 802A479C 3C04802B */ lui $a0, %hi(D_802AD618) /* 419530 802A47A0 8C84D618 */ lw $a0, %lo(D_802AD618)($a0) /* 419534 802A47A4 0C05123D */ jal free_icon -/* 419538 802A47A8 00000000 */ nop +/* 419538 802A47A8 00000000 */ nop /* 41953C 802A47AC 3C04802B */ lui $a0, %hi(D_802AD61C) /* 419540 802A47B0 8C84D61C */ lw $a0, %lo(D_802AD61C)($a0) /* 419544 802A47B4 0C05123D */ jal free_icon -/* 419548 802A47B8 00000000 */ nop +/* 419548 802A47B8 00000000 */ nop /* 41954C 802A47BC 3C04802B */ lui $a0, %hi(D_802AD620) /* 419550 802A47C0 8C84D620 */ lw $a0, %lo(D_802AD620)($a0) /* 419554 802A47C4 0C05123D */ jal free_icon -/* 419558 802A47C8 00000000 */ nop +/* 419558 802A47C8 00000000 */ nop /* 41955C 802A47CC 8FBF0018 */ lw $ra, 0x18($sp) /* 419560 802A47D0 8FB10014 */ lw $s1, 0x14($sp) /* 419564 802A47D4 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_415D90/func_802A47E0.s b/asm/nonmatchings/code_415D90/func_802A47E0.s index 7c9c62b81e..28b1951793 100644 --- a/asm/nonmatchings/code_415D90/func_802A47E0.s +++ b/asm/nonmatchings/code_415D90/func_802A47E0.s @@ -49,7 +49,7 @@ glabel func_802A47E0 /* 419618 802A4888 3C058010 */ lui $a1, %hi(D_80104A28) /* 41961C 802A488C 24A54A28 */ addiu $a1, $a1, %lo(D_80104A28) /* 419620 802A4890 0C0511FF */ jal set_menu_icon_script -/* 419624 802A4894 00000000 */ nop +/* 419624 802A4894 00000000 */ nop /* 419628 802A4898 24040006 */ addiu $a0, $zero, 6 /* 41962C 802A489C 0C051F9F */ jal func_80147E7C /* 419630 802A48A0 24050005 */ addiu $a1, $zero, 5 diff --git a/asm/nonmatchings/code_415D90/func_802A48FC.s b/asm/nonmatchings/code_415D90/func_802A48FC.s index 3142e8e304..ed67c84144 100644 --- a/asm/nonmatchings/code_415D90/func_802A48FC.s +++ b/asm/nonmatchings/code_415D90/func_802A48FC.s @@ -58,7 +58,7 @@ glabel func_802A48FC /* 419758 802A49C8 3C058010 */ lui $a1, %hi(D_80104A28) /* 41975C 802A49CC 24A54A28 */ addiu $a1, $a1, %lo(D_80104A28) /* 419760 802A49D0 0C0511FF */ jal set_menu_icon_script -/* 419764 802A49D4 00000000 */ nop +/* 419764 802A49D4 00000000 */ nop /* 419768 802A49D8 8FBF0018 */ lw $ra, 0x18($sp) /* 41976C 802A49DC 8FB10014 */ lw $s1, 0x14($sp) /* 419770 802A49E0 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_415D90/func_802A4A54.s b/asm/nonmatchings/code_415D90/func_802A4A54.s index 000ad75547..57e2481d7b 100644 --- a/asm/nonmatchings/code_415D90/func_802A4A54.s +++ b/asm/nonmatchings/code_415D90/func_802A4A54.s @@ -18,11 +18,12 @@ glabel func_802A4A54 /* 419818 802A4A88 104001F9 */ beqz $v0, .L802A5270 /* 41981C 802A4A8C AFB00028 */ sw $s0, 0x28($sp) /* 419820 802A4A90 00031080 */ sll $v0, $v1, 2 -/* 419824 802A4A94 3C01802B */ lui $at, %hi(D_802AB9F0) +/* 419824 802A4A94 3C01802B */ lui $at, %hi(jtbl_802AB9F0_420780) /* 419828 802A4A98 00220821 */ addu $at, $at, $v0 -/* 41982C 802A4A9C 8C22B9F0 */ lw $v0, %lo(D_802AB9F0)($at) +/* 41982C 802A4A9C 8C22B9F0 */ lw $v0, %lo(jtbl_802AB9F0_420780)($at) /* 419830 802A4AA0 00400008 */ jr $v0 -/* 419834 802A4AA4 00000000 */ nop +/* 419834 802A4AA4 00000000 */ nop +glabel L802A4AA8_419838 /* 419838 802A4AA8 3C05802B */ lui $a1, %hi(D_802AD608) /* 41983C 802A4AAC 80A5D608 */ lb $a1, %lo(D_802AD608)($a1) /* 419840 802A4AB0 3C04802B */ lui $a0, %hi(D_802AD605) @@ -78,7 +79,7 @@ glabel func_802A4A54 /* 419900 802A4B70 3C048010 */ lui $a0, %hi(D_80104A28) /* 419904 802A4B74 24844A28 */ addiu $a0, $a0, %lo(D_80104A28) /* 419908 802A4B78 0C050529 */ jal create_icon -/* 41990C 802A4B7C 00000000 */ nop +/* 41990C 802A4B7C 00000000 */ nop /* 419910 802A4B80 0040902D */ daddu $s2, $v0, $zero /* 419914 802A4B84 0240202D */ daddu $a0, $s2, $zero /* 419918 802A4B88 3C052000 */ lui $a1, 0x2000 @@ -97,7 +98,7 @@ glabel func_802A4A54 /* 41994C 802A4BBC 3C048010 */ lui $a0, %hi(D_801077E4) /* 419950 802A4BC0 248477E4 */ addiu $a0, $a0, %lo(D_801077E4) /* 419954 802A4BC4 0C050529 */ jal create_icon -/* 419958 802A4BC8 00000000 */ nop +/* 419958 802A4BC8 00000000 */ nop /* 41995C 802A4BCC 0040902D */ daddu $s2, $v0, $zero /* 419960 802A4BD0 0240202D */ daddu $a0, $s2, $zero /* 419964 802A4BD4 3C052000 */ lui $a1, 0x2000 @@ -114,7 +115,7 @@ glabel func_802A4A54 /* 419990 802A4C00 3C048010 */ lui $a0, %hi(D_80107798) /* 419994 802A4C04 24847798 */ addiu $a0, $a0, %lo(D_80107798) /* 419998 802A4C08 0C050529 */ jal create_icon -/* 41999C 802A4C0C 00000000 */ nop +/* 41999C 802A4C0C 00000000 */ nop /* 4199A0 802A4C10 0040902D */ daddu $s2, $v0, $zero /* 4199A4 802A4C14 0240202D */ daddu $a0, $s2, $zero /* 4199A8 802A4C18 3C052000 */ lui $a1, 0x2000 @@ -194,6 +195,7 @@ glabel func_802A4A54 /* 419AD0 802A4D40 A030D604 */ sb $s0, %lo(D_802AD604)($at) /* 419AD4 802A4D44 080A949D */ j .L802A5274 /* 419AD8 802A4D48 0000102D */ daddu $v0, $zero, $zero +glabel L802A4D4C_419ADC /* 419ADC 802A4D4C 3C02802B */ lui $v0, %hi(D_802AD607) /* 419AE0 802A4D50 8042D607 */ lb $v0, %lo(D_802AD607)($v0) /* 419AE4 802A4D54 14400147 */ bnez $v0, .L802A5274 @@ -221,7 +223,7 @@ glabel func_802A4A54 /* 419B34 802A4DA4 3C060002 */ lui $a2, 2 /* 419B38 802A4DA8 00461024 */ and $v0, $v0, $a2 /* 419B3C 802A4DAC 10400010 */ beqz $v0, .L802A4DF0 -/* 419B40 802A4DB0 00000000 */ nop +/* 419B40 802A4DB0 00000000 */ nop /* 419B44 802A4DB4 3C05802B */ lui $a1, %hi(D_802AD605) /* 419B48 802A4DB8 24A5D605 */ addiu $a1, $a1, %lo(D_802AD605) /* 419B4C 802A4DBC 3C02802B */ lui $v0, %hi(D_802AD66C) @@ -243,7 +245,7 @@ glabel func_802A4A54 /* 419B84 802A4DF4 2610D605 */ addiu $s0, $s0, %lo(D_802AD605) /* 419B88 802A4DF8 82020000 */ lb $v0, ($s0) /* 419B8C 802A4DFC 04410005 */ bgez $v0, .L802A4E14 -/* 419B90 802A4E00 00000000 */ nop +/* 419B90 802A4E00 00000000 */ nop /* 419B94 802A4E04 3C02802B */ lui $v0, %hi(D_802AD66F) /* 419B98 802A4E08 9042D66F */ lbu $v0, %lo(D_802AD66F)($v0) /* 419B9C 802A4E0C 2442FFFF */ addiu $v0, $v0, -1 @@ -286,7 +288,7 @@ glabel func_802A4A54 /* 419C20 802A4E90 80C20000 */ lb $v0, ($a2) /* 419C24 802A4E94 00A2102A */ slt $v0, $a1, $v0 /* 419C28 802A4E98 14400006 */ bnez $v0, .L802A4EB4 -/* 419C2C 802A4E9C 00000000 */ nop +/* 419C2C 802A4E9C 00000000 */ nop /* 419C30 802A4EA0 3C02802B */ lui $v0, %hi(D_802AD60A) /* 419C34 802A4EA4 9042D60A */ lbu $v0, %lo(D_802AD60A)($v0) /* 419C38 802A4EA8 2442FFFF */ addiu $v0, $v0, -1 @@ -301,7 +303,7 @@ glabel func_802A4A54 /* 419C58 802A4EC8 00021603 */ sra $v0, $v0, 0x18 /* 419C5C 802A4ECC 0062182A */ slt $v1, $v1, $v0 /* 419C60 802A4ED0 10600003 */ beqz $v1, .L802A4EE0 -/* 419C64 802A4ED4 00000000 */ nop +/* 419C64 802A4ED4 00000000 */ nop /* 419C68 802A4ED8 92220003 */ lbu $v0, 3($s1) /* 419C6C 802A4EDC A0C20000 */ sb $v0, ($a2) .L802A4EE0: @@ -314,7 +316,7 @@ glabel func_802A4A54 /* 419C88 802A4EF8 8C63D690 */ lw $v1, %lo(D_802AD690)($v1) /* 419C8C 802A4EFC 24020001 */ addiu $v0, $zero, 1 /* 419C90 802A4F00 14620005 */ bne $v1, $v0, .L802A4F18 -/* 419C94 802A4F04 00000000 */ nop +/* 419C94 802A4F04 00000000 */ nop /* 419C98 802A4F08 0C05272D */ jal play_sound /* 419C9C 802A4F0C 240400C9 */ addiu $a0, $zero, 0xc9 /* 419CA0 802A4F10 080A949A */ j .L802A5268 @@ -341,9 +343,10 @@ glabel func_802A4A54 /* 419CEC 802A4F5C 0C05272D */ jal play_sound /* 419CF0 802A4F60 240400CA */ addiu $a0, $zero, 0xca /* 419CF4 802A4F64 0C0A91CB */ jal func_802A472C -/* 419CF8 802A4F68 00000000 */ nop +/* 419CF8 802A4F68 00000000 */ nop /* 419CFC 802A4F6C 080A949A */ j .L802A5268 /* 419D00 802A4F70 2402FFFE */ addiu $v0, $zero, -2 +glabel L802A4F74_419D04 /* 419D04 802A4F74 3C02802B */ lui $v0, %hi(D_802AD66C) /* 419D08 802A4F78 8C42D66C */ lw $v0, %lo(D_802AD66C)($v0) /* 419D0C 802A4F7C 1840000F */ blez $v0, .L802A4FBC @@ -387,7 +390,7 @@ glabel func_802A4A54 /* 419D9C 802A500C 3C058010 */ lui $a1, %hi(D_80104A00) /* 419DA0 802A5010 24A54A00 */ addiu $a1, $a1, %lo(D_80104A00) /* 419DA4 802A5014 0C0511FF */ jal set_menu_icon_script -/* 419DA8 802A5018 00000000 */ nop +/* 419DA8 802A5018 00000000 */ nop /* 419DAC 802A501C 24040006 */ addiu $a0, $zero, 6 /* 419DB0 802A5020 2402000D */ addiu $v0, $zero, 0xd /* 419DB4 802A5024 3C01802B */ lui $at, %hi(D_802AD614) @@ -401,9 +404,11 @@ glabel func_802A4A54 /* 419DD4 802A5044 0C051F9F */ jal func_80147E7C /* 419DD8 802A5048 24050002 */ addiu $a1, $zero, 2 /* 419DDC 802A504C 080A9424 */ j .L802A5090 -/* 419DE0 802A5050 00000000 */ nop +/* 419DE0 802A5050 00000000 */ nop +glabel L802A5054_419DE4 /* 419DE4 802A5054 080A949D */ j .L802A5274 /* 419DE8 802A5058 240200FF */ addiu $v0, $zero, 0xff +glabel L802A505C_419DEC /* 419DEC 802A505C 24040006 */ addiu $a0, $zero, 6 /* 419DF0 802A5060 0C051F9F */ jal func_80147E7C /* 419DF4 802A5064 24050002 */ addiu $a1, $zero, 2 @@ -418,10 +423,12 @@ glabel func_802A4A54 /* 419E18 802A5088 080A9434 */ j .L802A50D0 /* 419E1C 802A508C 2403000B */ addiu $v1, $zero, 0xb .L802A5090: +glabel L802A5090_419E20 /* 419E20 802A5090 3C02802B */ lui $v0, %hi(D_802AD605) /* 419E24 802A5094 8042D605 */ lb $v0, %lo(D_802AD605)($v0) /* 419E28 802A5098 080A949D */ j .L802A5274 /* 419E2C 802A509C 24420001 */ addiu $v0, $v0, 1 +glabel L802A50A0_419E30 /* 419E30 802A50A0 24040006 */ addiu $a0, $zero, 6 /* 419E34 802A50A4 0C051F9F */ jal func_80147E7C /* 419E38 802A50A8 24050001 */ addiu $a1, $zero, 1 @@ -439,6 +446,7 @@ glabel func_802A4A54 /* 419E64 802A50D4 A023D604 */ sb $v1, %lo(D_802AD604)($at) /* 419E68 802A50D8 080A949D */ j .L802A5274 /* 419E6C 802A50DC 24420001 */ addiu $v0, $v0, 1 +glabel L802A50E0_419E70 /* 419E70 802A50E0 24040006 */ addiu $a0, $zero, 6 /* 419E74 802A50E4 0C051F9F */ jal func_80147E7C /* 419E78 802A50E8 24050001 */ addiu $a1, $zero, 1 @@ -450,6 +458,7 @@ glabel func_802A4A54 /* 419E90 802A5100 24050001 */ addiu $a1, $zero, 1 /* 419E94 802A5104 080A949A */ j .L802A5268 /* 419E98 802A5108 2402FFFF */ addiu $v0, $zero, -1 +glabel L802A510C_419E9C /* 419E9C 802A510C 2402FFFF */ addiu $v0, $zero, -1 /* 419EA0 802A5110 0040182D */ daddu $v1, $v0, $zero /* 419EA4 802A5114 3C01802B */ lui $at, %hi(D_802AD6D4) @@ -458,7 +467,8 @@ glabel func_802A4A54 /* 419EB0 802A5120 3C01802B */ lui $at, %hi(D_802AD604) /* 419EB4 802A5124 A023D604 */ sb $v1, %lo(D_802AD604)($at) /* 419EB8 802A5128 080A949D */ j .L802A5274 -/* 419EBC 802A512C 00000000 */ nop +/* 419EBC 802A512C 00000000 */ nop +glabel L802A5130_419EC0 /* 419EC0 802A5130 24040006 */ addiu $a0, $zero, 6 /* 419EC4 802A5134 0C051F9F */ jal func_80147E7C /* 419EC8 802A5138 24050002 */ addiu $a1, $zero, 2 @@ -509,12 +519,13 @@ glabel func_802A4A54 /* 419F74 802A51E4 A023D604 */ sb $v1, %lo(D_802AD604)($at) /* 419F78 802A51E8 080A949D */ j .L802A5274 /* 419F7C 802A51EC 2402FFFF */ addiu $v0, $zero, -1 +glabel L802A51F0_419F80 /* 419F80 802A51F0 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 419F84 802A51F4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 419F88 802A51F8 8C420010 */ lw $v0, 0x10($v0) /* 419F8C 802A51FC 3042C000 */ andi $v0, $v0, 0xc000 /* 419F90 802A5200 10400003 */ beqz $v0, .L802A5210 -/* 419F94 802A5204 00000000 */ nop +/* 419F94 802A5204 00000000 */ nop /* 419F98 802A5208 3C01802B */ lui $at, %hi(D_802AD612) /* 419F9C 802A520C A420D612 */ sh $zero, %lo(D_802AD612)($at) .L802A5210: @@ -545,6 +556,7 @@ glabel func_802A4A54 /* 419FF8 802A5268 3C01802B */ lui $at, %hi(D_802AD604) /* 419FFC 802A526C A022D604 */ sb $v0, %lo(D_802AD604)($at) .L802A5270: +glabel L802A5270_41A000 /* 41A000 802A5270 0000102D */ daddu $v0, $zero, $zero .L802A5274: /* 41A004 802A5274 8FBF0038 */ lw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_415D90/func_802A5290.s b/asm/nonmatchings/code_415D90/func_802A5290.s index 017da6edf1..fbd822a316 100644 --- a/asm/nonmatchings/code_415D90/func_802A5290.s +++ b/asm/nonmatchings/code_415D90/func_802A5290.s @@ -23,11 +23,12 @@ glabel func_802A5290 /* 41A068 802A52D8 104000FB */ beqz $v0, .L802A56C8 /* 41A06C 802A52DC AFA60048 */ sw $a2, 0x48($sp) /* 41A070 802A52E0 00031080 */ sll $v0, $v1, 2 -/* 41A074 802A52E4 3C01802B */ lui $at, %hi(D_802ABAA8) +/* 41A074 802A52E4 3C01802B */ lui $at, %hi(jtbl_802ABAA8_420838) /* 41A078 802A52E8 00220821 */ addu $at, $at, $v0 -/* 41A07C 802A52EC 8C22BAA8 */ lw $v0, %lo(D_802ABAA8)($at) +/* 41A07C 802A52EC 8C22BAA8 */ lw $v0, %lo(jtbl_802ABAA8_420838)($at) /* 41A080 802A52F0 00400008 */ jr $v0 -/* 41A084 802A52F4 00000000 */ nop +/* 41A084 802A52F4 00000000 */ nop +glabel L802A52F8_41A088 /* 41A088 802A52F8 3C03802B */ lui $v1, %hi(D_802AD608) /* 41A08C 802A52FC 8063D608 */ lb $v1, %lo(D_802AD608)($v1) /* 41A090 802A5300 3C08802B */ lui $t0, %hi(D_802AD60C) @@ -42,20 +43,20 @@ glabel func_802A5290 /* 41A0B4 802A5324 00438821 */ addu $s1, $v0, $v1 /* 41A0B8 802A5328 02281023 */ subu $v0, $s1, $t0 /* 41A0BC 802A532C 44820000 */ mtc1 $v0, $f0 -/* 41A0C0 802A5330 00000000 */ nop +/* 41A0C0 802A5330 00000000 */ nop /* 41A0C4 802A5334 46800021 */ cvt.d.w $f0, $f0 /* 41A0C8 802A5338 46220002 */ mul.d $f0, $f0, $f2 -/* 41A0CC 802A533C 00000000 */ nop +/* 41A0CC 802A533C 00000000 */ nop /* 41A0D0 802A5340 4620018D */ trunc.w.d $f6, $f0 /* 41A0D4 802A5344 44023000 */ mfc1 $v0, $f6 -/* 41A0D8 802A5348 00000000 */ nop +/* 41A0D8 802A5348 00000000 */ nop /* 41A0DC 802A534C 14400002 */ bnez $v0, .L802A5358 /* 41A0E0 802A5350 01024021 */ addu $t0, $t0, $v0 /* 41A0E4 802A5354 0220402D */ daddu $t0, $s1, $zero .L802A5358: /* 41A0E8 802A5358 26F50004 */ addiu $s5, $s7, 4 /* 41A0EC 802A535C 44951000 */ mtc1 $s5, $f2 -/* 41A0F0 802A5360 00000000 */ nop +/* 41A0F0 802A5360 00000000 */ nop /* 41A0F4 802A5364 468010A0 */ cvt.s.w $f2, $f2 /* 41A0F8 802A5368 26F50021 */ addiu $s5, $s7, 0x21 /* 41A0FC 802A536C 0000B02D */ daddu $s6, $zero, $zero @@ -79,52 +80,52 @@ glabel func_802A5290 /* 41A144 802A53B4 24420001 */ addiu $v0, $v0, 1 /* 41A148 802A53B8 02224021 */ addu $t0, $s1, $v0 /* 41A14C 802A53BC 46041082 */ mul.s $f2, $f2, $f4 -/* 41A150 802A53C0 00000000 */ nop +/* 41A150 802A53C0 00000000 */ nop /* 41A154 802A53C4 0080382D */ daddu $a3, $a0, $zero /* 41A158 802A53C8 24840008 */ addiu $a0, $a0, 8 /* 41A15C 802A53CC 44910000 */ mtc1 $s1, $f0 -/* 41A160 802A53D0 00000000 */ nop +/* 41A160 802A53D0 00000000 */ nop /* 41A164 802A53D4 46800020 */ cvt.s.w $f0, $f0 /* 41A168 802A53D8 84A20000 */ lh $v0, ($a1) /* 41A16C 802A53DC 46040002 */ mul.s $f0, $f0, $f4 -/* 41A170 802A53E0 00000000 */ nop +/* 41A170 802A53E0 00000000 */ nop /* 41A174 802A53E4 ACC40000 */ sw $a0, ($a2) /* 41A178 802A53E8 24420013 */ addiu $v0, $v0, 0x13 /* 41A17C 802A53EC 01228821 */ addu $s1, $t1, $v0 /* 41A180 802A53F0 26E2008E */ addiu $v0, $s7, 0x8e /* 41A184 802A53F4 4600118D */ trunc.w.s $f6, $f2 /* 41A188 802A53F8 44033000 */ mfc1 $v1, $f6 -/* 41A18C 802A53FC 00000000 */ nop +/* 41A18C 802A53FC 00000000 */ nop /* 41A190 802A5400 30630FFF */ andi $v1, $v1, 0xfff /* 41A194 802A5404 00031B00 */ sll $v1, $v1, 0xc /* 41A198 802A5408 4600018D */ trunc.w.s $f6, $f0 /* 41A19C 802A540C 44043000 */ mfc1 $a0, $f6 -/* 41A1A0 802A5410 00000000 */ nop +/* 41A1A0 802A5410 00000000 */ nop /* 41A1A4 802A5414 30840FFF */ andi $a0, $a0, 0xfff /* 41A1A8 802A5418 44821000 */ mtc1 $v0, $f2 -/* 41A1AC 802A541C 00000000 */ nop +/* 41A1AC 802A541C 00000000 */ nop /* 41A1B0 802A5420 468010A0 */ cvt.s.w $f2, $f2 /* 41A1B4 802A5424 3C02ED00 */ lui $v0, 0xed00 /* 41A1B8 802A5428 46041082 */ mul.s $f2, $f2, $f4 -/* 41A1BC 802A542C 00000000 */ nop +/* 41A1BC 802A542C 00000000 */ nop /* 41A1C0 802A5430 00822025 */ or $a0, $a0, $v0 /* 41A1C4 802A5434 00641825 */ or $v1, $v1, $a0 /* 41A1C8 802A5438 44880000 */ mtc1 $t0, $f0 -/* 41A1CC 802A543C 00000000 */ nop +/* 41A1CC 802A543C 00000000 */ nop /* 41A1D0 802A5440 46800020 */ cvt.s.w $f0, $f0 /* 41A1D4 802A5444 3C04802B */ lui $a0, %hi(D_802AD66C) /* 41A1D8 802A5448 8C84D66C */ lw $a0, %lo(D_802AD66C)($a0) /* 41A1DC 802A544C 46040002 */ mul.s $f0, $f0, $f4 -/* 41A1E0 802A5450 00000000 */ nop +/* 41A1E0 802A5450 00000000 */ nop /* 41A1E4 802A5454 ACE30000 */ sw $v1, ($a3) /* 41A1E8 802A5458 4600118D */ trunc.w.s $f6, $f2 /* 41A1EC 802A545C 44023000 */ mfc1 $v0, $f6 -/* 41A1F0 802A5460 00000000 */ nop +/* 41A1F0 802A5460 00000000 */ nop /* 41A1F4 802A5464 30420FFF */ andi $v0, $v0, 0xfff /* 41A1F8 802A5468 00021300 */ sll $v0, $v0, 0xc /* 41A1FC 802A546C 4600018D */ trunc.w.s $f6, $f0 /* 41A200 802A5470 44033000 */ mfc1 $v1, $f6 -/* 41A204 802A5474 00000000 */ nop +/* 41A204 802A5474 00000000 */ nop /* 41A208 802A5478 30630FFF */ andi $v1, $v1, 0xfff /* 41A20C 802A547C 00431025 */ or $v0, $v0, $v1 /* 41A210 802A5480 18800028 */ blez $a0, .L802A5524 @@ -140,7 +141,7 @@ glabel func_802A5290 /* 41A234 802A54A4 3C10802B */ lui $s0, %hi(D_802AD614) /* 41A238 802A54A8 8210D614 */ lb $s0, %lo(D_802AD614)($s0) /* 41A23C 802A54AC 14490005 */ bne $v0, $t1, .L802A54C4 -/* 41A240 802A54B0 00000000 */ nop +/* 41A240 802A54B0 00000000 */ nop /* 41A244 802A54B4 0C03A752 */ jal is_ability_active /* 41A248 802A54B8 2404001A */ addiu $a0, $zero, 0x1a /* 41A24C 802A54BC 54400001 */ bnel $v0, $zero, .L802A54C4 @@ -217,11 +218,11 @@ glabel func_802A5290 /* 41A354 802A55C4 00438821 */ addu $s1, $v0, $v1 /* 41A358 802A55C8 02281023 */ subu $v0, $s1, $t0 /* 41A35C 802A55CC 44820000 */ mtc1 $v0, $f0 -/* 41A360 802A55D0 00000000 */ nop +/* 41A360 802A55D0 00000000 */ nop /* 41A364 802A55D4 46800021 */ cvt.d.w $f0, $f0 /* 41A368 802A55D8 4620018D */ trunc.w.d $f6, $f0 /* 41A36C 802A55DC 44023000 */ mfc1 $v0, $f6 -/* 41A370 802A55E0 00000000 */ nop +/* 41A370 802A55E0 00000000 */ nop /* 41A374 802A55E4 10400003 */ beqz $v0, .L802A55F4 /* 41A378 802A55E8 26F5000A */ addiu $s5, $s7, 0xa /* 41A37C 802A55EC 080A957E */ j .L802A55F8 @@ -283,6 +284,7 @@ glabel func_802A5290 /* 41A450 802A56C0 0C0511EA */ jal draw_icon_0 /* 41A454 802A56C4 0200202D */ daddu $a0, $s0, $zero .L802A56C8: +glabel L802A56C8_41A458 /* 41A458 802A56C8 8FBF003C */ lw $ra, 0x3c($sp) /* 41A45C 802A56CC 8FBE0038 */ lw $fp, 0x38($sp) /* 41A460 802A56D0 8FB70034 */ lw $s7, 0x34($sp) diff --git a/asm/nonmatchings/code_415D90/func_802A5738.s b/asm/nonmatchings/code_415D90/func_802A5738.s index b61e563e0c..f8b8b8ee39 100644 --- a/asm/nonmatchings/code_415D90/func_802A5738.s +++ b/asm/nonmatchings/code_415D90/func_802A5738.s @@ -12,15 +12,16 @@ glabel func_802A5738 /* 41A4E4 802A5754 10400019 */ beqz $v0, .L802A57BC /* 41A4E8 802A5758 AFBF0018 */ sw $ra, 0x18($sp) /* 41A4EC 802A575C 00031080 */ sll $v0, $v1, 2 -/* 41A4F0 802A5760 3C01802B */ lui $at, %hi(D_802ABB58) +/* 41A4F0 802A5760 3C01802B */ lui $at, %hi(jtbl_802ABB58_4208E8) /* 41A4F4 802A5764 00220821 */ addu $at, $at, $v0 -/* 41A4F8 802A5768 8C22BB58 */ lw $v0, %lo(D_802ABB58)($at) +/* 41A4F8 802A5768 8C22BB58 */ lw $v0, %lo(jtbl_802ABB58_4208E8)($at) /* 41A4FC 802A576C 00400008 */ jr $v0 -/* 41A500 802A5770 00000000 */ nop +/* 41A500 802A5770 00000000 */ nop +glabel L802A5774_41A504 /* 41A504 802A5774 3C02802B */ lui $v0, %hi(D_802AD60B) /* 41A508 802A5778 8042D60B */ lb $v0, %lo(D_802AD60B)($v0) /* 41A50C 802A577C 1040000F */ beqz $v0, .L802A57BC -/* 41A510 802A5780 00000000 */ nop +/* 41A510 802A5780 00000000 */ nop /* 41A514 802A5784 3C02802B */ lui $v0, %hi(D_802AD605) /* 41A518 802A5788 8042D605 */ lb $v0, %lo(D_802AD605)($v0) /* 41A51C 802A578C 3C03802B */ lui $v1, %hi(D_802AD614) @@ -36,6 +37,7 @@ glabel func_802A5738 /* 41A544 802A57B4 0C04993B */ jal draw_string /* 41A548 802A57B8 24A50008 */ addiu $a1, $a1, 8 .L802A57BC: +glabel L802A57BC_41A54C /* 41A54C 802A57BC 8FBF0018 */ lw $ra, 0x18($sp) /* 41A550 802A57C0 03E00008 */ jr $ra /* 41A554 802A57C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_415D90/func_802A58D0.s b/asm/nonmatchings/code_415D90/func_802A58D0.s index 54cd33e331..b8742f3f61 100644 --- a/asm/nonmatchings/code_415D90/func_802A58D0.s +++ b/asm/nonmatchings/code_415D90/func_802A58D0.s @@ -8,13 +8,13 @@ glabel func_802A58D0 /* 41A66C 802A58DC 8C6500DC */ lw $a1, 0xdc($v1) /* 41A670 802A58E0 30420004 */ andi $v0, $v0, 4 /* 41A674 802A58E4 14400007 */ bnez $v0, .L802A5904 -/* 41A678 802A58E8 00000000 */ nop +/* 41A678 802A58E8 00000000 */ nop /* 41A67C 802A58EC 10A00005 */ beqz $a1, .L802A5904 /* 41A680 802A58F0 3C030020 */ lui $v1, 0x20 /* 41A684 802A58F4 8CA20000 */ lw $v0, ($a1) /* 41A688 802A58F8 00431024 */ and $v0, $v0, $v1 /* 41A68C 802A58FC 10400003 */ beqz $v0, .L802A590C -/* 41A690 802A5900 00000000 */ nop +/* 41A690 802A5900 00000000 */ nop .L802A5904: /* 41A694 802A5904 03E00008 */ jr $ra /* 41A698 802A5908 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_415D90/func_802A8180.s b/asm/nonmatchings/code_415D90/func_802A8180.s index 396694ec34..3ffb4b1213 100644 --- a/asm/nonmatchings/code_415D90/func_802A8180.s +++ b/asm/nonmatchings/code_415D90/func_802A8180.s @@ -14,9 +14,9 @@ glabel func_802A8180 /* 41CF34 802A81A4 00220821 */ addu $at, $at, $v0 /* 41CF38 802A81A8 8C22C090 */ lw $v0, %lo(D_802AC090)($at) /* 41CF3C 802A81AC 00400008 */ jr $v0 -/* 41CF40 802A81B0 00000000 */ nop +/* 41CF40 802A81B0 00000000 */ nop /* 41CF44 802A81B4 0C0A8715 */ jal draw_battle_wheel -/* 41CF48 802A81B8 00000000 */ nop +/* 41CF48 802A81B8 00000000 */ nop .L802A81BC: /* 41CF4C 802A81BC 8FBF0010 */ lw $ra, 0x10($sp) /* 41CF50 802A81C0 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_415D90/func_802A9AE8.s b/asm/nonmatchings/code_415D90/func_802A9AE8.s index cc34f64ce8..750ecf0b89 100644 --- a/asm/nonmatchings/code_415D90/func_802A9AE8.s +++ b/asm/nonmatchings/code_415D90/func_802A9AE8.s @@ -14,9 +14,9 @@ glabel func_802A9AE8 /* 41E89C 802A9B0C 00220821 */ addu $at, $at, $v0 /* 41E8A0 802A9B10 8C22C880 */ lw $v0, %lo(D_802AC880)($at) /* 41E8A4 802A9B14 00400008 */ jr $v0 -/* 41E8A8 802A9B18 00000000 */ nop +/* 41E8A8 802A9B18 00000000 */ nop /* 41E8AC 802A9B1C 0C0A8715 */ jal draw_battle_wheel -/* 41E8B0 802A9B20 00000000 */ nop +/* 41E8B0 802A9B20 00000000 */ nop .L802A9B24: /* 41E8B4 802A9B24 8FBF0010 */ lw $ra, 0x10($sp) /* 41E8B8 802A9B28 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_415D90/func_802A9B44.s b/asm/nonmatchings/code_415D90/func_802A9B44.s index e681630ec1..224e340c64 100644 --- a/asm/nonmatchings/code_415D90/func_802A9B44.s +++ b/asm/nonmatchings/code_415D90/func_802A9B44.s @@ -19,11 +19,12 @@ glabel func_802A9B44 /* 41E90C 802A9B7C 2C62000C */ sltiu $v0, $v1, 0xc /* 41E910 802A9B80 1040012D */ beqz $v0, .L802AA038 /* 41E914 802A9B84 00031080 */ sll $v0, $v1, 2 -/* 41E918 802A9B88 3C01802B */ lui $at, %hi(D_802ACBB0) +/* 41E918 802A9B88 3C01802B */ lui $at, %hi(jtbl_802ACBB0_421940) /* 41E91C 802A9B8C 00220821 */ addu $at, $at, $v0 -/* 41E920 802A9B90 8C22CBB0 */ lw $v0, %lo(D_802ACBB0)($at) +/* 41E920 802A9B90 8C22CBB0 */ lw $v0, %lo(jtbl_802ACBB0_421940)($at) /* 41E924 802A9B94 00400008 */ jr $v0 -/* 41E928 802A9B98 00000000 */ nop +/* 41E928 802A9B98 00000000 */ nop +glabel L802A9B9C_41E92C /* 41E92C 802A9B9C 0C093903 */ jal func_8024E40C /* 41E930 802A9BA0 24040002 */ addiu $a0, $zero, 2 /* 41E934 802A9BA4 0C093936 */ jal move_cam_over @@ -51,9 +52,10 @@ glabel func_802A9B44 /* 41E988 802A9BF8 AE000054 */ sw $zero, 0x54($s0) /* 41E98C 802A9BFC 080AA80E */ j .L802AA038 /* 41E990 802A9C00 E6000020 */ swc1 $f0, 0x20($s0) +glabel L802A9C04_41E994 /* 41E994 802A9C04 86020070 */ lh $v0, 0x70($s0) /* 41E998 802A9C08 10400022 */ beqz $v0, .L802A9C94 -/* 41E99C 802A9C0C 00000000 */ nop +/* 41E99C 802A9C0C 00000000 */ nop /* 41E9A0 802A9C10 C6000018 */ lwc1 $f0, 0x18($s0) /* 41E9A4 802A9C14 C6080144 */ lwc1 $f8, 0x144($s0) /* 41E9A8 802A9C18 C6020020 */ lwc1 $f2, 0x20($s0) @@ -61,7 +63,7 @@ glabel func_802A9B44 /* 41E9B0 802A9C20 C604014C */ lwc1 $f4, 0x14c($s0) /* 41E9B4 802A9C24 46041081 */ sub.s $f2, $f2, $f4 /* 41E9B8 802A9C28 44823000 */ mtc1 $v0, $f6 -/* 41E9BC 802A9C2C 00000000 */ nop +/* 41E9BC 802A9C2C 00000000 */ nop /* 41E9C0 802A9C30 468031A0 */ cvt.s.w $f6, $f6 /* 41E9C4 802A9C34 46060003 */ div.s $f0, $f0, $f6 /* 41E9C8 802A9C38 46004200 */ add.s $f8, $f8, $f0 @@ -82,7 +84,7 @@ glabel func_802A9B44 /* 41EA04 802A9C74 86020070 */ lh $v0, 0x70($s0) /* 41EA08 802A9C78 46040001 */ sub.s $f0, $f0, $f4 /* 41EA0C 802A9C7C 44821000 */ mtc1 $v0, $f2 -/* 41EA10 802A9C80 00000000 */ nop +/* 41EA10 802A9C80 00000000 */ nop /* 41EA14 802A9C84 468010A0 */ cvt.s.w $f2, $f2 /* 41EA18 802A9C88 46020003 */ div.s $f0, $f0, $f2 /* 41EA1C 802A9C8C 46002100 */ add.s $f4, $f4, $f0 @@ -92,9 +94,9 @@ glabel func_802A9B44 /* 41EA28 802A9C98 3C0140C9 */ lui $at, 0x40c9 /* 41EA2C 802A9C9C 34210FD0 */ ori $at, $at, 0xfd0 /* 41EA30 802A9CA0 4481B000 */ mtc1 $at, $f22 -/* 41EA34 802A9CA4 00000000 */ nop +/* 41EA34 802A9CA4 00000000 */ nop /* 41EA38 802A9CA8 46166302 */ mul.s $f12, $f12, $f22 -/* 41EA3C 802A9CAC 00000000 */ nop +/* 41EA3C 802A9CAC 00000000 */ nop /* 41EA40 802A9CB0 3C0143B4 */ lui $at, 0x43b4 /* 41EA44 802A9CB4 4481C000 */ mtc1 $at, $f24 /* 41EA48 802A9CB8 3C014180 */ lui $at, 0x4180 @@ -102,7 +104,7 @@ glabel func_802A9B44 /* 41EA50 802A9CC0 0C00A85B */ jal sin_rad /* 41EA54 802A9CC4 46186303 */ div.s $f12, $f12, $f24 /* 41EA58 802A9CC8 46140002 */ mul.s $f0, $f0, $f20 -/* 41EA5C 802A9CCC 00000000 */ nop +/* 41EA5C 802A9CCC 00000000 */ nop /* 41EA60 802A9CD0 C602014C */ lwc1 $f2, 0x14c($s0) /* 41EA64 802A9CD4 46001081 */ sub.s $f2, $f2, $f0 /* 41EA68 802A9CD8 C60C0054 */ lwc1 $f12, 0x54($s0) @@ -111,12 +113,12 @@ glabel func_802A9B44 /* 41EA74 802A9CE4 E602014C */ swc1 $f2, 0x14c($s0) /* 41EA78 802A9CE8 C60C0054 */ lwc1 $f12, 0x54($s0) /* 41EA7C 802A9CEC 46166302 */ mul.s $f12, $f12, $f22 -/* 41EA80 802A9CF0 00000000 */ nop +/* 41EA80 802A9CF0 00000000 */ nop /* 41EA84 802A9CF4 E600018C */ swc1 $f0, 0x18c($s0) /* 41EA88 802A9CF8 0C00A85B */ jal sin_rad /* 41EA8C 802A9CFC 46186303 */ div.s $f12, $f12, $f24 /* 41EA90 802A9D00 46140002 */ mul.s $f0, $f0, $f20 -/* 41EA94 802A9D04 00000000 */ nop +/* 41EA94 802A9D04 00000000 */ nop /* 41EA98 802A9D08 C622014C */ lwc1 $f2, 0x14c($s1) /* 41EA9C 802A9D0C 46001080 */ add.s $f2, $f2, $f0 /* 41EAA0 802A9D10 E622014C */ swc1 $f2, 0x14c($s1) @@ -159,6 +161,7 @@ glabel func_802A9B44 /* 41EB30 802A9DA0 3484FFFF */ ori $a0, $a0, 0xffff /* 41EB34 802A9DA4 00441024 */ and $v0, $v0, $a0 /* 41EB38 802A9DA8 AC620000 */ sw $v0, ($v1) +glabel L802A9DAC_41EB3C /* 41EB3C 802A9DAC 3C03800E */ lui $v1, %hi(gBattleStatus) /* 41EB40 802A9DB0 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) /* 41EB44 802A9DB4 8C620000 */ lw $v0, ($v1) @@ -231,19 +234,20 @@ glabel func_802A9B44 /* 41EC40 802A9EB0 3C01802B */ lui $at, %hi(D_802AD100) /* 41EC44 802A9EB4 AC22D100 */ sw $v0, %lo(D_802AD100)($at) /* 41EC48 802A9EB8 0C0A8400 */ jal func_802A1000 -/* 41EC4C 802A9EBC 00000000 */ nop +/* 41EC4C 802A9EBC 00000000 */ nop /* 41EC50 802A9EC0 24020008 */ addiu $v0, $zero, 8 /* 41EC54 802A9EC4 3C01802B */ lui $at, %hi(D_802ACC60) /* 41EC58 802A9EC8 AC22CC60 */ sw $v0, %lo(D_802ACC60)($at) /* 41EC5C 802A9ECC 080AA80C */ j .L802AA030 /* 41EC60 802A9ED0 24020001 */ addiu $v0, $zero, 1 +glabel L802A9ED4_41EC64 /* 41EC64 802A9ED4 0000202D */ daddu $a0, $zero, $zero /* 41EC68 802A9ED8 0080282D */ daddu $a1, $a0, $zero /* 41EC6C 802A9EDC 3C06000C */ lui $a2, 0xc /* 41EC70 802A9EE0 0C098F3F */ jal set_animation /* 41EC74 802A9EE4 34C60009 */ ori $a2, $a2, 9 /* 41EC78 802A9EE8 0C0A846C */ jal func_802A11B0 -/* 41EC7C 802A9EEC 00000000 */ nop +/* 41EC7C 802A9EEC 00000000 */ nop /* 41EC80 802A9EF0 3C11802B */ lui $s1, %hi(D_802ACC60) /* 41EC84 802A9EF4 2631CC60 */ addiu $s1, $s1, %lo(D_802ACC60) /* 41EC88 802A9EF8 8E230000 */ lw $v1, ($s1) @@ -273,8 +277,9 @@ glabel func_802A9B44 /* 41ECE4 802A9F54 AC22CC6C */ sw $v0, %lo(D_802ACC6C)($at) /* 41ECE8 802A9F58 080AA80C */ j .L802AA030 /* 41ECEC 802A9F5C 24020002 */ addiu $v0, $zero, 2 +glabel L802A9F60_41ECF0 /* 41ECF0 802A9F60 0C0A846C */ jal func_802A11B0 -/* 41ECF4 802A9F64 00000000 */ nop +/* 41ECF4 802A9F64 00000000 */ nop /* 41ECF8 802A9F68 10400033 */ beqz $v0, .L802AA038 /* 41ECFC 802A9F6C 24040011 */ addiu $a0, $zero, 0x11 /* 41ED00 802A9F70 24020004 */ addiu $v0, $zero, 4 @@ -292,22 +297,25 @@ glabel func_802A9B44 /* 41ED30 802A9FA0 0C090464 */ jal func_80241190 /* 41ED34 802A9FA4 AE430184 */ sw $v1, 0x184($s2) /* 41ED38 802A9FA8 080AA80E */ j .L802AA038 -/* 41ED3C 802A9FAC 00000000 */ nop +/* 41ED3C 802A9FAC 00000000 */ nop +glabel L802A9FB0_41ED40 /* 41ED40 802A9FB0 0C0A8414 */ jal func_802A1050 -/* 41ED44 802A9FB4 00000000 */ nop +/* 41ED44 802A9FB4 00000000 */ nop /* 41ED48 802A9FB8 24020001 */ addiu $v0, $zero, 1 /* 41ED4C 802A9FBC 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41ED50 802A9FC0 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 41ED54 802A9FC4 0C0AA6D1 */ jal func_802A9B44 -/* 41ED58 802A9FC8 00000000 */ nop +/* 41ED58 802A9FC8 00000000 */ nop /* 41ED5C 802A9FCC 0C0AA6D1 */ jal func_802A9B44 -/* 41ED60 802A9FD0 00000000 */ nop +/* 41ED60 802A9FD0 00000000 */ nop /* 41ED64 802A9FD4 080AA80E */ j .L802AA038 -/* 41ED68 802A9FD8 00000000 */ nop +/* 41ED68 802A9FD8 00000000 */ nop +glabel L802A9FDC_41ED6C /* 41ED6C 802A9FDC 0C0A842E */ jal func_802A10B8 -/* 41ED70 802A9FE0 00000000 */ nop +/* 41ED70 802A9FE0 00000000 */ nop /* 41ED74 802A9FE4 080AA80E */ j .L802AA038 -/* 41ED78 802A9FE8 00000000 */ nop +/* 41ED78 802A9FE8 00000000 */ nop +glabel L802A9FEC_41ED7C /* 41ED7C 802A9FEC 24040050 */ addiu $a0, $zero, 0x50 /* 41ED80 802A9FF0 2405003C */ addiu $a1, $zero, 0x3c /* 41ED84 802A9FF4 0C093E81 */ jal show_variable_battle_message @@ -317,8 +325,9 @@ glabel func_802A9B44 /* 41ED94 802AA004 A022D607 */ sb $v0, %lo(D_802AD607)($at) /* 41ED98 802AA008 080AA80C */ j .L802AA030 /* 41ED9C 802AA00C 24020009 */ addiu $v0, $zero, 9 +glabel L802AA010_41EDA0 /* 41EDA0 802AA010 0C093EAD */ jal is_popup_displayed -/* 41EDA4 802AA014 00000000 */ nop +/* 41EDA4 802AA014 00000000 */ nop /* 41EDA8 802AA018 14400007 */ bnez $v0, .L802AA038 /* 41EDAC 802AA01C 24020001 */ addiu $v0, $zero, 1 /* 41EDB0 802AA020 3C01802B */ lui $at, %hi(D_802AD607) @@ -329,6 +338,7 @@ glabel func_802A9B44 /* 41EDC0 802AA030 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41EDC4 802AA034 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) .L802AA038: +glabel L802AA038_41EDC8 /* 41EDC8 802AA038 8FBF001C */ lw $ra, 0x1c($sp) /* 41EDCC 802AA03C 8FB20018 */ lw $s2, 0x18($sp) /* 41EDD0 802AA040 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_415D90/func_802AA05C.s b/asm/nonmatchings/code_415D90/func_802AA05C.s index 1cbff81283..a3061da978 100644 --- a/asm/nonmatchings/code_415D90/func_802AA05C.s +++ b/asm/nonmatchings/code_415D90/func_802AA05C.s @@ -14,9 +14,9 @@ glabel func_802AA05C /* 41EE10 802AA080 00220821 */ addu $at, $at, $v0 /* 41EE14 802AA084 8C22CBE0 */ lw $v0, %lo(D_802ACBE0)($at) /* 41EE18 802AA088 00400008 */ jr $v0 -/* 41EE1C 802AA08C 00000000 */ nop +/* 41EE1C 802AA08C 00000000 */ nop /* 41EE20 802AA090 0C0A8715 */ jal draw_battle_wheel -/* 41EE24 802AA094 00000000 */ nop +/* 41EE24 802AA094 00000000 */ nop .L802AA098: /* 41EE28 802AA098 8FBF0010 */ lw $ra, 0x10($sp) /* 41EE2C 802AA09C 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_415D90/func_802AA0B8.s b/asm/nonmatchings/code_415D90/func_802AA0B8.s index 1081a43e32..bed298b04a 100644 --- a/asm/nonmatchings/code_415D90/func_802AA0B8.s +++ b/asm/nonmatchings/code_415D90/func_802AA0B8.s @@ -19,11 +19,12 @@ glabel func_802AA0B8 /* 41EE80 802AA0F0 2C62000C */ sltiu $v0, $v1, 0xc /* 41EE84 802AA0F4 10400149 */ beqz $v0, .L802AA61C /* 41EE88 802AA0F8 00031080 */ sll $v0, $v1, 2 -/* 41EE8C 802AA0FC 3C01802B */ lui $at, %hi(D_802ACC08) +/* 41EE8C 802AA0FC 3C01802B */ lui $at, %hi(jtbl_802ACC08_421998) /* 41EE90 802AA100 00220821 */ addu $at, $at, $v0 -/* 41EE94 802AA104 8C22CC08 */ lw $v0, %lo(D_802ACC08)($at) +/* 41EE94 802AA104 8C22CC08 */ lw $v0, %lo(jtbl_802ACC08_421998)($at) /* 41EE98 802AA108 00400008 */ jr $v0 -/* 41EE9C 802AA10C 00000000 */ nop +/* 41EE9C 802AA10C 00000000 */ nop +glabel L802AA110_41EEA0 /* 41EEA0 802AA110 82030210 */ lb $v1, 0x210($s0) /* 41EEA4 802AA114 38620006 */ xori $v0, $v1, 6 /* 41EEA8 802AA118 2C440001 */ sltiu $a0, $v0, 1 @@ -58,11 +59,11 @@ glabel func_802AA0B8 /* 41EF04 802AA174 24040001 */ addiu $a0, $zero, 1 .L802AA178: /* 41EF08 802AA178 10800005 */ beqz $a0, .L802AA190 -/* 41EF0C 802AA17C 00000000 */ nop +/* 41EF0C 802AA17C 00000000 */ nop /* 41EF10 802AA180 0C090464 */ jal func_80241190 /* 41EF14 802AA184 24040016 */ addiu $a0, $zero, 0x16 /* 41EF18 802AA188 080AA987 */ j .L802AA61C -/* 41EF1C 802AA18C 00000000 */ nop +/* 41EF1C 802AA18C 00000000 */ nop .L802AA190: /* 41EF20 802AA190 0C093903 */ jal func_8024E40C /* 41EF24 802AA194 24040002 */ addiu $a0, $zero, 2 @@ -88,9 +89,10 @@ glabel func_802AA0B8 /* 41EF74 802AA1E4 AE000054 */ sw $zero, 0x54($s0) /* 41EF78 802AA1E8 080AA987 */ j .L802AA61C /* 41EF7C 802AA1EC E6000020 */ swc1 $f0, 0x20($s0) +glabel L802AA1F0_41EF80 /* 41EF80 802AA1F0 86020070 */ lh $v0, 0x70($s0) /* 41EF84 802AA1F4 10400022 */ beqz $v0, .L802AA280 -/* 41EF88 802AA1F8 00000000 */ nop +/* 41EF88 802AA1F8 00000000 */ nop /* 41EF8C 802AA1FC C6000018 */ lwc1 $f0, 0x18($s0) /* 41EF90 802AA200 C6080144 */ lwc1 $f8, 0x144($s0) /* 41EF94 802AA204 C6020020 */ lwc1 $f2, 0x20($s0) @@ -98,7 +100,7 @@ glabel func_802AA0B8 /* 41EF9C 802AA20C C604014C */ lwc1 $f4, 0x14c($s0) /* 41EFA0 802AA210 46041081 */ sub.s $f2, $f2, $f4 /* 41EFA4 802AA214 44823000 */ mtc1 $v0, $f6 -/* 41EFA8 802AA218 00000000 */ nop +/* 41EFA8 802AA218 00000000 */ nop /* 41EFAC 802AA21C 468031A0 */ cvt.s.w $f6, $f6 /* 41EFB0 802AA220 46060003 */ div.s $f0, $f0, $f6 /* 41EFB4 802AA224 46004200 */ add.s $f8, $f8, $f0 @@ -119,7 +121,7 @@ glabel func_802AA0B8 /* 41EFF0 802AA260 86020070 */ lh $v0, 0x70($s0) /* 41EFF4 802AA264 46040001 */ sub.s $f0, $f0, $f4 /* 41EFF8 802AA268 44821000 */ mtc1 $v0, $f2 -/* 41EFFC 802AA26C 00000000 */ nop +/* 41EFFC 802AA26C 00000000 */ nop /* 41F000 802AA270 468010A0 */ cvt.s.w $f2, $f2 /* 41F004 802AA274 46020003 */ div.s $f0, $f0, $f2 /* 41F008 802AA278 46002100 */ add.s $f4, $f4, $f0 @@ -129,9 +131,9 @@ glabel func_802AA0B8 /* 41F014 802AA284 3C0140C9 */ lui $at, 0x40c9 /* 41F018 802AA288 34210FD0 */ ori $at, $at, 0xfd0 /* 41F01C 802AA28C 4481B000 */ mtc1 $at, $f22 -/* 41F020 802AA290 00000000 */ nop +/* 41F020 802AA290 00000000 */ nop /* 41F024 802AA294 46166302 */ mul.s $f12, $f12, $f22 -/* 41F028 802AA298 00000000 */ nop +/* 41F028 802AA298 00000000 */ nop /* 41F02C 802AA29C 3C0143B4 */ lui $at, 0x43b4 /* 41F030 802AA2A0 4481C000 */ mtc1 $at, $f24 /* 41F034 802AA2A4 3C014180 */ lui $at, 0x4180 @@ -139,7 +141,7 @@ glabel func_802AA0B8 /* 41F03C 802AA2AC 0C00A85B */ jal sin_rad /* 41F040 802AA2B0 46186303 */ div.s $f12, $f12, $f24 /* 41F044 802AA2B4 46140002 */ mul.s $f0, $f0, $f20 -/* 41F048 802AA2B8 00000000 */ nop +/* 41F048 802AA2B8 00000000 */ nop /* 41F04C 802AA2BC C602014C */ lwc1 $f2, 0x14c($s0) /* 41F050 802AA2C0 46001080 */ add.s $f2, $f2, $f0 /* 41F054 802AA2C4 C60C0054 */ lwc1 $f12, 0x54($s0) @@ -148,12 +150,12 @@ glabel func_802AA0B8 /* 41F060 802AA2D0 E602014C */ swc1 $f2, 0x14c($s0) /* 41F064 802AA2D4 C60C0054 */ lwc1 $f12, 0x54($s0) /* 41F068 802AA2D8 46166302 */ mul.s $f12, $f12, $f22 -/* 41F06C 802AA2DC 00000000 */ nop +/* 41F06C 802AA2DC 00000000 */ nop /* 41F070 802AA2E0 E600018C */ swc1 $f0, 0x18c($s0) /* 41F074 802AA2E4 0C00A85B */ jal sin_rad /* 41F078 802AA2E8 46186303 */ div.s $f12, $f12, $f24 /* 41F07C 802AA2EC 46140002 */ mul.s $f0, $f0, $f20 -/* 41F080 802AA2F0 00000000 */ nop +/* 41F080 802AA2F0 00000000 */ nop /* 41F084 802AA2F4 C622014C */ lwc1 $f2, 0x14c($s1) /* 41F088 802AA2F8 46001081 */ sub.s $f2, $f2, $f0 /* 41F08C 802AA2FC E622014C */ swc1 $f2, 0x14c($s1) @@ -195,6 +197,7 @@ glabel func_802AA0B8 /* 41F118 802AA388 3C030010 */ lui $v1, 0x10 /* 41F11C 802AA38C 00431025 */ or $v0, $v0, $v1 /* 41F120 802AA390 AC820000 */ sw $v0, ($a0) +glabel L802AA394_41F124 /* 41F124 802AA394 3C03800E */ lui $v1, %hi(gBattleStatus) /* 41F128 802AA398 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) /* 41F12C 802AA39C 8C620000 */ lw $v0, ($v1) @@ -267,19 +270,20 @@ glabel func_802AA0B8 /* 41F228 802AA498 3C01802B */ lui $at, %hi(D_802AD100) /* 41F22C 802AA49C AC22D100 */ sw $v0, %lo(D_802AD100)($at) /* 41F230 802AA4A0 0C0A8400 */ jal func_802A1000 -/* 41F234 802AA4A4 00000000 */ nop +/* 41F234 802AA4A4 00000000 */ nop /* 41F238 802AA4A8 24020008 */ addiu $v0, $zero, 8 /* 41F23C 802AA4AC 3C01802B */ lui $at, %hi(D_802ACC60) /* 41F240 802AA4B0 AC22CC60 */ sw $v0, %lo(D_802ACC60)($at) /* 41F244 802AA4B4 080AA985 */ j .L802AA614 /* 41F248 802AA4B8 24020001 */ addiu $v0, $zero, 1 +glabel L802AA4BC_41F24C /* 41F24C 802AA4BC 24040100 */ addiu $a0, $zero, 0x100 /* 41F250 802AA4C0 0000282D */ daddu $a1, $zero, $zero /* 41F254 802AA4C4 3C060020 */ lui $a2, 0x20 /* 41F258 802AA4C8 0C098F3F */ jal set_animation /* 41F25C 802AA4CC 34C60001 */ ori $a2, $a2, 1 /* 41F260 802AA4D0 0C0A846C */ jal func_802A11B0 -/* 41F264 802AA4D4 00000000 */ nop +/* 41F264 802AA4D4 00000000 */ nop /* 41F268 802AA4D8 3C11802B */ lui $s1, %hi(D_802ACC60) /* 41F26C 802AA4DC 2631CC60 */ addiu $s1, $s1, %lo(D_802ACC60) /* 41F270 802AA4E0 8E230000 */ lw $v1, ($s1) @@ -309,8 +313,9 @@ glabel func_802AA0B8 /* 41F2CC 802AA53C AC22CC6C */ sw $v0, %lo(D_802ACC6C)($at) /* 41F2D0 802AA540 080AA985 */ j .L802AA614 /* 41F2D4 802AA544 24020002 */ addiu $v0, $zero, 2 +glabel L802AA548_41F2D8 /* 41F2D8 802AA548 0C0A846C */ jal func_802A11B0 -/* 41F2DC 802AA54C 00000000 */ nop +/* 41F2DC 802AA54C 00000000 */ nop /* 41F2E0 802AA550 10400032 */ beqz $v0, .L802AA61C /* 41F2E4 802AA554 24040011 */ addiu $a0, $zero, 0x11 /* 41F2E8 802AA558 24020004 */ addiu $v0, $zero, 4 @@ -327,22 +332,25 @@ glabel func_802AA0B8 /* 41F314 802AA584 0C090464 */ jal func_80241190 /* 41F318 802AA588 AE430184 */ sw $v1, 0x184($s2) /* 41F31C 802AA58C 080AA987 */ j .L802AA61C -/* 41F320 802AA590 00000000 */ nop +/* 41F320 802AA590 00000000 */ nop +glabel L802AA594_41F324 /* 41F324 802AA594 0C0A8414 */ jal func_802A1050 -/* 41F328 802AA598 00000000 */ nop +/* 41F328 802AA598 00000000 */ nop /* 41F32C 802AA59C 24020001 */ addiu $v0, $zero, 1 /* 41F330 802AA5A0 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41F334 802AA5A4 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 41F338 802AA5A8 0C0AA82E */ jal func_802AA0B8 -/* 41F33C 802AA5AC 00000000 */ nop +/* 41F33C 802AA5AC 00000000 */ nop /* 41F340 802AA5B0 0C0AA82E */ jal func_802AA0B8 -/* 41F344 802AA5B4 00000000 */ nop +/* 41F344 802AA5B4 00000000 */ nop /* 41F348 802AA5B8 080AA987 */ j .L802AA61C -/* 41F34C 802AA5BC 00000000 */ nop +/* 41F34C 802AA5BC 00000000 */ nop +glabel L802AA5C0_41F350 /* 41F350 802AA5C0 0C0A842E */ jal func_802A10B8 -/* 41F354 802AA5C4 00000000 */ nop +/* 41F354 802AA5C4 00000000 */ nop /* 41F358 802AA5C8 080AA987 */ j .L802AA61C -/* 41F35C 802AA5CC 00000000 */ nop +/* 41F35C 802AA5CC 00000000 */ nop +glabel L802AA5D0_41F360 /* 41F360 802AA5D0 24040050 */ addiu $a0, $zero, 0x50 /* 41F364 802AA5D4 2405003C */ addiu $a1, $zero, 0x3c /* 41F368 802AA5D8 0C093E81 */ jal show_variable_battle_message @@ -352,8 +360,9 @@ glabel func_802AA0B8 /* 41F378 802AA5E8 A022D607 */ sb $v0, %lo(D_802AD607)($at) /* 41F37C 802AA5EC 080AA985 */ j .L802AA614 /* 41F380 802AA5F0 24020009 */ addiu $v0, $zero, 9 +glabel L802AA5F4_41F384 /* 41F384 802AA5F4 0C093EAD */ jal is_popup_displayed -/* 41F388 802AA5F8 00000000 */ nop +/* 41F388 802AA5F8 00000000 */ nop /* 41F38C 802AA5FC 14400007 */ bnez $v0, .L802AA61C /* 41F390 802AA600 24020001 */ addiu $v0, $zero, 1 /* 41F394 802AA604 3C01802B */ lui $at, %hi(D_802AD607) @@ -364,6 +373,7 @@ glabel func_802AA0B8 /* 41F3A4 802AA614 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41F3A8 802AA618 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) .L802AA61C: +glabel L802AA61C_41F3AC /* 41F3AC 802AA61C 8FBF001C */ lw $ra, 0x1c($sp) /* 41F3B0 802AA620 8FB20018 */ lw $s2, 0x18($sp) /* 41F3B4 802AA624 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_415D90/func_802AA640.s b/asm/nonmatchings/code_415D90/func_802AA640.s index f3c3dc8cea..c9893eef74 100644 --- a/asm/nonmatchings/code_415D90/func_802AA640.s +++ b/asm/nonmatchings/code_415D90/func_802AA640.s @@ -14,9 +14,9 @@ glabel func_802AA640 /* 41F3F4 802AA664 00220821 */ addu $at, $at, $v0 /* 41F3F8 802AA668 8C22CC38 */ lw $v0, %lo(D_802ACC38)($at) /* 41F3FC 802AA66C 00400008 */ jr $v0 -/* 41F400 802AA670 00000000 */ nop +/* 41F400 802AA670 00000000 */ nop /* 41F404 802AA674 0C0A8715 */ jal draw_battle_wheel -/* 41F408 802AA678 00000000 */ nop +/* 41F408 802AA678 00000000 */ nop .L802AA67C: /* 41F40C 802AA67C 8FBF0010 */ lw $ra, 0x10($sp) /* 41F410 802AA680 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_415D90/func_802AACD8.s b/asm/nonmatchings/code_415D90/func_802AACD8.s index c31deb308c..17c08f9ffa 100644 --- a/asm/nonmatchings/code_415D90/func_802AACD8.s +++ b/asm/nonmatchings/code_415D90/func_802AACD8.s @@ -21,11 +21,11 @@ glabel func_802AACD8 /* 41FAA8 802AAD18 F7B40090 */ sdc1 $f20, 0x90($sp) /* 41FAAC 802AAD1C 00431024 */ and $v0, $v0, $v1 /* 41FAB0 802AAD20 14400005 */ bnez $v0, .L802AAD38 -/* 41FAB4 802AAD24 00000000 */ nop +/* 41FAB4 802AAD24 00000000 */ nop /* 41FAB8 802AAD28 3C16800E */ lui $s6, %hi(gBattleStatus+0xD8) /* 41FABC 802AAD2C 8ED6C148 */ lw $s6, %lo(gBattleStatus+0xD8)($s6) /* 41FAC0 802AAD30 080AAB50 */ j .L802AAD40 -/* 41FAC4 802AAD34 00000000 */ nop +/* 41FAC4 802AAD34 00000000 */ nop .L802AAD38: /* 41FAC8 802AAD38 3C16800E */ lui $s6, %hi(gBattleStatus+0xDC) /* 41FACC 802AAD3C 8ED6C14C */ lw $s6, %lo(gBattleStatus+0xDC)($s6) @@ -42,7 +42,7 @@ glabel func_802AACD8 /* 41FAF4 802AAD64 8C42C1F4 */ lw $v0, %lo(gBattleStatus+0x184)($v0) /* 41FAF8 802AAD68 30420001 */ andi $v0, $v0, 1 /* 41FAFC 802AAD6C 10400045 */ beqz $v0, .L802AAE84 -/* 41FB00 802AAD70 00000000 */ nop +/* 41FB00 802AAD70 00000000 */ nop /* 41FB04 802AAD74 8FA90060 */ lw $t1, 0x60($sp) /* 41FB08 802AAD78 02E91021 */ addu $v0, $s7, $t1 /* 41FB0C 802AAD7C 80430000 */ lb $v1, ($v0) @@ -59,15 +59,15 @@ glabel func_802AACD8 /* 41FB38 802AADA8 86240006 */ lh $a0, 6($s1) /* 41FB3C 802AADAC 8C420000 */ lw $v0, ($v0) /* 41FB40 802AADB0 4483B000 */ mtc1 $v1, $f22 -/* 41FB44 802AADB4 00000000 */ nop +/* 41FB44 802AADB4 00000000 */ nop /* 41FB48 802AADB8 4680B5A0 */ cvt.s.w $f22, $f22 /* 41FB4C 802AADBC 4484C000 */ mtc1 $a0, $f24 -/* 41FB50 802AADC0 00000000 */ nop +/* 41FB50 802AADC0 00000000 */ nop /* 41FB54 802AADC4 4680C620 */ cvt.s.w $f24, $f24 /* 41FB58 802AADC8 86230008 */ lh $v1, 8($s1) /* 41FB5C 802AADCC 30420800 */ andi $v0, $v0, 0x800 /* 41FB60 802AADD0 4483A000 */ mtc1 $v1, $f20 -/* 41FB64 802AADD4 00000000 */ nop +/* 41FB64 802AADD4 00000000 */ nop /* 41FB68 802AADD8 4680A520 */ cvt.s.w $f20, $f20 /* 41FB6C 802AADDC 10400008 */ beqz $v0, .L802AAE00 /* 41FB70 802AADE0 24140010 */ addiu $s4, $zero, 0x10 @@ -77,7 +77,7 @@ glabel func_802AACD8 /* 41FB80 802AADF0 3C058008 */ lui $a1, %hi(D_80080208) /* 41FB84 802AADF4 24A50208 */ addiu $a1, $a1, %lo(D_80080208) /* 41FB88 802AADF8 080AAB86 */ j .L802AAE18 -/* 41FB8C 802AADFC 00000000 */ nop +/* 41FB8C 802AADFC 00000000 */ nop .L802AAE00: /* 41FB90 802AAE00 24140005 */ addiu $s4, $zero, 5 /* 41FB94 802AAE04 2413FFF5 */ addiu $s3, $zero, -0xb @@ -113,7 +113,7 @@ glabel func_802AACD8 /* 41FC04 802AAE74 0C0513AC */ jal icon_set_opacity /* 41FC08 802AAE78 0200202D */ daddu $a0, $s0, $zero /* 41FC0C 802AAE7C 080AABED */ j .L802AAFB4 -/* 41FC10 802AAE80 00000000 */ nop +/* 41FC10 802AAE80 00000000 */ nop .L802AAE84: /* 41FC14 802AAE84 1920004B */ blez $t1, .L802AAFB4 /* 41FC18 802AAE88 0000902D */ daddu $s2, $zero, $zero @@ -136,15 +136,15 @@ glabel func_802AACD8 /* 41FC58 802AAEC8 86240006 */ lh $a0, 6($s1) /* 41FC5C 802AAECC 8C420000 */ lw $v0, ($v0) /* 41FC60 802AAED0 4483B000 */ mtc1 $v1, $f22 -/* 41FC64 802AAED4 00000000 */ nop +/* 41FC64 802AAED4 00000000 */ nop /* 41FC68 802AAED8 4680B5A0 */ cvt.s.w $f22, $f22 /* 41FC6C 802AAEDC 4484C000 */ mtc1 $a0, $f24 -/* 41FC70 802AAEE0 00000000 */ nop +/* 41FC70 802AAEE0 00000000 */ nop /* 41FC74 802AAEE4 4680C620 */ cvt.s.w $f24, $f24 /* 41FC78 802AAEE8 86230008 */ lh $v1, 8($s1) /* 41FC7C 802AAEEC 30420800 */ andi $v0, $v0, 0x800 /* 41FC80 802AAEF0 4483A000 */ mtc1 $v1, $f20 -/* 41FC84 802AAEF4 00000000 */ nop +/* 41FC84 802AAEF4 00000000 */ nop /* 41FC88 802AAEF8 4680A520 */ cvt.s.w $f20, $f20 /* 41FC8C 802AAEFC 1040000A */ beqz $v0, .L802AAF28 /* 41FC90 802AAF00 24140010 */ addiu $s4, $zero, 0x10 @@ -167,7 +167,7 @@ glabel func_802AACD8 /* 41FCD0 802AAF40 0200202D */ daddu $a0, $s0, $zero .L802AAF44: /* 41FCD4 802AAF44 0C0511FF */ jal set_menu_icon_script -/* 41FCD8 802AAF48 00000000 */ nop +/* 41FCD8 802AAF48 00000000 */ nop .L802AAF4C: /* 41FCDC 802AAF4C 24040001 */ addiu $a0, $zero, 1 /* 41FCE0 802AAF50 02449021 */ addu $s2, $s2, $a0 @@ -216,7 +216,7 @@ glabel func_802AACD8 /* 41FD84 802AAFF4 24020001 */ addiu $v0, $zero, 1 /* 41FD88 802AAFF8 8FA9005C */ lw $t1, 0x5c($sp) /* 41FD8C 802AAFFC 15220026 */ bne $t1, $v0, .L802AB098 -/* 41FD90 802AB000 00000000 */ nop +/* 41FD90 802AB000 00000000 */ nop .L802AB004: /* 41FD94 802AB004 86230000 */ lh $v1, ($s1) /* 41FD98 802AB008 14600004 */ bnez $v1, .L802AB01C @@ -249,14 +249,14 @@ glabel func_802AACD8 /* 41FDFC 802AB06C 8C420008 */ lw $v0, 8($v0) /* 41FE00 802AB070 8C440020 */ lw $a0, 0x20($v0) /* 41FE04 802AB074 1480001E */ bnez $a0, .L802AB0F0 -/* 41FE08 802AB078 00000000 */ nop +/* 41FE08 802AB078 00000000 */ nop /* 41FE0C 802AB07C 92020136 */ lbu $v0, 0x136($s0) /* 41FE10 802AB080 00021080 */ sll $v0, $v0, 2 /* 41FE14 802AB084 3C048028 */ lui $a0, %hi(D_80281104) /* 41FE18 802AB088 00822021 */ addu $a0, $a0, $v0 /* 41FE1C 802AB08C 8C841104 */ lw $a0, %lo(D_80281104)($a0) /* 41FE20 802AB090 080AAC3C */ j .L802AB0F0 -/* 41FE24 802AB094 00000000 */ nop +/* 41FE24 802AB094 00000000 */ nop .L802AB098: /* 41FE28 802AB098 8FA90060 */ lw $t1, 0x60($sp) /* 41FE2C 802AB09C 02E91021 */ addu $v0, $s7, $t1 @@ -328,7 +328,7 @@ glabel func_802AACD8 /* 41FF28 802AB198 8FA9005C */ lw $t1, 0x5c($sp) /* 41FF2C 802AB19C 24020001 */ addiu $v0, $zero, 1 /* 41FF30 802AB1A0 15220032 */ bne $t1, $v0, .L802AB26C -/* 41FF34 802AB1A4 00000000 */ nop +/* 41FF34 802AB1A4 00000000 */ nop .L802AB1A8: /* 41FF38 802AB1A8 86230000 */ lh $v1, ($s1) /* 41FF3C 802AB1AC 14600004 */ bnez $v1, .L802AB1C0 @@ -421,7 +421,7 @@ glabel func_802AACD8 /* 420078 802AB2E8 01052821 */ addu $a1, $t0, $a1 .L802AB2EC: /* 42007C 802AB2EC 0C04993B */ jal draw_string -/* 420080 802AB2F0 00000000 */ nop +/* 420080 802AB2F0 00000000 */ nop .L802AB2F4: /* 420084 802AB2F4 8FBF008C */ lw $ra, 0x8c($sp) /* 420088 802AB2F8 8FBE0088 */ lw $fp, 0x88($sp) diff --git a/asm/nonmatchings/code_415D90/func_802AB330.s b/asm/nonmatchings/code_415D90/func_802AB330.s index c477ccdf70..7499f325e9 100644 --- a/asm/nonmatchings/code_415D90/func_802AB330.s +++ b/asm/nonmatchings/code_415D90/func_802AB330.s @@ -3,4 +3,4 @@ glabel func_802AB330 /* 4200C0 802AB330 03E00008 */ jr $ra -/* 4200C4 802AB334 00000000 */ nop +/* 4200C4 802AB334 00000000 */ nop diff --git a/asm/nonmatchings/code_415D90/func_802AB338.s b/asm/nonmatchings/code_415D90/func_802AB338.s index 3978b7956e..d43741f176 100644 --- a/asm/nonmatchings/code_415D90/func_802AB338.s +++ b/asm/nonmatchings/code_415D90/func_802AB338.s @@ -3,4 +3,4 @@ glabel func_802AB338 /* 4200C8 802AB338 03E00008 */ jr $ra -/* 4200CC 802AB33C 00000000 */ nop +/* 4200CC 802AB33C 00000000 */ nop diff --git a/asm/nonmatchings/code_415D90/update_partner_menu.s b/asm/nonmatchings/code_415D90/update_partner_menu.s index be3d1b70a6..0fe1f2a0dd 100644 --- a/asm/nonmatchings/code_415D90/update_partner_menu.s +++ b/asm/nonmatchings/code_415D90/update_partner_menu.s @@ -34,11 +34,11 @@ glabel update_partner_menu /* 41CFCC 802A823C 0C0A9634 */ jal func_802A58D0 /* 41CFD0 802A8240 AE800188 */ sw $zero, 0x188($s4) /* 41CFD4 802A8244 14400005 */ bnez $v0, .L802A825C -/* 41CFD8 802A8248 00000000 */ nop +/* 41CFD8 802A8248 00000000 */ nop /* 41CFDC 802A824C 0C090464 */ jal func_80241190 /* 41CFE0 802A8250 24040009 */ addiu $a0, $zero, 9 /* 41CFE4 802A8254 080AA0B8 */ j .L802A82E0 -/* 41CFE8 802A8258 00000000 */ nop +/* 41CFE8 802A8258 00000000 */ nop .L802A825C: /* 41CFEC 802A825C 0C093903 */ jal func_8024E40C /* 41CFF0 802A8260 24040002 */ addiu $a0, $zero, 2 @@ -81,10 +81,10 @@ glabel update_partner_menu /* 41D078 802A82E8 8E230000 */ lw $v1, ($s1) /* 41D07C 802A82EC 2402012D */ addiu $v0, $zero, 0x12d /* 41D080 802A82F0 1462006C */ bne $v1, $v0, .L802A84A4 -/* 41D084 802A82F4 00000000 */ nop +/* 41D084 802A82F4 00000000 */ nop /* 41D088 802A82F8 86020070 */ lh $v0, 0x70($s0) /* 41D08C 802A82FC 10400022 */ beqz $v0, .L802A8388 -/* 41D090 802A8300 00000000 */ nop +/* 41D090 802A8300 00000000 */ nop /* 41D094 802A8304 C6000018 */ lwc1 $f0, 0x18($s0) /* 41D098 802A8308 C6080144 */ lwc1 $f8, 0x144($s0) /* 41D09C 802A830C C6020020 */ lwc1 $f2, 0x20($s0) @@ -92,7 +92,7 @@ glabel update_partner_menu /* 41D0A4 802A8314 C604014C */ lwc1 $f4, 0x14c($s0) /* 41D0A8 802A8318 46041081 */ sub.s $f2, $f2, $f4 /* 41D0AC 802A831C 44823000 */ mtc1 $v0, $f6 -/* 41D0B0 802A8320 00000000 */ nop +/* 41D0B0 802A8320 00000000 */ nop /* 41D0B4 802A8324 468031A0 */ cvt.s.w $f6, $f6 /* 41D0B8 802A8328 46060003 */ div.s $f0, $f0, $f6 /* 41D0BC 802A832C 46004200 */ add.s $f8, $f8, $f0 @@ -113,7 +113,7 @@ glabel update_partner_menu /* 41D0F8 802A8368 86020070 */ lh $v0, 0x70($s0) /* 41D0FC 802A836C 46040001 */ sub.s $f0, $f0, $f4 /* 41D100 802A8370 44821000 */ mtc1 $v0, $f2 -/* 41D104 802A8374 00000000 */ nop +/* 41D104 802A8374 00000000 */ nop /* 41D108 802A8378 468010A0 */ cvt.s.w $f2, $f2 /* 41D10C 802A837C 46020003 */ div.s $f0, $f0, $f2 /* 41D110 802A8380 46002100 */ add.s $f4, $f4, $f0 @@ -123,9 +123,9 @@ glabel update_partner_menu /* 41D11C 802A838C 3C0140C9 */ lui $at, 0x40c9 /* 41D120 802A8390 34210FD0 */ ori $at, $at, 0xfd0 /* 41D124 802A8394 4481B000 */ mtc1 $at, $f22 -/* 41D128 802A8398 00000000 */ nop +/* 41D128 802A8398 00000000 */ nop /* 41D12C 802A839C 46166302 */ mul.s $f12, $f12, $f22 -/* 41D130 802A83A0 00000000 */ nop +/* 41D130 802A83A0 00000000 */ nop /* 41D134 802A83A4 3C0143B4 */ lui $at, 0x43b4 /* 41D138 802A83A8 4481C000 */ mtc1 $at, $f24 /* 41D13C 802A83AC 3C014180 */ lui $at, 0x4180 @@ -133,7 +133,7 @@ glabel update_partner_menu /* 41D144 802A83B4 0C00A85B */ jal sin_rad /* 41D148 802A83B8 46186303 */ div.s $f12, $f12, $f24 /* 41D14C 802A83BC 46140002 */ mul.s $f0, $f0, $f20 -/* 41D150 802A83C0 00000000 */ nop +/* 41D150 802A83C0 00000000 */ nop /* 41D154 802A83C4 C602014C */ lwc1 $f2, 0x14c($s0) /* 41D158 802A83C8 46001080 */ add.s $f2, $f2, $f0 /* 41D15C 802A83CC C60C0054 */ lwc1 $f12, 0x54($s0) @@ -142,12 +142,12 @@ glabel update_partner_menu /* 41D168 802A83D8 E602014C */ swc1 $f2, 0x14c($s0) /* 41D16C 802A83DC C60C0054 */ lwc1 $f12, 0x54($s0) /* 41D170 802A83E0 46166302 */ mul.s $f12, $f12, $f22 -/* 41D174 802A83E4 00000000 */ nop +/* 41D174 802A83E4 00000000 */ nop /* 41D178 802A83E8 E600018C */ swc1 $f0, 0x18c($s0) /* 41D17C 802A83EC 0C00A85B */ jal sin_rad /* 41D180 802A83F0 46186303 */ div.s $f12, $f12, $f24 /* 41D184 802A83F4 46140002 */ mul.s $f0, $f0, $f20 -/* 41D188 802A83F8 00000000 */ nop +/* 41D188 802A83F8 00000000 */ nop /* 41D18C 802A83FC C662014C */ lwc1 $f2, 0x14c($s3) /* 41D190 802A8400 46001081 */ sub.s $f2, $f2, $f0 /* 41D194 802A8404 E662014C */ swc1 $f2, 0x14c($s3) @@ -198,11 +198,12 @@ glabel update_partner_menu /* 41D240 802A84B0 2C62012D */ sltiu $v0, $v1, 0x12d /* 41D244 802A84B4 1040057D */ beqz $v0, .L802A9AAC /* 41D248 802A84B8 00031080 */ sll $v0, $v1, 2 -/* 41D24C 802A84BC 3C01802B */ lui $at, %hi(D_802AC3C8) +/* 41D24C 802A84BC 3C01802B */ lui $at, %hi(jtbl_802AC3C8_421158) /* 41D250 802A84C0 00220821 */ addu $at, $at, $v0 -/* 41D254 802A84C4 8C22C3C8 */ lw $v0, %lo(D_802AC3C8)($at) +/* 41D254 802A84C4 8C22C3C8 */ lw $v0, %lo(jtbl_802AC3C8_421158)($at) /* 41D258 802A84C8 00400008 */ jr $v0 -/* 41D25C 802A84CC 00000000 */ nop +/* 41D25C 802A84CC 00000000 */ nop +glabel L802A84D0_41D260 /* 41D260 802A84D0 3C03FBFF */ lui $v1, 0xfbff /* 41D264 802A84D4 3463FFFF */ ori $v1, $v1, 0xffff /* 41D268 802A84D8 8E020000 */ lw $v0, ($s0) @@ -224,9 +225,9 @@ glabel update_partner_menu /* 41D2A8 802A8518 A282005C */ sb $v0, 0x5c($s4) .L802A851C: /* 41D2AC 802A851C 0C098E45 */ jal func_80263914 -/* 41D2B0 802A8520 00000000 */ nop +/* 41D2B0 802A8520 00000000 */ nop /* 41D2B4 802A8524 0C098C9A */ jal func_80263268 -/* 41D2B8 802A8528 00000000 */ nop +/* 41D2B8 802A8528 00000000 */ nop /* 41D2BC 802A852C 24040007 */ addiu $a0, $zero, 7 /* 41D2C0 802A8530 3C13802B */ lui $s3, %hi(D_802AD0D0) /* 41D2C4 802A8534 2673D0D0 */ addiu $s3, $s3, %lo(D_802AD0D0) @@ -294,7 +295,7 @@ glabel update_partner_menu /* 41D3B0 802A8620 96820070 */ lhu $v0, 0x70($s4) /* 41D3B4 802A8624 30420040 */ andi $v0, $v0, 0x40 /* 41D3B8 802A8628 1440000B */ bnez $v0, .L802A8658 -/* 41D3BC 802A862C 00000000 */ nop +/* 41D3BC 802A862C 00000000 */ nop /* 41D3C0 802A8630 82E30012 */ lb $v1, 0x12($s7) /* 41D3C4 802A8634 00031080 */ sll $v0, $v1, 2 /* 41D3C8 802A8638 00431021 */ addu $v0, $v0, $v1 @@ -355,19 +356,19 @@ glabel update_partner_menu /* 41D490 802A8700 3C01802B */ lui $at, %hi(D_802AD100) /* 41D494 802A8704 AC22D100 */ sw $v0, %lo(D_802AD100)($at) /* 41D498 802A8708 0C0A9606 */ jal can_switch_to_player -/* 41D49C 802A870C 00000000 */ nop +/* 41D49C 802A870C 00000000 */ nop /* 41D4A0 802A8710 10400005 */ beqz $v0, .L802A8728 -/* 41D4A4 802A8714 00000000 */ nop +/* 41D4A4 802A8714 00000000 */ nop /* 41D4A8 802A8718 3C01802B */ lui $at, %hi(D_802AD104) /* 41D4AC 802A871C AC30D104 */ sw $s0, %lo(D_802AD104)($at) /* 41D4B0 802A8720 080AA1CC */ j .L802A8730 -/* 41D4B4 802A8724 00000000 */ nop +/* 41D4B4 802A8724 00000000 */ nop .L802A8728: /* 41D4B8 802A8728 3C01802B */ lui $at, %hi(D_802AD104) /* 41D4BC 802A872C AC20D104 */ sw $zero, %lo(D_802AD104)($at) .L802A8730: /* 41D4C0 802A8730 0C0A8400 */ jal func_802A1000 -/* 41D4C4 802A8734 00000000 */ nop +/* 41D4C4 802A8734 00000000 */ nop /* 41D4C8 802A8738 24020008 */ addiu $v0, $zero, 8 /* 41D4CC 802A873C 3C01802B */ lui $at, %hi(D_802ACC60) /* 41D4D0 802A8740 AC22CC60 */ sw $v0, %lo(D_802ACC60)($at) @@ -375,6 +376,7 @@ glabel update_partner_menu /* 41D4D8 802A8748 AC20CC6C */ sw $zero, %lo(D_802ACC6C)($at) /* 41D4DC 802A874C 080AA6A9 */ j .L802A9AA4 /* 41D4E0 802A8750 24020002 */ addiu $v0, $zero, 2 +glabel L802A8754_41D4E4 /* 41D4E4 802A8754 82E20012 */ lb $v0, 0x12($s7) /* 41D4E8 802A8758 24040100 */ addiu $a0, $zero, 0x100 /* 41D4EC 802A875C 00021080 */ sll $v0, $v0, 2 @@ -386,8 +388,9 @@ glabel update_partner_menu /* 41D504 802A8774 24020003 */ addiu $v0, $zero, 3 /* 41D508 802A8778 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41D50C 802A877C AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) +glabel L802A8780_41D510 /* 41D510 802A8780 0C0A846C */ jal func_802A11B0 -/* 41D514 802A8784 00000000 */ nop +/* 41D514 802A8784 00000000 */ nop /* 41D518 802A8788 3C04802B */ lui $a0, %hi(D_802ACC6C) /* 41D51C 802A878C 2484CC6C */ addiu $a0, $a0, %lo(D_802ACC6C) /* 41D520 802A8790 8C830000 */ lw $v1, ($a0) @@ -402,17 +405,17 @@ glabel update_partner_menu /* 41D540 802A87B0 3C030200 */ lui $v1, 0x200 /* 41D544 802A87B4 00431024 */ and $v0, $v0, $v1 /* 41D548 802A87B8 1440001E */ bnez $v0, .L802A8834 -/* 41D54C 802A87BC 00000000 */ nop +/* 41D54C 802A87BC 00000000 */ nop /* 41D550 802A87C0 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 41D554 802A87C4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 41D558 802A87C8 8C420010 */ lw $v0, 0x10($v0) /* 41D55C 802A87CC 30422000 */ andi $v0, $v0, 0x2000 /* 41D560 802A87D0 10400018 */ beqz $v0, .L802A8834 -/* 41D564 802A87D4 00000000 */ nop +/* 41D564 802A87D4 00000000 */ nop /* 41D568 802A87D8 0C0A9606 */ jal can_switch_to_player -/* 41D56C 802A87DC 00000000 */ nop +/* 41D56C 802A87DC 00000000 */ nop /* 41D570 802A87E0 10400010 */ beqz $v0, .L802A8824 -/* 41D574 802A87E4 00000000 */ nop +/* 41D574 802A87E4 00000000 */ nop /* 41D578 802A87E8 0C05272D */ jal play_sound /* 41D57C 802A87EC 2404000F */ addiu $a0, $zero, 0xf /* 41D580 802A87F0 3C02802B */ lui $v0, %hi(D_802AD002) @@ -427,7 +430,7 @@ glabel update_partner_menu /* 41D5A4 802A8814 0C0A842E */ jal func_802A10B8 /* 41D5A8 802A8818 A282005C */ sb $v0, 0x5c($s4) /* 41D5AC 802A881C 080AA5DD */ j .L802A9774 -/* 41D5B0 802A8820 00000000 */ nop +/* 41D5B0 802A8820 00000000 */ nop .L802A8824: /* 41D5B4 802A8824 0C05272D */ jal play_sound /* 41D5B8 802A8828 2404021D */ addiu $a0, $zero, 0x21d @@ -489,8 +492,9 @@ glabel update_partner_menu /* 41D67C 802A88EC A685006E */ sh $a1, 0x6e($s4) /* 41D680 802A88F0 080AA6A9 */ j .L802A9AA4 /* 41D684 802A88F4 24020004 */ addiu $v0, $zero, 4 +glabel L802A88F8_41D688 /* 41D688 802A88F8 0C0A846C */ jal func_802A11B0 -/* 41D68C 802A88FC 00000000 */ nop +/* 41D68C 802A88FC 00000000 */ nop /* 41D690 802A8900 8E830214 */ lw $v1, 0x214($s4) /* 41D694 802A8904 30634000 */ andi $v1, $v1, 0x4000 /* 41D698 802A8908 10600007 */ beqz $v1, .L802A8928 @@ -498,7 +502,7 @@ glabel update_partner_menu /* 41D6A0 802A8910 16000007 */ bnez $s0, .L802A8930 /* 41D6A4 802A8914 24040011 */ addiu $a0, $zero, 0x11 /* 41D6A8 802A8918 0C0A841E */ jal func_802A1078 -/* 41D6AC 802A891C 00000000 */ nop +/* 41D6AC 802A891C 00000000 */ nop /* 41D6B0 802A8920 080AA6A9 */ j .L802A9AA4 /* 41D6B4 802A8924 24020005 */ addiu $v0, $zero, 5 .L802A8928: @@ -513,8 +517,9 @@ glabel update_partner_menu /* 41D6D4 802A8944 A682017C */ sh $v0, 0x17c($s4) /* 41D6D8 802A8948 080AA34A */ j .L802A8D28 /* 41D6DC 802A894C A680017A */ sh $zero, 0x17a($s4) +glabel L802A8950_41D6E0 /* 41D6E0 802A8950 0C0A846C */ jal func_802A11B0 -/* 41D6E4 802A8954 00000000 */ nop +/* 41D6E4 802A8954 00000000 */ nop /* 41D6E8 802A8958 10400454 */ beqz $v0, .L802A9AAC /* 41D6EC 802A895C 24020008 */ addiu $v0, $zero, 8 /* 41D6F0 802A8960 3C01802B */ lui $at, %hi(D_802ACC60) @@ -524,12 +529,14 @@ glabel update_partner_menu /* 41D700 802A8970 AC22CC6C */ sw $v0, %lo(D_802ACC6C)($at) /* 41D704 802A8974 080AA6A9 */ j .L802A9AA4 /* 41D708 802A8978 24020002 */ addiu $v0, $zero, 2 +glabel L802A897C_41D70C /* 41D70C 802A897C 0C0A841E */ jal func_802A1078 -/* 41D710 802A8980 00000000 */ nop +/* 41D710 802A8980 00000000 */ nop /* 41D714 802A8984 080AA6A9 */ j .L802A9AA4 /* 41D718 802A8988 24020005 */ addiu $v0, $zero, 5 +glabel L802A898C_41D71C /* 41D71C 802A898C 0C0A9606 */ jal can_switch_to_player -/* 41D720 802A8990 00000000 */ nop +/* 41D720 802A8990 00000000 */ nop /* 41D724 802A8994 14400002 */ bnez $v0, .L802A89A0 /* 41D728 802A8998 24040050 */ addiu $a0, $zero, 0x50 /* 41D72C 802A899C 24040051 */ addiu $a0, $zero, 0x51 @@ -542,8 +549,9 @@ glabel update_partner_menu /* 41D744 802A89B4 A022D607 */ sb $v0, %lo(D_802AD607)($at) /* 41D748 802A89B8 080AA6A9 */ j .L802A9AA4 /* 41D74C 802A89BC 24020009 */ addiu $v0, $zero, 9 +glabel L802A89C0_41D750 /* 41D750 802A89C0 0C093EAD */ jal is_popup_displayed -/* 41D754 802A89C4 00000000 */ nop +/* 41D754 802A89C4 00000000 */ nop /* 41D758 802A89C8 14400438 */ bnez $v0, .L802A9AAC /* 41D75C 802A89CC 24020004 */ addiu $v0, $zero, 4 /* 41D760 802A89D0 3C01802B */ lui $at, %hi(D_802ACC6C) @@ -554,6 +562,7 @@ glabel update_partner_menu /* 41D774 802A89E4 A020D607 */ sb $zero, %lo(D_802AD607)($at) /* 41D778 802A89E8 080AA6A9 */ j .L802A9AA4 /* 41D77C 802A89EC 24020002 */ addiu $v0, $zero, 2 +glabel L802A89F0_41D780 /* 41D780 802A89F0 9282020E */ lbu $v0, 0x20e($s4) /* 41D784 802A89F4 1040007A */ beqz $v0, .L802A8BE0 /* 41D788 802A89F8 0000882D */ daddu $s1, $zero, $zero @@ -606,7 +615,7 @@ glabel update_partner_menu /* 41D834 802A8AA4 AC820000 */ sw $v0, ($a0) /* 41D838 802A8AA8 80A201F6 */ lb $v0, 0x1f6($a1) /* 41D83C 802A8AAC 14400009 */ bnez $v0, .L802A8AD4 -/* 41D840 802A8AB0 00000000 */ nop +/* 41D840 802A8AB0 00000000 */ nop /* 41D844 802A8AB4 82E20012 */ lb $v0, 0x12($s7) /* 41D848 802A8AB8 00021880 */ sll $v1, $v0, 2 /* 41D84C 802A8ABC 00621821 */ addu $v1, $v1, $v0 @@ -699,11 +708,12 @@ glabel update_partner_menu /* 41D994 802A8C04 3C01802B */ lui $at, %hi(D_802AD4A8) /* 41D998 802A8C08 AC31D4A8 */ sw $s1, %lo(D_802AD4A8)($at) /* 41D99C 802A8C0C 0C0A89A1 */ jal func_802A2684 -/* 41D9A0 802A8C10 00000000 */ nop +/* 41D9A0 802A8C10 00000000 */ nop /* 41D9A4 802A8C14 080AA6A9 */ j .L802A9AA4 /* 41D9A8 802A8C18 2402000B */ addiu $v0, $zero, 0xb +glabel L802A8C1C_41D9AC /* 41D9AC 802A8C1C 0C0A8B21 */ jal func_802A2C84 -/* 41D9B0 802A8C20 00000000 */ nop +/* 41D9B0 802A8C20 00000000 */ nop /* 41D9B4 802A8C24 0040802D */ daddu $s0, $v0, $zero /* 41D9B8 802A8C28 2402FFFF */ addiu $v0, $zero, -1 /* 41D9BC 802A8C2C 1202039D */ beq $s0, $v0, .L802A9AA4 @@ -713,7 +723,7 @@ glabel update_partner_menu /* 41D9CC 802A8C3C 5602000B */ bnel $s0, $v0, .L802A8C6C /* 41D9D0 802A8C40 2602FFFF */ addiu $v0, $s0, -1 /* 41D9D4 802A8C44 0C0A8414 */ jal func_802A1050 -/* 41D9D8 802A8C48 00000000 */ nop +/* 41D9D8 802A8C48 00000000 */ nop /* 41D9DC 802A8C4C 24020008 */ addiu $v0, $zero, 8 /* 41D9E0 802A8C50 3C01802B */ lui $at, %hi(D_802ACC60) /* 41D9E4 802A8C54 AC22CC60 */ sw $v0, %lo(D_802ACC60)($at) @@ -726,26 +736,27 @@ glabel update_partner_menu /* 41D9FC 802A8C6C 0C0A89F4 */ jal func_802A27D0 /* 41DA00 802A8C70 A282004B */ sb $v0, 0x4b($s4) /* 41DA04 802A8C74 0C0A840C */ jal func_802A1030 -/* 41DA08 802A8C78 00000000 */ nop +/* 41DA08 802A8C78 00000000 */ nop /* 41DA0C 802A8C7C 080AA6A9 */ j .L802A9AA4 /* 41DA10 802A8C80 2402000C */ addiu $v0, $zero, 0xc +glabel L802A8C84_41DA14 /* 41DA14 802A8C84 0C0A8B21 */ jal func_802A2C84 -/* 41DA18 802A8C88 00000000 */ nop +/* 41DA18 802A8C88 00000000 */ nop /* 41DA1C 802A8C8C 8E830214 */ lw $v1, 0x214($s4) /* 41DA20 802A8C90 30634000 */ andi $v1, $v1, 0x4000 /* 41DA24 802A8C94 10600009 */ beqz $v1, .L802A8CBC /* 41DA28 802A8C98 0040802D */ daddu $s0, $v0, $zero /* 41DA2C 802A8C9C 16000007 */ bnez $s0, .L802A8CBC -/* 41DA30 802A8CA0 00000000 */ nop +/* 41DA30 802A8CA0 00000000 */ nop /* 41DA34 802A8CA4 0C0A8AAE */ jal func_802A2AB8 -/* 41DA38 802A8CA8 00000000 */ nop +/* 41DA38 802A8CA8 00000000 */ nop /* 41DA3C 802A8CAC 0C0A8426 */ jal func_802A1098 -/* 41DA40 802A8CB0 00000000 */ nop +/* 41DA40 802A8CB0 00000000 */ nop /* 41DA44 802A8CB4 080AA6A9 */ j .L802A9AA4 /* 41DA48 802A8CB8 2402000D */ addiu $v0, $zero, 0xd .L802A8CBC: /* 41DA4C 802A8CBC 0C0A846C */ jal func_802A11B0 -/* 41DA50 802A8CC0 00000000 */ nop +/* 41DA50 802A8CC0 00000000 */ nop /* 41DA54 802A8CC4 10400379 */ beqz $v0, .L802A9AAC /* 41DA58 802A8CC8 24030006 */ addiu $v1, $zero, 6 /* 41DA5C 802A8CCC 8282004B */ lb $v0, 0x4b($s4) @@ -775,28 +786,32 @@ glabel update_partner_menu /* 41DAB8 802A8D28 0C090464 */ jal func_80241190 /* 41DABC 802A8D2C AE830184 */ sw $v1, 0x184($s4) /* 41DAC0 802A8D30 080AA6AB */ j .L802A9AAC -/* 41DAC4 802A8D34 00000000 */ nop +/* 41DAC4 802A8D34 00000000 */ nop +glabel L802A8D38_41DAC8 /* 41DAC8 802A8D38 0C0A8B21 */ jal func_802A2C84 -/* 41DACC 802A8D3C 00000000 */ nop +/* 41DACC 802A8D3C 00000000 */ nop /* 41DAD0 802A8D40 0C0A846C */ jal func_802A11B0 -/* 41DAD4 802A8D44 00000000 */ nop +/* 41DAD4 802A8D44 00000000 */ nop /* 41DAD8 802A8D48 10400358 */ beqz $v0, .L802A9AAC /* 41DADC 802A8D4C 2402000B */ addiu $v0, $zero, 0xb /* 41DAE0 802A8D50 080AA6A9 */ j .L802A9AA4 -/* 41DAE4 802A8D54 00000000 */ nop +/* 41DAE4 802A8D54 00000000 */ nop +glabel L802A8D58_41DAE8 /* 41DAE8 802A8D58 0C0A8AAE */ jal func_802A2AB8 -/* 41DAEC 802A8D5C 00000000 */ nop +/* 41DAEC 802A8D5C 00000000 */ nop /* 41DAF0 802A8D60 0C0A8426 */ jal func_802A1098 -/* 41DAF4 802A8D64 00000000 */ nop +/* 41DAF4 802A8D64 00000000 */ nop /* 41DAF8 802A8D68 080AA6A9 */ j .L802A9AA4 /* 41DAFC 802A8D6C 2402000D */ addiu $v0, $zero, 0xd +glabel L802A8D70_41DB00 /* 41DB00 802A8D70 0C0A8B21 */ jal func_802A2C84 -/* 41DB04 802A8D74 00000000 */ nop +/* 41DB04 802A8D74 00000000 */ nop /* 41DB08 802A8D78 2403FFFF */ addiu $v1, $zero, -1 /* 41DB0C 802A8D7C 1043034B */ beq $v0, $v1, .L802A9AAC /* 41DB10 802A8D80 2402000B */ addiu $v0, $zero, 0xb /* 41DB14 802A8D84 080AA6A9 */ j .L802A9AA4 -/* 41DB18 802A8D88 00000000 */ nop +/* 41DB18 802A8D88 00000000 */ nop +glabel L802A8D8C_41DB1C /* 41DB1C 802A8D8C 0000802D */ daddu $s0, $zero, $zero /* 41DB20 802A8D90 0200882D */ daddu $s1, $s0, $zero /* 41DB24 802A8D94 3C098008 */ lui $t1, %hi(gItemTable) @@ -848,16 +863,17 @@ glabel update_partner_menu /* 41DBCC 802A8E3C 0C03D44F */ jal func_800F513C /* 41DBD0 802A8E40 AC910328 */ sw $s1, 0x328($a0) /* 41DBD4 802A8E44 0C03D4AF */ jal func_800F52BC -/* 41DBD8 802A8E48 00000000 */ nop +/* 41DBD8 802A8E48 00000000 */ nop /* 41DBDC 802A8E4C 080AA6A9 */ j .L802A9AA4 /* 41DBE0 802A8E50 24020029 */ addiu $v0, $zero, 0x29 +glabel L802A8E54_41DBE4 /* 41DBE4 802A8E54 8643032C */ lh $v1, 0x32c($s2) /* 41DBE8 802A8E58 10600314 */ beqz $v1, .L802A9AAC /* 41DBEC 802A8E5C 240200FF */ addiu $v0, $zero, 0xff /* 41DBF0 802A8E60 5462000B */ bnel $v1, $v0, .L802A8E90 /* 41DBF4 802A8E64 2402002C */ addiu $v0, $zero, 0x2c /* 41DBF8 802A8E68 0C0A8414 */ jal func_802A1050 -/* 41DBFC 802A8E6C 00000000 */ nop +/* 41DBFC 802A8E6C 00000000 */ nop /* 41DC00 802A8E70 24020008 */ addiu $v0, $zero, 8 /* 41DC04 802A8E74 3C01802B */ lui $at, %hi(D_802ACC60) /* 41DC08 802A8E78 AC22CC60 */ sw $v0, %lo(D_802ACC60)($at) @@ -892,43 +908,47 @@ glabel update_partner_menu /* 41DC78 802A8EE8 0C03C4EC */ jal func_800F13B0 /* 41DC7C 802A8EEC AE830184 */ sw $v1, 0x184($s4) /* 41DC80 802A8EF0 0C0A840C */ jal func_802A1030 -/* 41DC84 802A8EF4 00000000 */ nop +/* 41DC84 802A8EF4 00000000 */ nop /* 41DC88 802A8EF8 080AA6A9 */ j .L802A9AA4 /* 41DC8C 802A8EFC 2402002A */ addiu $v0, $zero, 0x2a +glabel L802A8F00_41DC90 /* 41DC90 802A8F00 8E820214 */ lw $v0, 0x214($s4) /* 41DC94 802A8F04 30424000 */ andi $v0, $v0, 0x4000 /* 41DC98 802A8F08 1040000A */ beqz $v0, .L802A8F34 -/* 41DC9C 802A8F0C 00000000 */ nop +/* 41DC9C 802A8F0C 00000000 */ nop /* 41DCA0 802A8F10 8642032C */ lh $v0, 0x32c($s2) /* 41DCA4 802A8F14 14400007 */ bnez $v0, .L802A8F34 -/* 41DCA8 802A8F18 00000000 */ nop +/* 41DCA8 802A8F18 00000000 */ nop /* 41DCAC 802A8F1C 0C03C5B3 */ jal func_800F16CC -/* 41DCB0 802A8F20 00000000 */ nop +/* 41DCB0 802A8F20 00000000 */ nop /* 41DCB4 802A8F24 0C0A8426 */ jal func_802A1098 -/* 41DCB8 802A8F28 00000000 */ nop +/* 41DCB8 802A8F28 00000000 */ nop /* 41DCBC 802A8F2C 080AA6A9 */ j .L802A9AA4 /* 41DCC0 802A8F30 2402002B */ addiu $v0, $zero, 0x2b .L802A8F34: /* 41DCC4 802A8F34 0C0A846C */ jal func_802A11B0 -/* 41DCC8 802A8F38 00000000 */ nop +/* 41DCC8 802A8F38 00000000 */ nop /* 41DCCC 802A8F3C 104002DB */ beqz $v0, .L802A9AAC -/* 41DCD0 802A8F40 00000000 */ nop +/* 41DCD0 802A8F40 00000000 */ nop /* 41DCD4 802A8F44 0C090464 */ jal func_80241190 /* 41DCD8 802A8F48 24040011 */ addiu $a0, $zero, 0x11 /* 41DCDC 802A8F4C 080AA6AB */ j .L802A9AAC -/* 41DCE0 802A8F50 00000000 */ nop +/* 41DCE0 802A8F50 00000000 */ nop +glabel L802A8F54_41DCE4 /* 41DCE4 802A8F54 0C0A846C */ jal func_802A11B0 -/* 41DCE8 802A8F58 00000000 */ nop +/* 41DCE8 802A8F58 00000000 */ nop /* 41DCEC 802A8F5C 104002D3 */ beqz $v0, .L802A9AAC /* 41DCF0 802A8F60 24020029 */ addiu $v0, $zero, 0x29 /* 41DCF4 802A8F64 080AA6A9 */ j .L802A9AA4 -/* 41DCF8 802A8F68 00000000 */ nop +/* 41DCF8 802A8F68 00000000 */ nop +glabel L802A8F6C_41DCFC /* 41DCFC 802A8F6C 0C03C5B3 */ jal func_800F16CC -/* 41DD00 802A8F70 00000000 */ nop +/* 41DD00 802A8F70 00000000 */ nop /* 41DD04 802A8F74 0C0A8426 */ jal func_802A1098 -/* 41DD08 802A8F78 00000000 */ nop +/* 41DD08 802A8F78 00000000 */ nop /* 41DD0C 802A8F7C 080AA6A9 */ j .L802A9AA4 /* 41DD10 802A8F80 2402002B */ addiu $v0, $zero, 0x2b +glabel L802A8F84_41DD14 /* 41DD14 802A8F84 0000802D */ daddu $s0, $zero, $zero /* 41DD18 802A8F88 24110001 */ addiu $s1, $zero, 1 /* 41DD1C 802A8F8C 3C0C8009 */ lui $t4, %hi(D_8008EF20) @@ -996,9 +1016,10 @@ glabel update_partner_menu /* 41DE04 802A9074 0C03D44F */ jal func_800F513C /* 41DE08 802A9078 AC820328 */ sw $v0, 0x328($a0) /* 41DE0C 802A907C 0C03D4AF */ jal func_800F52BC -/* 41DE10 802A9080 00000000 */ nop +/* 41DE10 802A9080 00000000 */ nop /* 41DE14 802A9084 080AA6A9 */ j .L802A9AA4 /* 41DE18 802A9088 24020033 */ addiu $v0, $zero, 0x33 +glabel L802A908C_41DE1C /* 41DE1C 802A908C 8643032C */ lh $v1, 0x32c($s2) /* 41DE20 802A9090 2402FFFF */ addiu $v0, $zero, -1 /* 41DE24 802A9094 10620283 */ beq $v1, $v0, .L802A9AA4 @@ -1008,7 +1029,7 @@ glabel update_partner_menu /* 41DE34 802A90A4 5462000B */ bnel $v1, $v0, .L802A90D4 /* 41DE38 802A90A8 24020036 */ addiu $v0, $zero, 0x36 /* 41DE3C 802A90AC 0C0A8414 */ jal func_802A1050 -/* 41DE40 802A90B0 00000000 */ nop +/* 41DE40 802A90B0 00000000 */ nop /* 41DE44 802A90B4 24020008 */ addiu $v0, $zero, 8 /* 41DE48 802A90B8 3C01802B */ lui $at, %hi(D_802ACC60) /* 41DE4C 802A90BC AC22CC60 */ sw $v0, %lo(D_802ACC60)($at) @@ -1041,47 +1062,54 @@ glabel update_partner_menu /* 41DEB4 802A9124 0C03C4EC */ jal func_800F13B0 /* 41DEB8 802A9128 A2820061 */ sb $v0, 0x61($s4) /* 41DEBC 802A912C 0C0A840C */ jal func_802A1030 -/* 41DEC0 802A9130 00000000 */ nop +/* 41DEC0 802A9130 00000000 */ nop /* 41DEC4 802A9134 080AA6A9 */ j .L802A9AA4 /* 41DEC8 802A9138 24020034 */ addiu $v0, $zero, 0x34 +glabel L802A913C_41DECC /* 41DECC 802A913C 8E820214 */ lw $v0, 0x214($s4) /* 41DED0 802A9140 30424000 */ andi $v0, $v0, 0x4000 /* 41DED4 802A9144 10400224 */ beqz $v0, .L802A99D8 -/* 41DED8 802A9148 00000000 */ nop +/* 41DED8 802A9148 00000000 */ nop /* 41DEDC 802A914C 8642032C */ lh $v0, 0x32c($s2) /* 41DEE0 802A9150 14400221 */ bnez $v0, .L802A99D8 -/* 41DEE4 802A9154 00000000 */ nop +/* 41DEE4 802A9154 00000000 */ nop /* 41DEE8 802A9158 0C03C5B3 */ jal func_800F16CC -/* 41DEEC 802A915C 00000000 */ nop +/* 41DEEC 802A915C 00000000 */ nop /* 41DEF0 802A9160 0C0A8426 */ jal func_802A1098 -/* 41DEF4 802A9164 00000000 */ nop +/* 41DEF4 802A9164 00000000 */ nop /* 41DEF8 802A9168 080AA6A9 */ j .L802A9AA4 /* 41DEFC 802A916C 24020035 */ addiu $v0, $zero, 0x35 +glabel L802A9170_41DF00 /* 41DF00 802A9170 0C0A846C */ jal func_802A11B0 -/* 41DF04 802A9174 00000000 */ nop +/* 41DF04 802A9174 00000000 */ nop /* 41DF08 802A9178 1040024C */ beqz $v0, .L802A9AAC /* 41DF0C 802A917C 24020033 */ addiu $v0, $zero, 0x33 /* 41DF10 802A9180 080AA6A9 */ j .L802A9AA4 -/* 41DF14 802A9184 00000000 */ nop +/* 41DF14 802A9184 00000000 */ nop +glabel L802A9188_41DF18 /* 41DF18 802A9188 0C03C5B3 */ jal func_800F16CC -/* 41DF1C 802A918C 00000000 */ nop +/* 41DF1C 802A918C 00000000 */ nop /* 41DF20 802A9190 0C0A8426 */ jal func_802A1098 -/* 41DF24 802A9194 00000000 */ nop +/* 41DF24 802A9194 00000000 */ nop /* 41DF28 802A9198 080AA6A9 */ j .L802A9AA4 /* 41DF2C 802A919C 24020035 */ addiu $v0, $zero, 0x35 +glabel L802A91A0_41DF30 /* 41DF30 802A91A0 0C03C54E */ jal func_800F1538 -/* 41DF34 802A91A4 00000000 */ nop +/* 41DF34 802A91A4 00000000 */ nop .L802A91A8: +glabel L802A91A8_41DF38 /* 41DF38 802A91A8 0C0A842E */ jal func_802A10B8 -/* 41DF3C 802A91AC 00000000 */ nop +/* 41DF3C 802A91AC 00000000 */ nop /* 41DF40 802A91B0 080AA6AB */ j .L802A9AAC -/* 41DF44 802A91B4 00000000 */ nop +/* 41DF44 802A91B4 00000000 */ nop +glabel L802A91B8_41DF48 /* 41DF48 802A91B8 8643032C */ lh $v1, 0x32c($s2) /* 41DF4C 802A91BC 2402FFFF */ addiu $v0, $zero, -1 /* 41DF50 802A91C0 1062023A */ beq $v1, $v0, .L802A9AAC /* 41DF54 802A91C4 24020033 */ addiu $v0, $zero, 0x33 /* 41DF58 802A91C8 080AA6A9 */ j .L802A9AA4 -/* 41DF5C 802A91CC 00000000 */ nop +/* 41DF5C 802A91CC 00000000 */ nop +glabel L802A91D0_41DF60 /* 41DF60 802A91D0 24100001 */ addiu $s0, $zero, 1 /* 41DF64 802A91D4 0000882D */ daddu $s1, $zero, $zero /* 41DF68 802A91D8 24020077 */ addiu $v0, $zero, 0x77 @@ -1182,18 +1210,19 @@ glabel update_partner_menu /* 41E0D4 802A9344 3C01802B */ lui $at, %hi(D_802AD4A8) /* 41E0D8 802A9348 AC31D4A8 */ sw $s1, %lo(D_802AD4A8)($at) /* 41E0DC 802A934C 0C0A89A1 */ jal func_802A2684 -/* 41E0E0 802A9350 00000000 */ nop +/* 41E0E0 802A9350 00000000 */ nop /* 41E0E4 802A9354 080AA6A9 */ j .L802A9AA4 /* 41E0E8 802A9358 2402003D */ addiu $v0, $zero, 0x3d +glabel L802A935C_41E0EC /* 41E0EC 802A935C 0C0A8B21 */ jal func_802A2C84 -/* 41E0F0 802A9360 00000000 */ nop +/* 41E0F0 802A9360 00000000 */ nop /* 41E0F4 802A9364 0040802D */ daddu $s0, $v0, $zero /* 41E0F8 802A9368 120001D0 */ beqz $s0, .L802A9AAC /* 41E0FC 802A936C 240200FF */ addiu $v0, $zero, 0xff /* 41E100 802A9370 5602000B */ bnel $s0, $v0, .L802A93A0 /* 41E104 802A9374 2602FFFF */ addiu $v0, $s0, -1 /* 41E108 802A9378 0C0A8414 */ jal func_802A1050 -/* 41E10C 802A937C 00000000 */ nop +/* 41E10C 802A937C 00000000 */ nop /* 41E110 802A9380 24020008 */ addiu $v0, $zero, 8 /* 41E114 802A9384 3C01802B */ lui $at, %hi(D_802ACC60) /* 41E118 802A9388 AC22CC60 */ sw $v0, %lo(D_802ACC60)($at) @@ -1210,26 +1239,27 @@ glabel update_partner_menu /* 41E140 802A93B0 0C0A89F4 */ jal func_802A27D0 /* 41E144 802A93B4 A282004B */ sb $v0, 0x4b($s4) /* 41E148 802A93B8 0C0A840C */ jal func_802A1030 -/* 41E14C 802A93BC 00000000 */ nop +/* 41E14C 802A93BC 00000000 */ nop /* 41E150 802A93C0 080AA6A9 */ j .L802A9AA4 /* 41E154 802A93C4 2402003E */ addiu $v0, $zero, 0x3e +glabel L802A93C8_41E158 /* 41E158 802A93C8 0C0A8B21 */ jal func_802A2C84 -/* 41E15C 802A93CC 00000000 */ nop +/* 41E15C 802A93CC 00000000 */ nop /* 41E160 802A93D0 8E830214 */ lw $v1, 0x214($s4) /* 41E164 802A93D4 30634000 */ andi $v1, $v1, 0x4000 /* 41E168 802A93D8 10600009 */ beqz $v1, .L802A9400 /* 41E16C 802A93DC 0040802D */ daddu $s0, $v0, $zero /* 41E170 802A93E0 16000007 */ bnez $s0, .L802A9400 -/* 41E174 802A93E4 00000000 */ nop +/* 41E174 802A93E4 00000000 */ nop /* 41E178 802A93E8 0C0A8AAE */ jal func_802A2AB8 -/* 41E17C 802A93EC 00000000 */ nop +/* 41E17C 802A93EC 00000000 */ nop /* 41E180 802A93F0 0C0A8426 */ jal func_802A1098 -/* 41E184 802A93F4 00000000 */ nop +/* 41E184 802A93F4 00000000 */ nop /* 41E188 802A93F8 080AA6A9 */ j .L802A9AA4 /* 41E18C 802A93FC 2402003F */ addiu $v0, $zero, 0x3f .L802A9400: /* 41E190 802A9400 0C0A846C */ jal func_802A11B0 -/* 41E194 802A9404 00000000 */ nop +/* 41E194 802A9404 00000000 */ nop /* 41E198 802A9408 104001A8 */ beqz $v0, .L802A9AAC /* 41E19C 802A940C 24020040 */ addiu $v0, $zero, 0x40 /* 41E1A0 802A9410 A682006C */ sh $v0, 0x6c($s4) @@ -1261,25 +1291,29 @@ glabel update_partner_menu /* 41E208 802A9478 0C090464 */ jal func_80241190 /* 41E20C 802A947C AE850184 */ sw $a1, 0x184($s4) /* 41E210 802A9480 080AA6AB */ j .L802A9AAC -/* 41E214 802A9484 00000000 */ nop +/* 41E214 802A9484 00000000 */ nop +glabel L802A9488_41E218 /* 41E218 802A9488 0C0A8B21 */ jal func_802A2C84 -/* 41E21C 802A948C 00000000 */ nop +/* 41E21C 802A948C 00000000 */ nop /* 41E220 802A9490 0C0A846C */ jal func_802A11B0 -/* 41E224 802A9494 00000000 */ nop +/* 41E224 802A9494 00000000 */ nop /* 41E228 802A9498 10400184 */ beqz $v0, .L802A9AAC /* 41E22C 802A949C 2402003D */ addiu $v0, $zero, 0x3d /* 41E230 802A94A0 080AA6A9 */ j .L802A9AA4 -/* 41E234 802A94A4 00000000 */ nop +/* 41E234 802A94A4 00000000 */ nop +glabel L802A94A8_41E238 /* 41E238 802A94A8 0C0A8AAE */ jal func_802A2AB8 -/* 41E23C 802A94AC 00000000 */ nop +/* 41E23C 802A94AC 00000000 */ nop /* 41E240 802A94B0 0C0A8426 */ jal func_802A1098 -/* 41E244 802A94B4 00000000 */ nop +/* 41E244 802A94B4 00000000 */ nop /* 41E248 802A94B8 080AA6A9 */ j .L802A9AA4 /* 41E24C 802A94BC 2402003F */ addiu $v0, $zero, 0x3f +glabel L802A94C0_41E250 /* 41E250 802A94C0 0C0A89F9 */ jal func_802A27E4 -/* 41E254 802A94C4 00000000 */ nop +/* 41E254 802A94C4 00000000 */ nop /* 41E258 802A94C8 080AA46A */ j .L802A91A8 -/* 41E25C 802A94CC 00000000 */ nop +/* 41E25C 802A94CC 00000000 */ nop +glabel L802A94D0_41E260 /* 41E260 802A94D0 0C098C9A */ jal func_80263268 /* 41E264 802A94D4 0000802D */ daddu $s0, $zero, $zero /* 41E268 802A94D8 8282007C */ lb $v0, 0x7c($s4) @@ -1356,18 +1390,19 @@ glabel update_partner_menu /* 41E378 802A95E8 3C01802B */ lui $at, %hi(D_802AD670) /* 41E37C 802A95EC AC31D670 */ sw $s1, %lo(D_802AD670)($at) /* 41E380 802A95F0 0C0A9176 */ jal func_802A45D8 -/* 41E384 802A95F4 00000000 */ nop +/* 41E384 802A95F4 00000000 */ nop /* 41E388 802A95F8 080AA6A9 */ j .L802A9AA4 /* 41E38C 802A95FC 240200C9 */ addiu $v0, $zero, 0xc9 +glabel L802A9600_41E390 /* 41E390 802A9600 0C0A9295 */ jal func_802A4A54 -/* 41E394 802A9604 00000000 */ nop +/* 41E394 802A9604 00000000 */ nop /* 41E398 802A9608 0040802D */ daddu $s0, $v0, $zero /* 41E39C 802A960C 12000127 */ beqz $s0, .L802A9AAC /* 41E3A0 802A9610 240200FF */ addiu $v0, $zero, 0xff /* 41E3A4 802A9614 1602000B */ bne $s0, $v0, .L802A9644 /* 41E3A8 802A9618 2603FFFF */ addiu $v1, $s0, -1 /* 41E3AC 802A961C 0C0A8414 */ jal func_802A1050 -/* 41E3B0 802A9620 00000000 */ nop +/* 41E3B0 802A9620 00000000 */ nop /* 41E3B4 802A9624 24020008 */ addiu $v0, $zero, 8 /* 41E3B8 802A9628 3C01802B */ lui $at, %hi(D_802ACC60) /* 41E3BC 802A962C AC22CC60 */ sw $v0, %lo(D_802ACC60)($at) @@ -1388,28 +1423,29 @@ glabel update_partner_menu /* 41E3F4 802A9664 106200A7 */ beq $v1, $v0, .L802A9904 /* 41E3F8 802A9668 2402001E */ addiu $v0, $zero, 0x1e /* 41E3FC 802A966C 0C0A91C6 */ jal func_802A4718 -/* 41E400 802A9670 00000000 */ nop +/* 41E400 802A9670 00000000 */ nop /* 41E404 802A9674 0C0A840C */ jal func_802A1030 -/* 41E408 802A9678 00000000 */ nop +/* 41E408 802A9678 00000000 */ nop /* 41E40C 802A967C 080AA6A9 */ j .L802A9AA4 /* 41E410 802A9680 240200CA */ addiu $v0, $zero, 0xca +glabel L802A9684_41E414 /* 41E414 802A9684 0C0A9295 */ jal func_802A4A54 -/* 41E418 802A9688 00000000 */ nop +/* 41E418 802A9688 00000000 */ nop /* 41E41C 802A968C 8E830214 */ lw $v1, 0x214($s4) /* 41E420 802A9690 30634000 */ andi $v1, $v1, 0x4000 /* 41E424 802A9694 10600009 */ beqz $v1, .L802A96BC /* 41E428 802A9698 0040802D */ daddu $s0, $v0, $zero /* 41E42C 802A969C 16000007 */ bnez $s0, .L802A96BC -/* 41E430 802A96A0 00000000 */ nop +/* 41E430 802A96A0 00000000 */ nop /* 41E434 802A96A4 0C0A923F */ jal func_802A48FC -/* 41E438 802A96A8 00000000 */ nop +/* 41E438 802A96A8 00000000 */ nop /* 41E43C 802A96AC 0C0A8426 */ jal func_802A1098 -/* 41E440 802A96B0 00000000 */ nop +/* 41E440 802A96B0 00000000 */ nop /* 41E444 802A96B4 080AA6A9 */ j .L802A9AA4 /* 41E448 802A96B8 240200CB */ addiu $v0, $zero, 0xcb .L802A96BC: /* 41E44C 802A96BC 0C0A846C */ jal func_802A11B0 -/* 41E450 802A96C0 00000000 */ nop +/* 41E450 802A96C0 00000000 */ nop /* 41E454 802A96C4 104000F9 */ beqz $v0, .L802A9AAC /* 41E458 802A96C8 240200CC */ addiu $v0, $zero, 0xcc /* 41E45C 802A96CC 8290004A */ lb $s0, 0x4a($s4) @@ -1424,49 +1460,50 @@ glabel update_partner_menu /* 41E480 802A96F0 12020011 */ beq $s0, $v0, .L802A9738 /* 41E484 802A96F4 240200CD */ addiu $v0, $zero, 0xcd /* 41E488 802A96F8 080AA6AB */ j .L802A9AAC -/* 41E48C 802A96FC 00000000 */ nop +/* 41E48C 802A96FC 00000000 */ nop .L802A9700: /* 41E490 802A9700 2402000A */ addiu $v0, $zero, 0xa /* 41E494 802A9704 12020017 */ beq $s0, $v0, .L802A9764 /* 41E498 802A9708 240200CD */ addiu $v0, $zero, 0xcd /* 41E49C 802A970C 080AA6AB */ j .L802A9AAC -/* 41E4A0 802A9710 00000000 */ nop +/* 41E4A0 802A9710 00000000 */ nop .L802A9714: /* 41E4A4 802A9714 240200CD */ addiu $v0, $zero, 0xcd /* 41E4A8 802A9718 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41E4AC 802A971C AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 41E4B0 802A9720 0C0AA072 */ jal update_partner_menu -/* 41E4B4 802A9724 00000000 */ nop +/* 41E4B4 802A9724 00000000 */ nop /* 41E4B8 802A9728 0C090464 */ jal func_80241190 /* 41E4BC 802A972C 24040017 */ addiu $a0, $zero, 0x17 /* 41E4C0 802A9730 080AA6AB */ j .L802A9AAC -/* 41E4C4 802A9734 00000000 */ nop +/* 41E4C4 802A9734 00000000 */ nop .L802A9738: /* 41E4C8 802A9738 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41E4CC 802A973C AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 41E4D0 802A9740 0C0AA072 */ jal update_partner_menu -/* 41E4D4 802A9744 00000000 */ nop +/* 41E4D4 802A9744 00000000 */ nop /* 41E4D8 802A9748 24040018 */ addiu $a0, $zero, 0x18 /* 41E4DC 802A974C 24020039 */ addiu $v0, $zero, 0x39 /* 41E4E0 802A9750 A2900178 */ sb $s0, 0x178($s4) /* 41E4E4 802A9754 0C090464 */ jal func_80241190 /* 41E4E8 802A9758 A682017C */ sh $v0, 0x17c($s4) /* 41E4EC 802A975C 080AA6AB */ j .L802A9AAC -/* 41E4F0 802A9760 00000000 */ nop +/* 41E4F0 802A9760 00000000 */ nop .L802A9764: /* 41E4F4 802A9764 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41E4F8 802A9768 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 41E4FC 802A976C 0C0AA072 */ jal update_partner_menu -/* 41E500 802A9770 00000000 */ nop +/* 41E500 802A9770 00000000 */ nop .L802A9774: /* 41E504 802A9774 0C090464 */ jal func_80241190 /* 41E508 802A9778 2404000A */ addiu $a0, $zero, 0xa /* 41E50C 802A977C 080AA6AB */ j .L802A9AAC -/* 41E510 802A9780 00000000 */ nop +/* 41E510 802A9780 00000000 */ nop +glabel L802A9784_41E514 /* 41E514 802A9784 0C0A9295 */ jal func_802A4A54 -/* 41E518 802A9788 00000000 */ nop +/* 41E518 802A9788 00000000 */ nop /* 41E51C 802A978C 0C0A846C */ jal func_802A11B0 -/* 41E520 802A9790 00000000 */ nop +/* 41E520 802A9790 00000000 */ nop /* 41E524 802A9794 104000C5 */ beqz $v0, .L802A9AAC /* 41E528 802A9798 24020008 */ addiu $v0, $zero, 8 /* 41E52C 802A979C 3C01802B */ lui $at, %hi(D_802ACC60) @@ -1476,12 +1513,14 @@ glabel update_partner_menu /* 41E53C 802A97AC AC22CC6C */ sw $v0, %lo(D_802ACC6C)($at) /* 41E540 802A97B0 080AA6A9 */ j .L802A9AA4 /* 41E544 802A97B4 24020002 */ addiu $v0, $zero, 2 +glabel L802A97B8_41E548 /* 41E548 802A97B8 0C0A923F */ jal func_802A48FC -/* 41E54C 802A97BC 00000000 */ nop +/* 41E54C 802A97BC 00000000 */ nop /* 41E550 802A97C0 0C0A8426 */ jal func_802A1098 -/* 41E554 802A97C4 00000000 */ nop +/* 41E554 802A97C4 00000000 */ nop /* 41E558 802A97C8 080AA6A9 */ j .L802A9AA4 /* 41E55C 802A97CC 240200CB */ addiu $v0, $zero, 0xcb +glabel L802A97D0_41E560 /* 41E560 802A97D0 0000802D */ daddu $s0, $zero, $zero /* 41E564 802A97D4 24110001 */ addiu $s1, $zero, 1 /* 41E568 802A97D8 3C0C8009 */ lui $t4, %hi(D_8008EF20) @@ -1549,9 +1588,10 @@ glabel update_partner_menu /* 41E650 802A98C0 0C03D44F */ jal func_800F513C /* 41E654 802A98C4 AC820328 */ sw $v0, 0x328($a0) /* 41E658 802A98C8 0C03D4AF */ jal func_800F52BC -/* 41E65C 802A98CC 00000000 */ nop +/* 41E65C 802A98CC 00000000 */ nop /* 41E660 802A98D0 080AA6A9 */ j .L802A9AA4 /* 41E664 802A98D4 2402001F */ addiu $v0, $zero, 0x1f +glabel L802A98D8_41E668 /* 41E668 802A98D8 8643032C */ lh $v1, 0x32c($s2) /* 41E66C 802A98DC 2402FFFF */ addiu $v0, $zero, -1 /* 41E670 802A98E0 10620070 */ beq $v1, $v0, .L802A9AA4 @@ -1561,17 +1601,17 @@ glabel update_partner_menu /* 41E680 802A98F0 1462000C */ bne $v1, $v0, .L802A9924 /* 41E684 802A98F4 24020022 */ addiu $v0, $zero, 0x22 /* 41E688 802A98F8 0C0A91F8 */ jal func_802A47E0 -/* 41E68C 802A98FC 00000000 */ nop +/* 41E68C 802A98FC 00000000 */ nop /* 41E690 802A9900 240200C9 */ addiu $v0, $zero, 0xc9 .L802A9904: /* 41E694 802A9904 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41E698 802A9908 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 41E69C 802A990C 0C0AA072 */ jal update_partner_menu -/* 41E6A0 802A9910 00000000 */ nop +/* 41E6A0 802A9910 00000000 */ nop /* 41E6A4 802A9914 0C0AA072 */ jal update_partner_menu -/* 41E6A8 802A9918 00000000 */ nop +/* 41E6A8 802A9918 00000000 */ nop /* 41E6AC 802A991C 080AA6AB */ j .L802A9AAC -/* 41E6B0 802A9920 00000000 */ nop +/* 41E6B0 802A9920 00000000 */ nop .L802A9924: /* 41E6B4 802A9924 A682006C */ sh $v0, 0x6c($s4) /* 41E6B8 802A9928 8642032C */ lh $v0, 0x32c($s2) @@ -1596,65 +1636,71 @@ glabel update_partner_menu /* 41E704 802A9974 0C03C4EC */ jal func_800F13B0 /* 41E708 802A9978 A2820061 */ sb $v0, 0x61($s4) /* 41E70C 802A997C 0C0A91C6 */ jal func_802A4718 -/* 41E710 802A9980 00000000 */ nop +/* 41E710 802A9980 00000000 */ nop /* 41E714 802A9984 0C0A840C */ jal func_802A1030 -/* 41E718 802A9988 00000000 */ nop +/* 41E718 802A9988 00000000 */ nop /* 41E71C 802A998C 080AA6A9 */ j .L802A9AA4 /* 41E720 802A9990 24020020 */ addiu $v0, $zero, 0x20 +glabel L802A9994_41E724 /* 41E724 802A9994 8E820214 */ lw $v0, 0x214($s4) /* 41E728 802A9998 30424000 */ andi $v0, $v0, 0x4000 /* 41E72C 802A999C 1040000C */ beqz $v0, .L802A99D0 -/* 41E730 802A99A0 00000000 */ nop +/* 41E730 802A99A0 00000000 */ nop /* 41E734 802A99A4 8642032C */ lh $v0, 0x32c($s2) /* 41E738 802A99A8 14400009 */ bnez $v0, .L802A99D0 -/* 41E73C 802A99AC 00000000 */ nop +/* 41E73C 802A99AC 00000000 */ nop /* 41E740 802A99B0 0C03C5B3 */ jal func_800F16CC -/* 41E744 802A99B4 00000000 */ nop +/* 41E744 802A99B4 00000000 */ nop /* 41E748 802A99B8 0C0A9284 */ jal func_802A4A10 -/* 41E74C 802A99BC 00000000 */ nop +/* 41E74C 802A99BC 00000000 */ nop /* 41E750 802A99C0 0C0A8426 */ jal func_802A1098 -/* 41E754 802A99C4 00000000 */ nop +/* 41E754 802A99C4 00000000 */ nop /* 41E758 802A99C8 080AA6A9 */ j .L802A9AA4 /* 41E75C 802A99CC 24020021 */ addiu $v0, $zero, 0x21 .L802A99D0: /* 41E760 802A99D0 0C0A9295 */ jal func_802A4A54 -/* 41E764 802A99D4 00000000 */ nop +/* 41E764 802A99D4 00000000 */ nop .L802A99D8: /* 41E768 802A99D8 0C0A846C */ jal func_802A11B0 -/* 41E76C 802A99DC 00000000 */ nop +/* 41E76C 802A99DC 00000000 */ nop /* 41E770 802A99E0 10400032 */ beqz $v0, .L802A9AAC -/* 41E774 802A99E4 00000000 */ nop +/* 41E774 802A99E4 00000000 */ nop /* 41E778 802A99E8 8682006E */ lh $v0, 0x6e($s4) /* 41E77C 802A99EC 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41E780 802A99F0 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 41E784 802A99F4 0C0AA072 */ jal update_partner_menu -/* 41E788 802A99F8 00000000 */ nop +/* 41E788 802A99F8 00000000 */ nop /* 41E78C 802A99FC 0C090464 */ jal func_80241190 /* 41E790 802A9A00 2404001D */ addiu $a0, $zero, 0x1d /* 41E794 802A9A04 080AA6AB */ j .L802A9AAC -/* 41E798 802A9A08 00000000 */ nop +/* 41E798 802A9A08 00000000 */ nop +glabel L802A9A0C_41E79C /* 41E79C 802A9A0C 0C0A9295 */ jal func_802A4A54 -/* 41E7A0 802A9A10 00000000 */ nop +/* 41E7A0 802A9A10 00000000 */ nop /* 41E7A4 802A9A14 0C0A846C */ jal func_802A11B0 -/* 41E7A8 802A9A18 00000000 */ nop +/* 41E7A8 802A9A18 00000000 */ nop /* 41E7AC 802A9A1C 10400023 */ beqz $v0, .L802A9AAC /* 41E7B0 802A9A20 2402001F */ addiu $v0, $zero, 0x1f /* 41E7B4 802A9A24 080AA6A9 */ j .L802A9AA4 -/* 41E7B8 802A9A28 00000000 */ nop +/* 41E7B8 802A9A28 00000000 */ nop +glabel L802A9A2C_41E7BC /* 41E7BC 802A9A2C 0C03C5B3 */ jal func_800F16CC -/* 41E7C0 802A9A30 00000000 */ nop +/* 41E7C0 802A9A30 00000000 */ nop /* 41E7C4 802A9A34 0C0A9284 */ jal func_802A4A10 -/* 41E7C8 802A9A38 00000000 */ nop +/* 41E7C8 802A9A38 00000000 */ nop /* 41E7CC 802A9A3C 0C0A8426 */ jal func_802A1098 -/* 41E7D0 802A9A40 00000000 */ nop +/* 41E7D0 802A9A40 00000000 */ nop /* 41E7D4 802A9A44 080AA6A9 */ j .L802A9AA4 /* 41E7D8 802A9A48 24020021 */ addiu $v0, $zero, 0x21 +glabel L802A9A4C_41E7DC /* 41E7DC 802A9A4C 0C03C54E */ jal func_800F1538 -/* 41E7E0 802A9A50 00000000 */ nop +/* 41E7E0 802A9A50 00000000 */ nop +glabel L802A9A54_41E7E4 /* 41E7E4 802A9A54 0C0A91CB */ jal func_802A472C -/* 41E7E8 802A9A58 00000000 */ nop +/* 41E7E8 802A9A58 00000000 */ nop /* 41E7EC 802A9A5C 080AA46A */ j .L802A91A8 -/* 41E7F0 802A9A60 00000000 */ nop +/* 41E7F0 802A9A60 00000000 */ nop +glabel L802A9A64_41E7F4 /* 41E7F4 802A9A64 24040006 */ addiu $a0, $zero, 6 /* 41E7F8 802A9A68 0C051F9F */ jal func_80147E7C /* 41E7FC 802A9A6C 24050002 */ addiu $a1, $zero, 2 @@ -1675,6 +1721,7 @@ glabel update_partner_menu /* 41E834 802A9AA4 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41E838 802A9AA8 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) .L802A9AAC: +glabel L802A9AAC_41E83C /* 41E83C 802A9AAC 8FBF0034 */ lw $ra, 0x34($sp) /* 41E840 802A9AB0 8FBE0030 */ lw $fp, 0x30($sp) /* 41E844 802A9AB4 8FB7002C */ lw $s7, 0x2c($sp) diff --git a/asm/nonmatchings/code_415D90/update_player_menu.s b/asm/nonmatchings/code_415D90/update_player_menu.s index eaa0d3b9e8..b706701066 100644 --- a/asm/nonmatchings/code_415D90/update_player_menu.s +++ b/asm/nonmatchings/code_415D90/update_player_menu.s @@ -28,9 +28,9 @@ glabel update_player_menu /* 41A774 802A59E4 10600005 */ beqz $v1, .L802A59FC /* 41A778 802A59E8 2402012C */ addiu $v0, $zero, 0x12c /* 41A77C 802A59EC 10620023 */ beq $v1, $v0, .L802A5A7C -/* 41A780 802A59F0 00000000 */ nop +/* 41A780 802A59F0 00000000 */ nop /* 41A784 802A59F4 080A9709 */ j .L802A5C24 -/* 41A788 802A59F8 00000000 */ nop +/* 41A788 802A59F8 00000000 */ nop .L802A59FC: /* 41A78C 802A59FC 2402FFFF */ addiu $v0, $zero, -1 /* 41A790 802A5A00 A2C20178 */ sb $v0, 0x178($s6) @@ -38,7 +38,7 @@ glabel update_player_menu /* 41A798 802A5A08 0C0A9606 */ jal can_switch_to_player /* 41A79C 802A5A0C AEC00188 */ sw $zero, 0x188($s6) /* 41A7A0 802A5A10 104008D8 */ beqz $v0, .L802A7D74 -/* 41A7A4 802A5A14 00000000 */ nop +/* 41A7A4 802A5A14 00000000 */ nop /* 41A7A8 802A5A18 0C093903 */ jal func_8024E40C /* 41A7AC 802A5A1C 24040002 */ addiu $a0, $zero, 2 /* 41A7B0 802A5A20 0C093936 */ jal move_cam_over @@ -68,7 +68,7 @@ glabel update_player_menu .L802A5A7C: /* 41A80C 802A5A7C 86220070 */ lh $v0, 0x70($s1) /* 41A810 802A5A80 10400022 */ beqz $v0, .L802A5B0C -/* 41A814 802A5A84 00000000 */ nop +/* 41A814 802A5A84 00000000 */ nop /* 41A818 802A5A88 C6200018 */ lwc1 $f0, 0x18($s1) /* 41A81C 802A5A8C C6280144 */ lwc1 $f8, 0x144($s1) /* 41A820 802A5A90 C6220020 */ lwc1 $f2, 0x20($s1) @@ -76,7 +76,7 @@ glabel update_player_menu /* 41A828 802A5A98 C624014C */ lwc1 $f4, 0x14c($s1) /* 41A82C 802A5A9C 46041081 */ sub.s $f2, $f2, $f4 /* 41A830 802A5AA0 44823000 */ mtc1 $v0, $f6 -/* 41A834 802A5AA4 00000000 */ nop +/* 41A834 802A5AA4 00000000 */ nop /* 41A838 802A5AA8 468031A0 */ cvt.s.w $f6, $f6 /* 41A83C 802A5AAC 46060003 */ div.s $f0, $f0, $f6 /* 41A840 802A5AB0 46004200 */ add.s $f8, $f8, $f0 @@ -97,7 +97,7 @@ glabel update_player_menu /* 41A87C 802A5AEC 86220070 */ lh $v0, 0x70($s1) /* 41A880 802A5AF0 46040001 */ sub.s $f0, $f0, $f4 /* 41A884 802A5AF4 44821000 */ mtc1 $v0, $f2 -/* 41A888 802A5AF8 00000000 */ nop +/* 41A888 802A5AF8 00000000 */ nop /* 41A88C 802A5AFC 468010A0 */ cvt.s.w $f2, $f2 /* 41A890 802A5B00 46020003 */ div.s $f0, $f0, $f2 /* 41A894 802A5B04 46002100 */ add.s $f4, $f4, $f0 @@ -107,9 +107,9 @@ glabel update_player_menu /* 41A8A0 802A5B10 3C0140C9 */ lui $at, 0x40c9 /* 41A8A4 802A5B14 34210FD0 */ ori $at, $at, 0xfd0 /* 41A8A8 802A5B18 4481B000 */ mtc1 $at, $f22 -/* 41A8AC 802A5B1C 00000000 */ nop +/* 41A8AC 802A5B1C 00000000 */ nop /* 41A8B0 802A5B20 46166302 */ mul.s $f12, $f12, $f22 -/* 41A8B4 802A5B24 00000000 */ nop +/* 41A8B4 802A5B24 00000000 */ nop /* 41A8B8 802A5B28 3C0143B4 */ lui $at, 0x43b4 /* 41A8BC 802A5B2C 4481C000 */ mtc1 $at, $f24 /* 41A8C0 802A5B30 3C014180 */ lui $at, 0x4180 @@ -117,7 +117,7 @@ glabel update_player_menu /* 41A8C8 802A5B38 0C00A85B */ jal sin_rad /* 41A8CC 802A5B3C 46186303 */ div.s $f12, $f12, $f24 /* 41A8D0 802A5B40 46140002 */ mul.s $f0, $f0, $f20 -/* 41A8D4 802A5B44 00000000 */ nop +/* 41A8D4 802A5B44 00000000 */ nop /* 41A8D8 802A5B48 C622014C */ lwc1 $f2, 0x14c($s1) /* 41A8DC 802A5B4C 46001081 */ sub.s $f2, $f2, $f0 /* 41A8E0 802A5B50 C62C0054 */ lwc1 $f12, 0x54($s1) @@ -126,12 +126,12 @@ glabel update_player_menu /* 41A8EC 802A5B5C E622014C */ swc1 $f2, 0x14c($s1) /* 41A8F0 802A5B60 C62C0054 */ lwc1 $f12, 0x54($s1) /* 41A8F4 802A5B64 46166302 */ mul.s $f12, $f12, $f22 -/* 41A8F8 802A5B68 00000000 */ nop +/* 41A8F8 802A5B68 00000000 */ nop /* 41A8FC 802A5B6C E620018C */ swc1 $f0, 0x18c($s1) /* 41A900 802A5B70 0C00A85B */ jal sin_rad /* 41A904 802A5B74 46186303 */ div.s $f12, $f12, $f24 /* 41A908 802A5B78 46140002 */ mul.s $f0, $f0, $f20 -/* 41A90C 802A5B7C 00000000 */ nop +/* 41A90C 802A5B7C 00000000 */ nop /* 41A910 802A5B80 C6E2014C */ lwc1 $f2, 0x14c($s7) /* 41A914 802A5B84 46001080 */ add.s $f2, $f2, $f0 /* 41A918 802A5B88 E6E2014C */ swc1 $f2, 0x14c($s7) @@ -181,11 +181,12 @@ glabel update_player_menu /* 41A9C0 802A5C30 2C62012E */ sltiu $v0, $v1, 0x12e /* 41A9C4 802A5C34 10400943 */ beqz $v0, .L802A8144 /* 41A9C8 802A5C38 00031080 */ sll $v0, $v1, 2 -/* 41A9CC 802A5C3C 3C01802B */ lui $at, %hi(D_802ABBD8) +/* 41A9CC 802A5C3C 3C01802B */ lui $at, %hi(jtbl_802ABBD8_420968) /* 41A9D0 802A5C40 00220821 */ addu $at, $at, $v0 -/* 41A9D4 802A5C44 8C22BBD8 */ lw $v0, %lo(D_802ABBD8)($at) +/* 41A9D4 802A5C44 8C22BBD8 */ lw $v0, %lo(jtbl_802ABBD8_420968)($at) /* 41A9D8 802A5C48 00400008 */ jr $v0 -/* 41A9DC 802A5C4C 00000000 */ nop +/* 41A9DC 802A5C4C 00000000 */ nop +glabel L802A5C50_41A9E0 /* 41A9E0 802A5C50 3C10800E */ lui $s0, %hi(gBattleStatus) /* 41A9E4 802A5C54 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) /* 41A9E8 802A5C58 3C03FBFF */ lui $v1, 0xfbff @@ -206,13 +207,13 @@ glabel update_player_menu /* 41AA24 802A5C94 AE220000 */ sw $v0, ($s1) .L802A5C98: /* 41AA28 802A5C98 0C098C9A */ jal func_80263268 -/* 41AA2C 802A5C9C 00000000 */ nop +/* 41AA2C 802A5C9C 00000000 */ nop /* 41AA30 802A5CA0 0C098CC0 */ jal func_80263300 -/* 41AA34 802A5CA4 00000000 */ nop +/* 41AA34 802A5CA4 00000000 */ nop /* 41AA38 802A5CA8 0C098D2E */ jal func_802634B8 -/* 41AA3C 802A5CAC 00000000 */ nop +/* 41AA3C 802A5CAC 00000000 */ nop /* 41AA40 802A5CB0 0C098DB9 */ jal func_802636E4 -/* 41AA44 802A5CB4 00000000 */ nop +/* 41AA44 802A5CB4 00000000 */ nop /* 41AA48 802A5CB8 02E0202D */ daddu $a0, $s7, $zero /* 41AA4C 802A5CBC 0C099CAB */ jal heroes_is_ability_active /* 41AA50 802A5CC0 24050015 */ addiu $a1, $zero, 0x15 @@ -245,7 +246,7 @@ glabel update_player_menu /* 41AAB8 802A5D28 3C030200 */ lui $v1, 0x200 /* 41AABC 802A5D2C 00431024 */ and $v0, $v0, $v1 /* 41AAC0 802A5D30 10400004 */ beqz $v0, .L802A5D44 -/* 41AAC4 802A5D34 00000000 */ nop +/* 41AAC4 802A5D34 00000000 */ nop .L802A5D38: /* 41AAC8 802A5D38 3C02001D */ lui $v0, 0x1d /* 41AACC 802A5D3C 34420054 */ ori $v0, $v0, 0x54 @@ -259,7 +260,7 @@ glabel update_player_menu /* 41AAE8 802A5D58 96C20070 */ lhu $v0, 0x70($s6) /* 41AAEC 802A5D5C 30420080 */ andi $v0, $v0, 0x80 /* 41AAF0 802A5D60 1440000B */ bnez $v0, .L802A5D90 -/* 41AAF4 802A5D64 00000000 */ nop +/* 41AAF4 802A5D64 00000000 */ nop /* 41AAF8 802A5D68 3C02802B */ lui $v0, %hi(D_802AB47C) /* 41AAFC 802A5D6C 8C42B47C */ lw $v0, %lo(D_802AB47C)($v0) /* 41AB00 802A5D70 3C01802B */ lui $at, %hi(D_802AD0D0) @@ -368,7 +369,7 @@ glabel update_player_menu /* 41AC80 802A5EF0 3C08802B */ lui $t0, %hi(D_802AD090) /* 41AC84 802A5EF4 2508D090 */ addiu $t0, $t0, %lo(D_802AD090) /* 41AC88 802A5EF8 1C400008 */ bgtz $v0, .L802A5F1C -/* 41AC8C 802A5EFC 00000000 */ nop +/* 41AC8C 802A5EFC 00000000 */ nop /* 41AC90 802A5F00 8C820000 */ lw $v0, ($a0) /* 41AC94 802A5F04 ACC20000 */ sw $v0, ($a2) /* 41AC98 802A5F08 24020043 */ addiu $v0, $zero, 0x43 @@ -380,7 +381,7 @@ glabel update_player_menu /* 41ACAC 802A5F1C 96C20070 */ lhu $v0, 0x70($s6) /* 41ACB0 802A5F20 30420001 */ andi $v0, $v0, 1 /* 41ACB4 802A5F24 14400008 */ bnez $v0, .L802A5F48 -/* 41ACB8 802A5F28 00000000 */ nop +/* 41ACB8 802A5F28 00000000 */ nop /* 41ACBC 802A5F2C 8C820004 */ lw $v0, 4($a0) /* 41ACC0 802A5F30 ACC20000 */ sw $v0, ($a2) /* 41ACC4 802A5F34 24020048 */ addiu $v0, $zero, 0x48 @@ -391,7 +392,7 @@ glabel update_player_menu .L802A5F48: /* 41ACD8 802A5F48 82C200AF */ lb $v0, 0xaf($s6) /* 41ACDC 802A5F4C 04400008 */ bltz $v0, .L802A5F70 -/* 41ACE0 802A5F50 00000000 */ nop +/* 41ACE0 802A5F50 00000000 */ nop /* 41ACE4 802A5F54 8C820004 */ lw $v0, 4($a0) /* 41ACE8 802A5F58 ACC20000 */ sw $v0, ($a2) /* 41ACEC 802A5F5C 24020048 */ addiu $v0, $zero, 0x48 @@ -437,7 +438,7 @@ glabel update_player_menu /* 41AD80 802A5FF0 96C20070 */ lhu $v0, 0x70($s6) /* 41AD84 802A5FF4 30420002 */ andi $v0, $v0, 2 /* 41AD88 802A5FF8 14400008 */ bnez $v0, .L802A601C -/* 41AD8C 802A5FFC 00000000 */ nop +/* 41AD8C 802A5FFC 00000000 */ nop /* 41AD90 802A6000 8C620004 */ lw $v0, 4($v1) /* 41AD94 802A6004 ACC20000 */ sw $v0, ($a2) /* 41AD98 802A6008 24020048 */ addiu $v0, $zero, 0x48 @@ -448,7 +449,7 @@ glabel update_player_menu .L802A601C: /* 41ADAC 802A601C 82C200AE */ lb $v0, 0xae($s6) /* 41ADB0 802A6020 04400008 */ bltz $v0, .L802A6044 -/* 41ADB4 802A6024 00000000 */ nop +/* 41ADB4 802A6024 00000000 */ nop /* 41ADB8 802A6028 8C620004 */ lw $v0, 4($v1) /* 41ADBC 802A602C ACC20000 */ sw $v0, ($a2) /* 41ADC0 802A6030 24020048 */ addiu $v0, $zero, 0x48 @@ -494,7 +495,7 @@ glabel update_player_menu /* 41AE54 802A60C4 96C20070 */ lhu $v0, 0x70($s6) /* 41AE58 802A60C8 30420100 */ andi $v0, $v0, 0x100 /* 41AE5C 802A60CC 14400006 */ bnez $v0, .L802A60E8 -/* 41AE60 802A60D0 00000000 */ nop +/* 41AE60 802A60D0 00000000 */ nop /* 41AE64 802A60D4 8CC20004 */ lw $v0, 4($a2) /* 41AE68 802A60D8 ACA20000 */ sw $v0, ($a1) /* 41AE6C 802A60DC 24020048 */ addiu $v0, $zero, 0x48 @@ -518,20 +519,20 @@ glabel update_player_menu /* 41AEA8 802A6118 3C01802B */ lui $at, %hi(D_802AD100) /* 41AEAC 802A611C AC22D100 */ sw $v0, %lo(D_802AD100)($at) /* 41AEB0 802A6120 0C0A9634 */ jal func_802A58D0 -/* 41AEB4 802A6124 00000000 */ nop +/* 41AEB4 802A6124 00000000 */ nop /* 41AEB8 802A6128 10400006 */ beqz $v0, .L802A6144 -/* 41AEBC 802A612C 00000000 */ nop +/* 41AEBC 802A612C 00000000 */ nop /* 41AEC0 802A6130 24020001 */ addiu $v0, $zero, 1 /* 41AEC4 802A6134 3C01802B */ lui $at, %hi(D_802AD104) /* 41AEC8 802A6138 AC22D104 */ sw $v0, %lo(D_802AD104)($at) /* 41AECC 802A613C 080A9853 */ j .L802A614C -/* 41AED0 802A6140 00000000 */ nop +/* 41AED0 802A6140 00000000 */ nop .L802A6144: /* 41AED4 802A6144 3C01802B */ lui $at, %hi(D_802AD104) /* 41AED8 802A6148 AC20D104 */ sw $zero, %lo(D_802AD104)($at) .L802A614C: /* 41AEDC 802A614C 0C0A8400 */ jal func_802A1000 -/* 41AEE0 802A6150 00000000 */ nop +/* 41AEE0 802A6150 00000000 */ nop /* 41AEE4 802A6154 24020008 */ addiu $v0, $zero, 8 /* 41AEE8 802A6158 3C01802B */ lui $at, %hi(D_802ACC60) /* 41AEEC 802A615C AC22CC60 */ sw $v0, %lo(D_802ACC60)($at) @@ -539,6 +540,7 @@ glabel update_player_menu /* 41AEF4 802A6164 AC20CC6C */ sw $zero, %lo(D_802ACC6C)($at) /* 41AEF8 802A6168 080AA04F */ j .L802A813C /* 41AEFC 802A616C 24020001 */ addiu $v0, $zero, 1 +glabel L802A6170_41AF00 /* 41AF00 802A6170 82C2008B */ lb $v0, 0x8b($s6) /* 41AF04 802A6174 10400005 */ beqz $v0, .L802A618C /* 41AF08 802A6178 0000202D */ daddu $a0, $zero, $zero @@ -554,9 +556,9 @@ glabel update_player_menu /* 41AF2C 802A619C 0040302D */ daddu $a2, $v0, $zero .L802A61A0: /* 41AF30 802A61A0 0C098F3F */ jal set_animation -/* 41AF34 802A61A4 00000000 */ nop +/* 41AF34 802A61A4 00000000 */ nop /* 41AF38 802A61A8 0C0A846C */ jal func_802A11B0 -/* 41AF3C 802A61AC 00000000 */ nop +/* 41AF3C 802A61AC 00000000 */ nop /* 41AF40 802A61B0 3C04802B */ lui $a0, %hi(D_802ACC6C) /* 41AF44 802A61B4 2484CC6C */ addiu $a0, $a0, %lo(D_802ACC6C) /* 41AF48 802A61B8 8C830000 */ lw $v1, ($a0) @@ -571,20 +573,20 @@ glabel update_player_menu /* 41AF68 802A61D8 3C030200 */ lui $v1, 0x200 /* 41AF6C 802A61DC 00431024 */ and $v0, $v0, $v1 /* 41AF70 802A61E0 1440002A */ bnez $v0, .L802A628C -/* 41AF74 802A61E4 00000000 */ nop +/* 41AF74 802A61E4 00000000 */ nop /* 41AF78 802A61E8 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 41AF7C 802A61EC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 41AF80 802A61F0 8C420010 */ lw $v0, 0x10($v0) /* 41AF84 802A61F4 30422000 */ andi $v0, $v0, 0x2000 /* 41AF88 802A61F8 10400024 */ beqz $v0, .L802A628C -/* 41AF8C 802A61FC 00000000 */ nop +/* 41AF8C 802A61FC 00000000 */ nop /* 41AF90 802A6200 0C0A9634 */ jal func_802A58D0 -/* 41AF94 802A6204 00000000 */ nop +/* 41AF94 802A6204 00000000 */ nop /* 41AF98 802A6208 10400013 */ beqz $v0, .L802A6258 /* 41AF9C 802A620C 24020001 */ addiu $v0, $zero, 1 /* 41AFA0 802A6210 82C3008B */ lb $v1, 0x8b($s6) /* 41AFA4 802A6214 10620010 */ beq $v1, $v0, .L802A6258 -/* 41AFA8 802A6218 00000000 */ nop +/* 41AFA8 802A6218 00000000 */ nop /* 41AFAC 802A621C 0C05272D */ jal play_sound /* 41AFB0 802A6220 2404000F */ addiu $a0, $zero, 0xf /* 41AFB4 802A6224 3C02802B */ lui $v0, %hi(D_802AD002) @@ -599,7 +601,7 @@ glabel update_player_menu /* 41AFD8 802A6248 0C0A842E */ jal func_802A10B8 /* 41AFDC 802A624C A2C2004C */ sb $v0, 0x4c($s6) /* 41AFE0 802A6250 080A9F71 */ j .L802A7DC4 -/* 41AFE4 802A6254 00000000 */ nop +/* 41AFE4 802A6254 00000000 */ nop .L802A6258: /* 41AFE8 802A6258 122007BA */ beqz $s1, .L802A8144 /* 41AFEC 802A625C 3C030020 */ lui $v1, 0x20 @@ -609,7 +611,7 @@ glabel update_player_menu /* 41AFFC 802A626C 24020001 */ addiu $v0, $zero, 1 /* 41B000 802A6270 82C3008B */ lb $v1, 0x8b($s6) /* 41B004 802A6274 106207B3 */ beq $v1, $v0, .L802A8144 -/* 41B008 802A6278 00000000 */ nop +/* 41B008 802A6278 00000000 */ nop /* 41B00C 802A627C 0C05272D */ jal play_sound /* 41B010 802A6280 2404021D */ addiu $a0, $zero, 0x21d /* 41B014 802A6284 080AA04F */ j .L802A813C @@ -650,16 +652,16 @@ glabel update_player_menu /* 41B098 802A6308 10400005 */ beqz $v0, .L802A6320 /* 41B09C 802A630C 24020002 */ addiu $v0, $zero, 2 /* 41B0A0 802A6310 10600059 */ beqz $v1, .L802A6478 -/* 41B0A4 802A6314 00000000 */ nop +/* 41B0A4 802A6314 00000000 */ nop /* 41B0A8 802A6318 080A99AC */ j .L802A66B0 -/* 41B0AC 802A631C 00000000 */ nop +/* 41B0AC 802A631C 00000000 */ nop .L802A6320: /* 41B0B0 802A6320 10620005 */ beq $v1, $v0, .L802A6338 /* 41B0B4 802A6324 24020008 */ addiu $v0, $zero, 8 /* 41B0B8 802A6328 1062005E */ beq $v1, $v0, .L802A64A4 /* 41B0BC 802A632C 24140001 */ addiu $s4, $zero, 1 /* 41B0C0 802A6330 080A99AC */ j .L802A66B0 -/* 41B0C4 802A6334 00000000 */ nop +/* 41B0C4 802A6334 00000000 */ nop .L802A6338: /* 41B0C8 802A6338 0000982D */ daddu $s3, $zero, $zero /* 41B0CC 802A633C 3C148008 */ lui $s4, %hi(gItemTable) @@ -744,12 +746,12 @@ glabel update_player_menu /* 41B1F4 802A6464 A2C0020E */ sb $zero, 0x20e($s6) .L802A6468: /* 41B1F8 802A6468 0C098DB9 */ jal func_802636E4 -/* 41B1FC 802A646C 00000000 */ nop +/* 41B1FC 802A646C 00000000 */ nop /* 41B200 802A6470 080A9920 */ j .L802A6480 -/* 41B204 802A6474 00000000 */ nop +/* 41B204 802A6474 00000000 */ nop .L802A6478: /* 41B208 802A6478 0C098D2E */ jal func_802634B8 -/* 41B20C 802A647C 00000000 */ nop +/* 41B20C 802A647C 00000000 */ nop .L802A6480: /* 41B210 802A6480 92C2020E */ lbu $v0, 0x20e($s6) /* 41B214 802A6484 50500001 */ beql $v0, $s0, .L802A648C @@ -760,7 +762,7 @@ glabel update_player_menu /* 41B224 802A6494 50620086 */ beql $v1, $v0, .L802A66B0 /* 41B228 802A6498 A2C0020E */ sb $zero, 0x20e($s6) /* 41B22C 802A649C 080A99AC */ j .L802A66B0 -/* 41B230 802A64A0 00000000 */ nop +/* 41B230 802A64A0 00000000 */ nop .L802A64A4: /* 41B234 802A64A4 0000982D */ daddu $s3, $zero, $zero /* 41B238 802A64A8 24020077 */ addiu $v0, $zero, 0x77 @@ -928,14 +930,14 @@ glabel update_player_menu /* 41B47C 802A66EC 240200C8 */ addiu $v0, $zero, 0xc8 .L802A66F0: /* 41B480 802A66F0 0C0A842E */ jal func_802A10B8 -/* 41B484 802A66F4 00000000 */ nop +/* 41B484 802A66F4 00000000 */ nop /* 41B488 802A66F8 24040012 */ addiu $a0, $zero, 0x12 /* 41B48C 802A66FC A2D00178 */ sb $s0, 0x178($s6) /* 41B490 802A6700 A6C0017A */ sh $zero, 0x17a($s6) /* 41B494 802A6704 0C090464 */ jal func_80241190 /* 41B498 802A6708 A6C0017C */ sh $zero, 0x17c($s6) /* 41B49C 802A670C 080AA051 */ j .L802A8144 -/* 41B4A0 802A6710 00000000 */ nop +/* 41B4A0 802A6710 00000000 */ nop .L802A6714: /* 41B4A4 802A6714 92C2020E */ lbu $v0, 0x20e($s6) /* 41B4A8 802A6718 14400005 */ bnez $v0, .L802A6730 @@ -966,7 +968,7 @@ glabel update_player_menu /* 41B4FC 802A676C 24020002 */ addiu $v0, $zero, 2 .L802A6770: /* 41B500 802A6770 14620005 */ bne $v1, $v0, .L802A6788 -/* 41B504 802A6774 00000000 */ nop +/* 41B504 802A6774 00000000 */ nop /* 41B508 802A6778 82C2004F */ lb $v0, 0x4f($s6) /* 41B50C 802A677C 04420001 */ bltzl $v0, .L802A6784 /* 41B510 802A6780 A2C0004F */ sb $zero, 0x4f($s6) @@ -1034,7 +1036,7 @@ glabel update_player_menu /* 41B5EC 802A685C AC620000 */ sw $v0, ($v1) /* 41B5F0 802A6860 828201F6 */ lb $v0, 0x1f6($s4) /* 41B5F4 802A6864 14400003 */ bnez $v0, .L802A6874 -/* 41B5F8 802A6868 00000000 */ nop +/* 41B5F8 802A6868 00000000 */ nop /* 41B5FC 802A686C 8EA20004 */ lw $v0, 4($s5) /* 41B600 802A6870 AC620000 */ sw $v0, ($v1) .L802A6874: @@ -1113,11 +1115,12 @@ glabel update_player_menu /* 41B718 802A6988 3C01802B */ lui $at, %hi(D_802AD4A4) /* 41B71C 802A698C AC22D4A4 */ sw $v0, %lo(D_802AD4A4)($at) /* 41B720 802A6990 0C0A89A1 */ jal func_802A2684 -/* 41B724 802A6994 00000000 */ nop +/* 41B724 802A6994 00000000 */ nop /* 41B728 802A6998 080AA04F */ j .L802A813C /* 41B72C 802A699C 24020002 */ addiu $v0, $zero, 2 +glabel L802A69A0_41B730 /* 41B730 802A69A0 0C0A8B21 */ jal func_802A2C84 -/* 41B734 802A69A4 00000000 */ nop +/* 41B734 802A69A4 00000000 */ nop /* 41B738 802A69A8 0040802D */ daddu $s0, $v0, $zero /* 41B73C 802A69AC 2402FFFF */ addiu $v0, $zero, -1 /* 41B740 802A69B0 120205E2 */ beq $s0, $v0, .L802A813C @@ -1127,7 +1130,7 @@ glabel update_player_menu /* 41B750 802A69C0 5602000B */ bnel $s0, $v0, .L802A69F0 /* 41B754 802A69C4 2602FFFF */ addiu $v0, $s0, -1 /* 41B758 802A69C8 0C0A8414 */ jal func_802A1050 -/* 41B75C 802A69CC 00000000 */ nop +/* 41B75C 802A69CC 00000000 */ nop /* 41B760 802A69D0 24020008 */ addiu $v0, $zero, 8 /* 41B764 802A69D4 3C01802B */ lui $at, %hi(D_802ACC60) /* 41B768 802A69D8 AC22CC60 */ sw $v0, %lo(D_802ACC60)($at) @@ -1156,7 +1159,7 @@ glabel update_player_menu /* 41B7BC 802A6A2C 82C30048 */ lb $v1, 0x48($s6) /* 41B7C0 802A6A30 24020001 */ addiu $v0, $zero, 1 /* 41B7C4 802A6A34 14620004 */ bne $v1, $v0, .L802A6A48 -/* 41B7C8 802A6A38 00000000 */ nop +/* 41B7C8 802A6A38 00000000 */ nop /* 41B7CC 802A6A3C 3C02802B */ lui $v0, %hi(D_802AD603) /* 41B7D0 802A6A40 9042D603 */ lbu $v0, %lo(D_802AD603)($v0) /* 41B7D4 802A6A44 A2C2004E */ sb $v0, 0x4e($s6) @@ -1173,28 +1176,29 @@ glabel update_player_menu /* 41B7FC 802A6A6C 24020014 */ addiu $v0, $zero, 0x14 .L802A6A70: /* 41B800 802A6A70 0C0A89F4 */ jal func_802A27D0 -/* 41B804 802A6A74 00000000 */ nop +/* 41B804 802A6A74 00000000 */ nop /* 41B808 802A6A78 0C0A840C */ jal func_802A1030 -/* 41B80C 802A6A7C 00000000 */ nop +/* 41B80C 802A6A7C 00000000 */ nop /* 41B810 802A6A80 080AA04F */ j .L802A813C /* 41B814 802A6A84 24020003 */ addiu $v0, $zero, 3 +glabel L802A6A88_41B818 /* 41B818 802A6A88 0C0A8B21 */ jal func_802A2C84 -/* 41B81C 802A6A8C 00000000 */ nop +/* 41B81C 802A6A8C 00000000 */ nop /* 41B820 802A6A90 8EC30214 */ lw $v1, 0x214($s6) /* 41B824 802A6A94 30634000 */ andi $v1, $v1, 0x4000 /* 41B828 802A6A98 10600009 */ beqz $v1, .L802A6AC0 /* 41B82C 802A6A9C 0040802D */ daddu $s0, $v0, $zero /* 41B830 802A6AA0 16000007 */ bnez $s0, .L802A6AC0 -/* 41B834 802A6AA4 00000000 */ nop +/* 41B834 802A6AA4 00000000 */ nop /* 41B838 802A6AA8 0C0A8AAE */ jal func_802A2AB8 -/* 41B83C 802A6AAC 00000000 */ nop +/* 41B83C 802A6AAC 00000000 */ nop /* 41B840 802A6AB0 0C0A8426 */ jal func_802A1098 -/* 41B844 802A6AB4 00000000 */ nop +/* 41B844 802A6AB4 00000000 */ nop /* 41B848 802A6AB8 080AA04F */ j .L802A813C /* 41B84C 802A6ABC 24020004 */ addiu $v0, $zero, 4 .L802A6AC0: /* 41B850 802A6AC0 0C0A846C */ jal func_802A11B0 -/* 41B854 802A6AC4 00000000 */ nop +/* 41B854 802A6AC4 00000000 */ nop /* 41B858 802A6AC8 1040059E */ beqz $v0, .L802A8144 /* 41B85C 802A6ACC 24020005 */ addiu $v0, $zero, 5 /* 41B860 802A6AD0 A6C2006C */ sh $v0, 0x6c($s6) @@ -1223,12 +1227,12 @@ glabel update_player_menu /* 41B8BC 802A6B2C 12000007 */ beqz $s0, .L802A6B4C /* 41B8C0 802A6B30 24040011 */ addiu $a0, $zero, 0x11 /* 41B8C4 802A6B34 080AA051 */ j .L802A8144 -/* 41B8C8 802A6B38 00000000 */ nop +/* 41B8C8 802A6B38 00000000 */ nop .L802A6B3C: /* 41B8CC 802A6B3C 1202000F */ beq $s0, $v0, .L802A6B7C -/* 41B8D0 802A6B40 00000000 */ nop +/* 41B8D0 802A6B40 00000000 */ nop /* 41B8D4 802A6B44 080AA051 */ j .L802A8144 -/* 41B8D8 802A6B48 00000000 */ nop +/* 41B8D8 802A6B48 00000000 */ nop .L802A6B4C: /* 41B8DC 802A6B4C 92A20000 */ lbu $v0, ($s5) /* 41B8E0 802A6B50 080A9AD9 */ j .L802A6B64 @@ -1243,36 +1247,40 @@ glabel update_player_menu /* 41B8FC 802A6B6C 0C090464 */ jal func_80241190 /* 41B900 802A6B70 A6C2017A */ sh $v0, 0x17a($s6) /* 41B904 802A6B74 080AA051 */ j .L802A8144 -/* 41B908 802A6B78 00000000 */ nop +/* 41B908 802A6B78 00000000 */ nop .L802A6B7C: /* 41B90C 802A6B7C 86C2006E */ lh $v0, 0x6e($s6) /* 41B910 802A6B80 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41B914 802A6B84 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 41B918 802A6B88 0C0A9662 */ jal update_player_menu -/* 41B91C 802A6B8C 00000000 */ nop +/* 41B91C 802A6B8C 00000000 */ nop /* 41B920 802A6B90 080A9F69 */ j .L802A7DA4 /* 41B924 802A6B94 24040019 */ addiu $a0, $zero, 0x19 +glabel L802A6B98_41B928 /* 41B928 802A6B98 0C0A8B21 */ jal func_802A2C84 -/* 41B92C 802A6B9C 00000000 */ nop +/* 41B92C 802A6B9C 00000000 */ nop /* 41B930 802A6BA0 0C0A846C */ jal func_802A11B0 -/* 41B934 802A6BA4 00000000 */ nop +/* 41B934 802A6BA4 00000000 */ nop /* 41B938 802A6BA8 10400566 */ beqz $v0, .L802A8144 /* 41B93C 802A6BAC 24020002 */ addiu $v0, $zero, 2 /* 41B940 802A6BB0 080AA04F */ j .L802A813C -/* 41B944 802A6BB4 00000000 */ nop +/* 41B944 802A6BB4 00000000 */ nop +glabel L802A6BB8_41B948 /* 41B948 802A6BB8 0C0A8AAE */ jal func_802A2AB8 -/* 41B94C 802A6BBC 00000000 */ nop +/* 41B94C 802A6BBC 00000000 */ nop /* 41B950 802A6BC0 0C0A8426 */ jal func_802A1098 -/* 41B954 802A6BC4 00000000 */ nop +/* 41B954 802A6BC4 00000000 */ nop /* 41B958 802A6BC8 080AA04F */ j .L802A813C /* 41B95C 802A6BCC 24020004 */ addiu $v0, $zero, 4 +glabel L802A6BD0_41B960 /* 41B960 802A6BD0 0C0A8B21 */ jal func_802A2C84 -/* 41B964 802A6BD4 00000000 */ nop +/* 41B964 802A6BD4 00000000 */ nop /* 41B968 802A6BD8 2403FFFF */ addiu $v1, $zero, -1 /* 41B96C 802A6BDC 10430559 */ beq $v0, $v1, .L802A8144 /* 41B970 802A6BE0 24020002 */ addiu $v0, $zero, 2 /* 41B974 802A6BE4 080AA04F */ j .L802A813C -/* 41B978 802A6BE8 00000000 */ nop +/* 41B978 802A6BE8 00000000 */ nop +glabel L802A6BEC_41B97C /* 41B97C 802A6BEC 3C02800E */ lui $v0, %hi(gBattleStatus+0x4) /* 41B980 802A6BF0 8C42C074 */ lw $v0, %lo(gBattleStatus+0x4)($v0) /* 41B984 802A6BF4 30420004 */ andi $v0, $v0, 4 @@ -1287,14 +1295,15 @@ glabel update_player_menu /* 41B9A4 802A6C14 2405003C */ addiu $a1, $zero, 0x3c .L802A6C18: /* 41B9A8 802A6C18 0C093E81 */ jal show_variable_battle_message -/* 41B9AC 802A6C1C 00000000 */ nop +/* 41B9AC 802A6C1C 00000000 */ nop /* 41B9B0 802A6C20 24020001 */ addiu $v0, $zero, 1 /* 41B9B4 802A6C24 3C01802B */ lui $at, %hi(D_802AD607) /* 41B9B8 802A6C28 A022D607 */ sb $v0, %lo(D_802AD607)($at) /* 41B9BC 802A6C2C 080AA04F */ j .L802A813C /* 41B9C0 802A6C30 24020009 */ addiu $v0, $zero, 9 +glabel L802A6C34_41B9C4 /* 41B9C4 802A6C34 0C093EAD */ jal is_popup_displayed -/* 41B9C8 802A6C38 00000000 */ nop +/* 41B9C8 802A6C38 00000000 */ nop /* 41B9CC 802A6C3C 14400541 */ bnez $v0, .L802A8144 /* 41B9D0 802A6C40 24020004 */ addiu $v0, $zero, 4 /* 41B9D4 802A6C44 3C01802B */ lui $at, %hi(D_802ACC6C) @@ -1305,25 +1314,27 @@ glabel update_player_menu /* 41B9E8 802A6C58 AC20CC60 */ sw $zero, %lo(D_802ACC60)($at) /* 41B9EC 802A6C5C 080AA04F */ j .L802A813C /* 41B9F0 802A6C60 24020001 */ addiu $v0, $zero, 1 +glabel L802A6C64_41B9F4 /* 41B9F4 802A6C64 0C0A840C */ jal func_802A1030 -/* 41B9F8 802A6C68 00000000 */ nop +/* 41B9F8 802A6C68 00000000 */ nop /* 41B9FC 802A6C6C 080AA04F */ j .L802A813C /* 41BA00 802A6C70 2402000B */ addiu $v0, $zero, 0xb +glabel L802A6C74_41BA04 /* 41BA04 802A6C74 0C0A846C */ jal func_802A11B0 -/* 41BA08 802A6C78 00000000 */ nop +/* 41BA08 802A6C78 00000000 */ nop /* 41BA0C 802A6C7C 8EC30214 */ lw $v1, 0x214($s6) /* 41BA10 802A6C80 30634000 */ andi $v1, $v1, 0x4000 /* 41BA14 802A6C84 10600007 */ beqz $v1, .L802A6CA4 /* 41BA18 802A6C88 0040802D */ daddu $s0, $v0, $zero /* 41BA1C 802A6C8C 16000007 */ bnez $s0, .L802A6CAC -/* 41BA20 802A6C90 00000000 */ nop +/* 41BA20 802A6C90 00000000 */ nop /* 41BA24 802A6C94 0C0A841E */ jal func_802A1078 -/* 41BA28 802A6C98 00000000 */ nop +/* 41BA28 802A6C98 00000000 */ nop /* 41BA2C 802A6C9C 080AA04F */ j .L802A813C /* 41BA30 802A6CA0 2402000C */ addiu $v0, $zero, 0xc .L802A6CA4: /* 41BA34 802A6CA4 12000527 */ beqz $s0, .L802A8144 -/* 41BA38 802A6CA8 00000000 */ nop +/* 41BA38 802A6CA8 00000000 */ nop .L802A6CAC: /* 41BA3C 802A6CAC 82C40048 */ lb $a0, 0x48($s6) /* 41BA40 802A6CB0 2402000D */ addiu $v0, $zero, 0xd @@ -1333,9 +1344,9 @@ glabel update_player_menu /* 41BA50 802A6CC0 A6C2006E */ sh $v0, 0x6e($s6) /* 41BA54 802A6CC4 24020001 */ addiu $v0, $zero, 1 /* 41BA58 802A6CC8 1082000C */ beq $a0, $v0, .L802A6CFC -/* 41BA5C 802A6CCC 00000000 */ nop +/* 41BA5C 802A6CCC 00000000 */ nop /* 41BA60 802A6CD0 080A9B56 */ j .L802A6D58 -/* 41BA64 802A6CD4 00000000 */ nop +/* 41BA64 802A6CD4 00000000 */ nop .L802A6CD8: /* 41BA68 802A6CD8 92A30000 */ lbu $v1, ($s5) /* 41BA6C 802A6CDC A2C00178 */ sb $zero, 0x178($s6) @@ -1370,10 +1381,11 @@ glabel update_player_menu /* 41BAD8 802A6D48 0C090464 */ jal func_80241190 /* 41BADC 802A6D4C AEC20184 */ sw $v0, 0x184($s6) /* 41BAE0 802A6D50 080AA051 */ j .L802A8144 -/* 41BAE4 802A6D54 00000000 */ nop +/* 41BAE4 802A6D54 00000000 */ nop .L802A6D58: +glabel L802A6D58_41BAE8 /* 41BAE8 802A6D58 0C0A846C */ jal func_802A11B0 -/* 41BAEC 802A6D5C 00000000 */ nop +/* 41BAEC 802A6D5C 00000000 */ nop /* 41BAF0 802A6D60 104004F8 */ beqz $v0, .L802A8144 /* 41BAF4 802A6D64 24020008 */ addiu $v0, $zero, 8 /* 41BAF8 802A6D68 3C01802B */ lui $at, %hi(D_802ACC60) @@ -1383,10 +1395,12 @@ glabel update_player_menu /* 41BB08 802A6D78 AC22CC6C */ sw $v0, %lo(D_802ACC6C)($at) /* 41BB0C 802A6D7C 080AA04F */ j .L802A813C /* 41BB10 802A6D80 24020001 */ addiu $v0, $zero, 1 +glabel L802A6D84_41BB14 /* 41BB14 802A6D84 0C0A841E */ jal func_802A1078 -/* 41BB18 802A6D88 00000000 */ nop +/* 41BB18 802A6D88 00000000 */ nop /* 41BB1C 802A6D8C 080AA04F */ j .L802A813C /* 41BB20 802A6D90 2402000C */ addiu $v0, $zero, 0xc +glabel L802A6D94_41BB24 /* 41BB24 802A6D94 86C3017C */ lh $v1, 0x17c($s6) /* 41BB28 802A6D98 24020035 */ addiu $v0, $zero, 0x35 /* 41BB2C 802A6D9C 14620005 */ bne $v1, $v0, .L802A6DB4 @@ -1491,9 +1505,10 @@ glabel update_player_menu /* 41BC94 802A6F04 0C03D44F */ jal func_800F513C /* 41BC98 802A6F08 AC9E0328 */ sw $fp, 0x328($a0) /* 41BC9C 802A6F0C 0C03D4AF */ jal func_800F52BC -/* 41BCA0 802A6F10 00000000 */ nop +/* 41BCA0 802A6F10 00000000 */ nop /* 41BCA4 802A6F14 080AA04F */ j .L802A813C /* 41BCA8 802A6F18 24020015 */ addiu $v0, $zero, 0x15 +glabel L802A6F1C_41BCAC /* 41BCAC 802A6F1C 3C03802B */ lui $v1, %hi(D_802ACFFC) /* 41BCB0 802A6F20 8463CFFC */ lh $v1, %lo(D_802ACFFC)($v1) /* 41BCB4 802A6F24 10600487 */ beqz $v1, .L802A8144 @@ -1501,7 +1516,7 @@ glabel update_player_menu /* 41BCBC 802A6F2C 14620007 */ bne $v1, $v0, .L802A6F4C /* 41BCC0 802A6F30 24020018 */ addiu $v0, $zero, 0x18 /* 41BCC4 802A6F34 0C0A8A44 */ jal func_802A2910 -/* 41BCC8 802A6F38 00000000 */ nop +/* 41BCC8 802A6F38 00000000 */ nop /* 41BCCC 802A6F3C 24020002 */ addiu $v0, $zero, 2 /* 41BCD0 802A6F40 A6C0017C */ sh $zero, 0x17c($s6) /* 41BCD4 802A6F44 080A9FE1 */ j .L802A7F84 @@ -1536,60 +1551,65 @@ glabel update_player_menu /* 41BD44 802A6FB4 0C03C4EC */ jal func_800F13B0 /* 41BD48 802A6FB8 AEC30184 */ sw $v1, 0x184($s6) /* 41BD4C 802A6FBC 0C0A89F4 */ jal func_802A27D0 -/* 41BD50 802A6FC0 00000000 */ nop +/* 41BD50 802A6FC0 00000000 */ nop /* 41BD54 802A6FC4 0C0A840C */ jal func_802A1030 -/* 41BD58 802A6FC8 00000000 */ nop +/* 41BD58 802A6FC8 00000000 */ nop /* 41BD5C 802A6FCC 080AA04F */ j .L802A813C /* 41BD60 802A6FD0 24020016 */ addiu $v0, $zero, 0x16 +glabel L802A6FD4_41BD64 /* 41BD64 802A6FD4 8EC20214 */ lw $v0, 0x214($s6) /* 41BD68 802A6FD8 30424000 */ andi $v0, $v0, 0x4000 /* 41BD6C 802A6FDC 1040000E */ beqz $v0, .L802A7018 -/* 41BD70 802A6FE0 00000000 */ nop +/* 41BD70 802A6FE0 00000000 */ nop /* 41BD74 802A6FE4 3C02802B */ lui $v0, %hi(D_802ACFFC) /* 41BD78 802A6FE8 8442CFFC */ lh $v0, %lo(D_802ACFFC)($v0) /* 41BD7C 802A6FEC 1440000A */ bnez $v0, .L802A7018 -/* 41BD80 802A6FF0 00000000 */ nop +/* 41BD80 802A6FF0 00000000 */ nop /* 41BD84 802A6FF4 0C03C5B3 */ jal func_800F16CC -/* 41BD88 802A6FF8 00000000 */ nop +/* 41BD88 802A6FF8 00000000 */ nop /* 41BD8C 802A6FFC 0C0A8B16 */ jal func_802A2C58 -/* 41BD90 802A7000 00000000 */ nop +/* 41BD90 802A7000 00000000 */ nop /* 41BD94 802A7004 0C0A8426 */ jal func_802A1098 -/* 41BD98 802A7008 00000000 */ nop +/* 41BD98 802A7008 00000000 */ nop /* 41BD9C 802A700C 24020017 */ addiu $v0, $zero, 0x17 /* 41BDA0 802A7010 080AA04F */ j .L802A813C /* 41BDA4 802A7014 A6C0017C */ sh $zero, 0x17c($s6) .L802A7018: /* 41BDA8 802A7018 0C0A8B21 */ jal func_802A2C84 -/* 41BDAC 802A701C 00000000 */ nop +/* 41BDAC 802A701C 00000000 */ nop .L802A7020: /* 41BDB0 802A7020 0C0A846C */ jal func_802A11B0 -/* 41BDB4 802A7024 00000000 */ nop +/* 41BDB4 802A7024 00000000 */ nop /* 41BDB8 802A7028 10400446 */ beqz $v0, .L802A8144 -/* 41BDBC 802A702C 00000000 */ nop +/* 41BDBC 802A702C 00000000 */ nop /* 41BDC0 802A7030 080A9E2B */ j .L802A78AC -/* 41BDC4 802A7034 00000000 */ nop +/* 41BDC4 802A7034 00000000 */ nop +glabel L802A7038_41BDC8 /* 41BDC8 802A7038 0C0A8B21 */ jal func_802A2C84 -/* 41BDCC 802A703C 00000000 */ nop +/* 41BDCC 802A703C 00000000 */ nop /* 41BDD0 802A7040 0C0A846C */ jal func_802A11B0 -/* 41BDD4 802A7044 00000000 */ nop +/* 41BDD4 802A7044 00000000 */ nop /* 41BDD8 802A7048 1040043E */ beqz $v0, .L802A8144 /* 41BDDC 802A704C 24020015 */ addiu $v0, $zero, 0x15 /* 41BDE0 802A7050 080AA04F */ j .L802A813C -/* 41BDE4 802A7054 00000000 */ nop +/* 41BDE4 802A7054 00000000 */ nop +glabel L802A7058_41BDE8 /* 41BDE8 802A7058 0C03C5B3 */ jal func_800F16CC -/* 41BDEC 802A705C 00000000 */ nop +/* 41BDEC 802A705C 00000000 */ nop /* 41BDF0 802A7060 0C0A8B16 */ jal func_802A2C58 -/* 41BDF4 802A7064 00000000 */ nop +/* 41BDF4 802A7064 00000000 */ nop /* 41BDF8 802A7068 0C0A8426 */ jal func_802A1098 -/* 41BDFC 802A706C 00000000 */ nop +/* 41BDFC 802A706C 00000000 */ nop /* 41BE00 802A7070 0C0A8B21 */ jal func_802A2C84 -/* 41BE04 802A7074 00000000 */ nop +/* 41BE04 802A7074 00000000 */ nop /* 41BE08 802A7078 080AA04F */ j .L802A813C /* 41BE0C 802A707C 24020017 */ addiu $v0, $zero, 0x17 +glabel L802A7080_41BE10 /* 41BE10 802A7080 0C03C54E */ jal func_800F1538 -/* 41BE14 802A7084 00000000 */ nop +/* 41BE14 802A7084 00000000 */ nop /* 41BE18 802A7088 080A9D8B */ j .L802A762C -/* 41BE1C 802A708C 00000000 */ nop +/* 41BE1C 802A708C 00000000 */ nop +glabel L802A7090_41BE20 /* 41BE20 802A7090 0000A02D */ daddu $s4, $zero, $zero /* 41BE24 802A7094 0280982D */ daddu $s3, $s4, $zero /* 41BE28 802A7098 241E0002 */ addiu $fp, $zero, 2 @@ -1658,9 +1678,10 @@ glabel update_player_menu /* 41BF10 802A7180 0C03D44F */ jal func_800F513C /* 41BF14 802A7184 AC9E0328 */ sw $fp, 0x328($a0) /* 41BF18 802A7188 0C03D4AF */ jal func_800F52BC -/* 41BF1C 802A718C 00000000 */ nop +/* 41BF1C 802A718C 00000000 */ nop /* 41BF20 802A7190 080AA04F */ j .L802A813C /* 41BF24 802A7194 24020029 */ addiu $v0, $zero, 0x29 +glabel L802A7198_41BF28 /* 41BF28 802A7198 3C03802B */ lui $v1, %hi(D_802ACFFC) /* 41BF2C 802A719C 8463CFFC */ lh $v1, %lo(D_802ACFFC)($v1) /* 41BF30 802A71A0 106003E8 */ beqz $v1, .L802A8144 @@ -1668,7 +1689,7 @@ glabel update_player_menu /* 41BF38 802A71A8 5462000B */ bnel $v1, $v0, .L802A71D8 /* 41BF3C 802A71AC 2402002C */ addiu $v0, $zero, 0x2c /* 41BF40 802A71B0 0C0A8414 */ jal func_802A1050 -/* 41BF44 802A71B4 00000000 */ nop +/* 41BF44 802A71B4 00000000 */ nop /* 41BF48 802A71B8 24020008 */ addiu $v0, $zero, 8 /* 41BF4C 802A71BC 3C01802B */ lui $at, %hi(D_802ACC60) /* 41BF50 802A71C0 AC22CC60 */ sw $v0, %lo(D_802ACC60)($at) @@ -1710,42 +1731,48 @@ glabel update_player_menu /* 41BFDC 802A724C 0C03C4EC */ jal func_800F13B0 /* 41BFE0 802A7250 AEC30184 */ sw $v1, 0x184($s6) /* 41BFE4 802A7254 0C0A840C */ jal func_802A1030 -/* 41BFE8 802A7258 00000000 */ nop +/* 41BFE8 802A7258 00000000 */ nop /* 41BFEC 802A725C 080AA04F */ j .L802A813C /* 41BFF0 802A7260 2402002A */ addiu $v0, $zero, 0x2a +glabel L802A7264_41BFF4 /* 41BFF4 802A7264 8EC20214 */ lw $v0, 0x214($s6) /* 41BFF8 802A7268 30424000 */ andi $v0, $v0, 0x4000 /* 41BFFC 802A726C 1040FF6C */ beqz $v0, .L802A7020 -/* 41C000 802A7270 00000000 */ nop +/* 41C000 802A7270 00000000 */ nop /* 41C004 802A7274 3C02802B */ lui $v0, %hi(D_802ACFFC) /* 41C008 802A7278 8442CFFC */ lh $v0, %lo(D_802ACFFC)($v0) /* 41C00C 802A727C 1440FF68 */ bnez $v0, .L802A7020 -/* 41C010 802A7280 00000000 */ nop +/* 41C010 802A7280 00000000 */ nop /* 41C014 802A7284 0C03C5B3 */ jal func_800F16CC -/* 41C018 802A7288 00000000 */ nop +/* 41C018 802A7288 00000000 */ nop /* 41C01C 802A728C 0C0A8426 */ jal func_802A1098 -/* 41C020 802A7290 00000000 */ nop +/* 41C020 802A7290 00000000 */ nop /* 41C024 802A7294 080AA04F */ j .L802A813C /* 41C028 802A7298 2402002B */ addiu $v0, $zero, 0x2b +glabel L802A729C_41C02C /* 41C02C 802A729C 0C0A846C */ jal func_802A11B0 -/* 41C030 802A72A0 00000000 */ nop +/* 41C030 802A72A0 00000000 */ nop /* 41C034 802A72A4 104003A7 */ beqz $v0, .L802A8144 /* 41C038 802A72A8 24020029 */ addiu $v0, $zero, 0x29 /* 41C03C 802A72AC 080AA04F */ j .L802A813C -/* 41C040 802A72B0 00000000 */ nop +/* 41C040 802A72B0 00000000 */ nop +glabel L802A72B4_41C044 /* 41C044 802A72B4 0C03C5B3 */ jal func_800F16CC -/* 41C048 802A72B8 00000000 */ nop +/* 41C048 802A72B8 00000000 */ nop /* 41C04C 802A72BC 0C0A8426 */ jal func_802A1098 -/* 41C050 802A72C0 00000000 */ nop +/* 41C050 802A72C0 00000000 */ nop /* 41C054 802A72C4 080AA04F */ j .L802A813C /* 41C058 802A72C8 2402002B */ addiu $v0, $zero, 0x2b +glabel L802A72CC_41C05C /* 41C05C 802A72CC 0C03C54E */ jal func_800F1538 -/* 41C060 802A72D0 00000000 */ nop +/* 41C060 802A72D0 00000000 */ nop .L802A72D4: +glabel L802A72D4_41C064 /* 41C064 802A72D4 0C0A842E */ jal func_802A10B8 -/* 41C068 802A72D8 00000000 */ nop +/* 41C068 802A72D8 00000000 */ nop /* 41C06C 802A72DC 080AA051 */ j .L802A8144 -/* 41C070 802A72E0 00000000 */ nop +/* 41C070 802A72E0 00000000 */ nop +glabel L802A72E4_41C074 /* 41C074 802A72E4 92C2020E */ lbu $v0, 0x20e($s6) /* 41C078 802A72E8 1040005E */ beqz $v0, .L802A7464 /* 41C07C 802A72EC 0000982D */ daddu $s3, $zero, $zero @@ -1776,13 +1803,13 @@ glabel update_player_menu /* 41C0DC 802A734C 808201F6 */ lb $v0, 0x1f6($a0) .L802A7350: /* 41C0E0 802A7350 144B0004 */ bne $v0, $t3, .L802A7364 -/* 41C0E4 802A7354 00000000 */ nop +/* 41C0E4 802A7354 00000000 */ nop /* 41C0E8 802A7358 A08001F6 */ sb $zero, 0x1f6($a0) /* 41C0EC 802A735C A0A70000 */ sb $a3, ($a1) /* 41C0F0 802A7360 808201F6 */ lb $v0, 0x1f6($a0) .L802A7364: /* 41C0F4 802A7364 144A0003 */ bne $v0, $t2, .L802A7374 -/* 41C0F8 802A7368 00000000 */ nop +/* 41C0F8 802A7368 00000000 */ nop /* 41C0FC 802A736C A08001F6 */ sb $zero, 0x1f6($a0) /* 41C100 802A7370 A0A70000 */ sb $a3, ($a1) .L802A7374: @@ -1790,7 +1817,7 @@ glabel update_player_menu /* 41C108 802A7378 02691804 */ sllv $v1, $t1, $s3 /* 41C10C 802A737C 00431024 */ and $v0, $v0, $v1 /* 41C110 802A7380 14400003 */ bnez $v0, .L802A7390 -/* 41C114 802A7384 00000000 */ nop +/* 41C114 802A7384 00000000 */ nop /* 41C118 802A7388 A08001F6 */ sb $zero, 0x1f6($a0) /* 41C11C 802A738C A0A70000 */ sb $a3, ($a1) .L802A7390: @@ -1863,11 +1890,12 @@ glabel update_player_menu /* 41C21C 802A748C 3C01802B */ lui $at, %hi(D_802AD4A8) /* 41C220 802A7490 AC3ED4A8 */ sw $fp, %lo(D_802AD4A8)($at) /* 41C224 802A7494 0C0A89A1 */ jal func_802A2684 -/* 41C228 802A7498 00000000 */ nop +/* 41C228 802A7498 00000000 */ nop /* 41C22C 802A749C 080AA04F */ j .L802A813C /* 41C230 802A74A0 2402003D */ addiu $v0, $zero, 0x3d +glabel L802A74A4_41C234 /* 41C234 802A74A4 0C0A8B21 */ jal func_802A2C84 -/* 41C238 802A74A8 00000000 */ nop +/* 41C238 802A74A8 00000000 */ nop /* 41C23C 802A74AC 0040802D */ daddu $s0, $v0, $zero /* 41C240 802A74B0 2402FFFF */ addiu $v0, $zero, -1 /* 41C244 802A74B4 12020321 */ beq $s0, $v0, .L802A813C @@ -1877,7 +1905,7 @@ glabel update_player_menu /* 41C254 802A74C4 5602000B */ bnel $s0, $v0, .L802A74F4 /* 41C258 802A74C8 2602FFFF */ addiu $v0, $s0, -1 /* 41C25C 802A74CC 0C0A8414 */ jal func_802A1050 -/* 41C260 802A74D0 00000000 */ nop +/* 41C260 802A74D0 00000000 */ nop /* 41C264 802A74D4 24020008 */ addiu $v0, $zero, 8 /* 41C268 802A74D8 3C01802B */ lui $at, %hi(D_802ACC60) /* 41C26C 802A74DC AC22CC60 */ sw $v0, %lo(D_802ACC60)($at) @@ -1897,26 +1925,27 @@ glabel update_player_menu /* 41C2A0 802A7510 0C0A89F4 */ jal func_802A27D0 /* 41C2A4 802A7514 A2C30052 */ sb $v1, 0x52($s6) /* 41C2A8 802A7518 0C0A840C */ jal func_802A1030 -/* 41C2AC 802A751C 00000000 */ nop +/* 41C2AC 802A751C 00000000 */ nop /* 41C2B0 802A7520 080AA04F */ j .L802A813C /* 41C2B4 802A7524 2402003E */ addiu $v0, $zero, 0x3e +glabel L802A7528_41C2B8 /* 41C2B8 802A7528 0C0A8B21 */ jal func_802A2C84 -/* 41C2BC 802A752C 00000000 */ nop +/* 41C2BC 802A752C 00000000 */ nop /* 41C2C0 802A7530 8EC30214 */ lw $v1, 0x214($s6) /* 41C2C4 802A7534 30634000 */ andi $v1, $v1, 0x4000 /* 41C2C8 802A7538 10600009 */ beqz $v1, .L802A7560 /* 41C2CC 802A753C 0040802D */ daddu $s0, $v0, $zero /* 41C2D0 802A7540 16000007 */ bnez $s0, .L802A7560 -/* 41C2D4 802A7544 00000000 */ nop +/* 41C2D4 802A7544 00000000 */ nop /* 41C2D8 802A7548 0C0A8AAE */ jal func_802A2AB8 -/* 41C2DC 802A754C 00000000 */ nop +/* 41C2DC 802A754C 00000000 */ nop /* 41C2E0 802A7550 0C0A8426 */ jal func_802A1098 -/* 41C2E4 802A7554 00000000 */ nop +/* 41C2E4 802A7554 00000000 */ nop /* 41C2E8 802A7558 080AA04F */ j .L802A813C /* 41C2EC 802A755C 2402003F */ addiu $v0, $zero, 0x3f .L802A7560: /* 41C2F0 802A7560 0C0A846C */ jal func_802A11B0 -/* 41C2F4 802A7564 00000000 */ nop +/* 41C2F4 802A7564 00000000 */ nop /* 41C2F8 802A7568 104002F6 */ beqz $v0, .L802A8144 /* 41C2FC 802A756C 24020040 */ addiu $v0, $zero, 0x40 /* 41C300 802A7570 A6C2006C */ sh $v0, 0x6c($s6) @@ -1952,34 +1981,39 @@ glabel update_player_menu /* 41C378 802A75E8 24820001 */ addiu $v0, $a0, 1 /* 41C37C 802A75EC 080A9E2B */ j .L802A78AC /* 41C380 802A75F0 A6C2017A */ sh $v0, 0x17a($s6) +glabel L802A75F4_41C384 /* 41C384 802A75F4 0C0A8B21 */ jal func_802A2C84 -/* 41C388 802A75F8 00000000 */ nop +/* 41C388 802A75F8 00000000 */ nop /* 41C38C 802A75FC 0C0A846C */ jal func_802A11B0 -/* 41C390 802A7600 00000000 */ nop +/* 41C390 802A7600 00000000 */ nop /* 41C394 802A7604 104002CF */ beqz $v0, .L802A8144 /* 41C398 802A7608 2402003D */ addiu $v0, $zero, 0x3d /* 41C39C 802A760C 080AA04F */ j .L802A813C -/* 41C3A0 802A7610 00000000 */ nop +/* 41C3A0 802A7610 00000000 */ nop +glabel L802A7614_41C3A4 /* 41C3A4 802A7614 0C0A8AAE */ jal func_802A2AB8 -/* 41C3A8 802A7618 00000000 */ nop +/* 41C3A8 802A7618 00000000 */ nop /* 41C3AC 802A761C 0C0A8426 */ jal func_802A1098 -/* 41C3B0 802A7620 00000000 */ nop +/* 41C3B0 802A7620 00000000 */ nop /* 41C3B4 802A7624 080AA04F */ j .L802A813C /* 41C3B8 802A7628 2402003F */ addiu $v0, $zero, 0x3f .L802A762C: +glabel L802A762C_41C3BC /* 41C3BC 802A762C 0C0A89F9 */ jal func_802A27E4 -/* 41C3C0 802A7630 00000000 */ nop +/* 41C3C0 802A7630 00000000 */ nop /* 41C3C4 802A7634 080A9CB5 */ j .L802A72D4 -/* 41C3C8 802A7638 00000000 */ nop +/* 41C3C8 802A7638 00000000 */ nop +glabel L802A763C_41C3CC /* 41C3CC 802A763C 0C0A8B21 */ jal func_802A2C84 -/* 41C3D0 802A7640 00000000 */ nop +/* 41C3D0 802A7640 00000000 */ nop /* 41C3D4 802A7644 2403FFFF */ addiu $v1, $zero, -1 /* 41C3D8 802A7648 104302BE */ beq $v0, $v1, .L802A8144 /* 41C3DC 802A764C 2402003D */ addiu $v0, $zero, 0x3d /* 41C3E0 802A7650 080AA04F */ j .L802A813C -/* 41C3E4 802A7654 00000000 */ nop +/* 41C3E4 802A7654 00000000 */ nop +glabel L802A7658_41C3E8 /* 41C3E8 802A7658 0C0A9606 */ jal can_switch_to_player -/* 41C3EC 802A765C 00000000 */ nop +/* 41C3EC 802A765C 00000000 */ nop /* 41C3F0 802A7660 14400004 */ bnez $v0, .L802A7674 /* 41C3F4 802A7664 0000A02D */ daddu $s4, $zero, $zero /* 41C3F8 802A7668 24020001 */ addiu $v0, $zero, 1 @@ -2086,9 +2120,10 @@ glabel update_player_menu /* 41C568 802A77D8 0C03D44F */ jal func_800F513C /* 41C56C 802A77DC AC9E0328 */ sw $fp, 0x328($a0) /* 41C570 802A77E0 0C03D4AF */ jal func_800F52BC -/* 41C574 802A77E4 00000000 */ nop +/* 41C574 802A77E4 00000000 */ nop /* 41C578 802A77E8 080AA04F */ j .L802A813C /* 41C57C 802A77EC 24020047 */ addiu $v0, $zero, 0x47 +glabel L802A77F0_41C580 /* 41C580 802A77F0 3C03802B */ lui $v1, %hi(D_802ACFFC) /* 41C584 802A77F4 8463CFFC */ lh $v1, %lo(D_802ACFFC)($v1) /* 41C588 802A77F8 10600252 */ beqz $v1, .L802A8144 @@ -2132,6 +2167,7 @@ glabel update_player_menu /* 41C61C 802A788C AC22CC60 */ sw $v0, %lo(D_802ACC60)($at) /* 41C620 802A7890 080AA04F */ j .L802A813C /* 41C624 802A7894 24020048 */ addiu $v0, $zero, 0x48 +glabel L802A7898_41C628 /* 41C628 802A7898 3C03802B */ lui $v1, %hi(D_802ACC60) /* 41C62C 802A789C 2463CC60 */ addiu $v1, $v1, %lo(D_802ACC60) /* 41C630 802A78A0 8C620000 */ lw $v0, ($v1) @@ -2141,7 +2177,8 @@ glabel update_player_menu /* 41C63C 802A78AC 0C090464 */ jal func_80241190 /* 41C640 802A78B0 24040011 */ addiu $a0, $zero, 0x11 /* 41C644 802A78B4 080AA051 */ j .L802A8144 -/* 41C648 802A78B8 00000000 */ nop +/* 41C648 802A78B8 00000000 */ nop +glabel L802A78BC_41C64C /* 41C64C 802A78BC 3C03802B */ lui $v1, %hi(D_802ACC60) /* 41C650 802A78C0 2463CC60 */ addiu $v1, $v1, %lo(D_802ACC60) /* 41C654 802A78C4 8C620000 */ lw $v0, ($v1) @@ -2153,17 +2190,20 @@ glabel update_player_menu .L802A78D8: /* 41C668 802A78D8 080AA04F */ j .L802A813C /* 41C66C 802A78DC 24020047 */ addiu $v0, $zero, 0x47 +glabel L802A78E0_41C670 /* 41C670 802A78E0 0C03C5B3 */ jal func_800F16CC -/* 41C674 802A78E4 00000000 */ nop +/* 41C674 802A78E4 00000000 */ nop /* 41C678 802A78E8 24020005 */ addiu $v0, $zero, 5 /* 41C67C 802A78EC 3C01802B */ lui $at, %hi(D_802ACC60) /* 41C680 802A78F0 AC22CC60 */ sw $v0, %lo(D_802ACC60)($at) /* 41C684 802A78F4 080AA04F */ j .L802A813C /* 41C688 802A78F8 24020049 */ addiu $v0, $zero, 0x49 +glabel L802A78FC_41C68C /* 41C68C 802A78FC 0C03C54E */ jal func_800F1538 -/* 41C690 802A7900 00000000 */ nop +/* 41C690 802A7900 00000000 */ nop /* 41C694 802A7904 080AA051 */ j .L802A8144 -/* 41C698 802A7908 00000000 */ nop +/* 41C698 802A7908 00000000 */ nop +glabel L802A790C_41C69C /* 41C69C 802A790C 82A20000 */ lb $v0, ($s5) /* 41C6A0 802A7910 04400008 */ bltz $v0, .L802A7934 /* 41C6A4 802A7914 02E0202D */ daddu $a0, $s7, $zero @@ -2173,7 +2213,7 @@ glabel update_player_menu /* 41C6B4 802A7924 AEC20184 */ sw $v0, 0x184($s6) /* 41C6B8 802A7928 82F1040C */ lb $s1, 0x40c($s7) /* 41C6BC 802A792C 080A9E4E */ j .L802A7938 -/* 41C6C0 802A7930 00000000 */ nop +/* 41C6C0 802A7930 00000000 */ nop .L802A7934: /* 41C6C4 802A7934 0000882D */ daddu $s1, $zero, $zero .L802A7938: @@ -2186,12 +2226,12 @@ glabel update_player_menu /* 41C6E0 802A7950 AEC20184 */ sw $v0, 0x184($s6) /* 41C6E4 802A7954 82E2040C */ lb $v0, 0x40c($s7) /* 41C6E8 802A7958 080A9E59 */ j .L802A7964 -/* 41C6EC 802A795C 00000000 */ nop +/* 41C6EC 802A795C 00000000 */ nop .L802A7960: /* 41C6F0 802A7960 0000102D */ daddu $v0, $zero, $zero .L802A7964: /* 41C6F4 802A7964 1E200009 */ bgtz $s1, .L802A798C -/* 41C6F8 802A7968 00000000 */ nop +/* 41C6F8 802A7968 00000000 */ nop /* 41C6FC 802A796C 1C400007 */ bgtz $v0, .L802A798C /* 41C700 802A7970 24040016 */ addiu $a0, $zero, 0x16 /* 41C704 802A7974 24020009 */ addiu $v0, $zero, 9 @@ -2199,7 +2239,7 @@ glabel update_player_menu /* 41C70C 802A797C 0C090464 */ jal func_80241190 /* 41C710 802A7980 A2C00095 */ sb $zero, 0x95($s6) /* 41C714 802A7984 080AA051 */ j .L802A8144 -/* 41C718 802A7988 00000000 */ nop +/* 41C718 802A7988 00000000 */ nop .L802A798C: /* 41C71C 802A798C 1E200002 */ bgtz $s1, .L802A7998 /* 41C720 802A7990 24100032 */ addiu $s0, $zero, 0x32 @@ -2238,11 +2278,12 @@ glabel update_player_menu /* 41C798 802A7A08 A6C3017A */ sh $v1, 0x17a($s6) .L802A7A0C: /* 41C79C 802A7A0C 0C098C0B */ jal player_create_target_list -/* 41C7A0 802A7A10 00000000 */ nop +/* 41C7A0 802A7A10 00000000 */ nop /* 41C7A4 802A7A14 0C090464 */ jal func_80241190 /* 41C7A8 802A7A18 24040012 */ addiu $a0, $zero, 0x12 /* 41C7AC 802A7A1C 080AA051 */ j .L802A8144 -/* 41C7B0 802A7A20 00000000 */ nop +/* 41C7B0 802A7A20 00000000 */ nop +glabel L802A7A24_41C7B4 /* 41C7B4 802A7A24 0C098C9A */ jal func_80263268 /* 41C7B8 802A7A28 0000A02D */ daddu $s4, $zero, $zero /* 41C7BC 802A7A2C 82C2007C */ lb $v0, 0x7c($s6) @@ -2339,7 +2380,7 @@ glabel update_player_menu /* 41C920 802A7B90 8C42C074 */ lw $v0, %lo(gBattleStatus+0x4)($v0) /* 41C924 802A7B94 30420020 */ andi $v0, $v0, 0x20 /* 41C928 802A7B98 14400007 */ bnez $v0, .L802A7BB8 -/* 41C92C 802A7B9C 00000000 */ nop +/* 41C92C 802A7B9C 00000000 */ nop /* 41C930 802A7BA0 8D220004 */ lw $v0, 4($t1) /* 41C934 802A7BA4 ACE20000 */ sw $v0, ($a3) /* 41C938 802A7BA8 AC600000 */ sw $zero, ($v1) @@ -2358,11 +2399,12 @@ glabel update_player_menu /* 41C964 802A7BD4 3C01802B */ lui $at, %hi(D_802AD670) /* 41C968 802A7BD8 AC3ED670 */ sw $fp, %lo(D_802AD670)($at) /* 41C96C 802A7BDC 0C0A9176 */ jal func_802A45D8 -/* 41C970 802A7BE0 00000000 */ nop +/* 41C970 802A7BE0 00000000 */ nop /* 41C974 802A7BE4 080AA04F */ j .L802A813C /* 41C978 802A7BE8 240200C9 */ addiu $v0, $zero, 0xc9 +glabel L802A7BEC_41C97C /* 41C97C 802A7BEC 0C0A9295 */ jal func_802A4A54 -/* 41C980 802A7BF0 00000000 */ nop +/* 41C980 802A7BF0 00000000 */ nop /* 41C984 802A7BF4 0040802D */ daddu $s0, $v0, $zero /* 41C988 802A7BF8 2402FFFF */ addiu $v0, $zero, -1 /* 41C98C 802A7BFC 1202014F */ beq $s0, $v0, .L802A813C @@ -2372,7 +2414,7 @@ glabel update_player_menu /* 41C99C 802A7C0C 1602000B */ bne $s0, $v0, .L802A7C3C /* 41C9A0 802A7C10 2603FFFF */ addiu $v1, $s0, -1 /* 41C9A4 802A7C14 0C0A8414 */ jal func_802A1050 -/* 41C9A8 802A7C18 00000000 */ nop +/* 41C9A8 802A7C18 00000000 */ nop /* 41C9AC 802A7C1C 24020008 */ addiu $v0, $zero, 8 /* 41C9B0 802A7C20 3C01802B */ lui $at, %hi(D_802ACC60) /* 41C9B4 802A7C24 AC22CC60 */ sw $v0, %lo(D_802ACC60)($at) @@ -2393,28 +2435,29 @@ glabel update_player_menu /* 41C9EC 802A7C5C 106200C9 */ beq $v1, $v0, .L802A7F84 /* 41C9F0 802A7C60 2402001E */ addiu $v0, $zero, 0x1e /* 41C9F4 802A7C64 0C0A91C6 */ jal func_802A4718 -/* 41C9F8 802A7C68 00000000 */ nop +/* 41C9F8 802A7C68 00000000 */ nop /* 41C9FC 802A7C6C 0C0A840C */ jal func_802A1030 -/* 41CA00 802A7C70 00000000 */ nop +/* 41CA00 802A7C70 00000000 */ nop /* 41CA04 802A7C74 080AA04F */ j .L802A813C /* 41CA08 802A7C78 240200CA */ addiu $v0, $zero, 0xca +glabel L802A7C7C_41CA0C /* 41CA0C 802A7C7C 0C0A9295 */ jal func_802A4A54 -/* 41CA10 802A7C80 00000000 */ nop +/* 41CA10 802A7C80 00000000 */ nop /* 41CA14 802A7C84 8EC30214 */ lw $v1, 0x214($s6) /* 41CA18 802A7C88 30634000 */ andi $v1, $v1, 0x4000 /* 41CA1C 802A7C8C 10600009 */ beqz $v1, .L802A7CB4 /* 41CA20 802A7C90 0040802D */ daddu $s0, $v0, $zero /* 41CA24 802A7C94 16000007 */ bnez $s0, .L802A7CB4 -/* 41CA28 802A7C98 00000000 */ nop +/* 41CA28 802A7C98 00000000 */ nop /* 41CA2C 802A7C9C 0C0A923F */ jal func_802A48FC -/* 41CA30 802A7CA0 00000000 */ nop +/* 41CA30 802A7CA0 00000000 */ nop /* 41CA34 802A7CA4 0C0A8426 */ jal func_802A1098 -/* 41CA38 802A7CA8 00000000 */ nop +/* 41CA38 802A7CA8 00000000 */ nop /* 41CA3C 802A7CAC 080AA04F */ j .L802A813C /* 41CA40 802A7CB0 240200CB */ addiu $v0, $zero, 0xcb .L802A7CB4: /* 41CA44 802A7CB4 0C0A846C */ jal func_802A11B0 -/* 41CA48 802A7CB8 00000000 */ nop +/* 41CA48 802A7CB8 00000000 */ nop /* 41CA4C 802A7CBC 10400121 */ beqz $v0, .L802A8144 /* 41CA50 802A7CC0 240200CC */ addiu $v0, $zero, 0xcc /* 41CA54 802A7CC4 82D00048 */ lb $s0, 0x48($s6) @@ -2429,7 +2472,7 @@ glabel update_player_menu /* 41CA78 802A7CE8 1202000A */ beq $s0, $v0, .L802A7D14 /* 41CA7C 802A7CEC 240200CD */ addiu $v0, $zero, 0xcd /* 41CA80 802A7CF0 080AA051 */ j .L802A8144 -/* 41CA84 802A7CF4 00000000 */ nop +/* 41CA84 802A7CF4 00000000 */ nop .L802A7CF8: /* 41CA88 802A7CF8 24020009 */ addiu $v0, $zero, 9 /* 41CA8C 802A7CFC 12020010 */ beq $s0, $v0, .L802A7D40 @@ -2437,19 +2480,19 @@ glabel update_player_menu /* 41CA94 802A7D04 1202002B */ beq $s0, $v0, .L802A7DB4 /* 41CA98 802A7D08 240200CD */ addiu $v0, $zero, 0xcd /* 41CA9C 802A7D0C 080AA051 */ j .L802A8144 -/* 41CAA0 802A7D10 00000000 */ nop +/* 41CAA0 802A7D10 00000000 */ nop .L802A7D14: /* 41CAA4 802A7D14 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41CAA8 802A7D18 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 41CAAC 802A7D1C 0C0A9662 */ jal update_player_menu -/* 41CAB0 802A7D20 00000000 */ nop +/* 41CAB0 802A7D20 00000000 */ nop /* 41CAB4 802A7D24 24040018 */ addiu $a0, $zero, 0x18 /* 41CAB8 802A7D28 24020039 */ addiu $v0, $zero, 0x39 /* 41CABC 802A7D2C A2D00178 */ sb $s0, 0x178($s6) /* 41CAC0 802A7D30 0C090464 */ jal func_80241190 /* 41CAC4 802A7D34 A6C2017C */ sh $v0, 0x17c($s6) /* 41CAC8 802A7D38 080AA051 */ j .L802A8144 -/* 41CACC 802A7D3C 00000000 */ nop +/* 41CACC 802A7D3C 00000000 */ nop .L802A7D40: /* 41CAD0 802A7D40 3C05FBFF */ lui $a1, 0xfbff /* 41CAD4 802A7D44 34A5FFFF */ ori $a1, $a1, 0xffff @@ -2463,18 +2506,18 @@ glabel update_player_menu /* 41CAF4 802A7D64 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41CAF8 802A7D68 AC24C4DC */ sw $a0, %lo(gBattleStatus+0x46C)($at) /* 41CAFC 802A7D6C 0C0A9662 */ jal update_player_menu -/* 41CB00 802A7D70 00000000 */ nop +/* 41CB00 802A7D70 00000000 */ nop .L802A7D74: /* 41CB04 802A7D74 0C090464 */ jal func_80241190 /* 41CB08 802A7D78 24040016 */ addiu $a0, $zero, 0x16 /* 41CB0C 802A7D7C 080AA051 */ j .L802A8144 -/* 41CB10 802A7D80 00000000 */ nop +/* 41CB10 802A7D80 00000000 */ nop .L802A7D84: /* 41CB14 802A7D84 240200CD */ addiu $v0, $zero, 0xcd /* 41CB18 802A7D88 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41CB1C 802A7D8C AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 41CB20 802A7D90 0C0A9662 */ jal update_player_menu -/* 41CB24 802A7D94 00000000 */ nop +/* 41CB24 802A7D94 00000000 */ nop /* 41CB28 802A7D98 24040019 */ addiu $a0, $zero, 0x19 /* 41CB2C 802A7D9C 24020031 */ addiu $v0, $zero, 0x31 /* 41CB30 802A7DA0 A6C2017C */ sh $v0, 0x17c($s6) @@ -2482,21 +2525,22 @@ glabel update_player_menu /* 41CB34 802A7DA4 0C090464 */ jal func_80241190 /* 41CB38 802A7DA8 A2D00178 */ sb $s0, 0x178($s6) /* 41CB3C 802A7DAC 080AA051 */ j .L802A8144 -/* 41CB40 802A7DB0 00000000 */ nop +/* 41CB40 802A7DB0 00000000 */ nop .L802A7DB4: /* 41CB44 802A7DB4 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41CB48 802A7DB8 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 41CB4C 802A7DBC 0C0A9662 */ jal update_player_menu -/* 41CB50 802A7DC0 00000000 */ nop +/* 41CB50 802A7DC0 00000000 */ nop .L802A7DC4: /* 41CB54 802A7DC4 0C090464 */ jal func_80241190 /* 41CB58 802A7DC8 2404000B */ addiu $a0, $zero, 0xb /* 41CB5C 802A7DCC 080AA051 */ j .L802A8144 -/* 41CB60 802A7DD0 00000000 */ nop +/* 41CB60 802A7DD0 00000000 */ nop +glabel L802A7DD4_41CB64 /* 41CB64 802A7DD4 0C0A9295 */ jal func_802A4A54 -/* 41CB68 802A7DD8 00000000 */ nop +/* 41CB68 802A7DD8 00000000 */ nop /* 41CB6C 802A7DDC 0C0A846C */ jal func_802A11B0 -/* 41CB70 802A7DE0 00000000 */ nop +/* 41CB70 802A7DE0 00000000 */ nop /* 41CB74 802A7DE4 104000D7 */ beqz $v0, .L802A8144 /* 41CB78 802A7DE8 24020008 */ addiu $v0, $zero, 8 /* 41CB7C 802A7DEC 3C01802B */ lui $at, %hi(D_802ACC60) @@ -2506,19 +2550,22 @@ glabel update_player_menu /* 41CB8C 802A7DFC AC22CC6C */ sw $v0, %lo(D_802ACC6C)($at) /* 41CB90 802A7E00 080AA04F */ j .L802A813C /* 41CB94 802A7E04 24020001 */ addiu $v0, $zero, 1 +glabel L802A7E08_41CB98 /* 41CB98 802A7E08 0C0A923F */ jal func_802A48FC -/* 41CB9C 802A7E0C 00000000 */ nop +/* 41CB9C 802A7E0C 00000000 */ nop /* 41CBA0 802A7E10 0C0A8426 */ jal func_802A1098 -/* 41CBA4 802A7E14 00000000 */ nop +/* 41CBA4 802A7E14 00000000 */ nop /* 41CBA8 802A7E18 080AA04F */ j .L802A813C /* 41CBAC 802A7E1C 240200CB */ addiu $v0, $zero, 0xcb +glabel L802A7E20_41CBB0 /* 41CBB0 802A7E20 0C0A9295 */ jal func_802A4A54 -/* 41CBB4 802A7E24 00000000 */ nop +/* 41CBB4 802A7E24 00000000 */ nop /* 41CBB8 802A7E28 2403FFFF */ addiu $v1, $zero, -1 /* 41CBBC 802A7E2C 104300C5 */ beq $v0, $v1, .L802A8144 /* 41CBC0 802A7E30 240200C9 */ addiu $v0, $zero, 0xc9 /* 41CBC4 802A7E34 080AA04F */ j .L802A813C -/* 41CBC8 802A7E38 00000000 */ nop +/* 41CBC8 802A7E38 00000000 */ nop +glabel L802A7E3C_41CBCC /* 41CBCC 802A7E3C 0000A02D */ daddu $s4, $zero, $zero /* 41CBD0 802A7E40 24130001 */ addiu $s3, $zero, 1 /* 41CBD4 802A7E44 3C0C8009 */ lui $t4, %hi(D_8008EF20) @@ -2590,9 +2637,10 @@ glabel update_player_menu /* 41CCCC 802A7F3C 0C03D44F */ jal func_800F513C /* 41CCD0 802A7F40 AC820328 */ sw $v0, 0x328($a0) /* 41CCD4 802A7F44 0C03D4AF */ jal func_800F52BC -/* 41CCD8 802A7F48 00000000 */ nop +/* 41CCD8 802A7F48 00000000 */ nop /* 41CCDC 802A7F4C 080AA04F */ j .L802A813C /* 41CCE0 802A7F50 2402001F */ addiu $v0, $zero, 0x1f +glabel L802A7F54_41CCE4 /* 41CCE4 802A7F54 3C03802B */ lui $v1, %hi(D_802ACFFC) /* 41CCE8 802A7F58 8463CFFC */ lh $v1, %lo(D_802ACFFC)($v1) /* 41CCEC 802A7F5C 2402FFFF */ addiu $v0, $zero, -1 @@ -2603,17 +2651,17 @@ glabel update_player_menu /* 41CD00 802A7F70 1462000C */ bne $v1, $v0, .L802A7FA4 /* 41CD04 802A7F74 24020022 */ addiu $v0, $zero, 0x22 /* 41CD08 802A7F78 0C0A91F8 */ jal func_802A47E0 -/* 41CD0C 802A7F7C 00000000 */ nop +/* 41CD0C 802A7F7C 00000000 */ nop /* 41CD10 802A7F80 240200C9 */ addiu $v0, $zero, 0xc9 .L802A7F84: /* 41CD14 802A7F84 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41CD18 802A7F88 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 41CD1C 802A7F8C 0C0A9662 */ jal update_player_menu -/* 41CD20 802A7F90 00000000 */ nop +/* 41CD20 802A7F90 00000000 */ nop /* 41CD24 802A7F94 0C0A9662 */ jal update_player_menu -/* 41CD28 802A7F98 00000000 */ nop +/* 41CD28 802A7F98 00000000 */ nop /* 41CD2C 802A7F9C 080AA051 */ j .L802A8144 -/* 41CD30 802A7FA0 00000000 */ nop +/* 41CD30 802A7FA0 00000000 */ nop .L802A7FA4: /* 41CD34 802A7FA4 24030023 */ addiu $v1, $zero, 0x23 /* 41CD38 802A7FA8 A6C2006C */ sh $v0, 0x6c($s6) @@ -2642,65 +2690,71 @@ glabel update_player_menu /* 41CD94 802A8004 0C03C4EC */ jal func_800F13B0 /* 41CD98 802A8008 A2C20051 */ sb $v0, 0x51($s6) /* 41CD9C 802A800C 0C0A91C6 */ jal func_802A4718 -/* 41CDA0 802A8010 00000000 */ nop +/* 41CDA0 802A8010 00000000 */ nop /* 41CDA4 802A8014 0C0A840C */ jal func_802A1030 -/* 41CDA8 802A8018 00000000 */ nop +/* 41CDA8 802A8018 00000000 */ nop /* 41CDAC 802A801C 080AA04F */ j .L802A813C /* 41CDB0 802A8020 24020020 */ addiu $v0, $zero, 0x20 +glabel L802A8024_41CDB4 /* 41CDB4 802A8024 8EC20214 */ lw $v0, 0x214($s6) /* 41CDB8 802A8028 30424000 */ andi $v0, $v0, 0x4000 /* 41CDBC 802A802C 1040000D */ beqz $v0, .L802A8064 -/* 41CDC0 802A8030 00000000 */ nop +/* 41CDC0 802A8030 00000000 */ nop /* 41CDC4 802A8034 3C02802B */ lui $v0, %hi(D_802ACFFC) /* 41CDC8 802A8038 8442CFFC */ lh $v0, %lo(D_802ACFFC)($v0) /* 41CDCC 802A803C 14400009 */ bnez $v0, .L802A8064 -/* 41CDD0 802A8040 00000000 */ nop +/* 41CDD0 802A8040 00000000 */ nop /* 41CDD4 802A8044 0C03C5B3 */ jal func_800F16CC -/* 41CDD8 802A8048 00000000 */ nop +/* 41CDD8 802A8048 00000000 */ nop /* 41CDDC 802A804C 0C0A9284 */ jal func_802A4A10 -/* 41CDE0 802A8050 00000000 */ nop +/* 41CDE0 802A8050 00000000 */ nop /* 41CDE4 802A8054 0C0A8426 */ jal func_802A1098 -/* 41CDE8 802A8058 00000000 */ nop +/* 41CDE8 802A8058 00000000 */ nop /* 41CDEC 802A805C 080AA04F */ j .L802A813C /* 41CDF0 802A8060 24020021 */ addiu $v0, $zero, 0x21 .L802A8064: /* 41CDF4 802A8064 0C0A9295 */ jal func_802A4A54 -/* 41CDF8 802A8068 00000000 */ nop +/* 41CDF8 802A8068 00000000 */ nop /* 41CDFC 802A806C 0C0A846C */ jal func_802A11B0 -/* 41CE00 802A8070 00000000 */ nop +/* 41CE00 802A8070 00000000 */ nop /* 41CE04 802A8074 10400033 */ beqz $v0, .L802A8144 -/* 41CE08 802A8078 00000000 */ nop +/* 41CE08 802A8078 00000000 */ nop /* 41CE0C 802A807C 86C2006E */ lh $v0, 0x6e($s6) /* 41CE10 802A8080 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41CE14 802A8084 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 41CE18 802A8088 0C0A9662 */ jal update_player_menu -/* 41CE1C 802A808C 00000000 */ nop +/* 41CE1C 802A808C 00000000 */ nop /* 41CE20 802A8090 0C090464 */ jal func_80241190 /* 41CE24 802A8094 2404001D */ addiu $a0, $zero, 0x1d /* 41CE28 802A8098 080AA051 */ j .L802A8144 -/* 41CE2C 802A809C 00000000 */ nop +/* 41CE2C 802A809C 00000000 */ nop +glabel L802A80A0_41CE30 /* 41CE30 802A80A0 0C0A9295 */ jal func_802A4A54 -/* 41CE34 802A80A4 00000000 */ nop +/* 41CE34 802A80A4 00000000 */ nop /* 41CE38 802A80A8 0C0A846C */ jal func_802A11B0 -/* 41CE3C 802A80AC 00000000 */ nop +/* 41CE3C 802A80AC 00000000 */ nop /* 41CE40 802A80B0 10400024 */ beqz $v0, .L802A8144 /* 41CE44 802A80B4 2402001F */ addiu $v0, $zero, 0x1f /* 41CE48 802A80B8 080AA04F */ j .L802A813C -/* 41CE4C 802A80BC 00000000 */ nop +/* 41CE4C 802A80BC 00000000 */ nop +glabel L802A80C0_41CE50 /* 41CE50 802A80C0 0C03C5B3 */ jal func_800F16CC -/* 41CE54 802A80C4 00000000 */ nop +/* 41CE54 802A80C4 00000000 */ nop /* 41CE58 802A80C8 0C0A9284 */ jal func_802A4A10 -/* 41CE5C 802A80CC 00000000 */ nop +/* 41CE5C 802A80CC 00000000 */ nop /* 41CE60 802A80D0 0C0A8426 */ jal func_802A1098 -/* 41CE64 802A80D4 00000000 */ nop +/* 41CE64 802A80D4 00000000 */ nop /* 41CE68 802A80D8 080AA04F */ j .L802A813C /* 41CE6C 802A80DC 24020021 */ addiu $v0, $zero, 0x21 +glabel L802A80E0_41CE70 /* 41CE70 802A80E0 0C03C54E */ jal func_800F1538 -/* 41CE74 802A80E4 00000000 */ nop +/* 41CE74 802A80E4 00000000 */ nop +glabel L802A80E8_41CE78 /* 41CE78 802A80E8 0C0A91CB */ jal func_802A472C -/* 41CE7C 802A80EC 00000000 */ nop +/* 41CE7C 802A80EC 00000000 */ nop /* 41CE80 802A80F0 080A9CB5 */ j .L802A72D4 -/* 41CE84 802A80F4 00000000 */ nop +/* 41CE84 802A80F4 00000000 */ nop +glabel L802A80F8_41CE88 /* 41CE88 802A80F8 24040006 */ addiu $a0, $zero, 6 /* 41CE8C 802A80FC 0C051F9F */ jal func_80147E7C /* 41CE90 802A8100 24050002 */ addiu $a1, $zero, 2 @@ -2722,6 +2776,7 @@ glabel update_player_menu /* 41CECC 802A813C 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41CED0 802A8140 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) .L802A8144: +glabel L802A8144_41CED4 /* 41CED4 802A8144 8FBF0034 */ lw $ra, 0x34($sp) /* 41CED8 802A8148 8FBE0030 */ lw $fp, 0x30($sp) /* 41CEDC 802A814C 8FB7002C */ lw $s7, 0x2c($sp) diff --git a/asm/nonmatchings/code_415D90/update_targeting_enemies.s b/asm/nonmatchings/code_415D90/update_targeting_enemies.s index 814cc5ba45..ff67a000ce 100644 --- a/asm/nonmatchings/code_415D90/update_targeting_enemies.s +++ b/asm/nonmatchings/code_415D90/update_targeting_enemies.s @@ -40,14 +40,14 @@ glabel update_targeting_enemies /* 41F49C 802AA70C 10600009 */ beqz $v1, .L802AA734 /* 41F4A0 802AA710 24040015 */ addiu $a0, $zero, 0x15 /* 41F4A4 802AA714 080AAB2D */ j .L802AACB4 -/* 41F4A8 802AA718 00000000 */ nop +/* 41F4A8 802AA718 00000000 */ nop .L802AA71C: /* 41F4AC 802AA71C 106200D7 */ beq $v1, $v0, .L802AAA7C /* 41F4B0 802AA720 2402000A */ addiu $v0, $zero, 0xa /* 41F4B4 802AA724 1062011B */ beq $v1, $v0, .L802AAB94 -/* 41F4B8 802AA728 00000000 */ nop +/* 41F4B8 802AA728 00000000 */ nop /* 41F4BC 802AA72C 080AAB2D */ j .L802AACB4 -/* 41F4C0 802AA730 00000000 */ nop +/* 41F4C0 802AA730 00000000 */ nop .L802AA734: /* 41F4C4 802AA734 240200FF */ addiu $v0, $zero, 0xff /* 41F4C8 802AA738 3C01802B */ lui $at, %hi(D_802ACC64) @@ -67,7 +67,7 @@ glabel update_targeting_enemies /* 41F500 802AA770 8E020000 */ lw $v0, ($s0) /* 41F504 802AA774 00431024 */ and $v0, $v0, $v1 /* 41F508 802AA778 1040000D */ beqz $v0, .L802AA7B0 -/* 41F50C 802AA77C 00000000 */ nop +/* 41F50C 802AA77C 00000000 */ nop .L802AA780: /* 41F510 802AA780 8683017C */ lh $v1, 0x17c($s4) /* 41F514 802AA784 1060000A */ beqz $v1, .L802AA7B0 @@ -88,7 +88,7 @@ glabel update_targeting_enemies /* 41F54C 802AA7BC 8253040C */ lb $s3, 0x40c($s2) /* 41F550 802AA7C0 30420001 */ andi $v0, $v0, 1 /* 41F554 802AA7C4 10400018 */ beqz $v0, .L802AA828 -/* 41F558 802AA7C8 00000000 */ nop +/* 41F558 802AA7C8 00000000 */ nop /* 41F55C 802AA7CC 2655040D */ addiu $s5, $s2, 0x40d /* 41F560 802AA7D0 1A600015 */ blez $s3, .L802AA828 /* 41F564 802AA7D4 0000802D */ daddu $s0, $zero, $zero @@ -122,13 +122,13 @@ glabel update_targeting_enemies /* 41F5CC 802AA83C 8C820000 */ lw $v0, ($a0) /* 41F5D0 802AA840 00431024 */ and $v0, $v0, $v1 /* 41F5D4 802AA844 14400006 */ bnez $v0, .L802AA860 -/* 41F5D8 802AA848 00000000 */ nop +/* 41F5D8 802AA848 00000000 */ nop .L802AA84C: /* 41F5DC 802AA84C 8683006E */ lh $v1, 0x6e($s4) /* 41F5E0 802AA850 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41F5E4 802AA854 AC23C4DC */ sw $v1, %lo(gBattleStatus+0x46C)($at) /* 41F5E8 802AA858 080AAACE */ j .L802AAB38 -/* 41F5EC 802AA85C 00000000 */ nop +/* 41F5EC 802AA85C 00000000 */ nop .L802AA860: /* 41F5F0 802AA860 8C820004 */ lw $v0, 4($a0) /* 41F5F4 802AA864 8683006E */ lh $v1, 0x6e($s4) @@ -136,20 +136,20 @@ glabel update_targeting_enemies /* 41F5FC 802AA86C 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41F600 802AA870 AC23C4DC */ sw $v1, %lo(gBattleStatus+0x46C)($at) /* 41F604 802AA874 104000C1 */ beqz $v0, .L802AAB7C -/* 41F608 802AA878 00000000 */ nop +/* 41F608 802AA878 00000000 */ nop /* 41F60C 802AA87C 080AAADB */ j .L802AAB6C -/* 41F610 802AA880 00000000 */ nop +/* 41F610 802AA880 00000000 */ nop .L802AA884: /* 41F614 802AA884 16600009 */ bnez $s3, .L802AA8AC -/* 41F618 802AA888 00000000 */ nop +/* 41F618 802AA888 00000000 */ nop /* 41F61C 802AA88C 3C04800E */ lui $a0, %hi(gBattleStatus) /* 41F620 802AA890 2484C070 */ addiu $a0, $a0, %lo(gBattleStatus) /* 41F624 802AA894 8C820000 */ lw $v0, ($a0) /* 41F628 802AA898 00431024 */ and $v0, $v0, $v1 /* 41F62C 802AA89C 1040FFEB */ beqz $v0, .L802AA84C -/* 41F630 802AA8A0 00000000 */ nop +/* 41F630 802AA8A0 00000000 */ nop /* 41F634 802AA8A4 080AAA18 */ j .L802AA860 -/* 41F638 802AA8A8 00000000 */ nop +/* 41F638 802AA8A8 00000000 */ nop .L802AA8AC: /* 41F63C 802AA8AC 1A600013 */ blez $s3, .L802AA8FC /* 41F640 802AA8B0 0000802D */ daddu $s0, $zero, $zero @@ -177,7 +177,7 @@ glabel update_targeting_enemies /* 41F690 802AA900 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41F694 802AA904 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 41F698 802AA908 080AAB2D */ j .L802AACB4 -/* 41F69C 802AA90C 00000000 */ nop +/* 41F69C 802AA90C 00000000 */ nop .L802AA910: /* 41F6A0 802AA910 3C03802B */ lui $v1, %hi(D_802ACC68) /* 41F6A4 802AA914 2463CC68 */ addiu $v1, $v1, %lo(D_802ACC68) @@ -198,10 +198,10 @@ glabel update_targeting_enemies /* 41F6DC 802AA94C 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41F6E0 802AA950 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 41F6E4 802AA954 080AAB2D */ j .L802AACB4 -/* 41F6E8 802AA958 00000000 */ nop +/* 41F6E8 802AA958 00000000 */ nop .L802AA95C: /* 41F6EC 802AA95C 1040000E */ beqz $v0, .L802AA998 -/* 41F6F0 802AA960 00000000 */ nop +/* 41F6F0 802AA960 00000000 */ nop /* 41F6F4 802AA964 0C05272D */ jal play_sound /* 41F6F8 802AA968 240400C9 */ addiu $a0, $zero, 0xc9 /* 41F6FC 802AA96C 24020008 */ addiu $v0, $zero, 8 @@ -214,7 +214,7 @@ glabel update_targeting_enemies /* 41F718 802AA988 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41F71C 802AA98C AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 41F720 802AA990 080AAB2D */ j .L802AACB4 -/* 41F724 802AA994 00000000 */ nop +/* 41F724 802AA994 00000000 */ nop .L802AA998: /* 41F728 802AA998 3C04800E */ lui $a0, %hi(gBattleStatus) /* 41F72C 802AA99C 2484C070 */ addiu $a0, $a0, %lo(gBattleStatus) @@ -269,13 +269,13 @@ glabel update_targeting_enemies /* 41F7DC 802AAA4C 3C058008 */ lui $a1, %hi(D_80080208) /* 41F7E0 802AAA50 24A50208 */ addiu $a1, $a1, %lo(D_80080208) /* 41F7E4 802AAA54 080AAA99 */ j .L802AAA64 -/* 41F7E8 802AAA58 00000000 */ nop +/* 41F7E8 802AAA58 00000000 */ nop .L802AAA5C: /* 41F7EC 802AAA5C 3C058008 */ lui $a1, %hi(D_8007FF20) /* 41F7F0 802AAA60 24A5FF20 */ addiu $a1, $a1, %lo(D_8007FF20) .L802AAA64: /* 41F7F4 802AAA64 0C0511FF */ jal set_menu_icon_script -/* 41F7F8 802AAA68 00000000 */ nop +/* 41F7F8 802AAA68 00000000 */ nop /* 41F7FC 802AAA6C 0C05272D */ jal play_sound /* 41F800 802AAA70 240400C7 */ addiu $a0, $zero, 0xc7 .L802AAA74: @@ -311,7 +311,7 @@ glabel update_targeting_enemies /* 41F870 802AAAE0 26100001 */ addiu $s0, $s0, 1 /* 41F874 802AAAE4 0213102A */ slt $v0, $s0, $s3 /* 41F878 802AAAE8 1440FFFA */ bnez $v0, .L802AAAD4 -/* 41F87C 802AAAEC 00000000 */ nop +/* 41F87C 802AAAEC 00000000 */ nop /* 41F880 802AAAF0 3C04800E */ lui $a0, %hi(gBattleStatus) /* 41F884 802AAAF4 2484C070 */ addiu $a0, $a0, %lo(gBattleStatus) .L802AAAF8: @@ -319,26 +319,26 @@ glabel update_targeting_enemies /* 41F88C 802AAAFC 3C030008 */ lui $v1, 8 /* 41F890 802AAB00 00431024 */ and $v0, $v0, $v1 /* 41F894 802AAB04 14400012 */ bnez $v0, .L802AAB50 -/* 41F898 802AAB08 00000000 */ nop +/* 41F898 802AAB08 00000000 */ nop /* 41F89C 802AAB0C 8C820004 */ lw $v0, 4($a0) /* 41F8A0 802AAB10 8683006E */ lh $v1, 0x6e($s4) /* 41F8A4 802AAB14 30420040 */ andi $v0, $v0, 0x40 /* 41F8A8 802AAB18 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41F8AC 802AAB1C AC23C4DC */ sw $v1, %lo(gBattleStatus+0x46C)($at) /* 41F8B0 802AAB20 10400005 */ beqz $v0, .L802AAB38 -/* 41F8B4 802AAB24 00000000 */ nop +/* 41F8B4 802AAB24 00000000 */ nop /* 41F8B8 802AAB28 0C0AA6D1 */ jal func_802A9B44 -/* 41F8BC 802AAB2C 00000000 */ nop +/* 41F8BC 802AAB2C 00000000 */ nop /* 41F8C0 802AAB30 080AAAD0 */ j .L802AAB40 -/* 41F8C4 802AAB34 00000000 */ nop +/* 41F8C4 802AAB34 00000000 */ nop .L802AAB38: /* 41F8C8 802AAB38 0C0A9662 */ jal update_player_menu -/* 41F8CC 802AAB3C 00000000 */ nop +/* 41F8CC 802AAB3C 00000000 */ nop .L802AAB40: /* 41F8D0 802AAB40 0C090464 */ jal func_80241190 /* 41F8D4 802AAB44 24040012 */ addiu $a0, $zero, 0x12 /* 41F8D8 802AAB48 080AAB2D */ j .L802AACB4 -/* 41F8DC 802AAB4C 00000000 */ nop +/* 41F8DC 802AAB4C 00000000 */ nop .L802AAB50: /* 41F8E0 802AAB50 8C820004 */ lw $v0, 4($a0) /* 41F8E4 802AAB54 8683006E */ lh $v1, 0x6e($s4) @@ -346,20 +346,20 @@ glabel update_targeting_enemies /* 41F8EC 802AAB5C 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41F8F0 802AAB60 AC23C4DC */ sw $v1, %lo(gBattleStatus+0x46C)($at) /* 41F8F4 802AAB64 10400005 */ beqz $v0, .L802AAB7C -/* 41F8F8 802AAB68 00000000 */ nop +/* 41F8F8 802AAB68 00000000 */ nop .L802AAB6C: /* 41F8FC 802AAB6C 0C0AA82E */ jal func_802AA0B8 -/* 41F900 802AAB70 00000000 */ nop +/* 41F900 802AAB70 00000000 */ nop /* 41F904 802AAB74 080AAAE1 */ j .L802AAB84 -/* 41F908 802AAB78 00000000 */ nop +/* 41F908 802AAB78 00000000 */ nop .L802AAB7C: /* 41F90C 802AAB7C 0C0AA072 */ jal update_partner_menu -/* 41F910 802AAB80 00000000 */ nop +/* 41F910 802AAB80 00000000 */ nop .L802AAB84: /* 41F914 802AAB84 0C090464 */ jal func_80241190 /* 41F918 802AAB88 24040013 */ addiu $a0, $zero, 0x13 /* 41F91C 802AAB8C 080AAB2D */ j .L802AACB4 -/* 41F920 802AAB90 00000000 */ nop +/* 41F920 802AAB90 00000000 */ nop .L802AAB94: /* 41F924 802AAB94 1A60000A */ blez $s3, .L802AABC0 /* 41F928 802AAB98 0000802D */ daddu $s0, $zero, $zero @@ -372,7 +372,7 @@ glabel update_targeting_enemies /* 41F940 802AABB0 26100001 */ addiu $s0, $s0, 1 /* 41F944 802AABB4 0213102A */ slt $v0, $s0, $s3 /* 41F948 802AABB8 1440FFFA */ bnez $v0, .L802AABA4 -/* 41F94C 802AABBC 00000000 */ nop +/* 41F94C 802AABBC 00000000 */ nop .L802AABC0: /* 41F950 802AABC0 3C030001 */ lui $v1, 1 /* 41F954 802AABC4 3C10800E */ lui $s0, %hi(gBattleStatus) @@ -396,14 +396,14 @@ glabel update_targeting_enemies /* 41F99C 802AAC0C 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41F9A0 802AAC10 AC23C4DC */ sw $v1, %lo(gBattleStatus+0x46C)($at) /* 41F9A4 802AAC14 10400014 */ beqz $v0, .L802AAC68 -/* 41F9A8 802AAC18 00000000 */ nop +/* 41F9A8 802AAC18 00000000 */ nop /* 41F9AC 802AAC1C 080AAB16 */ j .L802AAC58 -/* 41F9B0 802AAC20 00000000 */ nop +/* 41F9B0 802AAC20 00000000 */ nop .L802AAC24: /* 41F9B4 802AAC24 8E020000 */ lw $v0, ($s0) /* 41F9B8 802AAC28 00431024 */ and $v0, $v0, $v1 /* 41F9BC 802AAC2C 14400012 */ bnez $v0, .L802AAC78 -/* 41F9C0 802AAC30 00000000 */ nop +/* 41F9C0 802AAC30 00000000 */ nop /* 41F9C4 802AAC34 0C090464 */ jal func_80241190 /* 41F9C8 802AAC38 2404000D */ addiu $a0, $zero, 0xd /* 41F9CC 802AAC3C 8E020004 */ lw $v0, 4($s0) @@ -412,17 +412,17 @@ glabel update_targeting_enemies /* 41F9D8 802AAC48 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41F9DC 802AAC4C AC23C4DC */ sw $v1, %lo(gBattleStatus+0x46C)($at) /* 41F9E0 802AAC50 10400005 */ beqz $v0, .L802AAC68 -/* 41F9E4 802AAC54 00000000 */ nop +/* 41F9E4 802AAC54 00000000 */ nop .L802AAC58: /* 41F9E8 802AAC58 0C0AA6D1 */ jal func_802A9B44 -/* 41F9EC 802AAC5C 00000000 */ nop +/* 41F9EC 802AAC5C 00000000 */ nop /* 41F9F0 802AAC60 080AAB2D */ j .L802AACB4 -/* 41F9F4 802AAC64 00000000 */ nop +/* 41F9F4 802AAC64 00000000 */ nop .L802AAC68: /* 41F9F8 802AAC68 0C0A9662 */ jal update_player_menu -/* 41F9FC 802AAC6C 00000000 */ nop +/* 41F9FC 802AAC6C 00000000 */ nop /* 41FA00 802AAC70 080AAB2D */ j .L802AACB4 -/* 41FA04 802AAC74 00000000 */ nop +/* 41FA04 802AAC74 00000000 */ nop .L802AAC78: /* 41FA08 802AAC78 0C090464 */ jal func_80241190 /* 41FA0C 802AAC7C 2404000E */ addiu $a0, $zero, 0xe @@ -432,14 +432,14 @@ glabel update_targeting_enemies /* 41FA1C 802AAC8C 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 41FA20 802AAC90 AC23C4DC */ sw $v1, %lo(gBattleStatus+0x46C)($at) /* 41FA24 802AAC94 10400005 */ beqz $v0, .L802AACAC -/* 41FA28 802AAC98 00000000 */ nop +/* 41FA28 802AAC98 00000000 */ nop /* 41FA2C 802AAC9C 0C0AA82E */ jal func_802AA0B8 -/* 41FA30 802AACA0 00000000 */ nop +/* 41FA30 802AACA0 00000000 */ nop /* 41FA34 802AACA4 080AAB2D */ j .L802AACB4 -/* 41FA38 802AACA8 00000000 */ nop +/* 41FA38 802AACA8 00000000 */ nop .L802AACAC: /* 41FA3C 802AACAC 0C0AA072 */ jal update_partner_menu -/* 41FA40 802AACB0 00000000 */ nop +/* 41FA40 802AACB0 00000000 */ nop .L802AACB4: /* 41FA44 802AACB4 8FBF0028 */ lw $ra, 0x28($sp) /* 41FA48 802AACB8 8FB50024 */ lw $s5, 0x24($sp) diff --git a/asm/nonmatchings/code_4219F0/func_802A9000_4219F0.s b/asm/nonmatchings/code_4219F0/func_802A9000_4219F0.s new file mode 100644 index 0000000000..9efc36309e --- /dev/null +++ b/asm/nonmatchings/code_4219F0/func_802A9000_4219F0.s @@ -0,0 +1,78 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802A9000_4219F0 +/* 4219F0 802A9000 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 4219F4 802A9004 3C03800E */ lui $v1, %hi(gBattleStatus) +/* 4219F8 802A9008 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) +/* 4219FC 802A900C 24020001 */ addiu $v0, $zero, 1 +/* 421A00 802A9010 AFBF0018 */ sw $ra, 0x18($sp) +/* 421A04 802A9014 AFB10014 */ sw $s1, 0x14($sp) +/* 421A08 802A9018 AFB00010 */ sw $s0, 0x10($sp) +/* 421A0C 802A901C A0620082 */ sb $v0, 0x82($v1) +/* 421A10 802A9020 3C028029 */ lui $v0, %hi(D_802941C0) +/* 421A14 802A9024 244241C0 */ addiu $v0, $v0, %lo(D_802941C0) +/* 421A18 802A9028 AC620434 */ sw $v0, 0x434($v1) +/* 421A1C 802A902C 80620083 */ lb $v0, 0x83($v1) +/* 421A20 802A9030 3C11802A */ lui $s1, %hi(D_8029FBE0) +/* 421A24 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 421A28 802A9038 10400032 */ beqz $v0, .L802A9104 +/* 421A2C 802A903C A0600086 */ sb $zero, 0x86($v1) +/* 421A30 802A9040 0C09A216 */ jal func_80268858 +/* 421A34 802A9044 00000000 */ nop +/* 421A38 802A9048 3C048011 */ lui $a0, %hi(D_80108B28) +/* 421A3C 802A904C 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) +/* 421A40 802A9050 24020001 */ addiu $v0, $zero, 1 +/* 421A44 802A9054 A622004A */ sh $v0, 0x4a($s1) +/* 421A48 802A9058 2402FFD0 */ addiu $v0, $zero, -0x30 +/* 421A4C 802A905C A6220056 */ sh $v0, 0x56($s1) +/* 421A50 802A9060 24020050 */ addiu $v0, $zero, 0x50 +/* 421A54 802A9064 A620004C */ sh $zero, 0x4c($s1) +/* 421A58 802A9068 A2200060 */ sb $zero, 0x60($s1) +/* 421A5C 802A906C 0C050529 */ jal create_icon +/* 421A60 802A9070 A6220058 */ sh $v0, 0x58($s1) +/* 421A64 802A9074 0040802D */ daddu $s0, $v0, $zero +/* 421A68 802A9078 0200202D */ daddu $a0, $s0, $zero +/* 421A6C 802A907C 24050082 */ addiu $a1, $zero, 0x82 +/* 421A70 802A9080 0C051280 */ jal set_icon_flags +/* 421A74 802A9084 AE300004 */ sw $s0, 4($s1) +/* 421A78 802A9088 86250056 */ lh $a1, 0x56($s1) +/* 421A7C 802A908C 86260058 */ lh $a2, 0x58($s1) +/* 421A80 802A9090 0C051261 */ jal set_icon_render_pos +/* 421A84 802A9094 0200202D */ daddu $a0, $s0, $zero +/* 421A88 802A9098 0200202D */ daddu $a0, $s0, $zero +/* 421A8C 802A909C 0C051277 */ jal func_801449DC +/* 421A90 802A90A0 0000282D */ daddu $a1, $zero, $zero +/* 421A94 802A90A4 0200202D */ daddu $a0, $s0, $zero +/* 421A98 802A90A8 0C0513AC */ jal icon_set_opacity +/* 421A9C 802A90AC 240500FF */ addiu $a1, $zero, 0xff +/* 421AA0 802A90B0 3C048029 */ lui $a0, %hi(D_80292A2C) +/* 421AA4 802A90B4 24842A2C */ addiu $a0, $a0, %lo(D_80292A2C) +/* 421AA8 802A90B8 0C050529 */ jal create_icon +/* 421AAC 802A90BC 00000000 */ nop +/* 421AB0 802A90C0 0040802D */ daddu $s0, $v0, $zero +/* 421AB4 802A90C4 0200202D */ daddu $a0, $s0, $zero +/* 421AB8 802A90C8 24050082 */ addiu $a1, $zero, 0x82 +/* 421ABC 802A90CC 0C051280 */ jal set_icon_flags +/* 421AC0 802A90D0 AE300008 */ sw $s0, 8($s1) +/* 421AC4 802A90D4 86250056 */ lh $a1, 0x56($s1) +/* 421AC8 802A90D8 86260058 */ lh $a2, 0x58($s1) +/* 421ACC 802A90DC 0C051261 */ jal set_icon_render_pos +/* 421AD0 802A90E0 0200202D */ daddu $a0, $s0, $zero +/* 421AD4 802A90E4 0200202D */ daddu $a0, $s0, $zero +/* 421AD8 802A90E8 0C051277 */ jal func_801449DC +/* 421ADC 802A90EC 0000282D */ daddu $a1, $zero, $zero +/* 421AE0 802A90F0 0200202D */ daddu $a0, $s0, $zero +/* 421AE4 802A90F4 0C0513AC */ jal icon_set_opacity +/* 421AE8 802A90F8 240500FF */ addiu $a1, $zero, 0xff +/* 421AEC 802A90FC 080AA443 */ j .L802A910C +/* 421AF0 802A9100 24020002 */ addiu $v0, $zero, 2 +.L802A9104: +/* 421AF4 802A9104 A0600081 */ sb $zero, 0x81($v1) +/* 421AF8 802A9108 24020002 */ addiu $v0, $zero, 2 +.L802A910C: +/* 421AFC 802A910C 8FBF0018 */ lw $ra, 0x18($sp) +/* 421B00 802A9110 8FB10014 */ lw $s1, 0x14($sp) +/* 421B04 802A9114 8FB00010 */ lw $s0, 0x10($sp) +/* 421B08 802A9118 03E00008 */ jr $ra +/* 421B0C 802A911C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_4219F0/func_802A9120_421B10.s b/asm/nonmatchings/code_4219F0/func_802A9120_421B10.s new file mode 100644 index 0000000000..5b30935032 --- /dev/null +++ b/asm/nonmatchings/code_4219F0/func_802A9120_421B10.s @@ -0,0 +1,76 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802A9120_421B10 +/* 421B10 802A9120 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 421B14 802A9124 AFB20018 */ sw $s2, 0x18($sp) +/* 421B18 802A9128 0080902D */ daddu $s2, $a0, $zero +/* 421B1C 802A912C AFB10014 */ sw $s1, 0x14($sp) +/* 421B20 802A9130 3C11802A */ lui $s1, %hi(D_8029FBE0) +/* 421B24 802A9134 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 421B28 802A9138 AFB40020 */ sw $s4, 0x20($sp) +/* 421B2C 802A913C 0220A02D */ daddu $s4, $s1, $zero +/* 421B30 802A9140 3C03800E */ lui $v1, %hi(gBattleStatus) +/* 421B34 802A9144 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) +/* 421B38 802A9148 AFB3001C */ sw $s3, 0x1c($sp) +/* 421B3C 802A914C AFBF0024 */ sw $ra, 0x24($sp) +/* 421B40 802A9150 AFB00010 */ sw $s0, 0x10($sp) +/* 421B44 802A9154 80620083 */ lb $v0, 0x83($v1) +/* 421B48 802A9158 8E50000C */ lw $s0, 0xc($s2) +/* 421B4C 802A915C 14400003 */ bnez $v0, .L802A916C +/* 421B50 802A9160 0060982D */ daddu $s3, $v1, $zero +/* 421B54 802A9164 080AA484 */ j .L802A9210 +/* 421B58 802A9168 A0600081 */ sb $zero, 0x81($v1) +.L802A916C: +/* 421B5C 802A916C 0C09A216 */ jal func_80268858 +/* 421B60 802A9170 00000000 */ nop +/* 421B64 802A9174 8E050000 */ lw $a1, ($s0) +/* 421B68 802A9178 26100004 */ addiu $s0, $s0, 4 +/* 421B6C 802A917C 0C0B1EAF */ jal get_variable +/* 421B70 802A9180 0240202D */ daddu $a0, $s2, $zero +/* 421B74 802A9184 A622004E */ sh $v0, 0x4e($s1) +/* 421B78 802A9188 8E050000 */ lw $a1, ($s0) +/* 421B7C 802A918C 0C0B1EAF */ jal get_variable +/* 421B80 802A9190 0240202D */ daddu $a0, $s2, $zero +/* 421B84 802A9194 00022400 */ sll $a0, $v0, 0x10 +/* 421B88 802A9198 00042403 */ sra $a0, $a0, 0x10 +/* 421B8C 802A919C 0C09A089 */ jal func_80268224 +/* 421B90 802A91A0 A6220050 */ sh $v0, 0x50($s1) +/* 421B94 802A91A4 3C03FFFF */ lui $v1, 0xffff +/* 421B98 802A91A8 34637FFF */ ori $v1, $v1, 0x7fff +/* 421B9C 802A91AC 24050032 */ addiu $a1, $zero, 0x32 +/* 421BA0 802A91B0 A6220050 */ sh $v0, 0x50($s1) +/* 421BA4 802A91B4 A2200060 */ sb $zero, 0x60($s1) +/* 421BA8 802A91B8 A2600081 */ sb $zero, 0x81($s3) +/* 421BAC 802A91BC 8E300004 */ lw $s0, 4($s1) +/* 421BB0 802A91C0 00A0102D */ daddu $v0, $a1, $zero +/* 421BB4 802A91C4 A6220056 */ sh $v0, 0x56($s1) +/* 421BB8 802A91C8 8E620000 */ lw $v0, ($s3) +/* 421BBC 802A91CC 86260058 */ lh $a2, 0x58($s1) +/* 421BC0 802A91D0 0200202D */ daddu $a0, $s0, $zero +/* 421BC4 802A91D4 00431024 */ and $v0, $v0, $v1 +/* 421BC8 802A91D8 2403DFFF */ addiu $v1, $zero, -0x2001 +/* 421BCC 802A91DC 00431024 */ and $v0, $v0, $v1 +/* 421BD0 802A91E0 0C051261 */ jal set_icon_render_pos +/* 421BD4 802A91E4 AE620000 */ sw $v0, ($s3) +/* 421BD8 802A91E8 82220061 */ lb $v0, 0x61($s1) +/* 421BDC 802A91EC 10400003 */ beqz $v0, .L802A91FC +/* 421BE0 802A91F0 0200202D */ daddu $a0, $s0, $zero +/* 421BE4 802A91F4 0C05128B */ jal clear_icon_flags +/* 421BE8 802A91F8 24050002 */ addiu $a1, $zero, 2 +.L802A91FC: +/* 421BEC 802A91FC 2402000A */ addiu $v0, $zero, 0xa +/* 421BF0 802A9200 0C09A446 */ jal func_80269118 +/* 421BF4 802A9204 A682004C */ sh $v0, 0x4c($s4) +/* 421BF8 802A9208 0C093EB1 */ jal set_popup_duration +/* 421BFC 802A920C 2404000A */ addiu $a0, $zero, 0xa +.L802A9210: +/* 421C00 802A9210 24020002 */ addiu $v0, $zero, 2 +/* 421C04 802A9214 8FBF0024 */ lw $ra, 0x24($sp) +/* 421C08 802A9218 8FB40020 */ lw $s4, 0x20($sp) +/* 421C0C 802A921C 8FB3001C */ lw $s3, 0x1c($sp) +/* 421C10 802A9220 8FB20018 */ lw $s2, 0x18($sp) +/* 421C14 802A9224 8FB10014 */ lw $s1, 0x14($sp) +/* 421C18 802A9228 8FB00010 */ lw $s0, 0x10($sp) +/* 421C1C 802A922C 03E00008 */ jr $ra +/* 421C20 802A9230 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_4219F0/func_802A9234.s b/asm/nonmatchings/code_4219F0/func_802A9234.s index 30862647c8..33858d5d7c 100644 --- a/asm/nonmatchings/code_4219F0/func_802A9234.s +++ b/asm/nonmatchings/code_4219F0/func_802A9234.s @@ -19,7 +19,7 @@ glabel func_802A9234 /* 421C5C 802A926C 00220821 */ addu $at, $at, $v0 /* 421C60 802A9270 8C2295D0 */ lw $v0, %lo(D_802A95D0)($at) /* 421C64 802A9274 00400008 */ jr $v0 -/* 421C68 802A9278 00000000 */ nop +/* 421C68 802A9278 00000000 */ nop /* 421C6C 802A927C 82430083 */ lb $v1, 0x83($s2) /* 421C70 802A9280 24020002 */ addiu $v0, $zero, 2 /* 421C74 802A9284 14620004 */ bne $v1, $v0, .L802A9298 @@ -33,7 +33,7 @@ glabel func_802A9234 /* 421C90 802A92A0 82430083 */ lb $v1, 0x83($s2) /* 421C94 802A92A4 24020002 */ addiu $v0, $zero, 2 /* 421C98 802A92A8 14620003 */ bne $v1, $v0, .L802A92B8 -/* 421C9C 802A92AC 00000000 */ nop +/* 421C9C 802A92AC 00000000 */ nop /* 421CA0 802A92B0 0C093EB1 */ jal set_popup_duration /* 421CA4 802A92B4 24040063 */ addiu $a0, $zero, 0x63 .L802A92B8: @@ -60,7 +60,7 @@ glabel func_802A9234 .L802A9304: /* 421CF4 802A9304 8222005E */ lb $v0, 0x5e($s1) /* 421CF8 802A9308 10400088 */ beqz $v0, .L802A952C -/* 421CFC 802A930C 00000000 */ nop +/* 421CFC 802A930C 00000000 */ nop /* 421D00 802A9310 8E300008 */ lw $s0, 8($s1) /* 421D04 802A9314 86260058 */ lh $a2, 0x58($s1) /* 421D08 802A9318 86250056 */ lh $a1, 0x56($s1) @@ -73,11 +73,11 @@ glabel func_802A9234 /* 421D24 802A9334 0C05128B */ jal clear_icon_flags /* 421D28 802A9338 24050002 */ addiu $a1, $zero, 2 /* 421D2C 802A933C 080AA54B */ j .L802A952C -/* 421D30 802A9340 00000000 */ nop +/* 421D30 802A9340 00000000 */ nop /* 421D34 802A9344 82430083 */ lb $v1, 0x83($s2) /* 421D38 802A9348 24020002 */ addiu $v0, $zero, 2 /* 421D3C 802A934C 14620003 */ bne $v1, $v0, .L802A935C -/* 421D40 802A9350 00000000 */ nop +/* 421D40 802A9350 00000000 */ nop /* 421D44 802A9354 0C093EB1 */ jal set_popup_duration /* 421D48 802A9358 24040063 */ addiu $a0, $zero, 0x63 .L802A935C: @@ -90,17 +90,17 @@ glabel func_802A9234 /* 421D64 802A9374 00501023 */ subu $v0, $v0, $s0 /* 421D68 802A9378 2442FFFE */ addiu $v0, $v0, -2 /* 421D6C 802A937C 1C400006 */ bgtz $v0, .L802A9398 -/* 421D70 802A9380 00000000 */ nop +/* 421D70 802A9380 00000000 */ nop /* 421D74 802A9384 8E240004 */ lw $a0, 4($s1) /* 421D78 802A9388 3C058011 */ lui $a1, %hi(D_80108B54) /* 421D7C 802A938C 24A58B54 */ addiu $a1, $a1, %lo(D_80108B54) /* 421D80 802A9390 0C0511FF */ jal set_menu_icon_script -/* 421D84 802A9394 00000000 */ nop +/* 421D84 802A9394 00000000 */ nop .L802A9398: /* 421D88 802A9398 8E420214 */ lw $v0, 0x214($s2) /* 421D8C 802A939C 30428000 */ andi $v0, $v0, 0x8000 /* 421D90 802A93A0 10400007 */ beqz $v0, .L802A93C0 -/* 421D94 802A93A4 00000000 */ nop +/* 421D94 802A93A4 00000000 */ nop /* 421D98 802A93A8 8222005E */ lb $v0, 0x5e($s1) /* 421D9C 802A93AC 14400004 */ bnez $v0, .L802A93C0 /* 421DA0 802A93B0 24020001 */ addiu $v0, $zero, 1 @@ -129,23 +129,23 @@ glabel func_802A9234 /* 421DF4 802A9404 82430083 */ lb $v1, 0x83($s2) /* 421DF8 802A9408 24020002 */ addiu $v0, $zero, 2 /* 421DFC 802A940C 14620003 */ bne $v1, $v0, .L802A941C -/* 421E00 802A9410 00000000 */ nop +/* 421E00 802A9410 00000000 */ nop /* 421E04 802A9414 0C093EB1 */ jal set_popup_duration /* 421E08 802A9418 24040063 */ addiu $a0, $zero, 0x63 .L802A941C: /* 421E0C 802A941C 82420083 */ lb $v0, 0x83($s2) /* 421E10 802A9420 28420002 */ slti $v0, $v0, 2 /* 421E14 802A9424 14400006 */ bnez $v0, .L802A9440 -/* 421E18 802A9428 00000000 */ nop +/* 421E18 802A9428 00000000 */ nop /* 421E1C 802A942C 86220054 */ lh $v0, 0x54($s1) /* 421E20 802A9430 1040003E */ beqz $v0, .L802A952C -/* 421E24 802A9434 00000000 */ nop +/* 421E24 802A9434 00000000 */ nop /* 421E28 802A9438 080AA519 */ j .L802A9464 -/* 421E2C 802A943C 00000000 */ nop +/* 421E2C 802A943C 00000000 */ nop .L802A9440: /* 421E30 802A9440 82420081 */ lb $v0, 0x81($s2) /* 421E34 802A9444 0440000A */ bltz $v0, .L802A9470 -/* 421E38 802A9448 00000000 */ nop +/* 421E38 802A9448 00000000 */ nop /* 421E3C 802A944C 82220061 */ lb $v0, 0x61($s1) /* 421E40 802A9450 8E300004 */ lw $s0, 4($s1) /* 421E44 802A9454 10400003 */ beqz $v0, .L802A9464 @@ -155,19 +155,19 @@ glabel func_802A9234 .L802A9464: /* 421E54 802A9464 82420081 */ lb $v0, 0x81($s2) /* 421E58 802A9468 04410013 */ bgez $v0, .L802A94B8 -/* 421E5C 802A946C 00000000 */ nop +/* 421E5C 802A946C 00000000 */ nop .L802A9470: /* 421E60 802A9470 8E420214 */ lw $v0, 0x214($s2) /* 421E64 802A9474 30428000 */ andi $v0, $v0, 0x8000 /* 421E68 802A9478 10400004 */ beqz $v0, .L802A948C -/* 421E6C 802A947C 00000000 */ nop +/* 421E6C 802A947C 00000000 */ nop /* 421E70 802A9480 82220060 */ lb $v0, 0x60($s1) /* 421E74 802A9484 10400004 */ beqz $v0, .L802A9498 -/* 421E78 802A9488 00000000 */ nop +/* 421E78 802A9488 00000000 */ nop .L802A948C: /* 421E7C 802A948C 8222005E */ lb $v0, 0x5e($s1) /* 421E80 802A9490 10400009 */ beqz $v0, .L802A94B8 -/* 421E84 802A9494 00000000 */ nop +/* 421E84 802A9494 00000000 */ nop .L802A9498: /* 421E88 802A9498 3C02800E */ lui $v0, %hi(gBattleStatus) /* 421E8C 802A949C 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) @@ -185,9 +185,9 @@ glabel func_802A9234 /* 421EB8 802A94C8 82430081 */ lb $v1, 0x81($s2) /* 421EBC 802A94CC 24020001 */ addiu $v0, $zero, 1 /* 421EC0 802A94D0 14620003 */ bne $v1, $v0, .L802A94E0 -/* 421EC4 802A94D4 00000000 */ nop +/* 421EC4 802A94D4 00000000 */ nop /* 421EC8 802A94D8 0C09A458 */ jal func_80269160 -/* 421ECC 802A94DC 00000000 */ nop +/* 421ECC 802A94DC 00000000 */ nop .L802A94E0: /* 421ED0 802A94E0 82430083 */ lb $v1, 0x83($s2) /* 421ED4 802A94E4 24020002 */ addiu $v0, $zero, 2 @@ -210,7 +210,7 @@ glabel func_802A9234 /* 421F10 802A9520 A6220054 */ sh $v0, 0x54($s1) .L802A9524: /* 421F14 802A9524 0C09A327 */ jal func_80268C9C -/* 421F18 802A9528 00000000 */ nop +/* 421F18 802A9528 00000000 */ nop .L802A952C: /* 421F1C 802A952C 8FBF001C */ lw $ra, 0x1c($sp) /* 421F20 802A9530 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/code_4219F0/func_802A9234_421C24.s b/asm/nonmatchings/code_4219F0/func_802A9234_421C24.s new file mode 100644 index 0000000000..9e3e9c57d0 --- /dev/null +++ b/asm/nonmatchings/code_4219F0/func_802A9234_421C24.s @@ -0,0 +1,226 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802A9234_421C24 +/* 421C24 802A9234 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 421C28 802A9238 AFB10014 */ sw $s1, 0x14($sp) +/* 421C2C 802A923C 3C11802A */ lui $s1, %hi(D_8029FBE0) +/* 421C30 802A9240 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 421C34 802A9244 AFBF001C */ sw $ra, 0x1c($sp) +/* 421C38 802A9248 AFB20018 */ sw $s2, 0x18($sp) +/* 421C3C 802A924C AFB00010 */ sw $s0, 0x10($sp) +/* 421C40 802A9250 8623004C */ lh $v1, 0x4c($s1) +/* 421C44 802A9254 3C12800E */ lui $s2, %hi(gBattleStatus) +/* 421C48 802A9258 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) +/* 421C4C 802A925C 2C62000D */ sltiu $v0, $v1, 0xd +/* 421C50 802A9260 104000B2 */ beqz $v0, .L802A952C +/* 421C54 802A9264 00031080 */ sll $v0, $v1, 2 +/* 421C58 802A9268 3C01802B */ lui $at, %hi(jtbl_802A95D0_421FC0) +/* 421C5C 802A926C 00220821 */ addu $at, $at, $v0 +/* 421C60 802A9270 8C2295D0 */ lw $v0, %lo(jtbl_802A95D0_421FC0)($at) +/* 421C64 802A9274 00400008 */ jr $v0 +/* 421C68 802A9278 00000000 */ nop +glabel L802A927C_421C6C +/* 421C6C 802A927C 82430083 */ lb $v1, 0x83($s2) +/* 421C70 802A9280 24020002 */ addiu $v0, $zero, 2 +/* 421C74 802A9284 14620004 */ bne $v1, $v0, .L802A9298 +/* 421C78 802A9288 24020001 */ addiu $v0, $zero, 1 +/* 421C7C 802A928C 0C093EB1 */ jal set_popup_duration +/* 421C80 802A9290 24040063 */ addiu $a0, $zero, 0x63 +/* 421C84 802A9294 24020001 */ addiu $v0, $zero, 1 +.L802A9298: +/* 421C88 802A9298 080AA54B */ j .L802A952C +/* 421C8C 802A929C A622004C */ sh $v0, 0x4c($s1) +glabel L802A92A0_421C90 +/* 421C90 802A92A0 82430083 */ lb $v1, 0x83($s2) +/* 421C94 802A92A4 24020002 */ addiu $v0, $zero, 2 +/* 421C98 802A92A8 14620003 */ bne $v1, $v0, .L802A92B8 +/* 421C9C 802A92AC 00000000 */ nop +/* 421CA0 802A92B0 0C093EB1 */ jal set_popup_duration +/* 421CA4 802A92B4 24040063 */ addiu $a0, $zero, 0x63 +.L802A92B8: +/* 421CA8 802A92B8 96220056 */ lhu $v0, 0x56($s1) +/* 421CAC 802A92BC 24420014 */ addiu $v0, $v0, 0x14 +/* 421CB0 802A92C0 A6220056 */ sh $v0, 0x56($s1) +/* 421CB4 802A92C4 00021400 */ sll $v0, $v0, 0x10 +/* 421CB8 802A92C8 00021403 */ sra $v0, $v0, 0x10 +/* 421CBC 802A92CC 28420033 */ slti $v0, $v0, 0x33 +/* 421CC0 802A92D0 14400002 */ bnez $v0, .L802A92DC +/* 421CC4 802A92D4 24020032 */ addiu $v0, $zero, 0x32 +/* 421CC8 802A92D8 A6220056 */ sh $v0, 0x56($s1) +.L802A92DC: +/* 421CCC 802A92DC 8E300004 */ lw $s0, 4($s1) +/* 421CD0 802A92E0 86250056 */ lh $a1, 0x56($s1) +/* 421CD4 802A92E4 86260058 */ lh $a2, 0x58($s1) +/* 421CD8 802A92E8 0C051261 */ jal set_icon_render_pos +/* 421CDC 802A92EC 0200202D */ daddu $a0, $s0, $zero +/* 421CE0 802A92F0 82220061 */ lb $v0, 0x61($s1) +/* 421CE4 802A92F4 10400003 */ beqz $v0, .L802A9304 +/* 421CE8 802A92F8 0200202D */ daddu $a0, $s0, $zero +/* 421CEC 802A92FC 0C05128B */ jal clear_icon_flags +/* 421CF0 802A9300 24050002 */ addiu $a1, $zero, 2 +.L802A9304: +/* 421CF4 802A9304 8222005E */ lb $v0, 0x5e($s1) +/* 421CF8 802A9308 10400088 */ beqz $v0, .L802A952C +/* 421CFC 802A930C 00000000 */ nop +/* 421D00 802A9310 8E300008 */ lw $s0, 8($s1) +/* 421D04 802A9314 86260058 */ lh $a2, 0x58($s1) +/* 421D08 802A9318 86250056 */ lh $a1, 0x56($s1) +/* 421D0C 802A931C 0200202D */ daddu $a0, $s0, $zero +/* 421D10 802A9320 0C051261 */ jal set_icon_render_pos +/* 421D14 802A9324 24A50032 */ addiu $a1, $a1, 0x32 +/* 421D18 802A9328 82220061 */ lb $v0, 0x61($s1) +/* 421D1C 802A932C 1040007F */ beqz $v0, .L802A952C +/* 421D20 802A9330 0200202D */ daddu $a0, $s0, $zero +/* 421D24 802A9334 0C05128B */ jal clear_icon_flags +/* 421D28 802A9338 24050002 */ addiu $a1, $zero, 2 +/* 421D2C 802A933C 080AA54B */ j .L802A952C +/* 421D30 802A9340 00000000 */ nop +glabel L802A9344_421D34 +/* 421D34 802A9344 82430083 */ lb $v1, 0x83($s2) +/* 421D38 802A9348 24020002 */ addiu $v0, $zero, 2 +/* 421D3C 802A934C 14620003 */ bne $v1, $v0, .L802A935C +/* 421D40 802A9350 00000000 */ nop +/* 421D44 802A9354 0C093EB1 */ jal set_popup_duration +/* 421D48 802A9358 24040063 */ addiu $a0, $zero, 0x63 +.L802A935C: +/* 421D4C 802A935C 86220050 */ lh $v0, 0x50($s1) +/* 421D50 802A9360 8E430434 */ lw $v1, 0x434($s2) +/* 421D54 802A9364 00021080 */ sll $v0, $v0, 2 +/* 421D58 802A9368 00431021 */ addu $v0, $v0, $v1 +/* 421D5C 802A936C 8C500000 */ lw $s0, ($v0) +/* 421D60 802A9370 8622004E */ lh $v0, 0x4e($s1) +/* 421D64 802A9374 00501023 */ subu $v0, $v0, $s0 +/* 421D68 802A9378 2442FFFE */ addiu $v0, $v0, -2 +/* 421D6C 802A937C 1C400006 */ bgtz $v0, .L802A9398 +/* 421D70 802A9380 00000000 */ nop +/* 421D74 802A9384 8E240004 */ lw $a0, 4($s1) +/* 421D78 802A9388 3C058011 */ lui $a1, %hi(D_80108B54) +/* 421D7C 802A938C 24A58B54 */ addiu $a1, $a1, %lo(D_80108B54) +/* 421D80 802A9390 0C0511FF */ jal set_menu_icon_script +/* 421D84 802A9394 00000000 */ nop +.L802A9398: +/* 421D88 802A9398 8E420214 */ lw $v0, 0x214($s2) +/* 421D8C 802A939C 30428000 */ andi $v0, $v0, 0x8000 +/* 421D90 802A93A0 10400007 */ beqz $v0, .L802A93C0 +/* 421D94 802A93A4 00000000 */ nop +/* 421D98 802A93A8 8222005E */ lb $v0, 0x5e($s1) +/* 421D9C 802A93AC 14400004 */ bnez $v0, .L802A93C0 +/* 421DA0 802A93B0 24020001 */ addiu $v0, $zero, 1 +/* 421DA4 802A93B4 A2220060 */ sb $v0, 0x60($s1) +/* 421DA8 802A93B8 2402FFFF */ addiu $v0, $zero, -1 +/* 421DAC 802A93BC A2420086 */ sb $v0, 0x86($s2) +.L802A93C0: +/* 421DB0 802A93C0 8622004E */ lh $v0, 0x4e($s1) +/* 421DB4 802A93C4 9623004E */ lhu $v1, 0x4e($s1) +/* 421DB8 802A93C8 00501023 */ subu $v0, $v0, $s0 +/* 421DBC 802A93CC 18400003 */ blez $v0, .L802A93DC +/* 421DC0 802A93D0 2462FFFF */ addiu $v0, $v1, -1 +/* 421DC4 802A93D4 080AA54B */ j .L802A952C +/* 421DC8 802A93D8 A622004E */ sh $v0, 0x4e($s1) +.L802A93DC: +/* 421DCC 802A93DC 86220050 */ lh $v0, 0x50($s1) +/* 421DD0 802A93E0 8E430434 */ lw $v1, 0x434($s2) +/* 421DD4 802A93E4 00021080 */ sll $v0, $v0, 2 +/* 421DD8 802A93E8 00431021 */ addu $v0, $v0, $v1 +/* 421DDC 802A93EC 94430002 */ lhu $v1, 2($v0) +/* 421DE0 802A93F0 2402FFFF */ addiu $v0, $zero, -1 +/* 421DE4 802A93F4 A2420081 */ sb $v0, 0x81($s2) +/* 421DE8 802A93F8 2402000B */ addiu $v0, $zero, 0xb +/* 421DEC 802A93FC A622004C */ sh $v0, 0x4c($s1) +/* 421DF0 802A9400 A6230054 */ sh $v1, 0x54($s1) +glabel L802A9404_421DF4 +/* 421DF4 802A9404 82430083 */ lb $v1, 0x83($s2) +/* 421DF8 802A9408 24020002 */ addiu $v0, $zero, 2 +/* 421DFC 802A940C 14620003 */ bne $v1, $v0, .L802A941C +/* 421E00 802A9410 00000000 */ nop +/* 421E04 802A9414 0C093EB1 */ jal set_popup_duration +/* 421E08 802A9418 24040063 */ addiu $a0, $zero, 0x63 +.L802A941C: +/* 421E0C 802A941C 82420083 */ lb $v0, 0x83($s2) +/* 421E10 802A9420 28420002 */ slti $v0, $v0, 2 +/* 421E14 802A9424 14400006 */ bnez $v0, .L802A9440 +/* 421E18 802A9428 00000000 */ nop +/* 421E1C 802A942C 86220054 */ lh $v0, 0x54($s1) +/* 421E20 802A9430 1040003E */ beqz $v0, .L802A952C +/* 421E24 802A9434 00000000 */ nop +/* 421E28 802A9438 080AA519 */ j .L802A9464 +/* 421E2C 802A943C 00000000 */ nop +.L802A9440: +/* 421E30 802A9440 82420081 */ lb $v0, 0x81($s2) +/* 421E34 802A9444 0440000A */ bltz $v0, .L802A9470 +/* 421E38 802A9448 00000000 */ nop +/* 421E3C 802A944C 82220061 */ lb $v0, 0x61($s1) +/* 421E40 802A9450 8E300004 */ lw $s0, 4($s1) +/* 421E44 802A9454 10400003 */ beqz $v0, .L802A9464 +/* 421E48 802A9458 0200202D */ daddu $a0, $s0, $zero +/* 421E4C 802A945C 0C051280 */ jal set_icon_flags +/* 421E50 802A9460 24050002 */ addiu $a1, $zero, 2 +.L802A9464: +/* 421E54 802A9464 82420081 */ lb $v0, 0x81($s2) +/* 421E58 802A9468 04410013 */ bgez $v0, .L802A94B8 +/* 421E5C 802A946C 00000000 */ nop +.L802A9470: +/* 421E60 802A9470 8E420214 */ lw $v0, 0x214($s2) +/* 421E64 802A9474 30428000 */ andi $v0, $v0, 0x8000 +/* 421E68 802A9478 10400004 */ beqz $v0, .L802A948C +/* 421E6C 802A947C 00000000 */ nop +/* 421E70 802A9480 82220060 */ lb $v0, 0x60($s1) +/* 421E74 802A9484 10400004 */ beqz $v0, .L802A9498 +/* 421E78 802A9488 00000000 */ nop +.L802A948C: +/* 421E7C 802A948C 8222005E */ lb $v0, 0x5e($s1) +/* 421E80 802A9490 10400009 */ beqz $v0, .L802A94B8 +/* 421E84 802A9494 00000000 */ nop +.L802A9498: +/* 421E88 802A9498 3C02800E */ lui $v0, %hi(gBattleStatus) +/* 421E8C 802A949C 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) +/* 421E90 802A94A0 8C430000 */ lw $v1, ($v0) +/* 421E94 802A94A4 24040001 */ addiu $a0, $zero, 1 +/* 421E98 802A94A8 A2440081 */ sb $a0, 0x81($s2) +/* 421E9C 802A94AC A2440086 */ sb $a0, 0x86($s2) +/* 421EA0 802A94B0 34632000 */ ori $v1, $v1, 0x2000 +/* 421EA4 802A94B4 AC430000 */ sw $v1, ($v0) +.L802A94B8: +/* 421EA8 802A94B8 86220054 */ lh $v0, 0x54($s1) +/* 421EAC 802A94BC 96230054 */ lhu $v1, 0x54($s1) +/* 421EB0 802A94C0 14400016 */ bnez $v0, .L802A951C +/* 421EB4 802A94C4 2462FFFF */ addiu $v0, $v1, -1 +/* 421EB8 802A94C8 82430081 */ lb $v1, 0x81($s2) +/* 421EBC 802A94CC 24020001 */ addiu $v0, $zero, 1 +/* 421EC0 802A94D0 14620003 */ bne $v1, $v0, .L802A94E0 +/* 421EC4 802A94D4 00000000 */ nop +/* 421EC8 802A94D8 0C09A458 */ jal func_80269160 +/* 421ECC 802A94DC 00000000 */ nop +.L802A94E0: +/* 421ED0 802A94E0 82430083 */ lb $v1, 0x83($s2) +/* 421ED4 802A94E4 24020002 */ addiu $v0, $zero, 2 +/* 421ED8 802A94E8 14620004 */ bne $v1, $v0, .L802A94FC +/* 421EDC 802A94EC 24020005 */ addiu $v0, $zero, 5 +/* 421EE0 802A94F0 0C093EB1 */ jal set_popup_duration +/* 421EE4 802A94F4 0000202D */ daddu $a0, $zero, $zero +/* 421EE8 802A94F8 24020005 */ addiu $v0, $zero, 5 +.L802A94FC: +/* 421EEC 802A94FC A6220054 */ sh $v0, 0x54($s1) +/* 421EF0 802A9500 2402000C */ addiu $v0, $zero, 0xc +/* 421EF4 802A9504 080AA54B */ j .L802A952C +/* 421EF8 802A9508 A622004C */ sh $v0, 0x4c($s1) +glabel L802A950C_421EFC +/* 421EFC 802A950C 86220054 */ lh $v0, 0x54($s1) +/* 421F00 802A9510 96230054 */ lhu $v1, 0x54($s1) +/* 421F04 802A9514 10400003 */ beqz $v0, .L802A9524 +/* 421F08 802A9518 2462FFFF */ addiu $v0, $v1, -1 +.L802A951C: +/* 421F0C 802A951C 080AA54B */ j .L802A952C +/* 421F10 802A9520 A6220054 */ sh $v0, 0x54($s1) +.L802A9524: +/* 421F14 802A9524 0C09A327 */ jal func_80268C9C +/* 421F18 802A9528 00000000 */ nop +.L802A952C: +glabel L802A952C_421F1C +/* 421F1C 802A952C 8FBF001C */ lw $ra, 0x1c($sp) +/* 421F20 802A9530 8FB20018 */ lw $s2, 0x18($sp) +/* 421F24 802A9534 8FB10014 */ lw $s1, 0x14($sp) +/* 421F28 802A9538 8FB00010 */ lw $s0, 0x10($sp) +/* 421F2C 802A953C 03E00008 */ jr $ra +/* 421F30 802A9540 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_4219F0/func_802A9544_421F34.s b/asm/nonmatchings/code_4219F0/func_802A9544_421F34.s new file mode 100644 index 0000000000..b7339feeee --- /dev/null +++ b/asm/nonmatchings/code_4219F0/func_802A9544_421F34.s @@ -0,0 +1,24 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802A9544_421F34 +/* 421F34 802A9544 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 421F38 802A9548 AFB00010 */ sw $s0, 0x10($sp) +/* 421F3C 802A954C 3C10802A */ lui $s0, %hi(D_8029FBE0) +/* 421F40 802A9550 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) +/* 421F44 802A9554 AFBF0014 */ sw $ra, 0x14($sp) +/* 421F48 802A9558 0C0511EA */ jal draw_icon_0 +/* 421F4C 802A955C 8E040004 */ lw $a0, 4($s0) +/* 421F50 802A9560 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 421F54 802A9564 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 421F58 802A9568 904200AA */ lbu $v0, 0xaa($v0) +/* 421F5C 802A956C 30420001 */ andi $v0, $v0, 1 +/* 421F60 802A9570 14400003 */ bnez $v0, .L802A9580 +/* 421F64 802A9574 00000000 */ nop +/* 421F68 802A9578 0C0511EA */ jal draw_icon_0 +/* 421F6C 802A957C 8E040008 */ lw $a0, 8($s0) +.L802A9580: +/* 421F70 802A9580 8FBF0014 */ lw $ra, 0x14($sp) +/* 421F74 802A9584 8FB00010 */ lw $s0, 0x10($sp) +/* 421F78 802A9588 03E00008 */ jr $ra +/* 421F7C 802A958C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_4219F0/func_802A9590_421F80.s b/asm/nonmatchings/code_4219F0/func_802A9590_421F80.s new file mode 100644 index 0000000000..83b21ab0e2 --- /dev/null +++ b/asm/nonmatchings/code_4219F0/func_802A9590_421F80.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802A9590_421F80 +/* 421F80 802A9590 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 421F84 802A9594 AFB00010 */ sw $s0, 0x10($sp) +/* 421F88 802A9598 3C10802A */ lui $s0, %hi(D_8029FBE0) +/* 421F8C 802A959C 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) +/* 421F90 802A95A0 AFBF0014 */ sw $ra, 0x14($sp) +/* 421F94 802A95A4 0C05123D */ jal free_icon +/* 421F98 802A95A8 8E040004 */ lw $a0, 4($s0) +/* 421F9C 802A95AC 0C05123D */ jal free_icon +/* 421FA0 802A95B0 8E040008 */ lw $a0, 8($s0) +/* 421FA4 802A95B4 8FBF0014 */ lw $ra, 0x14($sp) +/* 421FA8 802A95B8 8FB00010 */ lw $s0, 0x10($sp) +/* 421FAC 802A95BC 03E00008 */ jr $ra +/* 421FB0 802A95C0 27BD0018 */ addiu $sp, $sp, 0x18 +/* 421FB4 802A95C4 00000000 */ nop +/* 421FB8 802A95C8 00000000 */ nop +/* 421FBC 802A95CC 00000000 */ nop diff --git a/asm/nonmatchings/code_422000/func_802A9000_422000.s b/asm/nonmatchings/code_422000/func_802A9000_422000.s index 3d6a4203b2..be488d1e30 100644 --- a/asm/nonmatchings/code_422000/func_802A9000_422000.s +++ b/asm/nonmatchings/code_422000/func_802A9000_422000.s @@ -19,7 +19,7 @@ glabel func_802A9000_422000 /* 422038 802A9038 1040007F */ beqz $v0, .L802A9238 /* 42203C 802A903C A0600086 */ sb $zero, 0x86($v1) /* 422040 802A9040 0C09A216 */ jal func_80268858 -/* 422044 802A9044 00000000 */ nop +/* 422044 802A9044 00000000 */ nop /* 422048 802A9048 3C048029 */ lui $a0, %hi(D_802922F0) /* 42204C 802A904C 248422F0 */ addiu $a0, $a0, %lo(D_802922F0) /* 422050 802A9050 24020002 */ addiu $v0, $zero, 2 @@ -46,7 +46,7 @@ glabel func_802A9000_422000 /* 4220A4 802A90A4 3C048029 */ lui $a0, %hi(D_8029275C) /* 4220A8 802A90A8 2484275C */ addiu $a0, $a0, %lo(D_8029275C) /* 4220AC 802A90AC 0C050529 */ jal create_icon -/* 4220B0 802A90B0 00000000 */ nop +/* 4220B0 802A90B0 00000000 */ nop /* 4220B4 802A90B4 0040802D */ daddu $s0, $v0, $zero /* 4220B8 802A90B8 0200202D */ daddu $a0, $s0, $zero /* 4220BC 802A90BC 24050082 */ addiu $a1, $zero, 0x82 @@ -62,7 +62,7 @@ glabel func_802A9000_422000 /* 4220E4 802A90E4 3C048029 */ lui $a0, %hi(D_802927F0) /* 4220E8 802A90E8 248427F0 */ addiu $a0, $a0, %lo(D_802927F0) /* 4220EC 802A90EC 0C050529 */ jal create_icon -/* 4220F0 802A90F0 00000000 */ nop +/* 4220F0 802A90F0 00000000 */ nop /* 4220F4 802A90F4 0040802D */ daddu $s0, $v0, $zero /* 4220F8 802A90F8 0200202D */ daddu $a0, $s0, $zero /* 4220FC 802A90FC 24050082 */ addiu $a1, $zero, 0x82 @@ -78,7 +78,7 @@ glabel func_802A9000_422000 /* 422124 802A9124 3C048029 */ lui $a0, %hi(D_80292848) /* 422128 802A9128 24842848 */ addiu $a0, $a0, %lo(D_80292848) /* 42212C 802A912C 0C050529 */ jal create_icon -/* 422130 802A9130 00000000 */ nop +/* 422130 802A9130 00000000 */ nop /* 422134 802A9134 0040802D */ daddu $s0, $v0, $zero /* 422138 802A9138 0200202D */ daddu $a0, $s0, $zero /* 42213C 802A913C 24050082 */ addiu $a1, $zero, 0x82 @@ -94,7 +94,7 @@ glabel func_802A9000_422000 /* 422164 802A9164 3C048029 */ lui $a0, %hi(D_802928A0) /* 422168 802A9168 248428A0 */ addiu $a0, $a0, %lo(D_802928A0) /* 42216C 802A916C 0C050529 */ jal create_icon -/* 422170 802A9170 00000000 */ nop +/* 422170 802A9170 00000000 */ nop /* 422174 802A9174 0040802D */ daddu $s0, $v0, $zero /* 422178 802A9178 0200202D */ daddu $a0, $s0, $zero /* 42217C 802A917C 24050082 */ addiu $a1, $zero, 0x82 @@ -110,7 +110,7 @@ glabel func_802A9000_422000 /* 4221A4 802A91A4 3C048011 */ lui $a0, %hi(D_80108E48) /* 4221A8 802A91A8 24848E48 */ addiu $a0, $a0, %lo(D_80108E48) /* 4221AC 802A91AC 0C050529 */ jal create_icon -/* 4221B0 802A91B0 00000000 */ nop +/* 4221B0 802A91B0 00000000 */ nop /* 4221B4 802A91B4 0040802D */ daddu $s0, $v0, $zero /* 4221B8 802A91B8 0200202D */ daddu $a0, $s0, $zero /* 4221BC 802A91BC 24050082 */ addiu $a1, $zero, 0x82 @@ -126,7 +126,7 @@ glabel func_802A9000_422000 /* 4221E4 802A91E4 3C048029 */ lui $a0, %hi(D_80292A2C) /* 4221E8 802A91E8 24842A2C */ addiu $a0, $a0, %lo(D_80292A2C) /* 4221EC 802A91EC 0C050529 */ jal create_icon -/* 4221F0 802A91F0 00000000 */ nop +/* 4221F0 802A91F0 00000000 */ nop /* 4221F4 802A91F4 0040802D */ daddu $s0, $v0, $zero /* 4221F8 802A91F8 0200202D */ daddu $a0, $s0, $zero /* 4221FC 802A91FC 24050082 */ addiu $a1, $zero, 0x82 diff --git a/asm/nonmatchings/code_422000/func_802A9258_422258.s b/asm/nonmatchings/code_422000/func_802A9258_422258.s index 216fef78f0..6ec8356ed2 100644 --- a/asm/nonmatchings/code_422000/func_802A9258_422258.s +++ b/asm/nonmatchings/code_422000/func_802A9258_422258.s @@ -25,7 +25,7 @@ glabel func_802A9258_422258 /* 4222A8 802A92A8 A0600084 */ sb $zero, 0x84($v1) .L802A92AC: /* 4222AC 802A92AC 0C09A216 */ jal func_80268858 -/* 4222B0 802A92B0 00000000 */ nop +/* 4222B0 802A92B0 00000000 */ nop /* 4222B4 802A92B4 8E050000 */ lw $a1, ($s0) /* 4222B8 802A92B8 26100004 */ addiu $s0, $s0, 4 /* 4222BC 802A92BC 0C0B1EAF */ jal get_variable diff --git a/asm/nonmatchings/code_422000/func_802A936C_42236C.s b/asm/nonmatchings/code_422000/func_802A936C_42236C.s index 33698323a1..a605d39387 100644 --- a/asm/nonmatchings/code_422000/func_802A936C_42236C.s +++ b/asm/nonmatchings/code_422000/func_802A936C_42236C.s @@ -17,11 +17,12 @@ glabel func_802A936C_42236C /* 42239C 802A939C 2C62000D */ sltiu $v0, $v1, 0xd /* 4223A0 802A93A0 10400184 */ beqz $v0, .L802A99B4 /* 4223A4 802A93A4 00031080 */ sll $v0, $v1, 2 -/* 4223A8 802A93A8 3C01802B */ lui $at, %hi(D_802A9A90) +/* 4223A8 802A93A8 3C01802B */ lui $at, %hi(jtbl_802A9A90_422A90) /* 4223AC 802A93AC 00220821 */ addu $at, $at, $v0 -/* 4223B0 802A93B0 8C229A90 */ lw $v0, %lo(D_802A9A90)($at) +/* 4223B0 802A93B0 8C229A90 */ lw $v0, %lo(jtbl_802A9A90_422A90)($at) /* 4223B4 802A93B4 00400008 */ jr $v0 -/* 4223B8 802A93B8 00000000 */ nop +/* 4223B8 802A93B8 00000000 */ nop +glabel L802A93BC_4223BC /* 4223BC 802A93BC 0C093EB1 */ jal set_popup_duration /* 4223C0 802A93C0 24040063 */ addiu $a0, $zero, 0x63 /* 4223C4 802A93C4 82220061 */ lb $v0, 0x61($s1) @@ -87,6 +88,7 @@ glabel func_802A936C_42236C /* 42249C 802A949C 24020001 */ addiu $v0, $zero, 1 /* 4224A0 802A94A0 080AA66D */ j .L802A99B4 /* 4224A4 802A94A4 A622004C */ sh $v0, 0x4c($s1) +glabel L802A94A8_4224A8 /* 4224A8 802A94A8 0C093EB1 */ jal set_popup_duration /* 4224AC 802A94AC 24040063 */ addiu $a0, $zero, 0x63 /* 4224B0 802A94B0 96220056 */ lhu $v0, 0x56($s1) @@ -134,7 +136,7 @@ glabel func_802A936C_42236C /* 422554 802A9554 24C6FFE9 */ addiu $a2, $a2, -0x17 /* 422558 802A9558 8222005E */ lb $v0, 0x5e($s1) /* 42255C 802A955C 10400115 */ beqz $v0, .L802A99B4 -/* 422560 802A9560 00000000 */ nop +/* 422560 802A9560 00000000 */ nop /* 422564 802A9564 8E30001C */ lw $s0, 0x1c($s1) /* 422568 802A9568 86260058 */ lh $a2, 0x58($s1) /* 42256C 802A956C 86250056 */ lh $a1, 0x56($s1) @@ -147,13 +149,14 @@ glabel func_802A936C_42236C /* 422588 802A9588 0C05128B */ jal clear_icon_flags /* 42258C 802A958C 24050002 */ addiu $a1, $zero, 2 /* 422590 802A9590 080AA66D */ j .L802A99B4 -/* 422594 802A9594 00000000 */ nop +/* 422594 802A9594 00000000 */ nop +glabel L802A9598_422598 /* 422598 802A9598 0C093EB1 */ jal set_popup_duration /* 42259C 802A959C 24040063 */ addiu $a0, $zero, 0x63 /* 4225A0 802A95A0 8622004E */ lh $v0, 0x4e($s1) /* 4225A4 802A95A4 2842000F */ slti $v0, $v0, 0xf /* 4225A8 802A95A8 10400013 */ beqz $v0, .L802A95F8 -/* 4225AC 802A95AC 00000000 */ nop +/* 4225AC 802A95AC 00000000 */ nop /* 4225B0 802A95B0 8E240004 */ lw $a0, 4($s1) /* 4225B4 802A95B4 0C0513AC */ jal icon_set_opacity /* 4225B8 802A95B8 240500FF */ addiu $a1, $zero, 0xff @@ -195,6 +198,7 @@ glabel func_802A936C_42236C /* 42263C 802A963C 2402000B */ addiu $v0, $zero, 0xb .L802A9640: /* 422640 802A9640 A622004C */ sh $v0, 0x4c($s1) +glabel L802A9644_422644 /* 422644 802A9644 0C093EB1 */ jal set_popup_duration /* 422648 802A9648 24040063 */ addiu $a0, $zero, 0x63 /* 42264C 802A964C 82420083 */ lb $v0, 0x83($s2) @@ -213,41 +217,41 @@ glabel func_802A936C_42236C /* 422680 802A9680 86230054 */ lh $v1, 0x54($s1) /* 422684 802A9684 000217C3 */ sra $v0, $v0, 0x1f /* 422688 802A9688 44831000 */ mtc1 $v1, $f2 -/* 42268C 802A968C 00000000 */ nop +/* 42268C 802A968C 00000000 */ nop /* 422690 802A9690 468010A0 */ cvt.s.w $f2, $f2 /* 422694 802A9694 00004010 */ mfhi $t0 /* 422698 802A9698 01021023 */ subu $v0, $t0, $v0 /* 42269C 802A969C 4482A000 */ mtc1 $v0, $f20 -/* 4226A0 802A96A0 00000000 */ nop +/* 4226A0 802A96A0 00000000 */ nop /* 4226A4 802A96A4 4680A520 */ cvt.s.w $f20, $f20 /* 4226A8 802A96A8 4614103C */ c.lt.s $f2, $f20 -/* 4226AC 802A96AC 00000000 */ nop +/* 4226AC 802A96AC 00000000 */ nop /* 4226B0 802A96B0 4502000B */ bc1fl .L802A96E0 /* 4226B4 802A96B4 4614A580 */ add.s $f22, $f20, $f20 /* 4226B8 802A96B8 8E240014 */ lw $a0, 0x14($s1) /* 4226BC 802A96BC 3C058029 */ lui $a1, %hi(D_802928CC) /* 4226C0 802A96C0 24A528CC */ addiu $a1, $a1, %lo(D_802928CC) /* 4226C4 802A96C4 0C0511FF */ jal set_menu_icon_script -/* 4226C8 802A96C8 00000000 */ nop +/* 4226C8 802A96C8 00000000 */ nop /* 4226CC 802A96CC 86220054 */ lh $v0, 0x54($s1) /* 4226D0 802A96D0 14400031 */ bnez $v0, .L802A9798 /* 4226D4 802A96D4 A2400084 */ sb $zero, 0x84($s2) /* 4226D8 802A96D8 080AA5E1 */ j .L802A9784 -/* 4226DC 802A96DC 00000000 */ nop +/* 4226DC 802A96DC 00000000 */ nop .L802A96E0: /* 4226E0 802A96E0 4616103C */ c.lt.s $f2, $f22 -/* 4226E4 802A96E4 00000000 */ nop +/* 4226E4 802A96E4 00000000 */ nop /* 4226E8 802A96E8 4500000E */ bc1f .L802A9724 -/* 4226EC 802A96EC 00000000 */ nop +/* 4226EC 802A96EC 00000000 */ nop /* 4226F0 802A96F0 8E240010 */ lw $a0, 0x10($s1) /* 4226F4 802A96F4 3C058029 */ lui $a1, %hi(D_80292874) /* 4226F8 802A96F8 24A52874 */ addiu $a1, $a1, %lo(D_80292874) /* 4226FC 802A96FC 0C0511FF */ jal set_menu_icon_script -/* 422700 802A9700 00000000 */ nop +/* 422700 802A9700 00000000 */ nop /* 422704 802A9704 86220054 */ lh $v0, 0x54($s1) /* 422708 802A9708 24030001 */ addiu $v1, $zero, 1 /* 42270C 802A970C 44820000 */ mtc1 $v0, $f0 -/* 422710 802A9710 00000000 */ nop +/* 422710 802A9710 00000000 */ nop /* 422714 802A9714 46800020 */ cvt.s.w $f0, $f0 /* 422718 802A9718 46140032 */ c.eq.s $f0, $f20 /* 42271C 802A971C 080AA5DF */ j .L802A977C @@ -255,26 +259,26 @@ glabel func_802A936C_42236C .L802A9724: /* 422724 802A9724 3C014040 */ lui $at, 0x4040 /* 422728 802A9728 44810000 */ mtc1 $at, $f0 -/* 42272C 802A972C 00000000 */ nop +/* 42272C 802A972C 00000000 */ nop /* 422730 802A9730 4600A002 */ mul.s $f0, $f20, $f0 -/* 422734 802A9734 00000000 */ nop +/* 422734 802A9734 00000000 */ nop /* 422738 802A9738 4600103C */ c.lt.s $f2, $f0 -/* 42273C 802A973C 00000000 */ nop +/* 42273C 802A973C 00000000 */ nop /* 422740 802A9740 45000016 */ bc1f .L802A979C /* 422744 802A9744 00101027 */ nor $v0, $zero, $s0 /* 422748 802A9748 8E24000C */ lw $a0, 0xc($s1) /* 42274C 802A974C 3C058029 */ lui $a1, %hi(D_8029281C) /* 422750 802A9750 24A5281C */ addiu $a1, $a1, %lo(D_8029281C) /* 422754 802A9754 0C0511FF */ jal set_menu_icon_script -/* 422758 802A9758 00000000 */ nop +/* 422758 802A9758 00000000 */ nop /* 42275C 802A975C 86220054 */ lh $v0, 0x54($s1) /* 422760 802A9760 24030002 */ addiu $v1, $zero, 2 /* 422764 802A9764 A2430084 */ sb $v1, 0x84($s2) /* 422768 802A9768 44820000 */ mtc1 $v0, $f0 -/* 42276C 802A976C 00000000 */ nop +/* 42276C 802A976C 00000000 */ nop /* 422770 802A9770 46800020 */ cvt.s.w $f0, $f0 /* 422774 802A9774 46160032 */ c.eq.s $f0, $f22 -/* 422778 802A9778 00000000 */ nop +/* 422778 802A9778 00000000 */ nop .L802A977C: /* 42277C 802A977C 45000007 */ bc1f .L802A979C /* 422780 802A9780 00101027 */ nor $v0, $zero, $s0 @@ -301,10 +305,10 @@ glabel func_802A936C_42236C /* 4227C8 802A97C8 3C058011 */ lui $a1, %hi(D_80108FF0) /* 4227CC 802A97CC 24A58FF0 */ addiu $a1, $a1, %lo(D_80108FF0) /* 4227D0 802A97D0 0C0511FF */ jal set_menu_icon_script -/* 4227D4 802A97D4 00000000 */ nop +/* 4227D4 802A97D4 00000000 */ nop /* 4227D8 802A97D8 82220062 */ lb $v0, 0x62($s1) /* 4227DC 802A97DC 10400003 */ beqz $v0, .L802A97EC -/* 4227E0 802A97E0 00000000 */ nop +/* 4227E0 802A97E0 00000000 */ nop /* 4227E4 802A97E4 0C05272D */ jal play_sound /* 4227E8 802A97E8 24040234 */ addiu $a0, $zero, 0x234 .L802A97EC: @@ -312,7 +316,7 @@ glabel func_802A936C_42236C /* 4227F0 802A97F0 10400007 */ beqz $v0, .L802A9810 /* 4227F4 802A97F4 24030002 */ addiu $v1, $zero, 2 /* 4227F8 802A97F8 10430005 */ beq $v0, $v1, .L802A9810 -/* 4227FC 802A97FC 00000000 */ nop +/* 4227FC 802A97FC 00000000 */ nop /* 422800 802A9800 96220052 */ lhu $v0, 0x52($s1) /* 422804 802A9804 A223005E */ sb $v1, 0x5e($s1) /* 422808 802A9808 2442FFFC */ addiu $v0, $v0, -4 @@ -335,12 +339,12 @@ glabel func_802A936C_42236C /* 422844 802A9844 3C030004 */ lui $v1, 4 /* 422848 802A9848 00431024 */ and $v0, $v0, $v1 /* 42284C 802A984C 1440000D */ bnez $v0, .L802A9884 -/* 422850 802A9850 00000000 */ nop +/* 422850 802A9850 00000000 */ nop /* 422854 802A9854 1600000B */ bnez $s0, .L802A9884 -/* 422858 802A9858 00000000 */ nop +/* 422858 802A9858 00000000 */ nop /* 42285C 802A985C 8222005E */ lb $v0, 0x5e($s1) /* 422860 802A9860 14400008 */ bnez $v0, .L802A9884 -/* 422864 802A9864 00000000 */ nop +/* 422864 802A9864 00000000 */ nop /* 422868 802A9868 82420083 */ lb $v0, 0x83($s2) /* 42286C 802A986C 28420002 */ slti $v0, $v0, 2 /* 422870 802A9870 10400004 */ beqz $v0, .L802A9884 @@ -356,7 +360,7 @@ glabel func_802A936C_42236C .L802A9894: /* 422894 802A9894 82420081 */ lb $v0, 0x81($s2) /* 422898 802A9898 1440001C */ bnez $v0, .L802A990C -/* 42289C 802A989C 00000000 */ nop +/* 42289C 802A989C 00000000 */ nop /* 4228A0 802A98A0 1A00001A */ blez $s0, .L802A990C /* 4228A4 802A98A4 0000202D */ daddu $a0, $zero, $zero /* 4228A8 802A98A8 3C070004 */ lui $a3, 4 @@ -373,7 +377,7 @@ glabel func_802A936C_42236C /* 4228CC 802A98CC 8C420230 */ lw $v0, 0x230($v0) /* 4228D0 802A98D0 00471024 */ and $v0, $v0, $a3 /* 4228D4 802A98D4 10400004 */ beqz $v0, .L802A98E8 -/* 4228D8 802A98D8 00000000 */ nop +/* 4228D8 802A98D8 00000000 */ nop /* 4228DC 802A98DC 8222005E */ lb $v0, 0x5e($s1) /* 4228E0 802A98E0 50400007 */ beql $v0, $zero, .L802A9900 /* 4228E4 802A98E4 24840001 */ addiu $a0, $a0, 1 @@ -392,11 +396,11 @@ glabel func_802A936C_42236C /* 42290C 802A990C 82420083 */ lb $v0, 0x83($s2) /* 422910 802A9910 28420002 */ slti $v0, $v0, 2 /* 422914 802A9914 14400005 */ bnez $v0, .L802A992C -/* 422918 802A9918 00000000 */ nop +/* 422918 802A9918 00000000 */ nop /* 42291C 802A991C 86230054 */ lh $v1, 0x54($s1) /* 422920 802A9920 86220052 */ lh $v0, 0x52($s1) /* 422924 802A9924 10620023 */ beq $v1, $v0, .L802A99B4 -/* 422928 802A9928 00000000 */ nop +/* 422928 802A9928 00000000 */ nop .L802A992C: /* 42292C 802A992C 96220054 */ lhu $v0, 0x54($s1) /* 422930 802A9930 86230052 */ lh $v1, 0x52($s1) @@ -406,7 +410,7 @@ glabel func_802A936C_42236C /* 422940 802A9940 00021403 */ sra $v0, $v0, 0x10 /* 422944 802A9944 0062182A */ slt $v1, $v1, $v0 /* 422948 802A9948 1060001A */ beqz $v1, .L802A99B4 -/* 42294C 802A994C 00000000 */ nop +/* 42294C 802A994C 00000000 */ nop /* 422950 802A9950 82420081 */ lb $v0, 0x81($s2) /* 422954 802A9954 14400002 */ bnez $v0, .L802A9960 /* 422958 802A9958 2402FFFF */ addiu $v0, $zero, -1 @@ -415,9 +419,9 @@ glabel func_802A936C_42236C /* 422960 802A9960 82430081 */ lb $v1, 0x81($s2) /* 422964 802A9964 24020001 */ addiu $v0, $zero, 1 /* 422968 802A9968 14620003 */ bne $v1, $v0, .L802A9978 -/* 42296C 802A996C 00000000 */ nop +/* 42296C 802A996C 00000000 */ nop /* 422970 802A9970 0C09A458 */ jal func_80269160 -/* 422974 802A9974 00000000 */ nop +/* 422974 802A9974 00000000 */ nop .L802A9978: /* 422978 802A9978 0C093EB1 */ jal set_popup_duration /* 42297C 802A997C 0000202D */ daddu $a0, $zero, $zero @@ -426,6 +430,7 @@ glabel func_802A936C_42236C /* 422988 802A9988 2402000C */ addiu $v0, $zero, 0xc /* 42298C 802A998C 080AA66D */ j .L802A99B4 /* 422990 802A9990 A622004C */ sh $v0, 0x4c($s1) +glabel L802A9994_422994 /* 422994 802A9994 86220054 */ lh $v0, 0x54($s1) /* 422998 802A9998 96230054 */ lhu $v1, 0x54($s1) /* 42299C 802A999C 10400003 */ beqz $v0, .L802A99AC @@ -434,8 +439,9 @@ glabel func_802A936C_42236C /* 4229A8 802A99A8 A6220054 */ sh $v0, 0x54($s1) .L802A99AC: /* 4229AC 802A99AC 0C09A327 */ jal func_80268C9C -/* 4229B0 802A99B0 00000000 */ nop +/* 4229B0 802A99B0 00000000 */ nop .L802A99B4: +glabel L802A99B4_4229B4 /* 4229B4 802A99B4 8FBF001C */ lw $ra, 0x1c($sp) /* 4229B8 802A99B8 8FB20018 */ lw $s2, 0x18($sp) /* 4229BC 802A99BC 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_422000/func_802A9A30_422A30.s b/asm/nonmatchings/code_422000/func_802A9A30_422A30.s index 2b9cf69ff8..b086023f86 100644 --- a/asm/nonmatchings/code_422000/func_802A9A30_422A30.s +++ b/asm/nonmatchings/code_422000/func_802A9A30_422A30.s @@ -25,4 +25,4 @@ glabel func_802A9A30_422A30 /* 422A80 802A9A80 8FB00010 */ lw $s0, 0x10($sp) /* 422A84 802A9A84 03E00008 */ jr $ra /* 422A88 802A9A88 27BD0018 */ addiu $sp, $sp, 0x18 -/* 422A8C 802A9A8C 00000000 */ nop +/* 422A8C 802A9A8C 00000000 */ nop diff --git a/asm/nonmatchings/code_422AD0/func_802A9378_422E48.s b/asm/nonmatchings/code_422AD0/func_802A9378_422E48.s index ad6ef76969..e901f1e1c2 100644 --- a/asm/nonmatchings/code_422AD0/func_802A9378_422E48.s +++ b/asm/nonmatchings/code_422AD0/func_802A9378_422E48.s @@ -15,11 +15,12 @@ glabel func_802A9378_422E48 /* 422E70 802A93A0 2C62000D */ sltiu $v0, $v1, 0xd /* 422E74 802A93A4 104000AA */ beqz $v0, .L802A9650 /* 422E78 802A93A8 00031080 */ sll $v0, $v1, 2 -/* 422E7C 802A93AC 3C01802B */ lui $at, %hi(func_802A98E0) +/* 422E7C 802A93AC 3C01802B */ lui $at, %hi(jtbl_802A98E0_4233B0) /* 422E80 802A93B0 00220821 */ addu $at, $at, $v0 -/* 422E84 802A93B4 8C2298E0 */ lw $v0, %lo(func_802A98E0)($at) +/* 422E84 802A93B4 8C2298E0 */ lw $v0, %lo(jtbl_802A98E0_4233B0)($at) /* 422E88 802A93B8 00400008 */ jr $v0 /* 422E8C 802A93BC 00000000 */ nop +glabel L802A93C0_422E90 /* 422E90 802A93C0 8E300004 */ lw $s0, 4($s1) /* 422E94 802A93C4 240500FF */ addiu $a1, $zero, 0xff /* 422E98 802A93C8 0C0513AC */ jal icon_set_opacity @@ -63,6 +64,7 @@ glabel func_802A9378_422E48 /* 422F20 802A9450 24020001 */ addiu $v0, $zero, 1 /* 422F24 802A9454 080AA593 */ j .L802A964C /* 422F28 802A9458 A622004C */ sh $v0, 0x4c($s1) +glabel L802A945C_422F2C /* 422F2C 802A945C 96220056 */ lhu $v0, 0x56($s1) /* 422F30 802A9460 24420014 */ addiu $v0, $v0, 0x14 /* 422F34 802A9464 A6220056 */ sh $v0, 0x56($s1) @@ -84,6 +86,7 @@ glabel func_802A9378_422E48 /* 422F70 802A94A0 24C6001C */ addiu $a2, $a2, 0x1c /* 422F74 802A94A4 080AA593 */ j .L802A964C /* 422F78 802A94A8 00000000 */ nop +glabel L802A94AC_422F7C /* 422F7C 802A94AC 8622004E */ lh $v0, 0x4e($s1) /* 422F80 802A94B0 9623004E */ lhu $v1, 0x4e($s1) /* 422F84 802A94B4 10400003 */ beqz $v0, .L802A94C4 @@ -103,6 +106,7 @@ glabel func_802A9378_422E48 /* 422FB8 802A94E8 2402000B */ addiu $v0, $zero, 0xb /* 422FBC 802A94EC A622004C */ sh $v0, 0x4c($s1) /* 422FC0 802A94F0 A6230054 */ sh $v1, 0x54($s1) +glabel L802A94F4_422FC4 /* 422FC4 802A94F4 82420083 */ lb $v0, 0x83($s2) /* 422FC8 802A94F8 10400018 */ beqz $v0, .L802A955C /* 422FCC 802A94FC 00000000 */ nop @@ -185,6 +189,7 @@ glabel func_802A9378_422E48 /* 4230F0 802A9620 2402000C */ addiu $v0, $zero, 0xc /* 4230F4 802A9624 080AA593 */ j .L802A964C /* 4230F8 802A9628 A622004C */ sh $v0, 0x4c($s1) +glabel L802A962C_4230FC /* 4230FC 802A962C 86220054 */ lh $v0, 0x54($s1) /* 423100 802A9630 96230054 */ lhu $v1, 0x54($s1) /* 423104 802A9634 10400003 */ beqz $v0, .L802A9644 @@ -196,6 +201,7 @@ glabel func_802A9378_422E48 /* 423114 802A9644 0C09A327 */ jal func_80268C9C /* 423118 802A9648 00000000 */ nop .L802A964C: +glabel L802A964C_42311C /* 42311C 802A964C 8623004C */ lh $v1, 0x4c($s1) .L802A9650: /* 423120 802A9650 24040001 */ addiu $a0, $zero, 1 diff --git a/asm/nonmatchings/code_4233F0/func_802A9000_4233F0.s b/asm/nonmatchings/code_4233F0/func_802A9000_4233F0.s index d88d8dcc7c..ce4f083800 100644 --- a/asm/nonmatchings/code_4233F0/func_802A9000_4233F0.s +++ b/asm/nonmatchings/code_4233F0/func_802A9000_4233F0.s @@ -20,7 +20,7 @@ glabel func_802A9000_4233F0 /* 42342C 802A903C 10400055 */ beqz $v0, .L802A9194 /* 423430 802A9040 A2000082 */ sb $zero, 0x82($s0) /* 423434 802A9044 0C09A216 */ jal func_80268858 -/* 423438 802A9048 00000000 */ nop +/* 423438 802A9048 00000000 */ nop /* 42343C 802A904C 3C048011 */ lui $a0, %hi(D_80108B28) /* 423440 802A9050 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) /* 423444 802A9054 24020004 */ addiu $v0, $zero, 4 @@ -53,7 +53,7 @@ glabel func_802A9000_4233F0 /* 4234B0 802A90C0 3C048011 */ lui $a0, %hi(D_80108AFC) /* 4234B4 802A90C4 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) /* 4234B8 802A90C8 0C050529 */ jal create_icon -/* 4234BC 802A90CC 00000000 */ nop +/* 4234BC 802A90CC 00000000 */ nop /* 4234C0 802A90D0 0040802D */ daddu $s0, $v0, $zero /* 4234C4 802A90D4 86250056 */ lh $a1, 0x56($s1) /* 4234C8 802A90D8 86260058 */ lh $a2, 0x58($s1) @@ -70,7 +70,7 @@ glabel func_802A9000_4233F0 /* 4234F4 802A9104 3C048029 */ lui $a0, %hi(D_802928F8) /* 4234F8 802A9108 248428F8 */ addiu $a0, $a0, %lo(D_802928F8) /* 4234FC 802A910C 0C050529 */ jal create_icon -/* 423500 802A9110 00000000 */ nop +/* 423500 802A9110 00000000 */ nop /* 423504 802A9114 0040802D */ daddu $s0, $v0, $zero /* 423508 802A9118 86250056 */ lh $a1, 0x56($s1) /* 42350C 802A911C 86260058 */ lh $a2, 0x58($s1) @@ -87,7 +87,7 @@ glabel func_802A9000_4233F0 /* 423538 802A9148 3C048011 */ lui $a0, %hi(D_80109244) /* 42353C 802A914C 24849244 */ addiu $a0, $a0, %lo(D_80109244) /* 423540 802A9150 0C050529 */ jal create_icon -/* 423544 802A9154 00000000 */ nop +/* 423544 802A9154 00000000 */ nop /* 423548 802A9158 0040802D */ daddu $s0, $v0, $zero /* 42354C 802A915C 86250056 */ lh $a1, 0x56($s1) /* 423550 802A9160 86260058 */ lh $a2, 0x58($s1) diff --git a/asm/nonmatchings/code_4233F0/func_802A91B0_4235A0.s b/asm/nonmatchings/code_4233F0/func_802A91B0_4235A0.s index c95adeb168..5cb3ae869f 100644 --- a/asm/nonmatchings/code_4233F0/func_802A91B0_4235A0.s +++ b/asm/nonmatchings/code_4233F0/func_802A91B0_4235A0.s @@ -18,7 +18,7 @@ glabel func_802A91B0_4235A0 /* 4235D4 802A91E4 10400034 */ beqz $v0, .L802A92B8 /* 4235D8 802A91E8 0260182D */ daddu $v1, $s3, $zero /* 4235DC 802A91EC 0C09A216 */ jal func_80268858 -/* 4235E0 802A91F0 00000000 */ nop +/* 4235E0 802A91F0 00000000 */ nop /* 4235E4 802A91F4 8E050000 */ lw $a1, ($s0) /* 4235E8 802A91F8 26100004 */ addiu $s0, $s0, 4 /* 4235EC 802A91FC 0C0B1EAF */ jal get_variable diff --git a/asm/nonmatchings/code_4233F0/func_802A92DC_4236CC.s b/asm/nonmatchings/code_4233F0/func_802A92DC_4236CC.s index d7c43ca9cc..b5c73a6095 100644 --- a/asm/nonmatchings/code_4233F0/func_802A92DC_4236CC.s +++ b/asm/nonmatchings/code_4233F0/func_802A92DC_4236CC.s @@ -14,11 +14,12 @@ glabel func_802A92DC_4236CC /* 4236F0 802A9300 2C62000D */ sltiu $v0, $v1, 0xd /* 4236F4 802A9304 104000E7 */ beqz $v0, .L802A96A4 /* 4236F8 802A9308 00031080 */ sll $v0, $v1, 2 -/* 4236FC 802A930C 3C01802B */ lui $at, %hi(D_802A9840) +/* 4236FC 802A930C 3C01802B */ lui $at, %hi(jtbl_802A9840_423C30) /* 423700 802A9310 00220821 */ addu $at, $at, $v0 -/* 423704 802A9314 8C229840 */ lw $v0, %lo(D_802A9840)($at) +/* 423704 802A9314 8C229840 */ lw $v0, %lo(jtbl_802A9840_423C30)($at) /* 423708 802A9318 00400008 */ jr $v0 -/* 42370C 802A931C 00000000 */ nop +/* 42370C 802A931C 00000000 */ nop +glabel L802A9320_423710 /* 423710 802A9320 0C093EB1 */ jal set_popup_duration /* 423714 802A9324 24040063 */ addiu $a0, $zero, 0x63 /* 423718 802A9328 8E300004 */ lw $s0, 4($s1) @@ -64,6 +65,7 @@ glabel func_802A92DC_4236CC /* 4237A8 802A93B8 24020001 */ addiu $v0, $zero, 1 /* 4237AC 802A93BC 080AA5A9 */ j .L802A96A4 /* 4237B0 802A93C0 A622004C */ sh $v0, 0x4c($s1) +glabel L802A93C4_4237B4 /* 4237B4 802A93C4 0C093EB1 */ jal set_popup_duration /* 4237B8 802A93C8 24040063 */ addiu $a0, $zero, 0x63 /* 4237BC 802A93CC 96220056 */ lhu $v0, 0x56($s1) @@ -98,7 +100,8 @@ glabel func_802A92DC_4236CC /* 42382C 802A943C 0C051261 */ jal set_icon_render_pos /* 423830 802A9440 24C60011 */ addiu $a2, $a2, 0x11 /* 423834 802A9444 080AA5A9 */ j .L802A96A4 -/* 423838 802A9448 00000000 */ nop +/* 423838 802A9448 00000000 */ nop +glabel L802A944C_42383C /* 42383C 802A944C 0C093EB1 */ jal set_popup_duration /* 423840 802A9450 24040063 */ addiu $a0, $zero, 0x63 /* 423844 802A9454 8622004E */ lh $v0, 0x4e($s1) @@ -112,16 +115,17 @@ glabel func_802A92DC_4236CC /* 423860 802A9470 3C058011 */ lui $a1, %hi(D_80108B80) /* 423864 802A9474 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) /* 423868 802A9478 0C0511FF */ jal set_menu_icon_script -/* 42386C 802A947C 00000000 */ nop +/* 42386C 802A947C 00000000 */ nop /* 423870 802A9480 96230052 */ lhu $v1, 0x52($s1) /* 423874 802A9484 2402000B */ addiu $v0, $zero, 0xb /* 423878 802A9488 A622004C */ sh $v0, 0x4c($s1) /* 42387C 802A948C A6230054 */ sh $v1, 0x54($s1) +glabel L802A9490_423880 /* 423880 802A9490 0C093EB1 */ jal set_popup_duration /* 423884 802A9494 24040063 */ addiu $a0, $zero, 0x63 /* 423888 802A9498 8222005C */ lb $v0, 0x5c($s1) /* 42388C 802A949C 1440000E */ bnez $v0, .L802A94D8 -/* 423890 802A94A0 00000000 */ nop +/* 423890 802A94A0 00000000 */ nop /* 423894 802A94A4 96220046 */ lhu $v0, 0x46($s1) /* 423898 802A94A8 8623005A */ lh $v1, 0x5a($s1) /* 42389C 802A94AC 24420001 */ addiu $v0, $v0, 1 @@ -141,13 +145,13 @@ glabel func_802A92DC_4236CC /* 4238D0 802A94E0 A6220046 */ sh $v0, 0x46($s1) /* 4238D4 802A94E4 00021400 */ sll $v0, $v0, 0x10 /* 4238D8 802A94E8 1C400003 */ bgtz $v0, .L802A94F8 -/* 4238DC 802A94EC 00000000 */ nop +/* 4238DC 802A94EC 00000000 */ nop /* 4238E0 802A94F0 A6200046 */ sh $zero, 0x46($s1) /* 4238E4 802A94F4 A220005C */ sb $zero, 0x5c($s1) .L802A94F8: /* 4238E8 802A94F8 8622006A */ lh $v0, 0x6a($s1) /* 4238EC 802A94FC 14400021 */ bnez $v0, .L802A9584 -/* 4238F0 802A9500 00000000 */ nop +/* 4238F0 802A9500 00000000 */ nop /* 4238F4 802A9504 82040431 */ lb $a0, 0x431($s0) /* 4238F8 802A9508 86230052 */ lh $v1, 0x52($s1) /* 4238FC 802A950C 86220054 */ lh $v0, 0x54($s1) @@ -256,6 +260,7 @@ glabel func_802A92DC_4236CC /* 423A68 802A9678 2402000C */ addiu $v0, $zero, 0xc /* 423A6C 802A967C 080AA5A9 */ j .L802A96A4 /* 423A70 802A9680 A622004C */ sh $v0, 0x4c($s1) +glabel L802A9684_423A74 /* 423A74 802A9684 86220054 */ lh $v0, 0x54($s1) /* 423A78 802A9688 96230054 */ lhu $v1, 0x54($s1) /* 423A7C 802A968C 10400003 */ beqz $v0, .L802A969C @@ -264,8 +269,9 @@ glabel func_802A92DC_4236CC /* 423A88 802A9698 A6220054 */ sh $v0, 0x54($s1) .L802A969C: /* 423A8C 802A969C 0C09A327 */ jal func_80268C9C -/* 423A90 802A96A0 00000000 */ nop +/* 423A90 802A96A0 00000000 */ nop .L802A96A4: +glabel L802A96A4_423A94 /* 423A94 802A96A4 8FBF0018 */ lw $ra, 0x18($sp) /* 423A98 802A96A8 8FB10014 */ lw $s1, 0x14($sp) /* 423A9C 802A96AC 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_4233F0/func_802A96B8_423AA8.s b/asm/nonmatchings/code_4233F0/func_802A96B8_423AA8.s index 93a0193039..df1732fb63 100644 --- a/asm/nonmatchings/code_4233F0/func_802A96B8_423AA8.s +++ b/asm/nonmatchings/code_4233F0/func_802A96B8_423AA8.s @@ -25,7 +25,7 @@ glabel func_802A96B8_423AA8 /* 423AF4 802A9704 14810004 */ bne $a0, $at, .L802A9718 /* 423AF8 802A9708 3C018000 */ lui $at, 0x8000 /* 423AFC 802A970C 14410002 */ bne $v0, $at, .L802A9718 -/* 423B00 802A9710 00000000 */ nop +/* 423B00 802A9710 00000000 */ nop /* 423B04 802A9714 0006000D */ break 6 .L802A9718: /* 423B08 802A9718 00001012 */ mflo $v0 @@ -52,7 +52,7 @@ glabel func_802A96B8_423AA8 /* 423B5C 802A976C 0200882D */ daddu $s1, $s0, $zero /* 423B60 802A9770 8E040004 */ lw $a0, 4($s0) /* 423B64 802A9774 0C0511EA */ jal draw_icon_0 -/* 423B68 802A9778 00000000 */ nop +/* 423B68 802A9778 00000000 */ nop .L802A977C: /* 423B6C 802A977C 8E300008 */ lw $s0, 8($s1) /* 423B70 802A9780 0C0511EA */ jal draw_icon_0 @@ -78,7 +78,7 @@ glabel func_802A96B8_423AA8 /* 423BC0 802A97D0 00063403 */ sra $a2, $a2, 0x10 /* 423BC4 802A97D4 8E24000C */ lw $a0, 0xc($s1) /* 423BC8 802A97D8 0C0511EA */ jal draw_icon_0 -/* 423BCC 802A97DC 00000000 */ nop +/* 423BCC 802A97DC 00000000 */ nop /* 423BD0 802A97E0 0C0511EA */ jal draw_icon_0 /* 423BD4 802A97E4 8E240010 */ lw $a0, 0x10($s1) /* 423BD8 802A97E8 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/code_423C70/func_802A9000_423C70.s b/asm/nonmatchings/code_423C70/func_802A9000_423C70.s index e9a6bf68e9..53013ca61f 100644 --- a/asm/nonmatchings/code_423C70/func_802A9000_423C70.s +++ b/asm/nonmatchings/code_423C70/func_802A9000_423C70.s @@ -27,7 +27,7 @@ glabel func_802A9000_423C70 /* 423CC8 802A9058 A2000081 */ sb $zero, 0x81($s0) .L802A905C: /* 423CCC 802A905C 0C09A216 */ jal func_80268858 -/* 423CD0 802A9060 00000000 */ nop +/* 423CD0 802A9060 00000000 */ nop /* 423CD4 802A9064 8E450000 */ lw $a1, ($s2) /* 423CD8 802A9068 0C0B1EAF */ jal get_variable /* 423CDC 802A906C 0260202D */ daddu $a0, $s3, $zero @@ -68,7 +68,7 @@ glabel func_802A9000_423C70 /* 423D60 802A90F0 3C048011 */ lui $a0, %hi(D_80108AFC) /* 423D64 802A90F4 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) /* 423D68 802A90F8 0C050529 */ jal create_icon -/* 423D6C 802A90FC 00000000 */ nop +/* 423D6C 802A90FC 00000000 */ nop /* 423D70 802A9100 0040802D */ daddu $s0, $v0, $zero /* 423D74 802A9104 86250056 */ lh $a1, 0x56($s1) /* 423D78 802A9108 86260058 */ lh $a2, 0x58($s1) diff --git a/asm/nonmatchings/code_423C70/func_802A91E0_423E50.s b/asm/nonmatchings/code_423C70/func_802A91E0_423E50.s index 8bfe409015..b7d4c94f6d 100644 --- a/asm/nonmatchings/code_423C70/func_802A91E0_423E50.s +++ b/asm/nonmatchings/code_423C70/func_802A91E0_423E50.s @@ -23,7 +23,7 @@ glabel func_802A91E0_423E50 /* 423E98 802A9228 24020002 */ addiu $v0, $zero, 2 .L802A922C: /* 423E9C 802A922C 0C09A216 */ jal func_80268858 -/* 423EA0 802A9230 00000000 */ nop +/* 423EA0 802A9230 00000000 */ nop /* 423EA4 802A9234 8E050000 */ lw $a1, ($s0) /* 423EA8 802A9238 26100004 */ addiu $s0, $s0, 4 /* 423EAC 802A923C 0C0B1EAF */ jal get_variable diff --git a/asm/nonmatchings/code_423C70/func_802A92F0_423F60.s b/asm/nonmatchings/code_423C70/func_802A92F0_423F60.s index f53ca89d30..dbbe8e6df4 100644 --- a/asm/nonmatchings/code_423C70/func_802A92F0_423F60.s +++ b/asm/nonmatchings/code_423C70/func_802A92F0_423F60.s @@ -15,11 +15,12 @@ glabel func_802A92F0_423F60 /* 423F88 802A9318 2C62000D */ sltiu $v0, $v1, 0xd /* 423F8C 802A931C 10400103 */ beqz $v0, .L802A972C /* 423F90 802A9320 00031080 */ sll $v0, $v1, 2 -/* 423F94 802A9324 3C01802B */ lui $at, %hi(D_802AA8E0) +/* 423F94 802A9324 3C01802B */ lui $at, %hi(jtbl_802AA8E0_425550) /* 423F98 802A9328 00220821 */ addu $at, $at, $v0 -/* 423F9C 802A932C 8C22A8E0 */ lw $v0, %lo(D_802AA8E0)($at) +/* 423F9C 802A932C 8C22A8E0 */ lw $v0, %lo(jtbl_802AA8E0_425550)($at) /* 423FA0 802A9330 00400008 */ jr $v0 -/* 423FA4 802A9334 00000000 */ nop +/* 423FA4 802A9334 00000000 */ nop +glabel L802A9338_423FA8 /* 423FA8 802A9338 0C093EB1 */ jal set_popup_duration /* 423FAC 802A933C 24040063 */ addiu $a0, $zero, 0x63 /* 423FB0 802A9340 82220061 */ lb $v0, 0x61($s1) @@ -65,6 +66,7 @@ glabel func_802A92F0_423F60 /* 424040 802A93D0 24020001 */ addiu $v0, $zero, 1 /* 424044 802A93D4 080AA5CB */ j .L802A972C /* 424048 802A93D8 A622004C */ sh $v0, 0x4c($s1) +glabel L802A93DC_42404C /* 42404C 802A93DC 0C093EB1 */ jal set_popup_duration /* 424050 802A93E0 24040063 */ addiu $a0, $zero, 0x63 /* 424054 802A93E4 96220056 */ lhu $v0, 0x56($s1) @@ -99,7 +101,8 @@ glabel func_802A92F0_423F60 /* 4240C4 802A9454 0C051261 */ jal set_icon_render_pos /* 4240C8 802A9458 24C60017 */ addiu $a2, $a2, 0x17 /* 4240CC 802A945C 080AA5CB */ j .L802A972C -/* 4240D0 802A9460 00000000 */ nop +/* 4240D0 802A9460 00000000 */ nop +glabel L802A9464_4240D4 /* 4240D4 802A9464 0C093EB1 */ jal set_popup_duration /* 4240D8 802A9468 24040063 */ addiu $a0, $zero, 0x63 /* 4240DC 802A946C 8622004E */ lh $v0, 0x4e($s1) @@ -113,12 +116,13 @@ glabel func_802A92F0_423F60 /* 4240F8 802A9488 3C058011 */ lui $a1, %hi(D_80108B80) /* 4240FC 802A948C 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) /* 424100 802A9490 0C0511FF */ jal set_menu_icon_script -/* 424104 802A9494 00000000 */ nop +/* 424104 802A9494 00000000 */ nop /* 424108 802A9498 96230052 */ lhu $v1, 0x52($s1) /* 42410C 802A949C 2402000B */ addiu $v0, $zero, 0xb /* 424110 802A94A0 A6200044 */ sh $zero, 0x44($s1) /* 424114 802A94A4 A622004C */ sh $v0, 0x4c($s1) /* 424118 802A94A8 A6230054 */ sh $v1, 0x54($s1) +glabel L802A94AC_42411C /* 42411C 802A94AC 0C093EB1 */ jal set_popup_duration /* 424120 802A94B0 24040063 */ addiu $a0, $zero, 0x63 /* 424124 802A94B4 82220080 */ lb $v0, 0x80($s1) @@ -135,7 +139,7 @@ glabel func_802A92F0_423F60 /* 42414C 802A94DC 16010004 */ bne $s0, $at, .L802A94F0 /* 424150 802A94E0 3C018000 */ lui $at, 0x8000 /* 424154 802A94E4 14410002 */ bne $v0, $at, .L802A94F0 -/* 424158 802A94E8 00000000 */ nop +/* 424158 802A94E8 00000000 */ nop /* 42415C 802A94EC 0006000D */ break 6 .L802A94F0: /* 424160 802A94F0 00002012 */ mflo $a0 @@ -173,14 +177,14 @@ glabel func_802A92F0_423F60 .L802A9568: /* 4241D8 802A9568 8622006A */ lh $v0, 0x6a($s1) /* 4241DC 802A956C 1440001C */ bnez $v0, .L802A95E0 -/* 4241E0 802A9570 00000000 */ nop +/* 4241E0 802A9570 00000000 */ nop /* 4241E4 802A9574 8E420214 */ lw $v0, 0x214($s2) /* 4241E8 802A9578 30428000 */ andi $v0, $v0, 0x8000 /* 4241EC 802A957C 1040002F */ beqz $v0, .L802A963C -/* 4241F0 802A9580 00000000 */ nop +/* 4241F0 802A9580 00000000 */ nop /* 4241F4 802A9584 86220064 */ lh $v0, 0x64($s1) /* 4241F8 802A9588 14400009 */ bnez $v0, .L802A95B0 -/* 4241FC 802A958C 00000000 */ nop +/* 4241FC 802A958C 00000000 */ nop /* 424200 802A9590 86220050 */ lh $v0, 0x50($s1) /* 424204 802A9594 8E430434 */ lw $v1, 0x434($s2) /* 424208 802A9598 00021080 */ sll $v0, $v0, 2 @@ -285,6 +289,7 @@ glabel func_802A92F0_423F60 /* 424370 802A9700 2402000C */ addiu $v0, $zero, 0xc /* 424374 802A9704 080AA5CB */ j .L802A972C /* 424378 802A9708 A622004C */ sh $v0, 0x4c($s1) +glabel L802A970C_42437C /* 42437C 802A970C 86220054 */ lh $v0, 0x54($s1) /* 424380 802A9710 96230054 */ lhu $v1, 0x54($s1) /* 424384 802A9714 10400003 */ beqz $v0, .L802A9724 @@ -294,8 +299,9 @@ glabel func_802A92F0_423F60 /* 424390 802A9720 A6220054 */ sh $v0, 0x54($s1) .L802A9724: /* 424394 802A9724 0C09A327 */ jal func_80268C9C -/* 424398 802A9728 00000000 */ nop +/* 424398 802A9728 00000000 */ nop .L802A972C: +glabel L802A972C_42439C /* 42439C 802A972C 8FBF001C */ lw $ra, 0x1c($sp) /* 4243A0 802A9730 8FB20018 */ lw $s2, 0x18($sp) /* 4243A4 802A9734 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_423C70/func_802A9744_4243B4.s b/asm/nonmatchings/code_423C70/func_802A9744_4243B4.s index 132cda5a81..cb3fddc632 100644 --- a/asm/nonmatchings/code_423C70/func_802A9744_4243B4.s +++ b/asm/nonmatchings/code_423C70/func_802A9744_4243B4.s @@ -19,7 +19,7 @@ glabel func_802A9744_4243B4 /* 4243EC 802A977C 0260A02D */ daddu $s4, $s3, $zero /* 4243F0 802A9780 8C640004 */ lw $a0, 4($v1) /* 4243F4 802A9784 0C0511EA */ jal draw_icon_0 -/* 4243F8 802A9788 00000000 */ nop +/* 4243F8 802A9788 00000000 */ nop .L802A978C: /* 4243FC 802A978C 8E110008 */ lw $s1, 8($s0) /* 424400 802A9790 0C0511EA */ jal draw_icon_0 @@ -46,7 +46,7 @@ glabel func_802A9744_4243B4 /* 424454 802A97E4 00063403 */ sra $a2, $a2, 0x10 /* 424458 802A97E8 8E040010 */ lw $a0, 0x10($s0) /* 42445C 802A97EC 0C0511EA */ jal draw_icon_0 -/* 424460 802A97F0 00000000 */ nop +/* 424460 802A97F0 00000000 */ nop /* 424464 802A97F4 86020064 */ lh $v0, 0x64($s0) /* 424468 802A97F8 8E11000C */ lw $s1, 0xc($s0) /* 42446C 802A97FC 1440000D */ bnez $v0, .L802A9834 @@ -59,7 +59,7 @@ glabel func_802A9744_4243B4 /* 424488 802A9818 02128021 */ addu $s0, $s0, $s2 /* 42448C 802A981C 8E030000 */ lw $v1, ($s0) /* 424490 802A9820 10620013 */ beq $v1, $v0, .L802A9870 -/* 424494 802A9824 00000000 */ nop +/* 424494 802A9824 00000000 */ nop /* 424498 802A9828 82620084 */ lb $v0, 0x84($s3) /* 42449C 802A982C 080AA618 */ j .L802A9860 /* 4244A0 802A9830 00021080 */ sll $v0, $v0, 2 @@ -72,7 +72,7 @@ glabel func_802A9744_4243B4 /* 4244B8 802A9848 02128021 */ addu $s0, $s0, $s2 /* 4244BC 802A984C 8E030000 */ lw $v1, ($s0) /* 4244C0 802A9850 10620007 */ beq $v1, $v0, .L802A9870 -/* 4244C4 802A9854 00000000 */ nop +/* 4244C4 802A9854 00000000 */ nop /* 4244C8 802A9858 82820084 */ lb $v0, 0x84($s4) /* 4244CC 802A985C 00021080 */ sll $v0, $v0, 2 .L802A9860: diff --git a/asm/nonmatchings/code_423C70/func_802A9898_424508.s b/asm/nonmatchings/code_423C70/func_802A9898_424508.s index 23f489f3d5..6816aad251 100644 --- a/asm/nonmatchings/code_423C70/func_802A9898_424508.s +++ b/asm/nonmatchings/code_423C70/func_802A9898_424508.s @@ -19,4 +19,4 @@ glabel func_802A9898_424508 /* 424540 802A98D0 8FB00010 */ lw $s0, 0x10($sp) /* 424544 802A98D4 03E00008 */ jr $ra /* 424548 802A98D8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 42454C 802A98DC 00000000 */ nop +/* 42454C 802A98DC 00000000 */ nop diff --git a/asm/nonmatchings/code_425590/func_802A9000_425590.s b/asm/nonmatchings/code_425590/func_802A9000_425590.s index 4eeb2c1e7b..dc60602886 100644 --- a/asm/nonmatchings/code_425590/func_802A9000_425590.s +++ b/asm/nonmatchings/code_425590/func_802A9000_425590.s @@ -19,7 +19,7 @@ glabel func_802A9000_425590 /* 4255C8 802A9038 5040002F */ beql $v0, $zero, .L802A90F8 /* 4255CC 802A903C A0600081 */ sb $zero, 0x81($v1) /* 4255D0 802A9040 0C09A216 */ jal func_80268858 -/* 4255D4 802A9044 00000000 */ nop +/* 4255D4 802A9044 00000000 */ nop /* 4255D8 802A9048 3C048011 */ lui $a0, %hi(D_80108B28) /* 4255DC 802A904C 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) /* 4255E0 802A9050 24020006 */ addiu $v0, $zero, 6 @@ -48,7 +48,7 @@ glabel func_802A9000_425590 /* 42563C 802A90AC 3C048011 */ lui $a0, %hi(D_80108AFC) /* 425640 802A90B0 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) /* 425644 802A90B4 0C050529 */ jal create_icon -/* 425648 802A90B8 00000000 */ nop +/* 425648 802A90B8 00000000 */ nop /* 42564C 802A90BC 0040802D */ daddu $s0, $v0, $zero /* 425650 802A90C0 86250056 */ lh $a1, 0x56($s1) /* 425654 802A90C4 86260058 */ lh $a2, 0x58($s1) diff --git a/asm/nonmatchings/code_425590/func_802A9110_4256A0.s b/asm/nonmatchings/code_425590/func_802A9110_4256A0.s index 986db49c23..50924eeb40 100644 --- a/asm/nonmatchings/code_425590/func_802A9110_4256A0.s +++ b/asm/nonmatchings/code_425590/func_802A9110_4256A0.s @@ -18,7 +18,7 @@ glabel func_802A9110_4256A0 /* 4256D4 802A9144 10400023 */ beqz $v0, .L802A91D4 /* 4256D8 802A9148 0260182D */ daddu $v1, $s3, $zero /* 4256DC 802A914C 0C09A216 */ jal func_80268858 -/* 4256E0 802A9150 00000000 */ nop +/* 4256E0 802A9150 00000000 */ nop /* 4256E4 802A9154 8E050000 */ lw $a1, ($s0) /* 4256E8 802A9158 26100004 */ addiu $s0, $s0, 4 /* 4256EC 802A915C 0C0B1EAF */ jal get_variable diff --git a/asm/nonmatchings/code_425590/func_802A91F8_425788.s b/asm/nonmatchings/code_425590/func_802A91F8_425788.s index f6af03cf7c..71a2d13757 100644 --- a/asm/nonmatchings/code_425590/func_802A91F8_425788.s +++ b/asm/nonmatchings/code_425590/func_802A91F8_425788.s @@ -14,11 +14,12 @@ glabel func_802A91F8_425788 /* 4257AC 802A921C 2C62000D */ sltiu $v0, $v1, 0xd /* 4257B0 802A9220 1040009B */ beqz $v0, .L802A9490 /* 4257B4 802A9224 00031080 */ sll $v0, $v1, 2 -/* 4257B8 802A9228 3C01802B */ lui $at, %hi(D_802A9580) +/* 4257B8 802A9228 3C01802B */ lui $at, %hi(jtbl_802A9580_425B10) /* 4257BC 802A922C 00220821 */ addu $at, $at, $v0 -/* 4257C0 802A9230 8C229580 */ lw $v0, %lo(D_802A9580)($at) +/* 4257C0 802A9230 8C229580 */ lw $v0, %lo(jtbl_802A9580_425B10)($at) /* 4257C4 802A9234 00400008 */ jr $v0 -/* 4257C8 802A9238 00000000 */ nop +/* 4257C8 802A9238 00000000 */ nop +glabel L802A923C_4257CC /* 4257CC 802A923C 0C093EB1 */ jal set_popup_duration /* 4257D0 802A9240 24040063 */ addiu $a0, $zero, 0x63 /* 4257D4 802A9244 82220061 */ lb $v0, 0x61($s1) @@ -44,6 +45,7 @@ glabel func_802A91F8_425788 /* 42581C 802A928C 24020001 */ addiu $v0, $zero, 1 /* 425820 802A9290 080AA524 */ j .L802A9490 /* 425824 802A9294 A622004C */ sh $v0, 0x4c($s1) +glabel L802A9298_425828 /* 425828 802A9298 0C093EB1 */ jal set_popup_duration /* 42582C 802A929C 24040063 */ addiu $a0, $zero, 0x63 /* 425830 802A92A0 96220056 */ lhu $v0, 0x56($s1) @@ -66,7 +68,8 @@ glabel func_802A91F8_425788 /* 425870 802A92E0 0C051261 */ jal set_icon_render_pos /* 425874 802A92E4 24C6001C */ addiu $a2, $a2, 0x1c /* 425878 802A92E8 080AA524 */ j .L802A9490 -/* 42587C 802A92EC 00000000 */ nop +/* 42587C 802A92EC 00000000 */ nop +glabel L802A92F0_425880 /* 425880 802A92F0 0C093EB1 */ jal set_popup_duration /* 425884 802A92F4 24040063 */ addiu $a0, $zero, 0x63 /* 425888 802A92F8 8622004E */ lh $v0, 0x4e($s1) @@ -80,12 +83,13 @@ glabel func_802A91F8_425788 /* 4258A4 802A9314 3C058011 */ lui $a1, %hi(D_80108B80) /* 4258A8 802A9318 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) /* 4258AC 802A931C 0C0511FF */ jal set_menu_icon_script -/* 4258B0 802A9320 00000000 */ nop +/* 4258B0 802A9320 00000000 */ nop /* 4258B4 802A9324 96230052 */ lhu $v1, 0x52($s1) /* 4258B8 802A9328 2402000B */ addiu $v0, $zero, 0xb /* 4258BC 802A932C A6200044 */ sh $zero, 0x44($s1) /* 4258C0 802A9330 A622004C */ sh $v0, 0x4c($s1) /* 4258C4 802A9334 A6230054 */ sh $v1, 0x54($s1) +glabel L802A9338_4258C8 /* 4258C8 802A9338 0C093EB1 */ jal set_popup_duration /* 4258CC 802A933C 24040063 */ addiu $a0, $zero, 0x63 /* 4258D0 802A9340 8622006A */ lh $v0, 0x6a($s1) @@ -165,6 +169,7 @@ glabel func_802A91F8_425788 /* 4259E8 802A9458 2402000C */ addiu $v0, $zero, 0xc /* 4259EC 802A945C 080AA524 */ j .L802A9490 /* 4259F0 802A9460 A622004C */ sh $v0, 0x4c($s1) +glabel L802A9464_4259F4 /* 4259F4 802A9464 86220054 */ lh $v0, 0x54($s1) /* 4259F8 802A9468 96230054 */ lhu $v1, 0x54($s1) /* 4259FC 802A946C 10400003 */ beqz $v0, .L802A947C @@ -179,6 +184,7 @@ glabel func_802A91F8_425788 /* 425A18 802A9488 0C09A327 */ jal func_80268C9C /* 425A1C 802A948C A2020086 */ sb $v0, 0x86($s0) .L802A9490: +glabel L802A9490_425A20 /* 425A20 802A9490 8FBF0018 */ lw $ra, 0x18($sp) /* 425A24 802A9494 8FB10014 */ lw $s1, 0x14($sp) /* 425A28 802A9498 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_425590/func_802A94A4_425A34.s b/asm/nonmatchings/code_425590/func_802A94A4_425A34.s index 9e22c8ba5c..6f1f87a006 100644 --- a/asm/nonmatchings/code_425590/func_802A94A4_425A34.s +++ b/asm/nonmatchings/code_425590/func_802A94A4_425A34.s @@ -13,7 +13,7 @@ glabel func_802A94A4_425A34 /* 425A54 802A94C4 0060882D */ daddu $s1, $v1, $zero /* 425A58 802A94C8 8C640004 */ lw $a0, 4($v1) /* 425A5C 802A94CC 0C0511EA */ jal draw_icon_0 -/* 425A60 802A94D0 00000000 */ nop +/* 425A60 802A94D0 00000000 */ nop .L802A94D4: /* 425A64 802A94D4 8E300008 */ lw $s0, 8($s1) /* 425A68 802A94D8 0C0511EA */ jal draw_icon_0 diff --git a/asm/nonmatchings/code_425590/func_802A9544_425AD4.s b/asm/nonmatchings/code_425590/func_802A9544_425AD4.s index 36df8d045a..e766331f64 100644 --- a/asm/nonmatchings/code_425590/func_802A9544_425AD4.s +++ b/asm/nonmatchings/code_425590/func_802A9544_425AD4.s @@ -15,5 +15,5 @@ glabel func_802A9544_425AD4 /* 425AFC 802A956C 8FB00010 */ lw $s0, 0x10($sp) /* 425B00 802A9570 03E00008 */ jr $ra /* 425B04 802A9574 27BD0018 */ addiu $sp, $sp, 0x18 -/* 425B08 802A9578 00000000 */ nop -/* 425B0C 802A957C 00000000 */ nop +/* 425B08 802A9578 00000000 */ nop +/* 425B0C 802A957C 00000000 */ nop diff --git a/asm/nonmatchings/code_425B50/func_802A9000_425B50.s b/asm/nonmatchings/code_425B50/func_802A9000_425B50.s index 025304dcfa..70903016d1 100644 --- a/asm/nonmatchings/code_425B50/func_802A9000_425B50.s +++ b/asm/nonmatchings/code_425B50/func_802A9000_425B50.s @@ -50,7 +50,7 @@ glabel func_802A9000_425B50 /* 425C04 802A90B4 3C048011 */ lui $a0, %hi(D_80108AFC) /* 425C08 802A90B8 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) /* 425C0C 802A90BC 0C050529 */ jal create_icon -/* 425C10 802A90C0 00000000 */ nop +/* 425C10 802A90C0 00000000 */ nop /* 425C14 802A90C4 0040882D */ daddu $s1, $v0, $zero /* 425C18 802A90C8 86050056 */ lh $a1, 0x56($s0) /* 425C1C 802A90CC 86060058 */ lh $a2, 0x58($s0) @@ -67,7 +67,7 @@ glabel func_802A9000_425B50 /* 425C48 802A90F8 3C048011 */ lui $a0, %hi(D_80109244) /* 425C4C 802A90FC 24849244 */ addiu $a0, $a0, %lo(D_80109244) /* 425C50 802A9100 0C050529 */ jal create_icon -/* 425C54 802A9104 00000000 */ nop +/* 425C54 802A9104 00000000 */ nop /* 425C58 802A9108 0040882D */ daddu $s1, $v0, $zero /* 425C5C 802A910C 86050056 */ lh $a1, 0x56($s0) /* 425C60 802A9110 86060058 */ lh $a2, 0x58($s0) diff --git a/asm/nonmatchings/code_425B50/func_802A9228_425D78.s b/asm/nonmatchings/code_425B50/func_802A9228_425D78.s index aaa315bd7b..e177a3b7b4 100644 --- a/asm/nonmatchings/code_425B50/func_802A9228_425D78.s +++ b/asm/nonmatchings/code_425B50/func_802A9228_425D78.s @@ -14,11 +14,12 @@ glabel func_802A9228_425D78 /* 425D9C 802A924C 2C62000D */ sltiu $v0, $v1, 0xd /* 425DA0 802A9250 1040009C */ beqz $v0, .L802A94C4 /* 425DA4 802A9254 00031080 */ sll $v0, $v1, 2 -/* 425DA8 802A9258 3C01802B */ lui $at, %hi(D_802A95E0) +/* 425DA8 802A9258 3C01802B */ lui $at, %hi(jtbl_802A95E0_426130) /* 425DAC 802A925C 00220821 */ addu $at, $at, $v0 -/* 425DB0 802A9260 8C2295E0 */ lw $v0, %lo(D_802A95E0)($at) +/* 425DB0 802A9260 8C2295E0 */ lw $v0, %lo(jtbl_802A95E0_426130)($at) /* 425DB4 802A9264 00400008 */ jr $v0 -/* 425DB8 802A9268 00000000 */ nop +/* 425DB8 802A9268 00000000 */ nop +glabel L802A926C_425DBC /* 425DBC 802A926C 0C093EB1 */ jal set_popup_duration /* 425DC0 802A9270 24040063 */ addiu $a0, $zero, 0x63 /* 425DC4 802A9274 82220061 */ lb $v0, 0x61($s1) @@ -54,6 +55,7 @@ glabel func_802A9228_425D78 /* 425E30 802A92E0 24020001 */ addiu $v0, $zero, 1 /* 425E34 802A92E4 080AA531 */ j .L802A94C4 /* 425E38 802A92E8 A622004C */ sh $v0, 0x4c($s1) +glabel L802A92EC_425E3C /* 425E3C 802A92EC 0C093EB1 */ jal set_popup_duration /* 425E40 802A92F0 24040063 */ addiu $a0, $zero, 0x63 /* 425E44 802A92F4 96220056 */ lhu $v0, 0x56($s1) @@ -82,7 +84,8 @@ glabel func_802A9228_425D78 /* 425E9C 802A934C 0C051261 */ jal set_icon_render_pos /* 425EA0 802A9350 24C6000E */ addiu $a2, $a2, 0xe /* 425EA4 802A9354 080AA531 */ j .L802A94C4 -/* 425EA8 802A9358 00000000 */ nop +/* 425EA8 802A9358 00000000 */ nop +glabel L802A935C_425EAC /* 425EAC 802A935C 0C093EB1 */ jal set_popup_duration /* 425EB0 802A9360 24040063 */ addiu $a0, $zero, 0x63 /* 425EB4 802A9364 8622004E */ lh $v0, 0x4e($s1) @@ -96,7 +99,7 @@ glabel func_802A9228_425D78 /* 425ED0 802A9380 3C058011 */ lui $a1, %hi(D_80108B80) /* 425ED4 802A9384 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) /* 425ED8 802A9388 0C0511FF */ jal set_menu_icon_script -/* 425EDC 802A938C 00000000 */ nop +/* 425EDC 802A938C 00000000 */ nop /* 425EE0 802A9390 A2000081 */ sb $zero, 0x81($s0) /* 425EE4 802A9394 96230052 */ lhu $v1, 0x52($s1) /* 425EE8 802A9398 24020001 */ addiu $v0, $zero, 1 @@ -106,12 +109,13 @@ glabel func_802A9228_425D78 /* 425EF8 802A93A8 A220005D */ sb $zero, 0x5d($s1) /* 425EFC 802A93AC A622004C */ sh $v0, 0x4c($s1) /* 425F00 802A93B0 A6230054 */ sh $v1, 0x54($s1) +glabel L802A93B4_425F04 /* 425F04 802A93B4 0C093EB1 */ jal set_popup_duration /* 425F08 802A93B8 24040063 */ addiu $a0, $zero, 0x63 /* 425F0C 802A93BC 8E020214 */ lw $v0, 0x214($s0) /* 425F10 802A93C0 30428000 */ andi $v0, $v0, 0x8000 /* 425F14 802A93C4 1040000E */ beqz $v0, .L802A9400 -/* 425F18 802A93C8 00000000 */ nop +/* 425F18 802A93C8 00000000 */ nop /* 425F1C 802A93CC 86220050 */ lh $v0, 0x50($s1) /* 425F20 802A93D0 8E030434 */ lw $v1, 0x434($s0) /* 425F24 802A93D4 00021080 */ sll $v0, $v0, 2 @@ -170,6 +174,7 @@ glabel func_802A9228_425D78 /* 425FE8 802A9498 2402000C */ addiu $v0, $zero, 0xc /* 425FEC 802A949C 080AA531 */ j .L802A94C4 /* 425FF0 802A94A0 A622004C */ sh $v0, 0x4c($s1) +glabel L802A94A4_425FF4 /* 425FF4 802A94A4 86220054 */ lh $v0, 0x54($s1) /* 425FF8 802A94A8 96230054 */ lhu $v1, 0x54($s1) /* 425FFC 802A94AC 10400003 */ beqz $v0, .L802A94BC @@ -179,8 +184,9 @@ glabel func_802A9228_425D78 /* 426008 802A94B8 A6220054 */ sh $v0, 0x54($s1) .L802A94BC: /* 42600C 802A94BC 0C09A327 */ jal func_80268C9C -/* 426010 802A94C0 00000000 */ nop +/* 426010 802A94C0 00000000 */ nop .L802A94C4: +glabel L802A94C4_426014 /* 426014 802A94C4 8FBF0018 */ lw $ra, 0x18($sp) /* 426018 802A94C8 8FB10014 */ lw $s1, 0x14($sp) /* 42601C 802A94CC 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_425B50/func_802A94D8_426028.s b/asm/nonmatchings/code_425B50/func_802A94D8_426028.s index 4a8a711cb8..812762d2c5 100644 --- a/asm/nonmatchings/code_425B50/func_802A94D8_426028.s +++ b/asm/nonmatchings/code_425B50/func_802A94D8_426028.s @@ -47,7 +47,7 @@ glabel func_802A94D8_426028 /* 4260C8 802A9578 00063403 */ sra $a2, $a2, 0x10 /* 4260CC 802A957C 8E24000C */ lw $a0, 0xc($s1) /* 4260D0 802A9580 0C0511EA */ jal draw_icon_0 -/* 4260D4 802A9584 00000000 */ nop +/* 4260D4 802A9584 00000000 */ nop /* 4260D8 802A9588 8FBF0020 */ lw $ra, 0x20($sp) /* 4260DC 802A958C 8FB1001C */ lw $s1, 0x1c($sp) /* 4260E0 802A9590 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/nonmatchings/code_425B50/func_802A959C_4260EC.s b/asm/nonmatchings/code_425B50/func_802A959C_4260EC.s index 26c62f206d..30b251d0d4 100644 --- a/asm/nonmatchings/code_425B50/func_802A959C_4260EC.s +++ b/asm/nonmatchings/code_425B50/func_802A959C_4260EC.s @@ -17,5 +17,5 @@ glabel func_802A959C_4260EC /* 42611C 802A95CC 8FB00010 */ lw $s0, 0x10($sp) /* 426120 802A95D0 03E00008 */ jr $ra /* 426124 802A95D4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 426128 802A95D8 00000000 */ nop -/* 42612C 802A95DC 00000000 */ nop +/* 426128 802A95D8 00000000 */ nop +/* 42612C 802A95DC 00000000 */ nop diff --git a/asm/nonmatchings/code_426170/func_802A9000_426170.s b/asm/nonmatchings/code_426170/func_802A9000_426170.s index f61818bb05..711f7db7be 100644 --- a/asm/nonmatchings/code_426170/func_802A9000_426170.s +++ b/asm/nonmatchings/code_426170/func_802A9000_426170.s @@ -21,7 +21,7 @@ glabel func_802A9000_426170 /* 4261B0 802A9040 10400044 */ beqz $v0, .L802A9154 /* 4261B4 802A9044 0200182D */ daddu $v1, $s0, $zero /* 4261B8 802A9048 0C09A216 */ jal func_80268858 -/* 4261BC 802A904C 00000000 */ nop +/* 4261BC 802A904C 00000000 */ nop /* 4261C0 802A9050 3C048011 */ lui $a0, %hi(D_80108B28) /* 4261C4 802A9054 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) /* 4261C8 802A9058 24020008 */ addiu $v0, $zero, 8 @@ -54,7 +54,7 @@ glabel func_802A9000_426170 /* 426234 802A90C4 3C048011 */ lui $a0, %hi(D_80108AFC) /* 426238 802A90C8 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) /* 42623C 802A90CC 0C050529 */ jal create_icon -/* 426240 802A90D0 00000000 */ nop +/* 426240 802A90D0 00000000 */ nop /* 426244 802A90D4 0040802D */ daddu $s0, $v0, $zero /* 426248 802A90D8 86250056 */ lh $a1, 0x56($s1) /* 42624C 802A90DC 86260058 */ lh $a2, 0x58($s1) @@ -71,7 +71,7 @@ glabel func_802A9000_426170 /* 426278 802A9108 3C048029 */ lui $a0, %hi(D_80292974) /* 42627C 802A910C 24842974 */ addiu $a0, $a0, %lo(D_80292974) /* 426280 802A9110 0C050529 */ jal create_icon -/* 426284 802A9114 00000000 */ nop +/* 426284 802A9114 00000000 */ nop /* 426288 802A9118 0040802D */ daddu $s0, $v0, $zero /* 42628C 802A911C 86250056 */ lh $a1, 0x56($s1) /* 426290 802A9120 86260058 */ lh $a2, 0x58($s1) diff --git a/asm/nonmatchings/code_426170/func_802A9170_4262E0.s b/asm/nonmatchings/code_426170/func_802A9170_4262E0.s index 61c2a22be6..e315b2b129 100644 --- a/asm/nonmatchings/code_426170/func_802A9170_4262E0.s +++ b/asm/nonmatchings/code_426170/func_802A9170_4262E0.s @@ -18,7 +18,7 @@ glabel func_802A9170_4262E0 /* 426314 802A91A4 10400030 */ beqz $v0, .L802A9268 /* 426318 802A91A8 0240182D */ daddu $v1, $s2, $zero /* 42631C 802A91AC 0C09A216 */ jal func_80268858 -/* 426320 802A91B0 00000000 */ nop +/* 426320 802A91B0 00000000 */ nop /* 426324 802A91B4 8E050000 */ lw $a1, ($s0) /* 426328 802A91B8 26100004 */ addiu $s0, $s0, 4 /* 42632C 802A91BC 0C0B1EAF */ jal get_variable diff --git a/asm/nonmatchings/code_426170/func_802A928C_4263FC.s b/asm/nonmatchings/code_426170/func_802A928C_4263FC.s index 5b63a68c60..fe600a4bd2 100644 --- a/asm/nonmatchings/code_426170/func_802A928C_4263FC.s +++ b/asm/nonmatchings/code_426170/func_802A928C_4263FC.s @@ -15,11 +15,12 @@ glabel func_802A928C_4263FC /* 426424 802A92B4 2C62000D */ sltiu $v0, $v1, 0xd /* 426428 802A92B8 10400102 */ beqz $v0, .L802A96C4 /* 42642C 802A92BC 00031080 */ sll $v0, $v1, 2 -/* 426430 802A92C0 3C01802B */ lui $at, %hi(D_802A9820) +/* 426430 802A92C0 3C01802B */ lui $at, %hi(jtbl_802A9820_426990) /* 426434 802A92C4 00220821 */ addu $at, $at, $v0 -/* 426438 802A92C8 8C229820 */ lw $v0, %lo(D_802A9820)($at) +/* 426438 802A92C8 8C229820 */ lw $v0, %lo(jtbl_802A9820_426990)($at) /* 42643C 802A92CC 00400008 */ jr $v0 -/* 426440 802A92D0 00000000 */ nop +/* 426440 802A92D0 00000000 */ nop +glabel L802A92D4_426444 /* 426444 802A92D4 0C093EB1 */ jal set_popup_duration /* 426448 802A92D8 24040063 */ addiu $a0, $zero, 0x63 /* 42644C 802A92DC 8E300004 */ lw $s0, 4($s1) @@ -45,6 +46,7 @@ glabel func_802A928C_4263FC /* 426494 802A9324 24020001 */ addiu $v0, $zero, 1 /* 426498 802A9328 080AA5B1 */ j .L802A96C4 /* 42649C 802A932C A622004C */ sh $v0, 0x4c($s1) +glabel L802A9330_4264A0 /* 4264A0 802A9330 0C093EB1 */ jal set_popup_duration /* 4264A4 802A9334 24040063 */ addiu $a0, $zero, 0x63 /* 4264A8 802A9338 96220056 */ lhu $v0, 0x56($s1) @@ -67,7 +69,8 @@ glabel func_802A928C_4263FC /* 4264E8 802A9378 0C051261 */ jal set_icon_render_pos /* 4264EC 802A937C 24C6001C */ addiu $a2, $a2, 0x1c /* 4264F0 802A9380 080AA5B1 */ j .L802A96C4 -/* 4264F4 802A9384 00000000 */ nop +/* 4264F4 802A9384 00000000 */ nop +glabel L802A9388_4264F8 /* 4264F8 802A9388 0C093EB1 */ jal set_popup_duration /* 4264FC 802A938C 24040063 */ addiu $a0, $zero, 0x63 /* 426500 802A9390 8622004E */ lh $v0, 0x4e($s1) @@ -81,7 +84,7 @@ glabel func_802A928C_4263FC /* 42651C 802A93AC 3C058011 */ lui $a1, %hi(D_80108B80) /* 426520 802A93B0 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) /* 426524 802A93B4 0C0511FF */ jal set_menu_icon_script -/* 426528 802A93B8 00000000 */ nop +/* 426528 802A93B8 00000000 */ nop /* 42652C 802A93BC 3C048000 */ lui $a0, 0x8000 /* 426530 802A93C0 34840041 */ ori $a0, $a0, 0x41 /* 426534 802A93C4 0000282D */ daddu $a1, $zero, $zero @@ -93,14 +96,15 @@ glabel func_802A928C_4263FC /* 42654C 802A93DC A6220054 */ sh $v0, 0x54($s1) /* 426550 802A93E0 2402000B */ addiu $v0, $zero, 0xb /* 426554 802A93E4 A622004C */ sh $v0, 0x4c($s1) +glabel L802A93E8_426558 /* 426558 802A93E8 0C093EB1 */ jal set_popup_duration /* 42655C 802A93EC 24040063 */ addiu $a0, $zero, 0x63 /* 426560 802A93F0 86220068 */ lh $v0, 0x68($s1) /* 426564 802A93F4 14400027 */ bnez $v0, .L802A9494 -/* 426568 802A93F8 00000000 */ nop +/* 426568 802A93F8 00000000 */ nop /* 42656C 802A93FC 86220064 */ lh $v0, 0x64($s1) /* 426570 802A9400 1040001E */ beqz $v0, .L802A947C -/* 426574 802A9404 00000000 */ nop +/* 426574 802A9404 00000000 */ nop /* 426578 802A9408 82220080 */ lb $v0, 0x80($s1) /* 42657C 802A940C 00021040 */ sll $v0, $v0, 1 /* 426580 802A9410 02221021 */ addu $v0, $s1, $v0 @@ -114,7 +118,7 @@ glabel func_802A928C_4263FC /* 42659C 802A942C 14610004 */ bne $v1, $at, .L802A9440 /* 4265A0 802A9430 3C018000 */ lui $at, 0x8000 /* 4265A4 802A9434 14410002 */ bne $v0, $at, .L802A9440 -/* 4265A8 802A9438 00000000 */ nop +/* 4265A8 802A9438 00000000 */ nop /* 4265AC 802A943C 0006000D */ break 6 .L802A9440: /* 4265B0 802A9440 00001012 */ mflo $v0 @@ -144,7 +148,7 @@ glabel func_802A928C_4263FC /* 426604 802A9494 8E420214 */ lw $v0, 0x214($s2) /* 426608 802A9498 30428000 */ andi $v0, $v0, 0x8000 /* 42660C 802A949C 10400025 */ beqz $v0, .L802A9534 -/* 426610 802A94A0 00000000 */ nop +/* 426610 802A94A0 00000000 */ nop /* 426614 802A94A4 86240050 */ lh $a0, 0x50($s1) /* 426618 802A94A8 8E420434 */ lw $v0, 0x434($s2) /* 42661C 802A94AC 86230064 */ lh $v1, 0x64($s1) @@ -168,7 +172,7 @@ glabel func_802A928C_4263FC /* 426664 802A94F4 00021303 */ sra $v0, $v0, 0xc /* 426668 802A94F8 00431823 */ subu $v1, $v0, $v1 /* 42666C 802A94FC 10600004 */ beqz $v1, .L802A9510 -/* 426670 802A9500 00000000 */ nop +/* 426670 802A9500 00000000 */ nop /* 426674 802A9504 96220044 */ lhu $v0, 0x44($s1) /* 426678 802A9508 080AA54C */ j .L802A9530 /* 42667C 802A950C 00431021 */ addu $v0, $v0, $v1 @@ -261,7 +265,7 @@ glabel func_802A928C_4263FC /* 4267B8 802A9648 14620004 */ bne $v1, $v0, .L802A965C /* 4267BC 802A964C 3C048000 */ lui $a0, 0x8000 /* 4267C0 802A9650 0C09A458 */ jal func_80269160 -/* 4267C4 802A9654 00000000 */ nop +/* 4267C4 802A9654 00000000 */ nop /* 4267C8 802A9658 3C048000 */ lui $a0, 0x8000 .L802A965C: /* 4267CC 802A965C 0C05271B */ jal stop_sound @@ -273,9 +277,10 @@ glabel func_802A928C_4263FC /* 4267E4 802A9674 2402000C */ addiu $v0, $zero, 0xc /* 4267E8 802A9678 080AA5B1 */ j .L802A96C4 /* 4267EC 802A967C A622004C */ sh $v0, 0x4c($s1) +glabel L802A9680_4267F0 /* 4267F0 802A9680 86220064 */ lh $v0, 0x64($s1) /* 4267F4 802A9684 14400007 */ bnez $v0, .L802A96A4 -/* 4267F8 802A9688 00000000 */ nop +/* 4267F8 802A9688 00000000 */ nop /* 4267FC 802A968C 96220044 */ lhu $v0, 0x44($s1) /* 426800 802A9690 2442FF9C */ addiu $v0, $v0, -0x64 /* 426804 802A9694 A6220044 */ sh $v0, 0x44($s1) @@ -292,8 +297,9 @@ glabel func_802A928C_4263FC /* 426828 802A96B8 A6220054 */ sh $v0, 0x54($s1) .L802A96BC: /* 42682C 802A96BC 0C09A327 */ jal func_80268C9C -/* 426830 802A96C0 00000000 */ nop +/* 426830 802A96C0 00000000 */ nop .L802A96C4: +glabel L802A96C4_426834 /* 426834 802A96C4 8FBF001C */ lw $ra, 0x1c($sp) /* 426838 802A96C8 8FB20018 */ lw $s2, 0x18($sp) /* 42683C 802A96CC 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_426170/func_802A96DC_42684C.s b/asm/nonmatchings/code_426170/func_802A96DC_42684C.s index 3c2053164d..5221792bf8 100644 --- a/asm/nonmatchings/code_426170/func_802A96DC_42684C.s +++ b/asm/nonmatchings/code_426170/func_802A96DC_42684C.s @@ -35,7 +35,7 @@ glabel func_802A96DC_42684C /* 4268C4 802A9754 0C09A1DC */ jal func_80268770 /* 4268C8 802A9758 00063403 */ sra $a2, $a2, 0x10 /* 4268CC 802A975C 080AA5E7 */ j .L802A979C -/* 4268D0 802A9760 00000000 */ nop +/* 4268D0 802A9760 00000000 */ nop .L802A9764: /* 4268D4 802A9764 96230044 */ lhu $v1, 0x44($s1) /* 4268D8 802A9768 3484851F */ ori $a0, $a0, 0x851f @@ -54,7 +54,7 @@ glabel func_802A96DC_42684C .L802A979C: /* 42690C 802A979C 8E24000C */ lw $a0, 0xc($s1) /* 426910 802A97A0 0C0511EA */ jal draw_icon_0 -/* 426914 802A97A4 00000000 */ nop +/* 426914 802A97A4 00000000 */ nop /* 426918 802A97A8 8FBF0020 */ lw $ra, 0x20($sp) /* 42691C 802A97AC 8FB1001C */ lw $s1, 0x1c($sp) /* 426920 802A97B0 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/nonmatchings/code_426170/func_802A97BC_42692C.s b/asm/nonmatchings/code_426170/func_802A97BC_42692C.s index be5ed13c76..e87a9ebe1b 100644 --- a/asm/nonmatchings/code_426170/func_802A97BC_42692C.s +++ b/asm/nonmatchings/code_426170/func_802A97BC_42692C.s @@ -17,5 +17,5 @@ glabel func_802A97BC_42692C /* 42695C 802A97EC 8FB00010 */ lw $s0, 0x10($sp) /* 426960 802A97F0 03E00008 */ jr $ra /* 426964 802A97F4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 426968 802A97F8 00000000 */ nop -/* 42696C 802A97FC 00000000 */ nop +/* 426968 802A97F8 00000000 */ nop +/* 42696C 802A97FC 00000000 */ nop diff --git a/asm/nonmatchings/code_4269D0/func_802A9000_4269D0.s b/asm/nonmatchings/code_4269D0/func_802A9000_4269D0.s index bc29193749..c0c5eaf58d 100644 --- a/asm/nonmatchings/code_4269D0/func_802A9000_4269D0.s +++ b/asm/nonmatchings/code_4269D0/func_802A9000_4269D0.s @@ -21,7 +21,7 @@ glabel func_802A9000_4269D0 /* 426A10 802A9040 10400046 */ beqz $v0, .L802A915C /* 426A14 802A9044 0200182D */ daddu $v1, $s0, $zero /* 426A18 802A9048 0C09A216 */ jal func_80268858 -/* 426A1C 802A904C 00000000 */ nop +/* 426A1C 802A904C 00000000 */ nop /* 426A20 802A9050 3C048011 */ lui $a0, %hi(D_80108E1C) /* 426A24 802A9054 24848E1C */ addiu $a0, $a0, %lo(D_80108E1C) /* 426A28 802A9058 24020009 */ addiu $v0, $zero, 9 @@ -56,7 +56,7 @@ glabel func_802A9000_4269D0 /* 426A9C 802A90CC 3C048011 */ lui $a0, %hi(D_80108AFC) /* 426AA0 802A90D0 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) /* 426AA4 802A90D4 0C050529 */ jal create_icon -/* 426AA8 802A90D8 00000000 */ nop +/* 426AA8 802A90D8 00000000 */ nop /* 426AAC 802A90DC 0040802D */ daddu $s0, $v0, $zero /* 426AB0 802A90E0 86250056 */ lh $a1, 0x56($s1) /* 426AB4 802A90E4 86260058 */ lh $a2, 0x58($s1) @@ -73,7 +73,7 @@ glabel func_802A9000_4269D0 /* 426AE0 802A9110 3C048029 */ lui $a0, %hi(D_80292974) /* 426AE4 802A9114 24842974 */ addiu $a0, $a0, %lo(D_80292974) /* 426AE8 802A9118 0C050529 */ jal create_icon -/* 426AEC 802A911C 00000000 */ nop +/* 426AEC 802A911C 00000000 */ nop /* 426AF0 802A9120 0040802D */ daddu $s0, $v0, $zero /* 426AF4 802A9124 86250056 */ lh $a1, 0x56($s1) /* 426AF8 802A9128 86260058 */ lh $a2, 0x58($s1) diff --git a/asm/nonmatchings/code_4269D0/func_802A9178_426B48.s b/asm/nonmatchings/code_4269D0/func_802A9178_426B48.s index a0fd8db1e5..aae0afacfb 100644 --- a/asm/nonmatchings/code_4269D0/func_802A9178_426B48.s +++ b/asm/nonmatchings/code_4269D0/func_802A9178_426B48.s @@ -18,7 +18,7 @@ glabel func_802A9178_426B48 /* 426B7C 802A91AC 10400030 */ beqz $v0, .L802A9270 /* 426B80 802A91B0 0240182D */ daddu $v1, $s2, $zero /* 426B84 802A91B4 0C09A216 */ jal func_80268858 -/* 426B88 802A91B8 00000000 */ nop +/* 426B88 802A91B8 00000000 */ nop /* 426B8C 802A91BC 8E050000 */ lw $a1, ($s0) /* 426B90 802A91C0 26100004 */ addiu $s0, $s0, 4 /* 426B94 802A91C4 0C0B1EAF */ jal get_variable diff --git a/asm/nonmatchings/code_4269D0/func_802A9294_426C64.s b/asm/nonmatchings/code_4269D0/func_802A9294_426C64.s index 3fca25ff2b..c738004b69 100644 --- a/asm/nonmatchings/code_4269D0/func_802A9294_426C64.s +++ b/asm/nonmatchings/code_4269D0/func_802A9294_426C64.s @@ -17,11 +17,12 @@ glabel func_802A9294_426C64 /* 426C94 802A92C4 2C62000D */ sltiu $v0, $v1, 0xd /* 426C98 802A92C8 10400153 */ beqz $v0, .L802A9818 /* 426C9C 802A92CC 00031080 */ sll $v0, $v1, 2 -/* 426CA0 802A92D0 3C01802B */ lui $at, %hi(D_802A99A0) +/* 426CA0 802A92D0 3C01802B */ lui $at, %hi(jtbl_802A99A0_427370) /* 426CA4 802A92D4 00220821 */ addu $at, $at, $v0 -/* 426CA8 802A92D8 8C2299A0 */ lw $v0, %lo(D_802A99A0)($at) +/* 426CA8 802A92D8 8C2299A0 */ lw $v0, %lo(jtbl_802A99A0_427370)($at) /* 426CAC 802A92DC 00400008 */ jr $v0 -/* 426CB0 802A92E0 00000000 */ nop +/* 426CB0 802A92E0 00000000 */ nop +glabel L802A92E4_426CB4 /* 426CB4 802A92E4 0C093EB1 */ jal set_popup_duration /* 426CB8 802A92E8 24040063 */ addiu $a0, $zero, 0x63 /* 426CBC 802A92EC 8E300004 */ lw $s0, 4($s1) @@ -47,6 +48,7 @@ glabel func_802A9294_426C64 /* 426D04 802A9334 24020001 */ addiu $v0, $zero, 1 /* 426D08 802A9338 080AA606 */ j .L802A9818 /* 426D0C 802A933C A622004C */ sh $v0, 0x4c($s1) +glabel L802A9340_426D10 /* 426D10 802A9340 0C093EB1 */ jal set_popup_duration /* 426D14 802A9344 24040063 */ addiu $a0, $zero, 0x63 /* 426D18 802A9348 96220056 */ lhu $v0, 0x56($s1) @@ -69,7 +71,8 @@ glabel func_802A9294_426C64 /* 426D58 802A9388 0C051261 */ jal set_icon_render_pos /* 426D5C 802A938C 24C6001C */ addiu $a2, $a2, 0x1c /* 426D60 802A9390 080AA606 */ j .L802A9818 -/* 426D64 802A9394 00000000 */ nop +/* 426D64 802A9394 00000000 */ nop +glabel L802A9398_426D68 /* 426D68 802A9398 0C093EB1 */ jal set_popup_duration /* 426D6C 802A939C 24040063 */ addiu $a0, $zero, 0x63 /* 426D70 802A93A0 8622004E */ lh $v0, 0x4e($s1) @@ -83,7 +86,7 @@ glabel func_802A9294_426C64 /* 426D8C 802A93BC 3C058011 */ lui $a1, %hi(D_80108F30) /* 426D90 802A93C0 24A58F30 */ addiu $a1, $a1, %lo(D_80108F30) /* 426D94 802A93C4 0C0511FF */ jal set_menu_icon_script -/* 426D98 802A93C8 00000000 */ nop +/* 426D98 802A93C8 00000000 */ nop /* 426D9C 802A93CC 3C048000 */ lui $a0, 0x8000 /* 426DA0 802A93D0 34840041 */ ori $a0, $a0, 0x41 /* 426DA4 802A93D4 0000282D */ daddu $a1, $zero, $zero @@ -97,11 +100,12 @@ glabel func_802A9294_426C64 /* 426DC4 802A93F4 A6220054 */ sh $v0, 0x54($s1) /* 426DC8 802A93F8 2402000B */ addiu $v0, $zero, 0xb /* 426DCC 802A93FC A622004C */ sh $v0, 0x4c($s1) +glabel L802A9400_426DD0 /* 426DD0 802A9400 0C093EB1 */ jal set_popup_duration /* 426DD4 802A9404 24040063 */ addiu $a0, $zero, 0x63 /* 426DD8 802A9408 86220068 */ lh $v0, 0x68($s1) /* 426DDC 802A940C 1440005F */ bnez $v0, .L802A958C -/* 426DE0 802A9410 00000000 */ nop +/* 426DE0 802A9410 00000000 */ nop /* 426DE4 802A9414 82220080 */ lb $v0, 0x80($s1) /* 426DE8 802A9418 00021040 */ sll $v0, $v0, 1 /* 426DEC 802A941C 02221021 */ addu $v0, $s1, $v0 @@ -115,7 +119,7 @@ glabel func_802A9294_426C64 /* 426E08 802A9438 14610004 */ bne $v1, $at, .L802A944C /* 426E0C 802A943C 3C018000 */ lui $at, 0x8000 /* 426E10 802A9440 14410002 */ bne $v0, $at, .L802A944C -/* 426E14 802A9444 00000000 */ nop +/* 426E14 802A9444 00000000 */ nop /* 426E18 802A9448 0006000D */ break 6 .L802A944C: /* 426E1C 802A944C 00001012 */ mflo $v0 @@ -254,14 +258,14 @@ glabel func_802A9294_426C64 /* 427018 802A9648 10400005 */ beqz $v0, .L802A9660 /* 42701C 802A964C 24020002 */ addiu $v0, $zero, 2 /* 427020 802A9650 10600007 */ beqz $v1, .L802A9670 -/* 427024 802A9654 00000000 */ nop +/* 427024 802A9654 00000000 */ nop /* 427028 802A9658 080AA5D1 */ j .L802A9744 -/* 42702C 802A965C 00000000 */ nop +/* 42702C 802A965C 00000000 */ nop .L802A9660: /* 427030 802A9660 1062001F */ beq $v1, $v0, .L802A96E0 -/* 427034 802A9664 00000000 */ nop +/* 427034 802A9664 00000000 */ nop /* 427038 802A9668 080AA5D1 */ j .L802A9744 -/* 42703C 802A966C 00000000 */ nop +/* 42703C 802A966C 00000000 */ nop .L802A9670: /* 427040 802A9670 82420085 */ lb $v0, 0x85($s2) /* 427044 802A9674 82430084 */ lb $v1, 0x84($s2) @@ -357,7 +361,7 @@ glabel func_802A9294_426C64 /* 427190 802A97C0 14620004 */ bne $v1, $v0, .L802A97D4 /* 427194 802A97C4 3C048000 */ lui $a0, 0x8000 /* 427198 802A97C8 0C09A458 */ jal func_80269160 -/* 42719C 802A97CC 00000000 */ nop +/* 42719C 802A97CC 00000000 */ nop /* 4271A0 802A97D0 3C048000 */ lui $a0, 0x8000 .L802A97D4: /* 4271A4 802A97D4 0C05271B */ jal stop_sound @@ -369,6 +373,7 @@ glabel func_802A9294_426C64 /* 4271BC 802A97EC 2402000C */ addiu $v0, $zero, 0xc /* 4271C0 802A97F0 080AA606 */ j .L802A9818 /* 4271C4 802A97F4 A622004C */ sh $v0, 0x4c($s1) +glabel L802A97F8_4271C8 /* 4271C8 802A97F8 86220054 */ lh $v0, 0x54($s1) /* 4271CC 802A97FC 96230054 */ lhu $v1, 0x54($s1) /* 4271D0 802A9800 10400003 */ beqz $v0, .L802A9810 @@ -378,8 +383,9 @@ glabel func_802A9294_426C64 /* 4271DC 802A980C A6220054 */ sh $v0, 0x54($s1) .L802A9810: /* 4271E0 802A9810 0C09A327 */ jal func_80268C9C -/* 4271E4 802A9814 00000000 */ nop +/* 4271E4 802A9814 00000000 */ nop .L802A9818: +glabel L802A9818_4271E8 /* 4271E8 802A9818 8FBF0020 */ lw $ra, 0x20($sp) /* 4271EC 802A981C 8FB3001C */ lw $s3, 0x1c($sp) /* 4271F0 802A9820 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/code_4269D0/func_802A9834_427204.s b/asm/nonmatchings/code_4269D0/func_802A9834_427204.s index d42357421c..87a815b64e 100644 --- a/asm/nonmatchings/code_4269D0/func_802A9834_427204.s +++ b/asm/nonmatchings/code_4269D0/func_802A9834_427204.s @@ -35,7 +35,7 @@ glabel func_802A9834_427204 /* 42727C 802A98AC 0C09A1DC */ jal func_80268770 /* 427280 802A98B0 00063403 */ sra $a2, $a2, 0x10 /* 427284 802A98B4 080AA63D */ j .L802A98F4 -/* 427288 802A98B8 00000000 */ nop +/* 427288 802A98B8 00000000 */ nop .L802A98BC: /* 42728C 802A98BC 96230044 */ lhu $v1, 0x44($s1) /* 427290 802A98C0 3484851F */ ori $a0, $a0, 0x851f @@ -54,7 +54,7 @@ glabel func_802A9834_427204 .L802A98F4: /* 4272C4 802A98F4 8E24000C */ lw $a0, 0xc($s1) /* 4272C8 802A98F8 0C0511EA */ jal draw_icon_0 -/* 4272CC 802A98FC 00000000 */ nop +/* 4272CC 802A98FC 00000000 */ nop /* 4272D0 802A9900 8FBF0020 */ lw $ra, 0x20($sp) /* 4272D4 802A9904 8FB1001C */ lw $s1, 0x1c($sp) /* 4272D8 802A9908 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/nonmatchings/code_4273B0/func_802A928C_42763C.s b/asm/nonmatchings/code_4273B0/func_802A928C_42763C.s index 49a87777b5..b517c71cbb 100644 --- a/asm/nonmatchings/code_4273B0/func_802A928C_42763C.s +++ b/asm/nonmatchings/code_4273B0/func_802A928C_42763C.s @@ -15,11 +15,12 @@ glabel func_802A928C_42763C /* 427664 802A92B4 2C62000D */ sltiu $v0, $v1, 0xd /* 427668 802A92B8 104000A2 */ beqz $v0, .L802A9544 /* 42766C 802A92BC 00031080 */ sll $v0, $v1, 2 -/* 427670 802A92C0 3C01802B */ lui $at, %hi(D_802A9680) +/* 427670 802A92C0 3C01802B */ lui $at, %hi(jtbl_802A9680_427A30) /* 427674 802A92C4 00220821 */ addu $at, $at, $v0 -/* 427678 802A92C8 8C229680 */ lw $v0, %lo(D_802A9680)($at) +/* 427678 802A92C8 8C229680 */ lw $v0, %lo(jtbl_802A9680_427A30)($at) /* 42767C 802A92CC 00400008 */ jr $v0 /* 427680 802A92D0 00000000 */ nop +glabel L802A92D4_427684 /* 427684 802A92D4 0C093EB1 */ jal set_popup_duration /* 427688 802A92D8 24040063 */ addiu $a0, $zero, 0x63 /* 42768C 802A92DC 8E300004 */ lw $s0, 4($s1) @@ -45,6 +46,7 @@ glabel func_802A928C_42763C /* 4276D4 802A9324 24020001 */ addiu $v0, $zero, 1 /* 4276D8 802A9328 080AA551 */ j .L802A9544 /* 4276DC 802A932C A622004C */ sh $v0, 0x4c($s1) +glabel L802A9330_4276E0 /* 4276E0 802A9330 0C093EB1 */ jal set_popup_duration /* 4276E4 802A9334 24040063 */ addiu $a0, $zero, 0x63 /* 4276E8 802A9338 96220056 */ lhu $v0, 0x56($s1) @@ -68,6 +70,7 @@ glabel func_802A928C_42763C /* 42772C 802A937C 24C6001C */ addiu $a2, $a2, 0x1c /* 427730 802A9380 080AA551 */ j .L802A9544 /* 427734 802A9384 00000000 */ nop +glabel L802A9388_427738 /* 427738 802A9388 0C093EB1 */ jal set_popup_duration /* 42773C 802A938C 24040063 */ addiu $a0, $zero, 0x63 /* 427740 802A9390 8622004E */ lh $v0, 0x4e($s1) @@ -87,6 +90,7 @@ glabel func_802A928C_42763C /* 427774 802A93C4 A6200044 */ sh $zero, 0x44($s1) /* 427778 802A93C8 A622004C */ sh $v0, 0x4c($s1) /* 42777C 802A93CC A6230054 */ sh $v1, 0x54($s1) +glabel L802A93D0_427780 /* 427780 802A93D0 0C093EB1 */ jal set_popup_duration /* 427784 802A93D4 24040063 */ addiu $a0, $zero, 0x63 /* 427788 802A93D8 8E420214 */ lw $v0, 0x214($s2) @@ -178,6 +182,7 @@ glabel func_802A928C_42763C /* 4278C8 802A9518 2402000C */ addiu $v0, $zero, 0xc /* 4278CC 802A951C 080AA551 */ j .L802A9544 /* 4278D0 802A9520 A622004C */ sh $v0, 0x4c($s1) +glabel L802A9524_4278D4 /* 4278D4 802A9524 86220054 */ lh $v0, 0x54($s1) /* 4278D8 802A9528 96230054 */ lhu $v1, 0x54($s1) /* 4278DC 802A952C 10400003 */ beqz $v0, .L802A953C @@ -189,6 +194,7 @@ glabel func_802A928C_42763C /* 4278EC 802A953C 0C09A327 */ jal func_80268C9C /* 4278F0 802A9540 00000000 */ nop .L802A9544: +glabel L802A9544_4278F4 /* 4278F4 802A9544 8FBF001C */ lw $ra, 0x1c($sp) /* 4278F8 802A9548 8FB20018 */ lw $s2, 0x18($sp) /* 4278FC 802A954C 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_427A70/func_802A9000_427A70.s b/asm/nonmatchings/code_427A70/func_802A9000_427A70.s index a96670983f..3031316767 100644 --- a/asm/nonmatchings/code_427A70/func_802A9000_427A70.s +++ b/asm/nonmatchings/code_427A70/func_802A9000_427A70.s @@ -21,7 +21,7 @@ glabel func_802A9000_427A70 /* 427AB0 802A9040 10400044 */ beqz $v0, .L802A9154 /* 427AB4 802A9044 0200182D */ daddu $v1, $s0, $zero /* 427AB8 802A9048 0C09A216 */ jal func_80268858 -/* 427ABC 802A904C 00000000 */ nop +/* 427ABC 802A904C 00000000 */ nop /* 427AC0 802A9050 3C048011 */ lui $a0, %hi(D_80108B28) /* 427AC4 802A9054 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) /* 427AC8 802A9058 2402000B */ addiu $v0, $zero, 0xb @@ -54,7 +54,7 @@ glabel func_802A9000_427A70 /* 427B34 802A90C4 3C048011 */ lui $a0, %hi(D_80108AFC) /* 427B38 802A90C8 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) /* 427B3C 802A90CC 0C050529 */ jal create_icon -/* 427B40 802A90D0 00000000 */ nop +/* 427B40 802A90D0 00000000 */ nop /* 427B44 802A90D4 0040802D */ daddu $s0, $v0, $zero /* 427B48 802A90D8 86250056 */ lh $a1, 0x56($s1) /* 427B4C 802A90DC 86260058 */ lh $a2, 0x58($s1) @@ -71,7 +71,7 @@ glabel func_802A9000_427A70 /* 427B78 802A9108 3C048029 */ lui $a0, %hi(D_80292974) /* 427B7C 802A910C 24842974 */ addiu $a0, $a0, %lo(D_80292974) /* 427B80 802A9110 0C050529 */ jal create_icon -/* 427B84 802A9114 00000000 */ nop +/* 427B84 802A9114 00000000 */ nop /* 427B88 802A9118 0040802D */ daddu $s0, $v0, $zero /* 427B8C 802A911C 86250056 */ lh $a1, 0x56($s1) /* 427B90 802A9120 86260058 */ lh $a2, 0x58($s1) diff --git a/asm/nonmatchings/code_427A70/func_802A9170_427BE0.s b/asm/nonmatchings/code_427A70/func_802A9170_427BE0.s index b7cce3aac1..057c55ed05 100644 --- a/asm/nonmatchings/code_427A70/func_802A9170_427BE0.s +++ b/asm/nonmatchings/code_427A70/func_802A9170_427BE0.s @@ -18,7 +18,7 @@ glabel func_802A9170_427BE0 /* 427C14 802A91A4 10400030 */ beqz $v0, .L802A9268 /* 427C18 802A91A8 0240182D */ daddu $v1, $s2, $zero /* 427C1C 802A91AC 0C09A216 */ jal func_80268858 -/* 427C20 802A91B0 00000000 */ nop +/* 427C20 802A91B0 00000000 */ nop /* 427C24 802A91B4 8E050000 */ lw $a1, ($s0) /* 427C28 802A91B8 26100004 */ addiu $s0, $s0, 4 /* 427C2C 802A91BC 0C0B1EAF */ jal get_variable diff --git a/asm/nonmatchings/code_427A70/func_802A928C_427CFC.s b/asm/nonmatchings/code_427A70/func_802A928C_427CFC.s index b93fc1c3a8..cda227e054 100644 --- a/asm/nonmatchings/code_427A70/func_802A928C_427CFC.s +++ b/asm/nonmatchings/code_427A70/func_802A928C_427CFC.s @@ -15,11 +15,12 @@ glabel func_802A928C_427CFC /* 427D24 802A92B4 2C62000D */ sltiu $v0, $v1, 0xd /* 427D28 802A92B8 10400106 */ beqz $v0, .L802A96D4 /* 427D2C 802A92BC 00031080 */ sll $v0, $v1, 2 -/* 427D30 802A92C0 3C01802B */ lui $at, %hi(D_802A9830) +/* 427D30 802A92C0 3C01802B */ lui $at, %hi(jtbl_802A9830_4282A0) /* 427D34 802A92C4 00220821 */ addu $at, $at, $v0 -/* 427D38 802A92C8 8C229830 */ lw $v0, %lo(D_802A9830)($at) +/* 427D38 802A92C8 8C229830 */ lw $v0, %lo(jtbl_802A9830_4282A0)($at) /* 427D3C 802A92CC 00400008 */ jr $v0 -/* 427D40 802A92D0 00000000 */ nop +/* 427D40 802A92D0 00000000 */ nop +glabel L802A92D4_427D44 /* 427D44 802A92D4 0C093EB1 */ jal set_popup_duration /* 427D48 802A92D8 24040063 */ addiu $a0, $zero, 0x63 /* 427D4C 802A92DC 8E300004 */ lw $s0, 4($s1) @@ -45,6 +46,7 @@ glabel func_802A928C_427CFC /* 427D94 802A9324 24020001 */ addiu $v0, $zero, 1 /* 427D98 802A9328 080AA5B5 */ j .L802A96D4 /* 427D9C 802A932C A622004C */ sh $v0, 0x4c($s1) +glabel L802A9330_427DA0 /* 427DA0 802A9330 0C093EB1 */ jal set_popup_duration /* 427DA4 802A9334 24040063 */ addiu $a0, $zero, 0x63 /* 427DA8 802A9338 96220056 */ lhu $v0, 0x56($s1) @@ -67,7 +69,8 @@ glabel func_802A928C_427CFC /* 427DE8 802A9378 0C051261 */ jal set_icon_render_pos /* 427DEC 802A937C 24C6001C */ addiu $a2, $a2, 0x1c /* 427DF0 802A9380 080AA5B5 */ j .L802A96D4 -/* 427DF4 802A9384 00000000 */ nop +/* 427DF4 802A9384 00000000 */ nop +glabel L802A9388_427DF8 /* 427DF8 802A9388 0C093EB1 */ jal set_popup_duration /* 427DFC 802A938C 24040063 */ addiu $a0, $zero, 0x63 /* 427E00 802A9390 8622004E */ lh $v0, 0x4e($s1) @@ -81,7 +84,7 @@ glabel func_802A928C_427CFC /* 427E1C 802A93AC 3C058011 */ lui $a1, %hi(D_80108B80) /* 427E20 802A93B0 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) /* 427E24 802A93B4 0C0511FF */ jal set_menu_icon_script -/* 427E28 802A93B8 00000000 */ nop +/* 427E28 802A93B8 00000000 */ nop /* 427E2C 802A93BC 3C048000 */ lui $a0, 0x8000 /* 427E30 802A93C0 34840041 */ ori $a0, $a0, 0x41 /* 427E34 802A93C4 0000282D */ daddu $a1, $zero, $zero @@ -93,11 +96,12 @@ glabel func_802A928C_427CFC /* 427E4C 802A93DC A6220054 */ sh $v0, 0x54($s1) /* 427E50 802A93E0 2402000B */ addiu $v0, $zero, 0xb /* 427E54 802A93E4 A622004C */ sh $v0, 0x4c($s1) +glabel L802A93E8_427E58 /* 427E58 802A93E8 0C093EB1 */ jal set_popup_duration /* 427E5C 802A93EC 24040063 */ addiu $a0, $zero, 0x63 /* 427E60 802A93F0 86220068 */ lh $v0, 0x68($s1) /* 427E64 802A93F4 14400021 */ bnez $v0, .L802A947C -/* 427E68 802A93F8 00000000 */ nop +/* 427E68 802A93F8 00000000 */ nop /* 427E6C 802A93FC 82220080 */ lb $v0, 0x80($s1) /* 427E70 802A9400 00021040 */ sll $v0, $v0, 1 /* 427E74 802A9404 02221021 */ addu $v0, $s1, $v0 @@ -111,7 +115,7 @@ glabel func_802A928C_427CFC /* 427E90 802A9420 14610004 */ bne $v1, $at, .L802A9434 /* 427E94 802A9424 3C018000 */ lui $at, 0x8000 /* 427E98 802A9428 14410002 */ bne $v0, $at, .L802A9434 -/* 427E9C 802A942C 00000000 */ nop +/* 427E9C 802A942C 00000000 */ nop /* 427EA0 802A9430 0006000D */ break 6 .L802A9434: /* 427EA4 802A9434 00001012 */ mflo $v0 @@ -145,12 +149,12 @@ glabel func_802A928C_427CFC /* 427F10 802A94A0 10600007 */ beqz $v1, .L802A94C0 /* 427F14 802A94A4 3C0451EB */ lui $a0, 0x51eb /* 427F18 802A94A8 080AA55B */ j .L802A956C -/* 427F1C 802A94AC 00000000 */ nop +/* 427F1C 802A94AC 00000000 */ nop .L802A94B0: /* 427F20 802A94B0 10620019 */ beq $v1, $v0, .L802A9518 /* 427F24 802A94B4 3C0451EB */ lui $a0, 0x51eb /* 427F28 802A94B8 080AA55B */ j .L802A956C -/* 427F2C 802A94BC 00000000 */ nop +/* 427F2C 802A94BC 00000000 */ nop .L802A94C0: /* 427F30 802A94C0 86220050 */ lh $v0, 0x50($s1) /* 427F34 802A94C4 8E430434 */ lw $v1, 0x434($s2) @@ -275,7 +279,7 @@ glabel func_802A928C_427CFC /* 4280EC 802A967C 14620004 */ bne $v1, $v0, .L802A9690 /* 4280F0 802A9680 3C048000 */ lui $a0, 0x8000 /* 4280F4 802A9684 0C09A458 */ jal func_80269160 -/* 4280F8 802A9688 00000000 */ nop +/* 4280F8 802A9688 00000000 */ nop /* 4280FC 802A968C 3C048000 */ lui $a0, 0x8000 .L802A9690: /* 428100 802A9690 0C05271B */ jal stop_sound @@ -287,6 +291,7 @@ glabel func_802A928C_427CFC /* 428118 802A96A8 2402000C */ addiu $v0, $zero, 0xc /* 42811C 802A96AC 080AA5B5 */ j .L802A96D4 /* 428120 802A96B0 A622004C */ sh $v0, 0x4c($s1) +glabel L802A96B4_428124 /* 428124 802A96B4 86220054 */ lh $v0, 0x54($s1) /* 428128 802A96B8 96230054 */ lhu $v1, 0x54($s1) /* 42812C 802A96BC 10400003 */ beqz $v0, .L802A96CC @@ -296,8 +301,9 @@ glabel func_802A928C_427CFC /* 428138 802A96C8 A6220054 */ sh $v0, 0x54($s1) .L802A96CC: /* 42813C 802A96CC 0C09A327 */ jal func_80268C9C -/* 428140 802A96D0 00000000 */ nop +/* 428140 802A96D0 00000000 */ nop .L802A96D4: +glabel L802A96D4_428144 /* 428144 802A96D4 8FBF001C */ lw $ra, 0x1c($sp) /* 428148 802A96D8 8FB20018 */ lw $s2, 0x18($sp) /* 42814C 802A96DC 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_427A70/func_802A96EC_42815C.s b/asm/nonmatchings/code_427A70/func_802A96EC_42815C.s index 87fe4df732..c13383145e 100644 --- a/asm/nonmatchings/code_427A70/func_802A96EC_42815C.s +++ b/asm/nonmatchings/code_427A70/func_802A96EC_42815C.s @@ -35,7 +35,7 @@ glabel func_802A96EC_42815C /* 4281D4 802A9764 0C09A1DC */ jal func_80268770 /* 4281D8 802A9768 00063403 */ sra $a2, $a2, 0x10 /* 4281DC 802A976C 080AA5EB */ j .L802A97AC -/* 4281E0 802A9770 00000000 */ nop +/* 4281E0 802A9770 00000000 */ nop .L802A9774: /* 4281E4 802A9774 96230044 */ lhu $v1, 0x44($s1) /* 4281E8 802A9778 3484851F */ ori $a0, $a0, 0x851f @@ -54,7 +54,7 @@ glabel func_802A96EC_42815C .L802A97AC: /* 42821C 802A97AC 8E24000C */ lw $a0, 0xc($s1) /* 428220 802A97B0 0C0511EA */ jal draw_icon_0 -/* 428224 802A97B4 00000000 */ nop +/* 428224 802A97B4 00000000 */ nop /* 428228 802A97B8 8FBF0020 */ lw $ra, 0x20($sp) /* 42822C 802A97BC 8FB1001C */ lw $s1, 0x1c($sp) /* 428230 802A97C0 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/nonmatchings/code_427A70/func_802A97CC_42823C.s b/asm/nonmatchings/code_427A70/func_802A97CC_42823C.s index fb6fd3e548..74e81d57f2 100644 --- a/asm/nonmatchings/code_427A70/func_802A97CC_42823C.s +++ b/asm/nonmatchings/code_427A70/func_802A97CC_42823C.s @@ -17,5 +17,5 @@ glabel func_802A97CC_42823C /* 42826C 802A97FC 8FB00010 */ lw $s0, 0x10($sp) /* 428270 802A9800 03E00008 */ jr $ra /* 428274 802A9804 27BD0018 */ addiu $sp, $sp, 0x18 -/* 428278 802A9808 00000000 */ nop -/* 42827C 802A980C 00000000 */ nop +/* 428278 802A9808 00000000 */ nop +/* 42827C 802A980C 00000000 */ nop diff --git a/asm/nonmatchings/code_4282E0/func_802A9000_4282E0.s b/asm/nonmatchings/code_4282E0/func_802A9000_4282E0.s index 4296877f97..e1b6166317 100644 --- a/asm/nonmatchings/code_4282E0/func_802A9000_4282E0.s +++ b/asm/nonmatchings/code_4282E0/func_802A9000_4282E0.s @@ -21,7 +21,7 @@ glabel func_802A9000_4282E0 /* 428320 802A9040 10400056 */ beqz $v0, .L802A919C /* 428324 802A9044 0200182D */ daddu $v1, $s0, $zero /* 428328 802A9048 0C09A216 */ jal func_80268858 -/* 42832C 802A904C 00000000 */ nop +/* 42832C 802A904C 00000000 */ nop /* 428330 802A9050 3C048011 */ lui $a0, %hi(D_80108B28) /* 428334 802A9054 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) /* 428338 802A9058 2402000C */ addiu $v0, $zero, 0xc @@ -54,7 +54,7 @@ glabel func_802A9000_4282E0 /* 4283A4 802A90C4 3C048011 */ lui $a0, %hi(D_80108AFC) /* 4283A8 802A90C8 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) /* 4283AC 802A90CC 0C050529 */ jal create_icon -/* 4283B0 802A90D0 00000000 */ nop +/* 4283B0 802A90D0 00000000 */ nop /* 4283B4 802A90D4 0040802D */ daddu $s0, $v0, $zero /* 4283B8 802A90D8 86250056 */ lh $a1, 0x56($s1) /* 4283BC 802A90DC 86260058 */ lh $a2, 0x58($s1) @@ -71,7 +71,7 @@ glabel func_802A9000_4282E0 /* 4283E8 802A9108 3C048029 */ lui $a0, %hi(D_80292BAC) /* 4283EC 802A910C 24842BAC */ addiu $a0, $a0, %lo(D_80292BAC) /* 4283F0 802A9110 0C050529 */ jal create_icon -/* 4283F4 802A9114 00000000 */ nop +/* 4283F4 802A9114 00000000 */ nop /* 4283F8 802A9118 0040802D */ daddu $s0, $v0, $zero /* 4283FC 802A911C 86250056 */ lh $a1, 0x56($s1) /* 428400 802A9120 86260058 */ lh $a2, 0x58($s1) @@ -88,7 +88,7 @@ glabel func_802A9000_4282E0 /* 42842C 802A914C 3C048029 */ lui $a0, %hi(D_8029275C) /* 428430 802A9150 2484275C */ addiu $a0, $a0, %lo(D_8029275C) /* 428434 802A9154 0C050529 */ jal create_icon -/* 428438 802A9158 00000000 */ nop +/* 428438 802A9158 00000000 */ nop /* 42843C 802A915C 0040802D */ daddu $s0, $v0, $zero /* 428440 802A9160 86250056 */ lh $a1, 0x56($s1) /* 428444 802A9164 86260058 */ lh $a2, 0x58($s1) diff --git a/asm/nonmatchings/code_4282E0/func_802A91B8_428498.s b/asm/nonmatchings/code_4282E0/func_802A91B8_428498.s index 712b9ec31b..deb2ae6ca7 100644 --- a/asm/nonmatchings/code_4282E0/func_802A91B8_428498.s +++ b/asm/nonmatchings/code_4282E0/func_802A91B8_428498.s @@ -18,7 +18,7 @@ glabel func_802A91B8_428498 /* 4284CC 802A91EC 10400030 */ beqz $v0, .L802A92B0 /* 4284D0 802A91F0 0240182D */ daddu $v1, $s2, $zero /* 4284D4 802A91F4 0C09A216 */ jal func_80268858 -/* 4284D8 802A91F8 00000000 */ nop +/* 4284D8 802A91F8 00000000 */ nop /* 4284DC 802A91FC 8E050000 */ lw $a1, ($s0) /* 4284E0 802A9200 26100004 */ addiu $s0, $s0, 4 /* 4284E4 802A9204 0C0B1EAF */ jal get_variable diff --git a/asm/nonmatchings/code_4282E0/func_802A92D4_4285B4.s b/asm/nonmatchings/code_4282E0/func_802A92D4_4285B4.s index 363d803e83..34361b4ea6 100644 --- a/asm/nonmatchings/code_4282E0/func_802A92D4_4285B4.s +++ b/asm/nonmatchings/code_4282E0/func_802A92D4_4285B4.s @@ -14,11 +14,12 @@ glabel func_802A92D4_4285B4 /* 4285D8 802A92F8 2C62000D */ sltiu $v0, $v1, 0xd /* 4285DC 802A92FC 104000D4 */ beqz $v0, .L802A9650 /* 4285E0 802A9300 00031080 */ sll $v0, $v1, 2 -/* 4285E4 802A9304 3C01802B */ lui $at, %hi(D_802A9750) +/* 4285E4 802A9304 3C01802B */ lui $at, %hi(jtbl_802A9750_428A30) /* 4285E8 802A9308 00220821 */ addu $at, $at, $v0 -/* 4285EC 802A930C 8C229750 */ lw $v0, %lo(D_802A9750)($at) +/* 4285EC 802A930C 8C229750 */ lw $v0, %lo(jtbl_802A9750_428A30)($at) /* 4285F0 802A9310 00400008 */ jr $v0 -/* 4285F4 802A9314 00000000 */ nop +/* 4285F4 802A9314 00000000 */ nop +glabel L802A9318_4285F8 /* 4285F8 802A9318 0C093EB1 */ jal set_popup_duration /* 4285FC 802A931C 24040063 */ addiu $a0, $zero, 0x63 /* 428600 802A9320 8E300004 */ lw $s0, 4($s1) @@ -64,6 +65,7 @@ glabel func_802A92D4_4285B4 /* 428690 802A93B0 24020001 */ addiu $v0, $zero, 1 /* 428694 802A93B4 080AA594 */ j .L802A9650 /* 428698 802A93B8 A622004C */ sh $v0, 0x4c($s1) +glabel L802A93BC_42869C /* 42869C 802A93BC 0C093EB1 */ jal set_popup_duration /* 4286A0 802A93C0 24040063 */ addiu $a0, $zero, 0x63 /* 4286A4 802A93C4 96220056 */ lhu $v0, 0x56($s1) @@ -98,7 +100,8 @@ glabel func_802A92D4_4285B4 /* 428714 802A9434 0C051261 */ jal set_icon_render_pos /* 428718 802A9438 24C60018 */ addiu $a2, $a2, 0x18 /* 42871C 802A943C 080AA594 */ j .L802A9650 -/* 428720 802A9440 00000000 */ nop +/* 428720 802A9440 00000000 */ nop +glabel L802A9444_428724 /* 428724 802A9444 0C093EB1 */ jal set_popup_duration /* 428728 802A9448 24040063 */ addiu $a0, $zero, 0x63 /* 42872C 802A944C 8622004E */ lh $v0, 0x4e($s1) @@ -112,7 +115,7 @@ glabel func_802A92D4_4285B4 /* 428748 802A9468 3C058011 */ lui $a1, %hi(D_80108B54) /* 42874C 802A946C 24A58B54 */ addiu $a1, $a1, %lo(D_80108B54) /* 428750 802A9470 0C0511FF */ jal set_menu_icon_script -/* 428754 802A9474 00000000 */ nop +/* 428754 802A9474 00000000 */ nop /* 428758 802A9478 3C048000 */ lui $a0, 0x8000 /* 42875C 802A947C 34840041 */ ori $a0, $a0, 0x41 /* 428760 802A9480 0000282D */ daddu $a1, $zero, $zero @@ -125,6 +128,7 @@ glabel func_802A92D4_4285B4 /* 42877C 802A949C A6220054 */ sh $v0, 0x54($s1) /* 428780 802A94A0 2402000B */ addiu $v0, $zero, 0xb /* 428784 802A94A4 A622004C */ sh $v0, 0x4c($s1) +glabel L802A94A8_428788 /* 428788 802A94A8 0C093EB1 */ jal set_popup_duration /* 42878C 802A94AC 24040063 */ addiu $a0, $zero, 0x63 /* 428790 802A94B0 8E020210 */ lw $v0, 0x210($s0) @@ -152,7 +156,7 @@ glabel func_802A92D4_4285B4 /* 4287E4 802A9504 3C058011 */ lui $a1, %hi(D_80108B28) /* 4287E8 802A9508 24A58B28 */ addiu $a1, $a1, %lo(D_80108B28) /* 4287EC 802A950C 0C0511FF */ jal set_menu_icon_script -/* 4287F0 802A9510 00000000 */ nop +/* 4287F0 802A9510 00000000 */ nop /* 4287F4 802A9514 86220068 */ lh $v0, 0x68($s1) /* 4287F8 802A9518 14400006 */ bnez $v0, .L802A9534 /* 4287FC 802A951C 3C0451EB */ lui $a0, 0x51eb @@ -217,7 +221,7 @@ glabel func_802A92D4_4285B4 /* 4288D8 802A95F8 14620003 */ bne $v1, $v0, .L802A9608 /* 4288DC 802A95FC A2000086 */ sb $zero, 0x86($s0) /* 4288E0 802A9600 0C09A458 */ jal func_80269160 -/* 4288E4 802A9604 00000000 */ nop +/* 4288E4 802A9604 00000000 */ nop .L802A9608: /* 4288E8 802A9608 0C093EB1 */ jal set_popup_duration /* 4288EC 802A960C 0000202D */ daddu $a0, $zero, $zero @@ -229,6 +233,7 @@ glabel func_802A92D4_4285B4 /* 428904 802A9624 2402000C */ addiu $v0, $zero, 0xc /* 428908 802A9628 080AA594 */ j .L802A9650 /* 42890C 802A962C A622004C */ sh $v0, 0x4c($s1) +glabel L802A9630_428910 /* 428910 802A9630 86220054 */ lh $v0, 0x54($s1) /* 428914 802A9634 96230054 */ lhu $v1, 0x54($s1) /* 428918 802A9638 10400003 */ beqz $v0, .L802A9648 @@ -237,8 +242,9 @@ glabel func_802A92D4_4285B4 /* 428924 802A9644 A6220054 */ sh $v0, 0x54($s1) .L802A9648: /* 428928 802A9648 0C09A327 */ jal func_80268C9C -/* 42892C 802A964C 00000000 */ nop +/* 42892C 802A964C 00000000 */ nop .L802A9650: +glabel L802A9650_428930 /* 428930 802A9650 8FBF0018 */ lw $ra, 0x18($sp) /* 428934 802A9654 8FB10014 */ lw $s1, 0x14($sp) /* 428938 802A9658 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_4282E0/func_802A9664_428944.s b/asm/nonmatchings/code_4282E0/func_802A9664_428944.s index 0fbbb413a0..54ec614cdc 100644 --- a/asm/nonmatchings/code_4282E0/func_802A9664_428944.s +++ b/asm/nonmatchings/code_4282E0/func_802A9664_428944.s @@ -19,7 +19,7 @@ glabel func_802A9664_428944 /* 42897C 802A969C 27A60014 */ addiu $a2, $sp, 0x14 /* 428980 802A96A0 8E240010 */ lw $a0, 0x10($s1) /* 428984 802A96A4 0C0511EA */ jal draw_icon_0 -/* 428988 802A96A8 00000000 */ nop +/* 428988 802A96A8 00000000 */ nop /* 42898C 802A96AC 3C0451EB */ lui $a0, 0x51eb /* 428990 802A96B0 96230044 */ lhu $v1, 0x44($s1) /* 428994 802A96B4 3484851F */ ori $a0, $a0, 0x851f @@ -37,7 +37,7 @@ glabel func_802A9664_428944 /* 4289C4 802A96E4 00063403 */ sra $a2, $a2, 0x10 /* 4289C8 802A96E8 8E24000C */ lw $a0, 0xc($s1) /* 4289CC 802A96EC 0C0511EA */ jal draw_icon_0 -/* 4289D0 802A96F0 00000000 */ nop +/* 4289D0 802A96F0 00000000 */ nop /* 4289D4 802A96F4 8FBF0020 */ lw $ra, 0x20($sp) /* 4289D8 802A96F8 8FB1001C */ lw $s1, 0x1c($sp) /* 4289DC 802A96FC 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/nonmatchings/code_4282E0/func_802A9708_4289E8.s b/asm/nonmatchings/code_4282E0/func_802A9708_4289E8.s index 9a933d056b..869a32d675 100644 --- a/asm/nonmatchings/code_4282E0/func_802A9708_4289E8.s +++ b/asm/nonmatchings/code_4282E0/func_802A9708_4289E8.s @@ -19,4 +19,4 @@ glabel func_802A9708_4289E8 /* 428A20 802A9740 8FB00010 */ lw $s0, 0x10($sp) /* 428A24 802A9744 03E00008 */ jr $ra /* 428A28 802A9748 27BD0018 */ addiu $sp, $sp, 0x18 -/* 428A2C 802A974C 00000000 */ nop +/* 428A2C 802A974C 00000000 */ nop diff --git a/asm/nonmatchings/code_428A70/func_802A9000_428A70.s b/asm/nonmatchings/code_428A70/func_802A9000_428A70.s index 163a81a652..3ac9f57ba9 100644 --- a/asm/nonmatchings/code_428A70/func_802A9000_428A70.s +++ b/asm/nonmatchings/code_428A70/func_802A9000_428A70.s @@ -61,7 +61,7 @@ glabel func_802A9000_428A70 /* 428B50 802A90E0 3C048011 */ lui $a0, %hi(D_80108AFC) /* 428B54 802A90E4 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) /* 428B58 802A90E8 0C050529 */ jal create_icon -/* 428B5C 802A90EC 00000000 */ nop +/* 428B5C 802A90EC 00000000 */ nop /* 428B60 802A90F0 0040882D */ daddu $s1, $v0, $zero /* 428B64 802A90F4 86050056 */ lh $a1, 0x56($s0) /* 428B68 802A90F8 86060058 */ lh $a2, 0x58($s0) @@ -78,7 +78,7 @@ glabel func_802A9000_428A70 /* 428B94 802A9124 3C048029 */ lui $a0, %hi(D_80292974) /* 428B98 802A9128 24842974 */ addiu $a0, $a0, %lo(D_80292974) /* 428B9C 802A912C 0C050529 */ jal create_icon -/* 428BA0 802A9130 00000000 */ nop +/* 428BA0 802A9130 00000000 */ nop /* 428BA4 802A9134 0040882D */ daddu $s1, $v0, $zero /* 428BA8 802A9138 86050056 */ lh $a1, 0x56($s0) /* 428BAC 802A913C 86060058 */ lh $a2, 0x58($s0) diff --git a/asm/nonmatchings/code_428A70/func_802A9278_428CE8.s b/asm/nonmatchings/code_428A70/func_802A9278_428CE8.s index 20e2e8ccaf..ce2c72b7ee 100644 --- a/asm/nonmatchings/code_428A70/func_802A9278_428CE8.s +++ b/asm/nonmatchings/code_428A70/func_802A9278_428CE8.s @@ -15,11 +15,12 @@ glabel func_802A9278_428CE8 /* 428D10 802A92A0 2C62000D */ sltiu $v0, $v1, 0xd /* 428D14 802A92A4 1040010B */ beqz $v0, .L802A96D4 /* 428D18 802A92A8 00031080 */ sll $v0, $v1, 2 -/* 428D1C 802A92AC 3C01802B */ lui $at, %hi(D_802A9870) +/* 428D1C 802A92AC 3C01802B */ lui $at, %hi(jtbl_802A9870_4292E0) /* 428D20 802A92B0 00220821 */ addu $at, $at, $v0 -/* 428D24 802A92B4 8C229870 */ lw $v0, %lo(D_802A9870)($at) +/* 428D24 802A92B4 8C229870 */ lw $v0, %lo(jtbl_802A9870_4292E0)($at) /* 428D28 802A92B8 00400008 */ jr $v0 -/* 428D2C 802A92BC 00000000 */ nop +/* 428D2C 802A92BC 00000000 */ nop +glabel L802A92C0_428D30 /* 428D30 802A92C0 0C093EB1 */ jal set_popup_duration /* 428D34 802A92C4 24040063 */ addiu $a0, $zero, 0x63 /* 428D38 802A92C8 8E300004 */ lw $s0, 4($s1) @@ -45,6 +46,7 @@ glabel func_802A9278_428CE8 /* 428D80 802A9310 24020001 */ addiu $v0, $zero, 1 /* 428D84 802A9314 080AA5B5 */ j .L802A96D4 /* 428D88 802A9318 A622004C */ sh $v0, 0x4c($s1) +glabel L802A931C_428D8C /* 428D8C 802A931C 0C093EB1 */ jal set_popup_duration /* 428D90 802A9320 24040063 */ addiu $a0, $zero, 0x63 /* 428D94 802A9324 8622006C */ lh $v0, 0x6c($s1) @@ -74,7 +76,8 @@ glabel func_802A9278_428CE8 /* 428DEC 802A937C 0C051261 */ jal set_icon_render_pos /* 428DF0 802A9380 24C6001C */ addiu $a2, $a2, 0x1c /* 428DF4 802A9384 080AA5B5 */ j .L802A96D4 -/* 428DF8 802A9388 00000000 */ nop +/* 428DF8 802A9388 00000000 */ nop +glabel L802A938C_428DFC /* 428DFC 802A938C 0C093EB1 */ jal set_popup_duration /* 428E00 802A9390 24040063 */ addiu $a0, $zero, 0x63 /* 428E04 802A9394 8622004E */ lh $v0, 0x4e($s1) @@ -88,7 +91,7 @@ glabel func_802A9278_428CE8 /* 428E20 802A93B0 3C058011 */ lui $a1, %hi(D_80108B80) /* 428E24 802A93B4 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) /* 428E28 802A93B8 0C0511FF */ jal set_menu_icon_script -/* 428E2C 802A93BC 00000000 */ nop +/* 428E2C 802A93BC 00000000 */ nop /* 428E30 802A93C0 3C048000 */ lui $a0, 0x8000 /* 428E34 802A93C4 34840041 */ ori $a0, $a0, 0x41 /* 428E38 802A93C8 0000282D */ daddu $a1, $zero, $zero @@ -102,14 +105,15 @@ glabel func_802A9278_428CE8 /* 428E58 802A93E8 A6220054 */ sh $v0, 0x54($s1) /* 428E5C 802A93EC 2402000B */ addiu $v0, $zero, 0xb /* 428E60 802A93F0 A622004C */ sh $v0, 0x4c($s1) +glabel L802A93F4_428E64 /* 428E64 802A93F4 0C093EB1 */ jal set_popup_duration /* 428E68 802A93F8 24040063 */ addiu $a0, $zero, 0x63 /* 428E6C 802A93FC 86220068 */ lh $v0, 0x68($s1) /* 428E70 802A9400 14400027 */ bnez $v0, .L802A94A0 -/* 428E74 802A9404 00000000 */ nop +/* 428E74 802A9404 00000000 */ nop /* 428E78 802A9408 8622005A */ lh $v0, 0x5a($s1) /* 428E7C 802A940C 1040001E */ beqz $v0, .L802A9488 -/* 428E80 802A9410 00000000 */ nop +/* 428E80 802A9410 00000000 */ nop /* 428E84 802A9414 82220080 */ lb $v0, 0x80($s1) /* 428E88 802A9418 00021040 */ sll $v0, $v0, 1 /* 428E8C 802A941C 02221021 */ addu $v0, $s1, $v0 @@ -123,7 +127,7 @@ glabel func_802A9278_428CE8 /* 428EA8 802A9438 14610004 */ bne $v1, $at, .L802A944C /* 428EAC 802A943C 3C018000 */ lui $at, 0x8000 /* 428EB0 802A9440 14410002 */ bne $v0, $at, .L802A944C -/* 428EB4 802A9444 00000000 */ nop +/* 428EB4 802A9444 00000000 */ nop /* 428EB8 802A9448 0006000D */ break 6 .L802A944C: /* 428EBC 802A944C 00001012 */ mflo $v0 @@ -152,14 +156,14 @@ glabel func_802A9278_428CE8 .L802A94A0: /* 428F10 802A94A0 82420083 */ lb $v0, 0x83($s2) /* 428F14 802A94A4 10400029 */ beqz $v0, .L802A954C -/* 428F18 802A94A8 00000000 */ nop +/* 428F18 802A94A8 00000000 */ nop /* 428F1C 802A94AC 8E420214 */ lw $v0, 0x214($s2) /* 428F20 802A94B0 30428000 */ andi $v0, $v0, 0x8000 /* 428F24 802A94B4 10400025 */ beqz $v0, .L802A954C -/* 428F28 802A94B8 00000000 */ nop +/* 428F28 802A94B8 00000000 */ nop /* 428F2C 802A94BC 8625005A */ lh $a1, 0x5a($s1) /* 428F30 802A94C0 10A00019 */ beqz $a1, .L802A9528 -/* 428F34 802A94C4 00000000 */ nop +/* 428F34 802A94C4 00000000 */ nop /* 428F38 802A94C8 86240050 */ lh $a0, 0x50($s1) /* 428F3C 802A94CC 8E420434 */ lw $v0, 0x434($s2) /* 428F40 802A94D0 00042080 */ sll $a0, $a0, 2 @@ -269,9 +273,9 @@ glabel func_802A9278_428CE8 /* 4290C0 802A9650 82430081 */ lb $v1, 0x81($s2) /* 4290C4 802A9654 24020001 */ addiu $v0, $zero, 1 /* 4290C8 802A9658 14620003 */ bne $v1, $v0, .L802A9668 -/* 4290CC 802A965C 00000000 */ nop +/* 4290CC 802A965C 00000000 */ nop /* 4290D0 802A9660 0C09A458 */ jal func_80269160 -/* 4290D4 802A9664 00000000 */ nop +/* 4290D4 802A9664 00000000 */ nop .L802A9668: /* 4290D8 802A9668 0C093EB1 */ jal set_popup_duration /* 4290DC 802A966C 0000202D */ daddu $a0, $zero, $zero @@ -283,9 +287,10 @@ glabel func_802A9278_428CE8 /* 4290F4 802A9684 2402000C */ addiu $v0, $zero, 0xc /* 4290F8 802A9688 080AA5B5 */ j .L802A96D4 /* 4290FC 802A968C A622004C */ sh $v0, 0x4c($s1) +glabel L802A9690_429100 /* 429100 802A9690 8622005A */ lh $v0, 0x5a($s1) /* 429104 802A9694 14400007 */ bnez $v0, .L802A96B4 -/* 429108 802A9698 00000000 */ nop +/* 429108 802A9698 00000000 */ nop /* 42910C 802A969C 96220044 */ lhu $v0, 0x44($s1) /* 429110 802A96A0 2442FF9C */ addiu $v0, $v0, -0x64 /* 429114 802A96A4 A6220044 */ sh $v0, 0x44($s1) @@ -302,8 +307,9 @@ glabel func_802A9278_428CE8 /* 429138 802A96C8 A6220054 */ sh $v0, 0x54($s1) .L802A96CC: /* 42913C 802A96CC 0C09A327 */ jal func_80268C9C -/* 429140 802A96D0 00000000 */ nop +/* 429140 802A96D0 00000000 */ nop .L802A96D4: +glabel L802A96D4_429144 /* 429144 802A96D4 8FBF001C */ lw $ra, 0x1c($sp) /* 429148 802A96D8 8FB20018 */ lw $s2, 0x18($sp) /* 42914C 802A96DC 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_428A70/func_802A96EC_42915C.s b/asm/nonmatchings/code_428A70/func_802A96EC_42915C.s index f994d0dcd5..308137a5b5 100644 --- a/asm/nonmatchings/code_428A70/func_802A96EC_42915C.s +++ b/asm/nonmatchings/code_428A70/func_802A96EC_42915C.s @@ -13,7 +13,7 @@ glabel func_802A96EC_42915C /* 42917C 802A970C AFB00018 */ sw $s0, 0x18($sp) /* 429180 802A9710 8E240004 */ lw $a0, 4($s1) /* 429184 802A9714 0C0511EA */ jal draw_icon_0 -/* 429188 802A9718 00000000 */ nop +/* 429188 802A9718 00000000 */ nop .L802A971C: /* 42918C 802A971C 8E300008 */ lw $s0, 8($s1) /* 429190 802A9720 0C0511EA */ jal draw_icon_0 @@ -55,7 +55,7 @@ glabel func_802A96EC_42915C /* 429218 802A97A8 0C09A1E6 */ jal func_80268798 /* 42921C 802A97AC 00063403 */ sra $a2, $a2, 0x10 /* 429220 802A97B0 080AA5FC */ j .L802A97F0 -/* 429224 802A97B4 00000000 */ nop +/* 429224 802A97B4 00000000 */ nop .L802A97B8: /* 429228 802A97B8 96230044 */ lhu $v1, 0x44($s1) /* 42922C 802A97BC 00031C00 */ sll $v1, $v1, 0x10 @@ -74,7 +74,7 @@ glabel func_802A96EC_42915C .L802A97F0: /* 429260 802A97F0 8E24000C */ lw $a0, 0xc($s1) /* 429264 802A97F4 0C0511EA */ jal draw_icon_0 -/* 429268 802A97F8 00000000 */ nop +/* 429268 802A97F8 00000000 */ nop /* 42926C 802A97FC 8FBF0020 */ lw $ra, 0x20($sp) /* 429270 802A9800 8FB1001C */ lw $s1, 0x1c($sp) /* 429274 802A9804 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/nonmatchings/code_428A70/func_802A9810_429280.s b/asm/nonmatchings/code_428A70/func_802A9810_429280.s index 2bd68c2b4b..79bac2fff7 100644 --- a/asm/nonmatchings/code_428A70/func_802A9810_429280.s +++ b/asm/nonmatchings/code_428A70/func_802A9810_429280.s @@ -17,4 +17,4 @@ glabel func_802A9810_429280 /* 4292B0 802A9840 8FB00010 */ lw $s0, 0x10($sp) /* 4292B4 802A9844 03E00008 */ jr $ra /* 4292B8 802A9848 27BD0018 */ addiu $sp, $sp, 0x18 -/* 4292BC 802A984C 00000000 */ nop +/* 4292BC 802A984C 00000000 */ nop diff --git a/asm/nonmatchings/code_429320/func_802A9000_429320.s b/asm/nonmatchings/code_429320/func_802A9000_429320.s index 3095f5d408..4e2b1f99ab 100644 --- a/asm/nonmatchings/code_429320/func_802A9000_429320.s +++ b/asm/nonmatchings/code_429320/func_802A9000_429320.s @@ -21,7 +21,7 @@ glabel func_802A9000_429320 /* 429360 802A9040 10400046 */ beqz $v0, .L802A915C /* 429364 802A9044 0200182D */ daddu $v1, $s0, $zero /* 429368 802A9048 0C09A216 */ jal func_80268858 -/* 42936C 802A904C 00000000 */ nop +/* 42936C 802A904C 00000000 */ nop /* 429370 802A9050 3C048011 */ lui $a0, %hi(D_80108E1C) /* 429374 802A9054 24848E1C */ addiu $a0, $a0, %lo(D_80108E1C) /* 429378 802A9058 2402000E */ addiu $v0, $zero, 0xe @@ -56,7 +56,7 @@ glabel func_802A9000_429320 /* 4293EC 802A90CC 3C048011 */ lui $a0, %hi(D_80108AFC) /* 4293F0 802A90D0 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) /* 4293F4 802A90D4 0C050529 */ jal create_icon -/* 4293F8 802A90D8 00000000 */ nop +/* 4293F8 802A90D8 00000000 */ nop /* 4293FC 802A90DC 0040802D */ daddu $s0, $v0, $zero /* 429400 802A90E0 86250056 */ lh $a1, 0x56($s1) /* 429404 802A90E4 86260058 */ lh $a2, 0x58($s1) @@ -73,7 +73,7 @@ glabel func_802A9000_429320 /* 429430 802A9110 3C048029 */ lui $a0, %hi(D_80292974) /* 429434 802A9114 24842974 */ addiu $a0, $a0, %lo(D_80292974) /* 429438 802A9118 0C050529 */ jal create_icon -/* 42943C 802A911C 00000000 */ nop +/* 42943C 802A911C 00000000 */ nop /* 429440 802A9120 0040802D */ daddu $s0, $v0, $zero /* 429444 802A9124 86250056 */ lh $a1, 0x56($s1) /* 429448 802A9128 86260058 */ lh $a2, 0x58($s1) diff --git a/asm/nonmatchings/code_429320/func_802A9178_429498.s b/asm/nonmatchings/code_429320/func_802A9178_429498.s index c25418cf92..a2d0143c5f 100644 --- a/asm/nonmatchings/code_429320/func_802A9178_429498.s +++ b/asm/nonmatchings/code_429320/func_802A9178_429498.s @@ -18,7 +18,7 @@ glabel func_802A9178_429498 /* 4294CC 802A91AC 10400030 */ beqz $v0, .L802A9270 /* 4294D0 802A91B0 0240182D */ daddu $v1, $s2, $zero /* 4294D4 802A91B4 0C09A216 */ jal func_80268858 -/* 4294D8 802A91B8 00000000 */ nop +/* 4294D8 802A91B8 00000000 */ nop /* 4294DC 802A91BC 8E050000 */ lw $a1, ($s0) /* 4294E0 802A91C0 26100004 */ addiu $s0, $s0, 4 /* 4294E4 802A91C4 0C0B1EAF */ jal get_variable diff --git a/asm/nonmatchings/code_429320/func_802A9294_4295B4.s b/asm/nonmatchings/code_429320/func_802A9294_4295B4.s index f35770ffe7..5a5d4ec166 100644 --- a/asm/nonmatchings/code_429320/func_802A9294_4295B4.s +++ b/asm/nonmatchings/code_429320/func_802A9294_4295B4.s @@ -17,11 +17,12 @@ glabel func_802A9294_4295B4 /* 4295E4 802A92C4 2C62000D */ sltiu $v0, $v1, 0xd /* 4295E8 802A92C8 10400159 */ beqz $v0, .L802A9830 /* 4295EC 802A92CC 00031080 */ sll $v0, $v1, 2 -/* 4295F0 802A92D0 3C01802B */ lui $at, %hi(D_802A99C0) +/* 4295F0 802A92D0 3C01802B */ lui $at, %hi(jtbl_802A99C0_429CE0) /* 4295F4 802A92D4 00220821 */ addu $at, $at, $v0 -/* 4295F8 802A92D8 8C2299C0 */ lw $v0, %lo(D_802A99C0)($at) +/* 4295F8 802A92D8 8C2299C0 */ lw $v0, %lo(jtbl_802A99C0_429CE0)($at) /* 4295FC 802A92DC 00400008 */ jr $v0 -/* 429600 802A92E0 00000000 */ nop +/* 429600 802A92E0 00000000 */ nop +glabel L802A92E4_429604 /* 429604 802A92E4 0C093EB1 */ jal set_popup_duration /* 429608 802A92E8 24040063 */ addiu $a0, $zero, 0x63 /* 42960C 802A92EC 8E300004 */ lw $s0, 4($s1) @@ -47,6 +48,7 @@ glabel func_802A9294_4295B4 /* 429654 802A9334 24020001 */ addiu $v0, $zero, 1 /* 429658 802A9338 080AA60C */ j .L802A9830 /* 42965C 802A933C A622004C */ sh $v0, 0x4c($s1) +glabel L802A9340_429660 /* 429660 802A9340 0C093EB1 */ jal set_popup_duration /* 429664 802A9344 24040063 */ addiu $a0, $zero, 0x63 /* 429668 802A9348 8622006C */ lh $v0, 0x6c($s1) @@ -76,7 +78,8 @@ glabel func_802A9294_4295B4 /* 4296C0 802A93A0 0C051261 */ jal set_icon_render_pos /* 4296C4 802A93A4 24C6001C */ addiu $a2, $a2, 0x1c /* 4296C8 802A93A8 080AA60C */ j .L802A9830 -/* 4296CC 802A93AC 00000000 */ nop +/* 4296CC 802A93AC 00000000 */ nop +glabel L802A93B0_4296D0 /* 4296D0 802A93B0 0C093EB1 */ jal set_popup_duration /* 4296D4 802A93B4 24040063 */ addiu $a0, $zero, 0x63 /* 4296D8 802A93B8 8622004E */ lh $v0, 0x4e($s1) @@ -90,7 +93,7 @@ glabel func_802A9294_4295B4 /* 4296F4 802A93D4 3C058011 */ lui $a1, %hi(D_80108F30) /* 4296F8 802A93D8 24A58F30 */ addiu $a1, $a1, %lo(D_80108F30) /* 4296FC 802A93DC 0C0511FF */ jal set_menu_icon_script -/* 429700 802A93E0 00000000 */ nop +/* 429700 802A93E0 00000000 */ nop /* 429704 802A93E4 3C048000 */ lui $a0, 0x8000 /* 429708 802A93E8 34840041 */ ori $a0, $a0, 0x41 /* 42970C 802A93EC 0000282D */ daddu $a1, $zero, $zero @@ -104,11 +107,12 @@ glabel func_802A9294_4295B4 /* 42972C 802A940C A6220054 */ sh $v0, 0x54($s1) /* 429730 802A9410 2402000B */ addiu $v0, $zero, 0xb /* 429734 802A9414 A622004C */ sh $v0, 0x4c($s1) +glabel L802A9418_429738 /* 429738 802A9418 0C093EB1 */ jal set_popup_duration /* 42973C 802A941C 24040063 */ addiu $a0, $zero, 0x63 /* 429740 802A9420 86220068 */ lh $v0, 0x68($s1) /* 429744 802A9424 1440005F */ bnez $v0, .L802A95A4 -/* 429748 802A9428 00000000 */ nop +/* 429748 802A9428 00000000 */ nop /* 42974C 802A942C 82220080 */ lb $v0, 0x80($s1) /* 429750 802A9430 00021040 */ sll $v0, $v0, 1 /* 429754 802A9434 02221021 */ addu $v0, $s1, $v0 @@ -122,7 +126,7 @@ glabel func_802A9294_4295B4 /* 429770 802A9450 14610004 */ bne $v1, $at, .L802A9464 /* 429774 802A9454 3C018000 */ lui $at, 0x8000 /* 429778 802A9458 14410002 */ bne $v0, $at, .L802A9464 -/* 42977C 802A945C 00000000 */ nop +/* 42977C 802A945C 00000000 */ nop /* 429780 802A9460 0006000D */ break 6 .L802A9464: /* 429784 802A9464 00001012 */ mflo $v0 @@ -261,14 +265,14 @@ glabel func_802A9294_4295B4 /* 429980 802A9660 10400005 */ beqz $v0, .L802A9678 /* 429984 802A9664 24020002 */ addiu $v0, $zero, 2 /* 429988 802A9668 10600007 */ beqz $v1, .L802A9688 -/* 42998C 802A966C 00000000 */ nop +/* 42998C 802A966C 00000000 */ nop /* 429990 802A9670 080AA5D7 */ j .L802A975C -/* 429994 802A9674 00000000 */ nop +/* 429994 802A9674 00000000 */ nop .L802A9678: /* 429998 802A9678 1062001F */ beq $v1, $v0, .L802A96F8 -/* 42999C 802A967C 00000000 */ nop +/* 42999C 802A967C 00000000 */ nop /* 4299A0 802A9680 080AA5D7 */ j .L802A975C -/* 4299A4 802A9684 00000000 */ nop +/* 4299A4 802A9684 00000000 */ nop .L802A9688: /* 4299A8 802A9688 82420085 */ lb $v0, 0x85($s2) /* 4299AC 802A968C 82430084 */ lb $v1, 0x84($s2) @@ -362,9 +366,9 @@ glabel func_802A9294_4295B4 /* 429AF0 802A97D0 82430081 */ lb $v1, 0x81($s2) /* 429AF4 802A97D4 24020064 */ addiu $v0, $zero, 0x64 /* 429AF8 802A97D8 14620003 */ bne $v1, $v0, .L802A97E8 -/* 429AFC 802A97DC 00000000 */ nop +/* 429AFC 802A97DC 00000000 */ nop /* 429B00 802A97E0 0C09A458 */ jal func_80269160 -/* 429B04 802A97E4 00000000 */ nop +/* 429B04 802A97E4 00000000 */ nop .L802A97E8: /* 429B08 802A97E8 0C093EB1 */ jal set_popup_duration /* 429B0C 802A97EC 0000202D */ daddu $a0, $zero, $zero @@ -376,6 +380,7 @@ glabel func_802A9294_4295B4 /* 429B24 802A9804 2402000C */ addiu $v0, $zero, 0xc /* 429B28 802A9808 080AA60C */ j .L802A9830 /* 429B2C 802A980C A622004C */ sh $v0, 0x4c($s1) +glabel L802A9810_429B30 /* 429B30 802A9810 86220054 */ lh $v0, 0x54($s1) /* 429B34 802A9814 96230054 */ lhu $v1, 0x54($s1) /* 429B38 802A9818 10400003 */ beqz $v0, .L802A9828 @@ -385,8 +390,9 @@ glabel func_802A9294_4295B4 /* 429B44 802A9824 A6220054 */ sh $v0, 0x54($s1) .L802A9828: /* 429B48 802A9828 0C09A327 */ jal func_80268C9C -/* 429B4C 802A982C 00000000 */ nop +/* 429B4C 802A982C 00000000 */ nop .L802A9830: +glabel L802A9830_429B50 /* 429B50 802A9830 8FBF0020 */ lw $ra, 0x20($sp) /* 429B54 802A9834 8FB3001C */ lw $s3, 0x1c($sp) /* 429B58 802A9838 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/code_429320/func_802A984C_429B6C.s b/asm/nonmatchings/code_429320/func_802A984C_429B6C.s index 39c924c55c..c9ad66aaac 100644 --- a/asm/nonmatchings/code_429320/func_802A984C_429B6C.s +++ b/asm/nonmatchings/code_429320/func_802A984C_429B6C.s @@ -35,7 +35,7 @@ glabel func_802A984C_429B6C /* 429BE4 802A98C4 0C09A1DC */ jal func_80268770 /* 429BE8 802A98C8 00063403 */ sra $a2, $a2, 0x10 /* 429BEC 802A98CC 080AA643 */ j .L802A990C -/* 429BF0 802A98D0 00000000 */ nop +/* 429BF0 802A98D0 00000000 */ nop .L802A98D4: /* 429BF4 802A98D4 96230044 */ lhu $v1, 0x44($s1) /* 429BF8 802A98D8 3484851F */ ori $a0, $a0, 0x851f @@ -54,7 +54,7 @@ glabel func_802A984C_429B6C .L802A990C: /* 429C2C 802A990C 8E24000C */ lw $a0, 0xc($s1) /* 429C30 802A9910 0C0511EA */ jal draw_icon_0 -/* 429C34 802A9914 00000000 */ nop +/* 429C34 802A9914 00000000 */ nop /* 429C38 802A9918 8FBF0020 */ lw $ra, 0x20($sp) /* 429C3C 802A991C 8FB1001C */ lw $s1, 0x1c($sp) /* 429C40 802A9920 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/nonmatchings/code_429320/func_802A992C_429C4C.s b/asm/nonmatchings/code_429320/func_802A992C_429C4C.s index bf8467a42f..849c651be3 100644 --- a/asm/nonmatchings/code_429320/func_802A992C_429C4C.s +++ b/asm/nonmatchings/code_429320/func_802A992C_429C4C.s @@ -17,5 +17,5 @@ glabel func_802A992C_429C4C /* 429C7C 802A995C 8FB00010 */ lw $s0, 0x10($sp) /* 429C80 802A9960 03E00008 */ jr $ra /* 429C84 802A9964 27BD0018 */ addiu $sp, $sp, 0x18 -/* 429C88 802A9968 00000000 */ nop -/* 429C8C 802A996C 00000000 */ nop +/* 429C88 802A9968 00000000 */ nop +/* 429C8C 802A996C 00000000 */ nop diff --git a/asm/nonmatchings/code_429D20/func_802A9000_429D20.s b/asm/nonmatchings/code_429D20/func_802A9000_429D20.s index ceee6767b0..1aaebbc160 100644 --- a/asm/nonmatchings/code_429D20/func_802A9000_429D20.s +++ b/asm/nonmatchings/code_429D20/func_802A9000_429D20.s @@ -19,7 +19,7 @@ glabel func_802A9000_429D20 /* 429D58 802A9038 10400031 */ beqz $v0, .L802A9100 /* 429D5C 802A903C 0200182D */ daddu $v1, $s0, $zero /* 429D60 802A9040 0C09A216 */ jal func_80268858 -/* 429D64 802A9044 00000000 */ nop +/* 429D64 802A9044 00000000 */ nop /* 429D68 802A9048 3C048011 */ lui $a0, %hi(D_80108B28) /* 429D6C 802A904C 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) /* 429D70 802A9050 2402000F */ addiu $v0, $zero, 0xf @@ -50,7 +50,7 @@ glabel func_802A9000_429D20 /* 429DD4 802A90B4 3C048011 */ lui $a0, %hi(D_80108AFC) /* 429DD8 802A90B8 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) /* 429DDC 802A90BC 0C050529 */ jal create_icon -/* 429DE0 802A90C0 00000000 */ nop +/* 429DE0 802A90C0 00000000 */ nop /* 429DE4 802A90C4 0040802D */ daddu $s0, $v0, $zero /* 429DE8 802A90C8 86250056 */ lh $a1, 0x56($s1) /* 429DEC 802A90CC 86260058 */ lh $a2, 0x58($s1) diff --git a/asm/nonmatchings/code_429D20/func_802A911C_429E3C.s b/asm/nonmatchings/code_429D20/func_802A911C_429E3C.s index 18164cba97..05abc6ad97 100644 --- a/asm/nonmatchings/code_429D20/func_802A911C_429E3C.s +++ b/asm/nonmatchings/code_429D20/func_802A911C_429E3C.s @@ -18,7 +18,7 @@ glabel func_802A911C_429E3C /* 429E70 802A9150 10400024 */ beqz $v0, .L802A91E4 /* 429E74 802A9154 0260182D */ daddu $v1, $s3, $zero /* 429E78 802A9158 0C09A216 */ jal func_80268858 -/* 429E7C 802A915C 00000000 */ nop +/* 429E7C 802A915C 00000000 */ nop /* 429E80 802A9160 8E050000 */ lw $a1, ($s0) /* 429E84 802A9164 26100004 */ addiu $s0, $s0, 4 /* 429E88 802A9168 0C0B1EAF */ jal get_variable diff --git a/asm/nonmatchings/code_429D20/func_802A9208_429F28.s b/asm/nonmatchings/code_429D20/func_802A9208_429F28.s index 2d1cb96708..33fb7390e6 100644 --- a/asm/nonmatchings/code_429D20/func_802A9208_429F28.s +++ b/asm/nonmatchings/code_429D20/func_802A9208_429F28.s @@ -16,11 +16,12 @@ glabel func_802A9208_429F28 /* 429F54 802A9234 2C62000D */ sltiu $v0, $v1, 0xd /* 429F58 802A9238 104000F7 */ beqz $v0, .L802A9618 /* 429F5C 802A923C 00031080 */ sll $v0, $v1, 2 -/* 429F60 802A9240 3C01802B */ lui $at, %hi(D_802A9790) +/* 429F60 802A9240 3C01802B */ lui $at, %hi(jtbl_802A9790_42A4B0) /* 429F64 802A9244 00220821 */ addu $at, $at, $v0 -/* 429F68 802A9248 8C229790 */ lw $v0, %lo(D_802A9790)($at) +/* 429F68 802A9248 8C229790 */ lw $v0, %lo(jtbl_802A9790_42A4B0)($at) /* 429F6C 802A924C 00400008 */ jr $v0 -/* 429F70 802A9250 00000000 */ nop +/* 429F70 802A9250 00000000 */ nop +glabel L802A9254_429F74 /* 429F74 802A9254 0C093EB1 */ jal set_popup_duration /* 429F78 802A9258 24040063 */ addiu $a0, $zero, 0x63 /* 429F7C 802A925C 82220061 */ lb $v0, 0x61($s1) @@ -46,6 +47,7 @@ glabel func_802A9208_429F28 /* 429FC4 802A92A4 24020001 */ addiu $v0, $zero, 1 /* 429FC8 802A92A8 080AA586 */ j .L802A9618 /* 429FCC 802A92AC A622004C */ sh $v0, 0x4c($s1) +glabel L802A92B0_429FD0 /* 429FD0 802A92B0 0C093EB1 */ jal set_popup_duration /* 429FD4 802A92B4 24040063 */ addiu $a0, $zero, 0x63 /* 429FD8 802A92B8 96220056 */ lhu $v0, 0x56($s1) @@ -68,7 +70,8 @@ glabel func_802A9208_429F28 /* 42A018 802A92F8 0C051261 */ jal set_icon_render_pos /* 42A01C 802A92FC 24C6001C */ addiu $a2, $a2, 0x1c /* 42A020 802A9300 080AA586 */ j .L802A9618 -/* 42A024 802A9304 00000000 */ nop +/* 42A024 802A9304 00000000 */ nop +glabel L802A9308_42A028 /* 42A028 802A9308 0C093EB1 */ jal set_popup_duration /* 42A02C 802A930C 24040063 */ addiu $a0, $zero, 0x63 /* 42A030 802A9310 8622004E */ lh $v0, 0x4e($s1) @@ -82,7 +85,7 @@ glabel func_802A9208_429F28 /* 42A04C 802A932C 3C058011 */ lui $a1, %hi(D_80108B54) /* 42A050 802A9330 24A58B54 */ addiu $a1, $a1, %lo(D_80108B54) /* 42A054 802A9334 0C0511FF */ jal set_menu_icon_script -/* 42A058 802A9338 00000000 */ nop +/* 42A058 802A9338 00000000 */ nop /* 42A05C 802A933C 3C048000 */ lui $a0, 0x8000 /* 42A060 802A9340 34840041 */ ori $a0, $a0, 0x41 /* 42A064 802A9344 0000282D */ daddu $a1, $zero, $zero @@ -95,6 +98,7 @@ glabel func_802A9208_429F28 /* 42A080 802A9360 A6220054 */ sh $v0, 0x54($s1) /* 42A084 802A9364 2402000B */ addiu $v0, $zero, 0xb /* 42A088 802A9368 A622004C */ sh $v0, 0x4c($s1) +glabel L802A936C_42A08C /* 42A08C 802A936C 0C093EB1 */ jal set_popup_duration /* 42A090 802A9370 24040063 */ addiu $a0, $zero, 0x63 /* 42A094 802A9374 82220080 */ lb $v0, 0x80($s1) @@ -110,7 +114,7 @@ glabel func_802A9208_429F28 /* 42A0B8 802A9398 14610004 */ bne $v1, $at, .L802A93AC /* 42A0BC 802A939C 3C018000 */ lui $at, 0x8000 /* 42A0C0 802A93A0 14410002 */ bne $v0, $at, .L802A93AC -/* 42A0C4 802A93A4 00000000 */ nop +/* 42A0C4 802A93A4 00000000 */ nop /* 42A0C8 802A93A8 0006000D */ break 6 .L802A93AC: /* 42A0CC 802A93AC 00009012 */ mflo $s2 @@ -214,7 +218,7 @@ glabel func_802A9208_429F28 /* 42A244 802A9524 3C058011 */ lui $a1, %hi(D_80108B54) /* 42A248 802A9528 24A58B54 */ addiu $a1, $a1, %lo(D_80108B54) /* 42A24C 802A952C 080AA551 */ j .L802A9544 -/* 42A250 802A9530 00000000 */ nop +/* 42A250 802A9530 00000000 */ nop .L802A9534: /* 42A254 802A9534 0C05122C */ jal get_menu_icon_script /* 42A258 802A9538 0200202D */ daddu $a0, $s0, $zero @@ -222,7 +226,7 @@ glabel func_802A9208_429F28 /* 42A260 802A9540 24A58BBC */ addiu $a1, $a1, %lo(D_80108BBC) .L802A9544: /* 42A264 802A9544 10450003 */ beq $v0, $a1, .L802A9554 -/* 42A268 802A9548 00000000 */ nop +/* 42A268 802A9548 00000000 */ nop /* 42A26C 802A954C 0C0511FF */ jal set_menu_icon_script /* 42A270 802A9550 0200202D */ daddu $a0, $s0, $zero .L802A9554: @@ -256,9 +260,9 @@ glabel func_802A9208_429F28 /* 42A2D8 802A95B8 82630081 */ lb $v1, 0x81($s3) /* 42A2DC 802A95BC 24020064 */ addiu $v0, $zero, 0x64 /* 42A2E0 802A95C0 14620003 */ bne $v1, $v0, .L802A95D0 -/* 42A2E4 802A95C4 00000000 */ nop +/* 42A2E4 802A95C4 00000000 */ nop /* 42A2E8 802A95C8 0C09A458 */ jal func_80269160 -/* 42A2EC 802A95CC 00000000 */ nop +/* 42A2EC 802A95CC 00000000 */ nop .L802A95D0: /* 42A2F0 802A95D0 0C093EB1 */ jal set_popup_duration /* 42A2F4 802A95D4 0000202D */ daddu $a0, $zero, $zero @@ -270,6 +274,7 @@ glabel func_802A9208_429F28 /* 42A30C 802A95EC 2402000C */ addiu $v0, $zero, 0xc /* 42A310 802A95F0 080AA586 */ j .L802A9618 /* 42A314 802A95F4 A622004C */ sh $v0, 0x4c($s1) +glabel L802A95F8_42A318 /* 42A318 802A95F8 86220054 */ lh $v0, 0x54($s1) /* 42A31C 802A95FC 96230054 */ lhu $v1, 0x54($s1) /* 42A320 802A9600 10400003 */ beqz $v0, .L802A9610 @@ -279,8 +284,9 @@ glabel func_802A9208_429F28 /* 42A32C 802A960C A6220054 */ sh $v0, 0x54($s1) .L802A9610: /* 42A330 802A9610 0C09A327 */ jal func_80268C9C -/* 42A334 802A9614 00000000 */ nop +/* 42A334 802A9614 00000000 */ nop .L802A9618: +glabel L802A9618_42A338 /* 42A338 802A9618 8FBF0020 */ lw $ra, 0x20($sp) /* 42A33C 802A961C 8FB3001C */ lw $s3, 0x1c($sp) /* 42A340 802A9620 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/code_429D20/func_802A9634_42A354.s b/asm/nonmatchings/code_429D20/func_802A9634_42A354.s index 332d27b862..972ffad722 100644 --- a/asm/nonmatchings/code_429D20/func_802A9634_42A354.s +++ b/asm/nonmatchings/code_429D20/func_802A9634_42A354.s @@ -37,7 +37,7 @@ glabel func_802A9634_42A354 /* 42A3D4 802A96B4 0C09A1E6 */ jal func_80268798 /* 42A3D8 802A96B8 00063403 */ sra $a2, $a2, 0x10 /* 42A3DC 802A96BC 080AA5C3 */ j .L802A970C -/* 42A3E0 802A96C0 00000000 */ nop +/* 42A3E0 802A96C0 00000000 */ nop .L802A96C4: /* 42A3E4 802A96C4 3C0451EB */ lui $a0, 0x51eb /* 42A3E8 802A96C8 3484851F */ ori $a0, $a0, 0x851f diff --git a/asm/nonmatchings/code_42A4F0/func_802A948C_42A97C.s b/asm/nonmatchings/code_42A4F0/func_802A948C_42A97C.s index 146d600439..4d15453428 100644 --- a/asm/nonmatchings/code_42A4F0/func_802A948C_42A97C.s +++ b/asm/nonmatchings/code_42A4F0/func_802A948C_42A97C.s @@ -14,11 +14,12 @@ glabel func_802A948C_42A97C /* 42A9A0 802A94B0 2C620012 */ sltiu $v0, $v1, 0x12 /* 42A9A4 802A94B4 104002D2 */ beqz $v0, .L802AA000 /* 42A9A8 802A94B8 00031080 */ sll $v0, $v1, 2 -/* 42A9AC 802A94BC 3C01802B */ lui $at, %hi(D_802AB1B0) +/* 42A9AC 802A94BC 3C01802B */ lui $at, %hi(jtbl_802AB1B0_42C6A0) /* 42A9B0 802A94C0 00220821 */ addu $at, $at, $v0 -/* 42A9B4 802A94C4 8C22B1B0 */ lw $v0, %lo(D_802AB1B0)($at) +/* 42A9B4 802A94C4 8C22B1B0 */ lw $v0, %lo(jtbl_802AB1B0_42C6A0)($at) /* 42A9B8 802A94C8 00400008 */ jr $v0 /* 42A9BC 802A94CC 00000000 */ nop +glabel L802A94D0_42A9C0 /* 42A9C0 802A94D0 0C093EB1 */ jal set_popup_duration /* 42A9C4 802A94D4 24040063 */ addiu $a0, $zero, 0x63 /* 42A9C8 802A94D8 82220061 */ lb $v0, 0x61($s1) @@ -114,6 +115,7 @@ glabel func_802A948C_42A97C /* 42AB0C 802A961C 24020001 */ addiu $v0, $zero, 1 /* 42AB10 802A9620 080AA800 */ j .L802AA000 /* 42AB14 802A9624 A622004C */ sh $v0, 0x4c($s1) +glabel L802A9628_42AB18 /* 42AB18 802A9628 0C093EB1 */ jal set_popup_duration /* 42AB1C 802A962C 24040063 */ addiu $a0, $zero, 0x63 /* 42AB20 802A9630 8622006C */ lh $v0, 0x6c($s1) @@ -214,6 +216,7 @@ glabel func_802A948C_42A97C /* 42AC7C 802A978C 24C60017 */ addiu $a2, $a2, 0x17 /* 42AC80 802A9790 080AA800 */ j .L802AA000 /* 42AC84 802A9794 00000000 */ nop +glabel L802A9798_42AC88 /* 42AC88 802A9798 0C093EB1 */ jal set_popup_duration /* 42AC8C 802A979C 24040063 */ addiu $a0, $zero, 0x63 /* 42AC90 802A97A0 8622004E */ lh $v0, 0x4e($s1) @@ -235,6 +238,7 @@ glabel func_802A948C_42A97C .L802A97DC: /* 42ACCC 802A97DC 2402000B */ addiu $v0, $zero, 0xb /* 42ACD0 802A97E0 A622004C */ sh $v0, 0x4c($s1) +glabel L802A97E4_42ACD4 /* 42ACD4 802A97E4 0C093EB1 */ jal set_popup_duration /* 42ACD8 802A97E8 24040063 */ addiu $a0, $zero, 0x63 /* 42ACDC 802A97EC 86230054 */ lh $v1, 0x54($s1) @@ -287,6 +291,7 @@ glabel func_802A948C_42A97C /* 42AD8C 802A989C A6220054 */ sh $v0, 0x54($s1) /* 42AD90 802A98A0 080AA75A */ j .L802A9D68 /* 42AD94 802A98A4 2402000C */ addiu $v0, $zero, 0xc +glabel L802A98A8_42AD98 /* 42AD98 802A98A8 0C093EB1 */ jal set_popup_duration /* 42AD9C 802A98AC 24040063 */ addiu $a0, $zero, 0x63 /* 42ADA0 802A98B0 82220060 */ lb $v0, 0x60($s1) @@ -455,6 +460,7 @@ glabel func_802A948C_42A97C /* 42AFE8 802A9AF8 A6220054 */ sh $v0, 0x54($s1) /* 42AFEC 802A9AFC 080AA75A */ j .L802A9D68 /* 42AFF0 802A9B00 2402000D */ addiu $v0, $zero, 0xd +glabel L802A9B04_42AFF4 /* 42AFF4 802A9B04 0C093EB1 */ jal set_popup_duration /* 42AFF8 802A9B08 24040063 */ addiu $a0, $zero, 0x63 /* 42AFFC 802A9B0C 82220060 */ lb $v0, 0x60($s1) @@ -632,6 +638,7 @@ glabel func_802A948C_42A97C /* 42B260 802A9D70 A220005C */ sb $zero, 0x5c($s1) /* 42B264 802A9D74 080AA800 */ j .L802AA000 /* 42B268 802A9D78 A2200060 */ sb $zero, 0x60($s1) +glabel L802A9D7C_42B26C /* 42B26C 802A9D7C 0C093EB1 */ jal set_popup_duration /* 42B270 802A9D80 24040063 */ addiu $a0, $zero, 0x63 /* 42B274 802A9D84 82220060 */ lb $v0, 0x60($s1) @@ -781,6 +788,7 @@ glabel func_802A948C_42A97C .L802A9F84: /* 42B474 802A9F84 080AA800 */ j .L802AA000 /* 42B478 802A9F88 A222005D */ sb $v0, 0x5d($s1) +glabel L802A9F8C_42B47C /* 42B47C 802A9F8C 82020084 */ lb $v0, 0x84($s0) /* 42B480 802A9F90 92030084 */ lbu $v1, 0x84($s0) /* 42B484 802A9F94 54400003 */ bnel $v0, $zero, .L802A9FA4 @@ -804,6 +812,7 @@ glabel func_802A948C_42A97C /* 42B4C4 802A9FD4 24020011 */ addiu $v0, $zero, 0x11 /* 42B4C8 802A9FD8 080AA800 */ j .L802AA000 /* 42B4CC 802A9FDC A622004C */ sh $v0, 0x4c($s1) +glabel L802A9FE0_42B4D0 /* 42B4D0 802A9FE0 86220054 */ lh $v0, 0x54($s1) /* 42B4D4 802A9FE4 96230054 */ lhu $v1, 0x54($s1) /* 42B4D8 802A9FE8 10400003 */ beqz $v0, .L802A9FF8 @@ -814,6 +823,7 @@ glabel func_802A948C_42A97C /* 42B4E8 802A9FF8 0C09A327 */ jal func_80268C9C /* 42B4EC 802A9FFC 00000000 */ nop .L802AA000: +glabel L802AA000_42B4F0 /* 42B4F0 802AA000 8FBF0018 */ lw $ra, 0x18($sp) /* 42B4F4 802AA004 8FB10014 */ lw $s1, 0x14($sp) /* 42B4F8 802AA008 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_42C6F0/func_802A9228_42C918.s b/asm/nonmatchings/code_42C6F0/func_802A9228_42C918.s index 15375af32f..26513aab2c 100644 --- a/asm/nonmatchings/code_42C6F0/func_802A9228_42C918.s +++ b/asm/nonmatchings/code_42C6F0/func_802A9228_42C918.s @@ -21,11 +21,12 @@ glabel func_802A9228_42C918 /* 42C958 802A9268 2C62000F */ sltiu $v0, $v1, 0xf /* 42C95C 802A926C 1040011E */ beqz $v0, .L802A96E8 /* 42C960 802A9270 00031080 */ sll $v0, $v1, 2 -/* 42C964 802A9274 3C01802B */ lui $at, %hi(D_802A97E0) +/* 42C964 802A9274 3C01802B */ lui $at, %hi(jtbl_802A97E0_42CED0) /* 42C968 802A9278 00220821 */ addu $at, $at, $v0 -/* 42C96C 802A927C 8C2297E0 */ lw $v0, %lo(D_802A97E0)($at) +/* 42C96C 802A927C 8C2297E0 */ lw $v0, %lo(jtbl_802A97E0_42CED0)($at) /* 42C970 802A9280 00400008 */ jr $v0 /* 42C974 802A9284 00000000 */ nop +glabel L802A9288_42C978 /* 42C978 802A9288 0C093EB1 */ jal set_popup_duration /* 42C97C 802A928C 24040063 */ addiu $a0, $zero, 0x63 /* 42C980 802A9290 82220061 */ lb $v0, 0x61($s1) @@ -41,6 +42,7 @@ glabel func_802A9228_42C918 /* 42C9A4 802A92B4 24020001 */ addiu $v0, $zero, 1 /* 42C9A8 802A92B8 080AA5BA */ j .L802A96E8 /* 42C9AC 802A92BC A622004C */ sh $v0, 0x4c($s1) +glabel L802A92C0_42C9B0 /* 42C9B0 802A92C0 0C093EB1 */ jal set_popup_duration /* 42C9B4 802A92C4 24040063 */ addiu $a0, $zero, 0x63 /* 42C9B8 802A92C8 96220056 */ lhu $v0, 0x56($s1) @@ -61,6 +63,7 @@ glabel func_802A9228_42C918 /* 42C9F0 802A9300 24C6001C */ addiu $a2, $a2, 0x1c /* 42C9F4 802A9304 080AA5BA */ j .L802A96E8 /* 42C9F8 802A9308 00000000 */ nop +glabel L802A930C_42C9FC /* 42C9FC 802A930C 0C093EB1 */ jal set_popup_duration /* 42CA00 802A9310 24040063 */ addiu $a0, $zero, 0x63 /* 42CA04 802A9314 8622004E */ lh $v0, 0x4e($s1) @@ -80,6 +83,7 @@ glabel func_802A9228_42C918 /* 42CA38 802A9348 2402000B */ addiu $v0, $zero, 0xb /* 42CA3C 802A934C A622004C */ sh $v0, 0x4c($s1) /* 42CA40 802A9350 A6200072 */ sh $zero, 0x72($s1) +glabel L802A9354_42CA44 /* 42CA44 802A9354 0C093EB1 */ jal set_popup_duration /* 42CA48 802A9358 24040063 */ addiu $a0, $zero, 0x63 /* 42CA4C 802A935C 8230005C */ lb $s0, 0x5c($s1) @@ -121,6 +125,7 @@ glabel func_802A9228_42C918 /* 42CAD8 802A93E8 A6220070 */ sh $v0, 0x70($s1) /* 42CADC 802A93EC 2402000C */ addiu $v0, $zero, 0xc /* 42CAE0 802A93F0 A622004C */ sh $v0, 0x4c($s1) +glabel L802A93F4_42CAE4 /* 42CAE4 802A93F4 0C093EB1 */ jal set_popup_duration /* 42CAE8 802A93F8 24040063 */ addiu $a0, $zero, 0x63 /* 42CAEC 802A93FC 96220054 */ lhu $v0, 0x54($s1) @@ -298,6 +303,7 @@ glabel func_802A9228_42C918 /* 42CD5C 802A966C 26730001 */ addiu $s3, $s3, 1 /* 42CD60 802A9670 080AA5BA */ j .L802A96E8 /* 42CD64 802A9674 00000000 */ nop +glabel L802A9678_42CD68 /* 42CD68 802A9678 82E20084 */ lb $v0, 0x84($s7) /* 42CD6C 802A967C 92E30084 */ lbu $v1, 0x84($s7) /* 42CD70 802A9680 54400003 */ bnel $v0, $zero, .L802A9690 @@ -320,6 +326,7 @@ glabel func_802A9228_42C918 /* 42CDAC 802A96BC 2402000E */ addiu $v0, $zero, 0xe /* 42CDB0 802A96C0 080AA5BA */ j .L802A96E8 /* 42CDB4 802A96C4 A622004C */ sh $v0, 0x4c($s1) +glabel L802A96C8_42CDB8 /* 42CDB8 802A96C8 86220054 */ lh $v0, 0x54($s1) /* 42CDBC 802A96CC 96230054 */ lhu $v1, 0x54($s1) /* 42CDC0 802A96D0 10400003 */ beqz $v0, .L802A96E0 @@ -330,6 +337,7 @@ glabel func_802A9228_42C918 /* 42CDD0 802A96E0 0C09A327 */ jal func_80268C9C /* 42CDD4 802A96E4 00000000 */ nop .L802A96E8: +glabel L802A96E8_42CDD8 /* 42CDD8 802A96E8 8FBF0034 */ lw $ra, 0x34($sp) /* 42CDDC 802A96EC 8FBE0030 */ lw $fp, 0x30($sp) /* 42CDE0 802A96F0 8FB7002C */ lw $s7, 0x2c($sp) diff --git a/asm/nonmatchings/code_42CF10/func_802A9000_42CF10.s b/asm/nonmatchings/code_42CF10/func_802A9000_42CF10.s index da14e17a6f..99c8e4501d 100644 --- a/asm/nonmatchings/code_42CF10/func_802A9000_42CF10.s +++ b/asm/nonmatchings/code_42CF10/func_802A9000_42CF10.s @@ -19,7 +19,7 @@ glabel func_802A9000_42CF10 /* 42CF48 802A9038 5040006F */ beql $v0, $zero, .L802A91F8 /* 42CF4C 802A903C A0600081 */ sb $zero, 0x81($v1) /* 42CF50 802A9040 0C09A216 */ jal func_80268858 -/* 42CF54 802A9044 00000000 */ nop +/* 42CF54 802A9044 00000000 */ nop /* 42CF58 802A9048 24040064 */ addiu $a0, $zero, 0x64 /* 42CF5C 802A904C 24020010 */ addiu $v0, $zero, 0x10 /* 42CF60 802A9050 A622004A */ sh $v0, 0x4a($s1) @@ -57,7 +57,7 @@ glabel func_802A9000_42CF10 /* 42CFE0 802A90D0 3C048011 */ lui $a0, %hi(D_80108AFC) /* 42CFE4 802A90D4 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) /* 42CFE8 802A90D8 0C050529 */ jal create_icon -/* 42CFEC 802A90DC 00000000 */ nop +/* 42CFEC 802A90DC 00000000 */ nop /* 42CFF0 802A90E0 0040802D */ daddu $s0, $v0, $zero /* 42CFF4 802A90E4 86250056 */ lh $a1, 0x56($s1) /* 42CFF8 802A90E8 86260058 */ lh $a2, 0x58($s1) @@ -74,7 +74,7 @@ glabel func_802A9000_42CF10 /* 42D024 802A9114 3C048029 */ lui $a0, %hi(D_80292974) /* 42D028 802A9118 24842974 */ addiu $a0, $a0, %lo(D_80292974) /* 42D02C 802A911C 0C050529 */ jal create_icon -/* 42D030 802A9120 00000000 */ nop +/* 42D030 802A9120 00000000 */ nop /* 42D034 802A9124 0040802D */ daddu $s0, $v0, $zero /* 42D038 802A9128 86250056 */ lh $a1, 0x56($s1) /* 42D03C 802A912C 86260058 */ lh $a2, 0x58($s1) @@ -91,7 +91,7 @@ glabel func_802A9000_42CF10 /* 42D068 802A9158 3C048011 */ lui $a0, %hi(D_80109244) /* 42D06C 802A915C 24849244 */ addiu $a0, $a0, %lo(D_80109244) /* 42D070 802A9160 0C050529 */ jal create_icon -/* 42D074 802A9164 00000000 */ nop +/* 42D074 802A9164 00000000 */ nop /* 42D078 802A9168 0040802D */ daddu $s0, $v0, $zero /* 42D07C 802A916C 86250056 */ lh $a1, 0x56($s1) /* 42D080 802A9170 86260058 */ lh $a2, 0x58($s1) diff --git a/asm/nonmatchings/code_42CF10/func_802A9210_42D120.s b/asm/nonmatchings/code_42CF10/func_802A9210_42D120.s index 28c6b9cf21..10648debe4 100644 --- a/asm/nonmatchings/code_42CF10/func_802A9210_42D120.s +++ b/asm/nonmatchings/code_42CF10/func_802A9210_42D120.s @@ -18,7 +18,7 @@ glabel func_802A9210_42D120 /* 42D154 802A9244 10400029 */ beqz $v0, .L802A92EC /* 42D158 802A9248 0260182D */ daddu $v1, $s3, $zero /* 42D15C 802A924C 0C09A216 */ jal func_80268858 -/* 42D160 802A9250 00000000 */ nop +/* 42D160 802A9250 00000000 */ nop /* 42D164 802A9254 8E050000 */ lw $a1, ($s0) /* 42D168 802A9258 26100004 */ addiu $s0, $s0, 4 /* 42D16C 802A925C 0C0B1EAF */ jal get_variable diff --git a/asm/nonmatchings/code_42CF10/func_802A9310_42D220.s b/asm/nonmatchings/code_42CF10/func_802A9310_42D220.s index cf97977bbe..017489e58a 100644 --- a/asm/nonmatchings/code_42CF10/func_802A9310_42D220.s +++ b/asm/nonmatchings/code_42CF10/func_802A9310_42D220.s @@ -15,11 +15,12 @@ glabel func_802A9310_42D220 /* 42D248 802A9338 2C62000D */ sltiu $v0, $v1, 0xd /* 42D24C 802A933C 1040013F */ beqz $v0, .L802A983C /* 42D250 802A9340 00031080 */ sll $v0, $v1, 2 -/* 42D254 802A9344 3C01802B */ lui $at, %hi(D_802A9AC0) +/* 42D254 802A9344 3C01802B */ lui $at, %hi(jtbl_802A9AC0_42D9D0) /* 42D258 802A9348 00220821 */ addu $at, $at, $v0 -/* 42D25C 802A934C 8C229AC0 */ lw $v0, %lo(D_802A9AC0)($at) +/* 42D25C 802A934C 8C229AC0 */ lw $v0, %lo(jtbl_802A9AC0_42D9D0)($at) /* 42D260 802A9350 00400008 */ jr $v0 -/* 42D264 802A9354 00000000 */ nop +/* 42D264 802A9354 00000000 */ nop +glabel L802A9358_42D268 /* 42D268 802A9358 0C093EB1 */ jal set_popup_duration /* 42D26C 802A935C 24040063 */ addiu $a0, $zero, 0x63 /* 42D270 802A9360 82220061 */ lb $v0, 0x61($s1) @@ -55,6 +56,7 @@ glabel func_802A9310_42D220 /* 42D2DC 802A93CC 24020001 */ addiu $v0, $zero, 1 /* 42D2E0 802A93D0 080AA60E */ j .L802A9838 /* 42D2E4 802A93D4 A622004C */ sh $v0, 0x4c($s1) +glabel L802A93D8_42D2E8 /* 42D2E8 802A93D8 0C093EB1 */ jal set_popup_duration /* 42D2EC 802A93DC 24040063 */ addiu $a0, $zero, 0x63 /* 42D2F0 802A93E0 8622006C */ lh $v0, 0x6c($s1) @@ -105,7 +107,8 @@ glabel func_802A9310_42D220 /* 42D39C 802A948C 0C051261 */ jal set_icon_render_pos /* 42D3A0 802A9490 00452823 */ subu $a1, $v0, $a1 /* 42D3A4 802A9494 080AA60E */ j .L802A9838 -/* 42D3A8 802A9498 00000000 */ nop +/* 42D3A8 802A9498 00000000 */ nop +glabel L802A949C_42D3AC /* 42D3AC 802A949C 0C093EB1 */ jal set_popup_duration /* 42D3B0 802A94A0 24040063 */ addiu $a0, $zero, 0x63 /* 42D3B4 802A94A4 8622004E */ lh $v0, 0x4e($s1) @@ -119,7 +122,7 @@ glabel func_802A9310_42D220 /* 42D3D0 802A94C0 3C058011 */ lui $a1, %hi(D_80108B80) /* 42D3D4 802A94C4 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) /* 42D3D8 802A94C8 0C0511FF */ jal set_menu_icon_script -/* 42D3DC 802A94CC 00000000 */ nop +/* 42D3DC 802A94CC 00000000 */ nop /* 42D3E0 802A94D0 3C048000 */ lui $a0, 0x8000 /* 42D3E4 802A94D4 34840041 */ ori $a0, $a0, 0x41 /* 42D3E8 802A94D8 0000282D */ daddu $a1, $zero, $zero @@ -135,14 +138,15 @@ glabel func_802A9310_42D220 /* 42D410 802A9500 A6220054 */ sh $v0, 0x54($s1) /* 42D414 802A9504 2402000B */ addiu $v0, $zero, 0xb /* 42D418 802A9508 A622004C */ sh $v0, 0x4c($s1) +glabel L802A950C_42D41C /* 42D41C 802A950C 0C093EB1 */ jal set_popup_duration /* 42D420 802A9510 24040063 */ addiu $a0, $zero, 0x63 /* 42D424 802A9514 86220068 */ lh $v0, 0x68($s1) /* 42D428 802A9518 14400027 */ bnez $v0, .L802A95B8 -/* 42D42C 802A951C 00000000 */ nop +/* 42D42C 802A951C 00000000 */ nop /* 42D430 802A9520 86220064 */ lh $v0, 0x64($s1) /* 42D434 802A9524 1040001E */ beqz $v0, .L802A95A0 -/* 42D438 802A9528 00000000 */ nop +/* 42D438 802A9528 00000000 */ nop /* 42D43C 802A952C 82220080 */ lb $v0, 0x80($s1) /* 42D440 802A9530 00021040 */ sll $v0, $v0, 1 /* 42D444 802A9534 02221021 */ addu $v0, $s1, $v0 @@ -156,7 +160,7 @@ glabel func_802A9310_42D220 /* 42D460 802A9550 14610004 */ bne $v1, $at, .L802A9564 /* 42D464 802A9554 3C018000 */ lui $at, 0x8000 /* 42D468 802A9558 14410002 */ bne $v0, $at, .L802A9564 -/* 42D46C 802A955C 00000000 */ nop +/* 42D46C 802A955C 00000000 */ nop /* 42D470 802A9560 0006000D */ break 6 .L802A9564: /* 42D474 802A9564 00001012 */ mflo $v0 @@ -186,7 +190,7 @@ glabel func_802A9310_42D220 /* 42D4C8 802A95B8 8E420214 */ lw $v0, 0x214($s2) /* 42D4CC 802A95BC 30428000 */ andi $v0, $v0, 0x8000 /* 42D4D0 802A95C0 1040002B */ beqz $v0, .L802A9670 -/* 42D4D4 802A95C4 00000000 */ nop +/* 42D4D4 802A95C4 00000000 */ nop /* 42D4D8 802A95C8 86250064 */ lh $a1, 0x64($s1) /* 42D4DC 802A95CC 10A0001F */ beqz $a1, .L802A964C /* 42D4E0 802A95D0 3C0451EB */ lui $a0, 0x51eb @@ -210,8 +214,8 @@ glabel func_802A9310_42D220 /* 42D528 802A9618 00621823 */ subu $v1, $v1, $v0 /* 42D52C 802A961C 00650018 */ mult $v1, $a1 /* 42D530 802A9620 00001812 */ mflo $v1 -/* 42D534 802A9624 00000000 */ nop -/* 42D538 802A9628 00000000 */ nop +/* 42D534 802A9624 00000000 */ nop +/* 42D538 802A9628 00000000 */ nop /* 42D53C 802A962C 00640018 */ mult $v1, $a0 /* 42D540 802A9630 00031FC3 */ sra $v1, $v1, 0x1f /* 42D544 802A9634 00001010 */ mfhi $v0 @@ -323,7 +327,7 @@ glabel func_802A9310_42D220 /* 42D6CC 802A97BC 14620004 */ bne $v1, $v0, .L802A97D0 /* 42D6D0 802A97C0 3C048000 */ lui $a0, 0x8000 /* 42D6D4 802A97C4 0C09A458 */ jal func_80269160 -/* 42D6D8 802A97C8 00000000 */ nop +/* 42D6D8 802A97C8 00000000 */ nop /* 42D6DC 802A97CC 3C048000 */ lui $a0, 0x8000 .L802A97D0: /* 42D6E0 802A97D0 0C05271B */ jal stop_sound @@ -335,9 +339,10 @@ glabel func_802A9310_42D220 /* 42D6F8 802A97E8 2402000C */ addiu $v0, $zero, 0xc /* 42D6FC 802A97EC 080AA60E */ j .L802A9838 /* 42D700 802A97F0 A622004C */ sh $v0, 0x4c($s1) +glabel L802A97F4_42D704 /* 42D704 802A97F4 86220064 */ lh $v0, 0x64($s1) /* 42D708 802A97F8 14400007 */ bnez $v0, .L802A9818 -/* 42D70C 802A97FC 00000000 */ nop +/* 42D70C 802A97FC 00000000 */ nop /* 42D710 802A9800 96220044 */ lhu $v0, 0x44($s1) /* 42D714 802A9804 2442FF9C */ addiu $v0, $v0, -0x64 /* 42D718 802A9808 A6220044 */ sh $v0, 0x44($s1) @@ -354,23 +359,24 @@ glabel func_802A9310_42D220 /* 42D73C 802A982C A6220054 */ sh $v0, 0x54($s1) .L802A9830: /* 42D740 802A9830 0C09A327 */ jal func_80268C9C -/* 42D744 802A9834 00000000 */ nop +/* 42D744 802A9834 00000000 */ nop .L802A9838: +glabel L802A9838_42D748 /* 42D748 802A9838 8623004C */ lh $v1, 0x4c($s1) .L802A983C: /* 42D74C 802A983C 24040001 */ addiu $a0, $zero, 1 /* 42D750 802A9840 10640007 */ beq $v1, $a0, .L802A9860 -/* 42D754 802A9844 00000000 */ nop +/* 42D754 802A9844 00000000 */ nop /* 42D758 802A9848 1860001B */ blez $v1, .L802A98B8 /* 42D75C 802A984C 2862000C */ slti $v0, $v1, 0xc /* 42D760 802A9850 10400019 */ beqz $v0, .L802A98B8 /* 42D764 802A9854 2862000A */ slti $v0, $v1, 0xa /* 42D768 802A9858 14400017 */ bnez $v0, .L802A98B8 -/* 42D76C 802A985C 00000000 */ nop +/* 42D76C 802A985C 00000000 */ nop .L802A9860: /* 42D770 802A9860 86220066 */ lh $v0, 0x66($s1) /* 42D774 802A9864 1440000C */ bnez $v0, .L802A9898 -/* 42D778 802A9868 00000000 */ nop +/* 42D778 802A9868 00000000 */ nop /* 42D77C 802A986C 96220046 */ lhu $v0, 0x46($s1) /* 42D780 802A9870 24420007 */ addiu $v0, $v0, 7 /* 42D784 802A9874 A6220046 */ sh $v0, 0x46($s1) @@ -388,7 +394,7 @@ glabel func_802A9310_42D220 /* 42D7B0 802A98A0 A6220046 */ sh $v0, 0x46($s1) /* 42D7B4 802A98A4 00021400 */ sll $v0, $v0, 0x10 /* 42D7B8 802A98A8 1C400003 */ bgtz $v0, .L802A98B8 -/* 42D7BC 802A98AC 00000000 */ nop +/* 42D7BC 802A98AC 00000000 */ nop /* 42D7C0 802A98B0 A6200046 */ sh $zero, 0x46($s1) /* 42D7C4 802A98B4 A6200066 */ sh $zero, 0x66($s1) .L802A98B8: diff --git a/asm/nonmatchings/code_42CF10/func_802A98D0_42D7E0.s b/asm/nonmatchings/code_42CF10/func_802A98D0_42D7E0.s index 787e30ef67..d2edbf0ecd 100644 --- a/asm/nonmatchings/code_42CF10/func_802A98D0_42D7E0.s +++ b/asm/nonmatchings/code_42CF10/func_802A98D0_42D7E0.s @@ -34,7 +34,7 @@ glabel func_802A98D0_42D7E0 /* 42D854 802A9944 00652823 */ subu $a1, $v1, $a1 /* 42D858 802A9948 8E640004 */ lw $a0, 4($s3) /* 42D85C 802A994C 0C0511EA */ jal draw_icon_0 -/* 42D860 802A9950 00000000 */ nop +/* 42D860 802A9950 00000000 */ nop /* 42D864 802A9954 8E720008 */ lw $s2, 8($s3) /* 42D868 802A9958 0C0511EA */ jal draw_icon_0 /* 42D86C 802A995C 0240202D */ daddu $a0, $s2, $zero @@ -76,7 +76,7 @@ glabel func_802A98D0_42D7E0 /* 42D8F4 802A99E4 0C09A1E6 */ jal func_80268798 /* 42D8F8 802A99E8 00063403 */ sra $a2, $a2, 0x10 /* 42D8FC 802A99EC 080AA68A */ j .L802A9A28 -/* 42D900 802A99F0 00000000 */ nop +/* 42D900 802A99F0 00000000 */ nop .L802A99F4: /* 42D904 802A99F4 96630044 */ lhu $v1, 0x44($s3) /* 42D908 802A99F8 00031C00 */ sll $v1, $v1, 0x10 @@ -94,7 +94,7 @@ glabel func_802A98D0_42D7E0 .L802A9A28: /* 42D938 802A9A28 8E640010 */ lw $a0, 0x10($s3) /* 42D93C 802A9A2C 0C0511EA */ jal draw_icon_0 -/* 42D940 802A9A30 00000000 */ nop +/* 42D940 802A9A30 00000000 */ nop /* 42D944 802A9A34 8FBF002C */ lw $ra, 0x2c($sp) /* 42D948 802A9A38 8FB40028 */ lw $s4, 0x28($sp) /* 42D94C 802A9A3C 8FB30024 */ lw $s3, 0x24($sp) diff --git a/asm/nonmatchings/code_42CF10/func_802A9A54_42D964.s b/asm/nonmatchings/code_42CF10/func_802A9A54_42D964.s index 968645414e..2c39461819 100644 --- a/asm/nonmatchings/code_42CF10/func_802A9A54_42D964.s +++ b/asm/nonmatchings/code_42CF10/func_802A9A54_42D964.s @@ -19,5 +19,5 @@ glabel func_802A9A54_42D964 /* 42D99C 802A9A8C 8FB00010 */ lw $s0, 0x10($sp) /* 42D9A0 802A9A90 03E00008 */ jr $ra /* 42D9A4 802A9A94 27BD0018 */ addiu $sp, $sp, 0x18 -/* 42D9A8 802A9A98 00000000 */ nop -/* 42D9AC 802A9A9C 00000000 */ nop +/* 42D9A8 802A9A98 00000000 */ nop +/* 42D9AC 802A9A9C 00000000 */ nop diff --git a/asm/nonmatchings/code_42DA10/func_802A9000_42DA10.s b/asm/nonmatchings/code_42DA10/func_802A9000_42DA10.s index f02c44f6a0..860b9e01f5 100644 --- a/asm/nonmatchings/code_42DA10/func_802A9000_42DA10.s +++ b/asm/nonmatchings/code_42DA10/func_802A9000_42DA10.s @@ -19,7 +19,7 @@ glabel func_802A9000_42DA10 /* 42DA48 802A9038 50400053 */ beql $v0, $zero, .L802A9188 /* 42DA4C 802A903C A0600081 */ sb $zero, 0x81($v1) /* 42DA50 802A9040 0C09A216 */ jal func_80268858 -/* 42DA54 802A9044 00000000 */ nop +/* 42DA54 802A9044 00000000 */ nop /* 42DA58 802A9048 3C048011 */ lui $a0, %hi(D_80108B28) /* 42DA5C 802A904C 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) /* 42DA60 802A9050 24020011 */ addiu $v0, $zero, 0x11 @@ -51,7 +51,7 @@ glabel func_802A9000_42DA10 /* 42DAC8 802A90B8 3C048029 */ lui $a0, %hi(D_8029231C) /* 42DACC 802A90BC 2484231C */ addiu $a0, $a0, %lo(D_8029231C) /* 42DAD0 802A90C0 0C050529 */ jal create_icon -/* 42DAD4 802A90C4 00000000 */ nop +/* 42DAD4 802A90C4 00000000 */ nop /* 42DAD8 802A90C8 0040802D */ daddu $s0, $v0, $zero /* 42DADC 802A90CC 0200202D */ daddu $a0, $s0, $zero /* 42DAE0 802A90D0 24050082 */ addiu $a1, $zero, 0x82 @@ -67,7 +67,7 @@ glabel func_802A9000_42DA10 /* 42DB08 802A90F8 3C048011 */ lui $a0, %hi(D_80108AFC) /* 42DB0C 802A90FC 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) /* 42DB10 802A9100 0C050529 */ jal create_icon -/* 42DB14 802A9104 00000000 */ nop +/* 42DB14 802A9104 00000000 */ nop /* 42DB18 802A9108 0040802D */ daddu $s0, $v0, $zero /* 42DB1C 802A910C 86250056 */ lh $a1, 0x56($s1) /* 42DB20 802A9110 86260058 */ lh $a2, 0x58($s1) @@ -84,7 +84,7 @@ glabel func_802A9000_42DA10 /* 42DB4C 802A913C 3C048029 */ lui $a0, %hi(D_80292974) /* 42DB50 802A9140 24842974 */ addiu $a0, $a0, %lo(D_80292974) /* 42DB54 802A9144 0C050529 */ jal create_icon -/* 42DB58 802A9148 00000000 */ nop +/* 42DB58 802A9148 00000000 */ nop /* 42DB5C 802A914C 0040802D */ daddu $s0, $v0, $zero /* 42DB60 802A9150 86250056 */ lh $a1, 0x56($s1) /* 42DB64 802A9154 86260058 */ lh $a2, 0x58($s1) diff --git a/asm/nonmatchings/code_42DA10/func_802A91A0_42DBB0.s b/asm/nonmatchings/code_42DA10/func_802A91A0_42DBB0.s index 6bdd24b1f5..dc3f0c6aed 100644 --- a/asm/nonmatchings/code_42DA10/func_802A91A0_42DBB0.s +++ b/asm/nonmatchings/code_42DA10/func_802A91A0_42DBB0.s @@ -18,7 +18,7 @@ glabel func_802A91A0_42DBB0 /* 42DBE4 802A91D4 10400029 */ beqz $v0, .L802A927C /* 42DBE8 802A91D8 0260182D */ daddu $v1, $s3, $zero /* 42DBEC 802A91DC 0C09A216 */ jal func_80268858 -/* 42DBF0 802A91E0 00000000 */ nop +/* 42DBF0 802A91E0 00000000 */ nop /* 42DBF4 802A91E4 8E050000 */ lw $a1, ($s0) /* 42DBF8 802A91E8 26100004 */ addiu $s0, $s0, 4 /* 42DBFC 802A91EC 0C0B1EAF */ jal get_variable diff --git a/asm/nonmatchings/code_42DA10/func_802A92A0_42DCB0.s b/asm/nonmatchings/code_42DA10/func_802A92A0_42DCB0.s index e4df4fa4c7..594a351272 100644 --- a/asm/nonmatchings/code_42DA10/func_802A92A0_42DCB0.s +++ b/asm/nonmatchings/code_42DA10/func_802A92A0_42DCB0.s @@ -15,11 +15,12 @@ glabel func_802A92A0_42DCB0 /* 42DCD8 802A92C8 2C62000D */ sltiu $v0, $v1, 0xd /* 42DCDC 802A92CC 10400144 */ beqz $v0, .L802A97E0 /* 42DCE0 802A92D0 00031080 */ sll $v0, $v1, 2 -/* 42DCE4 802A92D4 3C01802B */ lui $at, %hi(D_802A9950) +/* 42DCE4 802A92D4 3C01802B */ lui $at, %hi(jtbl_802A9950_42E360) /* 42DCE8 802A92D8 00220821 */ addu $at, $at, $v0 -/* 42DCEC 802A92DC 8C229950 */ lw $v0, %lo(D_802A9950)($at) +/* 42DCEC 802A92DC 8C229950 */ lw $v0, %lo(jtbl_802A9950_42E360)($at) /* 42DCF0 802A92E0 00400008 */ jr $v0 -/* 42DCF4 802A92E4 00000000 */ nop +/* 42DCF4 802A92E4 00000000 */ nop +glabel L802A92E8_42DCF8 /* 42DCF8 802A92E8 0C093EB1 */ jal set_popup_duration /* 42DCFC 802A92EC 24040063 */ addiu $a0, $zero, 0x63 /* 42DD00 802A92F0 82220061 */ lb $v0, 0x61($s1) @@ -55,6 +56,7 @@ glabel func_802A92A0_42DCB0 /* 42DD6C 802A935C 24020001 */ addiu $v0, $zero, 1 /* 42DD70 802A9360 080AA5F8 */ j .L802A97E0 /* 42DD74 802A9364 A622004C */ sh $v0, 0x4c($s1) +glabel L802A9368_42DD78 /* 42DD78 802A9368 0C093EB1 */ jal set_popup_duration /* 42DD7C 802A936C 24040063 */ addiu $a0, $zero, 0x63 /* 42DD80 802A9370 8622006C */ lh $v0, 0x6c($s1) @@ -90,7 +92,8 @@ glabel func_802A92A0_42DCB0 /* 42DDF0 802A93E0 0C051261 */ jal set_icon_render_pos /* 42DDF4 802A93E4 24C6001C */ addiu $a2, $a2, 0x1c /* 42DDF8 802A93E8 080AA5F8 */ j .L802A97E0 -/* 42DDFC 802A93EC 00000000 */ nop +/* 42DDFC 802A93EC 00000000 */ nop +glabel L802A93F0_42DE00 /* 42DE00 802A93F0 0C093EB1 */ jal set_popup_duration /* 42DE04 802A93F4 24040063 */ addiu $a0, $zero, 0x63 /* 42DE08 802A93F8 8622004E */ lh $v0, 0x4e($s1) @@ -104,12 +107,12 @@ glabel func_802A92A0_42DCB0 /* 42DE24 802A9414 3C058011 */ lui $a1, %hi(D_80108B80) /* 42DE28 802A9418 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) /* 42DE2C 802A941C 0C0511FF */ jal set_menu_icon_script -/* 42DE30 802A9420 00000000 */ nop +/* 42DE30 802A9420 00000000 */ nop /* 42DE34 802A9424 8E24000C */ lw $a0, 0xc($s1) /* 42DE38 802A9428 3C058029 */ lui $a1, %hi(D_80292374) /* 42DE3C 802A942C 24A52374 */ addiu $a1, $a1, %lo(D_80292374) /* 42DE40 802A9430 0C0511FF */ jal set_menu_icon_script -/* 42DE44 802A9434 00000000 */ nop +/* 42DE44 802A9434 00000000 */ nop /* 42DE48 802A9438 3C048000 */ lui $a0, 0x8000 /* 42DE4C 802A943C 34840041 */ ori $a0, $a0, 0x41 /* 42DE50 802A9440 0000282D */ daddu $a1, $zero, $zero @@ -122,14 +125,15 @@ glabel func_802A92A0_42DCB0 /* 42DE6C 802A945C A6220054 */ sh $v0, 0x54($s1) /* 42DE70 802A9460 2402000B */ addiu $v0, $zero, 0xb /* 42DE74 802A9464 A622004C */ sh $v0, 0x4c($s1) +glabel L802A9468_42DE78 /* 42DE78 802A9468 0C093EB1 */ jal set_popup_duration /* 42DE7C 802A946C 24040063 */ addiu $a0, $zero, 0x63 /* 42DE80 802A9470 86220068 */ lh $v0, 0x68($s1) /* 42DE84 802A9474 14400027 */ bnez $v0, .L802A9514 -/* 42DE88 802A9478 00000000 */ nop +/* 42DE88 802A9478 00000000 */ nop /* 42DE8C 802A947C 86220064 */ lh $v0, 0x64($s1) /* 42DE90 802A9480 1040001E */ beqz $v0, .L802A94FC -/* 42DE94 802A9484 00000000 */ nop +/* 42DE94 802A9484 00000000 */ nop /* 42DE98 802A9488 82220080 */ lb $v0, 0x80($s1) /* 42DE9C 802A948C 00021040 */ sll $v0, $v0, 1 /* 42DEA0 802A9490 02221021 */ addu $v0, $s1, $v0 @@ -143,7 +147,7 @@ glabel func_802A92A0_42DCB0 /* 42DEBC 802A94AC 14610004 */ bne $v1, $at, .L802A94C0 /* 42DEC0 802A94B0 3C018000 */ lui $at, 0x8000 /* 42DEC4 802A94B4 14410002 */ bne $v0, $at, .L802A94C0 -/* 42DEC8 802A94B8 00000000 */ nop +/* 42DEC8 802A94B8 00000000 */ nop /* 42DECC 802A94BC 0006000D */ break 6 .L802A94C0: /* 42DED0 802A94C0 00001012 */ mflo $v0 @@ -192,7 +196,7 @@ glabel func_802A92A0_42DCB0 /* 42DF64 802A9554 3403C000 */ ori $v1, $zero, 0xc000 /* 42DF68 802A9558 00A31024 */ and $v0, $a1, $v1 /* 42DF6C 802A955C 14430037 */ bne $v0, $v1, .L802A963C -/* 42DF70 802A9560 00000000 */ nop +/* 42DF70 802A9560 00000000 */ nop /* 42DF74 802A9564 86220064 */ lh $v0, 0x64($s1) /* 42DF78 802A9568 1040001D */ beqz $v0, .L802A95E0 /* 42DF7C 802A956C 3C0651EB */ lui $a2, 0x51eb @@ -214,8 +218,8 @@ glabel func_802A92A0_42DCB0 /* 42DFBC 802A95AC 00832023 */ subu $a0, $a0, $v1 /* 42DFC0 802A95B0 00820018 */ mult $a0, $v0 /* 42DFC4 802A95B4 00002012 */ mflo $a0 -/* 42DFC8 802A95B8 00000000 */ nop -/* 42DFCC 802A95BC 00000000 */ nop +/* 42DFC8 802A95B8 00000000 */ nop +/* 42DFCC 802A95BC 00000000 */ nop /* 42DFD0 802A95C0 00860018 */ mult $a0, $a2 /* 42DFD4 802A95C4 000427C3 */ sra $a0, $a0, 0x1f /* 42DFD8 802A95C8 00001010 */ mfhi $v0 @@ -336,7 +340,7 @@ glabel func_802A92A0_42DCB0 /* 42E174 802A9764 14620004 */ bne $v1, $v0, .L802A9778 /* 42E178 802A9768 3C048000 */ lui $a0, 0x8000 /* 42E17C 802A976C 0C09A458 */ jal func_80269160 -/* 42E180 802A9770 00000000 */ nop +/* 42E180 802A9770 00000000 */ nop /* 42E184 802A9774 3C048000 */ lui $a0, 0x8000 .L802A9778: /* 42E188 802A9778 0C05271B */ jal stop_sound @@ -348,9 +352,10 @@ glabel func_802A92A0_42DCB0 /* 42E1A0 802A9790 2402000C */ addiu $v0, $zero, 0xc /* 42E1A4 802A9794 080AA5F8 */ j .L802A97E0 /* 42E1A8 802A9798 A622004C */ sh $v0, 0x4c($s1) +glabel L802A979C_42E1AC /* 42E1AC 802A979C 86220064 */ lh $v0, 0x64($s1) /* 42E1B0 802A97A0 14400007 */ bnez $v0, .L802A97C0 -/* 42E1B4 802A97A4 00000000 */ nop +/* 42E1B4 802A97A4 00000000 */ nop /* 42E1B8 802A97A8 96220044 */ lhu $v0, 0x44($s1) /* 42E1BC 802A97AC 2442FF9C */ addiu $v0, $v0, -0x64 /* 42E1C0 802A97B0 A6220044 */ sh $v0, 0x44($s1) @@ -367,8 +372,9 @@ glabel func_802A92A0_42DCB0 /* 42E1E4 802A97D4 A6220054 */ sh $v0, 0x54($s1) .L802A97D8: /* 42E1E8 802A97D8 0C09A327 */ jal func_80268C9C -/* 42E1EC 802A97DC 00000000 */ nop +/* 42E1EC 802A97DC 00000000 */ nop .L802A97E0: +glabel L802A97E0_42E1F0 /* 42E1F0 802A97E0 8FBF001C */ lw $ra, 0x1c($sp) /* 42E1F4 802A97E4 8FB20018 */ lw $s2, 0x18($sp) /* 42E1F8 802A97E8 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_42DA10/func_802A97F8_42E208.s b/asm/nonmatchings/code_42DA10/func_802A97F8_42E208.s index 2bfa936f01..03a7951568 100644 --- a/asm/nonmatchings/code_42DA10/func_802A97F8_42E208.s +++ b/asm/nonmatchings/code_42DA10/func_802A97F8_42E208.s @@ -37,7 +37,7 @@ glabel func_802A97F8_42E208 /* 42E288 802A9878 0C09A1DC */ jal func_80268770 /* 42E28C 802A987C 00063403 */ sra $a2, $a2, 0x10 /* 42E290 802A9880 080AA630 */ j .L802A98C0 -/* 42E294 802A9884 00000000 */ nop +/* 42E294 802A9884 00000000 */ nop .L802A9888: /* 42E298 802A9888 96230044 */ lhu $v1, 0x44($s1) /* 42E29C 802A988C 3484851F */ ori $a0, $a0, 0x851f @@ -56,7 +56,7 @@ glabel func_802A97F8_42E208 .L802A98C0: /* 42E2D0 802A98C0 8E240014 */ lw $a0, 0x14($s1) /* 42E2D4 802A98C4 0C0511EA */ jal draw_icon_0 -/* 42E2D8 802A98C8 00000000 */ nop +/* 42E2D8 802A98C8 00000000 */ nop /* 42E2DC 802A98CC 8FBF0020 */ lw $ra, 0x20($sp) /* 42E2E0 802A98D0 8FB1001C */ lw $s1, 0x1c($sp) /* 42E2E4 802A98D4 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/nonmatchings/code_42E3A0/func_802A9298_42E638.s b/asm/nonmatchings/code_42E3A0/func_802A9298_42E638.s index b699f91e97..bde5442efc 100644 --- a/asm/nonmatchings/code_42E3A0/func_802A9298_42E638.s +++ b/asm/nonmatchings/code_42E3A0/func_802A9298_42E638.s @@ -17,11 +17,12 @@ glabel func_802A9298_42E638 /* 42E668 802A92C8 2C62000D */ sltiu $v0, $v1, 0xd /* 42E66C 802A92CC 10400171 */ beqz $v0, .L802A9894 /* 42E670 802A92D0 00031080 */ sll $v0, $v1, 2 -/* 42E674 802A92D4 3C01802B */ lui $at, %hi(D_802A9A40) +/* 42E674 802A92D4 3C01802B */ lui $at, %hi(jtbl_802A9A40_42EDE0) /* 42E678 802A92D8 00220821 */ addu $at, $at, $v0 -/* 42E67C 802A92DC 8C229A40 */ lw $v0, %lo(D_802A9A40)($at) +/* 42E67C 802A92DC 8C229A40 */ lw $v0, %lo(jtbl_802A9A40_42EDE0)($at) /* 42E680 802A92E0 00400008 */ jr $v0 /* 42E684 802A92E4 00000000 */ nop +glabel L802A92E8_42E688 /* 42E688 802A92E8 0C093EB1 */ jal set_popup_duration /* 42E68C 802A92EC 24040063 */ addiu $a0, $zero, 0x63 /* 42E690 802A92F0 8E300004 */ lw $s0, 4($s1) @@ -47,6 +48,7 @@ glabel func_802A9298_42E638 /* 42E6D8 802A9338 24020001 */ addiu $v0, $zero, 1 /* 42E6DC 802A933C 080AA625 */ j .L802A9894 /* 42E6E0 802A9340 A622004C */ sh $v0, 0x4c($s1) +glabel L802A9344_42E6E4 /* 42E6E4 802A9344 0C093EB1 */ jal set_popup_duration /* 42E6E8 802A9348 24040063 */ addiu $a0, $zero, 0x63 /* 42E6EC 802A934C 8622006C */ lh $v0, 0x6c($s1) @@ -77,6 +79,7 @@ glabel func_802A9298_42E638 /* 42E748 802A93A8 24C6001C */ addiu $a2, $a2, 0x1c /* 42E74C 802A93AC 080AA625 */ j .L802A9894 /* 42E750 802A93B0 00000000 */ nop +glabel L802A93B4_42E754 /* 42E754 802A93B4 0C093EB1 */ jal set_popup_duration /* 42E758 802A93B8 24040063 */ addiu $a0, $zero, 0x63 /* 42E75C 802A93BC 8622004E */ lh $v0, 0x4e($s1) @@ -104,6 +107,7 @@ glabel func_802A9298_42E638 /* 42E7B0 802A9410 A6220054 */ sh $v0, 0x54($s1) /* 42E7B4 802A9414 2402000B */ addiu $v0, $zero, 0xb /* 42E7B8 802A9418 A622004C */ sh $v0, 0x4c($s1) +glabel L802A941C_42E7BC /* 42E7BC 802A941C 0C093EB1 */ jal set_popup_duration /* 42E7C0 802A9420 24040063 */ addiu $a0, $zero, 0x63 /* 42E7C4 802A9424 86220068 */ lh $v0, 0x68($s1) @@ -403,6 +407,7 @@ glabel func_802A9298_42E638 /* 42EC08 802A9868 2402000C */ addiu $v0, $zero, 0xc /* 42EC0C 802A986C 080AA625 */ j .L802A9894 /* 42EC10 802A9870 A622004C */ sh $v0, 0x4c($s1) +glabel L802A9874_42EC14 /* 42EC14 802A9874 86220054 */ lh $v0, 0x54($s1) /* 42EC18 802A9878 96230054 */ lhu $v1, 0x54($s1) /* 42EC1C 802A987C 10400003 */ beqz $v0, .L802A988C @@ -414,6 +419,7 @@ glabel func_802A9298_42E638 /* 42EC2C 802A988C 0C09A327 */ jal func_80268C9C /* 42EC30 802A9890 00000000 */ nop .L802A9894: +glabel L802A9894_42EC34 /* 42EC34 802A9894 8FBF0020 */ lw $ra, 0x20($sp) /* 42EC38 802A9898 8FB3001C */ lw $s3, 0x1c($sp) /* 42EC3C 802A989C 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/code_42EE20/func_802A9254_42F074.s b/asm/nonmatchings/code_42EE20/func_802A9254_42F074.s index 026cb6a0b0..01d4bc4192 100644 --- a/asm/nonmatchings/code_42EE20/func_802A9254_42F074.s +++ b/asm/nonmatchings/code_42EE20/func_802A9254_42F074.s @@ -15,11 +15,12 @@ glabel func_802A9254_42F074 /* 42F09C 802A927C 2C62000D */ sltiu $v0, $v1, 0xd /* 42F0A0 802A9280 10400128 */ beqz $v0, .L802A9724 /* 42F0A4 802A9284 00031080 */ sll $v0, $v1, 2 -/* 42F0A8 802A9288 3C01802B */ lui $at, %hi(D_802A9880) +/* 42F0A8 802A9288 3C01802B */ lui $at, %hi(jtbl_802A9880_42F6A0) /* 42F0AC 802A928C 00220821 */ addu $at, $at, $v0 -/* 42F0B0 802A9290 8C229880 */ lw $v0, %lo(D_802A9880)($at) +/* 42F0B0 802A9290 8C229880 */ lw $v0, %lo(jtbl_802A9880_42F6A0)($at) /* 42F0B4 802A9294 00400008 */ jr $v0 /* 42F0B8 802A9298 00000000 */ nop +glabel L802A929C_42F0BC /* 42F0BC 802A929C 0C093EB1 */ jal set_popup_duration /* 42F0C0 802A92A0 24040063 */ addiu $a0, $zero, 0x63 /* 42F0C4 802A92A4 8E300004 */ lw $s0, 4($s1) @@ -45,6 +46,7 @@ glabel func_802A9254_42F074 /* 42F10C 802A92EC 24020001 */ addiu $v0, $zero, 1 /* 42F110 802A92F0 080AA5C9 */ j .L802A9724 /* 42F114 802A92F4 A622004C */ sh $v0, 0x4c($s1) +glabel L802A92F8_42F118 /* 42F118 802A92F8 0C093EB1 */ jal set_popup_duration /* 42F11C 802A92FC 24040063 */ addiu $a0, $zero, 0x63 /* 42F120 802A9300 8622006C */ lh $v0, 0x6c($s1) @@ -75,6 +77,7 @@ glabel func_802A9254_42F074 /* 42F17C 802A935C 24C6001C */ addiu $a2, $a2, 0x1c /* 42F180 802A9360 080AA5C9 */ j .L802A9724 /* 42F184 802A9364 00000000 */ nop +glabel L802A9368_42F188 /* 42F188 802A9368 0C093EB1 */ jal set_popup_duration /* 42F18C 802A936C 24040063 */ addiu $a0, $zero, 0x63 /* 42F190 802A9370 8622004E */ lh $v0, 0x4e($s1) @@ -102,6 +105,7 @@ glabel func_802A9254_42F074 /* 42F1E4 802A93C4 A6220054 */ sh $v0, 0x54($s1) /* 42F1E8 802A93C8 2402000B */ addiu $v0, $zero, 0xb /* 42F1EC 802A93CC A622004C */ sh $v0, 0x4c($s1) +glabel L802A93D0_42F1F0 /* 42F1F0 802A93D0 0C093EB1 */ jal set_popup_duration /* 42F1F4 802A93D4 24040063 */ addiu $a0, $zero, 0x63 /* 42F1F8 802A93D8 86220068 */ lh $v0, 0x68($s1) @@ -321,6 +325,7 @@ glabel func_802A9254_42F074 /* 42F518 802A96F8 2402000C */ addiu $v0, $zero, 0xc /* 42F51C 802A96FC 080AA5C9 */ j .L802A9724 /* 42F520 802A9700 A622004C */ sh $v0, 0x4c($s1) +glabel L802A9704_42F524 /* 42F524 802A9704 86220054 */ lh $v0, 0x54($s1) /* 42F528 802A9708 96230054 */ lhu $v1, 0x54($s1) /* 42F52C 802A970C 10400003 */ beqz $v0, .L802A971C @@ -332,6 +337,7 @@ glabel func_802A9254_42F074 /* 42F53C 802A971C 0C09A327 */ jal func_80268C9C /* 42F540 802A9720 00000000 */ nop .L802A9724: +glabel L802A9724_42F544 /* 42F544 802A9724 8FBF001C */ lw $ra, 0x1c($sp) /* 42F548 802A9728 8FB20018 */ lw $s2, 0x18($sp) /* 42F54C 802A972C 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_42F6E0/func_802A9000_42F6E0.s b/asm/nonmatchings/code_42F6E0/func_802A9000_42F6E0.s index 9478bd8f70..6203605c17 100644 --- a/asm/nonmatchings/code_42F6E0/func_802A9000_42F6E0.s +++ b/asm/nonmatchings/code_42F6E0/func_802A9000_42F6E0.s @@ -19,7 +19,7 @@ glabel func_802A9000_42F6E0 /* 42F718 802A9038 50400053 */ beql $v0, $zero, .L802A9188 /* 42F71C 802A903C A0600081 */ sb $zero, 0x81($v1) /* 42F720 802A9040 0C09A216 */ jal func_80268858 -/* 42F724 802A9044 00000000 */ nop +/* 42F724 802A9044 00000000 */ nop /* 42F728 802A9048 3C048011 */ lui $a0, %hi(D_80108B28) /* 42F72C 802A904C 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) /* 42F730 802A9050 24020014 */ addiu $v0, $zero, 0x14 @@ -51,7 +51,7 @@ glabel func_802A9000_42F6E0 /* 42F798 802A90B8 3C048029 */ lui $a0, %hi(D_8029231C) /* 42F79C 802A90BC 2484231C */ addiu $a0, $a0, %lo(D_8029231C) /* 42F7A0 802A90C0 0C050529 */ jal create_icon -/* 42F7A4 802A90C4 00000000 */ nop +/* 42F7A4 802A90C4 00000000 */ nop /* 42F7A8 802A90C8 0040802D */ daddu $s0, $v0, $zero /* 42F7AC 802A90CC 0200202D */ daddu $a0, $s0, $zero /* 42F7B0 802A90D0 24050082 */ addiu $a1, $zero, 0x82 @@ -67,7 +67,7 @@ glabel func_802A9000_42F6E0 /* 42F7D8 802A90F8 3C048011 */ lui $a0, %hi(D_80108AFC) /* 42F7DC 802A90FC 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) /* 42F7E0 802A9100 0C050529 */ jal create_icon -/* 42F7E4 802A9104 00000000 */ nop +/* 42F7E4 802A9104 00000000 */ nop /* 42F7E8 802A9108 0040802D */ daddu $s0, $v0, $zero /* 42F7EC 802A910C 86250056 */ lh $a1, 0x56($s1) /* 42F7F0 802A9110 86260058 */ lh $a2, 0x58($s1) @@ -84,7 +84,7 @@ glabel func_802A9000_42F6E0 /* 42F81C 802A913C 3C048029 */ lui $a0, %hi(D_80292974) /* 42F820 802A9140 24842974 */ addiu $a0, $a0, %lo(D_80292974) /* 42F824 802A9144 0C050529 */ jal create_icon -/* 42F828 802A9148 00000000 */ nop +/* 42F828 802A9148 00000000 */ nop /* 42F82C 802A914C 0040802D */ daddu $s0, $v0, $zero /* 42F830 802A9150 86250056 */ lh $a1, 0x56($s1) /* 42F834 802A9154 86260058 */ lh $a2, 0x58($s1) diff --git a/asm/nonmatchings/code_42F6E0/func_802A91A0_42F880.s b/asm/nonmatchings/code_42F6E0/func_802A91A0_42F880.s index d3ae3c76ae..69b0a4773c 100644 --- a/asm/nonmatchings/code_42F6E0/func_802A91A0_42F880.s +++ b/asm/nonmatchings/code_42F6E0/func_802A91A0_42F880.s @@ -18,7 +18,7 @@ glabel func_802A91A0_42F880 /* 42F8B4 802A91D4 10400029 */ beqz $v0, .L802A927C /* 42F8B8 802A91D8 0260182D */ daddu $v1, $s3, $zero /* 42F8BC 802A91DC 0C09A216 */ jal func_80268858 -/* 42F8C0 802A91E0 00000000 */ nop +/* 42F8C0 802A91E0 00000000 */ nop /* 42F8C4 802A91E4 8E050000 */ lw $a1, ($s0) /* 42F8C8 802A91E8 26100004 */ addiu $s0, $s0, 4 /* 42F8CC 802A91EC 0C0B1EAF */ jal get_variable diff --git a/asm/nonmatchings/code_42F6E0/func_802A92A0_42F980.s b/asm/nonmatchings/code_42F6E0/func_802A92A0_42F980.s index 3e44b5ed1c..e15201fdfd 100644 --- a/asm/nonmatchings/code_42F6E0/func_802A92A0_42F980.s +++ b/asm/nonmatchings/code_42F6E0/func_802A92A0_42F980.s @@ -15,11 +15,12 @@ glabel func_802A92A0_42F980 /* 42F9A8 802A92C8 2C62000D */ sltiu $v0, $v1, 0xd /* 42F9AC 802A92CC 10400131 */ beqz $v0, .L802A9794 /* 42F9B0 802A92D0 00031080 */ sll $v0, $v1, 2 -/* 42F9B4 802A92D4 3C01802B */ lui $at, %hi(D_802A9900) +/* 42F9B4 802A92D4 3C01802B */ lui $at, %hi(jtbl_802A9900_42FFE0) /* 42F9B8 802A92D8 00220821 */ addu $at, $at, $v0 -/* 42F9BC 802A92DC 8C229900 */ lw $v0, %lo(D_802A9900)($at) +/* 42F9BC 802A92DC 8C229900 */ lw $v0, %lo(jtbl_802A9900_42FFE0)($at) /* 42F9C0 802A92E0 00400008 */ jr $v0 -/* 42F9C4 802A92E4 00000000 */ nop +/* 42F9C4 802A92E4 00000000 */ nop +glabel L802A92E8_42F9C8 /* 42F9C8 802A92E8 0C093EB1 */ jal set_popup_duration /* 42F9CC 802A92EC 24040063 */ addiu $a0, $zero, 0x63 /* 42F9D0 802A92F0 82220061 */ lb $v0, 0x61($s1) @@ -55,6 +56,7 @@ glabel func_802A92A0_42F980 /* 42FA3C 802A935C 24020001 */ addiu $v0, $zero, 1 /* 42FA40 802A9360 080AA5E5 */ j .L802A9794 /* 42FA44 802A9364 A622004C */ sh $v0, 0x4c($s1) +glabel L802A9368_42FA48 /* 42FA48 802A9368 0C093EB1 */ jal set_popup_duration /* 42FA4C 802A936C 24040063 */ addiu $a0, $zero, 0x63 /* 42FA50 802A9370 8622006C */ lh $v0, 0x6c($s1) @@ -90,7 +92,8 @@ glabel func_802A92A0_42F980 /* 42FAC0 802A93E0 0C051261 */ jal set_icon_render_pos /* 42FAC4 802A93E4 24C6001C */ addiu $a2, $a2, 0x1c /* 42FAC8 802A93E8 080AA5E5 */ j .L802A9794 -/* 42FACC 802A93EC 00000000 */ nop +/* 42FACC 802A93EC 00000000 */ nop +glabel L802A93F0_42FAD0 /* 42FAD0 802A93F0 0C093EB1 */ jal set_popup_duration /* 42FAD4 802A93F4 24040063 */ addiu $a0, $zero, 0x63 /* 42FAD8 802A93F8 8622004E */ lh $v0, 0x4e($s1) @@ -104,26 +107,27 @@ glabel func_802A92A0_42F980 /* 42FAF4 802A9414 3C058011 */ lui $a1, %hi(D_80108B80) /* 42FAF8 802A9418 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) /* 42FAFC 802A941C 0C0511FF */ jal set_menu_icon_script -/* 42FB00 802A9420 00000000 */ nop +/* 42FB00 802A9420 00000000 */ nop /* 42FB04 802A9424 8E24000C */ lw $a0, 0xc($s1) /* 42FB08 802A9428 3C058029 */ lui $a1, %hi(D_80292374) /* 42FB0C 802A942C 24A52374 */ addiu $a1, $a1, %lo(D_80292374) /* 42FB10 802A9430 0C0511FF */ jal set_menu_icon_script -/* 42FB14 802A9434 00000000 */ nop +/* 42FB14 802A9434 00000000 */ nop /* 42FB18 802A9438 96230052 */ lhu $v1, 0x52($s1) /* 42FB1C 802A943C 2402000B */ addiu $v0, $zero, 0xb /* 42FB20 802A9440 A6200044 */ sh $zero, 0x44($s1) /* 42FB24 802A9444 A220005C */ sb $zero, 0x5c($s1) /* 42FB28 802A9448 A622004C */ sh $v0, 0x4c($s1) /* 42FB2C 802A944C A6230054 */ sh $v1, 0x54($s1) +glabel L802A9450_42FB30 /* 42FB30 802A9450 0C093EB1 */ jal set_popup_duration /* 42FB34 802A9454 24040063 */ addiu $a0, $zero, 0x63 /* 42FB38 802A9458 86220068 */ lh $v0, 0x68($s1) /* 42FB3C 802A945C 14400027 */ bnez $v0, .L802A94FC -/* 42FB40 802A9460 00000000 */ nop +/* 42FB40 802A9460 00000000 */ nop /* 42FB44 802A9464 86220064 */ lh $v0, 0x64($s1) /* 42FB48 802A9468 1040001E */ beqz $v0, .L802A94E4 -/* 42FB4C 802A946C 00000000 */ nop +/* 42FB4C 802A946C 00000000 */ nop /* 42FB50 802A9470 82220080 */ lb $v0, 0x80($s1) /* 42FB54 802A9474 00021040 */ sll $v0, $v0, 1 /* 42FB58 802A9478 02221021 */ addu $v0, $s1, $v0 @@ -137,7 +141,7 @@ glabel func_802A92A0_42F980 /* 42FB74 802A9494 14610004 */ bne $v1, $at, .L802A94A8 /* 42FB78 802A9498 3C018000 */ lui $at, 0x8000 /* 42FB7C 802A949C 14410002 */ bne $v0, $at, .L802A94A8 -/* 42FB80 802A94A0 00000000 */ nop +/* 42FB80 802A94A0 00000000 */ nop /* 42FB84 802A94A4 0006000D */ break 6 .L802A94A8: /* 42FB88 802A94A8 00001012 */ mflo $v0 @@ -186,7 +190,7 @@ glabel func_802A92A0_42F980 /* 42FC1C 802A953C 3403C000 */ ori $v1, $zero, 0xc000 /* 42FC20 802A9540 00A31024 */ and $v0, $a1, $v1 /* 42FC24 802A9544 14430037 */ bne $v0, $v1, .L802A9624 -/* 42FC28 802A9548 00000000 */ nop +/* 42FC28 802A9548 00000000 */ nop /* 42FC2C 802A954C 86220064 */ lh $v0, 0x64($s1) /* 42FC30 802A9550 1040001D */ beqz $v0, .L802A95C8 /* 42FC34 802A9554 3C0651EB */ lui $a2, 0x51eb @@ -208,8 +212,8 @@ glabel func_802A92A0_42F980 /* 42FC74 802A9594 00832023 */ subu $a0, $a0, $v1 /* 42FC78 802A9598 00820018 */ mult $a0, $v0 /* 42FC7C 802A959C 00002012 */ mflo $a0 -/* 42FC80 802A95A0 00000000 */ nop -/* 42FC84 802A95A4 00000000 */ nop +/* 42FC80 802A95A0 00000000 */ nop +/* 42FC84 802A95A4 00000000 */ nop /* 42FC88 802A95A8 00860018 */ mult $a0, $a2 /* 42FC8C 802A95AC 000427C3 */ sra $a0, $a0, 0x1f /* 42FC90 802A95B0 00001010 */ mfhi $v0 @@ -318,9 +322,9 @@ glabel func_802A92A0_42F980 /* 42FDFC 802A971C 82430081 */ lb $v1, 0x81($s2) /* 42FE00 802A9720 24020064 */ addiu $v0, $zero, 0x64 /* 42FE04 802A9724 14620003 */ bne $v1, $v0, .L802A9734 -/* 42FE08 802A9728 00000000 */ nop +/* 42FE08 802A9728 00000000 */ nop /* 42FE0C 802A972C 0C09A458 */ jal func_80269160 -/* 42FE10 802A9730 00000000 */ nop +/* 42FE10 802A9730 00000000 */ nop .L802A9734: /* 42FE14 802A9734 0C093EB1 */ jal set_popup_duration /* 42FE18 802A9738 0000202D */ daddu $a0, $zero, $zero @@ -329,9 +333,10 @@ glabel func_802A92A0_42F980 /* 42FE24 802A9744 2402000C */ addiu $v0, $zero, 0xc /* 42FE28 802A9748 080AA5E5 */ j .L802A9794 /* 42FE2C 802A974C A622004C */ sh $v0, 0x4c($s1) +glabel L802A9750_42FE30 /* 42FE30 802A9750 86220064 */ lh $v0, 0x64($s1) /* 42FE34 802A9754 14400007 */ bnez $v0, .L802A9774 -/* 42FE38 802A9758 00000000 */ nop +/* 42FE38 802A9758 00000000 */ nop /* 42FE3C 802A975C 96220044 */ lhu $v0, 0x44($s1) /* 42FE40 802A9760 2442FF9C */ addiu $v0, $v0, -0x64 /* 42FE44 802A9764 A6220044 */ sh $v0, 0x44($s1) @@ -348,8 +353,9 @@ glabel func_802A92A0_42F980 /* 42FE68 802A9788 A6220054 */ sh $v0, 0x54($s1) .L802A978C: /* 42FE6C 802A978C 0C09A327 */ jal func_80268C9C -/* 42FE70 802A9790 00000000 */ nop +/* 42FE70 802A9790 00000000 */ nop .L802A9794: +glabel L802A9794_42FE74 /* 42FE74 802A9794 8FBF001C */ lw $ra, 0x1c($sp) /* 42FE78 802A9798 8FB20018 */ lw $s2, 0x18($sp) /* 42FE7C 802A979C 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_42F6E0/func_802A97AC_42FE8C.s b/asm/nonmatchings/code_42F6E0/func_802A97AC_42FE8C.s index 282f14238d..857bfc9450 100644 --- a/asm/nonmatchings/code_42F6E0/func_802A97AC_42FE8C.s +++ b/asm/nonmatchings/code_42F6E0/func_802A97AC_42FE8C.s @@ -37,7 +37,7 @@ glabel func_802A97AC_42FE8C /* 42FF0C 802A982C 0C09A1DC */ jal func_80268770 /* 42FF10 802A9830 00063403 */ sra $a2, $a2, 0x10 /* 42FF14 802A9834 080AA61D */ j .L802A9874 -/* 42FF18 802A9838 00000000 */ nop +/* 42FF18 802A9838 00000000 */ nop .L802A983C: /* 42FF1C 802A983C 96230044 */ lhu $v1, 0x44($s1) /* 42FF20 802A9840 3484851F */ ori $a0, $a0, 0x851f @@ -56,7 +56,7 @@ glabel func_802A97AC_42FE8C .L802A9874: /* 42FF54 802A9874 8E240014 */ lw $a0, 0x14($s1) /* 42FF58 802A9878 0C0511EA */ jal draw_icon_0 -/* 42FF5C 802A987C 00000000 */ nop +/* 42FF5C 802A987C 00000000 */ nop /* 42FF60 802A9880 8FBF0020 */ lw $ra, 0x20($sp) /* 42FF64 802A9884 8FB1001C */ lw $s1, 0x1c($sp) /* 42FF68 802A9888 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/nonmatchings/code_42F6E0/func_802A9894_42FF74.s b/asm/nonmatchings/code_42F6E0/func_802A9894_42FF74.s index f219747826..5e9e39958c 100644 --- a/asm/nonmatchings/code_42F6E0/func_802A9894_42FF74.s +++ b/asm/nonmatchings/code_42F6E0/func_802A9894_42FF74.s @@ -19,5 +19,5 @@ glabel func_802A9894_42FF74 /* 42FFAC 802A98CC 8FB00010 */ lw $s0, 0x10($sp) /* 42FFB0 802A98D0 03E00008 */ jr $ra /* 42FFB4 802A98D4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 42FFB8 802A98D8 00000000 */ nop -/* 42FFBC 802A98DC 00000000 */ nop +/* 42FFB8 802A98D8 00000000 */ nop +/* 42FFBC 802A98DC 00000000 */ nop diff --git a/asm/nonmatchings/code_42e0_len_1f60/update_lerp.s b/asm/nonmatchings/code_42e0_len_1f60/update_lerp.s index 9cf1316ab3..19e727c392 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/update_lerp.s +++ b/asm/nonmatchings/code_42e0_len_1f60/update_lerp.s @@ -20,11 +20,12 @@ glabel update_lerp /* 57EC 8002A3EC 2C82000D */ sltiu $v0, $a0, 0xd /* 57F0 8002A3F0 1040013B */ beqz $v0, .L8002A8E0 /* 57F4 8002A3F4 00041080 */ sll $v0, $a0, 2 -/* 57F8 8002A3F8 3C018009 */ lui $at, %hi(D_80097D90) +/* 57F8 8002A3F8 3C018009 */ lui $at, %hi(jtbl_80097D90_73190) /* 57FC 8002A3FC 00220821 */ addu $at, $at, $v0 -/* 5800 8002A400 8C227D90 */ lw $v0, %lo(D_80097D90)($at) +/* 5800 8002A400 8C227D90 */ lw $v0, %lo(jtbl_80097D90_73190)($at) /* 5804 8002A404 00400008 */ jr $v0 /* 5808 8002A408 00000000 */ nop +glabel L8002A40C_580C /* 580C 8002A40C 4616C001 */ sub.s $f0, $f24, $f22 /* 5810 8002A410 44911000 */ mtc1 $s1, $f2 /* 5814 8002A414 00000000 */ nop @@ -36,16 +37,19 @@ glabel update_lerp /* 582C 8002A42C 468010A0 */ cvt.s.w $f2, $f2 /* 5830 8002A430 0800A938 */ j .L8002A4E0 /* 5834 8002A434 46020003 */ div.s $f0, $f0, $f2 +glabel L8002A438_5838 /* 5838 8002A438 02310018 */ mult $s1, $s1 /* 583C 8002A43C 00004012 */ mflo $t0 /* 5840 8002A440 00000000 */ nop /* 5844 8002A444 0800A92D */ j .L8002A4B4 /* 5848 8002A448 02100018 */ mult $s0, $s0 +glabel L8002A44C_584C /* 584C 8002A44C 02310018 */ mult $s1, $s1 /* 5850 8002A450 00004012 */ mflo $t0 /* 5854 8002A454 00000000 */ nop /* 5858 8002A458 0800A925 */ j .L8002A494 /* 585C 8002A45C 02100018 */ mult $s0, $s0 +glabel L8002A460_5860 /* 5860 8002A460 02310018 */ mult $s1, $s1 /* 5864 8002A464 00004012 */ mflo $t0 /* 5868 8002A468 00000000 */ nop @@ -83,6 +87,7 @@ glabel update_lerp .L8002A4E0: /* 58E0 8002A4E0 0800AA39 */ j .L8002A8E4 /* 58E4 8002A4E4 4600B000 */ add.s $f0, $f22, $f0 +glabel L8002A4E8_58E8 /* 58E8 8002A4E8 44916000 */ mtc1 $s1, $f12 /* 58EC 8002A4EC 00000000 */ nop /* 58F0 8002A4F0 46806320 */ cvt.s.w $f12, $f12 @@ -102,6 +107,7 @@ glabel update_lerp /* 5928 8002A528 46206302 */ mul.d $f12, $f12, $f0 /* 592C 8002A52C 0800A966 */ j .L8002A598 /* 5930 8002A530 00000000 */ nop +glabel L8002A534_5934 /* 5934 8002A534 02310018 */ mult $s1, $s1 /* 5938 8002A538 4490A000 */ mtc1 $s0, $f20 /* 593C 8002A53C 00000000 */ nop @@ -146,6 +152,7 @@ glabel update_lerp /* 59D4 8002A5D4 46141083 */ div.s $f2, $f2, $f20 /* 59D8 8002A5D8 0800AA39 */ j .L8002A8E4 /* 59DC 8002A5DC 4602C001 */ sub.s $f0, $f24, $f2 +glabel L8002A5E0_59E0 /* 59E0 8002A5E0 02113823 */ subu $a3, $s0, $s1 /* 59E4 8002A5E4 00E70018 */ mult $a3, $a3 /* 59E8 8002A5E8 4616C101 */ sub.s $f4, $f24, $f22 @@ -162,6 +169,7 @@ glabel update_lerp /* 5A14 8002A614 468010A0 */ cvt.s.w $f2, $f2 /* 5A18 8002A618 0800A9B3 */ j .L8002A6CC /* 5A1C 8002A61C 4604B100 */ add.s $f4, $f22, $f4 +glabel L8002A620_5A20 /* 5A20 8002A620 02113823 */ subu $a3, $s0, $s1 /* 5A24 8002A624 00E70018 */ mult $a3, $a3 /* 5A28 8002A628 00001012 */ mflo $v0 @@ -172,6 +180,7 @@ glabel update_lerp /* 5A3C 8002A63C 00000000 */ nop /* 5A40 8002A640 0800A9A4 */ j .L8002A690 /* 5A44 8002A644 02100018 */ mult $s0, $s0 +glabel L8002A648_5A48 /* 5A48 8002A648 02113823 */ subu $a3, $s0, $s1 /* 5A4C 8002A64C 00E70018 */ mult $a3, $a3 /* 5A50 8002A650 00001012 */ mflo $v0 @@ -210,6 +219,7 @@ glabel update_lerp /* 5ACC 8002A6CC 46020003 */ div.s $f0, $f0, $f2 /* 5AD0 8002A6D0 0800AA39 */ j .L8002A8E4 /* 5AD4 8002A6D4 46002001 */ sub.s $f0, $f4, $f0 +glabel L8002A6D8_5AD8 /* 5AD8 8002A6D8 02310018 */ mult $s1, $s1 /* 5ADC 8002A6DC 4490A000 */ mtc1 $s0, $f20 /* 5AE0 8002A6E0 00000000 */ nop @@ -259,6 +269,7 @@ glabel update_lerp /* 5B8C 8002A78C 00000000 */ nop /* 5B90 8002A790 0800AA39 */ j .L8002A8E4 /* 5B94 8002A794 4600C001 */ sub.s $f0, $f24, $f0 +glabel L8002A798_5B98 /* 5B98 8002A798 44916000 */ mtc1 $s1, $f12 /* 5B9C 8002A79C 00000000 */ nop /* 5BA0 8002A7A0 46806320 */ cvt.s.w $f12, $f12 @@ -293,6 +304,7 @@ glabel update_lerp /* 5C14 8002A814 46220000 */ add.d $f0, $f0, $f2 /* 5C18 8002A818 0800AA39 */ j .L8002A8E4 /* 5C1C 8002A81C 46200020 */ cvt.s.d $f0, $f0 +glabel L8002A820_5C20 /* 5C20 8002A820 44916000 */ mtc1 $s1, $f12 /* 5C24 8002A824 00000000 */ nop /* 5C28 8002A828 46806320 */ cvt.s.w $f12, $f12 @@ -313,6 +325,7 @@ glabel update_lerp /* 5C64 8002A864 00000000 */ nop /* 5C68 8002A868 0800AA39 */ j .L8002A8E4 /* 5C6C 8002A86C 4602B000 */ add.s $f0, $f22, $f2 +glabel L8002A870_5C70 /* 5C70 8002A870 44916000 */ mtc1 $s1, $f12 /* 5C74 8002A874 00000000 */ nop /* 5C78 8002A878 46806320 */ cvt.s.w $f12, $f12 diff --git a/asm/nonmatchings/code_430020/func_802A9000_430020.s b/asm/nonmatchings/code_430020/func_802A9000_430020.s index 3709caf3d2..f47cf71ee2 100644 --- a/asm/nonmatchings/code_430020/func_802A9000_430020.s +++ b/asm/nonmatchings/code_430020/func_802A9000_430020.s @@ -21,7 +21,7 @@ glabel func_802A9000_430020 /* 430060 802A9040 10400047 */ beqz $v0, .L802A9160 /* 430064 802A9044 0200182D */ daddu $v1, $s0, $zero /* 430068 802A9048 0C09A216 */ jal func_80268858 -/* 43006C 802A904C 00000000 */ nop +/* 43006C 802A904C 00000000 */ nop /* 430070 802A9050 3C048011 */ lui $a0, %hi(D_80108E1C) /* 430074 802A9054 24848E1C */ addiu $a0, $a0, %lo(D_80108E1C) /* 430078 802A9058 24020015 */ addiu $v0, $zero, 0x15 @@ -57,7 +57,7 @@ glabel func_802A9000_430020 /* 4300F0 802A90D0 3C048011 */ lui $a0, %hi(D_80108AFC) /* 4300F4 802A90D4 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) /* 4300F8 802A90D8 0C050529 */ jal create_icon -/* 4300FC 802A90DC 00000000 */ nop +/* 4300FC 802A90DC 00000000 */ nop /* 430100 802A90E0 0040802D */ daddu $s0, $v0, $zero /* 430104 802A90E4 86250056 */ lh $a1, 0x56($s1) /* 430108 802A90E8 86260058 */ lh $a2, 0x58($s1) @@ -74,7 +74,7 @@ glabel func_802A9000_430020 /* 430134 802A9114 3C048029 */ lui $a0, %hi(D_80292974) /* 430138 802A9118 24842974 */ addiu $a0, $a0, %lo(D_80292974) /* 43013C 802A911C 0C050529 */ jal create_icon -/* 430140 802A9120 00000000 */ nop +/* 430140 802A9120 00000000 */ nop /* 430144 802A9124 0040802D */ daddu $s0, $v0, $zero /* 430148 802A9128 86250056 */ lh $a1, 0x56($s1) /* 43014C 802A912C 86260058 */ lh $a2, 0x58($s1) diff --git a/asm/nonmatchings/code_430020/func_802A917C_43019C.s b/asm/nonmatchings/code_430020/func_802A917C_43019C.s index 441be8bacd..59ba6cb75c 100644 --- a/asm/nonmatchings/code_430020/func_802A917C_43019C.s +++ b/asm/nonmatchings/code_430020/func_802A917C_43019C.s @@ -18,7 +18,7 @@ glabel func_802A917C_43019C /* 4301D0 802A91B0 10400030 */ beqz $v0, .L802A9274 /* 4301D4 802A91B4 0240182D */ daddu $v1, $s2, $zero /* 4301D8 802A91B8 0C09A216 */ jal func_80268858 -/* 4301DC 802A91BC 00000000 */ nop +/* 4301DC 802A91BC 00000000 */ nop /* 4301E0 802A91C0 8E050000 */ lw $a1, ($s0) /* 4301E4 802A91C4 26100004 */ addiu $s0, $s0, 4 /* 4301E8 802A91C8 0C0B1EAF */ jal get_variable diff --git a/asm/nonmatchings/code_430020/func_802A9298_4302B8.s b/asm/nonmatchings/code_430020/func_802A9298_4302B8.s index 970abc7a29..a0980b1137 100644 --- a/asm/nonmatchings/code_430020/func_802A9298_4302B8.s +++ b/asm/nonmatchings/code_430020/func_802A9298_4302B8.s @@ -15,11 +15,12 @@ glabel func_802A9298_4302B8 /* 4302E0 802A92C0 2C62000D */ sltiu $v0, $v1, 0xd /* 4302E4 802A92C4 10400147 */ beqz $v0, .L802A97E4 /* 4302E8 802A92C8 00031080 */ sll $v0, $v1, 2 -/* 4302EC 802A92CC 3C01802B */ lui $at, %hi(D_802A9940) +/* 4302EC 802A92CC 3C01802B */ lui $at, %hi(jtbl_802A9940_430960) /* 4302F0 802A92D0 00220821 */ addu $at, $at, $v0 -/* 4302F4 802A92D4 8C229940 */ lw $v0, %lo(D_802A9940)($at) +/* 4302F4 802A92D4 8C229940 */ lw $v0, %lo(jtbl_802A9940_430960)($at) /* 4302F8 802A92D8 00400008 */ jr $v0 -/* 4302FC 802A92DC 00000000 */ nop +/* 4302FC 802A92DC 00000000 */ nop +glabel L802A92E0_430300 /* 430300 802A92E0 0C093EB1 */ jal set_popup_duration /* 430304 802A92E4 24040063 */ addiu $a0, $zero, 0x63 /* 430308 802A92E8 8E300004 */ lw $s0, 4($s1) @@ -45,6 +46,7 @@ glabel func_802A9298_4302B8 /* 430350 802A9330 24020001 */ addiu $v0, $zero, 1 /* 430354 802A9334 080AA5F9 */ j .L802A97E4 /* 430358 802A9338 A622004C */ sh $v0, 0x4c($s1) +glabel L802A933C_43035C /* 43035C 802A933C 0C093EB1 */ jal set_popup_duration /* 430360 802A9340 24040063 */ addiu $a0, $zero, 0x63 /* 430364 802A9344 96220056 */ lhu $v0, 0x56($s1) @@ -67,7 +69,8 @@ glabel func_802A9298_4302B8 /* 4303A4 802A9384 0C051261 */ jal set_icon_render_pos /* 4303A8 802A9388 24C6001C */ addiu $a2, $a2, 0x1c /* 4303AC 802A938C 080AA5F9 */ j .L802A97E4 -/* 4303B0 802A9390 00000000 */ nop +/* 4303B0 802A9390 00000000 */ nop +glabel L802A9394_4303B4 /* 4303B4 802A9394 0C093EB1 */ jal set_popup_duration /* 4303B8 802A9398 24040063 */ addiu $a0, $zero, 0x63 /* 4303BC 802A939C 8622004E */ lh $v0, 0x4e($s1) @@ -81,7 +84,7 @@ glabel func_802A9298_4302B8 /* 4303D8 802A93B8 3C058011 */ lui $a1, %hi(D_80108F30) /* 4303DC 802A93BC 24A58F30 */ addiu $a1, $a1, %lo(D_80108F30) /* 4303E0 802A93C0 0C0511FF */ jal set_menu_icon_script -/* 4303E4 802A93C4 00000000 */ nop +/* 4303E4 802A93C4 00000000 */ nop /* 4303E8 802A93C8 3C048000 */ lui $a0, 0x8000 /* 4303EC 802A93CC 34840041 */ ori $a0, $a0, 0x41 /* 4303F0 802A93D0 0000282D */ daddu $a1, $zero, $zero @@ -95,14 +98,15 @@ glabel func_802A9298_4302B8 /* 430410 802A93F0 A6220054 */ sh $v0, 0x54($s1) /* 430414 802A93F4 2402000B */ addiu $v0, $zero, 0xb /* 430418 802A93F8 A622004C */ sh $v0, 0x4c($s1) +glabel L802A93FC_43041C /* 43041C 802A93FC 0C093EB1 */ jal set_popup_duration /* 430420 802A9400 24040063 */ addiu $a0, $zero, 0x63 /* 430424 802A9404 86220068 */ lh $v0, 0x68($s1) /* 430428 802A9408 1440008F */ bnez $v0, .L802A9648 -/* 43042C 802A940C 00000000 */ nop +/* 43042C 802A940C 00000000 */ nop /* 430430 802A9410 86220064 */ lh $v0, 0x64($s1) /* 430434 802A9414 1040001E */ beqz $v0, .L802A9490 -/* 430438 802A9418 00000000 */ nop +/* 430438 802A9418 00000000 */ nop /* 43043C 802A941C 82220080 */ lb $v0, 0x80($s1) /* 430440 802A9420 00021040 */ sll $v0, $v0, 1 /* 430444 802A9424 02221021 */ addu $v0, $s1, $v0 @@ -116,7 +120,7 @@ glabel func_802A9298_4302B8 /* 430460 802A9440 14610004 */ bne $v1, $at, .L802A9454 /* 430464 802A9444 3C018000 */ lui $at, 0x8000 /* 430468 802A9448 14410002 */ bne $v0, $at, .L802A9454 -/* 43046C 802A944C 00000000 */ nop +/* 43046C 802A944C 00000000 */ nop /* 430470 802A9450 0006000D */ break 6 .L802A9454: /* 430474 802A9454 00001012 */ mflo $v0 @@ -145,7 +149,7 @@ glabel func_802A9298_4302B8 .L802A94A8: /* 4304C8 802A94A8 86220068 */ lh $v0, 0x68($s1) /* 4304CC 802A94AC 14400066 */ bnez $v0, .L802A9648 -/* 4304D0 802A94B0 00000000 */ nop +/* 4304D0 802A94B0 00000000 */ nop /* 4304D4 802A94B4 86220064 */ lh $v0, 0x64($s1) /* 4304D8 802A94B8 10400044 */ beqz $v0, .L802A95CC /* 4304DC 802A94BC 3C040004 */ lui $a0, 4 @@ -160,7 +164,7 @@ glabel func_802A9298_4302B8 .L802A94E0: /* 430500 802A94E0 8222005C */ lb $v0, 0x5c($s1) /* 430504 802A94E4 1040001B */ beqz $v0, .L802A9554 -/* 430508 802A94E8 00000000 */ nop +/* 430508 802A94E8 00000000 */ nop /* 43050C 802A94EC 86240050 */ lh $a0, 0x50($s1) /* 430510 802A94F0 8E420434 */ lw $v0, 0x434($s2) /* 430514 802A94F4 86230064 */ lh $v1, 0x64($s1) @@ -192,7 +196,7 @@ glabel func_802A9298_4302B8 /* 430578 802A9558 3C030008 */ lui $v1, 8 /* 43057C 802A955C 00431024 */ and $v0, $v0, $v1 /* 430580 802A9560 10400039 */ beqz $v0, .L802A9648 -/* 430584 802A9564 00000000 */ nop +/* 430584 802A9564 00000000 */ nop /* 430588 802A9568 86240050 */ lh $a0, 0x50($s1) /* 43058C 802A956C 8E420434 */ lw $v0, 0x434($s2) /* 430590 802A9570 86230064 */ lh $v1, 0x64($s1) @@ -222,7 +226,7 @@ glabel func_802A9298_4302B8 /* 4305EC 802A95CC 8E420210 */ lw $v0, 0x210($s2) /* 4305F0 802A95D0 00441024 */ and $v0, $v0, $a0 /* 4305F4 802A95D4 10400006 */ beqz $v0, .L802A95F0 -/* 4305F8 802A95D8 00000000 */ nop +/* 4305F8 802A95D8 00000000 */ nop /* 4305FC 802A95DC 8E420210 */ lw $v0, 0x210($s2) /* 430600 802A95E0 24030001 */ addiu $v1, $zero, 1 /* 430604 802A95E4 00441024 */ and $v0, $v0, $a0 @@ -231,7 +235,7 @@ glabel func_802A9298_4302B8 .L802A95F0: /* 430610 802A95F0 8222005C */ lb $v0, 0x5c($s1) /* 430614 802A95F4 1040000C */ beqz $v0, .L802A9628 -/* 430618 802A95F8 00000000 */ nop +/* 430618 802A95F8 00000000 */ nop /* 43061C 802A95FC 96220044 */ lhu $v0, 0x44($s1) /* 430620 802A9600 24420064 */ addiu $v0, $v0, 0x64 /* 430624 802A9604 A6220044 */ sh $v0, 0x44($s1) @@ -248,7 +252,7 @@ glabel func_802A9298_4302B8 /* 43064C 802A962C 3C030008 */ lui $v1, 8 /* 430650 802A9630 00431024 */ and $v0, $v0, $v1 /* 430654 802A9634 10400004 */ beqz $v0, .L802A9648 -/* 430658 802A9638 00000000 */ nop +/* 430658 802A9638 00000000 */ nop /* 43065C 802A963C 96220044 */ lhu $v0, 0x44($s1) /* 430660 802A9640 2442FF9C */ addiu $v0, $v0, -0x64 .L802A9644: @@ -333,9 +337,9 @@ glabel func_802A9298_4302B8 /* 430780 802A9760 82430081 */ lb $v1, 0x81($s2) /* 430784 802A9764 24020064 */ addiu $v0, $zero, 0x64 /* 430788 802A9768 14620003 */ bne $v1, $v0, .L802A9778 -/* 43078C 802A976C 00000000 */ nop +/* 43078C 802A976C 00000000 */ nop /* 430790 802A9770 0C09A458 */ jal func_80269160 -/* 430794 802A9774 00000000 */ nop +/* 430794 802A9774 00000000 */ nop .L802A9778: /* 430798 802A9778 0C093EB1 */ jal set_popup_duration /* 43079C 802A977C 0000202D */ daddu $a0, $zero, $zero @@ -347,9 +351,10 @@ glabel func_802A9298_4302B8 /* 4307B4 802A9794 2402000C */ addiu $v0, $zero, 0xc /* 4307B8 802A9798 080AA5F9 */ j .L802A97E4 /* 4307BC 802A979C A622004C */ sh $v0, 0x4c($s1) +glabel L802A97A0_4307C0 /* 4307C0 802A97A0 86220064 */ lh $v0, 0x64($s1) /* 4307C4 802A97A4 14400007 */ bnez $v0, .L802A97C4 -/* 4307C8 802A97A8 00000000 */ nop +/* 4307C8 802A97A8 00000000 */ nop /* 4307CC 802A97AC 96220044 */ lhu $v0, 0x44($s1) /* 4307D0 802A97B0 2442FF9C */ addiu $v0, $v0, -0x64 /* 4307D4 802A97B4 A6220044 */ sh $v0, 0x44($s1) @@ -366,8 +371,9 @@ glabel func_802A9298_4302B8 /* 4307F8 802A97D8 A6220054 */ sh $v0, 0x54($s1) .L802A97DC: /* 4307FC 802A97DC 0C09A327 */ jal func_80268C9C -/* 430800 802A97E0 00000000 */ nop +/* 430800 802A97E0 00000000 */ nop .L802A97E4: +glabel L802A97E4_430804 /* 430804 802A97E4 8FBF001C */ lw $ra, 0x1c($sp) /* 430808 802A97E8 8FB20018 */ lw $s2, 0x18($sp) /* 43080C 802A97EC 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_430020/func_802A97FC_43081C.s b/asm/nonmatchings/code_430020/func_802A97FC_43081C.s index 5222d60d03..262aa9ff67 100644 --- a/asm/nonmatchings/code_430020/func_802A97FC_43081C.s +++ b/asm/nonmatchings/code_430020/func_802A97FC_43081C.s @@ -35,7 +35,7 @@ glabel func_802A97FC_43081C /* 430894 802A9874 0C09A1DC */ jal func_80268770 /* 430898 802A9878 00063403 */ sra $a2, $a2, 0x10 /* 43089C 802A987C 080AA62F */ j .L802A98BC -/* 4308A0 802A9880 00000000 */ nop +/* 4308A0 802A9880 00000000 */ nop .L802A9884: /* 4308A4 802A9884 96230044 */ lhu $v1, 0x44($s1) /* 4308A8 802A9888 3484851F */ ori $a0, $a0, 0x851f @@ -54,7 +54,7 @@ glabel func_802A97FC_43081C .L802A98BC: /* 4308DC 802A98BC 8E24000C */ lw $a0, 0xc($s1) /* 4308E0 802A98C0 0C0511EA */ jal draw_icon_0 -/* 4308E4 802A98C4 00000000 */ nop +/* 4308E4 802A98C4 00000000 */ nop /* 4308E8 802A98C8 8FBF0020 */ lw $ra, 0x20($sp) /* 4308EC 802A98CC 8FB1001C */ lw $s1, 0x1c($sp) /* 4308F0 802A98D0 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/nonmatchings/code_430020/func_802A98DC_4308FC.s b/asm/nonmatchings/code_430020/func_802A98DC_4308FC.s index e216900a7f..d011648a47 100644 --- a/asm/nonmatchings/code_430020/func_802A98DC_4308FC.s +++ b/asm/nonmatchings/code_430020/func_802A98DC_4308FC.s @@ -17,5 +17,5 @@ glabel func_802A98DC_4308FC /* 43092C 802A990C 8FB00010 */ lw $s0, 0x10($sp) /* 430930 802A9910 03E00008 */ jr $ra /* 430934 802A9914 27BD0018 */ addiu $sp, $sp, 0x18 -/* 430938 802A9918 00000000 */ nop -/* 43093C 802A991C 00000000 */ nop +/* 430938 802A9918 00000000 */ nop +/* 43093C 802A991C 00000000 */ nop diff --git a/asm/nonmatchings/code_6F5E80/func_80238000_6F5E80.s b/asm/nonmatchings/code_6F5E80/func_80238000_6F5E80.s index 342d7d731c..6f5bde5274 100644 --- a/asm/nonmatchings/code_6F5E80/func_80238000_6F5E80.s +++ b/asm/nonmatchings/code_6F5E80/func_80238000_6F5E80.s @@ -24,9 +24,9 @@ glabel func_80238000_6F5E80 /* 6F5EC8 80238048 C602004C */ lwc1 $f2, 0x4c($s0) /* 6F5ECC 8023804C 3C014080 */ lui $at, 0x4080 /* 6F5ED0 80238050 44810000 */ mtc1 $at, $f0 -/* 6F5ED4 80238054 00000000 */ nop +/* 6F5ED4 80238054 00000000 */ nop /* 6F5ED8 80238058 4600103C */ c.lt.s $f2, $f0 -/* 6F5EDC 8023805C 00000000 */ nop +/* 6F5EDC 8023805C 00000000 */ nop /* 6F5EE0 80238060 45000007 */ bc1f .L80238080 /* 6F5EE4 80238064 0000202D */ daddu $a0, $zero, $zero /* 6F5EE8 80238068 C6000054 */ lwc1 $f0, 0x54($s0) @@ -44,7 +44,7 @@ glabel func_80238000_6F5E80 /* 6F5F14 80238094 24040001 */ addiu $a0, $zero, 1 .L80238098: /* 6F5F18 80238098 0C0990BC */ jal play_movement_dust_effects -/* 6F5F1C 8023809C 00000000 */ nop +/* 6F5F1C 8023809C 00000000 */ nop /* 6F5F20 802380A0 C6200040 */ lwc1 $f0, 0x40($s1) /* 6F5F24 802380A4 3C013FF8 */ lui $at, 0x3ff8 /* 6F5F28 802380A8 44811800 */ mtc1 $at, $f3 @@ -65,7 +65,7 @@ glabel func_80238000_6F5E80 /* 6F5F64 802380E4 44801000 */ mtc1 $zero, $f2 /* 6F5F68 802380E8 46000021 */ cvt.d.s $f0, $f0 /* 6F5F6C 802380EC 4622003C */ c.lt.d $f0, $f2 -/* 6F5F70 802380F0 00000000 */ nop +/* 6F5F70 802380F0 00000000 */ nop /* 6F5F74 802380F4 45010002 */ bc1t .L80238100 /* 6F5F78 802380F8 24020002 */ addiu $v0, $zero, 2 /* 6F5F7C 802380FC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_6F5E80/func_80238114_6F5F94.s b/asm/nonmatchings/code_6F5E80/func_80238114_6F5F94.s index 6f0d45d743..fb81095ff0 100644 --- a/asm/nonmatchings/code_6F5E80/func_80238114_6F5F94.s +++ b/asm/nonmatchings/code_6F5E80/func_80238114_6F5F94.s @@ -37,24 +37,24 @@ glabel func_80238114_6F5F94 /* 6F600C 8023818C 86220004 */ lh $v0, 4($s1) /* 6F6010 80238190 86240000 */ lh $a0, ($s1) /* 6F6014 80238194 4482B000 */ mtc1 $v0, $f22 -/* 6F6018 80238198 00000000 */ nop +/* 6F6018 80238198 00000000 */ nop /* 6F601C 8023819C 0C09A75B */ jal get_actor /* 6F6020 802381A0 4680B5A0 */ cvt.s.w $f22, $f22 /* 6F6024 802381A4 0040802D */ daddu $s0, $v0, $zero /* 6F6028 802381A8 12000015 */ beqz $s0, .L80238200 -/* 6F602C 802381AC 00000000 */ nop +/* 6F602C 802381AC 00000000 */ nop /* 6F6030 802381B0 86250002 */ lh $a1, 2($s1) /* 6F6034 802381B4 0C099117 */ jal get_actor_part /* 6F6038 802381B8 0200202D */ daddu $a0, $s0, $zero /* 6F603C 802381BC 82030218 */ lb $v1, 0x218($s0) /* 6F6040 802381C0 1460000F */ bnez $v1, .L80238200 -/* 6F6044 802381C4 00000000 */ nop +/* 6F6044 802381C4 00000000 */ nop /* 6F6048 802381C8 8C42007C */ lw $v0, 0x7c($v0) /* 6F604C 802381CC 30420020 */ andi $v0, $v0, 0x20 /* 6F6050 802381D0 1440000B */ bnez $v0, .L80238200 -/* 6F6054 802381D4 00000000 */ nop +/* 6F6054 802381D4 00000000 */ nop /* 6F6058 802381D8 4614B03C */ c.lt.s $f22, $f20 -/* 6F605C 802381DC 00000000 */ nop +/* 6F605C 802381DC 00000000 */ nop /* 6F6060 802381E0 45020004 */ bc1fl .L802381F4 /* 6F6064 802381E4 AE00018C */ sw $zero, 0x18c($s0) /* 6F6068 802381E8 C600018C */ lwc1 $f0, 0x18c($s0) diff --git a/asm/nonmatchings/code_6F5E80/func_80238298_6F6118.s b/asm/nonmatchings/code_6F5E80/func_80238298_6F6118.s index b81c22b31b..31ba0f3b05 100644 --- a/asm/nonmatchings/code_6F5E80/func_80238298_6F6118.s +++ b/asm/nonmatchings/code_6F5E80/func_80238298_6F6118.s @@ -45,7 +45,7 @@ glabel func_80238298_6F6118 /* 6F61B0 80238330 0000202D */ daddu $a0, $zero, $zero .L80238334: /* 6F61B4 80238334 18800003 */ blez $a0, .L80238344 -/* 6F61B8 80238338 00000000 */ nop +/* 6F61B8 80238338 00000000 */ nop /* 6F61BC 8023833C 02649821 */ addu $s3, $s3, $a0 /* 6F61C0 80238340 26940001 */ addiu $s4, $s4, 1 .L80238344: @@ -65,7 +65,7 @@ glabel func_80238298_6F6118 /* 6F61F0 80238370 16810004 */ bne $s4, $at, .L80238384 /* 6F61F4 80238374 3C018000 */ lui $at, 0x8000 /* 6F61F8 80238378 16610002 */ bne $s3, $at, .L80238384 -/* 6F61FC 8023837C 00000000 */ nop +/* 6F61FC 8023837C 00000000 */ nop /* 6F6200 80238380 0006000D */ break 6 .L80238384: /* 6F6204 80238384 00001012 */ mflo $v0 diff --git a/asm/nonmatchings/code_6F5E80/func_802383C0_6F6240.s b/asm/nonmatchings/code_6F5E80/func_802383C0_6F6240.s index 0257f1116f..db24ceee0e 100644 --- a/asm/nonmatchings/code_6F5E80/func_802383C0_6F6240.s +++ b/asm/nonmatchings/code_6F5E80/func_802383C0_6F6240.s @@ -34,4 +34,4 @@ glabel func_802383C0_6F6240 /* 6F62A0 80238420 24020002 */ addiu $v0, $zero, 2 /* 6F62A4 80238424 03E00008 */ jr $ra /* 6F62A8 80238428 AC8300C0 */ sw $v1, 0xc0($a0) -/* 6F62AC 8023842C 00000000 */ nop +/* 6F62AC 8023842C 00000000 */ nop diff --git a/asm/nonmatchings/code_6FFD80/func_80238000_6FFD80.s b/asm/nonmatchings/code_6FFD80/func_80238000_6FFD80.s index 02e3b84a9e..4a17825fae 100644 --- a/asm/nonmatchings/code_6FFD80/func_80238000_6FFD80.s +++ b/asm/nonmatchings/code_6FFD80/func_80238000_6FFD80.s @@ -34,19 +34,19 @@ glabel func_80238000_6FFD80 /* 6FFDF0 80238070 10600009 */ beqz $v1, .L80238098 /* 6FFDF4 80238074 28620003 */ slti $v0, $v1, 3 /* 6FFDF8 80238078 0808E26D */ j .L802389B4 -/* 6FFDFC 8023807C 00000000 */ nop +/* 6FFDFC 8023807C 00000000 */ nop .L80238080: /* 6FFE00 80238080 106201B5 */ beq $v1, $v0, .L80238758 /* 6FFE04 80238084 24020003 */ addiu $v0, $zero, 3 /* 6FFE08 80238088 106201F2 */ beq $v1, $v0, .L80238854 -/* 6FFE0C 8023808C 00000000 */ nop +/* 6FFE0C 8023808C 00000000 */ nop /* 6FFE10 80238090 0808E26B */ j .L802389AC -/* 6FFE14 80238094 00000000 */ nop +/* 6FFE14 80238094 00000000 */ nop .L80238098: /* 6FFE18 80238098 3C048029 */ lui $a0, %hi(D_80293014) /* 6FFE1C 8023809C 24843014 */ addiu $a0, $a0, %lo(D_80293014) /* 6FFE20 802380A0 0C050529 */ jal create_icon -/* 6FFE24 802380A4 00000000 */ nop +/* 6FFE24 802380A4 00000000 */ nop /* 6FFE28 802380A8 0040982D */ daddu $s3, $v0, $zero /* 6FFE2C 802380AC 0260202D */ daddu $a0, $s3, $zero /* 6FFE30 802380B0 2405000A */ addiu $a1, $zero, 0xa @@ -61,7 +61,7 @@ glabel func_80238000_6FFD80 /* 6FFE54 802380D4 3C048029 */ lui $a0, %hi(D_80292F7C) /* 6FFE58 802380D8 24842F7C */ addiu $a0, $a0, %lo(D_80292F7C) /* 6FFE5C 802380DC 0C050529 */ jal create_icon -/* 6FFE60 802380E0 00000000 */ nop +/* 6FFE60 802380E0 00000000 */ nop /* 6FFE64 802380E4 0040982D */ daddu $s3, $v0, $zero /* 6FFE68 802380E8 0260202D */ daddu $a0, $s3, $zero /* 6FFE6C 802380EC 2405000A */ addiu $a1, $zero, 0xa @@ -74,7 +74,7 @@ glabel func_80238000_6FFD80 /* 6FFE88 80238108 3C048029 */ lui $a0, %hi(D_80292EE4) /* 6FFE8C 8023810C 24842EE4 */ addiu $a0, $a0, %lo(D_80292EE4) /* 6FFE90 80238110 0C050529 */ jal create_icon -/* 6FFE94 80238114 00000000 */ nop +/* 6FFE94 80238114 00000000 */ nop /* 6FFE98 80238118 0040982D */ daddu $s3, $v0, $zero /* 6FFE9C 8023811C 0260202D */ daddu $a0, $s3, $zero /* 6FFEA0 80238120 2405000A */ addiu $a1, $zero, 0xa @@ -87,7 +87,7 @@ glabel func_80238000_6FFD80 /* 6FFEBC 8023813C 3C048029 */ lui $a0, %hi(D_80292E4C) /* 6FFEC0 80238140 24842E4C */ addiu $a0, $a0, %lo(D_80292E4C) /* 6FFEC4 80238144 0C050529 */ jal create_icon -/* 6FFEC8 80238148 00000000 */ nop +/* 6FFEC8 80238148 00000000 */ nop /* 6FFECC 8023814C 0040982D */ daddu $s3, $v0, $zero /* 6FFED0 80238150 0260202D */ daddu $a0, $s3, $zero /* 6FFED4 80238154 2405000A */ addiu $a1, $zero, 0xa @@ -100,7 +100,7 @@ glabel func_80238000_6FFD80 /* 6FFEF0 80238170 3C048029 */ lui $a0, %hi(D_80292DB4) /* 6FFEF4 80238174 24842DB4 */ addiu $a0, $a0, %lo(D_80292DB4) /* 6FFEF8 80238178 0C050529 */ jal create_icon -/* 6FFEFC 8023817C 00000000 */ nop +/* 6FFEFC 8023817C 00000000 */ nop /* 6FFF00 80238180 0040982D */ daddu $s3, $v0, $zero /* 6FFF04 80238184 0260202D */ daddu $a0, $s3, $zero /* 6FFF08 80238188 2405000A */ addiu $a1, $zero, 0xa @@ -113,7 +113,7 @@ glabel func_80238000_6FFD80 /* 6FFF24 802381A4 3C048029 */ lui $a0, %hi(D_80292D1C) /* 6FFF28 802381A8 24842D1C */ addiu $a0, $a0, %lo(D_80292D1C) /* 6FFF2C 802381AC 0C050529 */ jal create_icon -/* 6FFF30 802381B0 00000000 */ nop +/* 6FFF30 802381B0 00000000 */ nop /* 6FFF34 802381B4 0040982D */ daddu $s3, $v0, $zero /* 6FFF38 802381B8 0260202D */ daddu $a0, $s3, $zero /* 6FFF3C 802381BC 2405000A */ addiu $a1, $zero, 0xa @@ -126,7 +126,7 @@ glabel func_80238000_6FFD80 /* 6FFF58 802381D8 3C048029 */ lui $a0, %hi(D_8029369C) /* 6FFF5C 802381DC 2484369C */ addiu $a0, $a0, %lo(D_8029369C) /* 6FFF60 802381E0 0C050529 */ jal create_icon -/* 6FFF64 802381E4 00000000 */ nop +/* 6FFF64 802381E4 00000000 */ nop /* 6FFF68 802381E8 0040982D */ daddu $s3, $v0, $zero /* 6FFF6C 802381EC 0260202D */ daddu $a0, $s3, $zero /* 6FFF70 802381F0 2405000A */ addiu $a1, $zero, 0xa @@ -139,7 +139,7 @@ glabel func_80238000_6FFD80 /* 6FFF8C 8023820C 3C048029 */ lui $a0, %hi(D_802934D4) /* 6FFF90 80238210 248434D4 */ addiu $a0, $a0, %lo(D_802934D4) /* 6FFF94 80238214 0C050529 */ jal create_icon -/* 6FFF98 80238218 00000000 */ nop +/* 6FFF98 80238218 00000000 */ nop /* 6FFF9C 8023821C 0040982D */ daddu $s3, $v0, $zero /* 6FFFA0 80238220 0260202D */ daddu $a0, $s3, $zero /* 6FFFA4 80238224 24050009 */ addiu $a1, $zero, 9 @@ -154,7 +154,7 @@ glabel func_80238000_6FFD80 /* 6FFFC8 80238248 3C048029 */ lui $a0, %hi(D_8029343C) /* 6FFFCC 8023824C 2484343C */ addiu $a0, $a0, %lo(D_8029343C) /* 6FFFD0 80238250 0C050529 */ jal create_icon -/* 6FFFD4 80238254 00000000 */ nop +/* 6FFFD4 80238254 00000000 */ nop /* 6FFFD8 80238258 0040982D */ daddu $s3, $v0, $zero /* 6FFFDC 8023825C 0260202D */ daddu $a0, $s3, $zero /* 6FFFE0 80238260 24050009 */ addiu $a1, $zero, 9 @@ -167,7 +167,7 @@ glabel func_80238000_6FFD80 /* 6FFFFC 8023827C 3C048029 */ lui $a0, %hi(D_802933A4) /* 700000 80238280 248433A4 */ addiu $a0, $a0, %lo(D_802933A4) /* 700004 80238284 0C050529 */ jal create_icon -/* 700008 80238288 00000000 */ nop +/* 700008 80238288 00000000 */ nop /* 70000C 8023828C 0040982D */ daddu $s3, $v0, $zero /* 700010 80238290 0260202D */ daddu $a0, $s3, $zero /* 700014 80238294 24050009 */ addiu $a1, $zero, 9 @@ -180,7 +180,7 @@ glabel func_80238000_6FFD80 /* 700030 802382B0 3C048029 */ lui $a0, %hi(D_8029330C) /* 700034 802382B4 2484330C */ addiu $a0, $a0, %lo(D_8029330C) /* 700038 802382B8 0C050529 */ jal create_icon -/* 70003C 802382BC 00000000 */ nop +/* 70003C 802382BC 00000000 */ nop /* 700040 802382C0 0040982D */ daddu $s3, $v0, $zero /* 700044 802382C4 0260202D */ daddu $a0, $s3, $zero /* 700048 802382C8 24050009 */ addiu $a1, $zero, 9 @@ -193,7 +193,7 @@ glabel func_80238000_6FFD80 /* 700064 802382E4 3C048029 */ lui $a0, %hi(D_80293274) /* 700068 802382E8 24843274 */ addiu $a0, $a0, %lo(D_80293274) /* 70006C 802382EC 0C050529 */ jal create_icon -/* 700070 802382F0 00000000 */ nop +/* 700070 802382F0 00000000 */ nop /* 700074 802382F4 0040982D */ daddu $s3, $v0, $zero /* 700078 802382F8 0260202D */ daddu $a0, $s3, $zero /* 70007C 802382FC 24050009 */ addiu $a1, $zero, 9 @@ -206,7 +206,7 @@ glabel func_80238000_6FFD80 /* 700098 80238318 3C048029 */ lui $a0, %hi(D_802931DC) /* 70009C 8023831C 248431DC */ addiu $a0, $a0, %lo(D_802931DC) /* 7000A0 80238320 0C050529 */ jal create_icon -/* 7000A4 80238324 00000000 */ nop +/* 7000A4 80238324 00000000 */ nop /* 7000A8 80238328 0040982D */ daddu $s3, $v0, $zero /* 7000AC 8023832C 0260202D */ daddu $a0, $s3, $zero /* 7000B0 80238330 24050009 */ addiu $a1, $zero, 9 @@ -219,7 +219,7 @@ glabel func_80238000_6FFD80 /* 7000CC 8023834C 3C048029 */ lui $a0, %hi(D_802936D4) /* 7000D0 80238350 248436D4 */ addiu $a0, $a0, %lo(D_802936D4) /* 7000D4 80238354 0C050529 */ jal create_icon -/* 7000D8 80238358 00000000 */ nop +/* 7000D8 80238358 00000000 */ nop /* 7000DC 8023835C 0040982D */ daddu $s3, $v0, $zero /* 7000E0 80238360 0260202D */ daddu $a0, $s3, $zero /* 7000E4 80238364 2405000A */ addiu $a1, $zero, 0xa @@ -229,7 +229,7 @@ glabel func_80238000_6FFD80 /* 7000F4 80238374 AE530000 */ sw $s3, ($s2) /* 7000F8 80238378 8E440000 */ lw $a0, ($s2) /* 7000FC 8023837C 0C0513CA */ jal func_80144F28 -/* 700100 80238380 00000000 */ nop +/* 700100 80238380 00000000 */ nop /* 700104 80238384 0260202D */ daddu $a0, $s3, $zero /* 700108 80238388 2405FF9C */ addiu $a1, $zero, -0x64 /* 70010C 8023838C 0C051261 */ jal set_icon_render_pos @@ -269,20 +269,20 @@ glabel func_80238000_6FFD80 /* 700194 80238414 80430075 */ lb $v1, 0x75($v0) /* 700198 80238418 C6000188 */ lwc1 $f0, 0x188($s0) /* 70019C 8023841C 44831000 */ mtc1 $v1, $f2 -/* 7001A0 80238420 00000000 */ nop +/* 7001A0 80238420 00000000 */ nop /* 7001A4 80238424 468010A0 */ cvt.s.w $f2, $f2 /* 7001A8 80238428 46001082 */ mul.s $f2, $f2, $f0 -/* 7001AC 8023842C 00000000 */ nop +/* 7001AC 8023842C 00000000 */ nop /* 7001B0 80238430 C6A00018 */ lwc1 $f0, 0x18($s5) /* 7001B4 80238434 46020000 */ add.s $f0, $f0, $f2 /* 7001B8 80238438 E6A00018 */ swc1 $f0, 0x18($s5) /* 7001BC 8023843C 80430076 */ lb $v1, 0x76($v0) /* 7001C0 80238440 C6020188 */ lwc1 $f2, 0x188($s0) /* 7001C4 80238444 44830000 */ mtc1 $v1, $f0 -/* 7001C8 80238448 00000000 */ nop +/* 7001C8 80238448 00000000 */ nop /* 7001CC 8023844C 46800020 */ cvt.s.w $f0, $f0 /* 7001D0 80238450 46020002 */ mul.s $f0, $f0, $f2 -/* 7001D4 80238454 00000000 */ nop +/* 7001D4 80238454 00000000 */ nop /* 7001D8 80238458 C6A2001C */ lwc1 $f2, 0x1c($s5) /* 7001DC 8023845C 46001080 */ add.s $f2, $f2, $f0 /* 7001E0 80238460 C6A00020 */ lwc1 $f0, 0x20($s5) @@ -295,20 +295,20 @@ glabel func_80238000_6FFD80 /* 7001FC 8023847C 00621821 */ addu $v1, $v1, $v0 /* 700200 80238480 00031843 */ sra $v1, $v1, 1 /* 700204 80238484 44830000 */ mtc1 $v1, $f0 -/* 700208 80238488 00000000 */ nop +/* 700208 80238488 00000000 */ nop /* 70020C 8023848C 46800021 */ cvt.d.w $f0, $f0 /* 700210 80238490 46220003 */ div.d $f0, $f0, $f2 /* 700214 80238494 46200020 */ cvt.s.d $f0, $f0 /* 700218 80238498 E6A00030 */ swc1 $f0, 0x30($s5) /* 70021C 8023849C C6020188 */ lwc1 $f2, 0x188($s0) /* 700220 802384A0 46020002 */ mul.s $f0, $f0, $f2 -/* 700224 802384A4 00000000 */ nop +/* 700224 802384A4 00000000 */ nop /* 700228 802384A8 8E440000 */ lw $a0, ($s2) /* 70022C 802384AC 44050000 */ mfc1 $a1, $f0 /* 700230 802384B0 3C013F80 */ lui $at, 0x3f80 /* 700234 802384B4 4481B000 */ mtc1 $at, $f22 /* 700238 802384B8 0C051308 */ jal func_80144C20 -/* 70023C 802384BC 00000000 */ nop +/* 70023C 802384BC 00000000 */ nop /* 700240 802384C0 27B30028 */ addiu $s3, $sp, 0x28 /* 700244 802384C4 8EA60018 */ lw $a2, 0x18($s5) /* 700248 802384C8 C6A00144 */ lwc1 $f0, 0x144($s5) @@ -368,7 +368,7 @@ glabel func_80238000_6FFD80 /* 70031C 8023859C 26310001 */ addiu $s1, $s1, 1 /* 700320 802385A0 2A22001E */ slti $v0, $s1, 0x1e /* 700324 802385A4 1440FFE1 */ bnez $v0, .L8023852C -/* 700328 802385A8 00000000 */ nop +/* 700328 802385A8 00000000 */ nop .L802385AC: /* 70032C 802385AC 0000882D */ daddu $s1, $zero, $zero /* 700330 802385B0 27B30028 */ addiu $s3, $sp, 0x28 @@ -410,14 +410,14 @@ glabel func_80238000_6FFD80 /* 7003BC 8023863C 26310001 */ addiu $s1, $s1, 1 /* 7003C0 80238640 2A22001E */ slti $v0, $s1, 0x1e /* 7003C4 80238644 1440FFE1 */ bnez $v0, .L802385CC -/* 7003C8 80238648 00000000 */ nop +/* 7003C8 80238648 00000000 */ nop .L8023864C: /* 7003CC 8023864C C682001C */ lwc1 $f2, 0x1c($s4) /* 7003D0 80238650 C6800018 */ lwc1 $f0, 0x18($s4) /* 7003D4 80238654 46001081 */ sub.s $f2, $f2, $f0 /* 7003D8 80238658 3C014000 */ lui $at, 0x4000 /* 7003DC 8023865C 44810000 */ mtc1 $at, $f0 -/* 7003E0 80238660 00000000 */ nop +/* 7003E0 80238660 00000000 */ nop /* 7003E4 80238664 46001081 */ sub.s $f2, $f2, $f0 /* 7003E8 80238668 24020078 */ addiu $v0, $zero, 0x78 /* 7003EC 8023866C 4600120D */ trunc.w.s $f8, $f2 @@ -425,7 +425,7 @@ glabel func_80238000_6FFD80 /* 7003F4 80238674 0C00A67F */ jal rand_int /* 7003F8 80238678 A6820064 */ sh $v0, 0x64($s4) /* 7003FC 8023867C 44822000 */ mtc1 $v0, $f4 -/* 700400 80238680 00000000 */ nop +/* 700400 80238680 00000000 */ nop /* 700404 80238684 46802120 */ cvt.s.w $f4, $f4 /* 700408 80238688 C6800018 */ lwc1 $f0, 0x18($s4) /* 70040C 8023868C 3C014040 */ lui $at, 0x4040 @@ -441,7 +441,7 @@ glabel func_80238000_6FFD80 /* 700434 802386B4 0C09A216 */ jal func_80268858 /* 700438 802386B8 A2C00086 */ sb $zero, 0x86($s6) /* 70043C 802386BC 0C09A446 */ jal func_80269118 -/* 700440 802386C0 00000000 */ nop +/* 700440 802386C0 00000000 */ nop /* 700444 802386C4 24020001 */ addiu $v0, $zero, 1 /* 700448 802386C8 0808E26B */ j .L802389AC /* 70044C 802386CC AEE20070 */ sw $v0, 0x70($s7) @@ -452,7 +452,7 @@ glabel func_80238000_6FFD80 /* 70045C 802386DC 8EC20210 */ lw $v0, 0x210($s6) /* 700460 802386E0 00431024 */ and $v0, $v0, $v1 /* 700464 802386E4 10400003 */ beqz $v0, .L802386F4 -/* 700468 802386E8 00000000 */ nop +/* 700468 802386E8 00000000 */ nop .L802386EC: /* 70046C 802386EC 3C018024 */ lui $at, %hi(D_8023BDBC) /* 700470 802386F0 AC20BDBC */ sw $zero, %lo(D_8023BDBC)($at) @@ -468,7 +468,7 @@ glabel func_80238000_6FFD80 /* 700494 80238714 24040064 */ addiu $a0, $zero, 0x64 /* 700498 80238718 28420032 */ slti $v0, $v0, 0x32 /* 70049C 8023871C 10400004 */ beqz $v0, .L80238730 -/* 7004A0 80238720 00000000 */ nop +/* 7004A0 80238720 00000000 */ nop /* 7004A4 80238724 C6800018 */ lwc1 $f0, 0x18($s4) /* 7004A8 80238728 0808E1CE */ j .L80238738 /* 7004AC 8023872C E6800048 */ swc1 $f0, 0x48($s4) @@ -502,7 +502,7 @@ glabel func_80238000_6FFD80 /* 70050C 8023878C 2442FFFF */ addiu $v0, $v0, -1 /* 700510 80238790 86A40428 */ lh $a0, 0x428($s5) /* 700514 80238794 0C09A75B */ jal get_actor -/* 700518 80238798 00000000 */ nop +/* 700518 80238798 00000000 */ nop /* 70051C 8023879C C6AC0054 */ lwc1 $f12, 0x54($s5) /* 700520 802387A0 C6AE005C */ lwc1 $f14, 0x5c($s5) /* 700524 802387A4 0C00A70A */ jal get_clamped_angle_diff @@ -512,12 +512,12 @@ glabel func_80238000_6FFD80 /* 700534 802387B4 C6040188 */ lwc1 $f4, 0x188($s0) /* 700538 802387B8 46020003 */ div.s $f0, $f0, $f2 /* 70053C 802387BC 46040082 */ mul.s $f2, $f0, $f4 -/* 700540 802387C0 00000000 */ nop +/* 700540 802387C0 00000000 */ nop /* 700544 802387C4 3C014040 */ lui $at, 0x4040 /* 700548 802387C8 44810000 */ mtc1 $at, $f0 -/* 70054C 802387CC 00000000 */ nop +/* 70054C 802387CC 00000000 */ nop /* 700550 802387D0 4600103C */ c.lt.s $f2, $f0 -/* 700554 802387D4 00000000 */ nop +/* 700554 802387D4 00000000 */ nop /* 700558 802387D8 45000004 */ bc1f .L802387EC /* 70055C 802387DC 24020003 */ addiu $v0, $zero, 3 /* 700560 802387E0 0808E26B */ j .L802389AC @@ -530,11 +530,11 @@ glabel func_80238000_6FFD80 /* 700574 802387F4 46020000 */ add.s $f0, $f0, $f2 /* 700578 802387F8 C6840018 */ lwc1 $f4, 0x18($s4) /* 70057C 802387FC 4604003E */ c.le.s $f0, $f4 -/* 700580 80238800 00000000 */ nop +/* 700580 80238800 00000000 */ nop /* 700584 80238804 45000006 */ bc1f .L80238820 /* 700588 80238808 E6800048 */ swc1 $f0, 0x48($s4) /* 70058C 8023880C 44800000 */ mtc1 $zero, $f0 -/* 700590 80238810 00000000 */ nop +/* 700590 80238810 00000000 */ nop /* 700594 80238814 46020001 */ sub.s $f0, $f0, $f2 /* 700598 80238818 E6840048 */ swc1 $f4, 0x48($s4) /* 70059C 8023881C E6800044 */ swc1 $f0, 0x44($s4) @@ -542,12 +542,12 @@ glabel func_80238000_6FFD80 /* 7005A0 80238820 C6800048 */ lwc1 $f0, 0x48($s4) /* 7005A4 80238824 C684001C */ lwc1 $f4, 0x1c($s4) /* 7005A8 80238828 4600203E */ c.le.s $f4, $f0 -/* 7005AC 8023882C 00000000 */ nop +/* 7005AC 8023882C 00000000 */ nop /* 7005B0 80238830 4500005E */ bc1f .L802389AC -/* 7005B4 80238834 00000000 */ nop +/* 7005B4 80238834 00000000 */ nop /* 7005B8 80238838 C6820044 */ lwc1 $f2, 0x44($s4) /* 7005BC 8023883C 44800000 */ mtc1 $zero, $f0 -/* 7005C0 80238840 00000000 */ nop +/* 7005C0 80238840 00000000 */ nop /* 7005C4 80238844 46020001 */ sub.s $f0, $f0, $f2 /* 7005C8 80238848 E6840048 */ swc1 $f4, 0x48($s4) /* 7005CC 8023884C 0808E26B */ j .L802389AC @@ -555,7 +555,7 @@ glabel func_80238000_6FFD80 .L80238854: /* 7005D4 80238854 86A40428 */ lh $a0, 0x428($s5) /* 7005D8 80238858 0C09A75B */ jal get_actor -/* 7005DC 8023885C 00000000 */ nop +/* 7005DC 8023885C 00000000 */ nop /* 7005E0 80238860 C6AC0054 */ lwc1 $f12, 0x54($s5) /* 7005E4 80238864 C6AE005C */ lwc1 $f14, 0x5c($s5) /* 7005E8 80238868 0C00A70A */ jal get_clamped_angle_diff @@ -566,23 +566,23 @@ glabel func_80238000_6FFD80 /* 7005FC 8023887C C6040188 */ lwc1 $f4, 0x188($s0) /* 700600 80238880 46020003 */ div.s $f0, $f0, $f2 /* 700604 80238884 46040082 */ mul.s $f2, $f0, $f4 -/* 700608 80238888 00000000 */ nop +/* 700608 80238888 00000000 */ nop /* 70060C 8023888C C6A00050 */ lwc1 $f0, 0x50($s5) /* 700610 80238890 44802000 */ mtc1 $zero, $f4 -/* 700614 80238894 00000000 */ nop +/* 700614 80238894 00000000 */ nop /* 700618 80238898 4600203E */ c.le.s $f4, $f0 -/* 70061C 8023889C 00000000 */ nop +/* 70061C 8023889C 00000000 */ nop /* 700620 802388A0 45000007 */ bc1f .L802388C0 -/* 700624 802388A4 00000000 */ nop +/* 700624 802388A4 00000000 */ nop /* 700628 802388A8 4604303C */ c.lt.s $f6, $f4 -/* 70062C 802388AC 00000000 */ nop +/* 70062C 802388AC 00000000 */ nop /* 700630 802388B0 4503000A */ bc1tl .L802388DC /* 700634 802388B4 A2C00086 */ sb $zero, 0x86($s6) /* 700638 802388B8 0808E234 */ j .L802388D0 /* 70063C 802388BC 2402FFFF */ addiu $v0, $zero, -1 .L802388C0: /* 700640 802388C0 4604303C */ c.lt.s $f6, $f4 -/* 700644 802388C4 00000000 */ nop +/* 700644 802388C4 00000000 */ nop /* 700648 802388C8 45000003 */ bc1f .L802388D8 /* 70064C 802388CC 2402FFFF */ addiu $v0, $zero, -1 .L802388D0: @@ -593,9 +593,9 @@ glabel func_80238000_6FFD80 .L802388DC: /* 70065C 802388DC 3C0140E0 */ lui $at, 0x40e0 /* 700660 802388E0 44810000 */ mtc1 $at, $f0 -/* 700664 802388E4 00000000 */ nop +/* 700664 802388E4 00000000 */ nop /* 700668 802388E8 4600103C */ c.lt.s $f2, $f0 -/* 70066C 802388EC 00000000 */ nop +/* 70066C 802388EC 00000000 */ nop /* 700670 802388F0 45000007 */ bc1f .L80238910 /* 700674 802388F4 A2C00084 */ sb $zero, 0x84($s6) /* 700678 802388F8 24020001 */ addiu $v0, $zero, 1 @@ -608,7 +608,7 @@ glabel func_80238000_6FFD80 /* 700690 80238910 C6820048 */ lwc1 $f2, 0x48($s4) /* 700694 80238914 C6800050 */ lwc1 $f0, 0x50($s4) /* 700698 80238918 4600103C */ c.lt.s $f2, $f0 -/* 70069C 8023891C 00000000 */ nop +/* 70069C 8023891C 00000000 */ nop /* 7006A0 80238920 45000002 */ bc1f .L8023892C /* 7006A4 80238924 2402FFFF */ addiu $v0, $zero, -1 /* 7006A8 80238928 A2C20084 */ sb $v0, 0x84($s6) @@ -624,7 +624,7 @@ glabel func_80238000_6FFD80 /* 7006C4 80238944 26310001 */ addiu $s1, $s1, 1 /* 7006C8 80238948 2A220007 */ slti $v0, $s1, 7 /* 7006CC 8023894C 1440FFFA */ bnez $v0, .L80238938 -/* 7006D0 80238950 00000000 */ nop +/* 7006D0 80238950 00000000 */ nop /* 7006D4 80238954 0000882D */ daddu $s1, $zero, $zero /* 7006D8 80238958 3C108024 */ lui $s0, %hi(D_8023BD98) /* 7006DC 8023895C 2610BD98 */ addiu $s0, $s0, %lo(D_8023BD98) @@ -635,15 +635,15 @@ glabel func_80238000_6FFD80 /* 7006EC 8023896C 26310001 */ addiu $s1, $s1, 1 /* 7006F0 80238970 2A220006 */ slti $v0, $s1, 6 /* 7006F4 80238974 1440FFFA */ bnez $v0, .L80238960 -/* 7006F8 80238978 00000000 */ nop +/* 7006F8 80238978 00000000 */ nop /* 7006FC 8023897C 3C048024 */ lui $a0, %hi(D_8023BDB4) /* 700700 80238980 8C84BDB4 */ lw $a0, %lo(D_8023BDB4)($a0) /* 700704 80238984 0C05123D */ jal free_icon -/* 700708 80238988 00000000 */ nop +/* 700708 80238988 00000000 */ nop /* 70070C 8023898C 3C048024 */ lui $a0, %hi(D_8023BDC0) /* 700710 80238990 8C84BDC0 */ lw $a0, %lo(D_8023BDC0)($a0) /* 700714 80238994 0C05123D */ jal free_icon -/* 700718 80238998 00000000 */ nop +/* 700718 80238998 00000000 */ nop /* 70071C 8023899C 0C093EB1 */ jal set_popup_duration /* 700720 802389A0 0000202D */ daddu $a0, $zero, $zero /* 700724 802389A4 0808E314 */ j .L80238C50 @@ -660,7 +660,7 @@ glabel func_80238000_6FFD80 /* 700748 802389C8 3C138024 */ lui $s3, %hi(D_8023BDC0) /* 70074C 802389CC 8E73BDC0 */ lw $s3, %lo(D_8023BDC0)($s3) /* 700750 802389D0 0C09A75B */ jal get_actor -/* 700754 802389D4 00000000 */ nop +/* 700754 802389D4 00000000 */ nop /* 700758 802389D8 C68C0048 */ lwc1 $f12, 0x48($s4) /* 70075C 802389DC C68E0050 */ lwc1 $f14, 0x50($s4) /* 700760 802389E0 0C00A70A */ jal get_clamped_angle_diff @@ -670,24 +670,24 @@ glabel func_80238000_6FFD80 /* 700770 802389F0 C6040188 */ lwc1 $f4, 0x188($s0) /* 700774 802389F4 46020003 */ div.s $f0, $f0, $f2 /* 700778 802389F8 46040082 */ mul.s $f2, $f0, $f4 -/* 70077C 802389FC 00000000 */ nop +/* 70077C 802389FC 00000000 */ nop /* 700780 80238A00 3C0140E0 */ lui $at, 0x40e0 /* 700784 80238A04 44810000 */ mtc1 $at, $f0 -/* 700788 80238A08 00000000 */ nop +/* 700788 80238A08 00000000 */ nop /* 70078C 80238A0C 4600103C */ c.lt.s $f2, $f0 -/* 700790 80238A10 00000000 */ nop +/* 700790 80238A10 00000000 */ nop /* 700794 80238A14 45000005 */ bc1f .L80238A2C /* 700798 80238A18 0260202D */ daddu $a0, $s3, $zero /* 70079C 80238A1C 3C058011 */ lui $a1, %hi(D_80108E1C) /* 7007A0 80238A20 24A58E1C */ addiu $a1, $a1, %lo(D_80108E1C) /* 7007A4 80238A24 0808E28D */ j .L80238A34 -/* 7007A8 80238A28 00000000 */ nop +/* 7007A8 80238A28 00000000 */ nop .L80238A2C: /* 7007AC 80238A2C 3C058011 */ lui $a1, %hi(D_80108E48) /* 7007B0 80238A30 24A58E48 */ addiu $a1, $a1, %lo(D_80108E48) .L80238A34: /* 7007B4 80238A34 0C0511FF */ jal set_menu_icon_script -/* 7007B8 80238A38 00000000 */ nop +/* 7007B8 80238A38 00000000 */ nop /* 7007BC 80238A3C 3C058024 */ lui $a1, %hi(D_8023BDC4) /* 7007C0 80238A40 24A5BDC4 */ addiu $a1, $a1, %lo(D_8023BDC4) /* 7007C4 80238A44 8CA20000 */ lw $v0, ($a1) @@ -735,7 +735,7 @@ glabel func_80238000_6FFD80 /* 700864 80238AE4 8E020000 */ lw $v0, ($s0) /* 700868 80238AE8 2442FFF6 */ addiu $v0, $v0, -0xa /* 70086C 80238AEC 44826000 */ mtc1 $v0, $f12 -/* 700870 80238AF0 00000000 */ nop +/* 700870 80238AF0 00000000 */ nop /* 700874 80238AF4 46806320 */ cvt.s.w $f12, $f12 /* 700878 80238AF8 0C00A6C9 */ jal clamp_angle /* 70087C 80238AFC AE020000 */ sw $v0, ($s0) diff --git a/asm/nonmatchings/code_6FFD80/func_80238CE0_700A60.s b/asm/nonmatchings/code_6FFD80/func_80238CE0_700A60.s index be9c088759..ee75feaf4c 100644 --- a/asm/nonmatchings/code_6FFD80/func_80238CE0_700A60.s +++ b/asm/nonmatchings/code_6FFD80/func_80238CE0_700A60.s @@ -31,7 +31,7 @@ glabel func_80238CE0_700A60 /* 700AC4 80238D44 14810004 */ bne $a0, $at, .L80238D58 /* 700AC8 80238D48 3C018000 */ lui $at, 0x8000 /* 700ACC 80238D4C 14610002 */ bne $v1, $at, .L80238D58 -/* 700AD0 80238D50 00000000 */ nop +/* 700AD0 80238D50 00000000 */ nop /* 700AD4 80238D54 0006000D */ break 6 .L80238D58: /* 700AD8 80238D58 00001812 */ mflo $v1 diff --git a/asm/nonmatchings/code_6FFD80/func_80238E24_700BA4.s b/asm/nonmatchings/code_6FFD80/func_80238E24_700BA4.s index 7fc2609008..beb9933393 100644 --- a/asm/nonmatchings/code_6FFD80/func_80238E24_700BA4.s +++ b/asm/nonmatchings/code_6FFD80/func_80238E24_700BA4.s @@ -21,7 +21,7 @@ glabel func_80238E24_700BA4 /* 700BE4 80238E64 2611000C */ addiu $s1, $s0, 0xc /* 700BE8 80238E68 86040428 */ lh $a0, 0x428($s0) /* 700BEC 80238E6C 0C09A75B */ jal get_actor -/* 700BF0 80238E70 00000000 */ nop +/* 700BF0 80238E70 00000000 */ nop /* 700BF4 80238E74 AE420074 */ sw $v0, 0x74($s2) /* 700BF8 80238E78 AE400070 */ sw $zero, 0x70($s2) .L80238E7C: @@ -30,9 +30,9 @@ glabel func_80238E24_700BA4 /* 700C04 80238E84 12800005 */ beqz $s4, .L80238E9C /* 700C08 80238E88 24020001 */ addiu $v0, $zero, 1 /* 700C0C 80238E8C 12820015 */ beq $s4, $v0, .L80238EE4 -/* 700C10 80238E90 00000000 */ nop +/* 700C10 80238E90 00000000 */ nop /* 700C14 80238E94 0808E40F */ j .L8023903C -/* 700C18 80238E98 00000000 */ nop +/* 700C18 80238E98 00000000 */ nop .L80238E9C: /* 700C1C 80238E9C C6600144 */ lwc1 $f0, 0x144($s3) /* 700C20 80238EA0 C6020144 */ lwc1 $f2, 0x144($s0) @@ -65,10 +65,10 @@ glabel func_80238E24_700BA4 /* 700C88 80238F08 34210FD0 */ ori $at, $at, 0xfd0 /* 700C8C 80238F0C 44810000 */ mtc1 $at, $f0 /* 700C90 80238F10 44826000 */ mtc1 $v0, $f12 -/* 700C94 80238F14 00000000 */ nop +/* 700C94 80238F14 00000000 */ nop /* 700C98 80238F18 46806320 */ cvt.s.w $f12, $f12 /* 700C9C 80238F1C 46006302 */ mul.s $f12, $f12, $f0 -/* 700CA0 80238F20 00000000 */ nop +/* 700CA0 80238F20 00000000 */ nop /* 700CA4 80238F24 C6140010 */ lwc1 $f20, 0x10($s0) /* 700CA8 80238F28 3C0143B4 */ lui $at, 0x43b4 /* 700CAC 80238F2C 44810000 */ mtc1 $at, $f0 @@ -79,15 +79,15 @@ glabel func_80238E24_700BA4 /* 700CC0 80238F40 3C014049 */ lui $at, 0x4049 /* 700CC4 80238F44 34210FD0 */ ori $at, $at, 0xfd0 /* 700CC8 80238F48 44816000 */ mtc1 $at, $f12 -/* 700CCC 80238F4C 00000000 */ nop +/* 700CCC 80238F4C 00000000 */ nop /* 700CD0 80238F50 460C0302 */ mul.s $f12, $f0, $f12 /* 700CD4 80238F54 0C00A85B */ jal sin_rad -/* 700CD8 80238F58 00000000 */ nop +/* 700CD8 80238F58 00000000 */ nop /* 700CDC 80238F5C 3C018024 */ lui $at, %hi(D_8023BD60) /* 700CE0 80238F60 D422BD60 */ ldc1 $f2, %lo(D_8023BD60)($at) /* 700CE4 80238F64 46000021 */ cvt.d.s $f0, $f0 /* 700CE8 80238F68 46220002 */ mul.d $f0, $f0, $f2 -/* 700CEC 80238F6C 00000000 */ nop +/* 700CEC 80238F6C 00000000 */ nop /* 700CF0 80238F70 96030070 */ lhu $v1, 0x70($s0) /* 700CF4 80238F74 3C013FE0 */ lui $at, 0x3fe0 /* 700CF8 80238F78 44811800 */ mtc1 $at, $f3 @@ -98,7 +98,7 @@ glabel func_80238E24_700BA4 /* 700D0C 80238F8C 00021403 */ sra $v0, $v0, 0x10 /* 700D10 80238F90 4620A500 */ add.d $f20, $f20, $f0 /* 700D14 80238F94 44826000 */ mtc1 $v0, $f12 -/* 700D18 80238F98 00000000 */ nop +/* 700D18 80238F98 00000000 */ nop /* 700D1C 80238F9C 46806320 */ cvt.s.w $f12, $f12 /* 700D20 80238FA0 A6030070 */ sh $v1, 0x70($s0) /* 700D24 80238FA4 4620A520 */ cvt.s.d $f20, $f20 @@ -108,7 +108,7 @@ glabel func_80238E24_700BA4 /* 700D34 80238FB4 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 700D38 80238FB8 4600018D */ trunc.w.s $f6, $f0 /* 700D3C 80238FBC 44023000 */ mfc1 $v0, $f6 -/* 700D40 80238FC0 00000000 */ nop +/* 700D40 80238FC0 00000000 */ nop /* 700D44 80238FC4 A6020070 */ sh $v0, 0x70($s0) /* 700D48 80238FC8 94630134 */ lhu $v1, 0x134($v1) /* 700D4C 80238FCC 3C02CCCC */ lui $v0, 0xcccc @@ -133,9 +133,9 @@ glabel func_80238E24_700BA4 /* 700D94 80239014 C602000C */ lwc1 $f2, 0xc($s0) /* 700D98 80239018 3C014370 */ lui $at, 0x4370 /* 700D9C 8023901C 44810000 */ mtc1 $at, $f0 -/* 700DA0 80239020 00000000 */ nop +/* 700DA0 80239020 00000000 */ nop /* 700DA4 80239024 4602003C */ c.lt.s $f0, $f2 -/* 700DA8 80239028 00000000 */ nop +/* 700DA8 80239028 00000000 */ nop /* 700DAC 8023902C 45000003 */ bc1f .L8023903C /* 700DB0 80239030 24020002 */ addiu $v0, $zero, 2 /* 700DB4 80239034 0808E422 */ j .L80239088 diff --git a/asm/nonmatchings/code_6FFD80/func_802390B4_700E34.s b/asm/nonmatchings/code_6FFD80/func_802390B4_700E34.s index 19867f37c3..433d154654 100644 --- a/asm/nonmatchings/code_6FFD80/func_802390B4_700E34.s +++ b/asm/nonmatchings/code_6FFD80/func_802390B4_700E34.s @@ -21,7 +21,7 @@ glabel func_802390B4_700E34 /* 700E70 802390F0 10620028 */ beq $v1, $v0, .L80239194 /* 700E74 802390F4 24020002 */ addiu $v0, $zero, 2 /* 700E78 802390F8 0808E5C8 */ j .L80239720 -/* 700E7C 802390FC 00000000 */ nop +/* 700E7C 802390FC 00000000 */ nop .L80239100: /* 700E80 80239100 C6200144 */ lwc1 $f0, 0x144($s1) /* 700E84 80239104 C6220148 */ lwc1 $f2, 0x148($s1) @@ -34,7 +34,7 @@ glabel func_802390B4_700E34 /* 700EA0 80239120 2403003C */ addiu $v1, $zero, 0x3c /* 700EA4 80239124 00621823 */ subu $v1, $v1, $v0 /* 700EA8 80239128 44830000 */ mtc1 $v1, $f0 -/* 700EAC 8023912C 00000000 */ nop +/* 700EAC 8023912C 00000000 */ nop /* 700EB0 80239130 46800020 */ cvt.s.w $f0, $f0 /* 700EB4 80239134 E6200054 */ swc1 $f0, 0x54($s1) /* 700EB8 80239138 3C014240 */ lui $at, 0x4240 @@ -80,36 +80,36 @@ glabel func_802390B4_700E34 /* 700F54 802391D4 C622000C */ lwc1 $f2, 0xc($s1) /* 700F58 802391D8 3C01C33E */ lui $at, 0xc33e /* 700F5C 802391DC 44810000 */ mtc1 $at, $f0 -/* 700F60 802391E0 00000000 */ nop +/* 700F60 802391E0 00000000 */ nop /* 700F64 802391E4 4600103C */ c.lt.s $f2, $f0 -/* 700F68 802391E8 00000000 */ nop +/* 700F68 802391E8 00000000 */ nop /* 700F6C 802391EC 45000053 */ bc1f .L8023933C -/* 700F70 802391F0 00000000 */ nop +/* 700F70 802391F0 00000000 */ nop /* 700F74 802391F4 8E420074 */ lw $v0, 0x74($s2) /* 700F78 802391F8 544000F1 */ bnel $v0, $zero, .L802395C0 /* 700F7C 802391FC 24020002 */ addiu $v0, $zero, 2 /* 700F80 80239200 C6220054 */ lwc1 $f2, 0x54($s1) /* 700F84 80239204 3C014387 */ lui $at, 0x4387 /* 700F88 80239208 44810000 */ mtc1 $at, $f0 -/* 700F8C 8023920C 00000000 */ nop +/* 700F8C 8023920C 00000000 */ nop /* 700F90 80239210 4602003E */ c.le.s $f0, $f2 -/* 700F94 80239214 00000000 */ nop +/* 700F94 80239214 00000000 */ nop /* 700F98 80239218 45000019 */ bc1f .L80239280 -/* 700F9C 8023921C 00000000 */ nop +/* 700F9C 8023921C 00000000 */ nop /* 700FA0 80239220 3C0143B4 */ lui $at, 0x43b4 /* 700FA4 80239224 44810000 */ mtc1 $at, $f0 -/* 700FA8 80239228 00000000 */ nop +/* 700FA8 80239228 00000000 */ nop /* 700FAC 8023922C 4600103C */ c.lt.s $f2, $f0 -/* 700FB0 80239230 00000000 */ nop +/* 700FB0 80239230 00000000 */ nop /* 700FB4 80239234 45000012 */ bc1f .L80239280 -/* 700FB8 80239238 00000000 */ nop +/* 700FB8 80239238 00000000 */ nop /* 700FBC 8023923C 3C014334 */ lui $at, 0x4334 /* 700FC0 80239240 44816000 */ mtc1 $at, $f12 /* 700FC4 80239244 0C00A6C9 */ jal clamp_angle /* 700FC8 80239248 460C1300 */ add.s $f12, $f2, $f12 /* 700FCC 8023924C 3C0142B4 */ lui $at, 0x42b4 /* 700FD0 80239250 44811000 */ mtc1 $at, $f2 -/* 700FD4 80239254 00000000 */ nop +/* 700FD4 80239254 00000000 */ nop /* 700FD8 80239258 46001001 */ sub.s $f0, $f2, $f0 /* 700FDC 8023925C 46020000 */ add.s $f0, $f0, $f2 /* 700FE0 80239260 24040004 */ addiu $a0, $zero, 4 @@ -117,30 +117,30 @@ glabel func_802390B4_700E34 /* 700FE8 80239268 E6200054 */ swc1 $f0, 0x54($s1) /* 700FEC 8023926C 2442FFFE */ addiu $v0, $v0, -2 /* 700FF0 80239270 44820000 */ mtc1 $v0, $f0 -/* 700FF4 80239274 00000000 */ nop +/* 700FF4 80239274 00000000 */ nop /* 700FF8 80239278 46800020 */ cvt.s.w $f0, $f0 /* 700FFC 8023927C E620005C */ swc1 $f0, 0x5c($s1) .L80239280: /* 701000 80239280 C60C0048 */ lwc1 $f12, 0x48($s0) /* 701004 80239284 3C014334 */ lui $at, 0x4334 /* 701008 80239288 44811000 */ mtc1 $at, $f2 -/* 70100C 8023928C 00000000 */ nop +/* 70100C 8023928C 00000000 */ nop /* 701010 80239290 460C103E */ c.le.s $f2, $f12 -/* 701014 80239294 00000000 */ nop +/* 701014 80239294 00000000 */ nop /* 701018 80239298 45000017 */ bc1f .L802392F8 -/* 70101C 8023929C 00000000 */ nop +/* 70101C 8023929C 00000000 */ nop /* 701020 802392A0 3C014387 */ lui $at, 0x4387 /* 701024 802392A4 44810000 */ mtc1 $at, $f0 -/* 701028 802392A8 00000000 */ nop +/* 701028 802392A8 00000000 */ nop /* 70102C 802392AC 4600603C */ c.lt.s $f12, $f0 -/* 701030 802392B0 00000000 */ nop +/* 701030 802392B0 00000000 */ nop /* 701034 802392B4 45000010 */ bc1f .L802392F8 -/* 701038 802392B8 00000000 */ nop +/* 701038 802392B8 00000000 */ nop /* 70103C 802392BC 0C00A6C9 */ jal clamp_angle /* 701040 802392C0 46026300 */ add.s $f12, $f12, $f2 /* 701044 802392C4 3C0142B4 */ lui $at, 0x42b4 /* 701048 802392C8 44811000 */ mtc1 $at, $f2 -/* 70104C 802392CC 00000000 */ nop +/* 70104C 802392CC 00000000 */ nop /* 701050 802392D0 46020001 */ sub.s $f0, $f0, $f2 /* 701054 802392D4 46001081 */ sub.s $f2, $f2, $f0 /* 701058 802392D8 24040004 */ addiu $a0, $zero, 4 @@ -148,7 +148,7 @@ glabel func_802390B4_700E34 /* 701060 802392E0 E6020048 */ swc1 $f2, 0x48($s0) /* 701064 802392E4 2442FFFE */ addiu $v0, $v0, -2 /* 701068 802392E8 44820000 */ mtc1 $v0, $f0 -/* 70106C 802392EC 00000000 */ nop +/* 70106C 802392EC 00000000 */ nop /* 701070 802392F0 46800020 */ cvt.s.w $f0, $f0 /* 701074 802392F4 E6000050 */ swc1 $f0, 0x50($s0) .L802392F8: @@ -175,11 +175,11 @@ glabel func_802390B4_700E34 /* 7010BC 8023933C C6020000 */ lwc1 $f2, ($s0) /* 7010C0 80239340 3C01433E */ lui $at, 0x433e /* 7010C4 80239344 44810000 */ mtc1 $at, $f0 -/* 7010C8 80239348 00000000 */ nop +/* 7010C8 80239348 00000000 */ nop /* 7010CC 8023934C 4602003C */ c.lt.s $f0, $f2 -/* 7010D0 80239350 00000000 */ nop +/* 7010D0 80239350 00000000 */ nop /* 7010D4 80239354 45000046 */ bc1f .L80239470 -/* 7010D8 80239358 00000000 */ nop +/* 7010D8 80239358 00000000 */ nop /* 7010DC 8023935C 8E420074 */ lw $v0, 0x74($s2) /* 7010E0 80239360 1040000E */ beqz $v0, .L8023939C /* 7010E4 80239364 24020002 */ addiu $v0, $zero, 2 @@ -192,7 +192,7 @@ glabel func_802390B4_700E34 /* 7010FC 8023937C 460C1300 */ add.s $f12, $f2, $f12 /* 701100 80239380 3C014387 */ lui $at, 0x4387 /* 701104 80239384 44811000 */ mtc1 $at, $f2 -/* 701108 80239388 00000000 */ nop +/* 701108 80239388 00000000 */ nop /* 70110C 8023938C 46001001 */ sub.s $f0, $f2, $f0 /* 701110 80239390 46020000 */ add.s $f0, $f0, $f2 /* 701114 80239394 0808E50B */ j .L8023942C @@ -200,38 +200,38 @@ glabel func_802390B4_700E34 .L8023939C: /* 70111C 8023939C C6020048 */ lwc1 $f2, 0x48($s0) /* 701120 802393A0 44800000 */ mtc1 $zero, $f0 -/* 701124 802393A4 00000000 */ nop +/* 701124 802393A4 00000000 */ nop /* 701128 802393A8 4602003E */ c.le.s $f0, $f2 -/* 70112C 802393AC 00000000 */ nop +/* 70112C 802393AC 00000000 */ nop /* 701130 802393B0 45000008 */ bc1f .L802393D4 -/* 701134 802393B4 00000000 */ nop +/* 701134 802393B4 00000000 */ nop /* 701138 802393B8 3C0142B4 */ lui $at, 0x42b4 /* 70113C 802393BC 44810000 */ mtc1 $at, $f0 -/* 701140 802393C0 00000000 */ nop +/* 701140 802393C0 00000000 */ nop /* 701144 802393C4 4600103C */ c.lt.s $f2, $f0 -/* 701148 802393C8 00000000 */ nop +/* 701148 802393C8 00000000 */ nop /* 70114C 802393CC 4501FFE8 */ bc1t .L80239370 -/* 701150 802393D0 00000000 */ nop +/* 701150 802393D0 00000000 */ nop .L802393D4: /* 701154 802393D4 3C0142B4 */ lui $at, 0x42b4 /* 701158 802393D8 44810000 */ mtc1 $at, $f0 -/* 70115C 802393DC 00000000 */ nop +/* 70115C 802393DC 00000000 */ nop /* 701160 802393E0 4602003E */ c.le.s $f0, $f2 -/* 701164 802393E4 00000000 */ nop +/* 701164 802393E4 00000000 */ nop /* 701168 802393E8 45000010 */ bc1f .L8023942C -/* 70116C 802393EC 00000000 */ nop +/* 70116C 802393EC 00000000 */ nop /* 701170 802393F0 3C014334 */ lui $at, 0x4334 /* 701174 802393F4 44810000 */ mtc1 $at, $f0 -/* 701178 802393F8 00000000 */ nop +/* 701178 802393F8 00000000 */ nop /* 70117C 802393FC 4600103C */ c.lt.s $f2, $f0 -/* 701180 80239400 00000000 */ nop +/* 701180 80239400 00000000 */ nop /* 701184 80239404 45000009 */ bc1f .L8023942C -/* 701188 80239408 00000000 */ nop +/* 701188 80239408 00000000 */ nop /* 70118C 8023940C 0C00A6C9 */ jal clamp_angle /* 701190 80239410 46001300 */ add.s $f12, $f2, $f0 /* 701194 80239414 3C014387 */ lui $at, 0x4387 /* 701198 80239418 44811000 */ mtc1 $at, $f2 -/* 70119C 8023941C 00000000 */ nop +/* 70119C 8023941C 00000000 */ nop /* 7011A0 80239420 46020001 */ sub.s $f0, $f0, $f2 /* 7011A4 80239424 46001081 */ sub.s $f2, $f2, $f0 /* 7011A8 80239428 E6020048 */ swc1 $f2, 0x48($s0) @@ -259,11 +259,11 @@ glabel func_802390B4_700E34 /* 7011F0 80239470 C6020004 */ lwc1 $f2, 4($s0) /* 7011F4 80239474 3C01C1F0 */ lui $at, 0xc1f0 /* 7011F8 80239478 44810000 */ mtc1 $at, $f0 -/* 7011FC 8023947C 00000000 */ nop +/* 7011FC 8023947C 00000000 */ nop /* 701200 80239480 4600103C */ c.lt.s $f2, $f0 -/* 701204 80239484 00000000 */ nop +/* 701204 80239484 00000000 */ nop /* 701208 80239488 45000043 */ bc1f .L80239598 -/* 70120C 8023948C 00000000 */ nop +/* 70120C 8023948C 00000000 */ nop /* 701210 80239490 8E420074 */ lw $v0, 0x74($s2) /* 701214 80239494 1040000B */ beqz $v0, .L802394C4 /* 701218 80239498 24020002 */ addiu $v0, $zero, 2 @@ -282,32 +282,32 @@ glabel func_802390B4_700E34 /* 701244 802394C4 C60C0048 */ lwc1 $f12, 0x48($s0) /* 701248 802394C8 3C014387 */ lui $at, 0x4387 /* 70124C 802394CC 44810000 */ mtc1 $at, $f0 -/* 701250 802394D0 00000000 */ nop +/* 701250 802394D0 00000000 */ nop /* 701254 802394D4 460C003E */ c.le.s $f0, $f12 -/* 701258 802394D8 00000000 */ nop +/* 701258 802394D8 00000000 */ nop /* 70125C 802394DC 45000008 */ bc1f .L80239500 -/* 701260 802394E0 00000000 */ nop +/* 701260 802394E0 00000000 */ nop /* 701264 802394E4 3C0143B4 */ lui $at, 0x43b4 /* 701268 802394E8 44810000 */ mtc1 $at, $f0 -/* 70126C 802394EC 00000000 */ nop +/* 70126C 802394EC 00000000 */ nop /* 701270 802394F0 4600603C */ c.lt.s $f12, $f0 -/* 701274 802394F4 00000000 */ nop +/* 701274 802394F4 00000000 */ nop /* 701278 802394F8 4501FFEA */ bc1t .L802394A4 -/* 70127C 802394FC 00000000 */ nop +/* 70127C 802394FC 00000000 */ nop .L80239500: /* 701280 80239500 44800000 */ mtc1 $zero, $f0 -/* 701284 80239504 00000000 */ nop +/* 701284 80239504 00000000 */ nop /* 701288 80239508 460C003E */ c.le.s $f0, $f12 -/* 70128C 8023950C 00000000 */ nop +/* 70128C 8023950C 00000000 */ nop /* 701290 80239510 4500000F */ bc1f .L80239550 -/* 701294 80239514 00000000 */ nop +/* 701294 80239514 00000000 */ nop /* 701298 80239518 3C0142B4 */ lui $at, 0x42b4 /* 70129C 8023951C 44810000 */ mtc1 $at, $f0 -/* 7012A0 80239520 00000000 */ nop +/* 7012A0 80239520 00000000 */ nop /* 7012A4 80239524 4600603C */ c.lt.s $f12, $f0 -/* 7012A8 80239528 00000000 */ nop +/* 7012A8 80239528 00000000 */ nop /* 7012AC 8023952C 45000008 */ bc1f .L80239550 -/* 7012B0 80239530 00000000 */ nop +/* 7012B0 80239530 00000000 */ nop /* 7012B4 80239534 3C014334 */ lui $at, 0x4334 /* 7012B8 80239538 4481A000 */ mtc1 $at, $f20 /* 7012BC 8023953C 0C00A6C9 */ jal clamp_angle @@ -339,11 +339,11 @@ glabel func_802390B4_700E34 .L80239598: /* 701318 80239598 3C014320 */ lui $at, 0x4320 /* 70131C 8023959C 44810000 */ mtc1 $at, $f0 -/* 701320 802395A0 00000000 */ nop +/* 701320 802395A0 00000000 */ nop /* 701324 802395A4 4602003C */ c.lt.s $f0, $f2 -/* 701328 802395A8 00000000 */ nop +/* 701328 802395A8 00000000 */ nop /* 70132C 802395AC 45000045 */ bc1f .L802396C4 -/* 701330 802395B0 00000000 */ nop +/* 701330 802395B0 00000000 */ nop /* 701334 802395B4 8E420074 */ lw $v0, 0x74($s2) /* 701338 802395B8 1040000C */ beqz $v0, .L802395EC /* 70133C 802395BC 24020002 */ addiu $v0, $zero, 2 @@ -355,7 +355,7 @@ glabel func_802390B4_700E34 /* 70134C 802395CC 46006300 */ add.s $f12, $f12, $f0 /* 701350 802395D0 3C0143B4 */ lui $at, 0x43b4 /* 701354 802395D4 44811000 */ mtc1 $at, $f2 -/* 701358 802395D8 00000000 */ nop +/* 701358 802395D8 00000000 */ nop /* 70135C 802395DC 46001001 */ sub.s $f0, $f2, $f0 /* 701360 802395E0 46020000 */ add.s $f0, $f0, $f2 /* 701364 802395E4 0808E5A0 */ j .L80239680 @@ -364,38 +364,38 @@ glabel func_802390B4_700E34 /* 70136C 802395EC C60C0048 */ lwc1 $f12, 0x48($s0) /* 701370 802395F0 3C0142B4 */ lui $at, 0x42b4 /* 701374 802395F4 44810000 */ mtc1 $at, $f0 -/* 701378 802395F8 00000000 */ nop +/* 701378 802395F8 00000000 */ nop /* 70137C 802395FC 460C003E */ c.le.s $f0, $f12 -/* 701380 80239600 00000000 */ nop +/* 701380 80239600 00000000 */ nop /* 701384 80239604 45000008 */ bc1f .L80239628 -/* 701388 80239608 00000000 */ nop +/* 701388 80239608 00000000 */ nop /* 70138C 8023960C 3C014334 */ lui $at, 0x4334 /* 701390 80239610 44810000 */ mtc1 $at, $f0 -/* 701394 80239614 00000000 */ nop +/* 701394 80239614 00000000 */ nop /* 701398 80239618 4600603C */ c.lt.s $f12, $f0 -/* 70139C 8023961C 00000000 */ nop +/* 70139C 8023961C 00000000 */ nop /* 7013A0 80239620 4501FFE9 */ bc1t .L802395C8 -/* 7013A4 80239624 00000000 */ nop +/* 7013A4 80239624 00000000 */ nop .L80239628: /* 7013A8 80239628 3C014334 */ lui $at, 0x4334 /* 7013AC 8023962C 44811000 */ mtc1 $at, $f2 -/* 7013B0 80239630 00000000 */ nop +/* 7013B0 80239630 00000000 */ nop /* 7013B4 80239634 460C103E */ c.le.s $f2, $f12 -/* 7013B8 80239638 00000000 */ nop +/* 7013B8 80239638 00000000 */ nop /* 7013BC 8023963C 45000010 */ bc1f .L80239680 -/* 7013C0 80239640 00000000 */ nop +/* 7013C0 80239640 00000000 */ nop /* 7013C4 80239644 3C014387 */ lui $at, 0x4387 /* 7013C8 80239648 44810000 */ mtc1 $at, $f0 -/* 7013CC 8023964C 00000000 */ nop +/* 7013CC 8023964C 00000000 */ nop /* 7013D0 80239650 4600603C */ c.lt.s $f12, $f0 -/* 7013D4 80239654 00000000 */ nop +/* 7013D4 80239654 00000000 */ nop /* 7013D8 80239658 45000009 */ bc1f .L80239680 -/* 7013DC 8023965C 00000000 */ nop +/* 7013DC 8023965C 00000000 */ nop /* 7013E0 80239660 0C00A6C9 */ jal clamp_angle /* 7013E4 80239664 46026300 */ add.s $f12, $f12, $f2 /* 7013E8 80239668 3C0143B4 */ lui $at, 0x43b4 /* 7013EC 8023966C 44811000 */ mtc1 $at, $f2 -/* 7013F0 80239670 00000000 */ nop +/* 7013F0 80239670 00000000 */ nop /* 7013F4 80239674 46020001 */ sub.s $f0, $f0, $f2 /* 7013F8 80239678 46001081 */ sub.s $f2, $f2, $f0 /* 7013FC 8023967C E6020048 */ swc1 $f2, 0x48($s0) @@ -426,7 +426,7 @@ glabel func_802390B4_700E34 /* 701450 802396D0 44801000 */ mtc1 $zero, $f2 /* 701454 802396D4 46000021 */ cvt.d.s $f0, $f0 /* 701458 802396D8 46220002 */ mul.d $f0, $f0, $f2 -/* 70145C 802396DC 00000000 */ nop +/* 70145C 802396DC 00000000 */ nop /* 701460 802396E0 C60C0048 */ lwc1 $f12, 0x48($s0) /* 701464 802396E4 46006321 */ cvt.d.s $f12, $f12 /* 701468 802396E8 46206300 */ add.d $f12, $f12, $f0 @@ -451,7 +451,7 @@ glabel func_802390B4_700E34 /* 7014A8 80239728 1062000D */ beq $v1, $v0, .L80239760 /* 7014AC 8023972C 0200202D */ daddu $a0, $s0, $zero /* 7014B0 80239730 0808E5E4 */ j .L80239790 -/* 7014B4 80239734 00000000 */ nop +/* 7014B4 80239734 00000000 */ nop .L80239738: /* 7014B8 80239738 3C038024 */ lui $v1, %hi(D_8023BD70) /* 7014BC 8023973C 8C63BD70 */ lw $v1, %lo(D_8023BD70)($v1) diff --git a/asm/nonmatchings/code_6FFD80/func_802397C8_701548.s b/asm/nonmatchings/code_6FFD80/func_802397C8_701548.s index 69227b20a2..e82330fc26 100644 --- a/asm/nonmatchings/code_6FFD80/func_802397C8_701548.s +++ b/asm/nonmatchings/code_6FFD80/func_802397C8_701548.s @@ -19,4 +19,4 @@ glabel func_802397C8_701548 /* 701580 80239800 24020002 */ addiu $v0, $zero, 2 /* 701584 80239804 03E00008 */ jr $ra /* 701588 80239808 AC8300C0 */ sw $v1, 0xc0($a0) -/* 70158C 8023980C 00000000 */ nop +/* 70158C 8023980C 00000000 */ nop diff --git a/asm/nonmatchings/code_707CA0/func_80238000_707CA0.s b/asm/nonmatchings/code_707CA0/func_80238000_707CA0.s index 97c9c4eceb..e6ebffad05 100644 --- a/asm/nonmatchings/code_707CA0/func_80238000_707CA0.s +++ b/asm/nonmatchings/code_707CA0/func_80238000_707CA0.s @@ -13,7 +13,7 @@ glabel func_80238000_707CA0 /* 707CC0 80238020 2604000C */ addiu $a0, $s0, 0xc /* 707CC4 80238024 86040428 */ lh $a0, 0x428($s0) /* 707CC8 80238028 0C09A75B */ jal get_actor -/* 707CCC 8023802C 00000000 */ nop +/* 707CCC 8023802C 00000000 */ nop /* 707CD0 80238030 82050426 */ lb $a1, 0x426($s0) /* 707CD4 80238034 0C099117 */ jal get_actor_part /* 707CD8 80238038 0040202D */ daddu $a0, $v0, $zero @@ -21,7 +21,7 @@ glabel func_80238000_707CA0 /* 707CE0 80238040 C6020018 */ lwc1 $f2, 0x18($s0) /* 707CE4 80238044 C6060144 */ lwc1 $f6, 0x144($s0) /* 707CE8 80238048 44830000 */ mtc1 $v1, $f0 -/* 707CEC 8023804C 00000000 */ nop +/* 707CEC 8023804C 00000000 */ nop /* 707CF0 80238050 46800020 */ cvt.s.w $f0, $f0 /* 707CF4 80238054 46001080 */ add.s $f2, $f2, $f0 /* 707CF8 80238058 3C014100 */ lui $at, 0x4100 @@ -30,14 +30,14 @@ glabel func_80238000_707CA0 /* 707D04 80238064 46003180 */ add.s $f6, $f6, $f0 /* 707D08 80238068 3C014180 */ lui $at, 0x4180 /* 707D0C 8023806C 44810000 */ mtc1 $at, $f0 -/* 707D10 80238070 00000000 */ nop +/* 707D10 80238070 00000000 */ nop /* 707D14 80238074 46002100 */ add.s $f4, $f4, $f0 /* 707D18 80238078 E6020018 */ swc1 $f2, 0x18($s0) /* 707D1C 8023807C 44061000 */ mfc1 $a2, $f2 /* 707D20 80238080 80420076 */ lb $v0, 0x76($v0) /* 707D24 80238084 C602001C */ lwc1 $f2, 0x1c($s0) /* 707D28 80238088 44820000 */ mtc1 $v0, $f0 -/* 707D2C 8023808C 00000000 */ nop +/* 707D2C 8023808C 00000000 */ nop /* 707D30 80238090 46800020 */ cvt.s.w $f0, $f0 /* 707D34 80238094 46001080 */ add.s $f2, $f2, $f0 /* 707D38 80238098 C6000020 */ lwc1 $f0, 0x20($s0) @@ -52,17 +52,17 @@ glabel func_80238000_707CA0 /* 707D5C 802380BC E6020014 */ swc1 $f2, 0x14($s0) /* 707D60 802380C0 3C0142B4 */ lui $at, 0x42b4 /* 707D64 802380C4 44812000 */ mtc1 $at, $f4 -/* 707D68 802380C8 00000000 */ nop +/* 707D68 802380C8 00000000 */ nop /* 707D6C 802380CC 46040101 */ sub.s $f4, $f0, $f4 /* 707D70 802380D0 3C013E80 */ lui $at, 0x3e80 /* 707D74 802380D4 44811000 */ mtc1 $at, $f2 -/* 707D78 802380D8 00000000 */ nop +/* 707D78 802380D8 00000000 */ nop /* 707D7C 802380DC 46022102 */ mul.s $f4, $f4, $f2 -/* 707D80 802380E0 00000000 */ nop +/* 707D80 802380E0 00000000 */ nop /* 707D84 802380E4 44801000 */ mtc1 $zero, $f2 /* 707D88 802380E8 E6000054 */ swc1 $f0, 0x54($s0) /* 707D8C 802380EC 4602203C */ c.lt.s $f4, $f2 -/* 707D90 802380F0 00000000 */ nop +/* 707D90 802380F0 00000000 */ nop /* 707D94 802380F4 45000002 */ bc1f .L80238100 /* 707D98 802380F8 E6040164 */ swc1 $f4, 0x164($s0) /* 707D9C 802380FC E6020164 */ swc1 $f2, 0x164($s0) diff --git a/asm/nonmatchings/code_707CA0/func_80238388_708028.s b/asm/nonmatchings/code_707CA0/func_80238388_708028.s index 06e7bc57aa..960b550b2b 100644 --- a/asm/nonmatchings/code_707CA0/func_80238388_708028.s +++ b/asm/nonmatchings/code_707CA0/func_80238388_708028.s @@ -20,10 +20,10 @@ glabel func_80238388_708028 /* 708064 802383C4 C60A014C */ lwc1 $f10, 0x14c($s0) /* 708068 802383C8 E7A00010 */ swc1 $f0, 0x10($sp) /* 70806C 802383CC 44820000 */ mtc1 $v0, $f0 -/* 708070 802383D0 00000000 */ nop +/* 708070 802383D0 00000000 */ nop /* 708074 802383D4 46800021 */ cvt.d.w $f0, $f0 /* 708078 802383D8 46220002 */ mul.d $f0, $f0, $f2 -/* 70807C 802383DC 00000000 */ nop +/* 70807C 802383DC 00000000 */ nop /* 708080 802383E0 24040001 */ addiu $a0, $zero, 1 /* 708084 802383E4 C6220148 */ lwc1 $f2, 0x148($s1) /* 708088 802383E8 2402001E */ addiu $v0, $zero, 0x1e diff --git a/asm/nonmatchings/code_707CA0/func_80238480_708120.s b/asm/nonmatchings/code_707CA0/func_80238480_708120.s index 0c87f8f30d..9441ff41e0 100644 --- a/asm/nonmatchings/code_707CA0/func_80238480_708120.s +++ b/asm/nonmatchings/code_707CA0/func_80238480_708120.s @@ -30,7 +30,7 @@ glabel func_80238480_708120 /* 708184 802384E4 10800003 */ beqz $a0, .L802384F4 /* 708188 802384E8 46000506 */ mov.s $f20, $f0 /* 70818C 802384EC 0C016914 */ jal remove_effect -/* 708190 802384F0 00000000 */ nop +/* 708190 802384F0 00000000 */ nop .L802384F4: /* 708194 802384F4 4405C000 */ mfc1 $a1, $f24 /* 708198 802384F8 3C013FC0 */ lui $at, 0x3fc0 diff --git a/asm/nonmatchings/code_707CA0/func_80238540_7081E0.s b/asm/nonmatchings/code_707CA0/func_80238540_7081E0.s index f885844ec6..c1d98b09cd 100644 --- a/asm/nonmatchings/code_707CA0/func_80238540_7081E0.s +++ b/asm/nonmatchings/code_707CA0/func_80238540_7081E0.s @@ -21,7 +21,7 @@ glabel func_80238540_7081E0 /* 70821C 8023857C 1062002C */ beq $v1, $v0, .L80238630 /* 708220 80238580 24020002 */ addiu $v0, $zero, 2 /* 708224 80238584 0808E346 */ j .L80238D18 -/* 708228 80238588 00000000 */ nop +/* 708228 80238588 00000000 */ nop .L8023858C: /* 70822C 8023858C C6200144 */ lwc1 $f0, 0x144($s1) /* 708230 80238590 C6220148 */ lwc1 $f2, 0x148($s1) @@ -73,36 +73,36 @@ glabel func_80238540_7081E0 /* 7082E4 80238644 C622000C */ lwc1 $f2, 0xc($s1) /* 7082E8 80238648 3C01C320 */ lui $at, 0xc320 /* 7082EC 8023864C 44810000 */ mtc1 $at, $f0 -/* 7082F0 80238650 00000000 */ nop +/* 7082F0 80238650 00000000 */ nop /* 7082F4 80238654 4600103C */ c.lt.s $f2, $f0 -/* 7082F8 80238658 00000000 */ nop +/* 7082F8 80238658 00000000 */ nop /* 7082FC 8023865C 45000042 */ bc1f .L80238768 -/* 708300 80238660 00000000 */ nop +/* 708300 80238660 00000000 */ nop /* 708304 80238664 8E420074 */ lw $v0, 0x74($s2) /* 708308 80238668 544000EF */ bnel $v0, $zero, .L80238A28 /* 70830C 8023866C 24020002 */ addiu $v0, $zero, 2 /* 708310 80238670 C6220054 */ lwc1 $f2, 0x54($s1) /* 708314 80238674 3C014387 */ lui $at, 0x4387 /* 708318 80238678 44810000 */ mtc1 $at, $f0 -/* 70831C 8023867C 00000000 */ nop +/* 70831C 8023867C 00000000 */ nop /* 708320 80238680 4602003E */ c.le.s $f0, $f2 -/* 708324 80238684 00000000 */ nop +/* 708324 80238684 00000000 */ nop /* 708328 80238688 45000019 */ bc1f .L802386F0 -/* 70832C 8023868C 00000000 */ nop +/* 70832C 8023868C 00000000 */ nop /* 708330 80238690 3C0143B4 */ lui $at, 0x43b4 /* 708334 80238694 44810000 */ mtc1 $at, $f0 -/* 708338 80238698 00000000 */ nop +/* 708338 80238698 00000000 */ nop /* 70833C 8023869C 4600103C */ c.lt.s $f2, $f0 -/* 708340 802386A0 00000000 */ nop +/* 708340 802386A0 00000000 */ nop /* 708344 802386A4 45000012 */ bc1f .L802386F0 -/* 708348 802386A8 00000000 */ nop +/* 708348 802386A8 00000000 */ nop /* 70834C 802386AC 3C014334 */ lui $at, 0x4334 /* 708350 802386B0 44816000 */ mtc1 $at, $f12 /* 708354 802386B4 0C00A6C9 */ jal clamp_angle /* 708358 802386B8 460C1300 */ add.s $f12, $f2, $f12 /* 70835C 802386BC 3C0142B4 */ lui $at, 0x42b4 /* 708360 802386C0 44811000 */ mtc1 $at, $f2 -/* 708364 802386C4 00000000 */ nop +/* 708364 802386C4 00000000 */ nop /* 708368 802386C8 46001001 */ sub.s $f0, $f2, $f0 /* 70836C 802386CC 46020000 */ add.s $f0, $f0, $f2 /* 708370 802386D0 24040004 */ addiu $a0, $zero, 4 @@ -110,30 +110,30 @@ glabel func_80238540_7081E0 /* 708378 802386D8 E6200054 */ swc1 $f0, 0x54($s1) /* 70837C 802386DC 2442FFFE */ addiu $v0, $v0, -2 /* 708380 802386E0 44820000 */ mtc1 $v0, $f0 -/* 708384 802386E4 00000000 */ nop +/* 708384 802386E4 00000000 */ nop /* 708388 802386E8 46800020 */ cvt.s.w $f0, $f0 /* 70838C 802386EC E620005C */ swc1 $f0, 0x5c($s1) .L802386F0: /* 708390 802386F0 C60C0048 */ lwc1 $f12, 0x48($s0) /* 708394 802386F4 3C014334 */ lui $at, 0x4334 /* 708398 802386F8 44811000 */ mtc1 $at, $f2 -/* 70839C 802386FC 00000000 */ nop +/* 70839C 802386FC 00000000 */ nop /* 7083A0 80238700 460C103E */ c.le.s $f2, $f12 -/* 7083A4 80238704 00000000 */ nop +/* 7083A4 80238704 00000000 */ nop /* 7083A8 80238708 45000017 */ bc1f .L80238768 -/* 7083AC 8023870C 00000000 */ nop +/* 7083AC 8023870C 00000000 */ nop /* 7083B0 80238710 3C014387 */ lui $at, 0x4387 /* 7083B4 80238714 44810000 */ mtc1 $at, $f0 -/* 7083B8 80238718 00000000 */ nop +/* 7083B8 80238718 00000000 */ nop /* 7083BC 8023871C 4600603C */ c.lt.s $f12, $f0 -/* 7083C0 80238720 00000000 */ nop +/* 7083C0 80238720 00000000 */ nop /* 7083C4 80238724 45000010 */ bc1f .L80238768 -/* 7083C8 80238728 00000000 */ nop +/* 7083C8 80238728 00000000 */ nop /* 7083CC 8023872C 0C00A6C9 */ jal clamp_angle /* 7083D0 80238730 46026300 */ add.s $f12, $f12, $f2 /* 7083D4 80238734 3C0142B4 */ lui $at, 0x42b4 /* 7083D8 80238738 44811000 */ mtc1 $at, $f2 -/* 7083DC 8023873C 00000000 */ nop +/* 7083DC 8023873C 00000000 */ nop /* 7083E0 80238740 46020001 */ sub.s $f0, $f0, $f2 /* 7083E4 80238744 46001081 */ sub.s $f2, $f2, $f0 /* 7083E8 80238748 24040004 */ addiu $a0, $zero, 4 @@ -141,18 +141,18 @@ glabel func_80238540_7081E0 /* 7083F0 80238750 E6020048 */ swc1 $f2, 0x48($s0) /* 7083F4 80238754 2442FFFE */ addiu $v0, $v0, -2 /* 7083F8 80238758 44820000 */ mtc1 $v0, $f0 -/* 7083FC 8023875C 00000000 */ nop +/* 7083FC 8023875C 00000000 */ nop /* 708400 80238760 46800020 */ cvt.s.w $f0, $f0 /* 708404 80238764 E6000050 */ swc1 $f0, 0x50($s0) .L80238768: /* 708408 80238768 C6020000 */ lwc1 $f2, ($s0) /* 70840C 8023876C 3C014320 */ lui $at, 0x4320 /* 708410 80238770 44810000 */ mtc1 $at, $f0 -/* 708414 80238774 00000000 */ nop +/* 708414 80238774 00000000 */ nop /* 708418 80238778 4602003C */ c.lt.s $f0, $f2 -/* 70841C 8023877C 00000000 */ nop +/* 70841C 8023877C 00000000 */ nop /* 708420 80238780 4500004F */ bc1f .L802388C0 -/* 708424 80238784 00000000 */ nop +/* 708424 80238784 00000000 */ nop /* 708428 80238788 8E420074 */ lw $v0, 0x74($s2) /* 70842C 8023878C 1040000F */ beqz $v0, .L802387CC /* 708430 80238790 24020002 */ addiu $v0, $zero, 2 @@ -165,7 +165,7 @@ glabel func_80238540_7081E0 /* 708448 802387A8 460C1300 */ add.s $f12, $f2, $f12 /* 70844C 802387AC 3C014387 */ lui $at, 0x4387 /* 708450 802387B0 44811000 */ mtc1 $at, $f2 -/* 708454 802387B4 00000000 */ nop +/* 708454 802387B4 00000000 */ nop /* 708458 802387B8 46001001 */ sub.s $f0, $f2, $f0 /* 70845C 802387BC 46020000 */ add.s $f0, $f0, $f2 /* 708460 802387C0 24040004 */ addiu $a0, $zero, 4 @@ -174,48 +174,48 @@ glabel func_80238540_7081E0 .L802387CC: /* 70846C 802387CC C6020048 */ lwc1 $f2, 0x48($s0) /* 708470 802387D0 44800000 */ mtc1 $zero, $f0 -/* 708474 802387D4 00000000 */ nop +/* 708474 802387D4 00000000 */ nop /* 708478 802387D8 4602003E */ c.le.s $f0, $f2 -/* 70847C 802387DC 00000000 */ nop +/* 70847C 802387DC 00000000 */ nop /* 708480 802387E0 45000008 */ bc1f .L80238804 -/* 708484 802387E4 00000000 */ nop +/* 708484 802387E4 00000000 */ nop /* 708488 802387E8 3C0142B4 */ lui $at, 0x42b4 /* 70848C 802387EC 44810000 */ mtc1 $at, $f0 -/* 708490 802387F0 00000000 */ nop +/* 708490 802387F0 00000000 */ nop /* 708494 802387F4 4600103C */ c.lt.s $f2, $f0 -/* 708498 802387F8 00000000 */ nop +/* 708498 802387F8 00000000 */ nop /* 70849C 802387FC 4501FFE7 */ bc1t .L8023879C -/* 7084A0 80238800 00000000 */ nop +/* 7084A0 80238800 00000000 */ nop .L80238804: /* 7084A4 80238804 3C0142B4 */ lui $at, 0x42b4 /* 7084A8 80238808 44810000 */ mtc1 $at, $f0 -/* 7084AC 8023880C 00000000 */ nop +/* 7084AC 8023880C 00000000 */ nop /* 7084B0 80238810 4602003E */ c.le.s $f0, $f2 -/* 7084B4 80238814 00000000 */ nop +/* 7084B4 80238814 00000000 */ nop /* 7084B8 80238818 45000018 */ bc1f .L8023887C -/* 7084BC 8023881C 00000000 */ nop +/* 7084BC 8023881C 00000000 */ nop /* 7084C0 80238820 3C014334 */ lui $at, 0x4334 /* 7084C4 80238824 44810000 */ mtc1 $at, $f0 -/* 7084C8 80238828 00000000 */ nop +/* 7084C8 80238828 00000000 */ nop /* 7084CC 8023882C 4600103C */ c.lt.s $f2, $f0 -/* 7084D0 80238830 00000000 */ nop +/* 7084D0 80238830 00000000 */ nop /* 7084D4 80238834 45000011 */ bc1f .L8023887C -/* 7084D8 80238838 00000000 */ nop +/* 7084D8 80238838 00000000 */ nop /* 7084DC 8023883C 0C00A6C9 */ jal clamp_angle /* 7084E0 80238840 46001300 */ add.s $f12, $f2, $f0 /* 7084E4 80238844 3C014387 */ lui $at, 0x4387 /* 7084E8 80238848 44811000 */ mtc1 $at, $f2 -/* 7084EC 8023884C 00000000 */ nop +/* 7084EC 8023884C 00000000 */ nop /* 7084F0 80238850 46020001 */ sub.s $f0, $f0, $f2 /* 7084F4 80238854 46001081 */ sub.s $f2, $f2, $f0 /* 7084F8 80238858 24040004 */ addiu $a0, $zero, 4 /* 7084FC 8023885C E6020048 */ swc1 $f2, 0x48($s0) .L80238860: /* 708500 80238860 0C00A67F */ jal rand_int -/* 708504 80238864 00000000 */ nop +/* 708504 80238864 00000000 */ nop /* 708508 80238868 2442FFFE */ addiu $v0, $v0, -2 /* 70850C 8023886C 44820000 */ mtc1 $v0, $f0 -/* 708510 80238870 00000000 */ nop +/* 708510 80238870 00000000 */ nop /* 708514 80238874 46800020 */ cvt.s.w $f0, $f0 /* 708518 80238878 E6000050 */ swc1 $f0, 0x50($s0) .L8023887C: @@ -241,11 +241,11 @@ glabel func_80238540_7081E0 .L802388C0: /* 708560 802388C0 C6000004 */ lwc1 $f0, 4($s0) /* 708564 802388C4 44801000 */ mtc1 $zero, $f2 -/* 708568 802388C8 00000000 */ nop +/* 708568 802388C8 00000000 */ nop /* 70856C 802388CC 4602003C */ c.lt.s $f0, $f2 -/* 708570 802388D0 00000000 */ nop +/* 708570 802388D0 00000000 */ nop /* 708574 802388D4 45000049 */ bc1f .L802389FC -/* 708578 802388D8 00000000 */ nop +/* 708578 802388D8 00000000 */ nop /* 70857C 802388DC 8E420074 */ lw $v0, 0x74($s2) /* 708580 802388E0 1040000C */ beqz $v0, .L80238914 /* 708584 802388E4 24020002 */ addiu $v0, $zero, 2 @@ -265,30 +265,30 @@ glabel func_80238540_7081E0 /* 7085B4 80238914 C60C0048 */ lwc1 $f12, 0x48($s0) /* 7085B8 80238918 3C014387 */ lui $at, 0x4387 /* 7085BC 8023891C 44810000 */ mtc1 $at, $f0 -/* 7085C0 80238920 00000000 */ nop +/* 7085C0 80238920 00000000 */ nop /* 7085C4 80238924 460C003E */ c.le.s $f0, $f12 -/* 7085C8 80238928 00000000 */ nop +/* 7085C8 80238928 00000000 */ nop /* 7085CC 8023892C 45000008 */ bc1f .L80238950 -/* 7085D0 80238930 00000000 */ nop +/* 7085D0 80238930 00000000 */ nop /* 7085D4 80238934 3C0143B4 */ lui $at, 0x43b4 /* 7085D8 80238938 44810000 */ mtc1 $at, $f0 -/* 7085DC 8023893C 00000000 */ nop +/* 7085DC 8023893C 00000000 */ nop /* 7085E0 80238940 4600603C */ c.lt.s $f12, $f0 -/* 7085E4 80238944 00000000 */ nop +/* 7085E4 80238944 00000000 */ nop /* 7085E8 80238948 4501FFE9 */ bc1t .L802388F0 -/* 7085EC 8023894C 00000000 */ nop +/* 7085EC 8023894C 00000000 */ nop .L80238950: /* 7085F0 80238950 460C103E */ c.le.s $f2, $f12 -/* 7085F4 80238954 00000000 */ nop +/* 7085F4 80238954 00000000 */ nop /* 7085F8 80238958 45000017 */ bc1f .L802389B8 -/* 7085FC 8023895C 00000000 */ nop +/* 7085FC 8023895C 00000000 */ nop /* 708600 80238960 3C0142B4 */ lui $at, 0x42b4 /* 708604 80238964 44810000 */ mtc1 $at, $f0 -/* 708608 80238968 00000000 */ nop +/* 708608 80238968 00000000 */ nop /* 70860C 8023896C 4600603C */ c.lt.s $f12, $f0 -/* 708610 80238970 00000000 */ nop +/* 708610 80238970 00000000 */ nop /* 708614 80238974 45000010 */ bc1f .L802389B8 -/* 708618 80238978 00000000 */ nop +/* 708618 80238978 00000000 */ nop /* 70861C 8023897C 3C014334 */ lui $at, 0x4334 /* 708620 80238980 4481A000 */ mtc1 $at, $f20 /* 708624 80238984 0C00A6C9 */ jal clamp_angle @@ -299,10 +299,10 @@ glabel func_80238540_7081E0 /* 708638 80238998 E6140048 */ swc1 $f20, 0x48($s0) .L8023899C: /* 70863C 8023899C 0C00A67F */ jal rand_int -/* 708640 802389A0 00000000 */ nop +/* 708640 802389A0 00000000 */ nop /* 708644 802389A4 2442FFFE */ addiu $v0, $v0, -2 /* 708648 802389A8 44820000 */ mtc1 $v0, $f0 -/* 70864C 802389AC 00000000 */ nop +/* 70864C 802389AC 00000000 */ nop /* 708650 802389B0 46800020 */ cvt.s.w $f0, $f0 /* 708654 802389B4 E6000050 */ swc1 $f0, 0x50($s0) .L802389B8: @@ -329,11 +329,11 @@ glabel func_80238540_7081E0 /* 70869C 802389FC C6020004 */ lwc1 $f2, 4($s0) /* 7086A0 80238A00 3C014302 */ lui $at, 0x4302 /* 7086A4 80238A04 44810000 */ mtc1 $at, $f0 -/* 7086A8 80238A08 00000000 */ nop +/* 7086A8 80238A08 00000000 */ nop /* 7086AC 80238A0C 4602003C */ c.lt.s $f0, $f2 -/* 7086B0 80238A10 00000000 */ nop +/* 7086B0 80238A10 00000000 */ nop /* 7086B4 80238A14 4500004E */ bc1f .L80238B50 -/* 7086B8 80238A18 00000000 */ nop +/* 7086B8 80238A18 00000000 */ nop /* 7086BC 80238A1C 8E420074 */ lw $v0, 0x74($s2) /* 7086C0 80238A20 1040000D */ beqz $v0, .L80238A58 /* 7086C4 80238A24 24020002 */ addiu $v0, $zero, 2 @@ -345,7 +345,7 @@ glabel func_80238540_7081E0 /* 7086D4 80238A34 46006300 */ add.s $f12, $f12, $f0 /* 7086D8 80238A38 3C0143B4 */ lui $at, 0x43b4 /* 7086DC 80238A3C 44811000 */ mtc1 $at, $f2 -/* 7086E0 80238A40 00000000 */ nop +/* 7086E0 80238A40 00000000 */ nop /* 7086E4 80238A44 46001001 */ sub.s $f0, $f2, $f0 /* 7086E8 80238A48 46020000 */ add.s $f0, $f0, $f2 /* 7086EC 80238A4C 24040004 */ addiu $a0, $zero, 4 @@ -355,48 +355,48 @@ glabel func_80238540_7081E0 /* 7086F8 80238A58 C60C0048 */ lwc1 $f12, 0x48($s0) /* 7086FC 80238A5C 3C0142B4 */ lui $at, 0x42b4 /* 708700 80238A60 44810000 */ mtc1 $at, $f0 -/* 708704 80238A64 00000000 */ nop +/* 708704 80238A64 00000000 */ nop /* 708708 80238A68 460C003E */ c.le.s $f0, $f12 -/* 70870C 80238A6C 00000000 */ nop +/* 70870C 80238A6C 00000000 */ nop /* 708710 80238A70 45000008 */ bc1f .L80238A94 -/* 708714 80238A74 00000000 */ nop +/* 708714 80238A74 00000000 */ nop /* 708718 80238A78 3C014334 */ lui $at, 0x4334 /* 70871C 80238A7C 44810000 */ mtc1 $at, $f0 -/* 708720 80238A80 00000000 */ nop +/* 708720 80238A80 00000000 */ nop /* 708724 80238A84 4600603C */ c.lt.s $f12, $f0 -/* 708728 80238A88 00000000 */ nop +/* 708728 80238A88 00000000 */ nop /* 70872C 80238A8C 4501FFE8 */ bc1t .L80238A30 -/* 708730 80238A90 00000000 */ nop +/* 708730 80238A90 00000000 */ nop .L80238A94: /* 708734 80238A94 3C014334 */ lui $at, 0x4334 /* 708738 80238A98 44811000 */ mtc1 $at, $f2 -/* 70873C 80238A9C 00000000 */ nop +/* 70873C 80238A9C 00000000 */ nop /* 708740 80238AA0 460C103E */ c.le.s $f2, $f12 -/* 708744 80238AA4 00000000 */ nop +/* 708744 80238AA4 00000000 */ nop /* 708748 80238AA8 45000018 */ bc1f .L80238B0C -/* 70874C 80238AAC 00000000 */ nop +/* 70874C 80238AAC 00000000 */ nop /* 708750 80238AB0 3C014387 */ lui $at, 0x4387 /* 708754 80238AB4 44810000 */ mtc1 $at, $f0 -/* 708758 80238AB8 00000000 */ nop +/* 708758 80238AB8 00000000 */ nop /* 70875C 80238ABC 4600603C */ c.lt.s $f12, $f0 -/* 708760 80238AC0 00000000 */ nop +/* 708760 80238AC0 00000000 */ nop /* 708764 80238AC4 45000011 */ bc1f .L80238B0C -/* 708768 80238AC8 00000000 */ nop +/* 708768 80238AC8 00000000 */ nop /* 70876C 80238ACC 0C00A6C9 */ jal clamp_angle /* 708770 80238AD0 46026300 */ add.s $f12, $f12, $f2 /* 708774 80238AD4 3C0143B4 */ lui $at, 0x43b4 /* 708778 80238AD8 44811000 */ mtc1 $at, $f2 -/* 70877C 80238ADC 00000000 */ nop +/* 70877C 80238ADC 00000000 */ nop /* 708780 80238AE0 46020001 */ sub.s $f0, $f0, $f2 /* 708784 80238AE4 46001081 */ sub.s $f2, $f2, $f0 /* 708788 80238AE8 24040004 */ addiu $a0, $zero, 4 /* 70878C 80238AEC E6020048 */ swc1 $f2, 0x48($s0) .L80238AF0: /* 708790 80238AF0 0C00A67F */ jal rand_int -/* 708794 80238AF4 00000000 */ nop +/* 708794 80238AF4 00000000 */ nop /* 708798 80238AF8 2442FFFE */ addiu $v0, $v0, -2 /* 70879C 80238AFC 44820000 */ mtc1 $v0, $f0 -/* 7087A0 80238B00 00000000 */ nop +/* 7087A0 80238B00 00000000 */ nop /* 7087A4 80238B04 46800020 */ cvt.s.w $f0, $f0 /* 7087A8 80238B08 E6000050 */ swc1 $f0, 0x50($s0) .L80238B0C: @@ -426,7 +426,7 @@ glabel func_80238540_7081E0 /* 7087FC 80238B5C 44801000 */ mtc1 $zero, $f2 /* 708800 80238B60 46000021 */ cvt.d.s $f0, $f0 /* 708804 80238B64 46220002 */ mul.d $f0, $f0, $f2 -/* 708808 80238B68 00000000 */ nop +/* 708808 80238B68 00000000 */ nop /* 70880C 80238B6C C60C0048 */ lwc1 $f12, 0x48($s0) /* 708810 80238B70 46006321 */ cvt.d.s $f12, $f12 /* 708814 80238B74 46206300 */ add.d $f12, $f12, $f0 @@ -435,7 +435,7 @@ glabel func_80238540_7081E0 /* 708820 80238B80 3C01439D */ lui $at, 0x439d /* 708824 80238B84 34218000 */ ori $at, $at, 0x8000 /* 708828 80238B88 44816000 */ mtc1 $at, $f12 -/* 70882C 80238B8C 00000000 */ nop +/* 70882C 80238B8C 00000000 */ nop /* 708830 80238B90 460C0301 */ sub.s $f12, $f0, $f12 /* 708834 80238B94 0C00A6C9 */ jal clamp_angle /* 708838 80238B98 E6000048 */ swc1 $f0, 0x48($s0) @@ -455,12 +455,12 @@ glabel func_80238540_7081E0 /* 708870 80238BD0 44801000 */ mtc1 $zero, $f2 /* 708874 80238BD4 46000021 */ cvt.d.s $f0, $f0 /* 708878 80238BD8 4622003C */ c.lt.d $f0, $f2 -/* 70887C 80238BDC 00000000 */ nop +/* 70887C 80238BDC 00000000 */ nop /* 708880 80238BE0 45000007 */ bc1f .L80238C00 -/* 708884 80238BE4 00000000 */ nop +/* 708884 80238BE4 00000000 */ nop /* 708888 80238BE8 3C013F80 */ lui $at, 0x3f80 /* 70888C 80238BEC 44810000 */ mtc1 $at, $f0 -/* 708890 80238BF0 00000000 */ nop +/* 708890 80238BF0 00000000 */ nop /* 708894 80238BF4 E6200170 */ swc1 $f0, 0x170($s1) /* 708898 80238BF8 E6200174 */ swc1 $f0, 0x174($s1) /* 70889C 80238BFC E6200178 */ swc1 $f0, 0x178($s1) @@ -468,9 +468,9 @@ glabel func_80238540_7081E0 /* 7088A0 80238C00 C6220170 */ lwc1 $f2, 0x170($s1) /* 7088A4 80238C04 3C01C170 */ lui $at, 0xc170 /* 7088A8 80238C08 44810000 */ mtc1 $at, $f0 -/* 7088AC 80238C0C 00000000 */ nop +/* 7088AC 80238C0C 00000000 */ nop /* 7088B0 80238C10 46001082 */ mul.s $f2, $f2, $f0 -/* 7088B4 80238C14 00000000 */ nop +/* 7088B4 80238C14 00000000 */ nop /* 7088B8 80238C18 27A40018 */ addiu $a0, $sp, 0x18 /* 7088BC 80238C1C 8E070048 */ lw $a3, 0x48($s0) /* 7088C0 80238C20 4480A000 */ mtc1 $zero, $f20 @@ -544,7 +544,7 @@ glabel func_80238540_7081E0 /* 7089C0 80238D20 10620008 */ beq $v1, $v0, .L80238D44 /* 7089C4 80238D24 0200202D */ daddu $a0, $s0, $zero /* 7089C8 80238D28 0808E374 */ j .L80238DD0 -/* 7089CC 80238D2C 00000000 */ nop +/* 7089CC 80238D2C 00000000 */ nop .L80238D30: /* 7089D0 80238D30 24020005 */ addiu $v0, $zero, 5 /* 7089D4 80238D34 A6020064 */ sh $v0, 0x64($s0) diff --git a/asm/nonmatchings/code_707CA0/func_80238E30_708AD0.s b/asm/nonmatchings/code_707CA0/func_80238E30_708AD0.s index 258520f0fc..561a41fd39 100644 --- a/asm/nonmatchings/code_707CA0/func_80238E30_708AD0.s +++ b/asm/nonmatchings/code_707CA0/func_80238E30_708AD0.s @@ -8,11 +8,11 @@ glabel func_80238E30_708AD0 /* 708ADC 80238E3C C4800084 */ lwc1 $f0, 0x84($a0) /* 708AE0 80238E40 46800021 */ cvt.d.w $f0, $f0 /* 708AE4 80238E44 46220002 */ mul.d $f0, $f0, $f2 -/* 708AE8 80238E48 00000000 */ nop +/* 708AE8 80238E48 00000000 */ nop /* 708AEC 80238E4C 3C014059 */ lui $at, 0x4059 /* 708AF0 80238E50 44811800 */ mtc1 $at, $f3 /* 708AF4 80238E54 44801000 */ mtc1 $zero, $f2 -/* 708AF8 80238E58 00000000 */ nop +/* 708AF8 80238E58 00000000 */ nop /* 708AFC 80238E5C 46220003 */ div.d $f0, $f0, $f2 /* 708B00 80238E60 3C013FF0 */ lui $at, 0x3ff0 /* 708B04 80238E64 44811800 */ mtc1 $at, $f3 @@ -25,7 +25,7 @@ glabel func_80238E30_708AD0 /* 708B20 80238E80 460A0081 */ sub.s $f2, $f0, $f10 /* 708B24 80238E84 3C014040 */ lui $at, 0x4040 /* 708B28 80238E88 44814000 */ mtc1 $at, $f8 -/* 708B2C 80238E8C 00000000 */ nop +/* 708B2C 80238E8C 00000000 */ nop /* 708B30 80238E90 46081083 */ div.s $f2, $f2, $f8 /* 708B34 80238E94 46025280 */ add.s $f10, $f10, $f2 /* 708B38 80238E98 C4460174 */ lwc1 $f6, 0x174($v0) @@ -41,4 +41,4 @@ glabel func_80238E30_708AD0 /* 708B60 80238EC0 E4440178 */ swc1 $f4, 0x178($v0) /* 708B64 80238EC4 03E00008 */ jr $ra /* 708B68 80238EC8 24020002 */ addiu $v0, $zero, 2 -/* 708B6C 80238ECC 00000000 */ nop +/* 708B6C 80238ECC 00000000 */ nop diff --git a/asm/nonmatchings/code_70BD10/func_8023803C_70BD4C.s b/asm/nonmatchings/code_70BD10/func_8023803C_70BD4C.s index 7f7de89d2a..65b0db39ff 100644 --- a/asm/nonmatchings/code_70BD10/func_8023803C_70BD4C.s +++ b/asm/nonmatchings/code_70BD10/func_8023803C_70BD4C.s @@ -33,14 +33,14 @@ glabel func_8023803C_70BD4C /* 70BDB8 802380A8 10400005 */ beqz $v0, .L802380C0 /* 70BDBC 802380AC 24020002 */ addiu $v0, $zero, 2 /* 70BDC0 802380B0 10600007 */ beqz $v1, .L802380D0 -/* 70BDC4 802380B4 00000000 */ nop +/* 70BDC4 802380B4 00000000 */ nop /* 70BDC8 802380B8 0808E21D */ j .L80238874 -/* 70BDCC 802380BC 00000000 */ nop +/* 70BDCC 802380BC 00000000 */ nop .L802380C0: /* 70BDD0 802380C0 106200CD */ beq $v1, $v0, .L802383F8 -/* 70BDD4 802380C4 00000000 */ nop +/* 70BDD4 802380C4 00000000 */ nop /* 70BDD8 802380C8 0808E21D */ j .L80238874 -/* 70BDDC 802380CC 00000000 */ nop +/* 70BDDC 802380CC 00000000 */ nop .L802380D0: /* 70BDE0 802380D0 3C048029 */ lui $a0, %hi(D_8029369C) /* 70BDE4 802380D4 2484369C */ addiu $a0, $a0, %lo(D_8029369C) @@ -54,7 +54,7 @@ glabel func_8023803C_70BD4C /* 70BE04 802380F4 3C048029 */ lui $a0, %hi(D_802936D4) /* 70BE08 802380F8 248436D4 */ addiu $a0, $a0, %lo(D_802936D4) /* 70BE0C 802380FC 0C050529 */ jal create_icon -/* 70BE10 80238100 00000000 */ nop +/* 70BE10 80238100 00000000 */ nop /* 70BE14 80238104 0040202D */ daddu $a0, $v0, $zero /* 70BE18 80238108 2405000A */ addiu $a1, $zero, 0xa /* 70BE1C 8023810C 3C108024 */ lui $s0, %hi(D_8023D28C) @@ -102,7 +102,7 @@ glabel func_8023803C_70BD4C /* 70BEC0 802381B0 C6E00144 */ lwc1 $f0, 0x144($s7) /* 70BEC4 802381B4 3C014204 */ lui $at, 0x4204 /* 70BEC8 802381B8 44813000 */ mtc1 $at, $f6 -/* 70BECC 802381BC 00000000 */ nop +/* 70BECC 802381BC 00000000 */ nop /* 70BED0 802381C0 46060000 */ add.s $f0, $f0, $f6 /* 70BED4 802381C4 3C014208 */ lui $at, 0x4208 /* 70BED8 802381C8 44812000 */ mtc1 $at, $f4 @@ -130,7 +130,7 @@ glabel func_8023803C_70BD4C /* 70BF30 80238220 02C0202D */ daddu $a0, $s6, $zero /* 70BF34 80238224 86E40428 */ lh $a0, 0x428($s7) /* 70BF38 80238228 0C09A75B */ jal get_actor -/* 70BF3C 8023822C 00000000 */ nop +/* 70BF3C 8023822C 00000000 */ nop /* 70BF40 80238230 0040882D */ daddu $s1, $v0, $zero /* 70BF44 80238234 82E50426 */ lb $a1, 0x426($s7) /* 70BF48 80238238 0C099117 */ jal get_actor_part @@ -140,7 +140,7 @@ glabel func_8023803C_70BD4C /* 70BF58 80238248 82020075 */ lb $v0, 0x75($s0) /* 70BF5C 8023824C C6C0000C */ lwc1 $f0, 0xc($s6) /* 70BF60 80238250 44821000 */ mtc1 $v0, $f2 -/* 70BF64 80238254 00000000 */ nop +/* 70BF64 80238254 00000000 */ nop /* 70BF68 80238258 468010A0 */ cvt.s.w $f2, $f2 /* 70BF6C 8023825C 46020000 */ add.s $f0, $f0, $f2 /* 70BF70 80238260 C6CE0004 */ lwc1 $f14, 4($s6) @@ -148,7 +148,7 @@ glabel func_8023803C_70BD4C /* 70BF78 80238268 82020076 */ lb $v0, 0x76($s0) /* 70BF7C 8023826C C6C00010 */ lwc1 $f0, 0x10($s6) /* 70BF80 80238270 44821000 */ mtc1 $v0, $f2 -/* 70BF84 80238274 00000000 */ nop +/* 70BF84 80238274 00000000 */ nop /* 70BF88 80238278 468010A0 */ cvt.s.w $f2, $f2 /* 70BF8C 8023827C 46020000 */ add.s $f0, $f0, $f2 /* 70BF90 80238280 8EC6000C */ lw $a2, 0xc($s6) @@ -193,19 +193,19 @@ glabel func_8023803C_70BD4C /* 70C02C 8023831C 00431021 */ addu $v0, $v0, $v1 /* 70C030 80238320 00021043 */ sra $v0, $v0, 1 /* 70C034 80238324 44820000 */ mtc1 $v0, $f0 -/* 70C038 80238328 00000000 */ nop +/* 70C038 80238328 00000000 */ nop /* 70C03C 8023832C 46800021 */ cvt.d.w $f0, $f0 /* 70C040 80238330 46220003 */ div.d $f0, $f0, $f2 /* 70C044 80238334 46200020 */ cvt.s.d $f0, $f0 /* 70C048 80238338 E6C00024 */ swc1 $f0, 0x24($s6) /* 70C04C 8023833C C6220188 */ lwc1 $f2, 0x188($s1) /* 70C050 80238340 46020002 */ mul.s $f0, $f0, $f2 -/* 70C054 80238344 00000000 */ nop +/* 70C054 80238344 00000000 */ nop /* 70C058 80238348 3C048024 */ lui $a0, %hi(D_8023D28C) /* 70C05C 8023834C 8C84D28C */ lw $a0, %lo(D_8023D28C)($a0) /* 70C060 80238350 44050000 */ mfc1 $a1, $f0 /* 70C064 80238354 0C051308 */ jal func_80144C20 -/* 70C068 80238358 00000000 */ nop +/* 70C068 80238358 00000000 */ nop /* 70C06C 8023835C 8FA90068 */ lw $t1, 0x68($sp) /* 70C070 80238360 24020001 */ addiu $v0, $zero, 1 /* 70C074 80238364 3C018024 */ lui $at, %hi(D_8023D2C8) @@ -215,10 +215,10 @@ glabel func_8023803C_70BD4C .L80238374: /* 70C084 80238374 8E02021C */ lw $v0, 0x21c($s0) /* 70C088 80238378 14400004 */ bnez $v0, .L8023838C -/* 70C08C 8023837C 00000000 */ nop +/* 70C08C 8023837C 00000000 */ nop /* 70C090 80238380 8E020220 */ lw $v0, 0x220($s0) /* 70C094 80238384 10400003 */ beqz $v0, .L80238394 -/* 70C098 80238388 00000000 */ nop +/* 70C098 80238388 00000000 */ nop .L8023838C: /* 70C09C 8023838C 3C018024 */ lui $at, %hi(D_8023D298) /* 70C0A0 80238390 AC20D298 */ sw $zero, %lo(D_8023D298)($at) @@ -264,19 +264,19 @@ glabel func_8023803C_70BD4C /* 70C130 80238420 34210FD0 */ ori $at, $at, 0xfd0 /* 70C134 80238424 44810000 */ mtc1 $at, $f0 /* 70C138 80238428 44826000 */ mtc1 $v0, $f12 -/* 70C13C 8023842C 00000000 */ nop +/* 70C13C 8023842C 00000000 */ nop /* 70C140 80238430 46806320 */ cvt.s.w $f12, $f12 /* 70C144 80238434 46006302 */ mul.s $f12, $f12, $f0 -/* 70C148 80238438 00000000 */ nop +/* 70C148 80238438 00000000 */ nop /* 70C14C 8023843C 3C0143B4 */ lui $at, 0x43b4 /* 70C150 80238440 44810000 */ mtc1 $at, $f0 /* 70C154 80238444 4485A000 */ mtc1 $a1, $f20 -/* 70C158 80238448 00000000 */ nop +/* 70C158 80238448 00000000 */ nop /* 70C15C 8023844C 4680A520 */ cvt.s.w $f20, $f20 /* 70C160 80238450 0C00A85B */ jal sin_rad /* 70C164 80238454 46006303 */ div.s $f12, $f12, $f0 /* 70C168 80238458 4600A502 */ mul.s $f20, $f20, $f0 -/* 70C16C 8023845C 00000000 */ nop +/* 70C16C 8023845C 00000000 */ nop /* 70C170 80238460 4600A28D */ trunc.w.s $f10, $f20 /* 70C174 80238464 44055000 */ mfc1 $a1, $f10 .L80238468: @@ -294,7 +294,7 @@ glabel func_8023803C_70BD4C /* 70C1A4 80238494 44812000 */ mtc1 $at, $f4 /* 70C1A8 80238498 46001080 */ add.s $f2, $f2, $f0 /* 70C1AC 8023849C 44850000 */ mtc1 $a1, $f0 -/* 70C1B0 802384A0 00000000 */ nop +/* 70C1B0 802384A0 00000000 */ nop /* 70C1B4 802384A4 46800020 */ cvt.s.w $f0, $f0 /* 70C1B8 802384A8 E4600000 */ swc1 $f0, ($v1) /* 70C1BC 802384AC 46041083 */ div.s $f2, $f2, $f4 @@ -302,18 +302,18 @@ glabel func_8023803C_70BD4C /* 70C1C4 802384B4 E4460000 */ swc1 $f6, ($v0) /* 70C1C8 802384B8 4600028D */ trunc.w.s $f10, $f0 /* 70C1CC 802384BC 44025000 */ mfc1 $v0, $f10 -/* 70C1D0 802384C0 00000000 */ nop +/* 70C1D0 802384C0 00000000 */ nop /* 70C1D4 802384C4 1840002B */ blez $v0, .L80238574 /* 70C1D8 802384C8 E4880000 */ swc1 $f8, ($a0) /* 70C1DC 802384CC C6E6004C */ lwc1 $f6, 0x4c($s7) /* 70C1E0 802384D0 44800000 */ mtc1 $zero, $f0 /* 70C1E4 802384D4 44822000 */ mtc1 $v0, $f4 -/* 70C1E8 802384D8 00000000 */ nop +/* 70C1E8 802384D8 00000000 */ nop /* 70C1EC 802384DC 46802120 */ cvt.s.w $f4, $f4 /* 70C1F0 802384E0 3C018024 */ lui $at, %hi(D_8023D2AC) /* 70C1F4 802384E4 E424D2AC */ swc1 $f4, %lo(D_8023D2AC)($at) /* 70C1F8 802384E8 46003032 */ c.eq.s $f6, $f0 -/* 70C1FC 802384EC 00000000 */ nop +/* 70C1FC 802384EC 00000000 */ nop /* 70C200 802384F0 4503000F */ bc1tl .L80238530 /* 70C204 802384F4 460020A1 */ cvt.d.s $f2, $f4 /* 70C208 802384F8 460030A1 */ cvt.d.s $f2, $f6 @@ -339,7 +339,7 @@ glabel func_8023803C_70BD4C /* 70C254 80238544 44802000 */ mtc1 $zero, $f4 /* 70C258 80238548 46201083 */ div.d $f2, $f2, $f0 /* 70C25C 8023854C 46241082 */ mul.d $f2, $f2, $f4 -/* 70C260 80238550 00000000 */ nop +/* 70C260 80238550 00000000 */ nop /* 70C264 80238554 46003021 */ cvt.d.s $f0, $f6 /* 70C268 80238558 46220000 */ add.d $f0, $f0, $f2 /* 70C26C 8023855C 46200020 */ cvt.s.d $f0, $f0 @@ -351,14 +351,14 @@ glabel func_8023803C_70BD4C /* 70C280 80238570 28A2001F */ slti $v0, $a1, 0x1f .L80238574: /* 70C284 80238574 44820000 */ mtc1 $v0, $f0 -/* 70C288 80238578 00000000 */ nop +/* 70C288 80238578 00000000 */ nop /* 70C28C 8023857C 46800020 */ cvt.s.w $f0, $f0 /* 70C290 80238580 3C018024 */ lui $at, %hi(D_8023D2AC) /* 70C294 80238584 E420D2AC */ swc1 $f0, %lo(D_8023D2AC)($at) /* 70C298 80238588 28A2001F */ slti $v0, $a1, 0x1f .L8023858C: /* 70C29C 8023858C 14400003 */ bnez $v0, .L8023859C -/* 70C2A0 80238590 00000000 */ nop +/* 70C2A0 80238590 00000000 */ nop /* 70C2A4 80238594 3C018024 */ lui $at, %hi(D_8023D2B4) /* 70C2A8 80238598 E436D2B4 */ swc1 $f22, %lo(D_8023D2B4)($at) .L8023859C: @@ -367,32 +367,32 @@ glabel func_8023803C_70BD4C /* 70C2B4 802385A4 D422D1B0 */ ldc1 $f2, %lo(D_8023D1B0)($at) /* 70C2B8 802385A8 46000021 */ cvt.d.s $f0, $f0 /* 70C2BC 802385AC 4620103C */ c.lt.d $f2, $f0 -/* 70C2C0 802385B0 00000000 */ nop +/* 70C2C0 802385B0 00000000 */ nop /* 70C2C4 802385B4 45000006 */ bc1f .L802385D0 /* 70C2C8 802385B8 24020028 */ addiu $v0, $zero, 0x28 /* 70C2CC 802385BC 3C0140D6 */ lui $at, 0x40d6 /* 70C2D0 802385C0 34216666 */ ori $at, $at, 0x6666 /* 70C2D4 802385C4 44810000 */ mtc1 $at, $f0 -/* 70C2D8 802385C8 00000000 */ nop +/* 70C2D8 802385C8 00000000 */ nop /* 70C2DC 802385CC E6C00040 */ swc1 $f0, 0x40($s6) .L802385D0: /* 70C2E0 802385D0 00451023 */ subu $v0, $v0, $a1 /* 70C2E4 802385D4 44820000 */ mtc1 $v0, $f0 -/* 70C2E8 802385D8 00000000 */ nop +/* 70C2E8 802385D8 00000000 */ nop /* 70C2EC 802385DC 46800021 */ cvt.d.w $f0, $f0 /* 70C2F0 802385E0 46200000 */ add.d $f0, $f0, $f0 /* 70C2F4 802385E4 3C014044 */ lui $at, 0x4044 /* 70C2F8 802385E8 44811800 */ mtc1 $at, $f3 /* 70C2FC 802385EC 44801000 */ mtc1 $zero, $f2 -/* 70C300 802385F0 00000000 */ nop +/* 70C300 802385F0 00000000 */ nop /* 70C304 802385F4 46220003 */ div.d $f0, $f0, $f2 /* 70C308 802385F8 C6C20040 */ lwc1 $f2, 0x40($s6) /* 70C30C 802385FC 46200020 */ cvt.s.d $f0, $f0 /* 70C310 80238600 46001081 */ sub.s $f2, $f2, $f0 /* 70C314 80238604 4480B000 */ mtc1 $zero, $f22 -/* 70C318 80238608 00000000 */ nop +/* 70C318 80238608 00000000 */ nop /* 70C31C 8023860C 4616103E */ c.le.s $f2, $f22 -/* 70C320 80238610 00000000 */ nop +/* 70C320 80238610 00000000 */ nop /* 70C324 80238614 45000004 */ bc1f .L80238628 /* 70C328 80238618 E6C20040 */ swc1 $f2, 0x40($s6) /* 70C32C 8023861C E6D60040 */ swc1 $f22, 0x40($s6) @@ -402,18 +402,18 @@ glabel func_8023803C_70BD4C /* 70C338 80238628 3C018024 */ lui $at, %hi(D_8023D2B4) /* 70C33C 8023862C C420D2B4 */ lwc1 $f0, %lo(D_8023D2B4)($at) /* 70C340 80238630 4600B03E */ c.le.s $f22, $f0 -/* 70C344 80238634 00000000 */ nop +/* 70C344 80238634 00000000 */ nop /* 70C348 80238638 4500001B */ bc1f .L802386A8 -/* 70C34C 8023863C 00000000 */ nop +/* 70C34C 8023863C 00000000 */ nop /* 70C350 80238640 3C0140C9 */ lui $at, 0x40c9 /* 70C354 80238644 34210FD0 */ ori $at, $at, 0xfd0 /* 70C358 80238648 4481A000 */ mtc1 $at, $f20 -/* 70C35C 8023864C 00000000 */ nop +/* 70C35C 8023864C 00000000 */ nop /* 70C360 80238650 46140502 */ mul.s $f20, $f0, $f20 -/* 70C364 80238654 00000000 */ nop +/* 70C364 80238654 00000000 */ nop /* 70C368 80238658 3C0143B4 */ lui $at, 0x43b4 /* 70C36C 8023865C 44810000 */ mtc1 $at, $f0 -/* 70C370 80238660 00000000 */ nop +/* 70C370 80238660 00000000 */ nop /* 70C374 80238664 4600A503 */ div.s $f20, $f20, $f0 /* 70C378 80238668 0C00A85B */ jal sin_rad /* 70C37C 8023866C 4600A306 */ mov.s $f12, $f20 @@ -422,9 +422,9 @@ glabel func_8023803C_70BD4C /* 70C388 80238678 46000506 */ mov.s $f20, $f0 /* 70C38C 8023867C C6C40040 */ lwc1 $f4, 0x40($s6) /* 70C390 80238680 46142502 */ mul.s $f20, $f4, $f20 -/* 70C394 80238684 00000000 */ nop +/* 70C394 80238684 00000000 */ nop /* 70C398 80238688 46002102 */ mul.s $f4, $f4, $f0 -/* 70C39C 8023868C 00000000 */ nop +/* 70C39C 8023868C 00000000 */ nop /* 70C3A0 80238690 C6C20000 */ lwc1 $f2, ($s6) /* 70C3A4 80238694 46141080 */ add.s $f2, $f2, $f20 /* 70C3A8 80238698 C6C00004 */ lwc1 $f0, 4($s6) @@ -435,40 +435,40 @@ glabel func_8023803C_70BD4C /* 70C3B8 802386A8 C6C00000 */ lwc1 $f0, ($s6) /* 70C3BC 802386AC 3C01C1F0 */ lui $at, 0xc1f0 /* 70C3C0 802386B0 44811000 */ mtc1 $at, $f2 -/* 70C3C4 802386B4 00000000 */ nop +/* 70C3C4 802386B4 00000000 */ nop /* 70C3C8 802386B8 4602003C */ c.lt.s $f0, $f2 -/* 70C3CC 802386BC 00000000 */ nop +/* 70C3CC 802386BC 00000000 */ nop /* 70C3D0 802386C0 45030001 */ bc1tl .L802386C8 /* 70C3D4 802386C4 E6C20000 */ swc1 $f2, ($s6) .L802386C8: /* 70C3D8 802386C8 C6C00000 */ lwc1 $f0, ($s6) /* 70C3DC 802386CC 3C01432A */ lui $at, 0x432a /* 70C3E0 802386D0 44811000 */ mtc1 $at, $f2 -/* 70C3E4 802386D4 00000000 */ nop +/* 70C3E4 802386D4 00000000 */ nop /* 70C3E8 802386D8 4600103C */ c.lt.s $f2, $f0 -/* 70C3EC 802386DC 00000000 */ nop +/* 70C3EC 802386DC 00000000 */ nop /* 70C3F0 802386E0 45030001 */ bc1tl .L802386E8 /* 70C3F4 802386E4 E6C20000 */ swc1 $f2, ($s6) .L802386E8: /* 70C3F8 802386E8 C6C00004 */ lwc1 $f0, 4($s6) /* 70C3FC 802386EC 3C014302 */ lui $at, 0x4302 /* 70C400 802386F0 44811000 */ mtc1 $at, $f2 -/* 70C404 802386F4 00000000 */ nop +/* 70C404 802386F4 00000000 */ nop /* 70C408 802386F8 4600103C */ c.lt.s $f2, $f0 -/* 70C40C 802386FC 00000000 */ nop +/* 70C40C 802386FC 00000000 */ nop /* 70C410 80238700 45030001 */ bc1tl .L80238708 /* 70C414 80238704 E6C20004 */ swc1 $f2, 4($s6) .L80238708: /* 70C418 80238708 C6C00004 */ lwc1 $f0, 4($s6) /* 70C41C 8023870C 4616003C */ c.lt.s $f0, $f22 -/* 70C420 80238710 00000000 */ nop +/* 70C420 80238710 00000000 */ nop /* 70C424 80238714 45030001 */ bc1tl .L8023871C /* 70C428 80238718 E6D60004 */ swc1 $f22, 4($s6) .L8023871C: /* 70C42C 8023871C 8E020214 */ lw $v0, 0x214($s0) /* 70C430 80238720 30428000 */ andi $v0, $v0, 0x8000 /* 70C434 80238724 10400003 */ beqz $v0, .L80238734 -/* 70C438 80238728 00000000 */ nop +/* 70C438 80238728 00000000 */ nop /* 70C43C 8023872C 3C018024 */ lui $at, %hi(D_8023D298) /* 70C440 80238730 AC20D298 */ sw $zero, %lo(D_8023D298)($at) .L80238734: @@ -523,7 +523,7 @@ glabel func_8023803C_70BD4C /* 70C4F8 802387E8 46020003 */ div.s $f0, $f0, $f2 /* 70C4FC 802387EC 460000A1 */ cvt.d.s $f2, $f0 /* 70C500 802387F0 4624103E */ c.le.d $f2, $f4 -/* 70C504 802387F4 00000000 */ nop +/* 70C504 802387F4 00000000 */ nop /* 70C508 802387F8 45000004 */ bc1f .L8023880C /* 70C50C 802387FC E6C0004C */ swc1 $f0, 0x4c($s6) /* 70C510 80238800 8FA90068 */ lw $t1, 0x68($sp) @@ -537,20 +537,20 @@ glabel func_8023803C_70BD4C /* 70C52C 8023881C 3C048024 */ lui $a0, %hi(D_8023D288) /* 70C530 80238820 8C84D288 */ lw $a0, %lo(D_8023D288)($a0) /* 70C534 80238824 0C05123D */ jal free_icon -/* 70C538 80238828 00000000 */ nop +/* 70C538 80238828 00000000 */ nop /* 70C53C 8023882C 3C048024 */ lui $a0, %hi(D_8023D2BC) /* 70C540 80238830 8C84D2BC */ lw $a0, %lo(D_8023D2BC)($a0) /* 70C544 80238834 3C108024 */ lui $s0, %hi(D_8023D2B8) /* 70C548 80238838 2610D2B8 */ addiu $s0, $s0, %lo(D_8023D2B8) /* 70C54C 8023883C 0C05123D */ jal free_icon -/* 70C550 80238840 00000000 */ nop +/* 70C550 80238840 00000000 */ nop .L80238844: /* 70C554 80238844 8E040000 */ lw $a0, ($s0) /* 70C558 80238848 26100004 */ addiu $s0, $s0, 4 /* 70C55C 8023884C 0C05123D */ jal free_icon /* 70C560 80238850 26520001 */ addiu $s2, $s2, 1 /* 70C564 80238854 1A40FFFB */ blez $s2, .L80238844 -/* 70C568 80238858 00000000 */ nop +/* 70C568 80238858 00000000 */ nop /* 70C56C 8023885C 0C093EB1 */ jal set_popup_duration /* 70C570 80238860 0000202D */ daddu $a0, $zero, $zero /* 70C574 80238864 0C05271B */ jal stop_sound @@ -590,7 +590,7 @@ glabel func_8023803C_70BD4C /* 70C5F8 802388E8 8E020000 */ lw $v0, ($s0) /* 70C5FC 802388EC 2442FFF6 */ addiu $v0, $v0, -0xa /* 70C600 802388F0 44826000 */ mtc1 $v0, $f12 -/* 70C604 802388F4 00000000 */ nop +/* 70C604 802388F4 00000000 */ nop /* 70C608 802388F8 46806320 */ cvt.s.w $f12, $f12 /* 70C60C 802388FC 0C00A6C9 */ jal clamp_angle /* 70C610 80238900 AE020000 */ sw $v0, ($s0) @@ -613,9 +613,9 @@ glabel func_8023803C_70BD4C /* 70C654 80238944 8D230070 */ lw $v1, 0x70($t1) /* 70C658 80238948 28620003 */ slti $v0, $v1, 3 /* 70C65C 8023894C 10400013 */ beqz $v0, .L8023899C -/* 70C660 80238950 00000000 */ nop +/* 70C660 80238950 00000000 */ nop /* 70C664 80238954 18600011 */ blez $v1, .L8023899C -/* 70C668 80238958 00000000 */ nop +/* 70C668 80238958 00000000 */ nop /* 70C66C 8023895C 3C058024 */ lui $a1, %hi(D_8023D2C0) /* 70C670 80238960 24A5D2C0 */ addiu $a1, $a1, %lo(D_8023D2C0) /* 70C674 80238964 8CA20000 */ lw $v0, ($a1) @@ -632,13 +632,13 @@ glabel func_8023803C_70BD4C /* 70C69C 8023898C 3C068024 */ lui $a2, %hi(D_8023D2C4) /* 70C6A0 80238990 8CC6D2C4 */ lw $a2, %lo(D_8023D2C4)($a2) /* 70C6A4 80238994 0C051261 */ jal set_icon_render_pos -/* 70C6A8 80238998 00000000 */ nop +/* 70C6A8 80238998 00000000 */ nop .L8023899C: /* 70C6AC 8023899C 8FA80068 */ lw $t0, 0x68($sp) /* 70C6B0 802389A0 8D040070 */ lw $a0, 0x70($t0) /* 70C6B4 802389A4 28820003 */ slti $v0, $a0, 3 /* 70C6B8 802389A8 1040001F */ beqz $v0, .L80238A28 -/* 70C6BC 802389AC 00000000 */ nop +/* 70C6BC 802389AC 00000000 */ nop /* 70C6C0 802389B0 1880001D */ blez $a0, .L80238A28 /* 70C6C4 802389B4 0000902D */ daddu $s2, $zero, $zero /* 70C6C8 802389B8 27B40020 */ addiu $s4, $sp, 0x20 @@ -669,7 +669,7 @@ glabel func_8023803C_70BD4C /* 70C728 80238A18 0C051261 */ jal set_icon_render_pos /* 70C72C 80238A1C 26100004 */ addiu $s0, $s0, 4 /* 70C730 80238A20 1A40FFF0 */ blez $s2, .L802389E4 -/* 70C734 80238A24 00000000 */ nop +/* 70C734 80238A24 00000000 */ nop .L80238A28: /* 70C738 80238A28 0C093EB1 */ jal set_popup_duration /* 70C73C 80238A2C 24040063 */ addiu $a0, $zero, 0x63 diff --git a/asm/nonmatchings/code_70BD10/func_80238A6C_70C77C.s b/asm/nonmatchings/code_70BD10/func_80238A6C_70C77C.s index 2757299155..f1af4bf4f7 100644 --- a/asm/nonmatchings/code_70BD10/func_80238A6C_70C77C.s +++ b/asm/nonmatchings/code_70BD10/func_80238A6C_70C77C.s @@ -19,7 +19,7 @@ glabel func_80238A6C_70C77C /* 70C7B4 80238AA4 4600C600 */ add.s $f24, $f24, $f0 /* 70C7B8 80238AA8 C4760148 */ lwc1 $f22, 0x148($v1) /* 70C7BC 80238AAC 44820000 */ mtc1 $v0, $f0 -/* 70C7C0 80238AB0 00000000 */ nop +/* 70C7C0 80238AB0 00000000 */ nop /* 70C7C4 80238AB4 46800020 */ cvt.s.w $f0, $f0 /* 70C7C8 80238AB8 4600B580 */ add.s $f22, $f22, $f0 /* 70C7CC 80238ABC 3C0141A0 */ lui $at, 0x41a0 @@ -29,14 +29,14 @@ glabel func_80238A6C_70C77C /* 70C7DC 80238ACC 461AB580 */ add.s $f22, $f22, $f26 /* 70C7E0 80238AD0 2442000A */ addiu $v0, $v0, 0xa /* 70C7E4 80238AD4 4482A000 */ mtc1 $v0, $f20 -/* 70C7E8 80238AD8 00000000 */ nop +/* 70C7E8 80238AD8 00000000 */ nop /* 70C7EC 80238ADC 4680A520 */ cvt.s.w $f20, $f20 /* 70C7F0 80238AE0 0C00A67F */ jal rand_int /* 70C7F4 80238AE4 24040050 */ addiu $a0, $zero, 0x50 /* 70C7F8 80238AE8 0000202D */ daddu $a0, $zero, $zero /* 70C7FC 80238AEC 2442000A */ addiu $v0, $v0, 0xa /* 70C800 80238AF0 44820000 */ mtc1 $v0, $f0 -/* 70C804 80238AF4 00000000 */ nop +/* 70C804 80238AF4 00000000 */ nop /* 70C808 80238AF8 46800020 */ cvt.s.w $f0, $f0 /* 70C80C 80238AFC E7A00014 */ swc1 $f0, 0x14($sp) /* 70C810 80238B00 3C013FC0 */ lui $at, 0x3fc0 diff --git a/asm/nonmatchings/code_70BD10/func_80238B50_70C860.s b/asm/nonmatchings/code_70BD10/func_80238B50_70C860.s index 318267675e..18ff5669ca 100644 --- a/asm/nonmatchings/code_70BD10/func_80238B50_70C860.s +++ b/asm/nonmatchings/code_70BD10/func_80238B50_70C860.s @@ -16,12 +16,12 @@ glabel func_80238B50_70C860 /* 70C88C 80238B7C 10A00007 */ beqz $a1, .L80238B9C /* 70C890 80238B80 28E20064 */ slti $v0, $a3, 0x64 /* 70C894 80238B84 0808E2FE */ j .L80238BF8 -/* 70C898 80238B88 00000000 */ nop +/* 70C898 80238B88 00000000 */ nop .L80238B8C: /* 70C89C 80238B8C 10A2000F */ beq $a1, $v0, .L80238BCC /* 70C8A0 80238B90 28E20064 */ slti $v0, $a3, 0x64 /* 70C8A4 80238B94 0808E2FE */ j .L80238BF8 -/* 70C8A8 80238B98 00000000 */ nop +/* 70C8A8 80238B98 00000000 */ nop .L80238B9C: /* 70C8AC 80238B9C 10400015 */ beqz $v0, .L80238BF4 /* 70C8B0 80238BA0 24060002 */ addiu $a2, $zero, 2 diff --git a/asm/nonmatchings/code_70BD10/func_80238C14_70C924.s b/asm/nonmatchings/code_70BD10/func_80238C14_70C924.s index e1e35efeb4..ff849707f8 100644 --- a/asm/nonmatchings/code_70BD10/func_80238C14_70C924.s +++ b/asm/nonmatchings/code_70BD10/func_80238C14_70C924.s @@ -11,7 +11,7 @@ glabel func_80238C14_70C924 /* 70C93C 80238C2C 10800006 */ beqz $a0, .L80238C48 /* 70C940 80238C30 24020002 */ addiu $v0, $zero, 2 /* 70C944 80238C34 0C016914 */ jal remove_effect -/* 70C948 80238C38 00000000 */ nop +/* 70C948 80238C38 00000000 */ nop /* 70C94C 80238C3C 24020002 */ addiu $v0, $zero, 2 /* 70C950 80238C40 AE0000A8 */ sw $zero, 0xa8($s0) /* 70C954 80238C44 A20000A4 */ sb $zero, 0xa4($s0) diff --git a/asm/nonmatchings/code_70BD10/func_80238C58_70C968.s b/asm/nonmatchings/code_70BD10/func_80238C58_70C968.s index 68b8b4a27d..b93d69cc0e 100644 --- a/asm/nonmatchings/code_70BD10/func_80238C58_70C968.s +++ b/asm/nonmatchings/code_70BD10/func_80238C58_70C968.s @@ -18,7 +18,7 @@ glabel func_80238C58_70C968 /* 70C998 80238C88 10620013 */ beq $v1, $v0, .L80238CD8 /* 70C99C 80238C8C 0000102D */ daddu $v0, $zero, $zero /* 70C9A0 80238C90 0808E34E */ j .L80238D38 -/* 70C9A4 80238C94 00000000 */ nop +/* 70C9A4 80238C94 00000000 */ nop .L80238C98: /* 70C9A8 80238C98 3C013DCC */ lui $at, 0x3dcc /* 70C9AC 80238C9C 3421CCCD */ ori $at, $at, 0xcccd @@ -45,7 +45,7 @@ glabel func_80238C58_70C968 /* 70C9FC 80238CEC 44800000 */ mtc1 $zero, $f0 /* 70CA00 80238CF0 460010A1 */ cvt.d.s $f2, $f2 /* 70CA04 80238CF4 4622003E */ c.le.d $f0, $f2 -/* 70CA08 80238CF8 00000000 */ nop +/* 70CA08 80238CF8 00000000 */ nop /* 70CA0C 80238CFC 4501000E */ bc1t .L80238D38 /* 70CA10 80238D00 24020002 */ addiu $v0, $zero, 2 /* 70CA14 80238D04 8CC200A8 */ lw $v0, 0xa8($a2) diff --git a/asm/nonmatchings/code_70BD10/func_80238D8C_70CA9C.s b/asm/nonmatchings/code_70BD10/func_80238D8C_70CA9C.s index e9824bbd0a..0a52b854f8 100644 --- a/asm/nonmatchings/code_70BD10/func_80238D8C_70CA9C.s +++ b/asm/nonmatchings/code_70BD10/func_80238D8C_70CA9C.s @@ -71,7 +71,7 @@ glabel func_80238D8C_70CA9C /* 70CB94 80238E84 14810004 */ bne $a0, $at, .L80238E98 /* 70CB98 80238E88 3C018000 */ lui $at, 0x8000 /* 70CB9C 80238E8C 14610002 */ bne $v1, $at, .L80238E98 -/* 70CBA0 80238E90 00000000 */ nop +/* 70CBA0 80238E90 00000000 */ nop /* 70CBA4 80238E94 0006000D */ break 6 .L80238E98: /* 70CBA8 80238E98 00001812 */ mflo $v1 @@ -83,8 +83,8 @@ glabel func_80238D8C_70CA9C /* 70CBC0 80238EB0 00431023 */ subu $v0, $v0, $v1 /* 70CBC4 80238EB4 00820018 */ mult $a0, $v0 /* 70CBC8 80238EB8 00001812 */ mflo $v1 -/* 70CBCC 80238EBC 00000000 */ nop -/* 70CBD0 80238EC0 00000000 */ nop +/* 70CBCC 80238EBC 00000000 */ nop +/* 70CBD0 80238EC0 00000000 */ nop /* 70CBD4 80238EC4 00770018 */ mult $v1, $s7 /* 70CBD8 80238EC8 00031FC3 */ sra $v1, $v1, 0x1f /* 70CBDC 80238ECC 00003810 */ mfhi $a3 @@ -142,7 +142,7 @@ glabel func_80238D8C_70CA9C /* 70CC90 80238F80 16410004 */ bne $s2, $at, .L80238F94 /* 70CC94 80238F84 3C018000 */ lui $at, 0x8000 /* 70CC98 80238F88 16C10002 */ bne $s6, $at, .L80238F94 -/* 70CC9C 80238F8C 00000000 */ nop +/* 70CC9C 80238F8C 00000000 */ nop /* 70CCA0 80238F90 0006000D */ break 6 .L80238F94: /* 70CCA4 80238F94 0000B012 */ mflo $s6 diff --git a/asm/nonmatchings/code_70BD10/func_8023906C_70CD7C.s b/asm/nonmatchings/code_70BD10/func_8023906C_70CD7C.s index d9f75ebdfe..d15824ee15 100644 --- a/asm/nonmatchings/code_70BD10/func_8023906C_70CD7C.s +++ b/asm/nonmatchings/code_70BD10/func_8023906C_70CD7C.s @@ -34,7 +34,7 @@ glabel func_8023906C_70CD7C /* 70CDF0 802390E0 24020002 */ addiu $v0, $zero, 2 /* 70CDF4 802390E4 86240000 */ lh $a0, ($s1) /* 70CDF8 802390E8 0C09A75B */ jal get_actor -/* 70CDFC 802390EC 00000000 */ nop +/* 70CDFC 802390EC 00000000 */ nop /* 70CE00 802390F0 0C00A67F */ jal rand_int /* 70CE04 802390F4 24040063 */ addiu $a0, $zero, 0x63 /* 70CE08 802390F8 82830081 */ lb $v1, 0x81($s4) diff --git a/asm/nonmatchings/code_70BD10/func_80239140_70CE50.s b/asm/nonmatchings/code_70BD10/func_80239140_70CE50.s index 7c6109483d..b4123ae2e0 100644 --- a/asm/nonmatchings/code_70BD10/func_80239140_70CE50.s +++ b/asm/nonmatchings/code_70BD10/func_80239140_70CE50.s @@ -28,7 +28,7 @@ glabel func_80239140_70CE50 /* 70CEA8 80239198 10620075 */ beq $v1, $v0, .L80239370 /* 70CEAC 8023919C 3C0451EB */ lui $a0, 0x51eb /* 70CEB0 802391A0 0808E53B */ j .L802394EC -/* 70CEB4 802391A4 00000000 */ nop +/* 70CEB4 802391A4 00000000 */ nop .L802391A8: /* 70CEB8 802391A8 0000202D */ daddu $a0, $zero, $zero /* 70CEBC 802391AC 240200A5 */ addiu $v0, $zero, 0xa5 @@ -88,17 +88,17 @@ glabel func_80239140_70CE50 /* 70CF94 80239284 34210FD0 */ ori $at, $at, 0xfd0 /* 70CF98 80239288 44810000 */ mtc1 $at, $f0 /* 70CF9C 8023928C 44826000 */ mtc1 $v0, $f12 -/* 70CFA0 80239290 00000000 */ nop +/* 70CFA0 80239290 00000000 */ nop /* 70CFA4 80239294 46806320 */ cvt.s.w $f12, $f12 /* 70CFA8 80239298 46006302 */ mul.s $f12, $f12, $f0 -/* 70CFAC 8023929C 00000000 */ nop +/* 70CFAC 8023929C 00000000 */ nop /* 70CFB0 802392A0 3C018024 */ lui $at, %hi(D_8023D27C) /* 70CFB4 802392A4 AC20D27C */ sw $zero, %lo(D_8023D27C)($at) /* 70CFB8 802392A8 3C013F00 */ lui $at, 0x3f00 /* 70CFBC 802392AC 44810000 */ mtc1 $at, $f0 /* 70CFC0 802392B0 24021388 */ addiu $v0, $zero, 0x1388 /* 70CFC4 802392B4 46006302 */ mul.s $f12, $f12, $f0 -/* 70CFC8 802392B8 00000000 */ nop +/* 70CFC8 802392B8 00000000 */ nop /* 70CFCC 802392BC A4820072 */ sh $v0, 0x72($a0) /* 70CFD0 802392C0 3C01443B */ lui $at, 0x443b /* 70CFD4 802392C4 34218000 */ ori $at, $at, 0x8000 @@ -115,9 +115,9 @@ glabel func_80239140_70CE50 /* 70D000 802392F0 3C014020 */ lui $at, 0x4020 /* 70D004 802392F4 44810800 */ mtc1 $at, $f1 /* 70D008 802392F8 44800000 */ mtc1 $zero, $f0 -/* 70D00C 802392FC 00000000 */ nop +/* 70D00C 802392FC 00000000 */ nop /* 70D010 80239300 46201082 */ mul.d $f2, $f2, $f0 -/* 70D014 80239304 00000000 */ nop +/* 70D014 80239304 00000000 */ nop /* 70D018 80239308 2402FFFF */ addiu $v0, $zero, -1 /* 70D01C 8023930C 3C018024 */ lui $at, %hi(D_8023D274) /* 70D020 80239310 AC22D274 */ sw $v0, %lo(D_8023D274)($at) @@ -162,7 +162,7 @@ glabel func_80239140_70CE50 /* 70D0B8 802393A8 2463FFB5 */ addiu $v1, $v1, -0x4b /* 70D0BC 802393AC 8242040C */ lb $v0, 0x40c($s2) /* 70D0C0 802393B0 44830000 */ mtc1 $v1, $f0 -/* 70D0C4 802393B4 00000000 */ nop +/* 70D0C4 802393B4 00000000 */ nop /* 70D0C8 802393B8 46800020 */ cvt.s.w $f0, $f0 /* 70D0CC 802393BC 18400024 */ blez $v0, .L80239450 /* 70D0D0 802393C0 E6400054 */ swc1 $f0, 0x54($s2) @@ -178,7 +178,7 @@ glabel func_80239140_70CE50 /* 70D0F4 802393E4 00951021 */ addu $v0, $a0, $s5 /* 70D0F8 802393E8 8C420000 */ lw $v0, ($v0) /* 70D0FC 802393EC 10540013 */ beq $v0, $s4, .L8023943C -/* 70D100 802393F0 00000000 */ nop +/* 70D100 802393F0 00000000 */ nop /* 70D104 802393F4 10400011 */ beqz $v0, .L8023943C /* 70D108 802393F8 00831021 */ addu $v0, $a0, $v1 /* 70D10C 802393FC 00021080 */ sll $v0, $v0, 2 @@ -192,7 +192,7 @@ glabel func_80239140_70CE50 /* 70D12C 8023941C 46140000 */ add.s $f0, $f0, $f20 /* 70D130 80239420 00021080 */ sll $v0, $v0, 2 /* 70D134 80239424 44826000 */ mtc1 $v0, $f12 -/* 70D138 80239428 00000000 */ nop +/* 70D138 80239428 00000000 */ nop /* 70D13C 8023942C 46806320 */ cvt.s.w $f12, $f12 /* 70D140 80239430 0C00A6C9 */ jal clamp_angle /* 70D144 80239434 460C0300 */ add.s $f12, $f0, $f12 @@ -224,7 +224,7 @@ glabel func_80239140_70CE50 /* 70D19C 8023948C 00931021 */ addu $v0, $a0, $s3 /* 70D1A0 80239490 8C420000 */ lw $v0, ($v0) /* 70D1A4 80239494 10500008 */ beq $v0, $s0, .L802394B8 -/* 70D1A8 80239498 00000000 */ nop +/* 70D1A8 80239498 00000000 */ nop /* 70D1AC 8023949C 10400006 */ beqz $v0, .L802394B8 /* 70D1B0 802394A0 00831021 */ addu $v0, $a0, $v1 /* 70D1B4 802394A4 00021080 */ sll $v0, $v0, 2 @@ -244,7 +244,7 @@ glabel func_80239140_70CE50 /* 70D1E4 802394D4 3C018024 */ lui $at, %hi(D_8023D334) /* 70D1E8 802394D8 AC20D334 */ sw $zero, %lo(D_8023D334)($at) /* 70D1EC 802394DC 0C016914 */ jal remove_effect -/* 70D1F0 802394E0 00000000 */ nop +/* 70D1F0 802394E0 00000000 */ nop /* 70D1F4 802394E4 0808E7D3 */ j .L80239F4C /* 70D1F8 802394E8 24020002 */ addiu $v0, $zero, 2 .L802394EC: @@ -276,19 +276,19 @@ glabel func_80239140_70CE50 /* 70D260 80239550 3C0140A0 */ lui $at, 0x40a0 /* 70D264 80239554 4481A000 */ mtc1 $at, $f20 /* 70D268 80239558 1200003E */ beqz $s0, .L80239654 -/* 70D26C 8023955C 00000000 */ nop +/* 70D26C 8023955C 00000000 */ nop /* 70D270 80239560 1E000006 */ bgtz $s0, .L8023957C /* 70D274 80239564 24020001 */ addiu $v0, $zero, 1 /* 70D278 80239568 2402FFFF */ addiu $v0, $zero, -1 /* 70D27C 8023956C 12020007 */ beq $s0, $v0, .L8023958C /* 70D280 80239570 27A40028 */ addiu $a0, $sp, 0x28 /* 70D284 80239574 0808E5CE */ j .L80239738 -/* 70D288 80239578 00000000 */ nop +/* 70D288 80239578 00000000 */ nop .L8023957C: /* 70D28C 8023957C 1202003F */ beq $s0, $v0, .L8023967C /* 70D290 80239580 27A40028 */ addiu $a0, $sp, 0x28 /* 70D294 80239584 0808E5CE */ j .L80239738 -/* 70D298 80239588 00000000 */ nop +/* 70D298 80239588 00000000 */ nop .L8023958C: /* 70D29C 8023958C 3C064140 */ lui $a2, 0x4140 /* 70D2A0 80239590 C6400148 */ lwc1 $f0, 0x148($s2) @@ -402,7 +402,7 @@ glabel func_80239140_70CE50 /* 70D43C 8023972C 34C60017 */ ori $a2, $a2, 0x17 .L80239730: /* 70D440 80239730 0C098F3F */ jal set_animation -/* 70D444 80239734 00000000 */ nop +/* 70D444 80239734 00000000 */ nop .L80239738: /* 70D448 80239738 3C108024 */ lui $s0, %hi(D_8023D270) /* 70D44C 8023973C 2610D270 */ addiu $s0, $s0, %lo(D_8023D270) @@ -424,7 +424,7 @@ glabel func_80239140_70CE50 /* 70D488 80239778 14410004 */ bne $v0, $at, .L8023978C /* 70D48C 8023977C 3C018000 */ lui $at, 0x8000 /* 70D490 80239780 14610002 */ bne $v1, $at, .L8023978C -/* 70D494 80239784 00000000 */ nop +/* 70D494 80239784 00000000 */ nop /* 70D498 80239788 0006000D */ break 6 .L8023978C: /* 70D49C 8023978C 00001010 */ mfhi $v0 @@ -440,7 +440,7 @@ glabel func_80239140_70CE50 /* 70D4C4 802397B4 240300B0 */ addiu $v1, $zero, 0xb0 /* 70D4C8 802397B8 00621823 */ subu $v1, $v1, $v0 /* 70D4CC 802397BC 44830000 */ mtc1 $v1, $f0 -/* 70D4D0 802397C0 00000000 */ nop +/* 70D4D0 802397C0 00000000 */ nop /* 70D4D4 802397C4 46800020 */ cvt.s.w $f0, $f0 /* 70D4D8 802397C8 0C00A67F */ jal rand_int /* 70D4DC 802397CC E7A0002C */ swc1 $f0, 0x2c($sp) @@ -448,12 +448,12 @@ glabel func_80239140_70CE50 /* 70D4E4 802397D4 24420064 */ addiu $v0, $v0, 0x64 /* 70D4E8 802397D8 C7A2002C */ lwc1 $f2, 0x2c($sp) /* 70D4EC 802397DC 44820000 */ mtc1 $v0, $f0 -/* 70D4F0 802397E0 00000000 */ nop +/* 70D4F0 802397E0 00000000 */ nop /* 70D4F4 802397E4 46800020 */ cvt.s.w $f0, $f0 /* 70D4F8 802397E8 0C00A67F */ jal rand_int /* 70D4FC 802397EC 46001681 */ sub.s $f26, $f2, $f0 /* 70D500 802397F0 4482A000 */ mtc1 $v0, $f20 -/* 70D504 802397F4 00000000 */ nop +/* 70D504 802397F4 00000000 */ nop /* 70D508 802397F8 4680A520 */ cvt.s.w $f20, $f20 /* 70D50C 802397FC 3C01453B */ lui $at, 0x453b /* 70D510 80239800 34218000 */ ori $at, $at, 0x8000 @@ -470,7 +470,7 @@ glabel func_80239140_70CE50 /* 70D53C 8023982C 0C00A67F */ jal rand_int /* 70D540 80239830 46200520 */ cvt.s.d $f20, $f0 /* 70D544 80239834 44820000 */ mtc1 $v0, $f0 -/* 70D548 80239838 00000000 */ nop +/* 70D548 80239838 00000000 */ nop /* 70D54C 8023983C 46800020 */ cvt.s.w $f0, $f0 /* 70D550 80239840 4407C000 */ mfc1 $a3, $f24 /* 70D554 80239844 3C014396 */ lui $at, 0x4396 @@ -512,7 +512,7 @@ glabel func_80239140_70CE50 /* 70D5DC 802398CC 14410004 */ bne $v0, $at, .L802398E0 /* 70D5E0 802398D0 3C018000 */ lui $at, 0x8000 /* 70D5E4 802398D4 14610002 */ bne $v1, $at, .L802398E0 -/* 70D5E8 802398D8 00000000 */ nop +/* 70D5E8 802398D8 00000000 */ nop /* 70D5EC 802398DC 0006000D */ break 6 .L802398E0: /* 70D5F0 802398E0 00001010 */ mfhi $v0 @@ -528,7 +528,7 @@ glabel func_80239140_70CE50 /* 70D618 80239908 240300B0 */ addiu $v1, $zero, 0xb0 /* 70D61C 8023990C 00621823 */ subu $v1, $v1, $v0 /* 70D620 80239910 44830000 */ mtc1 $v1, $f0 -/* 70D624 80239914 00000000 */ nop +/* 70D624 80239914 00000000 */ nop /* 70D628 80239918 46800020 */ cvt.s.w $f0, $f0 /* 70D62C 8023991C 0C00A67F */ jal rand_int /* 70D630 80239920 E7A0002C */ swc1 $f0, 0x2c($sp) @@ -536,12 +536,12 @@ glabel func_80239140_70CE50 /* 70D638 80239928 24420064 */ addiu $v0, $v0, 0x64 /* 70D63C 8023992C C7A2002C */ lwc1 $f2, 0x2c($sp) /* 70D640 80239930 44820000 */ mtc1 $v0, $f0 -/* 70D644 80239934 00000000 */ nop +/* 70D644 80239934 00000000 */ nop /* 70D648 80239938 46800020 */ cvt.s.w $f0, $f0 /* 70D64C 8023993C 0C00A67F */ jal rand_int /* 70D650 80239940 46001681 */ sub.s $f26, $f2, $f0 /* 70D654 80239944 4482A000 */ mtc1 $v0, $f20 -/* 70D658 80239948 00000000 */ nop +/* 70D658 80239948 00000000 */ nop /* 70D65C 8023994C 4680A520 */ cvt.s.w $f20, $f20 /* 70D660 80239950 3C01457A */ lui $at, 0x457a /* 70D664 80239954 44810000 */ mtc1 $at, $f0 @@ -556,7 +556,7 @@ glabel func_80239140_70CE50 /* 70D688 80239978 0C00A67F */ jal rand_int /* 70D68C 8023997C 46200520 */ cvt.s.d $f20, $f0 /* 70D690 80239980 44820000 */ mtc1 $v0, $f0 -/* 70D694 80239984 00000000 */ nop +/* 70D694 80239984 00000000 */ nop /* 70D698 80239988 46800020 */ cvt.s.w $f0, $f0 /* 70D69C 8023998C 4407C000 */ mfc1 $a3, $f24 /* 70D6A0 80239990 3C014396 */ lui $at, 0x4396 @@ -579,7 +579,7 @@ glabel func_80239140_70CE50 /* 70D6E4 802399D4 46201080 */ add.d $f2, $f2, $f0 /* 70D6E8 802399D8 00821007 */ srav $v0, $v0, $a0 /* 70D6EC 802399DC 44820000 */ mtc1 $v0, $f0 -/* 70D6F0 802399E0 00000000 */ nop +/* 70D6F0 802399E0 00000000 */ nop /* 70D6F4 802399E4 46800021 */ cvt.d.w $f0, $f0 /* 70D6F8 802399E8 46201080 */ add.d $f2, $f2, $f0 /* 70D6FC 802399EC 44052000 */ mfc1 $a1, $f4 @@ -597,7 +597,7 @@ glabel func_80239140_70CE50 /* 70D728 80239A18 10820086 */ beq $a0, $v0, .L80239C34 /* 70D72C 80239A1C 2402000A */ addiu $v0, $zero, 0xa /* 70D730 80239A20 0808E710 */ j .L80239C40 -/* 70D734 80239A24 00000000 */ nop +/* 70D734 80239A24 00000000 */ nop .L80239A28: /* 70D738 80239A28 8462005A */ lh $v0, 0x5a($v1) /* 70D73C 80239A2C 24120001 */ addiu $s2, $zero, 1 @@ -613,24 +613,24 @@ glabel func_80239140_70CE50 /* 70D760 80239A50 34214000 */ ori $at, $at, 0x4000 /* 70D764 80239A54 44811000 */ mtc1 $at, $f2 /* 70D768 80239A58 44820000 */ mtc1 $v0, $f0 -/* 70D76C 80239A5C 00000000 */ nop +/* 70D76C 80239A5C 00000000 */ nop /* 70D770 80239A60 46800020 */ cvt.s.w $f0, $f0 /* 70D774 80239A64 4600103C */ c.lt.s $f2, $f0 -/* 70D778 80239A68 00000000 */ nop +/* 70D778 80239A68 00000000 */ nop /* 70D77C 80239A6C 45030001 */ bc1tl .L80239A74 /* 70D780 80239A70 46001006 */ mov.s $f0, $f2 .L80239A74: /* 70D784 80239A74 3C014049 */ lui $at, 0x4049 /* 70D788 80239A78 34210FD0 */ ori $at, $at, 0xfd0 /* 70D78C 80239A7C 44816000 */ mtc1 $at, $f12 -/* 70D790 80239A80 00000000 */ nop +/* 70D790 80239A80 00000000 */ nop /* 70D794 80239A84 460C0302 */ mul.s $f12, $f0, $f12 -/* 70D798 80239A88 00000000 */ nop +/* 70D798 80239A88 00000000 */ nop /* 70D79C 80239A8C 3C013F00 */ lui $at, 0x3f00 /* 70D7A0 80239A90 44810000 */ mtc1 $at, $f0 -/* 70D7A4 80239A94 00000000 */ nop +/* 70D7A4 80239A94 00000000 */ nop /* 70D7A8 80239A98 46006302 */ mul.s $f12, $f12, $f0 -/* 70D7AC 80239A9C 00000000 */ nop +/* 70D7AC 80239A9C 00000000 */ nop /* 70D7B0 80239AA0 3C013FC9 */ lui $at, 0x3fc9 /* 70D7B4 80239AA4 34210FD0 */ ori $at, $at, 0xfd0 /* 70D7B8 80239AA8 44810000 */ mtc1 $at, $f0 @@ -647,13 +647,13 @@ glabel func_80239140_70CE50 /* 70D7E4 80239AD4 46000021 */ cvt.d.s $f0, $f0 /* 70D7E8 80239AD8 46201081 */ sub.d $f2, $f2, $f0 /* 70D7EC 80239ADC 4622A082 */ mul.d $f2, $f20, $f2 -/* 70D7F0 80239AE0 00000000 */ nop +/* 70D7F0 80239AE0 00000000 */ nop /* 70D7F4 80239AE4 3C013FF8 */ lui $at, 0x3ff8 /* 70D7F8 80239AE8 44810800 */ mtc1 $at, $f1 /* 70D7FC 80239AEC 44800000 */ mtc1 $zero, $f0 -/* 70D800 80239AF0 00000000 */ nop +/* 70D800 80239AF0 00000000 */ nop /* 70D804 80239AF4 46201082 */ mul.d $f2, $f2, $f0 -/* 70D808 80239AF8 00000000 */ nop +/* 70D808 80239AF8 00000000 */ nop /* 70D80C 80239AFC 3C068024 */ lui $a2, %hi(D_8023D27C) /* 70D810 80239B00 24C6D27C */ addiu $a2, $a2, %lo(D_8023D27C) /* 70D814 80239B04 8E250000 */ lw $a1, ($s1) @@ -665,7 +665,7 @@ glabel func_80239140_70CE50 /* 70D82C 80239B1C 4622A500 */ add.d $f20, $f20, $f2 /* 70D830 80239B20 84A20072 */ lh $v0, 0x72($a1) /* 70D834 80239B24 44840000 */ mtc1 $a0, $f0 -/* 70D838 80239B28 00000000 */ nop +/* 70D838 80239B28 00000000 */ nop /* 70D83C 80239B2C 46800020 */ cvt.s.w $f0, $f0 /* 70D840 80239B30 4620A520 */ cvt.s.d $f20, $f20 /* 70D844 80239B34 46140000 */ add.s $f0, $f0, $f20 @@ -691,12 +691,12 @@ glabel func_80239140_70CE50 /* 70D88C 80239B7C 8E230000 */ lw $v1, ($s1) /* 70D890 80239B80 84620070 */ lh $v0, 0x70($v1) /* 70D894 80239B84 44820000 */ mtc1 $v0, $f0 -/* 70D898 80239B88 00000000 */ nop +/* 70D898 80239B88 00000000 */ nop /* 70D89C 80239B8C 46800020 */ cvt.s.w $f0, $f0 /* 70D8A0 80239B90 46140000 */ add.s $f0, $f0, $f20 /* 70D8A4 80239B94 4600020D */ trunc.w.s $f8, $f0 /* 70D8A8 80239B98 44024000 */ mfc1 $v0, $f8 -/* 70D8AC 80239B9C 00000000 */ nop +/* 70D8AC 80239B9C 00000000 */ nop /* 70D8B0 80239BA0 A4620070 */ sh $v0, 0x70($v1) /* 70D8B4 80239BA4 00021400 */ sll $v0, $v0, 0x10 /* 70D8B8 80239BA8 00021403 */ sra $v0, $v0, 0x10 @@ -724,7 +724,7 @@ glabel func_80239140_70CE50 /* 70D908 80239BF8 24631388 */ addiu $v1, $v1, 0x1388 /* 70D90C 80239BFC 0062182A */ slt $v1, $v1, $v0 /* 70D910 80239C00 1060000F */ beqz $v1, .L80239C40 -/* 70D914 80239C04 00000000 */ nop +/* 70D914 80239C04 00000000 */ nop /* 70D918 80239C08 94A20002 */ lhu $v0, 2($a1) /* 70D91C 80239C0C A092005C */ sb $s2, 0x5c($a0) /* 70D920 80239C10 24421388 */ addiu $v0, $v0, 0x1388 @@ -749,9 +749,9 @@ glabel func_80239140_70CE50 /* 70D964 80239C54 10620005 */ beq $v1, $v0, .L80239C6C /* 70D968 80239C58 2402000B */ addiu $v0, $zero, 0xb /* 70D96C 80239C5C 1062003F */ beq $v1, $v0, .L80239D5C -/* 70D970 80239C60 00000000 */ nop +/* 70D970 80239C60 00000000 */ nop /* 70D974 80239C64 0808E792 */ j .L80239E48 -/* 70D978 80239C68 00000000 */ nop +/* 70D978 80239C68 00000000 */ nop .L80239C6C: /* 70D97C 80239C6C 3C045555 */ lui $a0, 0x5555 /* 70D980 80239C70 94A20070 */ lhu $v0, 0x70($a1) @@ -771,16 +771,16 @@ glabel func_80239140_70CE50 /* 70D9B8 80239CA8 00021403 */ sra $v0, $v0, 0x10 /* 70D9BC 80239CAC 00621821 */ addu $v1, $v1, $v0 /* 70D9C0 80239CB0 4483A000 */ mtc1 $v1, $f20 -/* 70D9C4 80239CB4 00000000 */ nop +/* 70D9C4 80239CB4 00000000 */ nop /* 70D9C8 80239CB8 4680A520 */ cvt.s.w $f20, $f20 /* 70D9CC 80239CBC 4600A03C */ c.lt.s $f20, $f0 -/* 70D9D0 80239CC0 00000000 */ nop +/* 70D9D0 80239CC0 00000000 */ nop /* 70D9D4 80239CC4 45030001 */ bc1tl .L80239CCC /* 70D9D8 80239CC8 46000506 */ mov.s $f20, $f0 .L80239CCC: /* 70D9DC 80239CCC 84A20072 */ lh $v0, 0x72($a1) /* 70D9E0 80239CD0 44820000 */ mtc1 $v0, $f0 -/* 70D9E4 80239CD4 00000000 */ nop +/* 70D9E4 80239CD4 00000000 */ nop /* 70D9E8 80239CD8 46800020 */ cvt.s.w $f0, $f0 /* 70D9EC 80239CDC 46140001 */ sub.s $f0, $f0, $f20 /* 70D9F0 80239CE0 3C048024 */ lui $a0, %hi(D_8023D284) @@ -788,7 +788,7 @@ glabel func_80239140_70CE50 /* 70D9F8 80239CE8 24061388 */ addiu $a2, $zero, 0x1388 /* 70D9FC 80239CEC 4600020D */ trunc.w.s $f8, $f0 /* 70DA00 80239CF0 44024000 */ mfc1 $v0, $f8 -/* 70DA04 80239CF4 00000000 */ nop +/* 70DA04 80239CF4 00000000 */ nop /* 70DA08 80239CF8 A4A20072 */ sh $v0, 0x72($a1) /* 70DA0C 80239CFC 00021400 */ sll $v0, $v0, 0x10 /* 70DA10 80239D00 8C830000 */ lw $v1, ($a0) @@ -813,7 +813,7 @@ glabel func_80239140_70CE50 /* 70DA5C 80239D4C 5040003E */ beql $v0, $zero, .L80239E48 /* 70DA60 80239D50 AC860000 */ sw $a2, ($a0) /* 70DA64 80239D54 0808E792 */ j .L80239E48 -/* 70DA68 80239D58 00000000 */ nop +/* 70DA68 80239D58 00000000 */ nop .L80239D5C: /* 70DA6C 80239D5C 3C018024 */ lui $at, %hi(D_8023D274) /* 70DA70 80239D60 AC20D274 */ sw $zero, %lo(D_8023D274)($at) @@ -823,28 +823,28 @@ glabel func_80239140_70CE50 /* 70DA80 80239D70 3C018024 */ lui $at, %hi(D_8023D1C8) /* 70DA84 80239D74 D422D1C8 */ ldc1 $f2, %lo(D_8023D1C8)($at) /* 70DA88 80239D78 44820000 */ mtc1 $v0, $f0 -/* 70DA8C 80239D7C 00000000 */ nop +/* 70DA8C 80239D7C 00000000 */ nop /* 70DA90 80239D80 46800021 */ cvt.d.w $f0, $f0 /* 70DA94 80239D84 46220083 */ div.d $f2, $f0, $f2 /* 70DA98 80239D88 46220001 */ sub.d $f0, $f0, $f2 /* 70DA9C 80239D8C 4620020D */ trunc.w.d $f8, $f0 /* 70DAA0 80239D90 44024000 */ mfc1 $v0, $f8 -/* 70DAA4 80239D94 00000000 */ nop +/* 70DAA4 80239D94 00000000 */ nop /* 70DAA8 80239D98 A4620070 */ sh $v0, 0x70($v1) /* 70DAAC 80239D9C 84630070 */ lh $v1, 0x70($v1) /* 70DAB0 80239DA0 3C014049 */ lui $at, 0x4049 /* 70DAB4 80239DA4 34210FD0 */ ori $at, $at, 0xfd0 /* 70DAB8 80239DA8 44810000 */ mtc1 $at, $f0 /* 70DABC 80239DAC 44836000 */ mtc1 $v1, $f12 -/* 70DAC0 80239DB0 00000000 */ nop +/* 70DAC0 80239DB0 00000000 */ nop /* 70DAC4 80239DB4 46806320 */ cvt.s.w $f12, $f12 /* 70DAC8 80239DB8 46006302 */ mul.s $f12, $f12, $f0 -/* 70DACC 80239DBC 00000000 */ nop +/* 70DACC 80239DBC 00000000 */ nop /* 70DAD0 80239DC0 3C013F00 */ lui $at, 0x3f00 /* 70DAD4 80239DC4 44810000 */ mtc1 $at, $f0 -/* 70DAD8 80239DC8 00000000 */ nop +/* 70DAD8 80239DC8 00000000 */ nop /* 70DADC 80239DCC 46006302 */ mul.s $f12, $f12, $f0 -/* 70DAE0 80239DD0 00000000 */ nop +/* 70DAE0 80239DD0 00000000 */ nop /* 70DAE4 80239DD4 00021400 */ sll $v0, $v0, 0x10 /* 70DAE8 80239DD8 3C01443B */ lui $at, 0x443b /* 70DAEC 80239DDC 34218000 */ ori $at, $at, 0x8000 @@ -862,13 +862,13 @@ glabel func_80239140_70CE50 /* 70DB1C 80239E0C 3C014020 */ lui $at, 0x4020 /* 70DB20 80239E10 44810800 */ mtc1 $at, $f1 /* 70DB24 80239E14 44800000 */ mtc1 $zero, $f0 -/* 70DB28 80239E18 00000000 */ nop +/* 70DB28 80239E18 00000000 */ nop /* 70DB2C 80239E1C 46201082 */ mul.d $f2, $f2, $f0 -/* 70DB30 80239E20 00000000 */ nop +/* 70DB30 80239E20 00000000 */ nop /* 70DB34 80239E24 3C01402A */ lui $at, 0x402a /* 70DB38 80239E28 44810800 */ mtc1 $at, $f1 /* 70DB3C 80239E2C 44800000 */ mtc1 $zero, $f0 -/* 70DB40 80239E30 00000000 */ nop +/* 70DB40 80239E30 00000000 */ nop /* 70DB44 80239E34 46201080 */ add.d $f2, $f2, $f0 /* 70DB48 80239E38 4620120D */ trunc.w.d $f8, $f2 /* 70DB4C 80239E3C 3C018024 */ lui $at, %hi(D_8023D278) @@ -879,7 +879,7 @@ glabel func_80239140_70CE50 /* 70DB5C 80239E4C 8C84CCC0 */ lw $a0, %lo(D_8023CCC0)($a0) /* 70DB60 80239E50 8082005C */ lb $v0, 0x5c($a0) /* 70DB64 80239E54 14400008 */ bnez $v0, .L80239E78 -/* 70DB68 80239E58 00000000 */ nop +/* 70DB68 80239E58 00000000 */ nop /* 70DB6C 80239E5C 84830070 */ lh $v1, 0x70($a0) /* 70DB70 80239E60 04620001 */ bltzl $v1, .L80239E68 /* 70DB74 80239E64 24630003 */ addiu $v1, $v1, 3 diff --git a/asm/nonmatchings/code_70BD10/func_80239F84_70DC94.s b/asm/nonmatchings/code_70BD10/func_80239F84_70DC94.s index a193ee0425..5329aaad13 100644 --- a/asm/nonmatchings/code_70BD10/func_80239F84_70DC94.s +++ b/asm/nonmatchings/code_70BD10/func_80239F84_70DC94.s @@ -12,7 +12,7 @@ glabel func_80239F84_70DC94 /* 70DCB0 80239FA0 0080882D */ daddu $s1, $a0, $zero /* 70DCB4 80239FA4 8E2400AC */ lw $a0, 0xac($s1) /* 70DCB8 80239FA8 0C09A75B */ jal get_actor -/* 70DCBC 80239FAC 00000000 */ nop +/* 70DCBC 80239FAC 00000000 */ nop /* 70DCC0 80239FB0 AE220074 */ sw $v0, 0x74($s1) /* 70DCC4 80239FB4 AE200070 */ sw $zero, 0x70($s1) .L80239FB8: @@ -22,9 +22,9 @@ glabel func_80239F84_70DC94 /* 70DCD4 80239FC4 2612000C */ addiu $s2, $s0, 0xc /* 70DCD8 80239FC8 24020001 */ addiu $v0, $zero, 1 /* 70DCDC 80239FCC 1062001B */ beq $v1, $v0, .L8023A03C -/* 70DCE0 80239FD0 00000000 */ nop +/* 70DCE0 80239FD0 00000000 */ nop /* 70DCE4 80239FD4 0808E859 */ j .L8023A164 -/* 70DCE8 80239FD8 00000000 */ nop +/* 70DCE8 80239FD8 00000000 */ nop .L80239FDC: /* 70DCEC 80239FDC 3C038024 */ lui $v1, %hi(D_8023D330) /* 70DCF0 80239FE0 2463D330 */ addiu $v1, $v1, %lo(D_8023D330) @@ -59,10 +59,10 @@ glabel func_80239F84_70DC94 /* 70DD60 8023A050 34210FD0 */ ori $at, $at, 0xfd0 /* 70DD64 8023A054 44810000 */ mtc1 $at, $f0 /* 70DD68 8023A058 44826000 */ mtc1 $v0, $f12 -/* 70DD6C 8023A05C 00000000 */ nop +/* 70DD6C 8023A05C 00000000 */ nop /* 70DD70 8023A060 46806320 */ cvt.s.w $f12, $f12 /* 70DD74 8023A064 46006302 */ mul.s $f12, $f12, $f0 -/* 70DD78 8023A068 00000000 */ nop +/* 70DD78 8023A068 00000000 */ nop /* 70DD7C 8023A06C C6140010 */ lwc1 $f20, 0x10($s0) /* 70DD80 8023A070 3C0143B4 */ lui $at, 0x43b4 /* 70DD84 8023A074 44810000 */ mtc1 $at, $f0 @@ -74,15 +74,15 @@ glabel func_80239F84_70DC94 /* 70DD9C 8023A08C 3C014049 */ lui $at, 0x4049 /* 70DDA0 8023A090 34210FD0 */ ori $at, $at, 0xfd0 /* 70DDA4 8023A094 44816000 */ mtc1 $at, $f12 -/* 70DDA8 8023A098 00000000 */ nop +/* 70DDA8 8023A098 00000000 */ nop /* 70DDAC 8023A09C 460C0302 */ mul.s $f12, $f0, $f12 /* 70DDB0 8023A0A0 0C00A85B */ jal sin_rad -/* 70DDB4 8023A0A4 00000000 */ nop +/* 70DDB4 8023A0A4 00000000 */ nop /* 70DDB8 8023A0A8 3C018024 */ lui $at, %hi(D_8023D1D0) /* 70DDBC 8023A0AC D422D1D0 */ ldc1 $f2, %lo(D_8023D1D0)($at) /* 70DDC0 8023A0B0 46000021 */ cvt.d.s $f0, $f0 /* 70DDC4 8023A0B4 46220002 */ mul.d $f0, $f0, $f2 -/* 70DDC8 8023A0B8 00000000 */ nop +/* 70DDC8 8023A0B8 00000000 */ nop /* 70DDCC 8023A0BC 96030070 */ lhu $v1, 0x70($s0) /* 70DDD0 8023A0C0 3C013FE0 */ lui $at, 0x3fe0 /* 70DDD4 8023A0C4 44811800 */ mtc1 $at, $f3 @@ -93,7 +93,7 @@ glabel func_80239F84_70DC94 /* 70DDE8 8023A0D8 00021403 */ sra $v0, $v0, 0x10 /* 70DDEC 8023A0DC 4620A500 */ add.d $f20, $f20, $f0 /* 70DDF0 8023A0E0 44826000 */ mtc1 $v0, $f12 -/* 70DDF4 8023A0E4 00000000 */ nop +/* 70DDF4 8023A0E4 00000000 */ nop /* 70DDF8 8023A0E8 46806320 */ cvt.s.w $f12, $f12 /* 70DDFC 8023A0EC A6030070 */ sh $v1, 0x70($s0) /* 70DE00 8023A0F0 4620A520 */ cvt.s.d $f20, $f20 @@ -102,20 +102,20 @@ glabel func_80239F84_70DC94 /* 70DE0C 8023A0FC C60C018C */ lwc1 $f12, 0x18c($s0) /* 70DE10 8023A100 3C014204 */ lui $at, 0x4204 /* 70DE14 8023A104 44811000 */ mtc1 $at, $f2 -/* 70DE18 8023A108 00000000 */ nop +/* 70DE18 8023A108 00000000 */ nop /* 70DE1C 8023A10C 46026300 */ add.s $f12, $f12, $f2 /* 70DE20 8023A110 4600020D */ trunc.w.s $f8, $f0 /* 70DE24 8023A114 44024000 */ mfc1 $v0, $f8 -/* 70DE28 8023A118 00000000 */ nop +/* 70DE28 8023A118 00000000 */ nop /* 70DE2C 8023A11C A6020070 */ sh $v0, 0x70($s0) /* 70DE30 8023A120 0C00A6C9 */ jal clamp_angle /* 70DE34 8023A124 E60C018C */ swc1 $f12, 0x18c($s0) /* 70DE38 8023A128 C604000C */ lwc1 $f4, 0xc($s0) /* 70DE3C 8023A12C 3C014370 */ lui $at, 0x4370 /* 70DE40 8023A130 44811000 */ mtc1 $at, $f2 -/* 70DE44 8023A134 00000000 */ nop +/* 70DE44 8023A134 00000000 */ nop /* 70DE48 8023A138 4604103C */ c.lt.s $f2, $f4 -/* 70DE4C 8023A13C 00000000 */ nop +/* 70DE4C 8023A13C 00000000 */ nop /* 70DE50 8023A140 45000008 */ bc1f .L8023A164 /* 70DE54 8023A144 E600018C */ swc1 $f0, 0x18c($s0) /* 70DE58 8023A148 3C048024 */ lui $a0, %hi(D_8023D330) diff --git a/asm/nonmatchings/code_710EF0/func_80238014_710F04.s b/asm/nonmatchings/code_710EF0/func_80238014_710F04.s index 68278aeb81..00891f2c62 100644 --- a/asm/nonmatchings/code_710EF0/func_80238014_710F04.s +++ b/asm/nonmatchings/code_710EF0/func_80238014_710F04.s @@ -17,13 +17,13 @@ glabel func_80238014_710F04 /* 710F34 80238044 00621821 */ addu $v1, $v1, $v0 /* 710F38 80238048 00031843 */ sra $v1, $v1, 1 /* 710F3C 8023804C 44831000 */ mtc1 $v1, $f2 -/* 710F40 80238050 00000000 */ nop +/* 710F40 80238050 00000000 */ nop /* 710F44 80238054 468010A0 */ cvt.s.w $f2, $f2 /* 710F48 80238058 46001002 */ mul.s $f0, $f2, $f0 -/* 710F4C 8023805C 00000000 */ nop +/* 710F4C 8023805C 00000000 */ nop /* 710F50 80238060 3C0142C8 */ lui $at, 0x42c8 /* 710F54 80238064 44811000 */ mtc1 $at, $f2 -/* 710F58 80238068 00000000 */ nop +/* 710F58 80238068 00000000 */ nop /* 710F5C 8023806C 46020083 */ div.s $f2, $f0, $f2 /* 710F60 80238070 4600110D */ trunc.w.s $f4, $f2 /* 710F64 80238074 E6040084 */ swc1 $f4, 0x84($s0) diff --git a/asm/nonmatchings/code_710EF0/func_802380E4_710FD4.s b/asm/nonmatchings/code_710EF0/func_802380E4_710FD4.s index cf2341c877..adfc34161f 100644 --- a/asm/nonmatchings/code_710EF0/func_802380E4_710FD4.s +++ b/asm/nonmatchings/code_710EF0/func_802380E4_710FD4.s @@ -16,19 +16,19 @@ glabel func_802380E4_710FD4 /* 711000 80238110 0C0B1EAF */ jal get_variable /* 711004 80238114 26100004 */ addiu $s0, $s0, 4 /* 711008 80238118 4482A000 */ mtc1 $v0, $f20 -/* 71100C 8023811C 00000000 */ nop +/* 71100C 8023811C 00000000 */ nop /* 711010 80238120 4680A520 */ cvt.s.w $f20, $f20 /* 711014 80238124 8E050000 */ lw $a1, ($s0) /* 711018 80238128 0C0B1EAF */ jal get_variable /* 71101C 8023812C 0220202D */ daddu $a0, $s1, $zero /* 711020 80238130 C6400188 */ lwc1 $f0, 0x188($s2) /* 711024 80238134 4600A502 */ mul.s $f20, $f20, $f0 -/* 711028 80238138 00000000 */ nop +/* 711028 80238138 00000000 */ nop /* 71102C 8023813C 44821000 */ mtc1 $v0, $f2 -/* 711030 80238140 00000000 */ nop +/* 711030 80238140 00000000 */ nop /* 711034 80238144 468010A0 */ cvt.s.w $f2, $f2 /* 711038 80238148 46001082 */ mul.s $f2, $f2, $f0 -/* 71103C 8023814C 00000000 */ nop +/* 71103C 8023814C 00000000 */ nop /* 711040 80238150 C6240084 */ lwc1 $f4, 0x84($s1) /* 711044 80238154 46802120 */ cvt.s.w $f4, $f4 /* 711048 80238158 46142100 */ add.s $f4, $f4, $f20 diff --git a/asm/nonmatchings/code_710EF0/func_802381E8_7110D8.s b/asm/nonmatchings/code_710EF0/func_802381E8_7110D8.s index ab91038ac1..d2af3137ff 100644 --- a/asm/nonmatchings/code_710EF0/func_802381E8_7110D8.s +++ b/asm/nonmatchings/code_710EF0/func_802381E8_7110D8.s @@ -41,7 +41,7 @@ glabel func_802381E8_7110D8 /* 711160 80238270 0000202D */ daddu $a0, $zero, $zero .L80238274: /* 711164 80238274 18800003 */ blez $a0, .L80238284 -/* 711168 80238278 00000000 */ nop +/* 711168 80238278 00000000 */ nop /* 71116C 8023827C 02449021 */ addu $s2, $s2, $a0 /* 711170 80238280 26730001 */ addiu $s3, $s3, 1 .L80238284: @@ -61,7 +61,7 @@ glabel func_802381E8_7110D8 /* 7111A0 802382B0 16610004 */ bne $s3, $at, .L802382C4 /* 7111A4 802382B4 3C018000 */ lui $at, 0x8000 /* 7111A8 802382B8 16410002 */ bne $s2, $at, .L802382C4 -/* 7111AC 802382BC 00000000 */ nop +/* 7111AC 802382BC 00000000 */ nop /* 7111B0 802382C0 0006000D */ break 6 .L802382C4: /* 7111B4 802382C4 00001012 */ mflo $v0 @@ -79,4 +79,4 @@ glabel func_802381E8_7110D8 /* 7111E0 802382F0 24020002 */ addiu $v0, $zero, 2 /* 7111E4 802382F4 03E00008 */ jr $ra /* 7111E8 802382F8 27BD0038 */ addiu $sp, $sp, 0x38 -/* 7111EC 802382FC 00000000 */ nop +/* 7111EC 802382FC 00000000 */ nop diff --git a/asm/nonmatchings/code_7179D0/func_802A1000_7179D0.s b/asm/nonmatchings/code_7179D0/func_802A1000_7179D0.s index 17e155509f..0ec3aa17df 100644 --- a/asm/nonmatchings/code_7179D0/func_802A1000_7179D0.s +++ b/asm/nonmatchings/code_7179D0/func_802A1000_7179D0.s @@ -29,7 +29,7 @@ glabel func_802A1000_7179D0 /* 717A30 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 717A34 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 717A38 802A1068 44820000 */ mtc1 $v0, $f0 -/* 717A3C 802A106C 00000000 */ nop +/* 717A3C 802A106C 00000000 */ nop /* 717A40 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 717A44 802A1074 0C099CAB */ jal heroes_is_ability_active /* 717A48 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_7179D0 /* 717AE4 802A1114 24040001 */ addiu $a0, $zero, 1 /* 717AE8 802A1118 0212102A */ slt $v0, $s0, $s2 /* 717AEC 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 717AF0 802A1120 00000000 */ nop +/* 717AF0 802A1120 00000000 */ nop .L802A1124: /* 717AF4 802A1124 00101040 */ sll $v0, $s0, 1 /* 717AF8 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_7179D0 /* 717B3C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 717B40 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 717B44 802A1174 0C050529 */ jal create_icon -/* 717B48 802A1178 00000000 */ nop +/* 717B48 802A1178 00000000 */ nop /* 717B4C 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 717B50 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 717B54 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_7179D0/func_802A11D4_717BA4.s b/asm/nonmatchings/code_7179D0/func_802A11D4_717BA4.s index 207a7934fd..8b39a3754a 100644 --- a/asm/nonmatchings/code_7179D0/func_802A11D4_717BA4.s +++ b/asm/nonmatchings/code_7179D0/func_802A11D4_717BA4.s @@ -16,17 +16,17 @@ glabel func_802A11D4_717BA4 /* 717BD0 802A1200 0C099CAB */ jal heroes_is_ability_active /* 717BD4 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 717BD8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 717BDC 802A120C 00000000 */ nop +/* 717BDC 802A120C 00000000 */ nop /* 717BE0 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 717BE4 802A1214 00000000 */ nop +/* 717BE4 802A1214 00000000 */ nop /* 717BE8 802A1218 3C04802A */ lui $a0, %hi(D_802A1E80) /* 717BEC 802A121C 8C841E80 */ lw $a0, %lo(D_802A1E80)($a0) /* 717BF0 802A1220 0C05123D */ jal free_icon -/* 717BF4 802A1224 00000000 */ nop +/* 717BF4 802A1224 00000000 */ nop .L802A1228: /* 717BF8 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 717BFC 802A122C 8FB00010 */ lw $s0, 0x10($sp) /* 717C00 802A1230 24020002 */ addiu $v0, $zero, 2 /* 717C04 802A1234 03E00008 */ jr $ra /* 717C08 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 -/* 717C0C 802A123C 00000000 */ nop +/* 717C0C 802A123C 00000000 */ nop diff --git a/asm/nonmatchings/code_718850/func_802A1000_718850.s b/asm/nonmatchings/code_718850/func_802A1000_718850.s index e8d7149eb4..131f818cd3 100644 --- a/asm/nonmatchings/code_718850/func_802A1000_718850.s +++ b/asm/nonmatchings/code_718850/func_802A1000_718850.s @@ -29,7 +29,7 @@ glabel func_802A1000_718850 /* 7188B0 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 7188B4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 7188B8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 7188BC 802A106C 00000000 */ nop +/* 7188BC 802A106C 00000000 */ nop /* 7188C0 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 7188C4 802A1074 0C099CAB */ jal heroes_is_ability_active /* 7188C8 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_718850 /* 718964 802A1114 24040001 */ addiu $a0, $zero, 1 /* 718968 802A1118 0212102A */ slt $v0, $s0, $s2 /* 71896C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 718970 802A1120 00000000 */ nop +/* 718970 802A1120 00000000 */ nop .L802A1124: /* 718974 802A1124 00101040 */ sll $v0, $s0, 1 /* 718978 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_718850 /* 7189BC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 7189C0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 7189C4 802A1174 0C050529 */ jal create_icon -/* 7189C8 802A1178 00000000 */ nop +/* 7189C8 802A1178 00000000 */ nop /* 7189CC 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 7189D0 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 7189D4 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_718850/func_802A11D4_718A24.s b/asm/nonmatchings/code_718850/func_802A11D4_718A24.s index 76b948a5b1..4e1e4863cf 100644 --- a/asm/nonmatchings/code_718850/func_802A11D4_718A24.s +++ b/asm/nonmatchings/code_718850/func_802A11D4_718A24.s @@ -16,13 +16,13 @@ glabel func_802A11D4_718A24 /* 718A50 802A1200 0C099CAB */ jal heroes_is_ability_active /* 718A54 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 718A58 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 718A5C 802A120C 00000000 */ nop +/* 718A5C 802A120C 00000000 */ nop /* 718A60 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 718A64 802A1214 00000000 */ nop +/* 718A64 802A1214 00000000 */ nop /* 718A68 802A1218 3C04802A */ lui $a0, %hi(D_802A2120) /* 718A6C 802A121C 8C842120 */ lw $a0, %lo(D_802A2120)($a0) /* 718A70 802A1220 0C05123D */ jal free_icon -/* 718A74 802A1224 00000000 */ nop +/* 718A74 802A1224 00000000 */ nop .L802A1228: /* 718A78 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 718A7C 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_718850/func_802A123C_718A8C.s b/asm/nonmatchings/code_718850/func_802A123C_718A8C.s index 0bdb81f5d5..277819da13 100644 --- a/asm/nonmatchings/code_718850/func_802A123C_718A8C.s +++ b/asm/nonmatchings/code_718850/func_802A123C_718A8C.s @@ -19,7 +19,7 @@ glabel func_802A123C_718A8C /* 718AC4 802A1274 44801000 */ mtc1 $zero, $f2 /* 718AC8 802A1278 46000021 */ cvt.d.s $f0, $f0 /* 718ACC 802A127C 46220032 */ c.eq.d $f0, $f2 -/* 718AD0 802A1280 00000000 */ nop +/* 718AD0 802A1280 00000000 */ nop /* 718AD4 802A1284 45000011 */ bc1f .L802A12CC /* 718AD8 802A1288 24020002 */ addiu $v0, $zero, 2 /* 718ADC 802A128C 8C9000AC */ lw $s0, 0xac($a0) diff --git a/asm/nonmatchings/code_718850/func_802A1318_718B68.s b/asm/nonmatchings/code_718850/func_802A1318_718B68.s index efe9531e0f..c62fde6344 100644 --- a/asm/nonmatchings/code_718850/func_802A1318_718B68.s +++ b/asm/nonmatchings/code_718850/func_802A1318_718B68.s @@ -9,7 +9,7 @@ glabel func_802A1318_718B68 /* 718B78 802A1328 3C10800E */ lui $s0, %hi(gBattleStatus+0xD8) /* 718B7C 802A132C 8E10C148 */ lw $s0, %lo(gBattleStatus+0xD8)($s0) /* 718B80 802A1330 0C04417A */ jal get_entity_by_index -/* 718B84 802A1334 00000000 */ nop +/* 718B84 802A1334 00000000 */ nop /* 718B88 802A1338 C6000188 */ lwc1 $f0, 0x188($s0) /* 718B8C 802A133C E4400054 */ swc1 $f0, 0x54($v0) /* 718B90 802A1340 C6000188 */ lwc1 $f0, 0x188($s0) @@ -22,13 +22,13 @@ glabel func_802A1318_718B68 /* 718BAC 802A135C 44801000 */ mtc1 $zero, $f2 /* 718BB0 802A1360 46000021 */ cvt.d.s $f0, $f0 /* 718BB4 802A1364 46220032 */ c.eq.d $f0, $f2 -/* 718BB8 802A1368 00000000 */ nop +/* 718BB8 802A1368 00000000 */ nop /* 718BBC 802A136C 45010007 */ bc1t .L802A138C -/* 718BC0 802A1370 00000000 */ nop +/* 718BC0 802A1370 00000000 */ nop /* 718BC4 802A1374 C440004C */ lwc1 $f0, 0x4c($v0) /* 718BC8 802A1378 3C014120 */ lui $at, 0x4120 /* 718BCC 802A137C 44811000 */ mtc1 $at, $f2 -/* 718BD0 802A1380 00000000 */ nop +/* 718BD0 802A1380 00000000 */ nop /* 718BD4 802A1384 46020001 */ sub.s $f0, $f0, $f2 /* 718BD8 802A1388 E440004C */ swc1 $f0, 0x4c($v0) .L802A138C: diff --git a/asm/nonmatchings/code_719970/func_802A1000_719970.s b/asm/nonmatchings/code_719970/func_802A1000_719970.s index 7e21a420db..c2c343f02b 100644 --- a/asm/nonmatchings/code_719970/func_802A1000_719970.s +++ b/asm/nonmatchings/code_719970/func_802A1000_719970.s @@ -29,7 +29,7 @@ glabel func_802A1000_719970 /* 7199D0 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 7199D4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 7199D8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 7199DC 802A106C 00000000 */ nop +/* 7199DC 802A106C 00000000 */ nop /* 7199E0 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 7199E4 802A1074 0C099CAB */ jal heroes_is_ability_active /* 7199E8 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_719970 /* 719A84 802A1114 24040001 */ addiu $a0, $zero, 1 /* 719A88 802A1118 0212102A */ slt $v0, $s0, $s2 /* 719A8C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 719A90 802A1120 00000000 */ nop +/* 719A90 802A1120 00000000 */ nop .L802A1124: /* 719A94 802A1124 00101040 */ sll $v0, $s0, 1 /* 719A98 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_719970 /* 719ADC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 719AE0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 719AE4 802A1174 0C050529 */ jal create_icon -/* 719AE8 802A1178 00000000 */ nop +/* 719AE8 802A1178 00000000 */ nop /* 719AEC 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 719AF0 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 719AF4 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_719970/func_802A11D4_719B44.s b/asm/nonmatchings/code_719970/func_802A11D4_719B44.s index b6c2f3bb72..f13f9c6409 100644 --- a/asm/nonmatchings/code_719970/func_802A11D4_719B44.s +++ b/asm/nonmatchings/code_719970/func_802A11D4_719B44.s @@ -16,17 +16,17 @@ glabel func_802A11D4_719B44 /* 719B70 802A1200 0C099CAB */ jal heroes_is_ability_active /* 719B74 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 719B78 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 719B7C 802A120C 00000000 */ nop +/* 719B7C 802A120C 00000000 */ nop /* 719B80 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 719B84 802A1214 00000000 */ nop +/* 719B84 802A1214 00000000 */ nop /* 719B88 802A1218 3C04802A */ lui $a0, %hi(D_802A1E80) /* 719B8C 802A121C 8C841E80 */ lw $a0, %lo(D_802A1E80)($a0) /* 719B90 802A1220 0C05123D */ jal free_icon -/* 719B94 802A1224 00000000 */ nop +/* 719B94 802A1224 00000000 */ nop .L802A1228: /* 719B98 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 719B9C 802A122C 8FB00010 */ lw $s0, 0x10($sp) /* 719BA0 802A1230 24020002 */ addiu $v0, $zero, 2 /* 719BA4 802A1234 03E00008 */ jr $ra /* 719BA8 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 -/* 719BAC 802A123C 00000000 */ nop +/* 719BAC 802A123C 00000000 */ nop diff --git a/asm/nonmatchings/code_71A7F0/func_802A1000_71A7F0.s b/asm/nonmatchings/code_71A7F0/func_802A1000_71A7F0.s index 43237ed0f0..1687f8932c 100644 --- a/asm/nonmatchings/code_71A7F0/func_802A1000_71A7F0.s +++ b/asm/nonmatchings/code_71A7F0/func_802A1000_71A7F0.s @@ -29,7 +29,7 @@ glabel func_802A1000_71A7F0 /* 71A850 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 71A854 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 71A858 802A1068 44820000 */ mtc1 $v0, $f0 -/* 71A85C 802A106C 00000000 */ nop +/* 71A85C 802A106C 00000000 */ nop /* 71A860 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 71A864 802A1074 0C099CAB */ jal heroes_is_ability_active /* 71A868 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_71A7F0 /* 71A904 802A1114 24040001 */ addiu $a0, $zero, 1 /* 71A908 802A1118 0212102A */ slt $v0, $s0, $s2 /* 71A90C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 71A910 802A1120 00000000 */ nop +/* 71A910 802A1120 00000000 */ nop .L802A1124: /* 71A914 802A1124 00101040 */ sll $v0, $s0, 1 /* 71A918 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_71A7F0 /* 71A95C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 71A960 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 71A964 802A1174 0C050529 */ jal create_icon -/* 71A968 802A1178 00000000 */ nop +/* 71A968 802A1178 00000000 */ nop /* 71A96C 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 71A970 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 71A974 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_71A7F0/func_802A11D4_71A9C4.s b/asm/nonmatchings/code_71A7F0/func_802A11D4_71A9C4.s index 3d0670bbe0..cdc7df50aa 100644 --- a/asm/nonmatchings/code_71A7F0/func_802A11D4_71A9C4.s +++ b/asm/nonmatchings/code_71A7F0/func_802A11D4_71A9C4.s @@ -16,13 +16,13 @@ glabel func_802A11D4_71A9C4 /* 71A9F0 802A1200 0C099CAB */ jal heroes_is_ability_active /* 71A9F4 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 71A9F8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 71A9FC 802A120C 00000000 */ nop +/* 71A9FC 802A120C 00000000 */ nop /* 71AA00 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 71AA04 802A1214 00000000 */ nop +/* 71AA04 802A1214 00000000 */ nop /* 71AA08 802A1218 3C04802A */ lui $a0, %hi(D_802A19B0) /* 71AA0C 802A121C 8C8419B0 */ lw $a0, %lo(D_802A19B0)($a0) /* 71AA10 802A1220 0C05123D */ jal free_icon -/* 71AA14 802A1224 00000000 */ nop +/* 71AA14 802A1224 00000000 */ nop .L802A1228: /* 71AA18 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 71AA1C 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_71A7F0/func_802A123C_71AA2C.s b/asm/nonmatchings/code_71A7F0/func_802A123C_71AA2C.s index f5c6978eb2..47bd62992b 100644 --- a/asm/nonmatchings/code_71A7F0/func_802A123C_71AA2C.s +++ b/asm/nonmatchings/code_71A7F0/func_802A123C_71AA2C.s @@ -18,4 +18,4 @@ glabel func_802A123C_71AA2C /* 71AA60 802A1270 24020002 */ addiu $v0, $zero, 2 /* 71AA64 802A1274 03E00008 */ jr $ra /* 71AA68 802A1278 27BD0018 */ addiu $sp, $sp, 0x18 -/* 71AA6C 802A127C 00000000 */ nop +/* 71AA6C 802A127C 00000000 */ nop diff --git a/asm/nonmatchings/code_71B1A0/func_802A1000_71B1A0.s b/asm/nonmatchings/code_71B1A0/func_802A1000_71B1A0.s index e0de72c8b8..adf3ec8b30 100644 --- a/asm/nonmatchings/code_71B1A0/func_802A1000_71B1A0.s +++ b/asm/nonmatchings/code_71B1A0/func_802A1000_71B1A0.s @@ -29,7 +29,7 @@ glabel func_802A1000_71B1A0 /* 71B200 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 71B204 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 71B208 802A1068 44820000 */ mtc1 $v0, $f0 -/* 71B20C 802A106C 00000000 */ nop +/* 71B20C 802A106C 00000000 */ nop /* 71B210 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 71B214 802A1074 0C099CAB */ jal heroes_is_ability_active /* 71B218 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_71B1A0 /* 71B2B4 802A1114 24040001 */ addiu $a0, $zero, 1 /* 71B2B8 802A1118 0212102A */ slt $v0, $s0, $s2 /* 71B2BC 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 71B2C0 802A1120 00000000 */ nop +/* 71B2C0 802A1120 00000000 */ nop .L802A1124: /* 71B2C4 802A1124 00101040 */ sll $v0, $s0, 1 /* 71B2C8 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_71B1A0 /* 71B30C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 71B310 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 71B314 802A1174 0C050529 */ jal create_icon -/* 71B318 802A1178 00000000 */ nop +/* 71B318 802A1178 00000000 */ nop /* 71B31C 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 71B320 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 71B324 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_71B1A0/func_802A11D4_71B374.s b/asm/nonmatchings/code_71B1A0/func_802A11D4_71B374.s index b80faf66d8..c727cfebb3 100644 --- a/asm/nonmatchings/code_71B1A0/func_802A11D4_71B374.s +++ b/asm/nonmatchings/code_71B1A0/func_802A11D4_71B374.s @@ -16,13 +16,13 @@ glabel func_802A11D4_71B374 /* 71B3A0 802A1200 0C099CAB */ jal heroes_is_ability_active /* 71B3A4 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 71B3A8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 71B3AC 802A120C 00000000 */ nop +/* 71B3AC 802A120C 00000000 */ nop /* 71B3B0 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 71B3B4 802A1214 00000000 */ nop +/* 71B3B4 802A1214 00000000 */ nop /* 71B3B8 802A1218 3C04802A */ lui $a0, %hi(D_802A1C90) /* 71B3BC 802A121C 8C841C90 */ lw $a0, %lo(D_802A1C90)($a0) /* 71B3C0 802A1220 0C05123D */ jal free_icon -/* 71B3C4 802A1224 00000000 */ nop +/* 71B3C4 802A1224 00000000 */ nop .L802A1228: /* 71B3C8 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 71B3CC 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_71B1A0/func_802A1354_71B4F4.s b/asm/nonmatchings/code_71B1A0/func_802A1354_71B4F4.s index 77501ee9e8..afc751fb0c 100644 --- a/asm/nonmatchings/code_71B1A0/func_802A1354_71B4F4.s +++ b/asm/nonmatchings/code_71B1A0/func_802A1354_71B4F4.s @@ -28,16 +28,16 @@ glabel func_802A1354_71B4F4 /* 71B550 802A13B0 00021882 */ srl $v1, $v0, 2 /* 71B554 802A13B4 00431021 */ addu $v0, $v0, $v1 /* 71B558 802A13B8 44823000 */ mtc1 $v0, $f6 -/* 71B55C 802A13BC 00000000 */ nop +/* 71B55C 802A13BC 00000000 */ nop /* 71B560 802A13C0 468031A0 */ cvt.s.w $f6, $f6 /* 71B564 802A13C4 46003182 */ mul.s $f6, $f6, $f0 -/* 71B568 802A13C8 00000000 */ nop +/* 71B568 802A13C8 00000000 */ nop /* 71B56C 802A13CC 2482FFFE */ addiu $v0, $a0, -2 /* 71B570 802A13D0 44822000 */ mtc1 $v0, $f4 -/* 71B574 802A13D4 00000000 */ nop +/* 71B574 802A13D4 00000000 */ nop /* 71B578 802A13D8 46802120 */ cvt.s.w $f4, $f4 /* 71B57C 802A13DC 46002102 */ mul.s $f4, $f4, $f0 -/* 71B580 802A13E0 00000000 */ nop +/* 71B580 802A13E0 00000000 */ nop /* 71B584 802A13E4 C6020148 */ lwc1 $f2, 0x148($s0) /* 71B588 802A13E8 C6160144 */ lwc1 $f22, 0x144($s0) /* 71B58C 802A13EC C618014C */ lwc1 $f24, 0x14c($s0) @@ -45,7 +45,7 @@ glabel func_802A1354_71B4F4 /* 71B594 802A13F4 000810C2 */ srl $v0, $t0, 3 /* 71B598 802A13F8 304200FF */ andi $v0, $v0, 0xff /* 71B59C 802A13FC 44820000 */ mtc1 $v0, $f0 -/* 71B5A0 802A1400 00000000 */ nop +/* 71B5A0 802A1400 00000000 */ nop /* 71B5A4 802A1404 46800020 */ cvt.s.w $f0, $f0 /* 71B5A8 802A1408 4600320D */ trunc.w.s $f8, $f6 /* 71B5AC 802A140C 44114000 */ mfc1 $s1, $f8 @@ -57,7 +57,7 @@ glabel func_802A1354_71B4F4 /* 71B5C4 802A1424 46001500 */ add.s $f20, $f2, $f0 /* 71B5C8 802A1428 00041042 */ srl $v0, $a0, 1 /* 71B5CC 802A142C 44820000 */ mtc1 $v0, $f0 -/* 71B5D0 802A1430 00000000 */ nop +/* 71B5D0 802A1430 00000000 */ nop /* 71B5D4 802A1434 46800020 */ cvt.s.w $f0, $f0 /* 71B5D8 802A1438 4600A501 */ sub.s $f20, $f20, $f0 .L802A143C: @@ -68,11 +68,11 @@ glabel func_802A1354_71B4F4 /* 71B5EC 802A144C 4406A000 */ mfc1 $a2, $f20 /* 71B5F0 802A1450 4407C000 */ mfc1 $a3, $f24 /* 71B5F4 802A1454 44910000 */ mtc1 $s1, $f0 -/* 71B5F8 802A1458 00000000 */ nop +/* 71B5F8 802A1458 00000000 */ nop /* 71B5FC 802A145C 46800020 */ cvt.s.w $f0, $f0 /* 71B600 802A1460 E7A00010 */ swc1 $f0, 0x10($sp) /* 71B604 802A1464 44920000 */ mtc1 $s2, $f0 -/* 71B608 802A1468 00000000 */ nop +/* 71B608 802A1468 00000000 */ nop /* 71B60C 802A146C 46800020 */ cvt.s.w $f0, $f0 /* 71B610 802A1470 0C01C334 */ jal func_80070CD0 /* 71B614 802A1474 E7A00014 */ swc1 $f0, 0x14($sp) diff --git a/asm/nonmatchings/code_71BE30/func_802A1000_71BE30.s b/asm/nonmatchings/code_71BE30/func_802A1000_71BE30.s index 3efa37779c..0e6715e52e 100644 --- a/asm/nonmatchings/code_71BE30/func_802A1000_71BE30.s +++ b/asm/nonmatchings/code_71BE30/func_802A1000_71BE30.s @@ -29,7 +29,7 @@ glabel func_802A1000_71BE30 /* 71BE90 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 71BE94 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 71BE98 802A1068 44820000 */ mtc1 $v0, $f0 -/* 71BE9C 802A106C 00000000 */ nop +/* 71BE9C 802A106C 00000000 */ nop /* 71BEA0 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 71BEA4 802A1074 0C099CAB */ jal heroes_is_ability_active /* 71BEA8 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_71BE30 /* 71BF44 802A1114 24040001 */ addiu $a0, $zero, 1 /* 71BF48 802A1118 0212102A */ slt $v0, $s0, $s2 /* 71BF4C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 71BF50 802A1120 00000000 */ nop +/* 71BF50 802A1120 00000000 */ nop .L802A1124: /* 71BF54 802A1124 00101040 */ sll $v0, $s0, 1 /* 71BF58 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_71BE30 /* 71BF9C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 71BFA0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 71BFA4 802A1174 0C050529 */ jal create_icon -/* 71BFA8 802A1178 00000000 */ nop +/* 71BFA8 802A1178 00000000 */ nop /* 71BFAC 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 71BFB0 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 71BFB4 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_71BE30/func_802A11D4_71C004.s b/asm/nonmatchings/code_71BE30/func_802A11D4_71C004.s index cafb302b0f..8355227a8b 100644 --- a/asm/nonmatchings/code_71BE30/func_802A11D4_71C004.s +++ b/asm/nonmatchings/code_71BE30/func_802A11D4_71C004.s @@ -16,13 +16,13 @@ glabel func_802A11D4_71C004 /* 71C030 802A1200 0C099CAB */ jal heroes_is_ability_active /* 71C034 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 71C038 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 71C03C 802A120C 00000000 */ nop +/* 71C03C 802A120C 00000000 */ nop /* 71C040 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 71C044 802A1214 00000000 */ nop +/* 71C044 802A1214 00000000 */ nop /* 71C048 802A1218 3C04802A */ lui $a0, %hi(D_802A1EB0) /* 71C04C 802A121C 8C841EB0 */ lw $a0, %lo(D_802A1EB0)($a0) /* 71C050 802A1220 0C05123D */ jal free_icon -/* 71C054 802A1224 00000000 */ nop +/* 71C054 802A1224 00000000 */ nop .L802A1228: /* 71C058 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 71C05C 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_71BE30/func_802A123C_71C06C.s b/asm/nonmatchings/code_71BE30/func_802A123C_71C06C.s index 921b053b66..1c3ccbdf7e 100644 --- a/asm/nonmatchings/code_71BE30/func_802A123C_71C06C.s +++ b/asm/nonmatchings/code_71BE30/func_802A123C_71C06C.s @@ -26,13 +26,13 @@ glabel func_802A123C_71C06C /* 71C0C0 802A1290 0C0B1EAF */ jal get_variable /* 71C0C4 802A1294 0040802D */ daddu $s0, $v0, $zero /* 71C0C8 802A1298 4492D000 */ mtc1 $s2, $f26 -/* 71C0CC 802A129C 00000000 */ nop +/* 71C0CC 802A129C 00000000 */ nop /* 71C0D0 802A12A0 4680D6A0 */ cvt.s.w $f26, $f26 /* 71C0D4 802A12A4 4490C000 */ mtc1 $s0, $f24 -/* 71C0D8 802A12A8 00000000 */ nop +/* 71C0D8 802A12A8 00000000 */ nop /* 71C0DC 802A12AC 4680C620 */ cvt.s.w $f24, $f24 /* 71C0E0 802A12B0 4482A000 */ mtc1 $v0, $f20 -/* 71C0E4 802A12B4 00000000 */ nop +/* 71C0E4 802A12B4 00000000 */ nop /* 71C0E8 802A12B8 4680A520 */ cvt.s.w $f20, $f20 /* 71C0EC 802A12BC 4405D000 */ mfc1 $a1, $f26 /* 71C0F0 802A12C0 4406C000 */ mfc1 $a2, $f24 diff --git a/asm/nonmatchings/code_71BE30/func_802A13B8_71C1E8.s b/asm/nonmatchings/code_71BE30/func_802A13B8_71C1E8.s index 68f8a29bce..8532910a58 100644 --- a/asm/nonmatchings/code_71BE30/func_802A13B8_71C1E8.s +++ b/asm/nonmatchings/code_71BE30/func_802A13B8_71C1E8.s @@ -37,5 +37,5 @@ glabel func_802A13B8_71C1E8 /* 71C25C 802A142C 8FB00010 */ lw $s0, 0x10($sp) /* 71C260 802A1430 03E00008 */ jr $ra /* 71C264 802A1434 27BD0018 */ addiu $sp, $sp, 0x18 -/* 71C268 802A1438 00000000 */ nop -/* 71C26C 802A143C 00000000 */ nop +/* 71C268 802A1438 00000000 */ nop +/* 71C26C 802A143C 00000000 */ nop diff --git a/asm/nonmatchings/code_71CCE0/func_802A1000_71CCE0.s b/asm/nonmatchings/code_71CCE0/func_802A1000_71CCE0.s index f4f00cd015..0a1ba6689f 100644 --- a/asm/nonmatchings/code_71CCE0/func_802A1000_71CCE0.s +++ b/asm/nonmatchings/code_71CCE0/func_802A1000_71CCE0.s @@ -29,7 +29,7 @@ glabel func_802A1000_71CCE0 /* 71CD40 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 71CD44 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 71CD48 802A1068 44820000 */ mtc1 $v0, $f0 -/* 71CD4C 802A106C 00000000 */ nop +/* 71CD4C 802A106C 00000000 */ nop /* 71CD50 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 71CD54 802A1074 0C099CAB */ jal heroes_is_ability_active /* 71CD58 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_71CCE0 /* 71CDF4 802A1114 24040001 */ addiu $a0, $zero, 1 /* 71CDF8 802A1118 0212102A */ slt $v0, $s0, $s2 /* 71CDFC 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 71CE00 802A1120 00000000 */ nop +/* 71CE00 802A1120 00000000 */ nop .L802A1124: /* 71CE04 802A1124 00101040 */ sll $v0, $s0, 1 /* 71CE08 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_71CCE0 /* 71CE4C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 71CE50 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 71CE54 802A1174 0C050529 */ jal create_icon -/* 71CE58 802A1178 00000000 */ nop +/* 71CE58 802A1178 00000000 */ nop /* 71CE5C 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 71CE60 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 71CE64 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_71CCE0/func_802A11D4_71CEB4.s b/asm/nonmatchings/code_71CCE0/func_802A11D4_71CEB4.s index 1cb47e7642..7f16cf5e65 100644 --- a/asm/nonmatchings/code_71CCE0/func_802A11D4_71CEB4.s +++ b/asm/nonmatchings/code_71CCE0/func_802A11D4_71CEB4.s @@ -16,13 +16,13 @@ glabel func_802A11D4_71CEB4 /* 71CEE0 802A1200 0C099CAB */ jal heroes_is_ability_active /* 71CEE4 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 71CEE8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 71CEEC 802A120C 00000000 */ nop +/* 71CEEC 802A120C 00000000 */ nop /* 71CEF0 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 71CEF4 802A1214 00000000 */ nop +/* 71CEF4 802A1214 00000000 */ nop /* 71CEF8 802A1218 3C04802A */ lui $a0, %hi(D_802A1A90) /* 71CEFC 802A121C 8C841A90 */ lw $a0, %lo(D_802A1A90)($a0) /* 71CF00 802A1220 0C05123D */ jal free_icon -/* 71CF04 802A1224 00000000 */ nop +/* 71CF04 802A1224 00000000 */ nop .L802A1228: /* 71CF08 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 71CF0C 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_71CCE0/func_802A123C_71CF1C.s b/asm/nonmatchings/code_71CCE0/func_802A123C_71CF1C.s index 27cce472d5..720ca1c208 100644 --- a/asm/nonmatchings/code_71CCE0/func_802A123C_71CF1C.s +++ b/asm/nonmatchings/code_71CCE0/func_802A123C_71CF1C.s @@ -28,15 +28,15 @@ glabel func_802A123C_71CF1C /* 71CF78 802A1298 0C0B1EAF */ jal get_variable /* 71CF7C 802A129C 0040802D */ daddu $s0, $v0, $zero /* 71CF80 802A12A0 44930000 */ mtc1 $s3, $f0 -/* 71CF84 802A12A4 00000000 */ nop +/* 71CF84 802A12A4 00000000 */ nop /* 71CF88 802A12A8 46800020 */ cvt.s.w $f0, $f0 /* 71CF8C 802A12AC 44050000 */ mfc1 $a1, $f0 /* 71CF90 802A12B0 44920000 */ mtc1 $s2, $f0 -/* 71CF94 802A12B4 00000000 */ nop +/* 71CF94 802A12B4 00000000 */ nop /* 71CF98 802A12B8 46800020 */ cvt.s.w $f0, $f0 /* 71CF9C 802A12BC 44060000 */ mfc1 $a2, $f0 /* 71CFA0 802A12C0 44900000 */ mtc1 $s0, $f0 -/* 71CFA4 802A12C4 00000000 */ nop +/* 71CFA4 802A12C4 00000000 */ nop /* 71CFA8 802A12C8 46800020 */ cvt.s.w $f0, $f0 /* 71CFAC 802A12CC 44070000 */ mfc1 $a3, $f0 /* 71CFB0 802A12D0 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/code_71D770/func_802A1000_71D770.s b/asm/nonmatchings/code_71D770/func_802A1000_71D770.s index ddabb015fe..0e213a33c1 100644 --- a/asm/nonmatchings/code_71D770/func_802A1000_71D770.s +++ b/asm/nonmatchings/code_71D770/func_802A1000_71D770.s @@ -29,7 +29,7 @@ glabel func_802A1000_71D770 /* 71D7D0 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 71D7D4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 71D7D8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 71D7DC 802A106C 00000000 */ nop +/* 71D7DC 802A106C 00000000 */ nop /* 71D7E0 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 71D7E4 802A1074 0C099CAB */ jal heroes_is_ability_active /* 71D7E8 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_71D770 /* 71D884 802A1114 24040001 */ addiu $a0, $zero, 1 /* 71D888 802A1118 0212102A */ slt $v0, $s0, $s2 /* 71D88C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 71D890 802A1120 00000000 */ nop +/* 71D890 802A1120 00000000 */ nop .L802A1124: /* 71D894 802A1124 00101040 */ sll $v0, $s0, 1 /* 71D898 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_71D770 /* 71D8DC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 71D8E0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 71D8E4 802A1174 0C050529 */ jal create_icon -/* 71D8E8 802A1178 00000000 */ nop +/* 71D8E8 802A1178 00000000 */ nop /* 71D8EC 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 71D8F0 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 71D8F4 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_71D770/func_802A11D4_71D944.s b/asm/nonmatchings/code_71D770/func_802A11D4_71D944.s index 4b8fecafd7..954aa12e87 100644 --- a/asm/nonmatchings/code_71D770/func_802A11D4_71D944.s +++ b/asm/nonmatchings/code_71D770/func_802A11D4_71D944.s @@ -16,13 +16,13 @@ glabel func_802A11D4_71D944 /* 71D970 802A1200 0C099CAB */ jal heroes_is_ability_active /* 71D974 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 71D978 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 71D97C 802A120C 00000000 */ nop +/* 71D97C 802A120C 00000000 */ nop /* 71D980 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 71D984 802A1214 00000000 */ nop +/* 71D984 802A1214 00000000 */ nop /* 71D988 802A1218 3C04802A */ lui $a0, %hi(D_802A1EE0) /* 71D98C 802A121C 8C841EE0 */ lw $a0, %lo(D_802A1EE0)($a0) /* 71D990 802A1220 0C05123D */ jal free_icon -/* 71D994 802A1224 00000000 */ nop +/* 71D994 802A1224 00000000 */ nop .L802A1228: /* 71D998 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 71D99C 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_71D770/func_802A123C_71D9AC.s b/asm/nonmatchings/code_71D770/func_802A123C_71D9AC.s index 59ec55c979..b9d13e9fcf 100644 --- a/asm/nonmatchings/code_71D770/func_802A123C_71D9AC.s +++ b/asm/nonmatchings/code_71D770/func_802A123C_71D9AC.s @@ -25,14 +25,14 @@ glabel func_802A123C_71D9AC /* 71D9FC 802A128C 00521021 */ addu $v0, $v0, $s2 /* 71DA00 802A1290 02221023 */ subu $v0, $s1, $v0 /* 71DA04 802A1294 4482B000 */ mtc1 $v0, $f22 -/* 71DA08 802A1298 00000000 */ nop +/* 71DA08 802A1298 00000000 */ nop /* 71DA0C 802A129C 4680B5A0 */ cvt.s.w $f22, $f22 /* 71DA10 802A12A0 0C00A67F */ jal rand_int /* 71DA14 802A12A4 24040064 */ addiu $a0, $zero, 0x64 /* 71DA18 802A12A8 2442FFCE */ addiu $v0, $v0, -0x32 /* 71DA1C 802A12AC 02021023 */ subu $v0, $s0, $v0 /* 71DA20 802A12B0 4482A000 */ mtc1 $v0, $f20 -/* 71DA24 802A12B4 00000000 */ nop +/* 71DA24 802A12B4 00000000 */ nop /* 71DA28 802A12B8 4680A520 */ cvt.s.w $f20, $f20 /* 71DA2C 802A12BC 0C00A67F */ jal rand_int /* 71DA30 802A12C0 2404000A */ addiu $a0, $zero, 0xa @@ -44,34 +44,34 @@ glabel func_802A123C_71D9AC /* 71DA44 802A12D4 244200C8 */ addiu $v0, $v0, 0xc8 /* 71DA48 802A12D8 02221023 */ subu $v0, $s1, $v0 /* 71DA4C 802A12DC 4482B000 */ mtc1 $v0, $f22 -/* 71DA50 802A12E0 00000000 */ nop +/* 71DA50 802A12E0 00000000 */ nop /* 71DA54 802A12E4 4680B5A0 */ cvt.s.w $f22, $f22 /* 71DA58 802A12E8 0C00A67F */ jal rand_int /* 71DA5C 802A12EC 24040064 */ addiu $a0, $zero, 0x64 /* 71DA60 802A12F0 2442FFCE */ addiu $v0, $v0, -0x32 /* 71DA64 802A12F4 02021023 */ subu $v0, $s0, $v0 /* 71DA68 802A12F8 4482A000 */ mtc1 $v0, $f20 -/* 71DA6C 802A12FC 00000000 */ nop +/* 71DA6C 802A12FC 00000000 */ nop /* 71DA70 802A1300 4680A520 */ cvt.s.w $f20, $f20 /* 71DA74 802A1304 0C00A67F */ jal rand_int /* 71DA78 802A1308 2404000A */ addiu $a0, $zero, 0xa /* 71DA7C 802A130C 24040003 */ addiu $a0, $zero, 3 .L802A1310: /* 71DA80 802A1310 44911000 */ mtc1 $s1, $f2 -/* 71DA84 802A1314 00000000 */ nop +/* 71DA84 802A1314 00000000 */ nop /* 71DA88 802A1318 468010A0 */ cvt.s.w $f2, $f2 /* 71DA8C 802A131C 44051000 */ mfc1 $a1, $f2 /* 71DA90 802A1320 44921000 */ mtc1 $s2, $f2 -/* 71DA94 802A1324 00000000 */ nop +/* 71DA94 802A1324 00000000 */ nop /* 71DA98 802A1328 468010A0 */ cvt.s.w $f2, $f2 /* 71DA9C 802A132C 44061000 */ mfc1 $a2, $f2 /* 71DAA0 802A1330 44901000 */ mtc1 $s0, $f2 -/* 71DAA4 802A1334 00000000 */ nop +/* 71DAA4 802A1334 00000000 */ nop /* 71DAA8 802A1338 468010A0 */ cvt.s.w $f2, $f2 /* 71DAAC 802A133C 24420007 */ addiu $v0, $v0, 7 /* 71DAB0 802A1340 44071000 */ mfc1 $a3, $f2 /* 71DAB4 802A1344 44820000 */ mtc1 $v0, $f0 -/* 71DAB8 802A1348 00000000 */ nop +/* 71DAB8 802A1348 00000000 */ nop /* 71DABC 802A134C 46800020 */ cvt.s.w $f0, $f0 /* 71DAC0 802A1350 E7B60010 */ swc1 $f22, 0x10($sp) /* 71DAC4 802A1354 AFA00014 */ sw $zero, 0x14($sp) diff --git a/asm/nonmatchings/code_71D770/func_802A1388_71DAF8.s b/asm/nonmatchings/code_71D770/func_802A1388_71DAF8.s index 586a38e12a..eb3ed04313 100644 --- a/asm/nonmatchings/code_71D770/func_802A1388_71DAF8.s +++ b/asm/nonmatchings/code_71D770/func_802A1388_71DAF8.s @@ -23,15 +23,15 @@ glabel func_802A1388_71DAF8 /* 71DB40 802A13D0 0040802D */ daddu $s0, $v0, $zero /* 71DB44 802A13D4 24040002 */ addiu $a0, $zero, 2 /* 71DB48 802A13D8 44921000 */ mtc1 $s2, $f2 -/* 71DB4C 802A13DC 00000000 */ nop +/* 71DB4C 802A13DC 00000000 */ nop /* 71DB50 802A13E0 468010A0 */ cvt.s.w $f2, $f2 /* 71DB54 802A13E4 44051000 */ mfc1 $a1, $f2 /* 71DB58 802A13E8 44901000 */ mtc1 $s0, $f2 -/* 71DB5C 802A13EC 00000000 */ nop +/* 71DB5C 802A13EC 00000000 */ nop /* 71DB60 802A13F0 468010A0 */ cvt.s.w $f2, $f2 /* 71DB64 802A13F4 44061000 */ mfc1 $a2, $f2 /* 71DB68 802A13F8 44821000 */ mtc1 $v0, $f2 -/* 71DB6C 802A13FC 00000000 */ nop +/* 71DB6C 802A13FC 00000000 */ nop /* 71DB70 802A1400 468010A0 */ cvt.s.w $f2, $f2 /* 71DB74 802A1404 3C01BF80 */ lui $at, 0xbf80 /* 71DB78 802A1408 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_71D770/func_802A14D4_71DC44.s b/asm/nonmatchings/code_71D770/func_802A14D4_71DC44.s index 683c98a9d8..85f4e22a5e 100644 --- a/asm/nonmatchings/code_71D770/func_802A14D4_71DC44.s +++ b/asm/nonmatchings/code_71D770/func_802A14D4_71DC44.s @@ -35,4 +35,4 @@ glabel func_802A14D4_71DC44 /* 71DCB0 802A1540 8FB00010 */ lw $s0, 0x10($sp) /* 71DCB4 802A1544 03E00008 */ jr $ra /* 71DCB8 802A1548 27BD0018 */ addiu $sp, $sp, 0x18 -/* 71DCBC 802A154C 00000000 */ nop +/* 71DCBC 802A154C 00000000 */ nop diff --git a/asm/nonmatchings/code_71E650/func_802A1000_71E650.s b/asm/nonmatchings/code_71E650/func_802A1000_71E650.s index f14c6a1037..6bd0f1b8a3 100644 --- a/asm/nonmatchings/code_71E650/func_802A1000_71E650.s +++ b/asm/nonmatchings/code_71E650/func_802A1000_71E650.s @@ -29,7 +29,7 @@ glabel func_802A1000_71E650 /* 71E6B0 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 71E6B4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 71E6B8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 71E6BC 802A106C 00000000 */ nop +/* 71E6BC 802A106C 00000000 */ nop /* 71E6C0 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 71E6C4 802A1074 0C099CAB */ jal heroes_is_ability_active /* 71E6C8 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_71E650 /* 71E764 802A1114 24040001 */ addiu $a0, $zero, 1 /* 71E768 802A1118 0212102A */ slt $v0, $s0, $s2 /* 71E76C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 71E770 802A1120 00000000 */ nop +/* 71E770 802A1120 00000000 */ nop .L802A1124: /* 71E774 802A1124 00101040 */ sll $v0, $s0, 1 /* 71E778 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_71E650 /* 71E7BC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 71E7C0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 71E7C4 802A1174 0C050529 */ jal create_icon -/* 71E7C8 802A1178 00000000 */ nop +/* 71E7C8 802A1178 00000000 */ nop /* 71E7CC 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 71E7D0 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 71E7D4 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_71E650/func_802A11D4_71E824.s b/asm/nonmatchings/code_71E650/func_802A11D4_71E824.s index 2c52e85548..7b3e255495 100644 --- a/asm/nonmatchings/code_71E650/func_802A11D4_71E824.s +++ b/asm/nonmatchings/code_71E650/func_802A11D4_71E824.s @@ -16,13 +16,13 @@ glabel func_802A11D4_71E824 /* 71E850 802A1200 0C099CAB */ jal heroes_is_ability_active /* 71E854 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 71E858 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 71E85C 802A120C 00000000 */ nop +/* 71E85C 802A120C 00000000 */ nop /* 71E860 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 71E864 802A1214 00000000 */ nop +/* 71E864 802A1214 00000000 */ nop /* 71E868 802A1218 3C04802A */ lui $a0, %hi(D_802A3F50) /* 71E86C 802A121C 8C843F50 */ lw $a0, %lo(D_802A3F50)($a0) /* 71E870 802A1220 0C05123D */ jal free_icon -/* 71E874 802A1224 00000000 */ nop +/* 71E874 802A1224 00000000 */ nop .L802A1228: /* 71E878 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 71E87C 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_71E650/func_802A123C_71E88C.s b/asm/nonmatchings/code_71E650/func_802A123C_71E88C.s index a7aff27c38..fee4293c97 100644 --- a/asm/nonmatchings/code_71E650/func_802A123C_71E88C.s +++ b/asm/nonmatchings/code_71E650/func_802A123C_71E88C.s @@ -33,12 +33,12 @@ glabel func_802A123C_71E88C /* 71E8F8 802A12A8 10600007 */ beqz $v1, .L802A12C8 /* 71E8FC 802A12AC 0000102D */ daddu $v0, $zero, $zero /* 71E900 802A12B0 080A85C0 */ j .L802A1700 -/* 71E904 802A12B4 00000000 */ nop +/* 71E904 802A12B4 00000000 */ nop .L802A12B8: /* 71E908 802A12B8 10620104 */ beq $v1, $v0, .L802A16CC /* 71E90C 802A12BC 0000102D */ daddu $v0, $zero, $zero /* 71E910 802A12C0 080A85C0 */ j .L802A1700 -/* 71E914 802A12C4 00000000 */ nop +/* 71E914 802A12C4 00000000 */ nop .L802A12C8: /* 71E918 802A12C8 0000882D */ daddu $s1, $zero, $zero /* 71E91C 802A12CC 3C17802A */ lui $s7, %hi(D_802A3F00) @@ -100,7 +100,7 @@ glabel func_802A123C_71E88C /* 71E9F8 802A13A8 00A0302D */ daddu $a2, $a1, $zero /* 71E9FC 802A13AC 2A22000A */ slti $v0, $s1, 0xa /* 71EA00 802A13B0 1440FFD6 */ bnez $v0, .L802A130C -/* 71EA04 802A13B4 00000000 */ nop +/* 71EA04 802A13B4 00000000 */ nop /* 71EA08 802A13B8 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 71EA0C 802A13BC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 71EA10 802A13C0 94440134 */ lhu $a0, 0x134($v0) @@ -124,7 +124,7 @@ glabel func_802A123C_71E88C /* 71EA54 802A1404 C7C00000 */ lwc1 $f0, ($fp) /* 71EA58 802A1408 3C0140C0 */ lui $at, 0x40c0 /* 71EA5C 802A140C 44811000 */ mtc1 $at, $f2 -/* 71EA60 802A1410 00000000 */ nop +/* 71EA60 802A1410 00000000 */ nop /* 71EA64 802A1414 46020000 */ add.s $f0, $f0, $f2 /* 71EA68 802A1418 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 71EA6C 802A141C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) @@ -189,7 +189,7 @@ glabel func_802A123C_71E88C /* 71EB50 802A1500 4600C10D */ trunc.w.s $f4, $f24 /* 71EB54 802A1504 44072000 */ mfc1 $a3, $f4 /* 71EB58 802A1508 0C0B50D9 */ jal func_802D4364 -/* 71EB5C 802A150C 00000000 */ nop +/* 71EB5C 802A150C 00000000 */ nop /* 71EB60 802A1510 56A00038 */ bnel $s5, $zero, .L802A15F4 /* 71EB64 802A1514 2694000C */ addiu $s4, $s4, 0xc /* 71EB68 802A1518 8FA80060 */ lw $t0, 0x60($sp) @@ -211,33 +211,33 @@ glabel func_802A123C_71E88C /* 71EBA8 802A1558 54800026 */ bnel $a0, $zero, .L802A15F4 /* 71EBAC 802A155C 2694000C */ addiu $s4, $s4, 0xc /* 71EBB0 802A1560 44800000 */ mtc1 $zero, $f0 -/* 71EBB4 802A1564 00000000 */ nop +/* 71EBB4 802A1564 00000000 */ nop /* 71EBB8 802A1568 4616003C */ c.lt.s $f0, $f22 -/* 71EBBC 802A156C 00000000 */ nop +/* 71EBBC 802A156C 00000000 */ nop /* 71EBC0 802A1570 45000013 */ bc1f .L802A15C0 -/* 71EBC4 802A1574 00000000 */ nop +/* 71EBC4 802A1574 00000000 */ nop /* 71EBC8 802A1578 3C0142C8 */ lui $at, 0x42c8 /* 71EBCC 802A157C 44810000 */ mtc1 $at, $f0 -/* 71EBD0 802A1580 00000000 */ nop +/* 71EBD0 802A1580 00000000 */ nop /* 71EBD4 802A1584 4616003C */ c.lt.s $f0, $f22 -/* 71EBD8 802A1588 00000000 */ nop +/* 71EBD8 802A1588 00000000 */ nop /* 71EBDC 802A158C 45000005 */ bc1f .L802A15A4 /* 71EBE0 802A1590 4600B506 */ mov.s $f20, $f22 /* 71EBE4 802A1594 3C014248 */ lui $at, 0x4248 /* 71EBE8 802A1598 44810000 */ mtc1 $at, $f0 -/* 71EBEC 802A159C 00000000 */ nop +/* 71EBEC 802A159C 00000000 */ nop /* 71EBF0 802A15A0 4600A501 */ sub.s $f20, $f20, $f0 .L802A15A4: /* 71EBF4 802A15A4 4600A10D */ trunc.w.s $f4, $f20 /* 71EBF8 802A15A8 44042000 */ mfc1 $a0, $f4 /* 71EBFC 802A15AC 0C00A67F */ jal rand_int -/* 71EC00 802A15B0 00000000 */ nop +/* 71EC00 802A15B0 00000000 */ nop /* 71EC04 802A15B4 4482A000 */ mtc1 $v0, $f20 -/* 71EC08 802A15B8 00000000 */ nop +/* 71EC08 802A15B8 00000000 */ nop /* 71EC0C 802A15BC 4680A520 */ cvt.s.w $f20, $f20 .L802A15C0: /* 71EC10 802A15C0 4616D03C */ c.lt.s $f26, $f22 -/* 71EC14 802A15C4 00000000 */ nop +/* 71EC14 802A15C4 00000000 */ nop /* 71EC18 802A15C8 45000003 */ bc1f .L802A15D8 /* 71EC1C 802A15CC 24040003 */ addiu $a0, $zero, 3 /* 71EC20 802A15D0 461AB001 */ sub.s $f0, $f22, $f26 @@ -262,7 +262,7 @@ glabel func_802A123C_71E88C /* 71EC64 802A1614 94420134 */ lhu $v0, 0x134($v0) /* 71EC68 802A1618 30420001 */ andi $v0, $v0, 1 /* 71EC6C 802A161C 10400020 */ beqz $v0, .L802A16A0 -/* 71EC70 802A1620 00000000 */ nop +/* 71EC70 802A1620 00000000 */ nop /* 71EC74 802A1624 0C00A67F */ jal rand_int /* 71EC78 802A1628 24040009 */ addiu $a0, $zero, 9 /* 71EC7C 802A162C 00021840 */ sll $v1, $v0, 1 @@ -298,9 +298,9 @@ glabel func_802A123C_71E88C /* 71ECF0 802A16A0 C7C20000 */ lwc1 $f2, ($fp) /* 71ECF4 802A16A4 3C0143A0 */ lui $at, 0x43a0 /* 71ECF8 802A16A8 44810000 */ mtc1 $at, $f0 -/* 71ECFC 802A16AC 00000000 */ nop +/* 71ECFC 802A16AC 00000000 */ nop /* 71ED00 802A16B0 4602003E */ c.le.s $f0, $f2 -/* 71ED04 802A16B4 00000000 */ nop +/* 71ED04 802A16B4 00000000 */ nop /* 71ED08 802A16B8 45000010 */ bc1f .L802A16FC /* 71ED0C 802A16BC 24020002 */ addiu $v0, $zero, 2 /* 71ED10 802A16C0 8FA80060 */ lw $t0, 0x60($sp) @@ -319,7 +319,7 @@ glabel func_802A123C_71E88C /* 71ED3C 802A16EC 1440FFFA */ bnez $v0, .L802A16D8 /* 71ED40 802A16F0 24020002 */ addiu $v0, $zero, 2 /* 71ED44 802A16F4 080A85C0 */ j .L802A1700 -/* 71ED48 802A16F8 00000000 */ nop +/* 71ED48 802A16F8 00000000 */ nop .L802A16FC: /* 71ED4C 802A16FC 0000102D */ daddu $v0, $zero, $zero .L802A1700: diff --git a/asm/nonmatchings/code_71E650/func_802A1740_71ED90.s b/asm/nonmatchings/code_71E650/func_802A1740_71ED90.s index eb0799912a..781d8cb57e 100644 --- a/asm/nonmatchings/code_71E650/func_802A1740_71ED90.s +++ b/asm/nonmatchings/code_71E650/func_802A1740_71ED90.s @@ -39,11 +39,11 @@ glabel func_802A1740_71ED90 /* 71EE10 802A17C0 0220202D */ daddu $a0, $s1, $zero /* 71EE14 802A17C4 82230218 */ lb $v1, 0x218($s1) /* 71EE18 802A17C8 1460000A */ bnez $v1, .L802A17F4 -/* 71EE1C 802A17CC 00000000 */ nop +/* 71EE1C 802A17CC 00000000 */ nop /* 71EE20 802A17D0 8C42007C */ lw $v0, 0x7c($v0) /* 71EE24 802A17D4 30420020 */ andi $v0, $v0, 0x20 /* 71EE28 802A17D8 14400006 */ bnez $v0, .L802A17F4 -/* 71EE2C 802A17DC 00000000 */ nop +/* 71EE2C 802A17DC 00000000 */ nop /* 71EE30 802A17E0 C62C018C */ lwc1 $f12, 0x18c($s1) /* 71EE34 802A17E4 46146300 */ add.s $f12, $f12, $f20 /* 71EE38 802A17E8 0C00A6C9 */ jal clamp_angle diff --git a/asm/nonmatchings/code_71E650/func_802A1848_71EE98.s b/asm/nonmatchings/code_71E650/func_802A1848_71EE98.s index 4730afc1a5..f4b172baaf 100644 --- a/asm/nonmatchings/code_71E650/func_802A1848_71EE98.s +++ b/asm/nonmatchings/code_71E650/func_802A1848_71EE98.s @@ -36,25 +36,25 @@ glabel func_802A1848_71EE98 /* 71EF0C 802A18BC 86240000 */ lh $a0, ($s1) /* 71EF10 802A18C0 0040802D */ daddu $s0, $v0, $zero /* 71EF14 802A18C4 12000017 */ beqz $s0, .L802A1924 -/* 71EF18 802A18C8 00000000 */ nop +/* 71EF18 802A18C8 00000000 */ nop /* 71EF1C 802A18CC 86250002 */ lh $a1, 2($s1) /* 71EF20 802A18D0 0C099117 */ jal get_actor_part /* 71EF24 802A18D4 0200202D */ daddu $a0, $s0, $zero /* 71EF28 802A18D8 82030218 */ lb $v1, 0x218($s0) /* 71EF2C 802A18DC 14600011 */ bnez $v1, .L802A1924 -/* 71EF30 802A18E0 00000000 */ nop +/* 71EF30 802A18E0 00000000 */ nop /* 71EF34 802A18E4 8C42007C */ lw $v0, 0x7c($v0) /* 71EF38 802A18E8 30420020 */ andi $v0, $v0, 0x20 /* 71EF3C 802A18EC 1440000D */ bnez $v0, .L802A1924 -/* 71EF40 802A18F0 00000000 */ nop +/* 71EF40 802A18F0 00000000 */ nop /* 71EF44 802A18F4 C600018C */ lwc1 $f0, 0x18c($s0) /* 71EF48 802A18F8 4614003C */ c.lt.s $f0, $f20 -/* 71EF4C 802A18FC 00000000 */ nop +/* 71EF4C 802A18FC 00000000 */ nop /* 71EF50 802A1900 45000008 */ bc1f .L802A1924 -/* 71EF54 802A1904 00000000 */ nop +/* 71EF54 802A1904 00000000 */ nop /* 71EF58 802A1908 46160000 */ add.s $f0, $f0, $f22 /* 71EF5C 802A190C 4600A03E */ c.le.s $f20, $f0 -/* 71EF60 802A1910 00000000 */ nop +/* 71EF60 802A1910 00000000 */ nop /* 71EF64 802A1914 45000002 */ bc1f .L802A1920 /* 71EF68 802A1918 E600018C */ swc1 $f0, 0x18c($s0) /* 71EF6C 802A191C E614018C */ swc1 $f20, 0x18c($s0) @@ -79,5 +79,5 @@ glabel func_802A1848_71EE98 /* 71EFAC 802A195C 00021040 */ sll $v0, $v0, 1 /* 71EFB0 802A1960 03E00008 */ jr $ra /* 71EFB4 802A1964 27BD0038 */ addiu $sp, $sp, 0x38 -/* 71EFB8 802A1968 00000000 */ nop -/* 71EFBC 802A196C 00000000 */ nop +/* 71EFB8 802A1968 00000000 */ nop +/* 71EFBC 802A196C 00000000 */ nop diff --git a/asm/nonmatchings/code_7215A0/func_802A1000_7215A0.s b/asm/nonmatchings/code_7215A0/func_802A1000_7215A0.s index 782a6afccd..32f285285f 100644 --- a/asm/nonmatchings/code_7215A0/func_802A1000_7215A0.s +++ b/asm/nonmatchings/code_7215A0/func_802A1000_7215A0.s @@ -29,7 +29,7 @@ glabel func_802A1000_7215A0 /* 721600 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 721604 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 721608 802A1068 44820000 */ mtc1 $v0, $f0 -/* 72160C 802A106C 00000000 */ nop +/* 72160C 802A106C 00000000 */ nop /* 721610 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 721614 802A1074 0C099CAB */ jal heroes_is_ability_active /* 721618 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_7215A0 /* 7216B4 802A1114 24040001 */ addiu $a0, $zero, 1 /* 7216B8 802A1118 0212102A */ slt $v0, $s0, $s2 /* 7216BC 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 7216C0 802A1120 00000000 */ nop +/* 7216C0 802A1120 00000000 */ nop .L802A1124: /* 7216C4 802A1124 00101040 */ sll $v0, $s0, 1 /* 7216C8 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_7215A0 /* 72170C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 721710 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 721714 802A1174 0C050529 */ jal create_icon -/* 721718 802A1178 00000000 */ nop +/* 721718 802A1178 00000000 */ nop /* 72171C 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 721720 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 721724 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_7215A0/func_802A11D4_721774.s b/asm/nonmatchings/code_7215A0/func_802A11D4_721774.s index f1320050ee..b9ac4be6ea 100644 --- a/asm/nonmatchings/code_7215A0/func_802A11D4_721774.s +++ b/asm/nonmatchings/code_7215A0/func_802A11D4_721774.s @@ -16,13 +16,13 @@ glabel func_802A11D4_721774 /* 7217A0 802A1200 0C099CAB */ jal heroes_is_ability_active /* 7217A4 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 7217A8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 7217AC 802A120C 00000000 */ nop +/* 7217AC 802A120C 00000000 */ nop /* 7217B0 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 7217B4 802A1214 00000000 */ nop +/* 7217B4 802A1214 00000000 */ nop /* 7217B8 802A1218 3C04802A */ lui $a0, %hi(D_802A1A60) /* 7217BC 802A121C 8C841A60 */ lw $a0, %lo(D_802A1A60)($a0) /* 7217C0 802A1220 0C05123D */ jal free_icon -/* 7217C4 802A1224 00000000 */ nop +/* 7217C4 802A1224 00000000 */ nop .L802A1228: /* 7217C8 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 7217CC 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_7215A0/func_802A123C_7217DC.s b/asm/nonmatchings/code_7215A0/func_802A123C_7217DC.s index 70b444b1d5..93d3cbd6ba 100644 --- a/asm/nonmatchings/code_7215A0/func_802A123C_7217DC.s +++ b/asm/nonmatchings/code_7215A0/func_802A123C_7217DC.s @@ -25,7 +25,7 @@ glabel func_802A123C_7217DC /* 721828 802A1288 1062000D */ beq $v1, $v0, .L802A12C0 /* 72182C 802A128C 0000102D */ daddu $v0, $zero, $zero /* 721830 802A1290 080A84E9 */ j .L802A13A4 -/* 721834 802A1294 00000000 */ nop +/* 721834 802A1294 00000000 */ nop .L802A1298: /* 721838 802A1298 0200202D */ daddu $a0, $s0, $zero /* 72183C 802A129C 8E460084 */ lw $a2, 0x84($s2) @@ -50,10 +50,10 @@ glabel func_802A123C_7217DC /* 721880 802A12E0 2442FFF6 */ addiu $v0, $v0, -0xa /* 721884 802A12E4 C6020188 */ lwc1 $f2, 0x188($s0) /* 721888 802A12E8 44820000 */ mtc1 $v0, $f0 -/* 72188C 802A12EC 00000000 */ nop +/* 72188C 802A12EC 00000000 */ nop /* 721890 802A12F0 46800020 */ cvt.s.w $f0, $f0 /* 721894 802A12F4 46020002 */ mul.s $f0, $f0, $f2 -/* 721898 802A12F8 00000000 */ nop +/* 721898 802A12F8 00000000 */ nop /* 72189C 802A12FC C6140144 */ lwc1 $f20, 0x144($s0) /* 7218A0 802A1300 24040014 */ addiu $a0, $zero, 0x14 /* 7218A4 802A1304 0C00A67F */ jal rand_int @@ -61,10 +61,10 @@ glabel func_802A123C_7217DC /* 7218AC 802A130C 2442000A */ addiu $v0, $v0, 0xa /* 7218B0 802A1310 C6020188 */ lwc1 $f2, 0x188($s0) /* 7218B4 802A1314 44820000 */ mtc1 $v0, $f0 -/* 7218B8 802A1318 00000000 */ nop +/* 7218B8 802A1318 00000000 */ nop /* 7218BC 802A131C 46800020 */ cvt.s.w $f0, $f0 /* 7218C0 802A1320 46020002 */ mul.s $f0, $f0, $f2 -/* 7218C4 802A1324 00000000 */ nop +/* 7218C4 802A1324 00000000 */ nop /* 7218C8 802A1328 C6020148 */ lwc1 $f2, 0x148($s0) /* 7218CC 802A132C 46001080 */ add.s $f2, $f2, $f0 /* 7218D0 802A1330 C600014C */ lwc1 $f0, 0x14c($s0) @@ -79,7 +79,7 @@ glabel func_802A123C_7217DC /* 7218F4 802A1354 AFB40014 */ sw $s4, 0x14($sp) /* 7218F8 802A1358 2A22000A */ slti $v0, $s1, 0xa /* 7218FC 802A135C 1440FFDE */ bnez $v0, .L802A12D8 -/* 721900 802A1360 00000000 */ nop +/* 721900 802A1360 00000000 */ nop /* 721904 802A1364 8E420074 */ lw $v0, 0x74($s2) /* 721908 802A1368 1440000C */ bnez $v0, .L802A139C /* 72190C 802A136C 2442FFFF */ addiu $v0, $v0, -1 diff --git a/asm/nonmatchings/code_722000/func_802A1000_722000.s b/asm/nonmatchings/code_722000/func_802A1000_722000.s index 40288cb1ad..a5c15e33f3 100644 --- a/asm/nonmatchings/code_722000/func_802A1000_722000.s +++ b/asm/nonmatchings/code_722000/func_802A1000_722000.s @@ -29,7 +29,7 @@ glabel func_802A1000_722000 /* 722060 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 722064 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 722068 802A1068 44820000 */ mtc1 $v0, $f0 -/* 72206C 802A106C 00000000 */ nop +/* 72206C 802A106C 00000000 */ nop /* 722070 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 722074 802A1074 0C099CAB */ jal heroes_is_ability_active /* 722078 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_722000 /* 722114 802A1114 24040001 */ addiu $a0, $zero, 1 /* 722118 802A1118 0212102A */ slt $v0, $s0, $s2 /* 72211C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 722120 802A1120 00000000 */ nop +/* 722120 802A1120 00000000 */ nop .L802A1124: /* 722124 802A1124 00101040 */ sll $v0, $s0, 1 /* 722128 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_722000 /* 72216C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 722170 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 722174 802A1174 0C050529 */ jal create_icon -/* 722178 802A1178 00000000 */ nop +/* 722178 802A1178 00000000 */ nop /* 72217C 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 722180 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 722184 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_722000/func_802A11D4_7221D4.s b/asm/nonmatchings/code_722000/func_802A11D4_7221D4.s index 9c33f9c052..7beb1dce15 100644 --- a/asm/nonmatchings/code_722000/func_802A11D4_7221D4.s +++ b/asm/nonmatchings/code_722000/func_802A11D4_7221D4.s @@ -16,13 +16,13 @@ glabel func_802A11D4_7221D4 /* 722200 802A1200 0C099CAB */ jal heroes_is_ability_active /* 722204 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 722208 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 72220C 802A120C 00000000 */ nop +/* 72220C 802A120C 00000000 */ nop /* 722210 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 722214 802A1214 00000000 */ nop +/* 722214 802A1214 00000000 */ nop /* 722218 802A1218 3C04802A */ lui $a0, %hi(D_802A1B40) /* 72221C 802A121C 8C841B40 */ lw $a0, %lo(D_802A1B40)($a0) /* 722220 802A1220 0C05123D */ jal free_icon -/* 722224 802A1224 00000000 */ nop +/* 722224 802A1224 00000000 */ nop .L802A1228: /* 722228 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 72222C 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_722000/func_802A123C_72223C.s b/asm/nonmatchings/code_722000/func_802A123C_72223C.s index 7c5afe46c1..ebbe7fac6c 100644 --- a/asm/nonmatchings/code_722000/func_802A123C_72223C.s +++ b/asm/nonmatchings/code_722000/func_802A123C_72223C.s @@ -23,13 +23,13 @@ glabel func_802A123C_72223C .L802A1284: /* 722284 802A1284 82020216 */ lb $v0, 0x216($s0) /* 722288 802A1288 1040000C */ beqz $v0, .L802A12BC -/* 72228C 802A128C 00000000 */ nop +/* 72228C 802A128C 00000000 */ nop /* 722290 802A1290 A2000217 */ sb $zero, 0x217($s0) /* 722294 802A1294 12200006 */ beqz $s1, .L802A12B0 /* 722298 802A1298 A2000216 */ sb $zero, 0x216($s0) /* 72229C 802A129C 24020100 */ addiu $v0, $zero, 0x100 /* 7222A0 802A12A0 16220003 */ bne $s1, $v0, .L802A12B0 -/* 7222A4 802A12A4 00000000 */ nop +/* 7222A4 802A12A4 00000000 */ nop /* 7222A8 802A12A8 0C09F7A0 */ jal dispatch_event_partner /* 7222AC 802A12AC 24040031 */ addiu $a0, $zero, 0x31 .L802A12B0: diff --git a/asm/nonmatchings/code_722B40/func_802A1000_722B40.s b/asm/nonmatchings/code_722B40/func_802A1000_722B40.s index f22118afe5..cc90b937a8 100644 --- a/asm/nonmatchings/code_722B40/func_802A1000_722B40.s +++ b/asm/nonmatchings/code_722B40/func_802A1000_722B40.s @@ -29,7 +29,7 @@ glabel func_802A1000_722B40 /* 722BA0 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 722BA4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 722BA8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 722BAC 802A106C 00000000 */ nop +/* 722BAC 802A106C 00000000 */ nop /* 722BB0 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 722BB4 802A1074 0C099CAB */ jal heroes_is_ability_active /* 722BB8 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_722B40 /* 722C54 802A1114 24040001 */ addiu $a0, $zero, 1 /* 722C58 802A1118 0212102A */ slt $v0, $s0, $s2 /* 722C5C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 722C60 802A1120 00000000 */ nop +/* 722C60 802A1120 00000000 */ nop .L802A1124: /* 722C64 802A1124 00101040 */ sll $v0, $s0, 1 /* 722C68 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_722B40 /* 722CAC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 722CB0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 722CB4 802A1174 0C050529 */ jal create_icon -/* 722CB8 802A1178 00000000 */ nop +/* 722CB8 802A1178 00000000 */ nop /* 722CBC 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 722CC0 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 722CC4 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_722B40/func_802A11D4_722D14.s b/asm/nonmatchings/code_722B40/func_802A11D4_722D14.s index a7e75a2257..b3e6542173 100644 --- a/asm/nonmatchings/code_722B40/func_802A11D4_722D14.s +++ b/asm/nonmatchings/code_722B40/func_802A11D4_722D14.s @@ -16,13 +16,13 @@ glabel func_802A11D4_722D14 /* 722D40 802A1200 0C099CAB */ jal heroes_is_ability_active /* 722D44 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 722D48 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 722D4C 802A120C 00000000 */ nop +/* 722D4C 802A120C 00000000 */ nop /* 722D50 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 722D54 802A1214 00000000 */ nop +/* 722D54 802A1214 00000000 */ nop /* 722D58 802A1218 3C04802A */ lui $a0, %hi(D_802A1C40) /* 722D5C 802A121C 8C841C40 */ lw $a0, %lo(D_802A1C40)($a0) /* 722D60 802A1220 0C05123D */ jal free_icon -/* 722D64 802A1224 00000000 */ nop +/* 722D64 802A1224 00000000 */ nop .L802A1228: /* 722D68 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 722D6C 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_722B40/func_802A123C_722D7C.s b/asm/nonmatchings/code_722B40/func_802A123C_722D7C.s index dd153047ad..85c4a5820c 100644 --- a/asm/nonmatchings/code_722B40/func_802A123C_722D7C.s +++ b/asm/nonmatchings/code_722B40/func_802A123C_722D7C.s @@ -28,16 +28,16 @@ glabel func_802A123C_722D7C /* 722DD8 802A1298 00021882 */ srl $v1, $v0, 2 /* 722DDC 802A129C 00431021 */ addu $v0, $v0, $v1 /* 722DE0 802A12A0 44823000 */ mtc1 $v0, $f6 -/* 722DE4 802A12A4 00000000 */ nop +/* 722DE4 802A12A4 00000000 */ nop /* 722DE8 802A12A8 468031A0 */ cvt.s.w $f6, $f6 /* 722DEC 802A12AC 46003182 */ mul.s $f6, $f6, $f0 -/* 722DF0 802A12B0 00000000 */ nop +/* 722DF0 802A12B0 00000000 */ nop /* 722DF4 802A12B4 2482FFFE */ addiu $v0, $a0, -2 /* 722DF8 802A12B8 44822000 */ mtc1 $v0, $f4 -/* 722DFC 802A12BC 00000000 */ nop +/* 722DFC 802A12BC 00000000 */ nop /* 722E00 802A12C0 46802120 */ cvt.s.w $f4, $f4 /* 722E04 802A12C4 46002102 */ mul.s $f4, $f4, $f0 -/* 722E08 802A12C8 00000000 */ nop +/* 722E08 802A12C8 00000000 */ nop /* 722E0C 802A12CC C6020148 */ lwc1 $f2, 0x148($s0) /* 722E10 802A12D0 C6160144 */ lwc1 $f22, 0x144($s0) /* 722E14 802A12D4 C618014C */ lwc1 $f24, 0x14c($s0) @@ -45,7 +45,7 @@ glabel func_802A123C_722D7C /* 722E1C 802A12DC 000810C2 */ srl $v0, $t0, 3 /* 722E20 802A12E0 304200FF */ andi $v0, $v0, 0xff /* 722E24 802A12E4 44820000 */ mtc1 $v0, $f0 -/* 722E28 802A12E8 00000000 */ nop +/* 722E28 802A12E8 00000000 */ nop /* 722E2C 802A12EC 46800020 */ cvt.s.w $f0, $f0 /* 722E30 802A12F0 4600320D */ trunc.w.s $f8, $f6 /* 722E34 802A12F4 44114000 */ mfc1 $s1, $f8 @@ -57,7 +57,7 @@ glabel func_802A123C_722D7C /* 722E4C 802A130C 46001500 */ add.s $f20, $f2, $f0 /* 722E50 802A1310 00041042 */ srl $v0, $a0, 1 /* 722E54 802A1314 44820000 */ mtc1 $v0, $f0 -/* 722E58 802A1318 00000000 */ nop +/* 722E58 802A1318 00000000 */ nop /* 722E5C 802A131C 46800020 */ cvt.s.w $f0, $f0 /* 722E60 802A1320 4600A501 */ sub.s $f20, $f20, $f0 .L802A1324: @@ -68,11 +68,11 @@ glabel func_802A123C_722D7C /* 722E74 802A1334 4406A000 */ mfc1 $a2, $f20 /* 722E78 802A1338 4407C000 */ mfc1 $a3, $f24 /* 722E7C 802A133C 44910000 */ mtc1 $s1, $f0 -/* 722E80 802A1340 00000000 */ nop +/* 722E80 802A1340 00000000 */ nop /* 722E84 802A1344 46800020 */ cvt.s.w $f0, $f0 /* 722E88 802A1348 E7A00010 */ swc1 $f0, 0x10($sp) /* 722E8C 802A134C 44920000 */ mtc1 $s2, $f0 -/* 722E90 802A1350 00000000 */ nop +/* 722E90 802A1350 00000000 */ nop /* 722E94 802A1354 46800020 */ cvt.s.w $f0, $f0 /* 722E98 802A1358 0C01C334 */ jal func_80070CD0 /* 722E9C 802A135C E7A00014 */ swc1 $f0, 0x14($sp) diff --git a/asm/nonmatchings/code_724240/func_802A1000_724240.s b/asm/nonmatchings/code_724240/func_802A1000_724240.s index 1fc7384597..992cdc6ee2 100644 --- a/asm/nonmatchings/code_724240/func_802A1000_724240.s +++ b/asm/nonmatchings/code_724240/func_802A1000_724240.s @@ -29,7 +29,7 @@ glabel func_802A1000_724240 /* 7242A0 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 7242A4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 7242A8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 7242AC 802A106C 00000000 */ nop +/* 7242AC 802A106C 00000000 */ nop /* 7242B0 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 7242B4 802A1074 0C099CAB */ jal heroes_is_ability_active /* 7242B8 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_724240 /* 724354 802A1114 24040001 */ addiu $a0, $zero, 1 /* 724358 802A1118 0212102A */ slt $v0, $s0, $s2 /* 72435C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 724360 802A1120 00000000 */ nop +/* 724360 802A1120 00000000 */ nop .L802A1124: /* 724364 802A1124 00101040 */ sll $v0, $s0, 1 /* 724368 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_724240 /* 7243AC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 7243B0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 7243B4 802A1174 0C050529 */ jal create_icon -/* 7243B8 802A1178 00000000 */ nop +/* 7243B8 802A1178 00000000 */ nop /* 7243BC 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 7243C0 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 7243C4 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_724240/func_802A11D4_724414.s b/asm/nonmatchings/code_724240/func_802A11D4_724414.s index a2683f7dc9..2cbf7ddf35 100644 --- a/asm/nonmatchings/code_724240/func_802A11D4_724414.s +++ b/asm/nonmatchings/code_724240/func_802A11D4_724414.s @@ -16,13 +16,13 @@ glabel func_802A11D4_724414 /* 724440 802A1200 0C099CAB */ jal heroes_is_ability_active /* 724444 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 724448 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 72444C 802A120C 00000000 */ nop +/* 72444C 802A120C 00000000 */ nop /* 724450 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 724454 802A1214 00000000 */ nop +/* 724454 802A1214 00000000 */ nop /* 724458 802A1218 3C04802A */ lui $a0, %hi(D_802A1AA0) /* 72445C 802A121C 8C841AA0 */ lw $a0, %lo(D_802A1AA0)($a0) /* 724460 802A1220 0C05123D */ jal free_icon -/* 724464 802A1224 00000000 */ nop +/* 724464 802A1224 00000000 */ nop .L802A1228: /* 724468 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 72446C 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_724240/func_802A123C_72447C.s b/asm/nonmatchings/code_724240/func_802A123C_72447C.s index c3b1ba7675..4ab022282f 100644 --- a/asm/nonmatchings/code_724240/func_802A123C_72447C.s +++ b/asm/nonmatchings/code_724240/func_802A123C_72447C.s @@ -28,15 +28,15 @@ glabel func_802A123C_72447C /* 7244D8 802A1298 0C0B1EAF */ jal get_variable /* 7244DC 802A129C 0040802D */ daddu $s0, $v0, $zero /* 7244E0 802A12A0 44930000 */ mtc1 $s3, $f0 -/* 7244E4 802A12A4 00000000 */ nop +/* 7244E4 802A12A4 00000000 */ nop /* 7244E8 802A12A8 46800020 */ cvt.s.w $f0, $f0 /* 7244EC 802A12AC 44050000 */ mfc1 $a1, $f0 /* 7244F0 802A12B0 44920000 */ mtc1 $s2, $f0 -/* 7244F4 802A12B4 00000000 */ nop +/* 7244F4 802A12B4 00000000 */ nop /* 7244F8 802A12B8 46800020 */ cvt.s.w $f0, $f0 /* 7244FC 802A12BC 44060000 */ mfc1 $a2, $f0 /* 724500 802A12C0 44900000 */ mtc1 $s0, $f0 -/* 724504 802A12C4 00000000 */ nop +/* 724504 802A12C4 00000000 */ nop /* 724508 802A12C8 46800020 */ cvt.s.w $f0, $f0 /* 72450C 802A12CC 44070000 */ mfc1 $a3, $f0 /* 724510 802A12D0 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/code_725F60/func_802A1000_725F60.s b/asm/nonmatchings/code_725F60/func_802A1000_725F60.s index a64258e4d5..ba8c9d6b80 100644 --- a/asm/nonmatchings/code_725F60/func_802A1000_725F60.s +++ b/asm/nonmatchings/code_725F60/func_802A1000_725F60.s @@ -29,7 +29,7 @@ glabel func_802A1000_725F60 /* 725FC0 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 725FC4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 725FC8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 725FCC 802A106C 00000000 */ nop +/* 725FCC 802A106C 00000000 */ nop /* 725FD0 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 725FD4 802A1074 0C099CAB */ jal heroes_is_ability_active /* 725FD8 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_725F60 /* 726074 802A1114 24040001 */ addiu $a0, $zero, 1 /* 726078 802A1118 0212102A */ slt $v0, $s0, $s2 /* 72607C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 726080 802A1120 00000000 */ nop +/* 726080 802A1120 00000000 */ nop .L802A1124: /* 726084 802A1124 00101040 */ sll $v0, $s0, 1 /* 726088 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_725F60 /* 7260CC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 7260D0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 7260D4 802A1174 0C050529 */ jal create_icon -/* 7260D8 802A1178 00000000 */ nop +/* 7260D8 802A1178 00000000 */ nop /* 7260DC 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 7260E0 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 7260E4 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_725F60/func_802A11D4_726134.s b/asm/nonmatchings/code_725F60/func_802A11D4_726134.s index aaeddc94f2..dc6c7eda29 100644 --- a/asm/nonmatchings/code_725F60/func_802A11D4_726134.s +++ b/asm/nonmatchings/code_725F60/func_802A11D4_726134.s @@ -16,13 +16,13 @@ glabel func_802A11D4_726134 /* 726160 802A1200 0C099CAB */ jal heroes_is_ability_active /* 726164 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 726168 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 72616C 802A120C 00000000 */ nop +/* 72616C 802A120C 00000000 */ nop /* 726170 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 726174 802A1214 00000000 */ nop +/* 726174 802A1214 00000000 */ nop /* 726178 802A1218 3C04802A */ lui $a0, %hi(D_802A1E70) /* 72617C 802A121C 8C841E70 */ lw $a0, %lo(D_802A1E70)($a0) /* 726180 802A1220 0C05123D */ jal free_icon -/* 726184 802A1224 00000000 */ nop +/* 726184 802A1224 00000000 */ nop .L802A1228: /* 726188 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 72618C 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_725F60/func_802A123C_72619C.s b/asm/nonmatchings/code_725F60/func_802A123C_72619C.s index ae10195acf..2f37053690 100644 --- a/asm/nonmatchings/code_725F60/func_802A123C_72619C.s +++ b/asm/nonmatchings/code_725F60/func_802A123C_72619C.s @@ -9,7 +9,7 @@ glabel func_802A123C_72619C /* 7261AC 802A124C AFBF0014 */ sw $ra, 0x14($sp) /* 7261B0 802A1250 82020210 */ lb $v0, 0x210($s0) /* 7261B4 802A1254 10400005 */ beqz $v0, .L802A126C -/* 7261B8 802A1258 00000000 */ nop +/* 7261B8 802A1258 00000000 */ nop /* 7261BC 802A125C 86040436 */ lh $a0, 0x436($s0) /* 7261C0 802A1260 A2000211 */ sb $zero, 0x211($s0) /* 7261C4 802A1264 0C011E26 */ jal func_80047898 @@ -17,7 +17,7 @@ glabel func_802A123C_72619C .L802A126C: /* 7261CC 802A126C 82020212 */ lb $v0, 0x212($s0) /* 7261D0 802A1270 10400005 */ beqz $v0, .L802A1288 -/* 7261D4 802A1274 00000000 */ nop +/* 7261D4 802A1274 00000000 */ nop /* 7261D8 802A1278 86040436 */ lh $a0, 0x436($s0) /* 7261DC 802A127C A2000213 */ sb $zero, 0x213($s0) /* 7261E0 802A1280 0C011E68 */ jal func_800479A0 @@ -25,13 +25,13 @@ glabel func_802A123C_72619C .L802A1288: /* 7261E8 802A1288 82020214 */ lb $v0, 0x214($s0) /* 7261EC 802A128C 10400003 */ beqz $v0, .L802A129C -/* 7261F0 802A1290 00000000 */ nop +/* 7261F0 802A1290 00000000 */ nop /* 7261F4 802A1294 A2000215 */ sb $zero, 0x215($s0) /* 7261F8 802A1298 A2000214 */ sb $zero, 0x214($s0) .L802A129C: /* 7261FC 802A129C 82020218 */ lb $v0, 0x218($s0) /* 726200 802A12A0 10400003 */ beqz $v0, .L802A12B0 -/* 726204 802A12A4 00000000 */ nop +/* 726204 802A12A4 00000000 */ nop /* 726208 802A12A8 A2000219 */ sb $zero, 0x219($s0) /* 72620C 802A12AC A2000218 */ sb $zero, 0x218($s0) .L802A12B0: diff --git a/asm/nonmatchings/code_725F60/func_802A12C4_726224.s b/asm/nonmatchings/code_725F60/func_802A12C4_726224.s index 8b935a7e62..d20d7aa1ed 100644 --- a/asm/nonmatchings/code_725F60/func_802A12C4_726224.s +++ b/asm/nonmatchings/code_725F60/func_802A12C4_726224.s @@ -7,5 +7,5 @@ glabel func_802A12C4_726224 /* 72622C 802A12CC A022C0FB */ sb $v0, %lo(gBattleStatus+0x8B)($at) /* 726230 802A12D0 03E00008 */ jr $ra /* 726234 802A12D4 24020002 */ addiu $v0, $zero, 2 -/* 726238 802A12D8 00000000 */ nop -/* 72623C 802A12DC 00000000 */ nop +/* 726238 802A12D8 00000000 */ nop +/* 72623C 802A12DC 00000000 */ nop diff --git a/asm/nonmatchings/code_7285E0/func_802A1000_7285E0.s b/asm/nonmatchings/code_7285E0/func_802A1000_7285E0.s index 65fc7aee77..17ba2dab24 100644 --- a/asm/nonmatchings/code_7285E0/func_802A1000_7285E0.s +++ b/asm/nonmatchings/code_7285E0/func_802A1000_7285E0.s @@ -29,7 +29,7 @@ glabel func_802A1000_7285E0 /* 728640 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 728644 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 728648 802A1068 44820000 */ mtc1 $v0, $f0 -/* 72864C 802A106C 00000000 */ nop +/* 72864C 802A106C 00000000 */ nop /* 728650 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 728654 802A1074 0C099CAB */ jal heroes_is_ability_active /* 728658 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_7285E0 /* 7286F4 802A1114 24040001 */ addiu $a0, $zero, 1 /* 7286F8 802A1118 0212102A */ slt $v0, $s0, $s2 /* 7286FC 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 728700 802A1120 00000000 */ nop +/* 728700 802A1120 00000000 */ nop .L802A1124: /* 728704 802A1124 00101040 */ sll $v0, $s0, 1 /* 728708 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_7285E0 /* 72874C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 728750 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 728754 802A1174 0C050529 */ jal create_icon -/* 728758 802A1178 00000000 */ nop +/* 728758 802A1178 00000000 */ nop /* 72875C 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 728760 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 728764 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_7285E0/func_802A11D4_7287B4.s b/asm/nonmatchings/code_7285E0/func_802A11D4_7287B4.s index 4fcc4b0a4b..ca33cb533d 100644 --- a/asm/nonmatchings/code_7285E0/func_802A11D4_7287B4.s +++ b/asm/nonmatchings/code_7285E0/func_802A11D4_7287B4.s @@ -16,17 +16,17 @@ glabel func_802A11D4_7287B4 /* 7287E0 802A1200 0C099CAB */ jal heroes_is_ability_active /* 7287E4 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 7287E8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 7287EC 802A120C 00000000 */ nop +/* 7287EC 802A120C 00000000 */ nop /* 7287F0 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 7287F4 802A1214 00000000 */ nop +/* 7287F4 802A1214 00000000 */ nop /* 7287F8 802A1218 3C04802A */ lui $a0, %hi(D_802A18E0) /* 7287FC 802A121C 8C8418E0 */ lw $a0, %lo(D_802A18E0)($a0) /* 728800 802A1220 0C05123D */ jal free_icon -/* 728804 802A1224 00000000 */ nop +/* 728804 802A1224 00000000 */ nop .L802A1228: /* 728808 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 72880C 802A122C 8FB00010 */ lw $s0, 0x10($sp) /* 728810 802A1230 24020002 */ addiu $v0, $zero, 2 /* 728814 802A1234 03E00008 */ jr $ra /* 728818 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 -/* 72881C 802A123C 00000000 */ nop +/* 72881C 802A123C 00000000 */ nop diff --git a/asm/nonmatchings/code_728EC0/func_802A1000_728EC0.s b/asm/nonmatchings/code_728EC0/func_802A1000_728EC0.s index 2a21324219..8260bb2b97 100644 --- a/asm/nonmatchings/code_728EC0/func_802A1000_728EC0.s +++ b/asm/nonmatchings/code_728EC0/func_802A1000_728EC0.s @@ -29,7 +29,7 @@ glabel func_802A1000_728EC0 /* 728F20 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 728F24 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 728F28 802A1068 44820000 */ mtc1 $v0, $f0 -/* 728F2C 802A106C 00000000 */ nop +/* 728F2C 802A106C 00000000 */ nop /* 728F30 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 728F34 802A1074 0C099CAB */ jal heroes_is_ability_active /* 728F38 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_728EC0 /* 728FD4 802A1114 24040001 */ addiu $a0, $zero, 1 /* 728FD8 802A1118 0212102A */ slt $v0, $s0, $s2 /* 728FDC 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 728FE0 802A1120 00000000 */ nop +/* 728FE0 802A1120 00000000 */ nop .L802A1124: /* 728FE4 802A1124 00101040 */ sll $v0, $s0, 1 /* 728FE8 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_728EC0 /* 72902C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 729030 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 729034 802A1174 0C050529 */ jal create_icon -/* 729038 802A1178 00000000 */ nop +/* 729038 802A1178 00000000 */ nop /* 72903C 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 729040 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 729044 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_728EC0/func_802A11D4_729094.s b/asm/nonmatchings/code_728EC0/func_802A11D4_729094.s index fccb5b1e8c..8dbb7fbac8 100644 --- a/asm/nonmatchings/code_728EC0/func_802A11D4_729094.s +++ b/asm/nonmatchings/code_728EC0/func_802A11D4_729094.s @@ -16,13 +16,13 @@ glabel func_802A11D4_729094 /* 7290C0 802A1200 0C099CAB */ jal heroes_is_ability_active /* 7290C4 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 7290C8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 7290CC 802A120C 00000000 */ nop +/* 7290CC 802A120C 00000000 */ nop /* 7290D0 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 7290D4 802A1214 00000000 */ nop +/* 7290D4 802A1214 00000000 */ nop /* 7290D8 802A1218 3C04802A */ lui $a0, %hi(D_802A2890) /* 7290DC 802A121C 8C842890 */ lw $a0, %lo(D_802A2890)($a0) /* 7290E0 802A1220 0C05123D */ jal free_icon -/* 7290E4 802A1224 00000000 */ nop +/* 7290E4 802A1224 00000000 */ nop .L802A1228: /* 7290E8 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 7290EC 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_728EC0/func_802A123C_7290FC.s b/asm/nonmatchings/code_728EC0/func_802A123C_7290FC.s index 4822ad0e30..101711d756 100644 --- a/asm/nonmatchings/code_728EC0/func_802A123C_7290FC.s +++ b/asm/nonmatchings/code_728EC0/func_802A123C_7290FC.s @@ -24,13 +24,13 @@ glabel func_802A123C_7290FC /* 729148 802A1288 0C0B1EAF */ jal get_variable /* 72914C 802A128C 0040802D */ daddu $s0, $v0, $zero /* 729150 802A1290 4492B000 */ mtc1 $s2, $f22 -/* 729154 802A1294 00000000 */ nop +/* 729154 802A1294 00000000 */ nop /* 729158 802A1298 4680B5A0 */ cvt.s.w $f22, $f22 /* 72915C 802A129C 4482A000 */ mtc1 $v0, $f20 -/* 729160 802A12A0 00000000 */ nop +/* 729160 802A12A0 00000000 */ nop /* 729164 802A12A4 4680A520 */ cvt.s.w $f20, $f20 /* 729168 802A12A8 44900000 */ mtc1 $s0, $f0 -/* 72916C 802A12AC 00000000 */ nop +/* 72916C 802A12AC 00000000 */ nop /* 729170 802A12B0 46800020 */ cvt.s.w $f0, $f0 /* 729174 802A12B4 4405B000 */ mfc1 $a1, $f22 /* 729178 802A12B8 4407A000 */ mfc1 $a3, $f20 @@ -39,7 +39,7 @@ glabel func_802A123C_7290FC /* 729184 802A12C4 0000202D */ daddu $a0, $zero, $zero /* 729188 802A12C8 26100014 */ addiu $s0, $s0, 0x14 /* 72918C 802A12CC 44900000 */ mtc1 $s0, $f0 -/* 729190 802A12D0 00000000 */ nop +/* 729190 802A12D0 00000000 */ nop /* 729194 802A12D4 46800020 */ cvt.s.w $f0, $f0 /* 729198 802A12D8 4405B000 */ mfc1 $a1, $f22 /* 72919C 802A12DC 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/code_72A750/func_802A1000_72A750.s b/asm/nonmatchings/code_72A750/func_802A1000_72A750.s index d3fd982c9d..f5347389ba 100644 --- a/asm/nonmatchings/code_72A750/func_802A1000_72A750.s +++ b/asm/nonmatchings/code_72A750/func_802A1000_72A750.s @@ -29,7 +29,7 @@ glabel func_802A1000_72A750 /* 72A7B0 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 72A7B4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 72A7B8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 72A7BC 802A106C 00000000 */ nop +/* 72A7BC 802A106C 00000000 */ nop /* 72A7C0 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 72A7C4 802A1074 0C099CAB */ jal heroes_is_ability_active /* 72A7C8 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_72A750 /* 72A864 802A1114 24040001 */ addiu $a0, $zero, 1 /* 72A868 802A1118 0212102A */ slt $v0, $s0, $s2 /* 72A86C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 72A870 802A1120 00000000 */ nop +/* 72A870 802A1120 00000000 */ nop .L802A1124: /* 72A874 802A1124 00101040 */ sll $v0, $s0, 1 /* 72A878 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_72A750 /* 72A8BC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 72A8C0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 72A8C4 802A1174 0C050529 */ jal create_icon -/* 72A8C8 802A1178 00000000 */ nop +/* 72A8C8 802A1178 00000000 */ nop /* 72A8CC 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 72A8D0 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 72A8D4 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_72A750/func_802A11D4_72A924.s b/asm/nonmatchings/code_72A750/func_802A11D4_72A924.s index de184e8a89..b6811fdb41 100644 --- a/asm/nonmatchings/code_72A750/func_802A11D4_72A924.s +++ b/asm/nonmatchings/code_72A750/func_802A11D4_72A924.s @@ -16,13 +16,13 @@ glabel func_802A11D4_72A924 /* 72A950 802A1200 0C099CAB */ jal heroes_is_ability_active /* 72A954 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 72A958 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 72A95C 802A120C 00000000 */ nop +/* 72A95C 802A120C 00000000 */ nop /* 72A960 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 72A964 802A1214 00000000 */ nop +/* 72A964 802A1214 00000000 */ nop /* 72A968 802A1218 3C04802A */ lui $a0, %hi(D_802A21C0) /* 72A96C 802A121C 8C8421C0 */ lw $a0, %lo(D_802A21C0)($a0) /* 72A970 802A1220 0C05123D */ jal free_icon -/* 72A974 802A1224 00000000 */ nop +/* 72A974 802A1224 00000000 */ nop .L802A1228: /* 72A978 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 72A97C 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_72A750/func_802A1280_72A9D0.s b/asm/nonmatchings/code_72A750/func_802A1280_72A9D0.s index 6d467c019f..b3e60bc738 100644 --- a/asm/nonmatchings/code_72A750/func_802A1280_72A9D0.s +++ b/asm/nonmatchings/code_72A750/func_802A1280_72A9D0.s @@ -17,7 +17,7 @@ glabel func_802A1280_72A9D0 /* 72AA00 802A12B0 0000282D */ daddu $a1, $zero, $zero /* 72AA04 802A12B4 86040428 */ lh $a0, 0x428($s0) /* 72AA08 802A12B8 0C09A75B */ jal get_actor -/* 72AA0C 802A12BC 00000000 */ nop +/* 72AA0C 802A12BC 00000000 */ nop /* 72AA10 802A12C0 0040202D */ daddu $a0, $v0, $zero /* 72AA14 802A12C4 0C09DC58 */ jal dispatch_event_actor /* 72AA18 802A12C8 24050039 */ addiu $a1, $zero, 0x39 diff --git a/asm/nonmatchings/code_72A750/func_802A12E0_72AA30.s b/asm/nonmatchings/code_72A750/func_802A12E0_72AA30.s index c4961f368d..e75bda22ff 100644 --- a/asm/nonmatchings/code_72A750/func_802A12E0_72AA30.s +++ b/asm/nonmatchings/code_72A750/func_802A12E0_72AA30.s @@ -15,34 +15,34 @@ glabel func_802A12E0_72AA30 /* 72AA58 802A1308 0C0B1EAF */ jal get_variable /* 72AA5C 802A130C 26100004 */ addiu $s0, $s0, 4 /* 72AA60 802A1310 4482A000 */ mtc1 $v0, $f20 -/* 72AA64 802A1314 00000000 */ nop +/* 72AA64 802A1314 00000000 */ nop /* 72AA68 802A1318 4680A520 */ cvt.s.w $f20, $f20 /* 72AA6C 802A131C 8E050000 */ lw $a1, ($s0) /* 72AA70 802A1320 26100004 */ addiu $s0, $s0, 4 /* 72AA74 802A1324 0C0B1EAF */ jal get_variable /* 72AA78 802A1328 0220202D */ daddu $a0, $s1, $zero /* 72AA7C 802A132C 4482B000 */ mtc1 $v0, $f22 -/* 72AA80 802A1330 00000000 */ nop +/* 72AA80 802A1330 00000000 */ nop /* 72AA84 802A1334 4680B5A0 */ cvt.s.w $f22, $f22 /* 72AA88 802A1338 8E050000 */ lw $a1, ($s0) /* 72AA8C 802A133C 0C0B1EAF */ jal get_variable /* 72AA90 802A1340 0220202D */ daddu $a0, $s1, $zero /* 72AA94 802A1344 4482C000 */ mtc1 $v0, $f24 -/* 72AA98 802A1348 00000000 */ nop +/* 72AA98 802A1348 00000000 */ nop /* 72AA9C 802A134C 4680C620 */ cvt.s.w $f24, $f24 /* 72AAA0 802A1350 0C00A67F */ jal rand_int /* 72AAA4 802A1354 24040014 */ addiu $a0, $zero, 0x14 /* 72AAA8 802A1358 2404000A */ addiu $a0, $zero, 0xa /* 72AAAC 802A135C 2442FFF6 */ addiu $v0, $v0, -0xa /* 72AAB0 802A1360 44820000 */ mtc1 $v0, $f0 -/* 72AAB4 802A1364 00000000 */ nop +/* 72AAB4 802A1364 00000000 */ nop /* 72AAB8 802A1368 46800020 */ cvt.s.w $f0, $f0 /* 72AABC 802A136C 0C00A67F */ jal rand_int /* 72AAC0 802A1370 4600A500 */ add.s $f20, $f20, $f0 /* 72AAC4 802A1374 0000202D */ daddu $a0, $zero, $zero /* 72AAC8 802A1378 2442FFFB */ addiu $v0, $v0, -5 /* 72AACC 802A137C 44820000 */ mtc1 $v0, $f0 -/* 72AAD0 802A1380 00000000 */ nop +/* 72AAD0 802A1380 00000000 */ nop /* 72AAD4 802A1384 46800020 */ cvt.s.w $f0, $f0 /* 72AAD8 802A1388 4600B580 */ add.s $f22, $f22, $f0 /* 72AADC 802A138C 3C013F80 */ lui $at, 0x3f80 @@ -80,5 +80,5 @@ glabel func_802A12E0_72AA30 /* 72AB5C 802A140C 24020002 */ addiu $v0, $zero, 2 /* 72AB60 802A1410 03E00008 */ jr $ra /* 72AB64 802A1414 27BD0040 */ addiu $sp, $sp, 0x40 -/* 72AB68 802A1418 00000000 */ nop -/* 72AB6C 802A141C 00000000 */ nop +/* 72AB68 802A1418 00000000 */ nop +/* 72AB6C 802A141C 00000000 */ nop diff --git a/asm/nonmatchings/code_72B910/func_802A1000_72B910.s b/asm/nonmatchings/code_72B910/func_802A1000_72B910.s index e233014c3a..16942c4975 100644 --- a/asm/nonmatchings/code_72B910/func_802A1000_72B910.s +++ b/asm/nonmatchings/code_72B910/func_802A1000_72B910.s @@ -29,7 +29,7 @@ glabel func_802A1000_72B910 /* 72B970 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 72B974 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 72B978 802A1068 44820000 */ mtc1 $v0, $f0 -/* 72B97C 802A106C 00000000 */ nop +/* 72B97C 802A106C 00000000 */ nop /* 72B980 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 72B984 802A1074 0C099CAB */ jal heroes_is_ability_active /* 72B988 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_72B910 /* 72BA24 802A1114 24040001 */ addiu $a0, $zero, 1 /* 72BA28 802A1118 0212102A */ slt $v0, $s0, $s2 /* 72BA2C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 72BA30 802A1120 00000000 */ nop +/* 72BA30 802A1120 00000000 */ nop .L802A1124: /* 72BA34 802A1124 00101040 */ sll $v0, $s0, 1 /* 72BA38 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_72B910 /* 72BA7C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 72BA80 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 72BA84 802A1174 0C050529 */ jal create_icon -/* 72BA88 802A1178 00000000 */ nop +/* 72BA88 802A1178 00000000 */ nop /* 72BA8C 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 72BA90 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 72BA94 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_72B910/func_802A11D4_72BAE4.s b/asm/nonmatchings/code_72B910/func_802A11D4_72BAE4.s index 6816d821eb..b71787bb28 100644 --- a/asm/nonmatchings/code_72B910/func_802A11D4_72BAE4.s +++ b/asm/nonmatchings/code_72B910/func_802A11D4_72BAE4.s @@ -16,13 +16,13 @@ glabel func_802A11D4_72BAE4 /* 72BB10 802A1200 0C099CAB */ jal heroes_is_ability_active /* 72BB14 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 72BB18 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 72BB1C 802A120C 00000000 */ nop +/* 72BB1C 802A120C 00000000 */ nop /* 72BB20 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 72BB24 802A1214 00000000 */ nop +/* 72BB24 802A1214 00000000 */ nop /* 72BB28 802A1218 3C04802A */ lui $a0, %hi(D_802A1CA0) /* 72BB2C 802A121C 8C841CA0 */ lw $a0, %lo(D_802A1CA0)($a0) /* 72BB30 802A1220 0C05123D */ jal free_icon -/* 72BB34 802A1224 00000000 */ nop +/* 72BB34 802A1224 00000000 */ nop .L802A1228: /* 72BB38 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 72BB3C 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_72C5B0/func_802A1000_72C5B0.s b/asm/nonmatchings/code_72C5B0/func_802A1000_72C5B0.s index 35d65edb15..a0d5140011 100644 --- a/asm/nonmatchings/code_72C5B0/func_802A1000_72C5B0.s +++ b/asm/nonmatchings/code_72C5B0/func_802A1000_72C5B0.s @@ -29,7 +29,7 @@ glabel func_802A1000_72C5B0 /* 72C610 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 72C614 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 72C618 802A1068 44820000 */ mtc1 $v0, $f0 -/* 72C61C 802A106C 00000000 */ nop +/* 72C61C 802A106C 00000000 */ nop /* 72C620 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 72C624 802A1074 0C099CAB */ jal heroes_is_ability_active /* 72C628 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_72C5B0 /* 72C6C4 802A1114 24040001 */ addiu $a0, $zero, 1 /* 72C6C8 802A1118 0212102A */ slt $v0, $s0, $s2 /* 72C6CC 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 72C6D0 802A1120 00000000 */ nop +/* 72C6D0 802A1120 00000000 */ nop .L802A1124: /* 72C6D4 802A1124 00101040 */ sll $v0, $s0, 1 /* 72C6D8 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_72C5B0 /* 72C71C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 72C720 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 72C724 802A1174 0C050529 */ jal create_icon -/* 72C728 802A1178 00000000 */ nop +/* 72C728 802A1178 00000000 */ nop /* 72C72C 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 72C730 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 72C734 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_72C5B0/func_802A11D4_72C784.s b/asm/nonmatchings/code_72C5B0/func_802A11D4_72C784.s index f88f58d7c3..49d66b29a5 100644 --- a/asm/nonmatchings/code_72C5B0/func_802A11D4_72C784.s +++ b/asm/nonmatchings/code_72C5B0/func_802A11D4_72C784.s @@ -16,13 +16,13 @@ glabel func_802A11D4_72C784 /* 72C7B0 802A1200 0C099CAB */ jal heroes_is_ability_active /* 72C7B4 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 72C7B8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 72C7BC 802A120C 00000000 */ nop +/* 72C7BC 802A120C 00000000 */ nop /* 72C7C0 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 72C7C4 802A1214 00000000 */ nop +/* 72C7C4 802A1214 00000000 */ nop /* 72C7C8 802A1218 3C04802A */ lui $a0, %hi(D_802A25C0) /* 72C7CC 802A121C 8C8425C0 */ lw $a0, %lo(D_802A25C0)($a0) /* 72C7D0 802A1220 0C05123D */ jal free_icon -/* 72C7D4 802A1224 00000000 */ nop +/* 72C7D4 802A1224 00000000 */ nop .L802A1228: /* 72C7D8 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 72C7DC 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_72C5B0/func_802A13E4_72C994.s b/asm/nonmatchings/code_72C5B0/func_802A13E4_72C994.s index ed80b18688..1e39663fd0 100644 --- a/asm/nonmatchings/code_72C5B0/func_802A13E4_72C994.s +++ b/asm/nonmatchings/code_72C5B0/func_802A13E4_72C994.s @@ -20,11 +20,12 @@ glabel func_802A13E4_72C994 /* 72C9CC 802A141C 2C620006 */ sltiu $v0, $v1, 6 /* 72C9D0 802A1420 10400112 */ beqz $v0, .L802A186C /* 72C9D4 802A1424 00031080 */ sll $v0, $v1, 2 -/* 72C9D8 802A1428 3C01802A */ lui $at, %hi(D_802A25A0) +/* 72C9D8 802A1428 3C01802A */ lui $at, %hi(jtbl_802A25A0_72DB50) /* 72C9DC 802A142C 00220821 */ addu $at, $at, $v0 -/* 72C9E0 802A1430 8C2225A0 */ lw $v0, %lo(D_802A25A0)($at) +/* 72C9E0 802A1430 8C2225A0 */ lw $v0, %lo(jtbl_802A25A0_72DB50)($at) /* 72C9E4 802A1434 00400008 */ jr $v0 -/* 72C9E8 802A1438 00000000 */ nop +/* 72C9E8 802A1438 00000000 */ nop +glabel L802A143C_72C9EC /* 72C9EC 802A143C 3C05802A */ lui $a1, %hi(func_802A123C_72C7EC) /* 72C9F0 802A1440 24A5123C */ addiu $a1, $a1, %lo(func_802A123C_72C7EC) /* 72C9F4 802A1444 0C048C8F */ jal bind_dynamic_entity_7 @@ -52,9 +53,9 @@ glabel func_802A13E4_72C994 /* 72CA4C 802A149C C7A20014 */ lwc1 $f2, 0x14($sp) /* 72CA50 802A14A0 3C014357 */ lui $at, 0x4357 /* 72CA54 802A14A4 44810000 */ mtc1 $at, $f0 -/* 72CA58 802A14A8 00000000 */ nop +/* 72CA58 802A14A8 00000000 */ nop /* 72CA5C 802A14AC 4602003E */ c.le.s $f0, $f2 -/* 72CA60 802A14B0 00000000 */ nop +/* 72CA60 802A14B0 00000000 */ nop /* 72CA64 802A14B4 45020005 */ bc1fl .L802A14CC /* 72CA68 802A14B8 0000802D */ daddu $s0, $zero, $zero /* 72CA6C 802A14BC 3C02802A */ lui $v0, %hi(D_802A229C) @@ -95,6 +96,7 @@ glabel func_802A13E4_72C994 /* 72CAEC 802A153C AC2225E4 */ sw $v0, %lo(D_802A25E4)($at) /* 72CAF0 802A1540 080A861C */ j .L802A1870 /* 72CAF4 802A1544 0000102D */ daddu $v0, $zero, $zero +glabel L802A1548_72CAF8 /* 72CAF8 802A1548 3C0351EB */ lui $v1, 0x51eb /* 72CAFC 802A154C 3C06802A */ lui $a2, %hi(D_802A25EC) /* 72CB00 802A1550 24C625EC */ addiu $a2, $a2, %lo(D_802A25EC) @@ -157,7 +159,7 @@ glabel func_802A13E4_72C994 /* 72CBD8 802A1628 00621823 */ subu $v1, $v1, $v0 /* 72CBDC 802A162C 2863000D */ slti $v1, $v1, 0xd /* 72CBE0 802A1630 10600008 */ beqz $v1, .L802A1654 -/* 72CBE4 802A1634 00000000 */ nop +/* 72CBE4 802A1634 00000000 */ nop /* 72CBE8 802A1638 0C00A67F */ jal rand_int /* 72CBEC 802A163C 24040064 */ addiu $a0, $zero, 0x64 /* 72CBF0 802A1640 28420050 */ slti $v0, $v0, 0x50 @@ -183,6 +185,7 @@ glabel func_802A13E4_72C994 /* 72CC30 802A1680 AC2225E4 */ sw $v0, %lo(D_802A25E4)($at) /* 72CC34 802A1684 080A861C */ j .L802A1870 /* 72CC38 802A1688 0000102D */ daddu $v0, $zero, $zero +glabel L802A168C_72CC3C /* 72CC3C 802A168C 3C024EC4 */ lui $v0, 0x4ec4 /* 72CC40 802A1690 3C06802A */ lui $a2, %hi(D_802A25E8) /* 72CC44 802A1694 24C625E8 */ addiu $a2, $a2, %lo(D_802A25E8) @@ -217,6 +220,7 @@ glabel func_802A13E4_72C994 /* 72CCB4 802A1704 0000102D */ daddu $v0, $zero, $zero /* 72CCB8 802A1708 080A85D7 */ j .L802A175C /* 72CCBC 802A170C 24020004 */ addiu $v0, $zero, 4 +glabel L802A1710_72CCC0 /* 72CCC0 802A1710 3C024EC4 */ lui $v0, 0x4ec4 /* 72CCC4 802A1714 3C06802A */ lui $a2, %hi(D_802A25E8) /* 72CCC8 802A1718 24C625E8 */ addiu $a2, $a2, %lo(D_802A25E8) @@ -259,6 +263,7 @@ glabel func_802A13E4_72C994 /* 72CD50 802A17A0 AC2225EC */ sw $v0, %lo(D_802A25EC)($at) /* 72CD54 802A17A4 080A861C */ j .L802A1870 /* 72CD58 802A17A8 0000102D */ daddu $v0, $zero, $zero +glabel L802A17AC_72CD5C /* 72CD5C 802A17AC 24020014 */ addiu $v0, $zero, 0x14 /* 72CD60 802A17B0 3C01802A */ lui $at, %hi(D_802A25F4) /* 72CD64 802A17B4 AC2225F4 */ sw $v0, %lo(D_802A25F4)($at) @@ -267,6 +272,7 @@ glabel func_802A13E4_72C994 /* 72CD70 802A17C0 AC2225E4 */ sw $v0, %lo(D_802A25E4)($at) /* 72CD74 802A17C4 080A861C */ j .L802A1870 /* 72CD78 802A17C8 0000102D */ daddu $v0, $zero, $zero +glabel L802A17CC_72CD7C /* 72CD7C 802A17CC 3C03802A */ lui $v1, %hi(D_802A25F4) /* 72CD80 802A17D0 246325F4 */ addiu $v1, $v1, %lo(D_802A25F4) /* 72CD84 802A17D4 8C620000 */ lw $v0, ($v1) @@ -308,7 +314,7 @@ glabel func_802A13E4_72C994 /* 72CE0C 802A185C 1440FFFA */ bnez $v0, .L802A1848 /* 72CE10 802A1860 24020002 */ addiu $v0, $zero, 2 /* 72CE14 802A1864 080A861C */ j .L802A1870 -/* 72CE18 802A1868 00000000 */ nop +/* 72CE18 802A1868 00000000 */ nop .L802A186C: /* 72CE1C 802A186C 0000102D */ daddu $v0, $zero, $zero .L802A1870: diff --git a/asm/nonmatchings/code_72C5B0/func_802A188C_72CE3C.s b/asm/nonmatchings/code_72C5B0/func_802A188C_72CE3C.s index 451f893b10..7d98a22d10 100644 --- a/asm/nonmatchings/code_72C5B0/func_802A188C_72CE3C.s +++ b/asm/nonmatchings/code_72C5B0/func_802A188C_72CE3C.s @@ -23,15 +23,15 @@ glabel func_802A188C_72CE3C /* 72CE84 802A18D4 0040802D */ daddu $s0, $v0, $zero /* 72CE88 802A18D8 24040002 */ addiu $a0, $zero, 2 /* 72CE8C 802A18DC 44921000 */ mtc1 $s2, $f2 -/* 72CE90 802A18E0 00000000 */ nop +/* 72CE90 802A18E0 00000000 */ nop /* 72CE94 802A18E4 468010A0 */ cvt.s.w $f2, $f2 /* 72CE98 802A18E8 44051000 */ mfc1 $a1, $f2 /* 72CE9C 802A18EC 44901000 */ mtc1 $s0, $f2 -/* 72CEA0 802A18F0 00000000 */ nop +/* 72CEA0 802A18F0 00000000 */ nop /* 72CEA4 802A18F4 468010A0 */ cvt.s.w $f2, $f2 /* 72CEA8 802A18F8 44061000 */ mfc1 $a2, $f2 /* 72CEAC 802A18FC 44821000 */ mtc1 $v0, $f2 -/* 72CEB0 802A1900 00000000 */ nop +/* 72CEB0 802A1900 00000000 */ nop /* 72CEB4 802A1904 468010A0 */ cvt.s.w $f2, $f2 /* 72CEB8 802A1908 3C01BF80 */ lui $at, 0xbf80 /* 72CEBC 802A190C 44810000 */ mtc1 $at, $f0 @@ -49,5 +49,5 @@ glabel func_802A188C_72CE3C /* 72CEEC 802A193C 24020002 */ addiu $v0, $zero, 2 /* 72CEF0 802A1940 03E00008 */ jr $ra /* 72CEF4 802A1944 27BD0030 */ addiu $sp, $sp, 0x30 -/* 72CEF8 802A1948 00000000 */ nop -/* 72CEFC 802A194C 00000000 */ nop +/* 72CEF8 802A1948 00000000 */ nop +/* 72CEFC 802A194C 00000000 */ nop diff --git a/asm/nonmatchings/code_72E530/func_802A1000_72E530.s b/asm/nonmatchings/code_72E530/func_802A1000_72E530.s index cee6334ac6..95f11bb7cc 100644 --- a/asm/nonmatchings/code_72E530/func_802A1000_72E530.s +++ b/asm/nonmatchings/code_72E530/func_802A1000_72E530.s @@ -29,7 +29,7 @@ glabel func_802A1000_72E530 /* 72E590 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 72E594 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 72E598 802A1068 44820000 */ mtc1 $v0, $f0 -/* 72E59C 802A106C 00000000 */ nop +/* 72E59C 802A106C 00000000 */ nop /* 72E5A0 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 72E5A4 802A1074 0C099CAB */ jal heroes_is_ability_active /* 72E5A8 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_72E530 /* 72E644 802A1114 24040001 */ addiu $a0, $zero, 1 /* 72E648 802A1118 0212102A */ slt $v0, $s0, $s2 /* 72E64C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 72E650 802A1120 00000000 */ nop +/* 72E650 802A1120 00000000 */ nop .L802A1124: /* 72E654 802A1124 00101040 */ sll $v0, $s0, 1 /* 72E658 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_72E530 /* 72E69C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 72E6A0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 72E6A4 802A1174 0C050529 */ jal create_icon -/* 72E6A8 802A1178 00000000 */ nop +/* 72E6A8 802A1178 00000000 */ nop /* 72E6AC 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 72E6B0 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 72E6B4 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_72E530/func_802A11D4_72E704.s b/asm/nonmatchings/code_72E530/func_802A11D4_72E704.s index d5493b7ce6..13d786d64e 100644 --- a/asm/nonmatchings/code_72E530/func_802A11D4_72E704.s +++ b/asm/nonmatchings/code_72E530/func_802A11D4_72E704.s @@ -16,13 +16,13 @@ glabel func_802A11D4_72E704 /* 72E730 802A1200 0C099CAB */ jal heroes_is_ability_active /* 72E734 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 72E738 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 72E73C 802A120C 00000000 */ nop +/* 72E73C 802A120C 00000000 */ nop /* 72E740 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 72E744 802A1214 00000000 */ nop +/* 72E744 802A1214 00000000 */ nop /* 72E748 802A1218 3C04802A */ lui $a0, %hi(D_802A21F0) /* 72E74C 802A121C 8C8421F0 */ lw $a0, %lo(D_802A21F0)($a0) /* 72E750 802A1220 0C05123D */ jal free_icon -/* 72E754 802A1224 00000000 */ nop +/* 72E754 802A1224 00000000 */ nop .L802A1228: /* 72E758 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 72E75C 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_72E530/func_802A123C_72E76C.s b/asm/nonmatchings/code_72E530/func_802A123C_72E76C.s index e7f8e6fe70..8e678a2ef0 100644 --- a/asm/nonmatchings/code_72E530/func_802A123C_72E76C.s +++ b/asm/nonmatchings/code_72E530/func_802A123C_72E76C.s @@ -27,15 +27,15 @@ glabel func_802A123C_72E76C /* 72E7C4 802A1294 0040802D */ daddu $s0, $v0, $zero /* 72E7C8 802A1298 0040182D */ daddu $v1, $v0, $zero /* 72E7CC 802A129C 44930000 */ mtc1 $s3, $f0 -/* 72E7D0 802A12A0 00000000 */ nop +/* 72E7D0 802A12A0 00000000 */ nop /* 72E7D4 802A12A4 46800020 */ cvt.s.w $f0, $f0 /* 72E7D8 802A12A8 E4600008 */ swc1 $f0, 8($v1) /* 72E7DC 802A12AC 44920000 */ mtc1 $s2, $f0 -/* 72E7E0 802A12B0 00000000 */ nop +/* 72E7E0 802A12B0 00000000 */ nop /* 72E7E4 802A12B4 46800020 */ cvt.s.w $f0, $f0 /* 72E7E8 802A12B8 E460000C */ swc1 $f0, 0xc($v1) /* 72E7EC 802A12BC 44900000 */ mtc1 $s0, $f0 -/* 72E7F0 802A12C0 00000000 */ nop +/* 72E7F0 802A12C0 00000000 */ nop /* 72E7F4 802A12C4 46800020 */ cvt.s.w $f0, $f0 /* 72E7F8 802A12C8 E4600010 */ swc1 $f0, 0x10($v1) /* 72E7FC 802A12CC 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/code_72E530/func_802A12EC_72E81C.s b/asm/nonmatchings/code_72E530/func_802A12EC_72E81C.s index 71ff1c522d..038ec679f6 100644 --- a/asm/nonmatchings/code_72E530/func_802A12EC_72E81C.s +++ b/asm/nonmatchings/code_72E530/func_802A12EC_72E81C.s @@ -13,7 +13,7 @@ glabel func_802A12EC_72E81C /* 72E83C 802A130C 24020002 */ addiu $v0, $zero, 2 /* 72E840 802A1310 8CA50000 */ lw $a1, ($a1) /* 72E844 802A1314 0C0B1EAF */ jal get_variable -/* 72E848 802A1318 00000000 */ nop +/* 72E848 802A1318 00000000 */ nop /* 72E84C 802A131C 92030217 */ lbu $v1, 0x217($s0) /* 72E850 802A1320 00621823 */ subu $v1, $v1, $v0 /* 72E854 802A1324 A2030217 */ sb $v1, 0x217($s0) diff --git a/asm/nonmatchings/code_72E530/func_802A1378_72E8A8.s b/asm/nonmatchings/code_72E530/func_802A1378_72E8A8.s index c3e9301d35..a729f852d8 100644 --- a/asm/nonmatchings/code_72E530/func_802A1378_72E8A8.s +++ b/asm/nonmatchings/code_72E530/func_802A1378_72E8A8.s @@ -28,15 +28,15 @@ glabel func_802A1378_72E8A8 /* 72E904 802A13D4 0C0B1EAF */ jal get_variable /* 72E908 802A13D8 0040802D */ daddu $s0, $v0, $zero /* 72E90C 802A13DC 44930000 */ mtc1 $s3, $f0 -/* 72E910 802A13E0 00000000 */ nop +/* 72E910 802A13E0 00000000 */ nop /* 72E914 802A13E4 46800020 */ cvt.s.w $f0, $f0 /* 72E918 802A13E8 44050000 */ mfc1 $a1, $f0 /* 72E91C 802A13EC 44920000 */ mtc1 $s2, $f0 -/* 72E920 802A13F0 00000000 */ nop +/* 72E920 802A13F0 00000000 */ nop /* 72E924 802A13F4 46800020 */ cvt.s.w $f0, $f0 /* 72E928 802A13F8 44060000 */ mfc1 $a2, $f0 /* 72E92C 802A13FC 44900000 */ mtc1 $s0, $f0 -/* 72E930 802A1400 00000000 */ nop +/* 72E930 802A1400 00000000 */ nop /* 72E934 802A1404 46800020 */ cvt.s.w $f0, $f0 /* 72E938 802A1408 44070000 */ mfc1 $a3, $f0 /* 72E93C 802A140C 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/code_72F720/func_802A1000_72F720.s b/asm/nonmatchings/code_72F720/func_802A1000_72F720.s index 2a8a8922d1..252cd6b601 100644 --- a/asm/nonmatchings/code_72F720/func_802A1000_72F720.s +++ b/asm/nonmatchings/code_72F720/func_802A1000_72F720.s @@ -29,7 +29,7 @@ glabel func_802A1000_72F720 /* 72F780 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 72F784 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 72F788 802A1068 44820000 */ mtc1 $v0, $f0 -/* 72F78C 802A106C 00000000 */ nop +/* 72F78C 802A106C 00000000 */ nop /* 72F790 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 72F794 802A1074 0C099CAB */ jal heroes_is_ability_active /* 72F798 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_72F720 /* 72F834 802A1114 24040001 */ addiu $a0, $zero, 1 /* 72F838 802A1118 0212102A */ slt $v0, $s0, $s2 /* 72F83C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 72F840 802A1120 00000000 */ nop +/* 72F840 802A1120 00000000 */ nop .L802A1124: /* 72F844 802A1124 00101040 */ sll $v0, $s0, 1 /* 72F848 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_72F720 /* 72F88C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 72F890 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 72F894 802A1174 0C050529 */ jal create_icon -/* 72F898 802A1178 00000000 */ nop +/* 72F898 802A1178 00000000 */ nop /* 72F89C 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 72F8A0 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 72F8A4 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_72F720/func_802A11D4_72F8F4.s b/asm/nonmatchings/code_72F720/func_802A11D4_72F8F4.s index e62df55a87..33057d5021 100644 --- a/asm/nonmatchings/code_72F720/func_802A11D4_72F8F4.s +++ b/asm/nonmatchings/code_72F720/func_802A11D4_72F8F4.s @@ -16,17 +16,17 @@ glabel func_802A11D4_72F8F4 /* 72F920 802A1200 0C099CAB */ jal heroes_is_ability_active /* 72F924 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 72F928 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 72F92C 802A120C 00000000 */ nop +/* 72F92C 802A120C 00000000 */ nop /* 72F930 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 72F934 802A1214 00000000 */ nop +/* 72F934 802A1214 00000000 */ nop /* 72F938 802A1218 3C04802A */ lui $a0, %hi(D_802A1E80) /* 72F93C 802A121C 8C841E80 */ lw $a0, %lo(D_802A1E80)($a0) /* 72F940 802A1220 0C05123D */ jal free_icon -/* 72F944 802A1224 00000000 */ nop +/* 72F944 802A1224 00000000 */ nop .L802A1228: /* 72F948 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 72F94C 802A122C 8FB00010 */ lw $s0, 0x10($sp) /* 72F950 802A1230 24020002 */ addiu $v0, $zero, 2 /* 72F954 802A1234 03E00008 */ jr $ra /* 72F958 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 -/* 72F95C 802A123C 00000000 */ nop +/* 72F95C 802A123C 00000000 */ nop diff --git a/asm/nonmatchings/code_7305A0/func_802A1000_7305A0.s b/asm/nonmatchings/code_7305A0/func_802A1000_7305A0.s index e43540f7c5..8fdea879b4 100644 --- a/asm/nonmatchings/code_7305A0/func_802A1000_7305A0.s +++ b/asm/nonmatchings/code_7305A0/func_802A1000_7305A0.s @@ -29,7 +29,7 @@ glabel func_802A1000_7305A0 /* 730600 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 730604 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 730608 802A1068 44820000 */ mtc1 $v0, $f0 -/* 73060C 802A106C 00000000 */ nop +/* 73060C 802A106C 00000000 */ nop /* 730610 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 730614 802A1074 0C099CAB */ jal heroes_is_ability_active /* 730618 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_7305A0 /* 7306B4 802A1114 24040001 */ addiu $a0, $zero, 1 /* 7306B8 802A1118 0212102A */ slt $v0, $s0, $s2 /* 7306BC 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 7306C0 802A1120 00000000 */ nop +/* 7306C0 802A1120 00000000 */ nop .L802A1124: /* 7306C4 802A1124 00101040 */ sll $v0, $s0, 1 /* 7306C8 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_7305A0 /* 73070C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 730710 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 730714 802A1174 0C050529 */ jal create_icon -/* 730718 802A1178 00000000 */ nop +/* 730718 802A1178 00000000 */ nop /* 73071C 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 730720 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 730724 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_7305A0/func_802A11D4_730774.s b/asm/nonmatchings/code_7305A0/func_802A11D4_730774.s index fef01212a4..627054344c 100644 --- a/asm/nonmatchings/code_7305A0/func_802A11D4_730774.s +++ b/asm/nonmatchings/code_7305A0/func_802A11D4_730774.s @@ -16,13 +16,13 @@ glabel func_802A11D4_730774 /* 7307A0 802A1200 0C099CAB */ jal heroes_is_ability_active /* 7307A4 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 7307A8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 7307AC 802A120C 00000000 */ nop +/* 7307AC 802A120C 00000000 */ nop /* 7307B0 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 7307B4 802A1214 00000000 */ nop +/* 7307B4 802A1214 00000000 */ nop /* 7307B8 802A1218 3C04802A */ lui $a0, %hi(D_802A1D60) /* 7307BC 802A121C 8C841D60 */ lw $a0, %lo(D_802A1D60)($a0) /* 7307C0 802A1220 0C05123D */ jal free_icon -/* 7307C4 802A1224 00000000 */ nop +/* 7307C4 802A1224 00000000 */ nop .L802A1228: /* 7307C8 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 7307CC 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_7305A0/func_802A127C_73081C.s b/asm/nonmatchings/code_7305A0/func_802A127C_73081C.s index 601eb946df..6f0fc5a802 100644 --- a/asm/nonmatchings/code_7305A0/func_802A127C_73081C.s +++ b/asm/nonmatchings/code_7305A0/func_802A127C_73081C.s @@ -28,15 +28,15 @@ glabel func_802A127C_73081C /* 730878 802A12D8 0C0B1EAF */ jal get_variable /* 73087C 802A12DC 0040802D */ daddu $s0, $v0, $zero /* 730880 802A12E0 44930000 */ mtc1 $s3, $f0 -/* 730884 802A12E4 00000000 */ nop +/* 730884 802A12E4 00000000 */ nop /* 730888 802A12E8 46800020 */ cvt.s.w $f0, $f0 /* 73088C 802A12EC 44050000 */ mfc1 $a1, $f0 /* 730890 802A12F0 44920000 */ mtc1 $s2, $f0 -/* 730894 802A12F4 00000000 */ nop +/* 730894 802A12F4 00000000 */ nop /* 730898 802A12F8 46800020 */ cvt.s.w $f0, $f0 /* 73089C 802A12FC 44060000 */ mfc1 $a2, $f0 /* 7308A0 802A1300 44900000 */ mtc1 $s0, $f0 -/* 7308A4 802A1304 00000000 */ nop +/* 7308A4 802A1304 00000000 */ nop /* 7308A8 802A1308 46800020 */ cvt.s.w $f0, $f0 /* 7308AC 802A130C 44070000 */ mfc1 $a3, $f0 /* 7308B0 802A1310 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/code_7305A0/func_802A133C_7308DC.s b/asm/nonmatchings/code_7305A0/func_802A133C_7308DC.s index 9eb3184d78..522d37e91d 100644 --- a/asm/nonmatchings/code_7305A0/func_802A133C_7308DC.s +++ b/asm/nonmatchings/code_7305A0/func_802A133C_7308DC.s @@ -28,15 +28,15 @@ glabel func_802A133C_7308DC /* 730938 802A1398 0C0B1EAF */ jal get_variable /* 73093C 802A139C 0040802D */ daddu $s0, $v0, $zero /* 730940 802A13A0 44930000 */ mtc1 $s3, $f0 -/* 730944 802A13A4 00000000 */ nop +/* 730944 802A13A4 00000000 */ nop /* 730948 802A13A8 46800020 */ cvt.s.w $f0, $f0 /* 73094C 802A13AC 44050000 */ mfc1 $a1, $f0 /* 730950 802A13B0 44920000 */ mtc1 $s2, $f0 -/* 730954 802A13B4 00000000 */ nop +/* 730954 802A13B4 00000000 */ nop /* 730958 802A13B8 46800020 */ cvt.s.w $f0, $f0 /* 73095C 802A13BC 44060000 */ mfc1 $a2, $f0 /* 730960 802A13C0 44900000 */ mtc1 $s0, $f0 -/* 730964 802A13C4 00000000 */ nop +/* 730964 802A13C4 00000000 */ nop /* 730968 802A13C8 46800020 */ cvt.s.w $f0, $f0 /* 73096C 802A13CC 44070000 */ mfc1 $a3, $f0 /* 730970 802A13D0 24040001 */ addiu $a0, $zero, 1 diff --git a/asm/nonmatchings/code_7305A0/func_802A14F0_730A90.s b/asm/nonmatchings/code_7305A0/func_802A14F0_730A90.s index d770761786..419dd443a4 100644 --- a/asm/nonmatchings/code_7305A0/func_802A14F0_730A90.s +++ b/asm/nonmatchings/code_7305A0/func_802A14F0_730A90.s @@ -22,4 +22,4 @@ glabel func_802A14F0_730A90 /* 730AD0 802A1530 AC820090 */ sw $v0, 0x90($a0) /* 730AD4 802A1534 03E00008 */ jr $ra /* 730AD8 802A1538 24020002 */ addiu $v0, $zero, 2 -/* 730ADC 802A153C 00000000 */ nop +/* 730ADC 802A153C 00000000 */ nop diff --git a/asm/nonmatchings/code_731300/func_802A13E4_7316E4.s b/asm/nonmatchings/code_731300/func_802A13E4_7316E4.s index 2e8630e7cc..21e819a6d4 100644 --- a/asm/nonmatchings/code_731300/func_802A13E4_7316E4.s +++ b/asm/nonmatchings/code_731300/func_802A13E4_7316E4.s @@ -18,11 +18,12 @@ glabel func_802A13E4_7316E4 /* 731714 802A1414 2C620006 */ sltiu $v0, $v1, 6 /* 731718 802A1418 104000F7 */ beqz $v0, .L802A17F8 /* 73171C 802A141C 00031080 */ sll $v0, $v1, 2 -/* 731720 802A1420 3C01802A */ lui $at, %hi(D_802A2DB0) +/* 731720 802A1420 3C01802A */ lui $at, %hi(jtbl_802A2DB0_7330B0) /* 731724 802A1424 00220821 */ addu $at, $at, $v0 -/* 731728 802A1428 8C222DB0 */ lw $v0, %lo(D_802A2DB0)($at) +/* 731728 802A1428 8C222DB0 */ lw $v0, %lo(jtbl_802A2DB0_7330B0)($at) /* 73172C 802A142C 00400008 */ jr $v0 /* 731730 802A1430 00000000 */ nop +glabel L802A1434_731734 /* 731734 802A1434 3C05802A */ lui $a1, %hi(func_802A123C_73153C) /* 731738 802A1438 24A5123C */ addiu $a1, $a1, %lo(func_802A123C_73153C) /* 73173C 802A143C 0C048C8F */ jal bind_dynamic_entity_7 @@ -63,6 +64,7 @@ glabel func_802A13E4_7316E4 /* 7317C4 802A14C4 AC222DEC */ sw $v0, %lo(D_802A2DEC)($at) /* 7317C8 802A14C8 080A85FF */ j .L802A17FC /* 7317CC 802A14CC 0000102D */ daddu $v0, $zero, $zero +glabel L802A14D0_7317D0 /* 7317D0 802A14D0 3C0351EB */ lui $v1, 0x51eb /* 7317D4 802A14D4 3C06802A */ lui $a2, %hi(D_802A2DF4) /* 7317D8 802A14D8 24C62DF4 */ addiu $a2, $a2, %lo(D_802A2DF4) @@ -151,6 +153,7 @@ glabel func_802A13E4_7316E4 /* 731908 802A1608 AC222DEC */ sw $v0, %lo(D_802A2DEC)($at) /* 73190C 802A160C 080A85FF */ j .L802A17FC /* 731910 802A1610 0000102D */ daddu $v0, $zero, $zero +glabel L802A1614_731914 /* 731914 802A1614 3C024EC4 */ lui $v0, 0x4ec4 /* 731918 802A1618 3C06802A */ lui $a2, %hi(D_802A2DF0) /* 73191C 802A161C 24C62DF0 */ addiu $a2, $a2, %lo(D_802A2DF0) @@ -185,6 +188,7 @@ glabel func_802A13E4_7316E4 /* 73198C 802A168C 0000102D */ daddu $v0, $zero, $zero /* 731990 802A1690 080A85B9 */ j .L802A16E4 /* 731994 802A1694 24020004 */ addiu $v0, $zero, 4 +glabel L802A1698_731998 /* 731998 802A1698 3C024EC4 */ lui $v0, 0x4ec4 /* 73199C 802A169C 3C06802A */ lui $a2, %hi(D_802A2DF0) /* 7319A0 802A16A0 24C62DF0 */ addiu $a2, $a2, %lo(D_802A2DF0) @@ -227,6 +231,7 @@ glabel func_802A13E4_7316E4 /* 731A28 802A1728 AC222DF4 */ sw $v0, %lo(D_802A2DF4)($at) /* 731A2C 802A172C 080A85FF */ j .L802A17FC /* 731A30 802A1730 0000102D */ daddu $v0, $zero, $zero +glabel L802A1734_731A34 /* 731A34 802A1734 24020014 */ addiu $v0, $zero, 0x14 /* 731A38 802A1738 3C01802A */ lui $at, %hi(D_802A2DFC) /* 731A3C 802A173C AC222DFC */ sw $v0, %lo(D_802A2DFC)($at) @@ -235,6 +240,7 @@ glabel func_802A13E4_7316E4 /* 731A48 802A1748 AC222DEC */ sw $v0, %lo(D_802A2DEC)($at) /* 731A4C 802A174C 080A85FF */ j .L802A17FC /* 731A50 802A1750 0000102D */ daddu $v0, $zero, $zero +glabel L802A1754_731A54 /* 731A54 802A1754 3C03802A */ lui $v1, %hi(D_802A2DFC) /* 731A58 802A1758 24632DFC */ addiu $v1, $v1, %lo(D_802A2DFC) /* 731A5C 802A175C 8C620000 */ lw $v0, ($v1) diff --git a/asm/nonmatchings/code_7340_len_b00/crash_delay_msec.s b/asm/nonmatchings/code_7340_len_b00/crash_delay_msec.s index d020425a7d..237715ade2 100644 --- a/asm/nonmatchings/code_7340_len_b00/crash_delay_msec.s +++ b/asm/nonmatchings/code_7340_len_b00/crash_delay_msec.s @@ -13,19 +13,19 @@ glabel crash_delay_msec /* 7360 8002BF60 00008010 */ mfhi $s0 /* 7364 8002BF64 00008812 */ mflo $s1 /* 7368 8002BF68 0C0198CC */ jal osSetTime -/* 736C 8002BF6C 00000000 */ nop +/* 736C 8002BF6C 00000000 */ nop .L8002BF70: /* 7370 8002BF70 0C0198A8 */ jal osGetTime -/* 7374 8002BF74 00000000 */ nop +/* 7374 8002BF74 00000000 */ nop /* 7378 8002BF78 0040202D */ daddu $a0, $v0, $zero /* 737C 8002BF7C 0060282D */ daddu $a1, $v1, $zero /* 7380 8002BF80 0090102B */ sltu $v0, $a0, $s0 /* 7384 8002BF84 1440FFFA */ bnez $v0, .L8002BF70 -/* 7388 8002BF88 00000000 */ nop +/* 7388 8002BF88 00000000 */ nop /* 738C 8002BF8C 16040003 */ bne $s0, $a0, .L8002BF9C /* 7390 8002BF90 00B1102B */ sltu $v0, $a1, $s1 /* 7394 8002BF94 1440FFF6 */ bnez $v0, .L8002BF70 -/* 7398 8002BF98 00000000 */ nop +/* 7398 8002BF98 00000000 */ nop .L8002BF9C: /* 739C 8002BF9C 8FBF0018 */ lw $ra, 0x18($sp) /* 73A0 8002BFA0 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_7340_len_b00/crash_monitor_thread.s b/asm/nonmatchings/code_7340_len_b00/crash_monitor_thread.s index d767481ea9..25f5e569c6 100644 --- a/asm/nonmatchings/code_7340_len_b00/crash_monitor_thread.s +++ b/asm/nonmatchings/code_7340_len_b00/crash_monitor_thread.s @@ -22,14 +22,14 @@ glabel crash_monitor_thread /* 7C5C 8002C85C 0C0195BC */ jal osRecvMesg /* 7C60 8002C860 24060001 */ addiu $a2, $zero, 1 /* 7C64 8002C864 0C00B1EC */ jal func_8002C7B0 -/* 7C68 8002C868 00000000 */ nop +/* 7C68 8002C868 00000000 */ nop /* 7C6C 8002C86C 0040802D */ daddu $s0, $v0, $zero /* 7C70 8002C870 1200FFF7 */ beqz $s0, .L8002C850 -/* 7C74 8002C874 00000000 */ nop +/* 7C74 8002C874 00000000 */ nop /* 7C78 8002C878 0C019850 */ jal osStopThread /* 7C7C 8002C87C 0200202D */ daddu $a0, $s0, $zero /* 7C80 8002C880 0C00B0EC */ jal crash_show_handler /* 7C84 8002C884 0200202D */ daddu $a0, $s0, $zero .L8002C888: /* 7C88 8002C888 0800B222 */ j .L8002C888 -/* 7C8C 8002C88C 00000000 */ nop +/* 7C8C 8002C88C 00000000 */ nop diff --git a/asm/nonmatchings/code_7340_len_b00/crash_print_fpr.s b/asm/nonmatchings/code_7340_len_b00/crash_print_fpr.s index c7874dd278..31c4c89e12 100644 --- a/asm/nonmatchings/code_7340_len_b00/crash_print_fpr.s +++ b/asm/nonmatchings/code_7340_len_b00/crash_print_fpr.s @@ -12,7 +12,7 @@ glabel crash_print_fpr /* 76D4 8002C2D4 14400003 */ bnez $v0, .L8002C2E4 /* 76D8 8002C2D8 00C0402D */ daddu $t0, $a2, $zero /* 76DC 8002C2DC 1460000A */ bnez $v1, .L8002C308 -/* 76E0 8002C2E0 00000000 */ nop +/* 76E0 8002C2E0 00000000 */ nop .L8002C2E4: /* 76E4 8002C2E4 3C06800A */ lui $a2, %hi(D_80098034) /* 76E8 8002C2E8 24C68034 */ addiu $a2, $a2, %lo(D_80098034) @@ -22,7 +22,7 @@ glabel crash_print_fpr /* 76F8 8002C2F8 0C00B082 */ jal crash_printf_string /* 76FC 8002C2FC 0100382D */ daddu $a3, $t0, $zero /* 7700 8002C300 0800B0C6 */ j .L8002C318 -/* 7704 8002C304 00000000 */ nop +/* 7704 8002C304 00000000 */ nop .L8002C308: /* 7708 8002C308 3C06800A */ lui $a2, %hi(D_80098040) /* 770C 8002C30C 24C68040 */ addiu $a2, $a2, %lo(D_80098040) diff --git a/asm/nonmatchings/code_7340_len_b00/crash_show_handler.s b/asm/nonmatchings/code_7340_len_b00/crash_show_handler.s index c5f7ed8bf9..dc2045b0c6 100644 --- a/asm/nonmatchings/code_7340_len_b00/crash_show_handler.s +++ b/asm/nonmatchings/code_7340_len_b00/crash_show_handler.s @@ -22,7 +22,7 @@ glabel crash_show_handler /* 77F0 8002C3F0 24100011 */ addiu $s0, $zero, 0x11 .L8002C3F4: /* 77F4 8002C3F4 0C018634 */ jal osWritebackDCacheAll -/* 77F8 8002C3F8 00000000 */ nop +/* 77F8 8002C3F8 00000000 */ nop /* 77FC 8002C3FC 24040019 */ addiu $a0, $zero, 0x19 /* 7800 8002C400 24050014 */ addiu $a1, $zero, 0x14 /* 7804 8002C404 2406010E */ addiu $a2, $zero, 0x10e @@ -58,7 +58,7 @@ glabel crash_show_handler /* 787C 8002C47C 3C04800A */ lui $a0, %hi(D_8009C4FC) /* 7880 8002C480 8C84C4FC */ lw $a0, %lo(D_8009C4FC)($a0) /* 7884 8002C484 0C019C08 */ jal osViSwapBuffer -/* 7888 8002C488 00000000 */ nop +/* 7888 8002C488 00000000 */ nop /* 788C 8002C48C 24040019 */ addiu $a0, $zero, 0x19 /* 7890 8002C490 2405002D */ addiu $a1, $zero, 0x2d /* 7894 8002C494 2406010E */ addiu $a2, $zero, 0x10e @@ -164,7 +164,7 @@ glabel crash_show_handler /* 7A24 8002C624 2405008C */ addiu $a1, $zero, 0x8c /* 7A28 8002C628 8E24012C */ lw $a0, 0x12c($s1) /* 7A2C 8002C62C 0C00B0C9 */ jal func_8002C324 -/* 7A30 8002C630 00000000 */ nop +/* 7A30 8002C630 00000000 */ nop /* 7A34 8002C634 2404001E */ addiu $a0, $zero, 0x1e /* 7A38 8002C638 240500AA */ addiu $a1, $zero, 0xaa /* 7A3C 8002C63C 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/code_7340_len_b00/func_8002BFB0.s b/asm/nonmatchings/code_7340_len_b00/func_8002BFB0.s index 250cabd36e..27ff037da0 100644 --- a/asm/nonmatchings/code_7340_len_b00/func_8002BFB0.s +++ b/asm/nonmatchings/code_7340_len_b00/func_8002BFB0.s @@ -7,7 +7,7 @@ glabel func_8002BFB0 /* 73B8 8002BFB8 950309D0 */ lhu $v1, 0x9d0($t0) /* 73BC 8002BFBC 24020280 */ addiu $v0, $zero, 0x280 /* 73C0 8002BFC0 14620005 */ bne $v1, $v0, .L8002BFD8 -/* 73C4 8002BFC4 00000000 */ nop +/* 73C4 8002BFC4 00000000 */ nop /* 73C8 8002BFC8 00042040 */ sll $a0, $a0, 1 /* 73CC 8002BFCC 00052840 */ sll $a1, $a1, 1 /* 73D0 8002BFD0 00063040 */ sll $a2, $a2, 1 @@ -44,7 +44,7 @@ glabel func_8002BFB0 /* 743C 8002C03C 00822021 */ addu $a0, $a0, $v0 /* 7440 8002C040 00A7102A */ slt $v0, $a1, $a3 /* 7444 8002C044 1440FFEE */ bnez $v0, .L8002C000 -/* 7448 8002C048 00000000 */ nop +/* 7448 8002C048 00000000 */ nop .L8002C04C: /* 744C 8002C04C 03E00008 */ jr $ra -/* 7450 8002C050 00000000 */ nop +/* 7450 8002C050 00000000 */ nop diff --git a/asm/nonmatchings/code_7340_len_b00/func_8002C054.s b/asm/nonmatchings/code_7340_len_b00/func_8002C054.s index 50ac9e5d05..01f1216da3 100644 --- a/asm/nonmatchings/code_7340_len_b00/func_8002C054.s +++ b/asm/nonmatchings/code_7340_len_b00/func_8002C054.s @@ -66,7 +66,7 @@ glabel func_8002C054 /* 753C 8002C13C 018D2006 */ srlv $a0, $t5, $t4 .L8002C140: /* 7540 8002C140 03E00008 */ jr $ra -/* 7544 8002C144 00000000 */ nop +/* 7544 8002C144 00000000 */ nop .L8002C148: /* 7548 8002C148 1462FFFD */ bne $v1, $v0, .L8002C140 /* 754C 8002C14C 0000482D */ daddu $t1, $zero, $zero @@ -105,4 +105,4 @@ glabel func_8002C054 /* 75C4 8002C1C4 1440FFEA */ bnez $v0, .L8002C170 /* 75C8 8002C1C8 246309E8 */ addiu $v1, $v1, 0x9e8 /* 75CC 8002C1CC 03E00008 */ jr $ra -/* 75D0 8002C1D0 00000000 */ nop +/* 75D0 8002C1D0 00000000 */ nop diff --git a/asm/nonmatchings/code_7340_len_b00/func_8002C324.s b/asm/nonmatchings/code_7340_len_b00/func_8002C324.s index a0f390ea7f..be4507d08c 100644 --- a/asm/nonmatchings/code_7340_len_b00/func_8002C324.s +++ b/asm/nonmatchings/code_7340_len_b00/func_8002C324.s @@ -28,7 +28,7 @@ glabel func_8002C324 /* 777C 8002C37C 0C00B082 */ jal crash_printf_string /* 7780 8002C380 2405009B */ addiu $a1, $zero, 0x9b /* 7784 8002C384 0800B0E7 */ j .L8002C39C -/* 7788 8002C388 00000000 */ nop +/* 7788 8002C388 00000000 */ nop .L8002C38C: /* 778C 8002C38C 24630001 */ addiu $v1, $v1, 1 /* 7790 8002C390 28620006 */ slti $v0, $v1, 6 diff --git a/asm/nonmatchings/code_7340_len_b00/func_8002C7B0.s b/asm/nonmatchings/code_7340_len_b00/func_8002C7B0.s index ac0dc0949a..25a77bbb1f 100644 --- a/asm/nonmatchings/code_7340_len_b00/func_8002C7B0.s +++ b/asm/nonmatchings/code_7340_len_b00/func_8002C7B0.s @@ -5,7 +5,7 @@ glabel func_8002C7B0 /* 7BB0 8002C7B0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 7BB4 8002C7B4 AFBF0010 */ sw $ra, 0x10($sp) /* 7BB8 8002C7B8 0C0198A4 */ jal osGetActiveQueue -/* 7BBC 8002C7BC 00000000 */ nop +/* 7BBC 8002C7BC 00000000 */ nop /* 7BC0 8002C7C0 0040202D */ daddu $a0, $v0, $zero /* 7BC4 8002C7C4 8C830004 */ lw $v1, 4($a0) /* 7BC8 8002C7C8 2402FFFF */ addiu $v0, $zero, -1 @@ -17,7 +17,7 @@ glabel func_8002C7B0 .L8002C7E0: /* 7BE0 8002C7E0 2C42007E */ sltiu $v0, $v0, 0x7e /* 7BE4 8002C7E4 10400005 */ beqz $v0, .L8002C7FC -/* 7BE8 8002C7E8 00000000 */ nop +/* 7BE8 8002C7E8 00000000 */ nop /* 7BEC 8002C7EC 94820012 */ lhu $v0, 0x12($a0) /* 7BF0 8002C7F0 30420003 */ andi $v0, $v0, 3 /* 7BF4 8002C7F4 14400006 */ bnez $v0, .L8002C810 diff --git a/asm/nonmatchings/code_7340_len_b00/func_8002C94C.s b/asm/nonmatchings/code_7340_len_b00/func_8002C94C.s index 9deb730745..34454f8d9f 100644 --- a/asm/nonmatchings/code_7340_len_b00/func_8002C94C.s +++ b/asm/nonmatchings/code_7340_len_b00/func_8002C94C.s @@ -63,6 +63,6 @@ glabel func_8002C94C /* 7E28 8002CA28 8FB00110 */ lw $s0, 0x110($sp) /* 7E2C 8002CA2C 03E00008 */ jr $ra /* 7E30 8002CA30 27BD0130 */ addiu $sp, $sp, 0x130 -/* 7E34 8002CA34 00000000 */ nop -/* 7E38 8002CA38 00000000 */ nop -/* 7E3C 8002CA3C 00000000 */ nop +/* 7E34 8002CA34 00000000 */ nop +/* 7E38 8002CA38 00000000 */ nop +/* 7E3C 8002CA3C 00000000 */ nop diff --git a/asm/nonmatchings/code_73D860/func_802A1000_73D860.s b/asm/nonmatchings/code_73D860/func_802A1000_73D860.s index ad152585cc..81bd841158 100644 --- a/asm/nonmatchings/code_73D860/func_802A1000_73D860.s +++ b/asm/nonmatchings/code_73D860/func_802A1000_73D860.s @@ -24,16 +24,16 @@ glabel func_802A1000_73D860 /* 73D8AC 802A104C E7A00014 */ swc1 $f0, 0x14($sp) /* 73D8B0 802A1050 3C014170 */ lui $at, 0x4170 /* 73D8B4 802A1054 44811000 */ mtc1 $at, $f2 -/* 73D8B8 802A1058 00000000 */ nop +/* 73D8B8 802A1058 00000000 */ nop /* 73D8BC 802A105C 46020002 */ mul.s $f0, $f0, $f2 -/* 73D8C0 802A1060 00000000 */ nop +/* 73D8C0 802A1060 00000000 */ nop /* 73D8C4 802A1064 3C0142C8 */ lui $at, 0x42c8 /* 73D8C8 802A1068 44811000 */ mtc1 $at, $f2 -/* 73D8CC 802A106C 00000000 */ nop +/* 73D8CC 802A106C 00000000 */ nop /* 73D8D0 802A1070 46020003 */ div.s $f0, $f0, $f2 /* 73D8D4 802A1074 4600020D */ trunc.w.s $f8, $f0 /* 73D8D8 802A1078 44024000 */ mfc1 $v0, $f8 -/* 73D8DC 802A107C 00000000 */ nop +/* 73D8DC 802A107C 00000000 */ nop /* 73D8E0 802A1080 AE020084 */ sw $v0, 0x84($s0) /* 73D8E4 802A1084 28420015 */ slti $v0, $v0, 0x15 /* 73D8E8 802A1088 14400002 */ bnez $v0, .L802A1094 @@ -42,7 +42,7 @@ glabel func_802A1000_73D860 .L802A1094: /* 73D8F4 802A1094 82220083 */ lb $v0, 0x83($s1) /* 73D8F8 802A1098 10400007 */ beqz $v0, .L802A10B8 -/* 73D8FC 802A109C 00000000 */ nop +/* 73D8FC 802A109C 00000000 */ nop /* 73D900 802A10A0 8E020084 */ lw $v0, 0x84($s0) /* 73D904 802A10A4 28420006 */ slti $v0, $v0, 6 /* 73D908 802A10A8 10400008 */ beqz $v0, .L802A10CC diff --git a/asm/nonmatchings/code_73D860/func_802A10E4_73D944.s b/asm/nonmatchings/code_73D860/func_802A10E4_73D944.s index 988118c188..12822afe94 100644 --- a/asm/nonmatchings/code_73D860/func_802A10E4_73D944.s +++ b/asm/nonmatchings/code_73D860/func_802A10E4_73D944.s @@ -11,14 +11,14 @@ glabel func_802A10E4_73D944 /* 73D95C 802A10FC 10400005 */ beqz $v0, .L802A1114 /* 73D960 802A1100 24020002 */ addiu $v0, $zero, 2 /* 73D964 802A1104 1060000A */ beqz $v1, .L802A1130 -/* 73D968 802A1108 00000000 */ nop +/* 73D968 802A1108 00000000 */ nop /* 73D96C 802A110C 080A844C */ j .L802A1130 -/* 73D970 802A1110 00000000 */ nop +/* 73D970 802A1110 00000000 */ nop .L802A1114: /* 73D974 802A1114 50620004 */ beql $v1, $v0, .L802A1128 /* 73D978 802A1118 24020003 */ addiu $v0, $zero, 3 /* 73D97C 802A111C 080A844C */ j .L802A1130 -/* 73D980 802A1120 00000000 */ nop +/* 73D980 802A1120 00000000 */ nop .L802A1124: /* 73D984 802A1124 24020002 */ addiu $v0, $zero, 2 .L802A1128: @@ -26,6 +26,6 @@ glabel func_802A10E4_73D944 /* 73D98C 802A112C 24020002 */ addiu $v0, $zero, 2 .L802A1130: /* 73D990 802A1130 03E00008 */ jr $ra -/* 73D994 802A1134 00000000 */ nop -/* 73D998 802A1138 00000000 */ nop -/* 73D99C 802A113C 00000000 */ nop +/* 73D994 802A1134 00000000 */ nop +/* 73D998 802A1138 00000000 */ nop +/* 73D99C 802A113C 00000000 */ nop diff --git a/asm/nonmatchings/code_740CC0/func_802A1000_740CC0.s b/asm/nonmatchings/code_740CC0/func_802A1000_740CC0.s index dbf1ae0c78..d64dab6e10 100644 --- a/asm/nonmatchings/code_740CC0/func_802A1000_740CC0.s +++ b/asm/nonmatchings/code_740CC0/func_802A1000_740CC0.s @@ -24,16 +24,16 @@ glabel func_802A1000_740CC0 /* 740D0C 802A104C E7A00014 */ swc1 $f0, 0x14($sp) /* 740D10 802A1050 3C014170 */ lui $at, 0x4170 /* 740D14 802A1054 44811000 */ mtc1 $at, $f2 -/* 740D18 802A1058 00000000 */ nop +/* 740D18 802A1058 00000000 */ nop /* 740D1C 802A105C 46020002 */ mul.s $f0, $f0, $f2 -/* 740D20 802A1060 00000000 */ nop +/* 740D20 802A1060 00000000 */ nop /* 740D24 802A1064 3C0142C8 */ lui $at, 0x42c8 /* 740D28 802A1068 44811000 */ mtc1 $at, $f2 -/* 740D2C 802A106C 00000000 */ nop +/* 740D2C 802A106C 00000000 */ nop /* 740D30 802A1070 46020003 */ div.s $f0, $f0, $f2 /* 740D34 802A1074 4600020D */ trunc.w.s $f8, $f0 /* 740D38 802A1078 44024000 */ mfc1 $v0, $f8 -/* 740D3C 802A107C 00000000 */ nop +/* 740D3C 802A107C 00000000 */ nop /* 740D40 802A1080 AE020084 */ sw $v0, 0x84($s0) /* 740D44 802A1084 28420015 */ slti $v0, $v0, 0x15 /* 740D48 802A1088 14400002 */ bnez $v0, .L802A1094 @@ -42,7 +42,7 @@ glabel func_802A1000_740CC0 .L802A1094: /* 740D54 802A1094 82220083 */ lb $v0, 0x83($s1) /* 740D58 802A1098 10400007 */ beqz $v0, .L802A10B8 -/* 740D5C 802A109C 00000000 */ nop +/* 740D5C 802A109C 00000000 */ nop /* 740D60 802A10A0 8E020084 */ lw $v0, 0x84($s0) /* 740D64 802A10A4 28420006 */ slti $v0, $v0, 6 /* 740D68 802A10A8 10400008 */ beqz $v0, .L802A10CC diff --git a/asm/nonmatchings/code_743DF0/func_802A1000_743DF0.s b/asm/nonmatchings/code_743DF0/func_802A1000_743DF0.s index 1b44a93e1b..30fd701789 100644 --- a/asm/nonmatchings/code_743DF0/func_802A1000_743DF0.s +++ b/asm/nonmatchings/code_743DF0/func_802A1000_743DF0.s @@ -24,16 +24,16 @@ glabel func_802A1000_743DF0 /* 743E3C 802A104C E7A00014 */ swc1 $f0, 0x14($sp) /* 743E40 802A1050 3C014170 */ lui $at, 0x4170 /* 743E44 802A1054 44811000 */ mtc1 $at, $f2 -/* 743E48 802A1058 00000000 */ nop +/* 743E48 802A1058 00000000 */ nop /* 743E4C 802A105C 46020002 */ mul.s $f0, $f0, $f2 -/* 743E50 802A1060 00000000 */ nop +/* 743E50 802A1060 00000000 */ nop /* 743E54 802A1064 3C0142C8 */ lui $at, 0x42c8 /* 743E58 802A1068 44811000 */ mtc1 $at, $f2 -/* 743E5C 802A106C 00000000 */ nop +/* 743E5C 802A106C 00000000 */ nop /* 743E60 802A1070 46020003 */ div.s $f0, $f0, $f2 /* 743E64 802A1074 4600020D */ trunc.w.s $f8, $f0 /* 743E68 802A1078 44024000 */ mfc1 $v0, $f8 -/* 743E6C 802A107C 00000000 */ nop +/* 743E6C 802A107C 00000000 */ nop /* 743E70 802A1080 AE020084 */ sw $v0, 0x84($s0) /* 743E74 802A1084 28420015 */ slti $v0, $v0, 0x15 /* 743E78 802A1088 14400002 */ bnez $v0, .L802A1094 @@ -42,7 +42,7 @@ glabel func_802A1000_743DF0 .L802A1094: /* 743E84 802A1094 82220083 */ lb $v0, 0x83($s1) /* 743E88 802A1098 10400007 */ beqz $v0, .L802A10B8 -/* 743E8C 802A109C 00000000 */ nop +/* 743E8C 802A109C 00000000 */ nop /* 743E90 802A10A0 8E020084 */ lw $v0, 0x84($s0) /* 743E94 802A10A4 28420006 */ slti $v0, $v0, 6 /* 743E98 802A10A8 10400008 */ beqz $v0, .L802A10CC diff --git a/asm/nonmatchings/code_743DF0/func_802A11C0_743FB0.s b/asm/nonmatchings/code_743DF0/func_802A11C0_743FB0.s index 072ad87178..e6fe56d1d5 100644 --- a/asm/nonmatchings/code_743DF0/func_802A11C0_743FB0.s +++ b/asm/nonmatchings/code_743DF0/func_802A11C0_743FB0.s @@ -10,7 +10,7 @@ glabel func_802A11C0_743FB0 /* 743FC4 802A11D4 8C830000 */ lw $v1, ($a0) /* 743FC8 802A11D8 0043102A */ slt $v0, $v0, $v1 /* 743FCC 802A11DC 10400003 */ beqz $v0, .L802A11EC -/* 743FD0 802A11E0 00000000 */ nop +/* 743FD0 802A11E0 00000000 */ nop /* 743FD4 802A11E4 94820002 */ lhu $v0, 2($a0) /* 743FD8 802A11E8 A4A202A0 */ sh $v0, 0x2a0($a1) .L802A11EC: diff --git a/asm/nonmatchings/code_746E10/func_802A1000_746E10.s b/asm/nonmatchings/code_746E10/func_802A1000_746E10.s index 14538d52d2..8377207fce 100644 --- a/asm/nonmatchings/code_746E10/func_802A1000_746E10.s +++ b/asm/nonmatchings/code_746E10/func_802A1000_746E10.s @@ -24,16 +24,16 @@ glabel func_802A1000_746E10 /* 746E5C 802A104C E7A00014 */ swc1 $f0, 0x14($sp) /* 746E60 802A1050 3C014170 */ lui $at, 0x4170 /* 746E64 802A1054 44811000 */ mtc1 $at, $f2 -/* 746E68 802A1058 00000000 */ nop +/* 746E68 802A1058 00000000 */ nop /* 746E6C 802A105C 46020002 */ mul.s $f0, $f0, $f2 -/* 746E70 802A1060 00000000 */ nop +/* 746E70 802A1060 00000000 */ nop /* 746E74 802A1064 3C0142C8 */ lui $at, 0x42c8 /* 746E78 802A1068 44811000 */ mtc1 $at, $f2 -/* 746E7C 802A106C 00000000 */ nop +/* 746E7C 802A106C 00000000 */ nop /* 746E80 802A1070 46020003 */ div.s $f0, $f0, $f2 /* 746E84 802A1074 4600020D */ trunc.w.s $f8, $f0 /* 746E88 802A1078 44024000 */ mfc1 $v0, $f8 -/* 746E8C 802A107C 00000000 */ nop +/* 746E8C 802A107C 00000000 */ nop /* 746E90 802A1080 AE020084 */ sw $v0, 0x84($s0) /* 746E94 802A1084 28420015 */ slti $v0, $v0, 0x15 /* 746E98 802A1088 14400002 */ bnez $v0, .L802A1094 @@ -42,7 +42,7 @@ glabel func_802A1000_746E10 .L802A1094: /* 746EA4 802A1094 82220083 */ lb $v0, 0x83($s1) /* 746EA8 802A1098 10400007 */ beqz $v0, .L802A10B8 -/* 746EAC 802A109C 00000000 */ nop +/* 746EAC 802A109C 00000000 */ nop /* 746EB0 802A10A0 8E020084 */ lw $v0, 0x84($s0) /* 746EB4 802A10A4 28420006 */ slti $v0, $v0, 6 /* 746EB8 802A10A8 10400008 */ beqz $v0, .L802A10CC diff --git a/asm/nonmatchings/code_74AD90/func_802A10A4_74AE34.s b/asm/nonmatchings/code_74AD90/func_802A10A4_74AE34.s index ad97c49581..1420d1c3f8 100644 --- a/asm/nonmatchings/code_74AD90/func_802A10A4_74AE34.s +++ b/asm/nonmatchings/code_74AD90/func_802A10A4_74AE34.s @@ -26,16 +26,16 @@ glabel func_802A10A4_74AE34 /* 74AE88 802A10F8 0040382D */ daddu $a3, $v0, $zero /* 74AE8C 802A10FC 2642001E */ addiu $v0, $s2, 0x1e /* 74AE90 802A1100 44821000 */ mtc1 $v0, $f2 -/* 74AE94 802A1104 00000000 */ nop +/* 74AE94 802A1104 00000000 */ nop /* 74AE98 802A1108 468010A0 */ cvt.s.w $f2, $f2 /* 74AE9C 802A110C 26020019 */ addiu $v0, $s0, 0x19 /* 74AEA0 802A1110 44051000 */ mfc1 $a1, $f2 /* 74AEA4 802A1114 44821000 */ mtc1 $v0, $f2 -/* 74AEA8 802A1118 00000000 */ nop +/* 74AEA8 802A1118 00000000 */ nop /* 74AEAC 802A111C 468010A0 */ cvt.s.w $f2, $f2 /* 74AEB0 802A1120 44061000 */ mfc1 $a2, $f2 /* 74AEB4 802A1124 44871000 */ mtc1 $a3, $f2 -/* 74AEB8 802A1128 00000000 */ nop +/* 74AEB8 802A1128 00000000 */ nop /* 74AEBC 802A112C 468010A0 */ cvt.s.w $f2, $f2 /* 74AEC0 802A1130 3C014234 */ lui $at, 0x4234 /* 74AEC4 802A1134 44810000 */ mtc1 $at, $f0 @@ -45,16 +45,16 @@ glabel func_802A10A4_74AE34 .L802A1144: /* 74AED4 802A1144 2642001E */ addiu $v0, $s2, 0x1e /* 74AED8 802A1148 44821000 */ mtc1 $v0, $f2 -/* 74AEDC 802A114C 00000000 */ nop +/* 74AEDC 802A114C 00000000 */ nop /* 74AEE0 802A1150 468010A0 */ cvt.s.w $f2, $f2 /* 74AEE4 802A1154 26020019 */ addiu $v0, $s0, 0x19 /* 74AEE8 802A1158 44051000 */ mfc1 $a1, $f2 /* 74AEEC 802A115C 44821000 */ mtc1 $v0, $f2 -/* 74AEF0 802A1160 00000000 */ nop +/* 74AEF0 802A1160 00000000 */ nop /* 74AEF4 802A1164 468010A0 */ cvt.s.w $f2, $f2 /* 74AEF8 802A1168 44061000 */ mfc1 $a2, $f2 /* 74AEFC 802A116C 44871000 */ mtc1 $a3, $f2 -/* 74AF00 802A1170 00000000 */ nop +/* 74AF00 802A1170 00000000 */ nop /* 74AF04 802A1174 468010A0 */ cvt.s.w $f2, $f2 /* 74AF08 802A1178 3C014234 */ lui $at, 0x4234 /* 74AF0C 802A117C 44810000 */ mtc1 $at, $f0 @@ -70,4 +70,4 @@ glabel func_802A10A4_74AE34 /* 74AF30 802A11A0 24020002 */ addiu $v0, $zero, 2 /* 74AF34 802A11A4 03E00008 */ jr $ra /* 74AF38 802A11A8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 74AF3C 802A11AC 00000000 */ nop +/* 74AF3C 802A11AC 00000000 */ nop diff --git a/asm/nonmatchings/code_74F130/func_802A10C8_74F1F8.s b/asm/nonmatchings/code_74F130/func_802A10C8_74F1F8.s index 6ea47cd9c9..d17c777d74 100644 --- a/asm/nonmatchings/code_74F130/func_802A10C8_74F1F8.s +++ b/asm/nonmatchings/code_74F130/func_802A10C8_74F1F8.s @@ -23,15 +23,15 @@ glabel func_802A10C8_74F1F8 /* 74F240 802A1110 0040802D */ daddu $s0, $v0, $zero /* 74F244 802A1114 0000202D */ daddu $a0, $zero, $zero /* 74F248 802A1118 44921000 */ mtc1 $s2, $f2 -/* 74F24C 802A111C 00000000 */ nop +/* 74F24C 802A111C 00000000 */ nop /* 74F250 802A1120 468010A0 */ cvt.s.w $f2, $f2 /* 74F254 802A1124 44051000 */ mfc1 $a1, $f2 /* 74F258 802A1128 44901000 */ mtc1 $s0, $f2 -/* 74F25C 802A112C 00000000 */ nop +/* 74F25C 802A112C 00000000 */ nop /* 74F260 802A1130 468010A0 */ cvt.s.w $f2, $f2 /* 74F264 802A1134 44061000 */ mfc1 $a2, $f2 /* 74F268 802A1138 44821000 */ mtc1 $v0, $f2 -/* 74F26C 802A113C 00000000 */ nop +/* 74F26C 802A113C 00000000 */ nop /* 74F270 802A1140 468010A0 */ cvt.s.w $f2, $f2 /* 74F274 802A1144 3C013F80 */ lui $at, 0x3f80 /* 74F278 802A1148 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_74F130/func_802A11CC_74F2FC.s b/asm/nonmatchings/code_74F130/func_802A11CC_74F2FC.s index de2c5ccf96..05459ef1fa 100644 --- a/asm/nonmatchings/code_74F130/func_802A11CC_74F2FC.s +++ b/asm/nonmatchings/code_74F130/func_802A11CC_74F2FC.s @@ -30,16 +30,16 @@ glabel func_802A11CC_74F2FC /* 74F360 802A1230 24040006 */ addiu $a0, $zero, 6 /* 74F364 802A1234 2673000A */ addiu $s3, $s3, 0xa /* 74F368 802A1238 44931000 */ mtc1 $s3, $f2 -/* 74F36C 802A123C 00000000 */ nop +/* 74F36C 802A123C 00000000 */ nop /* 74F370 802A1240 468010A0 */ cvt.s.w $f2, $f2 /* 74F374 802A1244 26520012 */ addiu $s2, $s2, 0x12 /* 74F378 802A1248 44051000 */ mfc1 $a1, $f2 /* 74F37C 802A124C 44921000 */ mtc1 $s2, $f2 -/* 74F380 802A1250 00000000 */ nop +/* 74F380 802A1250 00000000 */ nop /* 74F384 802A1254 468010A0 */ cvt.s.w $f2, $f2 /* 74F388 802A1258 44061000 */ mfc1 $a2, $f2 /* 74F38C 802A125C 44901000 */ mtc1 $s0, $f2 -/* 74F390 802A1260 00000000 */ nop +/* 74F390 802A1260 00000000 */ nop /* 74F394 802A1264 468010A0 */ cvt.s.w $f2, $f2 /* 74F398 802A1268 44071000 */ mfc1 $a3, $f2 /* 74F39C 802A126C 2402002D */ addiu $v0, $zero, 0x2d @@ -54,4 +54,4 @@ glabel func_802A11CC_74F2FC /* 74F3C0 802A1290 24020002 */ addiu $v0, $zero, 2 /* 74F3C4 802A1294 03E00008 */ jr $ra /* 74F3C8 802A1298 27BD0030 */ addiu $sp, $sp, 0x30 -/* 74F3CC 802A129C 00000000 */ nop +/* 74F3CC 802A129C 00000000 */ nop diff --git a/asm/nonmatchings/code_759b0_len_61b0/appendGfx_player.s b/asm/nonmatchings/code_759b0_len_61b0/appendGfx_player.s index 0d1cbe9e1f..2c639668d5 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/appendGfx_player.s +++ b/asm/nonmatchings/code_759b0_len_61b0/appendGfx_player.s @@ -92,7 +92,7 @@ glabel appendGfx_player /* 7A8FC 800E144C E7B40010 */ swc1 $f20, 0x10($sp) /* 7A900 800E1450 C64C008C */ lwc1 $f12, 0x8c($s2) /* 7A904 800E1454 0C00A6C9 */ jal clamp_angle -/* 7A908 800E1458 00000000 */ nop +/* 7A908 800E1458 00000000 */ nop /* 7A90C 800E145C 44050000 */ mfc1 $a1, $f0 /* 7A910 800E1460 4406A000 */ mfc1 $a2, $f20 /* 7A914 800E1464 4407A000 */ mfc1 $a3, $f20 @@ -110,10 +110,10 @@ glabel appendGfx_player /* 7A944 800E1494 4481C000 */ mtc1 $at, $f24 /* 7A948 800E1498 00021023 */ negu $v0, $v0 /* 7A94C 800E149C 44820000 */ mtc1 $v0, $f0 -/* 7A950 800E14A0 00000000 */ nop +/* 7A950 800E14A0 00000000 */ nop /* 7A954 800E14A4 46800020 */ cvt.s.w $f0, $f0 /* 7A958 800E14A8 46180002 */ mul.s $f0, $f0, $f24 -/* 7A95C 800E14AC 00000000 */ nop +/* 7A95C 800E14AC 00000000 */ nop /* 7A960 800E14B0 27B10060 */ addiu $s1, $sp, 0x60 /* 7A964 800E14B4 4405A000 */ mfc1 $a1, $f20 /* 7A968 800E14B8 4407A000 */ mfc1 $a3, $f20 @@ -146,10 +146,10 @@ glabel appendGfx_player /* 7A9D4 800E1524 0080302D */ daddu $a2, $a0, $zero /* 7A9D8 800E1528 864200B0 */ lh $v0, 0xb0($s2) /* 7A9DC 800E152C 44820000 */ mtc1 $v0, $f0 -/* 7A9E0 800E1530 00000000 */ nop +/* 7A9E0 800E1530 00000000 */ nop /* 7A9E4 800E1534 46800020 */ cvt.s.w $f0, $f0 /* 7A9E8 800E1538 46180002 */ mul.s $f0, $f0, $f24 -/* 7A9EC 800E153C 00000000 */ nop +/* 7A9EC 800E153C 00000000 */ nop /* 7A9F0 800E1540 0220202D */ daddu $a0, $s1, $zero /* 7A9F4 800E1544 4405A000 */ mfc1 $a1, $f20 /* 7A9F8 800E1548 44060000 */ mfc1 $a2, $f0 @@ -228,16 +228,16 @@ glabel appendGfx_player /* 7AB14 800E1664 C64200A8 */ lwc1 $f2, 0xa8($s2) /* 7AB18 800E1668 3C0142B4 */ lui $at, 0x42b4 /* 7AB1C 800E166C 44810000 */ mtc1 $at, $f0 -/* 7AB20 800E1670 00000000 */ nop +/* 7AB20 800E1670 00000000 */ nop /* 7AB24 800E1674 4602003E */ c.le.s $f0, $f2 -/* 7AB28 800E1678 00000000 */ nop +/* 7AB28 800E1678 00000000 */ nop /* 7AB2C 800E167C 45000008 */ bc1f .L800E16A0 /* 7AB30 800E1680 0000202D */ daddu $a0, $zero, $zero /* 7AB34 800E1684 3C014387 */ lui $at, 0x4387 /* 7AB38 800E1688 44810000 */ mtc1 $at, $f0 -/* 7AB3C 800E168C 00000000 */ nop +/* 7AB3C 800E168C 00000000 */ nop /* 7AB40 800E1690 4600103C */ c.lt.s $f2, $f0 -/* 7AB44 800E1694 00000000 */ nop +/* 7AB44 800E1694 00000000 */ nop /* 7AB48 800E1698 45030001 */ bc1tl .L800E16A0 /* 7AB4C 800E169C 3C041000 */ lui $a0, 0x1000 .L800E16A0: @@ -248,7 +248,7 @@ glabel appendGfx_player /* 7AB60 800E16B0 00A0382D */ daddu $a3, $a1, $zero .L800E16B4: /* 7AB64 800E16B4 0C0B7710 */ jal render_sprite -/* 7AB68 800E16B8 00000000 */ nop +/* 7AB68 800E16B8 00000000 */ nop /* 7AB6C 800E16BC 3C03800F */ lui $v1, %hi(D_800F7B4C) /* 7AB70 800E16C0 24637B4C */ addiu $v1, $v1, %lo(D_800F7B4C) /* 7AB74 800E16C4 8C620000 */ lw $v0, ($v1) diff --git a/asm/nonmatchings/code_759b0_len_61b0/appendGfx_player_spin.s b/asm/nonmatchings/code_759b0_len_61b0/appendGfx_player_spin.s index 20e53ddd71..6d721d1622 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/appendGfx_player_spin.s +++ b/asm/nonmatchings/code_759b0_len_61b0/appendGfx_player_spin.s @@ -44,36 +44,36 @@ glabel appendGfx_player_spin /* 7AC4C 800E179C C62200A8 */ lwc1 $f2, 0xa8($s1) /* 7AC50 800E17A0 3C0142B4 */ lui $at, 0x42b4 /* 7AC54 800E17A4 44810000 */ mtc1 $at, $f0 -/* 7AC58 800E17A8 00000000 */ nop +/* 7AC58 800E17A8 00000000 */ nop /* 7AC5C 800E17AC 4602003C */ c.lt.s $f0, $f2 -/* 7AC60 800E17B0 00000000 */ nop +/* 7AC60 800E17B0 00000000 */ nop /* 7AC64 800E17B4 4500000A */ bc1f .L800E17E0 -/* 7AC68 800E17B8 00000000 */ nop +/* 7AC68 800E17B8 00000000 */ nop /* 7AC6C 800E17BC 3C014334 */ lui $at, 0x4334 /* 7AC70 800E17C0 44812000 */ mtc1 $at, $f4 -/* 7AC74 800E17C4 00000000 */ nop +/* 7AC74 800E17C4 00000000 */ nop /* 7AC78 800E17C8 4604103E */ c.le.s $f2, $f4 -/* 7AC7C 800E17CC 00000000 */ nop +/* 7AC7C 800E17CC 00000000 */ nop /* 7AC80 800E17D0 45000003 */ bc1f .L800E17E0 -/* 7AC84 800E17D4 00000000 */ nop +/* 7AC84 800E17D4 00000000 */ nop /* 7AC88 800E17D8 0803861C */ j .L800E1870 /* 7AC8C 800E17DC 46022501 */ sub.s $f20, $f4, $f2 .L800E17E0: /* 7AC90 800E17E0 C62000A8 */ lwc1 $f0, 0xa8($s1) /* 7AC94 800E17E4 3C014334 */ lui $at, 0x4334 /* 7AC98 800E17E8 44812000 */ mtc1 $at, $f4 -/* 7AC9C 800E17EC 00000000 */ nop +/* 7AC9C 800E17EC 00000000 */ nop /* 7ACA0 800E17F0 4600203C */ c.lt.s $f4, $f0 -/* 7ACA4 800E17F4 00000000 */ nop +/* 7ACA4 800E17F4 00000000 */ nop /* 7ACA8 800E17F8 4500000C */ bc1f .L800E182C -/* 7ACAC 800E17FC 00000000 */ nop +/* 7ACAC 800E17FC 00000000 */ nop /* 7ACB0 800E1800 3C014387 */ lui $at, 0x4387 /* 7ACB4 800E1804 44812000 */ mtc1 $at, $f4 -/* 7ACB8 800E1808 00000000 */ nop +/* 7ACB8 800E1808 00000000 */ nop /* 7ACBC 800E180C 4604003E */ c.le.s $f0, $f4 -/* 7ACC0 800E1810 00000000 */ nop +/* 7ACC0 800E1810 00000000 */ nop /* 7ACC4 800E1814 45000008 */ bc1f .L800E1838 -/* 7ACC8 800E1818 00000000 */ nop +/* 7ACC8 800E1818 00000000 */ nop /* 7ACCC 800E181C 3C014334 */ lui $at, 0x4334 /* 7ACD0 800E1820 44812000 */ mtc1 $at, $f4 /* 7ACD4 800E1824 0803861C */ j .L800E1870 @@ -81,19 +81,19 @@ glabel appendGfx_player_spin .L800E182C: /* 7ACDC 800E182C 3C014387 */ lui $at, 0x4387 /* 7ACE0 800E1830 44812000 */ mtc1 $at, $f4 -/* 7ACE4 800E1834 00000000 */ nop +/* 7ACE4 800E1834 00000000 */ nop .L800E1838: /* 7ACE8 800E1838 4600203C */ c.lt.s $f4, $f0 -/* 7ACEC 800E183C 00000000 */ nop +/* 7ACEC 800E183C 00000000 */ nop /* 7ACF0 800E1840 4500000A */ bc1f .L800E186C -/* 7ACF4 800E1844 00000000 */ nop +/* 7ACF4 800E1844 00000000 */ nop /* 7ACF8 800E1848 3C0143B4 */ lui $at, 0x43b4 /* 7ACFC 800E184C 44811000 */ mtc1 $at, $f2 -/* 7AD00 800E1850 00000000 */ nop +/* 7AD00 800E1850 00000000 */ nop /* 7AD04 800E1854 4602003E */ c.le.s $f0, $f2 -/* 7AD08 800E1858 00000000 */ nop +/* 7AD08 800E1858 00000000 */ nop /* 7AD0C 800E185C 45000003 */ bc1f .L800E186C -/* 7AD10 800E1860 00000000 */ nop +/* 7AD10 800E1860 00000000 */ nop /* 7AD14 800E1864 0803861C */ j .L800E1870 /* 7AD18 800E1868 46001501 */ sub.s $f20, $f2, $f0 .L800E186C: @@ -101,11 +101,11 @@ glabel appendGfx_player_spin .L800E1870: /* 7AD20 800E1870 3C0141C8 */ lui $at, 0x41c8 /* 7AD24 800E1874 44810000 */ mtc1 $at, $f0 -/* 7AD28 800E1878 00000000 */ nop +/* 7AD28 800E1878 00000000 */ nop /* 7AD2C 800E187C 4600A003 */ div.s $f0, $f20, $f0 /* 7AD30 800E1880 4600010D */ trunc.w.s $f4, $f0 /* 7AD34 800E1884 44062000 */ mfc1 $a2, $f4 -/* 7AD38 800E1888 00000000 */ nop +/* 7AD38 800E1888 00000000 */ nop /* 7AD3C 800E188C 00061100 */ sll $v0, $a2, 4 /* 7AD40 800E1890 00461023 */ subu $v0, $v0, $a2 /* 7AD44 800E1894 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel appendGfx_player_spin /* 7AD88 800E18D8 E7B60010 */ swc1 $f22, 0x10($sp) /* 7AD8C 800E18DC C62C008C */ lwc1 $f12, 0x8c($s1) /* 7AD90 800E18E0 0C00A6C9 */ jal clamp_angle -/* 7AD94 800E18E4 00000000 */ nop +/* 7AD94 800E18E4 00000000 */ nop /* 7AD98 800E18E8 44050000 */ mfc1 $a1, $f0 /* 7AD9C 800E18EC 4406B000 */ mfc1 $a2, $f22 /* 7ADA0 800E18F0 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel appendGfx_player_spin /* 7AE04 800E1954 0000202D */ daddu $a0, $zero, $zero .L800E1958: /* 7AE08 800E1958 4486C000 */ mtc1 $a2, $f24 -/* 7AE0C 800E195C 00000000 */ nop +/* 7AE0C 800E195C 00000000 */ nop /* 7AE10 800E1960 4680C620 */ cvt.s.w $f24, $f24 /* 7AE14 800E1964 0000202D */ daddu $a0, $zero, $zero .L800E1968: @@ -204,10 +204,10 @@ glabel appendGfx_player_spin /* 7AEA4 800E19F4 44812000 */ mtc1 $at, $f4 /* 7AEA8 800E19F8 00021023 */ negu $v0, $v0 /* 7AEAC 800E19FC 44820000 */ mtc1 $v0, $f0 -/* 7AEB0 800E1A00 00000000 */ nop +/* 7AEB0 800E1A00 00000000 */ nop /* 7AEB4 800E1A04 46800020 */ cvt.s.w $f0, $f0 /* 7AEB8 800E1A08 46040102 */ mul.s $f4, $f0, $f4 -/* 7AEBC 800E1A0C 00000000 */ nop +/* 7AEBC 800E1A0C 00000000 */ nop /* 7AEC0 800E1A10 4405B000 */ mfc1 $a1, $f22 /* 7AEC4 800E1A14 4407B000 */ mfc1 $a3, $f22 /* 7AEC8 800E1A18 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel appendGfx_player_spin /* 7AF38 800E1A88 3C013F00 */ lui $at, 0x3f00 /* 7AF3C 800E1A8C 44812000 */ mtc1 $at, $f4 /* 7AF40 800E1A90 44820000 */ mtc1 $v0, $f0 -/* 7AF44 800E1A94 00000000 */ nop +/* 7AF44 800E1A94 00000000 */ nop /* 7AF48 800E1A98 46800020 */ cvt.s.w $f0, $f0 /* 7AF4C 800E1A9C 46040102 */ mul.s $f4, $f0, $f4 -/* 7AF50 800E1AA0 00000000 */ nop +/* 7AF50 800E1AA0 00000000 */ nop /* 7AF54 800E1AA4 4405B000 */ mfc1 $a1, $f22 /* 7AF58 800E1AA8 4407B000 */ mfc1 $a3, $f22 /* 7AF5C 800E1AAC 44062000 */ mfc1 $a2, $f4 @@ -257,7 +257,7 @@ glabel appendGfx_player_spin /* 7AF78 800E1AC8 3C013F36 */ lui $at, 0x3f36 /* 7AF7C 800E1ACC 3421DB6E */ ori $at, $at, 0xdb6e /* 7AF80 800E1AD0 44810000 */ mtc1 $at, $f0 -/* 7AF84 800E1AD4 00000000 */ nop +/* 7AF84 800E1AD4 00000000 */ nop /* 7AF88 800E1AD8 44050000 */ mfc1 $a1, $f0 /* 7AF8C 800E1ADC 0280202D */ daddu $a0, $s4, $zero /* 7AF90 800E1AE0 00A0302D */ daddu $a2, $a1, $zero @@ -279,16 +279,16 @@ glabel appendGfx_player_spin /* 7AFD0 800E1B20 C62200A8 */ lwc1 $f2, 0xa8($s1) /* 7AFD4 800E1B24 3C0142B4 */ lui $at, 0x42b4 /* 7AFD8 800E1B28 44810000 */ mtc1 $at, $f0 -/* 7AFDC 800E1B2C 00000000 */ nop +/* 7AFDC 800E1B2C 00000000 */ nop /* 7AFE0 800E1B30 4602003E */ c.le.s $f0, $f2 -/* 7AFE4 800E1B34 00000000 */ nop +/* 7AFE4 800E1B34 00000000 */ nop /* 7AFE8 800E1B38 45000008 */ bc1f .L800E1B5C /* 7AFEC 800E1B3C 0000202D */ daddu $a0, $zero, $zero /* 7AFF0 800E1B40 3C014387 */ lui $at, 0x4387 /* 7AFF4 800E1B44 44812000 */ mtc1 $at, $f4 -/* 7AFF8 800E1B48 00000000 */ nop +/* 7AFF8 800E1B48 00000000 */ nop /* 7AFFC 800E1B4C 4604103C */ c.lt.s $f2, $f4 -/* 7B000 800E1B50 00000000 */ nop +/* 7B000 800E1B50 00000000 */ nop /* 7B004 800E1B54 45030001 */ bc1tl .L800E1B5C /* 7B008 800E1B58 3C041000 */ lui $a0, 0x1000 .L800E1B5C: @@ -301,7 +301,7 @@ glabel appendGfx_player_spin /* 7B024 800E1B74 26730001 */ addiu $s3, $s3, 1 /* 7B028 800E1B78 2A620002 */ slti $v0, $s3, 2 /* 7B02C 800E1B7C 1440FEFA */ bnez $v0, .L800E1768 -/* 7B030 800E1B80 00000000 */ nop +/* 7B030 800E1B80 00000000 */ nop /* 7B034 800E1B84 8FBF014C */ lw $ra, 0x14c($sp) /* 7B038 800E1B88 8FB60148 */ lw $s6, 0x148($sp) /* 7B03C 800E1B8C 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/code_759b0_len_61b0/check_input_use_partner.s b/asm/nonmatchings/code_759b0_len_61b0/check_input_use_partner.s index c89c1a62f7..dbde189edb 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/check_input_use_partner.s +++ b/asm/nonmatchings/code_759b0_len_61b0/check_input_use_partner.s @@ -13,15 +13,15 @@ glabel check_input_use_partner /* 78ED0 800DFA20 0060282D */ daddu $a1, $v1, $zero /* 78ED4 800DFA24 30820008 */ andi $v0, $a0, 8 /* 78ED8 800DFA28 14400004 */ bnez $v0, .L800DFA3C -/* 78EDC 800DFA2C 00000000 */ nop +/* 78EDC 800DFA2C 00000000 */ nop /* 78EE0 800DFA30 80620015 */ lb $v0, 0x15($v1) /* 78EE4 800DFA34 1440001A */ bnez $v0, .L800DFAA0 -/* 78EE8 800DFA38 00000000 */ nop +/* 78EE8 800DFA38 00000000 */ nop .L800DFA3C: /* 78EEC 800DFA3C 8CA300E0 */ lw $v1, 0xe0($a1) /* 78EF0 800DFA40 30620004 */ andi $v0, $v1, 4 /* 78EF4 800DFA44 10400016 */ beqz $v0, .L800DFAA0 -/* 78EF8 800DFA48 00000000 */ nop +/* 78EF8 800DFA48 00000000 */ nop /* 78EFC 800DFA4C 8CA20000 */ lw $v0, ($a1) /* 78F00 800DFA50 30420080 */ andi $v0, $v0, 0x80 /* 78F04 800DFA54 14400012 */ bnez $v0, .L800DFAA0 @@ -31,19 +31,19 @@ glabel check_input_use_partner /* 78F14 800DFA64 1440000E */ bnez $v0, .L800DFAA0 /* 78F18 800DFA68 2CC20003 */ sltiu $v0, $a2, 3 /* 78F1C 800DFA6C 1040000C */ beqz $v0, .L800DFAA0 -/* 78F20 800DFA70 00000000 */ nop +/* 78F20 800DFA70 00000000 */ nop /* 78F24 800DFA74 3C028011 */ lui $v0, %hi(gPlayerData) /* 78F28 800DFA78 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) /* 78F2C 800DFA7C 80430012 */ lb $v1, 0x12($v0) /* 78F30 800DFA80 24020001 */ addiu $v0, $zero, 1 /* 78F34 800DFA84 14620004 */ bne $v1, $v0, .L800DFA98 -/* 78F38 800DFA88 00000000 */ nop +/* 78F38 800DFA88 00000000 */ nop /* 78F3C 800DFA8C 84A200C6 */ lh $v0, 0xc6($a1) /* 78F40 800DFA90 3C01802C */ lui $at, %hi(D_802BDF60) /* 78F44 800DFA94 AC22DF60 */ sw $v0, %lo(D_802BDF60)($at) .L800DFA98: /* 78F48 800DFA98 0C03ACC5 */ jal partner_use_ability -/* 78F4C 800DFA9C 00000000 */ nop +/* 78F4C 800DFA9C 00000000 */ nop .L800DFAA0: /* 78F50 800DFAA0 8FBF0010 */ lw $ra, 0x10($sp) /* 78F54 800DFAA4 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_759b0_len_61b0/collision_check_above.s b/asm/nonmatchings/code_759b0_len_61b0/collision_check_above.s index ba527b9c5b..cfbb75ae4a 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/collision_check_above.s +++ b/asm/nonmatchings/code_759b0_len_61b0/collision_check_above.s @@ -28,23 +28,23 @@ glabel collision_check_above /* 77CF0 800DE840 F7B60050 */ sdc1 $f22, 0x50($sp) /* 77CF4 800DE844 848200B2 */ lh $v0, 0xb2($a0) /* 77CF8 800DE848 4600A502 */ mul.s $f20, $f20, $f0 -/* 77CFC 800DE84C 00000000 */ nop +/* 77CFC 800DE84C 00000000 */ nop /* 77D00 800DE850 3C013E99 */ lui $at, 0x3e99 /* 77D04 800DE854 3421999A */ ori $at, $at, 0x999a /* 77D08 800DE858 44811000 */ mtc1 $at, $f2 /* 77D0C 800DE85C 8FB50080 */ lw $s5, 0x80($sp) /* 77D10 800DE860 4482B000 */ mtc1 $v0, $f22 -/* 77D14 800DE864 00000000 */ nop +/* 77D14 800DE864 00000000 */ nop /* 77D18 800DE868 4680B5A0 */ cvt.s.w $f22, $f22 /* 77D1C 800DE86C 3C0143B4 */ lui $at, 0x43b4 /* 77D20 800DE870 44810000 */ mtc1 $at, $f0 /* 77D24 800DE874 4602B582 */ mul.s $f22, $f22, $f2 -/* 77D28 800DE878 00000000 */ nop +/* 77D28 800DE878 00000000 */ nop /* 77D2C 800DE87C 4600A503 */ div.s $f20, $f20, $f0 /* 77D30 800DE880 0C00A85B */ jal sin_rad /* 77D34 800DE884 4600A306 */ mov.s $f12, $f20 /* 77D38 800DE888 4600B702 */ mul.s $f28, $f22, $f0 -/* 77D3C 800DE88C 00000000 */ nop +/* 77D3C 800DE88C 00000000 */ nop /* 77D40 800DE890 0C00A874 */ jal cos_rad /* 77D44 800DE894 4600A306 */ mov.s $f12, $f20 /* 77D48 800DE898 27B30010 */ addiu $s3, $sp, 0x10 @@ -56,7 +56,7 @@ glabel collision_check_above /* 77D60 800DE8B0 27B0001C */ addiu $s0, $sp, 0x1c /* 77D64 800DE8B4 4600B587 */ neg.s $f22, $f22 /* 77D68 800DE8B8 4600B682 */ mul.s $f26, $f22, $f0 -/* 77D6C 800DE8BC 00000000 */ nop +/* 77D6C 800DE8BC 00000000 */ nop /* 77D70 800DE8C0 C6D60000 */ lwc1 $f22, ($s6) /* 77D74 800DE8C4 C6F80000 */ lwc1 $f24, ($s7) /* 77D78 800DE8C8 C7D40000 */ lwc1 $f20, ($fp) @@ -103,7 +103,7 @@ glabel collision_check_above /* 77E1C 800DE96C 0C037A82 */ jal trace_above_player /* 77E20 800DE970 E7A00018 */ swc1 $f0, 0x18($sp) /* 77E24 800DE974 0440000A */ bltz $v0, .L800DE9A0 -/* 77E28 800DE978 00000000 */ nop +/* 77E28 800DE978 00000000 */ nop .L800DE97C: /* 77E2C 800DE97C C7A00010 */ lwc1 $f0, 0x10($sp) /* 77E30 800DE980 E6C00000 */ swc1 $f0, ($s6) diff --git a/asm/nonmatchings/code_759b0_len_61b0/do_lateral_collision.s b/asm/nonmatchings/code_759b0_len_61b0/do_lateral_collision.s index ee9193fabd..d2e56b935c 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/do_lateral_collision.s +++ b/asm/nonmatchings/code_759b0_len_61b0/do_lateral_collision.s @@ -23,11 +23,11 @@ glabel do_lateral_collision /* 780FC 800DEC4C 8FB100B8 */ lw $s1, 0xb8($sp) /* 78100 800DEC50 C7B400BC */ lwc1 $f20, 0xbc($sp) /* 78104 800DEC54 44821000 */ mtc1 $v0, $f2 -/* 78108 800DEC58 00000000 */ nop +/* 78108 800DEC58 00000000 */ nop /* 7810C 800DEC5C 468010A0 */ cvt.s.w $f2, $f2 /* 78110 800DEC60 8CA20000 */ lw $v0, ($a1) /* 78114 800DEC64 46001702 */ mul.s $f28, $f2, $f0 -/* 78118 800DEC68 00000000 */ nop +/* 78118 800DEC68 00000000 */ nop /* 7811C 800DEC6C 30420006 */ andi $v0, $v0, 6 /* 78120 800DEC70 1440000B */ bnez $v0, .L800DECA0 /* 78124 800DEC74 2413FFFF */ addiu $s3, $zero, -1 @@ -36,11 +36,11 @@ glabel do_lateral_collision /* 78130 800DEC80 34216E98 */ ori $at, $at, 0x6e98 /* 78134 800DEC84 44811000 */ mtc1 $at, $f2 /* 78138 800DEC88 44820000 */ mtc1 $v0, $f0 -/* 7813C 800DEC8C 00000000 */ nop +/* 7813C 800DEC8C 00000000 */ nop /* 78140 800DEC90 46800020 */ cvt.s.w $f0, $f0 /* 78144 800DEC94 46020582 */ mul.s $f22, $f0, $f2 /* 78148 800DEC98 08037B2A */ j .L800DECA8 -/* 7814C 800DEC9C 00000000 */ nop +/* 7814C 800DEC9C 00000000 */ nop .L800DECA0: /* 78150 800DECA0 3C013F80 */ lui $at, 0x3f80 /* 78154 800DECA4 4481B000 */ mtc1 $at, $f22 @@ -50,7 +50,7 @@ glabel do_lateral_collision /* 78160 800DECB0 44810000 */ mtc1 $at, $f0 /* 78164 800DECB4 C7AC00C0 */ lwc1 $f12, 0xc0($sp) /* 78168 800DECB8 46006302 */ mul.s $f12, $f12, $f0 -/* 7816C 800DECBC 00000000 */ nop +/* 7816C 800DECBC 00000000 */ nop /* 78170 800DECC0 27A50038 */ addiu $a1, $sp, 0x38 /* 78174 800DECC4 3C0143B4 */ lui $at, 0x43b4 /* 78178 800DECC8 44810000 */ mtc1 $at, $f0 @@ -90,24 +90,24 @@ glabel do_lateral_collision /* 78200 800DED50 0040802D */ daddu $s0, $v0, $zero /* 78204 800DED54 24020003 */ addiu $v0, $zero, 3 /* 78208 800DED58 16820004 */ bne $s4, $v0, .L800DED6C -/* 7820C 800DED5C 00000000 */ nop +/* 7820C 800DED5C 00000000 */ nop /* 78210 800DED60 4480C000 */ mtc1 $zero, $f24 /* 78214 800DED64 08037B61 */ j .L800DED84 /* 78218 800DED68 4600C686 */ mov.s $f26, $f24 .L800DED6C: /* 7821C 800DED6C C7A00038 */ lwc1 $f0, 0x38($sp) /* 78220 800DED70 4600A682 */ mul.s $f26, $f20, $f0 -/* 78224 800DED74 00000000 */ nop +/* 78224 800DED74 00000000 */ nop /* 78228 800DED78 C7A0003C */ lwc1 $f0, 0x3c($sp) /* 7822C 800DED7C 4600A602 */ mul.s $f24, $f20, $f0 -/* 78230 800DED80 00000000 */ nop +/* 78230 800DED80 00000000 */ nop .L800DED84: /* 78234 800DED84 06000021 */ bltz $s0, .L800DEE0C -/* 78238 800DED88 00000000 */ nop +/* 78238 800DED88 00000000 */ nop /* 7823C 800DED8C 461CA080 */ add.s $f2, $f20, $f28 /* 78240 800DED90 C7B6004C */ lwc1 $f22, 0x4c($sp) /* 78244 800DED94 4602B03E */ c.le.s $f22, $f2 -/* 78248 800DED98 00000000 */ nop +/* 78248 800DED98 00000000 */ nop /* 7824C 800DED9C 4500001B */ bc1f .L800DEE0C /* 78250 800DEDA0 27A4005C */ addiu $a0, $sp, 0x5c /* 78254 800DEDA4 4602B581 */ sub.s $f22, $f22, $f2 @@ -116,13 +116,13 @@ glabel do_lateral_collision /* 78260 800DEDB0 4407C000 */ mfc1 $a3, $f24 /* 78264 800DEDB4 C7A2003C */ lwc1 $f2, 0x3c($sp) /* 78268 800DEDB8 4614B502 */ mul.s $f20, $f22, $f20 -/* 7826C 800DEDBC 00000000 */ nop +/* 7826C 800DEDBC 00000000 */ nop /* 78270 800DEDC0 C7A00050 */ lwc1 $f0, 0x50($sp) /* 78274 800DEDC4 27A50060 */ addiu $a1, $sp, 0x60 /* 78278 800DEDC8 E7A00010 */ swc1 $f0, 0x10($sp) /* 7827C 800DEDCC C7A00058 */ lwc1 $f0, 0x58($sp) /* 78280 800DEDD0 4602B582 */ mul.s $f22, $f22, $f2 -/* 78284 800DEDD4 00000000 */ nop +/* 78284 800DEDD4 00000000 */ nop /* 78288 800DEDD8 0C037CFF */ jal func_800DF3FC /* 7828C 800DEDDC E7A00014 */ swc1 $f0, 0x14($sp) /* 78290 800DEDE0 C7A0005C */ lwc1 $f0, 0x5c($sp) diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DC500.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DC500.s index 6d5b23a163..8835eb5976 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DC500.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DC500.s @@ -73,13 +73,13 @@ glabel func_800DC500 /* 75AC0 800DC610 8E860000 */ lw $a2, ($s4) /* 75AC4 800DC614 44070000 */ mfc1 $a3, $f0 /* 75AC8 800DC618 0C017512 */ jal test_ray_entities -/* 75ACC 800DC61C 00000000 */ nop +/* 75ACC 800DC61C 00000000 */ nop /* 75AD0 800DC620 04400014 */ bltz $v0, .L800DC674 -/* 75AD4 800DC624 00000000 */ nop +/* 75AD4 800DC624 00000000 */ nop /* 75AD8 800DC628 C7AC0060 */ lwc1 $f12, 0x60($sp) /* 75ADC 800DC62C C7A00044 */ lwc1 $f0, 0x44($sp) /* 75AE0 800DC630 4600603C */ c.lt.s $f12, $f0 -/* 75AE4 800DC634 00000000 */ nop +/* 75AE4 800DC634 00000000 */ nop /* 75AE8 800DC638 4500000E */ bc1f .L800DC674 /* 75AEC 800DC63C 34514000 */ ori $s1, $v0, 0x4000 /* 75AF0 800DC640 C7A00054 */ lwc1 $f0, 0x54($sp) @@ -111,15 +111,15 @@ glabel func_800DC500 /* 75B50 800DC6A0 C7A40050 */ lwc1 $f4, 0x50($sp) /* 75B54 800DC6A4 3C0142C8 */ lui $at, 0x42c8 /* 75B58 800DC6A8 4481A000 */ mtc1 $at, $f20 -/* 75B5C 800DC6AC 00000000 */ nop +/* 75B5C 800DC6AC 00000000 */ nop /* 75B60 800DC6B0 46142402 */ mul.s $f16, $f4, $f20 -/* 75B64 800DC6B4 00000000 */ nop +/* 75B64 800DC6B4 00000000 */ nop /* 75B68 800DC6B8 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* 75B6C 800DC6BC 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 75B70 800DC6C0 C7A2004C */ lwc1 $f2, 0x4c($sp) /* 75B74 800DC6C4 44068000 */ mfc1 $a2, $f16 /* 75B78 800DC6C8 46141402 */ mul.s $f16, $f2, $f20 -/* 75B7C 800DC6CC 00000000 */ nop +/* 75B7C 800DC6CC 00000000 */ nop /* 75B80 800DC6D0 4480B000 */ mtc1 $zero, $f22 /* 75B84 800DC6D4 8E020000 */ lw $v0, ($s0) /* 75B88 800DC6D8 C7A00048 */ lwc1 $f0, 0x48($sp) @@ -132,11 +132,11 @@ glabel func_800DC500 /* 75BA4 800DC6F4 E4440130 */ swc1 $f4, 0x130($v0) /* 75BA8 800DC6F8 C7A20048 */ lwc1 $f2, 0x48($sp) /* 75BAC 800DC6FC 46141082 */ mul.s $f2, $f2, $f20 -/* 75BB0 800DC700 00000000 */ nop +/* 75BB0 800DC700 00000000 */ nop /* 75BB4 800DC704 44061000 */ mfc1 $a2, $f2 /* 75BB8 800DC708 C7A2004C */ lwc1 $f2, 0x4c($sp) /* 75BBC 800DC70C 46141082 */ mul.s $f2, $f2, $f20 -/* 75BC0 800DC710 00000000 */ nop +/* 75BC0 800DC710 00000000 */ nop /* 75BC4 800DC714 4600B306 */ mov.s $f12, $f22 /* 75BC8 800DC718 46006386 */ mov.s $f14, $f12 /* 75BCC 800DC71C 8E020000 */ lw $v0, ($s0) diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DC778.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DC778.s index 6c9c5da1c6..d60eb6558e 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DC778.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DC778.s @@ -53,12 +53,12 @@ glabel func_800DC778 /* 75CE8 800DC838 3C0140C9 */ lui $at, 0x40c9 /* 75CEC 800DC83C 34210FD0 */ ori $at, $at, 0xfd0 /* 75CF0 800DC840 44811000 */ mtc1 $at, $f2 -/* 75CF4 800DC844 00000000 */ nop +/* 75CF4 800DC844 00000000 */ nop /* 75CF8 800DC848 46020002 */ mul.s $f0, $f0, $f2 -/* 75CFC 800DC84C 00000000 */ nop +/* 75CFC 800DC84C 00000000 */ nop /* 75D00 800DC850 3C0143B4 */ lui $at, 0x43b4 /* 75D04 800DC854 44811000 */ mtc1 $at, $f2 -/* 75D08 800DC858 00000000 */ nop +/* 75D08 800DC858 00000000 */ nop /* 75D0C 800DC85C 46020503 */ div.s $f20, $f0, $f2 /* 75D10 800DC860 0C00A85B */ jal sin_rad /* 75D14 800DC864 4600A306 */ mov.s $f12, $f20 @@ -66,13 +66,13 @@ glabel func_800DC778 /* 75D1C 800DC86C 0C00A874 */ jal cos_rad /* 75D20 800DC870 4600A306 */ mov.s $f12, $f20 /* 75D24 800DC874 4616C102 */ mul.s $f4, $f24, $f22 -/* 75D28 800DC878 00000000 */ nop +/* 75D28 800DC878 00000000 */ nop /* 75D2C 800DC87C 0000802D */ daddu $s0, $zero, $zero /* 75D30 800DC880 0240202D */ daddu $a0, $s2, $zero /* 75D34 800DC884 27A50018 */ addiu $a1, $sp, 0x18 /* 75D38 800DC888 4600C087 */ neg.s $f2, $f24 /* 75D3C 800DC88C 46001002 */ mul.s $f0, $f2, $f0 -/* 75D40 800DC890 00000000 */ nop +/* 75D40 800DC890 00000000 */ nop /* 75D44 800DC894 27A6001C */ addiu $a2, $sp, 0x1c /* 75D48 800DC898 27A70020 */ addiu $a3, $sp, 0x20 /* 75D4C 800DC89C C7A60028 */ lwc1 $f6, 0x28($sp) @@ -96,9 +96,9 @@ glabel func_800DC778 /* 75D94 800DC8E4 E7BA0034 */ swc1 $f26, 0x34($sp) /* 75D98 800DC8E8 C7A00024 */ lwc1 $f0, 0x24($sp) /* 75D9C 800DC8EC 461A003E */ c.le.s $f0, $f26 -/* 75DA0 800DC8F0 00000000 */ nop +/* 75DA0 800DC8F0 00000000 */ nop /* 75DA4 800DC8F4 4500000A */ bc1f .L800DC920 -/* 75DA8 800DC8F8 00000000 */ nop +/* 75DA8 800DC8F8 00000000 */ nop /* 75DAC 800DC8FC 46000686 */ mov.s $f26, $f0 /* 75DB0 800DC900 C7BC001C */ lwc1 $f28, 0x1c($sp) /* 75DB4 800DC904 24100001 */ addiu $s0, $zero, 1 @@ -117,12 +117,12 @@ glabel func_800DC778 /* 75DE4 800DC934 3C0140C9 */ lui $at, 0x40c9 /* 75DE8 800DC938 34210FD0 */ ori $at, $at, 0xfd0 /* 75DEC 800DC93C 44811000 */ mtc1 $at, $f2 -/* 75DF0 800DC940 00000000 */ nop +/* 75DF0 800DC940 00000000 */ nop /* 75DF4 800DC944 46020002 */ mul.s $f0, $f0, $f2 -/* 75DF8 800DC948 00000000 */ nop +/* 75DF8 800DC948 00000000 */ nop /* 75DFC 800DC94C 3C0143B4 */ lui $at, 0x43b4 /* 75E00 800DC950 44811000 */ mtc1 $at, $f2 -/* 75E04 800DC954 00000000 */ nop +/* 75E04 800DC954 00000000 */ nop /* 75E08 800DC958 46020503 */ div.s $f20, $f0, $f2 /* 75E0C 800DC95C 0C00A85B */ jal sin_rad /* 75E10 800DC960 4600A306 */ mov.s $f12, $f20 @@ -130,10 +130,10 @@ glabel func_800DC778 /* 75E18 800DC968 0C00A874 */ jal cos_rad /* 75E1C 800DC96C 4600A306 */ mov.s $f12, $f20 /* 75E20 800DC970 4616C102 */ mul.s $f4, $f24, $f22 -/* 75E24 800DC974 00000000 */ nop +/* 75E24 800DC974 00000000 */ nop /* 75E28 800DC978 4600C087 */ neg.s $f2, $f24 /* 75E2C 800DC97C 46001002 */ mul.s $f0, $f2, $f0 -/* 75E30 800DC980 00000000 */ nop +/* 75E30 800DC980 00000000 */ nop /* 75E34 800DC984 0240202D */ daddu $a0, $s2, $zero /* 75E38 800DC988 C7A60028 */ lwc1 $f6, 0x28($sp) /* 75E3C 800DC98C 27A50018 */ addiu $a1, $sp, 0x18 @@ -152,12 +152,12 @@ glabel func_800DC778 /* 75E70 800DC9C0 0C037140 */ jal func_800DC500 /* 75E74 800DC9C4 AFA20010 */ sw $v0, 0x10($sp) /* 75E78 800DC9C8 04400010 */ bltz $v0, .L800DCA0C -/* 75E7C 800DC9CC 00000000 */ nop +/* 75E7C 800DC9CC 00000000 */ nop /* 75E80 800DC9D0 C7A00024 */ lwc1 $f0, 0x24($sp) /* 75E84 800DC9D4 461A003E */ c.le.s $f0, $f26 -/* 75E88 800DC9D8 00000000 */ nop +/* 75E88 800DC9D8 00000000 */ nop /* 75E8C 800DC9DC 4500000B */ bc1f .L800DCA0C -/* 75E90 800DC9E0 00000000 */ nop +/* 75E90 800DC9E0 00000000 */ nop /* 75E94 800DC9E4 46000686 */ mov.s $f26, $f0 /* 75E98 800DC9E8 C7BE001C */ lwc1 $f30, 0x1c($sp) /* 75E9C 800DC9EC 24100001 */ addiu $s0, $zero, 1 @@ -177,12 +177,12 @@ glabel func_800DC778 /* 75ED0 800DCA20 3C0140C9 */ lui $at, 0x40c9 /* 75ED4 800DCA24 34210FD0 */ ori $at, $at, 0xfd0 /* 75ED8 800DCA28 44811000 */ mtc1 $at, $f2 -/* 75EDC 800DCA2C 00000000 */ nop +/* 75EDC 800DCA2C 00000000 */ nop /* 75EE0 800DCA30 46020002 */ mul.s $f0, $f0, $f2 -/* 75EE4 800DCA34 00000000 */ nop +/* 75EE4 800DCA34 00000000 */ nop /* 75EE8 800DCA38 3C0143B4 */ lui $at, 0x43b4 /* 75EEC 800DCA3C 44811000 */ mtc1 $at, $f2 -/* 75EF0 800DCA40 00000000 */ nop +/* 75EF0 800DCA40 00000000 */ nop /* 75EF4 800DCA44 46020503 */ div.s $f20, $f0, $f2 /* 75EF8 800DCA48 0C00A85B */ jal sin_rad /* 75EFC 800DCA4C 4600A306 */ mov.s $f12, $f20 @@ -190,10 +190,10 @@ glabel func_800DC778 /* 75F04 800DCA54 0C00A874 */ jal cos_rad /* 75F08 800DCA58 4600A306 */ mov.s $f12, $f20 /* 75F0C 800DCA5C 4616C102 */ mul.s $f4, $f24, $f22 -/* 75F10 800DCA60 00000000 */ nop +/* 75F10 800DCA60 00000000 */ nop /* 75F14 800DCA64 4600C087 */ neg.s $f2, $f24 /* 75F18 800DCA68 46001002 */ mul.s $f0, $f2, $f0 -/* 75F1C 800DCA6C 00000000 */ nop +/* 75F1C 800DCA6C 00000000 */ nop /* 75F20 800DCA70 0240202D */ daddu $a0, $s2, $zero /* 75F24 800DCA74 C7A60028 */ lwc1 $f6, 0x28($sp) /* 75F28 800DCA78 27A50018 */ addiu $a1, $sp, 0x18 @@ -212,12 +212,12 @@ glabel func_800DC778 /* 75F5C 800DCAAC 0C037140 */ jal func_800DC500 /* 75F60 800DCAB0 AFA20010 */ sw $v0, 0x10($sp) /* 75F64 800DCAB4 04400011 */ bltz $v0, .L800DCAFC -/* 75F68 800DCAB8 00000000 */ nop +/* 75F68 800DCAB8 00000000 */ nop /* 75F6C 800DCABC C7A00024 */ lwc1 $f0, 0x24($sp) /* 75F70 800DCAC0 461A003E */ c.le.s $f0, $f26 -/* 75F74 800DCAC4 00000000 */ nop +/* 75F74 800DCAC4 00000000 */ nop /* 75F78 800DCAC8 4500000C */ bc1f .L800DCAFC -/* 75F7C 800DCACC 00000000 */ nop +/* 75F7C 800DCACC 00000000 */ nop /* 75F80 800DCAD0 46000686 */ mov.s $f26, $f0 /* 75F84 800DCAD4 C7A6001C */ lwc1 $f6, 0x1c($sp) /* 75F88 800DCAD8 24100001 */ addiu $s0, $zero, 1 @@ -233,7 +233,7 @@ glabel func_800DC778 /* 75FAC 800DCAFC 1200000F */ beqz $s0, .L800DCB3C /* 75FB0 800DCB00 0000102D */ daddu $v0, $zero, $zero /* 75FB4 800DCB04 461EE03C */ c.lt.s $f28, $f30 -/* 75FB8 800DCB08 00000000 */ nop +/* 75FB8 800DCB08 00000000 */ nop /* 75FBC 800DCB0C 45020002 */ bc1fl .L800DCB18 /* 75FC0 800DCB10 E63C0000 */ swc1 $f28, ($s1) /* 75FC4 800DCB14 E63E0000 */ swc1 $f30, ($s1) @@ -241,7 +241,7 @@ glabel func_800DC778 /* 75FC8 800DCB18 C6200000 */ lwc1 $f0, ($s1) /* 75FCC 800DCB1C C7A60038 */ lwc1 $f6, 0x38($sp) /* 75FD0 800DCB20 4606003C */ c.lt.s $f0, $f6 -/* 75FD4 800DCB24 00000000 */ nop +/* 75FD4 800DCB24 00000000 */ nop /* 75FD8 800DCB28 45030001 */ bc1tl .L800DCB30 /* 75FDC 800DCB2C E6260000 */ swc1 $f6, ($s1) .L800DCB30: diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DCB7C.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DCB7C.s index 27539893be..ee1081cbf8 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DCB7C.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DCB7C.s @@ -42,12 +42,12 @@ glabel func_800DCB7C /* 760C0 800DCC10 3C0140C9 */ lui $at, 0x40c9 /* 760C4 800DCC14 34210FD0 */ ori $at, $at, 0xfd0 /* 760C8 800DCC18 44811000 */ mtc1 $at, $f2 -/* 760CC 800DCC1C 00000000 */ nop +/* 760CC 800DCC1C 00000000 */ nop /* 760D0 800DCC20 46020002 */ mul.s $f0, $f0, $f2 -/* 760D4 800DCC24 00000000 */ nop +/* 760D4 800DCC24 00000000 */ nop /* 760D8 800DCC28 3C0143B4 */ lui $at, 0x43b4 /* 760DC 800DCC2C 44811000 */ mtc1 $at, $f2 -/* 760E0 800DCC30 00000000 */ nop +/* 760E0 800DCC30 00000000 */ nop /* 760E4 800DCC34 46020503 */ div.s $f20, $f0, $f2 /* 760E8 800DCC38 0C00A85B */ jal sin_rad /* 760EC 800DCC3C 4600A306 */ mov.s $f12, $f20 @@ -56,15 +56,15 @@ glabel func_800DCB7C /* 760F8 800DCC48 4600A306 */ mov.s $f12, $f20 /* 760FC 800DCC4C 3C014120 */ lui $at, 0x4120 /* 76100 800DCC50 44813000 */ mtc1 $at, $f6 -/* 76104 800DCC54 00000000 */ nop +/* 76104 800DCC54 00000000 */ nop /* 76108 800DCC58 4606B102 */ mul.s $f4, $f22, $f6 -/* 7610C 800DCC5C 00000000 */ nop +/* 7610C 800DCC5C 00000000 */ nop /* 76110 800DCC60 0000802D */ daddu $s0, $zero, $zero /* 76114 800DCC64 0260202D */ daddu $a0, $s3, $zero /* 76118 800DCC68 27A50018 */ addiu $a1, $sp, 0x18 /* 7611C 800DCC6C 46003087 */ neg.s $f2, $f6 /* 76120 800DCC70 46020002 */ mul.s $f0, $f0, $f2 -/* 76124 800DCC74 00000000 */ nop +/* 76124 800DCC74 00000000 */ nop /* 76128 800DCC78 27A6001C */ addiu $a2, $sp, 0x1c /* 7612C 800DCC7C 27A70020 */ addiu $a3, $sp, 0x20 /* 76130 800DCC80 C7A60028 */ lwc1 $f6, 0x28($sp) @@ -86,9 +86,9 @@ glabel func_800DCB7C /* 76170 800DCCC0 E7B80030 */ swc1 $f24, 0x30($sp) /* 76174 800DCCC4 C7A00024 */ lwc1 $f0, 0x24($sp) /* 76178 800DCCC8 4618003E */ c.le.s $f0, $f24 -/* 7617C 800DCCCC 00000000 */ nop +/* 7617C 800DCCCC 00000000 */ nop /* 76180 800DCCD0 4500000A */ bc1f .L800DCCFC -/* 76184 800DCCD4 00000000 */ nop +/* 76184 800DCCD4 00000000 */ nop /* 76188 800DCCD8 46000606 */ mov.s $f24, $f0 /* 7618C 800DCCDC C7BA001C */ lwc1 $f26, 0x1c($sp) /* 76190 800DCCE0 24100001 */ addiu $s0, $zero, 1 @@ -107,12 +107,12 @@ glabel func_800DCB7C /* 761C0 800DCD10 3C0140C9 */ lui $at, 0x40c9 /* 761C4 800DCD14 34210FD0 */ ori $at, $at, 0xfd0 /* 761C8 800DCD18 44811000 */ mtc1 $at, $f2 -/* 761CC 800DCD1C 00000000 */ nop +/* 761CC 800DCD1C 00000000 */ nop /* 761D0 800DCD20 46020002 */ mul.s $f0, $f0, $f2 -/* 761D4 800DCD24 00000000 */ nop +/* 761D4 800DCD24 00000000 */ nop /* 761D8 800DCD28 3C0143B4 */ lui $at, 0x43b4 /* 761DC 800DCD2C 44811000 */ mtc1 $at, $f2 -/* 761E0 800DCD30 00000000 */ nop +/* 761E0 800DCD30 00000000 */ nop /* 761E4 800DCD34 46020503 */ div.s $f20, $f0, $f2 /* 761E8 800DCD38 0C00A85B */ jal sin_rad /* 761EC 800DCD3C 4600A306 */ mov.s $f12, $f20 @@ -121,12 +121,12 @@ glabel func_800DCB7C /* 761F8 800DCD48 4600A306 */ mov.s $f12, $f20 /* 761FC 800DCD4C 3C014120 */ lui $at, 0x4120 /* 76200 800DCD50 44813000 */ mtc1 $at, $f6 -/* 76204 800DCD54 00000000 */ nop +/* 76204 800DCD54 00000000 */ nop /* 76208 800DCD58 46163102 */ mul.s $f4, $f6, $f22 -/* 7620C 800DCD5C 00000000 */ nop +/* 7620C 800DCD5C 00000000 */ nop /* 76210 800DCD60 46003087 */ neg.s $f2, $f6 /* 76214 800DCD64 46001002 */ mul.s $f0, $f2, $f0 -/* 76218 800DCD68 00000000 */ nop +/* 76218 800DCD68 00000000 */ nop /* 7621C 800DCD6C 0260202D */ daddu $a0, $s3, $zero /* 76220 800DCD70 27A50018 */ addiu $a1, $sp, 0x18 /* 76224 800DCD74 C7A60028 */ lwc1 $f6, 0x28($sp) @@ -144,12 +144,12 @@ glabel func_800DCB7C /* 76254 800DCDA4 0C037140 */ jal func_800DC500 /* 76258 800DCDA8 AFA20010 */ sw $v0, 0x10($sp) /* 7625C 800DCDAC 04400010 */ bltz $v0, .L800DCDF0 -/* 76260 800DCDB0 00000000 */ nop +/* 76260 800DCDB0 00000000 */ nop /* 76264 800DCDB4 C7A00024 */ lwc1 $f0, 0x24($sp) /* 76268 800DCDB8 4618003E */ c.le.s $f0, $f24 -/* 7626C 800DCDBC 00000000 */ nop +/* 7626C 800DCDBC 00000000 */ nop /* 76270 800DCDC0 4500000B */ bc1f .L800DCDF0 -/* 76274 800DCDC4 00000000 */ nop +/* 76274 800DCDC4 00000000 */ nop /* 76278 800DCDC8 46000606 */ mov.s $f24, $f0 /* 7627C 800DCDCC C7BC001C */ lwc1 $f28, 0x1c($sp) /* 76280 800DCDD0 24100001 */ addiu $s0, $zero, 1 @@ -164,7 +164,7 @@ glabel func_800DCB7C /* 762A0 800DCDF0 12000011 */ beqz $s0, .L800DCE38 /* 762A4 800DCDF4 0000102D */ daddu $v0, $zero, $zero /* 762A8 800DCDF8 461CD03C */ c.lt.s $f26, $f28 -/* 762AC 800DCDFC 00000000 */ nop +/* 762AC 800DCDFC 00000000 */ nop /* 762B0 800DCE00 45020002 */ bc1fl .L800DCE0C /* 762B4 800DCE04 E63A0000 */ swc1 $f26, ($s1) /* 762B8 800DCE08 E63C0000 */ swc1 $f28, ($s1) @@ -173,9 +173,9 @@ glabel func_800DCB7C /* 762C0 800DCE10 3C01C6FF */ lui $at, 0xc6ff /* 762C4 800DCE14 3421FE00 */ ori $at, $at, 0xfe00 /* 762C8 800DCE18 44813000 */ mtc1 $at, $f6 -/* 762CC 800DCE1C 00000000 */ nop +/* 762CC 800DCE1C 00000000 */ nop /* 762D0 800DCE20 4606003C */ c.lt.s $f0, $f6 -/* 762D4 800DCE24 00000000 */ nop +/* 762D4 800DCE24 00000000 */ nop /* 762D8 800DCE28 45030001 */ bc1tl .L800DCE30 /* 762DC 800DCE2C E6260000 */ swc1 $f6, ($s1) .L800DCE30: diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DCE70.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DCE70.s index 1562306968..9d04322a7b 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DCE70.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DCE70.s @@ -108,7 +108,7 @@ glabel func_800DCE70 /* 764B4 800DD004 3C018011 */ lui $at, %hi(D_8010C978) /* 764B8 800DD008 AC23C978 */ sw $v1, %lo(D_8010C978)($at) /* 764BC 800DD00C 08037406 */ j .L800DD018 -/* 764C0 800DD010 00000000 */ nop +/* 764C0 800DD010 00000000 */ nop .L800DD014: /* 764C4 800DD014 0000102D */ daddu $v0, $zero, $zero .L800DD018: diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DD04C.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DD04C.s index f5b74d1075..5a83fba937 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DD04C.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DD04C.s @@ -55,7 +55,7 @@ glabel func_800DD04C /* 765C4 800DD114 C6200000 */ lwc1 $f0, ($s1) /* 765C8 800DD118 C7A20044 */ lwc1 $f2, 0x44($sp) /* 765CC 800DD11C 4600103C */ c.lt.s $f2, $f0 -/* 765D0 800DD120 00000000 */ nop +/* 765D0 800DD120 00000000 */ nop /* 765D4 800DD124 45020007 */ bc1fl .L800DD144 /* 765D8 800DD128 4600D606 */ mov.s $f24, $f26 /* 765DC 800DD12C 0040802D */ daddu $s0, $v0, $zero @@ -100,7 +100,7 @@ glabel func_800DD04C /* 76670 800DD1C0 C6200000 */ lwc1 $f0, ($s1) /* 76674 800DD1C4 C7A20044 */ lwc1 $f2, 0x44($sp) /* 76678 800DD1C8 4600103C */ c.lt.s $f2, $f0 -/* 7667C 800DD1CC 00000000 */ nop +/* 7667C 800DD1CC 00000000 */ nop /* 76680 800DD1D0 45020007 */ bc1fl .L800DD1F0 /* 76684 800DD1D4 0200102D */ daddu $v0, $s0, $zero /* 76688 800DD1D8 34504000 */ ori $s0, $v0, 0x4000 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DD228.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DD228.s index 621050e52e..c2d94af64e 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DD228.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DD228.s @@ -18,7 +18,7 @@ glabel func_800DD228 /* 7670C 800DD25C 00A0B82D */ daddu $s7, $a1, $zero /* 76710 800DD260 AFBE0048 */ sw $fp, 0x48($sp) /* 76714 800DD264 4600A502 */ mul.s $f20, $f20, $f0 -/* 76718 800DD268 00000000 */ nop +/* 76718 800DD268 00000000 */ nop /* 7671C 800DD26C 3C0143B4 */ lui $at, 0x43b4 /* 76720 800DD270 44810000 */ mtc1 $at, $f0 /* 76724 800DD274 00C0F02D */ daddu $fp, $a2, $zero @@ -36,7 +36,7 @@ glabel func_800DD228 /* 76754 800DD2A4 0C00A85B */ jal sin_rad /* 76758 800DD2A8 4600A306 */ mov.s $f12, $f20 /* 7675C 800DD2AC 4600B702 */ mul.s $f28, $f22, $f0 -/* 76760 800DD2B0 00000000 */ nop +/* 76760 800DD2B0 00000000 */ nop /* 76764 800DD2B4 2414FFFF */ addiu $s4, $zero, -1 /* 76768 800DD2B8 4600A306 */ mov.s $f12, $f20 /* 7676C 800DD2BC 0C00A874 */ jal cos_rad @@ -49,7 +49,7 @@ glabel func_800DD228 /* 76788 800DD2D8 27B10020 */ addiu $s1, $sp, 0x20 /* 7678C 800DD2DC 0220382D */ daddu $a3, $s1, $zero /* 76790 800DD2E0 4600B682 */ mul.s $f26, $f22, $f0 -/* 76794 800DD2E4 00000000 */ nop +/* 76794 800DD2E4 00000000 */ nop /* 76798 800DD2E8 C6F60000 */ lwc1 $f22, ($s7) /* 7679C 800DD2EC C7D80000 */ lwc1 $f24, ($fp) /* 767A0 800DD2F0 8FA30084 */ lw $v1, 0x84($sp) @@ -101,7 +101,7 @@ glabel func_800DD228 /* 76858 800DD3A8 0C037413 */ jal func_800DD04C /* 7685C 800DD3AC AFB00010 */ sw $s0, 0x10($sp) /* 76860 800DD3B0 0440000B */ bltz $v0, .L800DD3E0 -/* 76864 800DD3B4 00000000 */ nop +/* 76864 800DD3B4 00000000 */ nop .L800DD3B8: /* 76868 800DD3B8 C7A00018 */ lwc1 $f0, 0x18($sp) /* 7686C 800DD3BC E6E00000 */ swc1 $f0, ($s7) diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DD618.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DD618.s index 78c3c25718..601a601a1e 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DD618.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DD618.s @@ -21,7 +21,7 @@ glabel func_800DD618 /* 76B08 800DD658 F7B40088 */ sdc1 $f20, 0x88($sp) /* 76B0C 800DD65C C7B400C8 */ lwc1 $f20, 0xc8($sp) /* 76B10 800DD660 46006302 */ mul.s $f12, $f12, $f0 -/* 76B14 800DD664 00000000 */ nop +/* 76B14 800DD664 00000000 */ nop /* 76B18 800DD668 3C0143B4 */ lui $at, 0x43b4 /* 76B1C 800DD66C 44810000 */ mtc1 $at, $f0 /* 76B20 800DD670 27A6003C */ addiu $a2, $sp, 0x3c @@ -35,16 +35,16 @@ glabel func_800DD618 /* 76B40 800DD690 46006303 */ div.s $f12, $f12, $f0 /* 76B44 800DD694 C7A40038 */ lwc1 $f4, 0x38($sp) /* 76B48 800DD698 4604C702 */ mul.s $f28, $f24, $f4 -/* 76B4C 800DD69C 00000000 */ nop +/* 76B4C 800DD69C 00000000 */ nop /* 76B50 800DD6A0 4604A182 */ mul.s $f6, $f20, $f4 -/* 76B54 800DD6A4 00000000 */ nop +/* 76B54 800DD6A4 00000000 */ nop /* 76B58 800DD6A8 3C013F00 */ lui $at, 0x3f00 /* 76B5C 800DD6AC 44814000 */ mtc1 $at, $f8 -/* 76B60 800DD6B0 00000000 */ nop +/* 76B60 800DD6B0 00000000 */ nop /* 76B64 800DD6B4 4608A082 */ mul.s $f2, $f20, $f8 -/* 76B68 800DD6B8 00000000 */ nop +/* 76B68 800DD6B8 00000000 */ nop /* 76B6C 800DD6BC 46083182 */ mul.s $f6, $f6, $f8 -/* 76B70 800DD6C0 00000000 */ nop +/* 76B70 800DD6C0 00000000 */ nop /* 76B74 800DD6C4 2412FFFF */ addiu $s2, $zero, -1 /* 76B78 800DD6C8 4614C000 */ add.s $f0, $f24, $f20 /* 76B7C 800DD6CC 0000A82D */ daddu $s5, $zero, $zero @@ -57,7 +57,7 @@ glabel func_800DD618 /* 76B98 800DD6E8 C66A0000 */ lwc1 $f10, ($s3) /* 76B9C 800DD6EC C68C0000 */ lwc1 $f12, ($s4) /* 76BA0 800DD6F0 4602A002 */ mul.s $f0, $f20, $f2 -/* 76BA4 800DD6F4 00000000 */ nop +/* 76BA4 800DD6F4 00000000 */ nop /* 76BA8 800DD6F8 AFA2001C */ sw $v0, 0x1c($sp) /* 76BAC 800DD6FC 27A20044 */ addiu $v0, $sp, 0x44 /* 76BB0 800DD700 AFA20020 */ sw $v0, 0x20($sp) @@ -69,7 +69,7 @@ glabel func_800DD618 /* 76BC8 800DD718 AFA2002C */ sw $v0, 0x2c($sp) /* 76BCC 800DD71C 27A20054 */ addiu $v0, $sp, 0x54 /* 76BD0 800DD720 46080002 */ mul.s $f0, $f0, $f8 -/* 76BD4 800DD724 00000000 */ nop +/* 76BD4 800DD724 00000000 */ nop /* 76BD8 800DD728 AFA20030 */ sw $v0, 0x30($sp) /* 76BDC 800DD72C 27A20058 */ addiu $v0, $sp, 0x58 /* 76BE0 800DD730 E7A40010 */ swc1 $f4, 0x10($sp) @@ -82,31 +82,31 @@ glabel func_800DD618 /* 76BFC 800DD74C 44055000 */ mfc1 $a1, $f10 /* 76C00 800DD750 44076000 */ mfc1 $a3, $f12 /* 76C04 800DD754 4602C682 */ mul.s $f26, $f24, $f2 -/* 76C08 800DD758 00000000 */ nop +/* 76C08 800DD758 00000000 */ nop /* 76C0C 800DD75C 0C037513 */ jal func_800DD44C /* 76C10 800DD760 0200202D */ daddu $a0, $s0, $zero /* 76C14 800DD764 0040802D */ daddu $s0, $v0, $zero /* 76C18 800DD768 0600004E */ bltz $s0, .L800DD8A4 -/* 76C1C 800DD76C 00000000 */ nop +/* 76C1C 800DD76C 00000000 */ nop /* 76C20 800DD770 C7A0004C */ lwc1 $f0, 0x4c($sp) /* 76C24 800DD774 4616003E */ c.le.s $f0, $f22 -/* 76C28 800DD778 00000000 */ nop +/* 76C28 800DD778 00000000 */ nop /* 76C2C 800DD77C 45000049 */ bc1f .L800DD8A4 -/* 76C30 800DD780 00000000 */ nop +/* 76C30 800DD780 00000000 */ nop /* 76C34 800DD784 C7A20050 */ lwc1 $f2, 0x50($sp) /* 76C38 800DD788 46021082 */ mul.s $f2, $f2, $f2 -/* 76C3C 800DD78C 00000000 */ nop +/* 76C3C 800DD78C 00000000 */ nop /* 76C40 800DD790 C7A00058 */ lwc1 $f0, 0x58($sp) /* 76C44 800DD794 46000002 */ mul.s $f0, $f0, $f0 -/* 76C48 800DD798 00000000 */ nop +/* 76C48 800DD798 00000000 */ nop /* 76C4C 800DD79C 46001300 */ add.s $f12, $f2, $f0 /* 76C50 800DD7A0 46006004 */ sqrt.s $f0, $f12 /* 76C54 800DD7A4 46000032 */ c.eq.s $f0, $f0 -/* 76C58 800DD7A8 00000000 */ nop +/* 76C58 800DD7A8 00000000 */ nop /* 76C5C 800DD7AC 45010003 */ bc1t .L800DD7BC -/* 76C60 800DD7B0 00000000 */ nop +/* 76C60 800DD7B0 00000000 */ nop /* 76C64 800DD7B4 0C0187BC */ jal sqrtf -/* 76C68 800DD7B8 00000000 */ nop +/* 76C68 800DD7B8 00000000 */ nop .L800DD7BC: /* 76C6C 800DD7BC 44060000 */ mfc1 $a2, $f0 /* 76C70 800DD7C0 C7A00054 */ lwc1 $f0, 0x54($sp) @@ -119,22 +119,22 @@ glabel func_800DD618 /* 76C8C 800DD7DC 44811000 */ mtc1 $at, $f2 /* 76C90 800DD7E0 46000106 */ mov.s $f4, $f0 /* 76C94 800DD7E4 4604103C */ c.lt.s $f2, $f4 -/* 76C98 800DD7E8 00000000 */ nop +/* 76C98 800DD7E8 00000000 */ nop /* 76C9C 800DD7EC 45000008 */ bc1f .L800DD810 -/* 76CA0 800DD7F0 00000000 */ nop +/* 76CA0 800DD7F0 00000000 */ nop /* 76CA4 800DD7F4 3C0142B4 */ lui $at, 0x42b4 /* 76CA8 800DD7F8 44810000 */ mtc1 $at, $f0 -/* 76CAC 800DD7FC 00000000 */ nop +/* 76CAC 800DD7FC 00000000 */ nop /* 76CB0 800DD800 4600203C */ c.lt.s $f4, $f0 -/* 76CB4 800DD804 00000000 */ nop +/* 76CB4 800DD804 00000000 */ nop /* 76CB8 800DD808 45030001 */ bc1tl .L800DD810 /* 76CBC 800DD80C 24150001 */ addiu $s5, $zero, 1 .L800DD810: /* 76CC0 800DD810 3C013F00 */ lui $at, 0x3f00 /* 76CC4 800DD814 44810000 */ mtc1 $at, $f0 -/* 76CC8 800DD818 00000000 */ nop +/* 76CC8 800DD818 00000000 */ nop /* 76CCC 800DD81C 4600A002 */ mul.s $f0, $f20, $f0 -/* 76CD0 800DD820 00000000 */ nop +/* 76CD0 800DD820 00000000 */ nop /* 76CD4 800DD824 4614C080 */ add.s $f2, $f24, $f20 /* 76CD8 800DD828 27A4005C */ addiu $a0, $sp, 0x5c /* 76CDC 800DD82C 4406E000 */ mfc1 $a2, $f28 @@ -145,13 +145,13 @@ glabel func_800DD618 /* 76CF0 800DD840 C7B60038 */ lwc1 $f22, 0x38($sp) /* 76CF4 800DD844 C7A00050 */ lwc1 $f0, 0x50($sp) /* 76CF8 800DD848 4616A582 */ mul.s $f22, $f20, $f22 -/* 76CFC 800DD84C 00000000 */ nop +/* 76CFC 800DD84C 00000000 */ nop /* 76D00 800DD850 C7A2003C */ lwc1 $f2, 0x3c($sp) /* 76D04 800DD854 27A50060 */ addiu $a1, $sp, 0x60 /* 76D08 800DD858 E7A00010 */ swc1 $f0, 0x10($sp) /* 76D0C 800DD85C C7A00058 */ lwc1 $f0, 0x58($sp) /* 76D10 800DD860 4602A502 */ mul.s $f20, $f20, $f2 -/* 76D14 800DD864 00000000 */ nop +/* 76D14 800DD864 00000000 */ nop /* 76D18 800DD868 0C03756D */ jal func_800DD5B4 /* 76D1C 800DD86C E7A00014 */ swc1 $f0, 0x14($sp) /* 76D20 800DD870 C7A0005C */ lwc1 $f0, 0x5c($sp) diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DD8FC.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DD8FC.s index 38d9ba3e76..c50a137b98 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DD8FC.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DD8FC.s @@ -21,7 +21,7 @@ glabel func_800DD8FC /* 76DEC 800DD93C F7B40078 */ sdc1 $f20, 0x78($sp) /* 76DF0 800DD940 C7B400B0 */ lwc1 $f20, 0xb0($sp) /* 76DF4 800DD944 46006302 */ mul.s $f12, $f12, $f0 -/* 76DF8 800DD948 00000000 */ nop +/* 76DF8 800DD948 00000000 */ nop /* 76DFC 800DD94C 3C0143B4 */ lui $at, 0x43b4 /* 76E00 800DD950 44810000 */ mtc1 $at, $f0 /* 76E04 800DD954 27A6003C */ addiu $a2, $sp, 0x3c @@ -33,26 +33,26 @@ glabel func_800DD8FC /* 76E1C 800DD96C 46006303 */ div.s $f12, $f12, $f0 /* 76E20 800DD970 3C013F00 */ lui $at, 0x3f00 /* 76E24 800DD974 44813000 */ mtc1 $at, $f6 -/* 76E28 800DD978 00000000 */ nop +/* 76E28 800DD978 00000000 */ nop /* 76E2C 800DD97C 4606A082 */ mul.s $f2, $f20, $f6 -/* 76E30 800DD980 00000000 */ nop +/* 76E30 800DD980 00000000 */ nop /* 76E34 800DD984 4614B000 */ add.s $f0, $f22, $f20 /* 76E38 800DD988 46020600 */ add.s $f24, $f0, $f2 /* 76E3C 800DD98C C7A00038 */ lwc1 $f0, 0x38($sp) /* 76E40 800DD990 4600B682 */ mul.s $f26, $f22, $f0 -/* 76E44 800DD994 00000000 */ nop +/* 76E44 800DD994 00000000 */ nop /* 76E48 800DD998 2412FFFF */ addiu $s2, $zero, -1 /* 76E4C 800DD99C 27A20040 */ addiu $v0, $sp, 0x40 /* 76E50 800DD9A0 C7A2003C */ lwc1 $f2, 0x3c($sp) /* 76E54 800DD9A4 46001087 */ neg.s $f2, $f2 /* 76E58 800DD9A8 4600A102 */ mul.s $f4, $f20, $f0 -/* 76E5C 800DD9AC 00000000 */ nop +/* 76E5C 800DD9AC 00000000 */ nop /* 76E60 800DD9B0 E7A2003C */ swc1 $f2, 0x3c($sp) /* 76E64 800DD9B4 E7B8004C */ swc1 $f24, 0x4c($sp) /* 76E68 800DD9B8 C6680000 */ lwc1 $f8, ($s3) /* 76E6C 800DD9BC C68A0000 */ lwc1 $f10, ($s4) /* 76E70 800DD9C0 4602A502 */ mul.s $f20, $f20, $f2 -/* 76E74 800DD9C4 00000000 */ nop +/* 76E74 800DD9C4 00000000 */ nop /* 76E78 800DD9C8 AFA2001C */ sw $v0, 0x1c($sp) /* 76E7C 800DD9CC 27A20044 */ addiu $v0, $sp, 0x44 /* 76E80 800DD9D0 AFA20020 */ sw $v0, 0x20($sp) @@ -60,13 +60,13 @@ glabel func_800DD8FC /* 76E88 800DD9D8 AFA20024 */ sw $v0, 0x24($sp) /* 76E8C 800DD9DC 27A2004C */ addiu $v0, $sp, 0x4c /* 76E90 800DD9E0 46062102 */ mul.s $f4, $f4, $f6 -/* 76E94 800DD9E4 00000000 */ nop +/* 76E94 800DD9E4 00000000 */ nop /* 76E98 800DD9E8 AFA20028 */ sw $v0, 0x28($sp) /* 76E9C 800DD9EC 27A20050 */ addiu $v0, $sp, 0x50 /* 76EA0 800DD9F0 AFA2002C */ sw $v0, 0x2c($sp) /* 76EA4 800DD9F4 27A20054 */ addiu $v0, $sp, 0x54 /* 76EA8 800DD9F8 4606A502 */ mul.s $f20, $f20, $f6 -/* 76EAC 800DD9FC 00000000 */ nop +/* 76EAC 800DD9FC 00000000 */ nop /* 76EB0 800DDA00 AFA20030 */ sw $v0, 0x30($sp) /* 76EB4 800DDA04 27A20058 */ addiu $v0, $sp, 0x58 /* 76EB8 800DDA08 E7A00010 */ swc1 $f0, 0x10($sp) @@ -79,25 +79,25 @@ glabel func_800DD8FC /* 76ED4 800DDA24 44054000 */ mfc1 $a1, $f8 /* 76ED8 800DDA28 44075000 */ mfc1 $a3, $f10 /* 76EDC 800DDA2C 4602B582 */ mul.s $f22, $f22, $f2 -/* 76EE0 800DDA30 00000000 */ nop +/* 76EE0 800DDA30 00000000 */ nop /* 76EE4 800DDA34 0C037513 */ jal func_800DD44C /* 76EE8 800DDA38 0220202D */ daddu $a0, $s1, $zero /* 76EEC 800DDA3C 04400016 */ bltz $v0, .L800DDA98 -/* 76EF0 800DDA40 00000000 */ nop +/* 76EF0 800DDA40 00000000 */ nop /* 76EF4 800DDA44 C7A4004C */ lwc1 $f4, 0x4c($sp) /* 76EF8 800DDA48 4618203E */ c.le.s $f4, $f24 -/* 76EFC 800DDA4C 00000000 */ nop +/* 76EFC 800DDA4C 00000000 */ nop /* 76F00 800DDA50 45000011 */ bc1f .L800DDA98 -/* 76F04 800DDA54 00000000 */ nop +/* 76F04 800DDA54 00000000 */ nop /* 76F08 800DDA58 46182101 */ sub.s $f4, $f4, $f24 /* 76F0C 800DDA5C C7A00038 */ lwc1 $f0, 0x38($sp) /* 76F10 800DDA60 46002002 */ mul.s $f0, $f4, $f0 -/* 76F14 800DDA64 00000000 */ nop +/* 76F14 800DDA64 00000000 */ nop /* 76F18 800DDA68 C6620000 */ lwc1 $f2, ($s3) /* 76F1C 800DDA6C 46001080 */ add.s $f2, $f2, $f0 /* 76F20 800DDA70 C7A0003C */ lwc1 $f0, 0x3c($sp) /* 76F24 800DDA74 46002102 */ mul.s $f4, $f4, $f0 -/* 76F28 800DDA78 00000000 */ nop +/* 76F28 800DDA78 00000000 */ nop /* 76F2C 800DDA7C E6620000 */ swc1 $f2, ($s3) /* 76F30 800DDA80 C6800000 */ lwc1 $f0, ($s4) /* 76F34 800DDA84 46040000 */ add.s $f0, $f0, $f4 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DDAE4.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DDAE4.s index 3942ecdeee..569a78fa67 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DDAE4.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DDAE4.s @@ -36,7 +36,7 @@ glabel func_800DDAE4 /* 77010 800DDB60 44811000 */ mtc1 $at, $f2 /* 77014 800DDB64 0220302D */ daddu $a2, $s1, $zero /* 77018 800DDB68 4602A502 */ mul.s $f20, $f20, $f2 -/* 7701C 800DDB6C 00000000 */ nop +/* 7701C 800DDB6C 00000000 */ nop /* 77020 800DDB70 27B00028 */ addiu $s0, $sp, 0x28 /* 77024 800DDB74 0200382D */ daddu $a3, $s0, $zero /* 77028 800DDB78 E7A00024 */ swc1 $f0, 0x24($sp) diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DDC44.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DDC44.s index 31d931e8a9..23e3d665e6 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DDC44.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DDC44.s @@ -22,7 +22,7 @@ glabel func_800DDC44 /* 77138 800DDC88 44811000 */ mtc1 $at, $f2 /* 7713C 800DDC8C 27A50020 */ addiu $a1, $sp, 0x20 /* 77140 800DDC90 46023182 */ mul.s $f6, $f6, $f2 -/* 77144 800DDC94 00000000 */ nop +/* 77144 800DDC94 00000000 */ nop /* 77148 800DDC98 27A70028 */ addiu $a3, $sp, 0x28 /* 7714C 800DDC9C 27A60024 */ addiu $a2, $sp, 0x24 /* 77150 800DDCA0 E7A00024 */ swc1 $f0, 0x24($sp) diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DDCEC.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DDCEC.s index 53b2db56fa..ff06f71a93 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DDCEC.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DDCEC.s @@ -22,7 +22,7 @@ glabel func_800DDCEC /* 771E0 800DDD30 44811000 */ mtc1 $at, $f2 /* 771E4 800DDD34 27A50020 */ addiu $a1, $sp, 0x20 /* 771E8 800DDD38 46023182 */ mul.s $f6, $f6, $f2 -/* 771EC 800DDD3C 00000000 */ nop +/* 771EC 800DDD3C 00000000 */ nop /* 771F0 800DDD40 27A70028 */ addiu $a3, $sp, 0x28 /* 771F4 800DDD44 27A60024 */ addiu $a2, $sp, 0x24 /* 771F8 800DDD48 E7A00024 */ swc1 $f0, 0x24($sp) diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DDD94.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DDD94.s index 0cf0a0e59c..d698cbf05f 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DDD94.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DDD94.s @@ -38,7 +38,7 @@ glabel func_800DDD94 /* 772C8 800DDE18 44811000 */ mtc1 $at, $f2 /* 772CC 800DDE1C 0260302D */ daddu $a2, $s3, $zero /* 772D0 800DDE20 4602A502 */ mul.s $f20, $f20, $f2 -/* 772D4 800DDE24 00000000 */ nop +/* 772D4 800DDE24 00000000 */ nop /* 772D8 800DDE28 27B00028 */ addiu $s0, $sp, 0x28 /* 772DC 800DDE2C 0200382D */ daddu $a3, $s0, $zero /* 772E0 800DDE30 E7A00024 */ swc1 $f0, 0x24($sp) @@ -50,7 +50,7 @@ glabel func_800DDD94 /* 772F8 800DDE48 0C037586 */ jal func_800DD618 /* 772FC 800DDE4C E7B40018 */ swc1 $f20, 0x18($sp) /* 77300 800DDE50 04400006 */ bltz $v0, .L800DDE6C -/* 77304 800DDE54 00000000 */ nop +/* 77304 800DDE54 00000000 */ nop /* 77308 800DDE58 C7A00020 */ lwc1 $f0, 0x20($sp) /* 7730C 800DDE5C E6200000 */ swc1 $f0, ($s1) /* 77310 800DDE60 C7A00028 */ lwc1 $f0, 0x28($sp) @@ -75,7 +75,7 @@ glabel func_800DDD94 /* 77358 800DDEA8 0C037586 */ jal func_800DD618 /* 7735C 800DDEAC E7B40018 */ swc1 $f20, 0x18($sp) /* 77360 800DDEB0 04400006 */ bltz $v0, .L800DDECC -/* 77364 800DDEB4 00000000 */ nop +/* 77364 800DDEB4 00000000 */ nop /* 77368 800DDEB8 C7A00020 */ lwc1 $f0, 0x20($sp) /* 7736C 800DDEBC E6200000 */ swc1 $f0, ($s1) /* 77370 800DDEC0 C7A00028 */ lwc1 $f0, 0x28($sp) @@ -101,7 +101,7 @@ glabel func_800DDD94 /* 773BC 800DDF0C 0C037586 */ jal func_800DD618 /* 773C0 800DDF10 E7B40018 */ swc1 $f20, 0x18($sp) /* 773C4 800DDF14 04400006 */ bltz $v0, .L800DDF30 -/* 773C8 800DDF18 00000000 */ nop +/* 773C8 800DDF18 00000000 */ nop /* 773CC 800DDF1C C7A00020 */ lwc1 $f0, 0x20($sp) /* 773D0 800DDF20 E6200000 */ swc1 $f0, ($s1) /* 773D4 800DDF24 C7A00028 */ lwc1 $f0, 0x28($sp) @@ -148,4 +148,4 @@ glabel func_800DDD94 /* 77470 800DDFC0 D7B40058 */ ldc1 $f20, 0x58($sp) /* 77474 800DDFC4 03E00008 */ jr $ra /* 77478 800DDFC8 27BD0070 */ addiu $sp, $sp, 0x70 -/* 7747C 800DDFCC 00000000 */ nop +/* 7747C 800DDFCC 00000000 */ nop diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DE46C.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DE46C.s index 49e3e968f6..d10cdce092 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DE46C.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DE46C.s @@ -9,16 +9,16 @@ glabel func_800DE46C /* 7792C 800DE47C 44810000 */ mtc1 $at, $f0 /* 77930 800DE480 44802000 */ mtc1 $zero, $f4 /* 77934 800DE484 4602003E */ c.le.s $f0, $f2 -/* 77938 800DE488 00000000 */ nop +/* 77938 800DE488 00000000 */ nop /* 7793C 800DE48C 4500000A */ bc1f .L800DE4B8 /* 77940 800DE490 00C0402D */ daddu $t0, $a2, $zero /* 77944 800DE494 3C014387 */ lui $at, 0x4387 /* 77948 800DE498 44810000 */ mtc1 $at, $f0 -/* 7794C 800DE49C 00000000 */ nop +/* 7794C 800DE49C 00000000 */ nop /* 77950 800DE4A0 4600103C */ c.lt.s $f2, $f0 -/* 77954 800DE4A4 00000000 */ nop +/* 77954 800DE4A4 00000000 */ nop /* 77958 800DE4A8 45000003 */ bc1f .L800DE4B8 -/* 7795C 800DE4AC 00000000 */ nop +/* 7795C 800DE4AC 00000000 */ nop /* 77960 800DE4B0 3C014334 */ lui $at, 0x4334 /* 77964 800DE4B4 44812000 */ mtc1 $at, $f4 .L800DE4B8: @@ -52,7 +52,7 @@ glabel func_800DE46C /* 779D4 800DE524 AFA20020 */ sw $v0, 0x20($sp) /* 779D8 800DE528 8FA20050 */ lw $v0, 0x50($sp) /* 779DC 800DE52C 44837000 */ mtc1 $v1, $f14 -/* 779E0 800DE530 00000000 */ nop +/* 779E0 800DE530 00000000 */ nop /* 779E4 800DE534 468073A0 */ cvt.s.w $f14, $f14 /* 779E8 800DE538 0C0377F4 */ jal test_below_player /* 779EC 800DE53C AFA20024 */ sw $v0, 0x24($sp) diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DEE5C.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DEE5C.s index 30e1270857..3051b79e6b 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DEE5C.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DEE5C.s @@ -110,7 +110,7 @@ glabel func_800DEE5C /* 784A0 800DEFF0 0C017334 */ jal test_ray_colliders /* 784A4 800DEFF4 AFA8002C */ sw $t0, 0x2c($sp) /* 784A8 800DEFF8 06210004 */ bgez $s1, .L800DF00C -/* 784AC 800DEFFC 00000000 */ nop +/* 784AC 800DEFFC 00000000 */ nop /* 784B0 800DF000 0040882D */ daddu $s1, $v0, $zero /* 784B4 800DF004 06200043 */ bltz $s1, .L800DF114 /* 784B8 800DF008 0220102D */ daddu $v0, $s1, $zero @@ -121,13 +121,13 @@ glabel func_800DEE5C /* 784C8 800DF018 4480A000 */ mtc1 $zero, $f20 /* 784CC 800DF01C 460010A1 */ cvt.d.s $f2, $f2 /* 784D0 800DF020 46341082 */ mul.d $f2, $f2, $f20 -/* 784D4 800DF024 00000000 */ nop +/* 784D4 800DF024 00000000 */ nop /* 784D8 800DF028 C6800000 */ lwc1 $f0, ($s4) /* 784DC 800DF02C 46000021 */ cvt.d.s $f0, $f0 /* 784E0 800DF030 46340002 */ mul.d $f0, $f0, $f20 -/* 784E4 800DF034 00000000 */ nop +/* 784E4 800DF034 00000000 */ nop /* 784E8 800DF038 4480B000 */ mtc1 $zero, $f22 -/* 784EC 800DF03C 00000000 */ nop +/* 784EC 800DF03C 00000000 */ nop /* 784F0 800DF040 4600B306 */ mov.s $f12, $f22 /* 784F4 800DF044 462010A0 */ cvt.s.d $f2, $f2 /* 784F8 800DF048 46200020 */ cvt.s.d $f0, $f0 @@ -138,12 +138,12 @@ glabel func_800DEE5C /* 7850C 800DF05C C6820000 */ lwc1 $f2, ($s4) /* 78510 800DF060 460010A1 */ cvt.d.s $f2, $f2 /* 78514 800DF064 46341082 */ mul.d $f2, $f2, $f20 -/* 78518 800DF068 00000000 */ nop +/* 78518 800DF068 00000000 */ nop /* 7851C 800DF06C 8FA800BC */ lw $t0, 0xbc($sp) /* 78520 800DF070 C5040000 */ lwc1 $f4, ($t0) /* 78524 800DF074 46002121 */ cvt.d.s $f4, $f4 /* 78528 800DF078 46342102 */ mul.d $f4, $f4, $f20 -/* 7852C 800DF07C 00000000 */ nop +/* 7852C 800DF07C 00000000 */ nop /* 78530 800DF080 3C014334 */ lui $at, 0x4334 /* 78534 800DF084 4481A000 */ mtc1 $at, $f20 /* 78538 800DF088 4600B306 */ mov.s $f12, $f22 @@ -156,13 +156,13 @@ glabel func_800DEE5C /* 78554 800DF0A4 46006386 */ mov.s $f14, $f12 /* 78558 800DF0A8 3C0142B4 */ lui $at, 0x42b4 /* 7855C 800DF0AC 44811000 */ mtc1 $at, $f2 -/* 78560 800DF0B0 00000000 */ nop +/* 78560 800DF0B0 00000000 */ nop /* 78564 800DF0B4 4602B032 */ c.eq.s $f22, $f2 -/* 78568 800DF0B8 00000000 */ nop +/* 78568 800DF0B8 00000000 */ nop /* 7856C 800DF0BC 45000005 */ bc1f .L800DF0D4 /* 78570 800DF0C0 4600A501 */ sub.s $f20, $f20, $f0 /* 78574 800DF0C4 4602A032 */ c.eq.s $f20, $f2 -/* 78578 800DF0C8 00000000 */ nop +/* 78578 800DF0C8 00000000 */ nop /* 7857C 800DF0CC 45010011 */ bc1t .L800DF114 /* 78580 800DF0D0 0220102D */ daddu $v0, $s1, $zero .L800DF0D4: @@ -172,13 +172,13 @@ glabel func_800DEE5C /* 78590 800DF0E0 44801000 */ mtc1 $zero, $f2 /* 78594 800DF0E4 46200005 */ abs.d $f0, $f0 /* 78598 800DF0E8 4620103E */ c.le.d $f2, $f0 -/* 7859C 800DF0EC 00000000 */ nop +/* 7859C 800DF0EC 00000000 */ nop /* 785A0 800DF0F0 45010008 */ bc1t .L800DF114 /* 785A4 800DF0F4 0220102D */ daddu $v0, $s1, $zero /* 785A8 800DF0F8 4600A021 */ cvt.d.s $f0, $f20 /* 785AC 800DF0FC 46200005 */ abs.d $f0, $f0 /* 785B0 800DF100 4620103E */ c.le.d $f2, $f0 -/* 785B4 800DF104 00000000 */ nop +/* 785B4 800DF104 00000000 */ nop /* 785B8 800DF108 45020001 */ bc1fl .L800DF110 /* 785BC 800DF10C 2411FFFF */ addiu $s1, $zero, -1 .L800DF110: diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DF15C.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DF15C.s index 13c206216b..c00c7a129e 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DF15C.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DF15C.s @@ -18,10 +18,10 @@ glabel func_800DF15C /* 78640 800DF190 3C013F00 */ lui $at, 0x3f00 /* 78644 800DF194 44811000 */ mtc1 $at, $f2 /* 78648 800DF198 44820000 */ mtc1 $v0, $f0 -/* 7864C 800DF19C 00000000 */ nop +/* 7864C 800DF19C 00000000 */ nop /* 78650 800DF1A0 46800020 */ cvt.s.w $f0, $f0 /* 78654 800DF1A4 46020582 */ mul.s $f22, $f0, $f2 -/* 78658 800DF1A8 00000000 */ nop +/* 78658 800DF1A8 00000000 */ nop /* 7865C 800DF1AC 00E0902D */ daddu $s2, $a3, $zero /* 78660 800DF1B0 C7A200B4 */ lwc1 $f2, 0xb4($sp) /* 78664 800DF1B4 3C0140C9 */ lui $at, 0x40c9 @@ -29,17 +29,17 @@ glabel func_800DF15C /* 7866C 800DF1BC 44810000 */ mtc1 $at, $f0 /* 78670 800DF1C0 27A50038 */ addiu $a1, $sp, 0x38 /* 78674 800DF1C4 46001082 */ mul.s $f2, $f2, $f0 -/* 78678 800DF1C8 00000000 */ nop +/* 78678 800DF1C8 00000000 */ nop /* 7867C 800DF1CC 27A6003C */ addiu $a2, $sp, 0x3c /* 78680 800DF1D0 848200B0 */ lh $v0, 0xb0($a0) /* 78684 800DF1D4 3C013E92 */ lui $at, 0x3e92 /* 78688 800DF1D8 34216E98 */ ori $at, $at, 0x6e98 /* 7868C 800DF1DC 44810000 */ mtc1 $at, $f0 /* 78690 800DF1E0 44822000 */ mtc1 $v0, $f4 -/* 78694 800DF1E4 00000000 */ nop +/* 78694 800DF1E4 00000000 */ nop /* 78698 800DF1E8 46802120 */ cvt.s.w $f4, $f4 /* 7869C 800DF1EC 46002682 */ mul.s $f26, $f4, $f0 -/* 786A0 800DF1F0 00000000 */ nop +/* 786A0 800DF1F0 00000000 */ nop /* 786A4 800DF1F4 3C0143B4 */ lui $at, 0x43b4 /* 786A8 800DF1F8 44816000 */ mtc1 $at, $f12 /* 786AC 800DF1FC C7B800B0 */ lwc1 $f24, 0xb0($sp) @@ -84,7 +84,7 @@ glabel func_800DF15C /* 78748 800DF298 4616C500 */ add.s $f20, $f24, $f22 /* 7874C 800DF29C C7A0004C */ lwc1 $f0, 0x4c($sp) /* 78750 800DF2A0 4614003E */ c.le.s $f0, $f20 -/* 78754 800DF2A4 00000000 */ nop +/* 78754 800DF2A4 00000000 */ nop /* 78758 800DF2A8 45000003 */ bc1f .L800DF2B8 /* 7875C 800DF2AC 24030001 */ addiu $v1, $zero, 1 /* 78760 800DF2B0 8FA200B8 */ lw $v0, 0xb8($sp) @@ -125,7 +125,7 @@ glabel func_800DF15C /* 787E4 800DF334 4600C686 */ mov.s $f26, $f24 /* 787E8 800DF338 C7B6004C */ lwc1 $f22, 0x4c($sp) /* 787EC 800DF33C 4614B03E */ c.le.s $f22, $f20 -/* 787F0 800DF340 00000000 */ nop +/* 787F0 800DF340 00000000 */ nop /* 787F4 800DF344 4500001B */ bc1f .L800DF3B4 /* 787F8 800DF348 27A4005C */ addiu $a0, $sp, 0x5c /* 787FC 800DF34C 4614B581 */ sub.s $f22, $f22, $f20 @@ -134,13 +134,13 @@ glabel func_800DF15C /* 78808 800DF358 4407C000 */ mfc1 $a3, $f24 /* 7880C 800DF35C C7A2003C */ lwc1 $f2, 0x3c($sp) /* 78810 800DF360 4614B502 */ mul.s $f20, $f22, $f20 -/* 78814 800DF364 00000000 */ nop +/* 78814 800DF364 00000000 */ nop /* 78818 800DF368 C7A00050 */ lwc1 $f0, 0x50($sp) /* 7881C 800DF36C 27A50060 */ addiu $a1, $sp, 0x60 /* 78820 800DF370 E7A00010 */ swc1 $f0, 0x10($sp) /* 78824 800DF374 C7A00058 */ lwc1 $f0, 0x58($sp) /* 78828 800DF378 4602B582 */ mul.s $f22, $f22, $f2 -/* 7882C 800DF37C 00000000 */ nop +/* 7882C 800DF37C 00000000 */ nop /* 78830 800DF380 0C037CFF */ jal func_800DF3FC /* 78834 800DF384 E7A00014 */ swc1 $f0, 0x14($sp) /* 78838 800DF388 C7A0005C */ lwc1 $f0, 0x5c($sp) diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DFAAC.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DFAAC.s index 399919537f..0f7d8cf4f1 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DFAAC.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DFAAC.s @@ -7,7 +7,7 @@ glabel func_800DFAAC /* 78F64 800DFAB4 0C037E80 */ jal check_input_use_partner /* 78F68 800DFAB8 AFB00010 */ sw $s0, 0x10($sp) /* 78F6C 800DFABC 0C03968B */ jal func_800E5A2C -/* 78F70 800DFAC0 00000000 */ nop +/* 78F70 800DFAC0 00000000 */ nop /* 78F74 800DFAC4 3C108011 */ lui $s0, %hi(gPlayerStatus) /* 78F78 800DFAC8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* 78F7C 800DFACC 8E030000 */ lw $v1, ($s0) @@ -18,62 +18,62 @@ glabel func_800DFAAC /* 78F90 800DFAE0 10400005 */ beqz $v0, .L800DFAF8 /* 78F94 800DFAE4 30620004 */ andi $v0, $v1, 4 /* 78F98 800DFAE8 0C038B46 */ jal update_fall_state -/* 78F9C 800DFAEC 00000000 */ nop +/* 78F9C 800DFAEC 00000000 */ nop /* 78FA0 800DFAF0 8E030000 */ lw $v1, ($s0) /* 78FA4 800DFAF4 30620004 */ andi $v0, $v1, 4 .L800DFAF8: /* 78FA8 800DFAF8 10400005 */ beqz $v0, .L800DFB10 /* 78FAC 800DFAFC 30620008 */ andi $v0, $v1, 8 /* 78FB0 800DFB00 14400003 */ bnez $v0, .L800DFB10 -/* 78FB4 800DFB04 00000000 */ nop +/* 78FB4 800DFB04 00000000 */ nop /* 78FB8 800DFB08 0C038C40 */ jal func_800E3100 -/* 78FBC 800DFB0C 00000000 */ nop +/* 78FBC 800DFB0C 00000000 */ nop .L800DFB10: /* 78FC0 800DFB10 0C0393F3 */ jal check_input_midair_jump -/* 78FC4 800DFB14 00000000 */ nop +/* 78FC4 800DFB14 00000000 */ nop /* 78FC8 800DFB18 820300B4 */ lb $v1, 0xb4($s0) /* 78FCC 800DFB1C 24020011 */ addiu $v0, $zero, 0x11 /* 78FD0 800DFB20 1062001A */ beq $v1, $v0, .L800DFB8C -/* 78FD4 800DFB24 00000000 */ nop +/* 78FD4 800DFB24 00000000 */ nop /* 78FD8 800DFB28 0C038D8F */ jal collision_main_lateral -/* 78FDC 800DFB2C 00000000 */ nop +/* 78FDC 800DFB2C 00000000 */ nop /* 78FE0 800DFB30 0C039142 */ jal func_800E4508 -/* 78FE4 800DFB34 00000000 */ nop +/* 78FE4 800DFB34 00000000 */ nop /* 78FE8 800DFB38 0C0389F8 */ jal collision_main_above -/* 78FEC 800DFB3C 00000000 */ nop +/* 78FEC 800DFB3C 00000000 */ nop /* 78FF0 800DFB40 0441000A */ bgez $v0, .L800DFB6C -/* 78FF4 800DFB44 00000000 */ nop +/* 78FF4 800DFB44 00000000 */ nop /* 78FF8 800DFB48 860200C0 */ lh $v0, 0xc0($s0) /* 78FFC 800DFB4C 14400007 */ bnez $v0, .L800DFB6C -/* 79000 800DFB50 00000000 */ nop +/* 79000 800DFB50 00000000 */ nop /* 79004 800DFB54 8E020004 */ lw $v0, 4($s0) /* 79008 800DFB58 30421000 */ andi $v0, $v0, 0x1000 /* 7900C 800DFB5C 10400003 */ beqz $v0, .L800DFB6C -/* 79010 800DFB60 00000000 */ nop +/* 79010 800DFB60 00000000 */ nop /* 79014 800DFB64 0C0393C4 */ jal func_800E4F10 -/* 79018 800DFB68 00000000 */ nop +/* 79018 800DFB68 00000000 */ nop .L800DFB6C: /* 7901C 800DFB6C 820300B4 */ lb $v1, 0xb4($s0) /* 79020 800DFB70 2402001B */ addiu $v0, $zero, 0x1b /* 79024 800DFB74 10620005 */ beq $v1, $v0, .L800DFB8C /* 79028 800DFB78 24020022 */ addiu $v0, $zero, 0x22 /* 7902C 800DFB7C 10620003 */ beq $v1, $v0, .L800DFB8C -/* 79030 800DFB80 00000000 */ nop +/* 79030 800DFB80 00000000 */ nop /* 79034 800DFB84 0C0391D1 */ jal func_800E4744 -/* 79038 800DFB88 00000000 */ nop +/* 79038 800DFB88 00000000 */ nop .L800DFB8C: /* 7903C 800DFB8C 8E020004 */ lw $v0, 4($s0) /* 79040 800DFB90 30420002 */ andi $v0, $v0, 2 /* 79044 800DFB94 10400003 */ beqz $v0, .L800DFBA4 -/* 79048 800DFB98 00000000 */ nop +/* 79048 800DFB98 00000000 */ nop /* 7904C 800DFB9C 0C0AF81C */ jal func_802BE070 -/* 79050 800DFBA0 00000000 */ nop +/* 79050 800DFBA0 00000000 */ nop .L800DFBA4: /* 79054 800DFBA4 8E020000 */ lw $v0, ($s0) /* 79058 800DFBA8 3C030400 */ lui $v1, 0x400 /* 7905C 800DFBAC 00431024 */ and $v0, $v0, $v1 /* 79060 800DFBB0 14400009 */ bnez $v0, .L800DFBD8 -/* 79064 800DFBB4 00000000 */ nop +/* 79064 800DFBB4 00000000 */ nop /* 79068 800DFBB8 C6000028 */ lwc1 $f0, 0x28($s0) /* 7906C 800DFBBC C602002C */ lwc1 $f2, 0x2c($s0) /* 79070 800DFBC0 C6040030 */ lwc1 $f4, 0x30($s0) diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DFD48.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DFD48.s index 06ed8d5ed5..75a72b5f3f 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DFD48.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DFD48.s @@ -29,7 +29,7 @@ glabel func_800DFD48 /* 79254 800DFDA4 3C020001 */ lui $v0, 1 /* 79258 800DFDA8 34420002 */ ori $v0, $v0, 2 /* 7925C 800DFDAC 16020003 */ bne $s0, $v0, .L800DFDBC -/* 79260 800DFDB0 00000000 */ nop +/* 79260 800DFDB0 00000000 */ nop /* 79264 800DFDB4 3C100008 */ lui $s0, 8 /* 79268 800DFDB8 3610000E */ ori $s0, $s0, 0xe .L800DFDBC: @@ -67,14 +67,14 @@ glabel func_800DFD48 /* 792D8 800DFE28 3C020001 */ lui $v0, 1 /* 792DC 800DFE2C 34420002 */ ori $v0, $v0, 2 /* 792E0 800DFE30 1602001A */ bne $s0, $v0, .L800DFE9C -/* 792E4 800DFE34 00000000 */ nop +/* 792E4 800DFE34 00000000 */ nop .L800DFE38: /* 792E8 800DFE38 8CA30004 */ lw $v1, 4($a1) /* 792EC 800DFE3C 30621000 */ andi $v0, $v1, 0x1000 /* 792F0 800DFE40 14400007 */ bnez $v0, .L800DFE60 /* 792F4 800DFE44 30622000 */ andi $v0, $v1, 0x2000 /* 792F8 800DFE48 0C037F3D */ jal func_800DFCF4 -/* 792FC 800DFE4C 00000000 */ nop +/* 792FC 800DFE4C 00000000 */ nop /* 79300 800DFE50 1440001E */ bnez $v0, .L800DFECC /* 79304 800DFE54 3C020008 */ lui $v0, 8 /* 79308 800DFE58 08037FBB */ j .L800DFEEC @@ -93,7 +93,7 @@ glabel func_800DFD48 /* 79334 800DFE84 00822021 */ addu $a0, $a0, $v0 /* 79338 800DFE88 8C847C30 */ lw $a0, %lo(D_800F7C30)($a0) /* 7933C 800DFE8C 0C0398DB */ jal func_800E636C -/* 79340 800DFE90 00000000 */ nop +/* 79340 800DFE90 00000000 */ nop /* 79344 800DFE94 08037FBB */ j .L800DFEEC /* 79348 800DFE98 2402FFFF */ addiu $v0, $zero, -1 .L800DFE9C: diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DFFCC.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DFFCC.s index fb84eb5018..fc7a8686e8 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DFFCC.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DFFCC.s @@ -55,4 +55,4 @@ glabel func_800DFFCC /* 7952C 800E007C ACA20000 */ sw $v0, ($a1) .L800E0080: /* 79530 800E0080 03E00008 */ jr $ra -/* 79534 800E0084 00000000 */ nop +/* 79534 800E0084 00000000 */ nop diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0294.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E0294.s index 52900c4434..2fe08b5de5 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E0294.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E0294.s @@ -12,13 +12,13 @@ glabel func_800E0294 /* 79760 800E02B0 2610C93C */ addiu $s0, $s0, %lo(D_8010C93C) /* 79764 800E02B4 8E020000 */ lw $v0, ($s0) /* 79768 800E02B8 14400015 */ bnez $v0, .L800E0310 -/* 7976C 800E02BC 00000000 */ nop +/* 7976C 800E02BC 00000000 */ nop /* 79770 800E02C0 3C028011 */ lui $v0, %hi(gPlayerStatus) /* 79774 800E02C4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) /* 79778 800E02C8 8C420004 */ lw $v0, 4($v0) /* 7977C 800E02CC 30420030 */ andi $v0, $v0, 0x30 /* 79780 800E02D0 1440000B */ bnez $v0, .L800E0300 -/* 79784 800E02D4 00000000 */ nop +/* 79784 800E02D4 00000000 */ nop /* 79788 800E02D8 3C06802B */ lui $a2, 0x802b /* 7978C 800E02DC 3C0400E2 */ lui $a0, 0xe2 /* 79790 800E02E0 248425B0 */ addiu $a0, $a0, 0x25b0 @@ -33,12 +33,12 @@ glabel func_800E0294 /* 797B0 800E0300 3C028011 */ lui $v0, %hi(D_8010C93C) /* 797B4 800E0304 8C42C93C */ lw $v0, %lo(D_8010C93C)($v0) /* 797B8 800E0308 10400005 */ beqz $v0, .L800E0320 -/* 797BC 800E030C 00000000 */ nop +/* 797BC 800E030C 00000000 */ nop .L800E0310: /* 797C0 800E0310 3C028011 */ lui $v0, %hi(D_8010C93C) /* 797C4 800E0314 8C42C93C */ lw $v0, %lo(D_8010C93C)($v0) /* 797C8 800E0318 0040F809 */ jalr $v0 -/* 797CC 800E031C 00000000 */ nop +/* 797CC 800E031C 00000000 */ nop .L800E0320: /* 797D0 800E0320 8FBF0014 */ lw $ra, 0x14($sp) /* 797D4 800E0324 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0398.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E0398.s index da445a8928..5d65877d1e 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E0398.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E0398.s @@ -11,7 +11,7 @@ glabel func_800E0398 /* 79860 800E03B0 3C078011 */ lui $a3, %hi(gPlayerStatus) /* 79864 800E03B4 24E7EFC8 */ addiu $a3, $a3, %lo(gPlayerStatus) /* 79868 800E03B8 1440003D */ bnez $v0, .L800E04B0 -/* 7986C 800E03BC 00000000 */ nop +/* 7986C 800E03BC 00000000 */ nop /* 79870 800E03C0 8CE60004 */ lw $a2, 4($a3) /* 79874 800E03C4 30C20100 */ andi $v0, $a2, 0x100 /* 79878 800E03C8 1440003D */ bnez $v0, .L800E04C0 @@ -20,7 +20,7 @@ glabel func_800E0398 /* 79884 800E03D4 8CA5419C */ lw $a1, %lo(gGameStatusPtr)($a1) /* 79888 800E03D8 84A30086 */ lh $v1, 0x86($a1) /* 7988C 800E03DC 14620038 */ bne $v1, $v0, .L800E04C0 -/* 79890 800E03E0 00000000 */ nop +/* 79890 800E03E0 00000000 */ nop /* 79894 800E03E4 80A20070 */ lb $v0, 0x70($a1) /* 79898 800E03E8 14400035 */ bnez $v0, .L800E04C0 /* 7989C 800E03EC 3C049249 */ lui $a0, 0x9249 @@ -50,16 +50,16 @@ glabel func_800E0398 /* 798F8 800E0448 1040001D */ beqz $v0, .L800E04C0 /* 798FC 800E044C 30C200C0 */ andi $v0, $a2, 0xc0 /* 79900 800E0450 1040001B */ beqz $v0, .L800E04C0 -/* 79904 800E0454 00000000 */ nop +/* 79904 800E0454 00000000 */ nop /* 79908 800E0458 8CE20000 */ lw $v0, ($a3) /* 7990C 800E045C 30420020 */ andi $v0, $v0, 0x20 /* 79910 800E0460 14400017 */ bnez $v0, .L800E04C0 -/* 79914 800E0464 00000000 */ nop +/* 79914 800E0464 00000000 */ nop /* 79918 800E0468 80E20015 */ lb $v0, 0x15($a3) /* 7991C 800E046C 14400014 */ bnez $v0, .L800E04C0 /* 79920 800E0470 30C20030 */ andi $v0, $a2, 0x30 /* 79924 800E0474 1440000B */ bnez $v0, .L800E04A4 -/* 79928 800E0478 00000000 */ nop +/* 79928 800E0478 00000000 */ nop /* 7992C 800E047C 3C06802B */ lui $a2, 0x802b /* 79930 800E0480 3C0400E2 */ lui $a0, 0xe2 /* 79934 800E0484 24841870 */ addiu $a0, $a0, 0x1870 @@ -73,12 +73,12 @@ glabel func_800E0398 .L800E04A4: /* 79954 800E04A4 8E020000 */ lw $v0, ($s0) /* 79958 800E04A8 10400005 */ beqz $v0, .L800E04C0 -/* 7995C 800E04AC 00000000 */ nop +/* 7995C 800E04AC 00000000 */ nop .L800E04B0: /* 79960 800E04B0 3C028011 */ lui $v0, %hi(D_8010C920) /* 79964 800E04B4 8C42C920 */ lw $v0, %lo(D_8010C920)($v0) /* 79968 800E04B8 0040F809 */ jalr $v0 -/* 7996C 800E04BC 00000000 */ nop +/* 7996C 800E04BC 00000000 */ nop .L800E04C0: /* 79970 800E04C0 8FBF0014 */ lw $ra, 0x14($sp) /* 79974 800E04C4 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0580.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E0580.s index 645ea356df..d979cf915b 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E0580.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E0580.s @@ -10,29 +10,29 @@ glabel func_800E0580 /* 79A44 800E0594 8C620004 */ lw $v0, 4($v1) /* 79A48 800E0598 30420100 */ andi $v0, $v0, 0x100 /* 79A4C 800E059C 1440002A */ bnez $v0, .L800E0648 -/* 79A50 800E05A0 00000000 */ nop +/* 79A50 800E05A0 00000000 */ nop /* 79A54 800E05A4 3C028011 */ lui $v0, %hi(D_8010C958) /* 79A58 800E05A8 8C42C958 */ lw $v0, %lo(D_8010C958)($v0) /* 79A5C 800E05AC 14400026 */ bnez $v0, .L800E0648 -/* 79A60 800E05B0 00000000 */ nop +/* 79A60 800E05B0 00000000 */ nop /* 79A64 800E05B4 3C028011 */ lui $v0, %hi(D_8010C920) /* 79A68 800E05B8 8C42C920 */ lw $v0, %lo(D_8010C920)($v0) /* 79A6C 800E05BC 14400022 */ bnez $v0, .L800E0648 -/* 79A70 800E05C0 00000000 */ nop +/* 79A70 800E05C0 00000000 */ nop /* 79A74 800E05C4 3C108011 */ lui $s0, %hi(D_8010C940) /* 79A78 800E05C8 2610C940 */ addiu $s0, $s0, %lo(D_8010C940) /* 79A7C 800E05CC 8E020000 */ lw $v0, ($s0) /* 79A80 800E05D0 14400019 */ bnez $v0, .L800E0638 -/* 79A84 800E05D4 00000000 */ nop +/* 79A84 800E05D4 00000000 */ nop /* 79A88 800E05D8 80620015 */ lb $v0, 0x15($v1) /* 79A8C 800E05DC 1440001A */ bnez $v0, .L800E0648 -/* 79A90 800E05E0 00000000 */ nop +/* 79A90 800E05E0 00000000 */ nop /* 79A94 800E05E4 8C620000 */ lw $v0, ($v1) /* 79A98 800E05E8 30420020 */ andi $v0, $v0, 0x20 /* 79A9C 800E05EC 14400016 */ bnez $v0, .L800E0648 -/* 79AA0 800E05F0 00000000 */ nop +/* 79AA0 800E05F0 00000000 */ nop /* 79AA4 800E05F4 0C03814E */ jal func_800E0538 -/* 79AA8 800E05F8 00000000 */ nop +/* 79AA8 800E05F8 00000000 */ nop /* 79AAC 800E05FC 14400003 */ bnez $v0, .L800E060C /* 79AB0 800E0600 3C06802B */ lui $a2, 0x802b /* 79AB4 800E0604 08038192 */ j .L800E0648 @@ -53,7 +53,7 @@ glabel func_800E0580 /* 79AE8 800E0638 3C028011 */ lui $v0, %hi(D_8010C940) /* 79AEC 800E063C 8C42C940 */ lw $v0, %lo(D_8010C940)($v0) /* 79AF0 800E0640 0040F809 */ jalr $v0 -/* 79AF4 800E0644 00000000 */ nop +/* 79AF4 800E0644 00000000 */ nop .L800E0648: /* 79AF8 800E0648 8FBF0014 */ lw $ra, 0x14($sp) /* 79AFC 800E064C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E06D8.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E06D8.s index 3bc1dde383..a50e95dde7 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E06D8.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E06D8.s @@ -31,13 +31,13 @@ glabel func_800E06D8 /* 79BE8 800E0738 00621824 */ and $v1, $v1, $v0 /* 79BEC 800E073C 3C020200 */ lui $v0, 0x200 /* 79BF0 800E0740 14620009 */ bne $v1, $v0, .L800E0768 -/* 79BF4 800E0744 00000000 */ nop +/* 79BF4 800E0744 00000000 */ nop /* 79BF8 800E0748 10800007 */ beqz $a0, .L800E0768 /* 79BFC 800E074C 3C031000 */ lui $v1, 0x1000 /* 79C00 800E0750 8C820000 */ lw $v0, ($a0) /* 79C04 800E0754 00431024 */ and $v0, $v0, $v1 /* 79C08 800E0758 10400003 */ beqz $v0, .L800E0768 -/* 79C0C 800E075C 00000000 */ nop +/* 79C0C 800E075C 00000000 */ nop /* 79C10 800E0760 080381FF */ j .L800E07FC /* 79C14 800E0764 A62500C6 */ sh $a1, 0xc6($s1) .L800E0768: @@ -45,16 +45,16 @@ glabel func_800E06D8 /* 79C1C 800E076C 8610A562 */ lh $s0, %lo(gCollisionStatus+0x12)($s0) /* 79C20 800E0770 32024000 */ andi $v0, $s0, 0x4000 /* 79C24 800E0774 14400007 */ bnez $v0, .L800E0794 -/* 79C28 800E0778 00000000 */ nop +/* 79C28 800E0778 00000000 */ nop /* 79C2C 800E077C 0C05173A */ jal func_80145CE8 /* 79C30 800E0780 0200202D */ daddu $a0, $s0, $zero /* 79C34 800E0784 1440000E */ bnez $v0, .L800E07C0 /* 79C38 800E0788 0000102D */ daddu $v0, $zero, $zero /* 79C3C 800E078C 08038200 */ j .L800E0800 -/* 79C40 800E0790 00000000 */ nop +/* 79C40 800E0790 00000000 */ nop .L800E0794: /* 79C44 800E0794 0C0394BE */ jal func_800E52F8 -/* 79C48 800E0798 00000000 */ nop +/* 79C48 800E0798 00000000 */ nop /* 79C4C 800E079C 14400003 */ bnez $v0, .L800E07AC /* 79C50 800E07A0 2402FFFF */ addiu $v0, $zero, -1 /* 79C54 800E07A4 080381CA */ j .L800E0728 @@ -74,7 +74,7 @@ glabel func_800E06D8 /* 79C84 800E07D4 10400007 */ beqz $v0, .L800E07F4 /* 79C88 800E07D8 0000102D */ daddu $v0, $zero, $zero /* 79C8C 800E07DC 08038200 */ j .L800E0800 -/* 79C90 800E07E0 00000000 */ nop +/* 79C90 800E07E0 00000000 */ nop .L800E07E4: /* 79C94 800E07E4 8E220000 */ lw $v0, ($s1) /* 79C98 800E07E8 3463FFFF */ ori $v1, $v1, 0xffff diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0818.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E0818.s index 968afc5901..68b8d49630 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E0818.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E0818.s @@ -14,19 +14,19 @@ glabel func_800E0818 /* 79CEC 800E083C 8E2500C8 */ lw $a1, 0xc8($s1) /* 79CF0 800E0840 30420100 */ andi $v0, $v0, 0x100 /* 79CF4 800E0844 1440009B */ bnez $v0, .L800E0AB4 -/* 79CF8 800E0848 00000000 */ nop +/* 79CF8 800E0848 00000000 */ nop /* 79CFC 800E084C 3C028011 */ lui $v0, %hi(D_8010C940) /* 79D00 800E0850 8C42C940 */ lw $v0, %lo(D_8010C940)($v0) /* 79D04 800E0854 14400097 */ bnez $v0, .L800E0AB4 -/* 79D08 800E0858 00000000 */ nop +/* 79D08 800E0858 00000000 */ nop /* 79D0C 800E085C 3C028011 */ lui $v0, %hi(D_8010C920) /* 79D10 800E0860 8C42C920 */ lw $v0, %lo(D_8010C920)($v0) /* 79D14 800E0864 14400093 */ bnez $v0, .L800E0AB4 -/* 79D18 800E0868 00000000 */ nop +/* 79D18 800E0868 00000000 */ nop /* 79D1C 800E086C 3C028011 */ lui $v0, %hi(D_8010C958) /* 79D20 800E0870 8C42C958 */ lw $v0, %lo(D_8010C958)($v0) /* 79D24 800E0874 14400073 */ bnez $v0, .L800E0A44 -/* 79D28 800E0878 00000000 */ nop +/* 79D28 800E0878 00000000 */ nop /* 79D2C 800E087C 3C038016 */ lui $v1, %hi(gCollisionStatus) /* 79D30 800E0880 2463A550 */ addiu $v1, $v1, %lo(gCollisionStatus) /* 79D34 800E0884 82220015 */ lb $v0, 0x15($s1) @@ -36,7 +36,7 @@ glabel func_800E0818 /* 79D44 800E0894 54500087 */ bnel $v0, $s0, .L800E0AB4 /* 79D48 800E0898 A63000C6 */ sh $s0, 0xc6($s1) /* 79D4C 800E089C 080382AD */ j .L800E0AB4 -/* 79D50 800E08A0 00000000 */ nop +/* 79D50 800E08A0 00000000 */ nop .L800E08A4: /* 79D54 800E08A4 862200C0 */ lh $v0, 0xc0($s1) /* 79D58 800E08A8 14400082 */ bnez $v0, .L800E0AB4 @@ -58,7 +58,7 @@ glabel func_800E0818 /* 79D98 800E08E8 00220821 */ addu $at, $at, $v0 /* 79D9C 800E08EC 8C22BC60 */ lw $v0, %lo(D_8010BC60)($at) /* 79DA0 800E08F0 00400008 */ jr $v0 -/* 79DA4 800E08F4 00000000 */ nop +/* 79DA4 800E08F4 00000000 */ nop /* 79DA8 800E08F8 08038270 */ j .L800E09C0 /* 79DAC 800E08FC 2410FFFF */ addiu $s0, $zero, -1 .L800E0900: @@ -81,7 +81,7 @@ glabel func_800E0818 /* 79DF0 800E0940 1070005C */ beq $v1, $s0, .L800E0AB4 /* 79DF4 800E0944 0000902D */ daddu $s2, $zero, $zero /* 79DF8 800E0948 08038270 */ j .L800E09C0 -/* 79DFC 800E094C 00000000 */ nop +/* 79DFC 800E094C 00000000 */ nop .L800E0950: /* 79E00 800E0950 3442FFFF */ ori $v0, $v0, 0xffff /* 79E04 800E0954 8E230000 */ lw $v1, ($s1) @@ -100,10 +100,10 @@ glabel func_800E0818 /* 79E34 800E0984 1440000E */ bnez $v0, .L800E09C0 /* 79E38 800E0988 3C03F7FF */ lui $v1, 0xf7ff /* 79E3C 800E098C 0803826A */ j .L800E09A8 -/* 79E40 800E0990 00000000 */ nop +/* 79E40 800E0990 00000000 */ nop .L800E0994: /* 79E44 800E0994 0C0394BE */ jal func_800E52F8 -/* 79E48 800E0998 00000000 */ nop +/* 79E48 800E0998 00000000 */ nop /* 79E4C 800E099C 14400008 */ bnez $v0, .L800E09C0 /* 79E50 800E09A0 24120001 */ addiu $s2, $zero, 1 /* 79E54 800E09A4 3C03F7FF */ lui $v1, 0xf7ff @@ -122,7 +122,7 @@ glabel func_800E0818 /* 79E80 800E09D0 3C030800 */ lui $v1, 0x800 /* 79E84 800E09D4 00431024 */ and $v0, $v0, $v1 /* 79E88 800E09D8 14400036 */ bnez $v0, .L800E0AB4 -/* 79E8C 800E09DC 00000000 */ nop +/* 79E8C 800E09DC 00000000 */ nop /* 79E90 800E09E0 0803827F */ j .L800E09FC /* 79E94 800E09E4 A63000C6 */ sh $s0, 0xc6($s1) .L800E09E8: @@ -133,15 +133,15 @@ glabel func_800E0818 /* 79EA8 800E09F8 A63000C6 */ sh $s0, 0xc6($s1) .L800E09FC: /* 79EAC 800E09FC 12400009 */ beqz $s2, .L800E0A24 -/* 79EB0 800E0A00 00000000 */ nop +/* 79EB0 800E0A00 00000000 */ nop /* 79EB4 800E0A04 0600000F */ bltz $s0, .L800E0A44 -/* 79EB8 800E0A08 00000000 */ nop +/* 79EB8 800E0A08 00000000 */ nop /* 79EBC 800E0A0C 0C04417A */ jal get_entity_by_index /* 79EC0 800E0A10 0200202D */ daddu $a0, $s0, $zero /* 79EC4 800E0A14 8C420000 */ lw $v0, ($v0) /* 79EC8 800E0A18 30421000 */ andi $v0, $v0, 0x1000 /* 79ECC 800E0A1C 10400009 */ beqz $v0, .L800E0A44 -/* 79ED0 800E0A20 00000000 */ nop +/* 79ED0 800E0A20 00000000 */ nop .L800E0A24: /* 79ED4 800E0A24 922200B4 */ lbu $v0, 0xb4($s1) /* 79ED8 800E0A28 2C420003 */ sltiu $v0, $v0, 3 @@ -155,13 +155,13 @@ glabel func_800E0818 /* 79EF4 800E0A44 8E220004 */ lw $v0, 4($s1) /* 79EF8 800E0A48 30420010 */ andi $v0, $v0, 0x10 /* 79EFC 800E0A4C 14400007 */ bnez $v0, .L800E0A6C -/* 79F00 800E0A50 00000000 */ nop +/* 79F00 800E0A50 00000000 */ nop /* 79F04 800E0A54 0C03BCF5 */ jal func_800EF3D4 /* 79F08 800E0A58 0000202D */ daddu $a0, $zero, $zero /* 79F0C 800E0A5C 0C03BCE9 */ jal func_800EF3A4 -/* 79F10 800E0A60 00000000 */ nop +/* 79F10 800E0A60 00000000 */ nop /* 79F14 800E0A64 080382AD */ j .L800E0AB4 -/* 79F18 800E0A68 00000000 */ nop +/* 79F18 800E0A68 00000000 */ nop .L800E0A6C: /* 79F1C 800E0A6C 3C108011 */ lui $s0, %hi(D_8010C958) /* 79F20 800E0A70 2610C958 */ addiu $s0, $s0, %lo(D_8010C958) @@ -181,7 +181,7 @@ glabel func_800E0818 /* 79F58 800E0AA8 8E020000 */ lw $v0, ($s0) .L800E0AAC: /* 79F5C 800E0AAC 0040F809 */ jalr $v0 -/* 79F60 800E0AB0 00000000 */ nop +/* 79F60 800E0AB0 00000000 */ nop .L800E0AB4: /* 79F64 800E0AB4 8FBF0020 */ lw $ra, 0x20($sp) /* 79F68 800E0AB8 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0B90.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E0B90.s index 46da2bedfc..893019568e 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E0B90.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E0B90.s @@ -31,38 +31,38 @@ glabel func_800E0B90 /* 7A0A8 800E0BF8 3C02800F */ lui $v0, %hi(D_800F7B48) /* 7A0AC 800E0BFC 24427B48 */ addiu $v0, $v0, %lo(D_800F7B48) /* 7A0B0 800E0C00 4600A03C */ c.lt.s $f20, $f0 -/* 7A0B4 800E0C04 00000000 */ nop +/* 7A0B4 800E0C04 00000000 */ nop /* 7A0B8 800E0C08 4500000B */ bc1f .L800E0C38 /* 7A0BC 800E0C0C AC400000 */ sw $zero, ($v0) /* 7A0C0 800E0C10 3C01C32F */ lui $at, 0xc32f /* 7A0C4 800E0C14 44810000 */ mtc1 $at, $f0 -/* 7A0C8 800E0C18 00000000 */ nop +/* 7A0C8 800E0C18 00000000 */ nop /* 7A0CC 800E0C1C 4614003C */ c.lt.s $f0, $f20 -/* 7A0D0 800E0C20 00000000 */ nop +/* 7A0D0 800E0C20 00000000 */ nop /* 7A0D4 800E0C24 45000004 */ bc1f .L800E0C38 /* 7A0D8 800E0C28 0000182D */ daddu $v1, $zero, $zero /* 7A0DC 800E0C2C C4540000 */ lwc1 $f20, ($v0) /* 7A0E0 800E0C30 08038324 */ j .L800E0C90 -/* 7A0E4 800E0C34 00000000 */ nop +/* 7A0E4 800E0C34 00000000 */ nop .L800E0C38: /* 7A0E8 800E0C38 3C0140A0 */ lui $at, 0x40a0 /* 7A0EC 800E0C3C 44810000 */ mtc1 $at, $f0 -/* 7A0F0 800E0C40 00000000 */ nop +/* 7A0F0 800E0C40 00000000 */ nop /* 7A0F4 800E0C44 4614003C */ c.lt.s $f0, $f20 -/* 7A0F8 800E0C48 00000000 */ nop +/* 7A0F8 800E0C48 00000000 */ nop /* 7A0FC 800E0C4C 4500000C */ bc1f .L800E0C80 -/* 7A100 800E0C50 00000000 */ nop +/* 7A100 800E0C50 00000000 */ nop /* 7A104 800E0C54 3C01432F */ lui $at, 0x432f /* 7A108 800E0C58 44810000 */ mtc1 $at, $f0 -/* 7A10C 800E0C5C 00000000 */ nop +/* 7A10C 800E0C5C 00000000 */ nop /* 7A110 800E0C60 4600A03C */ c.lt.s $f20, $f0 -/* 7A114 800E0C64 00000000 */ nop +/* 7A114 800E0C64 00000000 */ nop /* 7A118 800E0C68 45000005 */ bc1f .L800E0C80 /* 7A11C 800E0C6C 24030001 */ addiu $v1, $zero, 1 /* 7A120 800E0C70 3C014334 */ lui $at, 0x4334 /* 7A124 800E0C74 4481A000 */ mtc1 $at, $f20 /* 7A128 800E0C78 08038324 */ j .L800E0C90 -/* 7A12C 800E0C7C 00000000 */ nop +/* 7A12C 800E0C7C 00000000 */ nop .L800E0C80: /* 7A130 800E0C80 3C01800F */ lui $at, %hi(D_800F7B40) /* 7A134 800E0C84 C4347B40 */ lwc1 $f20, %lo(D_800F7B40)($at) @@ -75,7 +75,7 @@ glabel func_800E0B90 /* 7A14C 800E0C9C 10430022 */ beq $v0, $v1, .L800E0D28 /* 7A150 800E0CA0 24020002 */ addiu $v0, $zero, 2 /* 7A154 800E0CA4 10620020 */ beq $v1, $v0, .L800E0D28 -/* 7A158 800E0CA8 00000000 */ nop +/* 7A158 800E0CA8 00000000 */ nop /* 7A15C 800E0CAC 3C028007 */ lui $v0, %hi(gCurrentCameraID) /* 7A160 800E0CB0 8C427410 */ lw $v0, %lo(gCurrentCameraID)($v0) /* 7A164 800E0CB4 AC830000 */ sw $v1, ($a0) @@ -89,7 +89,7 @@ glabel func_800E0B90 .L800E0CD4: /* 7A184 800E0CD4 3C01C334 */ lui $at, 0xc334 /* 7A188 800E0CD8 44810000 */ mtc1 $at, $f0 -/* 7A18C 800E0CDC 00000000 */ nop +/* 7A18C 800E0CDC 00000000 */ nop /* 7A190 800E0CE0 E4400090 */ swc1 $f0, 0x90($v0) .L800E0CE4: /* 7A194 800E0CE4 C62E0084 */ lwc1 $f14, 0x84($s1) @@ -99,9 +99,9 @@ glabel func_800E0B90 /* 7A1A4 800E0CF4 44811000 */ mtc1 $at, $f2 /* 7A1A8 800E0CF8 46000005 */ abs.s $f0, $f0 /* 7A1AC 800E0CFC 4600103E */ c.le.s $f2, $f0 -/* 7A1B0 800E0D00 00000000 */ nop +/* 7A1B0 800E0D00 00000000 */ nop /* 7A1B4 800E0D04 45000008 */ bc1f .L800E0D28 -/* 7A1B8 800E0D08 00000000 */ nop +/* 7A1B8 800E0D08 00000000 */ nop /* 7A1BC 800E0D0C 3C028007 */ lui $v0, %hi(gCurrentCameraID) /* 7A1C0 800E0D10 8C427410 */ lw $v0, %lo(gCurrentCameraID)($v0) /* 7A1C4 800E0D14 00021080 */ sll $v0, $v0, 2 @@ -117,34 +117,34 @@ glabel func_800E0B90 /* 7A1E8 800E0D38 02221021 */ addu $v0, $s1, $v0 /* 7A1EC 800E0D3C C4440090 */ lwc1 $f4, 0x90($v0) /* 7A1F0 800E0D40 46022032 */ c.eq.s $f4, $f2 -/* 7A1F4 800E0D44 00000000 */ nop +/* 7A1F4 800E0D44 00000000 */ nop /* 7A1F8 800E0D48 4501001B */ bc1t .L800E0DB8 -/* 7A1FC 800E0D4C 00000000 */ nop +/* 7A1FC 800E0D4C 00000000 */ nop /* 7A200 800E0D50 4602203C */ c.lt.s $f4, $f2 -/* 7A204 800E0D54 00000000 */ nop +/* 7A204 800E0D54 00000000 */ nop /* 7A208 800E0D58 4500000B */ bc1f .L800E0D88 -/* 7A20C 800E0D5C 00000000 */ nop +/* 7A20C 800E0D5C 00000000 */ nop /* 7A210 800E0D60 3C0141E0 */ lui $at, 0x41e0 /* 7A214 800E0D64 44810000 */ mtc1 $at, $f0 -/* 7A218 800E0D68 00000000 */ nop +/* 7A218 800E0D68 00000000 */ nop /* 7A21C 800E0D6C 46002100 */ add.s $f4, $f4, $f0 /* 7A220 800E0D70 4604103C */ c.lt.s $f2, $f4 -/* 7A224 800E0D74 00000000 */ nop +/* 7A224 800E0D74 00000000 */ nop /* 7A228 800E0D78 45030003 */ bc1tl .L800E0D88 /* 7A22C 800E0D7C 46001106 */ mov.s $f4, $f2 /* 7A230 800E0D80 44801000 */ mtc1 $zero, $f2 -/* 7A234 800E0D84 00000000 */ nop +/* 7A234 800E0D84 00000000 */ nop .L800E0D88: /* 7A238 800E0D88 4604103C */ c.lt.s $f2, $f4 -/* 7A23C 800E0D8C 00000000 */ nop +/* 7A23C 800E0D8C 00000000 */ nop /* 7A240 800E0D90 45000009 */ bc1f .L800E0DB8 -/* 7A244 800E0D94 00000000 */ nop +/* 7A244 800E0D94 00000000 */ nop /* 7A248 800E0D98 3C0141E0 */ lui $at, 0x41e0 /* 7A24C 800E0D9C 44810000 */ mtc1 $at, $f0 -/* 7A250 800E0DA0 00000000 */ nop +/* 7A250 800E0DA0 00000000 */ nop /* 7A254 800E0DA4 46002101 */ sub.s $f4, $f4, $f0 /* 7A258 800E0DA8 4602203C */ c.lt.s $f4, $f2 -/* 7A25C 800E0DAC 00000000 */ nop +/* 7A25C 800E0DAC 00000000 */ nop /* 7A260 800E0DB0 45030001 */ bc1tl .L800E0DB8 /* 7A264 800E0DB4 46001106 */ mov.s $f4, $f2 .L800E0DB8: @@ -152,7 +152,7 @@ glabel func_800E0B90 /* 7A26C 800E0DBC 3C030020 */ lui $v1, 0x20 /* 7A270 800E0DC0 00431024 */ and $v0, $v0, $v1 /* 7A274 800E0DC4 10400002 */ beqz $v0, .L800E0DD0 -/* 7A278 800E0DC8 00000000 */ nop +/* 7A278 800E0DC8 00000000 */ nop /* 7A27C 800E0DCC 44802000 */ mtc1 $zero, $f4 .L800E0DD0: /* 7A280 800E0DD0 3C108007 */ lui $s0, %hi(gCurrentCameraID) @@ -175,9 +175,9 @@ glabel func_800E0B90 /* 7A2C4 800E0E14 46046300 */ add.s $f12, $f12, $f4 /* 7A2C8 800E0E18 C6220054 */ lwc1 $f2, 0x54($s1) /* 7A2CC 800E0E1C 44803000 */ mtc1 $zero, $f6 -/* 7A2D0 800E0E20 00000000 */ nop +/* 7A2D0 800E0E20 00000000 */ nop /* 7A2D4 800E0E24 46061032 */ c.eq.s $f2, $f6 -/* 7A2D8 800E0E28 00000000 */ nop +/* 7A2D8 800E0E28 00000000 */ nop /* 7A2DC 800E0E2C 45000003 */ bc1f .L800E0E3C /* 7A2E0 800E0E30 46000106 */ mov.s $f4, $f0 /* 7A2E4 800E0E34 3C01800F */ lui $at, %hi(D_800F7B48) @@ -212,7 +212,7 @@ glabel func_800E0B90 /* 7A354 800E0EA4 10820003 */ beq $a0, $v0, .L800E0EB4 /* 7A358 800E0EA8 2402000A */ addiu $v0, $zero, 0xa /* 7A35C 800E0EAC 1482000E */ bne $a0, $v0, .L800E0EE8 -/* 7A360 800E0EB0 00000000 */ nop +/* 7A360 800E0EB0 00000000 */ nop .L800E0EB4: /* 7A364 800E0EB4 C62E0084 */ lwc1 $f14, 0x84($s1) /* 7A368 800E0EB8 0C00A70A */ jal get_clamped_angle_diff @@ -221,9 +221,9 @@ glabel func_800E0B90 /* 7A374 800E0EC4 44811000 */ mtc1 $at, $f2 /* 7A378 800E0EC8 46000005 */ abs.s $f0, $f0 /* 7A37C 800E0ECC 4602003C */ c.lt.s $f0, $f2 -/* 7A380 800E0ED0 00000000 */ nop +/* 7A380 800E0ED0 00000000 */ nop /* 7A384 800E0ED4 45000004 */ bc1f .L800E0EE8 -/* 7A388 800E0ED8 00000000 */ nop +/* 7A388 800E0ED8 00000000 */ nop /* 7A38C 800E0EDC 0C0383FB */ jal func_800E0FEC /* 7A390 800E0EE0 0200202D */ daddu $a0, $s0, $zero /* 7A394 800E0EE4 0040802D */ daddu $s0, $v0, $zero @@ -251,16 +251,16 @@ glabel func_800E0B90 /* 7A3DC 800E0F2C C62200A8 */ lwc1 $f2, 0xa8($s1) /* 7A3E0 800E0F30 3C0143AF */ lui $at, 0x43af /* 7A3E4 800E0F34 44810000 */ mtc1 $at, $f0 -/* 7A3E8 800E0F38 00000000 */ nop +/* 7A3E8 800E0F38 00000000 */ nop /* 7A3EC 800E0F3C 4600103C */ c.lt.s $f2, $f0 -/* 7A3F0 800E0F40 00000000 */ nop +/* 7A3F0 800E0F40 00000000 */ nop /* 7A3F4 800E0F44 4502000C */ bc1fl .L800E0F78 /* 7A3F8 800E0F48 AE3000A4 */ sw $s0, 0xa4($s1) /* 7A3FC 800E0F4C 3C01433E */ lui $at, 0x433e /* 7A400 800E0F50 44810000 */ mtc1 $at, $f0 -/* 7A404 800E0F54 00000000 */ nop +/* 7A404 800E0F54 00000000 */ nop /* 7A408 800E0F58 4602003C */ c.lt.s $f0, $f2 -/* 7A40C 800E0F5C 00000000 */ nop +/* 7A40C 800E0F5C 00000000 */ nop /* 7A410 800E0F60 45020005 */ bc1fl .L800E0F78 /* 7A414 800E0F64 AE3000A4 */ sw $s0, 0xa4($s1) /* 7A418 800E0F68 0C0383FB */ jal func_800E0FEC @@ -280,7 +280,7 @@ glabel func_800E0B90 .L800E0F9C: /* 7A44C 800E0F9C 00621024 */ and $v0, $v1, $v0 /* 7A450 800E0FA0 10400002 */ beqz $v0, .L800E0FAC -/* 7A454 800E0FA4 00000000 */ nop +/* 7A454 800E0FA4 00000000 */ nop /* 7A458 800E0FA8 44800000 */ mtc1 $zero, $f0 .L800E0FAC: /* 7A45C 800E0FAC 8E2500A4 */ lw $a1, 0xa4($s1) diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0FEC.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E0FEC.s index fb80dc5931..fd16b33937 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E0FEC.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E0FEC.s @@ -11,7 +11,7 @@ glabel func_800E0FEC /* 7A4B4 800E1004 10620003 */ beq $v1, $v0, .L800E1014 /* 7A4B8 800E1008 2402000A */ addiu $v0, $zero, 0xa /* 7A4BC 800E100C 14620009 */ bne $v1, $v0, .L800E1034 -/* 7A4C0 800E1010 00000000 */ nop +/* 7A4C0 800E1010 00000000 */ nop .L800E1014: /* 7A4C4 800E1014 24020001 */ addiu $v0, $zero, 1 /* 7A4C8 800E1018 14620008 */ bne $v1, $v0, .L800E103C @@ -21,7 +21,7 @@ glabel func_800E0FEC /* 7A4D4 800E1024 3442000C */ ori $v0, $v0, 0xc /* 7A4D8 800E1028 0044102A */ slt $v0, $v0, $a0 /* 7A4DC 800E102C 1040003C */ beqz $v0, .L800E1120 -/* 7A4E0 800E1030 00000000 */ nop +/* 7A4E0 800E1030 00000000 */ nop .L800E1034: /* 7A4E4 800E1034 03E00008 */ jr $ra /* 7A4E8 800E1038 0080102D */ daddu $v0, $a0, $zero @@ -80,7 +80,7 @@ glabel func_800E0FEC .L800E10F0: /* 7A5A0 800E10F0 3442001A */ ori $v0, $v0, 0x1a /* 7A5A4 800E10F4 1482000A */ bne $a0, $v0, .L800E1120 -/* 7A5A8 800E10F8 00000000 */ nop +/* 7A5A8 800E10F8 00000000 */ nop /* 7A5AC 800E10FC 3C050006 */ lui $a1, 6 /* 7A5B0 800E1100 08038448 */ j .L800E1120 /* 7A5B4 800E1104 34A5001B */ ori $a1, $a1, 0x1b diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E205C.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E205C.s index 12868460f9..564504de3a 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E205C.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E205C.s @@ -82,16 +82,16 @@ glabel func_800E205C /* 7B638 800E2188 24427B70 */ addiu $v0, $v0, %lo(D_800F7B70) /* 7B63C 800E218C C4400000 */ lwc1 $f0, ($v0) /* 7B640 800E2190 46020002 */ mul.s $f0, $f0, $f2 -/* 7B644 800E2194 00000000 */ nop +/* 7B644 800E2194 00000000 */ nop /* 7B648 800E2198 24420004 */ addiu $v0, $v0, 4 /* 7B64C 800E219C E6000058 */ swc1 $f0, 0x58($s0) /* 7B650 800E21A0 C4400000 */ lwc1 $f0, ($v0) /* 7B654 800E21A4 46020002 */ mul.s $f0, $f0, $f2 -/* 7B658 800E21A8 00000000 */ nop +/* 7B658 800E21A8 00000000 */ nop /* 7B65C 800E21AC E600005C */ swc1 $f0, 0x5c($s0) /* 7B660 800E21B0 C4400004 */ lwc1 $f0, 4($v0) /* 7B664 800E21B4 46020002 */ mul.s $f0, $f0, $f2 -/* 7B668 800E21B8 00000000 */ nop +/* 7B668 800E21B8 00000000 */ nop /* 7B66C 800E21BC 0000202D */ daddu $a0, $zero, $zero /* 7B670 800E21C0 0C039769 */ jal set_action_state /* 7B674 800E21C4 E600006C */ swc1 $f0, 0x6c($s0) @@ -122,7 +122,7 @@ glabel func_800E205C /* 7B6D8 800E2228 8C440004 */ lw $a0, 4($v0) /* 7B6DC 800E222C 8C850014 */ lw $a1, 0x14($a0) /* 7B6E0 800E2230 10A0001B */ beqz $a1, .L800E22A0 -/* 7B6E4 800E2234 00000000 */ nop +/* 7B6E4 800E2234 00000000 */ nop /* 7B6E8 800E2238 84C3008E */ lh $v1, 0x8e($a2) /* 7B6EC 800E223C 8C820018 */ lw $v0, 0x18($a0) /* 7B6F0 800E2240 0062102A */ slt $v0, $v1, $v0 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E23FC.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E23FC.s index 5e774d0552..c523de8842 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E23FC.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E23FC.s @@ -19,13 +19,13 @@ glabel func_800E23FC /* 7B8E4 800E2434 80620040 */ lb $v0, 0x40($v1) /* 7B8E8 800E2438 4600D306 */ mov.s $f12, $f26 /* 7B8EC 800E243C 4482E000 */ mtc1 $v0, $f28 -/* 7B8F0 800E2440 00000000 */ nop +/* 7B8F0 800E2440 00000000 */ nop /* 7B8F4 800E2444 4680E720 */ cvt.s.w $f28, $f28 /* 7B8F8 800E2448 80620044 */ lb $v0, 0x44($v1) /* 7B8FC 800E244C 4406E000 */ mfc1 $a2, $f28 /* 7B900 800E2450 00021023 */ negu $v0, $v0 /* 7B904 800E2454 4482C000 */ mtc1 $v0, $f24 -/* 7B908 800E2458 00000000 */ nop +/* 7B908 800E2458 00000000 */ nop /* 7B90C 800E245C 4680C620 */ cvt.s.w $f24, $f24 /* 7B910 800E2460 4407C000 */ mfc1 $a3, $f24 /* 7B914 800E2464 0C00A7B5 */ jal dist2D @@ -34,7 +34,7 @@ glabel func_800E23FC /* 7B920 800E2470 4481B000 */ mtc1 $at, $f22 /* 7B924 800E2474 46000506 */ mov.s $f20, $f0 /* 7B928 800E2478 4614B03E */ c.le.s $f22, $f20 -/* 7B92C 800E247C 00000000 */ nop +/* 7B92C 800E247C 00000000 */ nop /* 7B930 800E2480 45030001 */ bc1tl .L800E2488 /* 7B934 800E2484 4600B506 */ mov.s $f20, $f22 .L800E2488: @@ -48,7 +48,7 @@ glabel func_800E23FC /* 7B954 800E24A4 0C00A6C9 */ jal clamp_angle /* 7B958 800E24A8 460C0300 */ add.s $f12, $f0, $f12 /* 7B95C 800E24AC 461AA032 */ c.eq.s $f20, $f26 -/* 7B960 800E24B0 00000000 */ nop +/* 7B960 800E24B0 00000000 */ nop /* 7B964 800E24B4 45020005 */ bc1fl .L800E24CC /* 7B968 800E24B8 E6000000 */ swc1 $f0, ($s0) /* 7B96C 800E24BC 3C028011 */ lui $v0, %hi(gPlayerStatus) diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E24F8.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E24F8.s index c900b97fa8..a15dab4d8c 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E24F8.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E24F8.s @@ -22,13 +22,13 @@ glabel func_800E24F8 /* 7B9EC 800E253C 44802000 */ mtc1 $zero, $f4 /* 7B9F0 800E2540 46200020 */ cvt.s.d $f0, $f0 /* 7B9F4 800E2544 46040032 */ c.eq.s $f0, $f4 -/* 7B9F8 800E2548 00000000 */ nop +/* 7B9F8 800E2548 00000000 */ nop /* 7B9FC 800E254C 45000005 */ bc1f .L800E2564 /* 7BA00 800E2550 462010A0 */ cvt.s.d $f2, $f2 /* 7BA04 800E2554 46041032 */ c.eq.s $f2, $f4 -/* 7BA08 800E2558 00000000 */ nop +/* 7BA08 800E2558 00000000 */ nop /* 7BA0C 800E255C 4501003D */ bc1t .L800E2654 -/* 7BA10 800E2560 00000000 */ nop +/* 7BA10 800E2560 00000000 */ nop .L800E2564: /* 7BA14 800E2564 920200B4 */ lbu $v0, 0xb4($s0) /* 7BA18 800E2568 2442FFFF */ addiu $v0, $v0, -1 @@ -41,7 +41,7 @@ glabel func_800E24F8 /* 7BA34 800E2584 00220821 */ addu $at, $at, $v0 /* 7BA38 800E2588 8C22BD38 */ lw $v0, %lo(D_8010BD38)($at) /* 7BA3C 800E258C 00400008 */ jr $v0 -/* 7BA40 800E2590 00000000 */ nop +/* 7BA40 800E2590 00000000 */ nop /* 7BA44 800E2594 3C014200 */ lui $at, 0x4200 /* 7BA48 800E2598 44812000 */ mtc1 $at, $f4 /* 7BA4C 800E259C 080389A5 */ j .L800E2694 @@ -49,7 +49,7 @@ glabel func_800E24F8 /* 7BA54 800E25A4 84A20034 */ lh $v0, 0x34($a1) /* 7BA58 800E25A8 28420082 */ slti $v0, $v0, 0x82 /* 7BA5C 800E25AC 10400005 */ beqz $v0, .L800E25C4 -/* 7BA60 800E25B0 00000000 */ nop +/* 7BA60 800E25B0 00000000 */ nop /* 7BA64 800E25B4 3C014040 */ lui $at, 0x4040 /* 7BA68 800E25B8 44810000 */ mtc1 $at, $f0 /* 7BA6C 800E25BC 080389A5 */ j .L800E2694 @@ -68,13 +68,13 @@ glabel func_800E24F8 /* 7BA9C 800E25EC C4A0049C */ lwc1 $f0, 0x49c($a1) /* 7BAA0 800E25F0 3C014000 */ lui $at, 0x4000 /* 7BAA4 800E25F4 44811000 */ mtc1 $at, $f2 -/* 7BAA8 800E25F8 00000000 */ nop +/* 7BAA8 800E25F8 00000000 */ nop /* 7BAAC 800E25FC 46020001 */ sub.s $f0, $f0, $f2 /* 7BAB0 800E2600 2402000A */ addiu $v0, $zero, 0xa /* 7BAB4 800E2604 AC820000 */ sw $v0, ($a0) .L800E2608: /* 7BAB8 800E2608 4604003C */ c.lt.s $f0, $f4 -/* 7BABC 800E260C 00000000 */ nop +/* 7BABC 800E260C 00000000 */ nop /* 7BAC0 800E2610 45000020 */ bc1f .L800E2694 /* 7BAC4 800E2614 E4A0049C */ swc1 $f0, 0x49c($a1) /* 7BAC8 800E2618 080389A5 */ j .L800E2694 @@ -100,7 +100,7 @@ glabel func_800E24F8 /* 7BB10 800E2660 14400003 */ bnez $v0, .L800E2670 /* 7BB14 800E2664 24020011 */ addiu $v0, $zero, 0x11 /* 7BB18 800E2668 14620006 */ bne $v1, $v0, .L800E2684 -/* 7BB1C 800E266C 00000000 */ nop +/* 7BB1C 800E266C 00000000 */ nop .L800E2670: /* 7BB20 800E2670 3C0140E6 */ lui $at, 0x40e6 /* 7BB24 800E2674 34216666 */ ori $at, $at, 0x6666 @@ -110,13 +110,13 @@ glabel func_800E24F8 .L800E2684: /* 7BB34 800E2684 3C0141C0 */ lui $at, 0x41c0 /* 7BB38 800E2688 44812000 */ mtc1 $at, $f4 -/* 7BB3C 800E268C 00000000 */ nop +/* 7BB3C 800E268C 00000000 */ nop /* 7BB40 800E2690 E4A4049C */ swc1 $f4, 0x49c($a1) .L800E2694: /* 7BB44 800E2694 8FBF0014 */ lw $ra, 0x14($sp) /* 7BB48 800E2698 8FB00010 */ lw $s0, 0x10($sp) /* 7BB4C 800E269C 03E00008 */ jr $ra /* 7BB50 800E26A0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 7BB54 800E26A4 00000000 */ nop -/* 7BB58 800E26A8 00000000 */ nop -/* 7BB5C 800E26AC 00000000 */ nop +/* 7BB54 800E26A4 00000000 */ nop +/* 7BB58 800E26A8 00000000 */ nop +/* 7BB5C 800E26AC 00000000 */ nop diff --git a/asm/nonmatchings/code_759b0_len_61b0/input_to_move_vector.s b/asm/nonmatchings/code_759b0_len_61b0/input_to_move_vector.s index 9147ef0237..fe89c05100 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/input_to_move_vector.s +++ b/asm/nonmatchings/code_759b0_len_61b0/input_to_move_vector.s @@ -25,7 +25,7 @@ glabel input_to_move_vector /* 7B804 800E2354 4600D306 */ mov.s $f12, $f26 /* 7B808 800E2358 00021023 */ negu $v0, $v0 /* 7B80C 800E235C 4482C000 */ mtc1 $v0, $f24 -/* 7B810 800E2360 00000000 */ nop +/* 7B810 800E2360 00000000 */ nop /* 7B814 800E2364 4680C620 */ cvt.s.w $f24, $f24 /* 7B818 800E2368 4407C000 */ mfc1 $a3, $f24 /* 7B81C 800E236C 0C00A7B5 */ jal dist2D @@ -34,7 +34,7 @@ glabel input_to_move_vector /* 7B828 800E2378 4481B000 */ mtc1 $at, $f22 /* 7B82C 800E237C 46000506 */ mov.s $f20, $f0 /* 7B830 800E2380 4614B03E */ c.le.s $f22, $f20 -/* 7B834 800E2384 00000000 */ nop +/* 7B834 800E2384 00000000 */ nop /* 7B838 800E2388 45030001 */ bc1tl .L800E2390 /* 7B83C 800E238C 4600B506 */ mov.s $f20, $f22 .L800E2390: @@ -48,7 +48,7 @@ glabel input_to_move_vector /* 7B85C 800E23AC 0C00A6C9 */ jal clamp_angle /* 7B860 800E23B0 460C0300 */ add.s $f12, $f0, $f12 /* 7B864 800E23B4 461AA032 */ c.eq.s $f20, $f26 -/* 7B868 800E23B8 00000000 */ nop +/* 7B868 800E23B8 00000000 */ nop /* 7B86C 800E23BC 45020003 */ bc1fl .L800E23CC /* 7B870 800E23C0 E6200000 */ swc1 $f0, ($s1) /* 7B874 800E23C4 C6000080 */ lwc1 $f0, 0x80($s0) diff --git a/asm/nonmatchings/code_759b0_len_61b0/render_player_model.s b/asm/nonmatchings/code_759b0_len_61b0/render_player_model.s index df4c88c9fa..0890754291 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/render_player_model.s +++ b/asm/nonmatchings/code_759b0_len_61b0/render_player_model.s @@ -70,7 +70,7 @@ glabel render_player_model /* 7A714 800E1264 AFA0001C */ sw $zero, 0x1c($sp) .L800E1268: /* 7A718 800E1268 0C0B77B9 */ jal func_802DDEE4 -/* 7A71C 800E126C 00000000 */ nop +/* 7A71C 800E126C 00000000 */ nop .L800E1270: /* 7A720 800E1270 9202000E */ lbu $v0, 0xe($s0) /* 7A724 800E1274 080384A1 */ j .L800E1284 @@ -103,7 +103,7 @@ glabel render_player_model /* 7A784 800E12D4 0220202D */ daddu $a0, $s1, $zero .L800E12D8: /* 7A788 800E12D8 0C03C327 */ jal func_800F0C9C -/* 7A78C 800E12DC 00000000 */ nop +/* 7A78C 800E12DC 00000000 */ nop .L800E12E0: /* 7A790 800E12E0 8FBF0048 */ lw $ra, 0x48($sp) /* 7A794 800E12E4 8FB10044 */ lw $s1, 0x44($sp) diff --git a/asm/nonmatchings/code_759b0_len_61b0/test_below_player.s b/asm/nonmatchings/code_759b0_len_61b0/test_below_player.s index bbc42185ff..69956946e9 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/test_below_player.s +++ b/asm/nonmatchings/code_759b0_len_61b0/test_below_player.s @@ -24,7 +24,7 @@ glabel test_below_player /* 774CC 800DE01C AFBE0048 */ sw $fp, 0x48($sp) /* 774D0 800DE020 8FBE00A4 */ lw $fp, 0xa4($sp) /* 774D4 800DE024 46006082 */ mul.s $f2, $f12, $f0 -/* 774D8 800DE028 00000000 */ nop +/* 774D8 800DE028 00000000 */ nop /* 774DC 800DE02C 3C0143B4 */ lui $at, 0x43b4 /* 774E0 800DE030 44816000 */ mtc1 $at, $f12 /* 774E4 800DE034 3C013E8F */ lui $at, 0x3e8f @@ -45,19 +45,19 @@ glabel test_below_player /* 77520 800DE070 AFC00000 */ sw $zero, ($fp) /* 77524 800DE074 C63E0000 */ lwc1 $f30, ($s1) /* 77528 800DE078 46007502 */ mul.s $f20, $f14, $f0 -/* 7752C 800DE07C 00000000 */ nop +/* 7752C 800DE07C 00000000 */ nop /* 77530 800DE080 0C00A82D */ jal sin_cos_rad /* 77534 800DE084 460C1303 */ div.s $f12, $f2, $f12 /* 77538 800DE088 C7A00010 */ lwc1 $f0, 0x10($sp) /* 7753C 800DE08C 4600A582 */ mul.s $f22, $f20, $f0 -/* 77540 800DE090 00000000 */ nop +/* 77540 800DE090 00000000 */ nop /* 77544 800DE094 2410FFFF */ addiu $s0, $zero, -1 /* 77548 800DE098 27A40018 */ addiu $a0, $sp, 0x18 /* 7754C 800DE09C 27A5001C */ addiu $a1, $sp, 0x1c /* 77550 800DE0A0 C7A00014 */ lwc1 $f0, 0x14($sp) /* 77554 800DE0A4 4600A507 */ neg.s $f20, $f20 /* 77558 800DE0A8 4600A502 */ mul.s $f20, $f20, $f0 -/* 7755C 800DE0AC 00000000 */ nop +/* 7755C 800DE0AC 00000000 */ nop /* 77560 800DE0B0 27A60020 */ addiu $a2, $sp, 0x20 /* 77564 800DE0B4 C65C0000 */ lwc1 $f28, ($s2) /* 77568 800DE0B8 C6780000 */ lwc1 $f24, ($s3) @@ -77,7 +77,7 @@ glabel test_below_player /* 775A0 800DE0F0 C7A20024 */ lwc1 $f2, 0x24($sp) /* 775A4 800DE0F4 46000005 */ abs.s $f0, $f0 /* 775A8 800DE0F8 4600103E */ c.le.s $f2, $f0 -/* 775AC 800DE0FC 00000000 */ nop +/* 775AC 800DE0FC 00000000 */ nop /* 775B0 800DE100 45020017 */ bc1fl .L800DE160 /* 775B4 800DE104 27A40018 */ addiu $a0, $sp, 0x18 /* 775B8 800DE108 3C038007 */ lui $v1, %hi(gGameStatusPtr) @@ -120,7 +120,7 @@ glabel test_below_player /* 77648 800DE198 C7A20024 */ lwc1 $f2, 0x24($sp) /* 7764C 800DE19C 46000005 */ abs.s $f0, $f0 /* 77650 800DE1A0 4600103E */ c.le.s $f2, $f0 -/* 77654 800DE1A4 00000000 */ nop +/* 77654 800DE1A4 00000000 */ nop /* 77658 800DE1A8 45020019 */ bc1fl .L800DE210 /* 7765C 800DE1AC 27A40018 */ addiu $a0, $sp, 0x18 /* 77660 800DE1B0 3C038007 */ lui $v1, %hi(gGameStatusPtr) @@ -165,7 +165,7 @@ glabel test_below_player /* 776F8 800DE248 C7A20024 */ lwc1 $f2, 0x24($sp) /* 776FC 800DE24C 46000005 */ abs.s $f0, $f0 /* 77700 800DE250 4600103E */ c.le.s $f2, $f0 -/* 77704 800DE254 00000000 */ nop +/* 77704 800DE254 00000000 */ nop /* 77708 800DE258 45020017 */ bc1fl .L800DE2B8 /* 7770C 800DE25C 27A40018 */ addiu $a0, $sp, 0x18 /* 77710 800DE260 3C038007 */ lui $v1, %hi(gGameStatusPtr) @@ -208,7 +208,7 @@ glabel test_below_player /* 777A0 800DE2F0 C7A20024 */ lwc1 $f2, 0x24($sp) /* 777A4 800DE2F4 46000005 */ abs.s $f0, $f0 /* 777A8 800DE2F8 4600103E */ c.le.s $f2, $f0 -/* 777AC 800DE2FC 00000000 */ nop +/* 777AC 800DE2FC 00000000 */ nop /* 777B0 800DE300 45020019 */ bc1fl .L800DE368 /* 777B4 800DE304 27A40018 */ addiu $a0, $sp, 0x18 /* 777B8 800DE308 3C038007 */ lui $v1, %hi(gGameStatusPtr) @@ -246,14 +246,14 @@ glabel test_below_player /* 77834 800DE384 E7BE0024 */ swc1 $f30, 0x24($sp) /* 77838 800DE388 0040202D */ daddu $a0, $v0, $zero /* 7783C 800DE38C 0480001D */ bltz $a0, .L800DE404 -/* 77840 800DE390 00000000 */ nop +/* 77840 800DE390 00000000 */ nop /* 77844 800DE394 C6200000 */ lwc1 $f0, ($s1) /* 77848 800DE398 C7A20024 */ lwc1 $f2, 0x24($sp) /* 7784C 800DE39C 46000005 */ abs.s $f0, $f0 /* 77850 800DE3A0 4600103E */ c.le.s $f2, $f0 -/* 77854 800DE3A4 00000000 */ nop +/* 77854 800DE3A4 00000000 */ nop /* 77858 800DE3A8 45000016 */ bc1f .L800DE404 -/* 7785C 800DE3AC 00000000 */ nop +/* 7785C 800DE3AC 00000000 */ nop /* 77860 800DE3B0 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* 77864 800DE3B4 2463419C */ addiu $v1, $v1, %lo(gGameStatusPtr) /* 77868 800DE3B8 8C620000 */ lw $v0, ($v1) diff --git a/asm/nonmatchings/code_759b0_len_61b0/test_player_lateral.s b/asm/nonmatchings/code_759b0_len_61b0/test_player_lateral.s index 088b2b076b..252d5f291d 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/test_player_lateral.s +++ b/asm/nonmatchings/code_759b0_len_61b0/test_player_lateral.s @@ -37,17 +37,17 @@ glabel test_player_lateral /* 7898C 800DF4DC C7A400CC */ lwc1 $f4, 0xcc($sp) /* 78990 800DF4E0 27A6003C */ addiu $a2, $sp, 0x3c /* 78994 800DF4E4 46002102 */ mul.s $f4, $f4, $f0 -/* 78998 800DF4E8 00000000 */ nop +/* 78998 800DF4E8 00000000 */ nop /* 7899C 800DF4EC 868200B2 */ lh $v0, 0xb2($s4) /* 789A0 800DF4F0 3C013F00 */ lui $at, 0x3f00 /* 789A4 800DF4F4 44811000 */ mtc1 $at, $f2 /* 789A8 800DF4F8 3C0143B4 */ lui $at, 0x43b4 /* 789AC 800DF4FC 44816000 */ mtc1 $at, $f12 /* 789B0 800DF500 44820000 */ mtc1 $v0, $f0 -/* 789B4 800DF504 00000000 */ nop +/* 789B4 800DF504 00000000 */ nop /* 789B8 800DF508 46800020 */ cvt.s.w $f0, $f0 /* 789BC 800DF50C 46020782 */ mul.s $f30, $f0, $f2 -/* 789C0 800DF510 00000000 */ nop +/* 789C0 800DF510 00000000 */ nop /* 789C4 800DF514 0C00A82D */ jal sin_cos_rad /* 789C8 800DF518 460C2303 */ div.s $f12, $f4, $f12 /* 789CC 800DF51C 27A20040 */ addiu $v0, $sp, 0x40 @@ -59,7 +59,7 @@ glabel test_player_lateral /* 789E4 800DF534 E7B6004C */ swc1 $f22, 0x4c($sp) /* 789E8 800DF538 C6A40000 */ lwc1 $f4, ($s5) /* 789EC 800DF53C 4602E682 */ mul.s $f26, $f28, $f2 -/* 789F0 800DF540 00000000 */ nop +/* 789F0 800DF540 00000000 */ nop /* 789F4 800DF544 AFA2001C */ sw $v0, 0x1c($sp) /* 789F8 800DF548 27A20044 */ addiu $v0, $sp, 0x44 /* 789FC 800DF54C AFA20020 */ sw $v0, 0x20($sp) @@ -81,15 +81,15 @@ glabel test_player_lateral /* 78A3C 800DF58C 8E470000 */ lw $a3, ($s2) /* 78A40 800DF590 44062000 */ mfc1 $a2, $f4 /* 78A44 800DF594 4600E602 */ mul.s $f24, $f28, $f0 -/* 78A48 800DF598 00000000 */ nop +/* 78A48 800DF598 00000000 */ nop /* 78A4C 800DF59C 0C037B97 */ jal func_800DEE5C /* 78A50 800DF5A0 0000202D */ daddu $a0, $zero, $zero /* 78A54 800DF5A4 0040802D */ daddu $s0, $v0, $zero /* 78A58 800DF5A8 06000008 */ bltz $s0, .L800DF5CC -/* 78A5C 800DF5AC 00000000 */ nop +/* 78A5C 800DF5AC 00000000 */ nop /* 78A60 800DF5B0 C7A4004C */ lwc1 $f4, 0x4c($sp) /* 78A64 800DF5B4 4616203E */ c.le.s $f4, $f22 -/* 78A68 800DF5B8 00000000 */ nop +/* 78A68 800DF5B8 00000000 */ nop /* 78A6C 800DF5BC 45000003 */ bc1f .L800DF5CC /* 78A70 800DF5C0 27A4005C */ addiu $a0, $sp, 0x5c /* 78A74 800DF5C4 08037DA1 */ j .L800DF684 @@ -112,11 +112,11 @@ glabel test_player_lateral /* 78AB4 800DF604 44810800 */ mtc1 $at, $f1 /* 78AB8 800DF608 44800000 */ mtc1 $zero, $f0 /* 78ABC 800DF60C 44831000 */ mtc1 $v1, $f2 -/* 78AC0 800DF610 00000000 */ nop +/* 78AC0 800DF610 00000000 */ nop /* 78AC4 800DF614 468010A1 */ cvt.d.w $f2, $f2 /* 78AC8 800DF618 AFA20028 */ sw $v0, 0x28($sp) /* 78ACC 800DF61C 46201082 */ mul.d $f2, $f2, $f0 -/* 78AD0 800DF620 00000000 */ nop +/* 78AD0 800DF620 00000000 */ nop /* 78AD4 800DF624 27A20050 */ addiu $v0, $sp, 0x50 /* 78AD8 800DF628 AFA2002C */ sw $v0, 0x2c($sp) /* 78ADC 800DF62C 27A20054 */ addiu $v0, $sp, 0x54 @@ -133,11 +133,11 @@ glabel test_player_lateral /* 78B08 800DF658 0000202D */ daddu $a0, $zero, $zero /* 78B0C 800DF65C 0040802D */ daddu $s0, $v0, $zero /* 78B10 800DF660 06000021 */ bltz $s0, .L800DF6E8 -/* 78B14 800DF664 00000000 */ nop +/* 78B14 800DF664 00000000 */ nop /* 78B18 800DF668 461EE000 */ add.s $f0, $f28, $f30 /* 78B1C 800DF66C C7A4004C */ lwc1 $f4, 0x4c($sp) /* 78B20 800DF670 4600203E */ c.le.s $f4, $f0 -/* 78B24 800DF674 00000000 */ nop +/* 78B24 800DF674 00000000 */ nop /* 78B28 800DF678 4500001B */ bc1f .L800DF6E8 /* 78B2C 800DF67C 27A4005C */ addiu $a0, $sp, 0x5c /* 78B30 800DF680 46002101 */ sub.s $f4, $f4, $f0 @@ -147,13 +147,13 @@ glabel test_player_lateral /* 78B3C 800DF68C 4407C000 */ mfc1 $a3, $f24 /* 78B40 800DF690 C7A2003C */ lwc1 $f2, 0x3c($sp) /* 78B44 800DF694 46002582 */ mul.s $f22, $f4, $f0 -/* 78B48 800DF698 00000000 */ nop +/* 78B48 800DF698 00000000 */ nop /* 78B4C 800DF69C C7A00050 */ lwc1 $f0, 0x50($sp) /* 78B50 800DF6A0 27A50060 */ addiu $a1, $sp, 0x60 /* 78B54 800DF6A4 E7A00010 */ swc1 $f0, 0x10($sp) /* 78B58 800DF6A8 C7A00058 */ lwc1 $f0, 0x58($sp) /* 78B5C 800DF6AC 46022502 */ mul.s $f20, $f4, $f2 -/* 78B60 800DF6B0 00000000 */ nop +/* 78B60 800DF6B0 00000000 */ nop /* 78B64 800DF6B4 0C037CFF */ jal func_800DF3FC /* 78B68 800DF6B8 E7A00014 */ swc1 $f0, 0x14($sp) /* 78B6C 800DF6BC C7A2005C */ lwc1 $f2, 0x5c($sp) diff --git a/asm/nonmatchings/code_759b0_len_61b0/trace_above_player.s b/asm/nonmatchings/code_759b0_len_61b0/trace_above_player.s index 5cdbddc0d4..40440b9033 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/trace_above_player.s +++ b/asm/nonmatchings/code_759b0_len_61b0/trace_above_player.s @@ -58,7 +58,7 @@ glabel trace_above_player /* 77F8C 800DEADC C6400000 */ lwc1 $f0, ($s2) /* 77F90 800DEAE0 C7A20044 */ lwc1 $f2, 0x44($sp) /* 77F94 800DEAE4 4600103C */ c.lt.s $f2, $f0 -/* 77F98 800DEAE8 00000000 */ nop +/* 77F98 800DEAE8 00000000 */ nop /* 77F9C 800DEAEC 45020007 */ bc1fl .L800DEB0C /* 77FA0 800DEAF0 4600D606 */ mov.s $f24, $f26 /* 77FA4 800DEAF4 0200882D */ daddu $s1, $s0, $zero @@ -104,9 +104,9 @@ glabel trace_above_player /* 7803C 800DEB8C C6420000 */ lwc1 $f2, ($s2) /* 78040 800DEB90 C7A00044 */ lwc1 $f0, 0x44($sp) /* 78044 800DEB94 4602003C */ c.lt.s $f0, $f2 -/* 78048 800DEB98 00000000 */ nop +/* 78048 800DEB98 00000000 */ nop /* 7804C 800DEB9C 4500000A */ bc1f .L800DEBC8 -/* 78050 800DEBA0 00000000 */ nop +/* 78050 800DEBA0 00000000 */ nop /* 78054 800DEBA4 0C04417A */ jal get_entity_by_index /* 78058 800DEBA8 0200202D */ daddu $a0, $s0, $zero /* 7805C 800DEBAC C7A00044 */ lwc1 $f0, 0x44($sp) diff --git a/asm/nonmatchings/code_759b0_len_61b0/trace_below_player.s b/asm/nonmatchings/code_759b0_len_61b0/trace_below_player.s index 4f9a12f03b..6138215724 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/trace_below_player.s +++ b/asm/nonmatchings/code_759b0_len_61b0/trace_below_player.s @@ -45,7 +45,7 @@ glabel trace_below_player /* 77A9C 800DE5EC 2411FFFF */ addiu $s1, $zero, -1 /* 77AA0 800DE5F0 0040802D */ daddu $s0, $v0, $zero /* 77AA4 800DE5F4 0600000E */ bltz $s0, .L800DE630 -/* 77AA8 800DE5F8 00000000 */ nop +/* 77AA8 800DE5F8 00000000 */ nop /* 77AAC 800DE5FC 0C04417A */ jal get_entity_by_index /* 77AB0 800DE600 0200202D */ daddu $a0, $s0, $zero /* 77AB4 800DE604 0040202D */ daddu $a0, $v0, $zero @@ -89,7 +89,7 @@ glabel trace_below_player /* 77B44 800DE694 0040882D */ daddu $s1, $v0, $zero .L800DE698: /* 77B48 800DE698 06200041 */ bltz $s1, .L800DE7A0 -/* 77B4C 800DE69C 00000000 */ nop +/* 77B4C 800DE69C 00000000 */ nop /* 77B50 800DE6A0 C7A00044 */ lwc1 $f0, 0x44($sp) /* 77B54 800DE6A4 E6A00000 */ swc1 $f0, ($s5) /* 77B58 800DE6A8 C7A00038 */ lwc1 $f0, 0x38($sp) @@ -111,18 +111,18 @@ glabel trace_below_player /* 77B98 800DE6E8 3C018011 */ lui $at, %hi(D_8010C938) /* 77B9C 800DE6EC E420C938 */ swc1 $f0, %lo(D_8010C938)($at) /* 77BA0 800DE6F0 0C00A794 */ jal get_player_normal_pitch -/* 77BA4 800DE6F4 00000000 */ nop +/* 77BA4 800DE6F4 00000000 */ nop /* 77BA8 800DE6F8 C7A40050 */ lwc1 $f4, 0x50($sp) /* 77BAC 800DE6FC 3C014059 */ lui $at, 0x4059 /* 77BB0 800DE700 4481A800 */ mtc1 $at, $f21 /* 77BB4 800DE704 4480A000 */ mtc1 $zero, $f20 /* 77BB8 800DE708 46002121 */ cvt.d.s $f4, $f4 /* 77BBC 800DE70C 46342102 */ mul.d $f4, $f4, $f20 -/* 77BC0 800DE710 00000000 */ nop +/* 77BC0 800DE710 00000000 */ nop /* 77BC4 800DE714 C7A2004C */ lwc1 $f2, 0x4c($sp) /* 77BC8 800DE718 460010A1 */ cvt.d.s $f2, $f2 /* 77BCC 800DE71C 46341082 */ mul.d $f2, $f2, $f20 -/* 77BD0 800DE720 00000000 */ nop +/* 77BD0 800DE720 00000000 */ nop /* 77BD4 800DE724 4480B000 */ mtc1 $zero, $f22 /* 77BD8 800DE728 3C018011 */ lui $at, %hi(D_8010C990) /* 77BDC 800DE72C E420C990 */ swc1 $f0, %lo(D_8010C990)($at) @@ -136,11 +136,11 @@ glabel trace_below_player /* 77BFC 800DE74C C7A40048 */ lwc1 $f4, 0x48($sp) /* 77C00 800DE750 46002121 */ cvt.d.s $f4, $f4 /* 77C04 800DE754 46342102 */ mul.d $f4, $f4, $f20 -/* 77C08 800DE758 00000000 */ nop +/* 77C08 800DE758 00000000 */ nop /* 77C0C 800DE75C C7A2004C */ lwc1 $f2, 0x4c($sp) /* 77C10 800DE760 460010A1 */ cvt.d.s $f2, $f2 /* 77C14 800DE764 46341082 */ mul.d $f2, $f2, $f20 -/* 77C18 800DE768 00000000 */ nop +/* 77C18 800DE768 00000000 */ nop /* 77C1C 800DE76C 4600B306 */ mov.s $f12, $f22 /* 77C20 800DE770 8E020000 */ lw $v0, ($s0) /* 77C24 800DE774 46202120 */ cvt.s.d $f4, $f4 diff --git a/asm/nonmatchings/code_759b0_len_61b0/update_player.s b/asm/nonmatchings/code_759b0_len_61b0/update_player.s index 1d834849ba..dacb80a329 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/update_player.s +++ b/asm/nonmatchings/code_759b0_len_61b0/update_player.s @@ -14,13 +14,13 @@ glabel update_player /* 78C14 800DF764 2631A550 */ addiu $s1, $s1, %lo(gCollisionStatus) /* 78C18 800DF768 28420065 */ slti $v0, $v0, 0x65 /* 78C1C 800DF76C 10400009 */ beqz $v0, .L800DF794 -/* 78C20 800DF770 00000000 */ nop +/* 78C20 800DF770 00000000 */ nop /* 78C24 800DF774 C602002C */ lwc1 $f2, 0x2c($s0) /* 78C28 800DF778 3C01C4FA */ lui $at, 0xc4fa /* 78C2C 800DF77C 44810000 */ mtc1 $at, $f0 -/* 78C30 800DF780 00000000 */ nop +/* 78C30 800DF780 00000000 */ nop /* 78C34 800DF784 4600103C */ c.lt.s $f2, $f0 -/* 78C38 800DF788 00000000 */ nop +/* 78C38 800DF788 00000000 */ nop /* 78C3C 800DF78C 45000039 */ bc1f .L800DF874 /* 78C40 800DF790 2402FFFF */ addiu $v0, $zero, -1 .L800DF794: @@ -32,17 +32,17 @@ glabel update_player /* 78C58 800DF7A8 86020016 */ lh $v0, 0x16($s0) /* 78C5C 800DF7AC 8603001A */ lh $v1, 0x1a($s0) /* 78C60 800DF7B0 44820000 */ mtc1 $v0, $f0 -/* 78C64 800DF7B4 00000000 */ nop +/* 78C64 800DF7B4 00000000 */ nop /* 78C68 800DF7B8 46800020 */ cvt.s.w $f0, $f0 /* 78C6C 800DF7BC 86020018 */ lh $v0, 0x18($s0) /* 78C70 800DF7C0 A60000C0 */ sh $zero, 0xc0($s0) /* 78C74 800DF7C4 E6000028 */ swc1 $f0, 0x28($s0) /* 78C78 800DF7C8 44820000 */ mtc1 $v0, $f0 -/* 78C7C 800DF7CC 00000000 */ nop +/* 78C7C 800DF7CC 00000000 */ nop /* 78C80 800DF7D0 46800020 */ cvt.s.w $f0, $f0 /* 78C84 800DF7D4 E600002C */ swc1 $f0, 0x2c($s0) /* 78C88 800DF7D8 44830000 */ mtc1 $v1, $f0 -/* 78C8C 800DF7DC 00000000 */ nop +/* 78C8C 800DF7DC 00000000 */ nop /* 78C90 800DF7E0 46800020 */ cvt.s.w $f0, $f0 /* 78C94 800DF7E4 3C020040 */ lui $v0, 0x40 /* 78C98 800DF7E8 00821024 */ and $v0, $a0, $v0 @@ -56,24 +56,24 @@ glabel update_player /* 78CB8 800DF808 AE020004 */ sw $v0, 4($s0) /* 78CBC 800DF80C 86030016 */ lh $v1, 0x16($s0) /* 78CC0 800DF810 44830000 */ mtc1 $v1, $f0 -/* 78CC4 800DF814 00000000 */ nop +/* 78CC4 800DF814 00000000 */ nop /* 78CC8 800DF818 46800020 */ cvt.s.w $f0, $f0 /* 78CCC 800DF81C E4400038 */ swc1 $f0, 0x38($v0) /* 78CD0 800DF820 86030018 */ lh $v1, 0x18($s0) /* 78CD4 800DF824 860400B0 */ lh $a0, 0xb0($s0) /* 78CD8 800DF828 00641821 */ addu $v1, $v1, $a0 /* 78CDC 800DF82C 44830000 */ mtc1 $v1, $f0 -/* 78CE0 800DF830 00000000 */ nop +/* 78CE0 800DF830 00000000 */ nop /* 78CE4 800DF834 46800020 */ cvt.s.w $f0, $f0 /* 78CE8 800DF838 E440003C */ swc1 $f0, 0x3c($v0) /* 78CEC 800DF83C 8603001A */ lh $v1, 0x1a($s0) /* 78CF0 800DF840 44830000 */ mtc1 $v1, $f0 -/* 78CF4 800DF844 00000000 */ nop +/* 78CF4 800DF844 00000000 */ nop /* 78CF8 800DF848 46800020 */ cvt.s.w $f0, $f0 /* 78CFC 800DF84C E4400040 */ swc1 $f0, 0x40($v0) /* 78D00 800DF850 86030018 */ lh $v1, 0x18($s0) /* 78D04 800DF854 44830000 */ mtc1 $v1, $f0 -/* 78D08 800DF858 00000000 */ nop +/* 78D08 800DF858 00000000 */ nop /* 78D0C 800DF85C 46800020 */ cvt.s.w $f0, $f0 /* 78D10 800DF860 08037E1C */ j .L800DF870 /* 78D14 800DF864 E4400064 */ swc1 $f0, 0x64($v0) @@ -99,31 +99,31 @@ glabel update_player /* 78D58 800DF8A8 1040000B */ beqz $v0, .L800DF8D8 /* 78D5C 800DF8AC 24020017 */ addiu $v0, $zero, 0x17 /* 78D60 800DF8B0 0C03968B */ jal func_800E5A2C -/* 78D64 800DF8B4 00000000 */ nop +/* 78D64 800DF8B4 00000000 */ nop /* 78D68 800DF8B8 0C038082 */ jal func_800E0208 -/* 78D6C 800DF8BC 00000000 */ nop +/* 78D6C 800DF8BC 00000000 */ nop /* 78D70 800DF8C0 1440000E */ bnez $v0, .L800DF8FC -/* 78D74 800DF8C4 00000000 */ nop +/* 78D74 800DF8C4 00000000 */ nop /* 78D78 800DF8C8 0C038D8F */ jal collision_main_lateral -/* 78D7C 800DF8CC 00000000 */ nop +/* 78D7C 800DF8CC 00000000 */ nop /* 78D80 800DF8D0 08037E3F */ j .L800DF8FC -/* 78D84 800DF8D4 00000000 */ nop +/* 78D84 800DF8D4 00000000 */ nop .L800DF8D8: /* 78D88 800DF8D8 820300B4 */ lb $v1, 0xb4($s0) /* 78D8C 800DF8DC 10620005 */ beq $v1, $v0, .L800DF8F4 -/* 78D90 800DF8E0 00000000 */ nop +/* 78D90 800DF8E0 00000000 */ nop /* 78D94 800DF8E4 0C037EAB */ jal func_800DFAAC -/* 78D98 800DF8E8 00000000 */ nop +/* 78D98 800DF8E8 00000000 */ nop /* 78D9C 800DF8EC 08037E3F */ j .L800DF8FC -/* 78DA0 800DF8F0 00000000 */ nop +/* 78DA0 800DF8F0 00000000 */ nop .L800DF8F4: /* 78DA4 800DF8F4 0C037EFA */ jal func_800DFBE8 -/* 78DA8 800DF8F8 00000000 */ nop +/* 78DA8 800DF8F8 00000000 */ nop .L800DF8FC: /* 78DAC 800DF8FC 8E020000 */ lw $v0, ($s0) /* 78DB0 800DF900 30424000 */ andi $v0, $v0, 0x4000 /* 78DB4 800DF904 1040000B */ beqz $v0, .L800DF934 -/* 78DB8 800DF908 00000000 */ nop +/* 78DB8 800DF908 00000000 */ nop /* 78DBC 800DF90C 96020012 */ lhu $v0, 0x12($s0) /* 78DC0 800DF910 2442FFFF */ addiu $v0, $v0, -1 /* 78DC4 800DF914 A6020012 */ sh $v0, 0x12($s0) @@ -138,12 +138,12 @@ glabel update_player /* 78DE4 800DF934 8E020004 */ lw $v0, 4($s0) /* 78DE8 800DF938 30421000 */ andi $v0, $v0, 0x1000 /* 78DEC 800DF93C 14400003 */ bnez $v0, .L800DF94C -/* 78DF0 800DF940 00000000 */ nop +/* 78DF0 800DF940 00000000 */ nop /* 78DF4 800DF944 0C03BF42 */ jal func_800EFD08 -/* 78DF8 800DF948 00000000 */ nop +/* 78DF8 800DF948 00000000 */ nop .L800DF94C: /* 78DFC 800DF94C 0C0382E4 */ jal func_800E0B90 -/* 78E00 800DF950 00000000 */ nop +/* 78E00 800DF950 00000000 */ nop /* 78E04 800DF954 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 78E08 800DF958 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 78E0C 800DF95C C6000028 */ lwc1 $f0, 0x28($s0) @@ -158,20 +158,20 @@ glabel update_player /* 78E30 800DF980 8E020004 */ lw $v0, 4($s0) /* 78E34 800DF984 30421000 */ andi $v0, $v0, 0x1000 /* 78E38 800DF988 14400003 */ bnez $v0, .L800DF998 -/* 78E3C 800DF98C 00000000 */ nop +/* 78E3C 800DF98C 00000000 */ nop /* 78E40 800DF990 0C039CA3 */ jal check_input_status_menu -/* 78E44 800DF994 00000000 */ nop +/* 78E44 800DF994 00000000 */ nop .L800DF998: /* 78E48 800DF998 0C0386F1 */ jal update_player_shadow -/* 78E4C 800DF99C 00000000 */ nop +/* 78E4C 800DF99C 00000000 */ nop /* 78E50 800DF9A0 0C038206 */ jal func_800E0818 -/* 78E54 800DF9A4 00000000 */ nop +/* 78E54 800DF9A4 00000000 */ nop /* 78E58 800DF9A8 0C038160 */ jal func_800E0580 -/* 78E5C 800DF9AC 00000000 */ nop +/* 78E5C 800DF9AC 00000000 */ nop /* 78E60 800DF9B0 0C0380E6 */ jal func_800E0398 -/* 78E64 800DF9B4 00000000 */ nop +/* 78E64 800DF9B4 00000000 */ nop /* 78E68 800DF9B8 0C0380A5 */ jal func_800E0294 -/* 78E6C 800DF9BC 00000000 */ nop +/* 78E6C 800DF9BC 00000000 */ nop /* 78E70 800DF9C0 8E020000 */ lw $v0, ($s0) /* 78E74 800DF9C4 2403FFEF */ addiu $v1, $zero, -0x11 /* 78E78 800DF9C8 AE00001C */ sw $zero, 0x1c($s0) diff --git a/asm/nonmatchings/code_759b0_len_61b0/update_player_input.s b/asm/nonmatchings/code_759b0_len_61b0/update_player_input.s index ee164b858e..583d313a96 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/update_player_input.s +++ b/asm/nonmatchings/code_759b0_len_61b0/update_player_input.s @@ -55,4 +55,4 @@ glabel update_player_input /* 7B500 800E2050 ACE300E0 */ sw $v1, 0xe0($a3) .L800E2054: /* 7B504 800E2054 03E00008 */ jr $ra -/* 7B508 800E2058 00000000 */ nop +/* 7B508 800E2058 00000000 */ nop diff --git a/asm/nonmatchings/code_759b0_len_61b0/update_player_shadow.s b/asm/nonmatchings/code_759b0_len_61b0/update_player_shadow.s index 4c9c4a6faa..bb99cb5ccf 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/update_player_shadow.s +++ b/asm/nonmatchings/code_759b0_len_61b0/update_player_shadow.s @@ -35,16 +35,16 @@ glabel update_player_shadow /* 7B0EC 800E1C3C 000210C0 */ sll $v0, $v0, 3 /* 7B0F0 800E1C40 00448821 */ addu $s1, $v0, $a0 /* 7B0F4 800E1C44 4604003E */ c.le.s $f0, $f4 -/* 7B0F8 800E1C48 00000000 */ nop +/* 7B0F8 800E1C48 00000000 */ nop /* 7B0FC 800E1C4C 4500000A */ bc1f .L800E1C78 /* 7B100 800E1C50 E7A80034 */ swc1 $f8, 0x34($sp) /* 7B104 800E1C54 3C014387 */ lui $at, 0x4387 /* 7B108 800E1C58 44810000 */ mtc1 $at, $f0 -/* 7B10C 800E1C5C 00000000 */ nop +/* 7B10C 800E1C5C 00000000 */ nop /* 7B110 800E1C60 4600203C */ c.lt.s $f4, $f0 -/* 7B114 800E1C64 00000000 */ nop +/* 7B114 800E1C64 00000000 */ nop /* 7B118 800E1C68 45000003 */ bc1f .L800E1C78 -/* 7B11C 800E1C6C 00000000 */ nop +/* 7B11C 800E1C6C 00000000 */ nop /* 7B120 800E1C70 3C014334 */ lui $at, 0x4334 /* 7B124 800E1C74 44814000 */ mtc1 $at, $f8 .L800E1C78: @@ -76,7 +76,7 @@ glabel update_player_shadow /* 7B18C 800E1CDC 460C4301 */ sub.s $f12, $f8, $f12 /* 7B190 800E1CE0 E7A20028 */ swc1 $f2, 0x28($sp) /* 7B194 800E1CE4 44821000 */ mtc1 $v0, $f2 -/* 7B198 800E1CE8 00000000 */ nop +/* 7B198 800E1CE8 00000000 */ nop /* 7B19C 800E1CEC 468010A0 */ cvt.s.w $f2, $f2 /* 7B1A0 800E1CF0 46001083 */ div.s $f2, $f2, $f0 /* 7B1A4 800E1CF4 46066300 */ add.s $f12, $f12, $f6 @@ -86,7 +86,7 @@ glabel update_player_shadow /* 7B1B4 800E1D04 E7A40030 */ swc1 $f4, 0x30($sp) /* 7B1B8 800E1D08 46020000 */ add.s $f0, $f0, $f2 /* 7B1BC 800E1D0C 44827000 */ mtc1 $v0, $f14 -/* 7B1C0 800E1D10 00000000 */ nop +/* 7B1C0 800E1D10 00000000 */ nop /* 7B1C4 800E1D14 468073A0 */ cvt.s.w $f14, $f14 /* 7B1C8 800E1D18 27A20030 */ addiu $v0, $sp, 0x30 /* 7B1CC 800E1D1C E7A0002C */ swc1 $f0, 0x2c($sp) @@ -114,7 +114,7 @@ glabel update_player_shadow /* 7B224 800E1D74 C7A40038 */ lwc1 $f4, 0x38($sp) /* 7B228 800E1D78 3C014334 */ lui $at, 0x4334 /* 7B22C 800E1D7C 44813000 */ mtc1 $at, $f6 -/* 7B230 800E1D80 00000000 */ nop +/* 7B230 800E1D80 00000000 */ nop /* 7B234 800E1D84 46062100 */ add.s $f4, $f4, $f6 /* 7B238 800E1D88 C7A2003C */ lwc1 $f2, 0x3c($sp) /* 7B23C 800E1D8C 4480B000 */ mtc1 $zero, $f22 @@ -125,9 +125,9 @@ glabel update_player_shadow /* 7B250 800E1DA0 45000005 */ bc1f .L800E1DB8 /* 7B254 800E1DA4 E7A2003C */ swc1 $f2, 0x3c($sp) /* 7B258 800E1DA8 46161032 */ c.eq.s $f2, $f22 -/* 7B25C 800E1DAC 00000000 */ nop +/* 7B25C 800E1DAC 00000000 */ nop /* 7B260 800E1DB0 45010041 */ bc1t .L800E1EB8 -/* 7B264 800E1DB4 00000000 */ nop +/* 7B264 800E1DB4 00000000 */ nop .L800E1DB8: /* 7B268 800E1DB8 C7AC0028 */ lwc1 $f12, 0x28($sp) /* 7B26C 800E1DBC C7AE0030 */ lwc1 $f14, 0x30($sp) @@ -141,12 +141,12 @@ glabel update_player_shadow /* 7B28C 800E1DDC 4600028D */ trunc.w.s $f10, $f0 /* 7B290 800E1DE0 44135000 */ mfc1 $s3, $f10 /* 7B294 800E1DE4 0C00A720 */ jal atan2 -/* 7B298 800E1DE8 00000000 */ nop +/* 7B298 800E1DE8 00000000 */ nop /* 7B29C 800E1DEC 0C00A788 */ jal get_player_normal_yaw /* 7B2A0 800E1DF0 46000506 */ mov.s $f20, $f0 /* 7B2A4 800E1DF4 3C01C2B4 */ lui $at, 0xc2b4 /* 7B2A8 800E1DF8 44816000 */ mtc1 $at, $f12 -/* 7B2AC 800E1DFC 00000000 */ nop +/* 7B2AC 800E1DFC 00000000 */ nop /* 7B2B0 800E1E00 46146301 */ sub.s $f12, $f12, $f20 /* 7B2B4 800E1E04 0C00A6C9 */ jal clamp_angle /* 7B2B8 800E1E08 46006300 */ add.s $f12, $f12, $f0 @@ -157,40 +157,40 @@ glabel update_player_shadow /* 7B2CC 800E1E1C 4600028D */ trunc.w.s $f10, $f0 /* 7B2D0 800E1E20 44025000 */ mfc1 $v0, $f10 /* 7B2D4 800E1E24 46161032 */ c.eq.s $f2, $f22 -/* 7B2D8 800E1E28 00000000 */ nop +/* 7B2D8 800E1E28 00000000 */ nop /* 7B2DC 800E1E2C 45010022 */ bc1t .L800E1EB8 -/* 7B2E0 800E1E30 00000000 */ nop +/* 7B2E0 800E1E30 00000000 */ nop /* 7B2E4 800E1E34 44826000 */ mtc1 $v0, $f12 -/* 7B2E8 800E1E38 00000000 */ nop +/* 7B2E8 800E1E38 00000000 */ nop /* 7B2EC 800E1E3C 0C00A8BB */ jal sin_deg /* 7B2F0 800E1E40 46806320 */ cvt.s.w $f12, $f12 /* 7B2F4 800E1E44 8E220000 */ lw $v0, ($s1) /* 7B2F8 800E1E48 C4440128 */ lwc1 $f4, 0x128($v0) /* 7B2FC 800E1E4C 46042102 */ mul.s $f4, $f4, $f4 -/* 7B300 800E1E50 00000000 */ nop +/* 7B300 800E1E50 00000000 */ nop /* 7B304 800E1E54 C4420130 */ lwc1 $f2, 0x130($v0) /* 7B308 800E1E58 46021082 */ mul.s $f2, $f2, $f2 -/* 7B30C 800E1E5C 00000000 */ nop +/* 7B30C 800E1E5C 00000000 */ nop /* 7B310 800E1E60 46022300 */ add.s $f12, $f4, $f2 /* 7B314 800E1E64 46006084 */ sqrt.s $f2, $f12 /* 7B318 800E1E68 46021032 */ c.eq.s $f2, $f2 -/* 7B31C 800E1E6C 00000000 */ nop +/* 7B31C 800E1E6C 00000000 */ nop /* 7B320 800E1E70 45010005 */ bc1t .L800E1E88 /* 7B324 800E1E74 46000506 */ mov.s $f20, $f0 /* 7B328 800E1E78 0C0187BC */ jal sqrtf -/* 7B32C 800E1E7C 00000000 */ nop +/* 7B32C 800E1E7C 00000000 */ nop /* 7B330 800E1E80 46000086 */ mov.s $f2, $f0 /* 7B334 800E1E84 8E220000 */ lw $v0, ($s1) .L800E1E88: /* 7B338 800E1E88 C440012C */ lwc1 $f0, 0x12c($v0) /* 7B33C 800E1E8C 46001003 */ div.s $f0, $f2, $f0 /* 7B340 800E1E90 44931000 */ mtc1 $s3, $f2 -/* 7B344 800E1E94 00000000 */ nop +/* 7B344 800E1E94 00000000 */ nop /* 7B348 800E1E98 468010A0 */ cvt.s.w $f2, $f2 /* 7B34C 800E1E9C 46020002 */ mul.s $f0, $f0, $f2 -/* 7B350 800E1EA0 00000000 */ nop +/* 7B350 800E1EA0 00000000 */ nop /* 7B354 800E1EA4 46140002 */ mul.s $f0, $f0, $f20 -/* 7B358 800E1EA8 00000000 */ nop +/* 7B358 800E1EA8 00000000 */ nop /* 7B35C 800E1EAC C7A2002C */ lwc1 $f2, 0x2c($sp) /* 7B360 800E1EB0 46001081 */ sub.s $f2, $f2, $f0 /* 7B364 800E1EB4 E7A2002C */ swc1 $f2, 0x2c($sp) @@ -202,16 +202,16 @@ glabel update_player_shadow /* 7B378 800E1EC8 44811800 */ mtc1 $at, $f3 /* 7B37C 800E1ECC 44801000 */ mtc1 $zero, $f2 /* 7B380 800E1ED0 44820000 */ mtc1 $v0, $f0 -/* 7B384 800E1ED4 00000000 */ nop +/* 7B384 800E1ED4 00000000 */ nop /* 7B388 800E1ED8 46800021 */ cvt.d.w $f0, $f0 /* 7B38C 800E1EDC 46220002 */ mul.d $f0, $f0, $f2 -/* 7B390 800E1EE0 00000000 */ nop +/* 7B390 800E1EE0 00000000 */ nop /* 7B394 800E1EE4 3C0141E0 */ lui $at, 0x41e0 /* 7B398 800E1EE8 44811800 */ mtc1 $at, $f3 /* 7B39C 800E1EEC 44801000 */ mtc1 $zero, $f2 -/* 7B3A0 800E1EF0 00000000 */ nop +/* 7B3A0 800E1EF0 00000000 */ nop /* 7B3A4 800E1EF4 4620103E */ c.le.d $f2, $f0 -/* 7B3A8 800E1EF8 00000000 */ nop +/* 7B3A8 800E1EF8 00000000 */ nop /* 7B3AC 800E1EFC 45010005 */ bc1t .L800E1F14 /* 7B3B0 800E1F00 26040005 */ addiu $a0, $s0, 5 /* 7B3B4 800E1F04 4620028D */ trunc.w.d $f10, $f0 @@ -223,7 +223,7 @@ glabel update_player_shadow /* 7B3C8 800E1F18 3C028000 */ lui $v0, 0x8000 /* 7B3CC 800E1F1C 4620028D */ trunc.w.d $f10, $f0 /* 7B3D0 800E1F20 44035000 */ mfc1 $v1, $f10 -/* 7B3D4 800E1F24 00000000 */ nop +/* 7B3D4 800E1F24 00000000 */ nop /* 7B3D8 800E1F28 00621825 */ or $v1, $v1, $v0 /* 7B3DC 800E1F2C A0830000 */ sb $v1, ($a0) .L800E1F30: @@ -232,12 +232,12 @@ glabel update_player_shadow /* 7B3E8 800E1F38 9042007E */ lbu $v0, 0x7e($v0) /* 7B3EC 800E1F3C 30420001 */ andi $v0, $v0, 1 /* 7B3F0 800E1F40 14400006 */ bnez $v0, .L800E1F5C -/* 7B3F4 800E1F44 00000000 */ nop +/* 7B3F4 800E1F44 00000000 */ nop /* 7B3F8 800E1F48 8FA50034 */ lw $a1, 0x34($sp) /* 7B3FC 800E1F4C 0C044A17 */ jal set_standard_shadow_scale /* 7B400 800E1F50 0200202D */ daddu $a0, $s0, $zero /* 7B404 800E1F54 080387DA */ j .L800E1F68 -/* 7B408 800E1F58 00000000 */ nop +/* 7B408 800E1F58 00000000 */ nop .L800E1F5C: /* 7B40C 800E1F5C 8FA50034 */ lw $a1, 0x34($sp) /* 7B410 800E1F60 0C044A75 */ jal set_peach_shadow_scale @@ -252,4 +252,4 @@ glabel update_player_shadow /* 7B430 800E1F80 D7B40060 */ ldc1 $f20, 0x60($sp) /* 7B434 800E1F84 03E00008 */ jr $ra /* 7B438 800E1F88 27BD0070 */ addiu $sp, $sp, 0x70 -/* 7B43C 800E1F8C 00000000 */ nop +/* 7B43C 800E1F8C 00000000 */ nop diff --git a/asm/nonmatchings/code_75C980/func_802A1000_75C980.s b/asm/nonmatchings/code_75C980/func_802A1000_75C980.s index 588961831b..33d5692457 100644 --- a/asm/nonmatchings/code_75C980/func_802A1000_75C980.s +++ b/asm/nonmatchings/code_75C980/func_802A1000_75C980.s @@ -24,16 +24,16 @@ glabel func_802A1000_75C980 /* 75C9CC 802A104C E7A00014 */ swc1 $f0, 0x14($sp) /* 75C9D0 802A1050 3C014170 */ lui $at, 0x4170 /* 75C9D4 802A1054 44811000 */ mtc1 $at, $f2 -/* 75C9D8 802A1058 00000000 */ nop +/* 75C9D8 802A1058 00000000 */ nop /* 75C9DC 802A105C 46020002 */ mul.s $f0, $f0, $f2 -/* 75C9E0 802A1060 00000000 */ nop +/* 75C9E0 802A1060 00000000 */ nop /* 75C9E4 802A1064 3C0142C8 */ lui $at, 0x42c8 /* 75C9E8 802A1068 44811000 */ mtc1 $at, $f2 -/* 75C9EC 802A106C 00000000 */ nop +/* 75C9EC 802A106C 00000000 */ nop /* 75C9F0 802A1070 46020003 */ div.s $f0, $f0, $f2 /* 75C9F4 802A1074 4600020D */ trunc.w.s $f8, $f0 /* 75C9F8 802A1078 44024000 */ mfc1 $v0, $f8 -/* 75C9FC 802A107C 00000000 */ nop +/* 75C9FC 802A107C 00000000 */ nop /* 75CA00 802A1080 AE020084 */ sw $v0, 0x84($s0) /* 75CA04 802A1084 28420015 */ slti $v0, $v0, 0x15 /* 75CA08 802A1088 14400002 */ bnez $v0, .L802A1094 @@ -42,7 +42,7 @@ glabel func_802A1000_75C980 .L802A1094: /* 75CA14 802A1094 82220083 */ lb $v0, 0x83($s1) /* 75CA18 802A1098 10400007 */ beqz $v0, .L802A10B8 -/* 75CA1C 802A109C 00000000 */ nop +/* 75CA1C 802A109C 00000000 */ nop /* 75CA20 802A10A0 8E020084 */ lw $v0, 0x84($s0) /* 75CA24 802A10A4 28420006 */ slti $v0, $v0, 6 /* 75CA28 802A10A8 10400008 */ beqz $v0, .L802A10CC diff --git a/asm/nonmatchings/code_75C980/func_802A1108_75CA88.s b/asm/nonmatchings/code_75C980/func_802A1108_75CA88.s index ca762dc1e6..b4d4d5fceb 100644 --- a/asm/nonmatchings/code_75C980/func_802A1108_75CA88.s +++ b/asm/nonmatchings/code_75C980/func_802A1108_75CA88.s @@ -23,15 +23,15 @@ glabel func_802A1108_75CA88 /* 75CAD0 802A1150 0040802D */ daddu $s0, $v0, $zero /* 75CAD4 802A1154 24040001 */ addiu $a0, $zero, 1 /* 75CAD8 802A1158 44921000 */ mtc1 $s2, $f2 -/* 75CADC 802A115C 00000000 */ nop +/* 75CADC 802A115C 00000000 */ nop /* 75CAE0 802A1160 468010A0 */ cvt.s.w $f2, $f2 /* 75CAE4 802A1164 44051000 */ mfc1 $a1, $f2 /* 75CAE8 802A1168 44901000 */ mtc1 $s0, $f2 -/* 75CAEC 802A116C 00000000 */ nop +/* 75CAEC 802A116C 00000000 */ nop /* 75CAF0 802A1170 468010A0 */ cvt.s.w $f2, $f2 /* 75CAF4 802A1174 44061000 */ mfc1 $a2, $f2 /* 75CAF8 802A1178 44821000 */ mtc1 $v0, $f2 -/* 75CAFC 802A117C 00000000 */ nop +/* 75CAFC 802A117C 00000000 */ nop /* 75CB00 802A1180 468010A0 */ cvt.s.w $f2, $f2 /* 75CB04 802A1184 3C013F80 */ lui $at, 0x3f80 /* 75CB08 802A1188 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_75C980/func_802A1228_75CBA8.s b/asm/nonmatchings/code_75C980/func_802A1228_75CBA8.s index df8fff865c..9760abc76c 100644 --- a/asm/nonmatchings/code_75C980/func_802A1228_75CBA8.s +++ b/asm/nonmatchings/code_75C980/func_802A1228_75CBA8.s @@ -34,14 +34,14 @@ glabel func_802A1228_75CBA8 /* 75CC1C 802A129C 24040006 */ addiu $a0, $zero, 6 /* 75CC20 802A12A0 2673000A */ addiu $s3, $s3, 0xa /* 75CC24 802A12A4 4493D000 */ mtc1 $s3, $f26 -/* 75CC28 802A12A8 00000000 */ nop +/* 75CC28 802A12A8 00000000 */ nop /* 75CC2C 802A12AC 4680D6A0 */ cvt.s.w $f26, $f26 /* 75CC30 802A12B0 26310012 */ addiu $s1, $s1, 0x12 /* 75CC34 802A12B4 4491C000 */ mtc1 $s1, $f24 -/* 75CC38 802A12B8 00000000 */ nop +/* 75CC38 802A12B8 00000000 */ nop /* 75CC3C 802A12BC 4680C620 */ cvt.s.w $f24, $f24 /* 75CC40 802A12C0 4490A000 */ mtc1 $s0, $f20 -/* 75CC44 802A12C4 00000000 */ nop +/* 75CC44 802A12C4 00000000 */ nop /* 75CC48 802A12C8 4680A520 */ cvt.s.w $f20, $f20 /* 75CC4C 802A12CC 46000586 */ mov.s $f22, $f0 /* 75CC50 802A12D0 4405D000 */ mfc1 $a1, $f26 diff --git a/asm/nonmatchings/code_75C980/func_802A133C_75CCBC.s b/asm/nonmatchings/code_75C980/func_802A133C_75CCBC.s index 33b3ca32a7..d2a61f0dfa 100644 --- a/asm/nonmatchings/code_75C980/func_802A133C_75CCBC.s +++ b/asm/nonmatchings/code_75C980/func_802A133C_75CCBC.s @@ -11,4 +11,4 @@ glabel func_802A133C_75CCBC /* 75CCD0 802A1350 AC820084 */ sw $v0, 0x84($a0) /* 75CCD4 802A1354 03E00008 */ jr $ra /* 75CCD8 802A1358 24020002 */ addiu $v0, $zero, 2 -/* 75CCDC 802A135C 00000000 */ nop +/* 75CCDC 802A135C 00000000 */ nop diff --git a/asm/nonmatchings/code_75E5D0/func_802A10C8_75E698.s b/asm/nonmatchings/code_75E5D0/func_802A10C8_75E698.s index d944b2cb6e..ce356c2b11 100644 --- a/asm/nonmatchings/code_75E5D0/func_802A10C8_75E698.s +++ b/asm/nonmatchings/code_75E5D0/func_802A10C8_75E698.s @@ -23,15 +23,15 @@ glabel func_802A10C8_75E698 /* 75E6E0 802A1110 0040802D */ daddu $s0, $v0, $zero /* 75E6E4 802A1114 24040002 */ addiu $a0, $zero, 2 /* 75E6E8 802A1118 44921000 */ mtc1 $s2, $f2 -/* 75E6EC 802A111C 00000000 */ nop +/* 75E6EC 802A111C 00000000 */ nop /* 75E6F0 802A1120 468010A0 */ cvt.s.w $f2, $f2 /* 75E6F4 802A1124 44051000 */ mfc1 $a1, $f2 /* 75E6F8 802A1128 44901000 */ mtc1 $s0, $f2 -/* 75E6FC 802A112C 00000000 */ nop +/* 75E6FC 802A112C 00000000 */ nop /* 75E700 802A1130 468010A0 */ cvt.s.w $f2, $f2 /* 75E704 802A1134 44061000 */ mfc1 $a2, $f2 /* 75E708 802A1138 44821000 */ mtc1 $v0, $f2 -/* 75E70C 802A113C 00000000 */ nop +/* 75E70C 802A113C 00000000 */ nop /* 75E710 802A1140 468010A0 */ cvt.s.w $f2, $f2 /* 75E714 802A1144 3C013F80 */ lui $at, 0x3f80 /* 75E718 802A1148 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_75E5D0/func_802A11E8_75E7B8.s b/asm/nonmatchings/code_75E5D0/func_802A11E8_75E7B8.s index 020397fe27..d2a132d131 100644 --- a/asm/nonmatchings/code_75E5D0/func_802A11E8_75E7B8.s +++ b/asm/nonmatchings/code_75E5D0/func_802A11E8_75E7B8.s @@ -34,14 +34,14 @@ glabel func_802A11E8_75E7B8 /* 75E82C 802A125C 24040006 */ addiu $a0, $zero, 6 /* 75E830 802A1260 2673000A */ addiu $s3, $s3, 0xa /* 75E834 802A1264 4493D000 */ mtc1 $s3, $f26 -/* 75E838 802A1268 00000000 */ nop +/* 75E838 802A1268 00000000 */ nop /* 75E83C 802A126C 4680D6A0 */ cvt.s.w $f26, $f26 /* 75E840 802A1270 26310012 */ addiu $s1, $s1, 0x12 /* 75E844 802A1274 4491C000 */ mtc1 $s1, $f24 -/* 75E848 802A1278 00000000 */ nop +/* 75E848 802A1278 00000000 */ nop /* 75E84C 802A127C 4680C620 */ cvt.s.w $f24, $f24 /* 75E850 802A1280 4490A000 */ mtc1 $s0, $f20 -/* 75E854 802A1284 00000000 */ nop +/* 75E854 802A1284 00000000 */ nop /* 75E858 802A1288 4680A520 */ cvt.s.w $f20, $f20 /* 75E85C 802A128C 46000586 */ mov.s $f22, $f0 /* 75E860 802A1290 4405D000 */ mfc1 $a1, $f26 diff --git a/asm/nonmatchings/code_75E5D0/func_802A12FC_75E8CC.s b/asm/nonmatchings/code_75E5D0/func_802A12FC_75E8CC.s index 805459b55b..2e21639220 100644 --- a/asm/nonmatchings/code_75E5D0/func_802A12FC_75E8CC.s +++ b/asm/nonmatchings/code_75E5D0/func_802A12FC_75E8CC.s @@ -11,4 +11,4 @@ glabel func_802A12FC_75E8CC /* 75E8E0 802A1310 AC820084 */ sw $v0, 0x84($a0) /* 75E8E4 802A1314 03E00008 */ jr $ra /* 75E8E8 802A1318 24020002 */ addiu $v0, $zero, 2 -/* 75E8EC 802A131C 00000000 */ nop +/* 75E8EC 802A131C 00000000 */ nop diff --git a/asm/nonmatchings/code_761920/func_802A1000_761920.s b/asm/nonmatchings/code_761920/func_802A1000_761920.s index 6f639ac3a0..f8c980aa69 100644 --- a/asm/nonmatchings/code_761920/func_802A1000_761920.s +++ b/asm/nonmatchings/code_761920/func_802A1000_761920.s @@ -24,16 +24,16 @@ glabel func_802A1000_761920 /* 76196C 802A104C E7A00014 */ swc1 $f0, 0x14($sp) /* 761970 802A1050 3C014170 */ lui $at, 0x4170 /* 761974 802A1054 44811000 */ mtc1 $at, $f2 -/* 761978 802A1058 00000000 */ nop +/* 761978 802A1058 00000000 */ nop /* 76197C 802A105C 46020002 */ mul.s $f0, $f0, $f2 -/* 761980 802A1060 00000000 */ nop +/* 761980 802A1060 00000000 */ nop /* 761984 802A1064 3C0142C8 */ lui $at, 0x42c8 /* 761988 802A1068 44811000 */ mtc1 $at, $f2 -/* 76198C 802A106C 00000000 */ nop +/* 76198C 802A106C 00000000 */ nop /* 761990 802A1070 46020003 */ div.s $f0, $f0, $f2 /* 761994 802A1074 4600020D */ trunc.w.s $f8, $f0 /* 761998 802A1078 44024000 */ mfc1 $v0, $f8 -/* 76199C 802A107C 00000000 */ nop +/* 76199C 802A107C 00000000 */ nop /* 7619A0 802A1080 AE020084 */ sw $v0, 0x84($s0) /* 7619A4 802A1084 28420015 */ slti $v0, $v0, 0x15 /* 7619A8 802A1088 14400002 */ bnez $v0, .L802A1094 @@ -42,7 +42,7 @@ glabel func_802A1000_761920 .L802A1094: /* 7619B4 802A1094 82220083 */ lb $v0, 0x83($s1) /* 7619B8 802A1098 10400007 */ beqz $v0, .L802A10B8 -/* 7619BC 802A109C 00000000 */ nop +/* 7619BC 802A109C 00000000 */ nop /* 7619C0 802A10A0 8E020084 */ lw $v0, 0x84($s0) /* 7619C4 802A10A4 28420006 */ slti $v0, $v0, 6 /* 7619C8 802A10A8 10400008 */ beqz $v0, .L802A10CC diff --git a/asm/nonmatchings/code_761920/func_802A1108_761A28.s b/asm/nonmatchings/code_761920/func_802A1108_761A28.s index e4e548e4a9..2e2978679b 100644 --- a/asm/nonmatchings/code_761920/func_802A1108_761A28.s +++ b/asm/nonmatchings/code_761920/func_802A1108_761A28.s @@ -23,15 +23,15 @@ glabel func_802A1108_761A28 /* 761A70 802A1150 0040802D */ daddu $s0, $v0, $zero /* 761A74 802A1154 24040002 */ addiu $a0, $zero, 2 /* 761A78 802A1158 44921000 */ mtc1 $s2, $f2 -/* 761A7C 802A115C 00000000 */ nop +/* 761A7C 802A115C 00000000 */ nop /* 761A80 802A1160 468010A0 */ cvt.s.w $f2, $f2 /* 761A84 802A1164 44051000 */ mfc1 $a1, $f2 /* 761A88 802A1168 44901000 */ mtc1 $s0, $f2 -/* 761A8C 802A116C 00000000 */ nop +/* 761A8C 802A116C 00000000 */ nop /* 761A90 802A1170 468010A0 */ cvt.s.w $f2, $f2 /* 761A94 802A1174 44061000 */ mfc1 $a2, $f2 /* 761A98 802A1178 44821000 */ mtc1 $v0, $f2 -/* 761A9C 802A117C 00000000 */ nop +/* 761A9C 802A117C 00000000 */ nop /* 761AA0 802A1180 468010A0 */ cvt.s.w $f2, $f2 /* 761AA4 802A1184 3C013F80 */ lui $at, 0x3f80 /* 761AA8 802A1188 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_761920/func_802A1228_761B48.s b/asm/nonmatchings/code_761920/func_802A1228_761B48.s index 2c9e589015..c228d0a9f9 100644 --- a/asm/nonmatchings/code_761920/func_802A1228_761B48.s +++ b/asm/nonmatchings/code_761920/func_802A1228_761B48.s @@ -34,14 +34,14 @@ glabel func_802A1228_761B48 /* 761BBC 802A129C 24040006 */ addiu $a0, $zero, 6 /* 761BC0 802A12A0 2673000A */ addiu $s3, $s3, 0xa /* 761BC4 802A12A4 4493D000 */ mtc1 $s3, $f26 -/* 761BC8 802A12A8 00000000 */ nop +/* 761BC8 802A12A8 00000000 */ nop /* 761BCC 802A12AC 4680D6A0 */ cvt.s.w $f26, $f26 /* 761BD0 802A12B0 26310012 */ addiu $s1, $s1, 0x12 /* 761BD4 802A12B4 4491C000 */ mtc1 $s1, $f24 -/* 761BD8 802A12B8 00000000 */ nop +/* 761BD8 802A12B8 00000000 */ nop /* 761BDC 802A12BC 4680C620 */ cvt.s.w $f24, $f24 /* 761BE0 802A12C0 4490A000 */ mtc1 $s0, $f20 -/* 761BE4 802A12C4 00000000 */ nop +/* 761BE4 802A12C4 00000000 */ nop /* 761BE8 802A12C8 4680A520 */ cvt.s.w $f20, $f20 /* 761BEC 802A12CC 46000586 */ mov.s $f22, $f0 /* 761BF0 802A12D0 4405D000 */ mfc1 $a1, $f26 diff --git a/asm/nonmatchings/code_761920/func_802A133C_761C5C.s b/asm/nonmatchings/code_761920/func_802A133C_761C5C.s index 0e12019f16..24f075fce5 100644 --- a/asm/nonmatchings/code_761920/func_802A133C_761C5C.s +++ b/asm/nonmatchings/code_761920/func_802A133C_761C5C.s @@ -11,4 +11,4 @@ glabel func_802A133C_761C5C /* 761C70 802A1350 AC820084 */ sw $v0, 0x84($a0) /* 761C74 802A1354 03E00008 */ jr $ra /* 761C78 802A1358 24020002 */ addiu $v0, $zero, 2 -/* 761C7C 802A135C 00000000 */ nop +/* 761C7C 802A135C 00000000 */ nop diff --git a/asm/nonmatchings/code_765C20/func_802A1000_765C20.s b/asm/nonmatchings/code_765C20/func_802A1000_765C20.s index 74ce50a247..f65ffe0a86 100644 --- a/asm/nonmatchings/code_765C20/func_802A1000_765C20.s +++ b/asm/nonmatchings/code_765C20/func_802A1000_765C20.s @@ -24,16 +24,16 @@ glabel func_802A1000_765C20 /* 765C6C 802A104C E7A00014 */ swc1 $f0, 0x14($sp) /* 765C70 802A1050 3C014170 */ lui $at, 0x4170 /* 765C74 802A1054 44811000 */ mtc1 $at, $f2 -/* 765C78 802A1058 00000000 */ nop +/* 765C78 802A1058 00000000 */ nop /* 765C7C 802A105C 46020002 */ mul.s $f0, $f0, $f2 -/* 765C80 802A1060 00000000 */ nop +/* 765C80 802A1060 00000000 */ nop /* 765C84 802A1064 3C0142C8 */ lui $at, 0x42c8 /* 765C88 802A1068 44811000 */ mtc1 $at, $f2 -/* 765C8C 802A106C 00000000 */ nop +/* 765C8C 802A106C 00000000 */ nop /* 765C90 802A1070 46020003 */ div.s $f0, $f0, $f2 /* 765C94 802A1074 4600020D */ trunc.w.s $f8, $f0 /* 765C98 802A1078 44024000 */ mfc1 $v0, $f8 -/* 765C9C 802A107C 00000000 */ nop +/* 765C9C 802A107C 00000000 */ nop /* 765CA0 802A1080 AE020084 */ sw $v0, 0x84($s0) /* 765CA4 802A1084 28420015 */ slti $v0, $v0, 0x15 /* 765CA8 802A1088 14400002 */ bnez $v0, .L802A1094 @@ -42,7 +42,7 @@ glabel func_802A1000_765C20 .L802A1094: /* 765CB4 802A1094 82220083 */ lb $v0, 0x83($s1) /* 765CB8 802A1098 10400007 */ beqz $v0, .L802A10B8 -/* 765CBC 802A109C 00000000 */ nop +/* 765CBC 802A109C 00000000 */ nop /* 765CC0 802A10A0 8E020084 */ lw $v0, 0x84($s0) /* 765CC4 802A10A4 28420006 */ slti $v0, $v0, 6 /* 765CC8 802A10A8 10400008 */ beqz $v0, .L802A10CC diff --git a/asm/nonmatchings/code_76D760/func_802A1000_76D760.s b/asm/nonmatchings/code_76D760/func_802A1000_76D760.s index 8c6f862b5c..4d3b793045 100644 --- a/asm/nonmatchings/code_76D760/func_802A1000_76D760.s +++ b/asm/nonmatchings/code_76D760/func_802A1000_76D760.s @@ -24,16 +24,16 @@ glabel func_802A1000_76D760 /* 76D7AC 802A104C E7A00014 */ swc1 $f0, 0x14($sp) /* 76D7B0 802A1050 3C014170 */ lui $at, 0x4170 /* 76D7B4 802A1054 44811000 */ mtc1 $at, $f2 -/* 76D7B8 802A1058 00000000 */ nop +/* 76D7B8 802A1058 00000000 */ nop /* 76D7BC 802A105C 46020002 */ mul.s $f0, $f0, $f2 -/* 76D7C0 802A1060 00000000 */ nop +/* 76D7C0 802A1060 00000000 */ nop /* 76D7C4 802A1064 3C0142C8 */ lui $at, 0x42c8 /* 76D7C8 802A1068 44811000 */ mtc1 $at, $f2 -/* 76D7CC 802A106C 00000000 */ nop +/* 76D7CC 802A106C 00000000 */ nop /* 76D7D0 802A1070 46020003 */ div.s $f0, $f0, $f2 /* 76D7D4 802A1074 4600020D */ trunc.w.s $f8, $f0 /* 76D7D8 802A1078 44024000 */ mfc1 $v0, $f8 -/* 76D7DC 802A107C 00000000 */ nop +/* 76D7DC 802A107C 00000000 */ nop /* 76D7E0 802A1080 AE020084 */ sw $v0, 0x84($s0) /* 76D7E4 802A1084 28420015 */ slti $v0, $v0, 0x15 /* 76D7E8 802A1088 14400002 */ bnez $v0, .L802A1094 @@ -42,7 +42,7 @@ glabel func_802A1000_76D760 .L802A1094: /* 76D7F4 802A1094 82220083 */ lb $v0, 0x83($s1) /* 76D7F8 802A1098 10400007 */ beqz $v0, .L802A10B8 -/* 76D7FC 802A109C 00000000 */ nop +/* 76D7FC 802A109C 00000000 */ nop /* 76D800 802A10A0 8E020084 */ lw $v0, 0x84($s0) /* 76D804 802A10A4 28420006 */ slti $v0, $v0, 6 /* 76D808 802A10A8 10400008 */ beqz $v0, .L802A10CC diff --git a/asm/nonmatchings/code_770F30/func_802A1000_770F30.s b/asm/nonmatchings/code_770F30/func_802A1000_770F30.s index 090d447255..4f506a4f71 100644 --- a/asm/nonmatchings/code_770F30/func_802A1000_770F30.s +++ b/asm/nonmatchings/code_770F30/func_802A1000_770F30.s @@ -24,16 +24,16 @@ glabel func_802A1000_770F30 /* 770F7C 802A104C E7A00014 */ swc1 $f0, 0x14($sp) /* 770F80 802A1050 3C014170 */ lui $at, 0x4170 /* 770F84 802A1054 44811000 */ mtc1 $at, $f2 -/* 770F88 802A1058 00000000 */ nop +/* 770F88 802A1058 00000000 */ nop /* 770F8C 802A105C 46020002 */ mul.s $f0, $f0, $f2 -/* 770F90 802A1060 00000000 */ nop +/* 770F90 802A1060 00000000 */ nop /* 770F94 802A1064 3C0142C8 */ lui $at, 0x42c8 /* 770F98 802A1068 44811000 */ mtc1 $at, $f2 -/* 770F9C 802A106C 00000000 */ nop +/* 770F9C 802A106C 00000000 */ nop /* 770FA0 802A1070 46020003 */ div.s $f0, $f0, $f2 /* 770FA4 802A1074 4600020D */ trunc.w.s $f8, $f0 /* 770FA8 802A1078 44024000 */ mfc1 $v0, $f8 -/* 770FAC 802A107C 00000000 */ nop +/* 770FAC 802A107C 00000000 */ nop /* 770FB0 802A1080 AE020084 */ sw $v0, 0x84($s0) /* 770FB4 802A1084 28420015 */ slti $v0, $v0, 0x15 /* 770FB8 802A1088 14400002 */ bnez $v0, .L802A1094 @@ -42,7 +42,7 @@ glabel func_802A1000_770F30 .L802A1094: /* 770FC4 802A1094 82220083 */ lb $v0, 0x83($s1) /* 770FC8 802A1098 10400007 */ beqz $v0, .L802A10B8 -/* 770FCC 802A109C 00000000 */ nop +/* 770FCC 802A109C 00000000 */ nop /* 770FD0 802A10A0 8E020084 */ lw $v0, 0x84($s0) /* 770FD4 802A10A4 28420006 */ slti $v0, $v0, 6 /* 770FD8 802A10A8 10400008 */ beqz $v0, .L802A10CC diff --git a/asm/nonmatchings/code_779C90/func_802A1000_779C90.s b/asm/nonmatchings/code_779C90/func_802A1000_779C90.s index e71cdc2a25..a6d791c07f 100644 --- a/asm/nonmatchings/code_779C90/func_802A1000_779C90.s +++ b/asm/nonmatchings/code_779C90/func_802A1000_779C90.s @@ -24,16 +24,16 @@ glabel func_802A1000_779C90 /* 779CDC 802A104C E7A00014 */ swc1 $f0, 0x14($sp) /* 779CE0 802A1050 3C014170 */ lui $at, 0x4170 /* 779CE4 802A1054 44811000 */ mtc1 $at, $f2 -/* 779CE8 802A1058 00000000 */ nop +/* 779CE8 802A1058 00000000 */ nop /* 779CEC 802A105C 46020002 */ mul.s $f0, $f0, $f2 -/* 779CF0 802A1060 00000000 */ nop +/* 779CF0 802A1060 00000000 */ nop /* 779CF4 802A1064 3C0142C8 */ lui $at, 0x42c8 /* 779CF8 802A1068 44811000 */ mtc1 $at, $f2 -/* 779CFC 802A106C 00000000 */ nop +/* 779CFC 802A106C 00000000 */ nop /* 779D00 802A1070 46020003 */ div.s $f0, $f0, $f2 /* 779D04 802A1074 4600020D */ trunc.w.s $f8, $f0 /* 779D08 802A1078 44024000 */ mfc1 $v0, $f8 -/* 779D0C 802A107C 00000000 */ nop +/* 779D0C 802A107C 00000000 */ nop /* 779D10 802A1080 AE020084 */ sw $v0, 0x84($s0) /* 779D14 802A1084 28420015 */ slti $v0, $v0, 0x15 /* 779D18 802A1088 14400002 */ bnez $v0, .L802A1094 @@ -42,7 +42,7 @@ glabel func_802A1000_779C90 .L802A1094: /* 779D24 802A1094 82220083 */ lb $v0, 0x83($s1) /* 779D28 802A1098 10400007 */ beqz $v0, .L802A10B8 -/* 779D2C 802A109C 00000000 */ nop +/* 779D2C 802A109C 00000000 */ nop /* 779D30 802A10A0 8E020084 */ lw $v0, 0x84($s0) /* 779D34 802A10A4 28420006 */ slti $v0, $v0, 6 /* 779D38 802A10A8 10400008 */ beqz $v0, .L802A10CC diff --git a/asm/nonmatchings/code_77F240/func_802A10A4_77F2E4.s b/asm/nonmatchings/code_77F240/func_802A10A4_77F2E4.s index 4a514c5f93..959b6adad4 100644 --- a/asm/nonmatchings/code_77F240/func_802A10A4_77F2E4.s +++ b/asm/nonmatchings/code_77F240/func_802A10A4_77F2E4.s @@ -27,7 +27,7 @@ glabel func_802A10A4_77F2E4 /* 77F338 802A10F8 2404001E */ addiu $a0, $zero, 0x1e /* 77F33C 802A10FC C614000C */ lwc1 $f20, 0xc($s0) /* 77F340 802A1100 44820000 */ mtc1 $v0, $f0 -/* 77F344 802A1104 00000000 */ nop +/* 77F344 802A1104 00000000 */ nop /* 77F348 802A1108 46800020 */ cvt.s.w $f0, $f0 /* 77F34C 802A110C 4600A500 */ add.s $f20, $f20, $f0 /* 77F350 802A1110 24040014 */ addiu $a0, $zero, 0x14 @@ -35,7 +35,7 @@ glabel func_802A10A4_77F2E4 /* 77F358 802A1118 4616A501 */ sub.s $f20, $f20, $f22 /* 77F35C 802A111C C6020010 */ lwc1 $f2, 0x10($s0) /* 77F360 802A1120 44820000 */ mtc1 $v0, $f0 -/* 77F364 802A1124 00000000 */ nop +/* 77F364 802A1124 00000000 */ nop /* 77F368 802A1128 46800020 */ cvt.s.w $f0, $f0 /* 77F36C 802A112C 46001080 */ add.s $f2, $f2, $f0 /* 77F370 802A1130 C6000014 */ lwc1 $f0, 0x14($s0) diff --git a/asm/nonmatchings/code_783BA0/func_802A1000_783BA0.s b/asm/nonmatchings/code_783BA0/func_802A1000_783BA0.s index ccb25d7394..abaa8c13a0 100644 --- a/asm/nonmatchings/code_783BA0/func_802A1000_783BA0.s +++ b/asm/nonmatchings/code_783BA0/func_802A1000_783BA0.s @@ -24,16 +24,16 @@ glabel func_802A1000_783BA0 /* 783BEC 802A104C E7A00014 */ swc1 $f0, 0x14($sp) /* 783BF0 802A1050 3C014170 */ lui $at, 0x4170 /* 783BF4 802A1054 44811000 */ mtc1 $at, $f2 -/* 783BF8 802A1058 00000000 */ nop +/* 783BF8 802A1058 00000000 */ nop /* 783BFC 802A105C 46020002 */ mul.s $f0, $f0, $f2 -/* 783C00 802A1060 00000000 */ nop +/* 783C00 802A1060 00000000 */ nop /* 783C04 802A1064 3C0142C8 */ lui $at, 0x42c8 /* 783C08 802A1068 44811000 */ mtc1 $at, $f2 -/* 783C0C 802A106C 00000000 */ nop +/* 783C0C 802A106C 00000000 */ nop /* 783C10 802A1070 46020003 */ div.s $f0, $f0, $f2 /* 783C14 802A1074 4600020D */ trunc.w.s $f8, $f0 /* 783C18 802A1078 44024000 */ mfc1 $v0, $f8 -/* 783C1C 802A107C 00000000 */ nop +/* 783C1C 802A107C 00000000 */ nop /* 783C20 802A1080 AE020084 */ sw $v0, 0x84($s0) /* 783C24 802A1084 28420015 */ slti $v0, $v0, 0x15 /* 783C28 802A1088 14400002 */ bnez $v0, .L802A1094 @@ -42,7 +42,7 @@ glabel func_802A1000_783BA0 .L802A1094: /* 783C34 802A1094 82220083 */ lb $v0, 0x83($s1) /* 783C38 802A1098 10400007 */ beqz $v0, .L802A10B8 -/* 783C3C 802A109C 00000000 */ nop +/* 783C3C 802A109C 00000000 */ nop /* 783C40 802A10A0 8E020084 */ lw $v0, 0x84($s0) /* 783C44 802A10A4 28420006 */ slti $v0, $v0, 6 /* 783C48 802A10A8 10400008 */ beqz $v0, .L802A10CC diff --git a/asm/nonmatchings/code_785B20/func_802A1000_785B20.s b/asm/nonmatchings/code_785B20/func_802A1000_785B20.s index 7ef6987aab..54666cae67 100644 --- a/asm/nonmatchings/code_785B20/func_802A1000_785B20.s +++ b/asm/nonmatchings/code_785B20/func_802A1000_785B20.s @@ -24,16 +24,16 @@ glabel func_802A1000_785B20 /* 785B6C 802A104C E7A00014 */ swc1 $f0, 0x14($sp) /* 785B70 802A1050 3C014170 */ lui $at, 0x4170 /* 785B74 802A1054 44811000 */ mtc1 $at, $f2 -/* 785B78 802A1058 00000000 */ nop +/* 785B78 802A1058 00000000 */ nop /* 785B7C 802A105C 46020002 */ mul.s $f0, $f0, $f2 -/* 785B80 802A1060 00000000 */ nop +/* 785B80 802A1060 00000000 */ nop /* 785B84 802A1064 3C0142C8 */ lui $at, 0x42c8 /* 785B88 802A1068 44811000 */ mtc1 $at, $f2 -/* 785B8C 802A106C 00000000 */ nop +/* 785B8C 802A106C 00000000 */ nop /* 785B90 802A1070 46020003 */ div.s $f0, $f0, $f2 /* 785B94 802A1074 4600020D */ trunc.w.s $f8, $f0 /* 785B98 802A1078 44024000 */ mfc1 $v0, $f8 -/* 785B9C 802A107C 00000000 */ nop +/* 785B9C 802A107C 00000000 */ nop /* 785BA0 802A1080 AE020084 */ sw $v0, 0x84($s0) /* 785BA4 802A1084 28420015 */ slti $v0, $v0, 0x15 /* 785BA8 802A1088 14400002 */ bnez $v0, .L802A1094 @@ -42,7 +42,7 @@ glabel func_802A1000_785B20 .L802A1094: /* 785BB4 802A1094 82220083 */ lb $v0, 0x83($s1) /* 785BB8 802A1098 10400007 */ beqz $v0, .L802A10B8 -/* 785BBC 802A109C 00000000 */ nop +/* 785BBC 802A109C 00000000 */ nop /* 785BC0 802A10A0 8E020084 */ lw $v0, 0x84($s0) /* 785BC4 802A10A4 28420006 */ slti $v0, $v0, 6 /* 785BC8 802A10A8 10400008 */ beqz $v0, .L802A10CC diff --git a/asm/nonmatchings/code_789E60/func_802A1000_789E60.s b/asm/nonmatchings/code_789E60/func_802A1000_789E60.s index ebbe22c766..b5215ed984 100644 --- a/asm/nonmatchings/code_789E60/func_802A1000_789E60.s +++ b/asm/nonmatchings/code_789E60/func_802A1000_789E60.s @@ -22,15 +22,15 @@ glabel func_802A1000_789E60 /* 789EA4 802A1044 0C0B1EAF */ jal get_variable /* 789EA8 802A1048 0040802D */ daddu $s0, $v0, $zero /* 789EAC 802A104C 44921000 */ mtc1 $s2, $f2 -/* 789EB0 802A1050 00000000 */ nop +/* 789EB0 802A1050 00000000 */ nop /* 789EB4 802A1054 468010A0 */ cvt.s.w $f2, $f2 /* 789EB8 802A1058 44051000 */ mfc1 $a1, $f2 /* 789EBC 802A105C 44901000 */ mtc1 $s0, $f2 -/* 789EC0 802A1060 00000000 */ nop +/* 789EC0 802A1060 00000000 */ nop /* 789EC4 802A1064 468010A0 */ cvt.s.w $f2, $f2 /* 789EC8 802A1068 44061000 */ mfc1 $a2, $f2 /* 789ECC 802A106C 44821000 */ mtc1 $v0, $f2 -/* 789ED0 802A1070 00000000 */ nop +/* 789ED0 802A1070 00000000 */ nop /* 789ED4 802A1074 468010A0 */ cvt.s.w $f2, $f2 /* 789ED8 802A1078 3C014220 */ lui $at, 0x4220 /* 789EDC 802A107C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_789E60/func_802A10AC_789F0C.s b/asm/nonmatchings/code_789E60/func_802A10AC_789F0C.s index dc0430f1ae..4d952c1357 100644 --- a/asm/nonmatchings/code_789E60/func_802A10AC_789F0C.s +++ b/asm/nonmatchings/code_789E60/func_802A10AC_789F0C.s @@ -23,15 +23,15 @@ glabel func_802A10AC_789F0C /* 789F54 802A10F4 0040802D */ daddu $s0, $v0, $zero /* 789F58 802A10F8 24040005 */ addiu $a0, $zero, 5 /* 789F5C 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 789F60 802A1100 00000000 */ nop +/* 789F60 802A1100 00000000 */ nop /* 789F64 802A1104 468010A0 */ cvt.s.w $f2, $f2 /* 789F68 802A1108 44051000 */ mfc1 $a1, $f2 /* 789F6C 802A110C 44901000 */ mtc1 $s0, $f2 -/* 789F70 802A1110 00000000 */ nop +/* 789F70 802A1110 00000000 */ nop /* 789F74 802A1114 468010A0 */ cvt.s.w $f2, $f2 /* 789F78 802A1118 44061000 */ mfc1 $a2, $f2 /* 789F7C 802A111C 44821000 */ mtc1 $v0, $f2 -/* 789F80 802A1120 00000000 */ nop +/* 789F80 802A1120 00000000 */ nop /* 789F84 802A1124 468010A0 */ cvt.s.w $f2, $f2 /* 789F88 802A1128 3C014248 */ lui $at, 0x4248 /* 789F8C 802A112C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_789E60/func_802A116C_789FCC.s b/asm/nonmatchings/code_789E60/func_802A116C_789FCC.s index 2c66e3e0f0..434c11a7ca 100644 --- a/asm/nonmatchings/code_789E60/func_802A116C_789FCC.s +++ b/asm/nonmatchings/code_789E60/func_802A116C_789FCC.s @@ -22,15 +22,15 @@ glabel func_802A116C_789FCC /* 78A010 802A11B0 0C0B1EAF */ jal get_variable /* 78A014 802A11B4 0040802D */ daddu $s0, $v0, $zero /* 78A018 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 78A01C 802A11BC 00000000 */ nop +/* 78A01C 802A11BC 00000000 */ nop /* 78A020 802A11C0 468010A0 */ cvt.s.w $f2, $f2 /* 78A024 802A11C4 44051000 */ mfc1 $a1, $f2 /* 78A028 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 78A02C 802A11CC 00000000 */ nop +/* 78A02C 802A11CC 00000000 */ nop /* 78A030 802A11D0 468010A0 */ cvt.s.w $f2, $f2 /* 78A034 802A11D4 44061000 */ mfc1 $a2, $f2 /* 78A038 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 78A03C 802A11DC 00000000 */ nop +/* 78A03C 802A11DC 00000000 */ nop /* 78A040 802A11E0 468010A0 */ cvt.s.w $f2, $f2 /* 78A044 802A11E4 3C0141F0 */ lui $at, 0x41f0 /* 78A048 802A11E8 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_789E60/func_802A1218_78A078.s b/asm/nonmatchings/code_789E60/func_802A1218_78A078.s index 7fbf4e133b..4e7814cc54 100644 --- a/asm/nonmatchings/code_789E60/func_802A1218_78A078.s +++ b/asm/nonmatchings/code_789E60/func_802A1218_78A078.s @@ -23,15 +23,15 @@ glabel func_802A1218_78A078 /* 78A0C0 802A1260 0040802D */ daddu $s0, $v0, $zero /* 78A0C4 802A1264 24040004 */ addiu $a0, $zero, 4 /* 78A0C8 802A1268 44922000 */ mtc1 $s2, $f4 -/* 78A0CC 802A126C 00000000 */ nop +/* 78A0CC 802A126C 00000000 */ nop /* 78A0D0 802A1270 46802120 */ cvt.s.w $f4, $f4 /* 78A0D4 802A1274 44052000 */ mfc1 $a1, $f4 /* 78A0D8 802A1278 44902000 */ mtc1 $s0, $f4 -/* 78A0DC 802A127C 00000000 */ nop +/* 78A0DC 802A127C 00000000 */ nop /* 78A0E0 802A1280 46802120 */ cvt.s.w $f4, $f4 /* 78A0E4 802A1284 44062000 */ mfc1 $a2, $f4 /* 78A0E8 802A1288 44822000 */ mtc1 $v0, $f4 -/* 78A0EC 802A128C 00000000 */ nop +/* 78A0EC 802A128C 00000000 */ nop /* 78A0F0 802A1290 46802120 */ cvt.s.w $f4, $f4 /* 78A0F4 802A1294 3C0141A0 */ lui $at, 0x41a0 /* 78A0F8 802A1298 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_78E7D0/func_802A1000_78E7D0.s b/asm/nonmatchings/code_78E7D0/func_802A1000_78E7D0.s index 0f49c11eef..6595f9cbef 100644 --- a/asm/nonmatchings/code_78E7D0/func_802A1000_78E7D0.s +++ b/asm/nonmatchings/code_78E7D0/func_802A1000_78E7D0.s @@ -22,15 +22,15 @@ glabel func_802A1000_78E7D0 /* 78E814 802A1044 0C0B1EAF */ jal get_variable /* 78E818 802A1048 0040802D */ daddu $s0, $v0, $zero /* 78E81C 802A104C 44921000 */ mtc1 $s2, $f2 -/* 78E820 802A1050 00000000 */ nop +/* 78E820 802A1050 00000000 */ nop /* 78E824 802A1054 468010A0 */ cvt.s.w $f2, $f2 /* 78E828 802A1058 44051000 */ mfc1 $a1, $f2 /* 78E82C 802A105C 44901000 */ mtc1 $s0, $f2 -/* 78E830 802A1060 00000000 */ nop +/* 78E830 802A1060 00000000 */ nop /* 78E834 802A1064 468010A0 */ cvt.s.w $f2, $f2 /* 78E838 802A1068 44061000 */ mfc1 $a2, $f2 /* 78E83C 802A106C 44821000 */ mtc1 $v0, $f2 -/* 78E840 802A1070 00000000 */ nop +/* 78E840 802A1070 00000000 */ nop /* 78E844 802A1074 468010A0 */ cvt.s.w $f2, $f2 /* 78E848 802A1078 3C014220 */ lui $at, 0x4220 /* 78E84C 802A107C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_78E7D0/func_802A10AC_78E87C.s b/asm/nonmatchings/code_78E7D0/func_802A10AC_78E87C.s index dcc6492e5a..8f7b64f7c1 100644 --- a/asm/nonmatchings/code_78E7D0/func_802A10AC_78E87C.s +++ b/asm/nonmatchings/code_78E7D0/func_802A10AC_78E87C.s @@ -23,15 +23,15 @@ glabel func_802A10AC_78E87C /* 78E8C4 802A10F4 0040802D */ daddu $s0, $v0, $zero /* 78E8C8 802A10F8 24040005 */ addiu $a0, $zero, 5 /* 78E8CC 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 78E8D0 802A1100 00000000 */ nop +/* 78E8D0 802A1100 00000000 */ nop /* 78E8D4 802A1104 468010A0 */ cvt.s.w $f2, $f2 /* 78E8D8 802A1108 44051000 */ mfc1 $a1, $f2 /* 78E8DC 802A110C 44901000 */ mtc1 $s0, $f2 -/* 78E8E0 802A1110 00000000 */ nop +/* 78E8E0 802A1110 00000000 */ nop /* 78E8E4 802A1114 468010A0 */ cvt.s.w $f2, $f2 /* 78E8E8 802A1118 44061000 */ mfc1 $a2, $f2 /* 78E8EC 802A111C 44821000 */ mtc1 $v0, $f2 -/* 78E8F0 802A1120 00000000 */ nop +/* 78E8F0 802A1120 00000000 */ nop /* 78E8F4 802A1124 468010A0 */ cvt.s.w $f2, $f2 /* 78E8F8 802A1128 3C014248 */ lui $at, 0x4248 /* 78E8FC 802A112C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_78E7D0/func_802A116C_78E93C.s b/asm/nonmatchings/code_78E7D0/func_802A116C_78E93C.s index 8710ecef36..9ab088fa7d 100644 --- a/asm/nonmatchings/code_78E7D0/func_802A116C_78E93C.s +++ b/asm/nonmatchings/code_78E7D0/func_802A116C_78E93C.s @@ -22,15 +22,15 @@ glabel func_802A116C_78E93C /* 78E980 802A11B0 0C0B1EAF */ jal get_variable /* 78E984 802A11B4 0040802D */ daddu $s0, $v0, $zero /* 78E988 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 78E98C 802A11BC 00000000 */ nop +/* 78E98C 802A11BC 00000000 */ nop /* 78E990 802A11C0 468010A0 */ cvt.s.w $f2, $f2 /* 78E994 802A11C4 44051000 */ mfc1 $a1, $f2 /* 78E998 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 78E99C 802A11CC 00000000 */ nop +/* 78E99C 802A11CC 00000000 */ nop /* 78E9A0 802A11D0 468010A0 */ cvt.s.w $f2, $f2 /* 78E9A4 802A11D4 44061000 */ mfc1 $a2, $f2 /* 78E9A8 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 78E9AC 802A11DC 00000000 */ nop +/* 78E9AC 802A11DC 00000000 */ nop /* 78E9B0 802A11E0 468010A0 */ cvt.s.w $f2, $f2 /* 78E9B4 802A11E4 3C0141F0 */ lui $at, 0x41f0 /* 78E9B8 802A11E8 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_78E7D0/func_802A1218_78E9E8.s b/asm/nonmatchings/code_78E7D0/func_802A1218_78E9E8.s index c70a0ad077..0185b61401 100644 --- a/asm/nonmatchings/code_78E7D0/func_802A1218_78E9E8.s +++ b/asm/nonmatchings/code_78E7D0/func_802A1218_78E9E8.s @@ -23,15 +23,15 @@ glabel func_802A1218_78E9E8 /* 78EA30 802A1260 0040802D */ daddu $s0, $v0, $zero /* 78EA34 802A1264 24040004 */ addiu $a0, $zero, 4 /* 78EA38 802A1268 44922000 */ mtc1 $s2, $f4 -/* 78EA3C 802A126C 00000000 */ nop +/* 78EA3C 802A126C 00000000 */ nop /* 78EA40 802A1270 46802120 */ cvt.s.w $f4, $f4 /* 78EA44 802A1274 44052000 */ mfc1 $a1, $f4 /* 78EA48 802A1278 44902000 */ mtc1 $s0, $f4 -/* 78EA4C 802A127C 00000000 */ nop +/* 78EA4C 802A127C 00000000 */ nop /* 78EA50 802A1280 46802120 */ cvt.s.w $f4, $f4 /* 78EA54 802A1284 44062000 */ mfc1 $a2, $f4 /* 78EA58 802A1288 44822000 */ mtc1 $v0, $f4 -/* 78EA5C 802A128C 00000000 */ nop +/* 78EA5C 802A128C 00000000 */ nop /* 78EA60 802A1290 46802120 */ cvt.s.w $f4, $f4 /* 78EA64 802A1294 3C0141A0 */ lui $at, 0x41a0 /* 78EA68 802A1298 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_78E7D0/func_802A1518_78ECE8.s b/asm/nonmatchings/code_78E7D0/func_802A1518_78ECE8.s index 7d4e3a3b9f..4a666e0d93 100644 --- a/asm/nonmatchings/code_78E7D0/func_802A1518_78ECE8.s +++ b/asm/nonmatchings/code_78E7D0/func_802A1518_78ECE8.s @@ -25,7 +25,7 @@ glabel func_802A1518_78ECE8 /* 78ED38 802A1568 00521021 */ addu $v0, $v0, $s2 /* 78ED3C 802A156C 02221021 */ addu $v0, $s1, $v0 /* 78ED40 802A1570 4482A000 */ mtc1 $v0, $f20 -/* 78ED44 802A1574 00000000 */ nop +/* 78ED44 802A1574 00000000 */ nop /* 78ED48 802A1578 4680A520 */ cvt.s.w $f20, $f20 /* 78ED4C 802A157C 0C00A67F */ jal rand_int /* 78ED50 802A1580 2404000A */ addiu $a0, $zero, 0xa @@ -37,27 +37,27 @@ glabel func_802A1518_78ECE8 /* 78ED64 802A1594 244200C8 */ addiu $v0, $v0, 0xc8 /* 78ED68 802A1598 02221021 */ addu $v0, $s1, $v0 /* 78ED6C 802A159C 4482A000 */ mtc1 $v0, $f20 -/* 78ED70 802A15A0 00000000 */ nop +/* 78ED70 802A15A0 00000000 */ nop /* 78ED74 802A15A4 4680A520 */ cvt.s.w $f20, $f20 /* 78ED78 802A15A8 0C00A67F */ jal rand_int /* 78ED7C 802A15AC 2404000A */ addiu $a0, $zero, 0xa /* 78ED80 802A15B0 24040003 */ addiu $a0, $zero, 3 .L802A15B4: /* 78ED84 802A15B4 44911000 */ mtc1 $s1, $f2 -/* 78ED88 802A15B8 00000000 */ nop +/* 78ED88 802A15B8 00000000 */ nop /* 78ED8C 802A15BC 468010A0 */ cvt.s.w $f2, $f2 /* 78ED90 802A15C0 44900000 */ mtc1 $s0, $f0 -/* 78ED94 802A15C4 00000000 */ nop +/* 78ED94 802A15C4 00000000 */ nop /* 78ED98 802A15C8 46800020 */ cvt.s.w $f0, $f0 /* 78ED9C 802A15CC 44051000 */ mfc1 $a1, $f2 /* 78EDA0 802A15D0 44921000 */ mtc1 $s2, $f2 -/* 78EDA4 802A15D4 00000000 */ nop +/* 78EDA4 802A15D4 00000000 */ nop /* 78EDA8 802A15D8 468010A0 */ cvt.s.w $f2, $f2 /* 78EDAC 802A15DC 24420007 */ addiu $v0, $v0, 7 /* 78EDB0 802A15E0 44070000 */ mfc1 $a3, $f0 /* 78EDB4 802A15E4 44061000 */ mfc1 $a2, $f2 /* 78EDB8 802A15E8 44820000 */ mtc1 $v0, $f0 -/* 78EDBC 802A15EC 00000000 */ nop +/* 78EDBC 802A15EC 00000000 */ nop /* 78EDC0 802A15F0 46800020 */ cvt.s.w $f0, $f0 /* 78EDC4 802A15F4 E7B40010 */ swc1 $f20, 0x10($sp) /* 78EDC8 802A15F8 AFA00014 */ sw $zero, 0x14($sp) diff --git a/asm/nonmatchings/code_78E7D0/func_802A1628_78EDF8.s b/asm/nonmatchings/code_78E7D0/func_802A1628_78EDF8.s index 35c453f88d..c37799f6c4 100644 --- a/asm/nonmatchings/code_78E7D0/func_802A1628_78EDF8.s +++ b/asm/nonmatchings/code_78E7D0/func_802A1628_78EDF8.s @@ -23,15 +23,15 @@ glabel func_802A1628_78EDF8 /* 78EE40 802A1670 0040802D */ daddu $s0, $v0, $zero /* 78EE44 802A1674 24040002 */ addiu $a0, $zero, 2 /* 78EE48 802A1678 44921000 */ mtc1 $s2, $f2 -/* 78EE4C 802A167C 00000000 */ nop +/* 78EE4C 802A167C 00000000 */ nop /* 78EE50 802A1680 468010A0 */ cvt.s.w $f2, $f2 /* 78EE54 802A1684 44051000 */ mfc1 $a1, $f2 /* 78EE58 802A1688 44901000 */ mtc1 $s0, $f2 -/* 78EE5C 802A168C 00000000 */ nop +/* 78EE5C 802A168C 00000000 */ nop /* 78EE60 802A1690 468010A0 */ cvt.s.w $f2, $f2 /* 78EE64 802A1694 44061000 */ mfc1 $a2, $f2 /* 78EE68 802A1698 44821000 */ mtc1 $v0, $f2 -/* 78EE6C 802A169C 00000000 */ nop +/* 78EE6C 802A169C 00000000 */ nop /* 78EE70 802A16A0 468010A0 */ cvt.s.w $f2, $f2 /* 78EE74 802A16A4 3C01BF80 */ lui $at, 0xbf80 /* 78EE78 802A16A8 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_791D90/func_802A1000_791D90.s b/asm/nonmatchings/code_791D90/func_802A1000_791D90.s index 1e6f861ed1..b8f0b1b092 100644 --- a/asm/nonmatchings/code_791D90/func_802A1000_791D90.s +++ b/asm/nonmatchings/code_791D90/func_802A1000_791D90.s @@ -22,15 +22,15 @@ glabel func_802A1000_791D90 /* 791DD4 802A1044 0C0B1EAF */ jal get_variable /* 791DD8 802A1048 0040802D */ daddu $s0, $v0, $zero /* 791DDC 802A104C 44921000 */ mtc1 $s2, $f2 -/* 791DE0 802A1050 00000000 */ nop +/* 791DE0 802A1050 00000000 */ nop /* 791DE4 802A1054 468010A0 */ cvt.s.w $f2, $f2 /* 791DE8 802A1058 44051000 */ mfc1 $a1, $f2 /* 791DEC 802A105C 44901000 */ mtc1 $s0, $f2 -/* 791DF0 802A1060 00000000 */ nop +/* 791DF0 802A1060 00000000 */ nop /* 791DF4 802A1064 468010A0 */ cvt.s.w $f2, $f2 /* 791DF8 802A1068 44061000 */ mfc1 $a2, $f2 /* 791DFC 802A106C 44821000 */ mtc1 $v0, $f2 -/* 791E00 802A1070 00000000 */ nop +/* 791E00 802A1070 00000000 */ nop /* 791E04 802A1074 468010A0 */ cvt.s.w $f2, $f2 /* 791E08 802A1078 3C014220 */ lui $at, 0x4220 /* 791E0C 802A107C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_791D90/func_802A10AC_791E3C.s b/asm/nonmatchings/code_791D90/func_802A10AC_791E3C.s index 1894002427..a369397ea1 100644 --- a/asm/nonmatchings/code_791D90/func_802A10AC_791E3C.s +++ b/asm/nonmatchings/code_791D90/func_802A10AC_791E3C.s @@ -23,15 +23,15 @@ glabel func_802A10AC_791E3C /* 791E84 802A10F4 0040802D */ daddu $s0, $v0, $zero /* 791E88 802A10F8 24040005 */ addiu $a0, $zero, 5 /* 791E8C 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 791E90 802A1100 00000000 */ nop +/* 791E90 802A1100 00000000 */ nop /* 791E94 802A1104 468010A0 */ cvt.s.w $f2, $f2 /* 791E98 802A1108 44051000 */ mfc1 $a1, $f2 /* 791E9C 802A110C 44901000 */ mtc1 $s0, $f2 -/* 791EA0 802A1110 00000000 */ nop +/* 791EA0 802A1110 00000000 */ nop /* 791EA4 802A1114 468010A0 */ cvt.s.w $f2, $f2 /* 791EA8 802A1118 44061000 */ mfc1 $a2, $f2 /* 791EAC 802A111C 44821000 */ mtc1 $v0, $f2 -/* 791EB0 802A1120 00000000 */ nop +/* 791EB0 802A1120 00000000 */ nop /* 791EB4 802A1124 468010A0 */ cvt.s.w $f2, $f2 /* 791EB8 802A1128 3C014248 */ lui $at, 0x4248 /* 791EBC 802A112C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_791D90/func_802A116C_791EFC.s b/asm/nonmatchings/code_791D90/func_802A116C_791EFC.s index 91542d5d48..078584a464 100644 --- a/asm/nonmatchings/code_791D90/func_802A116C_791EFC.s +++ b/asm/nonmatchings/code_791D90/func_802A116C_791EFC.s @@ -22,15 +22,15 @@ glabel func_802A116C_791EFC /* 791F40 802A11B0 0C0B1EAF */ jal get_variable /* 791F44 802A11B4 0040802D */ daddu $s0, $v0, $zero /* 791F48 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 791F4C 802A11BC 00000000 */ nop +/* 791F4C 802A11BC 00000000 */ nop /* 791F50 802A11C0 468010A0 */ cvt.s.w $f2, $f2 /* 791F54 802A11C4 44051000 */ mfc1 $a1, $f2 /* 791F58 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 791F5C 802A11CC 00000000 */ nop +/* 791F5C 802A11CC 00000000 */ nop /* 791F60 802A11D0 468010A0 */ cvt.s.w $f2, $f2 /* 791F64 802A11D4 44061000 */ mfc1 $a2, $f2 /* 791F68 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 791F6C 802A11DC 00000000 */ nop +/* 791F6C 802A11DC 00000000 */ nop /* 791F70 802A11E0 468010A0 */ cvt.s.w $f2, $f2 /* 791F74 802A11E4 3C0141F0 */ lui $at, 0x41f0 /* 791F78 802A11E8 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_791D90/func_802A1218_791FA8.s b/asm/nonmatchings/code_791D90/func_802A1218_791FA8.s index 998d386aa6..a2e240b711 100644 --- a/asm/nonmatchings/code_791D90/func_802A1218_791FA8.s +++ b/asm/nonmatchings/code_791D90/func_802A1218_791FA8.s @@ -23,15 +23,15 @@ glabel func_802A1218_791FA8 /* 791FF0 802A1260 0040802D */ daddu $s0, $v0, $zero /* 791FF4 802A1264 24040004 */ addiu $a0, $zero, 4 /* 791FF8 802A1268 44922000 */ mtc1 $s2, $f4 -/* 791FFC 802A126C 00000000 */ nop +/* 791FFC 802A126C 00000000 */ nop /* 792000 802A1270 46802120 */ cvt.s.w $f4, $f4 /* 792004 802A1274 44052000 */ mfc1 $a1, $f4 /* 792008 802A1278 44902000 */ mtc1 $s0, $f4 -/* 79200C 802A127C 00000000 */ nop +/* 79200C 802A127C 00000000 */ nop /* 792010 802A1280 46802120 */ cvt.s.w $f4, $f4 /* 792014 802A1284 44062000 */ mfc1 $a2, $f4 /* 792018 802A1288 44822000 */ mtc1 $v0, $f4 -/* 79201C 802A128C 00000000 */ nop +/* 79201C 802A128C 00000000 */ nop /* 792020 802A1290 46802120 */ cvt.s.w $f4, $f4 /* 792024 802A1294 3C0141A0 */ lui $at, 0x41a0 /* 792028 802A1298 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_791D90/func_802A156C_7922FC.s b/asm/nonmatchings/code_791D90/func_802A156C_7922FC.s index d0f699d8c4..66972a1d14 100644 --- a/asm/nonmatchings/code_791D90/func_802A156C_7922FC.s +++ b/asm/nonmatchings/code_791D90/func_802A156C_7922FC.s @@ -28,15 +28,15 @@ glabel func_802A156C_7922FC /* 792358 802A15C8 0C0B1EAF */ jal get_variable /* 79235C 802A15CC 0040802D */ daddu $s0, $v0, $zero /* 792360 802A15D0 44930000 */ mtc1 $s3, $f0 -/* 792364 802A15D4 00000000 */ nop +/* 792364 802A15D4 00000000 */ nop /* 792368 802A15D8 46800020 */ cvt.s.w $f0, $f0 /* 79236C 802A15DC 44050000 */ mfc1 $a1, $f0 /* 792370 802A15E0 44920000 */ mtc1 $s2, $f0 -/* 792374 802A15E4 00000000 */ nop +/* 792374 802A15E4 00000000 */ nop /* 792378 802A15E8 46800020 */ cvt.s.w $f0, $f0 /* 79237C 802A15EC 44060000 */ mfc1 $a2, $f0 /* 792380 802A15F0 44900000 */ mtc1 $s0, $f0 -/* 792384 802A15F4 00000000 */ nop +/* 792384 802A15F4 00000000 */ nop /* 792388 802A15F8 46800020 */ cvt.s.w $f0, $f0 /* 79238C 802A15FC 44070000 */ mfc1 $a3, $f0 /* 792390 802A1600 0000202D */ daddu $a0, $zero, $zero @@ -50,4 +50,4 @@ glabel func_802A156C_7922FC /* 7923B0 802A1620 24020002 */ addiu $v0, $zero, 2 /* 7923B4 802A1624 03E00008 */ jr $ra /* 7923B8 802A1628 27BD0030 */ addiu $sp, $sp, 0x30 -/* 7923BC 802A162C 00000000 */ nop +/* 7923BC 802A162C 00000000 */ nop diff --git a/asm/nonmatchings/code_793D20/func_802A1000_793D20.s b/asm/nonmatchings/code_793D20/func_802A1000_793D20.s index bd870267fc..61121132dd 100644 --- a/asm/nonmatchings/code_793D20/func_802A1000_793D20.s +++ b/asm/nonmatchings/code_793D20/func_802A1000_793D20.s @@ -22,15 +22,15 @@ glabel func_802A1000_793D20 /* 793D64 802A1044 0C0B1EAF */ jal get_variable /* 793D68 802A1048 0040802D */ daddu $s0, $v0, $zero /* 793D6C 802A104C 44921000 */ mtc1 $s2, $f2 -/* 793D70 802A1050 00000000 */ nop +/* 793D70 802A1050 00000000 */ nop /* 793D74 802A1054 468010A0 */ cvt.s.w $f2, $f2 /* 793D78 802A1058 44051000 */ mfc1 $a1, $f2 /* 793D7C 802A105C 44901000 */ mtc1 $s0, $f2 -/* 793D80 802A1060 00000000 */ nop +/* 793D80 802A1060 00000000 */ nop /* 793D84 802A1064 468010A0 */ cvt.s.w $f2, $f2 /* 793D88 802A1068 44061000 */ mfc1 $a2, $f2 /* 793D8C 802A106C 44821000 */ mtc1 $v0, $f2 -/* 793D90 802A1070 00000000 */ nop +/* 793D90 802A1070 00000000 */ nop /* 793D94 802A1074 468010A0 */ cvt.s.w $f2, $f2 /* 793D98 802A1078 3C014220 */ lui $at, 0x4220 /* 793D9C 802A107C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_793D20/func_802A10AC_793DCC.s b/asm/nonmatchings/code_793D20/func_802A10AC_793DCC.s index 1d4fbb5a16..6ed98faf1c 100644 --- a/asm/nonmatchings/code_793D20/func_802A10AC_793DCC.s +++ b/asm/nonmatchings/code_793D20/func_802A10AC_793DCC.s @@ -23,15 +23,15 @@ glabel func_802A10AC_793DCC /* 793E14 802A10F4 0040802D */ daddu $s0, $v0, $zero /* 793E18 802A10F8 24040005 */ addiu $a0, $zero, 5 /* 793E1C 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 793E20 802A1100 00000000 */ nop +/* 793E20 802A1100 00000000 */ nop /* 793E24 802A1104 468010A0 */ cvt.s.w $f2, $f2 /* 793E28 802A1108 44051000 */ mfc1 $a1, $f2 /* 793E2C 802A110C 44901000 */ mtc1 $s0, $f2 -/* 793E30 802A1110 00000000 */ nop +/* 793E30 802A1110 00000000 */ nop /* 793E34 802A1114 468010A0 */ cvt.s.w $f2, $f2 /* 793E38 802A1118 44061000 */ mfc1 $a2, $f2 /* 793E3C 802A111C 44821000 */ mtc1 $v0, $f2 -/* 793E40 802A1120 00000000 */ nop +/* 793E40 802A1120 00000000 */ nop /* 793E44 802A1124 468010A0 */ cvt.s.w $f2, $f2 /* 793E48 802A1128 3C014248 */ lui $at, 0x4248 /* 793E4C 802A112C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_793D20/func_802A116C_793E8C.s b/asm/nonmatchings/code_793D20/func_802A116C_793E8C.s index dfa4d5f0e8..14b0235976 100644 --- a/asm/nonmatchings/code_793D20/func_802A116C_793E8C.s +++ b/asm/nonmatchings/code_793D20/func_802A116C_793E8C.s @@ -22,15 +22,15 @@ glabel func_802A116C_793E8C /* 793ED0 802A11B0 0C0B1EAF */ jal get_variable /* 793ED4 802A11B4 0040802D */ daddu $s0, $v0, $zero /* 793ED8 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 793EDC 802A11BC 00000000 */ nop +/* 793EDC 802A11BC 00000000 */ nop /* 793EE0 802A11C0 468010A0 */ cvt.s.w $f2, $f2 /* 793EE4 802A11C4 44051000 */ mfc1 $a1, $f2 /* 793EE8 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 793EEC 802A11CC 00000000 */ nop +/* 793EEC 802A11CC 00000000 */ nop /* 793EF0 802A11D0 468010A0 */ cvt.s.w $f2, $f2 /* 793EF4 802A11D4 44061000 */ mfc1 $a2, $f2 /* 793EF8 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 793EFC 802A11DC 00000000 */ nop +/* 793EFC 802A11DC 00000000 */ nop /* 793F00 802A11E0 468010A0 */ cvt.s.w $f2, $f2 /* 793F04 802A11E4 3C0141F0 */ lui $at, 0x41f0 /* 793F08 802A11E8 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_793D20/func_802A1218_793F38.s b/asm/nonmatchings/code_793D20/func_802A1218_793F38.s index 88881d2793..bcbdb703d7 100644 --- a/asm/nonmatchings/code_793D20/func_802A1218_793F38.s +++ b/asm/nonmatchings/code_793D20/func_802A1218_793F38.s @@ -23,15 +23,15 @@ glabel func_802A1218_793F38 /* 793F80 802A1260 0040802D */ daddu $s0, $v0, $zero /* 793F84 802A1264 24040004 */ addiu $a0, $zero, 4 /* 793F88 802A1268 44922000 */ mtc1 $s2, $f4 -/* 793F8C 802A126C 00000000 */ nop +/* 793F8C 802A126C 00000000 */ nop /* 793F90 802A1270 46802120 */ cvt.s.w $f4, $f4 /* 793F94 802A1274 44052000 */ mfc1 $a1, $f4 /* 793F98 802A1278 44902000 */ mtc1 $s0, $f4 -/* 793F9C 802A127C 00000000 */ nop +/* 793F9C 802A127C 00000000 */ nop /* 793FA0 802A1280 46802120 */ cvt.s.w $f4, $f4 /* 793FA4 802A1284 44062000 */ mfc1 $a2, $f4 /* 793FA8 802A1288 44822000 */ mtc1 $v0, $f4 -/* 793FAC 802A128C 00000000 */ nop +/* 793FAC 802A128C 00000000 */ nop /* 793FB0 802A1290 46802120 */ cvt.s.w $f4, $f4 /* 793FB4 802A1294 3C0141A0 */ lui $at, 0x41a0 /* 793FB8 802A1298 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_793D20/func_802A14E8_794208.s b/asm/nonmatchings/code_793D20/func_802A14E8_794208.s index c1129310e3..2c849f636f 100644 --- a/asm/nonmatchings/code_793D20/func_802A14E8_794208.s +++ b/asm/nonmatchings/code_793D20/func_802A14E8_794208.s @@ -14,5 +14,5 @@ glabel func_802A14E8_794208 /* 79422C 802A150C 24020002 */ addiu $v0, $zero, 2 /* 794230 802A1510 03E00008 */ jr $ra /* 794234 802A1514 27BD0018 */ addiu $sp, $sp, 0x18 -/* 794238 802A1518 00000000 */ nop -/* 79423C 802A151C 00000000 */ nop +/* 794238 802A1518 00000000 */ nop +/* 79423C 802A151C 00000000 */ nop diff --git a/asm/nonmatchings/code_7952E0/func_802A1000_7952E0.s b/asm/nonmatchings/code_7952E0/func_802A1000_7952E0.s index c5c466ff1a..ced1df2af0 100644 --- a/asm/nonmatchings/code_7952E0/func_802A1000_7952E0.s +++ b/asm/nonmatchings/code_7952E0/func_802A1000_7952E0.s @@ -22,15 +22,15 @@ glabel func_802A1000_7952E0 /* 795324 802A1044 0C0B1EAF */ jal get_variable /* 795328 802A1048 0040802D */ daddu $s0, $v0, $zero /* 79532C 802A104C 44921000 */ mtc1 $s2, $f2 -/* 795330 802A1050 00000000 */ nop +/* 795330 802A1050 00000000 */ nop /* 795334 802A1054 468010A0 */ cvt.s.w $f2, $f2 /* 795338 802A1058 44051000 */ mfc1 $a1, $f2 /* 79533C 802A105C 44901000 */ mtc1 $s0, $f2 -/* 795340 802A1060 00000000 */ nop +/* 795340 802A1060 00000000 */ nop /* 795344 802A1064 468010A0 */ cvt.s.w $f2, $f2 /* 795348 802A1068 44061000 */ mfc1 $a2, $f2 /* 79534C 802A106C 44821000 */ mtc1 $v0, $f2 -/* 795350 802A1070 00000000 */ nop +/* 795350 802A1070 00000000 */ nop /* 795354 802A1074 468010A0 */ cvt.s.w $f2, $f2 /* 795358 802A1078 3C014220 */ lui $at, 0x4220 /* 79535C 802A107C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_7952E0/func_802A116C_79544C.s b/asm/nonmatchings/code_7952E0/func_802A116C_79544C.s index b5629e42bd..185081c341 100644 --- a/asm/nonmatchings/code_7952E0/func_802A116C_79544C.s +++ b/asm/nonmatchings/code_7952E0/func_802A116C_79544C.s @@ -22,15 +22,15 @@ glabel func_802A116C_79544C /* 795490 802A11B0 0C0B1EAF */ jal get_variable /* 795494 802A11B4 0040802D */ daddu $s0, $v0, $zero /* 795498 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 79549C 802A11BC 00000000 */ nop +/* 79549C 802A11BC 00000000 */ nop /* 7954A0 802A11C0 468010A0 */ cvt.s.w $f2, $f2 /* 7954A4 802A11C4 44051000 */ mfc1 $a1, $f2 /* 7954A8 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 7954AC 802A11CC 00000000 */ nop +/* 7954AC 802A11CC 00000000 */ nop /* 7954B0 802A11D0 468010A0 */ cvt.s.w $f2, $f2 /* 7954B4 802A11D4 44061000 */ mfc1 $a2, $f2 /* 7954B8 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 7954BC 802A11DC 00000000 */ nop +/* 7954BC 802A11DC 00000000 */ nop /* 7954C0 802A11E0 468010A0 */ cvt.s.w $f2, $f2 /* 7954C4 802A11E4 3C0141F0 */ lui $at, 0x41f0 /* 7954C8 802A11E8 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_796FC0/func_802A1518_7974D8.s b/asm/nonmatchings/code_796FC0/func_802A1518_7974D8.s index e20f4bfad8..b2fdba3dc2 100644 --- a/asm/nonmatchings/code_796FC0/func_802A1518_7974D8.s +++ b/asm/nonmatchings/code_796FC0/func_802A1518_7974D8.s @@ -252,11 +252,12 @@ glabel func_802A1518_7974D8 .L802A1894: /* 797854 802A1894 104002E1 */ beqz $v0, .L802A241C /* 797858 802A1898 00031080 */ sll $v0, $v1, 2 -/* 79785C 802A189C 3C01802A */ lui $at, %hi(D_802A3790) +/* 79785C 802A189C 3C01802A */ lui $at, %hi(jtbl_802A3790_799750) /* 797860 802A18A0 00220821 */ addu $at, $at, $v0 -/* 797864 802A18A4 8C223790 */ lw $v0, %lo(D_802A3790)($at) +/* 797864 802A18A4 8C223790 */ lw $v0, %lo(jtbl_802A3790_799750)($at) /* 797868 802A18A8 00400008 */ jr $v0 /* 79786C 802A18AC 00000000 */ nop +glabel L802A18B0_797870 /* 797870 802A18B0 C6B40144 */ lwc1 $f20, 0x144($s5) /* 797874 802A18B4 C6BE014C */ lwc1 $f30, 0x14c($s5) /* 797878 802A18B8 92A20191 */ lbu $v0, 0x191($s5) @@ -346,6 +347,7 @@ glabel func_802A1518_7974D8 /* 7979B4 802A19F4 24020001 */ addiu $v0, $zero, 1 /* 7979B8 802A19F8 080A8907 */ j .L802A241C /* 7979BC 802A19FC AFC20070 */ sw $v0, 0x70($fp) +glabel L802A1A00_7979C0 /* 7979C0 802A1A00 C6200010 */ lwc1 $f0, 0x10($s1) /* 7979C4 802A1A04 C6240004 */ lwc1 $f4, 4($s1) /* 7979C8 802A1A08 46040001 */ sub.s $f0, $f0, $f4 @@ -380,6 +382,7 @@ glabel func_802A1518_7974D8 /* 797A3C 802A1A7C 24020002 */ addiu $v0, $zero, 2 /* 797A40 802A1A80 080A8907 */ j .L802A241C /* 797A44 802A1A84 AFC20070 */ sw $v0, 0x70($fp) +glabel L802A1A88_797A48 /* 797A48 802A1A88 8FC20074 */ lw $v0, 0x74($fp) /* 797A4C 802A1A8C 1440016F */ bnez $v0, .L802A204C /* 797A50 802A1A90 2442FFFF */ addiu $v0, $v0, -1 @@ -392,6 +395,7 @@ glabel func_802A1518_7974D8 /* 797A6C 802A1AAC 24020003 */ addiu $v0, $zero, 3 /* 797A70 802A1AB0 080A8907 */ j .L802A241C /* 797A74 802A1AB4 AFC20070 */ sw $v0, 0x70($fp) +glabel L802A1AB8_797A78 /* 797A78 802A1AB8 C624004C */ lwc1 $f4, 0x4c($s1) /* 797A7C 802A1ABC 3C0141C0 */ lui $at, 0x41c0 /* 797A80 802A1AC0 44810000 */ mtc1 $at, $f0 @@ -433,6 +437,7 @@ glabel func_802A1518_7974D8 /* 797B08 802A1B48 24020004 */ addiu $v0, $zero, 4 /* 797B0C 802A1B4C 080A8907 */ j .L802A241C /* 797B10 802A1B50 AFC20070 */ sw $v0, 0x70($fp) +glabel L802A1B54_797B14 /* 797B14 802A1B54 C624004C */ lwc1 $f4, 0x4c($s1) /* 797B18 802A1B58 3C014240 */ lui $at, 0x4240 /* 797B1C 802A1B5C 44811000 */ mtc1 $at, $f2 @@ -627,6 +632,7 @@ glabel func_802A1518_7974D8 /* 797DE8 802A1E28 24020005 */ addiu $v0, $zero, 5 /* 797DEC 802A1E2C 080A8907 */ j .L802A241C /* 797DF0 802A1E30 AFC20070 */ sw $v0, 0x70($fp) +glabel L802A1E34_797DF4 /* 797DF4 802A1E34 8FC20074 */ lw $v0, 0x74($fp) /* 797DF8 802A1E38 14400084 */ bnez $v0, .L802A204C /* 797DFC 802A1E3C 2442FFFF */ addiu $v0, $v0, -1 @@ -682,6 +688,7 @@ glabel func_802A1518_7974D8 /* 797EC0 802A1F00 24020006 */ addiu $v0, $zero, 6 /* 797EC4 802A1F04 080A8907 */ j .L802A241C /* 797EC8 802A1F08 AFC20070 */ sw $v0, 0x70($fp) +glabel L802A1F0C_797ECC /* 797ECC 802A1F0C 96220064 */ lhu $v0, 0x64($s1) /* 797ED0 802A1F10 2442001E */ addiu $v0, $v0, 0x1e /* 797ED4 802A1F14 A6220064 */ sh $v0, 0x64($s1) @@ -732,6 +739,7 @@ glabel func_802A1518_7974D8 /* 797F7C 802A1FBC 24020007 */ addiu $v0, $zero, 7 /* 797F80 802A1FC0 080A8907 */ j .L802A241C /* 797F84 802A1FC4 AFC20070 */ sw $v0, 0x70($fp) +glabel L802A1FC8_797F88 /* 797F88 802A1FC8 8FC20074 */ lw $v0, 0x74($fp) /* 797F8C 802A1FCC 1440001F */ bnez $v0, .L802A204C /* 797F90 802A1FD0 2442FFFF */ addiu $v0, $v0, -1 @@ -740,6 +748,7 @@ glabel func_802A1518_7974D8 /* 797F9C 802A1FDC 24020008 */ addiu $v0, $zero, 8 /* 797FA0 802A1FE0 080A8907 */ j .L802A241C /* 797FA4 802A1FE4 AFC20070 */ sw $v0, 0x70($fp) +glabel L802A1FE8_797FA8 /* 797FA8 802A1FE8 96220064 */ lhu $v0, 0x64($s1) /* 797FAC 802A1FEC 2442FFE2 */ addiu $v0, $v0, -0x1e /* 797FB0 802A1FF0 A6220064 */ sh $v0, 0x64($s1) @@ -763,6 +772,7 @@ glabel func_802A1518_7974D8 /* 797FF4 802A2034 24020009 */ addiu $v0, $zero, 9 /* 797FF8 802A2038 080A8907 */ j .L802A241C /* 797FFC 802A203C AFC20070 */ sw $v0, 0x70($fp) +glabel L802A2040_798000 /* 798000 802A2040 8FC20074 */ lw $v0, 0x74($fp) /* 798004 802A2044 10400003 */ beqz $v0, .L802A2054 /* 798008 802A2048 2442FFFF */ addiu $v0, $v0, -1 @@ -781,6 +791,7 @@ glabel func_802A1518_7974D8 /* 798034 802A2074 2402000A */ addiu $v0, $zero, 0xa /* 798038 802A2078 080A8907 */ j .L802A241C /* 79803C 802A207C AFC20070 */ sw $v0, 0x70($fp) +glabel L802A2080_798040 /* 798040 802A2080 8FC20074 */ lw $v0, 0x74($fp) /* 798044 802A2084 10400010 */ beqz $v0, .L802A20C8 /* 798048 802A2088 2442FFFF */ addiu $v0, $v0, -1 @@ -860,6 +871,7 @@ glabel func_802A1518_7974D8 /* 798150 802A2190 2484001C */ addiu $a0, $a0, 0x1c /* 798154 802A2194 080A88FB */ j .L802A23EC /* 798158 802A2198 00000000 */ nop +glabel L802A219C_79815C /* 79815C 802A219C 3C02802A */ lui $v0, %hi(D_802A37F0) /* 798160 802A21A0 8C4237F0 */ lw $v0, %lo(D_802A37F0)($v0) /* 798164 802A21A4 2404000F */ addiu $a0, $zero, 0xf @@ -885,6 +897,7 @@ glabel func_802A1518_7974D8 /* 7981AC 802A21EC 24020015 */ addiu $v0, $zero, 0x15 /* 7981B0 802A21F0 080A8907 */ j .L802A241C /* 7981B4 802A21F4 AFC20070 */ sw $v0, 0x70($fp) +glabel L802A21F8_7981B8 /* 7981B8 802A21F8 0000B82D */ daddu $s7, $zero, $zero /* 7981BC 802A21FC 02E0902D */ daddu $s2, $s7, $zero /* 7981C0 802A2200 3C13802A */ lui $s3, %hi(D_802A3818) @@ -1032,6 +1045,7 @@ glabel func_802A1518_7974D8 /* 7983D4 802A2414 080A8908 */ j .L802A2420 /* 7983D8 802A2418 AC640000 */ sw $a0, ($v1) .L802A241C: +glabel L802A241C_7983DC /* 7983DC 802A241C 0000102D */ daddu $v0, $zero, $zero .L802A2420: /* 7983E0 802A2420 8FBF0064 */ lw $ra, 0x64($sp) diff --git a/asm/nonmatchings/code_7997B0/func_802A1000_7997B0.s b/asm/nonmatchings/code_7997B0/func_802A1000_7997B0.s index 811d37f206..6c2d867d4f 100644 --- a/asm/nonmatchings/code_7997B0/func_802A1000_7997B0.s +++ b/asm/nonmatchings/code_7997B0/func_802A1000_7997B0.s @@ -22,15 +22,15 @@ glabel func_802A1000_7997B0 /* 7997F4 802A1044 0C0B1EAF */ jal get_variable /* 7997F8 802A1048 0040802D */ daddu $s0, $v0, $zero /* 7997FC 802A104C 44921000 */ mtc1 $s2, $f2 -/* 799800 802A1050 00000000 */ nop +/* 799800 802A1050 00000000 */ nop /* 799804 802A1054 468010A0 */ cvt.s.w $f2, $f2 /* 799808 802A1058 44051000 */ mfc1 $a1, $f2 /* 79980C 802A105C 44901000 */ mtc1 $s0, $f2 -/* 799810 802A1060 00000000 */ nop +/* 799810 802A1060 00000000 */ nop /* 799814 802A1064 468010A0 */ cvt.s.w $f2, $f2 /* 799818 802A1068 44061000 */ mfc1 $a2, $f2 /* 79981C 802A106C 44821000 */ mtc1 $v0, $f2 -/* 799820 802A1070 00000000 */ nop +/* 799820 802A1070 00000000 */ nop /* 799824 802A1074 468010A0 */ cvt.s.w $f2, $f2 /* 799828 802A1078 3C014220 */ lui $at, 0x4220 /* 79982C 802A107C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_7997B0/func_802A10AC_79985C.s b/asm/nonmatchings/code_7997B0/func_802A10AC_79985C.s index 730a894ea8..30a8dd2802 100644 --- a/asm/nonmatchings/code_7997B0/func_802A10AC_79985C.s +++ b/asm/nonmatchings/code_7997B0/func_802A10AC_79985C.s @@ -23,15 +23,15 @@ glabel func_802A10AC_79985C /* 7998A4 802A10F4 0040802D */ daddu $s0, $v0, $zero /* 7998A8 802A10F8 24040005 */ addiu $a0, $zero, 5 /* 7998AC 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 7998B0 802A1100 00000000 */ nop +/* 7998B0 802A1100 00000000 */ nop /* 7998B4 802A1104 468010A0 */ cvt.s.w $f2, $f2 /* 7998B8 802A1108 44051000 */ mfc1 $a1, $f2 /* 7998BC 802A110C 44901000 */ mtc1 $s0, $f2 -/* 7998C0 802A1110 00000000 */ nop +/* 7998C0 802A1110 00000000 */ nop /* 7998C4 802A1114 468010A0 */ cvt.s.w $f2, $f2 /* 7998C8 802A1118 44061000 */ mfc1 $a2, $f2 /* 7998CC 802A111C 44821000 */ mtc1 $v0, $f2 -/* 7998D0 802A1120 00000000 */ nop +/* 7998D0 802A1120 00000000 */ nop /* 7998D4 802A1124 468010A0 */ cvt.s.w $f2, $f2 /* 7998D8 802A1128 3C014248 */ lui $at, 0x4248 /* 7998DC 802A112C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_7997B0/func_802A116C_79991C.s b/asm/nonmatchings/code_7997B0/func_802A116C_79991C.s index 24ee8f8b30..57b95963d2 100644 --- a/asm/nonmatchings/code_7997B0/func_802A116C_79991C.s +++ b/asm/nonmatchings/code_7997B0/func_802A116C_79991C.s @@ -22,15 +22,15 @@ glabel func_802A116C_79991C /* 799960 802A11B0 0C0B1EAF */ jal get_variable /* 799964 802A11B4 0040802D */ daddu $s0, $v0, $zero /* 799968 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 79996C 802A11BC 00000000 */ nop +/* 79996C 802A11BC 00000000 */ nop /* 799970 802A11C0 468010A0 */ cvt.s.w $f2, $f2 /* 799974 802A11C4 44051000 */ mfc1 $a1, $f2 /* 799978 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 79997C 802A11CC 00000000 */ nop +/* 79997C 802A11CC 00000000 */ nop /* 799980 802A11D0 468010A0 */ cvt.s.w $f2, $f2 /* 799984 802A11D4 44061000 */ mfc1 $a2, $f2 /* 799988 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 79998C 802A11DC 00000000 */ nop +/* 79998C 802A11DC 00000000 */ nop /* 799990 802A11E0 468010A0 */ cvt.s.w $f2, $f2 /* 799994 802A11E4 3C0141F0 */ lui $at, 0x41f0 /* 799998 802A11E8 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_7997B0/func_802A1218_7999C8.s b/asm/nonmatchings/code_7997B0/func_802A1218_7999C8.s index 7fadc9b93e..9a05c56611 100644 --- a/asm/nonmatchings/code_7997B0/func_802A1218_7999C8.s +++ b/asm/nonmatchings/code_7997B0/func_802A1218_7999C8.s @@ -23,15 +23,15 @@ glabel func_802A1218_7999C8 /* 799A10 802A1260 0040802D */ daddu $s0, $v0, $zero /* 799A14 802A1264 24040004 */ addiu $a0, $zero, 4 /* 799A18 802A1268 44922000 */ mtc1 $s2, $f4 -/* 799A1C 802A126C 00000000 */ nop +/* 799A1C 802A126C 00000000 */ nop /* 799A20 802A1270 46802120 */ cvt.s.w $f4, $f4 /* 799A24 802A1274 44052000 */ mfc1 $a1, $f4 /* 799A28 802A1278 44902000 */ mtc1 $s0, $f4 -/* 799A2C 802A127C 00000000 */ nop +/* 799A2C 802A127C 00000000 */ nop /* 799A30 802A1280 46802120 */ cvt.s.w $f4, $f4 /* 799A34 802A1284 44062000 */ mfc1 $a2, $f4 /* 799A38 802A1288 44822000 */ mtc1 $v0, $f4 -/* 799A3C 802A128C 00000000 */ nop +/* 799A3C 802A128C 00000000 */ nop /* 799A40 802A1290 46802120 */ cvt.s.w $f4, $f4 /* 799A44 802A1294 3C0141A0 */ lui $at, 0x41a0 /* 799A48 802A1298 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_7997B0/func_802A1518_799CC8.s b/asm/nonmatchings/code_7997B0/func_802A1518_799CC8.s index 18ad68c5f3..c99440f63c 100644 --- a/asm/nonmatchings/code_7997B0/func_802A1518_799CC8.s +++ b/asm/nonmatchings/code_7997B0/func_802A1518_799CC8.s @@ -35,7 +35,7 @@ glabel func_802A1518_799CC8 /* 799D3C 802A158C 82A3040C */ lb $v1, 0x40c($s5) /* 799D40 802A1590 24020001 */ addiu $v0, $zero, 1 /* 799D44 802A1594 14620040 */ bne $v1, $v0, .L802A1698 -/* 799D48 802A1598 00000000 */ nop +/* 799D48 802A1598 00000000 */ nop /* 799D4C 802A159C 0C09A75B */ jal get_actor /* 799D50 802A15A0 86A40428 */ lh $a0, 0x428($s5) /* 799D54 802A15A4 0040802D */ daddu $s0, $v0, $zero @@ -48,7 +48,7 @@ glabel func_802A1518_799CC8 /* 799D70 802A15C0 C6000144 */ lwc1 $f0, 0x144($s0) /* 799D74 802A15C4 8E030000 */ lw $v1, ($s0) /* 799D78 802A15C8 44821000 */ mtc1 $v0, $f2 -/* 799D7C 802A15CC 00000000 */ nop +/* 799D7C 802A15CC 00000000 */ nop /* 799D80 802A15D0 468010A0 */ cvt.s.w $f2, $f2 /* 799D84 802A15D4 30620800 */ andi $v0, $v1, 0x800 /* 799D88 802A15D8 1040000D */ beqz $v0, .L802A1610 @@ -56,28 +56,28 @@ glabel func_802A1518_799CC8 /* 799D90 802A15E0 86020152 */ lh $v0, 0x152($s0) /* 799D94 802A15E4 C6000148 */ lwc1 $f0, 0x148($s0) /* 799D98 802A15E8 44821000 */ mtc1 $v0, $f2 -/* 799D9C 802A15EC 00000000 */ nop +/* 799D9C 802A15EC 00000000 */ nop /* 799DA0 802A15F0 468010A0 */ cvt.s.w $f2, $f2 /* 799DA4 802A15F4 92020191 */ lbu $v0, 0x191($s0) /* 799DA8 802A15F8 46020000 */ add.s $f0, $f0, $f2 /* 799DAC 802A15FC 44821000 */ mtc1 $v0, $f2 -/* 799DB0 802A1600 00000000 */ nop +/* 799DB0 802A1600 00000000 */ nop /* 799DB4 802A1604 468010A0 */ cvt.s.w $f2, $f2 /* 799DB8 802A1608 080A859F */ j .L802A167C /* 799DBC 802A160C 46020601 */ sub.s $f24, $f0, $f2 .L802A1610: /* 799DC0 802A1610 30628000 */ andi $v0, $v1, 0x8000 /* 799DC4 802A1614 1440000D */ bnez $v0, .L802A164C -/* 799DC8 802A1618 00000000 */ nop +/* 799DC8 802A1618 00000000 */ nop /* 799DCC 802A161C 86020152 */ lh $v0, 0x152($s0) /* 799DD0 802A1620 C6000148 */ lwc1 $f0, 0x148($s0) /* 799DD4 802A1624 44821000 */ mtc1 $v0, $f2 -/* 799DD8 802A1628 00000000 */ nop +/* 799DD8 802A1628 00000000 */ nop /* 799DDC 802A162C 468010A0 */ cvt.s.w $f2, $f2 /* 799DE0 802A1630 92020191 */ lbu $v0, 0x191($s0) /* 799DE4 802A1634 46020000 */ add.s $f0, $f0, $f2 /* 799DE8 802A1638 44821000 */ mtc1 $v0, $f2 -/* 799DEC 802A163C 00000000 */ nop +/* 799DEC 802A163C 00000000 */ nop /* 799DF0 802A1640 468010A0 */ cvt.s.w $f2, $f2 /* 799DF4 802A1644 080A859F */ j .L802A167C /* 799DF8 802A1648 46001600 */ add.s $f24, $f2, $f0 @@ -85,20 +85,20 @@ glabel func_802A1518_799CC8 /* 799DFC 802A164C 86020152 */ lh $v0, 0x152($s0) /* 799E00 802A1650 C6020148 */ lwc1 $f2, 0x148($s0) /* 799E04 802A1654 44820000 */ mtc1 $v0, $f0 -/* 799E08 802A1658 00000000 */ nop +/* 799E08 802A1658 00000000 */ nop /* 799E0C 802A165C 46800020 */ cvt.s.w $f0, $f0 /* 799E10 802A1660 92020191 */ lbu $v0, 0x191($s0) /* 799E14 802A1664 46001080 */ add.s $f2, $f2, $f0 /* 799E18 802A1668 00021040 */ sll $v0, $v0, 1 /* 799E1C 802A166C 44820000 */ mtc1 $v0, $f0 -/* 799E20 802A1670 00000000 */ nop +/* 799E20 802A1670 00000000 */ nop /* 799E24 802A1674 46800020 */ cvt.s.w $f0, $f0 /* 799E28 802A1678 46001600 */ add.s $f24, $f2, $f0 .L802A167C: /* 799E2C 802A167C 86020154 */ lh $v0, 0x154($s0) /* 799E30 802A1680 C602014C */ lwc1 $f2, 0x14c($s0) /* 799E34 802A1684 44820000 */ mtc1 $v0, $f0 -/* 799E38 802A1688 00000000 */ nop +/* 799E38 802A1688 00000000 */ nop /* 799E3C 802A168C 46800020 */ cvt.s.w $f0, $f0 /* 799E40 802A1690 080A85AB */ j .L802A16AC /* 799E44 802A1694 46001680 */ add.s $f26, $f2, $f0 @@ -118,7 +118,7 @@ glabel func_802A1518_799CC8 /* 799E74 802A16C4 1062003B */ beq $v1, $v0, .L802A17B4 /* 799E78 802A16C8 2C620016 */ sltiu $v0, $v1, 0x16 /* 799E7C 802A16CC 080A8625 */ j .L802A1894 -/* 799E80 802A16D0 00000000 */ nop +/* 799E80 802A16D0 00000000 */ nop .L802A16D4: /* 799E84 802A16D4 24160014 */ addiu $s6, $zero, 0x14 /* 799E88 802A16D8 2417000A */ addiu $s7, $zero, 0xa @@ -182,7 +182,7 @@ glabel func_802A1518_799CC8 /* 799F54 802A17A4 1440FFD8 */ bnez $v0, .L802A1708 /* 799F58 802A17A8 2694001C */ addiu $s4, $s4, 0x1c /* 799F5C 802A17AC 080A8623 */ j .L802A188C -/* 799F60 802A17B0 00000000 */ nop +/* 799F60 802A17B0 00000000 */ nop .L802A17B4: /* 799F64 802A17B4 24160014 */ addiu $s6, $zero, 0x14 /* 799F68 802A17B8 2417000A */ addiu $s7, $zero, 0xa @@ -252,11 +252,12 @@ glabel func_802A1518_799CC8 .L802A1894: /* 79A044 802A1894 104002E1 */ beqz $v0, .L802A241C /* 79A048 802A1898 00031080 */ sll $v0, $v1, 2 -/* 79A04C 802A189C 3C01802A */ lui $at, %hi(D_802A3790) +/* 79A04C 802A189C 3C01802A */ lui $at, %hi(jtbl_802A3790_79BF40) /* 79A050 802A18A0 00220821 */ addu $at, $at, $v0 -/* 79A054 802A18A4 8C223790 */ lw $v0, %lo(D_802A3790)($at) +/* 79A054 802A18A4 8C223790 */ lw $v0, %lo(jtbl_802A3790_79BF40)($at) /* 79A058 802A18A8 00400008 */ jr $v0 -/* 79A05C 802A18AC 00000000 */ nop +/* 79A05C 802A18AC 00000000 */ nop +glabel L802A18B0_79A060 /* 79A060 802A18B0 C6B40144 */ lwc1 $f20, 0x144($s5) /* 79A064 802A18B4 C6BE014C */ lwc1 $f30, 0x14c($s5) /* 79A068 802A18B8 92A20191 */ lbu $v0, 0x191($s5) @@ -264,7 +265,7 @@ glabel func_802A1518_799CC8 /* 79A070 802A18C0 3C0141F0 */ lui $at, 0x41f0 /* 79A074 802A18C4 44812000 */ mtc1 $at, $f4 /* 79A078 802A18C8 44820000 */ mtc1 $v0, $f0 -/* 79A07C 802A18CC 00000000 */ nop +/* 79A07C 802A18CC 00000000 */ nop /* 79A080 802A18D0 46800020 */ cvt.s.w $f0, $f0 /* 79A084 802A18D4 46001080 */ add.s $f2, $f2, $f0 /* 79A088 802A18D8 3C014316 */ lui $at, 0x4316 @@ -342,10 +343,11 @@ glabel func_802A1518_799CC8 /* 79A198 802A19E8 34840069 */ ori $a0, $a0, 0x69 .L802A19EC: /* 79A19C 802A19EC 0C05272D */ jal play_sound -/* 79A1A0 802A19F0 00000000 */ nop +/* 79A1A0 802A19F0 00000000 */ nop /* 79A1A4 802A19F4 24020001 */ addiu $v0, $zero, 1 /* 79A1A8 802A19F8 080A8907 */ j .L802A241C /* 79A1AC 802A19FC AFC20070 */ sw $v0, 0x70($fp) +glabel L802A1A00_79A1B0 /* 79A1B0 802A1A00 C6200010 */ lwc1 $f0, 0x10($s1) /* 79A1B4 802A1A04 C6240004 */ lwc1 $f4, 4($s1) /* 79A1B8 802A1A08 46040001 */ sub.s $f0, $f0, $f4 @@ -380,6 +382,7 @@ glabel func_802A1518_799CC8 /* 79A22C 802A1A7C 24020002 */ addiu $v0, $zero, 2 /* 79A230 802A1A80 080A8907 */ j .L802A241C /* 79A234 802A1A84 AFC20070 */ sw $v0, 0x70($fp) +glabel L802A1A88_79A238 /* 79A238 802A1A88 8FC20074 */ lw $v0, 0x74($fp) /* 79A23C 802A1A8C 1440016F */ bnez $v0, .L802A204C /* 79A240 802A1A90 2442FFFF */ addiu $v0, $v0, -1 @@ -392,16 +395,17 @@ glabel func_802A1518_799CC8 /* 79A25C 802A1AAC 24020003 */ addiu $v0, $zero, 3 /* 79A260 802A1AB0 080A8907 */ j .L802A241C /* 79A264 802A1AB4 AFC20070 */ sw $v0, 0x70($fp) +glabel L802A1AB8_79A268 /* 79A268 802A1AB8 C624004C */ lwc1 $f4, 0x4c($s1) /* 79A26C 802A1ABC 3C0141C0 */ lui $at, 0x41c0 /* 79A270 802A1AC0 44810000 */ mtc1 $at, $f0 -/* 79A274 802A1AC4 00000000 */ nop +/* 79A274 802A1AC4 00000000 */ nop /* 79A278 802A1AC8 46040001 */ sub.s $f0, $f0, $f4 /* 79A27C 802A1ACC 3C013E00 */ lui $at, 0x3e00 /* 79A280 802A1AD0 44811000 */ mtc1 $at, $f2 -/* 79A284 802A1AD4 00000000 */ nop +/* 79A284 802A1AD4 00000000 */ nop /* 79A288 802A1AD8 46020002 */ mul.s $f0, $f0, $f2 -/* 79A28C 802A1ADC 00000000 */ nop +/* 79A28C 802A1ADC 00000000 */ nop /* 79A290 802A1AE0 46002100 */ add.s $f4, $f4, $f0 /* 79A294 802A1AE4 3C02802A */ lui $v0, %hi(D_802A37F0) /* 79A298 802A1AE8 8C4237F0 */ lw $v0, %lo(D_802A37F0)($v0) @@ -429,20 +433,21 @@ glabel func_802A1518_799CC8 /* 79A2EC 802A1B3C 24040648 */ addiu $a0, $zero, 0x648 .L802A1B40: /* 79A2F0 802A1B40 0C05272D */ jal play_sound -/* 79A2F4 802A1B44 00000000 */ nop +/* 79A2F4 802A1B44 00000000 */ nop /* 79A2F8 802A1B48 24020004 */ addiu $v0, $zero, 4 /* 79A2FC 802A1B4C 080A8907 */ j .L802A241C /* 79A300 802A1B50 AFC20070 */ sw $v0, 0x70($fp) +glabel L802A1B54_79A304 /* 79A304 802A1B54 C624004C */ lwc1 $f4, 0x4c($s1) /* 79A308 802A1B58 3C014240 */ lui $at, 0x4240 /* 79A30C 802A1B5C 44811000 */ mtc1 $at, $f2 -/* 79A310 802A1B60 00000000 */ nop +/* 79A310 802A1B60 00000000 */ nop /* 79A314 802A1B64 46041081 */ sub.s $f2, $f2, $f4 /* 79A318 802A1B68 3C013E80 */ lui $at, 0x3e80 /* 79A31C 802A1B6C 44810000 */ mtc1 $at, $f0 -/* 79A320 802A1B70 00000000 */ nop +/* 79A320 802A1B70 00000000 */ nop /* 79A324 802A1B74 46001082 */ mul.s $f2, $f2, $f0 -/* 79A328 802A1B78 00000000 */ nop +/* 79A328 802A1B78 00000000 */ nop /* 79A32C 802A1B7C 0000B82D */ daddu $s7, $zero, $zero /* 79A330 802A1B80 02E0902D */ daddu $s2, $s7, $zero /* 79A334 802A1B84 3C13802A */ lui $s3, %hi(D_802A3818) @@ -462,7 +467,7 @@ glabel func_802A1518_799CC8 /* 79A368 802A1BB8 26730004 */ addiu $s3, $s3, 4 /* 79A36C 802A1BBC 8E020000 */ lw $v0, ($s0) /* 79A370 802A1BC0 04410013 */ bgez $v0, .L802A1C10 -/* 79A374 802A1BC4 00000000 */ nop +/* 79A374 802A1BC4 00000000 */ nop /* 79A378 802A1BC8 C6340000 */ lwc1 $f20, ($s1) /* 79A37C 802A1BCC C638000C */ lwc1 $f24, 0xc($s1) /* 79A380 802A1BD0 C6360004 */ lwc1 $f22, 4($s1) @@ -602,7 +607,7 @@ glabel func_802A1518_799CC8 .L802A1DD0: /* 79A580 802A1DD0 8FC20078 */ lw $v0, 0x78($fp) /* 79A584 802A1DD4 14400003 */ bnez $v0, .L802A1DE4 -/* 79A588 802A1DD8 00000000 */ nop +/* 79A588 802A1DD8 00000000 */ nop /* 79A58C 802A1DDC 52400008 */ beql $s2, $zero, .L802A1E00 /* 79A590 802A1DE0 24A50004 */ addiu $a1, $a1, 4 .L802A1DE4: @@ -627,6 +632,7 @@ glabel func_802A1518_799CC8 /* 79A5D8 802A1E28 24020005 */ addiu $v0, $zero, 5 /* 79A5DC 802A1E2C 080A8907 */ j .L802A241C /* 79A5E0 802A1E30 AFC20070 */ sw $v0, 0x70($fp) +glabel L802A1E34_79A5E4 /* 79A5E4 802A1E34 8FC20074 */ lw $v0, 0x74($fp) /* 79A5E8 802A1E38 14400084 */ bnez $v0, .L802A204C /* 79A5EC 802A1E3C 2442FFFF */ addiu $v0, $v0, -1 @@ -667,7 +673,7 @@ glabel func_802A1518_799CC8 /* 79A674 802A1EC4 E4480084 */ swc1 $f8, 0x84($v0) /* 79A678 802A1EC8 C6200004 */ lwc1 $f0, 4($s1) /* 79A67C 802A1ECC 46020002 */ mul.s $f0, $f0, $f2 -/* 79A680 802A1ED0 00000000 */ nop +/* 79A680 802A1ED0 00000000 */ nop /* 79A684 802A1ED4 4600020D */ trunc.w.s $f8, $f0 /* 79A688 802A1ED8 E4480088 */ swc1 $f8, 0x88($v0) /* 79A68C 802A1EDC C6200008 */ lwc1 $f0, 8($s1) @@ -682,6 +688,7 @@ glabel func_802A1518_799CC8 /* 79A6B0 802A1F00 24020006 */ addiu $v0, $zero, 6 /* 79A6B4 802A1F04 080A8907 */ j .L802A241C /* 79A6B8 802A1F08 AFC20070 */ sw $v0, 0x70($fp) +glabel L802A1F0C_79A6BC /* 79A6BC 802A1F0C 96220064 */ lhu $v0, 0x64($s1) /* 79A6C0 802A1F10 2442001E */ addiu $v0, $v0, 0x1e /* 79A6C4 802A1F14 A6220064 */ sh $v0, 0x64($s1) @@ -714,7 +721,7 @@ glabel func_802A1518_799CC8 /* 79A72C 802A1F7C 2402000F */ addiu $v0, $zero, 0xf /* 79A730 802A1F80 86A40428 */ lh $a0, 0x428($s5) /* 79A734 802A1F84 0C09A75B */ jal get_actor -/* 79A738 802A1F88 00000000 */ nop +/* 79A738 802A1F88 00000000 */ nop /* 79A73C 802A1F8C 82A50426 */ lb $a1, 0x426($s5) /* 79A740 802A1F90 0C099117 */ jal get_actor_part /* 79A744 802A1F94 0040202D */ daddu $a0, $v0, $zero @@ -732,6 +739,7 @@ glabel func_802A1518_799CC8 /* 79A76C 802A1FBC 24020007 */ addiu $v0, $zero, 7 /* 79A770 802A1FC0 080A8907 */ j .L802A241C /* 79A774 802A1FC4 AFC20070 */ sw $v0, 0x70($fp) +glabel L802A1FC8_79A778 /* 79A778 802A1FC8 8FC20074 */ lw $v0, 0x74($fp) /* 79A77C 802A1FCC 1440001F */ bnez $v0, .L802A204C /* 79A780 802A1FD0 2442FFFF */ addiu $v0, $v0, -1 @@ -740,6 +748,7 @@ glabel func_802A1518_799CC8 /* 79A78C 802A1FDC 24020008 */ addiu $v0, $zero, 8 /* 79A790 802A1FE0 080A8907 */ j .L802A241C /* 79A794 802A1FE4 AFC20070 */ sw $v0, 0x70($fp) +glabel L802A1FE8_79A798 /* 79A798 802A1FE8 96220064 */ lhu $v0, 0x64($s1) /* 79A79C 802A1FEC 2442FFE2 */ addiu $v0, $v0, -0x1e /* 79A7A0 802A1FF0 A6220064 */ sh $v0, 0x64($s1) @@ -763,6 +772,7 @@ glabel func_802A1518_799CC8 /* 79A7E4 802A2034 24020009 */ addiu $v0, $zero, 9 /* 79A7E8 802A2038 080A8907 */ j .L802A241C /* 79A7EC 802A203C AFC20070 */ sw $v0, 0x70($fp) +glabel L802A2040_79A7F0 /* 79A7F0 802A2040 8FC20074 */ lw $v0, 0x74($fp) /* 79A7F4 802A2044 10400003 */ beqz $v0, .L802A2054 /* 79A7F8 802A2048 2442FFFF */ addiu $v0, $v0, -1 @@ -781,6 +791,7 @@ glabel func_802A1518_799CC8 /* 79A824 802A2074 2402000A */ addiu $v0, $zero, 0xa /* 79A828 802A2078 080A8907 */ j .L802A241C /* 79A82C 802A207C AFC20070 */ sw $v0, 0x70($fp) +glabel L802A2080_79A830 /* 79A830 802A2080 8FC20074 */ lw $v0, 0x74($fp) /* 79A834 802A2084 10400010 */ beqz $v0, .L802A20C8 /* 79A838 802A2088 2442FFFF */ addiu $v0, $v0, -1 @@ -800,7 +811,7 @@ glabel func_802A1518_799CC8 /* 79A86C 802A20BC 24040649 */ addiu $a0, $zero, 0x649 .L802A20C0: /* 79A870 802A20C0 0C05272D */ jal play_sound -/* 79A874 802A20C4 00000000 */ nop +/* 79A874 802A20C4 00000000 */ nop .L802A20C8: /* 79A878 802A20C8 0000B82D */ daddu $s7, $zero, $zero /* 79A87C 802A20CC 02E0902D */ daddu $s2, $s7, $zero @@ -820,7 +831,7 @@ glabel func_802A1518_799CC8 .L802A2104: /* 79A8B4 802A2104 8FC20078 */ lw $v0, 0x78($fp) /* 79A8B8 802A2108 14400003 */ bnez $v0, .L802A2118 -/* 79A8BC 802A210C 00000000 */ nop +/* 79A8BC 802A210C 00000000 */ nop /* 79A8C0 802A2110 5240001C */ beql $s2, $zero, .L802A2184 /* 79A8C4 802A2114 24630004 */ addiu $v1, $v1, 4 .L802A2118: @@ -848,7 +859,7 @@ glabel func_802A1518_799CC8 /* 79A918 802A2168 46000005 */ abs.s $f0, $f0 /* 79A91C 802A216C 46000021 */ cvt.d.s $f0, $f0 /* 79A920 802A2170 4624003C */ c.lt.d $f0, $f4 -/* 79A924 802A2174 00000000 */ nop +/* 79A924 802A2174 00000000 */ nop /* 79A928 802A2178 45030001 */ bc1tl .L802A2180 /* 79A92C 802A217C AC650000 */ sw $a1, ($v1) .L802A2180: @@ -859,7 +870,8 @@ glabel func_802A1518_799CC8 /* 79A93C 802A218C 1440FFDD */ bnez $v0, .L802A2104 /* 79A940 802A2190 2484001C */ addiu $a0, $a0, 0x1c /* 79A944 802A2194 080A88FB */ j .L802A23EC -/* 79A948 802A2198 00000000 */ nop +/* 79A948 802A2198 00000000 */ nop +glabel L802A219C_79A94C /* 79A94C 802A219C 3C02802A */ lui $v0, %hi(D_802A37F0) /* 79A950 802A21A0 8C4237F0 */ lw $v0, %lo(D_802A37F0)($v0) /* 79A954 802A21A4 2404000F */ addiu $a0, $zero, 0xf @@ -885,6 +897,7 @@ glabel func_802A1518_799CC8 /* 79A99C 802A21EC 24020015 */ addiu $v0, $zero, 0x15 /* 79A9A0 802A21F0 080A8907 */ j .L802A241C /* 79A9A4 802A21F4 AFC20070 */ sw $v0, 0x70($fp) +glabel L802A21F8_79A9A8 /* 79A9A8 802A21F8 0000B82D */ daddu $s7, $zero, $zero /* 79A9AC 802A21FC 02E0902D */ daddu $s2, $s7, $zero /* 79A9B0 802A2200 3C13802A */ lui $s3, %hi(D_802A3818) @@ -905,7 +918,7 @@ glabel func_802A1518_799CC8 .L802A223C: /* 79A9EC 802A223C 8FC20078 */ lw $v0, 0x78($fp) /* 79A9F0 802A2240 14400003 */ bnez $v0, .L802A2250 -/* 79A9F4 802A2244 00000000 */ nop +/* 79A9F4 802A2244 00000000 */ nop /* 79A9F8 802A2248 5240005F */ beql $s2, $zero, .L802A23C8 /* 79A9FC 802A224C 26730004 */ addiu $s3, $s3, 4 .L802A2250: @@ -1032,6 +1045,7 @@ glabel func_802A1518_799CC8 /* 79ABC4 802A2414 080A8908 */ j .L802A2420 /* 79ABC8 802A2418 AC640000 */ sw $a0, ($v1) .L802A241C: +glabel L802A241C_79ABCC /* 79ABCC 802A241C 0000102D */ daddu $v0, $zero, $zero .L802A2420: /* 79ABD0 802A2420 8FBF0064 */ lw $ra, 0x64($sp) diff --git a/asm/nonmatchings/code_79D8A0/func_802A1000_79D8A0.s b/asm/nonmatchings/code_79D8A0/func_802A1000_79D8A0.s index 32451ad11f..8af54feca0 100644 --- a/asm/nonmatchings/code_79D8A0/func_802A1000_79D8A0.s +++ b/asm/nonmatchings/code_79D8A0/func_802A1000_79D8A0.s @@ -22,15 +22,15 @@ glabel func_802A1000_79D8A0 /* 79D8E4 802A1044 0C0B1EAF */ jal get_variable /* 79D8E8 802A1048 0040802D */ daddu $s0, $v0, $zero /* 79D8EC 802A104C 44921000 */ mtc1 $s2, $f2 -/* 79D8F0 802A1050 00000000 */ nop +/* 79D8F0 802A1050 00000000 */ nop /* 79D8F4 802A1054 468010A0 */ cvt.s.w $f2, $f2 /* 79D8F8 802A1058 44051000 */ mfc1 $a1, $f2 /* 79D8FC 802A105C 44901000 */ mtc1 $s0, $f2 -/* 79D900 802A1060 00000000 */ nop +/* 79D900 802A1060 00000000 */ nop /* 79D904 802A1064 468010A0 */ cvt.s.w $f2, $f2 /* 79D908 802A1068 44061000 */ mfc1 $a2, $f2 /* 79D90C 802A106C 44821000 */ mtc1 $v0, $f2 -/* 79D910 802A1070 00000000 */ nop +/* 79D910 802A1070 00000000 */ nop /* 79D914 802A1074 468010A0 */ cvt.s.w $f2, $f2 /* 79D918 802A1078 3C014220 */ lui $at, 0x4220 /* 79D91C 802A107C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_79D8A0/func_802A10AC_79D94C.s b/asm/nonmatchings/code_79D8A0/func_802A10AC_79D94C.s index df660dac36..02d2415923 100644 --- a/asm/nonmatchings/code_79D8A0/func_802A10AC_79D94C.s +++ b/asm/nonmatchings/code_79D8A0/func_802A10AC_79D94C.s @@ -23,15 +23,15 @@ glabel func_802A10AC_79D94C /* 79D994 802A10F4 0040802D */ daddu $s0, $v0, $zero /* 79D998 802A10F8 24040005 */ addiu $a0, $zero, 5 /* 79D99C 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 79D9A0 802A1100 00000000 */ nop +/* 79D9A0 802A1100 00000000 */ nop /* 79D9A4 802A1104 468010A0 */ cvt.s.w $f2, $f2 /* 79D9A8 802A1108 44051000 */ mfc1 $a1, $f2 /* 79D9AC 802A110C 44901000 */ mtc1 $s0, $f2 -/* 79D9B0 802A1110 00000000 */ nop +/* 79D9B0 802A1110 00000000 */ nop /* 79D9B4 802A1114 468010A0 */ cvt.s.w $f2, $f2 /* 79D9B8 802A1118 44061000 */ mfc1 $a2, $f2 /* 79D9BC 802A111C 44821000 */ mtc1 $v0, $f2 -/* 79D9C0 802A1120 00000000 */ nop +/* 79D9C0 802A1120 00000000 */ nop /* 79D9C4 802A1124 468010A0 */ cvt.s.w $f2, $f2 /* 79D9C8 802A1128 3C014248 */ lui $at, 0x4248 /* 79D9CC 802A112C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_79D8A0/func_802A116C_79DA0C.s b/asm/nonmatchings/code_79D8A0/func_802A116C_79DA0C.s index db4a1297cc..790060fc47 100644 --- a/asm/nonmatchings/code_79D8A0/func_802A116C_79DA0C.s +++ b/asm/nonmatchings/code_79D8A0/func_802A116C_79DA0C.s @@ -22,15 +22,15 @@ glabel func_802A116C_79DA0C /* 79DA50 802A11B0 0C0B1EAF */ jal get_variable /* 79DA54 802A11B4 0040802D */ daddu $s0, $v0, $zero /* 79DA58 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 79DA5C 802A11BC 00000000 */ nop +/* 79DA5C 802A11BC 00000000 */ nop /* 79DA60 802A11C0 468010A0 */ cvt.s.w $f2, $f2 /* 79DA64 802A11C4 44051000 */ mfc1 $a1, $f2 /* 79DA68 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 79DA6C 802A11CC 00000000 */ nop +/* 79DA6C 802A11CC 00000000 */ nop /* 79DA70 802A11D0 468010A0 */ cvt.s.w $f2, $f2 /* 79DA74 802A11D4 44061000 */ mfc1 $a2, $f2 /* 79DA78 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 79DA7C 802A11DC 00000000 */ nop +/* 79DA7C 802A11DC 00000000 */ nop /* 79DA80 802A11E0 468010A0 */ cvt.s.w $f2, $f2 /* 79DA84 802A11E4 3C0141F0 */ lui $at, 0x41f0 /* 79DA88 802A11E8 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_79D8A0/func_802A1218_79DAB8.s b/asm/nonmatchings/code_79D8A0/func_802A1218_79DAB8.s index 1049e19655..c1f5eb7a79 100644 --- a/asm/nonmatchings/code_79D8A0/func_802A1218_79DAB8.s +++ b/asm/nonmatchings/code_79D8A0/func_802A1218_79DAB8.s @@ -23,15 +23,15 @@ glabel func_802A1218_79DAB8 /* 79DB00 802A1260 0040802D */ daddu $s0, $v0, $zero /* 79DB04 802A1264 24040004 */ addiu $a0, $zero, 4 /* 79DB08 802A1268 44922000 */ mtc1 $s2, $f4 -/* 79DB0C 802A126C 00000000 */ nop +/* 79DB0C 802A126C 00000000 */ nop /* 79DB10 802A1270 46802120 */ cvt.s.w $f4, $f4 /* 79DB14 802A1274 44052000 */ mfc1 $a1, $f4 /* 79DB18 802A1278 44902000 */ mtc1 $s0, $f4 -/* 79DB1C 802A127C 00000000 */ nop +/* 79DB1C 802A127C 00000000 */ nop /* 79DB20 802A1280 46802120 */ cvt.s.w $f4, $f4 /* 79DB24 802A1284 44062000 */ mfc1 $a2, $f4 /* 79DB28 802A1288 44822000 */ mtc1 $v0, $f4 -/* 79DB2C 802A128C 00000000 */ nop +/* 79DB2C 802A128C 00000000 */ nop /* 79DB30 802A1290 46802120 */ cvt.s.w $f4, $f4 /* 79DB34 802A1294 3C0141A0 */ lui $at, 0x41a0 /* 79DB38 802A1298 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_79D8A0/func_802A1518_79DDB8.s b/asm/nonmatchings/code_79D8A0/func_802A1518_79DDB8.s index 202e81c902..aeef15e727 100644 --- a/asm/nonmatchings/code_79D8A0/func_802A1518_79DDB8.s +++ b/asm/nonmatchings/code_79D8A0/func_802A1518_79DDB8.s @@ -12,7 +12,7 @@ glabel func_802A1518_79DDB8 /* 79DDD4 802A1534 0C03A752 */ jal is_ability_active /* 79DDD8 802A1538 0200882D */ daddu $s1, $s0, $zero /* 79DDDC 802A153C 10400004 */ beqz $v0, .L802A1550 -/* 79DDE0 802A1540 00000000 */ nop +/* 79DDE0 802A1540 00000000 */ nop /* 79DDE4 802A1544 96020290 */ lhu $v0, 0x290($s0) /* 79DDE8 802A1548 24420080 */ addiu $v0, $v0, 0x80 /* 79DDEC 802A154C A6020290 */ sh $v0, 0x290($s0) @@ -20,7 +20,7 @@ glabel func_802A1518_79DDB8 /* 79DDF0 802A1550 0C03A752 */ jal is_ability_active /* 79DDF4 802A1554 24040031 */ addiu $a0, $zero, 0x31 /* 79DDF8 802A1558 10400004 */ beqz $v0, .L802A156C -/* 79DDFC 802A155C 00000000 */ nop +/* 79DDFC 802A155C 00000000 */ nop /* 79DE00 802A1560 96020290 */ lhu $v0, 0x290($s0) /* 79DE04 802A1564 24420100 */ addiu $v0, $v0, 0x100 /* 79DE08 802A1568 A6020290 */ sh $v0, 0x290($s0) @@ -42,4 +42,4 @@ glabel func_802A1518_79DDB8 /* 79DE40 802A15A0 24020002 */ addiu $v0, $zero, 2 /* 79DE44 802A15A4 03E00008 */ jr $ra /* 79DE48 802A15A8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 79DE4C 802A15AC 00000000 */ nop +/* 79DE4C 802A15AC 00000000 */ nop diff --git a/asm/nonmatchings/code_8560/func_8002D160.s b/asm/nonmatchings/code_8560/func_8002D160.s index 21fdabeb98..0070e79948 100644 --- a/asm/nonmatchings/code_8560/func_8002D160.s +++ b/asm/nonmatchings/code_8560/func_8002D160.s @@ -179,4 +179,4 @@ glabel func_8002D160 /* 87F0 8002D3F0 8FB00018 */ lw $s0, 0x18($sp) /* 87F4 8002D3F4 03E00008 */ jr $ra /* 87F8 8002D3F8 27BD0040 */ addiu $sp, $sp, 0x40 -/* 87FC 8002D3FC 00000000 */ nop +/* 87FC 8002D3FC 00000000 */ nop diff --git a/asm/nonmatchings/code_8560/func_8002E82C.s b/asm/nonmatchings/code_8560/func_8002E82C.s index b49d3a71aa..36f2ec4174 100644 --- a/asm/nonmatchings/code_8560/func_8002E82C.s +++ b/asm/nonmatchings/code_8560/func_8002E82C.s @@ -20,10 +20,10 @@ glabel func_8002E82C /* 9C68 8002E868 00021403 */ sra $v0, $v0, 0x10 /* 9C6C 8002E86C 28420004 */ slti $v0, $v0, 4 /* 9C70 8002E870 14400003 */ bnez $v0, .L8002E880 -/* 9C74 8002E874 00000000 */ nop +/* 9C74 8002E874 00000000 */ nop .L8002E878: /* 9C78 8002E878 0800BA1E */ j .L8002E878 -/* 9C7C 8002E87C 00000000 */ nop +/* 9C7C 8002E87C 00000000 */ nop .L8002E880: /* 9C80 8002E880 84830212 */ lh $v1, 0x212($a0) /* 9C84 8002E884 000310C0 */ sll $v0, $v1, 3 @@ -59,5 +59,5 @@ glabel func_8002E82C /* 9CFC 8002E8FC 00821021 */ addu $v0, $a0, $v0 /* 9D00 8002E900 03E00008 */ jr $ra /* 9D04 8002E904 A4400214 */ sh $zero, 0x214($v0) -/* 9D08 8002E908 00000000 */ nop -/* 9D0C 8002E90C 00000000 */ nop +/* 9D08 8002E908 00000000 */ nop +/* 9D0C 8002E90C 00000000 */ nop diff --git a/asm/nonmatchings/code_8560/get_screen_coords.s b/asm/nonmatchings/code_8560/get_screen_coords.s index 82aec87d1e..70055d9210 100644 --- a/asm/nonmatchings/code_8560/get_screen_coords.s +++ b/asm/nonmatchings/code_8560/get_screen_coords.s @@ -38,11 +38,11 @@ glabel get_screen_coords /* 99BC 8002E5BC 3C01459C */ lui $at, 0x459c /* 99C0 8002E5C0 34214000 */ ori $at, $at, 0x4000 /* 99C4 8002E5C4 44811000 */ mtc1 $at, $f2 -/* 99C8 8002E5C8 00000000 */ nop +/* 99C8 8002E5C8 00000000 */ nop /* 99CC 8002E5CC 46020000 */ add.s $f0, $f0, $f2 /* 99D0 8002E5D0 4600020D */ trunc.w.s $f8, $f0 /* 99D4 8002E5D4 44024000 */ mfc1 $v0, $f8 -/* 99D8 8002E5D8 00000000 */ nop +/* 99D8 8002E5D8 00000000 */ nop /* 99DC 8002E5DC 04410003 */ bgez $v0, .L8002E5EC /* 99E0 8002E5E0 AE220000 */ sw $v0, ($s1) /* 99E4 8002E5E4 0800B97F */ j .L8002E5FC @@ -58,15 +58,15 @@ glabel get_screen_coords /* 9A04 8002E604 D4208200 */ ldc1 $f0, %lo(D_80098200)($at) /* 9A08 8002E608 460010A1 */ cvt.d.s $f2, $f2 /* 9A0C 8002E60C 4620103C */ c.lt.d $f2, $f0 -/* 9A10 8002E610 00000000 */ nop +/* 9A10 8002E610 00000000 */ nop /* 9A14 8002E614 4500000B */ bc1f .L8002E644 -/* 9A18 8002E618 00000000 */ nop +/* 9A18 8002E618 00000000 */ nop /* 9A1C 8002E61C 3C01800A */ lui $at, %hi(D_80098208) /* 9A20 8002E620 D4208208 */ ldc1 $f0, %lo(D_80098208)($at) /* 9A24 8002E624 4622003C */ c.lt.d $f0, $f2 -/* 9A28 8002E628 00000000 */ nop +/* 9A28 8002E628 00000000 */ nop /* 9A2C 8002E62C 45000005 */ bc1f .L8002E644 -/* 9A30 8002E630 00000000 */ nop +/* 9A30 8002E630 00000000 */ nop /* 9A34 8002E634 AE400000 */ sw $zero, ($s2) /* 9A38 8002E638 AE600000 */ sw $zero, ($s3) /* 9A3C 8002E63C 0800B9CE */ j .L8002E738 @@ -79,58 +79,58 @@ glabel get_screen_coords /* 9A54 8002E654 9603000A */ lhu $v1, 0xa($s0) /* 9A58 8002E658 46002103 */ div.s $f4, $f4, $f0 /* 9A5C 8002E65C 46041082 */ mul.s $f2, $f2, $f4 -/* 9A60 8002E660 00000000 */ nop +/* 9A60 8002E660 00000000 */ nop /* 9A64 8002E664 00031C00 */ sll $v1, $v1, 0x10 /* 9A68 8002E668 00031403 */ sra $v0, $v1, 0x10 /* 9A6C 8002E66C 44820000 */ mtc1 $v0, $f0 -/* 9A70 8002E670 00000000 */ nop +/* 9A70 8002E670 00000000 */ nop /* 9A74 8002E674 46800020 */ cvt.s.w $f0, $f0 /* 9A78 8002E678 46001082 */ mul.s $f2, $f2, $f0 -/* 9A7C 8002E67C 00000000 */ nop +/* 9A7C 8002E67C 00000000 */ nop /* 9A80 8002E680 3C013F00 */ lui $at, 0x3f00 /* 9A84 8002E684 44813000 */ mtc1 $at, $f6 -/* 9A88 8002E688 00000000 */ nop +/* 9A88 8002E688 00000000 */ nop /* 9A8C 8002E68C 46061082 */ mul.s $f2, $f2, $f6 -/* 9A90 8002E690 00000000 */ nop +/* 9A90 8002E690 00000000 */ nop /* 9A94 8002E694 00031FC2 */ srl $v1, $v1, 0x1f /* 9A98 8002E698 00431021 */ addu $v0, $v0, $v1 /* 9A9C 8002E69C 00021043 */ sra $v0, $v0, 1 /* 9AA0 8002E6A0 44820000 */ mtc1 $v0, $f0 -/* 9AA4 8002E6A4 00000000 */ nop +/* 9AA4 8002E6A4 00000000 */ nop /* 9AA8 8002E6A8 46800020 */ cvt.s.w $f0, $f0 /* 9AAC 8002E6AC 46020000 */ add.s $f0, $f0, $f2 /* 9AB0 8002E6B0 E7A40034 */ swc1 $f4, 0x34($sp) /* 9AB4 8002E6B4 8603000E */ lh $v1, 0xe($s0) /* 9AB8 8002E6B8 4600020D */ trunc.w.s $f8, $f0 /* 9ABC 8002E6BC 44024000 */ mfc1 $v0, $f8 -/* 9AC0 8002E6C0 00000000 */ nop +/* 9AC0 8002E6C0 00000000 */ nop /* 9AC4 8002E6C4 00431021 */ addu $v0, $v0, $v1 /* 9AC8 8002E6C8 AE420000 */ sw $v0, ($s2) /* 9ACC 8002E6CC C7A2002C */ lwc1 $f2, 0x2c($sp) /* 9AD0 8002E6D0 C7A00034 */ lwc1 $f0, 0x34($sp) /* 9AD4 8002E6D4 9603000C */ lhu $v1, 0xc($s0) /* 9AD8 8002E6D8 46001082 */ mul.s $f2, $f2, $f0 -/* 9ADC 8002E6DC 00000000 */ nop +/* 9ADC 8002E6DC 00000000 */ nop /* 9AE0 8002E6E0 00031C00 */ sll $v1, $v1, 0x10 /* 9AE4 8002E6E4 00031403 */ sra $v0, $v1, 0x10 /* 9AE8 8002E6E8 44820000 */ mtc1 $v0, $f0 -/* 9AEC 8002E6EC 00000000 */ nop +/* 9AEC 8002E6EC 00000000 */ nop /* 9AF0 8002E6F0 46800020 */ cvt.s.w $f0, $f0 /* 9AF4 8002E6F4 46001082 */ mul.s $f2, $f2, $f0 -/* 9AF8 8002E6F8 00000000 */ nop +/* 9AF8 8002E6F8 00000000 */ nop /* 9AFC 8002E6FC 46061082 */ mul.s $f2, $f2, $f6 -/* 9B00 8002E700 00000000 */ nop +/* 9B00 8002E700 00000000 */ nop /* 9B04 8002E704 00031FC2 */ srl $v1, $v1, 0x1f /* 9B08 8002E708 00431021 */ addu $v0, $v0, $v1 /* 9B0C 8002E70C 00021043 */ sra $v0, $v0, 1 /* 9B10 8002E710 44820000 */ mtc1 $v0, $f0 -/* 9B14 8002E714 00000000 */ nop +/* 9B14 8002E714 00000000 */ nop /* 9B18 8002E718 46800020 */ cvt.s.w $f0, $f0 /* 9B1C 8002E71C 46020001 */ sub.s $f0, $f0, $f2 /* 9B20 8002E720 86030010 */ lh $v1, 0x10($s0) /* 9B24 8002E724 4600020D */ trunc.w.s $f8, $f0 /* 9B28 8002E728 44024000 */ mfc1 $v0, $f8 -/* 9B2C 8002E72C 00000000 */ nop +/* 9B2C 8002E72C 00000000 */ nop /* 9B30 8002E730 00431021 */ addu $v0, $v0, $v1 /* 9B34 8002E734 AE620000 */ sw $v0, ($s3) .L8002E738: diff --git a/asm/nonmatchings/code_8560/initialize_next_camera.s b/asm/nonmatchings/code_8560/initialize_next_camera.s index b685786af2..73f2d9b742 100644 --- a/asm/nonmatchings/code_8560/initialize_next_camera.s +++ b/asm/nonmatchings/code_8560/initialize_next_camera.s @@ -24,7 +24,7 @@ glabel initialize_next_camera /* 95B0 8002E1B0 24030001 */ addiu $v1, $zero, 1 .L8002E1B4: /* 95B4 8002E1B4 0800B86D */ j .L8002E1B4 -/* 95B8 8002E1B8 00000000 */ nop +/* 95B8 8002E1B8 00000000 */ nop .L8002E1BC: /* 95BC 8002E1BC 94E20000 */ lhu $v0, ($a3) /* 95C0 8002E1C0 3C01C2C8 */ lui $at, 0xc2c8 @@ -58,7 +58,7 @@ glabel initialize_next_camera /* 9630 8002E230 24020064 */ addiu $v0, $zero, 0x64 /* 9634 8002E234 A602002A */ sh $v0, 0x2a($s0) /* 9638 8002E238 44830000 */ mtc1 $v1, $f0 -/* 963C 8002E23C 00000000 */ nop +/* 963C 8002E23C 00000000 */ nop /* 9640 8002E240 46800020 */ cvt.s.w $f0, $f0 /* 9644 8002E244 E6000018 */ swc1 $f0, 0x18($s0) /* 9648 8002E248 84E20006 */ lh $v0, 6($a3) diff --git a/asm/nonmatchings/code_8560/render_frame.s b/asm/nonmatchings/code_8560/render_frame.s index 9792bc8253..a92a3e3806 100644 --- a/asm/nonmatchings/code_8560/render_frame.s +++ b/asm/nonmatchings/code_8560/render_frame.s @@ -21,7 +21,7 @@ glabel render_frame /* 8B7C 8002D77C 3C01800A */ lui $at, %hi(D_8009A634) /* 8B80 8002D780 A420A634 */ sh $zero, %lo(D_8009A634)($at) /* 8B84 8002D784 0C0459A6 */ jal func_80116698 -/* 8B88 8002D788 00000000 */ nop +/* 8B88 8002D788 00000000 */ nop .L8002D78C: /* 8B8C 8002D78C 8FAB0070 */ lw $t3, 0x70($sp) /* 8B90 8002D790 11600003 */ beqz $t3, .L8002D7A0 @@ -60,7 +60,7 @@ glabel render_frame /* 8C0C 8002D80C 104001A0 */ beqz $v0, .L8002DE90 /* 8C10 8002D810 30420082 */ andi $v0, $v0, 0x82 /* 8C14 8002D814 1440019E */ bnez $v0, .L8002DE90 -/* 8C18 8002D818 00000000 */ nop +/* 8C18 8002D818 00000000 */ nop /* 8C1C 8002D81C 8EC201FC */ lw $v0, 0x1fc($s6) /* 8C20 8002D820 97AB0022 */ lhu $t3, 0x22($sp) /* 8C24 8002D824 3C01800A */ lui $at, %hi(D_8009A634) @@ -207,20 +207,20 @@ glabel render_frame /* 8E34 8002DA34 AEE20000 */ sw $v0, ($s7) /* 8E38 8002DA38 26A20068 */ addiu $v0, $s5, 0x68 /* 8E3C 8002DA3C 44981000 */ mtc1 $t8, $f2 -/* 8E40 8002DA40 00000000 */ nop +/* 8E40 8002DA40 00000000 */ nop /* 8E44 8002DA44 468010A0 */ cvt.s.w $f2, $f2 /* 8E48 8002DA48 46161082 */ mul.s $f2, $f2, $f22 -/* 8E4C 8002DA4C 00000000 */ nop +/* 8E4C 8002DA4C 00000000 */ nop /* 8E50 8002DA50 AEAA0058 */ sw $t2, 0x58($s5) /* 8E54 8002DA54 AEA9005C */ sw $t1, 0x5c($s5) /* 8E58 8002DA58 AEE20000 */ sw $v0, ($s7) /* 8E5C 8002DA5C 26A20070 */ addiu $v0, $s5, 0x70 /* 8E60 8002DA60 44990000 */ mtc1 $t9, $f0 -/* 8E64 8002DA64 00000000 */ nop +/* 8E64 8002DA64 00000000 */ nop /* 8E68 8002DA68 46800020 */ cvt.s.w $f0, $f0 /* 8E6C 8002DA6C 8FAB0028 */ lw $t3, 0x28($sp) /* 8E70 8002DA70 46160002 */ mul.s $f0, $f0, $f22 -/* 8E74 8002DA74 00000000 */ nop +/* 8E74 8002DA74 00000000 */ nop /* 8E78 8002DA78 AEAB0060 */ sw $t3, 0x60($s5) /* 8E7C 8002DA7C AEA00064 */ sw $zero, 0x64($s5) /* 8E80 8002DA80 AEE20000 */ sw $v0, ($s7) @@ -233,33 +233,33 @@ glabel render_frame /* 8E9C 8002DA9C AEAE0074 */ sw $t6, 0x74($s5) /* 8EA0 8002DAA0 4600110D */ trunc.w.s $f4, $f2 /* 8EA4 8002DAA4 44042000 */ mfc1 $a0, $f4 -/* 8EA8 8002DAA8 00000000 */ nop +/* 8EA8 8002DAA8 00000000 */ nop /* 8EAC 8002DAAC 30840FFF */ andi $a0, $a0, 0xfff /* 8EB0 8002DAB0 00042300 */ sll $a0, $a0, 0xc /* 8EB4 8002DAB4 4600010D */ trunc.w.s $f4, $f0 /* 8EB8 8002DAB8 44032000 */ mfc1 $v1, $f4 /* 8EBC 8002DABC 449E1000 */ mtc1 $fp, $f2 -/* 8EC0 8002DAC0 00000000 */ nop +/* 8EC0 8002DAC0 00000000 */ nop /* 8EC4 8002DAC4 468010A0 */ cvt.s.w $f2, $f2 /* 8EC8 8002DAC8 46161082 */ mul.s $f2, $f2, $f22 -/* 8ECC 8002DACC 00000000 */ nop +/* 8ECC 8002DACC 00000000 */ nop /* 8ED0 8002DAD0 30630FFF */ andi $v1, $v1, 0xfff /* 8ED4 8002DAD4 00621825 */ or $v1, $v1, $v0 /* 8ED8 8002DAD8 00832025 */ or $a0, $a0, $v1 /* 8EDC 8002DADC 44940000 */ mtc1 $s4, $f0 -/* 8EE0 8002DAE0 00000000 */ nop +/* 8EE0 8002DAE0 00000000 */ nop /* 8EE4 8002DAE4 46800020 */ cvt.s.w $f0, $f0 /* 8EE8 8002DAE8 46160002 */ mul.s $f0, $f0, $f22 -/* 8EEC 8002DAEC 00000000 */ nop +/* 8EEC 8002DAEC 00000000 */ nop /* 8EF0 8002DAF0 AEA40020 */ sw $a0, 0x20($s5) /* 8EF4 8002DAF4 4600110D */ trunc.w.s $f4, $f2 /* 8EF8 8002DAF8 44032000 */ mfc1 $v1, $f4 -/* 8EFC 8002DAFC 00000000 */ nop +/* 8EFC 8002DAFC 00000000 */ nop /* 8F00 8002DB00 30630FFF */ andi $v1, $v1, 0xfff /* 8F04 8002DB04 00031B00 */ sll $v1, $v1, 0xc /* 8F08 8002DB08 4600010D */ trunc.w.s $f4, $f0 /* 8F0C 8002DB0C 44022000 */ mfc1 $v0, $f4 -/* 8F10 8002DB10 00000000 */ nop +/* 8F10 8002DB10 00000000 */ nop /* 8F14 8002DB14 30420FFF */ andi $v0, $v0, 0xfff /* 8F18 8002DB18 00621825 */ or $v1, $v1, $v0 /* 8F1C 8002DB1C 26A20080 */ addiu $v0, $s5, 0x80 @@ -387,31 +387,31 @@ glabel render_frame /* 90FC 8002DCFC 10620019 */ beq $v1, $v0, .L8002DD64 /* 9100 8002DD00 30820200 */ andi $v0, $a0, 0x200 /* 9104 8002DD04 14400003 */ bnez $v0, .L8002DD14 -/* 9108 8002DD08 00000000 */ nop +/* 9108 8002DD08 00000000 */ nop /* 910C 8002DD0C 0C043FAD */ jal render_entities -/* 9110 8002DD10 00000000 */ nop +/* 9110 8002DD10 00000000 */ nop .L8002DD14: /* 9114 8002DD14 96C20000 */ lhu $v0, ($s6) /* 9118 8002DD18 30420400 */ andi $v0, $v0, 0x400 /* 911C 8002DD1C 14400003 */ bnez $v0, .L8002DD2C -/* 9120 8002DD20 00000000 */ nop +/* 9120 8002DD20 00000000 */ nop /* 9124 8002DD24 0C045AE4 */ jal render_models -/* 9128 8002DD28 00000000 */ nop +/* 9128 8002DD28 00000000 */ nop .L8002DD2C: /* 912C 8002DD2C 0C03844E */ jal render_player -/* 9130 8002DD30 00000000 */ nop +/* 9130 8002DD30 00000000 */ nop /* 9134 8002DD34 0C00E9FC */ jal render_npcs -/* 9138 8002DD38 00000000 */ nop +/* 9138 8002DD38 00000000 */ nop /* 913C 8002DD3C 0C048D1C */ jal render_dynamic_entities -/* 9140 8002DD40 00000000 */ nop +/* 9140 8002DD40 00000000 */ nop /* 9144 8002DD44 0C0167BD */ jal render_effects -/* 9148 8002DD48 00000000 */ nop +/* 9148 8002DD48 00000000 */ nop /* 914C 8002DD4C 0C04766E */ jal func_8011D9B8 -/* 9150 8002DD50 00000000 */ nop +/* 9150 8002DD50 00000000 */ nop /* 9154 8002DD54 0C050DAD */ jal render_menu_icons -/* 9158 8002DD58 00000000 */ nop +/* 9158 8002DD58 00000000 */ nop /* 915C 8002DD5C 0800B788 */ j .L8002DE20 -/* 9160 8002DD60 00000000 */ nop +/* 9160 8002DD60 00000000 */ nop .L8002DD64: /* 9164 8002DD64 26D000D4 */ addiu $s0, $s6, 0xd4 /* 9168 8002DD68 4405A000 */ mfc1 $a1, $f20 @@ -453,14 +453,14 @@ glabel render_frame /* 91F8 8002DDF8 0C050DAD */ jal render_menu_icons /* 91FC 8002DDFC AC820004 */ sw $v0, 4($a0) /* 9200 8002DE00 0C04CB95 */ jal render_item_entities -/* 9204 8002DE04 00000000 */ nop +/* 9204 8002DE04 00000000 */ nop /* 9208 8002DE08 0800B788 */ j .L8002DE20 -/* 920C 8002DE0C 00000000 */ nop +/* 920C 8002DE0C 00000000 */ nop .L8002DE10: /* 9210 8002DE10 0C048D1C */ jal render_dynamic_entities -/* 9214 8002DE14 00000000 */ nop +/* 9214 8002DE14 00000000 */ nop /* 9218 8002DE18 0C04766E */ jal func_8011D9B8 -/* 921C 8002DE1C 00000000 */ nop +/* 921C 8002DE1C 00000000 */ nop .L8002DE20: /* 9220 8002DE20 8EC20200 */ lw $v0, 0x200($s6) /* 9224 8002DE24 10400004 */ beqz $v0, .L8002DE38 diff --git a/asm/nonmatchings/code_8560/set_cam_viewport.s b/asm/nonmatchings/code_8560/set_cam_viewport.s index c0c5fcf341..5d07597e12 100644 --- a/asm/nonmatchings/code_8560/set_cam_viewport.s +++ b/asm/nonmatchings/code_8560/set_cam_viewport.s @@ -40,7 +40,7 @@ glabel set_cam_viewport /* 97A0 8002E3A0 A46200A8 */ sh $v0, 0xa8($v1) /* 97A4 8002E3A4 9462000C */ lhu $v0, 0xc($v1) /* 97A8 8002E3A8 44840000 */ mtc1 $a0, $f0 -/* 97AC 8002E3AC 00000000 */ nop +/* 97AC 8002E3AC 00000000 */ nop /* 97B0 8002E3B0 46800020 */ cvt.s.w $f0, $f0 /* 97B4 8002E3B4 00021400 */ sll $v0, $v0, 0x10 /* 97B8 8002E3B8 00022403 */ sra $a0, $v0, 0x10 @@ -57,33 +57,33 @@ glabel set_cam_viewport /* 97E4 8002E3E4 4600010D */ trunc.w.s $f4, $f0 /* 97E8 8002E3E8 44042000 */ mfc1 $a0, $f4 /* 97EC 8002E3EC 44820000 */ mtc1 $v0, $f0 -/* 97F0 8002E3F0 00000000 */ nop +/* 97F0 8002E3F0 00000000 */ nop /* 97F4 8002E3F4 46800020 */ cvt.s.w $f0, $f0 /* 97F8 8002E3F8 46000000 */ add.s $f0, $f0, $f0 /* 97FC 8002E3FC 8462000C */ lh $v0, 0xc($v1) /* 9800 8002E400 3C068007 */ lui $a2, %hi(gGameStatusPtr) /* 9804 8002E404 8CC6419C */ lw $a2, %lo(gGameStatusPtr)($a2) /* 9808 8002E408 44821000 */ mtc1 $v0, $f2 -/* 980C 8002E40C 00000000 */ nop +/* 980C 8002E40C 00000000 */ nop /* 9810 8002E410 468010A0 */ cvt.s.w $f2, $f2 /* 9814 8002E414 4600010D */ trunc.w.s $f4, $f0 /* 9818 8002E418 44022000 */ mfc1 $v0, $f4 -/* 981C 8002E41C 00000000 */ nop +/* 981C 8002E41C 00000000 */ nop /* 9820 8002E420 A46200B0 */ sh $v0, 0xb0($v1) /* 9824 8002E424 8462000C */ lh $v0, 0xc($v1) /* 9828 8002E428 46021080 */ add.s $f2, $f2, $f2 /* 982C 8002E42C A46400A0 */ sh $a0, 0xa0($v1) /* 9830 8002E430 44820000 */ mtc1 $v0, $f0 -/* 9834 8002E434 00000000 */ nop +/* 9834 8002E434 00000000 */ nop /* 9838 8002E438 46800020 */ cvt.s.w $f0, $f0 /* 983C 8002E43C 46000000 */ add.s $f0, $f0, $f0 /* 9840 8002E440 4600110D */ trunc.w.s $f4, $f2 /* 9844 8002E444 44042000 */ mfc1 $a0, $f4 -/* 9848 8002E448 00000000 */ nop +/* 9848 8002E448 00000000 */ nop /* 984C 8002E44C A46400A2 */ sh $a0, 0xa2($v1) /* 9850 8002E450 4600010D */ trunc.w.s $f4, $f0 /* 9854 8002E454 44022000 */ mfc1 $v0, $f4 -/* 9858 8002E458 00000000 */ nop +/* 9858 8002E458 00000000 */ nop /* 985C 8002E45C A46200B2 */ sh $v0, 0xb2($v1) /* 9860 8002E460 00E0102D */ daddu $v0, $a3, $zero /* 9864 8002E464 00021400 */ sll $v0, $v0, 0x10 diff --git a/asm/nonmatchings/code_8560/update_cameras.s b/asm/nonmatchings/code_8560/update_cameras.s index 19cbbd72f1..79e8e6d0be 100644 --- a/asm/nonmatchings/code_8560/update_cameras.s +++ b/asm/nonmatchings/code_8560/update_cameras.s @@ -36,36 +36,43 @@ glabel update_cameras /* 8878 8002D478 2C620007 */ sltiu $v0, $v1, 7 /* 887C 8002D47C 1040001E */ beqz $v0, .L8002D4F8 /* 8880 8002D480 00031080 */ sll $v0, $v1, 2 -/* 8884 8002D484 3C01800A */ lui $at, %hi(D_800981E0) +/* 8884 8002D484 3C01800A */ lui $at, %hi(jtbl_800981E0_735E0) /* 8888 8002D488 00220821 */ addu $at, $at, $v0 -/* 888C 8002D48C 8C2281E0 */ lw $v0, %lo(D_800981E0)($at) +/* 888C 8002D48C 8C2281E0 */ lw $v0, %lo(jtbl_800981E0_735E0)($at) /* 8890 8002D490 00400008 */ jr $v0 -/* 8894 8002D494 00000000 */ nop +/* 8894 8002D494 00000000 */ nop +glabel L8002D498_8898 /* 8898 8002D498 0C00C525 */ jal do_camera_type_3 /* 889C 8002D49C 0200202D */ daddu $a0, $s0, $zero /* 88A0 8002D4A0 0800B540 */ j .L8002D500 -/* 88A4 8002D4A4 00000000 */ nop +/* 88A4 8002D4A4 00000000 */ nop +glabel L8002D4A8_88A8 /* 88A8 8002D4A8 0C00BE14 */ jal do_camera_type_0 /* 88AC 8002D4AC 0200202D */ daddu $a0, $s0, $zero /* 88B0 8002D4B0 0800B540 */ j .L8002D500 -/* 88B4 8002D4B4 00000000 */ nop +/* 88B4 8002D4B4 00000000 */ nop +glabel L8002D4B8_88B8 /* 88B8 8002D4B8 0C00BCA4 */ jal do_camera_type_1 /* 88BC 8002D4BC 0200202D */ daddu $a0, $s0, $zero /* 88C0 8002D4C0 0800B540 */ j .L8002D500 -/* 88C4 8002D4C4 00000000 */ nop +/* 88C4 8002D4C4 00000000 */ nop +glabel L8002D4C8_88C8 /* 88C8 8002D4C8 0C00BB3E */ jal do_camera_type_2 /* 88CC 8002D4CC 0200202D */ daddu $a0, $s0, $zero /* 88D0 8002D4D0 0800B540 */ j .L8002D500 -/* 88D4 8002D4D4 00000000 */ nop +/* 88D4 8002D4D4 00000000 */ nop +glabel L8002D4D8_88D8 /* 88D8 8002D4D8 0C00BA44 */ jal do_camera_type_4 /* 88DC 8002D4DC 0200202D */ daddu $a0, $s0, $zero /* 88E0 8002D4E0 0800B540 */ j .L8002D500 -/* 88E4 8002D4E4 00000000 */ nop +/* 88E4 8002D4E4 00000000 */ nop +glabel L8002D4E8_88E8 /* 88E8 8002D4E8 0C00C000 */ jal do_camera_type_5 /* 88EC 8002D4EC 0200202D */ daddu $a0, $s0, $zero /* 88F0 8002D4F0 0800B540 */ j .L8002D500 -/* 88F4 8002D4F4 00000000 */ nop +/* 88F4 8002D4F4 00000000 */ nop .L8002D4F8: +glabel L8002D4F8_88F8 /* 88F8 8002D4F8 0C00BE64 */ jal do_camera_type_6 /* 88FC 8002D4FC 0200202D */ daddu $a0, $s0, $zero .L8002D500: @@ -103,20 +110,20 @@ glabel update_cameras /* 8978 8002D578 86020012 */ lh $v0, 0x12($s0) /* 897C 8002D57C 8603000C */ lh $v1, 0xc($s0) /* 8980 8002D580 44820000 */ mtc1 $v0, $f0 -/* 8984 8002D584 00000000 */ nop +/* 8984 8002D584 00000000 */ nop /* 8988 8002D588 46800020 */ cvt.s.w $f0, $f0 /* 898C 8002D58C E7A00010 */ swc1 $f0, 0x10($sp) /* 8990 8002D590 86020014 */ lh $v0, 0x14($s0) /* 8994 8002D594 44871000 */ mtc1 $a3, $f2 -/* 8998 8002D598 00000000 */ nop +/* 8998 8002D598 00000000 */ nop /* 899C 8002D59C 468010A0 */ cvt.s.w $f2, $f2 /* 89A0 8002D5A0 E7B60018 */ swc1 $f22, 0x18($sp) /* 89A4 8002D5A4 44820000 */ mtc1 $v0, $f0 -/* 89A8 8002D5A8 00000000 */ nop +/* 89A8 8002D5A8 00000000 */ nop /* 89AC 8002D5AC 46800020 */ cvt.s.w $f0, $f0 /* 89B0 8002D5B0 E7A00014 */ swc1 $f0, 0x14($sp) /* 89B4 8002D5B4 44830000 */ mtc1 $v1, $f0 -/* 89B8 8002D5B8 00000000 */ nop +/* 89B8 8002D5B8 00000000 */ nop /* 89BC 8002D5BC 46800020 */ cvt.s.w $f0, $f0 /* 89C0 8002D5C0 46001083 */ div.s $f2, $f2, $f0 /* 89C4 8002D5C4 8E060018 */ lw $a2, 0x18($s0) @@ -148,23 +155,23 @@ glabel update_cameras .L8002D624: /* 8A24 8002D624 8602000A */ lh $v0, 0xa($s0) /* 8A28 8002D628 44822000 */ mtc1 $v0, $f4 -/* 8A2C 8002D62C 00000000 */ nop +/* 8A2C 8002D62C 00000000 */ nop /* 8A30 8002D630 46802120 */ cvt.s.w $f4, $f4 /* 8A34 8002D634 46002187 */ neg.s $f6, $f4 /* 8A38 8002D638 460031A1 */ cvt.d.s $f6, $f6 /* 8A3C 8002D63C 46343182 */ mul.d $f6, $f6, $f20 -/* 8A40 8002D640 00000000 */ nop +/* 8A40 8002D640 00000000 */ nop /* 8A44 8002D644 46002121 */ cvt.d.s $f4, $f4 /* 8A48 8002D648 46342102 */ mul.d $f4, $f4, $f20 -/* 8A4C 8002D64C 00000000 */ nop +/* 8A4C 8002D64C 00000000 */ nop /* 8A50 8002D650 8602000C */ lh $v0, 0xc($s0) /* 8A54 8002D654 44820000 */ mtc1 $v0, $f0 -/* 8A58 8002D658 00000000 */ nop +/* 8A58 8002D658 00000000 */ nop /* 8A5C 8002D65C 46800020 */ cvt.s.w $f0, $f0 /* 8A60 8002D660 46000087 */ neg.s $f2, $f0 /* 8A64 8002D664 460010A1 */ cvt.d.s $f2, $f2 /* 8A68 8002D668 46341082 */ mul.d $f2, $f2, $f20 -/* 8A6C 8002D66C 00000000 */ nop +/* 8A6C 8002D66C 00000000 */ nop /* 8A70 8002D670 3C01C47A */ lui $at, 0xc47a /* 8A74 8002D674 44814000 */ mtc1 $at, $f8 /* 8A78 8002D678 3C01447A */ lui $at, 0x447a @@ -173,7 +180,7 @@ glabel update_cameras /* 8A84 8002D684 E7A80014 */ swc1 $f8, 0x14($sp) /* 8A88 8002D688 46000021 */ cvt.d.s $f0, $f0 /* 8A8C 8002D68C 46340002 */ mul.d $f0, $f0, $f20 -/* 8A90 8002D690 00000000 */ nop +/* 8A90 8002D690 00000000 */ nop /* 8A94 8002D694 E7AA0018 */ swc1 $f10, 0x18($sp) /* 8A98 8002D698 462031A0 */ cvt.s.d $f6, $f6 /* 8A9C 8002D69C 46202120 */ cvt.s.d $f4, $f4 diff --git a/asm/nonmatchings/code_8a160_len_700/func_800F0CB0.s b/asm/nonmatchings/code_8a160_len_700/func_800F0CB0.s index 036acc90d2..a36546e58a 100644 --- a/asm/nonmatchings/code_8a160_len_700/func_800F0CB0.s +++ b/asm/nonmatchings/code_8a160_len_700/func_800F0CB0.s @@ -30,15 +30,15 @@ glabel func_800F0CB0 /* 8A1C4 800F0D14 44801000 */ mtc1 $zero, $f2 .L800F0D18: /* 8A1C8 800F0D18 44830000 */ mtc1 $v1, $f0 -/* 8A1CC 800F0D1C 00000000 */ nop +/* 8A1CC 800F0D1C 00000000 */ nop /* 8A1D0 800F0D20 46800020 */ cvt.s.w $f0, $f0 /* 8A1D4 800F0D24 46000007 */ neg.s $f0, $f0 /* 8A1D8 800F0D28 46020002 */ mul.s $f0, $f0, $f2 -/* 8A1DC 800F0D2C 00000000 */ nop +/* 8A1DC 800F0D2C 00000000 */ nop /* 8A1E0 800F0D30 24630001 */ addiu $v1, $v1, 1 /* 8A1E4 800F0D34 4600018D */ trunc.w.s $f6, $f0 /* 8A1E8 800F0D38 44023000 */ mfc1 $v0, $f6 -/* 8A1EC 800F0D3C 00000000 */ nop +/* 8A1EC 800F0D3C 00000000 */ nop /* 8A1F0 800F0D40 2442FFFF */ addiu $v0, $v0, -1 /* 8A1F4 800F0D44 A0A20007 */ sb $v0, 7($a1) /* 8A1F8 800F0D48 0066102A */ slt $v0, $v1, $a2 @@ -46,4 +46,4 @@ glabel func_800F0CB0 /* 8A200 800F0D50 24A5001C */ addiu $a1, $a1, 0x1c .L800F0D54: /* 8A204 800F0D54 03E00008 */ jr $ra -/* 8A208 800F0D58 00000000 */ nop +/* 8A208 800F0D58 00000000 */ nop diff --git a/asm/nonmatchings/code_8a160_len_700/func_800F0D80.s b/asm/nonmatchings/code_8a160_len_700/func_800F0D80.s index f88b2018fa..606900c153 100644 --- a/asm/nonmatchings/code_8a160_len_700/func_800F0D80.s +++ b/asm/nonmatchings/code_8a160_len_700/func_800F0D80.s @@ -75,19 +75,19 @@ glabel func_800F0D80 /* 8A334 800F0E84 023E1821 */ addu $v1, $s1, $fp /* 8A338 800F0E88 80620000 */ lb $v0, ($v1) /* 8A33C 800F0E8C 44821000 */ mtc1 $v0, $f2 -/* 8A340 800F0E90 00000000 */ nop +/* 8A340 800F0E90 00000000 */ nop /* 8A344 800F0E94 468010A0 */ cvt.s.w $f2, $f2 /* 8A348 800F0E98 460010A1 */ cvt.d.s $f2, $f2 /* 8A34C 800F0E9C 46361082 */ mul.d $f2, $f2, $f22 -/* 8A350 800F0EA0 00000000 */ nop +/* 8A350 800F0EA0 00000000 */ nop /* 8A354 800F0EA4 80620001 */ lb $v0, 1($v1) /* 8A358 800F0EA8 44820000 */ mtc1 $v0, $f0 -/* 8A35C 800F0EAC 00000000 */ nop +/* 8A35C 800F0EAC 00000000 */ nop /* 8A360 800F0EB0 46800020 */ cvt.s.w $f0, $f0 /* 8A364 800F0EB4 46000007 */ neg.s $f0, $f0 /* 8A368 800F0EB8 46000021 */ cvt.d.s $f0, $f0 /* 8A36C 800F0EBC 46360002 */ mul.d $f0, $f0, $f22 -/* 8A370 800F0EC0 00000000 */ nop +/* 8A370 800F0EC0 00000000 */ nop /* 8A374 800F0EC4 3C013F80 */ lui $at, 0x3f80 /* 8A378 800F0EC8 44812000 */ mtc1 $at, $f4 /* 8A37C 800F0ECC 2404007F */ addiu $a0, $zero, 0x7f @@ -125,11 +125,11 @@ glabel func_800F0D80 /* 8A3F8 800F0F48 C600FFF8 */ lwc1 $f0, -8($s0) /* 8A3FC 800F0F4C 46000021 */ cvt.d.s $f0, $f0 /* 8A400 800F0F50 46340002 */ mul.d $f0, $f0, $f20 -/* 8A404 800F0F54 00000000 */ nop +/* 8A404 800F0F54 00000000 */ nop /* 8A408 800F0F58 C602FFFC */ lwc1 $f2, -4($s0) /* 8A40C 800F0F5C 460010A1 */ cvt.d.s $f2, $f2 /* 8A410 800F0F60 46341082 */ mul.d $f2, $f2, $f20 -/* 8A414 800F0F64 00000000 */ nop +/* 8A414 800F0F64 00000000 */ nop /* 8A418 800F0F68 C608FFF0 */ lwc1 $f8, -0x10($s0) /* 8A41C 800F0F6C C604FFF8 */ lwc1 $f4, -8($s0) /* 8A420 800F0F70 C606FFF4 */ lwc1 $f6, -0xc($s0) @@ -148,11 +148,11 @@ glabel func_800F0D80 /* 8A454 800F0FA4 3C018011 */ lui $at, %hi(D_8010C320) /* 8A458 800F0FA8 D422C320 */ ldc1 $f2, %lo(D_8010C320)($at) /* 8A45C 800F0FAC 44820000 */ mtc1 $v0, $f0 -/* 8A460 800F0FB0 00000000 */ nop +/* 8A460 800F0FB0 00000000 */ nop /* 8A464 800F0FB4 46800020 */ cvt.s.w $f0, $f0 /* 8A468 800F0FB8 46000021 */ cvt.d.s $f0, $f0 /* 8A46C 800F0FBC 46220002 */ mul.d $f0, $f0, $f2 -/* 8A470 800F0FC0 00000000 */ nop +/* 8A470 800F0FC0 00000000 */ nop /* 8A474 800F0FC4 46200020 */ cvt.s.d $f0, $f0 /* 8A478 800F0FC8 E6000000 */ swc1 $f0, ($s0) /* 8A47C 800F0FCC 26310002 */ addiu $s1, $s1, 2 diff --git a/asm/nonmatchings/code_8a160_len_700/func_800F102C.s b/asm/nonmatchings/code_8a160_len_700/func_800F102C.s index 2a317953ef..068038ff45 100644 --- a/asm/nonmatchings/code_8a160_len_700/func_800F102C.s +++ b/asm/nonmatchings/code_8a160_len_700/func_800F102C.s @@ -134,12 +134,12 @@ glabel func_800F102C /* 8A6D8 800F1228 4406B000 */ mfc1 $a2, $f22 /* 8A6DC 800F122C 94430134 */ lhu $v1, 0x134($v0) /* 8A6E0 800F1230 46140002 */ mul.s $f0, $f0, $f20 -/* 8A6E4 800F1234 00000000 */ nop +/* 8A6E4 800F1234 00000000 */ nop /* 8A6E8 800F1238 00031080 */ sll $v0, $v1, 2 /* 8A6EC 800F123C 00431021 */ addu $v0, $v0, $v1 /* 8A6F0 800F1240 00021040 */ sll $v0, $v0, 1 /* 8A6F4 800F1244 44823000 */ mtc1 $v0, $f6 -/* 8A6F8 800F1248 00000000 */ nop +/* 8A6F8 800F1248 00000000 */ nop /* 8A6FC 800F124C 468031A0 */ cvt.s.w $f6, $f6 /* 8A700 800F1250 44073000 */ mfc1 $a3, $f6 /* 8A704 800F1254 E7A00010 */ swc1 $f0, 0x10($sp) @@ -228,6 +228,6 @@ glabel func_800F102C /* 8A848 800F1398 D7B400C8 */ ldc1 $f20, 0xc8($sp) /* 8A84C 800F139C 03E00008 */ jr $ra /* 8A850 800F13A0 27BD00D8 */ addiu $sp, $sp, 0xd8 -/* 8A854 800F13A4 00000000 */ nop -/* 8A858 800F13A8 00000000 */ nop -/* 8A85C 800F13AC 00000000 */ nop +/* 8A854 800F13A4 00000000 */ nop +/* 8A858 800F13A8 00000000 */ nop +/* 8A85C 800F13AC 00000000 */ nop diff --git a/asm/nonmatchings/code_8a860_len_3f30/draw_submenu_title.s b/asm/nonmatchings/code_8a860_len_3f30/draw_submenu_title.s index 10d955e8a9..963029b726 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/draw_submenu_title.s +++ b/asm/nonmatchings/code_8a860_len_3f30/draw_submenu_title.s @@ -20,7 +20,7 @@ glabel draw_submenu_title /* 8DB34 800F4684 00220821 */ addu $at, $at, $v0 /* 8DB38 800F4688 8C22C8A8 */ lw $v0, %lo(D_8010C8A8)($at) /* 8DB3C 800F468C 00400008 */ jr $v0 -/* 8DB40 800F4690 00000000 */ nop +/* 8DB40 800F4690 00000000 */ nop /* 8DB44 800F4694 3C138011 */ lui $s3, %hi(D_8010D69C) /* 8DB48 800F4698 2673D69C */ addiu $s3, $s3, %lo(D_8010D69C) /* 8DB4C 800F469C 8E620000 */ lw $v0, ($s3) @@ -33,12 +33,12 @@ glabel draw_submenu_title /* 8DB68 800F46B8 10600007 */ beqz $v1, .L800F46D8 /* 8DB6C 800F46BC 3C04001D */ lui $a0, 0x1d /* 8DB70 800F46C0 0803D235 */ j .L800F48D4 -/* 8DB74 800F46C4 00000000 */ nop +/* 8DB74 800F46C4 00000000 */ nop .L800F46C8: /* 8DB78 800F46C8 10620025 */ beq $v1, $v0, .L800F4760 /* 8DB7C 800F46CC 3C04001D */ lui $a0, 0x1d /* 8DB80 800F46D0 0803D235 */ j .L800F48D4 -/* 8DB84 800F46D4 00000000 */ nop +/* 8DB84 800F46D4 00000000 */ nop .L800F46D8: /* 8DB88 800F46D8 3484003F */ ori $a0, $a0, 0x3f /* 8DB8C 800F46DC 2685001A */ addiu $a1, $s4, 0x1a @@ -109,7 +109,7 @@ glabel draw_submenu_title /* 8DC84 800F47D4 0C049DA7 */ jal draw_number /* 8DC88 800F47D8 AFA20014 */ sw $v0, 0x14($sp) /* 8DC8C 800F47DC 0803D235 */ j .L800F48D4 -/* 8DC90 800F47E0 00000000 */ nop +/* 8DC90 800F47E0 00000000 */ nop /* 8DC94 800F47E4 3C04001F */ lui $a0, 0x1f /* 8DC98 800F47E8 34840032 */ ori $a0, $a0, 0x32 /* 8DC9C 800F47EC 2685001B */ addiu $a1, $s4, 0x1b @@ -171,7 +171,7 @@ glabel draw_submenu_title /* 8DD78 800F48C8 AFA20014 */ sw $v0, 0x14($sp) .L800F48CC: /* 8DD7C 800F48CC 0C04993B */ jal draw_string -/* 8DD80 800F48D0 00000000 */ nop +/* 8DD80 800F48D0 00000000 */ nop .L800F48D4: /* 8DD84 800F48D4 8FBF0034 */ lw $ra, 0x34($sp) /* 8DD88 800F48D8 8FB40030 */ lw $s4, 0x30($sp) diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F13B0.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F13B0.s index 10dfd91b32..b3af72c19c 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F13B0.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F13B0.s @@ -19,7 +19,7 @@ glabel func_800F13B0 /* 8A898 800F13E8 00220821 */ addu $at, $at, $v0 /* 8A89C 800F13EC 8C22C330 */ lw $v0, %lo(D_8010C330)($at) /* 8A8A0 800F13F0 00400008 */ jr $v0 -/* 8A8A4 800F13F4 00000000 */ nop +/* 8A8A4 800F13F4 00000000 */ nop /* 8A8A8 800F13F8 2404000E */ addiu $a0, $zero, 0xe /* 8A8AC 800F13FC 3C108014 */ lui $s0, %hi(D_80147574) /* 8A8B0 800F1400 26107574 */ addiu $s0, $s0, %lo(D_80147574) @@ -32,7 +32,7 @@ glabel func_800F13B0 /* 8A8C8 800F1418 3C058014 */ lui $a1, %hi(D_80147574) /* 8A8CC 800F141C 24A57574 */ addiu $a1, $a1, %lo(D_80147574) /* 8A8D0 800F1420 0C051F9F */ jal func_80147E7C -/* 8A8D4 800F1424 00000000 */ nop +/* 8A8D4 800F1424 00000000 */ nop .L800F1428: /* 8A8D8 800F1428 0803C51D */ j .L800F1474 /* 8A8DC 800F142C 24040015 */ addiu $a0, $zero, 0x15 @@ -47,7 +47,7 @@ glabel func_800F13B0 /* 8A8FC 800F144C 00220821 */ addu $at, $at, $v0 /* 8A900 800F1450 8C22C368 */ lw $v0, %lo(D_8010C368)($at) /* 8A904 800F1454 00400008 */ jr $v0 -/* 8A908 800F1458 00000000 */ nop +/* 8A908 800F1458 00000000 */ nop /* 8A90C 800F145C 2404000E */ addiu $a0, $zero, 0xe /* 8A910 800F1460 0C051F9F */ jal func_80147E7C /* 8A914 800F1464 24050002 */ addiu $a1, $zero, 2 @@ -77,7 +77,7 @@ glabel func_800F13B0 /* 8A968 800F14B8 8C430318 */ lw $v1, 0x318($v0) /* 8A96C 800F14BC 24020004 */ addiu $v0, $zero, 4 /* 8A970 800F14C0 14620005 */ bne $v1, $v0, .L800F14D8 -/* 8A974 800F14C4 00000000 */ nop +/* 8A974 800F14C4 00000000 */ nop /* 8A978 800F14C8 3C058014 */ lui $a1, %hi(D_80147574) /* 8A97C 800F14CC 24A57574 */ addiu $a1, $a1, %lo(D_80147574) /* 8A980 800F14D0 0C051F9F */ jal func_80147E7C diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F1538.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F1538.s index e2894dc5ff..073f92e1f3 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F1538.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F1538.s @@ -12,61 +12,61 @@ glabel func_800F1538 /* 8AA04 800F1554 3C048011 */ lui $a0, %hi(D_8010D678) /* 8AA08 800F1558 8C84D678 */ lw $a0, %lo(D_8010D678)($a0) /* 8AA0C 800F155C 0C05123D */ jal free_icon -/* 8AA10 800F1560 00000000 */ nop +/* 8AA10 800F1560 00000000 */ nop /* 8AA14 800F1564 3C048011 */ lui $a0, %hi(D_8010D66C) /* 8AA18 800F1568 8C84D66C */ lw $a0, %lo(D_8010D66C)($a0) /* 8AA1C 800F156C 0C05123D */ jal free_icon -/* 8AA20 800F1570 00000000 */ nop +/* 8AA20 800F1570 00000000 */ nop /* 8AA24 800F1574 3C048011 */ lui $a0, %hi(D_8010D670) /* 8AA28 800F1578 8C84D670 */ lw $a0, %lo(D_8010D670)($a0) /* 8AA2C 800F157C 0C05123D */ jal free_icon -/* 8AA30 800F1580 00000000 */ nop +/* 8AA30 800F1580 00000000 */ nop /* 8AA34 800F1584 3C048011 */ lui $a0, %hi(D_8010D674) /* 8AA38 800F1588 8C84D674 */ lw $a0, %lo(D_8010D674)($a0) /* 8AA3C 800F158C 0C05123D */ jal free_icon -/* 8AA40 800F1590 00000000 */ nop +/* 8AA40 800F1590 00000000 */ nop /* 8AA44 800F1594 3C108011 */ lui $s0, %hi(D_8010D69C) /* 8AA48 800F1598 2610D69C */ addiu $s0, $s0, %lo(D_8010D69C) /* 8AA4C 800F159C 8E020000 */ lw $v0, ($s0) /* 8AA50 800F15A0 8C430318 */ lw $v1, 0x318($v0) /* 8AA54 800F15A4 24020003 */ addiu $v0, $zero, 3 /* 8AA58 800F15A8 14620009 */ bne $v1, $v0, .L800F15D0 -/* 8AA5C 800F15AC 00000000 */ nop +/* 8AA5C 800F15AC 00000000 */ nop /* 8AA60 800F15B0 3C048011 */ lui $a0, %hi(D_8010D660) /* 8AA64 800F15B4 8C84D660 */ lw $a0, %lo(D_8010D660)($a0) /* 8AA68 800F15B8 0C05123D */ jal free_icon -/* 8AA6C 800F15BC 00000000 */ nop +/* 8AA6C 800F15BC 00000000 */ nop /* 8AA70 800F15C0 3C048011 */ lui $a0, %hi(D_8010D664) /* 8AA74 800F15C4 8C84D664 */ lw $a0, %lo(D_8010D664)($a0) /* 8AA78 800F15C8 0C05123D */ jal free_icon -/* 8AA7C 800F15CC 00000000 */ nop +/* 8AA7C 800F15CC 00000000 */ nop .L800F15D0: /* 8AA80 800F15D0 8E020000 */ lw $v0, ($s0) /* 8AA84 800F15D4 8C420318 */ lw $v0, 0x318($v0) /* 8AA88 800F15D8 24110004 */ addiu $s1, $zero, 4 /* 8AA8C 800F15DC 14510009 */ bne $v0, $s1, .L800F1604 -/* 8AA90 800F15E0 00000000 */ nop +/* 8AA90 800F15E0 00000000 */ nop /* 8AA94 800F15E4 3C048011 */ lui $a0, %hi(D_8010D660) /* 8AA98 800F15E8 8C84D660 */ lw $a0, %lo(D_8010D660)($a0) /* 8AA9C 800F15EC 0C05123D */ jal free_icon -/* 8AAA0 800F15F0 00000000 */ nop +/* 8AAA0 800F15F0 00000000 */ nop /* 8AAA4 800F15F4 3C048011 */ lui $a0, %hi(D_8010D664) /* 8AAA8 800F15F8 8C84D664 */ lw $a0, %lo(D_8010D664)($a0) /* 8AAAC 800F15FC 0C05123D */ jal free_icon -/* 8AAB0 800F1600 00000000 */ nop +/* 8AAB0 800F1600 00000000 */ nop .L800F1604: /* 8AAB4 800F1604 8E020000 */ lw $v0, ($s0) /* 8AAB8 800F1608 8C430318 */ lw $v1, 0x318($v0) /* 8AABC 800F160C 24020001 */ addiu $v0, $zero, 1 /* 8AAC0 800F1610 10620003 */ beq $v1, $v0, .L800F1620 -/* 8AAC4 800F1614 00000000 */ nop +/* 8AAC4 800F1614 00000000 */ nop /* 8AAC8 800F1618 14710005 */ bne $v1, $s1, .L800F1630 -/* 8AACC 800F161C 00000000 */ nop +/* 8AACC 800F161C 00000000 */ nop .L800F1620: /* 8AAD0 800F1620 3C048011 */ lui $a0, %hi(D_8010D668) /* 8AAD4 800F1624 8C84D668 */ lw $a0, %lo(D_8010D668)($a0) /* 8AAD8 800F1628 0C05123D */ jal free_icon -/* 8AADC 800F162C 00000000 */ nop +/* 8AADC 800F162C 00000000 */ nop .L800F1630: /* 8AAE0 800F1630 3C108011 */ lui $s0, %hi(D_8010D69C) /* 8AAE4 800F1634 2610D69C */ addiu $s0, $s0, %lo(D_8010D69C) @@ -74,11 +74,11 @@ glabel func_800F1538 /* 8AAEC 800F163C 8C430318 */ lw $v1, 0x318($v0) /* 8AAF0 800F1640 24020005 */ addiu $v0, $zero, 5 /* 8AAF4 800F1644 14620005 */ bne $v1, $v0, .L800F165C -/* 8AAF8 800F1648 00000000 */ nop +/* 8AAF8 800F1648 00000000 */ nop /* 8AAFC 800F164C 3C048011 */ lui $a0, %hi(D_8010D660) /* 8AB00 800F1650 8C84D660 */ lw $a0, %lo(D_8010D660)($a0) /* 8AB04 800F1654 0C05123D */ jal free_icon -/* 8AB08 800F1658 00000000 */ nop +/* 8AB08 800F1658 00000000 */ nop .L800F165C: /* 8AB0C 800F165C 8E020000 */ lw $v0, ($s0) /* 8AB10 800F1660 8C430318 */ lw $v1, 0x318($v0) @@ -86,22 +86,22 @@ glabel func_800F1538 /* 8AB18 800F1668 14400003 */ bnez $v0, .L800F1678 /* 8AB1C 800F166C 2402000C */ addiu $v0, $zero, 0xc /* 8AB20 800F1670 1462000E */ bne $v1, $v0, .L800F16AC -/* 8AB24 800F1674 00000000 */ nop +/* 8AB24 800F1674 00000000 */ nop .L800F1678: /* 8AB28 800F1678 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 8AB2C 800F167C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 8AB30 800F1680 80420070 */ lb $v0, 0x70($v0) /* 8AB34 800F1684 14400009 */ bnez $v0, .L800F16AC -/* 8AB38 800F1688 00000000 */ nop +/* 8AB38 800F1688 00000000 */ nop /* 8AB3C 800F168C 3C028011 */ lui $v0, %hi(D_8010D69A) /* 8AB40 800F1690 8042D69A */ lb $v0, %lo(D_8010D69A)($v0) /* 8AB44 800F1694 14400003 */ bnez $v0, .L800F16A4 -/* 8AB48 800F1698 00000000 */ nop +/* 8AB48 800F1698 00000000 */ nop /* 8AB4C 800F169C 0C03A631 */ jal func_800E98C4 -/* 8AB50 800F16A0 00000000 */ nop +/* 8AB50 800F16A0 00000000 */ nop .L800F16A4: /* 8AB54 800F16A4 0C03A5EE */ jal func_800E97B8 -/* 8AB58 800F16A8 00000000 */ nop +/* 8AB58 800F16A8 00000000 */ nop .L800F16AC: /* 8AB5C 800F16AC 8FBF0018 */ lw $ra, 0x18($sp) /* 8AB60 800F16B0 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F16CC.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F16CC.s index 2b29ef6e28..ec03f8ba51 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F16CC.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F16CC.s @@ -20,7 +20,7 @@ glabel func_800F16CC /* 8ABB8 800F1708 00220821 */ addu $at, $at, $v0 /* 8ABBC 800F170C 8C22C3A0 */ lw $v0, %lo(D_8010C3A0)($at) /* 8ABC0 800F1710 00400008 */ jr $v0 -/* 8ABC4 800F1714 00000000 */ nop +/* 8ABC4 800F1714 00000000 */ nop /* 8ABC8 800F1718 2404000E */ addiu $a0, $zero, 0xe /* 8ABCC 800F171C 3C108014 */ lui $s0, %hi(D_80147474) /* 8ABD0 800F1720 26107474 */ addiu $s0, $s0, %lo(D_80147474) @@ -36,7 +36,7 @@ glabel func_800F16CC /* 8ABF8 800F1748 24040002 */ addiu $a0, $zero, 2 .L800F174C: /* 8ABFC 800F174C 0C05272D */ jal play_sound -/* 8AC00 800F1750 00000000 */ nop +/* 8AC00 800F1750 00000000 */ nop /* 8AC04 800F1754 24040013 */ addiu $a0, $zero, 0x13 /* 8AC08 800F1758 0C051F9F */ jal func_80147E7C /* 8AC0C 800F175C 0200282D */ daddu $a1, $s0, $zero @@ -54,7 +54,7 @@ glabel func_800F16CC /* 8AC34 800F1784 3C058014 */ lui $a1, %hi(D_80147474) /* 8AC38 800F1788 24A57474 */ addiu $a1, $a1, %lo(D_80147474) /* 8AC3C 800F178C 0803C5FC */ j .L800F17F0 -/* 8AC40 800F1790 00000000 */ nop +/* 8AC40 800F1790 00000000 */ nop .L800F1794: /* 8AC44 800F1794 3C028011 */ lui $v0, %hi(D_8010D69C) /* 8AC48 800F1798 8C42D69C */ lw $v0, %lo(D_8010D69C)($v0) @@ -66,7 +66,7 @@ glabel func_800F16CC /* 8AC60 800F17B0 00220821 */ addu $at, $at, $v0 /* 8AC64 800F17B4 8C22C3D8 */ lw $v0, %lo(D_8010C3D8)($at) /* 8AC68 800F17B8 00400008 */ jr $v0 -/* 8AC6C 800F17BC 00000000 */ nop +/* 8AC6C 800F17BC 00000000 */ nop /* 8AC70 800F17C0 2404000E */ addiu $a0, $zero, 0xe /* 8AC74 800F17C4 0C051F9F */ jal func_80147E7C /* 8AC78 800F17C8 24050001 */ addiu $a1, $zero, 1 @@ -82,7 +82,7 @@ glabel func_800F16CC /* 8AC9C 800F17EC 24050001 */ addiu $a1, $zero, 1 .L800F17F0: /* 8ACA0 800F17F0 0C051F9F */ jal func_80147E7C -/* 8ACA4 800F17F4 00000000 */ nop +/* 8ACA4 800F17F4 00000000 */ nop .L800F17F8: /* 8ACA8 800F17F8 3C118011 */ lui $s1, %hi(D_8010D69C) /* 8ACAC 800F17FC 2631D69C */ addiu $s1, $s1, %lo(D_8010D69C) @@ -103,7 +103,7 @@ glabel func_800F16CC /* 8ACE4 800F1834 8C420318 */ lw $v0, 0x318($v0) /* 8ACE8 800F1838 24100004 */ addiu $s0, $zero, 4 /* 8ACEC 800F183C 14500005 */ bne $v0, $s0, .L800F1854 -/* 8ACF0 800F1840 00000000 */ nop +/* 8ACF0 800F1840 00000000 */ nop /* 8ACF4 800F1844 3C058014 */ lui $a1, %hi(D_80147474) /* 8ACF8 800F1848 24A57474 */ addiu $a1, $a1, %lo(D_80147474) /* 8ACFC 800F184C 0C051F9F */ jal func_80147E7C @@ -185,9 +185,9 @@ glabel func_800F16CC /* 8AE1C 800F196C 8C430318 */ lw $v1, 0x318($v0) /* 8AE20 800F1970 24020001 */ addiu $v0, $zero, 1 /* 8AE24 800F1974 10620003 */ beq $v1, $v0, .L800F1984 -/* 8AE28 800F1978 00000000 */ nop +/* 8AE28 800F1978 00000000 */ nop /* 8AE2C 800F197C 14700007 */ bne $v1, $s0, .L800F199C -/* 8AE30 800F1980 00000000 */ nop +/* 8AE30 800F1980 00000000 */ nop .L800F1984: /* 8AE34 800F1984 3C048011 */ lui $a0, %hi(D_8010D668) /* 8AE38 800F1988 8C84D668 */ lw $a0, %lo(D_8010D668)($a0) @@ -213,7 +213,7 @@ glabel func_800F16CC /* 8AE80 800F19D0 3C058010 */ lui $a1, %hi(D_80104A28) /* 8AE84 800F19D4 24A54A28 */ addiu $a1, $a1, %lo(D_80104A28) /* 8AE88 800F19D8 0C0511FF */ jal set_menu_icon_script -/* 8AE8C 800F19DC 00000000 */ nop +/* 8AE8C 800F19DC 00000000 */ nop /* 8AE90 800F19E0 8FBF001C */ lw $ra, 0x1c($sp) /* 8AE94 800F19E4 8FB20018 */ lw $s2, 0x18($sp) /* 8AE98 800F19E8 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s index 0a10c50fe1..a524450884 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s @@ -18,7 +18,7 @@ glabel func_800F1A10 /* 8AEF4 800F1A44 00220821 */ addu $at, $at, $v0 /* 8AEF8 800F1A48 8C22C410 */ lw $v0, %lo(D_8010C410)($at) /* 8AEFC 800F1A4C 00400008 */ jr $v0 -/* 8AF00 800F1A50 00000000 */ nop +/* 8AF00 800F1A50 00000000 */ nop /* 8AF04 800F1A54 3C048011 */ lui $a0, %hi(D_8010D67C) /* 8AF08 800F1A58 2484D67C */ addiu $a0, $a0, %lo(D_8010D67C) /* 8AF0C 800F1A5C 24030014 */ addiu $v1, $zero, 0x14 @@ -47,7 +47,7 @@ glabel func_800F1A10 /* 8AF68 800F1AB8 3C018011 */ lui $at, %hi(D_8010D68A) /* 8AF6C 800F1ABC A422D68A */ sh $v0, %lo(D_8010D68A)($at) /* 8AF70 800F1AC0 1060000A */ beqz $v1, .L800F1AEC -/* 8AF74 800F1AC4 00000000 */ nop +/* 8AF74 800F1AC4 00000000 */ nop /* 8AF78 800F1AC8 3C028011 */ lui $v0, %hi(D_8010D69C) /* 8AF7C 800F1ACC 8C42D69C */ lw $v0, %lo(D_8010D69C)($v0) /* 8AF80 800F1AD0 8C420318 */ lw $v0, 0x318($v0) @@ -70,7 +70,7 @@ glabel func_800F1A10 /* 8AFBC 800F1B0C 3C018011 */ lui $at, %hi(D_8010D68C) /* 8AFC0 800F1B10 A420D68C */ sh $zero, %lo(D_8010D68C)($at) /* 8AFC4 800F1B14 0C050529 */ jal create_icon -/* 8AFC8 800F1B18 00000000 */ nop +/* 8AFC8 800F1B18 00000000 */ nop /* 8AFCC 800F1B1C 0040802D */ daddu $s0, $v0, $zero /* 8AFD0 800F1B20 0200202D */ daddu $a0, $s0, $zero /* 8AFD4 800F1B24 3C018011 */ lui $at, %hi(D_8010D65C) @@ -88,7 +88,7 @@ glabel func_800F1A10 /* 8B004 800F1B54 8C430318 */ lw $v1, 0x318($v0) /* 8B008 800F1B58 24020002 */ addiu $v0, $zero, 2 /* 8B00C 800F1B5C 10620004 */ beq $v1, $v0, .L800F1B70 -/* 8B010 800F1B60 00000000 */ nop +/* 8B010 800F1B60 00000000 */ nop /* 8B014 800F1B64 0200202D */ daddu $a0, $s0, $zero /* 8B018 800F1B68 0C051280 */ jal set_icon_flags /* 8B01C 800F1B6C 0040282D */ daddu $a1, $v0, $zero @@ -110,7 +110,7 @@ glabel func_800F1A10 /* 8B058 800F1BA8 3C048010 */ lui $a0, %hi(D_80104A28) /* 8B05C 800F1BAC 24844A28 */ addiu $a0, $a0, %lo(D_80104A28) /* 8B060 800F1BB0 0C050529 */ jal create_icon -/* 8B064 800F1BB4 00000000 */ nop +/* 8B064 800F1BB4 00000000 */ nop /* 8B068 800F1BB8 0040802D */ daddu $s0, $v0, $zero /* 8B06C 800F1BBC 0200202D */ daddu $a0, $s0, $zero /* 8B070 800F1BC0 3C052000 */ lui $a1, 0x2000 @@ -121,7 +121,7 @@ glabel func_800F1A10 /* 8B084 800F1BD4 3C048010 */ lui $a0, %hi(D_801077E4) /* 8B088 800F1BD8 248477E4 */ addiu $a0, $a0, %lo(D_801077E4) /* 8B08C 800F1BDC 0C050529 */ jal create_icon -/* 8B090 800F1BE0 00000000 */ nop +/* 8B090 800F1BE0 00000000 */ nop /* 8B094 800F1BE4 0040802D */ daddu $s0, $v0, $zero /* 8B098 800F1BE8 0200202D */ daddu $a0, $s0, $zero /* 8B09C 800F1BEC 3C052000 */ lui $a1, 0x2000 @@ -132,7 +132,7 @@ glabel func_800F1A10 /* 8B0B0 800F1C00 3C048010 */ lui $a0, %hi(D_80107798) /* 8B0B4 800F1C04 24847798 */ addiu $a0, $a0, %lo(D_80107798) /* 8B0B8 800F1C08 0C050529 */ jal create_icon -/* 8B0BC 800F1C0C 00000000 */ nop +/* 8B0BC 800F1C0C 00000000 */ nop /* 8B0C0 800F1C10 0040802D */ daddu $s0, $v0, $zero /* 8B0C4 800F1C14 0200202D */ daddu $a0, $s0, $zero /* 8B0C8 800F1C18 3C052000 */ lui $a1, 0x2000 @@ -144,11 +144,11 @@ glabel func_800F1A10 /* 8B0E0 800F1C30 8C430318 */ lw $v1, 0x318($v0) /* 8B0E4 800F1C34 24020003 */ addiu $v0, $zero, 3 /* 8B0E8 800F1C38 14620010 */ bne $v1, $v0, .L800F1C7C -/* 8B0EC 800F1C3C 00000000 */ nop +/* 8B0EC 800F1C3C 00000000 */ nop /* 8B0F0 800F1C40 3C048010 */ lui $a0, %hi(D_80104C10) /* 8B0F4 800F1C44 24844C10 */ addiu $a0, $a0, %lo(D_80104C10) /* 8B0F8 800F1C48 0C050529 */ jal create_icon -/* 8B0FC 800F1C4C 00000000 */ nop +/* 8B0FC 800F1C4C 00000000 */ nop /* 8B100 800F1C50 3C018011 */ lui $at, %hi(D_8010D660) /* 8B104 800F1C54 AC22D660 */ sw $v0, %lo(D_8010D660)($at) /* 8B108 800F1C58 0040802D */ daddu $s0, $v0, $zero @@ -165,11 +165,11 @@ glabel func_800F1A10 /* 8B130 800F1C80 8C420318 */ lw $v0, 0x318($v0) /* 8B134 800F1C84 24120004 */ addiu $s2, $zero, 4 /* 8B138 800F1C88 14520010 */ bne $v0, $s2, .L800F1CCC -/* 8B13C 800F1C8C 00000000 */ nop +/* 8B13C 800F1C8C 00000000 */ nop /* 8B140 800F1C90 3C048010 */ lui $a0, %hi(D_80104C10) /* 8B144 800F1C94 24844C10 */ addiu $a0, $a0, %lo(D_80104C10) /* 8B148 800F1C98 0C050529 */ jal create_icon -/* 8B14C 800F1C9C 00000000 */ nop +/* 8B14C 800F1C9C 00000000 */ nop /* 8B150 800F1CA0 3C018011 */ lui $at, %hi(D_8010D660) /* 8B154 800F1CA4 AC22D660 */ sw $v0, %lo(D_8010D660)($at) /* 8B158 800F1CA8 0040802D */ daddu $s0, $v0, $zero @@ -186,11 +186,11 @@ glabel func_800F1A10 /* 8B180 800F1CD0 8C430318 */ lw $v1, 0x318($v0) /* 8B184 800F1CD4 24020005 */ addiu $v0, $zero, 5 /* 8B188 800F1CD8 14620010 */ bne $v1, $v0, .L800F1D1C -/* 8B18C 800F1CDC 00000000 */ nop +/* 8B18C 800F1CDC 00000000 */ nop /* 8B190 800F1CE0 3C048011 */ lui $a0, %hi(D_80108558) /* 8B194 800F1CE4 24848558 */ addiu $a0, $a0, %lo(D_80108558) /* 8B198 800F1CE8 0C050529 */ jal create_icon -/* 8B19C 800F1CEC 00000000 */ nop +/* 8B19C 800F1CEC 00000000 */ nop /* 8B1A0 800F1CF0 3C018011 */ lui $at, %hi(D_8010D660) /* 8B1A4 800F1CF4 AC22D660 */ sw $v0, %lo(D_8010D660)($at) /* 8B1A8 800F1CF8 0040802D */ daddu $s0, $v0, $zero @@ -208,11 +208,11 @@ glabel func_800F1A10 /* 8B1D4 800F1D24 2442FFFD */ addiu $v0, $v0, -3 /* 8B1D8 800F1D28 2C420002 */ sltiu $v0, $v0, 2 /* 8B1DC 800F1D2C 10400010 */ beqz $v0, .L800F1D70 -/* 8B1E0 800F1D30 00000000 */ nop +/* 8B1E0 800F1D30 00000000 */ nop /* 8B1E4 800F1D34 3C048011 */ lui $a0, %hi(D_80109270) /* 8B1E8 800F1D38 24849270 */ addiu $a0, $a0, %lo(D_80109270) /* 8B1EC 800F1D3C 0C050529 */ jal create_icon -/* 8B1F0 800F1D40 00000000 */ nop +/* 8B1F0 800F1D40 00000000 */ nop /* 8B1F4 800F1D44 3C018011 */ lui $at, %hi(D_8010D664) /* 8B1F8 800F1D48 AC22D664 */ sw $v0, %lo(D_8010D664)($at) /* 8B1FC 800F1D4C 0040802D */ daddu $s0, $v0, $zero @@ -228,7 +228,7 @@ glabel func_800F1A10 /* 8B220 800F1D70 8E220000 */ lw $v0, ($s1) /* 8B224 800F1D74 8C420318 */ lw $v0, 0x318($v0) /* 8B228 800F1D78 10530003 */ beq $v0, $s3, .L800F1D88 -/* 8B22C 800F1D7C 00000000 */ nop +/* 8B22C 800F1D7C 00000000 */ nop /* 8B230 800F1D80 14520010 */ bne $v0, $s2, .L800F1DC4 /* 8B234 800F1D84 2402FF38 */ addiu $v0, $zero, -0xc8 .L800F1D88: @@ -278,7 +278,7 @@ glabel func_800F1A10 /* 8B2DC 800F1E2C 00220821 */ addu $at, $at, $v0 /* 8B2E0 800F1E30 8C22C5D0 */ lw $v0, %lo(D_8010C5D0)($at) /* 8B2E4 800F1E34 00400008 */ jr $v0 -/* 8B2E8 800F1E38 00000000 */ nop +/* 8B2E8 800F1E38 00000000 */ nop /* 8B2EC 800F1E3C 2404000E */ addiu $a0, $zero, 0xe /* 8B2F0 800F1E40 24070091 */ addiu $a3, $zero, 0x91 /* 8B2F4 800F1E44 3C038011 */ lui $v1, %hi(D_8010D656) @@ -655,7 +655,7 @@ glabel func_800F1A10 /* 8B8B4 800F2404 24050001 */ addiu $a1, $zero, 1 .L800F2408: /* 8B8B8 800F2408 0C051F9F */ jal func_80147E7C -/* 8B8BC 800F240C 00000000 */ nop +/* 8B8BC 800F240C 00000000 */ nop .L800F2410: /* 8B8C0 800F2410 3C028011 */ lui $v0, %hi(D_8010D69C) /* 8B8C4 800F2414 8C42D69C */ lw $v0, %lo(D_8010D69C)($v0) @@ -666,7 +666,7 @@ glabel func_800F1A10 /* 8B8D8 800F2428 10620006 */ beq $v1, $v0, .L800F2444 /* 8B8DC 800F242C 24040010 */ addiu $a0, $zero, 0x10 /* 8B8E0 800F2430 0803C91F */ j .L800F247C -/* 8B8E4 800F2434 00000000 */ nop +/* 8B8E4 800F2434 00000000 */ nop .L800F2438: /* 8B8E8 800F2438 24040010 */ addiu $a0, $zero, 0x10 /* 8B8EC 800F243C 0803C912 */ j .L800F2448 @@ -749,7 +749,7 @@ glabel func_800F1A10 /* 8BA0C 800F255C A0E00000 */ sb $zero, ($a3) .L800F2560: /* 8BA10 800F2560 14C0FFE6 */ bnez $a2, .L800F24FC -/* 8BA14 800F2564 00000000 */ nop +/* 8BA14 800F2564 00000000 */ nop /* 8BA18 800F2568 3C038011 */ lui $v1, %hi(D_8010D654) /* 8BA1C 800F256C 9063D654 */ lbu $v1, %lo(D_8010D654)($v1) /* 8BA20 800F2570 3C028011 */ lui $v0, %hi(D_8010D68F) @@ -808,7 +808,7 @@ glabel func_800F1A10 /* 8BAEC 800F263C 00220821 */ addu $at, $at, $v0 /* 8BAF0 800F2640 8C22C608 */ lw $v0, %lo(D_8010C608)($at) /* 8BAF4 800F2644 00400008 */ jr $v0 -/* 8BAF8 800F2648 00000000 */ nop +/* 8BAF8 800F2648 00000000 */ nop /* 8BAFC 800F264C 24040015 */ addiu $a0, $zero, 0x15 /* 8BB00 800F2650 0803C9A8 */ j .L800F26A0 /* 8BB04 800F2654 24070090 */ addiu $a3, $zero, 0x90 @@ -847,7 +847,7 @@ glabel func_800F1A10 /* 8BB7C 800F26CC 3C028011 */ lui $v0, %hi(D_8010D68E) /* 8BB80 800F26D0 8042D68E */ lb $v0, %lo(D_8010D68E)($v0) /* 8BB84 800F26D4 14400018 */ bnez $v0, .L800F2738 -/* 8BB88 800F26D8 00000000 */ nop +/* 8BB88 800F26D8 00000000 */ nop /* 8BB8C 800F26DC 3C028011 */ lui $v0, %hi(D_8010D69C) /* 8BB90 800F26E0 8C42D69C */ lw $v0, %lo(D_8010D69C)($v0) /* 8BB94 800F26E4 8C430318 */ lw $v1, 0x318($v0) @@ -858,7 +858,7 @@ glabel func_800F1A10 /* 8BBA8 800F26F8 00220821 */ addu $at, $at, $v0 /* 8BBAC 800F26FC 8C22C640 */ lw $v0, %lo(D_8010C640)($at) /* 8BBB0 800F2700 00400008 */ jr $v0 -/* 8BBB4 800F2704 00000000 */ nop +/* 8BBB4 800F2704 00000000 */ nop /* 8BBB8 800F2708 2404000E */ addiu $a0, $zero, 0xe /* 8BBBC 800F270C 0C051F9F */ jal func_80147E7C /* 8BBC0 800F2710 24050001 */ addiu $a1, $zero, 1 @@ -882,7 +882,7 @@ glabel func_800F1A10 /* 8BC04 800F2754 00220821 */ addu $at, $at, $v0 /* 8BC08 800F2758 8C22C678 */ lw $v0, %lo(D_8010C678)($at) /* 8BC0C 800F275C 00400008 */ jr $v0 -/* 8BC10 800F2760 00000000 */ nop +/* 8BC10 800F2760 00000000 */ nop /* 8BC14 800F2764 2404000E */ addiu $a0, $zero, 0xe /* 8BC18 800F2768 3C108014 */ lui $s0, %hi(D_80147474) /* 8BC1C 800F276C 26107474 */ addiu $s0, $s0, %lo(D_80147474) @@ -898,7 +898,7 @@ glabel func_800F1A10 /* 8BC44 800F2794 24040002 */ addiu $a0, $zero, 2 .L800F2798: /* 8BC48 800F2798 0C05272D */ jal play_sound -/* 8BC4C 800F279C 00000000 */ nop +/* 8BC4C 800F279C 00000000 */ nop /* 8BC50 800F27A0 24040013 */ addiu $a0, $zero, 0x13 /* 8BC54 800F27A4 0C051F9F */ jal func_80147E7C /* 8BC58 800F27A8 0200282D */ daddu $a1, $s0, $zero @@ -935,7 +935,7 @@ glabel func_800F1A10 /* 8BCC4 800F2814 8C430318 */ lw $v1, 0x318($v0) /* 8BCC8 800F2818 24020004 */ addiu $v0, $zero, 4 /* 8BCCC 800F281C 14620005 */ bne $v1, $v0, .L800F2834 -/* 8BCD0 800F2820 00000000 */ nop +/* 8BCD0 800F2820 00000000 */ nop /* 8BCD4 800F2824 3C058014 */ lui $a1, %hi(D_80147474) /* 8BCD8 800F2828 24A57474 */ addiu $a1, $a1, %lo(D_80147474) /* 8BCDC 800F282C 0C051F9F */ jal func_80147E7C @@ -972,7 +972,7 @@ glabel func_800F1A10 /* 8BD50 800F28A0 AC23D64C */ sw $v1, %lo(D_8010D64C)($at) /* 8BD54 800F28A4 00461024 */ and $v0, $v0, $a2 /* 8BD58 800F28A8 10400008 */ beqz $v0, .L800F28CC -/* 8BD5C 800F28AC 00000000 */ nop +/* 8BD5C 800F28AC 00000000 */ nop /* 8BD60 800F28B0 1C600005 */ bgtz $v1, .L800F28C8 /* 8BD64 800F28B4 2462FFFF */ addiu $v0, $v1, -1 /* 8BD68 800F28B8 8C820010 */ lw $v0, 0x10($a0) @@ -989,7 +989,7 @@ glabel func_800F1A10 /* 8BD8C 800F28DC 34C60010 */ ori $a2, $a2, 0x10 /* 8BD90 800F28E0 00461024 */ and $v0, $v0, $a2 /* 8BD94 800F28E4 10400010 */ beqz $v0, .L800F2928 -/* 8BD98 800F28E8 00000000 */ nop +/* 8BD98 800F28E8 00000000 */ nop /* 8BD9C 800F28EC 3C028011 */ lui $v0, %hi(D_8010D69C) /* 8BDA0 800F28F0 8C42D69C */ lw $v0, %lo(D_8010D69C)($v0) /* 8BDA4 800F28F4 3C048011 */ lui $a0, %hi(D_8010D648) @@ -1011,7 +1011,7 @@ glabel func_800F1A10 /* 8BDDC 800F292C 2610D648 */ addiu $s0, $s0, %lo(D_8010D648) /* 8BDE0 800F2930 8E020000 */ lw $v0, ($s0) /* 8BDE4 800F2934 04410006 */ bgez $v0, .L800F2950 -/* 8BDE8 800F2938 00000000 */ nop +/* 8BDE8 800F2938 00000000 */ nop /* 8BDEC 800F293C 3C028011 */ lui $v0, %hi(D_8010D69C) /* 8BDF0 800F2940 8C42D69C */ lw $v0, %lo(D_8010D69C)($v0) /* 8BDF4 800F2944 8C420324 */ lw $v0, 0x324($v0) @@ -1056,7 +1056,7 @@ glabel func_800F1A10 .L800F29CC: /* 8BE7C 800F29CC 28C20004 */ slti $v0, $a2, 4 /* 8BE80 800F29D0 1440FFF2 */ bnez $v0, .L800F299C -/* 8BE84 800F29D4 00000000 */ nop +/* 8BE84 800F29D4 00000000 */ nop /* 8BE88 800F29D8 0000302D */ daddu $a2, $zero, $zero /* 8BE8C 800F29DC 3C098011 */ lui $t1, %hi(D_8010D655) /* 8BE90 800F29E0 2529D655 */ addiu $t1, $t1, %lo(D_8010D655) @@ -1073,7 +1073,7 @@ glabel func_800F1A10 /* 8BEB8 800F2A08 2442FFFF */ addiu $v0, $v0, -1 /* 8BEBC 800F2A0C 0142102A */ slt $v0, $t2, $v0 /* 8BEC0 800F2A10 14400013 */ bnez $v0, .L800F2A60 -/* 8BEC4 800F2A14 00000000 */ nop +/* 8BEC4 800F2A14 00000000 */ nop /* 8BEC8 800F2A18 90E20000 */ lbu $v0, ($a3) /* 8BECC 800F2A1C 24420001 */ addiu $v0, $v0, 1 /* 8BED0 800F2A20 A0E20000 */ sb $v0, ($a3) @@ -1100,13 +1100,13 @@ glabel func_800F1A10 /* 8BF20 800F2A70 A1220000 */ sb $v0, ($t1) /* 8BF24 800F2A74 28C20004 */ slti $v0, $a2, 4 /* 8BF28 800F2A78 1440FFE2 */ bnez $v0, .L800F2A04 -/* 8BF2C 800F2A7C 00000000 */ nop +/* 8BF2C 800F2A7C 00000000 */ nop /* 8BF30 800F2A80 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 8BF34 800F2A84 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 8BF38 800F2A88 8C420010 */ lw $v0, 0x10($v0) /* 8BF3C 800F2A8C 30428000 */ andi $v0, $v0, 0x8000 /* 8BF40 800F2A90 1040003F */ beqz $v0, .L800F2B90 -/* 8BF44 800F2A94 00000000 */ nop +/* 8BF44 800F2A94 00000000 */ nop /* 8BF48 800F2A98 3C028011 */ lui $v0, %hi(D_8010D69C) /* 8BF4C 800F2A9C 8C42D69C */ lw $v0, %lo(D_8010D69C)($v0) /* 8BF50 800F2AA0 8C430318 */ lw $v1, 0x318($v0) @@ -1114,9 +1114,9 @@ glabel func_800F1A10 /* 8BF58 800F2AA8 10620005 */ beq $v1, $v0, .L800F2AC0 /* 8BF5C 800F2AAC 2402000D */ addiu $v0, $zero, 0xd /* 8BF60 800F2AB0 1062000B */ beq $v1, $v0, .L800F2AE0 -/* 8BF64 800F2AB4 00000000 */ nop +/* 8BF64 800F2AB4 00000000 */ nop /* 8BF68 800F2AB8 0803CAC0 */ j .L800F2B00 -/* 8BF6C 800F2ABC 00000000 */ nop +/* 8BF6C 800F2ABC 00000000 */ nop .L800F2AC0: /* 8BF70 800F2AC0 0C05272D */ jal play_sound /* 8BF74 800F2AC4 240400C9 */ addiu $a0, $zero, 0xc9 @@ -1156,7 +1156,7 @@ glabel func_800F1A10 .L800F2B44: /* 8BFF4 800F2B44 8C630318 */ lw $v1, 0x318($v1) /* 8BFF8 800F2B48 14620005 */ bne $v1, $v0, .L800F2B60 -/* 8BFFC 800F2B4C 00000000 */ nop +/* 8BFFC 800F2B4C 00000000 */ nop /* 8C000 800F2B50 0C05272D */ jal play_sound /* 8C004 800F2B54 2404021D */ addiu $a0, $zero, 0x21d /* 8C008 800F2B58 0803CD93 */ j .L800F364C @@ -1165,16 +1165,16 @@ glabel func_800F1A10 /* 8C010 800F2B60 3C028011 */ lui $v0, %hi(D_8010D68E) /* 8C014 800F2B64 8042D68E */ lb $v0, %lo(D_8010D68E)($v0) /* 8C018 800F2B68 104002BA */ beqz $v0, .L800F3654 -/* 8C01C 800F2B6C 00000000 */ nop +/* 8C01C 800F2B6C 00000000 */ nop /* 8C020 800F2B70 10600003 */ beqz $v1, .L800F2B80 /* 8C024 800F2B74 24020003 */ addiu $v0, $zero, 3 /* 8C028 800F2B78 146202B6 */ bne $v1, $v0, .L800F3654 -/* 8C02C 800F2B7C 00000000 */ nop +/* 8C02C 800F2B7C 00000000 */ nop .L800F2B80: /* 8C030 800F2B80 0C05272D */ jal play_sound /* 8C034 800F2B84 2404021D */ addiu $a0, $zero, 0x21d /* 8C038 800F2B88 0803CD95 */ j .L800F3654 -/* 8C03C 800F2B8C 00000000 */ nop +/* 8C03C 800F2B8C 00000000 */ nop .L800F2B90: /* 8C040 800F2B90 3C028011 */ lui $v0, %hi(D_8010D69C) /* 8C044 800F2B94 8C42D69C */ lw $v0, %lo(D_8010D69C)($v0) @@ -1186,7 +1186,7 @@ glabel func_800F1A10 /* 8C05C 800F2BAC 00220821 */ addu $at, $at, $v0 /* 8C060 800F2BB0 8C22C6B0 */ lw $v0, %lo(D_8010C6B0)($at) /* 8C064 800F2BB4 00400008 */ jr $v0 -/* 8C068 800F2BB8 00000000 */ nop +/* 8C068 800F2BB8 00000000 */ nop /* 8C06C 800F2BBC 3C028011 */ lui $v0, %hi(D_8010D68E) /* 8C070 800F2BC0 8042D68E */ lb $v0, %lo(D_8010D68E)($v0) /* 8C074 800F2BC4 1040000C */ beqz $v0, .L800F2BF8 @@ -1209,13 +1209,13 @@ glabel func_800F1A10 /* 8C0B0 800F2C00 8C420010 */ lw $v0, 0x10($v0) /* 8C0B4 800F2C04 00431024 */ and $v0, $v0, $v1 /* 8C0B8 800F2C08 10400013 */ beqz $v0, .L800F2C58 -/* 8C0BC 800F2C0C 00000000 */ nop +/* 8C0BC 800F2C0C 00000000 */ nop /* 8C0C0 800F2C10 0C05272D */ jal play_sound /* 8C0C4 800F2C14 240400CA */ addiu $a0, $zero, 0xca /* 8C0C8 800F2C18 3C028011 */ lui $v0, %hi(D_8010D698) /* 8C0CC 800F2C1C 8042D698 */ lb $v0, %lo(D_8010D698)($v0) /* 8C0D0 800F2C20 10400007 */ beqz $v0, .L800F2C40 -/* 8C0D4 800F2C24 00000000 */ nop +/* 8C0D4 800F2C24 00000000 */ nop /* 8C0D8 800F2C28 3C028011 */ lui $v0, %hi(D_8010D68E) /* 8C0DC 800F2C2C 8042D68E */ lb $v0, %lo(D_8010D68E)($v0) /* 8C0E0 800F2C30 14400286 */ bnez $v0, .L800F364C @@ -1238,7 +1238,7 @@ glabel func_800F1A10 /* 8C11C 800F2C6C 10620005 */ beq $v1, $v0, .L800F2C84 /* 8C120 800F2C70 0000182D */ daddu $v1, $zero, $zero /* 8C124 800F2C74 0803CB22 */ j .L800F2C88 -/* 8C128 800F2C78 00000000 */ nop +/* 8C128 800F2C78 00000000 */ nop .L800F2C7C: /* 8C12C 800F2C7C 0803CB22 */ j .L800F2C88 /* 8C130 800F2C80 24030001 */ addiu $v1, $zero, 1 @@ -1248,13 +1248,13 @@ glabel func_800F1A10 /* 8C138 800F2C88 3C028011 */ lui $v0, %hi(D_8010D68E) /* 8C13C 800F2C8C 8042D68E */ lb $v0, %lo(D_8010D68E)($v0) /* 8C140 800F2C90 10400270 */ beqz $v0, .L800F3654 -/* 8C144 800F2C94 00000000 */ nop +/* 8C144 800F2C94 00000000 */ nop /* 8C148 800F2C98 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 8C14C 800F2C9C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 8C150 800F2CA0 8C420010 */ lw $v0, 0x10($v0) /* 8C154 800F2CA4 00431024 */ and $v0, $v0, $v1 /* 8C158 800F2CA8 1040026A */ beqz $v0, .L800F3654 -/* 8C15C 800F2CAC 00000000 */ nop +/* 8C15C 800F2CAC 00000000 */ nop /* 8C160 800F2CB0 0C05272D */ jal play_sound /* 8C164 800F2CB4 240400CA */ addiu $a0, $zero, 0xca /* 8C168 800F2CB8 0803CD93 */ j .L800F364C @@ -1294,7 +1294,7 @@ glabel func_800F1A10 /* 8C1F0 800F2D40 3C058010 */ lui $a1, %hi(D_80104A00) /* 8C1F4 800F2D44 24A54A00 */ addiu $a1, $a1, %lo(D_80104A00) /* 8C1F8 800F2D48 0C0511FF */ jal set_menu_icon_script -/* 8C1FC 800F2D4C 00000000 */ nop +/* 8C1FC 800F2D4C 00000000 */ nop /* 8C200 800F2D50 3C108011 */ lui $s0, %hi(D_8010D69C) /* 8C204 800F2D54 2610D69C */ addiu $s0, $s0, %lo(D_8010D69C) /* 8C208 800F2D58 8E020000 */ lw $v0, ($s0) @@ -1335,9 +1335,9 @@ glabel func_800F1A10 /* 8C28C 800F2DDC 8C430318 */ lw $v1, 0x318($v0) /* 8C290 800F2DE0 24020001 */ addiu $v0, $zero, 1 /* 8C294 800F2DE4 10620003 */ beq $v1, $v0, .L800F2DF4 -/* 8C298 800F2DE8 00000000 */ nop +/* 8C298 800F2DE8 00000000 */ nop /* 8C29C 800F2DEC 14710007 */ bne $v1, $s1, .L800F2E0C -/* 8C2A0 800F2DF0 00000000 */ nop +/* 8C2A0 800F2DF0 00000000 */ nop .L800F2DF4: /* 8C2A4 800F2DF4 3C048011 */ lui $a0, %hi(D_8010D668) /* 8C2A8 800F2DF8 8C84D668 */ lw $a0, %lo(D_8010D668)($a0) @@ -1387,7 +1387,7 @@ glabel func_800F1A10 /* 8C350 800F2EA0 00220821 */ addu $at, $at, $v0 /* 8C354 800F2EA4 8C22C6E8 */ lw $v0, %lo(D_8010C6E8)($at) /* 8C358 800F2EA8 00400008 */ jr $v0 -/* 8C35C 800F2EAC 00000000 */ nop +/* 8C35C 800F2EAC 00000000 */ nop /* 8C360 800F2EB0 2404000E */ addiu $a0, $zero, 0xe /* 8C364 800F2EB4 0C051F9F */ jal func_80147E7C /* 8C368 800F2EB8 24050002 */ addiu $a1, $zero, 2 @@ -1404,11 +1404,11 @@ glabel func_800F1A10 /* 8C390 800F2EE0 24050002 */ addiu $a1, $zero, 2 .L800F2EE4: /* 8C394 800F2EE4 0C03C54E */ jal func_800F1538 -/* 8C398 800F2EE8 00000000 */ nop +/* 8C398 800F2EE8 00000000 */ nop /* 8C39C 800F2EEC 3C048011 */ lui $a0, %hi(D_8010D694) /* 8C3A0 800F2EF0 8C84D694 */ lw $a0, %lo(D_8010D694)($a0) /* 8C3A4 800F2EF4 0C048D70 */ jal func_801235C0 -/* 8C3A8 800F2EF8 00000000 */ nop +/* 8C3A8 800F2EF8 00000000 */ nop /* 8C3AC 800F2EFC 3C048011 */ lui $a0, %hi(D_8010D69C) /* 8C3B0 800F2F00 8C84D69C */ lw $a0, %lo(D_8010D69C)($a0) /* 8C3B4 800F2F04 2403FFFB */ addiu $v1, $zero, -5 @@ -1419,7 +1419,7 @@ glabel func_800F1A10 /* 8C3C8 800F2F18 3C048011 */ lui $a0, %hi(D_8010D694) /* 8C3CC 800F2F1C 8C84D694 */ lw $a0, %lo(D_8010D694)($a0) /* 8C3D0 800F2F20 0C048D70 */ jal func_801235C0 -/* 8C3D4 800F2F24 00000000 */ nop +/* 8C3D4 800F2F24 00000000 */ nop /* 8C3D8 800F2F28 3C048011 */ lui $a0, %hi(D_8010D69C) /* 8C3DC 800F2F2C 8C84D69C */ lw $a0, %lo(D_8010D69C)($a0) /* 8C3E0 800F2F30 2403FFFB */ addiu $v1, $zero, -5 @@ -1541,7 +1541,7 @@ glabel func_800F1A10 /* 8C5A4 800F30F4 8C420010 */ lw $v0, 0x10($v0) /* 8C5A8 800F30F8 3042C001 */ andi $v0, $v0, 0xc001 /* 8C5AC 800F30FC 10400003 */ beqz $v0, .L800F310C -/* 8C5B0 800F3100 00000000 */ nop +/* 8C5B0 800F3100 00000000 */ nop /* 8C5B4 800F3104 3C018011 */ lui $at, %hi(D_8010D644) /* 8C5B8 800F3108 AC20D644 */ sw $zero, %lo(D_8010D644)($at) .L800F310C: @@ -1612,7 +1612,7 @@ glabel func_800F1A10 /* 8C6B4 800F3204 3C058010 */ lui $a1, %hi(D_80104A00) /* 8C6B8 800F3208 24A54A00 */ addiu $a1, $a1, %lo(D_80104A00) /* 8C6BC 800F320C 0C0511FF */ jal set_menu_icon_script -/* 8C6C0 800F3210 00000000 */ nop +/* 8C6C0 800F3210 00000000 */ nop /* 8C6C4 800F3214 3C108011 */ lui $s0, %hi(D_8010D69C) /* 8C6C8 800F3218 2610D69C */ addiu $s0, $s0, %lo(D_8010D69C) /* 8C6CC 800F321C 8E020000 */ lw $v0, ($s0) @@ -1653,9 +1653,9 @@ glabel func_800F1A10 /* 8C750 800F32A0 8C430318 */ lw $v1, 0x318($v0) /* 8C754 800F32A4 24020001 */ addiu $v0, $zero, 1 /* 8C758 800F32A8 10620003 */ beq $v1, $v0, .L800F32B8 -/* 8C75C 800F32AC 00000000 */ nop +/* 8C75C 800F32AC 00000000 */ nop /* 8C760 800F32B0 14710007 */ bne $v1, $s1, .L800F32D0 -/* 8C764 800F32B4 00000000 */ nop +/* 8C764 800F32B4 00000000 */ nop .L800F32B8: /* 8C768 800F32B8 3C048011 */ lui $a0, %hi(D_8010D668) /* 8C76C 800F32BC 8C84D668 */ lw $a0, %lo(D_8010D668)($a0) @@ -1686,7 +1686,7 @@ glabel func_800F1A10 /* 8C7C8 800F3318 00220821 */ addu $at, $at, $v0 /* 8C7CC 800F331C 8C22C720 */ lw $v0, %lo(D_8010C720)($at) /* 8C7D0 800F3320 00400008 */ jr $v0 -/* 8C7D4 800F3324 00000000 */ nop +/* 8C7D4 800F3324 00000000 */ nop /* 8C7D8 800F3328 2404000E */ addiu $a0, $zero, 0xe /* 8C7DC 800F332C 0C051F9F */ jal func_80147E7C /* 8C7E0 800F3330 24050002 */ addiu $a1, $zero, 2 @@ -1766,7 +1766,7 @@ glabel func_800F1A10 /* 8C8FC 800F344C 1050007F */ beq $v0, $s0, .L800F364C /* 8C900 800F3450 24020067 */ addiu $v0, $zero, 0x67 /* 8C904 800F3454 0803CD95 */ j .L800F3654 -/* 8C908 800F3458 00000000 */ nop +/* 8C908 800F3458 00000000 */ nop /* 8C90C 800F345C 0803CD93 */ j .L800F364C /* 8C910 800F3460 2402FFFD */ addiu $v0, $zero, -3 /* 8C914 800F3464 240500FF */ addiu $a1, $zero, 0xff @@ -1839,9 +1839,9 @@ glabel func_800F1A10 /* 8CA18 800F3568 8C430318 */ lw $v1, 0x318($v0) /* 8CA1C 800F356C 24020001 */ addiu $v0, $zero, 1 /* 8CA20 800F3570 10620003 */ beq $v1, $v0, .L800F3580 -/* 8CA24 800F3574 00000000 */ nop +/* 8CA24 800F3574 00000000 */ nop /* 8CA28 800F3578 14710007 */ bne $v1, $s1, .L800F3598 -/* 8CA2C 800F357C 00000000 */ nop +/* 8CA2C 800F357C 00000000 */ nop .L800F3580: /* 8CA30 800F3580 3C048011 */ lui $a0, %hi(D_8010D668) /* 8CA34 800F3584 8C84D668 */ lw $a0, %lo(D_8010D668)($a0) @@ -1868,7 +1868,7 @@ glabel func_800F1A10 /* 8CA80 800F35D0 3C058010 */ lui $a1, %hi(D_80104A00) /* 8CA84 800F35D4 24A54A00 */ addiu $a1, $a1, %lo(D_80104A00) /* 8CA88 800F35D8 0C0511FF */ jal set_menu_icon_script -/* 8CA8C 800F35DC 00000000 */ nop +/* 8CA8C 800F35DC 00000000 */ nop /* 8CA90 800F35E0 8E020000 */ lw $v0, ($s0) /* 8CA94 800F35E4 8C430318 */ lw $v1, 0x318($v0) /* 8CA98 800F35E8 2C62000E */ sltiu $v0, $v1, 0xe @@ -1878,7 +1878,7 @@ glabel func_800F1A10 /* 8CAA8 800F35F8 00220821 */ addu $at, $at, $v0 /* 8CAAC 800F35FC 8C22C758 */ lw $v0, %lo(D_8010C758)($at) /* 8CAB0 800F3600 00400008 */ jr $v0 -/* 8CAB4 800F3604 00000000 */ nop +/* 8CAB4 800F3604 00000000 */ nop /* 8CAB8 800F3608 2404000E */ addiu $a0, $zero, 0xe /* 8CABC 800F360C 0C051F9F */ jal func_80147E7C /* 8CAC0 800F3610 24050001 */ addiu $a1, $zero, 1 diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F3680.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F3680.s index 1449ca7287..eb9b0634a4 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F3680.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F3680.s @@ -30,28 +30,28 @@ glabel func_800F3680 /* 8CB94 800F36E4 104003CC */ beqz $v0, .L800F4618 /* 8CB98 800F36E8 2862FFF8 */ slti $v0, $v1, -8 /* 8CB9C 800F36EC 0803CDCC */ j .L800F3730 -/* 8CBA0 800F36F0 00000000 */ nop +/* 8CBA0 800F36F0 00000000 */ nop .L800F36F4: /* 8CBA4 800F36F4 10620010 */ beq $v1, $v0, .L800F3738 -/* 8CBA8 800F36F8 00000000 */ nop +/* 8CBA8 800F36F8 00000000 */ nop /* 8CBAC 800F36FC 0803D186 */ j .L800F4618 -/* 8CBB0 800F3700 00000000 */ nop +/* 8CBB0 800F3700 00000000 */ nop .L800F3704: /* 8CBB4 800F3704 10400007 */ beqz $v0, .L800F3724 /* 8CBB8 800F3708 2862001E */ slti $v0, $v1, 0x1e /* 8CBBC 800F370C 1040000A */ beqz $v0, .L800F3738 /* 8CBC0 800F3710 24020014 */ addiu $v0, $zero, 0x14 /* 8CBC4 800F3714 10620008 */ beq $v1, $v0, .L800F3738 -/* 8CBC8 800F3718 00000000 */ nop +/* 8CBC8 800F3718 00000000 */ nop /* 8CBCC 800F371C 0803D186 */ j .L800F4618 -/* 8CBD0 800F3720 00000000 */ nop +/* 8CBD0 800F3720 00000000 */ nop .L800F3724: /* 8CBD4 800F3724 2862006A */ slti $v0, $v1, 0x6a /* 8CBD8 800F3728 104003BB */ beqz $v0, .L800F4618 /* 8CBDC 800F372C 28620064 */ slti $v0, $v1, 0x64 .L800F3730: /* 8CBE0 800F3730 144003B9 */ bnez $v0, .L800F4618 -/* 8CBE4 800F3734 00000000 */ nop +/* 8CBE4 800F3734 00000000 */ nop .L800F3738: /* 8CBE8 800F3738 8FAA005C */ lw $t2, 0x5c($sp) /* 8CBEC 800F373C 8FAB0060 */ lw $t3, 0x60($sp) @@ -75,14 +75,14 @@ glabel func_800F3680 /* 8CC34 800F3784 44811800 */ mtc1 $at, $f3 /* 8CC38 800F3788 44801000 */ mtc1 $zero, $f2 /* 8CC3C 800F378C 44840000 */ mtc1 $a0, $f0 -/* 8CC40 800F3790 00000000 */ nop +/* 8CC40 800F3790 00000000 */ nop /* 8CC44 800F3794 46800021 */ cvt.d.w $f0, $f0 /* 8CC48 800F3798 46220002 */ mul.d $f0, $f0, $f2 -/* 8CC4C 800F379C 00000000 */ nop +/* 8CC4C 800F379C 00000000 */ nop /* 8CC50 800F37A0 4620018D */ trunc.w.d $f6, $f0 /* 8CC54 800F37A4 44043000 */ mfc1 $a0, $f6 /* 8CC58 800F37A8 0803CDF8 */ j .L800F37E0 -/* 8CC5C 800F37AC 00000000 */ nop +/* 8CC5C 800F37AC 00000000 */ nop .L800F37B0: /* 8CC60 800F37B0 3C031B4E */ lui $v1, 0x1b4e /* 8CC64 800F37B4 346381B5 */ ori $v1, $v1, 0x81b5 @@ -135,25 +135,25 @@ glabel func_800F3680 /* 8CD18 800F3868 00220821 */ addu $at, $at, $v0 /* 8CD1C 800F386C 8C22C790 */ lw $v0, %lo(D_8010C790)($at) /* 8CD20 800F3870 00400008 */ jr $v0 -/* 8CD24 800F3874 00000000 */ nop +/* 8CD24 800F3874 00000000 */ nop /* 8CD28 800F3878 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* 8CD2C 800F387C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 8CD30 800F3880 C7A20020 */ lwc1 $f2, 0x20($sp) /* 8CD34 800F3884 468010A0 */ cvt.s.w $f2, $f2 /* 8CD38 800F3888 44910000 */ mtc1 $s1, $f0 -/* 8CD3C 800F388C 00000000 */ nop +/* 8CD3C 800F388C 00000000 */ nop /* 8CD40 800F3890 46800020 */ cvt.s.w $f0, $f0 /* 8CD44 800F3894 3C014080 */ lui $at, 0x4080 /* 8CD48 800F3898 44812000 */ mtc1 $at, $f4 /* 8CD4C 800F389C 8C620000 */ lw $v0, ($v1) /* 8CD50 800F38A0 46041082 */ mul.s $f2, $f2, $f4 -/* 8CD54 800F38A4 00000000 */ nop +/* 8CD54 800F38A4 00000000 */ nop /* 8CD58 800F38A8 0040282D */ daddu $a1, $v0, $zero /* 8CD5C 800F38AC 24420008 */ addiu $v0, $v0, 8 /* 8CD60 800F38B0 AC620000 */ sw $v0, ($v1) /* 8CD64 800F38B4 8FAB0020 */ lw $t3, 0x20($sp) /* 8CD68 800F38B8 46040002 */ mul.s $f0, $f0, $f4 -/* 8CD6C 800F38BC 00000000 */ nop +/* 8CD6C 800F38BC 00000000 */ nop /* 8CD70 800F38C0 0803CE59 */ j .L800F3964 /* 8CD74 800F38C4 25620070 */ addiu $v0, $t3, 0x70 /* 8CD78 800F38C8 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -161,19 +161,19 @@ glabel func_800F3680 /* 8CD80 800F38D0 C7A20020 */ lwc1 $f2, 0x20($sp) /* 8CD84 800F38D4 468010A0 */ cvt.s.w $f2, $f2 /* 8CD88 800F38D8 44910000 */ mtc1 $s1, $f0 -/* 8CD8C 800F38DC 00000000 */ nop +/* 8CD8C 800F38DC 00000000 */ nop /* 8CD90 800F38E0 46800020 */ cvt.s.w $f0, $f0 /* 8CD94 800F38E4 3C014080 */ lui $at, 0x4080 /* 8CD98 800F38E8 44812000 */ mtc1 $at, $f4 /* 8CD9C 800F38EC 8C620000 */ lw $v0, ($v1) /* 8CDA0 800F38F0 46041082 */ mul.s $f2, $f2, $f4 -/* 8CDA4 800F38F4 00000000 */ nop +/* 8CDA4 800F38F4 00000000 */ nop /* 8CDA8 800F38F8 0040282D */ daddu $a1, $v0, $zero /* 8CDAC 800F38FC 24420008 */ addiu $v0, $v0, 8 /* 8CDB0 800F3900 AC620000 */ sw $v0, ($v1) /* 8CDB4 800F3904 8FAB0020 */ lw $t3, 0x20($sp) /* 8CDB8 800F3908 46040002 */ mul.s $f0, $f0, $f4 -/* 8CDBC 800F390C 00000000 */ nop +/* 8CDBC 800F390C 00000000 */ nop /* 8CDC0 800F3910 0803CE59 */ j .L800F3964 /* 8CDC4 800F3914 2562005A */ addiu $v0, $t3, 0x5a /* 8CDC8 800F3918 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -181,52 +181,52 @@ glabel func_800F3680 /* 8CDD0 800F3920 C7A20020 */ lwc1 $f2, 0x20($sp) /* 8CDD4 800F3924 468010A0 */ cvt.s.w $f2, $f2 /* 8CDD8 800F3928 44910000 */ mtc1 $s1, $f0 -/* 8CDDC 800F392C 00000000 */ nop +/* 8CDDC 800F392C 00000000 */ nop /* 8CDE0 800F3930 46800020 */ cvt.s.w $f0, $f0 /* 8CDE4 800F3934 3C014080 */ lui $at, 0x4080 /* 8CDE8 800F3938 44812000 */ mtc1 $at, $f4 /* 8CDEC 800F393C 8C620000 */ lw $v0, ($v1) /* 8CDF0 800F3940 46041082 */ mul.s $f2, $f2, $f4 -/* 8CDF4 800F3944 00000000 */ nop +/* 8CDF4 800F3944 00000000 */ nop /* 8CDF8 800F3948 0040282D */ daddu $a1, $v0, $zero /* 8CDFC 800F394C 24420008 */ addiu $v0, $v0, 8 /* 8CE00 800F3950 AC620000 */ sw $v0, ($v1) /* 8CE04 800F3954 8FAB0020 */ lw $t3, 0x20($sp) /* 8CE08 800F3958 46040002 */ mul.s $f0, $f0, $f4 -/* 8CE0C 800F395C 00000000 */ nop +/* 8CE0C 800F395C 00000000 */ nop /* 8CE10 800F3960 256200A0 */ addiu $v0, $t3, 0xa0 .L800F3964: /* 8CE14 800F3964 4600118D */ trunc.w.s $f6, $f2 /* 8CE18 800F3968 44033000 */ mfc1 $v1, $f6 -/* 8CE1C 800F396C 00000000 */ nop +/* 8CE1C 800F396C 00000000 */ nop /* 8CE20 800F3970 30630FFF */ andi $v1, $v1, 0xfff /* 8CE24 800F3974 00031B00 */ sll $v1, $v1, 0xc /* 8CE28 800F3978 4600018D */ trunc.w.s $f6, $f0 /* 8CE2C 800F397C 44043000 */ mfc1 $a0, $f6 -/* 8CE30 800F3980 00000000 */ nop +/* 8CE30 800F3980 00000000 */ nop /* 8CE34 800F3984 30840FFF */ andi $a0, $a0, 0xfff /* 8CE38 800F3988 44821000 */ mtc1 $v0, $f2 -/* 8CE3C 800F398C 00000000 */ nop +/* 8CE3C 800F398C 00000000 */ nop /* 8CE40 800F3990 468010A0 */ cvt.s.w $f2, $f2 /* 8CE44 800F3994 46041082 */ mul.s $f2, $f2, $f4 -/* 8CE48 800F3998 00000000 */ nop +/* 8CE48 800F3998 00000000 */ nop /* 8CE4C 800F399C 3C02ED00 */ lui $v0, 0xed00 /* 8CE50 800F39A0 00822025 */ or $a0, $a0, $v0 /* 8CE54 800F39A4 00641825 */ or $v1, $v1, $a0 /* 8CE58 800F39A8 44880000 */ mtc1 $t0, $f0 -/* 8CE5C 800F39AC 00000000 */ nop +/* 8CE5C 800F39AC 00000000 */ nop /* 8CE60 800F39B0 46800020 */ cvt.s.w $f0, $f0 /* 8CE64 800F39B4 46040002 */ mul.s $f0, $f0, $f4 -/* 8CE68 800F39B8 00000000 */ nop +/* 8CE68 800F39B8 00000000 */ nop /* 8CE6C 800F39BC ACA30000 */ sw $v1, ($a1) /* 8CE70 800F39C0 4600118D */ trunc.w.s $f6, $f2 /* 8CE74 800F39C4 44023000 */ mfc1 $v0, $f6 -/* 8CE78 800F39C8 00000000 */ nop +/* 8CE78 800F39C8 00000000 */ nop /* 8CE7C 800F39CC 30420FFF */ andi $v0, $v0, 0xfff /* 8CE80 800F39D0 00021300 */ sll $v0, $v0, 0xc /* 8CE84 800F39D4 4600018D */ trunc.w.s $f6, $f0 /* 8CE88 800F39D8 44033000 */ mfc1 $v1, $f6 -/* 8CE8C 800F39DC 00000000 */ nop +/* 8CE8C 800F39DC 00000000 */ nop /* 8CE90 800F39E0 30630FFF */ andi $v1, $v1, 0xfff /* 8CE94 800F39E4 00431025 */ or $v0, $v0, $v1 /* 8CE98 800F39E8 ACA20004 */ sw $v0, 4($a1) @@ -261,7 +261,7 @@ glabel func_800F3680 /* 8CF04 800F3A54 8C420324 */ lw $v0, 0x324($v0) /* 8CF08 800F3A58 0062182A */ slt $v1, $v1, $v0 /* 8CF0C 800F3A5C 10600003 */ beqz $v1, .L800F3A6C -/* 8CF10 800F3A60 00000000 */ nop +/* 8CF10 800F3A60 00000000 */ nop /* 8CF14 800F3A64 0C0511F8 */ jal draw_icon_2 /* 8CF18 800F3A68 0200202D */ daddu $a0, $s0, $zero .L800F3A6C: @@ -283,7 +283,7 @@ glabel func_800F3680 /* 8CF58 800F3AA8 8042D654 */ lb $v0, %lo(D_8010D654)($v0) /* 8CF5C 800F3AAC 28420002 */ slti $v0, $v0, 2 /* 8CF60 800F3AB0 10400003 */ beqz $v0, .L800F3AC0 -/* 8CF64 800F3AB4 00000000 */ nop +/* 8CF64 800F3AB4 00000000 */ nop /* 8CF68 800F3AB8 0140882D */ daddu $s1, $t2, $zero /* 8CF6C 800F3ABC 25080001 */ addiu $t0, $t0, 1 .L800F3AC0: @@ -294,37 +294,37 @@ glabel func_800F3680 /* 8CF80 800F3AD0 3C06800A */ lui $a2, %hi(gMasterGfxPos) /* 8CF84 800F3AD4 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 8CF88 800F3AD8 46041082 */ mul.s $f2, $f2, $f4 -/* 8CF8C 800F3ADC 00000000 */ nop +/* 8CF8C 800F3ADC 00000000 */ nop /* 8CF90 800F3AE0 44910000 */ mtc1 $s1, $f0 -/* 8CF94 800F3AE4 00000000 */ nop +/* 8CF94 800F3AE4 00000000 */ nop /* 8CF98 800F3AE8 46800020 */ cvt.s.w $f0, $f0 /* 8CF9C 800F3AEC 8CC50000 */ lw $a1, ($a2) /* 8CFA0 800F3AF0 3C04ED00 */ lui $a0, 0xed00 /* 8CFA4 800F3AF4 00A0382D */ daddu $a3, $a1, $zero /* 8CFA8 800F3AF8 46040002 */ mul.s $f0, $f0, $f4 -/* 8CFAC 800F3AFC 00000000 */ nop +/* 8CFAC 800F3AFC 00000000 */ nop /* 8CFB0 800F3B00 24A50008 */ addiu $a1, $a1, 8 /* 8CFB4 800F3B04 4600118D */ trunc.w.s $f6, $f2 /* 8CFB8 800F3B08 44023000 */ mfc1 $v0, $f6 -/* 8CFBC 800F3B0C 00000000 */ nop +/* 8CFBC 800F3B0C 00000000 */ nop /* 8CFC0 800F3B10 30420FFF */ andi $v0, $v0, 0xfff /* 8CFC4 800F3B14 00021300 */ sll $v0, $v0, 0xc /* 8CFC8 800F3B18 4600018D */ trunc.w.s $f6, $f0 /* 8CFCC 800F3B1C 44033000 */ mfc1 $v1, $f6 -/* 8CFD0 800F3B20 00000000 */ nop +/* 8CFD0 800F3B20 00000000 */ nop /* 8CFD4 800F3B24 30630FFF */ andi $v1, $v1, 0xfff /* 8CFD8 800F3B28 00641825 */ or $v1, $v1, $a0 /* 8CFDC 800F3B2C 00431025 */ or $v0, $v0, $v1 /* 8CFE0 800F3B30 3C048011 */ lui $a0, %hi(D_8010D69C) /* 8CFE4 800F3B34 8C84D69C */ lw $a0, %lo(D_8010D69C)($a0) /* 8CFE8 800F3B38 44880000 */ mtc1 $t0, $f0 -/* 8CFEC 800F3B3C 00000000 */ nop +/* 8CFEC 800F3B3C 00000000 */ nop /* 8CFF0 800F3B40 46800020 */ cvt.s.w $f0, $f0 /* 8CFF4 800F3B44 ACE20000 */ sw $v0, ($a3) /* 8CFF8 800F3B48 8FAB0020 */ lw $t3, 0x20($sp) /* 8CFFC 800F3B4C 8C820318 */ lw $v0, 0x318($a0) /* 8D000 800F3B50 46040002 */ mul.s $f0, $f0, $f4 -/* 8D004 800F3B54 00000000 */ nop +/* 8D004 800F3B54 00000000 */ nop /* 8D008 800F3B58 AFA00024 */ sw $zero, 0x24($sp) /* 8D00C 800F3B5C 00021040 */ sll $v0, $v0, 1 /* 8D010 800F3B60 3C018011 */ lui $at, %hi(D_801098BC) @@ -333,12 +333,12 @@ glabel func_800F3680 /* 8D01C 800F3B6C 8FAA0060 */ lw $t2, 0x60($sp) /* 8D020 800F3B70 01621021 */ addu $v0, $t3, $v0 /* 8D024 800F3B74 44821000 */ mtc1 $v0, $f2 -/* 8D028 800F3B78 00000000 */ nop +/* 8D028 800F3B78 00000000 */ nop /* 8D02C 800F3B7C 468010A0 */ cvt.s.w $f2, $f2 /* 8D030 800F3B80 3C028011 */ lui $v0, %hi(D_8010D658) /* 8D034 800F3B84 8442D658 */ lh $v0, %lo(D_8010D658)($v0) /* 8D038 800F3B88 46041082 */ mul.s $f2, $f2, $f4 -/* 8D03C 800F3B8C 00000000 */ nop +/* 8D03C 800F3B8C 00000000 */ nop /* 8D040 800F3B90 ACC50000 */ sw $a1, ($a2) /* 8D044 800F3B94 8FAB005C */ lw $t3, 0x5c($sp) /* 8D048 800F3B98 01424821 */ addu $t1, $t2, $v0 @@ -346,12 +346,12 @@ glabel func_800F3680 /* 8D050 800F3BA0 AFAB0020 */ sw $t3, 0x20($sp) /* 8D054 800F3BA4 4600118D */ trunc.w.s $f6, $f2 /* 8D058 800F3BA8 44023000 */ mfc1 $v0, $f6 -/* 8D05C 800F3BAC 00000000 */ nop +/* 8D05C 800F3BAC 00000000 */ nop /* 8D060 800F3BB0 30420FFF */ andi $v0, $v0, 0xfff /* 8D064 800F3BB4 00021300 */ sll $v0, $v0, 0xc /* 8D068 800F3BB8 4600018D */ trunc.w.s $f6, $f0 /* 8D06C 800F3BBC 44033000 */ mfc1 $v1, $f6 -/* 8D070 800F3BC0 00000000 */ nop +/* 8D070 800F3BC0 00000000 */ nop /* 8D074 800F3BC4 30630FFF */ andi $v1, $v1, 0xfff /* 8D078 800F3BC8 00431025 */ or $v0, $v0, $v1 /* 8D07C 800F3BCC ACE20004 */ sw $v0, 4($a3) @@ -372,7 +372,7 @@ glabel func_800F3680 /* 8D0B0 800F3C00 2542FFFF */ addiu $v0, $t2, -1 /* 8D0B4 800F3C04 0242102A */ slt $v0, $s2, $v0 /* 8D0B8 800F3C08 14400007 */ bnez $v0, .L800F3C28 -/* 8D0BC 800F3C0C 00000000 */ nop +/* 8D0BC 800F3C0C 00000000 */ nop /* 8D0C0 800F3C10 3C028011 */ lui $v0, %hi(D_8010D656) /* 8D0C4 800F3C14 8042D656 */ lb $v0, %lo(D_8010D656)($v0) /* 8D0C8 800F3C18 01421021 */ addu $v0, $t2, $v0 @@ -407,7 +407,7 @@ glabel func_800F3680 /* 8D12C 800F3C7C 00220821 */ addu $at, $at, $v0 /* 8D130 800F3C80 8C22C7C8 */ lw $v0, %lo(D_8010C7C8)($at) /* 8D134 800F3C84 00400008 */ jr $v0 -/* 8D138 800F3C88 00000000 */ nop +/* 8D138 800F3C88 00000000 */ nop /* 8D13C 800F3C8C 3C078011 */ lui $a3, %hi(D_8010D650) /* 8D140 800F3C90 8CE7D650 */ lw $a3, %lo(D_8010D650)($a3) /* 8D144 800F3C94 3C028011 */ lui $v0, %hi(D_8010D69C) @@ -495,7 +495,7 @@ glabel func_800F3680 /* 8D280 800F3DD0 AFAA0014 */ sw $t2, 0x14($sp) .L800F3DD4: /* 8D284 800F3DD4 0C04993B */ jal draw_string -/* 8D288 800F3DD8 00000000 */ nop +/* 8D288 800F3DD8 00000000 */ nop .L800F3DDC: /* 8D28C 800F3DDC 3C048011 */ lui $a0, %hi(D_8010D69C) /* 8D290 800F3DE0 8C84D69C */ lw $a0, %lo(D_8010D69C)($a0) @@ -536,7 +536,7 @@ glabel func_800F3680 /* 8D30C 800F3E5C 3C108011 */ lui $s0, %hi(D_8010D668) /* 8D310 800F3E60 8E10D668 */ lw $s0, %lo(D_8010D668)($s0) /* 8D314 800F3E64 10400003 */ beqz $v0, .L800F3E74 -/* 8D318 800F3E68 00000000 */ nop +/* 8D318 800F3E68 00000000 */ nop /* 8D31C 800F3E6C 0803CF9E */ j .L800F3E78 /* 8D320 800F3E70 8E850000 */ lw $a1, ($s4) .L800F3E74: @@ -560,7 +560,7 @@ glabel func_800F3680 /* 8D360 800F3EB0 01772821 */ addu $a1, $t3, $s7 .L800F3EB4: /* 8D364 800F3EB4 0C051261 */ jal set_icon_render_pos -/* 8D368 800F3EB8 00000000 */ nop +/* 8D368 800F3EB8 00000000 */ nop /* 8D36C 800F3EBC 3C028011 */ lui $v0, %hi(D_8010D69C) /* 8D370 800F3EC0 8C42D69C */ lw $v0, %lo(D_8010D69C)($v0) /* 8D374 800F3EC4 005E1021 */ addu $v0, $v0, $fp @@ -650,7 +650,7 @@ glabel func_800F3680 /* 8D4A0 800F3FF0 00220821 */ addu $at, $at, $v0 /* 8D4A4 800F3FF4 8C22C800 */ lw $v0, %lo(D_8010C800)($at) /* 8D4A8 800F3FF8 00400008 */ jr $v0 -/* 8D4AC 800F3FFC 00000000 */ nop +/* 8D4AC 800F3FFC 00000000 */ nop /* 8D4B0 800F4000 3C028011 */ lui $v0, %hi(D_8010D69C) /* 8D4B4 800F4004 8C42D69C */ lw $v0, %lo(D_8010D69C)($v0) /* 8D4B8 800F4008 8C420324 */ lw $v0, 0x324($v0) @@ -661,7 +661,7 @@ glabel func_800F3680 /* 8D4CC 800F401C 0253102A */ slt $v0, $s2, $s3 .L800F4020: /* 8D4D0 800F4020 14400008 */ bnez $v0, .L800F4044 -/* 8D4D4 800F4024 00000000 */ nop +/* 8D4D4 800F4024 00000000 */ nop /* 8D4D8 800F4028 3C028011 */ lui $v0, %hi(D_8010D656) /* 8D4DC 800F402C 8042D656 */ lb $v0, %lo(D_8010D656)($v0) /* 8D4E0 800F4030 8FAA0028 */ lw $t2, 0x28($sp) @@ -700,7 +700,7 @@ glabel func_800F3680 /* 8D55C 800F40AC 0C0511F8 */ jal draw_icon_2 /* 8D560 800F40B0 0200202D */ daddu $a0, $s0, $zero /* 8D564 800F40B4 16400003 */ bnez $s2, .L800F40C4 -/* 8D568 800F40B8 00000000 */ nop +/* 8D568 800F40B8 00000000 */ nop /* 8D56C 800F40BC 8FAA0024 */ lw $t2, 0x24($sp) /* 8D570 800F40C0 022A8821 */ addu $s1, $s1, $t2 .L800F40C4: @@ -712,7 +712,7 @@ glabel func_800F3680 /* 8D588 800F40D8 1440FFD1 */ bnez $v0, .L800F4020 /* 8D58C 800F40DC 0253102A */ slt $v0, $s2, $s3 /* 8D590 800F40E0 0803D0AC */ j .L800F42B0 -/* 8D594 800F40E4 00000000 */ nop +/* 8D594 800F40E4 00000000 */ nop /* 8D598 800F40E8 3C028011 */ lui $v0, %hi(D_8010D69C) /* 8D59C 800F40EC 8C42D69C */ lw $v0, %lo(D_8010D69C)($v0) /* 8D5A0 800F40F0 8C420324 */ lw $v0, 0x324($v0) @@ -723,7 +723,7 @@ glabel func_800F3680 /* 8D5B4 800F4104 0253102A */ slt $v0, $s2, $s3 .L800F4108: /* 8D5B8 800F4108 14400008 */ bnez $v0, .L800F412C -/* 8D5BC 800F410C 00000000 */ nop +/* 8D5BC 800F410C 00000000 */ nop /* 8D5C0 800F4110 3C028011 */ lui $v0, %hi(D_8010D656) /* 8D5C4 800F4114 8042D656 */ lb $v0, %lo(D_8010D656)($v0) /* 8D5C8 800F4118 8FAA0028 */ lw $t2, 0x28($sp) @@ -762,7 +762,7 @@ glabel func_800F3680 /* 8D644 800F4194 0C0511F8 */ jal draw_icon_2 /* 8D648 800F4198 0200202D */ daddu $a0, $s0, $zero /* 8D64C 800F419C 16400003 */ bnez $s2, .L800F41AC -/* 8D650 800F41A0 00000000 */ nop +/* 8D650 800F41A0 00000000 */ nop /* 8D654 800F41A4 8FAA0024 */ lw $t2, 0x24($sp) /* 8D658 800F41A8 022A8821 */ addu $s1, $s1, $t2 .L800F41AC: @@ -774,7 +774,7 @@ glabel func_800F3680 /* 8D670 800F41C0 1440FFD1 */ bnez $v0, .L800F4108 /* 8D674 800F41C4 0253102A */ slt $v0, $s2, $s3 /* 8D678 800F41C8 0803D0AC */ j .L800F42B0 -/* 8D67C 800F41CC 00000000 */ nop +/* 8D67C 800F41CC 00000000 */ nop /* 8D680 800F41D0 3C028011 */ lui $v0, %hi(D_8010D69C) /* 8D684 800F41D4 8C42D69C */ lw $v0, %lo(D_8010D69C)($v0) /* 8D688 800F41D8 8C420324 */ lw $v0, 0x324($v0) @@ -785,7 +785,7 @@ glabel func_800F3680 /* 8D69C 800F41EC 0253102A */ slt $v0, $s2, $s3 .L800F41F0: /* 8D6A0 800F41F0 14400008 */ bnez $v0, .L800F4214 -/* 8D6A4 800F41F4 00000000 */ nop +/* 8D6A4 800F41F4 00000000 */ nop /* 8D6A8 800F41F8 3C028011 */ lui $v0, %hi(D_8010D656) /* 8D6AC 800F41FC 8042D656 */ lb $v0, %lo(D_8010D656)($v0) /* 8D6B0 800F4200 8FAA0028 */ lw $t2, 0x28($sp) @@ -824,7 +824,7 @@ glabel func_800F3680 /* 8D72C 800F427C 0C0511F8 */ jal draw_icon_2 /* 8D730 800F4280 0200202D */ daddu $a0, $s0, $zero /* 8D734 800F4284 16400003 */ bnez $s2, .L800F4294 -/* 8D738 800F4288 00000000 */ nop +/* 8D738 800F4288 00000000 */ nop /* 8D73C 800F428C 8FAA0024 */ lw $t2, 0x24($sp) /* 8D740 800F4290 022A8821 */ addu $s1, $s1, $t2 .L800F4294: @@ -895,25 +895,25 @@ glabel func_800F3680 /* 8D838 800F4388 00220821 */ addu $at, $at, $v0 /* 8D83C 800F438C 8C22C838 */ lw $v0, %lo(D_8010C838)($at) /* 8D840 800F4390 00400008 */ jr $v0 -/* 8D844 800F4394 00000000 */ nop +/* 8D844 800F4394 00000000 */ nop /* 8D848 800F4398 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* 8D84C 800F439C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 8D850 800F43A0 C7A20020 */ lwc1 $f2, 0x20($sp) /* 8D854 800F43A4 468010A0 */ cvt.s.w $f2, $f2 /* 8D858 800F43A8 44910000 */ mtc1 $s1, $f0 -/* 8D85C 800F43AC 00000000 */ nop +/* 8D85C 800F43AC 00000000 */ nop /* 8D860 800F43B0 46800020 */ cvt.s.w $f0, $f0 /* 8D864 800F43B4 3C014080 */ lui $at, 0x4080 /* 8D868 800F43B8 44812000 */ mtc1 $at, $f4 /* 8D86C 800F43BC 8C620000 */ lw $v0, ($v1) /* 8D870 800F43C0 46041082 */ mul.s $f2, $f2, $f4 -/* 8D874 800F43C4 00000000 */ nop +/* 8D874 800F43C4 00000000 */ nop /* 8D878 800F43C8 0040282D */ daddu $a1, $v0, $zero /* 8D87C 800F43CC 24420008 */ addiu $v0, $v0, 8 /* 8D880 800F43D0 AC620000 */ sw $v0, ($v1) /* 8D884 800F43D4 8FAB0020 */ lw $t3, 0x20($sp) /* 8D888 800F43D8 46040002 */ mul.s $f0, $f0, $f4 -/* 8D88C 800F43DC 00000000 */ nop +/* 8D88C 800F43DC 00000000 */ nop /* 8D890 800F43E0 0803D10D */ j .L800F4434 /* 8D894 800F43E4 25620070 */ addiu $v0, $t3, 0x70 /* 8D898 800F43E8 3C03800A */ lui $v1, %hi(gMasterGfxPos) @@ -921,52 +921,52 @@ glabel func_800F3680 /* 8D8A0 800F43F0 C7A20020 */ lwc1 $f2, 0x20($sp) /* 8D8A4 800F43F4 468010A0 */ cvt.s.w $f2, $f2 /* 8D8A8 800F43F8 44910000 */ mtc1 $s1, $f0 -/* 8D8AC 800F43FC 00000000 */ nop +/* 8D8AC 800F43FC 00000000 */ nop /* 8D8B0 800F4400 46800020 */ cvt.s.w $f0, $f0 /* 8D8B4 800F4404 3C014080 */ lui $at, 0x4080 /* 8D8B8 800F4408 44812000 */ mtc1 $at, $f4 /* 8D8BC 800F440C 8C620000 */ lw $v0, ($v1) /* 8D8C0 800F4410 46041082 */ mul.s $f2, $f2, $f4 -/* 8D8C4 800F4414 00000000 */ nop +/* 8D8C4 800F4414 00000000 */ nop /* 8D8C8 800F4418 0040282D */ daddu $a1, $v0, $zero /* 8D8CC 800F441C 24420008 */ addiu $v0, $v0, 8 /* 8D8D0 800F4420 AC620000 */ sw $v0, ($v1) /* 8D8D4 800F4424 8FAB0020 */ lw $t3, 0x20($sp) /* 8D8D8 800F4428 46040002 */ mul.s $f0, $f0, $f4 -/* 8D8DC 800F442C 00000000 */ nop +/* 8D8DC 800F442C 00000000 */ nop /* 8D8E0 800F4430 25620064 */ addiu $v0, $t3, 0x64 .L800F4434: /* 8D8E4 800F4434 4600118D */ trunc.w.s $f6, $f2 /* 8D8E8 800F4438 44033000 */ mfc1 $v1, $f6 -/* 8D8EC 800F443C 00000000 */ nop +/* 8D8EC 800F443C 00000000 */ nop /* 8D8F0 800F4440 30630FFF */ andi $v1, $v1, 0xfff /* 8D8F4 800F4444 00031B00 */ sll $v1, $v1, 0xc /* 8D8F8 800F4448 4600018D */ trunc.w.s $f6, $f0 /* 8D8FC 800F444C 44043000 */ mfc1 $a0, $f6 -/* 8D900 800F4450 00000000 */ nop +/* 8D900 800F4450 00000000 */ nop /* 8D904 800F4454 30840FFF */ andi $a0, $a0, 0xfff /* 8D908 800F4458 44821000 */ mtc1 $v0, $f2 -/* 8D90C 800F445C 00000000 */ nop +/* 8D90C 800F445C 00000000 */ nop /* 8D910 800F4460 468010A0 */ cvt.s.w $f2, $f2 /* 8D914 800F4464 46041082 */ mul.s $f2, $f2, $f4 -/* 8D918 800F4468 00000000 */ nop +/* 8D918 800F4468 00000000 */ nop /* 8D91C 800F446C 3C02ED00 */ lui $v0, 0xed00 /* 8D920 800F4470 00822025 */ or $a0, $a0, $v0 /* 8D924 800F4474 00641825 */ or $v1, $v1, $a0 /* 8D928 800F4478 44880000 */ mtc1 $t0, $f0 -/* 8D92C 800F447C 00000000 */ nop +/* 8D92C 800F447C 00000000 */ nop /* 8D930 800F4480 46800020 */ cvt.s.w $f0, $f0 /* 8D934 800F4484 46040002 */ mul.s $f0, $f0, $f4 -/* 8D938 800F4488 00000000 */ nop +/* 8D938 800F4488 00000000 */ nop /* 8D93C 800F448C ACA30000 */ sw $v1, ($a1) /* 8D940 800F4490 4600118D */ trunc.w.s $f6, $f2 /* 8D944 800F4494 44023000 */ mfc1 $v0, $f6 -/* 8D948 800F4498 00000000 */ nop +/* 8D948 800F4498 00000000 */ nop /* 8D94C 800F449C 30420FFF */ andi $v0, $v0, 0xfff /* 8D950 800F44A0 00021300 */ sll $v0, $v0, 0xc /* 8D954 800F44A4 4600018D */ trunc.w.s $f6, $f0 /* 8D958 800F44A8 44033000 */ mfc1 $v1, $f6 -/* 8D95C 800F44AC 00000000 */ nop +/* 8D95C 800F44AC 00000000 */ nop /* 8D960 800F44B0 30630FFF */ andi $v1, $v1, 0xfff /* 8D964 800F44B4 00431025 */ or $v0, $v0, $v1 /* 8D968 800F44B8 ACA20004 */ sw $v0, 4($a1) @@ -982,7 +982,7 @@ glabel func_800F3680 /* 8D98C 800F44DC 00220821 */ addu $at, $at, $v0 /* 8D990 800F44E0 8C22C870 */ lw $v0, %lo(D_8010C870)($at) /* 8D994 800F44E4 00400008 */ jr $v0 -/* 8D998 800F44E8 00000000 */ nop +/* 8D998 800F44E8 00000000 */ nop /* 8D99C 800F44EC 0803D150 */ j .L800F4540 /* 8D9A0 800F44F0 240B0023 */ addiu $t3, $zero, 0x23 /* 8D9A4 800F44F4 240A0023 */ addiu $t2, $zero, 0x23 @@ -1011,7 +1011,7 @@ glabel func_800F3680 /* 8D9F4 800F4544 3C028011 */ lui $v0, %hi(D_8010D654) /* 8D9F8 800F4548 8042D654 */ lb $v0, %lo(D_8010D654)($v0) /* 8D9FC 800F454C 18400012 */ blez $v0, .L800F4598 -/* 8DA00 800F4550 00000000 */ nop +/* 8DA00 800F4550 00000000 */ nop /* 8DA04 800F4554 8FAA005C */ lw $t2, 0x5c($sp) /* 8DA08 800F4558 8FAB0024 */ lw $t3, 0x24($sp) /* 8DA0C 800F455C 3C108011 */ lui $s0, %hi(D_8010D670) @@ -1037,7 +1037,7 @@ glabel func_800F3680 /* 8DA58 800F45A8 8C420324 */ lw $v0, 0x324($v0) /* 8DA5C 800F45AC 0062182A */ slt $v1, $v1, $v0 /* 8DA60 800F45B0 10600019 */ beqz $v1, .L800F4618 -/* 8DA64 800F45B4 00000000 */ nop +/* 8DA64 800F45B4 00000000 */ nop /* 8DA68 800F45B8 8FAB005C */ lw $t3, 0x5c($sp) /* 8DA6C 800F45BC 8FAA0024 */ lw $t2, 0x24($sp) /* 8DA70 800F45C0 3C038011 */ lui $v1, %hi(D_8010D68F) diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F4944.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F4944.s index 20ad9d8b3a..2a0a435b77 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F4944.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F4944.s @@ -21,7 +21,7 @@ glabel func_800F4944 /* 8DE34 800F4984 00220821 */ addu $at, $at, $v0 /* 8DE38 800F4988 8C22C8E0 */ lw $v0, %lo(D_8010C8E0)($at) /* 8DE3C 800F498C 00400008 */ jr $v0 -/* 8DE40 800F4990 00000000 */ nop +/* 8DE40 800F4990 00000000 */ nop /* 8DE44 800F4994 3C04001D */ lui $a0, 0x1d /* 8DE48 800F4998 34840061 */ ori $a0, $a0, 0x61 /* 8DE4C 800F499C 0C04991D */ jal get_string_width diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F4C6C.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F4C6C.s index 88ed730508..a3c22cd802 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F4C6C.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F4C6C.s @@ -14,7 +14,7 @@ glabel func_800F4C6C /* 8E140 800F4C90 10620008 */ beq $v1, $v0, .L800F4CB4 /* 8E144 800F4C94 24A50011 */ addiu $a1, $a1, 0x11 /* 8E148 800F4C98 0803D338 */ j .L800F4CE0 -/* 8E14C 800F4C9C 00000000 */ nop +/* 8E14C 800F4C9C 00000000 */ nop .L800F4CA0: /* 8E150 800F4CA0 24A50010 */ addiu $a1, $a1, 0x10 /* 8E154 800F4CA4 3C108011 */ lui $s0, %hi(D_8010D660) diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F4D28.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F4D28.s index 48e2a0d43d..6c6ce8735b 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F4D28.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F4D28.s @@ -33,7 +33,7 @@ glabel func_800F4D28 /* 8E244 800F4D94 2666000A */ addiu $a2, $s3, 0xa .L800F4D98: /* 8E248 800F4D98 0C051261 */ jal set_icon_render_pos -/* 8E24C 800F4D9C 00000000 */ nop +/* 8E24C 800F4D9C 00000000 */ nop /* 8E250 800F4DA0 0C0511EA */ jal draw_icon_0 /* 8E254 800F4DA4 0200202D */ daddu $a0, $s0, $zero /* 8E258 800F4DA8 2685001A */ addiu $a1, $s4, 0x1a diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F4E40.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F4E40.s index a67f7f9726..f464c8879e 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F4E40.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F4E40.s @@ -10,9 +10,9 @@ glabel func_800F4E40 /* 8E304 800F4E54 3C018011 */ lui $at, %hi(D_8010D69A) /* 8E308 800F4E58 A022D69A */ sb $v0, %lo(D_8010D69A)($at) /* 8E30C 800F4E5C 0C03A625 */ jal func_800E9894 -/* 8E310 800F4E60 00000000 */ nop +/* 8E310 800F4E60 00000000 */ nop /* 8E314 800F4E64 0C03A5E3 */ jal open_status_menu_short -/* 8E318 800F4E68 00000000 */ nop +/* 8E318 800F4E68 00000000 */ nop /* 8E31C 800F4E6C 3C048011 */ lui $a0, %hi(D_8010D699) /* 8E320 800F4E70 2484D699 */ addiu $a0, $a0, %lo(D_8010D699) /* 8E324 800F4E74 3C068011 */ lui $a2, %hi(D_8010D698) diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F513C.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F513C.s index e62002e21a..9858db67c0 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F513C.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F513C.s @@ -13,7 +13,7 @@ glabel func_800F513C /* 8E60C 800F515C 3C018011 */ lui $at, %hi(D_8010D693) /* 8E610 800F5160 A022D693 */ sb $v0, %lo(D_8010D693)($at) /* 8E614 800F5164 0C03A635 */ jal func_800E98D4 -/* 8E618 800F5168 00000000 */ nop +/* 8E618 800F5168 00000000 */ nop /* 8E61C 800F516C 3C048011 */ lui $a0, %hi(D_8010D699) /* 8E620 800F5170 2484D699 */ addiu $a0, $a0, %lo(D_8010D699) /* 8E624 800F5174 3C018011 */ lui $at, %hi(D_8010D69A) diff --git a/asm/nonmatchings/code_9d10_len_1080/do_camera_type_0.s b/asm/nonmatchings/code_9d10_len_1080/do_camera_type_0.s index bb75a6a4b7..17935413b6 100644 --- a/asm/nonmatchings/code_9d10_len_1080/do_camera_type_0.s +++ b/asm/nonmatchings/code_9d10_len_1080/do_camera_type_0.s @@ -12,7 +12,7 @@ glabel do_camera_type_0 /* AC6C 8002F86C F7B40018 */ sdc1 $f20, 0x18($sp) /* AC70 8002F870 86020006 */ lh $v0, 6($s0) /* AC74 8002F874 10400011 */ beqz $v0, .L8002F8BC -/* AC78 8002F878 00000000 */ nop +/* AC78 8002F878 00000000 */ nop /* AC7C 8002F87C 3C01800A */ lui $at, %hi(D_8009A5EC) /* AC80 8002F880 C420A5EC */ lwc1 $f0, %lo(D_8009A5EC)($at) /* AC84 8002F884 3C01447A */ lui $at, 0x447a @@ -36,7 +36,7 @@ glabel do_camera_type_0 /* ACC8 8002F8C8 8E070050 */ lw $a3, 0x50($s0) /* ACCC 8002F8CC 4480C000 */ mtc1 $zero, $f24 /* ACD0 8002F8D0 0C00A720 */ jal atan2 -/* ACD4 8002F8D4 00000000 */ nop +/* ACD4 8002F8D4 00000000 */ nop /* ACD8 8002F8D8 4600C306 */ mov.s $f12, $f24 /* ACDC 8002F8DC 4600C386 */ mov.s $f14, $f24 /* ACE0 8002F8E0 C6040048 */ lwc1 $f4, 0x48($s0) @@ -53,19 +53,19 @@ glabel do_camera_type_0 /* AD0C 8002F90C 0C00A720 */ jal atan2 /* AD10 8002F910 E600006C */ swc1 $f0, 0x6c($s0) /* AD14 8002F914 4616B082 */ mul.s $f2, $f22, $f22 -/* AD18 8002F918 00000000 */ nop +/* AD18 8002F918 00000000 */ nop /* AD1C 8002F91C 4614A502 */ mul.s $f20, $f20, $f20 -/* AD20 8002F920 00000000 */ nop +/* AD20 8002F920 00000000 */ nop /* AD24 8002F924 46141300 */ add.s $f12, $f2, $f20 /* AD28 8002F928 46000007 */ neg.s $f0, $f0 /* AD2C 8002F92C E6000090 */ swc1 $f0, 0x90($s0) /* AD30 8002F930 46006004 */ sqrt.s $f0, $f12 /* AD34 8002F934 46000032 */ c.eq.s $f0, $f0 -/* AD38 8002F938 00000000 */ nop +/* AD38 8002F938 00000000 */ nop /* AD3C 8002F93C 45030004 */ bc1tl .L8002F950 /* AD40 8002F940 4600C306 */ mov.s $f12, $f24 /* AD44 8002F944 0C0187BC */ jal sqrtf -/* AD48 8002F948 00000000 */ nop +/* AD48 8002F948 00000000 */ nop /* AD4C 8002F94C 4600C306 */ mov.s $f12, $f24 .L8002F950: /* AD50 8002F950 46000007 */ neg.s $f0, $f0 @@ -82,5 +82,5 @@ glabel do_camera_type_0 /* AD7C 8002F97C D7B40018 */ ldc1 $f20, 0x18($sp) /* AD80 8002F980 03E00008 */ jr $ra /* AD84 8002F984 27BD0038 */ addiu $sp, $sp, 0x38 -/* AD88 8002F988 00000000 */ nop -/* AD8C 8002F98C 00000000 */ nop +/* AD88 8002F988 00000000 */ nop +/* AD8C 8002F98C 00000000 */ nop diff --git a/asm/nonmatchings/code_9d10_len_1080/do_camera_type_1.s b/asm/nonmatchings/code_9d10_len_1080/do_camera_type_1.s index d20fe309c6..c95b999ae8 100644 --- a/asm/nonmatchings/code_9d10_len_1080/do_camera_type_1.s +++ b/asm/nonmatchings/code_9d10_len_1080/do_camera_type_1.s @@ -15,7 +15,7 @@ glabel do_camera_type_1 /* A6B8 8002F2B8 F7B40040 */ sdc1 $f20, 0x40($sp) /* A6BC 8002F2BC 86220006 */ lh $v0, 6($s1) /* A6C0 8002F2C0 10400089 */ beqz $v0, .L8002F4E8 -/* A6C4 8002F2C4 00000000 */ nop +/* A6C4 8002F2C4 00000000 */ nop /* A6C8 8002F2C8 C63E0054 */ lwc1 $f30, 0x54($s1) /* A6CC 8002F2CC C63C005C */ lwc1 $f28, 0x5c($s1) /* A6D0 8002F2D0 C6380060 */ lwc1 $f24, 0x60($s1) @@ -28,7 +28,7 @@ glabel do_camera_type_1 /* A6EC 8002F2EC 4600F306 */ mov.s $f12, $f30 /* A6F0 8002F2F0 4600E386 */ mov.s $f14, $f28 /* A6F4 8002F2F4 44820000 */ mtc1 $v0, $f0 -/* A6F8 8002F2F8 00000000 */ nop +/* A6F8 8002F2F8 00000000 */ nop /* A6FC 8002F2FC 46800020 */ cvt.s.w $f0, $f0 /* A700 8002F300 00031040 */ sll $v0, $v1, 1 /* A704 8002F304 00431021 */ addu $v0, $v0, $v1 @@ -37,7 +37,7 @@ glabel do_camera_type_1 /* A710 8002F310 00021080 */ sll $v0, $v0, 2 /* A714 8002F314 E6200074 */ swc1 $f0, 0x74($s1) /* A718 8002F318 44820000 */ mtc1 $v0, $f0 -/* A71C 8002F31C 00000000 */ nop +/* A71C 8002F31C 00000000 */ nop /* A720 8002F320 46800020 */ cvt.s.w $f0, $f0 /* A724 8002F324 4406C000 */ mfc1 $a2, $f24 /* A728 8002F328 4407B000 */ mfc1 $a3, $f22 @@ -49,7 +49,7 @@ glabel do_camera_type_1 /* A740 8002F340 00021080 */ sll $v0, $v0, 2 /* A744 8002F344 E6200078 */ swc1 $f0, 0x78($s1) /* A748 8002F348 44820000 */ mtc1 $v0, $f0 -/* A74C 8002F34C 00000000 */ nop +/* A74C 8002F34C 00000000 */ nop /* A750 8002F350 46800020 */ cvt.s.w $f0, $f0 /* A754 8002F354 46020003 */ div.s $f0, $f0, $f2 /* A758 8002F358 0C00A720 */ jal atan2 @@ -68,11 +68,11 @@ glabel do_camera_type_1 /* A78C 8002F38C 00431021 */ addu $v0, $v0, $v1 /* A790 8002F390 00021080 */ sll $v0, $v0, 2 /* A794 8002F394 44821000 */ mtc1 $v0, $f2 -/* A798 8002F398 00000000 */ nop +/* A798 8002F398 00000000 */ nop /* A79C 8002F39C 468010A0 */ cvt.s.w $f2, $f2 /* A7A0 8002F3A0 46041083 */ div.s $f2, $f2, $f4 /* A7A4 8002F3A4 4602003C */ c.lt.s $f0, $f2 -/* A7A8 8002F3A8 00000000 */ nop +/* A7A8 8002F3A8 00000000 */ nop /* A7AC 8002F3AC 45020004 */ bc1fl .L8002F3C0 /* A7B0 8002F3B0 E6340084 */ swc1 $f20, 0x84($s1) /* A7B4 8002F3B4 C6340084 */ lwc1 $f20, 0x84($s1) @@ -89,7 +89,7 @@ glabel do_camera_type_1 /* A7D8 8002F3D8 C6200058 */ lwc1 $f0, 0x58($s1) /* A7DC 8002F3DC C624007C */ lwc1 $f4, 0x7c($s1) /* A7E0 8002F3E0 460A1082 */ mul.s $f2, $f2, $f10 -/* A7E4 8002F3E4 00000000 */ nop +/* A7E4 8002F3E4 00000000 */ nop /* A7E8 8002F3E8 C626005C */ lwc1 $f6, 0x5c($s1) /* A7EC 8002F3EC 3C0143B4 */ lui $at, 0x43b4 /* A7F0 8002F3F0 4481B000 */ mtc1 $at, $f22 @@ -107,21 +107,21 @@ glabel do_camera_type_1 /* A820 8002F420 C7B00010 */ lwc1 $f16, 0x10($sp) /* A824 8002F424 46000206 */ mov.s $f8, $f0 /* A828 8002F428 46104182 */ mul.s $f6, $f8, $f16 -/* A82C 8002F42C 00000000 */ nop +/* A82C 8002F42C 00000000 */ nop /* A830 8002F430 C63C0078 */ lwc1 $f28, 0x78($s1) /* A834 8002F434 461AE082 */ mul.s $f2, $f28, $f26 -/* A838 8002F438 00000000 */ nop +/* A838 8002F438 00000000 */ nop /* A83C 8002F43C 46008007 */ neg.s $f0, $f16 /* A840 8002F440 4600D002 */ mul.s $f0, $f26, $f0 -/* A844 8002F444 00000000 */ nop +/* A844 8002F444 00000000 */ nop /* A848 8002F448 4608E102 */ mul.s $f4, $f28, $f8 -/* A84C 8002F44C 00000000 */ nop +/* A84C 8002F44C 00000000 */ nop /* A850 8002F450 3C0140C9 */ lui $at, 0x40c9 /* A854 8002F454 34210FD0 */ ori $at, $at, 0xfd0 /* A858 8002F458 44815000 */ mtc1 $at, $f10 -/* A85C 8002F45C 00000000 */ nop +/* A85C 8002F45C 00000000 */ nop /* A860 8002F460 460AA282 */ mul.s $f10, $f20, $f10 -/* A864 8002F464 00000000 */ nop +/* A864 8002F464 00000000 */ nop /* A868 8002F468 46008606 */ mov.s $f24, $f16 /* A86C 8002F46C 4600C786 */ mov.s $f30, $f24 /* A870 8002F470 46023180 */ add.s $f6, $f6, $f2 @@ -135,13 +135,13 @@ glabel do_camera_type_1 /* A890 8002F490 4600C306 */ mov.s $f12, $f24 /* A894 8002F494 46000206 */ mov.s $f8, $f0 /* A898 8002F498 461E4182 */ mul.s $f6, $f8, $f30 -/* A89C 8002F49C 00000000 */ nop +/* A89C 8002F49C 00000000 */ nop /* A8A0 8002F4A0 461AE082 */ mul.s $f2, $f28, $f26 -/* A8A4 8002F4A4 00000000 */ nop +/* A8A4 8002F4A4 00000000 */ nop /* A8A8 8002F4A8 461ED102 */ mul.s $f4, $f26, $f30 -/* A8AC 8002F4AC 00000000 */ nop +/* A8AC 8002F4AC 00000000 */ nop /* A8B0 8002F4B0 4608E002 */ mul.s $f0, $f28, $f8 -/* A8B4 8002F4B4 00000000 */ nop +/* A8B4 8002F4B4 00000000 */ nop /* A8B8 8002F4B8 46023601 */ sub.s $f24, $f6, $f2 /* A8BC 8002F4BC C7B00010 */ lwc1 $f16, 0x10($sp) /* A8C0 8002F4C0 46002580 */ add.s $f22, $f4, $f0 @@ -172,7 +172,7 @@ glabel do_camera_type_1 /* A920 8002F520 00431021 */ addu $v0, $v0, $v1 /* A924 8002F524 00021080 */ sll $v0, $v0, 2 /* A928 8002F528 44828000 */ mtc1 $v0, $f16 -/* A92C 8002F52C 00000000 */ nop +/* A92C 8002F52C 00000000 */ nop /* A930 8002F530 46808420 */ cvt.s.w $f16, $f16 /* A934 8002F534 460A8283 */ div.s $f10, $f16, $f10 /* A938 8002F538 4600F306 */ mov.s $f12, $f30 @@ -188,14 +188,14 @@ glabel do_camera_type_1 /* A960 8002F560 8622001C */ lh $v0, 0x1c($s1) /* A964 8002F564 46009481 */ sub.s $f18, $f18, $f0 /* A968 8002F568 44820000 */ mtc1 $v0, $f0 -/* A96C 8002F56C 00000000 */ nop +/* A96C 8002F56C 00000000 */ nop /* A970 8002F570 46800020 */ cvt.s.w $f0, $f0 /* A974 8002F574 E6200074 */ swc1 $f0, 0x74($s1) /* A978 8002F578 3C013F00 */ lui $at, 0x3f00 /* A97C 8002F57C 44810000 */ mtc1 $at, $f0 /* A980 8002F580 86230020 */ lh $v1, 0x20($s1) /* A984 8002F584 46008282 */ mul.s $f10, $f16, $f0 -/* A988 8002F588 00000000 */ nop +/* A988 8002F588 00000000 */ nop /* A98C 8002F58C C622004C */ lwc1 $f2, 0x4c($s1) /* A990 8002F590 00031040 */ sll $v0, $v1, 1 /* A994 8002F594 00431021 */ addu $v0, $v0, $v1 @@ -204,11 +204,11 @@ glabel do_camera_type_1 /* A9A0 8002F5A0 00431021 */ addu $v0, $v0, $v1 /* A9A4 8002F5A4 00021080 */ sll $v0, $v0, 2 /* A9A8 8002F5A8 46009482 */ mul.s $f18, $f18, $f0 -/* A9AC 8002F5AC 00000000 */ nop +/* A9AC 8002F5AC 00000000 */ nop /* A9B0 8002F5B0 3C014120 */ lui $at, 0x4120 /* A9B4 8002F5B4 44810000 */ mtc1 $at, $f0 /* A9B8 8002F5B8 44822000 */ mtc1 $v0, $f4 -/* A9BC 8002F5BC 00000000 */ nop +/* A9BC 8002F5BC 00000000 */ nop /* A9C0 8002F5C0 46802120 */ cvt.s.w $f4, $f4 /* A9C4 8002F5C4 46003183 */ div.s $f6, $f6, $f0 /* A9C8 8002F5C8 46001006 */ mov.s $f0, $f2 @@ -237,11 +237,11 @@ glabel do_camera_type_1 /* AA24 8002F624 00431021 */ addu $v0, $v0, $v1 /* AA28 8002F628 00021080 */ sll $v0, $v0, 2 /* AA2C 8002F62C 44821000 */ mtc1 $v0, $f2 -/* AA30 8002F630 00000000 */ nop +/* AA30 8002F630 00000000 */ nop /* AA34 8002F634 468010A0 */ cvt.s.w $f2, $f2 /* AA38 8002F638 46041083 */ div.s $f2, $f2, $f4 /* AA3C 8002F63C 4602003C */ c.lt.s $f0, $f2 -/* AA40 8002F640 00000000 */ nop +/* AA40 8002F640 00000000 */ nop /* AA44 8002F644 45020002 */ bc1fl .L8002F650 /* AA48 8002F648 E6340084 */ swc1 $f20, 0x84($s1) /* AA4C 8002F64C C6340084 */ lwc1 $f20, 0x84($s1) @@ -256,7 +256,7 @@ glabel do_camera_type_1 /* AA6C 8002F66C 3C014120 */ lui $at, 0x4120 /* AA70 8002F670 44811000 */ mtc1 $at, $f2 /* AA74 8002F674 460A2102 */ mul.s $f4, $f4, $f10 -/* AA78 8002F678 00000000 */ nop +/* AA78 8002F678 00000000 */ nop /* AA7C 8002F67C 46020003 */ div.s $f0, $f0, $f2 /* AA80 8002F680 C6220088 */ lwc1 $f2, 0x88($s1) /* AA84 8002F684 3C0143B4 */ lui $at, 0x43b4 @@ -274,21 +274,21 @@ glabel do_camera_type_1 /* AAB4 8002F6B4 C7B00010 */ lwc1 $f16, 0x10($sp) /* AAB8 8002F6B8 46000206 */ mov.s $f8, $f0 /* AABC 8002F6BC 46104182 */ mul.s $f6, $f8, $f16 -/* AAC0 8002F6C0 00000000 */ nop +/* AAC0 8002F6C0 00000000 */ nop /* AAC4 8002F6C4 C63C0078 */ lwc1 $f28, 0x78($s1) /* AAC8 8002F6C8 461AE082 */ mul.s $f2, $f28, $f26 -/* AACC 8002F6CC 00000000 */ nop +/* AACC 8002F6CC 00000000 */ nop /* AAD0 8002F6D0 46008007 */ neg.s $f0, $f16 /* AAD4 8002F6D4 4600D002 */ mul.s $f0, $f26, $f0 -/* AAD8 8002F6D8 00000000 */ nop +/* AAD8 8002F6D8 00000000 */ nop /* AADC 8002F6DC 4608E102 */ mul.s $f4, $f28, $f8 -/* AAE0 8002F6E0 00000000 */ nop +/* AAE0 8002F6E0 00000000 */ nop /* AAE4 8002F6E4 3C0140C9 */ lui $at, 0x40c9 /* AAE8 8002F6E8 34210FD0 */ ori $at, $at, 0xfd0 /* AAEC 8002F6EC 44815000 */ mtc1 $at, $f10 -/* AAF0 8002F6F0 00000000 */ nop +/* AAF0 8002F6F0 00000000 */ nop /* AAF4 8002F6F4 460AA282 */ mul.s $f10, $f20, $f10 -/* AAF8 8002F6F8 00000000 */ nop +/* AAF8 8002F6F8 00000000 */ nop /* AAFC 8002F6FC 46008606 */ mov.s $f24, $f16 /* AB00 8002F700 4600C786 */ mov.s $f30, $f24 /* AB04 8002F704 46023180 */ add.s $f6, $f6, $f2 @@ -302,13 +302,13 @@ glabel do_camera_type_1 /* AB24 8002F724 4600C306 */ mov.s $f12, $f24 /* AB28 8002F728 46000206 */ mov.s $f8, $f0 /* AB2C 8002F72C 461E4102 */ mul.s $f4, $f8, $f30 -/* AB30 8002F730 00000000 */ nop +/* AB30 8002F730 00000000 */ nop /* AB34 8002F734 461AE002 */ mul.s $f0, $f28, $f26 -/* AB38 8002F738 00000000 */ nop +/* AB38 8002F738 00000000 */ nop /* AB3C 8002F73C 461ED182 */ mul.s $f6, $f26, $f30 -/* AB40 8002F740 00000000 */ nop +/* AB40 8002F740 00000000 */ nop /* AB44 8002F744 4608E082 */ mul.s $f2, $f28, $f8 -/* AB48 8002F748 00000000 */ nop +/* AB48 8002F748 00000000 */ nop /* AB4C 8002F74C 46002601 */ sub.s $f24, $f4, $f0 /* AB50 8002F750 C7B00010 */ lwc1 $f16, 0x10($sp) /* AB54 8002F754 46023580 */ add.s $f22, $f6, $f2 @@ -343,19 +343,19 @@ glabel do_camera_type_1 /* ABC8 8002F7C8 0C00A720 */ jal atan2 /* ABCC 8002F7CC E620006C */ swc1 $f0, 0x6c($s1) /* ABD0 8002F7D0 461EF102 */ mul.s $f4, $f30, $f30 -/* ABD4 8002F7D4 00000000 */ nop +/* ABD4 8002F7D4 00000000 */ nop /* ABD8 8002F7D8 461CE082 */ mul.s $f2, $f28, $f28 -/* ABDC 8002F7DC 00000000 */ nop +/* ABDC 8002F7DC 00000000 */ nop /* ABE0 8002F7E0 46022300 */ add.s $f12, $f4, $f2 /* ABE4 8002F7E4 46000007 */ neg.s $f0, $f0 /* ABE8 8002F7E8 E6200090 */ swc1 $f0, 0x90($s1) /* ABEC 8002F7EC 46006004 */ sqrt.s $f0, $f12 /* ABF0 8002F7F0 46000032 */ c.eq.s $f0, $f0 -/* ABF4 8002F7F4 00000000 */ nop +/* ABF4 8002F7F4 00000000 */ nop /* ABF8 8002F7F8 45030004 */ bc1tl .L8002F80C /* ABFC 8002F7FC 4600A306 */ mov.s $f12, $f20 /* AC00 8002F800 0C0187BC */ jal sqrtf -/* AC04 8002F804 00000000 */ nop +/* AC04 8002F804 00000000 */ nop /* AC08 8002F808 4600A306 */ mov.s $f12, $f20 .L8002F80C: /* AC0C 8002F80C 46000007 */ neg.s $f0, $f0 diff --git a/asm/nonmatchings/code_9d10_len_1080/do_camera_type_2.s b/asm/nonmatchings/code_9d10_len_1080/do_camera_type_2.s index a92515f362..a73bfa6e7a 100644 --- a/asm/nonmatchings/code_9d10_len_1080/do_camera_type_2.s +++ b/asm/nonmatchings/code_9d10_len_1080/do_camera_type_2.s @@ -17,26 +17,26 @@ glabel do_camera_type_2 /* A128 8002ED28 C426A5EC */ lwc1 $f6, %lo(D_8009A5EC)($at) /* A12C 8002ED2C 86030022 */ lh $v1, 0x22($s0) /* A130 8002ED30 44822000 */ mtc1 $v0, $f4 -/* A134 8002ED34 00000000 */ nop +/* A134 8002ED34 00000000 */ nop /* A138 8002ED38 46802120 */ cvt.s.w $f4, $f4 /* A13C 8002ED3C 44831000 */ mtc1 $v1, $f2 -/* A140 8002ED40 00000000 */ nop +/* A140 8002ED40 00000000 */ nop /* A144 8002ED44 468010A0 */ cvt.s.w $f2, $f2 /* A148 8002ED48 46062102 */ mul.s $f4, $f4, $f6 -/* A14C 8002ED4C 00000000 */ nop +/* A14C 8002ED4C 00000000 */ nop /* A150 8002ED50 8602001E */ lh $v0, 0x1e($s0) /* A154 8002ED54 86030006 */ lh $v1, 6($s0) /* A158 8002ED58 44820000 */ mtc1 $v0, $f0 -/* A15C 8002ED5C 00000000 */ nop +/* A15C 8002ED5C 00000000 */ nop /* A160 8002ED60 46800020 */ cvt.s.w $f0, $f0 /* A164 8002ED64 8602001C */ lh $v0, 0x1c($s0) /* A168 8002ED68 46061082 */ mul.s $f2, $f2, $f6 -/* A16C 8002ED6C 00000000 */ nop +/* A16C 8002ED6C 00000000 */ nop /* A170 8002ED70 E6000070 */ swc1 $f0, 0x70($s0) /* A174 8002ED74 46000186 */ mov.s $f6, $f0 /* A178 8002ED78 E6060084 */ swc1 $f6, 0x84($s0) /* A17C 8002ED7C 44820000 */ mtc1 $v0, $f0 -/* A180 8002ED80 00000000 */ nop +/* A180 8002ED80 00000000 */ nop /* A184 8002ED84 46800020 */ cvt.s.w $f0, $f0 /* A188 8002ED88 E6000074 */ swc1 $f0, 0x74($s0) /* A18C 8002ED8C E6040078 */ swc1 $f4, 0x78($s0) @@ -54,7 +54,7 @@ glabel do_camera_type_2 /* A1BC 8002EDBC 3C0143B4 */ lui $at, 0x43b4 /* A1C0 8002EDC0 4481A000 */ mtc1 $at, $f20 /* A1C4 8002EDC4 46161082 */ mul.s $f2, $f2, $f22 -/* A1C8 8002EDC8 00000000 */ nop +/* A1C8 8002EDC8 00000000 */ nop /* A1CC 8002EDCC A6000006 */ sh $zero, 6($s0) /* A1D0 8002EDD0 E6180098 */ swc1 $f24, 0x98($s0) /* A1D4 8002EDD4 E618009C */ swc1 $f24, 0x9c($s0) @@ -70,18 +70,18 @@ glabel do_camera_type_2 /* A1FC 8002EDFC 4600D306 */ mov.s $f12, $f26 /* A200 8002EE00 46000306 */ mov.s $f12, $f0 /* A204 8002EE04 46186202 */ mul.s $f8, $f12, $f24 -/* A208 8002EE08 00000000 */ nop +/* A208 8002EE08 00000000 */ nop /* A20C 8002EE0C 4600C087 */ neg.s $f2, $f24 /* A210 8002EE10 4602F082 */ mul.s $f2, $f30, $f2 -/* A214 8002EE14 00000000 */ nop +/* A214 8002EE14 00000000 */ nop /* A218 8002EE18 C61C0078 */ lwc1 $f28, 0x78($s0) /* A21C 8002EE1C 461EE102 */ mul.s $f4, $f28, $f30 -/* A220 8002EE20 00000000 */ nop +/* A220 8002EE20 00000000 */ nop /* A224 8002EE24 460CE182 */ mul.s $f6, $f28, $f12 -/* A228 8002EE28 00000000 */ nop +/* A228 8002EE28 00000000 */ nop /* A22C 8002EE2C C6000070 */ lwc1 $f0, 0x70($s0) /* A230 8002EE30 46160002 */ mul.s $f0, $f0, $f22 -/* A234 8002EE34 00000000 */ nop +/* A234 8002EE34 00000000 */ nop /* A238 8002EE38 4600C286 */ mov.s $f10, $f24 /* A23C 8002EE3C 46005586 */ mov.s $f22, $f10 /* A240 8002EE40 46044600 */ add.s $f24, $f8, $f4 @@ -94,13 +94,13 @@ glabel do_camera_type_2 /* A25C 8002EE5C 4600D306 */ mov.s $f12, $f26 /* A260 8002EE60 46000306 */ mov.s $f12, $f0 /* A264 8002EE64 46166202 */ mul.s $f8, $f12, $f22 -/* A268 8002EE68 00000000 */ nop +/* A268 8002EE68 00000000 */ nop /* A26C 8002EE6C 4616F182 */ mul.s $f6, $f30, $f22 -/* A270 8002EE70 00000000 */ nop +/* A270 8002EE70 00000000 */ nop /* A274 8002EE74 461EE102 */ mul.s $f4, $f28, $f30 -/* A278 8002EE78 00000000 */ nop +/* A278 8002EE78 00000000 */ nop /* A27C 8002EE7C 460CE082 */ mul.s $f2, $f28, $f12 -/* A280 8002EE80 00000000 */ nop +/* A280 8002EE80 00000000 */ nop /* A284 8002EE84 C600004C */ lwc1 $f0, 0x4c($s0) /* A288 8002EE88 46180400 */ add.s $f16, $f0, $f24 /* A28C 8002EE8C 46044281 */ sub.s $f10, $f8, $f4 @@ -128,13 +128,13 @@ glabel do_camera_type_2 /* A2E0 8002EEE0 44811000 */ mtc1 $at, $f2 /* A2E4 8002EEE4 46002005 */ abs.s $f0, $f4 /* A2E8 8002EEE8 4600103C */ c.lt.s $f2, $f0 -/* A2EC 8002EEEC 00000000 */ nop +/* A2EC 8002EEEC 00000000 */ nop /* A2F0 8002EEF0 4502000C */ bc1fl .L8002EF24 /* A2F4 8002EEF4 46008005 */ abs.s $f0, $f16 /* A2F8 8002EEF8 44800000 */ mtc1 $zero, $f0 -/* A2FC 8002EEFC 00000000 */ nop +/* A2FC 8002EEFC 00000000 */ nop /* A300 8002EF00 4600203C */ c.lt.s $f4, $f0 -/* A304 8002EF04 00000000 */ nop +/* A304 8002EF04 00000000 */ nop /* A308 8002EF08 45000005 */ bc1f .L8002EF20 /* A30C 8002EF0C 46001106 */ mov.s $f4, $f2 /* A310 8002EF10 3C01C180 */ lui $at, 0xc180 @@ -145,13 +145,13 @@ glabel do_camera_type_2 /* A320 8002EF20 46008005 */ abs.s $f0, $f16 .L8002EF24: /* A324 8002EF24 4600103C */ c.lt.s $f2, $f0 -/* A328 8002EF28 00000000 */ nop +/* A328 8002EF28 00000000 */ nop /* A32C 8002EF2C 45000009 */ bc1f .L8002EF54 -/* A330 8002EF30 00000000 */ nop +/* A330 8002EF30 00000000 */ nop /* A334 8002EF34 44800000 */ mtc1 $zero, $f0 -/* A338 8002EF38 00000000 */ nop +/* A338 8002EF38 00000000 */ nop /* A33C 8002EF3C 4600803C */ c.lt.s $f16, $f0 -/* A340 8002EF40 00000000 */ nop +/* A340 8002EF40 00000000 */ nop /* A344 8002EF44 45000003 */ bc1f .L8002EF54 /* A348 8002EF48 46001406 */ mov.s $f16, $f2 /* A34C 8002EF4C 3C01C180 */ lui $at, 0xc180 @@ -161,13 +161,13 @@ glabel do_camera_type_2 /* A358 8002EF58 44811000 */ mtc1 $at, $f2 /* A35C 8002EF5C 46004005 */ abs.s $f0, $f8 /* A360 8002EF60 4600103C */ c.lt.s $f2, $f0 -/* A364 8002EF64 00000000 */ nop +/* A364 8002EF64 00000000 */ nop /* A368 8002EF68 45000009 */ bc1f .L8002EF90 -/* A36C 8002EF6C 00000000 */ nop +/* A36C 8002EF6C 00000000 */ nop /* A370 8002EF70 44800000 */ mtc1 $zero, $f0 -/* A374 8002EF74 00000000 */ nop +/* A374 8002EF74 00000000 */ nop /* A378 8002EF78 4600403C */ c.lt.s $f8, $f0 -/* A37C 8002EF7C 00000000 */ nop +/* A37C 8002EF7C 00000000 */ nop /* A380 8002EF80 45000003 */ bc1f .L8002EF90 /* A384 8002EF84 46001206 */ mov.s $f8, $f2 /* A388 8002EF88 3C01C180 */ lui $at, 0xc180 @@ -175,20 +175,20 @@ glabel do_camera_type_2 .L8002EF90: /* A390 8002EF90 3C013F00 */ lui $at, 0x3f00 /* A394 8002EF94 4481A000 */ mtc1 $at, $f20 -/* A398 8002EF98 00000000 */ nop +/* A398 8002EF98 00000000 */ nop /* A39C 8002EF9C 46142082 */ mul.s $f2, $f4, $f20 -/* A3A0 8002EFA0 00000000 */ nop +/* A3A0 8002EFA0 00000000 */ nop /* A3A4 8002EFA4 46148182 */ mul.s $f6, $f16, $f20 -/* A3A8 8002EFA8 00000000 */ nop +/* A3A8 8002EFA8 00000000 */ nop /* A3AC 8002EFAC 46144202 */ mul.s $f8, $f8, $f20 -/* A3B0 8002EFB0 00000000 */ nop +/* A3B0 8002EFB0 00000000 */ nop /* A3B4 8002EFB4 C6000074 */ lwc1 $f0, 0x74($s0) /* A3B8 8002EFB8 3C0140C9 */ lui $at, 0x40c9 /* A3BC 8002EFBC 34210FD0 */ ori $at, $at, 0xfd0 /* A3C0 8002EFC0 4481B000 */ mtc1 $at, $f22 -/* A3C4 8002EFC4 00000000 */ nop +/* A3C4 8002EFC4 00000000 */ nop /* A3C8 8002EFC8 46160002 */ mul.s $f0, $f0, $f22 -/* A3CC 8002EFCC 00000000 */ nop +/* A3CC 8002EFCC 00000000 */ nop /* A3D0 8002EFD0 4480C000 */ mtc1 $zero, $f24 /* A3D4 8002EFD4 C6040048 */ lwc1 $f4, 0x48($s0) /* A3D8 8002EFD8 3C0143B4 */ lui $at, 0x43b4 @@ -209,18 +209,18 @@ glabel do_camera_type_2 /* A414 8002F014 4600D306 */ mov.s $f12, $f26 /* A418 8002F018 46000306 */ mov.s $f12, $f0 /* A41C 8002F01C 46186202 */ mul.s $f8, $f12, $f24 -/* A420 8002F020 00000000 */ nop +/* A420 8002F020 00000000 */ nop /* A424 8002F024 4600C087 */ neg.s $f2, $f24 /* A428 8002F028 4602F082 */ mul.s $f2, $f30, $f2 -/* A42C 8002F02C 00000000 */ nop +/* A42C 8002F02C 00000000 */ nop /* A430 8002F030 C61C0078 */ lwc1 $f28, 0x78($s0) /* A434 8002F034 461EE102 */ mul.s $f4, $f28, $f30 -/* A438 8002F038 00000000 */ nop +/* A438 8002F038 00000000 */ nop /* A43C 8002F03C 460CE182 */ mul.s $f6, $f28, $f12 -/* A440 8002F040 00000000 */ nop +/* A440 8002F040 00000000 */ nop /* A444 8002F044 C6000070 */ lwc1 $f0, 0x70($s0) /* A448 8002F048 46160002 */ mul.s $f0, $f0, $f22 -/* A44C 8002F04C 00000000 */ nop +/* A44C 8002F04C 00000000 */ nop /* A450 8002F050 4600C286 */ mov.s $f10, $f24 /* A454 8002F054 3C0143B4 */ lui $at, 0x43b4 /* A458 8002F058 44819000 */ mtc1 $at, $f18 @@ -235,42 +235,42 @@ glabel do_camera_type_2 /* A47C 8002F07C 4600D306 */ mov.s $f12, $f26 /* A480 8002F080 46000306 */ mov.s $f12, $f0 /* A484 8002F084 461EE002 */ mul.s $f0, $f28, $f30 -/* A488 8002F088 00000000 */ nop +/* A488 8002F088 00000000 */ nop /* A48C 8002F08C C602004C */ lwc1 $f2, 0x4c($s0) /* A490 8002F090 46181400 */ add.s $f16, $f2, $f24 /* A494 8002F094 C6020040 */ lwc1 $f2, 0x40($s0) /* A498 8002F098 46028081 */ sub.s $f2, $f16, $f2 /* A49C 8002F09C 46141402 */ mul.s $f16, $f2, $f20 -/* A4A0 8002F0A0 00000000 */ nop +/* A4A0 8002F0A0 00000000 */ nop /* A4A4 8002F0A4 46166082 */ mul.s $f2, $f12, $f22 -/* A4A8 8002F0A8 00000000 */ nop +/* A4A8 8002F0A8 00000000 */ nop /* A4AC 8002F0AC 46001281 */ sub.s $f10, $f2, $f0 /* A4B0 8002F0B0 4616F082 */ mul.s $f2, $f30, $f22 -/* A4B4 8002F0B4 00000000 */ nop +/* A4B4 8002F0B4 00000000 */ nop /* A4B8 8002F0B8 C6000048 */ lwc1 $f0, 0x48($s0) /* A4BC 8002F0BC 460A0100 */ add.s $f4, $f0, $f10 /* A4C0 8002F0C0 C600003C */ lwc1 $f0, 0x3c($s0) /* A4C4 8002F0C4 46002001 */ sub.s $f0, $f4, $f0 /* A4C8 8002F0C8 46140102 */ mul.s $f4, $f0, $f20 -/* A4CC 8002F0CC 00000000 */ nop +/* A4CC 8002F0CC 00000000 */ nop /* A4D0 8002F0D0 460CE002 */ mul.s $f0, $f28, $f12 -/* A4D4 8002F0D4 00000000 */ nop +/* A4D4 8002F0D4 00000000 */ nop /* A4D8 8002F0D8 46001080 */ add.s $f2, $f2, $f0 /* A4DC 8002F0DC C6000050 */ lwc1 $f0, 0x50($s0) /* A4E0 8002F0E0 46020200 */ add.s $f8, $f0, $f2 /* A4E4 8002F0E4 C6000044 */ lwc1 $f0, 0x44($s0) /* A4E8 8002F0E8 46004001 */ sub.s $f0, $f8, $f0 /* A4EC 8002F0EC 46140202 */ mul.s $f8, $f0, $f20 -/* A4F0 8002F0F0 00000000 */ nop +/* A4F0 8002F0F0 00000000 */ nop /* A4F4 8002F0F4 3C014180 */ lui $at, 0x4180 /* A4F8 8002F0F8 44811000 */ mtc1 $at, $f2 /* A4FC 8002F0FC 46002005 */ abs.s $f0, $f4 /* A500 8002F100 4600103C */ c.lt.s $f2, $f0 -/* A504 8002F104 00000000 */ nop +/* A504 8002F104 00000000 */ nop /* A508 8002F108 4502000A */ bc1fl .L8002F134 /* A50C 8002F10C 46008005 */ abs.s $f0, $f16 /* A510 8002F110 4616203C */ c.lt.s $f4, $f22 -/* A514 8002F114 00000000 */ nop +/* A514 8002F114 00000000 */ nop /* A518 8002F118 45000005 */ bc1f .L8002F130 /* A51C 8002F11C 46001106 */ mov.s $f4, $f2 /* A520 8002F120 3C01C180 */ lui $at, 0xc180 @@ -281,13 +281,13 @@ glabel do_camera_type_2 /* A530 8002F130 46008005 */ abs.s $f0, $f16 .L8002F134: /* A534 8002F134 4600103C */ c.lt.s $f2, $f0 -/* A538 8002F138 00000000 */ nop +/* A538 8002F138 00000000 */ nop /* A53C 8002F13C 45000009 */ bc1f .L8002F164 -/* A540 8002F140 00000000 */ nop +/* A540 8002F140 00000000 */ nop /* A544 8002F144 44800000 */ mtc1 $zero, $f0 -/* A548 8002F148 00000000 */ nop +/* A548 8002F148 00000000 */ nop /* A54C 8002F14C 4600803C */ c.lt.s $f16, $f0 -/* A550 8002F150 00000000 */ nop +/* A550 8002F150 00000000 */ nop /* A554 8002F154 45000003 */ bc1f .L8002F164 /* A558 8002F158 46001406 */ mov.s $f16, $f2 /* A55C 8002F15C 3C01C180 */ lui $at, 0xc180 @@ -297,13 +297,13 @@ glabel do_camera_type_2 /* A568 8002F168 44811000 */ mtc1 $at, $f2 /* A56C 8002F16C 46004005 */ abs.s $f0, $f8 /* A570 8002F170 4600103C */ c.lt.s $f2, $f0 -/* A574 8002F174 00000000 */ nop +/* A574 8002F174 00000000 */ nop /* A578 8002F178 45000009 */ bc1f .L8002F1A0 -/* A57C 8002F17C 00000000 */ nop +/* A57C 8002F17C 00000000 */ nop /* A580 8002F180 44800000 */ mtc1 $zero, $f0 -/* A584 8002F184 00000000 */ nop +/* A584 8002F184 00000000 */ nop /* A588 8002F188 4600403C */ c.lt.s $f8, $f0 -/* A58C 8002F18C 00000000 */ nop +/* A58C 8002F18C 00000000 */ nop /* A590 8002F190 45000003 */ bc1f .L8002F1A0 /* A594 8002F194 46001206 */ mov.s $f8, $f2 /* A598 8002F198 3C01C180 */ lui $at, 0xc180 @@ -339,19 +339,19 @@ glabel do_camera_type_2 /* A60C 8002F20C 0C00A720 */ jal atan2 /* A610 8002F210 4600A386 */ mov.s $f14, $f20 /* A614 8002F214 4616B102 */ mul.s $f4, $f22, $f22 -/* A618 8002F218 00000000 */ nop +/* A618 8002F218 00000000 */ nop /* A61C 8002F21C 461CE082 */ mul.s $f2, $f28, $f28 -/* A620 8002F220 00000000 */ nop +/* A620 8002F220 00000000 */ nop /* A624 8002F224 46022300 */ add.s $f12, $f4, $f2 /* A628 8002F228 46000007 */ neg.s $f0, $f0 /* A62C 8002F22C E6000090 */ swc1 $f0, 0x90($s0) /* A630 8002F230 46006004 */ sqrt.s $f0, $f12 /* A634 8002F234 46000032 */ c.eq.s $f0, $f0 -/* A638 8002F238 00000000 */ nop +/* A638 8002F238 00000000 */ nop /* A63C 8002F23C 45030004 */ bc1tl .L8002F250 /* A640 8002F240 4600A306 */ mov.s $f12, $f20 /* A644 8002F244 0C0187BC */ jal sqrtf -/* A648 8002F248 00000000 */ nop +/* A648 8002F248 00000000 */ nop /* A64C 8002F24C 4600A306 */ mov.s $f12, $f20 .L8002F250: /* A650 8002F250 46000007 */ neg.s $f0, $f0 diff --git a/asm/nonmatchings/code_9d10_len_1080/do_camera_type_4.s b/asm/nonmatchings/code_9d10_len_1080/do_camera_type_4.s index 047ce5fddf..6a6c2af833 100644 --- a/asm/nonmatchings/code_9d10_len_1080/do_camera_type_4.s +++ b/asm/nonmatchings/code_9d10_len_1080/do_camera_type_4.s @@ -15,33 +15,33 @@ glabel do_camera_type_4 /* 9D38 8002E938 8602001C */ lh $v0, 0x1c($s0) /* 9D3C 8002E93C C6000060 */ lwc1 $f0, 0x60($s0) /* 9D40 8002E940 4482B000 */ mtc1 $v0, $f22 -/* 9D44 8002E944 00000000 */ nop +/* 9D44 8002E944 00000000 */ nop /* 9D48 8002E948 4680B5A0 */ cvt.s.w $f22, $f22 /* 9D4C 8002E94C 4600B03C */ c.lt.s $f22, $f0 -/* 9D50 8002E950 00000000 */ nop +/* 9D50 8002E950 00000000 */ nop /* 9D54 8002E954 45030001 */ bc1tl .L8002E95C /* 9D58 8002E958 4600B006 */ mov.s $f0, $f22 .L8002E95C: /* 9D5C 8002E95C 4600B107 */ neg.s $f4, $f22 /* 9D60 8002E960 4604003C */ c.lt.s $f0, $f4 -/* 9D64 8002E964 00000000 */ nop +/* 9D64 8002E964 00000000 */ nop /* 9D68 8002E968 45030001 */ bc1tl .L8002E970 /* 9D6C 8002E96C 46002006 */ mov.s $f0, $f4 .L8002E970: /* 9D70 8002E970 C6080068 */ lwc1 $f8, 0x68($s0) /* 9D74 8002E974 8602001E */ lh $v0, 0x1e($s0) /* 9D78 8002E978 4482C000 */ mtc1 $v0, $f24 -/* 9D7C 8002E97C 00000000 */ nop +/* 9D7C 8002E97C 00000000 */ nop /* 9D80 8002E980 4680C620 */ cvt.s.w $f24, $f24 /* 9D84 8002E984 4608C03C */ c.lt.s $f24, $f8 -/* 9D88 8002E988 00000000 */ nop +/* 9D88 8002E988 00000000 */ nop /* 9D8C 8002E98C 45000002 */ bc1f .L8002E998 /* 9D90 8002E990 E6000054 */ swc1 $f0, 0x54($s0) /* 9D94 8002E994 4600C206 */ mov.s $f8, $f24 .L8002E998: /* 9D98 8002E998 4600C007 */ neg.s $f0, $f24 /* 9D9C 8002E99C 4600403C */ c.lt.s $f8, $f0 -/* 9DA0 8002E9A0 00000000 */ nop +/* 9DA0 8002E9A0 00000000 */ nop /* 9DA4 8002E9A4 45030001 */ bc1tl .L8002E9AC /* 9DA8 8002E9A8 46000206 */ mov.s $f8, $f0 .L8002E9AC: @@ -50,18 +50,18 @@ glabel do_camera_type_4 /* 9DB4 8002E9B4 C424A5EC */ lwc1 $f4, %lo(D_8009A5EC)($at) /* 9DB8 8002E9B8 AE000070 */ sw $zero, 0x70($s0) /* 9DBC 8002E9BC 44821000 */ mtc1 $v0, $f2 -/* 9DC0 8002E9C0 00000000 */ nop +/* 9DC0 8002E9C0 00000000 */ nop /* 9DC4 8002E9C4 468010A0 */ cvt.s.w $f2, $f2 /* 9DC8 8002E9C8 46041082 */ mul.s $f2, $f2, $f4 -/* 9DCC 8002E9CC 00000000 */ nop +/* 9DCC 8002E9CC 00000000 */ nop /* 9DD0 8002E9D0 86020022 */ lh $v0, 0x22($s0) /* 9DD4 8002E9D4 C6060070 */ lwc1 $f6, 0x70($s0) /* 9DD8 8002E9D8 44820000 */ mtc1 $v0, $f0 -/* 9DDC 8002E9DC 00000000 */ nop +/* 9DDC 8002E9DC 00000000 */ nop /* 9DE0 8002E9E0 46800020 */ cvt.s.w $f0, $f0 /* 9DE4 8002E9E4 86020006 */ lh $v0, 6($s0) /* 9DE8 8002E9E8 46040002 */ mul.s $f0, $f0, $f4 -/* 9DEC 8002E9EC 00000000 */ nop +/* 9DEC 8002E9EC 00000000 */ nop /* 9DF0 8002E9F0 E608005C */ swc1 $f8, 0x5c($s0) /* 9DF4 8002E9F4 AE000074 */ sw $zero, 0x74($s0) /* 9DF8 8002E9F8 E6060084 */ swc1 $f6, 0x84($s0) @@ -80,7 +80,7 @@ glabel do_camera_type_4 /* 9E2C 8002EA2C 3C0143B4 */ lui $at, 0x43b4 /* 9E30 8002EA30 4481A000 */ mtc1 $at, $f20 /* 9E34 8002EA34 46161082 */ mul.s $f2, $f2, $f22 -/* 9E38 8002EA38 00000000 */ nop +/* 9E38 8002EA38 00000000 */ nop /* 9E3C 8002EA3C A6000006 */ sh $zero, 6($s0) /* 9E40 8002EA40 E61E0098 */ swc1 $f30, 0x98($s0) /* 9E44 8002EA44 E61E009C */ swc1 $f30, 0x9c($s0) @@ -96,18 +96,18 @@ glabel do_camera_type_4 /* 9E6C 8002EA6C 4600D306 */ mov.s $f12, $f26 /* 9E70 8002EA70 46000286 */ mov.s $f10, $f0 /* 9E74 8002EA74 461E5202 */ mul.s $f8, $f10, $f30 -/* 9E78 8002EA78 00000000 */ nop +/* 9E78 8002EA78 00000000 */ nop /* 9E7C 8002EA7C 4600F087 */ neg.s $f2, $f30 /* 9E80 8002EA80 4602E082 */ mul.s $f2, $f28, $f2 -/* 9E84 8002EA84 00000000 */ nop +/* 9E84 8002EA84 00000000 */ nop /* 9E88 8002EA88 C6180078 */ lwc1 $f24, 0x78($s0) /* 9E8C 8002EA8C 461CC102 */ mul.s $f4, $f24, $f28 -/* 9E90 8002EA90 00000000 */ nop +/* 9E90 8002EA90 00000000 */ nop /* 9E94 8002EA94 460AC182 */ mul.s $f6, $f24, $f10 -/* 9E98 8002EA98 00000000 */ nop +/* 9E98 8002EA98 00000000 */ nop /* 9E9C 8002EA9C C6000070 */ lwc1 $f0, 0x70($s0) /* 9EA0 8002EAA0 46160002 */ mul.s $f0, $f0, $f22 -/* 9EA4 8002EAA4 00000000 */ nop +/* 9EA4 8002EAA4 00000000 */ nop /* 9EA8 8002EAA8 4600F286 */ mov.s $f10, $f30 /* 9EAC 8002EAAC 46005586 */ mov.s $f22, $f10 /* 9EB0 8002EAB0 46044780 */ add.s $f30, $f8, $f4 @@ -120,13 +120,13 @@ glabel do_camera_type_4 /* 9ECC 8002EACC 4600D306 */ mov.s $f12, $f26 /* 9ED0 8002EAD0 46000286 */ mov.s $f10, $f0 /* 9ED4 8002EAD4 46165182 */ mul.s $f6, $f10, $f22 -/* 9ED8 8002EAD8 00000000 */ nop +/* 9ED8 8002EAD8 00000000 */ nop /* 9EDC 8002EADC 4616E102 */ mul.s $f4, $f28, $f22 -/* 9EE0 8002EAE0 00000000 */ nop +/* 9EE0 8002EAE0 00000000 */ nop /* 9EE4 8002EAE4 461CC082 */ mul.s $f2, $f24, $f28 -/* 9EE8 8002EAE8 00000000 */ nop +/* 9EE8 8002EAE8 00000000 */ nop /* 9EEC 8002EAEC 460AC002 */ mul.s $f0, $f24, $f10 -/* 9EF0 8002EAF0 00000000 */ nop +/* 9EF0 8002EAF0 00000000 */ nop /* 9EF4 8002EAF4 46023281 */ sub.s $f10, $f6, $f2 /* 9EF8 8002EAF8 46002180 */ add.s $f6, $f4, $f0 /* 9EFC 8002EAFC C600004C */ lwc1 $f0, 0x4c($s0) @@ -146,7 +146,7 @@ glabel do_camera_type_4 /* 9F30 8002EB30 4481B000 */ mtc1 $at, $f22 /* 9F34 8002EB34 C6080054 */ lwc1 $f8, 0x54($s0) /* 9F38 8002EB38 46161082 */ mul.s $f2, $f2, $f22 -/* 9F3C 8002EB3C 00000000 */ nop +/* 9F3C 8002EB3C 00000000 */ nop /* 9F40 8002EB40 C6000058 */ lwc1 $f0, 0x58($s0) /* 9F44 8002EB44 C604007C */ lwc1 $f4, 0x7c($s0) /* 9F48 8002EB48 C606005C */ lwc1 $f6, 0x5c($s0) @@ -164,18 +164,18 @@ glabel do_camera_type_4 /* 9F78 8002EB78 4600D306 */ mov.s $f12, $f26 /* 9F7C 8002EB7C 46000286 */ mov.s $f10, $f0 /* 9F80 8002EB80 461E5202 */ mul.s $f8, $f10, $f30 -/* 9F84 8002EB84 00000000 */ nop +/* 9F84 8002EB84 00000000 */ nop /* 9F88 8002EB88 4600F087 */ neg.s $f2, $f30 /* 9F8C 8002EB8C 4602E082 */ mul.s $f2, $f28, $f2 -/* 9F90 8002EB90 00000000 */ nop +/* 9F90 8002EB90 00000000 */ nop /* 9F94 8002EB94 C6180078 */ lwc1 $f24, 0x78($s0) /* 9F98 8002EB98 461CC102 */ mul.s $f4, $f24, $f28 -/* 9F9C 8002EB9C 00000000 */ nop +/* 9F9C 8002EB9C 00000000 */ nop /* 9FA0 8002EBA0 460AC182 */ mul.s $f6, $f24, $f10 -/* 9FA4 8002EBA4 00000000 */ nop +/* 9FA4 8002EBA4 00000000 */ nop /* 9FA8 8002EBA8 C6000070 */ lwc1 $f0, 0x70($s0) /* 9FAC 8002EBAC 46160002 */ mul.s $f0, $f0, $f22 -/* 9FB0 8002EBB0 00000000 */ nop +/* 9FB0 8002EBB0 00000000 */ nop /* 9FB4 8002EBB4 4600F286 */ mov.s $f10, $f30 /* 9FB8 8002EBB8 46005586 */ mov.s $f22, $f10 /* 9FBC 8002EBBC 46044780 */ add.s $f30, $f8, $f4 @@ -188,13 +188,13 @@ glabel do_camera_type_4 /* 9FD8 8002EBD8 4600D306 */ mov.s $f12, $f26 /* 9FDC 8002EBDC 46000286 */ mov.s $f10, $f0 /* 9FE0 8002EBE0 46165102 */ mul.s $f4, $f10, $f22 -/* 9FE4 8002EBE4 00000000 */ nop +/* 9FE4 8002EBE4 00000000 */ nop /* 9FE8 8002EBE8 4616E182 */ mul.s $f6, $f28, $f22 -/* 9FEC 8002EBEC 00000000 */ nop +/* 9FEC 8002EBEC 00000000 */ nop /* 9FF0 8002EBF0 461CC002 */ mul.s $f0, $f24, $f28 -/* 9FF4 8002EBF4 00000000 */ nop +/* 9FF4 8002EBF4 00000000 */ nop /* 9FF8 8002EBF8 460AC082 */ mul.s $f2, $f24, $f10 -/* 9FFC 8002EBFC 00000000 */ nop +/* 9FFC 8002EBFC 00000000 */ nop /* A000 8002EC00 46002281 */ sub.s $f10, $f4, $f0 /* A004 8002EC04 46023180 */ add.s $f6, $f6, $f2 /* A008 8002EC08 C602004C */ lwc1 $f2, 0x4c($s0) @@ -227,19 +227,19 @@ glabel do_camera_type_4 /* A074 8002EC74 0C00A720 */ jal atan2 /* A078 8002EC78 E600006C */ swc1 $f0, 0x6c($s0) /* A07C 8002EC7C 4616B102 */ mul.s $f4, $f22, $f22 -/* A080 8002EC80 00000000 */ nop +/* A080 8002EC80 00000000 */ nop /* A084 8002EC84 4618C082 */ mul.s $f2, $f24, $f24 -/* A088 8002EC88 00000000 */ nop +/* A088 8002EC88 00000000 */ nop /* A08C 8002EC8C 46022300 */ add.s $f12, $f4, $f2 /* A090 8002EC90 46000007 */ neg.s $f0, $f0 /* A094 8002EC94 E6000090 */ swc1 $f0, 0x90($s0) /* A098 8002EC98 46006004 */ sqrt.s $f0, $f12 /* A09C 8002EC9C 46000032 */ c.eq.s $f0, $f0 -/* A0A0 8002ECA0 00000000 */ nop +/* A0A0 8002ECA0 00000000 */ nop /* A0A4 8002ECA4 45030004 */ bc1tl .L8002ECB8 /* A0A8 8002ECA8 4600A306 */ mov.s $f12, $f20 /* A0AC 8002ECAC 0C0187BC */ jal sqrtf -/* A0B0 8002ECB0 00000000 */ nop +/* A0B0 8002ECB0 00000000 */ nop /* A0B4 8002ECB4 4600A306 */ mov.s $f12, $f20 .L8002ECB8: /* A0B8 8002ECB8 46000007 */ neg.s $f0, $f0 diff --git a/asm/nonmatchings/code_B9D60/_draw_message_box.s b/asm/nonmatchings/code_B9D60/_draw_message_box.s index b8b40fd238..4d5911bb63 100644 --- a/asm/nonmatchings/code_B9D60/_draw_message_box.s +++ b/asm/nonmatchings/code_B9D60/_draw_message_box.s @@ -35,12 +35,12 @@ glabel _draw_message_box /* C3380 8012CC80 44801000 */ mtc1 $zero, $f2 /* C3384 8012CC84 4600B021 */ cvt.d.s $f0, $f22 /* C3388 8012CC88 46220032 */ c.eq.d $f0, $f2 -/* C338C 8012CC8C 00000000 */ nop +/* C338C 8012CC8C 00000000 */ nop /* C3390 8012CC90 45000019 */ bc1f .L8012CCF8 /* C3394 8012CC94 27A40020 */ addiu $a0, $sp, 0x20 /* C3398 8012CC98 4600A021 */ cvt.d.s $f0, $f20 /* C339C 8012CC9C 46220032 */ c.eq.d $f0, $f2 -/* C33A0 8012CCA0 00000000 */ nop +/* C33A0 8012CCA0 00000000 */ nop /* C33A4 8012CCA4 45000013 */ bc1f .L8012CCF4 /* C33A8 8012CCA8 24040020 */ addiu $a0, $zero, 0x20 /* C33AC 8012CCAC 24050080 */ addiu $a1, $zero, 0x80 @@ -67,14 +67,14 @@ glabel _draw_message_box /* C33F8 8012CCF8 00111400 */ sll $v0, $s1, 0x10 /* C33FC 8012CCFC 00021403 */ sra $v0, $v0, 0x10 /* C3400 8012CD00 44822000 */ mtc1 $v0, $f4 -/* C3404 8012CD04 00000000 */ nop +/* C3404 8012CD04 00000000 */ nop /* C3408 8012CD08 46802120 */ cvt.s.w $f4, $f4 /* C340C 8012CD0C 00121400 */ sll $v0, $s2, 0x10 /* C3410 8012CD10 00021403 */ sra $v0, $v0, 0x10 /* C3414 8012CD14 00021023 */ negu $v0, $v0 /* C3418 8012CD18 44052000 */ mfc1 $a1, $f4 /* C341C 8012CD1C 44822000 */ mtc1 $v0, $f4 -/* C3420 8012CD20 00000000 */ nop +/* C3420 8012CD20 00000000 */ nop /* C3424 8012CD24 46802120 */ cvt.s.w $f4, $f4 /* C3428 8012CD28 0000382D */ daddu $a3, $zero, $zero /* C342C 8012CD2C 3C038015 */ lui $v1, %hi(D_8014C3C0) @@ -114,12 +114,12 @@ glabel _draw_message_box /* C34B4 8012CDB4 44801000 */ mtc1 $zero, $f2 /* C34B8 8012CDB8 4600B021 */ cvt.d.s $f0, $f22 /* C34BC 8012CDBC 46220032 */ c.eq.d $f0, $f2 -/* C34C0 8012CDC0 00000000 */ nop +/* C34C0 8012CDC0 00000000 */ nop /* C34C4 8012CDC4 45000007 */ bc1f .L8012CDE4 /* C34C8 8012CDC8 27B00060 */ addiu $s0, $sp, 0x60 /* C34CC 8012CDCC 4600A021 */ cvt.d.s $f0, $f20 /* C34D0 8012CDD0 46220032 */ c.eq.d $f0, $f2 -/* C34D4 8012CDD4 00000000 */ nop +/* C34D4 8012CDD4 00000000 */ nop /* C34D8 8012CDD8 4501000C */ bc1t .L8012CE0C /* C34DC 8012CDDC 3C120001 */ lui $s2, 1 /* C34E0 8012CDE0 27B00060 */ addiu $s0, $sp, 0x60 diff --git a/asm/nonmatchings/code_B9D60/_update_message.s b/asm/nonmatchings/code_B9D60/_update_message.s index 682f3096a3..394dd45295 100644 --- a/asm/nonmatchings/code_B9D60/_update_message.s +++ b/asm/nonmatchings/code_B9D60/_update_message.s @@ -20,7 +20,7 @@ glabel _update_message /* B9FD0 801238D0 44811800 */ mtc1 $at, $f3 /* B9FD4 801238D4 44801000 */ mtc1 $zero, $f2 /* B9FD8 801238D8 44820000 */ mtc1 $v0, $f0 -/* B9FDC 801238DC 00000000 */ nop +/* B9FDC 801238DC 00000000 */ nop /* B9FE0 801238E0 46800020 */ cvt.s.w $f0, $f0 /* B9FE4 801238E4 46000021 */ cvt.d.s $f0, $f0 /* B9FE8 801238E8 46220001 */ sub.d $f0, $f0, $f2 @@ -37,28 +37,28 @@ glabel _update_message /* BA014 80123914 44800000 */ mtc1 $zero, $f0 /* BA018 80123918 460020A1 */ cvt.d.s $f2, $f4 /* BA01C 8012391C 4620103C */ c.lt.d $f2, $f0 -/* BA020 80123920 00000000 */ nop +/* BA020 80123920 00000000 */ nop /* BA024 80123924 45000005 */ bc1f .L8012393C -/* BA028 80123928 00000000 */ nop +/* BA028 80123928 00000000 */ nop /* BA02C 8012392C 3C0140A0 */ lui $at, 0x40a0 /* BA030 80123930 44812000 */ mtc1 $at, $f4 /* BA034 80123934 08048E57 */ j .L8012395C -/* BA038 80123938 00000000 */ nop +/* BA038 80123938 00000000 */ nop .L8012393C: /* BA03C 8012393C 3C018015 */ lui $at, %hi(D_80150378) /* BA040 80123940 D4200378 */ ldc1 $f0, %lo(D_80150378)($at) /* BA044 80123944 4622003C */ c.lt.d $f0, $f2 -/* BA048 80123948 00000000 */ nop +/* BA048 80123948 00000000 */ nop /* BA04C 8012394C 45000003 */ bc1f .L8012395C -/* BA050 80123950 00000000 */ nop +/* BA050 80123950 00000000 */ nop /* BA054 80123954 3C0142F4 */ lui $at, 0x42f4 /* BA058 80123958 44812000 */ mtc1 $at, $f4 .L8012395C: /* BA05C 8012395C 3C014F00 */ lui $at, 0x4f00 /* BA060 80123960 44810000 */ mtc1 $at, $f0 -/* BA064 80123964 00000000 */ nop +/* BA064 80123964 00000000 */ nop /* BA068 80123968 4604003E */ c.le.s $f0, $f4 -/* BA06C 8012396C 00000000 */ nop +/* BA06C 8012396C 00000000 */ nop /* BA070 80123970 45010005 */ bc1t .L80123988 /* BA074 80123974 2604051A */ addiu $a0, $s0, 0x51a /* BA078 80123978 4600218D */ trunc.w.s $f6, $f4 @@ -70,7 +70,7 @@ glabel _update_message /* BA08C 8012398C 3C028000 */ lui $v0, 0x8000 /* BA090 80123990 4600018D */ trunc.w.s $f6, $f0 /* BA094 80123994 44033000 */ mfc1 $v1, $f6 -/* BA098 80123998 00000000 */ nop +/* BA098 80123998 00000000 */ nop /* BA09C 8012399C 00621825 */ or $v1, $v1, $v0 /* BA0A0 801239A0 A0830000 */ sb $v1, ($a0) .L801239A4: @@ -91,15 +91,15 @@ glabel _update_message /* BA0DC 801239DC 1062000A */ beq $v1, $v0, .L80123A08 /* BA0E0 801239E0 3C020008 */ lui $v0, 8 /* BA0E4 801239E4 08048F72 */ j .L80123DC8 -/* BA0E8 801239E8 00000000 */ nop +/* BA0E8 801239E8 00000000 */ nop .L801239EC: /* BA0EC 801239EC 24020008 */ addiu $v0, $zero, 8 /* BA0F0 801239F0 106200D9 */ beq $v1, $v0, .L80123D58 /* BA0F4 801239F4 2402000C */ addiu $v0, $zero, 0xc /* BA0F8 801239F8 1062004F */ beq $v1, $v0, .L80123B38 -/* BA0FC 801239FC 00000000 */ nop +/* BA0FC 801239FC 00000000 */ nop /* BA100 80123A00 08048F72 */ j .L80123DC8 -/* BA104 80123A04 00000000 */ nop +/* BA104 80123A04 00000000 */ nop .L80123A08: /* BA108 80123A08 00C21024 */ and $v0, $a2, $v0 /* BA10C 80123A0C 54400001 */ bnel $v0, $zero, .L80123A14 @@ -111,7 +111,7 @@ glabel _update_message /* BA120 80123A20 8C850010 */ lw $a1, 0x10($a0) /* BA124 80123A24 00E51024 */ and $v0, $a3, $a1 /* BA128 80123A28 14400005 */ bnez $v0, .L80123A40 -/* BA12C 80123A2C 00000000 */ nop +/* BA12C 80123A2C 00000000 */ nop /* BA130 80123A30 8C820000 */ lw $v0, ($a0) /* BA134 80123A34 30424000 */ andi $v0, $v0, 0x4000 /* BA138 80123A38 1040002F */ beqz $v0, .L80123AF8 @@ -127,7 +127,7 @@ glabel _update_message /* BA15C 80123A5C 8C620010 */ lw $v0, 0x10($v1) /* BA160 80123A60 30428004 */ andi $v0, $v0, 0x8004 /* BA164 80123A64 10400003 */ beqz $v0, .L80123A74 -/* BA168 80123A68 00000000 */ nop +/* BA168 80123A68 00000000 */ nop /* BA16C 80123A6C 08048EB7 */ j .L80123ADC /* BA170 80123A70 24110001 */ addiu $s1, $zero, 1 .L80123A74: @@ -158,7 +158,7 @@ glabel _update_message /* BA1CC 80123ACC 2442FFFF */ addiu $v0, $v0, -1 /* BA1D0 80123AD0 2C420004 */ sltiu $v0, $v0, 4 /* BA1D4 80123AD4 104000BC */ beqz $v0, .L80123DC8 -/* BA1D8 80123AD8 00000000 */ nop +/* BA1D8 80123AD8 00000000 */ nop .L80123ADC: /* BA1DC 80123ADC 240400C9 */ addiu $a0, $zero, 0xc9 .L80123AE0: @@ -167,13 +167,13 @@ glabel _update_message /* BA1E8 80123AE8 0C0526AE */ jal _play_sound /* BA1EC 80123AEC 00A0382D */ daddu $a3, $a1, $zero /* BA1F0 80123AF0 08048F72 */ j .L80123DC8 -/* BA1F4 80123AF4 00000000 */ nop +/* BA1F4 80123AF4 00000000 */ nop .L80123AF8: /* BA1F8 80123AF8 104000B3 */ beqz $v0, .L80123DC8 /* BA1FC 80123AFC 3C020004 */ lui $v0, 4 /* BA200 80123B00 00C21024 */ and $v0, $a2, $v0 /* BA204 80123B04 144000B0 */ bnez $v0, .L80123DC8 -/* BA208 80123B08 00000000 */ nop +/* BA208 80123B08 00000000 */ nop /* BA20C 80123B0C 92020486 */ lbu $v0, 0x486($s0) /* BA210 80123B10 104000AD */ beqz $v0, .L80123DC8 /* BA214 80123B14 240400CD */ addiu $a0, $zero, 0xcd @@ -239,7 +239,7 @@ glabel _update_message /* BA2F0 80123BF0 0C0526AE */ jal _play_sound /* BA2F4 80123BF4 A60204C8 */ sh $v0, 0x4c8($s0) /* BA2F8 80123BF8 08048F72 */ j .L80123DC8 -/* BA2FC 80123BFC 00000000 */ nop +/* BA2FC 80123BFC 00000000 */ nop .L80123C00: /* BA300 80123C00 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* BA304 80123C04 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) @@ -267,7 +267,7 @@ glabel _update_message /* BA358 80123C58 10620019 */ beq $v1, $v0, .L80123CC0 /* BA35C 80123C5C 30824000 */ andi $v0, $a0, 0x4000 /* BA360 80123C60 10400017 */ beqz $v0, .L80123CC0 -/* BA364 80123C64 00000000 */ nop +/* BA364 80123C64 00000000 */ nop /* BA368 80123C68 920204CE */ lbu $v0, 0x4ce($s0) /* BA36C 80123C6C 0062102B */ sltu $v0, $v1, $v0 /* BA370 80123C70 54400003 */ bnel $v0, $zero, .L80123C80 @@ -312,7 +312,7 @@ glabel _update_message .L80123D04: /* BA404 80123D04 00621024 */ and $v0, $v1, $v0 /* BA408 80123D08 1040000F */ beqz $v0, .L80123D48 -/* BA40C 80123D0C 00000000 */ nop +/* BA40C 80123D0C 00000000 */ nop /* BA410 80123D10 920204E8 */ lbu $v0, 0x4e8($s0) /* BA414 80123D14 1040000C */ beqz $v0, .L80123D48 /* BA418 80123D18 240400C7 */ addiu $a0, $zero, 0xc7 @@ -328,12 +328,12 @@ glabel _update_message /* BA43C 80123D3C A20204ED */ sb $v0, 0x4ed($s0) .L80123D40: /* BA440 80123D40 0C0526AE */ jal _play_sound -/* BA444 80123D44 00000000 */ nop +/* BA444 80123D44 00000000 */ nop .L80123D48: /* BA448 80123D48 920304F8 */ lbu $v1, 0x4f8($s0) /* BA44C 80123D4C 24020008 */ addiu $v0, $zero, 8 /* BA450 80123D50 1462001D */ bne $v1, $v0, .L80123DC8 -/* BA454 80123D54 00000000 */ nop +/* BA454 80123D54 00000000 */ nop .L80123D58: /* BA458 80123D58 920204ED */ lbu $v0, 0x4ed($s0) /* BA45C 80123D5C 24420001 */ addiu $v0, $v0, 1 @@ -352,7 +352,7 @@ glabel _update_message /* BA48C 80123D8C 24020005 */ addiu $v0, $zero, 5 /* BA490 80123D90 920304F8 */ lbu $v1, 0x4f8($s0) /* BA494 80123D94 1462000C */ bne $v1, $v0, .L80123DC8 -/* BA498 80123D98 00000000 */ nop +/* BA498 80123D98 00000000 */ nop /* BA49C 80123D9C 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* BA4A0 80123DA0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* BA4A4 80123DA4 8C420010 */ lw $v0, 0x10($v0) @@ -397,11 +397,12 @@ glabel _update_message /* BA530 80123E30 2C62000E */ sltiu $v0, $v1, 0xe /* BA534 80123E34 104000CF */ beqz $v0, .L80124174 /* BA538 80123E38 00031080 */ sll $v0, $v1, 2 -/* BA53C 80123E3C 3C018015 */ lui $at, %hi(D_80150380) +/* BA53C 80123E3C 3C018015 */ lui $at, %hi(jtbl_80150380_E6A80) /* BA540 80123E40 00220821 */ addu $at, $at, $v0 -/* BA544 80123E44 8C220380 */ lw $v0, %lo(D_80150380)($at) +/* BA544 80123E44 8C220380 */ lw $v0, %lo(jtbl_80150380_E6A80)($at) /* BA548 80123E48 00400008 */ jr $v0 -/* BA54C 80123E4C 00000000 */ nop +/* BA54C 80123E4C 00000000 */ nop +glabel L80123E50_BA550 /* BA550 80123E50 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* BA554 80123E54 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* BA558 80123E58 8C430010 */ lw $v1, 0x10($v0) @@ -420,6 +421,7 @@ glabel _update_message /* BA58C 80123E8C 24020001 */ addiu $v0, $zero, 1 /* BA590 80123E90 34620100 */ ori $v0, $v1, 0x100 /* BA594 80123E94 AE0204FC */ sw $v0, 0x4fc($s0) +glabel L80123E98_BA598 /* BA598 80123E98 24020001 */ addiu $v0, $zero, 1 .L80123E9C: /* BA59C 80123E9C 920304F8 */ lbu $v1, 0x4f8($s0) @@ -439,13 +441,13 @@ glabel _update_message /* BA5CC 80123ECC 1440000B */ bnez $v0, .L80123EFC /* BA5D0 80123ED0 30620030 */ andi $v0, $v1, 0x30 /* BA5D4 80123ED4 14400009 */ bnez $v0, .L80123EFC -/* BA5D8 80123ED8 00000000 */ nop +/* BA5D8 80123ED8 00000000 */ nop /* BA5DC 80123EDC 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* BA5E0 80123EE0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* BA5E4 80123EE4 8C420000 */ lw $v0, ($v0) /* BA5E8 80123EE8 30428000 */ andi $v0, $v0, 0x8000 /* BA5EC 80123EEC 10400003 */ beqz $v0, .L80123EFC -/* BA5F0 80123EF0 00000000 */ nop +/* BA5F0 80123EF0 00000000 */ nop /* BA5F4 80123EF4 24050006 */ addiu $a1, $zero, 6 .L80123EF8: /* BA5F8 80123EF8 A600000E */ sh $zero, 0xe($s0) @@ -456,19 +458,20 @@ glabel _update_message /* BA608 80123F08 A602000E */ sh $v0, 0xe($s0) /* BA60C 80123F0C 3042FFFF */ andi $v0, $v0, 0xffff /* BA610 80123F10 14400098 */ bnez $v0, .L80124174 -/* BA614 80123F14 00000000 */ nop +/* BA614 80123F14 00000000 */ nop .L80123F18: /* BA618 80123F18 0200202D */ daddu $a0, $s0, $zero /* BA61C 80123F1C 0C04915C */ jal func_80124570 /* BA620 80123F20 0000302D */ daddu $a2, $zero, $zero /* BA624 80123F24 0804905D */ j .L80124174 -/* BA628 80123F28 00000000 */ nop +/* BA628 80123F28 00000000 */ nop +glabel L80123F2C_BA62C /* BA62C 80123F2C 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* BA630 80123F30 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* BA634 80123F34 8C420010 */ lw $v0, 0x10($v0) /* BA638 80123F38 3042C000 */ andi $v0, $v0, 0xc000 /* BA63C 80123F3C 10400006 */ beqz $v0, .L80123F58 -/* BA640 80123F40 00000000 */ nop +/* BA640 80123F40 00000000 */ nop /* BA644 80123F44 8E0304FC */ lw $v1, 0x4fc($s0) /* BA648 80123F48 30620030 */ andi $v0, $v1, 0x30 /* BA64C 80123F4C 14400002 */ bnez $v0, .L80123F58 @@ -484,13 +487,13 @@ glabel _update_message /* BA670 80123F70 AE030460 */ sw $v1, 0x460($s0) /* BA674 80123F74 30820014 */ andi $v0, $a0, 0x14 /* BA678 80123F78 14400009 */ bnez $v0, .L80123FA0 -/* BA67C 80123F7C 00000000 */ nop +/* BA67C 80123F7C 00000000 */ nop /* BA680 80123F80 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* BA684 80123F84 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* BA688 80123F88 8C420000 */ lw $v0, ($v0) /* BA68C 80123F8C 30428000 */ andi $v0, $v0, 0x8000 /* BA690 80123F90 10400003 */ beqz $v0, .L80123FA0 -/* BA694 80123F94 00000000 */ nop +/* BA694 80123F94 00000000 */ nop .L80123F98: /* BA698 80123F98 24620006 */ addiu $v0, $v1, 6 /* BA69C 80123F9C AE020460 */ sw $v0, 0x460($s0) @@ -528,6 +531,7 @@ glabel _update_message /* BA70C 8012400C 02021021 */ addu $v0, $s0, $v0 /* BA710 80124010 0804905D */ j .L80124174 /* BA714 80124014 A4430488 */ sh $v1, 0x488($v0) +glabel L80124018_BA718 /* BA718 80124018 960204CC */ lhu $v0, 0x4cc($s0) /* BA71C 8012401C 92030487 */ lbu $v1, 0x487($s0) /* BA720 80124020 24420001 */ addiu $v0, $v0, 1 @@ -550,7 +554,7 @@ glabel _update_message /* BA760 80124060 10400018 */ beqz $v0, .L801240C4 /* BA764 80124064 28620009 */ slti $v0, $v1, 9 /* BA768 80124068 08049033 */ j .L801240CC -/* BA76C 8012406C 00000000 */ nop +/* BA76C 8012406C 00000000 */ nop .L80124070: /* BA770 80124070 00031400 */ sll $v0, $v1, 0x10 /* BA774 80124074 00021C03 */ sra $v1, $v0, 0x10 @@ -601,7 +605,7 @@ glabel _update_message /* BA80C 8012410C 94420488 */ lhu $v0, 0x488($v0) /* BA810 80124110 0043182A */ slt $v1, $v0, $v1 /* BA814 80124114 14600017 */ bnez $v1, .L80124174 -/* BA818 80124118 00000000 */ nop +/* BA818 80124118 00000000 */ nop /* BA81C 8012411C AE020460 */ sw $v0, 0x460($s0) /* BA820 80124120 2402000C */ addiu $v0, $zero, 0xc /* BA824 80124124 0804905D */ j .L80124174 @@ -614,7 +618,7 @@ glabel _update_message /* BA83C 8012413C 94420488 */ lhu $v0, 0x488($v0) /* BA840 80124140 0062182A */ slt $v1, $v1, $v0 /* BA844 80124144 1460000B */ bnez $v1, .L80124174 -/* BA848 80124148 00000000 */ nop +/* BA848 80124148 00000000 */ nop /* BA84C 8012414C 92040487 */ lbu $a0, 0x487($s0) /* BA850 80124150 92030486 */ lbu $v1, 0x486($s0) /* BA854 80124154 AE020460 */ sw $v0, 0x460($s0) @@ -626,34 +630,35 @@ glabel _update_message /* BA86C 8012416C A200047C */ sb $zero, 0x47c($s0) /* BA870 80124170 A600047E */ sh $zero, 0x47e($s0) .L80124174: +glabel L80124174_BA874 /* BA874 80124174 8E0204FC */ lw $v0, 0x4fc($s0) /* BA878 80124178 30420001 */ andi $v0, $v0, 1 /* BA87C 8012417C 1040001B */ beqz $v0, .L801241EC -/* BA880 80124180 00000000 */ nop +/* BA880 80124180 00000000 */ nop /* BA884 80124184 8E040544 */ lw $a0, 0x544($s0) /* BA888 80124188 A20004F8 */ sb $zero, 0x4f8($s0) /* BA88C 8012418C 10800003 */ beqz $a0, .L8012419C /* BA890 80124190 AE0004FC */ sw $zero, 0x4fc($s0) /* BA894 80124194 0C00AB1E */ jal general_heap_free -/* BA898 80124198 00000000 */ nop +/* BA898 80124198 00000000 */ nop .L8012419C: /* BA89C 8012419C 8E040548 */ lw $a0, 0x548($s0) /* BA8A0 801241A0 10800003 */ beqz $a0, .L801241B0 -/* BA8A4 801241A4 00000000 */ nop +/* BA8A4 801241A4 00000000 */ nop /* BA8A8 801241A8 0C00AB1E */ jal general_heap_free -/* BA8AC 801241AC 00000000 */ nop +/* BA8AC 801241AC 00000000 */ nop .L801241B0: /* BA8B0 801241B0 8E04054C */ lw $a0, 0x54c($s0) /* BA8B4 801241B4 10800003 */ beqz $a0, .L801241C4 -/* BA8B8 801241B8 00000000 */ nop +/* BA8B8 801241B8 00000000 */ nop /* BA8BC 801241BC 0C00AB1E */ jal general_heap_free -/* BA8C0 801241C0 00000000 */ nop +/* BA8C0 801241C0 00000000 */ nop .L801241C4: /* BA8C4 801241C4 8E040550 */ lw $a0, 0x550($s0) /* BA8C8 801241C8 10800003 */ beqz $a0, .L801241D8 -/* BA8CC 801241CC 00000000 */ nop +/* BA8CC 801241CC 00000000 */ nop /* BA8D0 801241D0 0C00AB1E */ jal general_heap_free -/* BA8D4 801241D4 00000000 */ nop +/* BA8D4 801241D4 00000000 */ nop .L801241D8: /* BA8D8 801241D8 8E030504 */ lw $v1, 0x504($s0) /* BA8DC 801241DC 10600003 */ beqz $v1, .L801241EC diff --git a/asm/nonmatchings/code_B9D60/appendGfx_item_entity.s b/asm/nonmatchings/code_B9D60/appendGfx_item_entity.s index 7dd4deb56b..71e3d3d6b0 100644 --- a/asm/nonmatchings/code_B9D60/appendGfx_item_entity.s +++ b/asm/nonmatchings/code_B9D60/appendGfx_item_entity.s @@ -26,7 +26,7 @@ glabel appendGfx_item_entity /* C88F8 801321F8 00540018 */ mult $v0, $s4 /* C88FC 801321FC 00001012 */ mflo $v0 /* C8900 80132200 34638081 */ ori $v1, $v1, 0x8081 -/* C8904 80132204 00000000 */ nop +/* C8904 80132204 00000000 */ nop /* C8908 80132208 00430018 */ mult $v0, $v1 /* C890C 8013220C 00001810 */ mfhi $v1 /* C8910 80132210 00621821 */ addu $v1, $v1, $v0 @@ -70,11 +70,11 @@ glabel appendGfx_item_entity /* C899C 8013229C 10620003 */ beq $v1, $v0, .L801322AC /* C89A0 801322A0 24020156 */ addiu $v0, $zero, 0x156 /* C89A4 801322A4 14620005 */ bne $v1, $v0, .L801322BC -/* C89A8 801322A8 00000000 */ nop +/* C89A8 801322A8 00000000 */ nop .L801322AC: /* C89AC 801322AC 3C013F80 */ lui $at, 0x3f80 /* C89B0 801322B0 44810000 */ mtc1 $at, $f0 -/* C89B4 801322B4 00000000 */ nop +/* C89B4 801322B4 00000000 */ nop /* C89B8 801322B8 E6600030 */ swc1 $f0, 0x30($s3) .L801322BC: /* C89BC 801322BC 3C03800A */ lui $v1, %hi(D_8009A634) @@ -97,7 +97,7 @@ glabel appendGfx_item_entity /* C8A00 80132300 0240202D */ daddu $a0, $s2, $zero /* C8A04 80132304 C664000C */ lwc1 $f4, 0xc($s3) /* C8A08 80132308 44901000 */ mtc1 $s0, $f2 -/* C8A0C 8013230C 00000000 */ nop +/* C8A0C 8013230C 00000000 */ nop /* C8A10 80132310 468010A0 */ cvt.s.w $f2, $f2 /* C8A14 80132314 46022100 */ add.s $f4, $f4, $f2 /* C8A18 80132318 8E650008 */ lw $a1, 8($s3) @@ -222,7 +222,7 @@ glabel appendGfx_item_entity /* C8BE4 801324E4 3C030808 */ lui $v1, 0x808 /* C8BE8 801324E8 00431024 */ and $v0, $v0, $v1 /* C8BEC 801324EC 10400025 */ beqz $v0, .L80132584 -/* C8BF0 801324F0 00000000 */ nop +/* C8BF0 801324F0 00000000 */ nop /* C8BF4 801324F4 3C028015 */ lui $v0, %hi(D_80151328) /* C8BF8 801324F8 8C421328 */ lw $v0, %lo(D_80151328)($v0) /* C8BFC 801324FC 94420000 */ lhu $v0, ($v0) @@ -397,7 +397,7 @@ glabel appendGfx_item_entity /* C8E98 80132798 0C052479 */ jal func_801491E4 /* C8E9C 8013279C AFB40014 */ sw $s4, 0x14($sp) /* C8EA0 801327A0 0804CA27 */ j .L8013289C -/* C8EA4 801327A4 00000000 */ nop +/* C8EA4 801327A4 00000000 */ nop .L801327A8: /* C8EA8 801327A8 0000282D */ daddu $a1, $zero, $zero /* C8EAC 801327AC 00A0302D */ daddu $a2, $a1, $zero @@ -408,7 +408,7 @@ glabel appendGfx_item_entity /* C8EC0 801327C0 0C052479 */ jal func_801491E4 /* C8EC4 801327C4 AFA20014 */ sw $v0, 0x14($sp) /* C8EC8 801327C8 0804CA27 */ j .L8013289C -/* C8ECC 801327CC 00000000 */ nop +/* C8ECC 801327CC 00000000 */ nop .L801327D0: /* C8ED0 801327D0 3C03FD48 */ lui $v1, 0xfd48 /* C8ED4 801327D4 3463000B */ ori $v1, $v1, 0xb @@ -606,7 +606,7 @@ glabel appendGfx_item_entity /* C91CC 80132ACC 0C052479 */ jal func_801491E4 /* C91D0 80132AD0 AFB40014 */ sw $s4, 0x14($sp) /* C91D4 80132AD4 0804CAF4 */ j .L80132BD0 -/* C91D8 80132AD8 00000000 */ nop +/* C91D8 80132AD8 00000000 */ nop .L80132ADC: /* C91DC 80132ADC 0000282D */ daddu $a1, $zero, $zero /* C91E0 80132AE0 00A0302D */ daddu $a2, $a1, $zero @@ -617,7 +617,7 @@ glabel appendGfx_item_entity /* C91F4 80132AF4 0C052479 */ jal func_801491E4 /* C91F8 80132AF8 AFA20014 */ sw $v0, 0x14($sp) /* C91FC 80132AFC 0804CAF4 */ j .L80132BD0 -/* C9200 80132B00 00000000 */ nop +/* C9200 80132B00 00000000 */ nop .L80132B04: /* C9204 80132B04 3C03FD48 */ lui $v1, 0xfd48 /* C9208 80132B08 3463000F */ ori $v1, $v1, 0xf @@ -702,7 +702,7 @@ glabel appendGfx_item_entity /* C933C 80132C3C 86630018 */ lh $v1, 0x18($s3) /* C9340 80132C40 24020157 */ addiu $v0, $zero, 0x157 /* C9344 80132C44 14620003 */ bne $v1, $v0, .L80132C54 -/* C9348 80132C48 00000000 */ nop +/* C9348 80132C48 00000000 */ nop /* C934C 80132C4C 0C04C2C3 */ jal draw_coin_sparkles /* C9350 80132C50 0260202D */ daddu $a0, $s3, $zero .L80132C54: diff --git a/asm/nonmatchings/code_B9D60/clamp_printer_coords.s b/asm/nonmatchings/code_B9D60/clamp_printer_coords.s index e153b6950e..3f55526fbf 100644 --- a/asm/nonmatchings/code_B9D60/clamp_printer_coords.s +++ b/asm/nonmatchings/code_B9D60/clamp_printer_coords.s @@ -25,4 +25,4 @@ glabel clamp_printer_coords /* BC1FC 80125AFC A482050C */ sh $v0, 0x50c($a0) .L80125B00: /* BC200 80125B00 03E00008 */ jr $ra -/* BC204 80125B04 00000000 */ nop +/* BC204 80125B04 00000000 */ nop diff --git a/asm/nonmatchings/code_B9D60/clear_item_entity_data.s b/asm/nonmatchings/code_B9D60/clear_item_entity_data.s index 1aa1ef3974..d7b10daa03 100644 --- a/asm/nonmatchings/code_B9D60/clear_item_entity_data.s +++ b/asm/nonmatchings/code_B9D60/clear_item_entity_data.s @@ -8,11 +8,11 @@ glabel clear_item_entity_data /* C76FC 80130FFC AFBF0010 */ sw $ra, 0x10($sp) /* C7700 80131000 80420070 */ lb $v0, 0x70($v0) /* C7704 80131004 14400005 */ bnez $v0, .L8013101C -/* C7708 80131008 00000000 */ nop +/* C7708 80131008 00000000 */ nop /* C770C 8013100C 3C028015 */ lui $v0, %hi(D_80155DA0) /* C7710 80131010 24425DA0 */ addiu $v0, $v0, %lo(D_80155DA0) /* C7714 80131014 0804C409 */ j .L80131024 -/* C7718 80131018 00000000 */ nop +/* C7718 80131018 00000000 */ nop .L8013101C: /* C771C 8013101C 3C028015 */ lui $v0, %hi(D_801561A0) /* C7720 80131020 244261A0 */ addiu $v0, $v0, %lo(D_801561A0) @@ -42,7 +42,7 @@ glabel clear_item_entity_data /* C7778 80131078 AC205D84 */ sw $zero, %lo(D_80155D84)($at) /* C777C 8013107C 80420070 */ lb $v0, 0x70($v0) /* C7780 80131080 14400003 */ bnez $v0, .L80131090 -/* C7784 80131084 00000000 */ nop +/* C7784 80131084 00000000 */ nop /* C7788 80131088 3C018015 */ lui $at, %hi(D_80155D88) /* C778C 8013108C AC205D88 */ sw $zero, %lo(D_80155D88)($at) .L80131090: diff --git a/asm/nonmatchings/code_B9D60/draw_coin_sparkles.s b/asm/nonmatchings/code_B9D60/draw_coin_sparkles.s index 1e875a9e83..2422bca40b 100644 --- a/asm/nonmatchings/code_B9D60/draw_coin_sparkles.s +++ b/asm/nonmatchings/code_B9D60/draw_coin_sparkles.s @@ -38,15 +38,15 @@ glabel draw_coin_sparkles /* C7290 80130B90 3C028015 */ lui $v0, %hi(D_80155D8E) /* C7294 80130B94 84425D8E */ lh $v0, %lo(D_80155D8E)($v0) /* C7298 80130B98 4483C000 */ mtc1 $v1, $f24 -/* C729C 80130B9C 00000000 */ nop +/* C729C 80130B9C 00000000 */ nop /* C72A0 80130BA0 4680C620 */ cvt.s.w $f24, $f24 /* C72A4 80130BA4 3C038015 */ lui $v1, %hi(D_80155D90) /* C72A8 80130BA8 84635D90 */ lh $v1, %lo(D_80155D90)($v1) /* C72AC 80130BAC 4482A000 */ mtc1 $v0, $f20 -/* C72B0 80130BB0 00000000 */ nop +/* C72B0 80130BB0 00000000 */ nop /* C72B4 80130BB4 4680A520 */ cvt.s.w $f20, $f20 /* C72B8 80130BB8 4483B000 */ mtc1 $v1, $f22 -/* C72BC 80130BBC 00000000 */ nop +/* C72BC 80130BBC 00000000 */ nop /* C72C0 80130BC0 4680B5A0 */ cvt.s.w $f22, $f22 /* C72C4 80130BC4 0C00A6C9 */ jal clamp_angle /* C72C8 80130BC8 46006301 */ sub.s $f12, $f12, $f0 diff --git a/asm/nonmatchings/code_B9D60/draw_item_entities.s b/asm/nonmatchings/code_B9D60/draw_item_entities.s index d0f724eb5e..9023e91f01 100644 --- a/asm/nonmatchings/code_B9D60/draw_item_entities.s +++ b/asm/nonmatchings/code_B9D60/draw_item_entities.s @@ -66,7 +66,7 @@ glabel draw_item_entities .L80132D64: /* C9464 80132D64 2A220100 */ slti $v0, $s1, 0x100 /* C9468 80132D68 1440FFD3 */ bnez $v0, .L80132CB8 -/* C946C 80132D6C 00000000 */ nop +/* C946C 80132D6C 00000000 */ nop /* C9470 80132D70 8FBF0038 */ lw $ra, 0x38($sp) /* C9474 80132D74 8FB50034 */ lw $s5, 0x34($sp) /* C9478 80132D78 8FB40030 */ lw $s4, 0x30($sp) diff --git a/asm/nonmatchings/code_B9D60/draw_number.s b/asm/nonmatchings/code_B9D60/draw_number.s index 51df663067..7a0eab5850 100644 --- a/asm/nonmatchings/code_B9D60/draw_number.s +++ b/asm/nonmatchings/code_B9D60/draw_number.s @@ -131,7 +131,7 @@ glabel draw_number /* BDF68 80127868 32220004 */ andi $v0, $s1, 4 .L8012786C: /* BDF6C 8012786C 10400038 */ beqz $v0, .L80127950 -/* BDF70 80127870 00000000 */ nop +/* BDF70 80127870 00000000 */ nop /* BDF74 80127874 1A600036 */ blez $s3, .L80127950 /* BDF78 80127878 0000802D */ daddu $s0, $zero, $zero /* BDF7C 8012787C 3C11800A */ lui $s1, %hi(gMasterGfxPos) diff --git a/asm/nonmatchings/code_B9D60/draw_string.s b/asm/nonmatchings/code_B9D60/draw_string.s index 5b27be306b..508bac879f 100644 --- a/asm/nonmatchings/code_B9D60/draw_string.s +++ b/asm/nonmatchings/code_B9D60/draw_string.s @@ -40,7 +40,7 @@ glabel draw_string /* BCC70 80126570 0C0495A9 */ jal initialize_printer /* BCC74 80126574 0000302D */ daddu $a2, $zero, $zero /* BCC78 80126578 06010003 */ bgez $s0, .L80126588 -/* BCC7C 8012657C 00000000 */ nop +/* BCC7C 8012657C 00000000 */ nop /* BCC80 80126580 08049975 */ j .L801265D4 /* BCC84 80126584 AFB00020 */ sw $s0, 0x20($sp) .L80126588: @@ -164,7 +164,7 @@ glabel draw_string /* BCE48 80126748 0C049F64 */ jal func_80127D90 /* BCE4C 8012674C 00063403 */ sra $a2, $a2, 0x10 /* BCE50 80126750 12800003 */ beqz $s4, .L80126760 -/* BCE54 80126754 00000000 */ nop +/* BCE54 80126754 00000000 */ nop /* BCE58 80126758 0C00AB1E */ jal general_heap_free /* BCE5C 8012675C 0280202D */ daddu $a0, $s4, $zero .L80126760: diff --git a/asm/nonmatchings/code_B9D60/func_80124434.s b/asm/nonmatchings/code_B9D60/func_80124434.s index 0cd5b8483b..f7aab5c36d 100644 --- a/asm/nonmatchings/code_B9D60/func_80124434.s +++ b/asm/nonmatchings/code_B9D60/func_80124434.s @@ -13,16 +13,16 @@ glabel func_80124434 /* BAB54 80124454 3C030080 */ lui $v1, 0x80 /* BAB58 80124458 00431024 */ and $v0, $v0, $v1 /* BAB5C 8012445C 1040003D */ beqz $v0, .L80124554 -/* BAB60 80124460 00000000 */ nop +/* BAB60 80124460 00000000 */ nop /* BAB64 80124464 96020500 */ lhu $v0, 0x500($s0) /* BAB68 80124468 30420006 */ andi $v0, $v0, 6 /* BAB6C 8012446C 14400039 */ bnez $v0, .L80124554 -/* BAB70 80124470 00000000 */ nop +/* BAB70 80124470 00000000 */ nop /* BAB74 80124474 92020519 */ lbu $v0, 0x519($s0) /* BAB78 80124478 10400036 */ beqz $v0, .L80124554 /* BAB7C 8012447C 2404000F */ addiu $a0, $zero, 0xf /* BAB80 80124480 4482A000 */ mtc1 $v0, $f20 -/* BAB84 80124484 00000000 */ nop +/* BAB84 80124484 00000000 */ nop /* BAB88 80124488 4680A520 */ cvt.s.w $f20, $f20 /* BAB8C 8012448C 30B100FF */ andi $s1, $a1, 0xff /* BAB90 80124490 3C02CCCC */ lui $v0, 0xcccc @@ -50,13 +50,13 @@ glabel func_80124434 /* BABE8 801244E8 00629021 */ addu $s2, $v1, $v0 /* BABEC 801244EC 2442004E */ addiu $v0, $v0, 0x4e /* BABF0 801244F0 44820000 */ mtc1 $v0, $f0 -/* BABF4 801244F4 00000000 */ nop +/* BABF4 801244F4 00000000 */ nop /* BABF8 801244F8 46800020 */ cvt.s.w $f0, $f0 /* BABFC 801244FC 46140002 */ mul.s $f0, $f0, $f20 -/* BAC00 80124500 00000000 */ nop +/* BAC00 80124500 00000000 */ nop /* BAC04 80124504 4600008D */ trunc.w.s $f2, $f0 /* BAC08 80124508 44021000 */ mfc1 $v0, $f2 -/* BAC0C 8012450C 00000000 */ nop +/* BAC0C 8012450C 00000000 */ nop /* BAC10 80124510 0040282D */ daddu $a1, $v0, $zero /* BAC14 80124514 00021400 */ sll $v0, $v0, 0x10 /* BAC18 80124518 00021403 */ sra $v0, $v0, 0x10 diff --git a/asm/nonmatchings/code_B9D60/func_80124570.s b/asm/nonmatchings/code_B9D60/func_80124570.s index 0c350a5d00..69dd903e0f 100644 --- a/asm/nonmatchings/code_B9D60/func_80124570.s +++ b/asm/nonmatchings/code_B9D60/func_80124570.s @@ -34,31 +34,32 @@ glabel func_80124570 /* BACE0 801245E0 2C620010 */ sltiu $v0, $v1, 0x10 /* BACE4 801245E4 104003EF */ beqz $v0, .L801255A4 /* BACE8 801245E8 00031080 */ sll $v0, $v1, 2 -/* BACEC 801245EC 3C018015 */ lui $at, %hi(D_801503B8) +/* BACEC 801245EC 3C018015 */ lui $at, %hi(jtbl_801503B8_E6AB8) /* BACF0 801245F0 00220821 */ addu $at, $at, $v0 -/* BACF4 801245F4 8C2203B8 */ lw $v0, %lo(D_801503B8)($at) +/* BACF4 801245F4 8C2203B8 */ lw $v0, %lo(jtbl_801503B8_E6AB8)($at) /* BACF8 801245F8 00400008 */ jr $v0 -/* BACFC 801245FC 00000000 */ nop +/* BACFC 801245FC 00000000 */ nop +glabel L80124600_BAD00 /* BAD00 80124600 240200F0 */ addiu $v0, $zero, 0xf0 /* BAD04 80124604 A2420000 */ sb $v0, ($s2) /* BAD08 80124608 C6800540 */ lwc1 $f0, 0x540($s4) /* BAD0C 8012460C 3C014F00 */ lui $at, 0x4f00 /* BAD10 80124610 44811000 */ mtc1 $at, $f2 -/* BAD14 80124614 00000000 */ nop +/* BAD14 80124614 00000000 */ nop /* BAD18 80124618 4600103E */ c.le.s $f2, $f0 -/* BAD1C 8012461C 00000000 */ nop +/* BAD1C 8012461C 00000000 */ nop /* BAD20 80124620 45010005 */ bc1t .L80124638 /* BAD24 80124624 26520001 */ addiu $s2, $s2, 1 /* BAD28 80124628 4600010D */ trunc.w.s $f4, $f0 /* BAD2C 8012462C 44032000 */ mfc1 $v1, $f4 /* BAD30 80124630 08049194 */ j .L80124650 -/* BAD34 80124634 00000000 */ nop +/* BAD34 80124634 00000000 */ nop .L80124638: /* BAD38 80124638 46020001 */ sub.s $f0, $f0, $f2 /* BAD3C 8012463C 3C028000 */ lui $v0, 0x8000 /* BAD40 80124640 4600010D */ trunc.w.s $f4, $f0 /* BAD44 80124644 44032000 */ mfc1 $v1, $f4 -/* BAD48 80124648 00000000 */ nop +/* BAD48 80124648 00000000 */ nop /* BAD4C 8012464C 00621825 */ or $v1, $v1, $v0 .L80124650: /* BAD50 80124650 8FA80018 */ lw $t0, 0x18($sp) @@ -66,6 +67,7 @@ glabel func_80124570 /* BAD58 80124658 00431021 */ addu $v0, $v0, $v1 /* BAD5C 8012465C 08049580 */ j .L80125600 /* BAD60 80124660 A1020000 */ sb $v0, ($t0) +glabel L80124664_BAD64 /* BAD64 80124664 96830500 */ lhu $v1, 0x500($s4) /* BAD68 80124668 24020005 */ addiu $v0, $zero, 5 /* BAD6C 8012466C A28204F8 */ sb $v0, 0x4f8($s4) @@ -89,7 +91,8 @@ glabel func_80124570 /* BADB4 801246B4 0C0526AE */ jal _play_sound /* BADB8 801246B8 00A0382D */ daddu $a3, $a1, $zero /* BADBC 801246BC 08049580 */ j .L80125600 -/* BADC0 801246C0 00000000 */ nop +/* BADC0 801246C0 00000000 */ nop +glabel L801246C4_BADC4 /* BADC4 801246C4 96820500 */ lhu $v0, 0x500($s4) /* BADC8 801246C8 92630000 */ lbu $v1, ($s3) /* BADCC 801246CC 34420001 */ ori $v0, $v0, 1 @@ -100,23 +103,29 @@ glabel func_80124570 /* BADE0 801246E0 2403FF7F */ addiu $v1, $zero, -0x81 /* BADE4 801246E4 0804957F */ j .L801255FC /* BADE8 801246E8 00431024 */ and $v0, $v0, $v1 +glabel L801246EC_BADEC /* BADEC 801246EC 24A200FE */ addiu $v0, $a1, 0xfe /* BADF0 801246F0 A2420000 */ sb $v0, ($s2) /* BADF4 801246F4 26520001 */ addiu $s2, $s2, 1 /* BADF8 801246F8 24A2000D */ addiu $v0, $a1, 0xd /* BADFC 801246FC 08049580 */ j .L80125600 /* BAE00 80124700 A2820455 */ sb $v0, 0x455($s4) +glabel L80124704_BAE04 /* BAE04 80124704 08049556 */ j .L80125558 /* BAE08 80124708 240200F5 */ addiu $v0, $zero, 0xf5 +glabel L8012470C_BAE0C /* BAE0C 8012470C 08049556 */ j .L80125558 /* BAE10 80124710 240200F6 */ addiu $v0, $zero, 0xf6 +glabel L80124714_BAE14 /* BAE14 80124714 08049556 */ j .L80125558 /* BAE18 80124718 240200F7 */ addiu $v0, $zero, 0xf7 +glabel L8012471C_BAE1C /* BAE1C 8012471C 240200F9 */ addiu $v0, $zero, 0xf9 /* BAE20 80124720 A2420000 */ sb $v0, ($s2) /* BAE24 80124724 26520001 */ addiu $s2, $s2, 1 /* BAE28 80124728 08049580 */ j .L80125600 /* BAE2C 8012472C 26B5FFFF */ addiu $s5, $s5, -1 +glabel L80124730_BAE30 /* BAE30 80124730 92820468 */ lbu $v0, 0x468($s4) /* BAE34 80124734 504003B2 */ beql $v0, $zero, .L80125600 /* BAE38 80124738 A2800468 */ sb $zero, 0x468($s4) @@ -156,6 +165,7 @@ glabel func_80124570 /* BAEC0 801247C0 A6830466 */ sh $v1, 0x466($s4) /* BAEC4 801247C4 08049580 */ j .L80125600 /* BAEC8 801247C8 A2800468 */ sb $zero, 0x468($s4) +glabel L801247CC_BAECC /* BAECC 801247CC 240200F8 */ addiu $v0, $zero, 0xf8 /* BAED0 801247D0 A2420000 */ sb $v0, ($s2) /* BAED4 801247D4 26520001 */ addiu $s2, $s2, 1 @@ -170,11 +180,12 @@ glabel func_80124570 /* BAEF8 801247F8 104000BD */ beqz $v0, .L80124AF0 /* BAEFC 801247FC A2800509 */ sb $zero, 0x509($s4) /* BAF00 80124800 00031080 */ sll $v0, $v1, 2 -/* BAF04 80124804 3C018015 */ lui $at, %hi(D_801503F8) +/* BAF04 80124804 3C018015 */ lui $at, %hi(jtbl_801503F8_E6AF8) /* BAF08 80124808 00220821 */ addu $at, $at, $v0 -/* BAF0C 8012480C 8C2203F8 */ lw $v0, %lo(D_801503F8)($at) +/* BAF0C 8012480C 8C2203F8 */ lw $v0, %lo(jtbl_801503F8_E6AF8)($at) /* BAF10 80124810 00400008 */ jr $v0 -/* BAF14 80124814 00000000 */ nop +/* BAF14 80124814 00000000 */ nop +glabel L80124818_BAF18 /* BAF18 80124818 2602FFFF */ addiu $v0, $s0, -1 /* BAF1C 8012481C 2C420003 */ sltiu $v0, $v0, 3 /* BAF20 80124820 10400002 */ beqz $v0, .L8012482C @@ -201,6 +212,7 @@ glabel func_80124570 /* BAF6C 8012486C AE820524 */ sw $v0, 0x524($s4) /* BAF70 80124870 080492BC */ j .L80124AF0 /* BAF74 80124874 A29704F8 */ sb $s7, 0x4f8($s4) +glabel L80124878_BAF78 /* BAF78 80124878 92620000 */ lbu $v0, ($s3) /* BAF7C 8012487C 26730001 */ addiu $s3, $s3, 1 /* BAF80 80124880 A682045A */ sh $v0, 0x45a($s4) @@ -218,6 +230,7 @@ glabel func_80124570 /* BAFB0 801248B0 AE8204FC */ sw $v0, 0x4fc($s4) /* BAFB4 801248B4 080492BC */ j .L80124AF0 /* BAFB8 801248B8 A6830516 */ sh $v1, 0x516($s4) +glabel L801248BC_BAFBC /* BAFBC 801248BC 17C0008C */ bnez $fp, .L80124AF0 /* BAFC0 801248C0 24020014 */ addiu $v0, $zero, 0x14 /* BAFC4 801248C4 A682045A */ sh $v0, 0x45a($s4) @@ -242,7 +255,8 @@ glabel func_80124570 /* BB010 80124910 0C0526AE */ jal _play_sound /* BB014 80124914 00A0382D */ daddu $a3, $a1, $zero /* BB018 80124918 080492BC */ j .L80124AF0 -/* BB01C 8012491C 00000000 */ nop +/* BB01C 8012491C 00000000 */ nop +glabel L80124920_BB020 /* BB020 80124920 92620000 */ lbu $v0, ($s3) /* BB024 80124924 26730001 */ addiu $s3, $s3, 1 /* BB028 80124928 2404021C */ addiu $a0, $zero, 0x21c @@ -268,11 +282,13 @@ glabel func_80124570 /* BB078 80124978 A6820500 */ sh $v0, 0x500($s4) /* BB07C 8012497C 080492BC */ j .L80124AF0 /* BB080 80124980 AE8304FC */ sw $v1, 0x4fc($s4) +glabel L80124984_BB084 /* BB084 80124984 92620000 */ lbu $v0, ($s3) /* BB088 80124988 26730001 */ addiu $s3, $s3, 1 /* BB08C 8012498C A6820516 */ sh $v0, 0x516($s4) +glabel L80124990_BB090 /* BB090 80124990 17C00057 */ bnez $fp, .L80124AF0 -/* BB094 80124994 00000000 */ nop +/* BB094 80124994 00000000 */ nop /* BB098 80124998 8E8204FC */ lw $v0, 0x4fc($s4) /* BB09C 8012499C 96830500 */ lhu $v1, 0x500($s4) /* BB0A0 801249A0 A29704F8 */ sb $s7, 0x4f8($s4) @@ -281,6 +297,7 @@ glabel func_80124570 /* BB0AC 801249AC AE8204FC */ sw $v0, 0x4fc($s4) /* BB0B0 801249B0 080492BC */ j .L80124AF0 /* BB0B4 801249B4 A6830500 */ sh $v1, 0x500($s4) +glabel L801249B8_BB0B8 /* BB0B8 801249B8 92700000 */ lbu $s0, ($s3) /* BB0BC 801249BC 26730001 */ addiu $s3, $s3, 1 /* BB0C0 801249C0 8E8204FC */ lw $v0, 0x4fc($s4) @@ -339,7 +356,8 @@ glabel func_80124570 /* BB194 80124A94 0C00A5CF */ jal dma_copy /* BB198 80124A98 24850200 */ addiu $a1, $a0, 0x200 /* BB19C 80124A9C 080492BC */ j .L80124AF0 -/* BB1A0 80124AA0 00000000 */ nop +/* BB1A0 80124AA0 00000000 */ nop +glabel L80124AA4_BB1A4 /* BB1A4 80124AA4 24020028 */ addiu $v0, $zero, 0x28 /* BB1A8 80124AA8 A6820516 */ sh $v0, 0x516($s4) /* BB1AC 80124AAC 96820538 */ lhu $v0, 0x538($s4) @@ -357,6 +375,7 @@ glabel func_80124570 /* BB1DC 80124ADC 34630001 */ ori $v1, $v1, 1 /* BB1E0 80124AE0 080492BC */ j .L80124AF0 /* BB1E4 80124AE4 A6830500 */ sh $v1, 0x500($s4) +glabel L80124AE8_BB1E8 /* BB1E8 80124AE8 24020004 */ addiu $v0, $zero, 4 /* BB1EC 80124AEC A28204F8 */ sb $v0, 0x4f8($s4) .L80124AF0: @@ -365,7 +384,8 @@ glabel func_80124570 /* BB1F8 80124AF8 104002C1 */ beqz $v0, .L80125600 /* BB1FC 80124AFC 30620006 */ andi $v0, $v1, 6 /* BB200 80124B00 080493E6 */ j .L80124F98 -/* BB204 80124B04 00000000 */ nop +/* BB204 80124B04 00000000 */ nop +glabel L80124B08_BB208 /* BB208 80124B08 240200FB */ addiu $v0, $zero, 0xfb /* BB20C 80124B0C A2420000 */ sb $v0, ($s2) /* BB210 80124B10 8E8304FC */ lw $v1, 0x4fc($s4) @@ -374,7 +394,7 @@ glabel func_80124570 /* BB21C 80124B1C 26520001 */ addiu $s2, $s2, 1 /* BB220 80124B20 30621000 */ andi $v0, $v1, 0x1000 /* BB224 80124B24 10400005 */ beqz $v0, .L80124B3C -/* BB228 80124B28 00000000 */ nop +/* BB228 80124B28 00000000 */ nop /* BB22C 80124B2C 8E830504 */ lw $v1, 0x504($s4) /* BB230 80124B30 10600002 */ beqz $v1, .L80124B3C /* BB234 80124B34 24020001 */ addiu $v0, $zero, 1 @@ -399,16 +419,18 @@ glabel func_80124570 /* BB270 80124B70 3042FFFD */ andi $v0, $v0, 0xfffd /* BB274 80124B74 08049580 */ j .L80125600 /* BB278 80124B78 A6820500 */ sh $v0, 0x500($s4) +glabel L80124B7C_BB27C /* BB27C 80124B7C 92630000 */ lbu $v1, ($s3) /* BB280 80124B80 2C620030 */ sltiu $v0, $v1, 0x30 /* BB284 80124B84 1040029E */ beqz $v0, .L80125600 /* BB288 80124B88 26730001 */ addiu $s3, $s3, 1 /* BB28C 80124B8C 00031080 */ sll $v0, $v1, 2 -/* BB290 80124B90 3C018015 */ lui $at, %hi(D_80150438) +/* BB290 80124B90 3C018015 */ lui $at, %hi(jtbl_80150438_E6B38) /* BB294 80124B94 00220821 */ addu $at, $at, $v0 -/* BB298 80124B98 8C220438 */ lw $v0, %lo(D_80150438)($at) +/* BB298 80124B98 8C220438 */ lw $v0, %lo(jtbl_80150438_E6B38)($at) /* BB29C 80124B9C 00400008 */ jr $v0 -/* BB2A0 80124BA0 00000000 */ nop +/* BB2A0 80124BA0 00000000 */ nop +glabel L80124BA4_BB2A4 /* BB2A4 80124BA4 A2560000 */ sb $s6, ($s2) /* BB2A8 80124BA8 26520001 */ addiu $s2, $s2, 1 /* BB2AC 80124BAC A2400000 */ sb $zero, ($s2) @@ -417,6 +439,7 @@ glabel func_80124570 /* BB2B8 80124BB8 26730001 */ addiu $s3, $s3, 1 /* BB2BC 80124BBC 08049556 */ j .L80125558 /* BB2C0 80124BC0 A2820454 */ sb $v0, 0x454($s4) +glabel L80124BC4_BB2C4 /* BB2C4 80124BC4 A2560000 */ sb $s6, ($s2) /* BB2C8 80124BC8 26520001 */ addiu $s2, $s2, 1 /* BB2CC 80124BCC 24020001 */ addiu $v0, $zero, 1 @@ -426,33 +449,41 @@ glabel func_80124570 /* BB2DC 80124BDC 26730001 */ addiu $s3, $s3, 1 /* BB2E0 80124BE0 08049556 */ j .L80125558 /* BB2E4 80124BE4 A2820455 */ sb $v0, 0x455($s4) +glabel L80124BE8_BB2E8 /* BB2E8 80124BE8 A2560000 */ sb $s6, ($s2) /* BB2EC 80124BEC 26520001 */ addiu $s2, $s2, 1 /* BB2F0 80124BF0 08049552 */ j .L80125548 /* BB2F4 80124BF4 24020004 */ addiu $v0, $zero, 4 +glabel L80124BF8_BB2F8 /* BB2F8 80124BF8 8E8204FC */ lw $v0, 0x4fc($s4) /* BB2FC 80124BFC 0804957F */ j .L801255FC /* BB300 80124C00 34420010 */ ori $v0, $v0, 0x10 +glabel L80124C04_BB304 /* BB304 80124C04 8E8204FC */ lw $v0, 0x4fc($s4) /* BB308 80124C08 2403FEFF */ addiu $v1, $zero, -0x101 /* BB30C 80124C0C 34420020 */ ori $v0, $v0, 0x20 /* BB310 80124C10 0804957F */ j .L801255FC /* BB314 80124C14 00431024 */ and $v0, $v0, $v1 +glabel L80124C18_BB318 /* BB318 80124C18 8E8204FC */ lw $v0, 0x4fc($s4) /* BB31C 80124C1C 2403FFDF */ addiu $v1, $zero, -0x21 /* BB320 80124C20 0804957F */ j .L801255FC /* BB324 80124C24 00431024 */ and $v0, $v0, $v1 +glabel L80124C28_BB328 /* BB328 80124C28 A2560000 */ sb $s6, ($s2) /* BB32C 80124C2C 26520001 */ addiu $s2, $s2, 1 /* BB330 80124C30 08049552 */ j .L80125548 /* BB334 80124C34 24020005 */ addiu $v0, $zero, 5 +glabel L80124C38_BB338 /* BB338 80124C38 96820500 */ lhu $v0, 0x500($s4) /* BB33C 80124C3C 34420002 */ ori $v0, $v0, 2 /* BB340 80124C40 08049580 */ j .L80125600 /* BB344 80124C44 A6820500 */ sh $v0, 0x500($s4) +glabel L80124C48_BB348 /* BB348 80124C48 96820500 */ lhu $v0, 0x500($s4) /* BB34C 80124C4C 0804941E */ j .L80125078 /* BB350 80124C50 3042FFFD */ andi $v0, $v0, 0xfffd +glabel L80124C54_BB354 /* BB354 80124C54 92820486 */ lbu $v0, 0x486($s4) /* BB358 80124C58 96830462 */ lhu $v1, 0x462($s4) /* BB35C 80124C5C 00021040 */ sll $v0, $v0, 1 @@ -490,6 +521,7 @@ glabel func_80124570 /* BB3DC 80124CDC 00681821 */ addu $v1, $v1, $t0 /* BB3E0 80124CE0 08049580 */ j .L80125600 /* BB3E4 80124CE4 A6830466 */ sh $v1, 0x466($s4) +glabel L80124CE8_BB3E8 /* BB3E8 80124CE8 A2560000 */ sb $s6, ($s2) /* BB3EC 80124CEC 26520001 */ addiu $s2, $s2, 1 /* BB3F0 80124CF0 24020006 */ addiu $v0, $zero, 6 @@ -504,19 +536,20 @@ glabel func_80124570 /* BB414 80124D14 26520001 */ addiu $s2, $s2, 1 /* BB418 80124D18 3202000F */ andi $v0, $s0, 0xf /* BB41C 80124D1C 44821000 */ mtc1 $v0, $f2 -/* BB420 80124D20 00000000 */ nop +/* BB420 80124D20 00000000 */ nop /* BB424 80124D24 468010A0 */ cvt.s.w $f2, $f2 /* BB428 80124D28 46001082 */ mul.s $f2, $f2, $f0 -/* BB42C 80124D2C 00000000 */ nop +/* BB42C 80124D2C 00000000 */ nop /* BB430 80124D30 26730001 */ addiu $s3, $s3, 1 /* BB434 80124D34 320200FF */ andi $v0, $s0, 0xff /* BB438 80124D38 00021102 */ srl $v0, $v0, 4 /* BB43C 80124D3C 44820000 */ mtc1 $v0, $f0 -/* BB440 80124D40 00000000 */ nop +/* BB440 80124D40 00000000 */ nop /* BB444 80124D44 46800020 */ cvt.s.w $f0, $f0 /* BB448 80124D48 46020000 */ add.s $f0, $f0, $f2 /* BB44C 80124D4C 0804935B */ j .L80124D6C /* BB450 80124D50 A2500000 */ sb $s0, ($s2) +glabel L80124D54_BB454 /* BB454 80124D54 A2560000 */ sb $s6, ($s2) /* BB458 80124D58 26520001 */ addiu $s2, $s2, 1 /* BB45C 80124D5C 3C013F80 */ lui $at, 0x3f80 @@ -527,6 +560,7 @@ glabel func_80124570 /* BB46C 80124D6C 26520001 */ addiu $s2, $s2, 1 /* BB470 80124D70 08049580 */ j .L80125600 /* BB474 80124D74 E6800540 */ swc1 $f0, 0x540($s4) +glabel L80124D78_BB478 /* BB478 80124D78 92620000 */ lbu $v0, ($s3) /* BB47C 80124D7C 26730001 */ addiu $s3, $s3, 1 /* BB480 80124D80 A282045E */ sb $v0, 0x45e($s4) @@ -534,6 +568,7 @@ glabel func_80124570 /* BB488 80124D88 26730001 */ addiu $s3, $s3, 1 /* BB48C 80124D8C 08049580 */ j .L80125600 /* BB490 80124D90 A282045F */ sb $v0, 0x45f($s4) +glabel L80124D94_BB494 /* BB494 80124D94 A2560000 */ sb $s6, ($s2) /* BB498 80124D98 26520001 */ addiu $s2, $s2, 1 /* BB49C 80124D9C 24020008 */ addiu $v0, $zero, 8 @@ -542,22 +577,27 @@ glabel func_80124570 /* BB4A8 80124DA8 92620000 */ lbu $v0, ($s3) /* BB4AC 80124DAC 08049552 */ j .L80125548 /* BB4B0 80124DB0 26730001 */ addiu $s3, $s3, 1 +glabel L80124DB4_BB4B4 /* BB4B4 80124DB4 A2560000 */ sb $s6, ($s2) /* BB4B8 80124DB8 26520001 */ addiu $s2, $s2, 1 /* BB4BC 80124DBC 08049552 */ j .L80125548 /* BB4C0 80124DC0 24020009 */ addiu $v0, $zero, 9 +glabel L80124DC4_BB4C4 /* BB4C4 80124DC4 A2560000 */ sb $s6, ($s2) /* BB4C8 80124DC8 26520001 */ addiu $s2, $s2, 1 /* BB4CC 80124DCC 08049552 */ j .L80125548 /* BB4D0 80124DD0 2402000A */ addiu $v0, $zero, 0xa +glabel L80124DD4_BB4D4 /* BB4D4 80124DD4 A2560000 */ sb $s6, ($s2) /* BB4D8 80124DD8 26520001 */ addiu $s2, $s2, 1 /* BB4DC 80124DDC 08049552 */ j .L80125548 /* BB4E0 80124DE0 2402000B */ addiu $v0, $zero, 0xb +glabel L80124DE4_BB4E4 /* BB4E4 80124DE4 A2560000 */ sb $s6, ($s2) /* BB4E8 80124DE8 26520001 */ addiu $s2, $s2, 1 /* BB4EC 80124DEC 08049552 */ j .L80125548 /* BB4F0 80124DF0 2402000C */ addiu $v0, $zero, 0xc +glabel L80124DF4_BB4F4 /* BB4F4 80124DF4 A2560000 */ sb $s6, ($s2) /* BB4F8 80124DF8 26520001 */ addiu $s2, $s2, 1 /* BB4FC 80124DFC 2402000E */ addiu $v0, $zero, 0xe @@ -571,6 +611,7 @@ glabel func_80124570 /* BB51C 80124E1C 26520001 */ addiu $s2, $s2, 1 /* BB520 80124E20 080493DF */ j .L80124F7C /* BB524 80124E24 A682000E */ sh $v0, 0xe($s4) +glabel L80124E28_BB528 /* BB528 80124E28 A2560000 */ sb $s6, ($s2) /* BB52C 80124E2C 26520001 */ addiu $s2, $s2, 1 /* BB530 80124E30 2402000F */ addiu $v0, $zero, 0xf @@ -592,6 +633,7 @@ glabel func_80124570 /* BB570 80124E70 26520001 */ addiu $s2, $s2, 1 /* BB574 80124E74 080493DF */ j .L80124F7C /* BB578 80124E78 A682000E */ sh $v0, 0xe($s4) +glabel L80124E7C_BB57C /* BB57C 80124E7C A2560000 */ sb $s6, ($s2) /* BB580 80124E80 26520001 */ addiu $s2, $s2, 1 /* BB584 80124E84 24020010 */ addiu $v0, $zero, 0x10 @@ -631,6 +673,7 @@ glabel func_80124570 /* BB60C 80124F0C 26B5FFFF */ addiu $s5, $s5, -1 /* BB610 80124F10 080493DF */ j .L80124F7C /* BB614 80124F14 A682000E */ sh $v0, 0xe($s4) +glabel L80124F18_BB618 /* BB618 80124F18 92620000 */ lbu $v0, ($s3) /* BB61C 80124F1C 26730001 */ addiu $s3, $s3, 1 /* BB620 80124F20 26B5FFFF */ addiu $s5, $s5, -1 @@ -658,7 +701,7 @@ glabel func_80124570 /* BB678 80124F78 A2820532 */ sb $v0, 0x532($s4) .L80124F7C: /* BB67C 80124F7C 1EA00004 */ bgtz $s5, .L80124F90 -/* BB680 80124F80 00000000 */ nop +/* BB680 80124F80 00000000 */ nop /* BB684 80124F84 96820500 */ lhu $v0, 0x500($s4) /* BB688 80124F88 34420001 */ ori $v0, $v0, 1 /* BB68C 80124F8C A6820500 */ sh $v0, 0x500($s4) @@ -670,6 +713,7 @@ glabel func_80124570 /* BB69C 80124F9C 3062FFFE */ andi $v0, $v1, 0xfffe /* BB6A0 80124FA0 08049580 */ j .L80125600 /* BB6A4 80124FA4 A6820500 */ sh $v0, 0x500($s4) +glabel L80124FA8_BB6A8 /* BB6A8 80124FA8 92700000 */ lbu $s0, ($s3) /* BB6AC 80124FAC 12000005 */ beqz $s0, .L80124FC4 /* BB6B0 80124FB0 26730001 */ addiu $s3, $s3, 1 @@ -680,6 +724,7 @@ glabel func_80124570 .L80124FC4: /* BB6C4 80124FC4 08049580 */ j .L80125600 /* BB6C8 80124FC8 A680052C */ sh $zero, 0x52c($s4) +glabel L80124FCC_BB6CC /* BB6CC 80124FCC A2560000 */ sb $s6, ($s2) /* BB6D0 80124FD0 26520001 */ addiu $s2, $s2, 1 /* BB6D4 80124FD4 24020011 */ addiu $v0, $zero, 0x11 @@ -701,6 +746,7 @@ glabel func_80124570 /* BB714 80125014 34420004 */ ori $v0, $v0, 4 /* BB718 80125018 08049580 */ j .L80125600 /* BB71C 8012501C A6820500 */ sh $v0, 0x500($s4) +glabel L80125020_BB720 /* BB720 80125020 A2560000 */ sb $s6, ($s2) /* BB724 80125024 26520001 */ addiu $s2, $s2, 1 /* BB728 80125028 24020012 */ addiu $v0, $zero, 0x12 @@ -709,6 +755,7 @@ glabel func_80124570 /* BB734 80125034 92620000 */ lbu $v0, ($s3) /* BB738 80125038 08049552 */ j .L80125548 /* BB73C 8012503C 26730001 */ addiu $s3, $s3, 1 +glabel L80125040_BB740 /* BB740 80125040 A2560000 */ sb $s6, ($s2) /* BB744 80125044 26520001 */ addiu $s2, $s2, 1 /* BB748 80125048 24020013 */ addiu $v0, $zero, 0x13 @@ -727,6 +774,7 @@ glabel func_80124570 /* BB778 80125078 34420001 */ ori $v0, $v0, 1 /* BB77C 8012507C 08049580 */ j .L80125600 /* BB780 80125080 A6820500 */ sh $v0, 0x500($s4) +glabel L80125084_BB784 /* BB784 80125084 92700000 */ lbu $s0, ($s3) /* BB788 80125088 26730001 */ addiu $s3, $s3, 1 /* BB78C 8012508C 92650000 */ lbu $a1, ($s3) @@ -743,10 +791,12 @@ glabel func_80124570 /* BB7B8 801250B8 30C300FF */ andi $v1, $a2, 0xff /* BB7BC 801250BC 08049580 */ j .L80125600 /* BB7C0 801250C0 A44304DC */ sh $v1, 0x4dc($v0) +glabel L801250C4_BB7C4 /* BB7C4 801250C4 A2560000 */ sb $s6, ($s2) /* BB7C8 801250C8 26520001 */ addiu $s2, $s2, 1 /* BB7CC 801250CC 08049552 */ j .L80125548 /* BB7D0 801250D0 24020014 */ addiu $v0, $zero, 0x14 +glabel L801250D4_BB7D4 /* BB7D4 801250D4 24040009 */ addiu $a0, $zero, 9 /* BB7D8 801250D8 0000282D */ daddu $a1, $zero, $zero /* BB7DC 801250DC 00A0302D */ daddu $a2, $a1, $zero @@ -764,18 +814,22 @@ glabel func_80124570 /* BB80C 8012510C A28404CE */ sb $a0, 0x4ce($s4) /* BB810 80125110 08049580 */ j .L80125600 /* BB814 80125114 A6830500 */ sh $v1, 0x500($s4) +glabel L80125118_BB818 /* BB818 80125118 92620000 */ lbu $v0, ($s3) /* BB81C 8012511C 26730001 */ addiu $s3, $s3, 1 /* BB820 80125120 08049580 */ j .L80125600 /* BB824 80125124 A28204EA */ sb $v0, 0x4ea($s4) +glabel L80125128_BB828 /* BB828 80125128 A2560000 */ sb $s6, ($s2) /* BB82C 8012512C 26520001 */ addiu $s2, $s2, 1 /* BB830 80125130 08049552 */ j .L80125548 /* BB834 80125134 24020015 */ addiu $v0, $zero, 0x15 +glabel L80125138_BB838 /* BB838 80125138 A2560000 */ sb $s6, ($s2) /* BB83C 8012513C 26520001 */ addiu $s2, $s2, 1 /* BB840 80125140 08049556 */ j .L80125558 /* BB844 80125144 24020017 */ addiu $v0, $zero, 0x17 +glabel L80125148_BB848 /* BB848 80125148 3C040010 */ lui $a0, 0x10 /* BB84C 8012514C 34840040 */ ori $a0, $a0, 0x40 /* BB850 80125150 8E8204FC */ lw $v0, 0x4fc($s4) @@ -791,22 +845,27 @@ glabel func_80124570 /* BB878 80125178 00621824 */ and $v1, $v1, $v0 /* BB87C 8012517C 08049580 */ j .L80125600 /* BB880 80125180 AE8304FC */ sw $v1, 0x4fc($s4) +glabel L80125184_BB884 /* BB884 80125184 A2560000 */ sb $s6, ($s2) /* BB888 80125188 26520001 */ addiu $s2, $s2, 1 /* BB88C 8012518C 08049556 */ j .L80125558 /* BB890 80125190 24020018 */ addiu $v0, $zero, 0x18 +glabel L80125194_BB894 /* BB894 80125194 A2560000 */ sb $s6, ($s2) /* BB898 80125198 26520001 */ addiu $s2, $s2, 1 /* BB89C 8012519C 08049556 */ j .L80125558 /* BB8A0 801251A0 24020019 */ addiu $v0, $zero, 0x19 +glabel L801251A4_BB8A4 /* BB8A4 801251A4 A2560000 */ sb $s6, ($s2) /* BB8A8 801251A8 26520001 */ addiu $s2, $s2, 1 /* BB8AC 801251AC 08049556 */ j .L80125558 /* BB8B0 801251B0 2402001A */ addiu $v0, $zero, 0x1a +glabel L801251B4_BB8B4 /* BB8B4 801251B4 A2560000 */ sb $s6, ($s2) /* BB8B8 801251B8 26520001 */ addiu $s2, $s2, 1 /* BB8BC 801251BC 08049556 */ j .L80125558 /* BB8C0 801251C0 2402001B */ addiu $v0, $zero, 0x1b +glabel L801251C4_BB8C4 /* BB8C4 801251C4 A2560000 */ sb $s6, ($s2) /* BB8C8 801251C8 26520001 */ addiu $s2, $s2, 1 /* BB8CC 801251CC 2402001C */ addiu $v0, $zero, 0x1c @@ -818,16 +877,19 @@ glabel func_80124570 /* BB8E4 801251E4 10400106 */ beqz $v0, .L80125600 /* BB8E8 801251E8 26730001 */ addiu $s3, $s3, 1 /* BB8EC 801251EC 00031080 */ sll $v0, $v1, 2 -/* BB8F0 801251F0 3C018015 */ lui $at, %hi(D_801504F8) +/* BB8F0 801251F0 3C018015 */ lui $at, %hi(jtbl_801504F8_E6BF8) /* BB8F4 801251F4 00220821 */ addu $at, $at, $v0 -/* BB8F8 801251F8 8C2204F8 */ lw $v0, %lo(D_801504F8)($at) +/* BB8F8 801251F8 8C2204F8 */ lw $v0, %lo(jtbl_801504F8_E6BF8)($at) /* BB8FC 801251FC 00400008 */ jr $v0 -/* BB900 80125200 00000000 */ nop +/* BB900 80125200 00000000 */ nop +glabel L80125204_BB904 /* BB904 80125204 A2500000 */ sb $s0, ($s2) /* BB908 80125208 08049580 */ j .L80125600 /* BB90C 8012520C 26520001 */ addiu $s2, $s2, 1 +glabel L80125210_BB910 /* BB910 80125210 08049553 */ j .L8012554C /* BB914 80125214 A2500000 */ sb $s0, ($s2) +glabel L80125218_BB918 /* BB918 80125218 A2560000 */ sb $s6, ($s2) /* BB91C 8012521C 26520001 */ addiu $s2, $s2, 1 /* BB920 80125220 08049552 */ j .L80125548 @@ -840,6 +902,7 @@ glabel func_80124570 /* BB938 80125238 A2420000 */ sb $v0, ($s2) /* BB93C 8012523C 0804950F */ j .L8012543C /* BB940 80125240 26520001 */ addiu $s2, $s2, 1 +glabel L80125244_BB944 /* BB944 80125244 92700000 */ lbu $s0, ($s3) /* BB948 80125248 96820528 */ lhu $v0, 0x528($s4) /* BB94C 8012524C 14400006 */ bnez $v0, .L80125268 @@ -875,7 +938,7 @@ glabel func_80124570 /* BB9BC 801252BC 00481021 */ addu $v0, $v0, $t0 /* BB9C0 801252C0 8C420000 */ lw $v0, ($v0) /* BB9C4 801252C4 00400008 */ jr $v0 -/* BB9C8 801252C8 00000000 */ nop +/* BB9C8 801252C8 00000000 */ nop /* BB9CC 801252CC 96820528 */ lhu $v0, 0x528($s4) /* BB9D0 801252D0 3C088015 */ lui $t0, %hi(D_80155C38) /* BB9D4 801252D4 25085C38 */ addiu $t0, $t0, %lo(D_80155C38) @@ -916,13 +979,13 @@ glabel func_80124570 /* BBA5C 8012535C 10620008 */ beq $v1, $v0, .L80125380 /* BBA60 80125360 0000182D */ daddu $v1, $zero, $zero /* BBA64 80125364 080494F6 */ j .L801253D8 -/* BBA68 80125368 00000000 */ nop +/* BBA68 80125368 00000000 */ nop .L8012536C: /* BBA6C 8012536C 24020025 */ addiu $v0, $zero, 0x25 /* BBA70 80125370 10620013 */ beq $v1, $v0, .L801253C0 /* BBA74 80125374 0000182D */ daddu $v1, $zero, $zero /* BBA78 80125378 080494F6 */ j .L801253D8 -/* BBA7C 8012537C 00000000 */ nop +/* BBA7C 8012537C 00000000 */ nop .L80125380: /* BBA80 80125380 24020004 */ addiu $v0, $zero, 4 /* BBA84 80125384 A3A20011 */ sb $v0, 0x11($sp) @@ -953,7 +1016,7 @@ glabel func_80124570 /* BBAD4 801253D4 0000182D */ daddu $v1, $zero, $zero .L801253D8: /* BBAD8 801253D8 10800009 */ beqz $a0, .L80125400 -/* BBADC 801253DC 00000000 */ nop +/* BBADC 801253DC 00000000 */ nop .L801253E0: /* BBAE0 801253E0 26B5FFFF */ addiu $s5, $s5, -1 /* BBAE4 801253E4 00C31021 */ addu $v0, $a2, $v1 @@ -976,9 +1039,9 @@ glabel func_80124570 /* BBB24 80125424 96820500 */ lhu $v0, 0x500($s4) /* BBB28 80125428 30420006 */ andi $v0, $v0, 6 /* BBB2C 8012542C 1440FF90 */ bnez $v0, .L80125270 -/* BBB30 80125430 00000000 */ nop +/* BBB30 80125430 00000000 */ nop /* BBB34 80125434 1EA0FF8E */ bgtz $s5, .L80125270 -/* BBB38 80125438 00000000 */ nop +/* BBB38 80125438 00000000 */ nop .L8012543C: /* BBB3C 8012543C 96840500 */ lhu $a0, 0x500($s4) /* BBB40 80125440 30820006 */ andi $v0, $a0, 6 @@ -992,6 +1055,7 @@ glabel func_80124570 /* BBB60 80125460 A683000E */ sh $v1, 0xe($s4) /* BBB64 80125464 08049578 */ j .L801255E0 /* BBB68 80125468 0280202D */ daddu $a0, $s4, $zero +glabel L8012546C_BBB6C /* BBB6C 8012546C 92700000 */ lbu $s0, ($s3) /* BBB70 80125470 3C04802F */ lui $a0, %hi(D_802EB620) /* BBB74 80125474 2484B620 */ addiu $a0, $a0, %lo(D_802EB620) @@ -1009,10 +1073,12 @@ glabel func_80124570 /* BBBA4 801254A4 26730001 */ addiu $s3, $s3, 1 /* BBBA8 801254A8 08049580 */ j .L80125600 /* BBBAC 801254AC A682051C */ sh $v0, 0x51c($s4) +glabel L801254B0_BBBB0 /* BBBB0 801254B0 92620000 */ lbu $v0, ($s3) /* BBBB4 801254B4 26730001 */ addiu $s3, $s3, 1 /* BBBB8 801254B8 08049580 */ j .L80125600 /* BBBBC 801254BC A2820519 */ sb $v0, 0x519($s4) +glabel L801254C0_BBBC0 /* BBBC0 801254C0 92700000 */ lbu $s0, ($s3) /* BBBC4 801254C4 26730001 */ addiu $s3, $s3, 1 /* BBBC8 801254C8 92650000 */ lbu $a1, ($s3) @@ -1044,6 +1110,7 @@ glabel func_80124570 /* BBC30 80125530 00C21025 */ or $v0, $a2, $v0 /* BBC34 80125534 08049580 */ j .L80125600 /* BBC38 80125538 AE820524 */ sw $v0, 0x524($s4) +glabel L8012553C_BBC3C /* BBC3C 8012553C A2560000 */ sb $s6, ($s2) /* BBC40 80125540 26520001 */ addiu $s2, $s2, 1 /* BBC44 80125544 2402001E */ addiu $v0, $zero, 0x1e @@ -1057,6 +1124,7 @@ glabel func_80124570 /* BBC58 80125558 A2420000 */ sb $v0, ($s2) /* BBC5C 8012555C 08049580 */ j .L80125600 /* BBC60 80125560 26520001 */ addiu $s2, $s2, 1 +glabel L80125564_BBC64 /* BBC64 80125564 92620000 */ lbu $v0, ($s3) /* BBC68 80125568 10400005 */ beqz $v0, .L80125580 /* BBC6C 8012556C 26730001 */ addiu $s3, $s3, 1 @@ -1070,11 +1138,13 @@ glabel func_80124570 /* BBC88 80125588 3463FFFF */ ori $v1, $v1, 0xffff /* BBC8C 8012558C 0804957F */ j .L801255FC /* BBC90 80125590 00431024 */ and $v0, $v0, $v1 +glabel L80125594_BBC94 /* BBC94 80125594 8E8204FC */ lw $v0, 0x4fc($s4) /* BBC98 80125598 3C030008 */ lui $v1, 8 /* BBC9C 8012559C 0804957F */ j .L801255FC /* BBCA0 801255A0 00431025 */ or $v0, $v0, $v1 .L801255A4: +glabel L801255A4_BBCA4 /* BBCA4 801255A4 A2450000 */ sb $a1, ($s2) /* BBCA8 801255A8 26520001 */ addiu $s2, $s2, 1 /* BBCAC 801255AC 92820455 */ lbu $v0, 0x455($s4) @@ -1094,7 +1164,7 @@ glabel func_80124570 /* BBCDC 801255DC 30A500FF */ andi $a1, $a1, 0xff .L801255E0: /* BBCE0 801255E0 0C04910D */ jal func_80124434 -/* BBCE4 801255E4 00000000 */ nop +/* BBCE4 801255E4 00000000 */ nop /* BBCE8 801255E8 8E8304FC */ lw $v1, 0x4fc($s4) /* BBCEC 801255EC 3C020080 */ lui $v0, 0x80 /* BBCF0 801255F0 00621024 */ and $v0, $v1, $v0 @@ -1103,13 +1173,14 @@ glabel func_80124570 .L801255FC: /* BBCFC 801255FC AE8204FC */ sw $v0, 0x4fc($s4) .L80125600: +glabel L80125600_BBD00 /* BBD00 80125600 96820500 */ lhu $v0, 0x500($s4) /* BBD04 80125604 30420006 */ andi $v0, $v0, 6 /* BBD08 80125608 14400008 */ bnez $v0, .L8012562C -/* BBD0C 8012560C 00000000 */ nop +/* BBD0C 8012560C 00000000 */ nop .L80125610: /* BBD10 80125610 1EA00006 */ bgtz $s5, .L8012562C -/* BBD14 80125614 00000000 */ nop +/* BBD14 80125614 00000000 */ nop /* BBD18 80125618 96820500 */ lhu $v0, 0x500($s4) /* BBD1C 8012561C 9283045E */ lbu $v1, 0x45e($s4) /* BBD20 80125620 34420001 */ ori $v0, $v0, 1 @@ -1119,7 +1190,7 @@ glabel func_80124570 /* BBD2C 8012562C 96820500 */ lhu $v0, 0x500($s4) /* BBD30 80125630 30420001 */ andi $v0, $v0, 1 /* BBD34 80125634 1040FBE6 */ beqz $v0, .L801245D0 -/* BBD38 80125638 00000000 */ nop +/* BBD38 80125638 00000000 */ nop /* BBD3C 8012563C 13C00004 */ beqz $fp, .L80125650 /* BBD40 80125640 240800FD */ addiu $t0, $zero, 0xfd /* BBD44 80125644 9262FFFF */ lbu $v0, -1($s3) diff --git a/asm/nonmatchings/code_B9D60/func_80125C84.s b/asm/nonmatchings/code_B9D60/func_80125C84.s index 6a2f3c7cf5..68bdab23ba 100644 --- a/asm/nonmatchings/code_B9D60/func_80125C84.s +++ b/asm/nonmatchings/code_B9D60/func_80125C84.s @@ -15,7 +15,7 @@ glabel func_80125C84 /* BC3A8 80125CA8 10E00005 */ beqz $a3, .L80125CC0 /* BC3AC 80125CAC 240200F7 */ addiu $v0, $zero, 0xf7 /* BC3B0 80125CB0 44870000 */ mtc1 $a3, $f0 -/* BC3B4 80125CB4 00000000 */ nop +/* BC3B4 80125CB4 00000000 */ nop /* BC3B8 80125CB8 08049754 */ j .L80125D50 /* BC3BC 80125CBC 46800020 */ cvt.s.w $f0, $f0 .L80125CC0: @@ -40,7 +40,7 @@ glabel func_80125C84 /* BC408 80125D08 00641021 */ addu $v0, $v1, $a0 /* BC40C 80125D0C 90420000 */ lbu $v0, ($v0) /* BC410 80125D10 08049750 */ j .L80125D40 -/* BC414 80125D14 00000000 */ nop +/* BC414 80125D14 00000000 */ nop .L80125D18: /* BC418 80125D18 00051880 */ sll $v1, $a1, 2 /* BC41C 80125D1C 00061040 */ sll $v0, $a2, 1 @@ -54,40 +54,40 @@ glabel func_80125C84 /* BC43C 80125D3C 90420008 */ lbu $v0, 8($v0) .L80125D40: /* BC440 80125D40 44820000 */ mtc1 $v0, $f0 -/* BC444 80125D44 00000000 */ nop +/* BC444 80125D44 00000000 */ nop /* BC448 80125D48 46800020 */ cvt.s.w $f0, $f0 /* BC44C 80125D4C 240200F7 */ addiu $v0, $zero, 0xf7 .L80125D50: /* BC450 80125D50 1482000C */ bne $a0, $v0, .L80125D84 /* BC454 80125D54 240200F8 */ addiu $v0, $zero, 0xf8 /* BC458 80125D58 46020002 */ mul.s $f0, $f0, $f2 -/* BC45C 80125D5C 00000000 */ nop +/* BC45C 80125D5C 00000000 */ nop /* BC460 80125D60 3C018015 */ lui $at, %hi(D_80150578) /* BC464 80125D64 D4220578 */ ldc1 $f2, %lo(D_80150578)($at) /* BC468 80125D68 46000021 */ cvt.d.s $f0, $f0 .L80125D6C: /* BC46C 80125D6C 46220002 */ mul.d $f0, $f0, $f2 -/* BC470 80125D70 00000000 */ nop +/* BC470 80125D70 00000000 */ nop /* BC474 80125D74 4620010D */ trunc.w.d $f4, $f0 /* BC478 80125D78 44022000 */ mfc1 $v0, $f4 .L80125D7C: /* BC47C 80125D7C 03E00008 */ jr $ra -/* BC480 80125D80 00000000 */ nop +/* BC480 80125D80 00000000 */ nop .L80125D84: /* BC484 80125D84 14820008 */ bne $a0, $v0, .L80125DA8 /* BC488 80125D88 240200F9 */ addiu $v0, $zero, 0xf9 /* BC48C 80125D8C 46020002 */ mul.s $f0, $f0, $f2 -/* BC490 80125D90 00000000 */ nop +/* BC490 80125D90 00000000 */ nop /* BC494 80125D94 46000021 */ cvt.d.s $f0, $f0 /* BC498 80125D98 4620010D */ trunc.w.d $f4, $f0 /* BC49C 80125D9C 44022000 */ mfc1 $v0, $f4 /* BC4A0 80125DA0 03E00008 */ jr $ra -/* BC4A4 80125DA4 00000000 */ nop +/* BC4A4 80125DA4 00000000 */ nop .L80125DA8: /* BC4A8 80125DA8 14820008 */ bne $a0, $v0, .L80125DCC /* BC4AC 80125DAC 288200F0 */ slti $v0, $a0, 0xf0 /* BC4B0 80125DB0 46020002 */ mul.s $f0, $f0, $f2 -/* BC4B4 80125DB4 00000000 */ nop +/* BC4B4 80125DB4 00000000 */ nop /* BC4B8 80125DB8 3C013FE0 */ lui $at, 0x3fe0 /* BC4BC 80125DBC 44811800 */ mtc1 $at, $f3 /* BC4C0 80125DC0 44801000 */ mtc1 $zero, $f2 @@ -95,13 +95,13 @@ glabel func_80125C84 /* BC4C8 80125DC8 46000021 */ cvt.d.s $f0, $f0 .L80125DCC: /* BC4CC 80125DCC 10400007 */ beqz $v0, .L80125DEC -/* BC4D0 80125DD0 00000000 */ nop +/* BC4D0 80125DD0 00000000 */ nop /* BC4D4 80125DD4 46020002 */ mul.s $f0, $f0, $f2 -/* BC4D8 80125DD8 00000000 */ nop +/* BC4D8 80125DD8 00000000 */ nop /* BC4DC 80125DDC 4600010D */ trunc.w.s $f4, $f0 /* BC4E0 80125DE0 44022000 */ mfc1 $v0, $f4 /* BC4E4 80125DE4 03E00008 */ jr $ra -/* BC4E8 80125DE8 00000000 */ nop +/* BC4E8 80125DE8 00000000 */ nop .L80125DEC: /* BC4EC 80125DEC 03E00008 */ jr $ra /* BC4F0 80125DF0 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_B9D60/func_80126790.s b/asm/nonmatchings/code_B9D60/func_80126790.s index 4b3082eba8..4e42e89864 100644 --- a/asm/nonmatchings/code_B9D60/func_80126790.s +++ b/asm/nonmatchings/code_B9D60/func_80126790.s @@ -54,24 +54,26 @@ glabel func_80126790 /* BCF54 80126854 10400071 */ beqz $v0, .L80126A1C /* BCF58 80126858 4600B106 */ mov.s $f4, $f22 /* BCF5C 8012685C 00031080 */ sll $v0, $v1, 2 -/* BCF60 80126860 3C018015 */ lui $at, %hi(D_801506F8) +/* BCF60 80126860 3C018015 */ lui $at, %hi(jtbl_801506F8_E6DF8) /* BCF64 80126864 00220821 */ addu $at, $at, $v0 -/* BCF68 80126868 8C2206F8 */ lw $v0, %lo(D_801506F8)($at) +/* BCF68 80126868 8C2206F8 */ lw $v0, %lo(jtbl_801506F8_E6DF8)($at) /* BCF6C 8012686C 00400008 */ jr $v0 -/* BCF70 80126870 00000000 */ nop +/* BCF70 80126870 00000000 */ nop +glabel L80126874_BCF74 /* BCF74 80126874 24020001 */ addiu $v0, $zero, 1 /* BCF78 80126878 A620047E */ sh $zero, 0x47e($s1) /* BCF7C 8012687C A6200480 */ sh $zero, 0x480($s1) /* BCF80 80126880 A222047C */ sb $v0, 0x47c($s1) +glabel L80126884_BCF84 /* BCF84 80126884 8622047E */ lh $v0, 0x47e($s1) /* BCF88 80126888 3C018015 */ lui $at, %hi(D_80150710) /* BCF8C 8012688C D4220710 */ ldc1 $f2, %lo(D_80150710)($at) /* BCF90 80126890 44820000 */ mtc1 $v0, $f0 -/* BCF94 80126894 00000000 */ nop +/* BCF94 80126894 00000000 */ nop /* BCF98 80126898 46800020 */ cvt.s.w $f0, $f0 /* BCF9C 8012689C 46000021 */ cvt.d.s $f0, $f0 /* BCFA0 801268A0 46220002 */ mul.d $f0, $f0, $f2 -/* BCFA4 801268A4 00000000 */ nop +/* BCFA4 801268A4 00000000 */ nop /* BCFA8 801268A8 9622047E */ lhu $v0, 0x47e($s1) /* BCFAC 801268AC 3C013FE0 */ lui $at, 0x3fe0 /* BCFB0 801268B0 44811800 */ mtc1 $at, $f3 @@ -84,6 +86,7 @@ glabel func_80126790 /* BCFCC 801268CC 28420004 */ slti $v0, $v0, 4 /* BCFD0 801268D0 08049A83 */ j .L80126A0C /* BCFD4 801268D4 46200720 */ cvt.s.d $f28, $f0 +glabel L801268D8_BCFD8 /* BCFD8 801268D8 9622047E */ lhu $v0, 0x47e($s1) /* BCFDC 801268DC 24420001 */ addiu $v0, $v0, 1 /* BCFE0 801268E0 A622047E */ sh $v0, 0x47e($s1) @@ -94,6 +97,7 @@ glabel func_80126790 /* BCFF4 801268F4 24020003 */ addiu $v0, $zero, 3 /* BCFF8 801268F8 08049A86 */ j .L80126A18 /* BCFFC 801268FC A620047E */ sh $zero, 0x47e($s1) +glabel L80126900_BD000 /* BD000 80126900 0000202D */ daddu $a0, $zero, $zero /* BD004 80126904 8627047E */ lh $a3, 0x47e($s1) /* BD008 80126908 3C01437F */ lui $at, 0x437f @@ -129,6 +133,7 @@ glabel func_80126790 /* BD080 80126980 46000106 */ mov.s $f4, $f0 /* BD084 80126984 08049A85 */ j .L80126A14 /* BD088 80126988 24020004 */ addiu $v0, $zero, 4 +glabel L8012698C_BD08C /* BD08C 8012698C 0000202D */ daddu $a0, $zero, $zero /* BD090 80126990 8627047E */ lh $a3, 0x47e($s1) /* BD094 80126994 3C014360 */ lui $at, 0x4360 @@ -180,7 +185,7 @@ glabel func_80126790 /* BD13C 80126A3C 3C02FA00 */ lui $v0, 0xfa00 /* BD140 80126A40 AC820000 */ sw $v0, ($a0) /* BD144 80126A44 4618003E */ c.le.s $f0, $f24 -/* BD148 80126A48 00000000 */ nop +/* BD148 80126A48 00000000 */ nop /* BD14C 80126A4C 45010005 */ bc1t .L80126A64 /* BD150 80126A50 24840004 */ addiu $a0, $a0, 4 /* BD154 80126A54 4600C18D */ trunc.w.s $f6, $f24 @@ -192,25 +197,25 @@ glabel func_80126790 /* BD168 80126A68 3C028000 */ lui $v0, 0x8000 /* BD16C 80126A6C 4600018D */ trunc.w.s $f6, $f0 /* BD170 80126A70 44033000 */ mfc1 $v1, $f6 -/* BD174 80126A74 00000000 */ nop +/* BD174 80126A74 00000000 */ nop /* BD178 80126A78 00621825 */ or $v1, $v1, $v0 /* BD17C 80126A7C 3C014F00 */ lui $at, 0x4f00 /* BD180 80126A80 44810000 */ mtc1 $at, $f0 /* BD184 80126A84 00032E00 */ sll $a1, $v1, 0x18 .L80126A88: /* BD188 80126A88 4616003E */ c.le.s $f0, $f22 -/* BD18C 80126A8C 00000000 */ nop +/* BD18C 80126A8C 00000000 */ nop /* BD190 80126A90 45030005 */ bc1tl .L80126AA8 /* BD194 80126A94 4600B001 */ sub.s $f0, $f22, $f0 /* BD198 80126A98 4600B18D */ trunc.w.s $f6, $f22 /* BD19C 80126A9C 44033000 */ mfc1 $v1, $f6 /* BD1A0 80126AA0 08049AAF */ j .L80126ABC -/* BD1A4 80126AA4 00000000 */ nop +/* BD1A4 80126AA4 00000000 */ nop .L80126AA8: /* BD1A8 80126AA8 3C028000 */ lui $v0, 0x8000 /* BD1AC 80126AAC 4600018D */ trunc.w.s $f6, $f0 /* BD1B0 80126AB0 44033000 */ mfc1 $v1, $f6 -/* BD1B4 80126AB4 00000000 */ nop +/* BD1B4 80126AB4 00000000 */ nop /* BD1B8 80126AB8 00621825 */ or $v1, $v1, $v0 .L80126ABC: /* BD1BC 80126ABC 3C014F00 */ lui $at, 0x4f00 @@ -218,7 +223,7 @@ glabel func_80126790 /* BD1C4 80126AC4 306200FF */ andi $v0, $v1, 0xff /* BD1C8 80126AC8 00021400 */ sll $v0, $v0, 0x10 /* BD1CC 80126ACC 4604003E */ c.le.s $f0, $f4 -/* BD1D0 80126AD0 00000000 */ nop +/* BD1D0 80126AD0 00000000 */ nop /* BD1D4 80126AD4 45010005 */ bc1t .L80126AEC /* BD1D8 80126AD8 00A22825 */ or $a1, $a1, $v0 /* BD1DC 80126ADC 4600218D */ trunc.w.s $f6, $f4 @@ -230,7 +235,7 @@ glabel func_80126790 /* BD1F0 80126AF0 3C028000 */ lui $v0, 0x8000 /* BD1F4 80126AF4 4600018D */ trunc.w.s $f6, $f0 /* BD1F8 80126AF8 44033000 */ mfc1 $v1, $f6 -/* BD1FC 80126AFC 00000000 */ nop +/* BD1FC 80126AFC 00000000 */ nop /* BD200 80126B00 00621825 */ or $v1, $v1, $v0 /* BD204 80126B04 306200FF */ andi $v0, $v1, 0xff .L80126B08: @@ -242,7 +247,7 @@ glabel func_80126790 /* BD21C 80126B1C 2442FFFE */ addiu $v0, $v0, -2 /* BD220 80126B20 2C420003 */ sltiu $v0, $v0, 3 /* BD224 80126B24 10400010 */ beqz $v0, .L80126B68 -/* BD228 80126B28 00000000 */ nop +/* BD228 80126B28 00000000 */ nop /* BD22C 80126B2C 0C00A4F5 */ jal cosine /* BD230 80126B30 86240480 */ lh $a0, 0x480($s1) /* BD234 80126B34 96230480 */ lhu $v1, 0x480($s1) @@ -254,7 +259,7 @@ glabel func_80126790 /* BD24C 80126B4C 00021403 */ sra $v0, $v0, 0x10 /* BD250 80126B50 28420168 */ slti $v0, $v0, 0x168 /* BD254 80126B54 46020682 */ mul.s $f26, $f0, $f2 -/* BD258 80126B58 00000000 */ nop +/* BD258 80126B58 00000000 */ nop /* BD25C 80126B5C 14400002 */ bnez $v0, .L80126B68 /* BD260 80126B60 2462FEA7 */ addiu $v0, $v1, -0x159 /* BD264 80126B64 A6220480 */ sh $v0, 0x480($s1) @@ -263,7 +268,7 @@ glabel func_80126790 /* BD26C 80126B6C 4480A000 */ mtc1 $zero, $f20 /* BD270 80126B70 2442000C */ addiu $v0, $v0, 0xc /* BD274 80126B74 44823000 */ mtc1 $v0, $f6 -/* BD278 80126B78 00000000 */ nop +/* BD278 80126B78 00000000 */ nop /* BD27C 80126B7C 468031A0 */ cvt.s.w $f6, $f6 /* BD280 80126B80 44053000 */ mfc1 $a1, $f6 /* BD284 80126B84 96220484 */ lhu $v0, 0x484($s1) @@ -271,7 +276,7 @@ glabel func_80126790 /* BD28C 80126B8C 2442000C */ addiu $v0, $v0, 0xc /* BD290 80126B90 00021023 */ negu $v0, $v0 /* BD294 80126B94 44823000 */ mtc1 $v0, $f6 -/* BD298 80126B98 00000000 */ nop +/* BD298 80126B98 00000000 */ nop /* BD29C 80126B9C 468031A0 */ cvt.s.w $f6, $f6 /* BD2A0 80126BA0 44063000 */ mfc1 $a2, $f6 /* BD2A4 80126BA4 0C019E40 */ jal guTranslateF @@ -280,7 +285,7 @@ glabel func_80126790 /* BD2B0 80126BB0 44801800 */ mtc1 $zero, $f3 /* BD2B4 80126BB4 4600D021 */ cvt.d.s $f0, $f26 /* BD2B8 80126BB8 46220032 */ c.eq.d $f0, $f2 -/* BD2BC 80126BBC 00000000 */ nop +/* BD2BC 80126BBC 00000000 */ nop /* BD2C0 80126BC0 4501000D */ bc1t .L80126BF8 /* BD2C4 80126BC4 27B00058 */ addiu $s0, $sp, 0x58 /* BD2C8 80126BC8 0200202D */ daddu $a0, $s0, $zero @@ -301,7 +306,7 @@ glabel func_80126790 /* BD300 80126C00 44801000 */ mtc1 $zero, $f2 /* BD304 80126C04 4600E021 */ cvt.d.s $f0, $f28 /* BD308 80126C08 46220032 */ c.eq.d $f0, $f2 -/* BD30C 80126C0C 00000000 */ nop +/* BD30C 80126C0C 00000000 */ nop /* BD310 80126C10 4501000C */ bc1t .L80126C44 /* BD314 80126C14 3C120001 */ lui $s2, 1 /* BD318 80126C18 27B00058 */ addiu $s0, $sp, 0x58 diff --git a/asm/nonmatchings/code_B9D60/func_80126F78.s b/asm/nonmatchings/code_B9D60/func_80126F78.s index 7ab4602284..e3a7a47747 100644 --- a/asm/nonmatchings/code_B9D60/func_80126F78.s +++ b/asm/nonmatchings/code_B9D60/func_80126F78.s @@ -38,7 +38,7 @@ glabel func_80126F78 /* BD6FC 80126FFC 3C030002 */ lui $v1, 2 /* BD700 80127000 00431024 */ and $v0, $v0, $v1 /* BD704 80127004 1040000F */ beqz $v0, .L80127044 -/* BD708 80127008 00000000 */ nop +/* BD708 80127008 00000000 */ nop .L8012700C: /* BD70C 8012700C 920304EE */ lbu $v1, 0x4ee($s0) /* BD710 80127010 86020456 */ lh $v0, 0x456($s0) @@ -64,7 +64,7 @@ glabel func_80126F78 /* BD75C 8012705C 920504EC */ lbu $a1, 0x4ec($s0) /* BD760 80127060 8604045C */ lh $a0, 0x45c($s0) /* BD764 80127064 44820000 */ mtc1 $v0, $f0 -/* BD768 80127068 00000000 */ nop +/* BD768 80127068 00000000 */ nop /* BD76C 8012706C 46800021 */ cvt.d.w $f0, $f0 /* BD770 80127070 00063040 */ sll $a2, $a2, 1 /* BD774 80127074 02063021 */ addu $a2, $s0, $a2 @@ -86,10 +86,10 @@ glabel func_80126F78 /* BD7B4 801270B4 00621821 */ addu $v1, $v1, $v0 /* BD7B8 801270B8 00671823 */ subu $v1, $v1, $a3 /* BD7BC 801270BC 44833000 */ mtc1 $v1, $f6 -/* BD7C0 801270C0 00000000 */ nop +/* BD7C0 801270C0 00000000 */ nop /* BD7C4 801270C4 468031A0 */ cvt.s.w $f6, $f6 /* BD7C8 801270C8 46003182 */ mul.s $f6, $f6, $f0 -/* BD7CC 801270CC 00000000 */ nop +/* BD7CC 801270CC 00000000 */ nop /* BD7D0 801270D0 86020458 */ lh $v0, 0x458($s0) /* BD7D4 801270D4 94C304DC */ lhu $v1, 0x4dc($a2) /* BD7D8 801270D8 00441021 */ addu $v0, $v0, $a0 @@ -98,16 +98,16 @@ glabel func_80126F78 /* BD7E4 801270E4 00441021 */ addu $v0, $v0, $a0 /* BD7E8 801270E8 00431023 */ subu $v0, $v0, $v1 /* BD7EC 801270EC 44822000 */ mtc1 $v0, $f4 -/* BD7F0 801270F0 00000000 */ nop +/* BD7F0 801270F0 00000000 */ nop /* BD7F4 801270F4 46802120 */ cvt.s.w $f4, $f4 /* BD7F8 801270F8 46002102 */ mul.s $f4, $f4, $f0 -/* BD7FC 801270FC 00000000 */ nop +/* BD7FC 801270FC 00000000 */ nop /* BD800 80127100 44871000 */ mtc1 $a3, $f2 -/* BD804 80127104 00000000 */ nop +/* BD804 80127104 00000000 */ nop /* BD808 80127108 468010A0 */ cvt.s.w $f2, $f2 /* BD80C 8012710C 46061080 */ add.s $f2, $f2, $f6 /* BD810 80127110 44830000 */ mtc1 $v1, $f0 -/* BD814 80127114 00000000 */ nop +/* BD814 80127114 00000000 */ nop /* BD818 80127118 46800020 */ cvt.s.w $f0, $f0 /* BD81C 8012711C 46040000 */ add.s $f0, $f0, $f4 /* BD820 80127120 4600120D */ trunc.w.s $f8, $f2 @@ -132,17 +132,17 @@ glabel func_80126F78 /* BD868 80127168 3C013FE0 */ lui $at, 0x3fe0 /* BD86C 8012716C 44811800 */ mtc1 $at, $f3 /* BD870 80127170 44801000 */ mtc1 $zero, $f2 -/* BD874 80127174 00000000 */ nop +/* BD874 80127174 00000000 */ nop /* BD878 80127178 46220002 */ mul.d $f0, $f0, $f2 -/* BD87C 8012717C 00000000 */ nop +/* BD87C 8012717C 00000000 */ nop /* BD880 80127180 3C018015 */ lui $at, %hi(D_80150718) /* BD884 80127184 D4220718 */ ldc1 $f2, %lo(D_80150718)($at) /* BD888 80127188 46220002 */ mul.d $f0, $f0, $f2 -/* BD88C 8012718C 00000000 */ nop +/* BD88C 8012718C 00000000 */ nop /* BD890 80127190 26B50001 */ addiu $s5, $s5, 1 /* BD894 80127194 8E0204FC */ lw $v0, 0x4fc($s0) /* BD898 80127198 44941000 */ mtc1 $s4, $f2 -/* BD89C 8012719C 00000000 */ nop +/* BD89C 8012719C 00000000 */ nop /* BD8A0 801271A0 468010A1 */ cvt.d.w $f2, $f2 /* BD8A4 801271A4 46201080 */ add.d $f2, $f2, $f0 /* BD8A8 801271A8 3C030002 */ lui $v1, 2 @@ -156,51 +156,51 @@ glabel func_80126F78 /* BD8C8 801271C8 44811800 */ mtc1 $at, $f3 /* BD8CC 801271CC 44801000 */ mtc1 $zero, $f2 /* BD8D0 801271D0 44820000 */ mtc1 $v0, $f0 -/* BD8D4 801271D4 00000000 */ nop +/* BD8D4 801271D4 00000000 */ nop /* BD8D8 801271D8 46800021 */ cvt.d.w $f0, $f0 /* BD8DC 801271DC 46220002 */ mul.d $f0, $f0, $f2 -/* BD8E0 801271E0 00000000 */ nop +/* BD8E0 801271E0 00000000 */ nop /* BD8E4 801271E4 3C018015 */ lui $at, %hi(D_80150720) /* BD8E8 801271E8 D4220720 */ ldc1 $f2, %lo(D_80150720)($at) /* BD8EC 801271EC 46201001 */ sub.d $f0, $f2, $f0 /* BD8F0 801271F0 3C0141E0 */ lui $at, 0x41e0 /* BD8F4 801271F4 44811800 */ mtc1 $at, $f3 /* BD8F8 801271F8 44801000 */ mtc1 $zero, $f2 -/* BD8FC 801271FC 00000000 */ nop +/* BD8FC 801271FC 00000000 */ nop /* BD900 80127200 4620103E */ c.le.d $f2, $f0 -/* BD904 80127204 00000000 */ nop +/* BD904 80127204 00000000 */ nop /* BD908 80127208 45030005 */ bc1tl .L80127220 /* BD90C 8012720C 46220001 */ sub.d $f0, $f0, $f2 /* BD910 80127210 4620020D */ trunc.w.d $f8, $f0 /* BD914 80127214 44034000 */ mfc1 $v1, $f8 /* BD918 80127218 08049C8D */ j .L80127234 -/* BD91C 8012721C 00000000 */ nop +/* BD91C 8012721C 00000000 */ nop .L80127220: /* BD920 80127220 3C028000 */ lui $v0, 0x8000 /* BD924 80127224 4620020D */ trunc.w.d $f8, $f0 /* BD928 80127228 44034000 */ mfc1 $v1, $f8 -/* BD92C 8012722C 00000000 */ nop +/* BD92C 8012722C 00000000 */ nop /* BD930 80127230 00621825 */ or $v1, $v1, $v0 .L80127234: /* BD934 80127234 92020512 */ lbu $v0, 0x512($s0) /* BD938 80127238 3C018015 */ lui $at, %hi(D_80150728) /* BD93C 8012723C D4220728 */ ldc1 $f2, %lo(D_80150728)($at) /* BD940 80127240 44820000 */ mtc1 $v0, $f0 -/* BD944 80127244 00000000 */ nop +/* BD944 80127244 00000000 */ nop /* BD948 80127248 46800021 */ cvt.d.w $f0, $f0 /* BD94C 8012724C 46220002 */ mul.d $f0, $f0, $f2 -/* BD950 80127250 00000000 */ nop +/* BD950 80127250 00000000 */ nop /* BD954 80127254 3C014052 */ lui $at, 0x4052 /* BD958 80127258 44811800 */ mtc1 $at, $f3 /* BD95C 8012725C 44801000 */ mtc1 $zero, $f2 -/* BD960 80127260 00000000 */ nop +/* BD960 80127260 00000000 */ nop /* BD964 80127264 46201001 */ sub.d $f0, $f2, $f0 /* BD968 80127268 3C0141E0 */ lui $at, 0x41e0 /* BD96C 8012726C 44811800 */ mtc1 $at, $f3 /* BD970 80127270 44801000 */ mtc1 $zero, $f2 -/* BD974 80127274 00000000 */ nop +/* BD974 80127274 00000000 */ nop /* BD978 80127278 4620103E */ c.le.d $f2, $f0 -/* BD97C 8012727C 00000000 */ nop +/* BD97C 8012727C 00000000 */ nop /* BD980 80127280 45010005 */ bc1t .L80127298 /* BD984 80127284 0060B82D */ daddu $s7, $v1, $zero /* BD988 80127288 4620020D */ trunc.w.d $f8, $f0 @@ -212,7 +212,7 @@ glabel func_80126F78 /* BD99C 8012729C 3C028000 */ lui $v0, 0x8000 /* BD9A0 801272A0 4620020D */ trunc.w.d $f8, $f0 /* BD9A4 801272A4 44034000 */ mfc1 $v1, $f8 -/* BD9A8 801272A8 00000000 */ nop +/* BD9A8 801272A8 00000000 */ nop /* BD9AC 801272AC 00621825 */ or $v1, $v1, $v0 /* BD9B0 801272B0 0060B02D */ daddu $s6, $v1, $zero .L801272B4: diff --git a/asm/nonmatchings/code_B9D60/func_80127BA4.s b/asm/nonmatchings/code_B9D60/func_80127BA4.s index 69624c43ac..bf4f13c291 100644 --- a/asm/nonmatchings/code_B9D60/func_80127BA4.s +++ b/asm/nonmatchings/code_B9D60/func_80127BA4.s @@ -15,7 +15,7 @@ glabel func_80127BA4 /* BE2CC 80127BCC 1062001D */ beq $v1, $v0, .L80127C44 /* BE2D0 80127BD0 2862000F */ slti $v0, $v1, 0xf /* BE2D4 80127BD4 08049F2B */ j .L80127CAC -/* BE2D8 80127BD8 00000000 */ nop +/* BE2D8 80127BD8 00000000 */ nop .L80127BDC: /* BE2DC 80127BDC 24050004 */ addiu $a1, $zero, 4 /* BE2E0 80127BE0 91030509 */ lbu $v1, 0x509($t0) @@ -31,7 +31,7 @@ glabel func_80127BA4 /* BE308 80127C08 24630001 */ addiu $v1, $v1, 1 /* BE30C 80127C0C A1030509 */ sb $v1, 0x509($t0) /* BE310 80127C10 44820000 */ mtc1 $v0, $f0 -/* BE314 80127C14 00000000 */ nop +/* BE314 80127C14 00000000 */ nop /* BE318 80127C18 46800020 */ cvt.s.w $f0, $f0 /* BE31C 80127C1C 46000021 */ cvt.d.s $f0, $f0 /* BE320 80127C20 306200FF */ andi $v0, $v1, 0xff @@ -59,7 +59,7 @@ glabel func_80127BA4 /* BE374 80127C74 00220821 */ addu $at, $at, $v0 /* BE378 80127C78 9022C588 */ lbu $v0, %lo(D_8014C588)($at) /* BE37C 80127C7C 44830000 */ mtc1 $v1, $f0 -/* BE380 80127C80 00000000 */ nop +/* BE380 80127C80 00000000 */ nop /* BE384 80127C84 46800020 */ cvt.s.w $f0, $f0 /* BE388 80127C88 46000021 */ cvt.d.s $f0, $f0 /* BE38C 80127C8C 46220003 */ div.d $f0, $f0, $f2 @@ -95,7 +95,7 @@ glabel func_80127BA4 /* BE3FC 80127CFC E7A00024 */ swc1 $f0, 0x24($sp) /* BE400 80127D00 E7A00028 */ swc1 $f0, 0x28($sp) /* BE404 80127D04 44890000 */ mtc1 $t1, $f0 -/* BE408 80127D08 00000000 */ nop +/* BE408 80127D08 00000000 */ nop /* BE40C 80127D0C 46800020 */ cvt.s.w $f0, $f0 /* BE410 80127D10 AFA2001C */ sw $v0, 0x1c($sp) /* BE414 80127D14 3C028012 */ lui $v0, %hi(func_80127B70) @@ -115,7 +115,7 @@ glabel func_80127BA4 /* BE44C 80127D4C 0C03D4B8 */ jal draw_box /* BE450 80127D50 AFA30018 */ sw $v1, 0x18($sp) /* BE454 80127D54 08049F61 */ j .L80127D84 -/* BE458 80127D58 00000000 */ nop +/* BE458 80127D58 00000000 */ nop .L80127D5C: /* BE45C 80127D5C 0100202D */ daddu $a0, $t0, $zero .L80127D60: diff --git a/asm/nonmatchings/code_B9D60/func_80127D90.s b/asm/nonmatchings/code_B9D60/func_80127D90.s index 111369a23a..587e441d6c 100644 --- a/asm/nonmatchings/code_B9D60/func_80127D90.s +++ b/asm/nonmatchings/code_B9D60/func_80127D90.s @@ -42,7 +42,7 @@ glabel func_80127D90 /* BE524 80127E24 10620003 */ beq $v1, $v0, .L80127E34 /* BE528 80127E28 A7A70076 */ sh $a3, 0x76($sp) /* BE52C 80127E2C 0C04B0B8 */ jal func_8012C2E0 -/* BE530 80127E30 00000000 */ nop +/* BE530 80127E30 00000000 */ nop .L80127E34: /* BE534 80127E34 8E040000 */ lw $a0, ($s0) /* BE538 80127E38 94820034 */ lhu $v0, 0x34($a0) @@ -52,7 +52,7 @@ glabel func_80127D90 /* BE548 80127E48 A4820034 */ sh $v0, 0x34($a0) /* BE54C 80127E4C 32220001 */ andi $v0, $s1, 1 /* BE550 80127E50 10400003 */ beqz $v0, .L80127E60 -/* BE554 80127E54 00000000 */ nop +/* BE554 80127E54 00000000 */ nop /* BE558 80127E58 325200FF */ andi $s2, $s2, 0xff /* BE55C 80127E5C A7B2008E */ sh $s2, 0x8e($sp) .L80127E60: @@ -137,11 +137,12 @@ glabel func_80127D90 /* BE68C 80127F8C 2C620010 */ sltiu $v0, $v1, 0x10 /* BE690 80127F90 10400AF2 */ beqz $v0, .L8012AB5C /* BE694 80127F94 00031080 */ sll $v0, $v1, 2 -/* BE698 80127F98 3C018015 */ lui $at, %hi(D_80150730) +/* BE698 80127F98 3C018015 */ lui $at, %hi(jtbl_80150730_E6E30) /* BE69C 80127F9C 00220821 */ addu $at, $at, $v0 -/* BE6A0 80127FA0 8C220730 */ lw $v0, %lo(D_80150730)($at) +/* BE6A0 80127FA0 8C220730 */ lw $v0, %lo(jtbl_80150730_E6E30)($at) /* BE6A4 80127FA4 00400008 */ jr $v0 -/* BE6A8 80127FA8 00000000 */ nop +/* BE6A8 80127FA8 00000000 */ nop +glabel L80127FAC_BE6AC /* BE6AC 80127FAC 3C048015 */ lui $a0, %hi(D_80155D74) /* BE6B0 80127FB0 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) /* BE6B4 80127FB4 9482003C */ lhu $v0, 0x3c($a0) @@ -153,24 +154,24 @@ glabel func_80127D90 /* BE6CC 80127FCC 90420003 */ lbu $v0, 3($v0) /* BE6D0 80127FD0 C4820014 */ lwc1 $f2, 0x14($a0) /* BE6D4 80127FD4 44820000 */ mtc1 $v0, $f0 -/* BE6D8 80127FD8 00000000 */ nop +/* BE6D8 80127FD8 00000000 */ nop /* BE6DC 80127FDC 46800020 */ cvt.s.w $f0, $f0 /* BE6E0 80127FE0 93C20508 */ lbu $v0, 0x508($fp) /* BE6E4 80127FE4 46001082 */ mul.s $f2, $f2, $f0 -/* BE6E8 80127FE8 00000000 */ nop +/* BE6E8 80127FE8 00000000 */ nop /* BE6EC 80127FEC 00021040 */ sll $v0, $v0, 1 /* BE6F0 80127FF0 3C01802F */ lui $at, %hi(D_802EB644) /* BE6F4 80127FF4 00220821 */ addu $at, $at, $v0 /* BE6F8 80127FF8 8422B644 */ lh $v0, %lo(D_802EB644)($at) /* BE6FC 80127FFC 44820000 */ mtc1 $v0, $f0 -/* BE700 80128000 00000000 */ nop +/* BE700 80128000 00000000 */ nop /* BE704 80128004 46800020 */ cvt.s.w $f0, $f0 /* BE708 80128008 46001080 */ add.s $f2, $f2, $f0 /* BE70C 8012800C 94850034 */ lhu $a1, 0x34($a0) /* BE710 80128010 94820044 */ lhu $v0, 0x44($a0) /* BE714 80128014 4600130D */ trunc.w.s $f12, $f2 /* BE718 80128018 44036000 */ mfc1 $v1, $f12 -/* BE71C 8012801C 00000000 */ nop +/* BE71C 8012801C 00000000 */ nop /* BE720 80128020 00431021 */ addu $v0, $v0, $v1 /* BE724 80128024 A4820044 */ sh $v0, 0x44($a0) /* BE728 80128028 30A20040 */ andi $v0, $a1, 0x40 @@ -178,6 +179,7 @@ glabel func_80127D90 /* BE730 80128030 34A20080 */ ori $v0, $a1, 0x80 /* BE734 80128034 0804A9B1 */ j .L8012A6C4 /* BE738 80128038 A4820034 */ sh $v0, 0x34($a0) +glabel L8012803C_BE73C /* BE73C 8012803C 3C048015 */ lui $a0, %hi(D_80155D74) /* BE740 80128040 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) /* BE744 80128044 8C83004C */ lw $v1, 0x4c($a0) @@ -189,6 +191,7 @@ glabel func_80127D90 /* BE75C 8012805C 2463FF0F */ addiu $v1, $v1, -0xf1 /* BE760 80128060 0804AFDC */ j .L8012BF70 /* BE764 80128064 A483003E */ sh $v1, 0x3e($a0) +glabel L80128068_BE768 /* BE768 80128068 3C078015 */ lui $a3, %hi(D_80155D74) /* BE76C 8012806C 8CE75D74 */ lw $a3, %lo(D_80155D74)($a3) /* BE770 80128070 8CE2004C */ lw $v0, 0x4c($a3) @@ -203,6 +206,7 @@ glabel func_80127D90 /* BE794 80128094 AFA20014 */ sw $v0, 0x14($sp) /* BE798 80128098 0804AFD2 */ j .L8012BF48 /* BE79C 8012809C 8CE70010 */ lw $a3, 0x10($a3) +glabel L801280A0_BE7A0 /* BE7A0 801280A0 3C038015 */ lui $v1, %hi(D_80155D74) /* BE7A4 801280A4 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) /* BE7A8 801280A8 8C620020 */ lw $v0, 0x20($v1) @@ -213,18 +217,19 @@ glabel func_80127D90 /* BE7BC 801280BC 2C62000F */ sltiu $v0, $v1, 0xf /* BE7C0 801280C0 10400FAB */ beqz $v0, .L8012BF70 /* BE7C4 801280C4 00031080 */ sll $v0, $v1, 2 -/* BE7C8 801280C8 3C018015 */ lui $at, %hi(D_80150770) +/* BE7C8 801280C8 3C018015 */ lui $at, %hi(jtbl_80150770_E6E70) /* BE7CC 801280CC 00220821 */ addu $at, $at, $v0 -/* BE7D0 801280D0 8C220770 */ lw $v0, %lo(D_80150770)($at) +/* BE7D0 801280D0 8C220770 */ lw $v0, %lo(jtbl_80150770_E6E70)($at) /* BE7D4 801280D4 00400008 */ jr $v0 -/* BE7D8 801280D8 00000000 */ nop +/* BE7D8 801280D8 00000000 */ nop +glabel L801280DC_BE7DC /* BE7DC 801280DC 93C204F8 */ lbu $v0, 0x4f8($fp) /* BE7E0 801280E0 24190002 */ addiu $t9, $zero, 2 /* BE7E4 801280E4 14590008 */ bne $v0, $t9, .L80128108 -/* BE7E8 801280E8 00000000 */ nop +/* BE7E8 801280E8 00000000 */ nop /* BE7EC 801280EC 93C20509 */ lbu $v0, 0x509($fp) /* BE7F0 801280F0 14400005 */ bnez $v0, .L80128108 -/* BE7F4 801280F4 00000000 */ nop +/* BE7F4 801280F4 00000000 */ nop /* BE7F8 801280F8 97C2050A */ lhu $v0, 0x50a($fp) /* BE7FC 801280FC 97C3050C */ lhu $v1, 0x50c($fp) /* BE800 80128100 A7C2050E */ sh $v0, 0x50e($fp) @@ -236,11 +241,11 @@ glabel func_80127D90 /* BE814 80128114 44806000 */ mtc1 $zero, $f12 /* BE818 80128118 97D6050E */ lhu $s6, 0x50e($fp) /* BE81C 8012811C 44820000 */ mtc1 $v0, $f0 -/* BE820 80128120 00000000 */ nop +/* BE820 80128120 00000000 */ nop /* BE824 80128124 46800020 */ cvt.s.w $f0, $f0 /* BE828 80128128 46000021 */ cvt.d.s $f0, $f0 /* BE82C 8012812C 462C0002 */ mul.d $f0, $f0, $f12 -/* BE830 80128130 00000000 */ nop +/* BE830 80128130 00000000 */ nop /* BE834 80128134 97D50510 */ lhu $s5, 0x510($fp) /* BE838 80128138 3C058015 */ lui $a1, %hi(D_80155D74) /* BE83C 8012813C 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) @@ -248,15 +253,15 @@ glabel func_80127D90 /* BE844 80128144 97C20516 */ lhu $v0, 0x516($fp) /* BE848 80128148 87C4045C */ lh $a0, 0x45c($fp) /* BE84C 8012814C 44822000 */ mtc1 $v0, $f4 -/* BE850 80128150 00000000 */ nop +/* BE850 80128150 00000000 */ nop /* BE854 80128154 46802120 */ cvt.s.w $f4, $f4 /* BE858 80128158 46002121 */ cvt.d.s $f4, $f4 /* BE85C 8012815C 462C2102 */ mul.d $f4, $f4, $f12 -/* BE860 80128160 00000000 */ nop +/* BE860 80128160 00000000 */ nop /* BE864 80128164 2418000A */ addiu $t8, $zero, 0xa /* BE868 80128168 94A20034 */ lhu $v0, 0x34($a1) /* BE86C 8012816C 44831000 */ mtc1 $v1, $f2 -/* BE870 80128170 00000000 */ nop +/* BE870 80128170 00000000 */ nop /* BE874 80128174 468010A1 */ cvt.d.w $f2, $f2 /* BE878 80128178 A4B8004A */ sh $t8, 0x4a($a1) /* BE87C 8012817C 34420010 */ ori $v0, $v0, 0x10 @@ -265,7 +270,7 @@ glabel func_80127D90 /* BE888 80128188 46201080 */ add.d $f2, $f2, $f0 /* BE88C 8012818C 2442FFFF */ addiu $v0, $v0, -1 /* BE890 80128190 44840000 */ mtc1 $a0, $f0 -/* BE894 80128194 00000000 */ nop +/* BE894 80128194 00000000 */ nop /* BE898 80128198 46800021 */ cvt.d.w $f0, $f0 /* BE89C 8012819C 46240000 */ add.d $f0, $f0, $f4 /* BE8A0 801281A0 2C420003 */ sltiu $v0, $v0, 3 @@ -303,13 +308,13 @@ glabel func_80127D90 /* BE91C 8012821C 10780008 */ beq $v1, $t8, .L80128240 /* BE920 80128220 24120020 */ addiu $s2, $zero, 0x20 /* BE924 80128224 0804A0A1 */ j .L80128284 -/* BE928 80128228 00000000 */ nop +/* BE928 80128228 00000000 */ nop .L8012822C: /* BE92C 8012822C 24190003 */ addiu $t9, $zero, 3 /* BE930 80128230 1079000F */ beq $v1, $t9, .L80128270 /* BE934 80128234 24120020 */ addiu $s2, $zero, 0x20 /* BE938 80128238 0804A0A1 */ j .L80128284 -/* BE93C 8012823C 00000000 */ nop +/* BE93C 8012823C 00000000 */ nop .L80128240: /* BE940 80128240 24120018 */ addiu $s2, $zero, 0x18 /* BE944 80128244 24020012 */ addiu $v0, $zero, 0x12 @@ -447,13 +452,13 @@ glabel func_80127D90 /* BEB1C 8012841C 00151400 */ sll $v0, $s5, 0x10 /* BEB20 80128420 00021403 */ sra $v0, $v0, 0x10 /* BEB24 80128424 44826000 */ mtc1 $v0, $f12 -/* BEB28 80128428 00000000 */ nop +/* BEB28 80128428 00000000 */ nop /* BEB2C 8012842C 46806320 */ cvt.s.w $f12, $f12 /* BEB30 80128430 00131400 */ sll $v0, $s3, 0x10 /* BEB34 80128434 00021403 */ sra $v0, $v0, 0x10 /* BEB38 80128438 44056000 */ mfc1 $a1, $f12 /* BEB3C 8012843C 44826000 */ mtc1 $v0, $f12 -/* BEB40 80128440 00000000 */ nop +/* BEB40 80128440 00000000 */ nop /* BEB44 80128444 46806320 */ cvt.s.w $f12, $f12 /* BEB48 80128448 93C70509 */ lbu $a3, 0x509($fp) /* BEB4C 8012844C 44066000 */ mfc1 $a2, $f12 @@ -465,13 +470,13 @@ glabel func_80127D90 /* BEB64 80128464 00161400 */ sll $v0, $s6, 0x10 /* BEB68 80128468 00021403 */ sra $v0, $v0, 0x10 /* BEB6C 8012846C 44826000 */ mtc1 $v0, $f12 -/* BEB70 80128470 00000000 */ nop +/* BEB70 80128470 00000000 */ nop /* BEB74 80128474 46806320 */ cvt.s.w $f12, $f12 /* BEB78 80128478 00141400 */ sll $v0, $s4, 0x10 /* BEB7C 8012847C 00021403 */ sra $v0, $v0, 0x10 /* BEB80 80128480 44056000 */ mfc1 $a1, $f12 /* BEB84 80128484 44826000 */ mtc1 $v0, $f12 -/* BEB88 80128488 00000000 */ nop +/* BEB88 80128488 00000000 */ nop /* BEB8C 8012848C 46806320 */ cvt.s.w $f12, $f12 /* BEB90 80128490 93C70509 */ lbu $a3, 0x509($fp) /* BEB94 80128494 44066000 */ mfc1 $a2, $f12 @@ -481,25 +486,25 @@ glabel func_80127D90 /* BEBA4 801284A4 97C20514 */ lhu $v0, 0x514($fp) /* BEBA8 801284A8 C7AC00BC */ lwc1 $f12, 0xbc($sp) /* BEBAC 801284AC 44822000 */ mtc1 $v0, $f4 -/* BEBB0 801284B0 00000000 */ nop +/* BEBB0 801284B0 00000000 */ nop /* BEBB4 801284B4 46802120 */ cvt.s.w $f4, $f4 /* BEBB8 801284B8 460C2102 */ mul.s $f4, $f4, $f12 -/* BEBBC 801284BC 00000000 */ nop +/* BEBBC 801284BC 00000000 */ nop /* BEBC0 801284C0 3C013FE0 */ lui $at, 0x3fe0 /* BEBC4 801284C4 44816800 */ mtc1 $at, $f13 /* BEBC8 801284C8 44806000 */ mtc1 $zero, $f12 /* BEBCC 801284CC 46002121 */ cvt.d.s $f4, $f4 /* BEBD0 801284D0 462C2102 */ mul.d $f4, $f4, $f12 -/* BEBD4 801284D4 00000000 */ nop +/* BEBD4 801284D4 00000000 */ nop /* BEBD8 801284D8 97C20516 */ lhu $v0, 0x516($fp) /* BEBDC 801284DC 44821000 */ mtc1 $v0, $f2 -/* BEBE0 801284E0 00000000 */ nop +/* BEBE0 801284E0 00000000 */ nop /* BEBE4 801284E4 468010A0 */ cvt.s.w $f2, $f2 /* BEBE8 801284E8 461E1082 */ mul.s $f2, $f2, $f30 -/* BEBEC 801284EC 00000000 */ nop +/* BEBEC 801284EC 00000000 */ nop /* BEBF0 801284F0 460010A1 */ cvt.d.s $f2, $f2 /* BEBF4 801284F4 462C1082 */ mul.d $f2, $f2, $f12 -/* BEBF8 801284F8 00000000 */ nop +/* BEBF8 801284F8 00000000 */ nop /* BEBFC 801284FC 46000021 */ cvt.d.s $f0, $f0 /* BEC00 80128500 46240001 */ sub.d $f0, $f0, $f4 /* BEC04 80128504 4600A121 */ cvt.d.s $f4, $f20 @@ -517,13 +522,13 @@ glabel func_80127D90 /* BEC34 80128534 E7AC0018 */ swc1 $f12, 0x18($sp) /* BEC38 80128538 4600C30D */ trunc.w.s $f12, $f24 /* BEC3C 8012853C 44026000 */ mfc1 $v0, $f12 -/* BEC40 80128540 00000000 */ nop +/* BEC40 80128540 00000000 */ nop /* BEC44 80128544 00021400 */ sll $v0, $v0, 0x10 /* BEC48 80128548 00022C03 */ sra $a1, $v0, 0x10 /* BEC4C 8012854C 462026A0 */ cvt.s.d $f26, $f4 /* BEC50 80128550 4600D30D */ trunc.w.s $f12, $f26 /* BEC54 80128554 44026000 */ mfc1 $v0, $f12 -/* BEC58 80128558 00000000 */ nop +/* BEC58 80128558 00000000 */ nop /* BEC5C 8012855C 00021400 */ sll $v0, $v0, 0x10 /* BEC60 80128560 00023403 */ sra $a2, $v0, 0x10 /* BEC64 80128564 00101400 */ sll $v0, $s0, 0x10 @@ -538,7 +543,7 @@ glabel func_80127D90 /* BEC84 80128584 3C028000 */ lui $v0, 0x8000 /* BEC88 80128588 4600030D */ trunc.w.s $f12, $f0 /* BEC8C 8012858C 44036000 */ mfc1 $v1, $f12 -/* BEC90 80128590 00000000 */ nop +/* BEC90 80128590 00000000 */ nop /* BEC94 80128594 00621825 */ or $v1, $v1, $v0 /* BEC98 80128598 03C0202D */ daddu $a0, $fp, $zero .L8012859C: @@ -582,30 +587,30 @@ glabel func_80127D90 /* BED2C 8012862C 97C20514 */ lhu $v0, 0x514($fp) /* BED30 80128630 C7AC00BC */ lwc1 $f12, 0xbc($sp) /* BED34 80128634 44821000 */ mtc1 $v0, $f2 -/* BED38 80128638 00000000 */ nop +/* BED38 80128638 00000000 */ nop /* BED3C 8012863C 468010A0 */ cvt.s.w $f2, $f2 /* BED40 80128640 460C1082 */ mul.s $f2, $f2, $f12 -/* BED44 80128644 00000000 */ nop +/* BED44 80128644 00000000 */ nop /* BED48 80128648 3C013FE0 */ lui $at, 0x3fe0 /* BED4C 8012864C 44816800 */ mtc1 $at, $f13 /* BED50 80128650 44806000 */ mtc1 $zero, $f12 /* BED54 80128654 460010A1 */ cvt.d.s $f2, $f2 /* BED58 80128658 462C1082 */ mul.d $f2, $f2, $f12 -/* BED5C 8012865C 00000000 */ nop +/* BED5C 8012865C 00000000 */ nop /* BED60 80128660 97C20516 */ lhu $v0, 0x516($fp) /* BED64 80128664 46000786 */ mov.s $f30, $f0 /* BED68 80128668 44820000 */ mtc1 $v0, $f0 -/* BED6C 8012866C 00000000 */ nop +/* BED6C 8012866C 00000000 */ nop /* BED70 80128670 46800020 */ cvt.s.w $f0, $f0 /* BED74 80128674 461E0002 */ mul.s $f0, $f0, $f30 -/* BED78 80128678 00000000 */ nop +/* BED78 80128678 00000000 */ nop /* BED7C 8012867C 46000021 */ cvt.d.s $f0, $f0 /* BED80 80128680 462C0002 */ mul.d $f0, $f0, $f12 -/* BED84 80128684 00000000 */ nop +/* BED84 80128684 00000000 */ nop /* BED88 80128688 00141400 */ sll $v0, $s4, 0x10 /* BED8C 8012868C 00021403 */ sra $v0, $v0, 0x10 /* BED90 80128690 4482B000 */ mtc1 $v0, $f22 -/* BED94 80128694 00000000 */ nop +/* BED94 80128694 00000000 */ nop /* BED98 80128698 4680B5A0 */ cvt.s.w $f22, $f22 /* BED9C 8012869C 4600B5A1 */ cvt.d.s $f22, $f22 /* BEDA0 801286A0 4622B181 */ sub.d $f6, $f22, $f2 @@ -613,7 +618,7 @@ glabel func_80127D90 /* BEDA8 801286A8 00021403 */ sra $v0, $v0, 0x10 /* BEDAC 801286AC 4622B580 */ add.d $f22, $f22, $f2 /* BEDB0 801286B0 4482A000 */ mtc1 $v0, $f20 -/* BEDB4 801286B4 00000000 */ nop +/* BEDB4 801286B4 00000000 */ nop /* BEDB8 801286B8 4680A520 */ cvt.s.w $f20, $f20 /* BEDBC 801286BC 4600A521 */ cvt.d.s $f20, $f20 /* BEDC0 801286C0 4620A101 */ sub.d $f4, $f20, $f0 @@ -638,35 +643,35 @@ glabel func_80127D90 /* BEE0C 8012870C D42007B0 */ ldc1 $f0, %lo(D_801507B0)($at) /* BEE10 80128710 4600E1A1 */ cvt.d.s $f6, $f28 /* BEE14 80128714 46203182 */ mul.d $f6, $f6, $f0 -/* BEE18 80128718 00000000 */ nop +/* BEE18 80128718 00000000 */ nop /* BEE1C 8012871C 3C028015 */ lui $v0, %hi(D_80155D74) /* BEE20 80128720 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* BEE24 80128724 4600E30D */ trunc.w.s $f12, $f28 /* BEE28 80128728 44046000 */ mfc1 $a0, $f12 -/* BEE2C 8012872C 00000000 */ nop +/* BEE2C 8012872C 00000000 */ nop /* BEE30 80128730 A7A400AE */ sh $a0, 0xae($sp) /* BEE34 80128734 84430046 */ lh $v1, 0x46($v0) /* BEE38 80128738 3C014F00 */ lui $at, 0x4f00 /* BEE3C 8012873C 44814000 */ mtc1 $at, $f8 /* BEE40 80128740 44831000 */ mtc1 $v1, $f2 -/* BEE44 80128744 00000000 */ nop +/* BEE44 80128744 00000000 */ nop /* BEE48 80128748 468010A0 */ cvt.s.w $f2, $f2 /* BEE4C 8012874C 84430048 */ lh $v1, 0x48($v0) /* BEE50 80128750 4602C080 */ add.s $f2, $f24, $f2 /* BEE54 80128754 44832000 */ mtc1 $v1, $f4 -/* BEE58 80128758 00000000 */ nop +/* BEE58 80128758 00000000 */ nop /* BEE5C 8012875C 46802120 */ cvt.s.w $f4, $f4 /* BEE60 80128760 84430046 */ lh $v1, 0x46($v0) /* BEE64 80128764 4604D100 */ add.s $f4, $f26, $f4 /* BEE68 80128768 44830000 */ mtc1 $v1, $f0 -/* BEE6C 8012876C 00000000 */ nop +/* BEE6C 8012876C 00000000 */ nop /* BEE70 80128770 46800020 */ cvt.s.w $f0, $f0 /* BEE74 80128774 84430048 */ lh $v1, 0x48($v0) /* BEE78 80128778 4600B581 */ sub.s $f22, $f22, $f0 /* BEE7C 8012877C 4600130D */ trunc.w.s $f12, $f2 /* BEE80 80128780 E44C0000 */ swc1 $f12, ($v0) /* BEE84 80128784 44830000 */ mtc1 $v1, $f0 -/* BEE88 80128788 00000000 */ nop +/* BEE88 80128788 00000000 */ nop /* BEE8C 8012878C 46800020 */ cvt.s.w $f0, $f0 /* BEE90 80128790 4600A501 */ sub.s $f20, $f20, $f0 /* BEE94 80128794 4600230D */ trunc.w.s $f12, $f4 @@ -683,16 +688,16 @@ glabel func_80127D90 /* BEEC0 801287C0 E7AC0018 */ swc1 $f12, 0x18($sp) /* BEEC4 801287C4 4620330D */ trunc.w.d $f12, $f6 /* BEEC8 801287C8 44186000 */ mfc1 $t8, $f12 -/* BEECC 801287CC 00000000 */ nop +/* BEECC 801287CC 00000000 */ nop /* BEED0 801287D0 A7B8008E */ sh $t8, 0x8e($sp) /* BEED4 801287D4 4600C30D */ trunc.w.s $f12, $f24 /* BEED8 801287D8 44026000 */ mfc1 $v0, $f12 -/* BEEDC 801287DC 00000000 */ nop +/* BEEDC 801287DC 00000000 */ nop /* BEEE0 801287E0 00021400 */ sll $v0, $v0, 0x10 /* BEEE4 801287E4 00022C03 */ sra $a1, $v0, 0x10 /* BEEE8 801287E8 4600D30D */ trunc.w.s $f12, $f26 /* BEEEC 801287EC 44026000 */ mfc1 $v0, $f12 -/* BEEF0 801287F0 00000000 */ nop +/* BEEF0 801287F0 00000000 */ nop /* BEEF4 801287F4 00021400 */ sll $v0, $v0, 0x10 /* BEEF8 801287F8 00023403 */ sra $a2, $v0, 0x10 /* BEEFC 801287FC 00101400 */ sll $v0, $s0, 0x10 @@ -705,7 +710,7 @@ glabel func_80127D90 /* BEF14 80128814 3C028000 */ lui $v0, 0x8000 /* BEF18 80128818 4600030D */ trunc.w.s $f12, $f0 /* BEF1C 8012881C 44036000 */ mfc1 $v1, $f12 -/* BEF20 80128820 00000000 */ nop +/* BEF20 80128820 00000000 */ nop /* BEF24 80128824 00621825 */ or $v1, $v1, $v0 .L80128828: /* BEF28 80128828 03C0202D */ daddu $a0, $fp, $zero @@ -717,7 +722,7 @@ glabel func_80127D90 /* BEF40 80128840 93C20512 */ lbu $v0, 0x512($fp) /* BEF44 80128844 2C420005 */ sltiu $v0, $v0, 5 /* BEF48 80128848 14400037 */ bnez $v0, .L80128928 -/* BEF4C 8012884C 00000000 */ nop +/* BEF4C 8012884C 00000000 */ nop /* BEF50 80128850 8FC204FC */ lw $v0, 0x4fc($fp) /* BEF54 80128854 34420001 */ ori $v0, $v0, 1 /* BEF58 80128858 0804A24A */ j .L80128928 @@ -741,24 +746,24 @@ glabel func_80127D90 /* BEF9C 8012889C 00021403 */ sra $v0, $v0, 0x10 /* BEFA0 801288A0 00431021 */ addu $v0, $v0, $v1 /* BEFA4 801288A4 4482C000 */ mtc1 $v0, $f24 -/* BEFA8 801288A8 00000000 */ nop +/* BEFA8 801288A8 00000000 */ nop /* BEFAC 801288AC 4680C620 */ cvt.s.w $f24, $f24 /* BEFB0 801288B0 00191400 */ sll $v0, $t9, 0x10 /* BEFB4 801288B4 00021403 */ sra $v0, $v0, 0x10 /* BEFB8 801288B8 00451021 */ addu $v0, $v0, $a1 /* BEFBC 801288BC 4482D000 */ mtc1 $v0, $f26 -/* BEFC0 801288C0 00000000 */ nop +/* BEFC0 801288C0 00000000 */ nop /* BEFC4 801288C4 4680D6A0 */ cvt.s.w $f26, $f26 /* BEFC8 801288C8 E7AC0018 */ swc1 $f12, 0x18($sp) /* BEFCC 801288CC E7AC001C */ swc1 $f12, 0x1c($sp) /* BEFD0 801288D0 4600C30D */ trunc.w.s $f12, $f24 /* BEFD4 801288D4 44056000 */ mfc1 $a1, $f12 -/* BEFD8 801288D8 00000000 */ nop +/* BEFD8 801288D8 00000000 */ nop /* BEFDC 801288DC 00052C00 */ sll $a1, $a1, 0x10 /* BEFE0 801288E0 00052C03 */ sra $a1, $a1, 0x10 /* BEFE4 801288E4 4600D30D */ trunc.w.s $f12, $f26 /* BEFE8 801288E8 44066000 */ mfc1 $a2, $f12 -/* BEFEC 801288EC 00000000 */ nop +/* BEFEC 801288EC 00000000 */ nop /* BEFF0 801288F0 00063400 */ sll $a2, $a2, 0x10 /* BEFF4 801288F4 0C04B302 */ jal _draw_message_box /* BEFF8 801288F8 00063403 */ sra $a2, $a2, 0x10 @@ -766,11 +771,11 @@ glabel func_80127D90 /* BF000 80128900 2442FFEC */ addiu $v0, $v0, -0x14 /* BF004 80128904 2C420119 */ sltiu $v0, $v0, 0x119 /* BF008 80128908 10400007 */ beqz $v0, .L80128928 -/* BF00C 8012890C 00000000 */ nop +/* BF00C 8012890C 00000000 */ nop /* BF010 80128910 97C20510 */ lhu $v0, 0x510($fp) /* BF014 80128914 2C4200DD */ sltiu $v0, $v0, 0xdd /* BF018 80128918 10400003 */ beqz $v0, .L80128928 -/* BF01C 8012891C 00000000 */ nop +/* BF01C 8012891C 00000000 */ nop /* BF020 80128920 0C04B4F7 */ jal func_8012D3DC /* BF024 80128924 03C0202D */ daddu $a0, $fp, $zero .L80128928: @@ -795,6 +800,7 @@ glabel func_80127D90 /* BF070 80128970 2442FFF0 */ addiu $v0, $v0, -0x10 /* BF074 80128974 0804A6B3 */ j .L80129ACC /* BF078 80128978 AC82000C */ sw $v0, 0xc($a0) +glabel L8012897C_BF07C /* BF07C 8012897C 0000A82D */ daddu $s5, $zero, $zero /* BF080 80128980 97D20514 */ lhu $s2, 0x514($fp) /* BF084 80128984 97D30516 */ lhu $s3, 0x516($fp) @@ -824,44 +830,44 @@ glabel func_80127D90 /* BF0E0 801289E0 3C018015 */ lui $at, %hi(D_801507B8) /* BF0E4 801289E4 D42207B8 */ ldc1 $f2, %lo(D_801507B8)($at) /* BF0E8 801289E8 44820000 */ mtc1 $v0, $f0 -/* BF0EC 801289EC 00000000 */ nop +/* BF0EC 801289EC 00000000 */ nop /* BF0F0 801289F0 46800020 */ cvt.s.w $f0, $f0 /* BF0F4 801289F4 46000021 */ cvt.d.s $f0, $f0 /* BF0F8 801289F8 46220002 */ mul.d $f0, $f0, $f2 -/* BF0FC 801289FC 00000000 */ nop +/* BF0FC 801289FC 00000000 */ nop /* BF100 80128A00 3C018015 */ lui $at, %hi(D_801507C0) /* BF104 80128A04 D42207C0 */ ldc1 $f2, %lo(D_801507C0)($at) /* BF108 80128A08 46220000 */ add.d $f0, $f0, $f2 /* BF10C 80128A0C 44922000 */ mtc1 $s2, $f4 -/* BF110 80128A10 00000000 */ nop +/* BF110 80128A10 00000000 */ nop /* BF114 80128A14 46802120 */ cvt.s.w $f4, $f4 /* BF118 80128A18 462002A0 */ cvt.s.d $f10, $f0 /* BF11C 80128A1C 460A2102 */ mul.s $f4, $f4, $f10 -/* BF120 80128A20 00000000 */ nop +/* BF120 80128A20 00000000 */ nop /* BF124 80128A24 3C013FE0 */ lui $at, 0x3fe0 /* BF128 80128A28 44816800 */ mtc1 $at, $f13 /* BF12C 80128A2C 44806000 */ mtc1 $zero, $f12 /* BF130 80128A30 46002121 */ cvt.d.s $f4, $f4 /* BF134 80128A34 462C2002 */ mul.d $f0, $f4, $f12 -/* BF138 80128A38 00000000 */ nop +/* BF138 80128A38 00000000 */ nop /* BF13C 80128A3C 44933000 */ mtc1 $s3, $f6 -/* BF140 80128A40 00000000 */ nop +/* BF140 80128A40 00000000 */ nop /* BF144 80128A44 468031A0 */ cvt.s.w $f6, $f6 /* BF148 80128A48 460A3182 */ mul.s $f6, $f6, $f10 -/* BF14C 80128A4C 00000000 */ nop +/* BF14C 80128A4C 00000000 */ nop /* BF150 80128A50 87C3045A */ lh $v1, 0x45a($fp) /* BF154 80128A54 001217C2 */ srl $v0, $s2, 0x1f /* BF158 80128A58 02421021 */ addu $v0, $s2, $v0 /* BF15C 80128A5C 460031A1 */ cvt.d.s $f6, $f6 /* BF160 80128A60 462C3202 */ mul.d $f8, $f6, $f12 -/* BF164 80128A64 00000000 */ nop +/* BF164 80128A64 00000000 */ nop /* BF168 80128A68 00021043 */ sra $v0, $v0, 1 /* BF16C 80128A6C 00621821 */ addu $v1, $v1, $v0 /* BF170 80128A70 001317C2 */ srl $v0, $s3, 0x1f /* BF174 80128A74 02621021 */ addu $v0, $s3, $v0 /* BF178 80128A78 00021043 */ sra $v0, $v0, 1 /* BF17C 80128A7C 44831000 */ mtc1 $v1, $f2 -/* BF180 80128A80 00000000 */ nop +/* BF180 80128A80 00000000 */ nop /* BF184 80128A84 468010A0 */ cvt.s.w $f2, $f2 /* BF188 80128A88 87C3045C */ lh $v1, 0x45c($fp) /* BF18C 80128A8C 462C2100 */ add.d $f4, $f4, $f12 @@ -869,7 +875,7 @@ glabel func_80127D90 /* BF194 80128A94 00621821 */ addu $v1, $v1, $v0 /* BF198 80128A98 46201081 */ sub.d $f2, $f2, $f0 /* BF19C 80128A9C 44830000 */ mtc1 $v1, $f0 -/* BF1A0 80128AA0 00000000 */ nop +/* BF1A0 80128AA0 00000000 */ nop /* BF1A4 80128AA4 46800020 */ cvt.s.w $f0, $f0 /* BF1A8 80128AA8 46000021 */ cvt.d.s $f0, $f0 /* BF1AC 80128AAC 46280001 */ sub.d $f0, $f0, $f8 @@ -903,13 +909,13 @@ glabel func_80127D90 /* BF214 80128B14 D42207C8 */ ldc1 $f2, %lo(D_801507C8)($at) /* BF218 80128B18 46005021 */ cvt.d.s $f0, $f10 /* BF21C 80128B1C 46220002 */ mul.d $f0, $f0, $f2 -/* BF220 80128B20 00000000 */ nop +/* BF220 80128B20 00000000 */ nop /* BF224 80128B24 3C0141E0 */ lui $at, 0x41e0 /* BF228 80128B28 44811800 */ mtc1 $at, $f3 /* BF22C 80128B2C 44801000 */ mtc1 $zero, $f2 -/* BF230 80128B30 00000000 */ nop +/* BF230 80128B30 00000000 */ nop /* BF234 80128B34 4620103E */ c.le.d $f2, $f0 -/* BF238 80128B38 00000000 */ nop +/* BF238 80128B38 00000000 */ nop /* BF23C 80128B3C 45030005 */ bc1tl .L80128B54 /* BF240 80128B40 46220001 */ sub.d $f0, $f0, $f2 /* BF244 80128B44 4620030D */ trunc.w.d $f12, $f0 @@ -920,17 +926,17 @@ glabel func_80127D90 /* BF254 80128B54 3C028000 */ lui $v0, 0x8000 /* BF258 80128B58 4620030D */ trunc.w.d $f12, $f0 /* BF25C 80128B5C 44036000 */ mfc1 $v1, $f12 -/* BF260 80128B60 00000000 */ nop +/* BF260 80128B60 00000000 */ nop /* BF264 80128B64 00621825 */ or $v1, $v1, $v0 /* BF268 80128B68 306200FF */ andi $v0, $v1, 0xff .L80128B6C: /* BF26C 80128B6C 3C018015 */ lui $at, %hi(D_801507D0) /* BF270 80128B70 D42207D0 */ ldc1 $f2, %lo(D_801507D0)($at) /* BF274 80128B74 44820000 */ mtc1 $v0, $f0 -/* BF278 80128B78 00000000 */ nop +/* BF278 80128B78 00000000 */ nop /* BF27C 80128B7C 46800021 */ cvt.d.w $f0, $f0 /* BF280 80128B80 46220002 */ mul.d $f0, $f0, $f2 -/* BF284 80128B84 00000000 */ nop +/* BF284 80128B84 00000000 */ nop /* BF288 80128B88 4620030D */ trunc.w.d $f12, $f0 /* BF28C 80128B8C 44186000 */ mfc1 $t8, $f12 /* BF290 80128B90 0804A323 */ j .L80128C8C @@ -945,7 +951,7 @@ glabel func_80127D90 /* BF2B0 80128BB0 304200FF */ andi $v0, $v0, 0xff /* BF2B4 80128BB4 2C420005 */ sltiu $v0, $v0, 5 /* BF2B8 80128BB8 14400004 */ bnez $v0, .L80128BCC -/* BF2BC 80128BBC 00000000 */ nop +/* BF2BC 80128BBC 00000000 */ nop /* BF2C0 80128BC0 8FC204FC */ lw $v0, 0x4fc($fp) /* BF2C4 80128BC4 34420001 */ ori $v0, $v0, 1 /* BF2C8 80128BC8 AFC204FC */ sw $v0, 0x4fc($fp) @@ -961,14 +967,14 @@ glabel func_80127D90 /* BF2EC 80128BEC 0002A027 */ nor $s4, $zero, $v0 /* BF2F0 80128BF0 328200FF */ andi $v0, $s4, 0xff /* BF2F4 80128BF4 44820000 */ mtc1 $v0, $f0 -/* BF2F8 80128BF8 00000000 */ nop +/* BF2F8 80128BF8 00000000 */ nop /* BF2FC 80128BFC 46800021 */ cvt.d.w $f0, $f0 /* BF300 80128C00 46220002 */ mul.d $f0, $f0, $f2 -/* BF304 80128C04 00000000 */ nop +/* BF304 80128C04 00000000 */ nop /* BF308 80128C08 24150001 */ addiu $s5, $zero, 1 /* BF30C 80128C0C 4620030D */ trunc.w.d $f12, $f0 /* BF310 80128C10 44036000 */ mfc1 $v1, $f12 -/* BF314 80128C14 00000000 */ nop +/* BF314 80128C14 00000000 */ nop /* BF318 80128C18 00031400 */ sll $v0, $v1, 0x10 /* BF31C 80128C1C 00021403 */ sra $v0, $v0, 0x10 /* BF320 80128C20 28420020 */ slti $v0, $v0, 0x20 @@ -1041,6 +1047,7 @@ glabel func_80127D90 /* BF41C 80128D1C AC820020 */ sw $v0, 0x20($a0) /* BF420 80128D20 0804AFDC */ j .L8012BF70 /* BF424 80128D24 A4830034 */ sh $v1, 0x34($a0) +glabel L80128D28_BF428 /* BF428 80128D28 3C058015 */ lui $a1, %hi(D_80155D74) /* BF42C 80128D2C 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) /* BF430 80128D30 24020010 */ addiu $v0, $zero, 0x10 @@ -1174,6 +1181,7 @@ glabel func_80127D90 /* BF628 80128F28 8C620020 */ lw $v0, 0x20($v1) /* BF62C 80128F2C 0804AAD4 */ j .L8012AB50 /* BF630 80128F30 A7B000AE */ sh $s0, 0xae($sp) +glabel L80128F34_BF634 /* BF634 80128F34 24020012 */ addiu $v0, $zero, 0x12 /* BF638 80128F38 2404001C */ addiu $a0, $zero, 0x1c /* BF63C 80128F3C 3C038015 */ lui $v1, %hi(D_80155D74) @@ -1672,6 +1680,7 @@ glabel func_80127D90 /* BFDE0 801296E0 AC490184 */ sw $t1, 0x184($v0) /* BFDE4 801296E4 0804A6B3 */ j .L80129ACC /* BFDE8 801296E8 AC440170 */ sw $a0, 0x170($v0) +glabel L801296EC_BFDEC /* BFDEC 801296EC 0000902D */ daddu $s2, $zero, $zero /* BFDF0 801296F0 240400FF */ addiu $a0, $zero, 0xff /* BFDF4 801296F4 24050020 */ addiu $a1, $zero, 0x20 @@ -1830,6 +1839,7 @@ glabel func_80127D90 /* C004C 8012994C 8C620020 */ lw $v0, 0x20($v1) /* C0050 80129950 0804AAD4 */ j .L8012AB50 /* C0054 80129954 A7B300AE */ sh $s3, 0xae($sp) +glabel L80129958_C0058 /* C0058 80129958 3C038015 */ lui $v1, %hi(D_80155D74) /* C005C 8012995C 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) /* C0060 80129960 94640034 */ lhu $a0, 0x34($v1) @@ -1888,7 +1898,8 @@ glabel func_80127D90 /* C0130 80129A30 0C03D4B8 */ jal draw_box /* C0134 80129A34 AFA30018 */ sw $v1, 0x18($sp) /* C0138 80129A38 0804A6B3 */ j .L80129ACC -/* C013C 80129A3C 00000000 */ nop +/* C013C 80129A3C 00000000 */ nop +glabel L80129A40_C0140 /* C0140 80129A40 3C048015 */ lui $a0, %hi(D_80155D74) /* C0144 80129A44 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) /* C0148 80129A48 2402003C */ addiu $v0, $zero, 0x3c @@ -1926,9 +1937,10 @@ glabel func_80127D90 /* C01C8 80129AC8 A7C20484 */ sh $v0, 0x484($fp) .L80129ACC: /* C01CC 80129ACC 0C04B0B8 */ jal func_8012C2E0 -/* C01D0 80129AD0 00000000 */ nop +/* C01D0 80129AD0 00000000 */ nop /* C01D4 80129AD4 0804AAD1 */ j .L8012AB44 -/* C01D8 80129AD8 00000000 */ nop +/* C01D8 80129AD8 00000000 */ nop +glabel L80129ADC_C01DC /* C01DC 80129ADC 93C304F8 */ lbu $v1, 0x4f8($fp) /* C01E0 80129AE0 2402000C */ addiu $v0, $zero, 0xc /* C01E4 80129AE4 1462000A */ bne $v1, $v0, .L80129B10 @@ -1944,7 +1956,7 @@ glabel func_80127D90 /* C020C 80129B0C A7B80080 */ sh $t8, 0x80($sp) .L80129B10: /* C0210 80129B10 14620033 */ bne $v1, $v0, .L80129BE0 -/* C0214 80129B14 00000000 */ nop +/* C0214 80129B14 00000000 */ nop /* C0218 80129B18 93C50487 */ lbu $a1, 0x487($fp) /* C021C 80129B1C 00051040 */ sll $v0, $a1, 1 /* C0220 80129B20 03C21021 */ addu $v0, $fp, $v0 @@ -1973,7 +1985,7 @@ glabel func_80127D90 .L80129B78: /* C0278 80129B78 0083102B */ sltu $v0, $a0, $v1 /* C027C 80129B7C 14400018 */ bnez $v0, .L80129BE0 -/* C0280 80129B80 00000000 */ nop +/* C0280 80129B80 00000000 */ nop /* C0284 80129B84 93C3053C */ lbu $v1, 0x53c($fp) /* C0288 80129B88 2C620002 */ sltiu $v0, $v1, 2 /* C028C 80129B8C 14400014 */ bnez $v0, .L80129BE0 @@ -2006,9 +2018,11 @@ glabel func_80127D90 /* C02EC 80129BEC 24420001 */ addiu $v0, $v0, 1 /* C02F0 80129BF0 0804A9B1 */ j .L8012A6C4 /* C02F4 80129BF4 A0620050 */ sb $v0, 0x50($v1) +glabel L80129BF8_C02F8 /* C02F8 80129BF8 24180001 */ addiu $t8, $zero, 1 /* C02FC 80129BFC 0804AFDC */ j .L8012BF70 /* C0300 80129C00 A7B80080 */ sh $t8, 0x80($sp) +glabel L80129C04_C0304 /* C0304 80129C04 3C038015 */ lui $v1, %hi(D_80155D74) /* C0308 80129C08 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) /* C030C 80129C0C 8C620020 */ lw $v0, 0x20($v1) @@ -2020,11 +2034,12 @@ glabel func_80127D90 /* C0324 80129C24 2C62001F */ sltiu $v0, $v1, 0x1f /* C0328 80129C28 104008D1 */ beqz $v0, .L8012BF70 /* C032C 80129C2C 00031080 */ sll $v0, $v1, 2 -/* C0330 80129C30 3C018015 */ lui $at, %hi(D_801507E0) +/* C0330 80129C30 3C018015 */ lui $at, %hi(jtbl_801507E0_E6EE0) /* C0334 80129C34 00220821 */ addu $at, $at, $v0 -/* C0338 80129C38 8C2207E0 */ lw $v0, %lo(D_801507E0)($at) +/* C0338 80129C38 8C2207E0 */ lw $v0, %lo(jtbl_801507E0_E6EE0)($at) /* C033C 80129C3C 00400008 */ jr $v0 -/* C0340 80129C40 00000000 */ nop +/* C0340 80129C40 00000000 */ nop +glabel L80129C44_C0344 /* C0344 80129C44 3C048015 */ lui $a0, %hi(D_80155D74) /* C0348 80129C48 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) /* C034C 80129C4C 8C820020 */ lw $v0, 0x20($a0) @@ -2039,6 +2054,7 @@ glabel func_80127D90 /* C0370 80129C70 A4830034 */ sh $v1, 0x34($a0) /* C0374 80129C74 0804AFDC */ j .L8012BF70 /* C0378 80129C78 A485003C */ sh $a1, 0x3c($a0) +glabel L80129C7C_C037C /* C037C 80129C7C 3C048015 */ lui $a0, %hi(D_80155D74) /* C0380 80129C80 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) /* C0384 80129C84 8C830020 */ lw $v1, 0x20($a0) @@ -2050,6 +2066,7 @@ glabel func_80127D90 /* C039C 80129C9C AC820020 */ sw $v0, 0x20($a0) /* C03A0 80129CA0 0804AFDC */ j .L8012BF70 /* C03A4 80129CA4 A483003E */ sh $v1, 0x3e($a0) +glabel L80129CA8_C03A8 /* C03A8 80129CA8 3C048015 */ lui $a0, %hi(D_80155D74) /* C03AC 80129CAC 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) /* C03B0 80129CB0 8C820020 */ lw $v0, 0x20($a0) @@ -2064,6 +2081,7 @@ glabel func_80127D90 /* C03D4 80129CD4 AC830020 */ sw $v1, 0x20($a0) /* C03D8 80129CD8 0804AFDC */ j .L8012BF70 /* C03DC 80129CDC A485004A */ sh $a1, 0x4a($a0) +glabel L80129CE0_C03E0 /* C03E0 80129CE0 3C048015 */ lui $a0, %hi(D_80155D74) /* C03E4 80129CE4 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) /* C03E8 80129CE8 8C820020 */ lw $v0, 0x20($a0) @@ -2072,6 +2090,7 @@ glabel func_80127D90 /* C03F4 80129CF4 90420001 */ lbu $v0, 1($v0) /* C03F8 80129CF8 0804AAD1 */ j .L8012AB44 /* C03FC 80129CFC A0820040 */ sb $v0, 0x40($a0) +glabel L80129D00_C0400 /* C0400 80129D00 3C048015 */ lui $a0, %hi(D_80155D74) /* C0404 80129D04 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) /* C0408 80129D08 8C820020 */ lw $v0, 0x20($a0) @@ -2082,13 +2101,13 @@ glabel func_80127D90 /* C041C 80129D1C 44812000 */ mtc1 $at, $f4 /* C0420 80129D20 3043000F */ andi $v1, $v0, 0xf /* C0424 80129D24 44830000 */ mtc1 $v1, $f0 -/* C0428 80129D28 00000000 */ nop +/* C0428 80129D28 00000000 */ nop /* C042C 80129D2C 46800020 */ cvt.s.w $f0, $f0 /* C0430 80129D30 46040002 */ mul.s $f0, $f0, $f4 -/* C0434 80129D34 00000000 */ nop +/* C0434 80129D34 00000000 */ nop /* C0438 80129D38 00021102 */ srl $v0, $v0, 4 /* C043C 80129D3C 44821000 */ mtc1 $v0, $f2 -/* C0440 80129D40 00000000 */ nop +/* C0440 80129D40 00000000 */ nop /* C0444 80129D44 468010A0 */ cvt.s.w $f2, $f2 /* C0448 80129D48 8C820020 */ lw $v0, 0x20($a0) /* C044C 80129D4C 8C83004C */ lw $v1, 0x4c($a0) @@ -2099,15 +2118,15 @@ glabel func_80127D90 /* C0460 80129D60 00021902 */ srl $v1, $v0, 4 /* C0464 80129D64 3042000F */ andi $v0, $v0, 0xf /* C0468 80129D68 44820000 */ mtc1 $v0, $f0 -/* C046C 80129D6C 00000000 */ nop +/* C046C 80129D6C 00000000 */ nop /* C0470 80129D70 46800020 */ cvt.s.w $f0, $f0 /* C0474 80129D74 46040002 */ mul.s $f0, $f0, $f4 -/* C0478 80129D78 00000000 */ nop +/* C0478 80129D78 00000000 */ nop /* C047C 80129D7C 3C013FF0 */ lui $at, 0x3ff0 /* C0480 80129D80 44816800 */ mtc1 $at, $f13 /* C0484 80129D84 44806000 */ mtc1 $zero, $f12 /* C0488 80129D88 44831000 */ mtc1 $v1, $f2 -/* C048C 80129D8C 00000000 */ nop +/* C048C 80129D8C 00000000 */ nop /* C0490 80129D90 468010A0 */ cvt.s.w $f2, $f2 /* C0494 80129D94 8C820020 */ lw $v0, 0x20($a0) /* C0498 80129D98 C4840010 */ lwc1 $f4, 0x10($a0) @@ -2121,9 +2140,9 @@ glabel func_80127D90 /* C04B8 80129DB8 46001006 */ mov.s $f0, $f2 /* C04BC 80129DBC 46000021 */ cvt.d.s $f0, $f0 /* C04C0 80129DC0 4620603C */ c.lt.d $f12, $f0 -/* C04C4 80129DC4 00000000 */ nop +/* C04C4 80129DC4 00000000 */ nop /* C04C8 80129DC8 4500000A */ bc1f .L80129DF4 -/* C04CC 80129DCC 00000000 */ nop +/* C04CC 80129DCC 00000000 */ nop .L80129DD0: /* C04D0 80129DD0 3C02E300 */ lui $v0, 0xe300 /* C04D4 80129DD4 8EE30000 */ lw $v1, ($s7) @@ -2136,13 +2155,13 @@ glabel func_80127D90 /* C04F0 80129DF0 AC800004 */ sw $zero, 4($a0) .L80129DF4: /* C04F4 80129DF4 462C203C */ c.lt.d $f4, $f12 -/* C04F8 80129DF8 00000000 */ nop +/* C04F8 80129DF8 00000000 */ nop /* C04FC 80129DFC 45010005 */ bc1t .L80129E14 /* C0500 80129E00 3C04E300 */ lui $a0, 0xe300 /* C0504 80129E04 462C003C */ c.lt.d $f0, $f12 -/* C0508 80129E08 00000000 */ nop +/* C0508 80129E08 00000000 */ nop /* C050C 80129E0C 45000858 */ bc1f .L8012BF70 -/* C0510 80129E10 00000000 */ nop +/* C0510 80129E10 00000000 */ nop .L80129E14: /* C0514 80129E14 8EE20000 */ lw $v0, ($s7) /* C0518 80129E18 34841201 */ ori $a0, $a0, 0x1201 @@ -2153,6 +2172,7 @@ glabel func_80127D90 /* C052C 80129E2C AC640000 */ sw $a0, ($v1) /* C0530 80129E30 0804AFDC */ j .L8012BF70 /* C0534 80129E34 AC620004 */ sw $v0, 4($v1) +glabel L80129E38_C0538 /* C0538 80129E38 3C06E300 */ lui $a2, 0xe300 /* C053C 80129E3C 34C61201 */ ori $a2, $a2, 0x1201 /* C0540 80129E40 8EE20000 */ lw $v0, ($s7) @@ -2172,6 +2192,7 @@ glabel func_80127D90 /* C0578 80129E78 ACA60000 */ sw $a2, ($a1) /* C057C 80129E7C 0804AFDC */ j .L8012BF70 /* C0580 80129E80 ACA20004 */ sw $v0, 4($a1) +glabel L80129E84_C0584 /* C0584 80129E84 3C058015 */ lui $a1, %hi(D_80155D74) /* C0588 80129E88 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) /* C058C 80129E8C 8CA30020 */ lw $v1, 0x20($a1) @@ -2186,6 +2207,7 @@ glabel func_80127D90 /* C05B0 80129EB0 ACA20020 */ sw $v0, 0x20($a1) /* C05B4 80129EB4 0804AFDC */ j .L8012BF70 /* C05B8 80129EB8 A4A30042 */ sh $v1, 0x42($a1) +glabel L80129EBC_C05BC /* C05BC 80129EBC 3C048015 */ lui $a0, %hi(D_80155D74) /* C05C0 80129EC0 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) /* C05C4 80129EC4 8C830020 */ lw $v1, 0x20($a0) @@ -2195,6 +2217,7 @@ glabel func_80127D90 /* C05D4 80129ED4 90630001 */ lbu $v1, 1($v1) /* C05D8 80129ED8 0804A7DA */ j .L80129F68 /* C05DC 80129EDC 24420002 */ addiu $v0, $v0, 2 +glabel L80129EE0_C05E0 /* C05E0 80129EE0 3C048015 */ lui $a0, %hi(D_80155D74) /* C05E4 80129EE4 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) /* C05E8 80129EE8 8C820020 */ lw $v0, 0x20($a0) @@ -2208,6 +2231,7 @@ glabel func_80127D90 /* C0608 80129F08 AC820020 */ sw $v0, 0x20($a0) /* C060C 80129F0C 0804AFDC */ j .L8012BF70 /* C0610 80129F10 A4830042 */ sh $v1, 0x42($a0) +glabel L80129F14_C0614 /* C0614 80129F14 3C048015 */ lui $a0, %hi(D_80155D74) /* C0618 80129F18 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) /* C061C 80129F1C 8C820020 */ lw $v0, 0x20($a0) @@ -2219,6 +2243,7 @@ glabel func_80127D90 /* C0634 80129F34 24420002 */ addiu $v0, $v0, 2 /* C0638 80129F38 0804A7DA */ j .L80129F68 /* C063C 80129F3C 00651821 */ addu $v1, $v1, $a1 +glabel L80129F40_C0640 /* C0640 80129F40 3C048015 */ lui $a0, %hi(D_80155D74) /* C0644 80129F44 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) /* C0648 80129F48 8C820020 */ lw $v0, 0x20($a0) @@ -2233,6 +2258,7 @@ glabel func_80127D90 /* C0668 80129F68 AC820020 */ sw $v0, 0x20($a0) /* C066C 80129F6C 0804AFDC */ j .L8012BF70 /* C0670 80129F70 A4830044 */ sh $v1, 0x44($a0) +glabel L80129F74_C0674 /* C0674 80129F74 3C0B8015 */ lui $t3, %hi(D_80155D74) /* C0678 80129F78 8D6B5D74 */ lw $t3, %lo(D_80155D74)($t3) /* C067C 80129F7C 8D620020 */ lw $v0, 0x20($t3) @@ -2250,14 +2276,14 @@ glabel func_80127D90 /* C06AC 80129FAC 00021C03 */ sra $v1, $v0, 0x10 /* C06B0 80129FB0 286200FF */ slti $v0, $v1, 0xff /* C06B4 80129FB4 1040000A */ beqz $v0, .L80129FE0 -/* C06B8 80129FB8 00000000 */ nop +/* C06B8 80129FB8 00000000 */ nop /* C06BC 80129FBC 3C018015 */ lui $at, %hi(D_80150860) /* C06C0 80129FC0 D4220860 */ ldc1 $f2, %lo(D_80150860)($at) /* C06C4 80129FC4 44830000 */ mtc1 $v1, $f0 -/* C06C8 80129FC8 00000000 */ nop +/* C06C8 80129FC8 00000000 */ nop /* C06CC 80129FCC 46800021 */ cvt.d.w $f0, $f0 /* C06D0 80129FD0 46220002 */ mul.d $f0, $f0, $f2 -/* C06D4 80129FD4 00000000 */ nop +/* C06D4 80129FD4 00000000 */ nop /* C06D8 80129FD8 4620030D */ trunc.w.d $f12, $f0 /* C06DC 80129FDC 440D6000 */ mfc1 $t5, $f12 .L80129FE0: @@ -2319,19 +2345,20 @@ glabel func_80127D90 /* C07BC 8012A0BC A4820034 */ sh $v0, 0x34($a0) /* C07C0 8012A0C0 0804AFDC */ j .L8012BF70 /* C07C4 8012A0C4 AC830020 */ sw $v1, 0x20($a0) +glabel L8012A0C8_C07C8 /* C07C8 8012A0C8 97B0008E */ lhu $s0, 0x8e($sp) /* C07CC 8012A0CC 00101400 */ sll $v0, $s0, 0x10 /* C07D0 8012A0D0 00021C03 */ sra $v1, $v0, 0x10 /* C07D4 8012A0D4 286200FF */ slti $v0, $v1, 0xff /* C07D8 8012A0D8 1040000A */ beqz $v0, .L8012A104 -/* C07DC 8012A0DC 00000000 */ nop +/* C07DC 8012A0DC 00000000 */ nop /* C07E0 8012A0E0 3C018015 */ lui $at, %hi(D_80150868) /* C07E4 8012A0E4 D4220868 */ ldc1 $f2, %lo(D_80150868)($at) /* C07E8 8012A0E8 44830000 */ mtc1 $v1, $f0 -/* C07EC 8012A0EC 00000000 */ nop +/* C07EC 8012A0EC 00000000 */ nop /* C07F0 8012A0F0 46800021 */ cvt.d.w $f0, $f0 /* C07F4 8012A0F4 46220002 */ mul.d $f0, $f0, $f2 -/* C07F8 8012A0F8 00000000 */ nop +/* C07F8 8012A0F8 00000000 */ nop /* C07FC 8012A0FC 4620030D */ trunc.w.d $f12, $f0 /* C0800 8012A100 44106000 */ mfc1 $s0, $f12 .L8012A104: @@ -2348,7 +2375,7 @@ glabel func_80127D90 /* C082C 8012A12C 0C0B7A76 */ jal func_802DE9D8 /* C0830 8012A130 00A22825 */ or $a1, $a1, $v0 /* C0834 8012A134 104000FA */ beqz $v0, .L8012A520 -/* C0838 8012A138 00000000 */ nop +/* C0838 8012A138 00000000 */ nop /* C083C 8012A13C 3C058015 */ lui $a1, %hi(D_80155D74) /* C0840 8012A140 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) /* C0844 8012A144 97C6045A */ lhu $a2, 0x45a($fp) @@ -2405,23 +2432,24 @@ glabel func_80127D90 /* C0910 8012A210 34420010 */ ori $v0, $v0, 0x10 /* C0914 8012A214 0804A948 */ j .L8012A520 /* C0918 8012A218 A4620034 */ sh $v0, 0x34($v1) +glabel L8012A21C_C091C /* C091C 8012A21C 3C028015 */ lui $v0, %hi(D_8015131C) /* C0920 8012A220 8C42131C */ lw $v0, %lo(D_8015131C)($v0) /* C0924 8012A224 10400127 */ beqz $v0, .L8012A6C4 -/* C0928 8012A228 00000000 */ nop +/* C0928 8012A228 00000000 */ nop /* C092C 8012A22C 97AB008E */ lhu $t3, 0x8e($sp) /* C0930 8012A230 000B1400 */ sll $v0, $t3, 0x10 /* C0934 8012A234 00021C03 */ sra $v1, $v0, 0x10 /* C0938 8012A238 286200FF */ slti $v0, $v1, 0xff /* C093C 8012A23C 1040000A */ beqz $v0, .L8012A268 -/* C0940 8012A240 00000000 */ nop +/* C0940 8012A240 00000000 */ nop /* C0944 8012A244 3C018015 */ lui $at, %hi(D_80150870) /* C0948 8012A248 D4220870 */ ldc1 $f2, %lo(D_80150870)($at) /* C094C 8012A24C 44830000 */ mtc1 $v1, $f0 -/* C0950 8012A250 00000000 */ nop +/* C0950 8012A250 00000000 */ nop /* C0954 8012A254 46800021 */ cvt.d.w $f0, $f0 /* C0958 8012A258 46220002 */ mul.d $f0, $f0, $f2 -/* C095C 8012A25C 00000000 */ nop +/* C095C 8012A25C 00000000 */ nop /* C0960 8012A260 4620030D */ trunc.w.d $f12, $f0 /* C0964 8012A264 440B6000 */ mfc1 $t3, $f12 .L8012A268: @@ -2483,6 +2511,7 @@ glabel func_80127D90 /* C0A44 8012A344 34420010 */ ori $v0, $v0, 0x10 /* C0A48 8012A348 0804A9B1 */ j .L8012A6C4 /* C0A4C 8012A34C A4620034 */ sh $v0, 0x34($v1) +glabel L8012A350_C0A50 /* C0A50 8012A350 3C028015 */ lui $v0, %hi(D_80155D74) /* C0A54 8012A354 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C0A58 8012A358 8C430020 */ lw $v1, 0x20($v0) @@ -2494,7 +2523,7 @@ glabel func_80127D90 /* C0A70 8012A370 84830474 */ lh $v1, 0x474($a0) /* C0A74 8012A374 2402FFFF */ addiu $v0, $zero, -1 /* C0A78 8012A378 14620003 */ bne $v1, $v0, .L8012A388 -/* C0A7C 8012A37C 00000000 */ nop +/* C0A7C 8012A37C 00000000 */ nop /* C0A80 8012A380 90A20003 */ lbu $v0, 3($a1) /* C0A84 8012A384 A4820474 */ sh $v0, 0x474($a0) .L8012A388: @@ -2522,17 +2551,17 @@ glabel func_80127D90 /* C0AD0 8012A3D0 9062FFFF */ lbu $v0, -1($v1) /* C0AD4 8012A3D4 241900FF */ addiu $t9, $zero, 0xff /* C0AD8 8012A3D8 1459000D */ bne $v0, $t9, .L8012A410 -/* C0ADC 8012A3DC 00000000 */ nop +/* C0ADC 8012A3DC 00000000 */ nop /* C0AE0 8012A3E0 90620000 */ lbu $v0, ($v1) /* C0AE4 8012A3E4 144A000A */ bne $v0, $t2, .L8012A410 -/* C0AE8 8012A3E8 00000000 */ nop +/* C0AE8 8012A3E8 00000000 */ nop /* C0AEC 8012A3EC 90620001 */ lbu $v0, 1($v1) /* C0AF0 8012A3F0 14470007 */ bne $v0, $a3, .L8012A410 -/* C0AF4 8012A3F4 00000000 */ nop +/* C0AF4 8012A3F4 00000000 */ nop /* C0AF8 8012A3F8 90630002 */ lbu $v1, 2($v1) /* C0AFC 8012A3FC 90A20470 */ lbu $v0, 0x470($a1) /* C0B00 8012A400 1062002A */ beq $v1, $v0, .L8012A4AC -/* C0B04 8012A404 00000000 */ nop +/* C0B04 8012A404 00000000 */ nop /* C0B08 8012A408 0804A929 */ j .L8012A4A4 /* C0B0C 8012A40C 24840004 */ addiu $a0, $a0, 4 .L8012A410: @@ -2546,10 +2575,10 @@ glabel func_80127D90 /* C0B2C 8012A42C 24840001 */ addiu $a0, $a0, 1 /* C0B30 8012A430 90620001 */ lbu $v0, 1($v1) /* C0B34 8012A434 1449000D */ bne $v0, $t1, .L8012A46C -/* C0B38 8012A438 00000000 */ nop +/* C0B38 8012A438 00000000 */ nop /* C0B3C 8012A43C 90620002 */ lbu $v0, 2($v1) /* C0B40 8012A440 1447000A */ bne $v0, $a3, .L8012A46C -/* C0B44 8012A444 00000000 */ nop +/* C0B44 8012A444 00000000 */ nop /* C0B48 8012A448 84C20474 */ lh $v0, 0x474($a2) /* C0B4C 8012A44C 14400017 */ bnez $v0, .L8012A4AC /* C0B50 8012A450 24840001 */ addiu $a0, $a0, 1 @@ -2558,7 +2587,7 @@ glabel func_80127D90 /* C0B5C 8012A45C 3C028015 */ lui $v0, %hi(D_80155D74) /* C0B60 8012A460 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C0B64 8012A464 0804A8EF */ j .L8012A3BC -/* C0B68 8012A468 00000000 */ nop +/* C0B68 8012A468 00000000 */ nop .L8012A46C: /* C0B6C 8012A46C 3C028015 */ lui $v0, %hi(D_80155D74) /* C0B70 8012A470 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) @@ -2592,18 +2621,18 @@ glabel func_80127D90 /* C0BD8 8012A4D8 10620008 */ beq $v1, $v0, .L8012A4FC /* C0BDC 8012A4DC 00071040 */ sll $v0, $a3, 1 /* C0BE0 8012A4E0 0804AFDC */ j .L8012BF70 -/* C0BE4 8012A4E4 00000000 */ nop +/* C0BE4 8012A4E4 00000000 */ nop .L8012A4E8: /* C0BE8 8012A4E8 24020013 */ addiu $v0, $zero, 0x13 /* C0BEC 8012A4EC 10620015 */ beq $v1, $v0, .L8012A544 /* C0BF0 8012A4F0 24820002 */ addiu $v0, $a0, 2 /* C0BF4 8012A4F4 0804AFDC */ j .L8012BF70 -/* C0BF8 8012A4F8 00000000 */ nop +/* C0BF8 8012A4F8 00000000 */ nop .L8012A4FC: /* C0BFC 8012A4FC 03C21821 */ addu $v1, $fp, $v0 /* C0C00 8012A500 84620474 */ lh $v0, 0x474($v1) /* C0C04 8012A504 14400006 */ bnez $v0, .L8012A520 -/* C0C08 8012A508 00000000 */ nop +/* C0C08 8012A508 00000000 */ nop /* C0C0C 8012A50C 90C20003 */ lbu $v0, 3($a2) /* C0C10 8012A510 10400002 */ beqz $v0, .L8012A51C /* C0C14 8012A514 2402FFFE */ addiu $v0, $zero, -2 @@ -2624,12 +2653,14 @@ glabel func_80127D90 .L8012A544: /* C0C44 8012A544 0804AFDC */ j .L8012BF70 /* C0C48 8012A548 ACA20020 */ sw $v0, 0x20($a1) +glabel L8012A54C_C0C4C /* C0C4C 8012A54C 3C038015 */ lui $v1, %hi(D_80155D74) /* C0C50 8012A550 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) /* C0C54 8012A554 8C620020 */ lw $v0, 0x20($v1) /* C0C58 8012A558 24420003 */ addiu $v0, $v0, 3 /* C0C5C 8012A55C 0804AFDC */ j .L8012BF70 /* C0C60 8012A560 AC620020 */ sw $v0, 0x20($v1) +glabel L8012A564_C0C64 /* C0C64 8012A564 3C058015 */ lui $a1, %hi(D_80155D74) /* C0C68 8012A568 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) /* C0C6C 8012A56C 97B80076 */ lhu $t8, 0x76($sp) @@ -2661,6 +2692,7 @@ glabel func_80127D90 /* C0CD4 8012A5D4 8CA20020 */ lw $v0, 0x20($a1) /* C0CD8 8012A5D8 0804A9E9 */ j .L8012A7A4 /* C0CDC 8012A5DC 24420002 */ addiu $v0, $v0, 2 +glabel L8012A5E0_C0CE0 /* C0CE0 8012A5E0 3C048015 */ lui $a0, %hi(D_80155D74) /* C0CE4 8012A5E4 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) /* C0CE8 8012A5E8 8C820020 */ lw $v0, 0x20($a0) @@ -2683,6 +2715,7 @@ glabel func_80127D90 /* C0D28 8012A628 A4430034 */ sh $v1, 0x34($v0) /* C0D2C 8012A62C 0804AAD1 */ j .L8012AB44 /* C0D30 8012A630 A4440042 */ sh $a0, 0x42($v0) +glabel L8012A634_C0D34 /* C0D34 8012A634 3C048015 */ lui $a0, %hi(D_80155D74) /* C0D38 8012A638 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) /* C0D3C 8012A63C 8C820020 */ lw $v0, 0x20($a0) @@ -2691,10 +2724,12 @@ glabel func_80127D90 /* C0D48 8012A648 90420001 */ lbu $v0, 1($v0) /* C0D4C 8012A64C 0804AAD1 */ j .L8012AB44 /* C0D50 8012A650 A082002B */ sb $v0, 0x2b($a0) +glabel L8012A654_C0D54 /* C0D54 8012A654 0C04B0B8 */ jal func_8012C2E0 -/* C0D58 8012A658 00000000 */ nop +/* C0D58 8012A658 00000000 */ nop /* C0D5C 8012A65C 0804A9B1 */ j .L8012A6C4 -/* C0D60 8012A660 00000000 */ nop +/* C0D60 8012A660 00000000 */ nop +glabel L8012A664_C0D64 /* C0D64 8012A664 3C028015 */ lui $v0, %hi(D_80155D74) /* C0D68 8012A668 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C0D6C 8012A66C 94440042 */ lhu $a0, 0x42($v0) @@ -2705,6 +2740,7 @@ glabel func_80127D90 /* C0D80 8012A680 A4450026 */ sh $a1, 0x26($v0) /* C0D84 8012A684 0804AFDC */ j .L8012BF70 /* C0D88 8012A688 AC430020 */ sw $v1, 0x20($v0) +glabel L8012A68C_C0D8C /* C0D8C 8012A68C 3C028015 */ lui $v0, %hi(D_80155D74) /* C0D90 8012A690 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C0D94 8012A694 94440024 */ lhu $a0, 0x24($v0) @@ -2715,17 +2751,20 @@ glabel func_80127D90 /* C0DA8 8012A6A8 A4450044 */ sh $a1, 0x44($v0) /* C0DAC 8012A6AC 0804AFDC */ j .L8012BF70 /* C0DB0 8012A6B0 AC430020 */ sw $v1, 0x20($v0) +glabel L8012A6B4_C0DB4 /* C0DB4 8012A6B4 3C038015 */ lui $v1, %hi(D_80155D74) /* C0DB8 8012A6B8 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) /* C0DBC 8012A6BC 9062004B */ lbu $v0, 0x4b($v1) /* C0DC0 8012A6C0 A0620028 */ sb $v0, 0x28($v1) .L8012A6C4: +glabel L8012A6C4_C0DC4 /* C0DC4 8012A6C4 3C038015 */ lui $v1, %hi(D_80155D74) /* C0DC8 8012A6C8 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) /* C0DCC 8012A6CC 8C620020 */ lw $v0, 0x20($v1) /* C0DD0 8012A6D0 24420001 */ addiu $v0, $v0, 1 /* C0DD4 8012A6D4 0804AFDC */ j .L8012BF70 /* C0DD8 8012A6D8 AC620020 */ sw $v0, 0x20($v1) +glabel L8012A6DC_C0DDC /* C0DDC 8012A6DC 3C028015 */ lui $v0, %hi(D_80155D74) /* C0DE0 8012A6E0 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C0DE4 8012A6E4 8C430020 */ lw $v1, 0x20($v0) @@ -2734,6 +2773,7 @@ glabel func_80127D90 /* C0DF0 8012A6F0 A444004A */ sh $a0, 0x4a($v0) /* C0DF4 8012A6F4 0804AFDC */ j .L8012BF70 /* C0DF8 8012A6F8 AC430020 */ sw $v1, 0x20($v0) +glabel L8012A6FC_C0DFC /* C0DFC 8012A6FC 3C038015 */ lui $v1, %hi(D_80155D74) /* C0E00 8012A700 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) /* C0E04 8012A704 8C620020 */ lw $v0, 0x20($v1) @@ -2743,23 +2783,26 @@ glabel func_80127D90 /* C0E14 8012A714 2C62000F */ sltiu $v0, $v1, 0xf /* C0E18 8012A718 10400615 */ beqz $v0, .L8012BF70 /* C0E1C 8012A71C 00031080 */ sll $v0, $v1, 2 -/* C0E20 8012A720 3C018015 */ lui $at, %hi(D_80150878) +/* C0E20 8012A720 3C018015 */ lui $at, %hi(jtbl_80150878_E6F78) /* C0E24 8012A724 00220821 */ addu $at, $at, $v0 -/* C0E28 8012A728 8C220878 */ lw $v0, %lo(D_80150878)($at) +/* C0E28 8012A728 8C220878 */ lw $v0, %lo(jtbl_80150878_E6F78)($at) /* C0E2C 8012A72C 00400008 */ jr $v0 -/* C0E30 8012A730 00000000 */ nop +/* C0E30 8012A730 00000000 */ nop +glabel L8012A734_C0E34 /* C0E34 8012A734 3C028015 */ lui $v0, %hi(D_80155D74) /* C0E38 8012A738 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C0E3C 8012A73C 8C430038 */ lw $v1, 0x38($v0) /* C0E40 8012A740 8C440020 */ lw $a0, 0x20($v0) /* C0E44 8012A744 0804AA54 */ j .L8012A950 /* C0E48 8012A748 34630001 */ ori $v1, $v1, 1 +glabel L8012A74C_C0E4C /* C0E4C 8012A74C 3C028015 */ lui $v0, %hi(D_80155D74) /* C0E50 8012A750 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C0E54 8012A754 8C430038 */ lw $v1, 0x38($v0) /* C0E58 8012A758 8C440020 */ lw $a0, 0x20($v0) /* C0E5C 8012A75C 0804AA54 */ j .L8012A950 /* C0E60 8012A760 34630002 */ ori $v1, $v1, 2 +glabel L8012A764_C0E64 /* C0E64 8012A764 3C06FC70 */ lui $a2, 0xfc70 /* C0E68 8012A768 34C6FEE1 */ ori $a2, $a2, 0xfee1 /* C0E6C 8012A76C 3C058015 */ lui $a1, %hi(D_80155D74) @@ -2779,6 +2822,7 @@ glabel func_80127D90 .L8012A7A4: /* C0EA4 8012A7A4 0804AFDC */ j .L8012BF70 /* C0EA8 8012A7A8 ACA20020 */ sw $v0, 0x20($a1) +glabel L8012A7AC_C0EAC /* C0EAC 8012A7AC 3C09FC72 */ lui $t1, 0xfc72 /* C0EB0 8012A7B0 3529FEE5 */ ori $t1, $t1, 0xfee5 /* C0EB4 8012A7B4 3C0811FC */ lui $t0, 0x11fc @@ -2813,6 +2857,7 @@ glabel func_80127D90 /* C0F28 8012A828 24420003 */ addiu $v0, $v0, 3 /* C0F2C 8012A82C 0804AFDC */ j .L8012BF70 /* C0F30 8012A830 ACC20020 */ sw $v0, 0x20($a2) +glabel L8012A834_C0F34 /* C0F34 8012A834 3C058015 */ lui $a1, %hi(D_80155D74) /* C0F38 8012A838 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) /* C0F3C 8012A83C 8CA20038 */ lw $v0, 0x38($a1) @@ -2825,12 +2870,14 @@ glabel func_80127D90 /* C0F58 8012A858 24840003 */ addiu $a0, $a0, 3 /* C0F5C 8012A85C 0804AFDB */ j .L8012BF6C /* C0F60 8012A860 A3A300B8 */ sb $v1, 0xb8($sp) +glabel L8012A864_C0F64 /* C0F64 8012A864 3C028015 */ lui $v0, %hi(D_80155D74) /* C0F68 8012A868 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C0F6C 8012A86C 8C430038 */ lw $v1, 0x38($v0) /* C0F70 8012A870 8C440020 */ lw $a0, 0x20($v0) /* C0F74 8012A874 0804AA54 */ j .L8012A950 /* C0F78 8012A878 34630040 */ ori $v1, $v1, 0x40 +glabel L8012A87C_C0F7C /* C0F7C 8012A87C 3C058015 */ lui $a1, %hi(D_80155D74) /* C0F80 8012A880 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) /* C0F84 8012A884 8CA20038 */ lw $v0, 0x38($a1) @@ -2843,42 +2890,49 @@ glabel func_80127D90 /* C0FA0 8012A8A0 24840003 */ addiu $a0, $a0, 3 /* C0FA4 8012A8A4 0804AFDB */ j .L8012BF6C /* C0FA8 8012A8A8 A7A300B6 */ sh $v1, 0xb6($sp) +glabel L8012A8AC_C0FAC /* C0FAC 8012A8AC 3C028015 */ lui $v0, %hi(D_80155D74) /* C0FB0 8012A8B0 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C0FB4 8012A8B4 8C430038 */ lw $v1, 0x38($v0) /* C0FB8 8012A8B8 8C440020 */ lw $a0, 0x20($v0) /* C0FBC 8012A8BC 0804AA54 */ j .L8012A950 /* C0FC0 8012A8C0 34630200 */ ori $v1, $v1, 0x200 +glabel L8012A8C4_C0FC4 /* C0FC4 8012A8C4 3C028015 */ lui $v0, %hi(D_80155D74) /* C0FC8 8012A8C8 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C0FCC 8012A8CC 8C430038 */ lw $v1, 0x38($v0) /* C0FD0 8012A8D0 8C440020 */ lw $a0, 0x20($v0) /* C0FD4 8012A8D4 0804AA54 */ j .L8012A950 /* C0FD8 8012A8D8 34630400 */ ori $v1, $v1, 0x400 +glabel L8012A8DC_C0FDC /* C0FDC 8012A8DC 3C028015 */ lui $v0, %hi(D_80155D74) /* C0FE0 8012A8E0 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C0FE4 8012A8E4 8C430038 */ lw $v1, 0x38($v0) /* C0FE8 8012A8E8 8C440020 */ lw $a0, 0x20($v0) /* C0FEC 8012A8EC 0804AA54 */ j .L8012A950 /* C0FF0 8012A8F0 34630800 */ ori $v1, $v1, 0x800 +glabel L8012A8F4_C0FF4 /* C0FF4 8012A8F4 3C028015 */ lui $v0, %hi(D_80155D74) /* C0FF8 8012A8F8 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C0FFC 8012A8FC 8C430038 */ lw $v1, 0x38($v0) /* C1000 8012A900 8C440020 */ lw $a0, 0x20($v0) /* C1004 8012A904 0804AA54 */ j .L8012A950 /* C1008 8012A908 34631000 */ ori $v1, $v1, 0x1000 +glabel L8012A90C_C100C /* C100C 8012A90C 3C028015 */ lui $v0, %hi(D_80155D74) /* C1010 8012A910 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C1014 8012A914 8C430038 */ lw $v1, 0x38($v0) /* C1018 8012A918 8C440020 */ lw $a0, 0x20($v0) /* C101C 8012A91C 0804AA54 */ j .L8012A950 /* C1020 8012A920 34632000 */ ori $v1, $v1, 0x2000 +glabel L8012A924_C1024 /* C1024 8012A924 3C028015 */ lui $v0, %hi(D_80155D74) /* C1028 8012A928 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C102C 8012A92C 8C430038 */ lw $v1, 0x38($v0) /* C1030 8012A930 8C440020 */ lw $a0, 0x20($v0) /* C1034 8012A934 0804AA54 */ j .L8012A950 /* C1038 8012A938 34634000 */ ori $v1, $v1, 0x4000 +glabel L8012A93C_C103C /* C103C 8012A93C 3C028015 */ lui $v0, %hi(D_80155D74) /* C1040 8012A940 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C1044 8012A944 8C430038 */ lw $v1, 0x38($v0) @@ -2889,6 +2943,7 @@ glabel func_80127D90 /* C1054 8012A954 AC430038 */ sw $v1, 0x38($v0) /* C1058 8012A958 0804AFDC */ j .L8012BF70 /* C105C 8012A95C AC440020 */ sw $a0, 0x20($v0) +glabel L8012A960_C1060 /* C1060 8012A960 3C038015 */ lui $v1, %hi(D_80155D74) /* C1064 8012A964 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) /* C1068 8012A968 8C620020 */ lw $v0, 0x20($v1) @@ -2898,51 +2953,60 @@ glabel func_80127D90 /* C1078 8012A978 2C62000F */ sltiu $v0, $v1, 0xf /* C107C 8012A97C 10400071 */ beqz $v0, .L8012AB44 /* C1080 8012A980 00031080 */ sll $v0, $v1, 2 -/* C1084 8012A984 3C018015 */ lui $at, %hi(D_801508B8) +/* C1084 8012A984 3C018015 */ lui $at, %hi(jtbl_801508B8_E6FB8) /* C1088 8012A988 00220821 */ addu $at, $at, $v0 -/* C108C 8012A98C 8C2208B8 */ lw $v0, %lo(D_801508B8)($at) +/* C108C 8012A98C 8C2208B8 */ lw $v0, %lo(jtbl_801508B8_E6FB8)($at) /* C1090 8012A990 00400008 */ jr $v0 -/* C1094 8012A994 00000000 */ nop +/* C1094 8012A994 00000000 */ nop +glabel L8012A998_C1098 /* C1098 8012A998 3C028015 */ lui $v0, %hi(D_80155D74) /* C109C 8012A99C 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C10A0 8012A9A0 8C430038 */ lw $v1, 0x38($v0) /* C10A4 8012A9A4 0804AAAB */ j .L8012AAAC /* C10A8 8012A9A8 2404FFFE */ addiu $a0, $zero, -2 +glabel L8012A9AC_C10AC /* C10AC 8012A9AC 3C028015 */ lui $v0, %hi(D_80155D74) /* C10B0 8012A9B0 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C10B4 8012A9B4 8C430038 */ lw $v1, 0x38($v0) /* C10B8 8012A9B8 0804AAAB */ j .L8012AAAC /* C10BC 8012A9BC 2404FFFD */ addiu $a0, $zero, -3 +glabel L8012A9C0_C10C0 /* C10C0 8012A9C0 3C028015 */ lui $v0, %hi(D_80155D74) /* C10C4 8012A9C4 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C10C8 8012A9C8 8C430038 */ lw $v1, 0x38($v0) /* C10CC 8012A9CC 0804AAAB */ j .L8012AAAC /* C10D0 8012A9D0 2404FFFB */ addiu $a0, $zero, -5 +glabel L8012A9D4_C10D4 /* C10D4 8012A9D4 3C048015 */ lui $a0, %hi(D_80155D74) /* C10D8 8012A9D8 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) /* C10DC 8012A9DC 3C03FFFE */ lui $v1, 0xfffe /* C10E0 8012A9E0 8C820038 */ lw $v0, 0x38($a0) /* C10E4 8012A9E4 0804AAB3 */ j .L8012AACC /* C10E8 8012A9E8 3463FFFF */ ori $v1, $v1, 0xffff +glabel L8012A9EC_C10EC /* C10EC 8012A9EC 3C028015 */ lui $v0, %hi(D_80155D74) /* C10F0 8012A9F0 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C10F4 8012A9F4 8C430038 */ lw $v1, 0x38($v0) /* C10F8 8012A9F8 0804AAAB */ j .L8012AAAC /* C10FC 8012A9FC 2404FFDF */ addiu $a0, $zero, -0x21 +glabel L8012AA00_C1100 /* C1100 8012AA00 3C048015 */ lui $a0, %hi(D_80155D74) /* C1104 8012AA04 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) /* C1108 8012AA08 0804AA91 */ j .L8012AA44 /* C110C 8012AA0C 2405FFBF */ addiu $a1, $zero, -0x41 +glabel L8012AA10_C1110 /* C1110 8012AA10 3C028015 */ lui $v0, %hi(D_80155D74) /* C1114 8012AA14 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C1118 8012AA18 8C430038 */ lw $v1, 0x38($v0) /* C111C 8012AA1C 0804AAAB */ j .L8012AAAC /* C1120 8012AA20 2404FF7F */ addiu $a0, $zero, -0x81 +glabel L8012AA24_C1124 /* C1124 8012AA24 3C028015 */ lui $v0, %hi(D_80155D74) /* C1128 8012AA28 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C112C 8012AA2C 8C430038 */ lw $v1, 0x38($v0) /* C1130 8012AA30 0804AAAB */ j .L8012AAAC /* C1134 8012AA34 2404FDFF */ addiu $a0, $zero, -0x201 +glabel L8012AA38_C1138 /* C1138 8012AA38 3C048015 */ lui $a0, %hi(D_80155D74) /* C113C 8012AA3C 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) /* C1140 8012AA40 2405FBFF */ addiu $a1, $zero, -0x401 @@ -2954,21 +3018,25 @@ glabel func_80127D90 /* C1154 8012AA54 AC820038 */ sw $v0, 0x38($a0) /* C1158 8012AA58 0804AAD1 */ j .L8012AB44 /* C115C 8012AA5C A4830034 */ sh $v1, 0x34($a0) +glabel L8012AA60_C1160 /* C1160 8012AA60 3C028015 */ lui $v0, %hi(D_80155D74) /* C1164 8012AA64 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C1168 8012AA68 8C430038 */ lw $v1, 0x38($v0) /* C116C 8012AA6C 0804AAAB */ j .L8012AAAC /* C1170 8012AA70 2404F7FF */ addiu $a0, $zero, -0x801 +glabel L8012AA74_C1174 /* C1174 8012AA74 3C028015 */ lui $v0, %hi(D_80155D74) /* C1178 8012AA78 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C117C 8012AA7C 8C430038 */ lw $v1, 0x38($v0) /* C1180 8012AA80 0804AAAB */ j .L8012AAAC /* C1184 8012AA84 2404EFFF */ addiu $a0, $zero, -0x1001 +glabel L8012AA88_C1188 /* C1188 8012AA88 3C028015 */ lui $v0, %hi(D_80155D74) /* C118C 8012AA8C 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C1190 8012AA90 8C430038 */ lw $v1, 0x38($v0) /* C1194 8012AA94 0804AAAB */ j .L8012AAAC /* C1198 8012AA98 2404DFFF */ addiu $a0, $zero, -0x2001 +glabel L8012AA9C_C119C /* C119C 8012AA9C 3C028015 */ lui $v0, %hi(D_80155D74) /* C11A0 8012AAA0 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C11A4 8012AAA4 8C430038 */ lw $v1, 0x38($v0) @@ -2977,6 +3045,7 @@ glabel func_80127D90 /* C11AC 8012AAAC 00641824 */ and $v1, $v1, $a0 /* C11B0 8012AAB0 0804AAD1 */ j .L8012AB44 /* C11B4 8012AAB4 AC430038 */ sw $v1, 0x38($v0) +glabel L8012AAB8_C11B8 /* C11B8 8012AAB8 3C048015 */ lui $a0, %hi(D_80155D74) /* C11BC 8012AABC 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) /* C11C0 8012AAC0 3C03FFFF */ lui $v1, 0xffff @@ -2986,6 +3055,7 @@ glabel func_80127D90 /* C11CC 8012AACC 00431024 */ and $v0, $v0, $v1 /* C11D0 8012AAD0 0804AAD1 */ j .L8012AB44 /* C11D4 8012AAD4 AC820038 */ sw $v0, 0x38($a0) +glabel L8012AAD8_C11D8 /* C11D8 8012AAD8 3C048015 */ lui $a0, %hi(D_80155D74) /* C11DC 8012AADC 8C845D74 */ lw $a0, %lo(D_80155D74)($a0) /* C11E0 8012AAE0 8C820020 */ lw $v0, 0x20($a0) @@ -2999,7 +3069,7 @@ glabel func_80127D90 /* C1200 8012AB00 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) /* C1204 8012AB04 9062002E */ lbu $v0, 0x2e($v1) /* C1208 8012AB08 14590006 */ bne $v0, $t9, .L8012AB24 -/* C120C 8012AB0C 00000000 */ nop +/* C120C 8012AB0C 00000000 */ nop /* C1210 8012AB10 97C20514 */ lhu $v0, 0x514($fp) /* C1214 8012AB14 00021042 */ srl $v0, $v0, 1 /* C1218 8012AB18 A062002E */ sb $v0, 0x2e($v1) @@ -3017,6 +3087,7 @@ glabel func_80127D90 .L8012AB40: /* C1240 8012AB40 A4820034 */ sh $v0, 0x34($a0) .L8012AB44: +glabel L8012AB44_C1244 /* C1244 8012AB44 3C038015 */ lui $v1, %hi(D_80155D74) /* C1248 8012AB48 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) /* C124C 8012AB4C 8C620020 */ lw $v0, 0x20($v1) @@ -3025,6 +3096,7 @@ glabel func_80127D90 /* C1254 8012AB54 0804AFDC */ j .L8012BF70 /* C1258 8012AB58 AC620020 */ sw $v0, 0x20($v1) .L8012AB5C: +glabel L8012AB5C_C125C /* C125C 8012AB5C 3C028015 */ lui $v0, %hi(D_80155D74) /* C1260 8012AB60 8C425D74 */ lw $v0, %lo(D_80155D74)($v0) /* C1264 8012AB64 94420034 */ lhu $v0, 0x34($v0) @@ -3072,7 +3144,7 @@ glabel func_80127D90 /* C1304 8012AC04 94820034 */ lhu $v0, 0x34($a0) /* C1308 8012AC08 30420040 */ andi $v0, $v0, 0x40 /* C130C 8012AC0C 10400007 */ beqz $v0, .L8012AC2C -/* C1310 8012AC10 00000000 */ nop +/* C1310 8012AC10 00000000 */ nop /* C1314 8012AC14 97C2045A */ lhu $v0, 0x45a($fp) /* C1318 8012AC18 97B80066 */ lhu $t8, 0x66($sp) /* C131C 8012AC1C 94830042 */ lhu $v1, 0x42($a0) @@ -3129,46 +3201,46 @@ glabel func_80127D90 /* C13E0 8012ACE0 00032C03 */ sra $a1, $v1, 0x10 /* C13E4 8012ACE4 00A2102A */ slt $v0, $a1, $v0 /* C13E8 8012ACE8 10400480 */ beqz $v0, .L8012BEEC -/* C13EC 8012ACEC 00000000 */ nop +/* C13EC 8012ACEC 00000000 */ nop /* C13F0 8012ACF0 90E20008 */ lbu $v0, 8($a3) /* C13F4 8012ACF4 C4C00010 */ lwc1 $f0, 0x10($a2) /* C13F8 8012ACF8 44821000 */ mtc1 $v0, $f2 -/* C13FC 8012ACFC 00000000 */ nop +/* C13FC 8012ACFC 00000000 */ nop /* C1400 8012AD00 468010A0 */ cvt.s.w $f2, $f2 /* C1404 8012AD04 46020002 */ mul.s $f0, $f0, $f2 -/* C1408 8012AD08 00000000 */ nop +/* C1408 8012AD08 00000000 */ nop /* C140C 8012AD0C 8CC30000 */ lw $v1, ($a2) /* C1410 8012AD10 4600030D */ trunc.w.s $f12, $f0 /* C1414 8012AD14 44026000 */ mfc1 $v0, $f12 -/* C1418 8012AD18 00000000 */ nop +/* C1418 8012AD18 00000000 */ nop /* C141C 8012AD1C 00821021 */ addu $v0, $a0, $v0 /* C1420 8012AD20 0062182A */ slt $v1, $v1, $v0 /* C1424 8012AD24 10600471 */ beqz $v1, .L8012BEEC -/* C1428 8012AD28 00000000 */ nop +/* C1428 8012AD28 00000000 */ nop /* C142C 8012AD2C 91020003 */ lbu $v0, 3($t0) /* C1430 8012AD30 C4C20014 */ lwc1 $f2, 0x14($a2) /* C1434 8012AD34 44820000 */ mtc1 $v0, $f0 -/* C1438 8012AD38 00000000 */ nop +/* C1438 8012AD38 00000000 */ nop /* C143C 8012AD3C 46800020 */ cvt.s.w $f0, $f0 /* C1440 8012AD40 93C20508 */ lbu $v0, 0x508($fp) /* C1444 8012AD44 46001082 */ mul.s $f2, $f2, $f0 -/* C1448 8012AD48 00000000 */ nop +/* C1448 8012AD48 00000000 */ nop /* C144C 8012AD4C 00021040 */ sll $v0, $v0, 1 /* C1450 8012AD50 3C01802F */ lui $at, %hi(D_802EB644) /* C1454 8012AD54 00220821 */ addu $at, $at, $v0 /* C1458 8012AD58 8422B644 */ lh $v0, %lo(D_802EB644)($at) /* C145C 8012AD5C 44820000 */ mtc1 $v0, $f0 -/* C1460 8012AD60 00000000 */ nop +/* C1460 8012AD60 00000000 */ nop /* C1464 8012AD64 46800020 */ cvt.s.w $f0, $f0 /* C1468 8012AD68 46001080 */ add.s $f2, $f2, $f0 /* C146C 8012AD6C 8CC30008 */ lw $v1, 8($a2) /* C1470 8012AD70 4600130D */ trunc.w.s $f12, $f2 /* C1474 8012AD74 44026000 */ mfc1 $v0, $f12 -/* C1478 8012AD78 00000000 */ nop +/* C1478 8012AD78 00000000 */ nop /* C147C 8012AD7C 00A21021 */ addu $v0, $a1, $v0 /* C1480 8012AD80 0062182A */ slt $v1, $v1, $v0 /* C1484 8012AD84 10600459 */ beqz $v1, .L8012BEEC -/* C1488 8012AD88 00000000 */ nop +/* C1488 8012AD88 00000000 */ nop /* C148C 8012AD8C 97B2008E */ lhu $s2, 0x8e($sp) /* C1490 8012AD90 8CC50038 */ lw $a1, 0x38($a2) /* C1494 8012AD94 94D9004A */ lhu $t9, 0x4a($a2) @@ -3176,24 +3248,24 @@ glabel func_80127D90 /* C149C 8012AD9C 1040000B */ beqz $v0, .L8012ADCC /* C14A0 8012ADA0 A7B900A6 */ sh $t9, 0xa6($sp) /* C14A4 8012ADA4 44890000 */ mtc1 $t1, $f0 -/* C14A8 8012ADA8 00000000 */ nop +/* C14A8 8012ADA8 00000000 */ nop /* C14AC 8012ADAC 46800020 */ cvt.s.w $f0, $f0 /* C14B0 8012ADB0 3C018015 */ lui $at, %hi(D_801508F8) /* C14B4 8012ADB4 D42208F8 */ ldc1 $f2, %lo(D_801508F8)($at) /* C14B8 8012ADB8 46000021 */ cvt.d.s $f0, $f0 /* C14BC 8012ADBC 46220002 */ mul.d $f0, $f0, $f2 -/* C14C0 8012ADC0 00000000 */ nop +/* C14C0 8012ADC0 00000000 */ nop /* C14C4 8012ADC4 4620030D */ trunc.w.d $f12, $f0 /* C14C8 8012ADC8 44126000 */ mfc1 $s2, $f12 .L8012ADCC: /* C14CC 8012ADCC 93C204F8 */ lbu $v0, 0x4f8($fp) /* C14D0 8012ADD0 24190007 */ addiu $t9, $zero, 7 /* C14D4 8012ADD4 14590018 */ bne $v0, $t9, .L8012AE38 -/* C14D8 8012ADD8 00000000 */ nop +/* C14D8 8012ADD8 00000000 */ nop /* C14DC 8012ADDC 94C20034 */ lhu $v0, 0x34($a2) /* C14E0 8012ADE0 30420020 */ andi $v0, $v0, 0x20 /* C14E4 8012ADE4 10400014 */ beqz $v0, .L8012AE38 -/* C14E8 8012ADE8 00000000 */ nop +/* C14E8 8012ADE8 00000000 */ nop /* C14EC 8012ADEC 90C3002D */ lbu $v1, 0x2d($a2) /* C14F0 8012ADF0 93C204E8 */ lbu $v0, 0x4e8($fp) /* C14F4 8012ADF4 14620004 */ bne $v1, $v0, .L8012AE08 @@ -3220,7 +3292,7 @@ glabel func_80127D90 /* C1540 8012AE40 8C420038 */ lw $v0, 0x38($v0) /* C1544 8012AE44 30420001 */ andi $v0, $v0, 1 /* C1548 8012AE48 10400011 */ beqz $v0, .L8012AE90 -/* C154C 8012AE4C 00000000 */ nop +/* C154C 8012AE4C 00000000 */ nop /* C1550 8012AE50 0C00A67F */ jal rand_int /* C1554 8012AE54 24042710 */ addiu $a0, $zero, 0x2710 /* C1558 8012AE58 00021FC2 */ srl $v1, $v0, 0x1f @@ -3243,7 +3315,7 @@ glabel func_80127D90 /* C1598 8012AE98 8C820038 */ lw $v0, 0x38($a0) /* C159C 8012AE9C 30420002 */ andi $v0, $v0, 2 /* C15A0 8012AEA0 10400063 */ beqz $v0, .L8012B030 -/* C15A4 8012AEA4 00000000 */ nop +/* C15A4 8012AEA4 00000000 */ nop /* C15A8 8012AEA8 C4820010 */ lwc1 $f2, 0x10($a0) /* C15AC 8012AEAC 3C013FF0 */ lui $at, 0x3ff0 /* C15B0 8012AEB0 44816800 */ mtc1 $at, $f13 @@ -3253,24 +3325,24 @@ glabel func_80127D90 /* C15C0 8012AEC0 3C014014 */ lui $at, 0x4014 /* C15C4 8012AEC4 44812800 */ mtc1 $at, $f5 /* C15C8 8012AEC8 44802000 */ mtc1 $zero, $f4 -/* C15CC 8012AECC 00000000 */ nop +/* C15CC 8012AECC 00000000 */ nop /* C15D0 8012AED0 46241102 */ mul.d $f4, $f2, $f4 -/* C15D4 8012AED4 00000000 */ nop +/* C15D4 8012AED4 00000000 */ nop /* C15D8 8012AED8 3C01402E */ lui $at, 0x402e /* C15DC 8012AEDC 44810800 */ mtc1 $at, $f1 /* C15E0 8012AEE0 44800000 */ mtc1 $zero, $f0 -/* C15E4 8012AEE4 00000000 */ nop +/* C15E4 8012AEE4 00000000 */ nop /* C15E8 8012AEE8 46201082 */ mul.d $f2, $f2, $f0 -/* C15EC 8012AEEC 00000000 */ nop +/* C15EC 8012AEEC 00000000 */ nop /* C15F0 8012AEF0 3C014034 */ lui $at, 0x4034 /* C15F4 8012AEF4 44810800 */ mtc1 $at, $f1 /* C15F8 8012AEF8 44800000 */ mtc1 $zero, $f0 -/* C15FC 8012AEFC 00000000 */ nop +/* C15FC 8012AEFC 00000000 */ nop /* C1600 8012AF00 46240001 */ sub.d $f0, $f0, $f4 /* C1604 8012AF04 97C30452 */ lhu $v1, 0x452($fp) /* C1608 8012AF08 4620030D */ trunc.w.d $f12, $f0 /* C160C 8012AF0C 44026000 */ mfc1 $v0, $f12 -/* C1610 8012AF10 00000000 */ nop +/* C1610 8012AF10 00000000 */ nop /* C1614 8012AF14 00620018 */ mult $v1, $v0 /* C1618 8012AF18 3C018015 */ lui $at, %hi(D_80150900) /* C161C 8012AF1C D4200900 */ ldc1 $f0, %lo(D_80150900)($at) @@ -3279,7 +3351,7 @@ glabel func_80127D90 /* C1628 8012AF28 8C830030 */ lw $v1, 0x30($a0) /* C162C 8012AF2C 4620030D */ trunc.w.d $f12, $f0 /* C1630 8012AF30 44026000 */ mfc1 $v0, $f12 -/* C1634 8012AF34 00000000 */ nop +/* C1634 8012AF34 00000000 */ nop /* C1638 8012AF38 00620018 */ mult $v1, $v0 /* C163C 8012AF3C 00001812 */ mflo $v1 /* C1640 8012AF40 00A38023 */ subu $s0, $a1, $v1 @@ -3299,11 +3371,11 @@ glabel func_80127D90 /* C1678 8012AF78 46341080 */ add.d $f2, $f2, $f20 /* C167C 8012AF7C 46000021 */ cvt.d.s $f0, $f0 /* C1680 8012AF80 46220002 */ mul.d $f0, $f0, $f2 -/* C1684 8012AF84 00000000 */ nop +/* C1684 8012AF84 00000000 */ nop /* C1688 8012AF88 3C018015 */ lui $at, %hi(D_80150910) /* C168C 8012AF8C D4240910 */ ldc1 $f4, %lo(D_80150910)($at) /* C1690 8012AF90 44901000 */ mtc1 $s0, $f2 -/* C1694 8012AF94 00000000 */ nop +/* C1694 8012AF94 00000000 */ nop /* C1698 8012AF98 468010A1 */ cvt.d.w $f2, $f2 /* C169C 8012AF9C 46241080 */ add.d $f2, $f2, $f4 /* C16A0 8012AFA0 3C018015 */ lui $at, %hi(D_80150918) @@ -3312,7 +3384,7 @@ glabel func_80127D90 /* C16AC 8012AFAC 46241080 */ add.d $f2, $f2, $f4 /* C16B0 8012AFB0 00021403 */ sra $v0, $v0, 0x10 /* C16B4 8012AFB4 44822000 */ mtc1 $v0, $f4 -/* C16B8 8012AFB8 00000000 */ nop +/* C16B8 8012AFB8 00000000 */ nop /* C16BC 8012AFBC 46802121 */ cvt.d.w $f4, $f4 /* C16C0 8012AFC0 4620130D */ trunc.w.d $f12, $f2 /* C16C4 8012AFC4 44046000 */ mfc1 $a0, $f12 @@ -3333,11 +3405,11 @@ glabel func_80127D90 /* C1700 8012B000 46341080 */ add.d $f2, $f2, $f20 /* C1704 8012B004 46000021 */ cvt.d.s $f0, $f0 /* C1708 8012B008 46220002 */ mul.d $f0, $f0, $f2 -/* C170C 8012B00C 00000000 */ nop +/* C170C 8012B00C 00000000 */ nop /* C1710 8012B010 00131400 */ sll $v0, $s3, 0x10 /* C1714 8012B014 00021403 */ sra $v0, $v0, 0x10 /* C1718 8012B018 44821000 */ mtc1 $v0, $f2 -/* C171C 8012B01C 00000000 */ nop +/* C171C 8012B01C 00000000 */ nop /* C1720 8012B020 468010A1 */ cvt.d.w $f2, $f2 /* C1724 8012B024 46201080 */ add.d $f2, $f2, $f0 /* C1728 8012B028 4620130D */ trunc.w.d $f12, $f2 @@ -3348,7 +3420,7 @@ glabel func_80127D90 /* C1738 8012B038 8C620038 */ lw $v0, 0x38($v1) /* C173C 8012B03C 30420200 */ andi $v0, $v0, 0x200 /* C1740 8012B040 1040005A */ beqz $v0, .L8012B1AC -/* C1744 8012B044 00000000 */ nop +/* C1744 8012B044 00000000 */ nop /* C1748 8012B048 C4620010 */ lwc1 $f2, 0x10($v1) /* C174C 8012B04C 3C013FF0 */ lui $at, 0x3ff0 /* C1750 8012B050 44816800 */ mtc1 $at, $f13 @@ -3358,20 +3430,20 @@ glabel func_80127D90 /* C1760 8012B060 3C014014 */ lui $at, 0x4014 /* C1764 8012B064 44810800 */ mtc1 $at, $f1 /* C1768 8012B068 44800000 */ mtc1 $zero, $f0 -/* C176C 8012B06C 00000000 */ nop +/* C176C 8012B06C 00000000 */ nop /* C1770 8012B070 46201082 */ mul.d $f2, $f2, $f0 -/* C1774 8012B074 00000000 */ nop +/* C1774 8012B074 00000000 */ nop /* C1778 8012B078 3C014034 */ lui $at, 0x4034 /* C177C 8012B07C 44810800 */ mtc1 $at, $f1 /* C1780 8012B080 44800000 */ mtc1 $zero, $f0 -/* C1784 8012B084 00000000 */ nop +/* C1784 8012B084 00000000 */ nop /* C1788 8012B088 46220001 */ sub.d $f0, $f0, $f2 /* C178C 8012B08C 3C028015 */ lui $v0, %hi(D_801512E4) /* C1790 8012B090 944212E4 */ lhu $v0, %lo(D_801512E4)($v0) /* C1794 8012B094 8C630030 */ lw $v1, 0x30($v1) /* C1798 8012B098 4620030D */ trunc.w.d $f12, $f0 /* C179C 8012B09C 44046000 */ mfc1 $a0, $f12 -/* C17A0 8012B0A0 00000000 */ nop +/* C17A0 8012B0A0 00000000 */ nop /* C17A4 8012B0A4 00440018 */ mult $v0, $a0 /* C17A8 8012B0A8 00031040 */ sll $v0, $v1, 1 /* C17AC 8012B0AC 00431021 */ addu $v0, $v0, $v1 @@ -3395,11 +3467,11 @@ glabel func_80127D90 /* C17F4 8012B0F4 46341080 */ add.d $f2, $f2, $f20 /* C17F8 8012B0F8 46000021 */ cvt.d.s $f0, $f0 /* C17FC 8012B0FC 46220002 */ mul.d $f0, $f0, $f2 -/* C1800 8012B100 00000000 */ nop +/* C1800 8012B100 00000000 */ nop /* C1804 8012B104 3C018015 */ lui $at, %hi(D_80150928) /* C1808 8012B108 D4240928 */ ldc1 $f4, %lo(D_80150928)($at) /* C180C 8012B10C 44901000 */ mtc1 $s0, $f2 -/* C1810 8012B110 00000000 */ nop +/* C1810 8012B110 00000000 */ nop /* C1814 8012B114 468010A1 */ cvt.d.w $f2, $f2 /* C1818 8012B118 46241080 */ add.d $f2, $f2, $f4 /* C181C 8012B11C 3C018015 */ lui $at, %hi(D_80150930) @@ -3408,7 +3480,7 @@ glabel func_80127D90 /* C1828 8012B128 46241080 */ add.d $f2, $f2, $f4 /* C182C 8012B12C 00021403 */ sra $v0, $v0, 0x10 /* C1830 8012B130 44822000 */ mtc1 $v0, $f4 -/* C1834 8012B134 00000000 */ nop +/* C1834 8012B134 00000000 */ nop /* C1838 8012B138 46802121 */ cvt.d.w $f4, $f4 /* C183C 8012B13C 4620130D */ trunc.w.d $f12, $f2 /* C1840 8012B140 44046000 */ mfc1 $a0, $f12 @@ -3429,11 +3501,11 @@ glabel func_80127D90 /* C187C 8012B17C 46341080 */ add.d $f2, $f2, $f20 /* C1880 8012B180 46000021 */ cvt.d.s $f0, $f0 /* C1884 8012B184 46220002 */ mul.d $f0, $f0, $f2 -/* C1888 8012B188 00000000 */ nop +/* C1888 8012B188 00000000 */ nop /* C188C 8012B18C 00131400 */ sll $v0, $s3, 0x10 /* C1890 8012B190 00021403 */ sra $v0, $v0, 0x10 /* C1894 8012B194 44821000 */ mtc1 $v0, $f2 -/* C1898 8012B198 00000000 */ nop +/* C1898 8012B198 00000000 */ nop /* C189C 8012B19C 468010A1 */ cvt.d.w $f2, $f2 /* C18A0 8012B1A0 46201080 */ add.d $f2, $f2, $f0 /* C18A4 8012B1A4 4620130D */ trunc.w.d $f12, $f2 @@ -3509,7 +3581,7 @@ glabel func_80127D90 /* C19A8 8012B2A8 00121400 */ sll $v0, $s2, 0x10 /* C19AC 8012B2AC 00021403 */ sra $v0, $v0, 0x10 /* C19B0 8012B2B0 44820000 */ mtc1 $v0, $f0 -/* C19B4 8012B2B4 00000000 */ nop +/* C19B4 8012B2B4 00000000 */ nop /* C19B8 8012B2B8 46800021 */ cvt.d.w $f0, $f0 /* C19BC 8012B2BC 24020020 */ addiu $v0, $zero, 0x20 /* C19C0 8012B2C0 8EE30000 */ lw $v1, ($s7) @@ -3521,10 +3593,10 @@ glabel func_80127D90 /* C19D8 8012B2D8 97B900B6 */ lhu $t9, 0xb6($sp) /* C19DC 8012B2DC 46220003 */ div.d $f0, $f0, $f2 /* C19E0 8012B2E0 44992000 */ mtc1 $t9, $f4 -/* C19E4 8012B2E4 00000000 */ nop +/* C19E4 8012B2E4 00000000 */ nop /* C19E8 8012B2E8 46802121 */ cvt.d.w $f4, $f4 /* C19EC 8012B2EC 46202102 */ mul.d $f4, $f4, $f0 -/* C19F0 8012B2F0 00000000 */ nop +/* C19F0 8012B2F0 00000000 */ nop /* C19F4 8012B2F4 AC820004 */ sw $v0, 4($a0) /* C19F8 8012B2F8 24620008 */ addiu $v0, $v1, 8 /* C19FC 8012B2FC AC850000 */ sw $a1, ($a0) @@ -3555,7 +3627,7 @@ glabel func_80127D90 /* C1A58 8012B358 00021403 */ sra $v0, $v0, 0x10 /* C1A5C 8012B35C 284200FF */ slti $v0, $v0, 0xff /* C1A60 8012B360 10400005 */ beqz $v0, .L8012B378 -/* C1A64 8012B364 00000000 */ nop +/* C1A64 8012B364 00000000 */ nop /* C1A68 8012B368 8EE20000 */ lw $v0, ($s7) /* C1A6C 8012B36C 0040182D */ daddu $v1, $v0, $zero /* C1A70 8012B370 0804AD09 */ j .L8012B424 @@ -3653,7 +3725,7 @@ glabel func_80127D90 /* C1BC4 8012B4C4 00121400 */ sll $v0, $s2, 0x10 .L8012B4C8: /* C1BC8 8012B4C8 18400288 */ blez $v0, .L8012BEEC -/* C1BCC 8012B4CC 00000000 */ nop +/* C1BCC 8012B4CC 00000000 */ nop /* C1BD0 8012B4D0 3C068015 */ lui $a2, %hi(D_80155D74) /* C1BD4 8012B4D4 8CC65D74 */ lw $a2, %lo(D_80155D74)($a2) /* C1BD8 8012B4D8 8CC30038 */ lw $v1, 0x38($a2) @@ -3665,13 +3737,13 @@ glabel func_80127D90 /* C1BF0 8012B4F0 00621821 */ addu $v1, $v1, $v0 /* C1BF4 8012B4F4 90650001 */ lbu $a1, 1($v1) /* C1BF8 8012B4F8 10A401B8 */ beq $a1, $a0, .L8012BBDC -/* C1BFC 8012B4FC 00000000 */ nop +/* C1BFC 8012B4FC 00000000 */ nop /* C1C00 8012B500 90620002 */ lbu $v0, 2($v1) /* C1C04 8012B504 104401B5 */ beq $v0, $a0, .L8012BBDC -/* C1C08 8012B508 00000000 */ nop +/* C1C08 8012B508 00000000 */ nop /* C1C0C 8012B50C 90620003 */ lbu $v0, 3($v1) /* C1C10 8012B510 104401B2 */ beq $v0, $a0, .L8012BBDC -/* C1C14 8012B514 00000000 */ nop +/* C1C14 8012B514 00000000 */ nop /* C1C18 8012B518 90620004 */ lbu $v0, 4($v1) /* C1C1C 8012B51C 104401AF */ beq $v0, $a0, .L8012BBDC /* C1C20 8012B520 240200FB */ addiu $v0, $zero, 0xfb @@ -3685,11 +3757,11 @@ glabel func_80127D90 /* C1C40 8012B540 D4280940 */ ldc1 $f8, %lo(D_80150940)($at) /* C1C44 8012B544 460031A1 */ cvt.d.s $f6, $f6 /* C1C48 8012B548 46283182 */ mul.d $f6, $f6, $f8 -/* C1C4C 8012B54C 00000000 */ nop +/* C1C4C 8012B54C 00000000 */ nop /* C1C50 8012B550 C4C00010 */ lwc1 $f0, 0x10($a2) /* C1C54 8012B554 46000021 */ cvt.d.s $f0, $f0 /* C1C58 8012B558 46280002 */ mul.d $f0, $f0, $f8 -/* C1C5C 8012B55C 00000000 */ nop +/* C1C5C 8012B55C 00000000 */ nop /* C1C60 8012B560 3C014018 */ lui $at, 0x4018 /* C1C64 8012B564 44812800 */ mtc1 $at, $f5 /* C1C68 8012B568 44802000 */ mtc1 $zero, $f4 @@ -3697,19 +3769,19 @@ glabel func_80127D90 /* C1C70 8012B570 460030A1 */ cvt.d.s $f2, $f6 /* C1C74 8012B574 46281083 */ div.d $f2, $f2, $f8 /* C1C78 8012B578 46241082 */ mul.d $f2, $f2, $f4 -/* C1C7C 8012B57C 00000000 */ nop +/* C1C7C 8012B57C 00000000 */ nop /* C1C80 8012B580 00021403 */ sra $v0, $v0, 0x10 /* C1C84 8012B584 46200020 */ cvt.s.d $f0, $f0 /* C1C88 8012B588 E4C00018 */ swc1 $f0, 0x18($a2) /* C1C8C 8012B58C 46201220 */ cvt.s.d $f8, $f2 /* C1C90 8012B590 44821000 */ mtc1 $v0, $f2 -/* C1C94 8012B594 00000000 */ nop +/* C1C94 8012B594 00000000 */ nop /* C1C98 8012B598 468010A0 */ cvt.s.w $f2, $f2 /* C1C9C 8012B59C 00131400 */ sll $v0, $s3, 0x10 /* C1CA0 8012B5A0 46081081 */ sub.s $f2, $f2, $f8 /* C1CA4 8012B5A4 00021403 */ sra $v0, $v0, 0x10 /* C1CA8 8012B5A8 44820000 */ mtc1 $v0, $f0 -/* C1CAC 8012B5AC 00000000 */ nop +/* C1CAC 8012B5AC 00000000 */ nop /* C1CB0 8012B5B0 46800020 */ cvt.s.w $f0, $f0 /* C1CB4 8012B5B4 46080001 */ sub.s $f0, $f0, $f8 /* C1CB8 8012B5B8 0804ADC5 */ j .L8012B714 @@ -3732,11 +3804,11 @@ glabel func_80127D90 /* C1CF8 8012B5F8 D4280948 */ ldc1 $f8, %lo(D_80150948)($at) /* C1CFC 8012B5FC 460031A1 */ cvt.d.s $f6, $f6 /* C1D00 8012B600 46283182 */ mul.d $f6, $f6, $f8 -/* C1D04 8012B604 00000000 */ nop +/* C1D04 8012B604 00000000 */ nop /* C1D08 8012B608 C4800010 */ lwc1 $f0, 0x10($a0) /* C1D0C 8012B60C 46000021 */ cvt.d.s $f0, $f0 /* C1D10 8012B610 46280002 */ mul.d $f0, $f0, $f8 -/* C1D14 8012B614 00000000 */ nop +/* C1D14 8012B614 00000000 */ nop /* C1D18 8012B618 3C014008 */ lui $at, 0x4008 /* C1D1C 8012B61C 44812800 */ mtc1 $at, $f5 /* C1D20 8012B620 44802000 */ mtc1 $zero, $f4 @@ -3744,19 +3816,19 @@ glabel func_80127D90 /* C1D28 8012B628 460030A1 */ cvt.d.s $f2, $f6 /* C1D2C 8012B62C 46281083 */ div.d $f2, $f2, $f8 /* C1D30 8012B630 46241082 */ mul.d $f2, $f2, $f4 -/* C1D34 8012B634 00000000 */ nop +/* C1D34 8012B634 00000000 */ nop /* C1D38 8012B638 00021403 */ sra $v0, $v0, 0x10 /* C1D3C 8012B63C 46200020 */ cvt.s.d $f0, $f0 /* C1D40 8012B640 E4800018 */ swc1 $f0, 0x18($a0) /* C1D44 8012B644 46201220 */ cvt.s.d $f8, $f2 /* C1D48 8012B648 44821000 */ mtc1 $v0, $f2 -/* C1D4C 8012B64C 00000000 */ nop +/* C1D4C 8012B64C 00000000 */ nop /* C1D50 8012B650 468010A0 */ cvt.s.w $f2, $f2 /* C1D54 8012B654 00131400 */ sll $v0, $s3, 0x10 /* C1D58 8012B658 46081081 */ sub.s $f2, $f2, $f8 /* C1D5C 8012B65C 00021403 */ sra $v0, $v0, 0x10 /* C1D60 8012B660 44820000 */ mtc1 $v0, $f0 -/* C1D64 8012B664 00000000 */ nop +/* C1D64 8012B664 00000000 */ nop /* C1D68 8012B668 46800020 */ cvt.s.w $f0, $f0 /* C1D6C 8012B66C 46080001 */ sub.s $f0, $f0, $f8 /* C1D70 8012B670 0804ADC5 */ j .L8012B714 @@ -3777,11 +3849,11 @@ glabel func_80127D90 /* C1DA8 8012B6A8 D4260950 */ ldc1 $f6, %lo(D_80150950)($at) /* C1DAC 8012B6AC 46002121 */ cvt.d.s $f4, $f4 /* C1DB0 8012B6B0 46262102 */ mul.d $f4, $f4, $f6 -/* C1DB4 8012B6B4 00000000 */ nop +/* C1DB4 8012B6B4 00000000 */ nop /* C1DB8 8012B6B8 C4820010 */ lwc1 $f2, 0x10($a0) /* C1DBC 8012B6BC 460010A1 */ cvt.d.s $f2, $f2 /* C1DC0 8012B6C0 46261082 */ mul.d $f2, $f2, $f6 -/* C1DC4 8012B6C4 00000000 */ nop +/* C1DC4 8012B6C4 00000000 */ nop /* C1DC8 8012B6C8 00021403 */ sra $v0, $v0, 0x10 /* C1DCC 8012B6CC 46202120 */ cvt.s.d $f4, $f4 /* C1DD0 8012B6D0 46002021 */ cvt.d.s $f0, $f4 @@ -3790,14 +3862,14 @@ glabel func_80127D90 /* C1DDC 8012B6DC E4820018 */ swc1 $f2, 0x18($a0) /* C1DE0 8012B6E0 46200000 */ add.d $f0, $f0, $f0 /* C1DE4 8012B6E4 44821000 */ mtc1 $v0, $f2 -/* C1DE8 8012B6E8 00000000 */ nop +/* C1DE8 8012B6E8 00000000 */ nop /* C1DEC 8012B6EC 468010A0 */ cvt.s.w $f2, $f2 /* C1DF0 8012B6F0 00131400 */ sll $v0, $s3, 0x10 /* C1DF4 8012B6F4 46200220 */ cvt.s.d $f8, $f0 /* C1DF8 8012B6F8 46081081 */ sub.s $f2, $f2, $f8 /* C1DFC 8012B6FC 00021403 */ sra $v0, $v0, 0x10 /* C1E00 8012B700 44820000 */ mtc1 $v0, $f0 -/* C1E04 8012B704 00000000 */ nop +/* C1E04 8012B704 00000000 */ nop /* C1E08 8012B708 46800020 */ cvt.s.w $f0, $f0 /* C1E0C 8012B70C 46080001 */ sub.s $f0, $f0, $f8 /* C1E10 8012B710 E484001C */ swc1 $f4, 0x1c($a0) @@ -3807,7 +3879,7 @@ glabel func_80127D90 /* C1E1C 8012B71C 4600030D */ trunc.w.s $f12, $f0 /* C1E20 8012B720 44136000 */ mfc1 $s3, $f12 /* C1E24 8012B724 0804AEF7 */ j .L8012BBDC -/* C1E28 8012B728 00000000 */ nop +/* C1E28 8012B728 00000000 */ nop .L8012B72C: /* C1E2C 8012B72C 30621000 */ andi $v0, $v1, 0x1000 /* C1E30 8012B730 10400060 */ beqz $v0, .L8012B8B4 @@ -3817,13 +3889,13 @@ glabel func_80127D90 /* C1E40 8012B740 00621821 */ addu $v1, $v1, $v0 /* C1E44 8012B744 90650001 */ lbu $a1, 1($v1) /* C1E48 8012B748 10A40124 */ beq $a1, $a0, .L8012BBDC -/* C1E4C 8012B74C 00000000 */ nop +/* C1E4C 8012B74C 00000000 */ nop /* C1E50 8012B750 90620002 */ lbu $v0, 2($v1) /* C1E54 8012B754 10440121 */ beq $v0, $a0, .L8012BBDC -/* C1E58 8012B758 00000000 */ nop +/* C1E58 8012B758 00000000 */ nop /* C1E5C 8012B75C 90620003 */ lbu $v0, 3($v1) /* C1E60 8012B760 1044011E */ beq $v0, $a0, .L8012BBDC -/* C1E64 8012B764 00000000 */ nop +/* C1E64 8012B764 00000000 */ nop /* C1E68 8012B768 90620004 */ lbu $v0, 4($v1) /* C1E6C 8012B76C 1044011B */ beq $v0, $a0, .L8012BBDC /* C1E70 8012B770 240200FB */ addiu $v0, $zero, 0xfb @@ -3831,17 +3903,17 @@ glabel func_80127D90 /* C1E78 8012B778 24020004 */ addiu $v0, $zero, 4 /* C1E7C 8012B77C 93C304F8 */ lbu $v1, 0x4f8($fp) /* C1E80 8012B780 14620012 */ bne $v1, $v0, .L8012B7CC -/* C1E84 8012B784 00000000 */ nop +/* C1E84 8012B784 00000000 */ nop /* C1E88 8012B788 C4C00010 */ lwc1 $f0, 0x10($a2) /* C1E8C 8012B78C 3C018015 */ lui $at, %hi(D_80150958) /* C1E90 8012B790 D4240958 */ ldc1 $f4, %lo(D_80150958)($at) /* C1E94 8012B794 46000021 */ cvt.d.s $f0, $f0 /* C1E98 8012B798 46240002 */ mul.d $f0, $f0, $f4 -/* C1E9C 8012B79C 00000000 */ nop +/* C1E9C 8012B79C 00000000 */ nop /* C1EA0 8012B7A0 C4C20014 */ lwc1 $f2, 0x14($a2) /* C1EA4 8012B7A4 460010A1 */ cvt.d.s $f2, $f2 /* C1EA8 8012B7A8 46241082 */ mul.d $f2, $f2, $f4 -/* C1EAC 8012B7AC 00000000 */ nop +/* C1EAC 8012B7AC 00000000 */ nop /* C1EB0 8012B7B0 26310005 */ addiu $s1, $s1, 5 /* C1EB4 8012B7B4 26730005 */ addiu $s3, $s3, 5 /* C1EB8 8012B7B8 46200020 */ cvt.s.d $f0, $f0 @@ -3861,18 +3933,18 @@ glabel func_80127D90 /* C1EEC 8012B7EC 24020004 */ addiu $v0, $zero, 4 /* C1EF0 8012B7F0 93C304F8 */ lbu $v1, 0x4f8($fp) /* C1EF4 8012B7F4 14620013 */ bne $v1, $v0, .L8012B844 -/* C1EF8 8012B7F8 00000000 */ nop +/* C1EF8 8012B7F8 00000000 */ nop /* C1EFC 8012B7FC C4820010 */ lwc1 $f2, 0x10($a0) /* C1F00 8012B800 3C013FE0 */ lui $at, 0x3fe0 /* C1F04 8012B804 44816800 */ mtc1 $at, $f13 /* C1F08 8012B808 44806000 */ mtc1 $zero, $f12 /* C1F0C 8012B80C 460010A1 */ cvt.d.s $f2, $f2 /* C1F10 8012B810 462C1082 */ mul.d $f2, $f2, $f12 -/* C1F14 8012B814 00000000 */ nop +/* C1F14 8012B814 00000000 */ nop /* C1F18 8012B818 C4800014 */ lwc1 $f0, 0x14($a0) /* C1F1C 8012B81C 46000021 */ cvt.d.s $f0, $f0 /* C1F20 8012B820 462C0002 */ mul.d $f0, $f0, $f12 -/* C1F24 8012B824 00000000 */ nop +/* C1F24 8012B824 00000000 */ nop /* C1F28 8012B828 26310003 */ addiu $s1, $s1, 3 /* C1F2C 8012B82C 26730003 */ addiu $s3, $s3, 3 /* C1F30 8012B830 462010A0 */ cvt.s.d $f2, $f2 @@ -3890,18 +3962,18 @@ glabel func_80127D90 /* C1F5C 8012B85C 24020004 */ addiu $v0, $zero, 4 /* C1F60 8012B860 93C304F8 */ lbu $v1, 0x4f8($fp) /* C1F64 8012B864 146200DD */ bne $v1, $v0, .L8012BBDC -/* C1F68 8012B868 00000000 */ nop +/* C1F68 8012B868 00000000 */ nop /* C1F6C 8012B86C C4800010 */ lwc1 $f0, 0x10($a0) /* C1F70 8012B870 3C013FE8 */ lui $at, 0x3fe8 /* C1F74 8012B874 44812800 */ mtc1 $at, $f5 /* C1F78 8012B878 44802000 */ mtc1 $zero, $f4 /* C1F7C 8012B87C 46000021 */ cvt.d.s $f0, $f0 /* C1F80 8012B880 46240002 */ mul.d $f0, $f0, $f4 -/* C1F84 8012B884 00000000 */ nop +/* C1F84 8012B884 00000000 */ nop /* C1F88 8012B888 C4820014 */ lwc1 $f2, 0x14($a0) /* C1F8C 8012B88C 460010A1 */ cvt.d.s $f2, $f2 /* C1F90 8012B890 46241082 */ mul.d $f2, $f2, $f4 -/* C1F94 8012B894 00000000 */ nop +/* C1F94 8012B894 00000000 */ nop /* C1F98 8012B898 26310002 */ addiu $s1, $s1, 2 /* C1F9C 8012B89C 26730002 */ addiu $s3, $s3, 2 /* C1FA0 8012B8A0 46200020 */ cvt.s.d $f0, $f0 @@ -3935,44 +4007,44 @@ glabel func_80127D90 /* C200C 8012B90C 00641821 */ addu $v1, $v1, $a0 /* C2010 8012B910 00431023 */ subu $v0, $v0, $v1 /* C2014 8012B914 44824000 */ mtc1 $v0, $f8 -/* C2018 8012B918 00000000 */ nop +/* C2018 8012B918 00000000 */ nop /* C201C 8012B91C 46804220 */ cvt.s.w $f8, $f8 /* C2020 8012B920 46004021 */ cvt.d.s $f0, $f8 /* C2024 8012B924 46220003 */ div.d $f0, $f0, $f2 /* C2028 8012B928 46200220 */ cvt.s.d $f8, $f0 /* C202C 8012B92C 46004021 */ cvt.d.s $f0, $f8 /* C2030 8012B930 462C0002 */ mul.d $f0, $f0, $f12 -/* C2034 8012B934 00000000 */ nop +/* C2034 8012B934 00000000 */ nop /* C2038 8012B938 3C013FF0 */ lui $at, 0x3ff0 /* C203C 8012B93C 44816800 */ mtc1 $at, $f13 /* C2040 8012B940 44806000 */ mtc1 $zero, $f12 -/* C2044 8012B944 00000000 */ nop +/* C2044 8012B944 00000000 */ nop /* C2048 8012B948 462C0000 */ add.d $f0, $f0, $f12 /* C204C 8012B94C 3C013FD0 */ lui $at, 0x3fd0 /* C2050 8012B950 44811800 */ mtc1 $at, $f3 /* C2054 8012B954 44801000 */ mtc1 $zero, $f2 -/* C2058 8012B958 00000000 */ nop +/* C2058 8012B958 00000000 */ nop /* C205C 8012B95C 46220001 */ sub.d $f0, $f0, $f2 /* C2060 8012B960 46200220 */ cvt.s.d $f8, $f0 /* C2064 8012B964 460040A1 */ cvt.d.s $f2, $f8 /* C2068 8012B968 4622603C */ c.lt.d $f12, $f2 -/* C206C 8012B96C 00000000 */ nop +/* C206C 8012B96C 00000000 */ nop /* C2070 8012B970 4500006D */ bc1f .L8012BB28 /* C2074 8012B974 00111400 */ sll $v0, $s1, 0x10 /* C2078 8012B978 3C014020 */ lui $at, 0x4020 /* C207C 8012B97C 44812800 */ mtc1 $at, $f5 /* C2080 8012B980 44802000 */ mtc1 $zero, $f4 -/* C2084 8012B984 00000000 */ nop +/* C2084 8012B984 00000000 */ nop /* C2088 8012B988 46241102 */ mul.d $f4, $f2, $f4 -/* C208C 8012B98C 00000000 */ nop +/* C208C 8012B98C 00000000 */ nop /* C2090 8012B990 3C038015 */ lui $v1, %hi(D_80155D74) /* C2094 8012B994 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) /* C2098 8012B998 C4600010 */ lwc1 $f0, 0x10($v1) /* C209C 8012B99C 46080002 */ mul.s $f0, $f0, $f8 -/* C20A0 8012B9A0 00000000 */ nop +/* C20A0 8012B9A0 00000000 */ nop /* C20A4 8012B9A4 C4660014 */ lwc1 $f6, 0x14($v1) /* C20A8 8012B9A8 46083182 */ mul.s $f6, $f6, $f8 -/* C20AC 8012B9AC 00000000 */ nop +/* C20AC 8012B9AC 00000000 */ nop /* C20B0 8012B9B0 E4600018 */ swc1 $f0, 0x18($v1) /* C20B4 8012B9B4 3C014021 */ lui $at, 0x4021 /* C20B8 8012B9B8 44810800 */ mtc1 $at, $f1 @@ -3980,13 +4052,13 @@ glabel func_80127D90 /* C20C0 8012B9C0 00021403 */ sra $v0, $v0, 0x10 /* C20C4 8012B9C4 46202101 */ sub.d $f4, $f4, $f0 /* C20C8 8012B9C8 44821000 */ mtc1 $v0, $f2 -/* C20CC 8012B9CC 00000000 */ nop +/* C20CC 8012B9CC 00000000 */ nop /* C20D0 8012B9D0 468010A1 */ cvt.d.w $f2, $f2 /* C20D4 8012B9D4 00131400 */ sll $v0, $s3, 0x10 /* C20D8 8012B9D8 46241081 */ sub.d $f2, $f2, $f4 /* C20DC 8012B9DC 00021403 */ sra $v0, $v0, 0x10 /* C20E0 8012B9E0 44820000 */ mtc1 $v0, $f0 -/* C20E4 8012B9E4 00000000 */ nop +/* C20E4 8012B9E4 00000000 */ nop /* C20E8 8012B9E8 46800021 */ cvt.d.w $f0, $f0 /* C20EC 8012B9EC 46240001 */ sub.d $f0, $f0, $f4 /* C20F0 8012B9F0 4620130D */ trunc.w.d $f12, $f2 @@ -4022,32 +4094,32 @@ glabel func_80127D90 /* C2164 8012BA64 44801000 */ mtc1 $zero, $f2 /* C2168 8012BA68 46000021 */ cvt.d.s $f0, $f0 /* C216C 8012BA6C 46220002 */ mul.d $f0, $f0, $f2 -/* C2170 8012BA70 00000000 */ nop +/* C2170 8012BA70 00000000 */ nop /* C2174 8012BA74 3C013FF0 */ lui $at, 0x3ff0 /* C2178 8012BA78 44816800 */ mtc1 $at, $f13 /* C217C 8012BA7C 44806000 */ mtc1 $zero, $f12 -/* C2180 8012BA80 00000000 */ nop +/* C2180 8012BA80 00000000 */ nop /* C2184 8012BA84 462C0000 */ add.d $f0, $f0, $f12 /* C2188 8012BA88 46200220 */ cvt.s.d $f8, $f0 /* C218C 8012BA8C 460040A1 */ cvt.d.s $f2, $f8 /* C2190 8012BA90 4622603C */ c.lt.d $f12, $f2 -/* C2194 8012BA94 00000000 */ nop +/* C2194 8012BA94 00000000 */ nop /* C2198 8012BA98 45000023 */ bc1f .L8012BB28 /* C219C 8012BA9C 00111400 */ sll $v0, $s1, 0x10 /* C21A0 8012BAA0 3C014020 */ lui $at, 0x4020 /* C21A4 8012BAA4 44812800 */ mtc1 $at, $f5 /* C21A8 8012BAA8 44802000 */ mtc1 $zero, $f4 -/* C21AC 8012BAAC 00000000 */ nop +/* C21AC 8012BAAC 00000000 */ nop /* C21B0 8012BAB0 46241102 */ mul.d $f4, $f2, $f4 -/* C21B4 8012BAB4 00000000 */ nop +/* C21B4 8012BAB4 00000000 */ nop /* C21B8 8012BAB8 3C038015 */ lui $v1, %hi(D_80155D74) /* C21BC 8012BABC 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) /* C21C0 8012BAC0 C4600010 */ lwc1 $f0, 0x10($v1) /* C21C4 8012BAC4 46080002 */ mul.s $f0, $f0, $f8 -/* C21C8 8012BAC8 00000000 */ nop +/* C21C8 8012BAC8 00000000 */ nop /* C21CC 8012BACC C4660014 */ lwc1 $f6, 0x14($v1) /* C21D0 8012BAD0 46083182 */ mul.s $f6, $f6, $f8 -/* C21D4 8012BAD4 00000000 */ nop +/* C21D4 8012BAD4 00000000 */ nop /* C21D8 8012BAD8 E4600018 */ swc1 $f0, 0x18($v1) /* C21DC 8012BADC 3C014021 */ lui $at, 0x4021 /* C21E0 8012BAE0 44810800 */ mtc1 $at, $f1 @@ -4055,13 +4127,13 @@ glabel func_80127D90 /* C21E8 8012BAE8 00021403 */ sra $v0, $v0, 0x10 /* C21EC 8012BAEC 46202101 */ sub.d $f4, $f4, $f0 /* C21F0 8012BAF0 44821000 */ mtc1 $v0, $f2 -/* C21F4 8012BAF4 00000000 */ nop +/* C21F4 8012BAF4 00000000 */ nop /* C21F8 8012BAF8 468010A1 */ cvt.d.w $f2, $f2 /* C21FC 8012BAFC 00131400 */ sll $v0, $s3, 0x10 /* C2200 8012BB00 46241081 */ sub.d $f2, $f2, $f4 /* C2204 8012BB04 00021403 */ sra $v0, $v0, 0x10 /* C2208 8012BB08 44820000 */ mtc1 $v0, $f0 -/* C220C 8012BB0C 00000000 */ nop +/* C220C 8012BB0C 00000000 */ nop /* C2210 8012BB10 46800021 */ cvt.d.w $f0, $f0 /* C2214 8012BB14 46240001 */ sub.d $f0, $f0, $f4 /* C2218 8012BB18 4620130D */ trunc.w.d $f12, $f2 @@ -4070,29 +4142,29 @@ glabel func_80127D90 /* C2224 8012BB24 E466001C */ swc1 $f6, 0x1c($v1) .L8012BB28: /* C2228 8012BB28 462C103C */ c.lt.d $f2, $f12 -/* C222C 8012BB2C 00000000 */ nop +/* C222C 8012BB2C 00000000 */ nop /* C2230 8012BB30 4500002A */ bc1f .L8012BBDC /* C2234 8012BB34 00111400 */ sll $v0, $s1, 0x10 /* C2238 8012BB38 3C014030 */ lui $at, 0x4030 /* C223C 8012BB3C 44810800 */ mtc1 $at, $f1 /* C2240 8012BB40 44800000 */ mtc1 $zero, $f0 -/* C2244 8012BB44 00000000 */ nop +/* C2244 8012BB44 00000000 */ nop /* C2248 8012BB48 46201002 */ mul.d $f0, $f2, $f0 -/* C224C 8012BB4C 00000000 */ nop +/* C224C 8012BB4C 00000000 */ nop /* C2250 8012BB50 3C013FE0 */ lui $at, 0x3fe0 /* C2254 8012BB54 44816800 */ mtc1 $at, $f13 /* C2258 8012BB58 44806000 */ mtc1 $zero, $f12 -/* C225C 8012BB5C 00000000 */ nop +/* C225C 8012BB5C 00000000 */ nop /* C2260 8012BB60 462C0002 */ mul.d $f0, $f0, $f12 -/* C2264 8012BB64 00000000 */ nop +/* C2264 8012BB64 00000000 */ nop /* C2268 8012BB68 3C038015 */ lui $v1, %hi(D_80155D74) /* C226C 8012BB6C 8C635D74 */ lw $v1, %lo(D_80155D74)($v1) /* C2270 8012BB70 C4620010 */ lwc1 $f2, 0x10($v1) /* C2274 8012BB74 46081082 */ mul.s $f2, $f2, $f8 -/* C2278 8012BB78 00000000 */ nop +/* C2278 8012BB78 00000000 */ nop /* C227C 8012BB7C C4660014 */ lwc1 $f6, 0x14($v1) /* C2280 8012BB80 46083182 */ mul.s $f6, $f6, $f8 -/* C2284 8012BB84 00000000 */ nop +/* C2284 8012BB84 00000000 */ nop /* C2288 8012BB88 E4620018 */ swc1 $f2, 0x18($v1) /* C228C 8012BB8C 3C014020 */ lui $at, 0x4020 /* C2290 8012BB90 44811800 */ mtc1 $at, $f3 @@ -4100,13 +4172,13 @@ glabel func_80127D90 /* C2298 8012BB98 00021403 */ sra $v0, $v0, 0x10 /* C229C 8012BB9C 46201081 */ sub.d $f2, $f2, $f0 /* C22A0 8012BBA0 44822000 */ mtc1 $v0, $f4 -/* C22A4 8012BBA4 00000000 */ nop +/* C22A4 8012BBA4 00000000 */ nop /* C22A8 8012BBA8 46802121 */ cvt.d.w $f4, $f4 /* C22AC 8012BBAC 00131400 */ sll $v0, $s3, 0x10 /* C22B0 8012BBB0 46222100 */ add.d $f4, $f4, $f2 /* C22B4 8012BBB4 00021403 */ sra $v0, $v0, 0x10 /* C22B8 8012BBB8 44820000 */ mtc1 $v0, $f0 -/* C22BC 8012BBBC 00000000 */ nop +/* C22BC 8012BBBC 00000000 */ nop /* C22C0 8012BBC0 46800021 */ cvt.d.w $f0, $f0 /* C22C4 8012BBC4 46220000 */ add.d $f0, $f0, $f2 /* C22C8 8012BBC8 E466001C */ swc1 $f6, 0x1c($v1) @@ -4120,41 +4192,48 @@ glabel func_80127D90 /* C22E0 8012BBE0 2442FFF5 */ addiu $v0, $v0, -0xb /* C22E4 8012BBE4 2C420002 */ sltiu $v0, $v0, 2 /* C22E8 8012BBE8 10400020 */ beqz $v0, .L8012BC6C -/* C22EC 8012BBEC 00000000 */ nop +/* C22EC 8012BBEC 00000000 */ nop /* C22F0 8012BBF0 93C20508 */ lbu $v0, 0x508($fp) /* C22F4 8012BBF4 2442FFFF */ addiu $v0, $v0, -1 /* C22F8 8012BBF8 2C420004 */ sltiu $v0, $v0, 4 /* C22FC 8012BBFC 1040001B */ beqz $v0, .L8012BC6C -/* C2300 8012BC00 00000000 */ nop +/* C2300 8012BC00 00000000 */ nop /* C2304 8012BC04 97B900A6 */ lhu $t9, 0xa6($sp) /* C2308 8012BC08 00191400 */ sll $v0, $t9, 0x10 /* C230C 8012BC0C 00021C03 */ sra $v1, $v0, 0x10 /* C2310 8012BC10 2C620026 */ sltiu $v0, $v1, 0x26 /* C2314 8012BC14 10400013 */ beqz $v0, .L8012BC64 /* C2318 8012BC18 00031080 */ sll $v0, $v1, 2 -/* C231C 8012BC1C 3C018015 */ lui $at, %hi(D_80150960) +/* C231C 8012BC1C 3C018015 */ lui $at, %hi(jtbl_80150960_E7060) /* C2320 8012BC20 00220821 */ addu $at, $at, $v0 -/* C2324 8012BC24 8C220960 */ lw $v0, %lo(D_80150960)($at) +/* C2324 8012BC24 8C220960 */ lw $v0, %lo(jtbl_80150960_E7060)($at) /* C2328 8012BC28 00400008 */ jr $v0 -/* C232C 8012BC2C 00000000 */ nop +/* C232C 8012BC2C 00000000 */ nop +glabel L8012BC30_C2330 /* C2330 8012BC30 24180040 */ addiu $t8, $zero, 0x40 /* C2334 8012BC34 0804AF1B */ j .L8012BC6C /* C2338 8012BC38 A7B800A6 */ sh $t8, 0xa6($sp) +glabel L8012BC3C_C233C /* C233C 8012BC3C 0804AF1A */ j .L8012BC68 /* C2340 8012BC40 24190041 */ addiu $t9, $zero, 0x41 +glabel L8012BC44_C2344 /* C2344 8012BC44 24180042 */ addiu $t8, $zero, 0x42 /* C2348 8012BC48 0804AF1B */ j .L8012BC6C /* C234C 8012BC4C A7B800A6 */ sh $t8, 0xa6($sp) +glabel L8012BC50_C2350 /* C2350 8012BC50 0804AF1A */ j .L8012BC68 /* C2354 8012BC54 24190043 */ addiu $t9, $zero, 0x43 +glabel L8012BC58_C2358 /* C2358 8012BC58 24180044 */ addiu $t8, $zero, 0x44 /* C235C 8012BC5C 0804AF1B */ j .L8012BC6C /* C2360 8012BC60 A7B800A6 */ sh $t8, 0xa6($sp) .L8012BC64: +glabel L8012BC64_C2364 /* C2364 8012BC64 24190040 */ addiu $t9, $zero, 0x40 .L8012BC68: /* C2368 8012BC68 A7B900A6 */ sh $t9, 0xa6($sp) .L8012BC6C: +glabel L8012BC6C_C236C /* C236C 8012BC6C 97B800A6 */ lhu $t8, 0xa6($sp) /* C2370 8012BC70 97B9009E */ lhu $t9, 0x9e($sp) /* C2374 8012BC74 00181C00 */ sll $v1, $t8, 0x10 @@ -4304,7 +4383,7 @@ glabel func_80127D90 /* C25A0 8012BEA0 1440FFD4 */ bnez $v0, .L8012BDF4 /* C25A4 8012BEA4 00168403 */ sra $s0, $s6, 0x10 /* C25A8 8012BEA8 0804AFBB */ j .L8012BEEC -/* C25AC 8012BEAC 00000000 */ nop +/* C25AC 8012BEAC 00000000 */ nop .L8012BEB0: /* C25B0 8012BEB0 03C0202D */ daddu $a0, $fp, $zero /* C25B4 8012BEB4 97B800A6 */ lhu $t8, 0xa6($sp) @@ -4348,7 +4427,7 @@ glabel func_80127D90 /* C2644 8012BF44 8C670010 */ lw $a3, 0x10($v1) .L8012BF48: /* C2648 8012BF48 0C04977D */ jal get_char_width -/* C264C 8012BF4C 00000000 */ nop +/* C264C 8012BF4C 00000000 */ nop /* C2650 8012BF50 3C058015 */ lui $a1, %hi(D_80155D74) /* C2654 8012BF54 8CA55D74 */ lw $a1, %lo(D_80155D74)($a1) /* C2658 8012BF58 94A30042 */ lhu $v1, 0x42($a1) @@ -4359,9 +4438,10 @@ glabel func_80127D90 .L8012BF6C: /* C266C 8012BF6C ACA40020 */ sw $a0, 0x20($a1) .L8012BF70: +glabel L8012BF70_C2670 /* C2670 8012BF70 97A20080 */ lhu $v0, 0x80($sp) /* C2674 8012BF74 1040EFFE */ beqz $v0, .L80127F70 -/* C2678 8012BF78 00000000 */ nop +/* C2678 8012BF78 00000000 */ nop /* C267C 8012BF7C 97C2052C */ lhu $v0, 0x52c($fp) /* C2680 8012BF80 104000BA */ beqz $v0, .L8012C26C /* C2684 8012BF84 0000302D */ daddu $a2, $zero, $zero @@ -4381,7 +4461,7 @@ glabel func_80127D90 /* C26BC 8012BFBC 10820050 */ beq $a0, $v0, .L8012C100 /* C26C0 8012BFC0 00101400 */ sll $v0, $s0, 0x10 /* C26C4 8012BFC4 0804B064 */ j .L8012C190 -/* C26C8 8012BFC8 00000000 */ nop +/* C26C8 8012BFC8 00000000 */ nop .L8012BFCC: /* C26CC 8012BFCC 54800001 */ bnel $a0, $zero, .L8012BFD4 /* C26D0 8012BFD0 24060001 */ addiu $a2, $zero, 1 @@ -4395,12 +4475,12 @@ glabel func_80127D90 /* C26EC 8012BFEC 10600007 */ beqz $v1, .L8012C00C /* C26F0 8012BFF0 00101400 */ sll $v0, $s0, 0x10 /* C26F4 8012BFF4 0804B064 */ j .L8012C190 -/* C26F8 8012BFF8 00000000 */ nop +/* C26F8 8012BFF8 00000000 */ nop .L8012BFFC: /* C26FC 8012BFFC 10620031 */ beq $v1, $v0, .L8012C0C4 /* C2700 8012C000 00101400 */ sll $v0, $s0, 0x10 /* C2704 8012C004 0804B064 */ j .L8012C190 -/* C2708 8012C008 00000000 */ nop +/* C2708 8012C008 00000000 */ nop .L8012C00C: /* C270C 8012C00C 97C30534 */ lhu $v1, 0x534($fp) /* C2710 8012C010 93C40532 */ lbu $a0, 0x532($fp) @@ -4428,25 +4508,25 @@ glabel func_80127D90 /* C2764 8012C064 00181400 */ sll $v0, $t8, 0x10 /* C2768 8012C068 00021403 */ sra $v0, $v0, 0x10 /* C276C 8012C06C 44821000 */ mtc1 $v0, $f2 -/* C2770 8012C070 00000000 */ nop +/* C2770 8012C070 00000000 */ nop /* C2774 8012C074 468010A0 */ cvt.s.w $f2, $f2 /* C2778 8012C078 460010A1 */ cvt.d.s $f2, $f2 /* C277C 8012C07C 93C20531 */ lbu $v0, 0x531($fp) /* C2780 8012C080 46201083 */ div.d $f2, $f2, $f0 /* C2784 8012C084 44820000 */ mtc1 $v0, $f0 -/* C2788 8012C088 00000000 */ nop +/* C2788 8012C088 00000000 */ nop /* C278C 8012C08C 46800020 */ cvt.s.w $f0, $f0 /* C2790 8012C090 46000021 */ cvt.d.s $f0, $f0 /* C2794 8012C094 46201002 */ mul.d $f0, $f2, $f0 -/* C2798 8012C098 00000000 */ nop +/* C2798 8012C098 00000000 */ nop /* C279C 8012C09C 3C0141E0 */ lui $at, 0x41e0 /* C27A0 8012C0A0 44811800 */ mtc1 $at, $f3 /* C27A4 8012C0A4 44801000 */ mtc1 $zero, $f2 -/* C27A8 8012C0A8 00000000 */ nop +/* C27A8 8012C0A8 00000000 */ nop /* C27AC 8012C0AC 4620103E */ c.le.d $f2, $f0 -/* C27B0 8012C0B0 00000000 */ nop +/* C27B0 8012C0B0 00000000 */ nop /* C27B4 8012C0B4 4500002B */ bc1f .L8012C164 -/* C27B8 8012C0B8 00000000 */ nop +/* C27B8 8012C0B8 00000000 */ nop /* C27BC 8012C0BC 0804B05D */ j .L8012C174 /* C27C0 8012C0C0 46220001 */ sub.d $f0, $f0, $f2 .L8012C0C4: @@ -4472,23 +4552,23 @@ glabel func_80127D90 /* C280C 8012C10C 00191400 */ sll $v0, $t9, 0x10 /* C2810 8012C110 00021403 */ sra $v0, $v0, 0x10 /* C2814 8012C114 44821000 */ mtc1 $v0, $f2 -/* C2818 8012C118 00000000 */ nop +/* C2818 8012C118 00000000 */ nop /* C281C 8012C11C 468010A0 */ cvt.s.w $f2, $f2 /* C2820 8012C120 460010A1 */ cvt.d.s $f2, $f2 /* C2824 8012C124 93C20531 */ lbu $v0, 0x531($fp) /* C2828 8012C128 46201083 */ div.d $f2, $f2, $f0 /* C282C 8012C12C 44820000 */ mtc1 $v0, $f0 -/* C2830 8012C130 00000000 */ nop +/* C2830 8012C130 00000000 */ nop /* C2834 8012C134 46800020 */ cvt.s.w $f0, $f0 /* C2838 8012C138 46000021 */ cvt.d.s $f0, $f0 /* C283C 8012C13C 46201002 */ mul.d $f0, $f2, $f0 -/* C2840 8012C140 00000000 */ nop +/* C2840 8012C140 00000000 */ nop /* C2844 8012C144 3C0141E0 */ lui $at, 0x41e0 /* C2848 8012C148 44811800 */ mtc1 $at, $f3 /* C284C 8012C14C 44801000 */ mtc1 $zero, $f2 -/* C2850 8012C150 00000000 */ nop +/* C2850 8012C150 00000000 */ nop /* C2854 8012C154 4620103E */ c.le.d $f2, $f0 -/* C2858 8012C158 00000000 */ nop +/* C2858 8012C158 00000000 */ nop /* C285C 8012C15C 45030005 */ bc1tl .L8012C174 /* C2860 8012C160 46220001 */ sub.d $f0, $f0, $f2 .L8012C164: @@ -4500,14 +4580,14 @@ glabel func_80127D90 /* C2874 8012C174 3C028000 */ lui $v0, 0x8000 /* C2878 8012C178 4620030D */ trunc.w.d $f12, $f0 /* C287C 8012C17C 44036000 */ mfc1 $v1, $f12 -/* C2880 8012C180 00000000 */ nop +/* C2880 8012C180 00000000 */ nop /* C2884 8012C184 00621825 */ or $v1, $v1, $v0 /* C2888 8012C188 307000FF */ andi $s0, $v1, 0xff .L8012C18C: /* C288C 8012C18C 00101400 */ sll $v0, $s0, 0x10 .L8012C190: /* C2890 8012C190 18400036 */ blez $v0, .L8012C26C -/* C2894 8012C194 00000000 */ nop +/* C2894 8012C194 00000000 */ nop .L8012C198: /* C2898 8012C198 00C0102D */ daddu $v0, $a2, $zero /* C289C 8012C19C 1040001E */ beqz $v0, .L8012C218 diff --git a/asm/nonmatchings/code_B9D60/func_8012C324.s b/asm/nonmatchings/code_B9D60/func_8012C324.s index bca4edd2b8..0d1c80e926 100644 --- a/asm/nonmatchings/code_B9D60/func_8012C324.s +++ b/asm/nonmatchings/code_B9D60/func_8012C324.s @@ -23,27 +23,27 @@ glabel func_8012C324 /* C2A6C 8012C36C 91220000 */ lbu $v0, ($t1) /* C2A70 8012C370 8D4B0004 */ lw $t3, 4($t2) /* C2A74 8012C374 44822000 */ mtc1 $v0, $f4 -/* C2A78 8012C378 00000000 */ nop +/* C2A78 8012C378 00000000 */ nop /* C2A7C 8012C37C 46802120 */ cvt.s.w $f4, $f4 /* C2A80 8012C380 46043102 */ mul.s $f4, $f6, $f4 -/* C2A84 8012C384 00000000 */ nop +/* C2A84 8012C384 00000000 */ nop /* C2A88 8012C388 954C003E */ lhu $t4, 0x3e($t2) /* C2A8C 8012C38C 91220001 */ lbu $v0, 1($t1) /* C2A90 8012C390 8D470008 */ lw $a3, 8($t2) /* C2A94 8012C394 44820000 */ mtc1 $v0, $f0 -/* C2A98 8012C398 00000000 */ nop +/* C2A98 8012C398 00000000 */ nop /* C2A9C 8012C39C 46800020 */ cvt.s.w $f0, $f0 /* C2AA0 8012C3A0 46001082 */ mul.s $f2, $f2, $f0 -/* C2AA4 8012C3A4 00000000 */ nop +/* C2AA4 8012C3A4 00000000 */ nop /* C2AA8 8012C3A8 8D48000C */ lw $t0, 0xc($t2) /* C2AAC 8012C3AC 8D450000 */ lw $a1, ($t2) /* C2AB0 8012C3B0 4600220D */ trunc.w.s $f8, $f4 /* C2AB4 8012C3B4 44024000 */ mfc1 $v0, $f8 -/* C2AB8 8012C3B8 00000000 */ nop +/* C2AB8 8012C3B8 00000000 */ nop /* C2ABC 8012C3BC 00C26821 */ addu $t5, $a2, $v0 /* C2AC0 8012C3C0 4600120D */ trunc.w.s $f8, $f2 /* C2AC4 8012C3C4 44024000 */ mfc1 $v0, $f8 -/* C2AC8 8012C3C8 00000000 */ nop +/* C2AC8 8012C3C8 00000000 */ nop /* C2ACC 8012C3CC 00627021 */ addu $t6, $v1, $v0 /* C2AD0 8012C3D0 00CB102A */ slt $v0, $a2, $t3 /* C2AD4 8012C3D4 1040016D */ beqz $v0, .L8012C98C @@ -60,7 +60,7 @@ glabel func_8012C324 /* C2B00 8012C400 00021023 */ negu $v0, $v0 .L8012C404: /* C2B04 8012C404 44820000 */ mtc1 $v0, $f0 -/* C2B08 8012C408 00000000 */ nop +/* C2B08 8012C408 00000000 */ nop /* C2B0C 8012C40C 46800020 */ cvt.s.w $f0, $f0 /* C2B10 8012C410 46060103 */ div.s $f4, $f0, $f6 /* C2B14 8012C414 3C013FE0 */ lui $at, 0x3fe0 @@ -71,9 +71,9 @@ glabel func_8012C324 /* C2B28 8012C428 3C014040 */ lui $at, 0x4040 /* C2B2C 8012C42C 44811800 */ mtc1 $at, $f3 /* C2B30 8012C430 44801000 */ mtc1 $zero, $f2 -/* C2B34 8012C434 00000000 */ nop +/* C2B34 8012C434 00000000 */ nop /* C2B38 8012C438 46220002 */ mul.d $f0, $f0, $f2 -/* C2B3C 8012C43C 00000000 */ nop +/* C2B3C 8012C43C 00000000 */ nop /* C2B40 8012C440 46200020 */ cvt.s.d $f0, $f0 /* C2B44 8012C444 4600020D */ trunc.w.s $f8, $f0 /* C2B48 8012C448 44104000 */ mfc1 $s0, $f8 @@ -98,14 +98,14 @@ glabel func_8012C324 /* C2B88 8012C488 00021023 */ negu $v0, $v0 .L8012C48C: /* C2B8C 8012C48C 44822000 */ mtc1 $v0, $f4 -/* C2B90 8012C490 00000000 */ nop +/* C2B90 8012C490 00000000 */ nop /* C2B94 8012C494 46802120 */ cvt.s.w $f4, $f4 /* C2B98 8012C498 C542001C */ lwc1 $f2, 0x1c($t2) /* C2B9C 8012C49C 3C014200 */ lui $at, 0x4200 /* C2BA0 8012C4A0 44810000 */ mtc1 $at, $f0 /* C2BA4 8012C4A4 46022103 */ div.s $f4, $f4, $f2 /* C2BA8 8012C4A8 46002002 */ mul.s $f0, $f4, $f0 -/* C2BAC 8012C4AC 00000000 */ nop +/* C2BAC 8012C4AC 00000000 */ nop /* C2BB0 8012C4B0 4600020D */ trunc.w.s $f8, $f0 /* C2BB4 8012C4B4 44184000 */ mfc1 $t8, $f8 /* C2BB8 8012C4B8 0804B131 */ j .L8012C4C4 @@ -129,11 +129,11 @@ glabel func_8012C324 /* C2BF0 8012C4F0 44813000 */ mtc1 $at, $f6 /* C2BF4 8012C4F4 46041103 */ div.s $f4, $f2, $f4 /* C2BF8 8012C4F8 46062102 */ mul.s $f4, $f4, $f6 -/* C2BFC 8012C4FC 00000000 */ nop +/* C2BFC 8012C4FC 00000000 */ nop /* C2C00 8012C500 C540001C */ lwc1 $f0, 0x1c($t2) /* C2C04 8012C504 46001083 */ div.s $f2, $f2, $f0 /* C2C08 8012C508 46061082 */ mul.s $f2, $f2, $f6 -/* C2C0C 8012C50C 00000000 */ nop +/* C2C0C 8012C50C 00000000 */ nop /* C2C10 8012C510 95440034 */ lhu $a0, 0x34($t2) /* C2C14 8012C514 30820011 */ andi $v0, $a0, 0x11 /* C2C18 8012C518 4600220D */ trunc.w.s $f8, $f4 @@ -189,7 +189,7 @@ glabel func_8012C324 /* C2CDC 8012C5DC 91220000 */ lbu $v0, ($t1) /* C2CE0 8012C5E0 2C420010 */ sltiu $v0, $v0, 0x10 /* C2CE4 8012C5E4 1440006B */ bnez $v0, .L8012C794 -/* C2CE8 8012C5E8 00000000 */ nop +/* C2CE8 8012C5E8 00000000 */ nop /* C2CEC 8012C5EC 91220000 */ lbu $v0, ($t1) /* C2CF0 8012C5F0 3042000F */ andi $v0, $v0, 0xf /* C2CF4 8012C5F4 14400067 */ bnez $v0, .L8012C794 @@ -256,7 +256,7 @@ glabel func_8012C324 /* C2DDC 8012C6DC 14810004 */ bne $a0, $at, .L8012C6F0 /* C2DE0 8012C6E0 3C018000 */ lui $at, 0x8000 /* C2DE4 8012C6E4 15010002 */ bne $t0, $at, .L8012C6F0 -/* C2DE8 8012C6E8 00000000 */ nop +/* C2DE8 8012C6E8 00000000 */ nop /* C2DEC 8012C6EC 0006000D */ break 6 .L8012C6F0: /* C2DF0 8012C6F0 00001012 */ mflo $v0 diff --git a/asm/nonmatchings/code_B9D60/func_8012D3DC.s b/asm/nonmatchings/code_B9D60/func_8012D3DC.s index 5302a72169..f9c6884741 100644 --- a/asm/nonmatchings/code_B9D60/func_8012D3DC.s +++ b/asm/nonmatchings/code_B9D60/func_8012D3DC.s @@ -34,7 +34,7 @@ glabel func_8012D3DC /* C3B50 8012D450 24020003 */ addiu $v0, $zero, 3 /* C3B54 8012D454 9223053C */ lbu $v1, 0x53c($s1) /* C3B58 8012D458 14620005 */ bne $v1, $v0, .L8012D470 -/* C3B5C 8012D45C 00000000 */ nop +/* C3B5C 8012D45C 00000000 */ nop .L8012D460: /* C3B60 8012D460 96220516 */ lhu $v0, 0x516($s1) /* C3B64 8012D464 00821021 */ addu $v0, $a0, $v0 @@ -63,26 +63,26 @@ glabel func_8012D3DC /* C3BB0 8012D4B0 30A200FF */ andi $v0, $a1, 0xff .L8012D4B4: /* C3BB4 8012D4B4 10400056 */ beqz $v0, .L8012D610 -/* C3BB8 8012D4B8 00000000 */ nop +/* C3BB8 8012D4B8 00000000 */ nop /* C3BBC 8012D4BC 96220514 */ lhu $v0, 0x514($s1) /* C3BC0 8012D4C0 3C018015 */ lui $at, %hi(D_80150A08) /* C3BC4 8012D4C4 D4200A08 */ ldc1 $f0, %lo(D_80150A08)($at) /* C3BC8 8012D4C8 44821000 */ mtc1 $v0, $f2 -/* C3BCC 8012D4CC 00000000 */ nop +/* C3BCC 8012D4CC 00000000 */ nop /* C3BD0 8012D4D0 468010A0 */ cvt.s.w $f2, $f2 /* C3BD4 8012D4D4 460010A1 */ cvt.d.s $f2, $f2 /* C3BD8 8012D4D8 46201082 */ mul.d $f2, $f2, $f0 -/* C3BDC 8012D4DC 00000000 */ nop +/* C3BDC 8012D4DC 00000000 */ nop /* C3BE0 8012D4E0 00061400 */ sll $v0, $a2, 0x10 /* C3BE4 8012D4E4 00022403 */ sra $a0, $v0, 0x10 /* C3BE8 8012D4E8 44840000 */ mtc1 $a0, $f0 -/* C3BEC 8012D4EC 00000000 */ nop +/* C3BEC 8012D4EC 00000000 */ nop /* C3BF0 8012D4F0 46800021 */ cvt.d.w $f0, $f0 /* C3BF4 8012D4F4 46220000 */ add.d $f0, $f0, $f2 /* C3BF8 8012D4F8 9623050E */ lhu $v1, 0x50e($s1) /* C3BFC 8012D4FC 4620010D */ trunc.w.d $f4, $f0 /* C3C00 8012D500 44022000 */ mfc1 $v0, $f4 -/* C3C04 8012D504 00000000 */ nop +/* C3C04 8012D504 00000000 */ nop /* C3C08 8012D508 0040902D */ daddu $s2, $v0, $zero /* C3C0C 8012D50C 00021400 */ sll $v0, $v0, 0x10 /* C3C10 8012D510 00021403 */ sra $v0, $v0, 0x10 @@ -90,7 +90,7 @@ glabel func_8012D3DC /* C3C18 8012D518 10600090 */ beqz $v1, .L8012D75C /* C3C1C 8012D51C 00141400 */ sll $v0, $s4, 0x10 /* C3C20 8012D520 4484D000 */ mtc1 $a0, $f26 -/* C3C24 8012D524 00000000 */ nop +/* C3C24 8012D524 00000000 */ nop /* C3C28 8012D528 4680D6A0 */ cvt.s.w $f26, $f26 /* C3C2C 8012D52C 00029C03 */ sra $s3, $v0, 0x10 /* C3C30 8012D530 3C013F33 */ lui $at, 0x3f33 @@ -103,37 +103,37 @@ glabel func_8012D3DC .L8012D54C: /* C3C4C 8012D54C 96220514 */ lhu $v0, 0x514($s1) /* C3C50 8012D550 44820000 */ mtc1 $v0, $f0 -/* C3C54 8012D554 00000000 */ nop +/* C3C54 8012D554 00000000 */ nop /* C3C58 8012D558 46800020 */ cvt.s.w $f0, $f0 /* C3C5C 8012D55C 46140002 */ mul.s $f0, $f0, $f20 -/* C3C60 8012D560 00000000 */ nop +/* C3C60 8012D560 00000000 */ nop /* C3C64 8012D564 44932000 */ mtc1 $s3, $f4 -/* C3C68 8012D568 00000000 */ nop +/* C3C68 8012D568 00000000 */ nop /* C3C6C 8012D56C 46802120 */ cvt.s.w $f4, $f4 /* C3C70 8012D570 44072000 */ mfc1 $a3, $f4 /* C3C74 8012D574 9622050E */ lhu $v0, 0x50e($s1) /* C3C78 8012D578 4600D000 */ add.s $f0, $f26, $f0 /* C3C7C 8012D57C 96230510 */ lhu $v1, 0x510($s1) /* C3C80 8012D580 44826000 */ mtc1 $v0, $f12 -/* C3C84 8012D584 00000000 */ nop +/* C3C84 8012D584 00000000 */ nop /* C3C88 8012D588 46806320 */ cvt.s.w $f12, $f12 /* C3C8C 8012D58C 4600010D */ trunc.w.s $f4, $f0 /* C3C90 8012D590 44022000 */ mfc1 $v0, $f4 -/* C3C94 8012D594 00000000 */ nop +/* C3C94 8012D594 00000000 */ nop /* C3C98 8012D598 0040902D */ daddu $s2, $v0, $zero /* C3C9C 8012D59C 00021400 */ sll $v0, $v0, 0x10 /* C3CA0 8012D5A0 00021403 */ sra $v0, $v0, 0x10 /* C3CA4 8012D5A4 44822000 */ mtc1 $v0, $f4 -/* C3CA8 8012D5A8 00000000 */ nop +/* C3CA8 8012D5A8 00000000 */ nop /* C3CAC 8012D5AC 46802120 */ cvt.s.w $f4, $f4 /* C3CB0 8012D5B0 44062000 */ mfc1 $a2, $f4 /* C3CB4 8012D5B4 44837000 */ mtc1 $v1, $f14 -/* C3CB8 8012D5B8 00000000 */ nop +/* C3CB8 8012D5B8 00000000 */ nop /* C3CBC 8012D5BC 0C00A720 */ jal atan2 /* C3CC0 8012D5C0 468073A0 */ cvt.s.w $f14, $f14 /* C3CC4 8012D5C4 4600010D */ trunc.w.s $f4, $f0 /* C3CC8 8012D5C8 44102000 */ mfc1 $s0, $f4 -/* C3CCC 8012D5CC 00000000 */ nop +/* C3CCC 8012D5CC 00000000 */ nop /* C3CD0 8012D5D0 06010002 */ bgez $s0, .L8012D5DC /* C3CD4 8012D5D4 0200102D */ daddu $v0, $s0, $zero /* C3CD8 8012D5D8 00021023 */ negu $v0, $v0 @@ -146,31 +146,31 @@ glabel func_8012D3DC /* C3CF0 8012D5F0 46200520 */ cvt.s.d $f20, $f0 /* C3CF4 8012D5F4 4600A021 */ cvt.d.s $f0, $f20 /* C3CF8 8012D5F8 4620B03E */ c.le.d $f22, $f0 -/* C3CFC 8012D5FC 00000000 */ nop +/* C3CFC 8012D5FC 00000000 */ nop /* C3D00 8012D600 45000058 */ bc1f .L8012D764 /* C3D04 8012D604 00021403 */ sra $v0, $v0, 0x10 /* C3D08 8012D608 0804B553 */ j .L8012D54C -/* C3D0C 8012D60C 00000000 */ nop +/* C3D0C 8012D60C 00000000 */ nop .L8012D610: /* C3D10 8012D610 96220514 */ lhu $v0, 0x514($s1) /* C3D14 8012D614 3C018015 */ lui $at, %hi(D_80150A20) /* C3D18 8012D618 D4200A20 */ ldc1 $f0, %lo(D_80150A20)($at) /* C3D1C 8012D61C 44821000 */ mtc1 $v0, $f2 -/* C3D20 8012D620 00000000 */ nop +/* C3D20 8012D620 00000000 */ nop /* C3D24 8012D624 468010A0 */ cvt.s.w $f2, $f2 /* C3D28 8012D628 460010A1 */ cvt.d.s $f2, $f2 /* C3D2C 8012D62C 46201082 */ mul.d $f2, $f2, $f0 -/* C3D30 8012D630 00000000 */ nop +/* C3D30 8012D630 00000000 */ nop /* C3D34 8012D634 00061400 */ sll $v0, $a2, 0x10 /* C3D38 8012D638 00022403 */ sra $a0, $v0, 0x10 /* C3D3C 8012D63C 44840000 */ mtc1 $a0, $f0 -/* C3D40 8012D640 00000000 */ nop +/* C3D40 8012D640 00000000 */ nop /* C3D44 8012D644 46800021 */ cvt.d.w $f0, $f0 /* C3D48 8012D648 46220000 */ add.d $f0, $f0, $f2 /* C3D4C 8012D64C 9623050E */ lhu $v1, 0x50e($s1) /* C3D50 8012D650 4620010D */ trunc.w.d $f4, $f0 /* C3D54 8012D654 44022000 */ mfc1 $v0, $f4 -/* C3D58 8012D658 00000000 */ nop +/* C3D58 8012D658 00000000 */ nop /* C3D5C 8012D65C 0040902D */ daddu $s2, $v0, $zero /* C3D60 8012D660 00021400 */ sll $v0, $v0, 0x10 /* C3D64 8012D664 00021403 */ sra $v0, $v0, 0x10 @@ -178,7 +178,7 @@ glabel func_8012D3DC /* C3D6C 8012D66C 1040003B */ beqz $v0, .L8012D75C /* C3D70 8012D670 00141400 */ sll $v0, $s4, 0x10 /* C3D74 8012D674 4484D000 */ mtc1 $a0, $f26 -/* C3D78 8012D678 00000000 */ nop +/* C3D78 8012D678 00000000 */ nop /* C3D7C 8012D67C 4680D6A0 */ cvt.s.w $f26, $f26 /* C3D80 8012D680 00029C03 */ sra $s3, $v0, 0x10 /* C3D84 8012D684 3C013E99 */ lui $at, 0x3e99 @@ -191,37 +191,37 @@ glabel func_8012D3DC .L8012D6A0: /* C3DA0 8012D6A0 96220514 */ lhu $v0, 0x514($s1) /* C3DA4 8012D6A4 44820000 */ mtc1 $v0, $f0 -/* C3DA8 8012D6A8 00000000 */ nop +/* C3DA8 8012D6A8 00000000 */ nop /* C3DAC 8012D6AC 46800020 */ cvt.s.w $f0, $f0 /* C3DB0 8012D6B0 46140002 */ mul.s $f0, $f0, $f20 -/* C3DB4 8012D6B4 00000000 */ nop +/* C3DB4 8012D6B4 00000000 */ nop /* C3DB8 8012D6B8 44932000 */ mtc1 $s3, $f4 -/* C3DBC 8012D6BC 00000000 */ nop +/* C3DBC 8012D6BC 00000000 */ nop /* C3DC0 8012D6C0 46802120 */ cvt.s.w $f4, $f4 /* C3DC4 8012D6C4 44072000 */ mfc1 $a3, $f4 /* C3DC8 8012D6C8 9622050E */ lhu $v0, 0x50e($s1) /* C3DCC 8012D6CC 4600D000 */ add.s $f0, $f26, $f0 /* C3DD0 8012D6D0 96230510 */ lhu $v1, 0x510($s1) /* C3DD4 8012D6D4 44826000 */ mtc1 $v0, $f12 -/* C3DD8 8012D6D8 00000000 */ nop +/* C3DD8 8012D6D8 00000000 */ nop /* C3DDC 8012D6DC 46806320 */ cvt.s.w $f12, $f12 /* C3DE0 8012D6E0 4600010D */ trunc.w.s $f4, $f0 /* C3DE4 8012D6E4 44022000 */ mfc1 $v0, $f4 -/* C3DE8 8012D6E8 00000000 */ nop +/* C3DE8 8012D6E8 00000000 */ nop /* C3DEC 8012D6EC 0040902D */ daddu $s2, $v0, $zero /* C3DF0 8012D6F0 00021400 */ sll $v0, $v0, 0x10 /* C3DF4 8012D6F4 00021403 */ sra $v0, $v0, 0x10 /* C3DF8 8012D6F8 44822000 */ mtc1 $v0, $f4 -/* C3DFC 8012D6FC 00000000 */ nop +/* C3DFC 8012D6FC 00000000 */ nop /* C3E00 8012D700 46802120 */ cvt.s.w $f4, $f4 /* C3E04 8012D704 44062000 */ mfc1 $a2, $f4 /* C3E08 8012D708 44837000 */ mtc1 $v1, $f14 -/* C3E0C 8012D70C 00000000 */ nop +/* C3E0C 8012D70C 00000000 */ nop /* C3E10 8012D710 0C00A720 */ jal atan2 /* C3E14 8012D714 468073A0 */ cvt.s.w $f14, $f14 /* C3E18 8012D718 4600010D */ trunc.w.s $f4, $f0 /* C3E1C 8012D71C 44102000 */ mfc1 $s0, $f4 -/* C3E20 8012D720 00000000 */ nop +/* C3E20 8012D720 00000000 */ nop /* C3E24 8012D724 06010002 */ bgez $s0, .L8012D730 /* C3E28 8012D728 0200102D */ daddu $v0, $s0, $zero /* C3E2C 8012D72C 00021023 */ negu $v0, $v0 @@ -234,31 +234,31 @@ glabel func_8012D3DC /* C3E44 8012D744 46200520 */ cvt.s.d $f20, $f0 /* C3E48 8012D748 4600A021 */ cvt.d.s $f0, $f20 /* C3E4C 8012D74C 4636003E */ c.le.d $f0, $f22 -/* C3E50 8012D750 00000000 */ nop +/* C3E50 8012D750 00000000 */ nop /* C3E54 8012D754 4501FFD2 */ bc1t .L8012D6A0 -/* C3E58 8012D758 00000000 */ nop +/* C3E58 8012D758 00000000 */ nop .L8012D75C: /* C3E5C 8012D75C 00121400 */ sll $v0, $s2, 0x10 .L8012D760: /* C3E60 8012D760 00021403 */ sra $v0, $v0, 0x10 .L8012D764: /* C3E64 8012D764 4482C000 */ mtc1 $v0, $f24 -/* C3E68 8012D768 00000000 */ nop +/* C3E68 8012D768 00000000 */ nop /* C3E6C 8012D76C 4680C620 */ cvt.s.w $f24, $f24 /* C3E70 8012D770 00141400 */ sll $v0, $s4, 0x10 /* C3E74 8012D774 0002B403 */ sra $s6, $v0, 0x10 /* C3E78 8012D778 4496B000 */ mtc1 $s6, $f22 -/* C3E7C 8012D77C 00000000 */ nop +/* C3E7C 8012D77C 00000000 */ nop /* C3E80 8012D780 4680B5A0 */ cvt.s.w $f22, $f22 /* C3E84 8012D784 4406C000 */ mfc1 $a2, $f24 /* C3E88 8012D788 4407B000 */ mfc1 $a3, $f22 /* C3E8C 8012D78C 8622050A */ lh $v0, 0x50a($s1) /* C3E90 8012D790 8623050C */ lh $v1, 0x50c($s1) /* C3E94 8012D794 44826000 */ mtc1 $v0, $f12 -/* C3E98 8012D798 00000000 */ nop +/* C3E98 8012D798 00000000 */ nop /* C3E9C 8012D79C 46806320 */ cvt.s.w $f12, $f12 /* C3EA0 8012D7A0 44837000 */ mtc1 $v1, $f14 -/* C3EA4 8012D7A4 00000000 */ nop +/* C3EA4 8012D7A4 00000000 */ nop /* C3EA8 8012D7A8 468073A0 */ cvt.s.w $f14, $f14 /* C3EAC 8012D7AC 0C00A7B5 */ jal dist2D /* C3EB0 8012D7B0 2655FFF7 */ addiu $s5, $s2, -9 @@ -284,18 +284,18 @@ glabel func_8012D3DC /* C3EF8 8012D7F8 8622050A */ lh $v0, 0x50a($s1) /* C3EFC 8012D7FC 8623050C */ lh $v1, 0x50c($s1) /* C3F00 8012D800 44822000 */ mtc1 $v0, $f4 -/* C3F04 8012D804 00000000 */ nop +/* C3F04 8012D804 00000000 */ nop /* C3F08 8012D808 46802120 */ cvt.s.w $f4, $f4 /* C3F0C 8012D80C 44062000 */ mfc1 $a2, $f4 /* C3F10 8012D810 44832000 */ mtc1 $v1, $f4 -/* C3F14 8012D814 00000000 */ nop +/* C3F14 8012D814 00000000 */ nop /* C3F18 8012D818 46802120 */ cvt.s.w $f4, $f4 /* C3F1C 8012D81C 44072000 */ mfc1 $a3, $f4 /* C3F20 8012D820 0C00A720 */ jal atan2 /* C3F24 8012D824 4600B386 */ mov.s $f14, $f22 /* C3F28 8012D828 4600010D */ trunc.w.s $f4, $f0 /* C3F2C 8012D82C 44102000 */ mfc1 $s0, $f4 -/* C3F30 8012D830 00000000 */ nop +/* C3F30 8012D830 00000000 */ nop /* C3F34 8012D834 2610FF4C */ addiu $s0, $s0, -0xb4 /* C3F38 8012D838 06010002 */ bgez $s0, .L8012D844 /* C3F3C 8012D83C 0200102D */ daddu $v0, $s0, $zero @@ -361,16 +361,16 @@ glabel func_8012D3DC /* C4028 8012D928 24620010 */ addiu $v0, $v1, 0x10 /* C402C 8012D92C 44051000 */ mfc1 $a1, $f2 /* C4030 8012D930 44971000 */ mtc1 $s7, $f2 -/* C4034 8012D934 00000000 */ nop +/* C4034 8012D934 00000000 */ nop /* C4038 8012D938 468010A0 */ cvt.s.w $f2, $f2 /* C403C 8012D93C 46141502 */ mul.s $f20, $f2, $f20 -/* C4040 8012D940 00000000 */ nop +/* C4040 8012D940 00000000 */ nop /* C4044 8012D944 AE020000 */ sw $v0, ($s0) /* C4048 8012D948 24620018 */ addiu $v0, $v1, 0x18 /* C404C 8012D94C AE020000 */ sw $v0, ($s0) /* C4050 8012D950 24620020 */ addiu $v0, $v1, 0x20 /* C4054 8012D954 46001082 */ mul.s $f2, $f2, $f0 -/* C4058 8012D958 00000000 */ nop +/* C4058 8012D958 00000000 */ nop /* C405C 8012D95C AE020000 */ sw $v0, ($s0) /* C4060 8012D960 24620028 */ addiu $v0, $v1, 0x28 /* C4064 8012D964 AE020000 */ sw $v0, ($s0) @@ -385,7 +385,7 @@ glabel func_8012D3DC /* C4088 8012D988 44082000 */ mfc1 $t0, $f4 /* C408C 8012D98C 4600110D */ trunc.w.s $f4, $f2 /* C4090 8012D990 44022000 */ mfc1 $v0, $f4 -/* C4094 8012D994 00000000 */ nop +/* C4094 8012D994 00000000 */ nop /* C4098 8012D998 00021400 */ sll $v0, $v0, 0x10 /* C409C 8012D99C 00021403 */ sra $v0, $v0, 0x10 /* C40A0 8012D9A0 00021023 */ negu $v0, $v0 diff --git a/asm/nonmatchings/code_B9D60/func_8012DB58.s b/asm/nonmatchings/code_B9D60/func_8012DB58.s index 110615eade..7e49a687e8 100644 --- a/asm/nonmatchings/code_B9D60/func_8012DB58.s +++ b/asm/nonmatchings/code_B9D60/func_8012DB58.s @@ -19,7 +19,7 @@ glabel func_8012DB58 /* C4290 8012DB90 00E0802D */ daddu $s0, $a3, $zero /* C4294 8012DB94 2A020010 */ slti $v0, $s0, 0x10 /* C4298 8012DB98 1440034B */ bnez $v0, .L8012E8C8 -/* C429C 8012DB9C 00000000 */ nop +/* C429C 8012DB9C 00000000 */ nop /* C42A0 8012DBA0 12600005 */ beqz $s3, .L8012DBB8 /* C42A4 8012DBA4 3C03E300 */ lui $v1, 0xe300 /* C42A8 8012DBA8 15800004 */ bnez $t4, .L8012DBBC @@ -90,7 +90,7 @@ glabel func_8012DB58 /* C43A0 8012DCA0 1242005D */ beq $s2, $v0, .L8012DE18 /* C43A4 8012DCA4 2B220020 */ slti $v0, $t9, 0x20 /* C43A8 8012DCA8 0804B88C */ j .L8012E230 -/* C43AC 8012DCAC 00000000 */ nop +/* C43AC 8012DCAC 00000000 */ nop .L8012DCB0: /* C43B0 8012DCB0 3C02802F */ lui $v0, %hi(D_802EC3F8) /* C43B4 8012DCB4 9442C3F8 */ lhu $v0, %lo(D_802EC3F8)($v0) diff --git a/asm/nonmatchings/code_B9D60/func_8012E8E0.s b/asm/nonmatchings/code_B9D60/func_8012E8E0.s index 3e49c1b716..3923f68571 100644 --- a/asm/nonmatchings/code_B9D60/func_8012E8E0.s +++ b/asm/nonmatchings/code_B9D60/func_8012E8E0.s @@ -49,4 +49,4 @@ glabel func_8012E8E0 /* C5090 8012E990 8FB00018 */ lw $s0, 0x18($sp) /* C5094 8012E994 03E00008 */ jr $ra /* C5098 8012E998 27BD0020 */ addiu $sp, $sp, 0x20 -/* C509C 8012E99C 00000000 */ nop +/* C509C 8012E99C 00000000 */ nop diff --git a/asm/nonmatchings/code_B9D60/func_8012EC94.s b/asm/nonmatchings/code_B9D60/func_8012EC94.s index 3e206d9e7c..aacb5f7bdd 100644 --- a/asm/nonmatchings/code_B9D60/func_8012EC94.s +++ b/asm/nonmatchings/code_B9D60/func_8012EC94.s @@ -114,7 +114,7 @@ glabel func_8012EC94 /* C5534 8012EE34 87A2000A */ lh $v0, 0xa($sp) /* C5538 8012EE38 004E102A */ slt $v0, $v0, $t6 /* C553C 8012EE3C 1040000A */ beqz $v0, .L8012EE68 -/* C5540 8012EE40 00000000 */ nop +/* C5540 8012EE40 00000000 */ nop /* C5544 8012EE44 97B50016 */ lhu $s5, 0x16($sp) /* C5548 8012EE48 97B6001A */ lhu $s6, 0x1a($sp) /* C554C 8012EE4C 00151400 */ sll $v0, $s5, 0x10 @@ -224,7 +224,7 @@ glabel func_8012EC94 /* C56C8 8012EFC8 01421021 */ addu $v0, $t2, $v0 /* C56CC 8012EFCC 0062182A */ slt $v1, $v1, $v0 /* C56D0 8012EFD0 14600008 */ bnez $v1, .L8012EFF4 -/* C56D4 8012EFD4 00000000 */ nop +/* C56D4 8012EFD4 00000000 */ nop /* C56D8 8012EFD8 240D0001 */ addiu $t5, $zero, 1 /* C56DC 8012EFDC 8FB50034 */ lw $s5, 0x34($sp) /* C56E0 8012EFE0 97B60036 */ lhu $s6, 0x36($sp) @@ -240,7 +240,7 @@ glabel func_8012EC94 /* C5704 8012F004 24420001 */ addiu $v0, $v0, 1 /* C5708 8012F008 0055102B */ sltu $v0, $v0, $s5 /* C570C 8012F00C 14400006 */ bnez $v0, .L8012F028 -/* C5710 8012F010 00000000 */ nop +/* C5710 8012F010 00000000 */ nop /* C5714 8012F014 240D0001 */ addiu $t5, $zero, 1 /* C5718 8012F018 97B6003A */ lhu $s6, 0x3a($sp) /* C571C 8012F01C 97B5003E */ lhu $s5, 0x3e($sp) diff --git a/asm/nonmatchings/code_B9D60/func_8012F500.s b/asm/nonmatchings/code_B9D60/func_8012F500.s index 08f5540b59..f83d3a9182 100644 --- a/asm/nonmatchings/code_B9D60/func_8012F500.s +++ b/asm/nonmatchings/code_B9D60/func_8012F500.s @@ -31,12 +31,12 @@ glabel func_8012F500 /* C5C68 8012F568 A3B50028 */ sb $s5, 0x28($sp) /* C5C6C 8012F56C 97B5009E */ lhu $s5, 0x9e($sp) /* C5C70 8012F570 4622003C */ c.lt.d $f0, $f2 -/* C5C74 8012F574 00000000 */ nop +/* C5C74 8012F574 00000000 */ nop /* C5C78 8012F578 45010046 */ bc1t .L8012F694 /* C5C7C 8012F57C A7B50036 */ sh $s5, 0x36($sp) /* C5C80 8012F580 460051A1 */ cvt.d.s $f6, $f10 /* C5C84 8012F584 4622303C */ c.lt.d $f6, $f2 -/* C5C88 8012F588 00000000 */ nop +/* C5C88 8012F588 00000000 */ nop /* C5C8C 8012F58C 45030214 */ bc1tl .L8012FDE0 /* C5C90 8012F590 0000102D */ daddu $v0, $zero, $zero /* C5C94 8012F594 00021400 */ sll $v0, $v0, 0x10 @@ -54,26 +54,26 @@ glabel func_8012F500 /* C5CC4 8012F5C4 10400206 */ beqz $v0, .L8012FDE0 /* C5CC8 8012F5C8 0000102D */ daddu $v0, $zero, $zero /* C5CCC 8012F5CC 44931000 */ mtc1 $s3, $f2 -/* C5CD0 8012F5D0 00000000 */ nop +/* C5CD0 8012F5D0 00000000 */ nop /* C5CD4 8012F5D4 468010A1 */ cvt.d.w $f2, $f2 /* C5CD8 8012F5D8 44852000 */ mtc1 $a1, $f4 -/* C5CDC 8012F5DC 00000000 */ nop +/* C5CDC 8012F5DC 00000000 */ nop /* C5CE0 8012F5E0 46802120 */ cvt.s.w $f4, $f4 /* C5CE4 8012F5E4 06630007 */ bgezl $s3, .L8012F604 /* C5CE8 8012F5E8 46201020 */ cvt.s.d $f0, $f2 /* C5CEC 8012F5EC 3C0141F0 */ lui $at, 0x41f0 /* C5CF0 8012F5F0 44810800 */ mtc1 $at, $f1 /* C5CF4 8012F5F4 44800000 */ mtc1 $zero, $f0 -/* C5CF8 8012F5F8 00000000 */ nop +/* C5CF8 8012F5F8 00000000 */ nop /* C5CFC 8012F5FC 46201080 */ add.d $f2, $f2, $f0 /* C5D00 8012F600 46201020 */ cvt.s.d $f0, $f2 .L8012F604: /* C5D04 8012F604 46080002 */ mul.s $f0, $f0, $f8 -/* C5D08 8012F608 00000000 */ nop +/* C5D08 8012F608 00000000 */ nop /* C5D0C 8012F60C 46002000 */ add.s $f0, $f4, $f0 /* C5D10 8012F610 4600050D */ trunc.w.s $f20, $f0 /* C5D14 8012F614 4402A000 */ mfc1 $v0, $f20 -/* C5D18 8012F618 00000000 */ nop +/* C5D18 8012F618 00000000 */ nop /* C5D1C 8012F61C 00021400 */ sll $v0, $v0, 0x10 /* C5D20 8012F620 00021403 */ sra $v0, $v0, 0x10 /* C5D24 8012F624 00C2102A */ slt $v0, $a2, $v0 @@ -83,23 +83,23 @@ glabel func_8012F500 /* C5D34 8012F634 468010A1 */ cvt.d.w $f2, $f2 /* C5D38 8012F638 8FB50080 */ lw $s5, 0x80($sp) /* C5D3C 8012F63C 44842000 */ mtc1 $a0, $f4 -/* C5D40 8012F640 00000000 */ nop +/* C5D40 8012F640 00000000 */ nop /* C5D44 8012F644 46802120 */ cvt.s.w $f4, $f4 /* C5D48 8012F648 06A30007 */ bgezl $s5, .L8012F668 /* C5D4C 8012F64C 46201020 */ cvt.s.d $f0, $f2 /* C5D50 8012F650 3C0141F0 */ lui $at, 0x41f0 /* C5D54 8012F654 44810800 */ mtc1 $at, $f1 /* C5D58 8012F658 44800000 */ mtc1 $zero, $f0 -/* C5D5C 8012F65C 00000000 */ nop +/* C5D5C 8012F65C 00000000 */ nop /* C5D60 8012F660 46201080 */ add.d $f2, $f2, $f0 /* C5D64 8012F664 46201020 */ cvt.s.d $f0, $f2 .L8012F668: /* C5D68 8012F668 460A0002 */ mul.s $f0, $f0, $f10 -/* C5D6C 8012F66C 00000000 */ nop +/* C5D6C 8012F66C 00000000 */ nop /* C5D70 8012F670 46002000 */ add.s $f0, $f4, $f0 /* C5D74 8012F674 4600050D */ trunc.w.s $f20, $f0 /* C5D78 8012F678 4402A000 */ mfc1 $v0, $f20 -/* C5D7C 8012F67C 00000000 */ nop +/* C5D7C 8012F67C 00000000 */ nop /* C5D80 8012F680 00021400 */ sll $v0, $v0, 0x10 /* C5D84 8012F684 00021403 */ sra $v0, $v0, 0x10 /* C5D88 8012F688 0062102A */ slt $v0, $v1, $v0 @@ -120,7 +120,7 @@ glabel func_8012F500 /* C5DB8 8012F6B8 44802000 */ mtc1 $zero, $f4 /* C5DBC 8012F6BC 00E0A02D */ daddu $s4, $a3, $zero /* C5DC0 8012F6C0 46243102 */ mul.d $f4, $f6, $f4 -/* C5DC4 8012F6C4 00000000 */ nop +/* C5DC4 8012F6C4 00000000 */ nop /* C5DC8 8012F6C8 00A0802D */ daddu $s0, $a1, $zero /* C5DCC 8012F6CC 3C014200 */ lui $at, 0x4200 /* C5DD0 8012F6D0 44817000 */ mtc1 $at, $f14 @@ -135,14 +135,14 @@ glabel func_8012F500 /* C5DF4 8012F6F4 44813000 */ mtc1 $at, $f6 /* C5DF8 8012F6F8 46081003 */ div.s $f0, $f2, $f8 /* C5DFC 8012F6FC 46060002 */ mul.s $f0, $f0, $f6 -/* C5E00 8012F700 00000000 */ nop +/* C5E00 8012F700 00000000 */ nop /* C5E04 8012F704 3C014280 */ lui $at, 0x4280 /* C5E08 8012F708 44818000 */ mtc1 $at, $f16 /* C5E0C 8012F70C 00C0502D */ daddu $t2, $a2, $zero /* C5E10 8012F710 AFA2003C */ sw $v0, 0x3c($sp) /* C5E14 8012F714 460A1083 */ div.s $f2, $f2, $f10 /* C5E18 8012F718 46061082 */ mul.s $f2, $f2, $f6 -/* C5E1C 8012F71C 00000000 */ nop +/* C5E1C 8012F71C 00000000 */ nop /* C5E20 8012F720 AFA00004 */ sw $zero, 4($sp) /* C5E24 8012F724 AFB70014 */ sw $s7, 0x14($sp) /* C5E28 8012F728 4600050D */ trunc.w.s $f20, $f0 @@ -162,26 +162,26 @@ glabel func_8012F500 /* C5E5C 8012F75C AFA2000C */ sw $v0, 0xc($sp) /* C5E60 8012F760 4620050D */ trunc.w.d $f20, $f0 /* C5E64 8012F764 4402A000 */ mfc1 $v0, $f20 -/* C5E68 8012F768 00000000 */ nop +/* C5E68 8012F768 00000000 */ nop /* C5E6C 8012F76C AFA2001C */ sw $v0, 0x1c($sp) /* C5E70 8012F770 01C2102A */ slt $v0, $t6, $v0 /* C5E74 8012F774 14400014 */ bnez $v0, .L8012F7C8 /* C5E78 8012F778 0000902D */ daddu $s2, $zero, $zero /* C5E7C 8012F77C 460E5082 */ mul.s $f2, $f10, $f14 -/* C5E80 8012F780 00000000 */ nop +/* C5E80 8012F780 00000000 */ nop .L8012F784: /* C5E84 8012F784 8FA40004 */ lw $a0, 4($sp) /* C5E88 8012F788 8FA2001C */ lw $v0, 0x1c($sp) /* C5E8C 8012F78C 24830020 */ addiu $v1, $a0, 0x20 /* C5E90 8012F790 44820000 */ mtc1 $v0, $f0 -/* C5E94 8012F794 00000000 */ nop +/* C5E94 8012F794 00000000 */ nop /* C5E98 8012F798 46800020 */ cvt.s.w $f0, $f0 /* C5E9C 8012F79C 46020000 */ add.s $f0, $f0, $f2 /* C5EA0 8012F7A0 AFA30004 */ sw $v1, 4($sp) /* C5EA4 8012F7A4 AFA20014 */ sw $v0, 0x14($sp) /* C5EA8 8012F7A8 4600050D */ trunc.w.s $f20, $f0 /* C5EAC 8012F7AC 4402A000 */ mfc1 $v0, $f20 -/* C5EB0 8012F7B0 00000000 */ nop +/* C5EB0 8012F7B0 00000000 */ nop /* C5EB4 8012F7B4 AFA2001C */ sw $v0, 0x1c($sp) /* C5EB8 8012F7B8 004E102A */ slt $v0, $v0, $t6 /* C5EBC 8012F7BC 1440FFF1 */ bnez $v0, .L8012F784 @@ -191,12 +191,12 @@ glabel func_8012F500 /* C5EC8 8012F7C8 8FA20014 */ lw $v0, 0x14($sp) /* C5ECC 8012F7CC 004E102A */ slt $v0, $v0, $t6 /* C5ED0 8012F7D0 10400009 */ beqz $v0, .L8012F7F8 -/* C5ED4 8012F7D4 00000000 */ nop +/* C5ED4 8012F7D4 00000000 */ nop /* C5ED8 8012F7D8 C7A0003C */ lwc1 $f0, 0x3c($sp) /* C5EDC 8012F7DC 46800020 */ cvt.s.w $f0, $f0 /* C5EE0 8012F7E0 460A0003 */ div.s $f0, $f0, $f10 /* C5EE4 8012F7E4 460E0002 */ mul.s $f0, $f0, $f14 -/* C5EE8 8012F7E8 00000000 */ nop +/* C5EE8 8012F7E8 00000000 */ nop /* C5EEC 8012F7EC AFAE0014 */ sw $t6, 0x14($sp) /* C5EF0 8012F7F0 4600050D */ trunc.w.s $f20, $f0 /* C5EF4 8012F7F4 4412A000 */ mfc1 $s2, $f20 @@ -208,18 +208,18 @@ glabel func_8012F500 /* C5F08 8012F808 14400014 */ bnez $v0, .L8012F85C /* C5F0C 8012F80C 26A3FFFF */ addiu $v1, $s5, -1 /* C5F10 8012F810 44830000 */ mtc1 $v1, $f0 -/* C5F14 8012F814 00000000 */ nop +/* C5F14 8012F814 00000000 */ nop /* C5F18 8012F818 46800020 */ cvt.s.w $f0, $f0 /* C5F1C 8012F81C 460A0002 */ mul.s $f0, $f0, $f10 -/* C5F20 8012F820 00000000 */ nop +/* C5F20 8012F820 00000000 */ nop /* C5F24 8012F824 4600050D */ trunc.w.s $f20, $f0 /* C5F28 8012F828 4402A000 */ mfc1 $v0, $f20 -/* C5F2C 8012F82C 00000000 */ nop +/* C5F2C 8012F82C 00000000 */ nop /* C5F30 8012F830 00021400 */ sll $v0, $v0, 0x10 /* C5F34 8012F834 00021403 */ sra $v0, $v0, 0x10 /* C5F38 8012F838 02E21021 */ addu $v0, $s7, $v0 /* C5F3C 8012F83C 44820000 */ mtc1 $v0, $f0 -/* C5F40 8012F840 00000000 */ nop +/* C5F40 8012F840 00000000 */ nop /* C5F44 8012F844 46800020 */ cvt.s.w $f0, $f0 /* C5F48 8012F848 460A0000 */ add.s $f0, $f0, $f10 /* C5F4C 8012F84C AFA3000C */ sw $v1, 0xc($sp) @@ -250,7 +250,7 @@ glabel func_8012F500 /* C5FA4 8012F8A4 93AF0028 */ lbu $t7, 0x28($sp) /* C5FA8 8012F8A8 93B50027 */ lbu $s5, 0x27($sp) /* C5FAC 8012F8AC 46320002 */ mul.d $f0, $f0, $f18 -/* C5FB0 8012F8B0 00000000 */ nop +/* C5FB0 8012F8B0 00000000 */ nop /* C5FB4 8012F8B4 AFA00000 */ sw $zero, ($sp) /* C5FB8 8012F8B8 AFB00010 */ sw $s0, 0x10($sp) /* C5FBC 8012F8BC 0142C021 */ addu $t8, $t2, $v0 @@ -268,26 +268,26 @@ glabel func_8012F500 /* C5FE8 8012F8E8 AFA20008 */ sw $v0, 8($sp) /* C5FEC 8012F8EC 4620050D */ trunc.w.d $f20, $f0 /* C5FF0 8012F8F0 4402A000 */ mfc1 $v0, $f20 -/* C5FF4 8012F8F4 00000000 */ nop +/* C5FF4 8012F8F4 00000000 */ nop /* C5FF8 8012F8F8 AFA20018 */ sw $v0, 0x18($sp) /* C5FFC 8012F8FC 0142102A */ slt $v0, $t2, $v0 /* C6000 8012F900 14400014 */ bnez $v0, .L8012F954 /* C6004 8012F904 0000682D */ daddu $t5, $zero, $zero /* C6008 8012F908 46104082 */ mul.s $f2, $f8, $f16 -/* C600C 8012F90C 00000000 */ nop +/* C600C 8012F90C 00000000 */ nop .L8012F910: /* C6010 8012F910 8FA40000 */ lw $a0, ($sp) /* C6014 8012F914 8FA30018 */ lw $v1, 0x18($sp) /* C6018 8012F918 24820040 */ addiu $v0, $a0, 0x40 /* C601C 8012F91C 44830000 */ mtc1 $v1, $f0 -/* C6020 8012F920 00000000 */ nop +/* C6020 8012F920 00000000 */ nop /* C6024 8012F924 46800020 */ cvt.s.w $f0, $f0 /* C6028 8012F928 46020000 */ add.s $f0, $f0, $f2 /* C602C 8012F92C AFA20000 */ sw $v0, ($sp) /* C6030 8012F930 AFA30010 */ sw $v1, 0x10($sp) /* C6034 8012F934 4600050D */ trunc.w.s $f20, $f0 /* C6038 8012F938 4402A000 */ mfc1 $v0, $f20 -/* C603C 8012F93C 00000000 */ nop +/* C603C 8012F93C 00000000 */ nop /* C6040 8012F940 AFA20018 */ sw $v0, 0x18($sp) /* C6044 8012F944 004A102A */ slt $v0, $v0, $t2 /* C6048 8012F948 1440FFF1 */ bnez $v0, .L8012F910 @@ -297,13 +297,13 @@ glabel func_8012F500 /* C6054 8012F954 8FA20010 */ lw $v0, 0x10($sp) /* C6058 8012F958 004A102A */ slt $v0, $v0, $t2 /* C605C 8012F95C 1040000A */ beqz $v0, .L8012F988 -/* C6060 8012F960 00000000 */ nop +/* C6060 8012F960 00000000 */ nop /* C6064 8012F964 44960000 */ mtc1 $s6, $f0 -/* C6068 8012F968 00000000 */ nop +/* C6068 8012F968 00000000 */ nop /* C606C 8012F96C 46800020 */ cvt.s.w $f0, $f0 /* C6070 8012F970 46080003 */ div.s $f0, $f0, $f8 /* C6074 8012F974 460E0002 */ mul.s $f0, $f0, $f14 -/* C6078 8012F978 00000000 */ nop +/* C6078 8012F978 00000000 */ nop /* C607C 8012F97C AFAA0010 */ sw $t2, 0x10($sp) /* C6080 8012F980 4600050D */ trunc.w.s $f20, $f0 /* C6084 8012F984 440DA000 */ mfc1 $t5, $f20 @@ -312,20 +312,20 @@ glabel func_8012F500 /* C608C 8012F98C 24420001 */ addiu $v0, $v0, 1 /* C6090 8012F990 0053102B */ sltu $v0, $v0, $s3 /* C6094 8012F994 14400016 */ bnez $v0, .L8012F9F0 -/* C6098 8012F998 00000000 */ nop +/* C6098 8012F998 00000000 */ nop /* C609C 8012F99C 448C0000 */ mtc1 $t4, $f0 -/* C60A0 8012F9A0 00000000 */ nop +/* C60A0 8012F9A0 00000000 */ nop /* C60A4 8012F9A4 46800020 */ cvt.s.w $f0, $f0 /* C60A8 8012F9A8 46080002 */ mul.s $f0, $f0, $f8 -/* C60AC 8012F9AC 00000000 */ nop +/* C60AC 8012F9AC 00000000 */ nop /* C60B0 8012F9B0 4600050D */ trunc.w.s $f20, $f0 /* C60B4 8012F9B4 4402A000 */ mfc1 $v0, $f20 -/* C60B8 8012F9B8 00000000 */ nop +/* C60B8 8012F9B8 00000000 */ nop /* C60BC 8012F9BC 00021400 */ sll $v0, $v0, 0x10 /* C60C0 8012F9C0 00021403 */ sra $v0, $v0, 0x10 /* C60C4 8012F9C4 02021021 */ addu $v0, $s0, $v0 /* C60C8 8012F9C8 44820000 */ mtc1 $v0, $f0 -/* C60CC 8012F9CC 00000000 */ nop +/* C60CC 8012F9CC 00000000 */ nop /* C60D0 8012F9D0 46800020 */ cvt.s.w $f0, $f0 /* C60D4 8012F9D4 46080000 */ add.s $f0, $f0, $f8 /* C60D8 8012F9D8 46000021 */ cvt.d.s $f0, $f0 diff --git a/asm/nonmatchings/code_B9D60/func_8012FE10.s b/asm/nonmatchings/code_B9D60/func_8012FE10.s index 78daa8dc4f..1225195b13 100644 --- a/asm/nonmatchings/code_B9D60/func_8012FE10.s +++ b/asm/nonmatchings/code_B9D60/func_8012FE10.s @@ -3,7 +3,7 @@ glabel func_8012FE10 /* C6510 8012FE10 44841000 */ mtc1 $a0, $f2 -/* C6514 8012FE14 00000000 */ nop +/* C6514 8012FE14 00000000 */ nop /* C6518 8012FE18 468010A0 */ cvt.s.w $f2, $f2 /* C651C 8012FE1C 24020001 */ addiu $v0, $zero, 1 /* C6520 8012FE20 3C0141F0 */ lui $at, 0x41f0 @@ -14,7 +14,7 @@ glabel func_8012FE10 /* C6534 8012FE34 44802000 */ mtc1 $zero, $f4 .L8012FE38: /* C6538 8012FE38 44850000 */ mtc1 $a1, $f0 -/* C653C 8012FE3C 00000000 */ nop +/* C653C 8012FE3C 00000000 */ nop /* C6540 8012FE40 46800021 */ cvt.d.w $f0, $f0 /* C6544 8012FE44 04A20001 */ bltzl $a1, .L8012FE4C /* C6548 8012FE48 46260000 */ add.d $f0, $f0, $f6 @@ -23,11 +23,11 @@ glabel func_8012FE10 /* C6550 8012FE50 46001083 */ div.s $f2, $f2, $f0 /* C6554 8012FE54 46001021 */ cvt.d.s $f0, $f2 /* C6558 8012FE58 4624003E */ c.le.d $f0, $f4 -/* C655C 8012FE5C 00000000 */ nop +/* C655C 8012FE5C 00000000 */ nop /* C6560 8012FE60 45010003 */ bc1t .L8012FE70 -/* C6564 8012FE64 00000000 */ nop +/* C6564 8012FE64 00000000 */ nop /* C6568 8012FE68 0804BF8E */ j .L8012FE38 /* C656C 8012FE6C 24420001 */ addiu $v0, $v0, 1 .L8012FE70: /* C6570 8012FE70 03E00008 */ jr $ra -/* C6574 8012FE74 00000000 */ nop +/* C6574 8012FE74 00000000 */ nop diff --git a/asm/nonmatchings/code_B9D60/func_8012FE78.s b/asm/nonmatchings/code_B9D60/func_8012FE78.s index 18b423b03a..7849eedfd4 100644 --- a/asm/nonmatchings/code_B9D60/func_8012FE78.s +++ b/asm/nonmatchings/code_B9D60/func_8012FE78.s @@ -39,7 +39,7 @@ glabel func_8012FE78 /* C6600 8012FF00 A7B7005E */ sh $s7, 0x5e($sp) /* C6604 8012FF04 4600A021 */ cvt.d.s $f0, $f20 /* C6608 8012FF08 4622003C */ c.lt.d $f0, $f2 -/* C660C 8012FF0C 00000000 */ nop +/* C660C 8012FF0C 00000000 */ nop /* C6610 8012FF10 450302A9 */ bc1tl .L801309B8 /* C6614 8012FF14 0000102D */ daddu $v0, $zero, $zero /* C6618 8012FF18 00021400 */ sll $v0, $v0, 0x10 @@ -57,52 +57,52 @@ glabel func_8012FE78 /* C6648 8012FF48 1040029B */ beqz $v0, .L801309B8 /* C664C 8012FF4C 0000102D */ daddu $v0, $zero, $zero /* C6650 8012FF50 44941000 */ mtc1 $s4, $f2 -/* C6654 8012FF54 00000000 */ nop +/* C6654 8012FF54 00000000 */ nop /* C6658 8012FF58 468010A1 */ cvt.d.w $f2, $f2 /* C665C 8012FF5C 44832000 */ mtc1 $v1, $f4 -/* C6660 8012FF60 00000000 */ nop +/* C6660 8012FF60 00000000 */ nop /* C6664 8012FF64 46802120 */ cvt.s.w $f4, $f4 /* C6668 8012FF68 06830007 */ bgezl $s4, .L8012FF88 /* C666C 8012FF6C 46201020 */ cvt.s.d $f0, $f2 /* C6670 8012FF70 3C0141F0 */ lui $at, 0x41f0 /* C6674 8012FF74 44810800 */ mtc1 $at, $f1 /* C6678 8012FF78 44800000 */ mtc1 $zero, $f0 -/* C667C 8012FF7C 00000000 */ nop +/* C667C 8012FF7C 00000000 */ nop /* C6680 8012FF80 46201080 */ add.d $f2, $f2, $f0 /* C6684 8012FF84 46201020 */ cvt.s.d $f0, $f2 .L8012FF88: /* C6688 8012FF88 46160002 */ mul.s $f0, $f0, $f22 -/* C668C 8012FF8C 00000000 */ nop +/* C668C 8012FF8C 00000000 */ nop /* C6690 8012FF90 46002000 */ add.s $f0, $f4, $f0 /* C6694 8012FF94 4600020D */ trunc.w.s $f8, $f0 /* C6698 8012FF98 44024000 */ mfc1 $v0, $f8 -/* C669C 8012FF9C 00000000 */ nop +/* C669C 8012FF9C 00000000 */ nop /* C66A0 8012FFA0 00021400 */ sll $v0, $v0, 0x10 /* C66A4 8012FFA4 00021403 */ sra $v0, $v0, 0x10 /* C66A8 8012FFA8 00A2102A */ slt $v0, $a1, $v0 /* C66AC 8012FFAC 10400282 */ beqz $v0, .L801309B8 /* C66B0 8012FFB0 0000102D */ daddu $v0, $zero, $zero /* C66B4 8012FFB4 44931000 */ mtc1 $s3, $f2 -/* C66B8 8012FFB8 00000000 */ nop +/* C66B8 8012FFB8 00000000 */ nop /* C66BC 8012FFBC 468010A1 */ cvt.d.w $f2, $f2 /* C66C0 8012FFC0 44842000 */ mtc1 $a0, $f4 -/* C66C4 8012FFC4 00000000 */ nop +/* C66C4 8012FFC4 00000000 */ nop /* C66C8 8012FFC8 46802120 */ cvt.s.w $f4, $f4 /* C66CC 8012FFCC 06630007 */ bgezl $s3, .L8012FFEC /* C66D0 8012FFD0 46201020 */ cvt.s.d $f0, $f2 /* C66D4 8012FFD4 3C0141F0 */ lui $at, 0x41f0 /* C66D8 8012FFD8 44810800 */ mtc1 $at, $f1 /* C66DC 8012FFDC 44800000 */ mtc1 $zero, $f0 -/* C66E0 8012FFE0 00000000 */ nop +/* C66E0 8012FFE0 00000000 */ nop /* C66E4 8012FFE4 46201080 */ add.d $f2, $f2, $f0 /* C66E8 8012FFE8 46201020 */ cvt.s.d $f0, $f2 .L8012FFEC: /* C66EC 8012FFEC 46140002 */ mul.s $f0, $f0, $f20 -/* C66F0 8012FFF0 00000000 */ nop +/* C66F0 8012FFF0 00000000 */ nop /* C66F4 8012FFF4 46002000 */ add.s $f0, $f4, $f0 /* C66F8 8012FFF8 4600020D */ trunc.w.s $f8, $f0 /* C66FC 8012FFFC 44024000 */ mfc1 $v0, $f8 -/* C6700 80130000 00000000 */ nop +/* C6700 80130000 00000000 */ nop /* C6704 80130004 00021400 */ sll $v0, $v0, 0x10 /* C6708 80130008 00021403 */ sra $v0, $v0, 0x10 /* C670C 8013000C 00C2102A */ slt $v0, $a2, $v0 @@ -121,7 +121,7 @@ glabel func_8012FE78 /* C6740 80130040 1062000A */ beq $v1, $v0, .L8013006C /* C6744 80130044 0000102D */ daddu $v0, $zero, $zero /* C6748 80130048 0804C26E */ j .L801309B8 -/* C674C 8013004C 00000000 */ nop +/* C674C 8013004C 00000000 */ nop .L80130050: /* C6750 80130050 1462000D */ bne $v1, $v0, .L80130088 /* C6754 80130054 24020002 */ addiu $v0, $zero, 2 @@ -138,7 +138,7 @@ glabel func_8012FE78 /* C6778 80130078 1062000A */ beq $v1, $v0, .L801300A4 /* C677C 8013007C 0000102D */ daddu $v0, $zero, $zero /* C6780 80130080 0804C26E */ j .L801309B8 -/* C6784 80130084 00000000 */ nop +/* C6784 80130084 00000000 */ nop .L80130088: /* C6788 80130088 14620008 */ bne $v1, $v0, .L801300AC /* C678C 8013008C 24020003 */ addiu $v0, $zero, 3 @@ -169,10 +169,10 @@ glabel func_8012FE78 /* C67E0 801300E0 44812000 */ mtc1 $at, $f4 /* C67E4 801300E4 46160083 */ div.s $f2, $f0, $f22 /* C67E8 801300E8 46041082 */ mul.s $f2, $f2, $f4 -/* C67EC 801300EC 00000000 */ nop +/* C67EC 801300EC 00000000 */ nop /* C67F0 801300F0 46140003 */ div.s $f0, $f0, $f20 /* C67F4 801300F4 46040002 */ mul.s $f0, $f0, $f4 -/* C67F8 801300F8 00000000 */ nop +/* C67F8 801300F8 00000000 */ nop /* C67FC 801300FC 4600120D */ trunc.w.s $f8, $f2 /* C6800 80130100 E7A8004C */ swc1 $f8, 0x4c($sp) /* C6804 80130104 4600020D */ trunc.w.s $f8, $f0 @@ -184,7 +184,7 @@ glabel func_8012FE78 /* C681C 8013011C 0260882D */ daddu $s1, $s3, $zero /* C6820 80130120 2C620002 */ sltiu $v0, $v1, 2 /* C6824 80130124 10400003 */ beqz $v0, .L80130134 -/* C6828 80130128 00000000 */ nop +/* C6828 80130128 00000000 */ nop .L8013012C: /* C682C 8013012C 0804C26E */ j .L801309B8 /* C6830 80130130 0000102D */ daddu $v0, $zero, $zero @@ -194,17 +194,17 @@ glabel func_8012FE78 /* C683C 8013013C 44801000 */ mtc1 $zero, $f2 /* C6840 80130140 4600A021 */ cvt.d.s $f0, $f20 /* C6844 80130144 4622003E */ c.le.d $f0, $f2 -/* C6848 80130148 00000000 */ nop +/* C6848 80130148 00000000 */ nop /* C684C 8013014C 45000003 */ bc1f .L8013015C -/* C6850 80130150 00000000 */ nop +/* C6850 80130150 00000000 */ nop /* C6854 80130154 0804C068 */ j .L801301A0 /* C6858 80130158 A7A00048 */ sh $zero, 0x48($sp) .L8013015C: /* C685C 8013015C 3C014F00 */ lui $at, 0x4f00 /* C6860 80130160 44810000 */ mtc1 $at, $f0 -/* C6864 80130164 00000000 */ nop +/* C6864 80130164 00000000 */ nop /* C6868 80130168 4614003E */ c.le.s $f0, $f20 -/* C686C 8013016C 00000000 */ nop +/* C686C 8013016C 00000000 */ nop /* C6870 80130170 45030005 */ bc1tl .L80130188 /* C6874 80130174 4600A001 */ sub.s $f0, $f20, $f0 /* C6878 80130178 4600A20D */ trunc.w.s $f8, $f20 @@ -215,7 +215,7 @@ glabel func_8012FE78 /* C6888 80130188 3C028000 */ lui $v0, 0x8000 /* C688C 8013018C 4600020D */ trunc.w.s $f8, $f0 /* C6890 80130190 44034000 */ mfc1 $v1, $f8 -/* C6894 80130194 00000000 */ nop +/* C6894 80130194 00000000 */ nop /* C6898 80130198 00621825 */ or $v1, $v1, $v0 /* C689C 8013019C A7A30048 */ sh $v1, 0x48($sp) .L801301A0: @@ -244,12 +244,12 @@ glabel func_8012FE78 /* C68F8 801301F8 2697FFFF */ addiu $s7, $s4, -1 /* C68FC 801301FC 3229FFFF */ andi $t1, $s1, 0xffff /* C6900 80130200 44890000 */ mtc1 $t1, $f0 -/* C6904 80130204 00000000 */ nop +/* C6904 80130204 00000000 */ nop /* C6908 80130208 46800020 */ cvt.s.w $f0, $f0 /* C690C 8013020C 97A3005E */ lhu $v1, 0x5e($sp) /* C6910 80130210 93AE0030 */ lbu $t6, 0x30($sp) /* C6914 80130214 46140182 */ mul.s $f6, $f0, $f20 -/* C6918 80130218 00000000 */ nop +/* C6918 80130218 00000000 */ nop /* C691C 8013021C AFB7005C */ sw $s7, 0x5c($sp) /* C6920 80130220 AFA00010 */ sw $zero, 0x10($sp) /* C6924 80130224 AFA00014 */ sw $zero, 0x14($sp) @@ -273,7 +273,7 @@ glabel func_8012FE78 /* C696C 8013026C AFA20024 */ sw $v0, 0x24($sp) .L80130270: /* C6970 80130270 44941000 */ mtc1 $s4, $f2 -/* C6974 80130274 00000000 */ nop +/* C6974 80130274 00000000 */ nop /* C6978 80130278 468010A1 */ cvt.d.w $f2, $f2 /* C697C 8013027C C7A00024 */ lwc1 $f0, 0x24($sp) /* C6980 80130280 46800020 */ cvt.s.w $f0, $f0 @@ -293,17 +293,17 @@ glabel func_8012FE78 /* C69B8 801302B8 3C0141F0 */ lui $at, 0x41f0 /* C69BC 801302BC 44810800 */ mtc1 $at, $f1 /* C69C0 801302C0 44800000 */ mtc1 $zero, $f0 -/* C69C4 801302C4 00000000 */ nop +/* C69C4 801302C4 00000000 */ nop /* C69C8 801302C8 46201080 */ add.d $f2, $f2, $f0 .L801302CC: /* C69CC 801302CC 46201020 */ cvt.s.d $f0, $f2 /* C69D0 801302D0 46160002 */ mul.s $f0, $f0, $f22 -/* C69D4 801302D4 00000000 */ nop +/* C69D4 801302D4 00000000 */ nop /* C69D8 801302D8 46002000 */ add.s $f0, $f4, $f0 /* C69DC 801302DC 0000882D */ daddu $s1, $zero, $zero /* C69E0 801302E0 4600020D */ trunc.w.s $f8, $f0 /* C69E4 801302E4 44024000 */ mfc1 $v0, $f8 -/* C69E8 801302E8 00000000 */ nop +/* C69E8 801302E8 00000000 */ nop /* C69EC 801302EC 00021400 */ sll $v0, $v0, 0x10 /* C69F0 801302F0 00021403 */ sra $v0, $v0, 0x10 /* C69F4 801302F4 AFA20028 */ sw $v0, 0x28($sp) @@ -311,23 +311,23 @@ glabel func_8012FE78 /* C69FC 801302FC 14400018 */ bnez $v0, .L80130360 /* C6A00 80130300 0220802D */ daddu $s0, $s1, $zero /* C6A04 80130304 44890000 */ mtc1 $t1, $f0 -/* C6A08 80130308 00000000 */ nop +/* C6A08 80130308 00000000 */ nop /* C6A0C 8013030C 46800020 */ cvt.s.w $f0, $f0 /* C6A10 80130310 46140082 */ mul.s $f2, $f0, $f20 -/* C6A14 80130314 00000000 */ nop +/* C6A14 80130314 00000000 */ nop .L80130318: /* C6A18 80130318 8FA20014 */ lw $v0, 0x14($sp) /* C6A1C 8013031C 8FA3002C */ lw $v1, 0x2c($sp) /* C6A20 80130320 00492021 */ addu $a0, $v0, $t1 /* C6A24 80130324 44830000 */ mtc1 $v1, $f0 -/* C6A28 80130328 00000000 */ nop +/* C6A28 80130328 00000000 */ nop /* C6A2C 8013032C 46800020 */ cvt.s.w $f0, $f0 /* C6A30 80130330 46020000 */ add.s $f0, $f0, $f2 /* C6A34 80130334 AFA40014 */ sw $a0, 0x14($sp) /* C6A38 80130338 AFA30024 */ sw $v1, 0x24($sp) /* C6A3C 8013033C 4600020D */ trunc.w.s $f8, $f0 /* C6A40 80130340 44024000 */ mfc1 $v0, $f8 -/* C6A44 80130344 00000000 */ nop +/* C6A44 80130344 00000000 */ nop /* C6A48 80130348 AFA2002C */ sw $v0, 0x2c($sp) /* C6A4C 8013034C 004A102A */ slt $v0, $v0, $t2 /* C6A50 80130350 1440FFF1 */ bnez $v0, .L80130318 @@ -338,7 +338,7 @@ glabel func_8012FE78 /* C6A60 80130360 8FA20024 */ lw $v0, 0x24($sp) /* C6A64 80130364 004A102A */ slt $v0, $v0, $t2 /* C6A68 80130368 10400012 */ beqz $v0, .L801303B4 -/* C6A6C 8013036C 00000000 */ nop +/* C6A6C 8013036C 00000000 */ nop /* C6A70 80130370 97B70046 */ lhu $s7, 0x46($sp) /* C6A74 80130374 00171400 */ sll $v0, $s7, 0x10 /* C6A78 80130378 00021403 */ sra $v0, $v0, 0x10 @@ -347,13 +347,13 @@ glabel func_8012FE78 /* C6A84 80130384 00021023 */ negu $v0, $v0 .L80130388: /* C6A88 80130388 44821000 */ mtc1 $v0, $f2 -/* C6A8C 8013038C 00000000 */ nop +/* C6A8C 8013038C 00000000 */ nop /* C6A90 80130390 468010A0 */ cvt.s.w $f2, $f2 /* C6A94 80130394 3C014200 */ lui $at, 0x4200 /* C6A98 80130398 44810000 */ mtc1 $at, $f0 /* C6A9C 8013039C 46141083 */ div.s $f2, $f2, $f20 /* C6AA0 801303A0 46001002 */ mul.s $f0, $f2, $f0 -/* C6AA4 801303A4 00000000 */ nop +/* C6AA4 801303A4 00000000 */ nop /* C6AA8 801303A8 AFAA0024 */ sw $t2, 0x24($sp) /* C6AAC 801303AC 4600020D */ trunc.w.s $f8, $f0 /* C6AB0 801303B0 44114000 */ mfc1 $s1, $f8 @@ -368,24 +368,24 @@ glabel func_8012FE78 /* C6ACC 801303CC 10400015 */ beqz $v0, .L80130424 /* C6AD0 801303D0 2662FFFF */ addiu $v0, $s3, -1 /* C6AD4 801303D4 44931000 */ mtc1 $s3, $f2 -/* C6AD8 801303D8 00000000 */ nop +/* C6AD8 801303D8 00000000 */ nop /* C6ADC 801303DC 468010A1 */ cvt.d.w $f2, $f2 /* C6AE0 801303E0 06610006 */ bgez $s3, .L801303FC /* C6AE4 801303E4 AFA2001C */ sw $v0, 0x1c($sp) /* C6AE8 801303E8 3C0141F0 */ lui $at, 0x41f0 /* C6AEC 801303EC 44810800 */ mtc1 $at, $f1 /* C6AF0 801303F0 44800000 */ mtc1 $zero, $f0 -/* C6AF4 801303F4 00000000 */ nop +/* C6AF4 801303F4 00000000 */ nop /* C6AF8 801303F8 46201080 */ add.d $f2, $f2, $f0 .L801303FC: /* C6AFC 801303FC 46201020 */ cvt.s.d $f0, $f2 /* C6B00 80130400 46140002 */ mul.s $f0, $f0, $f20 -/* C6B04 80130404 00000000 */ nop +/* C6B04 80130404 00000000 */ nop /* C6B08 80130408 240B0001 */ addiu $t3, $zero, 1 /* C6B0C 8013040C 8FA20024 */ lw $v0, 0x24($sp) /* C6B10 80130410 4600020D */ trunc.w.s $f8, $f0 /* C6B14 80130414 44034000 */ mfc1 $v1, $f8 -/* C6B18 80130418 00000000 */ nop +/* C6B18 80130418 00000000 */ nop /* C6B1C 8013041C 00431021 */ addu $v0, $v0, $v1 /* C6B20 80130420 AFA2002C */ sw $v0, 0x2c($sp) .L80130424: @@ -405,7 +405,7 @@ glabel func_8012FE78 /* C6B50 80130450 8FA20020 */ lw $v0, 0x20($sp) /* C6B54 80130454 0058102A */ slt $v0, $v0, $t8 /* C6B58 80130458 10400012 */ beqz $v0, .L801304A4 -/* C6B5C 8013045C 00000000 */ nop +/* C6B5C 8013045C 00000000 */ nop /* C6B60 80130460 97B7003E */ lhu $s7, 0x3e($sp) /* C6B64 80130464 00171400 */ sll $v0, $s7, 0x10 /* C6B68 80130468 00021403 */ sra $v0, $v0, 0x10 @@ -414,13 +414,13 @@ glabel func_8012FE78 /* C6B74 80130474 00021023 */ negu $v0, $v0 .L80130478: /* C6B78 80130478 44821000 */ mtc1 $v0, $f2 -/* C6B7C 8013047C 00000000 */ nop +/* C6B7C 8013047C 00000000 */ nop /* C6B80 80130480 468010A0 */ cvt.s.w $f2, $f2 /* C6B84 80130484 3C014200 */ lui $at, 0x4200 /* C6B88 80130488 44810000 */ mtc1 $at, $f0 /* C6B8C 8013048C 46161083 */ div.s $f2, $f2, $f22 /* C6B90 80130490 46001002 */ mul.s $f0, $f2, $f0 -/* C6B94 80130494 00000000 */ nop +/* C6B94 80130494 00000000 */ nop /* C6B98 80130498 AFB80020 */ sw $t8, 0x20($sp) /* C6B9C 8013049C 4600020D */ trunc.w.s $f8, $f0 /* C6BA0 801304A0 44104000 */ mfc1 $s0, $f8 @@ -744,10 +744,10 @@ glabel func_8012FE78 /* C7074 80130974 24020001 */ addiu $v0, $zero, 1 /* C7078 80130978 97A30048 */ lhu $v1, 0x48($sp) /* C707C 8013097C 44830000 */ mtc1 $v1, $f0 -/* C7080 80130980 00000000 */ nop +/* C7080 80130980 00000000 */ nop /* C7084 80130984 46800020 */ cvt.s.w $f0, $f0 /* C7088 80130988 46140002 */ mul.s $f0, $f0, $f20 -/* C708C 8013098C 00000000 */ nop +/* C708C 8013098C 00000000 */ nop /* C7090 80130990 C7A2002C */ lwc1 $f2, 0x2c($sp) /* C7094 80130994 468010A0 */ cvt.s.w $f2, $f2 /* C7098 80130998 8FA20014 */ lw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_B9D60/func_80130A04.s b/asm/nonmatchings/code_B9D60/func_80130A04.s index d829b16015..098add7a59 100644 --- a/asm/nonmatchings/code_B9D60/func_80130A04.s +++ b/asm/nonmatchings/code_B9D60/func_80130A04.s @@ -8,11 +8,12 @@ glabel func_80130A04 /* C7110 80130A10 1040002C */ beqz $v0, .L80130AC4 /* C7114 80130A14 24630004 */ addiu $v1, $v1, 4 /* C7118 80130A18 00051080 */ sll $v0, $a1, 2 -/* C711C 80130A1C 3C018015 */ lui $at, %hi(D_80150A60) +/* C711C 80130A1C 3C018015 */ lui $at, %hi(jtbl_80150A60_E7160) /* C7120 80130A20 00220821 */ addu $at, $at, $v0 -/* C7124 80130A24 8C220A60 */ lw $v0, %lo(D_80150A60)($at) +/* C7124 80130A24 8C220A60 */ lw $v0, %lo(jtbl_80150A60_E7160)($at) /* C7128 80130A28 00400008 */ jr $v0 -/* C712C 80130A2C 00000000 */ nop +/* C712C 80130A2C 00000000 */ nop +glabel L80130A30_C7130 /* C7130 80130A30 8C620000 */ lw $v0, ($v1) /* C7134 80130A34 24630004 */ addiu $v1, $v1, 4 /* C7138 80130A38 AC82003C */ sw $v0, 0x3c($a0) @@ -21,14 +22,17 @@ glabel func_80130A04 /* C7144 80130A44 AC830040 */ sw $v1, 0x40($a0) /* C7148 80130A48 0804C2B1 */ j .L80130AC4 /* C714C 80130A4C AC820044 */ sw $v0, 0x44($a0) +glabel L80130A50_C7150 /* C7150 80130A50 8C830048 */ lw $v1, 0x48($a0) /* C7154 80130A54 24020001 */ addiu $v0, $zero, 1 /* C7158 80130A58 03E00008 */ jr $ra /* C715C 80130A5C AC830040 */ sw $v1, 0x40($a0) +glabel L80130A60_C7160 /* C7160 80130A60 24020001 */ addiu $v0, $zero, 1 /* C7164 80130A64 AC830048 */ sw $v1, 0x48($a0) /* C7168 80130A68 03E00008 */ jr $ra /* C716C 80130A6C AC830040 */ sw $v1, 0x40($a0) +glabel L80130A70_C7170 /* C7170 80130A70 8C620000 */ lw $v0, ($v1) /* C7174 80130A74 24630004 */ addiu $v1, $v1, 4 /* C7178 80130A78 AC82003C */ sw $v0, 0x3c($a0) @@ -46,10 +50,13 @@ glabel func_80130A04 /* C71A8 80130AA8 AC830040 */ sw $v1, 0x40($a0) /* C71AC 80130AAC 0804C2B1 */ j .L80130AC4 /* C71B0 80130AB0 AC820058 */ sw $v0, 0x58($a0) +glabel L80130AB4_C71B4 /* C71B4 80130AB4 24630004 */ addiu $v1, $v1, 4 /* C71B8 80130AB8 AC830040 */ sw $v1, 0x40($a0) +glabel L80130ABC_C71BC /* C71BC 80130ABC 03E00008 */ jr $ra /* C71C0 80130AC0 24020001 */ addiu $v0, $zero, 1 .L80130AC4: +glabel L80130AC4_C71C4 /* C71C4 80130AC4 03E00008 */ jr $ra /* C71C8 80130AC8 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_B9D60/func_80130ACC.s b/asm/nonmatchings/code_B9D60/func_80130ACC.s index f596922304..c900a6dfdd 100644 --- a/asm/nonmatchings/code_B9D60/func_80130ACC.s +++ b/asm/nonmatchings/code_B9D60/func_80130ACC.s @@ -14,7 +14,7 @@ glabel func_80130ACC /* C71EC 80130AEC 0C04C281 */ jal func_80130A04 /* C71F0 80130AF0 0200202D */ daddu $a0, $s0, $zero /* C71F4 80130AF4 1440FFFD */ bnez $v0, .L80130AEC -/* C71F8 80130AF8 00000000 */ nop +/* C71F8 80130AF8 00000000 */ nop .L80130AFC: /* C71FC 80130AFC 8FBF0014 */ lw $ra, 0x14($sp) /* C7200 80130B00 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_B9D60/func_80131128.s b/asm/nonmatchings/code_B9D60/func_80131128.s index 24a7c907c2..d9e85c4877 100644 --- a/asm/nonmatchings/code_B9D60/func_80131128.s +++ b/asm/nonmatchings/code_B9D60/func_80131128.s @@ -27,18 +27,21 @@ glabel func_80131128 /* C7880 80131180 AFD00024 */ sw $s0, 0x24($fp) /* C7884 80131184 AFD00028 */ sw $s0, 0x28($fp) .L80131188: +glabel L80131188_C7888 /* C7888 80131188 8E030000 */ lw $v1, ($s0) /* C788C 8013118C 2C620005 */ sltiu $v0, $v1, 5 /* C7890 80131190 1040FFFD */ beqz $v0, .L80131188 /* C7894 80131194 26100004 */ addiu $s0, $s0, 4 /* C7898 80131198 00031080 */ sll $v0, $v1, 2 -/* C789C 8013119C 3C018015 */ lui $at, %hi(D_80150A80) +/* C789C 8013119C 3C018015 */ lui $at, %hi(jtbl_80150A80_E7180) /* C78A0 801311A0 00220821 */ addu $at, $at, $v0 -/* C78A4 801311A4 8C220A80 */ lw $v0, %lo(D_80150A80)($at) +/* C78A4 801311A4 8C220A80 */ lw $v0, %lo(jtbl_80150A80_E7180)($at) /* C78A8 801311A8 00400008 */ jr $v0 -/* C78AC 801311AC 00000000 */ nop +/* C78AC 801311AC 00000000 */ nop +glabel L801311B0_C78B0 /* C78B0 801311B0 0804C462 */ j .L80131188 /* C78B4 801311B4 26100008 */ addiu $s0, $s0, 8 +glabel L801311B8_C78B8 /* C78B8 801311B8 26100004 */ addiu $s0, $s0, 4 /* C78BC 801311BC 8E060000 */ lw $a2, ($s0) /* C78C0 801311C0 26100004 */ addiu $s0, $s0, 4 @@ -59,7 +62,7 @@ glabel func_80131128 .L801311F8: /* C78F8 801311F8 8C620000 */ lw $v0, ($v1) /* C78FC 801311FC 1457001F */ bne $v0, $s7, .L8013127C -/* C7900 80131200 00000000 */ nop +/* C7900 80131200 00000000 */ nop /* C7904 80131204 3C048015 */ lui $a0, %hi(D_8015133C) /* C7908 80131208 8C84133C */ lw $a0, %lo(D_8015133C)($a0) /* C790C 8013120C 3C028015 */ lui $v0, %hi(D_80151314) @@ -75,7 +78,7 @@ glabel func_80131128 /* C7934 80131234 00D62021 */ addu $a0, $a2, $s6 .L80131238: /* C7938 80131238 0804C48E */ j .L80131238 -/* C793C 8013123C 00000000 */ nop +/* C793C 8013123C 00000000 */ nop .L80131240: /* C7940 80131240 8CA50000 */ lw $a1, ($a1) /* C7944 80131244 0C017D24 */ jal nuPiReadRom @@ -91,7 +94,7 @@ glabel func_80131128 /* C796C 8013126C 5040000F */ beql $v0, $zero, .L801312AC /* C7970 80131270 AE110000 */ sw $s1, ($s0) /* C7974 80131274 0804C4A8 */ j .L801312A0 -/* C7978 80131278 00000000 */ nop +/* C7978 80131278 00000000 */ nop .L8013127C: /* C797C 8013127C 5446000D */ bnel $v0, $a2, .L801312B4 /* C7980 80131280 24A50008 */ addiu $a1, $a1, 8 @@ -99,7 +102,7 @@ glabel func_80131128 /* C7988 80131288 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* C798C 8013128C 80420070 */ lb $v0, 0x70($v0) /* C7990 80131290 14400003 */ bnez $v0, .L801312A0 -/* C7994 80131294 00000000 */ nop +/* C7994 80131294 00000000 */ nop /* C7998 80131298 0804C4AB */ j .L801312AC /* C799C 8013129C AE110000 */ sw $s1, ($s0) .L801312A0: @@ -121,7 +124,7 @@ glabel func_80131128 /* C79D0 801312D0 0000882D */ daddu $s1, $zero, $zero .L801312D4: /* C79D4 801312D4 0804C4B5 */ j .L801312D4 -/* C79D8 801312D8 00000000 */ nop +/* C79D8 801312D8 00000000 */ nop .L801312DC: /* C79DC 801312DC 3C038015 */ lui $v1, %hi(D_801512D0) /* C79E0 801312E0 8C6312D0 */ lw $v1, %lo(D_801512D0)($v1) @@ -130,7 +133,7 @@ glabel func_80131128 .L801312EC: /* C79EC 801312EC 8C620000 */ lw $v0, ($v1) /* C79F0 801312F0 1457001F */ bne $v0, $s7, .L80131370 -/* C79F4 801312F4 00000000 */ nop +/* C79F4 801312F4 00000000 */ nop /* C79F8 801312F8 3C048015 */ lui $a0, %hi(D_8015133C) /* C79FC 801312FC 8C84133C */ lw $a0, %lo(D_8015133C)($a0) /* C7A00 80131300 3C028015 */ lui $v0, %hi(D_80151314) @@ -146,7 +149,7 @@ glabel func_80131128 /* C7A28 80131328 02962021 */ addu $a0, $s4, $s6 .L8013132C: /* C7A2C 8013132C 0804C4CB */ j .L8013132C -/* C7A30 80131330 00000000 */ nop +/* C7A30 80131330 00000000 */ nop .L80131334: /* C7A34 80131334 8CA50000 */ lw $a1, ($a1) /* C7A38 80131338 0C017D24 */ jal nuPiReadRom @@ -162,7 +165,7 @@ glabel func_80131128 /* C7A60 80131360 5040000F */ beql $v0, $zero, .L801313A0 /* C7A64 80131364 AE110000 */ sw $s1, ($s0) /* C7A68 80131368 0804C4E5 */ j .L80131394 -/* C7A6C 8013136C 00000000 */ nop +/* C7A6C 8013136C 00000000 */ nop .L80131370: /* C7A70 80131370 5454000D */ bnel $v0, $s4, .L801313A8 /* C7A74 80131374 24A50008 */ addiu $a1, $a1, 8 @@ -170,7 +173,7 @@ glabel func_80131128 /* C7A7C 8013137C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* C7A80 80131380 80420070 */ lb $v0, 0x70($v0) /* C7A84 80131384 14400003 */ bnez $v0, .L80131394 -/* C7A88 80131388 00000000 */ nop +/* C7A88 80131388 00000000 */ nop /* C7A8C 8013138C 0804C4E8 */ j .L801313A0 /* C7A90 80131390 AE110000 */ sw $s1, ($s0) .L80131394: @@ -186,6 +189,7 @@ glabel func_80131128 /* C7AB0 801313B0 02429021 */ addu $s2, $s2, $v0 /* C7AB4 801313B4 0804C4BB */ j .L801312EC /* C7AB8 801313B8 26310001 */ addiu $s1, $s1, 1 +glabel L801313BC_C7ABC /* C7ABC 801313BC 0C04C775 */ jal func_80131DD4 /* C7AC0 801313C0 03C0202D */ daddu $a0, $fp, $zero /* C7AC4 801313C4 8FBF0034 */ lw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_B9D60/func_80131DD4.s b/asm/nonmatchings/code_B9D60/func_80131DD4.s index 9da5191e6e..44a5571924 100644 --- a/asm/nonmatchings/code_B9D60/func_80131DD4.s +++ b/asm/nonmatchings/code_B9D60/func_80131DD4.s @@ -14,7 +14,7 @@ glabel func_80131DD4 /* C84F8 80131DF8 A242002E */ sb $v0, 0x2e($s2) /* C84FC 80131DFC 304200FF */ andi $v0, $v0, 0xff /* C8500 80131E00 14400033 */ bnez $v0, .L80131ED0 -/* C8504 80131E04 00000000 */ nop +/* C8504 80131E04 00000000 */ nop /* C8508 80131E08 3C138015 */ lui $s3, %hi(D_80150BC0) /* C850C 80131E0C 26730BC0 */ addiu $s3, $s3, %lo(D_80150BC0) .L80131E10: @@ -27,7 +27,7 @@ glabel func_80131DD4 /* C8528 80131E28 00531021 */ addu $v0, $v0, $s3 /* C852C 80131E2C 8C420000 */ lw $v0, ($v0) /* C8530 80131E30 00400008 */ jr $v0 -/* C8534 80131E34 00000000 */ nop +/* C8534 80131E34 00000000 */ nop /* C8538 80131E38 2402003C */ addiu $v0, $zero, 0x3c /* C853C 80131E3C 0804C7B4 */ j .L80131ED0 /* C8540 80131E40 A242002E */ sb $v0, 0x2e($s2) diff --git a/asm/nonmatchings/code_B9D60/func_80132D94.s b/asm/nonmatchings/code_B9D60/func_80132D94.s index a0c9ad8ed5..b1292ddcdb 100644 --- a/asm/nonmatchings/code_B9D60/func_80132D94.s +++ b/asm/nonmatchings/code_B9D60/func_80132D94.s @@ -31,7 +31,7 @@ glabel func_80132D94 /* C94F8 80132DF8 00511021 */ addu $v0, $v0, $s1 /* C94FC 80132DFC 8C420000 */ lw $v0, ($v0) /* C9500 80132E00 00400008 */ jr $v0 -/* C9504 80132E04 00000000 */ nop +/* C9504 80132E04 00000000 */ nop /* C9508 80132E08 0C04D5B1 */ jal func_801356C4 /* C950C 80132E0C 26100001 */ addiu $s0, $s0, 1 /* C9510 80132E10 0804CB8E */ j .L80132E38 @@ -41,14 +41,14 @@ glabel func_80132D94 /* C9520 80132E20 0804CB8E */ j .L80132E38 /* C9524 80132E24 2A020100 */ slti $v0, $s0, 0x100 /* C9528 80132E28 0C04D567 */ jal func_8013559C -/* C952C 80132E2C 00000000 */ nop +/* C952C 80132E2C 00000000 */ nop .L80132E30: /* C9530 80132E30 26100001 */ addiu $s0, $s0, 1 .L80132E34: /* C9534 80132E34 2A020100 */ slti $v0, $s0, 0x100 .L80132E38: /* C9538 80132E38 1440FFE1 */ bnez $v0, .L80132DC0 -/* C953C 80132E3C 00000000 */ nop +/* C953C 80132E3C 00000000 */ nop .L80132E40: /* C9540 80132E40 8FBF0018 */ lw $ra, 0x18($sp) /* C9544 80132E44 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_B9D60/func_80133A94.s b/asm/nonmatchings/code_B9D60/func_80133A94.s index 97379a884d..b9b3e90e0d 100644 --- a/asm/nonmatchings/code_B9D60/func_80133A94.s +++ b/asm/nonmatchings/code_B9D60/func_80133A94.s @@ -29,7 +29,7 @@ glabel func_80133A94 /* CA1F4 80133AF4 AC820000 */ sw $v0, ($a0) .L80133AF8: /* CA1F8 80133AF8 0C04C44A */ jal func_80131128 -/* CA1FC 80133AFC 00000000 */ nop +/* CA1FC 80133AFC 00000000 */ nop /* CA200 80133B00 8FBF0010 */ lw $ra, 0x10($sp) /* CA204 80133B04 03E00008 */ jr $ra /* CA208 80133B08 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_B9D60/func_80133FC8.s b/asm/nonmatchings/code_B9D60/func_80133FC8.s index 7ce2ed273e..e1a425e491 100644 --- a/asm/nonmatchings/code_B9D60/func_80133FC8.s +++ b/asm/nonmatchings/code_B9D60/func_80133FC8.s @@ -24,7 +24,7 @@ glabel func_80133FC8 /* CA714 80134014 14400041 */ bnez $v0, .L8013411C /* CA718 80134018 2402FFFF */ addiu $v0, $zero, -1 /* CA71C 8013401C 0C009C64 */ jal func_80027190 -/* CA720 80134020 00000000 */ nop +/* CA720 80134020 00000000 */ nop /* CA724 80134024 1440003D */ bnez $v0, .L8013411C /* CA728 80134028 2402FFFF */ addiu $v0, $zero, -1 /* CA72C 8013402C 3C02800A */ lui $v0, %hi(D_8009A650) @@ -62,27 +62,27 @@ glabel func_80133FC8 /* CA7A8 801340A8 C4800008 */ lwc1 $f0, 8($a0) /* CA7AC 801340AC 46140001 */ sub.s $f0, $f0, $f20 /* CA7B0 801340B0 46000002 */ mul.s $f0, $f0, $f0 -/* CA7B4 801340B4 00000000 */ nop +/* CA7B4 801340B4 00000000 */ nop /* CA7B8 801340B8 C484000C */ lwc1 $f4, 0xc($a0) /* CA7BC 801340BC 46162101 */ sub.s $f4, $f4, $f22 /* CA7C0 801340C0 46042102 */ mul.s $f4, $f4, $f4 -/* CA7C4 801340C4 00000000 */ nop +/* CA7C4 801340C4 00000000 */ nop /* CA7C8 801340C8 C4820010 */ lwc1 $f2, 0x10($a0) /* CA7CC 801340CC 46181081 */ sub.s $f2, $f2, $f24 /* CA7D0 801340D0 46021082 */ mul.s $f2, $f2, $f2 -/* CA7D4 801340D4 00000000 */ nop +/* CA7D4 801340D4 00000000 */ nop /* CA7D8 801340D8 46040000 */ add.s $f0, $f0, $f4 /* CA7DC 801340DC 46020300 */ add.s $f12, $f0, $f2 /* CA7E0 801340E0 46006004 */ sqrt.s $f0, $f12 /* CA7E4 801340E4 46000032 */ c.eq.s $f0, $f0 -/* CA7E8 801340E8 00000000 */ nop +/* CA7E8 801340E8 00000000 */ nop /* CA7EC 801340EC 45010003 */ bc1t .L801340FC -/* CA7F0 801340F0 00000000 */ nop +/* CA7F0 801340F0 00000000 */ nop /* CA7F4 801340F4 0C0187BC */ jal sqrtf -/* CA7F8 801340F8 00000000 */ nop +/* CA7F8 801340F8 00000000 */ nop .L801340FC: /* CA7FC 801340FC 461A003C */ c.lt.s $f0, $f26 -/* CA800 80134100 00000000 */ nop +/* CA800 80134100 00000000 */ nop /* CA804 80134104 45010005 */ bc1t .L8013411C /* CA808 80134108 0200102D */ daddu $v0, $s0, $zero /* CA80C 8013410C 26100001 */ addiu $s0, $s0, 1 diff --git a/asm/nonmatchings/code_B9D60/func_8013559C.s b/asm/nonmatchings/code_B9D60/func_8013559C.s index df066bfd55..1f28b75a4d 100644 --- a/asm/nonmatchings/code_B9D60/func_8013559C.s +++ b/asm/nonmatchings/code_B9D60/func_8013559C.s @@ -15,7 +15,7 @@ glabel func_8013559C /* CBCC4 801355C4 10620022 */ beq $v1, $v0, .L80135650 /* CBCC8 801355C8 24020017 */ addiu $v0, $zero, 0x17 /* CBCCC 801355CC 10620015 */ beq $v1, $v0, .L80135624 -/* CBCD0 801355D0 00000000 */ nop +/* CBCD0 801355D0 00000000 */ nop /* CBCD4 801355D4 8CA2001C */ lw $v0, 0x1c($a1) /* CBCD8 801355D8 2842003C */ slti $v0, $v0, 0x3c /* CBCDC 801355DC 1040001C */ beqz $v0, .L80135650 @@ -52,4 +52,4 @@ glabel func_8013559C /* CBD4C 8013564C AC820000 */ sw $v0, ($a0) .L80135650: /* CBD50 80135650 03E00008 */ jr $ra -/* CBD54 80135654 00000000 */ nop +/* CBD54 80135654 00000000 */ nop diff --git a/asm/nonmatchings/code_B9D60/func_801363A0.s b/asm/nonmatchings/code_B9D60/func_801363A0.s index c17d231178..795003f2df 100644 --- a/asm/nonmatchings/code_B9D60/func_801363A0.s +++ b/asm/nonmatchings/code_B9D60/func_801363A0.s @@ -22,15 +22,15 @@ glabel func_801363A0 /* CCAE4 801363E4 10400005 */ beqz $v0, .L801363FC /* CCAE8 801363E8 24020002 */ addiu $v0, $zero, 2 /* CCAEC 801363EC 10620008 */ beq $v1, $v0, .L80136410 -/* CCAF0 801363F0 00000000 */ nop +/* CCAF0 801363F0 00000000 */ nop /* CCAF4 801363F4 0804D9C7 */ j .L8013671C -/* CCAF8 801363F8 00000000 */ nop +/* CCAF8 801363F8 00000000 */ nop .L801363FC: /* CCAFC 801363FC 2402000C */ addiu $v0, $zero, 0xc /* CCB00 80136400 106200AC */ beq $v1, $v0, .L801366B4 -/* CCB04 80136404 00000000 */ nop +/* CCB04 80136404 00000000 */ nop /* CCB08 80136408 0804D9C7 */ j .L8013671C -/* CCB0C 8013640C 00000000 */ nop +/* CCB0C 8013640C 00000000 */ nop .L80136410: /* CCB10 80136410 94820018 */ lhu $v0, 0x18($a0) /* CCB14 80136414 30420040 */ andi $v0, $v0, 0x40 @@ -60,7 +60,7 @@ glabel func_801363A0 /* CCB68 80136468 3652005E */ ori $s2, $s2, 0x5e .L8013646C: /* CCB6C 8013646C 10400003 */ beqz $v0, .L8013647C -/* CCB70 80136470 00000000 */ nop +/* CCB70 80136470 00000000 */ nop /* CCB74 80136474 3C12001D */ lui $s2, 0x1d /* CCB78 80136478 3652005C */ ori $s2, $s2, 0x5c .L8013647C: @@ -83,7 +83,7 @@ glabel func_801363A0 /* CCBBC 801364BC 96820006 */ lhu $v0, 6($s4) /* CCBC0 801364C0 30420030 */ andi $v0, $v0, 0x30 /* CCBC4 801364C4 14400006 */ bnez $v0, .L801364E0 -/* CCBC8 801364C8 00000000 */ nop +/* CCBC8 801364C8 00000000 */ nop /* CCBCC 801364CC 0C04991D */ jal get_string_width /* CCBD0 801364D0 0000282D */ daddu $a1, $zero, $zero /* CCBD4 801364D4 0804D93B */ j .L801364EC @@ -127,7 +127,7 @@ glabel func_801363A0 /* CCC50 80136550 3652005E */ ori $s2, $s2, 0x5e .L80136554: /* CCC54 80136554 10400003 */ beqz $v0, .L80136564 -/* CCC58 80136558 00000000 */ nop +/* CCC58 80136558 00000000 */ nop /* CCC5C 8013655C 3C12001D */ lui $s2, 0x1d /* CCC60 80136560 3652005C */ ori $s2, $s2, 0x5c .L80136564: diff --git a/asm/nonmatchings/code_B9D60/func_8013673C.s b/asm/nonmatchings/code_B9D60/func_8013673C.s index 2050dcf07e..a8eb9a16e8 100644 --- a/asm/nonmatchings/code_B9D60/func_8013673C.s +++ b/asm/nonmatchings/code_B9D60/func_8013673C.s @@ -23,11 +23,12 @@ glabel func_8013673C /* CCE84 80136784 1040008B */ beqz $v0, .L801369B4 /* CCE88 80136788 00C0982D */ daddu $s3, $a2, $zero /* CCE8C 8013678C 00031080 */ sll $v0, $v1, 2 -/* CCE90 80136790 3C018015 */ lui $at, %hi(D_80150E60) +/* CCE90 80136790 3C018015 */ lui $at, %hi(jtbl_80150E60_E7560) /* CCE94 80136794 00220821 */ addu $at, $at, $v0 -/* CCE98 80136798 8C220E60 */ lw $v0, %lo(D_80150E60)($at) +/* CCE98 80136798 8C220E60 */ lw $v0, %lo(jtbl_80150E60_E7560)($at) /* CCE9C 8013679C 00400008 */ jr $v0 -/* CCEA0 801367A0 00000000 */ nop +/* CCEA0 801367A0 00000000 */ nop +glabel L801367A4_CCEA4 /* CCEA4 801367A4 94820018 */ lhu $v0, 0x18($a0) /* CCEA8 801367A8 30420040 */ andi $v0, $v0, 0x40 /* CCEAC 801367AC 1440001C */ bnez $v0, .L80136820 @@ -59,7 +60,7 @@ glabel func_8013673C /* CCF08 80136808 3610005E */ ori $s0, $s0, 0x5e .L8013680C: /* CCF0C 8013680C 1040001E */ beqz $v0, .L80136888 -/* CCF10 80136810 00000000 */ nop +/* CCF10 80136810 00000000 */ nop /* CCF14 80136814 3C10001D */ lui $s0, 0x1d /* CCF18 80136818 0804DA22 */ j .L80136888 /* CCF1C 8013681C 3610005C */ ori $s0, $s0, 0x5c @@ -88,7 +89,7 @@ glabel func_8013673C /* CCF68 80136868 3610005E */ ori $s0, $s0, 0x5e .L8013686C: /* CCF6C 8013686C 10400003 */ beqz $v0, .L8013687C -/* CCF70 80136870 00000000 */ nop +/* CCF70 80136870 00000000 */ nop /* CCF74 80136874 3C10001D */ lui $s0, 0x1d /* CCF78 80136878 3610005C */ ori $s0, $s0, 0x5c .L8013687C: @@ -134,7 +135,7 @@ glabel func_8013673C /* CD00C 8013690C 0C04993B */ jal draw_string /* CD010 80136910 AFA00014 */ sw $zero, 0x14($sp) /* CD014 80136914 0804DA6D */ j .L801369B4 -/* CD018 80136918 00000000 */ nop +/* CD018 80136918 00000000 */ nop .L8013691C: /* CD01C 8013691C 02663021 */ addu $a2, $s3, $a2 /* CD020 80136920 240700FF */ addiu $a3, $zero, 0xff @@ -147,7 +148,8 @@ glabel func_8013673C /* CD03C 8013693C 1440001D */ bnez $v0, .L801369B4 /* CD040 80136940 26450014 */ addiu $a1, $s2, 0x14 /* CD044 80136944 0804DA65 */ j .L80136994 -/* CD048 80136948 00000000 */ nop +/* CD048 80136948 00000000 */ nop +glabel L8013694C_CD04C /* CD04C 8013694C 3C028015 */ lui $v0, %hi(D_801568EC) /* CD050 80136950 8C4268EC */ lw $v0, %lo(D_801568EC)($v0) /* CD054 80136954 00021140 */ sll $v0, $v0, 5 @@ -174,8 +176,9 @@ glabel func_8013673C /* CD0A4 801369A4 26660014 */ addiu $a2, $s3, 0x14 /* CD0A8 801369A8 8E040000 */ lw $a0, ($s0) /* CD0AC 801369AC 0C0511F1 */ jal draw_icon_1 -/* CD0B0 801369B0 00000000 */ nop +/* CD0B0 801369B0 00000000 */ nop .L801369B4: +glabel L801369B4_CD0B4 /* CD0B4 801369B4 8FBF0028 */ lw $ra, 0x28($sp) /* CD0B8 801369B8 8FB30024 */ lw $s3, 0x24($sp) /* CD0BC 801369BC 8FB20020 */ lw $s2, 0x20($sp) diff --git a/asm/nonmatchings/code_B9D60/func_80136A08.s b/asm/nonmatchings/code_B9D60/func_80136A08.s index b5b7b9faff..5041ac3765 100644 --- a/asm/nonmatchings/code_B9D60/func_80136A08.s +++ b/asm/nonmatchings/code_B9D60/func_80136A08.s @@ -31,6 +31,6 @@ glabel func_80136A08 /* CD168 80136A68 8FBF0018 */ lw $ra, 0x18($sp) /* CD16C 80136A6C 03E00008 */ jr $ra /* CD170 80136A70 27BD0020 */ addiu $sp, $sp, 0x20 -/* CD174 80136A74 00000000 */ nop -/* CD178 80136A78 00000000 */ nop -/* CD17C 80136A7C 00000000 */ nop +/* CD174 80136A74 00000000 */ nop +/* CD178 80136A78 00000000 */ nop +/* CD17C 80136A7C 00000000 */ nop diff --git a/asm/nonmatchings/code_B9D60/get_char_width.s b/asm/nonmatchings/code_B9D60/get_char_width.s index 76e817e3f7..ed057604c2 100644 --- a/asm/nonmatchings/code_B9D60/get_char_width.s +++ b/asm/nonmatchings/code_B9D60/get_char_width.s @@ -15,7 +15,7 @@ glabel get_char_width /* BC518 80125E18 10E00005 */ beqz $a3, .L80125E30 /* BC51C 80125E1C 240200F5 */ addiu $v0, $zero, 0xf5 /* BC520 80125E20 44870000 */ mtc1 $a3, $f0 -/* BC524 80125E24 00000000 */ nop +/* BC524 80125E24 00000000 */ nop /* BC528 80125E28 080497B1 */ j .L80125EC4 /* BC52C 80125E2C 46800020 */ cvt.s.w $f0, $f0 .L80125E30: @@ -41,7 +41,7 @@ glabel get_char_width /* BC57C 80125E7C 00641021 */ addu $v0, $v1, $a0 /* BC580 80125E80 90420000 */ lbu $v0, ($v0) /* BC584 80125E84 080497AD */ j .L80125EB4 -/* BC588 80125E88 00000000 */ nop +/* BC588 80125E88 00000000 */ nop .L80125E8C: /* BC58C 80125E8C 00051880 */ sll $v1, $a1, 2 /* BC590 80125E90 00061040 */ sll $v0, $a2, 1 @@ -55,40 +55,40 @@ glabel get_char_width /* BC5B0 80125EB0 90420008 */ lbu $v0, 8($v0) .L80125EB4: /* BC5B4 80125EB4 44820000 */ mtc1 $v0, $f0 -/* BC5B8 80125EB8 00000000 */ nop +/* BC5B8 80125EB8 00000000 */ nop /* BC5BC 80125EBC 46800020 */ cvt.s.w $f0, $f0 /* BC5C0 80125EC0 240200F5 */ addiu $v0, $zero, 0xf5 .L80125EC4: /* BC5C4 80125EC4 1482000C */ bne $a0, $v0, .L80125EF8 /* BC5C8 80125EC8 240200F6 */ addiu $v0, $zero, 0xf6 /* BC5CC 80125ECC 46020002 */ mul.s $f0, $f0, $f2 -/* BC5D0 80125ED0 00000000 */ nop +/* BC5D0 80125ED0 00000000 */ nop /* BC5D4 80125ED4 3C018015 */ lui $at, %hi(D_80150580) /* BC5D8 80125ED8 D4220580 */ ldc1 $f2, %lo(D_80150580)($at) /* BC5DC 80125EDC 46000021 */ cvt.d.s $f0, $f0 .L80125EE0: /* BC5E0 80125EE0 46220002 */ mul.d $f0, $f0, $f2 -/* BC5E4 80125EE4 00000000 */ nop +/* BC5E4 80125EE4 00000000 */ nop /* BC5E8 80125EE8 4620010D */ trunc.w.d $f4, $f0 /* BC5EC 80125EEC 44022000 */ mfc1 $v0, $f4 .L80125EF0: /* BC5F0 80125EF0 03E00008 */ jr $ra -/* BC5F4 80125EF4 00000000 */ nop +/* BC5F4 80125EF4 00000000 */ nop .L80125EF8: /* BC5F8 80125EF8 14820008 */ bne $a0, $v0, .L80125F1C /* BC5FC 80125EFC 240200F7 */ addiu $v0, $zero, 0xf7 /* BC600 80125F00 46020002 */ mul.s $f0, $f0, $f2 -/* BC604 80125F04 00000000 */ nop +/* BC604 80125F04 00000000 */ nop /* BC608 80125F08 46000021 */ cvt.d.s $f0, $f0 /* BC60C 80125F0C 4620010D */ trunc.w.d $f4, $f0 /* BC610 80125F10 44022000 */ mfc1 $v0, $f4 /* BC614 80125F14 03E00008 */ jr $ra -/* BC618 80125F18 00000000 */ nop +/* BC618 80125F18 00000000 */ nop .L80125F1C: /* BC61C 80125F1C 14820008 */ bne $a0, $v0, .L80125F40 /* BC620 80125F20 288200F0 */ slti $v0, $a0, 0xf0 /* BC624 80125F24 46020002 */ mul.s $f0, $f0, $f2 -/* BC628 80125F28 00000000 */ nop +/* BC628 80125F28 00000000 */ nop /* BC62C 80125F2C 3C013FE0 */ lui $at, 0x3fe0 /* BC630 80125F30 44811800 */ mtc1 $at, $f3 /* BC634 80125F34 44801000 */ mtc1 $zero, $f2 @@ -96,13 +96,13 @@ glabel get_char_width /* BC63C 80125F3C 46000021 */ cvt.d.s $f0, $f0 .L80125F40: /* BC640 80125F40 10400007 */ beqz $v0, .L80125F60 -/* BC644 80125F44 00000000 */ nop +/* BC644 80125F44 00000000 */ nop /* BC648 80125F48 46020002 */ mul.s $f0, $f0, $f2 -/* BC64C 80125F4C 00000000 */ nop +/* BC64C 80125F4C 00000000 */ nop /* BC650 80125F50 4600010D */ trunc.w.s $f4, $f0 /* BC654 80125F54 44022000 */ mfc1 $v0, $f4 /* BC658 80125F58 03E00008 */ jr $ra -/* BC65C 80125F5C 00000000 */ nop +/* BC65C 80125F5C 00000000 */ nop .L80125F60: /* BC660 80125F60 03E00008 */ jr $ra /* BC664 80125F64 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_B9D60/get_string_properties.s b/asm/nonmatchings/code_B9D60/get_string_properties.s index 392be6f83b..4e33ef2dd6 100644 --- a/asm/nonmatchings/code_B9D60/get_string_properties.s +++ b/asm/nonmatchings/code_B9D60/get_string_properties.s @@ -68,14 +68,16 @@ glabel get_string_properties /* BC754 80126054 10400092 */ beqz $v0, .L801262A0 /* BC758 80126058 26100001 */ addiu $s0, $s0, 1 /* BC75C 8012605C 00031080 */ sll $v0, $v1, 2 -/* BC760 80126060 3C018015 */ lui $at, %hi(D_80150588) +/* BC760 80126060 3C018015 */ lui $at, %hi(jtbl_80150588_E6C88) /* BC764 80126064 00220821 */ addu $at, $at, $v0 -/* BC768 80126068 8C220588 */ lw $v0, %lo(D_80150588)($at) +/* BC768 80126068 8C220588 */ lw $v0, %lo(jtbl_80150588_E6C88)($at) /* BC76C 8012606C 00400008 */ jr $v0 -/* BC770 80126070 00000000 */ nop +/* BC770 80126070 00000000 */ nop +glabel L80126074_BC774 /* BC774 80126074 2484FF0D */ addiu $a0, $a0, -0xf3 /* BC778 80126078 080498BA */ j .L801262E8 /* BC77C 8012607C A7A400E6 */ sh $a0, 0xe6($sp) +glabel L80126080_BC780 /* BC780 80126080 12C00099 */ beqz $s6, .L801262E8 /* BC784 80126084 32E2FFFF */ andi $v0, $s7, 0xffff /* BC788 80126088 00021040 */ sll $v0, $v0, 1 @@ -89,6 +91,7 @@ glabel get_string_properties .L801260A8: /* BC7A8 801260A8 080498BA */ j .L801262E8 /* BC7AC 801260AC 0000B02D */ daddu $s6, $zero, $zero +glabel L801260B0_BC7B0 /* BC7B0 801260B0 3243FFFF */ andi $v1, $s2, 0xffff /* BC7B4 801260B4 26520001 */ addiu $s2, $s2, 1 /* BC7B8 801260B8 8FA9011C */ lw $t1, 0x11c($sp) @@ -107,6 +110,7 @@ glabel get_string_properties /* BC7E8 801260E8 0260A82D */ daddu $s5, $s3, $zero /* BC7EC 801260EC 080498BA */ j .L801262E8 /* BC7F0 801260F0 241E0001 */ addiu $fp, $zero, 1 +glabel L801260F4_BC7F4 /* BC7F4 801260F4 02301021 */ addu $v0, $s1, $s0 /* BC7F8 801260F8 90420000 */ lbu $v0, ($v0) /* BC7FC 801260FC 2443FFFF */ addiu $v1, $v0, -1 @@ -114,13 +118,15 @@ glabel get_string_properties /* BC804 80126104 10400078 */ beqz $v0, .L801262E8 /* BC808 80126108 26100001 */ addiu $s0, $s0, 1 /* BC80C 8012610C 00031080 */ sll $v0, $v1, 2 -/* BC810 80126110 3C018015 */ lui $at, %hi(D_801505C8) +/* BC810 80126110 3C018015 */ lui $at, %hi(jtbl_801505C8_E6CC8) /* BC814 80126114 00220821 */ addu $at, $at, $v0 -/* BC818 80126118 8C2205C8 */ lw $v0, %lo(D_801505C8)($at) +/* BC818 80126118 8C2205C8 */ lw $v0, %lo(jtbl_801505C8_E6CC8)($at) /* BC81C 8012611C 00400008 */ jr $v0 -/* BC820 80126120 00000000 */ nop +/* BC820 80126120 00000000 */ nop +glabel L80126124_BC824 /* BC824 80126124 080498BA */ j .L801262E8 /* BC828 80126128 26100004 */ addiu $s0, $s0, 4 +glabel L8012612C_BC82C /* BC82C 8012612C 3243FFFF */ andi $v1, $s2, 0xffff /* BC830 80126130 26520001 */ addiu $s2, $s2, 1 /* BC834 80126134 8FA9011C */ lw $t1, 0x11c($sp) @@ -132,76 +138,90 @@ glabel get_string_properties /* BC84C 8012614C 01031821 */ addu $v1, $t0, $v1 /* BC850 80126150 080498BA */ j .L801262E8 /* BC854 80126154 A4750000 */ sh $s5, ($v1) +glabel L80126158_BC858 /* BC858 80126158 02301021 */ addu $v0, $s1, $s0 /* BC85C 8012615C 90430000 */ lbu $v1, ($v0) /* BC860 80126160 2C620030 */ sltiu $v0, $v1, 0x30 /* BC864 80126164 1040001C */ beqz $v0, .L801261D8 /* BC868 80126168 26100001 */ addiu $s0, $s0, 1 /* BC86C 8012616C 00031080 */ sll $v0, $v1, 2 -/* BC870 80126170 3C018015 */ lui $at, %hi(D_801505F8) +/* BC870 80126170 3C018015 */ lui $at, %hi(jtbl_801505F8_E6CF8) /* BC874 80126174 00220821 */ addu $at, $at, $v0 -/* BC878 80126178 8C2205F8 */ lw $v0, %lo(D_801505F8)($at) +/* BC878 80126178 8C2205F8 */ lw $v0, %lo(jtbl_801505F8_E6CF8)($at) /* BC87C 8012617C 00400008 */ jr $v0 -/* BC880 80126180 00000000 */ nop +/* BC880 80126180 00000000 */ nop +glabel L80126184_BC884 /* BC884 80126184 02301021 */ addu $v0, $s1, $s0 /* BC888 80126188 90420000 */ lbu $v0, ($v0) /* BC88C 8012618C 26100001 */ addiu $s0, $s0, 1 /* BC890 80126190 080498BA */ j .L801262E8 /* BC894 80126194 A7A200EE */ sh $v0, 0xee($sp) +glabel L80126198_BC898 /* BC898 80126198 26100001 */ addiu $s0, $s0, 1 +glabel L8012619C_BC89C /* BC89C 8012619C 26100004 */ addiu $s0, $s0, 4 +glabel L801261A0_BC8A0 /* BC8A0 801261A0 26100001 */ addiu $s0, $s0, 1 +glabel L801261A4_BC8A4 /* BC8A4 801261A4 08049898 */ j .L80126260 /* BC8A8 801261A8 26100001 */ addiu $s0, $s0, 1 +glabel L801261AC_BC8AC /* BC8AC 801261AC 02301021 */ addu $v0, $s1, $s0 /* BC8B0 801261B0 90420000 */ lbu $v0, ($v0) /* BC8B4 801261B4 5040002A */ beql $v0, $zero, .L80126260 /* BC8B8 801261B8 24140001 */ addiu $s4, $zero, 1 /* BC8BC 801261BC 080498BA */ j .L801262E8 /* BC8C0 801261C0 26100001 */ addiu $s0, $s0, 1 +glabel L801261C4_BC8C4 /* BC8C4 801261C4 02301021 */ addu $v0, $s1, $s0 /* BC8C8 801261C8 90430000 */ lbu $v1, ($v0) /* BC8CC 801261CC 240200FD */ addiu $v0, $zero, 0xfd /* BC8D0 801261D0 14620046 */ bne $v1, $v0, .L801262EC /* BC8D4 801261D4 328200FF */ andi $v0, $s4, 0xff .L801261D8: +glabel L801261D8_BC8D8 /* BC8D8 801261D8 080498BA */ j .L801262E8 /* BC8DC 801261DC 24140001 */ addiu $s4, $zero, 1 +glabel L801261E0_BC8E0 /* BC8E0 801261E0 02111021 */ addu $v0, $s0, $s1 /* BC8E4 801261E4 90420001 */ lbu $v0, 1($v0) /* BC8E8 801261E8 3C013D80 */ lui $at, 0x3d80 /* BC8EC 801261EC 44810000 */ mtc1 $at, $f0 /* BC8F0 801261F0 3043000F */ andi $v1, $v0, 0xf /* BC8F4 801261F4 44831000 */ mtc1 $v1, $f2 -/* BC8F8 801261F8 00000000 */ nop +/* BC8F8 801261F8 00000000 */ nop /* BC8FC 801261FC 468010A0 */ cvt.s.w $f2, $f2 /* BC900 80126200 46001082 */ mul.s $f2, $f2, $f0 -/* BC904 80126204 00000000 */ nop +/* BC904 80126204 00000000 */ nop /* BC908 80126208 26100002 */ addiu $s0, $s0, 2 /* BC90C 8012620C 00021102 */ srl $v0, $v0, 4 /* BC910 80126210 44820000 */ mtc1 $v0, $f0 -/* BC914 80126214 00000000 */ nop +/* BC914 80126214 00000000 */ nop /* BC918 80126218 46800020 */ cvt.s.w $f0, $f0 /* BC91C 8012621C 080498BA */ j .L801262E8 /* BC920 80126220 46020500 */ add.s $f20, $f0, $f2 +glabel L80126224_BC924 /* BC924 80126224 3C013F80 */ lui $at, 0x3f80 /* BC928 80126228 4481A000 */ mtc1 $at, $f20 /* BC92C 8012622C 080498BB */ j .L801262EC /* BC930 80126230 328200FF */ andi $v0, $s4, 0xff +glabel L80126234_BC934 /* BC934 80126234 02301021 */ addu $v0, $s1, $s0 /* BC938 80126238 90430000 */ lbu $v1, ($v0) /* BC93C 8012623C 2C62000F */ sltiu $v0, $v1, 0xf /* BC940 80126240 10400029 */ beqz $v0, .L801262E8 /* BC944 80126244 26100001 */ addiu $s0, $s0, 1 /* BC948 80126248 00031080 */ sll $v0, $v1, 2 -/* BC94C 8012624C 3C018015 */ lui $at, %hi(D_801506B8) +/* BC94C 8012624C 3C018015 */ lui $at, %hi(jtbl_801506B8_E6DB8) /* BC950 80126250 00220821 */ addu $at, $at, $v0 -/* BC954 80126254 8C2206B8 */ lw $v0, %lo(D_801506B8)($at) +/* BC954 80126254 8C2206B8 */ lw $v0, %lo(jtbl_801506B8_E6DB8)($at) /* BC958 80126258 00400008 */ jr $v0 -/* BC95C 8012625C 00000000 */ nop +/* BC95C 8012625C 00000000 */ nop .L80126260: +glabel L80126260_BC960 /* BC960 80126260 080498BA */ j .L801262E8 /* BC964 80126264 26100001 */ addiu $s0, $s0, 1 +glabel L80126268_BC968 /* BC968 80126268 02301021 */ addu $v0, $s1, $s0 /* BC96C 8012626C 26100001 */ addiu $s0, $s0, 1 /* BC970 80126270 90440000 */ lbu $a0, ($v0) @@ -213,10 +233,12 @@ glabel get_string_properties /* BC988 80126288 00892021 */ addu $a0, $a0, $t1 /* BC98C 8012628C 080498BA */ j .L801262E8 /* BC990 80126290 02629821 */ addu $s3, $s3, $v0 +glabel L80126294_BC994 /* BC994 80126294 97A80116 */ lhu $t0, 0x116($sp) /* BC998 80126298 25080001 */ addiu $t0, $t0, 1 /* BC99C 8012629C A7A80116 */ sh $t0, 0x116($sp) .L801262A0: +glabel L801262A0_BC9A0 /* BC9A0 801262A0 33C2FFFF */ andi $v0, $fp, 0xffff /* BC9A4 801262A4 10400006 */ beqz $v0, .L801262C0 /* BC9A8 801262A8 308400FF */ andi $a0, $a0, 0xff @@ -237,6 +259,7 @@ glabel get_string_properties /* BC9E0 801262E0 0100282D */ daddu $a1, $t0, $zero /* BC9E4 801262E4 02629821 */ addu $s3, $s3, $v0 .L801262E8: +glabel L801262E8_BC9E8 /* BC9E8 801262E8 328200FF */ andi $v0, $s4, 0xff .L801262EC: /* BC9EC 801262EC 1040FF56 */ beqz $v0, .L80126048 @@ -274,7 +297,7 @@ glabel get_string_properties .L8012635C: /* BCA5C 8012635C 32E2FFFF */ andi $v0, $s7, 0xffff /* BCA60 80126360 14400003 */ bnez $v0, .L80126370 -/* BCA64 80126364 00000000 */ nop +/* BCA64 80126364 00000000 */ nop /* BCA68 80126368 080498E9 */ j .L801263A4 /* BCA6C 8012636C A7B60108 */ sh $s6, 0x108($sp) .L80126370: @@ -296,13 +319,13 @@ glabel get_string_properties .L801263A4: /* BCAA4 801263A4 8FA80158 */ lw $t0, 0x158($sp) /* BCAA8 801263A8 11000003 */ beqz $t0, .L801263B8 -/* BCAAC 801263AC 00000000 */ nop +/* BCAAC 801263AC 00000000 */ nop /* BCAB0 801263B0 97A900FE */ lhu $t1, 0xfe($sp) /* BCAB4 801263B4 AD090000 */ sw $t1, ($t0) .L801263B8: /* BCAB8 801263B8 8FA80154 */ lw $t0, 0x154($sp) /* BCABC 801263BC 1100000C */ beqz $t0, .L801263F0 -/* BCAC0 801263C0 00000000 */ nop +/* BCAC0 801263C0 00000000 */ nop /* BCAC4 801263C4 97A900EE */ lhu $t1, 0xee($sp) /* BCAC8 801263C8 00091080 */ sll $v0, $t1, 2 /* BCACC 801263CC 3C01802F */ lui $at, %hi(D_802EB5A8) @@ -317,25 +340,25 @@ glabel get_string_properties .L801263F0: /* BCAF0 801263F0 8FA9015C */ lw $t1, 0x15c($sp) /* BCAF4 801263F4 11200003 */ beqz $t1, .L80126404 -/* BCAF8 801263F8 00000000 */ nop +/* BCAF8 801263F8 00000000 */ nop /* BCAFC 801263FC 97A80106 */ lhu $t0, 0x106($sp) /* BCB00 80126400 AD280000 */ sw $t0, ($t1) .L80126404: /* BCB04 80126404 8FA90160 */ lw $t1, 0x160($sp) /* BCB08 80126408 11200003 */ beqz $t1, .L80126418 -/* BCB0C 8012640C 00000000 */ nop +/* BCB0C 8012640C 00000000 */ nop /* BCB10 80126410 8FA800D8 */ lw $t0, 0xd8($sp) /* BCB14 80126414 AD280000 */ sw $t0, ($t1) .L80126418: /* BCB18 80126418 8FA90164 */ lw $t1, 0x164($sp) /* BCB1C 8012641C 11200003 */ beqz $t1, .L8012642C -/* BCB20 80126420 00000000 */ nop +/* BCB20 80126420 00000000 */ nop /* BCB24 80126424 97A20108 */ lhu $v0, 0x108($sp) /* BCB28 80126428 AD220000 */ sw $v0, ($t1) .L8012642C: /* BCB2C 8012642C 8FA80168 */ lw $t0, 0x168($sp) /* BCB30 80126430 11000003 */ beqz $t0, .L80126440 -/* BCB34 80126434 00000000 */ nop +/* BCB34 80126434 00000000 */ nop /* BCB38 80126438 97A20116 */ lhu $v0, 0x116($sp) /* BCB3C 8012643C AD020000 */ sw $v0, ($t0) .L80126440: diff --git a/asm/nonmatchings/code_B9D60/init_got_item.s b/asm/nonmatchings/code_B9D60/init_got_item.s index afa93ab74c..06a1e01d49 100644 --- a/asm/nonmatchings/code_B9D60/init_got_item.s +++ b/asm/nonmatchings/code_B9D60/init_got_item.s @@ -32,7 +32,7 @@ glabel init_got_item /* C8264 80131B64 2404005C */ addiu $a0, $zero, 0x5c .L80131B68: /* C8268 80131B68 0804C6DA */ j .L80131B68 -/* C826C 80131B6C 00000000 */ nop +/* C826C 80131B6C 00000000 */ nop .L80131B70: /* C8270 80131B70 0C00AB39 */ jal heap_malloc /* C8274 80131B74 0060A82D */ daddu $s5, $v1, $zero @@ -50,7 +50,7 @@ glabel init_got_item /* C82A4 80131BA4 ACA30000 */ sw $v1, ($a1) .L80131BA8: /* C82A8 80131BA8 0804C6EA */ j .L80131BA8 -/* C82AC 80131BAC 00000000 */ nop +/* C82AC 80131BAC 00000000 */ nop .L80131BB0: /* C82B0 80131BB0 3210FFFF */ andi $s0, $s0, 0xffff /* C82B4 80131BB4 3C030200 */ lui $v1, 0x200 @@ -162,7 +162,7 @@ glabel init_got_item /* C8450 80131D50 44810000 */ mtc1 $at, $f0 /* C8454 80131D54 C444011C */ lwc1 $f4, 0x11c($v0) /* C8458 80131D58 46001082 */ mul.s $f2, $f2, $f0 -/* C845C 80131D5C 00000000 */ nop +/* C845C 80131D5C 00000000 */ nop /* C8460 80131D60 AE00002C */ sw $zero, 0x2c($s0) /* C8464 80131D64 E6040028 */ swc1 $f4, 0x28($s0) /* C8468 80131D68 C4400124 */ lwc1 $f0, 0x124($v0) diff --git a/asm/nonmatchings/code_B9D60/init_item_entity_list.s b/asm/nonmatchings/code_B9D60/init_item_entity_list.s index 5b2636c941..566b1b2798 100644 --- a/asm/nonmatchings/code_B9D60/init_item_entity_list.s +++ b/asm/nonmatchings/code_B9D60/init_item_entity_list.s @@ -6,11 +6,11 @@ glabel init_item_entity_list /* C77D0 801310D0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* C77D4 801310D4 80420070 */ lb $v0, 0x70($v0) /* C77D8 801310D8 14400005 */ bnez $v0, .L801310F0 -/* C77DC 801310DC 00000000 */ nop +/* C77DC 801310DC 00000000 */ nop /* C77E0 801310E0 3C028015 */ lui $v0, %hi(D_80155DA0) /* C77E4 801310E4 24425DA0 */ addiu $v0, $v0, %lo(D_80155DA0) /* C77E8 801310E8 0804C43E */ j .L801310F8 -/* C77EC 801310EC 00000000 */ nop +/* C77EC 801310EC 00000000 */ nop .L801310F0: /* C77F0 801310F0 3C028015 */ lui $v0, %hi(D_801561A0) /* C77F4 801310F4 244261A0 */ addiu $v0, $v0, %lo(D_801561A0) @@ -26,4 +26,4 @@ glabel init_item_entity_list /* C7818 80131118 3C018015 */ lui $at, %hi(D_80155D84) /* C781C 8013111C AC205D84 */ sw $zero, %lo(D_80155D84)($at) /* C7820 80131120 03E00008 */ jr $ra -/* C7824 80131124 00000000 */ nop +/* C7824 80131124 00000000 */ nop diff --git a/asm/nonmatchings/code_B9D60/load_font.s b/asm/nonmatchings/code_B9D60/load_font.s index 585577e911..d469de0c27 100644 --- a/asm/nonmatchings/code_B9D60/load_font.s +++ b/asm/nonmatchings/code_B9D60/load_font.s @@ -21,7 +21,7 @@ glabel load_font /* B9E74 80123774 24050500 */ addiu $a1, $zero, 0x500 .L80123778: /* B9E78 80123778 14820014 */ bne $a0, $v0, .L801237CC -/* B9E7C 8012377C 00000000 */ nop +/* B9E7C 8012377C 00000000 */ nop /* B9E80 80123780 3C040000 */ lui $a0, 0 /* B9E84 80123784 24845800 */ addiu $a0, $a0, 0x5800 /* B9E88 80123788 3C06802F */ lui $a2, %hi(D_802ED970) @@ -41,7 +41,7 @@ glabel load_font /* B9EBC 801237BC 3C06802F */ lui $a2, %hi(D_802F4560) /* B9EC0 801237C0 24C64560 */ addiu $a2, $a2, %lo(D_802F4560) /* B9EC4 801237C4 0C048DC2 */ jal load_font_data -/* B9EC8 801237C8 00000000 */ nop +/* B9EC8 801237C8 00000000 */ nop .L801237CC: /* B9ECC 801237CC 8FBF0010 */ lw $ra, 0x10($sp) /* B9ED0 801237D0 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_B9D60/load_message_to_printer.s b/asm/nonmatchings/code_B9D60/load_message_to_printer.s index cdf8e1f14e..e759310f10 100644 --- a/asm/nonmatchings/code_B9D60/load_message_to_printer.s +++ b/asm/nonmatchings/code_B9D60/load_message_to_printer.s @@ -9,7 +9,7 @@ glabel load_message_to_printer /* BC178 80125A78 04400003 */ bltz $v0, .L80125A88 /* BC17C 80125A7C AFBF0014 */ sw $ra, 0x14($sp) /* BC180 80125A80 0C049623 */ jal load_message_to_buffer -/* BC184 80125A84 00000000 */ nop +/* BC184 80125A84 00000000 */ nop .L80125A88: /* BC188 80125A88 0040202D */ daddu $a0, $v0, $zero /* BC18C 80125A8C 8E0304FC */ lw $v1, 0x4fc($s0) diff --git a/asm/nonmatchings/code_B9D60/make_item_entity.s b/asm/nonmatchings/code_B9D60/make_item_entity.s index 12ffcafc7b..de69019bcd 100644 --- a/asm/nonmatchings/code_B9D60/make_item_entity.s +++ b/asm/nonmatchings/code_B9D60/make_item_entity.s @@ -27,16 +27,18 @@ glabel make_item_entity /* C7B48 80131448 2E620017 */ sltiu $v0, $s3, 0x17 /* C7B4C 8013144C 1040000A */ beqz $v0, .L80131478 /* C7B50 80131450 00131080 */ sll $v0, $s3, 2 -/* C7B54 80131454 3C018015 */ lui $at, %hi(D_80150A98) +/* C7B54 80131454 3C018015 */ lui $at, %hi(jtbl_80150A98_E7198) /* C7B58 80131458 00220821 */ addu $at, $at, $v0 -/* C7B5C 8013145C 8C220A98 */ lw $v0, %lo(D_80150A98)($at) +/* C7B5C 8013145C 8C220A98 */ lw $v0, %lo(jtbl_80150A98_E7198)($at) /* C7B60 80131460 00400008 */ jr $v0 -/* C7B64 80131464 00000000 */ nop +/* C7B64 80131464 00000000 */ nop +glabel L80131468_C7B68 /* C7B68 80131468 0C05152F */ jal get_global_flag /* C7B6C 8013146C 0220202D */ daddu $a0, $s1, $zero /* C7B70 80131470 14400180 */ bnez $v0, .L80131A74 /* C7B74 80131474 2402FFFF */ addiu $v0, $zero, -1 .L80131478: +glabel L80131478_C7B78 /* C7B78 80131478 0000182D */ daddu $v1, $zero, $zero /* C7B7C 8013147C 3C048015 */ lui $a0, %hi(D_801565A0) /* C7B80 80131480 8C8465A0 */ lw $a0, %lo(D_801565A0)($a0) @@ -54,7 +56,7 @@ glabel make_item_entity /* C7BA8 801314A8 2404005C */ addiu $a0, $zero, 0x5c .L801314AC: /* C7BAC 801314AC 0804C52B */ j .L801314AC -/* C7BB0 801314B0 00000000 */ nop +/* C7BB0 801314B0 00000000 */ nop .L801314B4: /* C7BB4 801314B4 0C00AB39 */ jal heap_malloc /* C7BB8 801314B8 0060A02D */ daddu $s4, $v1, $zero @@ -72,7 +74,7 @@ glabel make_item_entity /* C7BE8 801314E8 ACA30000 */ sw $v1, ($a1) .L801314EC: /* C7BEC 801314EC 0804C53B */ j .L801314EC -/* C7BF0 801314F0 00000000 */ nop +/* C7BF0 801314F0 00000000 */ nop .L801314F4: /* C7BF4 801314F4 00121402 */ srl $v0, $s2, 0x10 /* C7BF8 801314F8 3042000F */ andi $v0, $v0, 0xf @@ -147,20 +149,24 @@ glabel make_item_entity /* C7D00 80131600 2C62001C */ sltiu $v0, $v1, 0x1c /* C7D04 80131604 104000C1 */ beqz $v0, .L8013190C /* C7D08 80131608 00031080 */ sll $v0, $v1, 2 -/* C7D0C 8013160C 3C018015 */ lui $at, %hi(D_80150AF8) +/* C7D0C 8013160C 3C018015 */ lui $at, %hi(jtbl_80150AF8_E71F8) /* C7D10 80131610 00220821 */ addu $at, $at, $v0 -/* C7D14 80131614 8C220AF8 */ lw $v0, %lo(D_80150AF8)($at) +/* C7D14 80131614 8C220AF8 */ lw $v0, %lo(jtbl_80150AF8_E71F8)($at) /* C7D18 80131618 00400008 */ jr $v0 -/* C7D1C 8013161C 00000000 */ nop +/* C7D1C 8013161C 00000000 */ nop +glabel L80131620_C7D20 /* C7D20 80131620 8E020000 */ lw $v0, ($s0) /* C7D24 80131624 0804C640 */ j .L80131900 /* C7D28 80131628 3C038000 */ lui $v1, 0x8000 +glabel L8013162C_C7D2C /* C7D2C 8013162C 8E020000 */ lw $v0, ($s0) /* C7D30 80131630 0804C640 */ j .L80131900 /* C7D34 80131634 3C030080 */ lui $v1, 0x80 +glabel L80131638_C7D38 /* C7D38 80131638 8E020000 */ lw $v0, ($s0) /* C7D3C 8013163C 0804C640 */ j .L80131900 /* C7D40 80131640 3C030010 */ lui $v1, 0x10 +glabel L80131644_C7D44 /* C7D44 80131644 24020003 */ addiu $v0, $zero, 3 /* C7D48 80131648 A202001B */ sb $v0, 0x1b($s0) /* C7D4C 8013164C 8E020000 */ lw $v0, ($s0) @@ -168,31 +174,37 @@ glabel make_item_entity /* C7D54 80131654 00431025 */ or $v0, $v0, $v1 /* C7D58 80131658 0804C640 */ j .L80131900 /* C7D5C 8013165C 3C030001 */ lui $v1, 1 +glabel L80131660_C7D60 /* C7D60 80131660 3C020080 */ lui $v0, 0x80 /* C7D64 80131664 34420600 */ ori $v0, $v0, 0x600 /* C7D68 80131668 8E030000 */ lw $v1, ($s0) /* C7D6C 8013166C 0804C635 */ j .L801318D4 /* C7D70 80131670 24040003 */ addiu $a0, $zero, 3 +glabel L80131674_C7D74 /* C7D74 80131674 3C020080 */ lui $v0, 0x80 /* C7D78 80131678 34420400 */ ori $v0, $v0, 0x400 /* C7D7C 8013167C 8E030000 */ lw $v1, ($s0) /* C7D80 80131680 0804C635 */ j .L801318D4 /* C7D84 80131684 24040003 */ addiu $a0, $zero, 3 +glabel L80131688_C7D88 /* C7D88 80131688 3C020080 */ lui $v0, 0x80 /* C7D8C 8013168C 34420800 */ ori $v0, $v0, 0x800 /* C7D90 80131690 8E030000 */ lw $v1, ($s0) /* C7D94 80131694 0804C635 */ j .L801318D4 /* C7D98 80131698 24040003 */ addiu $a0, $zero, 3 +glabel L8013169C_C7D9C /* C7D9C 8013169C 3C020080 */ lui $v0, 0x80 /* C7DA0 801316A0 34420A00 */ ori $v0, $v0, 0xa00 /* C7DA4 801316A4 8E030000 */ lw $v1, ($s0) /* C7DA8 801316A8 0804C635 */ j .L801318D4 /* C7DAC 801316AC 24040003 */ addiu $a0, $zero, 3 +glabel L801316B0_C7DB0 /* C7DB0 801316B0 3C020080 */ lui $v0, 0x80 /* C7DB4 801316B4 34420200 */ ori $v0, $v0, 0x200 /* C7DB8 801316B8 8E030000 */ lw $v1, ($s0) /* C7DBC 801316BC 0804C635 */ j .L801318D4 /* C7DC0 801316C0 24040003 */ addiu $a0, $zero, 3 +glabel L801316C4_C7DC4 /* C7DC4 801316C4 3C040080 */ lui $a0, 0x80 /* C7DC8 801316C8 34840400 */ ori $a0, $a0, 0x400 /* C7DCC 801316CC 8E020000 */ lw $v0, ($s0) @@ -200,6 +212,7 @@ glabel make_item_entity /* C7DD4 801316D4 A203001B */ sb $v1, 0x1b($s0) /* C7DD8 801316D8 0804C63F */ j .L801318FC /* C7DDC 801316DC 3C034000 */ lui $v1, 0x4000 +glabel L801316E0_C7DE0 /* C7DE0 801316E0 3C050080 */ lui $a1, 0x80 /* C7DE4 801316E4 34A50400 */ ori $a1, $a1, 0x400 /* C7DE8 801316E8 3C044000 */ lui $a0, 0x4000 @@ -210,30 +223,36 @@ glabel make_item_entity /* C7DFC 801316FC 00451025 */ or $v0, $v0, $a1 /* C7E00 80131700 0804C641 */ j .L80131904 /* C7E04 80131704 00441025 */ or $v0, $v0, $a0 +glabel L80131708_C7E08 /* C7E08 80131708 8E020000 */ lw $v0, ($s0) /* C7E0C 8013170C 0804C640 */ j .L80131900 /* C7E10 80131710 3C030080 */ lui $v1, 0x80 +glabel L80131714_C7E14 /* C7E14 80131714 3C020080 */ lui $v0, 0x80 /* C7E18 80131718 34420600 */ ori $v0, $v0, 0x600 /* C7E1C 8013171C 8E030000 */ lw $v1, ($s0) /* C7E20 80131720 0804C635 */ j .L801318D4 /* C7E24 80131724 2404000C */ addiu $a0, $zero, 0xc +glabel L80131728_C7E28 /* C7E28 80131728 3C020080 */ lui $v0, 0x80 /* C7E2C 8013172C 34420400 */ ori $v0, $v0, 0x400 /* C7E30 80131730 8E030000 */ lw $v1, ($s0) /* C7E34 80131734 0804C635 */ j .L801318D4 /* C7E38 80131738 2404000C */ addiu $a0, $zero, 0xc +glabel L8013173C_C7E3C /* C7E3C 8013173C 3C020080 */ lui $v0, 0x80 /* C7E40 80131740 34420800 */ ori $v0, $v0, 0x800 /* C7E44 80131744 8E030000 */ lw $v1, ($s0) /* C7E48 80131748 0804C635 */ j .L801318D4 /* C7E4C 8013174C 2404000C */ addiu $a0, $zero, 0xc +glabel L80131750_C7E50 /* C7E50 80131750 3C020080 */ lui $v0, 0x80 /* C7E54 80131754 8E030000 */ lw $v1, ($s0) /* C7E58 80131758 34422000 */ ori $v0, $v0, 0x2000 /* C7E5C 8013175C 00621825 */ or $v1, $v1, $v0 /* C7E60 80131760 0804C636 */ j .L801318D8 /* C7E64 80131764 3C021000 */ lui $v0, 0x1000 +glabel L80131768_C7E68 /* C7E68 80131768 3C040080 */ lui $a0, 0x80 /* C7E6C 8013176C 34842600 */ ori $a0, $a0, 0x2600 /* C7E70 80131770 8E020000 */ lw $v0, ($s0) @@ -241,6 +260,7 @@ glabel make_item_entity /* C7E78 80131778 A203001B */ sb $v1, 0x1b($s0) /* C7E7C 8013177C 0804C63F */ j .L801318FC /* C7E80 80131780 3C031000 */ lui $v1, 0x1000 +glabel L80131784_C7E84 /* C7E84 80131784 3C040080 */ lui $a0, 0x80 /* C7E88 80131788 34842400 */ ori $a0, $a0, 0x2400 /* C7E8C 8013178C 8E020000 */ lw $v0, ($s0) @@ -248,6 +268,7 @@ glabel make_item_entity /* C7E94 80131794 A203001B */ sb $v1, 0x1b($s0) /* C7E98 80131798 0804C63F */ j .L801318FC /* C7E9C 8013179C 3C031000 */ lui $v1, 0x1000 +glabel L801317A0_C7EA0 /* C7EA0 801317A0 3C040080 */ lui $a0, 0x80 /* C7EA4 801317A4 34842200 */ ori $a0, $a0, 0x2200 /* C7EA8 801317A8 8E020000 */ lw $v0, ($s0) @@ -255,6 +276,7 @@ glabel make_item_entity /* C7EB0 801317B0 A203001B */ sb $v1, 0x1b($s0) /* C7EB4 801317B4 0804C63F */ j .L801318FC /* C7EB8 801317B8 3C031000 */ lui $v1, 0x1000 +glabel L801317BC_C7EBC /* C7EBC 801317BC 3C030080 */ lui $v1, 0x80 /* C7EC0 801317C0 34631000 */ ori $v1, $v1, 0x1000 /* C7EC4 801317C4 8E020000 */ lw $v0, ($s0) @@ -266,6 +288,7 @@ glabel make_item_entity /* C7EDC 801317DC 34424000 */ ori $v0, $v0, 0x4000 /* C7EE0 801317E0 0804C641 */ j .L80131904 /* C7EE4 801317E4 E6000030 */ swc1 $f0, 0x30($s0) +glabel L801317E8_C7EE8 /* C7EE8 801317E8 3C030080 */ lui $v1, 0x80 /* C7EEC 801317EC 34631000 */ ori $v1, $v1, 0x1000 /* C7EF0 801317F0 8E020000 */ lw $v0, ($s0) @@ -279,6 +302,7 @@ glabel make_item_entity /* C7F10 80131810 0040182D */ daddu $v1, $v0, $zero /* C7F14 80131814 0804C628 */ j .L801318A0 /* C7F18 80131818 24020017 */ addiu $v0, $zero, 0x17 +glabel L8013181C_C7F1C /* C7F1C 8013181C 3C030080 */ lui $v1, 0x80 /* C7F20 80131820 34631000 */ ori $v1, $v1, 0x1000 /* C7F24 80131824 8E020000 */ lw $v0, ($s0) @@ -292,6 +316,7 @@ glabel make_item_entity /* C7F44 80131844 0040182D */ daddu $v1, $v0, $zero /* C7F48 80131848 0804C628 */ j .L801318A0 /* C7F4C 8013184C 24020017 */ addiu $v0, $zero, 0x17 +glabel L80131850_C7F50 /* C7F50 80131850 3C030080 */ lui $v1, 0x80 /* C7F54 80131854 8E020000 */ lw $v0, ($s0) /* C7F58 80131858 3C013F4C */ lui $at, 0x3f4c @@ -302,6 +327,7 @@ glabel make_item_entity /* C7F6C 8013186C 0040182D */ daddu $v1, $v0, $zero /* C7F70 80131870 0804C628 */ j .L801318A0 /* C7F74 80131874 24020003 */ addiu $v0, $zero, 3 +glabel L80131878_C7F78 /* C7F78 80131878 3C030080 */ lui $v1, 0x80 /* C7F7C 8013187C 34638000 */ ori $v1, $v1, 0x8000 /* C7F80 80131880 8E020000 */ lw $v0, ($s0) @@ -318,10 +344,12 @@ glabel make_item_entity /* C7FA8 801318A8 E6000030 */ swc1 $f0, 0x30($s0) /* C7FAC 801318AC 0804C642 */ j .L80131908 /* C7FB0 801318B0 AE030000 */ sw $v1, ($s0) +glabel L801318B4_C7FB4 /* C7FB4 801318B4 3C030080 */ lui $v1, 0x80 /* C7FB8 801318B8 8E020000 */ lw $v0, ($s0) /* C7FBC 801318BC 0804C640 */ j .L80131900 /* C7FC0 801318C0 34638200 */ ori $v1, $v1, 0x8200 +glabel L801318C4_C7FC4 /* C7FC4 801318C4 3C020080 */ lui $v0, 0x80 /* C7FC8 801318C8 34428600 */ ori $v0, $v0, 0x8600 /* C7FCC 801318CC 8E030000 */ lw $v1, ($s0) @@ -332,6 +360,7 @@ glabel make_item_entity /* C7FD8 801318D8 00621825 */ or $v1, $v1, $v0 /* C7FDC 801318DC 0804C642 */ j .L80131908 /* C7FE0 801318E0 AE030000 */ sw $v1, ($s0) +glabel L801318E4_C7FE4 /* C7FE4 801318E4 3C040080 */ lui $a0, 0x80 /* C7FE8 801318E8 34840600 */ ori $a0, $a0, 0x600 /* C7FEC 801318EC 8E020000 */ lw $v0, ($s0) @@ -350,11 +379,12 @@ glabel make_item_entity /* C800C 8013190C 2C620015 */ sltiu $v0, $v1, 0x15 /* C8010 80131910 1040003E */ beqz $v0, .L80131A0C /* C8014 80131914 00031080 */ sll $v0, $v1, 2 -/* C8018 80131918 3C018015 */ lui $at, %hi(D_80150B68) +/* C8018 80131918 3C018015 */ lui $at, %hi(jtbl_80150B68_E7268) /* C801C 8013191C 00220821 */ addu $at, $at, $v0 -/* C8020 80131920 8C220B68 */ lw $v0, %lo(D_80150B68)($at) +/* C8020 80131920 8C220B68 */ lw $v0, %lo(jtbl_80150B68_E7268)($at) /* C8024 80131924 00400008 */ jr $v0 -/* C8028 80131928 00000000 */ nop +/* C8028 80131928 00000000 */ nop +glabel L8013192C_C802C /* C802C 8013192C 8E050008 */ lw $a1, 8($s0) /* C8030 80131930 8E06000C */ lw $a2, 0xc($s0) /* C8034 80131934 8E070010 */ lw $a3, 0x10($s0) @@ -404,7 +434,7 @@ glabel make_item_entity /* C80E0 801319E0 44810000 */ mtc1 $at, $f0 /* C80E4 801319E4 C444011C */ lwc1 $f4, 0x11c($v0) /* C80E8 801319E8 46001082 */ mul.s $f2, $f2, $f0 -/* C80EC 801319EC 00000000 */ nop +/* C80EC 801319EC 00000000 */ nop /* C80F0 801319F0 AE20002C */ sw $zero, 0x2c($s1) /* C80F4 801319F4 E6240028 */ swc1 $f4, 0x28($s1) /* C80F8 801319F8 C4400124 */ lwc1 $f0, 0x124($v0) @@ -413,9 +443,10 @@ glabel make_item_entity /* C8104 80131A04 0C044A17 */ jal set_standard_shadow_scale /* C8108 80131A08 E4800030 */ swc1 $f0, 0x30($a0) .L80131A0C: +glabel L80131A0C_C810C /* C810C 80131A0C 9202001C */ lbu $v0, 0x1c($s0) /* C8110 80131A10 10400003 */ beqz $v0, .L80131A20 -/* C8114 80131A14 00000000 */ nop +/* C8114 80131A14 00000000 */ nop /* C8118 80131A18 0C04C3DC */ jal func_80130F70 /* C811C 80131A1C 0200202D */ daddu $a0, $s0, $zero .L80131A20: diff --git a/asm/nonmatchings/code_B9D60/remove_item_entity_by_index.s b/asm/nonmatchings/code_B9D60/remove_item_entity_by_index.s index 3456c46400..14a68c9e5d 100644 --- a/asm/nonmatchings/code_B9D60/remove_item_entity_by_index.s +++ b/asm/nonmatchings/code_B9D60/remove_item_entity_by_index.s @@ -16,14 +16,16 @@ glabel remove_item_entity_by_index /* CA128 80133A28 2C82001D */ sltiu $v0, $a0, 0x1d /* CA12C 80133A2C 10400008 */ beqz $v0, .L80133A50 /* CA130 80133A30 00041080 */ sll $v0, $a0, 2 -/* CA134 80133A34 3C018015 */ lui $at, %hi(D_80150DA0) +/* CA134 80133A34 3C018015 */ lui $at, %hi(jtbl_80150DA0_E74A0) /* CA138 80133A38 00220821 */ addu $at, $at, $v0 -/* CA13C 80133A3C 8C220DA0 */ lw $v0, %lo(D_80150DA0)($at) +/* CA13C 80133A3C 8C220DA0 */ lw $v0, %lo(jtbl_80150DA0_E74A0)($at) /* CA140 80133A40 00400008 */ jr $v0 -/* CA144 80133A44 00000000 */ nop +/* CA144 80133A44 00000000 */ nop +glabel L80133A48_CA148 /* CA148 80133A48 0C0448CA */ jal func_80112328 /* CA14C 80133A4C 84640020 */ lh $a0, 0x20($v1) .L80133A50: +glabel L80133A50_CA150 /* CA150 80133A50 3C118015 */ lui $s1, %hi(D_801565A0) /* CA154 80133A54 263165A0 */ addiu $s1, $s1, %lo(D_801565A0) /* CA158 80133A58 8E220000 */ lw $v0, ($s1) diff --git a/asm/nonmatchings/code_B9D60/remove_item_entity_by_reference.s b/asm/nonmatchings/code_B9D60/remove_item_entity_by_reference.s index dfa0378d7c..deb24ee292 100644 --- a/asm/nonmatchings/code_B9D60/remove_item_entity_by_reference.s +++ b/asm/nonmatchings/code_B9D60/remove_item_entity_by_reference.s @@ -21,25 +21,27 @@ glabel remove_item_entity_by_reference /* CA06C 8013396C 2A020100 */ slti $v0, $s0, 0x100 .L80133970: /* CA070 80133970 1040001D */ beqz $v0, .L801339E8 -/* CA074 80133974 00000000 */ nop +/* CA074 80133974 00000000 */ nop /* CA078 80133978 8E240014 */ lw $a0, 0x14($s1) /* CA07C 8013397C 10800003 */ beqz $a0, .L8013398C -/* CA080 80133980 00000000 */ nop +/* CA080 80133980 00000000 */ nop /* CA084 80133984 0C00AB4B */ jal heap_free -/* CA088 80133988 00000000 */ nop +/* CA088 80133988 00000000 */ nop .L8013398C: /* CA08C 8013398C 8223001B */ lb $v1, 0x1b($s1) /* CA090 80133990 2C62001D */ sltiu $v0, $v1, 0x1d /* CA094 80133994 10400008 */ beqz $v0, .L801339B8 /* CA098 80133998 00031080 */ sll $v0, $v1, 2 -/* CA09C 8013399C 3C018015 */ lui $at, %hi(D_80150D28) +/* CA09C 8013399C 3C018015 */ lui $at, %hi(jtbl_80150D28_E7428) /* CA0A0 801339A0 00220821 */ addu $at, $at, $v0 -/* CA0A4 801339A4 8C220D28 */ lw $v0, %lo(D_80150D28)($at) +/* CA0A4 801339A4 8C220D28 */ lw $v0, %lo(jtbl_80150D28_E7428)($at) /* CA0A8 801339A8 00400008 */ jr $v0 -/* CA0AC 801339AC 00000000 */ nop +/* CA0AC 801339AC 00000000 */ nop +glabel L801339B0_CA0B0 /* CA0B0 801339B0 0C0448CA */ jal func_80112328 /* CA0B4 801339B4 86240020 */ lh $a0, 0x20($s1) .L801339B8: +glabel L801339B8_CA0B8 /* CA0B8 801339B8 3C118015 */ lui $s1, %hi(D_801565A0) /* CA0BC 801339BC 263165A0 */ addiu $s1, $s1, %lo(D_801565A0) /* CA0C0 801339C0 8E220000 */ lw $v0, ($s1) diff --git a/asm/nonmatchings/code_B9D60/render_item_entities.s b/asm/nonmatchings/code_B9D60/render_item_entities.s index fc3371c68e..520e905e7d 100644 --- a/asm/nonmatchings/code_B9D60/render_item_entities.s +++ b/asm/nonmatchings/code_B9D60/render_item_entities.s @@ -52,7 +52,7 @@ glabel render_item_entities /* C9608 80132F08 10620003 */ beq $v1, $v0, .L80132F18 /* C960C 80132F0C 24020156 */ addiu $v0, $zero, 0x156 /* C9610 80132F10 14620005 */ bne $v1, $v0, .L80132F28 -/* C9614 80132F14 00000000 */ nop +/* C9614 80132F14 00000000 */ nop .L80132F18: /* C9618 80132F18 3C013F80 */ lui $at, 0x3f80 /* C961C 80132F1C 44810000 */ mtc1 $at, $f0 @@ -79,7 +79,7 @@ glabel render_item_entities /* C966C 80132F6C 0280202D */ daddu $a0, $s4, $zero /* C9670 80132F70 C642000C */ lwc1 $f2, 0xc($s2) /* C9674 80132F74 44902000 */ mtc1 $s0, $f4 -/* C9678 80132F78 00000000 */ nop +/* C9678 80132F78 00000000 */ nop /* C967C 80132F7C 46802120 */ cvt.s.w $f4, $f4 /* C9680 80132F80 46001087 */ neg.s $f2, $f2 /* C9684 80132F84 46041081 */ sub.s $f2, $f2, $f4 @@ -207,7 +207,7 @@ glabel render_item_entities /* C985C 8013315C 00500018 */ mult $v0, $s0 /* C9860 80133160 00001012 */ mflo $v0 /* C9864 80133164 34638081 */ ori $v1, $v1, 0x8081 -/* C9868 80133168 00000000 */ nop +/* C9868 80133168 00000000 */ nop /* C986C 8013316C 00430018 */ mult $v0, $v1 /* C9870 80133170 00001810 */ mfhi $v1 /* C9874 80133174 00621821 */ addu $v1, $v1, $v0 @@ -241,7 +241,7 @@ glabel render_item_entities /* C98DC 801331DC 3C0E0808 */ lui $t6, 0x808 /* C98E0 801331E0 004E1024 */ and $v0, $v0, $t6 /* C98E4 801331E4 10400029 */ beqz $v0, .L8013328C -/* C98E8 801331E8 00000000 */ nop +/* C98E8 801331E8 00000000 */ nop /* C98EC 801331EC 3C028015 */ lui $v0, %hi(D_80151328) /* C98F0 801331F0 8C421328 */ lw $v0, %lo(D_80151328)($v0) /* C98F4 801331F4 94420000 */ lhu $v0, ($v0) @@ -414,7 +414,7 @@ glabel render_item_entities /* C9B88 80133488 0C052479 */ jal func_801491E4 /* C9B8C 8013348C AFB00014 */ sw $s0, 0x14($sp) /* C9B90 80133490 0804CD62 */ j .L80133588 -/* C9B94 80133494 00000000 */ nop +/* C9B94 80133494 00000000 */ nop .L80133498: /* C9B98 80133498 27A40058 */ addiu $a0, $sp, 0x58 /* C9B9C 8013349C 0000282D */ daddu $a1, $zero, $zero @@ -426,7 +426,7 @@ glabel render_item_entities /* C9BB4 801334B4 0C052479 */ jal func_801491E4 /* C9BB8 801334B8 AFA20014 */ sw $v0, 0x14($sp) /* C9BBC 801334BC 0804CD62 */ j .L80133588 -/* C9BC0 801334C0 00000000 */ nop +/* C9BC0 801334C0 00000000 */ nop .L801334C4: /* C9BC4 801334C4 3C03FD48 */ lui $v1, 0xfd48 /* C9BC8 801334C8 3463000B */ ori $v1, $v1, 0xb @@ -613,7 +613,7 @@ glabel render_item_entities /* C9E94 80133794 0C052479 */ jal func_801491E4 /* C9E98 80133798 AFB00014 */ sw $s0, 0x14($sp) /* C9E9C 8013379C 0804CE25 */ j .L80133894 -/* C9EA0 801337A0 00000000 */ nop +/* C9EA0 801337A0 00000000 */ nop .L801337A4: /* C9EA4 801337A4 27A40058 */ addiu $a0, $sp, 0x58 /* C9EA8 801337A8 0000282D */ daddu $a1, $zero, $zero @@ -625,7 +625,7 @@ glabel render_item_entities /* C9EC0 801337C0 0C052479 */ jal func_801491E4 /* C9EC4 801337C4 AFA20014 */ sw $v0, 0x14($sp) /* C9EC8 801337C8 0804CE25 */ j .L80133894 -/* C9ECC 801337CC 00000000 */ nop +/* C9ECC 801337CC 00000000 */ nop .L801337D0: /* C9ED0 801337D0 3C03FD48 */ lui $v1, 0xfd48 /* C9ED4 801337D4 3463000F */ ori $v1, $v1, 0xf @@ -705,7 +705,7 @@ glabel render_item_entities .L801338F0: /* C9FF0 801338F0 2AC20100 */ slti $v0, $s6, 0x100 /* C9FF4 801338F4 1440FD6C */ bnez $v0, .L80132EA8 -/* C9FF8 801338F8 00000000 */ nop +/* C9FF8 801338F8 00000000 */ nop /* C9FFC 801338FC 8FBF0144 */ lw $ra, 0x144($sp) /* CA000 80133900 8FBE0140 */ lw $fp, 0x140($sp) /* CA004 80133904 8FB7013C */ lw $s7, 0x13c($sp) diff --git a/asm/nonmatchings/code_B9D60/render_messages.s b/asm/nonmatchings/code_B9D60/render_messages.s index c6827c8335..f382f19add 100644 --- a/asm/nonmatchings/code_B9D60/render_messages.s +++ b/asm/nonmatchings/code_B9D60/render_messages.s @@ -143,7 +143,7 @@ glabel render_messages /* BAB0C 8012440C 26310001 */ addiu $s1, $s1, 1 /* BAB10 80124410 2A220003 */ slti $v0, $s1, 3 /* BAB14 80124414 1440FFD4 */ bnez $v0, .L80124368 -/* BAB18 80124418 00000000 */ nop +/* BAB18 80124418 00000000 */ nop /* BAB1C 8012441C 8FBF002C */ lw $ra, 0x2c($sp) /* BAB20 80124420 8FB20028 */ lw $s2, 0x28($sp) /* BAB24 80124424 8FB10024 */ lw $s1, 0x24($sp) diff --git a/asm/nonmatchings/code_B9D60/set_message_string.s b/asm/nonmatchings/code_B9D60/set_message_string.s index 364e352354..874c9f10da 100644 --- a/asm/nonmatchings/code_B9D60/set_message_string.s +++ b/asm/nonmatchings/code_B9D60/set_message_string.s @@ -31,7 +31,7 @@ glabel set_message_string /* BC29C 80125B9C A0830000 */ sb $v1, ($a0) /* BC2A0 80125BA0 90420000 */ lbu $v0, ($v0) /* BC2A4 80125BA4 10460006 */ beq $v0, $a2, .L80125BC0 -/* BC2A8 80125BA8 00000000 */ nop +/* BC2A8 80125BA8 00000000 */ nop /* BC2AC 80125BAC 24A50001 */ addiu $a1, $a1, 1 /* BC2B0 80125BB0 28A20020 */ slti $v0, $a1, 0x20 /* BC2B4 80125BB4 1440FFF7 */ bnez $v0, .L80125B94 @@ -39,7 +39,7 @@ glabel set_message_string /* BC2BC 80125BBC A086FFFF */ sb $a2, -1($a0) .L80125BC0: /* BC2C0 80125BC0 12200003 */ beqz $s1, .L80125BD0 -/* BC2C4 80125BC4 00000000 */ nop +/* BC2C4 80125BC4 00000000 */ nop /* BC2C8 80125BC8 0C00AB1E */ jal general_heap_free /* BC2CC 80125BCC 0220202D */ daddu $a0, $s1, $zero .L80125BD0: diff --git a/asm/nonmatchings/code_B9D60/test_item_player_collision.s b/asm/nonmatchings/code_B9D60/test_item_player_collision.s index 6cc6c2fe9e..97365190ca 100644 --- a/asm/nonmatchings/code_B9D60/test_item_player_collision.s +++ b/asm/nonmatchings/code_B9D60/test_item_player_collision.s @@ -44,7 +44,7 @@ glabel test_item_player_collision /* CA2A4 80133BA4 8C63A600 */ lw $v1, %lo(gGameState)($v1) /* CA2A8 80133BA8 24020002 */ addiu $v0, $zero, 2 /* CA2AC 80133BAC 10620003 */ beq $v1, $v0, .L80133BBC -/* CA2B0 80133BB0 00000000 */ nop +/* CA2B0 80133BB0 00000000 */ nop /* CA2B4 80133BB4 146000F6 */ bnez $v1, .L80133F90 /* CA2B8 80133BB8 0000102D */ daddu $v0, $zero, $zero .L80133BBC: @@ -66,7 +66,7 @@ glabel test_item_player_collision /* CA2F8 80133BF8 144000E5 */ bnez $v0, .L80133F90 /* CA2FC 80133BFC 0000102D */ daddu $v0, $zero, $zero /* CA300 80133C00 0C009C64 */ jal func_80027190 -/* CA304 80133C04 00000000 */ nop +/* CA304 80133C04 00000000 */ nop /* CA308 80133C08 144000E1 */ bnez $v0, .L80133F90 /* CA30C 80133C0C 0000102D */ daddu $v0, $zero, $zero /* CA310 80133C10 82820000 */ lb $v0, ($s4) @@ -98,7 +98,7 @@ glabel test_item_player_collision /* CA370 80133C70 00431021 */ addu $v0, $v0, $v1 /* CA374 80133C74 00021043 */ sra $v0, $v0, 1 /* CA378 80133C78 44823000 */ mtc1 $v0, $f6 -/* CA37C 80133C7C 00000000 */ nop +/* CA37C 80133C7C 00000000 */ nop /* CA380 80133C80 468031A0 */ cvt.s.w $f6, $f6 /* CA384 80133C84 E7A6001C */ swc1 $f6, 0x1c($sp) /* CA388 80133C88 C63E0028 */ lwc1 $f30, 0x28($s1) @@ -114,10 +114,10 @@ glabel test_item_player_collision /* CA3AC 80133CAC 3C014334 */ lui $at, 0x4334 /* CA3B0 80133CB0 44810000 */ mtc1 $at, $f0 /* CA3B4 80133CB4 44823000 */ mtc1 $v0, $f6 -/* CA3B8 80133CB8 00000000 */ nop +/* CA3B8 80133CB8 00000000 */ nop /* CA3BC 80133CBC 468031A0 */ cvt.s.w $f6, $f6 /* CA3C0 80133CC0 4600703C */ c.lt.s $f14, $f0 -/* CA3C4 80133CC4 00000000 */ nop +/* CA3C4 80133CC4 00000000 */ nop /* CA3C8 80133CC8 45000006 */ bc1f .L80133CE4 /* CA3CC 80133CCC E7A60020 */ swc1 $f6, 0x20($sp) /* CA3D0 80133CD0 C600006C */ lwc1 $f0, 0x6c($s0) @@ -129,11 +129,11 @@ glabel test_item_player_collision /* CA3E4 80133CE4 C600006C */ lwc1 $f0, 0x6c($s0) /* CA3E8 80133CE8 3C0142B4 */ lui $at, 0x42b4 /* CA3EC 80133CEC 44816000 */ mtc1 $at, $f12 -/* CA3F0 80133CF0 00000000 */ nop +/* CA3F0 80133CF0 00000000 */ nop /* CA3F4 80133CF4 460C0300 */ add.s $f12, $f0, $f12 .L80133CF8: /* CA3F8 80133CF8 0C00A6C9 */ jal clamp_angle -/* CA3FC 80133CFC 00000000 */ nop +/* CA3FC 80133CFC 00000000 */ nop /* CA400 80133D00 46000386 */ mov.s $f14, $f0 /* CA404 80133D04 C60C006C */ lwc1 $f12, 0x6c($s0) /* CA408 80133D08 C7A80018 */ lwc1 $f8, 0x18($sp) @@ -141,9 +141,9 @@ glabel test_item_player_collision /* CA410 80133D10 0C00A70A */ jal get_clamped_angle_diff /* CA414 80133D14 E7A80014 */ swc1 $f8, 0x14($sp) /* CA418 80133D18 44801000 */ mtc1 $zero, $f2 -/* CA41C 80133D1C 00000000 */ nop +/* CA41C 80133D1C 00000000 */ nop /* CA420 80133D20 4602003C */ c.lt.s $f0, $f2 -/* CA424 80133D24 00000000 */ nop +/* CA424 80133D24 00000000 */ nop /* CA428 80133D28 4500000F */ bc1f .L80133D68 /* CA42C 80133D2C E7BA0024 */ swc1 $f26, 0x24($sp) /* CA430 80133D30 C600006C */ lwc1 $f0, 0x6c($s0) @@ -173,11 +173,11 @@ glabel test_item_player_collision /* CA48C 80133D8C 27A40010 */ addiu $a0, $sp, 0x10 /* CA490 80133D90 3C0141F0 */ lui $at, 0x41f0 /* CA494 80133D94 44816000 */ mtc1 $at, $f12 -/* CA498 80133D98 00000000 */ nop +/* CA498 80133D98 00000000 */ nop /* CA49C 80133D9C 460C0301 */ sub.s $f12, $f0, $f12 .L80133DA0: /* CA4A0 80133DA0 0C00A6C9 */ jal clamp_angle -/* CA4A4 80133DA4 00000000 */ nop +/* CA4A4 80133DA4 00000000 */ nop /* CA4A8 80133DA8 27A40010 */ addiu $a0, $sp, 0x10 .L80133DAC: /* CA4AC 80133DAC 3C0641C0 */ lui $a2, 0x41c0 @@ -191,39 +191,39 @@ glabel test_item_player_collision /* CA4CC 80133DCC 4481E000 */ mtc1 $at, $f28 /* CA4D0 80133DD0 461EB081 */ sub.s $f2, $f22, $f30 /* CA4D4 80133DD4 46021082 */ mul.s $f2, $f2, $f2 -/* CA4D8 80133DD8 00000000 */ nop +/* CA4D8 80133DD8 00000000 */ nop /* CA4DC 80133DDC C7A60018 */ lwc1 $f6, 0x18($sp) /* CA4E0 80133DE0 4606C001 */ sub.s $f0, $f24, $f6 /* CA4E4 80133DE4 46000002 */ mul.s $f0, $f0, $f0 -/* CA4E8 80133DE8 00000000 */ nop +/* CA4E8 80133DE8 00000000 */ nop /* CA4EC 80133DEC 46001300 */ add.s $f12, $f2, $f0 /* CA4F0 80133DF0 46006104 */ sqrt.s $f4, $f12 /* CA4F4 80133DF4 46042032 */ c.eq.s $f4, $f4 -/* CA4F8 80133DF8 00000000 */ nop +/* CA4F8 80133DF8 00000000 */ nop /* CA4FC 80133DFC 45010004 */ bc1t .L80133E10 -/* CA500 80133E00 00000000 */ nop +/* CA500 80133E00 00000000 */ nop /* CA504 80133E04 0C0187BC */ jal sqrtf -/* CA508 80133E08 00000000 */ nop +/* CA508 80133E08 00000000 */ nop /* CA50C 80133E0C 46000106 */ mov.s $f4, $f0 .L80133E10: /* CA510 80133E10 C7A80020 */ lwc1 $f8, 0x20($sp) /* CA514 80133E14 461C4000 */ add.s $f0, $f8, $f28 /* CA518 80133E18 4604003E */ c.le.s $f0, $f4 -/* CA51C 80133E1C 00000000 */ nop +/* CA51C 80133E1C 00000000 */ nop /* CA520 80133E20 4501000F */ bc1t .L80133E60 -/* CA524 80133E24 00000000 */ nop +/* CA524 80133E24 00000000 */ nop /* CA528 80133E28 3C0141D8 */ lui $at, 0x41d8 /* CA52C 80133E2C 44813000 */ mtc1 $at, $f6 -/* CA530 80133E30 00000000 */ nop +/* CA530 80133E30 00000000 */ nop /* CA534 80133E34 4606A000 */ add.s $f0, $f20, $f6 /* CA538 80133E38 461A003C */ c.lt.s $f0, $f26 -/* CA53C 80133E3C 00000000 */ nop +/* CA53C 80133E3C 00000000 */ nop /* CA540 80133E40 45010007 */ bc1t .L80133E60 -/* CA544 80133E44 00000000 */ nop +/* CA544 80133E44 00000000 */ nop /* CA548 80133E48 C7A8001C */ lwc1 $f8, 0x1c($sp) /* CA54C 80133E4C 4608D000 */ add.s $f0, $f26, $f8 /* CA550 80133E50 4614003C */ c.lt.s $f0, $f20 -/* CA554 80133E54 00000000 */ nop +/* CA554 80133E54 00000000 */ nop /* CA558 80133E58 45020001 */ bc1fl .L80133E60 /* CA55C 80133E5C 24120001 */ addiu $s2, $zero, 1 .L80133E60: @@ -234,53 +234,53 @@ glabel test_item_player_collision /* CA570 80133E70 8E220000 */ lw $v0, ($s1) /* CA574 80133E74 00431024 */ and $v0, $v0, $v1 /* CA578 80133E78 1040002B */ beqz $v0, .L80133F28 -/* CA57C 80133E7C 00000000 */ nop +/* CA57C 80133E7C 00000000 */ nop /* CA580 80133E80 C7A00010 */ lwc1 $f0, 0x10($sp) /* CA584 80133E84 4600B081 */ sub.s $f2, $f22, $f0 /* CA588 80133E88 46021082 */ mul.s $f2, $f2, $f2 -/* CA58C 80133E8C 00000000 */ nop +/* CA58C 80133E8C 00000000 */ nop /* CA590 80133E90 C7A00014 */ lwc1 $f0, 0x14($sp) /* CA594 80133E94 4600C001 */ sub.s $f0, $f24, $f0 /* CA598 80133E98 46000002 */ mul.s $f0, $f0, $f0 -/* CA59C 80133E9C 00000000 */ nop +/* CA59C 80133E9C 00000000 */ nop /* CA5A0 80133EA0 46001300 */ add.s $f12, $f2, $f0 /* CA5A4 80133EA4 46006104 */ sqrt.s $f4, $f12 /* CA5A8 80133EA8 46042032 */ c.eq.s $f4, $f4 -/* CA5AC 80133EAC 00000000 */ nop +/* CA5AC 80133EAC 00000000 */ nop /* CA5B0 80133EB0 45010004 */ bc1t .L80133EC4 -/* CA5B4 80133EB4 00000000 */ nop +/* CA5B4 80133EB4 00000000 */ nop /* CA5B8 80133EB8 0C0187BC */ jal sqrtf -/* CA5BC 80133EBC 00000000 */ nop +/* CA5BC 80133EBC 00000000 */ nop /* CA5C0 80133EC0 46000106 */ mov.s $f4, $f0 .L80133EC4: /* CA5C4 80133EC4 3C014160 */ lui $at, 0x4160 /* CA5C8 80133EC8 44813000 */ mtc1 $at, $f6 -/* CA5CC 80133ECC 00000000 */ nop +/* CA5CC 80133ECC 00000000 */ nop /* CA5D0 80133ED0 461C3000 */ add.s $f0, $f6, $f28 /* CA5D4 80133ED4 4604003E */ c.le.s $f0, $f4 -/* CA5D8 80133ED8 00000000 */ nop +/* CA5D8 80133ED8 00000000 */ nop /* CA5DC 80133EDC 45010012 */ bc1t .L80133F28 -/* CA5E0 80133EE0 00000000 */ nop +/* CA5E0 80133EE0 00000000 */ nop /* CA5E4 80133EE4 3C0141D8 */ lui $at, 0x41d8 /* CA5E8 80133EE8 44814000 */ mtc1 $at, $f8 -/* CA5EC 80133EEC 00000000 */ nop +/* CA5EC 80133EEC 00000000 */ nop /* CA5F0 80133EF0 4608A000 */ add.s $f0, $f20, $f8 /* CA5F4 80133EF4 C7A60024 */ lwc1 $f6, 0x24($sp) /* CA5F8 80133EF8 4606003C */ c.lt.s $f0, $f6 -/* CA5FC 80133EFC 00000000 */ nop +/* CA5FC 80133EFC 00000000 */ nop /* CA600 80133F00 45010009 */ bc1t .L80133F28 -/* CA604 80133F04 00000000 */ nop +/* CA604 80133F04 00000000 */ nop /* CA608 80133F08 3C014190 */ lui $at, 0x4190 /* CA60C 80133F0C 44814000 */ mtc1 $at, $f8 -/* CA610 80133F10 00000000 */ nop +/* CA610 80133F10 00000000 */ nop /* CA614 80133F14 46083000 */ add.s $f0, $f6, $f8 /* CA618 80133F18 4614003C */ c.lt.s $f0, $f20 -/* CA61C 80133F1C 00000000 */ nop +/* CA61C 80133F1C 00000000 */ nop /* CA620 80133F20 45020001 */ bc1fl .L80133F28 /* CA624 80133F24 24120001 */ addiu $s2, $zero, 1 .L80133F28: /* CA628 80133F28 12400012 */ beqz $s2, .L80133F74 -/* CA62C 80133F2C 00000000 */ nop +/* CA62C 80133F2C 00000000 */ nop /* CA630 80133F30 8E640000 */ lw $a0, ($s3) /* CA634 80133F34 30820080 */ andi $v0, $a0, 0x80 /* CA638 80133F38 10400015 */ beqz $v0, .L80133F90 diff --git a/asm/nonmatchings/code_B9D60/update_item_entities.s b/asm/nonmatchings/code_B9D60/update_item_entities.s index 5051f9abc0..c30ac1aeec 100644 --- a/asm/nonmatchings/code_B9D60/update_item_entities.s +++ b/asm/nonmatchings/code_B9D60/update_item_entities.s @@ -26,12 +26,12 @@ glabel update_item_entities /* C863C 80131F3C 24020157 */ addiu $v0, $zero, 0x157 /* C8640 80131F40 86230018 */ lh $v1, 0x18($s1) /* C8644 80131F44 14620019 */ bne $v1, $v0, .L80131FAC -/* C8648 80131F48 00000000 */ nop +/* C8648 80131F48 00000000 */ nop /* C864C 80131F4C 0C00A67F */ jal rand_int /* C8650 80131F50 24040064 */ addiu $a0, $zero, 0x64 /* C8654 80131F54 2842005B */ slti $v0, $v0, 0x5b /* C8658 80131F58 14400012 */ bnez $v0, .L80131FA4 -/* C865C 80131F5C 00000000 */ nop +/* C865C 80131F5C 00000000 */ nop /* C8660 80131F60 3C058010 */ lui $a1, %hi(D_80104AC0) /* C8664 80131F64 24A54AC0 */ addiu $a1, $a1, %lo(D_80104AC0) /* C8668 80131F68 0C04C27C */ jal func_801309F0 @@ -59,26 +59,31 @@ glabel update_item_entities /* C86B8 80131FB8 2C62001D */ sltiu $v0, $v1, 0x1d /* C86BC 80131FBC 10400014 */ beqz $v0, .L80132010 /* C86C0 80131FC0 00031080 */ sll $v0, $v1, 2 -/* C86C4 80131FC4 3C018015 */ lui $at, %hi(D_80150BD8) +/* C86C4 80131FC4 3C018015 */ lui $at, %hi(jtbl_80150BD8_E72D8) /* C86C8 80131FC8 00220821 */ addu $at, $at, $v0 -/* C86CC 80131FCC 8C220BD8 */ lw $v0, %lo(D_80150BD8)($at) +/* C86CC 80131FCC 8C220BD8 */ lw $v0, %lo(jtbl_80150BD8_E72D8)($at) /* C86D0 80131FD0 00400008 */ jr $v0 -/* C86D4 80131FD4 00000000 */ nop +/* C86D4 80131FD4 00000000 */ nop +glabel L80131FD8_C86D8 /* C86D8 80131FD8 0C04D596 */ jal update_item_entity_static /* C86DC 80131FDC 0220202D */ daddu $a0, $s1, $zero /* C86E0 80131FE0 0804C804 */ j .L80132010 -/* C86E4 80131FE4 00000000 */ nop +/* C86E4 80131FE4 00000000 */ nop +glabel L80131FE8_C86E8 /* C86E8 80131FE8 0C04D5B3 */ jal func_801356CC /* C86EC 80131FEC 0220202D */ daddu $a0, $s1, $zero /* C86F0 80131FF0 0804C804 */ j .L80132010 -/* C86F4 80131FF4 00000000 */ nop +/* C86F4 80131FF4 00000000 */ nop +glabel L80131FF8_C86F8 /* C86F8 80131FF8 0C04D094 */ jal update_item_entity_collectable /* C86FC 80131FFC 0220202D */ daddu $a0, $s1, $zero /* C8700 80132000 0804C804 */ j .L80132010 -/* C8704 80132004 00000000 */ nop +/* C8704 80132004 00000000 */ nop +glabel L80132008_C8708 /* C8708 80132008 0C04D5B7 */ jal update_item_entity_temp /* C870C 8013200C 0220202D */ daddu $a0, $s1, $zero .L80132010: +glabel L80132010_C8710 /* C8710 80132010 3C028015 */ lui $v0, %hi(D_801565A0) /* C8714 80132014 8C4265A0 */ lw $v0, %lo(D_801565A0)($v0) /* C8718 80132018 02421021 */ addu $v0, $s2, $v0 @@ -89,11 +94,12 @@ glabel update_item_entities /* C872C 8013202C 2C62001D */ sltiu $v0, $v1, 0x1d /* C8730 80132030 10400043 */ beqz $v0, .L80132140 /* C8734 80132034 00031080 */ sll $v0, $v1, 2 -/* C8738 80132038 3C018015 */ lui $at, %hi(D_80150C50) +/* C8738 80132038 3C018015 */ lui $at, %hi(jtbl_80150C50_E7350) /* C873C 8013203C 00220821 */ addu $at, $at, $v0 -/* C8740 80132040 8C220C50 */ lw $v0, %lo(D_80150C50)($at) +/* C8740 80132040 8C220C50 */ lw $v0, %lo(jtbl_80150C50_E7350)($at) /* C8744 80132044 00400008 */ jr $v0 -/* C8748 80132048 00000000 */ nop +/* C8748 80132048 00000000 */ nop +glabel L8013204C_C874C /* C874C 8013204C C6200008 */ lwc1 $f0, 8($s1) /* C8750 80132050 C622000C */ lwc1 $f2, 0xc($s1) /* C8754 80132054 86220034 */ lh $v0, 0x34($s1) @@ -105,13 +111,13 @@ glabel update_item_entities /* C876C 8013206C 4600020D */ trunc.w.s $f8, $f0 /* C8770 80132070 44044000 */ mfc1 $a0, $f8 /* C8774 80132074 14620007 */ bne $v1, $v0, .L80132094 -/* C8778 80132078 00000000 */ nop +/* C8778 80132078 00000000 */ nop /* C877C 8013207C 86220036 */ lh $v0, 0x36($s1) /* C8780 80132080 14A20004 */ bne $a1, $v0, .L80132094 -/* C8784 80132084 00000000 */ nop +/* C8784 80132084 00000000 */ nop /* C8788 80132088 86220038 */ lh $v0, 0x38($s1) /* C878C 8013208C 1082002C */ beq $a0, $v0, .L80132140 -/* C8790 80132090 00000000 */ nop +/* C8790 80132090 00000000 */ nop .L80132094: /* C8794 80132094 0C044181 */ jal get_shadow_by_index /* C8798 80132098 86240020 */ lh $a0, 0x20($s1) @@ -148,7 +154,7 @@ glabel update_item_entities /* C8814 80132114 44810000 */ mtc1 $at, $f0 /* C8818 80132118 C444011C */ lwc1 $f4, 0x11c($v0) /* C881C 8013211C 46001082 */ mul.s $f2, $f2, $f0 -/* C8820 80132120 00000000 */ nop +/* C8820 80132120 00000000 */ nop /* C8824 80132124 AE00002C */ sw $zero, 0x2c($s0) /* C8828 80132128 E6040028 */ swc1 $f4, 0x28($s0) /* C882C 8013212C C4400124 */ lwc1 $f0, 0x124($v0) @@ -157,6 +163,7 @@ glabel update_item_entities /* C8838 80132138 0C044A17 */ jal set_standard_shadow_scale /* C883C 8013213C E4800030 */ swc1 $f0, 0x30($a0) .L80132140: +glabel L80132140_C8840 /* C8840 80132140 C6200008 */ lwc1 $f0, 8($s1) /* C8844 80132144 C6220010 */ lwc1 $f2, 0x10($s1) /* C8848 80132148 4600020D */ trunc.w.s $f8, $f0 @@ -165,11 +172,11 @@ glabel update_item_entities /* C8854 80132154 A6220034 */ sh $v0, 0x34($s1) /* C8858 80132158 4600020D */ trunc.w.s $f8, $f0 /* C885C 8013215C 44024000 */ mfc1 $v0, $f8 -/* C8860 80132160 00000000 */ nop +/* C8860 80132160 00000000 */ nop /* C8864 80132164 A6220036 */ sh $v0, 0x36($s1) /* C8868 80132168 4600120D */ trunc.w.s $f8, $f2 /* C886C 8013216C 44024000 */ mfc1 $v0, $f8 -/* C8870 80132170 00000000 */ nop +/* C8870 80132170 00000000 */ nop /* C8874 80132174 A6220038 */ sh $v0, 0x38($s1) .L80132178: /* C8878 80132178 26730001 */ addiu $s3, $s3, 1 diff --git a/asm/nonmatchings/code_B9D60/update_item_entity_collectable.s b/asm/nonmatchings/code_B9D60/update_item_entity_collectable.s index 463d300648..af4acd1b21 100644 --- a/asm/nonmatchings/code_B9D60/update_item_entity_collectable.s +++ b/asm/nonmatchings/code_B9D60/update_item_entity_collectable.s @@ -36,7 +36,7 @@ glabel update_item_entity_collectable /* CA9C8 801342C8 10820203 */ beq $a0, $v0, .L80134AD8 /* CA9CC 801342CC 24020014 */ addiu $v0, $zero, 0x14 /* CA9D0 801342D0 0804D44D */ j .L80135134 -/* CA9D4 801342D4 00000000 */ nop +/* CA9D4 801342D4 00000000 */ nop .L801342D8: /* CA9D8 801342D8 0C04C3EB */ jal func_80130FAC /* CA9DC 801342DC 0240202D */ daddu $a0, $s2, $zero @@ -47,7 +47,7 @@ glabel update_item_entity_collectable /* CA9F0 801342F0 AE510014 */ sw $s1, 0x14($s2) .L801342F4: /* CA9F4 801342F4 0804D0BD */ j .L801342F4 -/* CA9F8 801342F8 00000000 */ nop +/* CA9F8 801342F8 00000000 */ nop .L801342FC: /* CA9FC 801342FC 8E430000 */ lw $v1, ($s2) /* CAA00 80134300 3C020100 */ lui $v0, 0x100 @@ -57,15 +57,15 @@ glabel update_item_entity_collectable /* CAA10 80134310 3C014180 */ lui $at, 0x4180 /* CAA14 80134314 44810000 */ mtc1 $at, $f0 /* CAA18 80134318 0804D0D1 */ j .L80134344 -/* CAA1C 8013431C 00000000 */ nop +/* CAA1C 8013431C 00000000 */ nop .L80134320: /* CAA20 80134320 00621024 */ and $v0, $v1, $v0 /* CAA24 80134324 14400005 */ bnez $v0, .L8013433C -/* CAA28 80134328 00000000 */ nop +/* CAA28 80134328 00000000 */ nop /* CAA2C 8013432C 3C014140 */ lui $at, 0x4140 /* CAA30 80134330 44810000 */ mtc1 $at, $f0 /* CAA34 80134334 0804D0D1 */ j .L80134344 -/* CAA38 80134338 00000000 */ nop +/* CAA38 80134338 00000000 */ nop .L8013433C: /* CAA3C 8013433C 3C014160 */ lui $at, 0x4160 /* CAA40 80134340 44810000 */ mtc1 $at, $f0 @@ -76,12 +76,12 @@ glabel update_item_entity_collectable /* CAA50 80134350 E6220004 */ swc1 $f2, 4($s1) /* CAA54 80134354 3C0141C0 */ lui $at, 0x41c0 /* CAA58 80134358 44810000 */ mtc1 $at, $f0 -/* CAA5C 8013435C 00000000 */ nop +/* CAA5C 8013435C 00000000 */ nop /* CAA60 80134360 E6200008 */ swc1 $f0, 8($s1) /* CAA64 80134364 E620000C */ swc1 $f0, 0xc($s1) /* CAA68 80134368 8642001E */ lh $v0, 0x1e($s2) /* CAA6C 8013436C 04410164 */ bgez $v0, .L80134900 -/* CAA70 80134370 00000000 */ nop +/* CAA70 80134370 00000000 */ nop /* CAA74 80134374 96430018 */ lhu $v1, 0x18($s2) /* CAA78 80134378 2462FFF0 */ addiu $v0, $v1, -0x10 /* CAA7C 8013437C 2C4200CB */ sltiu $v0, $v0, 0xcb @@ -91,7 +91,7 @@ glabel update_item_entity_collectable /* CAA8C 8013438C 24042710 */ addiu $a0, $zero, 0x2710 /* CAA90 80134390 28421388 */ slti $v0, $v0, 0x1388 /* CAA94 80134394 10400011 */ beqz $v0, .L801343DC -/* CAA98 80134398 00000000 */ nop +/* CAA98 80134398 00000000 */ nop /* CAA9C 8013439C 0C00A67F */ jal rand_int /* CAAA0 801343A0 2404001E */ addiu $a0, $zero, 0x1e /* CAAA4 801343A4 00101880 */ sll $v1, $s0, 2 @@ -123,11 +123,11 @@ glabel update_item_entity_collectable /* CAB08 80134408 C42C1DEC */ lwc1 $f12, %lo(D_800B1DEC)($at) /* CAB0C 8013440C 3C0142D2 */ lui $at, 0x42d2 /* CAB10 80134410 44810000 */ mtc1 $at, $f0 -/* CAB14 80134414 00000000 */ nop +/* CAB14 80134414 00000000 */ nop /* CAB18 80134418 46006301 */ sub.s $f12, $f12, $f0 .L8013441C: /* CAB1C 8013441C 44820000 */ mtc1 $v0, $f0 -/* CAB20 80134420 00000000 */ nop +/* CAB20 80134420 00000000 */ nop /* CAB24 80134424 46800020 */ cvt.s.w $f0, $f0 /* CAB28 80134428 46006300 */ add.s $f12, $f12, $f0 /* CAB2C 8013442C 3C014170 */ lui $at, 0x4170 @@ -138,7 +138,7 @@ glabel update_item_entity_collectable /* CAB40 80134440 C6200000 */ lwc1 $f0, ($s1) /* CAB44 80134444 3C014080 */ lui $at, 0x4080 /* CAB48 80134448 44811000 */ mtc1 $at, $f2 -/* CAB4C 8013444C 00000000 */ nop +/* CAB4C 8013444C 00000000 */ nop /* CAB50 80134450 46020000 */ add.s $f0, $f0, $f2 /* CAB54 80134454 0804D20B */ j .L8013482C /* CAB58 80134458 E6200000 */ swc1 $f0, ($s1) @@ -154,7 +154,7 @@ glabel update_item_entity_collectable /* CAB7C 8013447C 10400029 */ beqz $v0, .L80134524 /* CAB80 80134480 24020010 */ addiu $v0, $zero, 0x10 /* CAB84 80134484 1062003C */ beq $v1, $v0, .L80134578 -/* CAB88 80134488 00000000 */ nop +/* CAB88 80134488 00000000 */ nop /* CAB8C 8013448C 0804D20B */ j .L8013482C /* CAB90 80134490 AE200018 */ sw $zero, 0x18($s1) .L80134494: @@ -167,7 +167,7 @@ glabel update_item_entity_collectable /* CABAC 801344AC 10620005 */ beq $v1, $v0, .L801344C4 /* CABB0 801344B0 2402015C */ addiu $v0, $zero, 0x15c /* CABB4 801344B4 1062008D */ beq $v1, $v0, .L801346EC -/* CABB8 801344B8 00000000 */ nop +/* CABB8 801344B8 00000000 */ nop /* CABBC 801344BC 0804D20B */ j .L8013482C /* CABC0 801344C0 AE200018 */ sw $zero, 0x18($s1) .L801344C4: @@ -185,10 +185,10 @@ glabel update_item_entity_collectable /* CABF0 801344F0 C42C1DEC */ lwc1 $f12, %lo(D_800B1DEC)($at) /* CABF4 801344F4 3C0142B4 */ lui $at, 0x42b4 /* CABF8 801344F8 44810000 */ mtc1 $at, $f0 -/* CABFC 801344FC 00000000 */ nop +/* CABFC 801344FC 00000000 */ nop /* CAC00 80134500 46006301 */ sub.s $f12, $f12, $f0 /* CAC04 80134504 44820000 */ mtc1 $v0, $f0 -/* CAC08 80134508 00000000 */ nop +/* CAC08 80134508 00000000 */ nop /* CAC0C 8013450C 46800020 */ cvt.s.w $f0, $f0 /* CAC10 80134510 46006300 */ add.s $f12, $f12, $f0 /* CAC14 80134514 3C014270 */ lui $at, 0x4270 @@ -200,7 +200,7 @@ glabel update_item_entity_collectable /* CAC28 80134528 24042710 */ addiu $a0, $zero, 0x2710 /* CAC2C 8013452C 28421388 */ slti $v0, $v0, 0x1388 /* CAC30 80134530 144000A3 */ bnez $v0, .L801347C0 -/* CAC34 80134534 00000000 */ nop +/* CAC34 80134534 00000000 */ nop /* CAC38 80134538 0C00A67F */ jal rand_int /* CAC3C 8013453C 24040078 */ addiu $a0, $zero, 0x78 /* CAC40 80134540 00101880 */ sll $v1, $s0, 2 @@ -222,7 +222,7 @@ glabel update_item_entity_collectable /* CAC7C 8013457C 24042710 */ addiu $a0, $zero, 0x2710 /* CAC80 80134580 28421388 */ slti $v0, $v0, 0x1388 /* CAC84 80134584 1440008E */ bnez $v0, .L801347C0 -/* CAC88 80134588 00000000 */ nop +/* CAC88 80134588 00000000 */ nop /* CAC8C 8013458C 0C00A67F */ jal rand_int /* CAC90 80134590 24040078 */ addiu $a0, $zero, 0x78 /* CAC94 80134594 00101880 */ sll $v1, $s0, 2 @@ -242,7 +242,7 @@ glabel update_item_entity_collectable .L801345CC: /* CACCC 801345CC 8243001B */ lb $v1, 0x1b($s2) /* CACD0 801345D0 10620011 */ beq $v1, $v0, .L80134618 -/* CACD4 801345D4 00000000 */ nop +/* CACD4 801345D4 00000000 */ nop /* CACD8 801345D8 0C00A67F */ jal rand_int /* CACDC 801345DC 24040078 */ addiu $a0, $zero, 0x78 /* CACE0 801345E0 00101880 */ sll $v1, $s0, 2 @@ -264,7 +264,7 @@ glabel update_item_entity_collectable /* CAD1C 8013461C 24042710 */ addiu $a0, $zero, 0x2710 /* CAD20 80134620 28421388 */ slti $v0, $v0, 0x1388 /* CAD24 80134624 10400019 */ beqz $v0, .L8013468C -/* CAD28 80134628 00000000 */ nop +/* CAD28 80134628 00000000 */ nop /* CAD2C 8013462C 0C00A67F */ jal rand_int /* CAD30 80134630 2404003C */ addiu $a0, $zero, 0x3c /* CAD34 80134634 00101880 */ sll $v1, $s0, 2 @@ -279,10 +279,10 @@ glabel update_item_entity_collectable /* CAD58 80134658 C42C1DEC */ lwc1 $f12, %lo(D_800B1DEC)($at) /* CAD5C 8013465C 3C0142B4 */ lui $at, 0x42b4 /* CAD60 80134660 44810000 */ mtc1 $at, $f0 -/* CAD64 80134664 00000000 */ nop +/* CAD64 80134664 00000000 */ nop /* CAD68 80134668 46006300 */ add.s $f12, $f12, $f0 /* CAD6C 8013466C 44820000 */ mtc1 $v0, $f0 -/* CAD70 80134670 00000000 */ nop +/* CAD70 80134670 00000000 */ nop /* CAD74 80134674 46800020 */ cvt.s.w $f0, $f0 /* CAD78 80134678 46006300 */ add.s $f12, $f12, $f0 /* CAD7C 8013467C 3C0141F0 */ lui $at, 0x41f0 @@ -304,10 +304,10 @@ glabel update_item_entity_collectable /* CADB8 801346B8 C42C1DEC */ lwc1 $f12, %lo(D_800B1DEC)($at) /* CADBC 801346BC 3C0142B4 */ lui $at, 0x42b4 /* CADC0 801346C0 44810000 */ mtc1 $at, $f0 -/* CADC4 801346C4 00000000 */ nop +/* CADC4 801346C4 00000000 */ nop /* CADC8 801346C8 46006301 */ sub.s $f12, $f12, $f0 /* CADCC 801346CC 44820000 */ mtc1 $v0, $f0 -/* CADD0 801346D0 00000000 */ nop +/* CADD0 801346D0 00000000 */ nop /* CADD4 801346D4 46800020 */ cvt.s.w $f0, $f0 /* CADD8 801346D8 46006300 */ add.s $f12, $f12, $f0 /* CADDC 801346DC 3C0141F0 */ lui $at, 0x41f0 @@ -319,7 +319,7 @@ glabel update_item_entity_collectable /* CADF0 801346F0 24042710 */ addiu $a0, $zero, 0x2710 /* CADF4 801346F4 28421388 */ slti $v0, $v0, 0x1388 /* CADF8 801346F8 10400019 */ beqz $v0, .L80134760 -/* CADFC 801346FC 00000000 */ nop +/* CADFC 801346FC 00000000 */ nop /* CAE00 80134700 0C00A67F */ jal rand_int /* CAE04 80134704 2404003C */ addiu $a0, $zero, 0x3c /* CAE08 80134708 00101880 */ sll $v1, $s0, 2 @@ -334,10 +334,10 @@ glabel update_item_entity_collectable /* CAE2C 8013472C C42C1DEC */ lwc1 $f12, %lo(D_800B1DEC)($at) /* CAE30 80134730 3C0142B4 */ lui $at, 0x42b4 /* CAE34 80134734 44810000 */ mtc1 $at, $f0 -/* CAE38 80134738 00000000 */ nop +/* CAE38 80134738 00000000 */ nop /* CAE3C 8013473C 46006300 */ add.s $f12, $f12, $f0 /* CAE40 80134740 44820000 */ mtc1 $v0, $f0 -/* CAE44 80134744 00000000 */ nop +/* CAE44 80134744 00000000 */ nop /* CAE48 80134748 46800020 */ cvt.s.w $f0, $f0 /* CAE4C 8013474C 46006300 */ add.s $f12, $f12, $f0 /* CAE50 80134750 3C0141F0 */ lui $at, 0x41f0 @@ -359,10 +359,10 @@ glabel update_item_entity_collectable /* CAE8C 8013478C C42C1DEC */ lwc1 $f12, %lo(D_800B1DEC)($at) /* CAE90 80134790 3C0142B4 */ lui $at, 0x42b4 /* CAE94 80134794 44810000 */ mtc1 $at, $f0 -/* CAE98 80134798 00000000 */ nop +/* CAE98 80134798 00000000 */ nop /* CAE9C 8013479C 46006301 */ sub.s $f12, $f12, $f0 /* CAEA0 801347A0 44820000 */ mtc1 $v0, $f0 -/* CAEA4 801347A4 00000000 */ nop +/* CAEA4 801347A4 00000000 */ nop /* CAEA8 801347A8 46800020 */ cvt.s.w $f0, $f0 /* CAEAC 801347AC 46006300 */ add.s $f12, $f12, $f0 /* CAEB0 801347B0 3C0141F0 */ lui $at, 0x41f0 @@ -384,27 +384,27 @@ glabel update_item_entity_collectable /* CAEEC 801347EC C42C1DEC */ lwc1 $f12, %lo(D_800B1DEC)($at) /* CAEF0 801347F0 3C0142B4 */ lui $at, 0x42b4 /* CAEF4 801347F4 44810000 */ mtc1 $at, $f0 -/* CAEF8 801347F8 00000000 */ nop +/* CAEF8 801347F8 00000000 */ nop /* CAEFC 801347FC 46006300 */ add.s $f12, $f12, $f0 .L80134800: /* CAF00 80134800 44820000 */ mtc1 $v0, $f0 -/* CAF04 80134804 00000000 */ nop +/* CAF04 80134804 00000000 */ nop /* CAF08 80134808 46800020 */ cvt.s.w $f0, $f0 /* CAF0C 8013480C 46006300 */ add.s $f12, $f12, $f0 /* CAF10 80134810 3C014270 */ lui $at, 0x4270 /* CAF14 80134814 44810000 */ mtc1 $at, $f0 -/* CAF18 80134818 00000000 */ nop +/* CAF18 80134818 00000000 */ nop /* CAF1C 8013481C 46006301 */ sub.s $f12, $f12, $f0 .L80134820: /* CAF20 80134820 0C00A6C9 */ jal clamp_angle -/* CAF24 80134824 00000000 */ nop +/* CAF24 80134824 00000000 */ nop /* CAF28 80134828 E6200018 */ swc1 $f0, 0x18($s1) .L8013482C: /* CAF2C 8013482C 8E420000 */ lw $v0, ($s2) /* CAF30 80134830 3C030100 */ lui $v1, 0x100 /* CAF34 80134834 00431024 */ and $v0, $v0, $v1 /* CAF38 80134838 14400019 */ bnez $v0, .L801348A0 -/* CAF3C 8013483C 00000000 */ nop +/* CAF3C 8013483C 00000000 */ nop /* CAF40 80134840 0C00A67F */ jal rand_int /* CAF44 80134844 240407D0 */ addiu $a0, $zero, 0x7d0 /* CAF48 80134848 C6240018 */ lwc1 $f4, 0x18($s1) @@ -414,9 +414,9 @@ glabel update_item_entity_collectable /* CAF58 80134858 3C01447A */ lui $at, 0x447a /* CAF5C 8013485C 44810000 */ mtc1 $at, $f0 /* CAF60 80134860 46022102 */ mul.s $f4, $f4, $f2 -/* CAF64 80134864 00000000 */ nop +/* CAF64 80134864 00000000 */ nop /* CAF68 80134868 4482C000 */ mtc1 $v0, $f24 -/* CAF6C 8013486C 00000000 */ nop +/* CAF6C 8013486C 00000000 */ nop /* CAF70 80134870 4680C620 */ cvt.s.w $f24, $f24 /* CAF74 80134874 4600C003 */ div.s $f0, $f24, $f0 /* CAF78 80134878 3C013FF8 */ lui $at, 0x3ff8 @@ -439,9 +439,9 @@ glabel update_item_entity_collectable /* CAFB8 801348B8 3C01447A */ lui $at, 0x447a /* CAFBC 801348BC 44810000 */ mtc1 $at, $f0 /* CAFC0 801348C0 46022102 */ mul.s $f4, $f4, $f2 -/* CAFC4 801348C4 00000000 */ nop +/* CAFC4 801348C4 00000000 */ nop /* CAFC8 801348C8 4482C000 */ mtc1 $v0, $f24 -/* CAFCC 801348CC 00000000 */ nop +/* CAFCC 801348CC 00000000 */ nop /* CAFD0 801348D0 4680C620 */ cvt.s.w $f24, $f24 /* CAFD4 801348D4 4600C003 */ div.s $f0, $f24, $f0 /* CAFD8 801348D8 3C014000 */ lui $at, 0x4000 @@ -456,7 +456,7 @@ glabel update_item_entity_collectable /* CAFFC 801348FC 46022503 */ div.s $f20, $f4, $f2 .L80134900: /* CB000 80134900 44826000 */ mtc1 $v0, $f12 -/* CB004 80134904 00000000 */ nop +/* CB004 80134904 00000000 */ nop /* CB008 80134908 0C00A6C9 */ jal clamp_angle /* CB00C 8013490C 46806320 */ cvt.s.w $f12, $f12 /* CB010 80134910 E6200018 */ swc1 $f0, 0x18($s1) @@ -480,14 +480,14 @@ glabel update_item_entity_collectable /* CB058 80134958 00021400 */ sll $v0, $v0, 0x10 /* CB05C 8013495C 00021403 */ sra $v0, $v0, 0x10 /* CB060 80134960 44820000 */ mtc1 $v0, $f0 -/* CB064 80134964 00000000 */ nop +/* CB064 80134964 00000000 */ nop /* CB068 80134968 46800021 */ cvt.d.w $f0, $f0 /* CB06C 8013496C 46220002 */ mul.d $f0, $f0, $f2 -/* CB070 80134970 00000000 */ nop +/* CB070 80134970 00000000 */ nop /* CB074 80134974 3C013FF8 */ lui $at, 0x3ff8 /* CB078 80134978 44811800 */ mtc1 $at, $f3 /* CB07C 8013497C 44801000 */ mtc1 $zero, $f2 -/* CB080 80134980 00000000 */ nop +/* CB080 80134980 00000000 */ nop /* CB084 80134984 46220000 */ add.d $f0, $f0, $f2 /* CB088 80134988 0804D267 */ j .L8013499C /* CB08C 8013498C 46200620 */ cvt.s.d $f24, $f0 @@ -500,12 +500,12 @@ glabel update_item_entity_collectable /* CB0A0 801349A0 3C0140C9 */ lui $at, 0x40c9 /* CB0A4 801349A4 34210FD0 */ ori $at, $at, 0xfd0 /* CB0A8 801349A8 44811000 */ mtc1 $at, $f2 -/* CB0AC 801349AC 00000000 */ nop +/* CB0AC 801349AC 00000000 */ nop /* CB0B0 801349B0 46020002 */ mul.s $f0, $f0, $f2 -/* CB0B4 801349B4 00000000 */ nop +/* CB0B4 801349B4 00000000 */ nop /* CB0B8 801349B8 3C0143B4 */ lui $at, 0x43b4 /* CB0BC 801349BC 44811000 */ mtc1 $at, $f2 -/* CB0C0 801349C0 00000000 */ nop +/* CB0C0 801349C0 00000000 */ nop /* CB0C4 801349C4 46020503 */ div.s $f20, $f0, $f2 .L801349C8: /* CB0C8 801349C8 0C00A85B */ jal sin_rad @@ -514,10 +514,10 @@ glabel update_item_entity_collectable /* CB0D4 801349D4 0C00A874 */ jal cos_rad /* CB0D8 801349D8 4600A306 */ mov.s $f12, $f20 /* CB0DC 801349DC 4616C102 */ mul.s $f4, $f24, $f22 -/* CB0E0 801349E0 00000000 */ nop +/* CB0E0 801349E0 00000000 */ nop /* CB0E4 801349E4 4600C087 */ neg.s $f2, $f24 /* CB0E8 801349E8 46001082 */ mul.s $f2, $f2, $f0 -/* CB0EC 801349EC 00000000 */ nop +/* CB0EC 801349EC 00000000 */ nop /* CB0F0 801349F0 E6240010 */ swc1 $f4, 0x10($s1) /* CB0F4 801349F4 E6220014 */ swc1 $f2, 0x14($s1) /* CB0F8 801349F8 8243001B */ lb $v1, 0x1b($s2) @@ -579,18 +579,18 @@ glabel update_item_entity_collectable /* CB1C0 80134AC0 24020001 */ addiu $v0, $zero, 1 /* CB1C4 80134AC4 86440004 */ lh $a0, 4($s2) /* CB1C8 80134AC8 0C051514 */ jal set_global_flag -/* CB1CC 80134ACC 00000000 */ nop +/* CB1CC 80134ACC 00000000 */ nop /* CB1D0 80134AD0 0804D44C */ j .L80135130 /* CB1D4 80134AD4 24020001 */ addiu $v0, $zero, 1 .L80134AD8: /* CB1D8 80134AD8 8E510014 */ lw $s1, 0x14($s2) /* CB1DC 80134ADC 1062000A */ beq $v1, $v0, .L80134B08 -/* CB1E0 80134AE0 00000000 */ nop +/* CB1E0 80134AE0 00000000 */ nop /* CB1E4 80134AE4 10650008 */ beq $v1, $a1, .L80134B08 -/* CB1E8 80134AE8 00000000 */ nop +/* CB1E8 80134AE8 00000000 */ nop /* CB1EC 80134AEC 8E220020 */ lw $v0, 0x20($s1) /* CB1F0 80134AF0 10400005 */ beqz $v0, .L80134B08 -/* CB1F4 80134AF4 00000000 */ nop +/* CB1F4 80134AF4 00000000 */ nop /* CB1F8 80134AF8 0C04CEC3 */ jal test_item_player_collision /* CB1FC 80134AFC 0240202D */ daddu $a0, $s2, $zero /* CB200 80134B00 1440018B */ bnez $v0, .L80135130 @@ -620,7 +620,7 @@ glabel update_item_entity_collectable /* CB258 80134B58 3C020020 */ lui $v0, 0x20 /* CB25C 80134B5C 00621024 */ and $v0, $v1, $v0 /* CB260 80134B60 1440001C */ bnez $v0, .L80134BD4 -/* CB264 80134B64 00000000 */ nop +/* CB264 80134B64 00000000 */ nop /* CB268 80134B68 C6240000 */ lwc1 $f4, ($s1) /* CB26C 80134B6C C6200004 */ lwc1 $f0, 4($s1) /* CB270 80134B70 46002101 */ sub.s $f4, $f4, $f0 @@ -629,12 +629,12 @@ glabel update_item_entity_collectable /* CB27C 80134B7C 44801000 */ mtc1 $zero, $f2 /* CB280 80134B80 46002021 */ cvt.d.s $f0, $f4 /* CB284 80134B84 4622003C */ c.lt.d $f0, $f2 -/* CB288 80134B88 00000000 */ nop +/* CB288 80134B88 00000000 */ nop /* CB28C 80134B8C 45000005 */ bc1f .L80134BA4 /* CB290 80134B90 E6240000 */ swc1 $f4, ($s1) /* CB294 80134B94 3C01C180 */ lui $at, 0xc180 /* CB298 80134B98 44810000 */ mtc1 $at, $f0 -/* CB29C 80134B9C 00000000 */ nop +/* CB29C 80134B9C 00000000 */ nop /* CB2A0 80134BA0 E6200000 */ swc1 $f0, ($s1) .L80134BA4: /* CB2A4 80134BA4 C640000C */ lwc1 $f0, 0xc($s2) @@ -653,12 +653,12 @@ glabel update_item_entity_collectable /* CB2D4 80134BD4 8243001B */ lb $v1, 0x1b($s2) /* CB2D8 80134BD8 24020014 */ addiu $v0, $zero, 0x14 /* CB2DC 80134BDC 14620008 */ bne $v1, $v0, .L80134C00 -/* CB2E0 80134BE0 00000000 */ nop +/* CB2E0 80134BE0 00000000 */ nop /* CB2E4 80134BE4 C6220000 */ lwc1 $f2, ($s1) /* CB2E8 80134BE8 44800000 */ mtc1 $zero, $f0 -/* CB2EC 80134BEC 00000000 */ nop +/* CB2EC 80134BEC 00000000 */ nop /* CB2F0 80134BF0 4600103E */ c.le.s $f2, $f0 -/* CB2F4 80134BF4 00000000 */ nop +/* CB2F4 80134BF4 00000000 */ nop /* CB2F8 80134BF8 4501014D */ bc1t .L80135130 /* CB2FC 80134BFC 24020003 */ addiu $v0, $zero, 3 .L80134C00: @@ -671,12 +671,12 @@ glabel update_item_entity_collectable /* CB318 80134C18 10620025 */ beq $v1, $v0, .L80134CB0 /* CB31C 80134C1C 24020017 */ addiu $v0, $zero, 0x17 /* CB320 80134C20 10620023 */ beq $v1, $v0, .L80134CB0 -/* CB324 80134C24 00000000 */ nop +/* CB324 80134C24 00000000 */ nop /* CB328 80134C28 C6220000 */ lwc1 $f2, ($s1) /* CB32C 80134C2C 44800000 */ mtc1 $zero, $f0 -/* CB330 80134C30 00000000 */ nop +/* CB330 80134C30 00000000 */ nop /* CB334 80134C34 4602003C */ c.lt.s $f0, $f2 -/* CB338 80134C38 00000000 */ nop +/* CB338 80134C38 00000000 */ nop /* CB33C 80134C3C 4500001C */ bc1f .L80134CB0 /* CB340 80134C40 27A2002C */ addiu $v0, $sp, 0x2c /* CB344 80134C44 C6400008 */ lwc1 $f0, 8($s2) @@ -696,12 +696,12 @@ glabel update_item_entity_collectable /* CB37C 80134C7C 0C03739C */ jal func_800DCE70 /* CB380 80134C80 27A70028 */ addiu $a3, $sp, 0x28 /* CB384 80134C84 1040000A */ beqz $v0, .L80134CB0 -/* CB388 80134C88 00000000 */ nop +/* CB388 80134C88 00000000 */ nop /* CB38C 80134C8C C7A0002C */ lwc1 $f0, 0x2c($sp) /* CB390 80134C90 4618003C */ c.lt.s $f0, $f24 -/* CB394 80134C94 00000000 */ nop +/* CB394 80134C94 00000000 */ nop /* CB398 80134C98 45000005 */ bc1f .L80134CB0 -/* CB39C 80134C9C 00000000 */ nop +/* CB39C 80134C9C 00000000 */ nop /* CB3A0 80134CA0 C7A00024 */ lwc1 $f0, 0x24($sp) /* CB3A4 80134CA4 46180001 */ sub.s $f0, $f0, $f24 /* CB3A8 80134CA8 E640000C */ swc1 $f0, 0xc($s2) @@ -716,19 +716,19 @@ glabel update_item_entity_collectable /* CB3C8 80134CC8 10620059 */ beq $v1, $v0, .L80134E30 /* CB3CC 80134CCC 24020017 */ addiu $v0, $zero, 0x17 /* CB3D0 80134CD0 10620057 */ beq $v1, $v0, .L80134E30 -/* CB3D4 80134CD4 00000000 */ nop +/* CB3D4 80134CD4 00000000 */ nop /* CB3D8 80134CD8 C6200010 */ lwc1 $f0, 0x10($s1) /* CB3DC 80134CDC 44803000 */ mtc1 $zero, $f6 -/* CB3E0 80134CE0 00000000 */ nop +/* CB3E0 80134CE0 00000000 */ nop /* CB3E4 80134CE4 46060032 */ c.eq.s $f0, $f6 -/* CB3E8 80134CE8 00000000 */ nop +/* CB3E8 80134CE8 00000000 */ nop /* CB3EC 80134CEC 45000006 */ bc1f .L80134D08 -/* CB3F0 80134CF0 00000000 */ nop +/* CB3F0 80134CF0 00000000 */ nop /* CB3F4 80134CF4 C6200014 */ lwc1 $f0, 0x14($s1) /* CB3F8 80134CF8 46060032 */ c.eq.s $f0, $f6 -/* CB3FC 80134CFC 00000000 */ nop +/* CB3FC 80134CFC 00000000 */ nop /* CB400 80134D00 4501004B */ bc1t .L80134E30 -/* CB404 80134D04 00000000 */ nop +/* CB404 80134D04 00000000 */ nop .L80134D08: /* CB408 80134D08 C6400008 */ lwc1 $f0, 8($s2) /* CB40C 80134D0C C642000C */ lwc1 $f2, 0xc($s2) @@ -751,7 +751,7 @@ glabel update_item_entity_collectable /* CB450 80134D50 0C037765 */ jal func_800DDD94 /* CB454 80134D54 E7A0001C */ swc1 $f0, 0x1c($sp) /* CB458 80134D58 0804D364 */ j .L80134D90 -/* CB45C 80134D5C 00000000 */ nop +/* CB45C 80134D5C 00000000 */ nop .L80134D60: /* CB460 80134D60 3C040002 */ lui $a0, 2 /* CB464 80134D64 E7A60010 */ swc1 $f6, 0x10($sp) @@ -767,7 +767,7 @@ glabel update_item_entity_collectable /* CB48C 80134D8C E7A0001C */ swc1 $f0, 0x1c($sp) .L80134D90: /* CB490 80134D90 10400027 */ beqz $v0, .L80134E30 -/* CB494 80134D94 00000000 */ nop +/* CB494 80134D94 00000000 */ nop /* CB498 80134D98 C7A00020 */ lwc1 $f0, 0x20($sp) /* CB49C 80134D9C C7A20024 */ lwc1 $f2, 0x24($sp) /* CB4A0 80134DA0 C7A40028 */ lwc1 $f4, 0x28($sp) @@ -782,9 +782,9 @@ glabel update_item_entity_collectable /* CB4C4 80134DC4 3C0140C9 */ lui $at, 0x40c9 /* CB4C8 80134DC8 34210FD0 */ ori $at, $at, 0xfd0 /* CB4CC 80134DCC 44811000 */ mtc1 $at, $f2 -/* CB4D0 80134DD0 00000000 */ nop +/* CB4D0 80134DD0 00000000 */ nop /* CB4D4 80134DD4 46020082 */ mul.s $f2, $f0, $f2 -/* CB4D8 80134DD8 00000000 */ nop +/* CB4D8 80134DD8 00000000 */ nop /* CB4DC 80134DDC 3C0143B4 */ lui $at, 0x43b4 /* CB4E0 80134DE0 44812000 */ mtc1 $at, $f4 /* CB4E4 80134DE4 E6200018 */ swc1 $f0, 0x18($s1) @@ -799,7 +799,7 @@ glabel update_item_entity_collectable /* CB508 80134E08 44801000 */ mtc1 $zero, $f2 /* CB50C 80134E0C 46000021 */ cvt.d.s $f0, $f0 /* CB510 80134E10 46220002 */ mul.d $f0, $f0, $f2 -/* CB514 80134E14 00000000 */ nop +/* CB514 80134E14 00000000 */ nop /* CB518 80134E18 4600B0A1 */ cvt.d.s $f2, $f22 /* CB51C 80134E1C 46221080 */ add.d $f2, $f2, $f2 /* CB520 80134E20 462010A0 */ cvt.s.d $f2, $f2 @@ -814,20 +814,20 @@ glabel update_item_entity_collectable /* CB540 80134E40 24020014 */ addiu $v0, $zero, 0x14 /* CB544 80134E44 8243001B */ lb $v1, 0x1b($s2) /* CB548 80134E48 106200B0 */ beq $v1, $v0, .L8013510C -/* CB54C 80134E4C 00000000 */ nop +/* CB54C 80134E4C 00000000 */ nop /* CB550 80134E50 C6200000 */ lwc1 $f0, ($s1) /* CB554 80134E54 44801000 */ mtc1 $zero, $f2 /* CB558 80134E58 44801800 */ mtc1 $zero, $f3 /* CB55C 80134E5C 46000021 */ cvt.d.s $f0, $f0 /* CB560 80134E60 4622003E */ c.le.d $f0, $f2 -/* CB564 80134E64 00000000 */ nop +/* CB564 80134E64 00000000 */ nop /* CB568 80134E68 450000A8 */ bc1f .L8013510C /* CB56C 80134E6C 24020001 */ addiu $v0, $zero, 1 /* CB570 80134E70 AE220020 */ sw $v0, 0x20($s1) /* CB574 80134E74 8243001B */ lb $v1, 0x1b($s2) /* CB578 80134E78 24020017 */ addiu $v0, $zero, 0x17 /* CB57C 80134E7C 1062002A */ beq $v1, $v0, .L80134F28 -/* CB580 80134E80 00000000 */ nop +/* CB580 80134E80 00000000 */ nop /* CB584 80134E84 C642000C */ lwc1 $f2, 0xc($s2) /* CB588 80134E88 C6200000 */ lwc1 $f0, ($s1) /* CB58C 80134E8C C6440008 */ lwc1 $f4, 8($s2) @@ -853,7 +853,7 @@ glabel update_item_entity_collectable /* CB5DC 80134EDC 0C0372DF */ jal func_800DCB7C /* CB5E0 80134EE0 27A70028 */ addiu $a3, $sp, 0x28 /* CB5E4 80134EE4 0804D3E1 */ j .L80134F84 -/* CB5E8 80134EE8 00000000 */ nop +/* CB5E8 80134EE8 00000000 */ nop .L80134EEC: /* CB5EC 80134EEC 3C040002 */ lui $a0, 2 /* CB5F0 80134EF0 27A50020 */ addiu $a1, $sp, 0x20 @@ -869,7 +869,7 @@ glabel update_item_entity_collectable /* CB618 80134F18 0C0371DE */ jal func_800DC778 /* CB61C 80134F1C E7A20018 */ swc1 $f2, 0x18($sp) /* CB620 80134F20 0804D3E1 */ j .L80134F84 -/* CB624 80134F24 00000000 */ nop +/* CB624 80134F24 00000000 */ nop .L80134F28: /* CB628 80134F28 C644000C */ lwc1 $f4, 0xc($s2) /* CB62C 80134F2C C6200000 */ lwc1 $f0, ($s1) @@ -887,7 +887,7 @@ glabel update_item_entity_collectable /* CB65C 80134F5C 46080180 */ add.s $f6, $f0, $f8 /* CB660 80134F60 E7A20028 */ swc1 $f2, 0x28($sp) /* CB664 80134F64 4606203C */ c.lt.s $f4, $f6 -/* CB668 80134F68 00000000 */ nop +/* CB668 80134F68 00000000 */ nop /* CB66C 80134F6C 45000004 */ bc1f .L80134F80 /* CB670 80134F70 E7A40024 */ swc1 $f4, 0x24($sp) /* CB674 80134F74 E7A80024 */ swc1 $f8, 0x24($sp) @@ -897,7 +897,7 @@ glabel update_item_entity_collectable /* CB680 80134F80 0000102D */ daddu $v0, $zero, $zero .L80134F84: /* CB684 80134F84 10400061 */ beqz $v0, .L8013510C -/* CB688 80134F88 00000000 */ nop +/* CB688 80134F88 00000000 */ nop /* CB68C 80134F8C C7A00024 */ lwc1 $f0, 0x24($sp) /* CB690 80134F90 3C013FF4 */ lui $at, 0x3ff4 /* CB694 80134F94 44811800 */ mtc1 $at, $f3 @@ -913,7 +913,7 @@ glabel update_item_entity_collectable /* CB6BC 80134FBC 46200020 */ cvt.s.d $f0, $f0 /* CB6C0 80134FC0 460000A1 */ cvt.d.s $f2, $f0 /* CB6C4 80134FC4 4624103C */ c.lt.d $f2, $f4 -/* CB6C8 80134FC8 00000000 */ nop +/* CB6C8 80134FC8 00000000 */ nop /* CB6CC 80134FCC 45000009 */ bc1f .L80134FF4 /* CB6D0 80134FD0 E6200000 */ swc1 $f0, ($s1) /* CB6D4 80134FD4 AE200000 */ sw $zero, ($s1) @@ -955,9 +955,9 @@ glabel update_item_entity_collectable /* CB758 80135058 10400013 */ beqz $v0, .L801350A8 /* CB75C 8013505C 24020010 */ addiu $v0, $zero, 0x10 /* CB760 80135060 10620014 */ beq $v1, $v0, .L801350B4 -/* CB764 80135064 00000000 */ nop +/* CB764 80135064 00000000 */ nop /* CB768 80135068 0804D443 */ j .L8013510C -/* CB76C 8013506C 00000000 */ nop +/* CB76C 8013506C 00000000 */ nop .L80135070: /* CB770 80135070 2402015A */ addiu $v0, $zero, 0x15a /* CB774 80135074 10620018 */ beq $v1, $v0, .L801350D8 @@ -967,9 +967,9 @@ glabel update_item_entity_collectable /* CB784 80135084 1062001A */ beq $v1, $v0, .L801350F0 /* CB788 80135088 2402015C */ addiu $v0, $zero, 0x15c /* CB78C 8013508C 10620015 */ beq $v1, $v0, .L801350E4 -/* CB790 80135090 00000000 */ nop +/* CB790 80135090 00000000 */ nop /* CB794 80135094 0804D443 */ j .L8013510C -/* CB798 80135098 00000000 */ nop +/* CB798 80135098 00000000 */ nop .L8013509C: /* CB79C 8013509C C6400010 */ lwc1 $f0, 0x10($s2) /* CB7A0 801350A0 0804D43E */ j .L801350F8 @@ -1012,11 +1012,11 @@ glabel update_item_entity_collectable /* CB80C 8013510C C642000C */ lwc1 $f2, 0xc($s2) /* CB810 80135110 3C01C4FA */ lui $at, 0xc4fa /* CB814 80135114 44810000 */ mtc1 $at, $f0 -/* CB818 80135118 00000000 */ nop +/* CB818 80135118 00000000 */ nop /* CB81C 8013511C 4600103C */ c.lt.s $f2, $f0 -/* CB820 80135120 00000000 */ nop +/* CB820 80135120 00000000 */ nop /* CB824 80135124 45000003 */ bc1f .L80135134 -/* CB828 80135128 00000000 */ nop +/* CB828 80135128 00000000 */ nop .L8013512C: /* CB82C 8013512C 24020002 */ addiu $v0, $zero, 2 .L80135130: @@ -1032,11 +1032,11 @@ glabel update_item_entity_collectable /* CB850 80135150 24020003 */ addiu $v0, $zero, 3 .L80135154: /* CB854 80135154 146200E6 */ bne $v1, $v0, .L801354F0 -/* CB858 80135158 00000000 */ nop +/* CB858 80135158 00000000 */ nop /* CB85C 8013515C 8E420000 */ lw $v0, ($s2) /* CB860 80135160 30420400 */ andi $v0, $v0, 0x400 /* CB864 80135164 10400003 */ beqz $v0, .L80135174 -/* CB868 80135168 00000000 */ nop +/* CB868 80135168 00000000 */ nop /* CB86C 8013516C 0C051514 */ jal set_global_flag /* CB870 80135170 86440004 */ lh $a0, 4($s2) .L80135174: @@ -1092,7 +1092,7 @@ glabel update_item_entity_collectable /* CB92C 8013522C 10620011 */ beq $v1, $v0, .L80135274 /* CB930 80135230 0240202D */ daddu $a0, $s2, $zero /* CB934 80135234 0804D533 */ j .L801354CC -/* CB938 80135238 00000000 */ nop +/* CB938 80135238 00000000 */ nop .L8013523C: /* CB93C 8013523C 2402015A */ addiu $v0, $zero, 0x15a /* CB940 80135240 10620096 */ beq $v1, $v0, .L8013549C @@ -1102,13 +1102,13 @@ glabel update_item_entity_collectable /* CB950 80135250 10620086 */ beq $v1, $v0, .L8013546C /* CB954 80135254 0240202D */ daddu $a0, $s2, $zero /* CB958 80135258 0804D533 */ j .L801354CC -/* CB95C 8013525C 00000000 */ nop +/* CB95C 8013525C 00000000 */ nop .L80135260: /* CB960 80135260 2402015B */ addiu $v0, $zero, 0x15b /* CB964 80135264 10620028 */ beq $v1, $v0, .L80135308 /* CB968 80135268 0240202D */ daddu $a0, $s2, $zero /* CB96C 8013526C 0804D533 */ j .L801354CC -/* CB970 80135270 00000000 */ nop +/* CB970 80135270 00000000 */ nop .L80135274: /* CB974 80135274 82620002 */ lb $v0, 2($s3) /* CB978 80135278 82630003 */ lb $v1, 3($s3) @@ -1118,7 +1118,7 @@ glabel update_item_entity_collectable /* CB988 80135288 868200B0 */ lh $v0, 0xb0($s4) /* CB98C 8013528C C682002C */ lwc1 $f2, 0x2c($s4) /* CB990 80135290 44820000 */ mtc1 $v0, $f0 -/* CB994 80135294 00000000 */ nop +/* CB994 80135294 00000000 */ nop /* CB998 80135298 46800020 */ cvt.s.w $f0, $f0 /* CB99C 8013529C 46001080 */ add.s $f2, $f2, $f0 /* CB9A0 801352A0 8E850028 */ lw $a1, 0x28($s4) @@ -1158,7 +1158,7 @@ glabel update_item_entity_collectable /* CBA1C 8013531C 868200B0 */ lh $v0, 0xb0($s4) /* CBA20 80135320 C682002C */ lwc1 $f2, 0x2c($s4) /* CBA24 80135324 44820000 */ mtc1 $v0, $f0 -/* CBA28 80135328 00000000 */ nop +/* CBA28 80135328 00000000 */ nop /* CBA2C 8013532C 46800020 */ cvt.s.w $f0, $f0 /* CBA30 80135330 46001080 */ add.s $f2, $f2, $f0 /* CBA34 80135334 8E850028 */ lw $a1, 0x28($s4) @@ -1198,7 +1198,7 @@ glabel update_item_entity_collectable /* CBAB0 801353B0 868200B0 */ lh $v0, 0xb0($s4) /* CBAB4 801353B4 C682002C */ lwc1 $f2, 0x2c($s4) /* CBAB8 801353B8 44820000 */ mtc1 $v0, $f0 -/* CBABC 801353BC 00000000 */ nop +/* CBABC 801353BC 00000000 */ nop /* CBAC0 801353C0 46800020 */ cvt.s.w $f0, $f0 /* CBAC4 801353C4 46001080 */ add.s $f2, $f2, $f0 /* CBAC8 801353C8 8E870030 */ lw $a3, 0x30($s4) @@ -1292,9 +1292,9 @@ glabel update_item_entity_collectable /* CBC00 80135500 3C048015 */ lui $a0, %hi(D_80155D80) /* CBC04 80135504 8C845D80 */ lw $a0, %lo(D_80155D80)($a0) /* CBC08 80135508 0C0B1059 */ jal does_script_exist -/* CBC0C 8013550C 00000000 */ nop +/* CBC0C 8013550C 00000000 */ nop /* CBC10 80135510 14400007 */ bnez $v0, .L80135530 -/* CBC14 80135514 00000000 */ nop +/* CBC14 80135514 00000000 */ nop /* CBC18 80135518 3C018015 */ lui $at, %hi(D_801565A8) /* CBC1C 8013551C A42065A8 */ sh $zero, %lo(D_801565A8)($at) /* CBC20 80135520 0C04CE4C */ jal remove_item_entity_by_reference diff --git a/asm/nonmatchings/code_B9D60/update_item_entity_static.s b/asm/nonmatchings/code_B9D60/update_item_entity_static.s index da2e43c307..febcc88108 100644 --- a/asm/nonmatchings/code_B9D60/update_item_entity_static.s +++ b/asm/nonmatchings/code_B9D60/update_item_entity_static.s @@ -8,9 +8,9 @@ glabel update_item_entity_static /* CBD64 80135664 AFBF0014 */ sw $ra, 0x14($sp) /* CBD68 80135668 8202001A */ lb $v0, 0x1a($s0) /* CBD6C 8013566C 14400011 */ bnez $v0, .L801356B4 -/* CBD70 80135670 00000000 */ nop +/* CBD70 80135670 00000000 */ nop /* CBD74 80135674 0C04CEC3 */ jal test_item_player_collision -/* CBD78 80135678 00000000 */ nop +/* CBD78 80135678 00000000 */ nop /* CBD7C 8013567C 1040000D */ beqz $v0, .L801356B4 /* CBD80 80135680 24020001 */ addiu $v0, $zero, 1 /* CBD84 80135684 3C018015 */ lui $at, %hi(D_801565A4) diff --git a/asm/nonmatchings/code_B9D60/update_item_entity_temp.s b/asm/nonmatchings/code_B9D60/update_item_entity_temp.s index 6572e88289..f2f77f128f 100644 --- a/asm/nonmatchings/code_B9D60/update_item_entity_temp.s +++ b/asm/nonmatchings/code_B9D60/update_item_entity_temp.s @@ -26,11 +26,11 @@ glabel update_item_entity_temp /* CBE30 80135730 A43265A4 */ sh $s2, %lo(D_801565A4)($at) /* CBE34 80135734 00431024 */ and $v0, $v0, $v1 /* CBE38 80135738 1440000C */ bnez $v0, .L8013576C -/* CBE3C 8013573C 00000000 */ nop +/* CBE3C 8013573C 00000000 */ nop /* CBE40 80135740 0C03805E */ jal disable_player_input -/* CBE44 80135744 00000000 */ nop +/* CBE44 80135744 00000000 */ nop /* CBE48 80135748 0C03BD8A */ jal func_800EF628 -/* CBE4C 8013574C 00000000 */ nop +/* CBE4C 8013574C 00000000 */ nop /* CBE50 80135750 3C03800A */ lui $v1, %hi(D_8009A650) /* CBE54 80135754 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) /* CBE58 80135758 8C620000 */ lw $v0, ($v1) @@ -50,11 +50,12 @@ glabel update_item_entity_temp /* CBE88 80135788 2C62000F */ sltiu $v0, $v1, 0xf /* CBE8C 8013578C 104002FB */ beqz $v0, .L8013637C /* CBE90 80135790 00031080 */ sll $v0, $v1, 2 -/* CBE94 80135794 3C018015 */ lui $at, %hi(D_80150E20) +/* CBE94 80135794 3C018015 */ lui $at, %hi(jtbl_80150E20_E7520) /* CBE98 80135798 00220821 */ addu $at, $at, $v0 -/* CBE9C 8013579C 8C220E20 */ lw $v0, %lo(D_80150E20)($at) +/* CBE9C 8013579C 8C220E20 */ lw $v0, %lo(jtbl_80150E20_E7520)($at) /* CBEA0 801357A0 00400008 */ jr $v0 -/* CBEA4 801357A4 00000000 */ nop +/* CBEA4 801357A4 00000000 */ nop +glabel L801357A8_CBEA8 /* CBEA8 801357A8 8E220000 */ lw $v0, ($s1) /* CBEAC 801357AC 3C030200 */ lui $v1, 0x200 /* CBEB0 801357B0 00431024 */ and $v0, $v0, $v1 @@ -82,19 +83,19 @@ glabel update_item_entity_temp /* CBF00 80135800 1062000A */ beq $v1, $v0, .L8013582C /* CBF04 80135804 24020021 */ addiu $v0, $zero, 0x21 /* CBF08 80135808 10620008 */ beq $v1, $v0, .L8013582C -/* CBF0C 8013580C 00000000 */ nop +/* CBF0C 8013580C 00000000 */ nop /* CBF10 80135810 10600006 */ beqz $v1, .L8013582C /* CBF14 80135814 2402001D */ addiu $v0, $zero, 0x1d /* CBF18 80135818 146202D8 */ bne $v1, $v0, .L8013637C /* CBF1C 8013581C 24020001 */ addiu $v0, $zero, 1 /* CBF20 80135820 826300B6 */ lb $v1, 0xb6($s3) /* CBF24 80135824 146202D5 */ bne $v1, $v0, .L8013637C -/* CBF28 80135828 00000000 */ nop +/* CBF28 80135828 00000000 */ nop .L8013582C: /* CBF2C 8013582C 96220006 */ lhu $v0, 6($s1) /* CBF30 80135830 30420001 */ andi $v0, $v0, 1 /* CBF34 80135834 1440001C */ bnez $v0, .L801358A8 -/* CBF38 80135838 00000000 */ nop +/* CBF38 80135838 00000000 */ nop /* CBF3C 8013583C 86240018 */ lh $a0, 0x18($s1) /* CBF40 80135840 00041140 */ sll $v0, $a0, 5 /* CBF44 80135844 3C038008 */ lui $v1, %hi(gItemTable+0x18) @@ -121,10 +122,10 @@ glabel update_item_entity_temp /* CBF90 80135890 0C052757 */ jal play_sound_at_position /* CBF94 80135894 0000282D */ daddu $a1, $zero, $zero /* CBF98 80135898 0804D62A */ j .L801358A8 -/* CBF9C 8013589C 00000000 */ nop +/* CBF9C 8013589C 00000000 */ nop .L801358A0: /* CBFA0 801358A0 0C05272D */ jal play_sound -/* CBFA4 801358A4 00000000 */ nop +/* CBFA4 801358A4 00000000 */ nop .L801358A8: /* CBFA8 801358A8 86220018 */ lh $v0, 0x18($s1) /* CBFAC 801358AC 00021140 */ sll $v0, $v0, 5 @@ -136,7 +137,7 @@ glabel update_item_entity_temp /* CBFC4 801358C4 00822021 */ addu $a0, $a0, $v0 /* CBFC8 801358C8 8C84A680 */ lw $a0, %lo(D_8008A680)($a0) /* CBFCC 801358CC 0C050529 */ jal create_icon -/* CBFD0 801358D0 00000000 */ nop +/* CBFD0 801358D0 00000000 */ nop /* CBFD4 801358D4 0040202D */ daddu $a0, $v0, $zero /* CBFD8 801358D8 24050080 */ addiu $a1, $zero, 0x80 /* CBFDC 801358DC 3C108015 */ lui $s0, %hi(D_801568E0) @@ -155,7 +156,7 @@ glabel update_item_entity_temp /* CC010 80135910 3C030200 */ lui $v1, 0x200 /* CC014 80135914 00431024 */ and $v0, $v0, $v1 /* CC018 80135918 14400066 */ bnez $v0, .L80135AB4 -/* CC01C 8013591C 00000000 */ nop +/* CC01C 8013591C 00000000 */ nop /* CC020 80135920 86220018 */ lh $v0, 0x18($s1) /* CC024 80135924 00021140 */ sll $v0, $v0, 5 /* CC028 80135928 00501021 */ addu $v0, $v0, $s0 @@ -259,7 +260,7 @@ glabel update_item_entity_temp /* CC178 80135A78 2442FFFC */ addiu $v0, $v0, -4 /* CC17C 80135A7C 2C420003 */ sltiu $v0, $v0, 3 /* CC180 80135A80 10400004 */ beqz $v0, .L80135A94 -/* CC184 80135A84 00000000 */ nop +/* CC184 80135A84 00000000 */ nop /* CC188 80135A88 92220019 */ lbu $v0, 0x19($s1) /* CC18C 80135A8C 2442FFFC */ addiu $v0, $v0, -4 /* CC190 80135A90 A2820001 */ sb $v0, 1($s4) @@ -268,21 +269,21 @@ glabel update_item_entity_temp /* CC198 80135A98 2442FFFF */ addiu $v0, $v0, -1 /* CC19C 80135A9C 2C420003 */ sltiu $v0, $v0, 3 /* CC1A0 80135AA0 10400004 */ beqz $v0, .L80135AB4 -/* CC1A4 80135AA4 00000000 */ nop +/* CC1A4 80135AA4 00000000 */ nop /* CC1A8 80135AA8 92220019 */ lbu $v0, 0x19($s1) /* CC1AC 80135AAC 2442FFFF */ addiu $v0, $v0, -1 /* CC1B0 80135AB0 A2820000 */ sb $v0, ($s4) .L80135AB4: /* CC1B4 80135AB4 8E220000 */ lw $v0, ($s1) /* CC1B8 80135AB8 04410003 */ bgez $v0, .L80135AC8 -/* CC1BC 80135ABC 00000000 */ nop +/* CC1BC 80135ABC 00000000 */ nop /* CC1C0 80135AC0 0C051514 */ jal set_global_flag /* CC1C4 80135AC4 86240004 */ lh $a0, 4($s1) .L80135AC8: /* CC1C8 80135AC8 8222001A */ lb $v0, 0x1a($s1) /* CC1CC 80135ACC 2412000A */ addiu $s2, $zero, 0xa /* CC1D0 80135AD0 1452000E */ bne $v0, $s2, .L80135B0C -/* CC1D4 80135AD4 00000000 */ nop +/* CC1D4 80135AD4 00000000 */ nop /* CC1D8 80135AD8 0C04D8E8 */ jal func_801363A0 /* CC1DC 80135ADC 0220202D */ daddu $a0, $s1, $zero /* CC1E0 80135AE0 2404000C */ addiu $a0, $zero, 0xc @@ -298,16 +299,17 @@ glabel update_item_entity_temp /* CC208 80135B08 0200282D */ daddu $a1, $s0, $zero .L80135B0C: /* CC20C 80135B0C 0C03A6D5 */ jal increment_status_menu_disabled -/* CC210 80135B10 00000000 */ nop +/* CC210 80135B10 00000000 */ nop /* CC214 80135B14 3C018015 */ lui $at, %hi(D_801568E4) /* CC218 80135B18 AC3268E4 */ sw $s2, %lo(D_801568E4)($at) /* CC21C 80135B1C 0804D8DF */ j .L8013637C -/* CC220 80135B20 00000000 */ nop +/* CC220 80135B20 00000000 */ nop +glabel L80135B24_CC224 /* CC224 80135B24 3C038015 */ lui $v1, %hi(D_801568E4) /* CC228 80135B28 8C6368E4 */ lw $v1, %lo(D_801568E4)($v1) /* CC22C 80135B2C 24020009 */ addiu $v0, $zero, 9 /* CC230 80135B30 1462003C */ bne $v1, $v0, .L80135C24 -/* CC234 80135B34 00000000 */ nop +/* CC234 80135B34 00000000 */ nop /* CC238 80135B38 86240018 */ lh $a0, 0x18($s1) /* CC23C 80135B3C 00041140 */ sll $v0, $a0, 5 /* CC240 80135B40 3C038008 */ lui $v1, %hi(gItemTable+0x18) @@ -325,18 +327,18 @@ glabel update_item_entity_temp /* CC270 80135B70 8E220000 */ lw $v0, ($s1) /* CC274 80135B74 00431024 */ and $v0, $v0, $v1 /* CC278 80135B78 14400005 */ bnez $v0, .L80135B90 -/* CC27C 80135B7C 00000000 */ nop +/* CC27C 80135B7C 00000000 */ nop /* CC280 80135B80 96220006 */ lhu $v0, 6($s1) /* CC284 80135B84 30420002 */ andi $v0, $v0, 2 /* CC288 80135B88 1040000F */ beqz $v0, .L80135BC8 -/* CC28C 80135B8C 00000000 */ nop +/* CC28C 80135B8C 00000000 */ nop .L80135B90: /* CC290 80135B90 C6600028 */ lwc1 $f0, 0x28($s3) /* CC294 80135B94 E6200008 */ swc1 $f0, 8($s1) /* CC298 80135B98 866200B0 */ lh $v0, 0xb0($s3) /* CC29C 80135B9C C660002C */ lwc1 $f0, 0x2c($s3) /* CC2A0 80135BA0 44821000 */ mtc1 $v0, $f2 -/* CC2A4 80135BA4 00000000 */ nop +/* CC2A4 80135BA4 00000000 */ nop /* CC2A8 80135BA8 468010A0 */ cvt.s.w $f2, $f2 /* CC2AC 80135BAC 46020000 */ add.s $f0, $f0, $f2 /* CC2B0 80135BB0 3C040006 */ lui $a0, 6 @@ -353,7 +355,7 @@ glabel update_item_entity_temp /* CC2D8 80135BD8 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* CC2DC 80135BDC 30420020 */ andi $v0, $v0, 0x20 /* CC2E0 80135BE0 10400010 */ beqz $v0, .L80135C24 -/* CC2E4 80135BE4 00000000 */ nop +/* CC2E4 80135BE4 00000000 */ nop /* CC2E8 80135BE8 C624000C */ lwc1 $f4, 0xc($s1) /* CC2EC 80135BEC 3C014100 */ lui $at, 0x4100 /* CC2F0 80135BF0 44810000 */ mtc1 $at, $f0 @@ -374,7 +376,7 @@ glabel update_item_entity_temp /* CC328 80135C28 8C4268E4 */ lw $v0, %lo(D_801568E4)($v0) /* CC32C 80135C2C 28420009 */ slti $v0, $v0, 9 /* CC330 80135C30 1040001D */ beqz $v0, .L80135CA8 -/* CC334 80135C34 00000000 */ nop +/* CC334 80135C34 00000000 */ nop /* CC338 80135C38 86240018 */ lh $a0, 0x18($s1) /* CC33C 80135C3C 00041140 */ sll $v0, $a0, 5 /* CC340 80135C40 3C038008 */ lui $v1, %hi(gItemTable+0x18) @@ -399,7 +401,7 @@ glabel update_item_entity_temp /* CC38C 80135C8C 96220006 */ lhu $v0, 6($s1) /* CC390 80135C90 30420002 */ andi $v0, $v0, 2 /* CC394 80135C94 10400004 */ beqz $v0, .L80135CA8 -/* CC398 80135C98 00000000 */ nop +/* CC398 80135C98 00000000 */ nop .L80135C9C: /* CC39C 80135C9C 3C040006 */ lui $a0, 6 .L80135CA0: @@ -428,11 +430,11 @@ glabel update_item_entity_temp /* CC3F4 80135CF4 8E220000 */ lw $v0, ($s1) /* CC3F8 80135CF8 00431024 */ and $v0, $v0, $v1 /* CC3FC 80135CFC 14400005 */ bnez $v0, .L80135D14 -/* CC400 80135D00 00000000 */ nop +/* CC400 80135D00 00000000 */ nop /* CC404 80135D04 96220006 */ lhu $v0, 6($s1) /* CC408 80135D08 30420002 */ andi $v0, $v0, 2 /* CC40C 80135D0C 10400005 */ beqz $v0, .L80135D24 -/* CC410 80135D10 00000000 */ nop +/* CC410 80135D10 00000000 */ nop .L80135D14: /* CC414 80135D14 8E220000 */ lw $v0, ($s1) /* CC418 80135D18 2403FFBF */ addiu $v1, $zero, -0x41 @@ -444,7 +446,7 @@ glabel update_item_entity_temp /* CC42C 80135D2C 24020006 */ addiu $v0, $zero, 6 .L80135D30: /* CC430 80135D30 14620010 */ bne $v1, $v0, .L80135D74 -/* CC434 80135D34 00000000 */ nop +/* CC434 80135D34 00000000 */ nop /* CC438 80135D38 0C04D8E8 */ jal func_801363A0 /* CC43C 80135D3C 0220202D */ daddu $a0, $s1, $zero /* CC440 80135D40 2404000C */ addiu $a0, $zero, 0xc @@ -476,11 +478,11 @@ glabel update_item_entity_temp /* CC4A0 80135DA0 3463C000 */ ori $v1, $v1, 0xc000 /* CC4A4 80135DA4 00431024 */ and $v0, $v0, $v1 /* CC4A8 80135DA8 10400174 */ beqz $v0, .L8013637C -/* CC4AC 80135DAC 00000000 */ nop +/* CC4AC 80135DAC 00000000 */ nop /* CC4B0 80135DB0 0C04C3DC */ jal func_80130F70 /* CC4B4 80135DB4 0220202D */ daddu $a0, $s1, $zero /* CC4B8 80135DB8 0C037F3D */ jal func_800DFCF4 -/* CC4BC 80135DBC 00000000 */ nop +/* CC4BC 80135DBC 00000000 */ nop /* CC4C0 80135DC0 1040000A */ beqz $v0, .L80135DEC /* CC4C4 80135DC4 2402001D */ addiu $v0, $zero, 0x1d /* CC4C8 80135DC8 826300B4 */ lb $v1, 0xb4($s3) @@ -489,7 +491,7 @@ glabel update_item_entity_temp /* CC4D4 80135DD4 8E620004 */ lw $v0, 4($s3) /* CC4D8 80135DD8 00431024 */ and $v0, $v0, $v1 /* CC4DC 80135DDC 14400003 */ bnez $v0, .L80135DEC -/* CC4E0 80135DE0 00000000 */ nop +/* CC4E0 80135DE0 00000000 */ nop /* CC4E4 80135DE4 0C039769 */ jal set_action_state /* CC4E8 80135DE8 0000202D */ daddu $a0, $zero, $zero .L80135DEC: @@ -517,18 +519,20 @@ glabel update_item_entity_temp /* CC53C 80135E3C 24020003 */ addiu $v0, $zero, 3 /* CC540 80135E40 0804D8DF */ j .L8013637C /* CC544 80135E44 A222001A */ sb $v0, 0x1a($s1) +glabel L80135E48_CC548 /* CC548 80135E48 3C038016 */ lui $v1, %hi(gUIPanels) /* CC54C 80135E4C 24639D50 */ addiu $v1, $v1, %lo(gUIPanels) /* CC550 80135E50 90620180 */ lbu $v0, 0x180($v1) /* CC554 80135E54 30420008 */ andi $v0, $v0, 8 /* CC558 80135E58 14400148 */ bnez $v0, .L8013637C -/* CC55C 80135E5C 00000000 */ nop +/* CC55C 80135E5C 00000000 */ nop /* CC560 80135E60 90620260 */ lbu $v0, 0x260($v1) /* CC564 80135E64 30420008 */ andi $v0, $v0, 8 /* CC568 80135E68 14400144 */ bnez $v0, .L8013637C /* CC56C 80135E6C 24020004 */ addiu $v0, $zero, 4 /* CC570 80135E70 0804D8DF */ j .L8013637C /* CC574 80135E74 A222001A */ sb $v0, 0x1a($s1) +glabel L80135E78_CC578 /* CC578 80135E78 86220018 */ lh $v0, 0x18($s1) /* CC57C 80135E7C 00021140 */ sll $v0, $v0, 5 /* CC580 80135E80 3C018008 */ lui $at, %hi(gItemTable+0x18) @@ -568,6 +572,7 @@ glabel update_item_entity_temp .L80135F00: /* CC600 80135F00 0804D8DF */ j .L8013637C /* CC604 80135F04 A222001A */ sb $v0, 0x1a($s1) +glabel L80135F08_CC608 /* CC608 80135F08 86230018 */ lh $v1, 0x18($s1) /* CC60C 80135F0C 00031140 */ sll $v0, $v1, 5 /* CC610 80135F10 3C018008 */ lui $at, %hi(gItemTable+0x18) @@ -581,14 +586,14 @@ glabel update_item_entity_temp .L80135F30: /* CC630 80135F30 2402015C */ addiu $v0, $zero, 0x15c /* CC634 80135F34 14620003 */ bne $v1, $v0, .L80135F44 -/* CC638 80135F38 00000000 */ nop +/* CC638 80135F38 00000000 */ nop /* CC63C 80135F3C 3C04001D */ lui $a0, 0x1d /* CC640 80135F40 34840003 */ ori $a0, $a0, 3 .L80135F44: /* CC644 80135F44 3C058015 */ lui $a1, %hi(D_801568F8) /* CC648 80135F48 24A568F8 */ addiu $a1, $a1, %lo(D_801568F8) /* CC64C 80135F4C 0C049640 */ jal load_string -/* CC650 80135F50 00000000 */ nop +/* CC650 80135F50 00000000 */ nop /* CC654 80135F54 0040202D */ daddu $a0, $v0, $zero /* CC658 80135F58 0000282D */ daddu $a1, $zero, $zero /* CC65C 80135F5C 3C018015 */ lui $at, %hi(D_801568F4) @@ -598,24 +603,26 @@ glabel update_item_entity_temp /* CC66C 80135F6C 24020006 */ addiu $v0, $zero, 6 /* CC670 80135F70 0804D8DF */ j .L8013637C /* CC674 80135F74 A222001A */ sb $v0, 0x1a($s1) +glabel L80135F78_CC678 /* CC678 80135F78 3C038015 */ lui $v1, %hi(D_801568F8) /* CC67C 80135F7C 8C6368F8 */ lw $v1, %lo(D_801568F8)($v1) /* CC680 80135F80 24020001 */ addiu $v0, $zero, 1 /* CC684 80135F84 146200FD */ bne $v1, $v0, .L8013637C -/* CC688 80135F88 00000000 */ nop +/* CC688 80135F88 00000000 */ nop /* CC68C 80135F8C 3C018015 */ lui $at, %hi(D_801565A4) /* CC690 80135F90 A42065A4 */ sh $zero, %lo(D_801565A4)($at) +glabel L80135F94_CC694 /* CC694 80135F94 8E220000 */ lw $v0, ($s1) /* CC698 80135F98 3C030200 */ lui $v1, 0x200 /* CC69C 80135F9C 00431024 */ and $v0, $v0, $v1 /* CC6A0 80135FA0 1440000D */ bnez $v0, .L80135FD8 -/* CC6A4 80135FA4 00000000 */ nop +/* CC6A4 80135FA4 00000000 */ nop /* CC6A8 80135FA8 0C009C22 */ jal func_80027088 /* CC6AC 80135FAC 0000202D */ daddu $a0, $zero, $zero /* CC6B0 80135FB0 0C038069 */ jal enable_player_input -/* CC6B4 80135FB4 00000000 */ nop +/* CC6B4 80135FB4 00000000 */ nop /* CC6B8 80135FB8 0C03BD80 */ jal func_800EF600 -/* CC6BC 80135FBC 00000000 */ nop +/* CC6BC 80135FBC 00000000 */ nop /* CC6C0 80135FC0 3C02800A */ lui $v0, %hi(D_8009A650) /* CC6C4 80135FC4 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) /* CC6C8 80135FC8 8C430000 */ lw $v1, ($v0) @@ -626,7 +633,8 @@ glabel update_item_entity_temp /* CC6D8 80135FD8 3C048015 */ lui $a0, %hi(D_801568E0) /* CC6DC 80135FDC 8C8468E0 */ lw $a0, %lo(D_801568E0)($a0) /* CC6E0 80135FE0 0804D8D5 */ j .L80136354 -/* CC6E4 80135FE4 00000000 */ nop +/* CC6E4 80135FE4 00000000 */ nop +glabel L80135FE8_CC6E8 /* CC6E8 80135FE8 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* CC6EC 80135FEC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* CC6F0 80135FF0 8C420010 */ lw $v0, 0x10($v0) @@ -702,22 +710,24 @@ glabel update_item_entity_temp /* CC800 80136100 AC2068E4 */ sw $zero, %lo(D_801568E4)($at) /* CC804 80136104 0804D8DF */ j .L8013637C /* CC808 80136108 A222001A */ sb $v0, 0x1a($s1) +glabel L8013610C_CC80C /* CC80C 8013610C 3C038016 */ lui $v1, %hi(gUIPanels) /* CC810 80136110 24639D50 */ addiu $v1, $v1, %lo(gUIPanels) /* CC814 80136114 90620180 */ lbu $v0, 0x180($v1) /* CC818 80136118 30420008 */ andi $v0, $v0, 8 /* CC81C 8013611C 14400097 */ bnez $v0, .L8013637C -/* CC820 80136120 00000000 */ nop +/* CC820 80136120 00000000 */ nop /* CC824 80136124 90620220 */ lbu $v0, 0x220($v1) /* CC828 80136128 30420008 */ andi $v0, $v0, 8 /* CC82C 8013612C 14400093 */ bnez $v0, .L8013637C -/* CC830 80136130 00000000 */ nop +/* CC830 80136130 00000000 */ nop /* CC834 80136134 90620260 */ lbu $v0, 0x260($v1) /* CC838 80136138 30420008 */ andi $v0, $v0, 8 /* CC83C 8013613C 1440008F */ bnez $v0, .L8013637C /* CC840 80136140 2402000C */ addiu $v0, $zero, 0xc /* CC844 80136144 0804D8DF */ j .L8013637C /* CC848 80136148 A222001A */ sb $v0, 0x1a($s1) +glabel L8013614C_CC84C /* CC84C 8013614C 3C158015 */ lui $s5, %hi(D_801568E4) /* CC850 80136150 26B568E4 */ addiu $s5, $s5, %lo(D_801568E4) /* CC854 80136154 8EA20000 */ lw $v0, ($s5) @@ -727,18 +737,18 @@ glabel update_item_entity_temp /* CC864 80136164 3C018015 */ lui $at, %hi(D_801568E8) /* CC868 80136168 AC2268E8 */ sw $v0, %lo(D_801568E8)($at) /* CC86C 8013616C 10400083 */ beqz $v0, .L8013637C -/* CC870 80136170 00000000 */ nop +/* CC870 80136170 00000000 */ nop /* CC874 80136174 0C03C4EC */ jal func_800F13B0 -/* CC878 80136178 00000000 */ nop +/* CC878 80136178 00000000 */ nop /* CC87C 8013617C 8EA20000 */ lw $v0, ($s5) /* CC880 80136180 24420001 */ addiu $v0, $v0, 1 .L80136184: /* CC884 80136184 AEA20000 */ sw $v0, ($s5) /* CC888 80136188 2842000F */ slti $v0, $v0, 0xf /* CC88C 8013618C 1440007B */ bnez $v0, .L8013637C -/* CC890 80136190 00000000 */ nop +/* CC890 80136190 00000000 */ nop /* CC894 80136194 0C03C54E */ jal func_800F1538 -/* CC898 80136198 00000000 */ nop +/* CC898 80136198 00000000 */ nop /* CC89C 8013619C 3C128015 */ lui $s2, %hi(D_801568E8) /* CC8A0 801361A0 265268E8 */ addiu $s2, $s2, %lo(D_801568E8) /* CC8A4 801361A4 8E430000 */ lw $v1, ($s2) @@ -767,7 +777,7 @@ glabel update_item_entity_temp /* CC8FC 801361FC 866200B0 */ lh $v0, 0xb0($s3) /* CC900 80136200 C662002C */ lwc1 $f2, 0x2c($s3) /* CC904 80136204 44820000 */ mtc1 $v0, $f0 -/* CC908 80136208 00000000 */ nop +/* CC908 80136208 00000000 */ nop /* CC90C 8013620C 46800020 */ cvt.s.w $f0, $f0 /* CC910 80136210 46001080 */ add.s $f2, $f2, $f0 /* CC914 80136214 44061000 */ mfc1 $a2, $f2 @@ -789,7 +799,7 @@ glabel update_item_entity_temp /* CC954 80136254 A44001B4 */ sh $zero, 0x1b4($v0) /* CC958 80136258 86240018 */ lh $a0, 0x18($s1) /* CC95C 8013625C 0C039D5D */ jal add_item -/* CC960 80136260 00000000 */ nop +/* CC960 80136260 00000000 */ nop /* CC964 80136264 3C040006 */ lui $a0, 6 .L80136268: /* CC968 80136268 0C037FDE */ jal func_800DFF78 @@ -805,12 +815,13 @@ glabel update_item_entity_temp /* CC990 80136290 2402000D */ addiu $v0, $zero, 0xd /* CC994 80136294 0804D8DF */ j .L8013637C /* CC998 80136298 A222001A */ sb $v0, 0x1a($s1) +glabel L8013629C_CC99C /* CC99C 8013629C 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* CC9A0 801362A0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* CC9A4 801362A4 8C420010 */ lw $v0, 0x10($v0) /* CC9A8 801362A8 30428000 */ andi $v0, $v0, 0x8000 /* CC9AC 801362AC 10400033 */ beqz $v0, .L8013637C -/* CC9B0 801362B0 00000000 */ nop +/* CC9B0 801362B0 00000000 */ nop /* CC9B4 801362B4 3C058014 */ lui $a1, %hi(D_80147574) /* CC9B8 801362B8 24A57574 */ addiu $a1, $a1, %lo(D_80147574) /* CC9BC 801362BC 0C051F9F */ jal func_80147E7C @@ -818,31 +829,33 @@ glabel update_item_entity_temp /* CC9C4 801362C4 2402000E */ addiu $v0, $zero, 0xe /* CC9C8 801362C8 0804D8DF */ j .L8013637C /* CC9CC 801362CC A222001A */ sb $v0, 0x1a($s1) +glabel L801362D0_CC9D0 /* CC9D0 801362D0 3C038016 */ lui $v1, %hi(gUIPanels) /* CC9D4 801362D4 24639D50 */ addiu $v1, $v1, %lo(gUIPanels) /* CC9D8 801362D8 90620180 */ lbu $v0, 0x180($v1) /* CC9DC 801362DC 30420008 */ andi $v0, $v0, 8 /* CC9E0 801362E0 14400026 */ bnez $v0, .L8013637C -/* CC9E4 801362E4 00000000 */ nop +/* CC9E4 801362E4 00000000 */ nop /* CC9E8 801362E8 90620220 */ lbu $v0, 0x220($v1) /* CC9EC 801362EC 30420008 */ andi $v0, $v0, 8 /* CC9F0 801362F0 14400022 */ bnez $v0, .L8013637C -/* CC9F4 801362F4 00000000 */ nop +/* CC9F4 801362F4 00000000 */ nop /* CC9F8 801362F8 90620260 */ lbu $v0, 0x260($v1) /* CC9FC 801362FC 30420008 */ andi $v0, $v0, 8 /* CCA00 80136300 1440001E */ bnez $v0, .L8013637C /* CCA04 80136304 2402000F */ addiu $v0, $zero, 0xf /* CCA08 80136308 0804D8DF */ j .L8013637C /* CCA0C 8013630C A222001A */ sb $v0, 0x1a($s1) +glabel L80136310_CCA10 /* CCA10 80136310 3C040001 */ lui $a0, 1 /* CCA14 80136314 0C037FDE */ jal func_800DFF78 /* CCA18 80136318 34840002 */ ori $a0, $a0, 2 /* CCA1C 8013631C 0C009C22 */ jal func_80027088 /* CCA20 80136320 0000202D */ daddu $a0, $zero, $zero /* CCA24 80136324 0C038069 */ jal enable_player_input -/* CCA28 80136328 00000000 */ nop +/* CCA28 80136328 00000000 */ nop /* CCA2C 8013632C 0C03BD80 */ jal func_800EF600 -/* CCA30 80136330 00000000 */ nop +/* CCA30 80136330 00000000 */ nop /* CCA34 80136334 3C02800A */ lui $v0, %hi(D_8009A650) /* CCA38 80136338 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) /* CCA3C 8013633C 2405FFBF */ addiu $a1, $zero, -0x41 @@ -853,16 +866,17 @@ glabel update_item_entity_temp /* CCA50 80136350 AC430000 */ sw $v1, ($v0) .L80136354: /* CCA54 80136354 0C05123D */ jal free_icon -/* CCA58 80136358 00000000 */ nop +/* CCA58 80136358 00000000 */ nop /* CCA5C 8013635C 0C04CE4C */ jal remove_item_entity_by_reference /* CCA60 80136360 0220202D */ daddu $a0, $s1, $zero /* CCA64 80136364 0C039DB3 */ jal sort_items -/* CCA68 80136368 00000000 */ nop +/* CCA68 80136368 00000000 */ nop /* CCA6C 8013636C 0C03A6CC */ jal decrement_status_menu_disabled -/* CCA70 80136370 00000000 */ nop +/* CCA70 80136370 00000000 */ nop /* CCA74 80136374 3C018015 */ lui $at, %hi(D_801565A4) /* CCA78 80136378 A42065A4 */ sh $zero, %lo(D_801565A4)($at) .L8013637C: +glabel L8013637C_CCA7C /* CCA7C 8013637C 8FBF0038 */ lw $ra, 0x38($sp) /* CCA80 80136380 8FB50034 */ lw $s5, 0x34($sp) /* CCA84 80136384 8FB40030 */ lw $s4, 0x30($sp) diff --git a/asm/nonmatchings/code_E20110/func_802B7000_E20110.s b/asm/nonmatchings/code_E20110/func_802B7000_E20110.s index 28b81aaa0a..79551ecdd9 100644 --- a/asm/nonmatchings/code_E20110/func_802B7000_E20110.s +++ b/asm/nonmatchings/code_E20110/func_802B7000_E20110.s @@ -4,14 +4,14 @@ glabel func_802B7000_E20110 /* E20110 802B7000 3C014387 */ lui $at, 0x4387 /* E20114 802B7004 44810000 */ mtc1 $at, $f0 -/* E20118 802B7008 00000000 */ nop +/* E20118 802B7008 00000000 */ nop /* E2011C 802B700C 460C003E */ c.le.s $f0, $f12 -/* E20120 802B7010 00000000 */ nop +/* E20120 802B7010 00000000 */ nop /* E20124 802B7014 45000009 */ bc1f .L802B703C /* E20128 802B7018 240200FF */ addiu $v0, $zero, 0xff /* E2012C 802B701C 3C0143B4 */ lui $at, 0x43b4 /* E20130 802B7020 44810000 */ mtc1 $at, $f0 -/* E20134 802B7024 00000000 */ nop +/* E20134 802B7024 00000000 */ nop /* E20138 802B7028 460C0001 */ sub.s $f0, $f0, $f12 /* E2013C 802B702C 4600010D */ trunc.w.s $f4, $f0 /* E20140 802B7030 44032000 */ mfc1 $v1, $f4 @@ -20,11 +20,11 @@ glabel func_802B7000_E20110 .L802B703C: /* E2014C 802B703C 3C014334 */ lui $at, 0x4334 /* E20150 802B7040 44811000 */ mtc1 $at, $f2 -/* E20154 802B7044 00000000 */ nop +/* E20154 802B7044 00000000 */ nop /* E20158 802B7048 460C103E */ c.le.s $f2, $f12 -/* E2015C 802B704C 00000000 */ nop +/* E2015C 802B704C 00000000 */ nop /* E20160 802B7050 45000006 */ bc1f .L802B706C -/* E20164 802B7054 00000000 */ nop +/* E20164 802B7054 00000000 */ nop /* E20168 802B7058 46026001 */ sub.s $f0, $f12, $f2 /* E2016C 802B705C 4600010D */ trunc.w.s $f4, $f0 /* E20170 802B7060 44032000 */ mfc1 $v1, $f4 @@ -33,9 +33,9 @@ glabel func_802B7000_E20110 .L802B706C: /* E2017C 802B706C 3C0142B4 */ lui $at, 0x42b4 /* E20180 802B7070 44810000 */ mtc1 $at, $f0 -/* E20184 802B7074 00000000 */ nop +/* E20184 802B7074 00000000 */ nop /* E20188 802B7078 460C003E */ c.le.s $f0, $f12 -/* E2018C 802B707C 00000000 */ nop +/* E2018C 802B707C 00000000 */ nop /* E20190 802B7080 45000006 */ bc1f .L802B709C /* E20194 802B7084 240200FF */ addiu $v0, $zero, 0xff /* E20198 802B7088 460C1001 */ sub.s $f0, $f2, $f12 @@ -46,7 +46,7 @@ glabel func_802B7000_E20110 .L802B709C: /* E201AC 802B709C 4600610D */ trunc.w.s $f4, $f12 /* E201B0 802B70A0 44032000 */ mfc1 $v1, $f4 -/* E201B4 802B70A4 00000000 */ nop +/* E201B4 802B70A4 00000000 */ nop /* E201B8 802B70A8 00431023 */ subu $v0, $v0, $v1 .L802B70AC: /* E201BC 802B70AC 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_E20110/func_802B70B4_E201C4.s b/asm/nonmatchings/code_E20110/func_802B70B4_E201C4.s index d0621cdc75..7a35f53f45 100644 --- a/asm/nonmatchings/code_E20110/func_802B70B4_E201C4.s +++ b/asm/nonmatchings/code_E20110/func_802B70B4_E201C4.s @@ -11,7 +11,7 @@ glabel func_802B70B4_E201C4 /* E201DC 802B70CC 8E220004 */ lw $v0, 4($s1) /* E201E0 802B70D0 30420010 */ andi $v0, $v0, 0x10 /* E201E4 802B70D4 1040003F */ beqz $v0, .L802B71D4 -/* E201E8 802B70D8 00000000 */ nop +/* E201E8 802B70D8 00000000 */ nop /* E201EC 802B70DC 3C10802B */ lui $s0, %hi(D_802B7CB8) /* E201F0 802B70E0 26107CB8 */ addiu $s0, $s0, %lo(D_802B7CB8) /* E201F4 802B70E4 8E040000 */ lw $a0, ($s0) @@ -26,7 +26,7 @@ glabel func_802B70B4_E201C4 /* E20218 802B7108 862200B0 */ lh $v0, 0xb0($s1) /* E2021C 802B710C C620002C */ lwc1 $f0, 0x2c($s1) /* E20220 802B7110 44821000 */ mtc1 $v0, $f2 -/* E20224 802B7114 00000000 */ nop +/* E20224 802B7114 00000000 */ nop /* E20228 802B7118 468010A0 */ cvt.s.w $f2, $f2 /* E2022C 802B711C 8E220004 */ lw $v0, 4($s1) /* E20230 802B7120 46020080 */ add.s $f2, $f0, $f2 @@ -37,7 +37,7 @@ glabel func_802B70B4_E201C4 /* E20244 802B7134 24630004 */ addiu $v1, $v1, 4 /* E20248 802B7138 3C014100 */ lui $at, 0x4100 /* E2024C 802B713C 44810000 */ mtc1 $at, $f0 -/* E20250 802B7140 00000000 */ nop +/* E20250 802B7140 00000000 */ nop .L802B7144: /* E20254 802B7144 46001000 */ add.s $f0, $f2, $f0 /* E20258 802B7148 3C04802B */ lui $a0, %hi(D_802B7CB8) diff --git a/asm/nonmatchings/code_E20110/func_802B7450_E20560.s b/asm/nonmatchings/code_E20110/func_802B7450_E20560.s index 4fc23b0ec7..9eeb4cb4f9 100644 --- a/asm/nonmatchings/code_E20110/func_802B7450_E20560.s +++ b/asm/nonmatchings/code_E20110/func_802B7450_E20560.s @@ -27,11 +27,12 @@ glabel func_802B7450_E20560 /* E205B8 802B74A8 2C620031 */ sltiu $v0, $v1, 0x31 /* E205BC 802B74AC 10400038 */ beqz $v0, .L802B7590 /* E205C0 802B74B0 00031080 */ sll $v0, $v1, 2 -/* E205C4 802B74B4 3C01802B */ lui $at, %hi(D_802B7CC0) +/* E205C4 802B74B4 3C01802B */ lui $at, %hi(jtbl_802B7CC0_E20DD0) /* E205C8 802B74B8 00220821 */ addu $at, $at, $v0 -/* E205CC 802B74BC 8C227CC0 */ lw $v0, %lo(D_802B7CC0)($at) +/* E205CC 802B74BC 8C227CC0 */ lw $v0, %lo(jtbl_802B7CC0_E20DD0)($at) /* E205D0 802B74C0 00400008 */ jr $v0 -/* E205D4 802B74C4 00000000 */ nop +/* E205D4 802B74C4 00000000 */ nop +glabel L802B74C8_E205D8 /* E205D8 802B74C8 080ADD64 */ j .L802B7590 /* E205DC 802B74CC 2410FFFF */ addiu $s0, $zero, -1 .L802B74D0: @@ -71,14 +72,14 @@ glabel func_802B7450_E20560 /* E20654 802B7544 14400007 */ bnez $v0, .L802B7564 /* E20658 802B7548 32022000 */ andi $v0, $s0, 0x2000 /* E2065C 802B754C 14400010 */ bnez $v0, .L802B7590 -/* E20660 802B7550 00000000 */ nop +/* E20660 802B7550 00000000 */ nop /* E20664 802B7554 0C05173A */ jal func_80145CE8 /* E20668 802B7558 0200202D */ daddu $a0, $s0, $zero /* E2066C 802B755C 080ADD5B */ j .L802B756C -/* E20670 802B7560 00000000 */ nop +/* E20670 802B7560 00000000 */ nop .L802B7564: /* E20674 802B7564 0C0394BE */ jal func_800E52F8 -/* E20678 802B7568 00000000 */ nop +/* E20678 802B7568 00000000 */ nop .L802B756C: /* E2067C 802B756C 14400008 */ bnez $v0, .L802B7590 /* E20680 802B7570 3C04F7FF */ lui $a0, 0xf7ff @@ -90,6 +91,7 @@ glabel func_802B7450_E20560 /* E20698 802B7588 080ADD74 */ j .L802B75D0 /* E2069C 802B758C AE230000 */ sw $v1, ($s1) .L802B7590: +glabel L802B7590_E206A0 /* E206A0 802B7590 862200C6 */ lh $v0, 0xc6($s1) /* E206A4 802B7594 14500008 */ bne $v0, $s0, .L802B75B8 /* E206A8 802B7598 3C03F7FF */ lui $v1, 0xf7ff @@ -99,7 +101,7 @@ glabel func_802B7450_E20560 /* E206B8 802B75A8 10400007 */ beqz $v0, .L802B75C8 /* E206BC 802B75AC 0000102D */ daddu $v0, $zero, $zero /* E206C0 802B75B0 080ADD74 */ j .L802B75D0 -/* E206C4 802B75B4 00000000 */ nop +/* E206C4 802B75B4 00000000 */ nop .L802B75B8: /* E206C8 802B75B8 8E220000 */ lw $v0, ($s1) /* E206CC 802B75BC 3463FFFF */ ori $v1, $v1, 0xffff diff --git a/asm/nonmatchings/code_E20110/func_802B75E8_E206F8.s b/asm/nonmatchings/code_E20110/func_802B75E8_E206F8.s index 8b1805286a..04ee5dd580 100644 --- a/asm/nonmatchings/code_E20110/func_802B75E8_E206F8.s +++ b/asm/nonmatchings/code_E20110/func_802B75E8_E206F8.s @@ -38,27 +38,27 @@ glabel func_802B75E8_E206F8 /* E20774 802B7664 3C013F2A */ lui $at, 0x3f2a /* E20778 802B7668 34217EFA */ ori $at, $at, 0x7efa /* E2077C 802B766C 44812000 */ mtc1 $at, $f4 -/* E20780 802B7670 00000000 */ nop +/* E20780 802B7670 00000000 */ nop /* E20784 802B7674 46040182 */ mul.s $f6, $f0, $f4 -/* E20788 802B7678 00000000 */ nop +/* E20788 802B7678 00000000 */ nop /* E2078C 802B767C 46061080 */ add.s $f2, $f2, $f6 /* E20790 802B7680 E4820000 */ swc1 $f2, ($a0) /* E20794 802B7684 C4C00030 */ lwc1 $f0, 0x30($a2) /* E20798 802B7688 C4820008 */ lwc1 $f2, 8($a0) /* E2079C 802B768C 46020001 */ sub.s $f0, $f0, $f2 /* E207A0 802B7690 46040182 */ mul.s $f6, $f0, $f4 -/* E207A4 802B7694 00000000 */ nop +/* E207A4 802B7694 00000000 */ nop /* E207A8 802B7698 80830021 */ lb $v1, 0x21($a0) /* E207AC 802B769C 46061080 */ add.s $f2, $f2, $f6 /* E207B0 802B76A0 C4840004 */ lwc1 $f4, 4($a0) /* E207B4 802B76A4 44833000 */ mtc1 $v1, $f6 -/* E207B8 802B76A8 00000000 */ nop +/* E207B8 802B76A8 00000000 */ nop /* E207BC 802B76AC 468031A0 */ cvt.s.w $f6, $f6 /* E207C0 802B76B0 E4820008 */ swc1 $f2, 8($a0) /* E207C4 802B76B4 84C200B0 */ lh $v0, 0xb0($a2) /* E207C8 802B76B8 C4C0002C */ lwc1 $f0, 0x2c($a2) /* E207CC 802B76BC 44821000 */ mtc1 $v0, $f2 -/* E207D0 802B76C0 00000000 */ nop +/* E207D0 802B76C0 00000000 */ nop /* E207D4 802B76C4 468010A0 */ cvt.s.w $f2, $f2 /* E207D8 802B76C8 8CC20004 */ lw $v0, 4($a2) /* E207DC 802B76CC 46020080 */ add.s $f2, $f0, $f2 @@ -69,16 +69,16 @@ glabel func_802B75E8_E206F8 /* E207F0 802B76E0 46001000 */ add.s $f0, $f2, $f0 /* E207F4 802B76E4 3C014100 */ lui $at, 0x4100 /* E207F8 802B76E8 44810000 */ mtc1 $at, $f0 -/* E207FC 802B76EC 00000000 */ nop +/* E207FC 802B76EC 00000000 */ nop /* E20800 802B76F0 46001000 */ add.s $f0, $f2, $f0 .L802B76F4: /* E20804 802B76F4 46060000 */ add.s $f0, $f0, $f6 /* E20808 802B76F8 46040001 */ sub.s $f0, $f0, $f4 /* E2080C 802B76FC 3C013E80 */ lui $at, 0x3e80 /* E20810 802B7700 44811000 */ mtc1 $at, $f2 -/* E20814 802B7704 00000000 */ nop +/* E20814 802B7704 00000000 */ nop /* E20818 802B7708 46020182 */ mul.s $f6, $f0, $f2 -/* E2081C 802B770C 00000000 */ nop +/* E2081C 802B770C 00000000 */ nop /* E20820 802B7710 3C02802B */ lui $v0, %hi(D_802B7CB8) /* E20824 802B7714 8C427CB8 */ lw $v0, %lo(D_802B7CB8)($v0) /* E20828 802B7718 C4400004 */ lwc1 $f0, 4($v0) diff --git a/asm/nonmatchings/code_E20110/func_802B7728_E20838.s b/asm/nonmatchings/code_E20110/func_802B7728_E20838.s index f7c2780e9e..596d1babd3 100644 --- a/asm/nonmatchings/code_E20110/func_802B7728_E20838.s +++ b/asm/nonmatchings/code_E20110/func_802B7728_E20838.s @@ -20,16 +20,16 @@ glabel func_802B7728_E20838 /* E20874 802B7764 10400005 */ beqz $v0, .L802B777C /* E20878 802B7768 24020002 */ addiu $v0, $zero, 2 /* E2087C 802B776C 10A00009 */ beqz $a1, .L802B7794 -/* E20880 802B7770 00000000 */ nop +/* E20880 802B7770 00000000 */ nop /* E20884 802B7774 080ADE4A */ j .L802B7928 -/* E20888 802B7778 00000000 */ nop +/* E20888 802B7778 00000000 */ nop .L802B777C: /* E2088C 802B777C 10A20027 */ beq $a1, $v0, .L802B781C /* E20890 802B7780 24020003 */ addiu $v0, $zero, 3 /* E20894 802B7784 10A20033 */ beq $a1, $v0, .L802B7854 -/* E20898 802B7788 00000000 */ nop +/* E20898 802B7788 00000000 */ nop /* E2089C 802B778C 080ADE4A */ j .L802B7928 -/* E208A0 802B7790 00000000 */ nop +/* E208A0 802B7790 00000000 */ nop .L802B7794: /* E208A4 802B7794 C4800010 */ lwc1 $f0, 0x10($a0) /* E208A8 802B7798 3C01802B */ lui $at, %hi(D_802B7D88) @@ -42,7 +42,7 @@ glabel func_802B7728_E20838 /* E208C4 802B77B4 46200020 */ cvt.s.d $f0, $f0 /* E208C8 802B77B8 460000A1 */ cvt.d.s $f2, $f0 /* E208CC 802B77BC 4622203E */ c.le.d $f4, $f2 -/* E208D0 802B77C0 00000000 */ nop +/* E208D0 802B77C0 00000000 */ nop /* E208D4 802B77C4 45000058 */ bc1f .L802B7928 /* E208D8 802B77C8 E4800010 */ swc1 $f0, 0x10($a0) /* E208DC 802B77CC 90820023 */ lbu $v0, 0x23($a0) @@ -70,13 +70,13 @@ glabel func_802B7728_E20838 /* E2092C 802B781C C48C000C */ lwc1 $f12, 0xc($a0) /* E20930 802B7820 3C014120 */ lui $at, 0x4120 /* E20934 802B7824 44810000 */ mtc1 $at, $f0 -/* E20938 802B7828 00000000 */ nop +/* E20938 802B7828 00000000 */ nop /* E2093C 802B782C 46006300 */ add.s $f12, $f12, $f0 /* E20940 802B7830 3C0143B4 */ lui $at, 0x43b4 /* E20944 802B7834 44810000 */ mtc1 $at, $f0 -/* E20948 802B7838 00000000 */ nop +/* E20948 802B7838 00000000 */ nop /* E2094C 802B783C 460C003E */ c.le.s $f0, $f12 -/* E20950 802B7840 00000000 */ nop +/* E20950 802B7840 00000000 */ nop /* E20954 802B7844 45030001 */ bc1tl .L802B784C /* E20958 802B7848 46006301 */ sub.s $f12, $f12, $f0 .L802B784C: @@ -86,13 +86,13 @@ glabel func_802B7728_E20838 /* E20964 802B7854 C48C000C */ lwc1 $f12, 0xc($a0) /* E20968 802B7858 3C0141C8 */ lui $at, 0x41c8 /* E2096C 802B785C 44810000 */ mtc1 $at, $f0 -/* E20970 802B7860 00000000 */ nop +/* E20970 802B7860 00000000 */ nop /* E20974 802B7864 46006300 */ add.s $f12, $f12, $f0 /* E20978 802B7868 3C0143B4 */ lui $at, 0x43b4 /* E2097C 802B786C 44810000 */ mtc1 $at, $f0 -/* E20980 802B7870 00000000 */ nop +/* E20980 802B7870 00000000 */ nop /* E20984 802B7874 460C003E */ c.le.s $f0, $f12 -/* E20988 802B7878 00000000 */ nop +/* E20988 802B7878 00000000 */ nop /* E2098C 802B787C 45030001 */ bc1tl .L802B7884 /* E20990 802B7880 46006301 */ sub.s $f12, $f12, $f0 .L802B7884: @@ -105,33 +105,33 @@ glabel func_802B7728_E20838 .L802B789C: /* E209AC 802B789C 3C01428C */ lui $at, 0x428c /* E209B0 802B78A0 44810000 */ mtc1 $at, $f0 -/* E209B4 802B78A4 00000000 */ nop +/* E209B4 802B78A4 00000000 */ nop /* E209B8 802B78A8 460C003E */ c.le.s $f0, $f12 -/* E209BC 802B78AC 00000000 */ nop +/* E209BC 802B78AC 00000000 */ nop /* E209C0 802B78B0 45000008 */ bc1f .L802B78D4 -/* E209C4 802B78B4 00000000 */ nop +/* E209C4 802B78B4 00000000 */ nop /* E209C8 802B78B8 3C0142DC */ lui $at, 0x42dc /* E209CC 802B78BC 44810000 */ mtc1 $at, $f0 -/* E209D0 802B78C0 00000000 */ nop +/* E209D0 802B78C0 00000000 */ nop /* E209D4 802B78C4 4600603E */ c.le.s $f12, $f0 -/* E209D8 802B78C8 00000000 */ nop +/* E209D8 802B78C8 00000000 */ nop /* E209DC 802B78CC 4501000F */ bc1t .L802B790C -/* E209E0 802B78D0 00000000 */ nop +/* E209E0 802B78D0 00000000 */ nop .L802B78D4: /* E209E4 802B78D4 3C01437A */ lui $at, 0x437a /* E209E8 802B78D8 44810000 */ mtc1 $at, $f0 -/* E209EC 802B78DC 00000000 */ nop +/* E209EC 802B78DC 00000000 */ nop /* E209F0 802B78E0 460C003E */ c.le.s $f0, $f12 -/* E209F4 802B78E4 00000000 */ nop +/* E209F4 802B78E4 00000000 */ nop /* E209F8 802B78E8 4500000C */ bc1f .L802B791C -/* E209FC 802B78EC 00000000 */ nop +/* E209FC 802B78EC 00000000 */ nop /* E20A00 802B78F0 3C014391 */ lui $at, 0x4391 /* E20A04 802B78F4 44810000 */ mtc1 $at, $f0 -/* E20A08 802B78F8 00000000 */ nop +/* E20A08 802B78F8 00000000 */ nop /* E20A0C 802B78FC 4600603E */ c.le.s $f12, $f0 -/* E20A10 802B7900 00000000 */ nop +/* E20A10 802B7900 00000000 */ nop /* E20A14 802B7904 45000005 */ bc1f .L802B791C -/* E20A18 802B7908 00000000 */ nop +/* E20A18 802B7908 00000000 */ nop .L802B790C: /* E20A1C 802B790C 3C02802B */ lui $v0, %hi(func_802B79C8_E20AD8) /* E20A20 802B7910 244279C8 */ addiu $v0, $v0, %lo(func_802B79C8_E20AD8) @@ -139,7 +139,7 @@ glabel func_802B7728_E20838 /* E20A28 802B7918 AC22C958 */ sw $v0, %lo(D_8010C958)($at) .L802B791C: /* E20A2C 802B791C 0C0ADC00 */ jal func_802B7000_E20110 -/* E20A30 802B7920 00000000 */ nop +/* E20A30 802B7920 00000000 */ nop /* E20A34 802B7924 0040802D */ daddu $s0, $v0, $zero .L802B7928: /* E20A38 802B7928 3C02802B */ lui $v0, %hi(D_802B7CB8) @@ -148,16 +148,16 @@ glabel func_802B7728_E20838 /* E20A44 802B7934 0C0ADD14 */ jal func_802B7450_E20560 /* E20A48 802B7938 823000B4 */ lb $s0, 0xb4($s1) /* E20A4C 802B793C 1040000A */ beqz $v0, .L802B7968 -/* E20A50 802B7940 00000000 */ nop +/* E20A50 802B7940 00000000 */ nop /* E20A54 802B7944 82220015 */ lb $v0, 0x15($s1) /* E20A58 802B7948 14400007 */ bnez $v0, .L802B7968 -/* E20A5C 802B794C 00000000 */ nop +/* E20A5C 802B794C 00000000 */ nop /* E20A60 802B7950 8E220000 */ lw $v0, ($s1) /* E20A64 802B7954 30420020 */ andi $v0, $v0, 0x20 /* E20A68 802B7958 14400003 */ bnez $v0, .L802B7968 /* E20A6C 802B795C 2E020003 */ sltiu $v0, $s0, 3 /* E20A70 802B7960 14400005 */ bnez $v0, .L802B7978 -/* E20A74 802B7964 00000000 */ nop +/* E20A74 802B7964 00000000 */ nop .L802B7968: /* E20A78 802B7968 3C03802B */ lui $v1, %hi(D_802B7CB8) /* E20A7C 802B796C 8C637CB8 */ lw $v1, %lo(D_802B7CB8)($v1) @@ -169,9 +169,9 @@ glabel func_802B7728_E20838 /* E20A90 802B7980 0480000C */ bltz $a0, .L802B79B4 /* E20A94 802B7984 30424000 */ andi $v0, $v0, 0x4000 /* E20A98 802B7988 1040000A */ beqz $v0, .L802B79B4 -/* E20A9C 802B798C 00000000 */ nop +/* E20A9C 802B798C 00000000 */ nop /* E20AA0 802B7990 0C04417A */ jal get_entity_by_index -/* E20AA4 802B7994 00000000 */ nop +/* E20AA4 802B7994 00000000 */ nop /* E20AA8 802B7998 8C420000 */ lw $v0, ($v0) /* E20AAC 802B799C 30421000 */ andi $v0, $v0, 0x1000 /* E20AB0 802B79A0 14400004 */ bnez $v0, .L802B79B4 diff --git a/asm/nonmatchings/code_E20110/func_802B79C8_E20AD8.s b/asm/nonmatchings/code_E20110/func_802B79C8_E20AD8.s index 30482426d3..430e77b77b 100644 --- a/asm/nonmatchings/code_E20110/func_802B79C8_E20AD8.s +++ b/asm/nonmatchings/code_E20110/func_802B79C8_E20AD8.s @@ -5,7 +5,7 @@ glabel func_802B79C8_E20AD8 /* E20AD8 802B79C8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* E20ADC 802B79CC AFBF0010 */ sw $ra, 0x10($sp) /* E20AE0 802B79D0 0C0ADD7A */ jal func_802B75E8_E206F8 -/* E20AE4 802B79D4 00000000 */ nop +/* E20AE4 802B79D4 00000000 */ nop /* E20AE8 802B79D8 3C04800F */ lui $a0, %hi(gPlayerStatusPtr) /* E20AEC 802B79DC 8C847B30 */ lw $a0, %lo(gPlayerStatusPtr)($a0) /* E20AF0 802B79E0 2402FFFF */ addiu $v0, $zero, -1 @@ -20,7 +20,7 @@ glabel func_802B79C8_E20AD8 /* E20B14 802B7A04 0C03BCF5 */ jal func_800EF3D4 /* E20B18 802B7A08 0000202D */ daddu $a0, $zero, $zero /* E20B1C 802B7A0C 0C03BCE9 */ jal func_800EF3A4 -/* E20B20 802B7A10 00000000 */ nop +/* E20B20 802B7A10 00000000 */ nop /* E20B24 802B7A14 8FBF0010 */ lw $ra, 0x10($sp) /* E20B28 802B7A18 03E00008 */ jr $ra /* E20B2C 802B7A1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E225B0/func_802B7000_E225B0.s b/asm/nonmatchings/code_E225B0/func_802B7000_E225B0.s index a270f27e0e..4bde3f29a2 100644 --- a/asm/nonmatchings/code_E225B0/func_802B7000_E225B0.s +++ b/asm/nonmatchings/code_E225B0/func_802B7000_E225B0.s @@ -117,19 +117,22 @@ glabel func_802B7000_E225B0 /* E2276C 802B71BC 2C82000C */ sltiu $v0, $a0, 0xc /* E22770 802B71C0 10400011 */ beqz $v0, .L802B7208 /* E22774 802B71C4 00041080 */ sll $v0, $a0, 2 -/* E22778 802B71C8 3C01802B */ lui $at, %hi(D_802B7C80) +/* E22778 802B71C8 3C01802B */ lui $at, %hi(jtbl_802B7C80_E23230) /* E2277C 802B71CC 00220821 */ addu $at, $at, $v0 -/* E22780 802B71D0 8C227C80 */ lw $v0, %lo(D_802B7C80)($at) +/* E22780 802B71D0 8C227C80 */ lw $v0, %lo(jtbl_802B7C80_E23230)($at) /* E22784 802B71D4 00400008 */ jr $v0 -/* E22788 802B71D8 00000000 */ nop +/* E22788 802B71D8 00000000 */ nop +glabel L802B71DC_E2278C /* E2278C 802B71DC 3C02802B */ lui $v0, %hi(D_802B7BA0) /* E22790 802B71E0 24427BA0 */ addiu $v0, $v0, %lo(D_802B7BA0) /* E22794 802B71E4 080ADC82 */ j .L802B7208 /* E22798 802B71E8 AFA200A4 */ sw $v0, 0xa4($sp) +glabel L802B71EC_E2279C /* E2279C 802B71EC 3C02802B */ lui $v0, %hi(D_802B7BC0) /* E227A0 802B71F0 24427BC0 */ addiu $v0, $v0, %lo(D_802B7BC0) /* E227A4 802B71F4 080ADC82 */ j .L802B7208 /* E227A8 802B71F8 AFA200A4 */ sw $v0, 0xa4($sp) +glabel L802B71FC_E227AC /* E227AC 802B71FC 3C02802B */ lui $v0, %hi(D_802B7BE0) /* E227B0 802B7200 24427BE0 */ addiu $v0, $v0, %lo(D_802B7BE0) /* E227B4 802B7204 AFA200A4 */ sw $v0, 0xa4($sp) diff --git a/asm/nonmatchings/code_E225B0/func_802B72C0_E22870.s b/asm/nonmatchings/code_E225B0/func_802B72C0_E22870.s index e4ff2499b6..589b8ffc3b 100644 --- a/asm/nonmatchings/code_E225B0/func_802B72C0_E22870.s +++ b/asm/nonmatchings/code_E225B0/func_802B72C0_E22870.s @@ -18,12 +18,12 @@ glabel func_802B72C0_E22870 /* E228A4 802B72F4 848200B0 */ lh $v0, 0xb0($a0) /* E228A8 802B72F8 C480002C */ lwc1 $f0, 0x2c($a0) /* E228AC 802B72FC 44821000 */ mtc1 $v0, $f2 -/* E228B0 802B7300 00000000 */ nop +/* E228B0 802B7300 00000000 */ nop /* E228B4 802B7304 468010A0 */ cvt.s.w $f2, $f2 /* E228B8 802B7308 46020000 */ add.s $f0, $f0, $f2 /* E228BC 802B730C 3C014100 */ lui $at, 0x4100 /* E228C0 802B7310 44811000 */ mtc1 $at, $f2 -/* E228C4 802B7314 00000000 */ nop +/* E228C4 802B7314 00000000 */ nop /* E228C8 802B7318 46020000 */ add.s $f0, $f0, $f2 /* E228CC 802B731C E4600004 */ swc1 $f0, 4($v1) /* E228D0 802B7320 C4800030 */ lwc1 $f0, 0x30($a0) diff --git a/asm/nonmatchings/code_E225B0/func_802B735C_E2290C.s b/asm/nonmatchings/code_E225B0/func_802B735C_E2290C.s index a3428fad67..c429c2889f 100644 --- a/asm/nonmatchings/code_E225B0/func_802B735C_E2290C.s +++ b/asm/nonmatchings/code_E225B0/func_802B735C_E2290C.s @@ -9,7 +9,7 @@ glabel func_802B735C_E2290C /* E2291C 802B736C 84A200B0 */ lh $v0, 0xb0($a1) /* E22920 802B7370 C4A0002C */ lwc1 $f0, 0x2c($a1) /* E22924 802B7374 44821000 */ mtc1 $v0, $f2 -/* E22928 802B7378 00000000 */ nop +/* E22928 802B7378 00000000 */ nop /* E2292C 802B737C 468010A0 */ cvt.s.w $f2, $f2 /* E22930 802B7380 46020000 */ add.s $f0, $f0, $f2 /* E22934 802B7384 3C014120 */ lui $at, 0x4120 @@ -21,7 +21,7 @@ glabel func_802B735C_E2290C /* E2294C 802B739C 46020001 */ sub.s $f0, $f0, $f2 /* E22950 802B73A0 3C013FC0 */ lui $at, 0x3fc0 /* E22954 802B73A4 44812000 */ mtc1 $at, $f4 -/* E22958 802B73A8 00000000 */ nop +/* E22958 802B73A8 00000000 */ nop /* E2295C 802B73AC 46040003 */ div.s $f0, $f0, $f4 /* E22960 802B73B0 46001080 */ add.s $f2, $f2, $f0 /* E22964 802B73B4 8C830024 */ lw $v1, 0x24($a0) @@ -38,23 +38,23 @@ glabel func_802B735C_E2290C /* E22990 802B73E0 50400005 */ beql $v0, $zero, .L802B73F8 /* E22994 802B73E4 24020002 */ addiu $v0, $zero, 2 /* E22998 802B73E8 10600009 */ beqz $v1, .L802B7410 -/* E2299C 802B73EC 00000000 */ nop +/* E2299C 802B73EC 00000000 */ nop /* E229A0 802B73F0 080ADD5A */ j .L802B7568 -/* E229A4 802B73F4 00000000 */ nop +/* E229A4 802B73F4 00000000 */ nop .L802B73F8: /* E229A8 802B73F8 1062002D */ beq $v1, $v0, .L802B74B0 /* E229AC 802B73FC 24020003 */ addiu $v0, $zero, 3 /* E229B0 802B7400 10620037 */ beq $v1, $v0, .L802B74E0 -/* E229B4 802B7404 00000000 */ nop +/* E229B4 802B7404 00000000 */ nop /* E229B8 802B7408 080ADD5A */ j .L802B7568 -/* E229BC 802B740C 00000000 */ nop +/* E229BC 802B740C 00000000 */ nop .L802B7410: /* E229C0 802B7410 80C20000 */ lb $v0, ($a2) /* E229C4 802B7414 10400008 */ beqz $v0, .L802B7438 /* E229C8 802B7418 24020008 */ addiu $v0, $zero, 8 /* E229CC 802B741C 80C30003 */ lb $v1, 3($a2) /* E229D0 802B7420 14620005 */ bne $v1, $v0, .L802B7438 -/* E229D4 802B7424 00000000 */ nop +/* E229D4 802B7424 00000000 */ nop /* E229D8 802B7428 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* E229DC 802B742C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* E229E0 802B7430 080ADD10 */ j .L802B7440 @@ -64,7 +64,7 @@ glabel func_802B735C_E2290C /* E229EC 802B743C 30423000 */ andi $v0, $v0, 0x3000 .L802B7440: /* E229F0 802B7440 14400049 */ bnez $v0, .L802B7568 -/* E229F4 802B7444 00000000 */ nop +/* E229F4 802B7444 00000000 */ nop /* E229F8 802B7448 3C03802B */ lui $v1, %hi(D_802B7C78) /* E229FC 802B744C 8C637C78 */ lw $v1, %lo(D_802B7C78)($v1) /* E22A00 802B7450 8C620024 */ lw $v0, 0x24($v1) @@ -105,7 +105,7 @@ glabel func_802B735C_E2290C /* E22A80 802B74D0 0C052736 */ jal play_sound_at_player /* E22A84 802B74D4 2404017B */ addiu $a0, $zero, 0x17b /* E22A88 802B74D8 080ADD5A */ j .L802B7568 -/* E22A8C 802B74DC 00000000 */ nop +/* E22A8C 802B74DC 00000000 */ nop .L802B74E0: /* E22A90 802B74E0 8C820018 */ lw $v0, 0x18($a0) /* E22A94 802B74E4 3C013F07 */ lui $at, 0x3f07 @@ -117,7 +117,7 @@ glabel func_802B735C_E2290C /* E22AAC 802B74FC 8CA20000 */ lw $v0, ($a1) /* E22AB0 802B7500 30420020 */ andi $v0, $v0, 0x20 /* E22AB4 802B7504 10400008 */ beqz $v0, .L802B7528 -/* E22AB8 802B7508 00000000 */ nop +/* E22AB8 802B7508 00000000 */ nop .L802B750C: /* E22ABC 802B750C 8C820028 */ lw $v0, 0x28($a0) /* E22AC0 802B7510 2442FFC0 */ addiu $v0, $v0, -0x40 @@ -147,6 +147,6 @@ glabel func_802B735C_E2290C /* E22B18 802B7568 8FBF0010 */ lw $ra, 0x10($sp) /* E22B1C 802B756C 03E00008 */ jr $ra /* E22B20 802B7570 27BD0018 */ addiu $sp, $sp, 0x18 -/* E22B24 802B7574 00000000 */ nop -/* E22B28 802B7578 00000000 */ nop -/* E22B2C 802B757C 00000000 */ nop +/* E22B24 802B7574 00000000 */ nop +/* E22B28 802B7578 00000000 */ nop +/* E22B2C 802B757C 00000000 */ nop diff --git a/asm/nonmatchings/code_E236E0/func_802B6000_E236E0.s b/asm/nonmatchings/code_E236E0/func_802B6000_E236E0.s index 63b8e7e338..1d7f8110a5 100644 --- a/asm/nonmatchings/code_E236E0/func_802B6000_E236E0.s +++ b/asm/nonmatchings/code_E236E0/func_802B6000_E236E0.s @@ -18,9 +18,9 @@ glabel func_802B6000_E236E0 /* E23714 802B6034 10400005 */ beqz $v0, .L802B604C /* E23718 802B6038 0000982D */ daddu $s3, $zero, $zero /* E2371C 802B603C 0C0AD97A */ jal func_802B65E8_E23CC8 -/* E23720 802B6040 00000000 */ nop +/* E23720 802B6040 00000000 */ nop /* E23724 802B6044 080AD89A */ j .L802B6268 -/* E23728 802B6048 00000000 */ nop +/* E23728 802B6048 00000000 */ nop .L802B604C: /* E2372C 802B604C 8E030000 */ lw $v1, ($s0) /* E23730 802B6050 04610016 */ bgez $v1, .L802B60AC @@ -48,7 +48,7 @@ glabel func_802B6000_E236E0 /* E23780 802B60A0 34840004 */ ori $a0, $a0, 4 .L802B60A4: /* E23784 802B60A4 0C037FBF */ jal func_800DFEFC -/* E23788 802B60A8 00000000 */ nop +/* E23788 802B60A8 00000000 */ nop .L802B60AC: /* E2378C 802B60AC 8E020000 */ lw $v0, ($s0) /* E23790 802B60B0 30424000 */ andi $v0, $v0, 0x4000 @@ -58,7 +58,7 @@ glabel func_802B6000_E236E0 /* E237A0 802B60C0 0C039426 */ jal func_800E5098 /* E237A4 802B60C4 E6000080 */ swc1 $f0, 0x80($s0) /* E237A8 802B60C8 080AD89A */ j .L802B6268 -/* E237AC 802B60CC 00000000 */ nop +/* E237AC 802B60CC 00000000 */ nop .L802B60D0: /* E237B0 802B60D0 27B20010 */ addiu $s2, $sp, 0x10 /* E237B4 802B60D4 0240202D */ daddu $a0, $s2, $zero @@ -66,32 +66,32 @@ glabel func_802B6000_E236E0 /* E237BC 802B60DC 0C0388C1 */ jal input_to_move_vector /* E237C0 802B60E0 0220282D */ daddu $a1, $s1, $zero /* E237C4 802B60E4 0C039454 */ jal func_800E5150 -/* E237C8 802B60E8 00000000 */ nop +/* E237C8 802B60E8 00000000 */ nop /* E237CC 802B60EC 0C039858 */ jal check_input_jump -/* E237D0 802B60F0 00000000 */ nop +/* E237D0 802B60F0 00000000 */ nop /* E237D4 802B60F4 1440005C */ bnez $v0, .L802B6268 -/* E237D8 802B60F8 00000000 */ nop +/* E237D8 802B60F8 00000000 */ nop /* E237DC 802B60FC 16600006 */ bnez $s3, .L802B6118 /* E237E0 802B6100 0240202D */ daddu $a0, $s2, $zero /* E237E4 802B6104 0C039838 */ jal check_input_hammer -/* E237E8 802B6108 00000000 */ nop +/* E237E8 802B6108 00000000 */ nop /* E237EC 802B610C 14400056 */ bnez $v0, .L802B6268 -/* E237F0 802B6110 00000000 */ nop +/* E237F0 802B6110 00000000 */ nop /* E237F4 802B6114 0240202D */ daddu $a0, $s2, $zero .L802B6118: /* E237F8 802B6118 0C0388C1 */ jal input_to_move_vector /* E237FC 802B611C 0220282D */ daddu $a1, $s1, $zero /* E23800 802B6120 C7A40014 */ lwc1 $f4, 0x14($sp) /* E23804 802B6124 44800000 */ mtc1 $zero, $f0 -/* E23808 802B6128 00000000 */ nop +/* E23808 802B6128 00000000 */ nop /* E2380C 802B612C 46002032 */ c.eq.s $f4, $f0 -/* E23810 802B6130 00000000 */ nop +/* E23810 802B6130 00000000 */ nop /* E23814 802B6134 45000005 */ bc1f .L802B614C -/* E23818 802B6138 00000000 */ nop +/* E23818 802B6138 00000000 */ nop /* E2381C 802B613C 0C039769 */ jal set_action_state /* E23820 802B6140 0000202D */ daddu $a0, $zero, $zero /* E23824 802B6144 080AD89A */ j .L802B6268 -/* E23828 802B6148 00000000 */ nop +/* E23828 802B6148 00000000 */ nop .L802B614C: /* E2382C 802B614C C7A60010 */ lwc1 $f6, 0x10($sp) /* E23830 802B6150 3C01800F */ lui $at, %hi(D_800F7B40) @@ -102,30 +102,30 @@ glabel func_802B6000_E236E0 /* E23844 802B6164 44811000 */ mtc1 $at, $f2 /* E23848 802B6168 46000005 */ abs.s $f0, $f0 /* E2384C 802B616C 4602003E */ c.le.s $f0, $f2 -/* E23850 802B6170 00000000 */ nop +/* E23850 802B6170 00000000 */ nop /* E23854 802B6174 4500001C */ bc1f .L802B61E8 -/* E23858 802B6178 00000000 */ nop +/* E23858 802B6178 00000000 */ nop /* E2385C 802B617C 3C01800F */ lui $at, %hi(D_800F7B44) /* E23860 802B6180 C4207B44 */ lwc1 $f0, %lo(D_800F7B44)($at) /* E23864 802B6184 46800020 */ cvt.s.w $f0, $f0 /* E23868 802B6188 46002001 */ sub.s $f0, $f4, $f0 /* E2386C 802B618C 4600020D */ trunc.w.s $f8, $f0 /* E23870 802B6190 44024000 */ mfc1 $v0, $f8 -/* E23874 802B6194 00000000 */ nop +/* E23874 802B6194 00000000 */ nop /* E23878 802B6198 04420001 */ bltzl $v0, .L802B61A0 /* E2387C 802B619C 00021023 */ negu $v0, $v0 .L802B61A0: /* E23880 802B61A0 28420014 */ slti $v0, $v0, 0x14 /* E23884 802B61A4 10400010 */ beqz $v0, .L802B61E8 -/* E23888 802B61A8 00000000 */ nop +/* E23888 802B61A8 00000000 */ nop /* E2388C 802B61AC 8E020004 */ lw $v0, 4($s0) /* E23890 802B61B0 0440000A */ bltz $v0, .L802B61DC /* E23894 802B61B4 3C037FFF */ lui $v1, 0x7fff /* E23898 802B61B8 3C0141A0 */ lui $at, 0x41a0 /* E2389C 802B61BC 44810000 */ mtc1 $at, $f0 -/* E238A0 802B61C0 00000000 */ nop +/* E238A0 802B61C0 00000000 */ nop /* E238A4 802B61C4 4604003E */ c.le.s $f0, $f4 -/* E238A8 802B61C8 00000000 */ nop +/* E238A8 802B61C8 00000000 */ nop /* E238AC 802B61CC 45030002 */ bc1tl .L802B61D8 /* E238B0 802B61D0 E6060080 */ swc1 $f6, 0x80($s0) /* E238B4 802B61D4 3C037FFF */ lui $v1, 0x7fff @@ -150,22 +150,22 @@ glabel func_802B6000_E236E0 /* E238E8 802B6208 0C03A752 */ jal is_ability_active /* E238EC 802B620C 2404000B */ addiu $a0, $zero, 0xb /* E238F0 802B6210 14400010 */ bnez $v0, .L802B6254 -/* E238F4 802B6214 00000000 */ nop +/* E238F4 802B6214 00000000 */ nop /* E238F8 802B6218 8E0200E8 */ lw $v0, 0xe8($s0) /* E238FC 802B621C 00420018 */ mult $v0, $v0 /* E23900 802B6220 00001812 */ mflo $v1 /* E23904 802B6224 8E0200EC */ lw $v0, 0xec($s0) -/* E23908 802B6228 00000000 */ nop +/* E23908 802B6228 00000000 */ nop /* E2390C 802B622C 00420018 */ mult $v0, $v0 /* E23910 802B6230 00003812 */ mflo $a3 /* E23914 802B6234 00671021 */ addu $v0, $v1, $a3 /* E23918 802B6238 28420BD2 */ slti $v0, $v0, 0xbd2 /* E2391C 802B623C 14400005 */ bnez $v0, .L802B6254 -/* E23920 802B6240 00000000 */ nop +/* E23920 802B6240 00000000 */ nop /* E23924 802B6244 0C039769 */ jal set_action_state /* E23928 802B6248 24040002 */ addiu $a0, $zero, 2 /* E2392C 802B624C 080AD89A */ j .L802B6268 -/* E23930 802B6250 00000000 */ nop +/* E23930 802B6250 00000000 */ nop .L802B6254: /* E23934 802B6254 0C039426 */ jal func_800E5098 /* E23938 802B6258 24040008 */ addiu $a0, $zero, 8 diff --git a/asm/nonmatchings/code_E236E0/func_802B6288_E23968.s b/asm/nonmatchings/code_E236E0/func_802B6288_E23968.s index bfbd392f94..dc10532755 100644 --- a/asm/nonmatchings/code_E236E0/func_802B6288_E23968.s +++ b/asm/nonmatchings/code_E236E0/func_802B6288_E23968.s @@ -18,9 +18,9 @@ glabel func_802B6288_E23968 /* E2399C 802B62BC 10400005 */ beqz $v0, .L802B62D4 /* E239A0 802B62C0 0000982D */ daddu $s3, $zero, $zero /* E239A4 802B62C4 0C0AD9CE */ jal func_802B6738_E23E18 -/* E239A8 802B62C8 00000000 */ nop +/* E239A8 802B62C8 00000000 */ nop /* E239AC 802B62CC 080AD94C */ j .L802B6530 -/* E239B0 802B62D0 00000000 */ nop +/* E239B0 802B62D0 00000000 */ nop .L802B62D4: /* E239B4 802B62D4 8E030000 */ lw $v1, ($s0) /* E239B8 802B62D8 04610019 */ bgez $v1, .L802B6340 @@ -51,7 +51,7 @@ glabel func_802B6288_E23968 /* E23A14 802B6334 34840005 */ ori $a0, $a0, 5 .L802B6338: /* E23A18 802B6338 0C037FBF */ jal func_800DFEFC -/* E23A1C 802B633C 00000000 */ nop +/* E23A1C 802B633C 00000000 */ nop .L802B6340: /* E23A20 802B6340 8E020000 */ lw $v0, ($s0) /* E23A24 802B6344 30424000 */ andi $v0, $v0, 0x4000 @@ -61,7 +61,7 @@ glabel func_802B6288_E23968 /* E23A34 802B6354 0C039426 */ jal func_800E5098 /* E23A38 802B6358 E6000080 */ swc1 $f0, 0x80($s0) /* E23A3C 802B635C 080AD94C */ j .L802B6530 -/* E23A40 802B6360 00000000 */ nop +/* E23A40 802B6360 00000000 */ nop .L802B6364: /* E23A44 802B6364 3C038011 */ lui $v1, %hi(D_8010C980) /* E23A48 802B6368 2463C980 */ addiu $v1, $v1, %lo(D_8010C980) @@ -74,13 +74,13 @@ glabel func_802B6288_E23968 /* E23A64 802B6384 3C030001 */ lui $v1, 1 /* E23A68 802B6388 00431024 */ and $v0, $v0, $v1 /* E23A6C 802B638C 10400003 */ beqz $v0, .L802B639C -/* E23A70 802B6390 00000000 */ nop +/* E23A70 802B6390 00000000 */ nop /* E23A74 802B6394 3C013FC0 */ lui $at, 0x3fc0 /* E23A78 802B6398 44811000 */ mtc1 $at, $f2 .L802B639C: /* E23A7C 802B639C C600005C */ lwc1 $f0, 0x5c($s0) /* E23A80 802B63A0 46020002 */ mul.s $f0, $f0, $f2 -/* E23A84 802B63A4 00000000 */ nop +/* E23A84 802B63A4 00000000 */ nop /* E23A88 802B63A8 27B20010 */ addiu $s2, $sp, 0x10 /* E23A8C 802B63AC 0240202D */ daddu $a0, $s2, $zero /* E23A90 802B63B0 27B10014 */ addiu $s1, $sp, 0x14 @@ -88,32 +88,32 @@ glabel func_802B6288_E23968 /* E23A98 802B63B8 0C0388C1 */ jal input_to_move_vector /* E23A9C 802B63BC E6000054 */ swc1 $f0, 0x54($s0) /* E23AA0 802B63C0 0C039454 */ jal func_800E5150 -/* E23AA4 802B63C4 00000000 */ nop +/* E23AA4 802B63C4 00000000 */ nop /* E23AA8 802B63C8 0C039858 */ jal check_input_jump -/* E23AAC 802B63CC 00000000 */ nop +/* E23AAC 802B63CC 00000000 */ nop /* E23AB0 802B63D0 14400057 */ bnez $v0, .L802B6530 -/* E23AB4 802B63D4 00000000 */ nop +/* E23AB4 802B63D4 00000000 */ nop /* E23AB8 802B63D8 16600006 */ bnez $s3, .L802B63F4 /* E23ABC 802B63DC 0240202D */ daddu $a0, $s2, $zero /* E23AC0 802B63E0 0C039838 */ jal check_input_hammer -/* E23AC4 802B63E4 00000000 */ nop +/* E23AC4 802B63E4 00000000 */ nop /* E23AC8 802B63E8 14400051 */ bnez $v0, .L802B6530 -/* E23ACC 802B63EC 00000000 */ nop +/* E23ACC 802B63EC 00000000 */ nop /* E23AD0 802B63F0 0240202D */ daddu $a0, $s2, $zero .L802B63F4: /* E23AD4 802B63F4 0C0388C1 */ jal input_to_move_vector /* E23AD8 802B63F8 0220282D */ daddu $a1, $s1, $zero /* E23ADC 802B63FC C7A20014 */ lwc1 $f2, 0x14($sp) /* E23AE0 802B6400 44800000 */ mtc1 $zero, $f0 -/* E23AE4 802B6404 00000000 */ nop +/* E23AE4 802B6404 00000000 */ nop /* E23AE8 802B6408 46001032 */ c.eq.s $f2, $f0 -/* E23AEC 802B640C 00000000 */ nop +/* E23AEC 802B640C 00000000 */ nop /* E23AF0 802B6410 45000005 */ bc1f .L802B6428 -/* E23AF4 802B6414 00000000 */ nop +/* E23AF4 802B6414 00000000 */ nop /* E23AF8 802B6418 0C039769 */ jal set_action_state /* E23AFC 802B641C 0000202D */ daddu $a0, $zero, $zero /* E23B00 802B6420 080AD94C */ j .L802B6530 -/* E23B04 802B6424 00000000 */ nop +/* E23B04 802B6424 00000000 */ nop .L802B6428: /* E23B08 802B6428 C7A40010 */ lwc1 $f4, 0x10($sp) /* E23B0C 802B642C 3C01800F */ lui $at, %hi(D_800F7B40) @@ -124,9 +124,9 @@ glabel func_802B6288_E23968 /* E23B20 802B6440 44811000 */ mtc1 $at, $f2 /* E23B24 802B6444 46000005 */ abs.s $f0, $f0 /* E23B28 802B6448 4602003E */ c.le.s $f0, $f2 -/* E23B2C 802B644C 00000000 */ nop +/* E23B2C 802B644C 00000000 */ nop /* E23B30 802B6450 45000009 */ bc1f .L802B6478 -/* E23B34 802B6454 00000000 */ nop +/* E23B34 802B6454 00000000 */ nop /* E23B38 802B6458 8E020004 */ lw $v0, 4($s0) /* E23B3C 802B645C 04430001 */ bgezl $v0, .L802B6464 /* E23B40 802B6460 E6040080 */ swc1 $f4, 0x80($s0) @@ -150,39 +150,39 @@ glabel func_802B6288_E23968 /* E23B74 802B6494 0C03A752 */ jal is_ability_active /* E23B78 802B6498 2404000B */ addiu $a0, $zero, 0xb /* E23B7C 802B649C 1440001B */ bnez $v0, .L802B650C -/* E23B80 802B64A0 00000000 */ nop +/* E23B80 802B64A0 00000000 */ nop /* E23B84 802B64A4 8E0200E8 */ lw $v0, 0xe8($s0) /* E23B88 802B64A8 00420018 */ mult $v0, $v0 /* E23B8C 802B64AC 00001812 */ mflo $v1 /* E23B90 802B64B0 8E0200EC */ lw $v0, 0xec($s0) -/* E23B94 802B64B4 00000000 */ nop +/* E23B94 802B64B4 00000000 */ nop /* E23B98 802B64B8 00420018 */ mult $v0, $v0 /* E23B9C 802B64BC 00003812 */ mflo $a3 /* E23BA0 802B64C0 00671021 */ addu $v0, $v1, $a3 /* E23BA4 802B64C4 44826000 */ mtc1 $v0, $f12 -/* E23BA8 802B64C8 00000000 */ nop +/* E23BA8 802B64C8 00000000 */ nop /* E23BAC 802B64CC 46806320 */ cvt.s.w $f12, $f12 /* E23BB0 802B64D0 46006084 */ sqrt.s $f2, $f12 /* E23BB4 802B64D4 46021032 */ c.eq.s $f2, $f2 -/* E23BB8 802B64D8 00000000 */ nop +/* E23BB8 802B64D8 00000000 */ nop /* E23BBC 802B64DC 45010004 */ bc1t .L802B64F0 -/* E23BC0 802B64E0 00000000 */ nop +/* E23BC0 802B64E0 00000000 */ nop /* E23BC4 802B64E4 0C0187BC */ jal sqrtf -/* E23BC8 802B64E8 00000000 */ nop +/* E23BC8 802B64E8 00000000 */ nop /* E23BCC 802B64EC 46000086 */ mov.s $f2, $f0 .L802B64F0: /* E23BD0 802B64F0 3C01425C */ lui $at, 0x425c /* E23BD4 802B64F4 44810000 */ mtc1 $at, $f0 -/* E23BD8 802B64F8 00000000 */ nop +/* E23BD8 802B64F8 00000000 */ nop /* E23BDC 802B64FC 4600103E */ c.le.s $f2, $f0 -/* E23BE0 802B6500 00000000 */ nop +/* E23BE0 802B6500 00000000 */ nop /* E23BE4 802B6504 45000005 */ bc1f .L802B651C -/* E23BE8 802B6508 00000000 */ nop +/* E23BE8 802B6508 00000000 */ nop .L802B650C: /* E23BEC 802B650C 0C039769 */ jal set_action_state /* E23BF0 802B6510 24040001 */ addiu $a0, $zero, 1 /* E23BF4 802B6514 080AD94C */ j .L802B6530 -/* E23BF8 802B6518 00000000 */ nop +/* E23BF8 802B6518 00000000 */ nop .L802B651C: /* E23BFC 802B651C 0C039426 */ jal func_800E5098 /* E23C00 802B6520 24040004 */ addiu $a0, $zero, 4 diff --git a/asm/nonmatchings/code_E236E0/func_802B6550_E23C30.s b/asm/nonmatchings/code_E236E0/func_802B6550_E23C30.s index 484eb2c980..b7df21c928 100644 --- a/asm/nonmatchings/code_E236E0/func_802B6550_E23C30.s +++ b/asm/nonmatchings/code_E236E0/func_802B6550_E23C30.s @@ -9,7 +9,7 @@ glabel func_802B6550_E23C30 /* E23C40 802B6560 8C620004 */ lw $v0, 4($v1) /* E23C44 802B6564 30422000 */ andi $v0, $v0, 0x2000 /* E23C48 802B6568 14400013 */ bnez $v0, .L802B65B8 -/* E23C4C 802B656C 00000000 */ nop +/* E23C4C 802B656C 00000000 */ nop /* E23C50 802B6570 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* E23C54 802B6574 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) /* E23C58 802B6578 9062007E */ lbu $v0, 0x7e($v1) @@ -23,12 +23,12 @@ glabel func_802B6550_E23C30 /* E23C78 802B6598 0C037FBF */ jal func_800DFEFC /* E23C7C 802B659C 8C846910 */ lw $a0, %lo(D_802B6910)($a0) /* E23C80 802B65A0 080AD977 */ j .L802B65DC -/* E23C84 802B65A4 00000000 */ nop +/* E23C84 802B65A4 00000000 */ nop .L802B65A8: /* E23C88 802B65A8 0C037FBF */ jal func_800DFEFC /* E23C8C 802B65AC 3484000D */ ori $a0, $a0, 0xd /* E23C90 802B65B0 080AD977 */ j .L802B65DC -/* E23C94 802B65B4 00000000 */ nop +/* E23C94 802B65B4 00000000 */ nop .L802B65B8: /* E23C98 802B65B8 8063000C */ lb $v1, 0xc($v1) /* E23C9C 802B65BC 00031040 */ sll $v0, $v1, 1 @@ -38,7 +38,7 @@ glabel func_802B6550_E23C30 /* E23CAC 802B65CC 00822021 */ addu $a0, $a0, $v0 /* E23CB0 802B65D0 8C847C20 */ lw $a0, %lo(D_800F7C20)($a0) /* E23CB4 802B65D4 0C0398DB */ jal func_800E636C -/* E23CB8 802B65D8 00000000 */ nop +/* E23CB8 802B65D8 00000000 */ nop .L802B65DC: /* E23CBC 802B65DC 8FBF0010 */ lw $ra, 0x10($sp) /* E23CC0 802B65E0 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_E236E0/func_802B65E8_E23CC8.s b/asm/nonmatchings/code_E236E0/func_802B65E8_E23CC8.s index 1add9a64b4..304f4d6e1f 100644 --- a/asm/nonmatchings/code_E236E0/func_802B65E8_E23CC8.s +++ b/asm/nonmatchings/code_E236E0/func_802B65E8_E23CC8.s @@ -20,7 +20,7 @@ glabel func_802B65E8_E23CC8 /* E23D04 802B6624 E6000054 */ swc1 $f0, 0x54($s0) .L802B6628: /* E23D08 802B6628 0C0AD954 */ jal func_802B6550_E23C30 -/* E23D0C 802B662C 00000000 */ nop +/* E23D0C 802B662C 00000000 */ nop .L802B6630: /* E23D10 802B6630 8E020000 */ lw $v0, ($s0) /* E23D14 802B6634 30424000 */ andi $v0, $v0, 0x4000 @@ -34,18 +34,18 @@ glabel func_802B65E8_E23CC8 /* E23D30 802B6650 0C0388C1 */ jal input_to_move_vector /* E23D34 802B6654 27A50014 */ addiu $a1, $sp, 0x14 /* E23D38 802B6658 0C039454 */ jal func_800E5150 -/* E23D3C 802B665C 00000000 */ nop +/* E23D3C 802B665C 00000000 */ nop /* E23D40 802B6660 C7A20014 */ lwc1 $f2, 0x14($sp) /* E23D44 802B6664 44800000 */ mtc1 $zero, $f0 -/* E23D48 802B6668 00000000 */ nop +/* E23D48 802B6668 00000000 */ nop /* E23D4C 802B666C 46001032 */ c.eq.s $f2, $f0 -/* E23D50 802B6670 00000000 */ nop +/* E23D50 802B6670 00000000 */ nop /* E23D54 802B6674 45000005 */ bc1f .L802B668C -/* E23D58 802B6678 00000000 */ nop +/* E23D58 802B6678 00000000 */ nop /* E23D5C 802B667C 0C039769 */ jal set_action_state /* E23D60 802B6680 0000202D */ daddu $a0, $zero, $zero /* E23D64 802B6684 080AD9CA */ j .L802B6728 -/* E23D68 802B6688 00000000 */ nop +/* E23D68 802B6688 00000000 */ nop .L802B668C: /* E23D6C 802B668C C7A00010 */ lwc1 $f0, 0x10($sp) /* E23D70 802B6690 3C028007 */ lui $v0, %hi(gGameStatusPtr) @@ -58,36 +58,36 @@ glabel func_802B65E8_E23CC8 /* E23D8C 802B66AC 00420018 */ mult $v0, $v0 /* E23D90 802B66B0 00001812 */ mflo $v1 /* E23D94 802B66B4 8E0200EC */ lw $v0, 0xec($s0) -/* E23D98 802B66B8 00000000 */ nop +/* E23D98 802B66B8 00000000 */ nop /* E23D9C 802B66BC 00420018 */ mult $v0, $v0 /* E23DA0 802B66C0 00001012 */ mflo $v0 /* E23DA4 802B66C4 00621021 */ addu $v0, $v1, $v0 /* E23DA8 802B66C8 44826000 */ mtc1 $v0, $f12 -/* E23DAC 802B66CC 00000000 */ nop +/* E23DAC 802B66CC 00000000 */ nop /* E23DB0 802B66D0 46806320 */ cvt.s.w $f12, $f12 /* E23DB4 802B66D4 46006084 */ sqrt.s $f2, $f12 /* E23DB8 802B66D8 46021032 */ c.eq.s $f2, $f2 -/* E23DBC 802B66DC 00000000 */ nop +/* E23DBC 802B66DC 00000000 */ nop /* E23DC0 802B66E0 45010004 */ bc1t .L802B66F4 -/* E23DC4 802B66E4 00000000 */ nop +/* E23DC4 802B66E4 00000000 */ nop /* E23DC8 802B66E8 0C0187BC */ jal sqrtf -/* E23DCC 802B66EC 00000000 */ nop +/* E23DCC 802B66EC 00000000 */ nop /* E23DD0 802B66F0 46000086 */ mov.s $f2, $f0 .L802B66F4: /* E23DD4 802B66F4 3C01425C */ lui $at, 0x425c /* E23DD8 802B66F8 44810000 */ mtc1 $at, $f0 -/* E23DDC 802B66FC 00000000 */ nop +/* E23DDC 802B66FC 00000000 */ nop /* E23DE0 802B6700 4602003C */ c.lt.s $f0, $f2 -/* E23DE4 802B6704 00000000 */ nop +/* E23DE4 802B6704 00000000 */ nop /* E23DE8 802B6708 45000005 */ bc1f .L802B6720 /* E23DEC 802B670C 24040008 */ addiu $a0, $zero, 8 /* E23DF0 802B6710 0C039769 */ jal set_action_state /* E23DF4 802B6714 24040002 */ addiu $a0, $zero, 2 /* E23DF8 802B6718 080AD9CA */ j .L802B6728 -/* E23DFC 802B671C 00000000 */ nop +/* E23DFC 802B671C 00000000 */ nop .L802B6720: /* E23E00 802B6720 0C039426 */ jal func_800E5098 -/* E23E04 802B6724 00000000 */ nop +/* E23E04 802B6724 00000000 */ nop .L802B6728: /* E23E08 802B6728 8FBF001C */ lw $ra, 0x1c($sp) /* E23E0C 802B672C 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/nonmatchings/code_E236E0/func_802B6738_E23E18.s b/asm/nonmatchings/code_E236E0/func_802B6738_E23E18.s index 4f49cacd15..1f6c6404e6 100644 --- a/asm/nonmatchings/code_E236E0/func_802B6738_E23E18.s +++ b/asm/nonmatchings/code_E236E0/func_802B6738_E23E18.s @@ -22,7 +22,7 @@ glabel func_802B6738_E23E18 /* E23E58 802B6778 8E020004 */ lw $v0, 4($s0) /* E23E5C 802B677C 30422000 */ andi $v0, $v0, 0x2000 /* E23E60 802B6780 14400019 */ bnez $v0, .L802B67E8 -/* E23E64 802B6784 00000000 */ nop +/* E23E64 802B6784 00000000 */ nop /* E23E68 802B6788 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* E23E6C 802B678C 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) /* E23E70 802B6790 9062007E */ lbu $v0, 0x7e($v1) @@ -36,19 +36,19 @@ glabel func_802B6738_E23E18 /* E23E90 802B67B0 0C037FBF */ jal func_800DFEFC /* E23E94 802B67B4 34840003 */ ori $a0, $a0, 3 /* E23E98 802B67B8 080ADA03 */ j .L802B680C -/* E23E9C 802B67BC 00000000 */ nop +/* E23E9C 802B67BC 00000000 */ nop .L802B67C0: /* E23EA0 802B67C0 3C04802B */ lui $a0, %hi(D_802B6910) /* E23EA4 802B67C4 00822021 */ addu $a0, $a0, $v0 /* E23EA8 802B67C8 0C037FBF */ jal func_800DFEFC /* E23EAC 802B67CC 8C846910 */ lw $a0, %lo(D_802B6910)($a0) /* E23EB0 802B67D0 080ADA03 */ j .L802B680C -/* E23EB4 802B67D4 00000000 */ nop +/* E23EB4 802B67D4 00000000 */ nop .L802B67D8: /* E23EB8 802B67D8 0C037FBF */ jal func_800DFEFC /* E23EBC 802B67DC 3484000D */ ori $a0, $a0, 0xd /* E23EC0 802B67E0 080ADA03 */ j .L802B680C -/* E23EC4 802B67E4 00000000 */ nop +/* E23EC4 802B67E4 00000000 */ nop .L802B67E8: /* E23EC8 802B67E8 8203000C */ lb $v1, 0xc($s0) /* E23ECC 802B67EC 00031040 */ sll $v0, $v1, 1 @@ -58,7 +58,7 @@ glabel func_802B6738_E23E18 /* E23EDC 802B67FC 00822021 */ addu $a0, $a0, $v0 /* E23EE0 802B6800 8C847C24 */ lw $a0, %lo(D_800F7C24)($a0) /* E23EE4 802B6804 0C0398DB */ jal func_800E636C -/* E23EE8 802B6808 00000000 */ nop +/* E23EE8 802B6808 00000000 */ nop .L802B680C: /* E23EEC 802B680C 8E020000 */ lw $v0, ($s0) /* E23EF0 802B6810 30424000 */ andi $v0, $v0, 0x4000 @@ -74,54 +74,54 @@ glabel func_802B6738_E23E18 /* E23F14 802B6834 0C0388C1 */ jal input_to_move_vector /* E23F18 802B6838 E6000054 */ swc1 $f0, 0x54($s0) /* E23F1C 802B683C 0C039454 */ jal func_800E5150 -/* E23F20 802B6840 00000000 */ nop +/* E23F20 802B6840 00000000 */ nop /* E23F24 802B6844 C7A20014 */ lwc1 $f2, 0x14($sp) /* E23F28 802B6848 44800000 */ mtc1 $zero, $f0 -/* E23F2C 802B684C 00000000 */ nop +/* E23F2C 802B684C 00000000 */ nop /* E23F30 802B6850 46001032 */ c.eq.s $f2, $f0 -/* E23F34 802B6854 00000000 */ nop +/* E23F34 802B6854 00000000 */ nop /* E23F38 802B6858 45000005 */ bc1f .L802B6870 -/* E23F3C 802B685C 00000000 */ nop +/* E23F3C 802B685C 00000000 */ nop /* E23F40 802B6860 0C039769 */ jal set_action_state /* E23F44 802B6864 0000202D */ daddu $a0, $zero, $zero /* E23F48 802B6868 080ADA3D */ j .L802B68F4 -/* E23F4C 802B686C 00000000 */ nop +/* E23F4C 802B686C 00000000 */ nop .L802B6870: /* E23F50 802B6870 8E0200E8 */ lw $v0, 0xe8($s0) /* E23F54 802B6874 00420018 */ mult $v0, $v0 /* E23F58 802B6878 00001812 */ mflo $v1 /* E23F5C 802B687C 8E0200EC */ lw $v0, 0xec($s0) -/* E23F60 802B6880 00000000 */ nop +/* E23F60 802B6880 00000000 */ nop /* E23F64 802B6884 00420018 */ mult $v0, $v0 /* E23F68 802B6888 C7A00010 */ lwc1 $f0, 0x10($sp) /* E23F6C 802B688C 00001012 */ mflo $v0 /* E23F70 802B6890 00621021 */ addu $v0, $v1, $v0 /* E23F74 802B6894 44826000 */ mtc1 $v0, $f12 -/* E23F78 802B6898 00000000 */ nop +/* E23F78 802B6898 00000000 */ nop /* E23F7C 802B689C 46806320 */ cvt.s.w $f12, $f12 /* E23F80 802B68A0 46006084 */ sqrt.s $f2, $f12 /* E23F84 802B68A4 46021032 */ c.eq.s $f2, $f2 -/* E23F88 802B68A8 00000000 */ nop +/* E23F88 802B68A8 00000000 */ nop /* E23F8C 802B68AC 45010004 */ bc1t .L802B68C0 /* E23F90 802B68B0 E6000080 */ swc1 $f0, 0x80($s0) /* E23F94 802B68B4 0C0187BC */ jal sqrtf -/* E23F98 802B68B8 00000000 */ nop +/* E23F98 802B68B8 00000000 */ nop /* E23F9C 802B68BC 46000086 */ mov.s $f2, $f0 .L802B68C0: /* E23FA0 802B68C0 3C01425C */ lui $at, 0x425c /* E23FA4 802B68C4 44810000 */ mtc1 $at, $f0 -/* E23FA8 802B68C8 00000000 */ nop +/* E23FA8 802B68C8 00000000 */ nop /* E23FAC 802B68CC 4600103C */ c.lt.s $f2, $f0 -/* E23FB0 802B68D0 00000000 */ nop +/* E23FB0 802B68D0 00000000 */ nop /* E23FB4 802B68D4 45000005 */ bc1f .L802B68EC /* E23FB8 802B68D8 24040004 */ addiu $a0, $zero, 4 /* E23FBC 802B68DC 0C039769 */ jal set_action_state /* E23FC0 802B68E0 24040001 */ addiu $a0, $zero, 1 /* E23FC4 802B68E4 080ADA3D */ j .L802B68F4 -/* E23FC8 802B68E8 00000000 */ nop +/* E23FC8 802B68E8 00000000 */ nop .L802B68EC: /* E23FCC 802B68EC 0C039426 */ jal func_800E5098 -/* E23FD0 802B68F0 00000000 */ nop +/* E23FD0 802B68F0 00000000 */ nop .L802B68F4: /* E23FD4 802B68F4 8FBF001C */ lw $ra, 0x1c($sp) /* E23FD8 802B68F8 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/nonmatchings/code_E24040/func_802B6000_E24040.s b/asm/nonmatchings/code_E24040/func_802B6000_E24040.s index f1873e0122..324c5c4413 100644 --- a/asm/nonmatchings/code_E24040/func_802B6000_E24040.s +++ b/asm/nonmatchings/code_E24040/func_802B6000_E24040.s @@ -40,7 +40,7 @@ glabel func_802B6000_E24040 /* E240C8 802B6088 34840007 */ ori $a0, $a0, 7 .L802B608C: /* E240CC 802B608C 0C037FBF */ jal func_800DFEFC -/* E240D0 802B6090 00000000 */ nop +/* E240D0 802B6090 00000000 */ nop /* E240D4 802B6094 96030002 */ lhu $v1, 2($s0) /* E240D8 802B6098 2402FFFF */ addiu $v0, $zero, -1 /* E240DC 802B609C A6020002 */ sh $v0, 2($s0) diff --git a/asm/nonmatchings/code_E24040/func_802B60B4_E240F4.s b/asm/nonmatchings/code_E24040/func_802B60B4_E240F4.s index 8d2fb1042d..ce257e7405 100644 --- a/asm/nonmatchings/code_E24040/func_802B60B4_E240F4.s +++ b/asm/nonmatchings/code_E24040/func_802B60B4_E240F4.s @@ -17,11 +17,11 @@ glabel func_802B60B4_E240F4 /* E24124 802B60E4 820300B4 */ lb $v1, 0xb4($s0) /* E24128 802B60E8 24020006 */ addiu $v0, $zero, 6 /* E2412C 802B60EC 14620005 */ bne $v1, $v0, .L802B6104 -/* E24130 802B60F0 00000000 */ nop +/* E24130 802B60F0 00000000 */ nop /* E24134 802B60F4 0C03954C */ jal func_800E5530 -/* E24138 802B60F8 00000000 */ nop +/* E24138 802B60F8 00000000 */ nop /* E2413C 802B60FC 080AD846 */ j .L802B6118 -/* E24140 802B6100 00000000 */ nop +/* E24140 802B6100 00000000 */ nop .L802B6104: /* E24144 802B6104 3C03800B */ lui $v1, %hi(gCameras) /* E24148 802B6108 24631D80 */ addiu $v1, $v1, %lo(gCameras) @@ -32,7 +32,7 @@ glabel func_802B60B4_E240F4 /* E24158 802B6118 820300B4 */ lb $v1, 0xb4($s0) /* E2415C 802B611C 24020003 */ addiu $v0, $zero, 3 /* E24160 802B6120 14620008 */ bne $v1, $v0, .L802B6144 -/* E24164 802B6124 00000000 */ nop +/* E24164 802B6124 00000000 */ nop /* E24168 802B6128 8E020004 */ lw $v0, 4($s0) /* E2416C 802B612C 30424000 */ andi $v0, $v0, 0x4000 /* E24170 802B6130 10400002 */ beqz $v0, .L802B613C @@ -57,7 +57,7 @@ glabel func_802B60B4_E240F4 /* E241B0 802B6170 34840007 */ ori $a0, $a0, 7 .L802B6174: /* E241B4 802B6174 0C037FBF */ jal func_800DFEFC -/* E241B8 802B6178 00000000 */ nop +/* E241B8 802B6178 00000000 */ nop /* E241BC 802B617C 960200C0 */ lhu $v0, 0xc0($s0) /* E241C0 802B6180 24420001 */ addiu $v0, $v0, 1 /* E241C4 802B6184 A60200C0 */ sh $v0, 0xc0($s0) diff --git a/asm/nonmatchings/code_E24040/func_802B6198_E241D8.s b/asm/nonmatchings/code_E24040/func_802B6198_E241D8.s index 14b951a16d..f2a94abeb7 100644 --- a/asm/nonmatchings/code_E24040/func_802B6198_E241D8.s +++ b/asm/nonmatchings/code_E24040/func_802B6198_E241D8.s @@ -22,7 +22,7 @@ glabel func_802B6198_E241D8 /* E2421C 802B61DC 3C018011 */ lui $at, %hi(D_8010C97C) /* E24220 802B61E0 E422C97C */ swc1 $f2, %lo(D_8010C97C)($at) /* E24224 802B61E4 0C0AD800 */ jal func_802B6000_E24040 -/* E24228 802B61E8 00000000 */ nop +/* E24228 802B61E8 00000000 */ nop /* E2422C 802B61EC 8E020000 */ lw $v0, ($s0) /* E24230 802B61F0 3C030088 */ lui $v1, 0x88 /* E24234 802B61F4 00431025 */ or $v0, $v0, $v1 @@ -35,7 +35,7 @@ glabel func_802B6198_E241D8 /* E2424C 802B620C A60200C0 */ sh $v0, 0xc0($s0) /* E24250 802B6210 24020001 */ addiu $v0, $zero, 1 /* E24254 802B6214 1462001A */ bne $v1, $v0, .L802B6280 -/* E24258 802B6218 00000000 */ nop +/* E24258 802B6218 00000000 */ nop /* E2425C 802B621C 8E050000 */ lw $a1, ($s0) /* E24260 802B6220 00B11024 */ and $v0, $a1, $s1 /* E24264 802B6224 10400013 */ beqz $v0, .L802B6274 @@ -53,7 +53,7 @@ glabel func_802B6198_E241D8 /* E24294 802B6254 34840008 */ ori $a0, $a0, 8 .L802B6258: /* E24298 802B6258 0C037FBF */ jal func_800DFEFC -/* E2429C 802B625C 00000000 */ nop +/* E2429C 802B625C 00000000 */ nop /* E242A0 802B6260 3C03800B */ lui $v1, %hi(gCameras) /* E242A4 802B6264 24631D80 */ addiu $v1, $v1, %lo(gCameras) /* E242A8 802B6268 94620002 */ lhu $v0, 2($v1) diff --git a/asm/nonmatchings/code_E24040/func_802B6294_E242D4.s b/asm/nonmatchings/code_E24040/func_802B6294_E242D4.s index daa64d6775..d5c57dfbe3 100644 --- a/asm/nonmatchings/code_E24040/func_802B6294_E242D4.s +++ b/asm/nonmatchings/code_E24040/func_802B6294_E242D4.s @@ -10,11 +10,11 @@ glabel func_802B6294_E242D4 /* E242E8 802B62A8 8E050004 */ lw $a1, 4($s0) /* E242EC 802B62AC 30A21000 */ andi $v0, $a1, 0x1000 /* E242F0 802B62B0 10400005 */ beqz $v0, .L802B62C8 -/* E242F4 802B62B4 00000000 */ nop +/* E242F4 802B62B4 00000000 */ nop /* E242F8 802B62B8 0C0AD91F */ jal func_802B647C_E244BC -/* E242FC 802B62BC 00000000 */ nop +/* E242FC 802B62BC 00000000 */ nop /* E24300 802B62C0 080AD8CE */ j .L802B6338 -/* E24304 802B62C4 00000000 */ nop +/* E24304 802B62C4 00000000 */ nop .L802B62C8: /* E24308 802B62C8 8E030000 */ lw $v1, ($s0) /* E2430C 802B62CC 04610017 */ bgez $v1, .L802B632C @@ -37,7 +37,7 @@ glabel func_802B6294_E242D4 /* E2434C 802B630C 34840008 */ ori $a0, $a0, 8 .L802B6310: /* E24350 802B6310 0C037FBF */ jal func_800DFEFC -/* E24354 802B6314 00000000 */ nop +/* E24354 802B6314 00000000 */ nop /* E24358 802B6318 3C03800B */ lui $v1, %hi(gCameras) /* E2435C 802B631C 24631D80 */ addiu $v1, $v1, %lo(gCameras) /* E24360 802B6320 94620002 */ lhu $v0, 2($v1) diff --git a/asm/nonmatchings/code_E24040/func_802B6348_E24388.s b/asm/nonmatchings/code_E24040/func_802B6348_E24388.s index 92d5980823..28a96bb63f 100644 --- a/asm/nonmatchings/code_E24040/func_802B6348_E24388.s +++ b/asm/nonmatchings/code_E24040/func_802B6348_E24388.s @@ -12,9 +12,9 @@ glabel func_802B6348_E24388 /* E243A4 802B6364 10400005 */ beqz $v0, .L802B637C /* E243A8 802B6368 00A0802D */ daddu $s0, $a1, $zero /* E243AC 802B636C 0C0AD942 */ jal func_802B6508_E24548 -/* E243B0 802B6370 00000000 */ nop +/* E243B0 802B6370 00000000 */ nop /* E243B4 802B6374 080AD91B */ j .L802B646C -/* E243B8 802B6378 00000000 */ nop +/* E243B8 802B6378 00000000 */ nop .L802B637C: /* E243BC 802B637C 8CA30000 */ lw $v1, ($a1) /* E243C0 802B6380 0461000A */ bgez $v1, .L802B63AC @@ -43,7 +43,7 @@ glabel func_802B6348_E24388 /* E24418 802B63D8 27A70030 */ addiu $a3, $sp, 0x30 /* E2441C 802B63DC E7A00028 */ swc1 $f0, 0x28($sp) /* E24420 802B63E0 44820000 */ mtc1 $v0, $f0 -/* E24424 802B63E4 00000000 */ nop +/* E24424 802B63E4 00000000 */ nop /* E24428 802B63E8 46800020 */ cvt.s.w $f0, $f0 /* E2442C 802B63EC 27A20034 */ addiu $v0, $sp, 0x34 /* E24430 802B63F0 E7A2002C */ swc1 $f2, 0x2c($sp) @@ -65,11 +65,11 @@ glabel func_802B6348_E24388 /* E24470 802B6430 2442FFFE */ addiu $v0, $v0, -2 /* E24474 802B6434 2C420002 */ sltiu $v0, $v0, 2 /* E24478 802B6438 1440000C */ bnez $v0, .L802B646C -/* E2447C 802B643C 00000000 */ nop +/* E2447C 802B643C 00000000 */ nop /* E24480 802B6440 0C039858 */ jal check_input_jump -/* E24484 802B6444 00000000 */ nop +/* E24484 802B6444 00000000 */ nop /* E24488 802B6448 10400008 */ beqz $v0, .L802B646C -/* E2448C 802B644C 00000000 */ nop +/* E2448C 802B644C 00000000 */ nop /* E24490 802B6450 0C039769 */ jal set_action_state /* E24494 802B6454 24040003 */ addiu $a0, $zero, 3 /* E24498 802B6458 8E020000 */ lw $v0, ($s0) diff --git a/asm/nonmatchings/code_E24040/func_802B647C_E244BC.s b/asm/nonmatchings/code_E24040/func_802B647C_E244BC.s index b47ba3d734..8d1fb96563 100644 --- a/asm/nonmatchings/code_E24040/func_802B647C_E244BC.s +++ b/asm/nonmatchings/code_E24040/func_802B647C_E244BC.s @@ -25,7 +25,7 @@ glabel func_802B647C_E244BC /* E2450C 802B64CC 34840008 */ ori $a0, $a0, 8 .L802B64D0: /* E24510 802B64D0 0C037FBF */ jal func_800DFEFC -/* E24514 802B64D4 00000000 */ nop +/* E24514 802B64D4 00000000 */ nop /* E24518 802B64D8 3C03800B */ lui $v1, %hi(gCameras) /* E2451C 802B64DC 24631D80 */ addiu $v1, $v1, %lo(gCameras) /* E24520 802B64E0 94620002 */ lhu $v0, 2($v1) diff --git a/asm/nonmatchings/code_E24040/func_802B6508_E24548.s b/asm/nonmatchings/code_E24040/func_802B6508_E24548.s index 23174c4d22..82b731a861 100644 --- a/asm/nonmatchings/code_E24040/func_802B6508_E24548.s +++ b/asm/nonmatchings/code_E24040/func_802B6508_E24548.s @@ -36,4 +36,4 @@ glabel func_802B6508_E24548 /* E245C0 802B6580 8FB00010 */ lw $s0, 0x10($sp) /* E245C4 802B6584 03E00008 */ jr $ra /* E245C8 802B6588 27BD0018 */ addiu $sp, $sp, 0x18 -/* E245CC 802B658C 00000000 */ nop +/* E245CC 802B658C 00000000 */ nop diff --git a/asm/nonmatchings/code_E245D0/func_802B6000_E245D0.s b/asm/nonmatchings/code_E245D0/func_802B6000_E245D0.s index ea7b6311bd..12862cf637 100644 --- a/asm/nonmatchings/code_E245D0/func_802B6000_E245D0.s +++ b/asm/nonmatchings/code_E245D0/func_802B6000_E245D0.s @@ -24,12 +24,12 @@ glabel func_802B6000_E245D0 /* E2461C 802B604C 34840004 */ ori $a0, $a0, 4 .L802B6050: /* E24620 802B6050 0C037FBF */ jal func_800DFEFC -/* E24624 802B6054 00000000 */ nop +/* E24624 802B6054 00000000 */ nop /* E24628 802B6058 080AD81A */ j .L802B6068 -/* E2462C 802B605C 00000000 */ nop +/* E2462C 802B605C 00000000 */ nop .L802B6060: /* E24630 802B6060 0C0AD866 */ jal func_802B6198_E24768 -/* E24634 802B6064 00000000 */ nop +/* E24634 802B6064 00000000 */ nop .L802B6068: /* E24638 802B6068 3C01418E */ lui $at, 0x418e /* E2463C 802B606C 34210D84 */ ori $at, $at, 0xd84 @@ -50,14 +50,14 @@ glabel func_802B6000_E245D0 /* E24678 802B60A8 E606007C */ swc1 $f6, 0x7c($s0) .L802B60AC: /* E2467C 802B60AC 0C038D12 */ jal integrate_gravity -/* E24680 802B60B0 00000000 */ nop +/* E24680 802B60B0 00000000 */ nop /* E24684 802B60B4 C60C0080 */ lwc1 $f12, 0x80($s0) /* E24688 802B60B8 3C0140C9 */ lui $at, 0x40c9 /* E2468C 802B60BC 34210FD0 */ ori $at, $at, 0xfd0 /* E24690 802B60C0 44810000 */ mtc1 $at, $f0 -/* E24694 802B60C4 00000000 */ nop +/* E24694 802B60C4 00000000 */ nop /* E24698 802B60C8 46006302 */ mul.s $f12, $f12, $f0 -/* E2469C 802B60CC 00000000 */ nop +/* E2469C 802B60CC 00000000 */ nop /* E246A0 802B60D0 27A50010 */ addiu $a1, $sp, 0x10 /* E246A4 802B60D4 3C0143B4 */ lui $at, 0x43b4 /* E246A8 802B60D8 44810000 */ mtc1 $at, $f0 @@ -67,12 +67,12 @@ glabel func_802B6000_E245D0 /* E246B8 802B60E8 C7A00010 */ lwc1 $f0, 0x10($sp) /* E246BC 802B60EC 3C014040 */ lui $at, 0x4040 /* E246C0 802B60F0 44811000 */ mtc1 $at, $f2 -/* E246C4 802B60F4 00000000 */ nop +/* E246C4 802B60F4 00000000 */ nop /* E246C8 802B60F8 46020002 */ mul.s $f0, $f0, $f2 -/* E246CC 802B60FC 00000000 */ nop +/* E246CC 802B60FC 00000000 */ nop /* E246D0 802B6100 C7A40014 */ lwc1 $f4, 0x14($sp) /* E246D4 802B6104 46022102 */ mul.s $f4, $f4, $f2 -/* E246D8 802B6108 00000000 */ nop +/* E246D8 802B6108 00000000 */ nop /* E246DC 802B610C 2402FFFF */ addiu $v0, $zero, -1 /* E246E0 802B6110 C6020028 */ lwc1 $f2, 0x28($s0) /* E246E4 802B6114 C60C0070 */ lwc1 $f12, 0x70($s0) @@ -99,14 +99,14 @@ glabel func_802B6000_E245D0 /* E24730 802B6160 2402001A */ addiu $v0, $zero, 0x1a /* E24734 802B6164 820400B5 */ lb $a0, 0xb5($s0) /* E24738 802B6168 10820005 */ beq $a0, $v0, .L802B6180 -/* E2473C 802B616C 00000000 */ nop +/* E2473C 802B616C 00000000 */ nop /* E24740 802B6170 0C039769 */ jal set_action_state -/* E24744 802B6174 00000000 */ nop +/* E24744 802B6174 00000000 */ nop /* E24748 802B6178 080AD862 */ j .L802B6188 -/* E2474C 802B617C 00000000 */ nop +/* E2474C 802B617C 00000000 */ nop .L802B6180: /* E24750 802B6180 0C0397DA */ jal update_locomotion_state -/* E24754 802B6184 00000000 */ nop +/* E24754 802B6184 00000000 */ nop .L802B6188: /* E24758 802B6188 8FBF0024 */ lw $ra, 0x24($sp) /* E2475C 802B618C 8FB00020 */ lw $s0, 0x20($sp) diff --git a/asm/nonmatchings/code_E245D0/func_802B6198_E24768.s b/asm/nonmatchings/code_E245D0/func_802B6198_E24768.s index 7da14058a8..43bec1c22f 100644 --- a/asm/nonmatchings/code_E245D0/func_802B6198_E24768.s +++ b/asm/nonmatchings/code_E245D0/func_802B6198_E24768.s @@ -9,7 +9,7 @@ glabel func_802B6198_E24768 /* E24778 802B61A8 8C620004 */ lw $v0, 4($v1) /* E2477C 802B61AC 30422000 */ andi $v0, $v0, 0x2000 /* E24780 802B61B0 14400013 */ bnez $v0, .L802B6200 -/* E24784 802B61B4 00000000 */ nop +/* E24784 802B61B4 00000000 */ nop /* E24788 802B61B8 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* E2478C 802B61BC 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) /* E24790 802B61C0 9062007E */ lbu $v0, 0x7e($v1) @@ -23,12 +23,12 @@ glabel func_802B6198_E24768 /* E247B0 802B61E0 0C037FBF */ jal func_800DFEFC /* E247B4 802B61E4 8C846300 */ lw $a0, %lo(D_802B6300)($a0) /* E247B8 802B61E8 080AD889 */ j .L802B6224 -/* E247BC 802B61EC 00000000 */ nop +/* E247BC 802B61EC 00000000 */ nop .L802B61F0: /* E247C0 802B61F0 0C037FBF */ jal func_800DFEFC /* E247C4 802B61F4 3484000D */ ori $a0, $a0, 0xd /* E247C8 802B61F8 080AD889 */ j .L802B6224 -/* E247CC 802B61FC 00000000 */ nop +/* E247CC 802B61FC 00000000 */ nop .L802B6200: /* E247D0 802B6200 8063000C */ lb $v1, 0xc($v1) /* E247D4 802B6204 00031040 */ sll $v0, $v1, 1 @@ -38,7 +38,7 @@ glabel func_802B6198_E24768 /* E247E4 802B6214 00822021 */ addu $a0, $a0, $v0 /* E247E8 802B6218 8C847C20 */ lw $a0, %lo(D_800F7C20)($a0) /* E247EC 802B621C 0C0398DB */ jal func_800E636C -/* E247F0 802B6220 00000000 */ nop +/* E247F0 802B6220 00000000 */ nop .L802B6224: /* E247F4 802B6224 8FBF0010 */ lw $ra, 0x10($sp) /* E247F8 802B6228 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_E245D0/func_802B6230_E24800.s b/asm/nonmatchings/code_E245D0/func_802B6230_E24800.s index 80e8fe3d21..ef01ca33c6 100644 --- a/asm/nonmatchings/code_E245D0/func_802B6230_E24800.s +++ b/asm/nonmatchings/code_E245D0/func_802B6230_E24800.s @@ -30,11 +30,11 @@ glabel func_802B6230_E24800 /* E24860 802B6290 00021403 */ sra $v0, $v0, 0x10 /* E24864 802B6294 24030004 */ addiu $v1, $zero, 4 /* E24868 802B6298 14430012 */ bne $v0, $v1, .L802B62E4 -/* E2486C 802B629C 00000000 */ nop +/* E2486C 802B629C 00000000 */ nop /* E24870 802B62A0 0C039426 */ jal func_800E5098 /* E24874 802B62A4 24040001 */ addiu $a0, $zero, 1 /* E24878 802B62A8 080AD8B9 */ j .L802B62E4 -/* E2487C 802B62AC 00000000 */ nop +/* E2487C 802B62AC 00000000 */ nop .L802B62B0: /* E24880 802B62B0 8E020000 */ lw $v0, ($s0) /* E24884 802B62B4 30424000 */ andi $v0, $v0, 0x4000 @@ -43,18 +43,18 @@ glabel func_802B6230_E24800 /* E24890 802B62C0 C6220054 */ lwc1 $f2, 0x54($s1) /* E24894 802B62C4 C620005C */ lwc1 $f0, 0x5c($s1) /* E24898 802B62C8 4602003E */ c.le.s $f0, $f2 -/* E2489C 802B62CC 00000000 */ nop +/* E2489C 802B62CC 00000000 */ nop /* E248A0 802B62D0 45000002 */ bc1f .L802B62DC /* E248A4 802B62D4 24040001 */ addiu $a0, $zero, 1 /* E248A8 802B62D8 24040002 */ addiu $a0, $zero, 2 .L802B62DC: /* E248AC 802B62DC 0C039769 */ jal set_action_state -/* E248B0 802B62E0 00000000 */ nop +/* E248B0 802B62E0 00000000 */ nop .L802B62E4: /* E248B4 802B62E4 8FBF0018 */ lw $ra, 0x18($sp) /* E248B8 802B62E8 8FB10014 */ lw $s1, 0x14($sp) /* E248BC 802B62EC 8FB00010 */ lw $s0, 0x10($sp) /* E248C0 802B62F0 03E00008 */ jr $ra /* E248C4 802B62F4 27BD0020 */ addiu $sp, $sp, 0x20 -/* E248C8 802B62F8 00000000 */ nop -/* E248CC 802B62FC 00000000 */ nop +/* E248C8 802B62F8 00000000 */ nop +/* E248CC 802B62FC 00000000 */ nop diff --git a/asm/nonmatchings/code_E24920/func_802B6000_E24920.s b/asm/nonmatchings/code_E24920/func_802B6000_E24920.s index 0c4eed846b..5ed896ca4a 100644 --- a/asm/nonmatchings/code_E24920/func_802B6000_E24920.s +++ b/asm/nonmatchings/code_E24920/func_802B6000_E24920.s @@ -16,11 +16,11 @@ glabel func_802B6000_E24920 /* E2494C 802B602C 26521D80 */ addiu $s2, $s2, %lo(gCameras) /* E24950 802B6030 30A21000 */ andi $v0, $a1, 0x1000 /* E24954 802B6034 10400005 */ beqz $v0, .L802B604C -/* E24958 802B6038 00000000 */ nop +/* E24958 802B6038 00000000 */ nop /* E2495C 802B603C 0C0AD8B3 */ jal func_802B62CC_E24BEC -/* E24960 802B6040 00000000 */ nop +/* E24960 802B6040 00000000 */ nop /* E24964 802B6044 080AD86A */ j .L802B61A8 -/* E24968 802B6048 00000000 */ nop +/* E24968 802B6048 00000000 */ nop .L802B604C: /* E2496C 802B604C 8E030000 */ lw $v1, ($s0) /* E24970 802B6050 0461002E */ bgez $v1, .L802B610C @@ -49,7 +49,7 @@ glabel func_802B6000_E24920 /* E249C8 802B60A8 34840009 */ ori $a0, $a0, 9 .L802B60AC: /* E249CC 802B60AC 0C037FBF */ jal func_800DFEFC -/* E249D0 802B60B0 00000000 */ nop +/* E249D0 802B60B0 00000000 */ nop /* E249D4 802B60B4 34048161 */ ori $a0, $zero, 0x8161 /* E249D8 802B60B8 0C052736 */ jal play_sound_at_player /* E249DC 802B60BC 0000282D */ daddu $a1, $zero, $zero @@ -61,7 +61,7 @@ glabel func_802B6000_E24920 /* E249F4 802B60D4 14400004 */ bnez $v0, .L802B60E8 /* E249F8 802B60D8 3C04FFFB */ lui $a0, 0xfffb /* E249FC 802B60DC 0C03954C */ jal func_800E5530 -/* E24A00 802B60E0 00000000 */ nop +/* E24A00 802B60E0 00000000 */ nop /* E24A04 802B60E4 3C04FFFB */ lui $a0, 0xfffb .L802B60E8: /* E24A08 802B60E8 3484FFFF */ ori $a0, $a0, 0xffff @@ -80,7 +80,7 @@ glabel func_802B6000_E24920 /* E24A38 802B6118 44811000 */ mtc1 $at, $f2 /* E24A3C 802B611C 27A40010 */ addiu $a0, $sp, 0x10 /* E24A40 802B6120 46020002 */ mul.s $f0, $f0, $f2 -/* E24A44 802B6124 00000000 */ nop +/* E24A44 802B6124 00000000 */ nop /* E24A48 802B6128 920200B6 */ lbu $v0, 0xb6($s0) /* E24A4C 802B612C 27A50014 */ addiu $a1, $sp, 0x14 /* E24A50 802B6130 24420001 */ addiu $v0, $v0, 1 @@ -88,34 +88,34 @@ glabel func_802B6000_E24920 /* E24A58 802B6138 0C0388C1 */ jal input_to_move_vector /* E24A5C 802B613C E6000054 */ swc1 $f0, 0x54($s0) /* E24A60 802B6140 0C039858 */ jal check_input_jump -/* E24A64 802B6144 00000000 */ nop +/* E24A64 802B6144 00000000 */ nop /* E24A68 802B6148 0040182D */ daddu $v1, $v0, $zero /* E24A6C 802B614C 14600005 */ bnez $v1, .L802B6164 -/* E24A70 802B6150 00000000 */ nop +/* E24A70 802B6150 00000000 */ nop /* E24A74 802B6154 820200B6 */ lb $v0, 0xb6($s0) /* E24A78 802B6158 0062102A */ slt $v0, $v1, $v0 /* E24A7C 802B615C 10400012 */ beqz $v0, .L802B61A8 -/* E24A80 802B6160 00000000 */ nop +/* E24A80 802B6160 00000000 */ nop .L802B6164: /* E24A84 802B6164 C7A00014 */ lwc1 $f0, 0x14($sp) /* E24A88 802B6168 44801000 */ mtc1 $zero, $f2 -/* E24A8C 802B616C 00000000 */ nop +/* E24A8C 802B616C 00000000 */ nop /* E24A90 802B6170 46020032 */ c.eq.s $f0, $f2 -/* E24A94 802B6174 00000000 */ nop +/* E24A94 802B6174 00000000 */ nop /* E24A98 802B6178 45000005 */ bc1f .L802B6190 -/* E24A9C 802B617C 00000000 */ nop +/* E24A9C 802B617C 00000000 */ nop /* E24AA0 802B6180 0C039769 */ jal set_action_state /* E24AA4 802B6184 0000202D */ daddu $a0, $zero, $zero /* E24AA8 802B6188 080AD86A */ j .L802B61A8 -/* E24AAC 802B618C 00000000 */ nop +/* E24AAC 802B618C 00000000 */ nop .L802B6190: /* E24AB0 802B6190 45010003 */ bc1t .L802B61A0 -/* E24AB4 802B6194 00000000 */ nop +/* E24AB4 802B6194 00000000 */ nop /* E24AB8 802B6198 C7A00010 */ lwc1 $f0, 0x10($sp) /* E24ABC 802B619C E6000080 */ swc1 $f0, 0x80($s0) .L802B61A0: /* E24AC0 802B61A0 0C0397DA */ jal update_locomotion_state -/* E24AC4 802B61A4 00000000 */ nop +/* E24AC4 802B61A4 00000000 */ nop .L802B61A8: /* E24AC8 802B61A8 8FBF0024 */ lw $ra, 0x24($sp) /* E24ACC 802B61AC 8FB20020 */ lw $s2, 0x20($sp) diff --git a/asm/nonmatchings/code_E24920/func_802B61C0_E24AE0.s b/asm/nonmatchings/code_E24920/func_802B61C0_E24AE0.s index f12a5f49b4..654c89b574 100644 --- a/asm/nonmatchings/code_E24920/func_802B61C0_E24AE0.s +++ b/asm/nonmatchings/code_E24920/func_802B61C0_E24AE0.s @@ -15,9 +15,9 @@ glabel func_802B61C0_E24AE0 /* E24B08 802B61E8 10400005 */ beqz $v0, .L802B6200 /* E24B0C 802B61EC 0060882D */ daddu $s1, $v1, $zero /* E24B10 802B61F0 0C0AD913 */ jal func_802B644C_E24D6C -/* E24B14 802B61F4 00000000 */ nop +/* E24B14 802B61F4 00000000 */ nop /* E24B18 802B61F8 080AD8AE */ j .L802B62B8 -/* E24B1C 802B61FC 00000000 */ nop +/* E24B1C 802B61FC 00000000 */ nop .L802B6200: /* E24B20 802B6200 8E040000 */ lw $a0, ($s0) /* E24B24 802B6204 04810012 */ bgez $a0, .L802B6250 @@ -36,7 +36,7 @@ glabel func_802B61C0_E24AE0 /* E24B58 802B6238 14600003 */ bnez $v1, .L802B6248 /* E24B5C 802B623C E6020048 */ swc1 $f2, 0x48($s0) /* E24B60 802B6240 0C03954C */ jal func_800E5530 -/* E24B64 802B6244 00000000 */ nop +/* E24B64 802B6244 00000000 */ nop .L802B6248: /* E24B68 802B6248 2402FFFF */ addiu $v0, $zero, -1 /* E24B6C 802B624C A6220004 */ sh $v0, 4($s1) @@ -47,7 +47,7 @@ glabel func_802B61C0_E24AE0 /* E24B7C 802B625C 44810000 */ mtc1 $at, $f0 /* E24B80 802B6260 27A40010 */ addiu $a0, $sp, 0x10 /* E24B84 802B6264 46001082 */ mul.s $f2, $f2, $f0 -/* E24B88 802B6268 00000000 */ nop +/* E24B88 802B6268 00000000 */ nop /* E24B8C 802B626C 920200B6 */ lbu $v0, 0xb6($s0) /* E24B90 802B6270 27A50014 */ addiu $a1, $sp, 0x14 /* E24B94 802B6274 24420001 */ addiu $v0, $v0, 1 @@ -55,19 +55,19 @@ glabel func_802B61C0_E24AE0 /* E24B9C 802B627C 0C0388C1 */ jal input_to_move_vector /* E24BA0 802B6280 E6020054 */ swc1 $f2, 0x54($s0) /* E24BA4 802B6284 0C039858 */ jal check_input_jump -/* E24BA8 802B6288 00000000 */ nop +/* E24BA8 802B6288 00000000 */ nop /* E24BAC 802B628C C7A20014 */ lwc1 $f2, 0x14($sp) /* E24BB0 802B6290 44800000 */ mtc1 $zero, $f0 -/* E24BB4 802B6294 00000000 */ nop +/* E24BB4 802B6294 00000000 */ nop /* E24BB8 802B6298 46001032 */ c.eq.s $f2, $f0 -/* E24BBC 802B629C 00000000 */ nop +/* E24BBC 802B629C 00000000 */ nop /* E24BC0 802B62A0 45010003 */ bc1t .L802B62B0 -/* E24BC4 802B62A4 00000000 */ nop +/* E24BC4 802B62A4 00000000 */ nop /* E24BC8 802B62A8 C7A00010 */ lwc1 $f0, 0x10($sp) /* E24BCC 802B62AC E6000080 */ swc1 $f0, 0x80($s0) .L802B62B0: /* E24BD0 802B62B0 0C0397DA */ jal update_locomotion_state -/* E24BD4 802B62B4 00000000 */ nop +/* E24BD4 802B62B4 00000000 */ nop .L802B62B8: /* E24BD8 802B62B8 8FBF0020 */ lw $ra, 0x20($sp) /* E24BDC 802B62BC 8FB1001C */ lw $s1, 0x1c($sp) diff --git a/asm/nonmatchings/code_E24920/func_802B62CC_E24BEC.s b/asm/nonmatchings/code_E24920/func_802B62CC_E24BEC.s index 40e16be75c..9cf08181cb 100644 --- a/asm/nonmatchings/code_E24920/func_802B62CC_E24BEC.s +++ b/asm/nonmatchings/code_E24920/func_802B62CC_E24BEC.s @@ -36,7 +36,7 @@ glabel func_802B62CC_E24BEC /* E24C68 802B6348 14400004 */ bnez $v0, .L802B635C /* E24C6C 802B634C 2402FFFF */ addiu $v0, $zero, -1 /* E24C70 802B6350 0C03954C */ jal func_800E5530 -/* E24C74 802B6354 00000000 */ nop +/* E24C74 802B6354 00000000 */ nop /* E24C78 802B6358 2402FFFF */ addiu $v0, $zero, -1 .L802B635C: /* E24C7C 802B635C A6420004 */ sh $v0, 4($s2) @@ -47,7 +47,7 @@ glabel func_802B62CC_E24BEC /* E24C8C 802B636C 44811000 */ mtc1 $at, $f2 /* E24C90 802B6370 27A40010 */ addiu $a0, $sp, 0x10 /* E24C94 802B6374 46020002 */ mul.s $f0, $f0, $f2 -/* E24C98 802B6378 00000000 */ nop +/* E24C98 802B6378 00000000 */ nop /* E24C9C 802B637C 920200B6 */ lbu $v0, 0xb6($s0) /* E24CA0 802B6380 27A50014 */ addiu $a1, $sp, 0x14 /* E24CA4 802B6384 24420001 */ addiu $v0, $v0, 1 @@ -56,13 +56,13 @@ glabel func_802B62CC_E24BEC /* E24CB0 802B6390 E6000054 */ swc1 $f0, 0x54($s0) /* E24CB4 802B6394 C7A00014 */ lwc1 $f0, 0x14($sp) /* E24CB8 802B6398 44801000 */ mtc1 $zero, $f2 -/* E24CBC 802B639C 00000000 */ nop +/* E24CBC 802B639C 00000000 */ nop /* E24CC0 802B63A0 46020032 */ c.eq.s $f0, $f2 -/* E24CC4 802B63A4 00000000 */ nop +/* E24CC4 802B63A4 00000000 */ nop /* E24CC8 802B63A8 45010020 */ bc1t .L802B642C /* E24CCC 802B63AC 0000202D */ daddu $a0, $zero, $zero /* E24CD0 802B63B0 45010003 */ bc1t .L802B63C0 -/* E24CD4 802B63B4 00000000 */ nop +/* E24CD4 802B63B4 00000000 */ nop /* E24CD8 802B63B8 C7A00010 */ lwc1 $f0, 0x10($sp) /* E24CDC 802B63BC E6000080 */ swc1 $f0, 0x80($s0) .L802B63C0: @@ -70,33 +70,33 @@ glabel func_802B62CC_E24BEC /* E24CE4 802B63C4 00420018 */ mult $v0, $v0 /* E24CE8 802B63C8 00001812 */ mflo $v1 /* E24CEC 802B63CC 8E0200EC */ lw $v0, 0xec($s0) -/* E24CF0 802B63D0 00000000 */ nop +/* E24CF0 802B63D0 00000000 */ nop /* E24CF4 802B63D4 00420018 */ mult $v0, $v0 /* E24CF8 802B63D8 00003812 */ mflo $a3 /* E24CFC 802B63DC 00671021 */ addu $v0, $v1, $a3 /* E24D00 802B63E0 44826000 */ mtc1 $v0, $f12 -/* E24D04 802B63E4 00000000 */ nop +/* E24D04 802B63E4 00000000 */ nop /* E24D08 802B63E8 46806320 */ cvt.s.w $f12, $f12 /* E24D0C 802B63EC 46006084 */ sqrt.s $f2, $f12 /* E24D10 802B63F0 46021032 */ c.eq.s $f2, $f2 -/* E24D14 802B63F4 00000000 */ nop +/* E24D14 802B63F4 00000000 */ nop /* E24D18 802B63F8 45010004 */ bc1t .L802B640C -/* E24D1C 802B63FC 00000000 */ nop +/* E24D1C 802B63FC 00000000 */ nop /* E24D20 802B6400 0C0187BC */ jal sqrtf -/* E24D24 802B6404 00000000 */ nop +/* E24D24 802B6404 00000000 */ nop /* E24D28 802B6408 46000086 */ mov.s $f2, $f0 .L802B640C: /* E24D2C 802B640C 3C01425C */ lui $at, 0x425c /* E24D30 802B6410 44810000 */ mtc1 $at, $f0 -/* E24D34 802B6414 00000000 */ nop +/* E24D34 802B6414 00000000 */ nop /* E24D38 802B6418 4602003C */ c.lt.s $f0, $f2 -/* E24D3C 802B641C 00000000 */ nop +/* E24D3C 802B641C 00000000 */ nop /* E24D40 802B6420 45000002 */ bc1f .L802B642C /* E24D44 802B6424 24040001 */ addiu $a0, $zero, 1 /* E24D48 802B6428 24040002 */ addiu $a0, $zero, 2 .L802B642C: /* E24D4C 802B642C 0C039769 */ jal set_action_state -/* E24D50 802B6430 00000000 */ nop +/* E24D50 802B6430 00000000 */ nop /* E24D54 802B6434 8FBF0024 */ lw $ra, 0x24($sp) /* E24D58 802B6438 8FB20020 */ lw $s2, 0x20($sp) /* E24D5C 802B643C 8FB1001C */ lw $s1, 0x1c($sp) diff --git a/asm/nonmatchings/code_E24920/func_802B644C_E24D6C.s b/asm/nonmatchings/code_E24920/func_802B644C_E24D6C.s index 6670fb1b96..41b440b415 100644 --- a/asm/nonmatchings/code_E24920/func_802B644C_E24D6C.s +++ b/asm/nonmatchings/code_E24920/func_802B644C_E24D6C.s @@ -31,7 +31,7 @@ glabel func_802B644C_E24D6C /* E24DD4 802B64B4 14400003 */ bnez $v0, .L802B64C4 /* E24DD8 802B64B8 E6020048 */ swc1 $f2, 0x48($s0) /* E24DDC 802B64BC 0C03954C */ jal func_800E5530 -/* E24DE0 802B64C0 00000000 */ nop +/* E24DE0 802B64C0 00000000 */ nop .L802B64C4: /* E24DE4 802B64C4 2402FFFF */ addiu $v0, $zero, -1 /* E24DE8 802B64C8 A6220004 */ sh $v0, 4($s1) @@ -42,7 +42,7 @@ glabel func_802B644C_E24D6C /* E24DF8 802B64D8 44810000 */ mtc1 $at, $f0 /* E24DFC 802B64DC 27A40010 */ addiu $a0, $sp, 0x10 /* E24E00 802B64E0 46001082 */ mul.s $f2, $f2, $f0 -/* E24E04 802B64E4 00000000 */ nop +/* E24E04 802B64E4 00000000 */ nop /* E24E08 802B64E8 920200B6 */ lbu $v0, 0xb6($s0) /* E24E0C 802B64EC 27A50014 */ addiu $a1, $sp, 0x14 /* E24E10 802B64F0 24420001 */ addiu $v0, $v0, 1 @@ -51,11 +51,11 @@ glabel func_802B644C_E24D6C /* E24E1C 802B64FC E6020054 */ swc1 $f2, 0x54($s0) /* E24E20 802B6500 C7A20014 */ lwc1 $f2, 0x14($sp) /* E24E24 802B6504 44800000 */ mtc1 $zero, $f0 -/* E24E28 802B6508 00000000 */ nop +/* E24E28 802B6508 00000000 */ nop /* E24E2C 802B650C 46001032 */ c.eq.s $f2, $f0 -/* E24E30 802B6510 00000000 */ nop +/* E24E30 802B6510 00000000 */ nop /* E24E34 802B6514 45010003 */ bc1t .L802B6524 -/* E24E38 802B6518 00000000 */ nop +/* E24E38 802B6518 00000000 */ nop /* E24E3C 802B651C C7A00010 */ lwc1 $f0, 0x10($sp) /* E24E40 802B6520 E6000080 */ swc1 $f0, 0x80($s0) .L802B6524: @@ -63,36 +63,36 @@ glabel func_802B644C_E24D6C /* E24E48 802B6528 00420018 */ mult $v0, $v0 /* E24E4C 802B652C 00001812 */ mflo $v1 /* E24E50 802B6530 8E0200EC */ lw $v0, 0xec($s0) -/* E24E54 802B6534 00000000 */ nop +/* E24E54 802B6534 00000000 */ nop /* E24E58 802B6538 00420018 */ mult $v0, $v0 /* E24E5C 802B653C 00003812 */ mflo $a3 /* E24E60 802B6540 00671021 */ addu $v0, $v1, $a3 /* E24E64 802B6544 44826000 */ mtc1 $v0, $f12 -/* E24E68 802B6548 00000000 */ nop +/* E24E68 802B6548 00000000 */ nop /* E24E6C 802B654C 46806320 */ cvt.s.w $f12, $f12 /* E24E70 802B6550 46006084 */ sqrt.s $f2, $f12 /* E24E74 802B6554 46021032 */ c.eq.s $f2, $f2 -/* E24E78 802B6558 00000000 */ nop +/* E24E78 802B6558 00000000 */ nop /* E24E7C 802B655C 45010004 */ bc1t .L802B6570 -/* E24E80 802B6560 00000000 */ nop +/* E24E80 802B6560 00000000 */ nop /* E24E84 802B6564 0C0187BC */ jal sqrtf -/* E24E88 802B6568 00000000 */ nop +/* E24E88 802B6568 00000000 */ nop /* E24E8C 802B656C 46000086 */ mov.s $f2, $f0 .L802B6570: /* E24E90 802B6570 3C01425C */ lui $at, 0x425c /* E24E94 802B6574 44810000 */ mtc1 $at, $f0 -/* E24E98 802B6578 00000000 */ nop +/* E24E98 802B6578 00000000 */ nop /* E24E9C 802B657C 4602003C */ c.lt.s $f0, $f2 -/* E24EA0 802B6580 00000000 */ nop +/* E24EA0 802B6580 00000000 */ nop /* E24EA4 802B6584 45000002 */ bc1f .L802B6590 /* E24EA8 802B6588 24040001 */ addiu $a0, $zero, 1 /* E24EAC 802B658C 24040002 */ addiu $a0, $zero, 2 .L802B6590: /* E24EB0 802B6590 0C039769 */ jal set_action_state -/* E24EB4 802B6594 00000000 */ nop +/* E24EB4 802B6594 00000000 */ nop /* E24EB8 802B6598 8FBF0020 */ lw $ra, 0x20($sp) /* E24EBC 802B659C 8FB1001C */ lw $s1, 0x1c($sp) /* E24EC0 802B65A0 8FB00018 */ lw $s0, 0x18($sp) /* E24EC4 802B65A4 03E00008 */ jr $ra /* E24EC8 802B65A8 27BD0028 */ addiu $sp, $sp, 0x28 -/* E24ECC 802B65AC 00000000 */ nop +/* E24ECC 802B65AC 00000000 */ nop diff --git a/asm/nonmatchings/code_E24ED0/func_802B6000_E24ED0.s b/asm/nonmatchings/code_E24ED0/func_802B6000_E24ED0.s index 436e5f2b6d..3aeb00f579 100644 --- a/asm/nonmatchings/code_E24ED0/func_802B6000_E24ED0.s +++ b/asm/nonmatchings/code_E24ED0/func_802B6000_E24ED0.s @@ -18,7 +18,7 @@ glabel func_802B6000_E24ED0 /* E24F00 802B6030 00220821 */ addu $at, $at, $v0 /* E24F04 802B6034 8C226DC0 */ lw $v0, %lo(D_802B6DC0)($at) /* E24F08 802B6038 00400008 */ jr $v0 -/* E24F0C 802B603C 00000000 */ nop +/* E24F0C 802B603C 00000000 */ nop .L802B6040: /* E24F10 802B6040 03E00008 */ jr $ra /* E24F14 802B6044 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_E24ED0/func_802B6048_E24F18.s b/asm/nonmatchings/code_E24ED0/func_802B6048_E24F18.s index cab76bec78..3700214b95 100644 --- a/asm/nonmatchings/code_E24ED0/func_802B6048_E24F18.s +++ b/asm/nonmatchings/code_E24ED0/func_802B6048_E24F18.s @@ -46,31 +46,31 @@ glabel func_802B6048_E24F18 /* E24FB4 802B60E4 24102118 */ addiu $s0, $zero, 0x2118 .L802B60E8: /* E24FB8 802B60E8 0C0394D2 */ jal func_800E5348 -/* E24FBC 802B60EC 00000000 */ nop +/* E24FBC 802B60EC 00000000 */ nop /* E24FC0 802B60F0 3C0140C9 */ lui $at, 0x40c9 /* E24FC4 802B60F4 34210FD0 */ ori $at, $at, 0xfd0 /* E24FC8 802B60F8 44811000 */ mtc1 $at, $f2 -/* E24FCC 802B60FC 00000000 */ nop +/* E24FCC 802B60FC 00000000 */ nop /* E24FD0 802B6100 46020502 */ mul.s $f20, $f0, $f2 -/* E24FD4 802B6104 00000000 */ nop +/* E24FD4 802B6104 00000000 */ nop /* E24FD8 802B6108 3C0143B4 */ lui $at, 0x43b4 /* E24FDC 802B610C 44810000 */ mtc1 $at, $f0 -/* E24FE0 802B6110 00000000 */ nop +/* E24FE0 802B6110 00000000 */ nop /* E24FE4 802B6114 4600A503 */ div.s $f20, $f20, $f0 /* E24FE8 802B6118 0C00A85B */ jal sin_rad /* E24FEC 802B611C 4600A306 */ mov.s $f12, $f20 /* E24FF0 802B6120 3C0141C8 */ lui $at, 0x41c8 /* E24FF4 802B6124 44811000 */ mtc1 $at, $f2 -/* E24FF8 802B6128 00000000 */ nop +/* E24FF8 802B6128 00000000 */ nop /* E24FFC 802B612C 46020582 */ mul.s $f22, $f0, $f2 -/* E25000 802B6130 00000000 */ nop +/* E25000 802B6130 00000000 */ nop /* E25004 802B6134 0C00A874 */ jal cos_rad /* E25008 802B6138 4600A306 */ mov.s $f12, $f20 /* E2500C 802B613C 3C01C1C8 */ lui $at, 0xc1c8 /* E25010 802B6140 44811000 */ mtc1 $at, $f2 -/* E25014 802B6144 00000000 */ nop +/* E25014 802B6144 00000000 */ nop /* E25018 802B6148 46020082 */ mul.s $f2, $f0, $f2 -/* E2501C 802B614C 00000000 */ nop +/* E2501C 802B614C 00000000 */ nop /* E25020 802B6150 06610008 */ bgez $s3, .L802B6174 /* E25024 802B6154 24130003 */ addiu $s3, $zero, 3 /* E25028 802B6158 C6800028 */ lwc1 $f0, 0x28($s4) @@ -90,7 +90,7 @@ glabel func_802B6048_E24F18 /* E2505C 802B618C 46020580 */ add.s $f22, $f0, $f2 /* E25060 802B6190 C4420004 */ lwc1 $f2, 4($v0) /* E25064 802B6194 44830000 */ mtc1 $v1, $f0 -/* E25068 802B6198 00000000 */ nop +/* E25068 802B6198 00000000 */ nop /* E2506C 802B619C 46800020 */ cvt.s.w $f0, $f0 /* E25070 802B61A0 46001080 */ add.s $f2, $f2, $f0 /* E25074 802B61A4 3C0140A0 */ lui $at, 0x40a0 @@ -105,7 +105,7 @@ glabel func_802B6048_E24F18 /* E25094 802B61C4 0240302D */ daddu $a2, $s2, $zero /* E25098 802B61C8 0000202D */ daddu $a0, $zero, $zero /* E2509C 802B61CC 44910000 */ mtc1 $s1, $f0 -/* E250A0 802B61D0 00000000 */ nop +/* E250A0 802B61D0 00000000 */ nop /* E250A4 802B61D4 46800020 */ cvt.s.w $f0, $f0 /* E250A8 802B61D8 26430003 */ addiu $v1, $s2, 3 /* E250AC 802B61DC 00031040 */ sll $v0, $v1, 1 @@ -124,21 +124,27 @@ glabel func_802B6048_E24F18 /* E250E0 802B6210 2C620006 */ sltiu $v0, $v1, 6 /* E250E4 802B6214 10400011 */ beqz $v0, .L802B625C /* E250E8 802B6218 00031080 */ sll $v0, $v1, 2 -/* E250EC 802B621C 3C01802B */ lui $at, %hi(D_802B6DF0) +/* E250EC 802B621C 3C01802B */ lui $at, %hi(jtbl_802B6DF0_E25CC0) /* E250F0 802B6220 00220821 */ addu $at, $at, $v0 -/* E250F4 802B6224 8C226DF0 */ lw $v0, %lo(D_802B6DF0)($at) +/* E250F4 802B6224 8C226DF0 */ lw $v0, %lo(jtbl_802B6DF0_E25CC0)($at) /* E250F8 802B6228 00400008 */ jr $v0 -/* E250FC 802B622C 00000000 */ nop +/* E250FC 802B622C 00000000 */ nop +glabel L802B6230_E25100 /* E25100 802B6230 080AD897 */ j .L802B625C /* E25104 802B6234 24100372 */ addiu $s0, $zero, 0x372 +glabel L802B6238_E25108 /* E25108 802B6238 080AD897 */ j .L802B625C /* E2510C 802B623C 241000F1 */ addiu $s0, $zero, 0xf1 +glabel L802B6240_E25110 /* E25110 802B6240 080AD897 */ j .L802B625C /* E25114 802B6244 241000DC */ addiu $s0, $zero, 0xdc +glabel L802B6248_E25118 /* E25118 802B6248 080AD897 */ j .L802B625C /* E2511C 802B624C 24102072 */ addiu $s0, $zero, 0x2072 +glabel L802B6250_E25120 /* E25120 802B6250 080AD897 */ j .L802B625C /* E25124 802B6254 24102073 */ addiu $s0, $zero, 0x2073 +glabel L802B6258_E25128 /* E25128 802B6258 2410205B */ addiu $s0, $zero, 0x205b .L802B625C: /* E2512C 802B625C 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/code_E24ED0/func_802B62A4_E25174.s b/asm/nonmatchings/code_E24ED0/func_802B62A4_E25174.s index 51f0a4a319..157d7411c8 100644 --- a/asm/nonmatchings/code_E24ED0/func_802B62A4_E25174.s +++ b/asm/nonmatchings/code_E24ED0/func_802B62A4_E25174.s @@ -40,16 +40,16 @@ glabel func_802B62A4_E25174 /* E25200 802B6330 460C0301 */ sub.s $f12, $f0, $f12 /* E25204 802B6334 46000086 */ mov.s $f2, $f0 /* E25208 802B6338 4602A03E */ c.le.s $f20, $f2 -/* E2520C 802B633C 00000000 */ nop +/* E2520C 802B633C 00000000 */ nop /* E25210 802B6340 45000015 */ bc1f .L802B6398 -/* E25214 802B6344 00000000 */ nop +/* E25214 802B6344 00000000 */ nop /* E25218 802B6348 3C014387 */ lui $at, 0x4387 /* E2521C 802B634C 44810000 */ mtc1 $at, $f0 -/* E25220 802B6350 00000000 */ nop +/* E25220 802B6350 00000000 */ nop /* E25224 802B6354 4600103C */ c.lt.s $f2, $f0 -/* E25228 802B6358 00000000 */ nop +/* E25228 802B6358 00000000 */ nop /* E2522C 802B635C 4500000E */ bc1f .L802B6398 -/* E25230 802B6360 00000000 */ nop +/* E25230 802B6360 00000000 */ nop /* E25234 802B6364 3C01C1F0 */ lui $at, 0xc1f0 /* E25238 802B6368 44810000 */ mtc1 $at, $f0 /* E2523C 802B636C 080AD8EA */ j .L802B63A8 @@ -67,7 +67,7 @@ glabel func_802B62A4_E25174 .L802B6398: /* E25268 802B6398 3C0141F0 */ lui $at, 0x41f0 /* E2526C 802B639C 44810000 */ mtc1 $at, $f0 -/* E25270 802B63A0 00000000 */ nop +/* E25270 802B63A0 00000000 */ nop /* E25274 802B63A4 4600B580 */ add.s $f22, $f22, $f0 .L802B63A8: /* E25278 802B63A8 27A50020 */ addiu $a1, $sp, 0x20 @@ -77,7 +77,7 @@ glabel func_802B62A4_E25174 /* E25284 802B63B4 44816000 */ mtc1 $at, $f12 /* E25288 802B63B8 27A60024 */ addiu $a2, $sp, 0x24 /* E2528C 802B63BC 460CB302 */ mul.s $f12, $f22, $f12 -/* E25290 802B63C0 00000000 */ nop +/* E25290 802B63C0 00000000 */ nop /* E25294 802B63C4 24100001 */ addiu $s0, $zero, 1 /* E25298 802B63C8 27B30030 */ addiu $s3, $sp, 0x30 /* E2529C 802B63CC 3C0143B4 */ lui $at, 0x43b4 @@ -92,13 +92,13 @@ glabel func_802B62A4_E25174 .L802B63F0: /* E252C0 802B63F0 C7A00020 */ lwc1 $f0, 0x20($sp) /* E252C4 802B63F4 44901000 */ mtc1 $s0, $f2 -/* E252C8 802B63F8 00000000 */ nop +/* E252C8 802B63F8 00000000 */ nop /* E252CC 802B63FC 468010A0 */ cvt.s.w $f2, $f2 /* E252D0 802B6400 46020002 */ mul.s $f0, $f0, $f2 -/* E252D4 802B6404 00000000 */ nop +/* E252D4 802B6404 00000000 */ nop /* E252D8 802B6408 C7A40024 */ lwc1 $f4, 0x24($sp) /* E252DC 802B640C 46022102 */ mul.s $f4, $f4, $f2 -/* E252E0 802B6410 00000000 */ nop +/* E252E0 802B6410 00000000 */ nop /* E252E4 802B6414 24040003 */ addiu $a0, $zero, 3 /* E252E8 802B6418 0240282D */ daddu $a1, $s2, $zero /* E252EC 802B641C 4600E000 */ add.s $f0, $f28, $f0 @@ -114,17 +114,17 @@ glabel func_802B62A4_E25174 /* E25314 802B6444 E7B60018 */ swc1 $f22, 0x18($sp) /* E25318 802B6448 0040882D */ daddu $s1, $v0, $zero /* E2531C 802B644C 0621FFC9 */ bgez $s1, .L802B6374 -/* E25320 802B6450 00000000 */ nop +/* E25320 802B6450 00000000 */ nop /* E25324 802B6454 26100001 */ addiu $s0, $s0, 1 /* E25328 802B6458 2A020010 */ slti $v0, $s0, 0x10 /* E2532C 802B645C 1440FFE4 */ bnez $v0, .L802B63F0 -/* E25330 802B6460 00000000 */ nop +/* E25330 802B6460 00000000 */ nop .L802B6464: /* E25334 802B6464 2A020010 */ slti $v0, $s0, 0x10 /* E25338 802B6468 14400061 */ bnez $v0, .L802B65F0 -/* E2533C 802B646C 00000000 */ nop +/* E2533C 802B646C 00000000 */ nop /* E25340 802B6470 0C0394D2 */ jal func_800E5348 -/* E25344 802B6474 00000000 */ nop +/* E25344 802B6474 00000000 */ nop /* E25348 802B6478 8E4400A4 */ lw $a0, 0xa4($s2) /* E2534C 802B647C 0C0AD800 */ jal func_802B6000_E24ED0 /* E25350 802B6480 46000586 */ mov.s $f22, $f0 @@ -149,16 +149,16 @@ glabel func_802B62A4_E25174 /* E2539C 802B64CC 460C0301 */ sub.s $f12, $f0, $f12 /* E253A0 802B64D0 46000086 */ mov.s $f2, $f0 /* E253A4 802B64D4 4602A03E */ c.le.s $f20, $f2 -/* E253A8 802B64D8 00000000 */ nop +/* E253A8 802B64D8 00000000 */ nop /* E253AC 802B64DC 45000015 */ bc1f .L802B6534 -/* E253B0 802B64E0 00000000 */ nop +/* E253B0 802B64E0 00000000 */ nop /* E253B4 802B64E4 3C014387 */ lui $at, 0x4387 /* E253B8 802B64E8 44810000 */ mtc1 $at, $f0 -/* E253BC 802B64EC 00000000 */ nop +/* E253BC 802B64EC 00000000 */ nop /* E253C0 802B64F0 4600103C */ c.lt.s $f2, $f0 -/* E253C4 802B64F4 00000000 */ nop +/* E253C4 802B64F4 00000000 */ nop /* E253C8 802B64F8 4500000E */ bc1f .L802B6534 -/* E253CC 802B64FC 00000000 */ nop +/* E253CC 802B64FC 00000000 */ nop /* E253D0 802B6500 3C014170 */ lui $at, 0x4170 /* E253D4 802B6504 44810000 */ mtc1 $at, $f0 /* E253D8 802B6508 080AD951 */ j .L802B6544 @@ -176,7 +176,7 @@ glabel func_802B62A4_E25174 .L802B6534: /* E25404 802B6534 3C01C170 */ lui $at, 0xc170 /* E25408 802B6538 44810000 */ mtc1 $at, $f0 -/* E2540C 802B653C 00000000 */ nop +/* E2540C 802B653C 00000000 */ nop /* E25410 802B6540 4600B580 */ add.s $f22, $f22, $f0 .L802B6544: /* E25414 802B6544 27A50020 */ addiu $a1, $sp, 0x20 @@ -186,7 +186,7 @@ glabel func_802B62A4_E25174 /* E25420 802B6550 44816000 */ mtc1 $at, $f12 /* E25424 802B6554 27A60024 */ addiu $a2, $sp, 0x24 /* E25428 802B6558 460CB302 */ mul.s $f12, $f22, $f12 -/* E2542C 802B655C 00000000 */ nop +/* E2542C 802B655C 00000000 */ nop /* E25430 802B6560 24100001 */ addiu $s0, $zero, 1 /* E25434 802B6564 27B30030 */ addiu $s3, $sp, 0x30 /* E25438 802B6568 3C0143B4 */ lui $at, 0x43b4 @@ -198,13 +198,13 @@ glabel func_802B62A4_E25174 .L802B6580: /* E25450 802B6580 C7A00020 */ lwc1 $f0, 0x20($sp) /* E25454 802B6584 44901000 */ mtc1 $s0, $f2 -/* E25458 802B6588 00000000 */ nop +/* E25458 802B6588 00000000 */ nop /* E2545C 802B658C 468010A0 */ cvt.s.w $f2, $f2 /* E25460 802B6590 46020002 */ mul.s $f0, $f0, $f2 -/* E25464 802B6594 00000000 */ nop +/* E25464 802B6594 00000000 */ nop /* E25468 802B6598 C7A40024 */ lwc1 $f4, 0x24($sp) /* E2546C 802B659C 46022102 */ mul.s $f4, $f4, $f2 -/* E25470 802B65A0 00000000 */ nop +/* E25470 802B65A0 00000000 */ nop /* E25474 802B65A4 24040003 */ addiu $a0, $zero, 3 /* E25478 802B65A8 0240282D */ daddu $a1, $s2, $zero /* E2547C 802B65AC 4600E000 */ add.s $f0, $f28, $f0 @@ -223,7 +223,7 @@ glabel func_802B62A4_E25174 /* E254B0 802B65E0 26100001 */ addiu $s0, $s0, 1 /* E254B4 802B65E4 2A020010 */ slti $v0, $s0, 0x10 /* E254B8 802B65E8 1440FFE5 */ bnez $v0, .L802B6580 -/* E254BC 802B65EC 00000000 */ nop +/* E254BC 802B65EC 00000000 */ nop .L802B65F0: /* E254C0 802B65F0 06200020 */ bltz $s1, .L802B6674 /* E254C4 802B65F4 32224000 */ andi $v0, $s1, 0x4000 @@ -237,29 +237,35 @@ glabel func_802B62A4_E25174 /* E254E4 802B6614 2C620020 */ sltiu $v0, $v1, 0x20 /* E254E8 802B6618 10400016 */ beqz $v0, .L802B6674 /* E254EC 802B661C 00031080 */ sll $v0, $v1, 2 -/* E254F0 802B6620 3C01802B */ lui $at, %hi(D_802B6E08) +/* E254F0 802B6620 3C01802B */ lui $at, %hi(jtbl_802B6E08_E25CD8) /* E254F4 802B6624 00220821 */ addu $at, $at, $v0 -/* E254F8 802B6628 8C226E08 */ lw $v0, %lo(D_802B6E08)($at) +/* E254F8 802B6628 8C226E08 */ lw $v0, %lo(jtbl_802B6E08_E25CD8)($at) /* E254FC 802B662C 00400008 */ jr $v0 -/* E25500 802B6630 00000000 */ nop +/* E25500 802B6630 00000000 */ nop +glabel L802B6634_E25504 /* E25504 802B6634 0603000F */ bgezl $s0, .L802B6674 /* E25508 802B6638 2411FFFF */ addiu $s1, $zero, -1 /* E2550C 802B663C 080AD998 */ j .L802B6660 -/* E25510 802B6640 00000000 */ nop +/* E25510 802B6640 00000000 */ nop +glabel L802B6644_E25514 /* E25514 802B6644 5E00000B */ bgtzl $s0, .L802B6674 /* E25518 802B6648 2411FFFF */ addiu $s1, $zero, -1 /* E2551C 802B664C 080AD998 */ j .L802B6660 -/* E25520 802B6650 00000000 */ nop +/* E25520 802B6650 00000000 */ nop +glabel L802B6654_E25524 /* E25524 802B6654 2A020002 */ slti $v0, $s0, 2 /* E25528 802B6658 50400006 */ beql $v0, $zero, .L802B6674 /* E2552C 802B665C 2411FFFF */ addiu $s1, $zero, -1 .L802B6660: +glabel L802B6660_E25530 /* E25530 802B6660 8E420004 */ lw $v0, 4($s2) /* E25534 802B6664 34420400 */ ori $v0, $v0, 0x400 /* E25538 802B6668 080AD99D */ j .L802B6674 /* E2553C 802B666C AE420004 */ sw $v0, 4($s2) +glabel L802B6670_E25540 /* E25540 802B6670 2411FFFF */ addiu $s1, $zero, -1 .L802B6674: +glabel L802B6674_E25544 /* E25544 802B6674 0220102D */ daddu $v0, $s1, $zero .L802B6678: /* E25548 802B6678 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/code_E24ED0/func_802B66A8_E25578.s b/asm/nonmatchings/code_E24ED0/func_802B66A8_E25578.s index 4a0c0f49b6..29d5c0ac07 100644 --- a/asm/nonmatchings/code_E24ED0/func_802B66A8_E25578.s +++ b/asm/nonmatchings/code_E24ED0/func_802B66A8_E25578.s @@ -59,7 +59,7 @@ glabel func_802B66A8_E25578 /* E25648 802B6778 34840010 */ ori $a0, $a0, 0x10 .L802B677C: /* E2564C 802B677C 0C037FBF */ jal func_800DFEFC -/* E25650 802B6780 00000000 */ nop +/* E25650 802B6780 00000000 */ nop /* E25654 802B6784 0200202D */ daddu $a0, $s0, $zero /* E25658 802B6788 0C052736 */ jal play_sound_at_player /* E2565C 802B678C 0000282D */ daddu $a1, $zero, $zero @@ -96,7 +96,7 @@ glabel func_802B66A8_E25578 /* E256D0 802B6800 AC820018 */ sw $v0, 0x18($a0) .L802B6804: /* E256D4 802B6804 0C0ADA08 */ jal func_802B6820_E256F0 -/* E256D8 802B6808 00000000 */ nop +/* E256D8 802B6808 00000000 */ nop .L802B680C: /* E256DC 802B680C 8FBF0018 */ lw $ra, 0x18($sp) /* E256E0 802B6810 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_E24ED0/func_802B6820_E256F0.s b/asm/nonmatchings/code_E24ED0/func_802B6820_E256F0.s index 7140aa1c02..ab5d9a3871 100644 --- a/asm/nonmatchings/code_E24ED0/func_802B6820_E256F0.s +++ b/asm/nonmatchings/code_E24ED0/func_802B6820_E256F0.s @@ -19,7 +19,7 @@ glabel func_802B6820_E256F0 /* E25728 802B6858 3C148016 */ lui $s4, %hi(gCollisionStatus) /* E2572C 802B685C 2694A550 */ addiu $s4, $s4, %lo(gCollisionStatus) /* E25730 802B6860 0C0394D2 */ jal func_800E5348 -/* E25734 802B6864 00000000 */ nop +/* E25734 802B6864 00000000 */ nop /* E25738 802B6868 8E4400A4 */ lw $a0, 0xa4($s2) /* E2573C 802B686C 0C0AD800 */ jal func_802B6000_E24ED0 /* E25740 802B6870 46000586 */ mov.s $f22, $f0 @@ -44,12 +44,12 @@ glabel func_802B6820_E256F0 /* E2578C 802B68BC 460C0301 */ sub.s $f12, $f0, $f12 /* E25790 802B68C0 46000086 */ mov.s $f2, $f0 /* E25794 802B68C4 4602A03E */ c.le.s $f20, $f2 -/* E25798 802B68C8 00000000 */ nop +/* E25798 802B68C8 00000000 */ nop /* E2579C 802B68CC 45000009 */ bc1f .L802B68F4 -/* E257A0 802B68D0 00000000 */ nop +/* E257A0 802B68D0 00000000 */ nop /* E257A4 802B68D4 3C014387 */ lui $at, 0x4387 /* E257A8 802B68D8 44810000 */ mtc1 $at, $f0 -/* E257AC 802B68DC 00000000 */ nop +/* E257AC 802B68DC 00000000 */ nop /* E257B0 802B68E0 4600103C */ c.lt.s $f2, $f0 /* E257B4 802B68E4 3C01C1F0 */ lui $at, 0xc1f0 /* E257B8 802B68E8 44810000 */ mtc1 $at, $f0 @@ -58,7 +58,7 @@ glabel func_802B6820_E256F0 .L802B68F4: /* E257C4 802B68F4 3C0141F0 */ lui $at, 0x41f0 /* E257C8 802B68F8 44810000 */ mtc1 $at, $f0 -/* E257CC 802B68FC 00000000 */ nop +/* E257CC 802B68FC 00000000 */ nop /* E257D0 802B6900 4600B580 */ add.s $f22, $f22, $f0 .L802B6904: /* E257D4 802B6904 27A50020 */ addiu $a1, $sp, 0x20 @@ -68,7 +68,7 @@ glabel func_802B6820_E256F0 /* E257E0 802B6910 44816000 */ mtc1 $at, $f12 /* E257E4 802B6914 27A60024 */ addiu $a2, $sp, 0x24 /* E257E8 802B6918 460CB302 */ mul.s $f12, $f22, $f12 -/* E257EC 802B691C 00000000 */ nop +/* E257EC 802B691C 00000000 */ nop /* E257F0 802B6920 24110001 */ addiu $s1, $zero, 1 /* E257F4 802B6924 27B30030 */ addiu $s3, $sp, 0x30 /* E257F8 802B6928 3C0143B4 */ lui $at, 0x43b4 @@ -83,13 +83,13 @@ glabel func_802B6820_E256F0 .L802B694C: /* E2581C 802B694C C7A40020 */ lwc1 $f4, 0x20($sp) /* E25820 802B6950 44910000 */ mtc1 $s1, $f0 -/* E25824 802B6954 00000000 */ nop +/* E25824 802B6954 00000000 */ nop /* E25828 802B6958 46800020 */ cvt.s.w $f0, $f0 /* E2582C 802B695C 46002102 */ mul.s $f4, $f4, $f0 -/* E25830 802B6960 00000000 */ nop +/* E25830 802B6960 00000000 */ nop /* E25834 802B6964 C7A20024 */ lwc1 $f2, 0x24($sp) /* E25838 802B6968 46001082 */ mul.s $f2, $f2, $f0 -/* E2583C 802B696C 00000000 */ nop +/* E2583C 802B696C 00000000 */ nop /* E25840 802B6970 24040003 */ addiu $a0, $zero, 3 /* E25844 802B6974 0240282D */ daddu $a1, $s2, $zero /* E25848 802B6978 4604E100 */ add.s $f4, $f28, $f4 @@ -112,7 +112,7 @@ glabel func_802B6820_E256F0 /* E2588C 802B69BC A6900014 */ sh $s0, 0x14($s4) /* E25890 802B69C0 32024000 */ andi $v0, $s0, 0x4000 /* E25894 802B69C4 10400004 */ beqz $v0, .L802B69D8 -/* E25898 802B69C8 00000000 */ nop +/* E25898 802B69C8 00000000 */ nop /* E2589C 802B69CC 0C04417A */ jal get_entity_by_index /* E258A0 802B69D0 0200202D */ daddu $a0, $s0, $zero /* E258A4 802B69D4 A0400007 */ sb $zero, 7($v0) @@ -123,12 +123,12 @@ glabel func_802B6820_E256F0 /* E258B0 802B69E0 26310001 */ addiu $s1, $s1, 1 /* E258B4 802B69E4 2A220010 */ slti $v0, $s1, 0x10 /* E258B8 802B69E8 1440FFD8 */ bnez $v0, .L802B694C -/* E258BC 802B69EC 00000000 */ nop +/* E258BC 802B69EC 00000000 */ nop .L802B69F0: /* E258C0 802B69F0 14400062 */ bnez $v0, .L802B6B7C -/* E258C4 802B69F4 00000000 */ nop +/* E258C4 802B69F4 00000000 */ nop /* E258C8 802B69F8 0C0394D2 */ jal func_800E5348 -/* E258CC 802B69FC 00000000 */ nop +/* E258CC 802B69FC 00000000 */ nop /* E258D0 802B6A00 8E4400A4 */ lw $a0, 0xa4($s2) /* E258D4 802B6A04 0C0AD800 */ jal func_802B6000_E24ED0 /* E258D8 802B6A08 46000586 */ mov.s $f22, $f0 @@ -153,12 +153,12 @@ glabel func_802B6820_E256F0 /* E25924 802B6A54 460C0301 */ sub.s $f12, $f0, $f12 /* E25928 802B6A58 46000086 */ mov.s $f2, $f0 /* E2592C 802B6A5C 4602A03E */ c.le.s $f20, $f2 -/* E25930 802B6A60 00000000 */ nop +/* E25930 802B6A60 00000000 */ nop /* E25934 802B6A64 45000009 */ bc1f .L802B6A8C -/* E25938 802B6A68 00000000 */ nop +/* E25938 802B6A68 00000000 */ nop /* E2593C 802B6A6C 3C014387 */ lui $at, 0x4387 /* E25940 802B6A70 44810000 */ mtc1 $at, $f0 -/* E25944 802B6A74 00000000 */ nop +/* E25944 802B6A74 00000000 */ nop /* E25948 802B6A78 4600103C */ c.lt.s $f2, $f0 /* E2594C 802B6A7C 3C014170 */ lui $at, 0x4170 /* E25950 802B6A80 44810000 */ mtc1 $at, $f0 @@ -167,7 +167,7 @@ glabel func_802B6820_E256F0 .L802B6A8C: /* E2595C 802B6A8C 3C01C170 */ lui $at, 0xc170 /* E25960 802B6A90 44810000 */ mtc1 $at, $f0 -/* E25964 802B6A94 00000000 */ nop +/* E25964 802B6A94 00000000 */ nop /* E25968 802B6A98 4600B580 */ add.s $f22, $f22, $f0 .L802B6A9C: /* E2596C 802B6A9C 27A50020 */ addiu $a1, $sp, 0x20 @@ -177,7 +177,7 @@ glabel func_802B6820_E256F0 /* E25978 802B6AA8 44816000 */ mtc1 $at, $f12 /* E2597C 802B6AAC 27A60024 */ addiu $a2, $sp, 0x24 /* E25980 802B6AB0 460CB302 */ mul.s $f12, $f22, $f12 -/* E25984 802B6AB4 00000000 */ nop +/* E25984 802B6AB4 00000000 */ nop /* E25988 802B6AB8 24110001 */ addiu $s1, $zero, 1 /* E2598C 802B6ABC 27B30030 */ addiu $s3, $sp, 0x30 /* E25990 802B6AC0 3C0143B4 */ lui $at, 0x43b4 @@ -189,13 +189,13 @@ glabel func_802B6820_E256F0 .L802B6AD8: /* E259A8 802B6AD8 C7A40020 */ lwc1 $f4, 0x20($sp) /* E259AC 802B6ADC 44910000 */ mtc1 $s1, $f0 -/* E259B0 802B6AE0 00000000 */ nop +/* E259B0 802B6AE0 00000000 */ nop /* E259B4 802B6AE4 46800020 */ cvt.s.w $f0, $f0 /* E259B8 802B6AE8 46002102 */ mul.s $f4, $f4, $f0 -/* E259BC 802B6AEC 00000000 */ nop +/* E259BC 802B6AEC 00000000 */ nop /* E259C0 802B6AF0 C7A20024 */ lwc1 $f2, 0x24($sp) /* E259C4 802B6AF4 46001082 */ mul.s $f2, $f2, $f0 -/* E259C8 802B6AF8 00000000 */ nop +/* E259C8 802B6AF8 00000000 */ nop /* E259CC 802B6AFC 24040003 */ addiu $a0, $zero, 3 /* E259D0 802B6B00 0240282D */ daddu $a1, $s2, $zero /* E259D4 802B6B04 4604E100 */ add.s $f4, $f28, $f4 @@ -218,25 +218,25 @@ glabel func_802B6820_E256F0 /* E25A18 802B6B48 A6900014 */ sh $s0, 0x14($s4) /* E25A1C 802B6B4C 32024000 */ andi $v0, $s0, 0x4000 /* E25A20 802B6B50 10400004 */ beqz $v0, .L802B6B64 -/* E25A24 802B6B54 00000000 */ nop +/* E25A24 802B6B54 00000000 */ nop /* E25A28 802B6B58 0C04417A */ jal get_entity_by_index /* E25A2C 802B6B5C 0200202D */ daddu $a0, $s0, $zero /* E25A30 802B6B60 A0400007 */ sb $zero, 7($v0) .L802B6B64: /* E25A34 802B6B64 06010005 */ bgez $s0, .L802B6B7C -/* E25A38 802B6B68 00000000 */ nop +/* E25A38 802B6B68 00000000 */ nop .L802B6B6C: /* E25A3C 802B6B6C 26310001 */ addiu $s1, $s1, 1 /* E25A40 802B6B70 2A220010 */ slti $v0, $s1, 0x10 /* E25A44 802B6B74 1440FFD8 */ bnez $v0, .L802B6AD8 -/* E25A48 802B6B78 00000000 */ nop +/* E25A48 802B6B78 00000000 */ nop .L802B6B7C: /* E25A4C 802B6B7C 3C02802B */ lui $v0, %hi(D_802B6DB0) /* E25A50 802B6B80 8C426DB0 */ lw $v0, %lo(D_802B6DB0)($v0) /* E25A54 802B6B84 8C440018 */ lw $a0, 0x18($v0) /* E25A58 802B6B88 24020002 */ addiu $v0, $zero, 2 /* E25A5C 802B6B8C 14820032 */ bne $a0, $v0, .L802B6C58 -/* E25A60 802B6B90 00000000 */ nop +/* E25A60 802B6B90 00000000 */ nop /* E25A64 802B6B94 3C038011 */ lui $v1, %hi(gPlayerData+0x1) /* E25A68 802B6B98 8063F291 */ lb $v1, %lo(gPlayerData+0x1)($v1) /* E25A6C 802B6B9C 14640003 */ bne $v1, $a0, .L802B6BAC @@ -259,9 +259,9 @@ glabel func_802B6820_E256F0 /* E25AA8 802B6BD8 04800007 */ bltz $a0, .L802B6BF8 /* E25AAC 802B6BDC 30424000 */ andi $v0, $v0, 0x4000 /* E25AB0 802B6BE0 10400005 */ beqz $v0, .L802B6BF8 -/* E25AB4 802B6BE4 00000000 */ nop +/* E25AB4 802B6BE4 00000000 */ nop /* E25AB8 802B6BE8 0C04417A */ jal get_entity_by_index -/* E25ABC 802B6BEC 00000000 */ nop +/* E25ABC 802B6BEC 00000000 */ nop /* E25AC0 802B6BF0 080ADB03 */ j .L802B6C0C /* E25AC4 802B6BF4 A0400007 */ sb $zero, 7($v0) .L802B6BF8: @@ -269,7 +269,7 @@ glabel func_802B6820_E256F0 /* E25ACC 802B6BFC 8C426DB0 */ lw $v0, %lo(D_802B6DB0)($v0) /* E25AD0 802B6C00 8C420010 */ lw $v0, 0x10($v0) /* E25AD4 802B6C04 04410014 */ bgez $v0, .L802B6C58 -/* E25AD8 802B6C08 00000000 */ nop +/* E25AD8 802B6C08 00000000 */ nop .L802B6C0C: /* E25ADC 802B6C0C 8E420000 */ lw $v0, ($s2) /* E25AE0 802B6C10 3C030100 */ lui $v1, 0x100 @@ -279,7 +279,7 @@ glabel func_802B6820_E256F0 /* E25AF0 802B6C20 8C426DB0 */ lw $v0, %lo(D_802B6DB0)($v0) /* E25AF4 802B6C24 8C420010 */ lw $v0, 0x10($v0) /* E25AF8 802B6C28 0441000B */ bgez $v0, .L802B6C58 -/* E25AFC 802B6C2C 00000000 */ nop +/* E25AFC 802B6C2C 00000000 */ nop /* E25B00 802B6C30 3C028011 */ lui $v0, %hi(gPlayerData+0x1) /* E25B04 802B6C34 8042F291 */ lb $v0, %lo(gPlayerData+0x1)($v0) /* E25B08 802B6C38 28420002 */ slti $v0, $v0, 2 @@ -295,7 +295,7 @@ glabel func_802B6820_E256F0 /* E25B2C 802B6C5C 14400009 */ bnez $v0, .L802B6C84 /* E25B30 802B6C60 924300B6 */ lbu $v1, 0xb6($s2) /* E25B34 802B6C64 06000007 */ bltz $s0, .L802B6C84 -/* E25B38 802B6C68 00000000 */ nop +/* E25B38 802B6C68 00000000 */ nop /* E25B3C 802B6C6C 3C02802B */ lui $v0, %hi(D_802B6DB0) /* E25B40 802B6C70 8C426DB0 */ lw $v0, %lo(D_802B6DB0)($v0) /* E25B44 802B6C74 8C420014 */ lw $v0, 0x14($v0) @@ -306,7 +306,7 @@ glabel func_802B6820_E256F0 /* E25B54 802B6C84 824300B6 */ lb $v1, 0xb6($s2) /* E25B58 802B6C88 24020001 */ addiu $v0, $zero, 1 /* E25B5C 802B6C8C 14620004 */ bne $v1, $v0, .L802B6CA0 -/* E25B60 802B6C90 00000000 */ nop +/* E25B60 802B6C90 00000000 */ nop /* E25B64 802B6C94 06010002 */ bgez $s0, .L802B6CA0 /* E25B68 802B6C98 24020002 */ addiu $v0, $zero, 2 /* E25B6C 802B6C9C A24200B6 */ sb $v0, 0xb6($s2) @@ -334,12 +334,12 @@ glabel func_802B6820_E256F0 /* E25BB8 802B6CE8 964400BC */ lhu $a0, 0xbc($s2) /* E25BBC 802B6CEC 24020001 */ addiu $v0, $zero, 1 /* E25BC0 802B6CF0 14820020 */ bne $a0, $v0, .L802B6D74 -/* E25BC4 802B6CF4 00000000 */ nop +/* E25BC4 802B6CF4 00000000 */ nop /* E25BC8 802B6CF8 8CA30000 */ lw $v1, ($a1) /* E25BCC 802B6CFC 8C620018 */ lw $v0, 0x18($v1) /* E25BD0 802B6D00 28420007 */ slti $v0, $v0, 7 /* E25BD4 802B6D04 14400005 */ bnez $v0, .L802B6D1C -/* E25BD8 802B6D08 00000000 */ nop +/* E25BD8 802B6D08 00000000 */ nop /* E25BDC 802B6D0C 8E4200E0 */ lw $v0, 0xe0($s2) /* E25BE0 802B6D10 30424000 */ andi $v0, $v0, 0x4000 /* E25BE4 802B6D14 54400001 */ bnel $v0, $zero, .L802B6D1C @@ -383,5 +383,5 @@ glabel func_802B6820_E256F0 /* E25C6C 802B6D9C D7B40050 */ ldc1 $f20, 0x50($sp) /* E25C70 802B6DA0 03E00008 */ jr $ra /* E25C74 802B6DA4 27BD0078 */ addiu $sp, $sp, 0x78 -/* E25C78 802B6DA8 00000000 */ nop -/* E25C7C 802B6DAC 00000000 */ nop +/* E25C78 802B6DA8 00000000 */ nop +/* E25C7C 802B6DAC 00000000 */ nop diff --git a/asm/nonmatchings/code_E26710/func_802B6000_E26710.s b/asm/nonmatchings/code_E26710/func_802B6000_E26710.s index 929fc289a6..71539696c0 100644 --- a/asm/nonmatchings/code_E26710/func_802B6000_E26710.s +++ b/asm/nonmatchings/code_E26710/func_802B6000_E26710.s @@ -40,7 +40,7 @@ glabel func_802B6000_E26710 /* E2679C 802B608C 0C037FDE */ jal func_800DFF78 /* E267A0 802B6090 E606007C */ swc1 $f6, 0x7c($s0) /* E267A4 802B6094 0C03805E */ jal disable_player_input -/* E267A8 802B6098 00000000 */ nop +/* E267A8 802B6098 00000000 */ nop /* E267AC 802B609C 8E020000 */ lw $v0, ($s0) /* E267B0 802B60A0 3C04800B */ lui $a0, %hi(gCameras) /* E267B4 802B60A4 24841D80 */ addiu $a0, $a0, %lo(gCameras) @@ -68,32 +68,32 @@ glabel func_802B6000_E26710 /* E2680C 802B60FC 3C01C270 */ lui $at, 0xc270 /* E26810 802B6100 44812000 */ mtc1 $at, $f4 /* E26814 802B6104 4602003E */ c.le.s $f0, $f2 -/* E26818 802B6108 00000000 */ nop +/* E26818 802B6108 00000000 */ nop /* E2681C 802B610C 45020005 */ bc1fl .L802B6124 /* E26820 802B6110 E60400D4 */ swc1 $f4, 0xd4($s0) /* E26824 802B6114 3C014270 */ lui $at, 0x4270 /* E26828 802B6118 44812000 */ mtc1 $at, $f4 -/* E2682C 802B611C 00000000 */ nop +/* E2682C 802B611C 00000000 */ nop /* E26830 802B6120 E60400D4 */ swc1 $f4, 0xd4($s0) .L802B6124: /* E26834 802B6124 820200B6 */ lb $v0, 0xb6($s0) /* E26838 802B6128 28420004 */ slti $v0, $v0, 4 /* E2683C 802B612C 1040001E */ beqz $v0, .L802B61A8 -/* E26840 802B6130 00000000 */ nop +/* E26840 802B6130 00000000 */ nop /* E26844 802B6134 C60200D4 */ lwc1 $f2, 0xd4($s0) /* E26848 802B6138 44802000 */ mtc1 $zero, $f4 -/* E2684C 802B613C 00000000 */ nop +/* E2684C 802B613C 00000000 */ nop /* E26850 802B6140 4602203E */ c.le.s $f4, $f2 -/* E26854 802B6144 00000000 */ nop +/* E26854 802B6144 00000000 */ nop /* E26858 802B6148 4500000C */ bc1f .L802B617C -/* E2685C 802B614C 00000000 */ nop +/* E2685C 802B614C 00000000 */ nop /* E26860 802B6150 C60000A8 */ lwc1 $f0, 0xa8($s0) /* E26864 802B6154 46020000 */ add.s $f0, $f0, $f2 /* E26868 802B6158 3C0143B4 */ lui $at, 0x43b4 /* E2686C 802B615C 44811000 */ mtc1 $at, $f2 -/* E26870 802B6160 00000000 */ nop +/* E26870 802B6160 00000000 */ nop /* E26874 802B6164 4600103E */ c.le.s $f2, $f0 -/* E26878 802B6168 00000000 */ nop +/* E26878 802B6168 00000000 */ nop /* E2687C 802B616C 4500000E */ bc1f .L802B61A8 /* E26880 802B6170 E60000A8 */ swc1 $f0, 0xa8($s0) /* E26884 802B6174 080AD869 */ j .L802B61A4 @@ -102,23 +102,23 @@ glabel func_802B6000_E26710 /* E2688C 802B617C C60000A8 */ lwc1 $f0, 0xa8($s0) /* E26890 802B6180 46020080 */ add.s $f2, $f0, $f2 /* E26894 802B6184 4604103C */ c.lt.s $f2, $f4 -/* E26898 802B6188 00000000 */ nop +/* E26898 802B6188 00000000 */ nop /* E2689C 802B618C 45000006 */ bc1f .L802B61A8 /* E268A0 802B6190 E60200A8 */ swc1 $f2, 0xa8($s0) /* E268A4 802B6194 3C0143B4 */ lui $at, 0x43b4 /* E268A8 802B6198 44810000 */ mtc1 $at, $f0 -/* E268AC 802B619C 00000000 */ nop +/* E268AC 802B619C 00000000 */ nop /* E268B0 802B61A0 46001000 */ add.s $f0, $f2, $f0 .L802B61A4: /* E268B4 802B61A4 E60000A8 */ swc1 $f0, 0xa8($s0) .L802B61A8: /* E268B8 802B61A8 C6020070 */ lwc1 $f2, 0x70($s0) /* E268BC 802B61AC 44800000 */ mtc1 $zero, $f0 -/* E268C0 802B61B0 00000000 */ nop +/* E268C0 802B61B0 00000000 */ nop /* E268C4 802B61B4 4600103E */ c.le.s $f2, $f0 -/* E268C8 802B61B8 00000000 */ nop +/* E268C8 802B61B8 00000000 */ nop /* E268CC 802B61BC 45000009 */ bc1f .L802B61E4 -/* E268D0 802B61C0 00000000 */ nop +/* E268D0 802B61C0 00000000 */ nop /* E268D4 802B61C4 3C028011 */ lui $v0, %hi(D_8010C944) /* E268D8 802B61C8 8C42C944 */ lw $v0, %lo(D_8010C944)($v0) /* E268DC 802B61CC C600002C */ lwc1 $f0, 0x2c($s0) @@ -148,13 +148,14 @@ glabel func_802B6000_E26710 /* E26934 802B6224 2C62000D */ sltiu $v0, $v1, 0xd /* E26938 802B6228 104000DE */ beqz $v0, .L802B65A4 /* E2693C 802B622C 00031080 */ sll $v0, $v1, 2 -/* E26940 802B6230 3C01802B */ lui $at, %hi(D_802B6690) +/* E26940 802B6230 3C01802B */ lui $at, %hi(jtbl_802B6690_E26DA0) /* E26944 802B6234 00220821 */ addu $at, $at, $v0 -/* E26948 802B6238 8C226690 */ lw $v0, %lo(D_802B6690)($at) +/* E26948 802B6238 8C226690 */ lw $v0, %lo(jtbl_802B6690_E26DA0)($at) /* E2694C 802B623C 00400008 */ jr $v0 -/* E26950 802B6240 00000000 */ nop +/* E26950 802B6240 00000000 */ nop +glabel L802B6244_E26954 /* E26954 802B6244 0C038D12 */ jal integrate_gravity -/* E26958 802B6248 00000000 */ nop +/* E26958 802B6248 00000000 */ nop /* E2695C 802B624C 46000506 */ mov.s $f20, $f0 /* E26960 802B6250 4600A306 */ mov.s $f12, $f20 /* E26964 802B6254 0C038D45 */ jal func_800E3514 @@ -171,7 +172,7 @@ glabel func_802B6000_E26710 /* E26990 802B6280 2442FFF9 */ addiu $v0, $v0, -7 /* E26994 802B6284 2C420002 */ sltiu $v0, $v0, 2 /* E26998 802B6288 1040000A */ beqz $v0, .L802B62B4 -/* E2699C 802B628C 00000000 */ nop +/* E2699C 802B628C 00000000 */ nop /* E269A0 802B6290 0C04417A */ jal get_entity_by_index /* E269A4 802B6294 86240002 */ lh $a0, 2($s1) /* E269A8 802B6298 90430006 */ lbu $v1, 6($v0) @@ -183,13 +184,13 @@ glabel func_802B6000_E26710 /* E269C0 802B62B0 A20200B6 */ sb $v0, 0xb6($s0) .L802B62B4: /* E269C4 802B62B4 44800000 */ mtc1 $zero, $f0 -/* E269C8 802B62B8 00000000 */ nop +/* E269C8 802B62B8 00000000 */ nop /* E269CC 802B62BC 4600A03E */ c.le.s $f20, $f0 -/* E269D0 802B62C0 00000000 */ nop +/* E269D0 802B62C0 00000000 */ nop /* E269D4 802B62C4 4500000E */ bc1f .L802B6300 -/* E269D8 802B62C8 00000000 */ nop +/* E269D8 802B62C8 00000000 */ nop /* E269DC 802B62CC 0C0389AC */ jal func_800E26B0 -/* E269E0 802B62D0 00000000 */ nop +/* E269E0 802B62D0 00000000 */ nop /* E269E4 802B62D4 24040147 */ addiu $a0, $zero, 0x147 /* E269E8 802B62D8 0000282D */ daddu $a1, $zero, $zero /* E269EC 802B62DC 24020003 */ addiu $v0, $zero, 3 @@ -212,28 +213,30 @@ glabel func_802B6000_E26710 /* E26A2C 802B631C 0C039769 */ jal set_action_state /* E26A30 802B6320 AE020000 */ sw $v0, ($s0) /* E26A34 802B6324 080AD969 */ j .L802B65A4 -/* E26A38 802B6328 00000000 */ nop +/* E26A38 802B6328 00000000 */ nop +glabel L802B632C_E26A3C /* E26A3C 802B632C 96020008 */ lhu $v0, 8($s0) /* E26A40 802B6330 2442FFFF */ addiu $v0, $v0, -1 /* E26A44 802B6334 A6020008 */ sh $v0, 8($s0) /* E26A48 802B6338 00021400 */ sll $v0, $v0, 0x10 /* E26A4C 802B633C 1C400099 */ bgtz $v0, .L802B65A4 -/* E26A50 802B6340 00000000 */ nop +/* E26A50 802B6340 00000000 */ nop /* E26A54 802B6344 920200B6 */ lbu $v0, 0xb6($s0) /* E26A58 802B6348 24420001 */ addiu $v0, $v0, 1 /* E26A5C 802B634C 080AD969 */ j .L802B65A4 /* E26A60 802B6350 A20200B6 */ sb $v0, 0xb6($s0) +glabel L802B6354_E26A64 /* E26A64 802B6354 0C038D12 */ jal integrate_gravity -/* E26A68 802B6358 00000000 */ nop +/* E26A68 802B6358 00000000 */ nop /* E26A6C 802B635C 46000506 */ mov.s $f20, $f0 /* E26A70 802B6360 4600A306 */ mov.s $f12, $f20 /* E26A74 802B6364 0C038D45 */ jal func_800E3514 /* E26A78 802B6368 27A50010 */ addiu $a1, $sp, 0x10 /* E26A7C 802B636C 3C01C2C8 */ lui $at, 0xc2c8 /* E26A80 802B6370 44811000 */ mtc1 $at, $f2 -/* E26A84 802B6374 00000000 */ nop +/* E26A84 802B6374 00000000 */ nop /* E26A88 802B6378 4602A03C */ c.lt.s $f20, $f2 -/* E26A8C 802B637C 00000000 */ nop +/* E26A8C 802B637C 00000000 */ nop /* E26A90 802B6380 45000005 */ bc1f .L802B6398 /* E26A94 802B6384 E600002C */ swc1 $f0, 0x2c($s0) /* E26A98 802B6388 AE00007C */ sw $zero, 0x7c($s0) @@ -243,7 +246,7 @@ glabel func_802B6000_E26710 .L802B6398: /* E26AA8 802B6398 8FA20010 */ lw $v0, 0x10($sp) /* E26AAC 802B639C 04400081 */ bltz $v0, .L802B65A4 -/* E26AB0 802B63A0 00000000 */ nop +/* E26AB0 802B63A0 00000000 */ nop /* E26AB4 802B63A4 96240002 */ lhu $a0, 2($s1) /* E26AB8 802B63A8 30824000 */ andi $v0, $a0, 0x4000 /* E26ABC 802B63AC 1040002D */ beqz $v0, .L802B6464 @@ -262,7 +265,7 @@ glabel func_802B6000_E26710 /* E26AF0 802B63E0 0C039769 */ jal set_action_state /* E26AF4 802B63E4 AE020000 */ sw $v0, ($s0) /* E26AF8 802B63E8 080AD978 */ j .L802B65E0 -/* E26AFC 802B63EC 00000000 */ nop +/* E26AFC 802B63EC 00000000 */ nop .L802B63F0: /* E26B00 802B63F0 2462FFF9 */ addiu $v0, $v1, -7 /* E26B04 802B63F4 2C420002 */ sltiu $v0, $v0, 2 @@ -296,7 +299,7 @@ glabel func_802B6000_E26710 .L802B6464: /* E26B74 802B6464 8FA40010 */ lw $a0, 0x10($sp) /* E26B78 802B6468 0C016F6A */ jal get_collider_type_by_id -/* E26B7C 802B646C 00000000 */ nop +/* E26B7C 802B646C 00000000 */ nop /* E26B80 802B6470 304300FF */ andi $v1, $v0, 0xff /* E26B84 802B6474 24020003 */ addiu $v0, $zero, 3 /* E26B88 802B6478 1462000E */ bne $v1, $v0, .L802B64B4 @@ -353,6 +356,7 @@ glabel func_802B6000_E26710 /* E26C4C 802B653C E4800008 */ swc1 $f0, 8($a0) /* E26C50 802B6540 080AD969 */ j .L802B65A4 /* E26C54 802B6544 AE030000 */ sw $v1, ($s0) +glabel L802B6548_E26C58 /* E26C58 802B6548 96020008 */ lhu $v0, 8($s0) /* E26C5C 802B654C 2442FFFF */ addiu $v0, $v0, -1 /* E26C60 802B6550 A6020008 */ sh $v0, 8($s0) @@ -369,7 +373,8 @@ glabel func_802B6000_E26710 /* E26C8C 802B657C 0C039769 */ jal set_action_state /* E26C90 802B6580 AE050000 */ sw $a1, ($s0) /* E26C94 802B6584 080AD969 */ j .L802B65A4 -/* E26C98 802B6588 00000000 */ nop +/* E26C98 802B6588 00000000 */ nop +glabel L802B658C_E26C9C /* E26C9C 802B658C 0C039769 */ jal set_action_state /* E26CA0 802B6590 24040007 */ addiu $a0, $zero, 7 /* E26CA4 802B6594 920200B6 */ lbu $v0, 0xb6($s0) @@ -377,15 +382,16 @@ glabel func_802B6000_E26710 /* E26CAC 802B659C 0C038069 */ jal enable_player_input /* E26CB0 802B65A0 A20200B6 */ sb $v0, 0xb6($s0) .L802B65A4: +glabel L802B65A4_E26CB4 /* E26CB4 802B65A4 C6020070 */ lwc1 $f2, 0x70($s0) /* E26CB8 802B65A8 44800000 */ mtc1 $zero, $f0 -/* E26CBC 802B65AC 00000000 */ nop +/* E26CBC 802B65AC 00000000 */ nop /* E26CC0 802B65B0 4600103C */ c.lt.s $f2, $f0 -/* E26CC4 802B65B4 00000000 */ nop +/* E26CC4 802B65B4 00000000 */ nop /* E26CC8 802B65B8 45000009 */ bc1f .L802B65E0 -/* E26CCC 802B65BC 00000000 */ nop +/* E26CCC 802B65BC 00000000 */ nop /* E26CD0 802B65C0 0C0AD97E */ jal func_802B65F8_E26D08 -/* E26CD4 802B65C4 00000000 */ nop +/* E26CD4 802B65C4 00000000 */ nop /* E26CD8 802B65C8 04400005 */ bltz $v0, .L802B65E0 /* E26CDC 802B65CC AFA20010 */ sw $v0, 0x10($sp) /* E26CE0 802B65D0 97A30012 */ lhu $v1, 0x12($sp) diff --git a/asm/nonmatchings/code_E26710/func_802B65F8_E26D08.s b/asm/nonmatchings/code_E26710/func_802B65F8_E26D08.s index 8b075a98ea..9ebc0c4fc0 100644 --- a/asm/nonmatchings/code_E26710/func_802B65F8_E26D08.s +++ b/asm/nonmatchings/code_E26710/func_802B65F8_E26D08.s @@ -14,10 +14,10 @@ glabel func_802B65F8_E26D08 /* E26D2C 802B661C 44811000 */ mtc1 $at, $f2 /* E26D30 802B6620 C4800028 */ lwc1 $f0, 0x28($a0) /* E26D34 802B6624 44823000 */ mtc1 $v0, $f6 -/* E26D38 802B6628 00000000 */ nop +/* E26D38 802B6628 00000000 */ nop /* E26D3C 802B662C 468031A0 */ cvt.s.w $f6, $f6 /* E26D40 802B6630 46023082 */ mul.s $f2, $f6, $f2 -/* E26D44 802B6634 00000000 */ nop +/* E26D44 802B6634 00000000 */ nop /* E26D48 802B6638 27A20034 */ addiu $v0, $sp, 0x34 /* E26D4C 802B663C E7A00028 */ swc1 $f0, 0x28($sp) /* E26D50 802B6640 C480002C */ lwc1 $f0, 0x2c($a0) @@ -39,4 +39,4 @@ glabel func_802B65F8_E26D08 /* E26D90 802B6680 8FBF0048 */ lw $ra, 0x48($sp) /* E26D94 802B6684 03E00008 */ jr $ra /* E26D98 802B6688 27BD0050 */ addiu $sp, $sp, 0x50 -/* E26D9C 802B668C 00000000 */ nop +/* E26D9C 802B668C 00000000 */ nop diff --git a/asm/nonmatchings/code_E26DE0/func_802B6000_E26DE0.s b/asm/nonmatchings/code_E26DE0/func_802B6000_E26DE0.s index 514c4c91f3..221b4de272 100644 --- a/asm/nonmatchings/code_E26DE0/func_802B6000_E26DE0.s +++ b/asm/nonmatchings/code_E26DE0/func_802B6000_E26DE0.s @@ -32,7 +32,7 @@ glabel func_802B6000_E26DE0 /* E26E4C 802B606C 0C037FBF */ jal func_800DFEFC /* E26E50 802B6070 E6000070 */ swc1 $f0, 0x70($s0) /* E26E54 802B6074 0C03805E */ jal disable_player_input -/* E26E58 802B6078 00000000 */ nop +/* E26E58 802B6078 00000000 */ nop /* E26E5C 802B607C 24040146 */ addiu $a0, $zero, 0x146 /* E26E60 802B6080 0000282D */ daddu $a1, $zero, $zero /* E26E64 802B6084 3C06800B */ lui $a2, %hi(gCameras) @@ -50,11 +50,12 @@ glabel func_802B6000_E26DE0 /* E26E90 802B60B0 10400146 */ beqz $v0, .L802B65CC /* E26E94 802B60B4 0000902D */ daddu $s2, $zero, $zero /* E26E98 802B60B8 00031080 */ sll $v0, $v1, 2 -/* E26E9C 802B60BC 3C01802B */ lui $at, %hi(D_802B66E0) +/* E26E9C 802B60BC 3C01802B */ lui $at, %hi(jtbl_802B66E0_E274C0) /* E26EA0 802B60C0 00220821 */ addu $at, $at, $v0 -/* E26EA4 802B60C4 8C2266E0 */ lw $v0, %lo(D_802B66E0)($at) +/* E26EA4 802B60C4 8C2266E0 */ lw $v0, %lo(jtbl_802B66E0_E274C0)($at) /* E26EA8 802B60C8 00400008 */ jr $v0 -/* E26EAC 802B60CC 00000000 */ nop +/* E26EAC 802B60CC 00000000 */ nop +glabel L802B60D0_E26EB0 /* E26EB0 802B60D0 3C014220 */ lui $at, 0x4220 /* E26EB4 802B60D4 44811000 */ mtc1 $at, $f2 /* E26EB8 802B60D8 C600008C */ lwc1 $f0, 0x8c($s0) @@ -64,18 +65,18 @@ glabel func_802B6000_E26DE0 /* E26EC8 802B60E8 3C01802B */ lui $at, %hi(D_802B6730) /* E26ECC 802B60EC E4226730 */ swc1 $f2, %lo(D_802B6730)($at) /* E26ED0 802B60F0 4600203E */ c.le.s $f4, $f0 -/* E26ED4 802B60F4 00000000 */ nop +/* E26ED4 802B60F4 00000000 */ nop /* E26ED8 802B60F8 45000002 */ bc1f .L802B6104 /* E26EDC 802B60FC E600008C */ swc1 $f0, 0x8c($s0) /* E26EE0 802B6100 E604008C */ swc1 $f4, 0x8c($s0) .L802B6104: /* E26EE4 802B6104 C6040070 */ lwc1 $f4, 0x70($s0) /* E26EE8 802B6108 44800000 */ mtc1 $zero, $f0 -/* E26EEC 802B610C 00000000 */ nop +/* E26EEC 802B610C 00000000 */ nop /* E26EF0 802B6110 4604003E */ c.le.s $f0, $f4 -/* E26EF4 802B6114 00000000 */ nop +/* E26EF4 802B6114 00000000 */ nop /* E26EF8 802B6118 45000023 */ bc1f .L802B61A8 -/* E26EFC 802B611C 00000000 */ nop +/* E26EFC 802B611C 00000000 */ nop /* E26F00 802B6120 3C01802B */ lui $at, %hi(D_802B6718) /* E26F04 802B6124 D4226718 */ ldc1 $f2, %lo(D_802B6718)($at) /* E26F08 802B6128 46002021 */ cvt.d.s $f0, $f4 @@ -91,21 +92,21 @@ glabel func_802B6000_E26DE0 /* E26F30 802B6150 46020000 */ add.s $f0, $f0, $f2 .L802B6154: /* E26F34 802B6154 10400014 */ beqz $v0, .L802B61A8 -/* E26F38 802B6158 00000000 */ nop +/* E26F38 802B6158 00000000 */ nop /* E26F3C 802B615C 0C04417A */ jal get_entity_by_index -/* E26F40 802B6160 00000000 */ nop +/* E26F40 802B6160 00000000 */ nop /* E26F44 802B6164 0040182D */ daddu $v1, $v0, $zero /* E26F48 802B6168 1060000F */ beqz $v1, .L802B61A8 -/* E26F4C 802B616C 00000000 */ nop +/* E26F4C 802B616C 00000000 */ nop /* E26F50 802B6170 860200B0 */ lh $v0, 0xb0($s0) /* E26F54 802B6174 3C013FE0 */ lui $at, 0x3fe0 /* E26F58 802B6178 44810800 */ mtc1 $at, $f1 /* E26F5C 802B617C 44800000 */ mtc1 $zero, $f0 /* E26F60 802B6180 44821000 */ mtc1 $v0, $f2 -/* E26F64 802B6184 00000000 */ nop +/* E26F64 802B6184 00000000 */ nop /* E26F68 802B6188 468010A1 */ cvt.d.w $f2, $f2 /* E26F6C 802B618C 46201082 */ mul.d $f2, $f2, $f0 -/* E26F70 802B6190 00000000 */ nop +/* E26F70 802B6190 00000000 */ nop /* E26F74 802B6194 C460004C */ lwc1 $f0, 0x4c($v1) /* E26F78 802B6198 46000021 */ cvt.d.s $f0, $f0 /* E26F7C 802B619C 46220001 */ sub.d $f0, $f0, $f2 @@ -116,16 +117,16 @@ glabel func_802B6000_E26DE0 /* E26F88 802B61A8 C602008C */ lwc1 $f2, 0x8c($s0) /* E26F8C 802B61AC 3C0143B4 */ lui $at, 0x43b4 /* E26F90 802B61B0 44810000 */ mtc1 $at, $f0 -/* E26F94 802B61B4 00000000 */ nop +/* E26F94 802B61B4 00000000 */ nop /* E26F98 802B61B8 46001032 */ c.eq.s $f2, $f0 -/* E26F9C 802B61BC 00000000 */ nop +/* E26F9C 802B61BC 00000000 */ nop /* E26FA0 802B61C0 4500000F */ bc1f .L802B6200 /* E26FA4 802B61C4 2402FFFF */ addiu $v0, $zero, -1 /* E26FA8 802B61C8 C6020070 */ lwc1 $f2, 0x70($s0) /* E26FAC 802B61CC 44800000 */ mtc1 $zero, $f0 -/* E26FB0 802B61D0 00000000 */ nop +/* E26FB0 802B61D0 00000000 */ nop /* E26FB4 802B61D4 4600103E */ c.le.s $f2, $f0 -/* E26FB8 802B61D8 00000000 */ nop +/* E26FB8 802B61D8 00000000 */ nop /* E26FBC 802B61DC 45000007 */ bc1f .L802B61FC /* E26FC0 802B61E0 24020005 */ addiu $v0, $zero, 5 /* E26FC4 802B61E4 3C014000 */ lui $at, 0x4000 @@ -139,13 +140,14 @@ glabel func_802B6000_E26DE0 .L802B6200: /* E26FE0 802B6200 080AD973 */ j .L802B65CC /* E26FE4 802B6204 A6220008 */ sh $v0, 8($s1) +glabel L802B6208_E26FE8 /* E26FE8 802B6208 C6020070 */ lwc1 $f2, 0x70($s0) /* E26FEC 802B620C 44800000 */ mtc1 $zero, $f0 -/* E26FF0 802B6210 00000000 */ nop +/* E26FF0 802B6210 00000000 */ nop /* E26FF4 802B6214 4602003E */ c.le.s $f0, $f2 -/* E26FF8 802B6218 00000000 */ nop +/* E26FF8 802B6218 00000000 */ nop /* E26FFC 802B621C 4500000C */ bc1f .L802B6250 -/* E27000 802B6220 00000000 */ nop +/* E27000 802B6220 00000000 */ nop /* E27004 802B6224 3C01802B */ lui $at, %hi(D_802B6720) /* E27008 802B6228 D4206720 */ ldc1 $f0, %lo(D_802B6720)($at) /* E2700C 802B622C 460010A1 */ cvt.d.s $f2, $f2 @@ -163,11 +165,12 @@ glabel func_802B6000_E26DE0 /* E27038 802B6258 A6020008 */ sh $v0, 8($s0) /* E2703C 802B625C 00021400 */ sll $v0, $v0, 0x10 /* E27040 802B6260 1C4000DA */ bgtz $v0, .L802B65CC -/* E27044 802B6264 00000000 */ nop +/* E27044 802B6264 00000000 */ nop /* E27048 802B6268 920200B6 */ lbu $v0, 0xb6($s0) /* E2704C 802B626C 24420001 */ addiu $v0, $v0, 1 /* E27050 802B6270 080AD973 */ j .L802B65CC /* E27054 802B6274 A20200B6 */ sb $v0, 0xb6($s0) +glabel L802B6278_E27058 /* E27058 802B6278 4480A000 */ mtc1 $zero, $f20 /* E2705C 802B627C 27A50010 */ addiu $a1, $sp, 0x10 /* E27060 802B6280 0C038D45 */ jal func_800E3514 @@ -183,7 +186,7 @@ glabel func_802B6000_E26DE0 /* E27088 802B62A8 D4226728 */ ldc1 $f2, %lo(D_802B6728)($at) /* E2708C 802B62AC 46002021 */ cvt.d.s $f0, $f4 /* E27090 802B62B0 4620103E */ c.le.d $f2, $f0 -/* E27094 802B62B4 00000000 */ nop +/* E27094 802B62B4 00000000 */ nop /* E27098 802B62B8 450000C4 */ bc1f .L802B65CC /* E2709C 802B62BC E604008C */ swc1 $f4, 0x8c($s0) /* E270A0 802B62C0 3C040001 */ lui $a0, 1 @@ -208,18 +211,19 @@ glabel func_802B6000_E26DE0 /* E270EC 802B630C 0C037FBF */ jal func_800DFEFC /* E270F0 802B6310 E6040070 */ swc1 $f4, 0x70($s0) /* E270F4 802B6314 080AD973 */ j .L802B65CC -/* E270F8 802B6318 00000000 */ nop +/* E270F8 802B6318 00000000 */ nop +glabel L802B631C_E270FC /* E270FC 802B631C 0C038D36 */ jal func_800E34D8 -/* E27100 802B6320 00000000 */ nop +/* E27100 802B6320 00000000 */ nop /* E27104 802B6324 46000506 */ mov.s $f20, $f0 /* E27108 802B6328 4600A306 */ mov.s $f12, $f20 /* E2710C 802B632C 0C038D45 */ jal func_800E3514 /* E27110 802B6330 27A50010 */ addiu $a1, $sp, 0x10 /* E27114 802B6334 3C01C2C8 */ lui $at, 0xc2c8 /* E27118 802B6338 44811000 */ mtc1 $at, $f2 -/* E2711C 802B633C 00000000 */ nop +/* E2711C 802B633C 00000000 */ nop /* E27120 802B6340 4602A03C */ c.lt.s $f20, $f2 -/* E27124 802B6344 00000000 */ nop +/* E27124 802B6344 00000000 */ nop /* E27128 802B6348 45000005 */ bc1f .L802B6360 /* E2712C 802B634C E600002C */ swc1 $f0, 0x2c($s0) /* E27130 802B6350 AE00007C */ sw $zero, 0x7c($s0) @@ -229,7 +233,7 @@ glabel func_802B6000_E26DE0 .L802B6360: /* E27140 802B6360 8FA20010 */ lw $v0, 0x10($sp) /* E27144 802B6364 04400099 */ bltz $v0, .L802B65CC -/* E27148 802B6368 00000000 */ nop +/* E27148 802B6368 00000000 */ nop /* E2714C 802B636C 96240002 */ lhu $a0, 2($s1) /* E27150 802B6370 30824000 */ andi $v0, $a0, 0x4000 /* E27154 802B6374 10400013 */ beqz $v0, .L802B63C4 @@ -239,7 +243,7 @@ glabel func_802B6000_E26DE0 /* E27164 802B6384 2442FFF9 */ addiu $v0, $v0, -7 /* E27168 802B6388 2C420002 */ sltiu $v0, $v0, 2 /* E2716C 802B638C 1040000D */ beqz $v0, .L802B63C4 -/* E27170 802B6390 00000000 */ nop +/* E27170 802B6390 00000000 */ nop /* E27174 802B6394 0C04417A */ jal get_entity_by_index /* E27178 802B6398 86240002 */ lh $a0, 2($s1) /* E2717C 802B639C 90430006 */ lbu $v1, 6($v0) @@ -255,7 +259,7 @@ glabel func_802B6000_E26DE0 .L802B63C4: /* E271A4 802B63C4 8FA40010 */ lw $a0, 0x10($sp) /* E271A8 802B63C8 0C016F6A */ jal get_collider_type_by_id -/* E271AC 802B63CC 00000000 */ nop +/* E271AC 802B63CC 00000000 */ nop /* E271B0 802B63D0 304300FF */ andi $v1, $v0, 0xff /* E271B4 802B63D4 24020003 */ addiu $v0, $zero, 3 /* E271B8 802B63D8 54620009 */ bnel $v1, $v0, .L802B6400 @@ -326,17 +330,18 @@ glabel func_802B6000_E26DE0 /* E272B0 802B64D0 E4800008 */ swc1 $f0, 8($a0) /* E272B4 802B64D4 080AD973 */ j .L802B65CC /* E272B8 802B64D8 AE030000 */ sw $v1, ($s0) +glabel L802B64DC_E272BC /* E272BC 802B64DC 0C038D12 */ jal integrate_gravity -/* E272C0 802B64E0 00000000 */ nop +/* E272C0 802B64E0 00000000 */ nop /* E272C4 802B64E4 4480B000 */ mtc1 $zero, $f22 /* E272C8 802B64E8 46000506 */ mov.s $f20, $f0 /* E272CC 802B64EC 4616A032 */ c.eq.s $f20, $f22 -/* E272D0 802B64F0 00000000 */ nop +/* E272D0 802B64F0 00000000 */ nop /* E272D4 802B64F4 45030035 */ bc1tl .L802B65CC /* E272D8 802B64F8 24120001 */ addiu $s2, $zero, 1 /* E272DC 802B64FC C6000070 */ lwc1 $f0, 0x70($s0) /* E272E0 802B6500 4600B03C */ c.lt.s $f22, $f0 -/* E272E4 802B6504 00000000 */ nop +/* E272E4 802B6504 00000000 */ nop /* E272E8 802B6508 45000005 */ bc1f .L802B6520 /* E272EC 802B650C 4600A306 */ mov.s $f12, $f20 /* E272F0 802B6510 C600002C */ lwc1 $f0, 0x2c($s0) @@ -348,12 +353,12 @@ glabel func_802B6000_E26DE0 /* E27304 802B6524 27A50010 */ addiu $a1, $sp, 0x10 /* E27308 802B6528 C6020070 */ lwc1 $f2, 0x70($s0) /* E2730C 802B652C 4616103C */ c.lt.s $f2, $f22 -/* E27310 802B6530 00000000 */ nop +/* E27310 802B6530 00000000 */ nop /* E27314 802B6534 45000007 */ bc1f .L802B6554 /* E27318 802B6538 E600002C */ swc1 $f0, 0x2c($s0) /* E2731C 802B653C 8FA20010 */ lw $v0, 0x10($sp) /* E27320 802B6540 04400004 */ bltz $v0, .L802B6554 -/* E27324 802B6544 00000000 */ nop +/* E27324 802B6544 00000000 */ nop /* E27328 802B6548 920200B6 */ lbu $v0, 0xb6($s0) /* E2732C 802B654C 24420001 */ addiu $v0, $v0, 1 /* E27330 802B6550 A20200B6 */ sb $v0, 0xb6($s0) @@ -363,6 +368,7 @@ glabel func_802B6000_E26DE0 /* E2733C 802B655C 27A50010 */ addiu $a1, $sp, 0x10 /* E27340 802B6560 080AD973 */ j .L802B65CC /* E27344 802B6564 E600002C */ swc1 $f0, 0x2c($s0) +glabel L802B6568_E27348 /* E27348 802B6568 4480A000 */ mtc1 $zero, $f20 /* E2734C 802B656C 27A50010 */ addiu $a1, $sp, 0x10 /* E27350 802B6570 0C038D45 */ jal func_800E3514 @@ -375,14 +381,16 @@ glabel func_802B6000_E26DE0 /* E2736C 802B658C E6140078 */ swc1 $f20, 0x78($s0) /* E27370 802B6590 E614007C */ swc1 $f20, 0x7c($s0) .L802B6594: +glabel L802B6594_E27374 /* E27374 802B6594 92020280 */ lbu $v0, 0x280($s0) /* E27378 802B6598 2442FFFF */ addiu $v0, $v0, -1 /* E2737C 802B659C A2020280 */ sb $v0, 0x280($s0) /* E27380 802B65A0 00021600 */ sll $v0, $v0, 0x18 /* E27384 802B65A4 1C400009 */ bgtz $v0, .L802B65CC -/* E27388 802B65A8 00000000 */ nop +/* E27388 802B65A8 00000000 */ nop /* E2738C 802B65AC 080AD973 */ j .L802B65CC /* E27390 802B65B0 24120001 */ addiu $s2, $zero, 1 +glabel L802B65B4_E27394 /* E27394 802B65B4 0C039769 */ jal set_action_state /* E27398 802B65B8 24040007 */ addiu $a0, $zero, 7 /* E2739C 802B65BC 920200B6 */ lbu $v0, 0xb6($s0) @@ -390,8 +398,9 @@ glabel func_802B6000_E26DE0 /* E273A4 802B65C4 0C038069 */ jal enable_player_input /* E273A8 802B65C8 A20200B6 */ sb $v0, 0xb6($s0) .L802B65CC: +glabel L802B65CC_E273AC /* E273AC 802B65CC 12400007 */ beqz $s2, .L802B65EC -/* E273B0 802B65D0 00000000 */ nop +/* E273B0 802B65D0 00000000 */ nop /* E273B4 802B65D4 0C039769 */ jal set_action_state /* E273B8 802B65D8 2404000A */ addiu $a0, $zero, 0xa /* E273BC 802B65DC 8E020000 */ lw $v0, ($s0) @@ -401,13 +410,13 @@ glabel func_802B6000_E26DE0 .L802B65EC: /* E273CC 802B65EC C6020070 */ lwc1 $f2, 0x70($s0) /* E273D0 802B65F0 44800000 */ mtc1 $zero, $f0 -/* E273D4 802B65F4 00000000 */ nop +/* E273D4 802B65F4 00000000 */ nop /* E273D8 802B65F8 4600103C */ c.lt.s $f2, $f0 -/* E273DC 802B65FC 00000000 */ nop +/* E273DC 802B65FC 00000000 */ nop /* E273E0 802B6600 45000009 */ bc1f .L802B6628 -/* E273E4 802B6604 00000000 */ nop +/* E273E4 802B6604 00000000 */ nop /* E273E8 802B6608 0C0AD992 */ jal func_802B6648_E27428 -/* E273EC 802B660C 00000000 */ nop +/* E273EC 802B660C 00000000 */ nop /* E273F0 802B6610 04400005 */ bltz $v0, .L802B6628 /* E273F4 802B6614 AFA20010 */ sw $v0, 0x10($sp) /* E273F8 802B6618 97A30012 */ lhu $v1, 0x12($sp) diff --git a/asm/nonmatchings/code_E26DE0/func_802B6648_E27428.s b/asm/nonmatchings/code_E26DE0/func_802B6648_E27428.s index 4692282817..e4c9dccead 100644 --- a/asm/nonmatchings/code_E26DE0/func_802B6648_E27428.s +++ b/asm/nonmatchings/code_E26DE0/func_802B6648_E27428.s @@ -14,10 +14,10 @@ glabel func_802B6648_E27428 /* E2744C 802B666C 44811000 */ mtc1 $at, $f2 /* E27450 802B6670 C4800028 */ lwc1 $f0, 0x28($a0) /* E27454 802B6674 44823000 */ mtc1 $v0, $f6 -/* E27458 802B6678 00000000 */ nop +/* E27458 802B6678 00000000 */ nop /* E2745C 802B667C 468031A0 */ cvt.s.w $f6, $f6 /* E27460 802B6680 46023082 */ mul.s $f2, $f6, $f2 -/* E27464 802B6684 00000000 */ nop +/* E27464 802B6684 00000000 */ nop /* E27468 802B6688 27A20034 */ addiu $v0, $sp, 0x34 /* E2746C 802B668C E7A00028 */ swc1 $f0, 0x28($sp) /* E27470 802B6690 C480002C */ lwc1 $f0, 0x2c($a0) @@ -39,4 +39,4 @@ glabel func_802B6648_E27428 /* E274B0 802B66D0 8FBF0048 */ lw $ra, 0x48($sp) /* E274B4 802B66D4 03E00008 */ jr $ra /* E274B8 802B66D8 27BD0050 */ addiu $sp, $sp, 0x50 -/* E274BC 802B66DC 00000000 */ nop +/* E274BC 802B66DC 00000000 */ nop diff --git a/asm/nonmatchings/code_E27510/func_802B6060_E27570.s b/asm/nonmatchings/code_E27510/func_802B6060_E27570.s index 9f1f68e911..c1acef07e2 100644 --- a/asm/nonmatchings/code_E27510/func_802B6060_E27570.s +++ b/asm/nonmatchings/code_E27510/func_802B6060_E27570.s @@ -71,11 +71,12 @@ glabel func_802B6060_E27570 /* E27674 802B6164 1040016D */ beqz $v0, .L802B671C /* E27678 802B6168 E604002C */ swc1 $f4, 0x2c($s0) /* E2767C 802B616C 00031080 */ sll $v0, $v1, 2 -/* E27680 802B6170 3C01802B */ lui $at, %hi(D_802B6740) +/* E27680 802B6170 3C01802B */ lui $at, %hi(jtbl_802B6740_E27C50) /* E27684 802B6174 00220821 */ addu $at, $at, $v0 -/* E27688 802B6178 8C226740 */ lw $v0, %lo(D_802B6740)($at) +/* E27688 802B6178 8C226740 */ lw $v0, %lo(jtbl_802B6740_E27C50)($at) /* E2768C 802B617C 00400008 */ jr $v0 /* E27690 802B6180 00000000 */ nop +glabel L802B6184_E27694 /* E27694 802B6184 3C02802B */ lui $v0, %hi(D_802B6780) /* E27698 802B6188 24426780 */ addiu $v0, $v0, %lo(D_802B6780) /* E2769C 802B618C C4400000 */ lwc1 $f0, ($v0) @@ -213,6 +214,7 @@ glabel func_802B6060_E27570 /* E27898 802B6388 E602002C */ swc1 $f2, 0x2c($s0) /* E2789C 802B638C 080AD9C7 */ j .L802B671C /* E278A0 802B6390 00000000 */ nop +glabel L802B6394_E278A4 /* E278A4 802B6394 0200202D */ daddu $a0, $s0, $zero /* E278A8 802B6398 27A50028 */ addiu $a1, $sp, 0x28 /* E278AC 802B639C 27A6002C */ addiu $a2, $sp, 0x2c @@ -284,6 +286,7 @@ glabel func_802B6060_E27570 /* E279B0 802B64A0 080AD9C7 */ j .L802B671C /* E279B4 802B64A4 E600002C */ swc1 $f0, 0x2c($s0) .L802B64A8: +glabel L802B64A8_E279B8 /* E279B8 802B64A8 C6000054 */ lwc1 $f0, 0x54($s0) /* E279BC 802B64AC 3C01802B */ lui $at, %hi(D_802B678C) /* E279C0 802B64B0 C422678C */ lwc1 $f2, %lo(D_802B678C)($at) @@ -324,6 +327,7 @@ glabel func_802B6060_E27570 /* E27A48 802B6538 E6040078 */ swc1 $f4, 0x78($s0) /* E27A4C 802B653C 080AD9C7 */ j .L802B671C /* E27A50 802B6540 E606007C */ swc1 $f6, 0x7c($s0) +glabel L802B6544_E27A54 /* E27A54 802B6544 3C11802B */ lui $s1, %hi(D_802B678C) /* E27A58 802B6548 2631678C */ addiu $s1, $s1, %lo(D_802B678C) /* E27A5C 802B654C C6000054 */ lwc1 $f0, 0x54($s0) @@ -356,6 +360,7 @@ glabel func_802B6060_E27570 /* E27AC4 802B65B4 0000282D */ daddu $a1, $zero, $zero /* E27AC8 802B65B8 080AD9AC */ j .L802B66B0 /* E27ACC 802B65BC 00000000 */ nop +glabel L802B65C0_E27AD0 /* E27AD0 802B65C0 C6000054 */ lwc1 $f0, 0x54($s0) /* E27AD4 802B65C4 3C01802B */ lui $at, %hi(D_802B678C) /* E27AD8 802B65C8 C422678C */ lwc1 $f2, %lo(D_802B678C)($at) @@ -376,6 +381,7 @@ glabel func_802B6060_E27570 /* E27B10 802B6600 34840030 */ ori $a0, $a0, 0x30 /* E27B14 802B6604 080AD9AC */ j .L802B66B0 /* E27B18 802B6608 00000000 */ nop +glabel L802B660C_E27B1C /* E27B1C 802B660C C6000054 */ lwc1 $f0, 0x54($s0) /* E27B20 802B6610 3C01802B */ lui $at, %hi(D_802B678C) /* E27B24 802B6614 C422678C */ lwc1 $f2, %lo(D_802B678C)($at) @@ -401,6 +407,7 @@ glabel func_802B6060_E27570 /* E27B70 802B6660 2403000F */ addiu $v1, $zero, 0xf /* E27B74 802B6664 080AD9AD */ j .L802B66B4 /* E27B78 802B6668 A6030008 */ sh $v1, 8($s0) +glabel L802B666C_E27B7C /* E27B7C 802B666C C6000054 */ lwc1 $f0, 0x54($s0) /* E27B80 802B6670 3C01802B */ lui $at, %hi(D_802B678C) /* E27B84 802B6674 C422678C */ lwc1 $f2, %lo(D_802B678C)($at) @@ -425,6 +432,7 @@ glabel func_802B6060_E27570 /* E27BC4 802B66B4 24420001 */ addiu $v0, $v0, 1 /* E27BC8 802B66B8 080AD9C7 */ j .L802B671C /* E27BCC 802B66BC A20200B6 */ sb $v0, 0xb6($s0) +glabel L802B66C0_E27BD0 /* E27BD0 802B66C0 C6020054 */ lwc1 $f2, 0x54($s0) /* E27BD4 802B66C4 3C014040 */ lui $at, 0x4040 /* E27BD8 802B66C8 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_E27F40/func_802B6000_E27F40.s b/asm/nonmatchings/code_E27F40/func_802B6000_E27F40.s index 7930dc59c5..2e68cd473c 100644 --- a/asm/nonmatchings/code_E27F40/func_802B6000_E27F40.s +++ b/asm/nonmatchings/code_E27F40/func_802B6000_E27F40.s @@ -52,7 +52,7 @@ glabel func_802B6000_E27F40 /* E27FF8 802B60B8 0C03A8CD */ jal subtract_hp /* E27FFC 802B60BC 24040001 */ addiu $a0, $zero, 1 /* E28000 802B60C0 0C03A5D8 */ jal open_status_menu_long -/* E28004 802B60C4 00000000 */ nop +/* E28004 802B60C4 00000000 */ nop /* E28008 802B60C8 240400E8 */ addiu $a0, $zero, 0xe8 /* E2800C 802B60CC 3C03800A */ lui $v1, %hi(D_8009A650) /* E28010 802B60D0 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) @@ -66,11 +66,12 @@ glabel func_802B6000_E27F40 /* E2802C 802B60EC 2C620016 */ sltiu $v0, $v1, 0x16 /* E28030 802B60F0 104001C5 */ beqz $v0, .L802B6808 /* E28034 802B60F4 00031080 */ sll $v0, $v1, 2 -/* E28038 802B60F8 3C01802B */ lui $at, %hi(D_802B6850) +/* E28038 802B60F8 3C01802B */ lui $at, %hi(jtbl_802B6850_E28790) /* E2803C 802B60FC 00220821 */ addu $at, $at, $v0 -/* E28040 802B6100 8C226850 */ lw $v0, %lo(D_802B6850)($at) +/* E28040 802B6100 8C226850 */ lw $v0, %lo(jtbl_802B6850_E28790)($at) /* E28044 802B6104 00400008 */ jr $v0 -/* E28048 802B6108 00000000 */ nop +/* E28048 802B6108 00000000 */ nop +glabel L802B610C_E2804C /* E2804C 802B610C 96020008 */ lhu $v0, 8($s0) /* E28050 802B6110 2403FFFF */ addiu $v1, $zero, -1 /* E28054 802B6114 2442FFFF */ addiu $v0, $v0, -1 @@ -80,7 +81,8 @@ glabel func_802B6000_E27F40 /* E28064 802B6124 504301B8 */ beql $v0, $v1, .L802B6808 /* E28068 802B6128 A20000B6 */ sb $zero, 0xb6($s0) /* E2806C 802B612C 080ADA02 */ j .L802B6808 -/* E28070 802B6130 00000000 */ nop +/* E28070 802B6130 00000000 */ nop +glabel L802B6134_E28074 /* E28074 802B6134 96020008 */ lhu $v0, 8($s0) /* E28078 802B6138 2403FFFF */ addiu $v1, $zero, -1 /* E2807C 802B613C 2442FFFF */ addiu $v0, $v0, -1 @@ -93,10 +95,11 @@ glabel func_802B6000_E27F40 /* E28094 802B6154 C600002C */ lwc1 $f0, 0x2c($s0) /* E28098 802B6158 3C014080 */ lui $at, 0x4080 /* E2809C 802B615C 44811000 */ mtc1 $at, $f2 -/* E280A0 802B6160 00000000 */ nop +/* E280A0 802B6160 00000000 */ nop /* E280A4 802B6164 46020001 */ sub.s $f0, $f0, $f2 /* E280A8 802B6168 080ADA02 */ j .L802B6808 /* E280AC 802B616C E600002C */ swc1 $f0, 0x2c($s0) +glabel L802B6170_E280B0 /* E280B0 802B6170 820200BF */ lb $v0, 0xbf($s0) /* E280B4 802B6174 24110001 */ addiu $s1, $zero, 1 /* E280B8 802B6178 1451000C */ bne $v0, $s1, .L802B61AC @@ -140,19 +143,21 @@ glabel func_802B6000_E27F40 /* E2814C 802B620C E60A004C */ swc1 $f10, 0x4c($s0) /* E28150 802B6210 080ADA02 */ j .L802B6808 /* E28154 802B6214 AE030000 */ sw $v1, ($s0) +glabel L802B6218_E28158 /* E28158 802B6218 96020008 */ lhu $v0, 8($s0) /* E2815C 802B621C 2442FFFF */ addiu $v0, $v0, -1 /* E28160 802B6220 A6020008 */ sh $v0, 8($s0) /* E28164 802B6224 00021400 */ sll $v0, $v0, 0x10 /* E28168 802B6228 1C400177 */ bgtz $v0, .L802B6808 -/* E2816C 802B622C 00000000 */ nop +/* E2816C 802B622C 00000000 */ nop /* E28170 802B6230 920200B6 */ lbu $v0, 0xb6($s0) /* E28174 802B6234 080AD9ED */ j .L802B67B4 /* E28178 802B6238 24420001 */ addiu $v0, $v0, 1 +glabel L802B623C_E2817C /* E2817C 802B623C 820300BF */ lb $v1, 0xbf($s0) /* E28180 802B6240 24020001 */ addiu $v0, $zero, 1 /* E28184 802B6244 1462000F */ bne $v1, $v0, .L802B6284 -/* E28188 802B6248 00000000 */ nop +/* E28188 802B6248 00000000 */ nop /* E2818C 802B624C 960200C0 */ lhu $v0, 0xc0($s0) /* E28190 802B6250 30420001 */ andi $v0, $v0, 1 /* E28194 802B6254 1440000B */ bnez $v0, .L802B6284 @@ -173,7 +178,7 @@ glabel func_802B6000_E27F40 /* E281CC 802B628C 46020080 */ add.s $f2, $f0, $f2 /* E281D0 802B6290 C600002C */ lwc1 $f0, 0x2c($s0) /* E281D4 802B6294 4602003C */ c.lt.s $f0, $f2 -/* E281D8 802B6298 00000000 */ nop +/* E281D8 802B6298 00000000 */ nop /* E281DC 802B629C 45000034 */ bc1f .L802B6370 /* E281E0 802B62A0 27A50018 */ addiu $a1, $sp, 0x18 /* E281E4 802B62A4 3C12802B */ lui $s2, %hi(D_802B68B4) @@ -182,9 +187,9 @@ glabel func_802B6000_E27F40 /* E281F0 802B62B0 3C0140C9 */ lui $at, 0x40c9 /* E281F4 802B62B4 34210FD0 */ ori $at, $at, 0xfd0 /* E281F8 802B62B8 4481B000 */ mtc1 $at, $f22 -/* E281FC 802B62BC 00000000 */ nop +/* E281FC 802B62BC 00000000 */ nop /* E28200 802B62C0 46166302 */ mul.s $f12, $f12, $f22 -/* E28204 802B62C4 00000000 */ nop +/* E28204 802B62C4 00000000 */ nop /* E28208 802B62C8 3C0143B4 */ lui $at, 0x43b4 /* E2820C 802B62CC 4481A000 */ mtc1 $at, $f20 /* E28210 802B62D0 27A6001C */ addiu $a2, $sp, 0x1c @@ -192,20 +197,20 @@ glabel func_802B6000_E27F40 /* E28218 802B62D8 46146303 */ div.s $f12, $f12, $f20 /* E2821C 802B62DC C64C0000 */ lwc1 $f12, ($s2) /* E28220 802B62E0 46166302 */ mul.s $f12, $f12, $f22 -/* E28224 802B62E4 00000000 */ nop +/* E28224 802B62E4 00000000 */ nop /* E28228 802B62E8 0C00A85B */ jal sin_rad /* E2822C 802B62EC 46146303 */ div.s $f12, $f12, $f20 /* E28230 802B62F0 3C014180 */ lui $at, 0x4180 /* E28234 802B62F4 44811000 */ mtc1 $at, $f2 -/* E28238 802B62F8 00000000 */ nop +/* E28238 802B62F8 00000000 */ nop /* E2823C 802B62FC 46020002 */ mul.s $f0, $f0, $f2 -/* E28240 802B6300 00000000 */ nop +/* E28240 802B6300 00000000 */ nop /* E28244 802B6304 3C01BF80 */ lui $at, 0xbf80 /* E28248 802B6308 44811000 */ mtc1 $at, $f2 /* E2824C 802B630C 3C11802B */ lui $s1, %hi(D_802B68B0) /* E28250 802B6310 263168B0 */ addiu $s1, $s1, %lo(D_802B68B0) /* E28254 802B6314 4602003C */ c.lt.s $f0, $f2 -/* E28258 802B6318 00000000 */ nop +/* E28258 802B6318 00000000 */ nop /* E2825C 802B631C 45000002 */ bc1f .L802B6328 /* E28260 802B6320 E6200000 */ swc1 $f0, ($s1) /* E28264 802B6324 E6220000 */ swc1 $f2, ($s1) @@ -216,13 +221,13 @@ glabel func_802B6000_E27F40 /* E28274 802B6334 46002100 */ add.s $f4, $f4, $f0 /* E28278 802B6338 3C014040 */ lui $at, 0x4040 /* E2827C 802B633C 44810000 */ mtc1 $at, $f0 -/* E28280 802B6340 00000000 */ nop +/* E28280 802B6340 00000000 */ nop /* E28284 802B6344 46001080 */ add.s $f2, $f2, $f0 /* E28288 802B6348 3C014334 */ lui $at, 0x4334 /* E2828C 802B634C 44810000 */ mtc1 $at, $f0 /* E28290 802B6350 E604002C */ swc1 $f4, 0x2c($s0) /* E28294 802B6354 4602003C */ c.lt.s $f0, $f2 -/* E28298 802B6358 00000000 */ nop +/* E28298 802B6358 00000000 */ nop /* E2829C 802B635C 4500012A */ bc1f .L802B6808 /* E282A0 802B6360 E6420000 */ swc1 $f2, ($s2) /* E282A4 802B6364 920200B6 */ lbu $v0, 0xb6($s0) @@ -232,6 +237,7 @@ glabel func_802B6000_E27F40 /* E282B0 802B6370 920200B6 */ lbu $v0, 0xb6($s0) /* E282B4 802B6374 080AD9EC */ j .L802B67B0 /* E282B8 802B6378 E602002C */ swc1 $f2, 0x2c($s0) +glabel L802B637C_E282BC /* E282BC 802B637C 820300BF */ lb $v1, 0xbf($s0) /* E282C0 802B6380 24020001 */ addiu $v0, $zero, 1 /* E282C4 802B6384 14620011 */ bne $v1, $v0, .L802B63CC @@ -258,7 +264,7 @@ glabel func_802B6000_E27F40 /* E28310 802B63D0 0C0B27F5 */ jal func_802C9FD4 /* E28314 802B63D4 27A60028 */ addiu $a2, $sp, 0x28 /* E28318 802B63D8 14400005 */ bnez $v0, .L802B63F0 -/* E2831C 802B63DC 00000000 */ nop +/* E2831C 802B63DC 00000000 */ nop /* E28320 802B63E0 C6000028 */ lwc1 $f0, 0x28($s0) /* E28324 802B63E4 C6020030 */ lwc1 $f2, 0x30($s0) /* E28328 802B63E8 E7A00020 */ swc1 $f0, 0x20($sp) @@ -281,7 +287,7 @@ glabel func_802B6000_E27F40 /* E28368 802B6428 920300B6 */ lbu $v1, 0xb6($s0) /* E2836C 802B642C 4600040D */ trunc.w.s $f16, $f0 /* E28370 802B6430 44028000 */ mfc1 $v0, $f16 -/* E28374 802B6434 00000000 */ nop +/* E28374 802B6434 00000000 */ nop /* E28378 802B6438 A6020016 */ sh $v0, 0x16($s0) /* E2837C 802B643C C7A00028 */ lwc1 $f0, 0x28($sp) /* E28380 802B6440 24630001 */ addiu $v1, $v1, 1 @@ -295,29 +301,30 @@ glabel func_802B6000_E27F40 /* E283A0 802B6460 44028000 */ mfc1 $v0, $f16 /* E283A4 802B6464 080ADA02 */ j .L802B6808 /* E283A8 802B6468 A602001A */ sh $v0, 0x1a($s0) +glabel L802B646C_E283AC /* E283AC 802B646C C60C0028 */ lwc1 $f12, 0x28($s0) /* E283B0 802B6470 C60E0030 */ lwc1 $f14, 0x30($s0) /* E283B4 802B6474 86020016 */ lh $v0, 0x16($s0) /* E283B8 802B6478 8603001A */ lh $v1, 0x1a($s0) /* E283BC 802B647C 44828000 */ mtc1 $v0, $f16 -/* E283C0 802B6480 00000000 */ nop +/* E283C0 802B6480 00000000 */ nop /* E283C4 802B6484 46808420 */ cvt.s.w $f16, $f16 /* E283C8 802B6488 44068000 */ mfc1 $a2, $f16 /* E283CC 802B648C 44838000 */ mtc1 $v1, $f16 -/* E283D0 802B6490 00000000 */ nop +/* E283D0 802B6490 00000000 */ nop /* E283D4 802B6494 46808420 */ cvt.s.w $f16, $f16 /* E283D8 802B6498 44078000 */ mfc1 $a3, $f16 /* E283DC 802B649C 0C00A720 */ jal atan2 -/* E283E0 802B64A0 00000000 */ nop +/* E283E0 802B64A0 00000000 */ nop /* E283E4 802B64A4 86020016 */ lh $v0, 0x16($s0) /* E283E8 802B64A8 8603001A */ lh $v1, 0x1a($s0) /* E283EC 802B64AC 3C01802B */ lui $at, %hi(D_802B68B8) /* E283F0 802B64B0 E42068B8 */ swc1 $f0, %lo(D_802B68B8)($at) /* E283F4 802B64B4 44826000 */ mtc1 $v0, $f12 -/* E283F8 802B64B8 00000000 */ nop +/* E283F8 802B64B8 00000000 */ nop /* E283FC 802B64BC 46806320 */ cvt.s.w $f12, $f12 /* E28400 802B64C0 44837000 */ mtc1 $v1, $f14 -/* E28404 802B64C4 00000000 */ nop +/* E28404 802B64C4 00000000 */ nop /* E28408 802B64C8 0C038022 */ jal func_800E0088 /* E2840C 802B64CC 468073A0 */ cvt.s.w $f14, $f14 /* E28410 802B64D0 3C014190 */ lui $at, 0x4190 @@ -328,26 +335,27 @@ glabel func_802B6000_E27F40 /* E28424 802B64E4 E6000054 */ swc1 $f0, 0x54($s0) /* E28428 802B64E8 080ADA02 */ j .L802B6808 /* E2842C 802B64EC A20200B6 */ sb $v0, 0xb6($s0) +glabel L802B64F0_E28430 /* E28430 802B64F0 C60C0028 */ lwc1 $f12, 0x28($s0) /* E28434 802B64F4 C60E0030 */ lwc1 $f14, 0x30($s0) /* E28438 802B64F8 86020016 */ lh $v0, 0x16($s0) /* E2843C 802B64FC 8603001A */ lh $v1, 0x1a($s0) /* E28440 802B6500 44828000 */ mtc1 $v0, $f16 -/* E28444 802B6504 00000000 */ nop +/* E28444 802B6504 00000000 */ nop /* E28448 802B6508 46808420 */ cvt.s.w $f16, $f16 /* E2844C 802B650C 44068000 */ mfc1 $a2, $f16 /* E28450 802B6510 44838000 */ mtc1 $v1, $f16 -/* E28454 802B6514 00000000 */ nop +/* E28454 802B6514 00000000 */ nop /* E28458 802B6518 46808420 */ cvt.s.w $f16, $f16 /* E2845C 802B651C 44078000 */ mfc1 $a3, $f16 /* E28460 802B6520 0C00A720 */ jal atan2 -/* E28464 802B6524 00000000 */ nop +/* E28464 802B6524 00000000 */ nop /* E28468 802B6528 3C0140C9 */ lui $at, 0x40c9 /* E2846C 802B652C 34210FD0 */ ori $at, $at, 0xfd0 /* E28470 802B6530 44811000 */ mtc1 $at, $f2 -/* E28474 802B6534 00000000 */ nop +/* E28474 802B6534 00000000 */ nop /* E28478 802B6538 46020082 */ mul.s $f2, $f0, $f2 -/* E2847C 802B653C 00000000 */ nop +/* E2847C 802B653C 00000000 */ nop /* E28480 802B6540 3C0143B4 */ lui $at, 0x43b4 /* E28484 802B6544 44812000 */ mtc1 $at, $f4 /* E28488 802B6548 3C01802B */ lui $at, %hi(D_802B68B8) @@ -357,30 +365,30 @@ glabel func_802B6000_E27F40 /* E28498 802B6558 4600A306 */ mov.s $f12, $f20 /* E2849C 802B655C C6020054 */ lwc1 $f2, 0x54($s0) /* E284A0 802B6560 46001102 */ mul.s $f4, $f2, $f0 -/* E284A4 802B6564 00000000 */ nop +/* E284A4 802B6564 00000000 */ nop /* E284A8 802B6568 C6000028 */ lwc1 $f0, 0x28($s0) /* E284AC 802B656C 44801000 */ mtc1 $zero, $f2 /* E284B0 802B6570 46040000 */ add.s $f0, $f0, $f4 /* E284B4 802B6574 AFA0002C */ sw $zero, 0x2c($sp) /* E284B8 802B6578 4604103E */ c.le.s $f2, $f4 -/* E284BC 802B657C 00000000 */ nop +/* E284BC 802B657C 00000000 */ nop /* E284C0 802B6580 45000008 */ bc1f .L802B65A4 /* E284C4 802B6584 E6000028 */ swc1 $f0, 0x28($s0) /* E284C8 802B6588 86020016 */ lh $v0, 0x16($s0) /* E284CC 802B658C 44821000 */ mtc1 $v0, $f2 -/* E284D0 802B6590 00000000 */ nop +/* E284D0 802B6590 00000000 */ nop /* E284D4 802B6594 468010A0 */ cvt.s.w $f2, $f2 /* E284D8 802B6598 4600103E */ c.le.s $f2, $f0 /* E284DC 802B659C 080AD970 */ j .L802B65C0 -/* E284E0 802B65A0 00000000 */ nop +/* E284E0 802B65A0 00000000 */ nop .L802B65A4: /* E284E4 802B65A4 86020016 */ lh $v0, 0x16($s0) /* E284E8 802B65A8 C6000028 */ lwc1 $f0, 0x28($s0) /* E284EC 802B65AC 44821000 */ mtc1 $v0, $f2 -/* E284F0 802B65B0 00000000 */ nop +/* E284F0 802B65B0 00000000 */ nop /* E284F4 802B65B4 468010A0 */ cvt.s.w $f2, $f2 /* E284F8 802B65B8 4602003E */ c.le.s $f0, $f2 -/* E284FC 802B65BC 00000000 */ nop +/* E284FC 802B65BC 00000000 */ nop .L802B65C0: /* E28500 802B65C0 45000003 */ bc1f .L802B65D0 /* E28504 802B65C4 24020001 */ addiu $v0, $zero, 1 @@ -391,32 +399,32 @@ glabel func_802B6000_E27F40 /* E28514 802B65D4 4600A306 */ mov.s $f12, $f20 /* E28518 802B65D8 C6020054 */ lwc1 $f2, 0x54($s0) /* E2851C 802B65DC 46001102 */ mul.s $f4, $f2, $f0 -/* E28520 802B65E0 00000000 */ nop +/* E28520 802B65E0 00000000 */ nop /* E28524 802B65E4 C6000030 */ lwc1 $f0, 0x30($s0) /* E28528 802B65E8 46040081 */ sub.s $f2, $f0, $f4 /* E2852C 802B65EC 44800000 */ mtc1 $zero, $f0 -/* E28530 802B65F0 00000000 */ nop +/* E28530 802B65F0 00000000 */ nop /* E28534 802B65F4 4604003E */ c.le.s $f0, $f4 -/* E28538 802B65F8 00000000 */ nop +/* E28538 802B65F8 00000000 */ nop /* E2853C 802B65FC 45000008 */ bc1f .L802B6620 /* E28540 802B6600 E6020030 */ swc1 $f2, 0x30($s0) /* E28544 802B6604 8602001A */ lh $v0, 0x1a($s0) /* E28548 802B6608 44820000 */ mtc1 $v0, $f0 -/* E2854C 802B660C 00000000 */ nop +/* E2854C 802B660C 00000000 */ nop /* E28550 802B6610 46800020 */ cvt.s.w $f0, $f0 /* E28554 802B6614 4600103E */ c.le.s $f2, $f0 /* E28558 802B6618 080AD98E */ j .L802B6638 -/* E2855C 802B661C 00000000 */ nop +/* E2855C 802B661C 00000000 */ nop .L802B6620: /* E28560 802B6620 8602001A */ lh $v0, 0x1a($s0) /* E28564 802B6624 44820000 */ mtc1 $v0, $f0 -/* E28568 802B6628 00000000 */ nop +/* E28568 802B6628 00000000 */ nop /* E2856C 802B662C 46800020 */ cvt.s.w $f0, $f0 /* E28570 802B6630 4602003E */ c.le.s $f0, $f2 -/* E28574 802B6634 00000000 */ nop +/* E28574 802B6634 00000000 */ nop .L802B6638: /* E28578 802B6638 45000005 */ bc1f .L802B6650 -/* E2857C 802B663C 00000000 */ nop +/* E2857C 802B663C 00000000 */ nop /* E28580 802B6640 8FA2002C */ lw $v0, 0x2c($sp) /* E28584 802B6644 E6000030 */ swc1 $f0, 0x30($s0) /* E28588 802B6648 24420001 */ addiu $v0, $v0, 1 @@ -425,14 +433,15 @@ glabel func_802B6000_E27F40 /* E28590 802B6650 8FA3002C */ lw $v1, 0x2c($sp) /* E28594 802B6654 24020002 */ addiu $v0, $zero, 2 /* E28598 802B6658 1462006B */ bne $v1, $v0, .L802B6808 -/* E2859C 802B665C 00000000 */ nop +/* E2859C 802B665C 00000000 */ nop /* E285A0 802B6660 920200B6 */ lbu $v0, 0xb6($s0) /* E285A4 802B6664 080AD9ED */ j .L802B67B4 /* E285A8 802B6668 24420001 */ addiu $v0, $v0, 1 +glabel L802B666C_E285AC /* E285AC 802B666C 820300BF */ lb $v1, 0xbf($s0) /* E285B0 802B6670 24020001 */ addiu $v0, $zero, 1 /* E285B4 802B6674 1462000F */ bne $v1, $v0, .L802B66B4 -/* E285B8 802B6678 00000000 */ nop +/* E285B8 802B6678 00000000 */ nop /* E285BC 802B667C 960200C0 */ lhu $v0, 0xc0($s0) /* E285C0 802B6680 30420001 */ andi $v0, $v0, 1 /* E285C4 802B6684 1440000B */ bnez $v0, .L802B66B4 @@ -449,7 +458,7 @@ glabel func_802B6000_E27F40 /* E285F0 802B66B0 E7A00010 */ swc1 $f0, 0x10($sp) .L802B66B4: /* E285F4 802B66B4 0C038D36 */ jal func_800E34D8 -/* E285F8 802B66B8 00000000 */ nop +/* E285F8 802B66B8 00000000 */ nop /* E285FC 802B66BC 46000306 */ mov.s $f12, $f0 /* E28600 802B66C0 0C038D45 */ jal func_800E3514 /* E28604 802B66C4 27A5002C */ addiu $a1, $sp, 0x2c @@ -466,7 +475,7 @@ glabel func_802B6000_E27F40 /* E28630 802B66F0 0C00A3C2 */ jal start_rumble /* E28634 802B66F4 24050032 */ addiu $a1, $zero, 0x32 /* E28638 802B66F8 0C03954C */ jal func_800E5530 -/* E2863C 802B66FC 00000000 */ nop +/* E2863C 802B66FC 00000000 */ nop /* E28640 802B6700 240403FB */ addiu $a0, $zero, 0x3fb /* E28644 802B6704 3C03800B */ lui $v1, %hi(gCameras) /* E28648 802B6708 24631D80 */ addiu $v1, $v1, %lo(gCameras) @@ -495,6 +504,7 @@ glabel func_802B6000_E27F40 /* E286A4 802B6764 A20200B6 */ sb $v0, 0xb6($s0) /* E286A8 802B6768 080ADA02 */ j .L802B6808 /* E286AC 802B676C E600002C */ swc1 $f0, 0x2c($s0) +glabel L802B6770_E286B0 /* E286B0 802B6770 C60C0070 */ lwc1 $f12, 0x70($s0) /* E286B4 802B6774 3C013FF0 */ lui $at, 0x3ff0 /* E286B8 802B6778 44810800 */ mtc1 $at, $f1 @@ -516,12 +526,13 @@ glabel func_802B6000_E27F40 .L802B67B4: /* E286F4 802B67B4 080ADA02 */ j .L802B6808 /* E286F8 802B67B8 A20200B6 */ sb $v0, 0xb6($s0) +glabel L802B67BC_E286FC /* E286FC 802B67BC 96020008 */ lhu $v0, 8($s0) /* E28700 802B67C0 2442FFFF */ addiu $v0, $v0, -1 /* E28704 802B67C4 A6020008 */ sh $v0, 8($s0) /* E28708 802B67C8 00021400 */ sll $v0, $v0, 0x10 /* E2870C 802B67CC 1C40000E */ bgtz $v0, .L802B6808 -/* E28710 802B67D0 00000000 */ nop +/* E28710 802B67D0 00000000 */ nop /* E28714 802B67D4 0C039769 */ jal set_action_state /* E28718 802B67D8 2404000A */ addiu $a0, $zero, 0xa /* E2871C 802B67DC 3C03FF7F */ lui $v1, 0xff7f @@ -536,10 +547,11 @@ glabel func_802B6000_E27F40 /* E28740 802B6800 00431024 */ and $v0, $v0, $v1 /* E28744 802B6804 AC820000 */ sw $v0, ($a0) .L802B6808: +glabel L802B6808_E28748 /* E28748 802B6808 820200B6 */ lb $v0, 0xb6($s0) /* E2874C 802B680C 28420007 */ slti $v0, $v0, 7 /* E28750 802B6810 10400004 */ beqz $v0, .L802B6824 -/* E28754 802B6814 00000000 */ nop +/* E28754 802B6814 00000000 */ nop /* E28758 802B6818 960200C0 */ lhu $v0, 0xc0($s0) /* E2875C 802B681C 24420001 */ addiu $v0, $v0, 1 /* E28760 802B6820 A60200C0 */ sh $v0, 0xc0($s0) @@ -552,6 +564,6 @@ glabel func_802B6000_E27F40 /* E28778 802B6838 D7B40040 */ ldc1 $f20, 0x40($sp) /* E2877C 802B683C 03E00008 */ jr $ra /* E28780 802B6840 27BD0050 */ addiu $sp, $sp, 0x50 -/* E28784 802B6844 00000000 */ nop -/* E28788 802B6848 00000000 */ nop -/* E2878C 802B684C 00000000 */ nop +/* E28784 802B6844 00000000 */ nop +/* E28788 802B6848 00000000 */ nop +/* E2878C 802B684C 00000000 */ nop diff --git a/asm/nonmatchings/code_E28A30/func_802B6000_E28A30.s b/asm/nonmatchings/code_E28A30/func_802B6000_E28A30.s index 3adb9c060f..dc2cd5e62c 100644 --- a/asm/nonmatchings/code_E28A30/func_802B6000_E28A30.s +++ b/asm/nonmatchings/code_E28A30/func_802B6000_E28A30.s @@ -24,7 +24,7 @@ glabel func_802B6000_E28A30 /* E28A78 802B6048 3C030040 */ lui $v1, 0x40 /* E28A7C 802B604C 00431024 */ and $v0, $v0, $v1 /* E28A80 802B6050 1040000F */ beqz $v0, .L802B6090 -/* E28A84 802B6054 00000000 */ nop +/* E28A84 802B6054 00000000 */ nop /* E28A88 802B6058 3C028011 */ lui $v0, %hi(D_8010EBB0) /* E28A8C 802B605C 2442EBB0 */ addiu $v0, $v0, %lo(D_8010EBB0) /* E28A90 802B6060 80430003 */ lb $v1, 3($v0) @@ -32,14 +32,14 @@ glabel func_802B6000_E28A30 /* E28A98 802B6068 14620005 */ bne $v1, $v0, .L802B6080 /* E28A9C 802B606C 24020007 */ addiu $v0, $zero, 7 /* E28AA0 802B6070 0C0AF440 */ jal func_802BD100 -/* E28AA4 802B6074 00000000 */ nop +/* E28AA4 802B6074 00000000 */ nop /* E28AA8 802B6078 080AD824 */ j .L802B6090 -/* E28AAC 802B607C 00000000 */ nop +/* E28AAC 802B607C 00000000 */ nop .L802B6080: /* E28AB0 802B6080 14620003 */ bne $v1, $v0, .L802B6090 -/* E28AB4 802B6084 00000000 */ nop +/* E28AB4 802B6084 00000000 */ nop /* E28AB8 802B6088 0C0AF440 */ jal func_802BD100 -/* E28ABC 802B608C 00000000 */ nop +/* E28ABC 802B608C 00000000 */ nop .L802B6090: /* E28AC0 802B6090 8FBF0010 */ lw $ra, 0x10($sp) /* E28AC4 802B6094 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_E28A30/func_802B609C_E28ACC.s b/asm/nonmatchings/code_E28A30/func_802B609C_E28ACC.s index e15b4c2330..b8d845f3dc 100644 --- a/asm/nonmatchings/code_E28A30/func_802B609C_E28ACC.s +++ b/asm/nonmatchings/code_E28A30/func_802B609C_E28ACC.s @@ -34,9 +34,9 @@ glabel func_802B609C_E28ACC /* E28B3C 802B610C 24420001 */ addiu $v0, $v0, 1 /* E28B40 802B6110 24020001 */ addiu $v0, $zero, 1 /* E28B44 802B6114 10620004 */ beq $v1, $v0, .L802B6128 -/* E28B48 802B6118 00000000 */ nop +/* E28B48 802B6118 00000000 */ nop /* E28B4C 802B611C 080AD8CC */ j .L802B6330 -/* E28B50 802B6120 00000000 */ nop +/* E28B50 802B6120 00000000 */ nop .L802B6124: /* E28B54 802B6124 A24200B6 */ sb $v0, 0xb6($s2) .L802B6128: @@ -47,7 +47,7 @@ glabel func_802B609C_E28ACC /* E28B68 802B6138 4481A000 */ mtc1 $at, $f20 /* E28B6C 802B613C 27B10028 */ addiu $s1, $sp, 0x28 /* E28B70 802B6140 46146302 */ mul.s $f12, $f12, $f20 -/* E28B74 802B6144 00000000 */ nop +/* E28B74 802B6144 00000000 */ nop /* E28B78 802B6148 0220282D */ daddu $a1, $s1, $zero /* E28B7C 802B614C 27B0002C */ addiu $s0, $sp, 0x2c /* E28B80 802B6150 3C0143B4 */ lui $at, 0x43b4 @@ -58,28 +58,28 @@ glabel func_802B609C_E28ACC /* E28B94 802B6164 3C01802B */ lui $at, %hi(D_802B6770) /* E28B98 802B6168 C42C6770 */ lwc1 $f12, %lo(D_802B6770)($at) /* E28B9C 802B616C 46146302 */ mul.s $f12, $f12, $f20 -/* E28BA0 802B6170 00000000 */ nop +/* E28BA0 802B6170 00000000 */ nop /* E28BA4 802B6174 0220282D */ daddu $a1, $s1, $zero /* E28BA8 802B6178 C7A00028 */ lwc1 $f0, 0x28($sp) /* E28BAC 802B617C 3C014040 */ lui $at, 0x4040 /* E28BB0 802B6180 4481A000 */ mtc1 $at, $f20 /* E28BB4 802B6184 0200302D */ daddu $a2, $s0, $zero /* E28BB8 802B6188 46140502 */ mul.s $f20, $f0, $f20 -/* E28BBC 802B618C 00000000 */ nop +/* E28BBC 802B618C 00000000 */ nop /* E28BC0 802B6190 0C00A82D */ jal sin_cos_rad /* E28BC4 802B6194 46166303 */ div.s $f12, $f12, $f22 /* E28BC8 802B6198 C7A00028 */ lwc1 $f0, 0x28($sp) /* E28BCC 802B619C 46140102 */ mul.s $f4, $f0, $f20 -/* E28BD0 802B61A0 00000000 */ nop +/* E28BD0 802B61A0 00000000 */ nop /* E28BD4 802B61A4 C7A0002C */ lwc1 $f0, 0x2c($sp) /* E28BD8 802B61A8 46140182 */ mul.s $f6, $f0, $f20 -/* E28BDC 802B61AC 00000000 */ nop +/* E28BDC 802B61AC 00000000 */ nop /* E28BE0 802B61B0 3C01802B */ lui $at, %hi(D_802B6760) /* E28BE4 802B61B4 D4226760 */ ldc1 $f2, %lo(D_802B6760)($at) /* E28BE8 802B61B8 46002021 */ cvt.d.s $f0, $f4 /* E28BEC 802B61BC 46200005 */ abs.d $f0, $f0 /* E28BF0 802B61C0 4622003C */ c.lt.d $f0, $f2 -/* E28BF4 802B61C4 00000000 */ nop +/* E28BF4 802B61C4 00000000 */ nop /* E28BF8 802B61C8 45020011 */ bc1fl .L802B6210 /* E28BFC 802B61CC 46003021 */ cvt.d.s $f0, $f6 /* E28C00 802B61D0 44800000 */ mtc1 $zero, $f0 @@ -87,13 +87,13 @@ glabel func_802B609C_E28ACC /* E28C08 802B61D8 3421CCCD */ ori $at, $at, 0xcccd /* E28C0C 802B61DC 44811000 */ mtc1 $at, $f2 /* E28C10 802B61E0 4600203C */ c.lt.s $f4, $f0 -/* E28C14 802B61E4 00000000 */ nop +/* E28C14 802B61E4 00000000 */ nop /* E28C18 802B61E8 45000006 */ bc1f .L802B6204 /* E28C1C 802B61EC 46001106 */ mov.s $f4, $f2 /* E28C20 802B61F0 3C01BDCC */ lui $at, 0xbdcc /* E28C24 802B61F4 3421CCCD */ ori $at, $at, 0xcccd /* E28C28 802B61F8 44811000 */ mtc1 $at, $f2 -/* E28C2C 802B61FC 00000000 */ nop +/* E28C2C 802B61FC 00000000 */ nop /* E28C30 802B6200 46001106 */ mov.s $f4, $f2 .L802B6204: /* E28C34 802B6204 46003021 */ cvt.d.s $f0, $f6 @@ -102,7 +102,7 @@ glabel func_802B609C_E28ACC .L802B6210: /* E28C40 802B6210 46200005 */ abs.d $f0, $f0 /* E28C44 802B6214 4622003C */ c.lt.d $f0, $f2 -/* E28C48 802B6218 00000000 */ nop +/* E28C48 802B6218 00000000 */ nop /* E28C4C 802B621C 4500000F */ bc1f .L802B625C /* E28C50 802B6220 0240202D */ daddu $a0, $s2, $zero /* E28C54 802B6224 44800000 */ mtc1 $zero, $f0 @@ -110,13 +110,13 @@ glabel func_802B609C_E28ACC /* E28C5C 802B622C 3421CCCD */ ori $at, $at, 0xcccd /* E28C60 802B6230 44811000 */ mtc1 $at, $f2 /* E28C64 802B6234 4600303C */ c.lt.s $f6, $f0 -/* E28C68 802B6238 00000000 */ nop +/* E28C68 802B6238 00000000 */ nop /* E28C6C 802B623C 45000007 */ bc1f .L802B625C /* E28C70 802B6240 46001186 */ mov.s $f6, $f2 /* E28C74 802B6244 3C01BDCC */ lui $at, 0xbdcc /* E28C78 802B6248 3421CCCD */ ori $at, $at, 0xcccd /* E28C7C 802B624C 44811000 */ mtc1 $at, $f2 -/* E28C80 802B6250 00000000 */ nop +/* E28C80 802B6250 00000000 */ nop /* E28C84 802B6254 46001186 */ mov.s $f6, $f2 /* E28C88 802B6258 0240202D */ daddu $a0, $s2, $zero .L802B625C: @@ -150,7 +150,7 @@ glabel func_802B609C_E28ACC /* E28CF8 802B62C8 0C03791B */ jal func_800DE46C /* E28CFC 802B62CC AFA20020 */ sw $v0, 0x20($sp) /* E28D00 802B62D0 04400003 */ bltz $v0, .L802B62E0 -/* E28D04 802B62D4 00000000 */ nop +/* E28D04 802B62D4 00000000 */ nop /* E28D08 802B62D8 C7A00034 */ lwc1 $f0, 0x34($sp) /* E28D0C 802B62DC E640002C */ swc1 $f0, 0x2c($s2) .L802B62E0: @@ -161,20 +161,20 @@ glabel func_802B609C_E28ACC /* E28D20 802B62F0 84430086 */ lh $v1, 0x86($v0) /* E28D24 802B62F4 2402000A */ addiu $v0, $zero, 0xa /* E28D28 802B62F8 14620003 */ bne $v1, $v0, .L802B6308 -/* E28D2C 802B62FC 00000000 */ nop +/* E28D2C 802B62FC 00000000 */ nop /* E28D30 802B6300 3C0141F0 */ lui $at, 0x41f0 /* E28D34 802B6304 4481A000 */ mtc1 $at, $f20 .L802B6308: /* E28D38 802B6308 3C018011 */ lui $at, %hi(D_8010C990) /* E28D3C 802B630C C420C990 */ lwc1 $f0, %lo(D_8010C990)($at) /* E28D40 802B6310 4614003C */ c.lt.s $f0, $f20 -/* E28D44 802B6314 00000000 */ nop +/* E28D44 802B6314 00000000 */ nop /* E28D48 802B6318 45000005 */ bc1f .L802B6330 -/* E28D4C 802B631C 00000000 */ nop +/* E28D4C 802B631C 00000000 */ nop /* E28D50 802B6320 0C039769 */ jal set_action_state /* E28D54 802B6324 24040008 */ addiu $a0, $zero, 8 /* E28D58 802B6328 0C038C1B */ jal gravity_use_fall_parms -/* E28D5C 802B632C 00000000 */ nop +/* E28D5C 802B632C 00000000 */ nop .L802B6330: /* E28D60 802B6330 8FBF005C */ lw $ra, 0x5c($sp) /* E28D64 802B6334 8FB20058 */ lw $s2, 0x58($sp) diff --git a/asm/nonmatchings/code_E28A30/func_802B6350_E28D80.s b/asm/nonmatchings/code_E28A30/func_802B6350_E28D80.s index 18608c0ef4..0817916a4a 100644 --- a/asm/nonmatchings/code_E28A30/func_802B6350_E28D80.s +++ b/asm/nonmatchings/code_E28A30/func_802B6350_E28D80.s @@ -30,7 +30,7 @@ glabel func_802B6350_E28D80 /* E28DE0 802B63B0 A4C20008 */ sh $v0, 8($a2) /* E28DE4 802B63B4 00021400 */ sll $v0, $v0, 0x10 /* E28DE8 802B63B8 14400003 */ bnez $v0, .L802B63C8 -/* E28DEC 802B63BC 00000000 */ nop +/* E28DEC 802B63BC 00000000 */ nop /* E28DF0 802B63C0 0C039769 */ jal set_action_state /* E28DF4 802B63C4 0000202D */ daddu $a0, $zero, $zero .L802B63C8: diff --git a/asm/nonmatchings/code_E28A30/func_802B63D4_E28E04.s b/asm/nonmatchings/code_E28A30/func_802B63D4_E28E04.s index d4285a7160..81bd3e138e 100644 --- a/asm/nonmatchings/code_E28A30/func_802B63D4_E28E04.s +++ b/asm/nonmatchings/code_E28A30/func_802B63D4_E28E04.s @@ -37,7 +37,7 @@ glabel func_802B63D4_E28E04 /* E28E7C 802B644C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* E28E80 802B6450 80420070 */ lb $v0, 0x70($v0) /* E28E84 802B6454 14400003 */ bnez $v0, .L802B6464 -/* E28E88 802B6458 00000000 */ nop +/* E28E88 802B6458 00000000 */ nop /* E28E8C 802B645C 0C039769 */ jal set_action_state /* E28E90 802B6460 0000202D */ daddu $a0, $zero, $zero .L802B6464: diff --git a/asm/nonmatchings/code_E28A30/func_802B6478_E28EA8.s b/asm/nonmatchings/code_E28A30/func_802B6478_E28EA8.s index 5f993cbecc..f51278ccbd 100644 --- a/asm/nonmatchings/code_E28A30/func_802B6478_E28EA8.s +++ b/asm/nonmatchings/code_E28A30/func_802B6478_E28EA8.s @@ -27,7 +27,7 @@ glabel func_802B6478_E28EA8 /* E28EFC 802B64CC 8E020004 */ lw $v0, 4($s0) /* E28F00 802B64D0 30420200 */ andi $v0, $v0, 0x200 /* E28F04 802B64D4 14400008 */ bnez $v0, .L802B64F8 -/* E28F08 802B64D8 00000000 */ nop +/* E28F08 802B64D8 00000000 */ nop /* E28F0C 802B64DC 0C039769 */ jal set_action_state /* E28F10 802B64E0 0000202D */ daddu $a0, $zero, $zero /* E28F14 802B64E4 3C03FFF7 */ lui $v1, 0xfff7 diff --git a/asm/nonmatchings/code_E28A30/func_802B6508_E28F38.s b/asm/nonmatchings/code_E28A30/func_802B6508_E28F38.s index b5e29f48f8..14886b8f30 100644 --- a/asm/nonmatchings/code_E28A30/func_802B6508_E28F38.s +++ b/asm/nonmatchings/code_E28A30/func_802B6508_E28F38.s @@ -23,51 +23,51 @@ glabel func_802B6508_E28F38 /* E28F80 802B6550 C7A20010 */ lwc1 $f2, 0x10($sp) /* E28F84 802B6554 3C014234 */ lui $at, 0x4234 /* E28F88 802B6558 44810000 */ mtc1 $at, $f0 -/* E28F8C 802B655C 00000000 */ nop +/* E28F8C 802B655C 00000000 */ nop /* E28F90 802B6560 4602003E */ c.le.s $f0, $f2 -/* E28F94 802B6564 00000000 */ nop +/* E28F94 802B6564 00000000 */ nop /* E28F98 802B6568 45000008 */ bc1f .L802B658C -/* E28F9C 802B656C 00000000 */ nop +/* E28F9C 802B656C 00000000 */ nop /* E28FA0 802B6570 3C014307 */ lui $at, 0x4307 /* E28FA4 802B6574 44810000 */ mtc1 $at, $f0 -/* E28FA8 802B6578 00000000 */ nop +/* E28FA8 802B6578 00000000 */ nop /* E28FAC 802B657C 4600103E */ c.le.s $f2, $f0 -/* E28FB0 802B6580 00000000 */ nop +/* E28FB0 802B6580 00000000 */ nop /* E28FB4 802B6584 45010011 */ bc1t .L802B65CC /* E28FB8 802B6588 3C040008 */ lui $a0, 8 .L802B658C: /* E28FBC 802B658C 3C014361 */ lui $at, 0x4361 /* E28FC0 802B6590 44810000 */ mtc1 $at, $f0 -/* E28FC4 802B6594 00000000 */ nop +/* E28FC4 802B6594 00000000 */ nop /* E28FC8 802B6598 4602003E */ c.le.s $f0, $f2 -/* E28FCC 802B659C 00000000 */ nop +/* E28FCC 802B659C 00000000 */ nop /* E28FD0 802B65A0 4500000E */ bc1f .L802B65DC /* E28FD4 802B65A4 3C040006 */ lui $a0, 6 /* E28FD8 802B65A8 3C01439D */ lui $at, 0x439d /* E28FDC 802B65AC 34218000 */ ori $at, $at, 0x8000 /* E28FE0 802B65B0 44810000 */ mtc1 $at, $f0 -/* E28FE4 802B65B4 00000000 */ nop +/* E28FE4 802B65B4 00000000 */ nop /* E28FE8 802B65B8 4600103E */ c.le.s $f2, $f0 -/* E28FEC 802B65BC 00000000 */ nop +/* E28FEC 802B65BC 00000000 */ nop /* E28FF0 802B65C0 45000006 */ bc1f .L802B65DC -/* E28FF4 802B65C4 00000000 */ nop +/* E28FF4 802B65C4 00000000 */ nop /* E28FF8 802B65C8 3C040008 */ lui $a0, 8 .L802B65CC: /* E28FFC 802B65CC 0C037FDE */ jal func_800DFF78 /* E29000 802B65D0 34840020 */ ori $a0, $a0, 0x20 /* E29004 802B65D4 080AD979 */ j .L802B65E4 -/* E29008 802B65D8 00000000 */ nop +/* E29008 802B65D8 00000000 */ nop .L802B65DC: /* E2900C 802B65DC 0C037FBF */ jal func_800DFEFC /* E29010 802B65E0 34840004 */ ori $a0, $a0, 4 .L802B65E4: /* E29014 802B65E4 0C039858 */ jal check_input_jump -/* E29018 802B65E8 00000000 */ nop +/* E29018 802B65E8 00000000 */ nop /* E2901C 802B65EC 8E020004 */ lw $v0, 4($s0) /* E29020 802B65F0 3C030080 */ lui $v1, 0x80 /* E29024 802B65F4 00431024 */ and $v0, $v0, $v1 /* E29028 802B65F8 1040000B */ beqz $v0, .L802B6628 -/* E2902C 802B65FC 00000000 */ nop +/* E2902C 802B65FC 00000000 */ nop /* E29030 802B6600 86020008 */ lh $v0, 8($s0) /* E29034 802B6604 96030008 */ lhu $v1, 8($s0) /* E29038 802B6608 10400007 */ beqz $v0, .L802B6628 @@ -75,7 +75,7 @@ glabel func_802B6508_E28F38 /* E29040 802B6610 A6020008 */ sh $v0, 8($s0) /* E29044 802B6614 00021400 */ sll $v0, $v0, 0x10 /* E29048 802B6618 14400003 */ bnez $v0, .L802B6628 -/* E2904C 802B661C 00000000 */ nop +/* E2904C 802B661C 00000000 */ nop /* E29050 802B6620 0C039769 */ jal set_action_state /* E29054 802B6624 0000202D */ daddu $a0, $zero, $zero .L802B6628: diff --git a/asm/nonmatchings/code_E28A30/func_802B6638_E29068.s b/asm/nonmatchings/code_E28A30/func_802B6638_E29068.s index f2f9bdb274..0c75506bb5 100644 --- a/asm/nonmatchings/code_E28A30/func_802B6638_E29068.s +++ b/asm/nonmatchings/code_E28A30/func_802B6638_E29068.s @@ -29,7 +29,7 @@ glabel func_802B6638_E29068 /* E290C4 802B6694 2402001E */ addiu $v0, $zero, 0x1e /* E290C8 802B6698 30822000 */ andi $v0, $a0, 0x2000 /* E290CC 802B669C 14400005 */ bnez $v0, .L802B66B4 -/* E290D0 802B66A0 00000000 */ nop +/* E290D0 802B66A0 00000000 */ nop /* E290D4 802B66A4 0C037FDE */ jal func_800DFF78 /* E290D8 802B66A8 3C04000C */ lui $a0, 0xc /* E290DC 802B66AC 080AD9B7 */ j .L802B66DC @@ -43,7 +43,7 @@ glabel func_802B6638_E29068 /* E290F8 802B66C8 00822021 */ addu $a0, $a0, $v0 /* E290FC 802B66CC 8C847C28 */ lw $a0, %lo(D_800F7C28)($a0) /* E29100 802B66D0 0C0398DB */ jal func_800E636C -/* E29104 802B66D4 00000000 */ nop +/* E29104 802B66D4 00000000 */ nop /* E29108 802B66D8 2402001E */ addiu $v0, $zero, 0x1e .L802B66DC: /* E2910C 802B66DC A6020008 */ sh $v0, 8($s0) @@ -51,7 +51,7 @@ glabel func_802B6638_E29068 /* E29110 802B66E0 8E040004 */ lw $a0, 4($s0) /* E29114 802B66E4 30821000 */ andi $v0, $a0, 0x1000 /* E29118 802B66E8 10400019 */ beqz $v0, .L802B6750 -/* E2911C 802B66EC 00000000 */ nop +/* E2911C 802B66EC 00000000 */ nop /* E29120 802B66F0 86020008 */ lh $v0, 8($s0) /* E29124 802B66F4 96030008 */ lhu $v1, 8($s0) /* E29128 802B66F8 10400003 */ beqz $v0, .L802B6708 @@ -67,7 +67,7 @@ glabel func_802B6638_E29068 /* E2914C 802B671C 0C037FDE */ jal func_800DFF78 /* E29150 802B6720 34840001 */ ori $a0, $a0, 1 /* E29154 802B6724 080AD9D4 */ j .L802B6750 -/* E29158 802B6728 00000000 */ nop +/* E29158 802B6728 00000000 */ nop .L802B672C: /* E2915C 802B672C 8203000C */ lb $v1, 0xc($s0) /* E29160 802B6730 00031040 */ sll $v0, $v1, 1 @@ -77,7 +77,7 @@ glabel func_802B6638_E29068 /* E29170 802B6740 00822021 */ addu $a0, $a0, $v0 /* E29174 802B6744 8C847C1C */ lw $a0, %lo(D_800F7C1C)($a0) /* E29178 802B6748 0C0398DB */ jal func_800E636C -/* E2917C 802B674C 00000000 */ nop +/* E2917C 802B674C 00000000 */ nop .L802B6750: /* E29180 802B6750 8FBF0014 */ lw $ra, 0x14($sp) /* E29184 802B6754 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_E291A0/func_802B6000_E291A0.s b/asm/nonmatchings/code_E291A0/func_802B6000_E291A0.s index 4d021a0803..faabae81c8 100644 --- a/asm/nonmatchings/code_E291A0/func_802B6000_E291A0.s +++ b/asm/nonmatchings/code_E291A0/func_802B6000_E291A0.s @@ -23,17 +23,18 @@ glabel func_802B6000_E291A0 /* E291E8 802B6048 0C038045 */ jal disable_player_static_collisions /* E291EC 802B604C AC830000 */ sw $v1, ($a0) /* E291F0 802B6050 0C03805E */ jal disable_player_input -/* E291F4 802B6054 00000000 */ nop +/* E291F4 802B6054 00000000 */ nop .L802B6058: /* E291F8 802B6058 822300B6 */ lb $v1, 0xb6($s1) /* E291FC 802B605C 2C620006 */ sltiu $v0, $v1, 6 /* E29200 802B6060 1040008D */ beqz $v0, .L802B6298 /* E29204 802B6064 00031080 */ sll $v0, $v1, 2 -/* E29208 802B6068 3C01802B */ lui $at, %hi(D_802B62B0) +/* E29208 802B6068 3C01802B */ lui $at, %hi(jtbl_802B62B0_E29450) /* E2920C 802B606C 00220821 */ addu $at, $at, $v0 -/* E29210 802B6070 8C2262B0 */ lw $v0, %lo(D_802B62B0)($at) +/* E29210 802B6070 8C2262B0 */ lw $v0, %lo(jtbl_802B62B0_E29450)($at) /* E29214 802B6074 00400008 */ jr $v0 -/* E29218 802B6078 00000000 */ nop +/* E29218 802B6078 00000000 */ nop +glabel L802B607C_E2921C /* E2921C 802B607C 3C040001 */ lui $a0, 1 /* E29220 802B6080 0C037FBF */ jal func_800DFEFC /* E29224 802B6084 3484002E */ ori $a0, $a0, 0x2e @@ -63,7 +64,8 @@ glabel func_802B6000_E291A0 /* E29284 802B60E4 3C01802B */ lui $at, %hi(D_802B62DC) /* E29288 802B60E8 E42062DC */ swc1 $f0, %lo(D_802B62DC)($at) /* E2928C 802B60EC 080AD8A6 */ j .L802B6298 -/* E29290 802B60F0 00000000 */ nop +/* E29290 802B60F0 00000000 */ nop +glabel L802B60F4_E29294 /* E29294 802B60F4 26240028 */ addiu $a0, $s1, 0x28 /* E29298 802B60F8 3C10802B */ lui $s0, %hi(D_802B62D0) /* E2929C 802B60FC 261062D0 */ addiu $s0, $s0, %lo(D_802B62D0) @@ -96,6 +98,7 @@ glabel func_802B6000_E291A0 /* E29308 802B6168 922200B6 */ lbu $v0, 0xb6($s1) /* E2930C 802B616C 080AD888 */ j .L802B6220 /* E29310 802B6170 24420001 */ addiu $v0, $v0, 1 +glabel L802B6174_E29314 /* E29314 802B6174 26240028 */ addiu $a0, $s1, 0x28 /* E29318 802B6178 3C10802B */ lui $s0, %hi(D_802B62D0) /* E2931C 802B617C 261062D0 */ addiu $s0, $s0, %lo(D_802B62D0) @@ -142,6 +145,7 @@ glabel func_802B6000_E291A0 .L802B6220: /* E293C0 802B6220 080AD8A6 */ j .L802B6298 /* E293C4 802B6224 A22200B6 */ sb $v0, 0xb6($s1) +glabel L802B6228_E293C8 /* E293C8 802B6228 962200BC */ lhu $v0, 0xbc($s1) /* E293CC 802B622C 1040001A */ beqz $v0, .L802B6298 /* E293D0 802B6230 3C040001 */ lui $a0, 1 @@ -152,6 +156,7 @@ glabel func_802B6000_E291A0 /* E293E4 802B6244 2402000F */ addiu $v0, $zero, 0xf /* E293E8 802B6248 080AD8A6 */ j .L802B6298 /* E293EC 802B624C A6220008 */ sh $v0, 8($s1) +glabel L802B6250_E293F0 /* E293F0 802B6250 86220008 */ lh $v0, 8($s1) /* E293F4 802B6254 96230008 */ lhu $v1, 8($s1) /* E293F8 802B6258 10400003 */ beqz $v0, .L802B6268 @@ -160,9 +165,9 @@ glabel func_802B6000_E291A0 /* E29404 802B6264 A6220008 */ sh $v0, 8($s1) .L802B6268: /* E29408 802B6268 0C038050 */ jal enable_player_static_collisions -/* E2940C 802B626C 00000000 */ nop +/* E2940C 802B626C 00000000 */ nop /* E29410 802B6270 0C038069 */ jal enable_player_input -/* E29414 802B6274 00000000 */ nop +/* E29414 802B6274 00000000 */ nop /* E29418 802B6278 0C039769 */ jal set_action_state /* E2941C 802B627C 0000202D */ daddu $a0, $zero, $zero /* E29420 802B6280 3C02800A */ lui $v0, %hi(D_8009A650) @@ -172,6 +177,7 @@ glabel func_802B6000_E291A0 /* E29430 802B6290 00641824 */ and $v1, $v1, $a0 /* E29434 802B6294 AC430000 */ sw $v1, ($v0) .L802B6298: +glabel L802B6298_E29438 /* E29438 802B6298 8FBF0020 */ lw $ra, 0x20($sp) /* E2943C 802B629C 8FB1001C */ lw $s1, 0x1c($sp) /* E29440 802B62A0 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/nonmatchings/code_E29470/func_802B60A4_E29514.s b/asm/nonmatchings/code_E29470/func_802B60A4_E29514.s index 4473cce51f..4ef0a392e2 100644 --- a/asm/nonmatchings/code_E29470/func_802B60A4_E29514.s +++ b/asm/nonmatchings/code_E29470/func_802B60A4_E29514.s @@ -453,11 +453,12 @@ glabel func_802B60A4_E29514 /* E29BD8 802B6768 2C620009 */ sltiu $v0, $v1, 9 /* E29BDC 802B676C 104001BA */ beqz $v0, .L802B6E58 /* E29BE0 802B6770 00031080 */ sll $v0, $v1, 2 -/* E29BE4 802B6774 3C01802B */ lui $at, %hi(D_802B6EA8) +/* E29BE4 802B6774 3C01802B */ lui $at, %hi(jtbl_802B6EA8_E2A318) /* E29BE8 802B6778 00220821 */ addu $at, $at, $v0 -/* E29BEC 802B677C 8C226EA8 */ lw $v0, %lo(D_802B6EA8)($at) +/* E29BEC 802B677C 8C226EA8 */ lw $v0, %lo(jtbl_802B6EA8_E2A318)($at) /* E29BF0 802B6780 00400008 */ jr $v0 /* E29BF4 802B6784 00000000 */ nop +glabel L802B6788_E29BF8 /* E29BF8 802B6788 3C04802B */ lui $a0, %hi(D_802B6ED0) /* E29BFC 802B678C 8C846ED0 */ lw $a0, %lo(D_802B6ED0)($a0) /* E29C00 802B6790 0480004D */ bltz $a0, .L802B68C8 @@ -611,6 +612,7 @@ glabel func_802B60A4_E29514 /* E29E40 802B69D0 A26200B6 */ sb $v0, 0xb6($s3) /* E29E44 802B69D4 080ADB96 */ j .L802B6E58 /* E29E48 802B69D8 00000000 */ nop +glabel L802B69DC_E29E4C /* E29E4C 802B69DC 3C02802B */ lui $v0, %hi(D_802B6EE4) /* E29E50 802B69E0 24426EE4 */ addiu $v0, $v0, %lo(D_802B6EE4) /* E29E54 802B69E4 C4400000 */ lwc1 $f0, ($v0) @@ -763,6 +765,7 @@ glabel func_802B60A4_E29514 /* E2A094 802B6C24 24020014 */ addiu $v0, $zero, 0x14 /* E2A098 802B6C28 080ADB96 */ j .L802B6E58 /* E2A09C 802B6C2C A6620008 */ sh $v0, 8($s3) +glabel L802B6C30_E2A0A0 /* E2A0A0 802B6C30 C66000A8 */ lwc1 $f0, 0xa8($s3) /* E2A0A4 802B6C34 3C01802B */ lui $at, %hi(D_802B6EE4) /* E2A0A8 802B6C38 C42C6EE4 */ lwc1 $f12, %lo(D_802B6EE4)($at) @@ -827,6 +830,7 @@ glabel func_802B60A4_E29514 /* E2A188 802B6D18 E4420064 */ swc1 $f2, 0x64($v0) /* E2A18C 802B6D1C 080ADB96 */ j .L802B6E58 /* E2A190 802B6D20 E4440068 */ swc1 $f4, 0x68($v0) +glabel L802B6D24_E2A194 /* E2A194 802B6D24 3C02802B */ lui $v0, %hi(D_802B6EE4) /* E2A198 802B6D28 24426EE4 */ addiu $v0, $v0, %lo(D_802B6EE4) /* E2A19C 802B6D2C C4400000 */ lwc1 $f0, ($v0) @@ -888,6 +892,7 @@ glabel func_802B60A4_E29514 /* E2A270 802B6E00 080ADB96 */ j .L802B6E58 /* E2A274 802B6E04 A6620008 */ sh $v0, 8($s3) .L802B6E08: +glabel L802B6E08_E2A278 /* E2A278 802B6E08 0C038050 */ jal enable_player_static_collisions /* E2A27C 802B6E0C 00000000 */ nop /* E2A280 802B6E10 0C038069 */ jal enable_player_input @@ -909,6 +914,7 @@ glabel func_802B60A4_E29514 /* E2A2C0 802B6E50 00431024 */ and $v0, $v0, $v1 /* E2A2C4 802B6E54 AC820000 */ sw $v0, ($a0) .L802B6E58: +glabel L802B6E58_E2A2C8 /* E2A2C8 802B6E58 8FBF003C */ lw $ra, 0x3c($sp) /* E2A2CC 802B6E5C 8FB40038 */ lw $s4, 0x38($sp) /* E2A2D0 802B6E60 8FB30034 */ lw $s3, 0x34($sp) diff --git a/asm/nonmatchings/code_E2A6B0/func_802B6000_E2A6B0.s b/asm/nonmatchings/code_E2A6B0/func_802B6000_E2A6B0.s index 8fae980efd..427f52cf3f 100644 --- a/asm/nonmatchings/code_E2A6B0/func_802B6000_E2A6B0.s +++ b/asm/nonmatchings/code_E2A6B0/func_802B6000_E2A6B0.s @@ -42,9 +42,9 @@ glabel func_802B6000_E2A6B0 /* E2A740 802B6090 46220001 */ sub.d $f0, $f0, $f2 /* E2A744 802B6094 44801000 */ mtc1 $zero, $f2 /* E2A748 802B6098 44801800 */ mtc1 $zero, $f3 -/* E2A74C 802B609C 00000000 */ nop +/* E2A74C 802B609C 00000000 */ nop /* E2A750 802B60A0 4620103C */ c.lt.d $f2, $f0 -/* E2A754 802B60A4 00000000 */ nop +/* E2A754 802B60A4 00000000 */ nop /* E2A758 802B60A8 45030015 */ bc1tl .L802B6100 /* E2A75C 802B60AC 0000802D */ daddu $s0, $zero, $zero /* E2A760 802B60B0 C64C0028 */ lwc1 $f12, 0x28($s2) @@ -63,7 +63,7 @@ glabel func_802B6000_E2A6B0 /* E2A794 802B60E4 4600A521 */ cvt.d.s $f20, $f20 /* E2A798 802B60E8 4620A505 */ abs.d $f20, $f20 /* E2A79C 802B60EC 4634003C */ c.lt.d $f0, $f20 -/* E2A7A0 802B60F0 00000000 */ nop +/* E2A7A0 802B60F0 00000000 */ nop /* E2A7A4 802B60F4 45000003 */ bc1f .L802B6104 /* E2A7A8 802B60F8 0200102D */ daddu $v0, $s0, $zero /* E2A7AC 802B60FC 0000802D */ daddu $s0, $zero, $zero diff --git a/asm/nonmatchings/code_E2A6B0/func_802B6120_E2A7D0.s b/asm/nonmatchings/code_E2A6B0/func_802B6120_E2A7D0.s index fa4fb790f1..36002edbc2 100644 --- a/asm/nonmatchings/code_E2A6B0/func_802B6120_E2A7D0.s +++ b/asm/nonmatchings/code_E2A6B0/func_802B6120_E2A7D0.s @@ -37,7 +37,7 @@ glabel func_802B6120_E2A7D0 /* E2A850 802B61A0 0C00A580 */ jal mem_clear /* E2A854 802B61A4 AE220000 */ sw $v0, ($s1) /* E2A858 802B61A8 0C038045 */ jal disable_player_static_collisions -/* E2A85C 802B61AC 00000000 */ nop +/* E2A85C 802B61AC 00000000 */ nop /* E2A860 802B61B0 3C01C000 */ lui $at, 0xc000 /* E2A864 802B61B4 44812000 */ mtc1 $at, $f4 /* E2A868 802B61B8 C62200A8 */ lwc1 $f2, 0xa8($s1) @@ -48,16 +48,16 @@ glabel func_802B6120_E2A7D0 /* E2A87C 802B61CC A62000C2 */ sh $zero, 0xc2($s1) /* E2A880 802B61D0 AE200054 */ sw $zero, 0x54($s1) /* E2A884 802B61D4 4602003E */ c.le.s $f0, $f2 -/* E2A888 802B61D8 00000000 */ nop +/* E2A888 802B61D8 00000000 */ nop /* E2A88C 802B61DC 4500000A */ bc1f .L802B6208 /* E2A890 802B61E0 AE20008C */ sw $zero, 0x8c($s1) /* E2A894 802B61E4 3C014387 */ lui $at, 0x4387 /* E2A898 802B61E8 44810000 */ mtc1 $at, $f0 -/* E2A89C 802B61EC 00000000 */ nop +/* E2A89C 802B61EC 00000000 */ nop /* E2A8A0 802B61F0 4600103C */ c.lt.s $f2, $f0 -/* E2A8A4 802B61F4 00000000 */ nop +/* E2A8A4 802B61F4 00000000 */ nop /* E2A8A8 802B61F8 45000003 */ bc1f .L802B6208 -/* E2A8AC 802B61FC 00000000 */ nop +/* E2A8AC 802B61FC 00000000 */ nop /* E2A8B0 802B6200 3C014000 */ lui $at, 0x4000 /* E2A8B4 802B6204 44812000 */ mtc1 $at, $f4 .L802B6208: @@ -102,20 +102,21 @@ glabel func_802B6120_E2A7D0 /* E2A948 802B6298 2C620033 */ sltiu $v0, $v1, 0x33 /* E2A94C 802B629C 104001D4 */ beqz $v0, .L802B69F0 /* E2A950 802B62A0 00031080 */ sll $v0, $v1, 2 -/* E2A954 802B62A4 3C01802B */ lui $at, %hi(D_802B6D90) +/* E2A954 802B62A4 3C01802B */ lui $at, %hi(jtbl_802B6D90_E2B440) /* E2A958 802B62A8 00220821 */ addu $at, $at, $v0 -/* E2A95C 802B62AC 8C226D90 */ lw $v0, %lo(D_802B6D90)($at) +/* E2A95C 802B62AC 8C226D90 */ lw $v0, %lo(jtbl_802B6D90_E2B440)($at) /* E2A960 802B62B0 00400008 */ jr $v0 -/* E2A964 802B62B4 00000000 */ nop +/* E2A964 802B62B4 00000000 */ nop +glabel L802B62B8_E2A968 /* E2A968 802B62B8 C6220090 */ lwc1 $f2, 0x90($s1) /* E2A96C 802B62BC 44800000 */ mtc1 $zero, $f0 -/* E2A970 802B62C0 00000000 */ nop +/* E2A970 802B62C0 00000000 */ nop /* E2A974 802B62C4 46001032 */ c.eq.s $f2, $f0 -/* E2A978 802B62C8 00000000 */ nop +/* E2A978 802B62C8 00000000 */ nop /* E2A97C 802B62CC 45000015 */ bc1f .L802B6324 -/* E2A980 802B62D0 00000000 */ nop +/* E2A980 802B62D0 00000000 */ nop /* E2A984 802B62D4 0C0399B1 */ jal func_800E66C4 -/* E2A988 802B62D8 00000000 */ nop +/* E2A988 802B62D8 00000000 */ nop /* E2A98C 802B62DC 0441000A */ bgez $v0, .L802B6308 /* E2A990 802B62E0 3C04000C */ lui $a0, 0xc /* E2A994 802B62E4 0C037FBF */ jal func_800DFEFC @@ -136,6 +137,7 @@ glabel func_802B6120_E2A7D0 /* E2A9CC 802B631C A6220008 */ sh $v0, 8($s1) /* E2A9D0 802B6320 AE400008 */ sw $zero, 8($s2) .L802B6324: +glabel L802B6324_E2A9D4 /* E2A9D4 802B6324 96220008 */ lhu $v0, 8($s1) /* E2A9D8 802B6328 2442FFFF */ addiu $v0, $v0, -1 /* E2A9DC 802B632C A6220008 */ sh $v0, 8($s1) @@ -155,7 +157,8 @@ glabel func_802B6120_E2A7D0 /* E2AA10 802B6360 0C009C22 */ jal func_80027088 /* E2AA14 802B6364 24040002 */ addiu $a0, $zero, 2 /* E2AA18 802B6368 080ADA7C */ j .L802B69F0 -/* E2AA1C 802B636C 00000000 */ nop +/* E2AA1C 802B636C 00000000 */ nop +glabel L802B6370_E2AA20 /* E2AA20 802B6370 962200BC */ lhu $v0, 0xbc($s1) /* E2AA24 802B6374 1040019E */ beqz $v0, .L802B69F0 /* E2AA28 802B6378 240400FD */ addiu $a0, $zero, 0xfd @@ -171,7 +174,8 @@ glabel func_802B6120_E2A7D0 /* E2AA50 802B63A0 0C052736 */ jal play_sound_at_player /* E2AA54 802B63A4 A22300B6 */ sb $v1, 0xb6($s1) /* E2AA58 802B63A8 080ADA7C */ j .L802B69F0 -/* E2AA5C 802B63AC 00000000 */ nop +/* E2AA5C 802B63AC 00000000 */ nop +glabel L802B63B0_E2AA60 /* E2AA60 802B63B0 96220008 */ lhu $v0, 8($s1) /* E2AA64 802B63B4 2442FFFF */ addiu $v0, $v0, -1 /* E2AA68 802B63B8 A6220008 */ sh $v0, 8($s1) @@ -183,9 +187,10 @@ glabel func_802B6120_E2A7D0 /* E2AA80 802B63D0 2403000A */ addiu $v1, $zero, 0xa /* E2AA84 802B63D4 080ADA05 */ j .L802B6814 /* E2AA88 802B63D8 AE43000C */ sw $v1, 0xc($s2) +glabel L802B63DC_E2AA8C /* E2AA8C 802B63DC C63400A8 */ lwc1 $f20, 0xa8($s1) /* E2AA90 802B63E0 0C0ADB3C */ jal func_802B6CF0_E2B3A0 -/* E2AA94 802B63E4 00000000 */ nop +/* E2AA94 802B63E4 00000000 */ nop /* E2AA98 802B63E8 C66C006C */ lwc1 $f12, 0x6c($s3) /* E2AA9C 802B63EC C62000A8 */ lwc1 $f0, 0xa8($s1) /* E2AAA0 802B63F0 46006301 */ sub.s $f12, $f12, $f0 @@ -199,42 +204,42 @@ glabel func_802B6120_E2A7D0 /* E2AAC0 802B6410 E6200080 */ swc1 $f0, 0x80($s1) /* E2AAC4 802B6414 C642001C */ lwc1 $f2, 0x1c($s2) /* E2AAC8 802B6418 44800000 */ mtc1 $zero, $f0 -/* E2AACC 802B641C 00000000 */ nop +/* E2AACC 802B641C 00000000 */ nop /* E2AAD0 802B6420 4602003C */ c.lt.s $f0, $f2 -/* E2AAD4 802B6424 00000000 */ nop +/* E2AAD4 802B6424 00000000 */ nop /* E2AAD8 802B6428 45000010 */ bc1f .L802B646C /* E2AADC 802B642C 0000102D */ daddu $v0, $zero, $zero /* E2AAE0 802B6430 3C014387 */ lui $at, 0x4387 /* E2AAE4 802B6434 44811000 */ mtc1 $at, $f2 -/* E2AAE8 802B6438 00000000 */ nop +/* E2AAE8 802B6438 00000000 */ nop /* E2AAEC 802B643C 4602A03C */ c.lt.s $f20, $f2 -/* E2AAF0 802B6440 00000000 */ nop +/* E2AAF0 802B6440 00000000 */ nop /* E2AAF4 802B6444 45000006 */ bc1f .L802B6460 -/* E2AAF8 802B6448 00000000 */ nop +/* E2AAF8 802B6448 00000000 */ nop /* E2AAFC 802B644C C62000A8 */ lwc1 $f0, 0xa8($s1) /* E2AB00 802B6450 4600103E */ c.le.s $f2, $f0 -/* E2AB04 802B6454 00000000 */ nop +/* E2AB04 802B6454 00000000 */ nop /* E2AB08 802B6458 45030001 */ bc1tl .L802B6460 /* E2AB0C 802B645C 24020001 */ addiu $v0, $zero, 1 .L802B6460: /* E2AB10 802B6460 C642001C */ lwc1 $f2, 0x1c($s2) /* E2AB14 802B6464 44800000 */ mtc1 $zero, $f0 -/* E2AB18 802B6468 00000000 */ nop +/* E2AB18 802B6468 00000000 */ nop .L802B646C: /* E2AB1C 802B646C 4600103C */ c.lt.s $f2, $f0 -/* E2AB20 802B6470 00000000 */ nop +/* E2AB20 802B6470 00000000 */ nop /* E2AB24 802B6474 4500000D */ bc1f .L802B64AC -/* E2AB28 802B6478 00000000 */ nop +/* E2AB28 802B6478 00000000 */ nop /* E2AB2C 802B647C 3C014387 */ lui $at, 0x4387 /* E2AB30 802B6480 44811000 */ mtc1 $at, $f2 -/* E2AB34 802B6484 00000000 */ nop +/* E2AB34 802B6484 00000000 */ nop /* E2AB38 802B6488 4614103C */ c.lt.s $f2, $f20 -/* E2AB3C 802B648C 00000000 */ nop +/* E2AB3C 802B648C 00000000 */ nop /* E2AB40 802B6490 45000006 */ bc1f .L802B64AC -/* E2AB44 802B6494 00000000 */ nop +/* E2AB44 802B6494 00000000 */ nop /* E2AB48 802B6498 C62000A8 */ lwc1 $f0, 0xa8($s1) /* E2AB4C 802B649C 4602003E */ c.le.s $f0, $f2 -/* E2AB50 802B64A0 00000000 */ nop +/* E2AB50 802B64A0 00000000 */ nop /* E2AB54 802B64A4 45030001 */ bc1tl .L802B64AC /* E2AB58 802B64A8 24020001 */ addiu $v0, $zero, 1 .L802B64AC: @@ -250,7 +255,8 @@ glabel func_802B6120_E2A7D0 /* E2AB80 802B64D0 0C039940 */ jal func_800E6500 /* E2AB84 802B64D4 A22200B6 */ sb $v0, 0xb6($s1) /* E2AB88 802B64D8 080ADA7C */ j .L802B69F0 -/* E2AB8C 802B64DC 00000000 */ nop +/* E2AB8C 802B64DC 00000000 */ nop +glabel L802B64E0_E2AB90 /* E2AB90 802B64E0 8E220004 */ lw $v0, 4($s1) /* E2AB94 802B64E4 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* E2AB98 802B64E8 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) @@ -263,13 +269,14 @@ glabel func_802B6120_E2A7D0 /* E2ABB4 802B6504 24420001 */ addiu $v0, $v0, 1 /* E2ABB8 802B6508 080AD9FE */ j .L802B67F8 /* E2ABBC 802B650C A22200B6 */ sb $v0, 0xb6($s1) +glabel L802B6510_E2ABC0 /* E2ABC0 802B6510 C640001C */ lwc1 $f0, 0x1c($s2) /* E2ABC4 802B6514 44802000 */ mtc1 $zero, $f4 -/* E2ABC8 802B6518 00000000 */ nop +/* E2ABC8 802B6518 00000000 */ nop /* E2ABCC 802B651C 4600203C */ c.lt.s $f4, $f0 -/* E2ABD0 802B6520 00000000 */ nop +/* E2ABD0 802B6520 00000000 */ nop /* E2ABD4 802B6524 4500001B */ bc1f .L802B6594 -/* E2ABD8 802B6528 00000000 */ nop +/* E2ABD8 802B6528 00000000 */ nop /* E2ABDC 802B652C C6400020 */ lwc1 $f0, 0x20($s2) /* E2ABE0 802B6530 3C01802B */ lui $at, %hi(D_802B6E60) /* E2ABE4 802B6534 D4226E60 */ ldc1 $f2, %lo(D_802B6E60)($at) @@ -277,7 +284,7 @@ glabel func_802B6120_E2A7D0 /* E2ABEC 802B653C 46220001 */ sub.d $f0, $f0, $f2 /* E2ABF0 802B6540 46200020 */ cvt.s.d $f0, $f0 /* E2ABF4 802B6544 4604003E */ c.le.s $f0, $f4 -/* E2ABF8 802B6548 00000000 */ nop +/* E2ABF8 802B6548 00000000 */ nop /* E2ABFC 802B654C 450000F9 */ bc1f .L802B6934 /* E2AC00 802B6550 E6400020 */ swc1 $f0, 0x20($s2) /* E2AC04 802B6554 3C048011 */ lui $a0, %hi(D_8010C96C) @@ -304,7 +311,7 @@ glabel func_802B6120_E2A7D0 /* E2AC54 802B65A4 46220000 */ add.d $f0, $f0, $f2 /* E2AC58 802B65A8 46200020 */ cvt.s.d $f0, $f0 /* E2AC5C 802B65AC 4600203E */ c.le.s $f4, $f0 -/* E2AC60 802B65B0 00000000 */ nop +/* E2AC60 802B65B0 00000000 */ nop /* E2AC64 802B65B4 450000DF */ bc1f .L802B6934 /* E2AC68 802B65B8 E6400020 */ swc1 $f0, 0x20($s2) /* E2AC6C 802B65BC 3C048011 */ lui $a0, %hi(D_8010C96C) @@ -332,18 +339,19 @@ glabel func_802B6120_E2A7D0 /* E2ACC0 802B6610 E600000C */ swc1 $f0, 0xc($s0) /* E2ACC4 802B6614 080ADA4D */ j .L802B6934 /* E2ACC8 802B6618 A602008A */ sh $v0, 0x8a($s0) +glabel L802B661C_E2ACCC /* E2ACCC 802B661C 96220008 */ lhu $v0, 8($s1) /* E2ACD0 802B6620 2442FFFF */ addiu $v0, $v0, -1 /* E2ACD4 802B6624 A6220008 */ sh $v0, 8($s1) /* E2ACD8 802B6628 00021400 */ sll $v0, $v0, 0x10 /* E2ACDC 802B662C 144000F0 */ bnez $v0, .L802B69F0 -/* E2ACE0 802B6630 00000000 */ nop +/* E2ACE0 802B6630 00000000 */ nop /* E2ACE4 802B6634 0C009C22 */ jal func_80027088 /* E2ACE8 802B6638 0000202D */ daddu $a0, $zero, $zero /* E2ACEC 802B663C 3C048011 */ lui $a0, %hi(D_8010C96C) /* E2ACF0 802B6640 8C84C96C */ lw $a0, %lo(D_8010C96C)($a0) /* E2ACF4 802B6644 0C00E2B7 */ jal get_npc_by_index -/* E2ACF8 802B6648 00000000 */ nop +/* E2ACF8 802B6648 00000000 */ nop /* E2ACFC 802B664C 0040802D */ daddu $s0, $v0, $zero /* E2AD00 802B6650 3C03FFFB */ lui $v1, 0xfffb /* E2AD04 802B6654 3463FFFF */ ori $v1, $v1, 0xffff @@ -357,25 +365,27 @@ glabel func_802B6120_E2A7D0 /* E2AD24 802B6674 00451024 */ and $v0, $v0, $a1 /* E2AD28 802B6678 080ADA78 */ j .L802B69E0 /* E2AD2C 802B667C AE220000 */ sw $v0, ($s1) +glabel L802B6680_E2AD30 /* E2AD30 802B6680 96220008 */ lhu $v0, 8($s1) /* E2AD34 802B6684 2442FFFF */ addiu $v0, $v0, -1 /* E2AD38 802B6688 A6220008 */ sh $v0, 8($s1) /* E2AD3C 802B668C 00021400 */ sll $v0, $v0, 0x10 /* E2AD40 802B6690 14400004 */ bnez $v0, .L802B66A4 -/* E2AD44 802B6694 00000000 */ nop +/* E2AD44 802B6694 00000000 */ nop /* E2AD48 802B6698 922200B6 */ lbu $v0, 0xb6($s1) /* E2AD4C 802B669C 24420001 */ addiu $v0, $v0, 1 /* E2AD50 802B66A0 A22200B6 */ sb $v0, 0xb6($s1) .L802B66A4: /* E2AD54 802B66A4 0C0ADB3C */ jal func_802B6CF0_E2B3A0 -/* E2AD58 802B66A8 00000000 */ nop +/* E2AD58 802B66A8 00000000 */ nop /* E2AD5C 802B66AC C66C006C */ lwc1 $f12, 0x6c($s3) /* E2AD60 802B66B0 C62000A8 */ lwc1 $f0, 0xa8($s1) /* E2AD64 802B66B4 080ADA54 */ j .L802B6950 /* E2AD68 802B66B8 46006301 */ sub.s $f12, $f12, $f0 +glabel L802B66BC_E2AD6C /* E2AD6C 802B66BC C63400A8 */ lwc1 $f20, 0xa8($s1) /* E2AD70 802B66C0 0C0ADB3C */ jal func_802B6CF0_E2B3A0 -/* E2AD74 802B66C4 00000000 */ nop +/* E2AD74 802B66C4 00000000 */ nop /* E2AD78 802B66C8 C66C006C */ lwc1 $f12, 0x6c($s3) /* E2AD7C 802B66CC C62000A8 */ lwc1 $f0, 0xa8($s1) /* E2AD80 802B66D0 46006301 */ sub.s $f12, $f12, $f0 @@ -389,42 +399,42 @@ glabel func_802B6120_E2A7D0 /* E2ADA0 802B66F0 E6200080 */ swc1 $f0, 0x80($s1) /* E2ADA4 802B66F4 C642001C */ lwc1 $f2, 0x1c($s2) /* E2ADA8 802B66F8 44800000 */ mtc1 $zero, $f0 -/* E2ADAC 802B66FC 00000000 */ nop +/* E2ADAC 802B66FC 00000000 */ nop /* E2ADB0 802B6700 4602003C */ c.lt.s $f0, $f2 -/* E2ADB4 802B6704 00000000 */ nop +/* E2ADB4 802B6704 00000000 */ nop /* E2ADB8 802B6708 45000010 */ bc1f .L802B674C /* E2ADBC 802B670C 0000102D */ daddu $v0, $zero, $zero /* E2ADC0 802B6710 3C014387 */ lui $at, 0x4387 /* E2ADC4 802B6714 44811000 */ mtc1 $at, $f2 -/* E2ADC8 802B6718 00000000 */ nop +/* E2ADC8 802B6718 00000000 */ nop /* E2ADCC 802B671C 4602A03C */ c.lt.s $f20, $f2 -/* E2ADD0 802B6720 00000000 */ nop +/* E2ADD0 802B6720 00000000 */ nop /* E2ADD4 802B6724 45000006 */ bc1f .L802B6740 -/* E2ADD8 802B6728 00000000 */ nop +/* E2ADD8 802B6728 00000000 */ nop /* E2ADDC 802B672C C62000A8 */ lwc1 $f0, 0xa8($s1) /* E2ADE0 802B6730 4600103E */ c.le.s $f2, $f0 -/* E2ADE4 802B6734 00000000 */ nop +/* E2ADE4 802B6734 00000000 */ nop /* E2ADE8 802B6738 45030001 */ bc1tl .L802B6740 /* E2ADEC 802B673C 24020001 */ addiu $v0, $zero, 1 .L802B6740: /* E2ADF0 802B6740 C642001C */ lwc1 $f2, 0x1c($s2) /* E2ADF4 802B6744 44800000 */ mtc1 $zero, $f0 -/* E2ADF8 802B6748 00000000 */ nop +/* E2ADF8 802B6748 00000000 */ nop .L802B674C: /* E2ADFC 802B674C 4600103C */ c.lt.s $f2, $f0 -/* E2AE00 802B6750 00000000 */ nop +/* E2AE00 802B6750 00000000 */ nop /* E2AE04 802B6754 4500000D */ bc1f .L802B678C -/* E2AE08 802B6758 00000000 */ nop +/* E2AE08 802B6758 00000000 */ nop /* E2AE0C 802B675C 3C014387 */ lui $at, 0x4387 /* E2AE10 802B6760 44811000 */ mtc1 $at, $f2 -/* E2AE14 802B6764 00000000 */ nop +/* E2AE14 802B6764 00000000 */ nop /* E2AE18 802B6768 4614103C */ c.lt.s $f2, $f20 -/* E2AE1C 802B676C 00000000 */ nop +/* E2AE1C 802B676C 00000000 */ nop /* E2AE20 802B6770 45000006 */ bc1f .L802B678C -/* E2AE24 802B6774 00000000 */ nop +/* E2AE24 802B6774 00000000 */ nop /* E2AE28 802B6778 C62000A8 */ lwc1 $f0, 0xa8($s1) /* E2AE2C 802B677C 4602003E */ c.le.s $f0, $f2 -/* E2AE30 802B6780 00000000 */ nop +/* E2AE30 802B6780 00000000 */ nop /* E2AE34 802B6784 45030001 */ bc1tl .L802B678C /* E2AE38 802B6788 24020001 */ addiu $v0, $zero, 1 .L802B678C: @@ -457,28 +467,30 @@ glabel func_802B6120_E2A7D0 /* E2AEA0 802B67F0 080ADA7C */ j .L802B69F0 /* E2AEA4 802B67F4 A6220008 */ sh $v0, 8($s1) .L802B67F8: +glabel L802B67F8_E2AEA8 /* E2AEA8 802B67F8 96220008 */ lhu $v0, 8($s1) /* E2AEAC 802B67FC 2442FFFF */ addiu $v0, $v0, -1 /* E2AEB0 802B6800 A6220008 */ sh $v0, 8($s1) /* E2AEB4 802B6804 00021400 */ sll $v0, $v0, 0x10 /* E2AEB8 802B6808 14400004 */ bnez $v0, .L802B681C -/* E2AEBC 802B680C 00000000 */ nop +/* E2AEBC 802B680C 00000000 */ nop /* E2AEC0 802B6810 922200B6 */ lbu $v0, 0xb6($s1) .L802B6814: /* E2AEC4 802B6814 24420001 */ addiu $v0, $v0, 1 /* E2AEC8 802B6818 A22200B6 */ sb $v0, 0xb6($s1) .L802B681C: /* E2AECC 802B681C 0C0ADB3C */ jal func_802B6CF0_E2B3A0 -/* E2AED0 802B6820 00000000 */ nop +/* E2AED0 802B6820 00000000 */ nop /* E2AED4 802B6824 080ADA7C */ j .L802B69F0 -/* E2AED8 802B6828 00000000 */ nop +/* E2AED8 802B6828 00000000 */ nop +glabel L802B682C_E2AEDC /* E2AEDC 802B682C C640001C */ lwc1 $f0, 0x1c($s2) /* E2AEE0 802B6830 44802000 */ mtc1 $zero, $f4 -/* E2AEE4 802B6834 00000000 */ nop +/* E2AEE4 802B6834 00000000 */ nop /* E2AEE8 802B6838 4600203C */ c.lt.s $f4, $f0 -/* E2AEEC 802B683C 00000000 */ nop +/* E2AEEC 802B683C 00000000 */ nop /* E2AEF0 802B6840 4500001D */ bc1f .L802B68B8 -/* E2AEF4 802B6844 00000000 */ nop +/* E2AEF4 802B6844 00000000 */ nop /* E2AEF8 802B6848 C6400020 */ lwc1 $f0, 0x20($s2) /* E2AEFC 802B684C 3C01802B */ lui $at, %hi(D_802B6E70) /* E2AF00 802B6850 D4226E70 */ ldc1 $f2, %lo(D_802B6E70)($at) @@ -486,7 +498,7 @@ glabel func_802B6120_E2A7D0 /* E2AF08 802B6858 46220001 */ sub.d $f0, $f0, $f2 /* E2AF0C 802B685C 46200020 */ cvt.s.d $f0, $f0 /* E2AF10 802B6860 4604003E */ c.le.s $f0, $f4 -/* E2AF14 802B6864 00000000 */ nop +/* E2AF14 802B6864 00000000 */ nop /* E2AF18 802B6868 45000032 */ bc1f .L802B6934 /* E2AF1C 802B686C E6400020 */ swc1 $f0, 0x20($s2) /* E2AF20 802B6870 2402000A */ addiu $v0, $zero, 0xa @@ -515,7 +527,7 @@ glabel func_802B6120_E2A7D0 /* E2AF78 802B68C8 46220000 */ add.d $f0, $f0, $f2 /* E2AF7C 802B68CC 46200020 */ cvt.s.d $f0, $f0 /* E2AF80 802B68D0 4600203E */ c.le.s $f4, $f0 -/* E2AF84 802B68D4 00000000 */ nop +/* E2AF84 802B68D4 00000000 */ nop /* E2AF88 802B68D8 45000016 */ bc1f .L802B6934 /* E2AF8C 802B68DC E6400020 */ swc1 $f0, 0x20($s2) /* E2AF90 802B68E0 E6440020 */ swc1 $f4, 0x20($s2) @@ -529,13 +541,13 @@ glabel func_802B6120_E2A7D0 /* E2AFB0 802B6900 46046301 */ sub.s $f12, $f12, $f4 /* E2AFB4 802B6904 3C0142B4 */ lui $at, 0x42b4 /* E2AFB8 802B6908 44810000 */ mtc1 $at, $f0 -/* E2AFBC 802B690C 00000000 */ nop +/* E2AFBC 802B690C 00000000 */ nop /* E2AFC0 802B6910 46006301 */ sub.s $f12, $f12, $f0 /* E2AFC4 802B6914 3C018011 */ lui $at, %hi(D_8010C95C) /* E2AFC8 802B6918 AC20C95C */ sw $zero, %lo(D_8010C95C)($at) .L802B691C: /* E2AFCC 802B691C 0C00A6C9 */ jal clamp_angle -/* E2AFD0 802B6920 00000000 */ nop +/* E2AFD0 802B6920 00000000 */ nop /* E2AFD4 802B6924 4600018D */ trunc.w.s $f6, $f0 /* E2AFD8 802B6928 3C01800F */ lui $at, %hi(D_800F7B40) /* E2AFDC 802B692C E4267B40 */ swc1 $f6, %lo(D_800F7B40)($at) @@ -555,12 +567,13 @@ glabel func_802B6120_E2A7D0 /* E2B00C 802B695C 46006301 */ sub.s $f12, $f12, $f0 /* E2B010 802B6960 080ADA7C */ j .L802B69F0 /* E2B014 802B6964 E6200080 */ swc1 $f0, 0x80($s1) +glabel L802B6968_E2B018 /* E2B018 802B6968 96220008 */ lhu $v0, 8($s1) /* E2B01C 802B696C 2442FFFF */ addiu $v0, $v0, -1 /* E2B020 802B6970 A6220008 */ sh $v0, 8($s1) /* E2B024 802B6974 00021400 */ sll $v0, $v0, 0x10 /* E2B028 802B6978 1440001D */ bnez $v0, .L802B69F0 -/* E2B02C 802B697C 00000000 */ nop +/* E2B02C 802B697C 00000000 */ nop /* E2B030 802B6980 0C009C22 */ jal func_80027088 /* E2B034 802B6984 0000202D */ daddu $a0, $zero, $zero /* E2B038 802B6988 3C03FFEF */ lui $v1, 0xffef @@ -570,15 +583,18 @@ glabel func_802B6120_E2A7D0 /* E2B048 802B6998 00431024 */ and $v0, $v0, $v1 /* E2B04C 802B699C 080ADA78 */ j .L802B69E0 /* E2B050 802B69A0 AE220000 */ sw $v0, ($s1) +glabel L802B69A4_E2B054 /* E2B054 802B69A4 0C0398E9 */ jal func_800E63A4 /* E2B058 802B69A8 0000202D */ daddu $a0, $zero, $zero /* E2B05C 802B69AC 080ADA7A */ j .L802B69E8 -/* E2B060 802B69B0 00000000 */ nop +/* E2B060 802B69B0 00000000 */ nop +glabel L802B69B4_E2B064 /* E2B064 802B69B4 962200BC */ lhu $v0, 0xbc($s1) /* E2B068 802B69B8 1040000D */ beqz $v0, .L802B69F0 /* E2B06C 802B69BC 0000202D */ daddu $a0, $zero, $zero /* E2B070 802B69C0 080ADA78 */ j .L802B69E0 -/* E2B074 802B69C4 00000000 */ nop +/* E2B074 802B69C4 00000000 */ nop +glabel L802B69C8_E2B078 /* E2B078 802B69C8 96220008 */ lhu $v0, 8($s1) /* E2B07C 802B69CC 2442FFFF */ addiu $v0, $v0, -1 /* E2B080 802B69D0 A6220008 */ sh $v0, 8($s1) @@ -587,11 +603,12 @@ glabel func_802B6120_E2A7D0 /* E2B08C 802B69DC 0000202D */ daddu $a0, $zero, $zero .L802B69E0: /* E2B090 802B69E0 0C039769 */ jal set_action_state -/* E2B094 802B69E4 00000000 */ nop +/* E2B094 802B69E4 00000000 */ nop .L802B69E8: /* E2B098 802B69E8 0C038050 */ jal enable_player_static_collisions -/* E2B09C 802B69EC 00000000 */ nop +/* E2B09C 802B69EC 00000000 */ nop .L802B69F0: +glabel L802B69F0_E2B0A0 /* E2B0A0 802B69F0 8E430008 */ lw $v1, 8($s2) /* E2B0A4 802B69F4 18600084 */ blez $v1, .L802B6C08 /* E2B0A8 802B69F8 2402000A */ addiu $v0, $zero, 0xa @@ -601,26 +618,26 @@ glabel func_802B6120_E2A7D0 /* E2B0B8 802B6A08 C62200A8 */ lwc1 $f2, 0xa8($s1) /* E2B0BC 802B6A0C 3C0142B4 */ lui $at, 0x42b4 /* E2B0C0 802B6A10 44810000 */ mtc1 $at, $f0 -/* E2B0C4 802B6A14 00000000 */ nop +/* E2B0C4 802B6A14 00000000 */ nop /* E2B0C8 802B6A18 4602003E */ c.le.s $f0, $f2 -/* E2B0CC 802B6A1C 00000000 */ nop +/* E2B0CC 802B6A1C 00000000 */ nop /* E2B0D0 802B6A20 45000016 */ bc1f .L802B6A7C -/* E2B0D4 802B6A24 00000000 */ nop +/* E2B0D4 802B6A24 00000000 */ nop /* E2B0D8 802B6A28 3C014387 */ lui $at, 0x4387 /* E2B0DC 802B6A2C 44812000 */ mtc1 $at, $f4 -/* E2B0E0 802B6A30 00000000 */ nop +/* E2B0E0 802B6A30 00000000 */ nop /* E2B0E4 802B6A34 4604103C */ c.lt.s $f2, $f4 -/* E2B0E8 802B6A38 00000000 */ nop +/* E2B0E8 802B6A38 00000000 */ nop /* E2B0EC 802B6A3C 4500000F */ bc1f .L802B6A7C -/* E2B0F0 802B6A40 00000000 */ nop +/* E2B0F0 802B6A40 00000000 */ nop /* E2B0F4 802B6A44 C660006C */ lwc1 $f0, 0x6c($s3) /* E2B0F8 802B6A48 46040001 */ sub.s $f0, $f0, $f4 /* E2B0FC 802B6A4C 3C0140C9 */ lui $at, 0x40c9 /* E2B100 802B6A50 34210FD0 */ ori $at, $at, 0xfd0 /* E2B104 802B6A54 44811000 */ mtc1 $at, $f2 -/* E2B108 802B6A58 00000000 */ nop +/* E2B108 802B6A58 00000000 */ nop /* E2B10C 802B6A5C 46020002 */ mul.s $f0, $f0, $f2 -/* E2B110 802B6A60 00000000 */ nop +/* E2B110 802B6A60 00000000 */ nop /* E2B114 802B6A64 3C0143B4 */ lui $at, 0x43b4 /* E2B118 802B6A68 44811000 */ mtc1 $at, $f2 /* E2B11C 802B6A6C 3C014238 */ lui $at, 0x4238 @@ -631,14 +648,14 @@ glabel func_802B6120_E2A7D0 /* E2B12C 802B6A7C C662006C */ lwc1 $f2, 0x6c($s3) /* E2B130 802B6A80 3C0142B4 */ lui $at, 0x42b4 /* E2B134 802B6A84 44810000 */ mtc1 $at, $f0 -/* E2B138 802B6A88 00000000 */ nop +/* E2B138 802B6A88 00000000 */ nop /* E2B13C 802B6A8C 46001081 */ sub.s $f2, $f2, $f0 /* E2B140 802B6A90 3C0140C9 */ lui $at, 0x40c9 /* E2B144 802B6A94 34210FD0 */ ori $at, $at, 0xfd0 /* E2B148 802B6A98 44810000 */ mtc1 $at, $f0 -/* E2B14C 802B6A9C 00000000 */ nop +/* E2B14C 802B6A9C 00000000 */ nop /* E2B150 802B6AA0 46001082 */ mul.s $f2, $f2, $f0 -/* E2B154 802B6AA4 00000000 */ nop +/* E2B154 802B6AA4 00000000 */ nop /* E2B158 802B6AA8 3C0143B4 */ lui $at, 0x43b4 /* E2B15C 802B6AAC 44810000 */ mtc1 $at, $f0 /* E2B160 802B6AB0 3C0141F0 */ lui $at, 0x41f0 @@ -648,18 +665,18 @@ glabel func_802B6120_E2A7D0 /* E2B16C 802B6ABC 0C00A85B */ jal sin_rad /* E2B170 802B6AC0 4600A306 */ mov.s $f12, $f20 /* E2B174 802B6AC4 4600B002 */ mul.s $f0, $f22, $f0 -/* E2B178 802B6AC8 00000000 */ nop +/* E2B178 802B6AC8 00000000 */ nop /* E2B17C 802B6ACC C6220028 */ lwc1 $f2, 0x28($s1) /* E2B180 802B6AD0 46001080 */ add.s $f2, $f2, $f0 /* E2B184 802B6AD4 4600A306 */ mov.s $f12, $f20 /* E2B188 802B6AD8 0C00A874 */ jal cos_rad /* E2B18C 802B6ADC E6420010 */ swc1 $f2, 0x10($s2) /* E2B190 802B6AE0 4600B002 */ mul.s $f0, $f22, $f0 -/* E2B194 802B6AE4 00000000 */ nop +/* E2B194 802B6AE4 00000000 */ nop /* E2B198 802B6AE8 C624002C */ lwc1 $f4, 0x2c($s1) /* E2B19C 802B6AEC 3C0141A0 */ lui $at, 0x41a0 /* E2B1A0 802B6AF0 44811000 */ mtc1 $at, $f2 -/* E2B1A4 802B6AF4 00000000 */ nop +/* E2B1A4 802B6AF4 00000000 */ nop /* E2B1A8 802B6AF8 46022101 */ sub.s $f4, $f4, $f2 /* E2B1AC 802B6AFC C6220030 */ lwc1 $f2, 0x30($s1) /* E2B1B0 802B6B00 46001081 */ sub.s $f2, $f2, $f0 @@ -671,11 +688,11 @@ glabel func_802B6120_E2A7D0 /* E2B1C4 802B6B14 10400050 */ beqz $v0, .L802B6C58 /* E2B1C8 802B6B18 30620001 */ andi $v0, $v1, 1 /* E2B1CC 802B6B1C 1040004E */ beqz $v0, .L802B6C58 -/* E2B1D0 802B6B20 00000000 */ nop +/* E2B1D0 802B6B20 00000000 */ nop /* E2B1D4 802B6B24 C6420010 */ lwc1 $f2, 0x10($s2) /* E2B1D8 802B6B28 3C014100 */ lui $at, 0x4100 /* E2B1DC 802B6B2C 44810000 */ mtc1 $at, $f0 -/* E2B1E0 802B6B30 00000000 */ nop +/* E2B1E0 802B6B30 00000000 */ nop /* E2B1E4 802B6B34 46001081 */ sub.s $f2, $f2, $f0 /* E2B1E8 802B6B38 3C014248 */ lui $at, 0x4248 /* E2B1EC 802B6B3C 44810000 */ mtc1 $at, $f0 @@ -694,14 +711,14 @@ glabel func_802B6120_E2A7D0 /* E2B220 802B6B70 46020000 */ add.s $f0, $f0, $f2 /* E2B224 802B6B74 3C0142B4 */ lui $at, 0x42b4 /* E2B228 802B6B78 44811000 */ mtc1 $at, $f2 -/* E2B22C 802B6B7C 00000000 */ nop +/* E2B22C 802B6B7C 00000000 */ nop /* E2B230 802B6B80 46020001 */ sub.s $f0, $f0, $f2 /* E2B234 802B6B84 3C0140C9 */ lui $at, 0x40c9 /* E2B238 802B6B88 34210FD0 */ ori $at, $at, 0xfd0 /* E2B23C 802B6B8C 44811000 */ mtc1 $at, $f2 -/* E2B240 802B6B90 00000000 */ nop +/* E2B240 802B6B90 00000000 */ nop /* E2B244 802B6B94 46020002 */ mul.s $f0, $f0, $f2 -/* E2B248 802B6B98 00000000 */ nop +/* E2B248 802B6B98 00000000 */ nop /* E2B24C 802B6B9C C6560010 */ lwc1 $f22, 0x10($s2) /* E2B250 802B6BA0 3C0143B4 */ lui $at, 0x43b4 /* E2B254 802B6BA4 44811000 */ mtc1 $at, $f2 @@ -714,7 +731,7 @@ glabel func_802B6120_E2A7D0 /* E2B270 802B6BC0 4480C000 */ mtc1 $zero, $f24 /* E2B274 802B6BC4 46000021 */ cvt.d.s $f0, $f0 /* E2B278 802B6BC8 46380002 */ mul.d $f0, $f0, $f24 -/* E2B27C 802B6BCC 00000000 */ nop +/* E2B27C 802B6BCC 00000000 */ nop /* E2B280 802B6BD0 4600A306 */ mov.s $f12, $f20 /* E2B284 802B6BD4 C6540018 */ lwc1 $f20, 0x18($s2) /* E2B288 802B6BD8 4620B580 */ add.d $f22, $f22, $f0 @@ -724,7 +741,7 @@ glabel func_802B6120_E2A7D0 /* E2B298 802B6BE8 E6560010 */ swc1 $f22, 0x10($s2) /* E2B29C 802B6BEC 46000021 */ cvt.d.s $f0, $f0 /* E2B2A0 802B6BF0 46380002 */ mul.d $f0, $f0, $f24 -/* E2B2A4 802B6BF4 00000000 */ nop +/* E2B2A4 802B6BF4 00000000 */ nop /* E2B2A8 802B6BF8 4620A501 */ sub.d $f20, $f20, $f0 /* E2B2AC 802B6BFC 4620A520 */ cvt.s.d $f20, $f20 /* E2B2B0 802B6C00 080ADB16 */ j .L802B6C58 @@ -741,7 +758,7 @@ glabel func_802B6120_E2A7D0 /* E2B2D8 802B6C28 E7A00010 */ swc1 $f0, 0x10($sp) /* E2B2DC 802B6C2C 8442008A */ lh $v0, 0x8a($v0) /* E2B2E0 802B6C30 44820000 */ mtc1 $v0, $f0 -/* E2B2E4 802B6C34 00000000 */ nop +/* E2B2E4 802B6C34 00000000 */ nop /* E2B2E8 802B6C38 46800020 */ cvt.s.w $f0, $f0 /* E2B2EC 802B6C3C E7A00014 */ swc1 $f0, 0x14($sp) /* E2B2F0 802B6C40 8C650038 */ lw $a1, 0x38($v1) diff --git a/asm/nonmatchings/code_E2A6B0/func_802B6CF0_E2B3A0.s b/asm/nonmatchings/code_E2A6B0/func_802B6CF0_E2B3A0.s index 76821114c2..531dec33da 100644 --- a/asm/nonmatchings/code_E2A6B0/func_802B6CF0_E2B3A0.s +++ b/asm/nonmatchings/code_E2A6B0/func_802B6CF0_E2B3A0.s @@ -15,16 +15,16 @@ glabel func_802B6CF0_E2B3A0 /* E2B3C8 802B6D18 3C108011 */ lui $s0, %hi(gPlayerStatus) /* E2B3CC 802B6D1C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* E2B3D0 802B6D20 4602003C */ c.lt.s $f0, $f2 -/* E2B3D4 802B6D24 00000000 */ nop +/* E2B3D4 802B6D24 00000000 */ nop /* E2B3D8 802B6D28 45010008 */ bc1t .L802B6D4C /* E2B3DC 802B6D2C E4420020 */ swc1 $f2, 0x20($v0) /* E2B3E0 802B6D30 3C01C248 */ lui $at, 0xc248 /* E2B3E4 802B6D34 44810000 */ mtc1 $at, $f0 -/* E2B3E8 802B6D38 00000000 */ nop +/* E2B3E8 802B6D38 00000000 */ nop /* E2B3EC 802B6D3C 4600103C */ c.lt.s $f2, $f0 -/* E2B3F0 802B6D40 00000000 */ nop +/* E2B3F0 802B6D40 00000000 */ nop /* E2B3F4 802B6D44 45000002 */ bc1f .L802B6D50 -/* E2B3F8 802B6D48 00000000 */ nop +/* E2B3F8 802B6D48 00000000 */ nop .L802B6D4C: /* E2B3FC 802B6D4C E4400020 */ swc1 $f0, 0x20($v0) .L802B6D50: diff --git a/asm/nonmatchings/code_E2B530/func_802BB1E8_E2B918.s b/asm/nonmatchings/code_E2B530/func_802BB1E8_E2B918.s index 0ae5eeaf23..2d5357ad75 100644 --- a/asm/nonmatchings/code_E2B530/func_802BB1E8_E2B918.s +++ b/asm/nonmatchings/code_E2B530/func_802BB1E8_E2B918.s @@ -12,11 +12,12 @@ glabel func_802BB1E8_E2B918 /* E2B934 802BB204 2C620009 */ sltiu $v0, $v1, 9 /* E2B938 802BB208 104000F2 */ beqz $v0, .L802BB5D4 /* E2B93C 802BB20C 00031080 */ sll $v0, $v1, 2 -/* E2B940 802BB210 3C01802C */ lui $at, %hi(D_802BCF50) +/* E2B940 802BB210 3C01802C */ lui $at, %hi(jtbl_802BCF50_E2D680) /* E2B944 802BB214 00220821 */ addu $at, $at, $v0 -/* E2B948 802BB218 8C22CF50 */ lw $v0, %lo(D_802BCF50)($at) +/* E2B948 802BB218 8C22CF50 */ lw $v0, %lo(jtbl_802BCF50_E2D680)($at) /* E2B94C 802BB21C 00400008 */ jr $v0 /* E2B950 802BB220 00000000 */ nop +glabel L802BB224_E2B954 /* E2B954 802BB224 0C0AEC11 */ jal func_802BB044_E2B774 /* E2B958 802BB228 0220202D */ daddu $a0, $s1, $zero /* E2B95C 802BB22C 8E220000 */ lw $v0, ($s1) @@ -27,6 +28,7 @@ glabel func_802BB1E8_E2B918 /* E2B970 802BB240 92020012 */ lbu $v0, 0x12($s0) /* E2B974 802BB244 080AED57 */ j .L802BB55C /* E2B978 802BB248 24420001 */ addiu $v0, $v0, 1 +glabel L802BB24C_E2B97C /* E2B97C 802BB24C C6000004 */ lwc1 $f0, 4($s0) /* E2B980 802BB250 3C0140A0 */ lui $at, 0x40a0 /* E2B984 802BB254 44811000 */ mtc1 $at, $f2 @@ -59,6 +61,7 @@ glabel func_802BB1E8_E2B918 /* E2B9F0 802BB2C0 E6020008 */ swc1 $f2, 8($s0) /* E2B9F4 802BB2C4 080AED75 */ j .L802BB5D4 /* E2B9F8 802BB2C8 E604000C */ swc1 $f4, 0xc($s0) +glabel L802BB2CC_E2B9FC /* E2B9FC 802BB2CC C600000C */ lwc1 $f0, 0xc($s0) /* E2BA00 802BB2D0 3C01802C */ lui $at, %hi(D_802BCF78) /* E2BA04 802BB2D4 D422CF78 */ ldc1 $f2, %lo(D_802BCF78)($at) @@ -110,6 +113,7 @@ glabel func_802BB1E8_E2B918 /* E2BABC 802BB38C 34420020 */ ori $v0, $v0, 0x20 /* E2BAC0 802BB390 080AED75 */ j .L802BB5D4 /* E2BAC4 802BB394 AE220000 */ sw $v0, ($s1) +glabel L802BB398_E2BAC8 /* E2BAC8 802BB398 C600000C */ lwc1 $f0, 0xc($s0) /* E2BACC 802BB39C 3C01802C */ lui $at, %hi(D_802BCF80) /* E2BAD0 802BB3A0 D422CF80 */ ldc1 $f2, %lo(D_802BCF80)($at) @@ -152,6 +156,7 @@ glabel func_802BB1E8_E2B918 /* E2BB64 802BB434 A2030012 */ sb $v1, 0x12($s0) /* E2BB68 802BB438 080AED75 */ j .L802BB5D4 /* E2BB6C 802BB43C 00000000 */ nop +glabel L802BB440_E2BB70 /* E2BB70 802BB440 92020011 */ lbu $v0, 0x11($s0) /* E2BB74 802BB444 2442FFFF */ addiu $v0, $v0, -1 /* E2BB78 802BB448 A2020011 */ sb $v0, 0x11($s0) @@ -162,6 +167,7 @@ glabel func_802BB1E8_E2B918 /* E2BB8C 802BB45C 24420001 */ addiu $v0, $v0, 1 /* E2BB90 802BB460 080AED75 */ j .L802BB5D4 /* E2BB94 802BB464 A2020012 */ sb $v0, 0x12($s0) +glabel L802BB468_E2BB98 /* E2BB98 802BB468 C600000C */ lwc1 $f0, 0xc($s0) /* E2BB9C 802BB46C 46000000 */ add.s $f0, $f0, $f0 /* E2BBA0 802BB470 3C0141F0 */ lui $at, 0x41f0 @@ -193,6 +199,7 @@ glabel func_802BB1E8_E2B918 /* E2BC04 802BB4D4 24420001 */ addiu $v0, $v0, 1 /* E2BC08 802BB4D8 080AED57 */ j .L802BB55C /* E2BC0C 802BB4DC E600000C */ swc1 $f0, 0xc($s0) +glabel L802BB4E0_E2BC10 /* E2BC10 802BB4E0 C600000C */ lwc1 $f0, 0xc($s0) /* E2BC14 802BB4E4 3C014120 */ lui $at, 0x4120 /* E2BC18 802BB4E8 44811000 */ mtc1 $at, $f2 @@ -230,6 +237,7 @@ glabel func_802BB1E8_E2B918 /* E2BC90 802BB560 A2020012 */ sb $v0, 0x12($s0) /* E2BC94 802BB564 080AED75 */ j .L802BB5D4 /* E2BC98 802BB568 00000000 */ nop +glabel L802BB56C_E2BC9C /* E2BC9C 802BB56C 92020011 */ lbu $v0, 0x11($s0) /* E2BCA0 802BB570 2442FFFF */ addiu $v0, $v0, -1 /* E2BCA4 802BB574 A2020011 */ sb $v0, 0x11($s0) @@ -243,6 +251,7 @@ glabel func_802BB1E8_E2B918 /* E2BCC4 802BB594 24020005 */ addiu $v0, $zero, 5 /* E2BCC8 802BB598 080AED75 */ j .L802BB5D4 /* E2BCCC 802BB59C A2020011 */ sb $v0, 0x11($s0) +glabel L802BB5A0_E2BCD0 /* E2BCD0 802BB5A0 92020011 */ lbu $v0, 0x11($s0) /* E2BCD4 802BB5A4 2442FFFF */ addiu $v0, $v0, -1 /* E2BCD8 802BB5A8 A2020011 */ sb $v0, 0x11($s0) diff --git a/asm/nonmatchings/code_E2BE40/func_802BB710_E2BE40.s b/asm/nonmatchings/code_E2BE40/func_802BB710_E2BE40.s index 8a8115acdf..7251db0893 100644 --- a/asm/nonmatchings/code_E2BE40/func_802BB710_E2BE40.s +++ b/asm/nonmatchings/code_E2BE40/func_802BB710_E2BE40.s @@ -69,7 +69,7 @@ glabel func_802BB710_E2BE40 /* E2BF3C 802BB80C 02A31023 */ subu $v0, $s5, $v1 .L802BB810: /* E2BF40 802BB810 44820000 */ mtc1 $v0, $f0 -/* E2BF44 802BB814 00000000 */ nop +/* E2BF44 802BB814 00000000 */ nop /* E2BF48 802BB818 46800020 */ cvt.s.w $f0, $f0 /* E2BF4C 802BB81C E600004C */ swc1 $f0, 0x4c($s0) /* E2BF50 802BB820 E614011C */ swc1 $f20, 0x11c($s0) diff --git a/asm/nonmatchings/code_E2BE40/func_802BB8A4_E2BFD4.s b/asm/nonmatchings/code_E2BE40/func_802BB8A4_E2BFD4.s index b8a799e69d..832ef8a264 100644 --- a/asm/nonmatchings/code_E2BE40/func_802BB8A4_E2BFD4.s +++ b/asm/nonmatchings/code_E2BE40/func_802BB8A4_E2BFD4.s @@ -41,16 +41,16 @@ glabel func_802BB8A4_E2BFD4 /* E2C060 802BB930 10400005 */ beqz $v0, .L802BB948 /* E2C064 802BB934 24020002 */ addiu $v0, $zero, 2 /* E2C068 802BB938 10600009 */ beqz $v1, .L802BB960 -/* E2C06C 802BB93C 00000000 */ nop +/* E2C06C 802BB93C 00000000 */ nop /* E2C070 802BB940 080AEE9B */ j .L802BBA6C -/* E2C074 802BB944 00000000 */ nop +/* E2C074 802BB944 00000000 */ nop .L802BB948: /* E2C078 802BB948 10620029 */ beq $v1, $v0, .L802BB9F0 /* E2C07C 802BB94C 24020003 */ addiu $v0, $zero, 3 /* E2C080 802BB950 50620046 */ beql $v1, $v0, .L802BBA6C /* E2C084 802BB954 26730001 */ addiu $s3, $s3, 1 /* E2C088 802BB958 080AEE9B */ j .L802BBA6C -/* E2C08C 802BB95C 00000000 */ nop +/* E2C08C 802BB95C 00000000 */ nop .L802BB960: /* E2C090 802BB960 3C014000 */ lui $at, 0x4000 /* E2C094 802BB964 4481E000 */ mtc1 $at, $f28 @@ -60,10 +60,10 @@ glabel func_802BB8A4_E2BFD4 /* E2C0A4 802BB974 44810000 */ mtc1 $at, $f0 /* E2C0A8 802BB978 44801000 */ mtc1 $zero, $f2 /* E2C0AC 802BB97C 44822000 */ mtc1 $v0, $f4 -/* E2C0B0 802BB980 00000000 */ nop +/* E2C0B0 802BB980 00000000 */ nop /* E2C0B4 802BB984 46802120 */ cvt.s.w $f4, $f4 /* E2C0B8 802BB988 461A103E */ c.le.s $f2, $f26 -/* E2C0BC 802BB98C 00000000 */ nop +/* E2C0BC 802BB98C 00000000 */ nop /* E2C0C0 802BB990 45000006 */ bc1f .L802BB9AC /* E2C0C4 802BB994 46002603 */ div.s $f24, $f4, $f0 /* E2C0C8 802BB998 3C01802C */ lui $at, %hi(D_802BCFA0) @@ -90,18 +90,18 @@ glabel func_802BB8A4_E2BFD4 /* E2C110 802BB9E0 4480E000 */ mtc1 $zero, $f28 /* E2C114 802BB9E4 46001682 */ mul.s $f26, $f2, $f0 /* E2C118 802BB9E8 080AEE9B */ j .L802BBA6C -/* E2C11C 802BB9EC 00000000 */ nop +/* E2C11C 802BB9EC 00000000 */ nop .L802BB9F0: /* E2C120 802BB9F0 C602004C */ lwc1 $f2, 0x4c($s0) /* E2C124 802BB9F4 3C013F80 */ lui $at, 0x3f80 /* E2C128 802BB9F8 44810000 */ mtc1 $at, $f0 -/* E2C12C 802BB9FC 00000000 */ nop +/* E2C12C 802BB9FC 00000000 */ nop /* E2C130 802BBA00 46001080 */ add.s $f2, $f2, $f0 /* E2C134 802BBA04 3C0141A0 */ lui $at, 0x41a0 /* E2C138 802BBA08 44810000 */ mtc1 $at, $f0 -/* E2C13C 802BBA0C 00000000 */ nop +/* E2C13C 802BBA0C 00000000 */ nop /* E2C140 802BBA10 4602003C */ c.lt.s $f0, $f2 -/* E2C144 802BBA14 00000000 */ nop +/* E2C144 802BBA14 00000000 */ nop /* E2C148 802BBA18 45000002 */ bc1f .L802BBA24 /* E2C14C 802BBA1C E602004C */ swc1 $f2, 0x4c($s0) /* E2C150 802BBA20 E600004C */ swc1 $f0, 0x4c($s0) @@ -119,7 +119,7 @@ glabel func_802BB8A4_E2BFD4 /* E2C17C 802BBA4C 304200FF */ andi $v0, $v0, 0xff /* E2C180 802BBA50 2C420006 */ sltiu $v0, $v0, 6 /* E2C184 802BBA54 10400005 */ beqz $v0, .L802BBA6C -/* E2C188 802BBA58 00000000 */ nop +/* E2C188 802BBA58 00000000 */ nop /* E2C18C 802BBA5C 92220008 */ lbu $v0, 8($s1) /* E2C190 802BBA60 A2200015 */ sb $zero, 0x15($s1) /* E2C194 802BBA64 24420001 */ addiu $v0, $v0, 1 @@ -131,7 +131,7 @@ glabel func_802BB8A4_E2BFD4 /* E2C1A8 802BBA78 26310001 */ addiu $s1, $s1, 1 /* E2C1AC 802BBA7C C602011C */ lwc1 $f2, 0x11c($s0) /* E2C1B0 802BBA80 44800000 */ mtc1 $zero, $f0 -/* E2C1B4 802BBA84 00000000 */ nop +/* E2C1B4 802BBA84 00000000 */ nop /* E2C1B8 802BBA88 4602003E */ c.le.s $f0, $f2 /* E2C1BC 802BBA8C 3C01802C */ lui $at, %hi(D_802BCFA8) /* E2C1C0 802BBA90 D420CFA8 */ ldc1 $f0, %lo(D_802BCFA8)($at) @@ -146,13 +146,13 @@ glabel func_802BB8A4_E2BFD4 /* E2C1E0 802BBAB0 462010A0 */ cvt.s.d $f2, $f2 /* E2C1E4 802BBAB4 46001021 */ cvt.d.s $f0, $f2 /* E2C1E8 802BBAB8 4624003C */ c.lt.d $f0, $f4 -/* E2C1EC 802BBABC 00000000 */ nop +/* E2C1EC 802BBABC 00000000 */ nop /* E2C1F0 802BBAC0 45000006 */ bc1f .L802BBADC /* E2C1F4 802BBAC4 E602011C */ swc1 $f2, 0x11c($s0) /* E2C1F8 802BBAC8 3C01C123 */ lui $at, 0xc123 /* E2C1FC 802BBACC 34213333 */ ori $at, $at, 0x3333 /* E2C200 802BBAD0 44810000 */ mtc1 $at, $f0 -/* E2C204 802BBAD4 00000000 */ nop +/* E2C204 802BBAD4 00000000 */ nop /* E2C208 802BBAD8 E600011C */ swc1 $f0, 0x11c($s0) .L802BBADC: /* E2C20C 802BBADC C60000B4 */ lwc1 $f0, 0xb4($s0) @@ -163,36 +163,36 @@ glabel func_802BB8A4_E2BFD4 /* E2C220 802BBAF0 3C0143B4 */ lui $at, 0x43b4 /* E2C224 802BBAF4 44814000 */ mtc1 $at, $f8 /* E2C228 802BBAF8 4482A000 */ mtc1 $v0, $f20 -/* E2C22C 802BBAFC 00000000 */ nop +/* E2C22C 802BBAFC 00000000 */ nop /* E2C230 802BBB00 4680A520 */ cvt.s.w $f20, $f20 /* E2C234 802BBB04 4608A502 */ mul.s $f20, $f20, $f8 -/* E2C238 802BBB08 00000000 */ nop +/* E2C238 802BBB08 00000000 */ nop /* E2C23C 802BBB0C 3C013B80 */ lui $at, 0x3b80 /* E2C240 802BBB10 44814000 */ mtc1 $at, $f8 -/* E2C244 802BBB14 00000000 */ nop +/* E2C244 802BBB14 00000000 */ nop /* E2C248 802BBB18 4608A502 */ mul.s $f20, $f20, $f8 -/* E2C24C 802BBB1C 00000000 */ nop +/* E2C24C 802BBB1C 00000000 */ nop /* E2C250 802BBB20 3C0140C9 */ lui $at, 0x40c9 /* E2C254 802BBB24 34210FD0 */ ori $at, $at, 0xfd0 /* E2C258 802BBB28 44814000 */ mtc1 $at, $f8 -/* E2C25C 802BBB2C 00000000 */ nop +/* E2C25C 802BBB2C 00000000 */ nop /* E2C260 802BBB30 4608A002 */ mul.s $f0, $f20, $f8 -/* E2C264 802BBB34 00000000 */ nop +/* E2C264 802BBB34 00000000 */ nop /* E2C268 802BBB38 3C0143B4 */ lui $at, 0x43b4 /* E2C26C 802BBB3C 44814000 */ mtc1 $at, $f8 -/* E2C270 802BBB40 00000000 */ nop +/* E2C270 802BBB40 00000000 */ nop /* E2C274 802BBB44 46080583 */ div.s $f22, $f0, $f8 /* E2C278 802BBB48 0C00A85B */ jal sin_rad /* E2C27C 802BBB4C 4600B306 */ mov.s $f12, $f22 /* E2C280 802BBB50 4600C002 */ mul.s $f0, $f24, $f0 -/* E2C284 802BBB54 00000000 */ nop +/* E2C284 802BBB54 00000000 */ nop /* E2C288 802BBB58 C6020080 */ lwc1 $f2, 0x80($s0) /* E2C28C 802BBB5C 46001080 */ add.s $f2, $f2, $f0 /* E2C290 802BBB60 4600B306 */ mov.s $f12, $f22 /* E2C294 802BBB64 0C00A874 */ jal cos_rad /* E2C298 802BBB68 E6020080 */ swc1 $f2, 0x80($s0) /* E2C29C 802BBB6C 4600C002 */ mul.s $f0, $f24, $f0 -/* E2C2A0 802BBB70 00000000 */ nop +/* E2C2A0 802BBB70 00000000 */ nop /* E2C2A4 802BBB74 C60200E8 */ lwc1 $f2, 0xe8($s0) /* E2C2A8 802BBB78 3C040004 */ lui $a0, 4 /* E2C2AC 802BBB7C 46001080 */ add.s $f2, $f2, $f0 @@ -228,21 +228,21 @@ glabel func_802BB8A4_E2BFD4 /* E2C324 802BBBF4 A2220015 */ sb $v0, 0x15($s1) /* E2C328 802BBBF8 304200FF */ andi $v0, $v0, 0xff /* E2C32C 802BBBFC 44820000 */ mtc1 $v0, $f0 -/* E2C330 802BBC00 00000000 */ nop +/* E2C330 802BBC00 00000000 */ nop /* E2C334 802BBC04 46800020 */ cvt.s.w $f0, $f0 /* E2C338 802BBC08 46080002 */ mul.s $f0, $f0, $f8 -/* E2C33C 802BBC0C 00000000 */ nop +/* E2C33C 802BBC0C 00000000 */ nop /* E2C340 802BBC10 3C013B80 */ lui $at, 0x3b80 /* E2C344 802BBC14 44814000 */ mtc1 $at, $f8 -/* E2C348 802BBC18 00000000 */ nop +/* E2C348 802BBC18 00000000 */ nop /* E2C34C 802BBC1C 46080002 */ mul.s $f0, $f0, $f8 -/* E2C350 802BBC20 00000000 */ nop +/* E2C350 802BBC20 00000000 */ nop /* E2C354 802BBC24 3C0140C9 */ lui $at, 0x40c9 /* E2C358 802BBC28 34210FD0 */ ori $at, $at, 0xfd0 /* E2C35C 802BBC2C 44814000 */ mtc1 $at, $f8 -/* E2C360 802BBC30 00000000 */ nop +/* E2C360 802BBC30 00000000 */ nop /* E2C364 802BBC34 46080002 */ mul.s $f0, $f0, $f8 -/* E2C368 802BBC38 00000000 */ nop +/* E2C368 802BBC38 00000000 */ nop /* E2C36C 802BBC3C 3C0143B4 */ lui $at, 0x43b4 /* E2C370 802BBC40 44814000 */ mtc1 $at, $f8 /* E2C374 802BBC44 3C014100 */ lui $at, 0x4100 @@ -251,14 +251,14 @@ glabel func_802BB8A4_E2BFD4 /* E2C380 802BBC50 0C00A85B */ jal sin_rad /* E2C384 802BBC54 4600B306 */ mov.s $f12, $f22 /* E2C388 802BBC58 46180002 */ mul.s $f0, $f0, $f24 -/* E2C38C 802BBC5C 00000000 */ nop +/* E2C38C 802BBC5C 00000000 */ nop /* E2C390 802BBC60 C6020080 */ lwc1 $f2, 0x80($s0) /* E2C394 802BBC64 46001080 */ add.s $f2, $f2, $f0 /* E2C398 802BBC68 4600B306 */ mov.s $f12, $f22 /* E2C39C 802BBC6C 0C00A874 */ jal cos_rad /* E2C3A0 802BBC70 E6020080 */ swc1 $f2, 0x80($s0) /* E2C3A4 802BBC74 46180002 */ mul.s $f0, $f0, $f24 -/* E2C3A8 802BBC78 00000000 */ nop +/* E2C3A8 802BBC78 00000000 */ nop /* E2C3AC 802BBC7C C60200E8 */ lwc1 $f2, 0xe8($s0) /* E2C3B0 802BBC80 46001080 */ add.s $f2, $f2, $f0 /* E2C3B4 802BBC84 E60200E8 */ swc1 $f2, 0xe8($s0) @@ -280,17 +280,17 @@ glabel func_802BB8A4_E2BFD4 /* E2C3F0 802BBCC0 0C0372DF */ jal func_800DCB7C /* E2C3F4 802BBCC4 AFA20010 */ sw $v0, 0x10($sp) /* E2C3F8 802BBCC8 1440000B */ bnez $v0, .L802BBCF8 -/* E2C3FC 802BBCCC 00000000 */ nop +/* E2C3FC 802BBCCC 00000000 */ nop /* E2C400 802BBCD0 C6400004 */ lwc1 $f0, 4($s2) /* E2C404 802BBCD4 3C014348 */ lui $at, 0x4348 /* E2C408 802BBCD8 44811000 */ mtc1 $at, $f2 -/* E2C40C 802BBCDC 00000000 */ nop +/* E2C40C 802BBCDC 00000000 */ nop /* E2C410 802BBCE0 46020001 */ sub.s $f0, $f0, $f2 /* E2C414 802BBCE4 C7A20024 */ lwc1 $f2, 0x24($sp) /* E2C418 802BBCE8 4600103C */ c.lt.s $f2, $f0 -/* E2C41C 802BBCEC 00000000 */ nop +/* E2C41C 802BBCEC 00000000 */ nop /* E2C420 802BBCF0 45000010 */ bc1f .L802BBD34 -/* E2C424 802BBCF4 00000000 */ nop +/* E2C424 802BBCF4 00000000 */ nop .L802BBCF8: /* E2C428 802BBCF8 92220008 */ lbu $v0, 8($s1) /* E2C42C 802BBCFC 24420001 */ addiu $v0, $v0, 1 @@ -310,11 +310,11 @@ glabel func_802BB8A4_E2BFD4 .L802BBD34: /* E2C464 802BBD34 92220022 */ lbu $v0, 0x22($s1) /* E2C468 802BBD38 44820000 */ mtc1 $v0, $f0 -/* E2C46C 802BBD3C 00000000 */ nop +/* E2C46C 802BBD3C 00000000 */ nop /* E2C470 802BBD40 46800020 */ cvt.s.w $f0, $f0 /* E2C474 802BBD44 461A0000 */ add.s $f0, $f0, $f26 /* E2C478 802BBD48 4600F03E */ c.le.s $f30, $f0 -/* E2C47C 802BBD4C 00000000 */ nop +/* E2C47C 802BBD4C 00000000 */ nop /* E2C480 802BBD50 45010005 */ bc1t .L802BBD68 /* E2C484 802BBD54 26230022 */ addiu $v1, $s1, 0x22 /* E2C488 802BBD58 4600020D */ trunc.w.s $f8, $f0 @@ -325,17 +325,17 @@ glabel func_802BB8A4_E2BFD4 /* E2C498 802BBD68 461E0001 */ sub.s $f0, $f0, $f30 /* E2C49C 802BBD6C 4600020D */ trunc.w.s $f8, $f0 /* E2C4A0 802BBD70 44024000 */ mfc1 $v0, $f8 -/* E2C4A4 802BBD74 00000000 */ nop +/* E2C4A4 802BBD74 00000000 */ nop /* E2C4A8 802BBD78 00571025 */ or $v0, $v0, $s7 /* E2C4AC 802BBD7C A0620000 */ sb $v0, ($v1) .L802BBD80: /* E2C4B0 802BBD80 9222002F */ lbu $v0, 0x2f($s1) /* E2C4B4 802BBD84 44820000 */ mtc1 $v0, $f0 -/* E2C4B8 802BBD88 00000000 */ nop +/* E2C4B8 802BBD88 00000000 */ nop /* E2C4BC 802BBD8C 46800020 */ cvt.s.w $f0, $f0 /* E2C4C0 802BBD90 461A0001 */ sub.s $f0, $f0, $f26 /* E2C4C4 802BBD94 4600F03E */ c.le.s $f30, $f0 -/* E2C4C8 802BBD98 00000000 */ nop +/* E2C4C8 802BBD98 00000000 */ nop /* E2C4CC 802BBD9C 45010005 */ bc1t .L802BBDB4 /* E2C4D0 802BBDA0 2623002F */ addiu $v1, $s1, 0x2f /* E2C4D4 802BBDA4 4600020D */ trunc.w.s $f8, $f0 @@ -346,7 +346,7 @@ glabel func_802BB8A4_E2BFD4 /* E2C4E4 802BBDB4 461E0001 */ sub.s $f0, $f0, $f30 /* E2C4E8 802BBDB8 4600020D */ trunc.w.s $f8, $f0 /* E2C4EC 802BBDBC 44024000 */ mfc1 $v0, $f8 -/* E2C4F0 802BBDC0 00000000 */ nop +/* E2C4F0 802BBDC0 00000000 */ nop /* E2C4F4 802BBDC4 00571025 */ or $v0, $v0, $s7 /* E2C4F8 802BBDC8 A0620000 */ sb $v0, ($v1) .L802BBDCC: @@ -358,7 +358,7 @@ glabel func_802BB8A4_E2BFD4 /* E2C50C 802BBDDC 26100004 */ addiu $s0, $s0, 4 /* E2C510 802BBDE0 2A62000C */ slti $v0, $s3, 0xc /* E2C514 802BBDE4 14400003 */ bnez $v0, .L802BBDF4 -/* E2C518 802BBDE8 00000000 */ nop +/* E2C518 802BBDE8 00000000 */ nop /* E2C51C 802BBDEC 0C043F5A */ jal func_8010FD68 /* E2C520 802BBDF0 03C0202D */ daddu $a0, $fp, $zero .L802BBDF4: diff --git a/asm/nonmatchings/code_E2BE40/func_802BBE3C_E2C56C.s b/asm/nonmatchings/code_E2BE40/func_802BBE3C_E2C56C.s index 7f4082a198..d645ded628 100644 --- a/asm/nonmatchings/code_E2BE40/func_802BBE3C_E2C56C.s +++ b/asm/nonmatchings/code_E2BE40/func_802BBE3C_E2C56C.s @@ -91,12 +91,12 @@ glabel func_802BBE3C_E2C56C /* E2C6B8 802BBF88 27A40018 */ addiu $a0, $sp, 0x18 /* E2C6BC 802BBF8C 92420022 */ lbu $v0, 0x22($s2) /* E2C6C0 802BBF90 44820000 */ mtc1 $v0, $f0 -/* E2C6C4 802BBF94 00000000 */ nop +/* E2C6C4 802BBF94 00000000 */ nop /* E2C6C8 802BBF98 46800020 */ cvt.s.w $f0, $f0 /* E2C6CC 802BBF9C 461A0002 */ mul.s $f0, $f0, $f26 -/* E2C6D0 802BBFA0 00000000 */ nop +/* E2C6D0 802BBFA0 00000000 */ nop /* E2C6D4 802BBFA4 46180002 */ mul.s $f0, $f0, $f24 -/* E2C6D8 802BBFA8 00000000 */ nop +/* E2C6D8 802BBFA8 00000000 */ nop /* E2C6DC 802BBFAC 4406B000 */ mfc1 $a2, $f22 /* E2C6E0 802BBFB0 4407A000 */ mfc1 $a3, $f20 /* E2C6E4 802BBFB4 8FA4011C */ lw $a0, 0x11c($sp) @@ -105,14 +105,14 @@ glabel func_802BBE3C_E2C56C /* E2C6F0 802BBFC0 E7B40010 */ swc1 $f20, 0x10($sp) /* E2C6F4 802BBFC4 9242002F */ lbu $v0, 0x2f($s2) /* E2C6F8 802BBFC8 44820000 */ mtc1 $v0, $f0 -/* E2C6FC 802BBFCC 00000000 */ nop +/* E2C6FC 802BBFCC 00000000 */ nop /* E2C700 802BBFD0 46800020 */ cvt.s.w $f0, $f0 /* E2C704 802BBFD4 461A0002 */ mul.s $f0, $f0, $f26 -/* E2C708 802BBFD8 00000000 */ nop +/* E2C708 802BBFD8 00000000 */ nop /* E2C70C 802BBFDC 26100008 */ addiu $s0, $s0, 8 /* E2C710 802BBFE0 26310018 */ addiu $s1, $s1, 0x18 /* E2C714 802BBFE4 46180002 */ mul.s $f0, $f0, $f24 -/* E2C718 802BBFE8 00000000 */ nop +/* E2C718 802BBFE8 00000000 */ nop /* E2C71C 802BBFEC 27DE0001 */ addiu $fp, $fp, 1 /* E2C720 802BBFF0 02A0202D */ daddu $a0, $s5, $zero /* E2C724 802BBFF4 4406A000 */ mfc1 $a2, $f20 diff --git a/asm/nonmatchings/code_E2BE40/func_802BC148_E2C878.s b/asm/nonmatchings/code_E2BE40/func_802BC148_E2C878.s index ff6b031b78..636f3bc0bd 100644 --- a/asm/nonmatchings/code_E2BE40/func_802BC148_E2C878.s +++ b/asm/nonmatchings/code_E2BE40/func_802BC148_E2C878.s @@ -9,7 +9,7 @@ glabel func_802BC148_E2C878 /* E2C888 802BC158 92020006 */ lbu $v0, 6($s0) /* E2C88C 802BC15C 30420001 */ andi $v0, $v0, 1 /* E2C890 802BC160 1040000D */ beqz $v0, .L802BC198 -/* E2C894 802BC164 00000000 */ nop +/* E2C894 802BC164 00000000 */ nop /* E2C898 802BC168 3C028011 */ lui $v0, %hi(gPlayerStatus) /* E2C89C 802BC16C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) /* E2C8A0 802BC170 804300B4 */ lb $v1, 0xb4($v0) @@ -17,7 +17,7 @@ glabel func_802BC148_E2C878 /* E2C8A8 802BC178 10620003 */ beq $v1, $v0, .L802BC188 /* E2C8AC 802BC17C 24020010 */ addiu $v0, $zero, 0x10 /* E2C8B0 802BC180 14620005 */ bne $v1, $v0, .L802BC198 -/* E2C8B4 802BC184 00000000 */ nop +/* E2C8B4 802BC184 00000000 */ nop .L802BC188: /* E2C8B8 802BC188 0C04419E */ jal func_80110678 /* E2C8BC 802BC18C 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/code_E2BE40/func_802BC1A8_E2C8D8.s b/asm/nonmatchings/code_E2BE40/func_802BC1A8_E2C8D8.s index 20456154f8..580ed93e68 100644 --- a/asm/nonmatchings/code_E2BE40/func_802BC1A8_E2C8D8.s +++ b/asm/nonmatchings/code_E2BE40/func_802BC1A8_E2C8D8.s @@ -22,6 +22,6 @@ glabel func_802BC1A8_E2C8D8 /* E2C918 802BC1E8 8FBF0010 */ lw $ra, 0x10($sp) /* E2C91C 802BC1EC 03E00008 */ jr $ra /* E2C920 802BC1F0 27BD0018 */ addiu $sp, $sp, 0x18 -/* E2C924 802BC1F4 00000000 */ nop -/* E2C928 802BC1F8 00000000 */ nop -/* E2C92C 802BC1FC 00000000 */ nop +/* E2C924 802BC1F4 00000000 */ nop +/* E2C928 802BC1F8 00000000 */ nop +/* E2C92C 802BC1FC 00000000 */ nop diff --git a/asm/nonmatchings/code_E2C930/func_802BC200_E2C930.s b/asm/nonmatchings/code_E2C930/func_802BC200_E2C930.s index e2a44d8f55..c2cd80ba13 100644 --- a/asm/nonmatchings/code_E2C930/func_802BC200_E2C930.s +++ b/asm/nonmatchings/code_E2C930/func_802BC200_E2C930.s @@ -56,20 +56,25 @@ glabel func_802BC200_E2C930 /* E2C9F8 802BC2C8 2E820005 */ sltiu $v0, $s4, 5 /* E2C9FC 802BC2CC 10400011 */ beqz $v0, .L802BC314 /* E2CA00 802BC2D0 E6000070 */ swc1 $f0, 0x70($s0) -/* E2CA04 802BC2D4 3C02802C */ lui $v0, %hi(D_802BCFC0) +/* E2CA04 802BC2D4 3C02802C */ lui $v0, %hi(jtbl_802BCFC0_E2D6F0) /* E2CA08 802BC2D8 00551021 */ addu $v0, $v0, $s5 -/* E2CA0C 802BC2DC 8C42CFC0 */ lw $v0, %lo(D_802BCFC0)($v0) +/* E2CA0C 802BC2DC 8C42CFC0 */ lw $v0, %lo(jtbl_802BCFC0_E2D6F0)($v0) /* E2CA10 802BC2E0 00400008 */ jr $v0 -/* E2CA14 802BC2E4 00000000 */ nop +/* E2CA14 802BC2E4 00000000 */ nop +glabel L802BC2E8_E2CA18 /* E2CA18 802BC2E8 241300C0 */ addiu $s3, $zero, 0xc0 /* E2CA1C 802BC2EC 080AF0C5 */ j .L802BC314 /* E2CA20 802BC2F0 0000902D */ daddu $s2, $zero, $zero +glabel L802BC2F4_E2CA24 /* E2CA24 802BC2F4 080AF0C4 */ j .L802BC310 /* E2CA28 802BC2F8 24130060 */ addiu $s3, $zero, 0x60 +glabel L802BC2FC_E2CA2C /* E2CA2C 802BC2FC 080AF0C4 */ j .L802BC310 /* E2CA30 802BC300 24130020 */ addiu $s3, $zero, 0x20 +glabel L802BC304_E2CA34 /* E2CA34 802BC304 080AF0C4 */ j .L802BC310 /* E2CA38 802BC308 241300A0 */ addiu $s3, $zero, 0xa0 +glabel L802BC30C_E2CA3C /* E2CA3C 802BC30C 241300E0 */ addiu $s3, $zero, 0xe0 .L802BC310: /* E2CA40 802BC310 24120014 */ addiu $s2, $zero, 0x14 @@ -86,7 +91,7 @@ glabel func_802BC200_E2C930 /* E2CA68 802BC338 00431023 */ subu $v0, $v0, $v1 .L802BC33C: /* E2CA6C 802BC33C 44820000 */ mtc1 $v0, $f0 -/* E2CA70 802BC340 00000000 */ nop +/* E2CA70 802BC340 00000000 */ nop /* E2CA74 802BC344 46800020 */ cvt.s.w $f0, $f0 /* E2CA78 802BC348 E6000028 */ swc1 $f0, 0x28($s0) /* E2CA7C 802BC34C 26B50004 */ addiu $s5, $s5, 4 diff --git a/asm/nonmatchings/code_E2C930/func_802BC3DC_E2CB0C.s b/asm/nonmatchings/code_E2C930/func_802BC3DC_E2CB0C.s index 8b29a6cfd7..fc6c1dbe84 100644 --- a/asm/nonmatchings/code_E2C930/func_802BC3DC_E2CB0C.s +++ b/asm/nonmatchings/code_E2C930/func_802BC3DC_E2CB0C.s @@ -41,16 +41,16 @@ glabel func_802BC3DC_E2CB0C /* E2CB98 802BC468 10400005 */ beqz $v0, .L802BC480 /* E2CB9C 802BC46C 24020002 */ addiu $v0, $zero, 2 /* E2CBA0 802BC470 10600009 */ beqz $v1, .L802BC498 -/* E2CBA4 802BC474 00000000 */ nop +/* E2CBA4 802BC474 00000000 */ nop /* E2CBA8 802BC478 080AF169 */ j .L802BC5A4 -/* E2CBAC 802BC47C 00000000 */ nop +/* E2CBAC 802BC47C 00000000 */ nop .L802BC480: /* E2CBB0 802BC480 10620029 */ beq $v1, $v0, .L802BC528 /* E2CBB4 802BC484 24020003 */ addiu $v0, $zero, 3 /* E2CBB8 802BC488 50620046 */ beql $v1, $v0, .L802BC5A4 /* E2CBBC 802BC48C 26730001 */ addiu $s3, $s3, 1 /* E2CBC0 802BC490 080AF169 */ j .L802BC5A4 -/* E2CBC4 802BC494 00000000 */ nop +/* E2CBC4 802BC494 00000000 */ nop .L802BC498: /* E2CBC8 802BC498 3C014000 */ lui $at, 0x4000 /* E2CBCC 802BC49C 4481E000 */ mtc1 $at, $f28 @@ -60,10 +60,10 @@ glabel func_802BC3DC_E2CB0C /* E2CBDC 802BC4AC 44810000 */ mtc1 $at, $f0 /* E2CBE0 802BC4B0 44801000 */ mtc1 $zero, $f2 /* E2CBE4 802BC4B4 44822000 */ mtc1 $v0, $f4 -/* E2CBE8 802BC4B8 00000000 */ nop +/* E2CBE8 802BC4B8 00000000 */ nop /* E2CBEC 802BC4BC 46802120 */ cvt.s.w $f4, $f4 /* E2CBF0 802BC4C0 461A103E */ c.le.s $f2, $f26 -/* E2CBF4 802BC4C4 00000000 */ nop +/* E2CBF4 802BC4C4 00000000 */ nop /* E2CBF8 802BC4C8 45000006 */ bc1f .L802BC4E4 /* E2CBFC 802BC4CC 46002603 */ div.s $f24, $f4, $f0 /* E2CC00 802BC4D0 3C01802C */ lui $at, %hi(D_802BCFD8) @@ -90,18 +90,18 @@ glabel func_802BC3DC_E2CB0C /* E2CC48 802BC518 4480E000 */ mtc1 $zero, $f28 /* E2CC4C 802BC51C 46001682 */ mul.s $f26, $f2, $f0 /* E2CC50 802BC520 080AF169 */ j .L802BC5A4 -/* E2CC54 802BC524 00000000 */ nop +/* E2CC54 802BC524 00000000 */ nop .L802BC528: /* E2CC58 802BC528 C6020028 */ lwc1 $f2, 0x28($s0) /* E2CC5C 802BC52C 3C013F80 */ lui $at, 0x3f80 /* E2CC60 802BC530 44810000 */ mtc1 $at, $f0 -/* E2CC64 802BC534 00000000 */ nop +/* E2CC64 802BC534 00000000 */ nop /* E2CC68 802BC538 46001080 */ add.s $f2, $f2, $f0 /* E2CC6C 802BC53C 3C0141A0 */ lui $at, 0x41a0 /* E2CC70 802BC540 44810000 */ mtc1 $at, $f0 -/* E2CC74 802BC544 00000000 */ nop +/* E2CC74 802BC544 00000000 */ nop /* E2CC78 802BC548 4602003C */ c.lt.s $f0, $f2 -/* E2CC7C 802BC54C 00000000 */ nop +/* E2CC7C 802BC54C 00000000 */ nop /* E2CC80 802BC550 45000002 */ bc1f .L802BC55C /* E2CC84 802BC554 E6020028 */ swc1 $f2, 0x28($s0) /* E2CC88 802BC558 E6000028 */ swc1 $f0, 0x28($s0) @@ -119,7 +119,7 @@ glabel func_802BC3DC_E2CB0C /* E2CCB4 802BC584 304200FF */ andi $v0, $v0, 0xff /* E2CCB8 802BC588 2C420006 */ sltiu $v0, $v0, 6 /* E2CCBC 802BC58C 10400005 */ beqz $v0, .L802BC5A4 -/* E2CCC0 802BC590 00000000 */ nop +/* E2CCC0 802BC590 00000000 */ nop /* E2CCC4 802BC594 92220008 */ lbu $v0, 8($s1) /* E2CCC8 802BC598 A220000E */ sb $zero, 0xe($s1) /* E2CCCC 802BC59C 24420001 */ addiu $v0, $v0, 1 @@ -131,7 +131,7 @@ glabel func_802BC3DC_E2CB0C /* E2CCE0 802BC5B0 26310001 */ addiu $s1, $s1, 1 /* E2CCE4 802BC5B4 C6020088 */ lwc1 $f2, 0x88($s0) /* E2CCE8 802BC5B8 44800000 */ mtc1 $zero, $f0 -/* E2CCEC 802BC5BC 00000000 */ nop +/* E2CCEC 802BC5BC 00000000 */ nop /* E2CCF0 802BC5C0 4602003E */ c.le.s $f0, $f2 /* E2CCF4 802BC5C4 3C01802C */ lui $at, %hi(D_802BCFE0) /* E2CCF8 802BC5C8 D420CFE0 */ ldc1 $f0, %lo(D_802BCFE0)($at) @@ -146,13 +146,13 @@ glabel func_802BC3DC_E2CB0C /* E2CD18 802BC5E8 462010A0 */ cvt.s.d $f2, $f2 /* E2CD1C 802BC5EC 46001021 */ cvt.d.s $f0, $f2 /* E2CD20 802BC5F0 4624003C */ c.lt.d $f0, $f4 -/* E2CD24 802BC5F4 00000000 */ nop +/* E2CD24 802BC5F4 00000000 */ nop /* E2CD28 802BC5F8 45000006 */ bc1f .L802BC614 /* E2CD2C 802BC5FC E6020088 */ swc1 $f2, 0x88($s0) /* E2CD30 802BC600 3C01C123 */ lui $at, 0xc123 /* E2CD34 802BC604 34213333 */ ori $at, $at, 0x3333 /* E2CD38 802BC608 44810000 */ mtc1 $at, $f0 -/* E2CD3C 802BC60C 00000000 */ nop +/* E2CD3C 802BC60C 00000000 */ nop /* E2CD40 802BC610 E6000088 */ swc1 $f0, 0x88($s0) .L802BC614: /* E2CD44 802BC614 C6000058 */ lwc1 $f0, 0x58($s0) @@ -163,36 +163,36 @@ glabel func_802BC3DC_E2CB0C /* E2CD58 802BC628 3C0143B4 */ lui $at, 0x43b4 /* E2CD5C 802BC62C 44814000 */ mtc1 $at, $f8 /* E2CD60 802BC630 4482A000 */ mtc1 $v0, $f20 -/* E2CD64 802BC634 00000000 */ nop +/* E2CD64 802BC634 00000000 */ nop /* E2CD68 802BC638 4680A520 */ cvt.s.w $f20, $f20 /* E2CD6C 802BC63C 4608A502 */ mul.s $f20, $f20, $f8 -/* E2CD70 802BC640 00000000 */ nop +/* E2CD70 802BC640 00000000 */ nop /* E2CD74 802BC644 3C013B80 */ lui $at, 0x3b80 /* E2CD78 802BC648 44814000 */ mtc1 $at, $f8 -/* E2CD7C 802BC64C 00000000 */ nop +/* E2CD7C 802BC64C 00000000 */ nop /* E2CD80 802BC650 4608A502 */ mul.s $f20, $f20, $f8 -/* E2CD84 802BC654 00000000 */ nop +/* E2CD84 802BC654 00000000 */ nop /* E2CD88 802BC658 3C0140C9 */ lui $at, 0x40c9 /* E2CD8C 802BC65C 34210FD0 */ ori $at, $at, 0xfd0 /* E2CD90 802BC660 44814000 */ mtc1 $at, $f8 -/* E2CD94 802BC664 00000000 */ nop +/* E2CD94 802BC664 00000000 */ nop /* E2CD98 802BC668 4608A002 */ mul.s $f0, $f20, $f8 -/* E2CD9C 802BC66C 00000000 */ nop +/* E2CD9C 802BC66C 00000000 */ nop /* E2CDA0 802BC670 3C0143B4 */ lui $at, 0x43b4 /* E2CDA4 802BC674 44814000 */ mtc1 $at, $f8 -/* E2CDA8 802BC678 00000000 */ nop +/* E2CDA8 802BC678 00000000 */ nop /* E2CDAC 802BC67C 46080583 */ div.s $f22, $f0, $f8 /* E2CDB0 802BC680 0C00A85B */ jal sin_rad /* E2CDB4 802BC684 4600B306 */ mov.s $f12, $f22 /* E2CDB8 802BC688 4600C002 */ mul.s $f0, $f24, $f0 -/* E2CDBC 802BC68C 00000000 */ nop +/* E2CDBC 802BC68C 00000000 */ nop /* E2CDC0 802BC690 C6020040 */ lwc1 $f2, 0x40($s0) /* E2CDC4 802BC694 46001080 */ add.s $f2, $f2, $f0 /* E2CDC8 802BC698 4600B306 */ mov.s $f12, $f22 /* E2CDCC 802BC69C 0C00A874 */ jal cos_rad /* E2CDD0 802BC6A0 E6020040 */ swc1 $f2, 0x40($s0) /* E2CDD4 802BC6A4 4600C002 */ mul.s $f0, $f24, $f0 -/* E2CDD8 802BC6A8 00000000 */ nop +/* E2CDD8 802BC6A8 00000000 */ nop /* E2CDDC 802BC6AC C6020070 */ lwc1 $f2, 0x70($s0) /* E2CDE0 802BC6B0 3C040004 */ lui $a0, 4 /* E2CDE4 802BC6B4 46001080 */ add.s $f2, $f2, $f0 @@ -228,21 +228,21 @@ glabel func_802BC3DC_E2CB0C /* E2CE5C 802BC72C A222000E */ sb $v0, 0xe($s1) /* E2CE60 802BC730 304200FF */ andi $v0, $v0, 0xff /* E2CE64 802BC734 44820000 */ mtc1 $v0, $f0 -/* E2CE68 802BC738 00000000 */ nop +/* E2CE68 802BC738 00000000 */ nop /* E2CE6C 802BC73C 46800020 */ cvt.s.w $f0, $f0 /* E2CE70 802BC740 46080002 */ mul.s $f0, $f0, $f8 -/* E2CE74 802BC744 00000000 */ nop +/* E2CE74 802BC744 00000000 */ nop /* E2CE78 802BC748 3C013B80 */ lui $at, 0x3b80 /* E2CE7C 802BC74C 44814000 */ mtc1 $at, $f8 -/* E2CE80 802BC750 00000000 */ nop +/* E2CE80 802BC750 00000000 */ nop /* E2CE84 802BC754 46080002 */ mul.s $f0, $f0, $f8 -/* E2CE88 802BC758 00000000 */ nop +/* E2CE88 802BC758 00000000 */ nop /* E2CE8C 802BC75C 3C0140C9 */ lui $at, 0x40c9 /* E2CE90 802BC760 34210FD0 */ ori $at, $at, 0xfd0 /* E2CE94 802BC764 44814000 */ mtc1 $at, $f8 -/* E2CE98 802BC768 00000000 */ nop +/* E2CE98 802BC768 00000000 */ nop /* E2CE9C 802BC76C 46080002 */ mul.s $f0, $f0, $f8 -/* E2CEA0 802BC770 00000000 */ nop +/* E2CEA0 802BC770 00000000 */ nop /* E2CEA4 802BC774 3C0143B4 */ lui $at, 0x43b4 /* E2CEA8 802BC778 44814000 */ mtc1 $at, $f8 /* E2CEAC 802BC77C 3C014100 */ lui $at, 0x4100 @@ -251,14 +251,14 @@ glabel func_802BC3DC_E2CB0C /* E2CEB8 802BC788 0C00A85B */ jal sin_rad /* E2CEBC 802BC78C 4600B306 */ mov.s $f12, $f22 /* E2CEC0 802BC790 46180002 */ mul.s $f0, $f0, $f24 -/* E2CEC4 802BC794 00000000 */ nop +/* E2CEC4 802BC794 00000000 */ nop /* E2CEC8 802BC798 C6020040 */ lwc1 $f2, 0x40($s0) /* E2CECC 802BC79C 46001080 */ add.s $f2, $f2, $f0 /* E2CED0 802BC7A0 4600B306 */ mov.s $f12, $f22 /* E2CED4 802BC7A4 0C00A874 */ jal cos_rad /* E2CED8 802BC7A8 E6020040 */ swc1 $f2, 0x40($s0) /* E2CEDC 802BC7AC 46180002 */ mul.s $f0, $f0, $f24 -/* E2CEE0 802BC7B0 00000000 */ nop +/* E2CEE0 802BC7B0 00000000 */ nop /* E2CEE4 802BC7B4 C6020070 */ lwc1 $f2, 0x70($s0) /* E2CEE8 802BC7B8 46001080 */ add.s $f2, $f2, $f0 /* E2CEEC 802BC7BC E6020070 */ swc1 $f2, 0x70($s0) @@ -280,17 +280,17 @@ glabel func_802BC3DC_E2CB0C /* E2CF28 802BC7F8 0C0372DF */ jal func_800DCB7C /* E2CF2C 802BC7FC AFA20010 */ sw $v0, 0x10($sp) /* E2CF30 802BC800 1440000B */ bnez $v0, .L802BC830 -/* E2CF34 802BC804 00000000 */ nop +/* E2CF34 802BC804 00000000 */ nop /* E2CF38 802BC808 C6400004 */ lwc1 $f0, 4($s2) /* E2CF3C 802BC80C 3C014348 */ lui $at, 0x4348 /* E2CF40 802BC810 44811000 */ mtc1 $at, $f2 -/* E2CF44 802BC814 00000000 */ nop +/* E2CF44 802BC814 00000000 */ nop /* E2CF48 802BC818 46020001 */ sub.s $f0, $f0, $f2 /* E2CF4C 802BC81C C7A20024 */ lwc1 $f2, 0x24($sp) /* E2CF50 802BC820 4600103C */ c.lt.s $f2, $f0 -/* E2CF54 802BC824 00000000 */ nop +/* E2CF54 802BC824 00000000 */ nop /* E2CF58 802BC828 45000010 */ bc1f .L802BC86C -/* E2CF5C 802BC82C 00000000 */ nop +/* E2CF5C 802BC82C 00000000 */ nop .L802BC830: /* E2CF60 802BC830 92220008 */ lbu $v0, 8($s1) /* E2CF64 802BC834 24420001 */ addiu $v0, $v0, 1 @@ -310,11 +310,11 @@ glabel func_802BC3DC_E2CB0C .L802BC86C: /* E2CF9C 802BC86C 92220014 */ lbu $v0, 0x14($s1) /* E2CFA0 802BC870 44820000 */ mtc1 $v0, $f0 -/* E2CFA4 802BC874 00000000 */ nop +/* E2CFA4 802BC874 00000000 */ nop /* E2CFA8 802BC878 46800020 */ cvt.s.w $f0, $f0 /* E2CFAC 802BC87C 461A0000 */ add.s $f0, $f0, $f26 /* E2CFB0 802BC880 4600F03E */ c.le.s $f30, $f0 -/* E2CFB4 802BC884 00000000 */ nop +/* E2CFB4 802BC884 00000000 */ nop /* E2CFB8 802BC888 45010005 */ bc1t .L802BC8A0 /* E2CFBC 802BC88C 26230014 */ addiu $v1, $s1, 0x14 /* E2CFC0 802BC890 4600020D */ trunc.w.s $f8, $f0 @@ -325,17 +325,17 @@ glabel func_802BC3DC_E2CB0C /* E2CFD0 802BC8A0 461E0001 */ sub.s $f0, $f0, $f30 /* E2CFD4 802BC8A4 4600020D */ trunc.w.s $f8, $f0 /* E2CFD8 802BC8A8 44024000 */ mfc1 $v0, $f8 -/* E2CFDC 802BC8AC 00000000 */ nop +/* E2CFDC 802BC8AC 00000000 */ nop /* E2CFE0 802BC8B0 00571025 */ or $v0, $v0, $s7 /* E2CFE4 802BC8B4 A0620000 */ sb $v0, ($v1) .L802BC8B8: /* E2CFE8 802BC8B8 9222001A */ lbu $v0, 0x1a($s1) /* E2CFEC 802BC8BC 44820000 */ mtc1 $v0, $f0 -/* E2CFF0 802BC8C0 00000000 */ nop +/* E2CFF0 802BC8C0 00000000 */ nop /* E2CFF4 802BC8C4 46800020 */ cvt.s.w $f0, $f0 /* E2CFF8 802BC8C8 461A0001 */ sub.s $f0, $f0, $f26 /* E2CFFC 802BC8CC 4600F03E */ c.le.s $f30, $f0 -/* E2D000 802BC8D0 00000000 */ nop +/* E2D000 802BC8D0 00000000 */ nop /* E2D004 802BC8D4 45010005 */ bc1t .L802BC8EC /* E2D008 802BC8D8 2623001A */ addiu $v1, $s1, 0x1a /* E2D00C 802BC8DC 4600020D */ trunc.w.s $f8, $f0 @@ -346,7 +346,7 @@ glabel func_802BC3DC_E2CB0C /* E2D01C 802BC8EC 461E0001 */ sub.s $f0, $f0, $f30 /* E2D020 802BC8F0 4600020D */ trunc.w.s $f8, $f0 /* E2D024 802BC8F4 44024000 */ mfc1 $v0, $f8 -/* E2D028 802BC8F8 00000000 */ nop +/* E2D028 802BC8F8 00000000 */ nop /* E2D02C 802BC8FC 00571025 */ or $v0, $v0, $s7 /* E2D030 802BC900 A0620000 */ sb $v0, ($v1) .L802BC904: @@ -358,7 +358,7 @@ glabel func_802BC3DC_E2CB0C /* E2D044 802BC914 26100004 */ addiu $s0, $s0, 4 /* E2D048 802BC918 2A620005 */ slti $v0, $s3, 5 /* E2D04C 802BC91C 14400003 */ bnez $v0, .L802BC92C -/* E2D050 802BC920 00000000 */ nop +/* E2D050 802BC920 00000000 */ nop /* E2D054 802BC924 0C043F5A */ jal func_8010FD68 /* E2D058 802BC928 03C0202D */ daddu $a0, $fp, $zero .L802BC92C: diff --git a/asm/nonmatchings/code_E2C930/func_802BC974_E2D0A4.s b/asm/nonmatchings/code_E2C930/func_802BC974_E2D0A4.s index 6898715f06..0111a13648 100644 --- a/asm/nonmatchings/code_E2C930/func_802BC974_E2D0A4.s +++ b/asm/nonmatchings/code_E2C930/func_802BC974_E2D0A4.s @@ -91,12 +91,12 @@ glabel func_802BC974_E2D0A4 /* E2D1F0 802BCAC0 27A40018 */ addiu $a0, $sp, 0x18 /* E2D1F4 802BCAC4 92420014 */ lbu $v0, 0x14($s2) /* E2D1F8 802BCAC8 44820000 */ mtc1 $v0, $f0 -/* E2D1FC 802BCACC 00000000 */ nop +/* E2D1FC 802BCACC 00000000 */ nop /* E2D200 802BCAD0 46800020 */ cvt.s.w $f0, $f0 /* E2D204 802BCAD4 461A0002 */ mul.s $f0, $f0, $f26 -/* E2D208 802BCAD8 00000000 */ nop +/* E2D208 802BCAD8 00000000 */ nop /* E2D20C 802BCADC 46180002 */ mul.s $f0, $f0, $f24 -/* E2D210 802BCAE0 00000000 */ nop +/* E2D210 802BCAE0 00000000 */ nop /* E2D214 802BCAE4 4406B000 */ mfc1 $a2, $f22 /* E2D218 802BCAE8 4407A000 */ mfc1 $a3, $f20 /* E2D21C 802BCAEC 8FA4011C */ lw $a0, 0x11c($sp) @@ -105,14 +105,14 @@ glabel func_802BC974_E2D0A4 /* E2D228 802BCAF8 E7B40010 */ swc1 $f20, 0x10($sp) /* E2D22C 802BCAFC 9242001A */ lbu $v0, 0x1a($s2) /* E2D230 802BCB00 44820000 */ mtc1 $v0, $f0 -/* E2D234 802BCB04 00000000 */ nop +/* E2D234 802BCB04 00000000 */ nop /* E2D238 802BCB08 46800020 */ cvt.s.w $f0, $f0 /* E2D23C 802BCB0C 461A0002 */ mul.s $f0, $f0, $f26 -/* E2D240 802BCB10 00000000 */ nop +/* E2D240 802BCB10 00000000 */ nop /* E2D244 802BCB14 26100008 */ addiu $s0, $s0, 8 /* E2D248 802BCB18 26310018 */ addiu $s1, $s1, 0x18 /* E2D24C 802BCB1C 46180002 */ mul.s $f0, $f0, $f24 -/* E2D250 802BCB20 00000000 */ nop +/* E2D250 802BCB20 00000000 */ nop /* E2D254 802BCB24 27DE0001 */ addiu $fp, $fp, 1 /* E2D258 802BCB28 02A0202D */ daddu $a0, $s5, $zero /* E2D25C 802BCB2C 4406A000 */ mfc1 $a2, $f20 diff --git a/asm/nonmatchings/code_E2C930/func_802BCC80_E2D3B0.s b/asm/nonmatchings/code_E2C930/func_802BCC80_E2D3B0.s index 90138912ae..ef90597361 100644 --- a/asm/nonmatchings/code_E2C930/func_802BCC80_E2D3B0.s +++ b/asm/nonmatchings/code_E2C930/func_802BCC80_E2D3B0.s @@ -9,9 +9,9 @@ glabel func_802BCC80_E2D3B0 /* E2D3C0 802BCC90 92020006 */ lbu $v0, 6($s0) /* E2D3C4 802BCC94 30420080 */ andi $v0, $v0, 0x80 /* E2D3C8 802BCC98 1040000C */ beqz $v0, .L802BCCCC -/* E2D3CC 802BCC9C 00000000 */ nop +/* E2D3CC 802BCC9C 00000000 */ nop /* E2D3D0 802BCCA0 0C04419E */ jal func_80110678 -/* E2D3D4 802BCCA4 00000000 */ nop +/* E2D3D4 802BCCA4 00000000 */ nop /* E2D3D8 802BCCA8 0C043F5A */ jal func_8010FD68 /* E2D3DC 802BCCAC 0200202D */ daddu $a0, $s0, $zero /* E2D3E0 802BCCB0 C600004C */ lwc1 $f0, 0x4c($s0) @@ -26,4 +26,4 @@ glabel func_802BCC80_E2D3B0 /* E2D400 802BCCD0 8FB00010 */ lw $s0, 0x10($sp) /* E2D404 802BCCD4 03E00008 */ jr $ra /* E2D408 802BCCD8 27BD0018 */ addiu $sp, $sp, 0x18 -/* E2D40C 802BCCDC 00000000 */ nop +/* E2D40C 802BCCDC 00000000 */ nop diff --git a/asm/nonmatchings/code_E2D730/func_802BB000_E2D930.s b/asm/nonmatchings/code_E2D730/func_802BB000_E2D930.s index 1b92010515..04de94a655 100644 --- a/asm/nonmatchings/code_E2D730/func_802BB000_E2D930.s +++ b/asm/nonmatchings/code_E2D730/func_802BB000_E2D930.s @@ -12,9 +12,9 @@ glabel func_802BB000_E2D930 /* E2D94C 802BB01C 8C900040 */ lw $s0, 0x40($a0) /* E2D950 802BB020 30420001 */ andi $v0, $v0, 1 /* E2D954 802BB024 10400019 */ beqz $v0, .L802BB08C -/* E2D958 802BB028 00000000 */ nop +/* E2D958 802BB028 00000000 */ nop /* E2D95C 802BB02C 0C04D07A */ jal func_801341E8 -/* E2D960 802BB030 00000000 */ nop +/* E2D960 802BB030 00000000 */ nop /* E2D964 802BB034 14400015 */ bnez $v0, .L802BB08C /* E2D968 802BB038 24020021 */ addiu $v0, $zero, 0x21 /* E2D96C 802BB03C 822300B4 */ lb $v1, 0xb4($s1) @@ -26,7 +26,7 @@ glabel func_802BB000_E2D930 /* E2D984 802BB054 AE220004 */ sw $v0, 4($s1) .L802BB058: /* E2D988 802BB058 1062000C */ beq $v1, $v0, .L802BB08C -/* E2D98C 802BB05C 00000000 */ nop +/* E2D98C 802BB05C 00000000 */ nop /* E2D990 802BB060 9604002C */ lhu $a0, 0x2c($s0) /* E2D994 802BB064 96020028 */ lhu $v0, 0x28($s0) /* E2D998 802BB068 9603002A */ lhu $v1, 0x2a($s0) diff --git a/asm/nonmatchings/code_E2D730/func_802BB0A0_E2D9D0.s b/asm/nonmatchings/code_E2D730/func_802BB0A0_E2D9D0.s index 74b3d30386..f0b14aa5bb 100644 --- a/asm/nonmatchings/code_E2D730/func_802BB0A0_E2D9D0.s +++ b/asm/nonmatchings/code_E2D730/func_802BB0A0_E2D9D0.s @@ -16,9 +16,9 @@ glabel func_802BB0A0_E2D9D0 /* E2D9FC 802BB0CC 10600005 */ beqz $v1, .L802BB0E4 /* E2DA00 802BB0D0 24020001 */ addiu $v0, $zero, 1 /* E2DA04 802BB0D4 1062000A */ beq $v1, $v0, .L802BB100 -/* E2DA08 802BB0D8 00000000 */ nop +/* E2DA08 802BB0D8 00000000 */ nop /* E2DA0C 802BB0DC 080AEC67 */ j .L802BB19C -/* E2DA10 802BB0E0 00000000 */ nop +/* E2DA10 802BB0E0 00000000 */ nop .L802BB0E4: /* E2DA14 802BB0E4 24020001 */ addiu $v0, $zero, 1 /* E2DA18 802BB0E8 AE000018 */ sw $zero, 0x18($s0) @@ -31,7 +31,7 @@ glabel func_802BB0A0_E2D9D0 /* E2DA30 802BB100 92220006 */ lbu $v0, 6($s1) /* E2DA34 802BB104 30420001 */ andi $v0, $v0, 1 /* E2DA38 802BB108 14400017 */ bnez $v0, .L802BB168 -/* E2DA3C 802BB10C 00000000 */ nop +/* E2DA3C 802BB10C 00000000 */ nop /* E2DA40 802BB110 C6000014 */ lwc1 $f0, 0x14($s0) /* E2DA44 802BB114 3C01802C */ lui $at, %hi(D_802BCDC0) /* E2DA48 802BB118 D422CDC0 */ ldc1 $f2, %lo(D_802BCDC0)($at) @@ -43,11 +43,11 @@ glabel func_802BB0A0_E2D9D0 /* E2DA60 802BB130 46200020 */ cvt.s.d $f0, $f0 /* E2DA64 802BB134 460000A1 */ cvt.d.s $f2, $f0 /* E2DA68 802BB138 4622203C */ c.lt.d $f4, $f2 -/* E2DA6C 802BB13C 00000000 */ nop +/* E2DA6C 802BB13C 00000000 */ nop /* E2DA70 802BB140 45000016 */ bc1f .L802BB19C /* E2DA74 802BB144 E6000014 */ swc1 $f0, 0x14($s0) /* E2DA78 802BB148 45000014 */ bc1f .L802BB19C -/* E2DA7C 802BB14C 00000000 */ nop +/* E2DA7C 802BB14C 00000000 */ nop /* E2DA80 802BB150 3C01802C */ lui $at, %hi(D_802BCDC8) /* E2DA84 802BB154 D420CDC8 */ ldc1 $f0, %lo(D_802BCDC8)($at) /* E2DA88 802BB158 46201001 */ sub.d $f0, $f2, $f0 @@ -64,7 +64,7 @@ glabel func_802BB0A0_E2D9D0 /* E2DAB0 802BB180 44811000 */ mtc1 $at, $f2 /* E2DAB4 802BB184 46200020 */ cvt.s.d $f0, $f0 /* E2DAB8 802BB188 4600103C */ c.lt.s $f2, $f0 -/* E2DABC 802BB18C 00000000 */ nop +/* E2DABC 802BB18C 00000000 */ nop /* E2DAC0 802BB190 45000002 */ bc1f .L802BB19C /* E2DAC4 802BB194 E6000014 */ swc1 $f0, 0x14($s0) /* E2DAC8 802BB198 E6020014 */ swc1 $f2, 0x14($s0) @@ -81,7 +81,7 @@ glabel func_802BB0A0_E2D9D0 /* E2DAF0 802BB1C0 8E420004 */ lw $v0, 4($s2) /* E2DAF4 802BB1C4 00431024 */ and $v0, $v0, $v1 /* E2DAF8 802BB1C8 10400011 */ beqz $v0, .L802BB210 -/* E2DAFC 802BB1CC 00000000 */ nop +/* E2DAFC 802BB1CC 00000000 */ nop /* E2DB00 802BB1D0 C62C0048 */ lwc1 $f12, 0x48($s1) /* E2DB04 802BB1D4 C62E0050 */ lwc1 $f14, 0x50($s1) /* E2DB08 802BB1D8 8E460028 */ lw $a2, 0x28($s2) @@ -93,9 +93,9 @@ glabel func_802BB0A0_E2D9D0 /* E2DB20 802BB1F0 44801000 */ mtc1 $zero, $f2 /* E2DB24 802BB1F4 46200005 */ abs.d $f0, $f0 /* E2DB28 802BB1F8 4622003C */ c.lt.d $f0, $f2 -/* E2DB2C 802BB1FC 00000000 */ nop +/* E2DB2C 802BB1FC 00000000 */ nop /* E2DB30 802BB200 45000003 */ bc1f .L802BB210 -/* E2DB34 802BB204 00000000 */ nop +/* E2DB34 802BB204 00000000 */ nop /* E2DB38 802BB208 0C043F5A */ jal func_8010FD68 /* E2DB3C 802BB20C 0220202D */ daddu $a0, $s1, $zero .L802BB210: diff --git a/asm/nonmatchings/code_E2D730/func_802BB228_E2DB58.s b/asm/nonmatchings/code_E2D730/func_802BB228_E2DB58.s index 25dc089495..b755bda649 100644 --- a/asm/nonmatchings/code_E2D730/func_802BB228_E2DB58.s +++ b/asm/nonmatchings/code_E2D730/func_802BB228_E2DB58.s @@ -17,7 +17,7 @@ glabel func_802BB228_E2DB58 /* E2DB88 802BB258 44811000 */ mtc1 $at, $f2 /* E2DB8C 802BB25C 46200020 */ cvt.s.d $f0, $f0 /* E2DB90 802BB260 4600103C */ c.lt.s $f2, $f0 -/* E2DB94 802BB264 00000000 */ nop +/* E2DB94 802BB264 00000000 */ nop /* E2DB98 802BB268 45000002 */ bc1f .L802BB274 /* E2DB9C 802BB26C E6000014 */ swc1 $f0, 0x14($s0) /* E2DBA0 802BB270 E6020014 */ swc1 $f2, 0x14($s0) diff --git a/asm/nonmatchings/code_E2D730/func_802BB298_E2DBC8.s b/asm/nonmatchings/code_E2D730/func_802BB298_E2DBC8.s index 3b8251321f..fd3173a6ed 100644 --- a/asm/nonmatchings/code_E2D730/func_802BB298_E2DBC8.s +++ b/asm/nonmatchings/code_E2D730/func_802BB298_E2DBC8.s @@ -11,11 +11,11 @@ glabel func_802BB298_E2DBC8 /* E2DBE0 802BB2B0 00C31025 */ or $v0, $a2, $v1 /* E2DBE4 802BB2B4 00451025 */ or $v0, $v0, $a1 /* E2DBE8 802BB2B8 1440000E */ bnez $v0, .L802BB2F4 -/* E2DBEC 802BB2BC 00000000 */ nop +/* E2DBEC 802BB2BC 00000000 */ nop /* E2DBF0 802BB2C0 C482004C */ lwc1 $f2, 0x4c($a0) /* E2DBF4 802BB2C4 3C0142C8 */ lui $at, 0x42c8 /* E2DBF8 802BB2C8 44810000 */ mtc1 $at, $f0 -/* E2DBFC 802BB2CC 00000000 */ nop +/* E2DBFC 802BB2CC 00000000 */ nop /* E2DC00 802BB2D0 46001080 */ add.s $f2, $f2, $f0 /* E2DC04 802BB2D4 C4800048 */ lwc1 $f0, 0x48($a0) /* E2DC08 802BB2D8 C4840050 */ lwc1 $f4, 0x50($a0) diff --git a/asm/nonmatchings/code_E2D730/func_802BB374_E2DCA4.s b/asm/nonmatchings/code_E2D730/func_802BB374_E2DCA4.s index 8acb7fe8bc..9172a00e85 100644 --- a/asm/nonmatchings/code_E2D730/func_802BB374_E2DCA4.s +++ b/asm/nonmatchings/code_E2D730/func_802BB374_E2DCA4.s @@ -49,14 +49,14 @@ glabel func_802BB374_E2DCA4 /* E2DD54 802BB424 C42C1DEC */ lwc1 $f12, %lo(D_800B1DEC)($at) /* E2DD58 802BB428 3C014334 */ lui $at, 0x4334 /* E2DD5C 802BB42C 44810000 */ mtc1 $at, $f0 -/* E2DD60 802BB430 00000000 */ nop +/* E2DD60 802BB430 00000000 */ nop /* E2DD64 802BB434 46006300 */ add.s $f12, $f12, $f0 /* E2DD68 802BB438 3C0140C9 */ lui $at, 0x40c9 /* E2DD6C 802BB43C 34210FD0 */ ori $at, $at, 0xfd0 /* E2DD70 802BB440 44810000 */ mtc1 $at, $f0 -/* E2DD74 802BB444 00000000 */ nop +/* E2DD74 802BB444 00000000 */ nop /* E2DD78 802BB448 46006302 */ mul.s $f12, $f12, $f0 -/* E2DD7C 802BB44C 00000000 */ nop +/* E2DD7C 802BB44C 00000000 */ nop /* E2DD80 802BB450 27A50098 */ addiu $a1, $sp, 0x98 /* E2DD84 802BB454 3C0143B4 */ lui $at, 0x43b4 /* E2DD88 802BB458 44810000 */ mtc1 $at, $f0 @@ -98,12 +98,12 @@ glabel func_802BB374_E2DCA4 /* E2DE18 802BB4E8 C7A00098 */ lwc1 $f0, 0x98($sp) /* E2DE1C 802BB4EC 3C014180 */ lui $at, 0x4180 /* E2DE20 802BB4F0 44812000 */ mtc1 $at, $f4 -/* E2DE24 802BB4F4 00000000 */ nop +/* E2DE24 802BB4F4 00000000 */ nop /* E2DE28 802BB4F8 46040002 */ mul.s $f0, $f0, $f4 -/* E2DE2C 802BB4FC 00000000 */ nop +/* E2DE2C 802BB4FC 00000000 */ nop /* E2DE30 802BB500 C7A2009C */ lwc1 $f2, 0x9c($sp) /* E2DE34 802BB504 46041082 */ mul.s $f2, $f2, $f4 -/* E2DE38 802BB508 00000000 */ nop +/* E2DE38 802BB508 00000000 */ nop /* E2DE3C 802BB50C C6440048 */ lwc1 $f4, 0x48($s2) /* E2DE40 802BB510 46002100 */ add.s $f4, $f4, $f0 /* E2DE44 802BB514 C6400050 */ lwc1 $f0, 0x50($s2) diff --git a/asm/nonmatchings/code_E2D730/func_802BB648_E2DF78.s b/asm/nonmatchings/code_E2D730/func_802BB648_E2DF78.s index 2f0db8afc3..172c0ad39d 100644 --- a/asm/nonmatchings/code_E2D730/func_802BB648_E2DF78.s +++ b/asm/nonmatchings/code_E2D730/func_802BB648_E2DF78.s @@ -11,11 +11,11 @@ glabel func_802BB648_E2DF78 /* E2DF90 802BB660 8E050040 */ lw $a1, 0x40($s0) /* E2DF94 802BB664 30420010 */ andi $v0, $v0, 0x10 /* E2DF98 802BB668 10400019 */ beqz $v0, .L802BB6D0 -/* E2DF9C 802BB66C 00000000 */ nop +/* E2DF9C 802BB66C 00000000 */ nop /* E2DFA0 802BB670 92020006 */ lbu $v0, 6($s0) /* E2DFA4 802BB674 30420048 */ andi $v0, $v0, 0x48 /* E2DFA8 802BB678 10400015 */ beqz $v0, .L802BB6D0 -/* E2DFAC 802BB67C 00000000 */ nop +/* E2DFAC 802BB67C 00000000 */ nop /* E2DFB0 802BB680 8E030000 */ lw $v1, ($s0) /* E2DFB4 802BB684 30621000 */ andi $v0, $v1, 0x1000 /* E2DFB8 802BB688 10400011 */ beqz $v0, .L802BB6D0 @@ -35,7 +35,7 @@ glabel func_802BB648_E2DF78 /* E2DFF0 802BB6C0 3C050000 */ lui $a1, 0 /* E2DFF4 802BB6C4 24A500F4 */ addiu $a1, $a1, 0xf4 /* E2DFF8 802BB6C8 0C048052 */ jal play_model_animation -/* E2DFFC 802BB6CC 00000000 */ nop +/* E2DFFC 802BB6CC 00000000 */ nop .L802BB6D0: /* E2E000 802BB6D0 8FBF0014 */ lw $ra, 0x14($sp) /* E2E004 802BB6D4 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_E2D730/func_802BB78C_E2E0BC.s b/asm/nonmatchings/code_E2D730/func_802BB78C_E2E0BC.s index 279c1772da..83da2afe51 100644 --- a/asm/nonmatchings/code_E2D730/func_802BB78C_E2E0BC.s +++ b/asm/nonmatchings/code_E2D730/func_802BB78C_E2E0BC.s @@ -12,13 +12,13 @@ glabel func_802BB78C_E2E0BC /* E2E0D8 802BB7A8 10600005 */ beqz $v1, .L802BB7C0 /* E2E0DC 802BB7AC 24020001 */ addiu $v0, $zero, 1 /* E2E0E0 802BB7B0 10620014 */ beq $v1, $v0, .L802BB804 -/* E2E0E4 802BB7B4 00000000 */ nop +/* E2E0E4 802BB7B4 00000000 */ nop /* E2E0E8 802BB7B8 080AEE29 */ j .L802BB8A4 -/* E2E0EC 802BB7BC 00000000 */ nop +/* E2E0EC 802BB7BC 00000000 */ nop .L802BB7C0: /* E2E0F0 802BB7C0 96220000 */ lhu $v0, ($s1) /* E2E0F4 802BB7C4 10400037 */ beqz $v0, .L802BB8A4 -/* E2E0F8 802BB7C8 00000000 */ nop +/* E2E0F8 802BB7C8 00000000 */ nop /* E2E0FC 802BB7CC 96220002 */ lhu $v0, 2($s1) /* E2E100 802BB7D0 3C01C1C8 */ lui $at, 0xc1c8 /* E2E104 802BB7D4 44810000 */ mtc1 $at, $f0 @@ -37,13 +37,13 @@ glabel func_802BB78C_E2E0BC /* E2E134 802BB804 C6000068 */ lwc1 $f0, 0x68($s0) /* E2E138 802BB808 3C013F80 */ lui $at, 0x3f80 /* E2E13C 802BB80C 44811000 */ mtc1 $at, $f2 -/* E2E140 802BB810 00000000 */ nop +/* E2E140 802BB810 00000000 */ nop /* E2E144 802BB814 46020000 */ add.s $f0, $f0, $f2 /* E2E148 802BB818 3C014100 */ lui $at, 0x4100 /* E2E14C 802BB81C 44811000 */ mtc1 $at, $f2 -/* E2E150 802BB820 00000000 */ nop +/* E2E150 802BB820 00000000 */ nop /* E2E154 802BB824 4600103E */ c.le.s $f2, $f0 -/* E2E158 802BB828 00000000 */ nop +/* E2E158 802BB828 00000000 */ nop /* E2E15C 802BB82C 45000002 */ bc1f .L802BB838 /* E2E160 802BB830 E6000068 */ swc1 $f0, 0x68($s0) /* E2E164 802BB834 E6020068 */ swc1 $f2, 0x68($s0) @@ -67,7 +67,7 @@ glabel func_802BB78C_E2E0BC /* E2E1A4 802BB874 46200020 */ cvt.s.d $f0, $f0 /* E2E1A8 802BB878 460000A1 */ cvt.d.s $f2, $f0 /* E2E1AC 802BB87C 4624103E */ c.le.d $f2, $f4 -/* E2E1B0 802BB880 00000000 */ nop +/* E2E1B0 802BB880 00000000 */ nop /* E2E1B4 802BB884 45000003 */ bc1f .L802BB894 /* E2E1B8 802BB888 E6000054 */ swc1 $f0, 0x54($s0) /* E2E1BC 802BB88C A6200002 */ sh $zero, 2($s1) diff --git a/asm/nonmatchings/code_E2D730/func_802BB8D4_E2E204.s b/asm/nonmatchings/code_E2D730/func_802BB8D4_E2E204.s index 86cb7da7d9..6988706a2f 100644 --- a/asm/nonmatchings/code_E2D730/func_802BB8D4_E2E204.s +++ b/asm/nonmatchings/code_E2D730/func_802BB8D4_E2E204.s @@ -26,7 +26,7 @@ glabel func_802BB8D4_E2E204 /* E2E258 802BB928 44801000 */ mtc1 $zero, $f2 /* E2E25C 802BB92C 46000021 */ cvt.d.s $f0, $f0 /* E2E260 802BB930 46220002 */ mul.d $f0, $f0, $f2 -/* E2E264 802BB934 00000000 */ nop +/* E2E264 802BB934 00000000 */ nop /* E2E268 802BB938 46200005 */ abs.d $f0, $f0 /* E2E26C 802BB93C 46200020 */ cvt.s.d $f0, $f0 /* E2E270 802BB940 E6400008 */ swc1 $f0, 8($s2) @@ -39,7 +39,7 @@ glabel func_802BB8D4_E2E204 /* E2E28C 802BB95C C62E0030 */ lwc1 $f14, 0x30($s1) /* E2E290 802BB960 44070000 */ mfc1 $a3, $f0 /* E2E294 802BB964 0C00A720 */ jal atan2 -/* E2E298 802BB968 00000000 */ nop +/* E2E298 802BB968 00000000 */ nop /* E2E29C 802BB96C E6400004 */ swc1 $f0, 4($s2) /* E2E2A0 802BB970 8FBF001C */ lw $ra, 0x1c($sp) /* E2E2A4 802BB974 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/code_E2D730/func_802BB9E0_E2E310.s b/asm/nonmatchings/code_E2D730/func_802BB9E0_E2E310.s index cd05c63852..da55864a56 100644 --- a/asm/nonmatchings/code_E2D730/func_802BB9E0_E2E310.s +++ b/asm/nonmatchings/code_E2D730/func_802BB9E0_E2E310.s @@ -17,24 +17,25 @@ glabel func_802BB9E0_E2E310 /* E2E340 802BBA10 2C620007 */ sltiu $v0, $v1, 7 /* E2E344 802BBA14 104000A2 */ beqz $v0, .L802BBCA0 /* E2E348 802BBA18 00031080 */ sll $v0, $v1, 2 -/* E2E34C 802BBA1C 3C01802C */ lui $at, %hi(D_802BCDE8) +/* E2E34C 802BBA1C 3C01802C */ lui $at, %hi(jtbl_802BCDE8_E2F718) /* E2E350 802BBA20 00220821 */ addu $at, $at, $v0 -/* E2E354 802BBA24 8C22CDE8 */ lw $v0, %lo(D_802BCDE8)($at) +/* E2E354 802BBA24 8C22CDE8 */ lw $v0, %lo(jtbl_802BCDE8_E2F718)($at) /* E2E358 802BBA28 00400008 */ jr $v0 -/* E2E35C 802BBA2C 00000000 */ nop +/* E2E35C 802BBA2C 00000000 */ nop +glabel L802BBA30_E2E360 /* E2E360 802BBA30 92420006 */ lbu $v0, 6($s2) /* E2E364 802BBA34 30420001 */ andi $v0, $v0, 1 /* E2E368 802BBA38 50400099 */ beql $v0, $zero, .L802BBCA0 /* E2E36C 802BBA3C A2000001 */ sb $zero, 1($s0) /* E2E370 802BBA40 80820003 */ lb $v0, 3($a0) /* E2E374 802BBA44 10400004 */ beqz $v0, .L802BBA58 -/* E2E378 802BBA48 00000000 */ nop +/* E2E378 802BBA48 00000000 */ nop /* E2E37C 802BBA4C 8E220004 */ lw $v0, 4($s1) /* E2E380 802BBA50 34420004 */ ori $v0, $v0, 4 /* E2E384 802BBA54 AE220004 */ sw $v0, 4($s1) .L802BBA58: /* E2E388 802BBA58 0C03BCC0 */ jal func_800EF300 -/* E2E38C 802BBA5C 00000000 */ nop +/* E2E38C 802BBA5C 00000000 */ nop /* E2E390 802BBA60 8E220004 */ lw $v0, 4($s1) /* E2E394 802BBA64 3C030004 */ lui $v1, 4 /* E2E398 802BBA68 00431025 */ or $v0, $v0, $v1 @@ -54,13 +55,14 @@ glabel func_802BB9E0_E2E310 /* E2E3D0 802BBAA0 3C050000 */ lui $a1, 0 /* E2E3D4 802BBAA4 24A50214 */ addiu $a1, $a1, 0x214 /* E2E3D8 802BBAA8 0C048052 */ jal play_model_animation -/* E2E3DC 802BBAAC 00000000 */ nop +/* E2E3DC 802BBAAC 00000000 */ nop /* E2E3E0 802BBAB0 0C05272D */ jal play_sound /* E2E3E4 802BBAB4 240400F2 */ addiu $a0, $zero, 0xf2 /* E2E3E8 802BBAB8 0C0AEE35 */ jal func_802BB8D4_E2E204 /* E2E3EC 802BBABC 0240202D */ daddu $a0, $s2, $zero /* E2E3F0 802BBAC0 080AEF28 */ j .L802BBCA0 -/* E2E3F4 802BBAC4 00000000 */ nop +/* E2E3F4 802BBAC4 00000000 */ nop +glabel L802BBAC8_E2E3F8 /* E2E3F8 802BBAC8 8E220004 */ lw $v0, 4($s1) /* E2E3FC 802BBACC 3C030004 */ lui $v1, 4 /* E2E400 802BBAD0 00431025 */ or $v0, $v0, $v1 @@ -92,7 +94,8 @@ glabel func_802BB9E0_E2E310 /* E2E464 802BBB34 0C0AEE63 */ jal func_802BB98C_E2E2BC /* E2E468 802BBB38 0240202D */ daddu $a0, $s2, $zero /* E2E46C 802BBB3C 080AEF28 */ j .L802BBCA0 -/* E2E470 802BBB40 00000000 */ nop +/* E2E470 802BBB40 00000000 */ nop +glabel L802BBB44_E2E474 /* E2E474 802BBB44 96020002 */ lhu $v0, 2($s0) /* E2E478 802BBB48 2442FFFF */ addiu $v0, $v0, -1 /* E2E47C 802BBB4C A6020002 */ sh $v0, 2($s0) @@ -121,22 +124,24 @@ glabel func_802BB9E0_E2E310 /* E2E4D8 802BBBA8 0C0B77FE */ jal func_802DDFF8 /* E2E4DC 802BBBAC AFA00018 */ sw $zero, 0x18($sp) /* E2E4E0 802BBBB0 080AEF28 */ j .L802BBCA0 -/* E2E4E4 802BBBB4 00000000 */ nop +/* E2E4E4 802BBBB4 00000000 */ nop +glabel L802BBBB8_E2E4E8 /* E2E4E8 802BBBB8 92020000 */ lbu $v0, ($s0) /* E2E4EC 802BBBBC 080AEF02 */ j .L802BBC08 /* E2E4F0 802BBBC0 24420001 */ addiu $v0, $v0, 1 +glabel L802BBBC4_E2E4F4 /* E2E4F4 802BBBC4 3C01802C */ lui $at, %hi(D_802BCE20) /* E2E4F8 802BBBC8 C420CE20 */ lwc1 $f0, %lo(D_802BCE20)($at) /* E2E4FC 802BBBCC 44801000 */ mtc1 $zero, $f2 /* E2E500 802BBBD0 3C014387 */ lui $at, 0x4387 /* E2E504 802BBBD4 44812000 */ mtc1 $at, $f4 /* E2E508 802BBBD8 46020032 */ c.eq.s $f0, $f2 -/* E2E50C 802BBBDC 00000000 */ nop +/* E2E50C 802BBBDC 00000000 */ nop /* E2E510 802BBBE0 45010004 */ bc1t .L802BBBF4 /* E2E514 802BBBE4 E62000A8 */ swc1 $f0, 0xa8($s1) /* E2E518 802BBBE8 3C0142B4 */ lui $at, 0x42b4 /* E2E51C 802BBBEC 44812000 */ mtc1 $at, $f4 -/* E2E520 802BBBF0 00000000 */ nop +/* E2E520 802BBBF0 00000000 */ nop .L802BBBF4: /* E2E524 802BBBF4 E6240080 */ swc1 $f4, 0x80($s1) /* E2E528 802BBBF8 92020000 */ lbu $v0, ($s0) @@ -146,6 +151,7 @@ glabel func_802BB9E0_E2E310 .L802BBC08: /* E2E538 802BBC08 080AEF28 */ j .L802BBCA0 /* E2E53C 802BBC0C A2020000 */ sb $v0, ($s0) +glabel L802BBC10_E2E540 /* E2E540 802BBC10 96020002 */ lhu $v0, 2($s0) /* E2E544 802BBC14 2442FFFF */ addiu $v0, $v0, -1 /* E2E548 802BBC18 A6020002 */ sh $v0, 2($s0) @@ -164,24 +170,25 @@ glabel func_802BB9E0_E2E310 /* E2E57C 802BBC4C 0C0B77B9 */ jal func_802DDEE4 /* E2E580 802BBC50 AFA0001C */ sw $zero, 0x1c($sp) /* E2E584 802BBC54 0C038069 */ jal enable_player_input -/* E2E588 802BBC58 00000000 */ nop +/* E2E588 802BBC58 00000000 */ nop /* E2E58C 802BBC5C 3C03FFEF */ lui $v1, 0xffef /* E2E590 802BBC60 8E220000 */ lw $v0, ($s1) /* E2E594 802BBC64 3463FFFF */ ori $v1, $v1, 0xffff /* E2E598 802BBC68 00431024 */ and $v0, $v0, $v1 /* E2E59C 802BBC6C 080AEF28 */ j .L802BBCA0 /* E2E5A0 802BBC70 AE220000 */ sw $v0, ($s1) +glabel L802BBC74_E2E5A4 /* E2E5A4 802BBC74 92420006 */ lbu $v0, 6($s2) /* E2E5A8 802BBC78 30420001 */ andi $v0, $v0, 1 /* E2E5AC 802BBC7C 14400008 */ bnez $v0, .L802BBCA0 -/* E2E5B0 802BBC80 00000000 */ nop +/* E2E5B0 802BBC80 00000000 */ nop /* E2E5B4 802BBC84 80820000 */ lb $v0, ($a0) /* E2E5B8 802BBC88 14400005 */ bnez $v0, .L802BBCA0 -/* E2E5BC 802BBC8C 00000000 */ nop +/* E2E5BC 802BBC8C 00000000 */ nop /* E2E5C0 802BBC90 0C03BCCA */ jal enable_partner_ai /* E2E5C4 802BBC94 A2000000 */ sb $zero, ($s0) /* E2E5C8 802BBC98 0C03954C */ jal func_800E5530 -/* E2E5CC 802BBC9C 00000000 */ nop +/* E2E5CC 802BBC9C 00000000 */ nop .L802BBCA0: /* E2E5D0 802BBCA0 8FBF002C */ lw $ra, 0x2c($sp) /* E2E5D4 802BBCA4 8FB20028 */ lw $s2, 0x28($sp) @@ -189,5 +196,5 @@ glabel func_802BB9E0_E2E310 /* E2E5DC 802BBCAC 8FB00020 */ lw $s0, 0x20($sp) /* E2E5E0 802BBCB0 03E00008 */ jr $ra /* E2E5E4 802BBCB4 27BD0030 */ addiu $sp, $sp, 0x30 -/* E2E5E8 802BBCB8 00000000 */ nop -/* E2E5EC 802BBCBC 00000000 */ nop +/* E2E5E8 802BBCB8 00000000 */ nop +/* E2E5EC 802BBCBC 00000000 */ nop diff --git a/asm/nonmatchings/code_E2E5F0/func_802BBCC0_E2E5F0.s b/asm/nonmatchings/code_E2E5F0/func_802BBCC0_E2E5F0.s index 7a7d6b9c15..ab65674eac 100644 --- a/asm/nonmatchings/code_E2E5F0/func_802BBCC0_E2E5F0.s +++ b/asm/nonmatchings/code_E2E5F0/func_802BBCC0_E2E5F0.s @@ -13,14 +13,14 @@ glabel func_802BBCC0_E2E5F0 /* E2E610 802BBCE0 92020006 */ lbu $v0, 6($s0) /* E2E614 802BBCE4 30420048 */ andi $v0, $v0, 0x48 /* E2E618 802BBCE8 10400008 */ beqz $v0, .L802BBD0C -/* E2E61C 802BBCEC 00000000 */ nop +/* E2E61C 802BBCEC 00000000 */ nop /* E2E620 802BBCF0 0C043F5A */ jal func_8010FD68 -/* E2E624 802BBCF4 00000000 */ nop +/* E2E624 802BBCF4 00000000 */ nop /* E2E628 802BBCF8 86040014 */ lh $a0, 0x14($s0) /* E2E62C 802BBCFC 3C050000 */ lui $a1, 0 /* E2E630 802BBD00 24A500F4 */ addiu $a1, $a1, 0xf4 /* E2E634 802BBD04 0C048052 */ jal play_model_animation -/* E2E638 802BBD08 00000000 */ nop +/* E2E638 802BBD08 00000000 */ nop .L802BBD0C: /* E2E63C 802BBD0C 8FBF0014 */ lw $ra, 0x14($sp) /* E2E640 802BBD10 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_E2E5F0/func_802BBD1C_E2E64C.s b/asm/nonmatchings/code_E2E5F0/func_802BBD1C_E2E64C.s index ce3b432e68..8003bc0ec4 100644 --- a/asm/nonmatchings/code_E2E5F0/func_802BBD1C_E2E64C.s +++ b/asm/nonmatchings/code_E2E5F0/func_802BBD1C_E2E64C.s @@ -13,14 +13,14 @@ glabel func_802BBD1C_E2E64C /* E2E66C 802BBD3C 92020006 */ lbu $v0, 6($s0) /* E2E670 802BBD40 30420048 */ andi $v0, $v0, 0x48 /* E2E674 802BBD44 10400008 */ beqz $v0, .L802BBD68 -/* E2E678 802BBD48 00000000 */ nop +/* E2E678 802BBD48 00000000 */ nop /* E2E67C 802BBD4C 0C043F5A */ jal func_8010FD68 -/* E2E680 802BBD50 00000000 */ nop +/* E2E680 802BBD50 00000000 */ nop /* E2E684 802BBD54 86040014 */ lh $a0, 0x14($s0) /* E2E688 802BBD58 3C050000 */ lui $a1, 0 /* E2E68C 802BBD5C 24A50064 */ addiu $a1, $a1, 0x64 /* E2E690 802BBD60 0C048052 */ jal play_model_animation -/* E2E694 802BBD64 00000000 */ nop +/* E2E694 802BBD64 00000000 */ nop .L802BBD68: /* E2E698 802BBD68 8FBF0014 */ lw $ra, 0x14($sp) /* E2E69C 802BBD6C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_E2E5F0/func_802BBD78_E2E6A8.s b/asm/nonmatchings/code_E2E5F0/func_802BBD78_E2E6A8.s index ceb19c2e15..52986e29ce 100644 --- a/asm/nonmatchings/code_E2E5F0/func_802BBD78_E2E6A8.s +++ b/asm/nonmatchings/code_E2E5F0/func_802BBD78_E2E6A8.s @@ -13,12 +13,12 @@ glabel func_802BBD78_E2E6A8 /* E2E6C8 802BBD98 3C0140C9 */ lui $at, 0x40c9 /* E2E6CC 802BBD9C 34210FD0 */ ori $at, $at, 0xfd0 /* E2E6D0 802BBDA0 44811000 */ mtc1 $at, $f2 -/* E2E6D4 802BBDA4 00000000 */ nop +/* E2E6D4 802BBDA4 00000000 */ nop /* E2E6D8 802BBDA8 46020582 */ mul.s $f22, $f0, $f2 -/* E2E6DC 802BBDAC 00000000 */ nop +/* E2E6DC 802BBDAC 00000000 */ nop /* E2E6E0 802BBDB0 3C0143B4 */ lui $at, 0x43b4 /* E2E6E4 802BBDB4 44810000 */ mtc1 $at, $f0 -/* E2E6E8 802BBDB8 00000000 */ nop +/* E2E6E8 802BBDB8 00000000 */ nop /* E2E6EC 802BBDBC 4600B583 */ div.s $f22, $f22, $f0 /* E2E6F0 802BBDC0 0C00A874 */ jal cos_rad /* E2E6F4 802BBDC4 4600B306 */ mov.s $f12, $f22 @@ -27,7 +27,7 @@ glabel func_802BBD78_E2E6A8 /* E2E700 802BBDD0 44801000 */ mtc1 $zero, $f2 /* E2E704 802BBDD4 46000521 */ cvt.d.s $f20, $f0 /* E2E708 802BBDD8 4622A502 */ mul.d $f20, $f20, $f2 -/* E2E70C 802BBDDC 00000000 */ nop +/* E2E70C 802BBDDC 00000000 */ nop /* E2E710 802BBDE0 4600B306 */ mov.s $f12, $f22 /* E2E714 802BBDE4 0C00A85B */ jal sin_rad /* E2E718 802BBDE8 4620A520 */ cvt.s.d $f20, $f20 @@ -36,7 +36,7 @@ glabel func_802BBD78_E2E6A8 /* E2E724 802BBDF4 44801000 */ mtc1 $zero, $f2 /* E2E728 802BBDF8 460005A1 */ cvt.d.s $f22, $f0 /* E2E72C 802BBDFC 4622B582 */ mul.d $f22, $f22, $f2 -/* E2E730 802BBE00 00000000 */ nop +/* E2E730 802BBE00 00000000 */ nop /* E2E734 802BBE04 C60C0064 */ lwc1 $f12, 0x64($s0) /* E2E738 802BBE08 3C01802C */ lui $at, %hi(D_802BCE10) /* E2E73C 802BBE0C D420CE10 */ ldc1 $f0, %lo(D_802BCE10)($at) @@ -52,7 +52,7 @@ glabel func_802BBD78_E2E6A8 /* E2E764 802BBE34 46141080 */ add.s $f2, $f2, $f20 /* E2E768 802BBE38 3C014278 */ lui $at, 0x4278 /* E2E76C 802BBE3C 44810000 */ mtc1 $at, $f0 -/* E2E770 802BBE40 00000000 */ nop +/* E2E770 802BBE40 00000000 */ nop /* E2E774 802BBE44 46002100 */ add.s $f4, $f4, $f0 /* E2E778 802BBE48 24020002 */ addiu $v0, $zero, 2 /* E2E77C 802BBE4C 46163180 */ add.s $f6, $f6, $f22 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BBE8C_E2E7BC.s b/asm/nonmatchings/code_E2E5F0/func_802BBE8C_E2E7BC.s index 8ce850c7fd..2646f6e18e 100644 --- a/asm/nonmatchings/code_E2E5F0/func_802BBE8C_E2E7BC.s +++ b/asm/nonmatchings/code_E2E5F0/func_802BBE8C_E2E7BC.s @@ -14,18 +14,18 @@ glabel func_802BBE8C_E2E7BC /* E2E7E0 802BBEB0 8E020000 */ lw $v0, ($s0) /* E2E7E4 802BBEB4 28420003 */ slti $v0, $v0, 3 /* E2E7E8 802BBEB8 1040004D */ beqz $v0, .L802BBFF0 -/* E2E7EC 802BBEBC 00000000 */ nop +/* E2E7EC 802BBEBC 00000000 */ nop /* E2E7F0 802BBEC0 0C00A6C9 */ jal clamp_angle /* E2E7F4 802BBEC4 C62C0064 */ lwc1 $f12, 0x64($s1) /* E2E7F8 802BBEC8 3C0140C9 */ lui $at, 0x40c9 /* E2E7FC 802BBECC 34210FD0 */ ori $at, $at, 0xfd0 /* E2E800 802BBED0 44811000 */ mtc1 $at, $f2 -/* E2E804 802BBED4 00000000 */ nop +/* E2E804 802BBED4 00000000 */ nop /* E2E808 802BBED8 46020502 */ mul.s $f20, $f0, $f2 -/* E2E80C 802BBEDC 00000000 */ nop +/* E2E80C 802BBEDC 00000000 */ nop /* E2E810 802BBEE0 3C0143B4 */ lui $at, 0x43b4 /* E2E814 802BBEE4 44810000 */ mtc1 $at, $f0 -/* E2E818 802BBEE8 00000000 */ nop +/* E2E818 802BBEE8 00000000 */ nop /* E2E81C 802BBEEC 4600A503 */ div.s $f20, $f20, $f0 /* E2E820 802BBEF0 0C00A874 */ jal cos_rad /* E2E824 802BBEF4 4600A306 */ mov.s $f12, $f20 @@ -34,7 +34,7 @@ glabel func_802BBE8C_E2E7BC /* E2E830 802BBF00 44801000 */ mtc1 $zero, $f2 /* E2E834 802BBF04 46000021 */ cvt.d.s $f0, $f0 /* E2E838 802BBF08 46220002 */ mul.d $f0, $f0, $f2 -/* E2E83C 802BBF0C 00000000 */ nop +/* E2E83C 802BBF0C 00000000 */ nop /* E2E840 802BBF10 4600A306 */ mov.s $f12, $f20 /* E2E844 802BBF14 0C00A85B */ jal sin_rad /* E2E848 802BBF18 46200520 */ cvt.s.d $f20, $f0 @@ -43,7 +43,7 @@ glabel func_802BBE8C_E2E7BC /* E2E854 802BBF24 44801000 */ mtc1 $zero, $f2 /* E2E858 802BBF28 46000021 */ cvt.d.s $f0, $f0 /* E2E85C 802BBF2C 46220002 */ mul.d $f0, $f0, $f2 -/* E2E860 802BBF30 00000000 */ nop +/* E2E860 802BBF30 00000000 */ nop /* E2E864 802BBF34 24040020 */ addiu $a0, $zero, 0x20 /* E2E868 802BBF38 0C00A67F */ jal rand_int /* E2E86C 802BBF3C 462005A0 */ cvt.s.d $f22, $f0 @@ -71,7 +71,7 @@ glabel func_802BBE8C_E2E7BC /* E2E8C4 802BBF94 00451023 */ subu $v0, $v0, $a1 /* E2E8C8 802BBF98 00021040 */ sll $v0, $v0, 1 /* E2E8CC 802BBF9C 44820000 */ mtc1 $v0, $f0 -/* E2E8D0 802BBFA0 00000000 */ nop +/* E2E8D0 802BBFA0 00000000 */ nop /* E2E8D4 802BBFA4 46800020 */ cvt.s.w $f0, $f0 /* E2E8D8 802BBFA8 46003180 */ add.s $f6, $f6, $f0 /* E2E8DC 802BBFAC C6200048 */ lwc1 $f0, 0x48($s1) diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC050_E2E980.s b/asm/nonmatchings/code_E2E5F0/func_802BC050_E2E980.s index 9e85d685e7..997f223740 100644 --- a/asm/nonmatchings/code_E2E5F0/func_802BC050_E2E980.s +++ b/asm/nonmatchings/code_E2E5F0/func_802BC050_E2E980.s @@ -11,7 +11,7 @@ glabel func_802BC050_E2E980 /* E2E998 802BC068 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) /* E2E99C 802BC06C 30420001 */ andi $v0, $v0, 1 /* E2E9A0 802BC070 1040000D */ beqz $v0, .L802BC0A8 -/* E2E9A4 802BC074 00000000 */ nop +/* E2E9A4 802BC074 00000000 */ nop /* E2E9A8 802BC078 8C620004 */ lw $v0, 4($v1) /* E2E9AC 802BC07C 34420004 */ ori $v0, $v0, 4 /* E2E9B0 802BC080 0C03BCC0 */ jal func_800EF300 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC0B8_E2E9E8.s b/asm/nonmatchings/code_E2E5F0/func_802BC0B8_E2E9E8.s index e52ae9d060..6b6ed62aa7 100644 --- a/asm/nonmatchings/code_E2E5F0/func_802BC0B8_E2E9E8.s +++ b/asm/nonmatchings/code_E2E5F0/func_802BC0B8_E2E9E8.s @@ -8,11 +8,11 @@ glabel func_802BC0B8_E2E9E8 /* E2E9F4 802BC0C4 3C050000 */ lui $a1, 0 /* E2E9F8 802BC0C8 24A50060 */ addiu $a1, $a1, 0x60 /* E2E9FC 802BC0CC 0C048052 */ jal play_model_animation -/* E2EA00 802BC0D0 00000000 */ nop +/* E2EA00 802BC0D0 00000000 */ nop /* E2EA04 802BC0D4 0C03805E */ jal disable_player_input -/* E2EA08 802BC0D8 00000000 */ nop +/* E2EA08 802BC0D8 00000000 */ nop /* E2EA0C 802BC0DC 0C038039 */ jal disable_player_shadow -/* E2EA10 802BC0E0 00000000 */ nop +/* E2EA10 802BC0E0 00000000 */ nop /* E2EA14 802BC0E4 8FBF0010 */ lw $ra, 0x10($sp) /* E2EA18 802BC0E8 03E00008 */ jr $ra /* E2EA1C 802BC0EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC0F0_E2EA20.s b/asm/nonmatchings/code_E2E5F0/func_802BC0F0_E2EA20.s index 1b126e24bd..ed7094623b 100644 --- a/asm/nonmatchings/code_E2E5F0/func_802BC0F0_E2EA20.s +++ b/asm/nonmatchings/code_E2E5F0/func_802BC0F0_E2EA20.s @@ -21,7 +21,7 @@ glabel func_802BC0F0_E2EA20 /* E2EA60 802BC130 44801000 */ mtc1 $zero, $f2 /* E2EA64 802BC134 46000021 */ cvt.d.s $f0, $f0 /* E2EA68 802BC138 46220002 */ mul.d $f0, $f0, $f2 -/* E2EA6C 802BC13C 00000000 */ nop +/* E2EA6C 802BC13C 00000000 */ nop /* E2EA70 802BC140 46200005 */ abs.d $f0, $f0 /* E2EA74 802BC144 46200020 */ cvt.s.d $f0, $f0 /* E2EA78 802BC148 E6400018 */ swc1 $f0, 0x18($s2) diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC1D0_E2EB00.s b/asm/nonmatchings/code_E2E5F0/func_802BC1D0_E2EB00.s index 00c7b774c1..d51ee1b28a 100644 --- a/asm/nonmatchings/code_E2E5F0/func_802BC1D0_E2EB00.s +++ b/asm/nonmatchings/code_E2E5F0/func_802BC1D0_E2EB00.s @@ -18,7 +18,7 @@ glabel func_802BC1D0_E2EB00 /* E2EB34 802BC204 4600120D */ trunc.w.s $f8, $f2 /* E2EB38 802BC208 44074000 */ mfc1 $a3, $f8 /* E2EB3C 802BC20C 0C044631 */ jal create_entity -/* E2EB40 802BC210 00000000 */ nop +/* E2EB40 802BC210 00000000 */ nop /* E2EB44 802BC214 8FBF0018 */ lw $ra, 0x18($sp) /* E2EB48 802BC218 03E00008 */ jr $ra /* E2EB4C 802BC21C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC250_E2EB80.s b/asm/nonmatchings/code_E2E5F0/func_802BC250_E2EB80.s index ee56fa8df9..ed895d3202 100644 --- a/asm/nonmatchings/code_E2E5F0/func_802BC250_E2EB80.s +++ b/asm/nonmatchings/code_E2E5F0/func_802BC250_E2EB80.s @@ -7,7 +7,7 @@ glabel func_802BC250_E2EB80 /* E2EB88 802BC258 24A5CC68 */ addiu $a1, $a1, %lo(D_802BCC68) /* E2EB8C 802BC25C AFBF0010 */ sw $ra, 0x10($sp) /* E2EB90 802BC260 0C0AF074 */ jal func_802BC1D0_E2EB00 -/* E2EB94 802BC264 00000000 */ nop +/* E2EB94 802BC264 00000000 */ nop /* E2EB98 802BC268 8FBF0010 */ lw $ra, 0x10($sp) /* E2EB9C 802BC26C 03E00008 */ jr $ra /* E2EBA0 802BC270 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC2B4_E2EBE4.s b/asm/nonmatchings/code_E2E5F0/func_802BC2B4_E2EBE4.s index ee9dd75511..11d4433bec 100644 --- a/asm/nonmatchings/code_E2E5F0/func_802BC2B4_E2EBE4.s +++ b/asm/nonmatchings/code_E2E5F0/func_802BC2B4_E2EBE4.s @@ -7,7 +7,7 @@ glabel func_802BC2B4_E2EBE4 /* E2EBEC 802BC2BC 24A5CCB0 */ addiu $a1, $a1, %lo(D_802BCCB0) /* E2EBF0 802BC2C0 AFBF0010 */ sw $ra, 0x10($sp) /* E2EBF4 802BC2C4 0C0AF074 */ jal func_802BC1D0_E2EB00 -/* E2EBF8 802BC2C8 00000000 */ nop +/* E2EBF8 802BC2C8 00000000 */ nop /* E2EBFC 802BC2CC 3C027FFF */ lui $v0, 0x7fff /* E2EC00 802BC2D0 3442FFFF */ ori $v0, $v0, 0xffff /* E2EC04 802BC2D4 3C040008 */ lui $a0, 8 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC308_E2EC38.s b/asm/nonmatchings/code_E2E5F0/func_802BC308_E2EC38.s index ab2db49af6..735eb17021 100644 --- a/asm/nonmatchings/code_E2E5F0/func_802BC308_E2EC38.s +++ b/asm/nonmatchings/code_E2E5F0/func_802BC308_E2EC38.s @@ -7,7 +7,7 @@ glabel func_802BC308_E2EC38 /* E2EC40 802BC310 24A5CCD4 */ addiu $a1, $a1, %lo(D_802BCCD4) /* E2EC44 802BC314 AFBF0010 */ sw $ra, 0x10($sp) /* E2EC48 802BC318 0C0AF074 */ jal func_802BC1D0_E2EB00 -/* E2EC4C 802BC31C 00000000 */ nop +/* E2EC4C 802BC31C 00000000 */ nop /* E2EC50 802BC320 8FBF0010 */ lw $ra, 0x10($sp) /* E2EC54 802BC324 03E00008 */ jr $ra /* E2EC58 802BC328 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC32C_E2EC5C.s b/asm/nonmatchings/code_E2E5F0/func_802BC32C_E2EC5C.s index cbb8ae7551..1e329918d8 100644 --- a/asm/nonmatchings/code_E2E5F0/func_802BC32C_E2EC5C.s +++ b/asm/nonmatchings/code_E2E5F0/func_802BC32C_E2EC5C.s @@ -7,9 +7,9 @@ glabel func_802BC32C_E2EC5C /* E2EC64 802BC334 24A5CCF8 */ addiu $a1, $a1, %lo(D_802BCCF8) /* E2EC68 802BC338 AFBF0010 */ sw $ra, 0x10($sp) /* E2EC6C 802BC33C 0C0AF074 */ jal func_802BC1D0_E2EB00 -/* E2EC70 802BC340 00000000 */ nop +/* E2EC70 802BC340 00000000 */ nop /* E2EC74 802BC344 0C03BCCA */ jal enable_partner_ai -/* E2EC78 802BC348 00000000 */ nop +/* E2EC78 802BC348 00000000 */ nop /* E2EC7C 802BC34C 8FBF0010 */ lw $ra, 0x10($sp) /* E2EC80 802BC350 03E00008 */ jr $ra /* E2EC84 802BC354 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC358_E2EC88.s b/asm/nonmatchings/code_E2E5F0/func_802BC358_E2EC88.s index a35436f148..cc1aba0767 100644 --- a/asm/nonmatchings/code_E2E5F0/func_802BC358_E2EC88.s +++ b/asm/nonmatchings/code_E2E5F0/func_802BC358_E2EC88.s @@ -7,7 +7,7 @@ glabel func_802BC358_E2EC88 /* E2EC90 802BC360 24A5CD1C */ addiu $a1, $a1, %lo(D_802BCD1C) /* E2EC94 802BC364 AFBF0010 */ sw $ra, 0x10($sp) /* E2EC98 802BC368 0C0AF074 */ jal func_802BC1D0_E2EB00 -/* E2EC9C 802BC36C 00000000 */ nop +/* E2EC9C 802BC36C 00000000 */ nop /* E2ECA0 802BC370 8FBF0010 */ lw $ra, 0x10($sp) /* E2ECA4 802BC374 03E00008 */ jr $ra /* E2ECA8 802BC378 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC37C_E2ECAC.s b/asm/nonmatchings/code_E2E5F0/func_802BC37C_E2ECAC.s index 000ff70d86..ceb7ea49f4 100644 --- a/asm/nonmatchings/code_E2E5F0/func_802BC37C_E2ECAC.s +++ b/asm/nonmatchings/code_E2E5F0/func_802BC37C_E2ECAC.s @@ -7,7 +7,7 @@ glabel func_802BC37C_E2ECAC /* E2ECB4 802BC384 24A5CD40 */ addiu $a1, $a1, %lo(D_802BCD40) /* E2ECB8 802BC388 AFBF0010 */ sw $ra, 0x10($sp) /* E2ECBC 802BC38C 0C0AF074 */ jal func_802BC1D0_E2EB00 -/* E2ECC0 802BC390 00000000 */ nop +/* E2ECC0 802BC390 00000000 */ nop /* E2ECC4 802BC394 8FBF0010 */ lw $ra, 0x10($sp) /* E2ECC8 802BC398 03E00008 */ jr $ra /* E2ECCC 802BC39C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC3A0_E2ECD0.s b/asm/nonmatchings/code_E2E5F0/func_802BC3A0_E2ECD0.s index 5c7250f3bb..3feae21981 100644 --- a/asm/nonmatchings/code_E2E5F0/func_802BC3A0_E2ECD0.s +++ b/asm/nonmatchings/code_E2E5F0/func_802BC3A0_E2ECD0.s @@ -5,9 +5,9 @@ glabel func_802BC3A0_E2ECD0 /* E2ECD0 802BC3A0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* E2ECD4 802BC3A4 AFBF0010 */ sw $ra, 0x10($sp) /* E2ECD8 802BC3A8 0C038069 */ jal enable_player_input -/* E2ECDC 802BC3AC 00000000 */ nop +/* E2ECDC 802BC3AC 00000000 */ nop /* E2ECE0 802BC3B0 0C03802C */ jal enable_player_shadow -/* E2ECE4 802BC3B4 00000000 */ nop +/* E2ECE4 802BC3B4 00000000 */ nop /* E2ECE8 802BC3B8 0C039769 */ jal set_action_state /* E2ECEC 802BC3BC 2404001E */ addiu $a0, $zero, 0x1e /* E2ECF0 802BC3C0 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC3E4_E2ED14.s b/asm/nonmatchings/code_E2E5F0/func_802BC3E4_E2ED14.s index 0a1c7e5f55..279adb62a3 100644 --- a/asm/nonmatchings/code_E2E5F0/func_802BC3E4_E2ED14.s +++ b/asm/nonmatchings/code_E2E5F0/func_802BC3E4_E2ED14.s @@ -12,16 +12,16 @@ glabel func_802BC3E4_E2ED14 /* E2ED30 802BC400 44810000 */ mtc1 $at, $f0 /* E2ED34 802BC404 C60C0010 */ lwc1 $f12, 0x10($s0) /* E2ED38 802BC408 46006302 */ mul.s $f12, $f12, $f0 -/* E2ED3C 802BC40C 00000000 */ nop +/* E2ED3C 802BC40C 00000000 */ nop /* E2ED40 802BC410 3C0143B4 */ lui $at, 0x43b4 /* E2ED44 802BC414 4481A000 */ mtc1 $at, $f20 /* E2ED48 802BC418 0C00A85B */ jal sin_rad /* E2ED4C 802BC41C 46146303 */ div.s $f12, $f12, $f20 /* E2ED50 802BC420 3C014040 */ lui $at, 0x4040 /* E2ED54 802BC424 44811000 */ mtc1 $at, $f2 -/* E2ED58 802BC428 00000000 */ nop +/* E2ED58 802BC428 00000000 */ nop /* E2ED5C 802BC42C 46020002 */ mul.s $f0, $f0, $f2 -/* E2ED60 802BC430 00000000 */ nop +/* E2ED60 802BC430 00000000 */ nop /* E2ED64 802BC434 C602000C */ lwc1 $f2, 0xc($s0) /* E2ED68 802BC438 46001080 */ add.s $f2, $f2, $f0 /* E2ED6C 802BC43C 3C0141C0 */ lui $at, 0x41c0 @@ -31,7 +31,7 @@ glabel func_802BC3E4_E2ED14 /* E2ED7C 802BC44C C6020010 */ lwc1 $f2, 0x10($s0) /* E2ED80 802BC450 46001000 */ add.s $f0, $f2, $f0 /* E2ED84 802BC454 4600A03C */ c.lt.s $f20, $f0 -/* E2ED88 802BC458 00000000 */ nop +/* E2ED88 802BC458 00000000 */ nop /* E2ED8C 802BC45C 45000003 */ bc1f .L802BC46C /* E2ED90 802BC460 E6000010 */ swc1 $f0, 0x10($s0) /* E2ED94 802BC464 46140001 */ sub.s $f0, $f0, $f20 @@ -40,11 +40,11 @@ glabel func_802BC3E4_E2ED14 /* E2ED9C 802BC46C C6020010 */ lwc1 $f2, 0x10($s0) /* E2EDA0 802BC470 3C0142C0 */ lui $at, 0x42c0 /* E2EDA4 802BC474 44810000 */ mtc1 $at, $f0 -/* E2EDA8 802BC478 00000000 */ nop +/* E2EDA8 802BC478 00000000 */ nop /* E2EDAC 802BC47C 46001032 */ c.eq.s $f2, $f0 -/* E2EDB0 802BC480 00000000 */ nop +/* E2EDB0 802BC480 00000000 */ nop /* E2EDB4 802BC484 45000003 */ bc1f .L802BC494 -/* E2EDB8 802BC488 00000000 */ nop +/* E2EDB8 802BC488 00000000 */ nop /* E2EDBC 802BC48C 0C05272D */ jal play_sound /* E2EDC0 802BC490 24040392 */ addiu $a0, $zero, 0x392 .L802BC494: @@ -53,5 +53,5 @@ glabel func_802BC3E4_E2ED14 /* E2EDCC 802BC49C D7B40018 */ ldc1 $f20, 0x18($sp) /* E2EDD0 802BC4A0 03E00008 */ jr $ra /* E2EDD4 802BC4A4 27BD0020 */ addiu $sp, $sp, 0x20 -/* E2EDD8 802BC4A8 00000000 */ nop -/* E2EDDC 802BC4AC 00000000 */ nop +/* E2EDD8 802BC4A8 00000000 */ nop +/* E2EDDC 802BC4AC 00000000 */ nop diff --git a/asm/nonmatchings/code_E2EDE0/func_802BC4B0_E2EDE0.s b/asm/nonmatchings/code_E2EDE0/func_802BC4B0_E2EDE0.s index b8f1bae3c9..77c8b7b6b1 100644 --- a/asm/nonmatchings/code_E2EDE0/func_802BC4B0_E2EDE0.s +++ b/asm/nonmatchings/code_E2EDE0/func_802BC4B0_E2EDE0.s @@ -27,7 +27,7 @@ glabel func_802BC4B0_E2EDE0 /* E2EE38 802BC508 C6000004 */ lwc1 $f0, 4($s0) /* E2EE3C 802BC50C 3C0142B4 */ lui $at, 0x42b4 /* E2EE40 802BC510 44816000 */ mtc1 $at, $f12 -/* E2EE44 802BC514 00000000 */ nop +/* E2EE44 802BC514 00000000 */ nop /* E2EE48 802BC518 460C0301 */ sub.s $f12, $f0, $f12 /* E2EE4C 802BC51C 0C00A6C9 */ jal clamp_angle /* E2EE50 802BC520 36941630 */ ori $s4, $s4, 0x1630 diff --git a/asm/nonmatchings/code_E2EDE0/func_802BC628_E2EF58.s b/asm/nonmatchings/code_E2EDE0/func_802BC628_E2EF58.s index 7d9c55c77a..299a00e469 100644 --- a/asm/nonmatchings/code_E2EDE0/func_802BC628_E2EF58.s +++ b/asm/nonmatchings/code_E2EDE0/func_802BC628_E2EF58.s @@ -3,4 +3,4 @@ glabel func_802BC628_E2EF58 /* E2EF58 802BC628 03E00008 */ jr $ra -/* E2EF5C 802BC62C 00000000 */ nop +/* E2EF5C 802BC62C 00000000 */ nop diff --git a/asm/nonmatchings/code_E2EDE0/func_802BC658_E2EF88.s b/asm/nonmatchings/code_E2EDE0/func_802BC658_E2EF88.s index 36d8828fe7..95c670511a 100644 --- a/asm/nonmatchings/code_E2EDE0/func_802BC658_E2EF88.s +++ b/asm/nonmatchings/code_E2EDE0/func_802BC658_E2EF88.s @@ -11,13 +11,13 @@ glabel func_802BC658_E2EF88 /* E2EFA0 802BC670 90820006 */ lbu $v0, 6($a0) /* E2EFA4 802BC674 30420008 */ andi $v0, $v0, 8 /* E2EFA8 802BC678 10400003 */ beqz $v0, .L802BC688 -/* E2EFAC 802BC67C 00000000 */ nop +/* E2EFAC 802BC67C 00000000 */ nop /* E2EFB0 802BC680 0C04419E */ jal func_80110678 -/* E2EFB4 802BC684 00000000 */ nop +/* E2EFB4 802BC684 00000000 */ nop .L802BC688: /* E2EFB8 802BC688 8FBF0010 */ lw $ra, 0x10($sp) /* E2EFBC 802BC68C 03E00008 */ jr $ra /* E2EFC0 802BC690 27BD0018 */ addiu $sp, $sp, 0x18 -/* E2EFC4 802BC694 00000000 */ nop -/* E2EFC8 802BC698 00000000 */ nop -/* E2EFCC 802BC69C 00000000 */ nop +/* E2EFC4 802BC694 00000000 */ nop +/* E2EFC8 802BC698 00000000 */ nop +/* E2EFCC 802BC69C 00000000 */ nop diff --git a/asm/nonmatchings/code_E2F750/func_802BC570_E30EC0.s b/asm/nonmatchings/code_E2F750/func_802BC570_E30EC0.s index 77309315bb..0339b96154 100644 --- a/asm/nonmatchings/code_E2F750/func_802BC570_E30EC0.s +++ b/asm/nonmatchings/code_E2F750/func_802BC570_E30EC0.s @@ -16,11 +16,12 @@ glabel func_802BC570_E30EC0 /* E30EEC 802BC59C 2C620007 */ sltiu $v0, $v1, 7 /* E30EF0 802BC5A0 104000F5 */ beqz $v0, .L802BC978 /* E30EF4 802BC5A4 00031080 */ sll $v0, $v1, 2 -/* E30EF8 802BC5A8 3C01802C */ lui $at, %hi(D_802BCBA0) +/* E30EF8 802BC5A8 3C01802C */ lui $at, %hi(jtbl_802BCBA0_E314F0) /* E30EFC 802BC5AC 00220821 */ addu $at, $at, $v0 -/* E30F00 802BC5B0 8C22CBA0 */ lw $v0, %lo(D_802BCBA0)($at) +/* E30F00 802BC5B0 8C22CBA0 */ lw $v0, %lo(jtbl_802BCBA0_E314F0)($at) /* E30F04 802BC5B4 00400008 */ jr $v0 /* E30F08 802BC5B8 00000000 */ nop +glabel L802BC5BC_E30F0C /* E30F0C 802BC5BC 92020000 */ lbu $v0, ($s0) /* E30F10 802BC5C0 3C0142B4 */ lui $at, 0x42b4 /* E30F14 802BC5C4 44810000 */ mtc1 $at, $f0 @@ -37,6 +38,7 @@ glabel func_802BC570_E30EC0 /* E30F40 802BC5F0 24042085 */ addiu $a0, $zero, 0x2085 /* E30F44 802BC5F4 0C05272D */ jal play_sound /* E30F48 802BC5F8 A2020004 */ sb $v0, 4($s0) +glabel L802BC5FC_E30F4C /* E30F4C 802BC5FC C60C0014 */ lwc1 $f12, 0x14($s0) /* E30F50 802BC600 3C0140C9 */ lui $at, 0x40c9 /* E30F54 802BC604 34210FD0 */ ori $at, $at, 0xfd0 @@ -94,6 +96,7 @@ glabel func_802BC570_E30EC0 /* E31020 802BC6D0 E6000018 */ swc1 $f0, 0x18($s0) /* E31024 802BC6D4 080AF25E */ j .L802BC978 /* E31028 802BC6D8 E602001C */ swc1 $f2, 0x1c($s0) +glabel L802BC6DC_E3102C /* E3102C 802BC6DC C60C001C */ lwc1 $f12, 0x1c($s0) /* E31030 802BC6E0 3C0140C9 */ lui $at, 0x40c9 /* E31034 802BC6E4 34210FD0 */ ori $at, $at, 0xfd0 @@ -157,6 +160,7 @@ glabel func_802BC570_E30EC0 /* E31114 802BC7C4 E6000018 */ swc1 $f0, 0x18($s0) /* E31118 802BC7C8 080AF256 */ j .L802BC958 /* E3111C 802BC7CC 00000000 */ nop +glabel L802BC7D0_E31120 /* E31120 802BC7D0 C6000020 */ lwc1 $f0, 0x20($s0) /* E31124 802BC7D4 3C01802C */ lui $at, %hi(D_802BCBD0) /* E31128 802BC7D8 D422CBD0 */ ldc1 $f2, %lo(D_802BCBD0)($at) @@ -238,6 +242,7 @@ glabel func_802BC570_E30EC0 /* E3124C 802BC8FC A2020000 */ sb $v0, ($s0) /* E31250 802BC900 080AF25E */ j .L802BC978 /* E31254 802BC904 E6360068 */ swc1 $f22, 0x68($s1) +glabel L802BC908_E31258 /* E31258 802BC908 92020001 */ lbu $v0, 1($s0) /* E3125C 802BC90C 2442FFFF */ addiu $v0, $v0, -1 /* E31260 802BC910 A2020001 */ sb $v0, 1($s0) @@ -246,6 +251,7 @@ glabel func_802BC570_E30EC0 /* E3126C 802BC91C 00000000 */ nop /* E31270 802BC920 080AF25E */ j .L802BC978 /* E31274 802BC924 00000000 */ nop +glabel L802BC928_E31278 /* E31278 802BC928 C620004C */ lwc1 $f0, 0x4c($s1) /* E3127C 802BC92C 3C014100 */ lui $at, 0x4100 /* E31280 802BC930 44811000 */ mtc1 $at, $f2 @@ -263,6 +269,7 @@ glabel func_802BC570_E30EC0 /* E312AC 802BC95C 24420001 */ addiu $v0, $v0, 1 /* E312B0 802BC960 080AF25E */ j .L802BC978 /* E312B4 802BC964 A2020000 */ sb $v0, ($s0) +glabel L802BC968_E312B8 /* E312B8 802BC968 0C043F5A */ jal func_8010FD68 /* E312BC 802BC96C 0220202D */ daddu $a0, $s1, $zero /* E312C0 802BC970 0C038050 */ jal enable_player_static_collisions diff --git a/asm/nonmatchings/code_EA0900/func_80240124_EA0A24.s b/asm/nonmatchings/code_EA0900/func_80240124_EA0A24.s index 3d2b81981e..cb7e0b4dd9 100644 --- a/asm/nonmatchings/code_EA0900/func_80240124_EA0A24.s +++ b/asm/nonmatchings/code_EA0900/func_80240124_EA0A24.s @@ -14,7 +14,7 @@ glabel func_80240124_EA0A24 .L80240148: /* EA0A48 80240148 8E020070 */ lw $v0, 0x70($s0) /* EA0A4C 8024014C 1440000E */ bnez $v0, .L80240188 -/* EA0A50 80240150 00000000 */ nop +/* EA0A50 80240150 00000000 */ nop /* EA0A54 80240154 8E0300A8 */ lw $v1, 0xa8($s0) /* EA0A58 80240158 8E020088 */ lw $v0, 0x88($s0) /* EA0A5C 8024015C 00621821 */ addu $v1, $v1, $v0 @@ -33,7 +33,7 @@ glabel func_80240124_EA0A24 .L80240188: /* EA0A88 80240188 8E020074 */ lw $v0, 0x74($s0) /* EA0A8C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* EA0A90 80240190 00000000 */ nop +/* EA0A90 80240190 00000000 */ nop /* EA0A94 80240194 8E0300AC */ lw $v1, 0xac($s0) /* EA0A98 80240198 8E02008C */ lw $v0, 0x8c($s0) /* EA0A9C 8024019C 00621821 */ addu $v1, $v1, $v0 @@ -52,7 +52,7 @@ glabel func_80240124_EA0A24 .L802401C8: /* EA0AC8 802401C8 8E020078 */ lw $v0, 0x78($s0) /* EA0ACC 802401CC 1440000E */ bnez $v0, .L80240208 -/* EA0AD0 802401D0 00000000 */ nop +/* EA0AD0 802401D0 00000000 */ nop /* EA0AD4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) /* EA0AD8 802401D8 8E020090 */ lw $v0, 0x90($s0) /* EA0ADC 802401DC 00621821 */ addu $v1, $v1, $v0 @@ -71,7 +71,7 @@ glabel func_80240124_EA0A24 .L80240208: /* EA0B08 80240208 8E02007C */ lw $v0, 0x7c($s0) /* EA0B0C 8024020C 1440000E */ bnez $v0, .L80240248 -/* EA0B10 80240210 00000000 */ nop +/* EA0B10 80240210 00000000 */ nop /* EA0B14 80240214 8E0300B4 */ lw $v1, 0xb4($s0) /* EA0B18 80240218 8E020094 */ lw $v0, 0x94($s0) /* EA0B1C 8024021C 00621821 */ addu $v1, $v1, $v0 @@ -141,4 +141,4 @@ glabel func_80240124_EA0A24 /* EA0C00 80240300 0000102D */ daddu $v0, $zero, $zero /* EA0C04 80240304 03E00008 */ jr $ra /* EA0C08 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* EA0C0C 8024030C 00000000 */ nop +/* EA0C0C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/code_EA0C10/func_802403EC_EA0CEC.s b/asm/nonmatchings/code_EA0C10/func_802403EC_EA0CEC.s index be17d45685..b9390590a6 100644 --- a/asm/nonmatchings/code_EA0C10/func_802403EC_EA0CEC.s +++ b/asm/nonmatchings/code_EA0C10/func_802403EC_EA0CEC.s @@ -37,7 +37,7 @@ glabel func_802403EC_EA0CEC /* EA0D6C 8024046C 3C01C1A0 */ lui $at, 0xc1a0 /* EA0D70 80240470 44812000 */ mtc1 $at, $f4 /* EA0D74 80240474 44873000 */ mtc1 $a3, $f6 -/* EA0D78 80240478 00000000 */ nop +/* EA0D78 80240478 00000000 */ nop /* EA0D7C 8024047C 468031A0 */ cvt.s.w $f6, $f6 /* EA0D80 80240480 E7A00010 */ swc1 $f0, 0x10($sp) /* EA0D84 80240484 E7A20014 */ swc1 $f2, 0x14($sp) diff --git a/asm/nonmatchings/code_EA0C10/func_80240518_EA0E18.s b/asm/nonmatchings/code_EA0C10/func_80240518_EA0E18.s index 451fc11fad..9985670620 100644 --- a/asm/nonmatchings/code_EA0C10/func_80240518_EA0E18.s +++ b/asm/nonmatchings/code_EA0C10/func_80240518_EA0E18.s @@ -42,7 +42,7 @@ glabel func_80240518_EA0E18 /* EA0EAC 802405AC C6620074 */ lwc1 $f2, 0x74($s3) /* EA0EB0 802405B0 468010A0 */ cvt.s.w $f2, $f2 /* EA0EB4 802405B4 4600103C */ c.lt.s $f2, $f0 -/* EA0EB8 802405B8 00000000 */ nop +/* EA0EB8 802405B8 00000000 */ nop /* EA0EBC 802405BC 45030001 */ bc1tl .L802405C4 /* EA0EC0 802405C0 0000882D */ daddu $s1, $zero, $zero .L802405C4: @@ -51,16 +51,16 @@ glabel func_80240518_EA0E18 /* EA0ECC 802405CC 3C014387 */ lui $at, 0x4387 /* EA0ED0 802405D0 4481A000 */ mtc1 $at, $f20 /* EA0ED4 802405D4 0C00ABC6 */ jal func_8002AF18 -/* EA0ED8 802405D8 00000000 */ nop +/* EA0ED8 802405D8 00000000 */ nop /* EA0EDC 802405DC 0C00AB85 */ jal func_8002AE14 /* EA0EE0 802405E0 46000306 */ mov.s $f12, $f0 /* EA0EE4 802405E4 3C018024 */ lui $at, %hi(D_80246480) /* EA0EE8 802405E8 D4226480 */ ldc1 $f2, %lo(D_80246480)($at) /* EA0EEC 802405EC 46000021 */ cvt.d.s $f0, $f0 /* EA0EF0 802405F0 4622003C */ c.lt.d $f0, $f2 -/* EA0EF4 802405F4 00000000 */ nop +/* EA0EF4 802405F4 00000000 */ nop /* EA0EF8 802405F8 45000003 */ bc1f .L80240608 -/* EA0EFC 802405FC 00000000 */ nop +/* EA0EFC 802405FC 00000000 */ nop /* EA0F00 80240600 3C0142B4 */ lui $at, 0x42b4 /* EA0F04 80240604 4481A000 */ mtc1 $at, $f20 .L80240608: @@ -77,7 +77,7 @@ glabel func_80240518_EA0E18 /* EA0F30 80240630 468010A0 */ cvt.s.w $f2, $f2 /* EA0F34 80240634 46000005 */ abs.s $f0, $f0 /* EA0F38 80240638 4600103C */ c.lt.s $f2, $f0 -/* EA0F3C 8024063C 00000000 */ nop +/* EA0F3C 8024063C 00000000 */ nop /* EA0F40 80240640 45030001 */ bc1tl .L80240648 /* EA0F44 80240644 0000882D */ daddu $s1, $zero, $zero .L80240648: @@ -87,13 +87,13 @@ glabel func_80240518_EA0E18 /* EA0F54 80240654 860200A8 */ lh $v0, 0xa8($s0) /* EA0F58 80240658 46020001 */ sub.s $f0, $f0, $f2 /* EA0F5C 8024065C 44821000 */ mtc1 $v0, $f2 -/* EA0F60 80240660 00000000 */ nop +/* EA0F60 80240660 00000000 */ nop /* EA0F64 80240664 468010A1 */ cvt.d.w $f2, $f2 /* EA0F68 80240668 46221080 */ add.d $f2, $f2, $f2 /* EA0F6C 8024066C 46000005 */ abs.s $f0, $f0 /* EA0F70 80240670 46000021 */ cvt.d.s $f0, $f0 /* EA0F74 80240674 4620103E */ c.le.d $f2, $f0 -/* EA0F78 80240678 00000000 */ nop +/* EA0F78 80240678 00000000 */ nop /* EA0F7C 8024067C 45030001 */ bc1tl .L80240684 /* EA0F80 80240680 0000882D */ daddu $s1, $zero, $zero .L80240684: diff --git a/asm/nonmatchings/code_EA0C10/func_802406CC_EA0FCC.s b/asm/nonmatchings/code_EA0C10/func_802406CC_EA0FCC.s index 1852060d78..fe24fc6258 100644 --- a/asm/nonmatchings/code_EA0C10/func_802406CC_EA0FCC.s +++ b/asm/nonmatchings/code_EA0C10/func_802406CC_EA0FCC.s @@ -30,7 +30,7 @@ glabel func_802406CC_EA0FCC /* EA1030 80240730 8E2200B0 */ lw $v0, 0xb0($s1) /* EA1034 80240734 30420004 */ andi $v0, $v0, 4 /* EA1038 80240738 10400015 */ beqz $v0, .L80240790 -/* EA103C 8024073C 00000000 */ nop +/* EA103C 8024073C 00000000 */ nop .L80240740: /* EA1040 80240740 AE800070 */ sw $zero, 0x70($s4) /* EA1044 80240744 8E420000 */ lw $v0, ($s2) @@ -57,9 +57,9 @@ glabel func_802406CC_EA0FCC /* EA1094 80240794 12600005 */ beqz $s3, .L802407AC /* EA1098 80240798 24020001 */ addiu $v0, $zero, 1 /* EA109C 8024079C 12620048 */ beq $s3, $v0, .L802408C0 -/* EA10A0 802407A0 00000000 */ nop +/* EA10A0 802407A0 00000000 */ nop /* EA10A4 802407A4 0809024D */ j .L80240934 -/* EA10A8 802407A8 00000000 */ nop +/* EA10A8 802407A8 00000000 */ nop .L802407AC: /* EA10AC 802407AC 86240008 */ lh $a0, 8($s1) /* EA10B0 802407B0 0C010ABD */ jal func_80042AF4 @@ -73,7 +73,7 @@ glabel func_802406CC_EA0FCC /* EA10D0 802407D0 8E03006C */ lw $v1, 0x6c($s0) /* EA10D4 802407D4 24020003 */ addiu $v0, $zero, 3 /* EA10D8 802407D8 14620056 */ bne $v1, $v0, .L80240934 -/* EA10DC 802407DC 00000000 */ nop +/* EA10DC 802407DC 00000000 */ nop /* EA10E0 802407E0 8E2500A8 */ lw $a1, 0xa8($s1) /* EA10E4 802407E4 10A00003 */ beqz $a1, .L802407F4 /* EA10E8 802407E8 0260202D */ daddu $a0, $s3, $zero @@ -110,7 +110,7 @@ glabel func_802406CC_EA0FCC /* EA1160 80240860 C7A20014 */ lwc1 $f2, 0x14($sp) /* EA1164 80240864 4600020D */ trunc.w.s $f8, $f0 /* EA1168 80240868 44024000 */ mfc1 $v0, $f8 -/* EA116C 8024086C 00000000 */ nop +/* EA116C 8024086C 00000000 */ nop /* EA1170 80240870 A6220012 */ sh $v0, 0x12($s1) /* EA1174 80240874 4600120D */ trunc.w.s $f8, $f2 /* EA1178 80240878 44024000 */ mfc1 $v0, $f8 @@ -165,7 +165,7 @@ glabel func_802406CC_EA0FCC .L80240934: /* EA1234 80240934 82220007 */ lb $v0, 7($s1) /* EA1238 80240938 10400007 */ beqz $v0, .L80240958 -/* EA123C 8024093C 00000000 */ nop +/* EA123C 8024093C 00000000 */ nop /* EA1240 80240940 3C0140E0 */ lui $at, 0x40e0 /* EA1244 80240944 44810000 */ mtc1 $at, $f0 /* EA1248 80240948 3C013F80 */ lui $at, 0x3f80 diff --git a/asm/nonmatchings/code_EA0C10/func_8024097C_EA127C.s b/asm/nonmatchings/code_EA0C10/func_8024097C_EA127C.s index 9dc9fbfc6e..76079c32af 100644 --- a/asm/nonmatchings/code_EA0C10/func_8024097C_EA127C.s +++ b/asm/nonmatchings/code_EA0C10/func_8024097C_EA127C.s @@ -57,7 +57,7 @@ glabel func_8024097C_EA127C /* EA134C 80240A4C 8E2200B0 */ lw $v0, 0xb0($s1) /* EA1350 80240A50 30420004 */ andi $v0, $v0, 4 /* EA1354 80240A54 10400020 */ beqz $v0, .L80240AD8 -/* EA1358 80240A58 00000000 */ nop +/* EA1358 80240A58 00000000 */ nop .L80240A5C: /* EA135C 80240A5C 2404F7FF */ addiu $a0, $zero, -0x801 /* EA1360 80240A60 AE600070 */ sw $zero, 0x70($s3) @@ -97,10 +97,10 @@ glabel func_8024097C_EA127C /* EA13D8 80240AD8 8E620070 */ lw $v0, 0x70($s3) /* EA13DC 80240ADC 2842001E */ slti $v0, $v0, 0x1e /* EA13E0 80240AE0 10400009 */ beqz $v0, .L80240B08 -/* EA13E4 80240AE4 00000000 */ nop +/* EA13E4 80240AE4 00000000 */ nop /* EA13E8 80240AE8 8E22006C */ lw $v0, 0x6c($s1) /* EA13EC 80240AEC 14400006 */ bnez $v0, .L80240B08 -/* EA13F0 80240AF0 00000000 */ nop +/* EA13F0 80240AF0 00000000 */ nop /* EA13F4 80240AF4 0C090146 */ jal func_80240518_EA0E18 /* EA13F8 80240AF8 0260202D */ daddu $a0, $s3, $zero /* EA13FC 80240AFC 10400002 */ beqz $v0, .L80240B08 @@ -111,78 +111,93 @@ glabel func_8024097C_EA127C /* EA140C 80240B0C 2C620064 */ sltiu $v0, $v1, 0x64 /* EA1410 80240B10 10400048 */ beqz $v0, .L80240C34 /* EA1414 80240B14 00031080 */ sll $v0, $v1, 2 -/* EA1418 80240B18 3C018024 */ lui $at, %hi(D_80246488) +/* EA1418 80240B18 3C018024 */ lui $at, %hi(jtbl_80246488_EA6D88) /* EA141C 80240B1C 00220821 */ addu $at, $at, $v0 -/* EA1420 80240B20 8C226488 */ lw $v0, %lo(D_80246488)($at) +/* EA1420 80240B20 8C226488 */ lw $v0, %lo(jtbl_80246488_EA6D88)($at) /* EA1424 80240B24 00400008 */ jr $v0 -/* EA1428 80240B28 00000000 */ nop +/* EA1428 80240B28 00000000 */ nop +glabel L80240B2C_EA142C /* EA142C 80240B2C 0260202D */ daddu $a0, $s3, $zero /* EA1430 80240B30 0280282D */ daddu $a1, $s4, $zero /* EA1434 80240B34 0C013670 */ jal func_8004D9C0 /* EA1438 80240B38 02A0302D */ daddu $a2, $s5, $zero +glabel L80240B3C_EA143C /* EA143C 80240B3C 0260202D */ daddu $a0, $s3, $zero /* EA1440 80240B40 0280282D */ daddu $a1, $s4, $zero /* EA1444 80240B44 0C0136B6 */ jal func_8004DAD8 /* EA1448 80240B48 02A0302D */ daddu $a2, $s5, $zero /* EA144C 80240B4C 0809030D */ j .L80240C34 -/* EA1450 80240B50 00000000 */ nop +/* EA1450 80240B50 00000000 */ nop +glabel L80240B54_EA1454 /* EA1454 80240B54 0260202D */ daddu $a0, $s3, $zero /* EA1458 80240B58 0280282D */ daddu $a1, $s4, $zero /* EA145C 80240B5C 0C0137D9 */ jal func_8004DF64 /* EA1460 80240B60 02A0302D */ daddu $a2, $s5, $zero +glabel L80240B64_EA1464 /* EA1464 80240B64 0260202D */ daddu $a0, $s3, $zero /* EA1468 80240B68 0280282D */ daddu $a1, $s4, $zero /* EA146C 80240B6C 0C013809 */ jal func_8004E024 /* EA1470 80240B70 02A0302D */ daddu $a2, $s5, $zero /* EA1474 80240B74 0809030D */ j .L80240C34 -/* EA1478 80240B78 00000000 */ nop +/* EA1478 80240B78 00000000 */ nop +glabel L80240B7C_EA147C /* EA147C 80240B7C 0260202D */ daddu $a0, $s3, $zero /* EA1480 80240B80 0280282D */ daddu $a1, $s4, $zero /* EA1484 80240B84 0C013897 */ jal func_8004E25C /* EA1488 80240B88 02A0302D */ daddu $a2, $s5, $zero +glabel L80240B8C_EA148C /* EA148C 80240B8C 0260202D */ daddu $a0, $s3, $zero /* EA1490 80240B90 0280282D */ daddu $a1, $s4, $zero /* EA1494 80240B94 0C0138BB */ jal func_8004E2EC /* EA1498 80240B98 02A0302D */ daddu $a2, $s5, $zero /* EA149C 80240B9C 0809030D */ j .L80240C34 -/* EA14A0 80240BA0 00000000 */ nop +/* EA14A0 80240BA0 00000000 */ nop +glabel L80240BA4_EA14A4 /* EA14A4 80240BA4 0260202D */ daddu $a0, $s3, $zero /* EA14A8 80240BA8 0280282D */ daddu $a1, $s4, $zero /* EA14AC 80240BAC 0C0138E7 */ jal func_8004E39C /* EA14B0 80240BB0 02A0302D */ daddu $a2, $s5, $zero +glabel L80240BB4_EA14B4 /* EA14B4 80240BB4 0260202D */ daddu $a0, $s3, $zero /* EA14B8 80240BB8 0280282D */ daddu $a1, $s4, $zero /* EA14BC 80240BBC 0C013951 */ jal func_8004E544 /* EA14C0 80240BC0 02A0302D */ daddu $a2, $s5, $zero /* EA14C4 80240BC4 0809030D */ j .L80240C34 -/* EA14C8 80240BC8 00000000 */ nop +/* EA14C8 80240BC8 00000000 */ nop +glabel L80240BCC_EA14CC /* EA14CC 80240BCC 0260202D */ daddu $a0, $s3, $zero /* EA14D0 80240BD0 0280282D */ daddu $a1, $s4, $zero /* EA14D4 80240BD4 0C013A02 */ jal func_8004E808 /* EA14D8 80240BD8 02A0302D */ daddu $a2, $s5, $zero /* EA14DC 80240BDC 0809030D */ j .L80240C34 -/* EA14E0 80240BE0 00000000 */ nop +/* EA14E0 80240BE0 00000000 */ nop +glabel L80240BE4_EA14E4 /* EA14E4 80240BE4 0C0900C4 */ jal func_80240310_EA0C10 /* EA14E8 80240BE8 0260202D */ daddu $a0, $s3, $zero +glabel L80240BEC_EA14EC /* EA14EC 80240BEC 0C0900DF */ jal func_8024037C_EA0C7C /* EA14F0 80240BF0 0260202D */ daddu $a0, $s3, $zero /* EA14F4 80240BF4 8E630070 */ lw $v1, 0x70($s3) /* EA14F8 80240BF8 24020020 */ addiu $v0, $zero, 0x20 /* EA14FC 80240BFC 1462000D */ bne $v1, $v0, .L80240C34 -/* EA1500 80240C00 00000000 */ nop +/* EA1500 80240C00 00000000 */ nop +glabel L80240C04_EA1504 /* EA1504 80240C04 0C0900FB */ jal func_802403EC_EA0CEC /* EA1508 80240C08 0260202D */ daddu $a0, $s3, $zero /* EA150C 80240C0C 8E630070 */ lw $v1, 0x70($s3) /* EA1510 80240C10 24020021 */ addiu $v0, $zero, 0x21 /* EA1514 80240C14 14620007 */ bne $v1, $v0, .L80240C34 -/* EA1518 80240C18 00000000 */ nop +/* EA1518 80240C18 00000000 */ nop +glabel L80240C1C_EA151C /* EA151C 80240C1C 0C090131 */ jal func_802404C4_EA0DC4 /* EA1520 80240C20 0260202D */ daddu $a0, $s3, $zero /* EA1524 80240C24 0809030D */ j .L80240C34 -/* EA1528 80240C28 00000000 */ nop +/* EA1528 80240C28 00000000 */ nop +glabel L80240C2C_EA152C /* EA152C 80240C2C 0C013AE3 */ jal func_8004EB8C /* EA1530 80240C30 0260202D */ daddu $a0, $s3, $zero .L80240C34: +glabel L80240C34_EA1534 /* EA1534 80240C34 8FBF0048 */ lw $ra, 0x48($sp) /* EA1538 80240C38 8FB50044 */ lw $s5, 0x44($sp) /* EA153C 80240C3C 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/code_EA0C10/func_80240CC8_EA15C8.s b/asm/nonmatchings/code_EA0C10/func_80240CC8_EA15C8.s index a20b7cbbfe..1b8366be5b 100644 --- a/asm/nonmatchings/code_EA0C10/func_80240CC8_EA15C8.s +++ b/asm/nonmatchings/code_EA0C10/func_80240CC8_EA15C8.s @@ -38,7 +38,7 @@ glabel func_80240CC8_EA15C8 /* EA164C 80240D4C 3C01C1A0 */ lui $at, 0xc1a0 /* EA1650 80240D50 44812000 */ mtc1 $at, $f4 /* EA1654 80240D54 44833000 */ mtc1 $v1, $f6 -/* EA1658 80240D58 00000000 */ nop +/* EA1658 80240D58 00000000 */ nop /* EA165C 80240D5C 468031A0 */ cvt.s.w $f6, $f6 /* EA1660 80240D60 44073000 */ mfc1 $a3, $f6 /* EA1664 80240D64 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/code_EA0C10/func_80240DC4_EA16C4.s b/asm/nonmatchings/code_EA0C10/func_80240DC4_EA16C4.s index 03e00d6430..6629b9c0c8 100644 --- a/asm/nonmatchings/code_EA0C10/func_80240DC4_EA16C4.s +++ b/asm/nonmatchings/code_EA0C10/func_80240DC4_EA16C4.s @@ -39,18 +39,18 @@ glabel func_80240DC4_EA16C4 .L80240E4C: /* EA174C 80240E4C 8622008E */ lh $v0, 0x8e($s1) /* EA1750 80240E50 1440025D */ bnez $v0, .L802417C8 -/* EA1754 80240E54 00000000 */ nop +/* EA1754 80240E54 00000000 */ nop /* EA1758 80240E58 3C028010 */ lui $v0, %hi(D_800FFC90) /* EA175C 80240E5C 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) /* EA1760 80240E60 0C00AB85 */ jal func_8002AE14 /* EA1764 80240E64 C44C00A8 */ lwc1 $f12, 0xa8($v0) /* EA1768 80240E68 3C014334 */ lui $at, 0x4334 /* EA176C 80240E6C 44811000 */ mtc1 $at, $f2 -/* EA1770 80240E70 00000000 */ nop +/* EA1770 80240E70 00000000 */ nop /* EA1774 80240E74 4602003C */ c.lt.s $f0, $f2 -/* EA1778 80240E78 00000000 */ nop +/* EA1778 80240E78 00000000 */ nop /* EA177C 80240E7C 45000011 */ bc1f .L80240EC4 -/* EA1780 80240E80 00000000 */ nop +/* EA1780 80240E80 00000000 */ nop /* EA1784 80240E84 3C038008 */ lui $v1, %hi(D_8007C760) /* EA1788 80240E88 8C63C760 */ lw $v1, %lo(D_8007C760)($v1) /* EA178C 80240E8C 3C0142B4 */ lui $at, 0x42b4 @@ -85,7 +85,7 @@ glabel func_80240DC4_EA16C4 /* EA17FC 80240EFC 460C0300 */ add.s $f12, $f0, $f12 .L80240F00: /* EA1800 80240F00 0C00AB85 */ jal func_8002AE14 -/* EA1804 80240F04 00000000 */ nop +/* EA1804 80240F04 00000000 */ nop /* EA1808 80240F08 46000586 */ mov.s $f22, $f0 /* EA180C 80240F0C 3C014334 */ lui $at, 0x4334 /* EA1810 80240F10 44816000 */ mtc1 $at, $f12 @@ -134,7 +134,7 @@ glabel func_80240DC4_EA16C4 /* EA18AC 80240FAC 862200A6 */ lh $v0, 0xa6($s1) /* EA18B0 80240FB0 8EA30000 */ lw $v1, ($s5) /* EA18B4 80240FB4 44824000 */ mtc1 $v0, $f8 -/* EA18B8 80240FB8 00000000 */ nop +/* EA18B8 80240FB8 00000000 */ nop /* EA18BC 80240FBC 46804220 */ cvt.s.w $f8, $f8 /* EA18C0 80240FC0 C4600028 */ lwc1 $f0, 0x28($v1) /* EA18C4 80240FC4 44064000 */ mfc1 $a2, $f8 @@ -146,7 +146,7 @@ glabel func_80240DC4_EA16C4 /* EA18DC 80240FDC E6200040 */ swc1 $f0, 0x40($s1) /* EA18E0 80240FE0 862200A6 */ lh $v0, 0xa6($s1) /* EA18E4 80240FE4 44820000 */ mtc1 $v0, $f0 -/* EA18E8 80240FE8 00000000 */ nop +/* EA18E8 80240FE8 00000000 */ nop /* EA18EC 80240FEC 46800020 */ cvt.s.w $f0, $f0 /* EA18F0 80240FF0 4600A000 */ add.s $f0, $f20, $f0 /* EA18F4 80240FF4 4406B000 */ mfc1 $a2, $f22 @@ -155,18 +155,18 @@ glabel func_80240DC4_EA16C4 /* EA1900 80241000 0220202D */ daddu $a0, $s1, $zero /* EA1904 80241004 8EC20088 */ lw $v0, 0x88($s6) /* EA1908 80241008 1440005D */ bnez $v0, .L80241180 -/* EA190C 8024100C 00000000 */ nop +/* EA190C 8024100C 00000000 */ nop /* EA1910 80241010 C6200038 */ lwc1 $f0, 0x38($s1) /* EA1914 80241014 3C018024 */ lui $at, %hi(D_80246618) /* EA1918 80241018 D4246618 */ ldc1 $f4, %lo(D_80246618)($at) /* EA191C 8024101C 46000021 */ cvt.d.s $f0, $f0 /* EA1920 80241020 4620203C */ c.lt.d $f4, $f0 -/* EA1924 80241024 00000000 */ nop +/* EA1924 80241024 00000000 */ nop /* EA1928 80241028 45000005 */ bc1f .L80241040 -/* EA192C 8024102C 00000000 */ nop +/* EA192C 8024102C 00000000 */ nop /* EA1930 80241030 3C0143BE */ lui $at, 0x43be /* EA1934 80241034 44810000 */ mtc1 $at, $f0 -/* EA1938 80241038 00000000 */ nop +/* EA1938 80241038 00000000 */ nop /* EA193C 8024103C E6200038 */ swc1 $f0, 0x38($s1) .L80241040: /* EA1940 80241040 C6200038 */ lwc1 $f0, 0x38($s1) @@ -174,50 +174,50 @@ glabel func_80240DC4_EA16C4 /* EA1948 80241048 D4226620 */ ldc1 $f2, %lo(D_80246620)($at) /* EA194C 8024104C 46000021 */ cvt.d.s $f0, $f0 /* EA1950 80241050 4622003C */ c.lt.d $f0, $f2 -/* EA1954 80241054 00000000 */ nop +/* EA1954 80241054 00000000 */ nop /* EA1958 80241058 45000005 */ bc1f .L80241070 -/* EA195C 8024105C 00000000 */ nop +/* EA195C 8024105C 00000000 */ nop /* EA1960 80241060 3C01C3BE */ lui $at, 0xc3be /* EA1964 80241064 44810000 */ mtc1 $at, $f0 -/* EA1968 80241068 00000000 */ nop +/* EA1968 80241068 00000000 */ nop /* EA196C 8024106C E6200038 */ swc1 $f0, 0x38($s1) .L80241070: /* EA1970 80241070 C6200040 */ lwc1 $f0, 0x40($s1) /* EA1974 80241074 46000021 */ cvt.d.s $f0, $f0 /* EA1978 80241078 4620203C */ c.lt.d $f4, $f0 -/* EA197C 8024107C 00000000 */ nop +/* EA197C 8024107C 00000000 */ nop /* EA1980 80241080 45000005 */ bc1f .L80241098 -/* EA1984 80241084 00000000 */ nop +/* EA1984 80241084 00000000 */ nop /* EA1988 80241088 3C0143BE */ lui $at, 0x43be /* EA198C 8024108C 44810000 */ mtc1 $at, $f0 -/* EA1990 80241090 00000000 */ nop +/* EA1990 80241090 00000000 */ nop /* EA1994 80241094 E6200040 */ swc1 $f0, 0x40($s1) .L80241098: /* EA1998 80241098 C6200040 */ lwc1 $f0, 0x40($s1) /* EA199C 8024109C 46000021 */ cvt.d.s $f0, $f0 /* EA19A0 802410A0 4622003C */ c.lt.d $f0, $f2 -/* EA19A4 802410A4 00000000 */ nop +/* EA19A4 802410A4 00000000 */ nop /* EA19A8 802410A8 45000005 */ bc1f .L802410C0 -/* EA19AC 802410AC 00000000 */ nop +/* EA19AC 802410AC 00000000 */ nop /* EA19B0 802410B0 3C01C3BE */ lui $at, 0xc3be /* EA19B4 802410B4 44810000 */ mtc1 $at, $f0 -/* EA19B8 802410B8 00000000 */ nop +/* EA19B8 802410B8 00000000 */ nop /* EA19BC 802410BC E6200040 */ swc1 $f0, 0x40($s1) .L802410C0: /* EA19C0 802410C0 C6220038 */ lwc1 $f2, 0x38($s1) /* EA19C4 802410C4 46021082 */ mul.s $f2, $f2, $f2 -/* EA19C8 802410C8 00000000 */ nop +/* EA19C8 802410C8 00000000 */ nop /* EA19CC 802410CC C6200040 */ lwc1 $f0, 0x40($s1) /* EA19D0 802410D0 46000002 */ mul.s $f0, $f0, $f0 -/* EA19D4 802410D4 00000000 */ nop +/* EA19D4 802410D4 00000000 */ nop /* EA19D8 802410D8 46001300 */ add.s $f12, $f2, $f0 /* EA19DC 802410DC 46006004 */ sqrt.s $f0, $f12 /* EA19E0 802410E0 46000032 */ c.eq.s $f0, $f0 -/* EA19E4 802410E4 00000000 */ nop +/* EA19E4 802410E4 00000000 */ nop /* EA19E8 802410E8 45010003 */ bc1t .L802410F8 -/* EA19EC 802410EC 00000000 */ nop +/* EA19EC 802410EC 00000000 */ nop /* EA19F0 802410F0 0C019C10 */ jal func_80067040 -/* EA19F4 802410F4 00000000 */ nop +/* EA19F4 802410F4 00000000 */ nop .L802410F8: /* EA19F8 802410F8 8E260038 */ lw $a2, 0x38($s1) /* EA19FC 802410FC 8E270040 */ lw $a3, 0x40($s1) @@ -232,7 +232,7 @@ glabel func_80240DC4_EA16C4 /* EA1A20 80241120 D4206628 */ ldc1 $f0, %lo(D_80246628)($at) /* EA1A24 80241124 460010A1 */ cvt.d.s $f2, $f2 /* EA1A28 80241128 4620103C */ c.lt.d $f2, $f0 -/* EA1A2C 8024112C 00000000 */ nop +/* EA1A2C 8024112C 00000000 */ nop /* EA1A30 80241130 45000004 */ bc1f .L80241144 /* EA1A34 80241134 0200202D */ daddu $a0, $s0, $zero /* EA1A38 80241138 3C064398 */ lui $a2, 0x4398 @@ -242,9 +242,9 @@ glabel func_80240DC4_EA16C4 /* EA1A44 80241144 3C018024 */ lui $at, %hi(D_80246630) /* EA1A48 80241148 D4206630 */ ldc1 $f0, %lo(D_80246630)($at) /* EA1A4C 8024114C 4622003C */ c.lt.d $f0, $f2 -/* EA1A50 80241150 00000000 */ nop +/* EA1A50 80241150 00000000 */ nop /* EA1A54 80241154 450000FA */ bc1f .L80241540 -/* EA1A58 80241158 00000000 */ nop +/* EA1A58 80241158 00000000 */ nop /* EA1A5C 8024115C 3C0643BB */ lui $a2, 0x43bb /* EA1A60 80241160 34C68000 */ ori $a2, $a2, 0x8000 .L80241164: @@ -254,7 +254,7 @@ glabel func_80240DC4_EA16C4 /* EA1A70 80241170 0C00ACA3 */ jal func_8002B28C /* EA1A74 80241174 E6340040 */ swc1 $f20, 0x40($s1) /* EA1A78 80241178 08090550 */ j .L80241540 -/* EA1A7C 8024117C 00000000 */ nop +/* EA1A7C 8024117C 00000000 */ nop .L80241180: /* EA1A80 80241180 8E220000 */ lw $v0, ($s1) /* EA1A84 80241184 30420040 */ andi $v0, $v0, 0x40 @@ -281,13 +281,13 @@ glabel func_80240DC4_EA16C4 /* EA1AD8 802411D8 862200A8 */ lh $v0, 0xa8($s1) /* EA1ADC 802411DC 0260302D */ daddu $a2, $s3, $zero /* EA1AE0 802411E0 44820000 */ mtc1 $v0, $f0 -/* EA1AE4 802411E4 00000000 */ nop +/* EA1AE4 802411E4 00000000 */ nop /* EA1AE8 802411E8 46800020 */ cvt.s.w $f0, $f0 /* EA1AEC 802411EC E7A00018 */ swc1 $f0, 0x18($sp) /* EA1AF0 802411F0 862200A6 */ lh $v0, 0xa6($s1) /* EA1AF4 802411F4 27B00028 */ addiu $s0, $sp, 0x28 /* EA1AF8 802411F8 44820000 */ mtc1 $v0, $f0 -/* EA1AFC 802411FC 00000000 */ nop +/* EA1AFC 802411FC 00000000 */ nop /* EA1B00 80241200 46800020 */ cvt.s.w $f0, $f0 /* EA1B04 80241204 E7A0001C */ swc1 $f0, 0x1c($sp) /* EA1B08 80241208 8E240080 */ lw $a0, 0x80($s1) @@ -311,13 +311,13 @@ glabel func_80240DC4_EA16C4 /* EA1B50 80241250 E7B60014 */ swc1 $f22, 0x14($sp) /* EA1B54 80241254 862200A8 */ lh $v0, 0xa8($s1) /* EA1B58 80241258 44820000 */ mtc1 $v0, $f0 -/* EA1B5C 8024125C 00000000 */ nop +/* EA1B5C 8024125C 00000000 */ nop /* EA1B60 80241260 46800020 */ cvt.s.w $f0, $f0 /* EA1B64 80241264 E7A00018 */ swc1 $f0, 0x18($sp) /* EA1B68 80241268 862200A6 */ lh $v0, 0xa6($s1) /* EA1B6C 8024126C 0260302D */ daddu $a2, $s3, $zero /* EA1B70 80241270 44820000 */ mtc1 $v0, $f0 -/* EA1B74 80241274 00000000 */ nop +/* EA1B74 80241274 00000000 */ nop /* EA1B78 80241278 46800020 */ cvt.s.w $f0, $f0 /* EA1B7C 8024127C E7A0001C */ swc1 $f0, 0x1c($sp) /* EA1B80 80241280 8E240080 */ lw $a0, 0x80($s1) @@ -347,32 +347,32 @@ glabel func_80240DC4_EA16C4 /* EA1BE0 802412E0 0C03908F */ jal func_800E423C /* EA1BE4 802412E4 0040802D */ daddu $s0, $v0, $zero /* EA1BE8 802412E8 1600001C */ bnez $s0, .L8024135C -/* EA1BEC 802412EC 00000000 */ nop +/* EA1BEC 802412EC 00000000 */ nop /* EA1BF0 802412F0 1040001A */ beqz $v0, .L8024135C -/* EA1BF4 802412F4 00000000 */ nop +/* EA1BF4 802412F4 00000000 */ nop /* EA1BF8 802412F8 C7A20038 */ lwc1 $f2, 0x38($sp) /* EA1BFC 802412FC 3C014054 */ lui $at, 0x4054 /* EA1C00 80241300 44810800 */ mtc1 $at, $f1 /* EA1C04 80241304 44800000 */ mtc1 $zero, $f0 /* EA1C08 80241308 460010A1 */ cvt.d.s $f2, $f2 /* EA1C0C 8024130C 4622003C */ c.lt.d $f0, $f2 -/* EA1C10 80241310 00000000 */ nop +/* EA1C10 80241310 00000000 */ nop /* EA1C14 80241314 45000011 */ bc1f .L8024135C -/* EA1C18 80241318 00000000 */ nop +/* EA1C18 80241318 00000000 */ nop /* EA1C1C 8024131C 3C01405E */ lui $at, 0x405e /* EA1C20 80241320 44810800 */ mtc1 $at, $f1 /* EA1C24 80241324 44800000 */ mtc1 $zero, $f0 -/* EA1C28 80241328 00000000 */ nop +/* EA1C28 80241328 00000000 */ nop /* EA1C2C 8024132C 4620103C */ c.lt.d $f2, $f0 -/* EA1C30 80241330 00000000 */ nop +/* EA1C30 80241330 00000000 */ nop /* EA1C34 80241334 45000009 */ bc1f .L8024135C -/* EA1C38 80241338 00000000 */ nop +/* EA1C38 80241338 00000000 */ nop /* EA1C3C 8024133C C622003C */ lwc1 $f2, 0x3c($s1) /* EA1C40 80241340 C7A00030 */ lwc1 $f0, 0x30($sp) /* EA1C44 80241344 46001032 */ c.eq.s $f2, $f0 -/* EA1C48 80241348 00000000 */ nop +/* EA1C48 80241348 00000000 */ nop /* EA1C4C 8024134C 45010003 */ bc1t .L8024135C -/* EA1C50 80241350 00000000 */ nop +/* EA1C50 80241350 00000000 */ nop /* EA1C54 80241354 08090550 */ j .L80241540 /* EA1C58 80241358 241E0001 */ addiu $fp, $zero, 1 .L8024135C: @@ -396,13 +396,13 @@ glabel func_80240DC4_EA16C4 /* EA1CA0 802413A0 862200A8 */ lh $v0, 0xa8($s1) /* EA1CA4 802413A4 27A50020 */ addiu $a1, $sp, 0x20 /* EA1CA8 802413A8 44820000 */ mtc1 $v0, $f0 -/* EA1CAC 802413AC 00000000 */ nop +/* EA1CAC 802413AC 00000000 */ nop /* EA1CB0 802413B0 46800020 */ cvt.s.w $f0, $f0 /* EA1CB4 802413B4 E7A00018 */ swc1 $f0, 0x18($sp) /* EA1CB8 802413B8 862200A6 */ lh $v0, 0xa6($s1) /* EA1CBC 802413BC 27A60024 */ addiu $a2, $sp, 0x24 /* EA1CC0 802413C0 44820000 */ mtc1 $v0, $f0 -/* EA1CC4 802413C4 00000000 */ nop +/* EA1CC4 802413C4 00000000 */ nop /* EA1CC8 802413C8 46800020 */ cvt.s.w $f0, $f0 /* EA1CCC 802413CC E7A0001C */ swc1 $f0, 0x1c($sp) /* EA1CD0 802413D0 8E240080 */ lw $a0, 0x80($s1) @@ -420,7 +420,7 @@ glabel func_80240DC4_EA16C4 /* EA1D00 80241400 862200A6 */ lh $v0, 0xa6($s1) /* EA1D04 80241404 4407C000 */ mfc1 $a3, $f24 /* EA1D08 80241408 44824000 */ mtc1 $v0, $f8 -/* EA1D0C 8024140C 00000000 */ nop +/* EA1D0C 8024140C 00000000 */ nop /* EA1D10 80241410 46804220 */ cvt.s.w $f8, $f8 /* EA1D14 80241414 C4600028 */ lwc1 $f0, 0x28($v1) /* EA1D18 80241418 44064000 */ mfc1 $a2, $f8 @@ -432,7 +432,7 @@ glabel func_80240DC4_EA16C4 /* EA1D30 80241430 E6200040 */ swc1 $f0, 0x40($s1) /* EA1D34 80241434 862200A6 */ lh $v0, 0xa6($s1) /* EA1D38 80241438 44820000 */ mtc1 $v0, $f0 -/* EA1D3C 8024143C 00000000 */ nop +/* EA1D3C 8024143C 00000000 */ nop /* EA1D40 80241440 46800020 */ cvt.s.w $f0, $f0 /* EA1D44 80241444 0809054C */ j .L80241530 /* EA1D48 80241448 4600A500 */ add.s $f20, $f20, $f0 @@ -454,20 +454,20 @@ glabel func_80240DC4_EA16C4 /* EA1D84 80241484 E7B60014 */ swc1 $f22, 0x14($sp) /* EA1D88 80241488 862200A8 */ lh $v0, 0xa8($s1) /* EA1D8C 8024148C 44820000 */ mtc1 $v0, $f0 -/* EA1D90 80241490 00000000 */ nop +/* EA1D90 80241490 00000000 */ nop /* EA1D94 80241494 46800020 */ cvt.s.w $f0, $f0 /* EA1D98 80241498 E7A00018 */ swc1 $f0, 0x18($sp) /* EA1D9C 8024149C 862200A6 */ lh $v0, 0xa6($s1) /* EA1DA0 802414A0 27A60024 */ addiu $a2, $sp, 0x24 /* EA1DA4 802414A4 44820000 */ mtc1 $v0, $f0 -/* EA1DA8 802414A8 00000000 */ nop +/* EA1DA8 802414A8 00000000 */ nop /* EA1DAC 802414AC 46800020 */ cvt.s.w $f0, $f0 /* EA1DB0 802414B0 E7A0001C */ swc1 $f0, 0x1c($sp) /* EA1DB4 802414B4 8E240080 */ lw $a0, 0x80($s1) /* EA1DB8 802414B8 0C0394C1 */ jal func_800E5304 /* EA1DBC 802414BC 27A70028 */ addiu $a3, $sp, 0x28 /* EA1DC0 802414C0 1040001F */ beqz $v0, .L80241540 -/* EA1DC4 802414C4 00000000 */ nop +/* EA1DC4 802414C4 00000000 */ nop /* EA1DC8 802414C8 8FA60020 */ lw $a2, 0x20($sp) /* EA1DCC 802414CC 8EA20000 */ lw $v0, ($s5) /* EA1DD0 802414D0 8FA70028 */ lw $a3, 0x28($sp) @@ -479,7 +479,7 @@ glabel func_80240DC4_EA16C4 /* EA1DE8 802414E8 862200A6 */ lh $v0, 0xa6($s1) /* EA1DEC 802414EC 4407C000 */ mfc1 $a3, $f24 /* EA1DF0 802414F0 44824000 */ mtc1 $v0, $f8 -/* EA1DF4 802414F4 00000000 */ nop +/* EA1DF4 802414F4 00000000 */ nop /* EA1DF8 802414F8 46804220 */ cvt.s.w $f8, $f8 /* EA1DFC 802414FC C4600028 */ lwc1 $f0, 0x28($v1) /* EA1E00 80241500 44064000 */ mfc1 $a2, $f8 @@ -491,7 +491,7 @@ glabel func_80240DC4_EA16C4 /* EA1E18 80241518 E6200040 */ swc1 $f0, 0x40($s1) /* EA1E1C 8024151C 862200A6 */ lh $v0, 0xa6($s1) /* EA1E20 80241520 44820000 */ mtc1 $v0, $f0 -/* EA1E24 80241524 00000000 */ nop +/* EA1E24 80241524 00000000 */ nop /* EA1E28 80241528 46800020 */ cvt.s.w $f0, $f0 /* EA1E2C 8024152C 4600A500 */ add.s $f20, $f20, $f0 .L80241530: @@ -520,14 +520,14 @@ glabel func_80240DC4_EA16C4 /* EA1E84 80241584 0C013431 */ jal func_8004D0C4 /* EA1E88 80241588 26330040 */ addiu $s3, $s1, 0x40 /* EA1E8C 8024158C 1040005A */ beqz $v0, .L802416F8 -/* EA1E90 80241590 00000000 */ nop +/* EA1E90 80241590 00000000 */ nop /* EA1E94 80241594 8E430004 */ lw $v1, 4($s2) /* EA1E98 80241598 10600005 */ beqz $v1, .L802415B0 /* EA1E9C 8024159C 24020001 */ addiu $v0, $zero, 1 /* EA1EA0 802415A0 10620029 */ beq $v1, $v0, .L80241648 -/* EA1EA4 802415A4 00000000 */ nop +/* EA1EA4 802415A4 00000000 */ nop /* EA1EA8 802415A8 080905BE */ j .L802416F8 -/* EA1EAC 802415AC 00000000 */ nop +/* EA1EAC 802415AC 00000000 */ nop .L802415B0: /* EA1EB0 802415B0 C6480008 */ lwc1 $f8, 8($s2) /* EA1EB4 802415B4 46804220 */ cvt.s.w $f8, $f8 @@ -538,11 +538,11 @@ glabel func_80240DC4_EA16C4 /* EA1EC8 802415C8 C62E0040 */ lwc1 $f14, 0x40($s1) /* EA1ECC 802415CC 44074000 */ mfc1 $a3, $f8 /* EA1ED0 802415D0 0C00AC71 */ jal func_8002B1C4 -/* EA1ED4 802415D4 00000000 */ nop +/* EA1ED4 802415D4 00000000 */ nop /* EA1ED8 802415D8 C6420010 */ lwc1 $f2, 0x10($s2) /* EA1EDC 802415DC 468010A0 */ cvt.s.w $f2, $f2 /* EA1EE0 802415E0 4600103C */ c.lt.s $f2, $f0 -/* EA1EE4 802415E4 00000000 */ nop +/* EA1EE4 802415E4 00000000 */ nop /* EA1EE8 802415E8 45000043 */ bc1f .L802416F8 /* EA1EEC 802415EC E7A00038 */ swc1 $f0, 0x38($sp) /* EA1EF0 802415F0 C64C0008 */ lwc1 $f12, 8($s2) @@ -566,17 +566,17 @@ glabel func_80240DC4_EA16C4 /* EA1F38 80241638 0C00ACA3 */ jal func_8002B28C /* EA1F3C 8024163C 0260282D */ daddu $a1, $s3, $zero /* EA1F40 80241640 080905BE */ j .L802416F8 -/* EA1F44 80241644 00000000 */ nop +/* EA1F44 80241644 00000000 */ nop .L80241648: /* EA1F48 80241648 8E420008 */ lw $v0, 8($s2) /* EA1F4C 8024164C 8E430010 */ lw $v1, 0x10($s2) /* EA1F50 80241650 C6200038 */ lwc1 $f0, 0x38($s1) /* EA1F54 80241654 00431021 */ addu $v0, $v0, $v1 /* EA1F58 80241658 44821000 */ mtc1 $v0, $f2 -/* EA1F5C 8024165C 00000000 */ nop +/* EA1F5C 8024165C 00000000 */ nop /* EA1F60 80241660 468010A0 */ cvt.s.w $f2, $f2 /* EA1F64 80241664 4600103C */ c.lt.s $f2, $f0 -/* EA1F68 80241668 00000000 */ nop +/* EA1F68 80241668 00000000 */ nop /* EA1F6C 8024166C 45030001 */ bc1tl .L80241674 /* EA1F70 80241670 E6220038 */ swc1 $f2, 0x38($s1) .L80241674: @@ -585,10 +585,10 @@ glabel func_80240DC4_EA16C4 /* EA1F7C 8024167C C6200038 */ lwc1 $f0, 0x38($s1) /* EA1F80 80241680 00431023 */ subu $v0, $v0, $v1 /* EA1F84 80241684 44821000 */ mtc1 $v0, $f2 -/* EA1F88 80241688 00000000 */ nop +/* EA1F88 80241688 00000000 */ nop /* EA1F8C 8024168C 468010A0 */ cvt.s.w $f2, $f2 /* EA1F90 80241690 4602003C */ c.lt.s $f0, $f2 -/* EA1F94 80241694 00000000 */ nop +/* EA1F94 80241694 00000000 */ nop /* EA1F98 80241698 45030001 */ bc1tl .L802416A0 /* EA1F9C 8024169C E6220038 */ swc1 $f2, 0x38($s1) .L802416A0: @@ -597,10 +597,10 @@ glabel func_80240DC4_EA16C4 /* EA1FA8 802416A8 C6200040 */ lwc1 $f0, 0x40($s1) /* EA1FAC 802416AC 00431021 */ addu $v0, $v0, $v1 /* EA1FB0 802416B0 44821000 */ mtc1 $v0, $f2 -/* EA1FB4 802416B4 00000000 */ nop +/* EA1FB4 802416B4 00000000 */ nop /* EA1FB8 802416B8 468010A0 */ cvt.s.w $f2, $f2 /* EA1FBC 802416BC 4600103C */ c.lt.s $f2, $f0 -/* EA1FC0 802416C0 00000000 */ nop +/* EA1FC0 802416C0 00000000 */ nop /* EA1FC4 802416C4 45030001 */ bc1tl .L802416CC /* EA1FC8 802416C8 E6220040 */ swc1 $f2, 0x40($s1) .L802416CC: @@ -609,21 +609,21 @@ glabel func_80240DC4_EA16C4 /* EA1FD4 802416D4 C6200040 */ lwc1 $f0, 0x40($s1) /* EA1FD8 802416D8 00431023 */ subu $v0, $v0, $v1 /* EA1FDC 802416DC 44821000 */ mtc1 $v0, $f2 -/* EA1FE0 802416E0 00000000 */ nop +/* EA1FE0 802416E0 00000000 */ nop /* EA1FE4 802416E4 468010A0 */ cvt.s.w $f2, $f2 /* EA1FE8 802416E8 4602003C */ c.lt.s $f0, $f2 -/* EA1FEC 802416EC 00000000 */ nop +/* EA1FEC 802416EC 00000000 */ nop /* EA1FF0 802416F0 45030001 */ bc1tl .L802416F8 /* EA1FF4 802416F4 E6220040 */ swc1 $f2, 0x40($s1) .L802416F8: /* EA1FF8 802416F8 16E0001F */ bnez $s7, .L80241778 -/* EA1FFC 802416FC 00000000 */ nop +/* EA1FFC 802416FC 00000000 */ nop /* EA2000 80241700 8E220000 */ lw $v0, ($s1) /* EA2004 80241704 30420008 */ andi $v0, $v0, 8 /* EA2008 80241708 10400003 */ beqz $v0, .L80241718 /* EA200C 8024170C 27A50020 */ addiu $a1, $sp, 0x20 /* EA2010 80241710 13C00019 */ beqz $fp, .L80241778 -/* EA2014 80241714 00000000 */ nop +/* EA2014 80241714 00000000 */ nop .L80241718: /* EA2018 80241718 27A60024 */ addiu $a2, $sp, 0x24 /* EA201C 8024171C 27A20038 */ addiu $v0, $sp, 0x38 @@ -646,7 +646,7 @@ glabel func_80240DC4_EA16C4 /* EA2060 80241760 0C03908F */ jal func_800E423C /* EA2064 80241764 27A70028 */ addiu $a3, $sp, 0x28 /* EA2068 80241768 10400003 */ beqz $v0, .L80241778 -/* EA206C 8024176C 00000000 */ nop +/* EA206C 8024176C 00000000 */ nop /* EA2070 80241770 C7A00024 */ lwc1 $f0, 0x24($sp) /* EA2074 80241774 E620003C */ swc1 $f0, 0x3c($s1) .L80241778: diff --git a/asm/nonmatchings/code_EA0C10/func_80241804_EA2104.s b/asm/nonmatchings/code_EA0C10/func_80241804_EA2104.s index 6a51f13591..d989a810b0 100644 --- a/asm/nonmatchings/code_EA0C10/func_80241804_EA2104.s +++ b/asm/nonmatchings/code_EA0C10/func_80241804_EA2104.s @@ -27,7 +27,7 @@ glabel func_80241804_EA2104 .L8024185C: /* EA215C 8024185C 8482008E */ lh $v0, 0x8e($a0) /* EA2160 80241860 14400007 */ bnez $v0, .L80241880 -/* EA2164 80241864 00000000 */ nop +/* EA2164 80241864 00000000 */ nop /* EA2168 80241868 8E0200CC */ lw $v0, 0xcc($s0) /* EA216C 8024186C 8C420028 */ lw $v0, 0x28($v0) /* EA2170 80241870 A480008E */ sh $zero, 0x8e($a0) diff --git a/asm/nonmatchings/code_EA0C10/func_80241894_EA2194.s b/asm/nonmatchings/code_EA0C10/func_80241894_EA2194.s index 529670ecbf..5f2f7c0e11 100644 --- a/asm/nonmatchings/code_EA0C10/func_80241894_EA2194.s +++ b/asm/nonmatchings/code_EA0C10/func_80241894_EA2194.s @@ -18,7 +18,7 @@ glabel func_80241894_EA2194 /* EA21C8 802418C8 8E0300A0 */ lw $v1, 0xa0($s0) /* EA21CC 802418CC 00021403 */ sra $v0, $v0, 0x10 /* EA21D0 802418D0 14430004 */ bne $v0, $v1, .L802418E4 -/* EA21D4 802418D4 00000000 */ nop +/* EA21D4 802418D4 00000000 */ nop /* EA21D8 802418D8 8E0200CC */ lw $v0, 0xcc($s0) /* EA21DC 802418DC 8C42002C */ lw $v0, 0x2c($v0) /* EA21E0 802418E0 ACA20028 */ sw $v0, 0x28($a1) @@ -47,7 +47,7 @@ glabel func_80241894_EA2194 /* EA2234 80241934 3C01C1A0 */ lui $at, 0xc1a0 /* EA2238 80241938 44812000 */ mtc1 $at, $f4 /* EA223C 8024193C 44833000 */ mtc1 $v1, $f6 -/* EA2240 80241940 00000000 */ nop +/* EA2240 80241940 00000000 */ nop /* EA2244 80241944 468031A0 */ cvt.s.w $f6, $f6 /* EA2248 80241948 8C420000 */ lw $v0, ($v0) /* EA224C 8024194C 44073000 */ mfc1 $a3, $f6 diff --git a/asm/nonmatchings/code_EA0C10/func_80241994_EA2294.s b/asm/nonmatchings/code_EA0C10/func_80241994_EA2294.s index 1b03b8d1a0..f8a751ab06 100644 --- a/asm/nonmatchings/code_EA0C10/func_80241994_EA2294.s +++ b/asm/nonmatchings/code_EA0C10/func_80241994_EA2294.s @@ -16,7 +16,7 @@ glabel func_80241994_EA2294 /* EA22C0 802419C0 A462008E */ sh $v0, 0x8e($v1) /* EA22C4 802419C4 00021400 */ sll $v0, $v0, 0x10 /* EA22C8 802419C8 14400005 */ bnez $v0, .L802419E0 -/* EA22CC 802419CC 00000000 */ nop +/* EA22CC 802419CC 00000000 */ nop /* EA22D0 802419D0 960200AA */ lhu $v0, 0xaa($s0) /* EA22D4 802419D4 A462008E */ sh $v0, 0x8e($v1) /* EA22D8 802419D8 2402000E */ addiu $v0, $zero, 0xe diff --git a/asm/nonmatchings/code_EA0C10/func_802419F4_EA22F4.s b/asm/nonmatchings/code_EA0C10/func_802419F4_EA22F4.s index eb450ae738..547e38175a 100644 --- a/asm/nonmatchings/code_EA0C10/func_802419F4_EA22F4.s +++ b/asm/nonmatchings/code_EA0C10/func_802419F4_EA22F4.s @@ -42,7 +42,7 @@ glabel func_802419F4_EA22F4 /* EA2388 80241A88 2402000F */ addiu $v0, $zero, 0xf /* EA238C 80241A8C AFA2001C */ sw $v0, 0x1c($sp) /* EA2390 80241A90 44833000 */ mtc1 $v1, $f6 -/* EA2394 80241A94 00000000 */ nop +/* EA2394 80241A94 00000000 */ nop /* EA2398 80241A98 468031A0 */ cvt.s.w $f6, $f6 /* EA239C 80241A9C 44073000 */ mfc1 $a3, $f6 /* EA23A0 80241AA0 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/code_EA0C10/func_80241AE0_EA23E0.s b/asm/nonmatchings/code_EA0C10/func_80241AE0_EA23E0.s index 57efd36da9..62b7ec6576 100644 --- a/asm/nonmatchings/code_EA0C10/func_80241AE0_EA23E0.s +++ b/asm/nonmatchings/code_EA0C10/func_80241AE0_EA23E0.s @@ -61,7 +61,7 @@ glabel func_80241AE0_EA23E0 /* EA24BC 80241BBC 8E0200B0 */ lw $v0, 0xb0($s0) /* EA24C0 80241BC0 30420004 */ andi $v0, $v0, 4 /* EA24C4 80241BC4 10400011 */ beqz $v0, .L80241C0C -/* EA24C8 80241BC8 00000000 */ nop +/* EA24C8 80241BC8 00000000 */ nop /* EA24CC 80241BCC AE200070 */ sw $zero, 0x70($s1) .L80241BD0: /* EA24D0 80241BD0 A680008E */ sh $zero, 0x8e($s4) @@ -93,12 +93,12 @@ glabel func_80241AE0_EA23E0 /* EA2534 80241C34 10600013 */ beqz $v1, .L80241C84 /* EA2538 80241C38 0220202D */ daddu $a0, $s1, $zero /* EA253C 80241C3C 08090750 */ j .L80241D40 -/* EA2540 80241C40 00000000 */ nop +/* EA2540 80241C40 00000000 */ nop .L80241C44: /* EA2544 80241C44 10620018 */ beq $v1, $v0, .L80241CA8 /* EA2548 80241C48 0220202D */ daddu $a0, $s1, $zero /* EA254C 80241C4C 08090750 */ j .L80241D40 -/* EA2550 80241C50 00000000 */ nop +/* EA2550 80241C50 00000000 */ nop .L80241C54: /* EA2554 80241C54 2402000D */ addiu $v0, $zero, 0xd /* EA2558 80241C58 10620029 */ beq $v1, $v0, .L80241D00 @@ -109,9 +109,9 @@ glabel func_80241AE0_EA23E0 /* EA256C 80241C6C 1062002D */ beq $v1, $v0, .L80241D24 /* EA2570 80241C70 24020063 */ addiu $v0, $zero, 0x63 /* EA2574 80241C74 10620030 */ beq $v1, $v0, .L80241D38 -/* EA2578 80241C78 00000000 */ nop +/* EA2578 80241C78 00000000 */ nop /* EA257C 80241C7C 08090750 */ j .L80241D40 -/* EA2580 80241C80 00000000 */ nop +/* EA2580 80241C80 00000000 */ nop .L80241C84: /* EA2584 80241C84 0240282D */ daddu $a1, $s2, $zero /* EA2588 80241C88 0C090317 */ jal func_80240C5C_EA155C @@ -122,14 +122,14 @@ glabel func_80241AE0_EA23E0 /* EA2598 80241C98 0C090332 */ jal func_80240CC8_EA15C8 /* EA259C 80241C9C 0260302D */ daddu $a2, $s3, $zero /* EA25A0 80241CA0 08090750 */ j .L80241D40 -/* EA25A4 80241CA4 00000000 */ nop +/* EA25A4 80241CA4 00000000 */ nop .L80241CA8: /* EA25A8 80241CA8 0240282D */ daddu $a1, $s2, $zero /* EA25AC 80241CAC 0C090371 */ jal func_80240DC4_EA16C4 /* EA25B0 80241CB0 0260302D */ daddu $a2, $s3, $zero /* EA25B4 80241CB4 8E220070 */ lw $v0, 0x70($s1) /* EA25B8 80241CB8 14500021 */ bne $v0, $s0, .L80241D40 -/* EA25BC 80241CBC 00000000 */ nop +/* EA25BC 80241CBC 00000000 */ nop .L80241CC0: /* EA25C0 80241CC0 0220202D */ daddu $a0, $s1, $zero /* EA25C4 80241CC4 0240282D */ daddu $a1, $s2, $zero @@ -138,7 +138,7 @@ glabel func_80241AE0_EA23E0 /* EA25D0 80241CD0 8E230070 */ lw $v1, 0x70($s1) /* EA25D4 80241CD4 2402000C */ addiu $v0, $zero, 0xc /* EA25D8 80241CD8 14620019 */ bne $v1, $v0, .L80241D40 -/* EA25DC 80241CDC 00000000 */ nop +/* EA25DC 80241CDC 00000000 */ nop /* EA25E0 80241CE0 0220202D */ daddu $a0, $s1, $zero .L80241CE4: /* EA25E4 80241CE4 0240282D */ daddu $a1, $s2, $zero @@ -147,7 +147,7 @@ glabel func_80241AE0_EA23E0 /* EA25F0 80241CF0 8E230070 */ lw $v1, 0x70($s1) /* EA25F4 80241CF4 2402000D */ addiu $v0, $zero, 0xd /* EA25F8 80241CF8 14620011 */ bne $v1, $v0, .L80241D40 -/* EA25FC 80241CFC 00000000 */ nop +/* EA25FC 80241CFC 00000000 */ nop .L80241D00: /* EA2600 80241D00 0220202D */ daddu $a0, $s1, $zero /* EA2604 80241D04 0240282D */ daddu $a1, $s2, $zero @@ -156,14 +156,14 @@ glabel func_80241AE0_EA23E0 /* EA2610 80241D10 8E230070 */ lw $v1, 0x70($s1) /* EA2614 80241D14 2402000E */ addiu $v0, $zero, 0xe /* EA2618 80241D18 14620009 */ bne $v1, $v0, .L80241D40 -/* EA261C 80241D1C 00000000 */ nop +/* EA261C 80241D1C 00000000 */ nop /* EA2620 80241D20 0220202D */ daddu $a0, $s1, $zero .L80241D24: /* EA2624 80241D24 0240282D */ daddu $a1, $s2, $zero /* EA2628 80241D28 0C09067D */ jal func_802419F4_EA22F4 /* EA262C 80241D2C 0260302D */ daddu $a2, $s3, $zero /* EA2630 80241D30 08090750 */ j .L80241D40 -/* EA2634 80241D34 00000000 */ nop +/* EA2634 80241D34 00000000 */ nop .L80241D38: /* EA2638 80241D38 0C013AE3 */ jal func_8004EB8C /* EA263C 80241D3C 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/code_EA0C10/func_80241DE4_EA26E4.s b/asm/nonmatchings/code_EA0C10/func_80241DE4_EA26E4.s index 502a85d895..22825d3351 100644 --- a/asm/nonmatchings/code_EA0C10/func_80241DE4_EA26E4.s +++ b/asm/nonmatchings/code_EA0C10/func_80241DE4_EA26E4.s @@ -21,11 +21,11 @@ glabel func_80241DE4_EA26E4 /* EA2724 80241E24 A602008E */ sh $v0, 0x8e($s0) /* EA2728 80241E28 00021400 */ sll $v0, $v0, 0x10 /* EA272C 80241E2C 1C400033 */ bgtz $v0, .L80241EFC -/* EA2730 80241E30 00000000 */ nop +/* EA2730 80241E30 00000000 */ nop .L80241E34: /* EA2734 80241E34 8602008C */ lh $v0, 0x8c($s0) /* EA2738 80241E38 14400030 */ bnez $v0, .L80241EFC -/* EA273C 80241E3C 00000000 */ nop +/* EA273C 80241E3C 00000000 */ nop /* EA2740 80241E40 8E2200CC */ lw $v0, 0xcc($s1) /* EA2744 80241E44 8C420024 */ lw $v0, 0x24($v0) /* EA2748 80241E48 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_80241DE4_EA26E4 /* EA2754 80241E54 8E230088 */ lw $v1, 0x88($s1) /* EA2758 80241E58 24020005 */ addiu $v0, $zero, 5 /* EA275C 80241E5C 10620005 */ beq $v1, $v0, .L80241E74 -/* EA2760 80241E60 00000000 */ nop +/* EA2760 80241E60 00000000 */ nop /* EA2764 80241E64 10600003 */ beqz $v1, .L80241E74 /* EA2768 80241E68 24020001 */ addiu $v0, $zero, 1 /* EA276C 80241E6C 14620006 */ bne $v1, $v0, .L80241E88 -/* EA2770 80241E70 00000000 */ nop +/* EA2770 80241E70 00000000 */ nop .L80241E74: /* EA2774 80241E74 8E220084 */ lw $v0, 0x84($s1) /* EA2778 80241E78 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_80241DE4_EA26E4 /* EA27B8 80241EB8 46220000 */ add.d $f0, $f0, $f2 /* EA27BC 80241EBC 4620010D */ trunc.w.d $f4, $f0 /* EA27C0 80241EC0 44022000 */ mfc1 $v0, $f4 -/* EA27C4 80241EC4 00000000 */ nop +/* EA27C4 80241EC4 00000000 */ nop /* EA27C8 80241EC8 A602008E */ sh $v0, 0x8e($s0) /* EA27CC 80241ECC 00021400 */ sll $v0, $v0, 0x10 /* EA27D0 80241ED0 8E230078 */ lw $v1, 0x78($s1) /* EA27D4 80241ED4 00021403 */ sra $v0, $v0, 0x10 /* EA27D8 80241ED8 0043102A */ slt $v0, $v0, $v1 /* EA27DC 80241EDC 10400003 */ beqz $v0, .L80241EEC -/* EA27E0 80241EE0 00000000 */ nop +/* EA27E0 80241EE0 00000000 */ nop /* EA27E4 80241EE4 9622007A */ lhu $v0, 0x7a($s1) /* EA27E8 80241EE8 A602008E */ sh $v0, 0x8e($s0) .L80241EEC: diff --git a/asm/nonmatchings/code_EA0C10/func_80241F18_EA2818.s b/asm/nonmatchings/code_EA0C10/func_80241F18_EA2818.s index 1c60a2746a..9091844425 100644 --- a/asm/nonmatchings/code_EA0C10/func_80241F18_EA2818.s +++ b/asm/nonmatchings/code_EA0C10/func_80241F18_EA2818.s @@ -17,23 +17,23 @@ glabel func_80241F18_EA2818 /* EA2848 80241F48 8603008E */ lh $v1, 0x8e($s0) /* EA284C 80241F4C 2442FFFF */ addiu $v0, $v0, -1 /* EA2850 80241F50 14620012 */ bne $v1, $v0, .L80241F9C -/* EA2854 80241F54 00000000 */ nop +/* EA2854 80241F54 00000000 */ nop /* EA2858 80241F58 C6000038 */ lwc1 $f0, 0x38($s0) /* EA285C 80241F5C 4600020D */ trunc.w.s $f8, $f0 /* EA2860 80241F60 44024000 */ mfc1 $v0, $f8 -/* EA2864 80241F64 00000000 */ nop +/* EA2864 80241F64 00000000 */ nop /* EA2868 80241F68 A6220010 */ sh $v0, 0x10($s1) /* EA286C 80241F6C C600003C */ lwc1 $f0, 0x3c($s0) /* EA2870 80241F70 4600020D */ trunc.w.s $f8, $f0 /* EA2874 80241F74 44024000 */ mfc1 $v0, $f8 -/* EA2878 80241F78 00000000 */ nop +/* EA2878 80241F78 00000000 */ nop /* EA287C 80241F7C A6220012 */ sh $v0, 0x12($s1) /* EA2880 80241F80 C6000040 */ lwc1 $f0, 0x40($s0) /* EA2884 80241F84 24020001 */ addiu $v0, $zero, 1 /* EA2888 80241F88 A2220007 */ sb $v0, 7($s1) /* EA288C 80241F8C 4600020D */ trunc.w.s $f8, $f0 /* EA2890 80241F90 44024000 */ mfc1 $v0, $f8 -/* EA2894 80241F94 00000000 */ nop +/* EA2894 80241F94 00000000 */ nop /* EA2898 80241F98 A6220014 */ sh $v0, 0x14($s1) .L80241F9C: /* EA289C 80241F9C C6000038 */ lwc1 $f0, 0x38($s0) @@ -49,13 +49,13 @@ glabel func_80241F18_EA2818 /* EA28C4 80241FC4 860200A8 */ lh $v0, 0xa8($s0) /* EA28C8 80241FC8 27A50020 */ addiu $a1, $sp, 0x20 /* EA28CC 80241FCC 44820000 */ mtc1 $v0, $f0 -/* EA28D0 80241FD0 00000000 */ nop +/* EA28D0 80241FD0 00000000 */ nop /* EA28D4 80241FD4 46800020 */ cvt.s.w $f0, $f0 /* EA28D8 80241FD8 E7A00018 */ swc1 $f0, 0x18($sp) /* EA28DC 80241FDC 860200A6 */ lh $v0, 0xa6($s0) /* EA28E0 80241FE0 27A60024 */ addiu $a2, $sp, 0x24 /* EA28E4 80241FE4 44820000 */ mtc1 $v0, $f0 -/* EA28E8 80241FE8 00000000 */ nop +/* EA28E8 80241FE8 00000000 */ nop /* EA28EC 80241FEC 46800020 */ cvt.s.w $f0, $f0 /* EA28F0 80241FF0 E7A0001C */ swc1 $f0, 0x1c($sp) /* EA28F4 80241FF4 8E040080 */ lw $a0, 0x80($s0) @@ -63,7 +63,7 @@ glabel func_80241F18_EA2818 /* EA28FC 80241FFC 27A70028 */ addiu $a3, $sp, 0x28 /* EA2900 80242000 0040902D */ daddu $s2, $v0, $zero /* EA2904 80242004 16400005 */ bnez $s2, .L8024201C -/* EA2908 80242008 00000000 */ nop +/* EA2908 80242008 00000000 */ nop /* EA290C 8024200C 8E050018 */ lw $a1, 0x18($s0) /* EA2910 80242010 8E06000C */ lw $a2, 0xc($s0) /* EA2914 80242014 0C00F909 */ jal func_8003E424 @@ -76,9 +76,9 @@ glabel func_80241F18_EA2818 /* EA292C 8024202C A602008E */ sh $v0, 0x8e($s0) /* EA2930 80242030 00021400 */ sll $v0, $v0, 0x10 /* EA2934 80242034 18400003 */ blez $v0, .L80242044 -/* EA2938 80242038 00000000 */ nop +/* EA2938 80242038 00000000 */ nop /* EA293C 8024203C 12400008 */ beqz $s2, .L80242060 -/* EA2940 80242040 00000000 */ nop +/* EA2940 80242040 00000000 */ nop .L80242044: /* EA2944 80242044 8E2200CC */ lw $v0, 0xcc($s1) /* EA2948 80242048 A2200007 */ sb $zero, 7($s1) diff --git a/asm/nonmatchings/code_EA0C10/func_8024207C_EA297C.s b/asm/nonmatchings/code_EA0C10/func_8024207C_EA297C.s index e33cb54597..20178b5866 100644 --- a/asm/nonmatchings/code_EA0C10/func_8024207C_EA297C.s +++ b/asm/nonmatchings/code_EA0C10/func_8024207C_EA297C.s @@ -18,7 +18,7 @@ glabel func_8024207C_EA297C /* EA29B0 802420B0 00021400 */ sll $v0, $v0, 0x10 /* EA29B4 802420B4 00021403 */ sra $v0, $v0, 0x10 /* EA29B8 802420B8 14430003 */ bne $v0, $v1, .L802420C8 -/* EA29BC 802420BC 00000000 */ nop +/* EA29BC 802420BC 00000000 */ nop /* EA29C0 802420C0 96020086 */ lhu $v0, 0x86($s0) /* EA29C4 802420C4 A48200A8 */ sh $v0, 0xa8($a0) .L802420C8: @@ -26,7 +26,7 @@ glabel func_8024207C_EA297C /* EA29CC 802420CC 8E030080 */ lw $v1, 0x80($s0) /* EA29D0 802420D0 0043102A */ slt $v0, $v0, $v1 /* EA29D4 802420D4 14400004 */ bnez $v0, .L802420E8 -/* EA29D8 802420D8 00000000 */ nop +/* EA29D8 802420D8 00000000 */ nop /* EA29DC 802420DC 96020086 */ lhu $v0, 0x86($s0) /* EA29E0 802420E0 A48200A8 */ sh $v0, 0xa8($a0) /* EA29E4 802420E4 AE200070 */ sw $zero, 0x70($s1) diff --git a/asm/nonmatchings/code_EA0C10/func_802420FC_EA29FC.s b/asm/nonmatchings/code_EA0C10/func_802420FC_EA29FC.s index 9789a48d10..4d2d3894f7 100644 --- a/asm/nonmatchings/code_EA0C10/func_802420FC_EA29FC.s +++ b/asm/nonmatchings/code_EA0C10/func_802420FC_EA29FC.s @@ -66,7 +66,7 @@ glabel func_802420FC_EA29FC /* EA2AEC 802421EC 8E2200B0 */ lw $v0, 0xb0($s1) /* EA2AF0 802421F0 30420004 */ andi $v0, $v0, 4 /* EA2AF4 802421F4 10400047 */ beqz $v0, .L80242314 -/* EA2AF8 802421F8 00000000 */ nop +/* EA2AF8 802421F8 00000000 */ nop .L802421FC: /* EA2AFC 802421FC AE600070 */ sw $zero, 0x70($s3) /* EA2B00 80242200 A640008E */ sh $zero, 0x8e($s2) @@ -115,7 +115,7 @@ glabel func_802420FC_EA29FC /* EA2BA4 802422A4 24020028 */ addiu $v0, $zero, 0x28 /* EA2BA8 802422A8 AFA2001C */ sw $v0, 0x1c($sp) /* EA2BAC 802422AC 44833000 */ mtc1 $v1, $f6 -/* EA2BB0 802422B0 00000000 */ nop +/* EA2BB0 802422B0 00000000 */ nop /* EA2BB4 802422B4 468031A0 */ cvt.s.w $f6, $f6 /* EA2BB8 802422B8 44073000 */ mfc1 $a3, $f6 /* EA2BBC 802422BC 27A20048 */ addiu $v0, $sp, 0x48 @@ -170,14 +170,14 @@ glabel func_802420FC_EA29FC /* EA2C74 80242374 10600015 */ beqz $v1, .L802423CC /* EA2C78 80242378 0260202D */ daddu $a0, $s3, $zero /* EA2C7C 8024237C 08090935 */ j .L802424D4 -/* EA2C80 80242380 00000000 */ nop +/* EA2C80 80242380 00000000 */ nop .L80242384: /* EA2C84 80242384 1062001C */ beq $v1, $v0, .L802423F8 /* EA2C88 80242388 24020003 */ addiu $v0, $zero, 3 /* EA2C8C 8024238C 10620035 */ beq $v1, $v0, .L80242464 /* EA2C90 80242390 0260202D */ daddu $a0, $s3, $zero /* EA2C94 80242394 08090935 */ j .L802424D4 -/* EA2C98 80242398 00000000 */ nop +/* EA2C98 80242398 00000000 */ nop .L8024239C: /* EA2C9C 8024239C 2402000E */ addiu $v0, $zero, 0xe /* EA2CA0 802423A0 1062003F */ beq $v1, $v0, .L802424A0 @@ -188,9 +188,9 @@ glabel func_802420FC_EA29FC /* EA2CB4 802423B4 10620040 */ beq $v1, $v0, .L802424B8 /* EA2CB8 802423B8 24020063 */ addiu $v0, $zero, 0x63 /* EA2CBC 802423BC 10620043 */ beq $v1, $v0, .L802424CC -/* EA2CC0 802423C0 00000000 */ nop +/* EA2CC0 802423C0 00000000 */ nop /* EA2CC4 802423C4 08090935 */ j .L802424D4 -/* EA2CC8 802423C8 00000000 */ nop +/* EA2CC8 802423C8 00000000 */ nop .L802423CC: /* EA2CCC 802423CC 0280282D */ daddu $a1, $s4, $zero /* EA2CD0 802423D0 0C013670 */ jal func_8004D9C0 @@ -203,7 +203,7 @@ glabel func_802420FC_EA29FC /* EA2CE8 802423E8 0C0136B6 */ jal func_8004DAD8 /* EA2CEC 802423EC 02A0302D */ daddu $a2, $s5, $zero /* EA2CF0 802423F0 08090935 */ j .L802424D4 -/* EA2CF4 802423F4 00000000 */ nop +/* EA2CF4 802423F4 00000000 */ nop .L802423F8: /* EA2CF8 802423F8 0260202D */ daddu $a0, $s3, $zero /* EA2CFC 802423FC 0280282D */ daddu $a1, $s4, $zero @@ -239,7 +239,7 @@ glabel func_802420FC_EA29FC /* EA2D68 80242468 0C013809 */ jal func_8004E024 /* EA2D6C 8024246C 02A0302D */ daddu $a2, $s5, $zero /* EA2D70 80242470 08090935 */ j .L802424D4 -/* EA2D74 80242474 00000000 */ nop +/* EA2D74 80242474 00000000 */ nop .L80242478: /* EA2D78 80242478 0260202D */ daddu $a0, $s3, $zero /* EA2D7C 8024247C 0280282D */ daddu $a1, $s4, $zero @@ -251,20 +251,20 @@ glabel func_802420FC_EA29FC /* EA2D90 80242490 0C090779 */ jal func_80241DE4_EA26E4 /* EA2D94 80242494 02A0302D */ daddu $a2, $s5, $zero /* EA2D98 80242498 08090935 */ j .L802424D4 -/* EA2D9C 8024249C 00000000 */ nop +/* EA2D9C 8024249C 00000000 */ nop .L802424A0: /* EA2DA0 802424A0 0260202D */ daddu $a0, $s3, $zero /* EA2DA4 802424A4 0280282D */ daddu $a1, $s4, $zero /* EA2DA8 802424A8 0C0907C6 */ jal func_80241F18_EA2818 /* EA2DAC 802424AC 02A0302D */ daddu $a2, $s5, $zero /* EA2DB0 802424B0 08090935 */ j .L802424D4 -/* EA2DB4 802424B4 00000000 */ nop +/* EA2DB4 802424B4 00000000 */ nop .L802424B8: /* EA2DB8 802424B8 0280282D */ daddu $a1, $s4, $zero /* EA2DBC 802424BC 0C09081F */ jal func_8024207C_EA297C /* EA2DC0 802424C0 02A0302D */ daddu $a2, $s5, $zero /* EA2DC4 802424C4 08090935 */ j .L802424D4 -/* EA2DC8 802424C8 00000000 */ nop +/* EA2DC8 802424C8 00000000 */ nop .L802424CC: /* EA2DCC 802424CC 0C013AE3 */ jal func_8004EB8C /* EA2DD0 802424D0 0260202D */ daddu $a0, $s3, $zero @@ -290,15 +290,17 @@ glabel func_802420FC_EA29FC /* EA2E14 80242514 2C620015 */ sltiu $v0, $v1, 0x15 /* EA2E18 80242518 10400009 */ beqz $v0, .L80242540 /* EA2E1C 8024251C 00031080 */ sll $v0, $v1, 2 -/* EA2E20 80242520 3C018024 */ lui $at, %hi(D_80246650) +/* EA2E20 80242520 3C018024 */ lui $at, %hi(jtbl_80246650_EA6F50) /* EA2E24 80242524 00220821 */ addu $at, $at, $v0 -/* EA2E28 80242528 8C226650 */ lw $v0, %lo(D_80246650)($at) +/* EA2E28 80242528 8C226650 */ lw $v0, %lo(jtbl_80246650_EA6F50)($at) /* EA2E2C 8024252C 00400008 */ jr $v0 -/* EA2E30 80242530 00000000 */ nop +/* EA2E30 80242530 00000000 */ nop +glabel L80242534_EA2E34 /* EA2E34 80242534 8E420028 */ lw $v0, 0x28($s2) /* EA2E38 80242538 24420001 */ addiu $v0, $v0, 1 /* EA2E3C 8024253C AE420028 */ sw $v0, 0x28($s2) .L80242540: +glabel L80242540_EA2E40 /* EA2E40 80242540 0000102D */ daddu $v0, $zero, $zero .L80242544: /* EA2E44 80242544 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/code_EA0C10/func_80242568_EA2E68.s b/asm/nonmatchings/code_EA0C10/func_80242568_EA2E68.s index 78f9d3e50b..db18e06184 100644 --- a/asm/nonmatchings/code_EA0C10/func_80242568_EA2E68.s +++ b/asm/nonmatchings/code_EA0C10/func_80242568_EA2E68.s @@ -11,7 +11,7 @@ glabel func_80242568_EA2E68 /* EA2E80 80242580 C462003C */ lwc1 $f2, 0x3c($v1) /* EA2E84 80242584 906400A9 */ lbu $a0, 0xa9($v1) /* EA2E88 80242588 44820000 */ mtc1 $v0, $f0 -/* EA2E8C 8024258C 00000000 */ nop +/* EA2E8C 8024258C 00000000 */ nop /* EA2E90 80242590 46800020 */ cvt.s.w $f0, $f0 /* EA2E94 80242594 46001081 */ sub.s $f2, $f2, $f0 /* EA2E98 80242598 A06400AB */ sb $a0, 0xab($v1) diff --git a/asm/nonmatchings/code_EA0C10/func_802425B0_EA2EB0.s b/asm/nonmatchings/code_EA0C10/func_802425B0_EA2EB0.s index 121028c538..5ff3d766ca 100644 --- a/asm/nonmatchings/code_EA0C10/func_802425B0_EA2EB0.s +++ b/asm/nonmatchings/code_EA0C10/func_802425B0_EA2EB0.s @@ -15,9 +15,9 @@ glabel func_802425B0_EA2EB0 /* EA2ED8 802425D8 8C670030 */ lw $a3, 0x30($v1) /* EA2EDC 802425DC 3C014248 */ lui $at, 0x4248 /* EA2EE0 802425E0 44811000 */ mtc1 $at, $f2 -/* EA2EE4 802425E4 00000000 */ nop +/* EA2EE4 802425E4 00000000 */ nop /* EA2EE8 802425E8 4602003C */ c.lt.s $f0, $f2 -/* EA2EEC 802425EC 00000000 */ nop +/* EA2EEC 802425EC 00000000 */ nop /* EA2EF0 802425F0 45010002 */ bc1t .L802425FC /* EA2EF4 802425F4 24020002 */ addiu $v0, $zero, 2 /* EA2EF8 802425F8 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_EA0C10/func_8024267C_EA2F7C.s b/asm/nonmatchings/code_EA0C10/func_8024267C_EA2F7C.s index e38d8d9966..d965d6f8a4 100644 --- a/asm/nonmatchings/code_EA0C10/func_8024267C_EA2F7C.s +++ b/asm/nonmatchings/code_EA0C10/func_8024267C_EA2F7C.s @@ -26,7 +26,7 @@ glabel func_8024267C_EA2F7C /* EA2FCC 802426CC 1440FFFA */ bnez $v0, .L802426B8 /* EA2FD0 802426D0 24A50004 */ addiu $a1, $a1, 4 /* EA2FD4 802426D4 080909C6 */ j .L80242718 -/* EA2FD8 802426D8 00000000 */ nop +/* EA2FD8 802426D8 00000000 */ nop .L802426DC: /* EA2FDC 802426DC 0000182D */ daddu $v1, $zero, $zero /* EA2FE0 802426E0 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/code_EA0C10/func_80242794_EA3094.s b/asm/nonmatchings/code_EA0C10/func_80242794_EA3094.s index b434d2780d..1e3405f7f4 100644 --- a/asm/nonmatchings/code_EA0C10/func_80242794_EA3094.s +++ b/asm/nonmatchings/code_EA0C10/func_80242794_EA3094.s @@ -14,7 +14,7 @@ glabel func_80242794_EA3094 /* EA30B8 802427B8 0C00F94D */ jal func_8003E534 /* EA30BC 802427BC 0040202D */ daddu $a0, $v0, $zero /* EA30C0 802427C0 10400005 */ beqz $v0, .L802427D8 -/* EA30C4 802427C4 00000000 */ nop +/* EA30C4 802427C4 00000000 */ nop /* EA30C8 802427C8 8E050000 */ lw $a1, ($s0) /* EA30CC 802427CC 844600A8 */ lh $a2, 0xa8($v0) /* EA30D0 802427D0 0C0B551A */ jal func_802D5468 diff --git a/asm/nonmatchings/code_EA0C10/func_802427F0_EA30F0.s b/asm/nonmatchings/code_EA0C10/func_802427F0_EA30F0.s index 921eac345a..c3203b7365 100644 --- a/asm/nonmatchings/code_EA0C10/func_802427F0_EA30F0.s +++ b/asm/nonmatchings/code_EA0C10/func_802427F0_EA30F0.s @@ -21,7 +21,7 @@ glabel func_802427F0_EA30F0 /* EA3130 80242830 0C0B53A3 */ jal func_802D4E8C /* EA3134 80242834 0260282D */ daddu $a1, $s3, $zero /* EA3138 80242838 4482E000 */ mtc1 $v0, $f28 -/* EA313C 8024283C 00000000 */ nop +/* EA313C 8024283C 00000000 */ nop /* EA3140 80242840 4680E720 */ cvt.s.w $f28, $f28 /* EA3144 80242844 8E140000 */ lw $s4, ($s0) /* EA3148 80242848 26100004 */ addiu $s0, $s0, 4 @@ -29,14 +29,14 @@ glabel func_802427F0_EA30F0 /* EA3150 80242850 0C0B53A3 */ jal func_802D4E8C /* EA3154 80242854 0280282D */ daddu $a1, $s4, $zero /* EA3158 80242858 4482D000 */ mtc1 $v0, $f26 -/* EA315C 8024285C 00000000 */ nop +/* EA315C 8024285C 00000000 */ nop /* EA3160 80242860 4680D6A0 */ cvt.s.w $f26, $f26 /* EA3164 80242864 8E100000 */ lw $s0, ($s0) /* EA3168 80242868 0220202D */ daddu $a0, $s1, $zero /* EA316C 8024286C 0C0B53A3 */ jal func_802D4E8C /* EA3170 80242870 0200282D */ daddu $a1, $s0, $zero /* EA3174 80242874 4482C000 */ mtc1 $v0, $f24 -/* EA3178 80242878 00000000 */ nop +/* EA3178 80242878 00000000 */ nop /* EA317C 8024287C 4680C620 */ cvt.s.w $f24, $f24 /* EA3180 80242880 3C128011 */ lui $s2, %hi(D_80117578) /* EA3184 80242884 26527578 */ addiu $s2, $s2, %lo(D_80117578) @@ -56,7 +56,7 @@ glabel func_802427F0_EA30F0 /* EA31BC 802428BC 00220821 */ addu $at, $at, $v0 /* EA31C0 802428C0 C4368DEC */ lwc1 $f22, %lo(D_800B8DEC)($at) /* EA31C4 802428C4 45000005 */ bc1f .L802428DC -/* EA31C8 802428C8 00000000 */ nop +/* EA31C8 802428C8 00000000 */ nop /* EA31CC 802428CC 3C0142C8 */ lui $at, 0x42c8 /* EA31D0 802428D0 44810000 */ mtc1 $at, $f0 /* EA31D4 802428D4 08090A3B */ j .L802428EC @@ -64,7 +64,7 @@ glabel func_802427F0_EA30F0 .L802428DC: /* EA31DC 802428DC 3C0142C8 */ lui $at, 0x42c8 /* EA31E0 802428E0 44810000 */ mtc1 $at, $f0 -/* EA31E4 802428E4 00000000 */ nop +/* EA31E4 802428E4 00000000 */ nop /* EA31E8 802428E8 4600B580 */ add.s $f22, $f22, $f0 .L802428EC: /* EA31EC 802428EC 0C00AB85 */ jal func_8002AE14 @@ -75,21 +75,21 @@ glabel func_802427F0_EA30F0 /* EA3200 80242900 0C00AD77 */ jal func_8002B5DC /* EA3204 80242904 4600B306 */ mov.s $f12, $f22 /* EA3208 80242908 46140002 */ mul.s $f0, $f0, $f20 -/* EA320C 8024290C 00000000 */ nop +/* EA320C 8024290C 00000000 */ nop /* EA3210 80242910 864200B0 */ lh $v0, 0xb0($s2) /* EA3214 80242914 3C013F00 */ lui $at, 0x3f00 /* EA3218 80242918 44812000 */ mtc1 $at, $f4 /* EA321C 8024291C 44821000 */ mtc1 $v0, $f2 -/* EA3220 80242920 00000000 */ nop +/* EA3220 80242920 00000000 */ nop /* EA3224 80242924 468010A0 */ cvt.s.w $f2, $f2 /* EA3228 80242928 46041082 */ mul.s $f2, $f2, $f4 -/* EA322C 8024292C 00000000 */ nop +/* EA322C 8024292C 00000000 */ nop /* EA3230 80242930 4600E700 */ add.s $f28, $f28, $f0 /* EA3234 80242934 4602D680 */ add.s $f26, $f26, $f2 /* EA3238 80242938 0C00AD90 */ jal func_8002B640 /* EA323C 8024293C 4600B306 */ mov.s $f12, $f22 /* EA3240 80242940 46140002 */ mul.s $f0, $f0, $f20 -/* EA3244 80242944 00000000 */ nop +/* EA3244 80242944 00000000 */ nop /* EA3248 80242948 0220202D */ daddu $a0, $s1, $zero /* EA324C 8024294C 0260282D */ daddu $a1, $s3, $zero /* EA3250 80242950 4600E18D */ trunc.w.s $f6, $f28 diff --git a/asm/nonmatchings/code_EA0C10/func_80242A4C_EA334C.s b/asm/nonmatchings/code_EA0C10/func_80242A4C_EA334C.s index 15cd9086b4..725d6ac1be 100644 --- a/asm/nonmatchings/code_EA0C10/func_80242A4C_EA334C.s +++ b/asm/nonmatchings/code_EA0C10/func_80242A4C_EA334C.s @@ -28,7 +28,7 @@ glabel func_80242A4C_EA334C /* EA33A0 80242AA0 00220821 */ addu $at, $at, $v0 /* EA33A4 80242AA4 AC2066D0 */ sw $zero, %lo(D_802466D0)($at) /* EA33A8 80242AA8 08090AB6 */ j .L80242AD8 -/* EA33AC 80242AAC 00000000 */ nop +/* EA33AC 80242AAC 00000000 */ nop .L80242AB0: /* EA33B0 80242AB0 3C038024 */ lui $v1, %hi(D_802466D0) /* EA33B4 80242AB4 246366D0 */ addiu $v1, $v1, %lo(D_802466D0) diff --git a/asm/nonmatchings/code_EA0C10/func_80242BD8_EA34D8.s b/asm/nonmatchings/code_EA0C10/func_80242BD8_EA34D8.s index b5eaaba8c6..9822510d21 100644 --- a/asm/nonmatchings/code_EA0C10/func_80242BD8_EA34D8.s +++ b/asm/nonmatchings/code_EA0C10/func_80242BD8_EA34D8.s @@ -20,7 +20,7 @@ glabel func_80242BD8_EA34D8 /* EA3514 80242C14 0C0B53A3 */ jal func_802D4E8C /* EA3518 80242C18 02C0282D */ daddu $a1, $s6, $zero /* EA351C 80242C1C 44820000 */ mtc1 $v0, $f0 -/* EA3520 80242C20 00000000 */ nop +/* EA3520 80242C20 00000000 */ nop /* EA3524 80242C24 46800020 */ cvt.s.w $f0, $f0 /* EA3528 80242C28 E7A00010 */ swc1 $f0, 0x10($sp) /* EA352C 80242C2C 8E140000 */ lw $s4, ($s0) @@ -31,13 +31,13 @@ glabel func_80242BD8_EA34D8 /* EA3540 80242C40 0220202D */ daddu $a0, $s1, $zero /* EA3544 80242C44 8E150000 */ lw $s5, ($s0) /* EA3548 80242C48 4482B000 */ mtc1 $v0, $f22 -/* EA354C 80242C4C 00000000 */ nop +/* EA354C 80242C4C 00000000 */ nop /* EA3550 80242C50 4680B5A0 */ cvt.s.w $f22, $f22 /* EA3554 80242C54 0C0B53A3 */ jal func_802D4E8C /* EA3558 80242C58 02A0282D */ daddu $a1, $s5, $zero /* EA355C 80242C5C 2404FFFC */ addiu $a0, $zero, -4 /* EA3560 80242C60 44820000 */ mtc1 $v0, $f0 -/* EA3564 80242C64 00000000 */ nop +/* EA3564 80242C64 00000000 */ nop /* EA3568 80242C68 46800020 */ cvt.s.w $f0, $f0 /* EA356C 80242C6C 0C00F92F */ jal func_8003E4BC /* EA3570 80242C70 E7A00014 */ swc1 $f0, 0x14($sp) diff --git a/asm/nonmatchings/code_EA0C10/func_80242DA8_EA36A8.s b/asm/nonmatchings/code_EA0C10/func_80242DA8_EA36A8.s index ca33f84d79..d841ec7da5 100644 --- a/asm/nonmatchings/code_EA0C10/func_80242DA8_EA36A8.s +++ b/asm/nonmatchings/code_EA0C10/func_80242DA8_EA36A8.s @@ -13,6 +13,6 @@ glabel func_80242DA8_EA36A8 /* EA36C8 80242DC8 24020002 */ addiu $v0, $zero, 2 /* EA36CC 80242DCC 03E00008 */ jr $ra /* EA36D0 80242DD0 27BD0018 */ addiu $sp, $sp, 0x18 -/* EA36D4 80242DD4 00000000 */ nop -/* EA36D8 80242DD8 00000000 */ nop -/* EA36DC 80242DDC 00000000 */ nop +/* EA36D4 80242DD4 00000000 */ nop +/* EA36D8 80242DD8 00000000 */ nop +/* EA36DC 80242DDC 00000000 */ nop diff --git a/asm/nonmatchings/code_EA36E0/func_80242E2C_EA372C.s b/asm/nonmatchings/code_EA36E0/func_80242E2C_EA372C.s index 38689fd1ed..51a7c39e44 100644 --- a/asm/nonmatchings/code_EA36E0/func_80242E2C_EA372C.s +++ b/asm/nonmatchings/code_EA36E0/func_80242E2C_EA372C.s @@ -24,11 +24,11 @@ glabel func_80242E2C_EA372C /* EA3778 80242E78 0C03908F */ jal func_800E423C /* EA377C 80242E7C AFA20010 */ sw $v0, 0x10($sp) /* EA3780 80242E80 1040000B */ beqz $v0, .L80242EB0 -/* EA3784 80242E84 00000000 */ nop +/* EA3784 80242E84 00000000 */ nop /* EA3788 80242E88 C7A2001C */ lwc1 $f2, 0x1c($sp) /* EA378C 80242E8C 3C01425C */ lui $at, 0x425c /* EA3790 80242E90 44810000 */ mtc1 $at, $f0 -/* EA3794 80242E94 00000000 */ nop +/* EA3794 80242E94 00000000 */ nop /* EA3798 80242E98 46001080 */ add.s $f2, $f2, $f0 /* EA379C 80242E9C C7A00018 */ lwc1 $f0, 0x18($sp) /* EA37A0 80242EA0 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/nonmatchings/code_EA36E0/func_80242EC4_EA37C4.s b/asm/nonmatchings/code_EA36E0/func_80242EC4_EA37C4.s index dd9de03225..c2e56ab553 100644 --- a/asm/nonmatchings/code_EA36E0/func_80242EC4_EA37C4.s +++ b/asm/nonmatchings/code_EA36E0/func_80242EC4_EA37C4.s @@ -13,28 +13,28 @@ glabel func_80242EC4_EA37C4 /* EA37E4 80242EE4 468010A0 */ cvt.s.w $f2, $f2 /* EA37E8 80242EE8 46001081 */ sub.s $f2, $f2, $f0 /* EA37EC 80242EEC 46021082 */ mul.s $f2, $f2, $f2 -/* EA37F0 80242EF0 00000000 */ nop +/* EA37F0 80242EF0 00000000 */ nop /* EA37F4 80242EF4 C440002C */ lwc1 $f0, 0x2c($v0) /* EA37F8 80242EF8 C604008C */ lwc1 $f4, 0x8c($s0) /* EA37FC 80242EFC 46802120 */ cvt.s.w $f4, $f4 /* EA3800 80242F00 46002101 */ sub.s $f4, $f4, $f0 /* EA3804 80242F04 46042102 */ mul.s $f4, $f4, $f4 -/* EA3808 80242F08 00000000 */ nop +/* EA3808 80242F08 00000000 */ nop /* EA380C 80242F0C C4460030 */ lwc1 $f6, 0x30($v0) /* EA3810 80242F10 44800000 */ mtc1 $zero, $f0 -/* EA3814 80242F14 00000000 */ nop +/* EA3814 80242F14 00000000 */ nop /* EA3818 80242F18 46060001 */ sub.s $f0, $f0, $f6 /* EA381C 80242F1C 46000002 */ mul.s $f0, $f0, $f0 -/* EA3820 80242F20 00000000 */ nop +/* EA3820 80242F20 00000000 */ nop /* EA3824 80242F24 46041080 */ add.s $f2, $f2, $f4 /* EA3828 80242F28 46001300 */ add.s $f12, $f2, $f0 /* EA382C 80242F2C 46006004 */ sqrt.s $f0, $f12 /* EA3830 80242F30 46000032 */ c.eq.s $f0, $f0 -/* EA3834 80242F34 00000000 */ nop +/* EA3834 80242F34 00000000 */ nop /* EA3838 80242F38 45010003 */ bc1t .L80242F48 -/* EA383C 80242F3C 00000000 */ nop +/* EA383C 80242F3C 00000000 */ nop /* EA3840 80242F40 0C019C10 */ jal func_80067040 -/* EA3844 80242F44 00000000 */ nop +/* EA3844 80242F44 00000000 */ nop .L80242F48: /* EA3848 80242F48 4600020D */ trunc.w.s $f8, $f0 /* EA384C 80242F4C E6080094 */ swc1 $f8, 0x94($s0) diff --git a/asm/nonmatchings/code_EA36E0/func_80242F64_EA3864.s b/asm/nonmatchings/code_EA36E0/func_80242F64_EA3864.s index 8ea66e07ad..cd2d23894f 100644 --- a/asm/nonmatchings/code_EA36E0/func_80242F64_EA3864.s +++ b/asm/nonmatchings/code_EA36E0/func_80242F64_EA3864.s @@ -8,7 +8,7 @@ glabel func_80242F64_EA3864 /* EA3870 80242F70 0C0B53A3 */ jal func_802D4E8C /* EA3874 80242F74 8C450000 */ lw $a1, ($v0) /* EA3878 80242F78 44820000 */ mtc1 $v0, $f0 -/* EA387C 80242F7C 00000000 */ nop +/* EA387C 80242F7C 00000000 */ nop /* EA3880 80242F80 46800020 */ cvt.s.w $f0, $f0 /* EA3884 80242F84 8FBF0010 */ lw $ra, 0x10($sp) /* EA3888 80242F88 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_EA36E0/func_80242F9C_EA389C.s b/asm/nonmatchings/code_EA36E0/func_80242F9C_EA389C.s index 38cc553c6a..83ecf129fa 100644 --- a/asm/nonmatchings/code_EA36E0/func_80242F9C_EA389C.s +++ b/asm/nonmatchings/code_EA36E0/func_80242F9C_EA389C.s @@ -21,7 +21,7 @@ glabel func_80242F9C_EA389C /* EA38DC 80242FDC 44801000 */ mtc1 $zero, $f2 /* EA38E0 80242FE0 46000021 */ cvt.d.s $f0, $f0 /* EA38E4 80242FE4 46220002 */ mul.d $f0, $f0, $f2 -/* EA38E8 80242FE8 00000000 */ nop +/* EA38E8 80242FE8 00000000 */ nop /* EA38EC 80242FEC C60C0090 */ lwc1 $f12, 0x90($s0) /* EA38F0 80242FF0 46806320 */ cvt.s.w $f12, $f12 /* EA38F4 80242FF4 46006307 */ neg.s $f12, $f12 @@ -39,7 +39,7 @@ glabel func_80242F9C_EA389C /* EA3924 80243024 44801000 */ mtc1 $zero, $f2 /* EA3928 80243028 46000021 */ cvt.d.s $f0, $f0 /* EA392C 8024302C 46220002 */ mul.d $f0, $f0, $f2 -/* EA3930 80243030 00000000 */ nop +/* EA3930 80243030 00000000 */ nop /* EA3934 80243034 4620010D */ trunc.w.d $f4, $f0 /* EA3938 80243038 E604009C */ swc1 $f4, 0x9c($s0) /* EA393C 8024303C 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/code_EA36E0/func_80243054_EA3954.s b/asm/nonmatchings/code_EA36E0/func_80243054_EA3954.s index d2141ff614..a2bef4ce3b 100644 --- a/asm/nonmatchings/code_EA36E0/func_80243054_EA3954.s +++ b/asm/nonmatchings/code_EA36E0/func_80243054_EA3954.s @@ -13,7 +13,7 @@ glabel func_80243054_EA3954 /* EA3974 80243074 46201081 */ sub.d $f2, $f2, $f0 /* EA3978 80243078 462010A0 */ cvt.s.d $f2, $f2 /* EA397C 8024307C 46021082 */ mul.s $f2, $f2, $f2 -/* EA3980 80243080 00000000 */ nop +/* EA3980 80243080 00000000 */ nop /* EA3984 80243084 3C018024 */ lui $at, %hi(D_802466C8) /* EA3988 80243088 D42066C8 */ ldc1 $f0, %lo(D_802466C8)($at) /* EA398C 8024308C C604008C */ lwc1 $f4, 0x8c($s0) @@ -21,15 +21,15 @@ glabel func_80243054_EA3954 /* EA3994 80243094 46240001 */ sub.d $f0, $f0, $f4 /* EA3998 80243098 46200020 */ cvt.s.d $f0, $f0 /* EA399C 8024309C 46000002 */ mul.s $f0, $f0, $f0 -/* EA39A0 802430A0 00000000 */ nop +/* EA39A0 802430A0 00000000 */ nop /* EA39A4 802430A4 46001300 */ add.s $f12, $f2, $f0 /* EA39A8 802430A8 46006004 */ sqrt.s $f0, $f12 /* EA39AC 802430AC 46000032 */ c.eq.s $f0, $f0 -/* EA39B0 802430B0 00000000 */ nop +/* EA39B0 802430B0 00000000 */ nop /* EA39B4 802430B4 45030004 */ bc1tl .L802430C8 /* EA39B8 802430B8 46000007 */ neg.s $f0, $f0 /* EA39BC 802430BC 0C019C10 */ jal func_80067040 -/* EA39C0 802430C0 00000000 */ nop +/* EA39C0 802430C0 00000000 */ nop /* EA39C4 802430C4 46000007 */ neg.s $f0, $f0 .L802430C8: /* EA39C8 802430C8 4600018D */ trunc.w.s $f6, $f0 diff --git a/asm/nonmatchings/code_EA36E0/func_802430E4_EA39E4.s b/asm/nonmatchings/code_EA36E0/func_802430E4_EA39E4.s index 4f2898a77f..bba8ef7684 100644 --- a/asm/nonmatchings/code_EA36E0/func_802430E4_EA39E4.s +++ b/asm/nonmatchings/code_EA36E0/func_802430E4_EA39E4.s @@ -29,7 +29,7 @@ glabel func_802430E4_EA39E4 /* EA3A44 80243144 44060000 */ mfc1 $a2, $f0 /* EA3A48 80243148 44071000 */ mfc1 $a3, $f2 /* EA3A4C 8024314C 44820000 */ mtc1 $v0, $f0 -/* EA3A50 80243150 00000000 */ nop +/* EA3A50 80243150 00000000 */ nop /* EA3A54 80243154 46800020 */ cvt.s.w $f0, $f0 /* EA3A58 80243158 AE220078 */ sw $v0, 0x78($s1) /* EA3A5C 8024315C 0C055C13 */ jal func_8015704C @@ -40,4 +40,4 @@ glabel func_802430E4_EA39E4 /* EA3A70 80243170 24020002 */ addiu $v0, $zero, 2 /* EA3A74 80243174 03E00008 */ jr $ra /* EA3A78 80243178 27BD0028 */ addiu $sp, $sp, 0x28 -/* EA3A7C 8024317C 00000000 */ nop +/* EA3A7C 8024317C 00000000 */ nop diff --git a/asm/nonmatchings/code_EA7010/func_80240164_EA7134.s b/asm/nonmatchings/code_EA7010/func_80240164_EA7134.s index 87b9a770e7..2555f05f61 100644 --- a/asm/nonmatchings/code_EA7010/func_80240164_EA7134.s +++ b/asm/nonmatchings/code_EA7010/func_80240164_EA7134.s @@ -14,7 +14,7 @@ glabel func_80240164_EA7134 .L80240188: /* EA7158 80240188 8E020070 */ lw $v0, 0x70($s0) /* EA715C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* EA7160 80240190 00000000 */ nop +/* EA7160 80240190 00000000 */ nop /* EA7164 80240194 8E0300A8 */ lw $v1, 0xa8($s0) /* EA7168 80240198 8E020088 */ lw $v0, 0x88($s0) /* EA716C 8024019C 00621821 */ addu $v1, $v1, $v0 @@ -33,7 +33,7 @@ glabel func_80240164_EA7134 .L802401C8: /* EA7198 802401C8 8E020074 */ lw $v0, 0x74($s0) /* EA719C 802401CC 1440000E */ bnez $v0, .L80240208 -/* EA71A0 802401D0 00000000 */ nop +/* EA71A0 802401D0 00000000 */ nop /* EA71A4 802401D4 8E0300AC */ lw $v1, 0xac($s0) /* EA71A8 802401D8 8E02008C */ lw $v0, 0x8c($s0) /* EA71AC 802401DC 00621821 */ addu $v1, $v1, $v0 @@ -52,7 +52,7 @@ glabel func_80240164_EA7134 .L80240208: /* EA71D8 80240208 8E020078 */ lw $v0, 0x78($s0) /* EA71DC 8024020C 1440000E */ bnez $v0, .L80240248 -/* EA71E0 80240210 00000000 */ nop +/* EA71E0 80240210 00000000 */ nop /* EA71E4 80240214 8E0300B0 */ lw $v1, 0xb0($s0) /* EA71E8 80240218 8E020090 */ lw $v0, 0x90($s0) /* EA71EC 8024021C 00621821 */ addu $v1, $v1, $v0 @@ -71,7 +71,7 @@ glabel func_80240164_EA7134 .L80240248: /* EA7218 80240248 8E02007C */ lw $v0, 0x7c($s0) /* EA721C 8024024C 1440000E */ bnez $v0, .L80240288 -/* EA7220 80240250 00000000 */ nop +/* EA7220 80240250 00000000 */ nop /* EA7224 80240254 8E0300B4 */ lw $v1, 0xb4($s0) /* EA7228 80240258 8E020094 */ lw $v0, 0x94($s0) /* EA722C 8024025C 00621821 */ addu $v1, $v1, $v0 @@ -141,4 +141,4 @@ glabel func_80240164_EA7134 /* EA7310 80240340 0000102D */ daddu $v0, $zero, $zero /* EA7314 80240344 03E00008 */ jr $ra /* EA7318 80240348 27BD0018 */ addiu $sp, $sp, 0x18 -/* EA731C 8024034C 00000000 */ nop +/* EA731C 8024034C 00000000 */ nop diff --git a/asm/nonmatchings/code_EA7320/func_80240388_EA7358.s b/asm/nonmatchings/code_EA7320/func_80240388_EA7358.s index 801dddddbb..de0ef0dc9c 100644 --- a/asm/nonmatchings/code_EA7320/func_80240388_EA7358.s +++ b/asm/nonmatchings/code_EA7320/func_80240388_EA7358.s @@ -13,6 +13,6 @@ glabel func_80240388_EA7358 /* EA7378 802403A8 24020002 */ addiu $v0, $zero, 2 /* EA737C 802403AC 03E00008 */ jr $ra /* EA7380 802403B0 27BD0018 */ addiu $sp, $sp, 0x18 -/* EA7384 802403B4 00000000 */ nop -/* EA7388 802403B8 00000000 */ nop -/* EA738C 802403BC 00000000 */ nop +/* EA7384 802403B4 00000000 */ nop +/* EA7388 802403B8 00000000 */ nop +/* EA738C 802403BC 00000000 */ nop diff --git a/asm/nonmatchings/code_EA8AE0/func_80240124_EA8C04.s b/asm/nonmatchings/code_EA8AE0/func_80240124_EA8C04.s index 53bcd20291..56944dc4b0 100644 --- a/asm/nonmatchings/code_EA8AE0/func_80240124_EA8C04.s +++ b/asm/nonmatchings/code_EA8AE0/func_80240124_EA8C04.s @@ -14,7 +14,7 @@ glabel func_80240124_EA8C04 .L80240148: /* EA8C28 80240148 8E020070 */ lw $v0, 0x70($s0) /* EA8C2C 8024014C 1440000E */ bnez $v0, .L80240188 -/* EA8C30 80240150 00000000 */ nop +/* EA8C30 80240150 00000000 */ nop /* EA8C34 80240154 8E0300A8 */ lw $v1, 0xa8($s0) /* EA8C38 80240158 8E020088 */ lw $v0, 0x88($s0) /* EA8C3C 8024015C 00621821 */ addu $v1, $v1, $v0 @@ -33,7 +33,7 @@ glabel func_80240124_EA8C04 .L80240188: /* EA8C68 80240188 8E020074 */ lw $v0, 0x74($s0) /* EA8C6C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* EA8C70 80240190 00000000 */ nop +/* EA8C70 80240190 00000000 */ nop /* EA8C74 80240194 8E0300AC */ lw $v1, 0xac($s0) /* EA8C78 80240198 8E02008C */ lw $v0, 0x8c($s0) /* EA8C7C 8024019C 00621821 */ addu $v1, $v1, $v0 @@ -52,7 +52,7 @@ glabel func_80240124_EA8C04 .L802401C8: /* EA8CA8 802401C8 8E020078 */ lw $v0, 0x78($s0) /* EA8CAC 802401CC 1440000E */ bnez $v0, .L80240208 -/* EA8CB0 802401D0 00000000 */ nop +/* EA8CB0 802401D0 00000000 */ nop /* EA8CB4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) /* EA8CB8 802401D8 8E020090 */ lw $v0, 0x90($s0) /* EA8CBC 802401DC 00621821 */ addu $v1, $v1, $v0 @@ -71,7 +71,7 @@ glabel func_80240124_EA8C04 .L80240208: /* EA8CE8 80240208 8E02007C */ lw $v0, 0x7c($s0) /* EA8CEC 8024020C 1440000E */ bnez $v0, .L80240248 -/* EA8CF0 80240210 00000000 */ nop +/* EA8CF0 80240210 00000000 */ nop /* EA8CF4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) /* EA8CF8 80240218 8E020094 */ lw $v0, 0x94($s0) /* EA8CFC 8024021C 00621821 */ addu $v1, $v1, $v0 diff --git a/asm/nonmatchings/code_EA8AE0/func_802404B8_EA8F98.s b/asm/nonmatchings/code_EA8AE0/func_802404B8_EA8F98.s index 1cd835d628..9a31bd640a 100644 --- a/asm/nonmatchings/code_EA8AE0/func_802404B8_EA8F98.s +++ b/asm/nonmatchings/code_EA8AE0/func_802404B8_EA8F98.s @@ -13,11 +13,12 @@ glabel func_802404B8_EA8F98 /* EA8FB8 802404D8 2C620005 */ sltiu $v0, $v1, 5 /* EA8FBC 802404DC 1040008A */ beqz $v0, .L80240708 /* EA8FC0 802404E0 00031080 */ sll $v0, $v1, 2 -/* EA8FC4 802404E4 3C018025 */ lui $at, %hi(D_80248340) +/* EA8FC4 802404E4 3C018025 */ lui $at, %hi(jtbl_80248340_EB0E20) /* EA8FC8 802404E8 00220821 */ addu $at, $at, $v0 -/* EA8FCC 802404EC 8C228340 */ lw $v0, %lo(D_80248340)($at) +/* EA8FCC 802404EC 8C228340 */ lw $v0, %lo(jtbl_80248340_EB0E20)($at) /* EA8FD0 802404F0 00400008 */ jr $v0 -/* EA8FD4 802404F4 00000000 */ nop +/* EA8FD4 802404F4 00000000 */ nop +glabel L802404F8_EA8FD8 /* EA8FD8 802404F8 8E22003C */ lw $v0, 0x3c($s1) /* EA8FDC 802404FC 86270046 */ lh $a3, 0x46($s1) /* EA8FE0 80240500 AFA20010 */ sw $v0, 0x10($sp) @@ -66,6 +67,7 @@ glabel func_802404B8_EA8F98 /* EA908C 802405AC A6220044 */ sh $v0, 0x44($s1) /* EA9090 802405B0 080901C2 */ j .L80240708 /* EA9094 802405B4 A6200046 */ sh $zero, 0x46($s1) +glabel L802405B8_EA9098 /* EA9098 802405B8 96220046 */ lhu $v0, 0x46($s1) /* EA909C 802405BC 24420001 */ addiu $v0, $v0, 1 /* EA90A0 802405C0 A6220046 */ sh $v0, 0x46($s1) @@ -84,6 +86,7 @@ glabel func_802404B8_EA8F98 /* EA90D4 802405F4 8C42000C */ lw $v0, 0xc($v0) /* EA90D8 802405F8 080901C2 */ j .L80240708 /* EA90DC 802405FC AC400074 */ sw $zero, 0x74($v0) +glabel L80240600_EA90E0 /* EA90E0 80240600 96220046 */ lhu $v0, 0x46($s1) /* EA90E4 80240604 24420001 */ addiu $v0, $v0, 1 /* EA90E8 80240608 A6220046 */ sh $v0, 0x46($s1) @@ -91,7 +94,7 @@ glabel func_802404B8_EA8F98 /* EA90F0 80240610 00021403 */ sra $v0, $v0, 0x10 /* EA90F4 80240614 2842003C */ slti $v0, $v0, 0x3c /* EA90F8 80240618 1440003B */ bnez $v0, .L80240708 -/* EA90FC 8024061C 00000000 */ nop +/* EA90FC 8024061C 00000000 */ nop /* EA9100 80240620 3C013F80 */ lui $at, 0x3f80 /* EA9104 80240624 44810000 */ mtc1 $at, $f0 /* EA9108 80240628 AFA00014 */ sw $zero, 0x14($sp) @@ -124,6 +127,7 @@ glabel func_802404B8_EA8F98 /* EA9174 80240694 A6220048 */ sh $v0, 0x48($s1) /* EA9178 80240698 080901C2 */ j .L80240708 /* EA917C 8024069C E6200030 */ swc1 $f0, 0x30($s1) +glabel L802406A0_EA9180 /* EA9180 802406A0 0000202D */ daddu $a0, $zero, $zero /* EA9184 802406A4 3C054210 */ lui $a1, 0x4210 /* EA9188 802406A8 3C064198 */ lui $a2, 0x4198 @@ -151,14 +155,15 @@ glabel func_802404B8_EA8F98 /* EA91E0 80240700 A6200046 */ sh $zero, 0x46($s1) /* EA91E4 80240704 E6200034 */ swc1 $f0, 0x34($s1) .L80240708: +glabel L80240708_EA91E8 /* EA91E8 80240708 8623004A */ lh $v1, 0x4a($s1) /* EA91EC 8024070C 24020001 */ addiu $v0, $zero, 1 /* EA91F0 80240710 10620005 */ beq $v1, $v0, .L80240728 /* EA91F4 80240714 24020002 */ addiu $v0, $zero, 2 /* EA91F8 80240718 1062001E */ beq $v1, $v0, .L80240794 -/* EA91FC 8024071C 00000000 */ nop +/* EA91FC 8024071C 00000000 */ nop /* EA9200 80240720 0809020F */ j .L8024083C -/* EA9204 80240724 00000000 */ nop +/* EA9204 80240724 00000000 */ nop .L80240728: /* EA9208 80240728 8627004C */ lh $a3, 0x4c($s1) /* EA920C 8024072C 24100078 */ addiu $s0, $zero, 0x78 @@ -190,12 +195,12 @@ glabel func_802404B8_EA8F98 .L80240794: /* EA9274 80240794 8622004C */ lh $v0, 0x4c($s1) /* EA9278 80240798 44826000 */ mtc1 $v0, $f12 -/* EA927C 8024079C 00000000 */ nop +/* EA927C 8024079C 00000000 */ nop /* EA9280 802407A0 0C00AD77 */ jal func_8002B5DC /* EA9284 802407A4 46806320 */ cvt.s.w $f12, $f12 /* EA9288 802407A8 3C013F80 */ lui $at, 0x3f80 /* EA928C 802407AC 44811000 */ mtc1 $at, $f2 -/* EA9290 802407B0 00000000 */ nop +/* EA9290 802407B0 00000000 */ nop /* EA9294 802407B4 46020000 */ add.s $f0, $f0, $f2 /* EA9298 802407B8 46000000 */ add.s $f0, $f0, $f0 /* EA929C 802407BC C6220024 */ lwc1 $f2, 0x24($s1) @@ -203,7 +208,7 @@ glabel func_802404B8_EA8F98 /* EA92A4 802407C4 46001080 */ add.s $f2, $f2, $f0 /* EA92A8 802407C8 24420008 */ addiu $v0, $v0, 8 /* EA92AC 802407CC 44826000 */ mtc1 $v0, $f12 -/* EA92B0 802407D0 00000000 */ nop +/* EA92B0 802407D0 00000000 */ nop /* EA92B4 802407D4 46806320 */ cvt.s.w $f12, $f12 /* EA92B8 802407D8 0C00AB85 */ jal func_8002AE14 /* EA92BC 802407DC E6220004 */ swc1 $f2, 4($s1) @@ -224,9 +229,9 @@ glabel func_802404B8_EA8F98 /* EA92F8 80240818 460E1380 */ add.s $f14, $f2, $f14 /* EA92FC 8024081C 3C0141F0 */ lui $at, 0x41f0 /* EA9300 80240820 44811000 */ mtc1 $at, $f2 -/* EA9304 80240824 00000000 */ nop +/* EA9304 80240824 00000000 */ nop /* EA9308 80240828 4600103C */ c.lt.s $f2, $f0 -/* EA930C 8024082C 00000000 */ nop +/* EA930C 8024082C 00000000 */ nop /* EA9310 80240830 45010002 */ bc1t .L8024083C /* EA9314 80240834 24020003 */ addiu $v0, $zero, 3 .L80240838: @@ -237,9 +242,9 @@ glabel func_802404B8_EA8F98 /* EA9324 80240844 10620005 */ beq $v1, $v0, .L8024085C /* EA9328 80240848 24020002 */ addiu $v0, $zero, 2 /* EA932C 8024084C 10620008 */ beq $v1, $v0, .L80240870 -/* EA9330 80240850 00000000 */ nop +/* EA9330 80240850 00000000 */ nop /* EA9334 80240854 0809022C */ j .L802408B0 -/* EA9338 80240858 00000000 */ nop +/* EA9338 80240858 00000000 */ nop .L8024085C: /* EA933C 8024085C C620002C */ lwc1 $f0, 0x2c($s1) /* EA9340 80240860 C62C0030 */ lwc1 $f12, 0x30($s1) diff --git a/asm/nonmatchings/code_EA8AE0/func_80240A14_EA94F4.s b/asm/nonmatchings/code_EA8AE0/func_80240A14_EA94F4.s index 343f567749..e2d5c6e046 100644 --- a/asm/nonmatchings/code_EA8AE0/func_80240A14_EA94F4.s +++ b/asm/nonmatchings/code_EA8AE0/func_80240A14_EA94F4.s @@ -8,12 +8,12 @@ glabel func_80240A14_EA94F4 /* EA9500 80240A20 8C900084 */ lw $s0, 0x84($a0) /* EA9504 80240A24 8602004C */ lh $v0, 0x4c($s0) /* EA9508 80240A28 44826000 */ mtc1 $v0, $f12 -/* EA950C 80240A2C 00000000 */ nop +/* EA950C 80240A2C 00000000 */ nop /* EA9510 80240A30 0C00AD77 */ jal func_8002B5DC /* EA9514 80240A34 46806320 */ cvt.s.w $f12, $f12 /* EA9518 80240A38 3C013F80 */ lui $at, 0x3f80 /* EA951C 80240A3C 44811000 */ mtc1 $at, $f2 -/* EA9520 80240A40 00000000 */ nop +/* EA9520 80240A40 00000000 */ nop /* EA9524 80240A44 46020000 */ add.s $f0, $f0, $f2 /* EA9528 80240A48 46000000 */ add.s $f0, $f0, $f0 /* EA952C 80240A4C C6020024 */ lwc1 $f2, 0x24($s0) @@ -21,13 +21,13 @@ glabel func_80240A14_EA94F4 /* EA9534 80240A54 46001080 */ add.s $f2, $f2, $f0 /* EA9538 80240A58 24420008 */ addiu $v0, $v0, 8 /* EA953C 80240A5C 44826000 */ mtc1 $v0, $f12 -/* EA9540 80240A60 00000000 */ nop +/* EA9540 80240A60 00000000 */ nop /* EA9544 80240A64 46806320 */ cvt.s.w $f12, $f12 /* EA9548 80240A68 0C00AB85 */ jal func_8002AE14 /* EA954C 80240A6C E6020004 */ swc1 $f2, 4($s0) /* EA9550 80240A70 4600010D */ trunc.w.s $f4, $f0 /* EA9554 80240A74 44022000 */ mfc1 $v0, $f4 -/* EA9558 80240A78 00000000 */ nop +/* EA9558 80240A78 00000000 */ nop /* EA955C 80240A7C A602004C */ sh $v0, 0x4c($s0) /* EA9560 80240A80 3C028011 */ lui $v0, %hi(D_80117578) /* EA9564 80240A84 24427578 */ addiu $v0, $v0, %lo(D_80117578) @@ -38,9 +38,9 @@ glabel func_80240A14_EA94F4 /* EA9578 80240A98 8E070020 */ lw $a3, 0x20($s0) /* EA957C 80240A9C 3C0141F0 */ lui $at, 0x41f0 /* EA9580 80240AA0 44811000 */ mtc1 $at, $f2 -/* EA9584 80240AA4 00000000 */ nop +/* EA9584 80240AA4 00000000 */ nop /* EA9588 80240AA8 4602003E */ c.le.s $f0, $f2 -/* EA958C 80240AAC 00000000 */ nop +/* EA958C 80240AAC 00000000 */ nop /* EA9590 80240AB0 45000002 */ bc1f .L80240ABC /* EA9594 80240AB4 24020003 */ addiu $v0, $zero, 3 /* EA9598 80240AB8 A602004E */ sh $v0, 0x4e($s0) diff --git a/asm/nonmatchings/code_EA8AE0/func_80240BD4_EA96B4.s b/asm/nonmatchings/code_EA8AE0/func_80240BD4_EA96B4.s index 142ae02659..86669501fc 100644 --- a/asm/nonmatchings/code_EA8AE0/func_80240BD4_EA96B4.s +++ b/asm/nonmatchings/code_EA8AE0/func_80240BD4_EA96B4.s @@ -48,15 +48,15 @@ glabel func_80240BD4_EA96B4 /* EA9760 80240C80 00431804 */ sllv $v1, $v1, $v0 /* EA9764 80240C84 00832021 */ addu $a0, $a0, $v1 /* EA9768 80240C88 44940000 */ mtc1 $s4, $f0 -/* EA976C 80240C8C 00000000 */ nop +/* EA976C 80240C8C 00000000 */ nop /* EA9770 80240C90 46800020 */ cvt.s.w $f0, $f0 /* EA9774 80240C94 E4800000 */ swc1 $f0, ($a0) /* EA9778 80240C98 44910000 */ mtc1 $s1, $f0 -/* EA977C 80240C9C 00000000 */ nop +/* EA977C 80240C9C 00000000 */ nop /* EA9780 80240CA0 46800020 */ cvt.s.w $f0, $f0 /* EA9784 80240CA4 E4800004 */ swc1 $f0, 4($a0) /* EA9788 80240CA8 44900000 */ mtc1 $s0, $f0 -/* EA978C 80240CAC 00000000 */ nop +/* EA978C 80240CAC 00000000 */ nop /* EA9790 80240CB0 46800020 */ cvt.s.w $f0, $f0 /* EA9794 80240CB4 E4800008 */ swc1 $f0, 8($a0) /* EA9798 80240CB8 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/asm/nonmatchings/code_EA8AE0/func_80240CD8_EA97B8.s b/asm/nonmatchings/code_EA8AE0/func_80240CD8_EA97B8.s index a4a5988231..a1d63fe563 100644 --- a/asm/nonmatchings/code_EA8AE0/func_80240CD8_EA97B8.s +++ b/asm/nonmatchings/code_EA8AE0/func_80240CD8_EA97B8.s @@ -43,7 +43,7 @@ glabel func_80240CD8_EA97B8 /* EA9850 80240D70 00529004 */ sllv $s2, $s2, $v0 /* EA9854 80240D74 00721821 */ addu $v1, $v1, $s2 /* EA9858 80240D78 44900000 */ mtc1 $s0, $f0 -/* EA985C 80240D7C 00000000 */ nop +/* EA985C 80240D7C 00000000 */ nop /* EA9860 80240D80 46800020 */ cvt.s.w $f0, $f0 /* EA9864 80240D84 E460006C */ swc1 $f0, 0x6c($v1) /* EA9868 80240D88 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/code_EA8AE0/func_80240E2C_EA990C.s b/asm/nonmatchings/code_EA8AE0/func_80240E2C_EA990C.s index d6fbe7ee40..9e96df6624 100644 --- a/asm/nonmatchings/code_EA8AE0/func_80240E2C_EA990C.s +++ b/asm/nonmatchings/code_EA8AE0/func_80240E2C_EA990C.s @@ -48,16 +48,16 @@ glabel func_80240E2C_EA990C /* EA99B4 80240ED4 50400005 */ beql $v0, $zero, .L80240EEC /* EA99B8 80240ED8 24020002 */ addiu $v0, $zero, 2 /* EA99BC 80240EDC 10E00009 */ beqz $a3, .L80240F04 -/* EA99C0 80240EE0 00000000 */ nop +/* EA99C0 80240EE0 00000000 */ nop /* EA99C4 80240EE4 080904DE */ j .L80241378 -/* EA99C8 80240EE8 00000000 */ nop +/* EA99C8 80240EE8 00000000 */ nop .L80240EEC: /* EA99CC 80240EEC 10E2000B */ beq $a3, $v0, .L80240F1C /* EA99D0 80240EF0 24020003 */ addiu $v0, $zero, 3 /* EA99D4 80240EF4 10E2000A */ beq $a3, $v0, .L80240F20 /* EA99D8 80240EF8 24140005 */ addiu $s4, $zero, 5 /* EA99DC 80240EFC 080904DE */ j .L80241378 -/* EA99E0 80240F00 00000000 */ nop +/* EA99E0 80240F00 00000000 */ nop .L80240F04: /* EA99E4 80240F04 3C014120 */ lui $at, 0x4120 /* EA99E8 80240F08 4481C000 */ mtc1 $at, $f24 @@ -95,21 +95,21 @@ glabel func_80240E2C_EA990C /* EA9A50 80240F70 C444006C */ lwc1 $f4, 0x6c($v0) /* EA9A54 80240F74 46002081 */ sub.s $f2, $f4, $f0 /* EA9A58 80240F78 4602D03C */ c.lt.s $f26, $f2 -/* EA9A5C 80240F7C 00000000 */ nop +/* EA9A5C 80240F7C 00000000 */ nop /* EA9A60 80240F80 45000003 */ bc1f .L80240F90 -/* EA9A64 80240F84 00000000 */ nop +/* EA9A64 80240F84 00000000 */ nop /* EA9A68 80240F88 080903E8 */ j .L80240FA0 /* EA9A6C 80240F8C 46140000 */ add.s $f0, $f0, $f20 .L80240F90: /* EA9A70 80240F90 4616103C */ c.lt.s $f2, $f22 -/* EA9A74 80240F94 00000000 */ nop +/* EA9A74 80240F94 00000000 */ nop /* EA9A78 80240F98 45030001 */ bc1tl .L80240FA0 /* EA9A7C 80240F9C 46142100 */ add.s $f4, $f4, $f20 .L80240FA0: /* EA9A80 80240FA0 46040000 */ add.s $f0, $f0, $f4 /* EA9A84 80240FA4 46000021 */ cvt.d.s $f0, $f0 /* EA9A88 80240FA8 46280002 */ mul.d $f0, $f0, $f8 -/* EA9A8C 80240FAC 00000000 */ nop +/* EA9A8C 80240FAC 00000000 */ nop /* EA9A90 80240FB0 46260000 */ add.d $f0, $f0, $f6 /* EA9A94 80240FB4 46200020 */ cvt.s.d $f0, $f0 .L80240FB8: @@ -196,15 +196,15 @@ glabel func_80240E2C_EA990C /* EA9BCC 802410EC 24900016 */ addiu $s0, $a0, 0x16 .L802410F0: /* EA9BD0 802410F0 44911000 */ mtc1 $s1, $f2 -/* EA9BD4 802410F4 00000000 */ nop +/* EA9BD4 802410F4 00000000 */ nop /* EA9BD8 802410F8 468010A0 */ cvt.s.w $f2, $f2 /* EA9BDC 802410FC 44940000 */ mtc1 $s4, $f0 -/* EA9BE0 80241100 00000000 */ nop +/* EA9BE0 80241100 00000000 */ nop /* EA9BE4 80241104 46800020 */ cvt.s.w $f0, $f0 /* EA9BE8 80241108 46001082 */ mul.s $f2, $f2, $f0 -/* EA9BEC 8024110C 00000000 */ nop +/* EA9BEC 8024110C 00000000 */ nop /* EA9BF0 80241110 44860000 */ mtc1 $a2, $f0 -/* EA9BF4 80241114 00000000 */ nop +/* EA9BF4 80241114 00000000 */ nop /* EA9BF8 80241118 46800020 */ cvt.s.w $f0, $f0 /* EA9BFC 8024111C C65A0098 */ lwc1 $f26, 0x98($s2) /* EA9C00 80241120 C65C009C */ lwc1 $f28, 0x9c($s2) @@ -212,9 +212,9 @@ glabel func_80240E2C_EA990C /* EA9C08 80241128 46001083 */ div.s $f2, $f2, $f0 /* EA9C0C 8024112C 4600128D */ trunc.w.s $f10, $f2 /* EA9C10 80241130 44045000 */ mfc1 $a0, $f10 -/* EA9C14 80241134 00000000 */ nop +/* EA9C14 80241134 00000000 */ nop /* EA9C18 80241138 44840000 */ mtc1 $a0, $f0 -/* EA9C1C 8024113C 00000000 */ nop +/* EA9C1C 8024113C 00000000 */ nop /* EA9C20 80241140 46800020 */ cvt.s.w $f0, $f0 /* EA9C24 80241144 24830001 */ addiu $v1, $a0, 1 /* EA9C28 80241148 0074102A */ slt $v0, $v1, $s4 @@ -234,32 +234,32 @@ glabel func_80240E2C_EA990C /* EA9C5C 8024117C 460C2081 */ sub.s $f2, $f4, $f12 /* EA9C60 80241180 3C014334 */ lui $at, 0x4334 /* EA9C64 80241184 44810000 */ mtc1 $at, $f0 -/* EA9C68 80241188 00000000 */ nop +/* EA9C68 80241188 00000000 */ nop /* EA9C6C 8024118C 4602003C */ c.lt.s $f0, $f2 -/* EA9C70 80241190 00000000 */ nop +/* EA9C70 80241190 00000000 */ nop /* EA9C74 80241194 45000006 */ bc1f .L802411B0 -/* EA9C78 80241198 00000000 */ nop +/* EA9C78 80241198 00000000 */ nop /* EA9C7C 8024119C 3C0143B4 */ lui $at, 0x43b4 /* EA9C80 802411A0 44815000 */ mtc1 $at, $f10 -/* EA9C84 802411A4 00000000 */ nop +/* EA9C84 802411A4 00000000 */ nop /* EA9C88 802411A8 460A2101 */ sub.s $f4, $f4, $f10 /* EA9C8C 802411AC 460C2081 */ sub.s $f2, $f4, $f12 .L802411B0: /* EA9C90 802411B0 3C01C334 */ lui $at, 0xc334 /* EA9C94 802411B4 44810000 */ mtc1 $at, $f0 -/* EA9C98 802411B8 00000000 */ nop +/* EA9C98 802411B8 00000000 */ nop /* EA9C9C 802411BC 4600103C */ c.lt.s $f2, $f0 -/* EA9CA0 802411C0 00000000 */ nop +/* EA9CA0 802411C0 00000000 */ nop /* EA9CA4 802411C4 45020006 */ bc1fl .L802411E0 /* EA9CA8 802411C8 460C2001 */ sub.s $f0, $f4, $f12 /* EA9CAC 802411CC 3C0143B4 */ lui $at, 0x43b4 /* EA9CB0 802411D0 44815000 */ mtc1 $at, $f10 -/* EA9CB4 802411D4 00000000 */ nop +/* EA9CB4 802411D4 00000000 */ nop /* EA9CB8 802411D8 460A2100 */ add.s $f4, $f4, $f10 /* EA9CBC 802411DC 460C2001 */ sub.s $f0, $f4, $f12 .L802411E0: /* EA9CC0 802411E0 46060002 */ mul.s $f0, $f0, $f6 -/* EA9CC4 802411E4 00000000 */ nop +/* EA9CC4 802411E4 00000000 */ nop /* EA9CC8 802411E8 460C0580 */ add.s $f22, $f0, $f12 /* EA9CCC 802411EC 4600B306 */ mov.s $f12, $f22 .L802411F0: @@ -269,12 +269,12 @@ glabel func_80240E2C_EA990C /* EA9CDC 802411FC 0C00AD77 */ jal func_8002B5DC /* EA9CE0 80241200 AFA80034 */ sw $t0, 0x34($sp) /* EA9CE4 80241204 46180502 */ mul.s $f20, $f0, $f24 -/* EA9CE8 80241208 00000000 */ nop +/* EA9CE8 80241208 00000000 */ nop /* EA9CEC 8024120C 0C00AD90 */ jal func_8002B640 /* EA9CF0 80241210 4600B306 */ mov.s $f12, $f22 /* EA9CF4 80241214 46000007 */ neg.s $f0, $f0 /* EA9CF8 80241218 46180002 */ mul.s $f0, $f0, $f24 -/* EA9CFC 8024121C 00000000 */ nop +/* EA9CFC 8024121C 00000000 */ nop /* EA9D00 80241220 4614D100 */ add.s $f4, $f26, $f20 /* EA9D04 80241224 4600E080 */ add.s $f2, $f28, $f0 /* EA9D08 80241228 4614D501 */ sub.s $f20, $f26, $f20 @@ -283,7 +283,7 @@ glabel func_80240E2C_EA990C /* EA9D14 80241234 4600E001 */ sub.s $f0, $f28, $f0 /* EA9D18 80241238 4600228D */ trunc.w.s $f10, $f4 /* EA9D1C 8024123C 44025000 */ mfc1 $v0, $f10 -/* EA9D20 80241240 00000000 */ nop +/* EA9D20 80241240 00000000 */ nop /* EA9D24 80241244 A6620000 */ sh $v0, ($s3) /* EA9D28 80241248 4600128D */ trunc.w.s $f10, $f2 /* EA9D2C 8024124C 44025000 */ mfc1 $v0, $f10 @@ -304,7 +304,7 @@ glabel func_80240E2C_EA990C /* EA9D68 80241288 A6620000 */ sh $v0, ($s3) /* EA9D6C 8024128C 4600028D */ trunc.w.s $f10, $f0 /* EA9D70 80241290 44025000 */ mfc1 $v0, $f10 -/* EA9D74 80241294 00000000 */ nop +/* EA9D74 80241294 00000000 */ nop /* EA9D78 80241298 A602FFF4 */ sh $v0, -0xc($s0) /* EA9D7C 8024129C 24020400 */ addiu $v0, $zero, 0x400 /* EA9D80 802412A0 A603FFF6 */ sh $v1, -0xa($s0) diff --git a/asm/nonmatchings/code_EA8AE0/func_80241468_EA9F48.s b/asm/nonmatchings/code_EA8AE0/func_80241468_EA9F48.s index 3dee9a2865..44197e9cad 100644 --- a/asm/nonmatchings/code_EA8AE0/func_80241468_EA9F48.s +++ b/asm/nonmatchings/code_EA8AE0/func_80241468_EA9F48.s @@ -26,7 +26,7 @@ glabel func_80241468_EA9F48 /* EA9F98 802414B8 1440FFFA */ bnez $v0, .L802414A4 /* EA9F9C 802414BC 24A50004 */ addiu $a1, $a1, 4 /* EA9FA0 802414C0 08090541 */ j .L80241504 -/* EA9FA4 802414C4 00000000 */ nop +/* EA9FA4 802414C4 00000000 */ nop .L802414C8: /* EA9FA8 802414C8 0000182D */ daddu $v1, $zero, $zero /* EA9FAC 802414CC 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/code_EA8AE0/func_80241580_EAA060.s b/asm/nonmatchings/code_EA8AE0/func_80241580_EAA060.s index 840e9233a6..1f1b392f01 100644 --- a/asm/nonmatchings/code_EA8AE0/func_80241580_EAA060.s +++ b/asm/nonmatchings/code_EA8AE0/func_80241580_EAA060.s @@ -14,7 +14,7 @@ glabel func_80241580_EAA060 /* EAA084 802415A4 0C00F94D */ jal func_8003E534 /* EAA088 802415A8 0040202D */ daddu $a0, $v0, $zero /* EAA08C 802415AC 10400005 */ beqz $v0, .L802415C4 -/* EAA090 802415B0 00000000 */ nop +/* EAA090 802415B0 00000000 */ nop /* EAA094 802415B4 8E050000 */ lw $a1, ($s0) /* EAA098 802415B8 844600A8 */ lh $a2, 0xa8($v0) /* EAA09C 802415BC 0C0B551A */ jal func_802D5468 diff --git a/asm/nonmatchings/code_EA8AE0/func_802415DC_EAA0BC.s b/asm/nonmatchings/code_EA8AE0/func_802415DC_EAA0BC.s index f21bdef38d..da738a19dd 100644 --- a/asm/nonmatchings/code_EA8AE0/func_802415DC_EAA0BC.s +++ b/asm/nonmatchings/code_EA8AE0/func_802415DC_EAA0BC.s @@ -21,7 +21,7 @@ glabel func_802415DC_EAA0BC /* EAA0FC 8024161C 0C0B53A3 */ jal func_802D4E8C /* EAA100 80241620 0260282D */ daddu $a1, $s3, $zero /* EAA104 80241624 4482E000 */ mtc1 $v0, $f28 -/* EAA108 80241628 00000000 */ nop +/* EAA108 80241628 00000000 */ nop /* EAA10C 8024162C 4680E720 */ cvt.s.w $f28, $f28 /* EAA110 80241630 8E140000 */ lw $s4, ($s0) /* EAA114 80241634 26100004 */ addiu $s0, $s0, 4 @@ -29,14 +29,14 @@ glabel func_802415DC_EAA0BC /* EAA11C 8024163C 0C0B53A3 */ jal func_802D4E8C /* EAA120 80241640 0280282D */ daddu $a1, $s4, $zero /* EAA124 80241644 4482D000 */ mtc1 $v0, $f26 -/* EAA128 80241648 00000000 */ nop +/* EAA128 80241648 00000000 */ nop /* EAA12C 8024164C 4680D6A0 */ cvt.s.w $f26, $f26 /* EAA130 80241650 8E100000 */ lw $s0, ($s0) /* EAA134 80241654 0220202D */ daddu $a0, $s1, $zero /* EAA138 80241658 0C0B53A3 */ jal func_802D4E8C /* EAA13C 8024165C 0200282D */ daddu $a1, $s0, $zero /* EAA140 80241660 4482C000 */ mtc1 $v0, $f24 -/* EAA144 80241664 00000000 */ nop +/* EAA144 80241664 00000000 */ nop /* EAA148 80241668 4680C620 */ cvt.s.w $f24, $f24 /* EAA14C 8024166C 3C128011 */ lui $s2, %hi(D_80117578) /* EAA150 80241670 26527578 */ addiu $s2, $s2, %lo(D_80117578) @@ -56,7 +56,7 @@ glabel func_802415DC_EAA0BC /* EAA188 802416A8 00220821 */ addu $at, $at, $v0 /* EAA18C 802416AC C4368DEC */ lwc1 $f22, %lo(D_800B8DEC)($at) /* EAA190 802416B0 45000005 */ bc1f .L802416C8 -/* EAA194 802416B4 00000000 */ nop +/* EAA194 802416B4 00000000 */ nop /* EAA198 802416B8 3C0142C8 */ lui $at, 0x42c8 /* EAA19C 802416BC 44810000 */ mtc1 $at, $f0 /* EAA1A0 802416C0 080905B6 */ j .L802416D8 @@ -64,7 +64,7 @@ glabel func_802415DC_EAA0BC .L802416C8: /* EAA1A8 802416C8 3C0142C8 */ lui $at, 0x42c8 /* EAA1AC 802416CC 44810000 */ mtc1 $at, $f0 -/* EAA1B0 802416D0 00000000 */ nop +/* EAA1B0 802416D0 00000000 */ nop /* EAA1B4 802416D4 4600B580 */ add.s $f22, $f22, $f0 .L802416D8: /* EAA1B8 802416D8 0C00AB85 */ jal func_8002AE14 @@ -75,21 +75,21 @@ glabel func_802415DC_EAA0BC /* EAA1CC 802416EC 0C00AD77 */ jal func_8002B5DC /* EAA1D0 802416F0 4600B306 */ mov.s $f12, $f22 /* EAA1D4 802416F4 46140002 */ mul.s $f0, $f0, $f20 -/* EAA1D8 802416F8 00000000 */ nop +/* EAA1D8 802416F8 00000000 */ nop /* EAA1DC 802416FC 864200B0 */ lh $v0, 0xb0($s2) /* EAA1E0 80241700 3C013F00 */ lui $at, 0x3f00 /* EAA1E4 80241704 44812000 */ mtc1 $at, $f4 /* EAA1E8 80241708 44821000 */ mtc1 $v0, $f2 -/* EAA1EC 8024170C 00000000 */ nop +/* EAA1EC 8024170C 00000000 */ nop /* EAA1F0 80241710 468010A0 */ cvt.s.w $f2, $f2 /* EAA1F4 80241714 46041082 */ mul.s $f2, $f2, $f4 -/* EAA1F8 80241718 00000000 */ nop +/* EAA1F8 80241718 00000000 */ nop /* EAA1FC 8024171C 4600E700 */ add.s $f28, $f28, $f0 /* EAA200 80241720 4602D680 */ add.s $f26, $f26, $f2 /* EAA204 80241724 0C00AD90 */ jal func_8002B640 /* EAA208 80241728 4600B306 */ mov.s $f12, $f22 /* EAA20C 8024172C 46140002 */ mul.s $f0, $f0, $f20 -/* EAA210 80241730 00000000 */ nop +/* EAA210 80241730 00000000 */ nop /* EAA214 80241734 0220202D */ daddu $a0, $s1, $zero /* EAA218 80241738 0260282D */ daddu $a1, $s3, $zero /* EAA21C 8024173C 4600E18D */ trunc.w.s $f6, $f28 diff --git a/asm/nonmatchings/code_EA8AE0/func_80241838_EAA318.s b/asm/nonmatchings/code_EA8AE0/func_80241838_EAA318.s index 75ac870e46..331a046537 100644 --- a/asm/nonmatchings/code_EA8AE0/func_80241838_EAA318.s +++ b/asm/nonmatchings/code_EA8AE0/func_80241838_EAA318.s @@ -28,7 +28,7 @@ glabel func_80241838_EAA318 /* EAA36C 8024188C 00220821 */ addu $at, $at, $v0 /* EAA370 80241890 AC208388 */ sw $zero, %lo(D_80248388)($at) /* EAA374 80241894 08090631 */ j .L802418C4 -/* EAA378 80241898 00000000 */ nop +/* EAA378 80241898 00000000 */ nop .L8024189C: /* EAA37C 8024189C 3C038025 */ lui $v1, %hi(D_80248388) /* EAA380 802418A0 24638388 */ addiu $v1, $v1, %lo(D_80248388) diff --git a/asm/nonmatchings/code_EA8AE0/func_802419C4_EAA4A4.s b/asm/nonmatchings/code_EA8AE0/func_802419C4_EAA4A4.s index 6b68e3354c..4e3ed8f9b8 100644 --- a/asm/nonmatchings/code_EA8AE0/func_802419C4_EAA4A4.s +++ b/asm/nonmatchings/code_EA8AE0/func_802419C4_EAA4A4.s @@ -20,7 +20,7 @@ glabel func_802419C4_EAA4A4 /* EAA4E0 80241A00 0C0B53A3 */ jal func_802D4E8C /* EAA4E4 80241A04 02C0282D */ daddu $a1, $s6, $zero /* EAA4E8 80241A08 44820000 */ mtc1 $v0, $f0 -/* EAA4EC 80241A0C 00000000 */ nop +/* EAA4EC 80241A0C 00000000 */ nop /* EAA4F0 80241A10 46800020 */ cvt.s.w $f0, $f0 /* EAA4F4 80241A14 E7A00010 */ swc1 $f0, 0x10($sp) /* EAA4F8 80241A18 8E140000 */ lw $s4, ($s0) @@ -31,13 +31,13 @@ glabel func_802419C4_EAA4A4 /* EAA50C 80241A2C 0220202D */ daddu $a0, $s1, $zero /* EAA510 80241A30 8E150000 */ lw $s5, ($s0) /* EAA514 80241A34 4482B000 */ mtc1 $v0, $f22 -/* EAA518 80241A38 00000000 */ nop +/* EAA518 80241A38 00000000 */ nop /* EAA51C 80241A3C 4680B5A0 */ cvt.s.w $f22, $f22 /* EAA520 80241A40 0C0B53A3 */ jal func_802D4E8C /* EAA524 80241A44 02A0282D */ daddu $a1, $s5, $zero /* EAA528 80241A48 2404FFFC */ addiu $a0, $zero, -4 /* EAA52C 80241A4C 44820000 */ mtc1 $v0, $f0 -/* EAA530 80241A50 00000000 */ nop +/* EAA530 80241A50 00000000 */ nop /* EAA534 80241A54 46800020 */ cvt.s.w $f0, $f0 /* EAA538 80241A58 0C00F92F */ jal func_8003E4BC /* EAA53C 80241A5C E7A00014 */ swc1 $f0, 0x14($sp) diff --git a/asm/nonmatchings/code_EA8AE0/func_80241BC0_EAA6A0.s b/asm/nonmatchings/code_EA8AE0/func_80241BC0_EAA6A0.s index e1fe9b8c29..150ebd23c0 100644 --- a/asm/nonmatchings/code_EA8AE0/func_80241BC0_EAA6A0.s +++ b/asm/nonmatchings/code_EA8AE0/func_80241BC0_EAA6A0.s @@ -24,14 +24,14 @@ glabel func_80241BC0_EAA6A0 /* EAA6EC 80241C0C 12000009 */ beqz $s0, .L80241C34 /* EAA6F0 80241C10 00041840 */ sll $v1, $a0, 1 /* EAA6F4 80241C14 08090743 */ j .L80241D0C -/* EAA6F8 80241C18 00000000 */ nop +/* EAA6F8 80241C18 00000000 */ nop .L80241C1C: /* EAA6FC 80241C1C 1202001F */ beq $s0, $v0, .L80241C9C /* EAA700 80241C20 24020003 */ addiu $v0, $zero, 3 /* EAA704 80241C24 1202002B */ beq $s0, $v0, .L80241CD4 /* EAA708 80241C28 3C068020 */ lui $a2, 0x8020 /* EAA70C 80241C2C 08090743 */ j .L80241D0C -/* EAA710 80241C30 00000000 */ nop +/* EAA710 80241C30 00000000 */ nop .L80241C34: /* EAA714 80241C34 3C028024 */ lui $v0, %hi(D_80243BB8) /* EAA718 80241C38 24423BB8 */ addiu $v0, $v0, %lo(D_80243BB8) @@ -90,7 +90,7 @@ glabel func_80241BC0_EAA6A0 /* EAA7E0 80241D00 34C6A000 */ ori $a2, $a2, 0xa000 .L80241D04: /* EAA7E4 80241D04 0C00AA8B */ jal func_8002AA2C -/* EAA7E8 80241D08 00000000 */ nop +/* EAA7E8 80241D08 00000000 */ nop .L80241D0C: /* EAA7EC 80241D0C 8FBF0018 */ lw $ra, 0x18($sp) /* EAA7F0 80241D10 8FB10014 */ lw $s1, 0x14($sp) @@ -98,6 +98,6 @@ glabel func_80241BC0_EAA6A0 /* EAA7F8 80241D18 24020002 */ addiu $v0, $zero, 2 /* EAA7FC 80241D1C 03E00008 */ jr $ra /* EAA800 80241D20 27BD0020 */ addiu $sp, $sp, 0x20 -/* EAA804 80241D24 00000000 */ nop -/* EAA808 80241D28 00000000 */ nop -/* EAA80C 80241D2C 00000000 */ nop +/* EAA804 80241D24 00000000 */ nop +/* EAA808 80241D28 00000000 */ nop +/* EAA80C 80241D2C 00000000 */ nop diff --git a/asm/nonmatchings/code_EB0E60/func_80240124_EB0F84.s b/asm/nonmatchings/code_EB0E60/func_80240124_EB0F84.s index a7fae4bee7..48d980403b 100644 --- a/asm/nonmatchings/code_EB0E60/func_80240124_EB0F84.s +++ b/asm/nonmatchings/code_EB0E60/func_80240124_EB0F84.s @@ -14,7 +14,7 @@ glabel func_80240124_EB0F84 .L80240148: /* EB0FA8 80240148 8E020070 */ lw $v0, 0x70($s0) /* EB0FAC 8024014C 1440000E */ bnez $v0, .L80240188 -/* EB0FB0 80240150 00000000 */ nop +/* EB0FB0 80240150 00000000 */ nop /* EB0FB4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) /* EB0FB8 80240158 8E020088 */ lw $v0, 0x88($s0) /* EB0FBC 8024015C 00621821 */ addu $v1, $v1, $v0 @@ -33,7 +33,7 @@ glabel func_80240124_EB0F84 .L80240188: /* EB0FE8 80240188 8E020074 */ lw $v0, 0x74($s0) /* EB0FEC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* EB0FF0 80240190 00000000 */ nop +/* EB0FF0 80240190 00000000 */ nop /* EB0FF4 80240194 8E0300AC */ lw $v1, 0xac($s0) /* EB0FF8 80240198 8E02008C */ lw $v0, 0x8c($s0) /* EB0FFC 8024019C 00621821 */ addu $v1, $v1, $v0 @@ -52,7 +52,7 @@ glabel func_80240124_EB0F84 .L802401C8: /* EB1028 802401C8 8E020078 */ lw $v0, 0x78($s0) /* EB102C 802401CC 1440000E */ bnez $v0, .L80240208 -/* EB1030 802401D0 00000000 */ nop +/* EB1030 802401D0 00000000 */ nop /* EB1034 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) /* EB1038 802401D8 8E020090 */ lw $v0, 0x90($s0) /* EB103C 802401DC 00621821 */ addu $v1, $v1, $v0 @@ -71,7 +71,7 @@ glabel func_80240124_EB0F84 .L80240208: /* EB1068 80240208 8E02007C */ lw $v0, 0x7c($s0) /* EB106C 8024020C 1440000E */ bnez $v0, .L80240248 -/* EB1070 80240210 00000000 */ nop +/* EB1070 80240210 00000000 */ nop /* EB1074 80240214 8E0300B4 */ lw $v1, 0xb4($s0) /* EB1078 80240218 8E020094 */ lw $v0, 0x94($s0) /* EB107C 8024021C 00621821 */ addu $v1, $v1, $v0 @@ -141,4 +141,4 @@ glabel func_80240124_EB0F84 /* EB1160 80240300 0000102D */ daddu $v0, $zero, $zero /* EB1164 80240304 03E00008 */ jr $ra /* EB1168 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* EB116C 8024030C 00000000 */ nop +/* EB116C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/code_EB1170/func_80240310_EB1170.s b/asm/nonmatchings/code_EB1170/func_80240310_EB1170.s index 1d3d78602e..32076e1719 100644 --- a/asm/nonmatchings/code_EB1170/func_80240310_EB1170.s +++ b/asm/nonmatchings/code_EB1170/func_80240310_EB1170.s @@ -26,7 +26,7 @@ glabel func_80240310_EB1170 /* EB11C0 80240360 1440FFFA */ bnez $v0, .L8024034C /* EB11C4 80240364 24A50004 */ addiu $a1, $a1, 4 /* EB11C8 80240368 080900EB */ j .L802403AC -/* EB11CC 8024036C 00000000 */ nop +/* EB11CC 8024036C 00000000 */ nop .L80240370: /* EB11D0 80240370 0000182D */ daddu $v1, $zero, $zero /* EB11D4 80240374 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/code_EB1170/func_80240428_EB1288.s b/asm/nonmatchings/code_EB1170/func_80240428_EB1288.s index e06e790214..5596d1148d 100644 --- a/asm/nonmatchings/code_EB1170/func_80240428_EB1288.s +++ b/asm/nonmatchings/code_EB1170/func_80240428_EB1288.s @@ -14,7 +14,7 @@ glabel func_80240428_EB1288 /* EB12AC 8024044C 0C00F94D */ jal func_8003E534 /* EB12B0 80240450 0040202D */ daddu $a0, $v0, $zero /* EB12B4 80240454 10400005 */ beqz $v0, .L8024046C -/* EB12B8 80240458 00000000 */ nop +/* EB12B8 80240458 00000000 */ nop /* EB12BC 8024045C 8E050000 */ lw $a1, ($s0) /* EB12C0 80240460 844600A8 */ lh $a2, 0xa8($v0) /* EB12C4 80240464 0C0B551A */ jal func_802D5468 diff --git a/asm/nonmatchings/code_EB1170/func_80240484_EB12E4.s b/asm/nonmatchings/code_EB1170/func_80240484_EB12E4.s index 0e1de0f903..b26ded065c 100644 --- a/asm/nonmatchings/code_EB1170/func_80240484_EB12E4.s +++ b/asm/nonmatchings/code_EB1170/func_80240484_EB12E4.s @@ -21,7 +21,7 @@ glabel func_80240484_EB12E4 /* EB1324 802404C4 0C0B53A3 */ jal func_802D4E8C /* EB1328 802404C8 0260282D */ daddu $a1, $s3, $zero /* EB132C 802404CC 4482E000 */ mtc1 $v0, $f28 -/* EB1330 802404D0 00000000 */ nop +/* EB1330 802404D0 00000000 */ nop /* EB1334 802404D4 4680E720 */ cvt.s.w $f28, $f28 /* EB1338 802404D8 8E140000 */ lw $s4, ($s0) /* EB133C 802404DC 26100004 */ addiu $s0, $s0, 4 @@ -29,14 +29,14 @@ glabel func_80240484_EB12E4 /* EB1344 802404E4 0C0B53A3 */ jal func_802D4E8C /* EB1348 802404E8 0280282D */ daddu $a1, $s4, $zero /* EB134C 802404EC 4482D000 */ mtc1 $v0, $f26 -/* EB1350 802404F0 00000000 */ nop +/* EB1350 802404F0 00000000 */ nop /* EB1354 802404F4 4680D6A0 */ cvt.s.w $f26, $f26 /* EB1358 802404F8 8E100000 */ lw $s0, ($s0) /* EB135C 802404FC 0220202D */ daddu $a0, $s1, $zero /* EB1360 80240500 0C0B53A3 */ jal func_802D4E8C /* EB1364 80240504 0200282D */ daddu $a1, $s0, $zero /* EB1368 80240508 4482C000 */ mtc1 $v0, $f24 -/* EB136C 8024050C 00000000 */ nop +/* EB136C 8024050C 00000000 */ nop /* EB1370 80240510 4680C620 */ cvt.s.w $f24, $f24 /* EB1374 80240514 3C128011 */ lui $s2, %hi(D_80117578) /* EB1378 80240518 26527578 */ addiu $s2, $s2, %lo(D_80117578) @@ -56,7 +56,7 @@ glabel func_80240484_EB12E4 /* EB13B0 80240550 00220821 */ addu $at, $at, $v0 /* EB13B4 80240554 C4368DEC */ lwc1 $f22, %lo(D_800B8DEC)($at) /* EB13B8 80240558 45000005 */ bc1f .L80240570 -/* EB13BC 8024055C 00000000 */ nop +/* EB13BC 8024055C 00000000 */ nop /* EB13C0 80240560 3C0142C8 */ lui $at, 0x42c8 /* EB13C4 80240564 44810000 */ mtc1 $at, $f0 /* EB13C8 80240568 08090160 */ j .L80240580 @@ -64,7 +64,7 @@ glabel func_80240484_EB12E4 .L80240570: /* EB13D0 80240570 3C0142C8 */ lui $at, 0x42c8 /* EB13D4 80240574 44810000 */ mtc1 $at, $f0 -/* EB13D8 80240578 00000000 */ nop +/* EB13D8 80240578 00000000 */ nop /* EB13DC 8024057C 4600B580 */ add.s $f22, $f22, $f0 .L80240580: /* EB13E0 80240580 0C00AB85 */ jal func_8002AE14 @@ -75,21 +75,21 @@ glabel func_80240484_EB12E4 /* EB13F4 80240594 0C00AD77 */ jal func_8002B5DC /* EB13F8 80240598 4600B306 */ mov.s $f12, $f22 /* EB13FC 8024059C 46140002 */ mul.s $f0, $f0, $f20 -/* EB1400 802405A0 00000000 */ nop +/* EB1400 802405A0 00000000 */ nop /* EB1404 802405A4 864200B0 */ lh $v0, 0xb0($s2) /* EB1408 802405A8 3C013F00 */ lui $at, 0x3f00 /* EB140C 802405AC 44812000 */ mtc1 $at, $f4 /* EB1410 802405B0 44821000 */ mtc1 $v0, $f2 -/* EB1414 802405B4 00000000 */ nop +/* EB1414 802405B4 00000000 */ nop /* EB1418 802405B8 468010A0 */ cvt.s.w $f2, $f2 /* EB141C 802405BC 46041082 */ mul.s $f2, $f2, $f4 -/* EB1420 802405C0 00000000 */ nop +/* EB1420 802405C0 00000000 */ nop /* EB1424 802405C4 4600E700 */ add.s $f28, $f28, $f0 /* EB1428 802405C8 4602D680 */ add.s $f26, $f26, $f2 /* EB142C 802405CC 0C00AD90 */ jal func_8002B640 /* EB1430 802405D0 4600B306 */ mov.s $f12, $f22 /* EB1434 802405D4 46140002 */ mul.s $f0, $f0, $f20 -/* EB1438 802405D8 00000000 */ nop +/* EB1438 802405D8 00000000 */ nop /* EB143C 802405DC 0220202D */ daddu $a0, $s1, $zero /* EB1440 802405E0 0260282D */ daddu $a1, $s3, $zero /* EB1444 802405E4 4600E18D */ trunc.w.s $f6, $f28 diff --git a/asm/nonmatchings/code_EB1170/func_802406E0_EB1540.s b/asm/nonmatchings/code_EB1170/func_802406E0_EB1540.s index 32bb8c9d33..3dd9a92be2 100644 --- a/asm/nonmatchings/code_EB1170/func_802406E0_EB1540.s +++ b/asm/nonmatchings/code_EB1170/func_802406E0_EB1540.s @@ -28,7 +28,7 @@ glabel func_802406E0_EB1540 /* EB1594 80240734 00220821 */ addu $at, $at, $v0 /* EB1598 80240738 AC2042D0 */ sw $zero, %lo(D_802442D0)($at) /* EB159C 8024073C 080901DB */ j .L8024076C -/* EB15A0 80240740 00000000 */ nop +/* EB15A0 80240740 00000000 */ nop .L80240744: /* EB15A4 80240744 3C038024 */ lui $v1, %hi(D_802442D0) /* EB15A8 80240748 246342D0 */ addiu $v1, $v1, %lo(D_802442D0) diff --git a/asm/nonmatchings/code_EB1170/func_8024086C_EB16CC.s b/asm/nonmatchings/code_EB1170/func_8024086C_EB16CC.s index 11914719a9..321664a67e 100644 --- a/asm/nonmatchings/code_EB1170/func_8024086C_EB16CC.s +++ b/asm/nonmatchings/code_EB1170/func_8024086C_EB16CC.s @@ -20,7 +20,7 @@ glabel func_8024086C_EB16CC /* EB1708 802408A8 0C0B53A3 */ jal func_802D4E8C /* EB170C 802408AC 02C0282D */ daddu $a1, $s6, $zero /* EB1710 802408B0 44820000 */ mtc1 $v0, $f0 -/* EB1714 802408B4 00000000 */ nop +/* EB1714 802408B4 00000000 */ nop /* EB1718 802408B8 46800020 */ cvt.s.w $f0, $f0 /* EB171C 802408BC E7A00010 */ swc1 $f0, 0x10($sp) /* EB1720 802408C0 8E140000 */ lw $s4, ($s0) @@ -31,13 +31,13 @@ glabel func_8024086C_EB16CC /* EB1734 802408D4 0220202D */ daddu $a0, $s1, $zero /* EB1738 802408D8 8E150000 */ lw $s5, ($s0) /* EB173C 802408DC 4482B000 */ mtc1 $v0, $f22 -/* EB1740 802408E0 00000000 */ nop +/* EB1740 802408E0 00000000 */ nop /* EB1744 802408E4 4680B5A0 */ cvt.s.w $f22, $f22 /* EB1748 802408E8 0C0B53A3 */ jal func_802D4E8C /* EB174C 802408EC 02A0282D */ daddu $a1, $s5, $zero /* EB1750 802408F0 2404FFFC */ addiu $a0, $zero, -4 /* EB1754 802408F4 44820000 */ mtc1 $v0, $f0 -/* EB1758 802408F8 00000000 */ nop +/* EB1758 802408F8 00000000 */ nop /* EB175C 802408FC 46800020 */ cvt.s.w $f0, $f0 /* EB1760 80240900 0C00F92F */ jal func_8003E4BC /* EB1764 80240904 E7A00014 */ swc1 $f0, 0x14($sp) diff --git a/asm/nonmatchings/code_EB1170/func_80240A8C_EB18EC.s b/asm/nonmatchings/code_EB1170/func_80240A8C_EB18EC.s index 209a6b9d78..5259c523c6 100644 --- a/asm/nonmatchings/code_EB1170/func_80240A8C_EB18EC.s +++ b/asm/nonmatchings/code_EB1170/func_80240A8C_EB18EC.s @@ -13,5 +13,5 @@ glabel func_80240A8C_EB18EC /* EB190C 80240AAC 24020002 */ addiu $v0, $zero, 2 /* EB1910 80240AB0 03E00008 */ jr $ra /* EB1914 80240AB4 27BD0018 */ addiu $sp, $sp, 0x18 -/* EB1918 80240AB8 00000000 */ nop -/* EB191C 80240ABC 00000000 */ nop +/* EB1918 80240AB8 00000000 */ nop +/* EB191C 80240ABC 00000000 */ nop diff --git a/asm/nonmatchings/code_EB7230/func_80240124_EB7354.s b/asm/nonmatchings/code_EB7230/func_80240124_EB7354.s index c43776a2b6..218cd0e96a 100644 --- a/asm/nonmatchings/code_EB7230/func_80240124_EB7354.s +++ b/asm/nonmatchings/code_EB7230/func_80240124_EB7354.s @@ -14,7 +14,7 @@ glabel func_80240124_EB7354 .L80240148: /* EB7378 80240148 8E020070 */ lw $v0, 0x70($s0) /* EB737C 8024014C 1440000E */ bnez $v0, .L80240188 -/* EB7380 80240150 00000000 */ nop +/* EB7380 80240150 00000000 */ nop /* EB7384 80240154 8E0300A8 */ lw $v1, 0xa8($s0) /* EB7388 80240158 8E020088 */ lw $v0, 0x88($s0) /* EB738C 8024015C 00621821 */ addu $v1, $v1, $v0 @@ -33,7 +33,7 @@ glabel func_80240124_EB7354 .L80240188: /* EB73B8 80240188 8E020074 */ lw $v0, 0x74($s0) /* EB73BC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* EB73C0 80240190 00000000 */ nop +/* EB73C0 80240190 00000000 */ nop /* EB73C4 80240194 8E0300AC */ lw $v1, 0xac($s0) /* EB73C8 80240198 8E02008C */ lw $v0, 0x8c($s0) /* EB73CC 8024019C 00621821 */ addu $v1, $v1, $v0 @@ -52,7 +52,7 @@ glabel func_80240124_EB7354 .L802401C8: /* EB73F8 802401C8 8E020078 */ lw $v0, 0x78($s0) /* EB73FC 802401CC 1440000E */ bnez $v0, .L80240208 -/* EB7400 802401D0 00000000 */ nop +/* EB7400 802401D0 00000000 */ nop /* EB7404 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) /* EB7408 802401D8 8E020090 */ lw $v0, 0x90($s0) /* EB740C 802401DC 00621821 */ addu $v1, $v1, $v0 @@ -71,7 +71,7 @@ glabel func_80240124_EB7354 .L80240208: /* EB7438 80240208 8E02007C */ lw $v0, 0x7c($s0) /* EB743C 8024020C 1440000E */ bnez $v0, .L80240248 -/* EB7440 80240210 00000000 */ nop +/* EB7440 80240210 00000000 */ nop /* EB7444 80240214 8E0300B4 */ lw $v1, 0xb4($s0) /* EB7448 80240218 8E020094 */ lw $v0, 0x94($s0) /* EB744C 8024021C 00621821 */ addu $v1, $v1, $v0 @@ -141,4 +141,4 @@ glabel func_80240124_EB7354 /* EB7530 80240300 0000102D */ daddu $v0, $zero, $zero /* EB7534 80240304 03E00008 */ jr $ra /* EB7538 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* EB753C 8024030C 00000000 */ nop +/* EB753C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/code_EB7540/func_80240310_EB7540.s b/asm/nonmatchings/code_EB7540/func_80240310_EB7540.s index eb2e819d94..833aadd374 100644 --- a/asm/nonmatchings/code_EB7540/func_80240310_EB7540.s +++ b/asm/nonmatchings/code_EB7540/func_80240310_EB7540.s @@ -23,18 +23,18 @@ glabel func_80240310_EB7540 /* EB7588 80240358 8E050000 */ lw $a1, ($s0) /* EB758C 8024035C 26100004 */ addiu $s0, $s0, 4 /* EB7590 80240360 4482C000 */ mtc1 $v0, $f24 -/* EB7594 80240364 00000000 */ nop +/* EB7594 80240364 00000000 */ nop /* EB7598 80240368 4680C620 */ cvt.s.w $f24, $f24 /* EB759C 8024036C 0C0B53A3 */ jal func_802D4E8C /* EB75A0 80240370 0220202D */ daddu $a0, $s1, $zero /* EB75A4 80240374 8E050000 */ lw $a1, ($s0) /* EB75A8 80240378 4482B000 */ mtc1 $v0, $f22 -/* EB75AC 8024037C 00000000 */ nop +/* EB75AC 8024037C 00000000 */ nop /* EB75B0 80240380 4680B5A0 */ cvt.s.w $f22, $f22 /* EB75B4 80240384 0C0B53A3 */ jal func_802D4E8C /* EB75B8 80240388 0220202D */ daddu $a0, $s1, $zero /* EB75BC 8024038C 4482A000 */ mtc1 $v0, $f20 -/* EB75C0 80240390 00000000 */ nop +/* EB75C0 80240390 00000000 */ nop /* EB75C4 80240394 4680A520 */ cvt.s.w $f20, $f20 /* EB75C8 80240398 0C0462EC */ jal func_80118BB0 /* EB75CC 8024039C 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/code_EB7540/func_80240520_EB7750.s b/asm/nonmatchings/code_EB7540/func_80240520_EB7750.s index 47f65441c5..39a8d76b57 100644 --- a/asm/nonmatchings/code_EB7540/func_80240520_EB7750.s +++ b/asm/nonmatchings/code_EB7540/func_80240520_EB7750.s @@ -30,7 +30,7 @@ glabel func_80240520_EB7750 /* EB77B0 80240580 46800020 */ cvt.s.w $f0, $f0 /* EB77B4 80240584 46020003 */ div.s $f0, $f0, $f2 /* EB77B8 80240588 460C0302 */ mul.s $f12, $f0, $f12 -/* EB77BC 8024058C 00000000 */ nop +/* EB77BC 8024058C 00000000 */ nop /* EB77C0 80240590 E6200058 */ swc1 $f0, 0x58($s1) /* EB77C4 80240594 C6400074 */ lwc1 $f0, 0x74($s2) /* EB77C8 80240598 46800020 */ cvt.s.w $f0, $f0 @@ -39,19 +39,19 @@ glabel func_80240520_EB7750 /* EB77D4 802405A4 E620005C */ swc1 $f0, 0x5c($s1) /* EB77D8 802405A8 3C013F80 */ lui $at, 0x3f80 /* EB77DC 802405AC 44811000 */ mtc1 $at, $f2 -/* EB77E0 802405B0 00000000 */ nop +/* EB77E0 802405B0 00000000 */ nop /* EB77E4 802405B4 46001081 */ sub.s $f2, $f2, $f0 /* EB77E8 802405B8 3C018024 */ lui $at, %hi(D_80241C10) /* EB77EC 802405BC D4201C10 */ ldc1 $f0, %lo(D_80241C10)($at) /* EB77F0 802405C0 460010A1 */ cvt.d.s $f2, $f2 /* EB77F4 802405C4 46201082 */ mul.d $f2, $f2, $f0 -/* EB77F8 802405C8 00000000 */ nop +/* EB77F8 802405C8 00000000 */ nop /* EB77FC 802405CC 3C013FE0 */ lui $at, 0x3fe0 /* EB7800 802405D0 44810800 */ mtc1 $at, $f1 /* EB7804 802405D4 44800000 */ mtc1 $zero, $f0 -/* EB7808 802405D8 00000000 */ nop +/* EB7808 802405D8 00000000 */ nop /* EB780C 802405DC 46201082 */ mul.d $f2, $f2, $f0 -/* EB7810 802405E0 00000000 */ nop +/* EB7810 802405E0 00000000 */ nop /* EB7814 802405E4 462010A0 */ cvt.s.d $f2, $f2 /* EB7818 802405E8 E6220064 */ swc1 $f2, 0x64($s1) /* EB781C 802405EC 8E430074 */ lw $v1, 0x74($s2) @@ -66,4 +66,4 @@ glabel func_80240520_EB7750 /* EB7840 80240610 00021040 */ sll $v0, $v0, 1 /* EB7844 80240614 03E00008 */ jr $ra /* EB7848 80240618 27BD0020 */ addiu $sp, $sp, 0x20 -/* EB784C 8024061C 00000000 */ nop +/* EB784C 8024061C 00000000 */ nop diff --git a/asm/nonmatchings/code_EB8E90/func_80240040_EB8E90.s b/asm/nonmatchings/code_EB8E90/func_80240040_EB8E90.s index 089d752c24..82d6e76f67 100644 --- a/asm/nonmatchings/code_EB8E90/func_80240040_EB8E90.s +++ b/asm/nonmatchings/code_EB8E90/func_80240040_EB8E90.s @@ -45,7 +45,7 @@ glabel func_80240040_EB8E90 /* EB8F2C 802400DC 0C00AC71 */ jal func_8002B1C4 /* EB8F30 802400E0 4600B386 */ mov.s $f14, $f22 /* EB8F34 802400E4 4614003C */ c.lt.s $f0, $f20 -/* EB8F38 802400E8 00000000 */ nop +/* EB8F38 802400E8 00000000 */ nop /* EB8F3C 802400EC 45000003 */ bc1f .L802400FC /* EB8F40 802400F0 2631000C */ addiu $s1, $s1, 0xc /* EB8F44 802400F4 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_80240040_EB8E90 /* EB8F70 80240120 8E6200D0 */ lw $v0, 0xd0($s3) /* EB8F74 80240124 8C42007C */ lw $v0, 0x7c($v0) /* EB8F78 80240128 04410004 */ bgez $v0, .L8024013C -/* EB8F7C 8024012C 00000000 */ nop +/* EB8F7C 8024012C 00000000 */ nop /* EB8F80 80240130 C6C00000 */ lwc1 $f0, ($s6) /* EB8F84 80240134 08090057 */ j .L8024015C /* EB8F88 80240138 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_80240040_EB8E90 /* EB8F8C 8024013C 3C018025 */ lui $at, %hi(D_802491F0) /* EB8F90 80240140 D42291F0 */ ldc1 $f2, %lo(D_802491F0)($at) /* EB8F94 80240144 44820000 */ mtc1 $v0, $f0 -/* EB8F98 80240148 00000000 */ nop +/* EB8F98 80240148 00000000 */ nop /* EB8F9C 8024014C 46800021 */ cvt.d.w $f0, $f0 /* EB8FA0 80240150 46220003 */ div.d $f0, $f0, $f2 /* EB8FA4 80240154 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/code_EB8E90/func_80240198_EB8FE8.s b/asm/nonmatchings/code_EB8E90/func_80240198_EB8FE8.s index a000f487af..4015234528 100644 --- a/asm/nonmatchings/code_EB8E90/func_80240198_EB8FE8.s +++ b/asm/nonmatchings/code_EB8E90/func_80240198_EB8FE8.s @@ -44,7 +44,7 @@ glabel func_80240198_EB8FE8 /* EB9084 80240234 2402000F */ addiu $v0, $zero, 0xf /* EB9088 80240238 AFA2001C */ sw $v0, 0x1c($sp) /* EB908C 8024023C 44833000 */ mtc1 $v1, $f6 -/* EB9090 80240240 00000000 */ nop +/* EB9090 80240240 00000000 */ nop /* EB9094 80240244 468031A0 */ cvt.s.w $f6, $f6 /* EB9098 80240248 44073000 */ mfc1 $a3, $f6 /* EB909C 8024024C 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_80240198_EB8FE8 .L8024029C: /* EB90EC 8024029C 8602008C */ lh $v0, 0x8c($s0) /* EB90F0 802402A0 1440005D */ bnez $v0, .L80240418 -/* EB90F4 802402A4 00000000 */ nop +/* EB90F4 802402A4 00000000 */ nop /* EB90F8 802402A8 C6000018 */ lwc1 $f0, 0x18($s0) /* EB90FC 802402AC 3C014010 */ lui $at, 0x4010 /* EB9100 802402B0 44811800 */ mtc1 $at, $f3 /* EB9104 802402B4 44801000 */ mtc1 $zero, $f2 /* EB9108 802402B8 46000021 */ cvt.d.s $f0, $f0 /* EB910C 802402BC 4622003C */ c.lt.d $f0, $f2 -/* EB9110 802402C0 00000000 */ nop +/* EB9110 802402C0 00000000 */ nop /* EB9114 802402C4 45000003 */ bc1f .L802402D4 /* EB9118 802402C8 0200202D */ daddu $a0, $s0, $zero /* EB911C 802402CC 080900B6 */ j .L802402D8 @@ -88,7 +88,7 @@ glabel func_80240198_EB8FE8 /* EB9124 802402D4 24050001 */ addiu $a1, $zero, 1 .L802402D8: /* EB9128 802402D8 0C010420 */ jal func_80041080 -/* EB912C 802402DC 00000000 */ nop +/* EB912C 802402DC 00000000 */ nop /* EB9130 802402E0 C60C0038 */ lwc1 $f12, 0x38($s0) /* EB9134 802402E4 8E430078 */ lw $v1, 0x78($s2) /* EB9138 802402E8 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_80240198_EB8FE8 /* EB9160 80240310 4406B000 */ mfc1 $a2, $f22 /* EB9164 80240314 4407A000 */ mfc1 $a3, $f20 /* EB9168 80240318 0C00ABDC */ jal fio_validate_header_checksums -/* EB916C 8024031C 00000000 */ nop +/* EB916C 8024031C 00000000 */ nop /* EB9170 80240320 8E050018 */ lw $a1, 0x18($s0) /* EB9174 80240324 44060000 */ mfc1 $a2, $f0 /* EB9178 80240328 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_80240198_EB8FE8 /* EB918C 8024033C 4406B000 */ mfc1 $a2, $f22 /* EB9190 80240340 4407A000 */ mfc1 $a3, $f20 /* EB9194 80240344 0C00AC71 */ jal func_8002B1C4 -/* EB9198 80240348 00000000 */ nop +/* EB9198 80240348 00000000 */ nop /* EB919C 8024034C C6020018 */ lwc1 $f2, 0x18($s0) /* EB91A0 80240350 4602003E */ c.le.s $f0, $f2 -/* EB91A4 80240354 00000000 */ nop +/* EB91A4 80240354 00000000 */ nop /* EB91A8 80240358 4500002F */ bc1f .L80240418 /* EB91AC 8024035C 240403E8 */ addiu $a0, $zero, 0x3e8 /* EB91B0 80240360 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_80240198_EB8FE8 /* EB9204 802403B4 18400003 */ blez $v0, .L802403C4 /* EB9208 802403B8 24020004 */ addiu $v0, $zero, 4 /* EB920C 802403BC 14600002 */ bnez $v1, .L802403C8 -/* EB9210 802403C0 00000000 */ nop +/* EB9210 802403C0 00000000 */ nop .L802403C4: /* EB9214 802403C4 AE420070 */ sw $v0, 0x70($s2) .L802403C8: diff --git a/asm/nonmatchings/code_EB8E90/func_80240440_EB9290.s b/asm/nonmatchings/code_EB8E90/func_80240440_EB9290.s index 1f5db35ee2..63b17b32e2 100644 --- a/asm/nonmatchings/code_EB8E90/func_80240440_EB9290.s +++ b/asm/nonmatchings/code_EB8E90/func_80240440_EB9290.s @@ -30,7 +30,7 @@ glabel func_80240440_EB9290 /* EB92F4 802404A4 A603008E */ sh $v1, 0x8e($s0) /* EB92F8 802404A8 C60C000C */ lwc1 $f12, 0xc($s0) /* EB92FC 802404AC 44820000 */ mtc1 $v0, $f0 -/* EB9300 802404B0 00000000 */ nop +/* EB9300 802404B0 00000000 */ nop /* EB9304 802404B4 46800020 */ cvt.s.w $f0, $f0 /* EB9308 802404B8 46006300 */ add.s $f12, $f12, $f0 /* EB930C 802404BC 3C0142B4 */ lui $at, 0x42b4 diff --git a/asm/nonmatchings/code_EB8E90/func_80240500_EB9350.s b/asm/nonmatchings/code_EB8E90/func_80240500_EB9350.s index 7008719bb0..d0740cb83c 100644 --- a/asm/nonmatchings/code_EB8E90/func_80240500_EB9350.s +++ b/asm/nonmatchings/code_EB8E90/func_80240500_EB9350.s @@ -38,7 +38,7 @@ glabel func_80240500_EB9350 /* EB93D4 80240584 2402000F */ addiu $v0, $zero, 0xf /* EB93D8 80240588 AFA2001C */ sw $v0, 0x1c($sp) /* EB93DC 8024058C 44833000 */ mtc1 $v1, $f6 -/* EB93E0 80240590 00000000 */ nop +/* EB93E0 80240590 00000000 */ nop /* EB93E4 80240594 468031A0 */ cvt.s.w $f6, $f6 /* EB93E8 80240598 44073000 */ mfc1 $a3, $f6 /* EB93EC 8024059C 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_80240500_EB9350 .L80240600: /* EB9450 80240600 8602008C */ lh $v0, 0x8c($s0) /* EB9454 80240604 14400025 */ bnez $v0, .L8024069C -/* EB9458 80240608 00000000 */ nop +/* EB9458 80240608 00000000 */ nop /* EB945C 8024060C 9602008E */ lhu $v0, 0x8e($s0) /* EB9460 80240610 2442FFFF */ addiu $v0, $v0, -1 /* EB9464 80240614 A602008E */ sh $v0, 0x8e($s0) /* EB9468 80240618 00021400 */ sll $v0, $v0, 0x10 /* EB946C 8024061C 1440001F */ bnez $v0, .L8024069C -/* EB9470 80240620 00000000 */ nop +/* EB9470 80240620 00000000 */ nop /* EB9474 80240624 8E820074 */ lw $v0, 0x74($s4) /* EB9478 80240628 2442FFFF */ addiu $v0, $v0, -1 /* EB947C 8024062C 10400019 */ beqz $v0, .L80240694 @@ -84,7 +84,7 @@ glabel func_80240500_EB9350 /* EB9488 80240638 9442002A */ lhu $v0, 0x2a($v0) /* EB948C 8024063C 30420010 */ andi $v0, $v0, 0x10 /* EB9490 80240640 14400007 */ bnez $v0, .L80240660 -/* EB9494 80240644 00000000 */ nop +/* EB9494 80240644 00000000 */ nop /* EB9498 80240648 C600000C */ lwc1 $f0, 0xc($s0) /* EB949C 8024064C 3C014334 */ lui $at, 0x4334 /* EB94A0 80240650 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/code_EB8E90/func_802406BC_EB950C.s b/asm/nonmatchings/code_EB8E90/func_802406BC_EB950C.s index 71e752e427..20e430012f 100644 --- a/asm/nonmatchings/code_EB8E90/func_802406BC_EB950C.s +++ b/asm/nonmatchings/code_EB8E90/func_802406BC_EB950C.s @@ -28,7 +28,7 @@ glabel func_802406BC_EB950C /* EB9564 80240714 8E0200D0 */ lw $v0, 0xd0($s0) /* EB9568 80240718 8C42007C */ lw $v0, 0x7c($v0) /* EB956C 8024071C 04410004 */ bgez $v0, .L80240730 -/* EB9570 80240720 00000000 */ nop +/* EB9570 80240720 00000000 */ nop /* EB9574 80240724 C6400000 */ lwc1 $f0, ($s2) /* EB9578 80240728 080901D4 */ j .L80240750 /* EB957C 8024072C E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_802406BC_EB950C /* EB9580 80240730 3C018025 */ lui $at, %hi(D_802491F8) /* EB9584 80240734 D42291F8 */ ldc1 $f2, %lo(D_802491F8)($at) /* EB9588 80240738 44820000 */ mtc1 $v0, $f0 -/* EB958C 8024073C 00000000 */ nop +/* EB958C 8024073C 00000000 */ nop /* EB9590 80240740 46800021 */ cvt.d.w $f0, $f0 /* EB9594 80240744 46220003 */ div.d $f0, $f0, $f2 /* EB9598 80240748 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/code_EB8E90/func_8024085C_EB96AC.s b/asm/nonmatchings/code_EB8E90/func_8024085C_EB96AC.s index cdfcb2605f..a7b52d7fbf 100644 --- a/asm/nonmatchings/code_EB8E90/func_8024085C_EB96AC.s +++ b/asm/nonmatchings/code_EB8E90/func_8024085C_EB96AC.s @@ -47,20 +47,20 @@ glabel func_8024085C_EB96AC /* EB9754 80240904 8E02001C */ lw $v0, 0x1c($s0) /* EB9758 80240908 46001005 */ abs.s $f0, $f2 /* EB975C 8024090C 44822000 */ mtc1 $v0, $f4 -/* EB9760 80240910 00000000 */ nop +/* EB9760 80240910 00000000 */ nop /* EB9764 80240914 46802120 */ cvt.s.w $f4, $f4 /* EB9768 80240918 4600203C */ c.lt.s $f4, $f0 -/* EB976C 8024091C 00000000 */ nop +/* EB976C 8024091C 00000000 */ nop /* EB9770 80240920 4500000D */ bc1f .L80240958 -/* EB9774 80240924 00000000 */ nop +/* EB9774 80240924 00000000 */ nop /* EB9778 80240928 44800000 */ mtc1 $zero, $f0 /* EB977C 8024092C C654000C */ lwc1 $f20, 0xc($s2) /* EB9780 80240930 4600103C */ c.lt.s $f2, $f0 -/* EB9784 80240934 00000000 */ nop +/* EB9784 80240934 00000000 */ nop /* EB9788 80240938 45000006 */ bc1f .L80240954 /* EB978C 8024093C 00021023 */ negu $v0, $v0 /* EB9790 80240940 44820000 */ mtc1 $v0, $f0 -/* EB9794 80240944 00000000 */ nop +/* EB9794 80240944 00000000 */ nop /* EB9798 80240948 46800020 */ cvt.s.w $f0, $f0 /* EB979C 8024094C 08090256 */ j .L80240958 /* EB97A0 80240950 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/code_EB8E90/func_8024098C_EB97DC.s b/asm/nonmatchings/code_EB8E90/func_8024098C_EB97DC.s index 4bd2280d43..91a67d4f30 100644 --- a/asm/nonmatchings/code_EB8E90/func_8024098C_EB97DC.s +++ b/asm/nonmatchings/code_EB8E90/func_8024098C_EB97DC.s @@ -37,7 +37,7 @@ glabel func_8024098C_EB97DC /* EB985C 80240A0C 2402000F */ addiu $v0, $zero, 0xf /* EB9860 80240A10 AFA2001C */ sw $v0, 0x1c($sp) /* EB9864 80240A14 44833000 */ mtc1 $v1, $f6 -/* EB9868 80240A18 00000000 */ nop +/* EB9868 80240A18 00000000 */ nop /* EB986C 80240A1C 468031A0 */ cvt.s.w $f6, $f6 /* EB9870 80240A20 44073000 */ mfc1 $a3, $f6 /* EB9874 80240A24 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/code_EB8E90/func_80240AAC_EB98FC.s b/asm/nonmatchings/code_EB8E90/func_80240AAC_EB98FC.s index dc95b7425f..5a442b4a78 100644 --- a/asm/nonmatchings/code_EB8E90/func_80240AAC_EB98FC.s +++ b/asm/nonmatchings/code_EB8E90/func_80240AAC_EB98FC.s @@ -15,7 +15,7 @@ glabel func_80240AAC_EB98FC /* EB9924 80240AD4 A443008E */ sh $v1, 0x8e($v0) /* EB9928 80240AD8 00031C00 */ sll $v1, $v1, 0x10 /* EB992C 80240ADC 14600008 */ bnez $v1, .L80240B00 -/* EB9930 80240AE0 00000000 */ nop +/* EB9930 80240AE0 00000000 */ nop /* EB9934 80240AE4 8E0200B0 */ lw $v0, 0xb0($s0) /* EB9938 80240AE8 30420080 */ andi $v0, $v0, 0x80 /* EB993C 80240AEC 10400003 */ beqz $v0, .L80240AFC diff --git a/asm/nonmatchings/code_EB8E90/func_80240B14_EB9964.s b/asm/nonmatchings/code_EB8E90/func_80240B14_EB9964.s index ee5063a24e..4f1e2c5422 100644 --- a/asm/nonmatchings/code_EB8E90/func_80240B14_EB9964.s +++ b/asm/nonmatchings/code_EB8E90/func_80240B14_EB9964.s @@ -28,7 +28,7 @@ glabel func_80240B14_EB9964 /* EB99BC 80240B6C C4400008 */ lwc1 $f0, 8($v0) /* EB99C0 80240B70 46800020 */ cvt.s.w $f0, $f0 /* EB99C4 80240B74 4602003E */ c.le.s $f0, $f2 -/* EB99C8 80240B78 00000000 */ nop +/* EB99C8 80240B78 00000000 */ nop /* EB99CC 80240B7C 45020003 */ bc1fl .L80240B8C /* EB99D0 80240B80 24840001 */ addiu $a0, $a0, 1 /* EB99D4 80240B84 080902E7 */ j .L80240B9C diff --git a/asm/nonmatchings/code_EB8E90/func_80240BD4_EB9A24.s b/asm/nonmatchings/code_EB8E90/func_80240BD4_EB9A24.s index 92dfaaf572..751376bf9d 100644 --- a/asm/nonmatchings/code_EB8E90/func_80240BD4_EB9A24.s +++ b/asm/nonmatchings/code_EB8E90/func_80240BD4_EB9A24.s @@ -57,7 +57,7 @@ glabel func_80240BD4_EB9A24 /* EB9AF4 80240CA4 8E2200B0 */ lw $v0, 0xb0($s1) /* EB9AF8 80240CA8 30420004 */ andi $v0, $v0, 4 /* EB9AFC 80240CAC 10400044 */ beqz $v0, .L80240DC0 -/* EB9B00 80240CB0 00000000 */ nop +/* EB9B00 80240CB0 00000000 */ nop .L80240CB4: /* EB9B04 80240CB4 2404F7FF */ addiu $a0, $zero, -0x801 /* EB9B08 80240CB8 AEA00070 */ sw $zero, 0x70($s5) @@ -112,7 +112,7 @@ glabel func_80240BD4_EB9A24 /* EB9BBC 80240D6C 3C0142C8 */ lui $at, 0x42c8 /* EB9BC0 80240D70 44812000 */ mtc1 $at, $f4 /* EB9BC4 80240D74 44823000 */ mtc1 $v0, $f6 -/* EB9BC8 80240D78 00000000 */ nop +/* EB9BC8 80240D78 00000000 */ nop /* EB9BCC 80240D7C 468031A0 */ cvt.s.w $f6, $f6 /* EB9BD0 80240D80 27A20044 */ addiu $v0, $sp, 0x44 /* EB9BD4 80240D84 E7A00038 */ swc1 $f0, 0x38($sp) @@ -127,7 +127,7 @@ glabel func_80240BD4_EB9A24 /* EB9BF8 80240DA8 0C03908F */ jal func_800E423C /* EB9BFC 80240DAC 27A70040 */ addiu $a3, $sp, 0x40 /* EB9C00 80240DB0 10400003 */ beqz $v0, .L80240DC0 -/* EB9C04 80240DB4 00000000 */ nop +/* EB9C04 80240DB4 00000000 */ nop /* EB9C08 80240DB8 C7A0003C */ lwc1 $f0, 0x3c($sp) /* EB9C0C 80240DBC E640003C */ swc1 $f0, 0x3c($s2) .L80240DC0: @@ -135,72 +135,85 @@ glabel func_80240BD4_EB9A24 /* EB9C14 80240DC4 2C620064 */ sltiu $v0, $v1, 0x64 /* EB9C18 80240DC8 10400042 */ beqz $v0, .L80240ED4 /* EB9C1C 80240DCC 00031080 */ sll $v0, $v1, 2 -/* EB9C20 80240DD0 3C018025 */ lui $at, %hi(D_80249200) +/* EB9C20 80240DD0 3C018025 */ lui $at, %hi(jtbl_80249200_EC2050) /* EB9C24 80240DD4 00220821 */ addu $at, $at, $v0 -/* EB9C28 80240DD8 8C229200 */ lw $v0, %lo(D_80249200)($at) +/* EB9C28 80240DD8 8C229200 */ lw $v0, %lo(jtbl_80249200_EC2050)($at) /* EB9C2C 80240DDC 00400008 */ jr $v0 -/* EB9C30 80240DE0 00000000 */ nop +/* EB9C30 80240DE0 00000000 */ nop +glabel L80240DE4_EB9C34 /* EB9C34 80240DE4 02A0202D */ daddu $a0, $s5, $zero /* EB9C38 80240DE8 0260282D */ daddu $a1, $s3, $zero /* EB9C3C 80240DEC 0C090010 */ jal func_80240040_EB8E90 /* EB9C40 80240DF0 0280302D */ daddu $a2, $s4, $zero +glabel L80240DF4_EB9C44 /* EB9C44 80240DF4 02A0202D */ daddu $a0, $s5, $zero /* EB9C48 80240DF8 0260282D */ daddu $a1, $s3, $zero /* EB9C4C 80240DFC 0C090066 */ jal func_80240198_EB8FE8 /* EB9C50 80240E00 0280302D */ daddu $a2, $s4, $zero /* EB9C54 80240E04 080903B5 */ j .L80240ED4 -/* EB9C58 80240E08 00000000 */ nop +/* EB9C58 80240E08 00000000 */ nop +glabel L80240E0C_EB9C5C /* EB9C5C 80240E0C 02A0202D */ daddu $a0, $s5, $zero /* EB9C60 80240E10 0260282D */ daddu $a1, $s3, $zero /* EB9C64 80240E14 0C090110 */ jal func_80240440_EB9290 /* EB9C68 80240E18 0280302D */ daddu $a2, $s4, $zero +glabel L80240E1C_EB9C6C /* EB9C6C 80240E1C 02A0202D */ daddu $a0, $s5, $zero /* EB9C70 80240E20 0260282D */ daddu $a1, $s3, $zero /* EB9C74 80240E24 0C090140 */ jal func_80240500_EB9350 /* EB9C78 80240E28 0280302D */ daddu $a2, $s4, $zero /* EB9C7C 80240E2C 080903B5 */ j .L80240ED4 -/* EB9C80 80240E30 00000000 */ nop +/* EB9C80 80240E30 00000000 */ nop +glabel L80240E34_EB9C84 /* EB9C84 80240E34 02A0202D */ daddu $a0, $s5, $zero /* EB9C88 80240E38 0260282D */ daddu $a1, $s3, $zero /* EB9C8C 80240E3C 0C0901AF */ jal func_802406BC_EB950C /* EB9C90 80240E40 0280302D */ daddu $a2, $s4, $zero /* EB9C94 80240E44 080903B5 */ j .L80240ED4 -/* EB9C98 80240E48 00000000 */ nop +/* EB9C98 80240E48 00000000 */ nop +glabel L80240E4C_EB9C9C /* EB9C9C 80240E4C 02A0202D */ daddu $a0, $s5, $zero /* EB9CA0 80240E50 0260282D */ daddu $a1, $s3, $zero /* EB9CA4 80240E54 0C0901DC */ jal func_80240770_EB95C0 /* EB9CA8 80240E58 0280302D */ daddu $a2, $s4, $zero +glabel L80240E5C_EB9CAC /* EB9CAC 80240E5C 02A0202D */ daddu $a0, $s5, $zero /* EB9CB0 80240E60 0260282D */ daddu $a1, $s3, $zero /* EB9CB4 80240E64 0C0901F9 */ jal func_802407E4_EB9634 /* EB9CB8 80240E68 0280302D */ daddu $a2, $s4, $zero /* EB9CBC 80240E6C 080903B5 */ j .L80240ED4 -/* EB9CC0 80240E70 00000000 */ nop +/* EB9CC0 80240E70 00000000 */ nop +glabel L80240E74_EB9CC4 /* EB9CC4 80240E74 02A0202D */ daddu $a0, $s5, $zero /* EB9CC8 80240E78 0260282D */ daddu $a1, $s3, $zero /* EB9CCC 80240E7C 0C090217 */ jal func_8024085C_EB96AC /* EB9CD0 80240E80 0280302D */ daddu $a2, $s4, $zero +glabel L80240E84_EB9CD4 /* EB9CD4 80240E84 02A0202D */ daddu $a0, $s5, $zero /* EB9CD8 80240E88 0260282D */ daddu $a1, $s3, $zero /* EB9CDC 80240E8C 0C090263 */ jal func_8024098C_EB97DC /* EB9CE0 80240E90 0280302D */ daddu $a2, $s4, $zero /* EB9CE4 80240E94 080903B5 */ j .L80240ED4 -/* EB9CE8 80240E98 00000000 */ nop +/* EB9CE8 80240E98 00000000 */ nop +glabel L80240E9C_EB9CEC /* EB9CEC 80240E9C 02A0202D */ daddu $a0, $s5, $zero /* EB9CF0 80240EA0 0260282D */ daddu $a1, $s3, $zero /* EB9CF4 80240EA4 0C0902AB */ jal func_80240AAC_EB98FC /* EB9CF8 80240EA8 0280302D */ daddu $a2, $s4, $zero /* EB9CFC 80240EAC 080903B5 */ j .L80240ED4 -/* EB9D00 80240EB0 00000000 */ nop +/* EB9D00 80240EB0 00000000 */ nop +glabel L80240EB4_EB9D04 /* EB9D04 80240EB4 02A0202D */ daddu $a0, $s5, $zero /* EB9D08 80240EB8 0260282D */ daddu $a1, $s3, $zero /* EB9D0C 80240EBC 0C0902C5 */ jal func_80240B14_EB9964 /* EB9D10 80240EC0 0280302D */ daddu $a2, $s4, $zero /* EB9D14 80240EC4 080903B5 */ j .L80240ED4 -/* EB9D18 80240EC8 00000000 */ nop +/* EB9D18 80240EC8 00000000 */ nop +glabel L80240ECC_EB9D1C /* EB9D1C 80240ECC 0C013AE3 */ jal func_8004EB8C /* EB9D20 80240ED0 02A0202D */ daddu $a0, $s5, $zero .L80240ED4: +glabel L80240ED4_EB9D24 /* EB9D24 80240ED4 8FBF0060 */ lw $ra, 0x60($sp) /* EB9D28 80240ED8 8FB5005C */ lw $s5, 0x5c($sp) /* EB9D2C 80240EDC 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/code_EB8E90/func_80240EFC_EB9D4C.s b/asm/nonmatchings/code_EB8E90/func_80240EFC_EB9D4C.s index 5df9367987..a91c451b22 100644 --- a/asm/nonmatchings/code_EB8E90/func_80240EFC_EB9D4C.s +++ b/asm/nonmatchings/code_EB8E90/func_80240EFC_EB9D4C.s @@ -17,5 +17,5 @@ glabel func_80240EFC_EB9D4C /* EB9D7C 80240F2C 24020002 */ addiu $v0, $zero, 2 /* EB9D80 80240F30 03E00008 */ jr $ra /* EB9D84 80240F34 27BD0018 */ addiu $sp, $sp, 0x18 -/* EB9D88 80240F38 00000000 */ nop -/* EB9D8C 80240F3C 00000000 */ nop +/* EB9D88 80240F38 00000000 */ nop +/* EB9D8C 80240F3C 00000000 */ nop diff --git a/asm/nonmatchings/code_EB9D90/func_80240FB0_EB9E00.s b/asm/nonmatchings/code_EB9D90/func_80240FB0_EB9E00.s index d7643dbc3b..e7536075b9 100644 --- a/asm/nonmatchings/code_EB9D90/func_80240FB0_EB9E00.s +++ b/asm/nonmatchings/code_EB9D90/func_80240FB0_EB9E00.s @@ -20,7 +20,7 @@ glabel func_80240FB0_EB9E00 /* EB9E3C 80240FEC C60200B0 */ lwc1 $f2, 0xb0($s0) /* EB9E40 80240FF0 468010A0 */ cvt.s.w $f2, $f2 /* EB9E44 80240FF4 4482A000 */ mtc1 $v0, $f20 -/* EB9E48 80240FF8 00000000 */ nop +/* EB9E48 80240FF8 00000000 */ nop /* EB9E4C 80240FFC 4680A520 */ cvt.s.w $f20, $f20 /* EB9E50 80241000 3C01C2A6 */ lui $at, 0xc2a6 /* EB9E54 80241004 4481C000 */ mtc1 $at, $f24 @@ -46,7 +46,7 @@ glabel func_80240FB0_EB9E00 /* EB9EA4 80241054 0C00AD77 */ jal func_8002B5DC /* EB9EA8 80241058 4600A306 */ mov.s $f12, $f20 /* EB9EAC 8024105C 4600B002 */ mul.s $f0, $f22, $f0 -/* EB9EB0 80241060 00000000 */ nop +/* EB9EB0 80241060 00000000 */ nop /* EB9EB4 80241064 46180000 */ add.s $f0, $f0, $f24 /* EB9EB8 80241068 3C118011 */ lui $s1, %hi(D_80117578) /* EB9EBC 8024106C 26317578 */ addiu $s1, $s1, %lo(D_80117578) @@ -61,12 +61,12 @@ glabel func_80240FB0_EB9E00 /* EB9EE0 80241090 4600A306 */ mov.s $f12, $f20 /* EB9EE4 80241094 02028021 */ addu $s0, $s0, $v0 /* EB9EE8 80241098 44900000 */ mtc1 $s0, $f0 -/* EB9EEC 8024109C 00000000 */ nop +/* EB9EEC 8024109C 00000000 */ nop /* EB9EF0 802410A0 46800020 */ cvt.s.w $f0, $f0 /* EB9EF4 802410A4 0C00AD90 */ jal func_8002B640 /* EB9EF8 802410A8 E620002C */ swc1 $f0, 0x2c($s1) /* EB9EFC 802410AC 4600B582 */ mul.s $f22, $f22, $f0 -/* EB9F00 802410B0 00000000 */ nop +/* EB9F00 802410B0 00000000 */ nop /* EB9F04 802410B4 4616D681 */ sub.s $f26, $f26, $f22 /* EB9F08 802410B8 E63A0030 */ swc1 $f26, 0x30($s1) /* EB9F0C 802410BC 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/asm/nonmatchings/code_EB9D90/func_802410E4_EB9F34.s b/asm/nonmatchings/code_EB9D90/func_802410E4_EB9F34.s index 793aefd153..6c868d1721 100644 --- a/asm/nonmatchings/code_EB9D90/func_802410E4_EB9F34.s +++ b/asm/nonmatchings/code_EB9D90/func_802410E4_EB9F34.s @@ -23,7 +23,7 @@ glabel func_802410E4_EB9F34 /* EB9F7C 8024112C C60200BC */ lwc1 $f2, 0xbc($s0) /* EB9F80 80241130 468010A0 */ cvt.s.w $f2, $f2 /* EB9F84 80241134 4482A000 */ mtc1 $v0, $f20 -/* EB9F88 80241138 00000000 */ nop +/* EB9F88 80241138 00000000 */ nop /* EB9F8C 8024113C 4680A520 */ cvt.s.w $f20, $f20 /* EB9F90 80241140 3C01C2A6 */ lui $at, 0xc2a6 /* EB9F94 80241144 4481C000 */ mtc1 $at, $f24 @@ -49,7 +49,7 @@ glabel func_802410E4_EB9F34 /* EB9FE4 80241194 0C00AD77 */ jal func_8002B5DC /* EB9FE8 80241198 4600A306 */ mov.s $f12, $f20 /* EB9FEC 8024119C 4600B002 */ mul.s $f0, $f22, $f0 -/* EB9FF0 802411A0 00000000 */ nop +/* EB9FF0 802411A0 00000000 */ nop /* EB9FF4 802411A4 46180000 */ add.s $f0, $f0, $f24 /* EB9FF8 802411A8 E6200038 */ swc1 $f0, 0x38($s1) /* EB9FFC 802411AC 8E0500B8 */ lw $a1, 0xb8($s0) @@ -62,12 +62,12 @@ glabel func_802410E4_EB9F34 /* EBA018 802411C8 4600A306 */ mov.s $f12, $f20 /* EBA01C 802411CC 02028021 */ addu $s0, $s0, $v0 /* EBA020 802411D0 44900000 */ mtc1 $s0, $f0 -/* EBA024 802411D4 00000000 */ nop +/* EBA024 802411D4 00000000 */ nop /* EBA028 802411D8 46800020 */ cvt.s.w $f0, $f0 /* EBA02C 802411DC 0C00AD90 */ jal func_8002B640 /* EBA030 802411E0 E620003C */ swc1 $f0, 0x3c($s1) /* EBA034 802411E4 4600B582 */ mul.s $f22, $f22, $f0 -/* EBA038 802411E8 00000000 */ nop +/* EBA038 802411E8 00000000 */ nop /* EBA03C 802411EC 4616D681 */ sub.s $f26, $f26, $f22 /* EBA040 802411F0 E63A0040 */ swc1 $f26, 0x40($s1) /* EBA044 802411F4 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/asm/nonmatchings/code_EB9D90/func_8024121C_EBA06C.s b/asm/nonmatchings/code_EB9D90/func_8024121C_EBA06C.s index dcab90b2c3..0986e336d9 100644 --- a/asm/nonmatchings/code_EB9D90/func_8024121C_EBA06C.s +++ b/asm/nonmatchings/code_EB9D90/func_8024121C_EBA06C.s @@ -52,13 +52,13 @@ glabel func_8024121C_EBA06C /* EBA128 802412D8 44812000 */ mtc1 $at, $f4 /* EBA12C 802412DC 46020003 */ div.s $f0, $f0, $f2 /* EBA130 802412E0 46040582 */ mul.s $f22, $f0, $f4 -/* EBA134 802412E4 00000000 */ nop +/* EBA134 802412E4 00000000 */ nop /* EBA138 802412E8 4618A501 */ sub.s $f20, $f20, $f24 /* EBA13C 802412EC 3C013F00 */ lui $at, 0x3f00 /* EBA140 802412F0 44810000 */ mtc1 $at, $f0 -/* EBA144 802412F4 00000000 */ nop +/* EBA144 802412F4 00000000 */ nop /* EBA148 802412F8 4600A502 */ mul.s $f20, $f20, $f0 -/* EBA14C 802412FC 00000000 */ nop +/* EBA14C 802412FC 00000000 */ nop /* EBA150 80241300 12000007 */ beqz $s0, .L80241320 /* EBA154 80241304 0233102A */ slt $v0, $s1, $s3 /* EBA158 80241308 10400005 */ beqz $v0, .L80241320 @@ -72,18 +72,18 @@ glabel func_8024121C_EBA06C /* EBA174 80241324 34210FD8 */ ori $at, $at, 0xfd8 /* EBA178 80241328 44810000 */ mtc1 $at, $f0 /* EBA17C 8024132C 44936000 */ mtc1 $s3, $f12 -/* EBA180 80241330 00000000 */ nop +/* EBA180 80241330 00000000 */ nop /* EBA184 80241334 46806320 */ cvt.s.w $f12, $f12 /* EBA188 80241338 46006302 */ mul.s $f12, $f12, $f0 -/* EBA18C 8024133C 00000000 */ nop +/* EBA18C 8024133C 00000000 */ nop /* EBA190 80241340 44910000 */ mtc1 $s1, $f0 -/* EBA194 80241344 00000000 */ nop +/* EBA194 80241344 00000000 */ nop /* EBA198 80241348 46800020 */ cvt.s.w $f0, $f0 /* EBA19C 8024134C 46006303 */ div.s $f12, $f12, $f0 /* EBA1A0 80241350 0C00AD30 */ jal func_8002B4C0 /* EBA1A4 80241354 46166300 */ add.s $f12, $f12, $f22 /* EBA1A8 80241358 4600A002 */ mul.s $f0, $f20, $f0 -/* EBA1AC 8024135C 00000000 */ nop +/* EBA1AC 8024135C 00000000 */ nop /* EBA1B0 80241360 4614C080 */ add.s $f2, $f24, $f20 /* EBA1B4 80241364 46001081 */ sub.s $f2, $f2, $f0 /* EBA1B8 80241368 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/code_EB9D90/func_802413AC_EBA1FC.s b/asm/nonmatchings/code_EB9D90/func_802413AC_EBA1FC.s index 5ddb988fb5..d4ed8bc0c4 100644 --- a/asm/nonmatchings/code_EB9D90/func_802413AC_EBA1FC.s +++ b/asm/nonmatchings/code_EB9D90/func_802413AC_EBA1FC.s @@ -5,7 +5,7 @@ glabel func_802413AC_EBA1FC /* EBA1FC 802413AC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* EBA200 802413B0 AFBF0010 */ sw $ra, 0x10($sp) /* EBA204 802413B4 0C03C5CC */ jal func_800F1730 -/* EBA208 802413B8 00000000 */ nop +/* EBA208 802413B8 00000000 */ nop /* EBA20C 802413BC 8FBF0010 */ lw $ra, 0x10($sp) /* EBA210 802413C0 24020002 */ addiu $v0, $zero, 2 /* EBA214 802413C4 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_EB9D90/func_802413CC_EBA21C.s b/asm/nonmatchings/code_EB9D90/func_802413CC_EBA21C.s index e428d8c90f..c64ae09ba0 100644 --- a/asm/nonmatchings/code_EB9D90/func_802413CC_EBA21C.s +++ b/asm/nonmatchings/code_EB9D90/func_802413CC_EBA21C.s @@ -5,7 +5,7 @@ glabel func_802413CC_EBA21C /* EBA21C 802413CC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* EBA220 802413D0 AFBF0010 */ sw $ra, 0x10($sp) /* EBA224 802413D4 0C03C5C6 */ jal func_800F1718 -/* EBA228 802413D8 00000000 */ nop +/* EBA228 802413D8 00000000 */ nop /* EBA22C 802413DC 8FBF0010 */ lw $ra, 0x10($sp) /* EBA230 802413E0 24020002 */ addiu $v0, $zero, 2 /* EBA234 802413E4 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_EB9D90/func_802413EC_EBA23C.s b/asm/nonmatchings/code_EB9D90/func_802413EC_EBA23C.s index 6844ce9c2f..a6a5379e03 100644 --- a/asm/nonmatchings/code_EB9D90/func_802413EC_EBA23C.s +++ b/asm/nonmatchings/code_EB9D90/func_802413EC_EBA23C.s @@ -5,9 +5,9 @@ glabel func_802413EC_EBA23C /* EBA23C 802413EC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* EBA240 802413F0 AFBF0010 */ sw $ra, 0x10($sp) /* EBA244 802413F4 0C03C5BD */ jal func_800F16F4 -/* EBA248 802413F8 00000000 */ nop +/* EBA248 802413F8 00000000 */ nop /* EBA24C 802413FC 8FBF0010 */ lw $ra, 0x10($sp) /* EBA250 80241400 24020002 */ addiu $v0, $zero, 2 /* EBA254 80241404 03E00008 */ jr $ra /* EBA258 80241408 27BD0018 */ addiu $sp, $sp, 0x18 -/* EBA25C 8024140C 00000000 */ nop +/* EBA25C 8024140C 00000000 */ nop diff --git a/asm/nonmatchings/code_EC2200/func_80240000_EC2200.s b/asm/nonmatchings/code_EC2200/func_80240000_EC2200.s index d828fead3b..2d17432c63 100644 --- a/asm/nonmatchings/code_EC2200/func_80240000_EC2200.s +++ b/asm/nonmatchings/code_EC2200/func_80240000_EC2200.s @@ -15,6 +15,6 @@ glabel func_80240000_EC2200 /* EC2228 80240028 24020002 */ addiu $v0, $zero, 2 /* EC222C 8024002C 03E00008 */ jr $ra /* EC2230 80240030 27BD0020 */ addiu $sp, $sp, 0x20 -/* EC2234 80240034 00000000 */ nop -/* EC2238 80240038 00000000 */ nop -/* EC223C 8024003C 00000000 */ nop +/* EC2234 80240034 00000000 */ nop +/* EC2238 80240038 00000000 */ nop +/* EC223C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/code_EC2240/func_80240040_EC2240.s b/asm/nonmatchings/code_EC2240/func_80240040_EC2240.s index 18e43008a1..97bdac2972 100644 --- a/asm/nonmatchings/code_EC2240/func_80240040_EC2240.s +++ b/asm/nonmatchings/code_EC2240/func_80240040_EC2240.s @@ -26,7 +26,7 @@ glabel func_80240040_EC2240 /* EC2290 80240090 1440FFFA */ bnez $v0, .L8024007C /* EC2294 80240094 24A50004 */ addiu $a1, $a1, 4 /* EC2298 80240098 08090037 */ j .L802400DC -/* EC229C 8024009C 00000000 */ nop +/* EC229C 8024009C 00000000 */ nop .L802400A0: /* EC22A0 802400A0 0000182D */ daddu $v1, $zero, $zero /* EC22A4 802400A4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/code_EC2240/func_80240158_EC2358.s b/asm/nonmatchings/code_EC2240/func_80240158_EC2358.s index 8c13cfab9c..2370a59adb 100644 --- a/asm/nonmatchings/code_EC2240/func_80240158_EC2358.s +++ b/asm/nonmatchings/code_EC2240/func_80240158_EC2358.s @@ -46,7 +46,7 @@ glabel func_80240158_EC2358 /* EC23FC 802401FC 44801000 */ mtc1 $zero, $f2 /* EC2400 80240200 46000121 */ cvt.d.s $f4, $f0 /* EC2404 80240204 4624103C */ c.lt.d $f2, $f4 -/* EC2408 80240208 00000000 */ nop +/* EC2408 80240208 00000000 */ nop /* EC240C 8024020C 45000058 */ bc1f .L80240370 /* EC2410 80240210 4600B306 */ mov.s $f12, $f22 /* EC2414 80240214 8E060038 */ lw $a2, 0x38($s0) @@ -66,42 +66,42 @@ glabel func_80240158_EC2358 /* EC244C 8024024C 4600A101 */ sub.s $f4, $f20, $f0 /* EC2450 80240250 4600218D */ trunc.w.s $f6, $f4 /* EC2454 80240254 44023000 */ mfc1 $v0, $f6 -/* EC2458 80240258 00000000 */ nop +/* EC2458 80240258 00000000 */ nop /* EC245C 8024025C 04420001 */ bltzl $v0, .L80240264 /* EC2460 80240260 00021023 */ negu $v0, $v0 .L80240264: /* EC2464 80240264 28420015 */ slti $v0, $v0, 0x15 /* EC2468 80240268 14400032 */ bnez $v0, .L80240334 -/* EC246C 8024026C 00000000 */ nop +/* EC246C 8024026C 00000000 */ nop /* EC2470 80240270 4604D03E */ c.le.s $f26, $f4 -/* EC2474 80240274 00000000 */ nop +/* EC2474 80240274 00000000 */ nop /* EC2478 80240278 45000005 */ bc1f .L80240290 /* EC247C 8024027C 46002086 */ mov.s $f2, $f4 /* EC2480 80240280 3C0143B4 */ lui $at, 0x43b4 /* EC2484 80240284 44810000 */ mtc1 $at, $f0 -/* EC2488 80240288 00000000 */ nop +/* EC2488 80240288 00000000 */ nop /* EC248C 8024028C 46002081 */ sub.s $f2, $f4, $f0 .L80240290: /* EC2490 80240290 3C01C334 */ lui $at, 0xc334 /* EC2494 80240294 44810000 */ mtc1 $at, $f0 -/* EC2498 80240298 00000000 */ nop +/* EC2498 80240298 00000000 */ nop /* EC249C 8024029C 4600103E */ c.le.s $f2, $f0 -/* EC24A0 802402A0 00000000 */ nop +/* EC24A0 802402A0 00000000 */ nop /* EC24A4 802402A4 45000005 */ bc1f .L802402BC -/* EC24A8 802402A8 00000000 */ nop +/* EC24A8 802402A8 00000000 */ nop /* EC24AC 802402AC 3C0143B4 */ lui $at, 0x43b4 /* EC24B0 802402B0 44810000 */ mtc1 $at, $f0 -/* EC24B4 802402B4 00000000 */ nop +/* EC24B4 802402B4 00000000 */ nop /* EC24B8 802402B8 46001080 */ add.s $f2, $f2, $f0 .L802402BC: /* EC24BC 802402BC 46022032 */ c.eq.s $f4, $f2 -/* EC24C0 802402C0 00000000 */ nop +/* EC24C0 802402C0 00000000 */ nop /* EC24C4 802402C4 45000018 */ bc1f .L80240328 -/* EC24C8 802402C8 00000000 */ nop +/* EC24C8 802402C8 00000000 */ nop /* EC24CC 802402CC 44800000 */ mtc1 $zero, $f0 /* EC24D0 802402D0 E7B60010 */ swc1 $f22, 0x10($sp) /* EC24D4 802402D4 4604003E */ c.le.s $f0, $f4 -/* EC24D8 802402D8 00000000 */ nop +/* EC24D8 802402D8 00000000 */ nop /* EC24DC 802402DC 45000005 */ bc1f .L802402F4 /* EC24E0 802402E0 E7B80014 */ swc1 $f24, 0x14($sp) /* EC24E4 802402E4 3C0141A0 */ lui $at, 0x41a0 @@ -111,18 +111,18 @@ glabel func_80240158_EC2358 .L802402F4: /* EC24F4 802402F4 3C0141A0 */ lui $at, 0x41a0 /* EC24F8 802402F8 44816000 */ mtc1 $at, $f12 -/* EC24FC 802402FC 00000000 */ nop +/* EC24FC 802402FC 00000000 */ nop /* EC2500 80240300 460CA300 */ add.s $f12, $f20, $f12 .L80240304: /* EC2504 80240304 0C00AB85 */ jal func_8002AE14 -/* EC2508 80240308 00000000 */ nop +/* EC2508 80240308 00000000 */ nop /* EC250C 8024030C 27A40010 */ addiu $a0, $sp, 0x10 /* EC2510 80240310 3C064238 */ lui $a2, 0x4238 /* EC2514 80240314 44070000 */ mfc1 $a3, $f0 /* EC2518 80240318 0C00ACA3 */ jal func_8002B28C /* EC251C 8024031C 27A50014 */ addiu $a1, $sp, 0x14 /* EC2520 80240320 080900CD */ j .L80240334 -/* EC2524 80240324 00000000 */ nop +/* EC2524 80240324 00000000 */ nop .L80240328: /* EC2528 80240328 3C048024 */ lui $a0, %hi(D_80244F88) /* EC252C 8024032C 0C00973F */ jal func_80025CFC @@ -142,14 +142,14 @@ glabel func_80240158_EC2358 /* EC2560 80240360 0C00F909 */ jal func_8003E424 /* EC2564 80240364 AC86000C */ sw $a2, 0xc($a0) /* EC2568 80240368 080900F7 */ j .L802403DC -/* EC256C 8024036C 00000000 */ nop +/* EC256C 8024036C 00000000 */ nop .L80240370: /* EC2570 80240370 3C018024 */ lui $at, %hi(D_80244F90) /* EC2574 80240374 D4204F90 */ ldc1 $f0, %lo(D_80244F90)($at) /* EC2578 80240378 4624003C */ c.lt.d $f0, $f4 -/* EC257C 8024037C 00000000 */ nop +/* EC257C 8024037C 00000000 */ nop /* EC2580 80240380 4500000F */ bc1f .L802403C0 -/* EC2584 80240384 00000000 */ nop +/* EC2584 80240384 00000000 */ nop /* EC2588 80240388 C60C0038 */ lwc1 $f12, 0x38($s0) /* EC258C 8024038C C60E0040 */ lwc1 $f14, 0x40($s0) /* EC2590 80240390 8FA60010 */ lw $a2, 0x10($sp) @@ -183,6 +183,6 @@ glabel func_80240158_EC2358 /* EC25F8 802403F8 0000102D */ daddu $v0, $zero, $zero /* EC25FC 802403FC 03E00008 */ jr $ra /* EC2600 80240400 27BD0048 */ addiu $sp, $sp, 0x48 -/* EC2604 80240404 00000000 */ nop -/* EC2608 80240408 00000000 */ nop -/* EC260C 8024040C 00000000 */ nop +/* EC2604 80240404 00000000 */ nop +/* EC2608 80240408 00000000 */ nop +/* EC260C 8024040C 00000000 */ nop diff --git a/asm/nonmatchings/code_EC71B0/func_80240124_EC72D4.s b/asm/nonmatchings/code_EC71B0/func_80240124_EC72D4.s index 8860dfa860..fb17c65977 100644 --- a/asm/nonmatchings/code_EC71B0/func_80240124_EC72D4.s +++ b/asm/nonmatchings/code_EC71B0/func_80240124_EC72D4.s @@ -14,7 +14,7 @@ glabel func_80240124_EC72D4 .L80240148: /* EC72F8 80240148 8E020070 */ lw $v0, 0x70($s0) /* EC72FC 8024014C 1440000E */ bnez $v0, .L80240188 -/* EC7300 80240150 00000000 */ nop +/* EC7300 80240150 00000000 */ nop /* EC7304 80240154 8E0300A8 */ lw $v1, 0xa8($s0) /* EC7308 80240158 8E020088 */ lw $v0, 0x88($s0) /* EC730C 8024015C 00621821 */ addu $v1, $v1, $v0 @@ -33,7 +33,7 @@ glabel func_80240124_EC72D4 .L80240188: /* EC7338 80240188 8E020074 */ lw $v0, 0x74($s0) /* EC733C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* EC7340 80240190 00000000 */ nop +/* EC7340 80240190 00000000 */ nop /* EC7344 80240194 8E0300AC */ lw $v1, 0xac($s0) /* EC7348 80240198 8E02008C */ lw $v0, 0x8c($s0) /* EC734C 8024019C 00621821 */ addu $v1, $v1, $v0 @@ -52,7 +52,7 @@ glabel func_80240124_EC72D4 .L802401C8: /* EC7378 802401C8 8E020078 */ lw $v0, 0x78($s0) /* EC737C 802401CC 1440000E */ bnez $v0, .L80240208 -/* EC7380 802401D0 00000000 */ nop +/* EC7380 802401D0 00000000 */ nop /* EC7384 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) /* EC7388 802401D8 8E020090 */ lw $v0, 0x90($s0) /* EC738C 802401DC 00621821 */ addu $v1, $v1, $v0 @@ -71,7 +71,7 @@ glabel func_80240124_EC72D4 .L80240208: /* EC73B8 80240208 8E02007C */ lw $v0, 0x7c($s0) /* EC73BC 8024020C 1440000E */ bnez $v0, .L80240248 -/* EC73C0 80240210 00000000 */ nop +/* EC73C0 80240210 00000000 */ nop /* EC73C4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) /* EC73C8 80240218 8E020094 */ lw $v0, 0x94($s0) /* EC73CC 8024021C 00621821 */ addu $v1, $v1, $v0 diff --git a/asm/nonmatchings/code_EC71B0/func_80240344_EC74F4.s b/asm/nonmatchings/code_EC71B0/func_80240344_EC74F4.s index 7f9f47be72..60c9c8918a 100644 --- a/asm/nonmatchings/code_EC71B0/func_80240344_EC74F4.s +++ b/asm/nonmatchings/code_EC71B0/func_80240344_EC74F4.s @@ -39,5 +39,5 @@ glabel func_80240344_EC74F4 /* EC757C 802403CC 24020002 */ addiu $v0, $zero, 2 /* EC7580 802403D0 03E00008 */ jr $ra /* EC7584 802403D4 27BD0030 */ addiu $sp, $sp, 0x30 -/* EC7588 802403D8 00000000 */ nop -/* EC758C 802403DC 00000000 */ nop +/* EC7588 802403D8 00000000 */ nop +/* EC758C 802403DC 00000000 */ nop diff --git a/asm/nonmatchings/code_EC7590/func_802403E0_EC7590.s b/asm/nonmatchings/code_EC7590/func_802403E0_EC7590.s index 40d74a5e4c..8b2ed6b867 100644 --- a/asm/nonmatchings/code_EC7590/func_802403E0_EC7590.s +++ b/asm/nonmatchings/code_EC7590/func_802403E0_EC7590.s @@ -14,12 +14,12 @@ glabel func_802403E0_EC7590 /* EC75B4 80240404 0C01B198 */ jal osGetCause /* EC75B8 80240408 0080802D */ daddu $s0, $a0, $zero /* EC75BC 8024040C 4616A582 */ mul.s $f22, $f20, $f22 -/* EC75C0 80240410 00000000 */ nop +/* EC75C0 80240410 00000000 */ nop /* EC75C4 80240414 4618A502 */ mul.s $f20, $f20, $f24 -/* EC75C8 80240418 00000000 */ nop +/* EC75C8 80240418 00000000 */ nop /* EC75CC 8024041C 3C013F80 */ lui $at, 0x3f80 /* EC75D0 80240420 44810000 */ mtc1 $at, $f0 -/* EC75D4 80240424 00000000 */ nop +/* EC75D4 80240424 00000000 */ nop /* EC75D8 80240428 E6000014 */ swc1 $f0, 0x14($s0) /* EC75DC 8024042C E6160010 */ swc1 $f22, 0x10($s0) /* EC75E0 80240430 E6140018 */ swc1 $f20, 0x18($s0) diff --git a/asm/nonmatchings/code_EC7590/func_8024061C_EC77CC.s b/asm/nonmatchings/code_EC7590/func_8024061C_EC77CC.s index 74ebc5e716..abb051ce70 100644 --- a/asm/nonmatchings/code_EC7590/func_8024061C_EC77CC.s +++ b/asm/nonmatchings/code_EC7590/func_8024061C_EC77CC.s @@ -26,7 +26,7 @@ glabel func_8024061C_EC77CC /* EC781C 8024066C 1440FFFA */ bnez $v0, .L80240658 /* EC7820 80240670 24A50004 */ addiu $a1, $a1, 4 /* EC7824 80240674 080901AE */ j .L802406B8 -/* EC7828 80240678 00000000 */ nop +/* EC7828 80240678 00000000 */ nop .L8024067C: /* EC782C 8024067C 0000182D */ daddu $v1, $zero, $zero /* EC7830 80240680 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/code_EC7590/func_802406D0_EC7880.s b/asm/nonmatchings/code_EC7590/func_802406D0_EC7880.s index c8661fe6b5..4168baba75 100644 --- a/asm/nonmatchings/code_EC7590/func_802406D0_EC7880.s +++ b/asm/nonmatchings/code_EC7590/func_802406D0_EC7880.s @@ -27,6 +27,6 @@ glabel func_802406D0_EC7880 /* EC78D8 80240728 24020002 */ addiu $v0, $zero, 2 /* EC78DC 8024072C 03E00008 */ jr $ra /* EC78E0 80240730 27BD0020 */ addiu $sp, $sp, 0x20 -/* EC78E4 80240734 00000000 */ nop -/* EC78E8 80240738 00000000 */ nop -/* EC78EC 8024073C 00000000 */ nop +/* EC78E4 80240734 00000000 */ nop +/* EC78E8 80240738 00000000 */ nop +/* EC78EC 8024073C 00000000 */ nop diff --git a/asm/nonmatchings/code_EC9D00/func_802400D4_EC9DD4.s b/asm/nonmatchings/code_EC9D00/func_802400D4_EC9DD4.s index 489249bdff..43e8a4d399 100644 --- a/asm/nonmatchings/code_EC9D00/func_802400D4_EC9DD4.s +++ b/asm/nonmatchings/code_EC9D00/func_802400D4_EC9DD4.s @@ -8,7 +8,7 @@ glabel func_802400D4_EC9DD4 /* EC9DE0 802400E0 00822021 */ addu $a0, $a0, $v0 /* EC9DE4 802400E4 90820014 */ lbu $v0, 0x14($a0) /* EC9DE8 802400E8 10400009 */ beqz $v0, .L80240110 -/* EC9DEC 802400EC 00000000 */ nop +/* EC9DEC 802400EC 00000000 */ nop /* EC9DF0 802400F0 90820015 */ lbu $v0, 0x15($a0) /* EC9DF4 802400F4 00022600 */ sll $a0, $v0, 0x18 /* EC9DF8 802400F8 00041E03 */ sra $v1, $a0, 0x18 @@ -16,7 +16,7 @@ glabel func_802400D4_EC9DD4 /* EC9E00 80240100 00021403 */ sra $v0, $v0, 0x10 /* EC9E04 80240104 0043102A */ slt $v0, $v0, $v1 /* EC9E08 80240108 10400003 */ beqz $v0, .L80240118 -/* EC9E0C 8024010C 00000000 */ nop +/* EC9E0C 8024010C 00000000 */ nop .L80240110: /* EC9E10 80240110 03E00008 */ jr $ra /* EC9E14 80240114 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/code_EC9D00/func_802401CC_EC9ECC.s b/asm/nonmatchings/code_EC9D00/func_802401CC_EC9ECC.s index 75a9db4e6b..40621bb965 100644 --- a/asm/nonmatchings/code_EC9D00/func_802401CC_EC9ECC.s +++ b/asm/nonmatchings/code_EC9D00/func_802401CC_EC9ECC.s @@ -108,20 +108,20 @@ glabel func_802401CC_EC9ECC /* ECA054 80240354 10400009 */ beqz $v0, .L8024037C /* ECA058 80240358 AEA20074 */ sw $v0, 0x74($s5) /* ECA05C 8024035C 0C03E498 */ jal func_800F9260 -/* ECA060 80240360 00000000 */ nop +/* ECA060 80240360 00000000 */ nop /* ECA064 80240364 8EA20070 */ lw $v0, 0x70($s5) /* ECA068 80240368 24420001 */ addiu $v0, $v0, 1 .L8024036C: /* ECA06C 8024036C AEA20070 */ sw $v0, 0x70($s5) /* ECA070 80240370 2842000F */ slti $v0, $v0, 0xf /* ECA074 80240374 10400003 */ beqz $v0, .L80240384 -/* ECA078 80240378 00000000 */ nop +/* ECA078 80240378 00000000 */ nop .L8024037C: /* ECA07C 8024037C 080900FB */ j .L802403EC /* ECA080 80240380 0000102D */ daddu $v0, $zero, $zero .L80240384: /* ECA084 80240384 0C03E4FA */ jal func_800F93E8 -/* ECA088 80240388 00000000 */ nop +/* ECA088 80240388 00000000 */ nop /* ECA08C 8024038C 8EA30074 */ lw $v1, 0x74($s5) /* ECA090 80240390 240200FF */ addiu $v0, $zero, 0xff /* ECA094 80240394 10620010 */ beq $v1, $v0, .L802403D8 diff --git a/asm/nonmatchings/code_EC9D00/func_80240600_ECA300.s b/asm/nonmatchings/code_EC9D00/func_80240600_ECA300.s index 7dddd58d2d..6dc93ce4cb 100644 --- a/asm/nonmatchings/code_EC9D00/func_80240600_ECA300.s +++ b/asm/nonmatchings/code_EC9D00/func_80240600_ECA300.s @@ -36,7 +36,7 @@ glabel func_80240600_ECA300 /* ECA37C 8024067C 0C00AD49 */ jal func_8002B524 /* ECA380 80240680 0040A82D */ daddu $s5, $v0, $zero /* ECA384 80240684 1200005D */ beqz $s0, .L802407FC -/* ECA388 80240688 00000000 */ nop +/* ECA388 80240688 00000000 */ nop /* ECA38C 8024068C 0C00AFC6 */ jal func_8002BF18 /* ECA390 80240690 24040068 */ addiu $a0, $zero, 0x68 /* ECA394 80240694 0040902D */ daddu $s2, $v0, $zero @@ -98,10 +98,10 @@ glabel func_80240600_ECA300 /* ECA46C 8024076C C7A2001C */ lwc1 $f2, 0x1c($sp) /* ECA470 80240770 C7A40020 */ lwc1 $f4, 0x20($sp) /* ECA474 80240774 46041082 */ mul.s $f2, $f2, $f4 -/* ECA478 80240778 00000000 */ nop +/* ECA478 80240778 00000000 */ nop /* ECA47C 8024077C C7A00018 */ lwc1 $f0, 0x18($sp) /* ECA480 80240780 46040002 */ mul.s $f0, $f0, $f4 -/* ECA484 80240784 00000000 */ nop +/* ECA484 80240784 00000000 */ nop /* ECA488 80240788 E6020038 */ swc1 $f2, 0x38($s0) /* ECA48C 8024078C E6000050 */ swc1 $f0, 0x50($s0) /* ECA490 80240790 8E42005C */ lw $v0, 0x5c($s2) @@ -142,12 +142,12 @@ glabel func_80240600_ECA300 /* ECA518 80240818 10600007 */ beqz $v1, .L80240838 /* ECA51C 8024081C 24040005 */ addiu $a0, $zero, 5 /* ECA520 80240820 08090274 */ j .L802409D0 -/* ECA524 80240824 00000000 */ nop +/* ECA524 80240824 00000000 */ nop .L80240828: /* ECA528 80240828 10620058 */ beq $v1, $v0, .L8024098C -/* ECA52C 8024082C 00000000 */ nop +/* ECA52C 8024082C 00000000 */ nop /* ECA530 80240830 08090274 */ j .L802409D0 -/* ECA534 80240834 00000000 */ nop +/* ECA534 80240834 00000000 */ nop .L80240838: /* ECA538 80240838 0000882D */ daddu $s1, $zero, $zero /* ECA53C 8024083C 3C148024 */ lui $s4, %hi(func_80242038_CD3E68) @@ -174,11 +174,11 @@ glabel func_80240600_ECA300 /* ECA58C 8024088C C7A4001C */ lwc1 $f4, 0x1c($sp) /* ECA590 80240890 C7A00020 */ lwc1 $f0, 0x20($sp) /* ECA594 80240894 46002102 */ mul.s $f4, $f4, $f0 -/* ECA598 80240898 00000000 */ nop +/* ECA598 80240898 00000000 */ nop /* ECA59C 8024089C C7A20018 */ lwc1 $f2, 0x18($sp) /* ECA5A0 802408A0 26940004 */ addiu $s4, $s4, 4 /* ECA5A4 802408A4 46001082 */ mul.s $f2, $f2, $f0 -/* ECA5A8 802408A8 00000000 */ nop +/* ECA5A8 802408A8 00000000 */ nop /* ECA5AC 802408AC 26730004 */ addiu $s3, $s3, 4 /* ECA5B0 802408B0 26310001 */ addiu $s1, $s1, 1 /* ECA5B4 802408B4 2A220003 */ slti $v0, $s1, 3 @@ -215,11 +215,11 @@ glabel func_80240600_ECA300 /* ECA628 80240928 C7A4001C */ lwc1 $f4, 0x1c($sp) /* ECA62C 8024092C C7A00020 */ lwc1 $f0, 0x20($sp) /* ECA630 80240930 46002102 */ mul.s $f4, $f4, $f0 -/* ECA634 80240934 00000000 */ nop +/* ECA634 80240934 00000000 */ nop /* ECA638 80240938 C7A20018 */ lwc1 $f2, 0x18($sp) /* ECA63C 8024093C 26940004 */ addiu $s4, $s4, 4 /* ECA640 80240940 46001082 */ mul.s $f2, $f2, $f0 -/* ECA644 80240944 00000000 */ nop +/* ECA644 80240944 00000000 */ nop /* ECA648 80240948 26730004 */ addiu $s3, $s3, 4 /* ECA64C 8024094C 26310001 */ addiu $s1, $s1, 1 /* ECA650 80240950 2A220003 */ slti $v0, $s1, 3 diff --git a/asm/nonmatchings/code_EC9D00/func_80240B38_ECA838.s b/asm/nonmatchings/code_EC9D00/func_80240B38_ECA838.s index 843e51e98b..cf3a778c71 100644 --- a/asm/nonmatchings/code_EC9D00/func_80240B38_ECA838.s +++ b/asm/nonmatchings/code_EC9D00/func_80240B38_ECA838.s @@ -36,16 +36,16 @@ glabel func_80240B38_ECA838 /* ECA8B0 80240BB0 10600007 */ beqz $v1, .L80240BD0 /* ECA8B4 80240BB4 240500FF */ addiu $a1, $zero, 0xff /* ECA8B8 80240BB8 08090312 */ j .L80240C48 -/* ECA8BC 80240BBC 00000000 */ nop +/* ECA8BC 80240BBC 00000000 */ nop .L80240BC0: /* ECA8C0 80240BC0 10620019 */ beq $v1, $v0, .L80240C28 -/* ECA8C4 80240BC4 00000000 */ nop +/* ECA8C4 80240BC4 00000000 */ nop /* ECA8C8 80240BC8 08090312 */ j .L80240C48 -/* ECA8CC 80240BCC 00000000 */ nop +/* ECA8CC 80240BCC 00000000 */ nop .L80240BD0: /* ECA8D0 80240BD0 8E220074 */ lw $v0, 0x74($s1) /* ECA8D4 80240BD4 14450004 */ bne $v0, $a1, .L80240BE8 -/* ECA8D8 80240BD8 00000000 */ nop +/* ECA8D8 80240BD8 00000000 */ nop /* ECA8DC 80240BDC AE240070 */ sw $a0, 0x70($s1) /* ECA8E0 80240BE0 AE200078 */ sw $zero, 0x78($s1) /* ECA8E4 80240BE4 8E220074 */ lw $v0, 0x74($s1) @@ -57,7 +57,7 @@ glabel func_80240B38_ECA838 /* ECA8F8 80240BF8 50400013 */ beql $v0, $zero, .L80240C48 /* ECA8FC 80240BFC AE250074 */ sw $a1, 0x74($s1) /* ECA900 80240C00 08090312 */ j .L80240C48 -/* ECA904 80240C04 00000000 */ nop +/* ECA904 80240C04 00000000 */ nop .L80240C08: /* ECA908 80240C08 8E220078 */ lw $v0, 0x78($s1) /* ECA90C 80240C0C 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/code_EC9D00/func_80240D08_ECAA08.s b/asm/nonmatchings/code_EC9D00/func_80240D08_ECAA08.s index 1bab2da743..46f2a998e7 100644 --- a/asm/nonmatchings/code_EC9D00/func_80240D08_ECAA08.s +++ b/asm/nonmatchings/code_EC9D00/func_80240D08_ECAA08.s @@ -15,5 +15,5 @@ glabel func_80240D08_ECAA08 .L80240D30: /* ECAA30 80240D30 03E00008 */ jr $ra /* ECAA34 80240D34 24020002 */ addiu $v0, $zero, 2 -/* ECAA38 80240D38 00000000 */ nop -/* ECAA3C 80240D3C 00000000 */ nop +/* ECAA38 80240D38 00000000 */ nop +/* ECAA3C 80240D3C 00000000 */ nop diff --git a/asm/nonmatchings/code_ECAA40/func_80240D40_ECAA40.s b/asm/nonmatchings/code_ECAA40/func_80240D40_ECAA40.s index cb682689d6..e2035be329 100644 --- a/asm/nonmatchings/code_ECAA40/func_80240D40_ECAA40.s +++ b/asm/nonmatchings/code_ECAA40/func_80240D40_ECAA40.s @@ -15,6 +15,6 @@ glabel func_80240D40_ECAA40 /* ECAA68 80240D68 24020002 */ addiu $v0, $zero, 2 /* ECAA6C 80240D6C 03E00008 */ jr $ra /* ECAA70 80240D70 27BD0020 */ addiu $sp, $sp, 0x20 -/* ECAA74 80240D74 00000000 */ nop -/* ECAA78 80240D78 00000000 */ nop -/* ECAA7C 80240D7C 00000000 */ nop +/* ECAA74 80240D74 00000000 */ nop +/* ECAA78 80240D78 00000000 */ nop +/* ECAA7C 80240D7C 00000000 */ nop diff --git a/asm/nonmatchings/code_ECAA80/func_8024150C_ECB20C.s b/asm/nonmatchings/code_ECAA80/func_8024150C_ECB20C.s index 9c808edb82..e0c4ede2a3 100644 --- a/asm/nonmatchings/code_ECAA80/func_8024150C_ECB20C.s +++ b/asm/nonmatchings/code_ECAA80/func_8024150C_ECB20C.s @@ -96,60 +96,71 @@ glabel func_8024150C_ECB20C /* ECB368 80241668 2C620064 */ sltiu $v0, $v1, 0x64 /* ECB36C 8024166C 10400036 */ beqz $v0, .L80241748 /* ECB370 80241670 00031080 */ sll $v0, $v1, 2 -/* ECB374 80241674 3C018024 */ lui $at, %hi(D_80246160) +/* ECB374 80241674 3C018024 */ lui $at, %hi(jtbl_80246160_ECFE60) /* ECB378 80241678 00220821 */ addu $at, $at, $v0 -/* ECB37C 8024167C 8C226160 */ lw $v0, %lo(D_80246160)($at) +/* ECB37C 8024167C 8C226160 */ lw $v0, %lo(jtbl_80246160_ECFE60)($at) /* ECB380 80241680 00400008 */ jr $v0 /* ECB384 80241684 00000000 */ nop +glabel L80241688_ECB388 /* ECB388 80241688 02A0202D */ daddu $a0, $s5, $zero /* ECB38C 8024168C 0260282D */ daddu $a1, $s3, $zero /* ECB390 80241690 0C013670 */ jal func_8004D9C0 /* ECB394 80241694 0280302D */ daddu $a2, $s4, $zero +glabel L80241698_ECB398 /* ECB398 80241698 02A0202D */ daddu $a0, $s5, $zero /* ECB39C 8024169C 0260282D */ daddu $a1, $s3, $zero /* ECB3A0 802416A0 0C0136B6 */ jal func_8004DAD8 /* ECB3A4 802416A4 0280302D */ daddu $a2, $s4, $zero /* ECB3A8 802416A8 080905D2 */ j .L80241748 /* ECB3AC 802416AC 00000000 */ nop +glabel L802416B0_ECB3B0 /* ECB3B0 802416B0 02A0202D */ daddu $a0, $s5, $zero /* ECB3B4 802416B4 0260282D */ daddu $a1, $s3, $zero /* ECB3B8 802416B8 0C0137D9 */ jal func_8004DF64 /* ECB3BC 802416BC 0280302D */ daddu $a2, $s4, $zero +glabel L802416C0_ECB3C0 /* ECB3C0 802416C0 02A0202D */ daddu $a0, $s5, $zero /* ECB3C4 802416C4 0260282D */ daddu $a1, $s3, $zero /* ECB3C8 802416C8 0C013809 */ jal func_8004E024 /* ECB3CC 802416CC 0280302D */ daddu $a2, $s4, $zero /* ECB3D0 802416D0 080905D2 */ j .L80241748 /* ECB3D4 802416D4 00000000 */ nop +glabel L802416D8_ECB3D8 /* ECB3D8 802416D8 02A0202D */ daddu $a0, $s5, $zero /* ECB3DC 802416DC 0260282D */ daddu $a1, $s3, $zero /* ECB3E0 802416E0 0C013897 */ jal func_8004E25C /* ECB3E4 802416E4 0280302D */ daddu $a2, $s4, $zero +glabel L802416E8_ECB3E8 /* ECB3E8 802416E8 02A0202D */ daddu $a0, $s5, $zero /* ECB3EC 802416EC 0260282D */ daddu $a1, $s3, $zero /* ECB3F0 802416F0 0C0138BB */ jal func_8004E2EC /* ECB3F4 802416F4 0280302D */ daddu $a2, $s4, $zero /* ECB3F8 802416F8 080905D2 */ j .L80241748 /* ECB3FC 802416FC 00000000 */ nop +glabel L80241700_ECB400 /* ECB400 80241700 02A0202D */ daddu $a0, $s5, $zero /* ECB404 80241704 0260282D */ daddu $a1, $s3, $zero /* ECB408 80241708 0C090360 */ jal func_80240D80_ECAA80 /* ECB40C 8024170C 0280302D */ daddu $a2, $s4, $zero +glabel L80241710_ECB410 /* ECB410 80241710 02A0202D */ daddu $a0, $s5, $zero /* ECB414 80241714 0260282D */ daddu $a1, $s3, $zero /* ECB418 80241718 0C0904D9 */ jal func_80241364_ECB064 /* ECB41C 8024171C 0280302D */ daddu $a2, $s4, $zero /* ECB420 80241720 080905D2 */ j .L80241748 /* ECB424 80241724 00000000 */ nop +glabel L80241728_ECB428 /* ECB428 80241728 02A0202D */ daddu $a0, $s5, $zero /* ECB42C 8024172C 0260282D */ daddu $a1, $s3, $zero /* ECB430 80241730 0C090532 */ jal func_802414C8_ECB1C8 /* ECB434 80241734 0280302D */ daddu $a2, $s4, $zero /* ECB438 80241738 080905D2 */ j .L80241748 /* ECB43C 8024173C 00000000 */ nop +glabel L80241740_ECB440 /* ECB440 80241740 0C013AE3 */ jal func_8004EB8C /* ECB444 80241744 02A0202D */ daddu $a0, $s5, $zero .L80241748: +glabel L80241748_ECB448 /* ECB448 80241748 8FBF0048 */ lw $ra, 0x48($sp) /* ECB44C 8024174C 8FB50044 */ lw $s5, 0x44($sp) /* ECB450 80241750 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/code_ECB930/func_80241C30_ECB930.s b/asm/nonmatchings/code_ECB930/func_80241C30_ECB930.s index 69f9d71bf4..60e633f007 100644 --- a/asm/nonmatchings/code_ECB930/func_80241C30_ECB930.s +++ b/asm/nonmatchings/code_ECB930/func_80241C30_ECB930.s @@ -14,12 +14,12 @@ glabel func_80241C30_ECB930 /* ECB954 80241C54 0C01B198 */ jal osGetCause /* ECB958 80241C58 0080802D */ daddu $s0, $a0, $zero /* ECB95C 80241C5C 4616A582 */ mul.s $f22, $f20, $f22 -/* ECB960 80241C60 00000000 */ nop +/* ECB960 80241C60 00000000 */ nop /* ECB964 80241C64 4618A502 */ mul.s $f20, $f20, $f24 -/* ECB968 80241C68 00000000 */ nop +/* ECB968 80241C68 00000000 */ nop /* ECB96C 80241C6C 3C013F80 */ lui $at, 0x3f80 /* ECB970 80241C70 44810000 */ mtc1 $at, $f0 -/* ECB974 80241C74 00000000 */ nop +/* ECB974 80241C74 00000000 */ nop /* ECB978 80241C78 E6000014 */ swc1 $f0, 0x14($s0) /* ECB97C 80241C7C E6160010 */ swc1 $f22, 0x10($s0) /* ECB980 80241C80 E6140018 */ swc1 $f20, 0x18($s0) diff --git a/asm/nonmatchings/code_ECB930/func_80241CA0_ECB9A0.s b/asm/nonmatchings/code_ECB930/func_80241CA0_ECB9A0.s index bf5aea9ef1..576b94113a 100644 --- a/asm/nonmatchings/code_ECB930/func_80241CA0_ECB9A0.s +++ b/asm/nonmatchings/code_ECB930/func_80241CA0_ECB9A0.s @@ -119,4 +119,4 @@ glabel func_80241CA0_ECB9A0 /* ECBB60 80241E60 24020002 */ addiu $v0, $zero, 2 /* ECBB64 80241E64 03E00008 */ jr $ra /* ECBB68 80241E68 27BD0088 */ addiu $sp, $sp, 0x88 -/* ECBB6C 80241E6C 00000000 */ nop +/* ECBB6C 80241E6C 00000000 */ nop diff --git a/asm/nonmatchings/code_ED0030/func_80240040_ED0030.s b/asm/nonmatchings/code_ED0030/func_80240040_ED0030.s index 0ce6494a1b..0686f01380 100644 --- a/asm/nonmatchings/code_ED0030/func_80240040_ED0030.s +++ b/asm/nonmatchings/code_ED0030/func_80240040_ED0030.s @@ -6,33 +6,33 @@ glabel func_80240040_ED0030 /* ED0034 80240044 8C830090 */ lw $v1, 0x90($a0) /* ED0038 80240048 00431023 */ subu $v0, $v0, $v1 /* ED003C 8024004C 44821000 */ mtc1 $v0, $f2 -/* ED0040 80240050 00000000 */ nop +/* ED0040 80240050 00000000 */ nop /* ED0044 80240054 468010A0 */ cvt.s.w $f2, $f2 /* ED0048 80240058 8C820088 */ lw $v0, 0x88($a0) /* ED004C 8024005C 8C830094 */ lw $v1, 0x94($a0) /* ED0050 80240060 46021082 */ mul.s $f2, $f2, $f2 -/* ED0054 80240064 00000000 */ nop +/* ED0054 80240064 00000000 */ nop /* ED0058 80240068 00431023 */ subu $v0, $v0, $v1 /* ED005C 8024006C 44822000 */ mtc1 $v0, $f4 -/* ED0060 80240070 00000000 */ nop +/* ED0060 80240070 00000000 */ nop /* ED0064 80240074 46802120 */ cvt.s.w $f4, $f4 /* ED0068 80240078 8C82008C */ lw $v0, 0x8c($a0) /* ED006C 8024007C 46042102 */ mul.s $f4, $f4, $f4 -/* ED0070 80240080 00000000 */ nop +/* ED0070 80240080 00000000 */ nop /* ED0074 80240084 8C830098 */ lw $v1, 0x98($a0) /* ED0078 80240088 00431023 */ subu $v0, $v0, $v1 /* ED007C 8024008C 44820000 */ mtc1 $v0, $f0 -/* ED0080 80240090 00000000 */ nop +/* ED0080 80240090 00000000 */ nop /* ED0084 80240094 46800020 */ cvt.s.w $f0, $f0 /* ED0088 80240098 46000002 */ mul.s $f0, $f0, $f0 -/* ED008C 8024009C 00000000 */ nop +/* ED008C 8024009C 00000000 */ nop /* ED0090 802400A0 46041080 */ add.s $f2, $f2, $f4 /* ED0094 802400A4 46001080 */ add.s $f2, $f2, $f0 /* ED0098 802400A8 3C014561 */ lui $at, 0x4561 /* ED009C 802400AC 44810000 */ mtc1 $at, $f0 -/* ED00A0 802400B0 00000000 */ nop +/* ED00A0 802400B0 00000000 */ nop /* ED00A4 802400B4 4600103C */ c.lt.s $f2, $f0 -/* ED00A8 802400B8 00000000 */ nop +/* ED00A8 802400B8 00000000 */ nop /* ED00AC 802400BC 45010002 */ bc1t .L802400C8 /* ED00B0 802400C0 24020001 */ addiu $v0, $zero, 1 /* ED00B4 802400C4 0000102D */ daddu $v0, $zero, $zero @@ -40,6 +40,6 @@ glabel func_80240040_ED0030 /* ED00B8 802400C8 AC820084 */ sw $v0, 0x84($a0) /* ED00BC 802400CC 03E00008 */ jr $ra /* ED00C0 802400D0 24020002 */ addiu $v0, $zero, 2 -/* ED00C4 802400D4 00000000 */ nop -/* ED00C8 802400D8 00000000 */ nop -/* ED00CC 802400DC 00000000 */ nop +/* ED00C4 802400D4 00000000 */ nop +/* ED00C8 802400D8 00000000 */ nop +/* ED00CC 802400DC 00000000 */ nop diff --git a/asm/nonmatchings/code_ED00D0/func_802400E0_ED00D0.s b/asm/nonmatchings/code_ED00D0/func_802400E0_ED00D0.s index 997fc8c92a..10dca3368e 100644 --- a/asm/nonmatchings/code_ED00D0/func_802400E0_ED00D0.s +++ b/asm/nonmatchings/code_ED00D0/func_802400E0_ED00D0.s @@ -14,12 +14,12 @@ glabel func_802400E0_ED00D0 /* ED00F4 80240104 0C01B198 */ jal osGetCause /* ED00F8 80240108 0080802D */ daddu $s0, $a0, $zero /* ED00FC 8024010C 4616A582 */ mul.s $f22, $f20, $f22 -/* ED0100 80240110 00000000 */ nop +/* ED0100 80240110 00000000 */ nop /* ED0104 80240114 4618A502 */ mul.s $f20, $f20, $f24 -/* ED0108 80240118 00000000 */ nop +/* ED0108 80240118 00000000 */ nop /* ED010C 8024011C 3C013F80 */ lui $at, 0x3f80 /* ED0110 80240120 44810000 */ mtc1 $at, $f0 -/* ED0114 80240124 00000000 */ nop +/* ED0114 80240124 00000000 */ nop /* ED0118 80240128 E6000014 */ swc1 $f0, 0x14($s0) /* ED011C 8024012C E6160010 */ swc1 $f22, 0x10($s0) /* ED0120 80240130 E6140018 */ swc1 $f20, 0x18($s0) diff --git a/asm/nonmatchings/code_ED00D0/func_80240150_ED0140.s b/asm/nonmatchings/code_ED00D0/func_80240150_ED0140.s index 14da34a28d..f7f92aadd9 100644 --- a/asm/nonmatchings/code_ED00D0/func_80240150_ED0140.s +++ b/asm/nonmatchings/code_ED00D0/func_80240150_ED0140.s @@ -119,4 +119,4 @@ glabel func_80240150_ED0140 /* ED0300 80240310 24020002 */ addiu $v0, $zero, 2 /* ED0304 80240314 03E00008 */ jr $ra /* ED0308 80240318 27BD0088 */ addiu $sp, $sp, 0x88 -/* ED030C 8024031C 00000000 */ nop +/* ED030C 8024031C 00000000 */ nop diff --git a/asm/nonmatchings/code_ED0310/func_80240320_ED0310.s b/asm/nonmatchings/code_ED0310/func_80240320_ED0310.s index 3564114aaf..636cad74ce 100644 --- a/asm/nonmatchings/code_ED0310/func_80240320_ED0310.s +++ b/asm/nonmatchings/code_ED0310/func_80240320_ED0310.s @@ -47,7 +47,7 @@ glabel func_80240320_ED0310 /* ED03B8 802403C8 0C013431 */ jal func_8004D0C4 /* ED03BC 802403CC 8E070038 */ lw $a3, 0x38($s0) /* ED03C0 802403D0 1040000E */ beqz $v0, .L8024040C -/* ED03C4 802403D4 00000000 */ nop +/* ED03C4 802403D4 00000000 */ nop /* ED03C8 802403D8 8E2200D0 */ lw $v0, 0xd0($s1) /* ED03CC 802403DC C60C0038 */ lwc1 $f12, 0x38($s0) /* ED03D0 802403E0 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240320_ED0310 /* ED03E4 802403F4 468031A0 */ cvt.s.w $f6, $f6 /* ED03E8 802403F8 44073000 */ mfc1 $a3, $f6 /* ED03EC 802403FC 0C00ABDC */ jal fio_validate_header_checksums -/* ED03F0 80240400 00000000 */ nop +/* ED03F0 80240400 00000000 */ nop /* ED03F4 80240404 0809010F */ j .L8024043C /* ED03F8 80240408 E600000C */ swc1 $f0, 0xc($s0) .L8024040C: @@ -66,7 +66,7 @@ glabel func_80240320_ED0310 /* ED0400 80240410 2404003C */ addiu $a0, $zero, 0x3c /* ED0404 80240414 C60C000C */ lwc1 $f12, 0xc($s0) /* ED0408 80240418 44820000 */ mtc1 $v0, $f0 -/* ED040C 8024041C 00000000 */ nop +/* ED040C 8024041C 00000000 */ nop /* ED0410 80240420 46800020 */ cvt.s.w $f0, $f0 /* ED0414 80240424 46006300 */ add.s $f12, $f12, $f0 /* ED0418 80240428 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240320_ED0310 /* ED043C 8024044C 8E2200D0 */ lw $v0, 0xd0($s1) /* ED0440 80240450 8C420014 */ lw $v0, 0x14($v0) /* ED0444 80240454 04410004 */ bgez $v0, .L80240468 -/* ED0448 80240458 00000000 */ nop +/* ED0448 80240458 00000000 */ nop /* ED044C 8024045C C6400000 */ lwc1 $f0, ($s2) /* ED0450 80240460 08090122 */ j .L80240488 /* ED0454 80240464 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240320_ED0310 /* ED0458 80240468 3C018024 */ lui $at, %hi(D_802441D0) /* ED045C 8024046C D42241D0 */ ldc1 $f2, %lo(D_802441D0)($at) /* ED0460 80240470 44820000 */ mtc1 $v0, $f0 -/* ED0464 80240474 00000000 */ nop +/* ED0464 80240474 00000000 */ nop /* ED0468 80240478 46800021 */ cvt.d.w $f0, $f0 /* ED046C 8024047C 46220003 */ div.d $f0, $f0, $f2 /* ED0470 80240480 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240320_ED0310 /* ED0484 80240494 44801000 */ mtc1 $zero, $f2 /* ED0488 80240498 46000021 */ cvt.d.s $f0, $f0 /* ED048C 8024049C 46220002 */ mul.d $f0, $f0, $f2 -/* ED0490 802404A0 00000000 */ nop +/* ED0490 802404A0 00000000 */ nop /* ED0494 802404A4 24020001 */ addiu $v0, $zero, 1 /* ED0498 802404A8 4620018D */ trunc.w.d $f6, $f0 /* ED049C 802404AC E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/code_ED0310/func_802404D0_ED04C0.s b/asm/nonmatchings/code_ED0310/func_802404D0_ED04C0.s index b4492012af..4179bc8b52 100644 --- a/asm/nonmatchings/code_ED0310/func_802404D0_ED04C0.s +++ b/asm/nonmatchings/code_ED0310/func_802404D0_ED04C0.s @@ -34,7 +34,7 @@ glabel func_802404D0_ED04C0 /* ED0534 80240544 44803000 */ mtc1 $zero, $f6 /* ED0538 80240548 46000021 */ cvt.d.s $f0, $f0 /* ED053C 8024054C 46260002 */ mul.d $f0, $f0, $f6 -/* ED0540 80240550 00000000 */ nop +/* ED0540 80240550 00000000 */ nop /* ED0544 80240554 24020001 */ addiu $v0, $zero, 1 /* ED0548 80240558 8E24006C */ lw $a0, 0x6c($s1) /* ED054C 8024055C 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_802404D0_ED04C0 /* ED05A8 802405B8 C600003C */ lwc1 $f0, 0x3c($s0) /* ED05AC 802405BC 4600C001 */ sub.s $f0, $f24, $f0 /* ED05B0 802405C0 4600B03C */ c.lt.s $f22, $f0 -/* ED05B4 802405C4 00000000 */ nop +/* ED05B4 802405C4 00000000 */ nop /* ED05B8 802405C8 4500001B */ bc1f .L80240638 /* ED05BC 802405CC 34820010 */ ori $v0, $a0, 0x10 /* ED05C0 802405D0 0809018E */ j .L80240638 @@ -87,9 +87,9 @@ glabel func_802404D0_ED04C0 /* ED0604 80240614 C7A00034 */ lwc1 $f0, 0x34($sp) /* ED0608 80240618 4600D001 */ sub.s $f0, $f26, $f0 /* ED060C 8024061C 4600B03C */ c.lt.s $f22, $f0 -/* ED0610 80240620 00000000 */ nop +/* ED0610 80240620 00000000 */ nop /* ED0614 80240624 45000004 */ bc1f .L80240638 -/* ED0618 80240628 00000000 */ nop +/* ED0618 80240628 00000000 */ nop /* ED061C 8024062C 8E22006C */ lw $v0, 0x6c($s1) /* ED0620 80240630 34420010 */ ori $v0, $v0, 0x10 /* ED0624 80240634 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_802404D0_ED04C0 /* ED062C 8024063C 24030011 */ addiu $v1, $zero, 0x11 /* ED0630 80240640 30420011 */ andi $v0, $v0, 0x11 /* ED0634 80240644 14430039 */ bne $v0, $v1, .L8024072C -/* ED0638 80240648 00000000 */ nop +/* ED0638 80240648 00000000 */ nop /* ED063C 8024064C 8E020000 */ lw $v0, ($s0) /* ED0640 80240650 30420008 */ andi $v0, $v0, 8 /* ED0644 80240654 1040000A */ beqz $v0, .L80240680 @@ -108,7 +108,7 @@ glabel func_802404D0_ED04C0 /* ED0654 80240664 D42041D8 */ ldc1 $f0, %lo(D_802441D8)($at) /* ED0658 80240668 460010A1 */ cvt.d.s $f2, $f2 /* ED065C 8024066C 46201082 */ mul.d $f2, $f2, $f0 -/* ED0660 80240670 00000000 */ nop +/* ED0660 80240670 00000000 */ nop /* ED0664 80240674 4600A021 */ cvt.d.s $f0, $f20 /* ED0668 80240678 080901B9 */ j .L802406E4 /* ED066C 8024067C 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_802404D0_ED04C0 /* ED06BC 802406CC D42041E0 */ ldc1 $f0, %lo(D_802441E0)($at) /* ED06C0 802406D0 460010A1 */ cvt.d.s $f2, $f2 /* ED06C4 802406D4 46201082 */ mul.d $f2, $f2, $f0 -/* ED06C8 802406D8 00000000 */ nop +/* ED06C8 802406D8 00000000 */ nop /* ED06CC 802406DC 4600A021 */ cvt.d.s $f0, $f20 /* ED06D0 802406E0 46220000 */ add.d $f0, $f0, $f2 .L802406E4: @@ -149,7 +149,7 @@ glabel func_802404D0_ED04C0 /* ED06F0 80240700 46000005 */ abs.s $f0, $f0 /* ED06F4 80240704 46000021 */ cvt.d.s $f0, $f0 /* ED06F8 80240708 4622003C */ c.lt.d $f0, $f2 -/* ED06FC 8024070C 00000000 */ nop +/* ED06FC 8024070C 00000000 */ nop /* ED0700 80240710 45000036 */ bc1f .L802407EC /* ED0704 80240714 2403FFEF */ addiu $v1, $zero, -0x11 /* ED0708 80240718 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_802404D0_ED04C0 .L8024072C: /* ED071C 8024072C 8E220070 */ lw $v0, 0x70($s1) /* ED0720 80240730 1840002E */ blez $v0, .L802407EC -/* ED0724 80240734 00000000 */ nop +/* ED0724 80240734 00000000 */ nop /* ED0728 80240738 C62C0074 */ lwc1 $f12, 0x74($s1) /* ED072C 8024073C 0C00AD77 */ jal func_8002B5DC /* ED0730 80240740 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_802404D0_ED04C0 /* ED0788 80240798 27A70030 */ addiu $a3, $sp, 0x30 .L8024079C: /* ED078C 8024079C 10400007 */ beqz $v0, .L802407BC -/* ED0790 802407A0 00000000 */ nop +/* ED0790 802407A0 00000000 */ nop /* ED0794 802407A4 4616A082 */ mul.s $f2, $f20, $f22 -/* ED0798 802407A8 00000000 */ nop +/* ED0798 802407A8 00000000 */ nop /* ED079C 802407AC C7A0002C */ lwc1 $f0, 0x2c($sp) /* ED07A0 802407B0 461A0000 */ add.s $f0, $f0, $f26 /* ED07A4 802407B4 080901F2 */ j .L802407C8 /* ED07A8 802407B8 46020000 */ add.s $f0, $f0, $f2 .L802407BC: /* ED07AC 802407BC 4616A002 */ mul.s $f0, $f20, $f22 -/* ED07B0 802407C0 00000000 */ nop +/* ED07B0 802407C0 00000000 */ nop /* ED07B4 802407C4 4600C000 */ add.s $f0, $f24, $f0 .L802407C8: /* ED07B8 802407C8 E600003C */ swc1 $f0, 0x3c($s0) /* ED07BC 802407CC 8E220074 */ lw $v0, 0x74($s1) /* ED07C0 802407D0 2442000A */ addiu $v0, $v0, 0xa /* ED07C4 802407D4 44826000 */ mtc1 $v0, $f12 -/* ED07C8 802407D8 00000000 */ nop +/* ED07C8 802407D8 00000000 */ nop /* ED07CC 802407DC 0C00AB85 */ jal func_8002AE14 /* ED07D0 802407E0 46806320 */ cvt.s.w $f12, $f12 /* ED07D4 802407E4 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_802404D0_ED04C0 /* ED07E4 802407F4 2442FFFF */ addiu $v0, $v0, -1 /* ED07E8 802407F8 8E430014 */ lw $v1, 0x14($s2) /* ED07EC 802407FC 04600048 */ bltz $v1, .L80240920 -/* ED07F0 80240800 00000000 */ nop +/* ED07F0 80240800 00000000 */ nop /* ED07F4 80240804 8E620074 */ lw $v0, 0x74($s3) /* ED07F8 80240808 1C400042 */ bgtz $v0, .L80240914 /* ED07FC 8024080C 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_802404D0_ED04C0 /* ED0804 80240814 860200A8 */ lh $v0, 0xa8($s0) /* ED0808 80240818 C602003C */ lwc1 $f2, 0x3c($s0) /* ED080C 8024081C 44820000 */ mtc1 $v0, $f0 -/* ED0810 80240820 00000000 */ nop +/* ED0810 80240820 00000000 */ nop /* ED0814 80240824 46800020 */ cvt.s.w $f0, $f0 /* ED0818 80240828 46001080 */ add.s $f2, $f2, $f0 /* ED081C 8024082C 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_802404D0_ED04C0 /* ED0838 80240848 C440002C */ lwc1 $f0, 0x2c($v0) /* ED083C 8024084C 46000021 */ cvt.d.s $f0, $f0 /* ED0840 80240850 4622003C */ c.lt.d $f0, $f2 -/* ED0844 80240854 00000000 */ nop +/* ED0844 80240854 00000000 */ nop /* ED0848 80240858 4500002C */ bc1f .L8024090C /* ED084C 8024085C 02A0202D */ daddu $a0, $s5, $zero /* ED0850 80240860 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_802404D0_ED04C0 /* ED088C 8024089C 3C01C1A0 */ lui $at, 0xc1a0 /* ED0890 802408A0 44812000 */ mtc1 $at, $f4 /* ED0894 802408A4 44834000 */ mtc1 $v1, $f8 -/* ED0898 802408A8 00000000 */ nop +/* ED0898 802408A8 00000000 */ nop /* ED089C 802408AC 46804220 */ cvt.s.w $f8, $f8 /* ED08A0 802408B0 44074000 */ mfc1 $a3, $f8 /* ED08A4 802408B4 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_802404D0_ED04C0 /* ED0958 80240968 0C013431 */ jal func_8004D0C4 /* ED095C 8024096C 8E070038 */ lw $a3, 0x38($s0) /* ED0960 80240970 1040001A */ beqz $v0, .L802409DC -/* ED0964 80240974 00000000 */ nop +/* ED0964 80240974 00000000 */ nop /* ED0968 80240978 8E060038 */ lw $a2, 0x38($s0) /* ED096C 8024097C 8E2200D0 */ lw $v0, 0xd0($s1) /* ED0970 80240980 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_802404D0_ED04C0 /* ED0984 80240994 468073A0 */ cvt.s.w $f14, $f14 /* ED0988 80240998 C6020018 */ lwc1 $f2, 0x18($s0) /* ED098C 8024099C 4600103C */ c.lt.s $f2, $f0 -/* ED0990 802409A0 00000000 */ nop +/* ED0990 802409A0 00000000 */ nop /* ED0994 802409A4 4500000D */ bc1f .L802409DC /* ED0998 802409A8 E7A00034 */ swc1 $f0, 0x34($sp) /* ED099C 802409AC C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_802404D0_ED04C0 /* ED09D8 802409E8 00621825 */ or $v1, $v1, $v0 /* ED09DC 802409EC 00741825 */ or $v1, $v1, $s4 /* ED09E0 802409F0 10600008 */ beqz $v1, .L80240A14 -/* ED09E4 802409F4 00000000 */ nop +/* ED09E4 802409F4 00000000 */ nop /* ED09E8 802409F8 8602008C */ lh $v0, 0x8c($s0) /* ED09EC 802409FC 14400031 */ bnez $v0, .L80240AC4 -/* ED09F0 80240A00 00000000 */ nop +/* ED09F0 80240A00 00000000 */ nop /* ED09F4 80240A04 8E050018 */ lw $a1, 0x18($s0) /* ED09F8 80240A08 8E06000C */ lw $a2, 0xc($s0) /* ED09FC 80240A0C 0C00F909 */ jal func_8003E424 @@ -362,12 +362,12 @@ glabel func_802404D0_ED04C0 /* ED0A10 80240A20 44801000 */ mtc1 $zero, $f2 /* ED0A14 80240A24 46000021 */ cvt.d.s $f0, $f0 /* ED0A18 80240A28 46220002 */ mul.d $f0, $f0, $f2 -/* ED0A1C 80240A2C 00000000 */ nop +/* ED0A1C 80240A2C 00000000 */ nop /* ED0A20 80240A30 4620020D */ trunc.w.d $f8, $f0 /* ED0A24 80240A34 E628007C */ swc1 $f8, 0x7c($s1) /* ED0A28 80240A38 8E420004 */ lw $v0, 4($s2) /* ED0A2C 80240A3C 18400021 */ blez $v0, .L80240AC4 -/* ED0A30 80240A40 00000000 */ nop +/* ED0A30 80240A40 00000000 */ nop /* ED0A34 80240A44 8602008E */ lh $v0, 0x8e($s0) /* ED0A38 80240A48 9603008E */ lhu $v1, 0x8e($s0) /* ED0A3C 80240A4C 18400005 */ blez $v0, .L80240A64 @@ -375,7 +375,7 @@ glabel func_802404D0_ED04C0 /* ED0A44 80240A54 A602008E */ sh $v0, 0x8e($s0) /* ED0A48 80240A58 00021400 */ sll $v0, $v0, 0x10 /* ED0A4C 80240A5C 1C400019 */ bgtz $v0, .L80240AC4 -/* ED0A50 80240A60 00000000 */ nop +/* ED0A50 80240A60 00000000 */ nop .L80240A64: /* ED0A54 80240A64 240403E8 */ addiu $a0, $zero, 0x3e8 /* ED0A58 80240A68 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_802404D0_ED04C0 /* ED0AA0 80240AB0 18400003 */ blez $v0, .L80240AC0 /* ED0AA4 80240AB4 28620003 */ slti $v0, $v1, 3 /* ED0AA8 80240AB8 10400002 */ beqz $v0, .L80240AC4 -/* ED0AAC 80240ABC 00000000 */ nop +/* ED0AAC 80240ABC 00000000 */ nop .L80240AC0: /* ED0AB0 80240AC0 AE600070 */ sw $zero, 0x70($s3) .L80240AC4: diff --git a/asm/nonmatchings/code_ED0310/func_80240AF8_ED0AE8.s b/asm/nonmatchings/code_ED0310/func_80240AF8_ED0AE8.s index d3f1d7e153..fabf65764c 100644 --- a/asm/nonmatchings/code_ED0310/func_80240AF8_ED0AE8.s +++ b/asm/nonmatchings/code_ED0310/func_80240AF8_ED0AE8.s @@ -30,7 +30,7 @@ glabel func_80240AF8_ED0AE8 /* ED0B4C 80240B5C A603008E */ sh $v1, 0x8e($s0) /* ED0B50 80240B60 C60C000C */ lwc1 $f12, 0xc($s0) /* ED0B54 80240B64 44820000 */ mtc1 $v0, $f0 -/* ED0B58 80240B68 00000000 */ nop +/* ED0B58 80240B68 00000000 */ nop /* ED0B5C 80240B6C 46800020 */ cvt.s.w $f0, $f0 /* ED0B60 80240B70 46006300 */ add.s $f12, $f12, $f0 /* ED0B64 80240B74 3C0142B4 */ lui $at, 0x42b4 diff --git a/asm/nonmatchings/code_ED0310/func_80240BB8_ED0BA8.s b/asm/nonmatchings/code_ED0310/func_80240BB8_ED0BA8.s index cba11646f2..503ce05cd5 100644 --- a/asm/nonmatchings/code_ED0310/func_80240BB8_ED0BA8.s +++ b/asm/nonmatchings/code_ED0310/func_80240BB8_ED0BA8.s @@ -42,11 +42,11 @@ glabel func_80240BB8_ED0BA8 .L80240C4C: /* ED0C3C 80240C4C 8E220070 */ lw $v0, 0x70($s1) /* ED0C40 80240C50 18400034 */ blez $v0, .L80240D24 -/* ED0C44 80240C54 00000000 */ nop +/* ED0C44 80240C54 00000000 */ nop /* ED0C48 80240C58 C62C0074 */ lwc1 $f12, 0x74($s1) /* ED0C4C 80240C5C 46806320 */ cvt.s.w $f12, $f12 /* ED0C50 80240C60 44820000 */ mtc1 $v0, $f0 -/* ED0C54 80240C64 00000000 */ nop +/* ED0C54 80240C64 00000000 */ nop /* ED0C58 80240C68 46800020 */ cvt.s.w $f0, $f0 /* ED0C5C 80240C6C 46000021 */ cvt.d.s $f0, $f0 /* ED0C60 80240C70 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_80240BB8_ED0BA8 /* ED0CC0 80240CD0 27A70030 */ addiu $a3, $sp, 0x30 .L80240CD4: /* ED0CC4 80240CD4 10400007 */ beqz $v0, .L80240CF4 -/* ED0CC8 80240CD8 00000000 */ nop +/* ED0CC8 80240CD8 00000000 */ nop /* ED0CCC 80240CDC 4616A082 */ mul.s $f2, $f20, $f22 -/* ED0CD0 80240CE0 00000000 */ nop +/* ED0CD0 80240CE0 00000000 */ nop /* ED0CD4 80240CE4 C7A0002C */ lwc1 $f0, 0x2c($sp) /* ED0CD8 80240CE8 46180000 */ add.s $f0, $f0, $f24 /* ED0CDC 80240CEC 08090340 */ j .L80240D00 /* ED0CE0 80240CF0 46020000 */ add.s $f0, $f0, $f2 .L80240CF4: /* ED0CE4 80240CF4 4616A002 */ mul.s $f0, $f20, $f22 -/* ED0CE8 80240CF8 00000000 */ nop +/* ED0CE8 80240CF8 00000000 */ nop /* ED0CEC 80240CFC 4600D000 */ add.s $f0, $f26, $f0 .L80240D00: /* ED0CF0 80240D00 E600003C */ swc1 $f0, 0x3c($s0) /* ED0CF4 80240D04 8E220074 */ lw $v0, 0x74($s1) /* ED0CF8 80240D08 2442000A */ addiu $v0, $v0, 0xa /* ED0CFC 80240D0C 44826000 */ mtc1 $v0, $f12 -/* ED0D00 80240D10 00000000 */ nop +/* ED0D00 80240D10 00000000 */ nop /* ED0D04 80240D14 0C00AB85 */ jal func_8002AE14 /* ED0D08 80240D18 46806320 */ cvt.s.w $f12, $f12 /* ED0D0C 80240D1C 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_80240BB8_ED0BA8 /* ED0D20 80240D30 860200A8 */ lh $v0, 0xa8($s0) /* ED0D24 80240D34 C600003C */ lwc1 $f0, 0x3c($s0) /* ED0D28 80240D38 44821000 */ mtc1 $v0, $f2 -/* ED0D2C 80240D3C 00000000 */ nop +/* ED0D2C 80240D3C 00000000 */ nop /* ED0D30 80240D40 468010A0 */ cvt.s.w $f2, $f2 /* ED0D34 80240D44 3C028010 */ lui $v0, %hi(D_800FFC90) /* ED0D38 80240D48 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) @@ -118,7 +118,7 @@ glabel func_80240BB8_ED0BA8 /* ED0D54 80240D64 46240000 */ add.d $f0, $f0, $f4 /* ED0D58 80240D68 460010A1 */ cvt.d.s $f2, $f2 /* ED0D5C 80240D6C 4620103C */ c.lt.d $f2, $f0 -/* ED0D60 80240D70 00000000 */ nop +/* ED0D60 80240D70 00000000 */ nop /* ED0D64 80240D74 4500002E */ bc1f .L80240E30 /* ED0D68 80240D78 0280202D */ daddu $a0, $s4, $zero /* ED0D6C 80240D7C 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_80240BB8_ED0BA8 /* ED0DAC 80240DBC 3C01C1A0 */ lui $at, 0xc1a0 /* ED0DB0 80240DC0 44812000 */ mtc1 $at, $f4 /* ED0DB4 80240DC4 44834000 */ mtc1 $v1, $f8 -/* ED0DB8 80240DC8 00000000 */ nop +/* ED0DB8 80240DC8 00000000 */ nop /* ED0DBC 80240DCC 46804220 */ cvt.s.w $f8, $f8 /* ED0DC0 80240DD0 44074000 */ mfc1 $a3, $f8 /* ED0DC4 80240DD4 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_80240BB8_ED0BA8 .L80240E30: /* ED0E20 80240E30 8602008C */ lh $v0, 0x8c($s0) /* ED0E24 80240E34 14400025 */ bnez $v0, .L80240ECC -/* ED0E28 80240E38 00000000 */ nop +/* ED0E28 80240E38 00000000 */ nop /* ED0E2C 80240E3C 8602008E */ lh $v0, 0x8e($s0) /* ED0E30 80240E40 1C400022 */ bgtz $v0, .L80240ECC -/* ED0E34 80240E44 00000000 */ nop +/* ED0E34 80240E44 00000000 */ nop /* ED0E38 80240E48 8E620074 */ lw $v0, 0x74($s3) /* ED0E3C 80240E4C 2442FFFF */ addiu $v0, $v0, -1 /* ED0E40 80240E50 1840001D */ blez $v0, .L80240EC8 @@ -183,7 +183,7 @@ glabel func_80240BB8_ED0BA8 /* ED0E4C 80240E5C 9442002A */ lhu $v0, 0x2a($v0) /* ED0E50 80240E60 30420010 */ andi $v0, $v0, 0x10 /* ED0E54 80240E64 14400007 */ bnez $v0, .L80240E84 -/* ED0E58 80240E68 00000000 */ nop +/* ED0E58 80240E68 00000000 */ nop /* ED0E5C 80240E6C C600000C */ lwc1 $f0, 0xc($s0) /* ED0E60 80240E70 3C014334 */ lui $at, 0x4334 /* ED0E64 80240E74 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/code_ED0310/func_80240FE0_ED0FD0.s b/asm/nonmatchings/code_ED0310/func_80240FE0_ED0FD0.s index f27f1fc605..c06fee21bb 100644 --- a/asm/nonmatchings/code_ED0310/func_80240FE0_ED0FD0.s +++ b/asm/nonmatchings/code_ED0310/func_80240FE0_ED0FD0.s @@ -60,18 +60,18 @@ glabel func_80240FE0_ED0FD0 /* ED10A8 802410B8 C6200038 */ lwc1 $f0, 0x38($s1) /* ED10AC 802410BC 4600018D */ trunc.w.s $f6, $f0 /* ED10B0 802410C0 44023000 */ mfc1 $v0, $f6 -/* ED10B4 802410C4 00000000 */ nop +/* ED10B4 802410C4 00000000 */ nop /* ED10B8 802410C8 A6420010 */ sh $v0, 0x10($s2) /* ED10BC 802410CC C620003C */ lwc1 $f0, 0x3c($s1) /* ED10C0 802410D0 4600018D */ trunc.w.s $f6, $f0 /* ED10C4 802410D4 44023000 */ mfc1 $v0, $f6 -/* ED10C8 802410D8 00000000 */ nop +/* ED10C8 802410D8 00000000 */ nop /* ED10CC 802410DC A6420012 */ sh $v0, 0x12($s2) /* ED10D0 802410E0 C6200040 */ lwc1 $f0, 0x40($s1) /* ED10D4 802410E4 A2430007 */ sb $v1, 7($s2) /* ED10D8 802410E8 4600018D */ trunc.w.s $f6, $f0 /* ED10DC 802410EC 44023000 */ mfc1 $v0, $f6 -/* ED10E0 802410F0 00000000 */ nop +/* ED10E0 802410F0 00000000 */ nop /* ED10E4 802410F4 A6420014 */ sh $v0, 0x14($s2) .L802410F8: /* ED10E8 802410F8 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/code_ED0310/func_80241114_ED1104.s b/asm/nonmatchings/code_ED0310/func_80241114_ED1104.s index 208c73878d..236c3b2db3 100644 --- a/asm/nonmatchings/code_ED0310/func_80241114_ED1104.s +++ b/asm/nonmatchings/code_ED0310/func_80241114_ED1104.s @@ -17,7 +17,7 @@ glabel func_80241114_ED1104 /* ED1134 80241144 A482008E */ sh $v0, 0x8e($a0) /* ED1138 80241148 00021400 */ sll $v0, $v0, 0x10 /* ED113C 8024114C 1C400006 */ bgtz $v0, .L80241168 -/* ED1140 80241150 00000000 */ nop +/* ED1140 80241150 00000000 */ nop .L80241154: /* ED1144 80241154 8482008C */ lh $v0, 0x8c($a0) /* ED1148 80241158 14400003 */ bnez $v0, .L80241168 diff --git a/asm/nonmatchings/code_ED0310/func_80241178_ED1168.s b/asm/nonmatchings/code_ED0310/func_80241178_ED1168.s index f13c4e20fe..acb96cfb75 100644 --- a/asm/nonmatchings/code_ED0310/func_80241178_ED1168.s +++ b/asm/nonmatchings/code_ED0310/func_80241178_ED1168.s @@ -42,9 +42,9 @@ glabel func_80241178_ED1168 /* ED11FC 8024120C 44801800 */ mtc1 $zero, $f3 /* ED1200 80241210 46002021 */ cvt.d.s $f0, $f4 /* ED1204 80241214 4620103E */ c.le.d $f2, $f0 -/* ED1208 80241218 00000000 */ nop +/* ED1208 80241218 00000000 */ nop /* ED120C 8024121C 45000030 */ bc1f .L802412E0 -/* ED1210 80241220 00000000 */ nop +/* ED1210 80241220 00000000 */ nop /* ED1214 80241224 C600003C */ lwc1 $f0, 0x3c($s0) /* ED1218 80241228 46040000 */ add.s $f0, $f0, $f4 /* ED121C 8024122C E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_80241178_ED1168 /* ED127C 8024128C 27A70020 */ addiu $a3, $sp, 0x20 .L80241290: /* ED1280 80241290 1040000B */ beqz $v0, .L802412C0 -/* ED1284 80241294 00000000 */ nop +/* ED1284 80241294 00000000 */ nop /* ED1288 80241298 C7A0001C */ lwc1 $f0, 0x1c($sp) /* ED128C 8024129C 46140080 */ add.s $f2, $f0, $f20 /* ED1290 802412A0 C600003C */ lwc1 $f0, 0x3c($s0) /* ED1294 802412A4 4600103E */ c.le.s $f2, $f0 -/* ED1298 802412A8 00000000 */ nop +/* ED1298 802412A8 00000000 */ nop /* ED129C 802412AC 4500008D */ bc1f .L802414E4 -/* ED12A0 802412B0 00000000 */ nop +/* ED12A0 802412B0 00000000 */ nop /* ED12A4 802412B4 E602003C */ swc1 $f2, 0x3c($s0) /* ED12A8 802412B8 08090539 */ j .L802414E4 /* ED12AC 802412BC AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_80241178_ED1168 /* ED12B0 802412C0 C602003C */ lwc1 $f2, 0x3c($s0) /* ED12B4 802412C4 C6000064 */ lwc1 $f0, 0x64($s0) /* ED12B8 802412C8 4602003E */ c.le.s $f0, $f2 -/* ED12BC 802412CC 00000000 */ nop +/* ED12BC 802412CC 00000000 */ nop /* ED12C0 802412D0 45030084 */ bc1tl .L802414E4 /* ED12C4 802412D4 AE400070 */ sw $zero, 0x70($s2) /* ED12C8 802412D8 08090539 */ j .L802414E4 -/* ED12CC 802412DC 00000000 */ nop +/* ED12CC 802412DC 00000000 */ nop .L802412E0: /* ED12D0 802412E0 4622003C */ c.lt.d $f0, $f2 -/* ED12D4 802412E4 00000000 */ nop +/* ED12D4 802412E4 00000000 */ nop /* ED12D8 802412E8 4500007E */ bc1f .L802414E4 -/* ED12DC 802412EC 00000000 */ nop +/* ED12DC 802412EC 00000000 */ nop /* ED12E0 802412F0 9602008E */ lhu $v0, 0x8e($s0) /* ED12E4 802412F4 24420001 */ addiu $v0, $v0, 1 /* ED12E8 802412F8 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_80241178_ED1168 /* ED12F4 80241304 00021403 */ sra $v0, $v0, 0x10 /* ED12F8 80241308 0043102A */ slt $v0, $v0, $v1 /* ED12FC 8024130C 14400026 */ bnez $v0, .L802413A8 -/* ED1300 80241310 00000000 */ nop +/* ED1300 80241310 00000000 */ nop /* ED1304 80241314 C60C0038 */ lwc1 $f12, 0x38($s0) /* ED1308 80241318 C60E0040 */ lwc1 $f14, 0x40($s0) /* ED130C 8024131C 3C028010 */ lui $v0, %hi(D_800FFC90) @@ -124,20 +124,20 @@ glabel func_80241178_ED1168 /* ED1338 80241348 8E62001C */ lw $v0, 0x1c($s3) /* ED133C 8024134C 46001005 */ abs.s $f0, $f2 /* ED1340 80241350 44822000 */ mtc1 $v0, $f4 -/* ED1344 80241354 00000000 */ nop +/* ED1344 80241354 00000000 */ nop /* ED1348 80241358 46802120 */ cvt.s.w $f4, $f4 /* ED134C 8024135C 4600203C */ c.lt.s $f4, $f0 -/* ED1350 80241360 00000000 */ nop +/* ED1350 80241360 00000000 */ nop /* ED1354 80241364 4500000D */ bc1f .L8024139C -/* ED1358 80241368 00000000 */ nop +/* ED1358 80241368 00000000 */ nop /* ED135C 8024136C 44800000 */ mtc1 $zero, $f0 /* ED1360 80241370 C614000C */ lwc1 $f20, 0xc($s0) /* ED1364 80241374 4600103C */ c.lt.s $f2, $f0 -/* ED1368 80241378 00000000 */ nop +/* ED1368 80241378 00000000 */ nop /* ED136C 8024137C 45000006 */ bc1f .L80241398 /* ED1370 80241380 00021023 */ negu $v0, $v0 /* ED1374 80241384 44820000 */ mtc1 $v0, $f0 -/* ED1378 80241388 00000000 */ nop +/* ED1378 80241388 00000000 */ nop /* ED137C 8024138C 46800020 */ cvt.s.w $f0, $f0 /* ED1380 80241390 080904E7 */ j .L8024139C /* ED1384 80241394 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_80241178_ED1168 /* ED13AC 802413BC C600001C */ lwc1 $f0, 0x1c($s0) /* ED13B0 802413C0 46001080 */ add.s $f2, $f2, $f0 /* ED13B4 802413C4 4616103C */ c.lt.s $f2, $f22 -/* ED13B8 802413C8 00000000 */ nop +/* ED13B8 802413C8 00000000 */ nop /* ED13BC 802413CC 45020045 */ bc1fl .L802414E4 /* ED13C0 802413D0 E602003C */ swc1 $f2, 0x3c($s0) /* ED13C4 802413D4 08090538 */ j .L802414E0 @@ -169,7 +169,7 @@ glabel func_80241178_ED1168 /* ED13DC 802413EC C600001C */ lwc1 $f0, 0x1c($s0) /* ED13E0 802413F0 C604003C */ lwc1 $f4, 0x3c($s0) /* ED13E4 802413F4 44821000 */ mtc1 $v0, $f2 -/* ED13E8 802413F8 00000000 */ nop +/* ED13E8 802413F8 00000000 */ nop /* ED13EC 802413FC 468010A0 */ cvt.s.w $f2, $f2 /* ED13F0 80241400 46000005 */ abs.s $f0, $f0 /* ED13F4 80241404 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_80241178_ED1168 /* ED1430 80241440 0C03908F */ jal func_800E423C /* ED1434 80241444 27A70020 */ addiu $a3, $sp, 0x20 /* ED1438 80241448 10400015 */ beqz $v0, .L802414A0 -/* ED143C 8024144C 00000000 */ nop +/* ED143C 8024144C 00000000 */ nop /* ED1440 80241450 860200A8 */ lh $v0, 0xa8($s0) /* ED1444 80241454 C604001C */ lwc1 $f4, 0x1c($s0) /* ED1448 80241458 44820000 */ mtc1 $v0, $f0 -/* ED144C 8024145C 00000000 */ nop +/* ED144C 8024145C 00000000 */ nop /* ED1450 80241460 46800020 */ cvt.s.w $f0, $f0 /* ED1454 80241464 46002085 */ abs.s $f2, $f4 /* ED1458 80241468 46020000 */ add.s $f0, $f0, $f2 /* ED145C 8024146C C7A20024 */ lwc1 $f2, 0x24($sp) /* ED1460 80241470 4600103E */ c.le.s $f2, $f0 -/* ED1464 80241474 00000000 */ nop +/* ED1464 80241474 00000000 */ nop /* ED1468 80241478 45000005 */ bc1f .L80241490 -/* ED146C 8024147C 00000000 */ nop +/* ED146C 8024147C 00000000 */ nop /* ED1470 80241480 C7A0001C */ lwc1 $f0, 0x1c($sp) /* ED1474 80241484 AE00001C */ sw $zero, 0x1c($s0) /* ED1478 80241488 08090539 */ j .L802414E4 @@ -217,13 +217,13 @@ glabel func_80241178_ED1168 /* ED1494 802414A4 860200A8 */ lh $v0, 0xa8($s0) /* ED1498 802414A8 46163081 */ sub.s $f2, $f6, $f22 /* ED149C 802414AC 44820000 */ mtc1 $v0, $f0 -/* ED14A0 802414B0 00000000 */ nop +/* ED14A0 802414B0 00000000 */ nop /* ED14A4 802414B4 46800020 */ cvt.s.w $f0, $f0 /* ED14A8 802414B8 46001080 */ add.s $f2, $f2, $f0 /* ED14AC 802414BC C604001C */ lwc1 $f4, 0x1c($s0) /* ED14B0 802414C0 46002005 */ abs.s $f0, $f4 /* ED14B4 802414C4 4602003C */ c.lt.s $f0, $f2 -/* ED14B8 802414C8 00000000 */ nop +/* ED14B8 802414C8 00000000 */ nop /* ED14BC 802414CC 45020005 */ bc1fl .L802414E4 /* ED14C0 802414D0 AE00001C */ sw $zero, 0x1c($s0) /* ED14C4 802414D4 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/code_ED0310/func_80241508_ED14F8.s b/asm/nonmatchings/code_ED0310/func_80241508_ED14F8.s index 72d0d93c02..9ea17f9641 100644 --- a/asm/nonmatchings/code_ED0310/func_80241508_ED14F8.s +++ b/asm/nonmatchings/code_ED0310/func_80241508_ED14F8.s @@ -49,15 +49,15 @@ glabel func_80241508_ED14F8 /* ED15A0 802415B0 44802000 */ mtc1 $zero, $f4 /* ED15A4 802415B4 460010A1 */ cvt.d.s $f2, $f2 /* ED15A8 802415B8 46241082 */ mul.d $f2, $f2, $f4 -/* ED15AC 802415BC 00000000 */ nop +/* ED15AC 802415BC 00000000 */ nop /* ED15B0 802415C0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* ED15B4 802415C4 46000021 */ cvt.d.s $f0, $f0 /* ED15B8 802415C8 46240002 */ mul.d $f0, $f0, $f4 -/* ED15BC 802415CC 00000000 */ nop +/* ED15BC 802415CC 00000000 */ nop /* ED15C0 802415D0 3C013FE0 */ lui $at, 0x3fe0 /* ED15C4 802415D4 44812800 */ mtc1 $at, $f5 /* ED15C8 802415D8 44802000 */ mtc1 $zero, $f4 -/* ED15CC 802415DC 00000000 */ nop +/* ED15CC 802415DC 00000000 */ nop /* ED15D0 802415E0 46241080 */ add.d $f2, $f2, $f4 /* ED15D4 802415E4 AE000074 */ sw $zero, 0x74($s0) /* ED15D8 802415E8 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/code_ED0310/func_8024162C_ED161C.s b/asm/nonmatchings/code_ED0310/func_8024162C_ED161C.s index 91796ca693..32cf802871 100644 --- a/asm/nonmatchings/code_ED0310/func_8024162C_ED161C.s +++ b/asm/nonmatchings/code_ED0310/func_8024162C_ED161C.s @@ -65,7 +65,7 @@ glabel func_8024162C_ED161C /* ED1708 80241718 8E4300B0 */ lw $v1, 0xb0($s2) /* ED170C 8024171C 30620004 */ andi $v0, $v1, 4 /* ED1710 80241720 10400007 */ beqz $v0, .L80241740 -/* ED1714 80241724 00000000 */ nop +/* ED1714 80241724 00000000 */ nop /* ED1718 80241728 824200B4 */ lb $v0, 0xb4($s2) /* ED171C 8024172C 1440003C */ bnez $v0, .L80241820 /* ED1720 80241730 0000102D */ daddu $v0, $zero, $zero @@ -77,58 +77,68 @@ glabel func_8024162C_ED161C /* ED1734 80241744 2C62000F */ sltiu $v0, $v1, 0xf /* ED1738 80241748 10400034 */ beqz $v0, .L8024181C /* ED173C 8024174C 00031080 */ sll $v0, $v1, 2 -/* ED1740 80241750 3C018024 */ lui $at, %hi(D_802441E8) +/* ED1740 80241750 3C018024 */ lui $at, %hi(jtbl_802441E8_ED41D8) /* ED1744 80241754 00220821 */ addu $at, $at, $v0 -/* ED1748 80241758 8C2241E8 */ lw $v0, %lo(D_802441E8)($at) +/* ED1748 80241758 8C2241E8 */ lw $v0, %lo(jtbl_802441E8_ED41D8)($at) /* ED174C 8024175C 00400008 */ jr $v0 -/* ED1750 80241760 00000000 */ nop +/* ED1750 80241760 00000000 */ nop +glabel L80241764_ED1754 /* ED1754 80241764 02A0202D */ daddu $a0, $s5, $zero /* ED1758 80241768 0200282D */ daddu $a1, $s0, $zero /* ED175C 8024176C 0C0900C8 */ jal func_80240320_ED0310 /* ED1760 80241770 0260302D */ daddu $a2, $s3, $zero +glabel L80241774_ED1764 /* ED1764 80241774 02A0202D */ daddu $a0, $s5, $zero /* ED1768 80241778 0200282D */ daddu $a1, $s0, $zero /* ED176C 8024177C 0C090134 */ jal func_802404D0_ED04C0 /* ED1770 80241780 0260302D */ daddu $a2, $s3, $zero /* ED1774 80241784 08090608 */ j .L80241820 /* ED1778 80241788 0000102D */ daddu $v0, $zero, $zero +glabel L8024178C_ED177C /* ED177C 8024178C 02A0202D */ daddu $a0, $s5, $zero /* ED1780 80241790 0200282D */ daddu $a1, $s0, $zero /* ED1784 80241794 0C0902BE */ jal func_80240AF8_ED0AE8 /* ED1788 80241798 0260302D */ daddu $a2, $s3, $zero +glabel L8024179C_ED178C /* ED178C 8024179C 02A0202D */ daddu $a0, $s5, $zero /* ED1790 802417A0 0200282D */ daddu $a1, $s0, $zero /* ED1794 802417A4 0C0902EE */ jal func_80240BB8_ED0BA8 /* ED1798 802417A8 0260302D */ daddu $a2, $s3, $zero /* ED179C 802417AC 08090608 */ j .L80241820 /* ED17A0 802417B0 0000102D */ daddu $v0, $zero, $zero +glabel L802417B4_ED17A4 /* ED17A4 802417B4 02A0202D */ daddu $a0, $s5, $zero /* ED17A8 802417B8 0200282D */ daddu $a1, $s0, $zero /* ED17AC 802417BC 0C0903BF */ jal func_80240EFC_ED0EEC /* ED17B0 802417C0 0260302D */ daddu $a2, $s3, $zero +glabel L802417C4_ED17B4 /* ED17B4 802417C4 02A0202D */ daddu $a0, $s5, $zero /* ED17B8 802417C8 0200282D */ daddu $a1, $s0, $zero /* ED17BC 802417CC 0C0903DD */ jal func_80240F74_ED0F64 /* ED17C0 802417D0 0260302D */ daddu $a2, $s3, $zero /* ED17C4 802417D4 08090608 */ j .L80241820 /* ED17C8 802417D8 0000102D */ daddu $v0, $zero, $zero +glabel L802417DC_ED17CC /* ED17CC 802417DC 02A0202D */ daddu $a0, $s5, $zero /* ED17D0 802417E0 0200282D */ daddu $a1, $s0, $zero /* ED17D4 802417E4 0C0903F8 */ jal func_80240FE0_ED0FD0 /* ED17D8 802417E8 0260302D */ daddu $a2, $s3, $zero /* ED17DC 802417EC 08090608 */ j .L80241820 /* ED17E0 802417F0 0000102D */ daddu $v0, $zero, $zero +glabel L802417F4_ED17E4 /* ED17E4 802417F4 02A0202D */ daddu $a0, $s5, $zero /* ED17E8 802417F8 0200282D */ daddu $a1, $s0, $zero /* ED17EC 802417FC 0C090445 */ jal func_80241114_ED1104 /* ED17F0 80241800 0260302D */ daddu $a2, $s3, $zero /* ED17F4 80241804 08090608 */ j .L80241820 /* ED17F8 80241808 0000102D */ daddu $v0, $zero, $zero +glabel L8024180C_ED17FC /* ED17FC 8024180C 02A0202D */ daddu $a0, $s5, $zero /* ED1800 80241810 0200282D */ daddu $a1, $s0, $zero /* ED1804 80241814 0C09045E */ jal func_80241178_ED1168 /* ED1808 80241818 0260302D */ daddu $a2, $s3, $zero .L8024181C: +glabel L8024181C_ED180C /* ED180C 8024181C 0000102D */ daddu $v0, $zero, $zero .L80241820: /* ED1810 80241820 8FBF0048 */ lw $ra, 0x48($sp) @@ -140,6 +150,6 @@ glabel func_8024162C_ED161C /* ED1828 80241838 8FB00030 */ lw $s0, 0x30($sp) /* ED182C 8024183C 03E00008 */ jr $ra /* ED1830 80241840 27BD0050 */ addiu $sp, $sp, 0x50 -/* ED1834 80241844 00000000 */ nop -/* ED1838 80241848 00000000 */ nop -/* ED183C 8024184C 00000000 */ nop +/* ED1834 80241844 00000000 */ nop +/* ED1838 80241848 00000000 */ nop +/* ED183C 8024184C 00000000 */ nop diff --git a/asm/nonmatchings/code_ED4220/func_80240000_ED4220.s b/asm/nonmatchings/code_ED4220/func_80240000_ED4220.s index f8e1bb04de..73101687bf 100644 --- a/asm/nonmatchings/code_ED4220/func_80240000_ED4220.s +++ b/asm/nonmatchings/code_ED4220/func_80240000_ED4220.s @@ -18,4 +18,4 @@ glabel func_80240000_ED4220 /* ED4250 80240030 8FBF0010 */ lw $ra, 0x10($sp) /* ED4254 80240034 03E00008 */ jr $ra /* ED4258 80240038 27BD0018 */ addiu $sp, $sp, 0x18 -/* ED425C 8024003C 00000000 */ nop +/* ED425C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/code_ED4260/func_80240040_ED4260.s b/asm/nonmatchings/code_ED4260/func_80240040_ED4260.s index 966950ed24..35b5f8a188 100644 --- a/asm/nonmatchings/code_ED4260/func_80240040_ED4260.s +++ b/asm/nonmatchings/code_ED4260/func_80240040_ED4260.s @@ -15,6 +15,6 @@ glabel func_80240040_ED4260 /* ED4288 80240068 24020002 */ addiu $v0, $zero, 2 /* ED428C 8024006C 03E00008 */ jr $ra /* ED4290 80240070 27BD0020 */ addiu $sp, $sp, 0x20 -/* ED4294 80240074 00000000 */ nop -/* ED4298 80240078 00000000 */ nop -/* ED429C 8024007C 00000000 */ nop +/* ED4294 80240074 00000000 */ nop +/* ED4298 80240078 00000000 */ nop +/* ED429C 8024007C 00000000 */ nop diff --git a/asm/nonmatchings/code_ED42A0/func_80240080_ED42A0.s b/asm/nonmatchings/code_ED42A0/func_80240080_ED42A0.s index 1f88e408dd..9839448c57 100644 --- a/asm/nonmatchings/code_ED42A0/func_80240080_ED42A0.s +++ b/asm/nonmatchings/code_ED42A0/func_80240080_ED42A0.s @@ -26,7 +26,7 @@ glabel func_80240080_ED42A0 /* ED42F0 802400D0 1440FFFA */ bnez $v0, .L802400BC /* ED42F4 802400D4 24A50004 */ addiu $a1, $a1, 4 /* ED42F8 802400D8 08090047 */ j .L8024011C -/* ED42FC 802400DC 00000000 */ nop +/* ED42FC 802400DC 00000000 */ nop .L802400E0: /* ED4300 802400E0 0000182D */ daddu $v1, $zero, $zero /* ED4304 802400E4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/code_ED42A0/func_802402BC_ED44DC.s b/asm/nonmatchings/code_ED42A0/func_802402BC_ED44DC.s index cdc3bb8b88..bf4e7fa731 100644 --- a/asm/nonmatchings/code_ED42A0/func_802402BC_ED44DC.s +++ b/asm/nonmatchings/code_ED42A0/func_802402BC_ED44DC.s @@ -14,7 +14,7 @@ glabel func_802402BC_ED44DC .L802402E0: /* ED4500 802402E0 8E020070 */ lw $v0, 0x70($s0) /* ED4504 802402E4 1440000E */ bnez $v0, .L80240320 -/* ED4508 802402E8 00000000 */ nop +/* ED4508 802402E8 00000000 */ nop /* ED450C 802402EC 8E0300A8 */ lw $v1, 0xa8($s0) /* ED4510 802402F0 8E020088 */ lw $v0, 0x88($s0) /* ED4514 802402F4 00621821 */ addu $v1, $v1, $v0 @@ -33,7 +33,7 @@ glabel func_802402BC_ED44DC .L80240320: /* ED4540 80240320 8E020074 */ lw $v0, 0x74($s0) /* ED4544 80240324 1440000E */ bnez $v0, .L80240360 -/* ED4548 80240328 00000000 */ nop +/* ED4548 80240328 00000000 */ nop /* ED454C 8024032C 8E0300AC */ lw $v1, 0xac($s0) /* ED4550 80240330 8E02008C */ lw $v0, 0x8c($s0) /* ED4554 80240334 00621821 */ addu $v1, $v1, $v0 @@ -52,7 +52,7 @@ glabel func_802402BC_ED44DC .L80240360: /* ED4580 80240360 8E020078 */ lw $v0, 0x78($s0) /* ED4584 80240364 1440000E */ bnez $v0, .L802403A0 -/* ED4588 80240368 00000000 */ nop +/* ED4588 80240368 00000000 */ nop /* ED458C 8024036C 8E0300B0 */ lw $v1, 0xb0($s0) /* ED4590 80240370 8E020090 */ lw $v0, 0x90($s0) /* ED4594 80240374 00621821 */ addu $v1, $v1, $v0 @@ -71,7 +71,7 @@ glabel func_802402BC_ED44DC .L802403A0: /* ED45C0 802403A0 8E02007C */ lw $v0, 0x7c($s0) /* ED45C4 802403A4 1440000E */ bnez $v0, .L802403E0 -/* ED45C8 802403A8 00000000 */ nop +/* ED45C8 802403A8 00000000 */ nop /* ED45CC 802403AC 8E0300B4 */ lw $v1, 0xb4($s0) /* ED45D0 802403B0 8E020094 */ lw $v0, 0x94($s0) /* ED45D4 802403B4 00621821 */ addu $v1, $v1, $v0 @@ -141,6 +141,6 @@ glabel func_802402BC_ED44DC /* ED46B8 80240498 0000102D */ daddu $v0, $zero, $zero /* ED46BC 8024049C 03E00008 */ jr $ra /* ED46C0 802404A0 27BD0018 */ addiu $sp, $sp, 0x18 -/* ED46C4 802404A4 00000000 */ nop -/* ED46C8 802404A8 00000000 */ nop -/* ED46CC 802404AC 00000000 */ nop +/* ED46C4 802404A4 00000000 */ nop +/* ED46C8 802404A8 00000000 */ nop +/* ED46CC 802404AC 00000000 */ nop diff --git a/asm/nonmatchings/code_ED46D0/func_802404B0_ED46D0.s b/asm/nonmatchings/code_ED46D0/func_802404B0_ED46D0.s index a236be4c2a..bd3edc288f 100644 --- a/asm/nonmatchings/code_ED46D0/func_802404B0_ED46D0.s +++ b/asm/nonmatchings/code_ED46D0/func_802404B0_ED46D0.s @@ -23,11 +23,11 @@ glabel func_802404B0_ED46D0 /* ED4718 802404F8 AC430000 */ sw $v1, ($v0) /* ED471C 802404FC 02D4102A */ slt $v0, $s6, $s4 /* ED4720 80240500 10400177 */ beqz $v0, .L80240AE0 -/* ED4724 80240504 00000000 */ nop +/* ED4724 80240504 00000000 */ nop /* ED4728 80240508 8FAA0054 */ lw $t2, 0x54($sp) /* ED472C 8024050C 0147102A */ slt $v0, $t2, $a3 /* ED4730 80240510 10400173 */ beqz $v0, .L80240AE0 -/* ED4734 80240514 00000000 */ nop +/* ED4734 80240514 00000000 */ nop /* ED4738 80240518 06C20002 */ bltzl $s6, .L80240524 /* ED473C 8024051C 0000B02D */ daddu $s6, $zero, $zero /* ED4740 80240520 8FAA0054 */ lw $t2, 0x54($sp) @@ -60,10 +60,10 @@ glabel func_802404B0_ED46D0 /* ED4790 80240570 240700EF */ addiu $a3, $zero, 0xef .L80240574: /* ED4794 80240574 12D4015A */ beq $s6, $s4, .L80240AE0 -/* ED4798 80240578 00000000 */ nop +/* ED4798 80240578 00000000 */ nop /* ED479C 8024057C 8FAA0054 */ lw $t2, 0x54($sp) /* ED47A0 80240580 11470157 */ beq $t2, $a3, .L80240AE0 -/* ED47A4 80240584 00000000 */ nop +/* ED47A4 80240584 00000000 */ nop /* ED47A8 80240588 06C10002 */ bgez $s6, .L80240594 /* ED47AC 8024058C 02C0102D */ daddu $v0, $s6, $zero /* ED47B0 80240590 26C20003 */ addiu $v0, $s6, 3 @@ -138,7 +138,7 @@ glabel func_802404B0_ED46D0 /* ED48B4 80240694 3C02FD10 */ lui $v0, 0xfd10 /* ED48B8 80240698 8FA40018 */ lw $a0, 0x18($sp) /* ED48BC 8024069C 0C019BF8 */ jal func_80066FE0 -/* ED48C0 802406A0 00000000 */ nop +/* ED48C0 802406A0 00000000 */ nop /* ED48C4 802406A4 3C048024 */ lui $a0, %hi(D_80244BB8) /* ED48C8 802406A8 24844BB8 */ addiu $a0, $a0, %lo(D_80244BB8) /* ED48CC 802406AC 3C058024 */ lui $a1, %hi(D_80244BEC) @@ -241,18 +241,18 @@ glabel func_802404B0_ED46D0 /* ED4A4C 8024082C 8FAA0020 */ lw $t2, 0x20($sp) /* ED4A50 80240830 006A1821 */ addu $v1, $v1, $t2 /* ED4A54 80240834 44836000 */ mtc1 $v1, $f12 -/* ED4A58 80240838 00000000 */ nop +/* ED4A58 80240838 00000000 */ nop /* ED4A5C 8024083C 0C00AD77 */ jal func_8002B5DC /* ED4A60 80240840 46806320 */ cvt.s.w $f12, $f12 /* ED4A64 80240844 3C0143FA */ lui $at, 0x43fa /* ED4A68 80240848 44811000 */ mtc1 $at, $f2 -/* ED4A6C 8024084C 00000000 */ nop +/* ED4A6C 8024084C 00000000 */ nop /* ED4A70 80240850 46020002 */ mul.s $f0, $f0, $f2 -/* ED4A74 80240854 00000000 */ nop +/* ED4A74 80240854 00000000 */ nop /* ED4A78 80240858 3C030400 */ lui $v1, 0x400 /* ED4A7C 8024085C 4600010D */ trunc.w.s $f4, $f0 /* ED4A80 80240860 44022000 */ mfc1 $v0, $f4 -/* ED4A84 80240864 00000000 */ nop +/* ED4A84 80240864 00000000 */ nop /* ED4A88 80240868 2442FE0C */ addiu $v0, $v0, -0x1f4 /* ED4A8C 8024086C 3042FFFF */ andi $v0, $v0, 0xffff /* ED4A90 80240870 00431025 */ or $v0, $v0, $v1 @@ -302,7 +302,7 @@ glabel func_802404B0_ED46D0 /* ED4B34 80240914 3C02FD10 */ lui $v0, 0xfd10 /* ED4B38 80240918 8FA40018 */ lw $a0, 0x18($sp) /* ED4B3C 8024091C 0C019BF8 */ jal func_80066FE0 -/* ED4B40 80240920 00000000 */ nop +/* ED4B40 80240920 00000000 */ nop /* ED4B44 80240924 3C048024 */ lui $a0, %hi(D_80244BB8) /* ED4B48 80240928 24844BB8 */ addiu $a0, $a0, %lo(D_80244BB8) /* ED4B4C 8024092C 3C058024 */ lui $a1, %hi(D_80244BEC) diff --git a/asm/nonmatchings/code_ED46D0/func_80240B10_ED4D30.s b/asm/nonmatchings/code_ED46D0/func_80240B10_ED4D30.s index a870a0ed55..662529a20c 100644 --- a/asm/nonmatchings/code_ED46D0/func_80240B10_ED4D30.s +++ b/asm/nonmatchings/code_ED46D0/func_80240B10_ED4D30.s @@ -68,16 +68,16 @@ glabel func_80240B10_ED4D30 /* ED4E2C 80240C0C C7A60028 */ lwc1 $f6, 0x28($sp) /* ED4E30 80240C10 4600C003 */ div.s $f0, $f24, $f0 /* ED4E34 80240C14 46003182 */ mul.s $f6, $f6, $f0 -/* ED4E38 80240C18 00000000 */ nop +/* ED4E38 80240C18 00000000 */ nop /* ED4E3C 80240C1C C7A4002C */ lwc1 $f4, 0x2c($sp) /* ED4E40 80240C20 46000087 */ neg.s $f2, $f0 /* ED4E44 80240C24 46022102 */ mul.s $f4, $f4, $f2 -/* ED4E48 80240C28 00000000 */ nop +/* ED4E48 80240C28 00000000 */ nop /* ED4E4C 80240C2C C7A20030 */ lwc1 $f2, 0x30($sp) /* ED4E50 80240C30 46001082 */ mul.s $f2, $f2, $f0 -/* ED4E54 80240C34 00000000 */ nop +/* ED4E54 80240C34 00000000 */ nop /* ED4E58 80240C38 44804000 */ mtc1 $zero, $f8 -/* ED4E5C 80240C3C 00000000 */ nop +/* ED4E5C 80240C3C 00000000 */ nop /* ED4E60 80240C40 4608003C */ c.lt.s $f0, $f8 /* ED4E64 80240C44 E7A00034 */ swc1 $f0, 0x34($sp) /* ED4E68 80240C48 E7A60028 */ swc1 $f6, 0x28($sp) @@ -108,14 +108,14 @@ glabel func_80240B10_ED4D30 /* ED4EC8 80240CA8 C7A60028 */ lwc1 $f6, 0x28($sp) /* ED4ECC 80240CAC 4600C003 */ div.s $f0, $f24, $f0 /* ED4ED0 80240CB0 46003182 */ mul.s $f6, $f6, $f0 -/* ED4ED4 80240CB4 00000000 */ nop +/* ED4ED4 80240CB4 00000000 */ nop /* ED4ED8 80240CB8 C7A4002C */ lwc1 $f4, 0x2c($sp) /* ED4EDC 80240CBC 46000087 */ neg.s $f2, $f0 /* ED4EE0 80240CC0 46022102 */ mul.s $f4, $f4, $f2 -/* ED4EE4 80240CC4 00000000 */ nop +/* ED4EE4 80240CC4 00000000 */ nop /* ED4EE8 80240CC8 C7A20030 */ lwc1 $f2, 0x30($sp) /* ED4EEC 80240CCC 46001082 */ mul.s $f2, $f2, $f0 -/* ED4EF0 80240CD0 00000000 */ nop +/* ED4EF0 80240CD0 00000000 */ nop /* ED4EF4 80240CD4 4600B686 */ mov.s $f26, $f22 /* ED4EF8 80240CD8 44804000 */ mtc1 $zero, $f8 /* ED4EFC 80240CDC 4600A706 */ mov.s $f28, $f20 @@ -130,23 +130,23 @@ glabel func_80240B10_ED4D30 .L80240D00: /* ED4F20 80240D00 C7A20028 */ lwc1 $f2, 0x28($sp) /* ED4F24 80240D04 4616103C */ c.lt.s $f2, $f22 -/* ED4F28 80240D08 00000000 */ nop +/* ED4F28 80240D08 00000000 */ nop /* ED4F2C 80240D0C 45030001 */ bc1tl .L80240D14 /* ED4F30 80240D10 46001686 */ mov.s $f26, $f2 .L80240D14: /* ED4F34 80240D14 C7A0002C */ lwc1 $f0, 0x2c($sp) /* ED4F38 80240D18 4614003C */ c.lt.s $f0, $f20 -/* ED4F3C 80240D1C 00000000 */ nop +/* ED4F3C 80240D1C 00000000 */ nop /* ED4F40 80240D20 45030001 */ bc1tl .L80240D28 /* ED4F44 80240D24 46000706 */ mov.s $f28, $f0 .L80240D28: /* ED4F48 80240D28 4602B03C */ c.lt.s $f22, $f2 -/* ED4F4C 80240D2C 00000000 */ nop +/* ED4F4C 80240D2C 00000000 */ nop /* ED4F50 80240D30 45030001 */ bc1tl .L80240D38 /* ED4F54 80240D34 46001586 */ mov.s $f22, $f2 .L80240D38: /* ED4F58 80240D38 4600A03C */ c.lt.s $f20, $f0 -/* ED4F5C 80240D3C 00000000 */ nop +/* ED4F5C 80240D3C 00000000 */ nop /* ED4F60 80240D40 45030001 */ bc1tl .L80240D48 /* ED4F64 80240D44 46000506 */ mov.s $f20, $f0 .L80240D48: @@ -169,16 +169,16 @@ glabel func_80240B10_ED4D30 /* ED4FA8 80240D88 C7A60028 */ lwc1 $f6, 0x28($sp) /* ED4FAC 80240D8C 4600C003 */ div.s $f0, $f24, $f0 /* ED4FB0 80240D90 46003182 */ mul.s $f6, $f6, $f0 -/* ED4FB4 80240D94 00000000 */ nop +/* ED4FB4 80240D94 00000000 */ nop /* ED4FB8 80240D98 C7A4002C */ lwc1 $f4, 0x2c($sp) /* ED4FBC 80240D9C 46000087 */ neg.s $f2, $f0 /* ED4FC0 80240DA0 46022102 */ mul.s $f4, $f4, $f2 -/* ED4FC4 80240DA4 00000000 */ nop +/* ED4FC4 80240DA4 00000000 */ nop /* ED4FC8 80240DA8 C7A20030 */ lwc1 $f2, 0x30($sp) /* ED4FCC 80240DAC 46001082 */ mul.s $f2, $f2, $f0 -/* ED4FD0 80240DB0 00000000 */ nop +/* ED4FD0 80240DB0 00000000 */ nop /* ED4FD4 80240DB4 44804000 */ mtc1 $zero, $f8 -/* ED4FD8 80240DB8 00000000 */ nop +/* ED4FD8 80240DB8 00000000 */ nop /* ED4FDC 80240DBC 4608003C */ c.lt.s $f0, $f8 /* ED4FE0 80240DC0 E7A00034 */ swc1 $f0, 0x34($sp) /* ED4FE4 80240DC4 E7A60028 */ swc1 $f6, 0x28($sp) @@ -190,23 +190,23 @@ glabel func_80240B10_ED4D30 .L80240DDC: /* ED4FFC 80240DDC C7A20028 */ lwc1 $f2, 0x28($sp) /* ED5000 80240DE0 461A103C */ c.lt.s $f2, $f26 -/* ED5004 80240DE4 00000000 */ nop +/* ED5004 80240DE4 00000000 */ nop /* ED5008 80240DE8 45030001 */ bc1tl .L80240DF0 /* ED500C 80240DEC 46001686 */ mov.s $f26, $f2 .L80240DF0: /* ED5010 80240DF0 C7A0002C */ lwc1 $f0, 0x2c($sp) /* ED5014 80240DF4 461C003C */ c.lt.s $f0, $f28 -/* ED5018 80240DF8 00000000 */ nop +/* ED5018 80240DF8 00000000 */ nop /* ED501C 80240DFC 45030001 */ bc1tl .L80240E04 /* ED5020 80240E00 46000706 */ mov.s $f28, $f0 .L80240E04: /* ED5024 80240E04 4602B03C */ c.lt.s $f22, $f2 -/* ED5028 80240E08 00000000 */ nop +/* ED5028 80240E08 00000000 */ nop /* ED502C 80240E0C 45030001 */ bc1tl .L80240E14 /* ED5030 80240E10 46001586 */ mov.s $f22, $f2 .L80240E14: /* ED5034 80240E14 4600A03C */ c.lt.s $f20, $f0 -/* ED5038 80240E18 00000000 */ nop +/* ED5038 80240E18 00000000 */ nop /* ED503C 80240E1C 45030001 */ bc1tl .L80240E24 /* ED5040 80240E20 46000506 */ mov.s $f20, $f0 .L80240E24: @@ -229,16 +229,16 @@ glabel func_80240B10_ED4D30 /* ED5084 80240E64 C7A60028 */ lwc1 $f6, 0x28($sp) /* ED5088 80240E68 4600C003 */ div.s $f0, $f24, $f0 /* ED508C 80240E6C 46003182 */ mul.s $f6, $f6, $f0 -/* ED5090 80240E70 00000000 */ nop +/* ED5090 80240E70 00000000 */ nop /* ED5094 80240E74 C7A4002C */ lwc1 $f4, 0x2c($sp) /* ED5098 80240E78 46000087 */ neg.s $f2, $f0 /* ED509C 80240E7C 46022102 */ mul.s $f4, $f4, $f2 -/* ED50A0 80240E80 00000000 */ nop +/* ED50A0 80240E80 00000000 */ nop /* ED50A4 80240E84 C7A20030 */ lwc1 $f2, 0x30($sp) /* ED50A8 80240E88 46001082 */ mul.s $f2, $f2, $f0 -/* ED50AC 80240E8C 00000000 */ nop +/* ED50AC 80240E8C 00000000 */ nop /* ED50B0 80240E90 44804000 */ mtc1 $zero, $f8 -/* ED50B4 80240E94 00000000 */ nop +/* ED50B4 80240E94 00000000 */ nop /* ED50B8 80240E98 4608003C */ c.lt.s $f0, $f8 /* ED50BC 80240E9C E7A00034 */ swc1 $f0, 0x34($sp) /* ED50C0 80240EA0 E7A60028 */ swc1 $f6, 0x28($sp) @@ -250,58 +250,58 @@ glabel func_80240B10_ED4D30 .L80240EB8: /* ED50D8 80240EB8 C7A20028 */ lwc1 $f2, 0x28($sp) /* ED50DC 80240EBC 461A103C */ c.lt.s $f2, $f26 -/* ED50E0 80240EC0 00000000 */ nop +/* ED50E0 80240EC0 00000000 */ nop /* ED50E4 80240EC4 45030001 */ bc1tl .L80240ECC /* ED50E8 80240EC8 46001686 */ mov.s $f26, $f2 .L80240ECC: /* ED50EC 80240ECC C7A0002C */ lwc1 $f0, 0x2c($sp) /* ED50F0 80240ED0 461C003C */ c.lt.s $f0, $f28 -/* ED50F4 80240ED4 00000000 */ nop +/* ED50F4 80240ED4 00000000 */ nop /* ED50F8 80240ED8 45030001 */ bc1tl .L80240EE0 /* ED50FC 80240EDC 46000706 */ mov.s $f28, $f0 .L80240EE0: /* ED5100 80240EE0 4602B03C */ c.lt.s $f22, $f2 -/* ED5104 80240EE4 00000000 */ nop +/* ED5104 80240EE4 00000000 */ nop /* ED5108 80240EE8 45030001 */ bc1tl .L80240EF0 /* ED510C 80240EEC 46001586 */ mov.s $f22, $f2 .L80240EF0: /* ED5110 80240EF0 4600A03C */ c.lt.s $f20, $f0 -/* ED5114 80240EF4 00000000 */ nop +/* ED5114 80240EF4 00000000 */ nop /* ED5118 80240EF8 45030001 */ bc1tl .L80240F00 /* ED511C 80240EFC 46000506 */ mov.s $f20, $f0 .L80240F00: /* ED5120 80240F00 4616D032 */ c.eq.s $f26, $f22 -/* ED5124 80240F04 00000000 */ nop +/* ED5124 80240F04 00000000 */ nop /* ED5128 80240F08 45000005 */ bc1f .L80240F20 -/* ED512C 80240F0C 00000000 */ nop +/* ED512C 80240F0C 00000000 */ nop /* ED5130 80240F10 4614E032 */ c.eq.s $f28, $f20 -/* ED5134 80240F14 00000000 */ nop +/* ED5134 80240F14 00000000 */ nop /* ED5138 80240F18 450100EC */ bc1t .L802412CC -/* ED513C 80240F1C 00000000 */ nop +/* ED513C 80240F1C 00000000 */ nop .L80240F20: /* ED5140 80240F20 86C2000A */ lh $v0, 0xa($s6) /* ED5144 80240F24 44821000 */ mtc1 $v0, $f2 -/* ED5148 80240F28 00000000 */ nop +/* ED5148 80240F28 00000000 */ nop /* ED514C 80240F2C 468010A0 */ cvt.s.w $f2, $f2 /* ED5150 80240F30 4602D002 */ mul.s $f0, $f26, $f2 -/* ED5154 80240F34 00000000 */ nop +/* ED5154 80240F34 00000000 */ nop /* ED5158 80240F38 46020000 */ add.s $f0, $f0, $f2 /* ED515C 80240F3C 3C013F00 */ lui $at, 0x3f00 /* ED5160 80240F40 44813000 */ mtc1 $at, $f6 -/* ED5164 80240F44 00000000 */ nop +/* ED5164 80240F44 00000000 */ nop /* ED5168 80240F48 46060682 */ mul.s $f26, $f0, $f6 -/* ED516C 80240F4C 00000000 */ nop +/* ED516C 80240F4C 00000000 */ nop /* ED5170 80240F50 86C2000C */ lh $v0, 0xc($s6) /* ED5174 80240F54 44822000 */ mtc1 $v0, $f4 -/* ED5178 80240F58 00000000 */ nop +/* ED5178 80240F58 00000000 */ nop /* ED517C 80240F5C 46802120 */ cvt.s.w $f4, $f4 /* ED5180 80240F60 4604E002 */ mul.s $f0, $f28, $f4 -/* ED5184 80240F64 00000000 */ nop +/* ED5184 80240F64 00000000 */ nop /* ED5188 80240F68 46040000 */ add.s $f0, $f0, $f4 /* ED518C 80240F6C 46060702 */ mul.s $f28, $f0, $f6 -/* ED5190 80240F70 00000000 */ nop +/* ED5190 80240F70 00000000 */ nop /* ED5194 80240F74 4602B002 */ mul.s $f0, $f22, $f2 -/* ED5198 80240F78 00000000 */ nop +/* ED5198 80240F78 00000000 */ nop /* ED519C 80240F7C 3C18E300 */ lui $t8, 0xe300 /* ED51A0 80240F80 37180A01 */ ori $t8, $t8, 0xa01 /* ED51A4 80240F84 3C1EE200 */ lui $fp, 0xe200 @@ -310,7 +310,7 @@ glabel func_80240B10_ED4D30 /* ED51B0 80240F90 3C060F0A */ lui $a2, 0xf0a /* ED51B4 80240F94 34C64010 */ ori $a2, $a2, 0x4010 /* ED51B8 80240F98 46060582 */ mul.s $f22, $f0, $f6 -/* ED51BC 80240F9C 00000000 */ nop +/* ED51BC 80240F9C 00000000 */ nop /* ED51C0 80240FA0 3C13800A */ lui $s3, %hi(D_800A15C4) /* ED51C4 80240FA4 267315C4 */ addiu $s3, $s3, %lo(D_800A15C4) /* ED51C8 80240FA8 3C12800A */ lui $s2, %hi(D_800A1530) @@ -318,7 +318,7 @@ glabel func_80240B10_ED4D30 /* ED51D0 80240FB0 AFB8003C */ sw $t8, 0x3c($sp) /* ED51D4 80240FB4 8E700000 */ lw $s0, ($s3) /* ED51D8 80240FB8 4604A002 */ mul.s $f0, $f20, $f4 -/* ED51DC 80240FBC 00000000 */ nop +/* ED51DC 80240FBC 00000000 */ nop /* ED51E0 80240FC0 8E440000 */ lw $a0, ($s2) /* ED51E4 80240FC4 86C3000E */ lh $v1, 0xe($s6) /* ED51E8 80240FC8 86C50010 */ lh $a1, 0x10($s6) @@ -327,12 +327,12 @@ glabel func_80240B10_ED4D30 /* ED51F4 80240FD4 26100008 */ addiu $s0, $s0, 8 /* ED51F8 80240FD8 AE700000 */ sw $s0, ($s3) /* ED51FC 80240FDC 46060502 */ mul.s $f20, $f0, $f6 -/* ED5200 80240FE0 00000000 */ nop +/* ED5200 80240FE0 00000000 */ nop /* ED5204 80240FE4 AC580000 */ sw $t8, ($v0) /* ED5208 80240FE8 AC400004 */ sw $zero, 4($v0) /* ED520C 80240FEC 26020008 */ addiu $v0, $s0, 8 /* ED5210 80240FF0 44831000 */ mtc1 $v1, $f2 -/* ED5214 80240FF4 00000000 */ nop +/* ED5214 80240FF4 00000000 */ nop /* ED5218 80240FF8 468010A0 */ cvt.s.w $f2, $f2 /* ED521C 80240FFC 4602D680 */ add.s $f26, $f26, $f2 /* ED5220 80241000 AE620000 */ sw $v0, ($s3) @@ -340,7 +340,7 @@ glabel func_80240B10_ED4D30 /* ED5228 80241008 4602B580 */ add.s $f22, $f22, $f2 /* ED522C 8024100C AE1E0000 */ sw $fp, ($s0) /* ED5230 80241010 44850000 */ mtc1 $a1, $f0 -/* ED5234 80241014 00000000 */ nop +/* ED5234 80241014 00000000 */ nop /* ED5238 80241018 46800020 */ cvt.s.w $f0, $f0 /* ED523C 8024101C 4600E700 */ add.s $f28, $f28, $f0 /* ED5240 80241020 AE060004 */ sw $a2, 4($s0) @@ -352,7 +352,7 @@ glabel func_80240B10_ED4D30 /* ED5258 80241038 3C15FF10 */ lui $s5, 0xff10 /* ED525C 8024103C 8E440000 */ lw $a0, ($s2) /* ED5260 80241040 0C019BF8 */ jal func_80066FE0 -/* ED5264 80241044 00000000 */ nop +/* ED5264 80241044 00000000 */ nop /* ED5268 80241048 3C048024 */ lui $a0, %hi(D_80244BB8) /* ED526C 8024104C 24844BB8 */ addiu $a0, $a0, %lo(D_80244BB8) /* ED5270 80241050 3C058024 */ lui $a1, %hi(D_80244BEC) @@ -411,7 +411,7 @@ glabel func_80240B10_ED4D30 /* ED5340 80241120 3C11E200 */ lui $s1, 0xe200 /* ED5344 80241124 8E840000 */ lw $a0, ($s4) /* ED5348 80241128 0C019BF8 */ jal func_80066FE0 -/* ED534C 8024112C 00000000 */ nop +/* ED534C 8024112C 00000000 */ nop /* ED5350 80241130 3C048024 */ lui $a0, %hi(D_80244BB8) /* ED5354 80241134 24844BB8 */ addiu $a0, $a0, %lo(D_80244BB8) /* ED5358 80241138 3C058024 */ lui $a1, %hi(D_80244BEC) @@ -535,6 +535,6 @@ glabel func_80240B10_ED4D30 /* ED5528 80241308 D7B40068 */ ldc1 $f20, 0x68($sp) /* ED552C 8024130C 03E00008 */ jr $ra /* ED5530 80241310 27BD0098 */ addiu $sp, $sp, 0x98 -/* ED5534 80241314 00000000 */ nop -/* ED5538 80241318 00000000 */ nop -/* ED553C 8024131C 00000000 */ nop +/* ED5534 80241314 00000000 */ nop +/* ED5538 80241318 00000000 */ nop +/* ED553C 8024131C 00000000 */ nop diff --git a/asm/nonmatchings/code_ED510/EnableGroup.s b/asm/nonmatchings/code_ED510/EnableGroup.s index 931b234703..a888d3bd00 100644 --- a/asm/nonmatchings/code_ED510/EnableGroup.s +++ b/asm/nonmatchings/code_ED510/EnableGroup.s @@ -16,7 +16,7 @@ glabel EnableGroup /* EE574 802C9BC4 0040802D */ daddu $s0, $v0, $zero /* EE578 802C9BC8 2402FFFF */ addiu $v0, $zero, -1 /* EE57C 802C9BCC 16020007 */ bne $s0, $v0, .L802C9BEC -/* EE580 802C9BD0 00000000 */ nop +/* EE580 802C9BD0 00000000 */ nop /* EE584 802C9BD4 3C04802D */ lui $a0, %hi(EnableModel) /* EE588 802C9BD8 24849288 */ addiu $a0, $a0, %lo(EnableModel) /* EE58C 802C9BDC 0C0B2568 */ jal func_802C95A0 diff --git a/asm/nonmatchings/code_ED510/ModifyColliderFlags.s b/asm/nonmatchings/code_ED510/ModifyColliderFlags.s index 7863e53bc8..d694a80544 100644 --- a/asm/nonmatchings/code_ED510/ModifyColliderFlags.s +++ b/asm/nonmatchings/code_ED510/ModifyColliderFlags.s @@ -41,16 +41,16 @@ glabel ModifyColliderFlags /* EE808 802C9E58 50400005 */ beql $v0, $zero, .L802C9E70 /* EE80C 802C9E5C 24020002 */ addiu $v0, $zero, 2 /* EE810 802C9E60 12400009 */ beqz $s2, .L802C9E88 -/* EE814 802C9E64 00000000 */ nop +/* EE814 802C9E64 00000000 */ nop /* EE818 802C9E68 080B27AF */ j .L802C9EBC -/* EE81C 802C9E6C 00000000 */ nop +/* EE81C 802C9E6C 00000000 */ nop .L802C9E70: /* EE820 802C9E70 1242000B */ beq $s2, $v0, .L802C9EA0 /* EE824 802C9E74 24020003 */ addiu $v0, $zero, 3 /* EE828 802C9E78 1242000B */ beq $s2, $v0, .L802C9EA8 /* EE82C 802C9E7C 2403FF00 */ addiu $v1, $zero, -0x100 /* EE830 802C9E80 080B27AF */ j .L802C9EBC -/* EE834 802C9E84 00000000 */ nop +/* EE834 802C9E84 00000000 */ nop .L802C9E88: /* EE838 802C9E88 8E020000 */ lw $v0, ($s0) /* EE83C 802C9E8C 080B27AE */ j .L802C9EB8 diff --git a/asm/nonmatchings/code_ED510/ScaleGroup.s b/asm/nonmatchings/code_ED510/ScaleGroup.s index 8b443c44af..1854e58707 100644 --- a/asm/nonmatchings/code_ED510/ScaleGroup.s +++ b/asm/nonmatchings/code_ED510/ScaleGroup.s @@ -47,7 +47,7 @@ glabel ScaleGroup /* EE470 802C9AC0 96020000 */ lhu $v0, ($s0) /* EE474 802C9AC4 30420400 */ andi $v0, $v0, 0x400 /* EE478 802C9AC8 1440000A */ bnez $v0, .L802C9AF4 -/* EE47C 802C9ACC 00000000 */ nop +/* EE47C 802C9ACC 00000000 */ nop /* EE480 802C9AD0 4405C000 */ mfc1 $a1, $f24 /* EE484 802C9AD4 4406B000 */ mfc1 $a2, $f22 /* EE488 802C9AD8 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/code_ED510/SetZoneEnabled.s b/asm/nonmatchings/code_ED510/SetZoneEnabled.s index d9a88a0ed5..ed210137d3 100644 --- a/asm/nonmatchings/code_ED510/SetZoneEnabled.s +++ b/asm/nonmatchings/code_ED510/SetZoneEnabled.s @@ -33,7 +33,7 @@ glabel SetZoneEnabled /* EEC70 802CA2C0 12020006 */ beq $s0, $v0, .L802CA2DC /* EEC74 802CA2C4 3C03FFFE */ lui $v1, 0xfffe /* EEC78 802CA2C8 080B28BB */ j .L802CA2EC -/* EEC7C 802CA2CC 00000000 */ nop +/* EEC7C 802CA2CC 00000000 */ nop .L802CA2D0: /* EEC80 802CA2D0 8E220000 */ lw $v0, ($s1) /* EEC84 802CA2D4 080B28BA */ j .L802CA2E8 diff --git a/asm/nonmatchings/code_ED510/TranslateGroup.s b/asm/nonmatchings/code_ED510/TranslateGroup.s index 5f5e450f10..42d85bb3a8 100644 --- a/asm/nonmatchings/code_ED510/TranslateGroup.s +++ b/asm/nonmatchings/code_ED510/TranslateGroup.s @@ -47,7 +47,7 @@ glabel TranslateGroup /* EE208 802C9858 96020000 */ lhu $v0, ($s0) /* EE20C 802C985C 30420400 */ andi $v0, $v0, 0x400 /* EE210 802C9860 1440000A */ bnez $v0, .L802C988C -/* EE214 802C9864 00000000 */ nop +/* EE214 802C9864 00000000 */ nop /* EE218 802C9868 4405C000 */ mfc1 $a1, $f24 /* EE21C 802C986C 4406B000 */ mfc1 $a2, $f22 /* EE220 802C9870 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/code_ED510/func_802C9FD4.s b/asm/nonmatchings/code_ED510/func_802C9FD4.s index 0e55e377b5..cd6aafef5e 100644 --- a/asm/nonmatchings/code_ED510/func_802C9FD4.s +++ b/asm/nonmatchings/code_ED510/func_802C9FD4.s @@ -18,7 +18,7 @@ glabel func_802C9FD4 /* EE9B8 802CA008 14620018 */ bne $v1, $v0, .L802CA06C /* EE9BC 802CA00C 00C0902D */ daddu $s2, $a2, $zero /* EE9C0 802CA010 0C016AFA */ jal get_current_map_header -/* EE9C4 802CA014 00000000 */ nop +/* EE9C4 802CA014 00000000 */ nop /* EE9C8 802CA018 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* EE9CC 802CA01C 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) /* EE9D0 802CA020 8463008E */ lh $v1, 0x8e($v1) diff --git a/asm/nonmatchings/code_ED510/modify_collider_family_flags.s b/asm/nonmatchings/code_ED510/modify_collider_family_flags.s index 4e0bf88d6b..f0c574fe41 100644 --- a/asm/nonmatchings/code_ED510/modify_collider_family_flags.s +++ b/asm/nonmatchings/code_ED510/modify_collider_family_flags.s @@ -18,7 +18,7 @@ glabel modify_collider_family_flags /* EE6CC 802C9D1C 04800003 */ bltz $a0, .L802C9D2C /* EE6D0 802C9D20 00C0882D */ daddu $s1, $a2, $zero /* EE6D4 802C9D24 0C0B273A */ jal modify_collider_family_flags -/* EE6D8 802C9D28 00000000 */ nop +/* EE6D8 802C9D28 00000000 */ nop .L802C9D2C: /* EE6DC 802C9D2C 86040006 */ lh $a0, 6($s0) /* EE6E0 802C9D30 04800003 */ bltz $a0, .L802C9D40 @@ -33,16 +33,16 @@ glabel modify_collider_family_flags /* EE700 802C9D50 50400005 */ beql $v0, $zero, .L802C9D68 /* EE704 802C9D54 24020002 */ addiu $v0, $zero, 2 /* EE708 802C9D58 12200009 */ beqz $s1, .L802C9D80 -/* EE70C 802C9D5C 00000000 */ nop +/* EE70C 802C9D5C 00000000 */ nop /* EE710 802C9D60 080B276D */ j .L802C9DB4 -/* EE714 802C9D64 00000000 */ nop +/* EE714 802C9D64 00000000 */ nop .L802C9D68: /* EE718 802C9D68 1222000B */ beq $s1, $v0, .L802C9D98 /* EE71C 802C9D6C 24020003 */ addiu $v0, $zero, 3 /* EE720 802C9D70 1222000B */ beq $s1, $v0, .L802C9DA0 /* EE724 802C9D74 2403FF00 */ addiu $v1, $zero, -0x100 /* EE728 802C9D78 080B276D */ j .L802C9DB4 -/* EE72C 802C9D7C 00000000 */ nop +/* EE72C 802C9D7C 00000000 */ nop .L802C9D80: /* EE730 802C9D80 8E020000 */ lw $v0, ($s0) /* EE734 802C9D84 080B276C */ j .L802C9DB0 diff --git a/asm/nonmatchings/code_ED510/set_zone_enabled.s b/asm/nonmatchings/code_ED510/set_zone_enabled.s index f46d64bae4..cd34adb4fd 100644 --- a/asm/nonmatchings/code_ED510/set_zone_enabled.s +++ b/asm/nonmatchings/code_ED510/set_zone_enabled.s @@ -16,11 +16,11 @@ glabel set_zone_enabled /* EEB94 802CA1E4 04800003 */ bltz $a0, .L802CA1F4 /* EEB98 802CA1E8 00A0882D */ daddu $s1, $a1, $zero /* EEB9C 802CA1EC 0C0B286E */ jal set_zone_enabled -/* EEBA0 802CA1F0 00000000 */ nop +/* EEBA0 802CA1F0 00000000 */ nop .L802CA1F4: /* EEBA4 802CA1F4 86040006 */ lh $a0, 6($s0) /* EEBA8 802CA1F8 04800003 */ bltz $a0, .L802CA208 -/* EEBAC 802CA1FC 00000000 */ nop +/* EEBAC 802CA1FC 00000000 */ nop /* EEBB0 802CA200 0C0B286E */ jal set_zone_enabled /* EEBB4 802CA204 0220282D */ daddu $a1, $s1, $zero .L802CA208: @@ -30,7 +30,7 @@ glabel set_zone_enabled /* EEBC4 802CA214 12220006 */ beq $s1, $v0, .L802CA230 /* EEBC8 802CA218 3C03FFFE */ lui $v1, 0xfffe /* EEBCC 802CA21C 080B2890 */ j .L802CA240 -/* EEBD0 802CA220 00000000 */ nop +/* EEBD0 802CA220 00000000 */ nop .L802CA224: /* EEBD4 802CA224 8E020000 */ lw $v0, ($s0) /* EEBD8 802CA228 080B288F */ j .L802CA23C diff --git a/asm/nonmatchings/code_ED8E20/func_80240034_ED8E54.s b/asm/nonmatchings/code_ED8E20/func_80240034_ED8E54.s index 4433b132c5..ec9dfa228c 100644 --- a/asm/nonmatchings/code_ED8E20/func_80240034_ED8E54.s +++ b/asm/nonmatchings/code_ED8E20/func_80240034_ED8E54.s @@ -22,16 +22,16 @@ glabel func_80240034_ED8E54 /* ED8E94 80240074 00021023 */ negu $v0, $v0 .L80240078: /* ED8E98 80240078 14400003 */ bnez $v0, .L80240088 -/* ED8E9C 8024007C 00000000 */ nop +/* ED8E9C 8024007C 00000000 */ nop /* ED8EA0 80240080 50E00017 */ beql $a3, $zero, .L802400E0 /* ED8EA4 80240084 0000102D */ daddu $v0, $zero, $zero .L80240088: /* ED8EA8 80240088 44822000 */ mtc1 $v0, $f4 -/* ED8EAC 8024008C 00000000 */ nop +/* ED8EAC 8024008C 00000000 */ nop /* ED8EB0 80240090 46802120 */ cvt.s.w $f4, $f4 /* ED8EB4 80240094 44062000 */ mfc1 $a2, $f4 /* ED8EB8 80240098 44872000 */ mtc1 $a3, $f4 -/* ED8EBC 8024009C 00000000 */ nop +/* ED8EBC 8024009C 00000000 */ nop /* ED8EC0 802400A0 46802120 */ cvt.s.w $f4, $f4 /* ED8EC4 802400A4 44806000 */ mtc1 $zero, $f12 /* ED8EC8 802400A8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240034_ED8E54 /* ED8ED0 802400B0 46006386 */ mov.s $f14, $f12 /* ED8ED4 802400B4 3C014270 */ lui $at, 0x4270 /* ED8ED8 802400B8 44811000 */ mtc1 $at, $f2 -/* ED8EDC 802400BC 00000000 */ nop +/* ED8EDC 802400BC 00000000 */ nop /* ED8EE0 802400C0 4602003C */ c.lt.s $f0, $f2 -/* ED8EE4 802400C4 00000000 */ nop +/* ED8EE4 802400C4 00000000 */ nop /* ED8EE8 802400C8 45000004 */ bc1f .L802400DC /* ED8EEC 802400CC 24020001 */ addiu $v0, $zero, 1 /* ED8EF0 802400D0 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/code_ED8E20/func_80240318_ED9138.s b/asm/nonmatchings/code_ED8E20/func_80240318_ED9138.s index 9d02faba75..8993d18927 100644 --- a/asm/nonmatchings/code_ED8E20/func_80240318_ED9138.s +++ b/asm/nonmatchings/code_ED8E20/func_80240318_ED9138.s @@ -15,4 +15,4 @@ glabel func_80240318_ED9138 /* ED9160 80240340 24020002 */ addiu $v0, $zero, 2 /* ED9164 80240344 03E00008 */ jr $ra /* ED9168 80240348 27BD0020 */ addiu $sp, $sp, 0x20 -/* ED916C 8024034C 00000000 */ nop +/* ED916C 8024034C 00000000 */ nop diff --git a/asm/nonmatchings/code_EDE9C0/func_80240000_EDE9C0.s b/asm/nonmatchings/code_EDE9C0/func_80240000_EDE9C0.s index 0f38f5677e..51e1b80718 100644 --- a/asm/nonmatchings/code_EDE9C0/func_80240000_EDE9C0.s +++ b/asm/nonmatchings/code_EDE9C0/func_80240000_EDE9C0.s @@ -15,6 +15,6 @@ glabel func_80240000_EDE9C0 /* EDE9E8 80240028 24020002 */ addiu $v0, $zero, 2 /* EDE9EC 8024002C 03E00008 */ jr $ra /* EDE9F0 80240030 27BD0020 */ addiu $sp, $sp, 0x20 -/* EDE9F4 80240034 00000000 */ nop -/* EDE9F8 80240038 00000000 */ nop -/* EDE9FC 8024003C 00000000 */ nop +/* EDE9F4 80240034 00000000 */ nop +/* EDE9F8 80240038 00000000 */ nop +/* EDE9FC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/code_EDEA00/func_80240040_EDEA00.s b/asm/nonmatchings/code_EDEA00/func_80240040_EDEA00.s index e3697ee368..9c2a599be3 100644 --- a/asm/nonmatchings/code_EDEA00/func_80240040_EDEA00.s +++ b/asm/nonmatchings/code_EDEA00/func_80240040_EDEA00.s @@ -41,14 +41,14 @@ glabel func_80240040_EDEA00 /* EDEA8C 802400CC 10600009 */ beqz $v1, .L802400F4 /* EDEA90 802400D0 0000102D */ daddu $v0, $zero, $zero /* EDEA94 802400D4 08090069 */ j .L802401A4 -/* EDEA98 802400D8 00000000 */ nop +/* EDEA98 802400D8 00000000 */ nop .L802400DC: /* EDEA9C 802400DC 10620013 */ beq $v1, $v0, .L8024012C /* EDEAA0 802400E0 24020003 */ addiu $v0, $zero, 3 /* EDEAA4 802400E4 1062001E */ beq $v1, $v0, .L80240160 /* EDEAA8 802400E8 0000102D */ daddu $v0, $zero, $zero /* EDEAAC 802400EC 08090069 */ j .L802401A4 -/* EDEAB0 802400F0 00000000 */ nop +/* EDEAB0 802400F0 00000000 */ nop .L802400F4: /* EDEAB4 802400F4 0C03CB57 */ jal func_800F2D5C /* EDEAB8 802400F8 0000202D */ daddu $a0, $zero, $zero @@ -75,7 +75,7 @@ glabel func_80240040_EDEA00 /* EDEB04 80240144 A0510014 */ sb $s1, 0x14($v0) /* EDEB08 80240148 82640012 */ lb $a0, 0x12($s3) /* EDEB0C 8024014C 0C03CBA6 */ jal func_800F2E98 -/* EDEB10 80240150 00000000 */ nop +/* EDEB10 80240150 00000000 */ nop /* EDEB14 80240154 24020003 */ addiu $v0, $zero, 3 /* EDEB18 80240158 08090068 */ j .L802401A0 /* EDEB1C 8024015C AE420070 */ sw $v0, 0x70($s2) diff --git a/asm/nonmatchings/code_EDEA00/func_802401C4_EDEB84.s b/asm/nonmatchings/code_EDEA00/func_802401C4_EDEB84.s index efca0ce600..0b0f24b6d9 100644 --- a/asm/nonmatchings/code_EDEA00/func_802401C4_EDEB84.s +++ b/asm/nonmatchings/code_EDEA00/func_802401C4_EDEB84.s @@ -47,7 +47,7 @@ glabel func_802401C4_EDEB84 /* EDEC2C 8024026C 0C013431 */ jal func_8004D0C4 /* EDEC30 80240270 8E070038 */ lw $a3, 0x38($s0) /* EDEC34 80240274 1040000E */ beqz $v0, .L802402B0 -/* EDEC38 80240278 00000000 */ nop +/* EDEC38 80240278 00000000 */ nop /* EDEC3C 8024027C 8E2200D0 */ lw $v0, 0xd0($s1) /* EDEC40 80240280 C60C0038 */ lwc1 $f12, 0x38($s0) /* EDEC44 80240284 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_802401C4_EDEB84 /* EDEC58 80240298 468031A0 */ cvt.s.w $f6, $f6 /* EDEC5C 8024029C 44073000 */ mfc1 $a3, $f6 /* EDEC60 802402A0 0C00ABDC */ jal fio_validate_header_checksums -/* EDEC64 802402A4 00000000 */ nop +/* EDEC64 802402A4 00000000 */ nop /* EDEC68 802402A8 080900B8 */ j .L802402E0 /* EDEC6C 802402AC E600000C */ swc1 $f0, 0xc($s0) .L802402B0: @@ -66,7 +66,7 @@ glabel func_802401C4_EDEB84 /* EDEC74 802402B4 2404003C */ addiu $a0, $zero, 0x3c /* EDEC78 802402B8 C60C000C */ lwc1 $f12, 0xc($s0) /* EDEC7C 802402BC 44820000 */ mtc1 $v0, $f0 -/* EDEC80 802402C0 00000000 */ nop +/* EDEC80 802402C0 00000000 */ nop /* EDEC84 802402C4 46800020 */ cvt.s.w $f0, $f0 /* EDEC88 802402C8 46006300 */ add.s $f12, $f12, $f0 /* EDEC8C 802402CC 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_802401C4_EDEB84 /* EDECB0 802402F0 8E2200D0 */ lw $v0, 0xd0($s1) /* EDECB4 802402F4 8C420014 */ lw $v0, 0x14($v0) /* EDECB8 802402F8 04410004 */ bgez $v0, .L8024030C -/* EDECBC 802402FC 00000000 */ nop +/* EDECBC 802402FC 00000000 */ nop /* EDECC0 80240300 C6400000 */ lwc1 $f0, ($s2) /* EDECC4 80240304 080900CB */ j .L8024032C /* EDECC8 80240308 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_802401C4_EDEB84 /* EDECCC 8024030C 3C018024 */ lui $at, %hi(D_80247AF0) /* EDECD0 80240310 D4227AF0 */ ldc1 $f2, %lo(D_80247AF0)($at) /* EDECD4 80240314 44820000 */ mtc1 $v0, $f0 -/* EDECD8 80240318 00000000 */ nop +/* EDECD8 80240318 00000000 */ nop /* EDECDC 8024031C 46800021 */ cvt.d.w $f0, $f0 /* EDECE0 80240320 46220003 */ div.d $f0, $f0, $f2 /* EDECE4 80240324 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_802401C4_EDEB84 /* EDECF8 80240338 44801000 */ mtc1 $zero, $f2 /* EDECFC 8024033C 46000021 */ cvt.d.s $f0, $f0 /* EDED00 80240340 46220002 */ mul.d $f0, $f0, $f2 -/* EDED04 80240344 00000000 */ nop +/* EDED04 80240344 00000000 */ nop /* EDED08 80240348 24020001 */ addiu $v0, $zero, 1 /* EDED0C 8024034C 4620018D */ trunc.w.d $f6, $f0 /* EDED10 80240350 E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/code_EDEA00/func_80240374_EDED34.s b/asm/nonmatchings/code_EDEA00/func_80240374_EDED34.s index 6871697f4e..568fe2ca19 100644 --- a/asm/nonmatchings/code_EDEA00/func_80240374_EDED34.s +++ b/asm/nonmatchings/code_EDEA00/func_80240374_EDED34.s @@ -34,7 +34,7 @@ glabel func_80240374_EDED34 /* EDEDA8 802403E8 44803000 */ mtc1 $zero, $f6 /* EDEDAC 802403EC 46000021 */ cvt.d.s $f0, $f0 /* EDEDB0 802403F0 46260002 */ mul.d $f0, $f0, $f6 -/* EDEDB4 802403F4 00000000 */ nop +/* EDEDB4 802403F4 00000000 */ nop /* EDEDB8 802403F8 24020001 */ addiu $v0, $zero, 1 /* EDEDBC 802403FC 8E24006C */ lw $a0, 0x6c($s1) /* EDEDC0 80240400 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80240374_EDED34 /* EDEE1C 8024045C C600003C */ lwc1 $f0, 0x3c($s0) /* EDEE20 80240460 4600C001 */ sub.s $f0, $f24, $f0 /* EDEE24 80240464 4600B03C */ c.lt.s $f22, $f0 -/* EDEE28 80240468 00000000 */ nop +/* EDEE28 80240468 00000000 */ nop /* EDEE2C 8024046C 4500001B */ bc1f .L802404DC /* EDEE30 80240470 34820010 */ ori $v0, $a0, 0x10 /* EDEE34 80240474 08090137 */ j .L802404DC @@ -87,9 +87,9 @@ glabel func_80240374_EDED34 /* EDEE78 802404B8 C7A00034 */ lwc1 $f0, 0x34($sp) /* EDEE7C 802404BC 4600D001 */ sub.s $f0, $f26, $f0 /* EDEE80 802404C0 4600B03C */ c.lt.s $f22, $f0 -/* EDEE84 802404C4 00000000 */ nop +/* EDEE84 802404C4 00000000 */ nop /* EDEE88 802404C8 45000004 */ bc1f .L802404DC -/* EDEE8C 802404CC 00000000 */ nop +/* EDEE8C 802404CC 00000000 */ nop /* EDEE90 802404D0 8E22006C */ lw $v0, 0x6c($s1) /* EDEE94 802404D4 34420010 */ ori $v0, $v0, 0x10 /* EDEE98 802404D8 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80240374_EDED34 /* EDEEA0 802404E0 24030011 */ addiu $v1, $zero, 0x11 /* EDEEA4 802404E4 30420011 */ andi $v0, $v0, 0x11 /* EDEEA8 802404E8 14430039 */ bne $v0, $v1, .L802405D0 -/* EDEEAC 802404EC 00000000 */ nop +/* EDEEAC 802404EC 00000000 */ nop /* EDEEB0 802404F0 8E020000 */ lw $v0, ($s0) /* EDEEB4 802404F4 30420008 */ andi $v0, $v0, 8 /* EDEEB8 802404F8 1040000A */ beqz $v0, .L80240524 @@ -108,7 +108,7 @@ glabel func_80240374_EDED34 /* EDEEC8 80240508 D4207AF8 */ ldc1 $f0, %lo(D_80247AF8)($at) /* EDEECC 8024050C 460010A1 */ cvt.d.s $f2, $f2 /* EDEED0 80240510 46201082 */ mul.d $f2, $f2, $f0 -/* EDEED4 80240514 00000000 */ nop +/* EDEED4 80240514 00000000 */ nop /* EDEED8 80240518 4600A021 */ cvt.d.s $f0, $f20 /* EDEEDC 8024051C 08090162 */ j .L80240588 /* EDEEE0 80240520 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80240374_EDED34 /* EDEF30 80240570 D4207B00 */ ldc1 $f0, %lo(D_80247B00)($at) /* EDEF34 80240574 460010A1 */ cvt.d.s $f2, $f2 /* EDEF38 80240578 46201082 */ mul.d $f2, $f2, $f0 -/* EDEF3C 8024057C 00000000 */ nop +/* EDEF3C 8024057C 00000000 */ nop /* EDEF40 80240580 4600A021 */ cvt.d.s $f0, $f20 /* EDEF44 80240584 46220000 */ add.d $f0, $f0, $f2 .L80240588: @@ -149,7 +149,7 @@ glabel func_80240374_EDED34 /* EDEF64 802405A4 46000005 */ abs.s $f0, $f0 /* EDEF68 802405A8 46000021 */ cvt.d.s $f0, $f0 /* EDEF6C 802405AC 4622003C */ c.lt.d $f0, $f2 -/* EDEF70 802405B0 00000000 */ nop +/* EDEF70 802405B0 00000000 */ nop /* EDEF74 802405B4 45000036 */ bc1f .L80240690 /* EDEF78 802405B8 2403FFEF */ addiu $v1, $zero, -0x11 /* EDEF7C 802405BC E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80240374_EDED34 .L802405D0: /* EDEF90 802405D0 8E220070 */ lw $v0, 0x70($s1) /* EDEF94 802405D4 1840002E */ blez $v0, .L80240690 -/* EDEF98 802405D8 00000000 */ nop +/* EDEF98 802405D8 00000000 */ nop /* EDEF9C 802405DC C62C0074 */ lwc1 $f12, 0x74($s1) /* EDEFA0 802405E0 0C00AD77 */ jal func_8002B5DC /* EDEFA4 802405E4 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80240374_EDED34 /* EDEFFC 8024063C 27A70030 */ addiu $a3, $sp, 0x30 .L80240640: /* EDF000 80240640 10400007 */ beqz $v0, .L80240660 -/* EDF004 80240644 00000000 */ nop +/* EDF004 80240644 00000000 */ nop /* EDF008 80240648 4616A082 */ mul.s $f2, $f20, $f22 -/* EDF00C 8024064C 00000000 */ nop +/* EDF00C 8024064C 00000000 */ nop /* EDF010 80240650 C7A0002C */ lwc1 $f0, 0x2c($sp) /* EDF014 80240654 461A0000 */ add.s $f0, $f0, $f26 /* EDF018 80240658 0809019B */ j .L8024066C /* EDF01C 8024065C 46020000 */ add.s $f0, $f0, $f2 .L80240660: /* EDF020 80240660 4616A002 */ mul.s $f0, $f20, $f22 -/* EDF024 80240664 00000000 */ nop +/* EDF024 80240664 00000000 */ nop /* EDF028 80240668 4600C000 */ add.s $f0, $f24, $f0 .L8024066C: /* EDF02C 8024066C E600003C */ swc1 $f0, 0x3c($s0) /* EDF030 80240670 8E220074 */ lw $v0, 0x74($s1) /* EDF034 80240674 2442000A */ addiu $v0, $v0, 0xa /* EDF038 80240678 44826000 */ mtc1 $v0, $f12 -/* EDF03C 8024067C 00000000 */ nop +/* EDF03C 8024067C 00000000 */ nop /* EDF040 80240680 0C00AB85 */ jal func_8002AE14 /* EDF044 80240684 46806320 */ cvt.s.w $f12, $f12 /* EDF048 80240688 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80240374_EDED34 /* EDF058 80240698 2442FFFF */ addiu $v0, $v0, -1 /* EDF05C 8024069C 8E430014 */ lw $v1, 0x14($s2) /* EDF060 802406A0 04600048 */ bltz $v1, .L802407C4 -/* EDF064 802406A4 00000000 */ nop +/* EDF064 802406A4 00000000 */ nop /* EDF068 802406A8 8E620074 */ lw $v0, 0x74($s3) /* EDF06C 802406AC 1C400042 */ bgtz $v0, .L802407B8 /* EDF070 802406B0 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80240374_EDED34 /* EDF078 802406B8 860200A8 */ lh $v0, 0xa8($s0) /* EDF07C 802406BC C602003C */ lwc1 $f2, 0x3c($s0) /* EDF080 802406C0 44820000 */ mtc1 $v0, $f0 -/* EDF084 802406C4 00000000 */ nop +/* EDF084 802406C4 00000000 */ nop /* EDF088 802406C8 46800020 */ cvt.s.w $f0, $f0 /* EDF08C 802406CC 46001080 */ add.s $f2, $f2, $f0 /* EDF090 802406D0 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80240374_EDED34 /* EDF0AC 802406EC C440002C */ lwc1 $f0, 0x2c($v0) /* EDF0B0 802406F0 46000021 */ cvt.d.s $f0, $f0 /* EDF0B4 802406F4 4622003C */ c.lt.d $f0, $f2 -/* EDF0B8 802406F8 00000000 */ nop +/* EDF0B8 802406F8 00000000 */ nop /* EDF0BC 802406FC 4500002C */ bc1f .L802407B0 /* EDF0C0 80240700 02A0202D */ daddu $a0, $s5, $zero /* EDF0C4 80240704 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80240374_EDED34 /* EDF100 80240740 3C01C1A0 */ lui $at, 0xc1a0 /* EDF104 80240744 44812000 */ mtc1 $at, $f4 /* EDF108 80240748 44834000 */ mtc1 $v1, $f8 -/* EDF10C 8024074C 00000000 */ nop +/* EDF10C 8024074C 00000000 */ nop /* EDF110 80240750 46804220 */ cvt.s.w $f8, $f8 /* EDF114 80240754 44074000 */ mfc1 $a3, $f8 /* EDF118 80240758 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80240374_EDED34 /* EDF1CC 8024080C 0C013431 */ jal func_8004D0C4 /* EDF1D0 80240810 8E070038 */ lw $a3, 0x38($s0) /* EDF1D4 80240814 1040001A */ beqz $v0, .L80240880 -/* EDF1D8 80240818 00000000 */ nop +/* EDF1D8 80240818 00000000 */ nop /* EDF1DC 8024081C 8E060038 */ lw $a2, 0x38($s0) /* EDF1E0 80240820 8E2200D0 */ lw $v0, 0xd0($s1) /* EDF1E4 80240824 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80240374_EDED34 /* EDF1F8 80240838 468073A0 */ cvt.s.w $f14, $f14 /* EDF1FC 8024083C C6020018 */ lwc1 $f2, 0x18($s0) /* EDF200 80240840 4600103C */ c.lt.s $f2, $f0 -/* EDF204 80240844 00000000 */ nop +/* EDF204 80240844 00000000 */ nop /* EDF208 80240848 4500000D */ bc1f .L80240880 /* EDF20C 8024084C E7A00034 */ swc1 $f0, 0x34($sp) /* EDF210 80240850 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80240374_EDED34 /* EDF24C 8024088C 00621825 */ or $v1, $v1, $v0 /* EDF250 80240890 00741825 */ or $v1, $v1, $s4 /* EDF254 80240894 10600008 */ beqz $v1, .L802408B8 -/* EDF258 80240898 00000000 */ nop +/* EDF258 80240898 00000000 */ nop /* EDF25C 8024089C 8602008C */ lh $v0, 0x8c($s0) /* EDF260 802408A0 14400031 */ bnez $v0, .L80240968 -/* EDF264 802408A4 00000000 */ nop +/* EDF264 802408A4 00000000 */ nop /* EDF268 802408A8 8E050018 */ lw $a1, 0x18($s0) /* EDF26C 802408AC 8E06000C */ lw $a2, 0xc($s0) /* EDF270 802408B0 0C00F909 */ jal func_8003E424 @@ -362,12 +362,12 @@ glabel func_80240374_EDED34 /* EDF284 802408C4 44801000 */ mtc1 $zero, $f2 /* EDF288 802408C8 46000021 */ cvt.d.s $f0, $f0 /* EDF28C 802408CC 46220002 */ mul.d $f0, $f0, $f2 -/* EDF290 802408D0 00000000 */ nop +/* EDF290 802408D0 00000000 */ nop /* EDF294 802408D4 4620020D */ trunc.w.d $f8, $f0 /* EDF298 802408D8 E628007C */ swc1 $f8, 0x7c($s1) /* EDF29C 802408DC 8E420004 */ lw $v0, 4($s2) /* EDF2A0 802408E0 18400021 */ blez $v0, .L80240968 -/* EDF2A4 802408E4 00000000 */ nop +/* EDF2A4 802408E4 00000000 */ nop /* EDF2A8 802408E8 8602008E */ lh $v0, 0x8e($s0) /* EDF2AC 802408EC 9603008E */ lhu $v1, 0x8e($s0) /* EDF2B0 802408F0 18400005 */ blez $v0, .L80240908 @@ -375,7 +375,7 @@ glabel func_80240374_EDED34 /* EDF2B8 802408F8 A602008E */ sh $v0, 0x8e($s0) /* EDF2BC 802408FC 00021400 */ sll $v0, $v0, 0x10 /* EDF2C0 80240900 1C400019 */ bgtz $v0, .L80240968 -/* EDF2C4 80240904 00000000 */ nop +/* EDF2C4 80240904 00000000 */ nop .L80240908: /* EDF2C8 80240908 240403E8 */ addiu $a0, $zero, 0x3e8 /* EDF2CC 8024090C 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80240374_EDED34 /* EDF314 80240954 18400003 */ blez $v0, .L80240964 /* EDF318 80240958 28620003 */ slti $v0, $v1, 3 /* EDF31C 8024095C 10400002 */ beqz $v0, .L80240968 -/* EDF320 80240960 00000000 */ nop +/* EDF320 80240960 00000000 */ nop .L80240964: /* EDF324 80240964 AE600070 */ sw $zero, 0x70($s3) .L80240968: diff --git a/asm/nonmatchings/code_EDEA00/func_8024099C_EDF35C.s b/asm/nonmatchings/code_EDEA00/func_8024099C_EDF35C.s index c9aadf4a76..617333950f 100644 --- a/asm/nonmatchings/code_EDEA00/func_8024099C_EDF35C.s +++ b/asm/nonmatchings/code_EDEA00/func_8024099C_EDF35C.s @@ -30,7 +30,7 @@ glabel func_8024099C_EDF35C /* EDF3C0 80240A00 A603008E */ sh $v1, 0x8e($s0) /* EDF3C4 80240A04 C60C000C */ lwc1 $f12, 0xc($s0) /* EDF3C8 80240A08 44820000 */ mtc1 $v0, $f0 -/* EDF3CC 80240A0C 00000000 */ nop +/* EDF3CC 80240A0C 00000000 */ nop /* EDF3D0 80240A10 46800020 */ cvt.s.w $f0, $f0 /* EDF3D4 80240A14 46006300 */ add.s $f12, $f12, $f0 /* EDF3D8 80240A18 3C0142B4 */ lui $at, 0x42b4 diff --git a/asm/nonmatchings/code_EDEA00/func_80240A5C_EDF41C.s b/asm/nonmatchings/code_EDEA00/func_80240A5C_EDF41C.s index ae92f1f86b..67058fbe6e 100644 --- a/asm/nonmatchings/code_EDEA00/func_80240A5C_EDF41C.s +++ b/asm/nonmatchings/code_EDEA00/func_80240A5C_EDF41C.s @@ -42,11 +42,11 @@ glabel func_80240A5C_EDF41C .L80240AF0: /* EDF4B0 80240AF0 8E220070 */ lw $v0, 0x70($s1) /* EDF4B4 80240AF4 18400034 */ blez $v0, .L80240BC8 -/* EDF4B8 80240AF8 00000000 */ nop +/* EDF4B8 80240AF8 00000000 */ nop /* EDF4BC 80240AFC C62C0074 */ lwc1 $f12, 0x74($s1) /* EDF4C0 80240B00 46806320 */ cvt.s.w $f12, $f12 /* EDF4C4 80240B04 44820000 */ mtc1 $v0, $f0 -/* EDF4C8 80240B08 00000000 */ nop +/* EDF4C8 80240B08 00000000 */ nop /* EDF4CC 80240B0C 46800020 */ cvt.s.w $f0, $f0 /* EDF4D0 80240B10 46000021 */ cvt.d.s $f0, $f0 /* EDF4D4 80240B14 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_80240A5C_EDF41C /* EDF534 80240B74 27A70030 */ addiu $a3, $sp, 0x30 .L80240B78: /* EDF538 80240B78 10400007 */ beqz $v0, .L80240B98 -/* EDF53C 80240B7C 00000000 */ nop +/* EDF53C 80240B7C 00000000 */ nop /* EDF540 80240B80 4616A082 */ mul.s $f2, $f20, $f22 -/* EDF544 80240B84 00000000 */ nop +/* EDF544 80240B84 00000000 */ nop /* EDF548 80240B88 C7A0002C */ lwc1 $f0, 0x2c($sp) /* EDF54C 80240B8C 46180000 */ add.s $f0, $f0, $f24 /* EDF550 80240B90 080902E9 */ j .L80240BA4 /* EDF554 80240B94 46020000 */ add.s $f0, $f0, $f2 .L80240B98: /* EDF558 80240B98 4616A002 */ mul.s $f0, $f20, $f22 -/* EDF55C 80240B9C 00000000 */ nop +/* EDF55C 80240B9C 00000000 */ nop /* EDF560 80240BA0 4600D000 */ add.s $f0, $f26, $f0 .L80240BA4: /* EDF564 80240BA4 E600003C */ swc1 $f0, 0x3c($s0) /* EDF568 80240BA8 8E220074 */ lw $v0, 0x74($s1) /* EDF56C 80240BAC 2442000A */ addiu $v0, $v0, 0xa /* EDF570 80240BB0 44826000 */ mtc1 $v0, $f12 -/* EDF574 80240BB4 00000000 */ nop +/* EDF574 80240BB4 00000000 */ nop /* EDF578 80240BB8 0C00AB85 */ jal func_8002AE14 /* EDF57C 80240BBC 46806320 */ cvt.s.w $f12, $f12 /* EDF580 80240BC0 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_80240A5C_EDF41C /* EDF594 80240BD4 860200A8 */ lh $v0, 0xa8($s0) /* EDF598 80240BD8 C600003C */ lwc1 $f0, 0x3c($s0) /* EDF59C 80240BDC 44821000 */ mtc1 $v0, $f2 -/* EDF5A0 80240BE0 00000000 */ nop +/* EDF5A0 80240BE0 00000000 */ nop /* EDF5A4 80240BE4 468010A0 */ cvt.s.w $f2, $f2 /* EDF5A8 80240BE8 3C028010 */ lui $v0, %hi(D_800FFC90) /* EDF5AC 80240BEC 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) @@ -118,7 +118,7 @@ glabel func_80240A5C_EDF41C /* EDF5C8 80240C08 46240000 */ add.d $f0, $f0, $f4 /* EDF5CC 80240C0C 460010A1 */ cvt.d.s $f2, $f2 /* EDF5D0 80240C10 4620103C */ c.lt.d $f2, $f0 -/* EDF5D4 80240C14 00000000 */ nop +/* EDF5D4 80240C14 00000000 */ nop /* EDF5D8 80240C18 4500002E */ bc1f .L80240CD4 /* EDF5DC 80240C1C 0280202D */ daddu $a0, $s4, $zero /* EDF5E0 80240C20 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_80240A5C_EDF41C /* EDF620 80240C60 3C01C1A0 */ lui $at, 0xc1a0 /* EDF624 80240C64 44812000 */ mtc1 $at, $f4 /* EDF628 80240C68 44834000 */ mtc1 $v1, $f8 -/* EDF62C 80240C6C 00000000 */ nop +/* EDF62C 80240C6C 00000000 */ nop /* EDF630 80240C70 46804220 */ cvt.s.w $f8, $f8 /* EDF634 80240C74 44074000 */ mfc1 $a3, $f8 /* EDF638 80240C78 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_80240A5C_EDF41C .L80240CD4: /* EDF694 80240CD4 8602008C */ lh $v0, 0x8c($s0) /* EDF698 80240CD8 14400025 */ bnez $v0, .L80240D70 -/* EDF69C 80240CDC 00000000 */ nop +/* EDF69C 80240CDC 00000000 */ nop /* EDF6A0 80240CE0 8602008E */ lh $v0, 0x8e($s0) /* EDF6A4 80240CE4 1C400022 */ bgtz $v0, .L80240D70 -/* EDF6A8 80240CE8 00000000 */ nop +/* EDF6A8 80240CE8 00000000 */ nop /* EDF6AC 80240CEC 8E620074 */ lw $v0, 0x74($s3) /* EDF6B0 80240CF0 2442FFFF */ addiu $v0, $v0, -1 /* EDF6B4 80240CF4 1840001D */ blez $v0, .L80240D6C @@ -183,7 +183,7 @@ glabel func_80240A5C_EDF41C /* EDF6C0 80240D00 9442002A */ lhu $v0, 0x2a($v0) /* EDF6C4 80240D04 30420010 */ andi $v0, $v0, 0x10 /* EDF6C8 80240D08 14400007 */ bnez $v0, .L80240D28 -/* EDF6CC 80240D0C 00000000 */ nop +/* EDF6CC 80240D0C 00000000 */ nop /* EDF6D0 80240D10 C600000C */ lwc1 $f0, 0xc($s0) /* EDF6D4 80240D14 3C014334 */ lui $at, 0x4334 /* EDF6D8 80240D18 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/code_EDEA00/func_80240E84_EDF844.s b/asm/nonmatchings/code_EDEA00/func_80240E84_EDF844.s index 51b96df34a..e448d6c046 100644 --- a/asm/nonmatchings/code_EDEA00/func_80240E84_EDF844.s +++ b/asm/nonmatchings/code_EDEA00/func_80240E84_EDF844.s @@ -60,18 +60,18 @@ glabel func_80240E84_EDF844 /* EDF91C 80240F5C C6200038 */ lwc1 $f0, 0x38($s1) /* EDF920 80240F60 4600018D */ trunc.w.s $f6, $f0 /* EDF924 80240F64 44023000 */ mfc1 $v0, $f6 -/* EDF928 80240F68 00000000 */ nop +/* EDF928 80240F68 00000000 */ nop /* EDF92C 80240F6C A6420010 */ sh $v0, 0x10($s2) /* EDF930 80240F70 C620003C */ lwc1 $f0, 0x3c($s1) /* EDF934 80240F74 4600018D */ trunc.w.s $f6, $f0 /* EDF938 80240F78 44023000 */ mfc1 $v0, $f6 -/* EDF93C 80240F7C 00000000 */ nop +/* EDF93C 80240F7C 00000000 */ nop /* EDF940 80240F80 A6420012 */ sh $v0, 0x12($s2) /* EDF944 80240F84 C6200040 */ lwc1 $f0, 0x40($s1) /* EDF948 80240F88 A2430007 */ sb $v1, 7($s2) /* EDF94C 80240F8C 4600018D */ trunc.w.s $f6, $f0 /* EDF950 80240F90 44023000 */ mfc1 $v0, $f6 -/* EDF954 80240F94 00000000 */ nop +/* EDF954 80240F94 00000000 */ nop /* EDF958 80240F98 A6420014 */ sh $v0, 0x14($s2) .L80240F9C: /* EDF95C 80240F9C 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/code_EDEA00/func_80240FB8_EDF978.s b/asm/nonmatchings/code_EDEA00/func_80240FB8_EDF978.s index 714e169976..8f39fcdf76 100644 --- a/asm/nonmatchings/code_EDEA00/func_80240FB8_EDF978.s +++ b/asm/nonmatchings/code_EDEA00/func_80240FB8_EDF978.s @@ -17,7 +17,7 @@ glabel func_80240FB8_EDF978 /* EDF9A8 80240FE8 A482008E */ sh $v0, 0x8e($a0) /* EDF9AC 80240FEC 00021400 */ sll $v0, $v0, 0x10 /* EDF9B0 80240FF0 1C400006 */ bgtz $v0, .L8024100C -/* EDF9B4 80240FF4 00000000 */ nop +/* EDF9B4 80240FF4 00000000 */ nop .L80240FF8: /* EDF9B8 80240FF8 8482008C */ lh $v0, 0x8c($a0) /* EDF9BC 80240FFC 14400003 */ bnez $v0, .L8024100C diff --git a/asm/nonmatchings/code_EDEA00/func_8024101C_EDF9DC.s b/asm/nonmatchings/code_EDEA00/func_8024101C_EDF9DC.s index 5a3e63d4d3..2ffb19767f 100644 --- a/asm/nonmatchings/code_EDEA00/func_8024101C_EDF9DC.s +++ b/asm/nonmatchings/code_EDEA00/func_8024101C_EDF9DC.s @@ -42,9 +42,9 @@ glabel func_8024101C_EDF9DC /* EDFA70 802410B0 44801800 */ mtc1 $zero, $f3 /* EDFA74 802410B4 46002021 */ cvt.d.s $f0, $f4 /* EDFA78 802410B8 4620103E */ c.le.d $f2, $f0 -/* EDFA7C 802410BC 00000000 */ nop +/* EDFA7C 802410BC 00000000 */ nop /* EDFA80 802410C0 45000030 */ bc1f .L80241184 -/* EDFA84 802410C4 00000000 */ nop +/* EDFA84 802410C4 00000000 */ nop /* EDFA88 802410C8 C600003C */ lwc1 $f0, 0x3c($s0) /* EDFA8C 802410CC 46040000 */ add.s $f0, $f0, $f4 /* EDFA90 802410D0 E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_8024101C_EDF9DC /* EDFAF0 80241130 27A70020 */ addiu $a3, $sp, 0x20 .L80241134: /* EDFAF4 80241134 1040000B */ beqz $v0, .L80241164 -/* EDFAF8 80241138 00000000 */ nop +/* EDFAF8 80241138 00000000 */ nop /* EDFAFC 8024113C C7A0001C */ lwc1 $f0, 0x1c($sp) /* EDFB00 80241140 46140080 */ add.s $f2, $f0, $f20 /* EDFB04 80241144 C600003C */ lwc1 $f0, 0x3c($s0) /* EDFB08 80241148 4600103E */ c.le.s $f2, $f0 -/* EDFB0C 8024114C 00000000 */ nop +/* EDFB0C 8024114C 00000000 */ nop /* EDFB10 80241150 4500008D */ bc1f .L80241388 -/* EDFB14 80241154 00000000 */ nop +/* EDFB14 80241154 00000000 */ nop /* EDFB18 80241158 E602003C */ swc1 $f2, 0x3c($s0) /* EDFB1C 8024115C 080904E2 */ j .L80241388 /* EDFB20 80241160 AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_8024101C_EDF9DC /* EDFB24 80241164 C602003C */ lwc1 $f2, 0x3c($s0) /* EDFB28 80241168 C6000064 */ lwc1 $f0, 0x64($s0) /* EDFB2C 8024116C 4602003E */ c.le.s $f0, $f2 -/* EDFB30 80241170 00000000 */ nop +/* EDFB30 80241170 00000000 */ nop /* EDFB34 80241174 45030084 */ bc1tl .L80241388 /* EDFB38 80241178 AE400070 */ sw $zero, 0x70($s2) /* EDFB3C 8024117C 080904E2 */ j .L80241388 -/* EDFB40 80241180 00000000 */ nop +/* EDFB40 80241180 00000000 */ nop .L80241184: /* EDFB44 80241184 4622003C */ c.lt.d $f0, $f2 -/* EDFB48 80241188 00000000 */ nop +/* EDFB48 80241188 00000000 */ nop /* EDFB4C 8024118C 4500007E */ bc1f .L80241388 -/* EDFB50 80241190 00000000 */ nop +/* EDFB50 80241190 00000000 */ nop /* EDFB54 80241194 9602008E */ lhu $v0, 0x8e($s0) /* EDFB58 80241198 24420001 */ addiu $v0, $v0, 1 /* EDFB5C 8024119C A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_8024101C_EDF9DC /* EDFB68 802411A8 00021403 */ sra $v0, $v0, 0x10 /* EDFB6C 802411AC 0043102A */ slt $v0, $v0, $v1 /* EDFB70 802411B0 14400026 */ bnez $v0, .L8024124C -/* EDFB74 802411B4 00000000 */ nop +/* EDFB74 802411B4 00000000 */ nop /* EDFB78 802411B8 C60C0038 */ lwc1 $f12, 0x38($s0) /* EDFB7C 802411BC C60E0040 */ lwc1 $f14, 0x40($s0) /* EDFB80 802411C0 3C028010 */ lui $v0, %hi(D_800FFC90) @@ -124,20 +124,20 @@ glabel func_8024101C_EDF9DC /* EDFBAC 802411EC 8E62001C */ lw $v0, 0x1c($s3) /* EDFBB0 802411F0 46001005 */ abs.s $f0, $f2 /* EDFBB4 802411F4 44822000 */ mtc1 $v0, $f4 -/* EDFBB8 802411F8 00000000 */ nop +/* EDFBB8 802411F8 00000000 */ nop /* EDFBBC 802411FC 46802120 */ cvt.s.w $f4, $f4 /* EDFBC0 80241200 4600203C */ c.lt.s $f4, $f0 -/* EDFBC4 80241204 00000000 */ nop +/* EDFBC4 80241204 00000000 */ nop /* EDFBC8 80241208 4500000D */ bc1f .L80241240 -/* EDFBCC 8024120C 00000000 */ nop +/* EDFBCC 8024120C 00000000 */ nop /* EDFBD0 80241210 44800000 */ mtc1 $zero, $f0 /* EDFBD4 80241214 C614000C */ lwc1 $f20, 0xc($s0) /* EDFBD8 80241218 4600103C */ c.lt.s $f2, $f0 -/* EDFBDC 8024121C 00000000 */ nop +/* EDFBDC 8024121C 00000000 */ nop /* EDFBE0 80241220 45000006 */ bc1f .L8024123C /* EDFBE4 80241224 00021023 */ negu $v0, $v0 /* EDFBE8 80241228 44820000 */ mtc1 $v0, $f0 -/* EDFBEC 8024122C 00000000 */ nop +/* EDFBEC 8024122C 00000000 */ nop /* EDFBF0 80241230 46800020 */ cvt.s.w $f0, $f0 /* EDFBF4 80241234 08090490 */ j .L80241240 /* EDFBF8 80241238 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_8024101C_EDF9DC /* EDFC20 80241260 C600001C */ lwc1 $f0, 0x1c($s0) /* EDFC24 80241264 46001080 */ add.s $f2, $f2, $f0 /* EDFC28 80241268 4616103C */ c.lt.s $f2, $f22 -/* EDFC2C 8024126C 00000000 */ nop +/* EDFC2C 8024126C 00000000 */ nop /* EDFC30 80241270 45020045 */ bc1fl .L80241388 /* EDFC34 80241274 E602003C */ swc1 $f2, 0x3c($s0) /* EDFC38 80241278 080904E1 */ j .L80241384 @@ -169,7 +169,7 @@ glabel func_8024101C_EDF9DC /* EDFC50 80241290 C600001C */ lwc1 $f0, 0x1c($s0) /* EDFC54 80241294 C604003C */ lwc1 $f4, 0x3c($s0) /* EDFC58 80241298 44821000 */ mtc1 $v0, $f2 -/* EDFC5C 8024129C 00000000 */ nop +/* EDFC5C 8024129C 00000000 */ nop /* EDFC60 802412A0 468010A0 */ cvt.s.w $f2, $f2 /* EDFC64 802412A4 46000005 */ abs.s $f0, $f0 /* EDFC68 802412A8 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_8024101C_EDF9DC /* EDFCA4 802412E4 0C03908F */ jal func_800E423C /* EDFCA8 802412E8 27A70020 */ addiu $a3, $sp, 0x20 /* EDFCAC 802412EC 10400015 */ beqz $v0, .L80241344 -/* EDFCB0 802412F0 00000000 */ nop +/* EDFCB0 802412F0 00000000 */ nop /* EDFCB4 802412F4 860200A8 */ lh $v0, 0xa8($s0) /* EDFCB8 802412F8 C604001C */ lwc1 $f4, 0x1c($s0) /* EDFCBC 802412FC 44820000 */ mtc1 $v0, $f0 -/* EDFCC0 80241300 00000000 */ nop +/* EDFCC0 80241300 00000000 */ nop /* EDFCC4 80241304 46800020 */ cvt.s.w $f0, $f0 /* EDFCC8 80241308 46002085 */ abs.s $f2, $f4 /* EDFCCC 8024130C 46020000 */ add.s $f0, $f0, $f2 /* EDFCD0 80241310 C7A20024 */ lwc1 $f2, 0x24($sp) /* EDFCD4 80241314 4600103E */ c.le.s $f2, $f0 -/* EDFCD8 80241318 00000000 */ nop +/* EDFCD8 80241318 00000000 */ nop /* EDFCDC 8024131C 45000005 */ bc1f .L80241334 -/* EDFCE0 80241320 00000000 */ nop +/* EDFCE0 80241320 00000000 */ nop /* EDFCE4 80241324 C7A0001C */ lwc1 $f0, 0x1c($sp) /* EDFCE8 80241328 AE00001C */ sw $zero, 0x1c($s0) /* EDFCEC 8024132C 080904E2 */ j .L80241388 @@ -217,13 +217,13 @@ glabel func_8024101C_EDF9DC /* EDFD08 80241348 860200A8 */ lh $v0, 0xa8($s0) /* EDFD0C 8024134C 46163081 */ sub.s $f2, $f6, $f22 /* EDFD10 80241350 44820000 */ mtc1 $v0, $f0 -/* EDFD14 80241354 00000000 */ nop +/* EDFD14 80241354 00000000 */ nop /* EDFD18 80241358 46800020 */ cvt.s.w $f0, $f0 /* EDFD1C 8024135C 46001080 */ add.s $f2, $f2, $f0 /* EDFD20 80241360 C604001C */ lwc1 $f4, 0x1c($s0) /* EDFD24 80241364 46002005 */ abs.s $f0, $f4 /* EDFD28 80241368 4602003C */ c.lt.s $f0, $f2 -/* EDFD2C 8024136C 00000000 */ nop +/* EDFD2C 8024136C 00000000 */ nop /* EDFD30 80241370 45020005 */ bc1fl .L80241388 /* EDFD34 80241374 AE00001C */ sw $zero, 0x1c($s0) /* EDFD38 80241378 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/code_EDEA00/func_802413AC_EDFD6C.s b/asm/nonmatchings/code_EDEA00/func_802413AC_EDFD6C.s index 93404f507a..0fda6f1b51 100644 --- a/asm/nonmatchings/code_EDEA00/func_802413AC_EDFD6C.s +++ b/asm/nonmatchings/code_EDEA00/func_802413AC_EDFD6C.s @@ -49,15 +49,15 @@ glabel func_802413AC_EDFD6C /* EDFE14 80241454 44802000 */ mtc1 $zero, $f4 /* EDFE18 80241458 460010A1 */ cvt.d.s $f2, $f2 /* EDFE1C 8024145C 46241082 */ mul.d $f2, $f2, $f4 -/* EDFE20 80241460 00000000 */ nop +/* EDFE20 80241460 00000000 */ nop /* EDFE24 80241464 C7A0001C */ lwc1 $f0, 0x1c($sp) /* EDFE28 80241468 46000021 */ cvt.d.s $f0, $f0 /* EDFE2C 8024146C 46240002 */ mul.d $f0, $f0, $f4 -/* EDFE30 80241470 00000000 */ nop +/* EDFE30 80241470 00000000 */ nop /* EDFE34 80241474 3C013FE0 */ lui $at, 0x3fe0 /* EDFE38 80241478 44812800 */ mtc1 $at, $f5 /* EDFE3C 8024147C 44802000 */ mtc1 $zero, $f4 -/* EDFE40 80241480 00000000 */ nop +/* EDFE40 80241480 00000000 */ nop /* EDFE44 80241484 46241080 */ add.d $f2, $f2, $f4 /* EDFE48 80241488 AE000074 */ sw $zero, 0x74($s0) /* EDFE4C 8024148C 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/code_EDEA00/func_802414D0_EDFE90.s b/asm/nonmatchings/code_EDEA00/func_802414D0_EDFE90.s index c6c5847008..a39ec1284c 100644 --- a/asm/nonmatchings/code_EDEA00/func_802414D0_EDFE90.s +++ b/asm/nonmatchings/code_EDEA00/func_802414D0_EDFE90.s @@ -65,7 +65,7 @@ glabel func_802414D0_EDFE90 /* EDFF7C 802415BC 8E4300B0 */ lw $v1, 0xb0($s2) /* EDFF80 802415C0 30620004 */ andi $v0, $v1, 4 /* EDFF84 802415C4 10400007 */ beqz $v0, .L802415E4 -/* EDFF88 802415C8 00000000 */ nop +/* EDFF88 802415C8 00000000 */ nop /* EDFF8C 802415CC 824200B4 */ lb $v0, 0xb4($s2) /* EDFF90 802415D0 1440003C */ bnez $v0, .L802416C4 /* EDFF94 802415D4 0000102D */ daddu $v0, $zero, $zero @@ -77,58 +77,68 @@ glabel func_802414D0_EDFE90 /* EDFFA8 802415E8 2C62000F */ sltiu $v0, $v1, 0xf /* EDFFAC 802415EC 10400034 */ beqz $v0, .L802416C0 /* EDFFB0 802415F0 00031080 */ sll $v0, $v1, 2 -/* EDFFB4 802415F4 3C018024 */ lui $at, %hi(D_80247B08) +/* EDFFB4 802415F4 3C018024 */ lui $at, %hi(jtbl_80247B08_EE64C8) /* EDFFB8 802415F8 00220821 */ addu $at, $at, $v0 -/* EDFFBC 802415FC 8C227B08 */ lw $v0, %lo(D_80247B08)($at) +/* EDFFBC 802415FC 8C227B08 */ lw $v0, %lo(jtbl_80247B08_EE64C8)($at) /* EDFFC0 80241600 00400008 */ jr $v0 -/* EDFFC4 80241604 00000000 */ nop +/* EDFFC4 80241604 00000000 */ nop +glabel L80241608_EDFFC8 /* EDFFC8 80241608 02A0202D */ daddu $a0, $s5, $zero /* EDFFCC 8024160C 0200282D */ daddu $a1, $s0, $zero /* EDFFD0 80241610 0C090071 */ jal func_802401C4_EDEB84 /* EDFFD4 80241614 0260302D */ daddu $a2, $s3, $zero +glabel L80241618_EDFFD8 /* EDFFD8 80241618 02A0202D */ daddu $a0, $s5, $zero /* EDFFDC 8024161C 0200282D */ daddu $a1, $s0, $zero /* EDFFE0 80241620 0C0900DD */ jal func_80240374_EDED34 /* EDFFE4 80241624 0260302D */ daddu $a2, $s3, $zero /* EDFFE8 80241628 080905B1 */ j .L802416C4 /* EDFFEC 8024162C 0000102D */ daddu $v0, $zero, $zero +glabel L80241630_EDFFF0 /* EDFFF0 80241630 02A0202D */ daddu $a0, $s5, $zero /* EDFFF4 80241634 0200282D */ daddu $a1, $s0, $zero /* EDFFF8 80241638 0C090267 */ jal func_8024099C_EDF35C /* EDFFFC 8024163C 0260302D */ daddu $a2, $s3, $zero +glabel L80241640_EE0000 /* EE0000 80241640 02A0202D */ daddu $a0, $s5, $zero /* EE0004 80241644 0200282D */ daddu $a1, $s0, $zero /* EE0008 80241648 0C090297 */ jal func_80240A5C_EDF41C /* EE000C 8024164C 0260302D */ daddu $a2, $s3, $zero /* EE0010 80241650 080905B1 */ j .L802416C4 /* EE0014 80241654 0000102D */ daddu $v0, $zero, $zero +glabel L80241658_EE0018 /* EE0018 80241658 02A0202D */ daddu $a0, $s5, $zero /* EE001C 8024165C 0200282D */ daddu $a1, $s0, $zero /* EE0020 80241660 0C090368 */ jal func_80240DA0_EDF760 /* EE0024 80241664 0260302D */ daddu $a2, $s3, $zero +glabel L80241668_EE0028 /* EE0028 80241668 02A0202D */ daddu $a0, $s5, $zero /* EE002C 8024166C 0200282D */ daddu $a1, $s0, $zero /* EE0030 80241670 0C090386 */ jal func_80240E18_EDF7D8 /* EE0034 80241674 0260302D */ daddu $a2, $s3, $zero /* EE0038 80241678 080905B1 */ j .L802416C4 /* EE003C 8024167C 0000102D */ daddu $v0, $zero, $zero +glabel L80241680_EE0040 /* EE0040 80241680 02A0202D */ daddu $a0, $s5, $zero /* EE0044 80241684 0200282D */ daddu $a1, $s0, $zero /* EE0048 80241688 0C0903A1 */ jal func_80240E84_EDF844 /* EE004C 8024168C 0260302D */ daddu $a2, $s3, $zero /* EE0050 80241690 080905B1 */ j .L802416C4 /* EE0054 80241694 0000102D */ daddu $v0, $zero, $zero +glabel L80241698_EE0058 /* EE0058 80241698 02A0202D */ daddu $a0, $s5, $zero /* EE005C 8024169C 0200282D */ daddu $a1, $s0, $zero /* EE0060 802416A0 0C0903EE */ jal func_80240FB8_EDF978 /* EE0064 802416A4 0260302D */ daddu $a2, $s3, $zero /* EE0068 802416A8 080905B1 */ j .L802416C4 /* EE006C 802416AC 0000102D */ daddu $v0, $zero, $zero +glabel L802416B0_EE0070 /* EE0070 802416B0 02A0202D */ daddu $a0, $s5, $zero /* EE0074 802416B4 0200282D */ daddu $a1, $s0, $zero /* EE0078 802416B8 0C090407 */ jal func_8024101C_EDF9DC /* EE007C 802416BC 0260302D */ daddu $a2, $s3, $zero .L802416C0: +glabel L802416C0_EE0080 /* EE0080 802416C0 0000102D */ daddu $v0, $zero, $zero .L802416C4: /* EE0084 802416C4 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/code_EDEA00/func_80241730_EE00F0.s b/asm/nonmatchings/code_EDEA00/func_80241730_EE00F0.s index 626aab98f5..8601109f1f 100644 --- a/asm/nonmatchings/code_EDEA00/func_80241730_EE00F0.s +++ b/asm/nonmatchings/code_EDEA00/func_80241730_EE00F0.s @@ -71,7 +71,7 @@ glabel func_80241730_EE00F0 /* EE01F4 80241834 0C00AD77 */ jal func_8002B5DC /* EE01F8 80241838 46806320 */ cvt.s.w $f12, $f12 /* EE01FC 8024183C 46140002 */ mul.s $f0, $f0, $f20 -/* EE0200 80241840 00000000 */ nop +/* EE0200 80241840 00000000 */ nop /* EE0204 80241844 C7A2002C */ lwc1 $f2, 0x2c($sp) /* EE0208 80241848 46181080 */ add.s $f2, $f2, $f24 /* EE020C 8024184C 46001080 */ add.s $f2, $f2, $f0 @@ -79,14 +79,14 @@ glabel func_80241730_EE00F0 /* EE0214 80241854 8E220074 */ lw $v0, 0x74($s1) /* EE0218 80241858 2442000C */ addiu $v0, $v0, 0xc /* EE021C 8024185C 44826000 */ mtc1 $v0, $f12 -/* EE0220 80241860 00000000 */ nop +/* EE0220 80241860 00000000 */ nop /* EE0224 80241864 0C00AB85 */ jal func_8002AE14 /* EE0228 80241868 46806320 */ cvt.s.w $f12, $f12 /* EE022C 8024186C 4600020D */ trunc.w.s $f8, $f0 /* EE0230 80241870 E6280074 */ swc1 $f8, 0x74($s1) /* EE0234 80241874 8EE30014 */ lw $v1, 0x14($s7) /* EE0238 80241878 0460003C */ bltz $v1, .L8024196C -/* EE023C 8024187C 00000000 */ nop +/* EE023C 8024187C 00000000 */ nop /* EE0240 80241880 8E420074 */ lw $v0, 0x74($s2) /* EE0244 80241884 1C400038 */ bgtz $v0, .L80241968 /* EE0248 80241888 2442FFFF */ addiu $v0, $v0, -1 @@ -111,7 +111,7 @@ glabel func_80241730_EE00F0 /* EE0294 802418D4 2402000F */ addiu $v0, $zero, 0xf /* EE0298 802418D8 AFA2001C */ sw $v0, 0x1c($sp) /* EE029C 802418DC 44834000 */ mtc1 $v1, $f8 -/* EE02A0 802418E0 00000000 */ nop +/* EE02A0 802418E0 00000000 */ nop /* EE02A4 802418E4 46804220 */ cvt.s.w $f8, $f8 /* EE02A8 802418E8 44074000 */ mfc1 $a3, $f8 /* EE02AC 802418EC 27A20038 */ addiu $v0, $sp, 0x38 @@ -170,7 +170,7 @@ glabel func_80241730_EE00F0 /* EE0374 802419B4 0C013431 */ jal func_8004D0C4 /* EE0378 802419B8 8E070038 */ lw $a3, 0x38($s0) /* EE037C 802419BC 1040000D */ beqz $v0, .L802419F4 -/* EE0380 802419C0 00000000 */ nop +/* EE0380 802419C0 00000000 */ nop /* EE0384 802419C4 8E2200D0 */ lw $v0, 0xd0($s1) /* EE0388 802419C8 C60C0038 */ lwc1 $f12, 0x38($s0) /* EE038C 802419CC C60E0040 */ lwc1 $f14, 0x40($s0) @@ -181,12 +181,12 @@ glabel func_80241730_EE00F0 /* EE03A0 802419E0 46804220 */ cvt.s.w $f8, $f8 /* EE03A4 802419E4 44074000 */ mfc1 $a3, $f8 /* EE03A8 802419E8 0C00ABDC */ jal fio_validate_header_checksums -/* EE03AC 802419EC 00000000 */ nop +/* EE03AC 802419EC 00000000 */ nop /* EE03B0 802419F0 E600000C */ swc1 $f0, 0xc($s0) .L802419F4: /* EE03B4 802419F4 8602008C */ lh $v0, 0x8c($s0) /* EE03B8 802419F8 14400056 */ bnez $v0, .L80241B54 -/* EE03BC 802419FC 00000000 */ nop +/* EE03BC 802419FC 00000000 */ nop /* EE03C0 80241A00 8602008E */ lh $v0, 0x8e($s0) /* EE03C4 80241A04 1840003D */ blez $v0, .L80241AFC /* EE03C8 80241A08 240403E8 */ addiu $a0, $zero, 0x3e8 @@ -221,7 +221,7 @@ glabel func_80241730_EE00F0 /* EE043C 80241A7C E7A4002C */ swc1 $f4, 0x2c($sp) /* EE0440 80241A80 460000A1 */ cvt.d.s $f2, $f0 /* EE0444 80241A84 4622303C */ c.lt.d $f6, $f2 -/* EE0448 80241A88 00000000 */ nop +/* EE0448 80241A88 00000000 */ nop /* EE044C 80241A8C 45000005 */ bc1f .L80241AA4 /* EE0450 80241A90 E7A00034 */ swc1 $f0, 0x34($sp) /* EE0454 80241A94 4600B021 */ cvt.d.s $f0, $f22 @@ -232,9 +232,9 @@ glabel func_80241730_EE00F0 /* EE0464 80241AA4 3C01C000 */ lui $at, 0xc000 /* EE0468 80241AA8 44810800 */ mtc1 $at, $f1 /* EE046C 80241AAC 44800000 */ mtc1 $zero, $f0 -/* EE0470 80241AB0 00000000 */ nop +/* EE0470 80241AB0 00000000 */ nop /* EE0474 80241AB4 4620103C */ c.lt.d $f2, $f0 -/* EE0478 80241AB8 00000000 */ nop +/* EE0478 80241AB8 00000000 */ nop /* EE047C 80241ABC 45020004 */ bc1fl .L80241AD0 /* EE0480 80241AC0 46002586 */ mov.s $f22, $f4 /* EE0484 80241AC4 4600B021 */ cvt.d.s $f0, $f22 @@ -246,7 +246,7 @@ glabel func_80241730_EE00F0 /* EE0498 80241AD8 44801000 */ mtc1 $zero, $f2 /* EE049C 80241ADC 4600B021 */ cvt.d.s $f0, $f22 /* EE04A0 80241AE0 46220002 */ mul.d $f0, $f0, $f2 -/* EE04A4 80241AE4 00000000 */ nop +/* EE04A4 80241AE4 00000000 */ nop /* EE04A8 80241AE8 4620020D */ trunc.w.d $f8, $f0 /* EE04AC 80241AEC E628007C */ swc1 $f8, 0x7c($s1) .L80241AF0: diff --git a/asm/nonmatchings/code_EDEA00/func_80241B94_EE0554.s b/asm/nonmatchings/code_EDEA00/func_80241B94_EE0554.s index 3019c58100..338174fa38 100644 --- a/asm/nonmatchings/code_EDEA00/func_80241B94_EE0554.s +++ b/asm/nonmatchings/code_EDEA00/func_80241B94_EE0554.s @@ -57,7 +57,7 @@ glabel func_80241B94_EE0554 /* EE0620 80241C60 0C00AD77 */ jal func_8002B5DC /* EE0624 80241C64 46806320 */ cvt.s.w $f12, $f12 /* EE0628 80241C68 46140002 */ mul.s $f0, $f0, $f20 -/* EE062C 80241C6C 00000000 */ nop +/* EE062C 80241C6C 00000000 */ nop /* EE0630 80241C70 C7A2002C */ lwc1 $f2, 0x2c($sp) /* EE0634 80241C74 46161080 */ add.s $f2, $f2, $f22 /* EE0638 80241C78 46001080 */ add.s $f2, $f2, $f0 @@ -65,7 +65,7 @@ glabel func_80241B94_EE0554 /* EE0640 80241C80 8E220074 */ lw $v0, 0x74($s1) /* EE0644 80241C84 2442000C */ addiu $v0, $v0, 0xc /* EE0648 80241C88 44826000 */ mtc1 $v0, $f12 -/* EE064C 80241C8C 00000000 */ nop +/* EE064C 80241C8C 00000000 */ nop /* EE0650 80241C90 0C00AB85 */ jal func_8002AE14 /* EE0654 80241C94 46806320 */ cvt.s.w $f12, $f12 /* EE0658 80241C98 4600028D */ trunc.w.s $f10, $f0 @@ -91,7 +91,7 @@ glabel func_80241B94_EE0554 /* EE06A8 80241CE8 2402000F */ addiu $v0, $zero, 0xf /* EE06AC 80241CEC AFA2001C */ sw $v0, 0x1c($sp) /* EE06B0 80241CF0 44835000 */ mtc1 $v1, $f10 -/* EE06B4 80241CF4 00000000 */ nop +/* EE06B4 80241CF4 00000000 */ nop /* EE06B8 80241CF8 468052A0 */ cvt.s.w $f10, $f10 /* EE06BC 80241CFC 44075000 */ mfc1 $a3, $f10 /* EE06C0 80241D00 27A20038 */ addiu $v0, $sp, 0x38 @@ -110,10 +110,10 @@ glabel func_80241B94_EE0554 .L80241D34: /* EE06F4 80241D34 8602008C */ lh $v0, 0x8c($s0) /* EE06F8 80241D38 14400020 */ bnez $v0, .L80241DBC -/* EE06FC 80241D3C 00000000 */ nop +/* EE06FC 80241D3C 00000000 */ nop /* EE0700 80241D40 8602008E */ lh $v0, 0x8e($s0) /* EE0704 80241D44 1C40001D */ bgtz $v0, .L80241DBC -/* EE0708 80241D48 00000000 */ nop +/* EE0708 80241D48 00000000 */ nop /* EE070C 80241D4C 8E420074 */ lw $v0, 0x74($s2) /* EE0710 80241D50 2442FFFF */ addiu $v0, $v0, -1 /* EE0714 80241D54 18400018 */ blez $v0, .L80241DB8 diff --git a/asm/nonmatchings/code_EDEA00/func_80241DE4_EE07A4.s b/asm/nonmatchings/code_EDEA00/func_80241DE4_EE07A4.s index 2819db542f..ef64bc1ca2 100644 --- a/asm/nonmatchings/code_EDEA00/func_80241DE4_EE07A4.s +++ b/asm/nonmatchings/code_EDEA00/func_80241DE4_EE07A4.s @@ -68,7 +68,7 @@ glabel func_80241DE4_EE07A4 /* EE089C 80241EDC 8E6300B0 */ lw $v1, 0xb0($s3) /* EE08A0 80241EE0 30620004 */ andi $v0, $v1, 4 /* EE08A4 80241EE4 10400007 */ beqz $v0, .L80241F04 -/* EE08A8 80241EE8 00000000 */ nop +/* EE08A8 80241EE8 00000000 */ nop /* EE08AC 80241EEC 826200B4 */ lb $v0, 0xb4($s3) /* EE08B0 80241EF0 144000F4 */ bnez $v0, .L802422C4 /* EE08B4 80241EF4 0000102D */ daddu $v0, $zero, $zero @@ -85,14 +85,14 @@ glabel func_80241DE4_EE07A4 /* EE08DC 80241F1C 10600009 */ beqz $v1, .L80241F44 /* EE08E0 80241F20 2402000C */ addiu $v0, $zero, 0xc /* EE08E4 80241F24 080907E5 */ j .L80241F94 -/* EE08E8 80241F28 00000000 */ nop +/* EE08E8 80241F28 00000000 */ nop .L80241F2C: /* EE08EC 80241F2C 1062000F */ beq $v1, $v0, .L80241F6C /* EE08F0 80241F30 24020003 */ addiu $v0, $zero, 3 /* EE08F4 80241F34 10620012 */ beq $v1, $v0, .L80241F80 /* EE08F8 80241F38 0280202D */ daddu $a0, $s4, $zero /* EE08FC 80241F3C 080907E3 */ j .L80241F8C -/* EE0900 80241F40 00000000 */ nop +/* EE0900 80241F40 00000000 */ nop .L80241F44: /* EE0904 80241F44 0280202D */ daddu $a0, $s4, $zero /* EE0908 80241F48 02C0282D */ daddu $a1, $s6, $zero @@ -104,7 +104,7 @@ glabel func_80241DE4_EE07A4 /* EE091C 80241F5C 0C0905CC */ jal func_80241730_EE00F0 /* EE0920 80241F60 02A0302D */ daddu $a2, $s5, $zero /* EE0924 80241F64 080907E3 */ j .L80241F8C -/* EE0928 80241F68 00000000 */ nop +/* EE0928 80241F68 00000000 */ nop .L80241F6C: /* EE092C 80241F6C 0280202D */ daddu $a0, $s4, $zero /* EE0930 80241F70 02C0282D */ daddu $a1, $s6, $zero @@ -120,7 +120,7 @@ glabel func_80241DE4_EE07A4 /* EE0950 80241F90 2402000C */ addiu $v0, $zero, 0xc .L80241F94: /* EE0954 80241F94 1462001A */ bne $v1, $v0, .L80242000 -/* EE0958 80241F98 00000000 */ nop +/* EE0958 80241F98 00000000 */ nop /* EE095C 80241F9C C64C0038 */ lwc1 $f12, 0x38($s2) /* EE0960 80241FA0 3C028010 */ lui $v0, %hi(D_800FFC90) /* EE0964 80241FA4 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) @@ -156,13 +156,13 @@ glabel func_80241DE4_EE07A4 /* EE09D8 80242018 10620008 */ beq $v1, $v0, .L8024203C /* EE09DC 8024201C 2410001F */ addiu $s0, $zero, 0x1f /* EE09E0 80242020 0809081E */ j .L80242078 -/* EE09E4 80242024 00000000 */ nop +/* EE09E4 80242024 00000000 */ nop .L80242028: /* EE09E8 80242028 2402000E */ addiu $v0, $zero, 0xe /* EE09EC 8024202C 1062000D */ beq $v1, $v0, .L80242064 /* EE09F0 80242030 0280202D */ daddu $a0, $s4, $zero /* EE09F4 80242034 0809081C */ j .L80242070 -/* EE09F8 80242038 00000000 */ nop +/* EE09F8 80242038 00000000 */ nop .L8024203C: /* EE09FC 8024203C 0280202D */ daddu $a0, $s4, $zero /* EE0A00 80242040 02C0282D */ daddu $a1, $s6, $zero @@ -174,7 +174,7 @@ glabel func_80241DE4_EE07A4 /* EE0A14 80242054 0C0903EE */ jal func_80240FB8_EDF978 /* EE0A18 80242058 02A0302D */ daddu $a2, $s5, $zero /* EE0A1C 8024205C 0809081C */ j .L80242070 -/* EE0A20 80242060 00000000 */ nop +/* EE0A20 80242060 00000000 */ nop .L80242064: /* EE0A24 80242064 02C0282D */ daddu $a1, $s6, $zero /* EE0A28 80242068 0C090407 */ jal func_8024101C_EDF9DC @@ -188,24 +188,24 @@ glabel func_80241DE4_EE07A4 /* EE0A40 80242080 10400005 */ beqz $v0, .L80242098 /* EE0A44 80242084 2402001E */ addiu $v0, $zero, 0x1e /* EE0A48 80242088 1062000A */ beq $v1, $v0, .L802420B4 -/* EE0A4C 8024208C 00000000 */ nop +/* EE0A4C 8024208C 00000000 */ nop /* EE0A50 80242090 08090859 */ j .L80242164 -/* EE0A54 80242094 00000000 */ nop +/* EE0A54 80242094 00000000 */ nop .L80242098: /* EE0A58 80242098 24020020 */ addiu $v0, $zero, 0x20 /* EE0A5C 8024209C 10620022 */ beq $v1, $v0, .L80242128 /* EE0A60 802420A0 24020021 */ addiu $v0, $zero, 0x21 /* EE0A64 802420A4 10620029 */ beq $v1, $v0, .L8024214C -/* EE0A68 802420A8 00000000 */ nop +/* EE0A68 802420A8 00000000 */ nop /* EE0A6C 802420AC 08090859 */ j .L80242164 -/* EE0A70 802420B0 00000000 */ nop +/* EE0A70 802420B0 00000000 */ nop .L802420B4: /* EE0A74 802420B4 9642008E */ lhu $v0, 0x8e($s2) /* EE0A78 802420B8 2442FFFF */ addiu $v0, $v0, -1 /* EE0A7C 802420BC A642008E */ sh $v0, 0x8e($s2) /* EE0A80 802420C0 00021400 */ sll $v0, $v0, 0x10 /* EE0A84 802420C4 1C400027 */ bgtz $v0, .L80242164 -/* EE0A88 802420C8 00000000 */ nop +/* EE0A88 802420C8 00000000 */ nop /* EE0A8C 802420CC 0C010ABD */ jal func_80042AF4 /* EE0A90 802420D0 8E64007C */ lw $a0, 0x7c($s3) /* EE0A94 802420D4 24030002 */ addiu $v1, $zero, 2 @@ -293,25 +293,25 @@ glabel func_80241DE4_EE07A4 /* EE0BCC 8024220C 44800000 */ mtc1 $zero, $f0 /* EE0BD0 80242210 4600A0A1 */ cvt.d.s $f2, $f20 /* EE0BD4 80242214 4622003C */ c.lt.d $f0, $f2 -/* EE0BD8 80242218 00000000 */ nop +/* EE0BD8 80242218 00000000 */ nop /* EE0BDC 8024221C 45000029 */ bc1f .L802422C4 -/* EE0BE0 80242220 00000000 */ nop +/* EE0BE0 80242220 00000000 */ nop /* EE0BE4 80242224 8642008C */ lh $v0, 0x8c($s2) /* EE0BE8 80242228 54400026 */ bnel $v0, $zero, .L802422C4 /* EE0BEC 8024222C 0000102D */ daddu $v0, $zero, $zero /* EE0BF0 80242230 3C014034 */ lui $at, 0x4034 /* EE0BF4 80242234 44810800 */ mtc1 $at, $f1 /* EE0BF8 80242238 44800000 */ mtc1 $zero, $f0 -/* EE0BFC 8024223C 00000000 */ nop +/* EE0BFC 8024223C 00000000 */ nop /* EE0C00 80242240 46201001 */ sub.d $f0, $f2, $f0 /* EE0C04 80242244 44801000 */ mtc1 $zero, $f2 /* EE0C08 80242248 44801800 */ mtc1 $zero, $f3 /* EE0C0C 8024224C 46200120 */ cvt.s.d $f4, $f0 /* EE0C10 80242250 46002021 */ cvt.d.s $f0, $f4 /* EE0C14 80242254 4622003C */ c.lt.d $f0, $f2 -/* EE0C18 80242258 00000000 */ nop +/* EE0C18 80242258 00000000 */ nop /* EE0C1C 8024225C 45000002 */ bc1f .L80242268 -/* EE0C20 80242260 00000000 */ nop +/* EE0C20 80242260 00000000 */ nop /* EE0C24 80242264 44802000 */ mtc1 $zero, $f4 .L80242268: /* EE0C28 80242268 3C014069 */ lui $at, 0x4069 @@ -319,7 +319,7 @@ glabel func_80241DE4_EE07A4 /* EE0C30 80242270 44801000 */ mtc1 $zero, $f2 /* EE0C34 80242274 46002021 */ cvt.d.s $f0, $f4 /* EE0C38 80242278 4620103C */ c.lt.d $f2, $f0 -/* EE0C3C 8024227C 00000000 */ nop +/* EE0C3C 8024227C 00000000 */ nop /* EE0C40 80242280 45000003 */ bc1f .L80242290 /* EE0C44 80242284 240200C8 */ addiu $v0, $zero, 0xc8 /* EE0C48 80242288 3C014348 */ lui $at, 0x4348 diff --git a/asm/nonmatchings/code_EDEA00/func_8024236C_EE0D2C.s b/asm/nonmatchings/code_EDEA00/func_8024236C_EE0D2C.s index 1f8aa64ec5..981d830146 100644 --- a/asm/nonmatchings/code_EDEA00/func_8024236C_EE0D2C.s +++ b/asm/nonmatchings/code_EDEA00/func_8024236C_EE0D2C.s @@ -21,11 +21,11 @@ glabel func_8024236C_EE0D2C /* EE0D6C 802423AC A602008E */ sh $v0, 0x8e($s0) /* EE0D70 802423B0 00021400 */ sll $v0, $v0, 0x10 /* EE0D74 802423B4 1C400033 */ bgtz $v0, .L80242484 -/* EE0D78 802423B8 00000000 */ nop +/* EE0D78 802423B8 00000000 */ nop .L802423BC: /* EE0D7C 802423BC 8602008C */ lh $v0, 0x8c($s0) /* EE0D80 802423C0 14400030 */ bnez $v0, .L80242484 -/* EE0D84 802423C4 00000000 */ nop +/* EE0D84 802423C4 00000000 */ nop /* EE0D88 802423C8 8E2200CC */ lw $v0, 0xcc($s1) /* EE0D8C 802423CC 8C420024 */ lw $v0, 0x24($v0) /* EE0D90 802423D0 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_8024236C_EE0D2C /* EE0D9C 802423DC 8E230088 */ lw $v1, 0x88($s1) /* EE0DA0 802423E0 24020005 */ addiu $v0, $zero, 5 /* EE0DA4 802423E4 10620005 */ beq $v1, $v0, .L802423FC -/* EE0DA8 802423E8 00000000 */ nop +/* EE0DA8 802423E8 00000000 */ nop /* EE0DAC 802423EC 10600003 */ beqz $v1, .L802423FC /* EE0DB0 802423F0 24020001 */ addiu $v0, $zero, 1 /* EE0DB4 802423F4 14620006 */ bne $v1, $v0, .L80242410 -/* EE0DB8 802423F8 00000000 */ nop +/* EE0DB8 802423F8 00000000 */ nop .L802423FC: /* EE0DBC 802423FC 8E220084 */ lw $v0, 0x84($s1) /* EE0DC0 80242400 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_8024236C_EE0D2C /* EE0E00 80242440 46220000 */ add.d $f0, $f0, $f2 /* EE0E04 80242444 4620010D */ trunc.w.d $f4, $f0 /* EE0E08 80242448 44022000 */ mfc1 $v0, $f4 -/* EE0E0C 8024244C 00000000 */ nop +/* EE0E0C 8024244C 00000000 */ nop /* EE0E10 80242450 A602008E */ sh $v0, 0x8e($s0) /* EE0E14 80242454 00021400 */ sll $v0, $v0, 0x10 /* EE0E18 80242458 8E230078 */ lw $v1, 0x78($s1) /* EE0E1C 8024245C 00021403 */ sra $v0, $v0, 0x10 /* EE0E20 80242460 0043102A */ slt $v0, $v0, $v1 /* EE0E24 80242464 10400003 */ beqz $v0, .L80242474 -/* EE0E28 80242468 00000000 */ nop +/* EE0E28 80242468 00000000 */ nop /* EE0E2C 8024246C 9622007A */ lhu $v0, 0x7a($s1) /* EE0E30 80242470 A602008E */ sh $v0, 0x8e($s0) .L80242474: diff --git a/asm/nonmatchings/code_EDEA00/func_802424A0_EE0E60.s b/asm/nonmatchings/code_EDEA00/func_802424A0_EE0E60.s index 4711189901..a3cb5abe3a 100644 --- a/asm/nonmatchings/code_EDEA00/func_802424A0_EE0E60.s +++ b/asm/nonmatchings/code_EDEA00/func_802424A0_EE0E60.s @@ -17,23 +17,23 @@ glabel func_802424A0_EE0E60 /* EE0E90 802424D0 8603008E */ lh $v1, 0x8e($s0) /* EE0E94 802424D4 2442FFFF */ addiu $v0, $v0, -1 /* EE0E98 802424D8 14620012 */ bne $v1, $v0, .L80242524 -/* EE0E9C 802424DC 00000000 */ nop +/* EE0E9C 802424DC 00000000 */ nop /* EE0EA0 802424E0 C6000038 */ lwc1 $f0, 0x38($s0) /* EE0EA4 802424E4 4600020D */ trunc.w.s $f8, $f0 /* EE0EA8 802424E8 44024000 */ mfc1 $v0, $f8 -/* EE0EAC 802424EC 00000000 */ nop +/* EE0EAC 802424EC 00000000 */ nop /* EE0EB0 802424F0 A6220010 */ sh $v0, 0x10($s1) /* EE0EB4 802424F4 C600003C */ lwc1 $f0, 0x3c($s0) /* EE0EB8 802424F8 4600020D */ trunc.w.s $f8, $f0 /* EE0EBC 802424FC 44024000 */ mfc1 $v0, $f8 -/* EE0EC0 80242500 00000000 */ nop +/* EE0EC0 80242500 00000000 */ nop /* EE0EC4 80242504 A6220012 */ sh $v0, 0x12($s1) /* EE0EC8 80242508 C6000040 */ lwc1 $f0, 0x40($s0) /* EE0ECC 8024250C 24020001 */ addiu $v0, $zero, 1 /* EE0ED0 80242510 A2220007 */ sb $v0, 7($s1) /* EE0ED4 80242514 4600020D */ trunc.w.s $f8, $f0 /* EE0ED8 80242518 44024000 */ mfc1 $v0, $f8 -/* EE0EDC 8024251C 00000000 */ nop +/* EE0EDC 8024251C 00000000 */ nop /* EE0EE0 80242520 A6220014 */ sh $v0, 0x14($s1) .L80242524: /* EE0EE4 80242524 C6000038 */ lwc1 $f0, 0x38($s0) @@ -49,13 +49,13 @@ glabel func_802424A0_EE0E60 /* EE0F0C 8024254C 860200A8 */ lh $v0, 0xa8($s0) /* EE0F10 80242550 27A50020 */ addiu $a1, $sp, 0x20 /* EE0F14 80242554 44820000 */ mtc1 $v0, $f0 -/* EE0F18 80242558 00000000 */ nop +/* EE0F18 80242558 00000000 */ nop /* EE0F1C 8024255C 46800020 */ cvt.s.w $f0, $f0 /* EE0F20 80242560 E7A00018 */ swc1 $f0, 0x18($sp) /* EE0F24 80242564 860200A6 */ lh $v0, 0xa6($s0) /* EE0F28 80242568 27A60024 */ addiu $a2, $sp, 0x24 /* EE0F2C 8024256C 44820000 */ mtc1 $v0, $f0 -/* EE0F30 80242570 00000000 */ nop +/* EE0F30 80242570 00000000 */ nop /* EE0F34 80242574 46800020 */ cvt.s.w $f0, $f0 /* EE0F38 80242578 E7A0001C */ swc1 $f0, 0x1c($sp) /* EE0F3C 8024257C 8E040080 */ lw $a0, 0x80($s0) @@ -63,7 +63,7 @@ glabel func_802424A0_EE0E60 /* EE0F44 80242584 27A70028 */ addiu $a3, $sp, 0x28 /* EE0F48 80242588 0040902D */ daddu $s2, $v0, $zero /* EE0F4C 8024258C 16400005 */ bnez $s2, .L802425A4 -/* EE0F50 80242590 00000000 */ nop +/* EE0F50 80242590 00000000 */ nop /* EE0F54 80242594 8E050018 */ lw $a1, 0x18($s0) /* EE0F58 80242598 8E06000C */ lw $a2, 0xc($s0) /* EE0F5C 8024259C 0C00F909 */ jal func_8003E424 @@ -76,9 +76,9 @@ glabel func_802424A0_EE0E60 /* EE0F74 802425B4 A602008E */ sh $v0, 0x8e($s0) /* EE0F78 802425B8 00021400 */ sll $v0, $v0, 0x10 /* EE0F7C 802425BC 18400003 */ blez $v0, .L802425CC -/* EE0F80 802425C0 00000000 */ nop +/* EE0F80 802425C0 00000000 */ nop /* EE0F84 802425C4 12400008 */ beqz $s2, .L802425E8 -/* EE0F88 802425C8 00000000 */ nop +/* EE0F88 802425C8 00000000 */ nop .L802425CC: /* EE0F8C 802425CC 8E2200CC */ lw $v0, 0xcc($s1) /* EE0F90 802425D0 A2200007 */ sb $zero, 7($s1) diff --git a/asm/nonmatchings/code_EDEA00/func_80242604_EE0FC4.s b/asm/nonmatchings/code_EDEA00/func_80242604_EE0FC4.s index bd4dbe01c6..41aadba490 100644 --- a/asm/nonmatchings/code_EDEA00/func_80242604_EE0FC4.s +++ b/asm/nonmatchings/code_EDEA00/func_80242604_EE0FC4.s @@ -18,7 +18,7 @@ glabel func_80242604_EE0FC4 /* EE0FF8 80242638 00021400 */ sll $v0, $v0, 0x10 /* EE0FFC 8024263C 00021403 */ sra $v0, $v0, 0x10 /* EE1000 80242640 14430003 */ bne $v0, $v1, .L80242650 -/* EE1004 80242644 00000000 */ nop +/* EE1004 80242644 00000000 */ nop /* EE1008 80242648 96020086 */ lhu $v0, 0x86($s0) /* EE100C 8024264C A48200A8 */ sh $v0, 0xa8($a0) .L80242650: @@ -26,7 +26,7 @@ glabel func_80242604_EE0FC4 /* EE1014 80242654 8E030080 */ lw $v1, 0x80($s0) /* EE1018 80242658 0043102A */ slt $v0, $v0, $v1 /* EE101C 8024265C 14400004 */ bnez $v0, .L80242670 -/* EE1020 80242660 00000000 */ nop +/* EE1020 80242660 00000000 */ nop /* EE1024 80242664 96020086 */ lhu $v0, 0x86($s0) /* EE1028 80242668 A48200A8 */ sh $v0, 0xa8($a0) /* EE102C 8024266C AE200070 */ sw $zero, 0x70($s1) diff --git a/asm/nonmatchings/code_EDEA00/func_80242684_EE1044.s b/asm/nonmatchings/code_EDEA00/func_80242684_EE1044.s index 4fc25f4e35..4eef19f26a 100644 --- a/asm/nonmatchings/code_EDEA00/func_80242684_EE1044.s +++ b/asm/nonmatchings/code_EDEA00/func_80242684_EE1044.s @@ -66,7 +66,7 @@ glabel func_80242684_EE1044 /* EE1134 80242774 8E2200B0 */ lw $v0, 0xb0($s1) /* EE1138 80242778 30420004 */ andi $v0, $v0, 4 /* EE113C 8024277C 10400047 */ beqz $v0, .L8024289C -/* EE1140 80242780 00000000 */ nop +/* EE1140 80242780 00000000 */ nop .L80242784: /* EE1144 80242784 AE600070 */ sw $zero, 0x70($s3) /* EE1148 80242788 A640008E */ sh $zero, 0x8e($s2) @@ -115,7 +115,7 @@ glabel func_80242684_EE1044 /* EE11EC 8024282C 24020028 */ addiu $v0, $zero, 0x28 /* EE11F0 80242830 AFA2001C */ sw $v0, 0x1c($sp) /* EE11F4 80242834 44833000 */ mtc1 $v1, $f6 -/* EE11F8 80242838 00000000 */ nop +/* EE11F8 80242838 00000000 */ nop /* EE11FC 8024283C 468031A0 */ cvt.s.w $f6, $f6 /* EE1200 80242840 44073000 */ mfc1 $a3, $f6 /* EE1204 80242844 27A20048 */ addiu $v0, $sp, 0x48 @@ -170,14 +170,14 @@ glabel func_80242684_EE1044 /* EE12BC 802428FC 10600015 */ beqz $v1, .L80242954 /* EE12C0 80242900 0260202D */ daddu $a0, $s3, $zero /* EE12C4 80242904 08090A97 */ j .L80242A5C -/* EE12C8 80242908 00000000 */ nop +/* EE12C8 80242908 00000000 */ nop .L8024290C: /* EE12CC 8024290C 1062001C */ beq $v1, $v0, .L80242980 /* EE12D0 80242910 24020003 */ addiu $v0, $zero, 3 /* EE12D4 80242914 10620035 */ beq $v1, $v0, .L802429EC /* EE12D8 80242918 0260202D */ daddu $a0, $s3, $zero /* EE12DC 8024291C 08090A97 */ j .L80242A5C -/* EE12E0 80242920 00000000 */ nop +/* EE12E0 80242920 00000000 */ nop .L80242924: /* EE12E4 80242924 2402000E */ addiu $v0, $zero, 0xe /* EE12E8 80242928 1062003F */ beq $v1, $v0, .L80242A28 @@ -188,9 +188,9 @@ glabel func_80242684_EE1044 /* EE12FC 8024293C 10620040 */ beq $v1, $v0, .L80242A40 /* EE1300 80242940 24020063 */ addiu $v0, $zero, 0x63 /* EE1304 80242944 10620043 */ beq $v1, $v0, .L80242A54 -/* EE1308 80242948 00000000 */ nop +/* EE1308 80242948 00000000 */ nop /* EE130C 8024294C 08090A97 */ j .L80242A5C -/* EE1310 80242950 00000000 */ nop +/* EE1310 80242950 00000000 */ nop .L80242954: /* EE1314 80242954 0280282D */ daddu $a1, $s4, $zero /* EE1318 80242958 0C013670 */ jal func_8004D9C0 @@ -203,7 +203,7 @@ glabel func_80242684_EE1044 /* EE1330 80242970 0C0136B6 */ jal func_8004DAD8 /* EE1334 80242974 02A0302D */ daddu $a2, $s5, $zero /* EE1338 80242978 08090A97 */ j .L80242A5C -/* EE133C 8024297C 00000000 */ nop +/* EE133C 8024297C 00000000 */ nop .L80242980: /* EE1340 80242980 0260202D */ daddu $a0, $s3, $zero /* EE1344 80242984 0280282D */ daddu $a1, $s4, $zero @@ -239,7 +239,7 @@ glabel func_80242684_EE1044 /* EE13B0 802429F0 0C013809 */ jal func_8004E024 /* EE13B4 802429F4 02A0302D */ daddu $a2, $s5, $zero /* EE13B8 802429F8 08090A97 */ j .L80242A5C -/* EE13BC 802429FC 00000000 */ nop +/* EE13BC 802429FC 00000000 */ nop .L80242A00: /* EE13C0 80242A00 0260202D */ daddu $a0, $s3, $zero /* EE13C4 80242A04 0280282D */ daddu $a1, $s4, $zero @@ -251,20 +251,20 @@ glabel func_80242684_EE1044 /* EE13D8 80242A18 0C0908DB */ jal func_8024236C_EE0D2C /* EE13DC 80242A1C 02A0302D */ daddu $a2, $s5, $zero /* EE13E0 80242A20 08090A97 */ j .L80242A5C -/* EE13E4 80242A24 00000000 */ nop +/* EE13E4 80242A24 00000000 */ nop .L80242A28: /* EE13E8 80242A28 0260202D */ daddu $a0, $s3, $zero /* EE13EC 80242A2C 0280282D */ daddu $a1, $s4, $zero /* EE13F0 80242A30 0C090928 */ jal func_802424A0_EE0E60 /* EE13F4 80242A34 02A0302D */ daddu $a2, $s5, $zero /* EE13F8 80242A38 08090A97 */ j .L80242A5C -/* EE13FC 80242A3C 00000000 */ nop +/* EE13FC 80242A3C 00000000 */ nop .L80242A40: /* EE1400 80242A40 0280282D */ daddu $a1, $s4, $zero /* EE1404 80242A44 0C090981 */ jal func_80242604_EE0FC4 /* EE1408 80242A48 02A0302D */ daddu $a2, $s5, $zero /* EE140C 80242A4C 08090A97 */ j .L80242A5C -/* EE1410 80242A50 00000000 */ nop +/* EE1410 80242A50 00000000 */ nop .L80242A54: /* EE1414 80242A54 0C013AE3 */ jal func_8004EB8C /* EE1418 80242A58 0260202D */ daddu $a0, $s3, $zero @@ -290,15 +290,17 @@ glabel func_80242684_EE1044 /* EE145C 80242A9C 2C620015 */ sltiu $v0, $v1, 0x15 /* EE1460 80242AA0 10400009 */ beqz $v0, .L80242AC8 /* EE1464 80242AA4 00031080 */ sll $v0, $v1, 2 -/* EE1468 80242AA8 3C018024 */ lui $at, %hi(D_80247B58) +/* EE1468 80242AA8 3C018024 */ lui $at, %hi(jtbl_80247B58_EE6518) /* EE146C 80242AAC 00220821 */ addu $at, $at, $v0 -/* EE1470 80242AB0 8C227B58 */ lw $v0, %lo(D_80247B58)($at) +/* EE1470 80242AB0 8C227B58 */ lw $v0, %lo(jtbl_80247B58_EE6518)($at) /* EE1474 80242AB4 00400008 */ jr $v0 -/* EE1478 80242AB8 00000000 */ nop +/* EE1478 80242AB8 00000000 */ nop +glabel L80242ABC_EE147C /* EE147C 80242ABC 8E420028 */ lw $v0, 0x28($s2) /* EE1480 80242AC0 24420001 */ addiu $v0, $v0, 1 /* EE1484 80242AC4 AE420028 */ sw $v0, 0x28($s2) .L80242AC8: +glabel L80242AC8_EE1488 /* EE1488 80242AC8 0000102D */ daddu $v0, $zero, $zero .L80242ACC: /* EE148C 80242ACC 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/code_EDEA00/func_80242AF0_EE14B0.s b/asm/nonmatchings/code_EDEA00/func_80242AF0_EE14B0.s index f100cb618f..f9a35ba230 100644 --- a/asm/nonmatchings/code_EDEA00/func_80242AF0_EE14B0.s +++ b/asm/nonmatchings/code_EDEA00/func_80242AF0_EE14B0.s @@ -66,7 +66,7 @@ glabel func_80242AF0_EE14B0 /* EE15A0 80242BE0 8E430094 */ lw $v1, 0x94($s2) /* EE15A4 80242BE4 24020064 */ addiu $v0, $zero, 0x64 /* EE15A8 80242BE8 1462001C */ bne $v1, $v0, .L80242C5C -/* EE15AC 80242BEC 00000000 */ nop +/* EE15AC 80242BEC 00000000 */ nop .L80242BF0: /* EE15B0 80242BF0 24020064 */ addiu $v0, $zero, 0x64 /* EE15B4 80242BF4 2404F7FF */ addiu $a0, $zero, -0x801 @@ -133,7 +133,7 @@ glabel func_80242AF0_EE14B0 /* EE16A0 80242CE0 24020028 */ addiu $v0, $zero, 0x28 /* EE16A4 80242CE4 AFA2001C */ sw $v0, 0x1c($sp) /* EE16A8 80242CE8 44834000 */ mtc1 $v1, $f8 -/* EE16AC 80242CEC 00000000 */ nop +/* EE16AC 80242CEC 00000000 */ nop /* EE16B0 80242CF0 46804220 */ cvt.s.w $f8, $f8 /* EE16B4 80242CF4 44074000 */ mfc1 $a3, $f8 /* EE16B8 80242CF8 27A20048 */ addiu $v0, $sp, 0x48 @@ -164,7 +164,7 @@ glabel func_80242AF0_EE14B0 /* EE1714 80242D54 8EA20070 */ lw $v0, 0x70($s5) /* EE1718 80242D58 28420064 */ slti $v0, $v0, 0x64 /* EE171C 80242D5C 10400007 */ beqz $v0, .L80242D7C -/* EE1720 80242D60 00000000 */ nop +/* EE1720 80242D60 00000000 */ nop /* EE1724 80242D64 8FA2004C */ lw $v0, 0x4c($sp) /* EE1728 80242D68 24420032 */ addiu $v0, $v0, 0x32 /* EE172C 80242D6C 2C4201A5 */ sltiu $v0, $v0, 0x1a5 @@ -189,7 +189,7 @@ glabel func_80242AF0_EE14B0 /* EE1774 80242DB4 50600027 */ beql $v1, $zero, .L80242E54 /* EE1778 80242DB8 02A0202D */ daddu $a0, $s5, $zero /* EE177C 80242DBC 08090CFA */ j .L802433E8 -/* EE1780 80242DC0 00000000 */ nop +/* EE1780 80242DC0 00000000 */ nop .L80242DC4: /* EE1784 80242DC4 2402000D */ addiu $v0, $zero, 0xd /* EE1788 80242DC8 1062004D */ beq $v1, $v0, .L80242F00 @@ -199,7 +199,7 @@ glabel func_80242AF0_EE14B0 /* EE1798 80242DD8 10620046 */ beq $v1, $v0, .L80242EF4 /* EE179C 80242DDC 02A0202D */ daddu $a0, $s5, $zero /* EE17A0 80242DE0 08090CFA */ j .L802433E8 -/* EE17A4 80242DE4 00000000 */ nop +/* EE17A4 80242DE4 00000000 */ nop .L80242DE8: /* EE17A8 80242DE8 24020067 */ addiu $v0, $zero, 0x67 /* EE17AC 80242DEC 10620158 */ beq $v1, $v0, .L80243350 @@ -213,7 +213,7 @@ glabel func_80242AF0_EE14B0 /* EE17CC 80242E0C 1062004F */ beq $v1, $v0, .L80242F4C /* EE17D0 80242E10 24020002 */ addiu $v0, $zero, 2 /* EE17D4 80242E14 08090CFA */ j .L802433E8 -/* EE17D8 80242E18 00000000 */ nop +/* EE17D8 80242E18 00000000 */ nop .L80242E1C: /* EE17DC 80242E1C 2404006F */ addiu $a0, $zero, 0x6f /* EE17E0 80242E20 10640166 */ beq $v1, $a0, .L802433BC @@ -223,13 +223,13 @@ glabel func_80242AF0_EE14B0 /* EE17F0 80242E30 10620156 */ beq $v1, $v0, .L8024338C /* EE17F4 80242E34 2402001E */ addiu $v0, $zero, 0x1e /* EE17F8 80242E38 08090CFA */ j .L802433E8 -/* EE17FC 80242E3C 00000000 */ nop +/* EE17FC 80242E3C 00000000 */ nop .L80242E40: /* EE1800 80242E40 240200C8 */ addiu $v0, $zero, 0xc8 /* EE1804 80242E44 10620166 */ beq $v1, $v0, .L802433E0 -/* EE1808 80242E48 00000000 */ nop +/* EE1808 80242E48 00000000 */ nop /* EE180C 80242E4C 08090CFA */ j .L802433E8 -/* EE1810 80242E50 00000000 */ nop +/* EE1810 80242E50 00000000 */ nop .L80242E54: /* EE1814 80242E54 0260282D */ daddu $a1, $s3, $zero /* EE1818 80242E58 0C013670 */ jal func_8004D9C0 @@ -244,7 +244,7 @@ glabel func_80242AF0_EE14B0 /* EE183C 80242E7C 44801800 */ mtc1 $zero, $f3 /* EE1840 80242E80 46000021 */ cvt.d.s $f0, $f0 /* EE1844 80242E84 4622003E */ c.le.d $f0, $f2 -/* EE1848 80242E88 00000000 */ nop +/* EE1848 80242E88 00000000 */ nop /* EE184C 80242E8C 45000005 */ bc1f .L80242EA4 /* EE1850 80242E90 2403FDFF */ addiu $v1, $zero, -0x201 /* EE1854 80242E94 8E220000 */ lw $v0, ($s1) @@ -265,7 +265,7 @@ glabel func_80242AF0_EE14B0 /* EE1880 80242EC0 0C0136B6 */ jal func_8004DAD8 /* EE1884 80242EC4 0280302D */ daddu $a2, $s4, $zero /* EE1888 80242EC8 08090CFA */ j .L802433E8 -/* EE188C 80242ECC 00000000 */ nop +/* EE188C 80242ECC 00000000 */ nop .L80242ED0: /* EE1890 80242ED0 0260282D */ daddu $a1, $s3, $zero /* EE1894 80242ED4 0C0137D9 */ jal func_8004DF64 @@ -276,7 +276,7 @@ glabel func_80242AF0_EE14B0 /* EE18A4 80242EE4 0C013809 */ jal func_8004E024 /* EE18A8 80242EE8 0280302D */ daddu $a2, $s4, $zero /* EE18AC 80242EEC 08090CFA */ j .L802433E8 -/* EE18B0 80242EF0 00000000 */ nop +/* EE18B0 80242EF0 00000000 */ nop .L80242EF4: /* EE18B4 80242EF4 0260282D */ daddu $a1, $s3, $zero /* EE18B8 80242EF8 0C0908BC */ jal func_802422F0_EE0CB0 @@ -295,18 +295,18 @@ glabel func_80242AF0_EE14B0 /* EE18E4 80242F24 0C090928 */ jal func_802424A0_EE0E60 /* EE18E8 80242F28 0280302D */ daddu $a2, $s4, $zero /* EE18EC 80242F2C 08090CFA */ j .L802433E8 -/* EE18F0 80242F30 00000000 */ nop +/* EE18F0 80242F30 00000000 */ nop .L80242F34: /* EE18F4 80242F34 02A0202D */ daddu $a0, $s5, $zero /* EE18F8 80242F38 0260282D */ daddu $a1, $s3, $zero /* EE18FC 80242F3C 0C090981 */ jal func_80242604_EE0FC4 /* EE1900 80242F40 0280302D */ daddu $a2, $s4, $zero /* EE1904 80242F44 08090CFA */ j .L802433E8 -/* EE1908 80242F48 00000000 */ nop +/* EE1908 80242F48 00000000 */ nop .L80242F4C: /* EE190C 80242F4C 8E430094 */ lw $v1, 0x94($s2) /* EE1910 80242F50 14620125 */ bne $v1, $v0, .L802433E8 -/* EE1914 80242F54 00000000 */ nop +/* EE1914 80242F54 00000000 */ nop /* EE1918 80242F58 0C010ABD */ jal func_80042AF4 /* EE191C 80242F5C 8E440098 */ lw $a0, 0x98($s2) /* EE1920 80242F60 0C00F92F */ jal func_8003E4BC @@ -316,9 +316,9 @@ glabel func_80242AF0_EE14B0 /* EE1930 80242F70 D4227BB0 */ ldc1 $f2, %lo(D_80247BB0)($at) /* EE1934 80242F74 46000021 */ cvt.d.s $f0, $f0 /* EE1938 80242F78 4622003C */ c.lt.d $f0, $f2 -/* EE193C 80242F7C 00000000 */ nop +/* EE193C 80242F7C 00000000 */ nop /* EE1940 80242F80 45000008 */ bc1f .L80242FA4 -/* EE1944 80242F84 00000000 */ nop +/* EE1944 80242F84 00000000 */ nop /* EE1948 80242F88 C4400038 */ lwc1 $f0, 0x38($v0) /* EE194C 80242F8C 3C014028 */ lui $at, 0x4028 /* EE1950 80242F90 44811800 */ mtc1 $at, $f3 @@ -401,7 +401,7 @@ glabel func_80242AF0_EE14B0 /* EE1A74 802430B4 44801800 */ mtc1 $zero, $f3 /* EE1A78 802430B8 46000021 */ cvt.d.s $f0, $f0 /* EE1A7C 802430BC 4620103C */ c.lt.d $f2, $f0 -/* EE1A80 802430C0 00000000 */ nop +/* EE1A80 802430C0 00000000 */ nop /* EE1A84 802430C4 4500001F */ bc1f .L80243144 /* EE1A88 802430C8 27A50058 */ addiu $a1, $sp, 0x58 /* EE1A8C 802430CC C6200038 */ lwc1 $f0, 0x38($s1) @@ -416,13 +416,13 @@ glabel func_80242AF0_EE14B0 /* EE1AB0 802430F0 E7A00014 */ swc1 $f0, 0x14($sp) /* EE1AB4 802430F4 862200A8 */ lh $v0, 0xa8($s1) /* EE1AB8 802430F8 44820000 */ mtc1 $v0, $f0 -/* EE1ABC 802430FC 00000000 */ nop +/* EE1ABC 802430FC 00000000 */ nop /* EE1AC0 80243100 46800020 */ cvt.s.w $f0, $f0 /* EE1AC4 80243104 E7A00018 */ swc1 $f0, 0x18($sp) /* EE1AC8 80243108 862200A6 */ lh $v0, 0xa6($s1) /* EE1ACC 8024310C 27A6005C */ addiu $a2, $sp, 0x5c /* EE1AD0 80243110 44820000 */ mtc1 $v0, $f0 -/* EE1AD4 80243114 00000000 */ nop +/* EE1AD4 80243114 00000000 */ nop /* EE1AD8 80243118 46800020 */ cvt.s.w $f0, $f0 /* EE1ADC 8024311C E7A0001C */ swc1 $f0, 0x1c($sp) /* EE1AE0 80243120 8E240080 */ lw $a0, 0x80($s1) @@ -440,7 +440,7 @@ glabel func_80242AF0_EE14B0 /* EE1B0C 8024314C 4480B800 */ mtc1 $zero, $f23 /* EE1B10 80243150 46000021 */ cvt.d.s $f0, $f0 /* EE1B14 80243154 4636003C */ c.lt.d $f0, $f22 -/* EE1B18 80243158 00000000 */ nop +/* EE1B18 80243158 00000000 */ nop /* EE1B1C 8024315C 45000074 */ bc1f .L80243330 /* EE1B20 80243160 27A50058 */ addiu $a1, $sp, 0x58 /* EE1B24 80243164 27A6005C */ addiu $a2, $sp, 0x5c @@ -471,7 +471,7 @@ glabel func_80242AF0_EE14B0 /* EE1B88 802431C8 0C03908F */ jal func_800E423C /* EE1B8C 802431CC 27A70060 */ addiu $a3, $sp, 0x60 /* EE1B90 802431D0 10400057 */ beqz $v0, .L80243330 -/* EE1B94 802431D4 00000000 */ nop +/* EE1B94 802431D4 00000000 */ nop /* EE1B98 802431D8 C620001C */ lwc1 $f0, 0x1c($s1) /* EE1B9C 802431DC C7A20064 */ lwc1 $f2, 0x64($sp) /* EE1BA0 802431E0 46000005 */ abs.s $f0, $f0 @@ -479,9 +479,9 @@ glabel func_80242AF0_EE14B0 /* EE1BA8 802431E8 46340000 */ add.d $f0, $f0, $f20 /* EE1BAC 802431EC 460010A1 */ cvt.d.s $f2, $f2 /* EE1BB0 802431F0 4620103E */ c.le.d $f2, $f0 -/* EE1BB4 802431F4 00000000 */ nop +/* EE1BB4 802431F4 00000000 */ nop /* EE1BB8 802431F8 4500004D */ bc1f .L80243330 -/* EE1BBC 802431FC 00000000 */ nop +/* EE1BBC 802431FC 00000000 */ nop /* EE1BC0 80243200 C7A0005C */ lwc1 $f0, 0x5c($sp) /* EE1BC4 80243204 E620003C */ swc1 $f0, 0x3c($s1) /* EE1BC8 80243208 8E4200D0 */ lw $v0, 0xd0($s2) @@ -515,7 +515,7 @@ glabel func_80242AF0_EE14B0 /* EE1C38 80243278 C620003C */ lwc1 $f0, 0x3c($s1) /* EE1C3C 8024327C 46000021 */ cvt.d.s $f0, $f0 /* EE1C40 80243280 4636003E */ c.le.d $f0, $f22 -/* EE1C44 80243284 00000000 */ nop +/* EE1C44 80243284 00000000 */ nop /* EE1C48 80243288 4501000D */ bc1t .L802432C0 /* EE1C4C 8024328C 2403FFF7 */ addiu $v1, $zero, -9 /* EE1C50 80243290 8E220000 */ lw $v0, ($s1) diff --git a/asm/nonmatchings/code_EDEA00/func_80243470_EE1E30.s b/asm/nonmatchings/code_EDEA00/func_80243470_EE1E30.s index 6174becb15..66cc29188f 100644 --- a/asm/nonmatchings/code_EDEA00/func_80243470_EE1E30.s +++ b/asm/nonmatchings/code_EDEA00/func_80243470_EE1E30.s @@ -53,7 +53,7 @@ glabel func_80243470_EE1E30 /* EE1EEC 8024352C 24040295 */ addiu $a0, $zero, 0x295 /* EE1EF0 80243530 4600008D */ trunc.w.s $f2, $f0 /* EE1EF4 80243534 44071000 */ mfc1 $a3, $f2 -/* EE1EF8 80243538 00000000 */ nop +/* EE1EF8 80243538 00000000 */ nop /* EE1EFC 8024353C 00073C00 */ sll $a3, $a3, 0x10 /* EE1F00 80243540 92050001 */ lbu $a1, 1($s0) /* EE1F04 80243544 92260001 */ lbu $a2, 1($s1) diff --git a/asm/nonmatchings/code_EDEA00/func_80243584_EE1F44.s b/asm/nonmatchings/code_EDEA00/func_80243584_EE1F44.s index 221644b943..53e5762a53 100644 --- a/asm/nonmatchings/code_EDEA00/func_80243584_EE1F44.s +++ b/asm/nonmatchings/code_EDEA00/func_80243584_EE1F44.s @@ -47,7 +47,7 @@ glabel func_80243584_EE1F44 /* EE1FE8 80243628 24040295 */ addiu $a0, $zero, 0x295 /* EE1FEC 8024362C 4600008D */ trunc.w.s $f2, $f0 /* EE1FF0 80243630 44071000 */ mfc1 $a3, $f2 -/* EE1FF4 80243634 00000000 */ nop +/* EE1FF4 80243634 00000000 */ nop /* EE1FF8 80243638 00073C00 */ sll $a3, $a3, 0x10 /* EE1FFC 8024363C 92050001 */ lbu $a1, 1($s0) /* EE2000 80243640 92260001 */ lbu $a2, 1($s1) @@ -66,4 +66,4 @@ glabel func_80243584_EE1F44 /* EE2030 80243670 00021040 */ sll $v0, $v0, 1 /* EE2034 80243674 03E00008 */ jr $ra /* EE2038 80243678 27BD0030 */ addiu $sp, $sp, 0x30 -/* EE203C 8024367C 00000000 */ nop +/* EE203C 8024367C 00000000 */ nop diff --git a/asm/nonmatchings/code_EE2040/func_80243680_EE2040.s b/asm/nonmatchings/code_EE2040/func_80243680_EE2040.s index 7f08a150f3..c37e050e7b 100644 --- a/asm/nonmatchings/code_EE2040/func_80243680_EE2040.s +++ b/asm/nonmatchings/code_EE2040/func_80243680_EE2040.s @@ -39,6 +39,6 @@ glabel func_80243680_EE2040 /* EE20C8 80243708 24020002 */ addiu $v0, $zero, 2 /* EE20CC 8024370C 03E00008 */ jr $ra /* EE20D0 80243710 27BD0028 */ addiu $sp, $sp, 0x28 -/* EE20D4 80243714 00000000 */ nop -/* EE20D8 80243718 00000000 */ nop -/* EE20DC 8024371C 00000000 */ nop +/* EE20D4 80243714 00000000 */ nop +/* EE20D8 80243718 00000000 */ nop +/* EE20DC 8024371C 00000000 */ nop diff --git a/asm/nonmatchings/code_EE65B0/func_80240124_EE66D4.s b/asm/nonmatchings/code_EE65B0/func_80240124_EE66D4.s index e5ccb29932..55123214e5 100644 --- a/asm/nonmatchings/code_EE65B0/func_80240124_EE66D4.s +++ b/asm/nonmatchings/code_EE65B0/func_80240124_EE66D4.s @@ -14,7 +14,7 @@ glabel func_80240124_EE66D4 .L80240148: /* EE66F8 80240148 8E020070 */ lw $v0, 0x70($s0) /* EE66FC 8024014C 1440000E */ bnez $v0, .L80240188 -/* EE6700 80240150 00000000 */ nop +/* EE6700 80240150 00000000 */ nop /* EE6704 80240154 8E0300A8 */ lw $v1, 0xa8($s0) /* EE6708 80240158 8E020088 */ lw $v0, 0x88($s0) /* EE670C 8024015C 00621821 */ addu $v1, $v1, $v0 @@ -33,7 +33,7 @@ glabel func_80240124_EE66D4 .L80240188: /* EE6738 80240188 8E020074 */ lw $v0, 0x74($s0) /* EE673C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* EE6740 80240190 00000000 */ nop +/* EE6740 80240190 00000000 */ nop /* EE6744 80240194 8E0300AC */ lw $v1, 0xac($s0) /* EE6748 80240198 8E02008C */ lw $v0, 0x8c($s0) /* EE674C 8024019C 00621821 */ addu $v1, $v1, $v0 @@ -52,7 +52,7 @@ glabel func_80240124_EE66D4 .L802401C8: /* EE6778 802401C8 8E020078 */ lw $v0, 0x78($s0) /* EE677C 802401CC 1440000E */ bnez $v0, .L80240208 -/* EE6780 802401D0 00000000 */ nop +/* EE6780 802401D0 00000000 */ nop /* EE6784 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) /* EE6788 802401D8 8E020090 */ lw $v0, 0x90($s0) /* EE678C 802401DC 00621821 */ addu $v1, $v1, $v0 @@ -71,7 +71,7 @@ glabel func_80240124_EE66D4 .L80240208: /* EE67B8 80240208 8E02007C */ lw $v0, 0x7c($s0) /* EE67BC 8024020C 1440000E */ bnez $v0, .L80240248 -/* EE67C0 80240210 00000000 */ nop +/* EE67C0 80240210 00000000 */ nop /* EE67C4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) /* EE67C8 80240218 8E020094 */ lw $v0, 0x94($s0) /* EE67CC 8024021C 00621821 */ addu $v1, $v1, $v0 diff --git a/asm/nonmatchings/code_EE65B0/func_80240340_EE68F0.s b/asm/nonmatchings/code_EE65B0/func_80240340_EE68F0.s index 37b0bd056d..79c2d4e2a6 100644 --- a/asm/nonmatchings/code_EE65B0/func_80240340_EE68F0.s +++ b/asm/nonmatchings/code_EE65B0/func_80240340_EE68F0.s @@ -6,33 +6,33 @@ glabel func_80240340_EE68F0 /* EE68F4 80240344 8C830090 */ lw $v1, 0x90($a0) /* EE68F8 80240348 00431023 */ subu $v0, $v0, $v1 /* EE68FC 8024034C 44821000 */ mtc1 $v0, $f2 -/* EE6900 80240350 00000000 */ nop +/* EE6900 80240350 00000000 */ nop /* EE6904 80240354 468010A0 */ cvt.s.w $f2, $f2 /* EE6908 80240358 8C820088 */ lw $v0, 0x88($a0) /* EE690C 8024035C 8C830094 */ lw $v1, 0x94($a0) /* EE6910 80240360 46021082 */ mul.s $f2, $f2, $f2 -/* EE6914 80240364 00000000 */ nop +/* EE6914 80240364 00000000 */ nop /* EE6918 80240368 00431023 */ subu $v0, $v0, $v1 /* EE691C 8024036C 44822000 */ mtc1 $v0, $f4 -/* EE6920 80240370 00000000 */ nop +/* EE6920 80240370 00000000 */ nop /* EE6924 80240374 46802120 */ cvt.s.w $f4, $f4 /* EE6928 80240378 8C82008C */ lw $v0, 0x8c($a0) /* EE692C 8024037C 46042102 */ mul.s $f4, $f4, $f4 -/* EE6930 80240380 00000000 */ nop +/* EE6930 80240380 00000000 */ nop /* EE6934 80240384 8C830098 */ lw $v1, 0x98($a0) /* EE6938 80240388 00431023 */ subu $v0, $v0, $v1 /* EE693C 8024038C 44820000 */ mtc1 $v0, $f0 -/* EE6940 80240390 00000000 */ nop +/* EE6940 80240390 00000000 */ nop /* EE6944 80240394 46800020 */ cvt.s.w $f0, $f0 /* EE6948 80240398 46000002 */ mul.s $f0, $f0, $f0 -/* EE694C 8024039C 00000000 */ nop +/* EE694C 8024039C 00000000 */ nop /* EE6950 802403A0 46041080 */ add.s $f2, $f2, $f4 /* EE6954 802403A4 46001080 */ add.s $f2, $f2, $f0 /* EE6958 802403A8 3C014561 */ lui $at, 0x4561 /* EE695C 802403AC 44810000 */ mtc1 $at, $f0 -/* EE6960 802403B0 00000000 */ nop +/* EE6960 802403B0 00000000 */ nop /* EE6964 802403B4 4600103C */ c.lt.s $f2, $f0 -/* EE6968 802403B8 00000000 */ nop +/* EE6968 802403B8 00000000 */ nop /* EE696C 802403BC 45010002 */ bc1t .L802403C8 /* EE6970 802403C0 24020001 */ addiu $v0, $zero, 1 /* EE6974 802403C4 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_EE65B0/func_8024046C_EE6A1C.s b/asm/nonmatchings/code_EE65B0/func_8024046C_EE6A1C.s index 3fd222a0e4..28d8000f04 100644 --- a/asm/nonmatchings/code_EE65B0/func_8024046C_EE6A1C.s +++ b/asm/nonmatchings/code_EE65B0/func_8024046C_EE6A1C.s @@ -29,7 +29,7 @@ glabel func_8024046C_EE6A1C /* EE6A7C 802404CC 44060000 */ mfc1 $a2, $f0 /* EE6A80 802404D0 44071000 */ mfc1 $a3, $f2 /* EE6A84 802404D4 44820000 */ mtc1 $v0, $f0 -/* EE6A88 802404D8 00000000 */ nop +/* EE6A88 802404D8 00000000 */ nop /* EE6A8C 802404DC 46800020 */ cvt.s.w $f0, $f0 /* EE6A90 802404E0 AE220078 */ sw $v0, 0x78($s1) /* EE6A94 802404E4 0C055C13 */ jal func_8015704C diff --git a/asm/nonmatchings/code_EE65B0/func_80240504_EE6AB4.s b/asm/nonmatchings/code_EE65B0/func_80240504_EE6AB4.s index b0ddf08272..5edbaca00c 100644 --- a/asm/nonmatchings/code_EE65B0/func_80240504_EE6AB4.s +++ b/asm/nonmatchings/code_EE65B0/func_80240504_EE6AB4.s @@ -20,7 +20,7 @@ glabel func_80240504_EE6AB4 /* EE6AF0 80240540 D4345350 */ ldc1 $f20, %lo(D_80245350)($at) /* EE6AF4 80240544 46000021 */ cvt.d.s $f0, $f0 /* EE6AF8 80240548 46340002 */ mul.d $f0, $f0, $f20 -/* EE6AFC 8024054C 00000000 */ nop +/* EE6AFC 8024054C 00000000 */ nop /* EE6B00 80240550 3C018024 */ lui $at, %hi(D_80245358) /* EE6B04 80240554 D4365358 */ ldc1 $f22, %lo(D_80245358)($at) /* EE6B08 80240558 C6020000 */ lwc1 $f2, ($s0) @@ -33,18 +33,18 @@ glabel func_80240504_EE6AB4 /* EE6B24 80240574 E7A00010 */ swc1 $f0, 0x10($sp) /* EE6B28 80240578 46000021 */ cvt.d.s $f0, $f0 /* EE6B2C 8024057C 46340002 */ mul.d $f0, $f0, $f20 -/* EE6B30 80240580 00000000 */ nop +/* EE6B30 80240580 00000000 */ nop /* EE6B34 80240584 C6020000 */ lwc1 $f2, ($s0) /* EE6B38 80240588 3C014150 */ lui $at, 0x4150 /* EE6B3C 8024058C 44816000 */ mtc1 $at, $f12 -/* EE6B40 80240590 00000000 */ nop +/* EE6B40 80240590 00000000 */ nop /* EE6B44 80240594 460C1303 */ div.s $f12, $f2, $f12 /* EE6B48 80240598 46200020 */ cvt.s.d $f0, $f0 /* EE6B4C 8024059C 0C00AD30 */ jal func_8002B4C0 /* EE6B50 802405A0 E7A00014 */ swc1 $f0, 0x14($sp) /* EE6B54 802405A4 46000021 */ cvt.d.s $f0, $f0 /* EE6B58 802405A8 46340002 */ mul.d $f0, $f0, $f20 -/* EE6B5C 802405AC 00000000 */ nop +/* EE6B5C 802405AC 00000000 */ nop /* EE6B60 802405B0 C60C0000 */ lwc1 $f12, ($s0) /* EE6B64 802405B4 3C0140E0 */ lui $at, 0x40e0 /* EE6B68 802405B8 44811000 */ mtc1 $at, $f2 @@ -57,7 +57,7 @@ glabel func_80240504_EE6AB4 /* EE6B84 802405D4 E7A00018 */ swc1 $f0, 0x18($sp) /* EE6B88 802405D8 46000021 */ cvt.d.s $f0, $f0 /* EE6B8C 802405DC 46340002 */ mul.d $f0, $f0, $f20 -/* EE6B90 802405E0 00000000 */ nop +/* EE6B90 802405E0 00000000 */ nop /* EE6B94 802405E4 C6020000 */ lwc1 $f2, ($s0) /* EE6B98 802405E8 3C014160 */ lui $at, 0x4160 /* EE6B9C 802405EC 44816000 */ mtc1 $at, $f12 @@ -68,51 +68,51 @@ glabel func_80240504_EE6AB4 /* EE6BB0 80240600 E7A00024 */ swc1 $f0, 0x24($sp) /* EE6BB4 80240604 46000021 */ cvt.d.s $f0, $f0 /* EE6BB8 80240608 46340002 */ mul.d $f0, $f0, $f20 -/* EE6BBC 8024060C 00000000 */ nop +/* EE6BBC 8024060C 00000000 */ nop /* EE6BC0 80240610 C6020000 */ lwc1 $f2, ($s0) /* EE6BC4 80240614 3C014170 */ lui $at, 0x4170 /* EE6BC8 80240618 44816000 */ mtc1 $at, $f12 -/* EE6BCC 8024061C 00000000 */ nop +/* EE6BCC 8024061C 00000000 */ nop /* EE6BD0 80240620 460C1303 */ div.s $f12, $f2, $f12 /* EE6BD4 80240624 46200020 */ cvt.s.d $f0, $f0 /* EE6BD8 80240628 0C00AD30 */ jal func_8002B4C0 /* EE6BDC 8024062C E7A00020 */ swc1 $f0, 0x20($sp) /* EE6BE0 80240630 46000021 */ cvt.d.s $f0, $f0 /* EE6BE4 80240634 46340002 */ mul.d $f0, $f0, $f20 -/* EE6BE8 80240638 00000000 */ nop +/* EE6BE8 80240638 00000000 */ nop /* EE6BEC 8024063C C60C0000 */ lwc1 $f12, ($s0) /* EE6BF0 80240640 3C013E80 */ lui $at, 0x3e80 /* EE6BF4 80240644 44811000 */ mtc1 $at, $f2 -/* EE6BF8 80240648 00000000 */ nop +/* EE6BF8 80240648 00000000 */ nop /* EE6BFC 8024064C 46026302 */ mul.s $f12, $f12, $f2 -/* EE6C00 80240650 00000000 */ nop +/* EE6C00 80240650 00000000 */ nop /* EE6C04 80240654 3C014000 */ lui $at, 0x4000 /* EE6C08 80240658 44811000 */ mtc1 $at, $f2 -/* EE6C0C 8024065C 00000000 */ nop +/* EE6C0C 8024065C 00000000 */ nop /* EE6C10 80240660 46026300 */ add.s $f12, $f12, $f2 /* EE6C14 80240664 46200020 */ cvt.s.d $f0, $f0 /* EE6C18 80240668 0C00AD17 */ jal func_8002B45C /* EE6C1C 8024066C E7A00028 */ swc1 $f0, 0x28($sp) /* EE6C20 80240670 46000021 */ cvt.d.s $f0, $f0 /* EE6C24 80240674 46340002 */ mul.d $f0, $f0, $f20 -/* EE6C28 80240678 00000000 */ nop +/* EE6C28 80240678 00000000 */ nop /* EE6C2C 8024067C C6020000 */ lwc1 $f2, ($s0) /* EE6C30 80240680 3C013D80 */ lui $at, 0x3d80 /* EE6C34 80240684 44816000 */ mtc1 $at, $f12 -/* EE6C38 80240688 00000000 */ nop +/* EE6C38 80240688 00000000 */ nop /* EE6C3C 8024068C 460C1302 */ mul.s $f12, $f2, $f12 -/* EE6C40 80240690 00000000 */ nop +/* EE6C40 80240690 00000000 */ nop /* EE6C44 80240694 46360000 */ add.d $f0, $f0, $f22 /* EE6C48 80240698 46200020 */ cvt.s.d $f0, $f0 /* EE6C4C 8024069C 0C00AD17 */ jal func_8002B45C /* EE6C50 802406A0 E7A00038 */ swc1 $f0, 0x38($sp) /* EE6C54 802406A4 46000021 */ cvt.d.s $f0, $f0 /* EE6C58 802406A8 46340002 */ mul.d $f0, $f0, $f20 -/* EE6C5C 802406AC 00000000 */ nop +/* EE6C5C 802406AC 00000000 */ nop /* EE6C60 802406B0 C6020000 */ lwc1 $f2, ($s0) /* EE6C64 802406B4 3C014188 */ lui $at, 0x4188 /* EE6C68 802406B8 44816000 */ mtc1 $at, $f12 -/* EE6C6C 802406BC 00000000 */ nop +/* EE6C6C 802406BC 00000000 */ nop /* EE6C70 802406C0 460C1303 */ div.s $f12, $f2, $f12 /* EE6C74 802406C4 46200020 */ cvt.s.d $f0, $f0 /* EE6C78 802406C8 0C00AD30 */ jal func_8002B4C0 @@ -120,7 +120,7 @@ glabel func_80240504_EE6AB4 /* EE6C80 802406D0 3C030001 */ lui $v1, 1 /* EE6C84 802406D4 46000021 */ cvt.d.s $f0, $f0 /* EE6C88 802406D8 46340002 */ mul.d $f0, $f0, $f20 -/* EE6C8C 802406DC 00000000 */ nop +/* EE6C8C 802406DC 00000000 */ nop /* EE6C90 802406E0 34631630 */ ori $v1, $v1, 0x1630 /* EE6C94 802406E4 27A40010 */ addiu $a0, $sp, 0x10 /* EE6C98 802406E8 3C058008 */ lui $a1, %hi(D_80079540) @@ -172,7 +172,7 @@ glabel func_80240504_EE6AB4 /* EE6D50 802407A0 C4600000 */ lwc1 $f0, ($v1) /* EE6D54 802407A4 3C013F80 */ lui $at, 0x3f80 /* EE6D58 802407A8 44811000 */ mtc1 $at, $f2 -/* EE6D5C 802407AC 00000000 */ nop +/* EE6D5C 802407AC 00000000 */ nop /* EE6D60 802407B0 46020000 */ add.s $f0, $f0, $f2 /* EE6D64 802407B4 AE020004 */ sw $v0, 4($s0) /* EE6D68 802407B8 E4600000 */ swc1 $f0, ($v1) diff --git a/asm/nonmatchings/code_EE65B0/func_802407D4_EE6D84.s b/asm/nonmatchings/code_EE65B0/func_802407D4_EE6D84.s index 7a3d2f82ae..dc018b7854 100644 --- a/asm/nonmatchings/code_EE65B0/func_802407D4_EE6D84.s +++ b/asm/nonmatchings/code_EE65B0/func_802407D4_EE6D84.s @@ -42,7 +42,7 @@ glabel func_802407D4_EE6D84 /* EE6E14 80240864 461A6303 */ div.s $f12, $f12, $f26 /* EE6E18 80240868 46006321 */ cvt.d.s $f12, $f12 /* EE6E1C 8024086C 46386302 */ mul.d $f12, $f12, $f24 -/* EE6E20 80240870 00000000 */ nop +/* EE6E20 80240870 00000000 */ nop /* EE6E24 80240874 0C00AD17 */ jal func_8002B45C /* EE6E28 80240878 46206320 */ cvt.s.d $f12, $f12 /* EE6E2C 8024087C C66C0000 */ lwc1 $f12, ($s3) @@ -50,12 +50,12 @@ glabel func_802407D4_EE6D84 /* EE6E34 80240884 461A6303 */ div.s $f12, $f12, $f26 /* EE6E38 80240888 46006321 */ cvt.d.s $f12, $f12 /* EE6E3C 8024088C 46386302 */ mul.d $f12, $f12, $f24 -/* EE6E40 80240890 00000000 */ nop +/* EE6E40 80240890 00000000 */ nop /* EE6E44 80240894 3C018024 */ lui $at, %hi(D_80245370) /* EE6E48 80240898 D4225370 */ ldc1 $f2, %lo(D_80245370)($at) /* EE6E4C 8024089C 46000521 */ cvt.d.s $f20, $f0 /* EE6E50 802408A0 4622A502 */ mul.d $f20, $f20, $f2 -/* EE6E54 802408A4 00000000 */ nop +/* EE6E54 802408A4 00000000 */ nop /* EE6E58 802408A8 3C018024 */ lui $at, %hi(D_80245378) /* EE6E5C 802408AC D4205378 */ ldc1 $f0, %lo(D_80245378)($at) /* EE6E60 802408B0 4620A500 */ add.d $f20, $f20, $f0 @@ -64,70 +64,70 @@ glabel func_802407D4_EE6D84 /* EE6E6C 802408BC 4620A520 */ cvt.s.d $f20, $f20 /* EE6E70 802408C0 46000021 */ cvt.d.s $f0, $f0 /* EE6E74 802408C4 46360002 */ mul.d $f0, $f0, $f22 -/* EE6E78 802408C8 00000000 */ nop +/* EE6E78 802408C8 00000000 */ nop /* EE6E7C 802408CC 86020000 */ lh $v0, ($s0) /* EE6E80 802408D0 2442FD98 */ addiu $v0, $v0, -0x268 /* EE6E84 802408D4 44822000 */ mtc1 $v0, $f4 -/* EE6E88 802408D8 00000000 */ nop +/* EE6E88 802408D8 00000000 */ nop /* EE6E8C 802408DC 46802120 */ cvt.s.w $f4, $f4 /* EE6E90 802408E0 46142102 */ mul.s $f4, $f4, $f20 -/* EE6E94 802408E4 00000000 */ nop +/* EE6E94 802408E4 00000000 */ nop /* EE6E98 802408E8 4620B001 */ sub.d $f0, $f22, $f0 /* EE6E9C 802408EC 3C01C240 */ lui $at, 0xc240 /* EE6EA0 802408F0 44813000 */ mtc1 $at, $f6 /* EE6EA4 802408F4 46200020 */ cvt.s.d $f0, $f0 /* EE6EA8 802408F8 46060182 */ mul.s $f6, $f0, $f6 -/* EE6EAC 802408FC 00000000 */ nop +/* EE6EAC 802408FC 00000000 */ nop /* EE6EB0 80240900 3C01441A */ lui $at, 0x441a /* EE6EB4 80240904 44811000 */ mtc1 $at, $f2 -/* EE6EB8 80240908 00000000 */ nop +/* EE6EB8 80240908 00000000 */ nop /* EE6EBC 8024090C 46022100 */ add.s $f4, $f4, $f2 /* EE6EC0 80240910 46062100 */ add.s $f4, $f4, $f6 /* EE6EC4 80240914 3C0141C8 */ lui $at, 0x41c8 /* EE6EC8 80240918 44813000 */ mtc1 $at, $f6 -/* EE6ECC 8024091C 00000000 */ nop +/* EE6ECC 8024091C 00000000 */ nop /* EE6ED0 80240920 46060182 */ mul.s $f6, $f0, $f6 -/* EE6ED4 80240924 00000000 */ nop +/* EE6ED4 80240924 00000000 */ nop /* EE6ED8 80240928 4600220D */ trunc.w.s $f8, $f4 /* EE6EDC 8024092C 44024000 */ mfc1 $v0, $f8 -/* EE6EE0 80240930 00000000 */ nop +/* EE6EE0 80240930 00000000 */ nop /* EE6EE4 80240934 A6220000 */ sh $v0, ($s1) /* EE6EE8 80240938 86020002 */ lh $v0, 2($s0) /* EE6EEC 8024093C 2442FFD4 */ addiu $v0, $v0, -0x2c /* EE6EF0 80240940 44821000 */ mtc1 $v0, $f2 -/* EE6EF4 80240944 00000000 */ nop +/* EE6EF4 80240944 00000000 */ nop /* EE6EF8 80240948 468010A0 */ cvt.s.w $f2, $f2 /* EE6EFC 8024094C 46141082 */ mul.s $f2, $f2, $f20 -/* EE6F00 80240950 00000000 */ nop +/* EE6F00 80240950 00000000 */ nop /* EE6F04 80240954 3C014230 */ lui $at, 0x4230 /* EE6F08 80240958 44812000 */ mtc1 $at, $f4 -/* EE6F0C 8024095C 00000000 */ nop +/* EE6F0C 8024095C 00000000 */ nop /* EE6F10 80240960 46041080 */ add.s $f2, $f2, $f4 /* EE6F14 80240964 46061080 */ add.s $f2, $f2, $f6 /* EE6F18 80240968 3C01C2AE */ lui $at, 0xc2ae /* EE6F1C 8024096C 44812000 */ mtc1 $at, $f4 -/* EE6F20 80240970 00000000 */ nop +/* EE6F20 80240970 00000000 */ nop /* EE6F24 80240974 46040002 */ mul.s $f0, $f0, $f4 -/* EE6F28 80240978 00000000 */ nop +/* EE6F28 80240978 00000000 */ nop /* EE6F2C 8024097C 4600120D */ trunc.w.s $f8, $f2 /* EE6F30 80240980 44024000 */ mfc1 $v0, $f8 -/* EE6F34 80240984 00000000 */ nop +/* EE6F34 80240984 00000000 */ nop /* EE6F38 80240988 A6220002 */ sh $v0, 2($s1) /* EE6F3C 8024098C 86020004 */ lh $v0, 4($s0) /* EE6F40 80240990 2442FF8F */ addiu $v0, $v0, -0x71 /* EE6F44 80240994 44821000 */ mtc1 $v0, $f2 -/* EE6F48 80240998 00000000 */ nop +/* EE6F48 80240998 00000000 */ nop /* EE6F4C 8024099C 468010A0 */ cvt.s.w $f2, $f2 /* EE6F50 802409A0 46141082 */ mul.s $f2, $f2, $f20 -/* EE6F54 802409A4 00000000 */ nop +/* EE6F54 802409A4 00000000 */ nop /* EE6F58 802409A8 3C0142E2 */ lui $at, 0x42e2 /* EE6F5C 802409AC 44812000 */ mtc1 $at, $f4 -/* EE6F60 802409B0 00000000 */ nop +/* EE6F60 802409B0 00000000 */ nop /* EE6F64 802409B4 46041080 */ add.s $f2, $f2, $f4 /* EE6F68 802409B8 46001080 */ add.s $f2, $f2, $f0 /* EE6F6C 802409BC 4600120D */ trunc.w.s $f8, $f2 /* EE6F70 802409C0 44024000 */ mfc1 $v0, $f8 -/* EE6F74 802409C4 00000000 */ nop +/* EE6F74 802409C4 00000000 */ nop /* EE6F78 802409C8 A6220004 */ sh $v0, 4($s1) .L802409CC: /* EE6F7C 802409CC 8FA20018 */ lw $v0, 0x18($sp) @@ -152,7 +152,7 @@ glabel func_802407D4_EE6D84 /* EE6FC4 80240A14 0C0B53A3 */ jal func_802D4E8C /* EE6FC8 80240A18 AE020004 */ sw $v0, 4($s0) /* EE6FCC 80240A1C 10400017 */ beqz $v0, .L80240A7C -/* EE6FD0 80240A20 00000000 */ nop +/* EE6FD0 80240A20 00000000 */ nop /* EE6FD4 80240A24 3C048024 */ lui $a0, %hi(D_80243B48) /* EE6FD8 80240A28 24843B48 */ addiu $a0, $a0, %lo(D_80243B48) /* EE6FDC 80240A2C 8C830000 */ lw $v1, ($a0) @@ -216,6 +216,6 @@ glabel func_802407D4_EE6D84 /* EE70A8 80240AF8 D7B40038 */ ldc1 $f20, 0x38($sp) /* EE70AC 80240AFC 03E00008 */ jr $ra /* EE70B0 80240B00 27BD0058 */ addiu $sp, $sp, 0x58 -/* EE70B4 80240B04 00000000 */ nop -/* EE70B8 80240B08 00000000 */ nop -/* EE70BC 80240B0C 00000000 */ nop +/* EE70B4 80240B04 00000000 */ nop +/* EE70B8 80240B08 00000000 */ nop +/* EE70BC 80240B0C 00000000 */ nop diff --git a/asm/nonmatchings/code_EE70C0/func_80240B10_EE70C0.s b/asm/nonmatchings/code_EE70C0/func_80240B10_EE70C0.s index 36827b215b..61ade49613 100644 --- a/asm/nonmatchings/code_EE70C0/func_80240B10_EE70C0.s +++ b/asm/nonmatchings/code_EE70C0/func_80240B10_EE70C0.s @@ -47,7 +47,7 @@ glabel func_80240B10_EE70C0 /* EE7168 80240BB8 0C013431 */ jal func_8004D0C4 /* EE716C 80240BBC 8E070038 */ lw $a3, 0x38($s0) /* EE7170 80240BC0 1040000E */ beqz $v0, .L80240BFC -/* EE7174 80240BC4 00000000 */ nop +/* EE7174 80240BC4 00000000 */ nop /* EE7178 80240BC8 8E2200D0 */ lw $v0, 0xd0($s1) /* EE717C 80240BCC C60C0038 */ lwc1 $f12, 0x38($s0) /* EE7180 80240BD0 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240B10_EE70C0 /* EE7194 80240BE4 468031A0 */ cvt.s.w $f6, $f6 /* EE7198 80240BE8 44073000 */ mfc1 $a3, $f6 /* EE719C 80240BEC 0C00ABDC */ jal fio_validate_header_checksums -/* EE71A0 80240BF0 00000000 */ nop +/* EE71A0 80240BF0 00000000 */ nop /* EE71A4 80240BF4 0809030B */ j .L80240C2C /* EE71A8 80240BF8 E600000C */ swc1 $f0, 0xc($s0) .L80240BFC: @@ -66,7 +66,7 @@ glabel func_80240B10_EE70C0 /* EE71B0 80240C00 2404003C */ addiu $a0, $zero, 0x3c /* EE71B4 80240C04 C60C000C */ lwc1 $f12, 0xc($s0) /* EE71B8 80240C08 44820000 */ mtc1 $v0, $f0 -/* EE71BC 80240C0C 00000000 */ nop +/* EE71BC 80240C0C 00000000 */ nop /* EE71C0 80240C10 46800020 */ cvt.s.w $f0, $f0 /* EE71C4 80240C14 46006300 */ add.s $f12, $f12, $f0 /* EE71C8 80240C18 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240B10_EE70C0 /* EE71EC 80240C3C 8E2200D0 */ lw $v0, 0xd0($s1) /* EE71F0 80240C40 8C420014 */ lw $v0, 0x14($v0) /* EE71F4 80240C44 04410004 */ bgez $v0, .L80240C58 -/* EE71F8 80240C48 00000000 */ nop +/* EE71F8 80240C48 00000000 */ nop /* EE71FC 80240C4C C6400000 */ lwc1 $f0, ($s2) /* EE7200 80240C50 0809031E */ j .L80240C78 /* EE7204 80240C54 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240B10_EE70C0 /* EE7208 80240C58 3C018024 */ lui $at, %hi(D_80245380) /* EE720C 80240C5C D4225380 */ ldc1 $f2, %lo(D_80245380)($at) /* EE7210 80240C60 44820000 */ mtc1 $v0, $f0 -/* EE7214 80240C64 00000000 */ nop +/* EE7214 80240C64 00000000 */ nop /* EE7218 80240C68 46800021 */ cvt.d.w $f0, $f0 /* EE721C 80240C6C 46220003 */ div.d $f0, $f0, $f2 /* EE7220 80240C70 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240B10_EE70C0 /* EE7234 80240C84 44801000 */ mtc1 $zero, $f2 /* EE7238 80240C88 46000021 */ cvt.d.s $f0, $f0 /* EE723C 80240C8C 46220002 */ mul.d $f0, $f0, $f2 -/* EE7240 80240C90 00000000 */ nop +/* EE7240 80240C90 00000000 */ nop /* EE7244 80240C94 24020001 */ addiu $v0, $zero, 1 /* EE7248 80240C98 4620018D */ trunc.w.d $f6, $f0 /* EE724C 80240C9C E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/code_EE70C0/func_80240CC0_EE7270.s b/asm/nonmatchings/code_EE70C0/func_80240CC0_EE7270.s index a08e03f9f0..e4063a5b72 100644 --- a/asm/nonmatchings/code_EE70C0/func_80240CC0_EE7270.s +++ b/asm/nonmatchings/code_EE70C0/func_80240CC0_EE7270.s @@ -34,7 +34,7 @@ glabel func_80240CC0_EE7270 /* EE72E4 80240D34 44803000 */ mtc1 $zero, $f6 /* EE72E8 80240D38 46000021 */ cvt.d.s $f0, $f0 /* EE72EC 80240D3C 46260002 */ mul.d $f0, $f0, $f6 -/* EE72F0 80240D40 00000000 */ nop +/* EE72F0 80240D40 00000000 */ nop /* EE72F4 80240D44 24020001 */ addiu $v0, $zero, 1 /* EE72F8 80240D48 8E24006C */ lw $a0, 0x6c($s1) /* EE72FC 80240D4C 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80240CC0_EE7270 /* EE7358 80240DA8 C600003C */ lwc1 $f0, 0x3c($s0) /* EE735C 80240DAC 4600C001 */ sub.s $f0, $f24, $f0 /* EE7360 80240DB0 4600B03C */ c.lt.s $f22, $f0 -/* EE7364 80240DB4 00000000 */ nop +/* EE7364 80240DB4 00000000 */ nop /* EE7368 80240DB8 4500001B */ bc1f .L80240E28 /* EE736C 80240DBC 34820010 */ ori $v0, $a0, 0x10 /* EE7370 80240DC0 0809038A */ j .L80240E28 @@ -87,9 +87,9 @@ glabel func_80240CC0_EE7270 /* EE73B4 80240E04 C7A00034 */ lwc1 $f0, 0x34($sp) /* EE73B8 80240E08 4600D001 */ sub.s $f0, $f26, $f0 /* EE73BC 80240E0C 4600B03C */ c.lt.s $f22, $f0 -/* EE73C0 80240E10 00000000 */ nop +/* EE73C0 80240E10 00000000 */ nop /* EE73C4 80240E14 45000004 */ bc1f .L80240E28 -/* EE73C8 80240E18 00000000 */ nop +/* EE73C8 80240E18 00000000 */ nop /* EE73CC 80240E1C 8E22006C */ lw $v0, 0x6c($s1) /* EE73D0 80240E20 34420010 */ ori $v0, $v0, 0x10 /* EE73D4 80240E24 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80240CC0_EE7270 /* EE73DC 80240E2C 24030011 */ addiu $v1, $zero, 0x11 /* EE73E0 80240E30 30420011 */ andi $v0, $v0, 0x11 /* EE73E4 80240E34 14430039 */ bne $v0, $v1, .L80240F1C -/* EE73E8 80240E38 00000000 */ nop +/* EE73E8 80240E38 00000000 */ nop /* EE73EC 80240E3C 8E020000 */ lw $v0, ($s0) /* EE73F0 80240E40 30420008 */ andi $v0, $v0, 8 /* EE73F4 80240E44 1040000A */ beqz $v0, .L80240E70 @@ -108,7 +108,7 @@ glabel func_80240CC0_EE7270 /* EE7404 80240E54 D4205388 */ ldc1 $f0, %lo(D_80245388)($at) /* EE7408 80240E58 460010A1 */ cvt.d.s $f2, $f2 /* EE740C 80240E5C 46201082 */ mul.d $f2, $f2, $f0 -/* EE7410 80240E60 00000000 */ nop +/* EE7410 80240E60 00000000 */ nop /* EE7414 80240E64 4600A021 */ cvt.d.s $f0, $f20 /* EE7418 80240E68 080903B5 */ j .L80240ED4 /* EE741C 80240E6C 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80240CC0_EE7270 /* EE746C 80240EBC D4205390 */ ldc1 $f0, %lo(D_80245390)($at) /* EE7470 80240EC0 460010A1 */ cvt.d.s $f2, $f2 /* EE7474 80240EC4 46201082 */ mul.d $f2, $f2, $f0 -/* EE7478 80240EC8 00000000 */ nop +/* EE7478 80240EC8 00000000 */ nop /* EE747C 80240ECC 4600A021 */ cvt.d.s $f0, $f20 /* EE7480 80240ED0 46220000 */ add.d $f0, $f0, $f2 .L80240ED4: @@ -149,7 +149,7 @@ glabel func_80240CC0_EE7270 /* EE74A0 80240EF0 46000005 */ abs.s $f0, $f0 /* EE74A4 80240EF4 46000021 */ cvt.d.s $f0, $f0 /* EE74A8 80240EF8 4622003C */ c.lt.d $f0, $f2 -/* EE74AC 80240EFC 00000000 */ nop +/* EE74AC 80240EFC 00000000 */ nop /* EE74B0 80240F00 45000036 */ bc1f .L80240FDC /* EE74B4 80240F04 2403FFEF */ addiu $v1, $zero, -0x11 /* EE74B8 80240F08 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80240CC0_EE7270 .L80240F1C: /* EE74CC 80240F1C 8E220070 */ lw $v0, 0x70($s1) /* EE74D0 80240F20 1840002E */ blez $v0, .L80240FDC -/* EE74D4 80240F24 00000000 */ nop +/* EE74D4 80240F24 00000000 */ nop /* EE74D8 80240F28 C62C0074 */ lwc1 $f12, 0x74($s1) /* EE74DC 80240F2C 0C00AD77 */ jal func_8002B5DC /* EE74E0 80240F30 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80240CC0_EE7270 /* EE7538 80240F88 27A70030 */ addiu $a3, $sp, 0x30 .L80240F8C: /* EE753C 80240F8C 10400007 */ beqz $v0, .L80240FAC -/* EE7540 80240F90 00000000 */ nop +/* EE7540 80240F90 00000000 */ nop /* EE7544 80240F94 4616A082 */ mul.s $f2, $f20, $f22 -/* EE7548 80240F98 00000000 */ nop +/* EE7548 80240F98 00000000 */ nop /* EE754C 80240F9C C7A0002C */ lwc1 $f0, 0x2c($sp) /* EE7550 80240FA0 461A0000 */ add.s $f0, $f0, $f26 /* EE7554 80240FA4 080903EE */ j .L80240FB8 /* EE7558 80240FA8 46020000 */ add.s $f0, $f0, $f2 .L80240FAC: /* EE755C 80240FAC 4616A002 */ mul.s $f0, $f20, $f22 -/* EE7560 80240FB0 00000000 */ nop +/* EE7560 80240FB0 00000000 */ nop /* EE7564 80240FB4 4600C000 */ add.s $f0, $f24, $f0 .L80240FB8: /* EE7568 80240FB8 E600003C */ swc1 $f0, 0x3c($s0) /* EE756C 80240FBC 8E220074 */ lw $v0, 0x74($s1) /* EE7570 80240FC0 2442000A */ addiu $v0, $v0, 0xa /* EE7574 80240FC4 44826000 */ mtc1 $v0, $f12 -/* EE7578 80240FC8 00000000 */ nop +/* EE7578 80240FC8 00000000 */ nop /* EE757C 80240FCC 0C00AB85 */ jal func_8002AE14 /* EE7580 80240FD0 46806320 */ cvt.s.w $f12, $f12 /* EE7584 80240FD4 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80240CC0_EE7270 /* EE7594 80240FE4 2442FFFF */ addiu $v0, $v0, -1 /* EE7598 80240FE8 8E430014 */ lw $v1, 0x14($s2) /* EE759C 80240FEC 04600048 */ bltz $v1, .L80241110 -/* EE75A0 80240FF0 00000000 */ nop +/* EE75A0 80240FF0 00000000 */ nop /* EE75A4 80240FF4 8E620074 */ lw $v0, 0x74($s3) /* EE75A8 80240FF8 1C400042 */ bgtz $v0, .L80241104 /* EE75AC 80240FFC 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80240CC0_EE7270 /* EE75B4 80241004 860200A8 */ lh $v0, 0xa8($s0) /* EE75B8 80241008 C602003C */ lwc1 $f2, 0x3c($s0) /* EE75BC 8024100C 44820000 */ mtc1 $v0, $f0 -/* EE75C0 80241010 00000000 */ nop +/* EE75C0 80241010 00000000 */ nop /* EE75C4 80241014 46800020 */ cvt.s.w $f0, $f0 /* EE75C8 80241018 46001080 */ add.s $f2, $f2, $f0 /* EE75CC 8024101C 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80240CC0_EE7270 /* EE75E8 80241038 C440002C */ lwc1 $f0, 0x2c($v0) /* EE75EC 8024103C 46000021 */ cvt.d.s $f0, $f0 /* EE75F0 80241040 4622003C */ c.lt.d $f0, $f2 -/* EE75F4 80241044 00000000 */ nop +/* EE75F4 80241044 00000000 */ nop /* EE75F8 80241048 4500002C */ bc1f .L802410FC /* EE75FC 8024104C 02A0202D */ daddu $a0, $s5, $zero /* EE7600 80241050 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80240CC0_EE7270 /* EE763C 8024108C 3C01C1A0 */ lui $at, 0xc1a0 /* EE7640 80241090 44812000 */ mtc1 $at, $f4 /* EE7644 80241094 44834000 */ mtc1 $v1, $f8 -/* EE7648 80241098 00000000 */ nop +/* EE7648 80241098 00000000 */ nop /* EE764C 8024109C 46804220 */ cvt.s.w $f8, $f8 /* EE7650 802410A0 44074000 */ mfc1 $a3, $f8 /* EE7654 802410A4 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80240CC0_EE7270 /* EE7708 80241158 0C013431 */ jal func_8004D0C4 /* EE770C 8024115C 8E070038 */ lw $a3, 0x38($s0) /* EE7710 80241160 1040001A */ beqz $v0, .L802411CC -/* EE7714 80241164 00000000 */ nop +/* EE7714 80241164 00000000 */ nop /* EE7718 80241168 8E060038 */ lw $a2, 0x38($s0) /* EE771C 8024116C 8E2200D0 */ lw $v0, 0xd0($s1) /* EE7720 80241170 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80240CC0_EE7270 /* EE7734 80241184 468073A0 */ cvt.s.w $f14, $f14 /* EE7738 80241188 C6020018 */ lwc1 $f2, 0x18($s0) /* EE773C 8024118C 4600103C */ c.lt.s $f2, $f0 -/* EE7740 80241190 00000000 */ nop +/* EE7740 80241190 00000000 */ nop /* EE7744 80241194 4500000D */ bc1f .L802411CC /* EE7748 80241198 E7A00034 */ swc1 $f0, 0x34($sp) /* EE774C 8024119C C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80240CC0_EE7270 /* EE7788 802411D8 00621825 */ or $v1, $v1, $v0 /* EE778C 802411DC 00741825 */ or $v1, $v1, $s4 /* EE7790 802411E0 10600008 */ beqz $v1, .L80241204 -/* EE7794 802411E4 00000000 */ nop +/* EE7794 802411E4 00000000 */ nop /* EE7798 802411E8 8602008C */ lh $v0, 0x8c($s0) /* EE779C 802411EC 14400031 */ bnez $v0, .L802412B4 -/* EE77A0 802411F0 00000000 */ nop +/* EE77A0 802411F0 00000000 */ nop /* EE77A4 802411F4 8E050018 */ lw $a1, 0x18($s0) /* EE77A8 802411F8 8E06000C */ lw $a2, 0xc($s0) /* EE77AC 802411FC 0C00F909 */ jal func_8003E424 @@ -362,12 +362,12 @@ glabel func_80240CC0_EE7270 /* EE77C0 80241210 44801000 */ mtc1 $zero, $f2 /* EE77C4 80241214 46000021 */ cvt.d.s $f0, $f0 /* EE77C8 80241218 46220002 */ mul.d $f0, $f0, $f2 -/* EE77CC 8024121C 00000000 */ nop +/* EE77CC 8024121C 00000000 */ nop /* EE77D0 80241220 4620020D */ trunc.w.d $f8, $f0 /* EE77D4 80241224 E628007C */ swc1 $f8, 0x7c($s1) /* EE77D8 80241228 8E420004 */ lw $v0, 4($s2) /* EE77DC 8024122C 18400021 */ blez $v0, .L802412B4 -/* EE77E0 80241230 00000000 */ nop +/* EE77E0 80241230 00000000 */ nop /* EE77E4 80241234 8602008E */ lh $v0, 0x8e($s0) /* EE77E8 80241238 9603008E */ lhu $v1, 0x8e($s0) /* EE77EC 8024123C 18400005 */ blez $v0, .L80241254 @@ -375,7 +375,7 @@ glabel func_80240CC0_EE7270 /* EE77F4 80241244 A602008E */ sh $v0, 0x8e($s0) /* EE77F8 80241248 00021400 */ sll $v0, $v0, 0x10 /* EE77FC 8024124C 1C400019 */ bgtz $v0, .L802412B4 -/* EE7800 80241250 00000000 */ nop +/* EE7800 80241250 00000000 */ nop .L80241254: /* EE7804 80241254 240403E8 */ addiu $a0, $zero, 0x3e8 /* EE7808 80241258 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80240CC0_EE7270 /* EE7850 802412A0 18400003 */ blez $v0, .L802412B0 /* EE7854 802412A4 28620003 */ slti $v0, $v1, 3 /* EE7858 802412A8 10400002 */ beqz $v0, .L802412B4 -/* EE785C 802412AC 00000000 */ nop +/* EE785C 802412AC 00000000 */ nop .L802412B0: /* EE7860 802412B0 AE600070 */ sw $zero, 0x70($s3) .L802412B4: diff --git a/asm/nonmatchings/code_EE70C0/func_802412E8_EE7898.s b/asm/nonmatchings/code_EE70C0/func_802412E8_EE7898.s index dfef72f411..4f529042ef 100644 --- a/asm/nonmatchings/code_EE70C0/func_802412E8_EE7898.s +++ b/asm/nonmatchings/code_EE70C0/func_802412E8_EE7898.s @@ -30,7 +30,7 @@ glabel func_802412E8_EE7898 /* EE78FC 8024134C A603008E */ sh $v1, 0x8e($s0) /* EE7900 80241350 C60C000C */ lwc1 $f12, 0xc($s0) /* EE7904 80241354 44820000 */ mtc1 $v0, $f0 -/* EE7908 80241358 00000000 */ nop +/* EE7908 80241358 00000000 */ nop /* EE790C 8024135C 46800020 */ cvt.s.w $f0, $f0 /* EE7910 80241360 46006300 */ add.s $f12, $f12, $f0 /* EE7914 80241364 3C0142B4 */ lui $at, 0x42b4 diff --git a/asm/nonmatchings/code_EE70C0/func_802413A8_EE7958.s b/asm/nonmatchings/code_EE70C0/func_802413A8_EE7958.s index 6347e21df3..ae685fe016 100644 --- a/asm/nonmatchings/code_EE70C0/func_802413A8_EE7958.s +++ b/asm/nonmatchings/code_EE70C0/func_802413A8_EE7958.s @@ -42,11 +42,11 @@ glabel func_802413A8_EE7958 .L8024143C: /* EE79EC 8024143C 8E220070 */ lw $v0, 0x70($s1) /* EE79F0 80241440 18400034 */ blez $v0, .L80241514 -/* EE79F4 80241444 00000000 */ nop +/* EE79F4 80241444 00000000 */ nop /* EE79F8 80241448 C62C0074 */ lwc1 $f12, 0x74($s1) /* EE79FC 8024144C 46806320 */ cvt.s.w $f12, $f12 /* EE7A00 80241450 44820000 */ mtc1 $v0, $f0 -/* EE7A04 80241454 00000000 */ nop +/* EE7A04 80241454 00000000 */ nop /* EE7A08 80241458 46800020 */ cvt.s.w $f0, $f0 /* EE7A0C 8024145C 46000021 */ cvt.d.s $f0, $f0 /* EE7A10 80241460 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_802413A8_EE7958 /* EE7A70 802414C0 27A70030 */ addiu $a3, $sp, 0x30 .L802414C4: /* EE7A74 802414C4 10400007 */ beqz $v0, .L802414E4 -/* EE7A78 802414C8 00000000 */ nop +/* EE7A78 802414C8 00000000 */ nop /* EE7A7C 802414CC 4616A082 */ mul.s $f2, $f20, $f22 -/* EE7A80 802414D0 00000000 */ nop +/* EE7A80 802414D0 00000000 */ nop /* EE7A84 802414D4 C7A0002C */ lwc1 $f0, 0x2c($sp) /* EE7A88 802414D8 46180000 */ add.s $f0, $f0, $f24 /* EE7A8C 802414DC 0809053C */ j .L802414F0 /* EE7A90 802414E0 46020000 */ add.s $f0, $f0, $f2 .L802414E4: /* EE7A94 802414E4 4616A002 */ mul.s $f0, $f20, $f22 -/* EE7A98 802414E8 00000000 */ nop +/* EE7A98 802414E8 00000000 */ nop /* EE7A9C 802414EC 4600D000 */ add.s $f0, $f26, $f0 .L802414F0: /* EE7AA0 802414F0 E600003C */ swc1 $f0, 0x3c($s0) /* EE7AA4 802414F4 8E220074 */ lw $v0, 0x74($s1) /* EE7AA8 802414F8 2442000A */ addiu $v0, $v0, 0xa /* EE7AAC 802414FC 44826000 */ mtc1 $v0, $f12 -/* EE7AB0 80241500 00000000 */ nop +/* EE7AB0 80241500 00000000 */ nop /* EE7AB4 80241504 0C00AB85 */ jal func_8002AE14 /* EE7AB8 80241508 46806320 */ cvt.s.w $f12, $f12 /* EE7ABC 8024150C 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_802413A8_EE7958 /* EE7AD0 80241520 860200A8 */ lh $v0, 0xa8($s0) /* EE7AD4 80241524 C600003C */ lwc1 $f0, 0x3c($s0) /* EE7AD8 80241528 44821000 */ mtc1 $v0, $f2 -/* EE7ADC 8024152C 00000000 */ nop +/* EE7ADC 8024152C 00000000 */ nop /* EE7AE0 80241530 468010A0 */ cvt.s.w $f2, $f2 /* EE7AE4 80241534 3C028010 */ lui $v0, %hi(D_800FFC90) /* EE7AE8 80241538 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) @@ -118,7 +118,7 @@ glabel func_802413A8_EE7958 /* EE7B04 80241554 46240000 */ add.d $f0, $f0, $f4 /* EE7B08 80241558 460010A1 */ cvt.d.s $f2, $f2 /* EE7B0C 8024155C 4620103C */ c.lt.d $f2, $f0 -/* EE7B10 80241560 00000000 */ nop +/* EE7B10 80241560 00000000 */ nop /* EE7B14 80241564 4500002E */ bc1f .L80241620 /* EE7B18 80241568 0280202D */ daddu $a0, $s4, $zero /* EE7B1C 8024156C 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_802413A8_EE7958 /* EE7B5C 802415AC 3C01C1A0 */ lui $at, 0xc1a0 /* EE7B60 802415B0 44812000 */ mtc1 $at, $f4 /* EE7B64 802415B4 44834000 */ mtc1 $v1, $f8 -/* EE7B68 802415B8 00000000 */ nop +/* EE7B68 802415B8 00000000 */ nop /* EE7B6C 802415BC 46804220 */ cvt.s.w $f8, $f8 /* EE7B70 802415C0 44074000 */ mfc1 $a3, $f8 /* EE7B74 802415C4 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_802413A8_EE7958 .L80241620: /* EE7BD0 80241620 8602008C */ lh $v0, 0x8c($s0) /* EE7BD4 80241624 14400025 */ bnez $v0, .L802416BC -/* EE7BD8 80241628 00000000 */ nop +/* EE7BD8 80241628 00000000 */ nop /* EE7BDC 8024162C 8602008E */ lh $v0, 0x8e($s0) /* EE7BE0 80241630 1C400022 */ bgtz $v0, .L802416BC -/* EE7BE4 80241634 00000000 */ nop +/* EE7BE4 80241634 00000000 */ nop /* EE7BE8 80241638 8E620074 */ lw $v0, 0x74($s3) /* EE7BEC 8024163C 2442FFFF */ addiu $v0, $v0, -1 /* EE7BF0 80241640 1840001D */ blez $v0, .L802416B8 @@ -183,7 +183,7 @@ glabel func_802413A8_EE7958 /* EE7BFC 8024164C 9442002A */ lhu $v0, 0x2a($v0) /* EE7C00 80241650 30420010 */ andi $v0, $v0, 0x10 /* EE7C04 80241654 14400007 */ bnez $v0, .L80241674 -/* EE7C08 80241658 00000000 */ nop +/* EE7C08 80241658 00000000 */ nop /* EE7C0C 8024165C C600000C */ lwc1 $f0, 0xc($s0) /* EE7C10 80241660 3C014334 */ lui $at, 0x4334 /* EE7C14 80241664 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/code_EE70C0/func_802417D0_EE7D80.s b/asm/nonmatchings/code_EE70C0/func_802417D0_EE7D80.s index 693f9aa83f..1108124ffa 100644 --- a/asm/nonmatchings/code_EE70C0/func_802417D0_EE7D80.s +++ b/asm/nonmatchings/code_EE70C0/func_802417D0_EE7D80.s @@ -60,18 +60,18 @@ glabel func_802417D0_EE7D80 /* EE7E58 802418A8 C6200038 */ lwc1 $f0, 0x38($s1) /* EE7E5C 802418AC 4600018D */ trunc.w.s $f6, $f0 /* EE7E60 802418B0 44023000 */ mfc1 $v0, $f6 -/* EE7E64 802418B4 00000000 */ nop +/* EE7E64 802418B4 00000000 */ nop /* EE7E68 802418B8 A6420010 */ sh $v0, 0x10($s2) /* EE7E6C 802418BC C620003C */ lwc1 $f0, 0x3c($s1) /* EE7E70 802418C0 4600018D */ trunc.w.s $f6, $f0 /* EE7E74 802418C4 44023000 */ mfc1 $v0, $f6 -/* EE7E78 802418C8 00000000 */ nop +/* EE7E78 802418C8 00000000 */ nop /* EE7E7C 802418CC A6420012 */ sh $v0, 0x12($s2) /* EE7E80 802418D0 C6200040 */ lwc1 $f0, 0x40($s1) /* EE7E84 802418D4 A2430007 */ sb $v1, 7($s2) /* EE7E88 802418D8 4600018D */ trunc.w.s $f6, $f0 /* EE7E8C 802418DC 44023000 */ mfc1 $v0, $f6 -/* EE7E90 802418E0 00000000 */ nop +/* EE7E90 802418E0 00000000 */ nop /* EE7E94 802418E4 A6420014 */ sh $v0, 0x14($s2) .L802418E8: /* EE7E98 802418E8 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/code_EE70C0/func_80241904_EE7EB4.s b/asm/nonmatchings/code_EE70C0/func_80241904_EE7EB4.s index da7b0a7ec7..7739f470fe 100644 --- a/asm/nonmatchings/code_EE70C0/func_80241904_EE7EB4.s +++ b/asm/nonmatchings/code_EE70C0/func_80241904_EE7EB4.s @@ -17,7 +17,7 @@ glabel func_80241904_EE7EB4 /* EE7EE4 80241934 A482008E */ sh $v0, 0x8e($a0) /* EE7EE8 80241938 00021400 */ sll $v0, $v0, 0x10 /* EE7EEC 8024193C 1C400006 */ bgtz $v0, .L80241958 -/* EE7EF0 80241940 00000000 */ nop +/* EE7EF0 80241940 00000000 */ nop .L80241944: /* EE7EF4 80241944 8482008C */ lh $v0, 0x8c($a0) /* EE7EF8 80241948 14400003 */ bnez $v0, .L80241958 diff --git a/asm/nonmatchings/code_EE70C0/func_80241968_EE7F18.s b/asm/nonmatchings/code_EE70C0/func_80241968_EE7F18.s index 776e674076..4f72f0c2b5 100644 --- a/asm/nonmatchings/code_EE70C0/func_80241968_EE7F18.s +++ b/asm/nonmatchings/code_EE70C0/func_80241968_EE7F18.s @@ -42,9 +42,9 @@ glabel func_80241968_EE7F18 /* EE7FAC 802419FC 44801800 */ mtc1 $zero, $f3 /* EE7FB0 80241A00 46002021 */ cvt.d.s $f0, $f4 /* EE7FB4 80241A04 4620103E */ c.le.d $f2, $f0 -/* EE7FB8 80241A08 00000000 */ nop +/* EE7FB8 80241A08 00000000 */ nop /* EE7FBC 80241A0C 45000030 */ bc1f .L80241AD0 -/* EE7FC0 80241A10 00000000 */ nop +/* EE7FC0 80241A10 00000000 */ nop /* EE7FC4 80241A14 C600003C */ lwc1 $f0, 0x3c($s0) /* EE7FC8 80241A18 46040000 */ add.s $f0, $f0, $f4 /* EE7FCC 80241A1C E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_80241968_EE7F18 /* EE802C 80241A7C 27A70020 */ addiu $a3, $sp, 0x20 .L80241A80: /* EE8030 80241A80 1040000B */ beqz $v0, .L80241AB0 -/* EE8034 80241A84 00000000 */ nop +/* EE8034 80241A84 00000000 */ nop /* EE8038 80241A88 C7A0001C */ lwc1 $f0, 0x1c($sp) /* EE803C 80241A8C 46140080 */ add.s $f2, $f0, $f20 /* EE8040 80241A90 C600003C */ lwc1 $f0, 0x3c($s0) /* EE8044 80241A94 4600103E */ c.le.s $f2, $f0 -/* EE8048 80241A98 00000000 */ nop +/* EE8048 80241A98 00000000 */ nop /* EE804C 80241A9C 4500008D */ bc1f .L80241CD4 -/* EE8050 80241AA0 00000000 */ nop +/* EE8050 80241AA0 00000000 */ nop /* EE8054 80241AA4 E602003C */ swc1 $f2, 0x3c($s0) /* EE8058 80241AA8 08090735 */ j .L80241CD4 /* EE805C 80241AAC AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_80241968_EE7F18 /* EE8060 80241AB0 C602003C */ lwc1 $f2, 0x3c($s0) /* EE8064 80241AB4 C6000064 */ lwc1 $f0, 0x64($s0) /* EE8068 80241AB8 4602003E */ c.le.s $f0, $f2 -/* EE806C 80241ABC 00000000 */ nop +/* EE806C 80241ABC 00000000 */ nop /* EE8070 80241AC0 45030084 */ bc1tl .L80241CD4 /* EE8074 80241AC4 AE400070 */ sw $zero, 0x70($s2) /* EE8078 80241AC8 08090735 */ j .L80241CD4 -/* EE807C 80241ACC 00000000 */ nop +/* EE807C 80241ACC 00000000 */ nop .L80241AD0: /* EE8080 80241AD0 4622003C */ c.lt.d $f0, $f2 -/* EE8084 80241AD4 00000000 */ nop +/* EE8084 80241AD4 00000000 */ nop /* EE8088 80241AD8 4500007E */ bc1f .L80241CD4 -/* EE808C 80241ADC 00000000 */ nop +/* EE808C 80241ADC 00000000 */ nop /* EE8090 80241AE0 9602008E */ lhu $v0, 0x8e($s0) /* EE8094 80241AE4 24420001 */ addiu $v0, $v0, 1 /* EE8098 80241AE8 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_80241968_EE7F18 /* EE80A4 80241AF4 00021403 */ sra $v0, $v0, 0x10 /* EE80A8 80241AF8 0043102A */ slt $v0, $v0, $v1 /* EE80AC 80241AFC 14400026 */ bnez $v0, .L80241B98 -/* EE80B0 80241B00 00000000 */ nop +/* EE80B0 80241B00 00000000 */ nop /* EE80B4 80241B04 C60C0038 */ lwc1 $f12, 0x38($s0) /* EE80B8 80241B08 C60E0040 */ lwc1 $f14, 0x40($s0) /* EE80BC 80241B0C 3C028010 */ lui $v0, %hi(D_800FFC90) @@ -124,20 +124,20 @@ glabel func_80241968_EE7F18 /* EE80E8 80241B38 8E62001C */ lw $v0, 0x1c($s3) /* EE80EC 80241B3C 46001005 */ abs.s $f0, $f2 /* EE80F0 80241B40 44822000 */ mtc1 $v0, $f4 -/* EE80F4 80241B44 00000000 */ nop +/* EE80F4 80241B44 00000000 */ nop /* EE80F8 80241B48 46802120 */ cvt.s.w $f4, $f4 /* EE80FC 80241B4C 4600203C */ c.lt.s $f4, $f0 -/* EE8100 80241B50 00000000 */ nop +/* EE8100 80241B50 00000000 */ nop /* EE8104 80241B54 4500000D */ bc1f .L80241B8C -/* EE8108 80241B58 00000000 */ nop +/* EE8108 80241B58 00000000 */ nop /* EE810C 80241B5C 44800000 */ mtc1 $zero, $f0 /* EE8110 80241B60 C614000C */ lwc1 $f20, 0xc($s0) /* EE8114 80241B64 4600103C */ c.lt.s $f2, $f0 -/* EE8118 80241B68 00000000 */ nop +/* EE8118 80241B68 00000000 */ nop /* EE811C 80241B6C 45000006 */ bc1f .L80241B88 /* EE8120 80241B70 00021023 */ negu $v0, $v0 /* EE8124 80241B74 44820000 */ mtc1 $v0, $f0 -/* EE8128 80241B78 00000000 */ nop +/* EE8128 80241B78 00000000 */ nop /* EE812C 80241B7C 46800020 */ cvt.s.w $f0, $f0 /* EE8130 80241B80 080906E3 */ j .L80241B8C /* EE8134 80241B84 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_80241968_EE7F18 /* EE815C 80241BAC C600001C */ lwc1 $f0, 0x1c($s0) /* EE8160 80241BB0 46001080 */ add.s $f2, $f2, $f0 /* EE8164 80241BB4 4616103C */ c.lt.s $f2, $f22 -/* EE8168 80241BB8 00000000 */ nop +/* EE8168 80241BB8 00000000 */ nop /* EE816C 80241BBC 45020045 */ bc1fl .L80241CD4 /* EE8170 80241BC0 E602003C */ swc1 $f2, 0x3c($s0) /* EE8174 80241BC4 08090734 */ j .L80241CD0 @@ -169,7 +169,7 @@ glabel func_80241968_EE7F18 /* EE818C 80241BDC C600001C */ lwc1 $f0, 0x1c($s0) /* EE8190 80241BE0 C604003C */ lwc1 $f4, 0x3c($s0) /* EE8194 80241BE4 44821000 */ mtc1 $v0, $f2 -/* EE8198 80241BE8 00000000 */ nop +/* EE8198 80241BE8 00000000 */ nop /* EE819C 80241BEC 468010A0 */ cvt.s.w $f2, $f2 /* EE81A0 80241BF0 46000005 */ abs.s $f0, $f0 /* EE81A4 80241BF4 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_80241968_EE7F18 /* EE81E0 80241C30 0C03908F */ jal func_800E423C /* EE81E4 80241C34 27A70020 */ addiu $a3, $sp, 0x20 /* EE81E8 80241C38 10400015 */ beqz $v0, .L80241C90 -/* EE81EC 80241C3C 00000000 */ nop +/* EE81EC 80241C3C 00000000 */ nop /* EE81F0 80241C40 860200A8 */ lh $v0, 0xa8($s0) /* EE81F4 80241C44 C604001C */ lwc1 $f4, 0x1c($s0) /* EE81F8 80241C48 44820000 */ mtc1 $v0, $f0 -/* EE81FC 80241C4C 00000000 */ nop +/* EE81FC 80241C4C 00000000 */ nop /* EE8200 80241C50 46800020 */ cvt.s.w $f0, $f0 /* EE8204 80241C54 46002085 */ abs.s $f2, $f4 /* EE8208 80241C58 46020000 */ add.s $f0, $f0, $f2 /* EE820C 80241C5C C7A20024 */ lwc1 $f2, 0x24($sp) /* EE8210 80241C60 4600103E */ c.le.s $f2, $f0 -/* EE8214 80241C64 00000000 */ nop +/* EE8214 80241C64 00000000 */ nop /* EE8218 80241C68 45000005 */ bc1f .L80241C80 -/* EE821C 80241C6C 00000000 */ nop +/* EE821C 80241C6C 00000000 */ nop /* EE8220 80241C70 C7A0001C */ lwc1 $f0, 0x1c($sp) /* EE8224 80241C74 AE00001C */ sw $zero, 0x1c($s0) /* EE8228 80241C78 08090735 */ j .L80241CD4 @@ -217,13 +217,13 @@ glabel func_80241968_EE7F18 /* EE8244 80241C94 860200A8 */ lh $v0, 0xa8($s0) /* EE8248 80241C98 46163081 */ sub.s $f2, $f6, $f22 /* EE824C 80241C9C 44820000 */ mtc1 $v0, $f0 -/* EE8250 80241CA0 00000000 */ nop +/* EE8250 80241CA0 00000000 */ nop /* EE8254 80241CA4 46800020 */ cvt.s.w $f0, $f0 /* EE8258 80241CA8 46001080 */ add.s $f2, $f2, $f0 /* EE825C 80241CAC C604001C */ lwc1 $f4, 0x1c($s0) /* EE8260 80241CB0 46002005 */ abs.s $f0, $f4 /* EE8264 80241CB4 4602003C */ c.lt.s $f0, $f2 -/* EE8268 80241CB8 00000000 */ nop +/* EE8268 80241CB8 00000000 */ nop /* EE826C 80241CBC 45020005 */ bc1fl .L80241CD4 /* EE8270 80241CC0 AE00001C */ sw $zero, 0x1c($s0) /* EE8274 80241CC4 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/code_EE70C0/func_80241CF8_EE82A8.s b/asm/nonmatchings/code_EE70C0/func_80241CF8_EE82A8.s index d731132677..1822223023 100644 --- a/asm/nonmatchings/code_EE70C0/func_80241CF8_EE82A8.s +++ b/asm/nonmatchings/code_EE70C0/func_80241CF8_EE82A8.s @@ -49,15 +49,15 @@ glabel func_80241CF8_EE82A8 /* EE8350 80241DA0 44802000 */ mtc1 $zero, $f4 /* EE8354 80241DA4 460010A1 */ cvt.d.s $f2, $f2 /* EE8358 80241DA8 46241082 */ mul.d $f2, $f2, $f4 -/* EE835C 80241DAC 00000000 */ nop +/* EE835C 80241DAC 00000000 */ nop /* EE8360 80241DB0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* EE8364 80241DB4 46000021 */ cvt.d.s $f0, $f0 /* EE8368 80241DB8 46240002 */ mul.d $f0, $f0, $f4 -/* EE836C 80241DBC 00000000 */ nop +/* EE836C 80241DBC 00000000 */ nop /* EE8370 80241DC0 3C013FE0 */ lui $at, 0x3fe0 /* EE8374 80241DC4 44812800 */ mtc1 $at, $f5 /* EE8378 80241DC8 44802000 */ mtc1 $zero, $f4 -/* EE837C 80241DCC 00000000 */ nop +/* EE837C 80241DCC 00000000 */ nop /* EE8380 80241DD0 46241080 */ add.d $f2, $f2, $f4 /* EE8384 80241DD4 AE000074 */ sw $zero, 0x74($s0) /* EE8388 80241DD8 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/code_EE70C0/func_80241E1C_EE83CC.s b/asm/nonmatchings/code_EE70C0/func_80241E1C_EE83CC.s index e8f3c27e49..ec478cba43 100644 --- a/asm/nonmatchings/code_EE70C0/func_80241E1C_EE83CC.s +++ b/asm/nonmatchings/code_EE70C0/func_80241E1C_EE83CC.s @@ -65,7 +65,7 @@ glabel func_80241E1C_EE83CC /* EE84B8 80241F08 8E4300B0 */ lw $v1, 0xb0($s2) /* EE84BC 80241F0C 30620004 */ andi $v0, $v1, 4 /* EE84C0 80241F10 10400007 */ beqz $v0, .L80241F30 -/* EE84C4 80241F14 00000000 */ nop +/* EE84C4 80241F14 00000000 */ nop /* EE84C8 80241F18 824200B4 */ lb $v0, 0xb4($s2) /* EE84CC 80241F1C 1440003C */ bnez $v0, .L80242010 /* EE84D0 80241F20 0000102D */ daddu $v0, $zero, $zero @@ -77,58 +77,68 @@ glabel func_80241E1C_EE83CC /* EE84E4 80241F34 2C62000F */ sltiu $v0, $v1, 0xf /* EE84E8 80241F38 10400034 */ beqz $v0, .L8024200C /* EE84EC 80241F3C 00031080 */ sll $v0, $v1, 2 -/* EE84F0 80241F40 3C018024 */ lui $at, %hi(D_80245398) +/* EE84F0 80241F40 3C018024 */ lui $at, %hi(jtbl_80245398_EEB948) /* EE84F4 80241F44 00220821 */ addu $at, $at, $v0 -/* EE84F8 80241F48 8C225398 */ lw $v0, %lo(D_80245398)($at) +/* EE84F8 80241F48 8C225398 */ lw $v0, %lo(jtbl_80245398_EEB948)($at) /* EE84FC 80241F4C 00400008 */ jr $v0 -/* EE8500 80241F50 00000000 */ nop +/* EE8500 80241F50 00000000 */ nop +glabel L80241F54_EE8504 /* EE8504 80241F54 02A0202D */ daddu $a0, $s5, $zero /* EE8508 80241F58 0200282D */ daddu $a1, $s0, $zero /* EE850C 80241F5C 0C0902C4 */ jal func_80240B10_EE70C0 /* EE8510 80241F60 0260302D */ daddu $a2, $s3, $zero +glabel L80241F64_EE8514 /* EE8514 80241F64 02A0202D */ daddu $a0, $s5, $zero /* EE8518 80241F68 0200282D */ daddu $a1, $s0, $zero /* EE851C 80241F6C 0C090330 */ jal func_80240CC0_EE7270 /* EE8520 80241F70 0260302D */ daddu $a2, $s3, $zero /* EE8524 80241F74 08090804 */ j .L80242010 /* EE8528 80241F78 0000102D */ daddu $v0, $zero, $zero +glabel L80241F7C_EE852C /* EE852C 80241F7C 02A0202D */ daddu $a0, $s5, $zero /* EE8530 80241F80 0200282D */ daddu $a1, $s0, $zero /* EE8534 80241F84 0C0904BA */ jal func_802412E8_EE7898 /* EE8538 80241F88 0260302D */ daddu $a2, $s3, $zero +glabel L80241F8C_EE853C /* EE853C 80241F8C 02A0202D */ daddu $a0, $s5, $zero /* EE8540 80241F90 0200282D */ daddu $a1, $s0, $zero /* EE8544 80241F94 0C0904EA */ jal func_802413A8_EE7958 /* EE8548 80241F98 0260302D */ daddu $a2, $s3, $zero /* EE854C 80241F9C 08090804 */ j .L80242010 /* EE8550 80241FA0 0000102D */ daddu $v0, $zero, $zero +glabel L80241FA4_EE8554 /* EE8554 80241FA4 02A0202D */ daddu $a0, $s5, $zero /* EE8558 80241FA8 0200282D */ daddu $a1, $s0, $zero /* EE855C 80241FAC 0C0905BB */ jal func_802416EC_EE7C9C /* EE8560 80241FB0 0260302D */ daddu $a2, $s3, $zero +glabel L80241FB4_EE8564 /* EE8564 80241FB4 02A0202D */ daddu $a0, $s5, $zero /* EE8568 80241FB8 0200282D */ daddu $a1, $s0, $zero /* EE856C 80241FBC 0C0905D9 */ jal func_80241764_EE7D14 /* EE8570 80241FC0 0260302D */ daddu $a2, $s3, $zero /* EE8574 80241FC4 08090804 */ j .L80242010 /* EE8578 80241FC8 0000102D */ daddu $v0, $zero, $zero +glabel L80241FCC_EE857C /* EE857C 80241FCC 02A0202D */ daddu $a0, $s5, $zero /* EE8580 80241FD0 0200282D */ daddu $a1, $s0, $zero /* EE8584 80241FD4 0C0905F4 */ jal func_802417D0_EE7D80 /* EE8588 80241FD8 0260302D */ daddu $a2, $s3, $zero /* EE858C 80241FDC 08090804 */ j .L80242010 /* EE8590 80241FE0 0000102D */ daddu $v0, $zero, $zero +glabel L80241FE4_EE8594 /* EE8594 80241FE4 02A0202D */ daddu $a0, $s5, $zero /* EE8598 80241FE8 0200282D */ daddu $a1, $s0, $zero /* EE859C 80241FEC 0C090641 */ jal func_80241904_EE7EB4 /* EE85A0 80241FF0 0260302D */ daddu $a2, $s3, $zero /* EE85A4 80241FF4 08090804 */ j .L80242010 /* EE85A8 80241FF8 0000102D */ daddu $v0, $zero, $zero +glabel L80241FFC_EE85AC /* EE85AC 80241FFC 02A0202D */ daddu $a0, $s5, $zero /* EE85B0 80242000 0200282D */ daddu $a1, $s0, $zero /* EE85B4 80242004 0C09065A */ jal func_80241968_EE7F18 /* EE85B8 80242008 0260302D */ daddu $a2, $s3, $zero .L8024200C: +glabel L8024200C_EE85BC /* EE85BC 8024200C 0000102D */ daddu $v0, $zero, $zero .L80242010: /* EE85C0 80242010 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/code_EE70C0/func_80242034_EE85E4.s b/asm/nonmatchings/code_EE70C0/func_80242034_EE85E4.s index 5eae0e33ea..5ffd241298 100644 --- a/asm/nonmatchings/code_EE70C0/func_80242034_EE85E4.s +++ b/asm/nonmatchings/code_EE70C0/func_80242034_EE85E4.s @@ -14,7 +14,7 @@ glabel func_80242034_EE85E4 /* EE8608 80242058 0C00F94D */ jal func_8003E534 /* EE860C 8024205C 0040202D */ daddu $a0, $v0, $zero /* EE8610 80242060 10400005 */ beqz $v0, .L80242078 -/* EE8614 80242064 00000000 */ nop +/* EE8614 80242064 00000000 */ nop /* EE8618 80242068 8E050000 */ lw $a1, ($s0) /* EE861C 8024206C 844600A8 */ lh $a2, 0xa8($v0) /* EE8620 80242070 0C0B551A */ jal func_802D5468 diff --git a/asm/nonmatchings/code_EE70C0/func_80242090_EE8640.s b/asm/nonmatchings/code_EE70C0/func_80242090_EE8640.s index 6aa2d14d1e..3e3b1ffbfc 100644 --- a/asm/nonmatchings/code_EE70C0/func_80242090_EE8640.s +++ b/asm/nonmatchings/code_EE70C0/func_80242090_EE8640.s @@ -21,7 +21,7 @@ glabel func_80242090_EE8640 /* EE8680 802420D0 0C0B53A3 */ jal func_802D4E8C /* EE8684 802420D4 0260282D */ daddu $a1, $s3, $zero /* EE8688 802420D8 4482E000 */ mtc1 $v0, $f28 -/* EE868C 802420DC 00000000 */ nop +/* EE868C 802420DC 00000000 */ nop /* EE8690 802420E0 4680E720 */ cvt.s.w $f28, $f28 /* EE8694 802420E4 8E140000 */ lw $s4, ($s0) /* EE8698 802420E8 26100004 */ addiu $s0, $s0, 4 @@ -29,14 +29,14 @@ glabel func_80242090_EE8640 /* EE86A0 802420F0 0C0B53A3 */ jal func_802D4E8C /* EE86A4 802420F4 0280282D */ daddu $a1, $s4, $zero /* EE86A8 802420F8 4482D000 */ mtc1 $v0, $f26 -/* EE86AC 802420FC 00000000 */ nop +/* EE86AC 802420FC 00000000 */ nop /* EE86B0 80242100 4680D6A0 */ cvt.s.w $f26, $f26 /* EE86B4 80242104 8E100000 */ lw $s0, ($s0) /* EE86B8 80242108 0220202D */ daddu $a0, $s1, $zero /* EE86BC 8024210C 0C0B53A3 */ jal func_802D4E8C /* EE86C0 80242110 0200282D */ daddu $a1, $s0, $zero /* EE86C4 80242114 4482C000 */ mtc1 $v0, $f24 -/* EE86C8 80242118 00000000 */ nop +/* EE86C8 80242118 00000000 */ nop /* EE86CC 8024211C 4680C620 */ cvt.s.w $f24, $f24 /* EE86D0 80242120 3C128011 */ lui $s2, %hi(D_80117578) /* EE86D4 80242124 26527578 */ addiu $s2, $s2, %lo(D_80117578) @@ -56,7 +56,7 @@ glabel func_80242090_EE8640 /* EE870C 8024215C 00220821 */ addu $at, $at, $v0 /* EE8710 80242160 C4368DEC */ lwc1 $f22, %lo(D_800B8DEC)($at) /* EE8714 80242164 45000005 */ bc1f .L8024217C -/* EE8718 80242168 00000000 */ nop +/* EE8718 80242168 00000000 */ nop /* EE871C 8024216C 3C0142C8 */ lui $at, 0x42c8 /* EE8720 80242170 44810000 */ mtc1 $at, $f0 /* EE8724 80242174 08090863 */ j .L8024218C @@ -64,7 +64,7 @@ glabel func_80242090_EE8640 .L8024217C: /* EE872C 8024217C 3C0142C8 */ lui $at, 0x42c8 /* EE8730 80242180 44810000 */ mtc1 $at, $f0 -/* EE8734 80242184 00000000 */ nop +/* EE8734 80242184 00000000 */ nop /* EE8738 80242188 4600B580 */ add.s $f22, $f22, $f0 .L8024218C: /* EE873C 8024218C 0C00AB85 */ jal func_8002AE14 @@ -75,21 +75,21 @@ glabel func_80242090_EE8640 /* EE8750 802421A0 0C00AD77 */ jal func_8002B5DC /* EE8754 802421A4 4600B306 */ mov.s $f12, $f22 /* EE8758 802421A8 46140002 */ mul.s $f0, $f0, $f20 -/* EE875C 802421AC 00000000 */ nop +/* EE875C 802421AC 00000000 */ nop /* EE8760 802421B0 864200B0 */ lh $v0, 0xb0($s2) /* EE8764 802421B4 3C013F00 */ lui $at, 0x3f00 /* EE8768 802421B8 44812000 */ mtc1 $at, $f4 /* EE876C 802421BC 44821000 */ mtc1 $v0, $f2 -/* EE8770 802421C0 00000000 */ nop +/* EE8770 802421C0 00000000 */ nop /* EE8774 802421C4 468010A0 */ cvt.s.w $f2, $f2 /* EE8778 802421C8 46041082 */ mul.s $f2, $f2, $f4 -/* EE877C 802421CC 00000000 */ nop +/* EE877C 802421CC 00000000 */ nop /* EE8780 802421D0 4600E700 */ add.s $f28, $f28, $f0 /* EE8784 802421D4 4602D680 */ add.s $f26, $f26, $f2 /* EE8788 802421D8 0C00AD90 */ jal func_8002B640 /* EE878C 802421DC 4600B306 */ mov.s $f12, $f22 /* EE8790 802421E0 46140002 */ mul.s $f0, $f0, $f20 -/* EE8794 802421E4 00000000 */ nop +/* EE8794 802421E4 00000000 */ nop /* EE8798 802421E8 0220202D */ daddu $a0, $s1, $zero /* EE879C 802421EC 0260282D */ daddu $a1, $s3, $zero /* EE87A0 802421F0 4600E18D */ trunc.w.s $f6, $f28 diff --git a/asm/nonmatchings/code_EE70C0/func_802422EC_EE889C.s b/asm/nonmatchings/code_EE70C0/func_802422EC_EE889C.s index 72a2380f2f..de29f3c17f 100644 --- a/asm/nonmatchings/code_EE70C0/func_802422EC_EE889C.s +++ b/asm/nonmatchings/code_EE70C0/func_802422EC_EE889C.s @@ -28,7 +28,7 @@ glabel func_802422EC_EE889C /* EE88F0 80242340 00220821 */ addu $at, $at, $v0 /* EE88F4 80242344 AC2053E0 */ sw $zero, %lo(D_802453E0)($at) /* EE88F8 80242348 080908DE */ j .L80242378 -/* EE88FC 8024234C 00000000 */ nop +/* EE88FC 8024234C 00000000 */ nop .L80242350: /* EE8900 80242350 3C038024 */ lui $v1, %hi(D_802453E0) /* EE8904 80242354 246353E0 */ addiu $v1, $v1, %lo(D_802453E0) @@ -46,5 +46,5 @@ glabel func_802422EC_EE889C /* EE892C 8024237C 24020002 */ addiu $v0, $zero, 2 /* EE8930 80242380 03E00008 */ jr $ra /* EE8934 80242384 27BD0018 */ addiu $sp, $sp, 0x18 -/* EE8938 80242388 00000000 */ nop -/* EE893C 8024238C 00000000 */ nop +/* EE8938 80242388 00000000 */ nop +/* EE893C 8024238C 00000000 */ nop diff --git a/asm/nonmatchings/code_EE8940/func_80242390_EE8940.s b/asm/nonmatchings/code_EE8940/func_80242390_EE8940.s index d5f095a7ef..542eee7686 100644 --- a/asm/nonmatchings/code_EE8940/func_80242390_EE8940.s +++ b/asm/nonmatchings/code_EE8940/func_80242390_EE8940.s @@ -13,4 +13,4 @@ glabel func_80242390_EE8940 /* EE8960 802423B0 24020002 */ addiu $v0, $zero, 2 /* EE8964 802423B4 03E00008 */ jr $ra /* EE8968 802423B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* EE896C 802423BC 00000000 */ nop +/* EE896C 802423BC 00000000 */ nop diff --git a/asm/nonmatchings/code_EED100/func_80240000_EED100.s b/asm/nonmatchings/code_EED100/func_80240000_EED100.s index 1a8f5b0780..6ea9b6158b 100644 --- a/asm/nonmatchings/code_EED100/func_80240000_EED100.s +++ b/asm/nonmatchings/code_EED100/func_80240000_EED100.s @@ -15,6 +15,6 @@ glabel func_80240000_EED100 /* EED128 80240028 24020002 */ addiu $v0, $zero, 2 /* EED12C 8024002C 03E00008 */ jr $ra /* EED130 80240030 27BD0020 */ addiu $sp, $sp, 0x20 -/* EED134 80240034 00000000 */ nop -/* EED138 80240038 00000000 */ nop -/* EED13C 8024003C 00000000 */ nop +/* EED134 80240034 00000000 */ nop +/* EED138 80240038 00000000 */ nop +/* EED13C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/code_EED140/func_80240040_EED140.s b/asm/nonmatchings/code_EED140/func_80240040_EED140.s index 44e173484d..94b93662d3 100644 --- a/asm/nonmatchings/code_EED140/func_80240040_EED140.s +++ b/asm/nonmatchings/code_EED140/func_80240040_EED140.s @@ -6,33 +6,33 @@ glabel func_80240040_EED140 /* EED144 80240044 8C830090 */ lw $v1, 0x90($a0) /* EED148 80240048 00431023 */ subu $v0, $v0, $v1 /* EED14C 8024004C 44821000 */ mtc1 $v0, $f2 -/* EED150 80240050 00000000 */ nop +/* EED150 80240050 00000000 */ nop /* EED154 80240054 468010A0 */ cvt.s.w $f2, $f2 /* EED158 80240058 8C820088 */ lw $v0, 0x88($a0) /* EED15C 8024005C 8C830094 */ lw $v1, 0x94($a0) /* EED160 80240060 46021082 */ mul.s $f2, $f2, $f2 -/* EED164 80240064 00000000 */ nop +/* EED164 80240064 00000000 */ nop /* EED168 80240068 00431023 */ subu $v0, $v0, $v1 /* EED16C 8024006C 44822000 */ mtc1 $v0, $f4 -/* EED170 80240070 00000000 */ nop +/* EED170 80240070 00000000 */ nop /* EED174 80240074 46802120 */ cvt.s.w $f4, $f4 /* EED178 80240078 8C82008C */ lw $v0, 0x8c($a0) /* EED17C 8024007C 46042102 */ mul.s $f4, $f4, $f4 -/* EED180 80240080 00000000 */ nop +/* EED180 80240080 00000000 */ nop /* EED184 80240084 8C830098 */ lw $v1, 0x98($a0) /* EED188 80240088 00431023 */ subu $v0, $v0, $v1 /* EED18C 8024008C 44820000 */ mtc1 $v0, $f0 -/* EED190 80240090 00000000 */ nop +/* EED190 80240090 00000000 */ nop /* EED194 80240094 46800020 */ cvt.s.w $f0, $f0 /* EED198 80240098 46000002 */ mul.s $f0, $f0, $f0 -/* EED19C 8024009C 00000000 */ nop +/* EED19C 8024009C 00000000 */ nop /* EED1A0 802400A0 46041080 */ add.s $f2, $f2, $f4 /* EED1A4 802400A4 46001080 */ add.s $f2, $f2, $f0 /* EED1A8 802400A8 3C014561 */ lui $at, 0x4561 /* EED1AC 802400AC 44810000 */ mtc1 $at, $f0 -/* EED1B0 802400B0 00000000 */ nop +/* EED1B0 802400B0 00000000 */ nop /* EED1B4 802400B4 4600103C */ c.lt.s $f2, $f0 -/* EED1B8 802400B8 00000000 */ nop +/* EED1B8 802400B8 00000000 */ nop /* EED1BC 802400BC 45010002 */ bc1t .L802400C8 /* EED1C0 802400C0 24020001 */ addiu $v0, $zero, 1 /* EED1C4 802400C4 0000102D */ daddu $v0, $zero, $zero @@ -40,6 +40,6 @@ glabel func_80240040_EED140 /* EED1C8 802400C8 AC820084 */ sw $v0, 0x84($a0) /* EED1CC 802400CC 03E00008 */ jr $ra /* EED1D0 802400D0 24020002 */ addiu $v0, $zero, 2 -/* EED1D4 802400D4 00000000 */ nop -/* EED1D8 802400D8 00000000 */ nop -/* EED1DC 802400DC 00000000 */ nop +/* EED1D4 802400D4 00000000 */ nop +/* EED1D8 802400D8 00000000 */ nop +/* EED1DC 802400DC 00000000 */ nop diff --git a/asm/nonmatchings/code_EED1E0/func_802401B4_EED2B4.s b/asm/nonmatchings/code_EED1E0/func_802401B4_EED2B4.s index 18dcf11381..f1e12f3e79 100644 --- a/asm/nonmatchings/code_EED1E0/func_802401B4_EED2B4.s +++ b/asm/nonmatchings/code_EED1E0/func_802401B4_EED2B4.s @@ -8,7 +8,7 @@ glabel func_802401B4_EED2B4 /* EED2C0 802401C0 00822021 */ addu $a0, $a0, $v0 /* EED2C4 802401C4 90820014 */ lbu $v0, 0x14($a0) /* EED2C8 802401C8 10400009 */ beqz $v0, .L802401F0 -/* EED2CC 802401CC 00000000 */ nop +/* EED2CC 802401CC 00000000 */ nop /* EED2D0 802401D0 90820015 */ lbu $v0, 0x15($a0) /* EED2D4 802401D4 00022600 */ sll $a0, $v0, 0x18 /* EED2D8 802401D8 00041E03 */ sra $v1, $a0, 0x18 @@ -16,7 +16,7 @@ glabel func_802401B4_EED2B4 /* EED2E0 802401E0 00021403 */ sra $v0, $v0, 0x10 /* EED2E4 802401E4 0043102A */ slt $v0, $v0, $v1 /* EED2E8 802401E8 10400003 */ beqz $v0, .L802401F8 -/* EED2EC 802401EC 00000000 */ nop +/* EED2EC 802401EC 00000000 */ nop .L802401F0: /* EED2F0 802401F0 03E00008 */ jr $ra /* EED2F4 802401F4 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/code_EED1E0/func_802402AC_EED3AC.s b/asm/nonmatchings/code_EED1E0/func_802402AC_EED3AC.s index 33fcc99368..4e9e1fe739 100644 --- a/asm/nonmatchings/code_EED1E0/func_802402AC_EED3AC.s +++ b/asm/nonmatchings/code_EED1E0/func_802402AC_EED3AC.s @@ -108,20 +108,20 @@ glabel func_802402AC_EED3AC /* EED534 80240434 10400009 */ beqz $v0, .L8024045C /* EED538 80240438 AEA20074 */ sw $v0, 0x74($s5) /* EED53C 8024043C 0C03E498 */ jal func_800F9260 -/* EED540 80240440 00000000 */ nop +/* EED540 80240440 00000000 */ nop /* EED544 80240444 8EA20070 */ lw $v0, 0x70($s5) /* EED548 80240448 24420001 */ addiu $v0, $v0, 1 .L8024044C: /* EED54C 8024044C AEA20070 */ sw $v0, 0x70($s5) /* EED550 80240450 2842000F */ slti $v0, $v0, 0xf /* EED554 80240454 10400003 */ beqz $v0, .L80240464 -/* EED558 80240458 00000000 */ nop +/* EED558 80240458 00000000 */ nop .L8024045C: /* EED55C 8024045C 08090133 */ j .L802404CC /* EED560 80240460 0000102D */ daddu $v0, $zero, $zero .L80240464: /* EED564 80240464 0C03E4FA */ jal func_800F93E8 -/* EED568 80240468 00000000 */ nop +/* EED568 80240468 00000000 */ nop /* EED56C 8024046C 8EA30074 */ lw $v1, 0x74($s5) /* EED570 80240470 240200FF */ addiu $v0, $zero, 0xff /* EED574 80240474 10620010 */ beq $v1, $v0, .L802404B8 diff --git a/asm/nonmatchings/code_EED1E0/func_802406E0_EED7E0.s b/asm/nonmatchings/code_EED1E0/func_802406E0_EED7E0.s index 5fa6daee5a..bf8cc1be88 100644 --- a/asm/nonmatchings/code_EED1E0/func_802406E0_EED7E0.s +++ b/asm/nonmatchings/code_EED1E0/func_802406E0_EED7E0.s @@ -36,7 +36,7 @@ glabel func_802406E0_EED7E0 /* EED85C 8024075C 0C00AD49 */ jal func_8002B524 /* EED860 80240760 0040A82D */ daddu $s5, $v0, $zero /* EED864 80240764 1200005D */ beqz $s0, .L802408DC -/* EED868 80240768 00000000 */ nop +/* EED868 80240768 00000000 */ nop /* EED86C 8024076C 0C00AFC6 */ jal func_8002BF18 /* EED870 80240770 24040068 */ addiu $a0, $zero, 0x68 /* EED874 80240774 0040902D */ daddu $s2, $v0, $zero @@ -98,10 +98,10 @@ glabel func_802406E0_EED7E0 /* EED94C 8024084C C7A2001C */ lwc1 $f2, 0x1c($sp) /* EED950 80240850 C7A40020 */ lwc1 $f4, 0x20($sp) /* EED954 80240854 46041082 */ mul.s $f2, $f2, $f4 -/* EED958 80240858 00000000 */ nop +/* EED958 80240858 00000000 */ nop /* EED95C 8024085C C7A00018 */ lwc1 $f0, 0x18($sp) /* EED960 80240860 46040002 */ mul.s $f0, $f0, $f4 -/* EED964 80240864 00000000 */ nop +/* EED964 80240864 00000000 */ nop /* EED968 80240868 E6020038 */ swc1 $f2, 0x38($s0) /* EED96C 8024086C E6000050 */ swc1 $f0, 0x50($s0) /* EED970 80240870 8E42005C */ lw $v0, 0x5c($s2) @@ -142,12 +142,12 @@ glabel func_802406E0_EED7E0 /* EED9F8 802408F8 10600007 */ beqz $v1, .L80240918 /* EED9FC 802408FC 24040005 */ addiu $a0, $zero, 5 /* EEDA00 80240900 080902AC */ j .L80240AB0 -/* EEDA04 80240904 00000000 */ nop +/* EEDA04 80240904 00000000 */ nop .L80240908: /* EEDA08 80240908 10620058 */ beq $v1, $v0, .L80240A6C -/* EEDA0C 8024090C 00000000 */ nop +/* EEDA0C 8024090C 00000000 */ nop /* EEDA10 80240910 080902AC */ j .L80240AB0 -/* EEDA14 80240914 00000000 */ nop +/* EEDA14 80240914 00000000 */ nop .L80240918: /* EEDA18 80240918 0000882D */ daddu $s1, $zero, $zero /* EEDA1C 8024091C 3C148024 */ lui $s4, %hi(func_802437B8) @@ -174,11 +174,11 @@ glabel func_802406E0_EED7E0 /* EEDA6C 8024096C C7A4001C */ lwc1 $f4, 0x1c($sp) /* EEDA70 80240970 C7A00020 */ lwc1 $f0, 0x20($sp) /* EEDA74 80240974 46002102 */ mul.s $f4, $f4, $f0 -/* EEDA78 80240978 00000000 */ nop +/* EEDA78 80240978 00000000 */ nop /* EEDA7C 8024097C C7A20018 */ lwc1 $f2, 0x18($sp) /* EEDA80 80240980 26940004 */ addiu $s4, $s4, 4 /* EEDA84 80240984 46001082 */ mul.s $f2, $f2, $f0 -/* EEDA88 80240988 00000000 */ nop +/* EEDA88 80240988 00000000 */ nop /* EEDA8C 8024098C 26730004 */ addiu $s3, $s3, 4 /* EEDA90 80240990 26310001 */ addiu $s1, $s1, 1 /* EEDA94 80240994 2A220003 */ slti $v0, $s1, 3 @@ -215,11 +215,11 @@ glabel func_802406E0_EED7E0 /* EEDB08 80240A08 C7A4001C */ lwc1 $f4, 0x1c($sp) /* EEDB0C 80240A0C C7A00020 */ lwc1 $f0, 0x20($sp) /* EEDB10 80240A10 46002102 */ mul.s $f4, $f4, $f0 -/* EEDB14 80240A14 00000000 */ nop +/* EEDB14 80240A14 00000000 */ nop /* EEDB18 80240A18 C7A20018 */ lwc1 $f2, 0x18($sp) /* EEDB1C 80240A1C 26940004 */ addiu $s4, $s4, 4 /* EEDB20 80240A20 46001082 */ mul.s $f2, $f2, $f0 -/* EEDB24 80240A24 00000000 */ nop +/* EEDB24 80240A24 00000000 */ nop /* EEDB28 80240A28 26730004 */ addiu $s3, $s3, 4 /* EEDB2C 80240A2C 26310001 */ addiu $s1, $s1, 1 /* EEDB30 80240A30 2A220003 */ slti $v0, $s1, 3 diff --git a/asm/nonmatchings/code_EED1E0/func_80240C18_EEDD18.s b/asm/nonmatchings/code_EED1E0/func_80240C18_EEDD18.s index 64768a5031..9865d119ed 100644 --- a/asm/nonmatchings/code_EED1E0/func_80240C18_EEDD18.s +++ b/asm/nonmatchings/code_EED1E0/func_80240C18_EEDD18.s @@ -36,16 +36,16 @@ glabel func_80240C18_EEDD18 /* EEDD90 80240C90 10600007 */ beqz $v1, .L80240CB0 /* EEDD94 80240C94 240500FF */ addiu $a1, $zero, 0xff /* EEDD98 80240C98 0809034A */ j .L80240D28 -/* EEDD9C 80240C9C 00000000 */ nop +/* EEDD9C 80240C9C 00000000 */ nop .L80240CA0: /* EEDDA0 80240CA0 10620019 */ beq $v1, $v0, .L80240D08 -/* EEDDA4 80240CA4 00000000 */ nop +/* EEDDA4 80240CA4 00000000 */ nop /* EEDDA8 80240CA8 0809034A */ j .L80240D28 -/* EEDDAC 80240CAC 00000000 */ nop +/* EEDDAC 80240CAC 00000000 */ nop .L80240CB0: /* EEDDB0 80240CB0 8E220074 */ lw $v0, 0x74($s1) /* EEDDB4 80240CB4 14450004 */ bne $v0, $a1, .L80240CC8 -/* EEDDB8 80240CB8 00000000 */ nop +/* EEDDB8 80240CB8 00000000 */ nop /* EEDDBC 80240CBC AE240070 */ sw $a0, 0x70($s1) /* EEDDC0 80240CC0 AE200078 */ sw $zero, 0x78($s1) /* EEDDC4 80240CC4 8E220074 */ lw $v0, 0x74($s1) @@ -57,7 +57,7 @@ glabel func_80240C18_EEDD18 /* EEDDD8 80240CD8 50400013 */ beql $v0, $zero, .L80240D28 /* EEDDDC 80240CDC AE250074 */ sw $a1, 0x74($s1) /* EEDDE0 80240CE0 0809034A */ j .L80240D28 -/* EEDDE4 80240CE4 00000000 */ nop +/* EEDDE4 80240CE4 00000000 */ nop .L80240CE8: /* EEDDE8 80240CE8 8E220078 */ lw $v0, 0x78($s1) /* EEDDEC 80240CEC 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/code_EED1E0/func_80240E18_EEDF18.s b/asm/nonmatchings/code_EED1E0/func_80240E18_EEDF18.s index 81e4611416..3edf667860 100644 --- a/asm/nonmatchings/code_EED1E0/func_80240E18_EEDF18.s +++ b/asm/nonmatchings/code_EED1E0/func_80240E18_EEDF18.s @@ -16,5 +16,5 @@ glabel func_80240E18_EEDF18 .L80240E40: /* EEDF40 80240E40 03E00008 */ jr $ra /* EEDF44 80240E44 24020002 */ addiu $v0, $zero, 2 -/* EEDF48 80240E48 00000000 */ nop -/* EEDF4C 80240E4C 00000000 */ nop +/* EEDF48 80240E48 00000000 */ nop +/* EEDF4C 80240E4C 00000000 */ nop diff --git a/asm/nonmatchings/code_EEDF50/func_8024215C_EEF25C.s b/asm/nonmatchings/code_EEDF50/func_8024215C_EEF25C.s index 6068082ddf..88b3ba12b1 100644 --- a/asm/nonmatchings/code_EEDF50/func_8024215C_EEF25C.s +++ b/asm/nonmatchings/code_EEDF50/func_8024215C_EEF25C.s @@ -77,58 +77,68 @@ glabel func_8024215C_EEF25C /* EEF374 80242274 2C62000F */ sltiu $v0, $v1, 0xf /* EEF378 80242278 10400034 */ beqz $v0, .L8024234C /* EEF37C 8024227C 00031080 */ sll $v0, $v1, 2 -/* EEF380 80242280 3C018024 */ lui $at, %hi(D_80245468) +/* EEF380 80242280 3C018024 */ lui $at, %hi(jtbl_80245468_EF2568) /* EEF384 80242284 00220821 */ addu $at, $at, $v0 -/* EEF388 80242288 8C225468 */ lw $v0, %lo(D_80245468)($at) +/* EEF388 80242288 8C225468 */ lw $v0, %lo(jtbl_80245468_EF2568)($at) /* EEF38C 8024228C 00400008 */ jr $v0 /* EEF390 80242290 00000000 */ nop +glabel L80242294_EEF394 /* EEF394 80242294 02A0202D */ daddu $a0, $s5, $zero /* EEF398 80242298 0200282D */ daddu $a1, $s0, $zero /* EEF39C 8024229C 0C090394 */ jal func_80240E50_EEDF50 /* EEF3A0 802422A0 0260302D */ daddu $a2, $s3, $zero +glabel L802422A4_EEF3A4 /* EEF3A4 802422A4 02A0202D */ daddu $a0, $s5, $zero /* EEF3A8 802422A8 0200282D */ daddu $a1, $s0, $zero /* EEF3AC 802422AC 0C090400 */ jal func_80241000_EEE100 /* EEF3B0 802422B0 0260302D */ daddu $a2, $s3, $zero /* EEF3B4 802422B4 080908D4 */ j .L80242350 /* EEF3B8 802422B8 0000102D */ daddu $v0, $zero, $zero +glabel L802422BC_EEF3BC /* EEF3BC 802422BC 02A0202D */ daddu $a0, $s5, $zero /* EEF3C0 802422C0 0200282D */ daddu $a1, $s0, $zero /* EEF3C4 802422C4 0C09058A */ jal func_80241628_EEE728 /* EEF3C8 802422C8 0260302D */ daddu $a2, $s3, $zero +glabel L802422CC_EEF3CC /* EEF3CC 802422CC 02A0202D */ daddu $a0, $s5, $zero /* EEF3D0 802422D0 0200282D */ daddu $a1, $s0, $zero /* EEF3D4 802422D4 0C0905BA */ jal func_802416E8_EEE7E8 /* EEF3D8 802422D8 0260302D */ daddu $a2, $s3, $zero /* EEF3DC 802422DC 080908D4 */ j .L80242350 /* EEF3E0 802422E0 0000102D */ daddu $v0, $zero, $zero +glabel L802422E4_EEF3E4 /* EEF3E4 802422E4 02A0202D */ daddu $a0, $s5, $zero /* EEF3E8 802422E8 0200282D */ daddu $a1, $s0, $zero /* EEF3EC 802422EC 0C09068B */ jal func_80241A2C_EEEB2C /* EEF3F0 802422F0 0260302D */ daddu $a2, $s3, $zero +glabel L802422F4_EEF3F4 /* EEF3F4 802422F4 02A0202D */ daddu $a0, $s5, $zero /* EEF3F8 802422F8 0200282D */ daddu $a1, $s0, $zero /* EEF3FC 802422FC 0C0906A9 */ jal func_80241AA4_EEEBA4 /* EEF400 80242300 0260302D */ daddu $a2, $s3, $zero /* EEF404 80242304 080908D4 */ j .L80242350 /* EEF408 80242308 0000102D */ daddu $v0, $zero, $zero +glabel L8024230C_EEF40C /* EEF40C 8024230C 02A0202D */ daddu $a0, $s5, $zero /* EEF410 80242310 0200282D */ daddu $a1, $s0, $zero /* EEF414 80242314 0C0906C4 */ jal func_80241B10_EEEC10 /* EEF418 80242318 0260302D */ daddu $a2, $s3, $zero /* EEF41C 8024231C 080908D4 */ j .L80242350 /* EEF420 80242320 0000102D */ daddu $v0, $zero, $zero +glabel L80242324_EEF424 /* EEF424 80242324 02A0202D */ daddu $a0, $s5, $zero /* EEF428 80242328 0200282D */ daddu $a1, $s0, $zero /* EEF42C 8024232C 0C090711 */ jal func_80241C44_EEED44 /* EEF430 80242330 0260302D */ daddu $a2, $s3, $zero /* EEF434 80242334 080908D4 */ j .L80242350 /* EEF438 80242338 0000102D */ daddu $v0, $zero, $zero +glabel L8024233C_EEF43C /* EEF43C 8024233C 02A0202D */ daddu $a0, $s5, $zero /* EEF440 80242340 0200282D */ daddu $a1, $s0, $zero /* EEF444 80242344 0C09072A */ jal func_80241CA8_EEEDA8 /* EEF448 80242348 0260302D */ daddu $a2, $s3, $zero .L8024234C: +glabel L8024234C_EEF44C /* EEF44C 8024234C 0000102D */ daddu $v0, $zero, $zero .L80242350: /* EEF450 80242350 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/code_EEDF50/func_80242780_EEF880.s b/asm/nonmatchings/code_EEDF50/func_80242780_EEF880.s index cf634aa90c..5f343539ff 100644 --- a/asm/nonmatchings/code_EEDF50/func_80242780_EEF880.s +++ b/asm/nonmatchings/code_EEDF50/func_80242780_EEF880.s @@ -78,56 +78,66 @@ glabel func_80242780_EEF880 /* EEF99C 8024289C 2C620015 */ sltiu $v0, $v1, 0x15 /* EEF9A0 802428A0 10400032 */ beqz $v0, .L8024296C /* EEF9A4 802428A4 00031080 */ sll $v0, $v1, 2 -/* EEF9A8 802428A8 3C018024 */ lui $at, %hi(D_802454B0) +/* EEF9A8 802428A8 3C018024 */ lui $at, %hi(jtbl_802454B0_EF25B0) /* EEF9AC 802428AC 00220821 */ addu $at, $at, $v0 -/* EEF9B0 802428B0 8C2254B0 */ lw $v0, %lo(D_802454B0)($at) +/* EEF9B0 802428B0 8C2254B0 */ lw $v0, %lo(jtbl_802454B0_EF25B0)($at) /* EEF9B4 802428B4 00400008 */ jr $v0 /* EEF9B8 802428B8 00000000 */ nop +glabel L802428BC_EEF9BC /* EEF9BC 802428BC 0280202D */ daddu $a0, $s4, $zero /* EEF9C0 802428C0 0200282D */ daddu $a1, $s0, $zero /* EEF9C4 802428C4 0C090394 */ jal func_80240E50_EEDF50 /* EEF9C8 802428C8 0260302D */ daddu $a2, $s3, $zero +glabel L802428CC_EEF9CC /* EEF9CC 802428CC 0280202D */ daddu $a0, $s4, $zero /* EEF9D0 802428D0 0200282D */ daddu $a1, $s0, $zero /* EEF9D4 802428D4 0C090400 */ jal func_80241000_EEE100 /* EEF9D8 802428D8 0260302D */ daddu $a2, $s3, $zero /* EEF9DC 802428DC 08090A5C */ j .L80242970 /* EEF9E0 802428E0 0000102D */ daddu $v0, $zero, $zero +glabel L802428E4_EEF9E4 /* EEF9E4 802428E4 0280202D */ daddu $a0, $s4, $zero /* EEF9E8 802428E8 0200282D */ daddu $a1, $s0, $zero /* EEF9EC 802428EC 0C09058A */ jal func_80241628_EEE728 /* EEF9F0 802428F0 0260302D */ daddu $a2, $s3, $zero +glabel L802428F4_EEF9F4 /* EEF9F4 802428F4 0280202D */ daddu $a0, $s4, $zero /* EEF9F8 802428F8 0200282D */ daddu $a1, $s0, $zero /* EEF9FC 802428FC 0C0905BA */ jal func_802416E8_EEE7E8 /* EEFA00 80242900 0260302D */ daddu $a2, $s3, $zero /* EEFA04 80242904 08090A5C */ j .L80242970 /* EEFA08 80242908 0000102D */ daddu $v0, $zero, $zero +glabel L8024290C_EEFA0C /* EEFA0C 8024290C 0280202D */ daddu $a0, $s4, $zero /* EEFA10 80242910 0200282D */ daddu $a1, $s0, $zero /* EEFA14 80242914 0C09068B */ jal func_80241A2C_EEEB2C /* EEFA18 80242918 0260302D */ daddu $a2, $s3, $zero +glabel L8024291C_EEFA1C /* EEFA1C 8024291C 0280202D */ daddu $a0, $s4, $zero /* EEFA20 80242920 0200282D */ daddu $a1, $s0, $zero /* EEFA24 80242924 0C0906A9 */ jal func_80241AA4_EEEBA4 /* EEFA28 80242928 0260302D */ daddu $a2, $s3, $zero /* EEFA2C 8024292C 08090A5C */ j .L80242970 /* EEFA30 80242930 0000102D */ daddu $v0, $zero, $zero +glabel L80242934_EEFA34 /* EEFA34 80242934 0280202D */ daddu $a0, $s4, $zero /* EEFA38 80242938 0200282D */ daddu $a1, $s0, $zero /* EEFA3C 8024293C 0C0908DD */ jal func_80242374_EEF474 /* EEFA40 80242940 0260302D */ daddu $a2, $s3, $zero +glabel L80242944_EEFA44 /* EEFA44 80242944 0280202D */ daddu $a0, $s4, $zero /* EEFA48 80242948 0200282D */ daddu $a1, $s0, $zero /* EEFA4C 8024294C 0C090929 */ jal func_802424A4_EEF5A4 /* EEFA50 80242950 0260302D */ daddu $a2, $s3, $zero /* EEFA54 80242954 08090A5C */ j .L80242970 /* EEFA58 80242958 0000102D */ daddu $v0, $zero, $zero +glabel L8024295C_EEFA5C /* EEFA5C 8024295C 0280202D */ daddu $a0, $s4, $zero /* EEFA60 80242960 0200282D */ daddu $a1, $s0, $zero /* EEFA64 80242964 0C0909C9 */ jal func_80242724_EEF824 /* EEFA68 80242968 0260302D */ daddu $a2, $s3, $zero .L8024296C: +glabel L8024296C_EEFA6C /* EEFA6C 8024296C 0000102D */ daddu $v0, $zero, $zero .L80242970: /* EEFA70 80242970 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/code_EF2610/func_80240000_EF2610.s b/asm/nonmatchings/code_EF2610/func_80240000_EF2610.s index 4ace432f51..cf17caeb2e 100644 --- a/asm/nonmatchings/code_EF2610/func_80240000_EF2610.s +++ b/asm/nonmatchings/code_EF2610/func_80240000_EF2610.s @@ -15,6 +15,6 @@ glabel func_80240000_EF2610 /* EF2638 80240028 24020002 */ addiu $v0, $zero, 2 /* EF263C 8024002C 03E00008 */ jr $ra /* EF2640 80240030 27BD0020 */ addiu $sp, $sp, 0x20 -/* EF2644 80240034 00000000 */ nop -/* EF2648 80240038 00000000 */ nop -/* EF264C 8024003C 00000000 */ nop +/* EF2644 80240034 00000000 */ nop +/* EF2648 80240038 00000000 */ nop +/* EF264C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/code_EF2680/func_80240848_EF2E58.s b/asm/nonmatchings/code_EF2680/func_80240848_EF2E58.s index 9ae482182a..2feb87aae1 100644 --- a/asm/nonmatchings/code_EF2680/func_80240848_EF2E58.s +++ b/asm/nonmatchings/code_EF2680/func_80240848_EF2E58.s @@ -30,7 +30,7 @@ glabel func_80240848_EF2E58 /* EF2EBC 802408AC A603008E */ sh $v1, 0x8e($s0) /* EF2EC0 802408B0 C60C000C */ lwc1 $f12, 0xc($s0) /* EF2EC4 802408B4 44820000 */ mtc1 $v0, $f0 -/* EF2EC8 802408B8 00000000 */ nop +/* EF2EC8 802408B8 00000000 */ nop /* EF2ECC 802408BC 46800020 */ cvt.s.w $f0, $f0 /* EF2ED0 802408C0 46006300 */ add.s $f12, $f12, $f0 /* EF2ED4 802408C4 3C0142B4 */ lui $at, 0x42b4 diff --git a/asm/nonmatchings/code_EF2680/func_80240908_EF2F18.s b/asm/nonmatchings/code_EF2680/func_80240908_EF2F18.s index 336d390d54..1c442bcc8a 100644 --- a/asm/nonmatchings/code_EF2680/func_80240908_EF2F18.s +++ b/asm/nonmatchings/code_EF2680/func_80240908_EF2F18.s @@ -42,11 +42,11 @@ glabel func_80240908_EF2F18 .L8024099C: /* EF2FAC 8024099C 8E220070 */ lw $v0, 0x70($s1) /* EF2FB0 802409A0 18400034 */ blez $v0, .L80240A74 -/* EF2FB4 802409A4 00000000 */ nop +/* EF2FB4 802409A4 00000000 */ nop /* EF2FB8 802409A8 C62C0074 */ lwc1 $f12, 0x74($s1) /* EF2FBC 802409AC 46806320 */ cvt.s.w $f12, $f12 /* EF2FC0 802409B0 44820000 */ mtc1 $v0, $f0 -/* EF2FC4 802409B4 00000000 */ nop +/* EF2FC4 802409B4 00000000 */ nop /* EF2FC8 802409B8 46800020 */ cvt.s.w $f0, $f0 /* EF2FCC 802409BC 46000021 */ cvt.d.s $f0, $f0 /* EF2FD0 802409C0 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_80240908_EF2F18 /* EF3030 80240A20 27A70030 */ addiu $a3, $sp, 0x30 .L80240A24: /* EF3034 80240A24 10400007 */ beqz $v0, .L80240A44 -/* EF3038 80240A28 00000000 */ nop +/* EF3038 80240A28 00000000 */ nop /* EF303C 80240A2C 4616A082 */ mul.s $f2, $f20, $f22 -/* EF3040 80240A30 00000000 */ nop +/* EF3040 80240A30 00000000 */ nop /* EF3044 80240A34 C7A0002C */ lwc1 $f0, 0x2c($sp) /* EF3048 80240A38 46180000 */ add.s $f0, $f0, $f24 /* EF304C 80240A3C 08090294 */ j .L80240A50 /* EF3050 80240A40 46020000 */ add.s $f0, $f0, $f2 .L80240A44: /* EF3054 80240A44 4616A002 */ mul.s $f0, $f20, $f22 -/* EF3058 80240A48 00000000 */ nop +/* EF3058 80240A48 00000000 */ nop /* EF305C 80240A4C 4600D000 */ add.s $f0, $f26, $f0 .L80240A50: /* EF3060 80240A50 E600003C */ swc1 $f0, 0x3c($s0) /* EF3064 80240A54 8E220074 */ lw $v0, 0x74($s1) /* EF3068 80240A58 2442000A */ addiu $v0, $v0, 0xa /* EF306C 80240A5C 44826000 */ mtc1 $v0, $f12 -/* EF3070 80240A60 00000000 */ nop +/* EF3070 80240A60 00000000 */ nop /* EF3074 80240A64 0C00AB85 */ jal func_8002AE14 /* EF3078 80240A68 46806320 */ cvt.s.w $f12, $f12 /* EF307C 80240A6C 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_80240908_EF2F18 /* EF3090 80240A80 860200A8 */ lh $v0, 0xa8($s0) /* EF3094 80240A84 C600003C */ lwc1 $f0, 0x3c($s0) /* EF3098 80240A88 44821000 */ mtc1 $v0, $f2 -/* EF309C 80240A8C 00000000 */ nop +/* EF309C 80240A8C 00000000 */ nop /* EF30A0 80240A90 468010A0 */ cvt.s.w $f2, $f2 /* EF30A4 80240A94 3C028010 */ lui $v0, %hi(D_800FFC90) /* EF30A8 80240A98 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) @@ -118,7 +118,7 @@ glabel func_80240908_EF2F18 /* EF30C4 80240AB4 46240000 */ add.d $f0, $f0, $f4 /* EF30C8 80240AB8 460010A1 */ cvt.d.s $f2, $f2 /* EF30CC 80240ABC 4620103C */ c.lt.d $f2, $f0 -/* EF30D0 80240AC0 00000000 */ nop +/* EF30D0 80240AC0 00000000 */ nop /* EF30D4 80240AC4 4500002E */ bc1f .L80240B80 /* EF30D8 80240AC8 0280202D */ daddu $a0, $s4, $zero /* EF30DC 80240ACC 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_80240908_EF2F18 /* EF311C 80240B0C 3C01C1A0 */ lui $at, 0xc1a0 /* EF3120 80240B10 44812000 */ mtc1 $at, $f4 /* EF3124 80240B14 44834000 */ mtc1 $v1, $f8 -/* EF3128 80240B18 00000000 */ nop +/* EF3128 80240B18 00000000 */ nop /* EF312C 80240B1C 46804220 */ cvt.s.w $f8, $f8 /* EF3130 80240B20 44074000 */ mfc1 $a3, $f8 /* EF3134 80240B24 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_80240908_EF2F18 .L80240B80: /* EF3190 80240B80 8602008C */ lh $v0, 0x8c($s0) /* EF3194 80240B84 14400025 */ bnez $v0, .L80240C1C -/* EF3198 80240B88 00000000 */ nop +/* EF3198 80240B88 00000000 */ nop /* EF319C 80240B8C 8602008E */ lh $v0, 0x8e($s0) /* EF31A0 80240B90 1C400022 */ bgtz $v0, .L80240C1C -/* EF31A4 80240B94 00000000 */ nop +/* EF31A4 80240B94 00000000 */ nop /* EF31A8 80240B98 8E620074 */ lw $v0, 0x74($s3) /* EF31AC 80240B9C 2442FFFF */ addiu $v0, $v0, -1 /* EF31B0 80240BA0 1840001D */ blez $v0, .L80240C18 @@ -183,7 +183,7 @@ glabel func_80240908_EF2F18 /* EF31BC 80240BAC 9442002A */ lhu $v0, 0x2a($v0) /* EF31C0 80240BB0 30420010 */ andi $v0, $v0, 0x10 /* EF31C4 80240BB4 14400007 */ bnez $v0, .L80240BD4 -/* EF31C8 80240BB8 00000000 */ nop +/* EF31C8 80240BB8 00000000 */ nop /* EF31CC 80240BBC C600000C */ lwc1 $f0, 0xc($s0) /* EF31D0 80240BC0 3C014334 */ lui $at, 0x4334 /* EF31D4 80240BC4 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/code_EF2680/func_80240D30_EF3340.s b/asm/nonmatchings/code_EF2680/func_80240D30_EF3340.s index a81ad579cd..7c96b74314 100644 --- a/asm/nonmatchings/code_EF2680/func_80240D30_EF3340.s +++ b/asm/nonmatchings/code_EF2680/func_80240D30_EF3340.s @@ -60,18 +60,18 @@ glabel func_80240D30_EF3340 /* EF3418 80240E08 C6200038 */ lwc1 $f0, 0x38($s1) /* EF341C 80240E0C 4600018D */ trunc.w.s $f6, $f0 /* EF3420 80240E10 44023000 */ mfc1 $v0, $f6 -/* EF3424 80240E14 00000000 */ nop +/* EF3424 80240E14 00000000 */ nop /* EF3428 80240E18 A6420010 */ sh $v0, 0x10($s2) /* EF342C 80240E1C C620003C */ lwc1 $f0, 0x3c($s1) /* EF3430 80240E20 4600018D */ trunc.w.s $f6, $f0 /* EF3434 80240E24 44023000 */ mfc1 $v0, $f6 -/* EF3438 80240E28 00000000 */ nop +/* EF3438 80240E28 00000000 */ nop /* EF343C 80240E2C A6420012 */ sh $v0, 0x12($s2) /* EF3440 80240E30 C6200040 */ lwc1 $f0, 0x40($s1) /* EF3444 80240E34 A2430007 */ sb $v1, 7($s2) /* EF3448 80240E38 4600018D */ trunc.w.s $f6, $f0 /* EF344C 80240E3C 44023000 */ mfc1 $v0, $f6 -/* EF3450 80240E40 00000000 */ nop +/* EF3450 80240E40 00000000 */ nop /* EF3454 80240E44 A6420014 */ sh $v0, 0x14($s2) .L80240E48: /* EF3458 80240E48 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/code_EF2680/func_80240EC8_EF34D8.s b/asm/nonmatchings/code_EF2680/func_80240EC8_EF34D8.s index 8658cc64b9..8d65b46d8d 100644 --- a/asm/nonmatchings/code_EF2680/func_80240EC8_EF34D8.s +++ b/asm/nonmatchings/code_EF2680/func_80240EC8_EF34D8.s @@ -42,9 +42,9 @@ glabel func_80240EC8_EF34D8 /* EF356C 80240F5C 44801800 */ mtc1 $zero, $f3 /* EF3570 80240F60 46002021 */ cvt.d.s $f0, $f4 /* EF3574 80240F64 4620103E */ c.le.d $f2, $f0 -/* EF3578 80240F68 00000000 */ nop +/* EF3578 80240F68 00000000 */ nop /* EF357C 80240F6C 45000030 */ bc1f .L80241030 -/* EF3580 80240F70 00000000 */ nop +/* EF3580 80240F70 00000000 */ nop /* EF3584 80240F74 C600003C */ lwc1 $f0, 0x3c($s0) /* EF3588 80240F78 46040000 */ add.s $f0, $f0, $f4 /* EF358C 80240F7C E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_80240EC8_EF34D8 /* EF35EC 80240FDC 27A70020 */ addiu $a3, $sp, 0x20 .L80240FE0: /* EF35F0 80240FE0 1040000B */ beqz $v0, .L80241010 -/* EF35F4 80240FE4 00000000 */ nop +/* EF35F4 80240FE4 00000000 */ nop /* EF35F8 80240FE8 C7A0001C */ lwc1 $f0, 0x1c($sp) /* EF35FC 80240FEC 46140080 */ add.s $f2, $f0, $f20 /* EF3600 80240FF0 C600003C */ lwc1 $f0, 0x3c($s0) /* EF3604 80240FF4 4600103E */ c.le.s $f2, $f0 -/* EF3608 80240FF8 00000000 */ nop +/* EF3608 80240FF8 00000000 */ nop /* EF360C 80240FFC 4500008D */ bc1f .L80241234 -/* EF3610 80241000 00000000 */ nop +/* EF3610 80241000 00000000 */ nop /* EF3614 80241004 E602003C */ swc1 $f2, 0x3c($s0) /* EF3618 80241008 0809048D */ j .L80241234 /* EF361C 8024100C AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_80240EC8_EF34D8 /* EF3620 80241010 C602003C */ lwc1 $f2, 0x3c($s0) /* EF3624 80241014 C6000064 */ lwc1 $f0, 0x64($s0) /* EF3628 80241018 4602003E */ c.le.s $f0, $f2 -/* EF362C 8024101C 00000000 */ nop +/* EF362C 8024101C 00000000 */ nop /* EF3630 80241020 45030084 */ bc1tl .L80241234 /* EF3634 80241024 AE400070 */ sw $zero, 0x70($s2) /* EF3638 80241028 0809048D */ j .L80241234 -/* EF363C 8024102C 00000000 */ nop +/* EF363C 8024102C 00000000 */ nop .L80241030: /* EF3640 80241030 4622003C */ c.lt.d $f0, $f2 -/* EF3644 80241034 00000000 */ nop +/* EF3644 80241034 00000000 */ nop /* EF3648 80241038 4500007E */ bc1f .L80241234 -/* EF364C 8024103C 00000000 */ nop +/* EF364C 8024103C 00000000 */ nop /* EF3650 80241040 9602008E */ lhu $v0, 0x8e($s0) /* EF3654 80241044 24420001 */ addiu $v0, $v0, 1 /* EF3658 80241048 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_80240EC8_EF34D8 /* EF3664 80241054 00021403 */ sra $v0, $v0, 0x10 /* EF3668 80241058 0043102A */ slt $v0, $v0, $v1 /* EF366C 8024105C 14400026 */ bnez $v0, .L802410F8 -/* EF3670 80241060 00000000 */ nop +/* EF3670 80241060 00000000 */ nop /* EF3674 80241064 C60C0038 */ lwc1 $f12, 0x38($s0) /* EF3678 80241068 C60E0040 */ lwc1 $f14, 0x40($s0) /* EF367C 8024106C 3C028010 */ lui $v0, %hi(D_800FFC90) @@ -124,20 +124,20 @@ glabel func_80240EC8_EF34D8 /* EF36A8 80241098 8E62001C */ lw $v0, 0x1c($s3) /* EF36AC 8024109C 46001005 */ abs.s $f0, $f2 /* EF36B0 802410A0 44822000 */ mtc1 $v0, $f4 -/* EF36B4 802410A4 00000000 */ nop +/* EF36B4 802410A4 00000000 */ nop /* EF36B8 802410A8 46802120 */ cvt.s.w $f4, $f4 /* EF36BC 802410AC 4600203C */ c.lt.s $f4, $f0 -/* EF36C0 802410B0 00000000 */ nop +/* EF36C0 802410B0 00000000 */ nop /* EF36C4 802410B4 4500000D */ bc1f .L802410EC -/* EF36C8 802410B8 00000000 */ nop +/* EF36C8 802410B8 00000000 */ nop /* EF36CC 802410BC 44800000 */ mtc1 $zero, $f0 /* EF36D0 802410C0 C614000C */ lwc1 $f20, 0xc($s0) /* EF36D4 802410C4 4600103C */ c.lt.s $f2, $f0 -/* EF36D8 802410C8 00000000 */ nop +/* EF36D8 802410C8 00000000 */ nop /* EF36DC 802410CC 45000006 */ bc1f .L802410E8 /* EF36E0 802410D0 00021023 */ negu $v0, $v0 /* EF36E4 802410D4 44820000 */ mtc1 $v0, $f0 -/* EF36E8 802410D8 00000000 */ nop +/* EF36E8 802410D8 00000000 */ nop /* EF36EC 802410DC 46800020 */ cvt.s.w $f0, $f0 /* EF36F0 802410E0 0809043B */ j .L802410EC /* EF36F4 802410E4 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_80240EC8_EF34D8 /* EF371C 8024110C C600001C */ lwc1 $f0, 0x1c($s0) /* EF3720 80241110 46001080 */ add.s $f2, $f2, $f0 /* EF3724 80241114 4616103C */ c.lt.s $f2, $f22 -/* EF3728 80241118 00000000 */ nop +/* EF3728 80241118 00000000 */ nop /* EF372C 8024111C 45020045 */ bc1fl .L80241234 /* EF3730 80241120 E602003C */ swc1 $f2, 0x3c($s0) /* EF3734 80241124 0809048C */ j .L80241230 @@ -169,7 +169,7 @@ glabel func_80240EC8_EF34D8 /* EF374C 8024113C C600001C */ lwc1 $f0, 0x1c($s0) /* EF3750 80241140 C604003C */ lwc1 $f4, 0x3c($s0) /* EF3754 80241144 44821000 */ mtc1 $v0, $f2 -/* EF3758 80241148 00000000 */ nop +/* EF3758 80241148 00000000 */ nop /* EF375C 8024114C 468010A0 */ cvt.s.w $f2, $f2 /* EF3760 80241150 46000005 */ abs.s $f0, $f0 /* EF3764 80241154 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_80240EC8_EF34D8 /* EF37A0 80241190 0C03908F */ jal func_800E423C /* EF37A4 80241194 27A70020 */ addiu $a3, $sp, 0x20 /* EF37A8 80241198 10400015 */ beqz $v0, .L802411F0 -/* EF37AC 8024119C 00000000 */ nop +/* EF37AC 8024119C 00000000 */ nop /* EF37B0 802411A0 860200A8 */ lh $v0, 0xa8($s0) /* EF37B4 802411A4 C604001C */ lwc1 $f4, 0x1c($s0) /* EF37B8 802411A8 44820000 */ mtc1 $v0, $f0 -/* EF37BC 802411AC 00000000 */ nop +/* EF37BC 802411AC 00000000 */ nop /* EF37C0 802411B0 46800020 */ cvt.s.w $f0, $f0 /* EF37C4 802411B4 46002085 */ abs.s $f2, $f4 /* EF37C8 802411B8 46020000 */ add.s $f0, $f0, $f2 /* EF37CC 802411BC C7A20024 */ lwc1 $f2, 0x24($sp) /* EF37D0 802411C0 4600103E */ c.le.s $f2, $f0 -/* EF37D4 802411C4 00000000 */ nop +/* EF37D4 802411C4 00000000 */ nop /* EF37D8 802411C8 45000005 */ bc1f .L802411E0 -/* EF37DC 802411CC 00000000 */ nop +/* EF37DC 802411CC 00000000 */ nop /* EF37E0 802411D0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* EF37E4 802411D4 AE00001C */ sw $zero, 0x1c($s0) /* EF37E8 802411D8 0809048D */ j .L80241234 @@ -217,13 +217,13 @@ glabel func_80240EC8_EF34D8 /* EF3804 802411F4 860200A8 */ lh $v0, 0xa8($s0) /* EF3808 802411F8 46163081 */ sub.s $f2, $f6, $f22 /* EF380C 802411FC 44820000 */ mtc1 $v0, $f0 -/* EF3810 80241200 00000000 */ nop +/* EF3810 80241200 00000000 */ nop /* EF3814 80241204 46800020 */ cvt.s.w $f0, $f0 /* EF3818 80241208 46001080 */ add.s $f2, $f2, $f0 /* EF381C 8024120C C604001C */ lwc1 $f4, 0x1c($s0) /* EF3820 80241210 46002005 */ abs.s $f0, $f4 /* EF3824 80241214 4602003C */ c.lt.s $f0, $f2 -/* EF3828 80241218 00000000 */ nop +/* EF3828 80241218 00000000 */ nop /* EF382C 8024121C 45020005 */ bc1fl .L80241234 /* EF3830 80241220 AE00001C */ sw $zero, 0x1c($s0) /* EF3834 80241224 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/code_EF2680/func_8024137C_EF398C.s b/asm/nonmatchings/code_EF2680/func_8024137C_EF398C.s index a958e48762..7a6b9c5919 100644 --- a/asm/nonmatchings/code_EF2680/func_8024137C_EF398C.s +++ b/asm/nonmatchings/code_EF2680/func_8024137C_EF398C.s @@ -77,58 +77,68 @@ glabel func_8024137C_EF398C /* EF3AA4 80241494 2C62000F */ sltiu $v0, $v1, 0xf /* EF3AA8 80241498 10400034 */ beqz $v0, .L8024156C /* EF3AAC 8024149C 00031080 */ sll $v0, $v1, 2 -/* EF3AB0 802414A0 3C018024 */ lui $at, %hi(D_802453C8) +/* EF3AB0 802414A0 3C018024 */ lui $at, %hi(jtbl_802453C8_EF79D8) /* EF3AB4 802414A4 00220821 */ addu $at, $at, $v0 -/* EF3AB8 802414A8 8C2253C8 */ lw $v0, %lo(D_802453C8)($at) +/* EF3AB8 802414A8 8C2253C8 */ lw $v0, %lo(jtbl_802453C8_EF79D8)($at) /* EF3ABC 802414AC 00400008 */ jr $v0 /* EF3AC0 802414B0 00000000 */ nop +glabel L802414B4_EF3AC4 /* EF3AC4 802414B4 02A0202D */ daddu $a0, $s5, $zero /* EF3AC8 802414B8 0200282D */ daddu $a1, $s0, $zero /* EF3ACC 802414BC 0C09001C */ jal func_80240070_EF2680 /* EF3AD0 802414C0 0260302D */ daddu $a2, $s3, $zero +glabel L802414C4_EF3AD4 /* EF3AD4 802414C4 02A0202D */ daddu $a0, $s5, $zero /* EF3AD8 802414C8 0200282D */ daddu $a1, $s0, $zero /* EF3ADC 802414CC 0C090088 */ jal func_80240220_EF2830 /* EF3AE0 802414D0 0260302D */ daddu $a2, $s3, $zero /* EF3AE4 802414D4 0809055C */ j .L80241570 /* EF3AE8 802414D8 0000102D */ daddu $v0, $zero, $zero +glabel L802414DC_EF3AEC /* EF3AEC 802414DC 02A0202D */ daddu $a0, $s5, $zero /* EF3AF0 802414E0 0200282D */ daddu $a1, $s0, $zero /* EF3AF4 802414E4 0C090212 */ jal func_80240848_EF2E58 /* EF3AF8 802414E8 0260302D */ daddu $a2, $s3, $zero +glabel L802414EC_EF3AFC /* EF3AFC 802414EC 02A0202D */ daddu $a0, $s5, $zero /* EF3B00 802414F0 0200282D */ daddu $a1, $s0, $zero /* EF3B04 802414F4 0C090242 */ jal func_80240908_EF2F18 /* EF3B08 802414F8 0260302D */ daddu $a2, $s3, $zero /* EF3B0C 802414FC 0809055C */ j .L80241570 /* EF3B10 80241500 0000102D */ daddu $v0, $zero, $zero +glabel L80241504_EF3B14 /* EF3B14 80241504 02A0202D */ daddu $a0, $s5, $zero /* EF3B18 80241508 0200282D */ daddu $a1, $s0, $zero /* EF3B1C 8024150C 0C090313 */ jal func_80240C4C_EF325C /* EF3B20 80241510 0260302D */ daddu $a2, $s3, $zero +glabel L80241514_EF3B24 /* EF3B24 80241514 02A0202D */ daddu $a0, $s5, $zero /* EF3B28 80241518 0200282D */ daddu $a1, $s0, $zero /* EF3B2C 8024151C 0C090331 */ jal func_80240CC4_EF32D4 /* EF3B30 80241520 0260302D */ daddu $a2, $s3, $zero /* EF3B34 80241524 0809055C */ j .L80241570 /* EF3B38 80241528 0000102D */ daddu $v0, $zero, $zero +glabel L8024152C_EF3B3C /* EF3B3C 8024152C 02A0202D */ daddu $a0, $s5, $zero /* EF3B40 80241530 0200282D */ daddu $a1, $s0, $zero /* EF3B44 80241534 0C09034C */ jal func_80240D30_EF3340 /* EF3B48 80241538 0260302D */ daddu $a2, $s3, $zero /* EF3B4C 8024153C 0809055C */ j .L80241570 /* EF3B50 80241540 0000102D */ daddu $v0, $zero, $zero +glabel L80241544_EF3B54 /* EF3B54 80241544 02A0202D */ daddu $a0, $s5, $zero /* EF3B58 80241548 0200282D */ daddu $a1, $s0, $zero /* EF3B5C 8024154C 0C090399 */ jal func_80240E64_EF3474 /* EF3B60 80241550 0260302D */ daddu $a2, $s3, $zero /* EF3B64 80241554 0809055C */ j .L80241570 /* EF3B68 80241558 0000102D */ daddu $v0, $zero, $zero +glabel L8024155C_EF3B6C /* EF3B6C 8024155C 02A0202D */ daddu $a0, $s5, $zero /* EF3B70 80241560 0200282D */ daddu $a1, $s0, $zero /* EF3B74 80241564 0C0903B2 */ jal func_80240EC8_EF34D8 /* EF3B78 80241568 0260302D */ daddu $a2, $s3, $zero .L8024156C: +glabel L8024156C_EF3B7C /* EF3B7C 8024156C 0000102D */ daddu $v0, $zero, $zero .L80241570: /* EF3B80 80241570 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/code_EF2680/func_80241C90_EF42A0.s b/asm/nonmatchings/code_EF2680/func_80241C90_EF42A0.s index 9906915921..8e7033556b 100644 --- a/asm/nonmatchings/code_EF2680/func_80241C90_EF42A0.s +++ b/asm/nonmatchings/code_EF2680/func_80241C90_EF42A0.s @@ -68,7 +68,7 @@ glabel func_80241C90_EF42A0 /* EF4398 80241D88 8E6300B0 */ lw $v1, 0xb0($s3) /* EF439C 80241D8C 30620004 */ andi $v0, $v1, 4 /* EF43A0 80241D90 10400007 */ beqz $v0, .L80241DB0 -/* EF43A4 80241D94 00000000 */ nop +/* EF43A4 80241D94 00000000 */ nop /* EF43A8 80241D98 826200B4 */ lb $v0, 0xb4($s3) /* EF43AC 80241D9C 144000F4 */ bnez $v0, .L80242170 /* EF43B0 80241DA0 0000102D */ daddu $v0, $zero, $zero @@ -85,14 +85,14 @@ glabel func_80241C90_EF42A0 /* EF43D8 80241DC8 10600009 */ beqz $v1, .L80241DF0 /* EF43DC 80241DCC 2402000C */ addiu $v0, $zero, 0xc /* EF43E0 80241DD0 08090790 */ j .L80241E40 -/* EF43E4 80241DD4 00000000 */ nop +/* EF43E4 80241DD4 00000000 */ nop .L80241DD8: /* EF43E8 80241DD8 1062000F */ beq $v1, $v0, .L80241E18 /* EF43EC 80241DDC 24020003 */ addiu $v0, $zero, 3 /* EF43F0 80241DE0 10620012 */ beq $v1, $v0, .L80241E2C /* EF43F4 80241DE4 0280202D */ daddu $a0, $s4, $zero /* EF43F8 80241DE8 0809078E */ j .L80241E38 -/* EF43FC 80241DEC 00000000 */ nop +/* EF43FC 80241DEC 00000000 */ nop .L80241DF0: /* EF4400 80241DF0 0280202D */ daddu $a0, $s4, $zero /* EF4404 80241DF4 02C0282D */ daddu $a1, $s6, $zero @@ -104,7 +104,7 @@ glabel func_80241C90_EF42A0 /* EF4418 80241E08 0C090577 */ jal func_802415DC_EF3BEC /* EF441C 80241E0C 02A0302D */ daddu $a2, $s5, $zero /* EF4420 80241E10 0809078E */ j .L80241E38 -/* EF4424 80241E14 00000000 */ nop +/* EF4424 80241E14 00000000 */ nop .L80241E18: /* EF4428 80241E18 0280202D */ daddu $a0, $s4, $zero /* EF442C 80241E1C 02C0282D */ daddu $a1, $s6, $zero @@ -120,7 +120,7 @@ glabel func_80241C90_EF42A0 /* EF444C 80241E3C 2402000C */ addiu $v0, $zero, 0xc .L80241E40: /* EF4450 80241E40 1462001A */ bne $v1, $v0, .L80241EAC -/* EF4454 80241E44 00000000 */ nop +/* EF4454 80241E44 00000000 */ nop /* EF4458 80241E48 C64C0038 */ lwc1 $f12, 0x38($s2) /* EF445C 80241E4C 3C028010 */ lui $v0, %hi(D_800FFC90) /* EF4460 80241E50 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) @@ -156,13 +156,13 @@ glabel func_80241C90_EF42A0 /* EF44D4 80241EC4 10620008 */ beq $v1, $v0, .L80241EE8 /* EF44D8 80241EC8 2410001F */ addiu $s0, $zero, 0x1f /* EF44DC 80241ECC 080907C9 */ j .L80241F24 -/* EF44E0 80241ED0 00000000 */ nop +/* EF44E0 80241ED0 00000000 */ nop .L80241ED4: /* EF44E4 80241ED4 2402000E */ addiu $v0, $zero, 0xe /* EF44E8 80241ED8 1062000D */ beq $v1, $v0, .L80241F10 /* EF44EC 80241EDC 0280202D */ daddu $a0, $s4, $zero /* EF44F0 80241EE0 080907C7 */ j .L80241F1C -/* EF44F4 80241EE4 00000000 */ nop +/* EF44F4 80241EE4 00000000 */ nop .L80241EE8: /* EF44F8 80241EE8 0280202D */ daddu $a0, $s4, $zero /* EF44FC 80241EEC 02C0282D */ daddu $a1, $s6, $zero @@ -174,7 +174,7 @@ glabel func_80241C90_EF42A0 /* EF4510 80241F00 0C090399 */ jal func_80240E64_EF3474 /* EF4514 80241F04 02A0302D */ daddu $a2, $s5, $zero /* EF4518 80241F08 080907C7 */ j .L80241F1C -/* EF451C 80241F0C 00000000 */ nop +/* EF451C 80241F0C 00000000 */ nop .L80241F10: /* EF4520 80241F10 02C0282D */ daddu $a1, $s6, $zero /* EF4524 80241F14 0C0903B2 */ jal func_80240EC8_EF34D8 @@ -188,24 +188,24 @@ glabel func_80241C90_EF42A0 /* EF453C 80241F2C 10400005 */ beqz $v0, .L80241F44 /* EF4540 80241F30 2402001E */ addiu $v0, $zero, 0x1e /* EF4544 80241F34 1062000A */ beq $v1, $v0, .L80241F60 -/* EF4548 80241F38 00000000 */ nop +/* EF4548 80241F38 00000000 */ nop /* EF454C 80241F3C 08090804 */ j .L80242010 -/* EF4550 80241F40 00000000 */ nop +/* EF4550 80241F40 00000000 */ nop .L80241F44: /* EF4554 80241F44 24020020 */ addiu $v0, $zero, 0x20 /* EF4558 80241F48 10620022 */ beq $v1, $v0, .L80241FD4 /* EF455C 80241F4C 24020021 */ addiu $v0, $zero, 0x21 /* EF4560 80241F50 10620029 */ beq $v1, $v0, .L80241FF8 -/* EF4564 80241F54 00000000 */ nop +/* EF4564 80241F54 00000000 */ nop /* EF4568 80241F58 08090804 */ j .L80242010 -/* EF456C 80241F5C 00000000 */ nop +/* EF456C 80241F5C 00000000 */ nop .L80241F60: /* EF4570 80241F60 9642008E */ lhu $v0, 0x8e($s2) /* EF4574 80241F64 2442FFFF */ addiu $v0, $v0, -1 /* EF4578 80241F68 A642008E */ sh $v0, 0x8e($s2) /* EF457C 80241F6C 00021400 */ sll $v0, $v0, 0x10 /* EF4580 80241F70 1C400027 */ bgtz $v0, .L80242010 -/* EF4584 80241F74 00000000 */ nop +/* EF4584 80241F74 00000000 */ nop /* EF4588 80241F78 0C010ABD */ jal func_80042AF4 /* EF458C 80241F7C 8E64007C */ lw $a0, 0x7c($s3) /* EF4590 80241F80 24030002 */ addiu $v1, $zero, 2 @@ -293,25 +293,25 @@ glabel func_80241C90_EF42A0 /* EF46C8 802420B8 44800000 */ mtc1 $zero, $f0 /* EF46CC 802420BC 4600A0A1 */ cvt.d.s $f2, $f20 /* EF46D0 802420C0 4622003C */ c.lt.d $f0, $f2 -/* EF46D4 802420C4 00000000 */ nop +/* EF46D4 802420C4 00000000 */ nop /* EF46D8 802420C8 45000029 */ bc1f .L80242170 -/* EF46DC 802420CC 00000000 */ nop +/* EF46DC 802420CC 00000000 */ nop /* EF46E0 802420D0 8642008C */ lh $v0, 0x8c($s2) /* EF46E4 802420D4 54400026 */ bnel $v0, $zero, .L80242170 /* EF46E8 802420D8 0000102D */ daddu $v0, $zero, $zero /* EF46EC 802420DC 3C014034 */ lui $at, 0x4034 /* EF46F0 802420E0 44810800 */ mtc1 $at, $f1 /* EF46F4 802420E4 44800000 */ mtc1 $zero, $f0 -/* EF46F8 802420E8 00000000 */ nop +/* EF46F8 802420E8 00000000 */ nop /* EF46FC 802420EC 46201001 */ sub.d $f0, $f2, $f0 /* EF4700 802420F0 44801000 */ mtc1 $zero, $f2 /* EF4704 802420F4 44801800 */ mtc1 $zero, $f3 /* EF4708 802420F8 46200120 */ cvt.s.d $f4, $f0 /* EF470C 802420FC 46002021 */ cvt.d.s $f0, $f4 /* EF4710 80242100 4622003C */ c.lt.d $f0, $f2 -/* EF4714 80242104 00000000 */ nop +/* EF4714 80242104 00000000 */ nop /* EF4718 80242108 45000002 */ bc1f .L80242114 -/* EF471C 8024210C 00000000 */ nop +/* EF471C 8024210C 00000000 */ nop /* EF4720 80242110 44802000 */ mtc1 $zero, $f4 .L80242114: /* EF4724 80242114 3C014069 */ lui $at, 0x4069 @@ -319,7 +319,7 @@ glabel func_80241C90_EF42A0 /* EF472C 8024211C 44801000 */ mtc1 $zero, $f2 /* EF4730 80242120 46002021 */ cvt.d.s $f0, $f4 /* EF4734 80242124 4620103C */ c.lt.d $f2, $f0 -/* EF4738 80242128 00000000 */ nop +/* EF4738 80242128 00000000 */ nop /* EF473C 8024212C 45000003 */ bc1f .L8024213C /* EF4740 80242130 240200C8 */ addiu $v0, $zero, 0xc8 /* EF4744 80242134 3C014348 */ lui $at, 0x4348 diff --git a/asm/nonmatchings/code_EF2680/func_80242218_EF4828.s b/asm/nonmatchings/code_EF2680/func_80242218_EF4828.s index 1dfb5ed38f..70e3a174e9 100644 --- a/asm/nonmatchings/code_EF2680/func_80242218_EF4828.s +++ b/asm/nonmatchings/code_EF2680/func_80242218_EF4828.s @@ -21,11 +21,11 @@ glabel func_80242218_EF4828 /* EF4868 80242258 A602008E */ sh $v0, 0x8e($s0) /* EF486C 8024225C 00021400 */ sll $v0, $v0, 0x10 /* EF4870 80242260 1C400033 */ bgtz $v0, .L80242330 -/* EF4874 80242264 00000000 */ nop +/* EF4874 80242264 00000000 */ nop .L80242268: /* EF4878 80242268 8602008C */ lh $v0, 0x8c($s0) /* EF487C 8024226C 14400030 */ bnez $v0, .L80242330 -/* EF4880 80242270 00000000 */ nop +/* EF4880 80242270 00000000 */ nop /* EF4884 80242274 8E2200CC */ lw $v0, 0xcc($s1) /* EF4888 80242278 8C420024 */ lw $v0, 0x24($v0) /* EF488C 8024227C AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_80242218_EF4828 /* EF4898 80242288 8E230088 */ lw $v1, 0x88($s1) /* EF489C 8024228C 24020005 */ addiu $v0, $zero, 5 /* EF48A0 80242290 10620005 */ beq $v1, $v0, .L802422A8 -/* EF48A4 80242294 00000000 */ nop +/* EF48A4 80242294 00000000 */ nop /* EF48A8 80242298 10600003 */ beqz $v1, .L802422A8 /* EF48AC 8024229C 24020001 */ addiu $v0, $zero, 1 /* EF48B0 802422A0 14620006 */ bne $v1, $v0, .L802422BC -/* EF48B4 802422A4 00000000 */ nop +/* EF48B4 802422A4 00000000 */ nop .L802422A8: /* EF48B8 802422A8 8E220084 */ lw $v0, 0x84($s1) /* EF48BC 802422AC 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_80242218_EF4828 /* EF48FC 802422EC 46220000 */ add.d $f0, $f0, $f2 /* EF4900 802422F0 4620010D */ trunc.w.d $f4, $f0 /* EF4904 802422F4 44022000 */ mfc1 $v0, $f4 -/* EF4908 802422F8 00000000 */ nop +/* EF4908 802422F8 00000000 */ nop /* EF490C 802422FC A602008E */ sh $v0, 0x8e($s0) /* EF4910 80242300 00021400 */ sll $v0, $v0, 0x10 /* EF4914 80242304 8E230078 */ lw $v1, 0x78($s1) /* EF4918 80242308 00021403 */ sra $v0, $v0, 0x10 /* EF491C 8024230C 0043102A */ slt $v0, $v0, $v1 /* EF4920 80242310 10400003 */ beqz $v0, .L80242320 -/* EF4924 80242314 00000000 */ nop +/* EF4924 80242314 00000000 */ nop /* EF4928 80242318 9622007A */ lhu $v0, 0x7a($s1) /* EF492C 8024231C A602008E */ sh $v0, 0x8e($s0) .L80242320: diff --git a/asm/nonmatchings/code_EF2680/func_80242530_EF4B40.s b/asm/nonmatchings/code_EF2680/func_80242530_EF4B40.s index d7f891b7b3..c4c4201dcc 100644 --- a/asm/nonmatchings/code_EF2680/func_80242530_EF4B40.s +++ b/asm/nonmatchings/code_EF2680/func_80242530_EF4B40.s @@ -290,15 +290,17 @@ glabel func_80242530_EF4B40 /* EF4F58 80242948 2C620015 */ sltiu $v0, $v1, 0x15 /* EF4F5C 8024294C 10400009 */ beqz $v0, .L80242974 /* EF4F60 80242950 00031080 */ sll $v0, $v1, 2 -/* EF4F64 80242954 3C018024 */ lui $at, %hi(D_80245410) +/* EF4F64 80242954 3C018024 */ lui $at, %hi(jtbl_80245410_EF7A20) /* EF4F68 80242958 00220821 */ addu $at, $at, $v0 -/* EF4F6C 8024295C 8C225410 */ lw $v0, %lo(D_80245410)($at) +/* EF4F6C 8024295C 8C225410 */ lw $v0, %lo(jtbl_80245410_EF7A20)($at) /* EF4F70 80242960 00400008 */ jr $v0 /* EF4F74 80242964 00000000 */ nop +glabel L80242968_EF4F78 /* EF4F78 80242968 8E420028 */ lw $v0, 0x28($s2) /* EF4F7C 8024296C 24420001 */ addiu $v0, $v0, 1 /* EF4F80 80242970 AE420028 */ sw $v0, 0x28($s2) .L80242974: +glabel L80242974_EF4F84 /* EF4F84 80242974 0000102D */ daddu $v0, $zero, $zero .L80242978: /* EF4F88 80242978 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/code_EF7FB0/func_80240530_EF7FB0.s b/asm/nonmatchings/code_EF7FB0/func_80240530_EF7FB0.s index 5501498f37..8871bfb0d6 100644 --- a/asm/nonmatchings/code_EF7FB0/func_80240530_EF7FB0.s +++ b/asm/nonmatchings/code_EF7FB0/func_80240530_EF7FB0.s @@ -24,5 +24,5 @@ glabel func_80240530_EF7FB0 /* EF7FFC 8024057C 24020002 */ addiu $v0, $zero, 2 /* EF8000 80240580 03E00008 */ jr $ra /* EF8004 80240584 27BD0018 */ addiu $sp, $sp, 0x18 -/* EF8008 80240588 00000000 */ nop -/* EF800C 8024058C 00000000 */ nop +/* EF8008 80240588 00000000 */ nop +/* EF800C 8024058C 00000000 */ nop diff --git a/asm/nonmatchings/code_EF8010/func_80240590_EF8010.s b/asm/nonmatchings/code_EF8010/func_80240590_EF8010.s index 0f6490f665..5a0ababfe0 100644 --- a/asm/nonmatchings/code_EF8010/func_80240590_EF8010.s +++ b/asm/nonmatchings/code_EF8010/func_80240590_EF8010.s @@ -14,12 +14,12 @@ glabel func_80240590_EF8010 /* EF8034 802405B4 0C01B198 */ jal osGetCause /* EF8038 802405B8 0080802D */ daddu $s0, $a0, $zero /* EF803C 802405BC 4616A582 */ mul.s $f22, $f20, $f22 -/* EF8040 802405C0 00000000 */ nop +/* EF8040 802405C0 00000000 */ nop /* EF8044 802405C4 4618A502 */ mul.s $f20, $f20, $f24 -/* EF8048 802405C8 00000000 */ nop +/* EF8048 802405C8 00000000 */ nop /* EF804C 802405CC 3C013F80 */ lui $at, 0x3f80 /* EF8050 802405D0 44810000 */ mtc1 $at, $f0 -/* EF8054 802405D4 00000000 */ nop +/* EF8054 802405D4 00000000 */ nop /* EF8058 802405D8 E6000014 */ swc1 $f0, 0x14($s0) /* EF805C 802405DC E6160010 */ swc1 $f22, 0x10($s0) /* EF8060 802405E0 E6140018 */ swc1 $f20, 0x18($s0) diff --git a/asm/nonmatchings/code_EF8010/func_80240600_EF8080.s b/asm/nonmatchings/code_EF8010/func_80240600_EF8080.s index 6b42edb237..b67718cdc6 100644 --- a/asm/nonmatchings/code_EF8010/func_80240600_EF8080.s +++ b/asm/nonmatchings/code_EF8010/func_80240600_EF8080.s @@ -119,4 +119,4 @@ glabel func_80240600_EF8080 /* EF8240 802407C0 24020002 */ addiu $v0, $zero, 2 /* EF8244 802407C4 03E00008 */ jr $ra /* EF8248 802407C8 27BD0088 */ addiu $sp, $sp, 0x88 -/* EF824C 802407CC 00000000 */ nop +/* EF824C 802407CC 00000000 */ nop diff --git a/asm/nonmatchings/code_EFEB00/func_80240124_EFEC24.s b/asm/nonmatchings/code_EFEB00/func_80240124_EFEC24.s index 6de3abae8b..cef5ea87b7 100644 --- a/asm/nonmatchings/code_EFEB00/func_80240124_EFEC24.s +++ b/asm/nonmatchings/code_EFEB00/func_80240124_EFEC24.s @@ -14,7 +14,7 @@ glabel func_80240124_EFEC24 .L80240148: /* EFEC48 80240148 8E020070 */ lw $v0, 0x70($s0) /* EFEC4C 8024014C 1440000E */ bnez $v0, .L80240188 -/* EFEC50 80240150 00000000 */ nop +/* EFEC50 80240150 00000000 */ nop /* EFEC54 80240154 8E0300A8 */ lw $v1, 0xa8($s0) /* EFEC58 80240158 8E020088 */ lw $v0, 0x88($s0) /* EFEC5C 8024015C 00621821 */ addu $v1, $v1, $v0 @@ -33,7 +33,7 @@ glabel func_80240124_EFEC24 .L80240188: /* EFEC88 80240188 8E020074 */ lw $v0, 0x74($s0) /* EFEC8C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* EFEC90 80240190 00000000 */ nop +/* EFEC90 80240190 00000000 */ nop /* EFEC94 80240194 8E0300AC */ lw $v1, 0xac($s0) /* EFEC98 80240198 8E02008C */ lw $v0, 0x8c($s0) /* EFEC9C 8024019C 00621821 */ addu $v1, $v1, $v0 @@ -52,7 +52,7 @@ glabel func_80240124_EFEC24 .L802401C8: /* EFECC8 802401C8 8E020078 */ lw $v0, 0x78($s0) /* EFECCC 802401CC 1440000E */ bnez $v0, .L80240208 -/* EFECD0 802401D0 00000000 */ nop +/* EFECD0 802401D0 00000000 */ nop /* EFECD4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) /* EFECD8 802401D8 8E020090 */ lw $v0, 0x90($s0) /* EFECDC 802401DC 00621821 */ addu $v1, $v1, $v0 @@ -71,7 +71,7 @@ glabel func_80240124_EFEC24 .L80240208: /* EFED08 80240208 8E02007C */ lw $v0, 0x7c($s0) /* EFED0C 8024020C 1440000E */ bnez $v0, .L80240248 -/* EFED10 80240210 00000000 */ nop +/* EFED10 80240210 00000000 */ nop /* EFED14 80240214 8E0300B4 */ lw $v1, 0xb4($s0) /* EFED18 80240218 8E020094 */ lw $v0, 0x94($s0) /* EFED1C 8024021C 00621821 */ addu $v1, $v1, $v0 diff --git a/asm/nonmatchings/code_EFEB00/func_80240340_EFEE40.s b/asm/nonmatchings/code_EFEB00/func_80240340_EFEE40.s index ce24a54627..e7d78a92a3 100644 --- a/asm/nonmatchings/code_EFEB00/func_80240340_EFEE40.s +++ b/asm/nonmatchings/code_EFEB00/func_80240340_EFEE40.s @@ -52,13 +52,13 @@ glabel func_80240340_EFEE40 /* EFEEFC 802403FC 44812000 */ mtc1 $at, $f4 /* EFEF00 80240400 46020003 */ div.s $f0, $f0, $f2 /* EFEF04 80240404 46040582 */ mul.s $f22, $f0, $f4 -/* EFEF08 80240408 00000000 */ nop +/* EFEF08 80240408 00000000 */ nop /* EFEF0C 8024040C 4618A501 */ sub.s $f20, $f20, $f24 /* EFEF10 80240410 3C013F00 */ lui $at, 0x3f00 /* EFEF14 80240414 44810000 */ mtc1 $at, $f0 /* EFEF18 80240418 4600A505 */ abs.s $f20, $f20 /* EFEF1C 8024041C 4600A502 */ mul.s $f20, $f20, $f0 -/* EFEF20 80240420 00000000 */ nop +/* EFEF20 80240420 00000000 */ nop /* EFEF24 80240424 12000007 */ beqz $s0, .L80240444 /* EFEF28 80240428 0233102A */ slt $v0, $s1, $s3 /* EFEF2C 8024042C 10400005 */ beqz $v0, .L80240444 @@ -72,18 +72,18 @@ glabel func_80240340_EFEE40 /* EFEF48 80240448 34210FD8 */ ori $at, $at, 0xfd8 /* EFEF4C 8024044C 44810000 */ mtc1 $at, $f0 /* EFEF50 80240450 44936000 */ mtc1 $s3, $f12 -/* EFEF54 80240454 00000000 */ nop +/* EFEF54 80240454 00000000 */ nop /* EFEF58 80240458 46806320 */ cvt.s.w $f12, $f12 /* EFEF5C 8024045C 46006302 */ mul.s $f12, $f12, $f0 -/* EFEF60 80240460 00000000 */ nop +/* EFEF60 80240460 00000000 */ nop /* EFEF64 80240464 44910000 */ mtc1 $s1, $f0 -/* EFEF68 80240468 00000000 */ nop +/* EFEF68 80240468 00000000 */ nop /* EFEF6C 8024046C 46800020 */ cvt.s.w $f0, $f0 /* EFEF70 80240470 46006303 */ div.s $f12, $f12, $f0 /* EFEF74 80240474 0C00AD30 */ jal func_8002B4C0 /* EFEF78 80240478 46166300 */ add.s $f12, $f12, $f22 /* EFEF7C 8024047C 4600A002 */ mul.s $f0, $f20, $f0 -/* EFEF80 80240480 00000000 */ nop +/* EFEF80 80240480 00000000 */ nop /* EFEF84 80240484 4614C080 */ add.s $f2, $f24, $f20 /* EFEF88 80240488 46001081 */ sub.s $f2, $f2, $f0 /* EFEF8C 8024048C 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/code_EFEB00/func_80240540_EFF040.s b/asm/nonmatchings/code_EFEB00/func_80240540_EFF040.s index bab86726c1..722217a391 100644 --- a/asm/nonmatchings/code_EFEB00/func_80240540_EFF040.s +++ b/asm/nonmatchings/code_EFEB00/func_80240540_EFF040.s @@ -22,7 +22,7 @@ glabel func_80240540_EFF040 /* EFF084 80240584 468010A0 */ cvt.s.w $f2, $f2 /* EFF088 80240588 44071000 */ mfc1 $a3, $f2 /* EFF08C 8024058C 4482A000 */ mtc1 $v0, $f20 -/* EFF090 80240590 00000000 */ nop +/* EFF090 80240590 00000000 */ nop /* EFF094 80240594 4680A520 */ cvt.s.w $f20, $f20 /* EFF098 80240598 0C00AC71 */ jal func_8002B1C4 /* EFF09C 8024059C 4600B386 */ mov.s $f14, $f22 @@ -42,7 +42,7 @@ glabel func_80240540_EFF040 /* EFF0D4 802405D4 0C00AD77 */ jal func_8002B5DC /* EFF0D8 802405D8 4600A306 */ mov.s $f12, $f20 /* EFF0DC 802405DC 4600C002 */ mul.s $f0, $f24, $f0 -/* EFF0E0 802405E0 00000000 */ nop +/* EFF0E0 802405E0 00000000 */ nop /* EFF0E4 802405E4 46160000 */ add.s $f0, $f0, $f22 /* EFF0E8 802405E8 3C118011 */ lui $s1, %hi(D_80117578) /* EFF0EC 802405EC 26317578 */ addiu $s1, $s1, %lo(D_80117578) @@ -57,12 +57,12 @@ glabel func_80240540_EFF040 /* EFF110 80240610 4600A306 */ mov.s $f12, $f20 /* EFF114 80240614 02028021 */ addu $s0, $s0, $v0 /* EFF118 80240618 44900000 */ mtc1 $s0, $f0 -/* EFF11C 8024061C 00000000 */ nop +/* EFF11C 8024061C 00000000 */ nop /* EFF120 80240620 46800020 */ cvt.s.w $f0, $f0 /* EFF124 80240624 0C00AD90 */ jal func_8002B640 /* EFF128 80240628 E620002C */ swc1 $f0, 0x2c($s1) /* EFF12C 8024062C 4600C602 */ mul.s $f24, $f24, $f0 -/* EFF130 80240630 00000000 */ nop +/* EFF130 80240630 00000000 */ nop /* EFF134 80240634 4618B581 */ sub.s $f22, $f22, $f24 /* EFF138 80240638 E6360030 */ swc1 $f22, 0x30($s1) /* EFF13C 8024063C 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/asm/nonmatchings/code_EFEB00/func_80240660_EFF160.s b/asm/nonmatchings/code_EFEB00/func_80240660_EFF160.s index c6013d1b8f..2f05a3c571 100644 --- a/asm/nonmatchings/code_EFEB00/func_80240660_EFF160.s +++ b/asm/nonmatchings/code_EFEB00/func_80240660_EFF160.s @@ -25,7 +25,7 @@ glabel func_80240660_EFF160 /* EFF1B0 802406B0 468010A0 */ cvt.s.w $f2, $f2 /* EFF1B4 802406B4 44071000 */ mfc1 $a3, $f2 /* EFF1B8 802406B8 4482A000 */ mtc1 $v0, $f20 -/* EFF1BC 802406BC 00000000 */ nop +/* EFF1BC 802406BC 00000000 */ nop /* EFF1C0 802406C0 4680A520 */ cvt.s.w $f20, $f20 /* EFF1C4 802406C4 0C00AC71 */ jal func_8002B1C4 /* EFF1C8 802406C8 4600B386 */ mov.s $f14, $f22 @@ -45,7 +45,7 @@ glabel func_80240660_EFF160 /* EFF200 80240700 0C00AD77 */ jal func_8002B5DC /* EFF204 80240704 4600A306 */ mov.s $f12, $f20 /* EFF208 80240708 4600C002 */ mul.s $f0, $f24, $f0 -/* EFF20C 8024070C 00000000 */ nop +/* EFF20C 8024070C 00000000 */ nop /* EFF210 80240710 46160000 */ add.s $f0, $f0, $f22 /* EFF214 80240714 E6200038 */ swc1 $f0, 0x38($s1) /* EFF218 80240718 8E0500B8 */ lw $a1, 0xb8($s0) @@ -58,12 +58,12 @@ glabel func_80240660_EFF160 /* EFF234 80240734 4600A306 */ mov.s $f12, $f20 /* EFF238 80240738 02028021 */ addu $s0, $s0, $v0 /* EFF23C 8024073C 44900000 */ mtc1 $s0, $f0 -/* EFF240 80240740 00000000 */ nop +/* EFF240 80240740 00000000 */ nop /* EFF244 80240744 46800020 */ cvt.s.w $f0, $f0 /* EFF248 80240748 0C00AD90 */ jal func_8002B640 /* EFF24C 8024074C E620003C */ swc1 $f0, 0x3c($s1) /* EFF250 80240750 4600C602 */ mul.s $f24, $f24, $f0 -/* EFF254 80240754 00000000 */ nop +/* EFF254 80240754 00000000 */ nop /* EFF258 80240758 4618B581 */ sub.s $f22, $f22, $f24 /* EFF25C 8024075C E6360040 */ swc1 $f22, 0x40($s1) /* EFF260 80240760 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/asm/nonmatchings/code_EFEB00/func_802407B0_EFF2B0.s b/asm/nonmatchings/code_EFEB00/func_802407B0_EFF2B0.s index 8dea533338..c26814eeec 100644 --- a/asm/nonmatchings/code_EFEB00/func_802407B0_EFF2B0.s +++ b/asm/nonmatchings/code_EFEB00/func_802407B0_EFF2B0.s @@ -52,13 +52,13 @@ glabel func_802407B0_EFF2B0 /* EFF36C 8024086C 44812000 */ mtc1 $at, $f4 /* EFF370 80240870 46020003 */ div.s $f0, $f0, $f2 /* EFF374 80240874 46040582 */ mul.s $f22, $f0, $f4 -/* EFF378 80240878 00000000 */ nop +/* EFF378 80240878 00000000 */ nop /* EFF37C 8024087C 4618A501 */ sub.s $f20, $f20, $f24 /* EFF380 80240880 3C013F00 */ lui $at, 0x3f00 /* EFF384 80240884 44810000 */ mtc1 $at, $f0 -/* EFF388 80240888 00000000 */ nop +/* EFF388 80240888 00000000 */ nop /* EFF38C 8024088C 4600A502 */ mul.s $f20, $f20, $f0 -/* EFF390 80240890 00000000 */ nop +/* EFF390 80240890 00000000 */ nop /* EFF394 80240894 12000007 */ beqz $s0, .L802408B4 /* EFF398 80240898 0233102A */ slt $v0, $s1, $s3 /* EFF39C 8024089C 10400005 */ beqz $v0, .L802408B4 @@ -72,18 +72,18 @@ glabel func_802407B0_EFF2B0 /* EFF3B8 802408B8 34210FD8 */ ori $at, $at, 0xfd8 /* EFF3BC 802408BC 44810000 */ mtc1 $at, $f0 /* EFF3C0 802408C0 44936000 */ mtc1 $s3, $f12 -/* EFF3C4 802408C4 00000000 */ nop +/* EFF3C4 802408C4 00000000 */ nop /* EFF3C8 802408C8 46806320 */ cvt.s.w $f12, $f12 /* EFF3CC 802408CC 46006302 */ mul.s $f12, $f12, $f0 -/* EFF3D0 802408D0 00000000 */ nop +/* EFF3D0 802408D0 00000000 */ nop /* EFF3D4 802408D4 44910000 */ mtc1 $s1, $f0 -/* EFF3D8 802408D8 00000000 */ nop +/* EFF3D8 802408D8 00000000 */ nop /* EFF3DC 802408DC 46800020 */ cvt.s.w $f0, $f0 /* EFF3E0 802408E0 46006303 */ div.s $f12, $f12, $f0 /* EFF3E4 802408E4 0C00AD30 */ jal func_8002B4C0 /* EFF3E8 802408E8 46166300 */ add.s $f12, $f12, $f22 /* EFF3EC 802408EC 4600A002 */ mul.s $f0, $f20, $f0 -/* EFF3F0 802408F0 00000000 */ nop +/* EFF3F0 802408F0 00000000 */ nop /* EFF3F4 802408F4 4614C080 */ add.s $f2, $f24, $f20 /* EFF3F8 802408F8 46001081 */ sub.s $f2, $f2, $f0 /* EFF3FC 802408FC 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/code_F5750/PlayerFaceNpc.s b/asm/nonmatchings/code_F5750/PlayerFaceNpc.s index 63f6dd0dc3..a4473f43f4 100644 --- a/asm/nonmatchings/code_F5750/PlayerFaceNpc.s +++ b/asm/nonmatchings/code_F5750/PlayerFaceNpc.s @@ -28,16 +28,16 @@ glabel PlayerFaceNpc /* F6510 802D1B60 3C02EFE8 */ lui $v0, 0xefe8 /* F6514 802D1B64 8E44014C */ lw $a0, 0x14c($s2) /* F6518 802D1B68 0C00EAD2 */ jal get_npc_safe -/* F651C 802D1B6C 00000000 */ nop +/* F651C 802D1B6C 00000000 */ nop /* F6520 802D1B70 080B46E7 */ j .L802D1B9C /* F6524 802D1B74 0040202D */ daddu $a0, $v0, $zero .L802D1B78: /* F6528 802D1B78 34422080 */ ori $v0, $v0, 0x2080 /* F652C 802D1B7C 0082102A */ slt $v0, $a0, $v0 /* F6530 802D1B80 14400006 */ bnez $v0, .L802D1B9C -/* F6534 802D1B84 00000000 */ nop +/* F6534 802D1B84 00000000 */ nop /* F6538 802D1B88 0C00EAD2 */ jal get_npc_safe -/* F653C 802D1B8C 00000000 */ nop +/* F653C 802D1B8C 00000000 */ nop /* F6540 802D1B90 0040202D */ daddu $a0, $v0, $zero /* F6544 802D1B94 1080005A */ beqz $a0, .L802D1D00 /* F6548 802D1B98 24020002 */ addiu $v0, $zero, 2 @@ -66,32 +66,32 @@ glabel PlayerFaceNpc /* F65A0 802D1BF0 A440008E */ sh $zero, 0x8e($v0) /* F65A4 802D1BF4 C6220000 */ lwc1 $f2, ($s1) /* F65A8 802D1BF8 4600103C */ c.lt.s $f2, $f0 -/* F65AC 802D1BFC 00000000 */ nop +/* F65AC 802D1BFC 00000000 */ nop /* F65B0 802D1C00 45000007 */ bc1f .L802D1C20 -/* F65B4 802D1C04 00000000 */ nop +/* F65B4 802D1C04 00000000 */ nop /* F65B8 802D1C08 3C0143B4 */ lui $at, 0x43b4 /* F65BC 802D1C0C 44810000 */ mtc1 $at, $f0 -/* F65C0 802D1C10 00000000 */ nop +/* F65C0 802D1C10 00000000 */ nop /* F65C4 802D1C14 46001000 */ add.s $f0, $f2, $f0 /* F65C8 802D1C18 E6200000 */ swc1 $f0, ($s1) /* F65CC 802D1C1C C6220000 */ lwc1 $f2, ($s1) .L802D1C20: /* F65D0 802D1C20 3C014334 */ lui $at, 0x4334 /* F65D4 802D1C24 44810000 */ mtc1 $at, $f0 -/* F65D8 802D1C28 00000000 */ nop +/* F65D8 802D1C28 00000000 */ nop /* F65DC 802D1C2C 4602003C */ c.lt.s $f0, $f2 -/* F65E0 802D1C30 00000000 */ nop +/* F65E0 802D1C30 00000000 */ nop /* F65E4 802D1C34 45000006 */ bc1f .L802D1C50 -/* F65E8 802D1C38 00000000 */ nop +/* F65E8 802D1C38 00000000 */ nop /* F65EC 802D1C3C 3C0143B4 */ lui $at, 0x43b4 /* F65F0 802D1C40 44810000 */ mtc1 $at, $f0 -/* F65F4 802D1C44 00000000 */ nop +/* F65F4 802D1C44 00000000 */ nop /* F65F8 802D1C48 46001001 */ sub.s $f0, $f2, $f0 /* F65FC 802D1C4C E6200000 */ swc1 $f0, ($s1) .L802D1C50: /* F6600 802D1C50 8E820000 */ lw $v0, ($s4) /* F6604 802D1C54 1C40000E */ bgtz $v0, .L802D1C90 -/* F6608 802D1C58 00000000 */ nop +/* F6608 802D1C58 00000000 */ nop /* F660C 802D1C5C 3C10802E */ lui $s0, %hi(gPlayerNpcPtr) /* F6610 802D1C60 26109D20 */ addiu $s0, $s0, %lo(gPlayerNpcPtr) /* F6614 802D1C64 8E020000 */ lw $v0, ($s0) @@ -116,10 +116,10 @@ glabel PlayerFaceNpc /* F665C 802D1CAC 00021403 */ sra $v0, $v0, 0x10 /* F6660 802D1CB0 C6200000 */ lwc1 $f0, ($s1) /* F6664 802D1CB4 44821000 */ mtc1 $v0, $f2 -/* F6668 802D1CB8 00000000 */ nop +/* F6668 802D1CB8 00000000 */ nop /* F666C 802D1CBC 468010A0 */ cvt.s.w $f2, $f2 /* F6670 802D1CC0 46020002 */ mul.s $f0, $f0, $f2 -/* F6674 802D1CC4 00000000 */ nop +/* F6674 802D1CC4 00000000 */ nop /* F6678 802D1CC8 C6AC0000 */ lwc1 $f12, ($s5) /* F667C 802D1CCC C6820000 */ lwc1 $f2, ($s4) /* F6680 802D1CD0 468010A0 */ cvt.s.w $f2, $f2 diff --git a/asm/nonmatchings/code_F5750/UseEntryHeading.s b/asm/nonmatchings/code_F5750/UseEntryHeading.s index 67952b702f..f980ef589d 100644 --- a/asm/nonmatchings/code_F5750/UseEntryHeading.s +++ b/asm/nonmatchings/code_F5750/UseEntryHeading.s @@ -32,7 +32,7 @@ glabel UseEntryHeading /* F698C 802D1FDC C4600000 */ lwc1 $f0, ($v1) /* F6990 802D1FE0 4600020D */ trunc.w.s $f8, $f0 /* F6994 802D1FE4 44074000 */ mfc1 $a3, $f8 -/* F6998 802D1FE8 00000000 */ nop +/* F6998 802D1FE8 00000000 */ nop /* F699C 802D1FEC AE470088 */ sw $a3, 0x88($s2) /* F69A0 802D1FF0 84A3008E */ lh $v1, 0x8e($a1) /* F69A4 802D1FF4 8E240014 */ lw $a0, 0x14($s1) @@ -50,7 +50,7 @@ glabel UseEntryHeading /* F69D4 802D2024 44816000 */ mtc1 $at, $f12 /* F69D8 802D2028 4600020D */ trunc.w.s $f8, $f0 /* F69DC 802D202C 44064000 */ mfc1 $a2, $f8 -/* F69E0 802D2030 00000000 */ nop +/* F69E0 802D2030 00000000 */ nop /* F69E4 802D2034 AE460090 */ sw $a2, 0x90($s2) /* F69E8 802D2038 84A3008E */ lh $v1, 0x8e($a1) /* F69EC 802D203C 8E240014 */ lw $a0, 0x14($s1) @@ -58,11 +58,11 @@ glabel UseEntryHeading /* F69F4 802D2044 00641821 */ addu $v1, $v1, $a0 /* F69F8 802D2048 C460000C */ lwc1 $f0, 0xc($v1) /* F69FC 802D204C 4487A000 */ mtc1 $a3, $f20 -/* F6A00 802D2050 00000000 */ nop +/* F6A00 802D2050 00000000 */ nop /* F6A04 802D2054 4680A520 */ cvt.s.w $f20, $f20 /* F6A08 802D2058 460C0300 */ add.s $f12, $f0, $f12 /* F6A0C 802D205C 4486B000 */ mtc1 $a2, $f22 -/* F6A10 802D2060 00000000 */ nop +/* F6A10 802D2060 00000000 */ nop /* F6A14 802D2064 4680B5A0 */ cvt.s.w $f22, $f22 /* F6A18 802D2068 0C00A6C9 */ jal clamp_angle /* F6A1C 802D206C 0040882D */ daddu $s1, $v0, $zero @@ -72,24 +72,24 @@ glabel UseEntryHeading /* F6A2C 802D207C 27A60014 */ addiu $a2, $sp, 0x14 /* F6A30 802D2080 C7A40010 */ lwc1 $f4, 0x10($sp) /* F6A34 802D2084 44937000 */ mtc1 $s3, $f14 -/* F6A38 802D2088 00000000 */ nop +/* F6A38 802D2088 00000000 */ nop /* F6A3C 802D208C 468073A0 */ cvt.s.w $f14, $f14 /* F6A40 802D2090 46047302 */ mul.s $f12, $f14, $f4 -/* F6A44 802D2094 00000000 */ nop +/* F6A44 802D2094 00000000 */ nop /* F6A48 802D2098 8E020000 */ lw $v0, ($s0) /* F6A4C 802D209C 3C013E99 */ lui $at, 0x3e99 /* F6A50 802D20A0 3421999A */ ori $at, $at, 0x999a /* F6A54 802D20A4 44810000 */ mtc1 $at, $f0 /* F6A58 802D20A8 C4420094 */ lwc1 $f2, 0x94($v0) /* F6A5C 802D20AC 46001082 */ mul.s $f2, $f2, $f0 -/* F6A60 802D20B0 00000000 */ nop +/* F6A60 802D20B0 00000000 */ nop /* F6A64 802D20B4 C7A00014 */ lwc1 $f0, 0x14($sp) /* F6A68 802D20B8 46007382 */ mul.s $f14, $f14, $f0 -/* F6A6C 802D20BC 00000000 */ nop +/* F6A6C 802D20BC 00000000 */ nop /* F6A70 802D20C0 46001182 */ mul.s $f6, $f2, $f0 -/* F6A74 802D20C4 00000000 */ nop +/* F6A74 802D20C4 00000000 */ nop /* F6A78 802D20C8 46041082 */ mul.s $f2, $f2, $f4 -/* F6A7C 802D20CC 00000000 */ nop +/* F6A7C 802D20CC 00000000 */ nop /* F6A80 802D20D0 460CA300 */ add.s $f12, $f20, $f12 /* F6A84 802D20D4 460EB381 */ sub.s $f14, $f22, $f14 /* F6A88 802D20D8 46066301 */ sub.s $f12, $f12, $f6 @@ -102,7 +102,7 @@ glabel UseEntryHeading /* F6AA4 802D20F4 0C00A7B5 */ jal dist2D /* F6AA8 802D20F8 E60E0030 */ swc1 $f14, 0x30($s0) /* F6AAC 802D20FC 44911000 */ mtc1 $s1, $f2 -/* F6AB0 802D2100 00000000 */ nop +/* F6AB0 802D2100 00000000 */ nop /* F6AB4 802D2104 468010A0 */ cvt.s.w $f2, $f2 /* F6AB8 802D2108 46020003 */ div.s $f0, $f0, $f2 /* F6ABC 802D210C E6400098 */ swc1 $f0, 0x98($s2) diff --git a/asm/nonmatchings/code_F5750/UseExitHeading.s b/asm/nonmatchings/code_F5750/UseExitHeading.s index 73c778f35e..f0ed2f1252 100644 --- a/asm/nonmatchings/code_F5750/UseExitHeading.s +++ b/asm/nonmatchings/code_F5750/UseExitHeading.s @@ -37,7 +37,7 @@ glabel UseExitHeading /* F6B9C 802D21EC 0040802D */ daddu $s0, $v0, $zero /* F6BA0 802D21F0 00101100 */ sll $v0, $s0, 4 /* F6BA4 802D21F4 4491C000 */ mtc1 $s1, $f24 -/* F6BA8 802D21F8 00000000 */ nop +/* F6BA8 802D21F8 00000000 */ nop /* F6BAC 802D21FC 4680C620 */ cvt.s.w $f24, $f24 /* F6BB0 802D2200 8E460028 */ lw $a2, 0x28($s2) /* F6BB4 802D2204 8E830014 */ lw $v1, 0x14($s4) @@ -50,25 +50,25 @@ glabel UseExitHeading /* F6BD0 802D2220 00431021 */ addu $v0, $v0, $v1 /* F6BD4 802D2224 C45C0000 */ lwc1 $f28, ($v0) /* F6BD8 802D2228 461AB502 */ mul.s $f20, $f22, $f26 -/* F6BDC 802D222C 00000000 */ nop +/* F6BDC 802D222C 00000000 */ nop /* F6BE0 802D2230 C45E0008 */ lwc1 $f30, 8($v0) /* F6BE4 802D2234 4600E306 */ mov.s $f12, $f28 /* F6BE8 802D2238 0C00A7B5 */ jal dist2D /* F6BEC 802D223C 4600F386 */ mov.s $f14, $f30 /* F6BF0 802D2240 46140081 */ sub.s $f2, $f0, $f20 /* F6BF4 802D2244 44800000 */ mtc1 $zero, $f0 -/* F6BF8 802D2248 00000000 */ nop +/* F6BF8 802D2248 00000000 */ nop /* F6BFC 802D224C 4602003C */ c.lt.s $f0, $f2 -/* F6C00 802D2250 00000000 */ nop +/* F6C00 802D2250 00000000 */ nop /* F6C04 802D2254 4502000B */ bc1fl .L802D2284 /* F6C08 802D2258 00108100 */ sll $s0, $s0, 4 /* F6C0C 802D225C 4602B03C */ c.lt.s $f22, $f2 -/* F6C10 802D2260 00000000 */ nop +/* F6C10 802D2260 00000000 */ nop /* F6C14 802D2264 45030001 */ bc1tl .L802D226C /* F6C18 802D2268 4600B086 */ mov.s $f2, $f22 .L802D226C: /* F6C1C 802D226C 461A1002 */ mul.s $f0, $f2, $f26 -/* F6C20 802D2270 00000000 */ nop +/* F6C20 802D2270 00000000 */ nop /* F6C24 802D2274 4600C001 */ sub.s $f0, $f24, $f0 /* F6C28 802D2278 4600040D */ trunc.w.s $f16, $f0 /* F6C2C 802D227C 44118000 */ mfc1 $s1, $f16 @@ -87,38 +87,38 @@ glabel UseExitHeading /* F6C5C 802D22AC 27A60014 */ addiu $a2, $sp, 0x14 /* F6C60 802D22B0 C7AA0010 */ lwc1 $f10, 0x10($sp) /* F6C64 802D22B4 44913000 */ mtc1 $s1, $f6 -/* F6C68 802D22B8 00000000 */ nop +/* F6C68 802D22B8 00000000 */ nop /* F6C6C 802D22BC 468031A0 */ cvt.s.w $f6, $f6 /* F6C70 802D22C0 460A3302 */ mul.s $f12, $f6, $f10 -/* F6C74 802D22C4 00000000 */ nop +/* F6C74 802D22C4 00000000 */ nop /* F6C78 802D22C8 C7A80014 */ lwc1 $f8, 0x14($sp) /* F6C7C 802D22CC 46083182 */ mul.s $f6, $f6, $f8 -/* F6C80 802D22D0 00000000 */ nop +/* F6C80 802D22D0 00000000 */ nop /* F6C84 802D22D4 C6420028 */ lwc1 $f2, 0x28($s2) /* F6C88 802D22D8 461C1081 */ sub.s $f2, $f2, $f28 /* F6C8C 802D22DC 46024082 */ mul.s $f2, $f8, $f2 -/* F6C90 802D22E0 00000000 */ nop +/* F6C90 802D22E0 00000000 */ nop /* F6C94 802D22E4 C6400030 */ lwc1 $f0, 0x30($s2) /* F6C98 802D22E8 4600F001 */ sub.s $f0, $f30, $f0 /* F6C9C 802D22EC 46005002 */ mul.s $f0, $f10, $f0 -/* F6CA0 802D22F0 00000000 */ nop +/* F6CA0 802D22F0 00000000 */ nop /* F6CA4 802D22F4 46001081 */ sub.s $f2, $f2, $f0 /* F6CA8 802D22F8 3C013E99 */ lui $at, 0x3e99 /* F6CAC 802D22FC 3421999A */ ori $at, $at, 0x999a /* F6CB0 802D2300 44812000 */ mtc1 $at, $f4 -/* F6CB4 802D2304 00000000 */ nop +/* F6CB4 802D2304 00000000 */ nop /* F6CB8 802D2308 46041102 */ mul.s $f4, $f2, $f4 -/* F6CBC 802D230C 00000000 */ nop +/* F6CBC 802D230C 00000000 */ nop /* F6CC0 802D2310 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* F6CC4 802D2314 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* F6CC8 802D2318 46082382 */ mul.s $f14, $f4, $f8 -/* F6CCC 802D231C 00000000 */ nop +/* F6CCC 802D231C 00000000 */ nop /* F6CD0 802D2320 E4420094 */ swc1 $f2, 0x94($v0) /* F6CD4 802D2324 C6400028 */ lwc1 $f0, 0x28($s2) /* F6CD8 802D2328 460C0000 */ add.s $f0, $f0, $f12 /* F6CDC 802D232C 460E0001 */ sub.s $f0, $f0, $f14 /* F6CE0 802D2330 460A2102 */ mul.s $f4, $f4, $f10 -/* F6CE4 802D2334 00000000 */ nop +/* F6CE4 802D2334 00000000 */ nop /* F6CE8 802D2338 4600040D */ trunc.w.s $f16, $f0 /* F6CEC 802D233C E6700088 */ swc1 $f16, 0x88($s3) /* F6CF0 802D2340 C6400030 */ lwc1 $f0, 0x30($s2) @@ -141,7 +141,7 @@ glabel UseExitHeading /* F6D34 802D2384 000318C3 */ sra $v1, $v1, 3 /* F6D38 802D2388 00641823 */ subu $v1, $v1, $a0 /* F6D3C 802D238C 44830000 */ mtc1 $v1, $f0 -/* F6D40 802D2390 00000000 */ nop +/* F6D40 802D2390 00000000 */ nop /* F6D44 802D2394 46800020 */ cvt.s.w $f0, $f0 /* F6D48 802D2398 E6A00000 */ swc1 $f0, ($s5) /* F6D4C 802D239C 8E430004 */ lw $v1, 4($s2) diff --git a/asm/nonmatchings/code_F5750/func_802D1270.s b/asm/nonmatchings/code_F5750/func_802D1270.s index 8db0d7475b..6ba44f792e 100644 --- a/asm/nonmatchings/code_F5750/func_802D1270.s +++ b/asm/nonmatchings/code_F5750/func_802D1270.s @@ -21,13 +21,13 @@ glabel func_802D1270 /* F5C60 802D12B0 8E050000 */ lw $a1, ($s0) /* F5C64 802D12B4 26100004 */ addiu $s0, $s0, 4 /* F5C68 802D12B8 4482C000 */ mtc1 $v0, $f24 -/* F5C6C 802D12BC 00000000 */ nop +/* F5C6C 802D12BC 00000000 */ nop /* F5C70 802D12C0 4680C620 */ cvt.s.w $f24, $f24 /* F5C74 802D12C4 0C0B1EAF */ jal get_variable /* F5C78 802D12C8 0220202D */ daddu $a0, $s1, $zero /* F5C7C 802D12CC 8E050000 */ lw $a1, ($s0) /* F5C80 802D12D0 4482B000 */ mtc1 $v0, $f22 -/* F5C84 802D12D4 00000000 */ nop +/* F5C84 802D12D4 00000000 */ nop /* F5C88 802D12D8 4680B5A0 */ cvt.s.w $f22, $f22 /* F5C8C 802D12DC 0C0B210B */ jal get_float_variable /* F5C90 802D12E0 0220202D */ daddu $a0, $s1, $zero @@ -46,16 +46,16 @@ glabel func_802D1270 /* F5CC4 802D1314 46140503 */ div.s $f20, $f0, $f20 /* F5CC8 802D1318 4600A10D */ trunc.w.s $f4, $f20 /* F5CCC 802D131C 44042000 */ mfc1 $a0, $f4 -/* F5CD0 802D1320 00000000 */ nop +/* F5CD0 802D1320 00000000 */ nop /* F5CD4 802D1324 44841000 */ mtc1 $a0, $f2 -/* F5CD8 802D1328 00000000 */ nop +/* F5CD8 802D1328 00000000 */ nop /* F5CDC 802D132C 468010A0 */ cvt.s.w $f2, $f2 /* F5CE0 802D1330 46020003 */ div.s $f0, $f0, $f2 /* F5CE4 802D1334 AE240070 */ sw $a0, 0x70($s1) /* F5CE8 802D1338 8E450080 */ lw $a1, 0x80($s2) /* F5CEC 802D133C 44060000 */ mfc1 $a2, $f0 /* F5CF0 802D1340 0C0389DE */ jal move_player -/* F5CF4 802D1344 00000000 */ nop +/* F5CF4 802D1344 00000000 */ nop .L802D1348: /* F5CF8 802D1348 8E230070 */ lw $v1, 0x70($s1) /* F5CFC 802D134C 2463FFFF */ addiu $v1, $v1, -1 diff --git a/asm/nonmatchings/code_F5750/func_802D1380.s b/asm/nonmatchings/code_F5750/func_802D1380.s index dc710d660e..5368729e97 100644 --- a/asm/nonmatchings/code_F5750/func_802D1380.s +++ b/asm/nonmatchings/code_F5750/func_802D1380.s @@ -20,13 +20,13 @@ glabel func_802D1380 /* F5D6C 802D13BC 8E050000 */ lw $a1, ($s0) /* F5D70 802D13C0 26100004 */ addiu $s0, $s0, 4 /* F5D74 802D13C4 4482B000 */ mtc1 $v0, $f22 -/* F5D78 802D13C8 00000000 */ nop +/* F5D78 802D13C8 00000000 */ nop /* F5D7C 802D13CC 4680B5A0 */ cvt.s.w $f22, $f22 /* F5D80 802D13D0 0C0B1EAF */ jal get_variable /* F5D84 802D13D4 0220202D */ daddu $a0, $s1, $zero /* F5D88 802D13D8 8E050000 */ lw $a1, ($s0) /* F5D8C 802D13DC 4482A000 */ mtc1 $v0, $f20 -/* F5D90 802D13E0 00000000 */ nop +/* F5D90 802D13E0 00000000 */ nop /* F5D94 802D13E4 4680A520 */ cvt.s.w $f20, $f20 /* F5D98 802D13E8 0C0B1EAF */ jal get_variable /* F5D9C 802D13EC 0220202D */ daddu $a0, $s1, $zero @@ -43,17 +43,17 @@ glabel func_802D1380 /* F5DC8 802D1418 E6400080 */ swc1 $f0, 0x80($s2) /* F5DCC 802D141C 8442008E */ lh $v0, 0x8e($v0) /* F5DD0 802D1420 1040000F */ beqz $v0, .L802D1460 -/* F5DD4 802D1424 00000000 */ nop +/* F5DD4 802D1424 00000000 */ nop /* F5DD8 802D1428 C64C0028 */ lwc1 $f12, 0x28($s2) /* F5DDC 802D142C C64E0030 */ lwc1 $f14, 0x30($s2) /* F5DE0 802D1430 4406B000 */ mfc1 $a2, $f22 /* F5DE4 802D1434 4407A000 */ mfc1 $a3, $f20 /* F5DE8 802D1438 0C00A7B5 */ jal dist2D -/* F5DEC 802D143C 00000000 */ nop +/* F5DEC 802D143C 00000000 */ nop /* F5DF0 802D1440 8E030000 */ lw $v1, ($s0) /* F5DF4 802D1444 8462008E */ lh $v0, 0x8e($v1) /* F5DF8 802D1448 44821000 */ mtc1 $v0, $f2 -/* F5DFC 802D144C 00000000 */ nop +/* F5DFC 802D144C 00000000 */ nop /* F5E00 802D1450 468010A0 */ cvt.s.w $f2, $f2 /* F5E04 802D1454 46020003 */ div.s $f0, $f0, $f2 /* F5E08 802D1458 080B4529 */ j .L802D14A4 @@ -64,13 +64,13 @@ glabel func_802D1380 /* F5E18 802D1468 4406B000 */ mfc1 $a2, $f22 /* F5E1C 802D146C 4407A000 */ mfc1 $a3, $f20 /* F5E20 802D1470 0C00A7B5 */ jal dist2D -/* F5E24 802D1474 00000000 */ nop +/* F5E24 802D1474 00000000 */ nop /* F5E28 802D1478 8E030000 */ lw $v1, ($s0) /* F5E2C 802D147C C4620018 */ lwc1 $f2, 0x18($v1) /* F5E30 802D1480 46020003 */ div.s $f0, $f0, $f2 /* F5E34 802D1484 4600010D */ trunc.w.s $f4, $f0 /* F5E38 802D1488 44022000 */ mfc1 $v0, $f4 -/* F5E3C 802D148C 00000000 */ nop +/* F5E3C 802D148C 00000000 */ nop /* F5E40 802D1490 A462008E */ sh $v0, 0x8e($v1) /* F5E44 802D1494 00021400 */ sll $v0, $v0, 0x10 /* F5E48 802D1498 14400002 */ bnez $v0, .L802D14A4 diff --git a/asm/nonmatchings/code_F5750/func_802D23F8.s b/asm/nonmatchings/code_F5750/func_802D23F8.s index 60d51b7850..eebe134f1c 100644 --- a/asm/nonmatchings/code_F5750/func_802D23F8.s +++ b/asm/nonmatchings/code_F5750/func_802D23F8.s @@ -18,7 +18,7 @@ glabel func_802D23F8 /* F6DDC 802D242C 10620003 */ beq $v1, $v0, .L802D243C /* F6DE0 802D2430 2402001A */ addiu $v0, $zero, 0x1a /* F6DE4 802D2434 14620003 */ bne $v1, $v0, .L802D2444 -/* F6DE8 802D2438 00000000 */ nop +/* F6DE8 802D2438 00000000 */ nop .L802D243C: /* F6DEC 802D243C 03E00008 */ jr $ra /* F6DF0 802D2440 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/code_F5750/func_802D244C.s b/asm/nonmatchings/code_F5750/func_802D244C.s index c07681e32b..a531fd3c5f 100644 --- a/asm/nonmatchings/code_F5750/func_802D244C.s +++ b/asm/nonmatchings/code_F5750/func_802D244C.s @@ -8,7 +8,7 @@ glabel func_802D244C /* F6E08 802D2458 04400006 */ bltz $v0, .L802D2474 /* F6E0C 802D245C AFBF0010 */ sw $ra, 0x10($sp) /* F6E10 802D2460 0C0B48FE */ jal func_802D23F8 -/* F6E14 802D2464 00000000 */ nop +/* F6E14 802D2464 00000000 */ nop /* F6E18 802D2468 0040182D */ daddu $v1, $v0, $zero /* F6E1C 802D246C 14600002 */ bnez $v1, .L802D2478 /* F6E20 802D2470 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_F5750/func_802D2520.s b/asm/nonmatchings/code_F5750/func_802D2520.s index 578c4736d9..40a9f0d763 100644 --- a/asm/nonmatchings/code_F5750/func_802D2520.s +++ b/asm/nonmatchings/code_F5750/func_802D2520.s @@ -31,11 +31,12 @@ glabel func_802D2520 /* F6F38 802D2588 2E22000E */ sltiu $v0, $s1, 0xe /* F6F3C 802D258C 104000AB */ beqz $v0, .L802D283C /* F6F40 802D2590 00111080 */ sll $v0, $s1, 2 -/* F6F44 802D2594 3C01802E */ lui $at, %hi(D_802DA208) +/* F6F44 802D2594 3C01802E */ lui $at, %hi(jtbl_802DA208_FEBB8) /* F6F48 802D2598 00220821 */ addu $at, $at, $v0 -/* F6F4C 802D259C 8C22A208 */ lw $v0, %lo(D_802DA208)($at) +/* F6F4C 802D259C 8C22A208 */ lw $v0, %lo(jtbl_802DA208_FEBB8)($at) /* F6F50 802D25A0 00400008 */ jr $v0 -/* F6F54 802D25A4 00000000 */ nop +/* F6F54 802D25A4 00000000 */ nop +glabel L802D25A8_F6F58 /* F6F58 802D25A8 02A0202D */ daddu $a0, $s5, $zero /* F6F5C 802D25AC 0000282D */ daddu $a1, $zero, $zero /* F6F60 802D25B0 00A0302D */ daddu $a2, $a1, $zero @@ -47,8 +48,10 @@ glabel func_802D2520 /* F6F78 802D25C8 AFA00010 */ sw $zero, 0x10($sp) /* F6F7C 802D25CC 080B4A0C */ j .L802D2830 /* F6F80 802D25D0 AFA00014 */ sw $zero, 0x14($sp) +glabel L802D25D4_F6F84 /* F6F84 802D25D4 2402000D */ addiu $v0, $zero, 0xd /* F6F88 802D25D8 A24200BE */ sb $v0, 0xbe($s2) +glabel L802D25DC_F6F8C /* F6F8C 802D25DC 02A0202D */ daddu $a0, $s5, $zero /* F6F90 802D25E0 0220282D */ daddu $a1, $s1, $zero /* F6F94 802D25E4 0000302D */ daddu $a2, $zero, $zero @@ -59,6 +62,7 @@ glabel func_802D2520 /* F6FA8 802D25F8 AFA00014 */ sw $zero, 0x14($sp) /* F6FAC 802D25FC 080B4A0D */ j .L802D2834 /* F6FB0 802D2600 AFA20018 */ sw $v0, 0x18($sp) +glabel L802D2604_F6FB4 /* F6FB4 802D2604 2402000D */ addiu $v0, $zero, 0xd /* F6FB8 802D2608 A24200BE */ sb $v0, 0xbe($s2) /* F6FBC 802D260C 8E050000 */ lw $a1, ($s0) @@ -83,6 +87,7 @@ glabel func_802D2520 /* F7008 802D2658 AFA20010 */ sw $v0, 0x10($sp) /* F700C 802D265C 080B4A0C */ j .L802D2830 /* F7010 802D2660 AFA00014 */ sw $zero, 0x14($sp) +glabel L802D2664_F7014 /* F7014 802D2664 2402000D */ addiu $v0, $zero, 0xd /* F7018 802D2668 A24200BE */ sb $v0, 0xbe($s2) /* F701C 802D266C 8E050000 */ lw $a1, ($s0) @@ -107,6 +112,7 @@ glabel func_802D2520 /* F7068 802D26B8 AFA20010 */ sw $v0, 0x10($sp) /* F706C 802D26BC 080B4A0B */ j .L802D282C /* F7070 802D26C0 240200FF */ addiu $v0, $zero, 0xff +glabel L802D26C4_F7074 /* F7074 802D26C4 24020016 */ addiu $v0, $zero, 0x16 /* F7078 802D26C8 A24200BE */ sb $v0, 0xbe($s2) /* F707C 802D26CC 8E050000 */ lw $a1, ($s0) @@ -123,6 +129,7 @@ glabel func_802D2520 /* F70A8 802D26F8 AFA20014 */ sw $v0, 0x14($sp) /* F70AC 802D26FC 080B4A0D */ j .L802D2834 /* F70B0 802D2700 AFA80018 */ sw $t0, 0x18($sp) +glabel L802D2704_F70B4 /* F70B4 802D2704 24020016 */ addiu $v0, $zero, 0x16 /* F70B8 802D2708 A24200BE */ sb $v0, 0xbe($s2) /* F70BC 802D270C 8E050000 */ lw $a1, ($s0) @@ -146,6 +153,7 @@ glabel func_802D2520 /* F7104 802D2754 02A0202D */ daddu $a0, $s5, $zero /* F7108 802D2758 080B4A06 */ j .L802D2818 /* F710C 802D275C 24050008 */ addiu $a1, $zero, 8 +glabel L802D2760_F7110 /* F7110 802D2760 2402000D */ addiu $v0, $zero, 0xd /* F7114 802D2764 A24200BE */ sb $v0, 0xbe($s2) /* F7118 802D2768 8E050000 */ lw $a1, ($s0) @@ -170,6 +178,7 @@ glabel func_802D2520 /* F7164 802D27B4 AFA20010 */ sw $v0, 0x10($sp) /* F7168 802D27B8 080B4A0C */ j .L802D2830 /* F716C 802D27BC AFA00014 */ sw $zero, 0x14($sp) +glabel L802D27C0_F7170 /* F7170 802D27C0 24020016 */ addiu $v0, $zero, 0x16 /* F7174 802D27C4 A24200BE */ sb $v0, 0xbe($s2) /* F7178 802D27C8 8E050000 */ lw $a1, ($s0) @@ -204,8 +213,9 @@ glabel func_802D2520 /* F71E0 802D2830 AFA30018 */ sw $v1, 0x18($sp) .L802D2834: /* F71E4 802D2834 0C0B77FE */ jal func_802DDFF8 -/* F71E8 802D2838 00000000 */ nop +/* F71E8 802D2838 00000000 */ nop .L802D283C: +glabel L802D283C_F71EC /* F71EC 802D283C 8FBF0038 */ lw $ra, 0x38($sp) /* F71F0 802D2840 8FB50034 */ lw $s5, 0x34($sp) /* F71F4 802D2844 8FB40030 */ lw $s4, 0x30($sp) diff --git a/asm/nonmatchings/code_F5750/func_802D2884.s b/asm/nonmatchings/code_F5750/func_802D2884.s index 54ed5d7fa6..d5f8b849d8 100644 --- a/asm/nonmatchings/code_F5750/func_802D2884.s +++ b/asm/nonmatchings/code_F5750/func_802D2884.s @@ -34,20 +34,20 @@ glabel func_802D2884 /* F72A8 802D28F8 E6420074 */ swc1 $f2, 0x74($s2) /* F72AC 802D28FC C66C0028 */ lwc1 $f12, 0x28($s3) /* F72B0 802D2900 46146032 */ c.eq.s $f12, $f20 -/* F72B4 802D2904 00000000 */ nop +/* F72B4 802D2904 00000000 */ nop /* F72B8 802D2908 45000006 */ bc1f .L802D2924 /* F72BC 802D290C 46000086 */ mov.s $f2, $f0 /* F72C0 802D2910 C6600030 */ lwc1 $f0, 0x30($s3) /* F72C4 802D2914 46020032 */ c.eq.s $f0, $f2 -/* F72C8 802D2918 00000000 */ nop +/* F72C8 802D2918 00000000 */ nop /* F72CC 802D291C 45010008 */ bc1t .L802D2940 -/* F72D0 802D2920 00000000 */ nop +/* F72D0 802D2920 00000000 */ nop .L802D2924: /* F72D4 802D2924 C66E0030 */ lwc1 $f14, 0x30($s3) /* F72D8 802D2928 4406A000 */ mfc1 $a2, $f20 /* F72DC 802D292C 44071000 */ mfc1 $a3, $f2 /* F72E0 802D2930 0C00A720 */ jal atan2 -/* F72E4 802D2934 00000000 */ nop +/* F72E4 802D2934 00000000 */ nop /* F72E8 802D2938 080B4A51 */ j .L802D2944 /* F72EC 802D293C 46000086 */ mov.s $f2, $f0 .L802D2940: @@ -67,32 +67,32 @@ glabel func_802D2884 /* F7320 802D2970 A440008E */ sh $zero, 0x8e($v0) /* F7324 802D2974 C6220000 */ lwc1 $f2, ($s1) /* F7328 802D2978 4600103C */ c.lt.s $f2, $f0 -/* F732C 802D297C 00000000 */ nop +/* F732C 802D297C 00000000 */ nop /* F7330 802D2980 45000007 */ bc1f .L802D29A0 -/* F7334 802D2984 00000000 */ nop +/* F7334 802D2984 00000000 */ nop /* F7338 802D2988 3C0143B4 */ lui $at, 0x43b4 /* F733C 802D298C 44810000 */ mtc1 $at, $f0 -/* F7340 802D2990 00000000 */ nop +/* F7340 802D2990 00000000 */ nop /* F7344 802D2994 46001000 */ add.s $f0, $f2, $f0 /* F7348 802D2998 E6200000 */ swc1 $f0, ($s1) /* F734C 802D299C C6220000 */ lwc1 $f2, ($s1) .L802D29A0: /* F7350 802D29A0 3C014334 */ lui $at, 0x4334 /* F7354 802D29A4 44810000 */ mtc1 $at, $f0 -/* F7358 802D29A8 00000000 */ nop +/* F7358 802D29A8 00000000 */ nop /* F735C 802D29AC 4602003C */ c.lt.s $f0, $f2 -/* F7360 802D29B0 00000000 */ nop +/* F7360 802D29B0 00000000 */ nop /* F7364 802D29B4 45000006 */ bc1f .L802D29D0 -/* F7368 802D29B8 00000000 */ nop +/* F7368 802D29B8 00000000 */ nop /* F736C 802D29BC 3C0143B4 */ lui $at, 0x43b4 /* F7370 802D29C0 44810000 */ mtc1 $at, $f0 -/* F7374 802D29C4 00000000 */ nop +/* F7374 802D29C4 00000000 */ nop /* F7378 802D29C8 46001001 */ sub.s $f0, $f2, $f0 /* F737C 802D29CC E6200000 */ swc1 $f0, ($s1) .L802D29D0: /* F7380 802D29D0 8E820000 */ lw $v0, ($s4) /* F7384 802D29D4 1C40000E */ bgtz $v0, .L802D2A10 -/* F7388 802D29D8 00000000 */ nop +/* F7388 802D29D8 00000000 */ nop /* F738C 802D29DC 3C10802E */ lui $s0, %hi(gPlayerNpcPtr) /* F7390 802D29E0 26109D20 */ addiu $s0, $s0, %lo(gPlayerNpcPtr) /* F7394 802D29E4 8E020000 */ lw $v0, ($s0) @@ -117,10 +117,10 @@ glabel func_802D2884 /* F73DC 802D2A2C 00021403 */ sra $v0, $v0, 0x10 /* F73E0 802D2A30 C6200000 */ lwc1 $f0, ($s1) /* F73E4 802D2A34 44821000 */ mtc1 $v0, $f2 -/* F73E8 802D2A38 00000000 */ nop +/* F73E8 802D2A38 00000000 */ nop /* F73EC 802D2A3C 468010A0 */ cvt.s.w $f2, $f2 /* F73F0 802D2A40 46020002 */ mul.s $f0, $f0, $f2 -/* F73F4 802D2A44 00000000 */ nop +/* F73F4 802D2A44 00000000 */ nop /* F73F8 802D2A48 C6AC0000 */ lwc1 $f12, ($s5) /* F73FC 802D2A4C C6820000 */ lwc1 $f2, ($s4) /* F7400 802D2A50 468010A0 */ cvt.s.w $f2, $f2 diff --git a/asm/nonmatchings/code_F5750/func_802D2C40.s b/asm/nonmatchings/code_F5750/func_802D2C40.s index 7bddfa768e..082ffe4b96 100644 --- a/asm/nonmatchings/code_F5750/func_802D2C40.s +++ b/asm/nonmatchings/code_F5750/func_802D2C40.s @@ -13,7 +13,7 @@ glabel func_802D2C40 /* F7610 802D2C60 0C0B1EAF */ jal get_variable /* F7614 802D2C64 26100004 */ addiu $s0, $s0, 4 /* F7618 802D2C68 44820000 */ mtc1 $v0, $f0 -/* F761C 802D2C6C 00000000 */ nop +/* F761C 802D2C6C 00000000 */ nop /* F7620 802D2C70 46800020 */ cvt.s.w $f0, $f0 /* F7624 802D2C74 3C118011 */ lui $s1, %hi(gPlayerStatus) /* F7628 802D2C78 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) @@ -23,14 +23,14 @@ glabel func_802D2C40 /* F7638 802D2C88 0C0B1EAF */ jal get_variable /* F763C 802D2C8C 0240202D */ daddu $a0, $s2, $zero /* F7640 802D2C90 44820000 */ mtc1 $v0, $f0 -/* F7644 802D2C94 00000000 */ nop +/* F7644 802D2C94 00000000 */ nop /* F7648 802D2C98 46800020 */ cvt.s.w $f0, $f0 /* F764C 802D2C9C E6200020 */ swc1 $f0, 0x20($s1) /* F7650 802D2CA0 8E050000 */ lw $a1, ($s0) /* F7654 802D2CA4 0C0B1EAF */ jal get_variable /* F7658 802D2CA8 0240202D */ daddu $a0, $s2, $zero /* F765C 802D2CAC 44820000 */ mtc1 $v0, $f0 -/* F7660 802D2CB0 00000000 */ nop +/* F7660 802D2CB0 00000000 */ nop /* F7664 802D2CB4 46800020 */ cvt.s.w $f0, $f0 /* F7668 802D2CB8 E6200024 */ swc1 $f0, 0x24($s1) /* F766C 802D2CBC 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/code_F5750/func_802D2F34.s b/asm/nonmatchings/code_F5750/func_802D2F34.s index 9075d95a05..6730018baf 100644 --- a/asm/nonmatchings/code_F5750/func_802D2F34.s +++ b/asm/nonmatchings/code_F5750/func_802D2F34.s @@ -11,7 +11,7 @@ glabel func_802D2F34 /* F78FC 802D2F4C 44862000 */ mtc1 $a2, $f4 /* F7900 802D2F50 F7B40018 */ sdc1 $f20, 0x18($sp) /* F7904 802D2F54 46002502 */ mul.s $f20, $f4, $f0 -/* F7908 802D2F58 00000000 */ nop +/* F7908 802D2F58 00000000 */ nop /* F790C 802D2F5C AFB00010 */ sw $s0, 0x10($sp) /* F7910 802D2F60 3C0143B4 */ lui $at, 0x43b4 /* F7914 802D2F64 44810000 */ mtc1 $at, $f0 @@ -24,10 +24,10 @@ glabel func_802D2F34 /* F7930 802D2F80 0C00A874 */ jal cos_rad /* F7934 802D2F84 46000506 */ mov.s $f20, $f0 /* F7938 802D2F88 4614B502 */ mul.s $f20, $f22, $f20 -/* F793C 802D2F8C 00000000 */ nop +/* F793C 802D2F8C 00000000 */ nop /* F7940 802D2F90 4600B587 */ neg.s $f22, $f22 /* F7944 802D2F94 4600B582 */ mul.s $f22, $f22, $f0 -/* F7948 802D2F98 00000000 */ nop +/* F7948 802D2F98 00000000 */ nop /* F794C 802D2F9C C6020004 */ lwc1 $f2, 4($s0) /* F7950 802D2FA0 46141080 */ add.s $f2, $f2, $f20 /* F7954 802D2FA4 C600000C */ lwc1 $f0, 0xc($s0) diff --git a/asm/nonmatchings/code_F5750/func_802D2FCC.s b/asm/nonmatchings/code_F5750/func_802D2FCC.s index e961d1e840..9fac2499c8 100644 --- a/asm/nonmatchings/code_F5750/func_802D2FCC.s +++ b/asm/nonmatchings/code_F5750/func_802D2FCC.s @@ -16,13 +16,13 @@ glabel func_802D2FCC /* F79A4 802D2FF4 26100001 */ addiu $s0, $s0, 1 /* F79A8 802D2FF8 8C440000 */ lw $a0, ($v0) /* F79AC 802D2FFC 04800003 */ bltz $a0, .L802D300C -/* F79B0 802D3000 00000000 */ nop +/* F79B0 802D3000 00000000 */ nop /* F79B4 802D3004 0C0483C1 */ jal func_80120F04 -/* F79B8 802D3008 00000000 */ nop +/* F79B8 802D3008 00000000 */ nop .L802D300C: /* F79BC 802D300C 2A020040 */ slti $v0, $s0, 0x40 /* F79C0 802D3010 1440FFF2 */ bnez $v0, .L802D2FDC -/* F79C4 802D3014 00000000 */ nop +/* F79C4 802D3014 00000000 */ nop /* F79C8 802D3018 8FBF0014 */ lw $ra, 0x14($sp) /* F79CC 802D301C 8FB00010 */ lw $s0, 0x10($sp) /* F79D0 802D3020 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_F5750/func_802D3028.s b/asm/nonmatchings/code_F5750/func_802D3028.s index e5b4dc0514..53c8ba6cbd 100644 --- a/asm/nonmatchings/code_F5750/func_802D3028.s +++ b/asm/nonmatchings/code_F5750/func_802D3028.s @@ -40,7 +40,7 @@ glabel func_802D3028 /* F7A60 802D30B0 0482003A */ bltzl $a0, .L802D319C /* F7A64 802D30B4 26520001 */ addiu $s2, $s2, 1 /* F7A68 802D30B8 0C048B77 */ jal func_80122DDC -/* F7A6C 802D30BC 00000000 */ nop +/* F7A6C 802D30BC 00000000 */ nop /* F7A70 802D30C0 8C420000 */ lw $v0, ($v0) /* F7A74 802D30C4 30420008 */ andi $v0, $v0, 8 /* F7A78 802D30C8 54400034 */ bnel $v0, $zero, .L802D319C @@ -99,7 +99,7 @@ glabel func_802D3028 .L802D319C: /* F7B4C 802D319C 2A420040 */ slti $v0, $s2, 0x40 /* F7B50 802D31A0 1440FFBB */ bnez $v0, .L802D3090 -/* F7B54 802D31A4 00000000 */ nop +/* F7B54 802D31A4 00000000 */ nop /* F7B58 802D31A8 8FBF0284 */ lw $ra, 0x284($sp) /* F7B5C 802D31AC 8FBE0280 */ lw $fp, 0x280($sp) /* F7B60 802D31B0 8FB7027C */ lw $s7, 0x27c($sp) diff --git a/asm/nonmatchings/code_F5750/func_802D31E0.s b/asm/nonmatchings/code_F5750/func_802D31E0.s index 63096e164d..e156fa41d3 100644 --- a/asm/nonmatchings/code_F5750/func_802D31E0.s +++ b/asm/nonmatchings/code_F5750/func_802D31E0.s @@ -40,7 +40,7 @@ glabel func_802D31E0 /* F7C18 802D3268 0482003A */ bltzl $a0, .L802D3354 /* F7C1C 802D326C 26520001 */ addiu $s2, $s2, 1 /* F7C20 802D3270 0C048B77 */ jal func_80122DDC -/* F7C24 802D3274 00000000 */ nop +/* F7C24 802D3274 00000000 */ nop /* F7C28 802D3278 8C420000 */ lw $v0, ($v0) /* F7C2C 802D327C 30420008 */ andi $v0, $v0, 8 /* F7C30 802D3280 50400034 */ beql $v0, $zero, .L802D3354 @@ -99,7 +99,7 @@ glabel func_802D31E0 .L802D3354: /* F7D04 802D3354 2A420040 */ slti $v0, $s2, 0x40 /* F7D08 802D3358 1440FFBB */ bnez $v0, .L802D3248 -/* F7D0C 802D335C 00000000 */ nop +/* F7D0C 802D335C 00000000 */ nop /* F7D10 802D3360 8FBF0284 */ lw $ra, 0x284($sp) /* F7D14 802D3364 8FBE0280 */ lw $fp, 0x280($sp) /* F7D18 802D3368 8FB7027C */ lw $s7, 0x27c($sp) diff --git a/asm/nonmatchings/code_F5750/func_802D3398.s b/asm/nonmatchings/code_F5750/func_802D3398.s index 256737e4c5..a65b68a203 100644 --- a/asm/nonmatchings/code_F5750/func_802D3398.s +++ b/asm/nonmatchings/code_F5750/func_802D3398.s @@ -6,11 +6,11 @@ glabel func_802D3398 /* F7D4C 802D339C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* F7D50 802D33A0 80420070 */ lb $v0, 0x70($v0) /* F7D54 802D33A4 14400005 */ bnez $v0, .L802D33BC -/* F7D58 802D33A8 00000000 */ nop +/* F7D58 802D33A8 00000000 */ nop /* F7D5C 802D33AC 3C02802E */ lui $v0, %hi(D_802DB6C0) /* F7D60 802D33B0 2442B6C0 */ addiu $v0, $v0, %lo(D_802DB6C0) /* F7D64 802D33B4 080B4CF1 */ j .L802D33C4 -/* F7D68 802D33B8 00000000 */ nop +/* F7D68 802D33B8 00000000 */ nop .L802D33BC: /* F7D6C 802D33BC 3C02802E */ lui $v0, %hi(D_802DB5C0) /* F7D70 802D33C0 2442B5C0 */ addiu $v0, $v0, %lo(D_802DB5C0) diff --git a/asm/nonmatchings/code_F5750/func_802D3474.s b/asm/nonmatchings/code_F5750/func_802D3474.s index 18ba51b958..25dc9dcccf 100644 --- a/asm/nonmatchings/code_F5750/func_802D3474.s +++ b/asm/nonmatchings/code_F5750/func_802D3474.s @@ -31,7 +31,7 @@ glabel func_802D3474 /* F7E84 802D34D4 10400016 */ beqz $v0, .L802D3530 /* F7E88 802D34D8 24020002 */ addiu $v0, $zero, 2 /* F7E8C 802D34DC 0C048338 */ jal load_virtual_model -/* F7E90 802D34E0 00000000 */ nop +/* F7E90 802D34E0 00000000 */ nop /* F7E94 802D34E4 3C013F80 */ lui $at, 0x3f80 /* F7E98 802D34E8 44810000 */ mtc1 $at, $f0 /* F7E9C 802D34EC AE020000 */ sw $v0, ($s0) diff --git a/asm/nonmatchings/code_F5750/func_802D354C.s b/asm/nonmatchings/code_F5750/func_802D354C.s index ae0f7136ea..0ee6f719f8 100644 --- a/asm/nonmatchings/code_F5750/func_802D354C.s +++ b/asm/nonmatchings/code_F5750/func_802D354C.s @@ -31,7 +31,7 @@ glabel func_802D354C /* F7F5C 802D35AC 10400016 */ beqz $v0, .L802D3608 /* F7F60 802D35B0 24020002 */ addiu $v0, $zero, 2 /* F7F64 802D35B4 0C048379 */ jal func_80120DE4 -/* F7F68 802D35B8 00000000 */ nop +/* F7F68 802D35B8 00000000 */ nop /* F7F6C 802D35BC 3C013F80 */ lui $at, 0x3f80 /* F7F70 802D35C0 44810000 */ mtc1 $at, $f0 /* F7F74 802D35C4 AE020000 */ sw $v0, ($s0) diff --git a/asm/nonmatchings/code_F5750/func_802D3A60.s b/asm/nonmatchings/code_F5750/func_802D3A60.s index d31b74f586..56a531aefd 100644 --- a/asm/nonmatchings/code_F5750/func_802D3A60.s +++ b/asm/nonmatchings/code_F5750/func_802D3A60.s @@ -18,7 +18,7 @@ glabel func_802D3A60 .L802D3A94: /* F8444 802D3A94 8E420070 */ lw $v0, 0x70($s2) /* F8448 802D3A98 14400049 */ bnez $v0, .L802D3BC0 -/* F844C 802D3A9C 00000000 */ nop +/* F844C 802D3A9C 00000000 */ nop /* F8450 802D3AA0 8E250000 */ lw $a1, ($s1) /* F8454 802D3AA4 26310004 */ addiu $s1, $s1, 4 /* F8458 802D3AA8 0C0B1EAF */ jal get_variable @@ -29,7 +29,7 @@ glabel func_802D3A60 /* F846C 802D3ABC 0C0B1EAF */ jal get_variable /* F8470 802D3AC0 0040802D */ daddu $s0, $v0, $zero /* F8474 802D3AC4 4482D000 */ mtc1 $v0, $f26 -/* F8478 802D3AC8 00000000 */ nop +/* F8478 802D3AC8 00000000 */ nop /* F847C 802D3ACC 4680D6A0 */ cvt.s.w $f26, $f26 /* F8480 802D3AD0 8E250000 */ lw $a1, ($s1) /* F8484 802D3AD4 26310004 */ addiu $s1, $s1, 4 @@ -38,12 +38,12 @@ glabel func_802D3A60 /* F8490 802D3AE0 8E250000 */ lw $a1, ($s1) /* F8494 802D3AE4 26310004 */ addiu $s1, $s1, 4 /* F8498 802D3AE8 4482A000 */ mtc1 $v0, $f20 -/* F849C 802D3AEC 00000000 */ nop +/* F849C 802D3AEC 00000000 */ nop /* F84A0 802D3AF0 4680A520 */ cvt.s.w $f20, $f20 /* F84A4 802D3AF4 0C0B1EAF */ jal get_variable /* F84A8 802D3AF8 0240202D */ daddu $a0, $s2, $zero /* F84AC 802D3AFC 4482C000 */ mtc1 $v0, $f24 -/* F84B0 802D3B00 00000000 */ nop +/* F84B0 802D3B00 00000000 */ nop /* F84B4 802D3B04 4680C620 */ cvt.s.w $f24, $f24 /* F84B8 802D3B08 8E250000 */ lw $a1, ($s1) /* F84BC 802D3B0C 0C0B1EAF */ jal get_variable @@ -62,7 +62,7 @@ glabel func_802D3A60 /* F84F0 802D3B40 C6340028 */ lwc1 $f20, 0x28($s1) /* F84F4 802D3B44 C6360030 */ lwc1 $f22, 0x30($s1) /* F84F8 802D3B48 44820000 */ mtc1 $v0, $f0 -/* F84FC 802D3B4C 00000000 */ nop +/* F84FC 802D3B4C 00000000 */ nop /* F8500 802D3B50 46800020 */ cvt.s.w $f0, $f0 /* F8504 802D3B54 E6200048 */ swc1 $f0, 0x48($s1) /* F8508 802D3B58 4600D306 */ mov.s $f12, $f26 @@ -80,7 +80,7 @@ glabel func_802D3A60 /* F8538 802D3B88 44801000 */ mtc1 $zero, $f2 /* F853C 802D3B8C 46000106 */ mov.s $f4, $f0 /* F8540 802D3B90 46023032 */ c.eq.s $f6, $f2 -/* F8544 802D3B94 00000000 */ nop +/* F8544 802D3B94 00000000 */ nop /* F8548 802D3B98 45000005 */ bc1f .L802D3BB0 /* F854C 802D3B9C E6240034 */ swc1 $f4, 0x34($s1) /* F8550 802D3BA0 C620003C */ lwc1 $f0, 0x3c($s1) @@ -107,12 +107,12 @@ glabel func_802D3A60 /* F8598 802D3BE8 C6200048 */ lwc1 $f0, 0x48($s1) /* F859C 802D3BEC 3C013F80 */ lui $at, 0x3f80 /* F85A0 802D3BF0 44811000 */ mtc1 $at, $f2 -/* F85A4 802D3BF4 00000000 */ nop +/* F85A4 802D3BF4 00000000 */ nop /* F85A8 802D3BF8 46020001 */ sub.s $f0, $f0, $f2 /* F85AC 802D3BFC 44801000 */ mtc1 $zero, $f2 -/* F85B0 802D3C00 00000000 */ nop +/* F85B0 802D3C00 00000000 */ nop /* F85B4 802D3C04 4602003E */ c.le.s $f0, $f2 -/* F85B8 802D3C08 00000000 */ nop +/* F85B8 802D3C08 00000000 */ nop /* F85BC 802D3C0C 45010003 */ bc1t .L802D3C1C /* F85C0 802D3C10 E6200048 */ swc1 $f0, 0x48($s1) /* F85C4 802D3C14 080B4F0C */ j .L802D3C30 diff --git a/asm/nonmatchings/code_F5750/func_802D3C58.s b/asm/nonmatchings/code_F5750/func_802D3C58.s index cb396d13cd..4239ab9ae6 100644 --- a/asm/nonmatchings/code_F5750/func_802D3C58.s +++ b/asm/nonmatchings/code_F5750/func_802D3C58.s @@ -19,7 +19,7 @@ glabel func_802D3C58 .L802D3C90: /* F8640 802D3C90 8E420070 */ lw $v0, 0x70($s2) /* F8644 802D3C94 14400058 */ bnez $v0, .L802D3DF8 -/* F8648 802D3C98 00000000 */ nop +/* F8648 802D3C98 00000000 */ nop /* F864C 802D3C9C 8E250000 */ lw $a1, ($s1) /* F8650 802D3CA0 26310004 */ addiu $s1, $s1, 4 /* F8654 802D3CA4 0C0B1EAF */ jal get_variable @@ -30,21 +30,21 @@ glabel func_802D3C58 /* F8668 802D3CB8 0C0B1EAF */ jal get_variable /* F866C 802D3CBC 0040802D */ daddu $s0, $v0, $zero /* F8670 802D3CC0 4482D000 */ mtc1 $v0, $f26 -/* F8674 802D3CC4 00000000 */ nop +/* F8674 802D3CC4 00000000 */ nop /* F8678 802D3CC8 4680D6A0 */ cvt.s.w $f26, $f26 /* F867C 802D3CCC 8E250000 */ lw $a1, ($s1) /* F8680 802D3CD0 26310004 */ addiu $s1, $s1, 4 /* F8684 802D3CD4 0C0B1EAF */ jal get_variable /* F8688 802D3CD8 0240202D */ daddu $a0, $s2, $zero /* F868C 802D3CDC 4482E000 */ mtc1 $v0, $f28 -/* F8690 802D3CE0 00000000 */ nop +/* F8690 802D3CE0 00000000 */ nop /* F8694 802D3CE4 4680E720 */ cvt.s.w $f28, $f28 /* F8698 802D3CE8 8E250000 */ lw $a1, ($s1) /* F869C 802D3CEC 26310004 */ addiu $s1, $s1, 4 /* F86A0 802D3CF0 0C0B1EAF */ jal get_variable /* F86A4 802D3CF4 0240202D */ daddu $a0, $s2, $zero /* F86A8 802D3CF8 4482C000 */ mtc1 $v0, $f24 -/* F86AC 802D3CFC 00000000 */ nop +/* F86AC 802D3CFC 00000000 */ nop /* F86B0 802D3D00 4680C620 */ cvt.s.w $f24, $f24 /* F86B4 802D3D04 8E250000 */ lw $a1, ($s1) /* F86B8 802D3D08 0C0B1EAF */ jal get_variable @@ -64,7 +64,7 @@ glabel func_802D3C58 /* F86F0 802D3D40 C6360028 */ lwc1 $f22, 0x28($s1) /* F86F4 802D3D44 C6340030 */ lwc1 $f20, 0x30($s1) /* F86F8 802D3D48 44820000 */ mtc1 $v0, $f0 -/* F86FC 802D3D4C 00000000 */ nop +/* F86FC 802D3D4C 00000000 */ nop /* F8700 802D3D50 46800020 */ cvt.s.w $f0, $f0 /* F8704 802D3D54 E6200048 */ swc1 $f0, 0x48($s1) /* F8708 802D3D58 C620002C */ lwc1 $f0, 0x2c($s1) @@ -84,7 +84,7 @@ glabel func_802D3C58 /* F8740 802D3D90 44801000 */ mtc1 $zero, $f2 /* F8744 802D3D94 46000106 */ mov.s $f4, $f0 /* F8748 802D3D98 46023032 */ c.eq.s $f6, $f2 -/* F874C 802D3D9C 00000000 */ nop +/* F874C 802D3D9C 00000000 */ nop /* F8750 802D3DA0 45000005 */ bc1f .L802D3DB8 /* F8754 802D3DA4 E6240034 */ swc1 $f4, 0x34($s1) /* F8758 802D3DA8 C620003C */ lwc1 $f0, 0x3c($s1) @@ -98,12 +98,12 @@ glabel func_802D3C58 /* F8770 802D3DC0 C6200040 */ lwc1 $f0, 0x40($s1) /* F8774 802D3DC4 C6220048 */ lwc1 $f2, 0x48($s1) /* F8778 802D3DC8 46020002 */ mul.s $f0, $f0, $f2 -/* F877C 802D3DCC 00000000 */ nop +/* F877C 802D3DCC 00000000 */ nop /* F8780 802D3DD0 3C013F00 */ lui $at, 0x3f00 /* F8784 802D3DD4 44812000 */ mtc1 $at, $f4 -/* F8788 802D3DD8 00000000 */ nop +/* F8788 802D3DD8 00000000 */ nop /* F878C 802D3DDC 46040002 */ mul.s $f0, $f0, $f4 -/* F8790 802D3DE0 00000000 */ nop +/* F8790 802D3DE0 00000000 */ nop /* F8794 802D3DE4 4602E083 */ div.s $f2, $f28, $f2 /* F8798 802D3DE8 46020000 */ add.s $f0, $f0, $f2 /* F879C 802D3DEC 24020001 */ addiu $v0, $zero, 1 @@ -130,12 +130,12 @@ glabel func_802D3C58 /* F87EC 802D3E3C C6200048 */ lwc1 $f0, 0x48($s1) /* F87F0 802D3E40 3C013F80 */ lui $at, 0x3f80 /* F87F4 802D3E44 44811000 */ mtc1 $at, $f2 -/* F87F8 802D3E48 00000000 */ nop +/* F87F8 802D3E48 00000000 */ nop /* F87FC 802D3E4C 46020001 */ sub.s $f0, $f0, $f2 /* F8800 802D3E50 44801000 */ mtc1 $zero, $f2 -/* F8804 802D3E54 00000000 */ nop +/* F8804 802D3E54 00000000 */ nop /* F8808 802D3E58 4602003E */ c.le.s $f0, $f2 -/* F880C 802D3E5C 00000000 */ nop +/* F880C 802D3E5C 00000000 */ nop /* F8810 802D3E60 45010003 */ bc1t .L802D3E70 /* F8814 802D3E64 E6200048 */ swc1 $f0, 0x48($s1) /* F8818 802D3E68 080B4FA3 */ j .L802D3E8C diff --git a/asm/nonmatchings/code_F5750/func_802D3EB8.s b/asm/nonmatchings/code_F5750/func_802D3EB8.s index baaaedf7c9..350041ee07 100644 --- a/asm/nonmatchings/code_F5750/func_802D3EB8.s +++ b/asm/nonmatchings/code_F5750/func_802D3EB8.s @@ -12,7 +12,7 @@ glabel func_802D3EB8 .L802D3ED4: /* F8884 802D3ED4 8E020070 */ lw $v0, 0x70($s0) /* F8888 802D3ED8 14400007 */ bnez $v0, .L802D3EF8 -/* F888C 802D3EDC 00000000 */ nop +/* F888C 802D3EDC 00000000 */ nop /* F8890 802D3EE0 8C650000 */ lw $a1, ($v1) /* F8894 802D3EE4 0C0B1EAF */ jal get_variable /* F8898 802D3EE8 0200202D */ daddu $a0, $s0, $zero @@ -39,9 +39,9 @@ glabel func_802D3EB8 /* F88E8 802D3F38 E6000044 */ swc1 $f0, 0x44($s0) /* F88EC 802D3F3C C6000008 */ lwc1 $f0, 8($s0) /* F88F0 802D3F40 44801000 */ mtc1 $zero, $f2 -/* F88F4 802D3F44 00000000 */ nop +/* F88F4 802D3F44 00000000 */ nop /* F88F8 802D3F48 4602003C */ c.lt.s $f0, $f2 -/* F88FC 802D3F4C 00000000 */ nop +/* F88FC 802D3F4C 00000000 */ nop /* F8900 802D3F50 45030003 */ bc1tl .L802D3F60 /* F8904 802D3F54 E6020008 */ swc1 $f2, 8($s0) /* F8908 802D3F58 080B4FD9 */ j .L802D3F64 diff --git a/asm/nonmatchings/code_F5750/func_802D3FC8.s b/asm/nonmatchings/code_F5750/func_802D3FC8.s index b991cf9261..fb5fa1cd22 100644 --- a/asm/nonmatchings/code_F5750/func_802D3FC8.s +++ b/asm/nonmatchings/code_F5750/func_802D3FC8.s @@ -26,7 +26,7 @@ glabel func_802D3FC8 /* F89CC 802D401C 0C048BBA */ jal func_80122EE8 /* F89D0 802D4020 0200282D */ daddu $a1, $s0, $zero /* F89D4 802D4024 080B500E */ j .L802D4038 -/* F89D8 802D4028 00000000 */ nop +/* F89D8 802D4028 00000000 */ nop .L802D402C: /* F89DC 802D402C 8C840000 */ lw $a0, ($a0) /* F89E0 802D4030 0C048BC9 */ jal func_80122F24 diff --git a/asm/nonmatchings/code_F5750/func_802D4050.s b/asm/nonmatchings/code_F5750/func_802D4050.s index e3797be191..f362c41a66 100644 --- a/asm/nonmatchings/code_F5750/func_802D4050.s +++ b/asm/nonmatchings/code_F5750/func_802D4050.s @@ -30,23 +30,28 @@ glabel func_802D4050 /* F8A64 802D40B4 2E020006 */ sltiu $v0, $s0, 6 /* F8A68 802D40B8 10400023 */ beqz $v0, .L802D4148 /* F8A6C 802D40BC 00101080 */ sll $v0, $s0, 2 -/* F8A70 802D40C0 3C01802E */ lui $at, %hi(D_802DA240) +/* F8A70 802D40C0 3C01802E */ lui $at, %hi(jtbl_802DA240_FEBF0) /* F8A74 802D40C4 00220821 */ addu $at, $at, $v0 -/* F8A78 802D40C8 8C22A240 */ lw $v0, %lo(D_802DA240)($at) +/* F8A78 802D40C8 8C22A240 */ lw $v0, %lo(jtbl_802DA240_FEBF0)($at) /* F8A7C 802D40CC 00400008 */ jr $v0 -/* F8A80 802D40D0 00000000 */ nop +/* F8A80 802D40D0 00000000 */ nop +glabel L802D40D4_F8A84 /* F8A84 802D40D4 24020001 */ addiu $v0, $zero, 1 /* F8A88 802D40D8 080B5052 */ j .L802D4148 /* F8A8C 802D40DC A0620004 */ sb $v0, 4($v1) +glabel L802D40E0_F8A90 /* F8A90 802D40E0 24020001 */ addiu $v0, $zero, 1 /* F8A94 802D40E4 080B5047 */ j .L802D411C /* F8A98 802D40E8 A0620004 */ sb $v0, 4($v1) +glabel L802D40EC_F8A9C /* F8A9C 802D40EC 2402000D */ addiu $v0, $zero, 0xd /* F8AA0 802D40F0 080B5047 */ j .L802D411C /* F8AA4 802D40F4 A0620004 */ sb $v0, 4($v1) +glabel L802D40F8_F8AA8 /* F8AA8 802D40F8 24020016 */ addiu $v0, $zero, 0x16 /* F8AAC 802D40FC 080B504F */ j .L802D413C /* F8AB0 802D4100 A0620004 */ sb $v0, 4($v1) +glabel L802D4104_F8AB4 /* F8AB4 802D4104 24020016 */ addiu $v0, $zero, 0x16 /* F8AB8 802D4108 A0620004 */ sb $v0, 4($v1) /* F8ABC 802D410C 8E250000 */ lw $a1, ($s1) @@ -67,6 +72,7 @@ glabel func_802D4050 /* F8AF0 802D4140 0C0B1EAF */ jal get_variable /* F8AF4 802D4144 0240202D */ daddu $a0, $s2, $zero .L802D4148: +glabel L802D4148_F8AF8 /* F8AF8 802D4148 8FBF001C */ lw $ra, 0x1c($sp) /* F8AFC 802D414C 8FB20018 */ lw $s2, 0x18($sp) /* F8B00 802D4150 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_F5750/func_802D420C.s b/asm/nonmatchings/code_F5750/func_802D420C.s index 8700521bf7..1e228ad9ec 100644 --- a/asm/nonmatchings/code_F5750/func_802D420C.s +++ b/asm/nonmatchings/code_F5750/func_802D420C.s @@ -23,7 +23,7 @@ glabel func_802D420C /* F8BFC 802D424C 50400012 */ beql $v0, $zero, .L802D4298 /* F8C00 802D4250 0000102D */ daddu $v0, $zero, $zero /* F8C04 802D4254 0C048338 */ jal load_virtual_model -/* F8C08 802D4258 00000000 */ nop +/* F8C08 802D4258 00000000 */ nop /* F8C0C 802D425C 3C013F80 */ lui $at, 0x3f80 /* F8C10 802D4260 44810000 */ mtc1 $at, $f0 /* F8C14 802D4264 AE020000 */ sw $v0, ($s0) diff --git a/asm/nonmatchings/code_F5750/func_802D42AC.s b/asm/nonmatchings/code_F5750/func_802D42AC.s index 1e604330ae..765b74c4bd 100644 --- a/asm/nonmatchings/code_F5750/func_802D42AC.s +++ b/asm/nonmatchings/code_F5750/func_802D42AC.s @@ -25,7 +25,7 @@ glabel func_802D42AC /* F8CA4 802D42F4 10400015 */ beqz $v0, .L802D434C /* F8CA8 802D42F8 0000102D */ daddu $v0, $zero, $zero /* F8CAC 802D42FC 0C048379 */ jal func_80120DE4 -/* F8CB0 802D4300 00000000 */ nop +/* F8CB0 802D4300 00000000 */ nop /* F8CB4 802D4304 3C013F80 */ lui $at, 0x3f80 /* F8CB8 802D4308 44810000 */ mtc1 $at, $f0 /* F8CBC 802D430C AE020000 */ sw $v0, ($s0) diff --git a/asm/nonmatchings/code_F5750/func_802D4364.s b/asm/nonmatchings/code_F5750/func_802D4364.s index a3ad9e216a..c3152dc47a 100644 --- a/asm/nonmatchings/code_F5750/func_802D4364.s +++ b/asm/nonmatchings/code_F5750/func_802D4364.s @@ -8,15 +8,15 @@ glabel func_802D4364 /* F8D20 802D4370 00822021 */ addu $a0, $a0, $v0 /* F8D24 802D4374 8C820000 */ lw $v0, ($a0) /* F8D28 802D4378 44850000 */ mtc1 $a1, $f0 -/* F8D2C 802D437C 00000000 */ nop +/* F8D2C 802D437C 00000000 */ nop /* F8D30 802D4380 46800020 */ cvt.s.w $f0, $f0 /* F8D34 802D4384 E4400004 */ swc1 $f0, 4($v0) /* F8D38 802D4388 44860000 */ mtc1 $a2, $f0 -/* F8D3C 802D438C 00000000 */ nop +/* F8D3C 802D438C 00000000 */ nop /* F8D40 802D4390 46800020 */ cvt.s.w $f0, $f0 /* F8D44 802D4394 E4400008 */ swc1 $f0, 8($v0) /* F8D48 802D4398 44870000 */ mtc1 $a3, $f0 -/* F8D4C 802D439C 00000000 */ nop +/* F8D4C 802D439C 00000000 */ nop /* F8D50 802D43A0 46800020 */ cvt.s.w $f0, $f0 /* F8D54 802D43A4 03E00008 */ jr $ra /* F8D58 802D43A8 E440000C */ swc1 $f0, 0xc($v0) diff --git a/asm/nonmatchings/code_F5750/func_802D4434.s b/asm/nonmatchings/code_F5750/func_802D4434.s index bf8036a80a..6e5858dee9 100644 --- a/asm/nonmatchings/code_F5750/func_802D4434.s +++ b/asm/nonmatchings/code_F5750/func_802D4434.s @@ -15,13 +15,13 @@ glabel func_802D4434 /* F8E08 802D4458 54450005 */ bnel $v0, $a1, .L802D4470 /* F8E0C 802D445C 24840001 */ addiu $a0, $a0, 1 /* F8E10 802D4460 0C0B50FD */ jal func_802D43F4 -/* F8E14 802D4464 00000000 */ nop +/* F8E14 802D4464 00000000 */ nop /* F8E18 802D4468 080B511F */ j .L802D447C -/* F8E1C 802D446C 00000000 */ nop +/* F8E1C 802D446C 00000000 */ nop .L802D4470: /* F8E20 802D4470 28820040 */ slti $v0, $a0, 0x40 /* F8E24 802D4474 1440FFF3 */ bnez $v0, .L802D4444 -/* F8E28 802D4478 00000000 */ nop +/* F8E28 802D4478 00000000 */ nop .L802D447C: /* F8E2C 802D447C 8FBF0010 */ lw $ra, 0x10($sp) /* F8E30 802D4480 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_F5750/func_802D4488.s b/asm/nonmatchings/code_F5750/func_802D4488.s index 6e0172e076..ead37263b8 100644 --- a/asm/nonmatchings/code_F5750/func_802D4488.s +++ b/asm/nonmatchings/code_F5750/func_802D4488.s @@ -11,11 +11,11 @@ glabel func_802D4488 /* F8E50 802D44A0 AFB00010 */ sw $s0, 0x10($sp) /* F8E54 802D44A4 80420070 */ lb $v0, 0x70($v0) /* F8E58 802D44A8 14400005 */ bnez $v0, .L802D44C0 -/* F8E5C 802D44AC 00000000 */ nop +/* F8E5C 802D44AC 00000000 */ nop /* F8E60 802D44B0 3C02802E */ lui $v0, %hi(D_802DB6C0) /* F8E64 802D44B4 2442B6C0 */ addiu $v0, $v0, %lo(D_802DB6C0) /* F8E68 802D44B8 080B5132 */ j .L802D44C8 -/* F8E6C 802D44BC 00000000 */ nop +/* F8E6C 802D44BC 00000000 */ nop .L802D44C0: /* F8E70 802D44C0 3C02802E */ lui $v0, %hi(D_802DB5C0) /* F8E74 802D44C4 2442B5C0 */ addiu $v0, $v0, %lo(D_802DB5C0) @@ -35,7 +35,7 @@ glabel func_802D4488 /* F8EA4 802D44F4 AC620000 */ sw $v0, ($v1) .L802D44F8: /* F8EA8 802D44F8 080B513E */ j .L802D44F8 -/* F8EAC 802D44FC 00000000 */ nop +/* F8EAC 802D44FC 00000000 */ nop .L802D4500: /* F8EB0 802D4500 3C02802E */ lui $v0, %hi(D_802DB7C0) /* F8EB4 802D4504 8C42B7C0 */ lw $v0, %lo(D_802DB7C0)($v0) diff --git a/asm/nonmatchings/code_F5750/func_802D4560.s b/asm/nonmatchings/code_F5750/func_802D4560.s index 0a16b1a72c..33a4dfa7a8 100644 --- a/asm/nonmatchings/code_F5750/func_802D4560.s +++ b/asm/nonmatchings/code_F5750/func_802D4560.s @@ -6,20 +6,20 @@ glabel func_802D4560 /* F8F14 802D4564 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* F8F18 802D4568 80420070 */ lb $v0, 0x70($v0) /* F8F1C 802D456C 14400007 */ bnez $v0, .L802D458C -/* F8F20 802D4570 00000000 */ nop +/* F8F20 802D4570 00000000 */ nop /* F8F24 802D4574 3C02802E */ lui $v0, %hi(D_802DB6C0) /* F8F28 802D4578 2442B6C0 */ addiu $v0, $v0, %lo(D_802DB6C0) /* F8F2C 802D457C 3C01802E */ lui $at, %hi(D_802DB7C0) /* F8F30 802D4580 AC22B7C0 */ sw $v0, %lo(D_802DB7C0)($at) /* F8F34 802D4584 03E00008 */ jr $ra -/* F8F38 802D4588 00000000 */ nop +/* F8F38 802D4588 00000000 */ nop .L802D458C: /* F8F3C 802D458C 3C02802E */ lui $v0, %hi(D_802DB5C0) /* F8F40 802D4590 2442B5C0 */ addiu $v0, $v0, %lo(D_802DB5C0) /* F8F44 802D4594 3C01802E */ lui $at, %hi(D_802DB7C0) /* F8F48 802D4598 AC22B7C0 */ sw $v0, %lo(D_802DB7C0)($at) /* F8F4C 802D459C 03E00008 */ jr $ra -/* F8F50 802D45A0 00000000 */ nop -/* F8F54 802D45A4 00000000 */ nop -/* F8F58 802D45A8 00000000 */ nop -/* F8F5C 802D45AC 00000000 */ nop +/* F8F50 802D45A0 00000000 */ nop +/* F8F54 802D45A4 00000000 */ nop +/* F8F58 802D45A8 00000000 */ nop +/* F8F5C 802D45AC 00000000 */ nop diff --git a/asm/nonmatchings/code_F5750/player_jump.s b/asm/nonmatchings/code_F5750/player_jump.s index b008b921eb..2bb2426e4a 100644 --- a/asm/nonmatchings/code_F5750/player_jump.s +++ b/asm/nonmatchings/code_F5750/player_jump.s @@ -21,7 +21,7 @@ glabel player_jump .L802D1520: /* F5ED0 802D1520 8E420070 */ lw $v0, 0x70($s2) /* F5ED4 802D1524 1440007E */ bnez $v0, .L802D1720 -/* F5ED8 802D1528 00000000 */ nop +/* F5ED8 802D1528 00000000 */ nop /* F5EDC 802D152C 8E050000 */ lw $a1, ($s0) /* F5EE0 802D1530 26100004 */ addiu $s0, $s0, 4 /* F5EE4 802D1534 0C0B1EAF */ jal get_variable @@ -29,12 +29,12 @@ glabel player_jump /* F5EEC 802D153C 8E050000 */ lw $a1, ($s0) /* F5EF0 802D1540 26100004 */ addiu $s0, $s0, 4 /* F5EF4 802D1544 4482B000 */ mtc1 $v0, $f22 -/* F5EF8 802D1548 00000000 */ nop +/* F5EF8 802D1548 00000000 */ nop /* F5EFC 802D154C 4680B5A0 */ cvt.s.w $f22, $f22 /* F5F00 802D1550 0C0B1EAF */ jal get_variable /* F5F04 802D1554 0240202D */ daddu $a0, $s2, $zero /* F5F08 802D1558 4482C000 */ mtc1 $v0, $f24 -/* F5F0C 802D155C 00000000 */ nop +/* F5F0C 802D155C 00000000 */ nop /* F5F10 802D1560 4680C620 */ cvt.s.w $f24, $f24 /* F5F14 802D1564 8E050000 */ lw $a1, ($s0) /* F5F18 802D1568 26100004 */ addiu $s0, $s0, 4 @@ -42,7 +42,7 @@ glabel player_jump /* F5F20 802D1570 0240202D */ daddu $a0, $s2, $zero /* F5F24 802D1574 8E050000 */ lw $a1, ($s0) /* F5F28 802D1578 4482A000 */ mtc1 $v0, $f20 -/* F5F2C 802D157C 00000000 */ nop +/* F5F2C 802D157C 00000000 */ nop /* F5F30 802D1580 4680A520 */ cvt.s.w $f20, $f20 /* F5F34 802D1584 0C0B1EAF */ jal get_variable /* F5F38 802D1588 0240202D */ daddu $a0, $s2, $zero @@ -72,9 +72,9 @@ glabel player_jump /* F5F98 802D15E8 44801000 */ mtc1 $zero, $f2 /* F5F9C 802D15EC 4600A021 */ cvt.d.s $f0, $f20 /* F5FA0 802D15F0 4620103C */ c.lt.d $f2, $f0 -/* F5FA4 802D15F4 00000000 */ nop +/* F5FA4 802D15F4 00000000 */ nop /* F5FA8 802D15F8 45000009 */ bc1f .L802D1620 -/* F5FAC 802D15FC 00000000 */ nop +/* F5FAC 802D15FC 00000000 */ nop /* F5FB0 802D1600 8E020000 */ lw $v0, ($s0) /* F5FB4 802D1604 C44C0038 */ lwc1 $f12, 0x38($v0) /* F5FB8 802D1608 C44E0040 */ lwc1 $f14, 0x40($v0) @@ -98,7 +98,7 @@ glabel player_jump /* F5FFC 802D164C A462008E */ sh $v0, 0x8e($v1) .L802D1650: /* F6000 802D1650 44820000 */ mtc1 $v0, $f0 -/* F6004 802D1654 00000000 */ nop +/* F6004 802D1654 00000000 */ nop /* F6008 802D1658 46800020 */ cvt.s.w $f0, $f0 /* F600C 802D165C 4600A003 */ div.s $f0, $f20, $f0 /* F6010 802D1660 E4600018 */ swc1 $f0, 0x18($v1) @@ -109,17 +109,17 @@ glabel player_jump /* F6020 802D1670 C4620014 */ lwc1 $f2, 0x14($v1) /* F6024 802D1674 2482FFFF */ addiu $v0, $a0, -1 /* F6028 802D1678 44820000 */ mtc1 $v0, $f0 -/* F602C 802D167C 00000000 */ nop +/* F602C 802D167C 00000000 */ nop /* F6030 802D1680 46800020 */ cvt.s.w $f0, $f0 /* F6034 802D1684 46001082 */ mul.s $f2, $f2, $f0 -/* F6038 802D1688 00000000 */ nop +/* F6038 802D1688 00000000 */ nop /* F603C 802D168C 3C013F00 */ lui $at, 0x3f00 /* F6040 802D1690 44810000 */ mtc1 $at, $f0 -/* F6044 802D1694 00000000 */ nop +/* F6044 802D1694 00000000 */ nop /* F6048 802D1698 46001082 */ mul.s $f2, $f2, $f0 -/* F604C 802D169C 00000000 */ nop +/* F604C 802D169C 00000000 */ nop /* F6050 802D16A0 44840000 */ mtc1 $a0, $f0 -/* F6054 802D16A4 00000000 */ nop +/* F6054 802D16A4 00000000 */ nop /* F6058 802D16A8 46800020 */ cvt.s.w $f0, $f0 /* F605C 802D16AC 4600C003 */ div.s $f0, $f24, $f0 /* F6060 802D16B0 46001080 */ add.s $f2, $f2, $f0 @@ -146,7 +146,7 @@ glabel player_jump /* F60B0 802D1700 34840005 */ ori $a0, $a0, 5 .L802D1704: /* F60B4 802D1704 0C037FBF */ jal func_800DFEFC -/* F60B8 802D1708 00000000 */ nop +/* F60B8 802D1708 00000000 */ nop /* F60BC 802D170C 24042081 */ addiu $a0, $zero, 0x2081 /* F60C0 802D1710 0C052736 */ jal play_sound_at_player /* F60C4 802D1714 0000282D */ daddu $a1, $zero, $zero @@ -171,15 +171,15 @@ glabel player_jump /* F6108 802D1758 16600019 */ bnez $s3, .L802D17C0 /* F610C 802D175C E440001C */ swc1 $f0, 0x1c($v0) /* F6110 802D1760 44801000 */ mtc1 $zero, $f2 -/* F6114 802D1764 00000000 */ nop +/* F6114 802D1764 00000000 */ nop /* F6118 802D1768 4604103C */ c.lt.s $f2, $f4 -/* F611C 802D176C 00000000 */ nop +/* F611C 802D176C 00000000 */ nop /* F6120 802D1770 45000013 */ bc1f .L802D17C0 -/* F6124 802D1774 00000000 */ nop +/* F6124 802D1774 00000000 */ nop /* F6128 802D1778 4602003E */ c.le.s $f0, $f2 -/* F612C 802D177C 00000000 */ nop +/* F612C 802D177C 00000000 */ nop /* F6130 802D1780 4500000F */ bc1f .L802D17C0 -/* F6134 802D1784 00000000 */ nop +/* F6134 802D1784 00000000 */ nop /* F6138 802D1788 8E230004 */ lw $v1, 4($s1) /* F613C 802D178C 30624000 */ andi $v0, $v1, 0x4000 /* F6140 802D1790 14400008 */ bnez $v0, .L802D17B4 @@ -195,7 +195,7 @@ glabel player_jump /* F6164 802D17B4 34840005 */ ori $a0, $a0, 5 .L802D17B8: /* F6168 802D17B8 0C037FBF */ jal func_800DFEFC -/* F616C 802D17BC 00000000 */ nop +/* F616C 802D17BC 00000000 */ nop .L802D17C0: /* F6170 802D17C0 3C03802E */ lui $v1, %hi(gPlayerNpcPtr) /* F6174 802D17C4 24639D20 */ addiu $v1, $v1, %lo(gPlayerNpcPtr) @@ -241,13 +241,13 @@ glabel player_jump /* F620C 802D185C 34840003 */ ori $a0, $a0, 3 .L802D1860: /* F6210 802D1860 0C037FBF */ jal func_800DFEFC -/* F6214 802D1864 00000000 */ nop +/* F6214 802D1864 00000000 */ nop /* F6218 802D1868 3C04802E */ lui $a0, %hi(gPlayerNpcPtr) /* F621C 802D186C 8C849D20 */ lw $a0, %lo(gPlayerNpcPtr)($a0) /* F6220 802D1870 0C00F598 */ jal func_8003D660 /* F6224 802D1874 24050002 */ addiu $a1, $zero, 2 /* F6228 802D1878 12600004 */ beqz $s3, .L802D188C -/* F622C 802D187C 00000000 */ nop +/* F622C 802D187C 00000000 */ nop .L802D1880: /* F6230 802D1880 24020002 */ addiu $v0, $zero, 2 /* F6234 802D1884 1662000E */ bne $s3, $v0, .L802D18C0 @@ -264,7 +264,7 @@ glabel player_jump /* F625C 802D18AC 0C038C57 */ jal func_800E315C /* F6260 802D18B0 E638002C */ swc1 $f24, 0x2c($s1) /* F6264 802D18B4 0C03BF42 */ jal func_800EFD08 -/* F6268 802D18B8 00000000 */ nop +/* F6268 802D18B8 00000000 */ nop .L802D18BC: /* F626C 802D18BC 24020001 */ addiu $v0, $zero, 1 .L802D18C0: diff --git a/asm/nonmatchings/code_FBE10/PlayEffect.s b/asm/nonmatchings/code_FBE10/PlayEffect.s index 63eebf4a12..f1f8d9b994 100644 --- a/asm/nonmatchings/code_FBE10/PlayEffect.s +++ b/asm/nonmatchings/code_FBE10/PlayEffect.s @@ -174,11 +174,12 @@ glabel PlayEffect /* FCEF0 802D8540 2C620087 */ sltiu $v0, $v1, 0x87 /* FCEF4 802D8544 10400450 */ beqz $v0, .L802D9688 /* FCEF8 802D8548 00031080 */ sll $v0, $v1, 2 -/* FCEFC 802D854C 3C01802E */ lui $at, %hi(D_802DA258) +/* FCEFC 802D854C 3C01802E */ lui $at, %hi(jtbl_802DA258_FEC08) /* FCF00 802D8550 00220821 */ addu $at, $at, $v0 -/* FCF04 802D8554 8C22A258 */ lw $v0, %lo(D_802DA258)($at) +/* FCF04 802D8554 8C22A258 */ lw $v0, %lo(jtbl_802DA258_FEC08)($at) /* FCF08 802D8558 00400008 */ jr $v0 /* FCF0C 802D855C 00000000 */ nop +glabel L802D8560_FCF10 /* FCF10 802D8560 8FA50058 */ lw $a1, 0x58($sp) /* FCF14 802D8564 4406A000 */ mfc1 $a2, $f20 /* FCF18 802D8568 4407B000 */ mfc1 $a3, $f22 @@ -190,12 +191,14 @@ glabel PlayEffect /* FCF30 802D8580 E7A00010 */ swc1 $f0, 0x10($sp) /* FCF34 802D8584 080B65A4 */ j .L802D9690 /* FCF38 802D8588 00000000 */ nop +glabel L802D858C_FCF3C /* FCF3C 802D858C C7AC0058 */ lwc1 $f12, 0x58($sp) /* FCF40 802D8590 4406B000 */ mfc1 $a2, $f22 /* FCF44 802D8594 0C01BE3C */ jal func_8006F8F0 /* FCF48 802D8598 4600A386 */ mov.s $f14, $f20 /* FCF4C 802D859C 080B65A4 */ j .L802D9690 /* FCF50 802D85A0 00000000 */ nop +glabel L802D85A4_FCF54 /* FCF54 802D85A4 4405A000 */ mfc1 $a1, $f20 /* FCF58 802D85A8 4406B000 */ mfc1 $a2, $f22 /* FCF5C 802D85AC 4407C000 */ mfc1 $a3, $f24 @@ -203,6 +206,7 @@ glabel PlayEffect /* FCF64 802D85B4 E7BA0010 */ swc1 $f26, 0x10($sp) /* FCF68 802D85B8 080B65A4 */ j .L802D9690 /* FCF6C 802D85BC 00000000 */ nop +glabel L802D85C0_FCF70 /* FCF70 802D85C0 4405A000 */ mfc1 $a1, $f20 /* FCF74 802D85C4 4406B000 */ mfc1 $a2, $f22 /* FCF78 802D85C8 4407C000 */ mfc1 $a3, $f24 @@ -211,6 +215,7 @@ glabel PlayEffect /* FCF84 802D85D4 E7BC0014 */ swc1 $f28, 0x14($sp) /* FCF88 802D85D8 080B65A4 */ j .L802D9690 /* FCF8C 802D85DC 00000000 */ nop +glabel L802D85E0_FCF90 /* FCF90 802D85E0 C7AC0058 */ lwc1 $f12, 0x58($sp) /* FCF94 802D85E4 4406B000 */ mfc1 $a2, $f22 /* FCF98 802D85E8 4407C000 */ mfc1 $a3, $f24 @@ -218,6 +223,7 @@ glabel PlayEffect /* FCFA0 802D85F0 4600A386 */ mov.s $f14, $f20 /* FCFA4 802D85F4 080B65A4 */ j .L802D9690 /* FCFA8 802D85F8 00000000 */ nop +glabel L802D85FC_FCFAC /* FCFAC 802D85FC 4405A000 */ mfc1 $a1, $f20 /* FCFB0 802D8600 4406B000 */ mfc1 $a2, $f22 /* FCFB4 802D8604 4407C000 */ mfc1 $a3, $f24 @@ -226,6 +232,7 @@ glabel PlayEffect /* FCFC0 802D8610 E7BC0014 */ swc1 $f28, 0x14($sp) /* FCFC4 802D8614 080B65A4 */ j .L802D9690 /* FCFC8 802D8618 00000000 */ nop +glabel L802D861C_FCFCC /* FCFCC 802D861C C7AC0058 */ lwc1 $f12, 0x58($sp) /* FCFD0 802D8620 4406B000 */ mfc1 $a2, $f22 /* FCFD4 802D8624 4407C000 */ mfc1 $a3, $f24 @@ -233,6 +240,7 @@ glabel PlayEffect /* FCFDC 802D862C 4600A386 */ mov.s $f14, $f20 /* FCFE0 802D8630 080B65A4 */ j .L802D9690 /* FCFE4 802D8634 00000000 */ nop +glabel L802D8638_FCFE8 /* FCFE8 802D8638 4405A000 */ mfc1 $a1, $f20 /* FCFEC 802D863C 4406B000 */ mfc1 $a2, $f22 /* FCFF0 802D8640 4407C000 */ mfc1 $a3, $f24 @@ -240,6 +248,7 @@ glabel PlayEffect /* FCFF8 802D8648 00000000 */ nop /* FCFFC 802D864C 080B65A4 */ j .L802D9690 /* FD000 802D8650 00000000 */ nop +glabel L802D8654_FD004 /* FD004 802D8654 C7AC0058 */ lwc1 $f12, 0x58($sp) /* FD008 802D8658 4406B000 */ mfc1 $a2, $f22 /* FD00C 802D865C 4407C000 */ mfc1 $a3, $f24 @@ -248,6 +257,7 @@ glabel PlayEffect /* FD018 802D8668 E7BA0010 */ swc1 $f26, 0x10($sp) /* FD01C 802D866C 080B65A4 */ j .L802D9690 /* FD020 802D8670 00000000 */ nop +glabel L802D8674_FD024 /* FD024 802D8674 8FA50058 */ lw $a1, 0x58($sp) /* FD028 802D8678 4406A000 */ mfc1 $a2, $f20 /* FD02C 802D867C 4407B000 */ mfc1 $a3, $f22 @@ -257,6 +267,7 @@ glabel PlayEffect /* FD03C 802D868C AFA30010 */ sw $v1, 0x10($sp) /* FD040 802D8690 080B65A4 */ j .L802D9690 /* FD044 802D8694 00000000 */ nop +glabel L802D8698_FD048 /* FD048 802D8698 C7AC0058 */ lwc1 $f12, 0x58($sp) /* FD04C 802D869C 4406B000 */ mfc1 $a2, $f22 /* FD050 802D86A0 8FA7004C */ lw $a3, 0x4c($sp) @@ -264,6 +275,7 @@ glabel PlayEffect /* FD058 802D86A8 4600A386 */ mov.s $f14, $f20 /* FD05C 802D86AC 080B65A4 */ j .L802D9690 /* FD060 802D86B0 00000000 */ nop +glabel L802D86B4_FD064 /* FD064 802D86B4 4405A000 */ mfc1 $a1, $f20 /* FD068 802D86B8 4406B000 */ mfc1 $a2, $f22 /* FD06C 802D86BC 4407C000 */ mfc1 $a3, $f24 @@ -275,6 +287,7 @@ glabel PlayEffect /* FD084 802D86D4 E7A2001C */ swc1 $f2, 0x1c($sp) /* FD088 802D86D8 080B65A4 */ j .L802D9690 /* FD08C 802D86DC 00000000 */ nop +glabel L802D86E0_FD090 /* FD090 802D86E0 4406B000 */ mfc1 $a2, $f22 /* FD094 802D86E4 4407C000 */ mfc1 $a3, $f24 /* FD098 802D86E8 27A20030 */ addiu $v0, $sp, 0x30 @@ -286,6 +299,7 @@ glabel PlayEffect /* FD0B0 802D8700 AFA20020 */ sw $v0, 0x20($sp) /* FD0B4 802D8704 080B6234 */ j .L802D88D0 /* FD0B8 802D8708 00000000 */ nop +glabel L802D870C_FD0BC /* FD0BC 802D870C 4405A000 */ mfc1 $a1, $f20 /* FD0C0 802D8710 4406B000 */ mfc1 $a2, $f22 /* FD0C4 802D8714 4407C000 */ mfc1 $a3, $f24 @@ -293,6 +307,7 @@ glabel PlayEffect /* FD0CC 802D871C E7BA0010 */ swc1 $f26, 0x10($sp) /* FD0D0 802D8720 080B65A4 */ j .L802D9690 /* FD0D4 802D8724 00000000 */ nop +glabel L802D8728_FD0D8 /* FD0D8 802D8728 4405A000 */ mfc1 $a1, $f20 /* FD0DC 802D872C 4406B000 */ mfc1 $a2, $f22 /* FD0E0 802D8730 4407C000 */ mfc1 $a3, $f24 @@ -303,6 +318,7 @@ glabel PlayEffect /* FD0F4 802D8744 AFB7001C */ sw $s7, 0x1c($sp) /* FD0F8 802D8748 080B65A4 */ j .L802D9690 /* FD0FC 802D874C 00000000 */ nop +glabel L802D8750_FD100 /* FD100 802D8750 4405A000 */ mfc1 $a1, $f20 /* FD104 802D8754 4406B000 */ mfc1 $a2, $f22 /* FD108 802D8758 4407C000 */ mfc1 $a3, $f24 @@ -311,6 +327,7 @@ glabel PlayEffect /* FD114 802D8764 AFB40014 */ sw $s4, 0x14($sp) /* FD118 802D8768 080B65A4 */ j .L802D9690 /* FD11C 802D876C 00000000 */ nop +glabel L802D8770_FD120 /* FD120 802D8770 4405A000 */ mfc1 $a1, $f20 /* FD124 802D8774 4406B000 */ mfc1 $a2, $f22 /* FD128 802D8778 4407C000 */ mfc1 $a3, $f24 @@ -318,6 +335,7 @@ glabel PlayEffect /* FD130 802D8780 AFB60010 */ sw $s6, 0x10($sp) /* FD134 802D8784 080B65A4 */ j .L802D9690 /* FD138 802D8788 00000000 */ nop +glabel L802D878C_FD13C /* FD13C 802D878C 4405A000 */ mfc1 $a1, $f20 /* FD140 802D8790 4406B000 */ mfc1 $a2, $f22 /* FD144 802D8794 4407C000 */ mfc1 $a3, $f24 @@ -325,6 +343,7 @@ glabel PlayEffect /* FD14C 802D879C AFB60010 */ sw $s6, 0x10($sp) /* FD150 802D87A0 080B65A4 */ j .L802D9690 /* FD154 802D87A4 00000000 */ nop +glabel L802D87A8_FD158 /* FD158 802D87A8 4405A000 */ mfc1 $a1, $f20 /* FD15C 802D87AC 4406B000 */ mfc1 $a2, $f22 /* FD160 802D87B0 4407C000 */ mfc1 $a3, $f24 @@ -332,6 +351,7 @@ glabel PlayEffect /* FD168 802D87B8 E7BA0010 */ swc1 $f26, 0x10($sp) /* FD16C 802D87BC 080B65A4 */ j .L802D9690 /* FD170 802D87C0 00000000 */ nop +glabel L802D87C4_FD174 /* FD174 802D87C4 4405A000 */ mfc1 $a1, $f20 /* FD178 802D87C8 4406B000 */ mfc1 $a2, $f22 /* FD17C 802D87CC 4407C000 */ mfc1 $a3, $f24 @@ -339,6 +359,7 @@ glabel PlayEffect /* FD184 802D87D4 00000000 */ nop /* FD188 802D87D8 080B65A4 */ j .L802D9690 /* FD18C 802D87DC 00000000 */ nop +glabel L802D87E0_FD190 /* FD190 802D87E0 4405A000 */ mfc1 $a1, $f20 /* FD194 802D87E4 4406B000 */ mfc1 $a2, $f22 /* FD198 802D87E8 4407C000 */ mfc1 $a3, $f24 @@ -349,6 +370,7 @@ glabel PlayEffect /* FD1AC 802D87FC AFB7001C */ sw $s7, 0x1c($sp) /* FD1B0 802D8800 080B65A4 */ j .L802D9690 /* FD1B4 802D8804 00000000 */ nop +glabel L802D8808_FD1B8 /* FD1B8 802D8808 4405A000 */ mfc1 $a1, $f20 /* FD1BC 802D880C 4406B000 */ mfc1 $a2, $f22 /* FD1C0 802D8810 4407C000 */ mfc1 $a3, $f24 @@ -356,6 +378,7 @@ glabel PlayEffect /* FD1C8 802D8818 00000000 */ nop /* FD1CC 802D881C 080B65A4 */ j .L802D9690 /* FD1D0 802D8820 00000000 */ nop +glabel L802D8824_FD1D4 /* FD1D4 802D8824 4405A000 */ mfc1 $a1, $f20 /* FD1D8 802D8828 4406B000 */ mfc1 $a2, $f22 /* FD1DC 802D882C 4407C000 */ mfc1 $a3, $f24 @@ -363,6 +386,7 @@ glabel PlayEffect /* FD1E4 802D8834 AFB60010 */ sw $s6, 0x10($sp) /* FD1E8 802D8838 080B65A4 */ j .L802D9690 /* FD1EC 802D883C 00000000 */ nop +glabel L802D8840_FD1F0 /* FD1F0 802D8840 4405A000 */ mfc1 $a1, $f20 /* FD1F4 802D8844 4406B000 */ mfc1 $a2, $f22 /* FD1F8 802D8848 4407C000 */ mfc1 $a3, $f24 @@ -372,6 +396,7 @@ glabel PlayEffect /* FD208 802D8858 AFA20014 */ sw $v0, 0x14($sp) /* FD20C 802D885C 080B6337 */ j .L802D8CDC /* FD210 802D8860 00000000 */ nop +glabel L802D8864_FD214 /* FD214 802D8864 4405A000 */ mfc1 $a1, $f20 /* FD218 802D8868 4406B000 */ mfc1 $a2, $f22 /* FD21C 802D886C 4407C000 */ mfc1 $a3, $f24 @@ -379,6 +404,7 @@ glabel PlayEffect /* FD224 802D8874 AFB60010 */ sw $s6, 0x10($sp) /* FD228 802D8878 080B65A4 */ j .L802D9690 /* FD22C 802D887C 00000000 */ nop +glabel L802D8880_FD230 /* FD230 802D8880 4405A000 */ mfc1 $a1, $f20 /* FD234 802D8884 4406B000 */ mfc1 $a2, $f22 /* FD238 802D8888 4407C000 */ mfc1 $a3, $f24 @@ -389,6 +415,7 @@ glabel PlayEffect /* FD24C 802D889C AFB7001C */ sw $s7, 0x1c($sp) /* FD250 802D88A0 080B65A4 */ j .L802D9690 /* FD254 802D88A4 00000000 */ nop +glabel L802D88A8_FD258 /* FD258 802D88A8 4405A000 */ mfc1 $a1, $f20 /* FD25C 802D88AC 4406B000 */ mfc1 $a2, $f22 /* FD260 802D88B0 4407C000 */ mfc1 $a3, $f24 @@ -406,6 +433,7 @@ glabel PlayEffect /* FD28C 802D88DC 0260282D */ daddu $a1, $s3, $zero /* FD290 802D88E0 080B65A4 */ j .L802D9690 /* FD294 802D88E4 00000000 */ nop +glabel L802D88E8_FD298 /* FD298 802D88E8 4405A000 */ mfc1 $a1, $f20 /* FD29C 802D88EC 4406B000 */ mfc1 $a2, $f22 /* FD2A0 802D88F0 4407C000 */ mfc1 $a3, $f24 @@ -417,6 +445,7 @@ glabel PlayEffect /* FD2B8 802D8908 E7A2001C */ swc1 $f2, 0x1c($sp) /* FD2BC 802D890C 080B65A4 */ j .L802D9690 /* FD2C0 802D8910 00000000 */ nop +glabel L802D8914_FD2C4 /* FD2C4 802D8914 4405A000 */ mfc1 $a1, $f20 /* FD2C8 802D8918 4406B000 */ mfc1 $a2, $f22 /* FD2CC 802D891C 4407C000 */ mfc1 $a3, $f24 @@ -427,6 +456,7 @@ glabel PlayEffect /* FD2E0 802D8930 AFA30018 */ sw $v1, 0x18($sp) /* FD2E4 802D8934 080B65A4 */ j .L802D9690 /* FD2E8 802D8938 00000000 */ nop +glabel L802D893C_FD2EC /* FD2EC 802D893C 4405A000 */ mfc1 $a1, $f20 /* FD2F0 802D8940 4406B000 */ mfc1 $a2, $f22 /* FD2F4 802D8944 4407C000 */ mfc1 $a3, $f24 @@ -438,6 +468,7 @@ glabel PlayEffect /* FD30C 802D895C AFA30018 */ sw $v1, 0x18($sp) /* FD310 802D8960 080B65A4 */ j .L802D9690 /* FD314 802D8964 00000000 */ nop +glabel L802D8968_FD318 /* FD318 802D8968 4405A000 */ mfc1 $a1, $f20 /* FD31C 802D896C 4406B000 */ mfc1 $a2, $f22 /* FD320 802D8970 4407C000 */ mfc1 $a3, $f24 @@ -445,6 +476,7 @@ glabel PlayEffect /* FD328 802D8978 E7BA0010 */ swc1 $f26, 0x10($sp) /* FD32C 802D897C 080B65A4 */ j .L802D9690 /* FD330 802D8980 00000000 */ nop +glabel L802D8984_FD334 /* FD334 802D8984 4405A000 */ mfc1 $a1, $f20 /* FD338 802D8988 4406B000 */ mfc1 $a2, $f22 /* FD33C 802D898C 4407C000 */ mfc1 $a3, $f24 @@ -453,6 +485,7 @@ glabel PlayEffect /* FD348 802D8998 AFB40014 */ sw $s4, 0x14($sp) /* FD34C 802D899C 080B65A4 */ j .L802D9690 /* FD350 802D89A0 00000000 */ nop +glabel L802D89A4_FD354 /* FD354 802D89A4 4405A000 */ mfc1 $a1, $f20 /* FD358 802D89A8 4406B000 */ mfc1 $a2, $f22 /* FD35C 802D89AC 4407C000 */ mfc1 $a3, $f24 @@ -460,6 +493,7 @@ glabel PlayEffect /* FD364 802D89B4 00000000 */ nop /* FD368 802D89B8 080B65A4 */ j .L802D9690 /* FD36C 802D89BC 00000000 */ nop +glabel L802D89C0_FD370 /* FD370 802D89C0 4405A000 */ mfc1 $a1, $f20 /* FD374 802D89C4 4406B000 */ mfc1 $a2, $f22 /* FD378 802D89C8 4407C000 */ mfc1 $a3, $f24 @@ -467,6 +501,7 @@ glabel PlayEffect /* FD380 802D89D0 00000000 */ nop /* FD384 802D89D4 080B65A4 */ j .L802D9690 /* FD388 802D89D8 00000000 */ nop +glabel L802D89DC_FD38C /* FD38C 802D89DC 4405A000 */ mfc1 $a1, $f20 /* FD390 802D89E0 4406B000 */ mfc1 $a2, $f22 /* FD394 802D89E4 4407C000 */ mfc1 $a3, $f24 @@ -475,6 +510,7 @@ glabel PlayEffect /* FD3A0 802D89F0 AFB40014 */ sw $s4, 0x14($sp) /* FD3A4 802D89F4 080B65A4 */ j .L802D9690 /* FD3A8 802D89F8 00000000 */ nop +glabel L802D89FC_FD3AC /* FD3AC 802D89FC 4405A000 */ mfc1 $a1, $f20 /* FD3B0 802D8A00 4406B000 */ mfc1 $a2, $f22 /* FD3B4 802D8A04 4407C000 */ mfc1 $a3, $f24 @@ -485,6 +521,7 @@ glabel PlayEffect /* FD3C8 802D8A18 AFA30018 */ sw $v1, 0x18($sp) /* FD3CC 802D8A1C 080B65A4 */ j .L802D9690 /* FD3D0 802D8A20 00000000 */ nop +glabel L802D8A24_FD3D4 /* FD3D4 802D8A24 4405A000 */ mfc1 $a1, $f20 /* FD3D8 802D8A28 4406B000 */ mfc1 $a2, $f22 /* FD3DC 802D8A2C 4407C000 */ mfc1 $a3, $f24 @@ -495,6 +532,7 @@ glabel PlayEffect /* FD3F0 802D8A40 AFA20018 */ sw $v0, 0x18($sp) /* FD3F4 802D8A44 080B62C2 */ j .L802D8B08 /* FD3F8 802D8A48 00000000 */ nop +glabel L802D8A4C_FD3FC /* FD3FC 802D8A4C 4405A000 */ mfc1 $a1, $f20 /* FD400 802D8A50 4406B000 */ mfc1 $a2, $f22 /* FD404 802D8A54 4407C000 */ mfc1 $a3, $f24 @@ -502,6 +540,7 @@ glabel PlayEffect /* FD40C 802D8A5C 00000000 */ nop /* FD410 802D8A60 080B65A4 */ j .L802D9690 /* FD414 802D8A64 00000000 */ nop +glabel L802D8A68_FD418 /* FD418 802D8A68 4405A000 */ mfc1 $a1, $f20 /* FD41C 802D8A6C 4406B000 */ mfc1 $a2, $f22 /* FD420 802D8A70 4407C000 */ mfc1 $a3, $f24 @@ -511,6 +550,7 @@ glabel PlayEffect /* FD430 802D8A80 AFA20014 */ sw $v0, 0x14($sp) /* FD434 802D8A84 080B6337 */ j .L802D8CDC /* FD438 802D8A88 00000000 */ nop +glabel L802D8A8C_FD43C /* FD43C 802D8A8C 4405A000 */ mfc1 $a1, $f20 /* FD440 802D8A90 4406B000 */ mfc1 $a2, $f22 /* FD444 802D8A94 4407C000 */ mfc1 $a3, $f24 @@ -518,6 +558,7 @@ glabel PlayEffect /* FD44C 802D8A9C 00000000 */ nop /* FD450 802D8AA0 080B65A4 */ j .L802D9690 /* FD454 802D8AA4 00000000 */ nop +glabel L802D8AA8_FD458 /* FD458 802D8AA8 4405A000 */ mfc1 $a1, $f20 /* FD45C 802D8AAC 4406B000 */ mfc1 $a2, $f22 /* FD460 802D8AB0 4407C000 */ mfc1 $a3, $f24 @@ -526,6 +567,7 @@ glabel PlayEffect /* FD46C 802D8ABC AFB40014 */ sw $s4, 0x14($sp) /* FD470 802D8AC0 080B65A4 */ j .L802D9690 /* FD474 802D8AC4 00000000 */ nop +glabel L802D8AC8_FD478 /* FD478 802D8AC8 4405A000 */ mfc1 $a1, $f20 /* FD47C 802D8ACC 4406B000 */ mfc1 $a2, $f22 /* FD480 802D8AD0 4407C000 */ mfc1 $a3, $f24 @@ -534,6 +576,7 @@ glabel PlayEffect /* FD48C 802D8ADC AFB40014 */ sw $s4, 0x14($sp) /* FD490 802D8AE0 080B65A4 */ j .L802D9690 /* FD494 802D8AE4 00000000 */ nop +glabel L802D8AE8_FD498 /* FD498 802D8AE8 4405A000 */ mfc1 $a1, $f20 /* FD49C 802D8AEC 4406B000 */ mfc1 $a2, $f22 /* FD4A0 802D8AF0 4407C000 */ mfc1 $a3, $f24 @@ -549,6 +592,7 @@ glabel PlayEffect /* FD4C4 802D8B14 8FA5006C */ lw $a1, 0x6c($sp) /* FD4C8 802D8B18 080B65A4 */ j .L802D9690 /* FD4CC 802D8B1C 00000000 */ nop +glabel L802D8B20_FD4D0 /* FD4D0 802D8B20 4405A000 */ mfc1 $a1, $f20 /* FD4D4 802D8B24 4406B000 */ mfc1 $a2, $f22 /* FD4D8 802D8B28 4407C000 */ mfc1 $a3, $f24 @@ -556,6 +600,7 @@ glabel PlayEffect /* FD4E0 802D8B30 00000000 */ nop /* FD4E4 802D8B34 080B65A4 */ j .L802D9690 /* FD4E8 802D8B38 00000000 */ nop +glabel L802D8B3C_FD4EC /* FD4EC 802D8B3C 4405A000 */ mfc1 $a1, $f20 /* FD4F0 802D8B40 4406B000 */ mfc1 $a2, $f22 /* FD4F4 802D8B44 4407C000 */ mfc1 $a3, $f24 @@ -563,6 +608,7 @@ glabel PlayEffect /* FD4FC 802D8B4C 00000000 */ nop /* FD500 802D8B50 080B65A4 */ j .L802D9690 /* FD504 802D8B54 00000000 */ nop +glabel L802D8B58_FD508 /* FD508 802D8B58 4405A000 */ mfc1 $a1, $f20 /* FD50C 802D8B5C 4406B000 */ mfc1 $a2, $f22 /* FD510 802D8B60 4407C000 */ mfc1 $a3, $f24 @@ -570,6 +616,7 @@ glabel PlayEffect /* FD518 802D8B68 E7BA0010 */ swc1 $f26, 0x10($sp) /* FD51C 802D8B6C 080B65A4 */ j .L802D9690 /* FD520 802D8B70 00000000 */ nop +glabel L802D8B74_FD524 /* FD524 802D8B74 4405A000 */ mfc1 $a1, $f20 /* FD528 802D8B78 4406B000 */ mfc1 $a2, $f22 /* FD52C 802D8B7C 4407C000 */ mfc1 $a3, $f24 @@ -578,6 +625,7 @@ glabel PlayEffect /* FD538 802D8B88 AFB40014 */ sw $s4, 0x14($sp) /* FD53C 802D8B8C 080B65A4 */ j .L802D9690 /* FD540 802D8B90 00000000 */ nop +glabel L802D8B94_FD544 /* FD544 802D8B94 4405A000 */ mfc1 $a1, $f20 /* FD548 802D8B98 4406B000 */ mfc1 $a2, $f22 /* FD54C 802D8B9C 4407C000 */ mfc1 $a3, $f24 @@ -587,6 +635,7 @@ glabel PlayEffect /* FD55C 802D8BAC AFA20014 */ sw $v0, 0x14($sp) /* FD560 802D8BB0 080B6337 */ j .L802D8CDC /* FD564 802D8BB4 00000000 */ nop +glabel L802D8BB8_FD568 /* FD568 802D8BB8 4405A000 */ mfc1 $a1, $f20 /* FD56C 802D8BBC 4406B000 */ mfc1 $a2, $f22 /* FD570 802D8BC0 4407C000 */ mfc1 $a3, $f24 @@ -596,6 +645,7 @@ glabel PlayEffect /* FD580 802D8BD0 AFA20014 */ sw $v0, 0x14($sp) /* FD584 802D8BD4 080B6337 */ j .L802D8CDC /* FD588 802D8BD8 00000000 */ nop +glabel L802D8BDC_FD58C /* FD58C 802D8BDC 4405A000 */ mfc1 $a1, $f20 /* FD590 802D8BE0 4406B000 */ mfc1 $a2, $f22 /* FD594 802D8BE4 4407C000 */ mfc1 $a3, $f24 @@ -604,6 +654,7 @@ glabel PlayEffect /* FD5A0 802D8BF0 E7BC0014 */ swc1 $f28, 0x14($sp) /* FD5A4 802D8BF4 080B65A4 */ j .L802D9690 /* FD5A8 802D8BF8 0040A82D */ daddu $s5, $v0, $zero +glabel L802D8BFC_FD5AC /* FD5AC 802D8BFC 4405A000 */ mfc1 $a1, $f20 /* FD5B0 802D8C00 4406B000 */ mfc1 $a2, $f22 /* FD5B4 802D8C04 4407C000 */ mfc1 $a3, $f24 @@ -617,6 +668,7 @@ glabel PlayEffect /* FD5D4 802D8C24 AFA30024 */ sw $v1, 0x24($sp) /* FD5D8 802D8C28 080B65A4 */ j .L802D9690 /* FD5DC 802D8C2C 0040A82D */ daddu $s5, $v0, $zero +glabel L802D8C30_FD5E0 /* FD5E0 802D8C30 4405A000 */ mfc1 $a1, $f20 /* FD5E4 802D8C34 4406B000 */ mfc1 $a2, $f22 /* FD5E8 802D8C38 4407C000 */ mfc1 $a3, $f24 @@ -625,6 +677,7 @@ glabel PlayEffect /* FD5F4 802D8C44 AFB40014 */ sw $s4, 0x14($sp) /* FD5F8 802D8C48 080B65A4 */ j .L802D9690 /* FD5FC 802D8C4C 00000000 */ nop +glabel L802D8C50_FD600 /* FD600 802D8C50 4405A000 */ mfc1 $a1, $f20 /* FD604 802D8C54 4406B000 */ mfc1 $a2, $f22 /* FD608 802D8C58 4407C000 */ mfc1 $a3, $f24 @@ -633,6 +686,7 @@ glabel PlayEffect /* FD614 802D8C64 AFB40014 */ sw $s4, 0x14($sp) /* FD618 802D8C68 080B65A4 */ j .L802D9690 /* FD61C 802D8C6C 00000000 */ nop +glabel L802D8C70_FD620 /* FD620 802D8C70 4405A000 */ mfc1 $a1, $f20 /* FD624 802D8C74 4406B000 */ mfc1 $a2, $f22 /* FD628 802D8C78 4407C000 */ mfc1 $a3, $f24 @@ -644,6 +698,7 @@ glabel PlayEffect /* FD640 802D8C90 AFA30018 */ sw $v1, 0x18($sp) /* FD644 802D8C94 080B65A4 */ j .L802D9690 /* FD648 802D8C98 00000000 */ nop +glabel L802D8C9C_FD64C /* FD64C 802D8C9C 4405A000 */ mfc1 $a1, $f20 /* FD650 802D8CA0 4406B000 */ mfc1 $a2, $f22 /* FD654 802D8CA4 4407C000 */ mfc1 $a3, $f24 @@ -653,6 +708,7 @@ glabel PlayEffect /* FD664 802D8CB4 AFA20014 */ sw $v0, 0x14($sp) /* FD668 802D8CB8 080B6337 */ j .L802D8CDC /* FD66C 802D8CBC 00000000 */ nop +glabel L802D8CC0_FD670 /* FD670 802D8CC0 4405A000 */ mfc1 $a1, $f20 /* FD674 802D8CC4 4406B000 */ mfc1 $a2, $f22 /* FD678 802D8CC8 4407C000 */ mfc1 $a3, $f24 @@ -667,6 +723,7 @@ glabel PlayEffect /* FD698 802D8CE8 0200282D */ daddu $a1, $s0, $zero /* FD69C 802D8CEC 080B65A4 */ j .L802D9690 /* FD6A0 802D8CF0 00000000 */ nop +glabel L802D8CF4_FD6A4 /* FD6A4 802D8CF4 4405A000 */ mfc1 $a1, $f20 /* FD6A8 802D8CF8 4406B000 */ mfc1 $a2, $f22 /* FD6AC 802D8CFC 4407C000 */ mfc1 $a3, $f24 @@ -683,6 +740,7 @@ glabel PlayEffect /* FD6D8 802D8D28 0220282D */ daddu $a1, $s1, $zero /* FD6DC 802D8D2C 080B65A4 */ j .L802D9690 /* FD6E0 802D8D30 00000000 */ nop +glabel L802D8D34_FD6E4 /* FD6E4 802D8D34 4405A000 */ mfc1 $a1, $f20 /* FD6E8 802D8D38 4406B000 */ mfc1 $a2, $f22 /* FD6EC 802D8D3C 4407C000 */ mfc1 $a3, $f24 @@ -691,6 +749,7 @@ glabel PlayEffect /* FD6F8 802D8D48 AFB40014 */ sw $s4, 0x14($sp) /* FD6FC 802D8D4C 080B65A4 */ j .L802D9690 /* FD700 802D8D50 00000000 */ nop +glabel L802D8D54_FD704 /* FD704 802D8D54 4405A000 */ mfc1 $a1, $f20 /* FD708 802D8D58 4406B000 */ mfc1 $a2, $f22 /* FD70C 802D8D5C 4407C000 */ mfc1 $a3, $f24 @@ -698,6 +757,7 @@ glabel PlayEffect /* FD714 802D8D64 AFB60010 */ sw $s6, 0x10($sp) /* FD718 802D8D68 080B65A4 */ j .L802D9690 /* FD71C 802D8D6C 0040A82D */ daddu $s5, $v0, $zero +glabel L802D8D70_FD720 /* FD720 802D8D70 4405A000 */ mfc1 $a1, $f20 /* FD724 802D8D74 4406B000 */ mfc1 $a2, $f22 /* FD728 802D8D78 4407C000 */ mfc1 $a3, $f24 @@ -705,6 +765,7 @@ glabel PlayEffect /* FD730 802D8D80 AFB60010 */ sw $s6, 0x10($sp) /* FD734 802D8D84 080B65A4 */ j .L802D9690 /* FD738 802D8D88 0040A82D */ daddu $s5, $v0, $zero +glabel L802D8D8C_FD73C /* FD73C 802D8D8C 4405A000 */ mfc1 $a1, $f20 /* FD740 802D8D90 4406B000 */ mfc1 $a2, $f22 /* FD744 802D8D94 4407C000 */ mfc1 $a3, $f24 @@ -712,6 +773,7 @@ glabel PlayEffect /* FD74C 802D8D9C AFB60010 */ sw $s6, 0x10($sp) /* FD750 802D8DA0 080B65A4 */ j .L802D9690 /* FD754 802D8DA4 0040A82D */ daddu $s5, $v0, $zero +glabel L802D8DA8_FD758 /* FD758 802D8DA8 8FA50044 */ lw $a1, 0x44($sp) /* FD75C 802D8DAC 4407C000 */ mfc1 $a3, $f24 /* FD760 802D8DB0 8FA60048 */ lw $a2, 0x48($sp) @@ -720,6 +782,7 @@ glabel PlayEffect /* FD76C 802D8DBC AFB40014 */ sw $s4, 0x14($sp) /* FD770 802D8DC0 080B65A4 */ j .L802D9690 /* FD774 802D8DC4 0040A82D */ daddu $s5, $v0, $zero +glabel L802D8DC8_FD778 /* FD778 802D8DC8 4405A000 */ mfc1 $a1, $f20 /* FD77C 802D8DCC 4406B000 */ mfc1 $a2, $f22 /* FD780 802D8DD0 4407C000 */ mfc1 $a3, $f24 @@ -728,6 +791,7 @@ glabel PlayEffect /* FD78C 802D8DDC AFB40014 */ sw $s4, 0x14($sp) /* FD790 802D8DE0 080B65A4 */ j .L802D9690 /* FD794 802D8DE4 0040A82D */ daddu $s5, $v0, $zero +glabel L802D8DE8_FD798 /* FD798 802D8DE8 4405A000 */ mfc1 $a1, $f20 /* FD79C 802D8DEC 4406B000 */ mfc1 $a2, $f22 /* FD7A0 802D8DF0 4407C000 */ mfc1 $a3, $f24 @@ -736,16 +800,19 @@ glabel PlayEffect /* FD7AC 802D8DFC AFB40014 */ sw $s4, 0x14($sp) /* FD7B0 802D8E00 080B65A4 */ j .L802D9690 /* FD7B4 802D8E04 0040A82D */ daddu $s5, $v0, $zero +glabel L802D8E08_FD7B8 /* FD7B8 802D8E08 8FA50044 */ lw $a1, 0x44($sp) /* FD7BC 802D8E0C 0C01C49C */ jal func_80071270 /* FD7C0 802D8E10 00000000 */ nop /* FD7C4 802D8E14 080B65A4 */ j .L802D9690 /* FD7C8 802D8E18 0040A82D */ daddu $s5, $v0, $zero +glabel L802D8E1C_FD7CC /* FD7CC 802D8E1C 4406B000 */ mfc1 $a2, $f22 /* FD7D0 802D8E20 0C01C4B4 */ jal func_800712D0 /* FD7D4 802D8E24 8FA7004C */ lw $a3, 0x4c($sp) /* FD7D8 802D8E28 080B65A4 */ j .L802D9690 /* FD7DC 802D8E2C 0040A82D */ daddu $s5, $v0, $zero +glabel L802D8E30_FD7E0 /* FD7E0 802D8E30 4405A000 */ mfc1 $a1, $f20 /* FD7E4 802D8E34 4406B000 */ mfc1 $a2, $f22 /* FD7E8 802D8E38 4407C000 */ mfc1 $a3, $f24 @@ -754,6 +821,7 @@ glabel PlayEffect /* FD7F4 802D8E44 AFB40014 */ sw $s4, 0x14($sp) /* FD7F8 802D8E48 080B65A4 */ j .L802D9690 /* FD7FC 802D8E4C 0040A82D */ daddu $s5, $v0, $zero +glabel L802D8E50_FD800 /* FD800 802D8E50 4405A000 */ mfc1 $a1, $f20 /* FD804 802D8E54 4406B000 */ mfc1 $a2, $f22 /* FD808 802D8E58 4407C000 */ mfc1 $a3, $f24 @@ -762,6 +830,7 @@ glabel PlayEffect /* FD814 802D8E64 AFB40014 */ sw $s4, 0x14($sp) /* FD818 802D8E68 080B65A4 */ j .L802D9690 /* FD81C 802D8E6C 0040A82D */ daddu $s5, $v0, $zero +glabel L802D8E70_FD820 /* FD820 802D8E70 4405A000 */ mfc1 $a1, $f20 /* FD824 802D8E74 4406B000 */ mfc1 $a2, $f22 /* FD828 802D8E78 4407C000 */ mfc1 $a3, $f24 @@ -770,6 +839,7 @@ glabel PlayEffect /* FD834 802D8E84 AFB40014 */ sw $s4, 0x14($sp) /* FD838 802D8E88 080B65A4 */ j .L802D9690 /* FD83C 802D8E8C 0040A82D */ daddu $s5, $v0, $zero +glabel L802D8E90_FD840 /* FD840 802D8E90 4405A000 */ mfc1 $a1, $f20 /* FD844 802D8E94 4406B000 */ mfc1 $a2, $f22 /* FD848 802D8E98 4407C000 */ mfc1 $a3, $f24 @@ -778,6 +848,7 @@ glabel PlayEffect /* FD854 802D8EA4 E7BC0014 */ swc1 $f28, 0x14($sp) /* FD858 802D8EA8 080B65A4 */ j .L802D9690 /* FD85C 802D8EAC 0040A82D */ daddu $s5, $v0, $zero +glabel L802D8EB0_FD860 /* FD860 802D8EB0 4405A000 */ mfc1 $a1, $f20 /* FD864 802D8EB4 4406B000 */ mfc1 $a2, $f22 /* FD868 802D8EB8 4407C000 */ mfc1 $a3, $f24 @@ -786,6 +857,7 @@ glabel PlayEffect /* FD874 802D8EC4 AFB40014 */ sw $s4, 0x14($sp) /* FD878 802D8EC8 080B65A4 */ j .L802D9690 /* FD87C 802D8ECC 0040A82D */ daddu $s5, $v0, $zero +glabel L802D8ED0_FD880 /* FD880 802D8ED0 4405A000 */ mfc1 $a1, $f20 /* FD884 802D8ED4 4406B000 */ mfc1 $a2, $f22 /* FD888 802D8ED8 4407C000 */ mfc1 $a3, $f24 @@ -798,6 +870,7 @@ glabel PlayEffect /* FD8A4 802D8EF4 E7A2001C */ swc1 $f2, 0x1c($sp) /* FD8A8 802D8EF8 080B65A4 */ j .L802D9690 /* FD8AC 802D8EFC 0040A82D */ daddu $s5, $v0, $zero +glabel L802D8F00_FD8B0 /* FD8B0 802D8F00 4600E08D */ trunc.w.s $f2, $f28 /* FD8B4 802D8F04 E7A20014 */ swc1 $f2, 0x14($sp) /* FD8B8 802D8F08 C7A2005C */ lwc1 $f2, 0x5c($sp) @@ -815,6 +888,7 @@ glabel PlayEffect /* FD8E8 802D8F38 AFA30024 */ sw $v1, 0x24($sp) /* FD8EC 802D8F3C 080B65A4 */ j .L802D9690 /* FD8F0 802D8F40 0040A82D */ daddu $s5, $v0, $zero +glabel L802D8F44_FD8F4 /* FD8F4 802D8F44 4405A000 */ mfc1 $a1, $f20 /* FD8F8 802D8F48 4406B000 */ mfc1 $a2, $f22 /* FD8FC 802D8F4C 4407C000 */ mfc1 $a3, $f24 @@ -822,6 +896,7 @@ glabel PlayEffect /* FD904 802D8F54 00000000 */ nop /* FD908 802D8F58 080B65A4 */ j .L802D9690 /* FD90C 802D8F5C 0040A82D */ daddu $s5, $v0, $zero +glabel L802D8F60_FD910 /* FD910 802D8F60 4405A000 */ mfc1 $a1, $f20 /* FD914 802D8F64 4406B000 */ mfc1 $a2, $f22 /* FD918 802D8F68 4407C000 */ mfc1 $a3, $f24 @@ -830,6 +905,7 @@ glabel PlayEffect /* FD924 802D8F74 AFB40014 */ sw $s4, 0x14($sp) /* FD928 802D8F78 080B65A4 */ j .L802D9690 /* FD92C 802D8F7C 0040A82D */ daddu $s5, $v0, $zero +glabel L802D8F80_FD930 /* FD930 802D8F80 4405A000 */ mfc1 $a1, $f20 /* FD934 802D8F84 4406B000 */ mfc1 $a2, $f22 /* FD938 802D8F88 4407C000 */ mfc1 $a3, $f24 @@ -838,6 +914,7 @@ glabel PlayEffect /* FD944 802D8F94 AFB40014 */ sw $s4, 0x14($sp) /* FD948 802D8F98 080B65A4 */ j .L802D9690 /* FD94C 802D8F9C 0040A82D */ daddu $s5, $v0, $zero +glabel L802D8FA0_FD950 /* FD950 802D8FA0 4405A000 */ mfc1 $a1, $f20 /* FD954 802D8FA4 4406B000 */ mfc1 $a2, $f22 /* FD958 802D8FA8 4407C000 */ mfc1 $a3, $f24 @@ -845,6 +922,7 @@ glabel PlayEffect /* FD960 802D8FB0 00000000 */ nop /* FD964 802D8FB4 080B65A4 */ j .L802D9690 /* FD968 802D8FB8 0040A82D */ daddu $s5, $v0, $zero +glabel L802D8FBC_FD96C /* FD96C 802D8FBC 4405A000 */ mfc1 $a1, $f20 /* FD970 802D8FC0 4406B000 */ mfc1 $a2, $f22 /* FD974 802D8FC4 4407C000 */ mfc1 $a3, $f24 @@ -853,6 +931,7 @@ glabel PlayEffect /* FD980 802D8FD0 AFB40014 */ sw $s4, 0x14($sp) /* FD984 802D8FD4 080B65A4 */ j .L802D9690 /* FD988 802D8FD8 0040A82D */ daddu $s5, $v0, $zero +glabel L802D8FDC_FD98C /* FD98C 802D8FDC 4405A000 */ mfc1 $a1, $f20 /* FD990 802D8FE0 4406B000 */ mfc1 $a2, $f22 /* FD994 802D8FE4 4407C000 */ mfc1 $a3, $f24 @@ -861,6 +940,7 @@ glabel PlayEffect /* FD9A0 802D8FF0 AFB40014 */ sw $s4, 0x14($sp) /* FD9A4 802D8FF4 080B65A4 */ j .L802D9690 /* FD9A8 802D8FF8 0040A82D */ daddu $s5, $v0, $zero +glabel L802D8FFC_FD9AC /* FD9AC 802D8FFC 4405A000 */ mfc1 $a1, $f20 /* FD9B0 802D9000 4406B000 */ mfc1 $a2, $f22 /* FD9B4 802D9004 4407C000 */ mfc1 $a3, $f24 @@ -869,6 +949,7 @@ glabel PlayEffect /* FD9C0 802D9010 AFB40014 */ sw $s4, 0x14($sp) /* FD9C4 802D9014 080B65A4 */ j .L802D9690 /* FD9C8 802D9018 0040A82D */ daddu $s5, $v0, $zero +glabel L802D901C_FD9CC /* FD9CC 802D901C 4405A000 */ mfc1 $a1, $f20 /* FD9D0 802D9020 4406B000 */ mfc1 $a2, $f22 /* FD9D4 802D9024 4407C000 */ mfc1 $a3, $f24 @@ -877,6 +958,7 @@ glabel PlayEffect /* FD9E0 802D9030 AFB40014 */ sw $s4, 0x14($sp) /* FD9E4 802D9034 080B65A4 */ j .L802D9690 /* FD9E8 802D9038 0040A82D */ daddu $s5, $v0, $zero +glabel L802D903C_FD9EC /* FD9EC 802D903C 4405A000 */ mfc1 $a1, $f20 /* FD9F0 802D9040 4406B000 */ mfc1 $a2, $f22 /* FD9F4 802D9044 4407C000 */ mfc1 $a3, $f24 @@ -889,6 +971,7 @@ glabel PlayEffect /* FDA10 802D9060 E7A2001C */ swc1 $f2, 0x1c($sp) /* FDA14 802D9064 080B65A4 */ j .L802D9690 /* FDA18 802D9068 0040A82D */ daddu $s5, $v0, $zero +glabel L802D906C_FDA1C /* FDA1C 802D906C 4405A000 */ mfc1 $a1, $f20 /* FDA20 802D9070 4406B000 */ mfc1 $a2, $f22 /* FDA24 802D9074 4407C000 */ mfc1 $a3, $f24 @@ -897,6 +980,7 @@ glabel PlayEffect /* FDA30 802D9080 AFB40014 */ sw $s4, 0x14($sp) /* FDA34 802D9084 080B65A4 */ j .L802D9690 /* FDA38 802D9088 0040A82D */ daddu $s5, $v0, $zero +glabel L802D908C_FDA3C /* FDA3C 802D908C 4405A000 */ mfc1 $a1, $f20 /* FDA40 802D9090 4406B000 */ mfc1 $a2, $f22 /* FDA44 802D9094 4407C000 */ mfc1 $a3, $f24 @@ -905,6 +989,7 @@ glabel PlayEffect /* FDA50 802D90A0 AFB40014 */ sw $s4, 0x14($sp) /* FDA54 802D90A4 080B65A4 */ j .L802D9690 /* FDA58 802D90A8 0040A82D */ daddu $s5, $v0, $zero +glabel L802D90AC_FDA5C /* FDA5C 802D90AC 4405A000 */ mfc1 $a1, $f20 /* FDA60 802D90B0 4406B000 */ mfc1 $a2, $f22 /* FDA64 802D90B4 4407C000 */ mfc1 $a3, $f24 @@ -913,6 +998,7 @@ glabel PlayEffect /* FDA70 802D90C0 AFB40014 */ sw $s4, 0x14($sp) /* FDA74 802D90C4 080B65A4 */ j .L802D9690 /* FDA78 802D90C8 0040A82D */ daddu $s5, $v0, $zero +glabel L802D90CC_FDA7C /* FDA7C 802D90CC 4405A000 */ mfc1 $a1, $f20 /* FDA80 802D90D0 4406B000 */ mfc1 $a2, $f22 /* FDA84 802D90D4 4407C000 */ mfc1 $a3, $f24 @@ -921,6 +1007,7 @@ glabel PlayEffect /* FDA90 802D90E0 AFB40014 */ sw $s4, 0x14($sp) /* FDA94 802D90E4 080B65A4 */ j .L802D9690 /* FDA98 802D90E8 0040A82D */ daddu $s5, $v0, $zero +glabel L802D90EC_FDA9C /* FDA9C 802D90EC 4405A000 */ mfc1 $a1, $f20 /* FDAA0 802D90F0 4406B000 */ mfc1 $a2, $f22 /* FDAA4 802D90F4 4407C000 */ mfc1 $a3, $f24 @@ -933,6 +1020,7 @@ glabel PlayEffect /* FDAC0 802D9110 E7A2001C */ swc1 $f2, 0x1c($sp) /* FDAC4 802D9114 080B65A4 */ j .L802D9690 /* FDAC8 802D9118 0040A82D */ daddu $s5, $v0, $zero +glabel L802D911C_FDACC /* FDACC 802D911C 4405A000 */ mfc1 $a1, $f20 /* FDAD0 802D9120 4406B000 */ mfc1 $a2, $f22 /* FDAD4 802D9124 4407C000 */ mfc1 $a3, $f24 @@ -941,6 +1029,7 @@ glabel PlayEffect /* FDAE0 802D9130 AFB40014 */ sw $s4, 0x14($sp) /* FDAE4 802D9134 080B65A4 */ j .L802D9690 /* FDAE8 802D9138 0040A82D */ daddu $s5, $v0, $zero +glabel L802D913C_FDAEC /* FDAEC 802D913C 4405A000 */ mfc1 $a1, $f20 /* FDAF0 802D9140 4406B000 */ mfc1 $a2, $f22 /* FDAF4 802D9144 4407C000 */ mfc1 $a3, $f24 @@ -949,6 +1038,7 @@ glabel PlayEffect /* FDB00 802D9150 AFB40014 */ sw $s4, 0x14($sp) /* FDB04 802D9154 080B65A4 */ j .L802D9690 /* FDB08 802D9158 0040A82D */ daddu $s5, $v0, $zero +glabel L802D915C_FDB0C /* FDB0C 802D915C 4405A000 */ mfc1 $a1, $f20 /* FDB10 802D9160 4406B000 */ mfc1 $a2, $f22 /* FDB14 802D9164 4407C000 */ mfc1 $a3, $f24 @@ -957,6 +1047,7 @@ glabel PlayEffect /* FDB20 802D9170 AFB40014 */ sw $s4, 0x14($sp) /* FDB24 802D9174 080B65A4 */ j .L802D9690 /* FDB28 802D9178 0040A82D */ daddu $s5, $v0, $zero +glabel L802D917C_FDB2C /* FDB2C 802D917C 4405A000 */ mfc1 $a1, $f20 /* FDB30 802D9180 4406B000 */ mfc1 $a2, $f22 /* FDB34 802D9184 4407C000 */ mfc1 $a3, $f24 @@ -965,6 +1056,7 @@ glabel PlayEffect /* FDB40 802D9190 AFB40014 */ sw $s4, 0x14($sp) /* FDB44 802D9194 080B65A4 */ j .L802D9690 /* FDB48 802D9198 0040A82D */ daddu $s5, $v0, $zero +glabel L802D919C_FDB4C /* FDB4C 802D919C 4405A000 */ mfc1 $a1, $f20 /* FDB50 802D91A0 4406B000 */ mfc1 $a2, $f22 /* FDB54 802D91A4 4407C000 */ mfc1 $a3, $f24 @@ -979,6 +1071,7 @@ glabel PlayEffect /* FDB78 802D91C8 AFA30024 */ sw $v1, 0x24($sp) /* FDB7C 802D91CC 080B65A4 */ j .L802D9690 /* FDB80 802D91D0 0040A82D */ daddu $s5, $v0, $zero +glabel L802D91D4_FDB84 /* FDB84 802D91D4 4405A000 */ mfc1 $a1, $f20 /* FDB88 802D91D8 4406B000 */ mfc1 $a2, $f22 /* FDB8C 802D91DC 4407C000 */ mfc1 $a3, $f24 @@ -991,6 +1084,7 @@ glabel PlayEffect /* FDBA8 802D91F8 E7A2001C */ swc1 $f2, 0x1c($sp) /* FDBAC 802D91FC 080B65A4 */ j .L802D9690 /* FDBB0 802D9200 0040A82D */ daddu $s5, $v0, $zero +glabel L802D9204_FDBB4 /* FDBB4 802D9204 4405A000 */ mfc1 $a1, $f20 /* FDBB8 802D9208 4406B000 */ mfc1 $a2, $f22 /* FDBBC 802D920C 4407C000 */ mfc1 $a3, $f24 @@ -999,6 +1093,7 @@ glabel PlayEffect /* FDBC8 802D9218 AFB40014 */ sw $s4, 0x14($sp) /* FDBCC 802D921C 080B65A4 */ j .L802D9690 /* FDBD0 802D9220 0040A82D */ daddu $s5, $v0, $zero +glabel L802D9224_FDBD4 /* FDBD4 802D9224 4405A000 */ mfc1 $a1, $f20 /* FDBD8 802D9228 4406B000 */ mfc1 $a2, $f22 /* FDBDC 802D922C 4407C000 */ mfc1 $a3, $f24 @@ -1007,6 +1102,7 @@ glabel PlayEffect /* FDBE8 802D9238 AFB40014 */ sw $s4, 0x14($sp) /* FDBEC 802D923C 080B65A4 */ j .L802D9690 /* FDBF0 802D9240 0040A82D */ daddu $s5, $v0, $zero +glabel L802D9244_FDBF4 /* FDBF4 802D9244 4405A000 */ mfc1 $a1, $f20 /* FDBF8 802D9248 4406B000 */ mfc1 $a2, $f22 /* FDBFC 802D924C 4407C000 */ mfc1 $a3, $f24 @@ -1015,6 +1111,7 @@ glabel PlayEffect /* FDC08 802D9258 AFB40014 */ sw $s4, 0x14($sp) /* FDC0C 802D925C 080B65A4 */ j .L802D9690 /* FDC10 802D9260 0040A82D */ daddu $s5, $v0, $zero +glabel L802D9264_FDC14 /* FDC14 802D9264 4405A000 */ mfc1 $a1, $f20 /* FDC18 802D9268 4406B000 */ mfc1 $a2, $f22 /* FDC1C 802D926C 4407C000 */ mfc1 $a3, $f24 @@ -1023,6 +1120,7 @@ glabel PlayEffect /* FDC28 802D9278 AFB40014 */ sw $s4, 0x14($sp) /* FDC2C 802D927C 080B65A4 */ j .L802D9690 /* FDC30 802D9280 0040A82D */ daddu $s5, $v0, $zero +glabel L802D9284_FDC34 /* FDC34 802D9284 4405A000 */ mfc1 $a1, $f20 /* FDC38 802D9288 4406B000 */ mfc1 $a2, $f22 /* FDC3C 802D928C 4407C000 */ mfc1 $a3, $f24 @@ -1031,6 +1129,7 @@ glabel PlayEffect /* FDC48 802D9298 AFB40014 */ sw $s4, 0x14($sp) /* FDC4C 802D929C 080B65A4 */ j .L802D9690 /* FDC50 802D92A0 0040A82D */ daddu $s5, $v0, $zero +glabel L802D92A4_FDC54 /* FDC54 802D92A4 4405A000 */ mfc1 $a1, $f20 /* FDC58 802D92A8 4406B000 */ mfc1 $a2, $f22 /* FDC5C 802D92AC 4407C000 */ mfc1 $a3, $f24 @@ -1039,6 +1138,7 @@ glabel PlayEffect /* FDC68 802D92B8 AFB40014 */ sw $s4, 0x14($sp) /* FDC6C 802D92BC 080B65A4 */ j .L802D9690 /* FDC70 802D92C0 0040A82D */ daddu $s5, $v0, $zero +glabel L802D92C4_FDC74 /* FDC74 802D92C4 4405A000 */ mfc1 $a1, $f20 /* FDC78 802D92C8 4406B000 */ mfc1 $a2, $f22 /* FDC7C 802D92CC 4407C000 */ mfc1 $a3, $f24 @@ -1047,6 +1147,7 @@ glabel PlayEffect /* FDC88 802D92D8 AFB40014 */ sw $s4, 0x14($sp) /* FDC8C 802D92DC 080B65A4 */ j .L802D9690 /* FDC90 802D92E0 0040A82D */ daddu $s5, $v0, $zero +glabel L802D92E4_FDC94 /* FDC94 802D92E4 4405A000 */ mfc1 $a1, $f20 /* FDC98 802D92E8 4406B000 */ mfc1 $a2, $f22 /* FDC9C 802D92EC 4407C000 */ mfc1 $a3, $f24 @@ -1055,6 +1156,7 @@ glabel PlayEffect /* FDCA8 802D92F8 AFB40014 */ sw $s4, 0x14($sp) /* FDCAC 802D92FC 080B65A4 */ j .L802D9690 /* FDCB0 802D9300 0040A82D */ daddu $s5, $v0, $zero +glabel L802D9304_FDCB4 /* FDCB4 802D9304 4405A000 */ mfc1 $a1, $f20 /* FDCB8 802D9308 4406B000 */ mfc1 $a2, $f22 /* FDCBC 802D930C 4407C000 */ mfc1 $a3, $f24 @@ -1065,6 +1167,7 @@ glabel PlayEffect /* FDCD0 802D9320 AFB7001C */ sw $s7, 0x1c($sp) /* FDCD4 802D9324 080B65A4 */ j .L802D9690 /* FDCD8 802D9328 0040A82D */ daddu $s5, $v0, $zero +glabel L802D932C_FDCDC /* FDCDC 802D932C 4405A000 */ mfc1 $a1, $f20 /* FDCE0 802D9330 4406B000 */ mfc1 $a2, $f22 /* FDCE4 802D9334 4407C000 */ mfc1 $a3, $f24 @@ -1073,6 +1176,7 @@ glabel PlayEffect /* FDCF0 802D9340 AFB40014 */ sw $s4, 0x14($sp) /* FDCF4 802D9344 080B65A4 */ j .L802D9690 /* FDCF8 802D9348 0040A82D */ daddu $s5, $v0, $zero +glabel L802D934C_FDCFC /* FDCFC 802D934C C7A20064 */ lwc1 $f2, 0x64($sp) /* FDD00 802D9350 4405A000 */ mfc1 $a1, $f20 /* FDD04 802D9354 4406B000 */ mfc1 $a2, $f22 @@ -1088,6 +1192,7 @@ glabel PlayEffect /* FDD2C 802D937C E7A20028 */ swc1 $f2, 0x28($sp) /* FDD30 802D9380 080B65A4 */ j .L802D9690 /* FDD34 802D9384 0040A82D */ daddu $s5, $v0, $zero +glabel L802D9388_FDD38 /* FDD38 802D9388 4405A000 */ mfc1 $a1, $f20 /* FDD3C 802D938C 4406B000 */ mfc1 $a2, $f22 /* FDD40 802D9390 4407C000 */ mfc1 $a3, $f24 @@ -1096,6 +1201,7 @@ glabel PlayEffect /* FDD4C 802D939C AFB40014 */ sw $s4, 0x14($sp) /* FDD50 802D93A0 080B65A4 */ j .L802D9690 /* FDD54 802D93A4 0040A82D */ daddu $s5, $v0, $zero +glabel L802D93A8_FDD58 /* FDD58 802D93A8 4405A000 */ mfc1 $a1, $f20 /* FDD5C 802D93AC 4406B000 */ mfc1 $a2, $f22 /* FDD60 802D93B0 4407C000 */ mfc1 $a3, $f24 @@ -1107,6 +1213,7 @@ glabel PlayEffect /* FDD78 802D93C8 AFBE0020 */ sw $fp, 0x20($sp) /* FDD7C 802D93CC 080B65A4 */ j .L802D9690 /* FDD80 802D93D0 0040A82D */ daddu $s5, $v0, $zero +glabel L802D93D4_FDD84 /* FDD84 802D93D4 4405A000 */ mfc1 $a1, $f20 /* FDD88 802D93D8 4406B000 */ mfc1 $a2, $f22 /* FDD8C 802D93DC 4407C000 */ mfc1 $a3, $f24 @@ -1117,6 +1224,7 @@ glabel PlayEffect /* FDDA0 802D93F0 AFA30018 */ sw $v1, 0x18($sp) /* FDDA4 802D93F4 080B65A4 */ j .L802D9690 /* FDDA8 802D93F8 0040A82D */ daddu $s5, $v0, $zero +glabel L802D93FC_FDDAC /* FDDAC 802D93FC C7A2005C */ lwc1 $f2, 0x5c($sp) /* FDDB0 802D9400 4405A000 */ mfc1 $a1, $f20 /* FDDB4 802D9404 4406B000 */ mfc1 $a2, $f22 @@ -1130,6 +1238,7 @@ glabel PlayEffect /* FDDD4 802D9424 E7A20020 */ swc1 $f2, 0x20($sp) /* FDDD8 802D9428 080B65A4 */ j .L802D9690 /* FDDDC 802D942C 0040A82D */ daddu $s5, $v0, $zero +glabel L802D9430_FDDE0 /* FDDE0 802D9430 4405A000 */ mfc1 $a1, $f20 /* FDDE4 802D9434 4406B000 */ mfc1 $a2, $f22 /* FDDE8 802D9438 4407C000 */ mfc1 $a3, $f24 @@ -1138,6 +1247,7 @@ glabel PlayEffect /* FDDF4 802D9444 AFB40014 */ sw $s4, 0x14($sp) /* FDDF8 802D9448 080B65A4 */ j .L802D9690 /* FDDFC 802D944C 0040A82D */ daddu $s5, $v0, $zero +glabel L802D9450_FDE00 /* FDE00 802D9450 4405A000 */ mfc1 $a1, $f20 /* FDE04 802D9454 4406B000 */ mfc1 $a2, $f22 /* FDE08 802D9458 4407C000 */ mfc1 $a3, $f24 @@ -1150,6 +1260,7 @@ glabel PlayEffect /* FDE24 802D9474 E7A2001C */ swc1 $f2, 0x1c($sp) /* FDE28 802D9478 080B65A4 */ j .L802D9690 /* FDE2C 802D947C 0040A82D */ daddu $s5, $v0, $zero +glabel L802D9480_FDE30 /* FDE30 802D9480 4405A000 */ mfc1 $a1, $f20 /* FDE34 802D9484 4406B000 */ mfc1 $a2, $f22 /* FDE38 802D9488 4407C000 */ mfc1 $a3, $f24 @@ -1158,6 +1269,7 @@ glabel PlayEffect /* FDE44 802D9494 AFB40014 */ sw $s4, 0x14($sp) /* FDE48 802D9498 080B65A4 */ j .L802D9690 /* FDE4C 802D949C 0040A82D */ daddu $s5, $v0, $zero +glabel L802D94A0_FDE50 /* FDE50 802D94A0 4405A000 */ mfc1 $a1, $f20 /* FDE54 802D94A4 4406B000 */ mfc1 $a2, $f22 /* FDE58 802D94A8 4407C000 */ mfc1 $a3, $f24 @@ -1165,6 +1277,7 @@ glabel PlayEffect /* FDE60 802D94B0 00000000 */ nop /* FDE64 802D94B4 080B65A4 */ j .L802D9690 /* FDE68 802D94B8 0040A82D */ daddu $s5, $v0, $zero +glabel L802D94BC_FDE6C /* FDE6C 802D94BC 4405A000 */ mfc1 $a1, $f20 /* FDE70 802D94C0 4406B000 */ mfc1 $a2, $f22 /* FDE74 802D94C4 4407C000 */ mfc1 $a3, $f24 @@ -1173,6 +1286,7 @@ glabel PlayEffect /* FDE80 802D94D0 AFB40014 */ sw $s4, 0x14($sp) /* FDE84 802D94D4 080B65A4 */ j .L802D9690 /* FDE88 802D94D8 0040A82D */ daddu $s5, $v0, $zero +glabel L802D94DC_FDE8C /* FDE8C 802D94DC 4405A000 */ mfc1 $a1, $f20 /* FDE90 802D94E0 4406B000 */ mfc1 $a2, $f22 /* FDE94 802D94E4 4407C000 */ mfc1 $a3, $f24 @@ -1181,6 +1295,7 @@ glabel PlayEffect /* FDEA0 802D94F0 AFB40014 */ sw $s4, 0x14($sp) /* FDEA4 802D94F4 080B65A4 */ j .L802D9690 /* FDEA8 802D94F8 0040A82D */ daddu $s5, $v0, $zero +glabel L802D94FC_FDEAC /* FDEAC 802D94FC 4405A000 */ mfc1 $a1, $f20 /* FDEB0 802D9500 4406B000 */ mfc1 $a2, $f22 /* FDEB4 802D9504 4407C000 */ mfc1 $a3, $f24 @@ -1189,6 +1304,7 @@ glabel PlayEffect /* FDEC0 802D9510 AFB40014 */ sw $s4, 0x14($sp) /* FDEC4 802D9514 080B65A4 */ j .L802D9690 /* FDEC8 802D9518 0040A82D */ daddu $s5, $v0, $zero +glabel L802D951C_FDECC /* FDECC 802D951C 4405A000 */ mfc1 $a1, $f20 /* FDED0 802D9520 4406B000 */ mfc1 $a2, $f22 /* FDED4 802D9524 4407C000 */ mfc1 $a3, $f24 @@ -1197,6 +1313,7 @@ glabel PlayEffect /* FDEE0 802D9530 AFB40014 */ sw $s4, 0x14($sp) /* FDEE4 802D9534 080B65A4 */ j .L802D9690 /* FDEE8 802D9538 0040A82D */ daddu $s5, $v0, $zero +glabel L802D953C_FDEEC /* FDEEC 802D953C 4405A000 */ mfc1 $a1, $f20 /* FDEF0 802D9540 4406B000 */ mfc1 $a2, $f22 /* FDEF4 802D9544 4407C000 */ mfc1 $a3, $f24 @@ -1205,6 +1322,7 @@ glabel PlayEffect /* FDF00 802D9550 AFB40014 */ sw $s4, 0x14($sp) /* FDF04 802D9554 080B65A4 */ j .L802D9690 /* FDF08 802D9558 0040A82D */ daddu $s5, $v0, $zero +glabel L802D955C_FDF0C /* FDF0C 802D955C 4405A000 */ mfc1 $a1, $f20 /* FDF10 802D9560 4406B000 */ mfc1 $a2, $f22 /* FDF14 802D9564 4407C000 */ mfc1 $a3, $f24 @@ -1213,6 +1331,7 @@ glabel PlayEffect /* FDF20 802D9570 AFB40014 */ sw $s4, 0x14($sp) /* FDF24 802D9574 080B65A4 */ j .L802D9690 /* FDF28 802D9578 0040A82D */ daddu $s5, $v0, $zero +glabel L802D957C_FDF2C /* FDF2C 802D957C 4405A000 */ mfc1 $a1, $f20 /* FDF30 802D9580 4406B000 */ mfc1 $a2, $f22 /* FDF34 802D9584 4407C000 */ mfc1 $a3, $f24 @@ -1221,6 +1340,7 @@ glabel PlayEffect /* FDF40 802D9590 AFB40014 */ sw $s4, 0x14($sp) /* FDF44 802D9594 080B65A4 */ j .L802D9690 /* FDF48 802D9598 0040A82D */ daddu $s5, $v0, $zero +glabel L802D959C_FDF4C /* FDF4C 802D959C 4405A000 */ mfc1 $a1, $f20 /* FDF50 802D95A0 4406B000 */ mfc1 $a2, $f22 /* FDF54 802D95A4 4407C000 */ mfc1 $a3, $f24 @@ -1229,6 +1349,7 @@ glabel PlayEffect /* FDF60 802D95B0 AFB40014 */ sw $s4, 0x14($sp) /* FDF64 802D95B4 080B65A4 */ j .L802D9690 /* FDF68 802D95B8 0040A82D */ daddu $s5, $v0, $zero +glabel L802D95BC_FDF6C /* FDF6C 802D95BC 4405A000 */ mfc1 $a1, $f20 /* FDF70 802D95C0 4406B000 */ mfc1 $a2, $f22 /* FDF74 802D95C4 4407C000 */ mfc1 $a3, $f24 @@ -1237,6 +1358,7 @@ glabel PlayEffect /* FDF80 802D95D0 AFB40014 */ sw $s4, 0x14($sp) /* FDF84 802D95D4 080B65A4 */ j .L802D9690 /* FDF88 802D95D8 0040A82D */ daddu $s5, $v0, $zero +glabel L802D95DC_FDF8C /* FDF8C 802D95DC 4405A000 */ mfc1 $a1, $f20 /* FDF90 802D95E0 4406B000 */ mfc1 $a2, $f22 /* FDF94 802D95E4 4407C000 */ mfc1 $a3, $f24 @@ -1245,6 +1367,7 @@ glabel PlayEffect /* FDFA0 802D95F0 AFB40014 */ sw $s4, 0x14($sp) /* FDFA4 802D95F4 080B65A4 */ j .L802D9690 /* FDFA8 802D95F8 0040A82D */ daddu $s5, $v0, $zero +glabel L802D95FC_FDFAC /* FDFAC 802D95FC 4405A000 */ mfc1 $a1, $f20 /* FDFB0 802D9600 4406B000 */ mfc1 $a2, $f22 /* FDFB4 802D9604 4407C000 */ mfc1 $a3, $f24 @@ -1253,6 +1376,7 @@ glabel PlayEffect /* FDFC0 802D9610 AFB40014 */ sw $s4, 0x14($sp) /* FDFC4 802D9614 080B65A4 */ j .L802D9690 /* FDFC8 802D9618 0040A82D */ daddu $s5, $v0, $zero +glabel L802D961C_FDFCC /* FDFCC 802D961C 4405A000 */ mfc1 $a1, $f20 /* FDFD0 802D9620 4406B000 */ mfc1 $a2, $f22 /* FDFD4 802D9624 4407C000 */ mfc1 $a3, $f24 @@ -1264,6 +1388,7 @@ glabel PlayEffect /* FDFEC 802D963C E7A00014 */ swc1 $f0, 0x14($sp) /* FDFF0 802D9640 080B65A4 */ j .L802D9690 /* FDFF4 802D9644 0040A82D */ daddu $s5, $v0, $zero +glabel L802D9648_FDFF8 /* FDFF8 802D9648 4405A000 */ mfc1 $a1, $f20 /* FDFFC 802D964C 4406B000 */ mfc1 $a2, $f22 /* FE000 802D9650 4407C000 */ mfc1 $a3, $f24 @@ -1272,6 +1397,7 @@ glabel PlayEffect /* FE00C 802D965C AFB40014 */ sw $s4, 0x14($sp) /* FE010 802D9660 080B65A4 */ j .L802D9690 /* FE014 802D9664 0040A82D */ daddu $s5, $v0, $zero +glabel L802D9668_FE018 /* FE018 802D9668 4405A000 */ mfc1 $a1, $f20 /* FE01C 802D966C 4406B000 */ mfc1 $a2, $f22 /* FE020 802D9670 4407C000 */ mfc1 $a3, $f24 @@ -1281,6 +1407,7 @@ glabel PlayEffect /* FE030 802D9680 080B65A4 */ j .L802D9690 /* FE034 802D9684 0040A82D */ daddu $s5, $v0, $zero .L802D9688: +glabel L802D9688_FE038 /* FE038 802D9688 080B65A2 */ j .L802D9688 /* FE03C 802D968C 00000000 */ nop .L802D9690: diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/AssignCrateFlag.s b/asm/nonmatchings/code_a5dd0_len_114e0/AssignCrateFlag.s index 3f9e4175fd..66e1ef8492 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/AssignCrateFlag.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/AssignCrateFlag.s @@ -13,7 +13,7 @@ glabel AssignCrateFlag /* A8890 80112190 3C048015 */ lui $a0, %hi(gLastCreatedEntityIndex) /* A8894 80112194 8C8412EC */ lw $a0, %lo(gLastCreatedEntityIndex)($a0) /* A8898 80112198 0C04417A */ jal get_entity_by_index -/* A889C 8011219C 00000000 */ nop +/* A889C 8011219C 00000000 */ nop /* A88A0 801121A0 8E050000 */ lw $a1, ($s0) /* A88A4 801121A4 8C500040 */ lw $s0, 0x40($v0) /* A88A8 801121A8 0C0B1F6A */ jal get_variable_index diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/AssignPanelFlag.s b/asm/nonmatchings/code_a5dd0_len_114e0/AssignPanelFlag.s index 6b34b3d452..d069be1ff2 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/AssignPanelFlag.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/AssignPanelFlag.s @@ -13,7 +13,7 @@ glabel AssignPanelFlag /* A8834 80112134 3C048015 */ lui $a0, %hi(gLastCreatedEntityIndex) /* A8838 80112138 8C8412EC */ lw $a0, %lo(gLastCreatedEntityIndex)($a0) /* A883C 8011213C 0C04417A */ jal get_entity_by_index -/* A8840 80112140 00000000 */ nop +/* A8840 80112140 00000000 */ nop /* A8844 80112144 8E050000 */ lw $a1, ($s0) /* A8848 80112148 8C500040 */ lw $s0, 0x40($v0) /* A884C 8011214C 0C0B1F6A */ jal get_variable_index diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/_load_model_textures.s b/asm/nonmatchings/code_a5dd0_len_114e0/_load_model_textures.s index 8cbe47c032..8c42a08136 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/_load_model_textures.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/_load_model_textures.s @@ -17,10 +17,10 @@ glabel _load_model_textures /* AC274 80115B74 00C0A02D */ daddu $s4, $a2, $zero /* AC278 80115B78 8E420010 */ lw $v0, 0x10($s2) /* AC27C 80115B7C 1040001C */ beqz $v0, .L80115BF0 -/* AC280 80115B80 00000000 */ nop +/* AC280 80115B80 00000000 */ nop /* AC284 80115B84 8C51000C */ lw $s1, 0xc($v0) /* AC288 80115B88 12200019 */ beqz $s1, .L80115BF0 -/* AC28C 80115B8C 00000000 */ nop +/* AC28C 80115B8C 00000000 */ nop /* AC290 80115B90 1A200017 */ blez $s1, .L80115BF0 /* AC294 80115B94 0000802D */ daddu $s0, $zero, $zero /* AC298 80115B98 0260282D */ daddu $a1, $s3, $zero @@ -37,7 +37,7 @@ glabel _load_model_textures /* AC2C0 80115BC0 1440FFF6 */ bnez $v0, .L80115B9C /* AC2C4 80115BC4 0260282D */ daddu $a1, $s3, $zero /* AC2C8 80115BC8 080456FC */ j .L80115BF0 -/* AC2CC 80115BCC 00000000 */ nop +/* AC2CC 80115BCC 00000000 */ nop .L80115BD0: /* AC2D0 80115BD0 0240202D */ daddu $a0, $s2, $zero /* AC2D4 80115BD4 0C0456C3 */ jal get_model_property diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/_set_game_mode.s b/asm/nonmatchings/code_a5dd0_len_114e0/_set_game_mode.s index de2b2b337d..f57e7de09f 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/_set_game_mode.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/_set_game_mode.s @@ -15,7 +15,7 @@ glabel _set_game_mode /* A93D0 80112CD0 AFBF0014 */ sw $ra, 0x14($sp) .L80112CD4: /* A93D4 80112CD4 08044B35 */ j .L80112CD4 -/* A93D8 80112CD8 00000000 */ nop +/* A93D8 80112CD8 00000000 */ nop .L80112CDC: /* A93DC 80112CDC 24020003 */ addiu $v0, $zero, 3 /* A93E0 80112CE0 A6020000 */ sh $v0, ($s0) @@ -34,21 +34,21 @@ glabel _set_game_mode .L80112D14: /* A9414 80112D14 8E020008 */ lw $v0, 8($s0) /* A9418 80112D18 14400004 */ bnez $v0, .L80112D2C -/* A941C 80112D1C 00000000 */ nop +/* A941C 80112D1C 00000000 */ nop /* A9420 80112D20 3C028011 */ lui $v0, %hi(NOP_state) /* A9424 80112D24 24422B90 */ addiu $v0, $v0, %lo(NOP_state) /* A9428 80112D28 AE020008 */ sw $v0, 8($s0) .L80112D2C: /* A942C 80112D2C 8E02000C */ lw $v0, 0xc($s0) /* A9430 80112D30 14400004 */ bnez $v0, .L80112D44 -/* A9434 80112D34 00000000 */ nop +/* A9434 80112D34 00000000 */ nop /* A9438 80112D38 3C028011 */ lui $v0, %hi(NOP_state) /* A943C 80112D3C 24422B90 */ addiu $v0, $v0, %lo(NOP_state) /* A9440 80112D40 AE02000C */ sw $v0, 0xc($s0) .L80112D44: /* A9444 80112D44 8E020010 */ lw $v0, 0x10($s0) /* A9448 80112D48 14400004 */ bnez $v0, .L80112D5C -/* A944C 80112D4C 00000000 */ nop +/* A944C 80112D4C 00000000 */ nop /* A9450 80112D50 3C028011 */ lui $v0, %hi(NOP_state) /* A9454 80112D54 24422B90 */ addiu $v0, $v0, %lo(NOP_state) /* A9458 80112D58 AE020010 */ sw $v0, 0x10($s0) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s b/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s index 6826bb271b..462321a70f 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s @@ -51,7 +51,7 @@ glabel appendGfx_model /* A983C 8011313C 13C00004 */ beqz $fp, .L80113150 /* A9840 80113140 2FC20004 */ sltiu $v0, $fp, 4 /* A9844 80113144 10400002 */ beqz $v0, .L80113150 -/* A9848 80113148 00000000 */ nop +/* A9848 80113148 00000000 */ nop /* A984C 8011314C 24130002 */ addiu $s3, $zero, 2 .L80113150: /* A9850 80113150 16400005 */ bnez $s2, .L80113168 @@ -59,7 +59,7 @@ glabel appendGfx_model /* A9858 80113158 00021603 */ sra $v0, $v0, 0x18 /* A985C 8011315C 28420011 */ slti $v0, $v0, 0x11 /* A9860 80113160 1040000B */ beqz $v0, .L80113190 -/* A9864 80113164 00000000 */ nop +/* A9864 80113164 00000000 */ nop .L80113168: /* A9868 80113168 3C028015 */ lui $v0, %hi(D_80153264) /* A986C 8011316C 8C423264 */ lw $v0, %lo(D_80153264)($v0) @@ -67,7 +67,7 @@ glabel appendGfx_model /* A9874 80113174 10400006 */ beqz $v0, .L80113190 /* A9878 80113178 33020040 */ andi $v0, $t8, 0x40 /* A987C 8011317C 14400004 */ bnez $v0, .L80113190 -/* A9880 80113180 00000000 */ nop +/* A9880 80113180 00000000 */ nop /* A9884 80113184 24130003 */ addiu $s3, $zero, 3 /* A9888 80113188 24150001 */ addiu $s5, $zero, 1 /* A988C 8011318C AFB50044 */ sw $s5, 0x44($sp) @@ -82,13 +82,13 @@ glabel appendGfx_model /* A98AC 801131AC 50620008 */ beql $v1, $v0, .L801131D0 /* A98B0 801131B0 26730003 */ addiu $s3, $s3, 3 /* A98B4 801131B4 08044CF5 */ j .L801133D4 -/* A98B8 801131B8 00000000 */ nop +/* A98B8 801131B8 00000000 */ nop .L801131BC: /* A98BC 801131BC 24020003 */ addiu $v0, $zero, 3 /* A98C0 801131C0 5062005C */ beql $v1, $v0, .L80113334 /* A98C4 801131C4 24130002 */ addiu $s3, $zero, 2 /* A98C8 801131C8 08044CF5 */ j .L801133D4 -/* A98CC 801131CC 00000000 */ nop +/* A98CC 801131CC 00000000 */ nop .L801131D0: /* A98D0 801131D0 24190002 */ addiu $t9, $zero, 2 /* A98D4 801131D4 08044CF5 */ j .L801133D4 @@ -113,7 +113,7 @@ glabel appendGfx_model /* A9918 80113218 14610004 */ bne $v1, $at, .L8011322C /* A991C 8011321C 3C018000 */ lui $at, 0x8000 /* A9920 80113220 14E10002 */ bne $a3, $at, .L8011322C -/* A9924 80113224 00000000 */ nop +/* A9924 80113224 00000000 */ nop /* A9928 80113228 0006000D */ break 6 .L8011322C: /* A992C 8011322C 00003812 */ mflo $a3 @@ -131,7 +131,7 @@ glabel appendGfx_model /* A9958 80113258 14610004 */ bne $v1, $at, .L8011326C /* A995C 8011325C 3C018000 */ lui $at, 0x8000 /* A9960 80113260 14A10002 */ bne $a1, $at, .L8011326C -/* A9964 80113264 00000000 */ nop +/* A9964 80113264 00000000 */ nop /* A9968 80113268 0006000D */ break 6 .L8011326C: /* A996C 8011326C 00002812 */ mflo $a1 @@ -237,16 +237,17 @@ glabel appendGfx_model /* A9AF4 801133F4 AE020000 */ sw $v0, ($s0) /* A9AF8 801133F8 8C6E0004 */ lw $t6, 4($v1) /* A9AFC 801133FC 11C00172 */ beqz $t6, .L801139C8 -/* A9B00 80113400 00000000 */ nop +/* A9B00 80113400 00000000 */ nop /* A9B04 80113404 8C630008 */ lw $v1, 8($v1) /* A9B08 80113408 2C620008 */ sltiu $v0, $v1, 8 /* A9B0C 8011340C 1040016E */ beqz $v0, .L801139C8 /* A9B10 80113410 00031080 */ sll $v0, $v1, 2 -/* A9B14 80113414 3C018015 */ lui $at, %hi(D_8014F990) +/* A9B14 80113414 3C018015 */ lui $at, %hi(jtbl_8014F990_E6090) /* A9B18 80113418 00220821 */ addu $at, $at, $v0 -/* A9B1C 8011341C 8C22F990 */ lw $v0, %lo(D_8014F990)($at) +/* A9B1C 8011341C 8C22F990 */ lw $v0, %lo(jtbl_8014F990_E6090)($at) /* A9B20 80113420 00400008 */ jr $v0 -/* A9B24 80113424 00000000 */ nop +/* A9B24 80113424 00000000 */ nop +glabel L80113428_A9B28 /* A9B28 80113428 3C06DC08 */ lui $a2, 0xdc08 /* A9B2C 8011342C 34C6060A */ ori $a2, $a2, 0x60a /* A9B30 80113430 3C07DC08 */ lui $a3, 0xdc08 @@ -271,6 +272,7 @@ glabel appendGfx_model /* A9B7C 8011347C AE030000 */ sw $v1, ($s0) /* A9B80 80113480 08044E71 */ j .L801139C4 /* A9B84 80113484 AC470000 */ sw $a3, ($v0) +glabel L80113488_A9B88 /* A9B88 80113488 3C06DC08 */ lui $a2, 0xdc08 /* A9B8C 8011348C 34C6060A */ ori $a2, $a2, 0x60a /* A9B90 80113490 3C07DC08 */ lui $a3, 0xdc08 @@ -295,6 +297,7 @@ glabel appendGfx_model /* A9BDC 801134DC AE030000 */ sw $v1, ($s0) /* A9BE0 801134E0 08044E71 */ j .L801139C4 /* A9BE4 801134E4 AC470000 */ sw $a3, ($v0) +glabel L801134E8_A9BE8 /* A9BE8 801134E8 3C06DC08 */ lui $a2, 0xdc08 /* A9BEC 801134EC 34C6060A */ ori $a2, $a2, 0x60a /* A9BF0 801134F0 3C07DC08 */ lui $a3, 0xdc08 @@ -327,6 +330,7 @@ glabel appendGfx_model /* A9C5C 8011355C AE030000 */ sw $v1, ($s0) /* A9C60 80113560 08044E71 */ j .L801139C4 /* A9C64 80113564 AC480000 */ sw $t0, ($v0) +glabel L80113568_A9C68 /* A9C68 80113568 3C06DC08 */ lui $a2, 0xdc08 /* A9C6C 8011356C 34C6060A */ ori $a2, $a2, 0x60a /* A9C70 80113570 3C07DC08 */ lui $a3, 0xdc08 @@ -367,6 +371,7 @@ glabel appendGfx_model /* A9CFC 801135FC AE030000 */ sw $v1, ($s0) /* A9D00 80113600 08044E71 */ j .L801139C4 /* A9D04 80113604 AC490000 */ sw $t1, ($v0) +glabel L80113608_A9D08 /* A9D08 80113608 3C06DC08 */ lui $a2, 0xdc08 /* A9D0C 8011360C 34C6060A */ ori $a2, $a2, 0x60a /* A9D10 80113610 3C07DC08 */ lui $a3, 0xdc08 @@ -415,6 +420,7 @@ glabel appendGfx_model /* A9DBC 801136BC AE030000 */ sw $v1, ($s0) /* A9DC0 801136C0 08044E71 */ j .L801139C4 /* A9DC4 801136C4 AC4A0000 */ sw $t2, ($v0) +glabel L801136C8_A9DC8 /* A9DC8 801136C8 3C06DC08 */ lui $a2, 0xdc08 /* A9DCC 801136CC 34C6060A */ ori $a2, $a2, 0x60a /* A9DD0 801136D0 3C07DC08 */ lui $a3, 0xdc08 @@ -471,6 +477,7 @@ glabel appendGfx_model /* A9E9C 8011379C AE030000 */ sw $v1, ($s0) /* A9EA0 801137A0 08044E71 */ j .L801139C4 /* A9EA4 801137A4 AC4B0000 */ sw $t3, ($v0) +glabel L801137A8_A9EA8 /* A9EA8 801137A8 3C06DC08 */ lui $a2, 0xdc08 /* A9EAC 801137AC 34C6060A */ ori $a2, $a2, 0x60a /* A9EB0 801137B0 3C07DC08 */ lui $a3, 0xdc08 @@ -535,6 +542,7 @@ glabel appendGfx_model /* A9F9C 8011389C AE030000 */ sw $v1, ($s0) /* A9FA0 801138A0 08044E71 */ j .L801139C4 /* A9FA4 801138A4 AC4C0000 */ sw $t4, ($v0) +glabel L801138A8_A9FA8 /* A9FA8 801138A8 3C06DC08 */ lui $a2, 0xdc08 /* A9FAC 801138AC 34C6060A */ ori $a2, $a2, 0x60a /* A9FB0 801138B0 3C07DC08 */ lui $a3, 0xdc08 @@ -645,7 +653,7 @@ glabel appendGfx_model /* AA14C 80113A4C 0200282D */ daddu $a1, $s0, $zero /* AA150 80113A50 8FB80040 */ lw $t8, 0x40($sp) /* AA154 80113A54 08044EBF */ j .L80113AFC -/* AA158 80113A58 00000000 */ nop +/* AA158 80113A58 00000000 */ nop .L80113A5C: /* AA15C 80113A5C 8E030000 */ lw $v1, ($s0) /* AA160 80113A60 3C02DE00 */ lui $v0, 0xde00 @@ -760,155 +768,213 @@ glabel appendGfx_model /* AA2F4 80113BF4 2C62000B */ sltiu $v0, $v1, 0xb /* AA2F8 80113BF8 104002A5 */ beqz $v0, .L80114690 /* AA2FC 80113BFC 00031080 */ sll $v0, $v1, 2 -/* AA300 80113C00 3C018015 */ lui $at, %hi(D_8014F9B0) +/* AA300 80113C00 3C018015 */ lui $at, %hi(jtbl_8014F9B0_E60B0) /* AA304 80113C04 00220821 */ addu $at, $at, $v0 -/* AA308 80113C08 8C22F9B0 */ lw $v0, %lo(D_8014F9B0)($at) +/* AA308 80113C08 8C22F9B0 */ lw $v0, %lo(jtbl_8014F9B0_E60B0)($at) /* AA30C 80113C0C 00400008 */ jr $v0 -/* AA310 80113C10 00000000 */ nop +/* AA310 80113C10 00000000 */ nop +glabel L80113C14_AA314 /* AA314 80113C14 2682FFFF */ addiu $v0, $s4, -1 /* AA318 80113C18 00021600 */ sll $v0, $v0, 0x18 /* AA31C 80113C1C 00021E03 */ sra $v1, $v0, 0x18 /* AA320 80113C20 2C62002F */ sltiu $v0, $v1, 0x2f /* AA324 80113C24 1040002A */ beqz $v0, .L80113CD0 /* AA328 80113C28 00031080 */ sll $v0, $v1, 2 -/* AA32C 80113C2C 3C018015 */ lui $at, %hi(D_8014F9E0) +/* AA32C 80113C2C 3C018015 */ lui $at, %hi(jtbl_8014F9E0_E60E0) /* AA330 80113C30 00220821 */ addu $at, $at, $v0 -/* AA334 80113C34 8C22F9E0 */ lw $v0, %lo(D_8014F9E0)($at) +/* AA334 80113C34 8C22F9E0 */ lw $v0, %lo(jtbl_8014F9E0_E60E0)($at) /* AA338 80113C38 00400008 */ jr $v0 -/* AA33C 80113C3C 00000000 */ nop +/* AA33C 80113C3C 00000000 */ nop +glabel L80113C40_AA340 /* AA340 80113C40 08045199 */ j .L80114664 /* AA344 80113C44 24050001 */ addiu $a1, $zero, 1 +glabel L80113C48_AA348 /* AA348 80113C48 08045199 */ j .L80114664 /* AA34C 80113C4C 24050002 */ addiu $a1, $zero, 2 +glabel L80113C50_AA350 /* AA350 80113C50 08045199 */ j .L80114664 /* AA354 80113C54 24050003 */ addiu $a1, $zero, 3 +glabel L80113C58_AA358 /* AA358 80113C58 08045199 */ j .L80114664 /* AA35C 80113C5C 24050004 */ addiu $a1, $zero, 4 +glabel L80113C60_AA360 /* AA360 80113C60 08045199 */ j .L80114664 /* AA364 80113C64 24050006 */ addiu $a1, $zero, 6 +glabel L80113C68_AA368 /* AA368 80113C68 08045199 */ j .L80114664 /* AA36C 80113C6C 24050007 */ addiu $a1, $zero, 7 +glabel L80113C70_AA370 /* AA370 80113C70 08045199 */ j .L80114664 /* AA374 80113C74 24050009 */ addiu $a1, $zero, 9 +glabel L80113C78_AA378 /* AA378 80113C78 08045199 */ j .L80114664 /* AA37C 80113C7C 24050008 */ addiu $a1, $zero, 8 +glabel L80113C80_AA380 /* AA380 80113C80 08045199 */ j .L80114664 /* AA384 80113C84 2405000A */ addiu $a1, $zero, 0xa +glabel L80113C88_AA388 /* AA388 80113C88 08045199 */ j .L80114664 /* AA38C 80113C8C 2405000B */ addiu $a1, $zero, 0xb +glabel L80113C90_AA390 /* AA390 80113C90 08045199 */ j .L80114664 /* AA394 80113C94 2405000C */ addiu $a1, $zero, 0xc +glabel L80113C98_AA398 /* AA398 80113C98 08045199 */ j .L80114664 /* AA39C 80113C9C 2405000D */ addiu $a1, $zero, 0xd +glabel L80113CA0_AA3A0 /* AA3A0 80113CA0 08045199 */ j .L80114664 /* AA3A4 80113CA4 2405000E */ addiu $a1, $zero, 0xe +glabel L80113CA8_AA3A8 /* AA3A8 80113CA8 08045199 */ j .L80114664 /* AA3AC 80113CAC 2405002E */ addiu $a1, $zero, 0x2e +glabel L80113CB0_AA3B0 /* AA3B0 80113CB0 08045199 */ j .L80114664 /* AA3B4 80113CB4 2405002F */ addiu $a1, $zero, 0x2f +glabel L80113CB8_AA3B8 /* AA3B8 80113CB8 08045199 */ j .L80114664 /* AA3BC 80113CBC 24050030 */ addiu $a1, $zero, 0x30 +glabel L80113CC0_AA3C0 /* AA3C0 80113CC0 08045199 */ j .L80114664 /* AA3C4 80113CC4 24050037 */ addiu $a1, $zero, 0x37 +glabel L80113CC8_AA3C8 /* AA3C8 80113CC8 08045199 */ j .L80114664 /* AA3CC 80113CCC 24050038 */ addiu $a1, $zero, 0x38 .L80113CD0: +glabel L80113CD0_AA3D0 /* AA3D0 80113CD0 08045199 */ j .L80114664 /* AA3D4 80113CD4 0000282D */ daddu $a1, $zero, $zero +glabel L80113CD8_AA3D8 /* AA3D8 80113CD8 2682FFFF */ addiu $v0, $s4, -1 /* AA3DC 80113CDC 00021600 */ sll $v0, $v0, 0x18 /* AA3E0 80113CE0 00021E03 */ sra $v1, $v0, 0x18 /* AA3E4 80113CE4 2C62002F */ sltiu $v0, $v1, 0x2f /* AA3E8 80113CE8 10400028 */ beqz $v0, .L80113D8C /* AA3EC 80113CEC 00031080 */ sll $v0, $v1, 2 -/* AA3F0 80113CF0 3C018015 */ lui $at, %hi(D_8014FAA0) +/* AA3F0 80113CF0 3C018015 */ lui $at, %hi(jtbl_8014FAA0_E61A0) /* AA3F4 80113CF4 00220821 */ addu $at, $at, $v0 -/* AA3F8 80113CF8 8C22FAA0 */ lw $v0, %lo(D_8014FAA0)($at) +/* AA3F8 80113CF8 8C22FAA0 */ lw $v0, %lo(jtbl_8014FAA0_E61A0)($at) /* AA3FC 80113CFC 00400008 */ jr $v0 -/* AA400 80113D00 00000000 */ nop +/* AA400 80113D00 00000000 */ nop +glabel L80113D04_AA404 /* AA404 80113D04 08045199 */ j .L80114664 /* AA408 80113D08 24050011 */ addiu $a1, $zero, 0x11 +glabel L80113D0C_AA40C /* AA40C 80113D0C 08045199 */ j .L80114664 /* AA410 80113D10 24050012 */ addiu $a1, $zero, 0x12 +glabel L80113D14_AA414 /* AA414 80113D14 08045199 */ j .L80114664 /* AA418 80113D18 24050013 */ addiu $a1, $zero, 0x13 +glabel L80113D1C_AA41C /* AA41C 80113D1C 08045199 */ j .L80114664 /* AA420 80113D20 24050014 */ addiu $a1, $zero, 0x14 +glabel L80113D24_AA424 /* AA424 80113D24 08045199 */ j .L80114664 /* AA428 80113D28 24050016 */ addiu $a1, $zero, 0x16 +glabel L80113D2C_AA42C /* AA42C 80113D2C 08045199 */ j .L80114664 /* AA430 80113D30 24050017 */ addiu $a1, $zero, 0x17 +glabel L80113D34_AA434 /* AA434 80113D34 08045199 */ j .L80114664 /* AA438 80113D38 24050018 */ addiu $a1, $zero, 0x18 +glabel L80113D3C_AA43C /* AA43C 80113D3C 08045199 */ j .L80114664 /* AA440 80113D40 24050019 */ addiu $a1, $zero, 0x19 +glabel L80113D44_AA444 /* AA444 80113D44 08045199 */ j .L80114664 /* AA448 80113D48 2405001A */ addiu $a1, $zero, 0x1a +glabel L80113D4C_AA44C /* AA44C 80113D4C 08045199 */ j .L80114664 /* AA450 80113D50 2405001B */ addiu $a1, $zero, 0x1b +glabel L80113D54_AA454 /* AA454 80113D54 08045199 */ j .L80114664 /* AA458 80113D58 2405001C */ addiu $a1, $zero, 0x1c +glabel L80113D5C_AA45C /* AA45C 80113D5C 08045199 */ j .L80114664 /* AA460 80113D60 2405001D */ addiu $a1, $zero, 0x1d +glabel L80113D64_AA464 /* AA464 80113D64 08045199 */ j .L80114664 /* AA468 80113D68 24050031 */ addiu $a1, $zero, 0x31 +glabel L80113D6C_AA46C /* AA46C 80113D6C 08045199 */ j .L80114664 /* AA470 80113D70 24050032 */ addiu $a1, $zero, 0x32 +glabel L80113D74_AA474 /* AA474 80113D74 08045199 */ j .L80114664 /* AA478 80113D78 24050033 */ addiu $a1, $zero, 0x33 +glabel L80113D7C_AA47C /* AA47C 80113D7C 08045199 */ j .L80114664 /* AA480 80113D80 24050039 */ addiu $a1, $zero, 0x39 +glabel L80113D84_AA484 /* AA484 80113D84 08045199 */ j .L80114664 /* AA488 80113D88 2405003A */ addiu $a1, $zero, 0x3a .L80113D8C: +glabel L80113D8C_AA48C /* AA48C 80113D8C 08045199 */ j .L80114664 /* AA490 80113D90 24050010 */ addiu $a1, $zero, 0x10 +glabel L80113D94_AA494 /* AA494 80113D94 2682FFFF */ addiu $v0, $s4, -1 /* AA498 80113D98 00021600 */ sll $v0, $v0, 0x18 /* AA49C 80113D9C 00021E03 */ sra $v1, $v0, 0x18 /* AA4A0 80113DA0 2C62002F */ sltiu $v0, $v1, 0x2f /* AA4A4 80113DA4 10400028 */ beqz $v0, .L80113E48 /* AA4A8 80113DA8 00031080 */ sll $v0, $v1, 2 -/* AA4AC 80113DAC 3C018015 */ lui $at, %hi(D_8014FB60) +/* AA4AC 80113DAC 3C018015 */ lui $at, %hi(jtbl_8014FB60_E6260) /* AA4B0 80113DB0 00220821 */ addu $at, $at, $v0 -/* AA4B4 80113DB4 8C22FB60 */ lw $v0, %lo(D_8014FB60)($at) +/* AA4B4 80113DB4 8C22FB60 */ lw $v0, %lo(jtbl_8014FB60_E6260)($at) /* AA4B8 80113DB8 00400008 */ jr $v0 -/* AA4BC 80113DBC 00000000 */ nop +/* AA4BC 80113DBC 00000000 */ nop +glabel L80113DC0_AA4C0 /* AA4C0 80113DC0 08044F93 */ j .L80113E4C /* AA4C4 80113DC4 24050020 */ addiu $a1, $zero, 0x20 +glabel L80113DC8_AA4C8 /* AA4C8 80113DC8 08044F93 */ j .L80113E4C /* AA4CC 80113DCC 24050021 */ addiu $a1, $zero, 0x21 +glabel L80113DD0_AA4D0 /* AA4D0 80113DD0 08044F93 */ j .L80113E4C /* AA4D4 80113DD4 24050022 */ addiu $a1, $zero, 0x22 +glabel L80113DD8_AA4D8 /* AA4D8 80113DD8 08044F93 */ j .L80113E4C /* AA4DC 80113DDC 24050023 */ addiu $a1, $zero, 0x23 +glabel L80113DE0_AA4E0 /* AA4E0 80113DE0 08044F93 */ j .L80113E4C /* AA4E4 80113DE4 24050025 */ addiu $a1, $zero, 0x25 +glabel L80113DE8_AA4E8 /* AA4E8 80113DE8 08044F93 */ j .L80113E4C /* AA4EC 80113DEC 24050026 */ addiu $a1, $zero, 0x26 +glabel L80113DF0_AA4F0 /* AA4F0 80113DF0 08044F93 */ j .L80113E4C /* AA4F4 80113DF4 24050027 */ addiu $a1, $zero, 0x27 +glabel L80113DF8_AA4F8 /* AA4F8 80113DF8 08044F93 */ j .L80113E4C /* AA4FC 80113DFC 24050028 */ addiu $a1, $zero, 0x28 +glabel L80113E00_AA500 /* AA500 80113E00 08044F93 */ j .L80113E4C /* AA504 80113E04 24050029 */ addiu $a1, $zero, 0x29 +glabel L80113E08_AA508 /* AA508 80113E08 08044F93 */ j .L80113E4C /* AA50C 80113E0C 2405002A */ addiu $a1, $zero, 0x2a +glabel L80113E10_AA510 /* AA510 80113E10 08044F93 */ j .L80113E4C /* AA514 80113E14 2405002B */ addiu $a1, $zero, 0x2b +glabel L80113E18_AA518 /* AA518 80113E18 08044F93 */ j .L80113E4C /* AA51C 80113E1C 2405002C */ addiu $a1, $zero, 0x2c +glabel L80113E20_AA520 /* AA520 80113E20 08044F93 */ j .L80113E4C /* AA524 80113E24 24050034 */ addiu $a1, $zero, 0x34 +glabel L80113E28_AA528 /* AA528 80113E28 08044F93 */ j .L80113E4C /* AA52C 80113E2C 24050035 */ addiu $a1, $zero, 0x35 +glabel L80113E30_AA530 /* AA530 80113E30 08044F93 */ j .L80113E4C /* AA534 80113E34 24050036 */ addiu $a1, $zero, 0x36 +glabel L80113E38_AA538 /* AA538 80113E38 08044F93 */ j .L80113E4C /* AA53C 80113E3C 2405003B */ addiu $a1, $zero, 0x3b +glabel L80113E40_AA540 /* AA540 80113E40 08044F93 */ j .L80113E4C /* AA544 80113E44 2405003C */ addiu $a1, $zero, 0x3c .L80113E48: +glabel L80113E48_AA548 /* AA548 80113E48 2405001F */ addiu $a1, $zero, 0x1f .L80113E4C: /* AA54C 80113E4C 3C03DE00 */ lui $v1, 0xde00 @@ -959,7 +1025,7 @@ glabel appendGfx_model /* AA5FC 80113EFC 14610004 */ bne $v1, $at, .L80113F10 /* AA600 80113F00 3C018000 */ lui $at, 0x8000 /* AA604 80113F04 14C10002 */ bne $a2, $at, .L80113F10 -/* AA608 80113F08 00000000 */ nop +/* AA608 80113F08 00000000 */ nop /* AA60C 80113F0C 0006000D */ break 6 .L80113F10: /* AA610 80113F10 00003012 */ mflo $a2 @@ -974,7 +1040,7 @@ glabel appendGfx_model /* AA630 80113F30 14610004 */ bne $v1, $at, .L80113F44 /* AA634 80113F34 3C018000 */ lui $at, 0x8000 /* AA638 80113F38 14410002 */ bne $v0, $at, .L80113F44 -/* AA63C 80113F3C 00000000 */ nop +/* AA63C 80113F3C 00000000 */ nop /* AA640 80113F40 0006000D */ break 6 .L80113F44: /* AA644 80113F44 00001012 */ mflo $v0 @@ -985,6 +1051,7 @@ glabel appendGfx_model /* AA658 80113F58 00C23025 */ or $a2, $a2, $v0 /* AA65C 80113F5C 080451A4 */ j .L80114690 /* AA660 80113F60 ACA60004 */ sw $a2, 4($a1) +glabel L80113F64_AA664 /* AA664 80113F64 3C038015 */ lui $v1, %hi(D_8014B74C) /* AA668 80113F68 9063B74C */ lbu $v1, %lo(D_8014B74C)($v1) /* AA66C 80113F6C 240200FF */ addiu $v0, $zero, 0xff @@ -1004,11 +1071,12 @@ glabel appendGfx_model /* AA6A4 80113FA4 2C62002F */ sltiu $v0, $v1, 0x2f /* AA6A8 80113FA8 104000A2 */ beqz $v0, .L80114234 /* AA6AC 80113FAC 00031080 */ sll $v0, $v1, 2 -/* AA6B0 80113FB0 3C018015 */ lui $at, %hi(D_8014FC20) +/* AA6B0 80113FB0 3C018015 */ lui $at, %hi(jtbl_8014FC20_E6320) /* AA6B4 80113FB4 00220821 */ addu $at, $at, $v0 -/* AA6B8 80113FB8 8C22FC20 */ lw $v0, %lo(D_8014FC20)($at) +/* AA6B8 80113FB8 8C22FC20 */ lw $v0, %lo(jtbl_8014FC20_E6320)($at) /* AA6BC 80113FBC 00400008 */ jr $v0 -/* AA6C0 80113FC0 00000000 */ nop +/* AA6C0 80113FC0 00000000 */ nop +glabel L80113FC4_AA6C4 /* AA6C4 80113FC4 3C06E200 */ lui $a2, 0xe200 /* AA6C8 80113FC8 34C6001C */ ori $a2, $a2, 0x1c /* AA6CC 80113FCC 3C058411 */ lui $a1, 0x8411 @@ -1017,6 +1085,7 @@ glabel appendGfx_model /* AA6D8 80113FD8 8C820000 */ lw $v0, ($a0) /* AA6DC 80113FDC 08045088 */ j .L80114220 /* AA6E0 80113FE0 34A52078 */ ori $a1, $a1, 0x2078 +glabel L80113FE4_AA6E4 /* AA6E4 80113FE4 3C06E200 */ lui $a2, 0xe200 /* AA6E8 80113FE8 34C6001C */ ori $a2, $a2, 0x1c /* AA6EC 80113FEC 3C058411 */ lui $a1, 0x8411 @@ -1025,6 +1094,7 @@ glabel appendGfx_model /* AA6F8 80113FF8 8C820000 */ lw $v0, ($a0) /* AA6FC 80113FFC 08045088 */ j .L80114220 /* AA700 80114000 34A52230 */ ori $a1, $a1, 0x2230 +glabel L80114004_AA704 /* AA704 80114004 3C06E200 */ lui $a2, 0xe200 /* AA708 80114008 34C6001C */ ori $a2, $a2, 0x1c /* AA70C 8011400C 3C058411 */ lui $a1, 0x8411 @@ -1033,6 +1103,7 @@ glabel appendGfx_model /* AA718 80114018 8C820000 */ lw $v0, ($a0) /* AA71C 8011401C 08045088 */ j .L80114220 /* AA720 80114020 34A52D58 */ ori $a1, $a1, 0x2d58 +glabel L80114024_AA724 /* AA724 80114024 3C06E200 */ lui $a2, 0xe200 /* AA728 80114028 34C6001C */ ori $a2, $a2, 0x1c /* AA72C 8011402C 3C058411 */ lui $a1, 0x8411 @@ -1041,6 +1112,7 @@ glabel appendGfx_model /* AA738 80114038 8C820000 */ lw $v0, ($a0) /* AA73C 8011403C 08045088 */ j .L80114220 /* AA740 80114040 34A52E10 */ ori $a1, $a1, 0x2e10 +glabel L80114044_AA744 /* AA744 80114044 3C06E200 */ lui $a2, 0xe200 /* AA748 80114048 34C6001C */ ori $a2, $a2, 0x1c /* AA74C 8011404C 3C058411 */ lui $a1, 0x8411 @@ -1049,6 +1121,7 @@ glabel appendGfx_model /* AA758 80114058 8C820000 */ lw $v0, ($a0) /* AA75C 8011405C 08045088 */ j .L80114220 /* AA760 80114060 34A52478 */ ori $a1, $a1, 0x2478 +glabel L80114064_AA764 /* AA764 80114064 3C06E200 */ lui $a2, 0xe200 /* AA768 80114068 34C6001C */ ori $a2, $a2, 0x1c /* AA76C 8011406C 3C058411 */ lui $a1, 0x8411 @@ -1057,6 +1130,7 @@ glabel appendGfx_model /* AA778 80114078 8C820000 */ lw $v0, ($a0) /* AA77C 8011407C 08045088 */ j .L80114220 /* AA780 80114080 34A53078 */ ori $a1, $a1, 0x3078 +glabel L80114084_AA784 /* AA784 80114084 3C06E200 */ lui $a2, 0xe200 /* AA788 80114088 34C6001C */ ori $a2, $a2, 0x1c /* AA78C 8011408C 3C058411 */ lui $a1, 0x8411 @@ -1065,6 +1139,7 @@ glabel appendGfx_model /* AA798 80114098 8C820000 */ lw $v0, ($a0) /* AA79C 8011409C 08045088 */ j .L80114220 /* AA7A0 801140A0 34A53078 */ ori $a1, $a1, 0x3078 +glabel L801140A4_AA7A4 /* AA7A4 801140A4 3C06E200 */ lui $a2, 0xe200 /* AA7A8 801140A8 34C6001C */ ori $a2, $a2, 0x1c /* AA7AC 801140AC 3C058410 */ lui $a1, 0x8410 @@ -1073,6 +1148,7 @@ glabel appendGfx_model /* AA7B8 801140B8 8C820000 */ lw $v0, ($a0) /* AA7BC 801140BC 08045088 */ j .L80114220 /* AA7C0 801140C0 34A549D8 */ ori $a1, $a1, 0x49d8 +glabel L801140C4_AA7C4 /* AA7C4 801140C4 3C06E200 */ lui $a2, 0xe200 /* AA7C8 801140C8 34C6001C */ ori $a2, $a2, 0x1c /* AA7CC 801140CC 3C058410 */ lui $a1, 0x8410 @@ -1081,6 +1157,7 @@ glabel appendGfx_model /* AA7D8 801140D8 8C820000 */ lw $v0, ($a0) /* AA7DC 801140DC 08045088 */ j .L80114220 /* AA7E0 801140E0 34A549D8 */ ori $a1, $a1, 0x49d8 +glabel L801140E4_AA7E4 /* AA7E4 801140E4 3C06E200 */ lui $a2, 0xe200 /* AA7E8 801140E8 34C6001C */ ori $a2, $a2, 0x1c /* AA7EC 801140EC 3C058410 */ lui $a1, 0x8410 @@ -1089,6 +1166,7 @@ glabel appendGfx_model /* AA7F8 801140F8 8C820000 */ lw $v0, ($a0) /* AA7FC 801140FC 08045088 */ j .L80114220 /* AA800 80114100 34A549D8 */ ori $a1, $a1, 0x49d8 +glabel L80114104_AA804 /* AA804 80114104 3C06E200 */ lui $a2, 0xe200 /* AA808 80114108 34C6001C */ ori $a2, $a2, 0x1c /* AA80C 8011410C 3C058410 */ lui $a1, 0x8410 @@ -1097,6 +1175,7 @@ glabel appendGfx_model /* AA818 80114118 8C820000 */ lw $v0, ($a0) /* AA81C 8011411C 08045088 */ j .L80114220 /* AA820 80114120 34A54A50 */ ori $a1, $a1, 0x4a50 +glabel L80114124_AA824 /* AA824 80114124 3C06E200 */ lui $a2, 0xe200 /* AA828 80114128 34C6001C */ ori $a2, $a2, 0x1c /* AA82C 8011412C 3C058410 */ lui $a1, 0x8410 @@ -1105,6 +1184,7 @@ glabel appendGfx_model /* AA838 80114138 8C820000 */ lw $v0, ($a0) /* AA83C 8011413C 08045088 */ j .L80114220 /* AA840 80114140 34A54DD8 */ ori $a1, $a1, 0x4dd8 +glabel L80114144_AA844 /* AA844 80114144 3C06E200 */ lui $a2, 0xe200 /* AA848 80114148 34C6001C */ ori $a2, $a2, 0x1c /* AA84C 8011414C 3C058410 */ lui $a1, 0x8410 @@ -1113,6 +1193,7 @@ glabel appendGfx_model /* AA858 80114158 8C820000 */ lw $v0, ($a0) /* AA85C 8011415C 08045088 */ j .L80114220 /* AA860 80114160 34A54DD8 */ ori $a1, $a1, 0x4dd8 +glabel L80114164_AA864 /* AA864 80114164 3C06E200 */ lui $a2, 0xe200 /* AA868 80114168 34C6001C */ ori $a2, $a2, 0x1c /* AA86C 8011416C 3C058410 */ lui $a1, 0x8410 @@ -1121,6 +1202,7 @@ glabel appendGfx_model /* AA878 80114178 8C820000 */ lw $v0, ($a0) /* AA87C 8011417C 08045088 */ j .L80114220 /* AA880 80114180 34A545D8 */ ori $a1, $a1, 0x45d8 +glabel L80114184_AA884 /* AA884 80114184 3C06E200 */ lui $a2, 0xe200 /* AA888 80114188 34C6001C */ ori $a2, $a2, 0x1c /* AA88C 8011418C 3C058411 */ lui $a1, 0x8411 @@ -1129,6 +1211,7 @@ glabel appendGfx_model /* AA898 80114198 8C820000 */ lw $v0, ($a0) /* AA89C 8011419C 08045088 */ j .L80114220 /* AA8A0 801141A0 34A52048 */ ori $a1, $a1, 0x2048 +glabel L801141A4_AA8A4 /* AA8A4 801141A4 3C06E200 */ lui $a2, 0xe200 /* AA8A8 801141A8 34C6001C */ ori $a2, $a2, 0x1c /* AA8AC 801141AC 3C058411 */ lui $a1, 0x8411 @@ -1137,6 +1220,7 @@ glabel appendGfx_model /* AA8B8 801141B8 8C820000 */ lw $v0, ($a0) /* AA8BC 801141BC 08045088 */ j .L80114220 /* AA8C0 801141C0 34A53048 */ ori $a1, $a1, 0x3048 +glabel L801141C4_AA8C4 /* AA8C4 801141C4 3C06E200 */ lui $a2, 0xe200 /* AA8C8 801141C8 34C6001C */ ori $a2, $a2, 0x1c /* AA8CC 801141CC 3C058410 */ lui $a1, 0x8410 @@ -1145,6 +1229,7 @@ glabel appendGfx_model /* AA8D8 801141D8 8C820000 */ lw $v0, ($a0) /* AA8DC 801141DC 08045088 */ j .L80114220 /* AA8E0 801141E0 34A541C8 */ ori $a1, $a1, 0x41c8 +glabel L801141E4_AA8E4 /* AA8E4 801141E4 3C06E200 */ lui $a2, 0xe200 /* AA8E8 801141E8 34C6001C */ ori $a2, $a2, 0x1c /* AA8EC 801141EC 3C058410 */ lui $a1, 0x8410 @@ -1153,6 +1238,7 @@ glabel appendGfx_model /* AA8F8 801141F8 8C820000 */ lw $v0, ($a0) /* AA8FC 801141FC 08045088 */ j .L80114220 /* AA900 80114200 34A54B50 */ ori $a1, $a1, 0x4b50 +glabel L80114204_AA904 /* AA904 80114204 3C06E200 */ lui $a2, 0xe200 /* AA908 80114208 34C6001C */ ori $a2, $a2, 0x1c /* AA90C 8011420C 3C058410 */ lui $a1, 0x8410 @@ -1167,6 +1253,7 @@ glabel appendGfx_model /* AA92C 8011422C AC660000 */ sw $a2, ($v1) /* AA930 80114230 AC650004 */ sw $a1, 4($v1) .L80114234: +glabel L80114234_AA934 /* AA934 80114234 3C0910AA */ lui $t1, 0x10aa /* AA938 80114238 8E020000 */ lw $v0, ($s0) /* AA93C 8011423C 3529F056 */ ori $t1, $t1, 0xf056 @@ -1215,52 +1302,71 @@ glabel appendGfx_model /* AA9E8 801142E8 AC620000 */ sw $v0, ($v1) /* AA9EC 801142EC 080451A4 */ j .L80114690 /* AA9F0 801142F0 AC690004 */ sw $t1, 4($v1) +glabel L801142F4_AA9F4 /* AA9F4 801142F4 2682FFFF */ addiu $v0, $s4, -1 /* AA9F8 801142F8 00021600 */ sll $v0, $v0, 0x18 /* AA9FC 801142FC 00021E03 */ sra $v1, $v0, 0x18 /* AAA00 80114300 2C62002F */ sltiu $v0, $v1, 0x2f /* AAA04 80114304 10400028 */ beqz $v0, .L801143A8 /* AAA08 80114308 00031080 */ sll $v0, $v1, 2 -/* AAA0C 8011430C 3C018015 */ lui $at, %hi(D_8014FCE0) +/* AAA0C 8011430C 3C018015 */ lui $at, %hi(jtbl_8014FCE0_E63E0) /* AAA10 80114310 00220821 */ addu $at, $at, $v0 -/* AAA14 80114314 8C22FCE0 */ lw $v0, %lo(D_8014FCE0)($at) +/* AAA14 80114314 8C22FCE0 */ lw $v0, %lo(jtbl_8014FCE0_E63E0)($at) /* AAA18 80114318 00400008 */ jr $v0 -/* AAA1C 8011431C 00000000 */ nop +/* AAA1C 8011431C 00000000 */ nop +glabel L80114320_AAA20 /* AAA20 80114320 080450EB */ j .L801143AC /* AAA24 80114324 24050020 */ addiu $a1, $zero, 0x20 +glabel L80114328_AAA28 /* AAA28 80114328 080450EB */ j .L801143AC /* AAA2C 8011432C 24050021 */ addiu $a1, $zero, 0x21 +glabel L80114330_AAA30 /* AAA30 80114330 080450EB */ j .L801143AC /* AAA34 80114334 24050022 */ addiu $a1, $zero, 0x22 +glabel L80114338_AAA38 /* AAA38 80114338 080450EB */ j .L801143AC /* AAA3C 8011433C 24050023 */ addiu $a1, $zero, 0x23 +glabel L80114340_AAA40 /* AAA40 80114340 080450EB */ j .L801143AC /* AAA44 80114344 24050025 */ addiu $a1, $zero, 0x25 +glabel L80114348_AAA48 /* AAA48 80114348 080450EB */ j .L801143AC /* AAA4C 8011434C 24050026 */ addiu $a1, $zero, 0x26 +glabel L80114350_AAA50 /* AAA50 80114350 080450EB */ j .L801143AC /* AAA54 80114354 24050027 */ addiu $a1, $zero, 0x27 +glabel L80114358_AAA58 /* AAA58 80114358 080450EB */ j .L801143AC /* AAA5C 8011435C 24050028 */ addiu $a1, $zero, 0x28 +glabel L80114360_AAA60 /* AAA60 80114360 080450EB */ j .L801143AC /* AAA64 80114364 24050029 */ addiu $a1, $zero, 0x29 +glabel L80114368_AAA68 /* AAA68 80114368 080450EB */ j .L801143AC /* AAA6C 8011436C 2405002A */ addiu $a1, $zero, 0x2a +glabel L80114370_AAA70 /* AAA70 80114370 080450EB */ j .L801143AC /* AAA74 80114374 2405002B */ addiu $a1, $zero, 0x2b +glabel L80114378_AAA78 /* AAA78 80114378 080450EB */ j .L801143AC /* AAA7C 8011437C 2405002C */ addiu $a1, $zero, 0x2c +glabel L80114380_AAA80 /* AAA80 80114380 080450EB */ j .L801143AC /* AAA84 80114384 24050034 */ addiu $a1, $zero, 0x34 +glabel L80114388_AAA88 /* AAA88 80114388 080450EB */ j .L801143AC /* AAA8C 8011438C 24050035 */ addiu $a1, $zero, 0x35 +glabel L80114390_AAA90 /* AAA90 80114390 080450EB */ j .L801143AC /* AAA94 80114394 24050036 */ addiu $a1, $zero, 0x36 +glabel L80114398_AAA98 /* AAA98 80114398 080450EB */ j .L801143AC /* AAA9C 8011439C 2405003B */ addiu $a1, $zero, 0x3b +glabel L801143A0_AAAA0 /* AAAA0 801143A0 080450EB */ j .L801143AC /* AAAA4 801143A4 2405003C */ addiu $a1, $zero, 0x3c .L801143A8: +glabel L801143A8_AAAA8 /* AAAA8 801143A8 2405001F */ addiu $a1, $zero, 0x1f .L801143AC: /* AAAAC 801143AC 3C02DE00 */ lui $v0, 0xde00 @@ -1321,7 +1427,7 @@ glabel appendGfx_model /* AAB84 80114484 14610004 */ bne $v1, $at, .L80114498 /* AAB88 80114488 3C018000 */ lui $at, 0x8000 /* AAB8C 8011448C 15210002 */ bne $t1, $at, .L80114498 -/* AAB90 80114490 00000000 */ nop +/* AAB90 80114490 00000000 */ nop /* AAB94 80114494 0006000D */ break 6 .L80114498: /* AAB98 80114498 00004812 */ mflo $t1 @@ -1336,12 +1442,12 @@ glabel appendGfx_model /* AABB8 801144B8 14610004 */ bne $v1, $at, .L801144CC /* AABBC 801144BC 3C018000 */ lui $at, 0x8000 /* AABC0 801144C0 14C10002 */ bne $a2, $at, .L801144CC -/* AABC4 801144C4 00000000 */ nop +/* AABC4 801144C4 00000000 */ nop /* AABC8 801144C8 0006000D */ break 6 .L801144CC: /* AABCC 801144CC 00003012 */ mflo $a2 /* AABD0 801144D0 8D420004 */ lw $v0, 4($t2) -/* AABD4 801144D4 00000000 */ nop +/* AABD4 801144D4 00000000 */ nop /* AABD8 801144D8 00470018 */ mult $v0, $a3 /* AABDC 801144DC 00001812 */ mflo $v1 /* AABE0 801144E0 3C028015 */ lui $v0, %hi(D_8014B74D) @@ -1349,13 +1455,13 @@ glabel appendGfx_model /* AABE8 801144E8 00450018 */ mult $v0, $a1 /* AABEC 801144EC 00004012 */ mflo $t0 /* AABF0 801144F0 00684021 */ addu $t0, $v1, $t0 -/* AABF4 801144F4 00000000 */ nop +/* AABF4 801144F4 00000000 */ nop /* AABF8 801144F8 010C0018 */ mult $t0, $t4 /* AABFC 801144FC 256B0008 */ addiu $t3, $t3, 8 /* AAC00 80114500 AE0B0000 */ sw $t3, ($s0) /* AAC04 80114504 0000A010 */ mfhi $s4 /* AAC08 80114508 8D430008 */ lw $v1, 8($t2) -/* AAC0C 8011450C 00000000 */ nop +/* AAC0C 8011450C 00000000 */ nop /* AAC10 80114510 00670018 */ mult $v1, $a3 /* AAC14 80114514 3C04800A */ lui $a0, %hi(gMasterGfxPos) /* AAC18 80114518 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) @@ -1369,7 +1475,7 @@ glabel appendGfx_model /* AAC38 80114538 AC820000 */ sw $v0, ($a0) /* AAC3C 8011453C 00009812 */ mflo $s3 /* AAC40 80114540 8D43000C */ lw $v1, 0xc($t2) -/* AAC44 80114544 00000000 */ nop +/* AAC44 80114544 00000000 */ nop /* AAC48 80114548 00670018 */ mult $v1, $a3 /* AAC4C 8011454C 8E020000 */ lw $v0, ($s0) /* AAC50 80114550 3C04F800 */ lui $a0, 0xf800 @@ -1419,28 +1525,35 @@ glabel appendGfx_model /* AAD00 80114600 ACE20000 */ sw $v0, ($a3) /* AAD04 80114604 080451A4 */ j .L80114690 /* AAD08 80114608 ACE90004 */ sw $t1, 4($a3) +glabel L8011460C_AAD0C /* AAD0C 8011460C 2682FFFF */ addiu $v0, $s4, -1 /* AAD10 80114610 00021600 */ sll $v0, $v0, 0x18 /* AAD14 80114614 00021E03 */ sra $v1, $v0, 0x18 /* AAD18 80114618 2C62002F */ sltiu $v0, $v1, 0x2f /* AAD1C 8011461C 10400010 */ beqz $v0, .L80114660 /* AAD20 80114620 00031080 */ sll $v0, $v1, 2 -/* AAD24 80114624 3C018015 */ lui $at, %hi(D_8014FDA0) +/* AAD24 80114624 3C018015 */ lui $at, %hi(jtbl_8014FDA0_E64A0) /* AAD28 80114628 00220821 */ addu $at, $at, $v0 -/* AAD2C 8011462C 8C22FDA0 */ lw $v0, %lo(D_8014FDA0)($at) +/* AAD2C 8011462C 8C22FDA0 */ lw $v0, %lo(jtbl_8014FDA0_E64A0)($at) /* AAD30 80114630 00400008 */ jr $v0 -/* AAD34 80114634 00000000 */ nop +/* AAD34 80114634 00000000 */ nop +glabel L80114638_AAD38 /* AAD38 80114638 08045199 */ j .L80114664 /* AAD3C 8011463C 24050021 */ addiu $a1, $zero, 0x21 +glabel L80114640_AAD40 /* AAD40 80114640 08045199 */ j .L80114664 /* AAD44 80114644 24050023 */ addiu $a1, $zero, 0x23 +glabel L80114648_AAD48 /* AAD48 80114648 08045199 */ j .L80114664 /* AAD4C 8011464C 24050025 */ addiu $a1, $zero, 0x25 +glabel L80114650_AAD50 /* AAD50 80114650 08045199 */ j .L80114664 /* AAD54 80114654 2405003B */ addiu $a1, $zero, 0x3b +glabel L80114658_AAD58 /* AAD58 80114658 08045199 */ j .L80114664 /* AAD5C 8011465C 2405003C */ addiu $a1, $zero, 0x3c .L80114660: +glabel L80114660_AAD60 /* AAD60 80114660 2405001F */ addiu $a1, $zero, 0x1f .L80114664: /* AAD64 80114664 8E030000 */ lw $v1, ($s0) @@ -1455,6 +1568,7 @@ glabel appendGfx_model /* AAD88 80114688 AE030000 */ sw $v1, ($s0) /* AAD8C 8011468C AC820004 */ sw $v0, 4($a0) .L80114690: +glabel L80114690_AAD90 /* AAD90 80114690 33020008 */ andi $v0, $t8, 8 /* AAD94 80114694 14400016 */ bnez $v0, .L801146F0 /* AAD98 80114698 33022000 */ andi $v0, $t8, 0x2000 @@ -1499,7 +1613,7 @@ glabel appendGfx_model /* AAE28 80114728 33020010 */ andi $v0, $t8, 0x10 .L8011472C: /* AAE2C 8011472C 10400018 */ beqz $v0, .L80114790 -/* AAE30 80114730 00000000 */ nop +/* AAE30 80114730 00000000 */ nop /* AAE34 80114734 92C200A5 */ lbu $v0, 0xa5($s6) /* AAE38 80114738 3C038015 */ lui $v1, %hi(gCurrentModelSpecialDlsPtr) /* AAE3C 8011473C 246312E8 */ addiu $v1, $v1, %lo(gCurrentModelSpecialDlsPtr) @@ -1512,7 +1626,7 @@ glabel appendGfx_model /* AAE58 80114758 00C21021 */ addu $v0, $a2, $v0 /* AAE5C 8011475C 8C420000 */ lw $v0, ($v0) /* AAE60 80114760 1040000B */ beqz $v0, .L80114790 -/* AAE64 80114764 00000000 */ nop +/* AAE64 80114764 00000000 */ nop /* AAE68 80114768 8E040000 */ lw $a0, ($s0) /* AAE6C 8011476C 8C620000 */ lw $v0, ($v1) /* AAE70 80114770 3C03DE00 */ lui $v1, 0xde00 @@ -1724,7 +1838,7 @@ glabel appendGfx_model /* AB184 80114A84 33020010 */ andi $v0, $t8, 0x10 .L80114A88: /* AB188 80114A88 10400016 */ beqz $v0, .L80114AE4 -/* AB18C 80114A8C 00000000 */ nop +/* AB18C 80114A8C 00000000 */ nop /* AB190 80114A90 97B50036 */ lhu $s5, 0x36($sp) /* AB194 80114A94 3C078015 */ lui $a3, %hi(gCurrentModelSpecialDlsPtr) /* AB198 80114A98 24E712E8 */ addiu $a3, $a3, %lo(gCurrentModelSpecialDlsPtr) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model_group.s b/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model_group.s index 510512c4b2..c863a9e5a5 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model_group.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model_group.s @@ -28,7 +28,7 @@ glabel appendGfx_model_group /* AE3E4 80117CE4 3C018015 */ lui $at, %hi(D_80153224) /* AE3E8 80117CE8 AC223224 */ sw $v0, %lo(D_80153224)($at) /* AE3EC 80117CEC 0C045F40 */ jal func_80117D00 -/* AE3F0 80117CF0 00000000 */ nop +/* AE3F0 80117CF0 00000000 */ nop /* AE3F4 80117CF4 8FBF0010 */ lw $ra, 0x10($sp) /* AE3F8 80117CF8 03E00008 */ jr $ra /* AE3FC 80117CFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/calculate_model_sizes.s b/asm/nonmatchings/code_a5dd0_len_114e0/calculate_model_sizes.s index 250cbe2f74..873deda24f 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/calculate_model_sizes.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/calculate_model_sizes.s @@ -27,19 +27,19 @@ glabel calculate_model_sizes /* AC880 80116180 46002101 */ sub.s $f4, $f4, $f0 /* AC884 80116184 46002121 */ cvt.d.s $f4, $f4 /* AC888 80116188 46342102 */ mul.d $f4, $f4, $f20 -/* AC88C 8011618C 00000000 */ nop +/* AC88C 8011618C 00000000 */ nop /* AC890 80116190 C4420038 */ lwc1 $f2, 0x38($v0) /* AC894 80116194 C4400014 */ lwc1 $f0, 0x14($v0) /* AC898 80116198 46001081 */ sub.s $f2, $f2, $f0 /* AC89C 8011619C 460010A1 */ cvt.d.s $f2, $f2 /* AC8A0 801161A0 46341082 */ mul.d $f2, $f2, $f20 -/* AC8A4 801161A4 00000000 */ nop +/* AC8A4 801161A4 00000000 */ nop /* AC8A8 801161A8 C4460020 */ lwc1 $f6, 0x20($v0) /* AC8AC 801161AC C4400044 */ lwc1 $f0, 0x44($v0) /* AC8B0 801161B0 46060001 */ sub.s $f0, $f0, $f6 /* AC8B4 801161B4 46000021 */ cvt.d.s $f0, $f0 /* AC8B8 801161B8 46340002 */ mul.d $f0, $f0, $f20 -/* AC8BC 801161BC 00000000 */ nop +/* AC8BC 801161BC 00000000 */ nop /* AC8C0 801161C0 4620220D */ trunc.w.d $f8, $f4 /* AC8C4 801161C4 E4480004 */ swc1 $f8, 4($v0) /* AC8C8 801161C8 4620120D */ trunc.w.d $f8, $f2 @@ -53,7 +53,7 @@ glabel calculate_model_sizes .L801161E8: /* AC8E8 801161E8 2A220100 */ slti $v0, $s1, 0x100 /* AC8EC 801161EC 1440FFD8 */ bnez $v0, .L80116150 -/* AC8F0 801161F0 00000000 */ nop +/* AC8F0 801161F0 00000000 */ nop /* AC8F4 801161F4 8FBF0018 */ lw $ra, 0x18($sp) /* AC8F8 801161F8 8FB10014 */ lw $s1, 0x14($sp) /* AC8FC 801161FC 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/clear_entity_data.s b/asm/nonmatchings/code_a5dd0_len_114e0/clear_entity_data.s index a7fe971bc5..0af0b6c7ee 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/clear_entity_data.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/clear_entity_data.s @@ -21,7 +21,7 @@ glabel clear_entity_data /* A73F8 80110CF8 AC201304 */ sw $zero, %lo(D_80151304)($at) /* A73FC 80110CFC 80420070 */ lb $v0, 0x70($v0) /* A7400 80110D00 14400003 */ bnez $v0, .L80110D10 -/* A7404 80110D04 00000000 */ nop +/* A7404 80110D04 00000000 */ nop /* A7408 80110D08 3C018015 */ lui $at, %hi(D_80151310) /* A740C 80110D0C AC201310 */ sw $zero, %lo(D_80151310)($at) .L80110D10: @@ -53,7 +53,7 @@ glabel clear_entity_data /* A746C 80110D6C 0481FFFD */ bgez $a0, .L80110D64 /* A7470 80110D70 2442FFFC */ addiu $v0, $v0, -4 /* A7474 80110D74 08044367 */ j .L80110D9C -/* A7478 80110D78 00000000 */ nop +/* A7478 80110D78 00000000 */ nop .L80110D7C: /* A747C 80110D7C 3C018015 */ lui $at, %hi(D_80151660) /* A7480 80110D80 AC201660 */ sw $zero, %lo(D_80151660)($at) @@ -77,7 +77,7 @@ glabel clear_entity_data /* A74C0 80110DC0 3C018015 */ lui $at, %hi(D_801512C4) /* A74C4 80110DC4 AC2312C4 */ sw $v1, %lo(D_801512C4)($at) /* A74C8 80110DC8 0804437B */ j .L80110DEC -/* A74CC 80110DCC 00000000 */ nop +/* A74CC 80110DCC 00000000 */ nop .L80110DD0: /* A74D0 80110DD0 3C02801A */ lui $v0, %hi(D_801A7000) /* A74D4 80110DD4 24427000 */ addiu $v0, $v0, %lo(D_801A7000) @@ -88,7 +88,7 @@ glabel clear_entity_data /* A74E8 80110DE8 AC2212C4 */ sw $v0, %lo(D_801512C4)($at) .L80110DEC: /* A74EC 80110DEC 0C044188 */ jal get_entity_list -/* A74F0 80110DF0 00000000 */ nop +/* A74F0 80110DF0 00000000 */ nop /* A74F4 80110DF4 3C108015 */ lui $s0, %hi(gCurrentEntityListPtr) /* A74F8 80110DF8 26101470 */ addiu $s0, $s0, %lo(gCurrentEntityListPtr) /* A74FC 80110DFC 0C044193 */ jal get_shadow_list diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/clear_model_data.s b/asm/nonmatchings/code_a5dd0_len_114e0/clear_model_data.s index 9328634b53..c771775cb5 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/clear_model_data.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/clear_model_data.s @@ -6,7 +6,7 @@ glabel clear_model_data /* AC448 80115D48 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* AC44C 80115D4C 80420070 */ lb $v0, 0x70($v0) /* AC450 80115D50 1440002C */ bnez $v0, .L80115E04 -/* AC454 80115D54 00000000 */ nop +/* AC454 80115D54 00000000 */ nop /* AC458 80115D58 3C028015 */ lui $v0, %hi(gWorldModelList) /* AC45C 80115D5C 24421770 */ addiu $v0, $v0, %lo(gWorldModelList) /* AC460 80115D60 3C018015 */ lui $at, %hi(gCurrentModelListPtr) @@ -177,4 +177,4 @@ glabel clear_model_data /* AC6D8 80115FD8 1440FFF6 */ bnez $v0, .L80115FB4 /* AC6DC 80115FDC 24A50004 */ addiu $a1, $a1, 4 /* AC6E0 80115FE0 03E00008 */ jr $ra -/* AC6E4 80115FE4 00000000 */ nop +/* AC6E4 80115FE4 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/clone_model.s b/asm/nonmatchings/code_a5dd0_len_114e0/clone_model.s index f35f7b5ffb..12173a7cce 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/clone_model.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/clone_model.s @@ -21,7 +21,7 @@ glabel clone_model .L8011B730: /* B1E30 8011B730 8C620000 */ lw $v0, ($v1) /* B1E34 8011B734 10400005 */ beqz $v0, .L8011B74C -/* B1E38 8011B738 00000000 */ nop +/* B1E38 8011B738 00000000 */ nop /* B1E3C 8011B73C 26100001 */ addiu $s0, $s0, 1 /* B1E40 8011B740 2A020100 */ slti $v0, $s0, 0x100 /* B1E44 8011B744 1440FFFA */ bnez $v0, .L8011B730 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/create_entity.s b/asm/nonmatchings/code_a5dd0_len_114e0/create_entity.s index 4f684a6f29..8befd532dc 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/create_entity.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/create_entity.s @@ -74,7 +74,7 @@ glabel create_entity /* A80C8 801119C8 AE000040 */ sw $zero, 0x40($s0) /* A80CC 801119CC 94620002 */ lhu $v0, 2($v1) /* A80D0 801119D0 10400008 */ beqz $v0, .L801119F4 -/* A80D4 801119D4 00000000 */ nop +/* A80D4 801119D4 00000000 */ nop /* A80D8 801119D8 0C00AB39 */ jal heap_malloc /* A80DC 801119DC 0040202D */ daddu $a0, $v0, $zero /* A80E0 801119E0 8FA30040 */ lw $v1, 0x40($sp) @@ -140,22 +140,22 @@ glabel create_entity /* A81CC 80111ACC 0200202D */ daddu $a0, $s0, $zero /* A81D0 80111AD0 8CA20018 */ lw $v0, 0x18($a1) /* A81D4 80111AD4 10400003 */ beqz $v0, .L80111AE4 -/* A81D8 80111AD8 00000000 */ nop +/* A81D8 80111AD8 00000000 */ nop /* A81DC 80111ADC 0C0444A9 */ jal load_simple_entity_data /* A81E0 80111AE0 0220302D */ daddu $a2, $s1, $zero .L80111AE4: /* A81E4 80111AE4 8FA20040 */ lw $v0, 0x40($sp) /* A81E8 80111AE8 8C440004 */ lw $a0, 4($v0) /* A81EC 80111AEC 1080000C */ beqz $a0, .L80111B20 -/* A81F0 80111AF0 00000000 */ nop +/* A81F0 80111AF0 00000000 */ nop /* A81F4 80111AF4 0C048338 */ jal load_virtual_model -/* A81F8 80111AF8 00000000 */ nop +/* A81F8 80111AF8 00000000 */ nop /* A81FC 80111AFC A6020014 */ sh $v0, 0x14($s0) /* A8200 80111B00 00021400 */ sll $v0, $v0, 0x10 /* A8204 80111B04 0C0483C1 */ jal func_80120F04 /* A8208 80111B08 00022403 */ sra $a0, $v0, 0x10 /* A820C 80111B0C 080446C7 */ j .L80111B1C -/* A8210 80111B10 00000000 */ nop +/* A8210 80111B10 00000000 */ nop .L80111B14: /* A8214 80111B14 0C044502 */ jal load_split_entity_data /* A8218 80111B18 0220302D */ daddu $a2, $s1, $zero @@ -165,11 +165,11 @@ glabel create_entity /* A8220 80111B20 90430020 */ lbu $v1, 0x20($v0) /* A8224 80111B24 24020001 */ addiu $v0, $zero, 1 /* A8228 80111B28 1062000A */ beq $v1, $v0, .L80111B54 -/* A822C 80111B2C 00000000 */ nop +/* A822C 80111B2C 00000000 */ nop /* A8230 80111B30 8E020000 */ lw $v0, ($s0) /* A8234 80111B34 30420300 */ andi $v0, $v0, 0x300 /* A8238 80111B38 10400006 */ beqz $v0, .L80111B54 -/* A823C 80111B3C 00000000 */ nop +/* A823C 80111B3C 00000000 */ nop /* A8240 80111B40 4405B000 */ mfc1 $a1, $f22 /* A8244 80111B44 4406C000 */ mfc1 $a2, $f24 /* A8248 80111B48 4407D000 */ mfc1 $a3, $f26 @@ -182,19 +182,21 @@ glabel create_entity /* A8260 80111B60 2C62002B */ sltiu $v0, $v1, 0x2b /* A8264 80111B64 10400009 */ beqz $v0, .L80111B8C /* A8268 80111B68 00031080 */ sll $v0, $v1, 2 -/* A826C 80111B6C 3C018015 */ lui $at, %hi(D_8014F878) +/* A826C 80111B6C 3C018015 */ lui $at, %hi(jtbl_8014F878_E5F78) /* A8270 80111B70 00220821 */ addu $at, $at, $v0 -/* A8274 80111B74 8C22F878 */ lw $v0, %lo(D_8014F878)($at) +/* A8274 80111B74 8C22F878 */ lw $v0, %lo(jtbl_8014F878_E5F78)($at) /* A8278 80111B78 00400008 */ jr $v0 -/* A827C 80111B7C 00000000 */ nop +/* A827C 80111B7C 00000000 */ nop +glabel L80111B80_A8280 /* A8280 80111B80 8E020000 */ lw $v0, ($s0) /* A8284 80111B84 34424000 */ ori $v0, $v0, 0x4000 /* A8288 80111B88 AE020000 */ sw $v0, ($s0) .L80111B8C: +glabel L80111B8C_A828C /* A828C 80111B8C 8FA20040 */ lw $v0, 0x40($sp) /* A8290 80111B90 8C42000C */ lw $v0, 0xc($v0) /* A8294 80111B94 10400003 */ beqz $v0, .L80111BA4 -/* A8298 80111B98 00000000 */ nop +/* A8298 80111B98 00000000 */ nop /* A829C 80111B9C 0040F809 */ jalr $v0 /* A82A0 80111BA0 0200202D */ daddu $a0, $s0, $zero .L80111BA4: diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/create_entity_shadow.s b/asm/nonmatchings/code_a5dd0_len_114e0/create_entity_shadow.s index e176d07f62..81c5228647 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/create_entity_shadow.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/create_entity_shadow.s @@ -27,7 +27,7 @@ glabel create_entity_shadow /* A891C 8011221C 44061000 */ mfc1 $a2, $f2 /* A8920 80112220 44072000 */ mfc1 $a3, $f4 /* A8924 80112224 0C044898 */ jal create_shadow_type -/* A8928 80112228 00000000 */ nop +/* A8928 80112228 00000000 */ nop /* A892C 8011222C 00022400 */ sll $a0, $v0, 0x10 /* A8930 80112230 00042403 */ sra $a0, $a0, 0x10 /* A8934 80112234 0C044181 */ jal get_shadow_by_index diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/create_shadow_from_data.s b/asm/nonmatchings/code_a5dd0_len_114e0/create_shadow_from_data.s index 11999c8365..7e85faf889 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/create_shadow_from_data.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/create_shadow_from_data.s @@ -28,10 +28,10 @@ glabel create_shadow_from_data /* A8330 80111C30 2A22003C */ slti $v0, $s1, 0x3c .L80111C34: /* A8334 80111C34 14400003 */ bnez $v0, .L80111C44 -/* A8338 80111C38 00000000 */ nop +/* A8338 80111C38 00000000 */ nop .L80111C3C: /* A833C 80111C3C 0804470F */ j .L80111C3C -/* A8340 80111C40 00000000 */ nop +/* A8340 80111C40 00000000 */ nop .L80111C44: /* A8344 80111C44 0C00AB39 */ jal heap_malloc /* A8348 80111C48 24040078 */ addiu $a0, $zero, 0x78 @@ -73,7 +73,7 @@ glabel create_shadow_from_data /* A83D8 80111CD8 0C0480EB */ jal func_801203AC /* A83DC 80111CDC 00022403 */ sra $a0, $v0, 0x10 /* A83E0 80111CE0 0804473D */ j .L80111CF4 -/* A83E4 80111CE4 00000000 */ nop +/* A83E4 80111CE4 00000000 */ nop .L80111CE8: /* A83E8 80111CE8 0C048338 */ jal load_virtual_model /* A83EC 80111CEC 8E440004 */ lw $a0, 4($s2) @@ -81,7 +81,7 @@ glabel create_shadow_from_data .L80111CF4: /* A83F4 80111CF4 8E42000C */ lw $v0, 0xc($s2) /* A83F8 80111CF8 10400003 */ beqz $v0, .L80111D08 -/* A83FC 80111CFC 00000000 */ nop +/* A83FC 80111CFC 00000000 */ nop /* A8400 80111D00 0040F809 */ jalr $v0 /* A8404 80111D04 0200202D */ daddu $a0, $s0, $zero .L80111D08: diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/create_shadow_type.s b/asm/nonmatchings/code_a5dd0_len_114e0/create_shadow_type.s index 98681219a5..56f07b45e3 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/create_shadow_type.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/create_shadow_type.s @@ -16,22 +16,28 @@ glabel create_shadow_type /* A898C 8011228C 10400014 */ beqz $v0, .L801122E0 /* A8990 80112290 AFB10014 */ sw $s1, 0x14($sp) /* A8994 80112294 00031080 */ sll $v0, $v1, 2 -/* A8998 80112298 3C018015 */ lui $at, %hi(D_8014F928) +/* A8998 80112298 3C018015 */ lui $at, %hi(jtbl_8014F928_E6028) /* A899C 8011229C 00220821 */ addu $at, $at, $v0 -/* A89A0 801122A0 8C22F928 */ lw $v0, %lo(D_8014F928)($at) +/* A89A0 801122A0 8C22F928 */ lw $v0, %lo(jtbl_8014F928_E6028)($at) /* A89A4 801122A4 00400008 */ jr $v0 -/* A89A8 801122A8 00000000 */ nop +/* A89A8 801122A8 00000000 */ nop +glabel L801122AC_A89AC /* A89AC 801122AC 24100001 */ addiu $s0, $zero, 1 +glabel L801122B0_A89B0 /* A89B0 801122B0 3C04802F */ lui $a0, %hi(D_802E98BC) /* A89B4 801122B4 248498BC */ addiu $a0, $a0, %lo(D_802E98BC) /* A89B8 801122B8 080448B8 */ j .L801122E0 -/* A89BC 801122BC 00000000 */ nop +/* A89BC 801122BC 00000000 */ nop +glabel L801122C0_A89C0 /* A89C0 801122C0 24100001 */ addiu $s0, $zero, 1 +glabel L801122C4_A89C4 /* A89C4 801122C4 3C04802F */ lui $a0, %hi(D_802E9904) /* A89C8 801122C8 24849904 */ addiu $a0, $a0, %lo(D_802E9904) /* A89CC 801122CC 080448B8 */ j .L801122E0 -/* A89D0 801122D0 00000000 */ nop +/* A89D0 801122D0 00000000 */ nop +glabel L801122D4_A89D4 /* A89D4 801122D4 24100001 */ addiu $s0, $zero, 1 +glabel L801122D8_A89D8 /* A89D8 801122D8 3C04802F */ lui $a0, %hi(D_802E98E0) /* A89DC 801122DC 248498E0 */ addiu $a0, $a0, %lo(D_802E98E0) .L801122E0: @@ -39,7 +45,7 @@ glabel create_shadow_type /* A89E4 801122E4 44061000 */ mfc1 $a2, $f2 /* A89E8 801122E8 44072000 */ mfc1 $a3, $f4 /* A89EC 801122EC 0C0446F6 */ jal create_shadow_from_data -/* A89F0 801122F0 00000000 */ nop +/* A89F0 801122F0 00000000 */ nop /* A89F4 801122F4 12000006 */ beqz $s0, .L80112310 /* A89F8 801122F8 0040882D */ daddu $s1, $v0, $zero /* A89FC 801122FC 0C044181 */ jal get_shadow_by_index diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/delete_entity.s b/asm/nonmatchings/code_a5dd0_len_114e0/delete_entity.s index 3d9337d706..ab36887ff1 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/delete_entity.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/delete_entity.s @@ -11,18 +11,18 @@ glabel delete_entity /* A6DE8 801106E8 0040882D */ daddu $s1, $v0, $zero /* A6DEC 801106EC 8E240040 */ lw $a0, 0x40($s1) /* A6DF0 801106F0 10800003 */ beqz $a0, .L80110700 -/* A6DF4 801106F4 00000000 */ nop +/* A6DF4 801106F4 00000000 */ nop /* A6DF8 801106F8 0C00AB4B */ jal heap_free -/* A6DFC 801106FC 00000000 */ nop +/* A6DFC 801106FC 00000000 */ nop .L80110700: /* A6E00 80110700 8E220000 */ lw $v0, ($s1) /* A6E04 80110704 30420008 */ andi $v0, $v0, 8 /* A6E08 80110708 14400005 */ bnez $v0, .L80110720 -/* A6E0C 8011070C 00000000 */ nop +/* A6E0C 8011070C 00000000 */ nop /* A6E10 80110710 0C048B7F */ jal func_80122DFC /* A6E14 80110714 86240014 */ lh $a0, 0x14($s1) /* A6E18 80110718 080441CC */ j .L80110730 -/* A6E1C 8011071C 00000000 */ nop +/* A6E1C 8011071C 00000000 */ nop .L80110720: /* A6E20 80110720 0C047FF8 */ jal get_anim_mesh /* A6E24 80110724 86240014 */ lh $a0, 0x14($s1) @@ -31,9 +31,9 @@ glabel delete_entity .L80110730: /* A6E30 80110730 86240016 */ lh $a0, 0x16($s1) /* A6E34 80110734 04800007 */ bltz $a0, .L80110754 -/* A6E38 80110738 00000000 */ nop +/* A6E38 80110738 00000000 */ nop /* A6E3C 8011073C 0C044181 */ jal get_shadow_by_index -/* A6E40 80110740 00000000 */ nop +/* A6E40 80110740 00000000 */ nop /* A6E44 80110744 8C430000 */ lw $v1, ($v0) /* A6E48 80110748 3C041000 */ lui $a0, 0x1000 /* A6E4C 8011074C 00641825 */ or $v1, $v1, $a0 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/delete_entity_and_unload_data.s b/asm/nonmatchings/code_a5dd0_len_114e0/delete_entity_and_unload_data.s index ac9e63b8f2..779fe58e5c 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/delete_entity_and_unload_data.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/delete_entity_and_unload_data.s @@ -11,18 +11,18 @@ glabel delete_entity_and_unload_data /* A6EA8 801107A8 0040882D */ daddu $s1, $v0, $zero /* A6EAC 801107AC 8E240040 */ lw $a0, 0x40($s1) /* A6EB0 801107B0 10800003 */ beqz $a0, .L801107C0 -/* A6EB4 801107B4 00000000 */ nop +/* A6EB4 801107B4 00000000 */ nop /* A6EB8 801107B8 0C00AB4B */ jal heap_free -/* A6EBC 801107BC 00000000 */ nop +/* A6EBC 801107BC 00000000 */ nop .L801107C0: /* A6EC0 801107C0 8E220000 */ lw $v0, ($s1) /* A6EC4 801107C4 30420008 */ andi $v0, $v0, 8 /* A6EC8 801107C8 14400005 */ bnez $v0, .L801107E0 -/* A6ECC 801107CC 00000000 */ nop +/* A6ECC 801107CC 00000000 */ nop /* A6ED0 801107D0 0C048B7F */ jal func_80122DFC /* A6ED4 801107D4 86240014 */ lh $a0, 0x14($s1) /* A6ED8 801107D8 080441FC */ j .L801107F0 -/* A6EDC 801107DC 00000000 */ nop +/* A6EDC 801107DC 00000000 */ nop .L801107E0: /* A6EE0 801107E0 0C047FF8 */ jal get_anim_mesh /* A6EE4 801107E4 86240014 */ lh $a0, 0x14($s1) @@ -31,12 +31,12 @@ glabel delete_entity_and_unload_data .L801107F0: /* A6EF0 801107F0 8E240038 */ lw $a0, 0x38($s1) /* A6EF4 801107F4 0C0445F7 */ jal func_801117DC -/* A6EF8 801107F8 00000000 */ nop +/* A6EF8 801107F8 00000000 */ nop /* A6EFC 801107FC 86240016 */ lh $a0, 0x16($s1) /* A6F00 80110800 04800007 */ bltz $a0, .L80110820 -/* A6F04 80110804 00000000 */ nop +/* A6F04 80110804 00000000 */ nop /* A6F08 80110808 0C044181 */ jal get_shadow_by_index -/* A6F0C 8011080C 00000000 */ nop +/* A6F0C 8011080C 00000000 */ nop /* A6F10 80110810 8C430000 */ lw $v1, ($v0) /* A6F14 80110814 3C041000 */ lui $a0, 0x1000 /* A6F18 80110818 00641825 */ or $v1, $v1, $a0 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/entity_get_collision_flags.s b/asm/nonmatchings/code_a5dd0_len_114e0/entity_get_collision_flags.s index 6bbb66a76c..581646c217 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/entity_get_collision_flags.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/entity_get_collision_flags.s @@ -72,7 +72,7 @@ glabel entity_get_collision_flags /* A70AC 801109AC 10400009 */ beqz $v0, .L801109D4 /* A70B0 801109B0 306200FF */ andi $v0, $v1, 0xff /* A70B4 801109B4 14C20007 */ bne $a2, $v0, .L801109D4 -/* A70B8 801109B8 00000000 */ nop +/* A70B8 801109B8 00000000 */ nop /* A70BC 801109BC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A70C0 801109C0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A70C4 801109C4 8C4200E0 */ lw $v0, 0xe0($v0) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FBD8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FBD8.s index 249804abb7..735649e6fa 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FBD8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FBD8.s @@ -13,17 +13,19 @@ glabel func_8010FBD8 /* A62F8 8010FBF8 10400052 */ beqz $v0, .L8010FD44 /* A62FC 8010FBFC 26100004 */ addiu $s0, $s0, 4 /* A6300 8010FC00 00031080 */ sll $v0, $v1, 2 -/* A6304 8010FC04 3C018015 */ lui $at, %hi(D_8014F740) +/* A6304 8010FC04 3C018015 */ lui $at, %hi(jtbl_8014F740_E5E40) /* A6308 8010FC08 00220821 */ addu $at, $at, $v0 -/* A630C 8010FC0C 8C22F740 */ lw $v0, %lo(D_8014F740)($at) +/* A630C 8010FC0C 8C22F740 */ lw $v0, %lo(jtbl_8014F740_E5E40)($at) /* A6310 8010FC10 00400008 */ jr $v0 -/* A6314 8010FC14 00000000 */ nop +/* A6314 8010FC14 00000000 */ nop +glabel L8010FC18_A6318 /* A6318 8010FC18 0000202D */ daddu $a0, $zero, $zero /* A631C 8010FC1C 240200FF */ addiu $v0, $zero, 0xff /* A6320 8010FC20 A2220009 */ sb $v0, 9($s1) /* A6324 8010FC24 AE20001C */ sw $zero, 0x1c($s1) /* A6328 8010FC28 08043F54 */ j .L8010FD50 /* A632C 8010FC2C AE200018 */ sw $zero, 0x18($s1) +glabel L8010FC30_A6330 /* A6330 8010FC30 8E020000 */ lw $v0, ($s0) /* A6334 8010FC34 24040001 */ addiu $a0, $zero, 1 /* A6338 8010FC38 AE220018 */ sw $v0, 0x18($s1) @@ -32,6 +34,7 @@ glabel func_8010FBD8 /* A6344 8010FC44 A2220009 */ sb $v0, 9($s1) /* A6348 8010FC48 08043F54 */ j .L8010FD50 /* A634C 8010FC4C AE23002C */ sw $v1, 0x2c($s1) +glabel L8010FC50_A6350 /* A6350 8010FC50 8E020000 */ lw $v0, ($s0) /* A6354 8010FC54 26100004 */ addiu $s0, $s0, 4 /* A6358 8010FC58 0220202D */ daddu $a0, $s1, $zero @@ -39,6 +42,7 @@ glabel func_8010FBD8 /* A6360 8010FC60 AC900018 */ sw $s0, 0x18($a0) /* A6364 8010FC64 08043F54 */ j .L8010FD50 /* A6368 8010FC68 24040001 */ addiu $a0, $zero, 1 +glabel L8010FC6C_A636C /* A636C 8010FC6C 92020003 */ lbu $v0, 3($s0) /* A6370 8010FC70 26100004 */ addiu $s0, $s0, 4 /* A6374 8010FC74 0000202D */ daddu $a0, $zero, $zero @@ -48,6 +52,7 @@ glabel func_8010FBD8 /* A6384 8010FC84 AE300018 */ sw $s0, 0x18($s1) /* A6388 8010FC88 08043F54 */ j .L8010FD50 /* A638C 8010FC8C AE22001C */ sw $v0, 0x1c($s1) +glabel L8010FC90_A6390 /* A6390 8010FC90 8E020000 */ lw $v0, ($s0) /* A6394 8010FC94 00021080 */ sll $v0, $v0, 2 /* A6398 8010FC98 02221021 */ addu $v0, $s1, $v0 @@ -55,6 +60,7 @@ glabel func_8010FBD8 /* A63A0 8010FCA0 24040001 */ addiu $a0, $zero, 1 /* A63A4 8010FCA4 08043F54 */ j .L8010FD50 /* A63A8 8010FCA8 AE220018 */ sw $v0, 0x18($s1) +glabel L8010FCAC_A63AC /* A63AC 8010FCAC 8E020000 */ lw $v0, ($s0) /* A63B0 8010FCB0 26100004 */ addiu $s0, $s0, 4 /* A63B4 8010FCB4 24040001 */ addiu $a0, $zero, 1 @@ -63,6 +69,7 @@ glabel func_8010FBD8 /* A63C0 8010FCC0 AC50002C */ sw $s0, 0x2c($v0) /* A63C4 8010FCC4 08043F54 */ j .L8010FD50 /* A63C8 8010FCC8 AE300018 */ sw $s0, 0x18($s1) +glabel L8010FCCC_A63CC /* A63CC 8010FCCC 8E220028 */ lw $v0, 0x28($s1) /* A63D0 8010FCD0 1040001D */ beqz $v0, .L8010FD48 /* A63D4 8010FCD4 3C030100 */ lui $v1, 0x100 @@ -70,6 +77,7 @@ glabel func_8010FBD8 /* A63DC 8010FCDC 00431025 */ or $v0, $v0, $v1 /* A63E0 8010FCE0 08043F52 */ j .L8010FD48 /* A63E4 8010FCE4 AE220000 */ sw $v0, ($s1) +glabel L8010FCE8_A63E8 /* A63E8 8010FCE8 8E030000 */ lw $v1, ($s0) /* A63EC 8010FCEC 26100004 */ addiu $s0, $s0, 4 /* A63F0 8010FCF0 8E220000 */ lw $v0, ($s1) @@ -78,6 +86,7 @@ glabel func_8010FBD8 /* A63FC 8010FCFC 00431025 */ or $v0, $v0, $v1 /* A6400 8010FD00 08043F54 */ j .L8010FD50 /* A6404 8010FD04 AE220000 */ sw $v0, ($s1) +glabel L8010FD08_A6408 /* A6408 8010FD08 8E030000 */ lw $v1, ($s0) /* A640C 8010FD0C 26100004 */ addiu $s0, $s0, 4 /* A6410 8010FD10 8E220000 */ lw $v0, ($s1) @@ -87,6 +96,7 @@ glabel func_8010FBD8 /* A6420 8010FD20 00431024 */ and $v0, $v0, $v1 /* A6424 8010FD24 08043F54 */ j .L8010FD50 /* A6428 8010FD28 AE220000 */ sw $v0, ($s1) +glabel L8010FD2C_A642C /* A642C 8010FD2C 8E040000 */ lw $a0, ($s0) /* A6430 8010FD30 0C05272D */ jal play_sound /* A6434 8010FD34 26100004 */ addiu $s0, $s0, 4 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FD68.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FD68.s index c63b403fea..bf2eef1e41 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FD68.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FD68.s @@ -10,7 +10,7 @@ glabel func_8010FD68 /* A6478 8010FD78 0C043EF6 */ jal func_8010FBD8 /* A647C 8010FD7C 0200202D */ daddu $a0, $s0, $zero /* A6480 8010FD80 1440FFFD */ bnez $v0, .L8010FD78 -/* A6484 8010FD84 00000000 */ nop +/* A6484 8010FD84 00000000 */ nop /* A6488 8010FD88 8FBF0014 */ lw $ra, 0x14($sp) /* A648C 8010FD8C 8FB00010 */ lw $s0, 0x10($sp) /* A6490 8010FD90 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FE44.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FE44.s index 446432b2f4..acdfe29a8e 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FE44.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FE44.s @@ -7,7 +7,7 @@ glabel func_8010FE44 /* A654C 8010FE4C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* A6550 8010FE50 AFBF0010 */ sw $ra, 0x10($sp) /* A6554 8010FE54 0C043F66 */ jal func_8010FD98 -/* A6558 8010FE58 00000000 */ nop +/* A6558 8010FE58 00000000 */ nop /* A655C 8010FE5C 8FBF0010 */ lw $ra, 0x10($sp) /* A6560 8010FE60 03E00008 */ jr $ra /* A6564 8010FE64 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_801109DC.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_801109DC.s index 6dea5711cb..8abfc33724 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_801109DC.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_801109DC.s @@ -23,24 +23,26 @@ glabel func_801109DC /* A7124 80110A24 2C620020 */ sltiu $v0, $v1, 0x20 /* A7128 80110A28 1040000F */ beqz $v0, .L80110A68 /* A712C 80110A2C 00031080 */ sll $v0, $v1, 2 -/* A7130 80110A30 3C018015 */ lui $at, %hi(D_8014F768) +/* A7130 80110A30 3C018015 */ lui $at, %hi(jtbl_8014F768_E5E68) /* A7134 80110A34 00220821 */ addu $at, $at, $v0 -/* A7138 80110A38 8C22F768 */ lw $v0, %lo(D_8014F768)($at) +/* A7138 80110A38 8C22F768 */ lw $v0, %lo(jtbl_8014F768_E5E68)($at) /* A713C 80110A3C 00400008 */ jr $v0 -/* A7140 80110A40 00000000 */ nop +/* A7140 80110A40 00000000 */ nop .L80110A44: /* A7144 80110A44 2623FFF9 */ addiu $v1, $s1, -7 /* A7148 80110A48 2C62001C */ sltiu $v0, $v1, 0x1c /* A714C 80110A4C 10400006 */ beqz $v0, .L80110A68 /* A7150 80110A50 00031080 */ sll $v0, $v1, 2 -/* A7154 80110A54 3C018015 */ lui $at, %hi(D_8014F7E8) +/* A7154 80110A54 3C018015 */ lui $at, %hi(jtbl_8014F7E8_E5EE8) /* A7158 80110A58 00220821 */ addu $at, $at, $v0 -/* A715C 80110A5C 8C22F7E8 */ lw $v0, %lo(D_8014F7E8)($at) +/* A715C 80110A5C 8C22F7E8 */ lw $v0, %lo(jtbl_8014F7E8_E5EE8)($at) /* A7160 80110A60 00400008 */ jr $v0 -/* A7164 80110A64 00000000 */ nop +/* A7164 80110A64 00000000 */ nop .L80110A68: +glabel L80110A68_A7168 /* A7168 80110A68 080442A5 */ j .L80110A94 /* A716C 80110A6C 0000102D */ daddu $v0, $zero, $zero +glabel L80110A70_A7170 /* A7170 80110A70 0C04417A */ jal get_entity_by_index /* A7174 80110A74 0240202D */ daddu $a0, $s2, $zero /* A7178 80110A78 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80110BCC.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80110BCC.s index e9513d9654..5a33af30ad 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80110BCC.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80110BCC.s @@ -7,7 +7,7 @@ glabel func_80110BCC /* A72D4 80110BD4 8C820000 */ lw $v0, ($a0) /* A72D8 80110BD8 30420008 */ andi $v0, $v0, 8 /* A72DC 80110BDC 14400003 */ bnez $v0, .L80110BEC -/* A72E0 80110BE0 00000000 */ nop +/* A72E0 80110BE0 00000000 */ nop /* A72E4 80110BE4 0C048B5F */ jal func_80122D7C /* A72E8 80110BE8 84840014 */ lh $a0, 0x14($a0) .L80110BEC: diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80110E58.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80110E58.s index a131b6f6ae..0b532974e3 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80110E58.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80110E58.s @@ -17,9 +17,9 @@ glabel func_80110E58 /* A7588 80110E88 3C018015 */ lui $at, %hi(D_801512C4) /* A758C 80110E8C AC2312C4 */ sw $v1, %lo(D_801512C4)($at) /* A7590 80110E90 0C0443C4 */ jal func_80110F10 -/* A7594 80110E94 00000000 */ nop +/* A7594 80110E94 00000000 */ nop /* A7598 80110E98 080443B5 */ j .L80110ED4 -/* A759C 80110E9C 00000000 */ nop +/* A759C 80110E9C 00000000 */ nop .L80110EA0: /* A75A0 80110EA0 3C028015 */ lui $v0, %hi(D_801516F4) /* A75A4 80110EA4 244216F4 */ addiu $v0, $v0, %lo(D_801516F4) @@ -37,11 +37,11 @@ glabel func_80110E58 /* A75D0 80110ED0 AC2212C4 */ sw $v0, %lo(D_801512C4)($at) .L80110ED4: /* A75D4 80110ED4 0C044188 */ jal get_entity_list -/* A75D8 80110ED8 00000000 */ nop +/* A75D8 80110ED8 00000000 */ nop /* A75DC 80110EDC 3C018015 */ lui $at, %hi(gCurrentEntityListPtr) /* A75E0 80110EE0 AC221470 */ sw $v0, %lo(gCurrentEntityListPtr)($at) /* A75E4 80110EE4 0C044193 */ jal get_shadow_list -/* A75E8 80110EE8 00000000 */ nop +/* A75E8 80110EE8 00000000 */ nop /* A75EC 80110EEC 8FBF0010 */ lw $ra, 0x10($sp) /* A75F0 80110EF0 3C018015 */ lui $at, %hi(gCurrentShadowListPtr) /* A75F4 80110EF4 AC221658 */ sw $v0, %lo(gCurrentShadowListPtr)($at) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80110F10.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80110F10.s index cbc0fabb3f..105c01dbeb 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80110F10.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80110F10.s @@ -23,7 +23,7 @@ glabel func_80110F10 .L80110F58: /* A7658 80110F58 8E910000 */ lw $s1, ($s4) /* A765C 80110F5C 1220004A */ beqz $s1, .L80111088 -/* A7660 80110F60 00000000 */ nop +/* A7660 80110F60 00000000 */ nop /* A7664 80110F64 96220000 */ lhu $v0, ($s1) /* A7668 80110F68 30420008 */ andi $v0, $v0, 8 /* A766C 80110F6C 1440000F */ bnez $v0, .L80110FAC @@ -95,7 +95,7 @@ glabel func_80110F10 /* A776C 8011106C 0240302D */ daddu $a2, $s2, $zero .L80111070: /* A7770 80111070 0C04442D */ jal func_801110B4 -/* A7774 80111074 00000000 */ nop +/* A7774 80111074 00000000 */ nop .L80111078: /* A7778 80111078 26B50001 */ addiu $s5, $s5, 1 /* A777C 8011107C 2AA2001E */ slti $v0, $s5, 0x1e diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80111790.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80111790.s index 7fa4ee6169..ce48582c4f 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80111790.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80111790.s @@ -12,7 +12,7 @@ glabel func_80111790 /* A7EA8 801117A8 8C430038 */ lw $v1, 0x38($v0) /* A7EAC 801117AC 8C620018 */ lw $v0, 0x18($v1) /* A7EB0 801117B0 10400005 */ beqz $v0, .L801117C8 -/* A7EB4 801117B4 00000000 */ nop +/* A7EB4 801117B4 00000000 */ nop /* A7EB8 801117B8 14430004 */ bne $v0, $v1, .L801117CC /* A7EBC 801117BC 28A2001E */ slti $v0, $a1, 0x1e /* A7EC0 801117C0 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_801117DC.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_801117DC.s index e2a867fd67..88e08673c1 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_801117DC.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_801117DC.s @@ -27,11 +27,11 @@ glabel func_801117DC /* A7F2C 8011182C 00468821 */ addu $s1, $v0, $a2 /* A7F30 80111830 8E240000 */ lw $a0, ($s1) /* A7F34 80111834 1487001E */ bne $a0, $a3, .L801118B0 -/* A7F38 80111838 00000000 */ nop +/* A7F38 80111838 00000000 */ nop /* A7F3C 8011183C 94820000 */ lhu $v0, ($a0) /* A7F40 80111840 30420008 */ andi $v0, $v0, 8 /* A7F44 80111844 1040000C */ beqz $v0, .L80111878 -/* A7F48 80111848 00000000 */ nop +/* A7F48 80111848 00000000 */ nop /* A7F4C 8011184C 8C830018 */ lw $v1, 0x18($a0) /* A7F50 80111850 8C650004 */ lw $a1, 4($v1) /* A7F54 80111854 8C620000 */ lw $v0, ($v1) @@ -50,9 +50,9 @@ glabel func_801117DC /* A7F84 80111884 00028083 */ sra $s0, $v0, 2 .L80111888: /* A7F88 80111888 0C0445E4 */ jal func_80111790 -/* A7F8C 8011188C 00000000 */ nop +/* A7F8C 8011188C 00000000 */ nop /* A7F90 80111890 14400007 */ bnez $v0, .L801118B0 -/* A7F94 80111894 00000000 */ nop +/* A7F94 80111894 00000000 */ nop /* A7F98 80111898 3C038015 */ lui $v1, %hi(D_8015165C) /* A7F9C 8011189C 2463165C */ addiu $v1, $v1, %lo(D_8015165C) /* A7FA0 801118A0 8C620000 */ lw $v0, ($v1) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80111E9C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80111E9C.s index bcaf858fa7..c588e98fd0 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80111E9C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80111E9C.s @@ -9,7 +9,7 @@ glabel func_80111E9C /* A85AC 80111EAC 8C8412EC */ lw $a0, %lo(gLastCreatedEntityIndex)($a0) /* A85B0 80111EB0 AFBF0014 */ sw $ra, 0x14($sp) /* A85B4 80111EB4 0C04417A */ jal get_entity_by_index -/* A85B8 80111EB8 00000000 */ nop +/* A85B8 80111EB8 00000000 */ nop /* A85BC 80111EBC 8E03000C */ lw $v1, 0xc($s0) /* A85C0 80111EC0 0200202D */ daddu $a0, $s0, $zero /* A85C4 80111EC4 8C650000 */ lw $a1, ($v1) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80111F2C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80111F2C.s index 62d6185a24..0e2a4146d3 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80111F2C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80111F2C.s @@ -9,7 +9,7 @@ glabel func_80111F2C /* A863C 80111F3C 8C8412EC */ lw $a0, %lo(gLastCreatedEntityIndex)($a0) /* A8640 80111F40 AFBF0014 */ sw $ra, 0x14($sp) /* A8644 80111F44 0C04417A */ jal get_entity_by_index -/* A8648 80111F48 00000000 */ nop +/* A8648 80111F48 00000000 */ nop /* A864C 80111F4C 8E03000C */ lw $v1, 0xc($s0) /* A8650 80111F50 0200202D */ daddu $a0, $s0, $zero /* A8654 80111F54 8C650000 */ lw $a1, ($v1) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112328.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112328.s index 894e43027f..a4acf0b0e8 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112328.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112328.s @@ -5,7 +5,7 @@ glabel func_80112328 /* A8A28 80112328 27BDFFE8 */ addiu $sp, $sp, -0x18 /* A8A2C 8011232C AFBF0010 */ sw $ra, 0x10($sp) /* A8A30 80112330 0C044217 */ jal func_8011085C -/* A8A34 80112334 00000000 */ nop +/* A8A34 80112334 00000000 */ nop /* A8A38 80112338 8FBF0010 */ lw $ra, 0x10($sp) /* A8A3C 8011233C 03E00008 */ jr $ra /* A8A40 80112340 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112344.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112344.s index 638825d34c..788d50b61e 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112344.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112344.s @@ -58,14 +58,14 @@ glabel func_80112344 /* A8B08 80112408 0C04497A */ jal func_801125E8 /* A8B0C 8011240C AFA20014 */ sw $v0, 0x14($sp) /* A8B10 80112410 1440000A */ bnez $v0, .L8011243C -/* A8B14 80112414 00000000 */ nop +/* A8B14 80112414 00000000 */ nop /* A8B18 80112418 C7A2002C */ lwc1 $f2, 0x2c($sp) /* A8B1C 8011241C 3C0146FF */ lui $at, 0x46ff /* A8B20 80112420 3421FE00 */ ori $at, $at, 0xfe00 /* A8B24 80112424 44810000 */ mtc1 $at, $f0 -/* A8B28 80112428 00000000 */ nop +/* A8B28 80112428 00000000 */ nop /* A8B2C 8011242C 46001032 */ c.eq.s $f2, $f0 -/* A8B30 80112430 00000000 */ nop +/* A8B30 80112430 00000000 */ nop /* A8B34 80112434 45030001 */ bc1tl .L8011243C /* A8B38 80112438 AFA0002C */ sw $zero, 0x2c($sp) .L8011243C: @@ -73,20 +73,20 @@ glabel func_80112344 /* A8B40 80112440 C7A8002C */ lwc1 $f8, 0x2c($sp) /* A8B44 80112444 30420200 */ andi $v0, $v0, 0x200 /* A8B48 80112448 10400012 */ beqz $v0, .L80112494 -/* A8B4C 8011244C 00000000 */ nop +/* A8B4C 8011244C 00000000 */ nop /* A8B50 80112450 8622000C */ lh $v0, 0xc($s1) /* A8B54 80112454 3C014354 */ lui $at, 0x4354 /* A8B58 80112458 34218000 */ ori $at, $at, 0x8000 /* A8B5C 8011245C 44811000 */ mtc1 $at, $f2 /* A8B60 80112460 44820000 */ mtc1 $v0, $f0 -/* A8B64 80112464 00000000 */ nop +/* A8B64 80112464 00000000 */ nop /* A8B68 80112468 46800020 */ cvt.s.w $f0, $f0 /* A8B6C 8011246C 46020003 */ div.s $f0, $f0, $f2 /* A8B70 80112470 E600001C */ swc1 $f0, 0x1c($s0) /* A8B74 80112474 86220010 */ lh $v0, 0x10($s1) /* A8B78 80112478 E7A2002C */ swc1 $f2, 0x2c($sp) /* A8B7C 8011247C 44820000 */ mtc1 $v0, $f0 -/* A8B80 80112480 00000000 */ nop +/* A8B80 80112480 00000000 */ nop /* A8B84 80112484 46800020 */ cvt.s.w $f0, $f0 /* A8B88 80112488 46020003 */ div.s $f0, $f0, $f2 /* A8B8C 8011248C 08044944 */ j .L80112510 @@ -102,25 +102,25 @@ glabel func_80112344 /* A8BB0 801124B0 3C018015 */ lui $at, %hi(D_8014F948) /* A8BB4 801124B4 D422F948 */ ldc1 $f2, %lo(D_8014F948)($at) /* A8BB8 801124B8 46220002 */ mul.d $f0, $f0, $f2 -/* A8BBC 801124BC 00000000 */ nop +/* A8BBC 801124BC 00000000 */ nop /* A8BC0 801124C0 8622000C */ lh $v0, 0xc($s1) /* A8BC4 801124C4 C6240054 */ lwc1 $f4, 0x54($s1) /* A8BC8 801124C8 44821000 */ mtc1 $v0, $f2 -/* A8BCC 801124CC 00000000 */ nop +/* A8BCC 801124CC 00000000 */ nop /* A8BD0 801124D0 468010A0 */ cvt.s.w $f2, $f2 /* A8BD4 801124D4 46200020 */ cvt.s.d $f0, $f0 /* A8BD8 801124D8 46001083 */ div.s $f2, $f2, $f0 /* A8BDC 801124DC 46041082 */ mul.s $f2, $f2, $f4 -/* A8BE0 801124E0 00000000 */ nop +/* A8BE0 801124E0 00000000 */ nop /* A8BE4 801124E4 E602001C */ swc1 $f2, 0x1c($s0) /* A8BE8 801124E8 86220010 */ lh $v0, 0x10($s1) /* A8BEC 801124EC C624005C */ lwc1 $f4, 0x5c($s1) /* A8BF0 801124F0 44821000 */ mtc1 $v0, $f2 -/* A8BF4 801124F4 00000000 */ nop +/* A8BF4 801124F4 00000000 */ nop /* A8BF8 801124F8 468010A0 */ cvt.s.w $f2, $f2 /* A8BFC 801124FC 46001083 */ div.s $f2, $f2, $f0 /* A8C00 80112500 46041082 */ mul.s $f2, $f2, $f4 -/* A8C04 80112504 00000000 */ nop +/* A8C04 80112504 00000000 */ nop /* A8C08 80112508 E7A0002C */ swc1 $f0, 0x2c($sp) /* A8C0C 8011250C E6020024 */ swc1 $f2, 0x24($s0) .L80112510: @@ -139,7 +139,7 @@ glabel func_80112344 /* A8C40 80112540 E600002C */ swc1 $f0, 0x2c($s0) /* A8C44 80112544 C620004C */ lwc1 $f0, 0x4c($s1) /* A8C48 80112548 4606003C */ c.lt.s $f0, $f6 -/* A8C4C 8011254C 00000000 */ nop +/* A8C4C 8011254C 00000000 */ nop /* A8C50 80112550 45000009 */ bc1f .L80112578 /* A8C54 80112554 3C034000 */ lui $v1, 0x4000 /* A8C58 80112558 3C014120 */ lui $at, 0x4120 @@ -167,11 +167,11 @@ glabel func_80112344 /* A8CA8 801125A8 8E220000 */ lw $v0, ($s1) /* A8CAC 801125AC 30420400 */ andi $v0, $v0, 0x400 /* A8CB0 801125B0 14400008 */ bnez $v0, .L801125D4 -/* A8CB4 801125B4 00000000 */ nop +/* A8CB4 801125B4 00000000 */ nop /* A8CB8 801125B8 44800000 */ mtc1 $zero, $f0 -/* A8CBC 801125BC 00000000 */ nop +/* A8CBC 801125BC 00000000 */ nop /* A8CC0 801125C0 46004032 */ c.eq.s $f8, $f0 -/* A8CC4 801125C4 00000000 */ nop +/* A8CC4 801125C4 00000000 */ nop /* A8CC8 801125C8 45000002 */ bc1f .L801125D4 /* A8CCC 801125CC 34620001 */ ori $v0, $v1, 1 /* A8CD0 801125D0 AE020000 */ sw $v0, ($s0) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_801125E8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_801125E8.s index 9dfa994e40..03fbc0481a 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_801125E8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_801125E8.s @@ -54,7 +54,7 @@ glabel func_801125E8 /* A8DAC 801126AC 0000902D */ daddu $s2, $zero, $zero /* A8DB0 801126B0 0040802D */ daddu $s0, $v0, $zero /* A8DB4 801126B4 06000019 */ bltz $s0, .L8011271C -/* A8DB8 801126B8 00000000 */ nop +/* A8DB8 801126B8 00000000 */ nop /* A8DBC 801126BC 0C0441A9 */ jal get_entity_type /* A8DC0 801126C0 0200202D */ daddu $a0, $s0, $zero /* A8DC4 801126C4 2403000C */ addiu $v1, $zero, 0xc @@ -62,21 +62,21 @@ glabel func_801125E8 /* A8DCC 801126CC 36114000 */ ori $s1, $s0, 0x4000 /* A8DD0 801126D0 C7A00048 */ lwc1 $f0, 0x48($sp) /* A8DD4 801126D4 46140032 */ c.eq.s $f0, $f20 -/* A8DD8 801126D8 00000000 */ nop +/* A8DD8 801126D8 00000000 */ nop /* A8DDC 801126DC 4500000F */ bc1f .L8011271C -/* A8DE0 801126E0 00000000 */ nop +/* A8DE0 801126E0 00000000 */ nop /* A8DE4 801126E4 C7A00050 */ lwc1 $f0, 0x50($sp) /* A8DE8 801126E8 46140032 */ c.eq.s $f0, $f20 -/* A8DEC 801126EC 00000000 */ nop +/* A8DEC 801126EC 00000000 */ nop /* A8DF0 801126F0 4500000A */ bc1f .L8011271C -/* A8DF4 801126F4 00000000 */ nop +/* A8DF4 801126F4 00000000 */ nop /* A8DF8 801126F8 C7A0004C */ lwc1 $f0, 0x4c($sp) /* A8DFC 801126FC 3C013FF0 */ lui $at, 0x3ff0 /* A8E00 80112700 44811800 */ mtc1 $at, $f3 /* A8E04 80112704 44801000 */ mtc1 $zero, $f2 /* A8E08 80112708 46000021 */ cvt.d.s $f0, $f0 /* A8E0C 8011270C 46220032 */ c.eq.d $f0, $f2 -/* A8E10 80112710 00000000 */ nop +/* A8E10 80112710 00000000 */ nop /* A8E14 80112714 45030001 */ bc1tl .L8011271C /* A8E18 80112718 36114000 */ ori $s1, $s0, 0x4000 .L8011271C: @@ -117,13 +117,13 @@ glabel func_801125E8 /* A8EA0 801127A0 E6600000 */ swc1 $f0, ($s3) /* A8EA4 801127A4 C7A00050 */ lwc1 $f0, 0x50($sp) /* A8EA8 801127A8 46140002 */ mul.s $f0, $f0, $f20 -/* A8EAC 801127AC 00000000 */ nop +/* A8EAC 801127AC 00000000 */ nop /* A8EB0 801127B0 44060000 */ mfc1 $a2, $f0 /* A8EB4 801127B4 C7A0004C */ lwc1 $f0, 0x4c($sp) /* A8EB8 801127B8 46140002 */ mul.s $f0, $f0, $f20 -/* A8EBC 801127BC 00000000 */ nop +/* A8EBC 801127BC 00000000 */ nop /* A8EC0 801127C0 4480B000 */ mtc1 $zero, $f22 -/* A8EC4 801127C4 00000000 */ nop +/* A8EC4 801127C4 00000000 */ nop /* A8EC8 801127C8 4600B306 */ mov.s $f12, $f22 /* A8ECC 801127CC 44070000 */ mfc1 $a3, $f0 /* A8ED0 801127D0 0C00A720 */ jal atan2 @@ -132,11 +132,11 @@ glabel func_801125E8 /* A8EDC 801127DC E6E00000 */ swc1 $f0, ($s7) /* A8EE0 801127E0 C7A00048 */ lwc1 $f0, 0x48($sp) /* A8EE4 801127E4 46140002 */ mul.s $f0, $f0, $f20 -/* A8EE8 801127E8 00000000 */ nop +/* A8EE8 801127E8 00000000 */ nop /* A8EEC 801127EC 44060000 */ mfc1 $a2, $f0 /* A8EF0 801127F0 C7A0004C */ lwc1 $f0, 0x4c($sp) /* A8EF4 801127F4 46140002 */ mul.s $f0, $f0, $f20 -/* A8EF8 801127F8 00000000 */ nop +/* A8EF8 801127F8 00000000 */ nop /* A8EFC 801127FC 24120001 */ addiu $s2, $zero, 1 /* A8F00 80112800 4600B306 */ mov.s $f12, $f22 /* A8F04 80112804 44070000 */ mfc1 $a3, $f0 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112B20.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112B20.s index 04ff4b539f..17249c069b 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112B20.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112B20.s @@ -23,7 +23,7 @@ glabel func_80112B20 /* A9268 80112B68 24027FFF */ addiu $v0, $zero, 0x7fff /* A926C 80112B6C 4600018D */ trunc.w.s $f6, $f0 /* A9270 80112B70 44033000 */ mfc1 $v1, $f6 -/* A9274 80112B74 00000000 */ nop +/* A9274 80112B74 00000000 */ nop /* A9278 80112B78 50620001 */ beql $v1, $v0, .L80112B80 /* A927C 80112B7C 0000182D */ daddu $v1, $zero, $zero .L80112B80: diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112B98.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112B98.s index 650acc307b..ab7ddfa6c8 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112B98.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112B98.s @@ -11,4 +11,4 @@ glabel func_80112B98 /* A92AC 80112BAC 0441FFFD */ bgez $v0, .L80112BA4 /* A92B0 80112BB0 24630018 */ addiu $v1, $v1, 0x18 /* A92B4 80112BB4 03E00008 */ jr $ra -/* A92B8 80112BB8 00000000 */ nop +/* A92B8 80112BB8 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112BBC.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112BBC.s index 9d22d36834..d54befee38 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112BBC.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112BBC.s @@ -22,7 +22,7 @@ glabel func_80112BBC /* A92F8 80112BF8 24020003 */ addiu $v0, $zero, 3 .L80112BFC: /* A92FC 80112BFC 08044AFF */ j .L80112BFC -/* A9300 80112C00 00000000 */ nop +/* A9300 80112C00 00000000 */ nop .L80112C04: /* A9304 80112C04 A6020000 */ sh $v0, ($s0) /* A9308 80112C08 8C820004 */ lw $v0, 4($a0) @@ -40,21 +40,21 @@ glabel func_80112BBC .L80112C38: /* A9338 80112C38 8E020008 */ lw $v0, 8($s0) /* A933C 80112C3C 14400004 */ bnez $v0, .L80112C50 -/* A9340 80112C40 00000000 */ nop +/* A9340 80112C40 00000000 */ nop /* A9344 80112C44 3C028011 */ lui $v0, %hi(NOP_state) /* A9348 80112C48 24422B90 */ addiu $v0, $v0, %lo(NOP_state) /* A934C 80112C4C AE020008 */ sw $v0, 8($s0) .L80112C50: /* A9350 80112C50 8E02000C */ lw $v0, 0xc($s0) /* A9354 80112C54 14400004 */ bnez $v0, .L80112C68 -/* A9358 80112C58 00000000 */ nop +/* A9358 80112C58 00000000 */ nop /* A935C 80112C5C 3C028011 */ lui $v0, %hi(NOP_state) /* A9360 80112C60 24422B90 */ addiu $v0, $v0, %lo(NOP_state) /* A9364 80112C64 AE02000C */ sw $v0, 0xc($s0) .L80112C68: /* A9368 80112C68 8E020010 */ lw $v0, 0x10($s0) /* A936C 80112C6C 14400004 */ bnez $v0, .L80112C80 -/* A9370 80112C70 00000000 */ nop +/* A9370 80112C70 00000000 */ nop /* A9374 80112C74 3C028011 */ lui $v0, %hi(NOP_state) /* A9378 80112C78 24422B90 */ addiu $v0, $v0, %lo(NOP_state) /* A937C 80112C7C AE020010 */ sw $v0, 0x10($s0) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112D84.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112D84.s index 50f2f96554..db1c67fde9 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112D84.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112D84.s @@ -12,7 +12,7 @@ glabel func_80112D84 /* A94A0 80112DA0 00431821 */ addu $v1, $v0, $v1 .L80112DA4: /* A94A4 80112DA4 08044B69 */ j .L80112DA4 -/* A94A8 80112DA8 00000000 */ nop +/* A94A8 80112DA8 00000000 */ nop .L80112DAC: /* A94AC 80112DAC 94620000 */ lhu $v0, ($v1) /* A94B0 80112DB0 AC650014 */ sw $a1, 0x14($v1) @@ -24,4 +24,4 @@ glabel func_80112D84 /* A94C8 80112DC8 AC620014 */ sw $v0, 0x14($v1) .L80112DCC: /* A94CC 80112DCC 03E00008 */ jr $ra -/* A94D0 80112DD0 00000000 */ nop +/* A94D0 80112DD0 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112EEC.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112EEC.s index b27fc8ab5d..3b226ea7b3 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112EEC.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112EEC.s @@ -18,10 +18,10 @@ glabel func_80112EEC /* A961C 80112F1C 26310001 */ addiu $s1, $s1, 1 /* A9620 80112F20 30620010 */ andi $v0, $v1, 0x10 /* A9624 80112F24 14400004 */ bnez $v0, .L80112F38 -/* A9628 80112F28 00000000 */ nop +/* A9628 80112F28 00000000 */ nop /* A962C 80112F2C 8E02000C */ lw $v0, 0xc($s0) /* A9630 80112F30 0040F809 */ jalr $v0 -/* A9634 80112F34 00000000 */ nop +/* A9634 80112F34 00000000 */ nop .L80112F38: /* A9638 80112F38 2A220002 */ slti $v0, $s1, 2 /* A963C 80112F3C 1440FFF2 */ bnez $v0, .L80112F08 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112FC4.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112FC4.s index 765d125ff7..8b892461dd 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112FC4.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112FC4.s @@ -21,10 +21,10 @@ glabel func_80112FC4 /* A9700 80113000 26310001 */ addiu $s1, $s1, 1 /* A9704 80113004 30620020 */ andi $v0, $v1, 0x20 /* A9708 80113008 10400004 */ beqz $v0, .L8011301C -/* A970C 8011300C 00000000 */ nop +/* A970C 8011300C 00000000 */ nop /* A9710 80113010 8E020014 */ lw $v0, 0x14($s0) /* A9714 80113014 0040F809 */ jalr $v0 -/* A9718 80113018 00000000 */ nop +/* A9718 80113018 00000000 */ nop .L8011301C: /* A971C 8011301C 2A220002 */ slti $v0, $s1, 2 /* A9720 80113020 1440FFEF */ bnez $v0, .L80112FE0 @@ -44,10 +44,10 @@ glabel func_80112FC4 /* A9754 80113054 26310001 */ addiu $s1, $s1, 1 /* A9758 80113058 30620010 */ andi $v0, $v1, 0x10 /* A975C 8011305C 10400004 */ beqz $v0, .L80113070 -/* A9760 80113060 00000000 */ nop +/* A9760 80113060 00000000 */ nop /* A9764 80113064 8E020010 */ lw $v0, 0x10($s0) /* A9768 80113068 0040F809 */ jalr $v0 -/* A976C 8011306C 00000000 */ nop +/* A976C 8011306C 00000000 */ nop .L80113070: /* A9770 80113070 2A220002 */ slti $v0, $s1, 2 /* A9774 80113074 1440FFEF */ bnez $v0, .L80113034 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80114B58.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80114B58.s index d1493e7a7c..bd546caf64 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80114B58.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80114B58.s @@ -96,7 +96,7 @@ glabel func_80114B58 /* AB3A8 80114CA8 1482FFEE */ bne $a0, $v0, .L80114C64 /* AB3AC 80114CAC 24A50010 */ addiu $a1, $a1, 0x10 /* AB3B0 80114CB0 0804533A */ j .L80114CE8 -/* AB3B4 80114CB4 00000000 */ nop +/* AB3B4 80114CB4 00000000 */ nop .L80114CB8: /* AB3B8 80114CB8 26E20030 */ addiu $v0, $s7, 0x30 .L80114CBC: diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80115498.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80115498.s index 09ee3ca7fe..f467272804 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80115498.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80115498.s @@ -33,7 +33,7 @@ glabel func_80115498 /* ABC04 80115504 27A60020 */ addiu $a2, $sp, 0x20 /* ABC08 80115508 93A20048 */ lbu $v0, 0x48($sp) /* ABC0C 8011550C 10400173 */ beqz $v0, .L80115ADC -/* ABC10 80115510 00000000 */ nop +/* ABC10 80115510 00000000 */ nop /* ABC14 80115514 97A40042 */ lhu $a0, 0x42($sp) /* ABC18 80115518 97A20046 */ lhu $v0, 0x46($sp) /* ABC1C 8011551C 00820018 */ mult $a0, $v0 @@ -54,7 +54,7 @@ glabel func_80115498 /* ABC54 80115554 14A10004 */ bne $a1, $at, .L80115568 /* ABC58 80115558 3C018000 */ lui $at, 0x8000 /* ABC5C 8011555C 14810002 */ bne $a0, $at, .L80115568 -/* ABC60 80115560 00000000 */ nop +/* ABC60 80115560 00000000 */ nop /* ABC64 80115564 0006000D */ break 6 .L80115568: /* ABC68 80115568 00001012 */ mflo $v0 @@ -71,7 +71,7 @@ glabel func_80115498 /* ABC8C 8011558C 14A10004 */ bne $a1, $at, .L801155A0 /* ABC90 80115590 3C018000 */ lui $at, 0x8000 /* ABC94 80115594 14C10002 */ bne $a2, $at, .L801155A0 -/* ABC98 80115598 00000000 */ nop +/* ABC98 80115598 00000000 */ nop /* ABC9C 8011559C 0006000D */ break 6 .L801155A0: /* ABCA0 801155A0 00001012 */ mflo $v0 @@ -86,15 +86,15 @@ glabel func_80115498 /* ABCC0 801155C0 14A10004 */ bne $a1, $at, .L801155D4 /* ABCC4 801155C4 3C018000 */ lui $at, 0x8000 /* ABCC8 801155C8 14610002 */ bne $v1, $at, .L801155D4 -/* ABCCC 801155CC 00000000 */ nop +/* ABCCC 801155CC 00000000 */ nop /* ABCD0 801155D0 0006000D */ break 6 .L801155D4: /* ABCD4 801155D4 00001012 */ mflo $v0 -/* ABCD8 801155D8 00000000 */ nop -/* ABCDC 801155DC 00000000 */ nop +/* ABCD8 801155D8 00000000 */ nop +/* ABCDC 801155DC 00000000 */ nop /* ABCE0 801155E0 00460018 */ mult $v0, $a2 /* ABCE4 801155E4 00005012 */ mflo $t2 -/* ABCE8 801155E8 00000000 */ nop +/* ABCE8 801155E8 00000000 */ nop /* ABCEC 801155EC 14A00002 */ bnez $a1, .L801155F8 /* ABCF0 801155F0 0145001A */ div $zero, $t2, $a1 /* ABCF4 801155F4 0007000D */ break 7 @@ -103,7 +103,7 @@ glabel func_80115498 /* ABCFC 801155FC 14A10004 */ bne $a1, $at, .L80115610 /* ABD00 80115600 3C018000 */ lui $at, 0x8000 /* ABD04 80115604 15410002 */ bne $t2, $at, .L80115610 -/* ABD08 80115608 00000000 */ nop +/* ABD08 80115608 00000000 */ nop /* ABD0C 8011560C 0006000D */ break 6 .L80115610: /* ABD10 80115610 00002012 */ mflo $a0 @@ -116,7 +116,7 @@ glabel func_80115498 /* ABD28 80115628 14A10004 */ bne $a1, $at, .L8011563C /* ABD2C 8011562C 3C018000 */ lui $at, 0x8000 /* ABD30 80115630 14610002 */ bne $v1, $at, .L8011563C -/* ABD34 80115634 00000000 */ nop +/* ABD34 80115634 00000000 */ nop /* ABD38 80115638 0006000D */ break 6 .L8011563C: /* ABD3C 8011563C 00001012 */ mflo $v0 @@ -127,7 +127,7 @@ glabel func_80115498 /* ABD50 80115650 00129042 */ srl $s2, $s2, 1 .L80115654: /* ABD54 80115654 14680048 */ bne $v1, $t0, .L80115778 -/* ABD58 80115658 00000000 */ nop +/* ABD58 80115658 00000000 */ nop /* ABD5C 8011565C 93A20049 */ lbu $v0, 0x49($sp) /* ABD60 80115660 145700DB */ bne $v0, $s7, .L801159D0 /* ABD64 80115664 24050002 */ addiu $a1, $zero, 2 @@ -139,13 +139,13 @@ glabel func_80115498 /* ABD78 80115678 14A10004 */ bne $a1, $at, .L8011568C /* ABD7C 8011567C 3C018000 */ lui $at, 0x8000 /* ABD80 80115680 14810002 */ bne $a0, $at, .L8011568C -/* ABD84 80115684 00000000 */ nop +/* ABD84 80115684 00000000 */ nop /* ABD88 80115688 0006000D */ break 6 .L8011568C: /* ABD8C 8011568C 00001012 */ mflo $v0 /* ABD90 80115690 28420008 */ slti $v0, $v0, 8 /* ABD94 80115694 144000CE */ bnez $v0, .L801159D0 -/* ABD98 80115698 00000000 */ nop +/* ABD98 80115698 00000000 */ nop /* ABD9C 8011569C 96660026 */ lhu $a2, 0x26($s3) .L801156A0: /* ABDA0 801156A0 14A00002 */ bnez $a1, .L801156AC @@ -156,12 +156,12 @@ glabel func_80115498 /* ABDB0 801156B0 14A10004 */ bne $a1, $at, .L801156C4 /* ABDB4 801156B4 3C018000 */ lui $at, 0x8000 /* ABDB8 801156B8 14C10002 */ bne $a2, $at, .L801156C4 -/* ABDBC 801156BC 00000000 */ nop +/* ABDBC 801156BC 00000000 */ nop /* ABDC0 801156C0 0006000D */ break 6 .L801156C4: /* ABDC4 801156C4 00001012 */ mflo $v0 /* ABDC8 801156C8 184000C1 */ blez $v0, .L801159D0 -/* ABDCC 801156CC 00000000 */ nop +/* ABDCC 801156CC 00000000 */ nop /* ABDD0 801156D0 96630022 */ lhu $v1, 0x22($s3) /* ABDD4 801156D4 14A00002 */ bnez $a1, .L801156E0 /* ABDD8 801156D8 0065001A */ div $zero, $v1, $a1 @@ -171,15 +171,15 @@ glabel func_80115498 /* ABDE4 801156E4 14A10004 */ bne $a1, $at, .L801156F8 /* ABDE8 801156E8 3C018000 */ lui $at, 0x8000 /* ABDEC 801156EC 14610002 */ bne $v1, $at, .L801156F8 -/* ABDF0 801156F0 00000000 */ nop +/* ABDF0 801156F0 00000000 */ nop /* ABDF4 801156F4 0006000D */ break 6 .L801156F8: /* ABDF8 801156F8 00001012 */ mflo $v0 -/* ABDFC 801156FC 00000000 */ nop -/* ABE00 80115700 00000000 */ nop +/* ABDFC 801156FC 00000000 */ nop +/* ABE00 80115700 00000000 */ nop /* ABE04 80115704 00460018 */ mult $v0, $a2 /* ABE08 80115708 00005012 */ mflo $t2 -/* ABE0C 8011570C 00000000 */ nop +/* ABE0C 8011570C 00000000 */ nop /* ABE10 80115710 14A00002 */ bnez $a1, .L8011571C /* ABE14 80115714 0145001A */ div $zero, $t2, $a1 /* ABE18 80115718 0007000D */ break 7 @@ -188,7 +188,7 @@ glabel func_80115498 /* ABE20 80115720 14A10004 */ bne $a1, $at, .L80115734 /* ABE24 80115724 3C018000 */ lui $at, 0x8000 /* ABE28 80115728 15410002 */ bne $t2, $at, .L80115734 -/* ABE2C 8011572C 00000000 */ nop +/* ABE2C 8011572C 00000000 */ nop /* ABE30 80115730 0006000D */ break 6 .L80115734: /* ABE34 80115734 00002012 */ mflo $a0 @@ -201,7 +201,7 @@ glabel func_80115498 /* ABE4C 8011574C 14A10004 */ bne $a1, $at, .L80115760 /* ABE50 80115750 3C018000 */ lui $at, 0x8000 /* ABE54 80115754 14610002 */ bne $v1, $at, .L80115760 -/* ABE58 80115758 00000000 */ nop +/* ABE58 80115758 00000000 */ nop /* ABE5C 8011575C 0006000D */ break 6 .L80115760: /* ABE60 80115760 00001012 */ mflo $v0 @@ -209,7 +209,7 @@ glabel func_80115498 /* ABE68 80115768 14400099 */ bnez $v0, .L801159D0 /* ABE6C 8011576C 02449021 */ addu $s2, $s2, $a0 /* ABE70 80115770 080455A8 */ j .L801156A0 -/* ABE74 80115774 00000000 */ nop +/* ABE74 80115774 00000000 */ nop .L80115778: /* ABE78 80115778 9662002C */ lhu $v0, 0x2c($s3) /* ABE7C 8011577C 30430F00 */ andi $v1, $v0, 0xf00 @@ -229,7 +229,7 @@ glabel func_80115498 /* ABEB0 801157B0 14810004 */ bne $a0, $at, .L801157C4 /* ABEB4 801157B4 3C018000 */ lui $at, 0x8000 /* ABEB8 801157B8 14E10002 */ bne $a3, $at, .L801157C4 -/* ABEBC 801157BC 00000000 */ nop +/* ABEBC 801157BC 00000000 */ nop /* ABEC0 801157C0 0006000D */ break 6 .L801157C4: /* ABEC4 801157C4 00001012 */ mflo $v0 @@ -246,7 +246,7 @@ glabel func_80115498 /* ABEE8 801157E8 14810004 */ bne $a0, $at, .L801157FC /* ABEEC 801157EC 3C018000 */ lui $at, 0x8000 /* ABEF0 801157F0 14C10002 */ bne $a2, $at, .L801157FC -/* ABEF4 801157F4 00000000 */ nop +/* ABEF4 801157F4 00000000 */ nop /* ABEF8 801157F8 0006000D */ break 6 .L801157FC: /* ABEFC 801157FC 00001012 */ mflo $v0 @@ -260,15 +260,15 @@ glabel func_80115498 /* ABF18 80115818 14810004 */ bne $a0, $at, .L8011582C /* ABF1C 8011581C 3C018000 */ lui $at, 0x8000 /* ABF20 80115820 14E10002 */ bne $a3, $at, .L8011582C -/* ABF24 80115824 00000000 */ nop +/* ABF24 80115824 00000000 */ nop /* ABF28 80115828 0006000D */ break 6 .L8011582C: /* ABF2C 8011582C 00001012 */ mflo $v0 -/* ABF30 80115830 00000000 */ nop -/* ABF34 80115834 00000000 */ nop +/* ABF30 80115830 00000000 */ nop +/* ABF34 80115834 00000000 */ nop /* ABF38 80115838 00460018 */ mult $v0, $a2 /* ABF3C 8011583C 00001812 */ mflo $v1 -/* ABF40 80115840 00000000 */ nop +/* ABF40 80115840 00000000 */ nop /* ABF44 80115844 14800002 */ bnez $a0, .L80115850 /* ABF48 80115848 0064001A */ div $zero, $v1, $a0 /* ABF4C 8011584C 0007000D */ break 7 @@ -277,7 +277,7 @@ glabel func_80115498 /* ABF54 80115854 14810004 */ bne $a0, $at, .L80115868 /* ABF58 80115858 3C018000 */ lui $at, 0x8000 /* ABF5C 8011585C 14610002 */ bne $v1, $at, .L80115868 -/* ABF60 80115860 00000000 */ nop +/* ABF60 80115860 00000000 */ nop /* ABF64 80115864 0006000D */ break 6 .L80115868: /* ABF68 80115868 00001812 */ mflo $v1 @@ -290,7 +290,7 @@ glabel func_80115498 /* ABF80 80115880 14810004 */ bne $a0, $at, .L80115894 /* ABF84 80115884 3C018000 */ lui $at, 0x8000 /* ABF88 80115888 14E10002 */ bne $a3, $at, .L80115894 -/* ABF8C 8011588C 00000000 */ nop +/* ABF8C 8011588C 00000000 */ nop /* ABF90 80115890 0006000D */ break 6 .L80115894: /* ABF94 80115894 00001012 */ mflo $v0 @@ -301,7 +301,7 @@ glabel func_80115498 /* ABFA8 801158A8 00129040 */ sll $s2, $s2, 1 .L801158AC: /* ABFAC 801158AC 14620048 */ bne $v1, $v0, .L801159D0 -/* ABFB0 801158B0 00000000 */ nop +/* ABFB0 801158B0 00000000 */ nop /* ABFB4 801158B4 92620029 */ lbu $v0, 0x29($s3) /* ABFB8 801158B8 54570045 */ bnel $v0, $s7, .L801159D0 /* ABFBC 801158BC 00129080 */ sll $s2, $s2, 2 @@ -315,7 +315,7 @@ glabel func_80115498 /* ABFD8 801158D8 14810004 */ bne $a0, $at, .L801158EC /* ABFDC 801158DC 3C018000 */ lui $at, 0x8000 /* ABFE0 801158E0 14E10002 */ bne $a3, $at, .L801158EC -/* ABFE4 801158E4 00000000 */ nop +/* ABFE4 801158E4 00000000 */ nop /* ABFE8 801158E8 0006000D */ break 6 .L801158EC: /* ABFEC 801158EC 00001012 */ mflo $v0 @@ -332,7 +332,7 @@ glabel func_80115498 /* AC010 80115910 14810004 */ bne $a0, $at, .L80115924 /* AC014 80115914 3C018000 */ lui $at, 0x8000 /* AC018 80115918 14C10002 */ bne $a2, $at, .L80115924 -/* AC01C 8011591C 00000000 */ nop +/* AC01C 8011591C 00000000 */ nop /* AC020 80115920 0006000D */ break 6 .L80115924: /* AC024 80115924 00001012 */ mflo $v0 @@ -346,15 +346,15 @@ glabel func_80115498 /* AC040 80115940 14810004 */ bne $a0, $at, .L80115954 /* AC044 80115944 3C018000 */ lui $at, 0x8000 /* AC048 80115948 14E10002 */ bne $a3, $at, .L80115954 -/* AC04C 8011594C 00000000 */ nop +/* AC04C 8011594C 00000000 */ nop /* AC050 80115950 0006000D */ break 6 .L80115954: /* AC054 80115954 00001012 */ mflo $v0 -/* AC058 80115958 00000000 */ nop -/* AC05C 8011595C 00000000 */ nop +/* AC058 80115958 00000000 */ nop +/* AC05C 8011595C 00000000 */ nop /* AC060 80115960 00460018 */ mult $v0, $a2 /* AC064 80115964 00001812 */ mflo $v1 -/* AC068 80115968 00000000 */ nop +/* AC068 80115968 00000000 */ nop /* AC06C 8011596C 14800002 */ bnez $a0, .L80115978 /* AC070 80115970 0064001A */ div $zero, $v1, $a0 /* AC074 80115974 0007000D */ break 7 @@ -363,7 +363,7 @@ glabel func_80115498 /* AC07C 8011597C 14810004 */ bne $a0, $at, .L80115990 /* AC080 80115980 3C018000 */ lui $at, 0x8000 /* AC084 80115984 14610002 */ bne $v1, $at, .L80115990 -/* AC088 80115988 00000000 */ nop +/* AC088 80115988 00000000 */ nop /* AC08C 8011598C 0006000D */ break 6 .L80115990: /* AC090 80115990 00001812 */ mflo $v1 @@ -376,7 +376,7 @@ glabel func_80115498 /* AC0A8 801159A8 14810004 */ bne $a0, $at, .L801159BC /* AC0AC 801159AC 3C018000 */ lui $at, 0x8000 /* AC0B0 801159B0 14E10002 */ bne $a3, $at, .L801159BC -/* AC0B4 801159B4 00000000 */ nop +/* AC0B4 801159B4 00000000 */ nop /* AC0B8 801159B8 0006000D */ break 6 .L801159BC: /* AC0BC 801159BC 00001012 */ mflo $v0 @@ -408,7 +408,7 @@ glabel func_80115498 /* AC11C 80115A1C 3063F000 */ andi $v1, $v1, 0xf000 /* AC120 80115A20 00008012 */ mflo $s0 /* AC124 80115A24 14600003 */ bnez $v1, .L80115A34 -/* AC128 80115A28 00000000 */ nop +/* AC128 80115A28 00000000 */ nop /* AC12C 80115A2C 08045695 */ j .L80115A54 /* AC130 80115A30 00108042 */ srl $s0, $s0, 1 .L80115A34: diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80115CA8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80115CA8.s index ec22e9bd2d..cf438ab962 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80115CA8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80115CA8.s @@ -33,7 +33,7 @@ glabel func_80115CA8 /* AC414 80115D14 02228821 */ addu $s1, $s1, $v0 /* AC418 80115D18 0212102A */ slt $v0, $s0, $s2 /* AC41C 80115D1C 1440FFF6 */ bnez $v0, .L80115CF8 -/* AC420 80115D20 00000000 */ nop +/* AC420 80115D20 00000000 */ nop .L80115D24: /* AC424 80115D24 0220102D */ daddu $v0, $s1, $zero .L80115D28: diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011620C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011620C.s index fb4ac184a9..a8f5a21199 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011620C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011620C.s @@ -31,15 +31,15 @@ glabel func_8011620C /* AC974 80116274 46020000 */ add.s $f0, $f0, $f2 /* AC978 80116278 3C013F00 */ lui $at, 0x3f00 /* AC97C 8011627C 44812000 */ mtc1 $at, $f4 -/* AC980 80116280 00000000 */ nop +/* AC980 80116280 00000000 */ nop /* AC984 80116284 46040002 */ mul.s $f0, $f0, $f4 -/* AC988 80116288 00000000 */ nop +/* AC988 80116288 00000000 */ nop /* AC98C 8011628C C6020044 */ lwc1 $f2, 0x44($s0) /* AC990 80116290 44050000 */ mfc1 $a1, $f0 /* AC994 80116294 C6000020 */ lwc1 $f0, 0x20($s0) /* AC998 80116298 46020000 */ add.s $f0, $f0, $f2 /* AC99C 8011629C 46040002 */ mul.s $f0, $f0, $f4 -/* AC9A0 801162A0 00000000 */ nop +/* AC9A0 801162A0 00000000 */ nop /* AC9A4 801162A4 44070000 */ mfc1 $a3, $f0 /* AC9A8 801162A8 3C013F80 */ lui $at, 0x3f80 /* AC9AC 801162AC 44810000 */ mtc1 $at, $f0 @@ -49,7 +49,7 @@ glabel func_8011620C /* AC9BC 801162BC 0C01C124 */ jal func_80070490 /* AC9C0 801162C0 2624FFFF */ addiu $a0, $s1, -1 /* AC9C4 801162C4 08045995 */ j .L80116654 -/* AC9C8 801162C8 00000000 */ nop +/* AC9C8 801162C8 00000000 */ nop .L801162CC: /* AC9CC 801162CC 0000982D */ daddu $s3, $zero, $zero .L801162D0: @@ -59,7 +59,7 @@ glabel func_8011620C .L801162DC: /* AC9DC 801162DC 8C620000 */ lw $v0, ($v1) /* AC9E0 801162E0 10400005 */ beqz $v0, .L801162F8 -/* AC9E4 801162E4 00000000 */ nop +/* AC9E4 801162E4 00000000 */ nop /* AC9E8 801162E8 26730001 */ addiu $s3, $s3, 1 /* AC9EC 801162EC 2A620100 */ slti $v0, $s3, 0x100 /* AC9F0 801162F0 1440FFFA */ bnez $v0, .L801162DC @@ -166,7 +166,7 @@ glabel func_8011620C /* ACB60 80116460 1444FFF6 */ bne $v0, $a0, .L8011643C /* ACB64 80116464 24630010 */ addiu $v1, $v1, 0x10 /* ACB68 80116468 08045921 */ j .L80116484 -/* ACB6C 8011646C 00000000 */ nop +/* ACB6C 8011646C 00000000 */ nop .L80116470: /* ACB70 80116470 0C019D10 */ jal guMtxIdent /* ACB74 80116474 AE200004 */ sw $zero, 4($s1) @@ -182,32 +182,32 @@ glabel func_8011620C /* ACB98 80116498 24050061 */ addiu $a1, $zero, 0x61 /* ACB9C 8011649C 0040802D */ daddu $s0, $v0, $zero /* ACBA0 801164A0 12000017 */ beqz $s0, .L80116500 -/* ACBA4 801164A4 00000000 */ nop +/* ACBA4 801164A4 00000000 */ nop /* ACBA8 801164A8 C6060008 */ lwc1 $f6, 8($s0) /* ACBAC 801164AC C600002C */ lwc1 $f0, 0x2c($s0) /* ACBB0 801164B0 46003180 */ add.s $f6, $f6, $f0 /* ACBB4 801164B4 3C013F00 */ lui $at, 0x3f00 /* ACBB8 801164B8 44814000 */ mtc1 $at, $f8 -/* ACBBC 801164BC 00000000 */ nop +/* ACBBC 801164BC 00000000 */ nop /* ACBC0 801164C0 46083182 */ mul.s $f6, $f6, $f8 -/* ACBC4 801164C4 00000000 */ nop +/* ACBC4 801164C4 00000000 */ nop /* ACBC8 801164C8 C6040014 */ lwc1 $f4, 0x14($s0) /* ACBCC 801164CC C6000038 */ lwc1 $f0, 0x38($s0) /* ACBD0 801164D0 46002100 */ add.s $f4, $f4, $f0 /* ACBD4 801164D4 46082102 */ mul.s $f4, $f4, $f8 -/* ACBD8 801164D8 00000000 */ nop +/* ACBD8 801164D8 00000000 */ nop /* ACBDC 801164DC C6020044 */ lwc1 $f2, 0x44($s0) /* ACBE0 801164E0 C6000020 */ lwc1 $f0, 0x20($s0) /* ACBE4 801164E4 46020000 */ add.s $f0, $f0, $f2 /* ACBE8 801164E8 46080002 */ mul.s $f0, $f0, $f8 -/* ACBEC 801164EC 00000000 */ nop +/* ACBEC 801164EC 00000000 */ nop /* ACBF0 801164F0 E7A60024 */ swc1 $f6, 0x24($sp) /* ACBF4 801164F4 E7A40028 */ swc1 $f4, 0x28($sp) /* ACBF8 801164F8 08045945 */ j .L80116514 /* ACBFC 801164FC E7A0002C */ swc1 $f0, 0x2c($sp) .L80116500: /* ACC00 80116500 44800000 */ mtc1 $zero, $f0 -/* ACC04 80116504 00000000 */ nop +/* ACC04 80116504 00000000 */ nop /* ACC08 80116508 E7A0002C */ swc1 $f0, 0x2c($sp) /* ACC0C 8011650C E7A00028 */ swc1 $f0, 0x28($sp) /* ACC10 80116510 E7A00024 */ swc1 $f0, 0x24($sp) @@ -228,7 +228,7 @@ glabel func_8011620C /* ACC48 80116548 44061000 */ mfc1 $a2, $f2 /* ACC4C 8011654C 44072000 */ mfc1 $a3, $f4 /* ACC50 80116550 0C019E78 */ jal guMtxXFML -/* ACC54 80116554 00000000 */ nop +/* ACC54 80116554 00000000 */ nop .L80116558: /* ACC58 80116558 C7A00024 */ lwc1 $f0, 0x24($sp) /* ACC5C 8011655C C7A20028 */ lwc1 $f2, 0x28($sp) @@ -244,19 +244,19 @@ glabel func_8011620C /* ACC84 80116584 44802000 */ mtc1 $zero, $f4 /* ACC88 80116588 460061A1 */ cvt.d.s $f6, $f12 /* ACC8C 8011658C 46243182 */ mul.d $f6, $f6, $f4 -/* ACC90 80116590 00000000 */ nop +/* ACC90 80116590 00000000 */ nop /* ACC94 80116594 C6020038 */ lwc1 $f2, 0x38($s0) /* ACC98 80116598 C6000014 */ lwc1 $f0, 0x14($s0) /* ACC9C 8011659C 46001281 */ sub.s $f10, $f2, $f0 /* ACCA0 801165A0 460050A1 */ cvt.d.s $f2, $f10 /* ACCA4 801165A4 46241082 */ mul.d $f2, $f2, $f4 -/* ACCA8 801165A8 00000000 */ nop +/* ACCA8 801165A8 00000000 */ nop /* ACCAC 801165AC C6080044 */ lwc1 $f8, 0x44($s0) /* ACCB0 801165B0 C6000020 */ lwc1 $f0, 0x20($s0) /* ACCB4 801165B4 46004201 */ sub.s $f8, $f8, $f0 /* ACCB8 801165B8 46004021 */ cvt.d.s $f0, $f8 /* ACCBC 801165BC 46240002 */ mul.d $f0, $f0, $f4 -/* ACCC0 801165C0 00000000 */ nop +/* ACCC0 801165C0 00000000 */ nop /* ACCC4 801165C4 4620338D */ trunc.w.d $f14, $f6 /* ACCC8 801165C8 E60E0004 */ swc1 $f14, 4($s0) /* ACCCC 801165CC 4620138D */ trunc.w.d $f14, $f2 @@ -270,19 +270,19 @@ glabel func_8011620C /* ACCEC 801165EC E7A8002C */ swc1 $f8, 0x2c($sp) /* ACCF0 801165F0 3C0142C8 */ lui $at, 0x42c8 /* ACCF4 801165F4 44810000 */ mtc1 $at, $f0 -/* ACCF8 801165F8 00000000 */ nop +/* ACCF8 801165F8 00000000 */ nop /* ACCFC 801165FC 4600603C */ c.lt.s $f12, $f0 -/* ACD00 80116600 00000000 */ nop +/* ACD00 80116600 00000000 */ nop /* ACD04 80116604 4500000C */ bc1f .L80116638 -/* ACD08 80116608 00000000 */ nop +/* ACD08 80116608 00000000 */ nop /* ACD0C 8011660C 4600503C */ c.lt.s $f10, $f0 -/* ACD10 80116610 00000000 */ nop +/* ACD10 80116610 00000000 */ nop /* ACD14 80116614 45000008 */ bc1f .L80116638 -/* ACD18 80116618 00000000 */ nop +/* ACD18 80116618 00000000 */ nop /* ACD1C 8011661C 4600403C */ c.lt.s $f8, $f0 -/* ACD20 80116620 00000000 */ nop +/* ACD20 80116620 00000000 */ nop /* ACD24 80116624 45000004 */ bc1f .L80116638 -/* ACD28 80116628 00000000 */ nop +/* ACD28 80116628 00000000 */ nop /* ACD2C 8011662C 96220000 */ lhu $v0, ($s1) /* ACD30 80116630 34420200 */ ori $v0, $v0, 0x200 /* ACD34 80116634 A6220000 */ sh $v0, ($s1) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80116674.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80116674.s index 463e619b54..24d6288d6c 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80116674.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80116674.s @@ -11,4 +11,4 @@ glabel func_80116674 /* ACD88 80116688 1440FFFD */ bnez $v0, .L80116680 /* ACD8C 8011668C 24630004 */ addiu $v1, $v1, 4 /* ACD90 80116690 03E00008 */ jr $ra -/* ACD94 80116694 00000000 */ nop +/* ACD94 80116694 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80116698.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80116698.s index c79681e6ba..c8fbfeddec 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80116698.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80116698.s @@ -41,7 +41,7 @@ glabel func_80116698 /* ACE24 80116724 A20200A7 */ sb $v0, 0xa7($s0) /* ACE28 80116728 304200FF */ andi $v0, $v0, 0xff /* ACE2C 8011672C 1440000F */ bnez $v0, .L8011676C -/* ACE30 80116730 00000000 */ nop +/* ACE30 80116730 00000000 */ nop /* ACE34 80116734 8E020010 */ lw $v0, 0x10($s0) /* ACE38 80116738 26030018 */ addiu $v1, $s0, 0x18 /* ACE3C 8011673C 24440040 */ addiu $a0, $v0, 0x40 @@ -108,7 +108,7 @@ glabel func_80116698 /* ACF1C 8011681C 96020000 */ lhu $v0, ($s0) /* ACF20 80116820 30420008 */ andi $v0, $v0, 8 /* ACF24 80116824 10400003 */ beqz $v0, .L80116834 -/* ACF28 80116828 00000000 */ nop +/* ACF28 80116828 00000000 */ nop .L8011682C: /* ACF2C 8011682C 08045A14 */ j .L80116850 /* ACF30 80116830 26040058 */ addiu $a0, $s0, 0x58 @@ -133,17 +133,17 @@ glabel func_80116698 /* ACF74 80116874 C440002C */ lwc1 $f0, 0x2c($v0) /* ACF78 80116878 46003180 */ add.s $f6, $f6, $f0 /* ACF7C 8011687C 46143182 */ mul.s $f6, $f6, $f20 -/* ACF80 80116880 00000000 */ nop +/* ACF80 80116880 00000000 */ nop /* ACF84 80116884 C4440014 */ lwc1 $f4, 0x14($v0) /* ACF88 80116888 C4400038 */ lwc1 $f0, 0x38($v0) /* ACF8C 8011688C 46002100 */ add.s $f4, $f4, $f0 /* ACF90 80116890 46142102 */ mul.s $f4, $f4, $f20 -/* ACF94 80116894 00000000 */ nop +/* ACF94 80116894 00000000 */ nop /* ACF98 80116898 C4420020 */ lwc1 $f2, 0x20($v0) /* ACF9C 8011689C C4400044 */ lwc1 $f0, 0x44($v0) /* ACFA0 801168A0 46001080 */ add.s $f2, $f2, $f0 /* ACFA4 801168A4 46141082 */ mul.s $f2, $f2, $f20 -/* ACFA8 801168A8 00000000 */ nop +/* ACFA8 801168A8 00000000 */ nop /* ACFAC 801168AC 0220202D */ daddu $a0, $s1, $zero /* ACFB0 801168B0 44053000 */ mfc1 $a1, $f6 /* ACFB4 801168B4 44062000 */ mfc1 $a2, $f4 @@ -204,7 +204,7 @@ glabel func_80116698 /* AD084 80116984 A202009F */ sb $v0, 0x9f($s0) /* AD088 80116988 304200FF */ andi $v0, $v0, 0xff /* AD08C 8011698C 1440000F */ bnez $v0, .L801169CC -/* AD090 80116990 00000000 */ nop +/* AD090 80116990 00000000 */ nop /* AD094 80116994 8E02000C */ lw $v0, 0xc($s0) /* AD098 80116998 26030010 */ addiu $v1, $s0, 0x10 /* AD09C 8011699C 24440040 */ addiu $a0, $v0, 0x40 @@ -291,17 +291,17 @@ glabel func_80116698 /* AD1C4 80116AC4 C440002C */ lwc1 $f0, 0x2c($v0) /* AD1C8 80116AC8 46003180 */ add.s $f6, $f6, $f0 /* AD1CC 80116ACC 46143182 */ mul.s $f6, $f6, $f20 -/* AD1D0 80116AD0 00000000 */ nop +/* AD1D0 80116AD0 00000000 */ nop /* AD1D4 80116AD4 C4440014 */ lwc1 $f4, 0x14($v0) /* AD1D8 80116AD8 C4400038 */ lwc1 $f0, 0x38($v0) /* AD1DC 80116ADC 46002100 */ add.s $f4, $f4, $f0 /* AD1E0 80116AE0 46142102 */ mul.s $f4, $f4, $f20 -/* AD1E4 80116AE4 00000000 */ nop +/* AD1E4 80116AE4 00000000 */ nop /* AD1E8 80116AE8 C4420020 */ lwc1 $f2, 0x20($v0) /* AD1EC 80116AEC C4400044 */ lwc1 $f0, 0x44($v0) /* AD1F0 80116AF0 46001080 */ add.s $f2, $f2, $f0 /* AD1F4 80116AF4 46141082 */ mul.s $f2, $f2, $f20 -/* AD1F8 80116AF8 00000000 */ nop +/* AD1F8 80116AF8 00000000 */ nop /* AD1FC 80116AFC 0220202D */ daddu $a0, $s1, $zero /* AD200 80116B00 44053000 */ mfc1 $a1, $f6 /* AD204 80116B04 44062000 */ mfc1 $a2, $f4 @@ -328,9 +328,9 @@ glabel func_80116698 .L80116B54: /* AD254 80116B54 2A420004 */ slti $v0, $s2, 4 /* AD258 80116B58 1440FF77 */ bnez $v0, .L80116938 -/* AD25C 80116B5C 00000000 */ nop +/* AD25C 80116B5C 00000000 */ nop /* AD260 80116B60 0C046F3B */ jal func_8011BCEC -/* AD264 80116B64 00000000 */ nop +/* AD264 80116B64 00000000 */ nop /* AD268 80116B68 8FBF00D0 */ lw $ra, 0xd0($sp) /* AD26C 80116B6C 8FB500CC */ lw $s5, 0xcc($sp) /* AD270 80116B70 8FB400C8 */ lw $s4, 0xc8($sp) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80117D00.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80117D00.s index d3cdf5ab92..ca0a9bfd01 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80117D00.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80117D00.s @@ -18,10 +18,10 @@ glabel func_80117D00 /* AE434 80117D34 0080802D */ daddu $s0, $a0, $zero /* AE438 80117D38 8E620010 */ lw $v0, 0x10($s3) /* AE43C 80117D3C 10400043 */ beqz $v0, .L80117E4C -/* AE440 80117D40 00000000 */ nop +/* AE440 80117D40 00000000 */ nop /* AE444 80117D44 8C52000C */ lw $s2, 0xc($v0) /* AE448 80117D48 12400040 */ beqz $s2, .L80117E4C -/* AE44C 80117D4C 00000000 */ nop +/* AE44C 80117D4C 00000000 */ nop /* AE450 80117D50 1A40003E */ blez $s2, .L80117E4C /* AE454 80117D54 0000882D */ daddu $s1, $zero, $zero /* AE458 80117D58 249500B0 */ addiu $s5, $a0, 0xb0 @@ -86,7 +86,7 @@ glabel func_80117D00 /* AE534 80117E34 1440FFCD */ bnez $v0, .L80117D6C /* AE538 80117E38 27A30010 */ addiu $v1, $sp, 0x10 /* AE53C 80117E3C 08045F93 */ j .L80117E4C -/* AE540 80117E40 00000000 */ nop +/* AE540 80117E40 00000000 */ nop .L80117E44: /* AE544 80117E44 0C044C24 */ jal appendGfx_model /* AE548 80117E48 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80117E74.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80117E74.s index 5b3dcffa81..a92b136b83 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80117E74.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80117E74.s @@ -19,10 +19,10 @@ glabel func_80117E74 /* AE5AC 80117EAC 0C0456C3 */ jal get_model_property /* AE5B0 80117EB0 24050060 */ addiu $a1, $zero, 0x60 /* AE5B4 80117EB4 10400011 */ beqz $v0, .L80117EFC -/* AE5B8 80117EB8 00000000 */ nop +/* AE5B8 80117EB8 00000000 */ nop /* AE5BC 80117EBC 8C420008 */ lw $v0, 8($v0) /* AE5C0 80117EC0 1040000E */ beqz $v0, .L80117EFC -/* AE5C4 80117EC4 00000000 */ nop +/* AE5C4 80117EC4 00000000 */ nop /* AE5C8 80117EC8 3C108015 */ lui $s0, %hi(D_8015336C) /* AE5CC 80117ECC 2610336C */ addiu $s0, $s0, %lo(D_8015336C) /* AE5D0 80117ED0 0C046B4C */ jal get_model_from_list_index @@ -31,20 +31,20 @@ glabel func_80117E74 /* AE5DC 80117EDC 94820000 */ lhu $v0, ($a0) /* AE5E0 80117EE0 30420002 */ andi $v0, $v0, 2 /* AE5E4 80117EE4 1440003F */ bnez $v0, .L80117FE4 -/* AE5E8 80117EE8 00000000 */ nop +/* AE5E8 80117EE8 00000000 */ nop /* AE5EC 80117EEC 0C045F25 */ jal appendGfx_model_group -/* AE5F0 80117EF0 00000000 */ nop +/* AE5F0 80117EF0 00000000 */ nop /* AE5F4 80117EF4 08045FF9 */ j .L80117FE4 -/* AE5F8 80117EF8 00000000 */ nop +/* AE5F8 80117EF8 00000000 */ nop .L80117EFC: /* AE5FC 80117EFC 8E430000 */ lw $v1, ($s2) /* AE600 80117F00 24020002 */ addiu $v0, $zero, 2 .L80117F04: /* AE604 80117F04 1062002C */ beq $v1, $v0, .L80117FB8 -/* AE608 80117F08 00000000 */ nop +/* AE608 80117F08 00000000 */ nop /* AE60C 80117F0C 8E420010 */ lw $v0, 0x10($s2) /* AE610 80117F10 10400037 */ beqz $v0, .L80117FF0 -/* AE614 80117F14 00000000 */ nop +/* AE614 80117F14 00000000 */ nop /* AE618 80117F18 8C420000 */ lw $v0, ($v0) /* AE61C 80117F1C 10400009 */ beqz $v0, .L80117F44 /* AE620 80117F20 3C02DA38 */ lui $v0, 0xda38 @@ -60,7 +60,7 @@ glabel func_80117E74 /* AE644 80117F44 8E420010 */ lw $v0, 0x10($s2) /* AE648 80117F48 8C51000C */ lw $s1, 0xc($v0) /* AE64C 80117F4C 1220000E */ beqz $s1, .L80117F88 -/* AE650 80117F50 00000000 */ nop +/* AE650 80117F50 00000000 */ nop /* AE654 80117F54 1A20000C */ blez $s1, .L80117F88 /* AE658 80117F58 0000802D */ daddu $s0, $zero, $zero .L80117F5C: @@ -73,7 +73,7 @@ glabel func_80117E74 /* AE674 80117F74 26100001 */ addiu $s0, $s0, 1 /* AE678 80117F78 0211102A */ slt $v0, $s0, $s1 /* AE67C 80117F7C 1440FFF7 */ bnez $v0, .L80117F5C -/* AE680 80117F80 00000000 */ nop +/* AE680 80117F80 00000000 */ nop /* AE684 80117F84 8E420010 */ lw $v0, 0x10($s2) .L80117F88: /* AE688 80117F88 8C420000 */ lw $v0, ($v0) @@ -97,9 +97,9 @@ glabel func_80117E74 /* AE6CC 80117FCC 94820000 */ lhu $v0, ($a0) /* AE6D0 80117FD0 30420002 */ andi $v0, $v0, 2 /* AE6D4 80117FD4 14400003 */ bnez $v0, .L80117FE4 -/* AE6D8 80117FD8 00000000 */ nop +/* AE6D8 80117FD8 00000000 */ nop /* AE6DC 80117FDC 0C044C24 */ jal appendGfx_model -/* AE6E0 80117FE0 00000000 */ nop +/* AE6E0 80117FE0 00000000 */ nop .L80117FE4: /* AE6E4 80117FE4 96020000 */ lhu $v0, ($s0) /* AE6E8 80117FE8 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_801180E8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_801180E8.s index 5505f0c3d6..656fb0f3ad 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_801180E8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_801180E8.s @@ -313,7 +313,7 @@ glabel func_801180E8 /* AEC58 80118558 AC600004 */ sw $zero, 4($v1) .L8011855C: /* AEC5C 8011855C 10C00052 */ beqz $a2, .L801186A8 -/* AEC60 80118560 00000000 */ nop +/* AEC60 80118560 00000000 */ nop /* AEC64 80118564 8FB0004C */ lw $s0, 0x4c($sp) /* AEC68 80118568 1600001F */ bnez $s0, .L801185E8 /* AEC6C 8011856C 24020001 */ addiu $v0, $zero, 1 @@ -434,14 +434,14 @@ glabel func_801180E8 /* AEE28 80118728 11600009 */ beqz $t3, .L80118750 /* AEE2C 8011872C 3C03E300 */ lui $v1, 0xe300 /* AEE30 80118730 08046B32 */ j .L8011ACC8 -/* AEE34 80118734 00000000 */ nop +/* AEE34 80118734 00000000 */ nop .L80118738: /* AEE38 80118738 11670469 */ beq $t3, $a3, .L801198E0 /* AEE3C 8011873C 24020003 */ addiu $v0, $zero, 3 /* AEE40 80118740 116206A5 */ beq $t3, $v0, .L8011A1D8 /* AEE44 80118744 3C03E300 */ lui $v1, 0xe300 /* AEE48 80118748 08046B32 */ j .L8011ACC8 -/* AEE4C 8011874C 00000000 */ nop +/* AEE4C 8011874C 00000000 */ nop .L80118750: /* AEE50 80118750 3C02D700 */ lui $v0, 0xd700 /* AEE54 80118754 34420002 */ ori $v0, $v0, 2 @@ -458,14 +458,14 @@ glabel func_801180E8 /* AEE80 80118780 10A00009 */ beqz $a1, .L801187A8 /* AEE84 80118784 3C03E300 */ lui $v1, 0xe300 /* AEE88 80118788 08046B32 */ j .L8011ACC8 -/* AEE8C 8011878C 00000000 */ nop +/* AEE8C 8011878C 00000000 */ nop .L80118790: /* AEE90 80118790 10A200C1 */ beq $a1, $v0, .L80118A98 /* AEE94 80118794 24020003 */ addiu $v0, $zero, 3 /* AEE98 80118798 10A20117 */ beq $a1, $v0, .L80118BF8 /* AEE9C 8011879C 3C03E300 */ lui $v1, 0xe300 /* AEEA0 801187A0 08046B32 */ j .L8011ACC8 -/* AEEA4 801187A4 00000000 */ nop +/* AEEA4 801187A4 00000000 */ nop .L801187A8: /* AEEA8 801187A8 31030007 */ andi $v1, $t0, 7 /* AEEAC 801187AC 8F020000 */ lw $v0, ($t8) @@ -541,7 +541,7 @@ glabel func_801180E8 /* AEFB4 801188B4 14A10004 */ bne $a1, $at, .L801188C8 /* AEFB8 801188B8 3C018000 */ lui $at, 0x8000 /* AEFBC 801188BC 14610002 */ bne $v1, $at, .L801188C8 -/* AEFC0 801188C0 00000000 */ nop +/* AEFC0 801188C0 00000000 */ nop /* AEFC4 801188C4 0006000D */ break 6 .L801188C8: /* AEFC8 801188C8 00001012 */ mflo $v0 @@ -643,7 +643,7 @@ glabel func_801180E8 /* AF12C 80118A2C 14A10004 */ bne $a1, $at, .L80118A40 /* AF130 80118A30 3C018000 */ lui $at, 0x8000 /* AF134 80118A34 14610002 */ bne $v1, $at, .L80118A40 -/* AF138 80118A38 00000000 */ nop +/* AF138 80118A38 00000000 */ nop /* AF13C 80118A3C 0006000D */ break 6 .L80118A40: /* AF140 80118A40 00001012 */ mflo $v0 @@ -743,7 +743,7 @@ glabel func_801180E8 /* AF29C 80118B9C 14A10004 */ bne $a1, $at, .L80118BB0 /* AF2A0 80118BA0 3C018000 */ lui $at, 0x8000 /* AF2A4 80118BA4 14610002 */ bne $v1, $at, .L80118BB0 -/* AF2A8 80118BA8 00000000 */ nop +/* AF2A8 80118BA8 00000000 */ nop /* AF2AC 80118BAC 0006000D */ break 6 .L80118BB0: /* AF2B0 80118BB0 00001012 */ mflo $v0 @@ -835,7 +835,7 @@ glabel func_801180E8 /* AF3F0 80118CF0 14A10004 */ bne $a1, $at, .L80118D04 /* AF3F4 80118CF4 3C018000 */ lui $at, 0x8000 /* AF3F8 80118CF8 14610002 */ bne $v1, $at, .L80118D04 -/* AF3FC 80118CFC 00000000 */ nop +/* AF3FC 80118CFC 00000000 */ nop /* AF400 80118D00 0006000D */ break 6 .L80118D04: /* AF404 80118D04 00001012 */ mflo $v0 @@ -909,14 +909,14 @@ glabel func_801180E8 /* AF4FC 80118DFC 10A00009 */ beqz $a1, .L80118E24 /* AF500 80118E00 3C04D700 */ lui $a0, 0xd700 /* AF504 80118E04 0804662B */ j .L801198AC -/* AF508 80118E08 00000000 */ nop +/* AF508 80118E08 00000000 */ nop .L80118E0C: /* AF50C 80118E0C 10A2015A */ beq $a1, $v0, .L80119378 /* AF510 80118E10 24020003 */ addiu $v0, $zero, 3 /* AF514 80118E14 10A201FF */ beq $a1, $v0, .L80119614 /* AF518 80118E18 3C04D700 */ lui $a0, 0xd700 /* AF51C 80118E1C 0804662B */ j .L801198AC -/* AF520 80118E20 00000000 */ nop +/* AF520 80118E20 00000000 */ nop .L80118E24: /* AF524 80118E24 03C0702D */ daddu $t6, $fp, $zero /* AF528 80118E28 0000882D */ daddu $s1, $zero, $zero @@ -940,7 +940,7 @@ glabel func_801180E8 /* AF568 80118E68 15E10004 */ bne $t7, $at, .L80118E7C /* AF56C 80118E6C 3C018000 */ lui $at, 0x8000 /* AF570 80118E70 16410002 */ bne $s2, $at, .L80118E7C -/* AF574 80118E74 00000000 */ nop +/* AF574 80118E74 00000000 */ nop /* AF578 80118E78 0006000D */ break 6 .L80118E7C: /* AF57C 80118E7C 00008012 */ mflo $s0 @@ -954,7 +954,7 @@ glabel func_801180E8 /* AF598 80118E98 15E10004 */ bne $t7, $at, .L80118EAC /* AF59C 80118E9C 3C018000 */ lui $at, 0x8000 /* AF5A0 80118EA0 17210002 */ bne $t9, $at, .L80118EAC -/* AF5A4 80118EA4 00000000 */ nop +/* AF5A4 80118EA4 00000000 */ nop /* AF5A8 80118EA8 0006000D */ break 6 .L80118EAC: /* AF5AC 80118EAC 00003012 */ mflo $a2 @@ -1011,7 +1011,7 @@ glabel func_801180E8 /* AF674 80118F74 15E10004 */ bne $t7, $at, .L80118F88 /* AF678 80118F78 3C018000 */ lui $at, 0x8000 /* AF67C 80118F7C 14610002 */ bne $v1, $at, .L80118F88 -/* AF680 80118F80 00000000 */ nop +/* AF680 80118F80 00000000 */ nop /* AF684 80118F84 0006000D */ break 6 .L80118F88: /* AF688 80118F88 00005812 */ mflo $t3 @@ -1058,7 +1058,7 @@ glabel func_801180E8 /* AF728 80119028 15E10004 */ bne $t7, $at, .L8011903C /* AF72C 8011902C 3C018000 */ lui $at, 0x8000 /* AF730 80119030 17210002 */ bne $t9, $at, .L8011903C -/* AF734 80119034 00000000 */ nop +/* AF734 80119034 00000000 */ nop /* AF738 80119038 0006000D */ break 6 .L8011903C: /* AF73C 8011903C 00008012 */ mflo $s0 @@ -1103,7 +1103,7 @@ glabel func_801180E8 /* AF7D8 801190D8 144001F3 */ bnez $v0, .L801198A8 /* AF7DC 801190DC AC830004 */ sw $v1, 4($a0) /* AF7E0 801190E0 08046396 */ j .L80118E58 -/* AF7E4 801190E4 00000000 */ nop +/* AF7E4 801190E4 00000000 */ nop .L801190E8: /* AF7E8 801190E8 03C0702D */ daddu $t6, $fp, $zero /* AF7EC 801190EC 0000882D */ daddu $s1, $zero, $zero @@ -1129,7 +1129,7 @@ glabel func_801180E8 /* AF834 80119134 15E10004 */ bne $t7, $at, .L80119148 /* AF838 80119138 3C018000 */ lui $at, 0x8000 /* AF83C 8011913C 16410002 */ bne $s2, $at, .L80119148 -/* AF840 80119140 00000000 */ nop +/* AF840 80119140 00000000 */ nop /* AF844 80119144 0006000D */ break 6 .L80119148: /* AF848 80119148 00003012 */ mflo $a2 @@ -1143,7 +1143,7 @@ glabel func_801180E8 /* AF864 80119164 15E10004 */ bne $t7, $at, .L80119178 /* AF868 80119168 3C018000 */ lui $at, 0x8000 /* AF86C 8011916C 17210002 */ bne $t9, $at, .L80119178 -/* AF870 80119170 00000000 */ nop +/* AF870 80119170 00000000 */ nop /* AF874 80119174 0006000D */ break 6 .L80119178: /* AF878 80119178 00002812 */ mflo $a1 @@ -1183,7 +1183,7 @@ glabel func_801180E8 /* AF8FC 801191FC 15E10004 */ bne $t7, $at, .L80119210 /* AF900 80119200 3C018000 */ lui $at, 0x8000 /* AF904 80119204 15010002 */ bne $t0, $at, .L80119210 -/* AF908 80119208 00000000 */ nop +/* AF908 80119208 00000000 */ nop /* AF90C 8011920C 0006000D */ break 6 .L80119210: /* AF910 80119210 00006012 */ mflo $t4 @@ -1229,7 +1229,7 @@ glabel func_801180E8 /* AF9AC 801192AC 15E10004 */ bne $t7, $at, .L801192C0 /* AF9B0 801192B0 3C018000 */ lui $at, 0x8000 /* AF9B4 801192B4 17210002 */ bne $t9, $at, .L801192C0 -/* AF9B8 801192B8 00000000 */ nop +/* AF9B8 801192B8 00000000 */ nop /* AF9BC 801192BC 0006000D */ break 6 .L801192C0: /* AF9C0 801192C0 00006812 */ mflo $t5 @@ -1277,7 +1277,7 @@ glabel func_801180E8 /* AFA68 80119368 1440014F */ bnez $v0, .L801198A8 /* AFA6C 8011936C 01CC7021 */ addu $t6, $t6, $t4 /* AFA70 80119370 08046449 */ j .L80119124 -/* AFA74 80119374 00000000 */ nop +/* AFA74 80119374 00000000 */ nop .L80119378: /* AFA78 80119378 03C0702D */ daddu $t6, $fp, $zero /* AFA7C 8011937C 0000882D */ daddu $s1, $zero, $zero @@ -1303,7 +1303,7 @@ glabel func_801180E8 /* AFAC4 801193C4 15E10004 */ bne $t7, $at, .L801193D8 /* AFAC8 801193C8 3C018000 */ lui $at, 0x8000 /* AFACC 801193CC 16410002 */ bne $s2, $at, .L801193D8 -/* AFAD0 801193D0 00000000 */ nop +/* AFAD0 801193D0 00000000 */ nop /* AFAD4 801193D4 0006000D */ break 6 .L801193D8: /* AFAD8 801193D8 00006012 */ mflo $t4 @@ -1317,7 +1317,7 @@ glabel func_801180E8 /* AFAF4 801193F4 15E10004 */ bne $t7, $at, .L80119408 /* AFAF8 801193F8 3C018000 */ lui $at, 0x8000 /* AFAFC 801193FC 17210002 */ bne $t9, $at, .L80119408 -/* AFB00 80119400 00000000 */ nop +/* AFB00 80119400 00000000 */ nop /* AFB04 80119404 0006000D */ break 6 .L80119408: /* AFB08 80119408 00002012 */ mflo $a0 @@ -1350,7 +1350,7 @@ glabel func_801180E8 /* AFB74 80119474 304201FF */ andi $v0, $v0, 0x1ff /* AFB78 80119478 00621825 */ or $v1, $v1, $v0 /* AFB7C 8011947C 00001012 */ mflo $v0 -/* AFB80 80119480 00000000 */ nop +/* AFB80 80119480 00000000 */ nop /* AFB84 80119484 15E00002 */ bnez $t7, .L80119490 /* AFB88 80119488 004F001A */ div $zero, $v0, $t7 /* AFB8C 8011948C 0007000D */ break 7 @@ -1359,7 +1359,7 @@ glabel func_801180E8 /* AFB94 80119494 15E10004 */ bne $t7, $at, .L801194A8 /* AFB98 80119498 3C018000 */ lui $at, 0x8000 /* AFB9C 8011949C 14410002 */ bne $v0, $at, .L801194A8 -/* AFBA0 801194A0 00000000 */ nop +/* AFBA0 801194A0 00000000 */ nop /* AFBA4 801194A4 0006000D */ break 6 .L801194A8: /* AFBA8 801194A8 00005012 */ mflo $t2 @@ -1405,7 +1405,7 @@ glabel func_801180E8 /* AFC44 80119544 15E10004 */ bne $t7, $at, .L80119558 /* AFC48 80119548 3C018000 */ lui $at, 0x8000 /* AFC4C 8011954C 17210002 */ bne $t9, $at, .L80119558 -/* AFC50 80119550 00000000 */ nop +/* AFC50 80119550 00000000 */ nop /* AFC54 80119554 0006000D */ break 6 .L80119558: /* AFC58 80119558 00006812 */ mflo $t5 @@ -1454,7 +1454,7 @@ glabel func_801180E8 /* AFD04 80119604 144000A8 */ bnez $v0, .L801198A8 /* AFD08 80119608 01CA7021 */ addu $t6, $t6, $t2 /* AFD0C 8011960C 080464ED */ j .L801193B4 -/* AFD10 80119610 00000000 */ nop +/* AFD10 80119610 00000000 */ nop .L80119614: /* AFD14 80119614 03C0702D */ daddu $t6, $fp, $zero /* AFD18 80119618 0000882D */ daddu $s1, $zero, $zero @@ -1480,7 +1480,7 @@ glabel func_801180E8 /* AFD60 80119660 15E10004 */ bne $t7, $at, .L80119674 /* AFD64 80119664 3C018000 */ lui $at, 0x8000 /* AFD68 80119668 16410002 */ bne $s2, $at, .L80119674 -/* AFD6C 8011966C 00000000 */ nop +/* AFD6C 8011966C 00000000 */ nop /* AFD70 80119670 0006000D */ break 6 .L80119674: /* AFD74 80119674 00006012 */ mflo $t4 @@ -1494,7 +1494,7 @@ glabel func_801180E8 /* AFD90 80119690 15E10004 */ bne $t7, $at, .L801196A4 /* AFD94 80119694 3C018000 */ lui $at, 0x8000 /* AFD98 80119698 17210002 */ bne $t9, $at, .L801196A4 -/* AFD9C 8011969C 00000000 */ nop +/* AFD9C 8011969C 00000000 */ nop /* AFDA0 801196A0 0006000D */ break 6 .L801196A4: /* AFDA4 801196A4 00002012 */ mflo $a0 @@ -1527,7 +1527,7 @@ glabel func_801180E8 /* AFE10 80119710 304201FF */ andi $v0, $v0, 0x1ff /* AFE14 80119714 00621825 */ or $v1, $v1, $v0 /* AFE18 80119718 00001012 */ mflo $v0 -/* AFE1C 8011971C 00000000 */ nop +/* AFE1C 8011971C 00000000 */ nop /* AFE20 80119720 15E00002 */ bnez $t7, .L8011972C /* AFE24 80119724 004F001A */ div $zero, $v0, $t7 /* AFE28 80119728 0007000D */ break 7 @@ -1536,7 +1536,7 @@ glabel func_801180E8 /* AFE30 80119730 15E10004 */ bne $t7, $at, .L80119744 /* AFE34 80119734 3C018000 */ lui $at, 0x8000 /* AFE38 80119738 14410002 */ bne $v0, $at, .L80119744 -/* AFE3C 8011973C 00000000 */ nop +/* AFE3C 8011973C 00000000 */ nop /* AFE40 80119740 0006000D */ break 6 .L80119744: /* AFE44 80119744 00005012 */ mflo $t2 @@ -1582,7 +1582,7 @@ glabel func_801180E8 /* AFEE0 801197E0 15E10004 */ bne $t7, $at, .L801197F4 /* AFEE4 801197E4 3C018000 */ lui $at, 0x8000 /* AFEE8 801197E8 17210002 */ bne $t9, $at, .L801197F4 -/* AFEEC 801197EC 00000000 */ nop +/* AFEEC 801197EC 00000000 */ nop /* AFEF0 801197F0 0006000D */ break 6 .L801197F4: /* AFEF4 801197F4 00006812 */ mflo $t5 @@ -1665,18 +1665,18 @@ glabel func_801180E8 /* B001C 8011991C AC600004 */ sw $zero, 4($v1) /* B0020 80119920 28A20002 */ slti $v0, $a1, 2 /* B0024 80119924 10400005 */ beqz $v0, .L8011993C -/* B0028 80119928 00000000 */ nop +/* B0028 80119928 00000000 */ nop /* B002C 8011992C 10A00009 */ beqz $a1, .L80119954 /* B0030 80119930 3C03E300 */ lui $v1, 0xe300 /* B0034 80119934 08046B32 */ j .L8011ACC8 -/* B0038 80119938 00000000 */ nop +/* B0038 80119938 00000000 */ nop .L8011993C: /* B003C 8011993C 10AB0118 */ beq $a1, $t3, .L80119DA0 /* B0040 80119940 24020003 */ addiu $v0, $zero, 3 /* B0044 80119944 10A20177 */ beq $a1, $v0, .L80119F24 /* B0048 80119948 3C03E300 */ lui $v1, 0xe300 /* B004C 8011994C 08046B32 */ j .L8011ACC8 -/* B0050 80119950 00000000 */ nop +/* B0050 80119950 00000000 */ nop .L80119954: /* B0054 80119954 31030007 */ andi $v1, $t0, 7 /* B0058 80119958 8F020000 */ lw $v0, ($t8) @@ -1752,7 +1752,7 @@ glabel func_801180E8 /* B0160 80119A60 14A10004 */ bne $a1, $at, .L80119A74 /* B0164 80119A64 3C018000 */ lui $at, 0x8000 /* B0168 80119A68 14610002 */ bne $v1, $at, .L80119A74 -/* B016C 80119A6C 00000000 */ nop +/* B016C 80119A6C 00000000 */ nop /* B0170 80119A70 0006000D */ break 6 .L80119A74: /* B0174 80119A74 00001012 */ mflo $v0 @@ -1898,7 +1898,7 @@ glabel func_801180E8 /* B0388 80119C88 14A10004 */ bne $a1, $at, .L80119C9C /* B038C 80119C8C 3C018000 */ lui $at, 0x8000 /* B0390 80119C90 14610002 */ bne $v1, $at, .L80119C9C -/* B0394 80119C94 00000000 */ nop +/* B0394 80119C94 00000000 */ nop /* B0398 80119C98 0006000D */ break 6 .L80119C9C: /* B039C 80119C9C 00001012 */ mflo $v0 @@ -2041,7 +2041,7 @@ glabel func_801180E8 /* B05A4 80119EA4 14A10004 */ bne $a1, $at, .L80119EB8 /* B05A8 80119EA8 3C018000 */ lui $at, 0x8000 /* B05AC 80119EAC 14610002 */ bne $v1, $at, .L80119EB8 -/* B05B0 80119EB0 00000000 */ nop +/* B05B0 80119EB0 00000000 */ nop /* B05B4 80119EB4 0006000D */ break 6 .L80119EB8: /* B05B8 80119EB8 00001012 */ mflo $v0 @@ -2142,7 +2142,7 @@ glabel func_801180E8 /* B071C 8011A01C 14A10004 */ bne $a1, $at, .L8011A030 /* B0720 8011A020 3C018000 */ lui $at, 0x8000 /* B0724 8011A024 14610002 */ bne $v1, $at, .L8011A030 -/* B0728 8011A028 00000000 */ nop +/* B0728 8011A028 00000000 */ nop /* B072C 8011A02C 0006000D */ break 6 .L8011A030: /* B0730 8011A030 00001012 */ mflo $v0 @@ -2268,18 +2268,18 @@ glabel func_801180E8 /* B08F8 8011A1F8 AC82000C */ sw $v0, 0xc($a0) /* B08FC 8011A1FC 28A20002 */ slti $v0, $a1, 2 /* B0900 8011A200 10400005 */ beqz $v0, .L8011A218 -/* B0904 8011A204 00000000 */ nop +/* B0904 8011A204 00000000 */ nop /* B0908 8011A208 10A00009 */ beqz $a1, .L8011A230 /* B090C 8011A20C 31080007 */ andi $t0, $t0, 7 /* B0910 8011A210 080469FD */ j .L8011A7F4 -/* B0914 8011A214 00000000 */ nop +/* B0914 8011A214 00000000 */ nop .L8011A218: /* B0918 8011A218 10A700BF */ beq $a1, $a3, .L8011A518 /* B091C 8011A21C 31080007 */ andi $t0, $t0, 7 /* B0920 8011A220 10AB0118 */ beq $a1, $t3, .L8011A684 /* B0924 8011A224 00084540 */ sll $t0, $t0, 0x15 /* B0928 8011A228 080469FD */ j .L8011A7F4 -/* B092C 8011A22C 00000000 */ nop +/* B092C 8011A22C 00000000 */ nop .L8011A230: /* B0930 8011A230 00084540 */ sll $t0, $t0, 0x15 /* B0934 8011A234 00192843 */ sra $a1, $t9, 1 @@ -2665,7 +2665,7 @@ glabel func_801180E8 /* B0F10 8011A810 1200000A */ beqz $s0, .L8011A83C /* B0F14 8011A814 3C03E300 */ lui $v1, 0xe300 /* B0F18 8011A818 08046B32 */ j .L8011ACC8 -/* B0F1C 8011A81C 00000000 */ nop +/* B0F1C 8011A81C 00000000 */ nop .L8011A820: /* B0F20 8011A820 8FB4004C */ lw $s4, 0x4c($sp) /* B0F24 8011A824 1282009C */ beq $s4, $v0, .L8011AA98 @@ -2673,7 +2673,7 @@ glabel func_801180E8 /* B0F2C 8011A82C 128200AF */ beq $s4, $v0, .L8011AAEC /* B0F30 8011A830 3C03E300 */ lui $v1, 0xe300 /* B0F34 8011A834 08046B32 */ j .L8011ACC8 -/* B0F38 8011A838 00000000 */ nop +/* B0F38 8011A838 00000000 */ nop .L8011A83C: /* B0F3C 8011A83C 00132043 */ sra $a0, $s3, 1 /* B0F40 8011A840 3C03FD08 */ lui $v1, 0xfd08 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B1D8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B1D8.s index 6fa46bb98e..5ee4febffe 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B1D8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B1D8.s @@ -22,17 +22,17 @@ glabel func_8011B1D8 /* B191C 8011B21C 3C018015 */ lui $at, %hi(D_80153376) /* B1920 8011B220 A4223376 */ sh $v0, %lo(D_80153376)($at) /* B1924 8011B224 08046CD4 */ j .L8011B350 -/* B1928 8011B228 00000000 */ nop +/* B1928 8011B228 00000000 */ nop .L8011B22C: /* B192C 8011B22C 14620019 */ bne $v1, $v0, .L8011B294 /* B1930 8011B230 02A0202D */ daddu $a0, $s5, $zero /* B1934 8011B234 0C0456C3 */ jal get_model_property /* B1938 8011B238 24050060 */ addiu $a1, $zero, 0x60 /* B193C 8011B23C 10400015 */ beqz $v0, .L8011B294 -/* B1940 8011B240 00000000 */ nop +/* B1940 8011B240 00000000 */ nop /* B1944 8011B244 8C420008 */ lw $v0, 8($v0) /* B1948 8011B248 10400012 */ beqz $v0, .L8011B294 -/* B194C 8011B24C 00000000 */ nop +/* B194C 8011B24C 00000000 */ nop /* B1950 8011B250 0C04572A */ jal func_80115CA8 /* B1954 8011B254 02A0202D */ daddu $a0, $s5, $zero /* B1958 8011B258 3C038015 */ lui $v1, %hi(D_80153224) @@ -44,20 +44,20 @@ glabel func_8011B1D8 /* B1970 8011B270 3C018015 */ lui $at, %hi(D_80153376) /* B1974 8011B274 A4223376 */ sh $v0, %lo(D_80153376)($at) /* B1978 8011B278 08046CD4 */ j .L8011B350 -/* B197C 8011B27C 00000000 */ nop +/* B197C 8011B27C 00000000 */ nop .L8011B280: /* B1980 8011B280 AED00000 */ sw $s0, ($s6) /* B1984 8011B284 3C018015 */ lui $at, %hi(D_80153374) /* B1988 8011B288 A4323374 */ sh $s2, %lo(D_80153374)($at) /* B198C 8011B28C 08046CD4 */ j .L8011B350 -/* B1990 8011B290 00000000 */ nop +/* B1990 8011B290 00000000 */ nop .L8011B294: /* B1994 8011B294 8EA20010 */ lw $v0, 0x10($s5) /* B1998 8011B298 1040002D */ beqz $v0, .L8011B350 -/* B199C 8011B29C 00000000 */ nop +/* B199C 8011B29C 00000000 */ nop /* B19A0 8011B2A0 8C53000C */ lw $s3, 0xc($v0) /* B19A4 8011B2A4 1260002A */ beqz $s3, .L8011B350 -/* B19A8 8011B2A8 00000000 */ nop +/* B19A8 8011B2A8 00000000 */ nop /* B19AC 8011B2AC 1A600028 */ blez $s3, .L8011B350 /* B19B0 8011B2B0 0000882D */ daddu $s1, $zero, $zero /* B19B4 8011B2B4 3C148015 */ lui $s4, %hi(D_80153224) @@ -78,10 +78,10 @@ glabel func_8011B1D8 /* B19EC 8011B2EC 0C0456C3 */ jal get_model_property /* B19F0 8011B2F0 24050060 */ addiu $a1, $zero, 0x60 /* B19F4 8011B2F4 10400007 */ beqz $v0, .L8011B314 -/* B19F8 8011B2F8 00000000 */ nop +/* B19F8 8011B2F8 00000000 */ nop /* B19FC 8011B2FC 8C420008 */ lw $v0, 8($v0) /* B1A00 8011B300 10400004 */ beqz $v0, .L8011B314 -/* B1A04 8011B304 00000000 */ nop +/* B1A04 8011B304 00000000 */ nop /* B1A08 8011B308 0C04572A */ jal func_80115CA8 /* B1A0C 8011B30C 0200202D */ daddu $a0, $s0, $zero /* B1A10 8011B310 02429021 */ addu $s2, $s2, $v0 @@ -90,7 +90,7 @@ glabel func_8011B1D8 /* B1A18 8011B318 0200202D */ daddu $a0, $s0, $zero /* B1A1C 8011B31C 8EC20000 */ lw $v0, ($s6) /* B1A20 8011B320 1440000B */ bnez $v0, .L8011B350 -/* B1A24 8011B324 00000000 */ nop +/* B1A24 8011B324 00000000 */ nop /* B1A28 8011B328 3C028015 */ lui $v0, %hi(D_8015336E) /* B1A2C 8011B32C 9442336E */ lhu $v0, %lo(D_8015336E)($v0) /* B1A30 8011B330 8E830000 */ lw $v1, ($s4) @@ -100,7 +100,7 @@ glabel func_8011B1D8 /* B1A40 8011B340 26310001 */ addiu $s1, $s1, 1 /* B1A44 8011B344 0233102A */ slt $v0, $s1, $s3 /* B1A48 8011B348 1440FFDF */ bnez $v0, .L8011B2C8 -/* B1A4C 8011B34C 00000000 */ nop +/* B1A4C 8011B34C 00000000 */ nop .L8011B350: /* B1A50 8011B350 8FBF0030 */ lw $ra, 0x30($sp) /* B1A54 8011B354 8FB7002C */ lw $s7, 0x2c($sp) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B37C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B37C.s index c27cd74112..ec28292230 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B37C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B37C.s @@ -33,7 +33,7 @@ glabel func_8011B37C .L8011B3EC: /* B1AEC 8011B3EC 8C620000 */ lw $v0, ($v1) /* B1AF0 8011B3F0 10400005 */ beqz $v0, .L8011B408 -/* B1AF4 8011B3F4 00000000 */ nop +/* B1AF4 8011B3F4 00000000 */ nop /* B1AF8 8011B3F8 26100001 */ addiu $s0, $s0, 1 /* B1AFC 8011B3FC 2A020004 */ slti $v0, $s0, 4 /* B1B00 8011B400 1440FFFA */ bnez $v0, .L8011B3EC @@ -56,7 +56,7 @@ glabel func_8011B37C /* B1B40 8011B440 3C048015 */ lui $a0, %hi(D_80153376) /* B1B44 8011B444 94843376 */ lhu $a0, %lo(D_80153376)($a0) /* B1B48 8011B448 0C046C04 */ jal get_model_list_index_from_tree_index -/* B1B4C 8011B44C 00000000 */ nop +/* B1B4C 8011B44C 00000000 */ nop /* B1B50 8011B450 A202009D */ sb $v0, 0x9d($s0) /* B1B54 8011B454 A200009F */ sb $zero, 0x9f($s0) /* B1B58 8011B458 3C028015 */ lui $v0, %hi(D_80153370) @@ -78,7 +78,7 @@ glabel func_8011B37C /* B1B98 8011B498 0C0456C3 */ jal get_model_property /* B1B9C 8011B49C 2405005C */ addiu $a1, $zero, 0x5c /* B1BA0 8011B4A0 08046D2E */ j .L8011B4B8 -/* B1BA4 8011B4A4 00000000 */ nop +/* B1BA4 8011B4A4 00000000 */ nop .L8011B4A8: /* B1BA8 8011B4A8 0C0456C3 */ jal get_model_property /* B1BAC 8011B4AC 24050060 */ addiu $a1, $zero, 0x60 @@ -99,32 +99,32 @@ glabel func_8011B37C /* B1BD8 8011B4D8 0C0456C3 */ jal get_model_property /* B1BDC 8011B4DC 24050061 */ addiu $a1, $zero, 0x61 /* B1BE0 8011B4E0 10400017 */ beqz $v0, .L8011B540 -/* B1BE4 8011B4E4 00000000 */ nop +/* B1BE4 8011B4E4 00000000 */ nop /* B1BE8 8011B4E8 C4460008 */ lwc1 $f6, 8($v0) /* B1BEC 8011B4EC C440002C */ lwc1 $f0, 0x2c($v0) /* B1BF0 8011B4F0 46003180 */ add.s $f6, $f6, $f0 /* B1BF4 8011B4F4 3C013F00 */ lui $at, 0x3f00 /* B1BF8 8011B4F8 44814000 */ mtc1 $at, $f8 -/* B1BFC 8011B4FC 00000000 */ nop +/* B1BFC 8011B4FC 00000000 */ nop /* B1C00 8011B500 46083182 */ mul.s $f6, $f6, $f8 -/* B1C04 8011B504 00000000 */ nop +/* B1C04 8011B504 00000000 */ nop /* B1C08 8011B508 C4440014 */ lwc1 $f4, 0x14($v0) /* B1C0C 8011B50C C4400038 */ lwc1 $f0, 0x38($v0) /* B1C10 8011B510 46002100 */ add.s $f4, $f4, $f0 /* B1C14 8011B514 46082102 */ mul.s $f4, $f4, $f8 -/* B1C18 8011B518 00000000 */ nop +/* B1C18 8011B518 00000000 */ nop /* B1C1C 8011B51C C4420044 */ lwc1 $f2, 0x44($v0) /* B1C20 8011B520 C4400020 */ lwc1 $f0, 0x20($v0) /* B1C24 8011B524 46020000 */ add.s $f0, $f0, $f2 /* B1C28 8011B528 46080002 */ mul.s $f0, $f0, $f8 -/* B1C2C 8011B52C 00000000 */ nop +/* B1C2C 8011B52C 00000000 */ nop /* B1C30 8011B530 E7A60020 */ swc1 $f6, 0x20($sp) /* B1C34 8011B534 E7A40024 */ swc1 $f4, 0x24($sp) /* B1C38 8011B538 08046D55 */ j .L8011B554 /* B1C3C 8011B53C E7A00028 */ swc1 $f0, 0x28($sp) .L8011B540: /* B1C40 8011B540 44800000 */ mtc1 $zero, $f0 -/* B1C44 8011B544 00000000 */ nop +/* B1C44 8011B544 00000000 */ nop /* B1C48 8011B548 E7A00028 */ swc1 $f0, 0x28($sp) /* B1C4C 8011B54C E7A00024 */ swc1 $f0, 0x24($sp) /* B1C50 8011B550 E7A00020 */ swc1 $f0, 0x20($sp) @@ -145,7 +145,7 @@ glabel func_8011B37C /* B1C88 8011B588 44061000 */ mfc1 $a2, $f2 /* B1C8C 8011B58C 44072000 */ mfc1 $a3, $f4 /* B1C90 8011B590 0C019E78 */ jal guMtxXFML -/* B1C94 8011B594 00000000 */ nop +/* B1C94 8011B594 00000000 */ nop .L8011B598: /* B1C98 8011B598 C7A00020 */ lwc1 $f0, 0x20($sp) /* B1C9C 8011B59C C7A20024 */ lwc1 $f2, 0x24($sp) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B5D0.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B5D0.s index ccdf09514a..3803c04eb7 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B5D0.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B5D0.s @@ -34,7 +34,7 @@ glabel func_8011B5D0 /* B1D3C 8011B63C 26100001 */ addiu $s0, $s0, 1 /* B1D40 8011B640 0050102A */ slt $v0, $v0, $s0 /* B1D44 8011B644 1040FFF2 */ beqz $v0, .L8011B610 -/* B1D48 8011B648 00000000 */ nop +/* B1D48 8011B648 00000000 */ nop .L8011B64C: /* B1D4C 8011B64C 8FBF0018 */ lw $ra, 0x18($sp) /* B1D50 8011B650 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B660.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B660.s index 23626b2985..d686c82443 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B660.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B660.s @@ -34,7 +34,7 @@ glabel func_8011B660 /* B1DCC 8011B6CC 26100001 */ addiu $s0, $s0, 1 /* B1DD0 8011B6D0 0050102A */ slt $v0, $v0, $s0 /* B1DD4 8011B6D4 1040FFF2 */ beqz $v0, .L8011B6A0 -/* B1DD8 8011B6D8 00000000 */ nop +/* B1DD8 8011B6D8 00000000 */ nop .L8011B6DC: /* B1DDC 8011B6DC 8FBF0018 */ lw $ra, 0x18($sp) /* B1DE0 8011B6E0 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B7C0.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B7C0.s index d99e37e6f3..426c458524 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B7C0.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B7C0.s @@ -67,7 +67,7 @@ glabel func_8011B7C0 /* B1F94 8011B894 24E70004 */ addiu $a3, $a3, 4 .L8011B898: /* B1F98 8011B898 03E00008 */ jr $ra -/* B1F9C 8011B89C 00000000 */ nop +/* B1F9C 8011B89C 00000000 */ nop .L8011B8A0: /* B1FA0 8011B8A0 19200011 */ blez $t1, .L8011B8E8 /* B1FA4 8011B8A4 0000202D */ daddu $a0, $zero, $zero @@ -105,7 +105,7 @@ glabel func_8011B7C0 /* B2010 8011B910 5060000A */ beql $v1, $zero, .L8011B93C /* B2014 8011B914 24840001 */ addiu $a0, $a0, 1 /* B2018 8011B918 14C90004 */ bne $a2, $t1, .L8011B92C -/* B201C 8011B91C 00000000 */ nop +/* B201C 8011B91C 00000000 */ nop /* B2020 8011B920 94620000 */ lhu $v0, ($v1) /* B2024 8011B924 08046E4D */ j .L8011B934 /* B2028 8011B928 00481024 */ and $v0, $v0, $t0 @@ -120,4 +120,4 @@ glabel func_8011B7C0 /* B2040 8011B940 1440FFF2 */ bnez $v0, .L8011B90C /* B2044 8011B944 24E70004 */ addiu $a3, $a3, 4 /* B2048 8011B948 03E00008 */ jr $ra -/* B204C 8011B94C 00000000 */ nop +/* B204C 8011B94C 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B950.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B950.s index 35c523bb8b..320c1121c9 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B950.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B950.s @@ -72,10 +72,10 @@ glabel func_8011B950 /* B2138 8011BA38 A06200A5 */ sb $v0, 0xa5($v1) /* B213C 8011BA3C 0124102A */ slt $v0, $t1, $a0 /* B2140 8011BA40 1040FFF5 */ beqz $v0, .L8011BA18 -/* B2144 8011BA44 00000000 */ nop +/* B2144 8011BA44 00000000 */ nop .L8011BA48: /* B2148 8011BA48 03E00008 */ jr $ra -/* B214C 8011BA4C 00000000 */ nop +/* B214C 8011BA4C 00000000 */ nop .L8011BA50: /* B2150 8011BA50 19600010 */ blez $t3, .L8011BA94 /* B2154 8011BA54 0000202D */ daddu $a0, $zero, $zero @@ -94,7 +94,7 @@ glabel func_8011B950 /* B2184 8011BA84 A06200A5 */ sb $v0, 0xa5($v1) /* B2188 8011BA88 008B102A */ slt $v0, $a0, $t3 /* B218C 8011BA8C 1440FFF5 */ bnez $v0, .L8011BA64 -/* B2190 8011BA90 00000000 */ nop +/* B2190 8011BA90 00000000 */ nop .L8011BA94: /* B2194 8011BA94 25240001 */ addiu $a0, $t1, 1 /* B2198 8011BA98 28820100 */ slti $v0, $a0, 0x100 @@ -116,6 +116,6 @@ glabel func_8011B950 .L8011BAD4: /* B21D4 8011BAD4 28820100 */ slti $v0, $a0, 0x100 /* B21D8 8011BAD8 1440FFF4 */ bnez $v0, .L8011BAAC -/* B21DC 8011BADC 00000000 */ nop +/* B21DC 8011BADC 00000000 */ nop /* B21E0 8011BAE0 03E00008 */ jr $ra -/* B21E4 8011BAE4 00000000 */ nop +/* B21E4 8011BAE4 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BAE8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BAE8.s index 32b9e2eb11..a916abdcdd 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BAE8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BAE8.s @@ -31,4 +31,4 @@ glabel func_8011BAE8 /* B2240 8011BB40 1440FFF8 */ bnez $v0, .L8011BB24 /* B2244 8011BB44 24A50004 */ addiu $a1, $a1, 4 /* B2248 8011BB48 03E00008 */ jr $ra -/* B224C 8011BB4C 00000000 */ nop +/* B224C 8011BB4C 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BC7C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BC7C.s index e0a200d108..fc78048cb9 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BC7C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BC7C.s @@ -4,7 +4,7 @@ glabel func_8011BC7C /* B237C 8011BC7C 2403FFFF */ addiu $v1, $zero, -1 /* B2380 8011BC80 14A30003 */ bne $a1, $v1, .L8011BC90 -/* B2384 8011BC84 00000000 */ nop +/* B2384 8011BC84 00000000 */ nop /* B2388 8011BC88 908200A5 */ lbu $v0, 0xa5($a0) /* B238C 8011BC8C 3045000F */ andi $a1, $v0, 0xf .L8011BC90: diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C028.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C028.s index 0db78fa62b..86a7a54bb7 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C028.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C028.s @@ -19,7 +19,7 @@ glabel func_8011C028 /* B2758 8011C058 8C820004 */ lw $v0, 4($a0) /* B275C 8011C05C 00085E02 */ srl $t3, $t0, 0x18 /* B2760 8011C060 156F0013 */ bne $t3, $t7, .L8011C0B0 -/* B2764 8011C064 00000000 */ nop +/* B2764 8011C064 00000000 */ nop /* B2768 8011C068 11800003 */ beqz $t4, .L8011C078 /* B276C 8011C06C 0040182D */ daddu $v1, $v0, $zero /* B2770 8011C070 3042FFFF */ andi $v0, $v0, 0xffff diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C0DC.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C0DC.s index 790e46ca5a..c9a1f7c15a 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C0DC.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C0DC.s @@ -24,4 +24,4 @@ glabel func_8011C0DC /* B2820 8011C120 146CFFF1 */ bne $v1, $t4, .L8011C0E8 /* B2824 8011C124 24C60008 */ addiu $a2, $a2, 8 /* B2828 8011C128 03E00008 */ jr $ra -/* B282C 8011C12C 00000000 */ nop +/* B282C 8011C12C 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C130.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C130.s index 1c1620945d..adbd81afdf 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C130.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C130.s @@ -16,4 +16,4 @@ glabel func_8011C130 /* B2858 8011C158 00C71821 */ addu $v1, $a2, $a3 .L8011C15C: /* B285C 8011C15C 03E00008 */ jr $ra -/* B2860 8011C160 00000000 */ nop +/* B2860 8011C160 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C164.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C164.s index 9c4af8e1f8..67fec0ff5b 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C164.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C164.s @@ -58,7 +58,7 @@ glabel func_8011C164 /* B2934 8011C234 26100004 */ addiu $s0, $s0, 4 /* B2938 8011C238 2A220002 */ slti $v0, $s1, 2 /* B293C 8011C23C 1440FFEB */ bnez $v0, .L8011C1EC -/* B2940 8011C240 00000000 */ nop +/* B2940 8011C240 00000000 */ nop /* B2944 8011C244 96820000 */ lhu $v0, ($s4) /* B2948 8011C248 0804709E */ j .L8011C278 /* B294C 8011C24C 34420080 */ ori $v0, $v0, 0x80 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C2EC.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C2EC.s index 84ef9eef91..81a5e3271d 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C2EC.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C2EC.s @@ -18,4 +18,4 @@ glabel func_8011C2EC /* B2A20 8011C320 AC800018 */ sw $zero, 0x18($a0) .L8011C324: /* B2A24 8011C324 03E00008 */ jr $ra -/* B2A28 8011C328 00000000 */ nop +/* B2A28 8011C328 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C32C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C32C.s index 66296f8169..848d382c9f 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C32C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C32C.s @@ -40,53 +40,53 @@ glabel func_8011C32C /* B2AB0 8011C3B0 84430000 */ lh $v1, ($v0) /* B2AB4 8011C3B4 84440010 */ lh $a0, 0x10($v0) /* B2AB8 8011C3B8 44838000 */ mtc1 $v1, $f16 -/* B2ABC 8011C3BC 00000000 */ nop +/* B2ABC 8011C3BC 00000000 */ nop /* B2AC0 8011C3C0 46808420 */ cvt.s.w $f16, $f16 /* B2AC4 8011C3C4 44842000 */ mtc1 $a0, $f4 -/* B2AC8 8011C3C8 00000000 */ nop +/* B2AC8 8011C3C8 00000000 */ nop /* B2ACC 8011C3CC 46802120 */ cvt.s.w $f4, $f4 /* B2AD0 8011C3D0 46048032 */ c.eq.s $f16, $f4 /* B2AD4 8011C3D4 84430004 */ lh $v1, 4($v0) /* B2AD8 8011C3D8 84440008 */ lh $a0, 8($v0) /* B2ADC 8011C3DC 44839000 */ mtc1 $v1, $f18 -/* B2AE0 8011C3E0 00000000 */ nop +/* B2AE0 8011C3E0 00000000 */ nop /* B2AE4 8011C3E4 468094A0 */ cvt.s.w $f18, $f18 /* B2AE8 8011C3E8 4484A000 */ mtc1 $a0, $f20 -/* B2AEC 8011C3EC 00000000 */ nop +/* B2AEC 8011C3EC 00000000 */ nop /* B2AF0 8011C3F0 4680A520 */ cvt.s.w $f20, $f20 /* B2AF4 8011C3F4 8443000A */ lh $v1, 0xa($v0) /* B2AF8 8011C3F8 84440014 */ lh $a0, 0x14($v0) /* B2AFC 8011C3FC 4483B000 */ mtc1 $v1, $f22 -/* B2B00 8011C400 00000000 */ nop +/* B2B00 8011C400 00000000 */ nop /* B2B04 8011C404 4680B5A0 */ cvt.s.w $f22, $f22 /* B2B08 8011C408 44845000 */ mtc1 $a0, $f10 -/* B2B0C 8011C40C 00000000 */ nop +/* B2B0C 8011C40C 00000000 */ nop /* B2B10 8011C410 468052A0 */ cvt.s.w $f10, $f10 /* B2B14 8011C414 E7B60038 */ swc1 $f22, 0x38($sp) /* B2B18 8011C418 84430018 */ lh $v1, 0x18($v0) /* B2B1C 8011C41C 8444001A */ lh $a0, 0x1a($v0) /* B2B20 8011C420 44830000 */ mtc1 $v1, $f0 -/* B2B24 8011C424 00000000 */ nop +/* B2B24 8011C424 00000000 */ nop /* B2B28 8011C428 46800020 */ cvt.s.w $f0, $f0 /* B2B2C 8011C42C 4484E000 */ mtc1 $a0, $f28 -/* B2B30 8011C430 00000000 */ nop +/* B2B30 8011C430 00000000 */ nop /* B2B34 8011C434 4680E720 */ cvt.s.w $f28, $f28 /* B2B38 8011C438 E7BC0024 */ swc1 $f28, 0x24($sp) /* B2B3C 8011C43C 84430020 */ lh $v1, 0x20($v0) /* B2B40 8011C440 84440024 */ lh $a0, 0x24($v0) /* B2B44 8011C444 4483C000 */ mtc1 $v1, $f24 -/* B2B48 8011C448 00000000 */ nop +/* B2B48 8011C448 00000000 */ nop /* B2B4C 8011C44C 4680C620 */ cvt.s.w $f24, $f24 /* B2B50 8011C450 44843000 */ mtc1 $a0, $f6 -/* B2B54 8011C454 00000000 */ nop +/* B2B54 8011C454 00000000 */ nop /* B2B58 8011C458 468031A0 */ cvt.s.w $f6, $f6 /* B2B5C 8011C45C 84430028 */ lh $v1, 0x28($v0) /* B2B60 8011C460 8444002A */ lh $a0, 0x2a($v0) /* B2B64 8011C464 4483D000 */ mtc1 $v1, $f26 -/* B2B68 8011C468 00000000 */ nop +/* B2B68 8011C468 00000000 */ nop /* B2B6C 8011C46C 4680D6A0 */ cvt.s.w $f26, $f26 /* B2B70 8011C470 4484B000 */ mtc1 $a0, $f22 -/* B2B74 8011C474 00000000 */ nop +/* B2B74 8011C474 00000000 */ nop /* B2B78 8011C478 4680B5A0 */ cvt.s.w $f22, $f22 /* B2B7C 8011C47C E7B60028 */ swc1 $f22, 0x28($sp) /* B2B80 8011C480 9053000C */ lbu $s3, 0xc($v0) @@ -99,10 +99,10 @@ glabel func_8011C32C /* B2B9C 8011C49C 4600A201 */ sub.s $f8, $f20, $f0 /* B2BA0 8011C4A0 460E1083 */ div.s $f2, $f2, $f14 /* B2BA4 8011C4A4 46081002 */ mul.s $f0, $f2, $f8 -/* B2BA8 8011C4A8 00000000 */ nop +/* B2BA8 8011C4A8 00000000 */ nop /* B2BAC 8011C4AC 460A9301 */ sub.s $f12, $f18, $f10 /* B2BB0 8011C4B0 460C1282 */ mul.s $f10, $f2, $f12 -/* B2BB4 8011C4B4 00000000 */ nop +/* B2BB4 8011C4B4 00000000 */ nop /* B2BB8 8011C4B8 461AA101 */ sub.s $f4, $f20, $f26 /* B2BBC 8011C4BC 46069181 */ sub.s $f6, $f18, $f6 /* B2BC0 8011C4C0 46040001 */ sub.s $f0, $f0, $f4 @@ -110,30 +110,30 @@ glabel func_8011C32C /* B2BC8 8011C4C8 460A0003 */ div.s $f0, $f0, $f10 /* B2BCC 8011C4CC E7A00040 */ swc1 $f0, 0x40($sp) /* B2BD0 8011C4D0 46006002 */ mul.s $f0, $f12, $f0 -/* B2BD4 8011C4D4 00000000 */ nop +/* B2BD4 8011C4D4 00000000 */ nop /* B2BD8 8011C4D8 C7B60038 */ lwc1 $f22, 0x38($sp) /* B2BDC 8011C4DC 461CB101 */ sub.s $f4, $f22, $f28 /* B2BE0 8011C4E0 46041082 */ mul.s $f2, $f2, $f4 -/* B2BE4 8011C4E4 00000000 */ nop +/* B2BE4 8011C4E4 00000000 */ nop /* B2BE8 8011C4E8 46004201 */ sub.s $f8, $f8, $f0 /* B2BEC 8011C4EC 460E4783 */ div.s $f30, $f8, $f14 /* B2BF0 8011C4F0 4610F182 */ mul.s $f6, $f30, $f16 -/* B2BF4 8011C4F4 00000000 */ nop +/* B2BF4 8011C4F4 00000000 */ nop /* B2BF8 8011C4F8 C7BC0028 */ lwc1 $f28, 0x28($sp) /* B2BFC 8011C4FC 461CB001 */ sub.s $f0, $f22, $f28 /* B2C00 8011C500 C7B60040 */ lwc1 $f22, 0x40($sp) /* B2C04 8011C504 4612B202 */ mul.s $f8, $f22, $f18 -/* B2C08 8011C508 00000000 */ nop +/* B2C08 8011C508 00000000 */ nop /* B2C0C 8011C50C 46001081 */ sub.s $f2, $f2, $f0 /* B2C10 8011C510 460A1683 */ div.s $f26, $f2, $f10 /* B2C14 8011C514 461A6302 */ mul.s $f12, $f12, $f26 -/* B2C18 8011C518 00000000 */ nop +/* B2C18 8011C518 00000000 */ nop /* B2C1C 8011C51C 4612D082 */ mul.s $f2, $f26, $f18 -/* B2C20 8011C520 00000000 */ nop +/* B2C20 8011C520 00000000 */ nop /* B2C24 8011C524 460C2101 */ sub.s $f4, $f4, $f12 /* B2C28 8011C528 460E2603 */ div.s $f24, $f4, $f14 /* B2C2C 8011C52C 4610C002 */ mul.s $f0, $f24, $f16 -/* B2C30 8011C530 00000000 */ nop +/* B2C30 8011C530 00000000 */ nop /* B2C34 8011C534 4606A181 */ sub.s $f6, $f20, $f6 /* B2C38 8011C538 46083181 */ sub.s $f6, $f6, $f8 /* B2C3C 8011C53C C7BC0038 */ lwc1 $f28, 0x38($sp) @@ -144,41 +144,41 @@ glabel func_8011C32C /* B2C4C 8011C54C 4600A201 */ sub.s $f8, $f20, $f0 /* B2C50 8011C550 460E1083 */ div.s $f2, $f2, $f14 /* B2C54 8011C554 46081002 */ mul.s $f0, $f2, $f8 -/* B2C58 8011C558 00000000 */ nop +/* B2C58 8011C558 00000000 */ nop /* B2C5C 8011C55C 46048301 */ sub.s $f12, $f16, $f4 /* B2C60 8011C560 460C1282 */ mul.s $f10, $f2, $f12 -/* B2C64 8011C564 00000000 */ nop +/* B2C64 8011C564 00000000 */ nop /* B2C68 8011C568 461AA101 */ sub.s $f4, $f20, $f26 /* B2C6C 8011C56C 46188181 */ sub.s $f6, $f16, $f24 /* B2C70 8011C570 46040001 */ sub.s $f0, $f0, $f4 /* B2C74 8011C574 46065281 */ sub.s $f10, $f10, $f6 /* B2C78 8011C578 460A0783 */ div.s $f30, $f0, $f10 /* B2C7C 8011C57C 461E6002 */ mul.s $f0, $f12, $f30 -/* B2C80 8011C580 00000000 */ nop +/* B2C80 8011C580 00000000 */ nop /* B2C84 8011C584 4610F182 */ mul.s $f6, $f30, $f16 -/* B2C88 8011C588 00000000 */ nop +/* B2C88 8011C588 00000000 */ nop /* B2C8C 8011C58C C7B60038 */ lwc1 $f22, 0x38($sp) /* B2C90 8011C590 C7BC0024 */ lwc1 $f28, 0x24($sp) /* B2C94 8011C594 461CB101 */ sub.s $f4, $f22, $f28 /* B2C98 8011C598 46041082 */ mul.s $f2, $f2, $f4 -/* B2C9C 8011C59C 00000000 */ nop +/* B2C9C 8011C59C 00000000 */ nop /* B2CA0 8011C5A0 46004201 */ sub.s $f8, $f8, $f0 /* B2CA4 8011C5A4 460E4203 */ div.s $f8, $f8, $f14 /* B2CA8 8011C5A8 E7A80040 */ swc1 $f8, 0x40($sp) /* B2CAC 8011C5AC 46124202 */ mul.s $f8, $f8, $f18 -/* B2CB0 8011C5B0 00000000 */ nop +/* B2CB0 8011C5B0 00000000 */ nop /* B2CB4 8011C5B4 C7BC0028 */ lwc1 $f28, 0x28($sp) /* B2CB8 8011C5B8 461CB001 */ sub.s $f0, $f22, $f28 /* B2CBC 8011C5BC 46001081 */ sub.s $f2, $f2, $f0 /* B2CC0 8011C5C0 460A1603 */ div.s $f24, $f2, $f10 /* B2CC4 8011C5C4 46186302 */ mul.s $f12, $f12, $f24 -/* B2CC8 8011C5C8 00000000 */ nop +/* B2CC8 8011C5C8 00000000 */ nop /* B2CCC 8011C5CC 4610C002 */ mul.s $f0, $f24, $f16 -/* B2CD0 8011C5D0 00000000 */ nop +/* B2CD0 8011C5D0 00000000 */ nop /* B2CD4 8011C5D4 460C2101 */ sub.s $f4, $f4, $f12 /* B2CD8 8011C5D8 460E2683 */ div.s $f26, $f4, $f14 /* B2CDC 8011C5DC 4612D082 */ mul.s $f2, $f26, $f18 -/* B2CE0 8011C5E0 00000000 */ nop +/* B2CE0 8011C5E0 00000000 */ nop /* B2CE4 8011C5E4 4606A181 */ sub.s $f6, $f20, $f6 /* B2CE8 8011C5E8 46083181 */ sub.s $f6, $f6, $f8 /* B2CEC 8011C5EC 4600B001 */ sub.s $f0, $f22, $f0 @@ -202,36 +202,36 @@ glabel func_8011C32C /* B2D2C 8011C62C 8FA3001C */ lw $v1, 0x1c($sp) /* B2D30 8011C630 84620000 */ lh $v0, ($v1) /* B2D34 8011C634 44823000 */ mtc1 $v0, $f6 -/* B2D38 8011C638 00000000 */ nop +/* B2D38 8011C638 00000000 */ nop /* B2D3C 8011C63C 468031A0 */ cvt.s.w $f6, $f6 /* B2D40 8011C640 84620002 */ lh $v0, 2($v1) /* B2D44 8011C644 84630004 */ lh $v1, 4($v1) /* B2D48 8011C648 44827000 */ mtc1 $v0, $f14 -/* B2D4C 8011C64C 00000000 */ nop +/* B2D4C 8011C64C 00000000 */ nop /* B2D50 8011C650 468073A0 */ cvt.s.w $f14, $f14 /* B2D54 8011C654 44836000 */ mtc1 $v1, $f12 -/* B2D58 8011C658 00000000 */ nop +/* B2D58 8011C658 00000000 */ nop /* B2D5C 8011C65C 46806320 */ cvt.s.w $f12, $f12 /* B2D60 8011C660 1200001C */ beqz $s0, .L8011C6D4 /* B2D64 8011C664 46003286 */ mov.s $f10, $f6 /* B2D68 8011C668 C6040000 */ lwc1 $f4, ($s0) /* B2D6C 8011C66C 46062102 */ mul.s $f4, $f4, $f6 -/* B2D70 8011C670 00000000 */ nop +/* B2D70 8011C670 00000000 */ nop /* B2D74 8011C674 C60A0010 */ lwc1 $f10, 0x10($s0) /* B2D78 8011C678 460E5282 */ mul.s $f10, $f10, $f14 -/* B2D7C 8011C67C 00000000 */ nop +/* B2D7C 8011C67C 00000000 */ nop /* B2D80 8011C680 C6000020 */ lwc1 $f0, 0x20($s0) /* B2D84 8011C684 460C0002 */ mul.s $f0, $f0, $f12 -/* B2D88 8011C688 00000000 */ nop +/* B2D88 8011C688 00000000 */ nop /* B2D8C 8011C68C C6020008 */ lwc1 $f2, 8($s0) /* B2D90 8011C690 46061082 */ mul.s $f2, $f2, $f6 -/* B2D94 8011C694 00000000 */ nop +/* B2D94 8011C694 00000000 */ nop /* B2D98 8011C698 C6080018 */ lwc1 $f8, 0x18($s0) /* B2D9C 8011C69C 460E4202 */ mul.s $f8, $f8, $f14 -/* B2DA0 8011C6A0 00000000 */ nop +/* B2DA0 8011C6A0 00000000 */ nop /* B2DA4 8011C6A4 C6060028 */ lwc1 $f6, 0x28($s0) /* B2DA8 8011C6A8 460C3182 */ mul.s $f6, $f6, $f12 -/* B2DAC 8011C6AC 00000000 */ nop +/* B2DAC 8011C6AC 00000000 */ nop /* B2DB0 8011C6B0 460A2100 */ add.s $f4, $f4, $f10 /* B2DB4 8011C6B4 46081080 */ add.s $f2, $f2, $f8 /* B2DB8 8011C6B8 46002100 */ add.s $f4, $f4, $f0 @@ -245,20 +245,20 @@ glabel func_8011C32C /* B2DD4 8011C6D4 46006186 */ mov.s $f6, $f12 .L8011C6D8: /* B2DD8 8011C6D8 460AF002 */ mul.s $f0, $f30, $f10 -/* B2DDC 8011C6DC 00000000 */ nop +/* B2DDC 8011C6DC 00000000 */ nop /* B2DE0 8011C6E0 460AC082 */ mul.s $f2, $f24, $f10 -/* B2DE4 8011C6E4 00000000 */ nop +/* B2DE4 8011C6E4 00000000 */ nop /* B2DE8 8011C6E8 C7B60040 */ lwc1 $f22, 0x40($sp) /* B2DEC 8011C6EC 4606B102 */ mul.s $f4, $f22, $f6 -/* B2DF0 8011C6F0 00000000 */ nop +/* B2DF0 8011C6F0 00000000 */ nop /* B2DF4 8011C6F4 4606D182 */ mul.s $f6, $f26, $f6 -/* B2DF8 8011C6F8 00000000 */ nop +/* B2DF8 8011C6F8 00000000 */ nop /* B2DFC 8011C6FC 46040000 */ add.s $f0, $f0, $f4 /* B2E00 8011C700 46061080 */ add.s $f2, $f2, $f6 /* B2E04 8011C704 C7BC002C */ lwc1 $f28, 0x2c($sp) /* B2E08 8011C708 461C0100 */ add.s $f4, $f0, $f28 /* B2E0C 8011C70C 4612203C */ c.lt.s $f4, $f18 -/* B2E10 8011C710 00000000 */ nop +/* B2E10 8011C710 00000000 */ nop /* B2E14 8011C714 45000004 */ bc1f .L8011C728 /* B2E18 8011C718 46141080 */ add.s $f2, $f2, $f20 /* B2E1C 8011C71C 46002021 */ cvt.d.s $f0, $f4 @@ -266,26 +266,26 @@ glabel func_8011C32C /* B2E24 8011C724 46300001 */ sub.d $f0, $f0, $f16 .L8011C728: /* B2E28 8011C728 4604903C */ c.lt.s $f18, $f4 -/* B2E2C 8011C72C 00000000 */ nop +/* B2E2C 8011C72C 00000000 */ nop /* B2E30 8011C730 45000004 */ bc1f .L8011C744 -/* B2E34 8011C734 00000000 */ nop +/* B2E34 8011C734 00000000 */ nop /* B2E38 8011C738 46002021 */ cvt.d.s $f0, $f4 /* B2E3C 8011C73C 46300000 */ add.d $f0, $f0, $f16 .L8011C740: /* B2E40 8011C740 46200120 */ cvt.s.d $f4, $f0 .L8011C744: /* B2E44 8011C744 4612103C */ c.lt.s $f2, $f18 -/* B2E48 8011C748 00000000 */ nop +/* B2E48 8011C748 00000000 */ nop /* B2E4C 8011C74C 45000004 */ bc1f .L8011C760 -/* B2E50 8011C750 00000000 */ nop +/* B2E50 8011C750 00000000 */ nop /* B2E54 8011C754 46001021 */ cvt.d.s $f0, $f2 /* B2E58 8011C758 080471DE */ j .L8011C778 /* B2E5C 8011C75C 46300001 */ sub.d $f0, $f0, $f16 .L8011C760: /* B2E60 8011C760 4602903C */ c.lt.s $f18, $f2 -/* B2E64 8011C764 00000000 */ nop +/* B2E64 8011C764 00000000 */ nop /* B2E68 8011C768 45000004 */ bc1f .L8011C77C -/* B2E6C 8011C76C 00000000 */ nop +/* B2E6C 8011C76C 00000000 */ nop /* B2E70 8011C770 46001021 */ cvt.d.s $f0, $f2 /* B2E74 8011C774 46300000 */ add.d $f0, $f0, $f16 .L8011C778: @@ -294,13 +294,13 @@ glabel func_8011C32C /* B2E7C 8011C77C 8FA3001C */ lw $v1, 0x1c($sp) /* B2E80 8011C780 4600258D */ trunc.w.s $f22, $f4 /* B2E84 8011C784 4402B000 */ mfc1 $v0, $f22 -/* B2E88 8011C788 00000000 */ nop +/* B2E88 8011C788 00000000 */ nop /* B2E8C 8011C78C A4620008 */ sh $v0, 8($v1) /* B2E90 8011C790 A073000C */ sb $s3, 0xc($v1) /* B2E94 8011C794 8FA4001C */ lw $a0, 0x1c($sp) /* B2E98 8011C798 4600158D */ trunc.w.s $f22, $f2 /* B2E9C 8011C79C 4402B000 */ mfc1 $v0, $f22 -/* B2EA0 8011C7A0 00000000 */ nop +/* B2EA0 8011C7A0 00000000 */ nop /* B2EA4 8011C7A4 A462000A */ sh $v0, 0xa($v1) /* B2EA8 8011C7A8 A092000D */ sb $s2, 0xd($a0) /* B2EAC 8011C7AC 8FA2001C */ lw $v0, 0x1c($sp) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C80C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C80C.s index c58afd35aa..dfd9cd6181 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C80C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C80C.s @@ -56,9 +56,9 @@ glabel func_8011C80C /* B2FD8 8011C8D8 27C400D4 */ addiu $a0, $fp, 0xd4 /* B2FDC 8011C8DC C7A00034 */ lwc1 $f0, 0x34($sp) /* B2FE0 8011C8E0 44809000 */ mtc1 $zero, $f18 -/* B2FE4 8011C8E4 00000000 */ nop +/* B2FE4 8011C8E4 00000000 */ nop /* B2FE8 8011C8E8 46120032 */ c.eq.s $f0, $f18 -/* B2FEC 8011C8EC 00000000 */ nop +/* B2FEC 8011C8EC 00000000 */ nop /* B2FF0 8011C8F0 45000004 */ bc1f .L8011C904 /* B2FF4 8011C8F4 24020001 */ addiu $v0, $zero, 1 /* B2FF8 8011C8F8 E6120000 */ swc1 $f18, ($s0) @@ -68,37 +68,37 @@ glabel func_8011C80C /* B3004 8011C904 C7AC0030 */ lwc1 $f12, 0x30($sp) /* B3008 8011C908 4600A383 */ div.s $f14, $f20, $f0 /* B300C 8011C90C 460E6302 */ mul.s $f12, $f12, $f14 -/* B3010 8011C910 00000000 */ nop +/* B3010 8011C910 00000000 */ nop /* B3014 8011C914 46146080 */ add.s $f2, $f12, $f20 /* B3018 8011C918 3C013FE0 */ lui $at, 0x3fe0 /* B301C 8011C91C 44814800 */ mtc1 $at, $f9 /* B3020 8011C920 44804000 */ mtc1 $zero, $f8 /* B3024 8011C924 460010A1 */ cvt.d.s $f2, $f2 /* B3028 8011C928 46281082 */ mul.d $f2, $f2, $f8 -/* B302C 8011C92C 00000000 */ nop +/* B302C 8011C92C 00000000 */ nop /* B3030 8011C930 C7B00028 */ lwc1 $f16, 0x28($sp) /* B3034 8011C934 460E8402 */ mul.s $f16, $f16, $f14 -/* B3038 8011C938 00000000 */ nop +/* B3038 8011C938 00000000 */ nop /* B303C 8011C93C 87C2000A */ lh $v0, 0xa($fp) /* B3040 8011C940 44820000 */ mtc1 $v0, $f0 -/* B3044 8011C944 00000000 */ nop +/* B3044 8011C944 00000000 */ nop /* B3048 8011C948 46800020 */ cvt.s.w $f0, $f0 /* B304C 8011C94C 46008102 */ mul.s $f4, $f16, $f0 -/* B3050 8011C950 00000000 */ nop +/* B3050 8011C950 00000000 */ nop /* B3054 8011C954 46002100 */ add.s $f4, $f4, $f0 /* B3058 8011C958 46002121 */ cvt.d.s $f4, $f4 /* B305C 8011C95C 46282102 */ mul.d $f4, $f4, $f8 -/* B3060 8011C960 00000000 */ nop +/* B3060 8011C960 00000000 */ nop /* B3064 8011C964 C7A6002C */ lwc1 $f6, 0x2c($sp) /* B3068 8011C968 46007007 */ neg.s $f0, $f14 /* B306C 8011C96C 46003182 */ mul.s $f6, $f6, $f0 -/* B3070 8011C970 00000000 */ nop +/* B3070 8011C970 00000000 */ nop /* B3074 8011C974 87C2000C */ lh $v0, 0xc($fp) /* B3078 8011C978 44825000 */ mtc1 $v0, $f10 -/* B307C 8011C97C 00000000 */ nop +/* B307C 8011C97C 00000000 */ nop /* B3080 8011C980 468052A0 */ cvt.s.w $f10, $f10 /* B3084 8011C984 460A3002 */ mul.s $f0, $f6, $f10 -/* B3088 8011C988 00000000 */ nop +/* B3088 8011C988 00000000 */ nop /* B308C 8011C98C E7AE0034 */ swc1 $f14, 0x34($sp) /* B3090 8011C990 E7B00028 */ swc1 $f16, 0x28($sp) /* B3094 8011C994 E7AC0030 */ swc1 $f12, 0x30($sp) @@ -107,18 +107,18 @@ glabel func_8011C80C /* B30A0 8011C9A0 462010A0 */ cvt.s.d $f2, $f2 /* B30A4 8011C9A4 46000021 */ cvt.d.s $f0, $f0 /* B30A8 8011C9A8 46280002 */ mul.d $f0, $f0, $f8 -/* B30AC 8011C9AC 00000000 */ nop +/* B30AC 8011C9AC 00000000 */ nop /* B30B0 8011C9B0 E7A20030 */ swc1 $f2, 0x30($sp) /* B30B4 8011C9B4 87C2000E */ lh $v0, 0xe($fp) /* B30B8 8011C9B8 44821000 */ mtc1 $v0, $f2 -/* B30BC 8011C9BC 00000000 */ nop +/* B30BC 8011C9BC 00000000 */ nop /* B30C0 8011C9C0 468010A0 */ cvt.s.w $f2, $f2 /* B30C4 8011C9C4 46202120 */ cvt.s.d $f4, $f4 /* B30C8 8011C9C8 E7A40028 */ swc1 $f4, 0x28($sp) /* B30CC 8011C9CC 87C20010 */ lh $v0, 0x10($fp) /* B30D0 8011C9D0 46022100 */ add.s $f4, $f4, $f2 /* B30D4 8011C9D4 44821000 */ mtc1 $v0, $f2 -/* B30D8 8011C9D8 00000000 */ nop +/* B30D8 8011C9D8 00000000 */ nop /* B30DC 8011C9DC 468010A0 */ cvt.s.w $f2, $f2 /* B30E0 8011C9E0 4600258D */ trunc.w.s $f22, $f4 /* B30E4 8011C9E4 4402B000 */ mfc1 $v0, $f22 @@ -127,24 +127,24 @@ glabel func_8011C80C /* B30F0 8011C9F0 46020080 */ add.s $f2, $f0, $f2 /* B30F4 8011C9F4 E7A0002C */ swc1 $f0, 0x2c($sp) /* B30F8 8011C9F8 44820000 */ mtc1 $v0, $f0 -/* B30FC 8011C9FC 00000000 */ nop +/* B30FC 8011C9FC 00000000 */ nop /* B3100 8011CA00 46800020 */ cvt.s.w $f0, $f0 /* B3104 8011CA04 E7A2002C */ swc1 $f2, 0x2c($sp) /* B3108 8011CA08 E6000000 */ swc1 $f0, ($s0) /* B310C 8011CA0C C7A0002C */ lwc1 $f0, 0x2c($sp) /* B3110 8011CA10 4600058D */ trunc.w.s $f22, $f0 /* B3114 8011CA14 4402B000 */ mfc1 $v0, $f22 -/* B3118 8011CA18 00000000 */ nop +/* B3118 8011CA18 00000000 */ nop /* B311C 8011CA1C 44820000 */ mtc1 $v0, $f0 -/* B3120 8011CA20 00000000 */ nop +/* B3120 8011CA20 00000000 */ nop /* B3124 8011CA24 46800020 */ cvt.s.w $f0, $f0 /* B3128 8011CA28 E6200000 */ swc1 $f0, ($s1) /* B312C 8011CA2C 8FA8007C */ lw $t0, 0x7c($sp) /* B3130 8011CA30 05010008 */ bgez $t0, .L8011CA54 -/* B3134 8011CA34 00000000 */ nop +/* B3134 8011CA34 00000000 */ nop /* B3138 8011CA38 C7A00030 */ lwc1 $f0, 0x30($sp) /* B313C 8011CA3C 4600903C */ c.lt.s $f18, $f0 -/* B3140 8011CA40 00000000 */ nop +/* B3140 8011CA40 00000000 */ nop /* B3144 8011CA44 4501014F */ bc1t .L8011CF84 /* B3148 8011CA48 0000102D */ daddu $v0, $zero, $zero /* B314C 8011CA4C 080473E1 */ j .L8011CF84 @@ -152,26 +152,26 @@ glabel func_8011C80C .L8011CA54: /* B3154 8011CA54 C7A40028 */ lwc1 $f4, 0x28($sp) /* B3158 8011CA58 4604903E */ c.le.s $f18, $f4 -/* B315C 8011CA5C 00000000 */ nop +/* B315C 8011CA5C 00000000 */ nop /* B3160 8011CA60 45000140 */ bc1f .L8011CF64 -/* B3164 8011CA64 00000000 */ nop +/* B3164 8011CA64 00000000 */ nop /* B3168 8011CA68 C7A2002C */ lwc1 $f2, 0x2c($sp) /* B316C 8011CA6C 4602903E */ c.le.s $f18, $f2 -/* B3170 8011CA70 00000000 */ nop +/* B3170 8011CA70 00000000 */ nop /* B3174 8011CA74 4500013B */ bc1f .L8011CF64 -/* B3178 8011CA78 00000000 */ nop +/* B3178 8011CA78 00000000 */ nop /* B317C 8011CA7C 3C0143A0 */ lui $at, 0x43a0 /* B3180 8011CA80 44810000 */ mtc1 $at, $f0 -/* B3184 8011CA84 00000000 */ nop +/* B3184 8011CA84 00000000 */ nop /* B3188 8011CA88 4600203C */ c.lt.s $f4, $f0 -/* B318C 8011CA8C 00000000 */ nop +/* B318C 8011CA8C 00000000 */ nop /* B3190 8011CA90 45000134 */ bc1f .L8011CF64 -/* B3194 8011CA94 00000000 */ nop +/* B3194 8011CA94 00000000 */ nop /* B3198 8011CA98 3C014370 */ lui $at, 0x4370 /* B319C 8011CA9C 44810000 */ mtc1 $at, $f0 -/* B31A0 8011CAA0 00000000 */ nop +/* B31A0 8011CAA0 00000000 */ nop /* B31A4 8011CAA4 4600103C */ c.lt.s $f2, $f0 -/* B31A8 8011CAA8 00000000 */ nop +/* B31A8 8011CAA8 00000000 */ nop /* B31AC 8011CAAC 4500012D */ bc1f .L8011CF64 /* B31B0 8011CAB0 3C05FD10 */ lui $a1, 0xfd10 /* B31B4 8011CAB4 3C11800A */ lui $s1, %hi(gMasterGfxPos) @@ -179,7 +179,7 @@ glabel func_8011C80C /* B31BC 8011CABC 34A5013F */ ori $a1, $a1, 0x13f /* B31C0 8011CAC0 4600158D */ trunc.w.s $f22, $f2 /* B31C4 8011CAC4 4402B000 */ mfc1 $v0, $f22 -/* B31C8 8011CAC8 00000000 */ nop +/* B31C8 8011CAC8 00000000 */ nop /* B31CC 8011CACC 00022080 */ sll $a0, $v0, 2 /* B31D0 8011CAD0 00822021 */ addu $a0, $a0, $v0 /* B31D4 8011CAD4 000421C0 */ sll $a0, $a0, 7 @@ -250,7 +250,7 @@ glabel func_8011C80C /* B32D8 8011CBD8 3C02F400 */ lui $v0, 0xf400 /* B32DC 8011CBDC 4600058D */ trunc.w.s $f22, $f0 /* B32E0 8011CBE0 4405B000 */ mfc1 $a1, $f22 -/* B32E4 8011CBE4 00000000 */ nop +/* B32E4 8011CBE4 00000000 */ nop /* B32E8 8011CBE8 00052080 */ sll $a0, $a1, 2 /* B32EC 8011CBEC 30840FFF */ andi $a0, $a0, 0xfff /* B32F0 8011CBF0 00042300 */ sll $a0, $a0, 0xc @@ -347,7 +347,7 @@ glabel func_8011C80C /* B345C 8011CD5C C7A0007C */ lwc1 $f0, 0x7c($sp) /* B3460 8011CD60 46800020 */ cvt.s.w $f0, $f0 /* B3464 8011CD64 46140002 */ mul.s $f0, $f0, $f20 -/* B3468 8011CD68 00000000 */ nop +/* B3468 8011CD68 00000000 */ nop /* B346C 8011CD6C 00052D40 */ sll $a1, $a1, 0x15 /* B3470 8011CD70 260200A8 */ addiu $v0, $s0, 0xa8 /* B3474 8011CD74 AE05009C */ sw $a1, 0x9c($s0) @@ -358,17 +358,17 @@ glabel func_8011C80C /* B3488 8011CD88 37390400 */ ori $t9, $t9, 0x400 /* B348C 8011CD8C 25030001 */ addiu $v1, $t0, 1 /* B3490 8011CD90 44830000 */ mtc1 $v1, $f0 -/* B3494 8011CD94 00000000 */ nop +/* B3494 8011CD94 00000000 */ nop /* B3498 8011CD98 46800020 */ cvt.s.w $f0, $f0 /* B349C 8011CD9C 46140002 */ mul.s $f0, $f0, $f20 -/* B34A0 8011CDA0 00000000 */ nop +/* B34A0 8011CDA0 00000000 */ nop /* B34A4 8011CDA4 30420FFF */ andi $v0, $v0, 0xfff /* B34A8 8011CDA8 00021300 */ sll $v0, $v0, 0xc /* B34AC 8011CDAC 00521025 */ or $v0, $v0, $s2 /* B34B0 8011CDB0 AE020088 */ sw $v0, 0x88($s0) /* B34B4 8011CDB4 4600058D */ trunc.w.s $f22, $f0 /* B34B8 8011CDB8 4402B000 */ mfc1 $v0, $f22 -/* B34BC 8011CDBC 00000000 */ nop +/* B34BC 8011CDBC 00000000 */ nop /* B34C0 8011CDC0 30420FFF */ andi $v0, $v0, 0xfff /* B34C4 8011CDC4 00021300 */ sll $v0, $v0, 0xc /* B34C8 8011CDC8 34420004 */ ori $v0, $v0, 4 @@ -393,25 +393,25 @@ glabel func_8011C80C /* B3514 8011CE14 AC400004 */ sw $zero, 4($v0) /* B3518 8011CE18 87C2000E */ lh $v0, 0xe($fp) /* B351C 8011CE1C 44820000 */ mtc1 $v0, $f0 -/* B3520 8011CE20 00000000 */ nop +/* B3520 8011CE20 00000000 */ nop /* B3524 8011CE24 46800020 */ cvt.s.w $f0, $f0 /* B3528 8011CE28 46140002 */ mul.s $f0, $f0, $f20 -/* B352C 8011CE2C 00000000 */ nop +/* B352C 8011CE2C 00000000 */ nop /* B3530 8011CE30 87C20010 */ lh $v0, 0x10($fp) /* B3534 8011CE34 44821000 */ mtc1 $v0, $f2 -/* B3538 8011CE38 00000000 */ nop +/* B3538 8011CE38 00000000 */ nop /* B353C 8011CE3C 468010A0 */ cvt.s.w $f2, $f2 /* B3540 8011CE40 46141082 */ mul.s $f2, $f2, $f20 -/* B3544 8011CE44 00000000 */ nop +/* B3544 8011CE44 00000000 */ nop /* B3548 8011CE48 24840008 */ addiu $a0, $a0, 8 /* B354C 8011CE4C 4600058D */ trunc.w.s $f22, $f0 /* B3550 8011CE50 4403B000 */ mfc1 $v1, $f22 -/* B3554 8011CE54 00000000 */ nop +/* B3554 8011CE54 00000000 */ nop /* B3558 8011CE58 30630FFF */ andi $v1, $v1, 0xfff /* B355C 8011CE5C 00031B00 */ sll $v1, $v1, 0xc /* B3560 8011CE60 4600158D */ trunc.w.s $f22, $f2 /* B3564 8011CE64 4402B000 */ mfc1 $v0, $f22 -/* B3568 8011CE68 00000000 */ nop +/* B3568 8011CE68 00000000 */ nop /* B356C 8011CE6C 30420FFF */ andi $v0, $v0, 0xfff /* B3570 8011CE70 00521025 */ or $v0, $v0, $s2 /* B3574 8011CE74 00621825 */ or $v1, $v1, $v0 @@ -420,27 +420,27 @@ glabel func_8011C80C /* B3580 8011CE80 87C3000A */ lh $v1, 0xa($fp) /* B3584 8011CE84 00431021 */ addu $v0, $v0, $v1 /* B3588 8011CE88 44821000 */ mtc1 $v0, $f2 -/* B358C 8011CE8C 00000000 */ nop +/* B358C 8011CE8C 00000000 */ nop /* B3590 8011CE90 468010A0 */ cvt.s.w $f2, $f2 /* B3594 8011CE94 46141082 */ mul.s $f2, $f2, $f20 -/* B3598 8011CE98 00000000 */ nop +/* B3598 8011CE98 00000000 */ nop /* B359C 8011CE9C 87C20010 */ lh $v0, 0x10($fp) /* B35A0 8011CEA0 87C3000C */ lh $v1, 0xc($fp) /* B35A4 8011CEA4 00431021 */ addu $v0, $v0, $v1 /* B35A8 8011CEA8 44820000 */ mtc1 $v0, $f0 -/* B35AC 8011CEAC 00000000 */ nop +/* B35AC 8011CEAC 00000000 */ nop /* B35B0 8011CEB0 46800020 */ cvt.s.w $f0, $f0 /* B35B4 8011CEB4 46140002 */ mul.s $f0, $f0, $f20 -/* B35B8 8011CEB8 00000000 */ nop +/* B35B8 8011CEB8 00000000 */ nop /* B35BC 8011CEBC AE240000 */ sw $a0, ($s1) /* B35C0 8011CEC0 4600158D */ trunc.w.s $f22, $f2 /* B35C4 8011CEC4 4402B000 */ mfc1 $v0, $f22 -/* B35C8 8011CEC8 00000000 */ nop +/* B35C8 8011CEC8 00000000 */ nop /* B35CC 8011CECC 30420FFF */ andi $v0, $v0, 0xfff /* B35D0 8011CED0 00021300 */ sll $v0, $v0, 0xc /* B35D4 8011CED4 4600058D */ trunc.w.s $f22, $f0 /* B35D8 8011CED8 4403B000 */ mfc1 $v1, $f22 -/* B35DC 8011CEDC 00000000 */ nop +/* B35DC 8011CEDC 00000000 */ nop /* B35E0 8011CEE0 30630FFF */ andi $v1, $v1, 0xfff /* B35E4 8011CEE4 00431025 */ or $v0, $v0, $v1 /* B35E8 8011CEE8 AC820004 */ sw $v0, 4($a0) @@ -462,7 +462,7 @@ glabel func_8011C80C /* B3628 8011CF28 000318C0 */ sll $v1, $v1, 3 /* B362C 8011CF2C 00641821 */ addu $v1, $v1, $a0 /* B3630 8011CF30 46001082 */ mul.s $f2, $f2, $f0 -/* B3634 8011CF34 00000000 */ nop +/* B3634 8011CF34 00000000 */ nop /* B3638 8011CF38 8C640000 */ lw $a0, ($v1) /* B363C 8011CF3C 8C630004 */ lw $v1, 4($v1) /* B3640 8011CF40 00821004 */ sllv $v0, $v0, $a0 @@ -470,16 +470,16 @@ glabel func_8011C80C /* B3648 8011CF48 000210C2 */ srl $v0, $v0, 3 /* B364C 8011CF4C 4600158D */ trunc.w.s $f22, $f2 /* B3650 8011CF50 4403B000 */ mfc1 $v1, $f22 -/* B3654 8011CF54 00000000 */ nop +/* B3654 8011CF54 00000000 */ nop /* B3658 8011CF58 0043102B */ sltu $v0, $v0, $v1 /* B365C 8011CF5C 14400009 */ bnez $v0, .L8011CF84 /* B3660 8011CF60 0000102D */ daddu $v0, $zero, $zero .L8011CF64: /* B3664 8011CF64 C7A20030 */ lwc1 $f2, 0x30($sp) /* B3668 8011CF68 44800000 */ mtc1 $zero, $f0 -/* B366C 8011CF6C 00000000 */ nop +/* B366C 8011CF6C 00000000 */ nop /* B3670 8011CF70 4602003C */ c.lt.s $f0, $f2 -/* B3674 8011CF74 00000000 */ nop +/* B3674 8011CF74 00000000 */ nop /* B3678 8011CF78 45010002 */ bc1t .L8011CF84 /* B367C 8011CF7C 24020001 */ addiu $v0, $zero, 1 .L8011CF80: diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011CFBC.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011CFBC.s index a6086b634f..4840d823dd 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011CFBC.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011CFBC.s @@ -51,9 +51,9 @@ glabel func_8011CFBC /* B3774 8011D074 E7B40010 */ swc1 $f20, 0x10($sp) /* B3778 8011D078 C7A00034 */ lwc1 $f0, 0x34($sp) /* B377C 8011D07C 44809000 */ mtc1 $zero, $f18 -/* B3780 8011D080 00000000 */ nop +/* B3780 8011D080 00000000 */ nop /* B3784 8011D084 46120032 */ c.eq.s $f0, $f18 -/* B3788 8011D088 00000000 */ nop +/* B3788 8011D088 00000000 */ nop /* B378C 8011D08C 45000004 */ bc1f .L8011D0A0 /* B3790 8011D090 24020001 */ addiu $v0, $zero, 1 /* B3794 8011D094 E6120000 */ swc1 $f18, ($s0) @@ -63,37 +63,37 @@ glabel func_8011CFBC /* B37A0 8011D0A0 C7AC0030 */ lwc1 $f12, 0x30($sp) /* B37A4 8011D0A4 4600A383 */ div.s $f14, $f20, $f0 /* B37A8 8011D0A8 460E6302 */ mul.s $f12, $f12, $f14 -/* B37AC 8011D0AC 00000000 */ nop +/* B37AC 8011D0AC 00000000 */ nop /* B37B0 8011D0B0 46146080 */ add.s $f2, $f12, $f20 /* B37B4 8011D0B4 3C013FE0 */ lui $at, 0x3fe0 /* B37B8 8011D0B8 44814800 */ mtc1 $at, $f9 /* B37BC 8011D0BC 44804000 */ mtc1 $zero, $f8 /* B37C0 8011D0C0 460010A1 */ cvt.d.s $f2, $f2 /* B37C4 8011D0C4 46281082 */ mul.d $f2, $f2, $f8 -/* B37C8 8011D0C8 00000000 */ nop +/* B37C8 8011D0C8 00000000 */ nop /* B37CC 8011D0CC C7B00028 */ lwc1 $f16, 0x28($sp) /* B37D0 8011D0D0 460E8402 */ mul.s $f16, $f16, $f14 -/* B37D4 8011D0D4 00000000 */ nop +/* B37D4 8011D0D4 00000000 */ nop /* B37D8 8011D0D8 87C2000A */ lh $v0, 0xa($fp) /* B37DC 8011D0DC 44820000 */ mtc1 $v0, $f0 -/* B37E0 8011D0E0 00000000 */ nop +/* B37E0 8011D0E0 00000000 */ nop /* B37E4 8011D0E4 46800020 */ cvt.s.w $f0, $f0 /* B37E8 8011D0E8 46008102 */ mul.s $f4, $f16, $f0 -/* B37EC 8011D0EC 00000000 */ nop +/* B37EC 8011D0EC 00000000 */ nop /* B37F0 8011D0F0 46002100 */ add.s $f4, $f4, $f0 /* B37F4 8011D0F4 46002121 */ cvt.d.s $f4, $f4 /* B37F8 8011D0F8 46282102 */ mul.d $f4, $f4, $f8 -/* B37FC 8011D0FC 00000000 */ nop +/* B37FC 8011D0FC 00000000 */ nop /* B3800 8011D100 C7A6002C */ lwc1 $f6, 0x2c($sp) /* B3804 8011D104 46007007 */ neg.s $f0, $f14 /* B3808 8011D108 46003182 */ mul.s $f6, $f6, $f0 -/* B380C 8011D10C 00000000 */ nop +/* B380C 8011D10C 00000000 */ nop /* B3810 8011D110 87C2000C */ lh $v0, 0xc($fp) /* B3814 8011D114 44825000 */ mtc1 $v0, $f10 -/* B3818 8011D118 00000000 */ nop +/* B3818 8011D118 00000000 */ nop /* B381C 8011D11C 468052A0 */ cvt.s.w $f10, $f10 /* B3820 8011D120 460A3002 */ mul.s $f0, $f6, $f10 -/* B3824 8011D124 00000000 */ nop +/* B3824 8011D124 00000000 */ nop /* B3828 8011D128 E7AE0034 */ swc1 $f14, 0x34($sp) /* B382C 8011D12C E7B00028 */ swc1 $f16, 0x28($sp) /* B3830 8011D130 E7AC0030 */ swc1 $f12, 0x30($sp) @@ -102,18 +102,18 @@ glabel func_8011CFBC /* B383C 8011D13C 462010A0 */ cvt.s.d $f2, $f2 /* B3840 8011D140 46000021 */ cvt.d.s $f0, $f0 /* B3844 8011D144 46280002 */ mul.d $f0, $f0, $f8 -/* B3848 8011D148 00000000 */ nop +/* B3848 8011D148 00000000 */ nop /* B384C 8011D14C E7A20030 */ swc1 $f2, 0x30($sp) /* B3850 8011D150 87C2000E */ lh $v0, 0xe($fp) /* B3854 8011D154 44821000 */ mtc1 $v0, $f2 -/* B3858 8011D158 00000000 */ nop +/* B3858 8011D158 00000000 */ nop /* B385C 8011D15C 468010A0 */ cvt.s.w $f2, $f2 /* B3860 8011D160 46202120 */ cvt.s.d $f4, $f4 /* B3864 8011D164 E7A40028 */ swc1 $f4, 0x28($sp) /* B3868 8011D168 87C20010 */ lh $v0, 0x10($fp) /* B386C 8011D16C 46022100 */ add.s $f4, $f4, $f2 /* B3870 8011D170 44821000 */ mtc1 $v0, $f2 -/* B3874 8011D174 00000000 */ nop +/* B3874 8011D174 00000000 */ nop /* B3878 8011D178 468010A0 */ cvt.s.w $f2, $f2 /* B387C 8011D17C 46200020 */ cvt.s.d $f0, $f0 /* B3880 8011D180 46020080 */ add.s $f2, $f0, $f2 @@ -129,30 +129,30 @@ glabel func_8011CFBC /* B38A8 8011D1A8 C7A00030 */ lwc1 $f0, 0x30($sp) /* B38AC 8011D1AC 4600903C */ c.lt.s $f18, $f0 /* B38B0 8011D1B0 080475BA */ j .L8011D6E8 -/* B38B4 8011D1B4 00000000 */ nop +/* B38B4 8011D1B4 00000000 */ nop .L8011D1B8: /* B38B8 8011D1B8 C7A40028 */ lwc1 $f4, 0x28($sp) /* B38BC 8011D1BC 4604903E */ c.le.s $f18, $f4 -/* B38C0 8011D1C0 00000000 */ nop +/* B38C0 8011D1C0 00000000 */ nop /* B38C4 8011D1C4 45000143 */ bc1f .L8011D6D4 -/* B38C8 8011D1C8 00000000 */ nop +/* B38C8 8011D1C8 00000000 */ nop /* B38CC 8011D1CC C7A2002C */ lwc1 $f2, 0x2c($sp) /* B38D0 8011D1D0 4602903E */ c.le.s $f18, $f2 -/* B38D4 8011D1D4 00000000 */ nop +/* B38D4 8011D1D4 00000000 */ nop /* B38D8 8011D1D8 4500013E */ bc1f .L8011D6D4 -/* B38DC 8011D1DC 00000000 */ nop +/* B38DC 8011D1DC 00000000 */ nop /* B38E0 8011D1E0 3C0143A0 */ lui $at, 0x43a0 /* B38E4 8011D1E4 44810000 */ mtc1 $at, $f0 -/* B38E8 8011D1E8 00000000 */ nop +/* B38E8 8011D1E8 00000000 */ nop /* B38EC 8011D1EC 4600203C */ c.lt.s $f4, $f0 -/* B38F0 8011D1F0 00000000 */ nop +/* B38F0 8011D1F0 00000000 */ nop /* B38F4 8011D1F4 45000137 */ bc1f .L8011D6D4 -/* B38F8 8011D1F8 00000000 */ nop +/* B38F8 8011D1F8 00000000 */ nop /* B38FC 8011D1FC 3C014370 */ lui $at, 0x4370 /* B3900 8011D200 44810000 */ mtc1 $at, $f0 -/* B3904 8011D204 00000000 */ nop +/* B3904 8011D204 00000000 */ nop /* B3908 8011D208 4600103C */ c.lt.s $f2, $f0 -/* B390C 8011D20C 00000000 */ nop +/* B390C 8011D20C 00000000 */ nop /* B3910 8011D210 45000130 */ bc1f .L8011D6D4 /* B3914 8011D214 3C05FD10 */ lui $a1, 0xfd10 /* B3918 8011D218 3C11800A */ lui $s1, %hi(gMasterGfxPos) @@ -160,7 +160,7 @@ glabel func_8011CFBC /* B3920 8011D220 34A5013F */ ori $a1, $a1, 0x13f /* B3924 8011D224 4600158D */ trunc.w.s $f22, $f2 /* B3928 8011D228 4402B000 */ mfc1 $v0, $f22 -/* B392C 8011D22C 00000000 */ nop +/* B392C 8011D22C 00000000 */ nop /* B3930 8011D230 00022080 */ sll $a0, $v0, 2 /* B3934 8011D234 00822021 */ addu $a0, $a0, $v0 /* B3938 8011D238 000421C0 */ sll $a0, $a0, 7 @@ -232,7 +232,7 @@ glabel func_8011CFBC /* B3A40 8011D340 3C02F400 */ lui $v0, 0xf400 /* B3A44 8011D344 4600058D */ trunc.w.s $f22, $f0 /* B3A48 8011D348 4405B000 */ mfc1 $a1, $f22 -/* B3A4C 8011D34C 00000000 */ nop +/* B3A4C 8011D34C 00000000 */ nop /* B3A50 8011D350 00052080 */ sll $a0, $a1, 2 /* B3A54 8011D354 30840FFF */ andi $a0, $a0, 0xfff /* B3A58 8011D358 00042300 */ sll $a0, $a0, 0xc @@ -334,7 +334,7 @@ glabel func_8011CFBC /* B3BD8 8011D4D8 C7A00084 */ lwc1 $f0, 0x84($sp) /* B3BDC 8011D4DC 46800020 */ cvt.s.w $f0, $f0 /* B3BE0 8011D4E0 46140002 */ mul.s $f0, $f0, $f20 -/* B3BE4 8011D4E4 00000000 */ nop +/* B3BE4 8011D4E4 00000000 */ nop /* B3BE8 8011D4E8 00052D40 */ sll $a1, $a1, 0x15 /* B3BEC 8011D4EC 260200A8 */ addiu $v0, $s0, 0xa8 /* B3BF0 8011D4F0 AE05009C */ sw $a1, 0x9c($s0) @@ -342,17 +342,17 @@ glabel func_8011CFBC /* B3BF8 8011D4F8 4600058D */ trunc.w.s $f22, $f0 /* B3BFC 8011D4FC 4402B000 */ mfc1 $v0, $f22 /* B3C00 8011D500 44830000 */ mtc1 $v1, $f0 -/* B3C04 8011D504 00000000 */ nop +/* B3C04 8011D504 00000000 */ nop /* B3C08 8011D508 46800020 */ cvt.s.w $f0, $f0 /* B3C0C 8011D50C 46140002 */ mul.s $f0, $f0, $f20 -/* B3C10 8011D510 00000000 */ nop +/* B3C10 8011D510 00000000 */ nop /* B3C14 8011D514 30420FFF */ andi $v0, $v0, 0xfff /* B3C18 8011D518 00021300 */ sll $v0, $v0, 0xc /* B3C1C 8011D51C 00521025 */ or $v0, $v0, $s2 /* B3C20 8011D520 AE020088 */ sw $v0, 0x88($s0) /* B3C24 8011D524 4600058D */ trunc.w.s $f22, $f0 /* B3C28 8011D528 4402B000 */ mfc1 $v0, $f22 -/* B3C2C 8011D52C 00000000 */ nop +/* B3C2C 8011D52C 00000000 */ nop /* B3C30 8011D530 30420FFF */ andi $v0, $v0, 0xfff /* B3C34 8011D534 00021300 */ sll $v0, $v0, 0xc /* B3C38 8011D538 34420004 */ ori $v0, $v0, 4 @@ -377,25 +377,25 @@ glabel func_8011CFBC /* B3C84 8011D584 AC400004 */ sw $zero, 4($v0) /* B3C88 8011D588 87C2000E */ lh $v0, 0xe($fp) /* B3C8C 8011D58C 44820000 */ mtc1 $v0, $f0 -/* B3C90 8011D590 00000000 */ nop +/* B3C90 8011D590 00000000 */ nop /* B3C94 8011D594 46800020 */ cvt.s.w $f0, $f0 /* B3C98 8011D598 46140002 */ mul.s $f0, $f0, $f20 -/* B3C9C 8011D59C 00000000 */ nop +/* B3C9C 8011D59C 00000000 */ nop /* B3CA0 8011D5A0 87C20010 */ lh $v0, 0x10($fp) /* B3CA4 8011D5A4 44821000 */ mtc1 $v0, $f2 -/* B3CA8 8011D5A8 00000000 */ nop +/* B3CA8 8011D5A8 00000000 */ nop /* B3CAC 8011D5AC 468010A0 */ cvt.s.w $f2, $f2 /* B3CB0 8011D5B0 46141082 */ mul.s $f2, $f2, $f20 -/* B3CB4 8011D5B4 00000000 */ nop +/* B3CB4 8011D5B4 00000000 */ nop /* B3CB8 8011D5B8 24840008 */ addiu $a0, $a0, 8 /* B3CBC 8011D5BC 4600058D */ trunc.w.s $f22, $f0 /* B3CC0 8011D5C0 4403B000 */ mfc1 $v1, $f22 -/* B3CC4 8011D5C4 00000000 */ nop +/* B3CC4 8011D5C4 00000000 */ nop /* B3CC8 8011D5C8 30630FFF */ andi $v1, $v1, 0xfff /* B3CCC 8011D5CC 00031B00 */ sll $v1, $v1, 0xc /* B3CD0 8011D5D0 4600158D */ trunc.w.s $f22, $f2 /* B3CD4 8011D5D4 4402B000 */ mfc1 $v0, $f22 -/* B3CD8 8011D5D8 00000000 */ nop +/* B3CD8 8011D5D8 00000000 */ nop /* B3CDC 8011D5DC 30420FFF */ andi $v0, $v0, 0xfff /* B3CE0 8011D5E0 00521025 */ or $v0, $v0, $s2 /* B3CE4 8011D5E4 00621825 */ or $v1, $v1, $v0 @@ -404,27 +404,27 @@ glabel func_8011CFBC /* B3CF0 8011D5F0 87C3000A */ lh $v1, 0xa($fp) /* B3CF4 8011D5F4 00431021 */ addu $v0, $v0, $v1 /* B3CF8 8011D5F8 44821000 */ mtc1 $v0, $f2 -/* B3CFC 8011D5FC 00000000 */ nop +/* B3CFC 8011D5FC 00000000 */ nop /* B3D00 8011D600 468010A0 */ cvt.s.w $f2, $f2 /* B3D04 8011D604 46141082 */ mul.s $f2, $f2, $f20 -/* B3D08 8011D608 00000000 */ nop +/* B3D08 8011D608 00000000 */ nop /* B3D0C 8011D60C 87C20010 */ lh $v0, 0x10($fp) /* B3D10 8011D610 87C3000C */ lh $v1, 0xc($fp) /* B3D14 8011D614 00431021 */ addu $v0, $v0, $v1 /* B3D18 8011D618 44820000 */ mtc1 $v0, $f0 -/* B3D1C 8011D61C 00000000 */ nop +/* B3D1C 8011D61C 00000000 */ nop /* B3D20 8011D620 46800020 */ cvt.s.w $f0, $f0 /* B3D24 8011D624 46140002 */ mul.s $f0, $f0, $f20 -/* B3D28 8011D628 00000000 */ nop +/* B3D28 8011D628 00000000 */ nop /* B3D2C 8011D62C AE240000 */ sw $a0, ($s1) /* B3D30 8011D630 4600158D */ trunc.w.s $f22, $f2 /* B3D34 8011D634 4402B000 */ mfc1 $v0, $f22 -/* B3D38 8011D638 00000000 */ nop +/* B3D38 8011D638 00000000 */ nop /* B3D3C 8011D63C 30420FFF */ andi $v0, $v0, 0xfff /* B3D40 8011D640 00021300 */ sll $v0, $v0, 0xc /* B3D44 8011D644 4600058D */ trunc.w.s $f22, $f0 /* B3D48 8011D648 4403B000 */ mfc1 $v1, $f22 -/* B3D4C 8011D64C 00000000 */ nop +/* B3D4C 8011D64C 00000000 */ nop /* B3D50 8011D650 30630FFF */ andi $v1, $v1, 0xfff /* B3D54 8011D654 00431025 */ or $v0, $v0, $v1 /* B3D58 8011D658 AC820004 */ sw $v0, 4($a0) @@ -446,7 +446,7 @@ glabel func_8011CFBC /* B3D98 8011D698 000318C0 */ sll $v1, $v1, 3 /* B3D9C 8011D69C 00641821 */ addu $v1, $v1, $a0 /* B3DA0 8011D6A0 46001082 */ mul.s $f2, $f2, $f0 -/* B3DA4 8011D6A4 00000000 */ nop +/* B3DA4 8011D6A4 00000000 */ nop /* B3DA8 8011D6A8 8C640000 */ lw $a0, ($v1) /* B3DAC 8011D6AC 8C630004 */ lw $v1, 4($v1) /* B3DB0 8011D6B0 00821004 */ sllv $v0, $v0, $a0 @@ -454,7 +454,7 @@ glabel func_8011CFBC /* B3DB8 8011D6B8 000210C2 */ srl $v0, $v0, 3 /* B3DBC 8011D6BC 4600158D */ trunc.w.s $f22, $f2 /* B3DC0 8011D6C0 4403B000 */ mfc1 $v1, $f22 -/* B3DC4 8011D6C4 00000000 */ nop +/* B3DC4 8011D6C4 00000000 */ nop /* B3DC8 8011D6C8 0043102B */ sltu $v0, $v0, $v1 /* B3DCC 8011D6CC 14400009 */ bnez $v0, .L8011D6F4 /* B3DD0 8011D6D0 0000102D */ daddu $v0, $zero, $zero @@ -463,10 +463,10 @@ glabel func_8011CFBC /* B3DD8 8011D6D8 44800000 */ mtc1 $zero, $f0 /* B3DDC 8011D6DC 24020001 */ addiu $v0, $zero, 1 /* B3DE0 8011D6E0 4602003C */ c.lt.s $f0, $f2 -/* B3DE4 8011D6E4 00000000 */ nop +/* B3DE4 8011D6E4 00000000 */ nop .L8011D6E8: /* B3DE8 8011D6E8 45010002 */ bc1t .L8011D6F4 -/* B3DEC 8011D6EC 00000000 */ nop +/* B3DEC 8011D6EC 00000000 */ nop .L8011D6F0: /* B3DF0 8011D6F0 0000102D */ daddu $v0, $zero, $zero .L8011D6F4: diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D7E4.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D7E4.s index 3c12e38eea..30f9334e0a 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D7E4.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D7E4.s @@ -20,4 +20,4 @@ glabel func_8011D7E4 /* B3F20 8011D820 0000102D */ daddu $v0, $zero, $zero .L8011D824: /* B3F24 8011D824 03E00008 */ jr $ra -/* B3F28 8011D828 00000000 */ nop +/* B3F28 8011D828 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D890.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D890.s index ad395e0942..b1be3849a3 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D890.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D890.s @@ -18,4 +18,4 @@ glabel func_8011D890 /* B3FC0 8011D8C0 3C018015 */ lui $at, %hi(D_801533B0) /* B3FC4 8011D8C4 AC2033B0 */ sw $zero, %lo(D_801533B0)($at) /* B3FC8 8011D8C8 03E00008 */ jr $ra -/* B3FCC 8011D8CC 00000000 */ nop +/* B3FCC 8011D8CC 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D8D0.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D8D0.s index ea147dd8bd..b9f302c1d8 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D8D0.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D8D0.s @@ -18,4 +18,4 @@ glabel func_8011D8D0 /* B4000 8011D900 3C018015 */ lui $at, %hi(D_801533B0) /* B4004 8011D904 AC2033B0 */ sw $zero, %lo(D_801533B0)($at) /* B4008 8011D908 03E00008 */ jr $ra -/* B400C 8011D90C 00000000 */ nop +/* B400C 8011D90C 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D9B8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D9B8.s index 85c3f511d2..9e65c7719a 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D9B8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D9B8.s @@ -147,7 +147,7 @@ glabel func_8011D9B8 /* B42B8 8011DBB8 8E020004 */ lw $v0, 4($s0) /* B42BC 8011DBBC 0162102A */ slt $v0, $t3, $v0 /* B42C0 8011DBC0 1440001E */ bnez $v0, .L8011DC3C -/* B42C4 8011DBC4 00000000 */ nop +/* B42C4 8011DBC4 00000000 */ nop /* B42C8 8011DBC8 26650001 */ addiu $a1, $s3, 1 /* B42CC 8011DBCC 00B5102A */ slt $v0, $a1, $s5 /* B42D0 8011DBD0 10400016 */ beqz $v0, .L8011DC2C @@ -239,7 +239,7 @@ glabel func_8011D9B8 /* B4410 8011DD10 8E03000C */ lw $v1, 0xc($s0) /* B4414 8011DD14 30420002 */ andi $v0, $v0, 2 /* B4418 8011DD18 10400004 */ beqz $v0, .L8011DD2C -/* B441C 8011DD1C 00000000 */ nop +/* B441C 8011DD1C 00000000 */ nop /* B4420 8011DD20 8E360000 */ lw $s6, ($s1) /* B4424 8011DD24 26C20008 */ addiu $v0, $s6, 8 /* B4428 8011DD28 AE220000 */ sw $v0, ($s1) @@ -293,7 +293,7 @@ glabel func_8011D9B8 /* B44E0 8011DDE0 1440FFC6 */ bnez $v0, .L8011DCFC /* B44E4 8011DDE4 00131080 */ sll $v0, $s3, 2 /* B44E8 8011DDE8 0804778A */ j .L8011DE28 -/* B44EC 8011DDEC 00000000 */ nop +/* B44EC 8011DDEC 00000000 */ nop .L8011DDF0: /* B44F0 8011DDF0 1AA0000D */ blez $s5, .L8011DE28 /* B44F4 8011DDF4 0000982D */ daddu $s3, $zero, $zero @@ -309,7 +309,7 @@ glabel func_8011D9B8 /* B4518 8011DE18 26730001 */ addiu $s3, $s3, 1 /* B451C 8011DE1C 0275102A */ slt $v0, $s3, $s5 /* B4520 8011DE20 1440FFF6 */ bnez $v0, .L8011DDFC -/* B4524 8011DE24 00000000 */ nop +/* B4524 8011DE24 00000000 */ nop .L8011DE28: /* B4528 8011DE28 3C038015 */ lui $v1, %hi(D_801533AC) /* B452C 8011DE2C 246333AC */ addiu $v1, $v1, %lo(D_801533AC) @@ -334,4 +334,4 @@ glabel func_8011D9B8 /* B4570 8011DE70 8FB00450 */ lw $s0, 0x450($sp) /* B4574 8011DE74 03E00008 */ jr $ra /* B4578 8011DE78 27BD0478 */ addiu $sp, $sp, 0x478 -/* B457C 8011DE7C 00000000 */ nop +/* B457C 8011DE7C 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011DE80.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011DE80.s index c475aa2430..a62d3f0fad 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011DE80.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011DE80.s @@ -29,10 +29,10 @@ glabel func_8011DE80 /* B45DC 8011DEDC 28A20060 */ slti $v0, $a1, 0x60 .L8011DEE0: /* B45E0 8011DEE0 14400003 */ bnez $v0, .L8011DEF0 -/* B45E4 8011DEE4 00000000 */ nop +/* B45E4 8011DEE4 00000000 */ nop .L8011DEE8: /* B45E8 8011DEE8 080477BA */ j .L8011DEE8 -/* B45EC 8011DEEC 00000000 */ nop +/* B45EC 8011DEEC 00000000 */ nop .L8011DEF0: /* B45F0 8011DEF0 8FA40038 */ lw $a0, 0x38($sp) /* B45F4 8011DEF4 02442021 */ addu $a0, $s2, $a0 @@ -43,7 +43,7 @@ glabel func_8011DE80 /* B4608 8011DF08 AE270004 */ sw $a3, 4($s1) .L8011DF0C: /* B460C 8011DF0C 080477C3 */ j .L8011DF0C -/* B4610 8011DF10 00000000 */ nop +/* B4610 8011DF10 00000000 */ nop .L8011DF14: /* B4614 8011DF14 24020003 */ addiu $v0, $zero, 3 /* B4618 8011DF18 AE220000 */ sw $v0, ($s1) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E09C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E09C.s index 28e6a2a981..b7dec97504 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E09C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E09C.s @@ -9,7 +9,7 @@ glabel func_8011E09C /* B47AC 8011E0AC 0080802D */ daddu $s0, $a0, $zero /* B47B0 8011E0B0 3C013F80 */ lui $at, 0x3f80 /* B47B4 8011E0B4 44810000 */ mtc1 $at, $f0 -/* B47B8 8011E0B8 00000000 */ nop +/* B47B8 8011E0B8 00000000 */ nop /* B47BC 8011E0BC E6000000 */ swc1 $f0, ($s0) /* B47C0 8011E0C0 E6000014 */ swc1 $f0, 0x14($s0) /* B47C4 8011E0C4 E6000028 */ swc1 $f0, 0x28($s0) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E1C4.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E1C4.s index 66aa21c8c9..c81951178e 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E1C4.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E1C4.s @@ -15,7 +15,7 @@ glabel func_8011E1C4 /* B48E8 8011E1E8 10800003 */ beqz $a0, .L8011E1F8 /* B48EC 8011E1EC 26310001 */ addiu $s1, $s1, 1 /* B48F0 8011E1F0 0C047871 */ jal func_8011E1C4 -/* B48F4 8011E1F4 00000000 */ nop +/* B48F4 8011E1F4 00000000 */ nop .L8011E1F8: /* B48F8 8011E1F8 2A220020 */ slti $v0, $s1, 0x20 /* B48FC 8011E1FC 1440FFF9 */ bnez $v0, .L8011E1E4 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E224.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E224.s index ccd26cbc1e..df66633f5c 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E224.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E224.s @@ -29,7 +29,7 @@ glabel func_8011E224 /* B497C 8011E27C 0461FFFD */ bgez $v1, .L8011E274 /* B4980 8011E280 2442FFF8 */ addiu $v0, $v0, -8 /* B4984 8011E284 080478A7 */ j .L8011E29C -/* B4988 8011E288 00000000 */ nop +/* B4988 8011E288 00000000 */ nop .L8011E28C: /* B498C 8011E28C 3C028015 */ lui $v0, %hi(D_80153A00) /* B4990 8011E290 24423A00 */ addiu $v0, $v0, %lo(D_80153A00) @@ -65,4 +65,4 @@ glabel func_8011E224 /* B4A00 8011E300 3C018015 */ lui $at, %hi(D_80153A5C) /* B4A04 8011E304 AC223A5C */ sw $v0, %lo(D_80153A5C)($at) /* B4A08 8011E308 03E00008 */ jr $ra -/* B4A0C 8011E30C 00000000 */ nop +/* B4A0C 8011E30C 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E310.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E310.s index 1d26e94912..de68adc7ef 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E310.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E310.s @@ -6,11 +6,11 @@ glabel func_8011E310 /* B4A14 8011E314 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* B4A18 8011E318 80420070 */ lb $v0, 0x70($v0) /* B4A1C 8011E31C 14400005 */ bnez $v0, .L8011E334 -/* B4A20 8011E320 00000000 */ nop +/* B4A20 8011E320 00000000 */ nop /* B4A24 8011E324 3C028015 */ lui $v0, %hi(D_801539C0) /* B4A28 8011E328 244239C0 */ addiu $v0, $v0, %lo(D_801539C0) /* B4A2C 8011E32C 080478CF */ j .L8011E33C -/* B4A30 8011E330 00000000 */ nop +/* B4A30 8011E330 00000000 */ nop .L8011E334: /* B4A34 8011E334 3C028015 */ lui $v0, %hi(D_80153A00) /* B4A38 8011E338 24423A00 */ addiu $v0, $v0, %lo(D_80153A00) @@ -37,4 +37,4 @@ glabel func_8011E310 /* B4A88 8011E388 3C018015 */ lui $at, %hi(D_80153A5C) /* B4A8C 8011E38C AC223A5C */ sw $v0, %lo(D_80153A5C)($at) /* B4A90 8011E390 03E00008 */ jr $ra -/* B4A94 8011E394 00000000 */ nop +/* B4A94 8011E394 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E398.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E398.s index 77b064e4b0..0b29f88fa8 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E398.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E398.s @@ -16,7 +16,7 @@ glabel func_8011E398 /* B4AC0 8011E3C0 10800004 */ beqz $a0, .L8011E3D4 /* B4AC4 8011E3C4 26310001 */ addiu $s1, $s1, 1 /* B4AC8 8011E3C8 0C0478E6 */ jal func_8011E398 -/* B4ACC 8011E3CC 00000000 */ nop +/* B4ACC 8011E3CC 00000000 */ nop /* B4AD0 8011E3D0 AE000004 */ sw $zero, 4($s0) .L8011E3D4: /* B4AD4 8011E3D4 2A220020 */ slti $v0, $s1, 0x20 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E400.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E400.s index 4ec08b67f9..34b784a58a 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E400.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E400.s @@ -10,7 +10,7 @@ glabel func_8011E400 /* B4B14 8011E414 10800004 */ beqz $a0, .L8011E428 /* B4B18 8011E418 A2000014 */ sb $zero, 0x14($s0) /* B4B1C 8011E41C 0C0478E6 */ jal func_8011E398 -/* B4B20 8011E420 00000000 */ nop +/* B4B20 8011E420 00000000 */ nop /* B4B24 8011E424 AE000010 */ sw $zero, 0x10($s0) .L8011E428: /* B4B28 8011E428 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E438.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E438.s index 42ff95e5e1..71adb45022 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E438.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E438.s @@ -10,7 +10,7 @@ glabel func_8011E438 /* B4B4C 8011E44C 10800016 */ beqz $a0, .L8011E4A8 /* B4B50 8011E450 A2000014 */ sb $zero, 0x14($s0) /* B4B54 8011E454 0C0478E6 */ jal func_8011E398 -/* B4B58 8011E458 00000000 */ nop +/* B4B58 8011E458 00000000 */ nop /* B4B5C 8011E45C 3C038015 */ lui $v1, %hi(gCurrentAnimMeshListPtr) /* B4B60 8011E460 8C633A40 */ lw $v1, %lo(gCurrentAnimMeshListPtr)($v1) /* B4B64 8011E464 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E4B8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E4B8.s index 183ec51a7f..59a5ca685d 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E4B8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E4B8.s @@ -21,10 +21,10 @@ glabel func_8011E4B8 /* B4BF4 8011E4F4 2A020010 */ slti $v0, $s0, 0x10 .L8011E4F8: /* B4BF8 8011E4F8 14400003 */ bnez $v0, .L8011E508 -/* B4BFC 8011E4FC 00000000 */ nop +/* B4BFC 8011E4FC 00000000 */ nop .L8011E500: /* B4C00 8011E500 08047940 */ j .L8011E500 -/* B4C04 8011E504 00000000 */ nop +/* B4C04 8011E504 00000000 */ nop .L8011E508: /* B4C08 8011E508 0C00AB39 */ jal heap_malloc /* B4C0C 8011E50C 240402E0 */ addiu $a0, $zero, 0x2e0 @@ -42,7 +42,7 @@ glabel func_8011E4B8 /* B4C3C 8011E53C ACA30000 */ sw $v1, ($a1) .L8011E540: /* B4C40 8011E540 08047950 */ j .L8011E540 -/* B4C44 8011E544 00000000 */ nop +/* B4C44 8011E544 00000000 */ nop .L8011E548: /* B4C48 8011E548 3C013F80 */ lui $at, 0x3f80 /* B4C4C 8011E54C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E5E0.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E5E0.s index 981c964dab..46e5c020d0 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E5E0.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E5E0.s @@ -23,10 +23,10 @@ glabel func_8011E5E0 /* B4D24 8011E624 2A020010 */ slti $v0, $s0, 0x10 .L8011E628: /* B4D28 8011E628 14400003 */ bnez $v0, .L8011E638 -/* B4D2C 8011E62C 00000000 */ nop +/* B4D2C 8011E62C 00000000 */ nop .L8011E630: /* B4D30 8011E630 0804798C */ j .L8011E630 -/* B4D34 8011E634 00000000 */ nop +/* B4D34 8011E634 00000000 */ nop .L8011E638: /* B4D38 8011E638 0C00AB39 */ jal heap_malloc /* B4D3C 8011E63C 240402E0 */ addiu $a0, $zero, 0x2e0 @@ -44,7 +44,7 @@ glabel func_8011E5E0 /* B4D6C 8011E66C ACA30000 */ sw $v1, ($a1) .L8011E670: /* B4D70 8011E670 0804799C */ j .L8011E670 -/* B4D74 8011E674 00000000 */ nop +/* B4D74 8011E674 00000000 */ nop .L8011E678: /* B4D78 8011E678 3C0300FF */ lui $v1, 0xff /* B4D7C 8011E67C 3463FFFF */ ori $v1, $v1, 0xffff diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E718.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E718.s index 1e8b28eb27..12a4341c27 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E718.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E718.s @@ -18,7 +18,7 @@ glabel func_8011E718 /* B4E4C 8011E74C 24020010 */ addiu $v0, $zero, 0x10 .L8011E750: /* B4E50 8011E750 080479D4 */ j .L8011E750 -/* B4E54 8011E754 00000000 */ nop +/* B4E54 8011E754 00000000 */ nop .L8011E758: /* B4E58 8011E758 A60200F4 */ sh $v0, 0xf4($s0) /* B4E5C 8011E75C 8E220000 */ lw $v0, ($s1) @@ -68,7 +68,7 @@ glabel func_8011E718 /* B4F04 8011E804 0000202D */ daddu $a0, $zero, $zero .L8011E808: /* B4F08 8011E808 08047A02 */ j .L8011E808 -/* B4F0C 8011E80C 00000000 */ nop +/* B4F0C 8011E80C 00000000 */ nop .L8011E810: /* B4F10 8011E810 0040182D */ daddu $v1, $v0, $zero .L8011E814: @@ -85,7 +85,7 @@ glabel func_8011E718 /* B4F38 8011E838 0200102D */ daddu $v0, $s0, $zero .L8011E83C: /* B4F3C 8011E83C 08047A0F */ j .L8011E83C -/* B4F40 8011E840 00000000 */ nop +/* B4F40 8011E840 00000000 */ nop .L8011E844: /* B4F44 8011E844 A61100F6 */ sh $s1, 0xf6($s0) /* B4F48 8011E848 8E440010 */ lw $a0, 0x10($s2) @@ -95,7 +95,7 @@ glabel func_8011E718 /* B4F58 8011E858 0000202D */ daddu $a0, $zero, $zero .L8011E85C: /* B4F5C 8011E85C 08047A17 */ j .L8011E85C -/* B4F60 8011E860 00000000 */ nop +/* B4F60 8011E860 00000000 */ nop .L8011E864: /* B4F64 8011E864 0040182D */ daddu $v1, $v0, $zero .L8011E868: @@ -112,7 +112,7 @@ glabel func_8011E718 /* B4F8C 8011E88C 0200102D */ daddu $v0, $s0, $zero .L8011E890: /* B4F90 8011E890 08047A24 */ j .L8011E890 -/* B4F94 8011E894 00000000 */ nop +/* B4F94 8011E894 00000000 */ nop .L8011E898: /* B4F98 8011E898 0200102D */ daddu $v0, $s0, $zero .L8011E89C: diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E8BC.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E8BC.s index f3ca157214..9de92633d3 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E8BC.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E8BC.s @@ -13,7 +13,7 @@ glabel func_8011E8BC /* B4FDC 8011E8DC 10400003 */ beqz $v0, .L8011E8EC /* B4FE0 8011E8E0 30820800 */ andi $v0, $a0, 0x800 /* B4FE4 8011E8E4 10400055 */ beqz $v0, .L8011EA3C -/* B4FE8 8011E8E8 00000000 */ nop +/* B4FE8 8011E8E8 00000000 */ nop .L8011E8EC: /* B4FEC 8011E8EC 2402F7FF */ addiu $v0, $zero, -0x801 /* B4FF0 8011E8F0 00822024 */ and $a0, $a0, $v0 @@ -23,7 +23,7 @@ glabel func_8011E8BC /* B5000 8011E900 00431021 */ addu $v0, $v0, $v1 /* B5004 8011E904 8C500000 */ lw $s0, ($v0) /* B5008 8011E908 1200004C */ beqz $s0, .L8011EA3C -/* B500C 8011E90C 00000000 */ nop +/* B500C 8011E90C 00000000 */ nop /* B5010 8011E910 8E040000 */ lw $a0, ($s0) /* B5014 8011E914 10800049 */ beqz $a0, .L8011EA3C /* B5018 8011E918 3C020004 */ lui $v0, 4 @@ -38,7 +38,7 @@ glabel func_8011E8BC /* B503C 8011E93C 00821024 */ and $v0, $a0, $v0 /* B5040 8011E940 AE020000 */ sw $v0, ($s0) /* B5044 8011E944 4602003E */ c.le.s $f0, $f2 -/* B5048 8011E948 00000000 */ nop +/* B5048 8011E948 00000000 */ nop /* B504C 8011E94C 45000014 */ bc1f .L8011E9A0 /* B5050 8011E950 E6000090 */ swc1 $f0, 0x90($s0) /* B5054 8011E954 30428000 */ andi $v0, $v0, 0x8000 @@ -51,7 +51,7 @@ glabel func_8011E8BC /* B506C 8011E96C 1C60FFFC */ bgtz $v1, .L8011E960 /* B5070 8011E970 2402FFFF */ addiu $v0, $zero, -1 /* B5074 8011E974 08047A69 */ j .L8011E9A4 -/* B5078 8011E978 00000000 */ nop +/* B5078 8011E978 00000000 */ nop .L8011E97C: /* B507C 8011E97C 3C013F80 */ lui $at, 0x3f80 /* B5080 8011E980 44810000 */ mtc1 $at, $f0 @@ -62,7 +62,7 @@ glabel func_8011E8BC /* B5090 8011E990 0200202D */ daddu $a0, $s0, $zero /* B5094 8011E994 0040182D */ daddu $v1, $v0, $zero /* B5098 8011E998 1C60FFFC */ bgtz $v1, .L8011E98C -/* B509C 8011E99C 00000000 */ nop +/* B509C 8011E99C 00000000 */ nop .L8011E9A0: /* B50A0 8011E9A0 2402FFFF */ addiu $v0, $zero, -1 .L8011E9A4: diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011EA54.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011EA54.s index d1bf14d9aa..10af6e008c 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011EA54.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011EA54.s @@ -14,7 +14,7 @@ glabel func_8011EA54 /* B5178 8011EA78 00A0882D */ daddu $s1, $a1, $zero /* B517C 8011EA7C 30820800 */ andi $v0, $a0, 0x800 /* B5180 8011EA80 10400055 */ beqz $v0, .L8011EBD8 -/* B5184 8011EA84 00000000 */ nop +/* B5184 8011EA84 00000000 */ nop .L8011EA88: /* B5188 8011EA88 2402F7FF */ addiu $v0, $zero, -0x801 /* B518C 8011EA8C 00822024 */ and $a0, $a0, $v0 @@ -24,7 +24,7 @@ glabel func_8011EA54 /* B519C 8011EA9C 00431021 */ addu $v0, $v0, $v1 /* B51A0 8011EAA0 8C500000 */ lw $s0, ($v0) /* B51A4 8011EAA4 1200004C */ beqz $s0, .L8011EBD8 -/* B51A8 8011EAA8 00000000 */ nop +/* B51A8 8011EAA8 00000000 */ nop /* B51AC 8011EAAC 8E040000 */ lw $a0, ($s0) /* B51B0 8011EAB0 10800049 */ beqz $a0, .L8011EBD8 /* B51B4 8011EAB4 3C020004 */ lui $v0, 4 @@ -39,7 +39,7 @@ glabel func_8011EA54 /* B51D8 8011EAD8 00821024 */ and $v0, $a0, $v0 /* B51DC 8011EADC AE020000 */ sw $v0, ($s0) /* B51E0 8011EAE0 4602003E */ c.le.s $f0, $f2 -/* B51E4 8011EAE4 00000000 */ nop +/* B51E4 8011EAE4 00000000 */ nop /* B51E8 8011EAE8 45000014 */ bc1f .L8011EB3C /* B51EC 8011EAEC E6000090 */ swc1 $f0, 0x90($s0) /* B51F0 8011EAF0 30428000 */ andi $v0, $v0, 0x8000 @@ -52,7 +52,7 @@ glabel func_8011EA54 /* B5208 8011EB08 1C60FFFC */ bgtz $v1, .L8011EAFC /* B520C 8011EB0C 2402FFFF */ addiu $v0, $zero, -1 /* B5210 8011EB10 08047AD0 */ j .L8011EB40 -/* B5214 8011EB14 00000000 */ nop +/* B5214 8011EB14 00000000 */ nop .L8011EB18: /* B5218 8011EB18 3C013F80 */ lui $at, 0x3f80 /* B521C 8011EB1C 44810000 */ mtc1 $at, $f0 @@ -63,7 +63,7 @@ glabel func_8011EA54 /* B522C 8011EB2C 0200202D */ daddu $a0, $s0, $zero /* B5230 8011EB30 0040182D */ daddu $v1, $v0, $zero /* B5234 8011EB34 1C60FFFC */ bgtz $v1, .L8011EB28 -/* B5238 8011EB38 00000000 */ nop +/* B5238 8011EB38 00000000 */ nop .L8011EB3C: /* B523C 8011EB3C 2402FFFF */ addiu $v0, $zero, -1 .L8011EB40: diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011EBF0.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011EBF0.s index 0d05904d31..49c22e1710 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011EBF0.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011EBF0.s @@ -16,35 +16,41 @@ glabel func_8011EBF0 /* B531C 8011EC1C 10400105 */ beqz $v0, .L8011F034 /* B5320 8011EC20 26100002 */ addiu $s0, $s0, 2 /* B5324 8011EC24 00031080 */ sll $v0, $v1, 2 -/* B5328 8011EC28 3C018015 */ lui $at, %hi(D_8014FE60) +/* B5328 8011EC28 3C018015 */ lui $at, %hi(jtbl_8014FE60_E6560) /* B532C 8011EC2C 00220821 */ addu $at, $at, $v0 -/* B5330 8011EC30 8C22FE60 */ lw $v0, %lo(D_8014FE60)($at) +/* B5330 8011EC30 8C22FE60 */ lw $v0, %lo(jtbl_8014FE60_E6560)($at) /* B5334 8011EC34 00400008 */ jr $v0 -/* B5338 8011EC38 00000000 */ nop +/* B5338 8011EC38 00000000 */ nop +glabel L8011EC3C_B533C /* B533C 8011EC3C 08047C0E */ j .L8011F038 /* B5340 8011EC40 2402FFFF */ addiu $v0, $zero, -1 +glabel L8011EC44_B5344 /* B5344 8011EC44 92030001 */ lbu $v1, 1($s0) /* B5348 8011EC48 26100002 */ addiu $s0, $s0, 2 /* B534C 8011EC4C 24020001 */ addiu $v0, $zero, 1 /* B5350 8011EC50 AE300008 */ sw $s0, 8($s1) /* B5354 8011EC54 08047C0E */ j .L8011F038 /* B5358 8011EC58 A2230004 */ sb $v1, 4($s1) +glabel L8011EC5C_B535C /* B535C 8011EC5C 86020000 */ lh $v0, ($s0) /* B5360 8011EC60 26100002 */ addiu $s0, $s0, 2 /* B5364 8011EC64 AE300008 */ sw $s0, 8($s1) /* B5368 8011EC68 44820000 */ mtc1 $v0, $f0 -/* B536C 8011EC6C 00000000 */ nop +/* B536C 8011EC6C 00000000 */ nop /* B5370 8011EC70 46800020 */ cvt.s.w $f0, $f0 /* B5374 8011EC74 08047C0D */ j .L8011F034 /* B5378 8011EC78 E6200090 */ swc1 $f0, 0x90($s1) +glabel L8011EC7C_B537C /* B537C 8011EC7C 8E23000C */ lw $v1, 0xc($s1) /* B5380 8011EC80 24020001 */ addiu $v0, $zero, 1 /* B5384 8011EC84 08047C0E */ j .L8011F038 /* B5388 8011EC88 AE230008 */ sw $v1, 8($s1) +glabel L8011EC8C_B538C /* B538C 8011EC8C 24020001 */ addiu $v0, $zero, 1 /* B5390 8011EC90 AE30000C */ sw $s0, 0xc($s1) /* B5394 8011EC94 08047C0E */ j .L8011F038 /* B5398 8011EC98 AE300008 */ sw $s0, 8($s1) +glabel L8011EC9C_B539C /* B539C 8011EC9C 86040000 */ lh $a0, ($s0) /* B53A0 8011ECA0 26100002 */ addiu $s0, $s0, 2 /* B53A4 8011ECA4 8E230000 */ lw $v1, ($s1) @@ -52,6 +58,7 @@ glabel func_8011EBF0 /* B53AC 8011ECAC AE300008 */ sw $s0, 8($s1) /* B53B0 8011ECB0 08047B4F */ j .L8011ED3C /* B53B4 8011ECB4 3084FFFF */ andi $a0, $a0, 0xffff +glabel L8011ECB8_B53B8 /* B53B8 8011ECB8 86020000 */ lh $v0, ($s0) /* B53BC 8011ECBC 8E240010 */ lw $a0, 0x10($s1) /* B53C0 8011ECC0 00511021 */ addu $v0, $v0, $s1 @@ -65,6 +72,7 @@ glabel func_8011EBF0 /* B53E0 8011ECE0 24020001 */ addiu $v0, $zero, 1 /* B53E4 8011ECE4 08047B48 */ j .L8011ED20 /* B53E8 8011ECE8 00641825 */ or $v1, $v1, $a0 +glabel L8011ECEC_B53EC /* B53EC 8011ECEC 86020000 */ lh $v0, ($s0) /* B53F0 8011ECF0 8E240010 */ lw $a0, 0x10($s1) /* B53F4 8011ECF4 00511021 */ addu $v0, $v0, $s1 @@ -82,6 +90,7 @@ glabel func_8011EBF0 /* B5420 8011ED20 A4A300F4 */ sh $v1, 0xf4($a1) /* B5424 8011ED24 08047C0E */ j .L8011F038 /* B5428 8011ED28 AE300008 */ sw $s0, 8($s1) +glabel L8011ED2C_B542C /* B542C 8011ED2C 24020001 */ addiu $v0, $zero, 1 /* B5430 8011ED30 8E230000 */ lw $v1, ($s1) /* B5434 8011ED34 3C040002 */ lui $a0, 2 @@ -90,36 +99,37 @@ glabel func_8011EBF0 /* B543C 8011ED3C 00641825 */ or $v1, $v1, $a0 /* B5440 8011ED40 08047C0E */ j .L8011F038 /* B5444 8011ED44 AE230000 */ sw $v1, ($s1) +glabel L8011ED48_B5448 /* B5448 8011ED48 86030000 */ lh $v1, ($s0) /* B544C 8011ED4C 26100002 */ addiu $s0, $s0, 2 /* B5450 8011ED50 86020000 */ lh $v0, ($s0) /* B5454 8011ED54 3C018015 */ lui $at, %hi(D_8014FEB0) /* B5458 8011ED58 D424FEB0 */ ldc1 $f4, %lo(D_8014FEB0)($at) /* B545C 8011ED5C 44823000 */ mtc1 $v0, $f6 -/* B5460 8011ED60 00000000 */ nop +/* B5460 8011ED60 00000000 */ nop /* B5464 8011ED64 468031A0 */ cvt.s.w $f6, $f6 /* B5468 8011ED68 460031A1 */ cvt.d.s $f6, $f6 /* B546C 8011ED6C 46243182 */ mul.d $f6, $f6, $f4 -/* B5470 8011ED70 00000000 */ nop +/* B5470 8011ED70 00000000 */ nop /* B5474 8011ED74 26100002 */ addiu $s0, $s0, 2 /* B5478 8011ED78 86020000 */ lh $v0, ($s0) /* B547C 8011ED7C 44821000 */ mtc1 $v0, $f2 -/* B5480 8011ED80 00000000 */ nop +/* B5480 8011ED80 00000000 */ nop /* B5484 8011ED84 468010A0 */ cvt.s.w $f2, $f2 /* B5488 8011ED88 460010A1 */ cvt.d.s $f2, $f2 /* B548C 8011ED8C 46241082 */ mul.d $f2, $f2, $f4 -/* B5490 8011ED90 00000000 */ nop +/* B5490 8011ED90 00000000 */ nop /* B5494 8011ED94 8E240010 */ lw $a0, 0x10($s1) /* B5498 8011ED98 26100002 */ addiu $s0, $s0, 2 /* B549C 8011ED9C 00711821 */ addu $v1, $v1, $s1 /* B54A0 8011EDA0 86020000 */ lh $v0, ($s0) /* B54A4 8011EDA4 90650014 */ lbu $a1, 0x14($v1) /* B54A8 8011EDA8 44820000 */ mtc1 $v0, $f0 -/* B54AC 8011EDAC 00000000 */ nop +/* B54AC 8011EDAC 00000000 */ nop /* B54B0 8011EDB0 46800020 */ cvt.s.w $f0, $f0 /* B54B4 8011EDB4 46000021 */ cvt.d.s $f0, $f0 /* B54B8 8011EDB8 46240002 */ mul.d $f0, $f0, $f4 -/* B54BC 8011EDBC 00000000 */ nop +/* B54BC 8011EDBC 00000000 */ nop /* B54C0 8011EDC0 3C018015 */ lui $at, %hi(D_8014FEB8) /* B54C4 8011EDC4 D424FEB8 */ ldc1 $f4, %lo(D_8014FEB8)($at) /* B54C8 8011EDC8 26100002 */ addiu $s0, $s0, 2 @@ -136,42 +146,43 @@ glabel func_8011EBF0 /* B54F4 8011EDF4 24020001 */ addiu $v0, $zero, 1 .L8011EDF8: /* B54F8 8011EDF8 08047B7E */ j .L8011EDF8 -/* B54FC 8011EDFC 00000000 */ nop +/* B54FC 8011EDFC 00000000 */ nop .L8011EE00: /* B5500 8011EE00 E4B8009C */ swc1 $f24, 0x9c($a1) /* B5504 8011EE04 E4B600A0 */ swc1 $f22, 0xa0($a1) /* B5508 8011EE08 08047C0E */ j .L8011F038 /* B550C 8011EE0C E4B400A4 */ swc1 $f20, 0xa4($a1) +glabel L8011EE10_B5510 /* B5510 8011EE10 86030000 */ lh $v1, ($s0) /* B5514 8011EE14 26100002 */ addiu $s0, $s0, 2 /* B5518 8011EE18 86020000 */ lh $v0, ($s0) /* B551C 8011EE1C 3C018015 */ lui $at, %hi(D_8014FEC0) /* B5520 8011EE20 D424FEC0 */ ldc1 $f4, %lo(D_8014FEC0)($at) /* B5524 8011EE24 44823000 */ mtc1 $v0, $f6 -/* B5528 8011EE28 00000000 */ nop +/* B5528 8011EE28 00000000 */ nop /* B552C 8011EE2C 468031A0 */ cvt.s.w $f6, $f6 /* B5530 8011EE30 460031A1 */ cvt.d.s $f6, $f6 /* B5534 8011EE34 46243182 */ mul.d $f6, $f6, $f4 -/* B5538 8011EE38 00000000 */ nop +/* B5538 8011EE38 00000000 */ nop /* B553C 8011EE3C 26100002 */ addiu $s0, $s0, 2 /* B5540 8011EE40 86020000 */ lh $v0, ($s0) /* B5544 8011EE44 44821000 */ mtc1 $v0, $f2 -/* B5548 8011EE48 00000000 */ nop +/* B5548 8011EE48 00000000 */ nop /* B554C 8011EE4C 468010A0 */ cvt.s.w $f2, $f2 /* B5550 8011EE50 460010A1 */ cvt.d.s $f2, $f2 /* B5554 8011EE54 46241082 */ mul.d $f2, $f2, $f4 -/* B5558 8011EE58 00000000 */ nop +/* B5558 8011EE58 00000000 */ nop /* B555C 8011EE5C 8E240010 */ lw $a0, 0x10($s1) /* B5560 8011EE60 26100002 */ addiu $s0, $s0, 2 /* B5564 8011EE64 00711821 */ addu $v1, $v1, $s1 /* B5568 8011EE68 86020000 */ lh $v0, ($s0) /* B556C 8011EE6C 90650014 */ lbu $a1, 0x14($v1) /* B5570 8011EE70 44820000 */ mtc1 $v0, $f0 -/* B5574 8011EE74 00000000 */ nop +/* B5574 8011EE74 00000000 */ nop /* B5578 8011EE78 46800020 */ cvt.s.w $f0, $f0 /* B557C 8011EE7C 46000021 */ cvt.d.s $f0, $f0 /* B5580 8011EE80 46240002 */ mul.d $f0, $f0, $f4 -/* B5584 8011EE84 00000000 */ nop +/* B5584 8011EE84 00000000 */ nop /* B5588 8011EE88 3C018015 */ lui $at, %hi(D_8014FEC8) /* B558C 8011EE8C D424FEC8 */ ldc1 $f4, %lo(D_8014FEC8)($at) /* B5590 8011EE90 26100002 */ addiu $s0, $s0, 2 @@ -188,7 +199,7 @@ glabel func_8011EBF0 /* B55BC 8011EEBC 24020001 */ addiu $v0, $zero, 1 .L8011EEC0: /* B55C0 8011EEC0 08047BB0 */ j .L8011EEC0 -/* B55C4 8011EEC4 00000000 */ nop +/* B55C4 8011EEC4 00000000 */ nop .L8011EEC8: /* B55C8 8011EEC8 C4A4009C */ lwc1 $f4, 0x9c($a1) /* B55CC 8011EECC 46182100 */ add.s $f4, $f4, $f24 @@ -200,6 +211,7 @@ glabel func_8011EBF0 /* B55E4 8011EEE4 E4A200A0 */ swc1 $f2, 0xa0($a1) /* B55E8 8011EEE8 08047C0E */ j .L8011F038 /* B55EC 8011EEEC E4A000A4 */ swc1 $f0, 0xa4($a1) +glabel L8011EEF0_B55F0 /* B55F0 8011EEF0 86020000 */ lh $v0, ($s0) /* B55F4 8011EEF4 26100002 */ addiu $s0, $s0, 2 /* B55F8 8011EEF8 86050000 */ lh $a1, ($s0) @@ -210,15 +222,15 @@ glabel func_8011EBF0 /* B560C 8011EF0C 26100002 */ addiu $s0, $s0, 2 /* B5610 8011EF10 8E240010 */ lw $a0, 0x10($s1) /* B5614 8011EF14 4485C000 */ mtc1 $a1, $f24 -/* B5618 8011EF18 00000000 */ nop +/* B5618 8011EF18 00000000 */ nop /* B561C 8011EF1C 4680C620 */ cvt.s.w $f24, $f24 /* B5620 8011EF20 4483B000 */ mtc1 $v1, $f22 -/* B5624 8011EF24 00000000 */ nop +/* B5624 8011EF24 00000000 */ nop /* B5628 8011EF28 4680B5A0 */ cvt.s.w $f22, $f22 /* B562C 8011EF2C 00511021 */ addu $v0, $v0, $s1 /* B5630 8011EF30 90450014 */ lbu $a1, 0x14($v0) /* B5634 8011EF34 4486A000 */ mtc1 $a2, $f20 -/* B5638 8011EF38 00000000 */ nop +/* B5638 8011EF38 00000000 */ nop /* B563C 8011EF3C 4680A520 */ cvt.s.w $f20, $f20 /* B5640 8011EF40 0C047837 */ jal func_8011E0DC /* B5644 8011EF44 AE300008 */ sw $s0, 8($s1) @@ -227,42 +239,43 @@ glabel func_8011EBF0 /* B5650 8011EF50 24020001 */ addiu $v0, $zero, 1 .L8011EF54: /* B5654 8011EF54 08047BD5 */ j .L8011EF54 -/* B5658 8011EF58 00000000 */ nop +/* B5658 8011EF58 00000000 */ nop .L8011EF5C: /* B565C 8011EF5C E4B80090 */ swc1 $f24, 0x90($a1) /* B5660 8011EF60 E4B60094 */ swc1 $f22, 0x94($a1) /* B5664 8011EF64 08047C0E */ j .L8011F038 /* B5668 8011EF68 E4B40098 */ swc1 $f20, 0x98($a1) +glabel L8011EF6C_B566C /* B566C 8011EF6C 86030000 */ lh $v1, ($s0) /* B5670 8011EF70 26100002 */ addiu $s0, $s0, 2 /* B5674 8011EF74 86020000 */ lh $v0, ($s0) /* B5678 8011EF78 3C018015 */ lui $at, %hi(D_8014FED0) /* B567C 8011EF7C D424FED0 */ ldc1 $f4, %lo(D_8014FED0)($at) /* B5680 8011EF80 44823000 */ mtc1 $v0, $f6 -/* B5684 8011EF84 00000000 */ nop +/* B5684 8011EF84 00000000 */ nop /* B5688 8011EF88 468031A0 */ cvt.s.w $f6, $f6 /* B568C 8011EF8C 460031A1 */ cvt.d.s $f6, $f6 /* B5690 8011EF90 46243182 */ mul.d $f6, $f6, $f4 -/* B5694 8011EF94 00000000 */ nop +/* B5694 8011EF94 00000000 */ nop /* B5698 8011EF98 26100002 */ addiu $s0, $s0, 2 /* B569C 8011EF9C 86020000 */ lh $v0, ($s0) /* B56A0 8011EFA0 44821000 */ mtc1 $v0, $f2 -/* B56A4 8011EFA4 00000000 */ nop +/* B56A4 8011EFA4 00000000 */ nop /* B56A8 8011EFA8 468010A0 */ cvt.s.w $f2, $f2 /* B56AC 8011EFAC 460010A1 */ cvt.d.s $f2, $f2 /* B56B0 8011EFB0 46241082 */ mul.d $f2, $f2, $f4 -/* B56B4 8011EFB4 00000000 */ nop +/* B56B4 8011EFB4 00000000 */ nop /* B56B8 8011EFB8 8E240010 */ lw $a0, 0x10($s1) /* B56BC 8011EFBC 26100002 */ addiu $s0, $s0, 2 /* B56C0 8011EFC0 00711821 */ addu $v1, $v1, $s1 /* B56C4 8011EFC4 86020000 */ lh $v0, ($s0) /* B56C8 8011EFC8 90650014 */ lbu $a1, 0x14($v1) /* B56CC 8011EFCC 44820000 */ mtc1 $v0, $f0 -/* B56D0 8011EFD0 00000000 */ nop +/* B56D0 8011EFD0 00000000 */ nop /* B56D4 8011EFD4 46800020 */ cvt.s.w $f0, $f0 /* B56D8 8011EFD8 46000021 */ cvt.d.s $f0, $f0 /* B56DC 8011EFDC 46240002 */ mul.d $f0, $f0, $f4 -/* B56E0 8011EFE0 00000000 */ nop +/* B56E0 8011EFE0 00000000 */ nop /* B56E4 8011EFE4 3C018015 */ lui $at, %hi(D_8014FED8) /* B56E8 8011EFE8 D424FED8 */ ldc1 $f4, %lo(D_8014FED8)($at) /* B56EC 8011EFEC 26100002 */ addiu $s0, $s0, 2 @@ -279,13 +292,14 @@ glabel func_8011EBF0 /* B5718 8011F018 24020001 */ addiu $v0, $zero, 1 .L8011F01C: /* B571C 8011F01C 08047C07 */ j .L8011F01C -/* B5720 8011F020 00000000 */ nop +/* B5720 8011F020 00000000 */ nop .L8011F024: /* B5724 8011F024 E4B800A8 */ swc1 $f24, 0xa8($a1) /* B5728 8011F028 E4B600AC */ swc1 $f22, 0xac($a1) /* B572C 8011F02C 08047C0E */ j .L8011F038 /* B5730 8011F030 E4B400B0 */ swc1 $f20, 0xb0($a1) .L8011F034: +glabel L8011F034_B5734 /* B5734 8011F034 0000102D */ daddu $v0, $zero, $zero .L8011F038: /* B5738 8011F038 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F058.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F058.s index b6f8479cc9..31b79a28e8 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F058.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F058.s @@ -18,15 +18,15 @@ glabel func_8011F058 /* B578C 8011F08C 10400005 */ beqz $v0, .L8011F0A4 /* B5790 8011F090 24020100 */ addiu $v0, $zero, 0x100 /* B5794 8011F094 10620008 */ beq $v1, $v0, .L8011F0B8 -/* B5798 8011F098 00000000 */ nop +/* B5798 8011F098 00000000 */ nop /* B579C 8011F09C 08047C3A */ j .L8011F0E8 -/* B57A0 8011F0A0 00000000 */ nop +/* B57A0 8011F0A0 00000000 */ nop .L8011F0A4: /* B57A4 8011F0A4 24020400 */ addiu $v0, $zero, 0x400 /* B57A8 8011F0A8 1062000B */ beq $v1, $v0, .L8011F0D8 -/* B57AC 8011F0AC 00000000 */ nop +/* B57AC 8011F0AC 00000000 */ nop /* B57B0 8011F0B0 08047C3A */ j .L8011F0E8 -/* B57B4 8011F0B4 00000000 */ nop +/* B57B4 8011F0B4 00000000 */ nop .L8011F0B8: /* B57B8 8011F0B8 0C0477F4 */ jal func_8011DFD0 /* B57BC 8011F0BC 27A40010 */ addiu $a0, $sp, 0x10 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F118.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F118.s index d350a26932..d336d2bd74 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F118.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F118.s @@ -83,7 +83,7 @@ glabel func_8011F118 /* B594C 8011F24C 0000882D */ daddu $s1, $zero, $zero /* B5950 8011F250 8E6400FC */ lw $a0, 0xfc($s3) /* B5954 8011F254 0C046C04 */ jal get_model_list_index_from_tree_index -/* B5958 8011F258 00000000 */ nop +/* B5958 8011F258 00000000 */ nop /* B595C 8011F25C 0C046B4C */ jal get_model_from_list_index /* B5960 8011F260 0040202D */ daddu $a0, $v0, $zero /* B5964 8011F264 27A40010 */ addiu $a0, $sp, 0x10 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F304.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F304.s index 41bafb53d3..7a0de34fcf 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F304.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F304.s @@ -11,7 +11,7 @@ glabel func_8011F304 /* B5A1C 8011F31C 27A80010 */ addiu $t0, $sp, 0x10 /* B5A20 8011F320 30820800 */ andi $v0, $a0, 0x800 /* B5A24 8011F324 1040002D */ beqz $v0, .L8011F3DC -/* B5A28 8011F328 00000000 */ nop +/* B5A28 8011F328 00000000 */ nop .L8011F32C: /* B5A2C 8011F32C 2402F7FF */ addiu $v0, $zero, -0x801 /* B5A30 8011F330 00822024 */ and $a0, $a0, $v0 @@ -21,7 +21,7 @@ glabel func_8011F304 /* B5A40 8011F340 00431021 */ addu $v0, $v0, $v1 /* B5A44 8011F344 8C470000 */ lw $a3, ($v0) /* B5A48 8011F348 10E00024 */ beqz $a3, .L8011F3DC -/* B5A4C 8011F34C 00000000 */ nop +/* B5A4C 8011F34C 00000000 */ nop /* B5A50 8011F350 8CE60000 */ lw $a2, ($a3) /* B5A54 8011F354 10C00021 */ beqz $a2, .L8011F3DC /* B5A58 8011F358 30C20040 */ andi $v0, $a2, 0x40 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F3E8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F3E8.s index 7a1b0e3540..4b4296d6ed 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F3E8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F3E8.s @@ -11,7 +11,7 @@ glabel func_8011F3E8 /* B5B00 8011F400 27AA0010 */ addiu $t2, $sp, 0x10 /* B5B04 8011F404 30820800 */ andi $v0, $a0, 0x800 /* B5B08 8011F408 1040002F */ beqz $v0, .L8011F4C8 -/* B5B0C 8011F40C 00000000 */ nop +/* B5B0C 8011F40C 00000000 */ nop .L8011F410: /* B5B10 8011F410 2402F7FF */ addiu $v0, $zero, -0x801 /* B5B14 8011F414 00822024 */ and $a0, $a0, $v0 @@ -21,7 +21,7 @@ glabel func_8011F3E8 /* B5B24 8011F424 00431021 */ addu $v0, $v0, $v1 /* B5B28 8011F428 8C490000 */ lw $t1, ($v0) /* B5B2C 8011F42C 11200026 */ beqz $t1, .L8011F4C8 -/* B5B30 8011F430 00000000 */ nop +/* B5B30 8011F430 00000000 */ nop /* B5B34 8011F434 8D280000 */ lw $t0, ($t1) /* B5B38 8011F438 11000023 */ beqz $t0, .L8011F4C8 /* B5B3C 8011F43C 31020040 */ andi $v0, $t0, 0x40 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F4D4.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F4D4.s index c85a882d87..c089fae8bf 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F4D4.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F4D4.s @@ -81,7 +81,7 @@ glabel func_8011F4D4 /* B5CFC 8011F5FC 10820063 */ beq $a0, $v0, .L8011F78C /* B5D00 8011F600 27A40010 */ addiu $a0, $sp, 0x10 /* B5D04 8011F604 08047E80 */ j .L8011FA00 -/* B5D08 8011F608 00000000 */ nop +/* B5D08 8011F608 00000000 */ nop .L8011F60C: /* B5D0C 8011F60C 92020004 */ lbu $v0, 4($s0) /* B5D10 8011F610 2442FFFF */ addiu $v0, $v0, -1 @@ -90,11 +90,12 @@ glabel func_8011F4D4 /* B5D1C 8011F61C 2C620026 */ sltiu $v0, $v1, 0x26 /* B5D20 8011F620 104000F6 */ beqz $v0, .L8011F9FC /* B5D24 8011F624 00031080 */ sll $v0, $v1, 2 -/* B5D28 8011F628 3C018015 */ lui $at, %hi(D_8014FEE0) +/* B5D28 8011F628 3C018015 */ lui $at, %hi(jtbl_8014FEE0_E65E0) /* B5D2C 8011F62C 00220821 */ addu $at, $at, $v0 -/* B5D30 8011F630 8C22FEE0 */ lw $v0, %lo(D_8014FEE0)($at) +/* B5D30 8011F630 8C22FEE0 */ lw $v0, %lo(jtbl_8014FEE0_E65E0)($at) /* B5D34 8011F634 00400008 */ jr $v0 -/* B5D38 8011F638 00000000 */ nop +/* B5D38 8011F638 00000000 */ nop +glabel L8011F63C_B5D3C /* B5D3C 8011F63C 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B5D40 8011F640 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5D44 8011F644 8C620000 */ lw $v0, ($v1) @@ -107,6 +108,7 @@ glabel func_8011F4D4 /* B5D60 8011F660 2442B7F8 */ addiu $v0, $v0, %lo(D_8014B7F8) /* B5D64 8011F664 08047E7F */ j .L8011F9FC /* B5D68 8011F668 AC820004 */ sw $v0, 4($a0) +glabel L8011F66C_B5D6C /* B5D6C 8011F66C 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B5D70 8011F670 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5D74 8011F674 8C620000 */ lw $v0, ($v1) @@ -119,6 +121,7 @@ glabel func_8011F4D4 /* B5D90 8011F690 2442B820 */ addiu $v0, $v0, %lo(D_8014B820) /* B5D94 8011F694 08047E7F */ j .L8011F9FC /* B5D98 8011F698 AC820004 */ sw $v0, 4($a0) +glabel L8011F69C_B5D9C /* B5D9C 8011F69C 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B5DA0 8011F6A0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5DA4 8011F6A4 8C620000 */ lw $v0, ($v1) @@ -131,6 +134,7 @@ glabel func_8011F4D4 /* B5DC0 8011F6C0 2442B848 */ addiu $v0, $v0, %lo(D_8014B848) /* B5DC4 8011F6C4 08047E7F */ j .L8011F9FC /* B5DC8 8011F6C8 AC820004 */ sw $v0, 4($a0) +glabel L8011F6CC_B5DCC /* B5DCC 8011F6CC 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B5DD0 8011F6D0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5DD4 8011F6D4 8C620000 */ lw $v0, ($v1) @@ -143,6 +147,7 @@ glabel func_8011F4D4 /* B5DF0 8011F6F0 2442B870 */ addiu $v0, $v0, %lo(D_8014B870) /* B5DF4 8011F6F4 08047E7F */ j .L8011F9FC /* B5DF8 8011F6F8 AC820004 */ sw $v0, 4($a0) +glabel L8011F6FC_B5DFC /* B5DFC 8011F6FC 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B5E00 8011F700 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5E04 8011F704 8C620000 */ lw $v0, ($v1) @@ -155,6 +160,7 @@ glabel func_8011F4D4 /* B5E20 8011F720 2442B898 */ addiu $v0, $v0, %lo(D_8014B898) /* B5E24 8011F724 08047E7F */ j .L8011F9FC /* B5E28 8011F728 AC820004 */ sw $v0, 4($a0) +glabel L8011F72C_B5E2C /* B5E2C 8011F72C 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B5E30 8011F730 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5E34 8011F734 8C620000 */ lw $v0, ($v1) @@ -167,6 +173,7 @@ glabel func_8011F4D4 /* B5E50 8011F750 2442B8C0 */ addiu $v0, $v0, %lo(D_8014B8C0) /* B5E54 8011F754 08047E7F */ j .L8011F9FC /* B5E58 8011F758 AC820004 */ sw $v0, 4($a0) +glabel L8011F75C_B5E5C /* B5E5C 8011F75C 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B5E60 8011F760 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5E64 8011F764 8C620000 */ lw $v0, ($v1) @@ -187,11 +194,12 @@ glabel func_8011F4D4 /* B5E9C 8011F79C 2C620026 */ sltiu $v0, $v1, 0x26 /* B5EA0 8011F7A0 10400059 */ beqz $v0, .L8011F908 /* B5EA4 8011F7A4 00031080 */ sll $v0, $v1, 2 -/* B5EA8 8011F7A8 3C018015 */ lui $at, %hi(D_8014FF78) +/* B5EA8 8011F7A8 3C018015 */ lui $at, %hi(jtbl_8014FF78_E6678) /* B5EAC 8011F7AC 00220821 */ addu $at, $at, $v0 -/* B5EB0 8011F7B0 8C22FF78 */ lw $v0, %lo(D_8014FF78)($at) +/* B5EB0 8011F7B0 8C22FF78 */ lw $v0, %lo(jtbl_8014FF78_E6678)($at) /* B5EB4 8011F7B4 00400008 */ jr $v0 -/* B5EB8 8011F7B8 00000000 */ nop +/* B5EB8 8011F7B8 00000000 */ nop +glabel L8011F7BC_B5EBC /* B5EBC 8011F7BC 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B5EC0 8011F7C0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5EC4 8011F7C4 8C620000 */ lw $v0, ($v1) @@ -204,6 +212,7 @@ glabel func_8011F4D4 /* B5EE0 8011F7E0 2442BE78 */ addiu $v0, $v0, %lo(D_8014BE78) /* B5EE4 8011F7E4 08047E42 */ j .L8011F908 /* B5EE8 8011F7E8 AC820004 */ sw $v0, 4($a0) +glabel L8011F7EC_B5EEC /* B5EEC 8011F7EC 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B5EF0 8011F7F0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5EF4 8011F7F4 8C620000 */ lw $v0, ($v1) @@ -216,6 +225,7 @@ glabel func_8011F4D4 /* B5F10 8011F810 2442BEA0 */ addiu $v0, $v0, %lo(D_8014BEA0) /* B5F14 8011F814 08047E42 */ j .L8011F908 /* B5F18 8011F818 AC820004 */ sw $v0, 4($a0) +glabel L8011F81C_B5F1C /* B5F1C 8011F81C 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B5F20 8011F820 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5F24 8011F824 8C620000 */ lw $v0, ($v1) @@ -228,6 +238,7 @@ glabel func_8011F4D4 /* B5F40 8011F840 2442BEC8 */ addiu $v0, $v0, %lo(D_8014BEC8) /* B5F44 8011F844 08047E42 */ j .L8011F908 /* B5F48 8011F848 AC820004 */ sw $v0, 4($a0) +glabel L8011F84C_B5F4C /* B5F4C 8011F84C 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B5F50 8011F850 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5F54 8011F854 8C620000 */ lw $v0, ($v1) @@ -240,6 +251,7 @@ glabel func_8011F4D4 /* B5F70 8011F870 2442BEF0 */ addiu $v0, $v0, %lo(D_8014BEF0) /* B5F74 8011F874 08047E42 */ j .L8011F908 /* B5F78 8011F878 AC820004 */ sw $v0, 4($a0) +glabel L8011F87C_B5F7C /* B5F7C 8011F87C 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B5F80 8011F880 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5F84 8011F884 8C620000 */ lw $v0, ($v1) @@ -252,6 +264,7 @@ glabel func_8011F4D4 /* B5FA0 8011F8A0 2442BF18 */ addiu $v0, $v0, %lo(D_8014BF18) /* B5FA4 8011F8A4 08047E42 */ j .L8011F908 /* B5FA8 8011F8A8 AC820004 */ sw $v0, 4($a0) +glabel L8011F8AC_B5FAC /* B5FAC 8011F8AC 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B5FB0 8011F8B0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5FB4 8011F8B4 8C620000 */ lw $v0, ($v1) @@ -264,6 +277,7 @@ glabel func_8011F4D4 /* B5FD0 8011F8D0 2442BF40 */ addiu $v0, $v0, %lo(D_8014BF40) /* B5FD4 8011F8D4 08047E42 */ j .L8011F908 /* B5FD8 8011F8D8 AC820004 */ sw $v0, 4($a0) +glabel L8011F8DC_B5FDC /* B5FDC 8011F8DC 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B5FE0 8011F8E0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B5FE4 8011F8E4 8C620000 */ lw $v0, ($v1) @@ -276,6 +290,7 @@ glabel func_8011F4D4 /* B6000 8011F900 2442BF68 */ addiu $v0, $v0, %lo(D_8014BF68) /* B6004 8011F904 AC820004 */ sw $v0, 4($a0) .L8011F908: +glabel L8011F908_B6008 /* B6008 8011F908 3C070001 */ lui $a3, 1 /* B600C 8011F90C 3C028015 */ lui $v0, %hi(D_80153A5C) /* B6010 8011F910 8C423A5C */ lw $v0, %lo(D_80153A5C)($v0) @@ -291,7 +306,7 @@ glabel func_8011F4D4 /* B6034 8011F934 14410004 */ bne $v0, $at, .L8011F948 /* B6038 8011F938 3C018000 */ lui $at, 0x8000 /* B603C 8011F93C 14E10002 */ bne $a3, $at, .L8011F948 -/* B6040 8011F940 00000000 */ nop +/* B6040 8011F940 00000000 */ nop /* B6044 8011F944 0006000D */ break 6 .L8011F948: /* B6048 8011F948 00003812 */ mflo $a3 @@ -306,7 +321,7 @@ glabel func_8011F4D4 /* B6068 8011F968 14410004 */ bne $v0, $at, .L8011F97C /* B606C 8011F96C 3C018000 */ lui $at, 0x8000 /* B6070 8011F970 14A10002 */ bne $a1, $at, .L8011F97C -/* B6074 8011F974 00000000 */ nop +/* B6074 8011F974 00000000 */ nop /* B6078 8011F978 0006000D */ break 6 .L8011F97C: /* B607C 8011F97C 00002812 */ mflo $a1 @@ -342,6 +357,7 @@ glabel func_8011F4D4 /* B60F4 8011F9F4 00E53825 */ or $a3, $a3, $a1 /* B60F8 8011F9F8 ACC70004 */ sw $a3, 4($a2) .L8011F9FC: +glabel L8011F9FC_B60FC /* B60FC 8011F9FC 27A40010 */ addiu $a0, $sp, 0x10 .L8011FA00: /* B6100 8011FA00 0C019D60 */ jal guMtxL2F diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FA54.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FA54.s index 0eda9bd2da..a1301527ba 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FA54.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FA54.s @@ -40,7 +40,7 @@ glabel func_8011FA54 /* B61D8 8011FAD8 1440FFF2 */ bnez $v0, .L8011FAA4 /* B61DC 8011FADC 26100004 */ addiu $s0, $s0, 4 /* B61E0 8011FAE0 08047FD1 */ j .L8011FF44 -/* B61E4 8011FAE4 00000000 */ nop +/* B61E4 8011FAE4 00000000 */ nop .L8011FAE8: /* B61E8 8011FAE8 26D000B4 */ addiu $s0, $s6, 0xb4 /* B61EC 8011FAEC 0200202D */ daddu $a0, $s0, $zero @@ -158,7 +158,7 @@ glabel func_8011FA54 /* B63A0 8011FCA0 AE020000 */ sw $v0, ($s0) /* B63A4 8011FCA4 8D4402D8 */ lw $a0, 0x2d8($t2) /* B63A8 8011FCA8 0060F809 */ jalr $v1 -/* B63AC 8011FCAC 00000000 */ nop +/* B63AC 8011FCAC 00000000 */ nop .L8011FCB0: /* B63B0 8011FCB0 8E040000 */ lw $a0, ($s0) /* B63B4 8011FCB4 0080102D */ daddu $v0, $a0, $zero @@ -208,10 +208,10 @@ glabel func_8011FA54 /* B6454 8011FD54 28620060 */ slti $v0, $v1, 0x60 .L8011FD58: /* B6458 8011FD58 14400003 */ bnez $v0, .L8011FD68 -/* B645C 8011FD5C 00000000 */ nop +/* B645C 8011FD5C 00000000 */ nop .L8011FD60: /* B6460 8011FD60 08047F58 */ j .L8011FD60 -/* B6464 8011FD64 00000000 */ nop +/* B6464 8011FD64 00000000 */ nop .L8011FD68: /* B6468 8011FD68 0C00AB0A */ jal general_heap_malloc /* B646C 8011FD6C 000420C0 */ sll $a0, $a0, 3 @@ -220,7 +220,7 @@ glabel func_8011FA54 /* B6478 8011FD78 AEF30004 */ sw $s3, 4($s7) .L8011FD7C: /* B647C 8011FD7C 08047F5F */ j .L8011FD7C -/* B6480 8011FD80 00000000 */ nop +/* B6480 8011FD80 00000000 */ nop .L8011FD84: /* B6484 8011FD84 0000A82D */ daddu $s5, $zero, $zero /* B6488 8011FD88 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FFB4.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FFB4.s index c0fe231791..589183f264 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FFB4.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FFB4.s @@ -14,4 +14,4 @@ glabel func_8011FFB4 /* B66D4 8011FFD4 24A50004 */ addiu $a1, $a1, 4 .L8011FFD8: /* B66D8 8011FFD8 03E00008 */ jr $ra -/* B66DC 8011FFDC 00000000 */ nop +/* B66DC 8011FFDC 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120028.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120028.s index 6859a67101..be59862e61 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120028.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120028.s @@ -6,4 +6,4 @@ glabel func_80120028 /* B672C 8012002C 3C018015 */ lui $at, %hi(D_80153A44) /* B6730 80120030 AC223A44 */ sw $v0, %lo(D_80153A44)($at) /* B6734 80120034 03E00008 */ jr $ra -/* B6738 80120038 00000000 */ nop +/* B6738 80120038 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8012003C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8012003C.s index 23c94d5589..c194b6e432 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8012003C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8012003C.s @@ -5,4 +5,4 @@ glabel func_8012003C /* B673C 8012003C 3C018015 */ lui $at, %hi(D_80153A44) /* B6740 80120040 AC203A44 */ sw $zero, %lo(D_80153A44)($at) /* B6744 80120044 03E00008 */ jr $ra -/* B6748 80120048 00000000 */ nop +/* B6748 80120048 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8012004C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8012004C.s index 74f6f32a9d..8ab91b968e 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8012004C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8012004C.s @@ -7,4 +7,4 @@ glabel func_8012004C /* B6754 80120054 3C018015 */ lui $at, %hi(D_80153A5C) /* B6758 80120058 AC253A5C */ sw $a1, %lo(D_80153A5C)($at) /* B675C 8012005C 03E00008 */ jr $ra -/* B6760 80120060 00000000 */ nop +/* B6760 80120060 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120064.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120064.s index 31efd96689..4bd9dfb5f1 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120064.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120064.s @@ -11,4 +11,4 @@ glabel func_80120064 /* B677C 8012007C 3C018015 */ lui $at, %hi(D_80153A54) /* B6780 80120080 AC273A54 */ sw $a3, %lo(D_80153A54)($at) /* B6784 80120084 03E00008 */ jr $ra -/* B6788 80120088 00000000 */ nop +/* B6788 80120088 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8012008C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8012008C.s index 03c4c9f6f7..e9fada17fc 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8012008C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8012008C.s @@ -5,4 +5,4 @@ glabel func_8012008C /* B678C 8012008C 3C028015 */ lui $v0, %hi(D_80153A44) /* B6790 80120090 8C423A44 */ lw $v0, %lo(D_80153A44)($v0) /* B6794 80120094 03E00008 */ jr $ra -/* B6798 80120098 00000000 */ nop +/* B6798 80120098 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120198.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120198.s index 57a0520eee..dcea9e7c8b 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120198.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120198.s @@ -36,7 +36,7 @@ glabel func_80120198 /* B690C 8012020C 26100001 */ addiu $s0, $s0, 1 /* B6910 80120210 0212102A */ slt $v0, $s0, $s2 /* B6914 80120214 1440FFFB */ bnez $v0, .L80120204 -/* B6918 80120218 00000000 */ nop +/* B6918 80120218 00000000 */ nop .L8012021C: /* B691C 8012021C 8FBF001C */ lw $ra, 0x1c($sp) /* B6920 80120220 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120234.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120234.s index fd69f97957..d95e152ee4 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120234.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120234.s @@ -23,11 +23,11 @@ glabel func_80120234 /* B697C 8012027C 3C018015 */ lui $at, %hi(D_80150010) /* B6980 80120280 D4220010 */ ldc1 $f2, %lo(D_80150010)($at) /* B6984 80120284 44820000 */ mtc1 $v0, $f0 -/* B6988 80120288 00000000 */ nop +/* B6988 80120288 00000000 */ nop /* B698C 8012028C 46800020 */ cvt.s.w $f0, $f0 /* B6990 80120290 46000021 */ cvt.d.s $f0, $f0 /* B6994 80120294 46220002 */ mul.d $f0, $f0, $f2 -/* B6998 80120298 00000000 */ nop +/* B6998 80120298 00000000 */ nop /* B699C 8012029C 3C018015 */ lui $at, %hi(D_80150018) /* B69A0 801202A0 D4240018 */ ldc1 $f4, %lo(D_80150018)($at) /* B69A4 801202A4 46240003 */ div.d $f0, $f0, $f4 @@ -35,21 +35,21 @@ glabel func_80120234 /* B69AC 801202AC E7A00020 */ swc1 $f0, 0x20($sp) /* B69B0 801202B0 86020006 */ lh $v0, 6($s0) /* B69B4 801202B4 44820000 */ mtc1 $v0, $f0 -/* B69B8 801202B8 00000000 */ nop +/* B69B8 801202B8 00000000 */ nop /* B69BC 801202BC 46800020 */ cvt.s.w $f0, $f0 /* B69C0 801202C0 46000021 */ cvt.d.s $f0, $f0 /* B69C4 801202C4 46220002 */ mul.d $f0, $f0, $f2 -/* B69C8 801202C8 00000000 */ nop +/* B69C8 801202C8 00000000 */ nop /* B69CC 801202CC 46240003 */ div.d $f0, $f0, $f4 /* B69D0 801202D0 46200020 */ cvt.s.d $f0, $f0 /* B69D4 801202D4 E7A00024 */ swc1 $f0, 0x24($sp) /* B69D8 801202D8 86020008 */ lh $v0, 8($s0) /* B69DC 801202DC 44820000 */ mtc1 $v0, $f0 -/* B69E0 801202E0 00000000 */ nop +/* B69E0 801202E0 00000000 */ nop /* B69E4 801202E4 46800020 */ cvt.s.w $f0, $f0 /* B69E8 801202E8 46000021 */ cvt.d.s $f0, $f0 /* B69EC 801202EC 46220002 */ mul.d $f0, $f0, $f2 -/* B69F0 801202F0 00000000 */ nop +/* B69F0 801202F0 00000000 */ nop /* B69F4 801202F4 0220202D */ daddu $a0, $s1, $zero /* B69F8 801202F8 0260282D */ daddu $a1, $s3, $zero /* B69FC 801202FC 46240003 */ div.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120420.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120420.s index 24a4a5e864..b4630bd7e8 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120420.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120420.s @@ -14,7 +14,7 @@ glabel func_80120420 /* B6B44 80120444 0C048108 */ jal func_80120420 /* B6B48 80120448 0000302D */ daddu $a2, $zero, $zero /* B6B4C 8012044C 0804811A */ j .L80120468 -/* B6B50 80120450 00000000 */ nop +/* B6B50 80120450 00000000 */ nop .L80120454: /* B6B54 80120454 00451021 */ addu $v0, $v0, $a1 .L80120458: diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120474.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120474.s index 9ede50e6d8..581224f3f4 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120474.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120474.s @@ -13,18 +13,18 @@ glabel func_80120474 /* B6B94 80120494 00431021 */ addu $v0, $v0, $v1 /* B6B98 80120498 8C500000 */ lw $s0, ($v0) /* B6B9C 8012049C 12000020 */ beqz $s0, .L80120520 -/* B6BA0 801204A0 00000000 */ nop +/* B6BA0 801204A0 00000000 */ nop /* B6BA4 801204A4 8E020000 */ lw $v0, ($s0) /* B6BA8 801204A8 1040001D */ beqz $v0, .L80120520 -/* B6BAC 801204AC 00000000 */ nop +/* B6BAC 801204AC 00000000 */ nop /* B6BB0 801204B0 8CA20000 */ lw $v0, ($a1) /* B6BB4 801204B4 84420020 */ lh $v0, 0x20($v0) /* B6BB8 801204B8 14400005 */ bnez $v0, .L801204D0 /* B6BBC 801204BC 24030079 */ addiu $v1, $zero, 0x79 /* B6BC0 801204C0 0C0480EB */ jal func_801203AC -/* B6BC4 801204C4 00000000 */ nop +/* B6BC4 801204C4 00000000 */ nop /* B6BC8 801204C8 08048148 */ j .L80120520 -/* B6BCC 801204CC 00000000 */ nop +/* B6BCC 801204CC 00000000 */ nop .L801204D0: /* B6BD0 801204D0 260201E4 */ addiu $v0, $s0, 0x1e4 /* B6BD4 801204D4 3C018015 */ lui $at, %hi(D_80153B68) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120530.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120530.s index 00a2228c8e..1893ea78c4 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120530.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120530.s @@ -22,11 +22,11 @@ glabel func_80120530 /* B6C74 80120574 3C018015 */ lui $at, %hi(D_80150020) /* B6C78 80120578 D4220020 */ ldc1 $f2, %lo(D_80150020)($at) /* B6C7C 8012057C 44820000 */ mtc1 $v0, $f0 -/* B6C80 80120580 00000000 */ nop +/* B6C80 80120580 00000000 */ nop /* B6C84 80120584 46800020 */ cvt.s.w $f0, $f0 /* B6C88 80120588 46000021 */ cvt.d.s $f0, $f0 /* B6C8C 8012058C 46220002 */ mul.d $f0, $f0, $f2 -/* B6C90 80120590 00000000 */ nop +/* B6C90 80120590 00000000 */ nop /* B6C94 80120594 3C018015 */ lui $at, %hi(D_80150028) /* B6C98 80120598 D4240028 */ ldc1 $f4, %lo(D_80150028)($at) /* B6C9C 8012059C 46240003 */ div.d $f0, $f0, $f4 @@ -34,21 +34,21 @@ glabel func_80120530 /* B6CA4 801205A4 E7A00020 */ swc1 $f0, 0x20($sp) /* B6CA8 801205A8 86020006 */ lh $v0, 6($s0) /* B6CAC 801205AC 44820000 */ mtc1 $v0, $f0 -/* B6CB0 801205B0 00000000 */ nop +/* B6CB0 801205B0 00000000 */ nop /* B6CB4 801205B4 46800020 */ cvt.s.w $f0, $f0 /* B6CB8 801205B8 46000021 */ cvt.d.s $f0, $f0 /* B6CBC 801205BC 46220002 */ mul.d $f0, $f0, $f2 -/* B6CC0 801205C0 00000000 */ nop +/* B6CC0 801205C0 00000000 */ nop /* B6CC4 801205C4 46240003 */ div.d $f0, $f0, $f4 /* B6CC8 801205C8 46200020 */ cvt.s.d $f0, $f0 /* B6CCC 801205CC E7A00024 */ swc1 $f0, 0x24($sp) /* B6CD0 801205D0 86020008 */ lh $v0, 8($s0) /* B6CD4 801205D4 44820000 */ mtc1 $v0, $f0 -/* B6CD8 801205D8 00000000 */ nop +/* B6CD8 801205D8 00000000 */ nop /* B6CDC 801205DC 46800020 */ cvt.s.w $f0, $f0 /* B6CE0 801205E0 46000021 */ cvt.d.s $f0, $f0 /* B6CE4 801205E4 46220002 */ mul.d $f0, $f0, $f2 -/* B6CE8 801205E8 00000000 */ nop +/* B6CE8 801205E8 00000000 */ nop /* B6CEC 801205EC 0220202D */ daddu $a0, $s1, $zero /* B6CF0 801205F0 46240003 */ div.d $f0, $f0, $f4 /* B6CF4 801205F4 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_801206F8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_801206F8.s index 6dd9b35b15..da996839fa 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_801206F8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_801206F8.s @@ -17,24 +17,28 @@ glabel func_801206F8 /* B6E28 80120728 10400114 */ beqz $v0, .L80120B7C /* B6E2C 8012072C 26500002 */ addiu $s0, $s2, 2 /* B6E30 80120730 00031080 */ sll $v0, $v1, 2 -/* B6E34 80120734 3C018015 */ lui $at, %hi(D_80150030) +/* B6E34 80120734 3C018015 */ lui $at, %hi(jtbl_80150030_E6730) /* B6E38 80120738 00220821 */ addu $at, $at, $v0 -/* B6E3C 8012073C 8C220030 */ lw $v0, %lo(D_80150030)($at) +/* B6E3C 8012073C 8C220030 */ lw $v0, %lo(jtbl_80150030_E6730)($at) /* B6E40 80120740 00400008 */ jr $v0 -/* B6E44 80120744 00000000 */ nop +/* B6E44 80120744 00000000 */ nop +glabel L80120748_B6E48 /* B6E48 80120748 080482E0 */ j .L80120B80 /* B6E4C 8012074C 2402FFFF */ addiu $v0, $zero, -1 +glabel L80120750_B6E50 /* B6E50 80120750 92030001 */ lbu $v1, 1($s0) /* B6E54 80120754 26100002 */ addiu $s0, $s0, 2 /* B6E58 80120758 24020001 */ addiu $v0, $zero, 1 /* B6E5C 8012075C AE300008 */ sw $s0, 8($s1) /* B6E60 80120760 080482E0 */ j .L80120B80 /* B6E64 80120764 A2230004 */ sb $v1, 4($s1) +glabel L80120768_B6E68 /* B6E68 80120768 26100002 */ addiu $s0, $s0, 2 /* B6E6C 8012076C AE300008 */ sw $s0, 8($s1) .L80120770: /* B6E70 80120770 080482E0 */ j .L80120B80 /* B6E74 80120774 24020001 */ addiu $v0, $zero, 1 +glabel L80120778_B6E78 /* B6E78 80120778 8E22000C */ lw $v0, 0xc($s1) /* B6E7C 8012077C 8E2302D0 */ lw $v1, 0x2d0($s1) /* B6E80 80120780 0220202D */ daddu $a0, $s1, $zero @@ -43,17 +47,20 @@ glabel func_801206F8 /* B6E8C 8012078C AC8302CC */ sw $v1, 0x2cc($a0) /* B6E90 80120790 080482E0 */ j .L80120B80 /* B6E94 80120794 24020001 */ addiu $v0, $zero, 1 +glabel L80120798_B6E98 /* B6E98 80120798 8E22000C */ lw $v0, 0xc($s1) /* B6E9C 8012079C 8E2302D0 */ lw $v1, 0x2d0($s1) /* B6EA0 801207A0 AE220008 */ sw $v0, 8($s1) /* B6EA4 801207A4 080482DF */ j .L80120B7C /* B6EA8 801207A8 AE2302CC */ sw $v1, 0x2cc($s1) +glabel L801207AC_B6EAC /* B6EAC 801207AC 8E2302CC */ lw $v1, 0x2cc($s1) /* B6EB0 801207B0 24020001 */ addiu $v0, $zero, 1 /* B6EB4 801207B4 AE30000C */ sw $s0, 0xc($s1) /* B6EB8 801207B8 AE300008 */ sw $s0, 8($s1) /* B6EBC 801207BC 080482E0 */ j .L80120B80 /* B6EC0 801207C0 AE2302D0 */ sw $v1, 0x2d0($s1) +glabel L801207C4_B6EC4 /* B6EC4 801207C4 86040000 */ lh $a0, ($s0) /* B6EC8 801207C8 26100002 */ addiu $s0, $s0, 2 /* B6ECC 801207CC 8E230000 */ lw $v1, ($s1) @@ -61,6 +68,7 @@ glabel func_801206F8 /* B6ED4 801207D4 AE300008 */ sw $s0, 8($s1) /* B6ED8 801207D8 08048219 */ j .L80120864 /* B6EDC 801207DC 3084FFFF */ andi $a0, $a0, 0xffff +glabel L801207E0_B6EE0 /* B6EE0 801207E0 86020000 */ lh $v0, ($s0) /* B6EE4 801207E4 8E240010 */ lw $a0, 0x10($s1) /* B6EE8 801207E8 00511021 */ addu $v0, $v0, $s1 @@ -74,6 +82,7 @@ glabel func_801206F8 /* B6F08 80120808 24020001 */ addiu $v0, $zero, 1 /* B6F0C 8012080C 08048212 */ j .L80120848 /* B6F10 80120810 00641825 */ or $v1, $v1, $a0 +glabel L80120814_B6F14 /* B6F14 80120814 86020000 */ lh $v0, ($s0) /* B6F18 80120818 8E240010 */ lw $a0, 0x10($s1) /* B6F1C 8012081C 00511021 */ addu $v0, $v0, $s1 @@ -91,6 +100,7 @@ glabel func_801206F8 /* B6F48 80120848 A4A300F4 */ sh $v1, 0xf4($a1) /* B6F4C 8012084C 080482E0 */ j .L80120B80 /* B6F50 80120850 AE300008 */ sw $s0, 8($s1) +glabel L80120854_B6F54 /* B6F54 80120854 24020001 */ addiu $v0, $zero, 1 /* B6F58 80120858 8E230000 */ lw $v1, ($s1) /* B6F5C 8012085C 3C040002 */ lui $a0, 2 @@ -99,36 +109,37 @@ glabel func_801206F8 /* B6F64 80120864 00641825 */ or $v1, $v1, $a0 /* B6F68 80120868 080482E0 */ j .L80120B80 /* B6F6C 8012086C AE230000 */ sw $v1, ($s1) +glabel L80120870_B6F70 /* B6F70 80120870 86030000 */ lh $v1, ($s0) /* B6F74 80120874 26100002 */ addiu $s0, $s0, 2 /* B6F78 80120878 86020000 */ lh $v0, ($s0) /* B6F7C 8012087C 3C018015 */ lui $at, %hi(D_80150080) /* B6F80 80120880 D4260080 */ ldc1 $f6, %lo(D_80150080)($at) /* B6F84 80120884 44822000 */ mtc1 $v0, $f4 -/* B6F88 80120888 00000000 */ nop +/* B6F88 80120888 00000000 */ nop /* B6F8C 8012088C 46802120 */ cvt.s.w $f4, $f4 /* B6F90 80120890 46002121 */ cvt.d.s $f4, $f4 /* B6F94 80120894 46262102 */ mul.d $f4, $f4, $f6 -/* B6F98 80120898 00000000 */ nop +/* B6F98 80120898 00000000 */ nop /* B6F9C 8012089C 26100002 */ addiu $s0, $s0, 2 /* B6FA0 801208A0 86020000 */ lh $v0, ($s0) /* B6FA4 801208A4 44821000 */ mtc1 $v0, $f2 -/* B6FA8 801208A8 00000000 */ nop +/* B6FA8 801208A8 00000000 */ nop /* B6FAC 801208AC 468010A0 */ cvt.s.w $f2, $f2 /* B6FB0 801208B0 460010A1 */ cvt.d.s $f2, $f2 /* B6FB4 801208B4 46261082 */ mul.d $f2, $f2, $f6 -/* B6FB8 801208B8 00000000 */ nop +/* B6FB8 801208B8 00000000 */ nop /* B6FBC 801208BC 26100002 */ addiu $s0, $s0, 2 /* B6FC0 801208C0 00711821 */ addu $v1, $v1, $s1 /* B6FC4 801208C4 90630014 */ lbu $v1, 0x14($v1) /* B6FC8 801208C8 86020000 */ lh $v0, ($s0) /* B6FCC 801208CC 26100002 */ addiu $s0, $s0, 2 /* B6FD0 801208D0 44820000 */ mtc1 $v0, $f0 -/* B6FD4 801208D4 00000000 */ nop +/* B6FD4 801208D4 00000000 */ nop /* B6FD8 801208D8 46800020 */ cvt.s.w $f0, $f0 /* B6FDC 801208DC 46000021 */ cvt.d.s $f0, $f0 /* B6FE0 801208E0 46260002 */ mul.d $f0, $f0, $f6 -/* B6FE4 801208E4 00000000 */ nop +/* B6FE4 801208E4 00000000 */ nop /* B6FE8 801208E8 AE300008 */ sw $s0, 8($s1) /* B6FEC 801208EC 3C018015 */ lui $at, %hi(D_80150088) /* B6FF0 801208F0 D4260088 */ ldc1 $f6, %lo(D_80150088)($at) @@ -150,36 +161,37 @@ glabel func_801206F8 /* B7030 80120930 E4B600A0 */ swc1 $f22, 0xa0($a1) /* B7034 80120934 080482E0 */ j .L80120B80 /* B7038 80120938 E4B400A4 */ swc1 $f20, 0xa4($a1) +glabel L8012093C_B703C /* B703C 8012093C 86030000 */ lh $v1, ($s0) /* B7040 80120940 26100002 */ addiu $s0, $s0, 2 /* B7044 80120944 86020000 */ lh $v0, ($s0) /* B7048 80120948 3C018015 */ lui $at, %hi(D_80150090) /* B704C 8012094C D4260090 */ ldc1 $f6, %lo(D_80150090)($at) /* B7050 80120950 44822000 */ mtc1 $v0, $f4 -/* B7054 80120954 00000000 */ nop +/* B7054 80120954 00000000 */ nop /* B7058 80120958 46802120 */ cvt.s.w $f4, $f4 /* B705C 8012095C 46002121 */ cvt.d.s $f4, $f4 /* B7060 80120960 46262102 */ mul.d $f4, $f4, $f6 -/* B7064 80120964 00000000 */ nop +/* B7064 80120964 00000000 */ nop /* B7068 80120968 26100002 */ addiu $s0, $s0, 2 /* B706C 8012096C 86020000 */ lh $v0, ($s0) /* B7070 80120970 44821000 */ mtc1 $v0, $f2 -/* B7074 80120974 00000000 */ nop +/* B7074 80120974 00000000 */ nop /* B7078 80120978 468010A0 */ cvt.s.w $f2, $f2 /* B707C 8012097C 460010A1 */ cvt.d.s $f2, $f2 /* B7080 80120980 46261082 */ mul.d $f2, $f2, $f6 -/* B7084 80120984 00000000 */ nop +/* B7084 80120984 00000000 */ nop /* B7088 80120988 26100002 */ addiu $s0, $s0, 2 /* B708C 8012098C 00711821 */ addu $v1, $v1, $s1 /* B7090 80120990 90630014 */ lbu $v1, 0x14($v1) /* B7094 80120994 86020000 */ lh $v0, ($s0) /* B7098 80120998 26100002 */ addiu $s0, $s0, 2 /* B709C 8012099C 44820000 */ mtc1 $v0, $f0 -/* B70A0 801209A0 00000000 */ nop +/* B70A0 801209A0 00000000 */ nop /* B70A4 801209A4 46800020 */ cvt.s.w $f0, $f0 /* B70A8 801209A8 46000021 */ cvt.d.s $f0, $f0 /* B70AC 801209AC 46260002 */ mul.d $f0, $f0, $f6 -/* B70B0 801209B0 00000000 */ nop +/* B70B0 801209B0 00000000 */ nop /* B70B4 801209B4 AE300008 */ sw $s0, 8($s1) /* B70B8 801209B8 3C018015 */ lui $at, %hi(D_80150098) /* B70BC 801209BC D4260098 */ ldc1 $f6, %lo(D_80150098)($at) @@ -207,6 +219,7 @@ glabel func_801206F8 /* B7114 80120A14 E4A200A0 */ swc1 $f2, 0xa0($a1) /* B7118 80120A18 080482E0 */ j .L80120B80 /* B711C 80120A1C E4A000A4 */ swc1 $f0, 0xa4($a1) +glabel L80120A20_B7120 /* B7120 80120A20 86020000 */ lh $v0, ($s0) /* B7124 80120A24 26100002 */ addiu $s0, $s0, 2 /* B7128 80120A28 86040000 */ lh $a0, ($s0) @@ -216,14 +229,14 @@ glabel func_801206F8 /* B7138 80120A38 86050000 */ lh $a1, ($s0) /* B713C 80120A3C 26100002 */ addiu $s0, $s0, 2 /* B7140 80120A40 4484C000 */ mtc1 $a0, $f24 -/* B7144 80120A44 00000000 */ nop +/* B7144 80120A44 00000000 */ nop /* B7148 80120A48 4680C620 */ cvt.s.w $f24, $f24 /* B714C 80120A4C 4483B000 */ mtc1 $v1, $f22 -/* B7150 80120A50 00000000 */ nop +/* B7150 80120A50 00000000 */ nop /* B7154 80120A54 4680B5A0 */ cvt.s.w $f22, $f22 /* B7158 80120A58 00511021 */ addu $v0, $v0, $s1 /* B715C 80120A5C 4485A000 */ mtc1 $a1, $f20 -/* B7160 80120A60 00000000 */ nop +/* B7160 80120A60 00000000 */ nop /* B7164 80120A64 4680A520 */ cvt.s.w $f20, $f20 /* B7168 80120A68 90430014 */ lbu $v1, 0x14($v0) /* B716C 80120A6C 240200FF */ addiu $v0, $zero, 0xff @@ -239,36 +252,37 @@ glabel func_801206F8 /* B7194 80120A94 E4B60094 */ swc1 $f22, 0x94($a1) /* B7198 80120A98 080482E0 */ j .L80120B80 /* B719C 80120A9C E4B40098 */ swc1 $f20, 0x98($a1) +glabel L80120AA0_B71A0 /* B71A0 80120AA0 86030000 */ lh $v1, ($s0) /* B71A4 80120AA4 26100002 */ addiu $s0, $s0, 2 /* B71A8 80120AA8 86020000 */ lh $v0, ($s0) /* B71AC 80120AAC 3C018015 */ lui $at, %hi(D_801500A0) /* B71B0 80120AB0 D42600A0 */ ldc1 $f6, %lo(D_801500A0)($at) /* B71B4 80120AB4 44822000 */ mtc1 $v0, $f4 -/* B71B8 80120AB8 00000000 */ nop +/* B71B8 80120AB8 00000000 */ nop /* B71BC 80120ABC 46802120 */ cvt.s.w $f4, $f4 /* B71C0 80120AC0 46002121 */ cvt.d.s $f4, $f4 /* B71C4 80120AC4 46262102 */ mul.d $f4, $f4, $f6 -/* B71C8 80120AC8 00000000 */ nop +/* B71C8 80120AC8 00000000 */ nop /* B71CC 80120ACC 26100002 */ addiu $s0, $s0, 2 /* B71D0 80120AD0 86020000 */ lh $v0, ($s0) /* B71D4 80120AD4 44821000 */ mtc1 $v0, $f2 -/* B71D8 80120AD8 00000000 */ nop +/* B71D8 80120AD8 00000000 */ nop /* B71DC 80120ADC 468010A0 */ cvt.s.w $f2, $f2 /* B71E0 80120AE0 460010A1 */ cvt.d.s $f2, $f2 /* B71E4 80120AE4 46261082 */ mul.d $f2, $f2, $f6 -/* B71E8 80120AE8 00000000 */ nop +/* B71E8 80120AE8 00000000 */ nop /* B71EC 80120AEC 26100002 */ addiu $s0, $s0, 2 /* B71F0 80120AF0 00711821 */ addu $v1, $v1, $s1 /* B71F4 80120AF4 90630014 */ lbu $v1, 0x14($v1) /* B71F8 80120AF8 86020000 */ lh $v0, ($s0) /* B71FC 80120AFC 26100002 */ addiu $s0, $s0, 2 /* B7200 80120B00 44820000 */ mtc1 $v0, $f0 -/* B7204 80120B04 00000000 */ nop +/* B7204 80120B04 00000000 */ nop /* B7208 80120B08 46800020 */ cvt.s.w $f0, $f0 /* B720C 80120B0C 46000021 */ cvt.d.s $f0, $f0 /* B7210 80120B10 46260002 */ mul.d $f0, $f0, $f6 -/* B7214 80120B14 00000000 */ nop +/* B7214 80120B14 00000000 */ nop /* B7218 80120B18 AE300008 */ sw $s0, 8($s1) /* B721C 80120B1C 3C018015 */ lui $at, %hi(D_801500A8) /* B7220 80120B20 D42600A8 */ ldc1 $f6, %lo(D_801500A8)($at) @@ -296,6 +310,7 @@ glabel func_801206F8 /* B7274 80120B74 24420001 */ addiu $v0, $v0, 1 /* B7278 80120B78 AE2202CC */ sw $v0, 0x2cc($s1) .L80120B7C: +glabel L80120B7C_B727C /* B727C 80120B7C 0000102D */ daddu $v0, $zero, $zero .L80120B80: /* B7280 80120B80 8FBF001C */ lw $ra, 0x1c($sp) @@ -307,6 +322,6 @@ glabel func_801206F8 /* B7298 80120B98 D7B40020 */ ldc1 $f20, 0x20($sp) /* B729C 80120B9C 03E00008 */ jr $ra /* B72A0 80120BA0 27BD0038 */ addiu $sp, $sp, 0x38 -/* B72A4 80120BA4 00000000 */ nop -/* B72A8 80120BA8 00000000 */ nop -/* B72AC 80120BAC 00000000 */ nop +/* B72A4 80120BA4 00000000 */ nop +/* B72A8 80120BA8 00000000 */ nop +/* B72AC 80120BAC 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/get_entity_type.s b/asm/nonmatchings/code_a5dd0_len_114e0/get_entity_type.s index 37d9df6135..4ca16a10f7 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/get_entity_type.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/get_entity_type.s @@ -5,7 +5,7 @@ glabel get_entity_type /* A6DA4 801106A4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* A6DA8 801106A8 AFBF0010 */ sw $ra, 0x10($sp) /* A6DAC 801106AC 0C04417A */ jal get_entity_by_index -/* A6DB0 801106B0 00000000 */ nop +/* A6DB0 801106B0 00000000 */ nop /* A6DB4 801106B4 50400003 */ beql $v0, $zero, .L801106C4 /* A6DB8 801106B8 2402FFFF */ addiu $v0, $zero, -1 /* A6DBC 801106BC 8C420038 */ lw $v0, 0x38($v0) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/get_model_center_and_size.s b/asm/nonmatchings/code_a5dd0_len_114e0/get_model_center_and_size.s index 4933aafb0f..a2aff81518 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/get_model_center_and_size.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/get_model_center_and_size.s @@ -30,7 +30,7 @@ glabel get_model_center_and_size /* B1850 8011B150 0C0456C3 */ jal get_model_property /* B1854 8011B154 E6400000 */ swc1 $f0, ($s2) /* B1858 8011B158 1040000B */ beqz $v0, .L8011B188 -/* B185C 8011B15C 00000000 */ nop +/* B185C 8011B15C 00000000 */ nop /* B1860 8011B160 C4400004 */ lwc1 $f0, 4($v0) /* B1864 8011B164 46800020 */ cvt.s.w $f0, $f0 /* B1868 8011B168 E6600000 */ swc1 $f0, ($s3) @@ -43,7 +43,7 @@ glabel get_model_center_and_size /* B1884 8011B184 E6A00000 */ swc1 $f0, ($s5) .L8011B188: /* B1888 8011B188 44800000 */ mtc1 $zero, $f0 -/* B188C 8011B18C 00000000 */ nop +/* B188C 8011B18C 00000000 */ nop /* B1890 8011B190 E6A00000 */ swc1 $f0, ($s5) /* B1894 8011B194 E6800000 */ swc1 $f0, ($s4) /* B1898 8011B198 E6600000 */ swc1 $f0, ($s3) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/init_model_data.s b/asm/nonmatchings/code_a5dd0_len_114e0/init_model_data.s index 0d57ca3261..a939d03d58 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/init_model_data.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/init_model_data.s @@ -6,7 +6,7 @@ glabel init_model_data /* AC6EC 80115FEC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* AC6F0 80115FF0 80420070 */ lb $v0, 0x70($v0) /* AC6F4 80115FF4 14400027 */ bnez $v0, .L80116094 -/* AC6F8 80115FF8 00000000 */ nop +/* AC6F8 80115FF8 00000000 */ nop /* AC6FC 80115FFC 3C028015 */ lui $v0, %hi(gWorldModelList) /* AC700 80116000 24421770 */ addiu $v0, $v0, %lo(gWorldModelList) /* AC704 80116004 3C018015 */ lui $at, %hi(gCurrentModelListPtr) @@ -44,7 +44,7 @@ glabel init_model_data /* AC784 80116084 3C018015 */ lui $at, %hi(D_80153264) /* AC788 80116088 AC223264 */ sw $v0, %lo(D_80153264)($at) /* AC78C 8011608C 03E00008 */ jr $ra -/* AC790 80116090 00000000 */ nop +/* AC790 80116090 00000000 */ nop .L80116094: /* AC794 80116094 3C028015 */ lui $v0, %hi(gBattleModelList) /* AC798 80116098 24421B70 */ addiu $v0, $v0, %lo(gBattleModelList) @@ -83,4 +83,4 @@ glabel init_model_data /* AC81C 8011611C 3C018015 */ lui $at, %hi(D_80153264) /* AC820 80116120 AC223264 */ sw $v0, %lo(D_80153264)($at) /* AC824 80116124 03E00008 */ jr $ra -/* AC828 80116128 00000000 */ nop +/* AC828 80116128 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/is_entity_data_loaded.s b/asm/nonmatchings/code_a5dd0_len_114e0/is_entity_data_loaded.s index 8e6af0636c..6e79875699 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/is_entity_data_loaded.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/is_entity_data_loaded.s @@ -18,7 +18,7 @@ glabel is_entity_data_loaded .L8011118C: /* A788C 8011118C 8D240000 */ lw $a0, ($t1) /* A7890 80111190 1480000A */ bnez $a0, .L801111BC -/* A7894 80111194 00000000 */ nop +/* A7894 80111194 00000000 */ nop /* A7898 80111198 AD250000 */ sw $a1, ($t1) /* A789C 8011119C AD200004 */ sw $zero, 4($t1) /* A78A0 801111A0 94A20000 */ lhu $v0, ($a1) @@ -27,27 +27,27 @@ glabel is_entity_data_loaded /* A78AC 801111AC 240B0001 */ addiu $t3, $zero, 1 /* A78B0 801111B0 8CA30018 */ lw $v1, 0x18($a1) /* A78B4 801111B4 08044481 */ j .L80111204 -/* A78B8 801111B8 00000000 */ nop +/* A78B8 801111B8 00000000 */ nop .L801111BC: /* A78BC 801111BC 8C880018 */ lw $t0, 0x18($a0) /* A78C0 801111C0 8CA30018 */ lw $v1, 0x18($a1) /* A78C4 801111C4 15030009 */ bne $t0, $v1, .L801111EC -/* A78C8 801111C8 00000000 */ nop +/* A78C8 801111C8 00000000 */ nop /* A78CC 801111CC 94A20000 */ lhu $v0, ($a1) /* A78D0 801111D0 30420008 */ andi $v0, $v0, 8 /* A78D4 801111D4 10400031 */ beqz $v0, .L8011129C -/* A78D8 801111D8 00000000 */ nop +/* A78D8 801111D8 00000000 */ nop /* A78DC 801111DC 8D020004 */ lw $v0, 4($t0) /* A78E0 801111E0 8D030000 */ lw $v1, ($t0) /* A78E4 801111E4 08044484 */ j .L80111210 /* A78E8 801111E8 00431023 */ subu $v0, $v0, $v1 .L801111EC: /* A78EC 801111EC 1485000D */ bne $a0, $a1, .L80111224 -/* A78F0 801111F0 00000000 */ nop +/* A78F0 801111F0 00000000 */ nop /* A78F4 801111F4 94820000 */ lhu $v0, ($a0) /* A78F8 801111F8 30420008 */ andi $v0, $v0, 8 /* A78FC 801111FC 10400027 */ beqz $v0, .L8011129C -/* A7900 80111200 00000000 */ nop +/* A7900 80111200 00000000 */ nop .L80111204: /* A7904 80111204 8C620004 */ lw $v0, 4($v1) /* A7908 80111208 8C630000 */ lw $v1, ($v1) @@ -62,7 +62,7 @@ glabel is_entity_data_loaded /* A7924 80111224 94820000 */ lhu $v0, ($a0) /* A7928 80111228 30420008 */ andi $v0, $v0, 8 /* A792C 8011122C 10400011 */ beqz $v0, .L80111274 -/* A7930 80111230 00000000 */ nop +/* A7930 80111230 00000000 */ nop /* A7934 80111234 8D030004 */ lw $v1, 4($t0) /* A7938 80111238 8D020000 */ lw $v0, ($t0) /* A793C 8011123C 00621823 */ subu $v1, $v1, $v0 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/load_model_textures.s b/asm/nonmatchings/code_a5dd0_len_114e0/load_model_textures.s index 377357a186..a98a276282 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/load_model_textures.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/load_model_textures.s @@ -15,9 +15,9 @@ glabel load_model_textures /* AC34C 80115C4C 3C018015 */ lui $at, %hi(D_80153368) /* AC350 80115C50 AC233368 */ sw $v1, %lo(D_80153368)($at) /* AC354 80115C54 10800011 */ beqz $a0, .L80115C9C -/* AC358 80115C58 00000000 */ nop +/* AC358 80115C58 00000000 */ nop /* AC35C 80115C5C 10A0000F */ beqz $a1, .L80115C9C -/* AC360 80115C60 00000000 */ nop +/* AC360 80115C60 00000000 */ nop /* AC364 80115C64 10C0000D */ beqz $a2, .L80115C9C /* AC368 80115C68 2403007F */ addiu $v1, $zero, 0x7f /* AC36C 80115C6C 3C028016 */ lui $v0, %hi(D_8015C74C) @@ -30,9 +30,9 @@ glabel load_model_textures /* AC384 80115C84 3C018015 */ lui $at, %hi(D_80153224) /* AC388 80115C88 AC203224 */ sw $zero, %lo(D_80153224)($at) /* AC38C 80115C8C 10800003 */ beqz $a0, .L80115C9C -/* AC390 80115C90 00000000 */ nop +/* AC390 80115C90 00000000 */ nop /* AC394 80115C94 0C0456D1 */ jal _load_model_textures -/* AC398 80115C98 00000000 */ nop +/* AC398 80115C98 00000000 */ nop .L80115C9C: /* AC39C 80115C9C 8FBF0010 */ lw $ra, 0x10($sp) /* AC3A0 80115CA0 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/load_model_transforms.s b/asm/nonmatchings/code_a5dd0_len_114e0/load_model_transforms.s index 7f1aaf3967..ca76ee403e 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/load_model_transforms.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/load_model_transforms.s @@ -40,7 +40,7 @@ glabel load_model_transforms /* B154C 8011AE4C 8E230000 */ lw $v1, ($s1) /* B1550 8011AE50 24020005 */ addiu $v0, $zero, 5 /* B1554 8011AE54 14620003 */ bne $v1, $v0, .L8011AE64 -/* B1558 8011AE58 00000000 */ nop +/* B1558 8011AE58 00000000 */ nop /* B155C 8011AE5C 1480002A */ bnez $a0, .L8011AF08 /* B1560 8011AE60 0260202D */ daddu $a0, $s3, $zero .L8011AE64: @@ -128,7 +128,7 @@ glabel load_model_transforms /* B1690 8011AF90 00441021 */ addu $v0, $v0, $a0 /* B1694 8011AF94 0202102A */ slt $v0, $s0, $v0 /* B1698 8011AF98 1440FFF4 */ bnez $v0, .L8011AF6C -/* B169C 8011AF9C 00000000 */ nop +/* B169C 8011AF9C 00000000 */ nop .L8011AFA0: /* B16A0 8011AFA0 3C038015 */ lui $v1, %hi(D_80153224) /* B16A4 8011AFA4 24633224 */ addiu $v1, $v1, %lo(D_80153224) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/load_simple_entity_data.s b/asm/nonmatchings/code_a5dd0_len_114e0/load_simple_entity_data.s index 066f3c8198..73e4f23255 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/load_simple_entity_data.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/load_simple_entity_data.s @@ -29,7 +29,7 @@ glabel load_simple_entity_data /* A79FC 801112FC 0C044457 */ jal is_entity_data_loaded /* A7A00 80111300 27A70014 */ addiu $a3, $sp, 0x14 /* A7A04 80111304 10400020 */ beqz $v0, .L80111388 -/* A7A08 80111308 00000000 */ nop +/* A7A08 80111308 00000000 */ nop /* A7A0C 8011130C 8E22001C */ lw $v0, 0x1c($s1) /* A7A10 80111310 8E230018 */ lw $v1, 0x18($s1) /* A7A14 80111314 00431023 */ subu $v0, $v0, $v1 @@ -37,14 +37,14 @@ glabel load_simple_entity_data /* A7A1C 8011131C 02021021 */ addu $v0, $s0, $v0 /* A7A20 80111320 2C425FFD */ sltiu $v0, $v0, 0x5ffd /* A7A24 80111324 14400007 */ bnez $v0, .L80111344 -/* A7A28 80111328 00000000 */ nop +/* A7A28 80111328 00000000 */ nop /* A7A2C 8011132C 0C0441A9 */ jal get_entity_type /* A7A30 80111330 92440004 */ lbu $a0, 4($s2) /* A7A34 80111334 0C0441A9 */ jal get_entity_type /* A7A38 80111338 92440004 */ lbu $a0, 4($s2) .L8011133C: /* A7A3C 8011133C 080444CF */ j .L8011133C -/* A7A40 80111340 00000000 */ nop +/* A7A40 80111340 00000000 */ nop .L80111344: /* A7A44 80111344 8E22001C */ lw $v0, 0x1c($s1) /* A7A48 80111348 3C068015 */ lui $a2, %hi(D_801512C4) @@ -79,16 +79,16 @@ glabel load_simple_entity_data /* A7AB8 801113B8 AE430044 */ sw $v1, 0x44($s2) .L801113BC: /* A7ABC 801113BC 0C0441A9 */ jal get_entity_type -/* A7AC0 801113C0 00000000 */ nop +/* A7AC0 801113C0 00000000 */ nop /* A7AC4 801113C4 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* A7AC8 801113C8 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* A7ACC 801113CC 80420070 */ lb $v0, 0x70($v0) /* A7AD0 801113D0 14400005 */ bnez $v0, .L801113E8 -/* A7AD4 801113D4 00000000 */ nop +/* A7AD4 801113D4 00000000 */ nop /* A7AD8 801113D8 3C018015 */ lui $at, %hi(D_8015165C) /* A7ADC 801113DC AC30165C */ sw $s0, %lo(D_8015165C)($at) /* A7AE0 801113E0 080444FC */ j .L801113F0 -/* A7AE4 801113E4 00000000 */ nop +/* A7AE4 801113E4 00000000 */ nop .L801113E8: /* A7AE8 801113E8 3C018015 */ lui $at, %hi(D_80151660) /* A7AEC 801113EC AC301660 */ sw $s0, %lo(D_80151660)($at) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/load_split_entity_data.s b/asm/nonmatchings/code_a5dd0_len_114e0/load_split_entity_data.s index 6fe8d6678a..576dd8264d 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/load_split_entity_data.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/load_split_entity_data.s @@ -25,13 +25,15 @@ glabel load_split_entity_data /* A7B58 80111458 2C620008 */ sltiu $v0, $v1, 8 /* A7B5C 8011145C 1040000A */ beqz $v0, .L80111488 /* A7B60 80111460 00031080 */ sll $v0, $v1, 2 -/* A7B64 80111464 3C018015 */ lui $at, %hi(D_8014F858) +/* A7B64 80111464 3C018015 */ lui $at, %hi(jtbl_8014F858_E5F58) /* A7B68 80111468 00220821 */ addu $at, $at, $v0 -/* A7B6C 8011146C 8C22F858 */ lw $v0, %lo(D_8014F858)($at) +/* A7B6C 8011146C 8C22F858 */ lw $v0, %lo(jtbl_8014F858_E5F58)($at) /* A7B70 80111470 00400008 */ jr $v0 -/* A7B74 80111474 00000000 */ nop +/* A7B74 80111474 00000000 */ nop +glabel L80111478_A7B78 /* A7B78 80111478 08044523 */ j .L8011148C /* A7B7C 8011147C 24121000 */ addiu $s2, $zero, 0x1000 +glabel L80111480_A7B80 /* A7B80 80111480 08044523 */ j .L8011148C /* A7B84 80111484 24122BC0 */ addiu $s2, $zero, 0x2bc0 .L80111488: @@ -78,16 +80,16 @@ glabel load_split_entity_data /* A7C1C 8011151C 0C044457 */ jal is_entity_data_loaded /* A7C20 80111520 27A70014 */ addiu $a3, $sp, 0x14 /* A7C24 80111524 10400055 */ beqz $v0, .L8011167C -/* A7C28 80111528 00000000 */ nop +/* A7C28 80111528 00000000 */ nop /* A7C2C 8011152C 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* A7C30 80111530 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* A7C34 80111534 80420070 */ lb $v0, 0x70($v0) /* A7C38 80111538 14400005 */ bnez $v0, .L80111550 -/* A7C3C 8011153C 00000000 */ nop +/* A7C3C 8011153C 00000000 */ nop /* A7C40 80111540 3C128015 */ lui $s2, %hi(D_8015165C) /* A7C44 80111544 8E52165C */ lw $s2, %lo(D_8015165C)($s2) /* A7C48 80111548 08044556 */ j .L80111558 -/* A7C4C 8011154C 00000000 */ nop +/* A7C4C 8011154C 00000000 */ nop .L80111550: /* A7C50 80111550 3C128015 */ lui $s2, %hi(D_80151660) /* A7C54 80111554 8E521660 */ lw $s2, %lo(D_80151660)($s2) @@ -99,12 +101,12 @@ glabel load_split_entity_data /* A7C68 80111568 02421021 */ addu $v0, $s2, $v0 /* A7C6C 8011156C 2C425FFD */ sltiu $v0, $v0, 0x5ffd /* A7C70 80111570 14400005 */ bnez $v0, .L80111588 -/* A7C74 80111574 00000000 */ nop +/* A7C74 80111574 00000000 */ nop /* A7C78 80111578 0C0441A9 */ jal get_entity_type /* A7C7C 8011157C 92840004 */ lbu $a0, 4($s4) .L80111580: /* A7C80 80111580 08044560 */ j .L80111580 -/* A7C84 80111584 00000000 */ nop +/* A7C84 80111584 00000000 */ nop .L80111588: /* A7C88 80111588 8E62000C */ lw $v0, 0xc($s3) /* A7C8C 8011158C 8E630008 */ lw $v1, 8($s3) @@ -116,10 +118,10 @@ glabel load_split_entity_data /* A7CA4 801115A4 00128080 */ sll $s0, $s2, 2 /* A7CA8 801115A8 92840004 */ lbu $a0, 4($s4) /* A7CAC 801115AC 0C0441A9 */ jal get_entity_type -/* A7CB0 801115B0 00000000 */ nop +/* A7CB0 801115B0 00000000 */ nop .L801115B4: /* A7CB4 801115B4 0804456D */ j .L801115B4 -/* A7CB8 801115B8 00000000 */ nop +/* A7CB8 801115B8 00000000 */ nop .L801115BC: /* A7CBC 801115BC 3C118015 */ lui $s1, %hi(D_801512C4) /* A7CC0 801115C0 263112C4 */ addiu $s1, $s1, %lo(D_801512C4) @@ -164,12 +166,12 @@ glabel load_split_entity_data /* A7D5C 8011165C 3C018015 */ lui $at, %hi(D_8015165C) /* A7D60 80111660 AC32165C */ sw $s2, %lo(D_8015165C)($at) /* A7D64 80111664 080445C4 */ j .L80111710 -/* A7D68 80111668 00000000 */ nop +/* A7D68 80111668 00000000 */ nop .L8011166C: /* A7D6C 8011166C 3C018015 */ lui $at, %hi(D_80151660) /* A7D70 80111670 AC321660 */ sw $s2, %lo(D_80151660)($at) /* A7D74 80111674 080445C4 */ j .L80111710 -/* A7D78 80111678 00000000 */ nop +/* A7D78 80111678 00000000 */ nop .L8011167C: /* A7D7C 8011167C 8E620004 */ lw $v0, 4($s3) /* A7D80 80111680 8E630000 */ lw $v1, ($s3) @@ -195,7 +197,7 @@ glabel load_split_entity_data /* A7DD0 801116D0 0C0441A9 */ jal get_entity_type /* A7DD4 801116D4 00A28023 */ subu $s0, $a1, $v0 /* A7DD8 801116D8 080445C4 */ j .L80111710 -/* A7DDC 801116DC 00000000 */ nop +/* A7DDC 801116DC 00000000 */ nop .L801116E0: /* A7DE0 801116E0 0C04792E */ jal func_8011E4B8 /* A7DE4 801116E4 8EC40004 */ lw $a0, 4($s6) @@ -206,9 +208,9 @@ glabel load_split_entity_data /* A7DF8 801116F8 00022403 */ sra $a0, $v0, 0x10 /* A7DFC 801116FC 86840014 */ lh $a0, 0x14($s4) /* A7E00 80111700 0C047A2F */ jal func_8011E8BC -/* A7E04 80111704 00000000 */ nop +/* A7E04 80111704 00000000 */ nop /* A7E08 80111708 080445DA */ j .L80111768 -/* A7E0C 8011170C 00000000 */ nop +/* A7E0C 8011170C 00000000 */ nop .L80111710: /* A7E10 80111710 8EC20008 */ lw $v0, 8($s6) /* A7E14 80111714 8ED10004 */ lw $s1, 4($s6) @@ -229,7 +231,7 @@ glabel load_split_entity_data /* A7E4C 8011174C A6820014 */ sh $v0, 0x14($s4) /* A7E50 80111750 86840014 */ lh $a0, 0x14($s4) /* A7E54 80111754 0C047A2F */ jal func_8011E8BC -/* A7E58 80111758 00000000 */ nop +/* A7E58 80111758 00000000 */ nop /* A7E5C 8011175C 8E820000 */ lw $v0, ($s4) /* A7E60 80111760 34420008 */ ori $v0, $v0, 8 /* A7E64 80111764 AE820000 */ sw $v0, ($s4) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/load_tile_header.s b/asm/nonmatchings/code_a5dd0_len_114e0/load_tile_header.s index 59cbe81e94..e9c7ae625c 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/load_tile_header.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/load_tile_header.s @@ -52,7 +52,7 @@ glabel load_tile_header /* AB520 80114E20 14810004 */ bne $a0, $at, .L80114E34 /* AB524 80114E24 3C018000 */ lui $at, 0x8000 /* AB528 80114E28 14610002 */ bne $v1, $at, .L80114E34 -/* AB52C 80114E2C 00000000 */ nop +/* AB52C 80114E2C 00000000 */ nop /* AB530 80114E30 0006000D */ break 6 .L80114E34: /* AB534 80114E34 00001012 */ mflo $v0 @@ -68,7 +68,7 @@ glabel load_tile_header /* AB554 80114E54 14810004 */ bne $a0, $at, .L80114E68 /* AB558 80114E58 3C018000 */ lui $at, 0x8000 /* AB55C 80114E5C 14C10002 */ bne $a2, $at, .L80114E68 -/* AB560 80114E60 00000000 */ nop +/* AB560 80114E60 00000000 */ nop /* AB564 80114E64 0006000D */ break 6 .L80114E68: /* AB568 80114E68 00001012 */ mflo $v0 @@ -82,15 +82,15 @@ glabel load_tile_header /* AB584 80114E84 14810004 */ bne $a0, $at, .L80114E98 /* AB588 80114E88 3C018000 */ lui $at, 0x8000 /* AB58C 80114E8C 14E10002 */ bne $a3, $at, .L80114E98 -/* AB590 80114E90 00000000 */ nop +/* AB590 80114E90 00000000 */ nop /* AB594 80114E94 0006000D */ break 6 .L80114E98: /* AB598 80114E98 00001012 */ mflo $v0 -/* AB59C 80114E9C 00000000 */ nop -/* AB5A0 80114EA0 00000000 */ nop +/* AB59C 80114E9C 00000000 */ nop +/* AB5A0 80114EA0 00000000 */ nop /* AB5A4 80114EA4 00460018 */ mult $v0, $a2 /* AB5A8 80114EA8 00001812 */ mflo $v1 -/* AB5AC 80114EAC 00000000 */ nop +/* AB5AC 80114EAC 00000000 */ nop /* AB5B0 80114EB0 14800002 */ bnez $a0, .L80114EBC /* AB5B4 80114EB4 0064001A */ div $zero, $v1, $a0 /* AB5B8 80114EB8 0007000D */ break 7 @@ -99,7 +99,7 @@ glabel load_tile_header /* AB5C0 80114EC0 14810004 */ bne $a0, $at, .L80114ED4 /* AB5C4 80114EC4 3C018000 */ lui $at, 0x8000 /* AB5C8 80114EC8 14610002 */ bne $v1, $at, .L80114ED4 -/* AB5CC 80114ECC 00000000 */ nop +/* AB5CC 80114ECC 00000000 */ nop /* AB5D0 80114ED0 0006000D */ break 6 .L80114ED4: /* AB5D4 80114ED4 00001812 */ mflo $v1 @@ -112,7 +112,7 @@ glabel load_tile_header /* AB5EC 80114EEC 14810004 */ bne $a0, $at, .L80114F00 /* AB5F0 80114EF0 3C018000 */ lui $at, 0x8000 /* AB5F4 80114EF4 14E10002 */ bne $a3, $at, .L80114F00 -/* AB5F8 80114EF8 00000000 */ nop +/* AB5F8 80114EF8 00000000 */ nop /* AB5FC 80114EFC 0006000D */ break 6 .L80114F00: /* AB600 80114F00 00001012 */ mflo $v0 @@ -124,7 +124,7 @@ glabel load_tile_header .L80114F18: /* AB618 80114F18 24080100 */ addiu $t0, $zero, 0x100 /* AB61C 80114F1C 14480044 */ bne $v0, $t0, .L80115030 -/* AB620 80114F20 00000000 */ nop +/* AB620 80114F20 00000000 */ nop /* AB624 80114F24 92420029 */ lbu $v0, 0x29($s2) /* AB628 80114F28 145600D7 */ bne $v0, $s6, .L80115288 /* AB62C 80114F2C 24050002 */ addiu $a1, $zero, 2 @@ -136,14 +136,14 @@ glabel load_tile_header /* AB640 80114F40 14A10004 */ bne $a1, $at, .L80114F54 /* AB644 80114F44 3C018000 */ lui $at, 0x8000 /* AB648 80114F48 14610002 */ bne $v1, $at, .L80114F54 -/* AB64C 80114F4C 00000000 */ nop +/* AB64C 80114F4C 00000000 */ nop /* AB650 80114F50 0006000D */ break 6 .L80114F54: /* AB654 80114F54 00001012 */ mflo $v0 .L80114F58: /* AB658 80114F58 28420008 */ slti $v0, $v0, 8 /* AB65C 80114F5C 144000CA */ bnez $v0, .L80115288 -/* AB660 80114F60 00000000 */ nop +/* AB660 80114F60 00000000 */ nop /* AB664 80114F64 14A00002 */ bnez $a1, .L80114F70 /* AB668 80114F68 00C5001A */ div $zero, $a2, $a1 /* AB66C 80114F6C 0007000D */ break 7 @@ -152,12 +152,12 @@ glabel load_tile_header /* AB674 80114F74 14A10004 */ bne $a1, $at, .L80114F88 /* AB678 80114F78 3C018000 */ lui $at, 0x8000 /* AB67C 80114F7C 14C10002 */ bne $a2, $at, .L80114F88 -/* AB680 80114F80 00000000 */ nop +/* AB680 80114F80 00000000 */ nop /* AB684 80114F84 0006000D */ break 6 .L80114F88: /* AB688 80114F88 00001012 */ mflo $v0 /* AB68C 80114F8C 184000BE */ blez $v0, .L80115288 -/* AB690 80114F90 00000000 */ nop +/* AB690 80114F90 00000000 */ nop /* AB694 80114F94 96430022 */ lhu $v1, 0x22($s2) /* AB698 80114F98 14A00002 */ bnez $a1, .L80114FA4 /* AB69C 80114F9C 0065001A */ div $zero, $v1, $a1 @@ -167,15 +167,15 @@ glabel load_tile_header /* AB6A8 80114FA8 14A10004 */ bne $a1, $at, .L80114FBC /* AB6AC 80114FAC 3C018000 */ lui $at, 0x8000 /* AB6B0 80114FB0 14610002 */ bne $v1, $at, .L80114FBC -/* AB6B4 80114FB4 00000000 */ nop +/* AB6B4 80114FB4 00000000 */ nop /* AB6B8 80114FB8 0006000D */ break 6 .L80114FBC: /* AB6BC 80114FBC 00001012 */ mflo $v0 -/* AB6C0 80114FC0 00000000 */ nop -/* AB6C4 80114FC4 00000000 */ nop +/* AB6C0 80114FC0 00000000 */ nop +/* AB6C4 80114FC4 00000000 */ nop /* AB6C8 80114FC8 00460018 */ mult $v0, $a2 /* AB6CC 80114FCC 00004812 */ mflo $t1 -/* AB6D0 80114FD0 00000000 */ nop +/* AB6D0 80114FD0 00000000 */ nop /* AB6D4 80114FD4 14A00002 */ bnez $a1, .L80114FE0 /* AB6D8 80114FD8 0125001A */ div $zero, $t1, $a1 /* AB6DC 80114FDC 0007000D */ break 7 @@ -184,7 +184,7 @@ glabel load_tile_header /* AB6E4 80114FE4 14A10004 */ bne $a1, $at, .L80114FF8 /* AB6E8 80114FE8 3C018000 */ lui $at, 0x8000 /* AB6EC 80114FEC 15210002 */ bne $t1, $at, .L80114FF8 -/* AB6F0 80114FF0 00000000 */ nop +/* AB6F0 80114FF0 00000000 */ nop /* AB6F4 80114FF4 0006000D */ break 6 .L80114FF8: /* AB6F8 80114FF8 00002012 */ mflo $a0 @@ -197,7 +197,7 @@ glabel load_tile_header /* AB710 80115010 14A10004 */ bne $a1, $at, .L80115024 /* AB714 80115014 3C018000 */ lui $at, 0x8000 /* AB718 80115018 14610002 */ bne $v1, $at, .L80115024 -/* AB71C 8011501C 00000000 */ nop +/* AB71C 8011501C 00000000 */ nop /* AB720 80115020 0006000D */ break 6 .L80115024: /* AB724 80115024 00001012 */ mflo $v0 @@ -222,7 +222,7 @@ glabel load_tile_header /* AB768 80115068 14810004 */ bne $a0, $at, .L8011507C /* AB76C 8011506C 3C018000 */ lui $at, 0x8000 /* AB770 80115070 14E10002 */ bne $a3, $at, .L8011507C -/* AB774 80115074 00000000 */ nop +/* AB774 80115074 00000000 */ nop /* AB778 80115078 0006000D */ break 6 .L8011507C: /* AB77C 8011507C 00001012 */ mflo $v0 @@ -239,7 +239,7 @@ glabel load_tile_header /* AB7A0 801150A0 14810004 */ bne $a0, $at, .L801150B4 /* AB7A4 801150A4 3C018000 */ lui $at, 0x8000 /* AB7A8 801150A8 14C10002 */ bne $a2, $at, .L801150B4 -/* AB7AC 801150AC 00000000 */ nop +/* AB7AC 801150AC 00000000 */ nop /* AB7B0 801150B0 0006000D */ break 6 .L801150B4: /* AB7B4 801150B4 00001012 */ mflo $v0 @@ -253,15 +253,15 @@ glabel load_tile_header /* AB7D0 801150D0 14810004 */ bne $a0, $at, .L801150E4 /* AB7D4 801150D4 3C018000 */ lui $at, 0x8000 /* AB7D8 801150D8 14E10002 */ bne $a3, $at, .L801150E4 -/* AB7DC 801150DC 00000000 */ nop +/* AB7DC 801150DC 00000000 */ nop /* AB7E0 801150E0 0006000D */ break 6 .L801150E4: /* AB7E4 801150E4 00001012 */ mflo $v0 -/* AB7E8 801150E8 00000000 */ nop -/* AB7EC 801150EC 00000000 */ nop +/* AB7E8 801150E8 00000000 */ nop +/* AB7EC 801150EC 00000000 */ nop /* AB7F0 801150F0 00460018 */ mult $v0, $a2 /* AB7F4 801150F4 00001812 */ mflo $v1 -/* AB7F8 801150F8 00000000 */ nop +/* AB7F8 801150F8 00000000 */ nop /* AB7FC 801150FC 14800002 */ bnez $a0, .L80115108 /* AB800 80115100 0064001A */ div $zero, $v1, $a0 /* AB804 80115104 0007000D */ break 7 @@ -270,7 +270,7 @@ glabel load_tile_header /* AB80C 8011510C 14810004 */ bne $a0, $at, .L80115120 /* AB810 80115110 3C018000 */ lui $at, 0x8000 /* AB814 80115114 14610002 */ bne $v1, $at, .L80115120 -/* AB818 80115118 00000000 */ nop +/* AB818 80115118 00000000 */ nop /* AB81C 8011511C 0006000D */ break 6 .L80115120: /* AB820 80115120 00001812 */ mflo $v1 @@ -283,7 +283,7 @@ glabel load_tile_header /* AB838 80115138 14810004 */ bne $a0, $at, .L8011514C /* AB83C 8011513C 3C018000 */ lui $at, 0x8000 /* AB840 80115140 14E10002 */ bne $a3, $at, .L8011514C -/* AB844 80115144 00000000 */ nop +/* AB844 80115144 00000000 */ nop /* AB848 80115148 0006000D */ break 6 .L8011514C: /* AB84C 8011514C 00001012 */ mflo $v0 @@ -294,7 +294,7 @@ glabel load_tile_header /* AB860 80115160 00108040 */ sll $s0, $s0, 1 .L80115164: /* AB864 80115164 14620048 */ bne $v1, $v0, .L80115288 -/* AB868 80115168 00000000 */ nop +/* AB868 80115168 00000000 */ nop /* AB86C 8011516C 92420029 */ lbu $v0, 0x29($s2) /* AB870 80115170 54560045 */ bnel $v0, $s6, .L80115288 /* AB874 80115174 00108080 */ sll $s0, $s0, 2 @@ -308,7 +308,7 @@ glabel load_tile_header /* AB890 80115190 14810004 */ bne $a0, $at, .L801151A4 /* AB894 80115194 3C018000 */ lui $at, 0x8000 /* AB898 80115198 14E10002 */ bne $a3, $at, .L801151A4 -/* AB89C 8011519C 00000000 */ nop +/* AB89C 8011519C 00000000 */ nop /* AB8A0 801151A0 0006000D */ break 6 .L801151A4: /* AB8A4 801151A4 00001012 */ mflo $v0 @@ -325,7 +325,7 @@ glabel load_tile_header /* AB8C8 801151C8 14810004 */ bne $a0, $at, .L801151DC /* AB8CC 801151CC 3C018000 */ lui $at, 0x8000 /* AB8D0 801151D0 14C10002 */ bne $a2, $at, .L801151DC -/* AB8D4 801151D4 00000000 */ nop +/* AB8D4 801151D4 00000000 */ nop /* AB8D8 801151D8 0006000D */ break 6 .L801151DC: /* AB8DC 801151DC 00001012 */ mflo $v0 @@ -339,15 +339,15 @@ glabel load_tile_header /* AB8F8 801151F8 14810004 */ bne $a0, $at, .L8011520C /* AB8FC 801151FC 3C018000 */ lui $at, 0x8000 /* AB900 80115200 14E10002 */ bne $a3, $at, .L8011520C -/* AB904 80115204 00000000 */ nop +/* AB904 80115204 00000000 */ nop /* AB908 80115208 0006000D */ break 6 .L8011520C: /* AB90C 8011520C 00001012 */ mflo $v0 -/* AB910 80115210 00000000 */ nop -/* AB914 80115214 00000000 */ nop +/* AB910 80115210 00000000 */ nop +/* AB914 80115214 00000000 */ nop /* AB918 80115218 00460018 */ mult $v0, $a2 /* AB91C 8011521C 00001812 */ mflo $v1 -/* AB920 80115220 00000000 */ nop +/* AB920 80115220 00000000 */ nop /* AB924 80115224 14800002 */ bnez $a0, .L80115230 /* AB928 80115228 0064001A */ div $zero, $v1, $a0 /* AB92C 8011522C 0007000D */ break 7 @@ -356,7 +356,7 @@ glabel load_tile_header /* AB934 80115234 14810004 */ bne $a0, $at, .L80115248 /* AB938 80115238 3C018000 */ lui $at, 0x8000 /* AB93C 8011523C 14610002 */ bne $v1, $at, .L80115248 -/* AB940 80115240 00000000 */ nop +/* AB940 80115240 00000000 */ nop /* AB944 80115244 0006000D */ break 6 .L80115248: /* AB948 80115248 00001812 */ mflo $v1 @@ -369,7 +369,7 @@ glabel load_tile_header /* AB960 80115260 14810004 */ bne $a0, $at, .L80115274 /* AB964 80115264 3C018000 */ lui $at, 0x8000 /* AB968 80115268 14E10002 */ bne $a3, $at, .L80115274 -/* AB96C 8011526C 00000000 */ nop +/* AB96C 8011526C 00000000 */ nop /* AB970 80115270 0006000D */ break 6 .L80115274: /* AB974 80115274 00001012 */ mflo $v0 @@ -452,7 +452,7 @@ glabel load_tile_header /* ABA88 80115388 03C21021 */ addu $v0, $fp, $v0 /* ABA8C 8011538C 0282102B */ sltu $v0, $s4, $v0 /* ABA90 80115390 14400009 */ bnez $v0, .L801153B8 -/* ABA94 80115394 00000000 */ nop +/* ABA94 80115394 00000000 */ nop .L80115398: /* ABA98 80115398 3C028015 */ lui $v0, %hi(D_80153224) /* ABA9C 8011539C 8C423224 */ lw $v0, %lo(D_80153224)($v0) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/queue_render_task.s b/asm/nonmatchings/code_a5dd0_len_114e0/queue_render_task.s index 80ba509853..45d74e8d7d 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/queue_render_task.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/queue_render_task.s @@ -15,7 +15,7 @@ glabel queue_render_task /* B4038 8011D938 0080302D */ daddu $a2, $a0, $zero .L8011D93C: /* B403C 8011D93C 0804764F */ j .L8011D93C -/* B4040 8011D940 00000000 */ nop +/* B4040 8011D940 00000000 */ nop .L8011D944: /* B4044 8011D944 3C048015 */ lui $a0, %hi(D_801533B0) /* B4048 8011D948 248433B0 */ addiu $a0, $a0, %lo(D_801533B0) @@ -29,7 +29,7 @@ glabel queue_render_task /* B4068 8011D968 8CC30000 */ lw $v1, ($a2) /* B406C 8011D96C 2402002D */ addiu $v0, $zero, 0x2d /* B4070 8011D970 14620003 */ bne $v1, $v0, .L8011D980 -/* B4074 8011D974 00000000 */ nop +/* B4074 8011D974 00000000 */ nop /* B4078 8011D978 24020021 */ addiu $v0, $zero, 0x21 /* B407C 8011D97C ACA20000 */ sw $v0, ($a1) .L8011D980: diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/render_entities.s b/asm/nonmatchings/code_a5dd0_len_114e0/render_entities.s index 6595435de4..944f382dfe 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/render_entities.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/render_entities.s @@ -19,7 +19,7 @@ glabel render_entities /* A65E8 8010FEE8 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* A65EC 8010FEEC 80420070 */ lb $v0, 0x70($v0) /* A65F0 8010FEF0 14400025 */ bnez $v0, .L8010FF88 -/* A65F4 8010FEF4 00000000 */ nop +/* A65F4 8010FEF4 00000000 */ nop /* A65F8 8010FEF8 3C028015 */ lui $v0, %hi(D_80151310) /* A65FC 8010FEFC 8C421310 */ lw $v0, %lo(D_80151310)($v0) /* A6600 8010FF00 10400013 */ beqz $v0, .L8010FF50 @@ -27,7 +27,7 @@ glabel render_entities /* A6608 8010FF08 8E020000 */ lw $v0, ($s0) /* A660C 8010FF0C 00431024 */ and $v0, $v0, $v1 /* A6610 8010FF10 1440000F */ bnez $v0, .L8010FF50 -/* A6614 8010FF14 00000000 */ nop +/* A6614 8010FF14 00000000 */ nop /* A6618 8010FF18 8E060048 */ lw $a2, 0x48($s0) /* A661C 8010FF1C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A6620 8010FF20 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -37,9 +37,9 @@ glabel render_entities /* A6630 8010FF30 C44E0030 */ lwc1 $f14, 0x30($v0) /* A6634 8010FF34 3C014348 */ lui $at, 0x4348 /* A6638 8010FF38 44811000 */ mtc1 $at, $f2 -/* A663C 8010FF3C 00000000 */ nop +/* A663C 8010FF3C 00000000 */ nop /* A6640 8010FF40 4600103C */ c.lt.s $f2, $f0 -/* A6644 8010FF44 00000000 */ nop +/* A6644 8010FF44 00000000 */ nop /* A6648 8010FF48 45030055 */ bc1tl .L801100A0 /* A664C 8010FF4C 26310001 */ addiu $s1, $s1, 1 .L8010FF50: @@ -66,14 +66,14 @@ glabel render_entities /* A6694 8010FF94 26310001 */ addiu $s1, $s1, 1 /* A6698 8010FF98 30620008 */ andi $v0, $v1, 8 /* A669C 8010FF9C 1040001F */ beqz $v0, .L8011001C -/* A66A0 8010FFA0 00000000 */ nop +/* A66A0 8010FFA0 00000000 */ nop /* A66A4 8010FFA4 3C028015 */ lui $v0, %hi(D_8014AFB0) /* A66A8 8010FFA8 8C42AFB0 */ lw $v0, %lo(D_8014AFB0)($v0) /* A66AC 8010FFAC 14520007 */ bne $v0, $s2, .L8010FFCC -/* A66B0 8010FFB0 00000000 */ nop +/* A66B0 8010FFB0 00000000 */ nop /* A66B4 8010FFB4 8E06003C */ lw $a2, 0x3c($s0) /* A66B8 8010FFB8 10C0000A */ beqz $a2, .L8010FFE4 -/* A66BC 8010FFBC 00000000 */ nop +/* A66BC 8010FFBC 00000000 */ nop /* A66C0 8010FFC0 86040014 */ lh $a0, 0x14($s0) /* A66C4 8010FFC4 08043FF7 */ j .L8010FFDC /* A66C8 8010FFC8 92050004 */ lbu $a1, 4($s0) @@ -84,11 +84,11 @@ glabel render_entities /* A66D8 8010FFD8 24C6FE44 */ addiu $a2, $a2, %lo(func_8010FE44) .L8010FFDC: /* A66DC 8010FFDC 0C048000 */ jal func_80120000 -/* A66E0 8010FFE0 00000000 */ nop +/* A66E0 8010FFE0 00000000 */ nop .L8010FFE4: /* A66E4 8010FFE4 8E070044 */ lw $a3, 0x44($s0) /* A66E8 8010FFE8 14E00006 */ bnez $a3, .L80110004 -/* A66EC 8010FFEC 00000000 */ nop +/* A66EC 8010FFEC 00000000 */ nop /* A66F0 8010FFF0 86040014 */ lh $a0, 0x14($s0) /* A66F4 8010FFF4 0C047CC1 */ jal func_8011F304 /* A66F8 8010FFF8 260500B8 */ addiu $a1, $s0, 0xb8 @@ -105,10 +105,10 @@ glabel render_entities /* A671C 8011001C 3C028015 */ lui $v0, %hi(D_8014AFB0) /* A6720 80110020 8C42AFB0 */ lw $v0, %lo(D_8014AFB0)($v0) /* A6724 80110024 1452000B */ bne $v0, $s2, .L80110054 -/* A6728 80110028 00000000 */ nop +/* A6728 80110028 00000000 */ nop /* A672C 8011002C 8E06003C */ lw $a2, 0x3c($s0) /* A6730 80110030 10C00004 */ beqz $a2, .L80110044 -/* A6734 80110034 00000000 */ nop +/* A6734 80110034 00000000 */ nop /* A6738 80110038 86040014 */ lh $a0, 0x14($s0) /* A673C 8011003C 08044019 */ j .L80110064 /* A6740 80110040 92050004 */ lbu $a1, 4($s0) @@ -124,11 +124,11 @@ glabel render_entities /* A6760 80110060 24C6FE44 */ addiu $a2, $a2, %lo(func_8010FE44) .L80110064: /* A6764 80110064 0C048BD9 */ jal func_80122F64 -/* A6768 80110068 00000000 */ nop +/* A6768 80110068 00000000 */ nop .L8011006C: /* A676C 8011006C 8E070044 */ lw $a3, 0x44($s0) /* A6770 80110070 14E00006 */ bnez $a3, .L8011008C -/* A6774 80110074 00000000 */ nop +/* A6774 80110074 00000000 */ nop /* A6778 80110078 86040014 */ lh $a0, 0x14($s0) /* A677C 8011007C 0C04873A */ jal func_80121CE8 /* A6780 80110080 260500B8 */ addiu $a1, $s0, 0xb8 @@ -143,9 +143,9 @@ glabel render_entities .L801100A0: /* A67A0 801100A0 2A22001E */ slti $v0, $s1, 0x1e /* A67A4 801100A4 1440FF8A */ bnez $v0, .L8010FED0 -/* A67A8 801100A8 00000000 */ nop +/* A67A8 801100A8 00000000 */ nop /* A67AC 801100AC 0C044033 */ jal render_shadows -/* A67B0 801100B0 00000000 */ nop +/* A67B0 801100B0 00000000 */ nop /* A67B4 801100B4 8FBF001C */ lw $ra, 0x1c($sp) /* A67B8 801100B8 8FB20018 */ lw $s2, 0x18($sp) /* A67BC 801100BC 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/render_models.s b/asm/nonmatchings/code_a5dd0_len_114e0/render_models.s index 93eccf552c..fb88fd53f1 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/render_models.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/render_models.s @@ -109,45 +109,45 @@ glabel render_models /* AD42C 80116D2C 461AC101 */ sub.s $f4, $f24, $f26 /* AD430 80116D30 C7BA0048 */ lwc1 $f26, 0x48($sp) /* AD434 80116D34 4604D182 */ mul.s $f6, $f26, $f4 -/* AD438 80116D38 00000000 */ nop +/* AD438 80116D38 00000000 */ nop /* AD43C 80116D3C C7B8008C */ lwc1 $f24, 0x8c($sp) /* AD440 80116D40 C7BA00A0 */ lwc1 $f26, 0xa0($sp) /* AD444 80116D44 461AC301 */ sub.s $f12, $f24, $f26 /* AD448 80116D48 C7B80058 */ lwc1 $f24, 0x58($sp) /* AD44C 80116D4C 460CC582 */ mul.s $f22, $f24, $f12 -/* AD450 80116D50 00000000 */ nop +/* AD450 80116D50 00000000 */ nop /* AD454 80116D54 C7BA0090 */ lwc1 $f26, 0x90($sp) /* AD458 80116D58 461CD501 */ sub.s $f20, $f26, $f28 /* AD45C 80116D5C C7BA004C */ lwc1 $f26, 0x4c($sp) /* AD460 80116D60 4604D002 */ mul.s $f0, $f26, $f4 -/* AD464 80116D64 00000000 */ nop +/* AD464 80116D64 00000000 */ nop /* AD468 80116D68 C7B80068 */ lwc1 $f24, 0x68($sp) /* AD46C 80116D6C 4614C382 */ mul.s $f14, $f24, $f20 -/* AD470 80116D70 00000000 */ nop +/* AD470 80116D70 00000000 */ nop /* AD474 80116D74 C7BA006C */ lwc1 $f26, 0x6c($sp) /* AD478 80116D78 4614D402 */ mul.s $f16, $f26, $f20 -/* AD47C 80116D7C 00000000 */ nop +/* AD47C 80116D7C 00000000 */ nop /* AD480 80116D80 C7B8005C */ lwc1 $f24, 0x5c($sp) /* AD484 80116D84 460CC202 */ mul.s $f8, $f24, $f12 -/* AD488 80116D88 00000000 */ nop +/* AD488 80116D88 00000000 */ nop /* AD48C 80116D8C C7BA0060 */ lwc1 $f26, 0x60($sp) /* AD490 80116D90 460CD282 */ mul.s $f10, $f26, $f12 -/* AD494 80116D94 00000000 */ nop +/* AD494 80116D94 00000000 */ nop /* AD498 80116D98 C7B80050 */ lwc1 $f24, 0x50($sp) /* AD49C 80116D9C 4604C082 */ mul.s $f2, $f24, $f4 -/* AD4A0 80116DA0 00000000 */ nop +/* AD4A0 80116DA0 00000000 */ nop /* AD4A4 80116DA4 C7BA0054 */ lwc1 $f26, 0x54($sp) /* AD4A8 80116DA8 4604D102 */ mul.s $f4, $f26, $f4 -/* AD4AC 80116DAC 00000000 */ nop +/* AD4AC 80116DAC 00000000 */ nop /* AD4B0 80116DB0 C7B80070 */ lwc1 $f24, 0x70($sp) /* AD4B4 80116DB4 4614C482 */ mul.s $f18, $f24, $f20 -/* AD4B8 80116DB8 00000000 */ nop +/* AD4B8 80116DB8 00000000 */ nop /* AD4BC 80116DBC C7BA0074 */ lwc1 $f26, 0x74($sp) /* AD4C0 80116DC0 4614D502 */ mul.s $f20, $f26, $f20 -/* AD4C4 80116DC4 00000000 */ nop +/* AD4C4 80116DC4 00000000 */ nop /* AD4C8 80116DC8 C7B80064 */ lwc1 $f24, 0x64($sp) /* AD4CC 80116DCC 460CC302 */ mul.s $f12, $f24, $f12 -/* AD4D0 80116DD0 00000000 */ nop +/* AD4D0 80116DD0 00000000 */ nop /* AD4D4 80116DD4 46163180 */ add.s $f6, $f6, $f22 /* AD4D8 80116DD8 460E3180 */ add.s $f6, $f6, $f14 /* AD4DC 80116DDC 46080000 */ add.s $f0, $f0, $f8 @@ -169,90 +169,90 @@ glabel render_models /* AD51C 80116E1C E7A8003C */ swc1 $f8, 0x3c($sp) /* AD520 80116E20 E7A20040 */ swc1 $f2, 0x40($sp) /* AD524 80116E24 46182032 */ c.eq.s $f4, $f24 -/* AD528 80116E28 00000000 */ nop +/* AD528 80116E28 00000000 */ nop /* AD52C 80116E2C 45010312 */ bc1t .L80117A78 /* AD530 80116E30 E7A40044 */ swc1 $f4, 0x44($sp) /* AD534 80116E34 4604F003 */ div.s $f0, $f30, $f4 /* AD538 80116E38 46003102 */ mul.s $f4, $f6, $f0 -/* AD53C 80116E3C 00000000 */ nop +/* AD53C 80116E3C 00000000 */ nop /* AD540 80116E40 46004302 */ mul.s $f12, $f8, $f0 -/* AD544 80116E44 00000000 */ nop +/* AD544 80116E44 00000000 */ nop /* AD548 80116E48 46001502 */ mul.s $f20, $f2, $f0 -/* AD54C 80116E4C 00000000 */ nop +/* AD54C 80116E4C 00000000 */ nop /* AD550 80116E50 3C01BF80 */ lui $at, 0xbf80 /* AD554 80116E54 4481D000 */ mtc1 $at, $f26 -/* AD558 80116E58 00000000 */ nop +/* AD558 80116E58 00000000 */ nop /* AD55C 80116E5C 4614D03C */ c.lt.s $f26, $f20 -/* AD560 80116E60 00000000 */ nop +/* AD560 80116E60 00000000 */ nop /* AD564 80116E64 45000011 */ bc1f .L80116EAC /* AD568 80116E68 E7A00044 */ swc1 $f0, 0x44($sp) /* AD56C 80116E6C 4604D03E */ c.le.s $f26, $f4 -/* AD570 80116E70 00000000 */ nop +/* AD570 80116E70 00000000 */ nop /* AD574 80116E74 4500000D */ bc1f .L80116EAC -/* AD578 80116E78 00000000 */ nop +/* AD578 80116E78 00000000 */ nop /* AD57C 80116E7C 461E203E */ c.le.s $f4, $f30 -/* AD580 80116E80 00000000 */ nop +/* AD580 80116E80 00000000 */ nop /* AD584 80116E84 45000009 */ bc1f .L80116EAC -/* AD588 80116E88 00000000 */ nop +/* AD588 80116E88 00000000 */ nop /* AD58C 80116E8C 460CD03E */ c.le.s $f26, $f12 -/* AD590 80116E90 00000000 */ nop +/* AD590 80116E90 00000000 */ nop /* AD594 80116E94 45000005 */ bc1f .L80116EAC -/* AD598 80116E98 00000000 */ nop +/* AD598 80116E98 00000000 */ nop /* AD59C 80116E9C 461E603E */ c.le.s $f12, $f30 -/* AD5A0 80116EA0 00000000 */ nop +/* AD5A0 80116EA0 00000000 */ nop /* AD5A4 80116EA4 450102F4 */ bc1t .L80117A78 -/* AD5A8 80116EA8 00000000 */ nop +/* AD5A8 80116EA8 00000000 */ nop .L80116EAC: /* AD5AC 80116EAC C7B80098 */ lwc1 $f24, 0x98($sp) /* AD5B0 80116EB0 4480D000 */ mtc1 $zero, $f26 -/* AD5B4 80116EB4 00000000 */ nop +/* AD5B4 80116EB4 00000000 */ nop /* AD5B8 80116EB8 461AC032 */ c.eq.s $f24, $f26 -/* AD5BC 80116EBC 00000000 */ nop +/* AD5BC 80116EBC 00000000 */ nop /* AD5C0 80116EC0 45010062 */ bc1t .L8011704C -/* AD5C4 80116EC4 00000000 */ nop +/* AD5C4 80116EC4 00000000 */ nop /* AD5C8 80116EC8 C7BA0088 */ lwc1 $f26, 0x88($sp) /* AD5CC 80116ECC 4618D100 */ add.s $f4, $f26, $f24 /* AD5D0 80116ED0 C7B80048 */ lwc1 $f24, 0x48($sp) /* AD5D4 80116ED4 4604C182 */ mul.s $f6, $f24, $f4 -/* AD5D8 80116ED8 00000000 */ nop +/* AD5D8 80116ED8 00000000 */ nop /* AD5DC 80116EDC C7BA008C */ lwc1 $f26, 0x8c($sp) /* AD5E0 80116EE0 C7B800A0 */ lwc1 $f24, 0xa0($sp) /* AD5E4 80116EE4 4618D301 */ sub.s $f12, $f26, $f24 /* AD5E8 80116EE8 C7BA0058 */ lwc1 $f26, 0x58($sp) /* AD5EC 80116EEC 460CD582 */ mul.s $f22, $f26, $f12 -/* AD5F0 80116EF0 00000000 */ nop +/* AD5F0 80116EF0 00000000 */ nop /* AD5F4 80116EF4 C7B80090 */ lwc1 $f24, 0x90($sp) /* AD5F8 80116EF8 461CC501 */ sub.s $f20, $f24, $f28 /* AD5FC 80116EFC C7B8004C */ lwc1 $f24, 0x4c($sp) /* AD600 80116F00 4604C002 */ mul.s $f0, $f24, $f4 -/* AD604 80116F04 00000000 */ nop +/* AD604 80116F04 00000000 */ nop /* AD608 80116F08 C7BA0068 */ lwc1 $f26, 0x68($sp) /* AD60C 80116F0C 4614D382 */ mul.s $f14, $f26, $f20 -/* AD610 80116F10 00000000 */ nop +/* AD610 80116F10 00000000 */ nop /* AD614 80116F14 C7B8006C */ lwc1 $f24, 0x6c($sp) /* AD618 80116F18 4614C402 */ mul.s $f16, $f24, $f20 -/* AD61C 80116F1C 00000000 */ nop +/* AD61C 80116F1C 00000000 */ nop /* AD620 80116F20 C7BA005C */ lwc1 $f26, 0x5c($sp) /* AD624 80116F24 460CD202 */ mul.s $f8, $f26, $f12 -/* AD628 80116F28 00000000 */ nop +/* AD628 80116F28 00000000 */ nop /* AD62C 80116F2C C7B80060 */ lwc1 $f24, 0x60($sp) /* AD630 80116F30 460CC282 */ mul.s $f10, $f24, $f12 -/* AD634 80116F34 00000000 */ nop +/* AD634 80116F34 00000000 */ nop /* AD638 80116F38 C7BA0050 */ lwc1 $f26, 0x50($sp) /* AD63C 80116F3C 4604D082 */ mul.s $f2, $f26, $f4 -/* AD640 80116F40 00000000 */ nop +/* AD640 80116F40 00000000 */ nop /* AD644 80116F44 C7B80054 */ lwc1 $f24, 0x54($sp) /* AD648 80116F48 4604C102 */ mul.s $f4, $f24, $f4 -/* AD64C 80116F4C 00000000 */ nop +/* AD64C 80116F4C 00000000 */ nop /* AD650 80116F50 C7BA0070 */ lwc1 $f26, 0x70($sp) /* AD654 80116F54 4614D482 */ mul.s $f18, $f26, $f20 -/* AD658 80116F58 00000000 */ nop +/* AD658 80116F58 00000000 */ nop /* AD65C 80116F5C C7B80074 */ lwc1 $f24, 0x74($sp) /* AD660 80116F60 4614C502 */ mul.s $f20, $f24, $f20 -/* AD664 80116F64 00000000 */ nop +/* AD664 80116F64 00000000 */ nop /* AD668 80116F68 C7BA0064 */ lwc1 $f26, 0x64($sp) /* AD66C 80116F6C 460CD302 */ mul.s $f12, $f26, $f12 -/* AD670 80116F70 00000000 */ nop +/* AD670 80116F70 00000000 */ nop /* AD674 80116F74 46163180 */ add.s $f6, $f6, $f22 /* AD678 80116F78 460E3180 */ add.s $f6, $f6, $f14 /* AD67C 80116F7C 46080000 */ add.s $f0, $f0, $f8 @@ -274,91 +274,91 @@ glabel render_models /* AD6BC 80116FBC E7A8003C */ swc1 $f8, 0x3c($sp) /* AD6C0 80116FC0 E7A20040 */ swc1 $f2, 0x40($sp) /* AD6C4 80116FC4 461A2032 */ c.eq.s $f4, $f26 -/* AD6C8 80116FC8 00000000 */ nop +/* AD6C8 80116FC8 00000000 */ nop /* AD6CC 80116FCC 450102AA */ bc1t .L80117A78 /* AD6D0 80116FD0 E7A40044 */ swc1 $f4, 0x44($sp) /* AD6D4 80116FD4 4604F003 */ div.s $f0, $f30, $f4 /* AD6D8 80116FD8 46003102 */ mul.s $f4, $f6, $f0 -/* AD6DC 80116FDC 00000000 */ nop +/* AD6DC 80116FDC 00000000 */ nop /* AD6E0 80116FE0 46004302 */ mul.s $f12, $f8, $f0 -/* AD6E4 80116FE4 00000000 */ nop +/* AD6E4 80116FE4 00000000 */ nop /* AD6E8 80116FE8 46001502 */ mul.s $f20, $f2, $f0 -/* AD6EC 80116FEC 00000000 */ nop +/* AD6EC 80116FEC 00000000 */ nop /* AD6F0 80116FF0 3C01BF80 */ lui $at, 0xbf80 /* AD6F4 80116FF4 4481C000 */ mtc1 $at, $f24 -/* AD6F8 80116FF8 00000000 */ nop +/* AD6F8 80116FF8 00000000 */ nop /* AD6FC 80116FFC 4614C03C */ c.lt.s $f24, $f20 -/* AD700 80117000 00000000 */ nop +/* AD700 80117000 00000000 */ nop /* AD704 80117004 45000011 */ bc1f .L8011704C /* AD708 80117008 E7A00044 */ swc1 $f0, 0x44($sp) /* AD70C 8011700C 4604C03E */ c.le.s $f24, $f4 -/* AD710 80117010 00000000 */ nop +/* AD710 80117010 00000000 */ nop /* AD714 80117014 4500000D */ bc1f .L8011704C -/* AD718 80117018 00000000 */ nop +/* AD718 80117018 00000000 */ nop /* AD71C 8011701C 461E203E */ c.le.s $f4, $f30 -/* AD720 80117020 00000000 */ nop +/* AD720 80117020 00000000 */ nop /* AD724 80117024 45000009 */ bc1f .L8011704C -/* AD728 80117028 00000000 */ nop +/* AD728 80117028 00000000 */ nop /* AD72C 8011702C 460CC03E */ c.le.s $f24, $f12 -/* AD730 80117030 00000000 */ nop +/* AD730 80117030 00000000 */ nop /* AD734 80117034 45000005 */ bc1f .L8011704C -/* AD738 80117038 00000000 */ nop +/* AD738 80117038 00000000 */ nop /* AD73C 8011703C 461E603E */ c.le.s $f12, $f30 -/* AD740 80117040 00000000 */ nop +/* AD740 80117040 00000000 */ nop /* AD744 80117044 4501028C */ bc1t .L80117A78 -/* AD748 80117048 00000000 */ nop +/* AD748 80117048 00000000 */ nop .L8011704C: /* AD74C 8011704C C7BA00A0 */ lwc1 $f26, 0xa0($sp) /* AD750 80117050 4480C000 */ mtc1 $zero, $f24 -/* AD754 80117054 00000000 */ nop +/* AD754 80117054 00000000 */ nop /* AD758 80117058 4618D032 */ c.eq.s $f26, $f24 -/* AD75C 8011705C 00000000 */ nop +/* AD75C 8011705C 00000000 */ nop /* AD760 80117060 45010063 */ bc1t .L801171F0 -/* AD764 80117064 00000000 */ nop +/* AD764 80117064 00000000 */ nop /* AD768 80117068 C7BA0088 */ lwc1 $f26, 0x88($sp) /* AD76C 8011706C C7B80098 */ lwc1 $f24, 0x98($sp) /* AD770 80117070 4618D101 */ sub.s $f4, $f26, $f24 /* AD774 80117074 C7BA0048 */ lwc1 $f26, 0x48($sp) /* AD778 80117078 4604D182 */ mul.s $f6, $f26, $f4 -/* AD77C 8011707C 00000000 */ nop +/* AD77C 8011707C 00000000 */ nop /* AD780 80117080 C7B8008C */ lwc1 $f24, 0x8c($sp) /* AD784 80117084 C7BA00A0 */ lwc1 $f26, 0xa0($sp) /* AD788 80117088 461AC300 */ add.s $f12, $f24, $f26 /* AD78C 8011708C C7B80058 */ lwc1 $f24, 0x58($sp) /* AD790 80117090 460CC582 */ mul.s $f22, $f24, $f12 -/* AD794 80117094 00000000 */ nop +/* AD794 80117094 00000000 */ nop /* AD798 80117098 C7BA0090 */ lwc1 $f26, 0x90($sp) /* AD79C 8011709C 461CD501 */ sub.s $f20, $f26, $f28 /* AD7A0 801170A0 C7BA004C */ lwc1 $f26, 0x4c($sp) /* AD7A4 801170A4 4604D002 */ mul.s $f0, $f26, $f4 -/* AD7A8 801170A8 00000000 */ nop +/* AD7A8 801170A8 00000000 */ nop /* AD7AC 801170AC C7B80068 */ lwc1 $f24, 0x68($sp) /* AD7B0 801170B0 4614C382 */ mul.s $f14, $f24, $f20 -/* AD7B4 801170B4 00000000 */ nop +/* AD7B4 801170B4 00000000 */ nop /* AD7B8 801170B8 C7BA006C */ lwc1 $f26, 0x6c($sp) /* AD7BC 801170BC 4614D402 */ mul.s $f16, $f26, $f20 -/* AD7C0 801170C0 00000000 */ nop +/* AD7C0 801170C0 00000000 */ nop /* AD7C4 801170C4 C7B8005C */ lwc1 $f24, 0x5c($sp) /* AD7C8 801170C8 460CC202 */ mul.s $f8, $f24, $f12 -/* AD7CC 801170CC 00000000 */ nop +/* AD7CC 801170CC 00000000 */ nop /* AD7D0 801170D0 C7BA0060 */ lwc1 $f26, 0x60($sp) /* AD7D4 801170D4 460CD282 */ mul.s $f10, $f26, $f12 -/* AD7D8 801170D8 00000000 */ nop +/* AD7D8 801170D8 00000000 */ nop /* AD7DC 801170DC C7B80050 */ lwc1 $f24, 0x50($sp) /* AD7E0 801170E0 4604C082 */ mul.s $f2, $f24, $f4 -/* AD7E4 801170E4 00000000 */ nop +/* AD7E4 801170E4 00000000 */ nop /* AD7E8 801170E8 C7BA0054 */ lwc1 $f26, 0x54($sp) /* AD7EC 801170EC 4604D102 */ mul.s $f4, $f26, $f4 -/* AD7F0 801170F0 00000000 */ nop +/* AD7F0 801170F0 00000000 */ nop /* AD7F4 801170F4 C7B80070 */ lwc1 $f24, 0x70($sp) /* AD7F8 801170F8 4614C482 */ mul.s $f18, $f24, $f20 -/* AD7FC 801170FC 00000000 */ nop +/* AD7FC 801170FC 00000000 */ nop /* AD800 80117100 C7BA0074 */ lwc1 $f26, 0x74($sp) /* AD804 80117104 4614D502 */ mul.s $f20, $f26, $f20 -/* AD808 80117108 00000000 */ nop +/* AD808 80117108 00000000 */ nop /* AD80C 8011710C C7B80064 */ lwc1 $f24, 0x64($sp) /* AD810 80117110 460CC302 */ mul.s $f12, $f24, $f12 -/* AD814 80117114 00000000 */ nop +/* AD814 80117114 00000000 */ nop /* AD818 80117118 46163180 */ add.s $f6, $f6, $f22 /* AD81C 8011711C 460E3180 */ add.s $f6, $f6, $f14 /* AD820 80117120 46080000 */ add.s $f0, $f0, $f8 @@ -380,96 +380,96 @@ glabel render_models /* AD860 80117160 E7A8003C */ swc1 $f8, 0x3c($sp) /* AD864 80117164 E7A20040 */ swc1 $f2, 0x40($sp) /* AD868 80117168 46182032 */ c.eq.s $f4, $f24 -/* AD86C 8011716C 00000000 */ nop +/* AD86C 8011716C 00000000 */ nop /* AD870 80117170 45010241 */ bc1t .L80117A78 /* AD874 80117174 E7A40044 */ swc1 $f4, 0x44($sp) /* AD878 80117178 4604F003 */ div.s $f0, $f30, $f4 /* AD87C 8011717C 46003102 */ mul.s $f4, $f6, $f0 -/* AD880 80117180 00000000 */ nop +/* AD880 80117180 00000000 */ nop /* AD884 80117184 46004302 */ mul.s $f12, $f8, $f0 -/* AD888 80117188 00000000 */ nop +/* AD888 80117188 00000000 */ nop /* AD88C 8011718C 46001502 */ mul.s $f20, $f2, $f0 -/* AD890 80117190 00000000 */ nop +/* AD890 80117190 00000000 */ nop /* AD894 80117194 3C01BF80 */ lui $at, 0xbf80 /* AD898 80117198 4481D000 */ mtc1 $at, $f26 -/* AD89C 8011719C 00000000 */ nop +/* AD89C 8011719C 00000000 */ nop /* AD8A0 801171A0 4614D03C */ c.lt.s $f26, $f20 -/* AD8A4 801171A4 00000000 */ nop +/* AD8A4 801171A4 00000000 */ nop /* AD8A8 801171A8 45000011 */ bc1f .L801171F0 /* AD8AC 801171AC E7A00044 */ swc1 $f0, 0x44($sp) /* AD8B0 801171B0 4604D03E */ c.le.s $f26, $f4 -/* AD8B4 801171B4 00000000 */ nop +/* AD8B4 801171B4 00000000 */ nop /* AD8B8 801171B8 4500000D */ bc1f .L801171F0 -/* AD8BC 801171BC 00000000 */ nop +/* AD8BC 801171BC 00000000 */ nop /* AD8C0 801171C0 461E203E */ c.le.s $f4, $f30 -/* AD8C4 801171C4 00000000 */ nop +/* AD8C4 801171C4 00000000 */ nop /* AD8C8 801171C8 45000009 */ bc1f .L801171F0 -/* AD8CC 801171CC 00000000 */ nop +/* AD8CC 801171CC 00000000 */ nop /* AD8D0 801171D0 460CD03E */ c.le.s $f26, $f12 -/* AD8D4 801171D4 00000000 */ nop +/* AD8D4 801171D4 00000000 */ nop /* AD8D8 801171D8 45000005 */ bc1f .L801171F0 -/* AD8DC 801171DC 00000000 */ nop +/* AD8DC 801171DC 00000000 */ nop /* AD8E0 801171E0 461E603E */ c.le.s $f12, $f30 -/* AD8E4 801171E4 00000000 */ nop +/* AD8E4 801171E4 00000000 */ nop /* AD8E8 801171E8 45010223 */ bc1t .L80117A78 -/* AD8EC 801171EC 00000000 */ nop +/* AD8EC 801171EC 00000000 */ nop .L801171F0: /* AD8F0 801171F0 C7B80098 */ lwc1 $f24, 0x98($sp) /* AD8F4 801171F4 4480D000 */ mtc1 $zero, $f26 -/* AD8F8 801171F8 00000000 */ nop +/* AD8F8 801171F8 00000000 */ nop /* AD8FC 801171FC 461AC032 */ c.eq.s $f24, $f26 -/* AD900 80117200 00000000 */ nop +/* AD900 80117200 00000000 */ nop /* AD904 80117204 45010068 */ bc1t .L801173A8 -/* AD908 80117208 00000000 */ nop +/* AD908 80117208 00000000 */ nop /* AD90C 8011720C C7B800A0 */ lwc1 $f24, 0xa0($sp) /* AD910 80117210 461AC032 */ c.eq.s $f24, $f26 -/* AD914 80117214 00000000 */ nop +/* AD914 80117214 00000000 */ nop /* AD918 80117218 45010063 */ bc1t .L801173A8 -/* AD91C 8011721C 00000000 */ nop +/* AD91C 8011721C 00000000 */ nop /* AD920 80117220 C7BA0088 */ lwc1 $f26, 0x88($sp) /* AD924 80117224 C7B80098 */ lwc1 $f24, 0x98($sp) /* AD928 80117228 4618D100 */ add.s $f4, $f26, $f24 /* AD92C 8011722C C7BA0048 */ lwc1 $f26, 0x48($sp) /* AD930 80117230 4604D182 */ mul.s $f6, $f26, $f4 -/* AD934 80117234 00000000 */ nop +/* AD934 80117234 00000000 */ nop /* AD938 80117238 C7B8008C */ lwc1 $f24, 0x8c($sp) /* AD93C 8011723C C7BA00A0 */ lwc1 $f26, 0xa0($sp) /* AD940 80117240 461AC300 */ add.s $f12, $f24, $f26 /* AD944 80117244 C7B80058 */ lwc1 $f24, 0x58($sp) /* AD948 80117248 460CC582 */ mul.s $f22, $f24, $f12 -/* AD94C 8011724C 00000000 */ nop +/* AD94C 8011724C 00000000 */ nop /* AD950 80117250 C7BA0090 */ lwc1 $f26, 0x90($sp) /* AD954 80117254 461CD501 */ sub.s $f20, $f26, $f28 /* AD958 80117258 C7BA004C */ lwc1 $f26, 0x4c($sp) /* AD95C 8011725C 4604D002 */ mul.s $f0, $f26, $f4 -/* AD960 80117260 00000000 */ nop +/* AD960 80117260 00000000 */ nop /* AD964 80117264 C7B80068 */ lwc1 $f24, 0x68($sp) /* AD968 80117268 4614C382 */ mul.s $f14, $f24, $f20 -/* AD96C 8011726C 00000000 */ nop +/* AD96C 8011726C 00000000 */ nop /* AD970 80117270 C7BA006C */ lwc1 $f26, 0x6c($sp) /* AD974 80117274 4614D402 */ mul.s $f16, $f26, $f20 -/* AD978 80117278 00000000 */ nop +/* AD978 80117278 00000000 */ nop /* AD97C 8011727C C7B8005C */ lwc1 $f24, 0x5c($sp) /* AD980 80117280 460CC202 */ mul.s $f8, $f24, $f12 -/* AD984 80117284 00000000 */ nop +/* AD984 80117284 00000000 */ nop /* AD988 80117288 C7BA0060 */ lwc1 $f26, 0x60($sp) /* AD98C 8011728C 460CD282 */ mul.s $f10, $f26, $f12 -/* AD990 80117290 00000000 */ nop +/* AD990 80117290 00000000 */ nop /* AD994 80117294 C7B80050 */ lwc1 $f24, 0x50($sp) /* AD998 80117298 4604C082 */ mul.s $f2, $f24, $f4 -/* AD99C 8011729C 00000000 */ nop +/* AD99C 8011729C 00000000 */ nop /* AD9A0 801172A0 C7BA0054 */ lwc1 $f26, 0x54($sp) /* AD9A4 801172A4 4604D102 */ mul.s $f4, $f26, $f4 -/* AD9A8 801172A8 00000000 */ nop +/* AD9A8 801172A8 00000000 */ nop /* AD9AC 801172AC C7B80070 */ lwc1 $f24, 0x70($sp) /* AD9B0 801172B0 4614C482 */ mul.s $f18, $f24, $f20 -/* AD9B4 801172B4 00000000 */ nop +/* AD9B4 801172B4 00000000 */ nop /* AD9B8 801172B8 C7BA0074 */ lwc1 $f26, 0x74($sp) /* AD9BC 801172BC 4614D502 */ mul.s $f20, $f26, $f20 -/* AD9C0 801172C0 00000000 */ nop +/* AD9C0 801172C0 00000000 */ nop /* AD9C4 801172C4 C7B80064 */ lwc1 $f24, 0x64($sp) /* AD9C8 801172C8 460CC302 */ mul.s $f12, $f24, $f12 -/* AD9CC 801172CC 00000000 */ nop +/* AD9CC 801172CC 00000000 */ nop /* AD9D0 801172D0 46163180 */ add.s $f6, $f6, $f22 /* AD9D4 801172D4 460E3180 */ add.s $f6, $f6, $f14 /* AD9D8 801172D8 46080000 */ add.s $f0, $f0, $f8 @@ -491,91 +491,91 @@ glabel render_models /* ADA18 80117318 E7A8003C */ swc1 $f8, 0x3c($sp) /* ADA1C 8011731C E7A20040 */ swc1 $f2, 0x40($sp) /* ADA20 80117320 46182032 */ c.eq.s $f4, $f24 -/* ADA24 80117324 00000000 */ nop +/* ADA24 80117324 00000000 */ nop /* ADA28 80117328 450101D3 */ bc1t .L80117A78 /* ADA2C 8011732C E7A40044 */ swc1 $f4, 0x44($sp) /* ADA30 80117330 4604F003 */ div.s $f0, $f30, $f4 /* ADA34 80117334 46003102 */ mul.s $f4, $f6, $f0 -/* ADA38 80117338 00000000 */ nop +/* ADA38 80117338 00000000 */ nop /* ADA3C 8011733C 46004302 */ mul.s $f12, $f8, $f0 -/* ADA40 80117340 00000000 */ nop +/* ADA40 80117340 00000000 */ nop /* ADA44 80117344 46001502 */ mul.s $f20, $f2, $f0 -/* ADA48 80117348 00000000 */ nop +/* ADA48 80117348 00000000 */ nop /* ADA4C 8011734C 3C01BF80 */ lui $at, 0xbf80 /* ADA50 80117350 4481D000 */ mtc1 $at, $f26 -/* ADA54 80117354 00000000 */ nop +/* ADA54 80117354 00000000 */ nop /* ADA58 80117358 4614D03C */ c.lt.s $f26, $f20 -/* ADA5C 8011735C 00000000 */ nop +/* ADA5C 8011735C 00000000 */ nop /* ADA60 80117360 45000013 */ bc1f .L801173B0 /* ADA64 80117364 E7A00044 */ swc1 $f0, 0x44($sp) /* ADA68 80117368 4604D03E */ c.le.s $f26, $f4 -/* ADA6C 8011736C 00000000 */ nop +/* ADA6C 8011736C 00000000 */ nop /* ADA70 80117370 4500000F */ bc1f .L801173B0 -/* ADA74 80117374 00000000 */ nop +/* ADA74 80117374 00000000 */ nop /* ADA78 80117378 461E203E */ c.le.s $f4, $f30 -/* ADA7C 8011737C 00000000 */ nop +/* ADA7C 8011737C 00000000 */ nop /* ADA80 80117380 4500000B */ bc1f .L801173B0 -/* ADA84 80117384 00000000 */ nop +/* ADA84 80117384 00000000 */ nop /* ADA88 80117388 460CD03E */ c.le.s $f26, $f12 -/* ADA8C 8011738C 00000000 */ nop +/* ADA8C 8011738C 00000000 */ nop /* ADA90 80117390 45000007 */ bc1f .L801173B0 -/* ADA94 80117394 00000000 */ nop +/* ADA94 80117394 00000000 */ nop /* ADA98 80117398 461E603E */ c.le.s $f12, $f30 -/* ADA9C 8011739C 00000000 */ nop +/* ADA9C 8011739C 00000000 */ nop /* ADAA0 801173A0 450101B5 */ bc1t .L80117A78 -/* ADAA4 801173A4 00000000 */ nop +/* ADAA4 801173A4 00000000 */ nop .L801173A8: /* ADAA8 801173A8 4480C000 */ mtc1 $zero, $f24 -/* ADAAC 801173AC 00000000 */ nop +/* ADAAC 801173AC 00000000 */ nop .L801173B0: /* ADAB0 801173B0 4618E032 */ c.eq.s $f28, $f24 -/* ADAB4 801173B4 00000000 */ nop +/* ADAB4 801173B4 00000000 */ nop /* ADAB8 801173B8 45010063 */ bc1t .L80117548 -/* ADABC 801173BC 00000000 */ nop +/* ADABC 801173BC 00000000 */ nop /* ADAC0 801173C0 C7BA0088 */ lwc1 $f26, 0x88($sp) /* ADAC4 801173C4 C7B80098 */ lwc1 $f24, 0x98($sp) /* ADAC8 801173C8 4618D101 */ sub.s $f4, $f26, $f24 /* ADACC 801173CC C7BA0048 */ lwc1 $f26, 0x48($sp) /* ADAD0 801173D0 4604D182 */ mul.s $f6, $f26, $f4 -/* ADAD4 801173D4 00000000 */ nop +/* ADAD4 801173D4 00000000 */ nop /* ADAD8 801173D8 C7B8008C */ lwc1 $f24, 0x8c($sp) /* ADADC 801173DC C7BA00A0 */ lwc1 $f26, 0xa0($sp) /* ADAE0 801173E0 461AC301 */ sub.s $f12, $f24, $f26 /* ADAE4 801173E4 C7B80058 */ lwc1 $f24, 0x58($sp) /* ADAE8 801173E8 460CC582 */ mul.s $f22, $f24, $f12 -/* ADAEC 801173EC 00000000 */ nop +/* ADAEC 801173EC 00000000 */ nop /* ADAF0 801173F0 C7BA0090 */ lwc1 $f26, 0x90($sp) /* ADAF4 801173F4 461CD500 */ add.s $f20, $f26, $f28 /* ADAF8 801173F8 C7BA004C */ lwc1 $f26, 0x4c($sp) /* ADAFC 801173FC 4604D002 */ mul.s $f0, $f26, $f4 -/* ADB00 80117400 00000000 */ nop +/* ADB00 80117400 00000000 */ nop /* ADB04 80117404 C7B80068 */ lwc1 $f24, 0x68($sp) /* ADB08 80117408 4614C382 */ mul.s $f14, $f24, $f20 -/* ADB0C 8011740C 00000000 */ nop +/* ADB0C 8011740C 00000000 */ nop /* ADB10 80117410 C7BA006C */ lwc1 $f26, 0x6c($sp) /* ADB14 80117414 4614D402 */ mul.s $f16, $f26, $f20 -/* ADB18 80117418 00000000 */ nop +/* ADB18 80117418 00000000 */ nop /* ADB1C 8011741C C7B8005C */ lwc1 $f24, 0x5c($sp) /* ADB20 80117420 460CC202 */ mul.s $f8, $f24, $f12 -/* ADB24 80117424 00000000 */ nop +/* ADB24 80117424 00000000 */ nop /* ADB28 80117428 C7BA0060 */ lwc1 $f26, 0x60($sp) /* ADB2C 8011742C 460CD282 */ mul.s $f10, $f26, $f12 -/* ADB30 80117430 00000000 */ nop +/* ADB30 80117430 00000000 */ nop /* ADB34 80117434 C7B80050 */ lwc1 $f24, 0x50($sp) /* ADB38 80117438 4604C082 */ mul.s $f2, $f24, $f4 -/* ADB3C 8011743C 00000000 */ nop +/* ADB3C 8011743C 00000000 */ nop /* ADB40 80117440 C7BA0054 */ lwc1 $f26, 0x54($sp) /* ADB44 80117444 4604D102 */ mul.s $f4, $f26, $f4 -/* ADB48 80117448 00000000 */ nop +/* ADB48 80117448 00000000 */ nop /* ADB4C 8011744C C7B80070 */ lwc1 $f24, 0x70($sp) /* ADB50 80117450 4614C482 */ mul.s $f18, $f24, $f20 -/* ADB54 80117454 00000000 */ nop +/* ADB54 80117454 00000000 */ nop /* ADB58 80117458 C7BA0074 */ lwc1 $f26, 0x74($sp) /* ADB5C 8011745C 4614D502 */ mul.s $f20, $f26, $f20 -/* ADB60 80117460 00000000 */ nop +/* ADB60 80117460 00000000 */ nop /* ADB64 80117464 C7B80064 */ lwc1 $f24, 0x64($sp) /* ADB68 80117468 460CC302 */ mul.s $f12, $f24, $f12 -/* ADB6C 8011746C 00000000 */ nop +/* ADB6C 8011746C 00000000 */ nop /* ADB70 80117470 46163180 */ add.s $f6, $f6, $f22 /* ADB74 80117474 460E3180 */ add.s $f6, $f6, $f14 /* ADB78 80117478 46080000 */ add.s $f0, $f0, $f8 @@ -597,94 +597,94 @@ glabel render_models /* ADBB8 801174B8 E7A8003C */ swc1 $f8, 0x3c($sp) /* ADBBC 801174BC E7A20040 */ swc1 $f2, 0x40($sp) /* ADBC0 801174C0 46182032 */ c.eq.s $f4, $f24 -/* ADBC4 801174C4 00000000 */ nop +/* ADBC4 801174C4 00000000 */ nop /* ADBC8 801174C8 4501016B */ bc1t .L80117A78 /* ADBCC 801174CC E7A40044 */ swc1 $f4, 0x44($sp) /* ADBD0 801174D0 4604F003 */ div.s $f0, $f30, $f4 /* ADBD4 801174D4 46003102 */ mul.s $f4, $f6, $f0 -/* ADBD8 801174D8 00000000 */ nop +/* ADBD8 801174D8 00000000 */ nop /* ADBDC 801174DC 46004302 */ mul.s $f12, $f8, $f0 -/* ADBE0 801174E0 00000000 */ nop +/* ADBE0 801174E0 00000000 */ nop /* ADBE4 801174E4 46001502 */ mul.s $f20, $f2, $f0 -/* ADBE8 801174E8 00000000 */ nop +/* ADBE8 801174E8 00000000 */ nop /* ADBEC 801174EC 3C01BF80 */ lui $at, 0xbf80 /* ADBF0 801174F0 4481D000 */ mtc1 $at, $f26 -/* ADBF4 801174F4 00000000 */ nop +/* ADBF4 801174F4 00000000 */ nop /* ADBF8 801174F8 4614D03C */ c.lt.s $f26, $f20 -/* ADBFC 801174FC 00000000 */ nop +/* ADBFC 801174FC 00000000 */ nop /* ADC00 80117500 45000011 */ bc1f .L80117548 /* ADC04 80117504 E7A00044 */ swc1 $f0, 0x44($sp) /* ADC08 80117508 4604D03E */ c.le.s $f26, $f4 -/* ADC0C 8011750C 00000000 */ nop +/* ADC0C 8011750C 00000000 */ nop /* ADC10 80117510 4500000D */ bc1f .L80117548 -/* ADC14 80117514 00000000 */ nop +/* ADC14 80117514 00000000 */ nop /* ADC18 80117518 461E203E */ c.le.s $f4, $f30 -/* ADC1C 8011751C 00000000 */ nop +/* ADC1C 8011751C 00000000 */ nop /* ADC20 80117520 45000009 */ bc1f .L80117548 -/* ADC24 80117524 00000000 */ nop +/* ADC24 80117524 00000000 */ nop /* ADC28 80117528 460CD03E */ c.le.s $f26, $f12 -/* ADC2C 8011752C 00000000 */ nop +/* ADC2C 8011752C 00000000 */ nop /* ADC30 80117530 45000005 */ bc1f .L80117548 -/* ADC34 80117534 00000000 */ nop +/* ADC34 80117534 00000000 */ nop /* ADC38 80117538 461E603E */ c.le.s $f12, $f30 -/* ADC3C 8011753C 00000000 */ nop +/* ADC3C 8011753C 00000000 */ nop /* ADC40 80117540 4501014D */ bc1t .L80117A78 -/* ADC44 80117544 00000000 */ nop +/* ADC44 80117544 00000000 */ nop .L80117548: /* ADC48 80117548 C7B80098 */ lwc1 $f24, 0x98($sp) /* ADC4C 8011754C 4480D000 */ mtc1 $zero, $f26 -/* ADC50 80117550 00000000 */ nop +/* ADC50 80117550 00000000 */ nop /* ADC54 80117554 461AC032 */ c.eq.s $f24, $f26 -/* ADC58 80117558 00000000 */ nop +/* ADC58 80117558 00000000 */ nop /* ADC5C 8011755C 45010066 */ bc1t .L801176F8 -/* ADC60 80117560 00000000 */ nop +/* ADC60 80117560 00000000 */ nop /* ADC64 80117564 461AE032 */ c.eq.s $f28, $f26 -/* ADC68 80117568 00000000 */ nop +/* ADC68 80117568 00000000 */ nop /* ADC6C 8011756C 45010062 */ bc1t .L801176F8 -/* ADC70 80117570 00000000 */ nop +/* ADC70 80117570 00000000 */ nop /* ADC74 80117574 C7BA0088 */ lwc1 $f26, 0x88($sp) /* ADC78 80117578 4618D100 */ add.s $f4, $f26, $f24 /* ADC7C 8011757C C7B80048 */ lwc1 $f24, 0x48($sp) /* ADC80 80117580 4604C182 */ mul.s $f6, $f24, $f4 -/* ADC84 80117584 00000000 */ nop +/* ADC84 80117584 00000000 */ nop /* ADC88 80117588 C7BA008C */ lwc1 $f26, 0x8c($sp) /* ADC8C 8011758C C7B800A0 */ lwc1 $f24, 0xa0($sp) /* ADC90 80117590 4618D301 */ sub.s $f12, $f26, $f24 /* ADC94 80117594 C7BA0058 */ lwc1 $f26, 0x58($sp) /* ADC98 80117598 460CD582 */ mul.s $f22, $f26, $f12 -/* ADC9C 8011759C 00000000 */ nop +/* ADC9C 8011759C 00000000 */ nop /* ADCA0 801175A0 C7B80090 */ lwc1 $f24, 0x90($sp) /* ADCA4 801175A4 461CC500 */ add.s $f20, $f24, $f28 /* ADCA8 801175A8 C7B8004C */ lwc1 $f24, 0x4c($sp) /* ADCAC 801175AC 4604C002 */ mul.s $f0, $f24, $f4 -/* ADCB0 801175B0 00000000 */ nop +/* ADCB0 801175B0 00000000 */ nop /* ADCB4 801175B4 C7BA0068 */ lwc1 $f26, 0x68($sp) /* ADCB8 801175B8 4614D382 */ mul.s $f14, $f26, $f20 -/* ADCBC 801175BC 00000000 */ nop +/* ADCBC 801175BC 00000000 */ nop /* ADCC0 801175C0 C7B8006C */ lwc1 $f24, 0x6c($sp) /* ADCC4 801175C4 4614C402 */ mul.s $f16, $f24, $f20 -/* ADCC8 801175C8 00000000 */ nop +/* ADCC8 801175C8 00000000 */ nop /* ADCCC 801175CC C7BA005C */ lwc1 $f26, 0x5c($sp) /* ADCD0 801175D0 460CD202 */ mul.s $f8, $f26, $f12 -/* ADCD4 801175D4 00000000 */ nop +/* ADCD4 801175D4 00000000 */ nop /* ADCD8 801175D8 C7B80060 */ lwc1 $f24, 0x60($sp) /* ADCDC 801175DC 460CC282 */ mul.s $f10, $f24, $f12 -/* ADCE0 801175E0 00000000 */ nop +/* ADCE0 801175E0 00000000 */ nop /* ADCE4 801175E4 C7BA0050 */ lwc1 $f26, 0x50($sp) /* ADCE8 801175E8 4604D082 */ mul.s $f2, $f26, $f4 -/* ADCEC 801175EC 00000000 */ nop +/* ADCEC 801175EC 00000000 */ nop /* ADCF0 801175F0 C7B80054 */ lwc1 $f24, 0x54($sp) /* ADCF4 801175F4 4604C102 */ mul.s $f4, $f24, $f4 -/* ADCF8 801175F8 00000000 */ nop +/* ADCF8 801175F8 00000000 */ nop /* ADCFC 801175FC C7BA0070 */ lwc1 $f26, 0x70($sp) /* ADD00 80117600 4614D482 */ mul.s $f18, $f26, $f20 -/* ADD04 80117604 00000000 */ nop +/* ADD04 80117604 00000000 */ nop /* ADD08 80117608 C7B80074 */ lwc1 $f24, 0x74($sp) /* ADD0C 8011760C 4614C502 */ mul.s $f20, $f24, $f20 -/* ADD10 80117610 00000000 */ nop +/* ADD10 80117610 00000000 */ nop /* ADD14 80117614 C7BA0064 */ lwc1 $f26, 0x64($sp) /* ADD18 80117618 460CD302 */ mul.s $f12, $f26, $f12 -/* ADD1C 8011761C 00000000 */ nop +/* ADD1C 8011761C 00000000 */ nop /* ADD20 80117620 46163180 */ add.s $f6, $f6, $f22 /* ADD24 80117624 460E3180 */ add.s $f6, $f6, $f14 /* ADD28 80117628 46080000 */ add.s $f0, $f0, $f8 @@ -706,95 +706,95 @@ glabel render_models /* ADD68 80117668 E7A8003C */ swc1 $f8, 0x3c($sp) /* ADD6C 8011766C E7A20040 */ swc1 $f2, 0x40($sp) /* ADD70 80117670 461A2032 */ c.eq.s $f4, $f26 -/* ADD74 80117674 00000000 */ nop +/* ADD74 80117674 00000000 */ nop /* ADD78 80117678 450100FF */ bc1t .L80117A78 /* ADD7C 8011767C E7A40044 */ swc1 $f4, 0x44($sp) /* ADD80 80117680 4604F003 */ div.s $f0, $f30, $f4 /* ADD84 80117684 46003102 */ mul.s $f4, $f6, $f0 -/* ADD88 80117688 00000000 */ nop +/* ADD88 80117688 00000000 */ nop /* ADD8C 8011768C 46004302 */ mul.s $f12, $f8, $f0 -/* ADD90 80117690 00000000 */ nop +/* ADD90 80117690 00000000 */ nop /* ADD94 80117694 46001502 */ mul.s $f20, $f2, $f0 -/* ADD98 80117698 00000000 */ nop +/* ADD98 80117698 00000000 */ nop /* ADD9C 8011769C 3C01BF80 */ lui $at, 0xbf80 /* ADDA0 801176A0 4481C000 */ mtc1 $at, $f24 -/* ADDA4 801176A4 00000000 */ nop +/* ADDA4 801176A4 00000000 */ nop /* ADDA8 801176A8 4614C03C */ c.lt.s $f24, $f20 -/* ADDAC 801176AC 00000000 */ nop +/* ADDAC 801176AC 00000000 */ nop /* ADDB0 801176B0 45000011 */ bc1f .L801176F8 /* ADDB4 801176B4 E7A00044 */ swc1 $f0, 0x44($sp) /* ADDB8 801176B8 4604C03E */ c.le.s $f24, $f4 -/* ADDBC 801176BC 00000000 */ nop +/* ADDBC 801176BC 00000000 */ nop /* ADDC0 801176C0 4500000D */ bc1f .L801176F8 -/* ADDC4 801176C4 00000000 */ nop +/* ADDC4 801176C4 00000000 */ nop /* ADDC8 801176C8 461E203E */ c.le.s $f4, $f30 -/* ADDCC 801176CC 00000000 */ nop +/* ADDCC 801176CC 00000000 */ nop /* ADDD0 801176D0 45000009 */ bc1f .L801176F8 -/* ADDD4 801176D4 00000000 */ nop +/* ADDD4 801176D4 00000000 */ nop /* ADDD8 801176D8 460CC03E */ c.le.s $f24, $f12 -/* ADDDC 801176DC 00000000 */ nop +/* ADDDC 801176DC 00000000 */ nop /* ADDE0 801176E0 45000005 */ bc1f .L801176F8 -/* ADDE4 801176E4 00000000 */ nop +/* ADDE4 801176E4 00000000 */ nop /* ADDE8 801176E8 461E603E */ c.le.s $f12, $f30 -/* ADDEC 801176EC 00000000 */ nop +/* ADDEC 801176EC 00000000 */ nop /* ADDF0 801176F0 450100E1 */ bc1t .L80117A78 -/* ADDF4 801176F4 00000000 */ nop +/* ADDF4 801176F4 00000000 */ nop .L801176F8: /* ADDF8 801176F8 C7BA00A0 */ lwc1 $f26, 0xa0($sp) /* ADDFC 801176FC 4480C000 */ mtc1 $zero, $f24 -/* ADE00 80117700 00000000 */ nop +/* ADE00 80117700 00000000 */ nop /* ADE04 80117704 4618D032 */ c.eq.s $f26, $f24 -/* ADE08 80117708 00000000 */ nop +/* ADE08 80117708 00000000 */ nop /* ADE0C 8011770C 45010067 */ bc1t .L801178AC -/* ADE10 80117710 00000000 */ nop +/* ADE10 80117710 00000000 */ nop /* ADE14 80117714 4618E032 */ c.eq.s $f28, $f24 -/* ADE18 80117718 00000000 */ nop +/* ADE18 80117718 00000000 */ nop /* ADE1C 8011771C 45010063 */ bc1t .L801178AC -/* ADE20 80117720 00000000 */ nop +/* ADE20 80117720 00000000 */ nop /* ADE24 80117724 C7BA0088 */ lwc1 $f26, 0x88($sp) /* ADE28 80117728 C7B80098 */ lwc1 $f24, 0x98($sp) /* ADE2C 8011772C 4618D101 */ sub.s $f4, $f26, $f24 /* ADE30 80117730 C7BA0048 */ lwc1 $f26, 0x48($sp) /* ADE34 80117734 4604D182 */ mul.s $f6, $f26, $f4 -/* ADE38 80117738 00000000 */ nop +/* ADE38 80117738 00000000 */ nop /* ADE3C 8011773C C7B8008C */ lwc1 $f24, 0x8c($sp) /* ADE40 80117740 C7BA00A0 */ lwc1 $f26, 0xa0($sp) /* ADE44 80117744 461AC300 */ add.s $f12, $f24, $f26 /* ADE48 80117748 C7B80058 */ lwc1 $f24, 0x58($sp) /* ADE4C 8011774C 460CC582 */ mul.s $f22, $f24, $f12 -/* ADE50 80117750 00000000 */ nop +/* ADE50 80117750 00000000 */ nop /* ADE54 80117754 C7BA0090 */ lwc1 $f26, 0x90($sp) /* ADE58 80117758 461CD500 */ add.s $f20, $f26, $f28 /* ADE5C 8011775C C7BA004C */ lwc1 $f26, 0x4c($sp) /* ADE60 80117760 4604D002 */ mul.s $f0, $f26, $f4 -/* ADE64 80117764 00000000 */ nop +/* ADE64 80117764 00000000 */ nop /* ADE68 80117768 C7B80068 */ lwc1 $f24, 0x68($sp) /* ADE6C 8011776C 4614C382 */ mul.s $f14, $f24, $f20 -/* ADE70 80117770 00000000 */ nop +/* ADE70 80117770 00000000 */ nop /* ADE74 80117774 C7BA006C */ lwc1 $f26, 0x6c($sp) /* ADE78 80117778 4614D402 */ mul.s $f16, $f26, $f20 -/* ADE7C 8011777C 00000000 */ nop +/* ADE7C 8011777C 00000000 */ nop /* ADE80 80117780 C7B8005C */ lwc1 $f24, 0x5c($sp) /* ADE84 80117784 460CC202 */ mul.s $f8, $f24, $f12 -/* ADE88 80117788 00000000 */ nop +/* ADE88 80117788 00000000 */ nop /* ADE8C 8011778C C7BA0060 */ lwc1 $f26, 0x60($sp) /* ADE90 80117790 460CD282 */ mul.s $f10, $f26, $f12 -/* ADE94 80117794 00000000 */ nop +/* ADE94 80117794 00000000 */ nop /* ADE98 80117798 C7B80050 */ lwc1 $f24, 0x50($sp) /* ADE9C 8011779C 4604C082 */ mul.s $f2, $f24, $f4 -/* ADEA0 801177A0 00000000 */ nop +/* ADEA0 801177A0 00000000 */ nop /* ADEA4 801177A4 C7BA0054 */ lwc1 $f26, 0x54($sp) /* ADEA8 801177A8 4604D102 */ mul.s $f4, $f26, $f4 -/* ADEAC 801177AC 00000000 */ nop +/* ADEAC 801177AC 00000000 */ nop /* ADEB0 801177B0 C7B80070 */ lwc1 $f24, 0x70($sp) /* ADEB4 801177B4 4614C482 */ mul.s $f18, $f24, $f20 -/* ADEB8 801177B8 00000000 */ nop +/* ADEB8 801177B8 00000000 */ nop /* ADEBC 801177BC C7BA0074 */ lwc1 $f26, 0x74($sp) /* ADEC0 801177C0 4614D502 */ mul.s $f20, $f26, $f20 -/* ADEC4 801177C4 00000000 */ nop +/* ADEC4 801177C4 00000000 */ nop /* ADEC8 801177C8 C7B80064 */ lwc1 $f24, 0x64($sp) /* ADECC 801177CC 460CC302 */ mul.s $f12, $f24, $f12 -/* ADED0 801177D0 00000000 */ nop +/* ADED0 801177D0 00000000 */ nop /* ADED4 801177D4 46163180 */ add.s $f6, $f6, $f22 /* ADED8 801177D8 460E3180 */ add.s $f6, $f6, $f14 /* ADEDC 801177DC 46080000 */ add.s $f0, $f0, $f8 @@ -816,54 +816,54 @@ glabel render_models /* ADF1C 8011781C E7A8003C */ swc1 $f8, 0x3c($sp) /* ADF20 80117820 E7A20040 */ swc1 $f2, 0x40($sp) /* ADF24 80117824 46182032 */ c.eq.s $f4, $f24 -/* ADF28 80117828 00000000 */ nop +/* ADF28 80117828 00000000 */ nop /* ADF2C 8011782C 45010092 */ bc1t .L80117A78 /* ADF30 80117830 E7A40044 */ swc1 $f4, 0x44($sp) /* ADF34 80117834 4604F003 */ div.s $f0, $f30, $f4 /* ADF38 80117838 46003102 */ mul.s $f4, $f6, $f0 -/* ADF3C 8011783C 00000000 */ nop +/* ADF3C 8011783C 00000000 */ nop /* ADF40 80117840 46004302 */ mul.s $f12, $f8, $f0 -/* ADF44 80117844 00000000 */ nop +/* ADF44 80117844 00000000 */ nop /* ADF48 80117848 46001502 */ mul.s $f20, $f2, $f0 -/* ADF4C 8011784C 00000000 */ nop +/* ADF4C 8011784C 00000000 */ nop /* ADF50 80117850 3C01BF80 */ lui $at, 0xbf80 /* ADF54 80117854 4481D000 */ mtc1 $at, $f26 -/* ADF58 80117858 00000000 */ nop +/* ADF58 80117858 00000000 */ nop /* ADF5C 8011785C 4614D03C */ c.lt.s $f26, $f20 -/* ADF60 80117860 00000000 */ nop +/* ADF60 80117860 00000000 */ nop /* ADF64 80117864 45000011 */ bc1f .L801178AC /* ADF68 80117868 E7A00044 */ swc1 $f0, 0x44($sp) /* ADF6C 8011786C 4604D03E */ c.le.s $f26, $f4 -/* ADF70 80117870 00000000 */ nop +/* ADF70 80117870 00000000 */ nop /* ADF74 80117874 4500000D */ bc1f .L801178AC -/* ADF78 80117878 00000000 */ nop +/* ADF78 80117878 00000000 */ nop /* ADF7C 8011787C 461E203E */ c.le.s $f4, $f30 -/* ADF80 80117880 00000000 */ nop +/* ADF80 80117880 00000000 */ nop /* ADF84 80117884 45000009 */ bc1f .L801178AC -/* ADF88 80117888 00000000 */ nop +/* ADF88 80117888 00000000 */ nop /* ADF8C 8011788C 460CD03E */ c.le.s $f26, $f12 -/* ADF90 80117890 00000000 */ nop +/* ADF90 80117890 00000000 */ nop /* ADF94 80117894 45000005 */ bc1f .L801178AC -/* ADF98 80117898 00000000 */ nop +/* ADF98 80117898 00000000 */ nop /* ADF9C 8011789C 461E603E */ c.le.s $f12, $f30 -/* ADFA0 801178A0 00000000 */ nop +/* ADFA0 801178A0 00000000 */ nop /* ADFA4 801178A4 45010074 */ bc1t .L80117A78 -/* ADFA8 801178A8 00000000 */ nop +/* ADFA8 801178A8 00000000 */ nop .L801178AC: /* ADFAC 801178AC C7B80098 */ lwc1 $f24, 0x98($sp) /* ADFB0 801178B0 4480D000 */ mtc1 $zero, $f26 -/* ADFB4 801178B4 00000000 */ nop +/* ADFB4 801178B4 00000000 */ nop /* ADFB8 801178B8 461AC032 */ c.eq.s $f24, $f26 -/* ADFBC 801178BC 00000000 */ nop +/* ADFBC 801178BC 00000000 */ nop /* ADFC0 801178C0 4503006D */ bc1tl .L80117A78 /* ADFC4 801178C4 24030001 */ addiu $v1, $zero, 1 /* ADFC8 801178C8 C7B800A0 */ lwc1 $f24, 0xa0($sp) /* ADFCC 801178CC 461AC032 */ c.eq.s $f24, $f26 -/* ADFD0 801178D0 00000000 */ nop +/* ADFD0 801178D0 00000000 */ nop /* ADFD4 801178D4 45030068 */ bc1tl .L80117A78 /* ADFD8 801178D8 24030001 */ addiu $v1, $zero, 1 /* ADFDC 801178DC 461AE032 */ c.eq.s $f28, $f26 -/* ADFE0 801178E0 00000000 */ nop +/* ADFE0 801178E0 00000000 */ nop /* ADFE4 801178E4 45030064 */ bc1tl .L80117A78 /* ADFE8 801178E8 24030001 */ addiu $v1, $zero, 1 /* ADFEC 801178EC C7BA0088 */ lwc1 $f26, 0x88($sp) @@ -871,45 +871,45 @@ glabel render_models /* ADFF4 801178F4 4618D100 */ add.s $f4, $f26, $f24 /* ADFF8 801178F8 C7BA0048 */ lwc1 $f26, 0x48($sp) /* ADFFC 801178FC 4604D182 */ mul.s $f6, $f26, $f4 -/* AE000 80117900 00000000 */ nop +/* AE000 80117900 00000000 */ nop /* AE004 80117904 C7B8008C */ lwc1 $f24, 0x8c($sp) /* AE008 80117908 C7BA00A0 */ lwc1 $f26, 0xa0($sp) /* AE00C 8011790C 461AC300 */ add.s $f12, $f24, $f26 /* AE010 80117910 C7B80058 */ lwc1 $f24, 0x58($sp) /* AE014 80117914 460CC582 */ mul.s $f22, $f24, $f12 -/* AE018 80117918 00000000 */ nop +/* AE018 80117918 00000000 */ nop /* AE01C 8011791C C7BA0090 */ lwc1 $f26, 0x90($sp) /* AE020 80117920 461CD500 */ add.s $f20, $f26, $f28 /* AE024 80117924 C7BA004C */ lwc1 $f26, 0x4c($sp) /* AE028 80117928 4604D002 */ mul.s $f0, $f26, $f4 -/* AE02C 8011792C 00000000 */ nop +/* AE02C 8011792C 00000000 */ nop /* AE030 80117930 C7B80068 */ lwc1 $f24, 0x68($sp) /* AE034 80117934 4614C382 */ mul.s $f14, $f24, $f20 -/* AE038 80117938 00000000 */ nop +/* AE038 80117938 00000000 */ nop /* AE03C 8011793C C7BA006C */ lwc1 $f26, 0x6c($sp) /* AE040 80117940 4614D402 */ mul.s $f16, $f26, $f20 -/* AE044 80117944 00000000 */ nop +/* AE044 80117944 00000000 */ nop /* AE048 80117948 C7B8005C */ lwc1 $f24, 0x5c($sp) /* AE04C 8011794C 460CC202 */ mul.s $f8, $f24, $f12 -/* AE050 80117950 00000000 */ nop +/* AE050 80117950 00000000 */ nop /* AE054 80117954 C7BA0060 */ lwc1 $f26, 0x60($sp) /* AE058 80117958 460CD282 */ mul.s $f10, $f26, $f12 -/* AE05C 8011795C 00000000 */ nop +/* AE05C 8011795C 00000000 */ nop /* AE060 80117960 C7B80050 */ lwc1 $f24, 0x50($sp) /* AE064 80117964 4604C082 */ mul.s $f2, $f24, $f4 -/* AE068 80117968 00000000 */ nop +/* AE068 80117968 00000000 */ nop /* AE06C 8011796C C7BA0054 */ lwc1 $f26, 0x54($sp) /* AE070 80117970 4604D102 */ mul.s $f4, $f26, $f4 -/* AE074 80117974 00000000 */ nop +/* AE074 80117974 00000000 */ nop /* AE078 80117978 C7B80070 */ lwc1 $f24, 0x70($sp) /* AE07C 8011797C 4614C482 */ mul.s $f18, $f24, $f20 -/* AE080 80117980 00000000 */ nop +/* AE080 80117980 00000000 */ nop /* AE084 80117984 C7BA0074 */ lwc1 $f26, 0x74($sp) /* AE088 80117988 4614D502 */ mul.s $f20, $f26, $f20 -/* AE08C 8011798C 00000000 */ nop +/* AE08C 8011798C 00000000 */ nop /* AE090 80117990 C7B80064 */ lwc1 $f24, 0x64($sp) /* AE094 80117994 460CC302 */ mul.s $f12, $f24, $f12 -/* AE098 80117998 00000000 */ nop +/* AE098 80117998 00000000 */ nop /* AE09C 8011799C 46163180 */ add.s $f6, $f6, $f22 /* AE0A0 801179A0 460E3180 */ add.s $f6, $f6, $f14 /* AE0A4 801179A4 46080000 */ add.s $f0, $f0, $f8 @@ -931,39 +931,39 @@ glabel render_models /* AE0E4 801179E4 E7A8003C */ swc1 $f8, 0x3c($sp) /* AE0E8 801179E8 E7A20040 */ swc1 $f2, 0x40($sp) /* AE0EC 801179EC 46182032 */ c.eq.s $f4, $f24 -/* AE0F0 801179F0 00000000 */ nop +/* AE0F0 801179F0 00000000 */ nop /* AE0F4 801179F4 45010020 */ bc1t .L80117A78 /* AE0F8 801179F8 E7A40044 */ swc1 $f4, 0x44($sp) /* AE0FC 801179FC 4604F003 */ div.s $f0, $f30, $f4 /* AE100 80117A00 46003102 */ mul.s $f4, $f6, $f0 -/* AE104 80117A04 00000000 */ nop +/* AE104 80117A04 00000000 */ nop /* AE108 80117A08 46004302 */ mul.s $f12, $f8, $f0 -/* AE10C 80117A0C 00000000 */ nop +/* AE10C 80117A0C 00000000 */ nop /* AE110 80117A10 46001502 */ mul.s $f20, $f2, $f0 -/* AE114 80117A14 00000000 */ nop +/* AE114 80117A14 00000000 */ nop /* AE118 80117A18 3C01BF80 */ lui $at, 0xbf80 /* AE11C 80117A1C 4481D000 */ mtc1 $at, $f26 -/* AE120 80117A20 00000000 */ nop +/* AE120 80117A20 00000000 */ nop /* AE124 80117A24 4614D03C */ c.lt.s $f26, $f20 -/* AE128 80117A28 00000000 */ nop +/* AE128 80117A28 00000000 */ nop /* AE12C 80117A2C 45000011 */ bc1f .L80117A74 /* AE130 80117A30 E7A00044 */ swc1 $f0, 0x44($sp) /* AE134 80117A34 4604D03E */ c.le.s $f26, $f4 -/* AE138 80117A38 00000000 */ nop +/* AE138 80117A38 00000000 */ nop /* AE13C 80117A3C 4502000E */ bc1fl .L80117A78 /* AE140 80117A40 24030001 */ addiu $v1, $zero, 1 /* AE144 80117A44 461E203E */ c.le.s $f4, $f30 -/* AE148 80117A48 00000000 */ nop +/* AE148 80117A48 00000000 */ nop /* AE14C 80117A4C 4502000A */ bc1fl .L80117A78 /* AE150 80117A50 24030001 */ addiu $v1, $zero, 1 /* AE154 80117A54 460CD03E */ c.le.s $f26, $f12 -/* AE158 80117A58 00000000 */ nop +/* AE158 80117A58 00000000 */ nop /* AE15C 80117A5C 45020006 */ bc1fl .L80117A78 /* AE160 80117A60 24030001 */ addiu $v1, $zero, 1 /* AE164 80117A64 461E603E */ c.le.s $f12, $f30 -/* AE168 80117A68 00000000 */ nop +/* AE168 80117A68 00000000 */ nop /* AE16C 80117A6C 45010002 */ bc1t .L80117A78 -/* AE170 80117A70 00000000 */ nop +/* AE170 80117A70 00000000 */ nop .L80117A74: /* AE174 80117A74 24030001 */ addiu $v1, $zero, 1 .L80117A78: @@ -988,11 +988,11 @@ glabel render_models /* AE1BC 80117ABC 3C01459C */ lui $at, 0x459c /* AE1C0 80117AC0 34214000 */ ori $at, $at, 0x4000 /* AE1C4 80117AC4 44811000 */ mtc1 $at, $f2 -/* AE1C8 80117AC8 00000000 */ nop +/* AE1C8 80117AC8 00000000 */ nop /* AE1CC 80117ACC 46020000 */ add.s $f0, $f0, $f2 /* AE1D0 80117AD0 4600060D */ trunc.w.s $f24, $f0 /* AE1D4 80117AD4 4404C000 */ mfc1 $a0, $f24 -/* AE1D8 80117AD8 00000000 */ nop +/* AE1D8 80117AD8 00000000 */ nop /* AE1DC 80117ADC 04810003 */ bgez $a0, .L80117AEC /* AE1E0 80117AE0 28822711 */ slti $v0, $a0, 0x2711 /* AE1E4 80117AE4 08045EBD */ j .L80117AF4 @@ -1006,7 +1006,7 @@ glabel render_models /* AE1FC 80117AFC 8C430000 */ lw $v1, ($v0) /* AE200 80117B00 24020005 */ addiu $v0, $zero, 5 /* AE204 80117B04 14620005 */ bne $v1, $v0, .L80117B1C -/* AE208 80117B08 00000000 */ nop +/* AE208 80117B08 00000000 */ nop /* AE20C 80117B0C 3C028011 */ lui $v0, %hi(appendGfx_model_group) /* AE210 80117B10 24427C94 */ addiu $v0, $v0, %lo(appendGfx_model_group) /* AE214 80117B14 08045ECA */ j .L80117B28 @@ -1062,9 +1062,9 @@ glabel render_models /* AE2CC 80117BCC AFA20020 */ sw $v0, 0x20($sp) /* AE2D0 80117BD0 C7A20044 */ lwc1 $f2, 0x44($sp) /* AE2D4 80117BD4 44800000 */ mtc1 $zero, $f0 -/* AE2D8 80117BD8 00000000 */ nop +/* AE2D8 80117BD8 00000000 */ nop /* AE2DC 80117BDC 46001032 */ c.eq.s $f2, $f0 -/* AE2E0 80117BE0 00000000 */ nop +/* AE2E0 80117BE0 00000000 */ nop /* AE2E4 80117BE4 45030001 */ bc1tl .L80117BEC /* AE2E8 80117BE8 E7B60044 */ swc1 $f22, 0x44($sp) .L80117BEC: @@ -1075,7 +1075,7 @@ glabel render_models /* AE2FC 80117BFC 44812000 */ mtc1 $at, $f4 /* AE300 80117C00 46020003 */ div.s $f0, $f0, $f2 /* AE304 80117C04 46040002 */ mul.s $f0, $f0, $f4 -/* AE308 80117C08 00000000 */ nop +/* AE308 80117C08 00000000 */ nop /* AE30C 80117C0C 96020000 */ lhu $v0, ($s0) /* AE310 80117C10 30420002 */ andi $v0, $v0, 2 /* AE314 80117C14 4600060D */ trunc.w.s $f24, $f0 @@ -1096,7 +1096,7 @@ glabel render_models .L80117C50: /* AE350 80117C50 2A620004 */ slti $v0, $s3, 4 /* AE354 80117C54 1440FFC1 */ bnez $v0, .L80117B5C -/* AE358 80117C58 00000000 */ nop +/* AE358 80117C58 00000000 */ nop /* AE35C 80117C5C 8FBF00BC */ lw $ra, 0xbc($sp) /* AE360 80117C60 8FB400B8 */ lw $s4, 0xb8($sp) /* AE364 80117C64 8FB300B4 */ lw $s3, 0xb4($sp) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/render_shadows.s b/asm/nonmatchings/code_a5dd0_len_114e0/render_shadows.s index e7367fa089..0b6fc9a898 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/render_shadows.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/render_shadows.s @@ -40,7 +40,7 @@ glabel render_shadows /* A6850 80110150 00731024 */ and $v0, $v1, $s3 /* A6854 80110154 8E07000C */ lw $a3, 0xc($s0) /* A6858 80110158 14E00006 */ bnez $a3, .L80110174 -/* A685C 8011015C 00000000 */ nop +/* A685C 8011015C 00000000 */ nop /* A6860 80110160 86040008 */ lh $a0, 8($s0) /* A6864 80110164 0C047CC1 */ jal func_8011F304 /* A6868 80110168 26050038 */ addiu $a1, $s0, 0x38 @@ -55,14 +55,14 @@ glabel render_shadows /* A6888 80110188 26310001 */ addiu $s1, $s1, 1 .L8011018C: /* A688C 8011018C 1040000B */ beqz $v0, .L801101BC -/* A6890 80110190 00000000 */ nop +/* A6890 80110190 00000000 */ nop /* A6894 80110194 92020005 */ lbu $v0, 5($s0) /* A6898 80110198 2442FFEC */ addiu $v0, $v0, -0x14 /* A689C 8011019C A2020005 */ sb $v0, 5($s0) /* A68A0 801101A0 304200FF */ andi $v0, $v0, 0xff /* A68A4 801101A4 2C420015 */ sltiu $v0, $v0, 0x15 /* A68A8 801101A8 10400004 */ beqz $v0, .L801101BC -/* A68AC 801101AC 00000000 */ nop +/* A68AC 801101AC 00000000 */ nop /* A68B0 801101B0 8E020000 */ lw $v0, ($s0) /* A68B4 801101B4 00521025 */ or $v0, $v0, $s2 /* A68B8 801101B8 AE020000 */ sw $v0, ($s0) @@ -74,7 +74,7 @@ glabel render_shadows /* A68CC 801101CC 24C6FE68 */ addiu $a2, $a2, %lo(func_8010FE68) /* A68D0 801101D0 8E07000C */ lw $a3, 0xc($s0) /* A68D4 801101D4 14E00006 */ bnez $a3, .L801101F0 -/* A68D8 801101D8 00000000 */ nop +/* A68D8 801101D8 00000000 */ nop /* A68DC 801101DC 86040008 */ lh $a0, 8($s0) /* A68E0 801101E0 0C04873A */ jal func_80121CE8 /* A68E4 801101E4 26050038 */ addiu $a1, $s0, 0x38 @@ -90,7 +90,7 @@ glabel render_shadows .L80110204: /* A6904 80110204 2A22003C */ slti $v0, $s1, 0x3c /* A6908 80110208 1440FFB9 */ bnez $v0, .L801100F0 -/* A690C 8011020C 00000000 */ nop +/* A690C 8011020C 00000000 */ nop /* A6910 80110210 8FBF0020 */ lw $ra, 0x20($sp) /* A6914 80110214 8FB3001C */ lw $s3, 0x1c($sp) /* A6918 80110218 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/render_ui.s b/asm/nonmatchings/code_a5dd0_len_114e0/render_ui.s index 15c9cbff2c..badec6b0c9 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/render_ui.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/render_ui.s @@ -18,10 +18,10 @@ glabel render_ui /* A9688 80112F88 26310001 */ addiu $s1, $s1, 1 /* A968C 80112F8C 30620010 */ andi $v0, $v1, 0x10 /* A9690 80112F90 14400004 */ bnez $v0, .L80112FA4 -/* A9694 80112F94 00000000 */ nop +/* A9694 80112F94 00000000 */ nop /* A9698 80112F98 8E020010 */ lw $v0, 0x10($s0) /* A969C 80112F9C 0040F809 */ jalr $v0 -/* A96A0 80112FA0 00000000 */ nop +/* A96A0 80112FA0 00000000 */ nop .L80112FA4: /* A96A4 80112FA4 2A220002 */ slti $v0, $s1, 2 /* A96A8 80112FA8 1440FFF2 */ bnez $v0, .L80112F74 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/set_aux_pan_u.s b/asm/nonmatchings/code_a5dd0_len_114e0/set_aux_pan_u.s index 5edb2185d6..5b9ec03f35 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/set_aux_pan_u.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/set_aux_pan_u.s @@ -7,4 +7,4 @@ glabel set_aux_pan_u /* B2354 8011BC54 00240821 */ addu $at, $at, $a0 /* B2358 8011BC58 AC2532E8 */ sw $a1, %lo(D_801532E8)($at) /* B235C 8011BC5C 03E00008 */ jr $ra -/* B2360 8011BC60 00000000 */ nop +/* B2360 8011BC60 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/set_aux_pan_v.s b/asm/nonmatchings/code_a5dd0_len_114e0/set_aux_pan_v.s index 5f686f6b5c..7f8f5d3c5c 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/set_aux_pan_v.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/set_aux_pan_v.s @@ -7,4 +7,4 @@ glabel set_aux_pan_v /* B236C 8011BC6C 00240821 */ addu $at, $at, $a0 /* B2370 8011BC70 AC253328 */ sw $a1, %lo(D_80153328)($at) /* B2374 8011BC74 03E00008 */ jr $ra -/* B2378 8011BC78 00000000 */ nop +/* B2378 8011BC78 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/set_main_pan_u.s b/asm/nonmatchings/code_a5dd0_len_114e0/set_main_pan_u.s index 211a26911e..ce2091dadb 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/set_main_pan_u.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/set_main_pan_u.s @@ -7,4 +7,4 @@ glabel set_main_pan_u /* B2324 8011BC24 00240821 */ addu $at, $at, $a0 /* B2328 8011BC28 AC253268 */ sw $a1, %lo(D_80153268)($at) /* B232C 8011BC2C 03E00008 */ jr $ra -/* B2330 8011BC30 00000000 */ nop +/* B2330 8011BC30 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/set_main_pan_v.s b/asm/nonmatchings/code_a5dd0_len_114e0/set_main_pan_v.s index 7ae24459ec..5d3742889c 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/set_main_pan_v.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/set_main_pan_v.s @@ -7,4 +7,4 @@ glabel set_main_pan_v /* B233C 8011BC3C 00240821 */ addu $at, $at, $a0 /* B2340 8011BC40 AC2532A8 */ sw $a1, %lo(D_801532A8)($at) /* B2344 8011BC44 03E00008 */ jr $ra -/* B2348 8011BC48 00000000 */ nop +/* B2348 8011BC48 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/set_npc_shadow_scale.s b/asm/nonmatchings/code_a5dd0_len_114e0/set_npc_shadow_scale.s index 2ba3b3d9de..1cbc3cbab3 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/set_npc_shadow_scale.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/set_npc_shadow_scale.s @@ -8,11 +8,11 @@ glabel set_npc_shadow_scale /* A900C 8011290C 80420070 */ lb $v0, 0x70($v0) /* A9010 80112910 44862000 */ mtc1 $a2, $f4 /* A9014 80112914 1440000A */ bnez $v0, .L80112940 -/* A9018 80112918 00000000 */ nop +/* A9018 80112918 00000000 */ nop /* A901C 8011291C 3C014522 */ lui $at, 0x4522 /* A9020 80112920 34218000 */ ori $at, $at, 0x8000 /* A9024 80112924 44810000 */ mtc1 $at, $f0 -/* A9028 80112928 00000000 */ nop +/* A9028 80112928 00000000 */ nop /* A902C 8011292C 46001003 */ div.s $f0, $f2, $f0 /* A9030 80112930 3C018015 */ lui $at, %hi(D_8014F968) /* A9034 80112934 D422F968 */ ldc1 $f2, %lo(D_8014F968)($at) @@ -21,7 +21,7 @@ glabel set_npc_shadow_scale .L80112940: /* A9040 80112940 3C014561 */ lui $at, 0x4561 /* A9044 80112944 44810000 */ mtc1 $at, $f0 -/* A9048 80112948 00000000 */ nop +/* A9048 80112948 00000000 */ nop /* A904C 8011294C 46001003 */ div.s $f0, $f2, $f0 /* A9050 80112950 3C018015 */ lui $at, %hi(D_8014F970) /* A9054 80112954 D422F970 */ ldc1 $f2, %lo(D_8014F970)($at) @@ -35,22 +35,22 @@ glabel set_npc_shadow_scale /* A9070 80112970 D422F978 */ ldc1 $f2, %lo(D_8014F978)($at) /* A9074 80112974 46000021 */ cvt.d.s $f0, $f0 /* A9078 80112978 4622003C */ c.lt.d $f0, $f2 -/* A907C 8011297C 00000000 */ nop +/* A907C 8011297C 00000000 */ nop /* A9080 80112980 45000006 */ bc1f .L8011299C -/* A9084 80112984 00000000 */ nop +/* A9084 80112984 00000000 */ nop /* A9088 80112988 3C013C23 */ lui $at, 0x3c23 /* A908C 8011298C 3421D70A */ ori $at, $at, 0xd70a /* A9090 80112990 44810000 */ mtc1 $at, $f0 -/* A9094 80112994 00000000 */ nop +/* A9094 80112994 00000000 */ nop /* A9098 80112998 E480001C */ swc1 $f0, 0x1c($a0) .L8011299C: /* A909C 8011299C 3C014270 */ lui $at, 0x4270 /* A90A0 801129A0 44810000 */ mtc1 $at, $f0 -/* A90A4 801129A4 00000000 */ nop +/* A90A4 801129A4 00000000 */ nop /* A90A8 801129A8 4604003C */ c.lt.s $f0, $f4 -/* A90AC 801129AC 00000000 */ nop +/* A90AC 801129AC 00000000 */ nop /* A90B0 801129B0 45000005 */ bc1f .L801129C8 -/* A90B4 801129B4 00000000 */ nop +/* A90B4 801129B4 00000000 */ nop /* A90B8 801129B8 C480001C */ lwc1 $f0, 0x1c($a0) /* A90BC 801129BC 46000000 */ add.s $f0, $f0, $f0 /* A90C0 801129C0 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/set_peach_shadow_scale.s b/asm/nonmatchings/code_a5dd0_len_114e0/set_peach_shadow_scale.s index 00f84289e8..1572a4a5b4 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/set_peach_shadow_scale.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/set_peach_shadow_scale.s @@ -24,7 +24,7 @@ glabel set_peach_shadow_scale /* A9120 80112A20 3C02000D */ lui $v0, 0xd /* A9124 80112A24 34420008 */ ori $v0, $v0, 8 /* A9128 80112A28 14A20025 */ bne $a1, $v0, .L80112AC0 -/* A912C 80112A2C 00000000 */ nop +/* A912C 80112A2C 00000000 */ nop .L80112A30: /* A9130 80112A30 3C014522 */ lui $at, 0x4522 /* A9134 80112A34 34218000 */ ori $at, $at, 0x8000 @@ -38,26 +38,26 @@ glabel set_peach_shadow_scale /* A9154 80112A54 D426F980 */ ldc1 $f6, %lo(D_8014F980)($at) /* A9158 80112A58 46001021 */ cvt.d.s $f0, $f2 /* A915C 80112A5C 4626003C */ c.lt.d $f0, $f6 -/* A9160 80112A60 00000000 */ nop +/* A9160 80112A60 00000000 */ nop /* A9164 80112A64 45000006 */ bc1f .L80112A80 /* A9168 80112A68 E482001C */ swc1 $f2, 0x1c($a0) /* A916C 80112A6C 3C013C23 */ lui $at, 0x3c23 /* A9170 80112A70 3421D70A */ ori $at, $at, 0xd70a /* A9174 80112A74 44810000 */ mtc1 $at, $f0 -/* A9178 80112A78 00000000 */ nop +/* A9178 80112A78 00000000 */ nop /* A917C 80112A7C E480001C */ swc1 $f0, 0x1c($a0) .L80112A80: /* A9180 80112A80 3C013E05 */ lui $at, 0x3e05 /* A9184 80112A84 34211EB8 */ ori $at, $at, 0x1eb8 /* A9188 80112A88 44810000 */ mtc1 $at, $f0 -/* A918C 80112A8C 00000000 */ nop +/* A918C 80112A8C 00000000 */ nop /* A9190 80112A90 46040001 */ sub.s $f0, $f0, $f4 /* A9194 80112A94 E4800024 */ swc1 $f0, 0x24($a0) /* A9198 80112A98 46000021 */ cvt.d.s $f0, $f0 /* A919C 80112A9C 4626003C */ c.lt.d $f0, $f6 -/* A91A0 80112AA0 00000000 */ nop +/* A91A0 80112AA0 00000000 */ nop /* A91A4 80112AA4 4500001C */ bc1f .L80112B18 -/* A91A8 80112AA8 00000000 */ nop +/* A91A8 80112AA8 00000000 */ nop /* A91AC 80112AAC 3C013C23 */ lui $at, 0x3c23 /* A91B0 80112AB0 3421D70A */ ori $at, $at, 0xd70a /* A91B4 80112AB4 44810000 */ mtc1 $at, $f0 @@ -70,24 +70,24 @@ glabel set_peach_shadow_scale .L80112ACC: /* A91CC 80112ACC 3C014561 */ lui $at, 0x4561 /* A91D0 80112AD0 44810000 */ mtc1 $at, $f0 -/* A91D4 80112AD4 00000000 */ nop +/* A91D4 80112AD4 00000000 */ nop /* A91D8 80112AD8 46002003 */ div.s $f0, $f4, $f0 /* A91DC 80112ADC 46001001 */ sub.s $f0, $f2, $f0 /* A91E0 80112AE0 3C018015 */ lui $at, %hi(D_8014F988) /* A91E4 80112AE4 D424F988 */ ldc1 $f4, %lo(D_8014F988)($at) /* A91E8 80112AE8 460000A1 */ cvt.d.s $f2, $f0 /* A91EC 80112AEC 4624103C */ c.lt.d $f2, $f4 -/* A91F0 80112AF0 00000000 */ nop +/* A91F0 80112AF0 00000000 */ nop /* A91F4 80112AF4 45000006 */ bc1f .L80112B10 /* A91F8 80112AF8 E480001C */ swc1 $f0, 0x1c($a0) /* A91FC 80112AFC 3C013C23 */ lui $at, 0x3c23 /* A9200 80112B00 3421D70A */ ori $at, $at, 0xd70a /* A9204 80112B04 44810000 */ mtc1 $at, $f0 -/* A9208 80112B08 00000000 */ nop +/* A9208 80112B08 00000000 */ nop /* A920C 80112B0C E480001C */ swc1 $f0, 0x1c($a0) .L80112B10: /* A9210 80112B10 C480001C */ lwc1 $f0, 0x1c($a0) /* A9214 80112B14 E4800024 */ swc1 $f0, 0x24($a0) .L80112B18: /* A9218 80112B18 03E00008 */ jr $ra -/* A921C 80112B1C 00000000 */ nop +/* A921C 80112B1C 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/set_standard_shadow_scale.s b/asm/nonmatchings/code_a5dd0_len_114e0/set_standard_shadow_scale.s index 7bed53db68..a9a4e90370 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/set_standard_shadow_scale.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/set_standard_shadow_scale.s @@ -7,11 +7,11 @@ glabel set_standard_shadow_scale /* A8F64 80112864 80420070 */ lb $v0, 0x70($v0) /* A8F68 80112868 44851000 */ mtc1 $a1, $f2 /* A8F6C 8011286C 1440000A */ bnez $v0, .L80112898 -/* A8F70 80112870 00000000 */ nop +/* A8F70 80112870 00000000 */ nop /* A8F74 80112874 3C014522 */ lui $at, 0x4522 /* A8F78 80112878 34218000 */ ori $at, $at, 0x8000 /* A8F7C 8011287C 44810000 */ mtc1 $at, $f0 -/* A8F80 80112880 00000000 */ nop +/* A8F80 80112880 00000000 */ nop /* A8F84 80112884 46001003 */ div.s $f0, $f2, $f0 /* A8F88 80112888 3C018015 */ lui $at, %hi(D_8014F950) /* A8F8C 8011288C D422F950 */ ldc1 $f2, %lo(D_8014F950)($at) @@ -20,7 +20,7 @@ glabel set_standard_shadow_scale .L80112898: /* A8F98 80112898 3C014561 */ lui $at, 0x4561 /* A8F9C 8011289C 44810000 */ mtc1 $at, $f0 -/* A8FA0 801128A0 00000000 */ nop +/* A8FA0 801128A0 00000000 */ nop /* A8FA4 801128A4 46001003 */ div.s $f0, $f2, $f0 /* A8FA8 801128A8 3C018015 */ lui $at, %hi(D_8014F958) /* A8FAC 801128AC D422F958 */ ldc1 $f2, %lo(D_8014F958)($at) @@ -34,13 +34,13 @@ glabel set_standard_shadow_scale /* A8FC8 801128C8 D422F960 */ ldc1 $f2, %lo(D_8014F960)($at) /* A8FCC 801128CC 46000021 */ cvt.d.s $f0, $f0 /* A8FD0 801128D0 4622003C */ c.lt.d $f0, $f2 -/* A8FD4 801128D4 00000000 */ nop +/* A8FD4 801128D4 00000000 */ nop /* A8FD8 801128D8 45000006 */ bc1f .L801128F4 -/* A8FDC 801128DC 00000000 */ nop +/* A8FDC 801128DC 00000000 */ nop /* A8FE0 801128E0 3C013C23 */ lui $at, 0x3c23 /* A8FE4 801128E4 3421D70A */ ori $at, $at, 0xd70a /* A8FE8 801128E8 44810000 */ mtc1 $at, $f0 -/* A8FEC 801128EC 00000000 */ nop +/* A8FEC 801128EC 00000000 */ nop /* A8FF0 801128F0 E480001C */ swc1 $f0, 0x1c($a0) .L801128F4: /* A8FF4 801128F4 C480001C */ lwc1 $f0, 0x1c($a0) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/test_player_entity_aabb.s b/asm/nonmatchings/code_a5dd0_len_114e0/test_player_entity_aabb.s index d6421ac82e..3e87a32ccf 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/test_player_entity_aabb.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/test_player_entity_aabb.s @@ -7,27 +7,27 @@ glabel test_player_entity_aabb /* A71B4 80110AB4 84A300B0 */ lh $v1, 0xb0($a1) /* A71B8 80110AB8 C4A0002C */ lwc1 $f0, 0x2c($a1) /* A71BC 80110ABC 44831000 */ mtc1 $v1, $f2 -/* A71C0 80110AC0 00000000 */ nop +/* A71C0 80110AC0 00000000 */ nop /* A71C4 80110AC4 468010A0 */ cvt.s.w $f2, $f2 /* A71C8 80110AC8 46020000 */ add.s $f0, $f0, $f2 /* A71CC 80110ACC C482004C */ lwc1 $f2, 0x4c($a0) /* A71D0 80110AD0 46001101 */ sub.s $f4, $f2, $f0 /* A71D4 80110AD4 44800000 */ mtc1 $zero, $f0 -/* A71D8 80110AD8 00000000 */ nop +/* A71D8 80110AD8 00000000 */ nop /* A71DC 80110ADC 4604003C */ c.lt.s $f0, $f4 -/* A71E0 80110AE0 00000000 */ nop +/* A71E0 80110AE0 00000000 */ nop /* A71E4 80110AE4 4501000B */ bc1t .L80110B14 -/* A71E8 80110AE8 00000000 */ nop +/* A71E8 80110AE8 00000000 */ nop /* A71EC 80110AEC 8482000E */ lh $v0, 0xe($a0) /* A71F0 80110AF0 46002005 */ abs.s $f0, $f4 /* A71F4 80110AF4 00621021 */ addu $v0, $v1, $v0 /* A71F8 80110AF8 44821000 */ mtc1 $v0, $f2 -/* A71FC 80110AFC 00000000 */ nop +/* A71FC 80110AFC 00000000 */ nop /* A7200 80110B00 468010A0 */ cvt.s.w $f2, $f2 /* A7204 80110B04 4600103C */ c.lt.s $f2, $f0 -/* A7208 80110B08 00000000 */ nop +/* A7208 80110B08 00000000 */ nop /* A720C 80110B0C 45000003 */ bc1f .L80110B1C -/* A7210 80110B10 00000000 */ nop +/* A7210 80110B10 00000000 */ nop .L80110B14: /* A7214 80110B14 03E00008 */ jr $ra /* A7218 80110B18 0000102D */ daddu $v0, $zero, $zero @@ -39,17 +39,17 @@ glabel test_player_entity_aabb /* A722C 80110B2C 44800000 */ mtc1 $zero, $f0 /* A7230 80110B30 00621021 */ addu $v0, $v1, $v0 /* A7234 80110B34 44821000 */ mtc1 $v0, $f2 -/* A7238 80110B38 00000000 */ nop +/* A7238 80110B38 00000000 */ nop /* A723C 80110B3C 468010A1 */ cvt.d.w $f2, $f2 /* A7240 80110B40 46201082 */ mul.d $f2, $f2, $f0 -/* A7244 80110B44 00000000 */ nop +/* A7244 80110B44 00000000 */ nop /* A7248 80110B48 84820010 */ lh $v0, 0x10($a0) /* A724C 80110B4C 00621821 */ addu $v1, $v1, $v0 /* A7250 80110B50 44833000 */ mtc1 $v1, $f6 -/* A7254 80110B54 00000000 */ nop +/* A7254 80110B54 00000000 */ nop /* A7258 80110B58 468031A1 */ cvt.d.w $f6, $f6 /* A725C 80110B5C 46203182 */ mul.d $f6, $f6, $f0 -/* A7260 80110B60 00000000 */ nop +/* A7260 80110B60 00000000 */ nop /* A7264 80110B64 C4A40028 */ lwc1 $f4, 0x28($a1) /* A7268 80110B68 C4800048 */ lwc1 $f0, 0x48($a0) /* A726C 80110B6C C4A80030 */ lwc1 $f8, 0x30($a1) @@ -60,12 +60,12 @@ glabel test_player_entity_aabb /* A7280 80110B80 46004205 */ abs.s $f8, $f8 /* A7284 80110B84 462010A0 */ cvt.s.d $f2, $f2 /* A7288 80110B88 4604103C */ c.lt.s $f2, $f4 -/* A728C 80110B8C 00000000 */ nop +/* A728C 80110B8C 00000000 */ nop /* A7290 80110B90 4501FFE0 */ bc1t .L80110B14 /* A7294 80110B94 462031A0 */ cvt.s.d $f6, $f6 /* A7298 80110B98 4608303C */ c.lt.s $f6, $f8 -/* A729C 80110B9C 00000000 */ nop +/* A729C 80110B9C 00000000 */ nop /* A72A0 80110BA0 4501FFDC */ bc1t .L80110B14 /* A72A4 80110BA4 24020001 */ addiu $v0, $zero, 1 /* A72A8 80110BA8 03E00008 */ jr $ra -/* A72AC 80110BAC 00000000 */ nop +/* A72AC 80110BAC 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/update_entities.s b/asm/nonmatchings/code_a5dd0_len_114e0/update_entities.s index 41473b675c..cc7b3d8beb 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/update_entities.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/update_entities.s @@ -58,7 +58,7 @@ glabel update_entities /* A5E98 8010F798 8E020000 */ lw $v0, ($s0) /* A5E9C 8010F79C 00531024 */ and $v0, $v0, $s3 /* A5EA0 8010F7A0 1040002D */ beqz $v0, .L8010F858 -/* A5EA4 8010F7A4 00000000 */ nop +/* A5EA4 8010F7A4 00000000 */ nop /* A5EA8 8010F7A8 8E020024 */ lw $v0, 0x24($s0) /* A5EAC 8010F7AC 0C0B1059 */ jal does_script_exist /* A5EB0 8010F7B0 8C440144 */ lw $a0, 0x144($v0) @@ -67,11 +67,11 @@ glabel update_entities /* A5EBC 8010F7BC 8E020000 */ lw $v0, ($s0) /* A5EC0 8010F7C0 30420008 */ andi $v0, $v0, 8 /* A5EC4 8010F7C4 10400005 */ beqz $v0, .L8010F7DC -/* A5EC8 8010F7C8 00000000 */ nop +/* A5EC8 8010F7C8 00000000 */ nop /* A5ECC 8010F7CC 0C047A2F */ jal func_8011E8BC /* A5ED0 8010F7D0 86040014 */ lh $a0, 0x14($s0) /* A5ED4 8010F7D4 08043DF9 */ j .L8010F7E4 -/* A5ED8 8010F7D8 00000000 */ nop +/* A5ED8 8010F7D8 00000000 */ nop .L8010F7DC: /* A5EDC 8010F7DC 0C0483C1 */ jal func_80120F04 /* A5EE0 8010F7E0 86040014 */ lh $a0, 0x14($s0) @@ -79,7 +79,7 @@ glabel update_entities /* A5EE4 8010F7E4 8E020000 */ lw $v0, ($s0) /* A5EE8 8010F7E8 30422000 */ andi $v0, $v0, 0x2000 /* A5EEC 8010F7EC 1040000E */ beqz $v0, .L8010F828 -/* A5EF0 8010F7F0 00000000 */ nop +/* A5EF0 8010F7F0 00000000 */ nop /* A5EF4 8010F7F4 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* A5EF8 8010F7F8 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* A5EFC 8010F7FC 00031080 */ sll $v0, $v1, 2 @@ -117,11 +117,11 @@ glabel update_entities /* A5F70 8010F870 A2020006 */ sb $v0, 6($s0) /* A5F74 8010F874 304200FF */ andi $v0, $v0, 0xff /* A5F78 8010F878 10400026 */ beqz $v0, .L8010F914 -/* A5F7C 8010F87C 00000000 */ nop +/* A5F7C 8010F87C 00000000 */ nop /* A5F80 8010F880 8E020038 */ lw $v0, 0x38($s0) /* A5F84 8010F884 8C420014 */ lw $v0, 0x14($v0) /* A5F88 8010F888 10400022 */ beqz $v0, .L8010F914 -/* A5F8C 8010F88C 00000000 */ nop +/* A5F8C 8010F88C 00000000 */ nop /* A5F90 8010F890 0040F809 */ jalr $v0 /* A5F94 8010F894 0200202D */ daddu $a0, $s0, $zero /* A5F98 8010F898 1040001E */ beqz $v0, .L8010F914 @@ -162,7 +162,7 @@ glabel update_entities /* A6014 8010F914 8E020000 */ lw $v0, ($s0) /* A6018 8010F918 30422000 */ andi $v0, $v0, 0x2000 /* A601C 8010F91C 1040000E */ beqz $v0, .L8010F958 -/* A6020 8010F920 00000000 */ nop +/* A6020 8010F920 00000000 */ nop /* A6024 8010F924 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* A6028 8010F928 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* A602C 8010F92C 00031080 */ sll $v0, $v1, 2 @@ -181,58 +181,58 @@ glabel update_entities /* A605C 8010F95C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* A6060 8010F960 80420078 */ lb $v0, 0x78($v0) /* A6064 8010F964 14400014 */ bnez $v0, .L8010F9B8 -/* A6068 8010F968 00000000 */ nop +/* A6068 8010F968 00000000 */ nop /* A606C 8010F96C 8E02001C */ lw $v0, 0x1c($s0) /* A6070 8010F970 10400003 */ beqz $v0, .L8010F980 -/* A6074 8010F974 00000000 */ nop +/* A6074 8010F974 00000000 */ nop /* A6078 8010F978 0040F809 */ jalr $v0 /* A607C 8010F97C 0200202D */ daddu $a0, $s0, $zero .L8010F980: /* A6080 8010F980 8E020018 */ lw $v0, 0x18($s0) /* A6084 8010F984 1040000C */ beqz $v0, .L8010F9B8 -/* A6088 8010F988 00000000 */ nop +/* A6088 8010F988 00000000 */ nop /* A608C 8010F98C 92020009 */ lbu $v0, 9($s0) /* A6090 8010F990 10400009 */ beqz $v0, .L8010F9B8 /* A6094 8010F994 2442FFFF */ addiu $v0, $v0, -1 /* A6098 8010F998 A2020009 */ sb $v0, 9($s0) /* A609C 8010F99C 304200FF */ andi $v0, $v0, 0xff /* A60A0 8010F9A0 14400005 */ bnez $v0, .L8010F9B8 -/* A60A4 8010F9A4 00000000 */ nop +/* A60A4 8010F9A4 00000000 */ nop .L8010F9A8: /* A60A8 8010F9A8 0C043EF6 */ jal func_8010FBD8 /* A60AC 8010F9AC 0200202D */ daddu $a0, $s0, $zero /* A60B0 8010F9B0 1440FFFD */ bnez $v0, .L8010F9A8 -/* A60B4 8010F9B4 00000000 */ nop +/* A60B4 8010F9B4 00000000 */ nop .L8010F9B8: /* A60B8 8010F9B8 8E020000 */ lw $v0, ($s0) /* A60BC 8010F9BC 30420010 */ andi $v0, $v0, 0x10 /* A60C0 8010F9C0 14400003 */ bnez $v0, .L8010F9D0 -/* A60C4 8010F9C4 00000000 */ nop +/* A60C4 8010F9C4 00000000 */ nop /* A60C8 8010F9C8 0C04408B */ jal update_entity_transform_matrix /* A60CC 8010F9CC 0200202D */ daddu $a0, $s0, $zero .L8010F9D0: /* A60D0 8010F9D0 8E020000 */ lw $v0, ($s0) /* A60D4 8010F9D4 30420020 */ andi $v0, $v0, 0x20 /* A60D8 8010F9D8 14400003 */ bnez $v0, .L8010F9E8 -/* A60DC 8010F9DC 00000000 */ nop +/* A60DC 8010F9DC 00000000 */ nop /* A60E0 8010F9E0 0C044129 */ jal update_entity_inverse_rotation_matrix /* A60E4 8010F9E4 0200202D */ daddu $a0, $s0, $zero .L8010F9E8: /* A60E8 8010F9E8 8E020000 */ lw $v0, ($s0) /* A60EC 8010F9EC 30420008 */ andi $v0, $v0, 8 /* A60F0 8010F9F0 10400005 */ beqz $v0, .L8010FA08 -/* A60F4 8010F9F4 00000000 */ nop +/* A60F4 8010F9F4 00000000 */ nop /* A60F8 8010F9F8 0C047A2F */ jal func_8011E8BC /* A60FC 8010F9FC 86040014 */ lh $a0, 0x14($s0) /* A6100 8010FA00 08043E84 */ j .L8010FA10 -/* A6104 8010FA04 00000000 */ nop +/* A6104 8010FA04 00000000 */ nop .L8010FA08: /* A6108 8010FA08 0C0483C1 */ jal func_80120F04 /* A610C 8010FA0C 86040014 */ lh $a0, 0x14($s0) .L8010FA10: /* A6110 8010FA10 86020016 */ lh $v0, 0x16($s0) /* A6114 8010FA14 04400003 */ bltz $v0, .L8010FA24 -/* A6118 8010FA18 00000000 */ nop +/* A6118 8010FA18 00000000 */ nop /* A611C 8010FA1C 0C0448D1 */ jal func_80112344 /* A6120 8010FA20 0200202D */ daddu $a0, $s0, $zero .L8010FA24: @@ -240,7 +240,7 @@ glabel update_entities /* A6128 8010FA28 3C032000 */ lui $v1, 0x2000 /* A612C 8010FA2C 00431024 */ and $v0, $v0, $v1 /* A6130 8010FA30 10400003 */ beqz $v0, .L8010FA40 -/* A6134 8010FA34 00000000 */ nop +/* A6134 8010FA34 00000000 */ nop /* A6138 8010FA38 0C0441B4 */ jal delete_entity /* A613C 8010FA3C 92040004 */ lbu $a0, 4($s0) .L8010FA40: @@ -251,13 +251,13 @@ glabel update_entities /* A6150 8010FA50 26310001 */ addiu $s1, $s1, 1 /* A6154 8010FA54 92040004 */ lbu $a0, 4($s0) /* A6158 8010FA58 0C0441E4 */ jal delete_entity_and_unload_data -/* A615C 8010FA5C 00000000 */ nop +/* A615C 8010FA5C 00000000 */ nop .L8010FA60: /* A6160 8010FA60 2A22001E */ slti $v0, $s1, 0x1e /* A6164 8010FA64 1440FF2D */ bnez $v0, .L8010F71C -/* A6168 8010FA68 00000000 */ nop +/* A6168 8010FA68 00000000 */ nop /* A616C 8010FA6C 0C043EA6 */ jal update_shadows -/* A6170 8010FA70 00000000 */ nop +/* A6170 8010FA70 00000000 */ nop /* A6174 8010FA74 8FBF0020 */ lw $ra, 0x20($sp) /* A6178 8010FA78 8FB3001C */ lw $s3, 0x1c($sp) /* A617C 8010FA7C 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/update_entity_inverse_rotation_matrix.s b/asm/nonmatchings/code_a5dd0_len_114e0/update_entity_inverse_rotation_matrix.s index 25f80b0aad..33203212ce 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/update_entity_inverse_rotation_matrix.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/update_entity_inverse_rotation_matrix.s @@ -49,32 +49,32 @@ glabel update_entity_inverse_rotation_matrix /* A6C54 80110554 00420018 */ mult $v0, $v0 /* A6C58 80110558 00001812 */ mflo $v1 /* A6C5C 8011055C 86220010 */ lh $v0, 0x10($s1) -/* A6C60 80110560 00000000 */ nop +/* A6C60 80110560 00000000 */ nop /* A6C64 80110564 00420018 */ mult $v0, $v0 /* A6C68 80110568 00004812 */ mflo $t1 /* A6C6C 8011056C 8622000E */ lh $v0, 0xe($s1) -/* A6C70 80110570 00000000 */ nop +/* A6C70 80110570 00000000 */ nop /* A6C74 80110574 00420018 */ mult $v0, $v0 /* A6C78 80110578 3C013E80 */ lui $at, 0x3e80 /* A6C7C 8011057C 44811000 */ mtc1 $at, $f2 /* A6C80 80110580 00691021 */ addu $v0, $v1, $t1 /* A6C84 80110584 44820000 */ mtc1 $v0, $f0 -/* A6C88 80110588 00000000 */ nop +/* A6C88 80110588 00000000 */ nop /* A6C8C 8011058C 46800020 */ cvt.s.w $f0, $f0 /* A6C90 80110590 46020002 */ mul.s $f0, $f0, $f2 -/* A6C94 80110594 00000000 */ nop +/* A6C94 80110594 00000000 */ nop /* A6C98 80110598 00002012 */ mflo $a0 /* A6C9C 8011059C 44841000 */ mtc1 $a0, $f2 -/* A6CA0 801105A0 00000000 */ nop +/* A6CA0 801105A0 00000000 */ nop /* A6CA4 801105A4 468010A0 */ cvt.s.w $f2, $f2 /* A6CA8 801105A8 46020300 */ add.s $f12, $f0, $f2 /* A6CAC 801105AC 46006004 */ sqrt.s $f0, $f12 /* A6CB0 801105B0 46000032 */ c.eq.s $f0, $f0 -/* A6CB4 801105B4 00000000 */ nop +/* A6CB4 801105B4 00000000 */ nop /* A6CB8 801105B8 45030004 */ bc1tl .L801105CC /* A6CBC 801105BC E62000B0 */ swc1 $f0, 0xb0($s1) /* A6CC0 801105C0 0C0187BC */ jal sqrtf -/* A6CC4 801105C4 00000000 */ nop +/* A6CC4 801105C4 00000000 */ nop /* A6CC8 801105C8 E62000B0 */ swc1 $f0, 0xb0($s1) .L801105CC: /* A6CCC 801105CC 8FBF00A0 */ lw $ra, 0xa0($sp) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/update_entity_transform_matrix.s b/asm/nonmatchings/code_a5dd0_len_114e0/update_entity_transform_matrix.s index 2cad0cddec..a1c4cc0e80 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/update_entity_transform_matrix.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/update_entity_transform_matrix.s @@ -16,9 +16,9 @@ glabel update_entity_transform_matrix /* A6958 80110258 10400005 */ beqz $v0, .L80110270 /* A695C 8011025C 27B30058 */ addiu $s3, $sp, 0x58 /* A6960 80110260 0040F809 */ jalr $v0 -/* A6964 80110264 00000000 */ nop +/* A6964 80110264 00000000 */ nop /* A6968 80110268 080440D3 */ j .L8011034C -/* A696C 8011026C 00000000 */ nop +/* A696C 8011026C 00000000 */ nop .L80110270: /* A6970 80110270 8E850048 */ lw $a1, 0x48($s4) /* A6974 80110274 8E86004C */ lw $a2, 0x4c($s4) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/update_shadows.s b/asm/nonmatchings/code_a5dd0_len_114e0/update_shadows.s index bde8261a1b..d161b1936a 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/update_shadows.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/update_shadows.s @@ -32,7 +32,7 @@ glabel update_shadows /* A6200 8010FB00 26310001 */ addiu $s1, $s1, 1 /* A6204 8010FB04 30622000 */ andi $v0, $v1, 0x2000 /* A6208 8010FB08 1040000E */ beqz $v0, .L8010FB44 -/* A620C 8010FB0C 00000000 */ nop +/* A620C 8010FB0C 00000000 */ nop /* A6210 8010FB10 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* A6214 8010FB14 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* A6218 8010FB18 00031080 */ sll $v0, $v1, 2 @@ -52,11 +52,11 @@ glabel update_shadows /* A624C 8010FB4C 8E020000 */ lw $v0, ($s0) /* A6250 8010FB50 30420008 */ andi $v0, $v0, 8 /* A6254 8010FB54 10400005 */ beqz $v0, .L8010FB6C -/* A6258 8010FB58 00000000 */ nop +/* A6258 8010FB58 00000000 */ nop /* A625C 8010FB5C 0C047A2F */ jal func_8011E8BC /* A6260 8010FB60 86040008 */ lh $a0, 8($s0) /* A6264 8010FB64 08043EDD */ j .L8010FB74 -/* A6268 8010FB68 00000000 */ nop +/* A6268 8010FB68 00000000 */ nop .L8010FB6C: /* A626C 8010FB6C 0C0483C1 */ jal func_80120F04 /* A6270 8010FB70 86040008 */ lh $a0, 8($s0) @@ -68,11 +68,11 @@ glabel update_shadows /* A6284 8010FB84 26310001 */ addiu $s1, $s1, 1 /* A6288 8010FB88 92040004 */ lbu $a0, 4($s0) /* A628C 8010FB8C 0C044217 */ jal func_8011085C -/* A6290 8010FB90 00000000 */ nop +/* A6290 8010FB90 00000000 */ nop .L8010FB94: /* A6294 8010FB94 2A22003C */ slti $v0, $s1, 0x3c /* A6298 8010FB98 1440FFCE */ bnez $v0, .L8010FAD4 -/* A629C 8010FB9C 00000000 */ nop +/* A629C 8010FB9C 00000000 */ nop /* A62A0 8010FBA0 8FBF0024 */ lw $ra, 0x24($sp) /* A62A4 8010FBA4 8FB40020 */ lw $s4, 0x20($sp) /* A62A8 8010FBA8 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/code_ad90_len_2880/func_800304FC.s b/asm/nonmatchings/code_ad90_len_2880/func_800304FC.s index ff57fdd71a..8ef1a2fe47 100644 --- a/asm/nonmatchings/code_ad90_len_2880/func_800304FC.s +++ b/asm/nonmatchings/code_ad90_len_2880/func_800304FC.s @@ -43,11 +43,12 @@ glabel func_800304FC /* B990 80030590 2C620007 */ sltiu $v0, $v1, 7 /* B994 80030594 104000BA */ beqz $v0, .L80030880 /* B998 80030598 00031080 */ sll $v0, $v1, 2 -/* B99C 8003059C 3C01800A */ lui $at, %hi(D_80098210) +/* B99C 8003059C 3C01800A */ lui $at, %hi(jtbl_80098210_73610) /* B9A0 800305A0 00220821 */ addu $at, $at, $v0 -/* B9A4 800305A4 8C228210 */ lw $v0, %lo(D_80098210)($at) +/* B9A4 800305A4 8C228210 */ lw $v0, %lo(jtbl_80098210_73610)($at) /* B9A8 800305A8 00400008 */ jr $v0 /* B9AC 800305AC 00000000 */ nop +glabel L800305B0_B9B0 /* B9B0 800305B0 8E020028 */ lw $v0, 0x28($s0) /* B9B4 800305B4 504000B0 */ beql $v0, $zero, .L80030878 /* B9B8 800305B8 E6380010 */ swc1 $f24, 0x10($s1) @@ -85,6 +86,7 @@ glabel func_800304FC /* BA38 80030638 E6280010 */ swc1 $f8, 0x10($s1) /* BA3C 8003063C 0800C220 */ j .L80030880 /* BA40 80030640 E6240018 */ swc1 $f4, 0x18($s1) +glabel L80030644_BA44 /* BA44 80030644 C60E000C */ lwc1 $f14, 0xc($s0) /* BA48 80030648 C61C0018 */ lwc1 $f28, 0x18($s0) /* BA4C 8003064C 460EE201 */ sub.s $f8, $f28, $f14 @@ -161,6 +163,7 @@ glabel func_800304FC /* BB5C 8003075C E63E0014 */ swc1 $f30, 0x14($s1) /* BB60 80030760 0800C220 */ j .L80030880 /* BB64 80030764 E62A0018 */ swc1 $f10, 0x18($s1) +glabel L80030768_BB68 /* BB68 80030768 8E020028 */ lw $v0, 0x28($s0) /* BB6C 8003076C 50400042 */ beql $v0, $zero, .L80030878 /* BB70 80030770 E6380010 */ swc1 $f24, 0x10($s1) @@ -227,14 +230,17 @@ glabel func_800304FC /* BC5C 8003085C 46040000 */ add.s $f0, $f0, $f4 /* BC60 80030860 0800C220 */ j .L80030880 /* BC64 80030864 E6200018 */ swc1 $f0, 0x18($s1) +glabel L80030868_BC68 /* BC68 80030868 2402FFFF */ addiu $v0, $zero, -1 /* BC6C 8003086C 0800C220 */ j .L80030880 /* BC70 80030870 AE820000 */ sw $v0, ($s4) +glabel L80030874_BC74 /* BC74 80030874 E6380010 */ swc1 $f24, 0x10($s1) .L80030878: /* BC78 80030878 E63E0014 */ swc1 $f30, 0x14($s1) /* BC7C 8003087C E63A0018 */ swc1 $f26, 0x18($s1) .L80030880: +glabel L80030880_BC80 /* BC80 80030880 8FA20090 */ lw $v0, 0x90($sp) /* BC84 80030884 C7B800A0 */ lwc1 $f24, 0xa0($sp) /* BC88 80030888 C7BE00A4 */ lwc1 $f30, 0xa4($sp) @@ -251,11 +257,12 @@ glabel func_800304FC /* BCB0 800308B0 2C620007 */ sltiu $v0, $v1, 7 /* BCB4 800308B4 10400279 */ beqz $v0, .L8003129C /* BCB8 800308B8 00031080 */ sll $v0, $v1, 2 -/* BCBC 800308BC 3C01800A */ lui $at, %hi(D_80098230) +/* BCBC 800308BC 3C01800A */ lui $at, %hi(jtbl_80098230_73630) /* BCC0 800308C0 00220821 */ addu $at, $at, $v0 -/* BCC4 800308C4 8C228230 */ lw $v0, %lo(D_80098230)($at) +/* BCC4 800308C4 8C228230 */ lw $v0, %lo(jtbl_80098230_73630)($at) /* BCC8 800308C8 00400008 */ jr $v0 /* BCCC 800308CC 00000000 */ nop +glabel L800308D0_BCD0 /* BCD0 800308D0 C6020018 */ lwc1 $f2, 0x18($s0) /* BCD4 800308D4 C600000C */ lwc1 $f0, 0xc($s0) /* BCD8 800308D8 46001081 */ sub.s $f2, $f2, $f0 @@ -321,6 +328,7 @@ glabel func_800304FC /* BDC0 800309C0 E63E0014 */ swc1 $f30, 0x14($s1) /* BDC4 800309C4 0800C2D4 */ j .L80030B50 /* BDC8 800309C8 E63A0018 */ swc1 $f26, 0x18($s1) +glabel L800309CC_BDCC /* BDCC 800309CC C6020018 */ lwc1 $f2, 0x18($s0) /* BDD0 800309D0 C600000C */ lwc1 $f0, 0xc($s0) /* BDD4 800309D4 46001581 */ sub.s $f22, $f2, $f0 @@ -466,6 +474,7 @@ glabel func_800304FC /* BFF0 80030BF0 E6C40000 */ swc1 $f4, ($s6) /* BFF4 80030BF4 0800C4A7 */ j .L8003129C /* BFF8 80030BF8 00000000 */ nop +glabel L80030BFC_BFFC /* BFFC 80030BFC C6040004 */ lwc1 $f4, 4($s0) /* C000 80030C00 44800000 */ mtc1 $zero, $f0 /* C004 80030C04 00000000 */ nop @@ -622,6 +631,7 @@ glabel func_800304FC /* C248 80030E48 E6C40000 */ swc1 $f4, ($s6) /* C24C 80030E4C 0800C4A7 */ j .L8003129C /* C250 80030E50 00000000 */ nop +glabel L80030E54_C254 /* C254 80030E54 8E020028 */ lw $v0, 0x28($s0) /* C258 80030E58 1440005D */ bnez $v0, .L80030FD0 /* C25C 80030E5C 00000000 */ nop @@ -765,6 +775,7 @@ glabel func_800304FC .L80031064: /* C464 80031064 0800C4A6 */ j .L80031298 /* C468 80031068 2402FFFF */ addiu $v0, $zero, -1 +glabel L8003106C_C46C /* C46C 8003106C 8E020028 */ lw $v0, 0x28($s0) /* C470 80031070 1440003A */ bnez $v0, .L8003115C /* C474 80031074 00000000 */ nop @@ -878,10 +889,12 @@ glabel func_800304FC .L80031208: /* C608 80031208 0800C4A6 */ j .L80031298 /* C60C 8003120C 2402FFFF */ addiu $v0, $zero, -1 +glabel L80031210_C610 /* C610 80031210 E6380010 */ swc1 $f24, 0x10($s1) /* C614 80031214 E63E0014 */ swc1 $f30, 0x14($s1) /* C618 80031218 0800C4A7 */ j .L8003129C /* C61C 8003121C E63A0018 */ swc1 $f26, 0x18($s1) +glabel L80031220_C620 /* C620 80031220 C6020018 */ lwc1 $f2, 0x18($s0) /* C624 80031224 C600000C */ lwc1 $f0, 0xc($s0) /* C628 80031228 46001081 */ sub.s $f2, $f2, $f0 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/bind_dynamic_entity_3.s b/asm/nonmatchings/code_b72b0_len_15ed0/bind_dynamic_entity_3.s index c9b911a237..51f0cf1d7a 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/bind_dynamic_entity_3.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/bind_dynamic_entity_3.s @@ -23,10 +23,10 @@ glabel bind_dynamic_entity_3 /* B989C 8012319C 2A020010 */ slti $v0, $s0, 0x10 .L801231A0: /* B98A0 801231A0 14400003 */ bnez $v0, .L801231B0 -/* B98A4 801231A4 00000000 */ nop +/* B98A4 801231A4 00000000 */ nop .L801231A8: /* B98A8 801231A8 08048C6A */ j .L801231A8 -/* B98AC 801231AC 00000000 */ nop +/* B98AC 801231AC 00000000 */ nop .L801231B0: /* B98B0 801231B0 0C00AB39 */ jal heap_malloc /* B98B4 801231B4 2404000C */ addiu $a0, $zero, 0xc @@ -39,7 +39,7 @@ glabel bind_dynamic_entity_3 /* B98D0 801231D0 AC640000 */ sw $a0, ($v1) .L801231D4: /* B98D4 801231D4 08048C75 */ j .L801231D4 -/* B98D8 801231D8 00000000 */ nop +/* B98D8 801231D8 00000000 */ nop .L801231DC: /* B98DC 801231DC 24020003 */ addiu $v0, $zero, 3 /* B98E0 801231E0 AC820000 */ sw $v0, ($a0) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/bind_dynamic_entity_7.s b/asm/nonmatchings/code_b72b0_len_15ed0/bind_dynamic_entity_7.s index e99c7361d6..599e36e3ca 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/bind_dynamic_entity_7.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/bind_dynamic_entity_7.s @@ -23,10 +23,10 @@ glabel bind_dynamic_entity_7 /* B9980 80123280 2A020010 */ slti $v0, $s0, 0x10 .L80123284: /* B9984 80123284 14400003 */ bnez $v0, .L80123294 -/* B9988 80123288 00000000 */ nop +/* B9988 80123288 00000000 */ nop .L8012328C: /* B998C 8012328C 08048CA3 */ j .L8012328C -/* B9990 80123290 00000000 */ nop +/* B9990 80123290 00000000 */ nop .L80123294: /* B9994 80123294 0C00AB39 */ jal heap_malloc /* B9998 80123298 2404000C */ addiu $a0, $zero, 0xc @@ -39,7 +39,7 @@ glabel bind_dynamic_entity_7 /* B99B4 801232B4 AC640000 */ sw $a0, ($v1) .L801232B8: /* B99B8 801232B8 08048CAE */ j .L801232B8 -/* B99BC 801232BC 00000000 */ nop +/* B99BC 801232BC 00000000 */ nop .L801232C0: /* B99C0 801232C0 24020007 */ addiu $v0, $zero, 7 /* B99C4 801232C4 AC820000 */ sw $v0, ($a0) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/bind_dynamic_entity_B.s b/asm/nonmatchings/code_b72b0_len_15ed0/bind_dynamic_entity_B.s index b22ad2e002..598303219b 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/bind_dynamic_entity_B.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/bind_dynamic_entity_B.s @@ -23,10 +23,10 @@ glabel bind_dynamic_entity_B /* B9A64 80123364 2A020010 */ slti $v0, $s0, 0x10 .L80123368: /* B9A68 80123368 14400003 */ bnez $v0, .L80123378 -/* B9A6C 8012336C 00000000 */ nop +/* B9A6C 8012336C 00000000 */ nop .L80123370: /* B9A70 80123370 08048CDC */ j .L80123370 -/* B9A74 80123374 00000000 */ nop +/* B9A74 80123374 00000000 */ nop .L80123378: /* B9A78 80123378 0C00AB39 */ jal heap_malloc /* B9A7C 8012337C 2404000C */ addiu $a0, $zero, 0xc @@ -39,7 +39,7 @@ glabel bind_dynamic_entity_B /* B9A98 80123398 AC640000 */ sw $a0, ($v1) .L8012339C: /* B9A9C 8012339C 08048CE7 */ j .L8012339C -/* B9AA0 801233A0 00000000 */ nop +/* B9AA0 801233A0 00000000 */ nop .L801233A4: /* B9AA4 801233A4 2402000B */ addiu $v0, $zero, 0xb /* B9AA8 801233A8 AC820000 */ sw $v0, ($a0) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/clear_dynamic_entity_list.s b/asm/nonmatchings/code_b72b0_len_15ed0/clear_dynamic_entity_list.s index 2d47eb85a7..077f8799e7 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/clear_dynamic_entity_list.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/clear_dynamic_entity_list.s @@ -6,11 +6,11 @@ glabel clear_dynamic_entity_list /* B97BC 801230BC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* B97C0 801230C0 80420070 */ lb $v0, 0x70($v0) /* B97C4 801230C4 14400005 */ bnez $v0, .L801230DC -/* B97C8 801230C8 00000000 */ nop +/* B97C8 801230C8 00000000 */ nop /* B97CC 801230CC 3C028015 */ lui $v0, %hi(gWorldDynamicEntityList) /* B97D0 801230D0 244243A0 */ addiu $v0, $v0, %lo(gWorldDynamicEntityList) /* B97D4 801230D4 08048C39 */ j .L801230E4 -/* B97D8 801230D8 00000000 */ nop +/* B97D8 801230D8 00000000 */ nop .L801230DC: /* B97DC 801230DC 3C028015 */ lui $v0, %hi(gBattleDynamicEntityList) /* B97E0 801230E0 244243E0 */ addiu $v0, $v0, %lo(gBattleDynamicEntityList) @@ -27,4 +27,4 @@ glabel clear_dynamic_entity_list /* B9804 80123104 0461FFFD */ bgez $v1, .L801230FC /* B9808 80123108 2442FFFC */ addiu $v0, $v0, -4 /* B980C 8012310C 03E00008 */ jr $ra -/* B9810 80123110 00000000 */ nop +/* B9810 80123110 00000000 */ nop diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/clear_virtual_models.s b/asm/nonmatchings/code_b72b0_len_15ed0/clear_virtual_models.s index febdbfe216..b368b68bcb 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/clear_virtual_models.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/clear_virtual_models.s @@ -6,11 +6,11 @@ glabel clear_virtual_models /* B72B4 80120BB4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* B72B8 80120BB8 80420070 */ lb $v0, 0x70($v0) /* B72BC 80120BBC 14400005 */ bnez $v0, .L80120BD4 -/* B72C0 80120BC0 00000000 */ nop +/* B72C0 80120BC0 00000000 */ nop /* B72C4 80120BC4 3C028015 */ lui $v0, %hi(D_80153B70) /* B72C8 80120BC8 24423B70 */ addiu $v0, $v0, %lo(D_80153B70) /* B72CC 80120BCC 080482F7 */ j .L80120BDC -/* B72D0 80120BD0 00000000 */ nop +/* B72D0 80120BD0 00000000 */ nop .L80120BD4: /* B72D4 80120BD4 3C028015 */ lui $v0, %hi(D_80153F70) /* B72D8 80120BD8 24423F70 */ addiu $v0, $v0, %lo(D_80153F70) @@ -46,4 +46,4 @@ glabel clear_virtual_models /* B7348 80120C48 3C018015 */ lui $at, %hi(D_80154390) /* B734C 80120C4C AC224390 */ sw $v0, %lo(D_80154390)($at) /* B7350 80120C50 03E00008 */ jr $ra -/* B7354 80120C54 00000000 */ nop +/* B7354 80120C54 00000000 */ nop diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80120DE4.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80120DE4.s index 4c1493c5c7..66c2fe93ae 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80120DE4.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80120DE4.s @@ -22,10 +22,10 @@ glabel func_80120DE4 /* B7524 80120E24 2A220100 */ slti $v0, $s1, 0x100 .L80120E28: /* B7528 80120E28 14400003 */ bnez $v0, .L80120E38 -/* B752C 80120E2C 00000000 */ nop +/* B752C 80120E2C 00000000 */ nop .L80120E30: /* B7530 80120E30 0804838C */ j .L80120E30 -/* B7534 80120E34 00000000 */ nop +/* B7534 80120E34 00000000 */ nop .L80120E38: /* B7538 80120E38 0C00AB39 */ jal heap_malloc /* B753C 80120E3C 24040068 */ addiu $a0, $zero, 0x68 @@ -43,7 +43,7 @@ glabel func_80120DE4 /* B756C 80120E6C ACA30000 */ sw $v1, ($a1) .L80120E70: /* B7570 80120E70 0804839C */ j .L80120E70 -/* B7574 80120E74 00000000 */ nop +/* B7574 80120E74 00000000 */ nop .L80120E78: /* B7578 80120E78 0C00AB39 */ jal heap_malloc /* B757C 80120E7C 24040010 */ addiu $a0, $zero, 0x10 @@ -51,7 +51,7 @@ glabel func_80120DE4 /* B7584 80120E84 AE020014 */ sw $v0, 0x14($s0) .L80120E88: /* B7588 80120E88 080483A2 */ j .L80120E88 -/* B758C 80120E8C 00000000 */ nop +/* B758C 80120E8C 00000000 */ nop .L80120E90: /* B7590 80120E90 3C013F80 */ lui $at, 0x3f80 /* B7594 80120E94 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80120F04.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80120F04.s index d5650ba87e..b9910a095e 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80120F04.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80120F04.s @@ -11,7 +11,7 @@ glabel func_80120F04 /* B761C 80120F1C 10400003 */ beqz $v0, .L80120F2C /* B7620 80120F20 30820800 */ andi $v0, $a0, 0x800 /* B7624 80120F24 10400020 */ beqz $v0, .L80120FA8 -/* B7628 80120F28 00000000 */ nop +/* B7628 80120F28 00000000 */ nop .L80120F2C: /* B762C 80120F2C 2402F7FF */ addiu $v0, $zero, -0x801 /* B7630 80120F30 00822024 */ and $a0, $a0, $v0 @@ -21,7 +21,7 @@ glabel func_80120F04 /* B7640 80120F40 00431021 */ addu $v0, $v0, $v1 /* B7644 80120F44 8C500000 */ lw $s0, ($v0) /* B7648 80120F48 12000017 */ beqz $s0, .L80120FA8 -/* B764C 80120F4C 00000000 */ nop +/* B764C 80120F4C 00000000 */ nop /* B7650 80120F50 8E030000 */ lw $v1, ($s0) /* B7654 80120F54 10600014 */ beqz $v1, .L80120FA8 /* B7658 80120F58 30620020 */ andi $v0, $v1, 0x20 @@ -37,14 +37,14 @@ glabel func_80120F04 /* B7680 80120F80 00621024 */ and $v0, $v1, $v0 /* B7684 80120F84 AE020000 */ sw $v0, ($s0) /* B7688 80120F88 4602003E */ c.le.s $f0, $f2 -/* B768C 80120F8C 00000000 */ nop +/* B768C 80120F8C 00000000 */ nop /* B7690 80120F90 45000005 */ bc1f .L80120FA8 /* B7694 80120F94 E6000008 */ swc1 $f0, 8($s0) .L80120F98: /* B7698 80120F98 0C0483EE */ jal func_80120FB8 /* B769C 80120F9C 0200202D */ daddu $a0, $s0, $zero /* B76A0 80120FA0 1440FFFD */ bnez $v0, .L80120F98 -/* B76A4 80120FA4 00000000 */ nop +/* B76A4 80120FA4 00000000 */ nop .L80120FA8: /* B76A8 80120FA8 8FBF0014 */ lw $ra, 0x14($sp) /* B76AC 80120FAC 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80120FB8.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80120FB8.s index c080dc7652..2ec1a8090a 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80120FB8.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80120FB8.s @@ -11,25 +11,27 @@ glabel func_80120FB8 /* B76D0 80120FD0 10400057 */ beqz $v0, .L80121130 /* B76D4 80120FD4 24A50004 */ addiu $a1, $a1, 4 /* B76D8 80120FD8 00031080 */ sll $v0, $v1, 2 -/* B76DC 80120FDC 3C018015 */ lui $at, %hi(D_801500B0) +/* B76DC 80120FDC 3C018015 */ lui $at, %hi(jtbl_801500B0_E67B0) /* B76E0 80120FE0 00220821 */ addu $at, $at, $v0 -/* B76E4 80120FE4 8C2200B0 */ lw $v0, %lo(D_801500B0)($at) +/* B76E4 80120FE4 8C2200B0 */ lw $v0, %lo(jtbl_801500B0_E67B0)($at) /* B76E8 80120FE8 00400008 */ jr $v0 -/* B76EC 80120FEC 00000000 */ nop +/* B76EC 80120FEC 00000000 */ nop +glabel L80120FF0_B76F0 /* B76F0 80120FF0 0C048BA5 */ jal func_80122E94 /* B76F4 80120FF4 00C0202D */ daddu $a0, $a2, $zero /* B76F8 80120FF8 0804844D */ j .L80121134 /* B76FC 80120FFC 24020001 */ addiu $v0, $zero, 1 +glabel L80121000_B7700 /* B7700 80121000 8CA20000 */ lw $v0, ($a1) /* B7704 80121004 44821000 */ mtc1 $v0, $f2 -/* B7708 80121008 00000000 */ nop +/* B7708 80121008 00000000 */ nop /* B770C 8012100C 468010A1 */ cvt.d.w $f2, $f2 /* B7710 80121010 04410006 */ bgez $v0, .L8012102C /* B7714 80121014 24A50004 */ addiu $a1, $a1, 4 /* B7718 80121018 3C0141F0 */ lui $at, 0x41f0 /* B771C 8012101C 44810800 */ mtc1 $at, $f1 /* B7720 80121020 44800000 */ mtc1 $zero, $f0 -/* B7724 80121024 00000000 */ nop +/* B7724 80121024 00000000 */ nop /* B7728 80121028 46201080 */ add.d $f2, $f2, $f0 .L8012102C: /* B772C 8012102C 46201020 */ cvt.s.d $f0, $f2 @@ -39,20 +41,24 @@ glabel func_80120FB8 /* B773C 8012103C ACC50010 */ sw $a1, 0x10($a2) /* B7740 80121040 0804844C */ j .L80121130 /* B7744 80121044 ACC20014 */ sw $v0, 0x14($a2) +glabel L80121048_B7748 /* B7748 80121048 8CC30058 */ lw $v1, 0x58($a2) /* B774C 8012104C 24020001 */ addiu $v0, $zero, 1 /* B7750 80121050 0804844D */ j .L80121134 /* B7754 80121054 ACC30010 */ sw $v1, 0x10($a2) +glabel L80121058_B7758 /* B7758 80121058 24020001 */ addiu $v0, $zero, 1 /* B775C 8012105C ACC50058 */ sw $a1, 0x58($a2) /* B7760 80121060 0804844D */ j .L80121134 /* B7764 80121064 ACC50010 */ sw $a1, 0x10($a2) +glabel L80121068_B7768 /* B7768 80121068 90A30003 */ lbu $v1, 3($a1) /* B776C 8012106C 24A50004 */ addiu $a1, $a1, 4 /* B7770 80121070 24020001 */ addiu $v0, $zero, 1 /* B7774 80121074 ACC50010 */ sw $a1, 0x10($a2) /* B7778 80121078 0804844D */ j .L80121134 /* B777C 8012107C A0C30004 */ sb $v1, 4($a2) +glabel L80121080_B7780 /* B7780 80121080 8CA40000 */ lw $a0, ($a1) /* B7784 80121084 24A50004 */ addiu $a1, $a1, 4 /* B7788 80121088 8CC30000 */ lw $v1, ($a2) @@ -61,6 +67,7 @@ glabel func_80120FB8 /* B7794 80121094 00641825 */ or $v1, $v1, $a0 /* B7798 80121098 0804844D */ j .L80121134 /* B779C 8012109C ACC30000 */ sw $v1, ($a2) +glabel L801210A0_B77A0 /* B77A0 801210A0 8CA40000 */ lw $a0, ($a1) /* B77A4 801210A4 24A50004 */ addiu $a1, $a1, 4 /* B77A8 801210A8 8CC30000 */ lw $v1, ($a2) @@ -70,17 +77,18 @@ glabel func_80120FB8 /* B77B8 801210B8 00641824 */ and $v1, $v1, $a0 /* B77BC 801210BC 0804844D */ j .L80121134 /* B77C0 801210C0 ACC30000 */ sw $v1, ($a2) +glabel L801210C4_B77C4 /* B77C4 801210C4 8CA20000 */ lw $v0, ($a1) /* B77C8 801210C8 8CC30014 */ lw $v1, 0x14($a2) /* B77CC 801210CC 44821000 */ mtc1 $v0, $f2 -/* B77D0 801210D0 00000000 */ nop +/* B77D0 801210D0 00000000 */ nop /* B77D4 801210D4 468010A1 */ cvt.d.w $f2, $f2 /* B77D8 801210D8 04410006 */ bgez $v0, .L801210F4 /* B77DC 801210DC 24A50004 */ addiu $a1, $a1, 4 /* B77E0 801210E0 3C0141F0 */ lui $at, 0x41f0 /* B77E4 801210E4 44810800 */ mtc1 $at, $f1 /* B77E8 801210E8 44800000 */ mtc1 $zero, $f0 -/* B77EC 801210EC 00000000 */ nop +/* B77EC 801210EC 00000000 */ nop /* B77F0 801210F0 46201080 */ add.d $f2, $f2, $f0 .L801210F4: /* B77F4 801210F4 46201020 */ cvt.s.d $f0, $f2 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121184.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121184.s index 5a54ce8231..6c7a6870d8 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121184.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121184.s @@ -113,7 +113,7 @@ glabel func_80121184 /* B7A2C 8012132C 112200C3 */ beq $t1, $v0, .L8012163C /* B7A30 80121330 3C02D9FD */ lui $v0, %hi(D_D9FCFFFF) /* B7A34 80121334 0804862C */ j .L801218B0 -/* B7A38 80121338 00000000 */ nop +/* B7A38 80121338 00000000 */ nop .L8012133C: /* B7A3C 8012133C 92420004 */ lbu $v0, 4($s2) /* B7A40 80121340 2442FFFF */ addiu $v0, $v0, %lo(D_D9FCFFFF) @@ -122,11 +122,12 @@ glabel func_80121184 /* B7A4C 8012134C 2C62002D */ sltiu $v0, $v1, 0x2d /* B7A50 80121350 10400156 */ beqz $v0, .L801218AC /* B7A54 80121354 00031080 */ sll $v0, $v1, 2 -/* B7A58 80121358 3C018015 */ lui $at, %hi(D_801500D0) +/* B7A58 80121358 3C018015 */ lui $at, %hi(jtbl_801500D0_E67D0) /* B7A5C 8012135C 00220821 */ addu $at, $at, $v0 -/* B7A60 80121360 8C2200D0 */ lw $v0, %lo(D_801500D0)($at) +/* B7A60 80121360 8C2200D0 */ lw $v0, %lo(jtbl_801500D0_E67D0)($at) /* B7A64 80121364 00400008 */ jr $v0 -/* B7A68 80121368 00000000 */ nop +/* B7A68 80121368 00000000 */ nop +glabel L8012136C_B7A6C /* B7A6C 8012136C 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B7A70 80121370 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7A74 80121374 8C620000 */ lw $v0, ($v1) @@ -139,6 +140,7 @@ glabel func_80121184 /* B7A90 80121390 2442B7F8 */ addiu $v0, $v0, %lo(D_8014B7F8) /* B7A94 80121394 0804862B */ j .L801218AC /* B7A98 80121398 AC820004 */ sw $v0, 4($a0) +glabel L8012139C_B7A9C /* B7A9C 8012139C 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B7AA0 801213A0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7AA4 801213A4 8C620000 */ lw $v0, ($v1) @@ -151,6 +153,7 @@ glabel func_80121184 /* B7AC0 801213C0 2442B820 */ addiu $v0, $v0, %lo(D_8014B820) /* B7AC4 801213C4 0804862B */ j .L801218AC /* B7AC8 801213C8 AC820004 */ sw $v0, 4($a0) +glabel L801213CC_B7ACC /* B7ACC 801213CC 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B7AD0 801213D0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7AD4 801213D4 8C620000 */ lw $v0, ($v1) @@ -163,6 +166,7 @@ glabel func_80121184 /* B7AF0 801213F0 2442B848 */ addiu $v0, $v0, %lo(D_8014B848) /* B7AF4 801213F4 0804862B */ j .L801218AC /* B7AF8 801213F8 AC820004 */ sw $v0, 4($a0) +glabel L801213FC_B7AFC /* B7AFC 801213FC 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B7B00 80121400 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7B04 80121404 8C620000 */ lw $v0, ($v1) @@ -175,6 +179,7 @@ glabel func_80121184 /* B7B20 80121420 2442B870 */ addiu $v0, $v0, %lo(D_8014B870) /* B7B24 80121424 0804862B */ j .L801218AC /* B7B28 80121428 AC820004 */ sw $v0, 4($a0) +glabel L8012142C_B7B2C /* B7B2C 8012142C 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B7B30 80121430 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7B34 80121434 8C620000 */ lw $v0, ($v1) @@ -187,6 +192,7 @@ glabel func_80121184 /* B7B50 80121450 2442B898 */ addiu $v0, $v0, %lo(D_8014B898) /* B7B54 80121454 0804862B */ j .L801218AC /* B7B58 80121458 AC820004 */ sw $v0, 4($a0) +glabel L8012145C_B7B5C /* B7B5C 8012145C 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B7B60 80121460 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7B64 80121464 8C620000 */ lw $v0, ($v1) @@ -199,6 +205,7 @@ glabel func_80121184 /* B7B80 80121480 2442B9B0 */ addiu $v0, $v0, %lo(D_8014B9B0) /* B7B84 80121484 0804862B */ j .L801218AC /* B7B88 80121488 AC820004 */ sw $v0, 4($a0) +glabel L8012148C_B7B8C /* B7B8C 8012148C 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B7B90 80121490 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7B94 80121494 8C620000 */ lw $v0, ($v1) @@ -211,6 +218,7 @@ glabel func_80121184 /* B7BB0 801214B0 2442B8C0 */ addiu $v0, $v0, %lo(D_8014B8C0) /* B7BB4 801214B4 0804862B */ j .L801218AC /* B7BB8 801214B8 AC820004 */ sw $v0, 4($a0) +glabel L801214BC_B7BBC /* B7BBC 801214BC 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B7BC0 801214C0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7BC4 801214C4 8C620000 */ lw $v0, ($v1) @@ -223,6 +231,7 @@ glabel func_80121184 /* B7BE0 801214E0 2442B9D8 */ addiu $v0, $v0, %lo(D_8014B9D8) /* B7BE4 801214E4 0804862B */ j .L801218AC /* B7BE8 801214E8 AC820004 */ sw $v0, 4($a0) +glabel L801214EC_B7BEC /* B7BEC 801214EC 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B7BF0 801214F0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7BF4 801214F4 8C620000 */ lw $v0, ($v1) @@ -235,6 +244,7 @@ glabel func_80121184 /* B7C10 80121510 2442B8E8 */ addiu $v0, $v0, %lo(D_8014B8E8) /* B7C14 80121514 0804862B */ j .L801218AC /* B7C18 80121518 AC820004 */ sw $v0, 4($a0) +glabel L8012151C_B7C1C /* B7C1C 8012151C 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B7C20 80121520 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7C24 80121524 8C620000 */ lw $v0, ($v1) @@ -247,6 +257,7 @@ glabel func_80121184 /* B7C40 80121540 2442BA00 */ addiu $v0, $v0, %lo(D_8014BA00) /* B7C44 80121544 0804862B */ j .L801218AC /* B7C48 80121548 AC820004 */ sw $v0, 4($a0) +glabel L8012154C_B7C4C /* B7C4C 8012154C 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B7C50 80121550 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7C54 80121554 8C620000 */ lw $v0, ($v1) @@ -259,6 +270,7 @@ glabel func_80121184 /* B7C70 80121570 2442B988 */ addiu $v0, $v0, %lo(D_8014B988) /* B7C74 80121574 0804862B */ j .L801218AC /* B7C78 80121578 AC820004 */ sw $v0, 4($a0) +glabel L8012157C_B7C7C /* B7C7C 8012157C 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B7C80 80121580 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7C84 80121584 8C620000 */ lw $v0, ($v1) @@ -271,6 +283,7 @@ glabel func_80121184 /* B7CA0 801215A0 2442BA48 */ addiu $v0, $v0, %lo(D_8014BA48) /* B7CA4 801215A4 0804862B */ j .L801218AC /* B7CA8 801215A8 AC820004 */ sw $v0, 4($a0) +glabel L801215AC_B7CAC /* B7CAC 801215AC 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B7CB0 801215B0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7CB4 801215B4 8C620000 */ lw $v0, ($v1) @@ -283,6 +296,7 @@ glabel func_80121184 /* B7CD0 801215D0 2442BA70 */ addiu $v0, $v0, %lo(D_8014BA70) /* B7CD4 801215D4 0804862B */ j .L801218AC /* B7CD8 801215D8 AC820004 */ sw $v0, 4($a0) +glabel L801215DC_B7CDC /* B7CDC 801215DC 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B7CE0 801215E0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7CE4 801215E4 8C620000 */ lw $v0, ($v1) @@ -295,6 +309,7 @@ glabel func_80121184 /* B7D00 80121600 2442BA98 */ addiu $v0, $v0, %lo(D_8014BA98) /* B7D04 80121604 0804862B */ j .L801218AC /* B7D08 80121608 AC820004 */ sw $v0, 4($a0) +glabel L8012160C_B7D0C /* B7D0C 8012160C 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B7D10 80121610 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7D14 80121614 8C620000 */ lw $v0, ($v1) @@ -315,11 +330,12 @@ glabel func_80121184 /* B7D4C 8012164C 2C620026 */ sltiu $v0, $v1, 0x26 /* B7D50 80121650 10400059 */ beqz $v0, .L801217B8 /* B7D54 80121654 00031080 */ sll $v0, $v1, 2 -/* B7D58 80121658 3C018015 */ lui $at, %hi(D_80150188) +/* B7D58 80121658 3C018015 */ lui $at, %hi(jtbl_80150188_E6888) /* B7D5C 8012165C 00220821 */ addu $at, $at, $v0 -/* B7D60 80121660 8C220188 */ lw $v0, %lo(D_80150188)($at) +/* B7D60 80121660 8C220188 */ lw $v0, %lo(jtbl_80150188_E6888)($at) /* B7D64 80121664 00400008 */ jr $v0 -/* B7D68 80121668 00000000 */ nop +/* B7D68 80121668 00000000 */ nop +glabel L8012166C_B7D6C /* B7D6C 8012166C 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B7D70 80121670 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7D74 80121674 8C620000 */ lw $v0, ($v1) @@ -332,6 +348,7 @@ glabel func_80121184 /* B7D90 80121690 2442BE78 */ addiu $v0, $v0, %lo(D_8014BE78) /* B7D94 80121694 080485EE */ j .L801217B8 /* B7D98 80121698 AC820004 */ sw $v0, 4($a0) +glabel L8012169C_B7D9C /* B7D9C 8012169C 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B7DA0 801216A0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7DA4 801216A4 8C620000 */ lw $v0, ($v1) @@ -344,6 +361,7 @@ glabel func_80121184 /* B7DC0 801216C0 2442BEA0 */ addiu $v0, $v0, %lo(D_8014BEA0) /* B7DC4 801216C4 080485EE */ j .L801217B8 /* B7DC8 801216C8 AC820004 */ sw $v0, 4($a0) +glabel L801216CC_B7DCC /* B7DCC 801216CC 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B7DD0 801216D0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7DD4 801216D4 8C620000 */ lw $v0, ($v1) @@ -356,6 +374,7 @@ glabel func_80121184 /* B7DF0 801216F0 2442BEC8 */ addiu $v0, $v0, %lo(D_8014BEC8) /* B7DF4 801216F4 080485EE */ j .L801217B8 /* B7DF8 801216F8 AC820004 */ sw $v0, 4($a0) +glabel L801216FC_B7DFC /* B7DFC 801216FC 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B7E00 80121700 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7E04 80121704 8C620000 */ lw $v0, ($v1) @@ -368,6 +387,7 @@ glabel func_80121184 /* B7E20 80121720 2442BEF0 */ addiu $v0, $v0, %lo(D_8014BEF0) /* B7E24 80121724 080485EE */ j .L801217B8 /* B7E28 80121728 AC820004 */ sw $v0, 4($a0) +glabel L8012172C_B7E2C /* B7E2C 8012172C 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B7E30 80121730 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7E34 80121734 8C620000 */ lw $v0, ($v1) @@ -380,6 +400,7 @@ glabel func_80121184 /* B7E50 80121750 2442BF18 */ addiu $v0, $v0, %lo(D_8014BF18) /* B7E54 80121754 080485EE */ j .L801217B8 /* B7E58 80121758 AC820004 */ sw $v0, 4($a0) +glabel L8012175C_B7E5C /* B7E5C 8012175C 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B7E60 80121760 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7E64 80121764 8C620000 */ lw $v0, ($v1) @@ -392,6 +413,7 @@ glabel func_80121184 /* B7E80 80121780 2442BF40 */ addiu $v0, $v0, %lo(D_8014BF40) /* B7E84 80121784 080485EE */ j .L801217B8 /* B7E88 80121788 AC820004 */ sw $v0, 4($a0) +glabel L8012178C_B7E8C /* B7E8C 8012178C 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B7E90 80121790 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B7E94 80121794 8C620000 */ lw $v0, ($v1) @@ -404,6 +426,7 @@ glabel func_80121184 /* B7EB0 801217B0 2442BF68 */ addiu $v0, $v0, %lo(D_8014BF68) /* B7EB4 801217B4 AC820004 */ sw $v0, 4($a0) .L801217B8: +glabel L801217B8_B7EB8 /* B7EB8 801217B8 3C070001 */ lui $a3, 1 /* B7EBC 801217BC 3C028015 */ lui $v0, %hi(D_80154390) /* B7EC0 801217C0 8C424390 */ lw $v0, %lo(D_80154390)($v0) @@ -419,7 +442,7 @@ glabel func_80121184 /* B7EE4 801217E4 14410004 */ bne $v0, $at, .L801217F8 /* B7EE8 801217E8 3C018000 */ lui $at, 0x8000 /* B7EEC 801217EC 14E10002 */ bne $a3, $at, .L801217F8 -/* B7EF0 801217F0 00000000 */ nop +/* B7EF0 801217F0 00000000 */ nop /* B7EF4 801217F4 0006000D */ break 6 .L801217F8: /* B7EF8 801217F8 00003812 */ mflo $a3 @@ -434,7 +457,7 @@ glabel func_80121184 /* B7F18 80121818 14410004 */ bne $v0, $at, .L8012182C /* B7F1C 8012181C 3C018000 */ lui $at, 0x8000 /* B7F20 80121820 14A10002 */ bne $a1, $at, .L8012182C -/* B7F24 80121824 00000000 */ nop +/* B7F24 80121824 00000000 */ nop /* B7F28 80121828 0006000D */ break 6 .L8012182C: /* B7F2C 8012182C 00002812 */ mflo $a1 @@ -470,6 +493,7 @@ glabel func_80121184 /* B7FA4 801218A4 00E53825 */ or $a3, $a3, $a1 /* B7FA8 801218A8 ACC70004 */ sw $a3, 4($a2) .L801218AC: +glabel L801218AC_B7FAC /* B7FAC 801218AC 3C02D9FD */ lui $v0, 0xd9fd .L801218B0: /* B7FB0 801218B0 3C06800A */ lui $a2, %hi(gMasterGfxPos) @@ -508,7 +532,7 @@ glabel func_80121184 .L8012192C: /* B802C 8012192C 8E42005C */ lw $v0, 0x5c($s2) /* B8030 80121930 10400012 */ beqz $v0, .L8012197C -/* B8034 80121934 00000000 */ nop +/* B8034 80121934 00000000 */ nop /* B8038 80121938 3C04800A */ lui $a0, %hi(gMasterGfxPos) /* B803C 8012193C 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* B8040 80121940 8C830000 */ lw $v1, ($a0) @@ -540,7 +564,7 @@ glabel func_80121184 /* B80A4 801219A4 AE020000 */ sw $v0, ($s0) /* B80A8 801219A8 8E440064 */ lw $a0, 0x64($s2) /* B80AC 801219AC 0060F809 */ jalr $v1 -/* B80B0 801219B0 00000000 */ nop +/* B80B0 801219B0 00000000 */ nop .L801219B4: /* B80B4 801219B4 3C05D838 */ lui $a1, 0xd838 /* B80B8 801219B8 8E020000 */ lw $v0, ($s0) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121CE8.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121CE8.s index ae7f0ff73b..8e826555e6 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121CE8.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121CE8.s @@ -28,7 +28,7 @@ glabel func_80121CE8 /* B8444 80121D44 00449021 */ addu $s2, $v0, $a0 /* B8448 80121D48 30C20800 */ andi $v0, $a2, 0x800 /* B844C 80121D4C 10400053 */ beqz $v0, .L80121E9C -/* B8450 80121D50 00000000 */ nop +/* B8450 80121D50 00000000 */ nop .L80121D54: /* B8454 80121D54 2402F7FF */ addiu $v0, $zero, -0x801 /* B8458 80121D58 00C23024 */ and $a2, $a2, $v0 @@ -38,7 +38,7 @@ glabel func_80121CE8 /* B8468 80121D68 00431021 */ addu $v0, $v0, $v1 /* B846C 80121D6C 8C500000 */ lw $s0, ($v0) /* B8470 80121D70 1200004A */ beqz $s0, .L80121E9C -/* B8474 80121D74 00000000 */ nop +/* B8474 80121D74 00000000 */ nop /* B8478 80121D78 8E030000 */ lw $v1, ($s0) /* B847C 80121D7C 10600047 */ beqz $v1, .L80121E9C /* B8480 80121D80 30620100 */ andi $v0, $v1, 0x100 @@ -98,14 +98,14 @@ glabel func_80121CE8 /* B8554 80121E54 3042F000 */ andi $v0, $v0, 0xf000 /* B8558 80121E58 00021202 */ srl $v0, $v0, 8 /* B855C 80121E5C 44821000 */ mtc1 $v0, $f2 -/* B8560 80121E60 00000000 */ nop +/* B8560 80121E60 00000000 */ nop /* B8564 80121E64 468010A1 */ cvt.d.w $f2, $f2 /* B8568 80121E68 04430007 */ bgezl $v0, .L80121E88 /* B856C 80121E6C 46201020 */ cvt.s.d $f0, $f2 /* B8570 80121E70 3C0141F0 */ lui $at, 0x41f0 /* B8574 80121E74 44810800 */ mtc1 $at, $f1 /* B8578 80121E78 44800000 */ mtc1 $zero, $f0 -/* B857C 80121E7C 00000000 */ nop +/* B857C 80121E7C 00000000 */ nop /* B8580 80121E80 46201080 */ add.d $f2, $f2, $f0 /* B8584 80121E84 46201020 */ cvt.s.d $f0, $f2 .L80121E88: diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121EB8.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121EB8.s index 957bb9d7a4..d674fdfd78 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121EB8.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121EB8.s @@ -28,7 +28,7 @@ glabel func_80121EB8 /* B8614 80121F14 00449021 */ addu $s2, $v0, $a0 /* B8618 80121F18 31020800 */ andi $v0, $t0, 0x800 /* B861C 80121F1C 10400053 */ beqz $v0, .L8012206C -/* B8620 80121F20 00000000 */ nop +/* B8620 80121F20 00000000 */ nop .L80121F24: /* B8624 80121F24 2402F7FF */ addiu $v0, $zero, -0x801 /* B8628 80121F28 01024024 */ and $t0, $t0, $v0 @@ -38,7 +38,7 @@ glabel func_80121EB8 /* B8638 80121F38 00431021 */ addu $v0, $v0, $v1 /* B863C 80121F3C 8C500000 */ lw $s0, ($v0) /* B8640 80121F40 1200004A */ beqz $s0, .L8012206C -/* B8644 80121F44 00000000 */ nop +/* B8644 80121F44 00000000 */ nop /* B8648 80121F48 8E030000 */ lw $v1, ($s0) /* B864C 80121F4C 10600047 */ beqz $v1, .L8012206C /* B8650 80121F50 30620100 */ andi $v0, $v1, 0x100 @@ -98,14 +98,14 @@ glabel func_80121EB8 /* B8724 80122024 3042F000 */ andi $v0, $v0, 0xf000 /* B8728 80122028 00021202 */ srl $v0, $v0, 8 /* B872C 8012202C 44821000 */ mtc1 $v0, $f2 -/* B8730 80122030 00000000 */ nop +/* B8730 80122030 00000000 */ nop /* B8734 80122034 468010A1 */ cvt.d.w $f2, $f2 /* B8738 80122038 04430007 */ bgezl $v0, .L80122058 /* B873C 8012203C 46201020 */ cvt.s.d $f0, $f2 /* B8740 80122040 3C0141F0 */ lui $at, 0x41f0 /* B8744 80122044 44810800 */ mtc1 $at, $f1 /* B8748 80122048 44800000 */ mtc1 $zero, $f0 -/* B874C 8012204C 00000000 */ nop +/* B874C 8012204C 00000000 */ nop /* B8750 80122050 46201080 */ add.d $f2, $f2, $f0 /* B8754 80122054 46201020 */ cvt.s.d $f0, $f2 .L80122058: diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122088.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122088.s index 937f1538aa..ce893887b2 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122088.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122088.s @@ -11,7 +11,7 @@ glabel func_80122088 /* B87A0 801220A0 27A80010 */ addiu $t0, $sp, 0x10 /* B87A4 801220A4 30820800 */ andi $v0, $a0, 0x800 /* B87A8 801220A8 10400034 */ beqz $v0, .L8012217C -/* B87AC 801220AC 00000000 */ nop +/* B87AC 801220AC 00000000 */ nop .L801220B0: /* B87B0 801220B0 2402F7FF */ addiu $v0, $zero, -0x801 /* B87B4 801220B4 00822024 */ and $a0, $a0, $v0 @@ -21,7 +21,7 @@ glabel func_80122088 /* B87C4 801220C4 00431021 */ addu $v0, $v0, $v1 /* B87C8 801220C8 8C470000 */ lw $a3, ($v0) /* B87CC 801220CC 10E0002B */ beqz $a3, .L8012217C -/* B87D0 801220D0 00000000 */ nop +/* B87D0 801220D0 00000000 */ nop /* B87D4 801220D4 8CE60000 */ lw $a2, ($a3) /* B87D8 801220D8 10C00028 */ beqz $a2, .L8012217C /* B87DC 801220DC 30C20100 */ andi $v0, $a2, 0x100 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122188.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122188.s index 54a95c2350..5b527b26f5 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122188.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122188.s @@ -11,7 +11,7 @@ glabel func_80122188 /* B88A0 801221A0 27AA0010 */ addiu $t2, $sp, 0x10 /* B88A4 801221A4 30820800 */ andi $v0, $a0, 0x800 /* B88A8 801221A8 10400034 */ beqz $v0, .L8012227C -/* B88AC 801221AC 00000000 */ nop +/* B88AC 801221AC 00000000 */ nop .L801221B0: /* B88B0 801221B0 2402F7FF */ addiu $v0, $zero, -0x801 /* B88B4 801221B4 00822024 */ and $a0, $a0, $v0 @@ -21,7 +21,7 @@ glabel func_80122188 /* B88C4 801221C4 00431021 */ addu $v0, $v0, $v1 /* B88C8 801221C8 8C490000 */ lw $t1, ($v0) /* B88CC 801221CC 1120002B */ beqz $t1, .L8012227C -/* B88D0 801221D0 00000000 */ nop +/* B88D0 801221D0 00000000 */ nop /* B88D4 801221D4 8D280000 */ lw $t0, ($t1) /* B88D8 801221D8 11000028 */ beqz $t0, .L8012227C /* B88DC 801221DC 31020100 */ andi $v0, $t0, 0x100 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s index 4de4accd9d..109ea0e15b 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s @@ -15,7 +15,7 @@ glabel func_80122288 /* B89B0 801222B0 00822021 */ addu $a0, $a0, $v0 /* B89B4 801222B4 8C920000 */ lw $s2, ($a0) /* B89B8 801222B8 124002AA */ beqz $s2, .L80122D64 -/* B89BC 801222BC 00000000 */ nop +/* B89BC 801222BC 00000000 */ nop /* B89C0 801222C0 8E430000 */ lw $v1, ($s2) /* B89C4 801222C4 106002A7 */ beqz $v1, .L80122D64 /* B89C8 801222C8 30620100 */ andi $v0, $v1, 0x100 @@ -102,7 +102,7 @@ glabel func_80122288 /* B8B00 80122400 106200C3 */ beq $v1, $v0, .L80122710 /* B8B04 80122404 3C02D9FD */ lui $v0, %hi(D_D9FCFFFF) /* B8B08 80122408 08048A61 */ j .L80122984 -/* B8B0C 8012240C 00000000 */ nop +/* B8B0C 8012240C 00000000 */ nop .L80122410: /* B8B10 80122410 92420004 */ lbu $v0, 4($s2) /* B8B14 80122414 2442FFFF */ addiu $v0, $v0, %lo(D_D9FCFFFF) @@ -111,11 +111,12 @@ glabel func_80122288 /* B8B20 80122420 2C62002D */ sltiu $v0, $v1, 0x2d /* B8B24 80122424 10400156 */ beqz $v0, .L80122980 /* B8B28 80122428 00031080 */ sll $v0, $v1, 2 -/* B8B2C 8012242C 3C018015 */ lui $at, %hi(D_80150220) +/* B8B2C 8012242C 3C018015 */ lui $at, %hi(jtbl_80150220_E6920) /* B8B30 80122430 00220821 */ addu $at, $at, $v0 -/* B8B34 80122434 8C220220 */ lw $v0, %lo(D_80150220)($at) +/* B8B34 80122434 8C220220 */ lw $v0, %lo(jtbl_80150220_E6920)($at) /* B8B38 80122438 00400008 */ jr $v0 -/* B8B3C 8012243C 00000000 */ nop +/* B8B3C 8012243C 00000000 */ nop +glabel L80122440_B8B40 /* B8B40 80122440 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B8B44 80122444 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8B48 80122448 8C620000 */ lw $v0, ($v1) @@ -128,6 +129,7 @@ glabel func_80122288 /* B8B64 80122464 2442B7F8 */ addiu $v0, $v0, %lo(D_8014B7F8) /* B8B68 80122468 08048A60 */ j .L80122980 /* B8B6C 8012246C AC820004 */ sw $v0, 4($a0) +glabel L80122470_B8B70 /* B8B70 80122470 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B8B74 80122474 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8B78 80122478 8C620000 */ lw $v0, ($v1) @@ -140,6 +142,7 @@ glabel func_80122288 /* B8B94 80122494 2442B820 */ addiu $v0, $v0, %lo(D_8014B820) /* B8B98 80122498 08048A60 */ j .L80122980 /* B8B9C 8012249C AC820004 */ sw $v0, 4($a0) +glabel L801224A0_B8BA0 /* B8BA0 801224A0 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B8BA4 801224A4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8BA8 801224A8 8C620000 */ lw $v0, ($v1) @@ -152,6 +155,7 @@ glabel func_80122288 /* B8BC4 801224C4 2442B848 */ addiu $v0, $v0, %lo(D_8014B848) /* B8BC8 801224C8 08048A60 */ j .L80122980 /* B8BCC 801224CC AC820004 */ sw $v0, 4($a0) +glabel L801224D0_B8BD0 /* B8BD0 801224D0 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B8BD4 801224D4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8BD8 801224D8 8C620000 */ lw $v0, ($v1) @@ -164,6 +168,7 @@ glabel func_80122288 /* B8BF4 801224F4 2442B870 */ addiu $v0, $v0, %lo(D_8014B870) /* B8BF8 801224F8 08048A60 */ j .L80122980 /* B8BFC 801224FC AC820004 */ sw $v0, 4($a0) +glabel L80122500_B8C00 /* B8C00 80122500 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B8C04 80122504 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8C08 80122508 8C620000 */ lw $v0, ($v1) @@ -176,6 +181,7 @@ glabel func_80122288 /* B8C24 80122524 2442B898 */ addiu $v0, $v0, %lo(D_8014B898) /* B8C28 80122528 08048A60 */ j .L80122980 /* B8C2C 8012252C AC820004 */ sw $v0, 4($a0) +glabel L80122530_B8C30 /* B8C30 80122530 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B8C34 80122534 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8C38 80122538 8C620000 */ lw $v0, ($v1) @@ -188,6 +194,7 @@ glabel func_80122288 /* B8C54 80122554 2442B9B0 */ addiu $v0, $v0, %lo(D_8014B9B0) /* B8C58 80122558 08048A60 */ j .L80122980 /* B8C5C 8012255C AC820004 */ sw $v0, 4($a0) +glabel L80122560_B8C60 /* B8C60 80122560 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B8C64 80122564 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8C68 80122568 8C620000 */ lw $v0, ($v1) @@ -200,6 +207,7 @@ glabel func_80122288 /* B8C84 80122584 2442B8C0 */ addiu $v0, $v0, %lo(D_8014B8C0) /* B8C88 80122588 08048A60 */ j .L80122980 /* B8C8C 8012258C AC820004 */ sw $v0, 4($a0) +glabel L80122590_B8C90 /* B8C90 80122590 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B8C94 80122594 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8C98 80122598 8C620000 */ lw $v0, ($v1) @@ -212,6 +220,7 @@ glabel func_80122288 /* B8CB4 801225B4 2442B9D8 */ addiu $v0, $v0, %lo(D_8014B9D8) /* B8CB8 801225B8 08048A60 */ j .L80122980 /* B8CBC 801225BC AC820004 */ sw $v0, 4($a0) +glabel L801225C0_B8CC0 /* B8CC0 801225C0 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B8CC4 801225C4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8CC8 801225C8 8C620000 */ lw $v0, ($v1) @@ -224,6 +233,7 @@ glabel func_80122288 /* B8CE4 801225E4 2442B8E8 */ addiu $v0, $v0, %lo(D_8014B8E8) /* B8CE8 801225E8 08048A60 */ j .L80122980 /* B8CEC 801225EC AC820004 */ sw $v0, 4($a0) +glabel L801225F0_B8CF0 /* B8CF0 801225F0 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B8CF4 801225F4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8CF8 801225F8 8C620000 */ lw $v0, ($v1) @@ -236,6 +246,7 @@ glabel func_80122288 /* B8D14 80122614 2442BA00 */ addiu $v0, $v0, %lo(D_8014BA00) /* B8D18 80122618 08048A60 */ j .L80122980 /* B8D1C 8012261C AC820004 */ sw $v0, 4($a0) +glabel L80122620_B8D20 /* B8D20 80122620 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B8D24 80122624 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8D28 80122628 8C620000 */ lw $v0, ($v1) @@ -248,6 +259,7 @@ glabel func_80122288 /* B8D44 80122644 2442B988 */ addiu $v0, $v0, %lo(D_8014B988) /* B8D48 80122648 08048A60 */ j .L80122980 /* B8D4C 8012264C AC820004 */ sw $v0, 4($a0) +glabel L80122650_B8D50 /* B8D50 80122650 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B8D54 80122654 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8D58 80122658 8C620000 */ lw $v0, ($v1) @@ -260,6 +272,7 @@ glabel func_80122288 /* B8D74 80122674 2442BA48 */ addiu $v0, $v0, %lo(D_8014BA48) /* B8D78 80122678 08048A60 */ j .L80122980 /* B8D7C 8012267C AC820004 */ sw $v0, 4($a0) +glabel L80122680_B8D80 /* B8D80 80122680 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B8D84 80122684 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8D88 80122688 8C620000 */ lw $v0, ($v1) @@ -272,6 +285,7 @@ glabel func_80122288 /* B8DA4 801226A4 2442BA70 */ addiu $v0, $v0, %lo(D_8014BA70) /* B8DA8 801226A8 08048A60 */ j .L80122980 /* B8DAC 801226AC AC820004 */ sw $v0, 4($a0) +glabel L801226B0_B8DB0 /* B8DB0 801226B0 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B8DB4 801226B4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8DB8 801226B8 8C620000 */ lw $v0, ($v1) @@ -284,6 +298,7 @@ glabel func_80122288 /* B8DD4 801226D4 2442BA98 */ addiu $v0, $v0, %lo(D_8014BA98) /* B8DD8 801226D8 08048A60 */ j .L80122980 /* B8DDC 801226DC AC820004 */ sw $v0, 4($a0) +glabel L801226E0_B8DE0 /* B8DE0 801226E0 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B8DE4 801226E4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8DE8 801226E8 8C620000 */ lw $v0, ($v1) @@ -304,11 +319,12 @@ glabel func_80122288 /* B8E20 80122720 2C620026 */ sltiu $v0, $v1, 0x26 /* B8E24 80122724 10400059 */ beqz $v0, .L8012288C /* B8E28 80122728 00031080 */ sll $v0, $v1, 2 -/* B8E2C 8012272C 3C018015 */ lui $at, %hi(D_801502D8) +/* B8E2C 8012272C 3C018015 */ lui $at, %hi(jtbl_801502D8_E69D8) /* B8E30 80122730 00220821 */ addu $at, $at, $v0 -/* B8E34 80122734 8C2202D8 */ lw $v0, %lo(D_801502D8)($at) +/* B8E34 80122734 8C2202D8 */ lw $v0, %lo(jtbl_801502D8_E69D8)($at) /* B8E38 80122738 00400008 */ jr $v0 -/* B8E3C 8012273C 00000000 */ nop +/* B8E3C 8012273C 00000000 */ nop +glabel L80122740_B8E40 /* B8E40 80122740 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B8E44 80122744 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8E48 80122748 8C620000 */ lw $v0, ($v1) @@ -321,6 +337,7 @@ glabel func_80122288 /* B8E64 80122764 2442BE78 */ addiu $v0, $v0, %lo(D_8014BE78) /* B8E68 80122768 08048A23 */ j .L8012288C /* B8E6C 8012276C AC820004 */ sw $v0, 4($a0) +glabel L80122770_B8E70 /* B8E70 80122770 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B8E74 80122774 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8E78 80122778 8C620000 */ lw $v0, ($v1) @@ -333,6 +350,7 @@ glabel func_80122288 /* B8E94 80122794 2442BEA0 */ addiu $v0, $v0, %lo(D_8014BEA0) /* B8E98 80122798 08048A23 */ j .L8012288C /* B8E9C 8012279C AC820004 */ sw $v0, 4($a0) +glabel L801227A0_B8EA0 /* B8EA0 801227A0 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B8EA4 801227A4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8EA8 801227A8 8C620000 */ lw $v0, ($v1) @@ -345,6 +363,7 @@ glabel func_80122288 /* B8EC4 801227C4 2442BEC8 */ addiu $v0, $v0, %lo(D_8014BEC8) /* B8EC8 801227C8 08048A23 */ j .L8012288C /* B8ECC 801227CC AC820004 */ sw $v0, 4($a0) +glabel L801227D0_B8ED0 /* B8ED0 801227D0 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B8ED4 801227D4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8ED8 801227D8 8C620000 */ lw $v0, ($v1) @@ -357,6 +376,7 @@ glabel func_80122288 /* B8EF4 801227F4 2442BEF0 */ addiu $v0, $v0, %lo(D_8014BEF0) /* B8EF8 801227F8 08048A23 */ j .L8012288C /* B8EFC 801227FC AC820004 */ sw $v0, 4($a0) +glabel L80122800_B8F00 /* B8F00 80122800 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B8F04 80122804 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8F08 80122808 8C620000 */ lw $v0, ($v1) @@ -369,6 +389,7 @@ glabel func_80122288 /* B8F24 80122824 2442BF18 */ addiu $v0, $v0, %lo(D_8014BF18) /* B8F28 80122828 08048A23 */ j .L8012288C /* B8F2C 8012282C AC820004 */ sw $v0, 4($a0) +glabel L80122830_B8F30 /* B8F30 80122830 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B8F34 80122834 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8F38 80122838 8C620000 */ lw $v0, ($v1) @@ -381,6 +402,7 @@ glabel func_80122288 /* B8F54 80122854 2442BF40 */ addiu $v0, $v0, %lo(D_8014BF40) /* B8F58 80122858 08048A23 */ j .L8012288C /* B8F5C 8012285C AC820004 */ sw $v0, 4($a0) +glabel L80122860_B8F60 /* B8F60 80122860 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* B8F64 80122864 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* B8F68 80122868 8C620000 */ lw $v0, ($v1) @@ -393,6 +415,7 @@ glabel func_80122288 /* B8F84 80122884 2442BF68 */ addiu $v0, $v0, %lo(D_8014BF68) /* B8F88 80122888 AC820004 */ sw $v0, 4($a0) .L8012288C: +glabel L8012288C_B8F8C /* B8F8C 8012288C 3C070001 */ lui $a3, 1 /* B8F90 80122890 3C028015 */ lui $v0, %hi(D_80154390) /* B8F94 80122894 8C424390 */ lw $v0, %lo(D_80154390)($v0) @@ -408,7 +431,7 @@ glabel func_80122288 /* B8FB8 801228B8 14410004 */ bne $v0, $at, .L801228CC /* B8FBC 801228BC 3C018000 */ lui $at, 0x8000 /* B8FC0 801228C0 14E10002 */ bne $a3, $at, .L801228CC -/* B8FC4 801228C4 00000000 */ nop +/* B8FC4 801228C4 00000000 */ nop /* B8FC8 801228C8 0006000D */ break 6 .L801228CC: /* B8FCC 801228CC 00003812 */ mflo $a3 @@ -423,7 +446,7 @@ glabel func_80122288 /* B8FEC 801228EC 14410004 */ bne $v0, $at, .L80122900 /* B8FF0 801228F0 3C018000 */ lui $at, 0x8000 /* B8FF4 801228F4 14A10002 */ bne $a1, $at, .L80122900 -/* B8FF8 801228F8 00000000 */ nop +/* B8FF8 801228F8 00000000 */ nop /* B8FFC 801228FC 0006000D */ break 6 .L80122900: /* B9000 80122900 00002812 */ mflo $a1 @@ -459,6 +482,7 @@ glabel func_80122288 /* B9078 80122978 00E53825 */ or $a3, $a3, $a1 /* B907C 8012297C ACC70004 */ sw $a3, 4($a2) .L80122980: +glabel L80122980_B9080 /* B9080 80122980 3C02D9FD */ lui $v0, 0xd9fd .L80122984: /* B9084 80122984 3C06800A */ lui $a2, %hi(gMasterGfxPos) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122D7C.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122D7C.s index c6aefe6945..7567e1b653 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122D7C.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122D7C.s @@ -10,12 +10,12 @@ glabel func_80122D7C /* B9490 80122D90 00822021 */ addu $a0, $a0, $v0 /* B9494 80122D94 8C840000 */ lw $a0, ($a0) /* B9498 80122D98 1080000E */ beqz $a0, .L80122DD4 -/* B949C 80122D9C 00000000 */ nop +/* B949C 80122D9C 00000000 */ nop /* B94A0 80122DA0 8C820000 */ lw $v0, ($a0) /* B94A4 80122DA4 1040000B */ beqz $v0, .L80122DD4 -/* B94A8 80122DA8 00000000 */ nop +/* B94A8 80122DA8 00000000 */ nop /* B94AC 80122DAC 14A00003 */ bnez $a1, .L80122DBC -/* B94B0 80122DB0 00000000 */ nop +/* B94B0 80122DB0 00000000 */ nop /* B94B4 80122DB4 3C058015 */ lui $a1, %hi(D_8014C260) /* B94B8 80122DB8 24A5C260 */ addiu $a1, $a1, %lo(D_8014C260) .L80122DBC: @@ -27,4 +27,4 @@ glabel func_80122D7C /* B94D0 80122DD0 E480000C */ swc1 $f0, 0xc($a0) .L80122DD4: /* B94D4 80122DD4 03E00008 */ jr $ra -/* B94D8 80122DD8 00000000 */ nop +/* B94D8 80122DD8 00000000 */ nop diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122DFC.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122DFC.s index ec7df8fad9..9a4294ab91 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122DFC.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122DFC.s @@ -15,12 +15,12 @@ glabel func_80122DFC /* B9524 80122E24 02021021 */ addu $v0, $s0, $v0 /* B9528 80122E28 8C430000 */ lw $v1, ($v0) /* B952C 80122E2C 10600014 */ beqz $v1, .L80122E80 -/* B9530 80122E30 00000000 */ nop +/* B9530 80122E30 00000000 */ nop /* B9534 80122E34 8C620000 */ lw $v0, ($v1) /* B9538 80122E38 10400011 */ beqz $v0, .L80122E80 /* B953C 80122E3C 30420400 */ andi $v0, $v0, 0x400 /* B9540 80122E40 10400003 */ beqz $v0, .L80122E50 -/* B9544 80122E44 00000000 */ nop +/* B9544 80122E44 00000000 */ nop /* B9548 80122E48 0C00AB4B */ jal heap_free /* B954C 80122E4C 8C640014 */ lw $a0, 0x14($v1) .L80122E50: diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122E94.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122E94.s index b584f898d2..cc027de93d 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122E94.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122E94.s @@ -19,9 +19,9 @@ glabel func_80122E94 /* B95C8 80122EC8 28820100 */ slti $v0, $a0, 0x100 .L80122ECC: /* B95CC 80122ECC 10400003 */ beqz $v0, .L80122EDC -/* B95D0 80122ED0 00000000 */ nop +/* B95D0 80122ED0 00000000 */ nop /* B95D4 80122ED4 0C048B7F */ jal func_80122DFC -/* B95D8 80122ED8 00000000 */ nop +/* B95D8 80122ED8 00000000 */ nop .L80122EDC: /* B95DC 80122EDC 8FBF0010 */ lw $ra, 0x10($sp) /* B95E0 80122EE0 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122EE8.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122EE8.s index 089fe224d7..d847c17d29 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122EE8.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122EE8.s @@ -10,11 +10,11 @@ glabel func_80122EE8 /* B95FC 80122EFC 00822021 */ addu $a0, $a0, $v0 /* B9600 80122F00 8C840000 */ lw $a0, ($a0) /* B9604 80122F04 10800005 */ beqz $a0, .L80122F1C -/* B9608 80122F08 00000000 */ nop +/* B9608 80122F08 00000000 */ nop /* B960C 80122F0C 8C820000 */ lw $v0, ($a0) /* B9610 80122F10 10400002 */ beqz $v0, .L80122F1C /* B9614 80122F14 00451025 */ or $v0, $v0, $a1 /* B9618 80122F18 AC820000 */ sw $v0, ($a0) .L80122F1C: /* B961C 80122F1C 03E00008 */ jr $ra -/* B9620 80122F20 00000000 */ nop +/* B9620 80122F20 00000000 */ nop diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122F24.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122F24.s index 364d349eae..70da90dd5a 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122F24.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122F24.s @@ -10,7 +10,7 @@ glabel func_80122F24 /* B9638 80122F38 00822021 */ addu $a0, $a0, $v0 /* B963C 80122F3C 8C840000 */ lw $a0, ($a0) /* B9640 80122F40 10800006 */ beqz $a0, .L80122F5C -/* B9644 80122F44 00000000 */ nop +/* B9644 80122F44 00000000 */ nop /* B9648 80122F48 8C830000 */ lw $v1, ($a0) /* B964C 80122F4C 10600003 */ beqz $v1, .L80122F5C /* B9650 80122F50 00051027 */ nor $v0, $zero, $a1 @@ -18,4 +18,4 @@ glabel func_80122F24 /* B9658 80122F58 AC820000 */ sw $v0, ($a0) .L80122F5C: /* B965C 80122F5C 03E00008 */ jr $ra -/* B9660 80122F60 00000000 */ nop +/* B9660 80122F60 00000000 */ nop diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_801234E0.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_801234E0.s index cf7823d67a..4d97616156 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_801234E0.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_801234E0.s @@ -20,14 +20,14 @@ glabel func_801234E0 /* B9C18 80123518 26100001 */ addiu $s0, $s0, 1 /* B9C1C 8012351C 30820004 */ andi $v0, $a0, 4 /* B9C20 80123520 10400004 */ beqz $v0, .L80123534 -/* B9C24 80123524 00000000 */ nop +/* B9C24 80123524 00000000 */ nop /* B9C28 80123528 8C620008 */ lw $v0, 8($v1) /* B9C2C 8012352C 0040F809 */ jalr $v0 -/* B9C30 80123530 00000000 */ nop +/* B9C30 80123530 00000000 */ nop .L80123534: /* B9C34 80123534 2A020010 */ slti $v0, $s0, 0x10 /* B9C38 80123538 1440FFED */ bnez $v0, .L801234F0 -/* B9C3C 8012353C 00000000 */ nop +/* B9C3C 8012353C 00000000 */ nop /* B9C40 80123540 8FBF0014 */ lw $ra, 0x14($sp) /* B9C44 80123544 8FB00010 */ lw $s0, 0x10($sp) /* B9C48 80123548 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80123550.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80123550.s index fbf2b8d663..c22e2fdf50 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80123550.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80123550.s @@ -20,14 +20,14 @@ glabel func_80123550 /* B9C88 80123588 26100001 */ addiu $s0, $s0, 1 /* B9C8C 8012358C 30820008 */ andi $v0, $a0, 8 /* B9C90 80123590 10400004 */ beqz $v0, .L801235A4 -/* B9C94 80123594 00000000 */ nop +/* B9C94 80123594 00000000 */ nop /* B9C98 80123598 8C620008 */ lw $v0, 8($v1) /* B9C9C 8012359C 0040F809 */ jalr $v0 -/* B9CA0 801235A0 00000000 */ nop +/* B9CA0 801235A0 00000000 */ nop .L801235A4: /* B9CA4 801235A4 2A020010 */ slti $v0, $s0, 0x10 /* B9CA8 801235A8 1440FFED */ bnez $v0, .L80123560 -/* B9CAC 801235AC 00000000 */ nop +/* B9CAC 801235AC 00000000 */ nop /* B9CB0 801235B0 8FBF0014 */ lw $ra, 0x14($sp) /* B9CB4 801235B4 8FB00010 */ lw $s0, 0x10($sp) /* B9CB8 801235B8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_801235C0.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_801235C0.s index 74bb15c16d..05d8ee53ce 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_801235C0.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_801235C0.s @@ -12,7 +12,7 @@ glabel func_801235C0 /* B9CDC 801235DC 10400003 */ beqz $v0, .L801235EC /* B9CE0 801235E0 30820800 */ andi $v0, $a0, 0x800 /* B9CE4 801235E4 10400010 */ beqz $v0, .L80123628 -/* B9CE8 801235E8 00000000 */ nop +/* B9CE8 801235E8 00000000 */ nop .L801235EC: /* B9CEC 801235EC 2402F7FF */ addiu $v0, $zero, -0x801 /* B9CF0 801235F0 00822024 */ and $a0, $a0, $v0 @@ -23,9 +23,9 @@ glabel func_801235C0 /* B9D04 80123604 02021021 */ addu $v0, $s0, $v0 /* B9D08 80123608 8C440000 */ lw $a0, ($v0) /* B9D0C 8012360C 10800006 */ beqz $a0, .L80123628 -/* B9D10 80123610 00000000 */ nop +/* B9D10 80123610 00000000 */ nop /* B9D14 80123614 0C00AB4B */ jal heap_free -/* B9D18 80123618 00000000 */ nop +/* B9D18 80123618 00000000 */ nop /* B9D1C 8012361C 8E220000 */ lw $v0, ($s1) /* B9D20 80123620 02021021 */ addu $v0, $s0, $v0 /* B9D24 80123624 AC400000 */ sw $zero, ($v0) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/init_virtual_models.s b/asm/nonmatchings/code_b72b0_len_15ed0/init_virtual_models.s index a0d2dbc234..3f02a1608a 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/init_virtual_models.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/init_virtual_models.s @@ -6,11 +6,11 @@ glabel init_virtual_models /* B735C 80120C5C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* B7360 80120C60 80420070 */ lb $v0, 0x70($v0) /* B7364 80120C64 14400005 */ bnez $v0, .L80120C7C -/* B7368 80120C68 00000000 */ nop +/* B7368 80120C68 00000000 */ nop /* B736C 80120C6C 3C028015 */ lui $v0, %hi(D_80153B70) /* B7370 80120C70 24423B70 */ addiu $v0, $v0, %lo(D_80153B70) /* B7374 80120C74 08048321 */ j .L80120C84 -/* B7378 80120C78 00000000 */ nop +/* B7378 80120C78 00000000 */ nop .L80120C7C: /* B737C 80120C7C 3C028015 */ lui $v0, %hi(D_80153F70) /* B7380 80120C80 24423F70 */ addiu $v0, $v0, %lo(D_80153F70) @@ -37,4 +37,4 @@ glabel init_virtual_models /* B73D0 80120CD0 3C018015 */ lui $at, %hi(D_80154390) /* B73D4 80120CD4 AC224390 */ sw $v0, %lo(D_80154390)($at) /* B73D8 80120CD8 03E00008 */ jr $ra -/* B73DC 80120CDC 00000000 */ nop +/* B73DC 80120CDC 00000000 */ nop diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/load_virtual_model.s b/asm/nonmatchings/code_b72b0_len_15ed0/load_virtual_model.s index b188b03cd9..d81387c83f 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/load_virtual_model.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/load_virtual_model.s @@ -21,10 +21,10 @@ glabel load_virtual_model /* B741C 80120D1C 2A020100 */ slti $v0, $s0, 0x100 .L80120D20: /* B7420 80120D20 14400003 */ bnez $v0, .L80120D30 -/* B7424 80120D24 00000000 */ nop +/* B7424 80120D24 00000000 */ nop .L80120D28: /* B7428 80120D28 0804834A */ j .L80120D28 -/* B742C 80120D2C 00000000 */ nop +/* B742C 80120D2C 00000000 */ nop .L80120D30: /* B7430 80120D30 0C00AB39 */ jal heap_malloc /* B7434 80120D34 24040068 */ addiu $a0, $zero, 0x68 @@ -42,7 +42,7 @@ glabel load_virtual_model /* B7464 80120D64 ACA30000 */ sw $v1, ($a1) .L80120D68: /* B7468 80120D68 0804835A */ j .L80120D68 -/* B746C 80120D6C 00000000 */ nop +/* B746C 80120D6C 00000000 */ nop .L80120D70: /* B7470 80120D70 3C013F80 */ lui $at, 0x3f80 /* B7474 80120D74 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/render_dynamic_entities.s b/asm/nonmatchings/code_b72b0_len_15ed0/render_dynamic_entities.s index babca5e617..251f33ac11 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/render_dynamic_entities.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/render_dynamic_entities.s @@ -20,14 +20,14 @@ glabel render_dynamic_entities /* B9BA8 801234A8 26100001 */ addiu $s0, $s0, 1 /* B9BAC 801234AC 30820004 */ andi $v0, $a0, 4 /* B9BB0 801234B0 14400004 */ bnez $v0, .L801234C4 -/* B9BB4 801234B4 00000000 */ nop +/* B9BB4 801234B4 00000000 */ nop /* B9BB8 801234B8 8C620008 */ lw $v0, 8($v1) /* B9BBC 801234BC 0040F809 */ jalr $v0 -/* B9BC0 801234C0 00000000 */ nop +/* B9BC0 801234C0 00000000 */ nop .L801234C4: /* B9BC4 801234C4 2A020010 */ slti $v0, $s0, 0x10 /* B9BC8 801234C8 1440FFED */ bnez $v0, .L80123480 -/* B9BCC 801234CC 00000000 */ nop +/* B9BCC 801234CC 00000000 */ nop /* B9BD0 801234D0 8FBF0014 */ lw $ra, 0x14($sp) /* B9BD4 801234D4 8FB00010 */ lw $s0, 0x10($sp) /* B9BD8 801234D8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/update_dynamic_entities.s b/asm/nonmatchings/code_b72b0_len_15ed0/update_dynamic_entities.s index aa782f65d7..66581bfeea 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/update_dynamic_entities.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/update_dynamic_entities.s @@ -25,7 +25,7 @@ glabel update_dynamic_entities .L80123450: /* B9B50 80123450 2A020010 */ slti $v0, $s0, 0x10 /* B9B54 80123454 1440FFF1 */ bnez $v0, .L8012341C -/* B9B58 80123458 00000000 */ nop +/* B9B58 80123458 00000000 */ nop /* B9B5C 8012345C 8FBF0018 */ lw $ra, 0x18($sp) /* B9B60 80123460 8FB10014 */ lw $s1, 0x14($sp) /* B9B64 80123464 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s b/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s index 3c1253701b..851e880464 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s @@ -38,7 +38,7 @@ glabel func_80136A80 /* CD204 80136B04 3C03800A */ lui $v1, %hi(gDisplayContext) /* CD208 80136B08 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) /* CD20C 80136B0C 4600C032 */ c.eq.s $f24, $f0 -/* CD210 80136B10 00000000 */ nop +/* CD210 80136B10 00000000 */ nop /* CD214 80136B14 4501048B */ bc1t .L80137D44 /* CD218 80136B18 0065F021 */ addu $fp, $v1, $a1 /* CD21C 80136B1C 10C0000A */ beqz $a2, .L80136B48 @@ -67,7 +67,7 @@ glabel func_80136A80 /* CD270 80136B70 10620070 */ beq $v1, $v0, .L80136D34 /* CD274 80136B74 3C04E300 */ lui $a0, 0xe300 /* CD278 80136B78 0804DBCA */ j .L80136F28 -/* CD27C 80136B7C 00000000 */ nop +/* CD27C 80136B7C 00000000 */ nop .L80136B80: /* CD280 80136B80 3C04E300 */ lui $a0, 0xe300 /* CD284 80136B84 34841801 */ ori $a0, $a0, 0x1801 @@ -139,7 +139,7 @@ glabel func_80136A80 /* CD384 80136C84 00431025 */ or $v0, $v0, $v1 /* CD388 80136C88 00151A00 */ sll $v1, $s5, 8 /* CD38C 80136C8C 4618003E */ c.le.s $f0, $f24 -/* CD390 80136C90 00000000 */ nop +/* CD390 80136C90 00000000 */ nop /* CD394 80136C94 45010005 */ bc1t .L80136CAC /* CD398 80136C98 00434825 */ or $t1, $v0, $v1 /* CD39C 80136C9C 4600C20D */ trunc.w.s $f8, $f24 @@ -151,7 +151,7 @@ glabel func_80136A80 /* CD3B0 80136CB0 3C028000 */ lui $v0, 0x8000 /* CD3B4 80136CB4 4600020D */ trunc.w.s $f8, $f0 /* CD3B8 80136CB8 44054000 */ mfc1 $a1, $f8 -/* CD3BC 80136CBC 00000000 */ nop +/* CD3BC 80136CBC 00000000 */ nop /* CD3C0 80136CC0 00A22825 */ or $a1, $a1, $v0 /* CD3C4 80136CC4 3C060050 */ lui $a2, 0x50 .L80136CC8: @@ -252,7 +252,7 @@ glabel func_80136A80 /* CD534 80136E34 00431025 */ or $v0, $v0, $v1 /* CD538 80136E38 00151A00 */ sll $v1, $s5, 8 /* CD53C 80136E3C 4618003E */ c.le.s $f0, $f24 -/* CD540 80136E40 00000000 */ nop +/* CD540 80136E40 00000000 */ nop /* CD544 80136E44 45010005 */ bc1t .L80136E5C /* CD548 80136E48 00431825 */ or $v1, $v0, $v1 /* CD54C 80136E4C 4600C20D */ trunc.w.s $f8, $f24 @@ -264,7 +264,7 @@ glabel func_80136A80 /* CD560 80136E60 3C028000 */ lui $v0, 0x8000 /* CD564 80136E64 4600020D */ trunc.w.s $f8, $f0 /* CD568 80136E68 44104000 */ mfc1 $s0, $f8 -/* CD56C 80136E6C 00000000 */ nop +/* CD56C 80136E6C 00000000 */ nop /* CD570 80136E70 02028025 */ or $s0, $s0, $v0 /* CD574 80136E74 3C040050 */ lui $a0, 0x50 .L80136E78: @@ -356,18 +356,19 @@ glabel func_80136A80 /* CD6C8 80136FC8 2C62000E */ sltiu $v0, $v1, 0xe /* CD6CC 80136FCC 1040034C */ beqz $v0, .L80137D00 /* CD6D0 80136FD0 00031080 */ sll $v0, $v1, 2 -/* CD6D4 80136FD4 3C018015 */ lui $at, %hi(D_80150EA0) +/* CD6D4 80136FD4 3C018015 */ lui $at, %hi(jtbl_80150EA0_E75A0) /* CD6D8 80136FD8 00220821 */ addu $at, $at, $v0 -/* CD6DC 80136FDC 8C220EA0 */ lw $v0, %lo(D_80150EA0)($at) +/* CD6DC 80136FDC 8C220EA0 */ lw $v0, %lo(jtbl_80150EA0_E75A0)($at) /* CD6E0 80136FE0 00400008 */ jr $v0 -/* CD6E4 80136FE4 00000000 */ nop +/* CD6E4 80136FE4 00000000 */ nop +glabel L80136FE8_CD6E8 /* CD6E8 80136FE8 240400A0 */ addiu $a0, $zero, 0xa0 /* CD6EC 80136FEC 24050078 */ addiu $a1, $zero, 0x78 /* CD6F0 80136FF0 0260382D */ daddu $a3, $s3, $zero /* CD6F4 80136FF4 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* CD6F8 80136FF8 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* CD6FC 80136FFC 461CC002 */ mul.s $f0, $f24, $f28 -/* CD700 80137000 00000000 */ nop +/* CD700 80137000 00000000 */ nop /* CD704 80137004 8C620000 */ lw $v0, ($v1) /* CD708 80137008 4406C000 */ mfc1 $a2, $f24 /* CD70C 8013700C 3C01437F */ lui $at, 0x437f @@ -386,12 +387,13 @@ glabel func_80136A80 /* CD740 80137040 AFB50014 */ sw $s5, 0x14($sp) /* CD744 80137044 0804DC56 */ j .L80137158 /* CD748 80137048 AFA3001C */ sw $v1, 0x1c($sp) +glabel L8013704C_CD74C /* CD74C 8013704C 240400A0 */ addiu $a0, $zero, 0xa0 /* CD750 80137050 24050078 */ addiu $a1, $zero, 0x78 /* CD754 80137054 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* CD758 80137058 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* CD75C 8013705C 461CC002 */ mul.s $f0, $f24, $f28 -/* CD760 80137060 00000000 */ nop +/* CD760 80137060 00000000 */ nop /* CD764 80137064 8C620000 */ lw $v0, ($v1) /* CD768 80137068 4406C000 */ mfc1 $a2, $f24 /* CD76C 8013706C 3C01437F */ lui $at, 0x437f @@ -405,13 +407,14 @@ glabel func_80136A80 /* CD78C 8013708C 2442E670 */ addiu $v0, $v0, %lo(D_8014E670) /* CD790 80137090 0804DC51 */ j .L80137144 /* CD794 80137094 0260382D */ daddu $a3, $s3, $zero +glabel L80137098_CD798 /* CD798 80137098 240400A0 */ addiu $a0, $zero, 0xa0 /* CD79C 8013709C 24050078 */ addiu $a1, $zero, 0x78 /* CD7A0 801370A0 0260382D */ daddu $a3, $s3, $zero /* CD7A4 801370A4 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* CD7A8 801370A8 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* CD7AC 801370AC 461CC002 */ mul.s $f0, $f24, $f28 -/* CD7B0 801370B0 00000000 */ nop +/* CD7B0 801370B0 00000000 */ nop /* CD7B4 801370B4 8C620000 */ lw $v0, ($v1) /* CD7B8 801370B8 4406C000 */ mfc1 $a2, $f24 /* CD7BC 801370BC 3C01437F */ lui $at, 0x437f @@ -430,13 +433,14 @@ glabel func_80136A80 /* CD7F0 801370F0 AFB50014 */ sw $s5, 0x14($sp) /* CD7F4 801370F4 0804DC56 */ j .L80137158 /* CD7F8 801370F8 AFA3001C */ sw $v1, 0x1c($sp) +glabel L801370FC_CD7FC /* CD7FC 801370FC 240400A0 */ addiu $a0, $zero, 0xa0 /* CD800 80137100 24050078 */ addiu $a1, $zero, 0x78 /* CD804 80137104 0260382D */ daddu $a3, $s3, $zero /* CD808 80137108 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* CD80C 8013710C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* CD810 80137110 461CC002 */ mul.s $f0, $f24, $f28 -/* CD814 80137114 00000000 */ nop +/* CD814 80137114 00000000 */ nop /* CD818 80137118 8C620000 */ lw $v0, ($v1) /* CD81C 8013711C 4406C000 */ mfc1 $a2, $f24 /* CD820 80137120 3C01437F */ lui $at, 0x437f @@ -461,6 +465,7 @@ glabel func_80136A80 /* CD864 80137164 E7A80018 */ swc1 $f8, 0x18($sp) /* CD868 80137168 0804DF41 */ j .L80137D04 /* CD86C 8013716C 3C06DA38 */ lui $a2, 0xda38 +glabel L80137170_CD870 /* CD870 80137170 0220202D */ daddu $a0, $s1, $zero /* CD874 80137174 0240282D */ daddu $a1, $s2, $zero /* CD878 80137178 0000382D */ daddu $a3, $zero, $zero @@ -485,6 +490,7 @@ glabel func_80136A80 /* CD8C4 801371C4 AFA3001C */ sw $v1, 0x1c($sp) /* CD8C8 801371C8 0804DF41 */ j .L80137D04 /* CD8CC 801371CC 3C06DA38 */ lui $a2, 0xda38 +glabel L801371D0_CD8D0 /* CD8D0 801371D0 0220202D */ daddu $a0, $s1, $zero /* CD8D4 801371D4 0240282D */ daddu $a1, $s2, $zero /* CD8D8 801371D8 0000382D */ daddu $a3, $zero, $zero @@ -508,6 +514,7 @@ glabel func_80136A80 /* CD920 80137220 AFA2001C */ sw $v0, 0x1c($sp) /* CD924 80137224 0804DF41 */ j .L80137D04 /* CD928 80137228 3C06DA38 */ lui $a2, 0xda38 +glabel L8013722C_CD92C /* CD92C 8013722C 3C15DA38 */ lui $s5, 0xda38 /* CD930 80137230 36B50002 */ ori $s5, $s5, 2 /* CD934 80137234 3C14DA38 */ lui $s4, 0xda38 @@ -533,7 +540,7 @@ glabel func_80136A80 /* CD984 80137284 00108400 */ sll $s0, $s0, 0x10 /* CD988 80137288 00108403 */ sra $s0, $s0, 0x10 /* CD98C 8013728C 4490C000 */ mtc1 $s0, $f24 -/* CD990 80137290 00000000 */ nop +/* CD990 80137290 00000000 */ nop /* CD994 80137294 4680C620 */ cvt.s.w $f24, $f24 /* CD998 80137298 3C013F80 */ lui $at, 0x3f80 /* CD99C 8013729C 4481D000 */ mtc1 $at, $f26 @@ -553,7 +560,7 @@ glabel func_80136A80 /* CD9D4 801372D4 3042FFFF */ andi $v0, $v0, 0xffff /* CD9D8 801372D8 4600A521 */ cvt.d.s $f20, $f20 /* CD9DC 801372DC 4620A502 */ mul.d $f20, $f20, $f0 -/* CD9E0 801372E0 00000000 */ nop +/* CD9E0 801372E0 00000000 */ nop /* CD9E4 801372E4 00021180 */ sll $v0, $v0, 6 /* CD9E8 801372E8 03C21021 */ addu $v0, $fp, $v0 /* CD9EC 801372EC A6230000 */ sh $v1, ($s1) @@ -579,7 +586,7 @@ glabel func_80136A80 /* CDA3C 8013733C 00021180 */ sll $v0, $v0, 6 /* CDA40 80137340 03C21021 */ addu $v0, $fp, $v0 /* CDA44 80137344 4600C602 */ mul.s $f24, $f24, $f0 -/* CDA48 80137348 00000000 */ nop +/* CDA48 80137348 00000000 */ nop /* CDA4C 8013734C AC940000 */ sw $s4, ($a0) /* CDA50 80137350 A6230000 */ sh $v1, ($s1) /* CDA54 80137354 AC820004 */ sw $v0, 4($a0) @@ -712,14 +719,15 @@ glabel func_80136A80 /* CDC50 80137550 AC960008 */ sw $s6, 8($a0) /* CDC54 80137554 0804DF40 */ j .L80137D00 /* CDC58 80137558 AC90000C */ sw $s0, 0xc($a0) +glabel L8013755C_CDC5C /* CDC5C 8013755C 44914000 */ mtc1 $s1, $f8 -/* CDC60 80137560 00000000 */ nop +/* CDC60 80137560 00000000 */ nop /* CDC64 80137564 46804220 */ cvt.s.w $f8, $f8 /* CDC68 80137568 241300F0 */ addiu $s3, $zero, 0xf0 /* CDC6C 8013756C 02721023 */ subu $v0, $s3, $s2 /* CDC70 80137570 44054000 */ mfc1 $a1, $f8 /* CDC74 80137574 44824000 */ mtc1 $v0, $f8 -/* CDC78 80137578 00000000 */ nop +/* CDC78 80137578 00000000 */ nop /* CDC7C 8013757C 46804220 */ cvt.s.w $f8, $f8 /* CDC80 80137580 3C15DA38 */ lui $s5, 0xda38 /* CDC84 80137584 36B50002 */ ori $s5, $s5, 2 @@ -751,7 +759,7 @@ glabel func_80136A80 /* CDCEC 801375EC 00108400 */ sll $s0, $s0, 0x10 /* CDCF0 801375F0 00108403 */ sra $s0, $s0, 0x10 /* CDCF4 801375F4 4490A000 */ mtc1 $s0, $f20 -/* CDCF8 801375F8 00000000 */ nop +/* CDCF8 801375F8 00000000 */ nop /* CDCFC 801375FC 4680A520 */ cvt.s.w $f20, $f20 /* CDD00 80137600 3C013F80 */ lui $at, 0x3f80 /* CDD04 80137604 4481C000 */ mtc1 $at, $f24 @@ -771,7 +779,7 @@ glabel func_80136A80 /* CDD3C 8013763C 3042FFFF */ andi $v0, $v0, 0xffff /* CDD40 80137640 4600A521 */ cvt.d.s $f20, $f20 /* CDD44 80137644 4620A502 */ mul.d $f20, $f20, $f0 -/* CDD48 80137648 00000000 */ nop +/* CDD48 80137648 00000000 */ nop /* CDD4C 8013764C 00021180 */ sll $v0, $v0, 6 /* CDD50 80137650 03C21021 */ addu $v0, $fp, $v0 /* CDD54 80137654 A6230000 */ sh $v1, ($s1) @@ -786,7 +794,7 @@ glabel func_80136A80 /* CDD78 80137678 03C42021 */ addu $a0, $fp, $a0 /* CDD7C 8013767C 00108023 */ negu $s0, $s0 /* CDD80 80137680 4490D000 */ mtc1 $s0, $f26 -/* CDD84 80137684 00000000 */ nop +/* CDD84 80137684 00000000 */ nop /* CDD88 80137688 4680D6A0 */ cvt.s.w $f26, $f26 /* CDD8C 8013768C 8E430000 */ lw $v1, ($s2) /* CDD90 80137690 4405D000 */ mfc1 $a1, $f26 @@ -809,12 +817,12 @@ glabel func_80136A80 /* CDDD4 801376D4 0C019F20 */ jal guRotate /* CDDD8 801376D8 E7B80010 */ swc1 $f24, 0x10($sp) /* CDDDC 801376DC 44964000 */ mtc1 $s6, $f8 -/* CDDE0 801376E0 00000000 */ nop +/* CDDE0 801376E0 00000000 */ nop /* CDDE4 801376E4 46804220 */ cvt.s.w $f8, $f8 /* CDDE8 801376E8 02779823 */ subu $s3, $s3, $s7 /* CDDEC 801376EC 44054000 */ mfc1 $a1, $f8 /* CDDF0 801376F0 44934000 */ mtc1 $s3, $f8 -/* CDDF4 801376F4 00000000 */ nop +/* CDDF4 801376F4 00000000 */ nop /* CDDF8 801376F8 46804220 */ cvt.s.w $f8, $f8 /* CDDFC 801376FC 3C16DE00 */ lui $s6, 0xde00 /* CDE00 80137700 3C138015 */ lui $s3, %hi(D_8014E8F0) @@ -944,7 +952,7 @@ glabel func_80136A80 /* CDFEC 801378EC 3C028000 */ lui $v0, 0x8000 /* CDFF0 801378F0 4600020D */ trunc.w.s $f8, $f0 /* CDFF4 801378F4 44074000 */ mfc1 $a3, $f8 -/* CDFF8 801378F8 00000000 */ nop +/* CDFF8 801378F8 00000000 */ nop /* CDFFC 801378FC 00E23825 */ or $a3, $a3, $v0 /* CE000 80137900 3C06D838 */ lui $a2, 0xd838 .L80137904: @@ -968,14 +976,15 @@ glabel func_80136A80 /* CE048 80137948 AC660000 */ sw $a2, ($v1) /* CE04C 8013794C 0804DF40 */ j .L80137D00 /* CE050 80137950 AC620004 */ sw $v0, 4($v1) +glabel L80137954_CE054 /* CE054 80137954 44914000 */ mtc1 $s1, $f8 -/* CE058 80137958 00000000 */ nop +/* CE058 80137958 00000000 */ nop /* CE05C 8013795C 46804220 */ cvt.s.w $f8, $f8 /* CE060 80137960 240200F0 */ addiu $v0, $zero, 0xf0 /* CE064 80137964 00521023 */ subu $v0, $v0, $s2 /* CE068 80137968 44054000 */ mfc1 $a1, $f8 /* CE06C 8013796C 44824000 */ mtc1 $v0, $f8 -/* CE070 80137970 00000000 */ nop +/* CE070 80137970 00000000 */ nop /* CE074 80137974 46804220 */ cvt.s.w $f8, $f8 /* CE078 80137978 3C15DA38 */ lui $s5, 0xda38 /* CE07C 8013797C 36B50002 */ ori $s5, $s5, 2 @@ -1004,7 +1013,7 @@ glabel func_80136A80 /* CE0D8 801379D8 00108400 */ sll $s0, $s0, 0x10 /* CE0DC 801379DC 00108403 */ sra $s0, $s0, 0x10 /* CE0E0 801379E0 44900000 */ mtc1 $s0, $f0 -/* CE0E4 801379E4 00000000 */ nop +/* CE0E4 801379E4 00000000 */ nop /* CE0E8 801379E8 46800020 */ cvt.s.w $f0, $f0 /* CE0EC 801379EC 3C013F80 */ lui $at, 0x3f80 /* CE0F0 801379F0 4481A000 */ mtc1 $at, $f20 @@ -1024,7 +1033,7 @@ glabel func_80136A80 /* CE128 80137A28 3042FFFF */ andi $v0, $v0, 0xffff /* CE12C 80137A2C 46000021 */ cvt.d.s $f0, $f0 /* CE130 80137A30 46220002 */ mul.d $f0, $f0, $f2 -/* CE134 80137A34 00000000 */ nop +/* CE134 80137A34 00000000 */ nop /* CE138 80137A38 00021180 */ sll $v0, $v0, 6 /* CE13C 80137A3C 03C21021 */ addu $v0, $fp, $v0 /* CE140 80137A40 A6230000 */ sh $v1, ($s1) @@ -1039,7 +1048,7 @@ glabel func_80136A80 /* CE164 80137A64 00A0302D */ daddu $a2, $a1, $zero /* CE168 80137A68 00108023 */ negu $s0, $s0 /* CE16C 80137A6C 44900000 */ mtc1 $s0, $f0 -/* CE170 80137A70 00000000 */ nop +/* CE170 80137A70 00000000 */ nop /* CE174 80137A74 46800020 */ cvt.s.w $f0, $f0 /* CE178 80137A78 46000021 */ cvt.d.s $f0, $f0 /* CE17C 80137A7C 8E420000 */ lw $v0, ($s2) @@ -1055,7 +1064,7 @@ glabel func_80136A80 /* CE1A4 80137AA4 24620001 */ addiu $v0, $v1, 1 /* CE1A8 80137AA8 3063FFFF */ andi $v1, $v1, 0xffff /* CE1AC 80137AAC 46220002 */ mul.d $f0, $f0, $f2 -/* CE1B0 80137AB0 00000000 */ nop +/* CE1B0 80137AB0 00000000 */ nop /* CE1B4 80137AB4 00031980 */ sll $v1, $v1, 6 /* CE1B8 80137AB8 ACB30000 */ sw $s3, ($a1) /* CE1BC 80137ABC A6220000 */ sh $v0, ($s1) @@ -1130,7 +1139,7 @@ glabel func_80136A80 /* CE2CC 80137BCC 3C028000 */ lui $v0, 0x8000 /* CE2D0 80137BD0 4600020D */ trunc.w.s $f8, $f0 /* CE2D4 80137BD4 44074000 */ mfc1 $a3, $f8 -/* CE2D8 80137BD8 00000000 */ nop +/* CE2D8 80137BD8 00000000 */ nop /* CE2DC 80137BDC 00E23825 */ or $a3, $a3, $v0 /* CE2E0 80137BE0 3C06D838 */ lui $a2, 0xd838 .L80137BE4: @@ -1167,7 +1176,7 @@ glabel func_80136A80 /* CE358 80137C58 00021400 */ sll $v0, $v0, 0x10 /* CE35C 80137C5C 00021403 */ sra $v0, $v0, 0x10 /* CE360 80137C60 44820000 */ mtc1 $v0, $f0 -/* CE364 80137C64 00000000 */ nop +/* CE364 80137C64 00000000 */ nop /* CE368 80137C68 46800020 */ cvt.s.w $f0, $f0 /* CE36C 80137C6C E7A00010 */ swc1 $f0, 0x10($sp) /* CE370 80137C70 0000202D */ daddu $a0, $zero, $zero @@ -1177,10 +1186,12 @@ glabel func_80136A80 /* CE380 80137C80 240700EF */ addiu $a3, $zero, 0xef /* CE384 80137C84 0804DF41 */ j .L80137D04 /* CE388 80137C88 3C06DA38 */ lui $a2, 0xda38 +glabel L80137C8C_CE38C /* CE38C 80137C8C 24040001 */ addiu $a0, $zero, 1 /* CE390 80137C90 02C0282D */ daddu $a1, $s6, $zero /* CE394 80137C94 0804DF32 */ j .L80137CC8 /* CE398 80137C98 02E0302D */ daddu $a2, $s7, $zero +glabel L80137C9C_CE39C /* CE39C 80137C9C E7B80010 */ swc1 $f24, 0x10($sp) /* CE3A0 80137CA0 0220202D */ daddu $a0, $s1, $zero /* CE3A4 80137CA4 0240282D */ daddu $a1, $s2, $zero @@ -1189,6 +1200,7 @@ glabel func_80136A80 /* CE3B0 80137CB0 02E0382D */ daddu $a3, $s7, $zero /* CE3B4 80137CB4 0804DF41 */ j .L80137D04 /* CE3B8 80137CB8 3C06DA38 */ lui $a2, 0xda38 +glabel L80137CBC_CE3BC /* CE3BC 80137CBC 0000202D */ daddu $a0, $zero, $zero /* CE3C0 80137CC0 0220282D */ daddu $a1, $s1, $zero /* CE3C4 80137CC4 0240302D */ daddu $a2, $s2, $zero @@ -1208,6 +1220,7 @@ glabel func_80136A80 /* CE3F8 80137CF8 0C04E395 */ jal func_80138E54 /* CE3FC 80137CFC E7B80010 */ swc1 $f24, 0x10($sp) .L80137D00: +glabel L80137D00_CE400 /* CE400 80137D00 3C06DA38 */ lui $a2, 0xda38 .L80137D04: /* CE404 80137D04 3C04800A */ lui $a0, %hi(gMasterGfxPos) diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80137D88.s b/asm/nonmatchings/code_cd180_len_38f0/func_80137D88.s index 46184bbdf2..7b1d796573 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80137D88.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80137D88.s @@ -8,4 +8,4 @@ glabel func_80137D88 /* CE494 80137D94 3C018015 */ lui $at, %hi(D_80156904) /* CE498 80137D98 AC256904 */ sw $a1, %lo(D_80156904)($at) /* CE49C 80137D9C 03E00008 */ jr $ra -/* CE4A0 80137DA0 00000000 */ nop +/* CE4A0 80137DA0 00000000 */ nop diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80137DA4.s b/asm/nonmatchings/code_cd180_len_38f0/func_80137DA4.s index 0ce9e64095..7f533fd27b 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80137DA4.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80137DA4.s @@ -8,4 +8,4 @@ glabel func_80137DA4 /* CE4B0 80137DB0 3C018015 */ lui $at, %hi(D_8015690C) /* CE4B4 80137DB4 AC25690C */ sw $a1, %lo(D_8015690C)($at) /* CE4B8 80137DB8 03E00008 */ jr $ra -/* CE4BC 80137DBC 00000000 */ nop +/* CE4BC 80137DBC 00000000 */ nop diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80137DC0.s b/asm/nonmatchings/code_cd180_len_38f0/func_80137DC0.s index a7570703f6..39170a31ce 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80137DC0.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80137DC0.s @@ -5,9 +5,9 @@ glabel func_80137DC0 /* CE4C0 80137DC0 10800005 */ beqz $a0, .L80137DD8 /* CE4C4 80137DC4 24020001 */ addiu $v0, $zero, 1 /* CE4C8 80137DC8 1082000A */ beq $a0, $v0, .L80137DF4 -/* CE4CC 80137DCC 00000000 */ nop +/* CE4CC 80137DCC 00000000 */ nop /* CE4D0 80137DD0 03E00008 */ jr $ra -/* CE4D4 80137DD4 00000000 */ nop +/* CE4D4 80137DD4 00000000 */ nop .L80137DD8: /* CE4D8 80137DD8 3C028015 */ lui $v0, %hi(D_80156903) /* CE4DC 80137DDC 90426903 */ lbu $v0, %lo(D_80156903)($v0) diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80137E10.s b/asm/nonmatchings/code_cd180_len_38f0/func_80137E10.s index f2f3c2fb23..e8daed0539 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80137E10.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80137E10.s @@ -4,7 +4,7 @@ glabel func_80137E10 /* CE510 80137E10 28820002 */ slti $v0, $a0, 2 /* CE514 80137E14 1040000B */ beqz $v0, .L80137E44 -/* CE518 80137E18 00000000 */ nop +/* CE518 80137E18 00000000 */ nop /* CE51C 80137E1C 04800009 */ bltz $a0, .L80137E44 /* CE520 80137E20 00041040 */ sll $v0, $a0, 1 /* CE524 80137E24 3C038016 */ lui $v1, %hi(D_8015C790) @@ -17,4 +17,4 @@ glabel func_80137E10 /* CE540 80137E40 A0470002 */ sb $a3, 2($v0) .L80137E44: /* CE544 80137E44 03E00008 */ jr $ra -/* CE548 80137E48 00000000 */ nop +/* CE548 80137E48 00000000 */ nop diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80137E4C.s b/asm/nonmatchings/code_cd180_len_38f0/func_80137E4C.s index f6ec07f78b..792d7e40d2 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80137E4C.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80137E4C.s @@ -4,15 +4,15 @@ glabel func_80137E4C /* CE54C 80137E4C 28820002 */ slti $v0, $a0, 2 /* CE550 80137E50 10400019 */ beqz $v0, .L80137EB8 -/* CE554 80137E54 00000000 */ nop +/* CE554 80137E54 00000000 */ nop /* CE558 80137E58 04800017 */ bltz $a0, .L80137EB8 -/* CE55C 80137E5C 00000000 */ nop +/* CE55C 80137E5C 00000000 */ nop /* CE560 80137E60 10A00005 */ beqz $a1, .L80137E78 /* CE564 80137E64 24020001 */ addiu $v0, $zero, 1 /* CE568 80137E68 10A2000C */ beq $a1, $v0, .L80137E9C /* CE56C 80137E6C 00041040 */ sll $v0, $a0, 1 /* CE570 80137E70 03E00008 */ jr $ra -/* CE574 80137E74 00000000 */ nop +/* CE574 80137E74 00000000 */ nop .L80137E78: /* CE578 80137E78 3C038016 */ lui $v1, %hi(D_8015C790) /* CE57C 80137E7C 2463C790 */ addiu $v1, $v1, %lo(D_8015C790) @@ -33,4 +33,4 @@ glabel func_80137E4C /* CE5B4 80137EB4 AC470010 */ sw $a3, 0x10($v0) .L80137EB8: /* CE5B8 80137EB8 03E00008 */ jr $ra -/* CE5BC 80137EBC 00000000 */ nop +/* CE5BC 80137EBC 00000000 */ nop diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80137EC0.s b/asm/nonmatchings/code_cd180_len_38f0/func_80137EC0.s index 6c9de5eec4..4ff7630a9e 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80137EC0.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80137EC0.s @@ -33,11 +33,11 @@ glabel func_80137EC0 /* CE630 80137F30 AFA2001C */ sw $v0, 0x1c($sp) /* CE634 80137F34 27A20034 */ addiu $v0, $sp, 0x34 /* CE638 80137F38 44866000 */ mtc1 $a2, $f12 -/* CE63C 80137F3C 00000000 */ nop +/* CE63C 80137F3C 00000000 */ nop /* CE640 80137F40 46806320 */ cvt.s.w $f12, $f12 /* CE644 80137F44 44056000 */ mfc1 $a1, $f12 /* CE648 80137F48 44876000 */ mtc1 $a3, $f12 -/* CE64C 80137F4C 00000000 */ nop +/* CE64C 80137F4C 00000000 */ nop /* CE650 80137F50 46806320 */ cvt.s.w $f12, $f12 /* CE654 80137F54 44066000 */ mfc1 $a2, $f12 /* CE658 80137F58 C7AC0060 */ lwc1 $f12, 0x60($sp) @@ -53,48 +53,48 @@ glabel func_80137EC0 /* CE680 80137F80 C7AA0028 */ lwc1 $f10, 0x28($sp) /* CE684 80137F84 4600A503 */ div.s $f20, $f20, $f0 /* CE688 80137F88 46145282 */ mul.s $f10, $f10, $f20 -/* CE68C 80137F8C 00000000 */ nop +/* CE68C 80137F8C 00000000 */ nop /* CE690 80137F90 8602000A */ lh $v0, 0xa($s0) /* CE694 80137F94 44820000 */ mtc1 $v0, $f0 -/* CE698 80137F98 00000000 */ nop +/* CE698 80137F98 00000000 */ nop /* CE69C 80137F9C 46800020 */ cvt.s.w $f0, $f0 /* CE6A0 80137FA0 46005102 */ mul.s $f4, $f10, $f0 -/* CE6A4 80137FA4 00000000 */ nop +/* CE6A4 80137FA4 00000000 */ nop /* CE6A8 80137FA8 46002100 */ add.s $f4, $f4, $f0 /* CE6AC 80137FAC 3C013FE0 */ lui $at, 0x3fe0 /* CE6B0 80137FB0 44813800 */ mtc1 $at, $f7 /* CE6B4 80137FB4 44803000 */ mtc1 $zero, $f6 /* CE6B8 80137FB8 46002121 */ cvt.d.s $f4, $f4 /* CE6BC 80137FBC 46262102 */ mul.d $f4, $f4, $f6 -/* CE6C0 80137FC0 00000000 */ nop +/* CE6C0 80137FC0 00000000 */ nop /* CE6C4 80137FC4 C7A8002C */ lwc1 $f8, 0x2c($sp) /* CE6C8 80137FC8 4600A007 */ neg.s $f0, $f20 /* CE6CC 80137FCC 46004202 */ mul.s $f8, $f8, $f0 -/* CE6D0 80137FD0 00000000 */ nop +/* CE6D0 80137FD0 00000000 */ nop /* CE6D4 80137FD4 8602000C */ lh $v0, 0xc($s0) /* CE6D8 80137FD8 44820000 */ mtc1 $v0, $f0 -/* CE6DC 80137FDC 00000000 */ nop +/* CE6DC 80137FDC 00000000 */ nop /* CE6E0 80137FE0 46800020 */ cvt.s.w $f0, $f0 /* CE6E4 80137FE4 46004082 */ mul.s $f2, $f8, $f0 -/* CE6E8 80137FE8 00000000 */ nop +/* CE6E8 80137FE8 00000000 */ nop /* CE6EC 80137FEC 46001080 */ add.s $f2, $f2, $f0 /* CE6F0 80137FF0 460010A1 */ cvt.d.s $f2, $f2 /* CE6F4 80137FF4 46261082 */ mul.d $f2, $f2, $f6 -/* CE6F8 80137FF8 00000000 */ nop +/* CE6F8 80137FF8 00000000 */ nop /* CE6FC 80137FFC E7B40034 */ swc1 $f20, 0x34($sp) /* CE700 80138000 C7A60030 */ lwc1 $f6, 0x30($sp) /* CE704 80138004 8602000E */ lh $v0, 0xe($s0) /* CE708 80138008 46143182 */ mul.s $f6, $f6, $f20 -/* CE70C 8013800C 00000000 */ nop +/* CE70C 8013800C 00000000 */ nop /* CE710 80138010 E7AA0028 */ swc1 $f10, 0x28($sp) /* CE714 80138014 E7A8002C */ swc1 $f8, 0x2c($sp) /* CE718 80138018 44820000 */ mtc1 $v0, $f0 -/* CE71C 8013801C 00000000 */ nop +/* CE71C 8013801C 00000000 */ nop /* CE720 80138020 46800021 */ cvt.d.w $f0, $f0 /* CE724 80138024 86020010 */ lh $v0, 0x10($s0) /* CE728 80138028 46202100 */ add.d $f4, $f4, $f0 /* CE72C 8013802C 44820000 */ mtc1 $v0, $f0 -/* CE730 80138030 00000000 */ nop +/* CE730 80138030 00000000 */ nop /* CE734 80138034 46800021 */ cvt.d.w $f0, $f0 /* CE738 80138038 46202120 */ cvt.s.d $f4, $f4 /* CE73C 8013803C 46201080 */ add.d $f2, $f2, $f0 @@ -107,7 +107,7 @@ glabel func_80137EC0 /* CE758 80138058 1242000E */ beq $s2, $v0, .L80138094 /* CE75C 8013805C 00111040 */ sll $v0, $s1, 1 /* CE760 80138060 0804E02E */ j .L801380B8 -/* CE764 80138064 00000000 */ nop +/* CE764 80138064 00000000 */ nop .L80138068: /* CE768 80138068 3C038016 */ lui $v1, %hi(D_8015C790) /* CE76C 8013806C 2463C790 */ addiu $v1, $v1, %lo(D_8015C790) diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_801380D4.s b/asm/nonmatchings/code_cd180_len_38f0/func_801380D4.s index a46302eaa8..4135f04081 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_801380D4.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_801380D4.s @@ -5,7 +5,7 @@ glabel func_801380D4 /* CE7D4 801380D4 44850000 */ mtc1 $a1, $f0 /* CE7D8 801380D8 28820002 */ slti $v0, $a0, 2 /* CE7DC 801380DC 10400008 */ beqz $v0, .L80138100 -/* CE7E0 801380E0 00000000 */ nop +/* CE7E0 801380E0 00000000 */ nop /* CE7E4 801380E4 04800006 */ bltz $a0, .L80138100 /* CE7E8 801380E8 00041040 */ sll $v0, $a0, 1 /* CE7EC 801380EC 00441021 */ addu $v0, $v0, $a0 @@ -15,4 +15,4 @@ glabel func_801380D4 /* CE7FC 801380FC E420C7A4 */ swc1 $f0, %lo(D_8015C7A4)($at) .L80138100: /* CE800 80138100 03E00008 */ jr $ra -/* CE804 80138104 00000000 */ nop +/* CE804 80138104 00000000 */ nop diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138108.s b/asm/nonmatchings/code_cd180_len_38f0/func_80138108.s index 12e766d720..f6003f8859 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80138108.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80138108.s @@ -34,4 +34,4 @@ glabel func_80138108 /* CE878 80138178 1440FFF4 */ bnez $v0, .L8013814C /* CE87C 8013817C 24840018 */ addiu $a0, $a0, 0x18 /* CE880 80138180 03E00008 */ jr $ra -/* CE884 80138184 00000000 */ nop +/* CE884 80138184 00000000 */ nop diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138188.s b/asm/nonmatchings/code_cd180_len_38f0/func_80138188.s index 2c1d5e76c0..1a2721689f 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80138188.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80138188.s @@ -5,4 +5,4 @@ glabel func_80138188 /* CE888 80138188 3C018015 */ lui $at, %hi(D_8015690C) /* CE88C 8013818C AC20690C */ sw $zero, %lo(D_8015690C)($at) /* CE890 80138190 03E00008 */ jr $ra -/* CE894 80138194 00000000 */ nop +/* CE894 80138194 00000000 */ nop diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_801381A0.s b/asm/nonmatchings/code_cd180_len_38f0/func_801381A0.s index 7aa9b1c482..3febb18d80 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_801381A0.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_801381A0.s @@ -9,28 +9,28 @@ glabel func_801381A0 /* CE8B0 801381B0 8C830000 */ lw $v1, ($a0) /* CE8B4 801381B4 2402FFFF */ addiu $v0, $zero, -1 /* CE8B8 801381B8 10620016 */ beq $v1, $v0, .L80138214 -/* CE8BC 801381BC 00000000 */ nop +/* CE8BC 801381BC 00000000 */ nop /* CE8C0 801381C0 3C018015 */ lui $at, %hi(D_80156904) /* CE8C4 801381C4 C4226904 */ lwc1 $f2, %lo(D_80156904)($at) /* CE8C8 801381C8 3C01BF80 */ lui $at, 0xbf80 /* CE8CC 801381CC 44810000 */ mtc1 $at, $f0 -/* CE8D0 801381D0 00000000 */ nop +/* CE8D0 801381D0 00000000 */ nop /* CE8D4 801381D4 46001032 */ c.eq.s $f2, $f0 -/* CE8D8 801381D8 00000000 */ nop +/* CE8D8 801381D8 00000000 */ nop /* CE8DC 801381DC 4501000D */ bc1t .L80138214 -/* CE8E0 801381E0 00000000 */ nop +/* CE8E0 801381E0 00000000 */ nop /* CE8E4 801381E4 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* CE8E8 801381E8 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* CE8EC 801381EC 80430070 */ lb $v1, 0x70($v0) /* CE8F0 801381F0 24020002 */ addiu $v0, $zero, 2 /* CE8F4 801381F4 10620007 */ beq $v1, $v0, .L80138214 -/* CE8F8 801381F8 00000000 */ nop +/* CE8F8 801381F8 00000000 */ nop /* CE8FC 801381FC 90840003 */ lbu $a0, 3($a0) /* CE900 80138200 44051000 */ mfc1 $a1, $f2 /* CE904 80138204 3C068016 */ lui $a2, %hi(D_8015C790) /* CE908 80138208 24C6C790 */ addiu $a2, $a2, %lo(D_8015C790) /* CE90C 8013820C 0C04DAA0 */ jal func_80136A80 -/* CE910 80138210 00000000 */ nop +/* CE910 80138210 00000000 */ nop .L80138214: /* CE914 80138214 8FBF0010 */ lw $ra, 0x10($sp) /* CE918 80138218 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138220.s b/asm/nonmatchings/code_cd180_len_38f0/func_80138220.s index ffbbe2bd06..456ff7b67d 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80138220.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80138220.s @@ -9,28 +9,28 @@ glabel func_80138220 /* CE930 80138230 8C830000 */ lw $v1, ($a0) /* CE934 80138234 2402FFFF */ addiu $v0, $zero, -1 /* CE938 80138238 10620016 */ beq $v1, $v0, .L80138294 -/* CE93C 8013823C 00000000 */ nop +/* CE93C 8013823C 00000000 */ nop /* CE940 80138240 3C018015 */ lui $at, %hi(D_8015690C) /* CE944 80138244 C422690C */ lwc1 $f2, %lo(D_8015690C)($at) /* CE948 80138248 3C01BF80 */ lui $at, 0xbf80 /* CE94C 8013824C 44810000 */ mtc1 $at, $f0 -/* CE950 80138250 00000000 */ nop +/* CE950 80138250 00000000 */ nop /* CE954 80138254 46001032 */ c.eq.s $f2, $f0 -/* CE958 80138258 00000000 */ nop +/* CE958 80138258 00000000 */ nop /* CE95C 8013825C 4501000D */ bc1t .L80138294 -/* CE960 80138260 00000000 */ nop +/* CE960 80138260 00000000 */ nop /* CE964 80138264 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* CE968 80138268 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* CE96C 8013826C 80430070 */ lb $v1, 0x70($v0) /* CE970 80138270 24020002 */ addiu $v0, $zero, 2 /* CE974 80138274 10620007 */ beq $v1, $v0, .L80138294 -/* CE978 80138278 00000000 */ nop +/* CE978 80138278 00000000 */ nop /* CE97C 8013827C 90840003 */ lbu $a0, 3($a0) /* CE980 80138280 44051000 */ mfc1 $a1, $f2 /* CE984 80138284 3C068016 */ lui $a2, %hi(D_8015C7A8) /* CE988 80138288 24C6C7A8 */ addiu $a2, $a2, %lo(D_8015C7A8) /* CE98C 8013828C 0C04DAA0 */ jal func_80136A80 -/* CE990 80138290 00000000 */ nop +/* CE990 80138290 00000000 */ nop .L80138294: /* CE994 80138294 8FBF0010 */ lw $ra, 0x10($sp) /* CE998 80138298 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_801382AC.s b/asm/nonmatchings/code_cd180_len_38f0/func_801382AC.s index fc278ad5e7..c77f3dc1a7 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_801382AC.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_801382AC.s @@ -22,13 +22,15 @@ glabel func_801382AC /* CE9F0 801382F0 1040005E */ beqz $v0, .L8013846C /* CE9F4 801382F4 AFB00010 */ sw $s0, 0x10($sp) /* CE9F8 801382F8 00031080 */ sll $v0, $v1, 2 -/* CE9FC 801382FC 3C018015 */ lui $at, %hi(D_80150EF0) +/* CE9FC 801382FC 3C018015 */ lui $at, %hi(jtbl_80150EF0_E75F0) /* CEA00 80138300 00220821 */ addu $at, $at, $v0 -/* CEA04 80138304 8C220EF0 */ lw $v0, %lo(D_80150EF0)($at) +/* CEA04 80138304 8C220EF0 */ lw $v0, %lo(jtbl_80150EF0_E75F0)($at) /* CEA08 80138308 00400008 */ jr $v0 -/* CEA0C 8013830C 00000000 */ nop +/* CEA0C 8013830C 00000000 */ nop +glabel L80138310_CEA10 /* CEA10 80138310 0804E11B */ j .L8013846C /* CEA14 80138314 0000882D */ daddu $s1, $zero, $zero +glabel L80138318_CEA18 /* CEA18 80138318 241500D0 */ addiu $s5, $zero, 0xd0 /* CEA1C 8013831C 02A0A02D */ daddu $s4, $s5, $zero /* CEA20 80138320 02A0982D */ daddu $s3, $s5, $zero @@ -42,11 +44,14 @@ glabel func_801382AC /* CEA40 80138340 24020012 */ addiu $v0, $zero, 0x12 /* CEA44 80138344 0804E11B */ j .L8013846C /* CEA48 80138348 A0820072 */ sb $v0, 0x72($a0) +glabel L8013834C_CEA4C /* CEA4C 8013834C 241500D0 */ addiu $s5, $zero, 0xd0 /* CEA50 80138350 02A0A02D */ daddu $s4, $s5, $zero /* CEA54 80138354 02A0982D */ daddu $s3, $s5, $zero +glabel L80138358_CEA58 /* CEA58 80138358 0804E11B */ j .L8013846C /* CEA5C 8013835C 24110001 */ addiu $s1, $zero, 1 +glabel L80138360_CEA60 /* CEA60 80138360 3C048007 */ lui $a0, %hi(gGameStatusPtr) /* CEA64 80138364 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) /* CEA68 80138368 80830071 */ lb $v1, 0x71($a0) @@ -55,33 +60,41 @@ glabel func_801382AC /* CEA74 80138374 241500D0 */ addiu $s5, $zero, 0xd0 /* CEA78 80138378 24020012 */ addiu $v0, $zero, 0x12 /* CEA7C 8013837C A0820072 */ sb $v0, 0x72($a0) +glabel L80138380_CEA80 /* CEA80 80138380 241500D0 */ addiu $s5, $zero, 0xd0 .L80138384: /* CEA84 80138384 02A0A02D */ daddu $s4, $s5, $zero /* CEA88 80138388 02A0982D */ daddu $s3, $s5, $zero +glabel L8013838C_CEA8C /* CEA8C 8013838C 24110001 */ addiu $s1, $zero, 1 /* CEA90 80138390 0804E11B */ j .L8013846C /* CEA94 80138394 24120007 */ addiu $s2, $zero, 7 +glabel L80138398_CEA98 /* CEA98 80138398 241500D0 */ addiu $s5, $zero, 0xd0 /* CEA9C 8013839C 02A0A02D */ daddu $s4, $s5, $zero /* CEAA0 801383A0 02A0982D */ daddu $s3, $s5, $zero +glabel L801383A4_CEAA4 /* CEAA4 801383A4 24110001 */ addiu $s1, $zero, 1 /* CEAA8 801383A8 0804E11B */ j .L8013846C /* CEAAC 801383AC 24120032 */ addiu $s2, $zero, 0x32 +glabel L801383B0_CEAB0 /* CEAB0 801383B0 0000202D */ daddu $a0, $zero, $zero /* CEAB4 801383B4 0C04E035 */ jal func_801380D4 /* CEAB8 801383B8 0000282D */ daddu $a1, $zero, $zero /* CEABC 801383BC 0804E11B */ j .L8013846C /* CEAC0 801383C0 24110004 */ addiu $s1, $zero, 4 +glabel L801383C4_CEAC4 /* CEAC4 801383C4 241500D0 */ addiu $s5, $zero, 0xd0 /* CEAC8 801383C8 02A0A02D */ daddu $s4, $s5, $zero /* CEACC 801383CC 02A0982D */ daddu $s3, $s5, $zero +glabel L801383D0_CEAD0 /* CEAD0 801383D0 0000202D */ daddu $a0, $zero, $zero /* CEAD4 801383D4 0C04E035 */ jal func_801380D4 /* CEAD8 801383D8 0000282D */ daddu $a1, $zero, $zero /* CEADC 801383DC 24110004 */ addiu $s1, $zero, 4 /* CEAE0 801383E0 0804E11B */ j .L8013846C /* CEAE4 801383E4 24120007 */ addiu $s2, $zero, 7 +glabel L801383E8_CEAE8 /* CEAE8 801383E8 0000202D */ daddu $a0, $zero, $zero /* CEAEC 801383EC 3C054320 */ lui $a1, 0x4320 /* CEAF0 801383F0 241500D0 */ addiu $s5, $zero, 0xd0 @@ -91,13 +104,15 @@ glabel func_801382AC /* CEB00 80138400 0C04E035 */ jal func_801380D4 /* CEB04 80138404 24120007 */ addiu $s2, $zero, 7 /* CEB08 80138408 0804E11B */ j .L8013846C -/* CEB0C 8013840C 00000000 */ nop +/* CEB0C 8013840C 00000000 */ nop +glabel L80138410_CEB10 /* CEB10 80138410 0000202D */ daddu $a0, $zero, $zero /* CEB14 80138414 0C04E035 */ jal func_801380D4 /* CEB18 80138418 0000282D */ daddu $a1, $zero, $zero /* CEB1C 8013841C 24110005 */ addiu $s1, $zero, 5 /* CEB20 80138420 0804E11B */ j .L8013846C /* CEB24 80138424 24120007 */ addiu $s2, $zero, 7 +glabel L80138428_CEB28 /* CEB28 80138428 0000202D */ daddu $a0, $zero, $zero /* CEB2C 8013842C 0080282D */ daddu $a1, $a0, $zero /* CEB30 80138430 2406000F */ addiu $a2, $zero, 0xf @@ -166,10 +181,10 @@ glabel func_801382AC /* CEC24 80138524 0C04DF84 */ jal func_80137E10 /* CEC28 80138528 02A0382D */ daddu $a3, $s5, $zero /* CEC2C 8013852C 1600000A */ bnez $s0, .L80138558 -/* CEC30 80138530 00000000 */ nop +/* CEC30 80138530 00000000 */ nop /* CEC34 80138534 86C20000 */ lh $v0, ($s6) /* CEC38 80138538 44820000 */ mtc1 $v0, $f0 -/* CEC3C 8013853C 00000000 */ nop +/* CEC3C 8013853C 00000000 */ nop /* CEC40 80138540 46800020 */ cvt.s.w $f0, $f0 /* CEC44 80138544 44050000 */ mfc1 $a1, $f0 /* CEC48 80138548 0C04DF62 */ jal func_80137D88 @@ -179,7 +194,7 @@ glabel func_801382AC .L80138558: /* CEC58 80138558 86C20000 */ lh $v0, ($s6) /* CEC5C 8013855C 44820000 */ mtc1 $v0, $f0 -/* CEC60 80138560 00000000 */ nop +/* CEC60 80138560 00000000 */ nop /* CEC64 80138564 46800020 */ cvt.s.w $f0, $f0 /* CEC68 80138568 44050000 */ mfc1 $a1, $f0 /* CEC6C 8013856C 0C04DF69 */ jal func_80137DA4 diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_801385D4.s b/asm/nonmatchings/code_cd180_len_38f0/func_801385D4.s index 87077138e9..60d8f3bbd4 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_801385D4.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_801385D4.s @@ -17,11 +17,12 @@ glabel func_801385D4 /* CED04 80138604 10400030 */ beqz $v0, .L801386C8 /* CED08 80138608 AFBF0020 */ sw $ra, 0x20($sp) /* CED0C 8013860C 00031080 */ sll $v0, $v1, 2 -/* CED10 80138610 3C018015 */ lui $at, %hi(D_80150F38) +/* CED10 80138610 3C018015 */ lui $at, %hi(jtbl_80150F38_E7638) /* CED14 80138614 00220821 */ addu $at, $at, $v0 -/* CED18 80138618 8C220F38 */ lw $v0, %lo(D_80150F38)($at) +/* CED18 80138618 8C220F38 */ lw $v0, %lo(jtbl_80150F38_E7638)($at) /* CED1C 8013861C 00400008 */ jr $v0 -/* CED20 80138620 00000000 */ nop +/* CED20 80138620 00000000 */ nop +glabel L80138624_CED24 /* CED24 80138624 0000202D */ daddu $a0, $zero, $zero /* CED28 80138628 240500D0 */ addiu $a1, $zero, 0xd0 /* CED2C 8013862C 00A0302D */ daddu $a2, $a1, $zero @@ -29,22 +30,29 @@ glabel func_801385D4 /* CED34 80138634 00A0382D */ daddu $a3, $a1, $zero /* CED38 80138638 0804E1B2 */ j .L801386C8 /* CED3C 8013863C 24100032 */ addiu $s0, $zero, 0x32 +glabel L80138640_CED40 /* CED40 80138640 24110001 */ addiu $s1, $zero, 1 /* CED44 80138644 0804E1B2 */ j .L801386C8 /* CED48 80138648 24100032 */ addiu $s0, $zero, 0x32 +glabel L8013864C_CED4C /* CED4C 8013864C 24110001 */ addiu $s1, $zero, 1 /* CED50 80138650 0804E1B2 */ j .L801386C8 /* CED54 80138654 24100007 */ addiu $s0, $zero, 7 +glabel L80138658_CED58 /* CED58 80138658 0804E1B2 */ j .L801386C8 /* CED5C 8013865C 24110001 */ addiu $s1, $zero, 1 +glabel L80138660_CED60 /* CED60 80138660 0804E1B2 */ j .L801386C8 /* CED64 80138664 24110004 */ addiu $s1, $zero, 4 +glabel L80138668_CED68 /* CED68 80138668 24110005 */ addiu $s1, $zero, 5 /* CED6C 8013866C 0804E1B2 */ j .L801386C8 /* CED70 80138670 24100007 */ addiu $s0, $zero, 7 +glabel L80138674_CED74 /* CED74 80138674 24110004 */ addiu $s1, $zero, 4 /* CED78 80138678 0804E1B2 */ j .L801386C8 /* CED7C 8013867C 24100007 */ addiu $s0, $zero, 7 +glabel L80138680_CED80 /* CED80 80138680 0000202D */ daddu $a0, $zero, $zero /* CED84 80138684 0080282D */ daddu $a1, $a0, $zero /* CED88 80138688 2406000F */ addiu $a2, $zero, 0xf @@ -58,7 +66,7 @@ glabel func_801385D4 /* CEDA8 801386A8 86420000 */ lh $v0, ($s2) /* CEDAC 801386AC 2404000C */ addiu $a0, $zero, 0xc /* CEDB0 801386B0 44820000 */ mtc1 $v0, $f0 -/* CEDB4 801386B4 00000000 */ nop +/* CEDB4 801386B4 00000000 */ nop /* CEDB8 801386B8 46800020 */ cvt.s.w $f0, $f0 /* CEDBC 801386BC 44050000 */ mfc1 $a1, $f0 /* CEDC0 801386C0 0C04DF62 */ jal func_80137D88 @@ -68,10 +76,10 @@ glabel func_801385D4 /* CEDCC 801386CC 8C63C6F0 */ lw $v1, %lo(D_8014C6F0)($v1) /* CEDD0 801386D0 24020010 */ addiu $v0, $zero, 0x10 /* CEDD4 801386D4 10620008 */ beq $v1, $v0, .L801386F8 -/* CEDD8 801386D8 00000000 */ nop +/* CEDD8 801386D8 00000000 */ nop /* CEDDC 801386DC 86420000 */ lh $v0, ($s2) /* CEDE0 801386E0 44820000 */ mtc1 $v0, $f0 -/* CEDE4 801386E4 00000000 */ nop +/* CEDE4 801386E4 00000000 */ nop /* CEDE8 801386E8 46800020 */ cvt.s.w $f0, $f0 /* CEDEC 801386EC 44050000 */ mfc1 $a1, $f0 /* CEDF0 801386F0 0C04DF62 */ jal func_80137D88 @@ -96,4 +104,4 @@ glabel func_801385D4 /* CEE30 80138730 8FB00010 */ lw $s0, 0x10($sp) /* CEE34 80138734 03E00008 */ jr $ra /* CEE38 80138738 27BD0028 */ addiu $sp, $sp, 0x28 -/* CEE3C 8013873C 00000000 */ nop +/* CEE3C 8013873C 00000000 */ nop diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138740.s b/asm/nonmatchings/code_cd180_len_38f0/func_80138740.s index 13d4b2b25d..70752c2fdb 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80138740.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80138740.s @@ -60,7 +60,7 @@ glabel func_80138740 .L80138814: /* CEF14 80138814 8C820000 */ lw $v0, ($a0) /* CEF18 80138818 1446000B */ bne $v0, $a2, .L80138848 -/* CEF1C 8013881C 00000000 */ nop +/* CEF1C 8013881C 00000000 */ nop /* CEF20 80138820 8CE30000 */ lw $v1, ($a3) /* CEF24 80138824 02431021 */ addu $v0, $s2, $v1 /* CEF28 80138828 2442FFFF */ addiu $v0, $v0, -1 @@ -164,7 +164,7 @@ glabel func_80138740 /* CF0A4 801389A4 3C03FA00 */ lui $v1, 0xfa00 /* CF0A8 801389A8 24440054 */ addiu $a0, $v0, 0x54 /* CF0AC 801389AC 4600103E */ c.le.s $f2, $f0 -/* CF0B0 801389B0 00000000 */ nop +/* CF0B0 801389B0 00000000 */ nop /* CF0B4 801389B4 45010005 */ bc1t .L801389CC /* CF0B8 801389B8 AC430050 */ sw $v1, 0x50($v0) /* CF0BC 801389BC 4600010D */ trunc.w.s $f4, $f0 @@ -176,7 +176,7 @@ glabel func_80138740 /* CF0D0 801389D0 3C028000 */ lui $v0, 0x8000 /* CF0D4 801389D4 4600010D */ trunc.w.s $f4, $f0 /* CF0D8 801389D8 44032000 */ mfc1 $v1, $f4 -/* CF0DC 801389DC 00000000 */ nop +/* CF0DC 801389DC 00000000 */ nop /* CF0E0 801389E0 00621825 */ or $v1, $v1, $v0 /* CF0E4 801389E4 2402FF00 */ addiu $v0, $zero, -0x100 .L801389E8: diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138D88.s b/asm/nonmatchings/code_cd180_len_38f0/func_80138D88.s index aebf7f20e7..74fa3e6fd2 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80138D88.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80138D88.s @@ -26,7 +26,7 @@ glabel func_80138D88 /* CF4CC 80138DCC 1040001E */ beqz $v0, .L80138E48 /* CF4D0 80138DD0 00A7102A */ slt $v0, $a1, $a3 /* CF4D4 80138DD4 1040001C */ beqz $v0, .L80138E48 -/* CF4D8 80138DD8 00000000 */ nop +/* CF4D8 80138DD8 00000000 */ nop /* CF4DC 80138DDC 04820001 */ bltzl $a0, .L80138DE4 /* CF4E0 80138DE0 0000202D */ daddu $a0, $zero, $zero .L80138DE4: @@ -56,9 +56,9 @@ glabel func_80138D88 /* CF528 80138E28 240700EF */ addiu $a3, $zero, 0xef .L80138E2C: /* CF52C 80138E2C 10860006 */ beq $a0, $a2, .L80138E48 -/* CF530 80138E30 00000000 */ nop +/* CF530 80138E30 00000000 */ nop /* CF534 80138E34 10A70004 */ beq $a1, $a3, .L80138E48 -/* CF538 80138E38 00000000 */ nop +/* CF538 80138E38 00000000 */ nop /* CF53C 80138E3C C7A00030 */ lwc1 $f0, 0x30($sp) /* CF540 80138E40 0C04E1D0 */ jal func_80138740 /* CF544 80138E44 E7A00010 */ swc1 $f0, 0x10($sp) diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s b/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s index 47a141fbf9..0c0a0d0e21 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s @@ -37,21 +37,21 @@ glabel func_80138E54 /* CF5D4 80138ED4 00431021 */ addu $v0, $v0, $v1 /* CF5D8 80138ED8 000210C0 */ sll $v0, $v0, 3 /* CF5DC 80138EDC 4600C032 */ c.eq.s $f24, $f0 -/* CF5E0 80138EE0 00000000 */ nop +/* CF5E0 80138EE0 00000000 */ nop /* CF5E4 80138EE4 450103F8 */ bc1t .L80139EC8 /* CF5E8 80138EE8 0044F021 */ addu $fp, $v0, $a0 /* CF5EC 80138EEC 8FAD0088 */ lw $t5, 0x88($sp) /* CF5F0 80138EF0 15A00011 */ bnez $t5, .L80138F38 -/* CF5F4 80138EF4 00000000 */ nop +/* CF5F4 80138EF4 00000000 */ nop /* CF5F8 80138EF8 3C01437F */ lui $at, 0x437f /* CF5FC 80138EFC 44812000 */ mtc1 $at, $f4 -/* CF600 80138F00 00000000 */ nop +/* CF600 80138F00 00000000 */ nop /* CF604 80138F04 46182001 */ sub.s $f0, $f4, $f24 /* CF608 80138F08 3C014120 */ lui $at, 0x4120 /* CF60C 80138F0C 44811000 */ mtc1 $at, $f2 -/* CF610 80138F10 00000000 */ nop +/* CF610 80138F10 00000000 */ nop /* CF614 80138F14 46020002 */ mul.s $f0, $f0, $f2 -/* CF618 80138F18 00000000 */ nop +/* CF618 80138F18 00000000 */ nop /* CF61C 80138F1C 3C018015 */ lui $at, %hi(D_80150F80) /* CF620 80138F20 D4220F80 */ ldc1 $f2, %lo(D_80150F80)($at) /* CF624 80138F24 46040003 */ div.s $f0, $f0, $f4 @@ -75,30 +75,30 @@ glabel func_80138E54 /* CF668 80138F68 46184101 */ sub.s $f4, $f8, $f24 /* CF66C 80138F6C 006D1823 */ subu $v1, $v1, $t5 /* CF670 80138F70 44831000 */ mtc1 $v1, $f2 -/* CF674 80138F74 00000000 */ nop +/* CF674 80138F74 00000000 */ nop /* CF678 80138F78 468010A0 */ cvt.s.w $f2, $f2 /* CF67C 80138F7C 46062182 */ mul.s $f6, $f4, $f6 -/* CF680 80138F80 00000000 */ nop +/* CF680 80138F80 00000000 */ nop /* CF684 80138F84 00042400 */ sll $a0, $a0, 0x10 /* CF688 80138F88 00041403 */ sra $v0, $a0, 0x10 /* CF68C 80138F8C 000427C2 */ srl $a0, $a0, 0x1f /* CF690 80138F90 00441021 */ addu $v0, $v0, $a0 /* CF694 80138F94 46041082 */ mul.s $f2, $f2, $f4 -/* CF698 80138F98 00000000 */ nop +/* CF698 80138F98 00000000 */ nop /* CF69C 80138F9C 8FAD0090 */ lw $t5, 0x90($sp) /* CF6A0 80138FA0 00021043 */ sra $v0, $v0, 1 /* CF6A4 80138FA4 004D1023 */ subu $v0, $v0, $t5 /* CF6A8 80138FA8 44820000 */ mtc1 $v0, $f0 -/* CF6AC 80138FAC 00000000 */ nop +/* CF6AC 80138FAC 00000000 */ nop /* CF6B0 80138FB0 46800020 */ cvt.s.w $f0, $f0 /* CF6B4 80138FB4 46040002 */ mul.s $f0, $f0, $f4 -/* CF6B8 80138FB8 00000000 */ nop +/* CF6B8 80138FB8 00000000 */ nop /* CF6BC 80138FBC C7A4008C */ lwc1 $f4, 0x8c($sp) /* CF6C0 80138FC0 46802120 */ cvt.s.w $f4, $f4 /* CF6C4 80138FC4 46081083 */ div.s $f2, $f2, $f8 /* CF6C8 80138FC8 46022100 */ add.s $f4, $f4, $f2 /* CF6CC 80138FCC 448D1000 */ mtc1 $t5, $f2 -/* CF6D0 80138FD0 00000000 */ nop +/* CF6D0 80138FD0 00000000 */ nop /* CF6D4 80138FD4 468010A0 */ cvt.s.w $f2, $f2 /* CF6D8 80138FD8 46080003 */ div.s $f0, $f0, $f8 /* CF6DC 80138FDC 46001080 */ add.s $f2, $f2, $f0 @@ -281,7 +281,7 @@ glabel func_80138E54 /* CF998 80139298 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* CF99C 8013929C 94420134 */ lhu $v0, 0x134($v0) /* CF9A0 801392A0 44826000 */ mtc1 $v0, $f12 -/* CF9A4 801392A4 00000000 */ nop +/* CF9A4 801392A4 00000000 */ nop /* CF9A8 801392A8 0C00A8BB */ jal sin_deg /* CF9AC 801392AC 46806320 */ cvt.s.w $f12, $f12 /* CF9B0 801392B0 3C018015 */ lui $at, %hi(D_80150F90) @@ -295,7 +295,7 @@ glabel func_80138E54 /* CF9CC 801392CC 00021040 */ sll $v0, $v0, 1 /* CF9D0 801392D0 00571021 */ addu $v0, $v0, $s7 /* CF9D4 801392D4 44826000 */ mtc1 $v0, $f12 -/* CF9D8 801392D8 00000000 */ nop +/* CF9D8 801392D8 00000000 */ nop /* CF9DC 801392DC 0C00A8BB */ jal sin_deg /* CF9E0 801392E0 46806320 */ cvt.s.w $f12, $f12 /* CF9E4 801392E4 3C018015 */ lui $at, %hi(D_80150F98) @@ -303,7 +303,7 @@ glabel func_80138E54 /* CF9EC 801392EC 46000021 */ cvt.d.s $f0, $f0 .L801392F0: /* CF9F0 801392F0 46220002 */ mul.d $f0, $f0, $f2 -/* CF9F4 801392F4 00000000 */ nop +/* CF9F4 801392F4 00000000 */ nop /* CF9F8 801392F8 4620D001 */ sub.d $f0, $f26, $f0 /* CF9FC 801392FC 44801000 */ mtc1 $zero, $f2 /* CFA00 80139300 2A020100 */ slti $v0, $s0, 0x100 @@ -698,14 +698,14 @@ glabel func_80138E54 /* D0000 80139900 AD23002C */ sw $v1, 0x2c($t1) /* D0004 80139904 3C013F00 */ lui $at, 0x3f00 /* D0008 80139908 44810000 */ mtc1 $at, $f0 -/* D000C 8013990C 00000000 */ nop +/* D000C 8013990C 00000000 */ nop /* D0010 80139910 4600C602 */ mul.s $f24, $f24, $f0 -/* D0014 80139914 00000000 */ nop +/* D0014 80139914 00000000 */ nop /* D0018 80139918 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* D001C 8013991C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* D0020 80139920 8C620000 */ lw $v0, ($v1) /* D0024 80139924 4600C002 */ mul.s $f0, $f24, $f0 -/* D0028 80139928 00000000 */ nop +/* D0028 80139928 00000000 */ nop /* D002C 8013992C 3C01437F */ lui $at, 0x437f /* D0030 80139930 44811000 */ mtc1 $at, $f2 /* D0034 80139934 3C014F00 */ lui $at, 0x4f00 @@ -713,25 +713,25 @@ glabel func_80138E54 /* D003C 8013993C 0040202D */ daddu $a0, $v0, $zero /* D0040 80139940 24420008 */ addiu $v0, $v0, 8 /* D0044 80139944 461E0002 */ mul.s $f0, $f0, $f30 -/* D0048 80139948 00000000 */ nop +/* D0048 80139948 00000000 */ nop /* D004C 8013994C AC620000 */ sw $v0, ($v1) /* D0050 80139950 3C02FA00 */ lui $v0, 0xfa00 /* D0054 80139954 AC820000 */ sw $v0, ($a0) /* D0058 80139958 46020003 */ div.s $f0, $f0, $f2 /* D005C 8013995C 4600203E */ c.le.s $f4, $f0 -/* D0060 80139960 00000000 */ nop +/* D0060 80139960 00000000 */ nop /* D0064 80139964 45010005 */ bc1t .L8013997C /* D0068 80139968 24840004 */ addiu $a0, $a0, 4 /* D006C 8013996C 4600028D */ trunc.w.s $f10, $f0 /* D0070 80139970 44065000 */ mfc1 $a2, $f10 /* D0074 80139974 0804E665 */ j .L80139994 -/* D0078 80139978 00000000 */ nop +/* D0078 80139978 00000000 */ nop .L8013997C: /* D007C 8013997C 46040001 */ sub.s $f0, $f0, $f4 /* D0080 80139980 3C028000 */ lui $v0, 0x8000 /* D0084 80139984 4600028D */ trunc.w.s $f10, $f0 /* D0088 80139988 44065000 */ mfc1 $a2, $f10 -/* D008C 8013998C 00000000 */ nop +/* D008C 8013998C 00000000 */ nop /* D0090 80139990 00C23025 */ or $a2, $a2, $v0 .L80139994: /* D0094 80139994 3C05800A */ lui $a1, %hi(gMasterGfxPos) @@ -740,7 +740,7 @@ glabel func_80138E54 /* D00A0 801399A0 44810000 */ mtc1 $at, $f0 /* D00A4 801399A4 8CA30000 */ lw $v1, ($a1) /* D00A8 801399A8 4600C002 */ mul.s $f0, $f24, $f0 -/* D00AC 801399AC 00000000 */ nop +/* D00AC 801399AC 00000000 */ nop /* D00B0 801399B0 3C01437F */ lui $at, 0x437f /* D00B4 801399B4 44811000 */ mtc1 $at, $f2 /* D00B8 801399B8 30C200FF */ andi $v0, $a2, 0xff @@ -751,13 +751,13 @@ glabel func_80138E54 /* D00CC 801399CC 44812000 */ mtc1 $at, $f4 /* D00D0 801399D0 0060202D */ daddu $a0, $v1, $zero /* D00D4 801399D4 461E0002 */ mul.s $f0, $f0, $f30 -/* D00D8 801399D8 00000000 */ nop +/* D00D8 801399D8 00000000 */ nop /* D00DC 801399DC 24630008 */ addiu $v1, $v1, 8 /* D00E0 801399E0 ACA30000 */ sw $v1, ($a1) /* D00E4 801399E4 AC820000 */ sw $v0, ($a0) /* D00E8 801399E8 46020003 */ div.s $f0, $f0, $f2 /* D00EC 801399EC 4600203E */ c.le.s $f4, $f0 -/* D00F0 801399F0 00000000 */ nop +/* D00F0 801399F0 00000000 */ nop /* D00F4 801399F4 45010005 */ bc1t .L80139A0C /* D00F8 801399F8 24840004 */ addiu $a0, $a0, 4 /* D00FC 801399FC 4600028D */ trunc.w.s $f10, $f0 @@ -769,7 +769,7 @@ glabel func_80138E54 /* D0110 80139A10 3C028000 */ lui $v0, 0x8000 /* D0114 80139A14 4600028D */ trunc.w.s $f10, $f0 /* D0118 80139A18 44035000 */ mfc1 $v1, $f10 -/* D011C 80139A1C 00000000 */ nop +/* D011C 80139A1C 00000000 */ nop /* D0120 80139A20 00621825 */ or $v1, $v1, $v0 /* D0124 80139A24 2402FF00 */ addiu $v0, $zero, -0x100 .L80139A28: @@ -777,7 +777,7 @@ glabel func_80138E54 /* D012C 80139A2C AC820000 */ sw $v0, ($a0) /* D0130 80139A30 8FAD0088 */ lw $t5, 0x88($sp) /* D0134 80139A34 15A00091 */ bnez $t5, .L80139C7C -/* D0138 80139A38 00000000 */ nop +/* D0138 80139A38 00000000 */ nop /* D013C 80139A3C 3C06800A */ lui $a2, %hi(gMasterGfxPos) /* D0140 80139A40 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* D0144 80139A44 8CC50000 */ lw $a1, ($a2) @@ -810,11 +810,11 @@ glabel func_80138E54 /* D01B0 80139AB0 30630FFF */ andi $v1, $v1, 0xfff /* D01B4 80139AB4 004D1023 */ subu $v0, $v0, $t5 /* D01B8 80139AB8 44820000 */ mtc1 $v0, $f0 -/* D01BC 80139ABC 00000000 */ nop +/* D01BC 80139ABC 00000000 */ nop /* D01C0 80139AC0 46800020 */ cvt.s.w $f0, $f0 /* D01C4 80139AC4 00031B00 */ sll $v1, $v1, 0xc /* D01C8 80139AC8 46020002 */ mul.s $f0, $f0, $f2 -/* D01CC 80139ACC 00000000 */ nop +/* D01CC 80139ACC 00000000 */ nop /* D01D0 80139AD0 87C20010 */ lh $v0, 0x10($fp) /* D01D4 80139AD4 3C014180 */ lui $at, 0x4180 /* D01D8 80139AD8 44811000 */ mtc1 $at, $f2 @@ -832,7 +832,7 @@ glabel func_80138E54 /* D0208 80139B08 44811000 */ mtc1 $at, $f2 /* D020C 80139B0C 24A70004 */ addiu $a3, $a1, 4 /* D0210 80139B10 4600103E */ c.le.s $f2, $f0 -/* D0214 80139B14 00000000 */ nop +/* D0214 80139B14 00000000 */ nop /* D0218 80139B18 45010005 */ bc1t .L80139B30 /* D021C 80139B1C ACA20000 */ sw $v0, ($a1) /* D0220 80139B20 4600028D */ trunc.w.s $f10, $f0 @@ -844,7 +844,7 @@ glabel func_80138E54 /* D0234 80139B34 3C028000 */ lui $v0, 0x8000 /* D0238 80139B38 4600028D */ trunc.w.s $f10, $f0 /* D023C 80139B3C 44035000 */ mfc1 $v1, $f10 -/* D0240 80139B40 00000000 */ nop +/* D0240 80139B40 00000000 */ nop /* D0244 80139B44 00621825 */ or $v1, $v1, $v0 /* D0248 80139B48 24020013 */ addiu $v0, $zero, 0x13 .L80139B4C: @@ -853,35 +853,35 @@ glabel func_80138E54 /* D0254 80139B54 44811000 */ mtc1 $at, $f2 /* D0258 80139B58 004D1023 */ subu $v0, $v0, $t5 /* D025C 80139B5C 44820000 */ mtc1 $v0, $f0 -/* D0260 80139B60 00000000 */ nop +/* D0260 80139B60 00000000 */ nop /* D0264 80139B64 46800020 */ cvt.s.w $f0, $f0 /* D0268 80139B68 46020002 */ mul.s $f0, $f0, $f2 -/* D026C 80139B6C 00000000 */ nop +/* D026C 80139B6C 00000000 */ nop /* D0270 80139B70 3C014180 */ lui $at, 0x4180 /* D0274 80139B74 44811000 */ mtc1 $at, $f2 /* D0278 80139B78 46160003 */ div.s $f0, $f0, $f22 /* D027C 80139B7C 46020000 */ add.s $f0, $f0, $f2 /* D0280 80139B80 3C014480 */ lui $at, 0x4480 /* D0284 80139B84 44811000 */ mtc1 $at, $f2 -/* D0288 80139B88 00000000 */ nop +/* D0288 80139B88 00000000 */ nop /* D028C 80139B8C 46020000 */ add.s $f0, $f0, $f2 /* D0290 80139B90 3C014F00 */ lui $at, 0x4f00 /* D0294 80139B94 44811000 */ mtc1 $at, $f2 -/* D0298 80139B98 00000000 */ nop +/* D0298 80139B98 00000000 */ nop /* D029C 80139B9C 4600103E */ c.le.s $f2, $f0 -/* D02A0 80139BA0 00000000 */ nop +/* D02A0 80139BA0 00000000 */ nop /* D02A4 80139BA4 45010005 */ bc1t .L80139BBC /* D02A8 80139BA8 00033400 */ sll $a2, $v1, 0x10 /* D02AC 80139BAC 4600028D */ trunc.w.s $f10, $f0 /* D02B0 80139BB0 44045000 */ mfc1 $a0, $f10 /* D02B4 80139BB4 0804E6F5 */ j .L80139BD4 -/* D02B8 80139BB8 00000000 */ nop +/* D02B8 80139BB8 00000000 */ nop .L80139BBC: /* D02BC 80139BBC 46020001 */ sub.s $f0, $f0, $f2 /* D02C0 80139BC0 3C028000 */ lui $v0, 0x8000 /* D02C4 80139BC4 4600028D */ trunc.w.s $f10, $f0 /* D02C8 80139BC8 44045000 */ mfc1 $a0, $f10 -/* D02CC 80139BCC 00000000 */ nop +/* D02CC 80139BCC 00000000 */ nop /* D02D0 80139BD0 00822025 */ or $a0, $a0, $v0 .L80139BD4: /* D02D4 80139BD4 3C05800A */ lui $a1, %hi(gMasterGfxPos) @@ -901,7 +901,7 @@ glabel func_80138E54 /* D030C 80139C0C ACA30000 */ sw $v1, ($a1) /* D0310 80139C10 AC820000 */ sw $v0, ($a0) /* D0314 80139C14 4600103E */ c.le.s $f2, $f0 -/* D0318 80139C18 00000000 */ nop +/* D0318 80139C18 00000000 */ nop /* D031C 80139C1C 45010005 */ bc1t .L80139C34 /* D0320 80139C20 24840004 */ addiu $a0, $a0, 4 /* D0324 80139C24 4600028D */ trunc.w.s $f10, $f0 @@ -913,7 +913,7 @@ glabel func_80138E54 /* D0338 80139C38 3C028000 */ lui $v0, 0x8000 /* D033C 80139C3C 4600028D */ trunc.w.s $f10, $f0 /* D0340 80139C40 44035000 */ mfc1 $v1, $f10 -/* D0344 80139C44 00000000 */ nop +/* D0344 80139C44 00000000 */ nop /* D0348 80139C48 00621825 */ or $v1, $v1, $v0 /* D034C 80139C4C 00032C00 */ sll $a1, $v1, 0x10 .L80139C50: @@ -923,9 +923,9 @@ glabel func_80138E54 /* D035C 80139C5C 44811000 */ mtc1 $at, $f2 /* D0360 80139C60 46160003 */ div.s $f0, $f0, $f22 /* D0364 80139C64 4600103E */ c.le.s $f2, $f0 -/* D0368 80139C68 00000000 */ nop +/* D0368 80139C68 00000000 */ nop /* D036C 80139C6C 4500008A */ bc1f .L80139E98 -/* D0370 80139C70 00000000 */ nop +/* D0370 80139C70 00000000 */ nop /* D0374 80139C74 0804E7AA */ j .L80139EA8 /* D0378 80139C78 46020001 */ sub.s $f0, $f0, $f2 .L80139C7C: @@ -964,11 +964,11 @@ glabel func_80138E54 /* D03FC 80139CFC 00042080 */ sll $a0, $a0, 2 /* D0400 80139D00 004D1023 */ subu $v0, $v0, $t5 /* D0404 80139D04 44820000 */ mtc1 $v0, $f0 -/* D0408 80139D08 00000000 */ nop +/* D0408 80139D08 00000000 */ nop /* D040C 80139D0C 46800020 */ cvt.s.w $f0, $f0 /* D0410 80139D10 30840FFF */ andi $a0, $a0, 0xfff /* D0414 80139D14 46020002 */ mul.s $f0, $f0, $f2 -/* D0418 80139D18 00000000 */ nop +/* D0418 80139D18 00000000 */ nop /* D041C 80139D1C 00641825 */ or $v1, $v1, $a0 /* D0420 80139D20 3C014480 */ lui $at, 0x4480 /* D0424 80139D24 44811000 */ mtc1 $at, $f2 @@ -980,7 +980,7 @@ glabel func_80138E54 /* D043C 80139D3C 44811000 */ mtc1 $at, $f2 /* D0440 80139D40 24A70004 */ addiu $a3, $a1, 4 /* D0444 80139D44 4600103E */ c.le.s $f2, $f0 -/* D0448 80139D48 00000000 */ nop +/* D0448 80139D48 00000000 */ nop /* D044C 80139D4C 45010005 */ bc1t .L80139D64 /* D0450 80139D50 ACA20000 */ sw $v0, ($a1) /* D0454 80139D54 4600028D */ trunc.w.s $f10, $f0 @@ -992,7 +992,7 @@ glabel func_80138E54 /* D0468 80139D68 3C028000 */ lui $v0, 0x8000 /* D046C 80139D6C 4600028D */ trunc.w.s $f10, $f0 /* D0470 80139D70 44035000 */ mfc1 $v1, $f10 -/* D0474 80139D74 00000000 */ nop +/* D0474 80139D74 00000000 */ nop /* D0478 80139D78 00621825 */ or $v1, $v1, $v0 /* D047C 80139D7C 24020020 */ addiu $v0, $zero, 0x20 .L80139D80: @@ -1001,31 +1001,31 @@ glabel func_80138E54 /* D0488 80139D88 44811000 */ mtc1 $at, $f2 /* D048C 80139D8C 004D1023 */ subu $v0, $v0, $t5 /* D0490 80139D90 44820000 */ mtc1 $v0, $f0 -/* D0494 80139D94 00000000 */ nop +/* D0494 80139D94 00000000 */ nop /* D0498 80139D98 46800020 */ cvt.s.w $f0, $f0 /* D049C 80139D9C 46020002 */ mul.s $f0, $f0, $f2 -/* D04A0 80139DA0 00000000 */ nop +/* D04A0 80139DA0 00000000 */ nop /* D04A4 80139DA4 3C014480 */ lui $at, 0x4480 /* D04A8 80139DA8 44811000 */ mtc1 $at, $f2 /* D04AC 80139DAC 46160003 */ div.s $f0, $f0, $f22 /* D04B0 80139DB0 46020000 */ add.s $f0, $f0, $f2 /* D04B4 80139DB4 3C014F00 */ lui $at, 0x4f00 /* D04B8 80139DB8 44811000 */ mtc1 $at, $f2 -/* D04BC 80139DBC 00000000 */ nop +/* D04BC 80139DBC 00000000 */ nop /* D04C0 80139DC0 4600103E */ c.le.s $f2, $f0 -/* D04C4 80139DC4 00000000 */ nop +/* D04C4 80139DC4 00000000 */ nop /* D04C8 80139DC8 45010005 */ bc1t .L80139DE0 /* D04CC 80139DCC 00033400 */ sll $a2, $v1, 0x10 /* D04D0 80139DD0 4600028D */ trunc.w.s $f10, $f0 /* D04D4 80139DD4 44045000 */ mfc1 $a0, $f10 /* D04D8 80139DD8 0804E77E */ j .L80139DF8 -/* D04DC 80139DDC 00000000 */ nop +/* D04DC 80139DDC 00000000 */ nop .L80139DE0: /* D04E0 80139DE0 46020001 */ sub.s $f0, $f0, $f2 /* D04E4 80139DE4 3C028000 */ lui $v0, 0x8000 /* D04E8 80139DE8 4600028D */ trunc.w.s $f10, $f0 /* D04EC 80139DEC 44045000 */ mfc1 $a0, $f10 -/* D04F0 80139DF0 00000000 */ nop +/* D04F0 80139DF0 00000000 */ nop /* D04F4 80139DF4 00822025 */ or $a0, $a0, $v0 .L80139DF8: /* D04F8 80139DF8 3C05800A */ lui $a1, %hi(gMasterGfxPos) @@ -1045,7 +1045,7 @@ glabel func_80138E54 /* D0530 80139E30 ACA30000 */ sw $v1, ($a1) /* D0534 80139E34 AC820000 */ sw $v0, ($a0) /* D0538 80139E38 4600103E */ c.le.s $f2, $f0 -/* D053C 80139E3C 00000000 */ nop +/* D053C 80139E3C 00000000 */ nop /* D0540 80139E40 45010005 */ bc1t .L80139E58 /* D0544 80139E44 24840004 */ addiu $a0, $a0, 4 /* D0548 80139E48 4600028D */ trunc.w.s $f10, $f0 @@ -1057,7 +1057,7 @@ glabel func_80138E54 /* D055C 80139E5C 3C028000 */ lui $v0, 0x8000 /* D0560 80139E60 4600028D */ trunc.w.s $f10, $f0 /* D0564 80139E64 44035000 */ mfc1 $v1, $f10 -/* D0568 80139E68 00000000 */ nop +/* D0568 80139E68 00000000 */ nop /* D056C 80139E6C 00621825 */ or $v1, $v1, $v0 /* D0570 80139E70 00032C00 */ sll $a1, $v1, 0x10 .L80139E74: @@ -1067,7 +1067,7 @@ glabel func_80138E54 /* D0580 80139E80 44811000 */ mtc1 $at, $f2 /* D0584 80139E84 46160003 */ div.s $f0, $f0, $f22 /* D0588 80139E88 4600103E */ c.le.s $f2, $f0 -/* D058C 80139E8C 00000000 */ nop +/* D058C 80139E8C 00000000 */ nop /* D0590 80139E90 45030005 */ bc1tl .L80139EA8 /* D0594 80139E94 46020001 */ sub.s $f0, $f0, $f2 .L80139E98: @@ -1079,7 +1079,7 @@ glabel func_80138E54 /* D05A8 80139EA8 3C028000 */ lui $v0, 0x8000 /* D05AC 80139EAC 4600028D */ trunc.w.s $f10, $f0 /* D05B0 80139EB0 44035000 */ mfc1 $v1, $f10 -/* D05B4 80139EB4 00000000 */ nop +/* D05B4 80139EB4 00000000 */ nop /* D05B8 80139EB8 00621825 */ or $v1, $v1, $v0 /* D05BC 80139EBC 3062FFFF */ andi $v0, $v1, 0xffff .L80139EC0: diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80139F10.s b/asm/nonmatchings/code_cd180_len_38f0/func_80139F10.s index 864ee1fc8d..68a4e9d9c8 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80139F10.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80139F10.s @@ -35,26 +35,26 @@ glabel func_80139F10 /* D0684 80139F84 0120702D */ daddu $t6, $t1, $zero .L80139F88: /* D0688 80139F88 44800000 */ mtc1 $zero, $f0 -/* D068C 80139F8C 00000000 */ nop +/* D068C 80139F8C 00000000 */ nop /* D0690 80139F90 46004032 */ c.eq.s $f8, $f0 -/* D0694 80139F94 00000000 */ nop +/* D0694 80139F94 00000000 */ nop /* D0698 80139F98 450100F0 */ bc1t .L8013A35C /* D069C 80139F9C 3C04ED00 */ lui $a0, 0xed00 /* D06A0 80139FA0 3C014080 */ lui $at, 0x4080 /* D06A4 80139FA4 44812000 */ mtc1 $at, $f4 /* D06A8 80139FA8 44891000 */ mtc1 $t1, $f2 -/* D06AC 80139FAC 00000000 */ nop +/* D06AC 80139FAC 00000000 */ nop /* D06B0 80139FB0 468010A0 */ cvt.s.w $f2, $f2 /* D06B4 80139FB4 46041082 */ mul.s $f2, $f2, $f4 -/* D06B8 80139FB8 00000000 */ nop +/* D06B8 80139FB8 00000000 */ nop /* D06BC 80139FBC 3C08800A */ lui $t0, %hi(gMasterGfxPos) /* D06C0 80139FC0 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* D06C4 80139FC4 448A0000 */ mtc1 $t2, $f0 -/* D06C8 80139FC8 00000000 */ nop +/* D06C8 80139FC8 00000000 */ nop /* D06CC 80139FCC 46800020 */ cvt.s.w $f0, $f0 /* D06D0 80139FD0 8D060000 */ lw $a2, ($t0) /* D06D4 80139FD4 46040002 */ mul.s $f0, $f0, $f4 -/* D06D8 80139FD8 00000000 */ nop +/* D06D8 80139FD8 00000000 */ nop /* D06DC 80139FDC 3C01437F */ lui $at, 0x437f /* D06E0 80139FE0 44813000 */ mtc1 $at, $f6 /* D06E4 80139FE4 00C0282D */ daddu $a1, $a2, $zero @@ -63,33 +63,33 @@ glabel func_80139F10 /* D06F0 80139FF0 46064032 */ c.eq.s $f8, $f6 /* D06F4 80139FF4 4600128D */ trunc.w.s $f10, $f2 /* D06F8 80139FF8 44025000 */ mfc1 $v0, $f10 -/* D06FC 80139FFC 00000000 */ nop +/* D06FC 80139FFC 00000000 */ nop /* D0700 8013A000 30420FFF */ andi $v0, $v0, 0xfff /* D0704 8013A004 00021300 */ sll $v0, $v0, 0xc /* D0708 8013A008 4600028D */ trunc.w.s $f10, $f0 /* D070C 8013A00C 44035000 */ mfc1 $v1, $f10 /* D0710 8013A010 448B1000 */ mtc1 $t3, $f2 -/* D0714 8013A014 00000000 */ nop +/* D0714 8013A014 00000000 */ nop /* D0718 8013A018 468010A0 */ cvt.s.w $f2, $f2 /* D071C 8013A01C 46041082 */ mul.s $f2, $f2, $f4 -/* D0720 8013A020 00000000 */ nop +/* D0720 8013A020 00000000 */ nop /* D0724 8013A024 30630FFF */ andi $v1, $v1, 0xfff /* D0728 8013A028 00641825 */ or $v1, $v1, $a0 /* D072C 8013A02C 00431025 */ or $v0, $v0, $v1 /* D0730 8013A030 448C0000 */ mtc1 $t4, $f0 -/* D0734 8013A034 00000000 */ nop +/* D0734 8013A034 00000000 */ nop /* D0738 8013A038 46800020 */ cvt.s.w $f0, $f0 /* D073C 8013A03C 46040002 */ mul.s $f0, $f0, $f4 -/* D0740 8013A040 00000000 */ nop +/* D0740 8013A040 00000000 */ nop /* D0744 8013A044 ACA20000 */ sw $v0, ($a1) /* D0748 8013A048 4600128D */ trunc.w.s $f10, $f2 /* D074C 8013A04C 44025000 */ mfc1 $v0, $f10 -/* D0750 8013A050 00000000 */ nop +/* D0750 8013A050 00000000 */ nop /* D0754 8013A054 30420FFF */ andi $v0, $v0, 0xfff /* D0758 8013A058 00021300 */ sll $v0, $v0, 0xc /* D075C 8013A05C 4600028D */ trunc.w.s $f10, $f0 /* D0760 8013A060 44035000 */ mfc1 $v1, $f10 -/* D0764 8013A064 00000000 */ nop +/* D0764 8013A064 00000000 */ nop /* D0768 8013A068 30630FFF */ andi $v1, $v1, 0xfff /* D076C 8013A06C 00431025 */ or $v0, $v0, $v1 /* D0770 8013A070 45000009 */ bc1f .L8013A098 @@ -122,7 +122,7 @@ glabel func_80139F10 /* D07D8 8013A0D8 00621825 */ or $v1, $v1, $v0 /* D07DC 8013A0DC 8FA20014 */ lw $v0, 0x14($sp) /* D07E0 8013A0E0 46020002 */ mul.s $f0, $f0, $f2 -/* D07E4 8013A0E4 00000000 */ nop +/* D07E4 8013A0E4 00000000 */ nop /* D07E8 8013A0E8 304200FF */ andi $v0, $v0, 0xff /* D07EC 8013A0EC 00021200 */ sll $v0, $v0, 8 /* D07F0 8013A0F0 00621825 */ or $v1, $v1, $v0 @@ -153,10 +153,10 @@ glabel func_80139F10 /* D0854 8013A154 46220000 */ add.d $f0, $f0, $f2 /* D0858 8013A158 01AF2023 */ subu $a0, $t5, $t7 /* D085C 8013A15C 44841000 */ mtc1 $a0, $f2 -/* D0860 8013A160 00000000 */ nop +/* D0860 8013A160 00000000 */ nop /* D0864 8013A164 468010A0 */ cvt.s.w $f2, $f2 /* D0868 8013A168 46041082 */ mul.s $f2, $f2, $f4 -/* D086C 8013A16C 00000000 */ nop +/* D086C 8013A16C 00000000 */ nop /* D0870 8013A170 00431025 */ or $v0, $v0, $v1 /* D0874 8013A174 ACA20004 */ sw $v0, 4($a1) /* D0878 8013A178 46200120 */ cvt.s.d $f4, $f0 @@ -173,7 +173,7 @@ glabel func_80139F10 /* D08A4 8013A1A4 44811000 */ mtc1 $at, $f2 /* D08A8 8013A1A8 3C02E100 */ lui $v0, 0xe100 /* D08AC 8013A1AC 4600103E */ c.le.s $f2, $f0 -/* D08B0 8013A1B0 00000000 */ nop +/* D08B0 8013A1B0 00000000 */ nop /* D08B4 8013A1B4 45010005 */ bc1t .L8013A1CC /* D08B8 8013A1B8 ACA20008 */ sw $v0, 8($a1) /* D08BC 8013A1BC 4600028D */ trunc.w.s $f10, $f0 @@ -185,42 +185,42 @@ glabel func_80139F10 /* D08D0 8013A1D0 3C028000 */ lui $v0, 0x8000 /* D08D4 8013A1D4 4600028D */ trunc.w.s $f10, $f0 /* D08D8 8013A1D8 44035000 */ mfc1 $v1, $f10 -/* D08DC 8013A1DC 00000000 */ nop +/* D08DC 8013A1DC 00000000 */ nop /* D08E0 8013A1E0 00621825 */ or $v1, $v1, $v0 /* D08E4 8013A1E4 01D81023 */ subu $v0, $t6, $t8 .L8013A1E8: /* D08E8 8013A1E8 3C014200 */ lui $at, 0x4200 /* D08EC 8013A1EC 44811000 */ mtc1 $at, $f2 /* D08F0 8013A1F0 44820000 */ mtc1 $v0, $f0 -/* D08F4 8013A1F4 00000000 */ nop +/* D08F4 8013A1F4 00000000 */ nop /* D08F8 8013A1F8 46800020 */ cvt.s.w $f0, $f0 /* D08FC 8013A1FC 46020002 */ mul.s $f0, $f0, $f2 -/* D0900 8013A200 00000000 */ nop +/* D0900 8013A200 00000000 */ nop /* D0904 8013A204 3C014180 */ lui $at, 0x4180 /* D0908 8013A208 44811000 */ mtc1 $at, $f2 /* D090C 8013A20C 46040003 */ div.s $f0, $f0, $f4 /* D0910 8013A210 46020000 */ add.s $f0, $f0, $f2 /* D0914 8013A214 3C014480 */ lui $at, 0x4480 /* D0918 8013A218 44811000 */ mtc1 $at, $f2 -/* D091C 8013A21C 00000000 */ nop +/* D091C 8013A21C 00000000 */ nop /* D0920 8013A220 46020000 */ add.s $f0, $f0, $f2 /* D0924 8013A224 3C014F00 */ lui $at, 0x4f00 /* D0928 8013A228 44811000 */ mtc1 $at, $f2 -/* D092C 8013A22C 00000000 */ nop +/* D092C 8013A22C 00000000 */ nop /* D0930 8013A230 4600103E */ c.le.s $f2, $f0 -/* D0934 8013A234 00000000 */ nop +/* D0934 8013A234 00000000 */ nop /* D0938 8013A238 45010005 */ bc1t .L8013A250 /* D093C 8013A23C 00033400 */ sll $a2, $v1, 0x10 /* D0940 8013A240 4600028D */ trunc.w.s $f10, $f0 /* D0944 8013A244 44045000 */ mfc1 $a0, $f10 /* D0948 8013A248 0804E89A */ j .L8013A268 -/* D094C 8013A24C 00000000 */ nop +/* D094C 8013A24C 00000000 */ nop .L8013A250: /* D0950 8013A250 46020001 */ sub.s $f0, $f0, $f2 /* D0954 8013A254 3C028000 */ lui $v0, 0x8000 /* D0958 8013A258 4600028D */ trunc.w.s $f10, $f0 /* D095C 8013A25C 44045000 */ mfc1 $a0, $f10 -/* D0960 8013A260 00000000 */ nop +/* D0960 8013A260 00000000 */ nop /* D0964 8013A264 00822025 */ or $a0, $a0, $v0 .L8013A268: /* D0968 8013A268 3C05800A */ lui $a1, %hi(gMasterGfxPos) @@ -240,7 +240,7 @@ glabel func_80139F10 /* D09A0 8013A2A0 ACA30000 */ sw $v1, ($a1) /* D09A4 8013A2A4 AC820000 */ sw $v0, ($a0) /* D09A8 8013A2A8 4600103E */ c.le.s $f2, $f0 -/* D09AC 8013A2AC 00000000 */ nop +/* D09AC 8013A2AC 00000000 */ nop /* D09B0 8013A2B0 45010005 */ bc1t .L8013A2C8 /* D09B4 8013A2B4 24840004 */ addiu $a0, $a0, 4 /* D09B8 8013A2B8 4600028D */ trunc.w.s $f10, $f0 @@ -252,7 +252,7 @@ glabel func_80139F10 /* D09CC 8013A2CC 3C028000 */ lui $v0, 0x8000 /* D09D0 8013A2D0 4600028D */ trunc.w.s $f10, $f0 /* D09D4 8013A2D4 44035000 */ mfc1 $v1, $f10 -/* D09D8 8013A2D8 00000000 */ nop +/* D09D8 8013A2D8 00000000 */ nop /* D09DC 8013A2DC 00621825 */ or $v1, $v1, $v0 /* D09E0 8013A2E0 00033C00 */ sll $a3, $v1, 0x10 .L8013A2E4: @@ -262,18 +262,18 @@ glabel func_80139F10 /* D09F0 8013A2F0 44811000 */ mtc1 $at, $f2 /* D09F4 8013A2F4 46040003 */ div.s $f0, $f0, $f4 /* D09F8 8013A2F8 4600103E */ c.le.s $f2, $f0 -/* D09FC 8013A2FC 00000000 */ nop +/* D09FC 8013A2FC 00000000 */ nop /* D0A00 8013A300 45030005 */ bc1tl .L8013A318 /* D0A04 8013A304 46020001 */ sub.s $f0, $f0, $f2 /* D0A08 8013A308 4600028D */ trunc.w.s $f10, $f0 /* D0A0C 8013A30C 44065000 */ mfc1 $a2, $f10 /* D0A10 8013A310 0804E8CB */ j .L8013A32C -/* D0A14 8013A314 00000000 */ nop +/* D0A14 8013A314 00000000 */ nop .L8013A318: /* D0A18 8013A318 3C028000 */ lui $v0, 0x8000 /* D0A1C 8013A31C 4600028D */ trunc.w.s $f10, $f0 /* D0A20 8013A320 44065000 */ mfc1 $a2, $f10 -/* D0A24 8013A324 00000000 */ nop +/* D0A24 8013A324 00000000 */ nop /* D0A28 8013A328 00C23025 */ or $a2, $a2, $v0 .L8013A32C: /* D0A2C 8013A32C 3C05800A */ lui $a1, %hi(gMasterGfxPos) @@ -290,7 +290,7 @@ glabel func_80139F10 /* D0A58 8013A358 AC800004 */ sw $zero, 4($a0) .L8013A35C: /* D0A5C 8013A35C 03E00008 */ jr $ra -/* D0A60 8013A360 00000000 */ nop -/* D0A64 8013A364 00000000 */ nop -/* D0A68 8013A368 00000000 */ nop -/* D0A6C 8013A36C 00000000 */ nop +/* D0A60 8013A360 00000000 */ nop +/* D0A64 8013A364 00000000 */ nop +/* D0A68 8013A368 00000000 */ nop +/* D0A6C 8013A36C 00000000 */ nop diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AA9C.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AA9C.s index 425a21a514..2c52a7e27e 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AA9C.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AA9C.s @@ -25,11 +25,12 @@ glabel func_8013AA9C /* D11EC 8013AAEC 2CA20012 */ sltiu $v0, $a1, 0x12 /* D11F0 8013AAF0 10400048 */ beqz $v0, .L8013AC14 /* D11F4 8013AAF4 00051080 */ sll $v0, $a1, 2 -/* D11F8 8013AAF8 3C018015 */ lui $at, %hi(D_80150FB0) +/* D11F8 8013AAF8 3C018015 */ lui $at, %hi(jtbl_80150FB0_E76B0) /* D11FC 8013AAFC 00220821 */ addu $at, $at, $v0 -/* D1200 8013AB00 8C220FB0 */ lw $v0, %lo(D_80150FB0)($at) +/* D1200 8013AB00 8C220FB0 */ lw $v0, %lo(jtbl_80150FB0_E76B0)($at) /* D1204 8013AB04 00400008 */ jr $v0 /* D1208 8013AB08 00000000 */ nop +glabel L8013AB0C_D120C /* D120C 8013AB0C 8E300014 */ lw $s0, 0x14($s1) /* D1210 8013AB10 0C04EA4F */ jal func_8013A93C /* D1214 8013AB14 0220202D */ daddu $a0, $s1, $zero @@ -51,16 +52,19 @@ glabel func_8013AA9C .L8013AB54: /* D1254 8013AB54 0804EBC2 */ j .L8013AF08 /* D1258 8013AB58 AE220014 */ sw $v0, 0x14($s1) +glabel L8013AB5C_D125C /* D125C 8013AB5C 2402FFFF */ addiu $v0, $zero, -1 /* D1260 8013AB60 A2200005 */ sb $zero, 5($s1) /* D1264 8013AB64 A2200002 */ sb $zero, 2($s1) /* D1268 8013AB68 0804EBC2 */ j .L8013AF08 /* D126C 8013AB6C AE22001C */ sw $v0, 0x1c($s1) +glabel L8013AB70_D1270 /* D1270 8013AB70 2402FFFF */ addiu $v0, $zero, -1 /* D1274 8013AB74 A2200006 */ sb $zero, 6($s1) /* D1278 8013AB78 A2200001 */ sb $zero, 1($s1) /* D127C 8013AB7C 0804EBC2 */ j .L8013AF08 /* D1280 8013AB80 AE22002C */ sw $v0, 0x2c($s1) +glabel L8013AB84_D1284 /* D1284 8013AB84 8E24005C */ lw $a0, 0x5c($s1) /* D1288 8013AB88 10800004 */ beqz $a0, .L8013AB9C /* D128C 8013AB8C 00101080 */ sll $v0, $s0, 2 @@ -73,6 +77,7 @@ glabel func_8013AA9C /* D12A4 8013ABA4 3044FFFF */ andi $a0, $v0, 0xffff /* D12A8 8013ABA8 0804EBC2 */ j .L8013AF08 /* D12AC 8013ABAC AE22005C */ sw $v0, 0x5c($s1) +glabel L8013ABB0_D12B0 /* D12B0 8013ABB0 82220006 */ lb $v0, 6($s1) /* D12B4 8013ABB4 14A20021 */ bne $a1, $v0, .L8013AC3C /* D12B8 8013ABB8 24030005 */ addiu $v1, $zero, 5 @@ -84,6 +89,7 @@ glabel func_8013AA9C /* D12D0 8013ABD0 00000000 */ nop /* D12D4 8013ABD4 0804EB0F */ j .L8013AC3C /* D12D8 8013ABD8 00000000 */ nop +glabel L8013ABDC_D12DC /* D12DC 8013ABDC 82220005 */ lb $v0, 5($s1) /* D12E0 8013ABE0 14450016 */ bne $v0, $a1, .L8013AC3C /* D12E4 8013ABE4 24030005 */ addiu $v1, $zero, 5 @@ -99,6 +105,7 @@ glabel func_8013AA9C /* D130C 8013AC0C 0804EB0F */ j .L8013AC3C /* D1310 8013AC10 00000000 */ nop .L8013AC14: +glabel L8013AC14_D1314 /* D1314 8013AC14 2403000D */ addiu $v1, $zero, 0xd /* D1318 8013AC18 50A30008 */ beql $a1, $v1, .L8013AC3C /* D131C 8013AC1C 24030005 */ addiu $v1, $zero, 5 @@ -149,14 +156,16 @@ glabel func_8013AA9C /* D13B8 8013ACB8 10400093 */ beqz $v0, .L8013AF08 /* D13BC 8013ACBC A2200001 */ sb $zero, 1($s1) /* D13C0 8013ACC0 00051080 */ sll $v0, $a1, 2 -/* D13C4 8013ACC4 3C018015 */ lui $at, %hi(D_80150FF8) +/* D13C4 8013ACC4 3C018015 */ lui $at, %hi(jtbl_80150FF8_E76F8) /* D13C8 8013ACC8 00220821 */ addu $at, $at, $v0 -/* D13CC 8013ACCC 8C220FF8 */ lw $v0, %lo(D_80150FF8)($at) +/* D13CC 8013ACCC 8C220FF8 */ lw $v0, %lo(jtbl_80150FF8_E76F8)($at) /* D13D0 8013ACD0 00400008 */ jr $v0 /* D13D4 8013ACD4 00000000 */ nop +glabel L8013ACD8_D13D8 /* D13D8 8013ACD8 A2200001 */ sb $zero, 1($s1) /* D13DC 8013ACDC 0804EBC2 */ j .L8013AF08 /* D13E0 8013ACE0 A2200002 */ sb $zero, 2($s1) +glabel L8013ACE4_D13E4 /* D13E4 8013ACE4 0220202D */ daddu $a0, $s1, $zero /* D13E8 8013ACE8 24020004 */ addiu $v0, $zero, 4 /* D13EC 8013ACEC A0820003 */ sb $v0, 3($a0) @@ -166,6 +175,7 @@ glabel func_8013AA9C /* D13FC 8013ACFC A0820001 */ sb $v0, 1($a0) /* D1400 8013AD00 0804EBC2 */ j .L8013AF08 /* D1404 8013AD04 00000000 */ nop +glabel L8013AD08_D1408 /* D1408 8013AD08 8E230014 */ lw $v1, 0x14($s1) /* D140C 8013AD0C 24020002 */ addiu $v0, $zero, 2 /* D1410 8013AD10 A2220001 */ sb $v0, 1($s1) @@ -176,6 +186,7 @@ glabel func_8013AA9C /* D1424 8013AD24 34630200 */ ori $v1, $v1, 0x200 /* D1428 8013AD28 0804EBC2 */ j .L8013AF08 /* D142C 8013AD2C AE230014 */ sw $v1, 0x14($s1) +glabel L8013AD30_D1430 /* D1430 8013AD30 2A0200FF */ slti $v0, $s0, 0xff /* D1434 8013AD34 1440000B */ bnez $v0, .L8013AD64 /* D1438 8013AD38 28C200FF */ slti $v0, $a2, 0xff @@ -210,6 +221,7 @@ glabel func_8013AA9C .L8013ADA4: /* D14A4 8013ADA4 0804EBC2 */ j .L8013AF08 /* D14A8 8013ADA8 A2220002 */ sb $v0, 2($s1) +glabel L8013ADAC_D14AC /* D14AC 8013ADAC 3C018015 */ lui $at, %hi(D_80151030) /* D14B0 8013ADB0 D4221030 */ ldc1 $f2, %lo(D_80151030)($at) /* D14B4 8013ADB4 44860000 */ mtc1 $a2, $f0 @@ -225,6 +237,7 @@ glabel func_8013AA9C /* D14D8 8013ADD8 24020005 */ addiu $v0, $zero, 5 /* D14DC 8013ADDC 0804EBC2 */ j .L8013AF08 /* D14E0 8013ADE0 A2220002 */ sb $v0, 2($s1) +glabel L8013ADE4_D14E4 /* D14E4 8013ADE4 96220060 */ lhu $v0, 0x60($s1) /* D14E8 8013ADE8 0202102A */ slt $v0, $s0, $v0 /* D14EC 8013ADEC 10400046 */ beqz $v0, .L8013AF08 @@ -255,6 +268,7 @@ glabel func_8013AA9C /* D154C 8013AE4C 24020008 */ addiu $v0, $zero, 8 /* D1550 8013AE50 0804EBC2 */ j .L8013AF08 /* D1554 8013AE54 A2220002 */ sb $v0, 2($s1) +glabel L8013AE58_D1558 /* D1558 8013AE58 96220060 */ lhu $v0, 0x60($s1) /* D155C 8013AE5C 0202102A */ slt $v0, $s0, $v0 /* D1560 8013AE60 10400029 */ beqz $v0, .L8013AF08 @@ -285,12 +299,15 @@ glabel func_8013AA9C /* D15C0 8013AEC0 2402000A */ addiu $v0, $zero, 0xa /* D15C4 8013AEC4 0804EBC2 */ j .L8013AF08 /* D15C8 8013AEC8 A2220002 */ sb $v0, 2($s1) +glabel L8013AECC_D15CC /* D15CC 8013AECC 2402000C */ addiu $v0, $zero, 0xc /* D15D0 8013AED0 0804EBC2 */ j .L8013AF08 /* D15D4 8013AED4 A2220002 */ sb $v0, 2($s1) +glabel L8013AED8_D15D8 /* D15D8 8013AED8 2402000D */ addiu $v0, $zero, 0xd /* D15DC 8013AEDC 0804EBC2 */ j .L8013AF08 /* D15E0 8013AEE0 A2220002 */ sb $v0, 2($s1) +glabel L8013AEE4_D15E4 /* D15E4 8013AEE4 24020004 */ addiu $v0, $zero, 4 /* D15E8 8013AEE8 A2220001 */ sb $v0, 1($s1) /* D15EC 8013AEEC 28E200FF */ slti $v0, $a3, 0xff diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B0EC.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B0EC.s index 7f97a8b893..7d9ae197d9 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B0EC.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B0EC.s @@ -10,11 +10,12 @@ glabel func_8013B0EC /* D1800 8013B100 2C620005 */ sltiu $v0, $v1, 5 /* D1804 8013B104 10400026 */ beqz $v0, .L8013B1A0 /* D1808 8013B108 00031080 */ sll $v0, $v1, 2 -/* D180C 8013B10C 3C018015 */ lui $at, %hi(D_80151038) +/* D180C 8013B10C 3C018015 */ lui $at, %hi(jtbl_80151038_E7738) /* D1810 8013B110 00220821 */ addu $at, $at, $v0 -/* D1814 8013B114 8C221038 */ lw $v0, %lo(D_80151038)($at) +/* D1814 8013B114 8C221038 */ lw $v0, %lo(jtbl_80151038_E7738)($at) /* D1818 8013B118 00400008 */ jr $v0 /* D181C 8013B11C 00000000 */ nop +glabel L8013B120_D1820 /* D1820 8013B120 8E020034 */ lw $v0, 0x34($s0) /* D1824 8013B124 14400004 */ bnez $v0, .L8013B138 /* D1828 8013B128 24020001 */ addiu $v0, $zero, 1 @@ -25,14 +26,17 @@ glabel func_8013B0EC /* D1838 8013B138 A2020003 */ sb $v0, 3($s0) .L8013B13C: /* D183C 8013B13C A2020004 */ sb $v0, 4($s0) +glabel L8013B140_D1840 /* D1840 8013B140 0C04F012 */ jal func_8013C048 /* D1844 8013B144 0200202D */ daddu $a0, $s0, $zero /* D1848 8013B148 0804EC5A */ j .L8013B168 /* D184C 8013B14C 00000000 */ nop +glabel L8013B150_D1850 /* D1850 8013B150 0C04F0FC */ jal func_8013C3F0 /* D1854 8013B154 0200202D */ daddu $a0, $s0, $zero /* D1858 8013B158 0804EC5A */ j .L8013B168 /* D185C 8013B15C 00000000 */ nop +glabel L8013B160_D1860 /* D1860 8013B160 0C04EF22 */ jal func_8013BC88 /* D1864 8013B164 0200202D */ daddu $a0, $s0, $zero .L8013B168: diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s index 901b8e41dd..2f99d5a7a2 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s @@ -105,17 +105,21 @@ glabel func_8013B1B0 /* D1A30 8013B330 2C62000C */ sltiu $v0, $v1, 0xc /* D1A34 8013B334 1040000B */ beqz $v0, .L8013B364 /* D1A38 8013B338 00031080 */ sll $v0, $v1, 2 -/* D1A3C 8013B33C 3C018015 */ lui $at, %hi(D_80151058) +/* D1A3C 8013B33C 3C018015 */ lui $at, %hi(jtbl_80151058_E7758) /* D1A40 8013B340 00220821 */ addu $at, $at, $v0 -/* D1A44 8013B344 8C221058 */ lw $v0, %lo(D_80151058)($at) +/* D1A44 8013B344 8C221058 */ lw $v0, %lo(jtbl_80151058_E7758)($at) /* D1A48 8013B348 00400008 */ jr $v0 /* D1A4C 8013B34C 00000000 */ nop +glabel L8013B350_D1A50 /* D1A50 8013B350 0804ECD9 */ j .L8013B364 /* D1A54 8013B354 240A0002 */ addiu $t2, $zero, 2 +glabel L8013B358_D1A58 /* D1A58 8013B358 0804ECD9 */ j .L8013B364 /* D1A5C 8013B35C 240A0003 */ addiu $t2, $zero, 3 +glabel L8013B360_D1A60 /* D1A60 8013B360 240A000A */ addiu $t2, $zero, 0xa .L8013B364: +glabel L8013B364_D1A64 /* D1A64 8013B364 3C070040 */ lui $a3, 0x40 /* D1A68 8013B368 C6400038 */ lwc1 $f0, 0x38($s2) /* D1A6C 8013B36C 46800020 */ cvt.s.w $f0, $f0 @@ -188,11 +192,12 @@ glabel func_8013B1B0 /* D1B64 8013B464 104001C0 */ beqz $v0, .L8013BB68 /* D1B68 8013B468 AC650000 */ sw $a1, ($v1) /* D1B6C 8013B46C 000A1080 */ sll $v0, $t2, 2 -/* D1B70 8013B470 3C018015 */ lui $at, %hi(D_80151088) +/* D1B70 8013B470 3C018015 */ lui $at, %hi(jtbl_80151088_E7788) /* D1B74 8013B474 00220821 */ addu $at, $at, $v0 -/* D1B78 8013B478 8C221088 */ lw $v0, %lo(D_80151088)($at) +/* D1B78 8013B478 8C221088 */ lw $v0, %lo(jtbl_80151088_E7788)($at) /* D1B7C 8013B47C 00400008 */ jr $v0 /* D1B80 8013B480 00000000 */ nop +glabel L8013B484_D1B84 /* D1B84 8013B484 3C02FC11 */ lui $v0, 0xfc11 /* D1B88 8013B488 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* D1B8C 8013B48C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) @@ -205,6 +210,7 @@ glabel func_8013B1B0 /* D1BA8 8013B4A8 2402F3F9 */ addiu $v0, $zero, -0xc07 /* D1BAC 8013B4AC 0804EEAD */ j .L8013BAB4 /* D1BB0 8013B4B0 AC820004 */ sw $v0, 4($a0) +glabel L8013B4B4_D1BB4 /* D1BB4 8013B4B4 190001EC */ blez $t0, .L8013BC68 /* D1BB8 8013B4B8 3C06FCFF */ lui $a2, 0xfcff /* D1BBC 8013B4BC 34C697FF */ ori $a2, $a2, 0x97ff @@ -224,6 +230,7 @@ glabel func_8013B1B0 /* D1BF4 8013B4F4 AC430000 */ sw $v1, ($v0) /* D1BF8 8013B4F8 0804EED9 */ j .L8013BB64 /* D1BFC 8013B4FC 310300FF */ andi $v1, $t0, 0xff +glabel L8013B500_D1C00 /* D1C00 8013B500 190001D9 */ blez $t0, .L8013BC68 /* D1C04 8013B504 3C06FC11 */ lui $a2, 0xfc11 /* D1C08 8013B508 34C69623 */ ori $a2, $a2, 0x9623 @@ -251,10 +258,12 @@ glabel func_8013B1B0 /* D1C60 8013B560 00431025 */ or $v0, $v0, $v1 /* D1C64 8013B564 0804EEB8 */ j .L8013BAE0 /* D1C68 8013B568 310300FF */ andi $v1, $t0, 0xff +glabel L8013B56C_D1C6C /* D1C6C 8013B56C 3C06FC60 */ lui $a2, 0xfc60 /* D1C70 8013B570 34C6FEC1 */ ori $a2, $a2, 0xfec1 /* D1C74 8013B574 0804EEA4 */ j .L8013BA90 /* D1C78 8013B578 3C0433FD */ lui $a0, 0x33fd +glabel L8013B57C_D1C7C /* D1C7C 8013B57C 190001BA */ blez $t0, .L8013BC68 /* D1C80 8013B580 3C06FC60 */ lui $a2, 0xfc60 /* D1C84 8013B584 34C696C1 */ ori $a2, $a2, 0x96c1 @@ -282,6 +291,7 @@ glabel func_8013B1B0 /* D1CDC 8013B5DC 00431025 */ or $v0, $v0, $v1 /* D1CE0 8013B5E0 0804EEB8 */ j .L8013BAE0 /* D1CE4 8013B5E4 310300FF */ andi $v1, $t0, 0xff +glabel L8013B5E8_D1CE8 /* D1CE8 8013B5E8 3C03FC12 */ lui $v1, 0xfc12 /* D1CEC 8013B5EC 34637E24 */ ori $v1, $v1, 0x7e24 /* D1CF0 8013B5F0 3C07D9FF */ lui $a3, 0xd9ff @@ -308,21 +318,25 @@ glabel func_8013B1B0 /* D1D44 8013B644 AC480008 */ sw $t0, 8($v0) /* D1D48 8013B648 0804EEDA */ j .L8013BB68 /* D1D4C 8013B64C AC40000C */ sw $zero, 0xc($v0) +glabel L8013B650_D1D50 /* D1D50 8013B650 3C07FC60 */ lui $a3, 0xfc60 /* D1D54 8013B654 34E7FEC1 */ ori $a3, $a3, 0xfec1 /* D1D58 8013B658 3C0544FE */ lui $a1, 0x44fe /* D1D5C 8013B65C 0804EDA7 */ j .L8013B69C /* D1D60 8013B660 34A57339 */ ori $a1, $a1, 0x7339 +glabel L8013B664_D1D64 /* D1D64 8013B664 3C07FCFF */ lui $a3, 0xfcff /* D1D68 8013B668 34E799FF */ ori $a3, $a3, 0x99ff /* D1D6C 8013B66C 3C05FF30 */ lui $a1, 0xff30 /* D1D70 8013B670 0804EDA7 */ j .L8013B69C /* D1D74 8013B674 34A5FE7F */ ori $a1, $a1, 0xfe7f +glabel L8013B678_D1D78 /* D1D78 8013B678 3C07FC12 */ lui $a3, 0xfc12 /* D1D7C 8013B67C 34E71824 */ ori $a3, $a3, 0x1824 /* D1D80 8013B680 3C05FF33 */ lui $a1, 0xff33 /* D1D84 8013B684 0804EDA7 */ j .L8013B69C /* D1D88 8013B688 34A5FFFF */ ori $a1, $a1, 0xffff +glabel L8013B68C_D1D8C /* D1D8C 8013B68C 3C07FC60 */ lui $a3, 0xfc60 /* D1D90 8013B690 34E798C1 */ ori $a3, $a3, 0x98c1 /* D1D94 8013B694 3C054432 */ lui $a1, 0x4432 @@ -351,6 +365,7 @@ glabel func_8013B1B0 /* D1DEC 8013B6EC AC490008 */ sw $t1, 8($v0) /* D1DF0 8013B6F0 0804EEDA */ j .L8013BB68 /* D1DF4 8013B6F4 AC40000C */ sw $zero, 0xc($v0) +glabel L8013B6F8_D1DF8 /* D1DF8 8013B6F8 8E420014 */ lw $v0, 0x14($s2) /* D1DFC 8013B6FC 3042A000 */ andi $v0, $v0, 0xa000 /* D1E00 8013B700 104000FA */ beqz $v0, .L8013BAEC @@ -456,6 +471,7 @@ glabel func_8013B1B0 /* D1F90 8013B890 AC680010 */ sw $t0, 0x10($v1) /* D1F94 8013B894 0804EEDA */ j .L8013BB68 /* D1F98 8013B898 AC640014 */ sw $a0, 0x14($v1) +glabel L8013B89C_D1F9C /* D1F9C 8013B89C 8E43002C */ lw $v1, 0x2c($s2) /* D1FA0 8013B8A0 1460001F */ bnez $v1, .L8013B920 /* D1FA4 8013B8A4 240B0001 */ addiu $t3, $zero, 1 @@ -581,6 +597,7 @@ glabel func_8013B1B0 /* D2178 8013BA78 310300FF */ andi $v1, $t0, 0xff /* D217C 8013BA7C 0804EEDA */ j .L8013BB68 /* D2180 8013BA80 AC430014 */ sw $v1, 0x14($v0) +glabel L8013BA84_D2184 /* D2184 8013BA84 3C06FCFF */ lui $a2, 0xfcff /* D2188 8013BA88 34C6FFFF */ ori $a2, $a2, 0xffff /* D218C 8013BA8C 3C04FFFD */ lui $a0, 0xfffd @@ -611,6 +628,7 @@ glabel func_8013B1B0 /* D21E4 8013BAE4 0804EEDA */ j .L8013BB68 /* D21E8 8013BAE8 ACA20004 */ sw $v0, 4($a1) .L8013BAEC: +glabel L8013BAEC_D21EC /* D21EC 8013BAEC 3C06FCFF */ lui $a2, 0xfcff /* D21F0 8013BAF0 34C6FFFF */ ori $a2, $a2, 0xffff /* D21F4 8013BAF4 3C05FFFC */ lui $a1, 0xfffc @@ -624,6 +642,7 @@ glabel func_8013B1B0 /* D2214 8013BB14 AC660000 */ sw $a2, ($v1) /* D2218 8013BB18 0804EEDA */ j .L8013BB68 /* D221C 8013BB1C AC650004 */ sw $a1, 4($v1) +glabel L8013BB20_D2220 /* D2220 8013BB20 3C06FCFF */ lui $a2, 0xfcff /* D2224 8013BB24 34C697FF */ ori $a2, $a2, 0x97ff /* D2228 8013BB28 3C05FF2C */ lui $a1, 0xff2c @@ -648,26 +667,30 @@ glabel func_8013B1B0 /* D226C 8013BB6C 2C620005 */ sltiu $v0, $v1, 5 /* D2270 8013BB70 10400024 */ beqz $v0, .L8013BC04 /* D2274 8013BB74 00031080 */ sll $v0, $v1, 2 -/* D2278 8013BB78 3C018015 */ lui $at, %hi(D_801510D0) +/* D2278 8013BB78 3C018015 */ lui $at, %hi(jtbl_801510D0_E77D0) /* D227C 8013BB7C 00220821 */ addu $at, $at, $v0 -/* D2280 8013BB80 8C2210D0 */ lw $v0, %lo(D_801510D0)($at) +/* D2280 8013BB80 8C2210D0 */ lw $v0, %lo(jtbl_801510D0_E77D0)($at) /* D2284 8013BB84 00400008 */ jr $v0 /* D2288 8013BB88 00000000 */ nop +glabel L8013BB8C_D228C /* D228C 8013BB8C 0240202D */ daddu $a0, $s2, $zero /* D2290 8013BB90 0C04F3EA */ jal func_8013CFA8 /* D2294 8013BB94 0260282D */ daddu $a1, $s3, $zero /* D2298 8013BB98 0804EF01 */ j .L8013BC04 /* D229C 8013BB9C 00000000 */ nop +glabel L8013BBA0_D22A0 /* D22A0 8013BBA0 0240202D */ daddu $a0, $s2, $zero /* D22A4 8013BBA4 0C04F6AD */ jal func_8013DAB4 /* D22A8 8013BBA8 0260282D */ daddu $a1, $s3, $zero /* D22AC 8013BBAC 0804EF01 */ j .L8013BC04 /* D22B0 8013BBB0 00000000 */ nop +glabel L8013BBB4_D22B4 /* D22B4 8013BBB4 0240202D */ daddu $a0, $s2, $zero /* D22B8 8013BBB8 0C04F8BC */ jal func_8013E2F0 /* D22BC 8013BBBC 0260282D */ daddu $a1, $s3, $zero /* D22C0 8013BBC0 0804EF01 */ j .L8013BC04 /* D22C4 8013BBC4 00000000 */ nop +glabel L8013BBC8_D22C8 /* D22C8 8013BBC8 0240202D */ daddu $a0, $s2, $zero /* D22CC 8013BBCC 0C04F3EA */ jal func_8013CFA8 /* D22D0 8013BBD0 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F350.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F350.s index 0c783b8b6d..0e8e7703aa 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F350.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F350.s @@ -18,27 +18,32 @@ glabel func_8013F350 /* D5A84 8013F384 3C168015 */ lui $s6, %hi(D_8014EFCC) /* D5A88 8013F388 26D6EFCC */ addiu $s6, $s6, %lo(D_8014EFCC) .L8013F38C: +glabel L8013F38C_D5A8C /* D5A8C 8013F38C 8E030000 */ lw $v1, ($s0) /* D5A90 8013F390 2C62001C */ sltiu $v0, $v1, 0x1c /* D5A94 8013F394 1040FFFD */ beqz $v0, .L8013F38C /* D5A98 8013F398 26100004 */ addiu $s0, $s0, 4 /* D5A9C 8013F39C 00031080 */ sll $v0, $v1, 2 -/* D5AA0 8013F3A0 3C018015 */ lui $at, %hi(D_80151140) +/* D5AA0 8013F3A0 3C018015 */ lui $at, %hi(jtbl_80151140_E7840) /* D5AA4 8013F3A4 00220821 */ addu $at, $at, $v0 -/* D5AA8 8013F3A8 8C221140 */ lw $v0, %lo(D_80151140)($at) +/* D5AA8 8013F3A8 8C221140 */ lw $v0, %lo(jtbl_80151140_E7840)($at) /* D5AAC 8013F3AC 00400008 */ jr $v0 /* D5AB0 8013F3B0 00000000 */ nop +glabel L8013F3B4_D5AB4 /* D5AB4 8013F3B4 0804FCE3 */ j .L8013F38C /* D5AB8 8013F3B8 2610000C */ addiu $s0, $s0, 0xc +glabel L8013F3BC_D5ABC /* D5ABC 8013F3BC 8E130000 */ lw $s3, ($s0) /* D5AC0 8013F3C0 0804FCF4 */ j .L8013F3D0 /* D5AC4 8013F3C4 26100004 */ addiu $s0, $s0, 4 +glabel L8013F3C8_D5AC8 /* D5AC8 8013F3C8 8E130000 */ lw $s3, ($s0) /* D5ACC 8013F3CC 26100008 */ addiu $s0, $s0, 8 .L8013F3D0: /* D5AD0 8013F3D0 A2B30046 */ sb $s3, 0x46($s5) /* D5AD4 8013F3D4 0804FCE3 */ j .L8013F38C /* D5AD8 8013F3D8 A2B30045 */ sb $s3, 0x45($s5) +glabel L8013F3DC_D5ADC /* D5ADC 8013F3DC 92020003 */ lbu $v0, 3($s0) /* D5AE0 8013F3E0 26100004 */ addiu $s0, $s0, 4 /* D5AE4 8013F3E4 3C030010 */ lui $v1, 0x10 @@ -52,8 +57,10 @@ glabel func_8013F350 /* D5B04 8013F404 A2A4004F */ sb $a0, 0x4f($s5) /* D5B08 8013F408 0804FCE3 */ j .L8013F38C /* D5B0C 8013F40C A2A40051 */ sb $a0, 0x51($s5) +glabel L8013F410_D5B10 /* D5B10 8013F410 0804FCE3 */ j .L8013F38C /* D5B14 8013F414 26100004 */ addiu $s0, $s0, 4 +glabel L8013F418_D5B18 /* D5B18 8013F418 0804FCE3 */ j .L8013F38C /* D5B1C 8013F41C 26100008 */ addiu $s0, $s0, 8 .L8013F420: @@ -62,6 +69,7 @@ glabel func_8013F350 .L8013F428: /* D5B28 8013F428 0804FDB2 */ j .L8013F6C8 /* D5B2C 8013F42C AE110000 */ sw $s1, ($s0) +glabel L8013F430_D5B30 /* D5B30 8013F430 26100004 */ addiu $s0, $s0, 4 /* D5B34 8013F434 8E070000 */ lw $a3, ($s0) /* D5B38 8013F438 26100004 */ addiu $s0, $s0, 4 @@ -257,6 +265,7 @@ glabel func_8013F350 /* D5DD4 8013F6D4 0804FDB5 */ j .L8013F6D4 /* D5DD8 8013F6D8 00000000 */ nop .L8013F6DC: +glabel L8013F6DC_D5DDC /* D5DDC 8013F6DC 8FBF002C */ lw $ra, 0x2c($sp) /* D5DE0 8013F6E0 8FB60028 */ lw $s6, 0x28($sp) /* D5DE4 8013F6E4 8FB50024 */ lw $s5, 0x24($sp) diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s index fdd84d1423..0140613020 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s @@ -16,17 +16,19 @@ glabel func_80141704 /* D7E30 80141730 104002AF */ beqz $v0, .L801421F0 /* D7E34 80141734 26100004 */ addiu $s0, $s0, 4 /* D7E38 80141738 00031080 */ sll $v0, $v1, 2 -/* D7E3C 8014173C 3C018015 */ lui $at, %hi(D_801511B0) +/* D7E3C 8014173C 3C018015 */ lui $at, %hi(jtbl_801511B0_E78B0) /* D7E40 80141740 00220821 */ addu $at, $at, $v0 -/* D7E44 80141744 8C2211B0 */ lw $v0, %lo(D_801511B0)($at) +/* D7E44 80141744 8C2211B0 */ lw $v0, %lo(jtbl_801511B0_E78B0)($at) /* D7E48 80141748 00400008 */ jr $v0 /* D7E4C 8014174C 00000000 */ nop +glabel L80141750_D7E50 /* D7E50 80141750 8E620000 */ lw $v0, ($s3) /* D7E54 80141754 2403003C */ addiu $v1, $zero, 0x3c /* D7E58 80141758 A2630047 */ sb $v1, 0x47($s3) /* D7E5C 8014175C 34420004 */ ori $v0, $v0, 4 /* D7E60 80141760 0805087C */ j .L801421F0 /* D7E64 80141764 AE620000 */ sw $v0, ($s3) +glabel L80141768_D7E68 /* D7E68 80141768 2402003C */ addiu $v0, $zero, 0x3c /* D7E6C 8014176C A2620047 */ sb $v0, 0x47($s3) /* D7E70 80141770 8E620000 */ lw $v0, ($s3) @@ -34,6 +36,7 @@ glabel func_80141704 /* D7E78 80141778 00431025 */ or $v0, $v0, $v1 /* D7E7C 8014177C 0805087C */ j .L801421F0 /* D7E80 80141780 AE620000 */ sw $v0, ($s3) +glabel L80141784_D7E84 /* D7E84 80141784 24020001 */ addiu $v0, $zero, 1 /* D7E88 80141788 8E630000 */ lw $v1, ($s3) /* D7E8C 8014178C 3C040008 */ lui $a0, 8 @@ -41,17 +44,20 @@ glabel func_80141704 /* D7E94 80141794 00641825 */ or $v1, $v1, $a0 /* D7E98 80141798 0805087D */ j .L801421F4 /* D7E9C 8014179C AE630000 */ sw $v1, ($s3) +glabel L801417A0_D7EA0 /* D7EA0 801417A0 8E630000 */ lw $v1, ($s3) /* D7EA4 801417A4 24020001 */ addiu $v0, $zero, 1 /* D7EA8 801417A8 AE700004 */ sw $s0, 4($s3) /* D7EAC 801417AC 34634000 */ ori $v1, $v1, 0x4000 /* D7EB0 801417B0 0805087D */ j .L801421F4 /* D7EB4 801417B4 AE630000 */ sw $v1, ($s3) +glabel L801417B8_D7EB8 /* D7EB8 801417B8 24020001 */ addiu $v0, $zero, 1 /* D7EBC 801417BC 8E630000 */ lw $v1, ($s3) /* D7EC0 801417C0 2404BFFF */ addiu $a0, $zero, -0x4001 /* D7EC4 801417C4 0805073C */ j .L80141CF0 /* D7EC8 801417C8 AE700004 */ sw $s0, 4($s3) +glabel L801417CC_D7ECC /* D7ECC 801417CC 8E110000 */ lw $s1, ($s0) /* D7ED0 801417D0 26100004 */ addiu $s0, $s0, 4 /* D7ED4 801417D4 8E630000 */ lw $v1, ($s3) @@ -60,6 +66,7 @@ glabel func_80141704 /* D7EE0 801417E0 00711825 */ or $v1, $v1, $s1 /* D7EE4 801417E4 0805087D */ j .L801421F4 /* D7EE8 801417E8 AE630000 */ sw $v1, ($s3) +glabel L801417EC_D7EEC /* D7EEC 801417EC 8E110000 */ lw $s1, ($s0) /* D7EF0 801417F0 26100004 */ addiu $s0, $s0, 4 /* D7EF4 801417F4 8E630000 */ lw $v1, ($s3) @@ -67,6 +74,7 @@ glabel func_80141704 /* D7EFC 801417FC AE700004 */ sw $s0, 4($s3) /* D7F00 80141800 0805073C */ j .L80141CF0 /* D7F04 80141804 00112027 */ nor $a0, $zero, $s1 +glabel L80141808_D7F08 /* D7F08 80141808 92020003 */ lbu $v0, 3($s0) /* D7F0C 8014180C 26100004 */ addiu $s0, $s0, 4 /* D7F10 80141810 A2620047 */ sb $v0, 0x47($s3) @@ -140,6 +148,7 @@ glabel func_80141704 /* D8014 80141914 46800020 */ cvt.s.w $f0, $f0 /* D8018 80141918 08050713 */ j .L80141C4C /* D801C 8014191C E664002C */ swc1 $f4, 0x2c($s3) +glabel L80141920_D8020 /* D8020 80141920 92020003 */ lbu $v0, 3($s0) /* D8024 80141924 26100004 */ addiu $s0, $s0, 4 /* D8028 80141928 A2620047 */ sb $v0, 0x47($s3) @@ -220,6 +229,7 @@ glabel func_80141704 /* D8148 80141A48 46800020 */ cvt.s.w $f0, $f0 /* D814C 80141A4C 08050713 */ j .L80141C4C /* D8150 80141A50 E664002C */ swc1 $f4, 0x2c($s3) +glabel L80141A54_D8154 /* D8154 80141A54 92030003 */ lbu $v1, 3($s0) /* D8158 80141A58 8E620000 */ lw $v0, ($s3) /* D815C 80141A5C 26100004 */ addiu $s0, $s0, 4 @@ -366,14 +376,17 @@ glabel func_80141704 /* D8360 80141C60 46020003 */ div.s $f0, $f0, $f2 /* D8364 80141C64 0805087C */ j .L801421F0 /* D8368 80141C68 E6600024 */ swc1 $f0, 0x24($s3) +glabel L80141C6C_D836C /* D836C 80141C6C 8E63000C */ lw $v1, 0xc($s3) /* D8370 80141C70 24020001 */ addiu $v0, $zero, 1 /* D8374 80141C74 0805087D */ j .L801421F4 /* D8378 80141C78 AE630004 */ sw $v1, 4($s3) +glabel L80141C7C_D837C /* D837C 80141C7C 24020001 */ addiu $v0, $zero, 1 /* D8380 80141C80 AE70000C */ sw $s0, 0xc($s3) /* D8384 80141C84 0805087D */ j .L801421F4 /* D8388 80141C88 AE700004 */ sw $s0, 4($s3) +glabel L80141C8C_D838C /* D838C 80141C8C 8E110000 */ lw $s1, ($s0) /* D8390 80141C90 26100004 */ addiu $s0, $s0, 4 /* D8394 80141C94 8E120000 */ lw $s2, ($s0) @@ -386,6 +399,7 @@ glabel func_80141704 /* D83B0 80141CB0 8E62000C */ lw $v0, 0xc($s3) /* D83B4 80141CB4 0805082D */ j .L801420B4 /* D83B8 80141CB8 AE620004 */ sw $v0, 4($s3) +glabel L80141CBC_D83BC /* D83BC 80141CBC 92040003 */ lbu $a0, 3($s0) /* D83C0 80141CC0 26100004 */ addiu $s0, $s0, 4 /* D83C4 80141CC4 24030400 */ addiu $v1, $zero, 0x400 @@ -403,6 +417,7 @@ glabel func_80141704 /* D83F0 80141CF0 00641824 */ and $v1, $v1, $a0 /* D83F4 80141CF4 0805087D */ j .L801421F4 /* D83F8 80141CF8 AE630000 */ sw $v1, ($s3) +glabel L80141CFC_D83FC /* D83FC 80141CFC 8E050000 */ lw $a1, ($s0) /* D8400 80141D00 26100004 */ addiu $s0, $s0, 4 /* D8404 80141D04 8E060000 */ lw $a2, ($s0) @@ -459,6 +474,7 @@ glabel func_80141704 /* D84D0 80141DD0 4600130D */ trunc.w.s $f12, $f2 /* D84D4 80141DD4 0805087D */ j .L801421F4 /* D84D8 80141DD8 E66C0038 */ swc1 $f12, 0x38($s3) +glabel L80141DDC_D84DC /* D84DC 80141DDC 8E050000 */ lw $a1, ($s0) /* D84E0 80141DE0 26100004 */ addiu $s0, $s0, 4 /* D84E4 80141DE4 8E060000 */ lw $a2, ($s0) @@ -478,6 +494,7 @@ glabel func_80141704 /* D851C 80141E1C A2660045 */ sb $a2, 0x45($s3) /* D8520 80141E20 0805087D */ j .L801421F4 /* D8524 80141E24 AE630000 */ sw $v1, ($s3) +glabel L80141E28_D8528 /* D8528 80141E28 8E110000 */ lw $s1, ($s0) /* D852C 80141E2C 26100004 */ addiu $s0, $s0, 4 /* D8530 80141E30 92630040 */ lbu $v1, 0x40($s3) @@ -486,6 +503,7 @@ glabel func_80141704 /* D853C 80141E3C 00711821 */ addu $v1, $v1, $s1 /* D8540 80141E40 0805087D */ j .L801421F4 /* D8544 80141E44 A2630040 */ sb $v1, 0x40($s3) +glabel L80141E48_D8548 /* D8548 80141E48 8E120000 */ lw $s2, ($s0) /* D854C 80141E4C 8E620000 */ lw $v0, ($s3) /* D8550 80141E50 30422000 */ andi $v0, $v0, 0x2000 @@ -498,6 +516,7 @@ glabel func_80141704 /* D8568 80141E68 92620041 */ lbu $v0, 0x41($s3) /* D856C 80141E6C 080507A8 */ j .L80141EA0 /* D8570 80141E70 00521023 */ subu $v0, $v0, $s2 +glabel L80141E74_D8574 /* D8574 80141E74 8E110000 */ lw $s1, ($s0) /* D8578 80141E78 26100004 */ addiu $s0, $s0, 4 /* D857C 80141E7C 8E120000 */ lw $s2, ($s0) @@ -513,6 +532,7 @@ glabel func_80141704 .L80141EA0: /* D85A0 80141EA0 0805082C */ j .L801420B0 /* D85A4 80141EA4 A2620041 */ sb $v0, 0x41($s3) +glabel L80141EA8_D85A8 /* D85A8 80141EA8 3C013780 */ lui $at, 0x3780 /* D85AC 80141EAC 44810000 */ mtc1 $at, $f0 /* D85B0 80141EB0 C6040000 */ lwc1 $f4, ($s0) @@ -637,6 +657,7 @@ glabel func_80141704 /* D8774 80142074 E66C0038 */ swc1 $f12, 0x38($s3) /* D8778 80142078 0805087D */ j .L801421F4 /* D877C 8014207C 24020001 */ addiu $v0, $zero, 1 +glabel L80142080_D8780 /* D8780 80142080 8E110000 */ lw $s1, ($s0) /* D8784 80142084 8E620000 */ lw $v0, ($s3) /* D8788 80142088 26100004 */ addiu $s0, $s0, 4 @@ -654,6 +675,7 @@ glabel func_80141704 .L801420B4: /* D87B4 801420B4 0805087D */ j .L801421F4 /* D87B8 801420B8 24020001 */ addiu $v0, $zero, 1 +glabel L801420BC_D87BC /* D87BC 801420BC 8E110000 */ lw $s1, ($s0) /* D87C0 801420C0 26100004 */ addiu $s0, $s0, 4 /* D87C4 801420C4 8E120000 */ lw $s2, ($s0) @@ -664,6 +686,7 @@ glabel func_80141704 /* D87D8 801420D8 A2620047 */ sb $v0, 0x47($s3) /* D87DC 801420DC 0805087C */ j .L801421F0 /* D87E0 801420E0 AE700004 */ sw $s0, 4($s3) +glabel L801420E4_D87E4 /* D87E4 801420E4 92030003 */ lbu $v1, 3($s0) /* D87E8 801420E8 26100004 */ addiu $s0, $s0, 4 /* D87EC 801420EC 24020001 */ addiu $v0, $zero, 1 @@ -688,6 +711,7 @@ glabel func_80141704 /* D8838 80142138 A265004F */ sb $a1, 0x4f($s3) /* D883C 8014213C 0805087D */ j .L801421F4 /* D8840 80142140 A2650051 */ sb $a1, 0x51($s3) +glabel L80142144_D8844 /* D8844 80142144 8E110000 */ lw $s1, ($s0) /* D8848 80142148 26100004 */ addiu $s0, $s0, 4 /* D884C 8014214C 3C03F0FF */ lui $v1, 0xf0ff @@ -700,6 +724,7 @@ glabel func_80141704 /* D8868 80142168 00832025 */ or $a0, $a0, $v1 /* D886C 8014216C 0805087D */ j .L801421F4 /* D8870 80142170 AE640000 */ sw $a0, ($s3) +glabel L80142174_D8874 /* D8874 80142174 8E110000 */ lw $s1, ($s0) /* D8878 80142178 26100004 */ addiu $s0, $s0, 4 /* D887C 8014217C 0C00A67F */ jal rand_int @@ -712,6 +737,7 @@ glabel func_80141704 /* D8898 80142198 AC850004 */ sw $a1, 4($a0) /* D889C 8014219C 0805087D */ j .L801421F4 /* D88A0 801421A0 24020001 */ addiu $v0, $zero, 1 +glabel L801421A4_D88A4 /* D88A4 801421A4 8E060000 */ lw $a2, ($s0) /* D88A8 801421A8 26100004 */ addiu $s0, $s0, 4 /* D88AC 801421AC 0C05272D */ jal play_sound @@ -719,6 +745,7 @@ glabel func_80141704 /* D88B4 801421B4 24020001 */ addiu $v0, $zero, 1 /* D88B8 801421B8 0805087D */ j .L801421F4 /* D88BC 801421BC AE700004 */ sw $s0, 4($s3) +glabel L801421C0_D88C0 /* D88C0 801421C0 8E050000 */ lw $a1, ($s0) /* D88C4 801421C4 26100004 */ addiu $s0, $s0, 4 /* D88C8 801421C8 8E060000 */ lw $a2, ($s0) @@ -732,6 +759,7 @@ glabel func_80141704 /* D88E8 801421E8 0805082D */ j .L801420B4 /* D88EC 801421EC A486002A */ sh $a2, 0x2a($a0) .L801421F0: +glabel L801421F0_D88F0 /* D88F0 801421F0 0000102D */ daddu $v0, $zero, $zero .L801421F4: /* D88F4 801421F4 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/code_d610_len_1330/func_800322DC.s b/asm/nonmatchings/code_d610_len_1330/func_800322DC.s index 97c03d8160..1298964c86 100644 --- a/asm/nonmatchings/code_d610_len_1330/func_800322DC.s +++ b/asm/nonmatchings/code_d610_len_1330/func_800322DC.s @@ -35,132 +35,132 @@ glabel func_800322DC /* D754 80032354 45000005 */ bc1f .L8003236C /* D758 80032358 E7BC0000 */ swc1 $f28, ($sp) /* D75C 8003235C 46046032 */ c.eq.s $f12, $f4 -/* D760 80032360 00000000 */ nop +/* D760 80032360 00000000 */ nop /* D764 80032364 45010097 */ bc1t .L800325C4 /* D768 80032368 0000102D */ daddu $v0, $zero, $zero .L8003236C: /* D76C 8003236C 44800000 */ mtc1 $zero, $f0 -/* D770 80032370 00000000 */ nop +/* D770 80032370 00000000 */ nop /* D774 80032374 46008032 */ c.eq.s $f16, $f0 -/* D778 80032378 00000000 */ nop +/* D778 80032378 00000000 */ nop /* D77C 8003237C 45000005 */ bc1f .L80032394 -/* D780 80032380 00000000 */ nop +/* D780 80032380 00000000 */ nop /* D784 80032384 46007032 */ c.eq.s $f14, $f0 -/* D788 80032388 00000000 */ nop +/* D788 80032388 00000000 */ nop /* D78C 8003238C 4501008D */ bc1t .L800325C4 /* D790 80032390 0000102D */ daddu $v0, $zero, $zero .L80032394: /* D794 80032394 46065002 */ mul.s $f0, $f10, $f6 -/* D798 80032398 00000000 */ nop +/* D798 80032398 00000000 */ nop /* D79C 8003239C C7BC0008 */ lwc1 $f28, 8($sp) /* D7A0 800323A0 461C4082 */ mul.s $f2, $f8, $f28 -/* D7A4 800323A4 00000000 */ nop +/* D7A4 800323A4 00000000 */ nop /* D7A8 800323A8 46001180 */ add.s $f6, $f2, $f0 /* D7AC 800323AC 44800000 */ mtc1 $zero, $f0 -/* D7B0 800323B0 00000000 */ nop +/* D7B0 800323B0 00000000 */ nop /* D7B4 800323B4 4600303C */ c.lt.s $f6, $f0 /* D7B8 800323B8 3C01BF80 */ lui $at, 0xbf80 /* D7BC 800323BC 44812000 */ mtc1 $at, $f4 /* D7C0 800323C0 45010007 */ bc1t .L800323E0 -/* D7C4 800323C4 00000000 */ nop +/* D7C4 800323C4 00000000 */ nop /* D7C8 800323C8 4606003C */ c.lt.s $f0, $f6 -/* D7CC 800323CC 00000000 */ nop +/* D7CC 800323CC 00000000 */ nop /* D7D0 800323D0 45000003 */ bc1f .L800323E0 /* D7D4 800323D4 46000106 */ mov.s $f4, $f0 /* D7D8 800323D8 3C013F80 */ lui $at, 0x3f80 /* D7DC 800323DC 44812000 */ mtc1 $at, $f4 .L800323E0: /* D7E0 800323E0 461E5002 */ mul.s $f0, $f10, $f30 -/* D7E4 800323E4 00000000 */ nop +/* D7E4 800323E4 00000000 */ nop /* D7E8 800323E8 C7BC0000 */ lwc1 $f28, ($sp) /* D7EC 800323EC 461C4082 */ mul.s $f2, $f8, $f28 -/* D7F0 800323F0 00000000 */ nop +/* D7F0 800323F0 00000000 */ nop /* D7F4 800323F4 46001080 */ add.s $f2, $f2, $f0 /* D7F8 800323F8 44800000 */ mtc1 $zero, $f0 -/* D7FC 800323FC 00000000 */ nop +/* D7FC 800323FC 00000000 */ nop /* D800 80032400 4600103C */ c.lt.s $f2, $f0 -/* D804 80032404 00000000 */ nop +/* D804 80032404 00000000 */ nop /* D808 80032408 45000005 */ bc1f .L80032420 /* D80C 8003240C 46002186 */ mov.s $f6, $f4 /* D810 80032410 3C01BF80 */ lui $at, 0xbf80 /* D814 80032414 44810000 */ mtc1 $at, $f0 /* D818 80032418 0800C90F */ j .L8003243C -/* D81C 8003241C 00000000 */ nop +/* D81C 8003241C 00000000 */ nop .L80032420: /* D820 80032420 4602003C */ c.lt.s $f0, $f2 -/* D824 80032424 00000000 */ nop +/* D824 80032424 00000000 */ nop /* D828 80032428 45000004 */ bc1f .L8003243C -/* D82C 8003242C 00000000 */ nop +/* D82C 8003242C 00000000 */ nop /* D830 80032430 3C013F80 */ lui $at, 0x3f80 /* D834 80032434 44810000 */ mtc1 $at, $f0 -/* D838 80032438 00000000 */ nop +/* D838 80032438 00000000 */ nop .L8003243C: /* D83C 8003243C 46003032 */ c.eq.s $f6, $f0 -/* D840 80032440 00000000 */ nop +/* D840 80032440 00000000 */ nop /* D844 80032444 4501005F */ bc1t .L800325C4 /* D848 80032448 0000102D */ daddu $v0, $zero, $zero /* D84C 8003244C 46009085 */ abs.s $f2, $f18 /* D850 80032450 46008005 */ abs.s $f0, $f16 /* D854 80032454 4602003C */ c.lt.s $f0, $f2 -/* D858 80032458 00000000 */ nop +/* D858 80032458 00000000 */ nop /* D85C 8003245C 4500001E */ bc1f .L800324D8 -/* D860 80032460 00000000 */ nop +/* D860 80032460 00000000 */ nop /* D864 80032464 460CA002 */ mul.s $f0, $f20, $f12 -/* D868 80032468 00000000 */ nop +/* D868 80032468 00000000 */ nop /* D86C 8003246C 4612B182 */ mul.s $f6, $f22, $f18 -/* D870 80032470 00000000 */ nop +/* D870 80032470 00000000 */ nop /* D874 80032474 461A9202 */ mul.s $f8, $f18, $f26 -/* D878 80032478 00000000 */ nop +/* D878 80032478 00000000 */ nop /* D87C 8003247C 46186282 */ mul.s $f10, $f12, $f24 -/* D880 80032480 00000000 */ nop +/* D880 80032480 00000000 */ nop /* D884 80032484 46106082 */ mul.s $f2, $f12, $f16 -/* D888 80032488 00000000 */ nop +/* D888 80032488 00000000 */ nop /* D88C 8003248C 460E9102 */ mul.s $f4, $f18, $f14 -/* D890 80032490 00000000 */ nop +/* D890 80032490 00000000 */ nop /* D894 80032494 46060001 */ sub.s $f0, $f0, $f6 /* D898 80032498 46041081 */ sub.s $f2, $f2, $f4 /* D89C 8003249C 46080000 */ add.s $f0, $f0, $f8 /* D8A0 800324A0 460A0181 */ sub.s $f6, $f0, $f10 /* D8A4 800324A4 46023183 */ div.s $f6, $f6, $f2 /* D8A8 800324A8 46068002 */ mul.s $f0, $f16, $f6 -/* D8AC 800324AC 00000000 */ nop +/* D8AC 800324AC 00000000 */ nop /* D8B0 800324B0 4600C000 */ add.s $f0, $f24, $f0 /* D8B4 800324B4 46140001 */ sub.s $f0, $f0, $f20 /* D8B8 800324B8 46120183 */ div.s $f6, $f0, $f18 /* D8BC 800324BC 46069002 */ mul.s $f0, $f18, $f6 -/* D8C0 800324C0 00000000 */ nop +/* D8C0 800324C0 00000000 */ nop /* D8C4 800324C4 46066082 */ mul.s $f2, $f12, $f6 -/* D8C8 800324C8 00000000 */ nop +/* D8C8 800324C8 00000000 */ nop /* D8CC 800324CC 4600A200 */ add.s $f8, $f20, $f0 /* D8D0 800324D0 0800C952 */ j .L80032548 /* D8D4 800324D4 4602B180 */ add.s $f6, $f22, $f2 .L800324D8: /* D8D8 800324D8 4610D002 */ mul.s $f0, $f26, $f16 -/* D8DC 800324DC 00000000 */ nop +/* D8DC 800324DC 00000000 */ nop /* D8E0 800324E0 460EA182 */ mul.s $f6, $f20, $f14 -/* D8E4 800324E4 00000000 */ nop +/* D8E4 800324E4 00000000 */ nop /* D8E8 800324E8 460ED202 */ mul.s $f8, $f26, $f14 -/* D8EC 800324EC 00000000 */ nop +/* D8EC 800324EC 00000000 */ nop /* D8F0 800324F0 4610B282 */ mul.s $f10, $f22, $f16 -/* D8F4 800324F4 00000000 */ nop +/* D8F4 800324F4 00000000 */ nop /* D8F8 800324F8 46106082 */ mul.s $f2, $f12, $f16 -/* D8FC 800324FC 00000000 */ nop +/* D8FC 800324FC 00000000 */ nop /* D900 80032500 460E9102 */ mul.s $f4, $f18, $f14 -/* D904 80032504 00000000 */ nop +/* D904 80032504 00000000 */ nop /* D908 80032508 46060000 */ add.s $f0, $f0, $f6 /* D90C 8003250C 46041081 */ sub.s $f2, $f2, $f4 /* D910 80032510 46080001 */ sub.s $f0, $f0, $f8 /* D914 80032514 460A0181 */ sub.s $f6, $f0, $f10 /* D918 80032518 46023183 */ div.s $f6, $f6, $f2 /* D91C 8003251C 46069002 */ mul.s $f0, $f18, $f6 -/* D920 80032520 00000000 */ nop +/* D920 80032520 00000000 */ nop /* D924 80032524 4600A000 */ add.s $f0, $f20, $f0 /* D928 80032528 46180001 */ sub.s $f0, $f0, $f24 /* D92C 8003252C 46100183 */ div.s $f6, $f0, $f16 /* D930 80032530 46068002 */ mul.s $f0, $f16, $f6 -/* D934 80032534 00000000 */ nop +/* D934 80032534 00000000 */ nop /* D938 80032538 46067082 */ mul.s $f2, $f14, $f6 -/* D93C 8003253C 00000000 */ nop +/* D93C 8003253C 00000000 */ nop /* D940 80032540 4600C200 */ add.s $f8, $f24, $f0 /* D944 80032544 4602D180 */ add.s $f6, $f26, $f2 .L80032548: @@ -168,26 +168,26 @@ glabel func_800322DC /* D94C 8003254C C7BC0048 */ lwc1 $f28, 0x48($sp) /* D950 80032550 461C4001 */ sub.s $f0, $f8, $f28 /* D954 80032554 46002102 */ mul.s $f4, $f4, $f0 -/* D958 80032558 00000000 */ nop +/* D958 80032558 00000000 */ nop /* D95C 8003255C C7BC004C */ lwc1 $f28, 0x4c($sp) /* D960 80032560 461C3081 */ sub.s $f2, $f6, $f28 /* D964 80032564 46163001 */ sub.s $f0, $f6, $f22 /* D968 80032568 46020002 */ mul.s $f0, $f0, $f2 -/* D96C 8003256C 00000000 */ nop +/* D96C 8003256C 00000000 */ nop /* D970 80032570 46002100 */ add.s $f4, $f4, $f0 /* D974 80032574 44800000 */ mtc1 $zero, $f0 -/* D978 80032578 00000000 */ nop +/* D978 80032578 00000000 */ nop /* D97C 8003257C 4604003C */ c.lt.s $f0, $f4 -/* D980 80032580 00000000 */ nop +/* D980 80032580 00000000 */ nop /* D984 80032584 4501000F */ bc1t .L800325C4 /* D988 80032588 0000102D */ daddu $v0, $zero, $zero /* D98C 8003258C 46184081 */ sub.s $f2, $f8, $f24 /* D990 80032590 46021082 */ mul.s $f2, $f2, $f2 -/* D994 80032594 00000000 */ nop +/* D994 80032594 00000000 */ nop /* D998 80032598 461A3001 */ sub.s $f0, $f6, $f26 /* D99C 8003259C 8FA30060 */ lw $v1, 0x60($sp) /* D9A0 800325A0 46000002 */ mul.s $f0, $f0, $f0 -/* D9A4 800325A4 00000000 */ nop +/* D9A4 800325A4 00000000 */ nop /* D9A8 800325A8 E4680000 */ swc1 $f8, ($v1) /* D9AC 800325AC 8FA30064 */ lw $v1, 0x64($sp) /* D9B0 800325B0 E4660000 */ swc1 $f6, ($v1) diff --git a/asm/nonmatchings/code_d610_len_1330/func_800325E4.s b/asm/nonmatchings/code_d610_len_1330/func_800325E4.s index f631b49867..e4c0121c72 100644 --- a/asm/nonmatchings/code_d610_len_1330/func_800325E4.s +++ b/asm/nonmatchings/code_d610_len_1330/func_800325E4.s @@ -21,7 +21,7 @@ glabel func_800325E4 /* DA24 80032624 C7A20058 */ lwc1 $f2, 0x58($sp) /* DA28 80032628 46161401 */ sub.s $f16, $f2, $f22 /* DA2C 8003262C 4487E000 */ mtc1 $a3, $f28 -/* DA30 80032630 00000000 */ nop +/* DA30 80032630 00000000 */ nop /* DA34 80032634 461AE301 */ sub.s $f12, $f28, $f26 /* DA38 80032638 4614B701 */ sub.s $f28, $f22, $f20 /* DA3C 8003263C 46180381 */ sub.s $f14, $f0, $f24 @@ -34,142 +34,142 @@ glabel func_800325E4 /* DA58 80032658 45000005 */ bc1f .L80032670 /* DA5C 8003265C E7BC0000 */ swc1 $f28, ($sp) /* DA60 80032660 46046032 */ c.eq.s $f12, $f4 -/* DA64 80032664 00000000 */ nop +/* DA64 80032664 00000000 */ nop /* DA68 80032668 45010086 */ bc1t .L80032884 /* DA6C 8003266C 0000102D */ daddu $v0, $zero, $zero .L80032670: /* DA70 80032670 44800000 */ mtc1 $zero, $f0 -/* DA74 80032674 00000000 */ nop +/* DA74 80032674 00000000 */ nop /* DA78 80032678 46008032 */ c.eq.s $f16, $f0 -/* DA7C 8003267C 00000000 */ nop +/* DA7C 8003267C 00000000 */ nop /* DA80 80032680 45000005 */ bc1f .L80032698 -/* DA84 80032684 00000000 */ nop +/* DA84 80032684 00000000 */ nop /* DA88 80032688 46007032 */ c.eq.s $f14, $f0 -/* DA8C 8003268C 00000000 */ nop +/* DA8C 8003268C 00000000 */ nop /* DA90 80032690 4501007C */ bc1t .L80032884 /* DA94 80032694 0000102D */ daddu $v0, $zero, $zero .L80032698: /* DA98 80032698 46065002 */ mul.s $f0, $f10, $f6 -/* DA9C 8003269C 00000000 */ nop +/* DA9C 8003269C 00000000 */ nop /* DAA0 800326A0 C7BC0008 */ lwc1 $f28, 8($sp) /* DAA4 800326A4 461C4082 */ mul.s $f2, $f8, $f28 -/* DAA8 800326A8 00000000 */ nop +/* DAA8 800326A8 00000000 */ nop /* DAAC 800326AC 46001180 */ add.s $f6, $f2, $f0 /* DAB0 800326B0 44800000 */ mtc1 $zero, $f0 -/* DAB4 800326B4 00000000 */ nop +/* DAB4 800326B4 00000000 */ nop /* DAB8 800326B8 4600303C */ c.lt.s $f6, $f0 /* DABC 800326BC 3C01BF80 */ lui $at, 0xbf80 /* DAC0 800326C0 44812000 */ mtc1 $at, $f4 /* DAC4 800326C4 45010007 */ bc1t .L800326E4 -/* DAC8 800326C8 00000000 */ nop +/* DAC8 800326C8 00000000 */ nop /* DACC 800326CC 4606003C */ c.lt.s $f0, $f6 -/* DAD0 800326D0 00000000 */ nop +/* DAD0 800326D0 00000000 */ nop /* DAD4 800326D4 45000003 */ bc1f .L800326E4 /* DAD8 800326D8 46000106 */ mov.s $f4, $f0 /* DADC 800326DC 3C013F80 */ lui $at, 0x3f80 /* DAE0 800326E0 44812000 */ mtc1 $at, $f4 .L800326E4: /* DAE4 800326E4 461E5002 */ mul.s $f0, $f10, $f30 -/* DAE8 800326E8 00000000 */ nop +/* DAE8 800326E8 00000000 */ nop /* DAEC 800326EC C7BC0000 */ lwc1 $f28, ($sp) /* DAF0 800326F0 461C4082 */ mul.s $f2, $f8, $f28 -/* DAF4 800326F4 00000000 */ nop +/* DAF4 800326F4 00000000 */ nop /* DAF8 800326F8 46001080 */ add.s $f2, $f2, $f0 /* DAFC 800326FC 44800000 */ mtc1 $zero, $f0 -/* DB00 80032700 00000000 */ nop +/* DB00 80032700 00000000 */ nop /* DB04 80032704 4600103C */ c.lt.s $f2, $f0 -/* DB08 80032708 00000000 */ nop +/* DB08 80032708 00000000 */ nop /* DB0C 8003270C 45000005 */ bc1f .L80032724 /* DB10 80032710 46002186 */ mov.s $f6, $f4 /* DB14 80032714 3C01BF80 */ lui $at, 0xbf80 /* DB18 80032718 44810000 */ mtc1 $at, $f0 /* DB1C 8003271C 0800C9D0 */ j .L80032740 -/* DB20 80032720 00000000 */ nop +/* DB20 80032720 00000000 */ nop .L80032724: /* DB24 80032724 4602003C */ c.lt.s $f0, $f2 -/* DB28 80032728 00000000 */ nop +/* DB28 80032728 00000000 */ nop /* DB2C 8003272C 45000004 */ bc1f .L80032740 -/* DB30 80032730 00000000 */ nop +/* DB30 80032730 00000000 */ nop /* DB34 80032734 3C013F80 */ lui $at, 0x3f80 /* DB38 80032738 44810000 */ mtc1 $at, $f0 -/* DB3C 8003273C 00000000 */ nop +/* DB3C 8003273C 00000000 */ nop .L80032740: /* DB40 80032740 46003032 */ c.eq.s $f6, $f0 -/* DB44 80032744 00000000 */ nop +/* DB44 80032744 00000000 */ nop /* DB48 80032748 4501004E */ bc1t .L80032884 /* DB4C 8003274C 0000102D */ daddu $v0, $zero, $zero /* DB50 80032750 46009085 */ abs.s $f2, $f18 /* DB54 80032754 46008005 */ abs.s $f0, $f16 /* DB58 80032758 4602003C */ c.lt.s $f0, $f2 -/* DB5C 8003275C 00000000 */ nop +/* DB5C 8003275C 00000000 */ nop /* DB60 80032760 4500001E */ bc1f .L800327DC -/* DB64 80032764 00000000 */ nop +/* DB64 80032764 00000000 */ nop /* DB68 80032768 460CA002 */ mul.s $f0, $f20, $f12 -/* DB6C 8003276C 00000000 */ nop +/* DB6C 8003276C 00000000 */ nop /* DB70 80032770 4612D182 */ mul.s $f6, $f26, $f18 -/* DB74 80032774 00000000 */ nop +/* DB74 80032774 00000000 */ nop /* DB78 80032778 46189202 */ mul.s $f8, $f18, $f24 -/* DB7C 8003277C 00000000 */ nop +/* DB7C 8003277C 00000000 */ nop /* DB80 80032780 46166282 */ mul.s $f10, $f12, $f22 -/* DB84 80032784 00000000 */ nop +/* DB84 80032784 00000000 */ nop /* DB88 80032788 46106082 */ mul.s $f2, $f12, $f16 -/* DB8C 8003278C 00000000 */ nop +/* DB8C 8003278C 00000000 */ nop /* DB90 80032790 460E9102 */ mul.s $f4, $f18, $f14 -/* DB94 80032794 00000000 */ nop +/* DB94 80032794 00000000 */ nop /* DB98 80032798 46060001 */ sub.s $f0, $f0, $f6 /* DB9C 8003279C 46041081 */ sub.s $f2, $f2, $f4 /* DBA0 800327A0 46080000 */ add.s $f0, $f0, $f8 /* DBA4 800327A4 460A0181 */ sub.s $f6, $f0, $f10 /* DBA8 800327A8 46023183 */ div.s $f6, $f6, $f2 /* DBAC 800327AC 46068002 */ mul.s $f0, $f16, $f6 -/* DBB0 800327B0 00000000 */ nop +/* DBB0 800327B0 00000000 */ nop /* DBB4 800327B4 4600B000 */ add.s $f0, $f22, $f0 /* DBB8 800327B8 46140001 */ sub.s $f0, $f0, $f20 /* DBBC 800327BC 46120183 */ div.s $f6, $f0, $f18 /* DBC0 800327C0 46069002 */ mul.s $f0, $f18, $f6 -/* DBC4 800327C4 00000000 */ nop +/* DBC4 800327C4 00000000 */ nop /* DBC8 800327C8 46066082 */ mul.s $f2, $f12, $f6 -/* DBCC 800327CC 00000000 */ nop +/* DBCC 800327CC 00000000 */ nop /* DBD0 800327D0 4600A300 */ add.s $f12, $f20, $f0 /* DBD4 800327D4 0800CA13 */ j .L8003284C /* DBD8 800327D8 4602D180 */ add.s $f6, $f26, $f2 .L800327DC: /* DBDC 800327DC 4610C002 */ mul.s $f0, $f24, $f16 -/* DBE0 800327E0 00000000 */ nop +/* DBE0 800327E0 00000000 */ nop /* DBE4 800327E4 460EA182 */ mul.s $f6, $f20, $f14 -/* DBE8 800327E8 00000000 */ nop +/* DBE8 800327E8 00000000 */ nop /* DBEC 800327EC 460EC202 */ mul.s $f8, $f24, $f14 -/* DBF0 800327F0 00000000 */ nop +/* DBF0 800327F0 00000000 */ nop /* DBF4 800327F4 4610D282 */ mul.s $f10, $f26, $f16 -/* DBF8 800327F8 00000000 */ nop +/* DBF8 800327F8 00000000 */ nop /* DBFC 800327FC 46106082 */ mul.s $f2, $f12, $f16 -/* DC00 80032800 00000000 */ nop +/* DC00 80032800 00000000 */ nop /* DC04 80032804 460E9102 */ mul.s $f4, $f18, $f14 -/* DC08 80032808 00000000 */ nop +/* DC08 80032808 00000000 */ nop /* DC0C 8003280C 46060000 */ add.s $f0, $f0, $f6 /* DC10 80032810 46041081 */ sub.s $f2, $f2, $f4 /* DC14 80032814 46080001 */ sub.s $f0, $f0, $f8 /* DC18 80032818 460A0181 */ sub.s $f6, $f0, $f10 /* DC1C 8003281C 46023183 */ div.s $f6, $f6, $f2 /* DC20 80032820 46069002 */ mul.s $f0, $f18, $f6 -/* DC24 80032824 00000000 */ nop +/* DC24 80032824 00000000 */ nop /* DC28 80032828 4600A000 */ add.s $f0, $f20, $f0 /* DC2C 8003282C 46160001 */ sub.s $f0, $f0, $f22 /* DC30 80032830 46100183 */ div.s $f6, $f0, $f16 /* DC34 80032834 46068002 */ mul.s $f0, $f16, $f6 -/* DC38 80032838 00000000 */ nop +/* DC38 80032838 00000000 */ nop /* DC3C 8003283C 46067082 */ mul.s $f2, $f14, $f6 -/* DC40 80032840 00000000 */ nop +/* DC40 80032840 00000000 */ nop /* DC44 80032844 4600B300 */ add.s $f12, $f22, $f0 /* DC48 80032848 4602C180 */ add.s $f6, $f24, $f2 .L8003284C: /* DC4C 8003284C 46166081 */ sub.s $f2, $f12, $f22 /* DC50 80032850 46021082 */ mul.s $f2, $f2, $f2 -/* DC54 80032854 00000000 */ nop +/* DC54 80032854 00000000 */ nop /* DC58 80032858 46183001 */ sub.s $f0, $f6, $f24 /* DC5C 8003285C 8FA30060 */ lw $v1, 0x60($sp) /* DC60 80032860 46000002 */ mul.s $f0, $f0, $f0 -/* DC64 80032864 00000000 */ nop +/* DC64 80032864 00000000 */ nop /* DC68 80032868 E46C0000 */ swc1 $f12, ($v1) /* DC6C 8003286C 8FA30064 */ lw $v1, 0x64($sp) /* DC70 80032870 E4660000 */ swc1 $f6, ($v1) diff --git a/asm/nonmatchings/code_d610_len_1330/func_800328A4.s b/asm/nonmatchings/code_d610_len_1330/func_800328A4.s index 6eb6af8fdc..94714293c6 100644 --- a/asm/nonmatchings/code_d610_len_1330/func_800328A4.s +++ b/asm/nonmatchings/code_d610_len_1330/func_800328A4.s @@ -12,48 +12,48 @@ glabel func_800328A4 .L800328BC: /* DCBC 800328BC 8C830000 */ lw $v1, ($a0) /* DCC0 800328C0 1462FFFC */ bne $v1, $v0, .L800328B4 -/* DCC4 800328C4 00000000 */ nop +/* DCC4 800328C4 00000000 */ nop /* DCC8 800328C8 C482000C */ lwc1 $f2, 0xc($a0) /* DCCC 800328CC 46027301 */ sub.s $f12, $f14, $f2 /* DCD0 800328D0 C4880018 */ lwc1 $f8, 0x18($a0) /* DCD4 800328D4 46024081 */ sub.s $f2, $f8, $f2 /* DCD8 800328D8 460C1282 */ mul.s $f10, $f2, $f12 -/* DCDC 800328DC 00000000 */ nop +/* DCDC 800328DC 00000000 */ nop /* DCE0 800328E0 C4800014 */ lwc1 $f0, 0x14($a0) /* DCE4 800328E4 46008301 */ sub.s $f12, $f16, $f0 /* DCE8 800328E8 C4840020 */ lwc1 $f4, 0x20($a0) /* DCEC 800328EC 46002001 */ sub.s $f0, $f4, $f0 /* DCF0 800328F0 460C0182 */ mul.s $f6, $f0, $f12 -/* DCF4 800328F4 00000000 */ nop +/* DCF4 800328F4 00000000 */ nop /* DCF8 800328F8 46087301 */ sub.s $f12, $f14, $f8 /* DCFC 800328FC 460C1082 */ mul.s $f2, $f2, $f12 -/* DD00 80032900 00000000 */ nop +/* DD00 80032900 00000000 */ nop /* DD04 80032904 46048301 */ sub.s $f12, $f16, $f4 /* DD08 80032908 460C0002 */ mul.s $f0, $f0, $f12 -/* DD0C 8003290C 00000000 */ nop +/* DD0C 8003290C 00000000 */ nop /* DD10 80032910 46065280 */ add.s $f10, $f10, $f6 /* DD14 80032914 44802000 */ mtc1 $zero, $f4 -/* DD18 80032918 00000000 */ nop +/* DD18 80032918 00000000 */ nop /* DD1C 8003291C 4604503C */ c.lt.s $f10, $f4 -/* DD20 80032920 00000000 */ nop +/* DD20 80032920 00000000 */ nop /* DD24 80032924 45000005 */ bc1f .L8003293C /* DD28 80032928 46001080 */ add.s $f2, $f2, $f0 /* DD2C 8003292C 4604103C */ c.lt.s $f2, $f4 -/* DD30 80032930 00000000 */ nop +/* DD30 80032930 00000000 */ nop /* DD34 80032934 4501000C */ bc1t .L80032968 /* DD38 80032938 2402FFFF */ addiu $v0, $zero, -1 .L8003293C: /* DD3C 8003293C 44800000 */ mtc1 $zero, $f0 -/* DD40 80032940 00000000 */ nop +/* DD40 80032940 00000000 */ nop /* DD44 80032944 460A003C */ c.lt.s $f0, $f10 -/* DD48 80032948 00000000 */ nop +/* DD48 80032948 00000000 */ nop /* DD4C 8003294C 45000006 */ bc1f .L80032968 /* DD50 80032950 0000102D */ daddu $v0, $zero, $zero /* DD54 80032954 4602003C */ c.lt.s $f0, $f2 -/* DD58 80032958 00000000 */ nop +/* DD58 80032958 00000000 */ nop /* DD5C 8003295C 45010002 */ bc1t .L80032968 /* DD60 80032960 24020001 */ addiu $v0, $zero, 1 /* DD64 80032964 0000102D */ daddu $v0, $zero, $zero .L80032968: /* DD68 80032968 03E00008 */ jr $ra -/* DD6C 8003296C 00000000 */ nop +/* DD6C 8003296C 00000000 */ nop diff --git a/asm/nonmatchings/code_d610_len_1330/func_80032970.s b/asm/nonmatchings/code_d610_len_1330/func_80032970.s index 7eb8b907e4..799f786a1e 100644 --- a/asm/nonmatchings/code_d610_len_1330/func_80032970.s +++ b/asm/nonmatchings/code_d610_len_1330/func_80032970.s @@ -29,11 +29,11 @@ glabel func_80032970 /* DDC8 800329C8 3C030040 */ lui $v1, 0x40 /* DDCC 800329CC 00431024 */ and $v0, $v0, $v1 /* DDD0 800329D0 10400007 */ beqz $v0, .L800329F0 -/* DDD4 800329D4 00000000 */ nop +/* DDD4 800329D4 00000000 */ nop /* DDD8 800329D8 3C028011 */ lui $v0, %hi(D_8010EBB4) /* DDDC 800329DC 8442EBB4 */ lh $v0, %lo(D_8010EBB4)($v0) /* DDE0 800329E0 44824000 */ mtc1 $v0, $f8 -/* DDE4 800329E4 00000000 */ nop +/* DDE4 800329E4 00000000 */ nop /* DDE8 800329E8 0800CA7E */ j .L800329F8 /* DDEC 800329EC 46804220 */ cvt.s.w $f8, $f8 .L800329F0: @@ -41,35 +41,35 @@ glabel func_80032970 /* DDF4 800329F4 46804220 */ cvt.s.w $f8, $f8 .L800329F8: /* DDF8 800329F8 44800000 */ mtc1 $zero, $f0 -/* DDFC 800329FC 00000000 */ nop +/* DDFC 800329FC 00000000 */ nop /* DE00 80032A00 4608003C */ c.lt.s $f0, $f8 -/* DE04 80032A04 00000000 */ nop +/* DE04 80032A04 00000000 */ nop /* DE08 80032A08 45000004 */ bc1f .L80032A1C -/* DE0C 80032A0C 00000000 */ nop +/* DE0C 80032A0C 00000000 */ nop /* DE10 80032A10 3C014248 */ lui $at, 0x4248 /* DE14 80032A14 44814000 */ mtc1 $at, $f8 -/* DE18 80032A18 00000000 */ nop +/* DE18 80032A18 00000000 */ nop .L80032A1C: /* DE1C 80032A1C 4600403C */ c.lt.s $f8, $f0 -/* DE20 80032A20 00000000 */ nop +/* DE20 80032A20 00000000 */ nop /* DE24 80032A24 45000003 */ bc1f .L80032A34 -/* DE28 80032A28 00000000 */ nop +/* DE28 80032A28 00000000 */ nop /* DE2C 80032A2C 3C01C248 */ lui $at, 0xc248 /* DE30 80032A30 44814000 */ mtc1 $at, $f8 .L80032A34: /* DE34 80032A34 44801000 */ mtc1 $zero, $f2 -/* DE38 80032A38 00000000 */ nop +/* DE38 80032A38 00000000 */ nop /* DE3C 80032A3C 46024032 */ c.eq.s $f8, $f2 -/* DE40 80032A40 00000000 */ nop +/* DE40 80032A40 00000000 */ nop /* DE44 80032A44 4501003A */ bc1t .L80032B30 -/* DE48 80032A48 00000000 */ nop +/* DE48 80032A48 00000000 */ nop /* DE4C 80032A4C 4602403C */ c.lt.s $f8, $f2 -/* DE50 80032A50 00000000 */ nop +/* DE50 80032A50 00000000 */ nop /* DE54 80032A54 4500001C */ bc1f .L80032AC8 -/* DE58 80032A58 00000000 */ nop +/* DE58 80032A58 00000000 */ nop /* DE5C 80032A5C C4800518 */ lwc1 $f0, 0x518($a0) /* DE60 80032A60 4600103C */ c.lt.s $f2, $f0 -/* DE64 80032A64 00000000 */ nop +/* DE64 80032A64 00000000 */ nop /* DE68 80032A68 45020003 */ bc1fl .L80032A78 /* DE6C 80032A6C 46080000 */ add.s $f0, $f0, $f8 /* DE70 80032A70 0800CA9F */ j .L80032A7C @@ -80,16 +80,16 @@ glabel func_80032970 /* DE7C 80032A7C C4800518 */ lwc1 $f0, 0x518($a0) /* DE80 80032A80 3C01C396 */ lui $at, 0xc396 /* DE84 80032A84 44812000 */ mtc1 $at, $f4 -/* DE88 80032A88 00000000 */ nop +/* DE88 80032A88 00000000 */ nop /* DE8C 80032A8C 4604003E */ c.le.s $f0, $f4 -/* DE90 80032A90 00000000 */ nop +/* DE90 80032A90 00000000 */ nop /* DE94 80032A94 45000026 */ bc1f .L80032B30 /* DE98 80032A98 24020001 */ addiu $v0, $zero, 1 /* DE9C 80032A9C C4800510 */ lwc1 $f0, 0x510($a0) /* DEA0 80032AA0 44801000 */ mtc1 $zero, $f2 -/* DEA4 80032AA4 00000000 */ nop +/* DEA4 80032AA4 00000000 */ nop /* DEA8 80032AA8 4600103C */ c.lt.s $f2, $f0 -/* DEAC 80032AAC 00000000 */ nop +/* DEAC 80032AAC 00000000 */ nop /* DEB0 80032AB0 45000002 */ bc1f .L80032ABC /* DEB4 80032AB4 AC82051C */ sw $v0, 0x51c($a0) /* DEB8 80032AB8 E4820514 */ swc1 $f2, 0x514($a0) @@ -100,7 +100,7 @@ glabel func_80032970 .L80032AC8: /* DEC8 80032AC8 C4800518 */ lwc1 $f0, 0x518($a0) /* DECC 80032ACC 4602003C */ c.lt.s $f0, $f2 -/* DED0 80032AD0 00000000 */ nop +/* DED0 80032AD0 00000000 */ nop /* DED4 80032AD4 45020003 */ bc1fl .L80032AE4 /* DED8 80032AD8 46080000 */ add.s $f0, $f0, $f8 /* DEDC 80032ADC 0800CABA */ j .L80032AE8 @@ -111,16 +111,16 @@ glabel func_80032970 /* DEE8 80032AE8 C4800518 */ lwc1 $f0, 0x518($a0) /* DEEC 80032AEC 3C014396 */ lui $at, 0x4396 /* DEF0 80032AF0 44812000 */ mtc1 $at, $f4 -/* DEF4 80032AF4 00000000 */ nop +/* DEF4 80032AF4 00000000 */ nop /* DEF8 80032AF8 4600203E */ c.le.s $f4, $f0 -/* DEFC 80032AFC 00000000 */ nop +/* DEFC 80032AFC 00000000 */ nop /* DF00 80032B00 4500000B */ bc1f .L80032B30 /* DF04 80032B04 24020001 */ addiu $v0, $zero, 1 /* DF08 80032B08 C4800510 */ lwc1 $f0, 0x510($a0) /* DF0C 80032B0C 44801000 */ mtc1 $zero, $f2 -/* DF10 80032B10 00000000 */ nop +/* DF10 80032B10 00000000 */ nop /* DF14 80032B14 4602003C */ c.lt.s $f0, $f2 -/* DF18 80032B18 00000000 */ nop +/* DF18 80032B18 00000000 */ nop /* DF1C 80032B1C 45000002 */ bc1f .L80032B28 /* DF20 80032B20 AC82051C */ sw $v0, 0x51c($a0) /* DF24 80032B24 E4820514 */ swc1 $f2, 0x514($a0) @@ -131,18 +131,18 @@ glabel func_80032970 .L80032B30: /* DF30 80032B30 8C82051C */ lw $v0, 0x51c($a0) /* DF34 80032B34 1040000F */ beqz $v0, .L80032B74 -/* DF38 80032B38 00000000 */ nop +/* DF38 80032B38 00000000 */ nop /* DF3C 80032B3C C4800514 */ lwc1 $f0, 0x514($a0) /* DF40 80032B40 3C013C23 */ lui $at, 0x3c23 /* DF44 80032B44 3421D70A */ ori $at, $at, 0xd70a /* DF48 80032B48 44811000 */ mtc1 $at, $f2 -/* DF4C 80032B4C 00000000 */ nop +/* DF4C 80032B4C 00000000 */ nop /* DF50 80032B50 46020000 */ add.s $f0, $f0, $f2 /* DF54 80032B54 3C013F80 */ lui $at, 0x3f80 /* DF58 80032B58 44811000 */ mtc1 $at, $f2 -/* DF5C 80032B5C 00000000 */ nop +/* DF5C 80032B5C 00000000 */ nop /* DF60 80032B60 4600103C */ c.lt.s $f2, $f0 -/* DF64 80032B64 00000000 */ nop +/* DF64 80032B64 00000000 */ nop /* DF68 80032B68 45000002 */ bc1f .L80032B74 /* DF6C 80032B6C E4800514 */ swc1 $f0, 0x514($a0) /* DF70 80032B70 E4820514 */ swc1 $f2, 0x514($a0) @@ -151,11 +151,11 @@ glabel func_80032970 /* DF78 80032B78 C482050C */ lwc1 $f2, 0x50c($a0) /* DF7C 80032B7C 46020001 */ sub.s $f0, $f0, $f2 /* DF80 80032B80 44805000 */ mtc1 $zero, $f10 -/* DF84 80032B84 00000000 */ nop +/* DF84 80032B84 00000000 */ nop /* DF88 80032B88 460A0032 */ c.eq.s $f0, $f10 -/* DF8C 80032B8C 00000000 */ nop +/* DF8C 80032B8C 00000000 */ nop /* DF90 80032B90 45000003 */ bc1f .L80032BA0 -/* DF94 80032B94 00000000 */ nop +/* DF94 80032B94 00000000 */ nop /* DF98 80032B98 E48A0514 */ swc1 $f10, 0x514($a0) /* DF9C 80032B9C AC80051C */ sw $zero, 0x51c($a0) .L80032BA0: @@ -164,49 +164,49 @@ glabel func_80032970 /* DFA8 80032BA8 46020101 */ sub.s $f4, $f0, $f2 /* DFAC 80032BAC C4800514 */ lwc1 $f0, 0x514($a0) /* DFB0 80032BB0 46002182 */ mul.s $f6, $f4, $f0 -/* DFB4 80032BB4 00000000 */ nop +/* DFB4 80032BB4 00000000 */ nop /* DFB8 80032BB8 4604503C */ c.lt.s $f10, $f4 -/* DFBC 80032BBC 00000000 */ nop +/* DFBC 80032BBC 00000000 */ nop /* DFC0 80032BC0 4500000D */ bc1f .L80032BF8 /* DFC4 80032BC4 46002021 */ cvt.d.s $f0, $f4 /* DFC8 80032BC8 3C01800A */ lui $at, %hi(D_80098280) /* DFCC 80032BCC D4228280 */ ldc1 $f2, %lo(D_80098280)($at) /* DFD0 80032BD0 4622003C */ c.lt.d $f0, $f2 -/* DFD4 80032BD4 00000000 */ nop +/* DFD4 80032BD4 00000000 */ nop /* DFD8 80032BD8 45030001 */ bc1tl .L80032BE0 /* DFDC 80032BDC 46002186 */ mov.s $f6, $f4 .L80032BE0: /* DFE0 80032BE0 3C014040 */ lui $at, 0x4040 /* DFE4 80032BE4 44810000 */ mtc1 $at, $f0 -/* DFE8 80032BE8 00000000 */ nop +/* DFE8 80032BE8 00000000 */ nop /* DFEC 80032BEC 4606003C */ c.lt.s $f0, $f6 /* DFF0 80032BF0 0800CB09 */ j .L80032C24 -/* DFF4 80032BF4 00000000 */ nop +/* DFF4 80032BF4 00000000 */ nop .L80032BF8: /* DFF8 80032BF8 3C01800A */ lui $at, %hi(D_80098288) /* DFFC 80032BFC D4228288 */ ldc1 $f2, %lo(D_80098288)($at) /* E000 80032C00 4620103C */ c.lt.d $f2, $f0 -/* E004 80032C04 00000000 */ nop +/* E004 80032C04 00000000 */ nop /* E008 80032C08 45030001 */ bc1tl .L80032C10 /* E00C 80032C0C 46002186 */ mov.s $f6, $f4 .L80032C10: /* E010 80032C10 3C01C040 */ lui $at, 0xc040 /* E014 80032C14 44810000 */ mtc1 $at, $f0 -/* E018 80032C18 00000000 */ nop +/* E018 80032C18 00000000 */ nop /* E01C 80032C1C 4600303C */ c.lt.s $f6, $f0 -/* E020 80032C20 00000000 */ nop +/* E020 80032C20 00000000 */ nop .L80032C24: /* E024 80032C24 45030001 */ bc1tl .L80032C2C /* E028 80032C28 46000186 */ mov.s $f6, $f0 .L80032C2C: /* E02C 80032C2C 44800000 */ mtc1 $zero, $f0 -/* E030 80032C30 00000000 */ nop +/* E030 80032C30 00000000 */ nop /* E034 80032C34 46004032 */ c.eq.s $f8, $f0 -/* E038 80032C38 00000000 */ nop +/* E038 80032C38 00000000 */ nop /* E03C 80032C3C 45000003 */ bc1f .L80032C4C -/* E040 80032C40 00000000 */ nop +/* E040 80032C40 00000000 */ nop /* E044 80032C44 10C00005 */ beqz $a2, .L80032C5C -/* E048 80032C48 00000000 */ nop +/* E048 80032C48 00000000 */ nop .L80032C4C: /* E04C 80032C4C C480050C */ lwc1 $f0, 0x50c($a0) /* E050 80032C50 46060000 */ add.s $f0, $f0, $f6 diff --git a/asm/nonmatchings/code_d610_len_1330/func_80032C64.s b/asm/nonmatchings/code_d610_len_1330/func_80032C64.s index e1574e13fe..5feca12a5b 100644 --- a/asm/nonmatchings/code_d610_len_1330/func_80032C64.s +++ b/asm/nonmatchings/code_d610_len_1330/func_80032C64.s @@ -24,7 +24,7 @@ glabel func_80032C64 /* E0B0 80032CB0 44812000 */ mtc1 $at, $f4 /* E0B4 80032CB4 46020003 */ div.s $f0, $f0, $f2 /* E0B8 80032CB8 46040502 */ mul.s $f20, $f0, $f4 -/* E0BC 80032CBC 00000000 */ nop +/* E0BC 80032CBC 00000000 */ nop /* E0C0 80032CC0 0000902D */ daddu $s2, $zero, $zero /* E0C4 80032CC4 C63A050C */ lwc1 $f26, 0x50c($s1) /* E0C8 80032CC8 0C00A874 */ jal cos_rad @@ -47,18 +47,18 @@ glabel func_80032C64 /* E10C 80032D0C 1062000A */ beq $v1, $v0, .L80032D38 /* E110 80032D10 24020005 */ addiu $v0, $zero, 5 /* E114 80032D14 10620008 */ beq $v1, $v0, .L80032D38 -/* E118 80032D18 00000000 */ nop +/* E118 80032D18 00000000 */ nop /* E11C 80032D1C 8E250060 */ lw $a1, 0x60($s1) /* E120 80032D20 8E260068 */ lw $a2, 0x68($s1) /* E124 80032D24 0C00CA29 */ jal func_800328A4 /* E128 80032D28 0200202D */ daddu $a0, $s0, $zero /* E12C 80032D2C 0040902D */ daddu $s2, $v0, $zero /* E130 80032D30 12400094 */ beqz $s2, .L80032F84 -/* E134 80032D34 00000000 */ nop +/* E134 80032D34 00000000 */ nop .L80032D38: /* E138 80032D38 8E220530 */ lw $v0, 0x530($s1) /* E13C 80032D3C 10400049 */ beqz $v0, .L80032E64 -/* E140 80032D40 00000000 */ nop +/* E140 80032D40 00000000 */ nop /* E144 80032D44 263000D4 */ addiu $s0, $s1, 0xd4 /* E148 80032D48 0200202D */ daddu $a0, $s0, $zero /* E14C 80032D4C 8627000A */ lh $a3, 0xa($s1) @@ -67,20 +67,20 @@ glabel func_80032C64 /* E158 80032D58 3C013F80 */ lui $at, 0x3f80 /* E15C 80032D5C 4481A000 */ mtc1 $at, $f20 /* E160 80032D60 44820000 */ mtc1 $v0, $f0 -/* E164 80032D64 00000000 */ nop +/* E164 80032D64 00000000 */ nop /* E168 80032D68 46800020 */ cvt.s.w $f0, $f0 /* E16C 80032D6C E7A00010 */ swc1 $f0, 0x10($sp) /* E170 80032D70 86220014 */ lh $v0, 0x14($s1) /* E174 80032D74 44871000 */ mtc1 $a3, $f2 -/* E178 80032D78 00000000 */ nop +/* E178 80032D78 00000000 */ nop /* E17C 80032D7C 468010A0 */ cvt.s.w $f2, $f2 /* E180 80032D80 E7B40018 */ swc1 $f20, 0x18($sp) /* E184 80032D84 44820000 */ mtc1 $v0, $f0 -/* E188 80032D88 00000000 */ nop +/* E188 80032D88 00000000 */ nop /* E18C 80032D8C 46800020 */ cvt.s.w $f0, $f0 /* E190 80032D90 E7A00014 */ swc1 $f0, 0x14($sp) /* E194 80032D94 44830000 */ mtc1 $v1, $f0 -/* E198 80032D98 00000000 */ nop +/* E198 80032D98 00000000 */ nop /* E19C 80032D9C 46800020 */ cvt.s.w $f0, $f0 /* E1A0 80032DA0 46001083 */ div.s $f2, $f2, $f0 /* E1A4 80032DA4 8E260018 */ lw $a2, 0x18($s1) @@ -107,9 +107,9 @@ glabel func_80032C64 /* E1F8 80032DF8 0200202D */ daddu $a0, $s0, $zero /* E1FC 80032DFC C7A0003C */ lwc1 $f0, 0x3c($sp) /* E200 80032E00 44802000 */ mtc1 $zero, $f4 -/* E204 80032E04 00000000 */ nop +/* E204 80032E04 00000000 */ nop /* E208 80032E08 46040032 */ c.eq.s $f0, $f4 -/* E20C 80032E0C 00000000 */ nop +/* E20C 80032E0C 00000000 */ nop /* E210 80032E10 45030001 */ bc1tl .L80032E18 /* E214 80032E14 E7B4003C */ swc1 $f20, 0x3c($sp) .L80032E18: @@ -117,7 +117,7 @@ glabel func_80032C64 /* E21C 80032E1C C7A20030 */ lwc1 $f2, 0x30($sp) /* E220 80032E20 4600A003 */ div.s $f0, $f20, $f0 /* E224 80032E24 46001082 */ mul.s $f2, $f2, $f0 -/* E228 80032E28 00000000 */ nop +/* E228 80032E28 00000000 */ nop /* E22C 80032E2C 2623052C */ addiu $v1, $s1, 0x52c /* E230 80032E30 E7A0003C */ swc1 $f0, 0x3c($sp) /* E234 80032E34 4602203C */ c.lt.s $f4, $f2 @@ -125,7 +125,7 @@ glabel func_80032C64 /* E23C 80032E3C 45010006 */ bc1t .L80032E58 /* E240 80032E40 24020001 */ addiu $v0, $zero, 1 /* E244 80032E44 4604103C */ c.lt.s $f2, $f4 -/* E248 80032E48 00000000 */ nop +/* E248 80032E48 00000000 */ nop /* E24C 80032E4C 45000002 */ bc1f .L80032E58 /* E250 80032E50 0000102D */ daddu $v0, $zero, $zero /* E254 80032E54 2402FFFF */ addiu $v0, $zero, -1 @@ -136,21 +136,21 @@ glabel func_80032C64 .L80032E64: /* E264 80032E64 8E220534 */ lw $v0, 0x534($s1) /* E268 80032E68 10400011 */ beqz $v0, .L80032EB0 -/* E26C 80032E6C 00000000 */ nop +/* E26C 80032E6C 00000000 */ nop /* E270 80032E70 8C430000 */ lw $v1, ($v0) /* E274 80032E74 24020002 */ addiu $v0, $zero, 2 /* E278 80032E78 1062002A */ beq $v1, $v0, .L80032F24 /* E27C 80032E7C 24020005 */ addiu $v0, $zero, 5 /* E280 80032E80 10620028 */ beq $v1, $v0, .L80032F24 -/* E284 80032E84 00000000 */ nop +/* E284 80032E84 00000000 */ nop /* E288 80032E88 8E250524 */ lw $a1, 0x524($s1) /* E28C 80032E8C 8E260528 */ lw $a2, 0x528($s1) /* E290 80032E90 0C00CA29 */ jal func_800328A4 /* E294 80032E94 0200202D */ daddu $a0, $s0, $zero /* E298 80032E98 14400022 */ bnez $v0, .L80032F24 -/* E29C 80032E9C 00000000 */ nop +/* E29C 80032E9C 00000000 */ nop /* E2A0 80032EA0 12400003 */ beqz $s2, .L80032EB0 -/* E2A4 80032EA4 00000000 */ nop +/* E2A4 80032EA4 00000000 */ nop /* E2A8 80032EA8 0800CBC9 */ j .L80032F24 /* E2AC 80032EAC AE32052C */ sw $s2, 0x52c($s1) .L80032EB0: @@ -166,19 +166,19 @@ glabel func_80032C64 /* E2D4 80032ED4 0C00A8BB */ jal sin_deg /* E2D8 80032ED8 46000507 */ neg.s $f20, $f0 /* E2DC 80032EDC 4614C602 */ mul.s $f24, $f24, $f20 -/* E2E0 80032EE0 00000000 */ nop +/* E2E0 80032EE0 00000000 */ nop /* E2E4 80032EE4 46000007 */ neg.s $f0, $f0 /* E2E8 80032EE8 4600B582 */ mul.s $f22, $f22, $f0 -/* E2EC 80032EEC 00000000 */ nop +/* E2EC 80032EEC 00000000 */ nop /* E2F0 80032EF0 4616C600 */ add.s $f24, $f24, $f22 /* E2F4 80032EF4 44800000 */ mtc1 $zero, $f0 -/* E2F8 80032EF8 00000000 */ nop +/* E2F8 80032EF8 00000000 */ nop /* E2FC 80032EFC 4618003C */ c.lt.s $f0, $f24 -/* E300 80032F00 00000000 */ nop +/* E300 80032F00 00000000 */ nop /* E304 80032F04 45010006 */ bc1t .L80032F20 /* E308 80032F08 2402FFFF */ addiu $v0, $zero, -1 /* E30C 80032F0C 4600C03C */ c.lt.s $f24, $f0 -/* E310 80032F10 00000000 */ nop +/* E310 80032F10 00000000 */ nop /* E314 80032F14 45010002 */ bc1t .L80032F20 /* E318 80032F18 24020001 */ addiu $v0, $zero, 1 /* E31C 80032F1C 0000102D */ daddu $v0, $zero, $zero @@ -186,22 +186,22 @@ glabel func_80032C64 /* E320 80032F20 AE22052C */ sw $v0, 0x52c($s1) .L80032F24: /* E324 80032F24 44800000 */ mtc1 $zero, $f0 -/* E328 80032F28 00000000 */ nop +/* E328 80032F28 00000000 */ nop /* E32C 80032F2C 461A003C */ c.lt.s $f0, $f26 -/* E330 80032F30 00000000 */ nop +/* E330 80032F30 00000000 */ nop /* E334 80032F34 45000004 */ bc1f .L80032F48 -/* E338 80032F38 00000000 */ nop +/* E338 80032F38 00000000 */ nop /* E33C 80032F3C 8E22052C */ lw $v0, 0x52c($s1) /* E340 80032F40 5C400009 */ bgtzl $v0, .L80032F68 /* E344 80032F44 AE200514 */ sw $zero, 0x514($s1) .L80032F48: /* E348 80032F48 4600D03C */ c.lt.s $f26, $f0 -/* E34C 80032F4C 00000000 */ nop +/* E34C 80032F4C 00000000 */ nop /* E350 80032F50 45000006 */ bc1f .L80032F6C -/* E354 80032F54 00000000 */ nop +/* E354 80032F54 00000000 */ nop /* E358 80032F58 8E22052C */ lw $v0, 0x52c($s1) /* E35C 80032F5C 04410003 */ bgez $v0, .L80032F6C -/* E360 80032F60 00000000 */ nop +/* E360 80032F60 00000000 */ nop /* E364 80032F64 AE200514 */ sw $zero, 0x514($s1) .L80032F68: /* E368 80032F68 AE20050C */ sw $zero, 0x50c($s1) @@ -222,13 +222,13 @@ glabel func_80032C64 /* E39C 80032F9C 0C00A874 */ jal cos_rad /* E3A0 80032FA0 E6220528 */ swc1 $f2, 0x528($s1) /* E3A4 80032FA4 4600D002 */ mul.s $f0, $f26, $f0 -/* E3A8 80032FA8 00000000 */ nop +/* E3A8 80032FA8 00000000 */ nop /* E3AC 80032FAC C6220060 */ lwc1 $f2, 0x60($s1) /* E3B0 80032FB0 46001700 */ add.s $f28, $f2, $f0 /* E3B4 80032FB4 0C00A85B */ jal sin_rad /* E3B8 80032FB8 4600A306 */ mov.s $f12, $f20 /* E3BC 80032FBC 4600D002 */ mul.s $f0, $f26, $f0 -/* E3C0 80032FC0 00000000 */ nop +/* E3C0 80032FC0 00000000 */ nop /* E3C4 80032FC4 C6220068 */ lwc1 $f2, 0x68($s1) /* E3C8 80032FC8 3C014120 */ lui $at, 0x4120 /* E3CC 80032FCC 44817000 */ mtc1 $at, $f14 @@ -246,14 +246,14 @@ glabel func_80032C64 /* E3FC 80032FFC 1082000A */ beq $a0, $v0, .L80033028 /* E400 80033000 24020005 */ addiu $v0, $zero, 5 /* E404 80033004 10820008 */ beq $a0, $v0, .L80033028 -/* E408 80033008 00000000 */ nop +/* E408 80033008 00000000 */ nop /* E40C 8003300C 8E240534 */ lw $a0, 0x534($s1) /* E410 80033010 4405E000 */ mfc1 $a1, $f28 /* E414 80033014 4406D000 */ mfc1 $a2, $f26 /* E418 80033018 0C00CA29 */ jal func_800328A4 -/* E41C 8003301C 00000000 */ nop +/* E41C 8003301C 00000000 */ nop /* E420 80033020 104000CE */ beqz $v0, .L8003335C -/* E424 80033024 00000000 */ nop +/* E424 80033024 00000000 */ nop .L80033028: /* E428 80033028 8E240534 */ lw $a0, 0x534($s1) /* E42C 8003302C 3C014974 */ lui $at, 0x4974 @@ -292,10 +292,10 @@ glabel func_80032C64 /* E4B0 800330B0 0C00C979 */ jal func_800325E4 /* E4B4 800330B4 0000902D */ daddu $s2, $zero, $zero /* E4B8 800330B8 10400006 */ beqz $v0, .L800330D4 -/* E4BC 800330BC 00000000 */ nop +/* E4BC 800330BC 00000000 */ nop /* E4C0 800330C0 C7A0004C */ lwc1 $f0, 0x4c($sp) /* E4C4 800330C4 4614003C */ c.lt.s $f0, $f20 -/* E4C8 800330C8 00000000 */ nop +/* E4C8 800330C8 00000000 */ nop /* E4CC 800330CC 45030001 */ bc1tl .L800330D4 /* E4D0 800330D0 46000506 */ mov.s $f20, $f0 .L800330D4: @@ -320,17 +320,17 @@ glabel func_80032C64 /* E51C 8003311C 44061000 */ mfc1 $a2, $f2 /* E520 80033120 44072000 */ mfc1 $a3, $f4 /* E524 80033124 0C00C979 */ jal func_800325E4 -/* E528 80033128 00000000 */ nop +/* E528 80033128 00000000 */ nop /* E52C 8003312C 10400006 */ beqz $v0, .L80033148 -/* E530 80033130 00000000 */ nop +/* E530 80033130 00000000 */ nop /* E534 80033134 C7A0004C */ lwc1 $f0, 0x4c($sp) /* E538 80033138 4614003C */ c.lt.s $f0, $f20 -/* E53C 8003313C 00000000 */ nop +/* E53C 8003313C 00000000 */ nop /* E540 80033140 45030001 */ bc1tl .L80033148 /* E544 80033144 46000506 */ mov.s $f20, $f0 .L80033148: /* E548 80033148 1240005C */ beqz $s2, .L800332BC -/* E54C 8003314C 00000000 */ nop +/* E54C 8003314C 00000000 */ nop /* E550 80033150 8FA30040 */ lw $v1, 0x40($sp) /* E554 80033154 8462000A */ lh $v0, 0xa($v1) /* E558 80033158 18400058 */ blez $v0, .L800332BC @@ -359,10 +359,10 @@ glabel func_80032C64 /* E5B0 800331B0 0C00C8B7 */ jal func_800322DC /* E5B4 800331B4 8C470008 */ lw $a3, 8($v0) /* E5B8 800331B8 10400006 */ beqz $v0, .L800331D4 -/* E5BC 800331BC 00000000 */ nop +/* E5BC 800331BC 00000000 */ nop /* E5C0 800331C0 C7A0004C */ lwc1 $f0, 0x4c($sp) /* E5C4 800331C4 4614003C */ c.lt.s $f0, $f20 -/* E5C8 800331C8 00000000 */ nop +/* E5C8 800331C8 00000000 */ nop /* E5CC 800331CC 45030001 */ bc1tl .L800331D4 /* E5D0 800331D0 46000506 */ mov.s $f20, $f0 .L800331D4: @@ -386,10 +386,10 @@ glabel func_80032C64 /* E618 80033218 0C00C8B7 */ jal func_800322DC /* E61C 8003321C 8C470008 */ lw $a3, 8($v0) /* E620 80033220 10400006 */ beqz $v0, .L8003323C -/* E624 80033224 00000000 */ nop +/* E624 80033224 00000000 */ nop /* E628 80033228 C7A0004C */ lwc1 $f0, 0x4c($sp) /* E62C 8003322C 4614003C */ c.lt.s $f0, $f20 -/* E630 80033230 00000000 */ nop +/* E630 80033230 00000000 */ nop /* E634 80033234 45030001 */ bc1tl .L8003323C /* E638 80033238 46000506 */ mov.s $f20, $f0 .L8003323C: @@ -413,10 +413,10 @@ glabel func_80032C64 /* E680 80033280 0C00C8B7 */ jal func_800322DC /* E684 80033284 8C470008 */ lw $a3, 8($v0) /* E688 80033288 10400006 */ beqz $v0, .L800332A4 -/* E68C 8003328C 00000000 */ nop +/* E68C 8003328C 00000000 */ nop /* E690 80033290 C7A0004C */ lwc1 $f0, 0x4c($sp) /* E694 80033294 4614003C */ c.lt.s $f0, $f20 -/* E698 80033298 00000000 */ nop +/* E698 80033298 00000000 */ nop /* E69C 8003329C 45030001 */ bc1tl .L800332A4 /* E6A0 800332A0 46000506 */ mov.s $f20, $f0 .L800332A4: @@ -430,28 +430,28 @@ glabel func_80032C64 /* E6BC 800332BC 3C014974 */ lui $at, 0x4974 /* E6C0 800332C0 34212400 */ ori $at, $at, 0x2400 /* E6C4 800332C4 44810000 */ mtc1 $at, $f0 -/* E6C8 800332C8 00000000 */ nop +/* E6C8 800332C8 00000000 */ nop /* E6CC 800332CC 4600A032 */ c.eq.s $f20, $f0 -/* E6D0 800332D0 00000000 */ nop +/* E6D0 800332D0 00000000 */ nop /* E6D4 800332D4 45030020 */ bc1tl .L80033358 /* E6D8 800332D8 AE20050C */ sw $zero, 0x50c($s1) /* E6DC 800332DC 44801000 */ mtc1 $zero, $f2 -/* E6E0 800332E0 00000000 */ nop +/* E6E0 800332E0 00000000 */ nop /* E6E4 800332E4 4602A032 */ c.eq.s $f20, $f2 -/* E6E8 800332E8 00000000 */ nop +/* E6E8 800332E8 00000000 */ nop /* E6EC 800332EC 45000003 */ bc1f .L800332FC -/* E6F0 800332F0 00000000 */ nop +/* E6F0 800332F0 00000000 */ nop /* E6F4 800332F4 0800CCD6 */ j .L80033358 /* E6F8 800332F8 AE20050C */ sw $zero, 0x50c($s1) .L800332FC: /* E6FC 800332FC C620050C */ lwc1 $f0, 0x50c($s1) /* E700 80033300 4600103C */ c.lt.s $f2, $f0 -/* E704 80033304 00000000 */ nop +/* E704 80033304 00000000 */ nop /* E708 80033308 4500000A */ bc1f .L80033334 /* E70C 8003330C 2630050C */ addiu $s0, $s1, 0x50c /* E710 80033310 4600A004 */ sqrt.s $f0, $f20 /* E714 80033314 46000032 */ c.eq.s $f0, $f0 -/* E718 80033318 00000000 */ nop +/* E718 80033318 00000000 */ nop /* E71C 8003331C 4503000E */ bc1tl .L80033358 /* E720 80033320 E6000000 */ swc1 $f0, ($s0) /* E724 80033324 0C0187BC */ jal sqrtf @@ -461,7 +461,7 @@ glabel func_80032C64 .L80033334: /* E734 80033334 4600A004 */ sqrt.s $f0, $f20 /* E738 80033338 46000032 */ c.eq.s $f0, $f0 -/* E73C 8003333C 00000000 */ nop +/* E73C 8003333C 00000000 */ nop /* E740 80033340 45030004 */ bc1tl .L80033354 /* E744 80033344 46000007 */ neg.s $f0, $f0 /* E748 80033348 0C0187BC */ jal sqrtf diff --git a/asm/nonmatchings/code_d610_len_1330/func_80033394.s b/asm/nonmatchings/code_d610_len_1330/func_80033394.s index 0a0fb9648c..dd03ea2ad9 100644 --- a/asm/nonmatchings/code_d610_len_1330/func_80033394.s +++ b/asm/nonmatchings/code_d610_len_1330/func_80033394.s @@ -12,34 +12,34 @@ glabel func_80033394 /* E7B0 800333B0 C6000048 */ lwc1 $f0, 0x48($s0) /* E7B4 800333B4 46001081 */ sub.s $f2, $f2, $f0 /* E7B8 800333B8 46021082 */ mul.s $f2, $f2, $f2 -/* E7BC 800333BC 00000000 */ nop +/* E7BC 800333BC 00000000 */ nop /* E7C0 800333C0 C6060040 */ lwc1 $f6, 0x40($s0) /* E7C4 800333C4 C600004C */ lwc1 $f0, 0x4c($s0) /* E7C8 800333C8 46003181 */ sub.s $f6, $f6, $f0 /* E7CC 800333CC 46063182 */ mul.s $f6, $f6, $f6 -/* E7D0 800333D0 00000000 */ nop +/* E7D0 800333D0 00000000 */ nop /* E7D4 800333D4 C6040050 */ lwc1 $f4, 0x50($s0) /* E7D8 800333D8 C6000044 */ lwc1 $f0, 0x44($s0) /* E7DC 800333DC 46040001 */ sub.s $f0, $f0, $f4 /* E7E0 800333E0 46000002 */ mul.s $f0, $f0, $f0 -/* E7E4 800333E4 00000000 */ nop +/* E7E4 800333E4 00000000 */ nop /* E7E8 800333E8 46061080 */ add.s $f2, $f2, $f6 /* E7EC 800333EC 46001300 */ add.s $f12, $f2, $f0 /* E7F0 800333F0 46006584 */ sqrt.s $f22, $f12 /* E7F4 800333F4 4616B032 */ c.eq.s $f22, $f22 -/* E7F8 800333F8 00000000 */ nop +/* E7F8 800333F8 00000000 */ nop /* E7FC 800333FC 45010004 */ bc1t .L80033410 -/* E800 80033400 00000000 */ nop +/* E800 80033400 00000000 */ nop /* E804 80033404 0C0187BC */ jal sqrtf -/* E808 80033408 00000000 */ nop +/* E808 80033408 00000000 */ nop /* E80C 8003340C 46000586 */ mov.s $f22, $f0 .L80033410: /* E810 80033410 C6140018 */ lwc1 $f20, 0x18($s0) /* E814 80033414 3C013F00 */ lui $at, 0x3f00 /* E818 80033418 44810000 */ mtc1 $at, $f0 -/* E81C 8003341C 00000000 */ nop +/* E81C 8003341C 00000000 */ nop /* E820 80033420 4600A502 */ mul.s $f20, $f20, $f0 -/* E824 80033424 00000000 */ nop +/* E824 80033424 00000000 */ nop /* E828 80033428 3C014334 */ lui $at, 0x4334 /* E82C 8003342C 44810000 */ mtc1 $at, $f0 /* E830 80033430 3C014049 */ lui $at, 0x4049 @@ -47,28 +47,28 @@ glabel func_80033394 /* E838 80033438 44811000 */ mtc1 $at, $f2 /* E83C 8003343C 4600A503 */ div.s $f20, $f20, $f0 /* E840 80033440 4602A502 */ mul.s $f20, $f20, $f2 -/* E844 80033444 00000000 */ nop +/* E844 80033444 00000000 */ nop /* E848 80033448 0C00A85B */ jal sin_rad /* E84C 8003344C 4600A306 */ mov.s $f12, $f20 /* E850 80033450 4600B582 */ mul.s $f22, $f22, $f0 -/* E854 80033454 00000000 */ nop +/* E854 80033454 00000000 */ nop /* E858 80033458 0C00A874 */ jal cos_rad /* E85C 8003345C 4600A306 */ mov.s $f12, $f20 /* E860 80033460 8602000A */ lh $v0, 0xa($s0) /* E864 80033464 4600B583 */ div.s $f22, $f22, $f0 /* E868 80033468 44820000 */ mtc1 $v0, $f0 -/* E86C 8003346C 00000000 */ nop +/* E86C 8003346C 00000000 */ nop /* E870 80033470 46800020 */ cvt.s.w $f0, $f0 /* E874 80033474 4600B582 */ mul.s $f22, $f22, $f0 -/* E878 80033478 00000000 */ nop +/* E878 80033478 00000000 */ nop /* E87C 8003347C 8602000C */ lh $v0, 0xc($s0) /* E880 80033480 C6020520 */ lwc1 $f2, 0x520($s0) /* E884 80033484 44820000 */ mtc1 $v0, $f0 -/* E888 80033488 00000000 */ nop +/* E888 80033488 00000000 */ nop /* E88C 8003348C 46800020 */ cvt.s.w $f0, $f0 /* E890 80033490 4600B583 */ div.s $f22, $f22, $f0 /* E894 80033494 4602B582 */ mul.s $f22, $f22, $f2 -/* E898 80033498 00000000 */ nop +/* E898 80033498 00000000 */ nop /* E89C 8003349C 4405B000 */ mfc1 $a1, $f22 /* E8A0 800334A0 0C00CA5C */ jal func_80032970 /* E8A4 800334A4 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/code_d610_len_1330/get_game_mode.s b/asm/nonmatchings/code_d610_len_1330/get_game_mode.s index 1d821f2e78..acae19f0bd 100644 --- a/asm/nonmatchings/code_d610_len_1330/get_game_mode.s +++ b/asm/nonmatchings/code_d610_len_1330/get_game_mode.s @@ -5,6 +5,6 @@ glabel get_game_mode /* E928 80033528 3C02800A */ lui $v0, %hi(D_800A08F0) /* E92C 8003352C 844208F0 */ lh $v0, %lo(D_800A08F0)($v0) /* E930 80033530 03E00008 */ jr $ra -/* E934 80033534 00000000 */ nop -/* E938 80033538 00000000 */ nop -/* E93C 8003353C 00000000 */ nop +/* E934 80033534 00000000 */ nop +/* E938 80033538 00000000 */ nop +/* E93C 8003353C 00000000 */ nop diff --git a/asm/nonmatchings/code_dbd70_len_700/clear_trigger_data.s b/asm/nonmatchings/code_dbd70_len_700/clear_trigger_data.s index bf3cecc2dc..a1a955a6ff 100644 --- a/asm/nonmatchings/code_dbd70_len_700/clear_trigger_data.s +++ b/asm/nonmatchings/code_dbd70_len_700/clear_trigger_data.s @@ -8,11 +8,11 @@ glabel clear_trigger_data /* DBD8C 8014568C 3C048016 */ lui $a0, %hi(gCollisionStatus) /* DBD90 80145690 2484A550 */ addiu $a0, $a0, %lo(gCollisionStatus) /* DBD94 80145694 14400005 */ bnez $v0, .L801456AC -/* DBD98 80145698 00000000 */ nop +/* DBD98 80145698 00000000 */ nop /* DBD9C 8014569C 3C028016 */ lui $v0, %hi(gTriggerList1) /* DBDA0 801456A0 24429190 */ addiu $v0, $v0, %lo(gTriggerList1) /* DBDA4 801456A4 080515AD */ j .L801456B4 -/* DBDA8 801456A8 00000000 */ nop +/* DBDA8 801456A8 00000000 */ nop .L801456AC: /* DBDAC 801456AC 3C028016 */ lui $v0, %hi(gTriggerList2) /* DBDB0 801456B0 24429290 */ addiu $v0, $v0, %lo(gTriggerList2) diff --git a/asm/nonmatchings/code_dbd70_len_700/create_trigger.s b/asm/nonmatchings/code_dbd70_len_700/create_trigger.s index ee08772979..9a37a8ffd7 100644 --- a/asm/nonmatchings/code_dbd70_len_700/create_trigger.s +++ b/asm/nonmatchings/code_dbd70_len_700/create_trigger.s @@ -21,10 +21,10 @@ glabel create_trigger /* DBEA8 801457A8 2A020040 */ slti $v0, $s0, 0x40 .L801457AC: /* DBEAC 801457AC 14400003 */ bnez $v0, .L801457BC -/* DBEB0 801457B0 00000000 */ nop +/* DBEB0 801457B0 00000000 */ nop .L801457B4: /* DBEB4 801457B4 080515ED */ j .L801457B4 -/* DBEB8 801457B8 00000000 */ nop +/* DBEB8 801457B8 00000000 */ nop .L801457BC: /* DBEBC 801457BC 0C00AB39 */ jal heap_malloc /* DBEC0 801457C0 24040038 */ addiu $a0, $zero, 0x38 @@ -42,7 +42,7 @@ glabel create_trigger /* DBEF0 801457F0 A4A30000 */ sh $v1, ($a1) .L801457F4: /* DBEF4 801457F4 080515FD */ j .L801457F4 -/* DBEF8 801457F8 00000000 */ nop +/* DBEF8 801457F8 00000000 */ nop .L801457FC: /* DBEFC 801457FC 8E220000 */ lw $v0, ($s1) /* DBF00 80145800 34420001 */ ori $v0, $v0, 1 diff --git a/asm/nonmatchings/code_dbd70_len_700/is_trigger_bound.s b/asm/nonmatchings/code_dbd70_len_700/is_trigger_bound.s index 2bea968d13..bd7ffb0c5e 100644 --- a/asm/nonmatchings/code_dbd70_len_700/is_trigger_bound.s +++ b/asm/nonmatchings/code_dbd70_len_700/is_trigger_bound.s @@ -17,7 +17,7 @@ glabel is_trigger_bound /* DC398 80145C98 25080001 */ addiu $t0, $t0, 1 /* DC39C 80145C9C 30C20002 */ andi $v0, $a2, 2 /* DC3A0 80145CA0 10400006 */ beqz $v0, .L80145CBC -/* DC3A4 80145CA4 00000000 */ nop +/* DC3A4 80145CA4 00000000 */ nop /* DC3A8 80145CA8 8C620010 */ lw $v0, 0x10($v1) /* DC3AC 80145CAC 14450004 */ bne $v0, $a1, .L80145CC0 /* DC3B0 80145CB0 29020040 */ slti $v0, $t0, 0x40 diff --git a/asm/nonmatchings/code_dbd70_len_700/update_triggers.s b/asm/nonmatchings/code_dbd70_len_700/update_triggers.s index 471505641d..de74a3830d 100644 --- a/asm/nonmatchings/code_dbd70_len_700/update_triggers.s +++ b/asm/nonmatchings/code_dbd70_len_700/update_triggers.s @@ -29,11 +29,11 @@ glabel update_triggers /* DBFBC 801458BC 34620002 */ ori $v0, $v1, 2 /* DBFC0 801458C0 30620040 */ andi $v0, $v1, 0x40 /* DBFC4 801458C4 1040000D */ beqz $v0, .L801458FC -/* DBFC8 801458C8 00000000 */ nop +/* DBFC8 801458C8 00000000 */ nop /* DBFCC 801458CC 86430012 */ lh $v1, 0x12($s2) /* DBFD0 801458D0 8E220008 */ lw $v0, 8($s1) /* DBFD4 801458D4 14430003 */ bne $v0, $v1, .L801458E4 -/* DBFD8 801458D8 00000000 */ nop +/* DBFD8 801458D8 00000000 */ nop /* DBFDC 801458DC 0C0381B0 */ jal func_800E06C0 /* DBFE0 801458E0 24040001 */ addiu $a0, $zero, 1 .L801458E4: @@ -64,7 +64,7 @@ glabel update_triggers /* DC03C 8014593C 30820100 */ andi $v0, $a0, 0x100 .L80145940: /* DC040 80145940 1040000E */ beqz $v0, .L8014597C -/* DC044 80145944 00000000 */ nop +/* DC044 80145944 00000000 */ nop /* DC048 80145948 86430012 */ lh $v1, 0x12($s2) /* DC04C 8014594C 8E220008 */ lw $v0, 8($s1) /* DC050 80145950 14430002 */ bne $v0, $v1, .L8014595C @@ -76,7 +76,7 @@ glabel update_triggers /* DC064 80145964 5443007F */ bnel $v0, $v1, .L80145B64 /* DC068 80145968 26730001 */ addiu $s3, $s3, 1 /* DC06C 8014596C 0C0394BE */ jal func_800E52F8 -/* DC070 80145970 00000000 */ nop +/* DC070 80145970 00000000 */ nop /* DC074 80145974 5040007B */ beql $v0, $zero, .L80145B64 /* DC078 80145978 26730001 */ addiu $s3, $s3, 1 .L8014597C: @@ -160,7 +160,7 @@ glabel update_triggers .L80145A94: /* DC194 80145A94 00821024 */ and $v0, $a0, $v0 /* DC198 80145A98 1040001C */ beqz $v0, .L80145B0C -/* DC19C 80145A9C 00000000 */ nop +/* DC19C 80145A9C 00000000 */ nop /* DC1A0 80145AA0 86420018 */ lh $v0, 0x18($s2) /* DC1A4 80145AA4 0442002F */ bltzl $v0, .L80145B64 /* DC1A8 80145AA8 26730001 */ addiu $s3, $s3, 1 @@ -177,15 +177,15 @@ glabel update_triggers /* DC1D4 80145AD4 C604000C */ lwc1 $f4, 0xc($s0) /* DC1D8 80145AD8 3C013F00 */ lui $at, 0x3f00 /* DC1DC 80145ADC 44811000 */ mtc1 $at, $f2 -/* DC1E0 80145AE0 00000000 */ nop +/* DC1E0 80145AE0 00000000 */ nop /* DC1E4 80145AE4 46022102 */ mul.s $f4, $f4, $f2 -/* DC1E8 80145AE8 00000000 */ nop +/* DC1E8 80145AE8 00000000 */ nop /* DC1EC 80145AEC 3C014248 */ lui $at, 0x4248 /* DC1F0 80145AF0 44811000 */ mtc1 $at, $f2 -/* DC1F4 80145AF4 00000000 */ nop +/* DC1F4 80145AF4 00000000 */ nop /* DC1F8 80145AF8 46022100 */ add.s $f4, $f4, $f2 /* DC1FC 80145AFC 4600203C */ c.lt.s $f4, $f0 -/* DC200 80145B00 00000000 */ nop +/* DC200 80145B00 00000000 */ nop /* DC204 80145B04 45030017 */ bc1tl .L80145B64 /* DC208 80145B08 26730001 */ addiu $s3, $s3, 1 .L80145B0C: @@ -193,7 +193,7 @@ glabel update_triggers /* DC210 80145B10 3C030001 */ lui $v1, 1 /* DC214 80145B14 00431024 */ and $v0, $v0, $v1 /* DC218 80145B18 10400005 */ beqz $v0, .L80145B30 -/* DC21C 80145B1C 00000000 */ nop +/* DC21C 80145B1C 00000000 */ nop /* DC220 80145B20 0C05152F */ jal get_global_flag /* DC224 80145B24 8E240004 */ lw $a0, 4($s1) /* DC228 80145B28 5040000E */ beql $v0, $zero, .L80145B64 @@ -203,7 +203,7 @@ glabel update_triggers /* DC234 80145B34 3C030002 */ lui $v1, 2 /* DC238 80145B38 00431024 */ and $v0, $v0, $v1 /* DC23C 80145B3C 10400005 */ beqz $v0, .L80145B54 -/* DC240 80145B40 00000000 */ nop +/* DC240 80145B40 00000000 */ nop /* DC244 80145B44 0C05157C */ jal get_area_flag /* DC248 80145B48 8E240004 */ lw $a0, 4($s1) /* DC24C 80145B4C 50400005 */ beql $v0, $zero, .L80145B64 @@ -245,7 +245,7 @@ glabel update_triggers .L80145BCC: /* DC2CC 80145BCC 2A620040 */ slti $v0, $s3, 0x40 /* DC2D0 80145BD0 1440FFE8 */ bnez $v0, .L80145B74 -/* DC2D4 80145BD4 00000000 */ nop +/* DC2D4 80145BD4 00000000 */ nop /* DC2D8 80145BD8 8FBF0028 */ lw $ra, 0x28($sp) /* DC2DC 80145BDC 8FB30024 */ lw $s3, 0x24($sp) /* DC2E0 80145BE0 8FB20020 */ lw $s2, 0x20($sp) diff --git a/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s b/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s index fa32ecd614..53456a3730 100644 --- a/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s +++ b/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s @@ -93,16 +93,18 @@ glabel func_80145EC0 /* DC710 80146010 2C620005 */ sltiu $v0, $v1, 5 /* DC714 80146014 10400067 */ beqz $v0, .L801461B4 /* DC718 80146018 00031080 */ sll $v0, $v1, 2 -/* DC71C 8014601C 3C018015 */ lui $at, %hi(D_80151220) +/* DC71C 8014601C 3C018015 */ lui $at, %hi(jtbl_80151220_E7920) /* DC720 80146020 00220821 */ addu $at, $at, $v0 -/* DC724 80146024 8C221220 */ lw $v0, %lo(D_80151220)($at) +/* DC724 80146024 8C221220 */ lw $v0, %lo(jtbl_80151220_E7920)($at) /* DC728 80146028 00400008 */ jr $v0 -/* DC72C 8014602C 00000000 */ nop +/* DC72C 8014602C 00000000 */ nop +glabel L80146030_DC730 /* DC730 80146030 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* DC734 80146034 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) /* DC738 80146038 94620148 */ lhu $v0, 0x148($v1) /* DC73C 8014603C 0805186C */ j .L801461B0 /* DC740 80146040 3042FFFD */ andi $v0, $v0, 0xfffd +glabel L80146044_DC744 /* DC744 80146044 3C078007 */ lui $a3, %hi(gGameStatusPtr) /* DC748 80146048 8CE7419C */ lw $a3, %lo(gGameStatusPtr)($a3) /* DC74C 8014604C 93A60028 */ lbu $a2, 0x28($sp) @@ -117,6 +119,7 @@ glabel func_80145EC0 /* DC770 80146070 34420002 */ ori $v0, $v0, 2 /* DC774 80146074 0805186D */ j .L801461B4 /* DC778 80146078 A4E20148 */ sh $v0, 0x148($a3) +glabel L8014607C_DC77C /* DC77C 8014607C 240700FF */ addiu $a3, $zero, 0xff /* DC780 80146080 93A8002B */ lbu $t0, 0x2b($sp) /* DC784 80146084 8FA20018 */ lw $v0, 0x18($sp) @@ -124,7 +127,7 @@ glabel func_80145EC0 /* DC78C 8014608C 00470018 */ mult $v0, $a3 /* DC790 80146090 00001812 */ mflo $v1 /* DC794 80146094 93A20028 */ lbu $v0, 0x28($sp) -/* DC798 80146098 00000000 */ nop +/* DC798 80146098 00000000 */ nop /* DC79C 8014609C 00480018 */ mult $v0, $t0 /* DC7A0 801460A0 3C098080 */ lui $t1, 0x8080 /* DC7A4 801460A4 00005012 */ mflo $t2 @@ -133,23 +136,23 @@ glabel func_80145EC0 /* DC7B0 801460B0 00C90018 */ mult $a2, $t1 /* DC7B4 801460B4 00005810 */ mfhi $t3 /* DC7B8 801460B8 8FA2001C */ lw $v0, 0x1c($sp) -/* DC7BC 801460BC 00000000 */ nop +/* DC7BC 801460BC 00000000 */ nop /* DC7C0 801460C0 00470018 */ mult $v0, $a3 /* DC7C4 801460C4 00002012 */ mflo $a0 /* DC7C8 801460C8 93A20029 */ lbu $v0, 0x29($sp) -/* DC7CC 801460CC 00000000 */ nop +/* DC7CC 801460CC 00000000 */ nop /* DC7D0 801460D0 00480018 */ mult $v0, $t0 /* DC7D4 801460D4 00006012 */ mflo $t4 /* DC7D8 801460D8 8FA20020 */ lw $v0, 0x20($sp) -/* DC7DC 801460DC 00000000 */ nop +/* DC7DC 801460DC 00000000 */ nop /* DC7E0 801460E0 00470018 */ mult $v0, $a3 /* DC7E4 801460E4 00005012 */ mflo $t2 /* DC7E8 801460E8 93A2002A */ lbu $v0, 0x2a($sp) -/* DC7EC 801460EC 00000000 */ nop +/* DC7EC 801460EC 00000000 */ nop /* DC7F0 801460F0 00480018 */ mult $v0, $t0 /* DC7F4 801460F4 00002812 */ mflo $a1 /* DC7F8 801460F8 008C2021 */ addu $a0, $a0, $t4 -/* DC7FC 801460FC 00000000 */ nop +/* DC7FC 801460FC 00000000 */ nop /* DC800 80146100 00890018 */ mult $a0, $t1 /* DC804 80146104 00006010 */ mfhi $t4 /* DC808 80146108 3C038007 */ lui $v1, %hi(gGameStatusPtr) @@ -161,7 +164,7 @@ glabel func_80145EC0 /* DC820 80146120 A4620148 */ sh $v0, 0x148($v1) /* DC824 80146124 00005010 */ mfhi $t2 /* DC828 80146128 8FA30024 */ lw $v1, 0x24($sp) -/* DC82C 8014612C 00000000 */ nop +/* DC82C 8014612C 00000000 */ nop /* DC830 80146130 00670018 */ mult $v1, $a3 /* DC834 80146134 01661021 */ addu $v0, $t3, $a2 /* DC838 80146138 000211C3 */ sra $v0, $v0, 7 @@ -190,6 +193,7 @@ glabel func_80145EC0 /* DC894 80146194 00431023 */ subu $v0, $v0, $v1 /* DC898 80146198 0805186D */ j .L801461B4 /* DC89C 8014619C AFA20024 */ sw $v0, 0x24($sp) +glabel L801461A0_DC8A0 /* DC8A0 801461A0 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* DC8A4 801461A4 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) /* DC8A8 801461A8 94620148 */ lhu $v0, 0x148($v1) @@ -202,7 +206,7 @@ glabel func_80145EC0 /* DC8BC 801461BC 94420148 */ lhu $v0, 0x148($v0) /* DC8C0 801461C0 30420002 */ andi $v0, $v0, 2 /* DC8C4 801461C4 10400077 */ beqz $v0, .L801463A4 -/* DC8C8 801461C8 00000000 */ nop +/* DC8C8 801461C8 00000000 */ nop /* DC8CC 801461CC 3C028015 */ lui $v0, %hi(D_801512F0) /* DC8D0 801461D0 8C4212F0 */ lw $v0, %lo(D_801512F0)($v0) /* DC8D4 801461D4 90420000 */ lbu $v0, ($v0) @@ -223,7 +227,7 @@ glabel func_80145EC0 /* DC90C 8014620C 0661FFFD */ bgez $s3, .L80146204 /* DC910 80146210 2442FFFE */ addiu $v0, $v0, -2 /* DC914 80146214 080518E9 */ j .L801463A4 -/* DC918 80146218 00000000 */ nop +/* DC918 80146218 00000000 */ nop .L8014621C: /* DC91C 8014621C 3C148016 */ lui $s4, %hi(D_801593A0) /* DC920 80146220 269493A0 */ addiu $s4, $s4, %lo(D_801593A0) @@ -265,7 +269,7 @@ glabel func_80145EC0 /* DC9AC 801462AC 1440FFDD */ bnez $v0, .L80146224 /* DC9B0 801462B0 26940002 */ addiu $s4, $s4, 2 /* DC9B4 801462B4 080518E9 */ j .L801463A4 -/* DC9B8 801462B8 00000000 */ nop +/* DC9B8 801462B8 00000000 */ nop .L801462BC: /* DC9BC 801462BC 0000982D */ daddu $s3, $zero, $zero /* DC9C0 801462C0 3C058016 */ lui $a1, %hi(D_801593A0) @@ -295,7 +299,7 @@ glabel func_80145EC0 /* DCA1C 8014631C 004A0018 */ mult $v0, $t2 /* DCA20 80146320 00006812 */ mflo $t5 /* DCA24 80146324 00031AC2 */ srl $v1, $v1, 0xb -/* DCA28 80146328 00000000 */ nop +/* DCA28 80146328 00000000 */ nop /* DCA2C 8014632C 00690018 */ mult $v1, $t1 /* DCA30 80146330 00041203 */ sra $v0, $a0, 8 /* DCA34 80146334 01029021 */ addu $s2, $t0, $v0 @@ -341,10 +345,10 @@ glabel func_80145EC0 /* DCAC4 801463C4 46000506 */ mov.s $f20, $f0 /* DCAC8 801463C8 C6A20048 */ lwc1 $f2, 0x48($s5) /* DCACC 801463CC 46020002 */ mul.s $f0, $f0, $f2 -/* DCAD0 801463D0 00000000 */ nop +/* DCAD0 801463D0 00000000 */ nop /* DCAD4 801463D4 C6A20050 */ lwc1 $f2, 0x50($s5) /* DCAD8 801463D8 4602A502 */ mul.s $f20, $f20, $f2 -/* DCADC 801463DC 00000000 */ nop +/* DCADC 801463DC 00000000 */ nop /* DCAE0 801463E0 46140001 */ sub.s $f0, $f0, $f20 /* DCAE4 801463E4 C6A2050C */ lwc1 $f2, 0x50c($s5) /* DCAE8 801463E8 46020000 */ add.s $f0, $f0, $f2 @@ -354,19 +358,19 @@ glabel func_80145EC0 /* DCAF8 801463F8 44811000 */ mtc1 $at, $f2 /* DCAFC 801463FC 46000007 */ neg.s $f0, $f0 /* DCB00 80146400 46020102 */ mul.s $f4, $f0, $f2 -/* DCB04 80146404 00000000 */ nop +/* DCB04 80146404 00000000 */ nop /* DCB08 80146408 8442014E */ lh $v0, 0x14e($v0) /* DCB0C 8014640C 44820000 */ mtc1 $v0, $f0 -/* DCB10 80146410 00000000 */ nop +/* DCB10 80146410 00000000 */ nop /* DCB14 80146414 46800020 */ cvt.s.w $f0, $f0 /* DCB18 80146418 46160002 */ mul.s $f0, $f0, $f22 -/* DCB1C 8014641C 00000000 */ nop +/* DCB1C 8014641C 00000000 */ nop /* DCB20 80146420 3C013C36 */ lui $at, 0x3c36 /* DCB24 80146424 34210B61 */ ori $at, $at, 0xb61 /* DCB28 80146428 44811000 */ mtc1 $at, $f2 -/* DCB2C 8014642C 00000000 */ nop +/* DCB2C 8014642C 00000000 */ nop /* DCB30 80146430 46020002 */ mul.s $f0, $f0, $f2 -/* DCB34 80146434 00000000 */ nop +/* DCB34 80146434 00000000 */ nop /* DCB38 80146438 3C028016 */ lui $v0, %hi(D_801595A0) /* DCB3C 8014643C 244295A0 */ addiu $v0, $v0, %lo(D_801595A0) /* DCB40 80146440 46002100 */ add.s $f4, $f4, $f0 @@ -377,28 +381,28 @@ glabel func_80145EC0 /* DCB54 80146454 44811000 */ mtc1 $at, $f2 /* DCB58 80146458 46000005 */ abs.s $f0, $f0 /* DCB5C 8014645C 4602003C */ c.lt.s $f0, $f2 -/* DCB60 80146460 00000000 */ nop +/* DCB60 80146460 00000000 */ nop /* DCB64 80146464 45020002 */ bc1fl .L80146470 /* DCB68 80146468 E4440000 */ swc1 $f4, ($v0) /* DCB6C 8014646C 46003106 */ mov.s $f4, $f6 .L80146470: /* DCB70 80146470 44801000 */ mtc1 $zero, $f2 -/* DCB74 80146474 00000000 */ nop +/* DCB74 80146474 00000000 */ nop /* DCB78 80146478 4602203C */ c.lt.s $f4, $f2 -/* DCB7C 8014647C 00000000 */ nop +/* DCB7C 8014647C 00000000 */ nop /* DCB80 80146480 4500000D */ bc1f .L801464B8 -/* DCB84 80146484 00000000 */ nop +/* DCB84 80146484 00000000 */ nop /* DCB88 80146488 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* DCB8C 8014648C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* DCB90 80146490 8442014E */ lh $v0, 0x14e($v0) /* DCB94 80146494 00021140 */ sll $v0, $v0, 5 /* DCB98 80146498 44820000 */ mtc1 $v0, $f0 -/* DCB9C 8014649C 00000000 */ nop +/* DCB9C 8014649C 00000000 */ nop /* DCBA0 801464A0 46800020 */ cvt.s.w $f0, $f0 /* DCBA4 801464A4 46002100 */ add.s $f4, $f4, $f0 .L801464A8: /* DCBA8 801464A8 4602203C */ c.lt.s $f4, $f2 -/* DCBAC 801464AC 00000000 */ nop +/* DCBAC 801464AC 00000000 */ nop /* DCBB0 801464B0 4503FFFD */ bc1tl .L801464A8 /* DCBB4 801464B4 46002100 */ add.s $f4, $f4, $f0 .L801464B8: @@ -416,7 +420,7 @@ glabel func_80145EC0 /* DCBE0 801464E0 14610004 */ bne $v1, $at, .L801464F4 /* DCBE4 801464E4 3C018000 */ lui $at, 0x8000 /* DCBE8 801464E8 14410002 */ bne $v0, $at, .L801464F4 -/* DCBEC 801464EC 00000000 */ nop +/* DCBEC 801464EC 00000000 */ nop /* DCBF0 801464F0 0006000D */ break 6 .L801464F4: /* DCBF4 801464F4 00001810 */ mfhi $v1 @@ -572,7 +576,7 @@ glabel func_80145EC0 /* DCE40 80146740 14610004 */ bne $v1, $at, .L80146754 /* DCE44 80146744 3C018000 */ lui $at, 0x8000 /* DCE48 80146748 14410002 */ bne $v0, $at, .L80146754 -/* DCE4C 8014674C 00000000 */ nop +/* DCE4C 8014674C 00000000 */ nop /* DCE50 80146750 0006000D */ break 6 .L80146754: /* DCE54 80146754 00008812 */ mflo $s1 @@ -585,7 +589,7 @@ glabel func_80145EC0 /* DCE6C 8014676C 16210004 */ bne $s1, $at, .L80146780 /* DCE70 80146770 3C018000 */ lui $at, 0x8000 /* DCE74 80146774 14410002 */ bne $v0, $at, .L80146780 -/* DCE78 80146778 00000000 */ nop +/* DCE78 80146778 00000000 */ nop /* DCE7C 8014677C 0006000D */ break 6 .L80146780: /* DCE80 80146780 00007812 */ mflo $t7 @@ -896,7 +900,7 @@ glabel func_80145EC0 /* DD32C 80146C2C 16210004 */ bne $s1, $at, .L80146C40 /* DD330 80146C30 3C018000 */ lui $at, 0x8000 /* DD334 80146C34 14410002 */ bne $v0, $at, .L80146C40 -/* DD338 80146C38 00000000 */ nop +/* DD338 80146C38 00000000 */ nop /* DD33C 80146C3C 0006000D */ break 6 .L80146C40: /* DD340 80146C40 00007812 */ mflo $t7 @@ -939,10 +943,10 @@ glabel func_80145EC0 /* DD3D0 80146CD0 34217744 */ ori $at, $at, 0x7744 /* DD3D4 80146CD4 44810000 */ mtc1 $at, $f0 /* DD3D8 80146CD8 44936000 */ mtc1 $s3, $f12 -/* DD3DC 80146CDC 00000000 */ nop +/* DD3DC 80146CDC 00000000 */ nop /* DD3E0 80146CE0 46806320 */ cvt.s.w $f12, $f12 /* DD3E4 80146CE4 46006302 */ mul.s $f12, $f12, $f0 -/* DD3E8 80146CE8 00000000 */ nop +/* DD3E8 80146CE8 00000000 */ nop /* DD3EC 80146CEC 3C018015 */ lui $at, %hi(D_8014F134) /* DD3F0 80146CF0 C420F134 */ lwc1 $f0, %lo(D_8014F134)($at) /* DD3F4 80146CF4 AFAB0060 */ sw $t3, 0x60($sp) @@ -961,9 +965,9 @@ glabel func_80145EC0 /* DD428 80146D28 8FB9006C */ lw $t9, 0x6c($sp) /* DD42C 80146D2C 85420152 */ lh $v0, 0x152($t2) /* DD430 80146D30 46020082 */ mul.s $f2, $f0, $f2 -/* DD434 80146D34 00000000 */ nop +/* DD434 80146D34 00000000 */ nop /* DD438 80146D38 44820000 */ mtc1 $v0, $f0 -/* DD43C 80146D3C 00000000 */ nop +/* DD43C 80146D3C 00000000 */ nop /* DD440 80146D40 46800020 */ cvt.s.w $f0, $f0 /* DD444 80146D44 3C028015 */ lui $v0, %hi(D_8014F130) /* DD448 80146D48 9442F130 */ lhu $v0, %lo(D_8014F130)($v0) @@ -1094,15 +1098,15 @@ glabel func_80145EC0 .L80146F38: /* DD638 80146F38 8FAF0038 */ lw $t7, 0x38($sp) /* DD63C 80146F3C 11E000A5 */ beqz $t7, .L801471D4 -/* DD640 80146F40 00000000 */ nop +/* DD640 80146F40 00000000 */ nop /* DD644 80146F44 3C013ED6 */ lui $at, 0x3ed6 /* DD648 80146F48 34217744 */ ori $at, $at, 0x7744 /* DD64C 80146F4C 44810000 */ mtc1 $at, $f0 /* DD650 80146F50 44936000 */ mtc1 $s3, $f12 -/* DD654 80146F54 00000000 */ nop +/* DD654 80146F54 00000000 */ nop /* DD658 80146F58 46806320 */ cvt.s.w $f12, $f12 /* DD65C 80146F5C 46006302 */ mul.s $f12, $f12, $f0 -/* DD660 80146F60 00000000 */ nop +/* DD660 80146F60 00000000 */ nop /* DD664 80146F64 3C018015 */ lui $at, %hi(D_8014F134) /* DD668 80146F68 C420F134 */ lwc1 $f0, %lo(D_8014F134)($at) /* DD66C 80146F6C 460C0300 */ add.s $f12, $f0, $f12 @@ -1115,11 +1119,11 @@ glabel func_80145EC0 /* DD688 80146F88 8D4A419C */ lw $t2, %lo(gGameStatusPtr)($t2) /* DD68C 80146F8C 8FB9006C */ lw $t9, 0x6c($sp) /* DD690 80146F90 46020082 */ mul.s $f2, $f0, $f2 -/* DD694 80146F94 00000000 */ nop +/* DD694 80146F94 00000000 */ nop /* DD698 80146F98 85420152 */ lh $v0, 0x152($t2) /* DD69C 80146F9C 85430150 */ lh $v1, 0x150($t2) /* DD6A0 80146FA0 44820000 */ mtc1 $v0, $f0 -/* DD6A4 80146FA4 00000000 */ nop +/* DD6A4 80146FA4 00000000 */ nop /* DD6A8 80146FA8 46800020 */ cvt.s.w $f0, $f0 /* DD6AC 80146FAC 3C028015 */ lui $v0, %hi(D_8014F130) /* DD6B0 80146FB0 9442F130 */ lhu $v0, %lo(D_8014F130)($v0) diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147414.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147414.s index d24031f9f8..31ace8872e 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147414.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147414.s @@ -15,7 +15,7 @@ glabel func_80147414 /* DDB38 80147438 24C60001 */ addiu $a2, $a2, 1 /* DDB3C 8014743C 30620002 */ andi $v0, $v1, 2 /* DDB40 80147440 10400006 */ beqz $v0, .L8014745C -/* DDB44 80147444 00000000 */ nop +/* DDB44 80147444 00000000 */ nop /* DDB48 80147448 306200FD */ andi $v0, $v1, 0xfd /* DDB4C 8014744C A0A20000 */ sb $v0, ($a1) /* DDB50 80147450 8C82FFEC */ lw $v0, -0x14($a0) @@ -27,4 +27,4 @@ glabel func_80147414 /* DDB64 80147464 1440FFEF */ bnez $v0, .L80147424 /* DDB68 80147468 24A50020 */ addiu $a1, $a1, 0x20 /* DDB6C 8014746C 03E00008 */ jr $ra -/* DDB70 80147470 00000000 */ nop +/* DDB70 80147470 00000000 */ nop diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147474.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147474.s index ffa358bca5..b3e111cfe0 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147474.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147474.s @@ -18,7 +18,7 @@ glabel func_80147474 /* DDBA8 801474A8 28C20005 */ slti $v0, $a2, 5 .L801474AC: /* DDBAC 801474AC 10400025 */ beqz $v0, .L80147544 -/* DDBB0 801474B0 00000000 */ nop +/* DDBB0 801474B0 00000000 */ nop /* DDBB4 801474B4 3C038015 */ lui $v1, %hi(D_8014F298) /* DDBB8 801474B8 2463F298 */ addiu $v1, $v1, %lo(D_8014F298) /* DDBBC 801474BC 3C028015 */ lui $v0, %hi(D_8014F2A0) @@ -30,20 +30,20 @@ glabel func_80147474 /* DDBD4 801474D4 3C018015 */ lui $at, %hi(D_80151240) /* DDBD8 801474D8 D4221240 */ ldc1 $f2, %lo(D_80151240)($at) /* DDBDC 801474DC 44820000 */ mtc1 $v0, $f0 -/* DDBE0 801474E0 00000000 */ nop +/* DDBE0 801474E0 00000000 */ nop /* DDBE4 801474E4 46800020 */ cvt.s.w $f0, $f0 /* DDBE8 801474E8 46000021 */ cvt.d.s $f0, $f0 /* DDBEC 801474EC 46220002 */ mul.d $f0, $f0, $f2 -/* DDBF0 801474F0 00000000 */ nop +/* DDBF0 801474F0 00000000 */ nop /* DDBF4 801474F4 46200020 */ cvt.s.d $f0, $f0 /* DDBF8 801474F8 E4E00000 */ swc1 $f0, ($a3) /* DDBFC 801474FC 90620000 */ lbu $v0, ($v1) /* DDC00 80147500 44820000 */ mtc1 $v0, $f0 -/* DDC04 80147504 00000000 */ nop +/* DDC04 80147504 00000000 */ nop /* DDC08 80147508 46800020 */ cvt.s.w $f0, $f0 /* DDC0C 8014750C 46000021 */ cvt.d.s $f0, $f0 /* DDC10 80147510 46220002 */ mul.d $f0, $f0, $f2 -/* DDC14 80147514 00000000 */ nop +/* DDC14 80147514 00000000 */ nop /* DDC18 80147518 24030004 */ addiu $v1, $zero, 4 /* DDC1C 8014751C 00661823 */ subu $v1, $v1, $a2 /* DDC20 80147520 00031040 */ sll $v0, $v1, 1 @@ -51,7 +51,7 @@ glabel func_80147474 /* DDC28 80147528 46200020 */ cvt.s.d $f0, $f0 /* DDC2C 8014752C E5000000 */ swc1 $f0, ($t0) /* DDC30 80147530 44820000 */ mtc1 $v0, $f0 -/* DDC34 80147534 00000000 */ nop +/* DDC34 80147534 00000000 */ nop /* DDC38 80147538 46800020 */ cvt.s.w $f0, $f0 /* DDC3C 8014753C 03E00008 */ jr $ra /* DDC40 80147540 E5200000 */ swc1 $f0, ($t1) diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147574.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147574.s index 1c5a33c34a..3b49ad62c7 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147574.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147574.s @@ -12,7 +12,7 @@ glabel func_80147574 /* DDC90 80147590 8FA90024 */ lw $t1, 0x24($sp) /* DDC94 80147594 28C2000A */ slti $v0, $a2, 0xa /* DDC98 80147598 10400022 */ beqz $v0, .L80147624 -/* DDC9C 8014759C 00000000 */ nop +/* DDC9C 8014759C 00000000 */ nop /* DDCA0 801475A0 3C038015 */ lui $v1, %hi(D_8014F2A8) /* DDCA4 801475A4 2463F2A8 */ addiu $v1, $v1, %lo(D_8014F2A8) /* DDCA8 801475A8 3C028015 */ lui $v0, %hi(D_8014F2B4) @@ -24,25 +24,25 @@ glabel func_80147574 /* DDCC0 801475C0 3C018015 */ lui $at, %hi(D_80151248) /* DDCC4 801475C4 D4221248 */ ldc1 $f2, %lo(D_80151248)($at) /* DDCC8 801475C8 44820000 */ mtc1 $v0, $f0 -/* DDCCC 801475CC 00000000 */ nop +/* DDCCC 801475CC 00000000 */ nop /* DDCD0 801475D0 46800020 */ cvt.s.w $f0, $f0 /* DDCD4 801475D4 46000021 */ cvt.d.s $f0, $f0 /* DDCD8 801475D8 46220002 */ mul.d $f0, $f0, $f2 -/* DDCDC 801475DC 00000000 */ nop +/* DDCDC 801475DC 00000000 */ nop /* DDCE0 801475E0 46200020 */ cvt.s.d $f0, $f0 /* DDCE4 801475E4 E4E00000 */ swc1 $f0, ($a3) /* DDCE8 801475E8 90620000 */ lbu $v0, ($v1) /* DDCEC 801475EC 44820000 */ mtc1 $v0, $f0 -/* DDCF0 801475F0 00000000 */ nop +/* DDCF0 801475F0 00000000 */ nop /* DDCF4 801475F4 46800020 */ cvt.s.w $f0, $f0 /* DDCF8 801475F8 46000021 */ cvt.d.s $f0, $f0 /* DDCFC 801475FC 46220002 */ mul.d $f0, $f0, $f2 -/* DDD00 80147600 00000000 */ nop +/* DDD00 80147600 00000000 */ nop /* DDD04 80147604 00061023 */ negu $v0, $a2 /* DDD08 80147608 46200020 */ cvt.s.d $f0, $f0 /* DDD0C 8014760C E5000000 */ swc1 $f0, ($t0) /* DDD10 80147610 44820000 */ mtc1 $v0, $f0 -/* DDD14 80147614 00000000 */ nop +/* DDD14 80147614 00000000 */ nop /* DDD18 80147618 46800020 */ cvt.s.w $f0, $f0 /* DDD1C 8014761C 03E00008 */ jr $ra /* DDD20 80147620 E5200000 */ swc1 $f0, ($t1) diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147698.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147698.s index 17234de917..56f6a79c97 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147698.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147698.s @@ -84,7 +84,7 @@ glabel func_80147698 /* DDED0 801477D0 92020000 */ lbu $v0, ($s0) /* DDED4 801477D4 30420001 */ andi $v0, $v0, 1 /* DDED8 801477D8 10400004 */ beqz $v0, .L801477EC -/* DDEDC 801477DC 00000000 */ nop +/* DDEDC 801477DC 00000000 */ nop /* DDEE0 801477E0 92250002 */ lbu $a1, 2($s1) /* DDEE4 801477E4 0C051F5C */ jal func_80147D70 /* DDEE8 801477E8 0240202D */ daddu $a0, $s2, $zero @@ -92,14 +92,14 @@ glabel func_80147698 /* DDEEC 801477EC 92020000 */ lbu $v0, ($s0) /* DDEF0 801477F0 30420004 */ andi $v0, $v0, 4 /* DDEF4 801477F4 10400003 */ beqz $v0, .L80147804 -/* DDEF8 801477F8 00000000 */ nop +/* DDEF8 801477F8 00000000 */ nop /* DDEFC 801477FC 92020003 */ lbu $v0, 3($s0) /* DDF00 80147800 AFA200B4 */ sw $v0, 0xb4($sp) .L80147804: /* DDF04 80147804 92020000 */ lbu $v0, ($s0) /* DDF08 80147808 30420002 */ andi $v0, $v0, 2 /* DDF0C 8014780C 1040001A */ beqz $v0, .L80147878 -/* DDF10 80147810 00000000 */ nop +/* DDF10 80147810 00000000 */ nop /* DDF14 80147814 92020004 */ lbu $v0, 4($s0) /* DDF18 80147818 08051E1E */ j .L80147878 /* DDF1C 8014781C AFA200B8 */ sw $v0, 0xb8($sp) @@ -129,7 +129,7 @@ glabel func_80147698 .L80147878: /* DDF78 80147878 8E220004 */ lw $v0, 4($s1) /* DDF7C 8014787C 10400006 */ beqz $v0, .L80147898 -/* DDF80 80147880 00000000 */ nop +/* DDF80 80147880 00000000 */ nop /* DDF84 80147884 9223001C */ lbu $v1, 0x1c($s1) /* DDF88 80147888 2C6200FF */ sltiu $v0, $v1, 0xff /* DDF8C 8014788C 10400002 */ beqz $v0, .L80147898 @@ -138,12 +138,12 @@ glabel func_80147698 .L80147898: /* DDF98 80147898 C7A000A0 */ lwc1 $f0, 0xa0($sp) /* DDF9C 8014789C 46140032 */ c.eq.s $f0, $f20 -/* DDFA0 801478A0 00000000 */ nop +/* DDFA0 801478A0 00000000 */ nop /* DDFA4 801478A4 45030077 */ bc1tl .L80147A84 /* DDFA8 801478A8 26D60001 */ addiu $s6, $s6, 1 /* DDFAC 801478AC C7A000A4 */ lwc1 $f0, 0xa4($sp) /* DDFB0 801478B0 46140032 */ c.eq.s $f0, $f20 -/* DDFB4 801478B4 00000000 */ nop +/* DDFB4 801478B4 00000000 */ nop /* DDFB8 801478B8 45030072 */ bc1tl .L80147A84 /* DDFBC 801478BC 26D60001 */ addiu $s6, $s6, 1 /* DDFC0 801478C0 92220000 */ lbu $v0, ($s1) @@ -243,7 +243,7 @@ glabel func_80147698 /* DE124 80147A24 26D60001 */ addiu $s6, $s6, 1 /* DE128 80147A28 8FA20090 */ lw $v0, 0x90($sp) /* DE12C 80147A2C 14400004 */ bnez $v0, .L80147A40 -/* DE130 80147A30 00000000 */ nop +/* DE130 80147A30 00000000 */ nop /* DE134 80147A34 8FAB010C */ lw $t3, 0x10c($sp) /* DE138 80147A38 51600001 */ beql $t3, $zero, .L80147A40 /* DE13C 80147A3C 0000802D */ daddu $s0, $zero, $zero diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147EC4.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147EC4.s index ec81f204cb..dbec6e3d41 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147EC4.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147EC4.s @@ -31,4 +31,4 @@ glabel func_80147EC4 /* DE620 80147F20 1440FFF1 */ bnez $v0, .L80147EE8 /* DE624 80147F24 24C60020 */ addiu $a2, $a2, 0x20 /* DE628 80147F28 03E00008 */ jr $ra -/* DE62C 80147F2C 00000000 */ nop +/* DE62C 80147F2C 00000000 */ nop diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147F30.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147F30.s index 6e74ff84f8..b0c58d843a 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147F30.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147F30.s @@ -39,7 +39,7 @@ glabel func_80147F30 /* DE6B4 80147FB4 AFA20020 */ sw $v0, 0x20($sp) /* DE6B8 80147FB8 8E030004 */ lw $v1, 4($s0) /* DE6BC 80147FBC 10760005 */ beq $v1, $s6, .L80147FD4 -/* DE6C0 80147FC0 00000000 */ nop +/* DE6C0 80147FC0 00000000 */ nop /* DE6C4 80147FC4 82220000 */ lb $v0, ($s1) /* DE6C8 80147FC8 00021080 */ sll $v0, $v0, 2 /* DE6CC 80147FCC 00551021 */ addu $v0, $v0, $s5 @@ -71,5 +71,5 @@ glabel func_80147F30 /* DE72C 8014802C 8FB00028 */ lw $s0, 0x28($sp) /* DE730 80148030 03E00008 */ jr $ra /* DE734 80148034 27BD0048 */ addiu $sp, $sp, 0x48 -/* DE738 80148038 00000000 */ nop -/* DE73C 8014803C 00000000 */ nop +/* DE738 80148038 00000000 */ nop +/* DE73C 8014803C 00000000 */ nop diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s index 7b85ccba69..b5d718200d 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s @@ -23,11 +23,12 @@ glabel func_8014A548 /* E0C8C 8014A58C 50400085 */ beql $v0, $zero, .L8014A7A4 /* E0C90 8014A590 26520001 */ addiu $s2, $s2, 1 /* E0C94 8014A594 00031080 */ sll $v0, $v1, 2 -/* E0C98 8014A598 3C018015 */ lui $at, %hi(D_80151290) +/* E0C98 8014A598 3C018015 */ lui $at, %hi(jtbl_80151290_E7990) /* E0C9C 8014A59C 00220821 */ addu $at, $at, $v0 -/* E0CA0 8014A5A0 8C221290 */ lw $v0, %lo(D_80151290)($at) +/* E0CA0 8014A5A0 8C221290 */ lw $v0, %lo(jtbl_80151290_E7990)($at) /* E0CA4 8014A5A4 00400008 */ jr $v0 -/* E0CA8 8014A5A8 00000000 */ nop +/* E0CA8 8014A5A8 00000000 */ nop +glabel L8014A5AC_E0CAC /* E0CAC 8014A5AC 96230000 */ lhu $v1, ($s1) /* E0CB0 8014A5B0 30620001 */ andi $v0, $v1, 1 /* E0CB4 8014A5B4 1040001D */ beqz $v0, .L8014A62C @@ -37,24 +38,24 @@ glabel func_8014A548 /* E0CC4 8014A5C4 1040000B */ beqz $v0, .L8014A5F4 /* E0CC8 8014A5C8 30620004 */ andi $v0, $v1, 4 /* E0CCC 8014A5CC 14400005 */ bnez $v0, .L8014A5E4 -/* E0CD0 8014A5D0 00000000 */ nop +/* E0CD0 8014A5D0 00000000 */ nop /* E0CD4 8014A5D4 0C015671 */ jal func_800559C4 /* E0CD8 8014A5D8 8E040016 */ lw $a0, 0x16($s0) /* E0CDC 8014A5DC 08052987 */ j .L8014A61C -/* E0CE0 8014A5E0 00000000 */ nop +/* E0CE0 8014A5E0 00000000 */ nop .L8014A5E4: /* E0CE4 8014A5E4 0C0156BC */ jal func_80055AF0 /* E0CE8 8014A5E8 8E040016 */ lw $a0, 0x16($s0) /* E0CEC 8014A5EC 08052987 */ j .L8014A61C -/* E0CF0 8014A5F0 00000000 */ nop +/* E0CF0 8014A5F0 00000000 */ nop .L8014A5F4: /* E0CF4 8014A5F4 14400006 */ bnez $v0, .L8014A610 -/* E0CF8 8014A5F8 00000000 */ nop +/* E0CF8 8014A5F8 00000000 */ nop /* E0CFC 8014A5FC 8E040016 */ lw $a0, 0x16($s0) /* E0D00 8014A600 0C0156AF */ jal func_80055ABC /* E0D04 8014A604 0000302D */ daddu $a2, $zero, $zero /* E0D08 8014A608 08052987 */ j .L8014A61C -/* E0D0C 8014A60C 00000000 */ nop +/* E0D0C 8014A60C 00000000 */ nop .L8014A610: /* E0D10 8014A610 8E040016 */ lw $a0, 0x16($s0) /* E0D14 8014A614 0C0156EE */ jal func_80055BB8 @@ -73,8 +74,10 @@ glabel func_8014A548 /* E0D3C 8014A63C 00551024 */ and $v0, $v0, $s5 /* E0D40 8014A640 A6220000 */ sh $v0, ($s1) .L8014A644: +glabel L8014A644_E0D44 /* E0D44 8014A644 080529E8 */ j .L8014A7A0 /* E0D48 8014A648 A6140000 */ sh $s4, ($s0) +glabel L8014A64C_E0D4C /* E0D4C 8014A64C 96230000 */ lhu $v1, ($s1) /* E0D50 8014A650 00751024 */ and $v0, $v1, $s5 /* E0D54 8014A654 30630001 */ andi $v1, $v1, 1 @@ -82,7 +85,7 @@ glabel func_8014A548 /* E0D5C 8014A65C A6220000 */ sh $v0, ($s1) /* E0D60 8014A660 8E040016 */ lw $a0, 0x16($s0) /* E0D64 8014A664 0C01567F */ jal func_800559FC -/* E0D68 8014A668 00000000 */ nop +/* E0D68 8014A668 00000000 */ nop /* E0D6C 8014A66C 5440004D */ bnel $v0, $zero, .L8014A7A4 /* E0D70 8014A670 26520001 */ addiu $s2, $s2, 1 /* E0D74 8014A674 96220000 */ lhu $v0, ($s1) @@ -91,16 +94,18 @@ glabel func_8014A548 /* E0D80 8014A680 24020003 */ addiu $v0, $zero, 3 /* E0D84 8014A684 080529E8 */ j .L8014A7A0 /* E0D88 8014A688 A6020000 */ sh $v0, ($s0) +glabel L8014A68C_E0D8C /* E0D8C 8014A68C 24020004 */ addiu $v0, $zero, 4 /* E0D90 8014A690 080529E8 */ j .L8014A7A0 /* E0D94 8014A694 A6020000 */ sh $v0, ($s0) +glabel L8014A698_E0D98 /* E0D98 8014A698 96230000 */ lhu $v1, ($s1) /* E0D9C 8014A69C 30620008 */ andi $v0, $v1, 8 /* E0DA0 8014A6A0 14400029 */ bnez $v0, .L8014A748 /* E0DA4 8014A6A4 30620010 */ andi $v0, $v1, 0x10 /* E0DA8 8014A6A8 8E04000E */ lw $a0, 0xe($s0) /* E0DAC 8014A6AC 04810003 */ bgez $a0, .L8014A6BC -/* E0DB0 8014A6B0 00000000 */ nop +/* E0DB0 8014A6B0 00000000 */ nop /* E0DB4 8014A6B4 080529E8 */ j .L8014A7A0 /* E0DB8 8014A6B8 A6000000 */ sh $zero, ($s0) .L8014A6BC: @@ -113,7 +118,7 @@ glabel func_8014A548 /* E0DD4 8014A6D4 96220000 */ lhu $v0, ($s1) /* E0DD8 8014A6D8 30420020 */ andi $v0, $v0, 0x20 /* E0DDC 8014A6DC 1040000C */ beqz $v0, .L8014A710 -/* E0DE0 8014A6E0 00000000 */ nop +/* E0DE0 8014A6E0 00000000 */ nop /* E0DE4 8014A6E4 8602000C */ lh $v0, 0xc($s0) /* E0DE8 8014A6E8 8607000A */ lh $a3, 0xa($s0) /* E0DEC 8014A6EC AFA20010 */ sw $v0, 0x10($sp) @@ -129,7 +134,7 @@ glabel func_8014A548 /* E0E10 8014A710 3C048016 */ lui $a0, %hi(gMusicUnkVolume) /* E0E14 8014A714 84849AE0 */ lh $a0, %lo(gMusicUnkVolume)($a0) /* E0E18 8014A718 0C052B21 */ jal transition_music_volume_to -/* E0E1C 8014A71C 00000000 */ nop +/* E0E1C 8014A71C 00000000 */ nop .L8014A720: /* E0E20 8014A720 8E040016 */ lw $a0, 0x16($s0) /* E0E24 8014A724 0C01565C */ jal func_80055970 @@ -143,7 +148,7 @@ glabel func_8014A548 /* E0E44 8014A744 A6000000 */ sh $zero, ($s0) .L8014A748: /* E0E48 8014A748 10400005 */ beqz $v0, .L8014A760 -/* E0E4C 8014A74C 00000000 */ nop +/* E0E4C 8014A74C 00000000 */ nop /* E0E50 8014A750 A6000000 */ sh $zero, ($s0) /* E0E54 8014A754 96220000 */ lhu $v0, ($s1) /* E0E58 8014A758 080529E7 */ j .L8014A79C @@ -151,7 +156,7 @@ glabel func_8014A548 .L8014A760: /* E0E60 8014A760 8E04002A */ lw $a0, 0x2a($s0) /* E0E64 8014A764 0C0156CA */ jal func_80055B28 -/* E0E68 8014A768 00000000 */ nop +/* E0E68 8014A768 00000000 */ nop /* E0E6C 8014A76C 5440000D */ bnel $v0, $zero, .L8014A7A4 /* E0E70 8014A770 26520001 */ addiu $s2, $s2, 1 /* E0E74 8014A774 8E020022 */ lw $v0, 0x22($s0) @@ -167,6 +172,7 @@ glabel func_8014A548 .L8014A79C: /* E0E9C 8014A79C A6220000 */ sh $v0, ($s1) .L8014A7A0: +glabel L8014A7A0_E0EA0 /* E0EA0 8014A7A0 26520001 */ addiu $s2, $s2, 1 .L8014A7A4: /* E0EA4 8014A7A4 26100030 */ addiu $s0, $s0, 0x30 @@ -174,7 +180,7 @@ glabel func_8014A548 /* E0EAC 8014A7AC 1440FF75 */ bnez $v0, .L8014A584 /* E0EB0 8014A7B0 26310030 */ addiu $s1, $s1, 0x30 /* E0EB4 8014A7B4 0C052B25 */ jal func_8014AC94 -/* E0EB8 8014A7B8 00000000 */ nop +/* E0EB8 8014A7B8 00000000 */ nop /* E0EBC 8014A7BC 8FBF0030 */ lw $ra, 0x30($sp) /* E0EC0 8014A7C0 8FB5002C */ lw $s5, 0x2c($sp) /* E0EC4 8014A7C4 8FB40028 */ lw $s4, 0x28($sp) diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s index 1300ae20f2..189a5c2958 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s @@ -41,7 +41,7 @@ glabel func_8014AC94 /* E1418 8014AD18 3C048016 */ lui $a0, %hi(gMusicCurrentVolume) /* E141C 8014AD1C 84849AE6 */ lh $a0, %lo(gMusicCurrentVolume)($a0) /* E1420 8014AD20 0C015869 */ jal func_800561A4 -/* E1424 8014AD24 00000000 */ nop +/* E1424 8014AD24 00000000 */ nop /* E1428 8014AD28 24020003 */ addiu $v0, $zero, 3 /* E142C 8014AD2C 3C018015 */ lui $at, %hi(D_8014F738) /* E1430 8014AD30 A422F738 */ sh $v0, %lo(D_8014F738)($at) diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AD40.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AD40.s index 843f7eb11e..2132a5c198 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AD40.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014AD40.s @@ -16,7 +16,7 @@ glabel func_8014AD40 /* E1468 8014AD68 26310001 */ addiu $s1, $s1, 1 /* E146C 8014AD6C 8E040018 */ lw $a0, 0x18($s0) /* E1470 8014AD70 0C01567F */ jal func_800559FC -/* E1474 8014AD74 00000000 */ nop +/* E1474 8014AD74 00000000 */ nop /* E1478 8014AD78 14400005 */ bnez $v0, .L8014AD90 /* E147C 8014AD7C 24020001 */ addiu $v0, $zero, 1 .L8014AD80: diff --git a/asm/nonmatchings/code_e79b0_len_1920/func_802C3EE4.s b/asm/nonmatchings/code_e79b0_len_1920/func_802C3EE4.s index ca3c1d52e1..ef2cbd4ec0 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/func_802C3EE4.s +++ b/asm/nonmatchings/code_e79b0_len_1920/func_802C3EE4.s @@ -25,4 +25,4 @@ glabel func_802C3EE4 /* E88E0 802C3F30 24A50004 */ addiu $a1, $a1, 4 .L802C3F34: /* E88E4 802C3F34 03E00008 */ jr $ra -/* E88E8 802C3F38 00000000 */ nop +/* E88E8 802C3F38 00000000 */ nop diff --git a/asm/nonmatchings/code_e79b0_len_1920/start_child_script.s b/asm/nonmatchings/code_e79b0_len_1920/start_child_script.s index fcad2f73b6..6141fe8c99 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/start_child_script.s +++ b/asm/nonmatchings/code_e79b0_len_1920/start_child_script.s @@ -29,7 +29,7 @@ glabel start_child_script /* E81D0 802C3820 24040168 */ addiu $a0, $zero, 0x168 .L802C3824: /* E81D4 802C3824 080B0E09 */ j .L802C3824 -/* E81D8 802C3828 00000000 */ nop +/* E81D8 802C3828 00000000 */ nop .L802C382C: /* E81DC 802C382C 0C00AB39 */ jal heap_malloc /* E81E0 802C3830 0060982D */ daddu $s3, $v1, $zero @@ -47,7 +47,7 @@ glabel start_child_script /* E8210 802C3860 ACA30000 */ sw $v1, ($a1) .L802C3864: /* E8214 802C3864 080B0E19 */ j .L802C3864 -/* E8218 802C3868 00000000 */ nop +/* E8218 802C3868 00000000 */ nop .L802C386C: /* E821C 802C386C 92220000 */ lbu $v0, ($s1) /* E8220 802C3870 AE300068 */ sw $s0, 0x68($s1) @@ -118,7 +118,7 @@ glabel start_child_script /* E831C 802C396C 3C02802E */ lui $v0, %hi(D_802D9CA4) /* E8320 802C3970 8C429CA4 */ lw $v0, %lo(D_802D9CA4)($v0) /* E8324 802C3974 1040000E */ beqz $v0, .L802C39B0 -/* E8328 802C3978 00000000 */ nop +/* E8328 802C3978 00000000 */ nop /* E832C 802C397C 3C05802E */ lui $a1, %hi(gScriptListCount) /* E8330 802C3980 24A5AC98 */ addiu $a1, $a1, %lo(gScriptListCount) /* E8334 802C3984 8CA20000 */ lw $v0, ($a1) diff --git a/asm/nonmatchings/code_e79b0_len_1920/update_scripts.s b/asm/nonmatchings/code_e79b0_len_1920/update_scripts.s index 32607712cf..247fb3a8c0 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/update_scripts.s +++ b/asm/nonmatchings/code_e79b0_len_1920/update_scripts.s @@ -17,7 +17,7 @@ glabel update_scripts /* E8754 802C3DA4 80420078 */ lb $v0, 0x78($v0) /* E8758 802C3DA8 24030001 */ addiu $v1, $zero, 1 /* E875C 802C3DAC 10430042 */ beq $v0, $v1, .L802C3EB8 -/* E8760 802C3DB0 00000000 */ nop +/* E8760 802C3DB0 00000000 */ nop /* E8764 802C3DB4 3C01802E */ lui $at, %hi(D_802D9CA4) /* E8768 802C3DB8 AC239CA4 */ sw $v1, %lo(D_802D9CA4)($at) /* E876C 802C3DBC 0C0B0C00 */ jal sort_scripts @@ -62,7 +62,7 @@ glabel update_scripts /* E8800 802C3E50 C6000154 */ lwc1 $f0, 0x154($s0) /* E8804 802C3E54 46000021 */ cvt.d.s $f0, $f0 /* E8808 802C3E58 4634003C */ c.lt.d $f0, $f20 -/* E880C 802C3E5C 00000000 */ nop +/* E880C 802C3E5C 00000000 */ nop /* E8810 802C3E60 4501000B */ bc1t .L802C3E90 /* E8814 802C3E64 0200202D */ daddu $a0, $s0, $zero /* E8818 802C3E68 46340001 */ sub.d $f0, $f0, $f20 @@ -70,12 +70,12 @@ glabel update_scripts /* E8820 802C3E70 0C0B1D01 */ jal si_execute_next_command /* E8824 802C3E74 E6000154 */ swc1 $f0, 0x154($s0) /* E8828 802C3E78 14560003 */ bne $v0, $s6, .L802C3E88 -/* E882C 802C3E7C 00000000 */ nop +/* E882C 802C3E7C 00000000 */ nop /* E8830 802C3E80 080B0FA4 */ j .L802C3E90 /* E8834 802C3E84 24110001 */ addiu $s1, $zero, 1 .L802C3E88: /* E8838 802C3E88 1455FFF1 */ bne $v0, $s5, .L802C3E50 -/* E883C 802C3E8C 00000000 */ nop +/* E883C 802C3E8C 00000000 */ nop .L802C3E90: /* E8840 802C3E90 16200007 */ bnez $s1, .L802C3EB0 /* E8844 802C3E94 26940004 */ addiu $s4, $s4, 4 diff --git a/asm/nonmatchings/code_ef070_len_3400/AdjustCam.s b/asm/nonmatchings/code_ef070_len_3400/AdjustCam.s index c5e8e84482..bbf8360987 100644 --- a/asm/nonmatchings/code_ef070_len_3400/AdjustCam.s +++ b/asm/nonmatchings/code_ef070_len_3400/AdjustCam.s @@ -140,9 +140,9 @@ glabel AdjustCam /* F1220 802CC870 C6620484 */ lwc1 $f2, 0x484($s3) /* F1224 802CC874 3C013F80 */ lui $at, 0x3f80 /* F1228 802CC878 44810000 */ mtc1 $at, $f0 -/* F122C 802CC87C 00000000 */ nop +/* F122C 802CC87C 00000000 */ nop /* F1230 802CC880 4602003E */ c.le.s $f0, $f2 -/* F1234 802CC884 00000000 */ nop +/* F1234 802CC884 00000000 */ nop /* F1238 802CC888 45010002 */ bc1t .L802CC894 /* F123C 802CC88C 24020002 */ addiu $v0, $zero, 2 /* F1240 802CC890 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_ef070_len_3400/ResetCam.s b/asm/nonmatchings/code_ef070_len_3400/ResetCam.s index bc66f43a5b..e931c8617e 100644 --- a/asm/nonmatchings/code_ef070_len_3400/ResetCam.s +++ b/asm/nonmatchings/code_ef070_len_3400/ResetCam.s @@ -110,9 +110,9 @@ glabel ResetCam /* F1410 802CCA60 C6000484 */ lwc1 $f0, 0x484($s0) /* F1414 802CCA64 3C013F80 */ lui $at, 0x3f80 /* F1418 802CCA68 44811000 */ mtc1 $at, $f2 -/* F141C 802CCA6C 00000000 */ nop +/* F141C 802CCA6C 00000000 */ nop /* F1420 802CCA70 4600103E */ c.le.s $f2, $f0 -/* F1424 802CCA74 00000000 */ nop +/* F1424 802CCA74 00000000 */ nop /* F1428 802CCA78 45000007 */ bc1f .L802CCA98 /* F142C 802CCA7C 0000102D */ daddu $v0, $zero, $zero /* F1430 802CCA80 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_ef070_len_3400/SetCamProperties.s b/asm/nonmatchings/code_ef070_len_3400/SetCamProperties.s index 53ecf188f3..389e142444 100644 --- a/asm/nonmatchings/code_ef070_len_3400/SetCamProperties.s +++ b/asm/nonmatchings/code_ef070_len_3400/SetCamProperties.s @@ -143,9 +143,9 @@ glabel SetCamProperties /* F0FB8 802CC608 C6620484 */ lwc1 $f2, 0x484($s3) /* F0FBC 802CC60C 3C013F80 */ lui $at, 0x3f80 /* F0FC0 802CC610 44810000 */ mtc1 $at, $f0 -/* F0FC4 802CC614 00000000 */ nop +/* F0FC4 802CC614 00000000 */ nop /* F0FC8 802CC618 4602003E */ c.le.s $f0, $f2 -/* F0FCC 802CC61C 00000000 */ nop +/* F0FCC 802CC61C 00000000 */ nop /* F0FD0 802CC620 45010002 */ bc1t .L802CC62C /* F0FD4 802CC624 24020002 */ addiu $v0, $zero, 2 /* F0FD8 802CC628 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_ef070_len_3400/ShakeCam.s b/asm/nonmatchings/code_ef070_len_3400/ShakeCam.s index 5bdfb69f87..23d7477463 100644 --- a/asm/nonmatchings/code_ef070_len_3400/ShakeCam.s +++ b/asm/nonmatchings/code_ef070_len_3400/ShakeCam.s @@ -52,36 +52,36 @@ glabel ShakeCam .L802CB364: /* EFD14 802CB364 3C013F80 */ lui $at, 0x3f80 /* EFD18 802CB368 44810000 */ mtc1 $at, $f0 -/* EFD1C 802CB36C 00000000 */ nop +/* EFD1C 802CB36C 00000000 */ nop /* EFD20 802CB370 E6A0007C */ swc1 $f0, 0x7c($s5) /* EFD24 802CB374 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* EFD28 802CB378 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* EFD2C 802CB37C AEB40074 */ sw $s4, 0x74($s5) /* EFD30 802CB380 80420070 */ lb $v0, 0x70($v0) /* EFD34 802CB384 14400021 */ bnez $v0, .L802CB40C -/* EFD38 802CB388 00000000 */ nop +/* EFD38 802CB388 00000000 */ nop /* EFD3C 802CB38C 3C014120 */ lui $at, 0x4120 /* EFD40 802CB390 44810000 */ mtc1 $at, $f0 -/* EFD44 802CB394 00000000 */ nop +/* EFD44 802CB394 00000000 */ nop /* EFD48 802CB398 4614003C */ c.lt.s $f0, $f20 -/* EFD4C 802CB39C 00000000 */ nop +/* EFD4C 802CB39C 00000000 */ nop /* EFD50 802CB3A0 45030001 */ bc1tl .L802CB3A8 /* EFD54 802CB3A4 46000506 */ mov.s $f20, $f0 .L802CB3A8: /* EFD58 802CB3A8 3C0140C0 */ lui $at, 0x40c0 /* EFD5C 802CB3AC 44810000 */ mtc1 $at, $f0 -/* EFD60 802CB3B0 00000000 */ nop +/* EFD60 802CB3B0 00000000 */ nop /* EFD64 802CB3B4 4614003C */ c.lt.s $f0, $f20 -/* EFD68 802CB3B8 00000000 */ nop +/* EFD68 802CB3B8 00000000 */ nop /* EFD6C 802CB3BC 45000002 */ bc1f .L802CB3C8 /* EFD70 802CB3C0 4600A086 */ mov.s $f2, $f20 /* EFD74 802CB3C4 46000086 */ mov.s $f2, $f0 .L802CB3C8: /* EFD78 802CB3C8 3C014200 */ lui $at, 0x4200 /* EFD7C 802CB3CC 44810000 */ mtc1 $at, $f0 -/* EFD80 802CB3D0 00000000 */ nop +/* EFD80 802CB3D0 00000000 */ nop /* EFD84 802CB3D4 46001002 */ mul.s $f0, $f2, $f0 -/* EFD88 802CB3D8 00000000 */ nop +/* EFD88 802CB3D8 00000000 */ nop /* EFD8C 802CB3DC 0280282D */ daddu $a1, $s4, $zero /* EFD90 802CB3E0 3C014280 */ lui $at, 0x4280 /* EFD94 802CB3E4 44811000 */ mtc1 $at, $f2 @@ -108,27 +108,27 @@ glabel ShakeCam /* EFDE0 802CB430 52600007 */ beql $s3, $zero, .L802CB450 /* EFDE4 802CB434 46001007 */ neg.s $f0, $f2 /* EFDE8 802CB438 080B2D47 */ j .L802CB51C -/* EFDEC 802CB43C 00000000 */ nop +/* EFDEC 802CB43C 00000000 */ nop .L802CB440: /* EFDF0 802CB440 5262001B */ beql $s3, $v0, .L802CB4B0 /* EFDF4 802CB444 46001007 */ neg.s $f0, $f2 /* EFDF8 802CB448 080B2D47 */ j .L802CB51C -/* EFDFC 802CB44C 00000000 */ nop +/* EFDFC 802CB44C 00000000 */ nop .L802CB450: /* EFE00 802CB450 46140002 */ mul.s $f0, $f0, $f20 -/* EFE04 802CB454 00000000 */ nop +/* EFE04 802CB454 00000000 */ nop /* EFE08 802CB458 44060000 */ mfc1 $a2, $f0 /* EFE0C 802CB45C 44800000 */ mtc1 $zero, $f0 -/* EFE10 802CB460 00000000 */ nop +/* EFE10 802CB460 00000000 */ nop /* EFE14 802CB464 44050000 */ mfc1 $a1, $f0 /* EFE18 802CB468 26040194 */ addiu $a0, $s0, 0x194 /* EFE1C 802CB46C 0C019E40 */ jal guTranslateF /* EFE20 802CB470 00A0382D */ daddu $a3, $a1, $zero /* EFE24 802CB474 080B2D44 */ j .L802CB510 -/* EFE28 802CB478 00000000 */ nop +/* EFE28 802CB478 00000000 */ nop .L802CB47C: /* EFE2C 802CB47C 46141082 */ mul.s $f2, $f2, $f20 -/* EFE30 802CB480 00000000 */ nop +/* EFE30 802CB480 00000000 */ nop /* EFE34 802CB484 44800000 */ mtc1 $zero, $f0 /* EFE38 802CB488 26040194 */ addiu $a0, $s0, 0x194 /* EFE3C 802CB48C 44060000 */ mfc1 $a2, $f0 @@ -139,13 +139,13 @@ glabel ShakeCam /* EFE50 802CB4A0 0C019EC8 */ jal guRotateF /* EFE54 802CB4A4 E7A00010 */ swc1 $f0, 0x10($sp) /* EFE58 802CB4A8 080B2D44 */ j .L802CB510 -/* EFE5C 802CB4AC 00000000 */ nop +/* EFE5C 802CB4AC 00000000 */ nop .L802CB4B0: /* EFE60 802CB4B0 46140002 */ mul.s $f0, $f0, $f20 -/* EFE64 802CB4B4 00000000 */ nop +/* EFE64 802CB4B4 00000000 */ nop /* EFE68 802CB4B8 44060000 */ mfc1 $a2, $f0 /* EFE6C 802CB4BC 44800000 */ mtc1 $zero, $f0 -/* EFE70 802CB4C0 00000000 */ nop +/* EFE70 802CB4C0 00000000 */ nop /* EFE74 802CB4C4 44050000 */ mfc1 $a1, $f0 /* EFE78 802CB4C8 26040194 */ addiu $a0, $s0, 0x194 /* EFE7C 802CB4CC 0C019E40 */ jal guTranslateF @@ -156,13 +156,13 @@ glabel ShakeCam /* EFE90 802CB4E0 1040000B */ beqz $v0, .L802CB510 /* EFE94 802CB4E4 0283102A */ slt $v0, $s4, $v1 /* EFE98 802CB4E8 10400009 */ beqz $v0, .L802CB510 -/* EFE9C 802CB4EC 00000000 */ nop +/* EFE9C 802CB4EC 00000000 */ nop /* EFEA0 802CB4F0 C6A0007C */ lwc1 $f0, 0x7c($s5) /* EFEA4 802CB4F4 3C01802E */ lui $at, %hi(D_802DA1D0) /* EFEA8 802CB4F8 D422A1D0 */ ldc1 $f2, %lo(D_802DA1D0)($at) /* EFEAC 802CB4FC 46000021 */ cvt.d.s $f0, $f0 /* EFEB0 802CB500 46220002 */ mul.d $f0, $f0, $f2 -/* EFEB4 802CB504 00000000 */ nop +/* EFEB4 802CB504 00000000 */ nop /* EFEB8 802CB508 080B2D46 */ j .L802CB518 /* EFEBC 802CB50C 46200020 */ cvt.s.d $f0, $f0 .L802CB510: diff --git a/asm/nonmatchings/code_ef070_len_3400/draw_anim_models.s b/asm/nonmatchings/code_ef070_len_3400/draw_anim_models.s index 66fa0e9529..1dc7797c6f 100644 --- a/asm/nonmatchings/code_ef070_len_3400/draw_anim_models.s +++ b/asm/nonmatchings/code_ef070_len_3400/draw_anim_models.s @@ -91,7 +91,7 @@ glabel draw_anim_models .L802CCC6C: /* F161C 802CCC6C 2A620010 */ slti $v0, $s3, 0x10 /* F1620 802CCC70 1440FFC2 */ bnez $v0, .L802CCB7C -/* F1624 802CCC74 00000000 */ nop +/* F1624 802CCC74 00000000 */ nop /* F1628 802CCC78 8FBF0244 */ lw $ra, 0x244($sp) /* F162C 802CCC7C 8FBE0240 */ lw $fp, 0x240($sp) /* F1630 802CCC80 8FB7023C */ lw $s7, 0x23c($sp) diff --git a/asm/nonmatchings/code_ef070_len_3400/func_802CB008.s b/asm/nonmatchings/code_ef070_len_3400/func_802CB008.s index abc8a300ab..8012c0e588 100644 --- a/asm/nonmatchings/code_ef070_len_3400/func_802CB008.s +++ b/asm/nonmatchings/code_ef070_len_3400/func_802CB008.s @@ -63,23 +63,23 @@ glabel func_802CB008 /* EFAA0 802CB0F0 ACB20014 */ sw $s2, 0x14($a1) /* EFAA4 802CB0F4 24020001 */ addiu $v0, $zero, 1 /* EFAA8 802CB0F8 10C20018 */ beq $a2, $v0, .L802CB15C -/* EFAAC 802CB0FC 00000000 */ nop +/* EFAAC 802CB0FC 00000000 */ nop /* EFAB0 802CB100 080B2C73 */ j .L802CB1CC -/* EFAB4 802CB104 00000000 */ nop +/* EFAB4 802CB104 00000000 */ nop .L802CB108: /* EFAB8 802CB108 C4620054 */ lwc1 $f2, 0x54($v1) /* EFABC 802CB10C 44940000 */ mtc1 $s4, $f0 -/* EFAC0 802CB110 00000000 */ nop +/* EFAC0 802CB110 00000000 */ nop /* EFAC4 802CB114 46800020 */ cvt.s.w $f0, $f0 /* EFAC8 802CB118 46020001 */ sub.s $f0, $f0, $f2 /* EFACC 802CB11C 44921000 */ mtc1 $s2, $f2 -/* EFAD0 802CB120 00000000 */ nop +/* EFAD0 802CB120 00000000 */ nop /* EFAD4 802CB124 468010A0 */ cvt.s.w $f2, $f2 /* EFAD8 802CB128 46020003 */ div.s $f0, $f0, $f2 /* EFADC 802CB12C E4A00008 */ swc1 $f0, 8($a1) /* EFAE0 802CB130 C4620058 */ lwc1 $f2, 0x58($v1) /* EFAE4 802CB134 44950000 */ mtc1 $s5, $f0 -/* EFAE8 802CB138 00000000 */ nop +/* EFAE8 802CB138 00000000 */ nop /* EFAEC 802CB13C 46800020 */ cvt.s.w $f0, $f0 /* EFAF0 802CB140 46020001 */ sub.s $f0, $f0, $f2 /* EFAF4 802CB144 C4A20014 */ lwc1 $f2, 0x14($a1) @@ -91,17 +91,17 @@ glabel func_802CB008 .L802CB15C: /* EFB0C 802CB15C C4620060 */ lwc1 $f2, 0x60($v1) /* EFB10 802CB160 44940000 */ mtc1 $s4, $f0 -/* EFB14 802CB164 00000000 */ nop +/* EFB14 802CB164 00000000 */ nop /* EFB18 802CB168 46800020 */ cvt.s.w $f0, $f0 /* EFB1C 802CB16C 46020001 */ sub.s $f0, $f0, $f2 /* EFB20 802CB170 44921000 */ mtc1 $s2, $f2 -/* EFB24 802CB174 00000000 */ nop +/* EFB24 802CB174 00000000 */ nop /* EFB28 802CB178 468010A0 */ cvt.s.w $f2, $f2 /* EFB2C 802CB17C 46020003 */ div.s $f0, $f0, $f2 /* EFB30 802CB180 E4A00008 */ swc1 $f0, 8($a1) /* EFB34 802CB184 C4620064 */ lwc1 $f2, 0x64($v1) /* EFB38 802CB188 44950000 */ mtc1 $s5, $f0 -/* EFB3C 802CB18C 00000000 */ nop +/* EFB3C 802CB18C 00000000 */ nop /* EFB40 802CB190 46800020 */ cvt.s.w $f0, $f0 /* EFB44 802CB194 46020001 */ sub.s $f0, $f0, $f2 /* EFB48 802CB198 C4A20014 */ lwc1 $f2, 0x14($a1) @@ -111,7 +111,7 @@ glabel func_802CB008 /* EFB58 802CB1A8 C4620068 */ lwc1 $f2, 0x68($v1) .L802CB1AC: /* EFB5C 802CB1AC 44960000 */ mtc1 $s6, $f0 -/* EFB60 802CB1B0 00000000 */ nop +/* EFB60 802CB1B0 00000000 */ nop /* EFB64 802CB1B4 46800020 */ cvt.s.w $f0, $f0 /* EFB68 802CB1B8 46020001 */ sub.s $f0, $f0, $f2 /* EFB6C 802CB1BC C4A20014 */ lwc1 $f2, 0x14($a1) @@ -125,9 +125,9 @@ glabel func_802CB008 /* EFB88 802CB1D8 10800005 */ beqz $a0, .L802CB1F0 /* EFB8C 802CB1DC 24020001 */ addiu $v0, $zero, 1 /* EFB90 802CB1E0 10820010 */ beq $a0, $v0, .L802CB224 -/* EFB94 802CB1E4 00000000 */ nop +/* EFB94 802CB1E4 00000000 */ nop /* EFB98 802CB1E8 080B2C95 */ j .L802CB254 -/* EFB9C 802CB1EC 00000000 */ nop +/* EFB9C 802CB1EC 00000000 */ nop .L802CB1F0: /* EFBA0 802CB1F0 C4600054 */ lwc1 $f0, 0x54($v1) /* EFBA4 802CB1F4 C4A20008 */ lwc1 $f2, 8($a1) @@ -165,7 +165,7 @@ glabel func_802CB008 .L802CB26C: /* EFC1C 802CB26C 8E640060 */ lw $a0, 0x60($s3) /* EFC20 802CB270 0C00AB4B */ jal heap_free -/* EFC24 802CB274 00000000 */ nop +/* EFC24 802CB274 00000000 */ nop /* EFC28 802CB278 24020002 */ addiu $v0, $zero, 2 /* EFC2C 802CB27C AE600060 */ sw $zero, 0x60($s3) .L802CB280: diff --git a/asm/nonmatchings/code_ef070_len_3400/func_802CD4B4.s b/asm/nonmatchings/code_ef070_len_3400/func_802CD4B4.s index e614ade3f9..6d299e3059 100644 --- a/asm/nonmatchings/code_ef070_len_3400/func_802CD4B4.s +++ b/asm/nonmatchings/code_ef070_len_3400/func_802CD4B4.s @@ -11,11 +11,11 @@ glabel func_802CD4B4 /* F1E7C 802CD4CC AFB00010 */ sw $s0, 0x10($sp) /* F1E80 802CD4D0 80420070 */ lb $v0, 0x70($v0) /* F1E84 802CD4D4 14400005 */ bnez $v0, .L802CD4EC -/* F1E88 802CD4D8 00000000 */ nop +/* F1E88 802CD4D8 00000000 */ nop /* F1E8C 802CD4DC 3C02802E */ lui $v0, %hi(gWorldMeshAnimationList) /* F1E90 802CD4E0 2442ADF0 */ addiu $v0, $v0, %lo(gWorldMeshAnimationList) /* F1E94 802CD4E4 080B353D */ j .L802CD4F4 -/* F1E98 802CD4E8 00000000 */ nop +/* F1E98 802CD4E8 00000000 */ nop .L802CD4EC: /* F1E9C 802CD4EC 3C02802E */ lui $v0, %hi(gBattleMeshAnimationList) /* F1EA0 802CD4F0 2442ADB0 */ addiu $v0, $v0, %lo(gBattleMeshAnimationList) @@ -35,7 +35,7 @@ glabel func_802CD4B4 /* F1ED0 802CD520 AC620000 */ sw $v0, ($v1) .L802CD524: /* F1ED4 802CD524 080B3549 */ j .L802CD524 -/* F1ED8 802CD528 00000000 */ nop +/* F1ED8 802CD528 00000000 */ nop .L802CD52C: /* F1EDC 802CD52C 3C02802E */ lui $v0, %hi(gCurrentMeshAnimationListPtr) /* F1EE0 802CD530 8C42AE30 */ lw $v0, %lo(gCurrentMeshAnimationListPtr)($v0) diff --git a/asm/nonmatchings/code_ef070_len_3400/func_802CD9F0.s b/asm/nonmatchings/code_ef070_len_3400/func_802CD9F0.s index 89bbe70493..5d2f82702b 100644 --- a/asm/nonmatchings/code_ef070_len_3400/func_802CD9F0.s +++ b/asm/nonmatchings/code_ef070_len_3400/func_802CD9F0.s @@ -53,6 +53,6 @@ glabel func_802CD9F0 /* F2458 802CDAA8 24020002 */ addiu $v0, $zero, 2 /* F245C 802CDAAC 03E00008 */ jr $ra /* F2460 802CDAB0 27BD0028 */ addiu $sp, $sp, 0x28 -/* F2464 802CDAB4 00000000 */ nop -/* F2468 802CDAB8 00000000 */ nop -/* F246C 802CDABC 00000000 */ nop +/* F2464 802CDAB4 00000000 */ nop +/* F2468 802CDAB8 00000000 */ nop +/* F246C 802CDABC 00000000 */ nop diff --git a/asm/nonmatchings/code_f2470_len_27f0/BringPartnerOut.s b/asm/nonmatchings/code_f2470_len_27f0/BringPartnerOut.s index 36e9d4eff9..f0b62520f1 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/BringPartnerOut.s +++ b/asm/nonmatchings/code_f2470_len_27f0/BringPartnerOut.s @@ -22,7 +22,7 @@ glabel BringPartnerOut /* F3FAC 802CF5FC 27B10010 */ addiu $s1, $sp, 0x10 /* F3FB0 802CF600 8C450000 */ lw $a1, ($v0) /* F3FB4 802CF604 0C0B1EAF */ jal get_variable -/* F3FB8 802CF608 00000000 */ nop +/* F3FB8 802CF608 00000000 */ nop /* F3FBC 802CF60C 3C038011 */ lui $v1, %hi(gPlayerData) /* F3FC0 802CF610 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) /* F3FC4 802CF614 80630012 */ lb $v1, 0x12($v1) @@ -87,7 +87,7 @@ glabel BringPartnerOut /* F40AC 802CF6FC 00621821 */ addu $v1, $v1, $v0 /* F40B0 802CF700 00031843 */ sra $v1, $v1, 1 /* F40B4 802CF704 44830000 */ mtc1 $v1, $f0 -/* F40B8 802CF708 00000000 */ nop +/* F40B8 802CF708 00000000 */ nop /* F40BC 802CF70C 46800020 */ cvt.s.w $f0, $f0 /* F40C0 802CF710 46001700 */ add.s $f28, $f2, $f0 /* F40C4 802CF714 3C014080 */ lui $at, 0x4080 @@ -117,13 +117,13 @@ glabel BringPartnerOut /* F4124 802CF774 46041083 */ div.s $f2, $f2, $f4 /* F4128 802CF778 4600118D */ trunc.w.s $f6, $f2 /* F412C 802CF77C 44023000 */ mfc1 $v0, $f6 -/* F4130 802CF780 00000000 */ nop +/* F4130 802CF780 00000000 */ nop /* F4134 802CF784 A622008E */ sh $v0, 0x8e($s1) /* F4138 802CF788 00021400 */ sll $v0, $v0, 0x10 /* F413C 802CF78C 00021403 */ sra $v0, $v0, 0x10 /* F4140 802CF790 2842000A */ slti $v0, $v0, 0xa /* F4144 802CF794 10400007 */ beqz $v0, .L802CF7B4 -/* F4148 802CF798 00000000 */ nop +/* F4148 802CF798 00000000 */ nop /* F414C 802CF79C 3C014120 */ lui $at, 0x4120 /* F4150 802CF7A0 44811000 */ mtc1 $at, $f2 /* F4154 802CF7A4 C6200010 */ lwc1 $f0, 0x10($s1) @@ -134,17 +134,17 @@ glabel BringPartnerOut /* F4164 802CF7B4 8622008E */ lh $v0, 0x8e($s1) /* F4168 802CF7B8 C6200014 */ lwc1 $f0, 0x14($s1) /* F416C 802CF7BC 44822000 */ mtc1 $v0, $f4 -/* F4170 802CF7C0 00000000 */ nop +/* F4170 802CF7C0 00000000 */ nop /* F4174 802CF7C4 46802120 */ cvt.s.w $f4, $f4 /* F4178 802CF7C8 46040002 */ mul.s $f0, $f0, $f4 -/* F417C 802CF7CC 00000000 */ nop +/* F417C 802CF7CC 00000000 */ nop /* F4180 802CF7D0 46040002 */ mul.s $f0, $f0, $f4 -/* F4184 802CF7D4 00000000 */ nop +/* F4184 802CF7D4 00000000 */ nop /* F4188 802CF7D8 3C013F00 */ lui $at, 0x3f00 /* F418C 802CF7DC 44811000 */ mtc1 $at, $f2 -/* F4190 802CF7E0 00000000 */ nop +/* F4190 802CF7E0 00000000 */ nop /* F4194 802CF7E4 46020002 */ mul.s $f0, $f0, $f2 -/* F4198 802CF7E8 00000000 */ nop +/* F4198 802CF7E8 00000000 */ nop /* F419C 802CF7EC 8E830000 */ lw $v1, ($s4) /* F41A0 802CF7F0 461CF081 */ sub.s $f2, $f30, $f28 /* F41A4 802CF7F4 000310C0 */ sll $v0, $v1, 3 @@ -162,7 +162,7 @@ glabel BringPartnerOut /* F41D0 802CF820 3C04802E */ lui $a0, %hi(D_802DAE44) /* F41D4 802CF824 8C84AE44 */ lw $a0, %lo(D_802DAE44)($a0) /* F41D8 802CF828 0C00E2B7 */ jal get_npc_by_index -/* F41DC 802CF82C 00000000 */ nop +/* F41DC 802CF82C 00000000 */ nop /* F41E0 802CF830 0040882D */ daddu $s1, $v0, $zero /* F41E4 802CF834 C620001C */ lwc1 $f0, 0x1c($s1) /* F41E8 802CF838 C6220014 */ lwc1 $f2, 0x14($s1) @@ -170,7 +170,7 @@ glabel BringPartnerOut /* F41F0 802CF840 C622003C */ lwc1 $f2, 0x3c($s1) /* F41F4 802CF844 46001080 */ add.s $f2, $f2, $f0 /* F41F8 802CF848 4480A000 */ mtc1 $zero, $f20 -/* F41FC 802CF84C 00000000 */ nop +/* F41FC 802CF84C 00000000 */ nop /* F4200 802CF850 4614003E */ c.le.s $f0, $f20 /* F4204 802CF854 E620001C */ swc1 $f0, 0x1c($s1) /* F4208 802CF858 4500000A */ bc1f .L802CF884 @@ -193,10 +193,10 @@ glabel BringPartnerOut /* F4248 802CF898 3C014120 */ lui $at, 0x4120 /* F424C 802CF89C 44811000 */ mtc1 $at, $f2 /* F4250 802CF8A0 44820000 */ mtc1 $v0, $f0 -/* F4254 802CF8A4 00000000 */ nop +/* F4254 802CF8A4 00000000 */ nop /* F4258 802CF8A8 46800020 */ cvt.s.w $f0, $f0 /* F425C 802CF8AC 4600103C */ c.lt.s $f2, $f0 -/* F4260 802CF8B0 00000000 */ nop +/* F4260 802CF8B0 00000000 */ nop /* F4264 802CF8B4 45030001 */ bc1tl .L802CF8BC /* F4268 802CF8B8 46001006 */ mov.s $f0, $f2 .L802CF8BC: diff --git a/asm/nonmatchings/code_f2470_len_27f0/InterpNpcYaw.s b/asm/nonmatchings/code_f2470_len_27f0/InterpNpcYaw.s index c151759837..92fa38a57f 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/InterpNpcYaw.s +++ b/asm/nonmatchings/code_f2470_len_27f0/InterpNpcYaw.s @@ -32,7 +32,7 @@ glabel InterpNpcYaw /* F3520 802CEB70 0240202D */ daddu $a0, $s2, $zero /* F3524 802CEB74 C6420074 */ lwc1 $f2, 0x74($s2) /* F3528 802CEB78 44820000 */ mtc1 $v0, $f0 -/* F352C 802CEB7C 00000000 */ nop +/* F352C 802CEB7C 00000000 */ nop /* F3530 802CEB80 46800020 */ cvt.s.w $f0, $f0 /* F3534 802CEB84 46020001 */ sub.s $f0, $f0, $f2 /* F3538 802CEB88 26310004 */ addiu $s1, $s1, 4 @@ -52,28 +52,28 @@ glabel InterpNpcYaw /* F356C 802CEBBC C6420078 */ lwc1 $f2, 0x78($s2) /* F3570 802CEBC0 3C01C334 */ lui $at, 0xc334 /* F3574 802CEBC4 44810000 */ mtc1 $at, $f0 -/* F3578 802CEBC8 00000000 */ nop +/* F3578 802CEBC8 00000000 */ nop /* F357C 802CEBCC 4600103C */ c.lt.s $f2, $f0 -/* F3580 802CEBD0 00000000 */ nop +/* F3580 802CEBD0 00000000 */ nop /* F3584 802CEBD4 45000007 */ bc1f .L802CEBF4 -/* F3588 802CEBD8 00000000 */ nop +/* F3588 802CEBD8 00000000 */ nop /* F358C 802CEBDC 3C0143B4 */ lui $at, 0x43b4 /* F3590 802CEBE0 44810000 */ mtc1 $at, $f0 -/* F3594 802CEBE4 00000000 */ nop +/* F3594 802CEBE4 00000000 */ nop /* F3598 802CEBE8 46001000 */ add.s $f0, $f2, $f0 /* F359C 802CEBEC E6400078 */ swc1 $f0, 0x78($s2) /* F35A0 802CEBF0 C6420078 */ lwc1 $f2, 0x78($s2) .L802CEBF4: /* F35A4 802CEBF4 3C014334 */ lui $at, 0x4334 /* F35A8 802CEBF8 44810000 */ mtc1 $at, $f0 -/* F35AC 802CEBFC 00000000 */ nop +/* F35AC 802CEBFC 00000000 */ nop /* F35B0 802CEC00 4602003C */ c.lt.s $f0, $f2 -/* F35B4 802CEC04 00000000 */ nop +/* F35B4 802CEC04 00000000 */ nop /* F35B8 802CEC08 45000006 */ bc1f .L802CEC24 -/* F35BC 802CEC0C 00000000 */ nop +/* F35BC 802CEC0C 00000000 */ nop /* F35C0 802CEC10 3C0143B4 */ lui $at, 0x43b4 /* F35C4 802CEC14 44810000 */ mtc1 $at, $f0 -/* F35C8 802CEC18 00000000 */ nop +/* F35C8 802CEC18 00000000 */ nop /* F35CC 802CEC1C 46001001 */ sub.s $f0, $f2, $f0 /* F35D0 802CEC20 E6400078 */ swc1 $f0, 0x78($s2) .L802CEC24: @@ -95,10 +95,10 @@ glabel InterpNpcYaw /* F3608 802CEC58 00021403 */ sra $v0, $v0, 0x10 /* F360C 802CEC5C C6800000 */ lwc1 $f0, ($s4) /* F3610 802CEC60 44821000 */ mtc1 $v0, $f2 -/* F3614 802CEC64 00000000 */ nop +/* F3614 802CEC64 00000000 */ nop /* F3618 802CEC68 468010A0 */ cvt.s.w $f2, $f2 /* F361C 802CEC6C 46020002 */ mul.s $f0, $f0, $f2 -/* F3620 802CEC70 00000000 */ nop +/* F3620 802CEC70 00000000 */ nop /* F3624 802CEC74 C6AC0000 */ lwc1 $f12, ($s5) /* F3628 802CEC78 C6620000 */ lwc1 $f2, ($s3) /* F362C 802CEC7C 468010A0 */ cvt.s.w $f2, $f2 diff --git a/asm/nonmatchings/code_f2470_len_27f0/NpcFaceNpc.s b/asm/nonmatchings/code_f2470_len_27f0/NpcFaceNpc.s index c1bc07396a..502706d5a4 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/NpcFaceNpc.s +++ b/asm/nonmatchings/code_f2470_len_27f0/NpcFaceNpc.s @@ -35,7 +35,7 @@ glabel NpcFaceNpc /* F38A8 802CEEF8 0200282D */ daddu $a1, $s0, $zero /* F38AC 802CEEFC 0040802D */ daddu $s0, $v0, $zero /* F38B0 802CEF00 16000003 */ bnez $s0, .L802CEF10 -/* F38B4 802CEF04 00000000 */ nop +/* F38B4 802CEF04 00000000 */ nop .L802CEF08: /* F38B8 802CEF08 080B3C0E */ j .L802CF038 /* F38BC 802CEF0C 24020002 */ addiu $v0, $zero, 2 @@ -59,28 +59,28 @@ glabel NpcFaceNpc /* F3900 802CEF50 C6220078 */ lwc1 $f2, 0x78($s1) /* F3904 802CEF54 3C01C334 */ lui $at, 0xc334 /* F3908 802CEF58 44810000 */ mtc1 $at, $f0 -/* F390C 802CEF5C 00000000 */ nop +/* F390C 802CEF5C 00000000 */ nop /* F3910 802CEF60 4600103C */ c.lt.s $f2, $f0 -/* F3914 802CEF64 00000000 */ nop +/* F3914 802CEF64 00000000 */ nop /* F3918 802CEF68 45000007 */ bc1f .L802CEF88 -/* F391C 802CEF6C 00000000 */ nop +/* F391C 802CEF6C 00000000 */ nop /* F3920 802CEF70 3C0143B4 */ lui $at, 0x43b4 /* F3924 802CEF74 44810000 */ mtc1 $at, $f0 -/* F3928 802CEF78 00000000 */ nop +/* F3928 802CEF78 00000000 */ nop /* F392C 802CEF7C 46001000 */ add.s $f0, $f2, $f0 /* F3930 802CEF80 E6200078 */ swc1 $f0, 0x78($s1) /* F3934 802CEF84 C6220078 */ lwc1 $f2, 0x78($s1) .L802CEF88: /* F3938 802CEF88 3C014334 */ lui $at, 0x4334 /* F393C 802CEF8C 44810000 */ mtc1 $at, $f0 -/* F3940 802CEF90 00000000 */ nop +/* F3940 802CEF90 00000000 */ nop /* F3944 802CEF94 4602003C */ c.lt.s $f0, $f2 -/* F3948 802CEF98 00000000 */ nop +/* F3948 802CEF98 00000000 */ nop /* F394C 802CEF9C 45000006 */ bc1f .L802CEFB8 -/* F3950 802CEFA0 00000000 */ nop +/* F3950 802CEFA0 00000000 */ nop /* F3954 802CEFA4 3C0143B4 */ lui $at, 0x43b4 /* F3958 802CEFA8 44810000 */ mtc1 $at, $f0 -/* F395C 802CEFAC 00000000 */ nop +/* F395C 802CEFAC 00000000 */ nop /* F3960 802CEFB0 46001001 */ sub.s $f0, $f2, $f0 /* F3964 802CEFB4 E6200078 */ swc1 $f0, 0x78($s1) .L802CEFB8: @@ -101,10 +101,10 @@ glabel NpcFaceNpc /* F399C 802CEFEC 00021403 */ sra $v0, $v0, 0x10 /* F39A0 802CEFF0 C6A00000 */ lwc1 $f0, ($s5) /* F39A4 802CEFF4 44821000 */ mtc1 $v0, $f2 -/* F39A8 802CEFF8 00000000 */ nop +/* F39A8 802CEFF8 00000000 */ nop /* F39AC 802CEFFC 468010A0 */ cvt.s.w $f2, $f2 /* F39B0 802CF000 46020002 */ mul.s $f0, $f0, $f2 -/* F39B4 802CF004 00000000 */ nop +/* F39B4 802CF004 00000000 */ nop /* F39B8 802CF008 C6CC0000 */ lwc1 $f12, ($s6) /* F39BC 802CF00C C6820000 */ lwc1 $f2, ($s4) /* F39C0 802CF010 468010A0 */ cvt.s.w $f2, $f2 diff --git a/asm/nonmatchings/code_f2470_len_27f0/NpcFacePlayer.s b/asm/nonmatchings/code_f2470_len_27f0/NpcFacePlayer.s index 568e65b013..cdc130c24d 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/NpcFacePlayer.s +++ b/asm/nonmatchings/code_f2470_len_27f0/NpcFacePlayer.s @@ -47,28 +47,28 @@ glabel NpcFacePlayer /* F3720 802CED70 C6220078 */ lwc1 $f2, 0x78($s1) /* F3724 802CED74 3C01C334 */ lui $at, 0xc334 /* F3728 802CED78 44810000 */ mtc1 $at, $f0 -/* F372C 802CED7C 00000000 */ nop +/* F372C 802CED7C 00000000 */ nop /* F3730 802CED80 4600103C */ c.lt.s $f2, $f0 -/* F3734 802CED84 00000000 */ nop +/* F3734 802CED84 00000000 */ nop /* F3738 802CED88 45000007 */ bc1f .L802CEDA8 -/* F373C 802CED8C 00000000 */ nop +/* F373C 802CED8C 00000000 */ nop /* F3740 802CED90 3C0143B4 */ lui $at, 0x43b4 /* F3744 802CED94 44810000 */ mtc1 $at, $f0 -/* F3748 802CED98 00000000 */ nop +/* F3748 802CED98 00000000 */ nop /* F374C 802CED9C 46001000 */ add.s $f0, $f2, $f0 /* F3750 802CEDA0 E6200078 */ swc1 $f0, 0x78($s1) /* F3754 802CEDA4 C6220078 */ lwc1 $f2, 0x78($s1) .L802CEDA8: /* F3758 802CEDA8 3C014334 */ lui $at, 0x4334 /* F375C 802CEDAC 44810000 */ mtc1 $at, $f0 -/* F3760 802CEDB0 00000000 */ nop +/* F3760 802CEDB0 00000000 */ nop /* F3764 802CEDB4 4602003C */ c.lt.s $f0, $f2 -/* F3768 802CEDB8 00000000 */ nop +/* F3768 802CEDB8 00000000 */ nop /* F376C 802CEDBC 45000006 */ bc1f .L802CEDD8 -/* F3770 802CEDC0 00000000 */ nop +/* F3770 802CEDC0 00000000 */ nop /* F3774 802CEDC4 3C0143B4 */ lui $at, 0x43b4 /* F3778 802CEDC8 44810000 */ mtc1 $at, $f0 -/* F377C 802CEDCC 00000000 */ nop +/* F377C 802CEDCC 00000000 */ nop /* F3780 802CEDD0 46001001 */ sub.s $f0, $f2, $f0 /* F3784 802CEDD4 E6200078 */ swc1 $f0, 0x78($s1) .L802CEDD8: @@ -89,10 +89,10 @@ glabel NpcFacePlayer /* F37BC 802CEE0C 00021403 */ sra $v0, $v0, 0x10 /* F37C0 802CEE10 C6A00000 */ lwc1 $f0, ($s5) /* F37C4 802CEE14 44821000 */ mtc1 $v0, $f2 -/* F37C8 802CEE18 00000000 */ nop +/* F37C8 802CEE18 00000000 */ nop /* F37CC 802CEE1C 468010A0 */ cvt.s.w $f2, $f2 /* F37D0 802CEE20 46020002 */ mul.s $f0, $f0, $f2 -/* F37D4 802CEE24 00000000 */ nop +/* F37D4 802CEE24 00000000 */ nop /* F37D8 802CEE28 C6CC0000 */ lwc1 $f12, ($s6) /* F37DC 802CEE2C C6620000 */ lwc1 $f2, ($s3) /* F37E0 802CEE30 468010A0 */ cvt.s.w $f2, $f2 diff --git a/asm/nonmatchings/code_f2470_len_27f0/NpcFlyTo.s b/asm/nonmatchings/code_f2470_len_27f0/NpcFlyTo.s index d986d17a27..cc57389a7b 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/NpcFlyTo.s +++ b/asm/nonmatchings/code_f2470_len_27f0/NpcFlyTo.s @@ -80,7 +80,7 @@ glabel NpcFlyTo /* F31D4 802CE824 E6220010 */ swc1 $f2, 0x10($s1) /* F31D8 802CE828 8E42009C */ lw $v0, 0x9c($s2) /* F31DC 802CE82C 14400006 */ bnez $v0, .L802CE848 -/* F31E0 802CE830 00000000 */ nop +/* F31E0 802CE830 00000000 */ nop /* F31E4 802CE834 C6200018 */ lwc1 $f0, 0x18($s1) /* F31E8 802CE838 46001003 */ div.s $f0, $f2, $f0 /* F31EC 802CE83C 4600018D */ trunc.w.s $f6, $f0 @@ -88,7 +88,7 @@ glabel NpcFlyTo /* F31F4 802CE844 E646009C */ swc1 $f6, 0x9c($s2) .L802CE848: /* F31F8 802CE848 44820000 */ mtc1 $v0, $f0 -/* F31FC 802CE84C 00000000 */ nop +/* F31FC 802CE84C 00000000 */ nop /* F3200 802CE850 46800020 */ cvt.s.w $f0, $f0 /* F3204 802CE854 46001003 */ div.s $f0, $f2, $f0 /* F3208 802CE858 E6200018 */ swc1 $f0, 0x18($s1) @@ -141,9 +141,9 @@ glabel NpcFlyTo /* F32BC 802CE90C 0C00A7B5 */ jal dist2D /* F32C0 802CE910 8E270068 */ lw $a3, 0x68($s1) /* F32C4 802CE914 4480A000 */ mtc1 $zero, $f20 -/* F32C8 802CE918 00000000 */ nop +/* F32C8 802CE918 00000000 */ nop /* F32CC 802CE91C 46140032 */ c.eq.s $f0, $f20 -/* F32D0 802CE920 00000000 */ nop +/* F32D0 802CE920 00000000 */ nop /* F32D4 802CE924 45000003 */ bc1f .L802CE934 /* F32D8 802CE928 46000086 */ mov.s $f2, $f0 /* F32DC 802CE92C 3C013F80 */ lui $at, 0x3f80 @@ -151,12 +151,12 @@ glabel NpcFlyTo .L802CE934: /* F32E4 802CE934 C6200010 */ lwc1 $f0, 0x10($s1) /* F32E8 802CE938 46140032 */ c.eq.s $f0, $f20 -/* F32EC 802CE93C 00000000 */ nop +/* F32EC 802CE93C 00000000 */ nop /* F32F0 802CE940 45000006 */ bc1f .L802CE95C -/* F32F4 802CE944 00000000 */ nop +/* F32F4 802CE944 00000000 */ nop /* F32F8 802CE948 3C013F80 */ lui $at, 0x3f80 /* F32FC 802CE94C 44810000 */ mtc1 $at, $f0 -/* F3300 802CE950 00000000 */ nop +/* F3300 802CE950 00000000 */ nop /* F3304 802CE954 E6200010 */ swc1 $f0, 0x10($s1) /* F3308 802CE958 C6200010 */ lwc1 $f0, 0x10($s1) .L802CE95C: @@ -169,7 +169,7 @@ glabel NpcFlyTo /* F3324 802CE974 3C01802E */ lui $at, %hi(D_802DA1E0) /* F3328 802CE978 D420A1E0 */ ldc1 $f0, %lo(D_802DA1E0)($at) /* F332C 802CE97C 46206302 */ mul.d $f12, $f12, $f0 -/* F3330 802CE980 00000000 */ nop +/* F3330 802CE980 00000000 */ nop /* F3334 802CE984 0C00A8BB */ jal sin_deg /* F3338 802CE988 46206320 */ cvt.s.d $f12, $f12 /* F333C 802CE98C 8E440078 */ lw $a0, 0x78($s2) @@ -180,19 +180,19 @@ glabel NpcFlyTo /* F334C 802CE99C 04810007 */ bgez $a0, .L802CE9BC /* F3350 802CE9A0 00041023 */ negu $v0, $a0 /* F3354 802CE9A4 44821000 */ mtc1 $v0, $f2 -/* F3358 802CE9A8 00000000 */ nop +/* F3358 802CE9A8 00000000 */ nop /* F335C 802CE9AC 468010A0 */ cvt.s.w $f2, $f2 /* F3360 802CE9B0 46002007 */ neg.s $f0, $f4 /* F3364 802CE9B4 46020102 */ mul.s $f4, $f0, $f2 -/* F3368 802CE9B8 00000000 */ nop +/* F3368 802CE9B8 00000000 */ nop .L802CE9BC: /* F336C 802CE9BC 18800006 */ blez $a0, .L802CE9D8 -/* F3370 802CE9C0 00000000 */ nop +/* F3370 802CE9C0 00000000 */ nop /* F3374 802CE9C4 44840000 */ mtc1 $a0, $f0 -/* F3378 802CE9C8 00000000 */ nop +/* F3378 802CE9C8 00000000 */ nop /* F337C 802CE9CC 46800020 */ cvt.s.w $f0, $f0 /* F3380 802CE9D0 46002102 */ mul.s $f4, $f4, $f0 -/* F3384 802CE9D4 00000000 */ nop +/* F3384 802CE9D4 00000000 */ nop .L802CE9D8: /* F3388 802CE9D8 C620003C */ lwc1 $f0, 0x3c($s1) /* F338C 802CE9DC 46040000 */ add.s $f0, $f0, $f4 diff --git a/asm/nonmatchings/code_f2470_len_27f0/NpcMoveTo.s b/asm/nonmatchings/code_f2470_len_27f0/NpcMoveTo.s index 19af303cb3..367c0951de 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/NpcMoveTo.s +++ b/asm/nonmatchings/code_f2470_len_27f0/NpcMoveTo.s @@ -16,7 +16,7 @@ glabel NpcMoveTo .L802CE258: /* F2C08 802CE258 8E420070 */ lw $v0, 0x70($s2) /* F2C0C 802CE25C 1440003D */ bnez $v0, .L802CE354 -/* F2C10 802CE260 00000000 */ nop +/* F2C10 802CE260 00000000 */ nop /* F2C14 802CE264 8E250000 */ lw $a1, ($s1) /* F2C18 802CE268 26310004 */ addiu $s1, $s1, 4 /* F2C1C 802CE26C 0C0B1EAF */ jal get_variable @@ -29,13 +29,13 @@ glabel NpcMoveTo /* F2C38 802CE288 8E250000 */ lw $a1, ($s1) /* F2C3C 802CE28C 26310004 */ addiu $s1, $s1, 4 /* F2C40 802CE290 4482B000 */ mtc1 $v0, $f22 -/* F2C44 802CE294 00000000 */ nop +/* F2C44 802CE294 00000000 */ nop /* F2C48 802CE298 4680B5A0 */ cvt.s.w $f22, $f22 /* F2C4C 802CE29C 0C0B1EAF */ jal get_variable /* F2C50 802CE2A0 0240202D */ daddu $a0, $s2, $zero /* F2C54 802CE2A4 8E250000 */ lw $a1, ($s1) /* F2C58 802CE2A8 4482A000 */ mtc1 $v0, $f20 -/* F2C5C 802CE2AC 00000000 */ nop +/* F2C5C 802CE2AC 00000000 */ nop /* F2C60 802CE2B0 4680A520 */ cvt.s.w $f20, $f20 /* F2C64 802CE2B4 0C0B1EAF */ jal get_variable /* F2C68 802CE2B8 0240202D */ daddu $a0, $s2, $zero @@ -68,7 +68,7 @@ glabel NpcMoveTo /* F2CD0 802CE320 A602008E */ sh $v0, 0x8e($s0) .L802CE324: /* F2CD4 802CE324 44820000 */ mtc1 $v0, $f0 -/* F2CD8 802CE328 00000000 */ nop +/* F2CD8 802CE328 00000000 */ nop /* F2CDC 802CE32C 46800020 */ cvt.s.w $f0, $f0 /* F2CE0 802CE330 46003003 */ div.s $f0, $f6, $f0 /* F2CE4 802CE334 E6000018 */ swc1 $f0, 0x18($s0) @@ -99,7 +99,7 @@ glabel NpcMoveTo /* F2D3C 802CE38C 44801000 */ mtc1 $zero, $f2 /* F2D40 802CE390 46000021 */ cvt.d.s $f0, $f0 /* F2D44 802CE394 4622003C */ c.lt.d $f0, $f2 -/* F2D48 802CE398 00000000 */ nop +/* F2D48 802CE398 00000000 */ nop /* F2D4C 802CE39C 45000003 */ bc1f .L802CE3AC /* F2D50 802CE3A0 0200202D */ daddu $a0, $s0, $zero /* F2D54 802CE3A4 080B38EC */ j .L802CE3B0 @@ -108,7 +108,7 @@ glabel NpcMoveTo /* F2D5C 802CE3AC 24050001 */ addiu $a1, $zero, 1 .L802CE3B0: /* F2D60 802CE3B0 0C00F598 */ jal func_8003D660 -/* F2D64 802CE3B4 00000000 */ nop +/* F2D64 802CE3B4 00000000 */ nop /* F2D68 802CE3B8 C60C0038 */ lwc1 $f12, 0x38($s0) /* F2D6C 802CE3BC C60E0040 */ lwc1 $f14, 0x40($s0) /* F2D70 802CE3C0 8E060060 */ lw $a2, 0x60($s0) @@ -121,15 +121,15 @@ glabel NpcMoveTo /* F2D8C 802CE3DC 44801000 */ mtc1 $zero, $f2 /* F2D90 802CE3E0 46002021 */ cvt.d.s $f0, $f4 /* F2D94 802CE3E4 4622003C */ c.lt.d $f0, $f2 -/* F2D98 802CE3E8 00000000 */ nop +/* F2D98 802CE3E8 00000000 */ nop /* F2D9C 802CE3EC 45000004 */ bc1f .L802CE400 -/* F2DA0 802CE3F0 00000000 */ nop +/* F2DA0 802CE3F0 00000000 */ nop /* F2DA4 802CE3F4 3C013F80 */ lui $at, 0x3f80 /* F2DA8 802CE3F8 44812000 */ mtc1 $at, $f4 -/* F2DAC 802CE3FC 00000000 */ nop +/* F2DAC 802CE3FC 00000000 */ nop .L802CE400: /* F2DB0 802CE400 4604303E */ c.le.s $f6, $f4 -/* F2DB4 802CE404 00000000 */ nop +/* F2DB4 802CE404 00000000 */ nop /* F2DB8 802CE408 45010002 */ bc1t .L802CE414 /* F2DBC 802CE40C 24020001 */ addiu $v0, $zero, 1 /* F2DC0 802CE410 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_f2470_len_27f0/PutPartnerAway.s b/asm/nonmatchings/code_f2470_len_27f0/PutPartnerAway.s index 53bd9d0f7f..d0a3c59cc3 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/PutPartnerAway.s +++ b/asm/nonmatchings/code_f2470_len_27f0/PutPartnerAway.s @@ -43,7 +43,7 @@ glabel PutPartnerAway /* F43D0 802CFA20 00621821 */ addu $v1, $v1, $v0 /* F43D4 802CFA24 00031843 */ sra $v1, $v1, 1 /* F43D8 802CFA28 44830000 */ mtc1 $v1, $f0 -/* F43DC 802CFA2C 00000000 */ nop +/* F43DC 802CFA2C 00000000 */ nop /* F43E0 802CFA30 46800020 */ cvt.s.w $f0, $f0 /* F43E4 802CFA34 46001780 */ add.s $f30, $f2, $f0 /* F43E8 802CFA38 3C014080 */ lui $at, 0x4080 @@ -72,7 +72,7 @@ glabel PutPartnerAway /* F4444 802CFA94 46041083 */ div.s $f2, $f2, $f4 /* F4448 802CFA98 4600118D */ trunc.w.s $f6, $f2 /* F444C 802CFA9C 44023000 */ mfc1 $v0, $f6 -/* F4450 802CFAA0 00000000 */ nop +/* F4450 802CFAA0 00000000 */ nop /* F4454 802CFAA4 A622008E */ sh $v0, 0x8e($s1) /* F4458 802CFAA8 00021400 */ sll $v0, $v0, 0x10 /* F445C 802CFAAC 00021403 */ sra $v0, $v0, 0x10 @@ -89,17 +89,17 @@ glabel PutPartnerAway /* F4484 802CFAD4 8622008E */ lh $v0, 0x8e($s1) /* F4488 802CFAD8 C6200014 */ lwc1 $f0, 0x14($s1) /* F448C 802CFADC 44822000 */ mtc1 $v0, $f4 -/* F4490 802CFAE0 00000000 */ nop +/* F4490 802CFAE0 00000000 */ nop /* F4494 802CFAE4 46802120 */ cvt.s.w $f4, $f4 /* F4498 802CFAE8 46040002 */ mul.s $f0, $f0, $f4 -/* F449C 802CFAEC 00000000 */ nop +/* F449C 802CFAEC 00000000 */ nop /* F44A0 802CFAF0 46040002 */ mul.s $f0, $f0, $f4 -/* F44A4 802CFAF4 00000000 */ nop +/* F44A4 802CFAF4 00000000 */ nop /* F44A8 802CFAF8 3C013F00 */ lui $at, 0x3f00 /* F44AC 802CFAFC 44811000 */ mtc1 $at, $f2 -/* F44B0 802CFB00 00000000 */ nop +/* F44B0 802CFB00 00000000 */ nop /* F44B4 802CFB04 46020002 */ mul.s $f0, $f0, $f2 -/* F44B8 802CFB08 00000000 */ nop +/* F44B8 802CFB08 00000000 */ nop /* F44BC 802CFB0C 8E030000 */ lw $v1, ($s0) /* F44C0 802CFB10 461CF701 */ sub.s $f28, $f30, $f28 /* F44C4 802CFB14 000310C0 */ sll $v0, $v1, 3 @@ -121,7 +121,7 @@ glabel PutPartnerAway /* F4500 802CFB50 C622003C */ lwc1 $f2, 0x3c($s1) /* F4504 802CFB54 46001080 */ add.s $f2, $f2, $f0 /* F4508 802CFB58 4480A000 */ mtc1 $zero, $f20 -/* F450C 802CFB5C 00000000 */ nop +/* F450C 802CFB5C 00000000 */ nop /* F4510 802CFB60 4614003E */ c.le.s $f0, $f20 /* F4514 802CFB64 E620001C */ swc1 $f0, 0x1c($s1) /* F4518 802CFB68 4500000A */ bc1f .L802CFB94 @@ -144,10 +144,10 @@ glabel PutPartnerAway /* F4558 802CFBA8 3C014120 */ lui $at, 0x4120 /* F455C 802CFBAC 44811000 */ mtc1 $at, $f2 /* F4560 802CFBB0 44820000 */ mtc1 $v0, $f0 -/* F4564 802CFBB4 00000000 */ nop +/* F4564 802CFBB4 00000000 */ nop /* F4568 802CFBB8 46800020 */ cvt.s.w $f0, $f0 /* F456C 802CFBBC 4600103C */ c.lt.s $f2, $f0 -/* F4570 802CFBC0 00000000 */ nop +/* F4570 802CFBC0 00000000 */ nop /* F4574 802CFBC4 45030001 */ bc1tl .L802CFBCC /* F4578 802CFBC8 46001006 */ mov.s $f0, $f2 .L802CFBCC: diff --git a/asm/nonmatchings/code_f2470_len_27f0/_npc_jump_to.s b/asm/nonmatchings/code_f2470_len_27f0/_npc_jump_to.s index ad1b446113..92e6f1052c 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/_npc_jump_to.s +++ b/asm/nonmatchings/code_f2470_len_27f0/_npc_jump_to.s @@ -21,7 +21,7 @@ glabel _npc_jump_to .L802CE474: /* F2E24 802CE474 8E420070 */ lw $v0, 0x70($s2) /* F2E28 802CE478 14400065 */ bnez $v0, .L802CE610 -/* F2E2C 802CE47C 00000000 */ nop +/* F2E2C 802CE47C 00000000 */ nop /* F2E30 802CE480 8E250000 */ lw $a1, ($s1) /* F2E34 802CE484 26310004 */ addiu $s1, $s1, 4 /* F2E38 802CE488 0C0B1EAF */ jal get_variable @@ -34,12 +34,12 @@ glabel _npc_jump_to /* F2E54 802CE4A4 8E250000 */ lw $a1, ($s1) /* F2E58 802CE4A8 26310004 */ addiu $s1, $s1, 4 /* F2E5C 802CE4AC 4482C000 */ mtc1 $v0, $f24 -/* F2E60 802CE4B0 00000000 */ nop +/* F2E60 802CE4B0 00000000 */ nop /* F2E64 802CE4B4 4680C620 */ cvt.s.w $f24, $f24 /* F2E68 802CE4B8 0C0B1EAF */ jal get_variable /* F2E6C 802CE4BC 0240202D */ daddu $a0, $s2, $zero /* F2E70 802CE4C0 4482B000 */ mtc1 $v0, $f22 -/* F2E74 802CE4C4 00000000 */ nop +/* F2E74 802CE4C4 00000000 */ nop /* F2E78 802CE4C8 4680B5A0 */ cvt.s.w $f22, $f22 /* F2E7C 802CE4CC 8E250000 */ lw $a1, ($s1) /* F2E80 802CE4D0 26310004 */ addiu $s1, $s1, 4 @@ -47,7 +47,7 @@ glabel _npc_jump_to /* F2E88 802CE4D8 0240202D */ daddu $a0, $s2, $zero /* F2E8C 802CE4DC 8E250000 */ lw $a1, ($s1) /* F2E90 802CE4E0 4482A000 */ mtc1 $v0, $f20 -/* F2E94 802CE4E4 00000000 */ nop +/* F2E94 802CE4E4 00000000 */ nop /* F2E98 802CE4E8 4680A520 */ cvt.s.w $f20, $f20 /* F2E9C 802CE4EC 0C0B1EAF */ jal get_variable /* F2EA0 802CE4F0 0240202D */ daddu $a0, $s2, $zero @@ -76,7 +76,7 @@ glabel _npc_jump_to /* F2EF8 802CE548 44801000 */ mtc1 $zero, $f2 /* F2EFC 802CE54C 4600A021 */ cvt.d.s $f0, $f20 /* F2F00 802CE550 4620103C */ c.lt.d $f2, $f0 -/* F2F04 802CE554 00000000 */ nop +/* F2F04 802CE554 00000000 */ nop /* F2F08 802CE558 45000009 */ bc1f .L802CE580 /* F2F0C 802CE55C AE400078 */ sw $zero, 0x78($s2) /* F2F10 802CE560 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -101,7 +101,7 @@ glabel _npc_jump_to /* F2F58 802CE5A8 A602008E */ sh $v0, 0x8e($s0) .L802CE5AC: /* F2F5C 802CE5AC 44820000 */ mtc1 $v0, $f0 -/* F2F60 802CE5B0 00000000 */ nop +/* F2F60 802CE5B0 00000000 */ nop /* F2F64 802CE5B4 46800020 */ cvt.s.w $f0, $f0 /* F2F68 802CE5B8 4600A003 */ div.s $f0, $f20, $f0 /* F2F6C 802CE5BC E6000018 */ swc1 $f0, 0x18($s0) @@ -109,15 +109,15 @@ glabel _npc_jump_to /* F2F70 802CE5C0 8602008E */ lh $v0, 0x8e($s0) /* F2F74 802CE5C4 C6000014 */ lwc1 $f0, 0x14($s0) /* F2F78 802CE5C8 44822000 */ mtc1 $v0, $f4 -/* F2F7C 802CE5CC 00000000 */ nop +/* F2F7C 802CE5CC 00000000 */ nop /* F2F80 802CE5D0 46802120 */ cvt.s.w $f4, $f4 /* F2F84 802CE5D4 46040002 */ mul.s $f0, $f0, $f4 -/* F2F88 802CE5D8 00000000 */ nop +/* F2F88 802CE5D8 00000000 */ nop /* F2F8C 802CE5DC 3C013F00 */ lui $at, 0x3f00 /* F2F90 802CE5E0 44811000 */ mtc1 $at, $f2 -/* F2F94 802CE5E4 00000000 */ nop +/* F2F94 802CE5E4 00000000 */ nop /* F2F98 802CE5E8 46020002 */ mul.s $f0, $f0, $f2 -/* F2F9C 802CE5EC 00000000 */ nop +/* F2F9C 802CE5EC 00000000 */ nop /* F2FA0 802CE5F0 8E020000 */ lw $v0, ($s0) /* F2FA4 802CE5F4 4604B103 */ div.s $f4, $f22, $f4 /* F2FA8 802CE5F8 34420800 */ ori $v0, $v0, 0x800 diff --git a/asm/nonmatchings/code_f270_len_1190/begin_state_logos.s b/asm/nonmatchings/code_f270_len_1190/begin_state_logos.s index 1c0c920058..42a3a7a62b 100644 --- a/asm/nonmatchings/code_f270_len_1190/begin_state_logos.s +++ b/asm/nonmatchings/code_f270_len_1190/begin_state_logos.s @@ -46,9 +46,9 @@ glabel begin_state_logos /* F314 80033F14 3C01800A */ lui $at, %hi(D_800A091C) /* F318 80033F18 AC22091C */ sw $v0, %lo(D_800A091C)($at) /* F31C 80033F1C 0C018028 */ jal nuContRmbForceStop -/* F320 80033F20 00000000 */ nop +/* F320 80033F20 00000000 */ nop /* F324 80033F24 0C00B7BD */ jal create_cameras_a -/* F328 80033F28 00000000 */ nop +/* F328 80033F28 00000000 */ nop /* F32C 80033F2C 0000202D */ daddu $a0, $zero, $zero /* F330 80033F30 2405000C */ addiu $a1, $zero, 0xc /* F334 80033F34 2406001C */ addiu $a2, $zero, 0x1c @@ -109,25 +109,25 @@ glabel begin_state_logos /* F410 80034010 0C0B0C77 */ jal clear_script_list /* F414 80034014 E606005C */ swc1 $f6, 0x5c($s0) /* F418 80034018 0C048C2E */ jal clear_dynamic_entity_list -/* F41C 8003401C 00000000 */ nop +/* F41C 8003401C 00000000 */ nop /* F420 80034020 0C047624 */ jal func_8011D890 -/* F424 80034024 00000000 */ nop +/* F424 80034024 00000000 */ nop /* F428 80034028 0C0B763E */ jal func_802DD8F8 /* F42C 8003402C 0000202D */ daddu $a0, $zero, $zero /* F430 80034030 0C047889 */ jal func_8011E224 -/* F434 80034034 00000000 */ nop +/* F434 80034034 00000000 */ nop /* F438 80034038 0C0482EC */ jal clear_virtual_models -/* F43C 8003403C 00000000 */ nop +/* F43C 8003403C 00000000 */ nop /* F440 80034040 0C00E12F */ jal clear_npcs -/* F444 80034044 00000000 */ nop +/* F444 80034044 00000000 */ nop /* F448 80034048 0C050440 */ jal func_80141100 -/* F44C 8003404C 00000000 */ nop +/* F44C 8003404C 00000000 */ nop /* F450 80034050 0C05177E */ jal func_80145DF8 -/* F454 80034054 00000000 */ nop +/* F454 80034054 00000000 */ nop /* F458 80034058 0C04432E */ jal clear_entity_data /* F45C 8003405C 24040001 */ addiu $a0, $zero, 1 /* F460 80034060 0C016727 */ jal func_80059C9C -/* F464 80034064 00000000 */ nop +/* F464 80034064 00000000 */ nop /* F468 80034068 3C03800A */ lui $v1, %hi(D_8009A650) /* F46C 8003406C 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) /* F470 80034070 8C620000 */ lw $v0, ($v1) diff --git a/asm/nonmatchings/code_f270_len_1190/begin_state_pause_menu.s b/asm/nonmatchings/code_f270_len_1190/begin_state_pause_menu.s index 832b67d6a9..eabdd30a7d 100644 --- a/asm/nonmatchings/code_f270_len_1190/begin_state_pause_menu.s +++ b/asm/nonmatchings/code_f270_len_1190/begin_state_pause_menu.s @@ -9,7 +9,7 @@ glabel begin_state_pause_menu /* FD50 80034950 3C01800A */ lui $at, %hi(D_800A0922) /* FD54 80034954 A4200922 */ sh $zero, %lo(D_800A0922)($at) /* FD58 80034958 0C03805E */ jal disable_player_input -/* FD5C 8003495C 00000000 */ nop +/* FD5C 8003495C 00000000 */ nop /* FD60 80034960 0C009C22 */ jal func_80027088 /* FD64 80034964 24040003 */ addiu $a0, $zero, 3 /* FD68 80034968 0C051FB1 */ jal func_80147EC4 diff --git a/asm/nonmatchings/code_f270_len_1190/func_800343A4.s b/asm/nonmatchings/code_f270_len_1190/func_800343A4.s index 67500d915d..e69a437083 100644 --- a/asm/nonmatchings/code_f270_len_1190/func_800343A4.s +++ b/asm/nonmatchings/code_f270_len_1190/func_800343A4.s @@ -62,11 +62,12 @@ glabel func_800343A4 /* F888 80034488 2C62000A */ sltiu $v0, $v1, 0xa /* F88C 8003448C 10400124 */ beqz $v0, .L80034920 /* F890 80034490 00031080 */ sll $v0, $v1, 2 -/* F894 80034494 3C01800A */ lui $at, %hi(D_800982C0) +/* F894 80034494 3C01800A */ lui $at, %hi(jtbl_800982C0_736C0) /* F898 80034498 00220821 */ addu $at, $at, $v0 -/* F89C 8003449C 8C2282C0 */ lw $v0, %lo(D_800982C0)($at) +/* F89C 8003449C 8C2282C0 */ lw $v0, %lo(jtbl_800982C0_736C0)($at) /* F8A0 800344A0 00400008 */ jr $v0 -/* F8A4 800344A4 00000000 */ nop +/* F8A4 800344A4 00000000 */ nop +glabel L800344A8_F8A8 /* F8A8 800344A8 0000502D */ daddu $t2, $zero, $zero /* F8AC 800344AC 3C02800A */ lui $v0, %hi(gMasterGfxPos) /* F8B0 800344B0 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) @@ -163,7 +164,8 @@ glabel func_800343A4 /* FA18 80034618 1440FFC2 */ bnez $v0, .L80034524 /* FA1C 8003461C AC60004C */ sw $zero, 0x4c($v1) /* FA20 80034620 0800D248 */ j .L80034920 -/* FA24 80034624 00000000 */ nop +/* FA24 80034624 00000000 */ nop +glabel L80034628_FA28 /* FA28 80034628 0000502D */ daddu $t2, $zero, $zero /* FA2C 8003462C 3C02800A */ lui $v0, %hi(gMasterGfxPos) /* FA30 80034630 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) @@ -260,7 +262,8 @@ glabel func_800343A4 /* FB98 80034798 1440FFC2 */ bnez $v0, .L800346A4 /* FB9C 8003479C AC60004C */ sw $zero, 0x4c($v1) /* FBA0 800347A0 0800D248 */ j .L80034920 -/* FBA4 800347A4 00000000 */ nop +/* FBA4 800347A4 00000000 */ nop +glabel L800347A8_FBA8 /* FBA8 800347A8 0000502D */ daddu $t2, $zero, $zero /* FBAC 800347AC 3C02800A */ lui $v0, %hi(gMasterGfxPos) /* FBB0 800347B0 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) diff --git a/asm/nonmatchings/code_f270_len_1190/func_80034BFC.s b/asm/nonmatchings/code_f270_len_1190/func_80034BFC.s index 9f2d0320dd..98eb3ce09c 100644 --- a/asm/nonmatchings/code_f270_len_1190/func_80034BFC.s +++ b/asm/nonmatchings/code_f270_len_1190/func_80034BFC.s @@ -9,7 +9,7 @@ glabel func_80034BFC /* 1000C 80034C0C 3C01800A */ lui $at, %hi(D_800A0921) /* 10010 80034C10 A0200921 */ sb $zero, %lo(D_800A0921)($at) /* 10014 80034C14 0800D30B */ j .L80034C2C -/* 10018 80034C18 00000000 */ nop +/* 10018 80034C18 00000000 */ nop .L80034C1C: /* 1001C 80034C1C 24020001 */ addiu $v0, $zero, 1 /* 10020 80034C20 3C01800A */ lui $at, %hi(D_800A0921) @@ -19,4 +19,4 @@ glabel func_80034BFC /* 1002C 80034C2C 3C01800A */ lui $at, %hi(D_800A0920) /* 10030 80034C30 A0220920 */ sb $v0, %lo(D_800A0920)($at) /* 10034 80034C34 03E00008 */ jr $ra -/* 10038 80034C38 00000000 */ nop +/* 10038 80034C38 00000000 */ nop diff --git a/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s b/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s index 2acc44b6f7..28c8b7aff3 100644 --- a/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s +++ b/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s @@ -17,19 +17,19 @@ glabel func_80034C3C /* 1006C 80034C6C 28620002 */ slti $v0, $v1, 2 /* 10070 80034C70 24020004 */ addiu $v0, $zero, 4 /* 10074 80034C74 106200CA */ beq $v1, $v0, .L80034FA0 -/* 10078 80034C78 00000000 */ nop +/* 10078 80034C78 00000000 */ nop /* 1007C 80034C7C 0800D3F6 */ j .L80034FD8 -/* 10080 80034C80 00000000 */ nop +/* 10080 80034C80 00000000 */ nop .L80034C84: /* 10084 80034C84 104000D4 */ beqz $v0, .L80034FD8 -/* 10088 80034C88 00000000 */ nop +/* 10088 80034C88 00000000 */ nop /* 1008C 80034C8C 046000D2 */ bltz $v1, .L80034FD8 /* 10090 80034C90 24020004 */ addiu $v0, $zero, 4 /* 10094 80034C94 3C06800A */ lui $a2, %hi(D_800A0920) /* 10098 80034C98 24C60920 */ addiu $a2, $a2, %lo(D_800A0920) /* 1009C 80034C9C 80C30000 */ lb $v1, ($a2) /* 100A0 80034CA0 14620007 */ bne $v1, $v0, .L80034CC0 -/* 100A4 80034CA4 00000000 */ nop +/* 100A4 80034CA4 00000000 */ nop /* 100A8 80034CA8 3C03800A */ lui $v1, %hi(D_8009A650) /* 100AC 80034CAC 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) /* 100B0 80034CB0 8C620000 */ lw $v0, ($v1) @@ -44,7 +44,7 @@ glabel func_80034C3C /* 100D0 80034CD0 A0C20000 */ sb $v0, ($a2) /* 100D4 80034CD4 00021600 */ sll $v0, $v0, 0x18 /* 100D8 80034CD8 144000BF */ bnez $v0, .L80034FD8 -/* 100DC 80034CDC 00000000 */ nop +/* 100DC 80034CDC 00000000 */ nop .L80034CE0: /* 100E0 80034CE0 3C048007 */ lui $a0, %hi(D_80077950) /* 100E4 80034CE4 24847950 */ addiu $a0, $a0, %lo(D_80077950) @@ -53,7 +53,7 @@ glabel func_80034C3C /* 100F0 80034CF0 0C017CBC */ jal nuGfxSetCfb /* 100F4 80034CF4 A0C20000 */ sb $v0, ($a2) /* 100F8 80034CF8 0C0911C2 */ jal pause_cleanup -/* 100FC 80034CFC 00000000 */ nop +/* 100FC 80034CFC 00000000 */ nop /* 10100 80034D00 3C04800A */ lui $a0, %hi(D_8009A650) /* 10104 80034D04 2484A650 */ addiu $a0, $a0, %lo(D_8009A650) /* 10108 80034D08 8C820000 */ lw $v0, ($a0) @@ -80,47 +80,47 @@ glabel func_80034C3C /* 1015C 80034D5C 0C016BE1 */ jal func_8005AF84 /* 10160 80034D60 A4A30148 */ sh $v1, 0x148($a1) /* 10164 80034D64 0C00AB37 */ jal func_8002ACDC -/* 10168 80034D68 00000000 */ nop +/* 10168 80034D68 00000000 */ nop /* 1016C 80034D6C 0C018030 */ jal nuContRmbForceStopEnd -/* 10170 80034D70 00000000 */ nop +/* 10170 80034D70 00000000 */ nop /* 10174 80034D74 0C05259C */ jal func_80149670 /* 10178 80034D78 24040001 */ addiu $a0, $zero, 1 /* 1017C 80034D7C 8E020000 */ lw $v0, ($s0) /* 10180 80034D80 0C0B763E */ jal func_802DD8F8 /* 10184 80034D84 80440084 */ lb $a0, 0x84($v0) /* 10188 80034D88 0C0457FA */ jal init_model_data -/* 1018C 80034D8C 00000000 */ nop +/* 1018C 80034D8C 00000000 */ nop /* 10190 80034D90 0C05203C */ jal func_801480F0 -/* 10194 80034D94 00000000 */ nop +/* 10194 80034D94 00000000 */ nop /* 10198 80034D98 0C048316 */ jal init_virtual_models -/* 1019C 80034D9C 00000000 */ nop +/* 1019C 80034D9C 00000000 */ nop /* 101A0 80034DA0 0C0478C4 */ jal func_8011E310 -/* 101A4 80034DA4 00000000 */ nop +/* 101A4 80034DA4 00000000 */ nop /* 101A8 80034DA8 0C048C45 */ jal init_dynamic_entity_list -/* 101AC 80034DAC 00000000 */ nop +/* 101AC 80034DAC 00000000 */ nop /* 101B0 80034DB0 0000202D */ daddu $a0, $zero, $zero /* 101B4 80034DB4 0C0514BA */ jal func_801452E8 /* 101B8 80034DB8 0080282D */ daddu $a1, $a0, $zero /* 101BC 80034DBC 0C0504C0 */ jal init_menu_icon_list -/* 101C0 80034DC0 00000000 */ nop +/* 101C0 80034DC0 00000000 */ nop /* 101C4 80034DC4 0C04C433 */ jal init_item_entity_list -/* 101C8 80034DC8 00000000 */ nop +/* 101C8 80034DC8 00000000 */ nop /* 101CC 80034DCC 0C0B0CBB */ jal init_script_list -/* 101D0 80034DD0 00000000 */ nop +/* 101D0 80034DD0 00000000 */ nop /* 101D4 80034DD4 0C00E14B */ jal init_npc_list -/* 101D8 80034DD8 00000000 */ nop +/* 101D8 80034DD8 00000000 */ nop /* 101DC 80034DDC 0C044396 */ jal func_80110E58 -/* 101E0 80034DE0 00000000 */ nop +/* 101E0 80034DE0 00000000 */ nop /* 101E4 80034DE4 0C0515CA */ jal init_trigger_list -/* 101E8 80034DE8 00000000 */ nop +/* 101E8 80034DE8 00000000 */ nop /* 101EC 80034DEC 3C04800A */ lui $a0, %hi(D_800A0924) /* 101F0 80034DF0 8C840924 */ lw $a0, %lo(D_800A0924)($a0) /* 101F4 80034DF4 0C0525FF */ jal func_801497FC -/* 101F8 80034DF8 00000000 */ nop +/* 101F8 80034DF8 00000000 */ nop /* 101FC 80034DFC 0C052B1C */ jal func_8014AC70 -/* 10200 80034E00 00000000 */ nop +/* 10200 80034E00 00000000 */ nop /* 10204 80034E04 0C0169B0 */ jal load_world_script_api -/* 10208 80034E08 00000000 */ nop +/* 10208 80034E08 00000000 */ nop /* 1020C 80034E0C 3C04800E */ lui $a0, %hi(D_800D9230) /* 10210 80034E10 24849230 */ addiu $a0, $a0, %lo(D_800D9230) /* 10214 80034E14 0C016B3A */ jal load_asset_by_name @@ -133,12 +133,12 @@ glabel func_80034C3C /* 10230 80034E30 0C00AB1E */ jal general_heap_free /* 10234 80034E34 0200202D */ daddu $a0, $s0, $zero /* 10238 80034E38 0C016BE5 */ jal initialize_collision -/* 1023C 80034E3C 00000000 */ nop +/* 1023C 80034E3C 00000000 */ nop /* 10240 80034E40 0C016C16 */ jal load_collision -/* 10244 80034E44 00000000 */ nop +/* 10244 80034E44 00000000 */ nop /* 10248 80034E48 8E240008 */ lw $a0, 8($s1) /* 1024C 80034E4C 10800004 */ beqz $a0, .L80034E60 -/* 10250 80034E50 00000000 */ nop +/* 10250 80034E50 00000000 */ nop /* 10254 80034E54 8E25000C */ lw $a1, 0xc($s1) /* 10258 80034E58 0C00A5CF */ jal dma_copy /* 1025C 80034E5C 8E260010 */ lw $a2, 0x10($s1) @@ -149,9 +149,9 @@ glabel func_80034C3C /* 1026C 80034E6C 50800005 */ beql $a0, $zero, .L80034E84 /* 10270 80034E70 24040128 */ addiu $a0, $zero, 0x128 /* 10274 80034E74 0C05178A */ jal read_background_size -/* 10278 80034E78 00000000 */ nop +/* 10278 80034E78 00000000 */ nop /* 1027C 80034E7C 0800D3A5 */ j .L80034E94 -/* 10280 80034E80 00000000 */ nop +/* 10280 80034E80 00000000 */ nop .L80034E84: /* 10284 80034E84 240500C8 */ addiu $a1, $zero, 0xc8 /* 10288 80034E88 2406000C */ addiu $a2, $zero, 0xc @@ -164,11 +164,11 @@ glabel func_80034C3C /* 102A0 80034EA0 0C04584B */ jal calculate_model_sizes /* 102A4 80034EA4 A462015C */ sh $v0, 0x15c($v1) /* 102A8 80034EA8 0C00EC6C */ jal func_8003B1B0 -/* 102AC 80034EAC 00000000 */ nop +/* 102AC 80034EAC 00000000 */ nop /* 102B0 80034EB0 0C051FB1 */ jal func_80147EC4 /* 102B4 80034EB4 0000202D */ daddu $a0, $zero, $zero /* 102B8 80034EB8 0C03A631 */ jal func_800E98C4 -/* 102BC 80034EBC 00000000 */ nop +/* 102BC 80034EBC 00000000 */ nop /* 102C0 80034EC0 0C009C22 */ jal func_80027088 /* 102C4 80034EC4 24040001 */ addiu $a0, $zero, 1 /* 102C8 80034EC8 24020003 */ addiu $v0, $zero, 3 @@ -185,13 +185,13 @@ glabel func_80034C3C /* 102F4 80034EF4 3C01802E */ lui $at, %hi(D_802D9D71) /* 102F8 80034EF8 A0239D71 */ sb $v1, %lo(D_802D9D71)($at) /* 102FC 80034EFC 0C00F949 */ jal func_8003E524 -/* 10300 80034F00 00000000 */ nop +/* 10300 80034F00 00000000 */ nop /* 10304 80034F04 0C00E64C */ jal update_npcs -/* 10308 80034F08 00000000 */ nop +/* 10308 80034F08 00000000 */ nop /* 1030C 80034F0C 0C037DD0 */ jal update_player -/* 10310 80034F10 00000000 */ nop +/* 10310 80034F10 00000000 */ nop /* 10314 80034F14 0C016754 */ jal func_80059D50 -/* 10318 80034F18 00000000 */ nop +/* 10318 80034F18 00000000 */ nop /* 1031C 80034F1C 3C03800A */ lui $v1, %hi(D_800A0922) /* 10320 80034F20 24630922 */ addiu $v1, $v1, %lo(D_800A0922) /* 10324 80034F24 94620000 */ lhu $v0, ($v1) @@ -201,16 +201,16 @@ glabel func_80034C3C /* 10334 80034F34 04420028 */ bltzl $v0, .L80034FD8 /* 10338 80034F38 A4600000 */ sh $zero, ($v1) /* 1033C 80034F3C 0800D3F6 */ j .L80034FD8 -/* 10340 80034F40 00000000 */ nop +/* 10340 80034F40 00000000 */ nop .L80034F44: /* 10344 80034F44 0C00F949 */ jal func_8003E524 -/* 10348 80034F48 00000000 */ nop +/* 10348 80034F48 00000000 */ nop /* 1034C 80034F4C 0C00E64C */ jal update_npcs -/* 10350 80034F50 00000000 */ nop +/* 10350 80034F50 00000000 */ nop /* 10354 80034F54 0C037DD0 */ jal update_player -/* 10358 80034F58 00000000 */ nop +/* 10358 80034F58 00000000 */ nop /* 1035C 80034F5C 0C016754 */ jal func_80059D50 -/* 10360 80034F60 00000000 */ nop +/* 10360 80034F60 00000000 */ nop /* 10364 80034F64 3C04800A */ lui $a0, %hi(D_800A0922) /* 10368 80034F68 24840922 */ addiu $a0, $a0, %lo(D_800A0922) /* 1036C 80034F6C 84820000 */ lh $v0, ($a0) @@ -226,20 +226,20 @@ glabel func_80034C3C /* 10390 80034F90 04420011 */ bltzl $v0, .L80034FD8 /* 10394 80034F94 A4800000 */ sh $zero, ($a0) /* 10398 80034F98 0800D3F6 */ j .L80034FD8 -/* 1039C 80034F9C 00000000 */ nop +/* 1039C 80034F9C 00000000 */ nop .L80034FA0: /* 103A0 80034FA0 0C009C22 */ jal func_80027088 /* 103A4 80034FA4 0000202D */ daddu $a0, $zero, $zero /* 103A8 80034FA8 0C00F949 */ jal func_8003E524 -/* 103AC 80034FAC 00000000 */ nop +/* 103AC 80034FAC 00000000 */ nop /* 103B0 80034FB0 0C00E64C */ jal update_npcs -/* 103B4 80034FB4 00000000 */ nop +/* 103B4 80034FB4 00000000 */ nop /* 103B8 80034FB8 0C037DD0 */ jal update_player -/* 103BC 80034FBC 00000000 */ nop +/* 103BC 80034FBC 00000000 */ nop /* 103C0 80034FC0 0C016754 */ jal func_80059D50 -/* 103C4 80034FC4 00000000 */ nop +/* 103C4 80034FC4 00000000 */ nop /* 103C8 80034FC8 0C038069 */ jal enable_player_input -/* 103CC 80034FCC 00000000 */ nop +/* 103CC 80034FCC 00000000 */ nop /* 103D0 80034FD0 0C00CD3C */ jal set_game_mode /* 103D4 80034FD4 24040004 */ addiu $a0, $zero, 4 .L80034FD8: diff --git a/asm/nonmatchings/code_f270_len_1190/step_logos.s b/asm/nonmatchings/code_f270_len_1190/step_logos.s index e4f1ed9da9..77c2fb973f 100644 --- a/asm/nonmatchings/code_f270_len_1190/step_logos.s +++ b/asm/nonmatchings/code_f270_len_1190/step_logos.s @@ -9,18 +9,18 @@ glabel step_logos /* F4B4 800340B4 AFB00010 */ sw $s0, 0x10($sp) /* F4B8 800340B8 806200AE */ lb $v0, 0xae($v1) /* F4BC 800340BC 1040000E */ beqz $v0, .L800340F8 -/* F4C0 800340C0 00000000 */ nop +/* F4C0 800340C0 00000000 */ nop /* F4C4 800340C4 0C00CE0C */ jal intro_logos_fade_out /* F4C8 800340C8 2404000A */ addiu $a0, $zero, 0xa /* F4CC 800340CC 104000A4 */ beqz $v0, .L80034360 -/* F4D0 800340D0 00000000 */ nop +/* F4D0 800340D0 00000000 */ nop /* F4D4 800340D4 3C013F80 */ lui $at, 0x3f80 /* F4D8 800340D8 44816000 */ mtc1 $at, $f12 /* F4DC 800340DC 0C00AFBB */ jal set_curtain_scale -/* F4E0 800340E0 00000000 */ nop +/* F4E0 800340E0 00000000 */ nop /* F4E4 800340E4 44806000 */ mtc1 $zero, $f12 /* F4E8 800340E8 0C00AFC9 */ jal set_curtain_fade -/* F4EC 800340EC 00000000 */ nop +/* F4EC 800340EC 00000000 */ nop /* F4F0 800340F0 0800D0D6 */ j .L80034358 /* F4F4 800340F4 24040002 */ addiu $a0, $zero, 2 .L800340F8: @@ -28,17 +28,18 @@ glabel step_logos /* F4FC 800340FC 2C62000C */ sltiu $v0, $v1, 0xc /* F500 80034100 10400097 */ beqz $v0, .L80034360 /* F504 80034104 00031080 */ sll $v0, $v1, 2 -/* F508 80034108 3C01800A */ lui $at, %hi(D_80098290) +/* F508 80034108 3C01800A */ lui $at, %hi(jtbl_80098290_73690) /* F50C 8003410C 00220821 */ addu $at, $at, $v0 -/* F510 80034110 8C228290 */ lw $v0, %lo(D_80098290)($at) +/* F510 80034110 8C228290 */ lw $v0, %lo(jtbl_80098290_73690)($at) /* F514 80034114 00400008 */ jr $v0 -/* F518 80034118 00000000 */ nop +/* F518 80034118 00000000 */ nop +glabel L8003411C_F51C /* F51C 8003411C 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* F520 80034120 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* F524 80034124 8E020000 */ lw $v0, ($s0) /* F528 80034128 804200AD */ lb $v0, 0xad($v0) /* F52C 8003412C 1440004D */ bnez $v0, .L80034264 -/* F530 80034130 00000000 */ nop +/* F530 80034130 00000000 */ nop /* F534 80034134 0C00CDF8 */ jal intro_logos_set_fade_color /* F538 80034138 240400D0 */ addiu $a0, $zero, 0xd0 /* F53C 8003413C 8E030000 */ lw $v1, ($s0) @@ -46,18 +47,20 @@ glabel step_logos /* F544 80034144 24420001 */ addiu $v0, $v0, 1 /* F548 80034148 0800D099 */ j .L80034264 /* F54C 8003414C A06200AC */ sb $v0, 0xac($v1) +glabel L80034150_F550 /* F550 80034150 0C00CE0C */ jal intro_logos_fade_out /* F554 80034154 2404000A */ addiu $a0, $zero, 0xa /* F558 80034158 10400081 */ beqz $v0, .L80034360 -/* F55C 8003415C 00000000 */ nop +/* F55C 8003415C 00000000 */ nop /* F560 80034160 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* F564 80034164 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) /* F568 80034168 0800D0C5 */ j .L80034314 -/* F56C 8003416C 00000000 */ nop +/* F56C 8003416C 00000000 */ nop +glabel L80034170_F570 /* F570 80034170 0C00CDFE */ jal intro_logos_fade_in /* F574 80034174 2404000A */ addiu $a0, $zero, 0xa /* F578 80034178 10400079 */ beqz $v0, .L80034360 -/* F57C 8003417C 00000000 */ nop +/* F57C 8003417C 00000000 */ nop /* F580 80034180 3C048007 */ lui $a0, %hi(gGameStatusPtr) /* F584 80034184 2484419C */ addiu $a0, $a0, %lo(gGameStatusPtr) /* F588 80034188 8C830000 */ lw $v1, ($a0) @@ -68,6 +71,7 @@ glabel step_logos /* F59C 8003419C 24020028 */ addiu $v0, $zero, 0x28 /* F5A0 800341A0 0800D0D8 */ j .L80034360 /* F5A4 800341A4 A06200AD */ sb $v0, 0xad($v1) +glabel L800341A8_F5A8 /* F5A8 800341A8 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* F5AC 800341AC 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* F5B0 800341B0 8E030000 */ lw $v1, ($s0) @@ -79,19 +83,21 @@ glabel step_logos /* F5C8 800341C8 0C00CDF8 */ jal intro_logos_set_fade_color /* F5CC 800341CC A06200AC */ sb $v0, 0xac($v1) /* F5D0 800341D0 0800D099 */ j .L80034264 -/* F5D4 800341D4 00000000 */ nop +/* F5D4 800341D4 00000000 */ nop +glabel L800341D8_F5D8 /* F5D8 800341D8 0C00CE0C */ jal intro_logos_fade_out /* F5DC 800341DC 2404000A */ addiu $a0, $zero, 0xa /* F5E0 800341E0 1040005F */ beqz $v0, .L80034360 -/* F5E4 800341E4 00000000 */ nop +/* F5E4 800341E4 00000000 */ nop /* F5E8 800341E8 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* F5EC 800341EC 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) /* F5F0 800341F0 0800D0C5 */ j .L80034314 -/* F5F4 800341F4 00000000 */ nop +/* F5F4 800341F4 00000000 */ nop +glabel L800341F8_F5F8 /* F5F8 800341F8 0C00CDFE */ jal intro_logos_fade_in /* F5FC 800341FC 2404000A */ addiu $a0, $zero, 0xa /* F600 80034200 10400057 */ beqz $v0, .L80034360 -/* F604 80034204 00000000 */ nop +/* F604 80034204 00000000 */ nop /* F608 80034208 3C048007 */ lui $a0, %hi(gGameStatusPtr) /* F60C 8003420C 2484419C */ addiu $a0, $a0, %lo(gGameStatusPtr) /* F610 80034210 8C830000 */ lw $v1, ($a0) @@ -102,6 +108,7 @@ glabel step_logos /* F624 80034224 2402001E */ addiu $v0, $zero, 0x1e /* F628 80034228 0800D0D8 */ j .L80034360 /* F62C 8003422C A06200AD */ sb $v0, 0xad($v1) +glabel L80034230_F630 /* F630 80034230 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* F634 80034234 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* F638 80034238 8E030000 */ lw $v1, ($s0) @@ -122,6 +129,7 @@ glabel step_logos /* F66C 8003426C 2442FFFF */ addiu $v0, $v0, -1 /* F670 80034270 0800D0D8 */ j .L80034360 /* F674 80034274 A06200AD */ sb $v0, 0xad($v1) +glabel L80034278_F678 /* F678 80034278 3C048007 */ lui $a0, %hi(gGameStatusPtr) /* F67C 8003427C 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) /* F680 80034280 808200AD */ lb $v0, 0xad($a0) @@ -140,12 +148,13 @@ glabel step_logos /* F6B4 800342B4 3421999A */ ori $at, $at, 0x999a /* F6B8 800342B8 44816000 */ mtc1 $at, $f12 /* F6BC 800342BC 0C00AFC5 */ jal set_curtain_fade_goal -/* F6C0 800342C0 00000000 */ nop +/* F6C0 800342C0 00000000 */ nop /* F6C4 800342C4 0800D0D8 */ j .L80034360 -/* F6C8 800342C8 00000000 */ nop +/* F6C8 800342C8 00000000 */ nop .L800342CC: /* F6CC 800342CC 0800D0D8 */ j .L80034360 /* F6D0 800342D0 A08200AD */ sb $v0, 0xad($a0) +glabel L800342D4_F6D4 /* F6D4 800342D4 0C00CE0C */ jal intro_logos_fade_out /* F6D8 800342D8 2404000A */ addiu $a0, $zero, 0xa /* F6DC 800342DC 10400020 */ beqz $v0, .L80034360 @@ -156,6 +165,7 @@ glabel step_logos /* F6F0 800342F0 A06200AD */ sb $v0, 0xad($v1) /* F6F4 800342F4 0800D0C5 */ j .L80034314 /* F6F8 800342F8 8C830000 */ lw $v1, ($a0) +glabel L800342FC_F6FC /* F6FC 800342FC 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* F700 80034300 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) /* F704 80034304 806200AD */ lb $v0, 0xad($v1) @@ -170,6 +180,7 @@ glabel step_logos .L80034324: /* F724 80034324 0800D0D8 */ j .L80034360 /* F728 80034328 A06200AD */ sb $v0, 0xad($v1) +glabel L8003432C_F72C /* F72C 8003432C 3C10800A */ lui $s0, %hi(D_800A0910) /* F730 80034330 26100910 */ addiu $s0, $s0, %lo(D_800A0910) /* F734 80034334 0C00AB4B */ jal heap_free @@ -183,14 +194,14 @@ glabel step_logos /* F754 80034354 A04000A8 */ sb $zero, 0xa8($v0) .L80034358: /* F758 80034358 0C00CD3C */ jal set_game_mode -/* F75C 8003435C 00000000 */ nop +/* F75C 8003435C 00000000 */ nop .L80034360: /* F760 80034360 0C00E64C */ jal update_npcs -/* F764 80034364 00000000 */ nop +/* F764 80034364 00000000 */ nop /* F768 80034368 0C00B500 */ jal update_cameras -/* F76C 8003436C 00000000 */ nop +/* F76C 8003436C 00000000 */ nop /* F770 80034370 0C00CE1D */ jal intro_logos_update_fade -/* F774 80034374 00000000 */ nop +/* F774 80034374 00000000 */ nop /* F778 80034378 8FBF0014 */ lw $ra, 0x14($sp) /* F77C 8003437C 8FB00010 */ lw $s0, 0x10($sp) /* F780 80034380 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_f270_len_1190/step_pause_menu.s b/asm/nonmatchings/code_f270_len_1190/step_pause_menu.s index 0f123837b9..3e23c7be71 100644 --- a/asm/nonmatchings/code_f270_len_1190/step_pause_menu.s +++ b/asm/nonmatchings/code_f270_len_1190/step_pause_menu.s @@ -12,18 +12,18 @@ glabel step_pause_menu /* FD98 80034998 12200005 */ beqz $s1, .L800349B0 /* FD9C 8003499C 24020002 */ addiu $v0, $zero, 2 /* FDA0 800349A0 12220022 */ beq $s1, $v0, .L80034A2C -/* FDA4 800349A4 00000000 */ nop +/* FDA4 800349A4 00000000 */ nop /* FDA8 800349A8 0800D2F8 */ j .L80034BE0 -/* FDAC 800349AC 00000000 */ nop +/* FDAC 800349AC 00000000 */ nop .L800349B0: /* FDB0 800349B0 0C00F949 */ jal func_8003E524 -/* FDB4 800349B4 00000000 */ nop +/* FDB4 800349B4 00000000 */ nop /* FDB8 800349B8 0C00E64C */ jal update_npcs -/* FDBC 800349BC 00000000 */ nop +/* FDBC 800349BC 00000000 */ nop /* FDC0 800349C0 0C037DD0 */ jal update_player -/* FDC4 800349C4 00000000 */ nop +/* FDC4 800349C4 00000000 */ nop /* FDC8 800349C8 0C016754 */ jal func_80059D50 -/* FDCC 800349CC 00000000 */ nop +/* FDCC 800349CC 00000000 */ nop /* FDD0 800349D0 3C02800A */ lui $v0, %hi(D_8009A658) /* FDD4 800349D4 8C42A658 */ lw $v0, %lo(D_8009A658)($v0) /* FDD8 800349D8 8C430004 */ lw $v1, 4($v0) @@ -58,7 +58,7 @@ glabel step_pause_menu /* FE48 80034A48 A0C20000 */ sb $v0, ($a2) /* FE4C 80034A4C 00021600 */ sll $v0, $v0, 0x18 /* FE50 80034A50 1440004C */ bnez $v0, .L80034B84 -/* FE54 80034A54 00000000 */ nop +/* FE54 80034A54 00000000 */ nop .L80034A58: /* FE58 80034A58 3C048007 */ lui $a0, %hi(D_80077950) /* FE5C 80034A5C 24847950 */ addiu $a0, $a0, %lo(D_80077950) @@ -73,62 +73,62 @@ glabel step_pause_menu /* FE80 80034A80 0C05260E */ jal func_80149838 /* FE84 80034A84 A462015E */ sh $v0, 0x15e($v1) /* FE88 80034A88 0C00EC6A */ jal func_8003B1A8 -/* FE8C 80034A8C 00000000 */ nop +/* FE8C 80034A8C 00000000 */ nop /* FE90 80034A90 8E020000 */ lw $v0, ($s0) /* FE94 80034A94 0C016BA8 */ jal allocate_hit_tables /* FE98 80034A98 A0510070 */ sb $s1, 0x70($v0) /* FE9C 80034A9C 0C00AB28 */ jal battle_heap_create -/* FEA0 80034AA0 00000000 */ nop +/* FEA0 80034AA0 00000000 */ nop /* FEA4 80034AA4 0C018028 */ jal nuContRmbForceStop -/* FEA8 80034AA8 00000000 */ nop +/* FEA8 80034AA8 00000000 */ nop /* FEAC 80034AAC 0C05259C */ jal func_80149670 /* FEB0 80034AB0 0000202D */ daddu $a0, $zero, $zero /* FEB4 80034AB4 0C0B763E */ jal func_802DD8F8 /* FEB8 80034AB8 0000202D */ daddu $a0, $zero, $zero /* FEBC 80034ABC 0C045751 */ jal clear_model_data -/* FEC0 80034AC0 00000000 */ nop +/* FEC0 80034AC0 00000000 */ nop /* FEC4 80034AC4 0C052010 */ jal func_80148040 -/* FEC8 80034AC8 00000000 */ nop +/* FEC8 80034AC8 00000000 */ nop /* FECC 80034ACC 0C05177E */ jal func_80145DF8 -/* FED0 80034AD0 00000000 */ nop +/* FED0 80034AD0 00000000 */ nop /* FED4 80034AD4 0C0482EC */ jal clear_virtual_models -/* FED8 80034AD8 00000000 */ nop +/* FED8 80034AD8 00000000 */ nop /* FEDC 80034ADC 0C047889 */ jal func_8011E224 -/* FEE0 80034AE0 00000000 */ nop +/* FEE0 80034AE0 00000000 */ nop /* FEE4 80034AE4 0C048C2E */ jal clear_dynamic_entity_list -/* FEE8 80034AE8 00000000 */ nop +/* FEE8 80034AE8 00000000 */ nop /* FEEC 80034AEC 3C048020 */ lui $a0, %hi(gBackgroundImage) /* FEF0 80034AF0 24840000 */ addiu $a0, $a0, %lo(gBackgroundImage) /* FEF4 80034AF4 3C050003 */ lui $a1, 3 /* FEF8 80034AF8 0C0514BA */ jal func_801452E8 /* FEFC 80034AFC 34A58000 */ ori $a1, $a1, 0x8000 /* FF00 80034B00 0C050440 */ jal func_80141100 -/* FF04 80034B04 00000000 */ nop +/* FF04 80034B04 00000000 */ nop /* FF08 80034B08 0C03A6EC */ jal reset_status_menu -/* FF0C 80034B0C 00000000 */ nop +/* FF0C 80034B0C 00000000 */ nop /* FF10 80034B10 0C04C3FC */ jal clear_item_entity_data -/* FF14 80034B14 00000000 */ nop +/* FF14 80034B14 00000000 */ nop /* FF18 80034B18 0C0B0C77 */ jal clear_script_list -/* FF1C 80034B1C 00000000 */ nop +/* FF1C 80034B1C 00000000 */ nop /* FF20 80034B20 0C00E12F */ jal clear_npcs -/* FF24 80034B24 00000000 */ nop +/* FF24 80034B24 00000000 */ nop /* FF28 80034B28 0C04432E */ jal clear_entity_data /* FF2C 80034B2C 0000202D */ daddu $a0, $zero, $zero /* FF30 80034B30 0C0515A0 */ jal clear_trigger_data -/* FF34 80034B34 00000000 */ nop +/* FF34 80034B34 00000000 */ nop /* FF38 80034B38 0C05260A */ jal func_80149828 -/* FF3C 80034B3C 00000000 */ nop +/* FF3C 80034B3C 00000000 */ nop /* FF40 80034B40 3C01800A */ lui $at, %hi(D_800A0924) /* FF44 80034B44 AC220924 */ sw $v0, %lo(D_800A0924)($at) /* FF48 80034B48 0C0525FF */ jal func_801497FC /* FF4C 80034B4C 0000202D */ daddu $a0, $zero, $zero /* FF50 80034B50 0C052B17 */ jal func_8014AC5C -/* FF54 80034B54 00000000 */ nop +/* FF54 80034B54 00000000 */ nop /* FF58 80034B58 3C048007 */ lui $a0, %hi(D_8007795C) /* FF5C 80034B5C 0C018038 */ jal nuPiReadRomOverlay /* FF60 80034B60 2484795C */ addiu $a0, $a0, %lo(D_8007795C) /* FF64 80034B64 0C091018 */ jal pause_init -/* FF68 80034B68 00000000 */ nop +/* FF68 80034B68 00000000 */ nop /* FF6C 80034B6C 3C04800A */ lui $a0, %hi(D_8009A650) /* FF70 80034B70 2484A650 */ addiu $a0, $a0, %lo(D_8009A650) /* FF74 80034B74 8C820000 */ lw $v0, ($a0) @@ -139,7 +139,7 @@ glabel step_pause_menu /* FF84 80034B84 3C02800A */ lui $v0, %hi(D_800A0920) /* FF88 80034B88 80420920 */ lb $v0, %lo(D_800A0920)($v0) /* FF8C 80034B8C 04410014 */ bgez $v0, .L80034BE0 -/* FF90 80034B90 00000000 */ nop +/* FF90 80034B90 00000000 */ nop .L80034B94: /* FF94 80034B94 3C10800A */ lui $s0, %hi(D_800A0920) /* FF98 80034B98 26100920 */ addiu $s0, $s0, %lo(D_800A0920) diff --git a/asm/nonmatchings/code_f4c60_len_4300/ShowMessageAtWorldPos.s b/asm/nonmatchings/code_f4c60_len_4300/ShowMessageAtWorldPos.s index b1a8cc6915..74152a8e89 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/ShowMessageAtWorldPos.s +++ b/asm/nonmatchings/code_f4c60_len_4300/ShowMessageAtWorldPos.s @@ -35,15 +35,15 @@ glabel ShowMessageAtWorldPos /* F5384 802D09D4 0C049640 */ jal load_string /* F5388 802D09D8 ACA00000 */ sw $zero, ($a1) /* F538C 802D09DC 44920000 */ mtc1 $s2, $f0 -/* F5390 802D09E0 00000000 */ nop +/* F5390 802D09E0 00000000 */ nop /* F5394 802D09E4 46800020 */ cvt.s.w $f0, $f0 /* F5398 802D09E8 44050000 */ mfc1 $a1, $f0 /* F539C 802D09EC 44900000 */ mtc1 $s0, $f0 -/* F53A0 802D09F0 00000000 */ nop +/* F53A0 802D09F0 00000000 */ nop /* F53A4 802D09F4 46800020 */ cvt.s.w $f0, $f0 /* F53A8 802D09F8 44060000 */ mfc1 $a2, $f0 /* F53AC 802D09FC 44910000 */ mtc1 $s1, $f0 -/* F53B0 802D0A00 00000000 */ nop +/* F53B0 802D0A00 00000000 */ nop /* F53B4 802D0A04 46800020 */ cvt.s.w $f0, $f0 /* F53B8 802D0A08 3C048007 */ lui $a0, %hi(gCurrentCameraID) /* F53BC 802D0A0C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) diff --git a/asm/nonmatchings/code_f4c60_len_4300/_show_message.s b/asm/nonmatchings/code_f4c60_len_4300/_show_message.s index 6018512133..9fec4fe9cb 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/_show_message.s +++ b/asm/nonmatchings/code_f4c60_len_4300/_show_message.s @@ -71,14 +71,14 @@ glabel _show_message /* F4DD4 802D0424 12E00009 */ beqz $s7, .L802D044C /* F4DD8 802D0428 2402FFFE */ addiu $v0, $zero, -2 /* F4DDC 802D042C 080B413A */ j .L802D04E8 -/* F4DE0 802D0430 00000000 */ nop +/* F4DE0 802D0430 00000000 */ nop .L802D0434: /* F4DE4 802D0434 12E20010 */ beq $s7, $v0, .L802D0478 /* F4DE8 802D0438 24020003 */ addiu $v0, $zero, 3 /* F4DEC 802D043C 12E20017 */ beq $s7, $v0, .L802D049C /* F4DF0 802D0440 2402FFFE */ addiu $v0, $zero, -2 /* F4DF4 802D0444 080B413A */ j .L802D04E8 -/* F4DF8 802D0448 00000000 */ nop +/* F4DF8 802D0448 00000000 */ nop .L802D044C: /* F4DFC 802D044C 8E050000 */ lw $a1, ($s0) /* F4E00 802D0450 0C0B1EAF */ jal get_variable @@ -89,7 +89,7 @@ glabel _show_message /* F4E10 802D0460 3C04802E */ lui $a0, %hi(gCurrentPrintContext) /* F4E14 802D0464 8C84B260 */ lw $a0, %lo(gCurrentPrintContext)($a0) /* F4E18 802D0468 0C04971C */ jal close_message -/* F4E1C 802D046C 00000000 */ nop +/* F4E1C 802D046C 00000000 */ nop /* F4E20 802D0470 080B413A */ j .L802D04E8 /* F4E24 802D0474 2402FFFE */ addiu $v0, $zero, -2 .L802D0478: @@ -135,7 +135,7 @@ glabel _show_message /* F4EB8 802D0508 866200B0 */ lh $v0, 0xb0($s3) /* F4EBC 802D050C C662002C */ lwc1 $f2, 0x2c($s3) /* F4EC0 802D0510 44820000 */ mtc1 $v0, $f0 -/* F4EC4 802D0514 00000000 */ nop +/* F4EC4 802D0514 00000000 */ nop /* F4EC8 802D0518 46800020 */ cvt.s.w $f0, $f0 /* F4ECC 802D051C 46001080 */ add.s $f2, $f2, $f0 /* F4ED0 802D0520 3C048007 */ lui $a0, %hi(gCurrentCameraID) @@ -164,14 +164,14 @@ glabel _show_message /* F4F28 802D0578 27A20028 */ addiu $v0, $sp, 0x28 /* F4F2C 802D057C AFA20018 */ sw $v0, 0x18($sp) /* F4F30 802D0580 44830000 */ mtc1 $v1, $f0 -/* F4F34 802D0584 00000000 */ nop +/* F4F34 802D0584 00000000 */ nop /* F4F38 802D0588 46800020 */ cvt.s.w $f0, $f0 /* F4F3C 802D058C 46001080 */ add.s $f2, $f2, $f0 /* F4F40 802D0590 8E050038 */ lw $a1, 0x38($s0) /* F4F44 802D0594 8E070040 */ lw $a3, 0x40($s0) /* F4F48 802D0598 44061000 */ mfc1 $a2, $f2 /* F4F4C 802D059C 0C00B94E */ jal get_screen_coords -/* F4F50 802D05A0 00000000 */ nop +/* F4F50 802D05A0 00000000 */ nop /* F4F54 802D05A4 8E020028 */ lw $v0, 0x28($s0) /* F4F58 802D05A8 AE42007C */ sw $v0, 0x7c($s2) /* F4F5C 802D05AC C600000C */ lwc1 $f0, 0xc($s0) @@ -208,7 +208,7 @@ glabel _show_message /* F4FD0 802D0620 8E670030 */ lw $a3, 0x30($s3) .L802D0624: /* F4FD4 802D0624 0C00A720 */ jal atan2 -/* F4FD8 802D0628 00000000 */ nop +/* F4FD8 802D0628 00000000 */ nop /* F4FDC 802D062C 46000506 */ mov.s $f20, $f0 /* F4FE0 802D0630 3C014334 */ lui $at, 0x4334 /* F4FE4 802D0634 44816000 */ mtc1 $at, $f12 @@ -219,25 +219,31 @@ glabel _show_message /* F4FF8 802D0648 2C620006 */ sltiu $v0, $v1, 6 /* F4FFC 802D064C 10400013 */ beqz $v0, .L802D069C /* F5000 802D0650 00031080 */ sll $v0, $v1, 2 -/* F5004 802D0654 3C01802E */ lui $at, %hi(D_802DA1F0) +/* F5004 802D0654 3C01802E */ lui $at, %hi(jtbl_802DA1F0_FEBA0) /* F5008 802D0658 00220821 */ addu $at, $at, $v0 -/* F500C 802D065C 8C22A1F0 */ lw $v0, %lo(D_802DA1F0)($at) +/* F500C 802D065C 8C22A1F0 */ lw $v0, %lo(jtbl_802DA1F0_FEBA0)($at) /* F5010 802D0660 00400008 */ jr $v0 -/* F5014 802D0664 00000000 */ nop +/* F5014 802D0664 00000000 */ nop +glabel L802D0668_F5018 /* F5018 802D0668 E614000C */ swc1 $f20, 0xc($s0) /* F501C 802D066C 080B41A7 */ j .L802D069C /* F5020 802D0670 E6200000 */ swc1 $f0, ($s1) +glabel L802D0674_F5024 /* F5024 802D0674 E600000C */ swc1 $f0, 0xc($s0) /* F5028 802D0678 080B41A7 */ j .L802D069C /* F502C 802D067C E6200000 */ swc1 $f0, ($s1) +glabel L802D0680_F5030 /* F5030 802D0680 E614000C */ swc1 $f20, 0xc($s0) /* F5034 802D0684 080B41A7 */ j .L802D069C /* F5038 802D0688 E6340000 */ swc1 $f20, ($s1) +glabel L802D068C_F503C /* F503C 802D068C E600000C */ swc1 $f0, 0xc($s0) /* F5040 802D0690 080B41A7 */ j .L802D069C /* F5044 802D0694 E6340000 */ swc1 $f20, ($s1) +glabel L802D0698_F5048 /* F5048 802D0698 E614000C */ swc1 $f20, 0xc($s0) .L802D069C: +glabel L802D069C_F504C /* F504C 802D069C 8E5000B4 */ lw $s0, 0xb4($s2) /* F5050 802D06A0 2402FFFE */ addiu $v0, $zero, -2 /* F5054 802D06A4 12020022 */ beq $s0, $v0, .L802D0730 @@ -252,30 +258,30 @@ glabel _show_message /* F5078 802D06C8 27A20028 */ addiu $v0, $sp, 0x28 /* F507C 802D06CC AFA20018 */ sw $v0, 0x18($sp) /* F5080 802D06D0 44830000 */ mtc1 $v1, $f0 -/* F5084 802D06D4 00000000 */ nop +/* F5084 802D06D4 00000000 */ nop /* F5088 802D06D8 46800020 */ cvt.s.w $f0, $f0 /* F508C 802D06DC 46001080 */ add.s $f2, $f2, $f0 /* F5090 802D06E0 8E050038 */ lw $a1, 0x38($s0) /* F5094 802D06E4 8E070040 */ lw $a3, 0x40($s0) /* F5098 802D06E8 44061000 */ mfc1 $a2, $f2 /* F509C 802D06EC 0C00B94E */ jal get_screen_coords -/* F50A0 802D06F0 00000000 */ nop +/* F50A0 802D06F0 00000000 */ nop /* F50A4 802D06F4 8E4500B8 */ lw $a1, 0xb8($s2) /* F50A8 802D06F8 2402FFFF */ addiu $v0, $zero, -1 /* F50AC 802D06FC 10A2002B */ beq $a1, $v0, .L802D07AC -/* F50B0 802D0700 00000000 */ nop +/* F50B0 802D0700 00000000 */ nop /* F50B4 802D0704 3C02802E */ lui $v0, %hi(gCurrentPrintContext) /* F50B8 802D0708 8C42B260 */ lw $v0, %lo(gCurrentPrintContext)($v0) /* F50BC 802D070C 8C4204FC */ lw $v0, 0x4fc($v0) /* F50C0 802D0710 30420080 */ andi $v0, $v0, 0x80 /* F50C4 802D0714 14400002 */ bnez $v0, .L802D0720 -/* F50C8 802D0718 00000000 */ nop +/* F50C8 802D0718 00000000 */ nop /* F50CC 802D071C 8E4500BC */ lw $a1, 0xbc($s2) .L802D0720: /* F50D0 802D0720 0C0B36C3 */ jal set_npc_animation /* F50D4 802D0724 0200202D */ daddu $a0, $s0, $zero /* F50D8 802D0728 080B41EB */ j .L802D07AC -/* F50DC 802D072C 00000000 */ nop +/* F50DC 802D072C 00000000 */ nop .L802D0730: /* F50E0 802D0730 8E650028 */ lw $a1, 0x28($s3) /* F50E4 802D0734 8E670030 */ lw $a3, 0x30($s3) @@ -285,7 +291,7 @@ glabel _show_message /* F50F4 802D0744 866200B0 */ lh $v0, 0xb0($s3) /* F50F8 802D0748 C662002C */ lwc1 $f2, 0x2c($s3) /* F50FC 802D074C 44820000 */ mtc1 $v0, $f0 -/* F5100 802D0750 00000000 */ nop +/* F5100 802D0750 00000000 */ nop /* F5104 802D0754 46800020 */ cvt.s.w $f0, $f0 /* F5108 802D0758 46001080 */ add.s $f2, $f2, $f0 /* F510C 802D075C 3C048007 */ lui $a0, %hi(gCurrentCameraID) @@ -297,13 +303,13 @@ glabel _show_message /* F5124 802D0774 8E4300B8 */ lw $v1, 0xb8($s2) /* F5128 802D0778 2402FFFF */ addiu $v0, $zero, -1 /* F512C 802D077C 1062000B */ beq $v1, $v0, .L802D07AC -/* F5130 802D0780 00000000 */ nop +/* F5130 802D0780 00000000 */ nop /* F5134 802D0784 3C02802E */ lui $v0, %hi(gCurrentPrintContext) /* F5138 802D0788 8C42B260 */ lw $v0, %lo(gCurrentPrintContext)($v0) /* F513C 802D078C 8C4204FC */ lw $v0, 0x4fc($v0) /* F5140 802D0790 30420080 */ andi $v0, $v0, 0x80 /* F5144 802D0794 10400003 */ beqz $v0, .L802D07A4 -/* F5148 802D0798 00000000 */ nop +/* F5148 802D0798 00000000 */ nop /* F514C 802D079C 080B41EB */ j .L802D07AC /* F5150 802D07A0 AE6300B8 */ sw $v1, 0xb8($s3) .L802D07A4: @@ -313,7 +319,7 @@ glabel _show_message /* F515C 802D07AC 8E420074 */ lw $v0, 0x74($s2) /* F5160 802D07B0 30420200 */ andi $v0, $v0, 0x200 /* F5164 802D07B4 1440000C */ bnez $v0, .L802D07E8 -/* F5168 802D07B8 00000000 */ nop +/* F5168 802D07B8 00000000 */ nop /* F516C 802D07BC 3C04802E */ lui $a0, %hi(gCurrentPrintContext) /* F5170 802D07C0 8C84B260 */ lw $a0, %lo(gCurrentPrintContext)($a0) /* F5174 802D07C4 8FA30020 */ lw $v1, 0x20($sp) @@ -341,12 +347,12 @@ glabel _show_message /* F51C8 802D0818 1062000A */ beq $v1, $v0, .L802D0844 /* F51CC 802D081C 2402FFFE */ addiu $v0, $zero, -2 /* F51D0 802D0820 12020006 */ beq $s0, $v0, .L802D083C -/* F51D4 802D0824 00000000 */ nop +/* F51D4 802D0824 00000000 */ nop /* F51D8 802D0828 8E45007C */ lw $a1, 0x7c($s2) /* F51DC 802D082C 0C0B36C3 */ jal set_npc_animation /* F51E0 802D0830 0200202D */ daddu $a0, $s0, $zero /* F51E4 802D0834 080B4211 */ j .L802D0844 -/* F51E8 802D0838 00000000 */ nop +/* F51E8 802D0838 00000000 */ nop .L802D083C: /* F51EC 802D083C 8E42007C */ lw $v0, 0x7c($s2) /* F51F0 802D0840 AE6200B8 */ sw $v0, 0xb8($s3) diff --git a/asm/nonmatchings/code_f8f60_len_1560/GetNextPathPos.s b/asm/nonmatchings/code_f8f60_len_1560/GetNextPathPos.s index 1aebbf8dbe..90e1dc6b62 100644 --- a/asm/nonmatchings/code_f8f60_len_1560/GetNextPathPos.s +++ b/asm/nonmatchings/code_f8f60_len_1560/GetNextPathPos.s @@ -15,16 +15,16 @@ glabel GetNextPathPos /* F9EFC 802D554C 10400005 */ beqz $v0, .L802D5564 /* F9F00 802D5550 24020004 */ addiu $v0, $zero, 4 /* F9F04 802D5554 10600009 */ beqz $v1, .L802D557C -/* F9F08 802D5558 00000000 */ nop +/* F9F08 802D5558 00000000 */ nop /* F9F0C 802D555C 080B55A3 */ j .L802D568C -/* F9F10 802D5560 00000000 */ nop +/* F9F10 802D5560 00000000 */ nop .L802D5564: /* F9F14 802D5564 10620022 */ beq $v1, $v0, .L802D55F0 /* F9F18 802D5568 2402000A */ addiu $v0, $zero, 0xa /* F9F1C 802D556C 10620032 */ beq $v1, $v0, .L802D5638 -/* F9F20 802D5570 00000000 */ nop +/* F9F20 802D5570 00000000 */ nop /* F9F24 802D5574 080B55A3 */ j .L802D568C -/* F9F28 802D5578 00000000 */ nop +/* F9F28 802D5578 00000000 */ nop .L802D557C: /* F9F2C 802D557C 3C013F80 */ lui $at, 0x3f80 /* F9F30 802D5580 44810000 */ mtc1 $at, $f0 @@ -35,42 +35,42 @@ glabel GetNextPathPos /* F9F44 802D5594 468010A0 */ cvt.s.w $f2, $f2 /* F9F48 802D5598 46020302 */ mul.s $f12, $f0, $f2 /* F9F4C 802D559C 080B55A4 */ j .L802D5690 -/* F9F50 802D55A0 00000000 */ nop +/* F9F50 802D55A0 00000000 */ nop .L802D55A4: /* F9F54 802D55A4 8E020014 */ lw $v0, 0x14($s0) /* F9F58 802D55A8 00420018 */ mult $v0, $v0 /* F9F5C 802D55AC 00001812 */ mflo $v1 /* F9F60 802D55B0 8E020010 */ lw $v0, 0x10($s0) -/* F9F64 802D55B4 00000000 */ nop +/* F9F64 802D55B4 00000000 */ nop /* F9F68 802D55B8 00420018 */ mult $v0, $v0 /* F9F6C 802D55BC 3C013F80 */ lui $at, 0x3f80 /* F9F70 802D55C0 44810000 */ mtc1 $at, $f0 /* F9F74 802D55C4 44831000 */ mtc1 $v1, $f2 -/* F9F78 802D55C8 00000000 */ nop +/* F9F78 802D55C8 00000000 */ nop /* F9F7C 802D55CC 468010A0 */ cvt.s.w $f2, $f2 /* F9F80 802D55D0 00001012 */ mflo $v0 /* F9F84 802D55D4 46020003 */ div.s $f0, $f0, $f2 /* F9F88 802D55D8 44821000 */ mtc1 $v0, $f2 -/* F9F8C 802D55DC 00000000 */ nop +/* F9F8C 802D55DC 00000000 */ nop /* F9F90 802D55E0 468010A0 */ cvt.s.w $f2, $f2 /* F9F94 802D55E4 46020302 */ mul.s $f12, $f0, $f2 /* F9F98 802D55E8 080B55A4 */ j .L802D5690 -/* F9F9C 802D55EC 00000000 */ nop +/* F9F9C 802D55EC 00000000 */ nop .L802D55F0: /* F9FA0 802D55F0 8E020014 */ lw $v0, 0x14($s0) /* F9FA4 802D55F4 00420018 */ mult $v0, $v0 /* F9FA8 802D55F8 8E030010 */ lw $v1, 0x10($s0) /* F9FAC 802D55FC 00431023 */ subu $v0, $v0, $v1 /* F9FB0 802D5600 44820000 */ mtc1 $v0, $f0 -/* F9FB4 802D5604 00000000 */ nop +/* F9FB4 802D5604 00000000 */ nop /* F9FB8 802D5608 46800020 */ cvt.s.w $f0, $f0 /* F9FBC 802D560C 46000002 */ mul.s $f0, $f0, $f0 -/* F9FC0 802D5610 00000000 */ nop +/* F9FC0 802D5610 00000000 */ nop /* F9FC4 802D5614 3C013F80 */ lui $at, 0x3f80 /* F9FC8 802D5618 44812000 */ mtc1 $at, $f4 /* F9FCC 802D561C 00004012 */ mflo $t0 /* F9FD0 802D5620 44881000 */ mtc1 $t0, $f2 -/* F9FD4 802D5624 00000000 */ nop +/* F9FD4 802D5624 00000000 */ nop /* F9FD8 802D5628 468010A0 */ cvt.s.w $f2, $f2 /* F9FDC 802D562C 46020003 */ div.s $f0, $f0, $f2 /* F9FE0 802D5630 080B55A4 */ j .L802D5690 @@ -86,17 +86,17 @@ glabel GetNextPathPos /* FA004 802D5654 46800020 */ cvt.s.w $f0, $f0 /* FA008 802D5658 46006302 */ mul.s $f12, $f12, $f0 /* FA00C 802D565C 0C00A874 */ jal cos_rad -/* FA010 802D5660 00000000 */ nop +/* FA010 802D5660 00000000 */ nop /* FA014 802D5664 3C013F80 */ lui $at, 0x3f80 /* FA018 802D5668 44811000 */ mtc1 $at, $f2 -/* FA01C 802D566C 00000000 */ nop +/* FA01C 802D566C 00000000 */ nop /* FA020 802D5670 46001081 */ sub.s $f2, $f2, $f0 /* FA024 802D5674 3C013F00 */ lui $at, 0x3f00 /* FA028 802D5678 44810000 */ mtc1 $at, $f0 -/* FA02C 802D567C 00000000 */ nop +/* FA02C 802D567C 00000000 */ nop /* FA030 802D5680 46001302 */ mul.s $f12, $f2, $f0 /* FA034 802D5684 080B55A4 */ j .L802D5690 -/* FA038 802D5688 00000000 */ nop +/* FA038 802D5688 00000000 */ nop .L802D568C: /* FA03C 802D568C 44806000 */ mtc1 $zero, $f12 .L802D5690: @@ -111,25 +111,25 @@ glabel GetNextPathPos /* FA060 802D56B0 C7A00018 */ lwc1 $f0, 0x18($sp) /* FA064 802D56B4 3C014480 */ lui $at, 0x4480 /* FA068 802D56B8 44812000 */ mtc1 $at, $f4 -/* FA06C 802D56BC 00000000 */ nop +/* FA06C 802D56BC 00000000 */ nop /* FA070 802D56C0 46040002 */ mul.s $f0, $f0, $f4 -/* FA074 802D56C4 00000000 */ nop +/* FA074 802D56C4 00000000 */ nop /* FA078 802D56C8 3C01CD5B */ lui $at, 0xcd5b /* FA07C 802D56CC 34215858 */ ori $at, $at, 0x5858 /* FA080 802D56D0 44811000 */ mtc1 $at, $f2 -/* FA084 802D56D4 00000000 */ nop +/* FA084 802D56D4 00000000 */ nop /* FA088 802D56D8 46020000 */ add.s $f0, $f0, $f2 /* FA08C 802D56DC 4600018D */ trunc.w.s $f6, $f0 /* FA090 802D56E0 E6260088 */ swc1 $f6, 0x88($s1) /* FA094 802D56E4 C7A0001C */ lwc1 $f0, 0x1c($sp) /* FA098 802D56E8 46040002 */ mul.s $f0, $f0, $f4 -/* FA09C 802D56EC 00000000 */ nop +/* FA09C 802D56EC 00000000 */ nop /* FA0A0 802D56F0 46020000 */ add.s $f0, $f0, $f2 /* FA0A4 802D56F4 4600018D */ trunc.w.s $f6, $f0 /* FA0A8 802D56F8 E626008C */ swc1 $f6, 0x8c($s1) /* FA0AC 802D56FC C7A00020 */ lwc1 $f0, 0x20($sp) /* FA0B0 802D5700 46040002 */ mul.s $f0, $f0, $f4 -/* FA0B4 802D5704 00000000 */ nop +/* FA0B4 802D5704 00000000 */ nop /* FA0B8 802D5708 46020000 */ add.s $f0, $f0, $f2 /* FA0BC 802D570C 4600018D */ trunc.w.s $f6, $f0 /* FA0C0 802D5710 E6260090 */ swc1 $f6, 0x90($s1) @@ -145,7 +145,7 @@ glabel GetNextPathPos .L802D5738: /* FA0E8 802D5738 8E040004 */ lw $a0, 4($s0) /* FA0EC 802D573C 0C00AB4B */ jal heap_free -/* FA0F0 802D5740 00000000 */ nop +/* FA0F0 802D5740 00000000 */ nop /* FA0F4 802D5744 0C00AB4B */ jal heap_free /* FA0F8 802D5748 8E04000C */ lw $a0, 0xc($s0) /* FA0FC 802D574C 0C00AB4B */ jal heap_free diff --git a/asm/nonmatchings/code_f8f60_len_1560/func_802D5270.s b/asm/nonmatchings/code_f8f60_len_1560/func_802D5270.s index 35b6cecdc1..07fb11ba93 100644 --- a/asm/nonmatchings/code_f8f60_len_1560/func_802D5270.s +++ b/asm/nonmatchings/code_f8f60_len_1560/func_802D5270.s @@ -14,7 +14,7 @@ glabel func_802D5270 /* F9C40 802D5290 00471021 */ addu $v0, $v0, $a3 /* F9C44 802D5294 C4400000 */ lwc1 $f0, ($v0) /* F9C48 802D5298 460C003C */ c.lt.s $f0, $f12 -/* F9C4C 802D529C 00000000 */ nop +/* F9C4C 802D529C 00000000 */ nop /* F9C50 802D52A0 45020002 */ bc1fl .L802D52AC /* F9C54 802D52A4 0060302D */ daddu $a2, $v1, $zero /* F9C58 802D52A8 24640001 */ addiu $a0, $v1, 1 @@ -38,24 +38,24 @@ glabel func_802D5270 /* F9C94 802D52E4 46086281 */ sub.s $f10, $f12, $f8 /* F9C98 802D52E8 3C014040 */ lui $at, 0x4040 /* F9C9C 802D52EC 44816000 */ mtc1 $at, $f12 -/* F9CA0 802D52F0 00000000 */ nop +/* F9CA0 802D52F0 00000000 */ nop /* F9CA4 802D52F4 460C2002 */ mul.s $f0, $f4, $f12 -/* F9CA8 802D52F8 00000000 */ nop +/* F9CA8 802D52F8 00000000 */ nop /* F9CAC 802D52FC C48E000C */ lwc1 $f14, 0xc($a0) /* F9CB0 802D5300 46047081 */ sub.s $f2, $f14, $f4 /* F9CB4 802D5304 460A1082 */ mul.s $f2, $f2, $f10 -/* F9CB8 802D5308 00000000 */ nop +/* F9CB8 802D5308 00000000 */ nop /* F9CBC 802D530C C4460004 */ lwc1 $f6, 4($v0) /* F9CC0 802D5310 46083181 */ sub.s $f6, $f6, $f8 /* F9CC4 802D5314 46042100 */ add.s $f4, $f4, $f4 /* F9CC8 802D5318 460E2100 */ add.s $f4, $f4, $f14 /* F9CCC 802D531C 46062102 */ mul.s $f4, $f4, $f6 -/* F9CD0 802D5320 00000000 */ nop +/* F9CD0 802D5320 00000000 */ nop /* F9CD4 802D5324 46061083 */ div.s $f2, $f2, $f6 /* F9CD8 802D5328 46001080 */ add.s $f2, $f2, $f0 /* F9CDC 802D532C 8FA20010 */ lw $v0, 0x10($sp) /* F9CE0 802D5330 460A1082 */ mul.s $f2, $f2, $f10 -/* F9CE4 802D5334 00000000 */ nop +/* F9CE4 802D5334 00000000 */ nop /* F9CE8 802D5338 00621821 */ addu $v1, $v1, $v0 /* F9CEC 802D533C C4680000 */ lwc1 $f8, ($v1) /* F9CF0 802D5340 C460000C */ lwc1 $f0, 0xc($v1) @@ -64,24 +64,24 @@ glabel func_802D5270 /* F9CFC 802D534C 46040001 */ sub.s $f0, $f0, $f4 /* F9D00 802D5350 46001080 */ add.s $f2, $f2, $f0 /* F9D04 802D5354 460A1082 */ mul.s $f2, $f2, $f10 -/* F9D08 802D5358 00000000 */ nop +/* F9D08 802D5358 00000000 */ nop /* F9D0C 802D535C 46081080 */ add.s $f2, $f2, $f8 /* F9D10 802D5360 E4A20000 */ swc1 $f2, ($a1) /* F9D14 802D5364 C4840004 */ lwc1 $f4, 4($a0) /* F9D18 802D5368 460C2002 */ mul.s $f0, $f4, $f12 -/* F9D1C 802D536C 00000000 */ nop +/* F9D1C 802D536C 00000000 */ nop /* F9D20 802D5370 C4880010 */ lwc1 $f8, 0x10($a0) /* F9D24 802D5374 46044081 */ sub.s $f2, $f8, $f4 /* F9D28 802D5378 460A1082 */ mul.s $f2, $f2, $f10 -/* F9D2C 802D537C 00000000 */ nop +/* F9D2C 802D537C 00000000 */ nop /* F9D30 802D5380 46042100 */ add.s $f4, $f4, $f4 /* F9D34 802D5384 46082100 */ add.s $f4, $f4, $f8 /* F9D38 802D5388 46062102 */ mul.s $f4, $f4, $f6 -/* F9D3C 802D538C 00000000 */ nop +/* F9D3C 802D538C 00000000 */ nop /* F9D40 802D5390 46061083 */ div.s $f2, $f2, $f6 /* F9D44 802D5394 46001080 */ add.s $f2, $f2, $f0 /* F9D48 802D5398 460A1082 */ mul.s $f2, $f2, $f10 -/* F9D4C 802D539C 00000000 */ nop +/* F9D4C 802D539C 00000000 */ nop /* F9D50 802D53A0 C4680004 */ lwc1 $f8, 4($v1) /* F9D54 802D53A4 C4600010 */ lwc1 $f0, 0x10($v1) /* F9D58 802D53A8 46080001 */ sub.s $f0, $f0, $f8 @@ -89,24 +89,24 @@ glabel func_802D5270 /* F9D60 802D53B0 46040001 */ sub.s $f0, $f0, $f4 /* F9D64 802D53B4 46001080 */ add.s $f2, $f2, $f0 /* F9D68 802D53B8 460A1082 */ mul.s $f2, $f2, $f10 -/* F9D6C 802D53BC 00000000 */ nop +/* F9D6C 802D53BC 00000000 */ nop /* F9D70 802D53C0 46081080 */ add.s $f2, $f2, $f8 /* F9D74 802D53C4 E4A20004 */ swc1 $f2, 4($a1) /* F9D78 802D53C8 C4840008 */ lwc1 $f4, 8($a0) /* F9D7C 802D53CC 460C2302 */ mul.s $f12, $f4, $f12 -/* F9D80 802D53D0 00000000 */ nop +/* F9D80 802D53D0 00000000 */ nop /* F9D84 802D53D4 C4800014 */ lwc1 $f0, 0x14($a0) /* F9D88 802D53D8 46040081 */ sub.s $f2, $f0, $f4 /* F9D8C 802D53DC 460A1082 */ mul.s $f2, $f2, $f10 -/* F9D90 802D53E0 00000000 */ nop +/* F9D90 802D53E0 00000000 */ nop /* F9D94 802D53E4 46042100 */ add.s $f4, $f4, $f4 /* F9D98 802D53E8 46002100 */ add.s $f4, $f4, $f0 /* F9D9C 802D53EC 46062102 */ mul.s $f4, $f4, $f6 -/* F9DA0 802D53F0 00000000 */ nop +/* F9DA0 802D53F0 00000000 */ nop /* F9DA4 802D53F4 46061083 */ div.s $f2, $f2, $f6 /* F9DA8 802D53F8 460C1080 */ add.s $f2, $f2, $f12 /* F9DAC 802D53FC 460A1082 */ mul.s $f2, $f2, $f10 -/* F9DB0 802D5400 00000000 */ nop +/* F9DB0 802D5400 00000000 */ nop /* F9DB4 802D5404 C4680008 */ lwc1 $f8, 8($v1) /* F9DB8 802D5408 C4600014 */ lwc1 $f0, 0x14($v1) /* F9DBC 802D540C 46080001 */ sub.s $f0, $f0, $f8 @@ -114,7 +114,7 @@ glabel func_802D5270 /* F9DC4 802D5414 46040001 */ sub.s $f0, $f0, $f4 /* F9DC8 802D5418 46001080 */ add.s $f2, $f2, $f0 /* F9DCC 802D541C 460A1082 */ mul.s $f2, $f2, $f10 -/* F9DD0 802D5420 00000000 */ nop +/* F9DD0 802D5420 00000000 */ nop /* F9DD4 802D5424 46081080 */ add.s $f2, $f2, $f8 /* F9DD8 802D5428 03E00008 */ jr $ra /* F9DDC 802D542C E4A20008 */ swc1 $f2, 8($a1) diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5B10.s b/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5B10.s index 6aee7b7fa0..1a368cbeb2 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5B10.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5B10.s @@ -38,11 +38,11 @@ glabel func_802D5B10 /* FA540 802D5B90 8C820000 */ lw $v0, ($a0) .L802D5B94: /* FA544 802D5B94 10450005 */ beq $v0, $a1, .L802D5BAC -/* FA548 802D5B98 00000000 */ nop +/* FA548 802D5B98 00000000 */ nop /* FA54C 802D5B9C 24840014 */ addiu $a0, $a0, 0x14 /* FA550 802D5BA0 8C820000 */ lw $v0, ($a0) /* FA554 802D5BA4 1446FFFB */ bne $v0, $a2, .L802D5B94 -/* FA558 802D5BA8 00000000 */ nop +/* FA558 802D5BA8 00000000 */ nop .L802D5BAC: /* FA55C 802D5BAC 50800017 */ beql $a0, $zero, .L802D5C0C /* FA560 802D5BB0 26730001 */ addiu $s3, $s3, 1 @@ -56,7 +56,7 @@ glabel func_802D5B10 /* FA580 802D5BD0 02341021 */ addu $v0, $s1, $s4 /* FA584 802D5BD4 8C440000 */ lw $a0, ($v0) /* FA588 802D5BD8 0C0B102B */ jal kill_script_by_ID -/* FA58C 802D5BDC 00000000 */ nop +/* FA58C 802D5BDC 00000000 */ nop .L802D5BE0: /* FA590 802D5BE0 5200000A */ beql $s0, $zero, .L802D5C0C /* FA594 802D5BE4 26730001 */ addiu $s3, $s3, 1 @@ -78,7 +78,7 @@ glabel func_802D5B10 /* FA5D0 802D5C20 AFA20010 */ sw $v0, 0x10($sp) .L802D5C24: /* FA5D4 802D5C24 0C01582A */ jal func_800560A8 -/* FA5D8 802D5C28 00000000 */ nop +/* FA5D8 802D5C28 00000000 */ nop /* FA5DC 802D5C2C 3C04802E */ lui $a0, %hi(D_802D9D30) /* FA5E0 802D5C30 24849D30 */ addiu $a0, $a0, %lo(D_802D9D30) /* FA5E4 802D5C34 8C830000 */ lw $v1, ($a0) diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D6420.s b/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D6420.s index 4a81d5951c..695e1d1167 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D6420.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D6420.s @@ -23,16 +23,16 @@ glabel func_802D6420 /* FAE14 802D6464 1062004B */ beq $v1, $v0, .L802D6594 /* FAE18 802D6468 0000102D */ daddu $v0, $zero, $zero /* FAE1C 802D646C 080B5988 */ j .L802D6620 -/* FAE20 802D6470 00000000 */ nop +/* FAE20 802D6470 00000000 */ nop .L802D6474: /* FAE24 802D6474 0C03805E */ jal disable_player_input -/* FAE28 802D6478 00000000 */ nop +/* FAE28 802D6478 00000000 */ nop /* FAE2C 802D647C 0C038045 */ jal disable_player_static_collisions -/* FAE30 802D6480 00000000 */ nop +/* FAE30 802D6480 00000000 */ nop /* FAE34 802D6484 0C03BD8A */ jal func_800EF628 -/* FAE38 802D6488 00000000 */ nop +/* FAE38 802D6488 00000000 */ nop /* FAE3C 802D648C 0C03A5EE */ jal func_800E97B8 -/* FAE40 802D6490 00000000 */ nop +/* FAE40 802D6490 00000000 */ nop /* FAE44 802D6494 0000482D */ daddu $t1, $zero, $zero /* FAE48 802D6498 0120402D */ daddu $t0, $t1, $zero /* FAE4C 802D649C 3C0C8008 */ lui $t4, %hi(gItemTable) @@ -63,7 +63,7 @@ glabel func_802D6420 .L802D64F8: /* FAEA8 802D64F8 8C620000 */ lw $v0, ($v1) /* FAEAC 802D64FC 1C40FFFA */ bgtz $v0, .L802D64E8 -/* FAEB0 802D6500 00000000 */ nop +/* FAEB0 802D6500 00000000 */ nop .L802D6504: /* FAEB4 802D6504 50A00012 */ beql $a1, $zero, .L802D6550 /* FAEB8 802D6508 25080001 */ addiu $t0, $t0, 1 @@ -111,7 +111,7 @@ glabel func_802D6420 /* FAF54 802D65A4 1040001D */ beqz $v0, .L802D661C /* FAF58 802D65A8 AE020078 */ sw $v0, 0x78($s0) /* FAF5C 802D65AC 0C03C4EC */ jal func_800F13B0 -/* FAF60 802D65B0 00000000 */ nop +/* FAF60 802D65B0 00000000 */ nop /* FAF64 802D65B4 8E020074 */ lw $v0, 0x74($s0) /* FAF68 802D65B8 24420001 */ addiu $v0, $v0, 1 .L802D65BC: @@ -120,7 +120,7 @@ glabel func_802D6420 /* FAF74 802D65C4 14400016 */ bnez $v0, .L802D6620 /* FAF78 802D65C8 0000102D */ daddu $v0, $zero, $zero /* FAF7C 802D65CC 0C03C54E */ jal func_800F1538 -/* FAF80 802D65D0 00000000 */ nop +/* FAF80 802D65D0 00000000 */ nop /* FAF84 802D65D4 8E030078 */ lw $v1, 0x78($s0) /* FAF88 802D65D8 240200FF */ addiu $v0, $zero, 0xff /* FAF8C 802D65DC 54620005 */ bnel $v1, $v0, .L802D65F4 diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D663C.s b/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D663C.s index 5185afa7e0..4eb1b71905 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D663C.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D663C.s @@ -23,16 +23,16 @@ glabel func_802D663C /* FB030 802D6680 1062004B */ beq $v1, $v0, .L802D67B0 /* FB034 802D6684 0000102D */ daddu $v0, $zero, $zero /* FB038 802D6688 080B5A0F */ j .L802D683C -/* FB03C 802D668C 00000000 */ nop +/* FB03C 802D668C 00000000 */ nop .L802D6690: /* FB040 802D6690 0C03805E */ jal disable_player_input -/* FB044 802D6694 00000000 */ nop +/* FB044 802D6694 00000000 */ nop /* FB048 802D6698 0C038045 */ jal disable_player_static_collisions -/* FB04C 802D669C 00000000 */ nop +/* FB04C 802D669C 00000000 */ nop /* FB050 802D66A0 0C03BD8A */ jal func_800EF628 -/* FB054 802D66A4 00000000 */ nop +/* FB054 802D66A4 00000000 */ nop /* FB058 802D66A8 0C03A5EE */ jal func_800E97B8 -/* FB05C 802D66AC 00000000 */ nop +/* FB05C 802D66AC 00000000 */ nop /* FB060 802D66B0 0000482D */ daddu $t1, $zero, $zero /* FB064 802D66B4 0120402D */ daddu $t0, $t1, $zero /* FB068 802D66B8 3C0C8008 */ lui $t4, %hi(gItemTable) @@ -63,7 +63,7 @@ glabel func_802D663C .L802D6714: /* FB0C4 802D6714 8C620000 */ lw $v0, ($v1) /* FB0C8 802D6718 1C40FFFA */ bgtz $v0, .L802D6704 -/* FB0CC 802D671C 00000000 */ nop +/* FB0CC 802D671C 00000000 */ nop .L802D6720: /* FB0D0 802D6720 50A00012 */ beql $a1, $zero, .L802D676C /* FB0D4 802D6724 25080001 */ addiu $t0, $t0, 1 @@ -111,7 +111,7 @@ glabel func_802D663C /* FB170 802D67C0 1040001D */ beqz $v0, .L802D6838 /* FB174 802D67C4 AE020078 */ sw $v0, 0x78($s0) /* FB178 802D67C8 0C03C4EC */ jal func_800F13B0 -/* FB17C 802D67CC 00000000 */ nop +/* FB17C 802D67CC 00000000 */ nop /* FB180 802D67D0 8E020074 */ lw $v0, 0x74($s0) /* FB184 802D67D4 24420001 */ addiu $v0, $v0, 1 .L802D67D8: @@ -120,7 +120,7 @@ glabel func_802D663C /* FB190 802D67E0 14400016 */ bnez $v0, .L802D683C /* FB194 802D67E4 0000102D */ daddu $v0, $zero, $zero /* FB198 802D67E8 0C03C54E */ jal func_800F1538 -/* FB19C 802D67EC 00000000 */ nop +/* FB19C 802D67EC 00000000 */ nop /* FB1A0 802D67F0 8E030078 */ lw $v1, 0x78($s0) /* FB1A4 802D67F4 240200FF */ addiu $v0, $zero, 0xff /* FB1A8 802D67F8 54620005 */ bnel $v1, $v0, .L802D6810 diff --git a/asm/nonmatchings/code_fe0b0_len_5a0/SetSpriteShading.s b/asm/nonmatchings/code_fe0b0_len_5a0/SetSpriteShading.s index 8be57f1aee..5032c947e0 100644 --- a/asm/nonmatchings/code_fe0b0_len_5a0/SetSpriteShading.s +++ b/asm/nonmatchings/code_fe0b0_len_5a0/SetSpriteShading.s @@ -141,7 +141,7 @@ glabel SetSpriteShading /* FE2CC 802D991C 00021400 */ sll $v0, $v0, 0x10 /* FE2D0 802D9920 00021403 */ sra $v0, $v0, 0x10 /* FE2D4 802D9924 44820000 */ mtc1 $v0, $f0 -/* FE2D8 802D9928 00000000 */ nop +/* FE2D8 802D9928 00000000 */ nop /* FE2DC 802D992C 46800020 */ cvt.s.w $f0, $f0 /* FE2E0 802D9930 E4A00004 */ swc1 $f0, 4($a1) /* FE2E4 802D9934 90E30000 */ lbu $v1, ($a3) @@ -151,7 +151,7 @@ glabel SetSpriteShading /* FE2F4 802D9944 00021400 */ sll $v0, $v0, 0x10 /* FE2F8 802D9948 00021403 */ sra $v0, $v0, 0x10 /* FE2FC 802D994C 44820000 */ mtc1 $v0, $f0 -/* FE300 802D9950 00000000 */ nop +/* FE300 802D9950 00000000 */ nop /* FE304 802D9954 46800020 */ cvt.s.w $f0, $f0 /* FE308 802D9958 E4A00008 */ swc1 $f0, 8($a1) /* FE30C 802D995C 91230000 */ lbu $v1, ($t1) @@ -161,7 +161,7 @@ glabel SetSpriteShading /* FE31C 802D996C 00021400 */ sll $v0, $v0, 0x10 /* FE320 802D9970 00021403 */ sra $v0, $v0, 0x10 /* FE324 802D9974 44820000 */ mtc1 $v0, $f0 -/* FE328 802D9978 00000000 */ nop +/* FE328 802D9978 00000000 */ nop /* FE32C 802D997C 46800020 */ cvt.s.w $f0, $f0 /* FE330 802D9980 E4A0000C */ swc1 $f0, 0xc($a1) /* FE334 802D9984 8FA7001C */ lw $a3, 0x1c($sp) diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DBE78.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DBE78.s index 2cad8bd336..59bd6214b1 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DBE78.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DBE78.s @@ -32,9 +32,9 @@ glabel func_802DBE78 /* FEFD4 802DBEE4 54A20006 */ bnel $a1, $v0, .L802DBF00 /* FEFD8 802DBEE8 0000202D */ daddu $a0, $zero, $zero /* FEFDC 802DBEEC 0C0B6F63 */ jal func_802DBD8C -/* FEFE0 802DBEF0 00000000 */ nop +/* FEFE0 802DBEF0 00000000 */ nop /* FEFE4 802DBEF4 080B6FEA */ j .L802DBFA8 -/* FEFE8 802DBEF8 00000000 */ nop +/* FEFE8 802DBEF8 00000000 */ nop .L802DBEFC: /* FEFEC 802DBEFC 0000202D */ daddu $a0, $zero, $zero .L802DBF00: @@ -45,7 +45,7 @@ glabel func_802DBE78 /* FEFFC 802DBF0C 8C620000 */ lw $v0, ($v1) /* FF000 802DBF10 00461024 */ and $v0, $v0, $a2 /* FF004 802DBF14 10A2001F */ beq $a1, $v0, .L802DBF94 -/* FF008 802DBF18 00000000 */ nop +/* FF008 802DBF18 00000000 */ nop /* FF00C 802DBF1C 24840001 */ addiu $a0, $a0, 1 /* FF010 802DBF20 28820016 */ slti $v0, $a0, 0x16 /* FF014 802DBF24 1440FFF9 */ bnez $v0, .L802DBF0C @@ -82,7 +82,7 @@ glabel func_802DBE78 /* FF084 802DBF94 0C0B6F63 */ jal func_802DBD8C /* FF088 802DBF98 AD040000 */ sw $a0, ($t0) /* FF08C 802DBF9C 080B6FEA */ j .L802DBFA8 -/* FF090 802DBFA0 00000000 */ nop +/* FF090 802DBFA0 00000000 */ nop .L802DBFA4: /* FF094 802DBFA4 0000102D */ daddu $v0, $zero, $zero .L802DBFA8: diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DBFC0.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DBFC0.s index 88b2821362..791f3f41a0 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DBFC0.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DBFC0.s @@ -22,4 +22,4 @@ glabel func_802DBFC0 /* FF0E8 802DBFF8 1440FFF5 */ bnez $v0, .L802DBFD0 /* FF0EC 802DBFFC 24630004 */ addiu $v1, $v1, 4 /* FF0F0 802DC000 03E00008 */ jr $ra -/* FF0F4 802DC004 00000000 */ nop +/* FF0F4 802DC004 00000000 */ nop diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DC008.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DC008.s index 7717368a9f..ce4e83369f 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DC008.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DC008.s @@ -258,7 +258,7 @@ glabel func_802DC008 /* FF4D0 802DC3E0 0C052071 */ jal func_801481C4 /* FF4D4 802DC3E4 01A0382D */ daddu $a3, $t5, $zero /* FF4D8 802DC3E8 080B71E2 */ j .L802DC788 -/* FF4DC 802DC3EC 00000000 */ nop +/* FF4DC 802DC3EC 00000000 */ nop .L802DC3F0: /* FF4E0 802DC3F0 3C03070A */ lui $v1, 0x70a /* FF4E4 802DC3F4 34630280 */ ori $v1, $v1, 0x280 @@ -310,7 +310,7 @@ glabel func_802DC008 /* FF58C 802DC49C 14A10004 */ bne $a1, $at, .L802DC4B0 /* FF590 802DC4A0 3C018000 */ lui $at, 0x8000 /* FF594 802DC4A4 14610002 */ bne $v1, $at, .L802DC4B0 -/* FF598 802DC4A8 00000000 */ nop +/* FF598 802DC4A8 00000000 */ nop /* FF59C 802DC4AC 0006000D */ break 6 .L802DC4B0: /* FF5A0 802DC4B0 00001012 */ mflo $v0 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DD634.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DD634.s index 4bbacf254a..b1bef84fdb 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DD634.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DD634.s @@ -45,4 +45,4 @@ glabel func_802DD634 /* 1007C0 802DD6D0 AC870018 */ sw $a3, 0x18($a0) .L802DD6D4: /* 1007C4 802DD6D4 03E00008 */ jr $ra -/* 1007C8 802DD6D8 00000000 */ nop +/* 1007C8 802DD6D8 00000000 */ nop diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DD6DC.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DD6DC.s index 6c3d693942..f855a2cf93 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DD6DC.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DD6DC.s @@ -47,7 +47,7 @@ glabel func_802DD6DC /* 100864 802DD774 02A0382D */ daddu $a3, $s5, $zero /* 100868 802DD778 8E020000 */ lw $v0, ($s0) /* 10086C 802DD77C 1451FFF8 */ bne $v0, $s1, .L802DD760 -/* 100870 802DD780 00000000 */ nop +/* 100870 802DD780 00000000 */ nop .L802DD784: /* 100874 802DD784 3C02802E */ lui $v0, %hi(D_802DFEAC) /* 100878 802DD788 8C42FEAC */ lw $v0, %lo(D_802DFEAC)($v0) diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DD820.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DD820.s index 6b555f41e3..15060aca1b 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DD820.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DD820.s @@ -24,7 +24,7 @@ glabel func_802DD820 .L802DD868: /* 100958 802DD868 8E020000 */ lw $v0, ($s0) /* 10095C 802DD86C 1452FFF7 */ bne $v0, $s2, .L802DD84C -/* 100960 802DD870 00000000 */ nop +/* 100960 802DD870 00000000 */ nop .L802DD874: /* 100964 802DD874 8FBF001C */ lw $ra, 0x1c($sp) /* 100968 802DD878 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DD8F8.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DD8F8.s index 9fcdd19d58..6db288af99 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DD8F8.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DD8F8.s @@ -93,7 +93,7 @@ glabel func_802DD8F8 /* 100B2C 802DDA3C 1440FFF8 */ bnez $v0, .L802DDA20 /* 100B30 802DDA40 24630014 */ addiu $v1, $v1, 0x14 /* 100B34 802DDA44 0C0B6F50 */ jal func_802DBD40 -/* 100B38 802DDA48 00000000 */ nop +/* 100B38 802DDA48 00000000 */ nop /* 100B3C 802DDA4C 8FBF0018 */ lw $ra, 0x18($sp) /* 100B40 802DDA50 8FB10014 */ lw $s1, 0x14($sp) /* 100B44 802DDA54 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DDA8C.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DDA8C.s index 9c9c5ad3d8..6dfa59fa8e 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DDA8C.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DDA8C.s @@ -34,7 +34,7 @@ glabel func_802DDA8C /* 100BF0 802DDB00 3C04802E */ lui $a0, %hi(D_802DF580) /* 100BF4 802DDB04 8C84F580 */ lw $a0, %lo(D_802DF580)($a0) /* 100BF8 802DDB08 0C0B7CB6 */ jal func_802DF2D8 -/* 100BFC 802DDB0C 00000000 */ nop +/* 100BFC 802DDB0C 00000000 */ nop /* 100C00 802DDB10 0040882D */ daddu $s1, $v0, $zero /* 100C04 802DDB14 AE110000 */ sw $s1, ($s0) /* 100C08 802DDB18 8E230000 */ lw $v1, ($s1) @@ -49,7 +49,7 @@ glabel func_802DDA8C /* 100C28 802DDB38 AE02004C */ sw $v0, 0x4c($s0) /* 100C2C 802DDB3C 8E220000 */ lw $v0, ($s1) /* 100C30 802DDB40 1453FFF9 */ bne $v0, $s3, .L802DDB28 -/* 100C34 802DDB44 00000000 */ nop +/* 100C34 802DDB44 00000000 */ nop .L802DDB48: /* 100C38 802DDB48 00141080 */ sll $v0, $s4, 2 /* 100C3C 802DDB4C 3C03802E */ lui $v1, %hi(D_802DF588) @@ -78,7 +78,7 @@ glabel func_802DDA8C /* 100C98 802DDBA8 02A22024 */ and $a0, $s5, $v0 /* 100C9C 802DDBAC 00621824 */ and $v1, $v1, $v0 /* 100CA0 802DDBB0 10830005 */ beq $a0, $v1, .L802DDBC8 -/* 100CA4 802DDBB4 00000000 */ nop +/* 100CA4 802DDBB4 00000000 */ nop .L802DDBB8: /* 100CA8 802DDBB8 0220202D */ daddu $a0, $s1, $zero /* 100CAC 802DDBBC 0C0B7608 */ jal func_802DD820 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DDEC4.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DDEC4.s index 8c25301999..a07903b61c 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DDEC4.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DDEC4.s @@ -9,4 +9,4 @@ glabel func_802DDEC4 /* 100FC4 802DDED4 00220821 */ addu $at, $at, $v0 /* 100FC8 802DDED8 8C22F590 */ lw $v0, %lo(D_802DF590)($at) /* 100FCC 802DDEDC 03E00008 */ jr $ra -/* 100FD0 802DDEE0 00000000 */ nop +/* 100FD0 802DDEE0 00000000 */ nop diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DDEE4.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DDEE4.s index ccff49bb16..36716aa9d2 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DDEE4.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DDEE4.s @@ -50,7 +50,7 @@ glabel func_802DDEE4 /* 101080 802DDF90 0C04EAA7 */ jal func_8013AA9C /* 101084 802DDF94 AFA80014 */ sw $t0, 0x14($sp) /* 101088 802DDF98 12A00004 */ beqz $s5, .L802DDFAC -/* 10108C 802DDF9C 00000000 */ nop +/* 10108C 802DDF9C 00000000 */ nop /* 101090 802DDFA0 8E02004C */ lw $v0, 0x4c($s0) /* 101094 802DDFA4 080B77ED */ j .L802DDFB4 /* 101098 802DDFA8 00571025 */ or $v0, $v0, $s7 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DE0C0.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DE0C0.s index d7f4176799..01f3c1e8a1 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DE0C0.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DE0C0.s @@ -8,7 +8,7 @@ glabel func_802DE0C0 /* 1011BC 802DE0CC 00441021 */ addu $v0, $v0, $a0 /* 1011C0 802DE0D0 8C42F548 */ lw $v0, %lo(D_802DF548)($v0) /* 1011C4 802DE0D4 10400003 */ beqz $v0, .L802DE0E4 -/* 1011C8 802DE0D8 00000000 */ nop +/* 1011C8 802DE0D8 00000000 */ nop /* 1011CC 802DE0DC 03E00008 */ jr $ra /* 1011D0 802DE0E0 8C420004 */ lw $v0, 4($v0) .L802DE0E4: diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DE0EC.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DE0EC.s index eae9adf7bf..efda1bb977 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DE0EC.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DE0EC.s @@ -21,7 +21,7 @@ glabel func_802DE0EC .L802DE12C: /* 10121C 802DE12C 8C620000 */ lw $v0, ($v1) /* 101220 802DE130 10400005 */ beqz $v0, .L802DE148 -/* 101224 802DE134 00000000 */ nop +/* 101224 802DE134 00000000 */ nop /* 101228 802DE138 24840001 */ addiu $a0, $a0, 1 /* 10122C 802DE13C 28820033 */ slti $v0, $a0, 0x33 /* 101230 802DE140 1440FFFA */ bnez $v0, .L802DE12C @@ -81,7 +81,7 @@ glabel func_802DE0EC .L802DE208: /* 1012F8 802DE208 8E040008 */ lw $a0, 8($s0) /* 1012FC 802DE20C 0C0B7CB6 */ jal func_802DF2D8 -/* 101300 802DE210 00000000 */ nop +/* 101300 802DE210 00000000 */ nop /* 101304 802DE214 0040882D */ daddu $s1, $v0, $zero /* 101308 802DE218 00121080 */ sll $v0, $s2, 2 /* 10130C 802DE21C 00521021 */ addu $v0, $v0, $s2 @@ -101,7 +101,7 @@ glabel func_802DE0EC /* 101340 802DE250 AE02004C */ sw $v0, 0x4c($s0) /* 101344 802DE254 8E220000 */ lw $v0, ($s1) /* 101348 802DE258 1453FFF9 */ bne $v0, $s3, .L802DE240 -/* 10134C 802DE25C 00000000 */ nop +/* 10134C 802DE25C 00000000 */ nop .L802DE260: /* 101350 802DE260 0240102D */ daddu $v0, $s2, $zero /* 101354 802DE264 3C03802E */ lui $v1, %hi(D_802DFA48) diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DE3D8.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DE3D8.s index d23514f5a6..8ffe4cd9ab 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DE3D8.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DE3D8.s @@ -54,12 +54,12 @@ glabel func_802DE3D8 /* 10158C 802DE49C 00220821 */ addu $at, $at, $v0 /* 101590 802DE4A0 C4221DEC */ lwc1 $f2, %lo(D_800B1DEC)($at) /* 101594 802DE4A4 44850000 */ mtc1 $a1, $f0 -/* 101598 802DE4A8 00000000 */ nop +/* 101598 802DE4A8 00000000 */ nop /* 10159C 802DE4AC 46800020 */ cvt.s.w $f0, $f0 /* 1015A0 802DE4B0 46020000 */ add.s $f0, $f0, $f2 /* 1015A4 802DE4B4 4600010D */ trunc.w.s $f4, $f0 /* 1015A8 802DE4B8 44052000 */ mfc1 $a1, $f4 -/* 1015AC 802DE4BC 00000000 */ nop +/* 1015AC 802DE4BC 00000000 */ nop /* 1015B0 802DE4C0 28A20169 */ slti $v0, $a1, 0x169 /* 1015B4 802DE4C4 50400001 */ beql $v0, $zero, .L802DE4CC /* 1015B8 802DE4C8 24A5FE98 */ addiu $a1, $a1, -0x168 @@ -75,12 +75,12 @@ glabel func_802DE3D8 /* 1015D4 802DE4E4 24A2010E */ addiu $v0, $a1, 0x10e /* 1015D8 802DE4E8 2C4200B4 */ sltiu $v0, $v0, 0xb4 /* 1015DC 802DE4EC 10400005 */ beqz $v0, .L802DE504 -/* 1015E0 802DE4F0 00000000 */ nop +/* 1015E0 802DE4F0 00000000 */ nop .L802DE4F4: /* 1015E4 802DE4F4 3C01BFC0 */ lui $at, 0xbfc0 /* 1015E8 802DE4F8 4481A000 */ mtc1 $at, $f20 /* 1015EC 802DE4FC 080B7943 */ j .L802DE50C -/* 1015F0 802DE500 00000000 */ nop +/* 1015F0 802DE500 00000000 */ nop .L802DE504: /* 1015F4 802DE504 3C013FC0 */ lui $at, 0x3fc0 /* 1015F8 802DE508 4481A000 */ mtc1 $at, $f20 @@ -123,7 +123,7 @@ glabel func_802DE3D8 .L802DE58C: /* 10167C 802DE58C 8E020000 */ lw $v0, ($s0) /* 101680 802DE590 1452FFF2 */ bne $v0, $s2, .L802DE55C -/* 101684 802DE594 00000000 */ nop +/* 101684 802DE594 00000000 */ nop .L802DE598: /* 101688 802DE598 24020001 */ addiu $v0, $zero, 1 .L802DE59C: diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DE5C8.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DE5C8.s index dfa4b68e6f..f62e636e61 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DE5C8.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DE5C8.s @@ -9,4 +9,4 @@ glabel func_802DE5C8 /* 1016C8 802DE5D8 00220821 */ addu $at, $at, $v0 /* 1016CC 802DE5DC 8C22FA58 */ lw $v0, %lo(D_802DFA58)($at) /* 1016D0 802DE5E0 03E00008 */ jr $ra -/* 1016D4 802DE5E4 00000000 */ nop +/* 1016D4 802DE5E4 00000000 */ nop diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DE5E8.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DE5E8.s index 816c79198a..5bd1854329 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DE5E8.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DE5E8.s @@ -20,7 +20,7 @@ glabel func_802DE5E8 /* 101714 802DE624 12200003 */ beqz $s1, .L802DE634 /* 101718 802DE628 2A2200EA */ slti $v0, $s1, 0xea /* 10171C 802DE62C 14400003 */ bnez $v0, .L802DE63C -/* 101720 802DE630 00000000 */ nop +/* 101720 802DE630 00000000 */ nop .L802DE634: /* 101724 802DE634 080B79CA */ j .L802DE728 /* 101728 802DE638 0240102D */ daddu $v0, $s2, $zero @@ -70,7 +70,7 @@ glabel func_802DE5E8 /* 1017C8 802DE6D8 3C048035 */ lui $a0, %hi(D_8034F800) /* 1017CC 802DE6DC 2484F800 */ addiu $a0, $a0, %lo(D_8034F800) /* 1017D0 802DE6E0 10400003 */ beqz $v0, .L802DE6F0 -/* 1017D4 802DE6E4 00000000 */ nop +/* 1017D4 802DE6E4 00000000 */ nop /* 1017D8 802DE6E8 3C048030 */ lui $a0, %hi(D_802FB800) /* 1017DC 802DE6EC 2484B800 */ addiu $a0, $a0, %lo(D_802FB800) .L802DE6F0: diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DE780.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DE780.s index 3e0a13f67d..7f4c09623b 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DE780.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DE780.s @@ -50,7 +50,7 @@ glabel func_802DE780 /* 10191C 802DE82C 0C04EAA7 */ jal func_8013AA9C /* 101920 802DE830 AFA80014 */ sw $t0, 0x14($sp) /* 101924 802DE834 12A00004 */ beqz $s5, .L802DE848 -/* 101928 802DE838 00000000 */ nop +/* 101928 802DE838 00000000 */ nop /* 10192C 802DE83C 8E02004C */ lw $v0, 0x4c($s0) /* 101930 802DE840 080B7A14 */ j .L802DE850 /* 101934 802DE844 00571025 */ or $v0, $v0, $s7 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DE8DC.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DE8DC.s index 544f3dda89..2ac7aae91d 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DE8DC.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DE8DC.s @@ -33,7 +33,7 @@ glabel func_802DE8DC /* 101A38 802DE948 84620006 */ lh $v0, 6($v1) /* 101A3C 802DE94C C4800028 */ lwc1 $f0, 0x28($a0) /* 101A40 802DE950 44821000 */ mtc1 $v0, $f2 -/* 101A44 802DE954 00000000 */ nop +/* 101A44 802DE954 00000000 */ nop /* 101A48 802DE958 468010A0 */ cvt.s.w $f2, $f2 /* 101A4C 802DE95C 46020000 */ add.s $f0, $f0, $f2 /* 101A50 802DE960 4600010D */ trunc.w.s $f4, $f0 @@ -41,7 +41,7 @@ glabel func_802DE8DC /* 101A58 802DE968 84620008 */ lh $v0, 8($v1) /* 101A5C 802DE96C C480002C */ lwc1 $f0, 0x2c($a0) /* 101A60 802DE970 44821000 */ mtc1 $v0, $f2 -/* 101A64 802DE974 00000000 */ nop +/* 101A64 802DE974 00000000 */ nop /* 101A68 802DE978 468010A0 */ cvt.s.w $f2, $f2 /* 101A6C 802DE97C 46020000 */ add.s $f0, $f0, $f2 /* 101A70 802DE980 4600010D */ trunc.w.s $f4, $f0 @@ -49,7 +49,7 @@ glabel func_802DE8DC /* 101A78 802DE988 8462000A */ lh $v0, 0xa($v1) /* 101A7C 802DE98C C4820030 */ lwc1 $f2, 0x30($a0) /* 101A80 802DE990 44820000 */ mtc1 $v0, $f0 -/* 101A84 802DE994 00000000 */ nop +/* 101A84 802DE994 00000000 */ nop /* 101A88 802DE998 46800020 */ cvt.s.w $f0, $f0 /* 101A8C 802DE99C 46001080 */ add.s $f2, $f2, $f0 /* 101A90 802DE9A0 4600110D */ trunc.w.s $f4, $f2 @@ -64,8 +64,8 @@ glabel func_802DE8DC .L802DE9C0: /* 101AB0 802DE9C0 8C820000 */ lw $v0, ($a0) /* 101AB4 802DE9C4 1443FFDC */ bne $v0, $v1, .L802DE938 -/* 101AB8 802DE9C8 00000000 */ nop +/* 101AB8 802DE9C8 00000000 */ nop /* 101ABC 802DE9CC 2402FFFF */ addiu $v0, $zero, -1 .L802DE9D0: /* 101AC0 802DE9D0 03E00008 */ jr $ra -/* 101AC4 802DE9D4 00000000 */ nop +/* 101AC4 802DE9D4 00000000 */ nop diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DEA40.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DEA40.s index 054fff684d..4473bab834 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DEA40.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DEA40.s @@ -7,10 +7,10 @@ glabel func_802DEA40 /* 101B38 802DEA48 00441021 */ addu $v0, $v0, $a0 /* 101B3C 802DEA4C 8C42F5B0 */ lw $v0, %lo(D_802DF5B0)($v0) /* 101B40 802DEA50 14400003 */ bnez $v0, .L802DEA60 -/* 101B44 802DEA54 00000000 */ nop +/* 101B44 802DEA54 00000000 */ nop /* 101B48 802DEA58 03E00008 */ jr $ra /* 101B4C 802DEA5C 0000102D */ daddu $v0, $zero, $zero .L802DEA60: /* 101B50 802DEA60 8C420004 */ lw $v0, 4($v0) /* 101B54 802DEA64 03E00008 */ jr $ra -/* 101B58 802DEA68 00000000 */ nop +/* 101B58 802DEA68 00000000 */ nop diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DEA6C.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DEA6C.s index 5b58d51f44..81b5e08c7d 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DEA6C.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DEA6C.s @@ -7,12 +7,12 @@ glabel func_802DEA6C /* 101B64 802DEA74 00441021 */ addu $v0, $v0, $a0 /* 101B68 802DEA78 8C42F5B0 */ lw $v0, %lo(D_802DF5B0)($v0) /* 101B6C 802DEA7C 14400003 */ bnez $v0, .L802DEA8C -/* 101B70 802DEA80 00000000 */ nop +/* 101B70 802DEA80 00000000 */ nop /* 101B74 802DEA84 03E00008 */ jr $ra /* 101B78 802DEA88 2402FFFF */ addiu $v0, $zero, -1 .L802DEA8C: /* 101B7C 802DEA8C 8C42000C */ lw $v0, 0xc($v0) /* 101B80 802DEA90 03E00008 */ jr $ra -/* 101B84 802DEA94 00000000 */ nop -/* 101B88 802DEA98 00000000 */ nop -/* 101B8C 802DEA9C 00000000 */ nop +/* 101B84 802DEA94 00000000 */ nop +/* 101B88 802DEA98 00000000 */ nop +/* 101B8C 802DEA9C 00000000 */ nop diff --git a/asm/nonmatchings/code_fee30_len_2d60/render_sprite.s b/asm/nonmatchings/code_fee30_len_2d60/render_sprite.s index 944e70b0c3..a5b4046094 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/render_sprite.s +++ b/asm/nonmatchings/code_fee30_len_2d60/render_sprite.s @@ -87,7 +87,7 @@ glabel render_sprite /* 100E64 802DDD74 46000007 */ neg.s $f0, $f0 /* 100E68 802DDD78 4600008D */ trunc.w.s $f2, $f0 /* 100E6C 802DDD7C 44021000 */ mfc1 $v0, $f2 -/* 100E70 802DDD80 00000000 */ nop +/* 100E70 802DDD80 00000000 */ nop /* 100E74 802DDD84 00A22821 */ addu $a1, $a1, $v0 /* 100E78 802DDD88 28A20169 */ slti $v0, $a1, 0x169 /* 100E7C 802DDD8C 50400001 */ beql $v0, $zero, .L802DDD94 @@ -116,9 +116,9 @@ glabel render_sprite .L802DDDD4: /* 100EC4 802DDDD4 00821024 */ and $v0, $a0, $v0 /* 100EC8 802DDDD8 10400004 */ beqz $v0, .L802DDDEC -/* 100ECC 802DDDDC 00000000 */ nop +/* 100ECC 802DDDDC 00000000 */ nop /* 100ED0 802DDDE0 44800000 */ mtc1 $zero, $f0 -/* 100ED4 802DDDE4 00000000 */ nop +/* 100ED4 802DDDE4 00000000 */ nop /* 100ED8 802DDDE8 46140501 */ sub.s $f20, $f0, $f20 .L802DDDEC: /* 100EDC 802DDDEC 3C02802E */ lui $v0, %hi(D_802DFEA0) @@ -167,7 +167,7 @@ glabel render_sprite .L802DDE84: /* 100F74 802DDE84 8E020000 */ lw $v0, ($s0) /* 100F78 802DDE88 1451FFF2 */ bne $v0, $s1, .L802DDE54 -/* 100F7C 802DDE8C 00000000 */ nop +/* 100F7C 802DDE8C 00000000 */ nop .L802DDE90: /* 100F80 802DDE90 24020001 */ addiu $v0, $zero, 1 .L802DDE94: 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 1055f930d6..f6602ab29a 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/spr_appendMDL_component.s +++ b/asm/nonmatchings/code_fee30_len_2d60/spr_appendMDL_component.s @@ -36,7 +36,7 @@ glabel spr_appendMDL_component /* FFA60 802DC970 0200282D */ daddu $a1, $s0, $zero /* FFA64 802DC974 C7A20124 */ lwc1 $f2, 0x124($sp) /* FFA68 802DC978 46141032 */ c.eq.s $f2, $f20 -/* FFA6C 802DC97C 00000000 */ nop +/* FFA6C 802DC97C 00000000 */ nop /* FFA70 802DC980 4501000A */ bc1t .L802DC9AC /* FFA74 802DC984 0220202D */ daddu $a0, $s1, $zero /* FFA78 802DC988 44051000 */ mfc1 $a1, $f2 @@ -50,7 +50,7 @@ glabel spr_appendMDL_component /* FFA98 802DC9A8 00A0302D */ daddu $a2, $a1, $zero .L802DC9AC: /* FFA9C 802DC9AC 4614B032 */ c.eq.s $f22, $f20 -/* FFAA0 802DC9B0 00000000 */ nop +/* FFAA0 802DC9B0 00000000 */ nop /* FFAA4 802DC9B4 4501000C */ bc1t .L802DC9E8 /* FFAA8 802DC9B8 0220202D */ daddu $a0, $s1, $zero /* FFAAC 802DC9BC 4405B000 */ mfc1 $a1, $f22 @@ -66,7 +66,7 @@ glabel spr_appendMDL_component /* FFAD4 802DC9E4 00A0302D */ daddu $a2, $a1, $zero .L802DC9E8: /* FFAD8 802DC9E8 4614C032 */ c.eq.s $f24, $f20 -/* FFADC 802DC9EC 00000000 */ nop +/* FFADC 802DC9EC 00000000 */ nop /* FFAE0 802DC9F0 4501000A */ bc1t .L802DCA1C /* FFAE4 802DC9F4 0220202D */ daddu $a0, $s1, $zero /* FFAE8 802DC9F8 4405C000 */ mfc1 $a1, $f24 @@ -81,17 +81,17 @@ glabel spr_appendMDL_component .L802DCA1C: /* FFB0C 802DCA1C 3C013F80 */ lui $at, 0x3f80 /* FFB10 802DCA20 44810000 */ mtc1 $at, $f0 -/* FFB14 802DCA24 00000000 */ nop +/* FFB14 802DCA24 00000000 */ nop /* FFB18 802DCA28 4600D032 */ c.eq.s $f26, $f0 -/* FFB1C 802DCA2C 00000000 */ nop +/* FFB1C 802DCA2C 00000000 */ nop /* FFB20 802DCA30 4500000A */ bc1f .L802DCA5C /* FFB24 802DCA34 27B00060 */ addiu $s0, $sp, 0x60 /* FFB28 802DCA38 4600E032 */ c.eq.s $f28, $f0 -/* FFB2C 802DCA3C 00000000 */ nop +/* FFB2C 802DCA3C 00000000 */ nop /* FFB30 802DCA40 45000006 */ bc1f .L802DCA5C -/* FFB34 802DCA44 00000000 */ nop +/* FFB34 802DCA44 00000000 */ nop /* FFB38 802DCA48 4600F032 */ c.eq.s $f30, $f0 -/* FFB3C 802DCA4C 00000000 */ nop +/* FFB3C 802DCA4C 00000000 */ nop /* FFB40 802DCA50 4501000C */ bc1t .L802DCA84 /* FFB44 802DCA54 3C120001 */ lui $s2, 1 /* FFB48 802DCA58 27B00060 */ addiu $s0, $sp, 0x60 diff --git a/asm/nonmatchings/code_fee30_len_2d60/spr_draw_component.s b/asm/nonmatchings/code_fee30_len_2d60/spr_draw_component.s index 8db10ababa..3fff108f9c 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/spr_draw_component.s +++ b/asm/nonmatchings/code_fee30_len_2d60/spr_draw_component.s @@ -20,7 +20,7 @@ glabel spr_draw_component /* 100008 802DCF18 8E230014 */ lw $v1, 0x14($s1) /* 10000C 802DCF1C 2402FFFF */ addiu $v0, $zero, -1 /* 100010 802DCF20 10620064 */ beq $v1, $v0, .L802DD0B4 -/* 100014 802DCF24 00000000 */ nop +/* 100014 802DCF24 00000000 */ nop /* 100018 802DCF28 3C02802E */ lui $v0, %hi(D_802DFEA0) /* 10001C 802DCF2C 2442FEA0 */ addiu $v0, $v0, %lo(D_802DFEA0) /* 100020 802DCF30 C4540000 */ lwc1 $f20, ($v0) @@ -39,23 +39,23 @@ glabel spr_draw_component /* 100054 802DCF64 C6240030 */ lwc1 $f4, 0x30($s1) /* 100058 802DCF68 85070006 */ lh $a3, 6($t0) /* 10005C 802DCF6C 44820000 */ mtc1 $v0, $f0 -/* 100060 802DCF70 00000000 */ nop +/* 100060 802DCF70 00000000 */ nop /* 100064 802DCF74 46800020 */ cvt.s.w $f0, $f0 /* 100068 802DCF78 46002100 */ add.s $f4, $f4, $f0 /* 10006C 802DCF7C C7A0008C */ lwc1 $f0, 0x8c($sp) /* 100070 802DCF80 C6260028 */ lwc1 $f6, 0x28($s1) /* 100074 802DCF84 46002102 */ mul.s $f4, $f4, $f0 -/* 100078 802DCF88 00000000 */ nop +/* 100078 802DCF88 00000000 */ nop /* 10007C 802DCF8C 85030008 */ lh $v1, 8($t0) /* 100080 802DCF90 C622002C */ lwc1 $f2, 0x2c($s1) /* 100084 802DCF94 27A20038 */ addiu $v0, $sp, 0x38 /* 100088 802DCF98 44830000 */ mtc1 $v1, $f0 -/* 10008C 802DCF9C 00000000 */ nop +/* 10008C 802DCF9C 00000000 */ nop /* 100090 802DCFA0 46800020 */ cvt.s.w $f0, $f0 /* 100094 802DCFA4 46001080 */ add.s $f2, $f2, $f0 /* 100098 802DCFA8 AFA20018 */ sw $v0, 0x18($sp) /* 10009C 802DCFAC 44870000 */ mtc1 $a3, $f0 -/* 1000A0 802DCFB0 00000000 */ nop +/* 1000A0 802DCFB0 00000000 */ nop /* 1000A4 802DCFB4 46800020 */ cvt.s.w $f0, $f0 /* 1000A8 802DCFB8 46003180 */ add.s $f6, $f6, $f0 /* 1000AC 802DCFBC 27A2003C */ addiu $v0, $sp, 0x3c diff --git a/asm/nonmatchings/code_fee30_len_2d60/spr_transform_point.s b/asm/nonmatchings/code_fee30_len_2d60/spr_transform_point.s index 0b5beb3e4f..5f12f20218 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/spr_transform_point.s +++ b/asm/nonmatchings/code_fee30_len_2d60/spr_transform_point.s @@ -25,16 +25,16 @@ glabel spr_transform_point /* FFE40 802DCD50 16400009 */ bnez $s2, .L802DCD78 /* FFE44 802DCD54 00C0882D */ daddu $s1, $a2, $zero /* FFE48 802DCD58 14A00007 */ bnez $a1, .L802DCD78 -/* FFE4C 802DCD5C 00000000 */ nop +/* FFE4C 802DCD5C 00000000 */ nop /* FFE50 802DCD60 16200005 */ bnez $s1, .L802DCD78 -/* FFE54 802DCD64 00000000 */ nop +/* FFE54 802DCD64 00000000 */ nop /* FFE58 802DCD68 E6780000 */ swc1 $f24, ($s3) /* FFE5C 802DCD6C E69A0000 */ swc1 $f26, ($s4) /* FFE60 802DCD70 080B73A9 */ j .L802DCEA4 /* FFE64 802DCD74 E6BC0000 */ swc1 $f28, ($s5) .L802DCD78: /* FFE68 802DCD78 44859000 */ mtc1 $a1, $f18 -/* FFE6C 802DCD7C 00000000 */ nop +/* FFE6C 802DCD7C 00000000 */ nop /* FFE70 802DCD80 468094A0 */ cvt.s.w $f18, $f18 /* FFE74 802DCD84 4480A000 */ mtc1 $zero, $f20 /* FFE78 802DCD88 3C013F80 */ lui $at, 0x3f80 @@ -47,7 +47,7 @@ glabel spr_transform_point /* FFE94 802DCDA4 E7B40010 */ swc1 $f20, 0x10($sp) /* FFE98 802DCDA8 27B00058 */ addiu $s0, $sp, 0x58 /* FFE9C 802DCDAC 44919000 */ mtc1 $s1, $f18 -/* FFEA0 802DCDB0 00000000 */ nop +/* FFEA0 802DCDB0 00000000 */ nop /* FFEA4 802DCDB4 468094A0 */ cvt.s.w $f18, $f18 /* FFEA8 802DCDB8 4406A000 */ mfc1 $a2, $f20 /* FFEAC 802DCDBC 4407A000 */ mfc1 $a3, $f20 @@ -60,7 +60,7 @@ glabel spr_transform_point /* FFEC8 802DCDD8 0C019D80 */ jal guMtxCatF /* FFECC 802DCDDC 00A0302D */ daddu $a2, $a1, $zero /* FFED0 802DCDE0 44929000 */ mtc1 $s2, $f18 -/* FFED4 802DCDE4 00000000 */ nop +/* FFED4 802DCDE4 00000000 */ nop /* FFED8 802DCDE8 468094A0 */ cvt.s.w $f18, $f18 /* FFEDC 802DCDEC 4406B000 */ mfc1 $a2, $f22 /* FFEE0 802DCDF0 4407A000 */ mfc1 $a3, $f20 @@ -74,31 +74,31 @@ glabel spr_transform_point /* FFF00 802DCE10 00A0302D */ daddu $a2, $a1, $zero /* FFF04 802DCE14 C7A80018 */ lwc1 $f8, 0x18($sp) /* FFF08 802DCE18 46184202 */ mul.s $f8, $f8, $f24 -/* FFF0C 802DCE1C 00000000 */ nop +/* FFF0C 802DCE1C 00000000 */ nop /* FFF10 802DCE20 C7B00028 */ lwc1 $f16, 0x28($sp) /* FFF14 802DCE24 461A8402 */ mul.s $f16, $f16, $f26 -/* FFF18 802DCE28 00000000 */ nop +/* FFF18 802DCE28 00000000 */ nop /* FFF1C 802DCE2C C7AE0038 */ lwc1 $f14, 0x38($sp) /* FFF20 802DCE30 461C7382 */ mul.s $f14, $f14, $f28 -/* FFF24 802DCE34 00000000 */ nop +/* FFF24 802DCE34 00000000 */ nop /* FFF28 802DCE38 C7A2001C */ lwc1 $f2, 0x1c($sp) /* FFF2C 802DCE3C 46181082 */ mul.s $f2, $f2, $f24 -/* FFF30 802DCE40 00000000 */ nop +/* FFF30 802DCE40 00000000 */ nop /* FFF34 802DCE44 C7AA002C */ lwc1 $f10, 0x2c($sp) /* FFF38 802DCE48 461A5282 */ mul.s $f10, $f10, $f26 -/* FFF3C 802DCE4C 00000000 */ nop +/* FFF3C 802DCE4C 00000000 */ nop /* FFF40 802DCE50 C7AC003C */ lwc1 $f12, 0x3c($sp) /* FFF44 802DCE54 461C6302 */ mul.s $f12, $f12, $f28 -/* FFF48 802DCE58 00000000 */ nop +/* FFF48 802DCE58 00000000 */ nop /* FFF4C 802DCE5C C7A00020 */ lwc1 $f0, 0x20($sp) /* FFF50 802DCE60 46180002 */ mul.s $f0, $f0, $f24 -/* FFF54 802DCE64 00000000 */ nop +/* FFF54 802DCE64 00000000 */ nop /* FFF58 802DCE68 C7A40030 */ lwc1 $f4, 0x30($sp) /* FFF5C 802DCE6C 461A2102 */ mul.s $f4, $f4, $f26 -/* FFF60 802DCE70 00000000 */ nop +/* FFF60 802DCE70 00000000 */ nop /* FFF64 802DCE74 C7A60040 */ lwc1 $f6, 0x40($sp) /* FFF68 802DCE78 461C3182 */ mul.s $f6, $f6, $f28 -/* FFF6C 802DCE7C 00000000 */ nop +/* FFF6C 802DCE7C 00000000 */ nop /* FFF70 802DCE80 46104200 */ add.s $f8, $f8, $f16 /* FFF74 802DCE84 460A1080 */ add.s $f2, $f2, $f10 /* FFF78 802DCE88 46040000 */ add.s $f0, $f0, $f4 diff --git a/asm/nonmatchings/code_fee30_len_2d60/update_component.s b/asm/nonmatchings/code_fee30_len_2d60/update_component.s index 87ea19c46c..7a81b9f29c 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/update_component.s +++ b/asm/nonmatchings/code_fee30_len_2d60/update_component.s @@ -33,7 +33,7 @@ glabel update_component /* 10027C 802DD18C 44801000 */ mtc1 $zero, $f2 /* 100280 802DD190 4600A706 */ mov.s $f28, $f20 /* 100284 802DD194 4602003E */ c.le.s $f0, $f2 -/* 100288 802DD198 00000000 */ nop +/* 100288 802DD198 00000000 */ nop /* 10028C 802DD19C 450000FC */ bc1f .L802DD590 /* 100290 802DD1A0 E620000C */ swc1 $f0, 0xc($s1) /* 100294 802DD1A4 46001606 */ mov.s $f24, $f2 @@ -70,14 +70,14 @@ glabel update_component /* 100308 802DD218 10600019 */ beqz $v1, .L802DD280 /* 10030C 802DD21C 30820FFF */ andi $v0, $a0, 0xfff /* 100310 802DD220 080B755D */ j .L802DD574 -/* 100314 802DD224 00000000 */ nop +/* 100314 802DD224 00000000 */ nop .L802DD228: /* 100318 802DD228 1062002C */ beq $v1, $v0, .L802DD2DC /* 10031C 802DD22C 24023000 */ addiu $v0, $zero, 0x3000 /* 100320 802DD230 1062005F */ beq $v1, $v0, .L802DD3B0 /* 100324 802DD234 3083000F */ andi $v1, $a0, 0xf /* 100328 802DD238 080B755D */ j .L802DD574 -/* 10032C 802DD23C 00000000 */ nop +/* 10032C 802DD23C 00000000 */ nop .L802DD240: /* 100330 802DD240 24026000 */ addiu $v0, $zero, 0x6000 /* 100334 802DD244 10620039 */ beq $v1, $v0, .L802DD32C @@ -87,7 +87,7 @@ glabel update_component /* 100344 802DD254 10620089 */ beq $v1, $v0, .L802DD47C /* 100348 802DD258 3083000F */ andi $v1, $a0, 0xf /* 10034C 802DD25C 080B755D */ j .L802DD574 -/* 100350 802DD260 00000000 */ nop +/* 100350 802DD260 00000000 */ nop .L802DD264: /* 100354 802DD264 24027000 */ addiu $v0, $zero, 0x7000 /* 100358 802DD268 106200B3 */ beq $v1, $v0, .L802DD538 @@ -95,20 +95,20 @@ glabel update_component /* 100360 802DD270 10620036 */ beq $v1, $v0, .L802DD34C /* 100364 802DD274 24020100 */ addiu $v0, $zero, 0x100 /* 100368 802DD278 080B755D */ j .L802DD574 -/* 10036C 802DD27C 00000000 */ nop +/* 10036C 802DD27C 00000000 */ nop .L802DD280: /* 100370 802DD280 44820000 */ mtc1 $v0, $f0 -/* 100374 802DD284 00000000 */ nop +/* 100374 802DD284 00000000 */ nop /* 100378 802DD288 46800020 */ cvt.s.w $f0, $f0 /* 10037C 802DD28C E620000C */ swc1 $f0, 0xc($s1) /* 100380 802DD290 46180032 */ c.eq.s $f0, $f24 -/* 100384 802DD294 00000000 */ nop +/* 100384 802DD294 00000000 */ nop /* 100388 802DD298 45000006 */ bc1f .L802DD2B4 /* 10038C 802DD29C 26100002 */ addiu $s0, $s0, 2 /* 100390 802DD2A0 3C01457F */ lui $at, 0x457f /* 100394 802DD2A4 3421F000 */ ori $at, $at, 0xf000 /* 100398 802DD2A8 44810000 */ mtc1 $at, $f0 -/* 10039C 802DD2AC 00000000 */ nop +/* 10039C 802DD2AC 00000000 */ nop /* 1003A0 802DD2B0 E620000C */ swc1 $f0, 0xc($s1) .L802DD2B4: /* 1003A4 802DD2B4 E6380024 */ swc1 $f24, 0x24($s1) @@ -124,7 +124,7 @@ glabel update_component .L802DD2DC: /* 1003CC 802DD2DC 96040000 */ lhu $a0, ($s0) /* 1003D0 802DD2E0 0C0B7437 */ jal _spr_sign_extend_12bit -/* 1003D4 802DD2E4 00000000 */ nop +/* 1003D4 802DD2E4 00000000 */ nop /* 1003D8 802DD2E8 8E630000 */ lw $v1, ($s3) /* 1003DC 802DD2EC 00021040 */ sll $v0, $v0, 1 /* 1003E0 802DD2F0 00628021 */ addu $s0, $v1, $v0 @@ -163,7 +163,7 @@ glabel update_component /* 100450 802DD360 10620009 */ beq $v1, $v0, .L802DD388 /* 100454 802DD364 3C04FF00 */ lui $a0, 0xff00 /* 100458 802DD368 080B755F */ j .L802DD57C -/* 10045C 802DD36C 00000000 */ nop +/* 10045C 802DD36C 00000000 */ nop .L802DD370: /* 100460 802DD370 8E220004 */ lw $v0, 4($s1) /* 100464 802DD374 3C03FFFF */ lui $v1, 0xffff @@ -187,7 +187,7 @@ glabel update_component /* 1004A4 802DD3B4 10400071 */ beqz $v0, .L802DD57C /* 1004A8 802DD3B8 26100002 */ addiu $s0, $s0, 2 /* 1004AC 802DD3BC 0460006F */ bltz $v1, .L802DD57C -/* 1004B0 802DD3C0 00000000 */ nop +/* 1004B0 802DD3C0 00000000 */ nop /* 1004B4 802DD3C4 96040000 */ lhu $a0, ($s0) /* 1004B8 802DD3C8 26100002 */ addiu $s0, $s0, 2 /* 1004BC 802DD3CC 0C0B743F */ jal _spr_sign_extend_16bit @@ -195,19 +195,19 @@ glabel update_component /* 1004C4 802DD3D4 96040000 */ lhu $a0, ($s0) /* 1004C8 802DD3D8 26100002 */ addiu $s0, $s0, 2 /* 1004CC 802DD3DC 44822000 */ mtc1 $v0, $f4 -/* 1004D0 802DD3E0 00000000 */ nop +/* 1004D0 802DD3E0 00000000 */ nop /* 1004D4 802DD3E4 46802120 */ cvt.s.w $f4, $f4 /* 1004D8 802DD3E8 0C0B743F */ jal _spr_sign_extend_16bit /* 1004DC 802DD3EC E7A40010 */ swc1 $f4, 0x10($sp) /* 1004E0 802DD3F0 96040000 */ lhu $a0, ($s0) /* 1004E4 802DD3F4 26100002 */ addiu $s0, $s0, 2 /* 1004E8 802DD3F8 44822000 */ mtc1 $v0, $f4 -/* 1004EC 802DD3FC 00000000 */ nop +/* 1004EC 802DD3FC 00000000 */ nop /* 1004F0 802DD400 46802120 */ cvt.s.w $f4, $f4 /* 1004F4 802DD404 0C0B743F */ jal _spr_sign_extend_16bit /* 1004F8 802DD408 E7A40014 */ swc1 $f4, 0x14($sp) /* 1004FC 802DD40C 44822000 */ mtc1 $v0, $f4 -/* 100500 802DD410 00000000 */ nop +/* 100500 802DD410 00000000 */ nop /* 100504 802DD414 46802120 */ cvt.s.w $f4, $f4 /* 100508 802DD418 080B755F */ j .L802DD57C /* 10050C 802DD41C E7A40018 */ swc1 $f4, 0x18($sp) @@ -219,19 +219,19 @@ glabel update_component /* 100520 802DD430 96040000 */ lhu $a0, ($s0) /* 100524 802DD434 26100002 */ addiu $s0, $s0, 2 /* 100528 802DD438 44822000 */ mtc1 $v0, $f4 -/* 10052C 802DD43C 00000000 */ nop +/* 10052C 802DD43C 00000000 */ nop /* 100530 802DD440 46802120 */ cvt.s.w $f4, $f4 /* 100534 802DD444 0C0B743F */ jal _spr_sign_extend_16bit /* 100538 802DD448 E7A4001C */ swc1 $f4, 0x1c($sp) /* 10053C 802DD44C 96040000 */ lhu $a0, ($s0) /* 100540 802DD450 26100002 */ addiu $s0, $s0, 2 /* 100544 802DD454 44822000 */ mtc1 $v0, $f4 -/* 100548 802DD458 00000000 */ nop +/* 100548 802DD458 00000000 */ nop /* 10054C 802DD45C 46802120 */ cvt.s.w $f4, $f4 /* 100550 802DD460 0C0B743F */ jal _spr_sign_extend_16bit /* 100554 802DD464 E7A40020 */ swc1 $f4, 0x20($sp) /* 100558 802DD468 44822000 */ mtc1 $v0, $f4 -/* 10055C 802DD46C 00000000 */ nop +/* 10055C 802DD46C 00000000 */ nop /* 100560 802DD470 46802120 */ cvt.s.w $f4, $f4 /* 100564 802DD474 080B755F */ j .L802DD57C /* 100568 802DD478 E7A40024 */ swc1 $f4, 0x24($sp) @@ -243,21 +243,21 @@ glabel update_component /* 10057C 802DD48C 50400005 */ beql $v0, $zero, .L802DD4A4 /* 100580 802DD490 24020002 */ addiu $v0, $zero, 2 /* 100584 802DD494 10600009 */ beqz $v1, .L802DD4BC -/* 100588 802DD498 00000000 */ nop +/* 100588 802DD498 00000000 */ nop /* 10058C 802DD49C 080B755F */ j .L802DD57C /* 100590 802DD4A0 36520004 */ ori $s2, $s2, 4 .L802DD4A4: /* 100594 802DD4A4 10620015 */ beq $v1, $v0, .L802DD4FC /* 100598 802DD4A8 24020003 */ addiu $v0, $zero, 3 /* 10059C 802DD4AC 1062001A */ beq $v1, $v0, .L802DD518 -/* 1005A0 802DD4B0 00000000 */ nop +/* 1005A0 802DD4B0 00000000 */ nop /* 1005A4 802DD4B4 080B755F */ j .L802DD57C /* 1005A8 802DD4B8 36520004 */ ori $s2, $s2, 4 .L802DD4BC: /* 1005AC 802DD4BC 96020000 */ lhu $v0, ($s0) /* 1005B0 802DD4C0 26100002 */ addiu $s0, $s0, 2 /* 1005B4 802DD4C4 44820000 */ mtc1 $v0, $f0 -/* 1005B8 802DD4C8 00000000 */ nop +/* 1005B8 802DD4C8 00000000 */ nop /* 1005BC 802DD4CC 46800020 */ cvt.s.w $f0, $f0 /* 1005C0 802DD4D0 461A0503 */ div.s $f20, $f0, $f26 /* 1005C4 802DD4D4 4600A786 */ mov.s $f30, $f20 @@ -267,7 +267,7 @@ glabel update_component /* 1005D0 802DD4E0 96020000 */ lhu $v0, ($s0) /* 1005D4 802DD4E4 26100002 */ addiu $s0, $s0, 2 /* 1005D8 802DD4E8 44820000 */ mtc1 $v0, $f0 -/* 1005DC 802DD4EC 00000000 */ nop +/* 1005DC 802DD4EC 00000000 */ nop /* 1005E0 802DD4F0 46800020 */ cvt.s.w $f0, $f0 /* 1005E4 802DD4F4 080B754C */ j .L802DD530 /* 1005E8 802DD4F8 461A0703 */ div.s $f28, $f0, $f26 @@ -275,7 +275,7 @@ glabel update_component /* 1005EC 802DD4FC 96020000 */ lhu $v0, ($s0) /* 1005F0 802DD500 26100002 */ addiu $s0, $s0, 2 /* 1005F4 802DD504 44820000 */ mtc1 $v0, $f0 -/* 1005F8 802DD508 00000000 */ nop +/* 1005F8 802DD508 00000000 */ nop /* 1005FC 802DD50C 46800020 */ cvt.s.w $f0, $f0 /* 100600 802DD510 080B754C */ j .L802DD530 /* 100604 802DD514 461A0783 */ div.s $f30, $f0, $f26 @@ -283,7 +283,7 @@ glabel update_component /* 100608 802DD518 96020000 */ lhu $v0, ($s0) /* 10060C 802DD51C 26100002 */ addiu $s0, $s0, 2 /* 100610 802DD520 44820000 */ mtc1 $v0, $f0 -/* 100614 802DD524 00000000 */ nop +/* 100614 802DD524 00000000 */ nop /* 100618 802DD528 46800020 */ cvt.s.w $f0, $f0 /* 10061C 802DD52C 461A0503 */ div.s $f20, $f0, $f26 .L802DD530: @@ -313,9 +313,9 @@ glabel update_component .L802DD57C: /* 10066C 802DD57C C620000C */ lwc1 $f0, 0xc($s1) /* 100670 802DD580 4618003E */ c.le.s $f0, $f24 -/* 100674 802DD584 00000000 */ nop +/* 100674 802DD584 00000000 */ nop /* 100678 802DD588 4501FF0B */ bc1t .L802DD1B8 -/* 10067C 802DD58C 00000000 */ nop +/* 10067C 802DD58C 00000000 */ nop .L802DD590: /* 100680 802DD590 32420001 */ andi $v0, $s2, 1 /* 100684 802DD594 10400007 */ beqz $v0, .L802DD5B4 @@ -341,7 +341,7 @@ glabel update_component /* 1006D0 802DD5E0 E624003C */ swc1 $f4, 0x3c($s1) .L802DD5E4: /* 1006D4 802DD5E4 10400004 */ beqz $v0, .L802DD5F8 -/* 1006D8 802DD5E8 00000000 */ nop +/* 1006D8 802DD5E8 00000000 */ nop /* 1006DC 802DD5EC E63C0040 */ swc1 $f28, 0x40($s1) /* 1006E0 802DD5F0 E63E0044 */ swc1 $f30, 0x44($s1) /* 1006E4 802DD5F4 E6340048 */ swc1 $f20, 0x48($s1) diff --git a/asm/nonmatchings/os/code_3c490_len_3c0/osDevMgrMain.s b/asm/nonmatchings/os/code_3c490_len_3c0/osDevMgrMain.s index 8e01c71dae..01b871779b 100644 --- a/asm/nonmatchings/os/code_3c490_len_3c0/osDevMgrMain.s +++ b/asm/nonmatchings/os/code_3c490_len_3c0/osDevMgrMain.s @@ -159,11 +159,12 @@ glabel osDevMgrMain /* 3C6D4 800612D4 2C620007 */ sltiu $v0, $v1, 7 /* 3C6D8 800612D8 10400042 */ beqz $v0, .L800613E4 /* 3C6DC 800612DC 00031080 */ sll $v0, $v1, 2 -/* 3C6E0 800612E0 3C01800A */ lui $at, %hi(D_80099B20) +/* 3C6E0 800612E0 3C01800A */ lui $at, %hi(jtbl_80099B20_74F20) /* 3C6E4 800612E4 00220821 */ addu $at, $at, $v0 -/* 3C6E8 800612E8 8C229B20 */ lw $v0, %lo(D_80099B20)($at) +/* 3C6E8 800612E8 8C229B20 */ lw $v0, %lo(jtbl_80099B20_74F20)($at) /* 3C6EC 800612EC 00400008 */ jr $v0 /* 3C6F0 800612F0 00000000 */ nop +glabel L800612F4_3C6F4 /* 3C6F4 800612F4 8E440010 */ lw $a0, 0x10($s2) /* 3C6F8 800612F8 27A5001C */ addiu $a1, $sp, 0x1c /* 3C6FC 800612FC 0C0195BC */ jal osRecvMesg @@ -177,6 +178,7 @@ glabel osDevMgrMain /* 3C71C 8006131C 00002021 */ addu $a0, $zero, $zero /* 3C720 80061320 080184FA */ j .L800613E8 /* 3C724 80061324 00000000 */ nop +glabel L80061328_3C728 /* 3C728 80061328 8E440010 */ lw $a0, 0x10($s2) /* 3C72C 8006132C 27A5001C */ addiu $a1, $sp, 0x1c /* 3C730 80061330 0C0195BC */ jal osRecvMesg @@ -190,6 +192,7 @@ glabel osDevMgrMain /* 3C750 80061350 24040001 */ addiu $a0, $zero, 1 /* 3C754 80061354 080184FA */ j .L800613E8 /* 3C758 80061358 00000000 */ nop +glabel L8006135C_3C75C /* 3C75C 8006135C 8E440010 */ lw $a0, 0x10($s2) /* 3C760 80061360 27A5001C */ addiu $a1, $sp, 0x1c /* 3C764 80061364 0C0195BC */ jal osRecvMesg @@ -205,6 +208,7 @@ glabel osDevMgrMain /* 3C78C 8006138C 00002821 */ addu $a1, $zero, $zero /* 3C790 80061390 080184FA */ j .L800613E8 /* 3C794 80061394 00000000 */ nop +glabel L80061398_3C798 /* 3C798 80061398 8E440010 */ lw $a0, 0x10($s2) /* 3C79C 8006139C 27A5001C */ addiu $a1, $sp, 0x1c /* 3C7A0 800613A0 0C0195BC */ jal osRecvMesg @@ -220,11 +224,13 @@ glabel osDevMgrMain /* 3C7C8 800613C8 24050001 */ addiu $a1, $zero, 1 /* 3C7CC 800613CC 080184FA */ j .L800613E8 /* 3C7D0 800613D0 00000000 */ nop +glabel L800613D4_3C7D4 /* 3C7D4 800613D4 8FA50018 */ lw $a1, 0x18($sp) /* 3C7D8 800613D8 8CA40004 */ lw $a0, 4($a1) /* 3C7DC 800613DC 0C019608 */ jal osSendMesg /* 3C7E0 800613E0 00003021 */ addu $a2, $zero, $zero .L800613E4: +glabel L800613E4_3C7E4 /* 3C7E4 800613E4 2402FFFF */ addiu $v0, $zero, -1 .L800613E8: /* 3C7E8 800613E8 1440FF35 */ bnez $v0, .L800610C0 diff --git a/asm/nonmatchings/os/code_3fa50_len_f60/_Putfld.s b/asm/nonmatchings/os/code_3fa50_len_f60/_Putfld.s index 2e942e7f52..cf5219b6ee 100644 --- a/asm/nonmatchings/os/code_3fa50_len_f60/_Putfld.s +++ b/asm/nonmatchings/os/code_3fa50_len_f60/_Putfld.s @@ -21,11 +21,12 @@ glabel _Putfld /* 40460 80065060 1040011A */ beqz $v0, .L800654CC /* 40464 80065064 AE00000C */ sw $zero, 0xc($s0) /* 40468 80065068 00061080 */ sll $v0, $a2, 2 -/* 4046C 8006506C 3C01800A */ lui $at, %hi(D_80099C18) +/* 4046C 8006506C 3C01800A */ lui $at, %hi(jtbl_80099C18_75018) /* 40470 80065070 00220821 */ addu $at, $at, $v0 -/* 40474 80065074 8C229C18 */ lw $v0, %lo(D_80099C18)($at) +/* 40474 80065074 8C229C18 */ lw $v0, %lo(jtbl_80099C18_75018)($at) /* 40478 80065078 00400008 */ jr $v0 /* 4047C 8006507C 00000000 */ nop +glabel L80065080_40480 /* 40480 80065080 8E04000C */ lw $a0, 0xc($s0) /* 40484 80065084 24820001 */ addiu $v0, $a0, 1 /* 40488 80065088 AE02000C */ sw $v0, 0xc($s0) @@ -39,6 +40,7 @@ glabel _Putfld /* 404A8 800650A8 01242021 */ addu $a0, $t1, $a0 /* 404AC 800650AC 08019538 */ j .L800654E0 /* 404B0 800650B0 A0820000 */ sb $v0, ($a0) +glabel L800650B4_404B4 /* 404B4 800650B4 82030034 */ lb $v1, 0x34($s0) /* 404B8 800650B8 2402006C */ addiu $v0, $zero, 0x6c /* 404BC 800650BC 1062000B */ beq $v1, $v0, .L800650EC @@ -109,6 +111,7 @@ glabel _Putfld .L800651AC: /* 405AC 800651AC 080194AA */ j .L800652A8 /* 405B0 800651B0 A0430000 */ sb $v1, ($v0) +glabel L800651B4_405B4 /* 405B4 800651B4 82030034 */ lb $v1, 0x34($s0) /* 405B8 800651B8 2402006C */ addiu $v0, $zero, 0x6c /* 405BC 800651BC 1062000B */ beq $v1, $v0, .L800651EC @@ -186,6 +189,7 @@ glabel _Putfld /* 406C0 800652C0 AC820008 */ sw $v0, 8($a0) /* 406C4 800652C4 08019538 */ j .L800654E0 /* 406C8 800652C8 00000000 */ nop +glabel L800652CC_406CC /* 406CC 800652CC 8D020000 */ lw $v0, ($t0) /* 406D0 800652D0 2403FFF8 */ addiu $v1, $zero, -8 /* 406D4 800652D4 24420007 */ addiu $v0, $v0, 7 @@ -235,6 +239,7 @@ glabel _Putfld /* 40774 80065374 AC820008 */ sw $v0, 8($a0) /* 40778 80065378 08019538 */ j .L800654E0 /* 4077C 8006537C 00000000 */ nop +glabel L80065380_40780 /* 40780 80065380 82030034 */ lb $v1, 0x34($s0) /* 40784 80065384 24020068 */ addiu $v0, $zero, 0x68 /* 40788 80065388 1462000B */ bne $v1, $v0, .L800653B8 @@ -277,6 +282,7 @@ glabel _Putfld /* 40814 80065414 8E02002C */ lw $v0, 0x2c($s0) /* 40818 80065418 08019538 */ j .L800654E0 /* 4081C 8006541C AC620000 */ sw $v0, ($v1) +glabel L80065420_40820 /* 40820 80065420 8D040000 */ lw $a0, ($t0) /* 40824 80065424 2405FFFC */ addiu $a1, $zero, -4 /* 40828 80065428 24840003 */ addiu $a0, $a0, 3 @@ -296,6 +302,7 @@ glabel _Putfld /* 40860 80065460 AC860008 */ sw $a2, 8($a0) /* 40864 80065464 08019538 */ j .L800654E0 /* 40868 80065468 00000000 */ nop +glabel L8006546C_4086C /* 4086C 8006546C 8D020000 */ lw $v0, ($t0) /* 40870 80065470 2403FFFC */ addiu $v1, $zero, -4 /* 40874 80065474 24420003 */ addiu $v0, $v0, 3 @@ -313,6 +320,7 @@ glabel _Putfld /* 408A4 800654A4 AE030014 */ sw $v1, 0x14($s0) /* 408A8 800654A8 08019538 */ j .L800654E0 /* 408AC 800654AC 00000000 */ nop +glabel L800654B0_408B0 /* 408B0 800654B0 8E02000C */ lw $v0, 0xc($s0) /* 408B4 800654B4 24430001 */ addiu $v1, $v0, 1 /* 408B8 800654B8 01221021 */ addu $v0, $t1, $v0 @@ -321,6 +329,7 @@ glabel _Putfld /* 408C4 800654C4 08019538 */ j .L800654E0 /* 408C8 800654C8 A0430000 */ sb $v1, ($v0) .L800654CC: +glabel L800654CC_408CC /* 408CC 800654CC 8E02000C */ lw $v0, 0xc($s0) /* 408D0 800654D0 24430001 */ addiu $v1, $v0, 1 /* 408D4 800654D4 01221021 */ addu $v0, $t1, $v0 diff --git a/asm/nonmatchings/os/code_45a50_len_3a0/osInitialize.s b/asm/nonmatchings/os/code_45a50_len_3a0/osInitialize.s index d61ecb5849..7af957dbd5 100644 --- a/asm/nonmatchings/os/code_45a50_len_3a0/osInitialize.s +++ b/asm/nonmatchings/os/code_45a50_len_3a0/osInitialize.s @@ -31,8 +31,8 @@ glabel osInitialize /* 45B68 8006A768 34A50008 */ ori $a1, $a1, 8 /* 45B6C 8006A76C 1440FFFA */ bnez $v0, .L8006A758 /* 45B70 8006A770 00000000 */ nop -/* 45B74 8006A774 3C028007 */ lui $v0, %hi(func_8006A9F0) -/* 45B78 8006A778 2442A9F0 */ addiu $v0, $v0, %lo(func_8006A9F0) +/* 45B74 8006A774 3C028007 */ lui $v0, %hi(D_8006A9F0) +/* 45B78 8006A778 2442A9F0 */ addiu $v0, $v0, %lo(D_8006A9F0) /* 45B7C 8006A77C 3C068000 */ lui $a2, 0x8000 /* 45B80 8006A780 8C430000 */ lw $v1, ($v0) /* 45B84 8006A784 8C440004 */ lw $a0, 4($v0) diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/load_demo_battle.s b/asm/nonmatchings/os/code_4ac90_len_3910/load_demo_battle.s index d98efcf179..1b379443b8 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/load_demo_battle.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/load_demo_battle.s @@ -70,22 +70,25 @@ glabel load_demo_battle /* 4E318 80072F18 2E220005 */ sltiu $v0, $s1, 5 /* 4E31C 80072F1C 1040002D */ beqz $v0, .L80072FD4 /* 4E320 80072F20 00111080 */ sll $v0, $s1, 2 -/* 4E324 80072F24 3C01800A */ lui $at, %hi(D_8009A578) +/* 4E324 80072F24 3C01800A */ lui $at, %hi(jtbl_8009A578_75978) /* 4E328 80072F28 00220821 */ addu $at, $at, $v0 -/* 4E32C 80072F2C 8C22A578 */ lw $v0, %lo(D_8009A578)($at) +/* 4E32C 80072F2C 8C22A578 */ lw $v0, %lo(jtbl_8009A578_75978)($at) /* 4E330 80072F30 00400008 */ jr $v0 /* 4E334 80072F34 00000000 */ nop +glabel L80072F38_4E338 /* 4E338 80072F38 0C01CB4B */ jal setup_demo_player /* 4E33C 80072F3C 24112700 */ addiu $s1, $zero, 0x2700 /* 4E340 80072F40 0000202D */ daddu $a0, $zero, $zero /* 4E344 80072F44 0801CBF8 */ j .L80072FE0 /* 4E348 80072F48 A200000A */ sb $zero, 0xa($s0) +glabel L80072F4C_4E34C /* 4E34C 80072F4C 0C01CB4B */ jal setup_demo_player /* 4E350 80072F50 24112701 */ addiu $s1, $zero, 0x2701 /* 4E354 80072F54 0000202D */ daddu $a0, $zero, $zero /* 4E358 80072F58 24020009 */ addiu $v0, $zero, 9 /* 4E35C 80072F5C 0801CBF8 */ j .L80072FE0 /* 4E360 80072F60 A2020012 */ sb $v0, 0x12($s0) +glabel L80072F64_4E364 /* 4E364 80072F64 0C01CB4B */ jal setup_demo_player /* 4E368 80072F68 24112702 */ addiu $s1, $zero, 0x2702 /* 4E36C 80072F6C 0000202D */ daddu $a0, $zero, $zero @@ -97,12 +100,14 @@ glabel load_demo_battle /* 4E384 80072F84 34420002 */ ori $v0, $v0, 2 /* 4E388 80072F88 0801CBF8 */ j .L80072FE0 /* 4E38C 80072F8C A06200AA */ sb $v0, 0xaa($v1) +glabel L80072F90_4E390 /* 4E390 80072F90 0C01CB4B */ jal setup_demo_player /* 4E394 80072F94 24112703 */ addiu $s1, $zero, 0x2703 /* 4E398 80072F98 0000202D */ daddu $a0, $zero, $zero /* 4E39C 80072F9C 24020006 */ addiu $v0, $zero, 6 /* 4E3A0 80072FA0 0801CBF8 */ j .L80072FE0 /* 4E3A4 80072FA4 A2020012 */ sb $v0, 0x12($s0) +glabel L80072FA8_4E3A8 /* 4E3A8 80072FA8 0C01CB4B */ jal setup_demo_player /* 4E3AC 80072FAC 24112704 */ addiu $s1, $zero, 0x2704 /* 4E3B0 80072FB0 0000202D */ daddu $a0, $zero, $zero @@ -129,11 +134,12 @@ glabel load_demo_battle /* 4E3FC 80072FFC 2C820005 */ sltiu $v0, $a0, 5 /* 4E400 80073000 10400049 */ beqz $v0, .L80073128 /* 4E404 80073004 00041080 */ sll $v0, $a0, 2 -/* 4E408 80073008 3C01800A */ lui $at, %hi(D_8009A590) +/* 4E408 80073008 3C01800A */ lui $at, %hi(jtbl_8009A590_75990) /* 4E40C 8007300C 00220821 */ addu $at, $at, $v0 -/* 4E410 80073010 8C22A590 */ lw $v0, %lo(D_8009A590)($at) +/* 4E410 80073010 8C22A590 */ lw $v0, %lo(jtbl_8009A590_75990)($at) /* 4E414 80073014 00400008 */ jr $v0 /* 4E418 80073018 00000000 */ nop +glabel L8007301C_4E41C /* 4E41C 8007301C 3C03800B */ lui $v1, %hi(gCurrentEncounter) /* 4E420 80073020 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) /* 4E424 80073024 3C048007 */ lui $a0, %hi(gGameStatusPtr) @@ -155,6 +161,7 @@ glabel load_demo_battle /* 4E464 80073064 34420040 */ ori $v0, $v0, 0x40 /* 4E468 80073068 0801CC4A */ j .L80073128 /* 4E46C 8007306C A06200AA */ sb $v0, 0xaa($v1) +glabel L80073070_4E470 /* 4E470 80073070 3C03800B */ lui $v1, %hi(gCurrentEncounter) /* 4E474 80073074 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) /* 4E478 80073078 24020001 */ addiu $v0, $zero, 1 @@ -164,6 +171,7 @@ glabel load_demo_battle /* 4E488 80073088 8CA5419C */ lw $a1, %lo(gGameStatusPtr)($a1) /* 4E48C 8007308C 0801CC2D */ j .L800730B4 /* 4E490 80073090 24020004 */ addiu $v0, $zero, 4 +glabel L80073094_4E494 /* 4E494 80073094 3C03800B */ lui $v1, %hi(gCurrentEncounter) /* 4E498 80073098 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) /* 4E49C 8007309C 24020001 */ addiu $v0, $zero, 1 @@ -179,6 +187,7 @@ glabel load_demo_battle /* 4E4C0 800730C0 34420010 */ ori $v0, $v0, 0x10 /* 4E4C4 800730C4 0801CC4A */ j .L80073128 /* 4E4C8 800730C8 A0A200AA */ sb $v0, 0xaa($a1) +glabel L800730CC_4E4CC /* 4E4CC 800730CC 3C03800B */ lui $v1, %hi(gCurrentEncounter) /* 4E4D0 800730D0 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) /* 4E4D4 800730D4 24020001 */ addiu $v0, $zero, 1 @@ -190,6 +199,7 @@ glabel load_demo_battle /* 4E4EC 800730EC 908200AA */ lbu $v0, 0xaa($a0) /* 4E4F0 800730F0 0801CC49 */ j .L80073124 /* 4E4F4 800730F4 34420020 */ ori $v0, $v0, 0x20 +glabel L800730F8_4E4F8 /* 4E4F8 800730F8 3C03800B */ lui $v1, %hi(gCurrentEncounter) /* 4E4FC 800730FC 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) /* 4E500 80073100 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/si/set_float_variable.s b/asm/nonmatchings/si/set_float_variable.s index 5db38ae700..ca345f0a9f 100644 --- a/asm/nonmatchings/si/set_float_variable.s +++ b/asm/nonmatchings/si/set_float_variable.s @@ -51,9 +51,9 @@ glabel set_float_variable /* ED0A0 802C86F0 00C0202D */ daddu $a0, $a2, $zero /* ED0A4 802C86F4 00041140 */ sll $v0, $a0, 5 /* ED0A8 802C86F8 44800000 */ mtc1 $zero, $f0 -/* ED0AC 802C86FC 00000000 */ nop +/* ED0AC 802C86FC 00000000 */ nop /* ED0B0 802C8700 46006032 */ c.eq.s $f12, $f0 -/* ED0B4 802C8704 00000000 */ nop +/* ED0B4 802C8704 00000000 */ nop /* ED0B8 802C8708 4501000A */ bc1t .L802C8734 /* ED0BC 802C870C 00A23023 */ subu $a2, $a1, $v0 /* ED0C0 802C8710 3C02802E */ lui $v0, %hi(gMapFlags) @@ -96,9 +96,9 @@ glabel set_float_variable /* ED140 802C8790 00C0182D */ daddu $v1, $a2, $zero /* ED144 802C8794 00031140 */ sll $v0, $v1, 5 /* ED148 802C8798 44800000 */ mtc1 $zero, $f0 -/* ED14C 802C879C 00000000 */ nop +/* ED14C 802C879C 00000000 */ nop /* ED150 802C87A0 46006032 */ c.eq.s $f12, $f0 -/* ED154 802C87A4 00000000 */ nop +/* ED154 802C87A4 00000000 */ nop /* ED158 802C87A8 45010008 */ bc1t .L802C87CC /* ED15C 802C87AC 00A23023 */ subu $a2, $a1, $v0 /* ED160 802C87B0 00031080 */ sll $v0, $v1, 2 @@ -155,7 +155,7 @@ glabel set_float_variable /* ED21C 802C886C 0240202D */ daddu $a0, $s2, $zero .L802C8870: /* ED220 802C8870 0C0B1248 */ jal fixed_var_to_float -/* ED224 802C8874 00000000 */ nop +/* ED224 802C8874 00000000 */ nop .L802C8878: /* ED228 802C8878 8FBF001C */ lw $ra, 0x1c($sp) /* ED22C 802C887C 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/si/set_variable.s b/asm/nonmatchings/si/set_variable.s index 65437ff217..30cac1a806 100644 --- a/asm/nonmatchings/si/set_variable.s +++ b/asm/nonmatchings/si/set_variable.s @@ -24,7 +24,7 @@ glabel set_variable /* ECA94 802C80E4 4600008D */ trunc.w.s $f2, $f0 /* ECA98 802C80E8 44021000 */ mfc1 $v0, $f2 /* ECA9C 802C80EC 080B2105 */ j .L802C8414 -/* ECAA0 802C80F0 00000000 */ nop +/* ECAA0 802C80F0 00000000 */ nop .L802C80F4: /* ECAA4 802C80F4 34423E00 */ ori $v0, $v0, 0x3e00 /* ECAA8 802C80F8 0050102A */ slt $v0, $v0, $s0 diff --git a/asm/nonmatchings/si/si_execute_next_command.s b/asm/nonmatchings/si/si_execute_next_command.s index 9ce5512250..7544c67d72 100644 --- a/asm/nonmatchings/si/si_execute_next_command.s +++ b/asm/nonmatchings/si/si_execute_next_command.s @@ -12,11 +12,12 @@ glabel si_execute_next_command /* EBDCC 802C741C 1040018B */ beqz $v0, .L802C7A4C /* EBDD0 802C7420 24050002 */ addiu $a1, $zero, 2 /* EBDD4 802C7424 00A31004 */ sllv $v0, $v1, $a1 -/* EBDD8 802C7428 3C01802E */ lui $at, %hi(D_802D9F20) +/* EBDD8 802C7428 3C01802E */ lui $at, %hi(jtbl_802D9F20_FE8D0) /* EBDDC 802C742C 00220821 */ addu $at, $at, $v0 -/* EBDE0 802C7430 8C229F20 */ lw $v0, %lo(D_802D9F20)($at) +/* EBDE0 802C7430 8C229F20 */ lw $v0, %lo(jtbl_802D9F20_FE8D0)($at) /* EBDE4 802C7434 00400008 */ jr $v0 -/* EBDE8 802C7438 00000000 */ nop +/* EBDE8 802C7438 00000000 */ nop +glabel L802C743C_EBDEC /* EBDEC 802C743C 8E030008 */ lw $v1, 8($s0) /* EBDF0 802C7440 24050003 */ addiu $a1, $zero, 3 /* EBDF4 802C7444 0060102D */ daddu $v0, $v1, $zero @@ -33,382 +34,476 @@ glabel si_execute_next_command /* EBE20 802C7470 A2040001 */ sb $a0, 1($s0) /* EBE24 802C7474 080B1E95 */ j .L802C7A54 /* EBE28 802C7478 AE030008 */ sw $v1, 8($s0) +glabel L802C747C_EBE2C /* EBE2C 802C747C 0C0B1266 */ jal si_handle_return /* EBE30 802C7480 0200202D */ daddu $a0, $s0, $zero /* EBE34 802C7484 080B1E95 */ j .L802C7A54 /* EBE38 802C7488 0040282D */ daddu $a1, $v0, $zero +glabel L802C748C_EBE3C /* EBE3C 802C748C 0C0B126E */ jal si_handle_label /* EBE40 802C7490 0200202D */ daddu $a0, $s0, $zero /* EBE44 802C7494 080B1E95 */ j .L802C7A54 /* EBE48 802C7498 0040282D */ daddu $a1, $v0, $zero +glabel L802C749C_EBE4C /* EBE4C 802C749C 0C0B1270 */ jal si_handle_goto /* EBE50 802C74A0 0200202D */ daddu $a0, $s0, $zero /* EBE54 802C74A4 080B1E95 */ j .L802C7A54 /* EBE58 802C74A8 0040282D */ daddu $a1, $v0, $zero +glabel L802C74AC_EBE5C /* EBE5C 802C74AC 0C0B1280 */ jal si_handle_loop /* EBE60 802C74B0 0200202D */ daddu $a0, $s0, $zero /* EBE64 802C74B4 080B1E95 */ j .L802C7A54 /* EBE68 802C74B8 0040282D */ daddu $a1, $v0, $zero +glabel L802C74BC_EBE6C /* EBE6C 802C74BC 0C0B1292 */ jal si_handle_end_loop /* EBE70 802C74C0 0200202D */ daddu $a0, $s0, $zero /* EBE74 802C74C4 080B1E95 */ j .L802C7A54 /* EBE78 802C74C8 0040282D */ daddu $a1, $v0, $zero +glabel L802C74CC_EBE7C /* EBE7C 802C74CC 0C0B12C3 */ jal si_handle_break_loop /* EBE80 802C74D0 0200202D */ daddu $a0, $s0, $zero /* EBE84 802C74D4 080B1E95 */ j .L802C7A54 /* EBE88 802C74D8 0040282D */ daddu $a1, $v0, $zero +glabel L802C74DC_EBE8C /* EBE8C 802C74DC 0C0B12D7 */ jal si_handle_sleep_frames /* EBE90 802C74E0 0200202D */ daddu $a0, $s0, $zero /* EBE94 802C74E4 080B1E95 */ j .L802C7A54 /* EBE98 802C74E8 0040282D */ daddu $a1, $v0, $zero +glabel L802C74EC_EBE9C /* EBE9C 802C74EC 0C0B12EE */ jal si_handle_sleep_seconds /* EBEA0 802C74F0 0200202D */ daddu $a0, $s0, $zero /* EBEA4 802C74F4 080B1E95 */ j .L802C7A54 /* EBEA8 802C74F8 0040282D */ daddu $a1, $v0, $zero +glabel L802C74FC_EBEAC /* EBEAC 802C74FC 0C0B1310 */ jal si_handle_if_equal /* EBEB0 802C7500 0200202D */ daddu $a0, $s0, $zero /* EBEB4 802C7504 080B1E95 */ j .L802C7A54 /* EBEB8 802C7508 0040282D */ daddu $a1, $v0, $zero +glabel L802C750C_EBEBC /* EBEBC 802C750C 0C0B1328 */ jal si_handle_if_not_equal /* EBEC0 802C7510 0200202D */ daddu $a0, $s0, $zero /* EBEC4 802C7514 080B1E95 */ j .L802C7A54 /* EBEC8 802C7518 0040282D */ daddu $a1, $v0, $zero +glabel L802C751C_EBECC /* EBECC 802C751C 0C0B1340 */ jal si_handle_if_less /* EBED0 802C7520 0200202D */ daddu $a0, $s0, $zero /* EBED4 802C7524 080B1E95 */ j .L802C7A54 /* EBED8 802C7528 0040282D */ daddu $a1, $v0, $zero +glabel L802C752C_EBEDC /* EBEDC 802C752C 0C0B1359 */ jal si_handle_if_greater /* EBEE0 802C7530 0200202D */ daddu $a0, $s0, $zero /* EBEE4 802C7534 080B1E95 */ j .L802C7A54 /* EBEE8 802C7538 0040282D */ daddu $a1, $v0, $zero +glabel L802C753C_EBEEC /* EBEEC 802C753C 0C0B1372 */ jal si_handle_if_less_equal /* EBEF0 802C7540 0200202D */ daddu $a0, $s0, $zero /* EBEF4 802C7544 080B1E95 */ j .L802C7A54 /* EBEF8 802C7548 0040282D */ daddu $a1, $v0, $zero +glabel L802C754C_EBEFC /* EBEFC 802C754C 0C0B138B */ jal si_handle_if_greater_equal /* EBF00 802C7550 0200202D */ daddu $a0, $s0, $zero /* EBF04 802C7554 080B1E95 */ j .L802C7A54 /* EBF08 802C7558 0040282D */ daddu $a1, $v0, $zero +glabel L802C755C_EBF0C /* EBF0C 802C755C 0C0B13A4 */ jal si_handle_if_flag /* EBF10 802C7560 0200202D */ daddu $a0, $s0, $zero /* EBF14 802C7564 080B1E95 */ j .L802C7A54 /* EBF18 802C7568 0040282D */ daddu $a1, $v0, $zero +glabel L802C756C_EBF1C /* EBF1C 802C756C 0C0B13BA */ jal si_handle_if_not_flag /* EBF20 802C7570 0200202D */ daddu $a0, $s0, $zero /* EBF24 802C7574 080B1E95 */ j .L802C7A54 /* EBF28 802C7578 0040282D */ daddu $a1, $v0, $zero +glabel L802C757C_EBF2C /* EBF2C 802C757C 0C0B13D0 */ jal si_handle_else /* EBF30 802C7580 0200202D */ daddu $a0, $s0, $zero /* EBF34 802C7584 080B1E95 */ j .L802C7A54 /* EBF38 802C7588 0040282D */ daddu $a1, $v0, $zero +glabel L802C758C_EBF3C /* EBF3C 802C758C 0C0B13DB */ jal si_handle_end_if /* EBF40 802C7590 0200202D */ daddu $a0, $s0, $zero /* EBF44 802C7594 080B1E95 */ j .L802C7A54 /* EBF48 802C7598 0040282D */ daddu $a1, $v0, $zero +glabel L802C759C_EBF4C /* EBF4C 802C759C 0C0B13DD */ jal si_handle_match /* EBF50 802C75A0 0200202D */ daddu $a0, $s0, $zero /* EBF54 802C75A4 080B1E95 */ j .L802C7A54 /* EBF58 802C75A8 0040282D */ daddu $a1, $v0, $zero +glabel L802C75AC_EBF5C /* EBF5C 802C75AC 0C0B13F9 */ jal si_handle_match_const /* EBF60 802C75B0 0200202D */ daddu $a0, $s0, $zero /* EBF64 802C75B4 080B1E95 */ j .L802C7A54 /* EBF68 802C75B8 0040282D */ daddu $a1, $v0, $zero +glabel L802C75BC_EBF6C /* EBF6C 802C75BC 0C0B140C */ jal si_handle_case_equal /* EBF70 802C75C0 0200202D */ daddu $a0, $s0, $zero /* EBF74 802C75C4 080B1E95 */ j .L802C7A54 /* EBF78 802C75C8 0040282D */ daddu $a1, $v0, $zero +glabel L802C75CC_EBF7C /* EBF7C 802C75CC 0C0B142F */ jal si_handle_case_not_equal /* EBF80 802C75D0 0200202D */ daddu $a0, $s0, $zero /* EBF84 802C75D4 080B1E95 */ j .L802C7A54 /* EBF88 802C75D8 0040282D */ daddu $a1, $v0, $zero +glabel L802C75DC_EBF8C /* EBF8C 802C75DC 0C0B1452 */ jal si_handle_case_less /* EBF90 802C75E0 0200202D */ daddu $a0, $s0, $zero /* EBF94 802C75E4 080B1E95 */ j .L802C7A54 /* EBF98 802C75E8 0040282D */ daddu $a1, $v0, $zero +glabel L802C75EC_EBF9C /* EBF9C 802C75EC 0C0B1476 */ jal si_handle_case_less_equal /* EBFA0 802C75F0 0200202D */ daddu $a0, $s0, $zero /* EBFA4 802C75F4 080B1E95 */ j .L802C7A54 /* EBFA8 802C75F8 0040282D */ daddu $a1, $v0, $zero +glabel L802C75FC_EBFAC /* EBFAC 802C75FC 0C0B149A */ jal si_handle_case_greater /* EBFB0 802C7600 0200202D */ daddu $a0, $s0, $zero /* EBFB4 802C7604 080B1E95 */ j .L802C7A54 /* EBFB8 802C7608 0040282D */ daddu $a1, $v0, $zero +glabel L802C760C_EBFBC /* EBFBC 802C760C 0C0B14BE */ jal si_handle_case_greater_equal /* EBFC0 802C7610 0200202D */ daddu $a0, $s0, $zero /* EBFC4 802C7614 080B1E95 */ j .L802C7A54 /* EBFC8 802C7618 0040282D */ daddu $a1, $v0, $zero +glabel L802C761C_EBFCC /* EBFCC 802C761C 0C0B1511 */ jal si_handle_case_else /* EBFD0 802C7620 0200202D */ daddu $a0, $s0, $zero /* EBFD4 802C7624 080B1E95 */ j .L802C7A54 /* EBFD8 802C7628 0040282D */ daddu $a1, $v0, $zero +glabel L802C762C_EBFDC /* EBFDC 802C762C 0C0B15B5 */ jal si_handle_break_match /* EBFE0 802C7630 0200202D */ daddu $a0, $s0, $zero /* EBFE4 802C7634 080B1E95 */ j .L802C7A54 /* EBFE8 802C7638 0040282D */ daddu $a1, $v0, $zero +glabel L802C763C_EBFEC /* EBFEC 802C763C 0C0B1546 */ jal si_handle_case_multi_or_equal /* EBFF0 802C7640 0200202D */ daddu $a0, $s0, $zero /* EBFF4 802C7644 080B1E95 */ j .L802C7A54 /* EBFF8 802C7648 0040282D */ daddu $a1, $v0, $zero +glabel L802C764C_EBFFC /* EBFFC 802C764C 0C0B1597 */ jal si_handle_end_case_multi /* EC000 802C7650 0200202D */ daddu $a0, $s0, $zero /* EC004 802C7654 080B1E95 */ j .L802C7A54 /* EC008 802C7658 0040282D */ daddu $a1, $v0, $zero +glabel L802C765C_EC00C /* EC00C 802C765C 0C0B156E */ jal si_handle_case_multi_and_equal /* EC010 802C7660 0200202D */ daddu $a0, $s0, $zero /* EC014 802C7664 080B1E95 */ j .L802C7A54 /* EC018 802C7668 0040282D */ daddu $a1, $v0, $zero +glabel L802C766C_EC01C /* EC01C 802C766C 0C0B1527 */ jal si_handle_case_flag /* EC020 802C7670 0200202D */ daddu $a0, $s0, $zero /* EC024 802C7674 080B1E95 */ j .L802C7A54 /* EC028 802C7678 0040282D */ daddu $a1, $v0, $zero +glabel L802C767C_EC02C /* EC02C 802C767C 0C0B14E2 */ jal si_handle_case_range /* EC030 802C7680 0200202D */ daddu $a0, $s0, $zero /* EC034 802C7684 080B1E95 */ j .L802C7A54 /* EC038 802C7688 0040282D */ daddu $a1, $v0, $zero +glabel L802C768C_EC03C /* EC03C 802C768C 0C0B15C6 */ jal si_handle_end_match /* EC040 802C7690 0200202D */ daddu $a0, $s0, $zero /* EC044 802C7694 080B1E95 */ j .L802C7A54 /* EC048 802C7698 0040282D */ daddu $a1, $v0, $zero +glabel L802C769C_EC04C /* EC04C 802C769C 0C0B15D1 */ jal si_handle_set_var /* EC050 802C76A0 0200202D */ daddu $a0, $s0, $zero /* EC054 802C76A4 080B1E95 */ j .L802C7A54 /* EC058 802C76A8 0040282D */ daddu $a1, $v0, $zero +glabel L802C76AC_EC05C /* EC05C 802C76AC 0C0B15E4 */ jal si_handle_set_const /* EC060 802C76B0 0200202D */ daddu $a0, $s0, $zero /* EC064 802C76B4 080B1E95 */ j .L802C7A54 /* EC068 802C76B8 0040282D */ daddu $a1, $v0, $zero +glabel L802C76BC_EC06C /* EC06C 802C76BC 0C0B15EE */ jal si_handle_set_float /* EC070 802C76C0 0200202D */ daddu $a0, $s0, $zero /* EC074 802C76C4 080B1E95 */ j .L802C7A54 /* EC078 802C76C8 0040282D */ daddu $a1, $v0, $zero +glabel L802C76CC_EC07C /* EC07C 802C76CC 0C0B1601 */ jal si_handle_add /* EC080 802C76D0 0200202D */ daddu $a0, $s0, $zero /* EC084 802C76D4 080B1E95 */ j .L802C7A54 /* EC088 802C76D8 0040282D */ daddu $a1, $v0, $zero +glabel L802C76DC_EC08C /* EC08C 802C76DC 0C0B161A */ jal si_handle_subtract /* EC090 802C76E0 0200202D */ daddu $a0, $s0, $zero /* EC094 802C76E4 080B1E95 */ j .L802C7A54 /* EC098 802C76E8 0040282D */ daddu $a1, $v0, $zero +glabel L802C76EC_EC09C /* EC09C 802C76EC 0C0B1633 */ jal si_handle_multiply /* EC0A0 802C76F0 0200202D */ daddu $a0, $s0, $zero /* EC0A4 802C76F4 080B1E95 */ j .L802C7A54 /* EC0A8 802C76F8 0040282D */ daddu $a1, $v0, $zero +glabel L802C76FC_EC0AC /* EC0AC 802C76FC 0C0B164D */ jal si_handle_divide /* EC0B0 802C7700 0200202D */ daddu $a0, $s0, $zero /* EC0B4 802C7704 080B1E95 */ j .L802C7A54 /* EC0B8 802C7708 0040282D */ daddu $a1, $v0, $zero +glabel L802C770C_EC0BC /* EC0BC 802C770C 0C0B166F */ jal si_handle_mod /* EC0C0 802C7710 0200202D */ daddu $a0, $s0, $zero /* EC0C4 802C7714 080B1E95 */ j .L802C7A54 /* EC0C8 802C7718 0040282D */ daddu $a1, $v0, $zero +glabel L802C771C_EC0CC /* EC0CC 802C771C 0C0B16A1 */ jal si_handle_addF /* EC0D0 802C7720 0200202D */ daddu $a0, $s0, $zero /* EC0D4 802C7724 080B1E95 */ j .L802C7A54 /* EC0D8 802C7728 0040282D */ daddu $a1, $v0, $zero +glabel L802C772C_EC0DC /* EC0DC 802C772C 0C0B16BB */ jal si_handle_subtractF /* EC0E0 802C7730 0200202D */ daddu $a0, $s0, $zero /* EC0E4 802C7734 080B1E95 */ j .L802C7A54 /* EC0E8 802C7738 0040282D */ daddu $a1, $v0, $zero +glabel L802C773C_EC0EC /* EC0EC 802C773C 0C0B16D5 */ jal si_handle_multiplyF /* EC0F0 802C7740 0200202D */ daddu $a0, $s0, $zero /* EC0F4 802C7744 080B1E95 */ j .L802C7A54 /* EC0F8 802C7748 0040282D */ daddu $a1, $v0, $zero +glabel L802C774C_EC0FC /* EC0FC 802C774C 0C0B16F0 */ jal si_handle_divideF /* EC100 802C7750 0200202D */ daddu $a0, $s0, $zero /* EC104 802C7754 080B1E95 */ j .L802C7A54 /* EC108 802C7758 0040282D */ daddu $a1, $v0, $zero +glabel L802C775C_EC10C /* EC10C 802C775C 0C0B170A */ jal si_handle_set_int_buffer_ptr /* EC110 802C7760 0200202D */ daddu $a0, $s0, $zero /* EC114 802C7764 080B1E95 */ j .L802C7A54 /* EC118 802C7768 0040282D */ daddu $a1, $v0, $zero +glabel L802C776C_EC11C /* EC11C 802C776C 0C0B1724 */ jal si_handle_get_1_word /* EC120 802C7770 0200202D */ daddu $a0, $s0, $zero /* EC124 802C7774 080B1E95 */ j .L802C7A54 /* EC128 802C7778 0040282D */ daddu $a1, $v0, $zero +glabel L802C777C_EC12C /* EC12C 802C777C 0C0B1731 */ jal si_handle_get_2_word /* EC130 802C7780 0200202D */ daddu $a0, $s0, $zero /* EC134 802C7784 080B1E95 */ j .L802C7A54 /* EC138 802C7788 0040282D */ daddu $a1, $v0, $zero +glabel L802C778C_EC13C /* EC13C 802C778C 0C0B174B */ jal si_handle_get_3_word /* EC140 802C7790 0200202D */ daddu $a0, $s0, $zero /* EC144 802C7794 080B1E95 */ j .L802C7A54 /* EC148 802C7798 0040282D */ daddu $a1, $v0, $zero +glabel L802C779C_EC14C /* EC14C 802C779C 0C0B176D */ jal si_handle_get_4_word /* EC150 802C77A0 0200202D */ daddu $a0, $s0, $zero /* EC154 802C77A4 080B1E95 */ j .L802C7A54 /* EC158 802C77A8 0040282D */ daddu $a1, $v0, $zero +glabel L802C77AC_EC15C /* EC15C 802C77AC 0C0B1797 */ jal si_handle_get_Nth_word /* EC160 802C77B0 0200202D */ daddu $a0, $s0, $zero /* EC164 802C77B4 080B1E95 */ j .L802C7A54 /* EC168 802C77B8 0040282D */ daddu $a1, $v0, $zero +glabel L802C77BC_EC16C /* EC16C 802C77BC 0C0B1717 */ jal si_handle_set_float_buffer_ptr /* EC170 802C77C0 0200202D */ daddu $a0, $s0, $zero /* EC174 802C77C4 080B1E95 */ j .L802C7A54 /* EC178 802C77C8 0040282D */ daddu $a1, $v0, $zero +glabel L802C77CC_EC17C /* EC17C 802C77CC 0C0B17AD */ jal si_handle_get_1_float /* EC180 802C77D0 0200202D */ daddu $a0, $s0, $zero /* EC184 802C77D4 080B1E95 */ j .L802C7A54 /* EC188 802C77D8 0040282D */ daddu $a1, $v0, $zero +glabel L802C77DC_EC18C /* EC18C 802C77DC 0C0B17C3 */ jal si_handle_get_2_float /* EC190 802C77E0 0200202D */ daddu $a0, $s0, $zero /* EC194 802C77E4 080B1E95 */ j .L802C7A54 /* EC198 802C77E8 0040282D */ daddu $a1, $v0, $zero +glabel L802C77EC_EC19C /* EC19C 802C77EC 0C0B17E7 */ jal si_handle_get_3_float /* EC1A0 802C77F0 0200202D */ daddu $a0, $s0, $zero /* EC1A4 802C77F4 080B1E95 */ j .L802C7A54 /* EC1A8 802C77F8 0040282D */ daddu $a1, $v0, $zero +glabel L802C77FC_EC1AC /* EC1AC 802C77FC 0C0B1817 */ jal si_handle_get_4_float /* EC1B0 802C7800 0200202D */ daddu $a0, $s0, $zero /* EC1B4 802C7804 080B1E95 */ j .L802C7A54 /* EC1B8 802C7808 0040282D */ daddu $a1, $v0, $zero +glabel L802C780C_EC1BC /* EC1BC 802C780C 0C0B1853 */ jal si_handle_get_Nth_float /* EC1C0 802C7810 0200202D */ daddu $a0, $s0, $zero /* EC1C4 802C7814 080B1E95 */ j .L802C7A54 /* EC1C8 802C7818 0040282D */ daddu $a1, $v0, $zero +glabel L802C781C_EC1CC /* EC1CC 802C781C 0C0B186B */ jal si_handle_set_array /* EC1D0 802C7820 0200202D */ daddu $a0, $s0, $zero /* EC1D4 802C7824 080B1E95 */ j .L802C7A54 /* EC1D8 802C7828 0040282D */ daddu $a1, $v0, $zero +glabel L802C782C_EC1DC /* EC1DC 802C782C 0C0B1878 */ jal si_handle_set_flag_array /* EC1E0 802C7830 0200202D */ daddu $a0, $s0, $zero /* EC1E4 802C7834 080B1E95 */ j .L802C7A54 /* EC1E8 802C7838 0040282D */ daddu $a1, $v0, $zero +glabel L802C783C_EC1EC /* EC1EC 802C783C 0C0B1885 */ jal si_handle_allocate_array /* EC1F0 802C7840 0200202D */ daddu $a0, $s0, $zero /* EC1F4 802C7844 080B1E95 */ j .L802C7A54 /* EC1F8 802C7848 0040282D */ daddu $a1, $v0, $zero +glabel L802C784C_EC1FC /* EC1FC 802C784C 0C0B1A1C */ jal si_handle_kill_script /* EC200 802C7850 0200202D */ daddu $a0, $s0, $zero /* EC204 802C7854 080B1E95 */ j .L802C7A54 /* EC208 802C7858 0040282D */ daddu $a1, $v0, $zero +glabel L802C785C_EC20C /* EC20C 802C785C 0C0B189C */ jal si_handle_AND /* EC210 802C7860 0200202D */ daddu $a0, $s0, $zero /* EC214 802C7864 080B1E95 */ j .L802C7A54 /* EC218 802C7868 0040282D */ daddu $a1, $v0, $zero +glabel L802C786C_EC21C /* EC21C 802C786C 0C0B18B5 */ jal si_handle_AND_const /* EC220 802C7870 0200202D */ daddu $a0, $s0, $zero /* EC224 802C7874 080B1E95 */ j .L802C7A54 /* EC228 802C7878 0040282D */ daddu $a1, $v0, $zero +glabel L802C787C_EC22C /* EC22C 802C787C 0C0B18CB */ jal si_handle_OR /* EC230 802C7880 0200202D */ daddu $a0, $s0, $zero /* EC234 802C7884 080B1E95 */ j .L802C7A54 /* EC238 802C7888 0040282D */ daddu $a1, $v0, $zero +glabel L802C788C_EC23C /* EC23C 802C788C 0C0B18E4 */ jal si_handle_OR_const /* EC240 802C7890 0200202D */ daddu $a0, $s0, $zero /* EC244 802C7894 080B1E95 */ j .L802C7A54 /* EC248 802C7898 0040282D */ daddu $a1, $v0, $zero +glabel L802C789C_EC24C /* EC24C 802C789C 0C0B18FA */ jal si_handle_call /* EC250 802C78A0 0200202D */ daddu $a0, $s0, $zero /* EC254 802C78A4 080B1E95 */ j .L802C7A54 /* EC258 802C78A8 0040282D */ daddu $a1, $v0, $zero +glabel L802C78AC_EC25C /* EC25C 802C78AC 0C0B191B */ jal si_handle_spawn_script /* EC260 802C78B0 0200202D */ daddu $a0, $s0, $zero /* EC264 802C78B4 080B1E95 */ j .L802C7A54 /* EC268 802C78B8 0040282D */ daddu $a1, $v0, $zero +glabel L802C78BC_EC26C /* EC26C 802C78BC 0C0B1949 */ jal si_handle_spawn_script_get_id /* EC270 802C78C0 0200202D */ daddu $a0, $s0, $zero /* EC274 802C78C4 080B1E95 */ j .L802C7A54 /* EC278 802C78C8 0040282D */ daddu $a1, $v0, $zero +glabel L802C78CC_EC27C /* EC27C 802C78CC 0C0B197F */ jal si_handle_await_script /* EC280 802C78D0 0200202D */ daddu $a0, $s0, $zero /* EC284 802C78D4 080B1E95 */ j .L802C7A54 /* EC288 802C78D8 0040282D */ daddu $a1, $v0, $zero +glabel L802C78DC_EC28C /* EC28C 802C78DC 0C0B19C5 */ jal si_handle_bind_trigger /* EC290 802C78E0 0200202D */ daddu $a0, $s0, $zero /* EC294 802C78E4 080B1E95 */ j .L802C7A54 /* EC298 802C78E8 0040282D */ daddu $a1, $v0, $zero +glabel L802C78EC_EC29C /* EC29C 802C78EC 0C0B1A14 */ jal si_handle_unbind /* EC2A0 802C78F0 0200202D */ daddu $a0, $s0, $zero /* EC2A4 802C78F4 080B1E95 */ j .L802C7A54 /* EC2A8 802C78F8 0040282D */ daddu $a1, $v0, $zero +glabel L802C78FC_EC2AC /* EC2AC 802C78FC 0C0B1A27 */ jal si_handle_set_priority /* EC2B0 802C7900 0200202D */ daddu $a0, $s0, $zero /* EC2B4 802C7904 080B1E95 */ j .L802C7A54 /* EC2B8 802C7908 0040282D */ daddu $a1, $v0, $zero +glabel L802C790C_EC2BC /* EC2BC 802C790C 0C0B1A36 */ jal si_handle_set_timescale /* EC2C0 802C7910 0200202D */ daddu $a0, $s0, $zero /* EC2C4 802C7914 080B1E95 */ j .L802C7A54 /* EC2C8 802C7918 0040282D */ daddu $a1, $v0, $zero +glabel L802C791C_EC2CC /* EC2CC 802C791C 0C0B1A45 */ jal si_handle_set_group /* EC2D0 802C7920 0200202D */ daddu $a0, $s0, $zero /* EC2D4 802C7924 080B1E95 */ j .L802C7A54 /* EC2D8 802C7928 0040282D */ daddu $a1, $v0, $zero +glabel L802C792C_EC2DC /* EC2DC 802C792C 0C0B1990 */ jal si_handle_jump /* EC2E0 802C7930 0200202D */ daddu $a0, $s0, $zero /* EC2E4 802C7934 080B1E95 */ j .L802C7A54 /* EC2E8 802C7938 0040282D */ daddu $a1, $v0, $zero +glabel L802C793C_EC2EC /* EC2EC 802C793C 0C0B1AD5 */ jal si_handle_bind_lock /* EC2F0 802C7940 0200202D */ daddu $a0, $s0, $zero /* EC2F4 802C7944 080B1E95 */ j .L802C7A54 /* EC2F8 802C7948 0040282D */ daddu $a1, $v0, $zero +glabel L802C794C_EC2FC /* EC2FC 802C794C 0C0B1A54 */ jal si_handle_suspend_all /* EC300 802C7950 0200202D */ daddu $a0, $s0, $zero /* EC304 802C7954 080B1E95 */ j .L802C7A54 /* EC308 802C7958 0040282D */ daddu $a1, $v0, $zero +glabel L802C795C_EC30C /* EC30C 802C795C 0C0B1A5F */ jal si_handle_resume_all /* EC310 802C7960 0200202D */ daddu $a0, $s0, $zero /* EC314 802C7964 080B1E95 */ j .L802C7A54 /* EC318 802C7968 0040282D */ daddu $a1, $v0, $zero +glabel L802C796C_EC31C /* EC31C 802C796C 0C0B1A6A */ jal si_handle_suspend_others /* EC320 802C7970 0200202D */ daddu $a0, $s0, $zero /* EC324 802C7974 080B1E95 */ j .L802C7A54 /* EC328 802C7978 0040282D */ daddu $a1, $v0, $zero +glabel L802C797C_EC32C /* EC32C 802C797C 0C0B1A79 */ jal si_handle_resume_others /* EC330 802C7980 0200202D */ daddu $a0, $s0, $zero /* EC334 802C7984 080B1E95 */ j .L802C7A54 /* EC338 802C7988 0040282D */ daddu $a1, $v0, $zero +glabel L802C798C_EC33C /* EC33C 802C798C 0C0B1A88 */ jal si_handle_suspend_script /* EC340 802C7990 0200202D */ daddu $a0, $s0, $zero /* EC344 802C7994 080B1E95 */ j .L802C7A54 /* EC348 802C7998 0040282D */ daddu $a1, $v0, $zero +glabel L802C799C_EC34C /* EC34C 802C799C 0C0B1A93 */ jal si_handle_resume_script /* EC350 802C79A0 0200202D */ daddu $a0, $s0, $zero /* EC354 802C79A4 080B1E95 */ j .L802C7A54 /* EC358 802C79A8 0040282D */ daddu $a1, $v0, $zero +glabel L802C79AC_EC35C /* EC35C 802C79AC 0C0B1A9E */ jal si_handle_does_script_exist /* EC360 802C79B0 0200202D */ daddu $a0, $s0, $zero /* EC364 802C79B4 080B1E95 */ j .L802C7A54 /* EC368 802C79B8 0040282D */ daddu $a1, $v0, $zero +glabel L802C79BC_EC36C /* EC36C 802C79BC 0C0B1B1E */ jal si_handle_spawn_thread /* EC370 802C79C0 0200202D */ daddu $a0, $s0, $zero /* EC374 802C79C4 080B1E95 */ j .L802C7A54 /* EC378 802C79C8 0040282D */ daddu $a1, $v0, $zero +glabel L802C79CC_EC37C /* EC37C 802C79CC 0C0B1B53 */ jal si_handle_end_spawn_thread /* EC380 802C79D0 0200202D */ daddu $a0, $s0, $zero /* EC384 802C79D4 080B1E95 */ j .L802C7A54 /* EC388 802C79D8 0040282D */ daddu $a1, $v0, $zero +glabel L802C79DC_EC38C /* EC38C 802C79DC 0C0B1B5B */ jal si_handle_parallel_thread /* EC390 802C79E0 0200202D */ daddu $a0, $s0, $zero /* EC394 802C79E4 080B1E95 */ j .L802C7A54 /* EC398 802C79E8 0040282D */ daddu $a1, $v0, $zero +glabel L802C79EC_EC39C /* EC39C 802C79EC 0C0B1B7D */ jal si_handle_end_parallel_thread /* EC3A0 802C79F0 0200202D */ daddu $a0, $s0, $zero /* EC3A4 802C79F4 080B1E95 */ j .L802C7A54 /* EC3A8 802C79F8 0040282D */ daddu $a1, $v0, $zero +glabel L802C79FC_EC3AC /* EC3AC 802C79FC 0C0B1B85 */ jal func_802C6E14 /* EC3B0 802C7A00 0200202D */ daddu $a0, $s0, $zero /* EC3B4 802C7A04 080B1E95 */ j .L802C7A54 /* EC3B8 802C7A08 0040282D */ daddu $a1, $v0, $zero +glabel L802C7A0C_EC3BC /* EC3BC 802C7A0C 0C0B1B87 */ jal si_handle_print_debug_var /* EC3C0 802C7A10 0200202D */ daddu $a0, $s0, $zero /* EC3C4 802C7A14 080B1E95 */ j .L802C7A54 /* EC3C8 802C7A18 0040282D */ daddu $a1, $v0, $zero +glabel L802C7A1C_EC3CC /* EC3CC 802C7A1C 0C0B1CE7 */ jal func_802C739C /* EC3D0 802C7A20 0200202D */ daddu $a0, $s0, $zero /* EC3D4 802C7A24 080B1E95 */ j .L802C7A54 /* EC3D8 802C7A28 0040282D */ daddu $a1, $v0, $zero +glabel L802C7A2C_EC3DC /* EC3DC 802C7A2C 0C0B1CEC */ jal func_802C73B0 /* EC3E0 802C7A30 0200202D */ daddu $a0, $s0, $zero /* EC3E4 802C7A34 080B1E95 */ j .L802C7A54 /* EC3E8 802C7A38 0040282D */ daddu $a1, $v0, $zero +glabel L802C7A3C_EC3EC /* EC3EC 802C7A3C 0C0B1CEE */ jal func_802C73B8 /* EC3F0 802C7A40 0200202D */ daddu $a0, $s0, $zero /* EC3F4 802C7A44 080B1E95 */ j .L802C7A54 /* EC3F8 802C7A48 0040282D */ daddu $a1, $v0, $zero .L802C7A4C: /* EC3FC 802C7A4C 080B1E93 */ j .L802C7A4C -/* EC400 802C7A50 00000000 */ nop +/* EC400 802C7A50 00000000 */ nop .L802C7A54: +glabel L802C7A54_EC404 /* EC404 802C7A54 24020003 */ addiu $v0, $zero, 3 /* EC408 802C7A58 10A2FE6E */ beq $a1, $v0, .L802C7414 /* EC40C 802C7A5C 240200FF */ addiu $v0, $zero, 0xff @@ -424,13 +519,13 @@ glabel si_execute_next_command /* EC434 802C7A84 A2000002 */ sb $zero, 2($s0) .L802C7A88: /* EC438 802C7A88 14A2FE62 */ bne $a1, $v0, .L802C7414 -/* EC43C 802C7A8C 00000000 */ nop +/* EC43C 802C7A8C 00000000 */ nop /* EC440 802C7A90 A2000002 */ sb $zero, 2($s0) /* EC444 802C7A94 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* EC448 802C7A98 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* EC44C 802C7A9C 80420078 */ lb $v0, 0x78($v0) /* EC450 802C7AA0 1445FE5C */ bne $v0, $a1, .L802C7414 -/* EC454 802C7AA4 00000000 */ nop +/* EC454 802C7AA4 00000000 */ nop .L802C7AA8: /* EC458 802C7AA8 0000102D */ daddu $v0, $zero, $zero .L802C7AAC: diff --git a/asm/nonmatchings/si/si_goto_end_case.s b/asm/nonmatchings/si/si_goto_end_case.s index 31dcf6caf4..317f509e96 100644 --- a/asm/nonmatchings/si/si_goto_end_case.s +++ b/asm/nonmatchings/si/si_goto_end_case.s @@ -19,7 +19,7 @@ glabel si_goto_end_case /* ED3C0 802C8A10 00C23021 */ addu $a2, $a2, $v0 /* ED3C4 802C8A14 28620015 */ slti $v0, $v1, 0x15 /* ED3C8 802C8A18 10400005 */ beqz $v0, .L802C8A30 -/* ED3CC 802C8A1C 00000000 */ nop +/* ED3CC 802C8A1C 00000000 */ nop /* ED3D0 802C8A20 10680007 */ beq $v1, $t0, .L802C8A40 /* ED3D4 802C8A24 00C0202D */ daddu $a0, $a2, $zero /* ED3D8 802C8A28 080B2280 */ j .L802C8A00 @@ -31,7 +31,7 @@ glabel si_goto_end_case /* ED3EC 802C8A3C 00C0202D */ daddu $a0, $a2, $zero .L802C8A40: /* ED3F0 802C8A40 080B2290 */ j .L802C8A40 -/* ED3F4 802C8A44 00000000 */ nop +/* ED3F4 802C8A44 00000000 */ nop .L802C8A48: /* ED3F8 802C8A48 080B227E */ j .L802C89F8 /* ED3FC 802C8A4C 24A50001 */ addiu $a1, $a1, 1 diff --git a/asm/nonmatchings/si/si_goto_end_loop.s b/asm/nonmatchings/si/si_goto_end_loop.s index 10bd005521..699252e99f 100644 --- a/asm/nonmatchings/si/si_goto_end_loop.s +++ b/asm/nonmatchings/si/si_goto_end_loop.s @@ -17,24 +17,24 @@ glabel si_goto_end_loop /* ED4C0 802C8B10 00621821 */ addu $v1, $v1, $v0 /* ED4C4 802C8B14 28820006 */ slti $v0, $a0, 6 /* ED4C8 802C8B18 10400005 */ beqz $v0, .L802C8B30 -/* ED4CC 802C8B1C 00000000 */ nop +/* ED4CC 802C8B1C 00000000 */ nop /* ED4D0 802C8B20 10870007 */ beq $a0, $a3, .L802C8B40 -/* ED4D4 802C8B24 00000000 */ nop +/* ED4D4 802C8B24 00000000 */ nop /* ED4D8 802C8B28 080B22BE */ j .L802C8AF8 -/* ED4DC 802C8B2C 00000000 */ nop +/* ED4DC 802C8B2C 00000000 */ nop .L802C8B30: /* ED4E0 802C8B30 50860005 */ beql $a0, $a2, .L802C8B48 /* ED4E4 802C8B34 24A5FFFF */ addiu $a1, $a1, -1 /* ED4E8 802C8B38 080B22BE */ j .L802C8AF8 -/* ED4EC 802C8B3C 00000000 */ nop +/* ED4EC 802C8B3C 00000000 */ nop .L802C8B40: /* ED4F0 802C8B40 080B22D0 */ j .L802C8B40 -/* ED4F4 802C8B44 00000000 */ nop +/* ED4F4 802C8B44 00000000 */ nop .L802C8B48: /* ED4F8 802C8B48 04A1FFEB */ bgez $a1, .L802C8AF8 /* ED4FC 802C8B4C 0060102D */ daddu $v0, $v1, $zero /* ED500 802C8B50 03E00008 */ jr $ra -/* ED504 802C8B54 00000000 */ nop +/* ED504 802C8B54 00000000 */ nop .L802C8B58: /* ED508 802C8B58 080B22BE */ j .L802C8AF8 /* ED50C 802C8B5C 24A50001 */ addiu $a1, $a1, 1 diff --git a/asm/nonmatchings/si/si_goto_next_case.s b/asm/nonmatchings/si/si_goto_next_case.s index a7556889ff..39e161ef26 100644 --- a/asm/nonmatchings/si/si_goto_next_case.s +++ b/asm/nonmatchings/si/si_goto_next_case.s @@ -23,10 +23,10 @@ glabel si_goto_next_case /* ED450 802C8AA0 00481021 */ addu $v0, $v0, $t0 /* ED454 802C8AA4 8C420000 */ lw $v0, ($v0) /* ED458 802C8AA8 00400008 */ jr $v0 -/* ED45C 802C8AAC 00000000 */ nop +/* ED45C 802C8AAC 00000000 */ nop .L802C8AB0: /* ED460 802C8AB0 080B22AC */ j .L802C8AB0 -/* ED464 802C8AB4 00000000 */ nop +/* ED464 802C8AB4 00000000 */ nop /* ED468 802C8AB8 080B229D */ j .L802C8A74 /* ED46C 802C8ABC 24A50001 */ addiu $a1, $a1, 1 /* ED470 802C8AC0 24A5FFFF */ addiu $a1, $a1, -1 diff --git a/asm/nonmatchings/si/si_handle_print_debug_var.s b/asm/nonmatchings/si/si_handle_print_debug_var.s index d2ba67f805..271c85067a 100644 --- a/asm/nonmatchings/si/si_handle_print_debug_var.s +++ b/asm/nonmatchings/si/si_handle_print_debug_var.s @@ -37,7 +37,7 @@ glabel si_handle_print_debug_var /* EB848 802C6E98 0C01953C */ jal sprintf /* EB84C 802C6E9C 24A59DA8 */ addiu $a1, $a1, %lo(D_802D9DA8) /* EB850 802C6EA0 080B1CE0 */ j .L802C7380 -/* EB854 802C6EA4 00000000 */ nop +/* EB854 802C6EA4 00000000 */ nop .L802C6EA8: /* EB858 802C6EA8 34423E00 */ ori $v0, $v0, 0x3e00 /* EB85C 802C6EAC 0050102A */ slt $v0, $v0, $s0 @@ -88,7 +88,7 @@ glabel si_handle_print_debug_var /* EB908 802C6F58 00E0302D */ daddu $a2, $a3, $zero .L802C6F5C: /* EB90C 802C6F5C 1440000A */ bnez $v0, .L802C6F88 -/* EB910 802C6F60 00000000 */ nop +/* EB910 802C6F60 00000000 */ nop /* EB914 802C6F64 0C0B1248 */ jal fixed_var_to_float /* EB918 802C6F68 00E0202D */ daddu $a0, $a3, $zero /* EB91C 802C6F6C 46000021 */ cvt.d.s $f0, $f0 @@ -126,7 +126,7 @@ glabel si_handle_print_debug_var /* EB994 802C6FE4 00E0302D */ daddu $a2, $a3, $zero .L802C6FE8: /* EB998 802C6FE8 1440000A */ bnez $v0, .L802C7014 -/* EB99C 802C6FEC 00000000 */ nop +/* EB99C 802C6FEC 00000000 */ nop /* EB9A0 802C6FF0 0C0B1248 */ jal fixed_var_to_float /* EB9A4 802C6FF4 00E0202D */ daddu $a0, $a3, $zero /* EB9A8 802C6FF8 46000021 */ cvt.d.s $f0, $f0 @@ -164,7 +164,7 @@ glabel si_handle_print_debug_var /* EBA20 802C7070 00E0302D */ daddu $a2, $a3, $zero .L802C7074: /* EBA24 802C7074 1440000A */ bnez $v0, .L802C70A0 -/* EBA28 802C7078 00000000 */ nop +/* EBA28 802C7078 00000000 */ nop /* EBA2C 802C707C 0C0B1248 */ jal fixed_var_to_float /* EBA30 802C7080 00E0202D */ daddu $a0, $a3, $zero /* EBA34 802C7084 46000021 */ cvt.d.s $f0, $f0 @@ -215,7 +215,7 @@ glabel si_handle_print_debug_var /* EBAD8 802C7128 0C01953C */ jal sprintf /* EBADC 802C712C 0040382D */ daddu $a3, $v0, $zero /* EBAE0 802C7130 080B1CE0 */ j .L802C7380 -/* EBAE4 802C7134 00000000 */ nop +/* EBAE4 802C7134 00000000 */ nop .L802C7138: /* EBAE8 802C7138 34424C00 */ ori $v0, $v0, 0x4c00 /* EBAEC 802C713C 0050102A */ slt $v0, $v0, $s0 @@ -274,7 +274,7 @@ glabel si_handle_print_debug_var /* EBBB0 802C7200 0C01953C */ jal sprintf /* EBBB4 802C7204 00473824 */ and $a3, $v0, $a3 /* EBBB8 802C7208 080B1CE0 */ j .L802C7380 -/* EBBBC 802C720C 00000000 */ nop +/* EBBBC 802C720C 00000000 */ nop .L802C7210: /* EBBC0 802C7210 3442A600 */ ori $v0, $v0, 0xa600 /* EBBC4 802C7214 0050102A */ slt $v0, $v0, $s0 @@ -303,7 +303,7 @@ glabel si_handle_print_debug_var /* EBC1C 802C726C 34421100 */ ori $v0, $v0, 0x1100 /* EBC20 802C7270 0047102A */ slt $v0, $v0, $a3 /* EBC24 802C7274 1440000A */ bnez $v0, .L802C72A0 -/* EBC28 802C7278 00000000 */ nop +/* EBC28 802C7278 00000000 */ nop /* EBC2C 802C727C 0C0B1248 */ jal fixed_var_to_float /* EBC30 802C7280 00E0202D */ daddu $a0, $a3, $zero /* EBC34 802C7284 46000021 */ cvt.d.s $f0, $f0 @@ -345,7 +345,7 @@ glabel si_handle_print_debug_var /* EBCB8 802C7308 34421100 */ ori $v0, $v0, 0x1100 /* EBCBC 802C730C 0047102A */ slt $v0, $v0, $a3 /* EBCC0 802C7310 1440000D */ bnez $v0, .L802C7348 -/* EBCC4 802C7314 00000000 */ nop +/* EBCC4 802C7314 00000000 */ nop /* EBCC8 802C7318 0C0B1248 */ jal fixed_var_to_float /* EBCCC 802C731C 00E0202D */ daddu $a0, $a3, $zero /* EBCD0 802C7320 46000021 */ cvt.d.s $f0, $f0 @@ -358,7 +358,7 @@ glabel si_handle_print_debug_var /* EBCE8 802C7338 0C01953C */ jal sprintf /* EBCEC 802C733C 0200302D */ daddu $a2, $s0, $zero /* EBCF0 802C7340 080B1CE0 */ j .L802C7380 -/* EBCF4 802C7344 00000000 */ nop +/* EBCF4 802C7344 00000000 */ nop .L802C7348: /* EBCF8 802C7348 3C04802E */ lui $a0, %hi(D_802DACA0) /* EBCFC 802C734C 2484ACA0 */ addiu $a0, $a0, %lo(D_802DACA0) @@ -368,7 +368,7 @@ glabel si_handle_print_debug_var /* EBD08 802C7358 0C01953C */ jal sprintf /* EBD0C 802C735C 0200302D */ daddu $a2, $s0, $zero /* EBD10 802C7360 080B1CE0 */ j .L802C7380 -/* EBD14 802C7364 00000000 */ nop +/* EBD14 802C7364 00000000 */ nop .L802C7368: /* EBD18 802C7368 3C04802E */ lui $a0, %hi(D_802DACA0) /* EBD1C 802C736C 2484ACA0 */ addiu $a0, $a0, %lo(D_802DACA0) @@ -376,7 +376,7 @@ glabel si_handle_print_debug_var /* EBD24 802C7374 24A59F10 */ addiu $a1, $a1, %lo(D_802D9F10) .L802C7378: /* EBD28 802C7378 0C01953C */ jal sprintf -/* EBD2C 802C737C 00000000 */ nop +/* EBD2C 802C737C 00000000 */ nop .L802C7380: /* EBD30 802C7380 8FBF0024 */ lw $ra, 0x24($sp) /* EBD34 802C7384 8FB20020 */ lw $s2, 0x20($sp) diff --git a/asm/nonmatchings/si/si_skip_else.s b/asm/nonmatchings/si/si_skip_else.s index ff08c0c827..f78a0e05db 100644 --- a/asm/nonmatchings/si/si_skip_else.s +++ b/asm/nonmatchings/si/si_skip_else.s @@ -20,14 +20,14 @@ glabel si_skip_else /* ED360 802C89B0 00461021 */ addu $v0, $v0, $a2 /* ED364 802C89B4 8C420000 */ lw $v0, ($v0) /* ED368 802C89B8 00400008 */ jr $v0 -/* ED36C 802C89BC 00000000 */ nop +/* ED36C 802C89BC 00000000 */ nop .L802C89C0: /* ED370 802C89C0 080B2270 */ j .L802C89C0 -/* ED374 802C89C4 00000000 */ nop +/* ED374 802C89C4 00000000 */ nop /* ED378 802C89C8 24A5FFFF */ addiu $a1, $a1, -1 /* ED37C 802C89CC 04A1FFEE */ bgez $a1, .L802C8988 /* ED380 802C89D0 0080102D */ daddu $v0, $a0, $zero /* ED384 802C89D4 03E00008 */ jr $ra -/* ED388 802C89D8 00000000 */ nop +/* ED388 802C89D8 00000000 */ nop /* ED38C 802C89DC 080B2262 */ j .L802C8988 /* ED390 802C89E0 24A50001 */ addiu $a1, $a1, 1 diff --git a/asm/nonmatchings/si/si_skip_if.s b/asm/nonmatchings/si/si_skip_if.s index c37530e82b..06bf23559a 100644 --- a/asm/nonmatchings/si/si_skip_if.s +++ b/asm/nonmatchings/si/si_skip_if.s @@ -20,18 +20,18 @@ glabel si_skip_if /* ED2E4 802C8934 00461021 */ addu $v0, $v0, $a2 /* ED2E8 802C8938 8C420000 */ lw $v0, ($v0) /* ED2EC 802C893C 00400008 */ jr $v0 -/* ED2F0 802C8940 00000000 */ nop +/* ED2F0 802C8940 00000000 */ nop .L802C8944: /* ED2F4 802C8944 080B2251 */ j .L802C8944 -/* ED2F8 802C8948 00000000 */ nop +/* ED2F8 802C8948 00000000 */ nop /* ED2FC 802C894C 24A5FFFF */ addiu $a1, $a1, -1 /* ED300 802C8950 04A1FFEE */ bgez $a1, .L802C890C /* ED304 802C8954 0080102D */ daddu $v0, $a0, $zero /* ED308 802C8958 03E00008 */ jr $ra -/* ED30C 802C895C 00000000 */ nop +/* ED30C 802C895C 00000000 */ nop /* ED310 802C8960 080B2243 */ j .L802C890C /* ED314 802C8964 24A50001 */ addiu $a1, $a1, 1 /* ED318 802C8968 14A0FFE8 */ bnez $a1, .L802C890C /* ED31C 802C896C 0080102D */ daddu $v0, $a0, $zero /* ED320 802C8970 03E00008 */ jr $ra -/* ED324 802C8974 00000000 */ nop +/* ED324 802C8974 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240000_BDD1B0.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240000_BDD1B0.s index 960e6b92ef..b2054731c6 100644 --- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240000_BDD1B0.s +++ b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240000_BDD1B0.s @@ -42,9 +42,9 @@ glabel func_80240000_BDD1B0 /* BDD244 80240094 D4221AE0 */ ldc1 $f2, %lo(func_80241AE0_9F6520)($at) /* BDD248 80240098 46000021 */ cvt.d.s $f0, $f0 /* BDD24C 8024009C 4622003C */ c.lt.d $f0, $f2 -/* BDD250 802400A0 00000000 */ nop +/* BDD250 802400A0 00000000 */ nop /* BDD254 802400A4 45000003 */ bc1f .L802400B4 -/* BDD258 802400A8 00000000 */ nop +/* BDD258 802400A8 00000000 */ nop /* BDD25C 802400AC 3C0142B4 */ lui $at, 0x42b4 /* BDD260 802400B0 4481A000 */ mtc1 $at, $f20 .L802400B4: @@ -64,7 +64,7 @@ glabel func_80240000_BDD1B0 /* BDD298 802400E8 D4221AE8 */ ldc1 $f2, %lo(D_80241AE8)($at) /* BDD29C 802400EC 46000021 */ cvt.d.s $f0, $f0 /* BDD2A0 802400F0 4620103C */ c.lt.d $f2, $f0 -/* BDD2A4 802400F4 00000000 */ nop +/* BDD2A4 802400F4 00000000 */ nop /* BDD2A8 802400F8 45030001 */ bc1tl .L80240100 /* BDD2AC 802400FC 0000802D */ daddu $s0, $zero, $zero .L80240100: @@ -76,7 +76,7 @@ glabel func_80240000_BDD1B0 /* BDD2C4 80240114 44811000 */ mtc1 $at, $f2 /* BDD2C8 80240118 46000005 */ abs.s $f0, $f0 /* BDD2CC 8024011C 4600103E */ c.le.s $f2, $f0 -/* BDD2D0 80240120 00000000 */ nop +/* BDD2D0 80240120 00000000 */ nop /* BDD2D4 80240124 45030001 */ bc1tl .L8024012C /* BDD2D8 80240128 0000802D */ daddu $s0, $zero, $zero .L8024012C: diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_802401D4_BDD384.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_802401D4_BDD384.s index 6436b9e349..f7085ded65 100644 --- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_802401D4_BDD384.s +++ b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_802401D4_BDD384.s @@ -25,7 +25,7 @@ glabel func_802401D4_BDD384 /* BDD3D4 80240224 D4221AF0 */ ldc1 $f2, %lo(func_80241AF0_A6FED0)($at) /* BDD3D8 80240228 46000021 */ cvt.d.s $f0, $f0 /* BDD3DC 8024022C 46220002 */ mul.d $f0, $f0, $f2 -/* BDD3E0 80240230 00000000 */ nop +/* BDD3E0 80240230 00000000 */ nop /* BDD3E4 80240234 0280202D */ daddu $a0, $s4, $zero /* BDD3E8 80240238 AFA00010 */ sw $zero, 0x10($sp) /* BDD3EC 8024023C 8E470010 */ lw $a3, 0x10($s2) @@ -47,7 +47,7 @@ glabel func_802401D4_BDD384 /* BDD42C 8024027C 3C01C1A0 */ lui $at, 0xc1a0 /* BDD430 80240280 44812000 */ mtc1 $at, $f4 /* BDD434 80240284 44823000 */ mtc1 $v0, $f6 -/* BDD438 80240288 00000000 */ nop +/* BDD438 80240288 00000000 */ nop /* BDD43C 8024028C 468031A0 */ cvt.s.w $f6, $f6 /* BDD440 80240290 44073000 */ mfc1 $a3, $f6 /* BDD444 80240294 2402000F */ addiu $v0, $zero, 0xf diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240304_BDD4B4.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240304_BDD4B4.s index d6535fb50d..b053f8e89b 100644 --- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240304_BDD4B4.s +++ b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240304_BDD4B4.s @@ -17,7 +17,7 @@ glabel func_80240304_BDD4B4 /* BDD4E4 80240334 A602008E */ sh $v0, 0x8e($s0) /* BDD4E8 80240338 00021400 */ sll $v0, $v0, 0x10 /* BDD4EC 8024033C 1C400012 */ bgtz $v0, .L80240388 -/* BDD4F0 80240340 00000000 */ nop +/* BDD4F0 80240340 00000000 */ nop /* BDD4F4 80240344 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* BDD4F8 80240348 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* BDD4FC 8024034C C60C0038 */ lwc1 $f12, 0x38($s0) diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_802403A0_BDD550.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_802403A0_BDD550.s index 4930e6e2c3..dafb6fdc6f 100644 --- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_802403A0_BDD550.s +++ b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_802403A0_BDD550.s @@ -16,7 +16,7 @@ glabel func_802403A0_BDD550 /* BDD57C 802403CC A602008E */ sh $v0, 0x8e($s0) /* BDD580 802403D0 00021400 */ sll $v0, $v0, 0x10 /* BDD584 802403D4 1C40000F */ bgtz $v0, .L80240414 -/* BDD588 802403D8 00000000 */ nop +/* BDD588 802403D8 00000000 */ nop /* BDD58C 802403DC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* BDD590 802403E0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* BDD594 802403E4 C60C0038 */ lwc1 $f12, 0x38($s0) diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240428_BDD5D8.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240428_BDD5D8.s index 0d5bfb5781..1a9de6038e 100644 --- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240428_BDD5D8.s +++ b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240428_BDD5D8.s @@ -16,7 +16,7 @@ glabel func_80240428_BDD5D8 /* BDD604 80240454 0040802D */ daddu $s0, $v0, $zero /* BDD608 80240458 C60C000C */ lwc1 $f12, 0xc($s0) /* BDD60C 8024045C 44820000 */ mtc1 $v0, $f0 -/* BDD610 80240460 00000000 */ nop +/* BDD610 80240460 00000000 */ nop /* BDD614 80240464 46800020 */ cvt.s.w $f0, $f0 /* BDD618 80240468 46006300 */ add.s $f12, $f12, $f0 /* BDD61C 8024046C 3C0142B4 */ lui $at, 0x42b4 diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_802404D0_BDD680.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_802404D0_BDD680.s index 0dde830877..600061f785 100644 --- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_802404D0_BDD680.s +++ b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_802404D0_BDD680.s @@ -22,7 +22,7 @@ glabel func_802404D0_BDD680 /* BDD6C4 80240514 0C01242D */ jal func_800490B4 /* BDD6C8 80240518 0040802D */ daddu $s0, $v0, $zero /* BDD6CC 8024051C 1040000B */ beqz $v0, .L8024054C -/* BDD6D0 80240520 00000000 */ nop +/* BDD6D0 80240520 00000000 */ nop /* BDD6D4 80240524 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* BDD6D8 80240528 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* BDD6DC 8024052C C60C0038 */ lwc1 $f12, 0x38($s0) @@ -39,7 +39,7 @@ glabel func_802404D0_BDD680 /* BDD704 80240554 A602008E */ sh $v0, 0x8e($s0) /* BDD708 80240558 00021400 */ sll $v0, $v0, 0x10 /* BDD70C 8024055C 1C400032 */ bgtz $v0, .L80240628 -/* BDD710 80240560 00000000 */ nop +/* BDD710 80240560 00000000 */ nop /* BDD714 80240564 8E620074 */ lw $v0, 0x74($s3) /* BDD718 80240568 2442FFFF */ addiu $v0, $v0, -1 /* BDD71C 8024056C 18400014 */ blez $v0, .L802405C0 @@ -77,7 +77,7 @@ glabel func_802404D0_BDD680 /* BDD798 802405E8 2402000C */ addiu $v0, $zero, 0xc /* BDD79C 802405EC AFA2001C */ sw $v0, 0x1c($sp) /* BDD7A0 802405F0 44833000 */ mtc1 $v1, $f6 -/* BDD7A4 802405F4 00000000 */ nop +/* BDD7A4 802405F4 00000000 */ nop /* BDD7A8 802405F8 468031A0 */ cvt.s.w $f6, $f6 /* BDD7AC 802405FC 44073000 */ mfc1 $a3, $f6 /* BDD7B0 80240600 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240694_BDD844.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240694_BDD844.s index 534235290f..ef4ddd718f 100644 --- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240694_BDD844.s +++ b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240694_BDD844.s @@ -55,23 +55,23 @@ glabel func_80240694_BDD844 /* BDD908 80240758 A602008E */ sh $v0, 0x8e($s0) /* BDD90C 8024075C 00021400 */ sll $v0, $v0, 0x10 /* BDD910 80240760 1C40002C */ bgtz $v0, .L80240814 -/* BDD914 80240764 00000000 */ nop +/* BDD914 80240764 00000000 */ nop /* BDD918 80240768 C6000038 */ lwc1 $f0, 0x38($s0) /* BDD91C 8024076C 4600010D */ trunc.w.s $f4, $f0 /* BDD920 80240770 44022000 */ mfc1 $v0, $f4 -/* BDD924 80240774 00000000 */ nop +/* BDD924 80240774 00000000 */ nop /* BDD928 80240778 A6220010 */ sh $v0, 0x10($s1) /* BDD92C 8024077C C600003C */ lwc1 $f0, 0x3c($s0) /* BDD930 80240780 4600010D */ trunc.w.s $f4, $f0 /* BDD934 80240784 44022000 */ mfc1 $v0, $f4 -/* BDD938 80240788 00000000 */ nop +/* BDD938 80240788 00000000 */ nop /* BDD93C 8024078C A6220012 */ sh $v0, 0x12($s1) /* BDD940 80240790 C6000040 */ lwc1 $f0, 0x40($s0) /* BDD944 80240794 24020001 */ addiu $v0, $zero, 1 /* BDD948 80240798 A2220007 */ sb $v0, 7($s1) /* BDD94C 8024079C 4600010D */ trunc.w.s $f4, $f0 /* BDD950 802407A0 44022000 */ mfc1 $v0, $f4 -/* BDD954 802407A4 00000000 */ nop +/* BDD954 802407A4 00000000 */ nop /* BDD958 802407A8 A6220014 */ sh $v0, 0x14($s1) /* BDD95C 802407AC C6800018 */ lwc1 $f0, 0x18($s4) /* BDD960 802407B0 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -89,7 +89,7 @@ glabel func_80240694_BDD844 /* BDD990 802407E0 46220000 */ add.d $f0, $f0, $f2 /* BDD994 802407E4 4620010D */ trunc.w.d $f4, $f0 /* BDD998 802407E8 44022000 */ mfc1 $v0, $f4 -/* BDD99C 802407EC 00000000 */ nop +/* BDD99C 802407EC 00000000 */ nop /* BDD9A0 802407F0 A602008E */ sh $v0, 0x8e($s0) /* BDD9A4 802407F4 00021400 */ sll $v0, $v0, 0x10 /* BDD9A8 802407F8 00021403 */ sra $v0, $v0, 0x10 diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240834_BDD9E4.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240834_BDD9E4.s index d22491cc9a..b27a1f3127 100644 --- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240834_BDD9E4.s +++ b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240834_BDD9E4.s @@ -55,13 +55,13 @@ glabel func_80240834_BDD9E4 /* BDDAAC 802408FC 860200A8 */ lh $v0, 0xa8($s0) /* BDDAB0 80240900 27A50020 */ addiu $a1, $sp, 0x20 /* BDDAB4 80240904 44820000 */ mtc1 $v0, $f0 -/* BDDAB8 80240908 00000000 */ nop +/* BDDAB8 80240908 00000000 */ nop /* BDDABC 8024090C 46800020 */ cvt.s.w $f0, $f0 /* BDDAC0 80240910 E7A00018 */ swc1 $f0, 0x18($sp) /* BDDAC4 80240914 860200A6 */ lh $v0, 0xa6($s0) /* BDDAC8 80240918 27A60024 */ addiu $a2, $sp, 0x24 /* BDDACC 8024091C 44820000 */ mtc1 $v0, $f0 -/* BDDAD0 80240920 00000000 */ nop +/* BDDAD0 80240920 00000000 */ nop /* BDDAD4 80240924 46800020 */ cvt.s.w $f0, $f0 /* BDDAD8 80240928 E7A0001C */ swc1 $f0, 0x1c($sp) /* BDDADC 8024092C 8E040080 */ lw $a0, 0x80($s0) diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240984_BDDB34.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240984_BDDB34.s index f0e68e9f22..c35a2fc9d3 100644 --- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240984_BDDB34.s +++ b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240984_BDDB34.s @@ -18,14 +18,14 @@ glabel func_80240984_BDDB34 /* BDDB68 802409B8 A462008E */ sh $v0, 0x8e($v1) /* BDDB6C 802409BC 00021400 */ sll $v0, $v0, 0x10 /* BDDB70 802409C0 1C400015 */ bgtz $v0, .L80240A18 -/* BDDB74 802409C4 00000000 */ nop +/* BDDB74 802409C4 00000000 */ nop /* BDDB78 802409C8 8E0200CC */ lw $v0, 0xcc($s0) /* BDDB7C 802409CC 8C420004 */ lw $v0, 4($v0) /* BDDB80 802409D0 AC620028 */ sw $v0, 0x28($v1) /* BDDB84 802409D4 8E0200D0 */ lw $v0, 0xd0($s0) /* BDDB88 802409D8 8C420014 */ lw $v0, 0x14($v0) /* BDDB8C 802409DC 04410004 */ bgez $v0, .L802409F0 -/* BDDB90 802409E0 00000000 */ nop +/* BDDB90 802409E0 00000000 */ nop /* BDDB94 802409E4 C6200000 */ lwc1 $f0, ($s1) /* BDDB98 802409E8 08090284 */ j .L80240A10 /* BDDB9C 802409EC E4600018 */ swc1 $f0, 0x18($v1) @@ -33,7 +33,7 @@ glabel func_80240984_BDDB34 /* BDDBA0 802409F0 3C018024 */ lui $at, %hi(func_80241B00_B366D0) /* BDDBA4 802409F4 D4221B00 */ ldc1 $f2, %lo(func_80241B00_B366D0)($at) /* BDDBA8 802409F8 44820000 */ mtc1 $v0, $f0 -/* BDDBAC 802409FC 00000000 */ nop +/* BDDBAC 802409FC 00000000 */ nop /* BDDBB0 80240A00 46800021 */ cvt.d.w $f0, $f0 /* BDDBB4 80240A04 46220003 */ div.d $f0, $f0, $f2 /* BDDBB8 80240A08 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240A30_BDDBE0.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240A30_BDDBE0.s index 2353e92521..77a7bcb576 100644 --- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240A30_BDDBE0.s +++ b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240A30_BDDBE0.s @@ -22,7 +22,7 @@ glabel func_80240A30_BDDBE0 /* BDDC24 80240A74 0C01242D */ jal func_800490B4 /* BDDC28 80240A78 0040802D */ daddu $s0, $v0, $zero /* BDDC2C 80240A7C 1040000C */ beqz $v0, .L80240AB0 -/* BDDC30 80240A80 00000000 */ nop +/* BDDC30 80240A80 00000000 */ nop /* BDDC34 80240A84 C60C0038 */ lwc1 $f12, 0x38($s0) /* BDDC38 80240A88 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* BDDC3C 80240A8C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -45,10 +45,10 @@ glabel func_80240A30_BDDBE0 /* BDDC7C 80240ACC 46802120 */ cvt.s.w $f4, $f4 /* BDDC80 80240AD0 44072000 */ mfc1 $a3, $f4 /* BDDC84 80240AD4 0C00A7B5 */ jal dist2D -/* BDDC88 80240AD8 00000000 */ nop +/* BDDC88 80240AD8 00000000 */ nop /* BDDC8C 80240ADC C6020018 */ lwc1 $f2, 0x18($s0) /* BDDC90 80240AE0 4602003E */ c.le.s $f0, $f2 -/* BDDC94 80240AE4 00000000 */ nop +/* BDDC94 80240AE4 00000000 */ nop /* BDDC98 80240AE8 45000005 */ bc1f .L80240B00 /* BDDC9C 80240AEC 2402000A */ addiu $v0, $zero, 0xa /* BDDCA0 80240AF0 A602008E */ sh $v0, 0x8e($s0) @@ -58,7 +58,7 @@ glabel func_80240A30_BDDBE0 .L80240B00: /* BDDCB0 80240B00 8602008C */ lh $v0, 0x8c($s0) /* BDDCB4 80240B04 14400011 */ bnez $v0, .L80240B4C -/* BDDCB8 80240B08 00000000 */ nop +/* BDDCB8 80240B08 00000000 */ nop /* BDDCBC 80240B0C C60C0038 */ lwc1 $f12, 0x38($s0) /* BDDCC0 80240B10 8E4200D0 */ lw $v0, 0xd0($s2) /* BDDCC4 80240B14 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -69,7 +69,7 @@ glabel func_80240A30_BDDBE0 /* BDDCD8 80240B28 46802120 */ cvt.s.w $f4, $f4 /* BDDCDC 80240B2C 44072000 */ mfc1 $a3, $f4 /* BDDCE0 80240B30 0C00A720 */ jal atan2 -/* BDDCE4 80240B34 00000000 */ nop +/* BDDCE4 80240B34 00000000 */ nop /* BDDCE8 80240B38 8E050018 */ lw $a1, 0x18($s0) /* BDDCEC 80240B3C 44060000 */ mfc1 $a2, $f0 /* BDDCF0 80240B40 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240B68_BDDD18.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240B68_BDDD18.s index 10d5336bca..b1bacc2962 100644 --- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240B68_BDDD18.s +++ b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240B68_BDDD18.s @@ -19,7 +19,7 @@ glabel func_80240B68_BDDD18 .L80240BA0: /* BDDD50 80240BA0 8482008C */ lh $v0, 0x8c($a0) /* BDDD54 80240BA4 1440000A */ bnez $v0, .L80240BD0 -/* BDDD58 80240BA8 00000000 */ nop +/* BDDD58 80240BA8 00000000 */ nop /* BDDD5C 80240BAC 8482008E */ lh $v0, 0x8e($a0) /* BDDD60 80240BB0 1C400007 */ bgtz $v0, .L80240BD0 /* BDDD64 80240BB4 24020008 */ addiu $v0, $zero, 8 diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s index bb5debb192..0efff08ae8 100644 --- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s +++ b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s @@ -71,7 +71,7 @@ glabel func_80240C90_BDDE40 /* BDDF3C 80240D8C 8E4300B0 */ lw $v1, 0xb0($s2) /* BDDF40 80240D90 30620004 */ andi $v0, $v1, 4 /* BDDF44 80240D94 10400007 */ beqz $v0, .L80240DB4 -/* BDDF48 80240D98 00000000 */ nop +/* BDDF48 80240D98 00000000 */ nop /* BDDF4C 80240D9C 824200B4 */ lb $v0, 0xb4($s2) /* BDDF50 80240DA0 14400086 */ bnez $v0, .L80240FBC /* BDDF54 80240DA4 0000102D */ daddu $v0, $zero, $zero @@ -95,15 +95,17 @@ glabel func_80240C90_BDDE40 /* BDDF94 80240DE4 2C620035 */ sltiu $v0, $v1, 0x35 /* BDDF98 80240DE8 10400073 */ beqz $v0, .L80240FB8 /* BDDF9C 80240DEC 00031080 */ sll $v0, $v1, 2 -/* BDDFA0 80240DF0 3C018024 */ lui $at, %hi(func_80241B08_B94F48) +/* BDDFA0 80240DF0 3C018024 */ lui $at, %hi(jtbl_80241B08_BDECB8) /* BDDFA4 80240DF4 00220821 */ addu $at, $at, $v0 -/* BDDFA8 80240DF8 8C221B08 */ lw $v0, %lo(func_80241B08_B94F48)($at) +/* BDDFA8 80240DF8 8C221B08 */ lw $v0, %lo(jtbl_80241B08_BDECB8)($at) /* BDDFAC 80240DFC 00400008 */ jr $v0 -/* BDDFB0 80240E00 00000000 */ nop +/* BDDFB0 80240E00 00000000 */ nop +glabel L80240E04_BDDFB4 /* BDDFB4 80240E04 0260202D */ daddu $a0, $s3, $zero /* BDDFB8 80240E08 0280282D */ daddu $a1, $s4, $zero /* BDDFBC 80240E0C 0C090058 */ jal func_80240160_BDD310 /* BDDFC0 80240E10 0200302D */ daddu $a2, $s0, $zero +glabel L80240E14_BDDFC4 /* BDDFC4 80240E14 0260202D */ daddu $a0, $s3, $zero /* BDDFC8 80240E18 0280282D */ daddu $a1, $s4, $zero /* BDDFCC 80240E1C 0C090075 */ jal func_802401D4_BDD384 @@ -112,6 +114,7 @@ glabel func_80240C90_BDDE40 /* BDDFD8 80240E28 24020002 */ addiu $v0, $zero, 2 /* BDDFDC 80240E2C 14620063 */ bne $v1, $v0, .L80240FBC /* BDDFE0 80240E30 0000102D */ daddu $v0, $zero, $zero +glabel L80240E34_BDDFE4 /* BDDFE4 80240E34 0260202D */ daddu $a0, $s3, $zero /* BDDFE8 80240E38 0280282D */ daddu $a1, $s4, $zero /* BDDFEC 80240E3C 0C0900C1 */ jal func_80240304_BDD4B4 @@ -120,6 +123,7 @@ glabel func_80240C90_BDDE40 /* BDDFF8 80240E48 24020003 */ addiu $v0, $zero, 3 /* BDDFFC 80240E4C 1462005B */ bne $v1, $v0, .L80240FBC /* BDE000 80240E50 0000102D */ daddu $v0, $zero, $zero +glabel L80240E54_BDE004 /* BDE004 80240E54 0260202D */ daddu $a0, $s3, $zero /* BDE008 80240E58 0280282D */ daddu $a1, $s4, $zero /* BDE00C 80240E5C 0C0900E8 */ jal func_802403A0_BDD550 @@ -128,16 +132,19 @@ glabel func_80240C90_BDDE40 /* BDE018 80240E68 24020004 */ addiu $v0, $zero, 4 /* BDE01C 80240E6C 14620053 */ bne $v1, $v0, .L80240FBC /* BDE020 80240E70 0000102D */ daddu $v0, $zero, $zero +glabel L80240E74_BDE024 /* BDE024 80240E74 0260202D */ daddu $a0, $s3, $zero /* BDE028 80240E78 0280282D */ daddu $a1, $s4, $zero /* BDE02C 80240E7C 0C09010A */ jal func_80240428_BDD5D8 /* BDE030 80240E80 0200302D */ daddu $a2, $s0, $zero +glabel L80240E84_BDE034 /* BDE034 80240E84 0260202D */ daddu $a0, $s3, $zero /* BDE038 80240E88 0280282D */ daddu $a1, $s4, $zero /* BDE03C 80240E8C 0C090134 */ jal func_802404D0_BDD680 /* BDE040 80240E90 0200302D */ daddu $a2, $s0, $zero /* BDE044 80240E94 080903EF */ j .L80240FBC /* BDE048 80240E98 0000102D */ daddu $v0, $zero, $zero +glabel L80240E9C_BDE04C /* BDE04C 80240E9C 0260202D */ daddu $a0, $s3, $zero /* BDE050 80240EA0 0280282D */ daddu $a1, $s4, $zero /* BDE054 80240EA4 0C0127DF */ jal func_80049F7C @@ -146,6 +153,7 @@ glabel func_80240C90_BDDE40 /* BDE060 80240EB0 2402000D */ addiu $v0, $zero, 0xd /* BDE064 80240EB4 14620041 */ bne $v1, $v0, .L80240FBC /* BDE068 80240EB8 0000102D */ daddu $v0, $zero, $zero +glabel L80240EBC_BDE06C /* BDE06C 80240EBC 0260202D */ daddu $a0, $s3, $zero /* BDE070 80240EC0 0280282D */ daddu $a1, $s4, $zero /* BDE074 80240EC4 0C012849 */ jal func_8004A124 @@ -154,6 +162,7 @@ glabel func_80240C90_BDDE40 /* BDE080 80240ED0 2402000E */ addiu $v0, $zero, 0xe /* BDE084 80240ED4 14620039 */ bne $v1, $v0, .L80240FBC /* BDE088 80240ED8 0000102D */ daddu $v0, $zero, $zero +glabel L80240EDC_BDE08C /* BDE08C 80240EDC 96A2008E */ lhu $v0, 0x8e($s5) /* BDE090 80240EE0 2442FFFF */ addiu $v0, $v0, -1 /* BDE094 80240EE4 A6A2008E */ sh $v0, 0x8e($s5) @@ -163,22 +172,26 @@ glabel func_80240C90_BDDE40 /* BDE0A4 80240EF4 24020028 */ addiu $v0, $zero, 0x28 /* BDE0A8 80240EF8 080903EE */ j .L80240FB8 /* BDE0AC 80240EFC AE620070 */ sw $v0, 0x70($s3) +glabel L80240F00_BDE0B0 /* BDE0B0 80240F00 0260202D */ daddu $a0, $s3, $zero /* BDE0B4 80240F04 0280282D */ daddu $a1, $s4, $zero /* BDE0B8 80240F08 0C090191 */ jal func_80240644_BDD7F4 /* BDE0BC 80240F0C 0200302D */ daddu $a2, $s0, $zero +glabel L80240F10_BDE0C0 /* BDE0C0 80240F10 0260202D */ daddu $a0, $s3, $zero /* BDE0C4 80240F14 0280282D */ daddu $a1, $s4, $zero /* BDE0C8 80240F18 0C0901A5 */ jal func_80240694_BDD844 /* BDE0CC 80240F1C 0200302D */ daddu $a2, $s0, $zero /* BDE0D0 80240F20 080903EF */ j .L80240FBC /* BDE0D4 80240F24 0000102D */ daddu $v0, $zero, $zero +glabel L80240F28_BDE0D8 /* BDE0D8 80240F28 0260202D */ daddu $a0, $s3, $zero /* BDE0DC 80240F2C 0280282D */ daddu $a1, $s4, $zero /* BDE0E0 80240F30 0C09020D */ jal func_80240834_BDD9E4 /* BDE0E4 80240F34 0200302D */ daddu $a2, $s0, $zero /* BDE0E8 80240F38 080903EF */ j .L80240FBC /* BDE0EC 80240F3C 0000102D */ daddu $v0, $zero, $zero +glabel L80240F40_BDE0F0 /* BDE0F0 80240F40 0260202D */ daddu $a0, $s3, $zero /* BDE0F4 80240F44 0280282D */ daddu $a1, $s4, $zero /* BDE0F8 80240F48 0C090261 */ jal func_80240984_BDDB34 @@ -187,16 +200,19 @@ glabel func_80240C90_BDDE40 /* BDE104 80240F54 24020029 */ addiu $v0, $zero, 0x29 /* BDE108 80240F58 14620018 */ bne $v1, $v0, .L80240FBC /* BDE10C 80240F5C 0000102D */ daddu $v0, $zero, $zero +glabel L80240F60_BDE110 /* BDE110 80240F60 0260202D */ daddu $a0, $s3, $zero /* BDE114 80240F64 0280282D */ daddu $a1, $s4, $zero /* BDE118 80240F68 0C09028C */ jal func_80240A30_BDDBE0 /* BDE11C 80240F6C 0200302D */ daddu $a2, $s0, $zero /* BDE120 80240F70 080903EF */ j .L80240FBC /* BDE124 80240F74 0000102D */ daddu $v0, $zero, $zero +glabel L80240F78_BDE128 /* BDE128 80240F78 0260202D */ daddu $a0, $s3, $zero /* BDE12C 80240F7C 0280282D */ daddu $a1, $s4, $zero /* BDE130 80240F80 0C0902DA */ jal func_80240B68_BDDD18 /* BDE134 80240F84 0200302D */ daddu $a2, $s0, $zero +glabel L80240F88_BDE138 /* BDE138 80240F88 0260202D */ daddu $a0, $s3, $zero /* BDE13C 80240F8C 0280282D */ daddu $a1, $s4, $zero /* BDE140 80240F90 0C0902F9 */ jal func_80240BE4_BDDD94 @@ -205,11 +221,13 @@ glabel func_80240C90_BDDE40 /* BDE14C 80240F9C 24020034 */ addiu $v0, $zero, 0x34 /* BDE150 80240FA0 14620006 */ bne $v1, $v0, .L80240FBC /* BDE154 80240FA4 0000102D */ daddu $v0, $zero, $zero +glabel L80240FA8_BDE158 /* BDE158 80240FA8 0260202D */ daddu $a0, $s3, $zero /* BDE15C 80240FAC 0280282D */ daddu $a1, $s4, $zero /* BDE160 80240FB0 0C090313 */ jal arn_02_UnkDurationCheck /* BDE164 80240FB4 0200302D */ daddu $a2, $s0, $zero .L80240FB8: +glabel L80240FB8_BDE168 /* BDE168 80240FB8 0000102D */ daddu $v0, $zero, $zero .L80240FBC: /* BDE16C 80240FBC 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240000_BDED90.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240000_BDED90.s index 95b8b32033..8f4fcc1a15 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240000_BDED90.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240000_BDED90.s @@ -45,7 +45,7 @@ glabel func_80240000_BDED90 /* BDEE2C 8024009C 0C00A7B5 */ jal dist2D /* BDEE30 802400A0 4600B386 */ mov.s $f14, $f22 /* BDEE34 802400A4 4614003C */ c.lt.s $f0, $f20 -/* BDEE38 802400A8 00000000 */ nop +/* BDEE38 802400A8 00000000 */ nop /* BDEE3C 802400AC 45000003 */ bc1f .L802400BC /* BDEE40 802400B0 2631000C */ addiu $s1, $s1, 0xc /* BDEE44 802400B4 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_80240000_BDED90 /* BDEE70 802400E0 8E6200D0 */ lw $v0, 0xd0($s3) /* BDEE74 802400E4 8C42007C */ lw $v0, 0x7c($v0) /* BDEE78 802400E8 04410004 */ bgez $v0, .L802400FC -/* BDEE7C 802400EC 00000000 */ nop +/* BDEE7C 802400EC 00000000 */ nop /* BDEE80 802400F0 C6C00000 */ lwc1 $f0, ($s6) /* BDEE84 802400F4 08090047 */ j .L8024011C /* BDEE88 802400F8 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_80240000_BDED90 /* BDEE8C 802400FC 3C018024 */ lui $at, %hi(D_80244860) /* BDEE90 80240100 D4224860 */ ldc1 $f2, %lo(D_80244860)($at) /* BDEE94 80240104 44820000 */ mtc1 $v0, $f0 -/* BDEE98 80240108 00000000 */ nop +/* BDEE98 80240108 00000000 */ nop /* BDEE9C 8024010C 46800021 */ cvt.d.w $f0, $f0 /* BDEEA0 80240110 46220003 */ div.d $f0, $f0, $f2 /* BDEEA4 80240114 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240158_BDEEE8.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240158_BDEEE8.s index 9e98c73e50..a2d2c1691b 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240158_BDEEE8.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240158_BDEEE8.s @@ -44,7 +44,7 @@ glabel func_80240158_BDEEE8 /* BDEF84 802401F4 2402000F */ addiu $v0, $zero, 0xf /* BDEF88 802401F8 AFA2001C */ sw $v0, 0x1c($sp) /* BDEF8C 802401FC 44833000 */ mtc1 $v1, $f6 -/* BDEF90 80240200 00000000 */ nop +/* BDEF90 80240200 00000000 */ nop /* BDEF94 80240204 468031A0 */ cvt.s.w $f6, $f6 /* BDEF98 80240208 44073000 */ mfc1 $a3, $f6 /* BDEF9C 8024020C 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_80240158_BDEEE8 .L8024025C: /* BDEFEC 8024025C 8602008C */ lh $v0, 0x8c($s0) /* BDEFF0 80240260 1440005D */ bnez $v0, .L802403D8 -/* BDEFF4 80240264 00000000 */ nop +/* BDEFF4 80240264 00000000 */ nop /* BDEFF8 80240268 C6000018 */ lwc1 $f0, 0x18($s0) /* BDEFFC 8024026C 3C014010 */ lui $at, 0x4010 /* BDF000 80240270 44811800 */ mtc1 $at, $f3 /* BDF004 80240274 44801000 */ mtc1 $zero, $f2 /* BDF008 80240278 46000021 */ cvt.d.s $f0, $f0 /* BDF00C 8024027C 4622003C */ c.lt.d $f0, $f2 -/* BDF010 80240280 00000000 */ nop +/* BDF010 80240280 00000000 */ nop /* BDF014 80240284 45000003 */ bc1f .L80240294 /* BDF018 80240288 0200202D */ daddu $a0, $s0, $zero /* BDF01C 8024028C 080900A6 */ j .L80240298 @@ -88,7 +88,7 @@ glabel func_80240158_BDEEE8 /* BDF024 80240294 24050001 */ addiu $a1, $zero, 1 .L80240298: /* BDF028 80240298 0C00F598 */ jal func_8003D660 -/* BDF02C 8024029C 00000000 */ nop +/* BDF02C 8024029C 00000000 */ nop /* BDF030 802402A0 C60C0038 */ lwc1 $f12, 0x38($s0) /* BDF034 802402A4 8E430078 */ lw $v1, 0x78($s2) /* BDF038 802402A8 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_80240158_BDEEE8 /* BDF060 802402D0 4406B000 */ mfc1 $a2, $f22 /* BDF064 802402D4 4407A000 */ mfc1 $a3, $f20 /* BDF068 802402D8 0C00A720 */ jal atan2 -/* BDF06C 802402DC 00000000 */ nop +/* BDF06C 802402DC 00000000 */ nop /* BDF070 802402E0 8E050018 */ lw $a1, 0x18($s0) /* BDF074 802402E4 44060000 */ mfc1 $a2, $f0 /* BDF078 802402E8 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_80240158_BDEEE8 /* BDF08C 802402FC 4406B000 */ mfc1 $a2, $f22 /* BDF090 80240300 4407A000 */ mfc1 $a3, $f20 /* BDF094 80240304 0C00A7B5 */ jal dist2D -/* BDF098 80240308 00000000 */ nop +/* BDF098 80240308 00000000 */ nop /* BDF09C 8024030C C6020018 */ lwc1 $f2, 0x18($s0) /* BDF0A0 80240310 4602003E */ c.le.s $f0, $f2 -/* BDF0A4 80240314 00000000 */ nop +/* BDF0A4 80240314 00000000 */ nop /* BDF0A8 80240318 4500002F */ bc1f .L802403D8 /* BDF0AC 8024031C 240403E8 */ addiu $a0, $zero, 0x3e8 /* BDF0B0 80240320 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_80240158_BDEEE8 /* BDF104 80240374 18400003 */ blez $v0, .L80240384 /* BDF108 80240378 24020004 */ addiu $v0, $zero, 4 /* BDF10C 8024037C 14600002 */ bnez $v1, .L80240388 -/* BDF110 80240380 00000000 */ nop +/* BDF110 80240380 00000000 */ nop .L80240384: /* BDF114 80240384 AE420070 */ sw $v0, 0x70($s2) .L80240388: diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802404C0_BDF250.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802404C0_BDF250.s index da82cfdae0..16ae96753f 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802404C0_BDF250.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802404C0_BDF250.s @@ -38,7 +38,7 @@ glabel func_802404C0_BDF250 /* BDF2D4 80240544 2402000F */ addiu $v0, $zero, 0xf /* BDF2D8 80240548 AFA2001C */ sw $v0, 0x1c($sp) /* BDF2DC 8024054C 44833000 */ mtc1 $v1, $f6 -/* BDF2E0 80240550 00000000 */ nop +/* BDF2E0 80240550 00000000 */ nop /* BDF2E4 80240554 468031A0 */ cvt.s.w $f6, $f6 /* BDF2E8 80240558 44073000 */ mfc1 $a3, $f6 /* BDF2EC 8024055C 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_802404C0_BDF250 .L802405C0: /* BDF350 802405C0 8602008C */ lh $v0, 0x8c($s0) /* BDF354 802405C4 14400025 */ bnez $v0, .L8024065C -/* BDF358 802405C8 00000000 */ nop +/* BDF358 802405C8 00000000 */ nop /* BDF35C 802405CC 9602008E */ lhu $v0, 0x8e($s0) /* BDF360 802405D0 2442FFFF */ addiu $v0, $v0, -1 /* BDF364 802405D4 A602008E */ sh $v0, 0x8e($s0) /* BDF368 802405D8 00021400 */ sll $v0, $v0, 0x10 /* BDF36C 802405DC 1440001F */ bnez $v0, .L8024065C -/* BDF370 802405E0 00000000 */ nop +/* BDF370 802405E0 00000000 */ nop /* BDF374 802405E4 8E820074 */ lw $v0, 0x74($s4) /* BDF378 802405E8 2442FFFF */ addiu $v0, $v0, -1 /* BDF37C 802405EC 10400019 */ beqz $v0, .L80240654 @@ -84,7 +84,7 @@ glabel func_802404C0_BDF250 /* BDF388 802405F8 9442002A */ lhu $v0, 0x2a($v0) /* BDF38C 802405FC 30420010 */ andi $v0, $v0, 0x10 /* BDF390 80240600 14400007 */ bnez $v0, .L80240620 -/* BDF394 80240604 00000000 */ nop +/* BDF394 80240604 00000000 */ nop /* BDF398 80240608 C600000C */ lwc1 $f0, 0xc($s0) /* BDF39C 8024060C 3C014334 */ lui $at, 0x4334 /* BDF3A0 80240610 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024067C_BDF40C.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024067C_BDF40C.s index 656b69eeac..d0c186794e 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024067C_BDF40C.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024067C_BDF40C.s @@ -28,7 +28,7 @@ glabel func_8024067C_BDF40C /* BDF464 802406D4 8E0200D0 */ lw $v0, 0xd0($s0) /* BDF468 802406D8 8C42007C */ lw $v0, 0x7c($v0) /* BDF46C 802406DC 04410004 */ bgez $v0, .L802406F0 -/* BDF470 802406E0 00000000 */ nop +/* BDF470 802406E0 00000000 */ nop /* BDF474 802406E4 C6400000 */ lwc1 $f0, ($s2) /* BDF478 802406E8 080901C4 */ j .L80240710 /* BDF47C 802406EC E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_8024067C_BDF40C /* BDF480 802406F0 3C018024 */ lui $at, %hi(D_80244868) /* BDF484 802406F4 D4224868 */ ldc1 $f2, %lo(D_80244868)($at) /* BDF488 802406F8 44820000 */ mtc1 $v0, $f0 -/* BDF48C 802406FC 00000000 */ nop +/* BDF48C 802406FC 00000000 */ nop /* BDF490 80240700 46800021 */ cvt.d.w $f0, $f0 /* BDF494 80240704 46220003 */ div.d $f0, $f0, $f2 /* BDF498 80240708 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024081C_BDF5AC.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024081C_BDF5AC.s index b4280deb74..74cbbc1020 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024081C_BDF5AC.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024081C_BDF5AC.s @@ -47,20 +47,20 @@ glabel func_8024081C_BDF5AC /* BDF654 802408C4 8E02001C */ lw $v0, 0x1c($s0) /* BDF658 802408C8 46001005 */ abs.s $f0, $f2 /* BDF65C 802408CC 44822000 */ mtc1 $v0, $f4 -/* BDF660 802408D0 00000000 */ nop +/* BDF660 802408D0 00000000 */ nop /* BDF664 802408D4 46802120 */ cvt.s.w $f4, $f4 /* BDF668 802408D8 4600203C */ c.lt.s $f4, $f0 -/* BDF66C 802408DC 00000000 */ nop +/* BDF66C 802408DC 00000000 */ nop /* BDF670 802408E0 4500000D */ bc1f .L80240918 -/* BDF674 802408E4 00000000 */ nop +/* BDF674 802408E4 00000000 */ nop /* BDF678 802408E8 44800000 */ mtc1 $zero, $f0 /* BDF67C 802408EC C654000C */ lwc1 $f20, 0xc($s2) /* BDF680 802408F0 4600103C */ c.lt.s $f2, $f0 -/* BDF684 802408F4 00000000 */ nop +/* BDF684 802408F4 00000000 */ nop /* BDF688 802408F8 45000006 */ bc1f .L80240914 /* BDF68C 802408FC 00021023 */ negu $v0, $v0 /* BDF690 80240900 44820000 */ mtc1 $v0, $f0 -/* BDF694 80240904 00000000 */ nop +/* BDF694 80240904 00000000 */ nop /* BDF698 80240908 46800020 */ cvt.s.w $f0, $f0 /* BDF69C 8024090C 08090246 */ j .L80240918 /* BDF6A0 80240910 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024094C_BDF6DC.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024094C_BDF6DC.s index efa17c818a..3676ccf880 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024094C_BDF6DC.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024094C_BDF6DC.s @@ -37,7 +37,7 @@ glabel func_8024094C_BDF6DC /* BDF75C 802409CC 2402000F */ addiu $v0, $zero, 0xf /* BDF760 802409D0 AFA2001C */ sw $v0, 0x1c($sp) /* BDF764 802409D4 44833000 */ mtc1 $v1, $f6 -/* BDF768 802409D8 00000000 */ nop +/* BDF768 802409D8 00000000 */ nop /* BDF76C 802409DC 468031A0 */ cvt.s.w $f6, $f6 /* BDF770 802409E0 44073000 */ mfc1 $a3, $f6 /* BDF774 802409E4 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240AD4_BDF864.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240AD4_BDF864.s index e5b5afb9fd..d7884891dc 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240AD4_BDF864.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240AD4_BDF864.s @@ -28,7 +28,7 @@ glabel func_80240AD4_BDF864 /* BDF8BC 80240B2C C4400008 */ lwc1 $f0, 8($v0) /* BDF8C0 80240B30 46800020 */ cvt.s.w $f0, $f0 /* BDF8C4 80240B34 4602003E */ c.le.s $f0, $f2 -/* BDF8C8 80240B38 00000000 */ nop +/* BDF8C8 80240B38 00000000 */ nop /* BDF8CC 80240B3C 45020003 */ bc1fl .L80240B4C /* BDF8D0 80240B40 24840001 */ addiu $a0, $a0, 1 /* BDF8D4 80240B44 080902D7 */ j .L80240B5C diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s index 0cb76d032b..eadb6e3c40 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s @@ -46,7 +46,7 @@ glabel func_80240B94_BDF924 /* BDF9C8 80240C38 8E2200B0 */ lw $v0, 0xb0($s1) /* BDF9CC 80240C3C 30420004 */ andi $v0, $v0, 4 /* BDF9D0 80240C40 10400044 */ beqz $v0, .L80240D54 -/* BDF9D4 80240C44 00000000 */ nop +/* BDF9D4 80240C44 00000000 */ nop .L80240C48: /* BDF9D8 80240C48 2404F7FF */ addiu $a0, $zero, -0x801 /* BDF9DC 80240C4C AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80240B94_BDF924 /* BDFA90 80240D00 3C0142C8 */ lui $at, 0x42c8 /* BDFA94 80240D04 44812000 */ mtc1 $at, $f4 /* BDFA98 80240D08 44823000 */ mtc1 $v0, $f6 -/* BDFA9C 80240D0C 00000000 */ nop +/* BDFA9C 80240D0C 00000000 */ nop /* BDFAA0 80240D10 468031A0 */ cvt.s.w $f6, $f6 /* BDFAA4 80240D14 27A20044 */ addiu $v0, $sp, 0x44 /* BDFAA8 80240D18 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80240B94_BDF924 /* BDFACC 80240D3C 0C0372DF */ jal func_800DCB7C /* BDFAD0 80240D40 27A70040 */ addiu $a3, $sp, 0x40 /* BDFAD4 80240D44 10400003 */ beqz $v0, .L80240D54 -/* BDFAD8 80240D48 00000000 */ nop +/* BDFAD8 80240D48 00000000 */ nop /* BDFADC 80240D4C C7A0003C */ lwc1 $f0, 0x3c($sp) /* BDFAE0 80240D50 E640003C */ swc1 $f0, 0x3c($s2) .L80240D54: @@ -124,72 +124,85 @@ glabel func_80240B94_BDF924 /* BDFAE8 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 /* BDFAEC 80240D5C 10400042 */ beqz $v0, .L80240E68 /* BDFAF0 80240D60 00031080 */ sll $v0, $v1, 2 -/* BDFAF4 80240D64 3C018024 */ lui $at, %hi(D_80244870) +/* BDFAF4 80240D64 3C018024 */ lui $at, %hi(jtbl_80244870_BE3600) /* BDFAF8 80240D68 00220821 */ addu $at, $at, $v0 -/* BDFAFC 80240D6C 8C224870 */ lw $v0, %lo(D_80244870)($at) +/* BDFAFC 80240D6C 8C224870 */ lw $v0, %lo(jtbl_80244870_BE3600)($at) /* BDFB00 80240D70 00400008 */ jr $v0 -/* BDFB04 80240D74 00000000 */ nop +/* BDFB04 80240D74 00000000 */ nop +glabel L80240D78_BDFB08 /* BDFB08 80240D78 0280202D */ daddu $a0, $s4, $zero /* BDFB0C 80240D7C 0260282D */ daddu $a1, $s3, $zero /* BDFB10 80240D80 0C090000 */ jal func_80240000_BDED90 /* BDFB14 80240D84 02A0302D */ daddu $a2, $s5, $zero +glabel L80240D88_BDFB18 /* BDFB18 80240D88 0280202D */ daddu $a0, $s4, $zero /* BDFB1C 80240D8C 0260282D */ daddu $a1, $s3, $zero /* BDFB20 80240D90 0C090056 */ jal func_80240158_BDEEE8 /* BDFB24 80240D94 02A0302D */ daddu $a2, $s5, $zero /* BDFB28 80240D98 0809039A */ j .L80240E68 -/* BDFB2C 80240D9C 00000000 */ nop +/* BDFB2C 80240D9C 00000000 */ nop +glabel L80240DA0_BDFB30 /* BDFB30 80240DA0 0280202D */ daddu $a0, $s4, $zero /* BDFB34 80240DA4 0260282D */ daddu $a1, $s3, $zero /* BDFB38 80240DA8 0C090100 */ jal arn_03_UnkNpcAIFunc1 /* BDFB3C 80240DAC 02A0302D */ daddu $a2, $s5, $zero +glabel L80240DB0_BDFB40 /* BDFB40 80240DB0 0280202D */ daddu $a0, $s4, $zero /* BDFB44 80240DB4 0260282D */ daddu $a1, $s3, $zero /* BDFB48 80240DB8 0C090130 */ jal func_802404C0_BDF250 /* BDFB4C 80240DBC 02A0302D */ daddu $a2, $s5, $zero /* BDFB50 80240DC0 0809039A */ j .L80240E68 -/* BDFB54 80240DC4 00000000 */ nop +/* BDFB54 80240DC4 00000000 */ nop +glabel L80240DC8_BDFB58 /* BDFB58 80240DC8 0280202D */ daddu $a0, $s4, $zero /* BDFB5C 80240DCC 0260282D */ daddu $a1, $s3, $zero /* BDFB60 80240DD0 0C09019F */ jal func_8024067C_BDF40C /* BDFB64 80240DD4 02A0302D */ daddu $a2, $s5, $zero /* BDFB68 80240DD8 0809039A */ j .L80240E68 -/* BDFB6C 80240DDC 00000000 */ nop +/* BDFB6C 80240DDC 00000000 */ nop +glabel L80240DE0_BDFB70 /* BDFB70 80240DE0 0280202D */ daddu $a0, $s4, $zero /* BDFB74 80240DE4 0260282D */ daddu $a1, $s3, $zero /* BDFB78 80240DE8 0C0901CC */ jal arn_03_NpcJumpFunc2 /* BDFB7C 80240DEC 02A0302D */ daddu $a2, $s5, $zero +glabel L80240DF0_BDFB80 /* BDFB80 80240DF0 0280202D */ daddu $a0, $s4, $zero /* BDFB84 80240DF4 0260282D */ daddu $a1, $s3, $zero /* BDFB88 80240DF8 0C0901E9 */ jal arn_03_NpcJumpFunc /* BDFB8C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* BDFB90 80240E00 0809039A */ j .L80240E68 -/* BDFB94 80240E04 00000000 */ nop +/* BDFB94 80240E04 00000000 */ nop +glabel L80240E08_BDFB98 /* BDFB98 80240E08 0280202D */ daddu $a0, $s4, $zero /* BDFB9C 80240E0C 0260282D */ daddu $a1, $s3, $zero /* BDFBA0 80240E10 0C090207 */ jal func_8024081C_BDF5AC /* BDFBA4 80240E14 02A0302D */ daddu $a2, $s5, $zero +glabel L80240E18_BDFBA8 /* BDFBA8 80240E18 0280202D */ daddu $a0, $s4, $zero /* BDFBAC 80240E1C 0260282D */ daddu $a1, $s3, $zero /* BDFBB0 80240E20 0C090253 */ jal func_8024094C_BDF6DC /* BDFBB4 80240E24 02A0302D */ daddu $a2, $s5, $zero /* BDFBB8 80240E28 0809039A */ j .L80240E68 -/* BDFBBC 80240E2C 00000000 */ nop +/* BDFBBC 80240E2C 00000000 */ nop +glabel L80240E30_BDFBC0 /* BDFBC0 80240E30 0280202D */ daddu $a0, $s4, $zero /* BDFBC4 80240E34 0260282D */ daddu $a1, $s3, $zero /* BDFBC8 80240E38 0C09029B */ jal arn_03_UnkNpcDurationFlagFunc /* BDFBCC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* BDFBD0 80240E40 0809039A */ j .L80240E68 -/* BDFBD4 80240E44 00000000 */ nop +/* BDFBD4 80240E44 00000000 */ nop +glabel L80240E48_BDFBD8 /* BDFBD8 80240E48 0280202D */ daddu $a0, $s4, $zero /* BDFBDC 80240E4C 0260282D */ daddu $a1, $s3, $zero /* BDFBE0 80240E50 0C0902B5 */ jal func_80240AD4_BDF864 /* BDFBE4 80240E54 02A0302D */ daddu $a2, $s5, $zero /* BDFBE8 80240E58 0809039A */ j .L80240E68 -/* BDFBEC 80240E5C 00000000 */ nop +/* BDFBEC 80240E5C 00000000 */ nop +glabel L80240E60_BDFBF0 /* BDFBF0 80240E60 0C0129CF */ jal func_8004A73C /* BDFBF4 80240E64 0280202D */ daddu $a0, $s4, $zero .L80240E68: +glabel L80240E68_BDFBF8 /* BDFBF8 80240E68 8FBF0060 */ lw $ra, 0x60($sp) /* BDFBFC 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) /* BDFC00 80240E70 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240E90_BDFC20.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240E90_BDFC20.s index f7a47c4e5c..ffbc44c1da 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240E90_BDFC20.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240E90_BDFC20.s @@ -79,7 +79,7 @@ glabel func_80240E90_BDFC20 /* BDFD48 80240FB8 E7A2001C */ swc1 $f2, 0x1c($sp) /* BDFD4C 80240FBC 46000121 */ cvt.d.s $f4, $f0 /* BDFD50 80240FC0 4624303C */ c.lt.d $f6, $f4 -/* BDFD54 80240FC4 00000000 */ nop +/* BDFD54 80240FC4 00000000 */ nop /* BDFD58 80240FC8 45000005 */ bc1f .L80240FE0 /* BDFD5C 80240FCC E7A00024 */ swc1 $f0, 0x24($sp) /* BDFD60 80240FD0 C620003C */ lwc1 $f0, 0x3c($s1) @@ -90,9 +90,9 @@ glabel func_80240E90_BDFC20 /* BDFD70 80240FE0 3C01C000 */ lui $at, 0xc000 /* BDFD74 80240FE4 44810800 */ mtc1 $at, $f1 /* BDFD78 80240FE8 44800000 */ mtc1 $zero, $f0 -/* BDFD7C 80240FEC 00000000 */ nop +/* BDFD7C 80240FEC 00000000 */ nop /* BDFD80 80240FF0 4620203C */ c.lt.d $f4, $f0 -/* BDFD84 80240FF4 00000000 */ nop +/* BDFD84 80240FF4 00000000 */ nop /* BDFD88 80240FF8 45020006 */ bc1fl .L80241014 /* BDFD8C 80240FFC E622003C */ swc1 $f2, 0x3c($s1) /* BDFD90 80241000 C620003C */ lwc1 $f0, 0x3c($s1) @@ -107,10 +107,10 @@ glabel func_80240E90_BDFC20 /* BDFDAC 8024101C 4406B000 */ mfc1 $a2, $f22 /* BDFDB0 80241020 4407A000 */ mfc1 $a3, $f20 /* BDFDB4 80241024 0C00A7B5 */ jal dist2D -/* BDFDB8 80241028 00000000 */ nop +/* BDFDB8 80241028 00000000 */ nop /* BDFDBC 8024102C C6220018 */ lwc1 $f2, 0x18($s1) /* BDFDC0 80241030 4600103C */ c.lt.s $f2, $f0 -/* BDFDC4 80241034 00000000 */ nop +/* BDFDC4 80241034 00000000 */ nop /* BDFDC8 80241038 45010003 */ bc1t .L80241048 /* BDFDCC 8024103C E7A00024 */ swc1 $f0, 0x24($sp) /* BDFDD0 80241040 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241068_BDFDF8.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241068_BDFDF8.s index d1b57e14da..1618895979 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241068_BDFDF8.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241068_BDFDF8.s @@ -19,7 +19,7 @@ glabel func_80241068_BDFDF8 /* BDFE30 802410A0 A602008E */ sh $v0, 0x8e($s0) /* BDFE34 802410A4 00021400 */ sll $v0, $v0, 0x10 /* BDFE38 802410A8 0441001D */ bgez $v0, .L80241120 -/* BDFE3C 802410AC 00000000 */ nop +/* BDFE3C 802410AC 00000000 */ nop /* BDFE40 802410B0 8E220074 */ lw $v0, 0x74($s1) /* BDFE44 802410B4 2442FFFF */ addiu $v0, $v0, -1 /* BDFE48 802410B8 04400014 */ bltz $v0, .L8024110C diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024113C_BDFECC.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024113C_BDFECC.s index 12e7864310..5af27b5f44 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024113C_BDFECC.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024113C_BDFECC.s @@ -54,31 +54,36 @@ glabel func_8024113C_BDFECC /* BDFF8C 802411FC 2C620005 */ sltiu $v0, $v1, 5 /* BDFF90 80241200 1040001E */ beqz $v0, .L8024127C /* BDFF94 80241204 00031080 */ sll $v0, $v1, 2 -/* BDFF98 80241208 3C018024 */ lui $at, %hi(D_80244A00) +/* BDFF98 80241208 3C018024 */ lui $at, %hi(jtbl_80244A00_BE3790) /* BDFF9C 8024120C 00220821 */ addu $at, $at, $v0 -/* BDFFA0 80241210 8C224A00 */ lw $v0, %lo(D_80244A00)($at) +/* BDFFA0 80241210 8C224A00 */ lw $v0, %lo(jtbl_80244A00_BE3790)($at) /* BDFFA4 80241214 00400008 */ jr $v0 -/* BDFFA8 80241218 00000000 */ nop +/* BDFFA8 80241218 00000000 */ nop +glabel L8024121C_BDFFAC /* BDFFAC 8024121C 0280202D */ daddu $a0, $s4, $zero /* BDFFB0 80241220 0200282D */ daddu $a1, $s0, $zero /* BDFFB4 80241224 0C090000 */ jal func_80240000_BDED90 /* BDFFB8 80241228 0240302D */ daddu $a2, $s2, $zero +glabel L8024122C_BDFFBC /* BDFFBC 8024122C 0280202D */ daddu $a0, $s4, $zero /* BDFFC0 80241230 0200282D */ daddu $a1, $s0, $zero /* BDFFC4 80241234 0C0903A4 */ jal func_80240E90_BDFC20 /* BDFFC8 80241238 0240302D */ daddu $a2, $s2, $zero /* BDFFCC 8024123C 0809049F */ j .L8024127C -/* BDFFD0 80241240 00000000 */ nop +/* BDFFD0 80241240 00000000 */ nop +glabel L80241244_BDFFD4 /* BDFFD4 80241244 0280202D */ daddu $a0, $s4, $zero /* BDFFD8 80241248 0200282D */ daddu $a1, $s0, $zero /* BDFFDC 8024124C 0C090100 */ jal arn_03_UnkNpcAIFunc1 /* BDFFE0 80241250 0240302D */ daddu $a2, $s2, $zero +glabel L80241254_BDFFE4 /* BDFFE4 80241254 0280202D */ daddu $a0, $s4, $zero /* BDFFE8 80241258 0200282D */ daddu $a1, $s0, $zero /* BDFFEC 8024125C 0C09041A */ jal func_80241068_BDFDF8 /* BDFFF0 80241260 0240302D */ daddu $a2, $s2, $zero /* BDFFF4 80241264 0809049F */ j .L8024127C -/* BDFFF8 80241268 00000000 */ nop +/* BDFFF8 80241268 00000000 */ nop +glabel L8024126C_BDFFFC /* BDFFFC 8024126C 0280202D */ daddu $a0, $s4, $zero /* BE0000 80241270 0200282D */ daddu $a1, $s0, $zero /* BE0004 80241274 0C09019F */ jal func_8024067C_BDF40C diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802412B0_BE0040.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802412B0_BE0040.s index c16942ac58..da5f81270a 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802412B0_BE0040.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802412B0_BE0040.s @@ -26,7 +26,7 @@ glabel func_802412B0_BE0040 /* BE0090 80241300 1440FFFA */ bnez $v0, .L802412EC /* BE0094 80241304 24A50004 */ addiu $a1, $a1, 4 /* BE0098 80241308 080904D3 */ j .L8024134C -/* BE009C 8024130C 00000000 */ nop +/* BE009C 8024130C 00000000 */ nop .L80241310: /* BE00A0 80241310 0000182D */ daddu $v1, $zero, $zero /* BE00A4 80241314 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241680_BE0410.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241680_BE0410.s index 8e5aa005d3..f5f3044ecd 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241680_BE0410.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241680_BE0410.s @@ -28,7 +28,7 @@ glabel func_80241680_BE0410 /* BE0464 802416D4 00220821 */ addu $at, $at, $v0 /* BE0468 802416D8 AC204A20 */ sw $zero, %lo(D_80244A20)($at) /* BE046C 802416DC 080905C3 */ j .L8024170C -/* BE0470 802416E0 00000000 */ nop +/* BE0470 802416E0 00000000 */ nop .L802416E4: /* BE0474 802416E4 3C038024 */ lui $v1, %hi(D_80244A20) /* BE0478 802416E8 24634A20 */ addiu $v1, $v1, %lo(D_80244A20) @@ -46,4 +46,4 @@ glabel func_80241680_BE0410 /* BE04A0 80241710 24020002 */ addiu $v0, $zero, 2 /* BE04A4 80241714 03E00008 */ jr $ra /* BE04A8 80241718 27BD0018 */ addiu $sp, $sp, 0x18 -/* BE04AC 8024171C 00000000 */ nop +/* BE04AC 8024171C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240000_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240000_BE37B0.s index d1caa8970d..14f65eec1d 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240000_BE37B0.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240000_BE37B0.s @@ -45,7 +45,7 @@ glabel func_80240000_BE37B0 /* BE384C 8024009C 0C00A7B5 */ jal dist2D /* BE3850 802400A0 4600B386 */ mov.s $f14, $f22 /* BE3854 802400A4 4614003C */ c.lt.s $f0, $f20 -/* BE3858 802400A8 00000000 */ nop +/* BE3858 802400A8 00000000 */ nop /* BE385C 802400AC 45000003 */ bc1f .L802400BC /* BE3860 802400B0 2631000C */ addiu $s1, $s1, 0xc /* BE3864 802400B4 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_80240000_BE37B0 /* BE3890 802400E0 8E6200D0 */ lw $v0, 0xd0($s3) /* BE3894 802400E4 8C42007C */ lw $v0, 0x7c($v0) /* BE3898 802400E8 04410004 */ bgez $v0, .L802400FC -/* BE389C 802400EC 00000000 */ nop +/* BE389C 802400EC 00000000 */ nop /* BE38A0 802400F0 C6C00000 */ lwc1 $f0, ($s6) /* BE38A4 802400F4 08090047 */ j .L8024011C /* BE38A8 802400F8 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_80240000_BE37B0 /* BE38AC 802400FC 3C018024 */ lui $at, %hi(D_80244130) /* BE38B0 80240100 D4224130 */ ldc1 $f2, %lo(D_80244130)($at) /* BE38B4 80240104 44820000 */ mtc1 $v0, $f0 -/* BE38B8 80240108 00000000 */ nop +/* BE38B8 80240108 00000000 */ nop /* BE38BC 8024010C 46800021 */ cvt.d.w $f0, $f0 /* BE38C0 80240110 46220003 */ div.d $f0, $f0, $f2 /* BE38C4 80240114 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240158_BE3908.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240158_BE3908.s index 21dfde5b6a..727f335eda 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240158_BE3908.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240158_BE3908.s @@ -44,7 +44,7 @@ glabel func_80240158_BE3908 /* BE39A4 802401F4 2402000F */ addiu $v0, $zero, 0xf /* BE39A8 802401F8 AFA2001C */ sw $v0, 0x1c($sp) /* BE39AC 802401FC 44833000 */ mtc1 $v1, $f6 -/* BE39B0 80240200 00000000 */ nop +/* BE39B0 80240200 00000000 */ nop /* BE39B4 80240204 468031A0 */ cvt.s.w $f6, $f6 /* BE39B8 80240208 44073000 */ mfc1 $a3, $f6 /* BE39BC 8024020C 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_80240158_BE3908 .L8024025C: /* BE3A0C 8024025C 8602008C */ lh $v0, 0x8c($s0) /* BE3A10 80240260 1440005D */ bnez $v0, .L802403D8 -/* BE3A14 80240264 00000000 */ nop +/* BE3A14 80240264 00000000 */ nop /* BE3A18 80240268 C6000018 */ lwc1 $f0, 0x18($s0) /* BE3A1C 8024026C 3C014010 */ lui $at, 0x4010 /* BE3A20 80240270 44811800 */ mtc1 $at, $f3 /* BE3A24 80240274 44801000 */ mtc1 $zero, $f2 /* BE3A28 80240278 46000021 */ cvt.d.s $f0, $f0 /* BE3A2C 8024027C 4622003C */ c.lt.d $f0, $f2 -/* BE3A30 80240280 00000000 */ nop +/* BE3A30 80240280 00000000 */ nop /* BE3A34 80240284 45000003 */ bc1f .L80240294 /* BE3A38 80240288 0200202D */ daddu $a0, $s0, $zero /* BE3A3C 8024028C 080900A6 */ j .L80240298 @@ -88,7 +88,7 @@ glabel func_80240158_BE3908 /* BE3A44 80240294 24050001 */ addiu $a1, $zero, 1 .L80240298: /* BE3A48 80240298 0C00F598 */ jal func_8003D660 -/* BE3A4C 8024029C 00000000 */ nop +/* BE3A4C 8024029C 00000000 */ nop /* BE3A50 802402A0 C60C0038 */ lwc1 $f12, 0x38($s0) /* BE3A54 802402A4 8E430078 */ lw $v1, 0x78($s2) /* BE3A58 802402A8 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_80240158_BE3908 /* BE3A80 802402D0 4406B000 */ mfc1 $a2, $f22 /* BE3A84 802402D4 4407A000 */ mfc1 $a3, $f20 /* BE3A88 802402D8 0C00A720 */ jal atan2 -/* BE3A8C 802402DC 00000000 */ nop +/* BE3A8C 802402DC 00000000 */ nop /* BE3A90 802402E0 8E050018 */ lw $a1, 0x18($s0) /* BE3A94 802402E4 44060000 */ mfc1 $a2, $f0 /* BE3A98 802402E8 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_80240158_BE3908 /* BE3AAC 802402FC 4406B000 */ mfc1 $a2, $f22 /* BE3AB0 80240300 4407A000 */ mfc1 $a3, $f20 /* BE3AB4 80240304 0C00A7B5 */ jal dist2D -/* BE3AB8 80240308 00000000 */ nop +/* BE3AB8 80240308 00000000 */ nop /* BE3ABC 8024030C C6020018 */ lwc1 $f2, 0x18($s0) /* BE3AC0 80240310 4602003E */ c.le.s $f0, $f2 -/* BE3AC4 80240314 00000000 */ nop +/* BE3AC4 80240314 00000000 */ nop /* BE3AC8 80240318 4500002F */ bc1f .L802403D8 /* BE3ACC 8024031C 240403E8 */ addiu $a0, $zero, 0x3e8 /* BE3AD0 80240320 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_80240158_BE3908 /* BE3B24 80240374 18400003 */ blez $v0, .L80240384 /* BE3B28 80240378 24020004 */ addiu $v0, $zero, 4 /* BE3B2C 8024037C 14600002 */ bnez $v1, .L80240388 -/* BE3B30 80240380 00000000 */ nop +/* BE3B30 80240380 00000000 */ nop .L80240384: /* BE3B34 80240384 AE420070 */ sw $v0, 0x70($s2) .L80240388: diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_802404C0_BE3C70.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_802404C0_BE3C70.s index ce11e3c80c..08d822f07a 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_802404C0_BE3C70.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_802404C0_BE3C70.s @@ -38,7 +38,7 @@ glabel func_802404C0_BE3C70 /* BE3CF4 80240544 2402000F */ addiu $v0, $zero, 0xf /* BE3CF8 80240548 AFA2001C */ sw $v0, 0x1c($sp) /* BE3CFC 8024054C 44833000 */ mtc1 $v1, $f6 -/* BE3D00 80240550 00000000 */ nop +/* BE3D00 80240550 00000000 */ nop /* BE3D04 80240554 468031A0 */ cvt.s.w $f6, $f6 /* BE3D08 80240558 44073000 */ mfc1 $a3, $f6 /* BE3D0C 8024055C 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_802404C0_BE3C70 .L802405C0: /* BE3D70 802405C0 8602008C */ lh $v0, 0x8c($s0) /* BE3D74 802405C4 14400025 */ bnez $v0, .L8024065C -/* BE3D78 802405C8 00000000 */ nop +/* BE3D78 802405C8 00000000 */ nop /* BE3D7C 802405CC 9602008E */ lhu $v0, 0x8e($s0) /* BE3D80 802405D0 2442FFFF */ addiu $v0, $v0, -1 /* BE3D84 802405D4 A602008E */ sh $v0, 0x8e($s0) /* BE3D88 802405D8 00021400 */ sll $v0, $v0, 0x10 /* BE3D8C 802405DC 1440001F */ bnez $v0, .L8024065C -/* BE3D90 802405E0 00000000 */ nop +/* BE3D90 802405E0 00000000 */ nop /* BE3D94 802405E4 8E820074 */ lw $v0, 0x74($s4) /* BE3D98 802405E8 2442FFFF */ addiu $v0, $v0, -1 /* BE3D9C 802405EC 10400019 */ beqz $v0, .L80240654 @@ -84,7 +84,7 @@ glabel func_802404C0_BE3C70 /* BE3DA8 802405F8 9442002A */ lhu $v0, 0x2a($v0) /* BE3DAC 802405FC 30420010 */ andi $v0, $v0, 0x10 /* BE3DB0 80240600 14400007 */ bnez $v0, .L80240620 -/* BE3DB4 80240604 00000000 */ nop +/* BE3DB4 80240604 00000000 */ nop /* BE3DB8 80240608 C600000C */ lwc1 $f0, 0xc($s0) /* BE3DBC 8024060C 3C014334 */ lui $at, 0x4334 /* BE3DC0 80240610 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024067C_BE3E2C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024067C_BE3E2C.s index c8bf70a545..57c10a4e2e 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024067C_BE3E2C.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024067C_BE3E2C.s @@ -28,7 +28,7 @@ glabel func_8024067C_BE3E2C /* BE3E84 802406D4 8E0200D0 */ lw $v0, 0xd0($s0) /* BE3E88 802406D8 8C42007C */ lw $v0, 0x7c($v0) /* BE3E8C 802406DC 04410004 */ bgez $v0, .L802406F0 -/* BE3E90 802406E0 00000000 */ nop +/* BE3E90 802406E0 00000000 */ nop /* BE3E94 802406E4 C6400000 */ lwc1 $f0, ($s2) /* BE3E98 802406E8 080901C4 */ j .L80240710 /* BE3E9C 802406EC E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_8024067C_BE3E2C /* BE3EA0 802406F0 3C018024 */ lui $at, %hi(D_80244138) /* BE3EA4 802406F4 D4224138 */ ldc1 $f2, %lo(D_80244138)($at) /* BE3EA8 802406F8 44820000 */ mtc1 $v0, $f0 -/* BE3EAC 802406FC 00000000 */ nop +/* BE3EAC 802406FC 00000000 */ nop /* BE3EB0 80240700 46800021 */ cvt.d.w $f0, $f0 /* BE3EB4 80240704 46220003 */ div.d $f0, $f0, $f2 /* BE3EB8 80240708 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024081C_BE3FCC.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024081C_BE3FCC.s index f98bc29ef2..455e61f826 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024081C_BE3FCC.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024081C_BE3FCC.s @@ -47,20 +47,20 @@ glabel func_8024081C_BE3FCC /* BE4074 802408C4 8E02001C */ lw $v0, 0x1c($s0) /* BE4078 802408C8 46001005 */ abs.s $f0, $f2 /* BE407C 802408CC 44822000 */ mtc1 $v0, $f4 -/* BE4080 802408D0 00000000 */ nop +/* BE4080 802408D0 00000000 */ nop /* BE4084 802408D4 46802120 */ cvt.s.w $f4, $f4 /* BE4088 802408D8 4600203C */ c.lt.s $f4, $f0 -/* BE408C 802408DC 00000000 */ nop +/* BE408C 802408DC 00000000 */ nop /* BE4090 802408E0 4500000D */ bc1f .L80240918 -/* BE4094 802408E4 00000000 */ nop +/* BE4094 802408E4 00000000 */ nop /* BE4098 802408E8 44800000 */ mtc1 $zero, $f0 /* BE409C 802408EC C654000C */ lwc1 $f20, 0xc($s2) /* BE40A0 802408F0 4600103C */ c.lt.s $f2, $f0 -/* BE40A4 802408F4 00000000 */ nop +/* BE40A4 802408F4 00000000 */ nop /* BE40A8 802408F8 45000006 */ bc1f .L80240914 /* BE40AC 802408FC 00021023 */ negu $v0, $v0 /* BE40B0 80240900 44820000 */ mtc1 $v0, $f0 -/* BE40B4 80240904 00000000 */ nop +/* BE40B4 80240904 00000000 */ nop /* BE40B8 80240908 46800020 */ cvt.s.w $f0, $f0 /* BE40BC 8024090C 08090246 */ j .L80240918 /* BE40C0 80240910 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024094C_BE40FC.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024094C_BE40FC.s index 1fe9217499..44c49a0e32 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024094C_BE40FC.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024094C_BE40FC.s @@ -37,7 +37,7 @@ glabel func_8024094C_BE40FC /* BE417C 802409CC 2402000F */ addiu $v0, $zero, 0xf /* BE4180 802409D0 AFA2001C */ sw $v0, 0x1c($sp) /* BE4184 802409D4 44833000 */ mtc1 $v1, $f6 -/* BE4188 802409D8 00000000 */ nop +/* BE4188 802409D8 00000000 */ nop /* BE418C 802409DC 468031A0 */ cvt.s.w $f6, $f6 /* BE4190 802409E0 44073000 */ mfc1 $a3, $f6 /* BE4194 802409E4 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240AD4_BE4284.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240AD4_BE4284.s index f8dad3c5dd..11b1781a9e 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240AD4_BE4284.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240AD4_BE4284.s @@ -28,7 +28,7 @@ glabel func_80240AD4_BE4284 /* BE42DC 80240B2C C4400008 */ lwc1 $f0, 8($v0) /* BE42E0 80240B30 46800020 */ cvt.s.w $f0, $f0 /* BE42E4 80240B34 4602003E */ c.le.s $f0, $f2 -/* BE42E8 80240B38 00000000 */ nop +/* BE42E8 80240B38 00000000 */ nop /* BE42EC 80240B3C 45020003 */ bc1fl .L80240B4C /* BE42F0 80240B40 24840001 */ addiu $a0, $a0, 1 /* BE42F4 80240B44 080902D7 */ j .L80240B5C diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s index bf1180133d..e016aa4e22 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s @@ -46,7 +46,7 @@ glabel func_80240B94_BE4344 /* BE43E8 80240C38 8E2200B0 */ lw $v0, 0xb0($s1) /* BE43EC 80240C3C 30420004 */ andi $v0, $v0, 4 /* BE43F0 80240C40 10400044 */ beqz $v0, .L80240D54 -/* BE43F4 80240C44 00000000 */ nop +/* BE43F4 80240C44 00000000 */ nop .L80240C48: /* BE43F8 80240C48 2404F7FF */ addiu $a0, $zero, -0x801 /* BE43FC 80240C4C AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80240B94_BE4344 /* BE44B0 80240D00 3C0142C8 */ lui $at, 0x42c8 /* BE44B4 80240D04 44812000 */ mtc1 $at, $f4 /* BE44B8 80240D08 44823000 */ mtc1 $v0, $f6 -/* BE44BC 80240D0C 00000000 */ nop +/* BE44BC 80240D0C 00000000 */ nop /* BE44C0 80240D10 468031A0 */ cvt.s.w $f6, $f6 /* BE44C4 80240D14 27A20044 */ addiu $v0, $sp, 0x44 /* BE44C8 80240D18 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80240B94_BE4344 /* BE44EC 80240D3C 0C0372DF */ jal func_800DCB7C /* BE44F0 80240D40 27A70040 */ addiu $a3, $sp, 0x40 /* BE44F4 80240D44 10400003 */ beqz $v0, .L80240D54 -/* BE44F8 80240D48 00000000 */ nop +/* BE44F8 80240D48 00000000 */ nop /* BE44FC 80240D4C C7A0003C */ lwc1 $f0, 0x3c($sp) /* BE4500 80240D50 E640003C */ swc1 $f0, 0x3c($s2) .L80240D54: @@ -124,72 +124,85 @@ glabel func_80240B94_BE4344 /* BE4508 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 /* BE450C 80240D5C 10400042 */ beqz $v0, .L80240E68 /* BE4510 80240D60 00031080 */ sll $v0, $v1, 2 -/* BE4514 80240D64 3C018024 */ lui $at, %hi(D_80244140) +/* BE4514 80240D64 3C018024 */ lui $at, %hi(jtbl_80244140_BE78F0) /* BE4518 80240D68 00220821 */ addu $at, $at, $v0 -/* BE451C 80240D6C 8C224140 */ lw $v0, %lo(D_80244140)($at) +/* BE451C 80240D6C 8C224140 */ lw $v0, %lo(jtbl_80244140_BE78F0)($at) /* BE4520 80240D70 00400008 */ jr $v0 -/* BE4524 80240D74 00000000 */ nop +/* BE4524 80240D74 00000000 */ nop +glabel L80240D78_BE4528 /* BE4528 80240D78 0280202D */ daddu $a0, $s4, $zero /* BE452C 80240D7C 0260282D */ daddu $a1, $s3, $zero /* BE4530 80240D80 0C090000 */ jal func_80240000_BE37B0 /* BE4534 80240D84 02A0302D */ daddu $a2, $s5, $zero +glabel L80240D88_BE4538 /* BE4538 80240D88 0280202D */ daddu $a0, $s4, $zero /* BE453C 80240D8C 0260282D */ daddu $a1, $s3, $zero /* BE4540 80240D90 0C090056 */ jal func_80240158_BE3908 /* BE4544 80240D94 02A0302D */ daddu $a2, $s5, $zero /* BE4548 80240D98 0809039A */ j .L80240E68 -/* BE454C 80240D9C 00000000 */ nop +/* BE454C 80240D9C 00000000 */ nop +glabel L80240DA0_BE4550 /* BE4550 80240DA0 0280202D */ daddu $a0, $s4, $zero /* BE4554 80240DA4 0260282D */ daddu $a1, $s3, $zero /* BE4558 80240DA8 0C090100 */ jal arn_04_UnkNpcAIFunc1 /* BE455C 80240DAC 02A0302D */ daddu $a2, $s5, $zero +glabel L80240DB0_BE4560 /* BE4560 80240DB0 0280202D */ daddu $a0, $s4, $zero /* BE4564 80240DB4 0260282D */ daddu $a1, $s3, $zero /* BE4568 80240DB8 0C090130 */ jal func_802404C0_BE3C70 /* BE456C 80240DBC 02A0302D */ daddu $a2, $s5, $zero /* BE4570 80240DC0 0809039A */ j .L80240E68 -/* BE4574 80240DC4 00000000 */ nop +/* BE4574 80240DC4 00000000 */ nop +glabel L80240DC8_BE4578 /* BE4578 80240DC8 0280202D */ daddu $a0, $s4, $zero /* BE457C 80240DCC 0260282D */ daddu $a1, $s3, $zero /* BE4580 80240DD0 0C09019F */ jal func_8024067C_BE3E2C /* BE4584 80240DD4 02A0302D */ daddu $a2, $s5, $zero /* BE4588 80240DD8 0809039A */ j .L80240E68 -/* BE458C 80240DDC 00000000 */ nop +/* BE458C 80240DDC 00000000 */ nop +glabel L80240DE0_BE4590 /* BE4590 80240DE0 0280202D */ daddu $a0, $s4, $zero /* BE4594 80240DE4 0260282D */ daddu $a1, $s3, $zero /* BE4598 80240DE8 0C0901CC */ jal arn_04_NpcJumpFunc2 /* BE459C 80240DEC 02A0302D */ daddu $a2, $s5, $zero +glabel L80240DF0_BE45A0 /* BE45A0 80240DF0 0280202D */ daddu $a0, $s4, $zero /* BE45A4 80240DF4 0260282D */ daddu $a1, $s3, $zero /* BE45A8 80240DF8 0C0901E9 */ jal arn_04_NpcJumpFunc /* BE45AC 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* BE45B0 80240E00 0809039A */ j .L80240E68 -/* BE45B4 80240E04 00000000 */ nop +/* BE45B4 80240E04 00000000 */ nop +glabel L80240E08_BE45B8 /* BE45B8 80240E08 0280202D */ daddu $a0, $s4, $zero /* BE45BC 80240E0C 0260282D */ daddu $a1, $s3, $zero /* BE45C0 80240E10 0C090207 */ jal func_8024081C_BE3FCC /* BE45C4 80240E14 02A0302D */ daddu $a2, $s5, $zero +glabel L80240E18_BE45C8 /* BE45C8 80240E18 0280202D */ daddu $a0, $s4, $zero /* BE45CC 80240E1C 0260282D */ daddu $a1, $s3, $zero /* BE45D0 80240E20 0C090253 */ jal func_8024094C_BE40FC /* BE45D4 80240E24 02A0302D */ daddu $a2, $s5, $zero /* BE45D8 80240E28 0809039A */ j .L80240E68 -/* BE45DC 80240E2C 00000000 */ nop +/* BE45DC 80240E2C 00000000 */ nop +glabel L80240E30_BE45E0 /* BE45E0 80240E30 0280202D */ daddu $a0, $s4, $zero /* BE45E4 80240E34 0260282D */ daddu $a1, $s3, $zero /* BE45E8 80240E38 0C09029B */ jal arn_04_UnkNpcDurationFlagFunc /* BE45EC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* BE45F0 80240E40 0809039A */ j .L80240E68 -/* BE45F4 80240E44 00000000 */ nop +/* BE45F4 80240E44 00000000 */ nop +glabel L80240E48_BE45F8 /* BE45F8 80240E48 0280202D */ daddu $a0, $s4, $zero /* BE45FC 80240E4C 0260282D */ daddu $a1, $s3, $zero /* BE4600 80240E50 0C0902B5 */ jal func_80240AD4_BE4284 /* BE4604 80240E54 02A0302D */ daddu $a2, $s5, $zero /* BE4608 80240E58 0809039A */ j .L80240E68 -/* BE460C 80240E5C 00000000 */ nop +/* BE460C 80240E5C 00000000 */ nop +glabel L80240E60_BE4610 /* BE4610 80240E60 0C0129CF */ jal func_8004A73C /* BE4614 80240E64 0280202D */ daddu $a0, $s4, $zero .L80240E68: +glabel L80240E68_BE4618 /* BE4618 80240E68 8FBF0060 */ lw $ra, 0x60($sp) /* BE461C 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) /* BE4620 80240E70 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240E90_BE4640.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240E90_BE4640.s index 9ecdd28c63..f0bf145d14 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240E90_BE4640.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240E90_BE4640.s @@ -47,7 +47,7 @@ glabel func_80240E90_BE4640 /* BE46E8 80240F38 0C0123F5 */ jal is_point_within_region /* BE46EC 80240F3C 8E070038 */ lw $a3, 0x38($s0) /* BE46F0 80240F40 1040000E */ beqz $v0, .L80240F7C -/* BE46F4 80240F44 00000000 */ nop +/* BE46F4 80240F44 00000000 */ nop /* BE46F8 80240F48 8E2200D0 */ lw $v0, 0xd0($s1) /* BE46FC 80240F4C C60C0038 */ lwc1 $f12, 0x38($s0) /* BE4700 80240F50 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240E90_BE4640 /* BE4714 80240F64 468031A0 */ cvt.s.w $f6, $f6 /* BE4718 80240F68 44073000 */ mfc1 $a3, $f6 /* BE471C 80240F6C 0C00A720 */ jal atan2 -/* BE4720 80240F70 00000000 */ nop +/* BE4720 80240F70 00000000 */ nop /* BE4724 80240F74 080903EB */ j .L80240FAC /* BE4728 80240F78 E600000C */ swc1 $f0, 0xc($s0) .L80240F7C: @@ -66,7 +66,7 @@ glabel func_80240E90_BE4640 /* BE4730 80240F80 2404003C */ addiu $a0, $zero, 0x3c /* BE4734 80240F84 C60C000C */ lwc1 $f12, 0xc($s0) /* BE4738 80240F88 44820000 */ mtc1 $v0, $f0 -/* BE473C 80240F8C 00000000 */ nop +/* BE473C 80240F8C 00000000 */ nop /* BE4740 80240F90 46800020 */ cvt.s.w $f0, $f0 /* BE4744 80240F94 46006300 */ add.s $f12, $f12, $f0 /* BE4748 80240F98 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240E90_BE4640 /* BE476C 80240FBC 8E2200D0 */ lw $v0, 0xd0($s1) /* BE4770 80240FC0 8C420014 */ lw $v0, 0x14($v0) /* BE4774 80240FC4 04410004 */ bgez $v0, .L80240FD8 -/* BE4778 80240FC8 00000000 */ nop +/* BE4778 80240FC8 00000000 */ nop /* BE477C 80240FCC C6400000 */ lwc1 $f0, ($s2) /* BE4780 80240FD0 080903FE */ j .L80240FF8 /* BE4784 80240FD4 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240E90_BE4640 /* BE4788 80240FD8 3C018024 */ lui $at, %hi(D_802442D0) /* BE478C 80240FDC D42242D0 */ ldc1 $f2, %lo(D_802442D0)($at) /* BE4790 80240FE0 44820000 */ mtc1 $v0, $f0 -/* BE4794 80240FE4 00000000 */ nop +/* BE4794 80240FE4 00000000 */ nop /* BE4798 80240FE8 46800021 */ cvt.d.w $f0, $f0 /* BE479C 80240FEC 46220003 */ div.d $f0, $f0, $f2 /* BE47A0 80240FF0 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240E90_BE4640 /* BE47B4 80241004 44801000 */ mtc1 $zero, $f2 /* BE47B8 80241008 46000021 */ cvt.d.s $f0, $f0 /* BE47BC 8024100C 46220002 */ mul.d $f0, $f0, $f2 -/* BE47C0 80241010 00000000 */ nop +/* BE47C0 80241010 00000000 */ nop /* BE47C4 80241014 24020001 */ addiu $v0, $zero, 1 /* BE47C8 80241018 4620018D */ trunc.w.d $f6, $f0 /* BE47CC 8024101C E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241040_BE47F0.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241040_BE47F0.s index d0dd340dc8..95552d7dbf 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241040_BE47F0.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241040_BE47F0.s @@ -34,7 +34,7 @@ glabel func_80241040_BE47F0 /* BE4864 802410B4 44803000 */ mtc1 $zero, $f6 /* BE4868 802410B8 46000021 */ cvt.d.s $f0, $f0 /* BE486C 802410BC 46260002 */ mul.d $f0, $f0, $f6 -/* BE4870 802410C0 00000000 */ nop +/* BE4870 802410C0 00000000 */ nop /* BE4874 802410C4 24020001 */ addiu $v0, $zero, 1 /* BE4878 802410C8 8E24006C */ lw $a0, 0x6c($s1) /* BE487C 802410CC 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80241040_BE47F0 /* BE48D8 80241128 C600003C */ lwc1 $f0, 0x3c($s0) /* BE48DC 8024112C 4600C001 */ sub.s $f0, $f24, $f0 /* BE48E0 80241130 4600B03C */ c.lt.s $f22, $f0 -/* BE48E4 80241134 00000000 */ nop +/* BE48E4 80241134 00000000 */ nop /* BE48E8 80241138 4500001B */ bc1f .L802411A8 /* BE48EC 8024113C 34820010 */ ori $v0, $a0, 0x10 /* BE48F0 80241140 0809046A */ j .L802411A8 @@ -87,9 +87,9 @@ glabel func_80241040_BE47F0 /* BE4934 80241184 C7A00034 */ lwc1 $f0, 0x34($sp) /* BE4938 80241188 4600D001 */ sub.s $f0, $f26, $f0 /* BE493C 8024118C 4600B03C */ c.lt.s $f22, $f0 -/* BE4940 80241190 00000000 */ nop +/* BE4940 80241190 00000000 */ nop /* BE4944 80241194 45000004 */ bc1f .L802411A8 -/* BE4948 80241198 00000000 */ nop +/* BE4948 80241198 00000000 */ nop /* BE494C 8024119C 8E22006C */ lw $v0, 0x6c($s1) /* BE4950 802411A0 34420010 */ ori $v0, $v0, 0x10 /* BE4954 802411A4 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80241040_BE47F0 /* BE495C 802411AC 24030011 */ addiu $v1, $zero, 0x11 /* BE4960 802411B0 30420011 */ andi $v0, $v0, 0x11 /* BE4964 802411B4 14430039 */ bne $v0, $v1, .L8024129C -/* BE4968 802411B8 00000000 */ nop +/* BE4968 802411B8 00000000 */ nop /* BE496C 802411BC 8E020000 */ lw $v0, ($s0) /* BE4970 802411C0 30420008 */ andi $v0, $v0, 8 /* BE4974 802411C4 1040000A */ beqz $v0, .L802411F0 @@ -108,7 +108,7 @@ glabel func_80241040_BE47F0 /* BE4984 802411D4 D42042D8 */ ldc1 $f0, %lo(D_802442D8)($at) /* BE4988 802411D8 460010A1 */ cvt.d.s $f2, $f2 /* BE498C 802411DC 46201082 */ mul.d $f2, $f2, $f0 -/* BE4990 802411E0 00000000 */ nop +/* BE4990 802411E0 00000000 */ nop /* BE4994 802411E4 4600A021 */ cvt.d.s $f0, $f20 /* BE4998 802411E8 08090495 */ j .L80241254 /* BE499C 802411EC 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80241040_BE47F0 /* BE49EC 8024123C D42042E0 */ ldc1 $f0, %lo(func_802442E0_9DB300)($at) /* BE49F0 80241240 460010A1 */ cvt.d.s $f2, $f2 /* BE49F4 80241244 46201082 */ mul.d $f2, $f2, $f0 -/* BE49F8 80241248 00000000 */ nop +/* BE49F8 80241248 00000000 */ nop /* BE49FC 8024124C 4600A021 */ cvt.d.s $f0, $f20 /* BE4A00 80241250 46220000 */ add.d $f0, $f0, $f2 .L80241254: @@ -149,7 +149,7 @@ glabel func_80241040_BE47F0 /* BE4A20 80241270 46000005 */ abs.s $f0, $f0 /* BE4A24 80241274 46000021 */ cvt.d.s $f0, $f0 /* BE4A28 80241278 4622003C */ c.lt.d $f0, $f2 -/* BE4A2C 8024127C 00000000 */ nop +/* BE4A2C 8024127C 00000000 */ nop /* BE4A30 80241280 45000036 */ bc1f .L8024135C /* BE4A34 80241284 2403FFEF */ addiu $v1, $zero, -0x11 /* BE4A38 80241288 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80241040_BE47F0 .L8024129C: /* BE4A4C 8024129C 8E220070 */ lw $v0, 0x70($s1) /* BE4A50 802412A0 1840002E */ blez $v0, .L8024135C -/* BE4A54 802412A4 00000000 */ nop +/* BE4A54 802412A4 00000000 */ nop /* BE4A58 802412A8 C62C0074 */ lwc1 $f12, 0x74($s1) /* BE4A5C 802412AC 0C00A8BB */ jal sin_deg /* BE4A60 802412B0 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80241040_BE47F0 /* BE4AB8 80241308 27A70030 */ addiu $a3, $sp, 0x30 .L8024130C: /* BE4ABC 8024130C 10400007 */ beqz $v0, .L8024132C -/* BE4AC0 80241310 00000000 */ nop +/* BE4AC0 80241310 00000000 */ nop /* BE4AC4 80241314 4616A082 */ mul.s $f2, $f20, $f22 -/* BE4AC8 80241318 00000000 */ nop +/* BE4AC8 80241318 00000000 */ nop /* BE4ACC 8024131C C7A0002C */ lwc1 $f0, 0x2c($sp) /* BE4AD0 80241320 461A0000 */ add.s $f0, $f0, $f26 /* BE4AD4 80241324 080904CE */ j .L80241338 /* BE4AD8 80241328 46020000 */ add.s $f0, $f0, $f2 .L8024132C: /* BE4ADC 8024132C 4616A002 */ mul.s $f0, $f20, $f22 -/* BE4AE0 80241330 00000000 */ nop +/* BE4AE0 80241330 00000000 */ nop /* BE4AE4 80241334 4600C000 */ add.s $f0, $f24, $f0 .L80241338: /* BE4AE8 80241338 E600003C */ swc1 $f0, 0x3c($s0) /* BE4AEC 8024133C 8E220074 */ lw $v0, 0x74($s1) /* BE4AF0 80241340 2442000A */ addiu $v0, $v0, 0xa /* BE4AF4 80241344 44826000 */ mtc1 $v0, $f12 -/* BE4AF8 80241348 00000000 */ nop +/* BE4AF8 80241348 00000000 */ nop /* BE4AFC 8024134C 0C00A6C9 */ jal clamp_angle /* BE4B00 80241350 46806320 */ cvt.s.w $f12, $f12 /* BE4B04 80241354 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80241040_BE47F0 /* BE4B14 80241364 2442FFFF */ addiu $v0, $v0, -1 /* BE4B18 80241368 8E430014 */ lw $v1, 0x14($s2) /* BE4B1C 8024136C 04600048 */ bltz $v1, .L80241490 -/* BE4B20 80241370 00000000 */ nop +/* BE4B20 80241370 00000000 */ nop /* BE4B24 80241374 8E620074 */ lw $v0, 0x74($s3) /* BE4B28 80241378 1C400042 */ bgtz $v0, .L80241484 /* BE4B2C 8024137C 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80241040_BE47F0 /* BE4B34 80241384 860200A8 */ lh $v0, 0xa8($s0) /* BE4B38 80241388 C602003C */ lwc1 $f2, 0x3c($s0) /* BE4B3C 8024138C 44820000 */ mtc1 $v0, $f0 -/* BE4B40 80241390 00000000 */ nop +/* BE4B40 80241390 00000000 */ nop /* BE4B44 80241394 46800020 */ cvt.s.w $f0, $f0 /* BE4B48 80241398 46001080 */ add.s $f2, $f2, $f0 /* BE4B4C 8024139C 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80241040_BE47F0 /* BE4B68 802413B8 C440002C */ lwc1 $f0, 0x2c($v0) /* BE4B6C 802413BC 46000021 */ cvt.d.s $f0, $f0 /* BE4B70 802413C0 4622003C */ c.lt.d $f0, $f2 -/* BE4B74 802413C4 00000000 */ nop +/* BE4B74 802413C4 00000000 */ nop /* BE4B78 802413C8 4500002C */ bc1f .L8024147C /* BE4B7C 802413CC 02A0202D */ daddu $a0, $s5, $zero /* BE4B80 802413D0 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80241040_BE47F0 /* BE4BBC 8024140C 3C01C1A0 */ lui $at, 0xc1a0 /* BE4BC0 80241410 44812000 */ mtc1 $at, $f4 /* BE4BC4 80241414 44834000 */ mtc1 $v1, $f8 -/* BE4BC8 80241418 00000000 */ nop +/* BE4BC8 80241418 00000000 */ nop /* BE4BCC 8024141C 46804220 */ cvt.s.w $f8, $f8 /* BE4BD0 80241420 44074000 */ mfc1 $a3, $f8 /* BE4BD4 80241424 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80241040_BE47F0 /* BE4C88 802414D8 0C0123F5 */ jal is_point_within_region /* BE4C8C 802414DC 8E070038 */ lw $a3, 0x38($s0) /* BE4C90 802414E0 1040001A */ beqz $v0, .L8024154C -/* BE4C94 802414E4 00000000 */ nop +/* BE4C94 802414E4 00000000 */ nop /* BE4C98 802414E8 8E060038 */ lw $a2, 0x38($s0) /* BE4C9C 802414EC 8E2200D0 */ lw $v0, 0xd0($s1) /* BE4CA0 802414F0 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80241040_BE47F0 /* BE4CB4 80241504 468073A0 */ cvt.s.w $f14, $f14 /* BE4CB8 80241508 C6020018 */ lwc1 $f2, 0x18($s0) /* BE4CBC 8024150C 4600103C */ c.lt.s $f2, $f0 -/* BE4CC0 80241510 00000000 */ nop +/* BE4CC0 80241510 00000000 */ nop /* BE4CC4 80241514 4500000D */ bc1f .L8024154C /* BE4CC8 80241518 E7A00034 */ swc1 $f0, 0x34($sp) /* BE4CCC 8024151C C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80241040_BE47F0 /* BE4D08 80241558 00621825 */ or $v1, $v1, $v0 /* BE4D0C 8024155C 00741825 */ or $v1, $v1, $s4 /* BE4D10 80241560 10600008 */ beqz $v1, .L80241584 -/* BE4D14 80241564 00000000 */ nop +/* BE4D14 80241564 00000000 */ nop /* BE4D18 80241568 8602008C */ lh $v0, 0x8c($s0) /* BE4D1C 8024156C 14400031 */ bnez $v0, .L80241634 -/* BE4D20 80241570 00000000 */ nop +/* BE4D20 80241570 00000000 */ nop /* BE4D24 80241574 8E050018 */ lw $a1, 0x18($s0) /* BE4D28 80241578 8E06000C */ lw $a2, 0xc($s0) /* BE4D2C 8024157C 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_80241040_BE47F0 /* BE4D40 80241590 44801000 */ mtc1 $zero, $f2 /* BE4D44 80241594 46000021 */ cvt.d.s $f0, $f0 /* BE4D48 80241598 46220002 */ mul.d $f0, $f0, $f2 -/* BE4D4C 8024159C 00000000 */ nop +/* BE4D4C 8024159C 00000000 */ nop /* BE4D50 802415A0 4620020D */ trunc.w.d $f8, $f0 /* BE4D54 802415A4 E628007C */ swc1 $f8, 0x7c($s1) /* BE4D58 802415A8 8E420004 */ lw $v0, 4($s2) /* BE4D5C 802415AC 18400021 */ blez $v0, .L80241634 -/* BE4D60 802415B0 00000000 */ nop +/* BE4D60 802415B0 00000000 */ nop /* BE4D64 802415B4 8602008E */ lh $v0, 0x8e($s0) /* BE4D68 802415B8 9603008E */ lhu $v1, 0x8e($s0) /* BE4D6C 802415BC 18400005 */ blez $v0, .L802415D4 @@ -375,7 +375,7 @@ glabel func_80241040_BE47F0 /* BE4D74 802415C4 A602008E */ sh $v0, 0x8e($s0) /* BE4D78 802415C8 00021400 */ sll $v0, $v0, 0x10 /* BE4D7C 802415CC 1C400019 */ bgtz $v0, .L80241634 -/* BE4D80 802415D0 00000000 */ nop +/* BE4D80 802415D0 00000000 */ nop .L802415D4: /* BE4D84 802415D4 240403E8 */ addiu $a0, $zero, 0x3e8 /* BE4D88 802415D8 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80241040_BE47F0 /* BE4DD0 80241620 18400003 */ blez $v0, .L80241630 /* BE4DD4 80241624 28620003 */ slti $v0, $v1, 3 /* BE4DD8 80241628 10400002 */ beqz $v0, .L80241634 -/* BE4DDC 8024162C 00000000 */ nop +/* BE4DDC 8024162C 00000000 */ nop .L80241630: /* BE4DE0 80241630 AE600070 */ sw $zero, 0x70($s3) .L80241634: diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241728_BE4ED8.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241728_BE4ED8.s index 2a3ed2271f..6af2776ff2 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241728_BE4ED8.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241728_BE4ED8.s @@ -42,11 +42,11 @@ glabel func_80241728_BE4ED8 .L802417BC: /* BE4F6C 802417BC 8E220070 */ lw $v0, 0x70($s1) /* BE4F70 802417C0 18400034 */ blez $v0, .L80241894 -/* BE4F74 802417C4 00000000 */ nop +/* BE4F74 802417C4 00000000 */ nop /* BE4F78 802417C8 C62C0074 */ lwc1 $f12, 0x74($s1) /* BE4F7C 802417CC 46806320 */ cvt.s.w $f12, $f12 /* BE4F80 802417D0 44820000 */ mtc1 $v0, $f0 -/* BE4F84 802417D4 00000000 */ nop +/* BE4F84 802417D4 00000000 */ nop /* BE4F88 802417D8 46800020 */ cvt.s.w $f0, $f0 /* BE4F8C 802417DC 46000021 */ cvt.d.s $f0, $f0 /* BE4F90 802417E0 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_80241728_BE4ED8 /* BE4FF0 80241840 27A70030 */ addiu $a3, $sp, 0x30 .L80241844: /* BE4FF4 80241844 10400007 */ beqz $v0, .L80241864 -/* BE4FF8 80241848 00000000 */ nop +/* BE4FF8 80241848 00000000 */ nop /* BE4FFC 8024184C 4616A082 */ mul.s $f2, $f20, $f22 -/* BE5000 80241850 00000000 */ nop +/* BE5000 80241850 00000000 */ nop /* BE5004 80241854 C7A0002C */ lwc1 $f0, 0x2c($sp) /* BE5008 80241858 46180000 */ add.s $f0, $f0, $f24 /* BE500C 8024185C 0809061C */ j .L80241870 /* BE5010 80241860 46020000 */ add.s $f0, $f0, $f2 .L80241864: /* BE5014 80241864 4616A002 */ mul.s $f0, $f20, $f22 -/* BE5018 80241868 00000000 */ nop +/* BE5018 80241868 00000000 */ nop /* BE501C 8024186C 4600D000 */ add.s $f0, $f26, $f0 .L80241870: /* BE5020 80241870 E600003C */ swc1 $f0, 0x3c($s0) /* BE5024 80241874 8E220074 */ lw $v0, 0x74($s1) /* BE5028 80241878 2442000A */ addiu $v0, $v0, 0xa /* BE502C 8024187C 44826000 */ mtc1 $v0, $f12 -/* BE5030 80241880 00000000 */ nop +/* BE5030 80241880 00000000 */ nop /* BE5034 80241884 0C00A6C9 */ jal clamp_angle /* BE5038 80241888 46806320 */ cvt.s.w $f12, $f12 /* BE503C 8024188C 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_80241728_BE4ED8 /* BE5050 802418A0 860200A8 */ lh $v0, 0xa8($s0) /* BE5054 802418A4 C600003C */ lwc1 $f0, 0x3c($s0) /* BE5058 802418A8 44821000 */ mtc1 $v0, $f2 -/* BE505C 802418AC 00000000 */ nop +/* BE505C 802418AC 00000000 */ nop /* BE5060 802418B0 468010A0 */ cvt.s.w $f2, $f2 /* BE5064 802418B4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* BE5068 802418B8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_80241728_BE4ED8 /* BE5084 802418D4 46240000 */ add.d $f0, $f0, $f4 /* BE5088 802418D8 460010A1 */ cvt.d.s $f2, $f2 /* BE508C 802418DC 4620103C */ c.lt.d $f2, $f0 -/* BE5090 802418E0 00000000 */ nop +/* BE5090 802418E0 00000000 */ nop /* BE5094 802418E4 4500002E */ bc1f .L802419A0 /* BE5098 802418E8 0280202D */ daddu $a0, $s4, $zero /* BE509C 802418EC 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_80241728_BE4ED8 /* BE50DC 8024192C 3C01C1A0 */ lui $at, 0xc1a0 /* BE50E0 80241930 44812000 */ mtc1 $at, $f4 /* BE50E4 80241934 44834000 */ mtc1 $v1, $f8 -/* BE50E8 80241938 00000000 */ nop +/* BE50E8 80241938 00000000 */ nop /* BE50EC 8024193C 46804220 */ cvt.s.w $f8, $f8 /* BE50F0 80241940 44074000 */ mfc1 $a3, $f8 /* BE50F4 80241944 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_80241728_BE4ED8 .L802419A0: /* BE5150 802419A0 8602008C */ lh $v0, 0x8c($s0) /* BE5154 802419A4 14400025 */ bnez $v0, .L80241A3C -/* BE5158 802419A8 00000000 */ nop +/* BE5158 802419A8 00000000 */ nop /* BE515C 802419AC 8602008E */ lh $v0, 0x8e($s0) /* BE5160 802419B0 1C400022 */ bgtz $v0, .L80241A3C -/* BE5164 802419B4 00000000 */ nop +/* BE5164 802419B4 00000000 */ nop /* BE5168 802419B8 8E620074 */ lw $v0, 0x74($s3) /* BE516C 802419BC 2442FFFF */ addiu $v0, $v0, -1 /* BE5170 802419C0 1840001D */ blez $v0, .L80241A38 @@ -183,7 +183,7 @@ glabel func_80241728_BE4ED8 /* BE517C 802419CC 9442002A */ lhu $v0, 0x2a($v0) /* BE5180 802419D0 30420010 */ andi $v0, $v0, 0x10 /* BE5184 802419D4 14400007 */ bnez $v0, .L802419F4 -/* BE5188 802419D8 00000000 */ nop +/* BE5188 802419D8 00000000 */ nop /* BE518C 802419DC C600000C */ lwc1 $f0, 0xc($s0) /* BE5190 802419E0 3C014334 */ lui $at, 0x4334 /* BE5194 802419E4 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241B50_BE5300.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241B50_BE5300.s index 2fc1bacd75..1dfff3546c 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241B50_BE5300.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241B50_BE5300.s @@ -60,18 +60,18 @@ glabel func_80241B50_BE5300 /* BE53D8 80241C28 C6200038 */ lwc1 $f0, 0x38($s1) /* BE53DC 80241C2C 4600018D */ trunc.w.s $f6, $f0 /* BE53E0 80241C30 44023000 */ mfc1 $v0, $f6 -/* BE53E4 80241C34 00000000 */ nop +/* BE53E4 80241C34 00000000 */ nop /* BE53E8 80241C38 A6420010 */ sh $v0, 0x10($s2) /* BE53EC 80241C3C C620003C */ lwc1 $f0, 0x3c($s1) /* BE53F0 80241C40 4600018D */ trunc.w.s $f6, $f0 /* BE53F4 80241C44 44023000 */ mfc1 $v0, $f6 -/* BE53F8 80241C48 00000000 */ nop +/* BE53F8 80241C48 00000000 */ nop /* BE53FC 80241C4C A6420012 */ sh $v0, 0x12($s2) /* BE5400 80241C50 C6200040 */ lwc1 $f0, 0x40($s1) /* BE5404 80241C54 A2430007 */ sb $v1, 7($s2) /* BE5408 80241C58 4600018D */ trunc.w.s $f6, $f0 /* BE540C 80241C5C 44023000 */ mfc1 $v0, $f6 -/* BE5410 80241C60 00000000 */ nop +/* BE5410 80241C60 00000000 */ nop /* BE5414 80241C64 A6420014 */ sh $v0, 0x14($s2) .L80241C68: /* BE5418 80241C68 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241CE8_BE5498.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241CE8_BE5498.s index e349ca4271..280dd5ee2a 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241CE8_BE5498.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241CE8_BE5498.s @@ -42,9 +42,9 @@ glabel func_80241CE8_BE5498 /* BE552C 80241D7C 44801800 */ mtc1 $zero, $f3 /* BE5530 80241D80 46002021 */ cvt.d.s $f0, $f4 /* BE5534 80241D84 4620103E */ c.le.d $f2, $f0 -/* BE5538 80241D88 00000000 */ nop +/* BE5538 80241D88 00000000 */ nop /* BE553C 80241D8C 45000030 */ bc1f .L80241E50 -/* BE5540 80241D90 00000000 */ nop +/* BE5540 80241D90 00000000 */ nop /* BE5544 80241D94 C600003C */ lwc1 $f0, 0x3c($s0) /* BE5548 80241D98 46040000 */ add.s $f0, $f0, $f4 /* BE554C 80241D9C E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_80241CE8_BE5498 /* BE55AC 80241DFC 27A70020 */ addiu $a3, $sp, 0x20 .L80241E00: /* BE55B0 80241E00 1040000B */ beqz $v0, .L80241E30 -/* BE55B4 80241E04 00000000 */ nop +/* BE55B4 80241E04 00000000 */ nop /* BE55B8 80241E08 C7A0001C */ lwc1 $f0, 0x1c($sp) /* BE55BC 80241E0C 46140080 */ add.s $f2, $f0, $f20 /* BE55C0 80241E10 C600003C */ lwc1 $f0, 0x3c($s0) /* BE55C4 80241E14 4600103E */ c.le.s $f2, $f0 -/* BE55C8 80241E18 00000000 */ nop +/* BE55C8 80241E18 00000000 */ nop /* BE55CC 80241E1C 4500008D */ bc1f .L80242054 -/* BE55D0 80241E20 00000000 */ nop +/* BE55D0 80241E20 00000000 */ nop /* BE55D4 80241E24 E602003C */ swc1 $f2, 0x3c($s0) /* BE55D8 80241E28 08090815 */ j .L80242054 /* BE55DC 80241E2C AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_80241CE8_BE5498 /* BE55E0 80241E30 C602003C */ lwc1 $f2, 0x3c($s0) /* BE55E4 80241E34 C6000064 */ lwc1 $f0, 0x64($s0) /* BE55E8 80241E38 4602003E */ c.le.s $f0, $f2 -/* BE55EC 80241E3C 00000000 */ nop +/* BE55EC 80241E3C 00000000 */ nop /* BE55F0 80241E40 45030084 */ bc1tl .L80242054 /* BE55F4 80241E44 AE400070 */ sw $zero, 0x70($s2) /* BE55F8 80241E48 08090815 */ j .L80242054 -/* BE55FC 80241E4C 00000000 */ nop +/* BE55FC 80241E4C 00000000 */ nop .L80241E50: /* BE5600 80241E50 4622003C */ c.lt.d $f0, $f2 -/* BE5604 80241E54 00000000 */ nop +/* BE5604 80241E54 00000000 */ nop /* BE5608 80241E58 4500007E */ bc1f .L80242054 -/* BE560C 80241E5C 00000000 */ nop +/* BE560C 80241E5C 00000000 */ nop /* BE5610 80241E60 9602008E */ lhu $v0, 0x8e($s0) /* BE5614 80241E64 24420001 */ addiu $v0, $v0, 1 /* BE5618 80241E68 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_80241CE8_BE5498 /* BE5624 80241E74 00021403 */ sra $v0, $v0, 0x10 /* BE5628 80241E78 0043102A */ slt $v0, $v0, $v1 /* BE562C 80241E7C 14400026 */ bnez $v0, .L80241F18 -/* BE5630 80241E80 00000000 */ nop +/* BE5630 80241E80 00000000 */ nop /* BE5634 80241E84 C60C0038 */ lwc1 $f12, 0x38($s0) /* BE5638 80241E88 C60E0040 */ lwc1 $f14, 0x40($s0) /* BE563C 80241E8C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_80241CE8_BE5498 /* BE5668 80241EB8 8E62001C */ lw $v0, 0x1c($s3) /* BE566C 80241EBC 46001005 */ abs.s $f0, $f2 /* BE5670 80241EC0 44822000 */ mtc1 $v0, $f4 -/* BE5674 80241EC4 00000000 */ nop +/* BE5674 80241EC4 00000000 */ nop /* BE5678 80241EC8 46802120 */ cvt.s.w $f4, $f4 /* BE567C 80241ECC 4600203C */ c.lt.s $f4, $f0 -/* BE5680 80241ED0 00000000 */ nop +/* BE5680 80241ED0 00000000 */ nop /* BE5684 80241ED4 4500000D */ bc1f .L80241F0C -/* BE5688 80241ED8 00000000 */ nop +/* BE5688 80241ED8 00000000 */ nop /* BE568C 80241EDC 44800000 */ mtc1 $zero, $f0 /* BE5690 80241EE0 C614000C */ lwc1 $f20, 0xc($s0) /* BE5694 80241EE4 4600103C */ c.lt.s $f2, $f0 -/* BE5698 80241EE8 00000000 */ nop +/* BE5698 80241EE8 00000000 */ nop /* BE569C 80241EEC 45000006 */ bc1f .L80241F08 /* BE56A0 80241EF0 00021023 */ negu $v0, $v0 /* BE56A4 80241EF4 44820000 */ mtc1 $v0, $f0 -/* BE56A8 80241EF8 00000000 */ nop +/* BE56A8 80241EF8 00000000 */ nop /* BE56AC 80241EFC 46800020 */ cvt.s.w $f0, $f0 /* BE56B0 80241F00 080907C3 */ j .L80241F0C /* BE56B4 80241F04 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_80241CE8_BE5498 /* BE56DC 80241F2C C600001C */ lwc1 $f0, 0x1c($s0) /* BE56E0 80241F30 46001080 */ add.s $f2, $f2, $f0 /* BE56E4 80241F34 4616103C */ c.lt.s $f2, $f22 -/* BE56E8 80241F38 00000000 */ nop +/* BE56E8 80241F38 00000000 */ nop /* BE56EC 80241F3C 45020045 */ bc1fl .L80242054 /* BE56F0 80241F40 E602003C */ swc1 $f2, 0x3c($s0) /* BE56F4 80241F44 08090814 */ j .L80242050 @@ -169,7 +169,7 @@ glabel func_80241CE8_BE5498 /* BE570C 80241F5C C600001C */ lwc1 $f0, 0x1c($s0) /* BE5710 80241F60 C604003C */ lwc1 $f4, 0x3c($s0) /* BE5714 80241F64 44821000 */ mtc1 $v0, $f2 -/* BE5718 80241F68 00000000 */ nop +/* BE5718 80241F68 00000000 */ nop /* BE571C 80241F6C 468010A0 */ cvt.s.w $f2, $f2 /* BE5720 80241F70 46000005 */ abs.s $f0, $f0 /* BE5724 80241F74 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_80241CE8_BE5498 /* BE5760 80241FB0 0C0372DF */ jal func_800DCB7C /* BE5764 80241FB4 27A70020 */ addiu $a3, $sp, 0x20 /* BE5768 80241FB8 10400015 */ beqz $v0, .L80242010 -/* BE576C 80241FBC 00000000 */ nop +/* BE576C 80241FBC 00000000 */ nop /* BE5770 80241FC0 860200A8 */ lh $v0, 0xa8($s0) /* BE5774 80241FC4 C604001C */ lwc1 $f4, 0x1c($s0) /* BE5778 80241FC8 44820000 */ mtc1 $v0, $f0 -/* BE577C 80241FCC 00000000 */ nop +/* BE577C 80241FCC 00000000 */ nop /* BE5780 80241FD0 46800020 */ cvt.s.w $f0, $f0 /* BE5784 80241FD4 46002085 */ abs.s $f2, $f4 /* BE5788 80241FD8 46020000 */ add.s $f0, $f0, $f2 /* BE578C 80241FDC C7A20024 */ lwc1 $f2, 0x24($sp) /* BE5790 80241FE0 4600103E */ c.le.s $f2, $f0 -/* BE5794 80241FE4 00000000 */ nop +/* BE5794 80241FE4 00000000 */ nop /* BE5798 80241FE8 45000005 */ bc1f .L80242000 -/* BE579C 80241FEC 00000000 */ nop +/* BE579C 80241FEC 00000000 */ nop /* BE57A0 80241FF0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* BE57A4 80241FF4 AE00001C */ sw $zero, 0x1c($s0) /* BE57A8 80241FF8 08090815 */ j .L80242054 @@ -217,13 +217,13 @@ glabel func_80241CE8_BE5498 /* BE57C4 80242014 860200A8 */ lh $v0, 0xa8($s0) /* BE57C8 80242018 46163081 */ sub.s $f2, $f6, $f22 /* BE57CC 8024201C 44820000 */ mtc1 $v0, $f0 -/* BE57D0 80242020 00000000 */ nop +/* BE57D0 80242020 00000000 */ nop /* BE57D4 80242024 46800020 */ cvt.s.w $f0, $f0 /* BE57D8 80242028 46001080 */ add.s $f2, $f2, $f0 /* BE57DC 8024202C C604001C */ lwc1 $f4, 0x1c($s0) /* BE57E0 80242030 46002005 */ abs.s $f0, $f4 /* BE57E4 80242034 4602003C */ c.lt.s $f0, $f2 -/* BE57E8 80242038 00000000 */ nop +/* BE57E8 80242038 00000000 */ nop /* BE57EC 8024203C 45020005 */ bc1fl .L80242054 /* BE57F0 80242040 AE00001C */ sw $zero, 0x1c($s0) /* BE57F4 80242044 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242078_BE5828.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242078_BE5828.s index cee75ca991..d2e216a6c9 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242078_BE5828.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242078_BE5828.s @@ -49,15 +49,15 @@ glabel func_80242078_BE5828 /* BE58D0 80242120 44802000 */ mtc1 $zero, $f4 /* BE58D4 80242124 460010A1 */ cvt.d.s $f2, $f2 /* BE58D8 80242128 46241082 */ mul.d $f2, $f2, $f4 -/* BE58DC 8024212C 00000000 */ nop +/* BE58DC 8024212C 00000000 */ nop /* BE58E0 80242130 C7A0001C */ lwc1 $f0, 0x1c($sp) /* BE58E4 80242134 46000021 */ cvt.d.s $f0, $f0 /* BE58E8 80242138 46240002 */ mul.d $f0, $f0, $f4 -/* BE58EC 8024213C 00000000 */ nop +/* BE58EC 8024213C 00000000 */ nop /* BE58F0 80242140 3C013FE0 */ lui $at, 0x3fe0 /* BE58F4 80242144 44812800 */ mtc1 $at, $f5 /* BE58F8 80242148 44802000 */ mtc1 $zero, $f4 -/* BE58FC 8024214C 00000000 */ nop +/* BE58FC 8024214C 00000000 */ nop /* BE5900 80242150 46241080 */ add.d $f2, $f2, $f4 /* BE5904 80242154 AE000074 */ sw $zero, 0x74($s0) /* BE5908 80242158 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s index e02ce0062e..19f9d51e88 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s @@ -54,7 +54,7 @@ glabel func_8024219C_BE594C /* BE5A0C 8024225C 8E4300B0 */ lw $v1, 0xb0($s2) /* BE5A10 80242260 30620004 */ andi $v0, $v1, 4 /* BE5A14 80242264 10400007 */ beqz $v0, .L80242284 -/* BE5A18 80242268 00000000 */ nop +/* BE5A18 80242268 00000000 */ nop /* BE5A1C 8024226C 824200B4 */ lb $v0, 0xb4($s2) /* BE5A20 80242270 1440003C */ bnez $v0, .L80242364 /* BE5A24 80242274 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_8024219C_BE594C /* BE5A38 80242288 2C62000F */ sltiu $v0, $v1, 0xf /* BE5A3C 8024228C 10400034 */ beqz $v0, .L80242360 /* BE5A40 80242290 00031080 */ sll $v0, $v1, 2 -/* BE5A44 80242294 3C018024 */ lui $at, %hi(D_802442E8) +/* BE5A44 80242294 3C018024 */ lui $at, %hi(jtbl_802442E8_BE7A98) /* BE5A48 80242298 00220821 */ addu $at, $at, $v0 -/* BE5A4C 8024229C 8C2242E8 */ lw $v0, %lo(D_802442E8)($at) +/* BE5A4C 8024229C 8C2242E8 */ lw $v0, %lo(jtbl_802442E8_BE7A98)($at) /* BE5A50 802422A0 00400008 */ jr $v0 -/* BE5A54 802422A4 00000000 */ nop +/* BE5A54 802422A4 00000000 */ nop +glabel L802422A8_BE5A58 /* BE5A58 802422A8 0280202D */ daddu $a0, $s4, $zero /* BE5A5C 802422AC 0200282D */ daddu $a1, $s0, $zero /* BE5A60 802422B0 0C0903A4 */ jal func_80240E90_BE4640 /* BE5A64 802422B4 0260302D */ daddu $a2, $s3, $zero +glabel L802422B8_BE5A68 /* BE5A68 802422B8 0280202D */ daddu $a0, $s4, $zero /* BE5A6C 802422BC 0200282D */ daddu $a1, $s0, $zero /* BE5A70 802422C0 0C090410 */ jal func_80241040_BE47F0 /* BE5A74 802422C4 0260302D */ daddu $a2, $s3, $zero /* BE5A78 802422C8 080908D9 */ j .L80242364 /* BE5A7C 802422CC 0000102D */ daddu $v0, $zero, $zero +glabel L802422D0_BE5A80 /* BE5A80 802422D0 0280202D */ daddu $a0, $s4, $zero /* BE5A84 802422D4 0200282D */ daddu $a1, $s0, $zero /* BE5A88 802422D8 0C09059A */ jal dup_arn_04_UnkNpcAIFunc1 /* BE5A8C 802422DC 0260302D */ daddu $a2, $s3, $zero +glabel L802422E0_BE5A90 /* BE5A90 802422E0 0280202D */ daddu $a0, $s4, $zero /* BE5A94 802422E4 0200282D */ daddu $a1, $s0, $zero /* BE5A98 802422E8 0C0905CA */ jal func_80241728_BE4ED8 /* BE5A9C 802422EC 0260302D */ daddu $a2, $s3, $zero /* BE5AA0 802422F0 080908D9 */ j .L80242364 /* BE5AA4 802422F4 0000102D */ daddu $v0, $zero, $zero +glabel L802422F8_BE5AA8 /* BE5AA8 802422F8 0280202D */ daddu $a0, $s4, $zero /* BE5AAC 802422FC 0200282D */ daddu $a1, $s0, $zero /* BE5AB0 80242300 0C09069B */ jal arn_04_UnkNpcAIFunc2 /* BE5AB4 80242304 0260302D */ daddu $a2, $s3, $zero +glabel L80242308_BE5AB8 /* BE5AB8 80242308 0280202D */ daddu $a0, $s4, $zero /* BE5ABC 8024230C 0200282D */ daddu $a1, $s0, $zero /* BE5AC0 80242310 0C0906B9 */ jal func_80241AE4_BE5294 /* BE5AC4 80242314 0260302D */ daddu $a2, $s3, $zero /* BE5AC8 80242318 080908D9 */ j .L80242364 /* BE5ACC 8024231C 0000102D */ daddu $v0, $zero, $zero +glabel L80242320_BE5AD0 /* BE5AD0 80242320 0280202D */ daddu $a0, $s4, $zero /* BE5AD4 80242324 0200282D */ daddu $a1, $s0, $zero /* BE5AD8 80242328 0C0906D4 */ jal func_80241B50_BE5300 /* BE5ADC 8024232C 0260302D */ daddu $a2, $s3, $zero /* BE5AE0 80242330 080908D9 */ j .L80242364 /* BE5AE4 80242334 0000102D */ daddu $v0, $zero, $zero +glabel L80242338_BE5AE8 /* BE5AE8 80242338 0280202D */ daddu $a0, $s4, $zero /* BE5AEC 8024233C 0200282D */ daddu $a1, $s0, $zero /* BE5AF0 80242340 0C090721 */ jal arn_04_UnkNpcAIFunc3 /* BE5AF4 80242344 0260302D */ daddu $a2, $s3, $zero /* BE5AF8 80242348 080908D9 */ j .L80242364 /* BE5AFC 8024234C 0000102D */ daddu $v0, $zero, $zero +glabel L80242350_BE5B00 /* BE5B00 80242350 0280202D */ daddu $a0, $s4, $zero /* BE5B04 80242354 0200282D */ daddu $a1, $s0, $zero /* BE5B08 80242358 0C09073A */ jal func_80241CE8_BE5498 /* BE5B0C 8024235C 0260302D */ daddu $a2, $s3, $zero .L80242360: +glabel L80242360_BE5B10 /* BE5B10 80242360 0000102D */ daddu $v0, $zero, $zero .L80242364: /* BE5B14 80242364 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242388_BE5B38.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242388_BE5B38.s index 6f17aeffd6..5720cdad17 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242388_BE5B38.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242388_BE5B38.s @@ -42,9 +42,9 @@ glabel func_80242388_BE5B38 /* BE5BCC 8024241C D4224328 */ ldc1 $f2, %lo(D_80244328)($at) /* BE5BD0 80242420 46000021 */ cvt.d.s $f0, $f0 /* BE5BD4 80242424 4622003C */ c.lt.d $f0, $f2 -/* BE5BD8 80242428 00000000 */ nop +/* BE5BD8 80242428 00000000 */ nop /* BE5BDC 8024242C 45000003 */ bc1f .L8024243C -/* BE5BE0 80242430 00000000 */ nop +/* BE5BE0 80242430 00000000 */ nop /* BE5BE4 80242434 3C0142B4 */ lui $at, 0x42b4 /* BE5BE8 80242438 4481A000 */ mtc1 $at, $f20 .L8024243C: @@ -64,7 +64,7 @@ glabel func_80242388_BE5B38 /* BE5C20 80242470 D4224330 */ ldc1 $f2, %lo(D_80244330)($at) /* BE5C24 80242474 46000021 */ cvt.d.s $f0, $f0 /* BE5C28 80242478 4620103C */ c.lt.d $f2, $f0 -/* BE5C2C 8024247C 00000000 */ nop +/* BE5C2C 8024247C 00000000 */ nop /* BE5C30 80242480 45030001 */ bc1tl .L80242488 /* BE5C34 80242484 0000802D */ daddu $s0, $zero, $zero .L80242488: @@ -76,7 +76,7 @@ glabel func_80242388_BE5B38 /* BE5C4C 8024249C 44811000 */ mtc1 $at, $f2 /* BE5C50 802424A0 46000005 */ abs.s $f0, $f0 /* BE5C54 802424A4 4600103E */ c.le.s $f2, $f0 -/* BE5C58 802424A8 00000000 */ nop +/* BE5C58 802424A8 00000000 */ nop /* BE5C5C 802424AC 45030001 */ bc1tl .L802424B4 /* BE5C60 802424B0 0000802D */ daddu $s0, $zero, $zero .L802424B4: diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024255C_BE5D0C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024255C_BE5D0C.s index 12f69e78c6..a9bd6036cc 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024255C_BE5D0C.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024255C_BE5D0C.s @@ -25,7 +25,7 @@ glabel func_8024255C_BE5D0C /* BE5D5C 802425AC D4224338 */ ldc1 $f2, %lo(D_80244338)($at) /* BE5D60 802425B0 46000021 */ cvt.d.s $f0, $f0 /* BE5D64 802425B4 46220002 */ mul.d $f0, $f0, $f2 -/* BE5D68 802425B8 00000000 */ nop +/* BE5D68 802425B8 00000000 */ nop /* BE5D6C 802425BC 0280202D */ daddu $a0, $s4, $zero /* BE5D70 802425C0 AFA00010 */ sw $zero, 0x10($sp) /* BE5D74 802425C4 8E470010 */ lw $a3, 0x10($s2) @@ -47,7 +47,7 @@ glabel func_8024255C_BE5D0C /* BE5DB4 80242604 3C01C1A0 */ lui $at, 0xc1a0 /* BE5DB8 80242608 44812000 */ mtc1 $at, $f4 /* BE5DBC 8024260C 44823000 */ mtc1 $v0, $f6 -/* BE5DC0 80242610 00000000 */ nop +/* BE5DC0 80242610 00000000 */ nop /* BE5DC4 80242614 468031A0 */ cvt.s.w $f6, $f6 /* BE5DC8 80242618 44073000 */ mfc1 $a3, $f6 /* BE5DCC 8024261C 2402000F */ addiu $v0, $zero, 0xf diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024268C_BE5E3C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024268C_BE5E3C.s index a92bf665dc..564e338d68 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024268C_BE5E3C.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024268C_BE5E3C.s @@ -17,7 +17,7 @@ glabel func_8024268C_BE5E3C /* BE5E6C 802426BC A602008E */ sh $v0, 0x8e($s0) /* BE5E70 802426C0 00021400 */ sll $v0, $v0, 0x10 /* BE5E74 802426C4 1C400012 */ bgtz $v0, .L80242710 -/* BE5E78 802426C8 00000000 */ nop +/* BE5E78 802426C8 00000000 */ nop /* BE5E7C 802426CC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* BE5E80 802426D0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* BE5E84 802426D4 C60C0038 */ lwc1 $f12, 0x38($s0) diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242728_BE5ED8.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242728_BE5ED8.s index 60359f5a26..805a6d545f 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242728_BE5ED8.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242728_BE5ED8.s @@ -16,7 +16,7 @@ glabel func_80242728_BE5ED8 /* BE5F04 80242754 A602008E */ sh $v0, 0x8e($s0) /* BE5F08 80242758 00021400 */ sll $v0, $v0, 0x10 /* BE5F0C 8024275C 1C40000F */ bgtz $v0, .L8024279C -/* BE5F10 80242760 00000000 */ nop +/* BE5F10 80242760 00000000 */ nop /* BE5F14 80242764 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* BE5F18 80242768 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* BE5F1C 8024276C C60C0038 */ lwc1 $f12, 0x38($s0) diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_802427B0_BE5F60.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_802427B0_BE5F60.s index 7ffdce66b8..e16d5fa92f 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_802427B0_BE5F60.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_802427B0_BE5F60.s @@ -16,7 +16,7 @@ glabel func_802427B0_BE5F60 /* BE5F8C 802427DC 0040802D */ daddu $s0, $v0, $zero /* BE5F90 802427E0 C60C000C */ lwc1 $f12, 0xc($s0) /* BE5F94 802427E4 44820000 */ mtc1 $v0, $f0 -/* BE5F98 802427E8 00000000 */ nop +/* BE5F98 802427E8 00000000 */ nop /* BE5F9C 802427EC 46800020 */ cvt.s.w $f0, $f0 /* BE5FA0 802427F0 46006300 */ add.s $f12, $f12, $f0 /* BE5FA4 802427F4 3C0142B4 */ lui $at, 0x42b4 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242858_BE6008.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242858_BE6008.s index 9ef073bac0..4499d5b5d9 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242858_BE6008.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242858_BE6008.s @@ -22,7 +22,7 @@ glabel func_80242858_BE6008 /* BE604C 8024289C 0C01242D */ jal func_800490B4 /* BE6050 802428A0 0040802D */ daddu $s0, $v0, $zero /* BE6054 802428A4 1040000B */ beqz $v0, .L802428D4 -/* BE6058 802428A8 00000000 */ nop +/* BE6058 802428A8 00000000 */ nop /* BE605C 802428AC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* BE6060 802428B0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* BE6064 802428B4 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -39,7 +39,7 @@ glabel func_80242858_BE6008 /* BE608C 802428DC A602008E */ sh $v0, 0x8e($s0) /* BE6090 802428E0 00021400 */ sll $v0, $v0, 0x10 /* BE6094 802428E4 1C400032 */ bgtz $v0, .L802429B0 -/* BE6098 802428E8 00000000 */ nop +/* BE6098 802428E8 00000000 */ nop /* BE609C 802428EC 8E620074 */ lw $v0, 0x74($s3) /* BE60A0 802428F0 2442FFFF */ addiu $v0, $v0, -1 /* BE60A4 802428F4 18400014 */ blez $v0, .L80242948 @@ -77,7 +77,7 @@ glabel func_80242858_BE6008 /* BE6120 80242970 2402000C */ addiu $v0, $zero, 0xc /* BE6124 80242974 AFA2001C */ sw $v0, 0x1c($sp) /* BE6128 80242978 44833000 */ mtc1 $v1, $f6 -/* BE612C 8024297C 00000000 */ nop +/* BE612C 8024297C 00000000 */ nop /* BE6130 80242980 468031A0 */ cvt.s.w $f6, $f6 /* BE6134 80242984 44073000 */ mfc1 $a3, $f6 /* BE6138 80242988 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242A1C_BE61CC.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242A1C_BE61CC.s index 7a9a540ae9..0fe2a77788 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242A1C_BE61CC.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242A1C_BE61CC.s @@ -55,23 +55,23 @@ glabel func_80242A1C_BE61CC /* BE6290 80242AE0 A602008E */ sh $v0, 0x8e($s0) /* BE6294 80242AE4 00021400 */ sll $v0, $v0, 0x10 /* BE6298 80242AE8 1C40002C */ bgtz $v0, .L80242B9C -/* BE629C 80242AEC 00000000 */ nop +/* BE629C 80242AEC 00000000 */ nop /* BE62A0 80242AF0 C6000038 */ lwc1 $f0, 0x38($s0) /* BE62A4 80242AF4 4600010D */ trunc.w.s $f4, $f0 /* BE62A8 80242AF8 44022000 */ mfc1 $v0, $f4 -/* BE62AC 80242AFC 00000000 */ nop +/* BE62AC 80242AFC 00000000 */ nop /* BE62B0 80242B00 A6220010 */ sh $v0, 0x10($s1) /* BE62B4 80242B04 C600003C */ lwc1 $f0, 0x3c($s0) /* BE62B8 80242B08 4600010D */ trunc.w.s $f4, $f0 /* BE62BC 80242B0C 44022000 */ mfc1 $v0, $f4 -/* BE62C0 80242B10 00000000 */ nop +/* BE62C0 80242B10 00000000 */ nop /* BE62C4 80242B14 A6220012 */ sh $v0, 0x12($s1) /* BE62C8 80242B18 C6000040 */ lwc1 $f0, 0x40($s0) /* BE62CC 80242B1C 24020001 */ addiu $v0, $zero, 1 /* BE62D0 80242B20 A2220007 */ sb $v0, 7($s1) /* BE62D4 80242B24 4600010D */ trunc.w.s $f4, $f0 /* BE62D8 80242B28 44022000 */ mfc1 $v0, $f4 -/* BE62DC 80242B2C 00000000 */ nop +/* BE62DC 80242B2C 00000000 */ nop /* BE62E0 80242B30 A6220014 */ sh $v0, 0x14($s1) /* BE62E4 80242B34 C6800018 */ lwc1 $f0, 0x18($s4) /* BE62E8 80242B38 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -89,7 +89,7 @@ glabel func_80242A1C_BE61CC /* BE6318 80242B68 46220000 */ add.d $f0, $f0, $f2 /* BE631C 80242B6C 4620010D */ trunc.w.d $f4, $f0 /* BE6320 80242B70 44022000 */ mfc1 $v0, $f4 -/* BE6324 80242B74 00000000 */ nop +/* BE6324 80242B74 00000000 */ nop /* BE6328 80242B78 A602008E */ sh $v0, 0x8e($s0) /* BE632C 80242B7C 00021400 */ sll $v0, $v0, 0x10 /* BE6330 80242B80 00021403 */ sra $v0, $v0, 0x10 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242BBC_BE636C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242BBC_BE636C.s index 4303bdd565..5bbe31107e 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242BBC_BE636C.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242BBC_BE636C.s @@ -55,13 +55,13 @@ glabel func_80242BBC_BE636C /* BE6434 80242C84 860200A8 */ lh $v0, 0xa8($s0) /* BE6438 80242C88 27A50020 */ addiu $a1, $sp, 0x20 /* BE643C 80242C8C 44820000 */ mtc1 $v0, $f0 -/* BE6440 80242C90 00000000 */ nop +/* BE6440 80242C90 00000000 */ nop /* BE6444 80242C94 46800020 */ cvt.s.w $f0, $f0 /* BE6448 80242C98 E7A00018 */ swc1 $f0, 0x18($sp) /* BE644C 80242C9C 860200A6 */ lh $v0, 0xa6($s0) /* BE6450 80242CA0 27A60024 */ addiu $a2, $sp, 0x24 /* BE6454 80242CA4 44820000 */ mtc1 $v0, $f0 -/* BE6458 80242CA8 00000000 */ nop +/* BE6458 80242CA8 00000000 */ nop /* BE645C 80242CAC 46800020 */ cvt.s.w $f0, $f0 /* BE6460 80242CB0 E7A0001C */ swc1 $f0, 0x1c($sp) /* BE6464 80242CB4 8E040080 */ lw $a0, 0x80($s0) diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242D0C_BE64BC.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242D0C_BE64BC.s index 7ce030dd89..78473becbf 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242D0C_BE64BC.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242D0C_BE64BC.s @@ -18,14 +18,14 @@ glabel func_80242D0C_BE64BC /* BE64F0 80242D40 A462008E */ sh $v0, 0x8e($v1) /* BE64F4 80242D44 00021400 */ sll $v0, $v0, 0x10 /* BE64F8 80242D48 1C400015 */ bgtz $v0, .L80242DA0 -/* BE64FC 80242D4C 00000000 */ nop +/* BE64FC 80242D4C 00000000 */ nop /* BE6500 80242D50 8E0200CC */ lw $v0, 0xcc($s0) /* BE6504 80242D54 8C420004 */ lw $v0, 4($v0) /* BE6508 80242D58 AC620028 */ sw $v0, 0x28($v1) /* BE650C 80242D5C 8E0200D0 */ lw $v0, 0xd0($s0) /* BE6510 80242D60 8C420014 */ lw $v0, 0x14($v0) /* BE6514 80242D64 04410004 */ bgez $v0, .L80242D78 -/* BE6518 80242D68 00000000 */ nop +/* BE6518 80242D68 00000000 */ nop /* BE651C 80242D6C C6200000 */ lwc1 $f0, ($s1) /* BE6520 80242D70 08090B66 */ j .L80242D98 /* BE6524 80242D74 E4600018 */ swc1 $f0, 0x18($v1) @@ -33,7 +33,7 @@ glabel func_80242D0C_BE64BC /* BE6528 80242D78 3C018024 */ lui $at, %hi(D_80244348) /* BE652C 80242D7C D4224348 */ ldc1 $f2, %lo(D_80244348)($at) /* BE6530 80242D80 44820000 */ mtc1 $v0, $f0 -/* BE6534 80242D84 00000000 */ nop +/* BE6534 80242D84 00000000 */ nop /* BE6538 80242D88 46800021 */ cvt.d.w $f0, $f0 /* BE653C 80242D8C 46220003 */ div.d $f0, $f0, $f2 /* BE6540 80242D90 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242DB8_BE6568.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242DB8_BE6568.s index 90aa3dee54..f0a81a4660 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242DB8_BE6568.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242DB8_BE6568.s @@ -22,7 +22,7 @@ glabel func_80242DB8_BE6568 /* BE65AC 80242DFC 0C01242D */ jal func_800490B4 /* BE65B0 80242E00 0040802D */ daddu $s0, $v0, $zero /* BE65B4 80242E04 1040000C */ beqz $v0, .L80242E38 -/* BE65B8 80242E08 00000000 */ nop +/* BE65B8 80242E08 00000000 */ nop /* BE65BC 80242E0C C60C0038 */ lwc1 $f12, 0x38($s0) /* BE65C0 80242E10 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* BE65C4 80242E14 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -45,10 +45,10 @@ glabel func_80242DB8_BE6568 /* BE6604 80242E54 46802120 */ cvt.s.w $f4, $f4 /* BE6608 80242E58 44072000 */ mfc1 $a3, $f4 /* BE660C 80242E5C 0C00A7B5 */ jal dist2D -/* BE6610 80242E60 00000000 */ nop +/* BE6610 80242E60 00000000 */ nop /* BE6614 80242E64 C6020018 */ lwc1 $f2, 0x18($s0) /* BE6618 80242E68 4602003E */ c.le.s $f0, $f2 -/* BE661C 80242E6C 00000000 */ nop +/* BE661C 80242E6C 00000000 */ nop /* BE6620 80242E70 45000005 */ bc1f .L80242E88 /* BE6624 80242E74 2402000A */ addiu $v0, $zero, 0xa /* BE6628 80242E78 A602008E */ sh $v0, 0x8e($s0) @@ -58,7 +58,7 @@ glabel func_80242DB8_BE6568 .L80242E88: /* BE6638 80242E88 8602008C */ lh $v0, 0x8c($s0) /* BE663C 80242E8C 14400011 */ bnez $v0, .L80242ED4 -/* BE6640 80242E90 00000000 */ nop +/* BE6640 80242E90 00000000 */ nop /* BE6644 80242E94 C60C0038 */ lwc1 $f12, 0x38($s0) /* BE6648 80242E98 8E4200D0 */ lw $v0, 0xd0($s2) /* BE664C 80242E9C C60E0040 */ lwc1 $f14, 0x40($s0) @@ -69,7 +69,7 @@ glabel func_80242DB8_BE6568 /* BE6660 80242EB0 46802120 */ cvt.s.w $f4, $f4 /* BE6664 80242EB4 44072000 */ mfc1 $a3, $f4 /* BE6668 80242EB8 0C00A720 */ jal atan2 -/* BE666C 80242EBC 00000000 */ nop +/* BE666C 80242EBC 00000000 */ nop /* BE6670 80242EC0 8E050018 */ lw $a1, 0x18($s0) /* BE6674 80242EC4 44060000 */ mfc1 $a2, $f0 /* BE6678 80242EC8 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242EF0_BE66A0.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242EF0_BE66A0.s index d41132581b..219823edf0 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242EF0_BE66A0.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242EF0_BE66A0.s @@ -19,7 +19,7 @@ glabel func_80242EF0_BE66A0 .L80242F28: /* BE66D8 80242F28 8482008C */ lh $v0, 0x8c($a0) /* BE66DC 80242F2C 1440000A */ bnez $v0, .L80242F58 -/* BE66E0 80242F30 00000000 */ nop +/* BE66E0 80242F30 00000000 */ nop /* BE66E4 80242F34 8482008E */ lh $v0, 0x8e($a0) /* BE66E8 80242F38 1C400007 */ bgtz $v0, .L80242F58 /* BE66EC 80242F3C 24020008 */ addiu $v0, $zero, 8 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s index 8657549f3f..566fa1c5d3 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s @@ -71,7 +71,7 @@ glabel func_80243018_BE67C8 /* BE68C4 80243114 8E4300B0 */ lw $v1, 0xb0($s2) /* BE68C8 80243118 30620004 */ andi $v0, $v1, 4 /* BE68CC 8024311C 10400007 */ beqz $v0, .L8024313C -/* BE68D0 80243120 00000000 */ nop +/* BE68D0 80243120 00000000 */ nop /* BE68D4 80243124 824200B4 */ lb $v0, 0xb4($s2) /* BE68D8 80243128 14400086 */ bnez $v0, .L80243344 /* BE68DC 8024312C 0000102D */ daddu $v0, $zero, $zero @@ -95,15 +95,17 @@ glabel func_80243018_BE67C8 /* BE691C 8024316C 2C620035 */ sltiu $v0, $v1, 0x35 /* BE6920 80243170 10400073 */ beqz $v0, .L80243340 /* BE6924 80243174 00031080 */ sll $v0, $v1, 2 -/* BE6928 80243178 3C018024 */ lui $at, %hi(D_80244350) +/* BE6928 80243178 3C018024 */ lui $at, %hi(jtbl_80244350_BE7B00) /* BE692C 8024317C 00220821 */ addu $at, $at, $v0 -/* BE6930 80243180 8C224350 */ lw $v0, %lo(D_80244350)($at) +/* BE6930 80243180 8C224350 */ lw $v0, %lo(jtbl_80244350_BE7B00)($at) /* BE6934 80243184 00400008 */ jr $v0 -/* BE6938 80243188 00000000 */ nop +/* BE6938 80243188 00000000 */ nop +glabel L8024318C_BE693C /* BE693C 8024318C 0260202D */ daddu $a0, $s3, $zero /* BE6940 80243190 0280282D */ daddu $a1, $s4, $zero /* BE6944 80243194 0C09093A */ jal func_802424E8_BE5C98 /* BE6948 80243198 0200302D */ daddu $a2, $s0, $zero +glabel L8024319C_BE694C /* BE694C 8024319C 0260202D */ daddu $a0, $s3, $zero /* BE6950 802431A0 0280282D */ daddu $a1, $s4, $zero /* BE6954 802431A4 0C090957 */ jal func_8024255C_BE5D0C @@ -112,6 +114,7 @@ glabel func_80243018_BE67C8 /* BE6960 802431B0 24020002 */ addiu $v0, $zero, 2 /* BE6964 802431B4 14620063 */ bne $v1, $v0, .L80243344 /* BE6968 802431B8 0000102D */ daddu $v0, $zero, $zero +glabel L802431BC_BE696C /* BE696C 802431BC 0260202D */ daddu $a0, $s3, $zero /* BE6970 802431C0 0280282D */ daddu $a1, $s4, $zero /* BE6974 802431C4 0C0909A3 */ jal func_8024268C_BE5E3C @@ -120,6 +123,7 @@ glabel func_80243018_BE67C8 /* BE6980 802431D0 24020003 */ addiu $v0, $zero, 3 /* BE6984 802431D4 1462005B */ bne $v1, $v0, .L80243344 /* BE6988 802431D8 0000102D */ daddu $v0, $zero, $zero +glabel L802431DC_BE698C /* BE698C 802431DC 0260202D */ daddu $a0, $s3, $zero /* BE6990 802431E0 0280282D */ daddu $a1, $s4, $zero /* BE6994 802431E4 0C0909CA */ jal func_80242728_BE5ED8 @@ -128,16 +132,19 @@ glabel func_80243018_BE67C8 /* BE69A0 802431F0 24020004 */ addiu $v0, $zero, 4 /* BE69A4 802431F4 14620053 */ bne $v1, $v0, .L80243344 /* BE69A8 802431F8 0000102D */ daddu $v0, $zero, $zero +glabel L802431FC_BE69AC /* BE69AC 802431FC 0260202D */ daddu $a0, $s3, $zero /* BE69B0 80243200 0280282D */ daddu $a1, $s4, $zero /* BE69B4 80243204 0C0909EC */ jal func_802427B0_BE5F60 /* BE69B8 80243208 0200302D */ daddu $a2, $s0, $zero +glabel L8024320C_BE69BC /* BE69BC 8024320C 0260202D */ daddu $a0, $s3, $zero /* BE69C0 80243210 0280282D */ daddu $a1, $s4, $zero /* BE69C4 80243214 0C090A16 */ jal func_80242858_BE6008 /* BE69C8 80243218 0200302D */ daddu $a2, $s0, $zero /* BE69CC 8024321C 08090CD1 */ j .L80243344 /* BE69D0 80243220 0000102D */ daddu $v0, $zero, $zero +glabel L80243224_BE69D4 /* BE69D4 80243224 0260202D */ daddu $a0, $s3, $zero /* BE69D8 80243228 0280282D */ daddu $a1, $s4, $zero /* BE69DC 8024322C 0C0127DF */ jal func_80049F7C @@ -146,6 +153,7 @@ glabel func_80243018_BE67C8 /* BE69E8 80243238 2402000D */ addiu $v0, $zero, 0xd /* BE69EC 8024323C 14620041 */ bne $v1, $v0, .L80243344 /* BE69F0 80243240 0000102D */ daddu $v0, $zero, $zero +glabel L80243244_BE69F4 /* BE69F4 80243244 0260202D */ daddu $a0, $s3, $zero /* BE69F8 80243248 0280282D */ daddu $a1, $s4, $zero /* BE69FC 8024324C 0C012849 */ jal func_8004A124 @@ -154,6 +162,7 @@ glabel func_80243018_BE67C8 /* BE6A08 80243258 2402000E */ addiu $v0, $zero, 0xe /* BE6A0C 8024325C 14620039 */ bne $v1, $v0, .L80243344 /* BE6A10 80243260 0000102D */ daddu $v0, $zero, $zero +glabel L80243264_BE6A14 /* BE6A14 80243264 96A2008E */ lhu $v0, 0x8e($s5) /* BE6A18 80243268 2442FFFF */ addiu $v0, $v0, -1 /* BE6A1C 8024326C A6A2008E */ sh $v0, 0x8e($s5) @@ -163,22 +172,26 @@ glabel func_80243018_BE67C8 /* BE6A2C 8024327C 24020028 */ addiu $v0, $zero, 0x28 /* BE6A30 80243280 08090CD0 */ j .L80243340 /* BE6A34 80243284 AE620070 */ sw $v0, 0x70($s3) +glabel L80243288_BE6A38 /* BE6A38 80243288 0260202D */ daddu $a0, $s3, $zero /* BE6A3C 8024328C 0280282D */ daddu $a1, $s4, $zero /* BE6A40 80243290 0C090A73 */ jal func_802429CC_BE617C /* BE6A44 80243294 0200302D */ daddu $a2, $s0, $zero +glabel L80243298_BE6A48 /* BE6A48 80243298 0260202D */ daddu $a0, $s3, $zero /* BE6A4C 8024329C 0280282D */ daddu $a1, $s4, $zero /* BE6A50 802432A0 0C090A87 */ jal func_80242A1C_BE61CC /* BE6A54 802432A4 0200302D */ daddu $a2, $s0, $zero /* BE6A58 802432A8 08090CD1 */ j .L80243344 /* BE6A5C 802432AC 0000102D */ daddu $v0, $zero, $zero +glabel L802432B0_BE6A60 /* BE6A60 802432B0 0260202D */ daddu $a0, $s3, $zero /* BE6A64 802432B4 0280282D */ daddu $a1, $s4, $zero /* BE6A68 802432B8 0C090AEF */ jal func_80242BBC_BE636C /* BE6A6C 802432BC 0200302D */ daddu $a2, $s0, $zero /* BE6A70 802432C0 08090CD1 */ j .L80243344 /* BE6A74 802432C4 0000102D */ daddu $v0, $zero, $zero +glabel L802432C8_BE6A78 /* BE6A78 802432C8 0260202D */ daddu $a0, $s3, $zero /* BE6A7C 802432CC 0280282D */ daddu $a1, $s4, $zero /* BE6A80 802432D0 0C090B43 */ jal func_80242D0C_BE64BC @@ -187,16 +200,19 @@ glabel func_80243018_BE67C8 /* BE6A8C 802432DC 24020029 */ addiu $v0, $zero, 0x29 /* BE6A90 802432E0 14620018 */ bne $v1, $v0, .L80243344 /* BE6A94 802432E4 0000102D */ daddu $v0, $zero, $zero +glabel L802432E8_BE6A98 /* BE6A98 802432E8 0260202D */ daddu $a0, $s3, $zero /* BE6A9C 802432EC 0280282D */ daddu $a1, $s4, $zero /* BE6AA0 802432F0 0C090B6E */ jal func_80242DB8_BE6568 /* BE6AA4 802432F4 0200302D */ daddu $a2, $s0, $zero /* BE6AA8 802432F8 08090CD1 */ j .L80243344 /* BE6AAC 802432FC 0000102D */ daddu $v0, $zero, $zero +glabel L80243300_BE6AB0 /* BE6AB0 80243300 0260202D */ daddu $a0, $s3, $zero /* BE6AB4 80243304 0280282D */ daddu $a1, $s4, $zero /* BE6AB8 80243308 0C090BBC */ jal func_80242EF0_BE66A0 /* BE6ABC 8024330C 0200302D */ daddu $a2, $s0, $zero +glabel L80243310_BE6AC0 /* BE6AC0 80243310 0260202D */ daddu $a0, $s3, $zero /* BE6AC4 80243314 0280282D */ daddu $a1, $s4, $zero /* BE6AC8 80243318 0C090BDB */ jal func_80242F6C_BE671C @@ -205,11 +221,13 @@ glabel func_80243018_BE67C8 /* BE6AD4 80243324 24020034 */ addiu $v0, $zero, 0x34 /* BE6AD8 80243328 14620006 */ bne $v1, $v0, .L80243344 /* BE6ADC 8024332C 0000102D */ daddu $v0, $zero, $zero +glabel L80243330_BE6AE0 /* BE6AE0 80243330 0260202D */ daddu $a0, $s3, $zero /* BE6AE4 80243334 0280282D */ daddu $a1, $s4, $zero /* BE6AE8 80243338 0C090BF5 */ jal arn_04_UnkDurationCheck /* BE6AEC 8024333C 0200302D */ daddu $a2, $s0, $zero .L80243340: +glabel L80243340_BE6AF0 /* BE6AF0 80243340 0000102D */ daddu $v0, $zero, $zero .L80243344: /* BE6AF4 80243344 8FBF0048 */ lw $ra, 0x48($sp) @@ -221,5 +239,5 @@ glabel func_80243018_BE67C8 /* BE6B0C 8024335C 8FB00030 */ lw $s0, 0x30($sp) /* BE6B10 80243360 03E00008 */ jr $ra /* BE6B14 80243364 27BD0050 */ addiu $sp, $sp, 0x50 -/* BE6B18 80243368 00000000 */ nop -/* BE6B1C 8024336C 00000000 */ nop +/* BE6B18 80243368 00000000 */ nop +/* BE6B1C 8024336C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240000_BE7BE0.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240000_BE7BE0.s index 4fb69c1885..d998304557 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240000_BE7BE0.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240000_BE7BE0.s @@ -45,7 +45,7 @@ glabel func_80240000_BE7BE0 /* BE7C7C 8024009C 0C00A7B5 */ jal dist2D /* BE7C80 802400A0 4600B386 */ mov.s $f14, $f22 /* BE7C84 802400A4 4614003C */ c.lt.s $f0, $f20 -/* BE7C88 802400A8 00000000 */ nop +/* BE7C88 802400A8 00000000 */ nop /* BE7C8C 802400AC 45000003 */ bc1f .L802400BC /* BE7C90 802400B0 2631000C */ addiu $s1, $s1, 0xc /* BE7C94 802400B4 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_80240000_BE7BE0 /* BE7CC0 802400E0 8E6200D0 */ lw $v0, 0xd0($s3) /* BE7CC4 802400E4 8C42007C */ lw $v0, 0x7c($v0) /* BE7CC8 802400E8 04410004 */ bgez $v0, .L802400FC -/* BE7CCC 802400EC 00000000 */ nop +/* BE7CCC 802400EC 00000000 */ nop /* BE7CD0 802400F0 C6C00000 */ lwc1 $f0, ($s6) /* BE7CD4 802400F4 08090047 */ j .L8024011C /* BE7CD8 802400F8 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_80240000_BE7BE0 /* BE7CDC 802400FC 3C018024 */ lui $at, %hi(D_80245050) /* BE7CE0 80240100 D4225050 */ ldc1 $f2, %lo(D_80245050)($at) /* BE7CE4 80240104 44820000 */ mtc1 $v0, $f0 -/* BE7CE8 80240108 00000000 */ nop +/* BE7CE8 80240108 00000000 */ nop /* BE7CEC 8024010C 46800021 */ cvt.d.w $f0, $f0 /* BE7CF0 80240110 46220003 */ div.d $f0, $f0, $f2 /* BE7CF4 80240114 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240158_BE7D38.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240158_BE7D38.s index bdb368d7fb..6b808b35c4 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240158_BE7D38.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240158_BE7D38.s @@ -44,7 +44,7 @@ glabel func_80240158_BE7D38 /* BE7DD4 802401F4 2402000F */ addiu $v0, $zero, 0xf /* BE7DD8 802401F8 AFA2001C */ sw $v0, 0x1c($sp) /* BE7DDC 802401FC 44833000 */ mtc1 $v1, $f6 -/* BE7DE0 80240200 00000000 */ nop +/* BE7DE0 80240200 00000000 */ nop /* BE7DE4 80240204 468031A0 */ cvt.s.w $f6, $f6 /* BE7DE8 80240208 44073000 */ mfc1 $a3, $f6 /* BE7DEC 8024020C 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_80240158_BE7D38 .L8024025C: /* BE7E3C 8024025C 8602008C */ lh $v0, 0x8c($s0) /* BE7E40 80240260 1440005D */ bnez $v0, .L802403D8 -/* BE7E44 80240264 00000000 */ nop +/* BE7E44 80240264 00000000 */ nop /* BE7E48 80240268 C6000018 */ lwc1 $f0, 0x18($s0) /* BE7E4C 8024026C 3C014010 */ lui $at, 0x4010 /* BE7E50 80240270 44811800 */ mtc1 $at, $f3 /* BE7E54 80240274 44801000 */ mtc1 $zero, $f2 /* BE7E58 80240278 46000021 */ cvt.d.s $f0, $f0 /* BE7E5C 8024027C 4622003C */ c.lt.d $f0, $f2 -/* BE7E60 80240280 00000000 */ nop +/* BE7E60 80240280 00000000 */ nop /* BE7E64 80240284 45000003 */ bc1f .L80240294 /* BE7E68 80240288 0200202D */ daddu $a0, $s0, $zero /* BE7E6C 8024028C 080900A6 */ j .L80240298 @@ -88,7 +88,7 @@ glabel func_80240158_BE7D38 /* BE7E74 80240294 24050001 */ addiu $a1, $zero, 1 .L80240298: /* BE7E78 80240298 0C00F598 */ jal func_8003D660 -/* BE7E7C 8024029C 00000000 */ nop +/* BE7E7C 8024029C 00000000 */ nop /* BE7E80 802402A0 C60C0038 */ lwc1 $f12, 0x38($s0) /* BE7E84 802402A4 8E430078 */ lw $v1, 0x78($s2) /* BE7E88 802402A8 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_80240158_BE7D38 /* BE7EB0 802402D0 4406B000 */ mfc1 $a2, $f22 /* BE7EB4 802402D4 4407A000 */ mfc1 $a3, $f20 /* BE7EB8 802402D8 0C00A720 */ jal atan2 -/* BE7EBC 802402DC 00000000 */ nop +/* BE7EBC 802402DC 00000000 */ nop /* BE7EC0 802402E0 8E050018 */ lw $a1, 0x18($s0) /* BE7EC4 802402E4 44060000 */ mfc1 $a2, $f0 /* BE7EC8 802402E8 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_80240158_BE7D38 /* BE7EDC 802402FC 4406B000 */ mfc1 $a2, $f22 /* BE7EE0 80240300 4407A000 */ mfc1 $a3, $f20 /* BE7EE4 80240304 0C00A7B5 */ jal dist2D -/* BE7EE8 80240308 00000000 */ nop +/* BE7EE8 80240308 00000000 */ nop /* BE7EEC 8024030C C6020018 */ lwc1 $f2, 0x18($s0) /* BE7EF0 80240310 4602003E */ c.le.s $f0, $f2 -/* BE7EF4 80240314 00000000 */ nop +/* BE7EF4 80240314 00000000 */ nop /* BE7EF8 80240318 4500002F */ bc1f .L802403D8 /* BE7EFC 8024031C 240403E8 */ addiu $a0, $zero, 0x3e8 /* BE7F00 80240320 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_80240158_BE7D38 /* BE7F54 80240374 18400003 */ blez $v0, .L80240384 /* BE7F58 80240378 24020004 */ addiu $v0, $zero, 4 /* BE7F5C 8024037C 14600002 */ bnez $v1, .L80240388 -/* BE7F60 80240380 00000000 */ nop +/* BE7F60 80240380 00000000 */ nop .L80240384: /* BE7F64 80240384 AE420070 */ sw $v0, 0x70($s2) .L80240388: diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_802404C0_BE80A0.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_802404C0_BE80A0.s index 187ef4b3b2..6de28c3f1a 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_802404C0_BE80A0.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_802404C0_BE80A0.s @@ -38,7 +38,7 @@ glabel func_802404C0_BE80A0 /* BE8124 80240544 2402000F */ addiu $v0, $zero, 0xf /* BE8128 80240548 AFA2001C */ sw $v0, 0x1c($sp) /* BE812C 8024054C 44833000 */ mtc1 $v1, $f6 -/* BE8130 80240550 00000000 */ nop +/* BE8130 80240550 00000000 */ nop /* BE8134 80240554 468031A0 */ cvt.s.w $f6, $f6 /* BE8138 80240558 44073000 */ mfc1 $a3, $f6 /* BE813C 8024055C 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_802404C0_BE80A0 .L802405C0: /* BE81A0 802405C0 8602008C */ lh $v0, 0x8c($s0) /* BE81A4 802405C4 14400025 */ bnez $v0, .L8024065C -/* BE81A8 802405C8 00000000 */ nop +/* BE81A8 802405C8 00000000 */ nop /* BE81AC 802405CC 9602008E */ lhu $v0, 0x8e($s0) /* BE81B0 802405D0 2442FFFF */ addiu $v0, $v0, -1 /* BE81B4 802405D4 A602008E */ sh $v0, 0x8e($s0) /* BE81B8 802405D8 00021400 */ sll $v0, $v0, 0x10 /* BE81BC 802405DC 1440001F */ bnez $v0, .L8024065C -/* BE81C0 802405E0 00000000 */ nop +/* BE81C0 802405E0 00000000 */ nop /* BE81C4 802405E4 8E820074 */ lw $v0, 0x74($s4) /* BE81C8 802405E8 2442FFFF */ addiu $v0, $v0, -1 /* BE81CC 802405EC 10400019 */ beqz $v0, .L80240654 @@ -84,7 +84,7 @@ glabel func_802404C0_BE80A0 /* BE81D8 802405F8 9442002A */ lhu $v0, 0x2a($v0) /* BE81DC 802405FC 30420010 */ andi $v0, $v0, 0x10 /* BE81E0 80240600 14400007 */ bnez $v0, .L80240620 -/* BE81E4 80240604 00000000 */ nop +/* BE81E4 80240604 00000000 */ nop /* BE81E8 80240608 C600000C */ lwc1 $f0, 0xc($s0) /* BE81EC 8024060C 3C014334 */ lui $at, 0x4334 /* BE81F0 80240610 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024067C_BE825C.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024067C_BE825C.s index a10afcbeb6..2179234c63 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024067C_BE825C.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024067C_BE825C.s @@ -28,7 +28,7 @@ glabel func_8024067C_BE825C /* BE82B4 802406D4 8E0200D0 */ lw $v0, 0xd0($s0) /* BE82B8 802406D8 8C42007C */ lw $v0, 0x7c($v0) /* BE82BC 802406DC 04410004 */ bgez $v0, .L802406F0 -/* BE82C0 802406E0 00000000 */ nop +/* BE82C0 802406E0 00000000 */ nop /* BE82C4 802406E4 C6400000 */ lwc1 $f0, ($s2) /* BE82C8 802406E8 080901C4 */ j .L80240710 /* BE82CC 802406EC E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_8024067C_BE825C /* BE82D0 802406F0 3C018024 */ lui $at, %hi(D_80245058) /* BE82D4 802406F4 D4225058 */ ldc1 $f2, %lo(D_80245058)($at) /* BE82D8 802406F8 44820000 */ mtc1 $v0, $f0 -/* BE82DC 802406FC 00000000 */ nop +/* BE82DC 802406FC 00000000 */ nop /* BE82E0 80240700 46800021 */ cvt.d.w $f0, $f0 /* BE82E4 80240704 46220003 */ div.d $f0, $f0, $f2 /* BE82E8 80240708 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024081C_BE83FC.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024081C_BE83FC.s index a793f6d6e0..e0b1c58794 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024081C_BE83FC.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024081C_BE83FC.s @@ -47,20 +47,20 @@ glabel func_8024081C_BE83FC /* BE84A4 802408C4 8E02001C */ lw $v0, 0x1c($s0) /* BE84A8 802408C8 46001005 */ abs.s $f0, $f2 /* BE84AC 802408CC 44822000 */ mtc1 $v0, $f4 -/* BE84B0 802408D0 00000000 */ nop +/* BE84B0 802408D0 00000000 */ nop /* BE84B4 802408D4 46802120 */ cvt.s.w $f4, $f4 /* BE84B8 802408D8 4600203C */ c.lt.s $f4, $f0 -/* BE84BC 802408DC 00000000 */ nop +/* BE84BC 802408DC 00000000 */ nop /* BE84C0 802408E0 4500000D */ bc1f .L80240918 -/* BE84C4 802408E4 00000000 */ nop +/* BE84C4 802408E4 00000000 */ nop /* BE84C8 802408E8 44800000 */ mtc1 $zero, $f0 /* BE84CC 802408EC C654000C */ lwc1 $f20, 0xc($s2) /* BE84D0 802408F0 4600103C */ c.lt.s $f2, $f0 -/* BE84D4 802408F4 00000000 */ nop +/* BE84D4 802408F4 00000000 */ nop /* BE84D8 802408F8 45000006 */ bc1f .L80240914 /* BE84DC 802408FC 00021023 */ negu $v0, $v0 /* BE84E0 80240900 44820000 */ mtc1 $v0, $f0 -/* BE84E4 80240904 00000000 */ nop +/* BE84E4 80240904 00000000 */ nop /* BE84E8 80240908 46800020 */ cvt.s.w $f0, $f0 /* BE84EC 8024090C 08090246 */ j .L80240918 /* BE84F0 80240910 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024094C_BE852C.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024094C_BE852C.s index f8b9e563d0..0bb529ed2b 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024094C_BE852C.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024094C_BE852C.s @@ -37,7 +37,7 @@ glabel func_8024094C_BE852C /* BE85AC 802409CC 2402000F */ addiu $v0, $zero, 0xf /* BE85B0 802409D0 AFA2001C */ sw $v0, 0x1c($sp) /* BE85B4 802409D4 44833000 */ mtc1 $v1, $f6 -/* BE85B8 802409D8 00000000 */ nop +/* BE85B8 802409D8 00000000 */ nop /* BE85BC 802409DC 468031A0 */ cvt.s.w $f6, $f6 /* BE85C0 802409E0 44073000 */ mfc1 $a3, $f6 /* BE85C4 802409E4 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240AD4_BE86B4.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240AD4_BE86B4.s index 1e3e7e4860..a2117ace32 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240AD4_BE86B4.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240AD4_BE86B4.s @@ -28,7 +28,7 @@ glabel func_80240AD4_BE86B4 /* BE870C 80240B2C C4400008 */ lwc1 $f0, 8($v0) /* BE8710 80240B30 46800020 */ cvt.s.w $f0, $f0 /* BE8714 80240B34 4602003E */ c.le.s $f0, $f2 -/* BE8718 80240B38 00000000 */ nop +/* BE8718 80240B38 00000000 */ nop /* BE871C 80240B3C 45020003 */ bc1fl .L80240B4C /* BE8720 80240B40 24840001 */ addiu $a0, $a0, 1 /* BE8724 80240B44 080902D7 */ j .L80240B5C diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s index 02d3f37ca9..300ba6eee6 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s @@ -46,7 +46,7 @@ glabel func_80240B94_BE8774 /* BE8818 80240C38 8E2200B0 */ lw $v0, 0xb0($s1) /* BE881C 80240C3C 30420004 */ andi $v0, $v0, 4 /* BE8820 80240C40 10400044 */ beqz $v0, .L80240D54 -/* BE8824 80240C44 00000000 */ nop +/* BE8824 80240C44 00000000 */ nop .L80240C48: /* BE8828 80240C48 2404F7FF */ addiu $a0, $zero, -0x801 /* BE882C 80240C4C AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80240B94_BE8774 /* BE88E0 80240D00 3C0142C8 */ lui $at, 0x42c8 /* BE88E4 80240D04 44812000 */ mtc1 $at, $f4 /* BE88E8 80240D08 44823000 */ mtc1 $v0, $f6 -/* BE88EC 80240D0C 00000000 */ nop +/* BE88EC 80240D0C 00000000 */ nop /* BE88F0 80240D10 468031A0 */ cvt.s.w $f6, $f6 /* BE88F4 80240D14 27A20044 */ addiu $v0, $sp, 0x44 /* BE88F8 80240D18 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80240B94_BE8774 /* BE891C 80240D3C 0C0372DF */ jal func_800DCB7C /* BE8920 80240D40 27A70040 */ addiu $a3, $sp, 0x40 /* BE8924 80240D44 10400003 */ beqz $v0, .L80240D54 -/* BE8928 80240D48 00000000 */ nop +/* BE8928 80240D48 00000000 */ nop /* BE892C 80240D4C C7A0003C */ lwc1 $f0, 0x3c($sp) /* BE8930 80240D50 E640003C */ swc1 $f0, 0x3c($s2) .L80240D54: @@ -124,72 +124,85 @@ glabel func_80240B94_BE8774 /* BE8938 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 /* BE893C 80240D5C 10400042 */ beqz $v0, .L80240E68 /* BE8940 80240D60 00031080 */ sll $v0, $v1, 2 -/* BE8944 80240D64 3C018024 */ lui $at, %hi(D_80245060) +/* BE8944 80240D64 3C018024 */ lui $at, %hi(jtbl_80245060_BECC40) /* BE8948 80240D68 00220821 */ addu $at, $at, $v0 -/* BE894C 80240D6C 8C225060 */ lw $v0, %lo(D_80245060)($at) +/* BE894C 80240D6C 8C225060 */ lw $v0, %lo(jtbl_80245060_BECC40)($at) /* BE8950 80240D70 00400008 */ jr $v0 -/* BE8954 80240D74 00000000 */ nop +/* BE8954 80240D74 00000000 */ nop +glabel L80240D78_BE8958 /* BE8958 80240D78 0280202D */ daddu $a0, $s4, $zero /* BE895C 80240D7C 0260282D */ daddu $a1, $s3, $zero /* BE8960 80240D80 0C090000 */ jal func_80240000_BE7BE0 /* BE8964 80240D84 02A0302D */ daddu $a2, $s5, $zero +glabel L80240D88_BE8968 /* BE8968 80240D88 0280202D */ daddu $a0, $s4, $zero /* BE896C 80240D8C 0260282D */ daddu $a1, $s3, $zero /* BE8970 80240D90 0C090056 */ jal func_80240158_BE7D38 /* BE8974 80240D94 02A0302D */ daddu $a2, $s5, $zero /* BE8978 80240D98 0809039A */ j .L80240E68 -/* BE897C 80240D9C 00000000 */ nop +/* BE897C 80240D9C 00000000 */ nop +glabel L80240DA0_BE8980 /* BE8980 80240DA0 0280202D */ daddu $a0, $s4, $zero /* BE8984 80240DA4 0260282D */ daddu $a1, $s3, $zero /* BE8988 80240DA8 0C090100 */ jal arn_05_UnkNpcAIFunc1 /* BE898C 80240DAC 02A0302D */ daddu $a2, $s5, $zero +glabel L80240DB0_BE8990 /* BE8990 80240DB0 0280202D */ daddu $a0, $s4, $zero /* BE8994 80240DB4 0260282D */ daddu $a1, $s3, $zero /* BE8998 80240DB8 0C090130 */ jal func_802404C0_BE80A0 /* BE899C 80240DBC 02A0302D */ daddu $a2, $s5, $zero /* BE89A0 80240DC0 0809039A */ j .L80240E68 -/* BE89A4 80240DC4 00000000 */ nop +/* BE89A4 80240DC4 00000000 */ nop +glabel L80240DC8_BE89A8 /* BE89A8 80240DC8 0280202D */ daddu $a0, $s4, $zero /* BE89AC 80240DCC 0260282D */ daddu $a1, $s3, $zero /* BE89B0 80240DD0 0C09019F */ jal func_8024067C_BE825C /* BE89B4 80240DD4 02A0302D */ daddu $a2, $s5, $zero /* BE89B8 80240DD8 0809039A */ j .L80240E68 -/* BE89BC 80240DDC 00000000 */ nop +/* BE89BC 80240DDC 00000000 */ nop +glabel L80240DE0_BE89C0 /* BE89C0 80240DE0 0280202D */ daddu $a0, $s4, $zero /* BE89C4 80240DE4 0260282D */ daddu $a1, $s3, $zero /* BE89C8 80240DE8 0C0901CC */ jal arn_05_NpcJumpFunc2 /* BE89CC 80240DEC 02A0302D */ daddu $a2, $s5, $zero +glabel L80240DF0_BE89D0 /* BE89D0 80240DF0 0280202D */ daddu $a0, $s4, $zero /* BE89D4 80240DF4 0260282D */ daddu $a1, $s3, $zero /* BE89D8 80240DF8 0C0901E9 */ jal arn_05_NpcJumpFunc /* BE89DC 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* BE89E0 80240E00 0809039A */ j .L80240E68 -/* BE89E4 80240E04 00000000 */ nop +/* BE89E4 80240E04 00000000 */ nop +glabel L80240E08_BE89E8 /* BE89E8 80240E08 0280202D */ daddu $a0, $s4, $zero /* BE89EC 80240E0C 0260282D */ daddu $a1, $s3, $zero /* BE89F0 80240E10 0C090207 */ jal func_8024081C_BE83FC /* BE89F4 80240E14 02A0302D */ daddu $a2, $s5, $zero +glabel L80240E18_BE89F8 /* BE89F8 80240E18 0280202D */ daddu $a0, $s4, $zero /* BE89FC 80240E1C 0260282D */ daddu $a1, $s3, $zero /* BE8A00 80240E20 0C090253 */ jal func_8024094C_BE852C /* BE8A04 80240E24 02A0302D */ daddu $a2, $s5, $zero /* BE8A08 80240E28 0809039A */ j .L80240E68 -/* BE8A0C 80240E2C 00000000 */ nop +/* BE8A0C 80240E2C 00000000 */ nop +glabel L80240E30_BE8A10 /* BE8A10 80240E30 0280202D */ daddu $a0, $s4, $zero /* BE8A14 80240E34 0260282D */ daddu $a1, $s3, $zero /* BE8A18 80240E38 0C09029B */ jal arn_05_UnkNpcDurationFlagFunc /* BE8A1C 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* BE8A20 80240E40 0809039A */ j .L80240E68 -/* BE8A24 80240E44 00000000 */ nop +/* BE8A24 80240E44 00000000 */ nop +glabel L80240E48_BE8A28 /* BE8A28 80240E48 0280202D */ daddu $a0, $s4, $zero /* BE8A2C 80240E4C 0260282D */ daddu $a1, $s3, $zero /* BE8A30 80240E50 0C0902B5 */ jal func_80240AD4_BE86B4 /* BE8A34 80240E54 02A0302D */ daddu $a2, $s5, $zero /* BE8A38 80240E58 0809039A */ j .L80240E68 -/* BE8A3C 80240E5C 00000000 */ nop +/* BE8A3C 80240E5C 00000000 */ nop +glabel L80240E60_BE8A40 /* BE8A40 80240E60 0C0129CF */ jal func_8004A73C /* BE8A44 80240E64 0280202D */ daddu $a0, $s4, $zero .L80240E68: +glabel L80240E68_BE8A48 /* BE8A48 80240E68 8FBF0060 */ lw $ra, 0x60($sp) /* BE8A4C 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) /* BE8A50 80240E70 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240E90_BE8A70.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240E90_BE8A70.s index 79eecd9008..a0d12bec4f 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240E90_BE8A70.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240E90_BE8A70.s @@ -79,7 +79,7 @@ glabel func_80240E90_BE8A70 /* BE8B98 80240FB8 E7A2001C */ swc1 $f2, 0x1c($sp) /* BE8B9C 80240FBC 46000121 */ cvt.d.s $f4, $f0 /* BE8BA0 80240FC0 4624303C */ c.lt.d $f6, $f4 -/* BE8BA4 80240FC4 00000000 */ nop +/* BE8BA4 80240FC4 00000000 */ nop /* BE8BA8 80240FC8 45000005 */ bc1f .L80240FE0 /* BE8BAC 80240FCC E7A00024 */ swc1 $f0, 0x24($sp) /* BE8BB0 80240FD0 C620003C */ lwc1 $f0, 0x3c($s1) @@ -90,9 +90,9 @@ glabel func_80240E90_BE8A70 /* BE8BC0 80240FE0 3C01C000 */ lui $at, 0xc000 /* BE8BC4 80240FE4 44810800 */ mtc1 $at, $f1 /* BE8BC8 80240FE8 44800000 */ mtc1 $zero, $f0 -/* BE8BCC 80240FEC 00000000 */ nop +/* BE8BCC 80240FEC 00000000 */ nop /* BE8BD0 80240FF0 4620203C */ c.lt.d $f4, $f0 -/* BE8BD4 80240FF4 00000000 */ nop +/* BE8BD4 80240FF4 00000000 */ nop /* BE8BD8 80240FF8 45020006 */ bc1fl .L80241014 /* BE8BDC 80240FFC E622003C */ swc1 $f2, 0x3c($s1) /* BE8BE0 80241000 C620003C */ lwc1 $f0, 0x3c($s1) @@ -107,10 +107,10 @@ glabel func_80240E90_BE8A70 /* BE8BFC 8024101C 4406B000 */ mfc1 $a2, $f22 /* BE8C00 80241020 4407A000 */ mfc1 $a3, $f20 /* BE8C04 80241024 0C00A7B5 */ jal dist2D -/* BE8C08 80241028 00000000 */ nop +/* BE8C08 80241028 00000000 */ nop /* BE8C0C 8024102C C6220018 */ lwc1 $f2, 0x18($s1) /* BE8C10 80241030 4600103C */ c.lt.s $f2, $f0 -/* BE8C14 80241034 00000000 */ nop +/* BE8C14 80241034 00000000 */ nop /* BE8C18 80241038 45010003 */ bc1t .L80241048 /* BE8C1C 8024103C E7A00024 */ swc1 $f0, 0x24($sp) /* BE8C20 80241040 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80241068_BE8C48.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80241068_BE8C48.s index f49661aab9..360a87c543 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80241068_BE8C48.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80241068_BE8C48.s @@ -19,7 +19,7 @@ glabel func_80241068_BE8C48 /* BE8C80 802410A0 A602008E */ sh $v0, 0x8e($s0) /* BE8C84 802410A4 00021400 */ sll $v0, $v0, 0x10 /* BE8C88 802410A8 0441001D */ bgez $v0, .L80241120 -/* BE8C8C 802410AC 00000000 */ nop +/* BE8C8C 802410AC 00000000 */ nop /* BE8C90 802410B0 8E220074 */ lw $v0, 0x74($s1) /* BE8C94 802410B4 2442FFFF */ addiu $v0, $v0, -1 /* BE8C98 802410B8 04400014 */ bltz $v0, .L8024110C diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024113C_BE8D1C.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024113C_BE8D1C.s index bbbf9da09b..5baa3c3e0e 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024113C_BE8D1C.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024113C_BE8D1C.s @@ -54,31 +54,36 @@ glabel func_8024113C_BE8D1C /* BE8DDC 802411FC 2C620005 */ sltiu $v0, $v1, 5 /* BE8DE0 80241200 1040001E */ beqz $v0, .L8024127C /* BE8DE4 80241204 00031080 */ sll $v0, $v1, 2 -/* BE8DE8 80241208 3C018024 */ lui $at, %hi(D_802451F0) +/* BE8DE8 80241208 3C018024 */ lui $at, %hi(jtbl_802451F0_BECDD0) /* BE8DEC 8024120C 00220821 */ addu $at, $at, $v0 -/* BE8DF0 80241210 8C2251F0 */ lw $v0, %lo(D_802451F0)($at) +/* BE8DF0 80241210 8C2251F0 */ lw $v0, %lo(jtbl_802451F0_BECDD0)($at) /* BE8DF4 80241214 00400008 */ jr $v0 -/* BE8DF8 80241218 00000000 */ nop +/* BE8DF8 80241218 00000000 */ nop +glabel L8024121C_BE8DFC /* BE8DFC 8024121C 0280202D */ daddu $a0, $s4, $zero /* BE8E00 80241220 0200282D */ daddu $a1, $s0, $zero /* BE8E04 80241224 0C090000 */ jal func_80240000_BE7BE0 /* BE8E08 80241228 0240302D */ daddu $a2, $s2, $zero +glabel L8024122C_BE8E0C /* BE8E0C 8024122C 0280202D */ daddu $a0, $s4, $zero /* BE8E10 80241230 0200282D */ daddu $a1, $s0, $zero /* BE8E14 80241234 0C0903A4 */ jal func_80240E90_BE8A70 /* BE8E18 80241238 0240302D */ daddu $a2, $s2, $zero /* BE8E1C 8024123C 0809049F */ j .L8024127C -/* BE8E20 80241240 00000000 */ nop +/* BE8E20 80241240 00000000 */ nop +glabel L80241244_BE8E24 /* BE8E24 80241244 0280202D */ daddu $a0, $s4, $zero /* BE8E28 80241248 0200282D */ daddu $a1, $s0, $zero /* BE8E2C 8024124C 0C090100 */ jal arn_05_UnkNpcAIFunc1 /* BE8E30 80241250 0240302D */ daddu $a2, $s2, $zero +glabel L80241254_BE8E34 /* BE8E34 80241254 0280202D */ daddu $a0, $s4, $zero /* BE8E38 80241258 0200282D */ daddu $a1, $s0, $zero /* BE8E3C 8024125C 0C09041A */ jal func_80241068_BE8C48 /* BE8E40 80241260 0240302D */ daddu $a2, $s2, $zero /* BE8E44 80241264 0809049F */ j .L8024127C -/* BE8E48 80241268 00000000 */ nop +/* BE8E48 80241268 00000000 */ nop +glabel L8024126C_BE8E4C /* BE8E4C 8024126C 0280202D */ daddu $a0, $s4, $zero /* BE8E50 80241270 0200282D */ daddu $a1, $s0, $zero /* BE8E54 80241274 0C09019F */ jal func_8024067C_BE825C diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_802412C8_BE8EA8.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_802412C8_BE8EA8.s index 3d5b8604fa..30cf723205 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_802412C8_BE8EA8.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_802412C8_BE8EA8.s @@ -13,6 +13,6 @@ glabel func_802412C8_BE8EA8 /* BE8EC8 802412E8 24020002 */ addiu $v0, $zero, 2 /* BE8ECC 802412EC 03E00008 */ jr $ra /* BE8ED0 802412F0 27BD0018 */ addiu $sp, $sp, 0x18 -/* BE8ED4 802412F4 00000000 */ nop -/* BE8ED8 802412F8 00000000 */ nop -/* BE8EDC 802412FC 00000000 */ nop +/* BE8ED4 802412F4 00000000 */ nop +/* BE8ED8 802412F8 00000000 */ nop +/* BE8EDC 802412FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_07/BECDF0/func_802401AC_BECF9C.s b/asm/nonmatchings/world/area_arn/arn_07/BECDF0/func_802401AC_BECF9C.s index 4dc0e99c7a..5c6cfcc13a 100644 --- a/asm/nonmatchings/world/area_arn/arn_07/BECDF0/func_802401AC_BECF9C.s +++ b/asm/nonmatchings/world/area_arn/arn_07/BECDF0/func_802401AC_BECF9C.s @@ -13,11 +13,12 @@ glabel func_802401AC_BECF9C /* BECFBC 802401CC 2C620005 */ sltiu $v0, $v1, 5 /* BECFC0 802401D0 1040008A */ beqz $v0, .L802403FC /* BECFC4 802401D4 00031080 */ sll $v0, $v1, 2 -/* BECFC8 802401D8 3C018024 */ lui $at, %hi(D_80247900) +/* BECFC8 802401D8 3C018024 */ lui $at, %hi(jtbl_80247900_BF46F0) /* BECFCC 802401DC 00220821 */ addu $at, $at, $v0 -/* BECFD0 802401E0 8C227900 */ lw $v0, %lo(D_80247900)($at) +/* BECFD0 802401E0 8C227900 */ lw $v0, %lo(jtbl_80247900_BF46F0)($at) /* BECFD4 802401E4 00400008 */ jr $v0 -/* BECFD8 802401E8 00000000 */ nop +/* BECFD8 802401E8 00000000 */ nop +glabel L802401EC_BECFDC /* BECFDC 802401EC 8E22003C */ lw $v0, 0x3c($s1) /* BECFE0 802401F0 86270046 */ lh $a3, 0x46($s1) /* BECFE4 802401F4 AFA20010 */ sw $v0, 0x10($sp) @@ -66,6 +67,7 @@ glabel func_802401AC_BECF9C /* BED090 802402A0 A6220044 */ sh $v0, 0x44($s1) /* BED094 802402A4 080900FF */ j .L802403FC /* BED098 802402A8 A6200046 */ sh $zero, 0x46($s1) +glabel L802402AC_BED09C /* BED09C 802402AC 96220046 */ lhu $v0, 0x46($s1) /* BED0A0 802402B0 24420001 */ addiu $v0, $v0, 1 /* BED0A4 802402B4 A6220046 */ sh $v0, 0x46($s1) @@ -84,6 +86,7 @@ glabel func_802401AC_BECF9C /* BED0D8 802402E8 8C42000C */ lw $v0, 0xc($v0) /* BED0DC 802402EC 080900FF */ j .L802403FC /* BED0E0 802402F0 AC400074 */ sw $zero, 0x74($v0) +glabel L802402F4_BED0E4 /* BED0E4 802402F4 96220046 */ lhu $v0, 0x46($s1) /* BED0E8 802402F8 24420001 */ addiu $v0, $v0, 1 /* BED0EC 802402FC A6220046 */ sh $v0, 0x46($s1) @@ -91,7 +94,7 @@ glabel func_802401AC_BECF9C /* BED0F4 80240304 00021403 */ sra $v0, $v0, 0x10 /* BED0F8 80240308 2842003C */ slti $v0, $v0, 0x3c /* BED0FC 8024030C 1440003B */ bnez $v0, .L802403FC -/* BED100 80240310 00000000 */ nop +/* BED100 80240310 00000000 */ nop /* BED104 80240314 3C013F80 */ lui $at, 0x3f80 /* BED108 80240318 44810000 */ mtc1 $at, $f0 /* BED10C 8024031C AFA00014 */ sw $zero, 0x14($sp) @@ -124,6 +127,7 @@ glabel func_802401AC_BECF9C /* BED178 80240388 A6220048 */ sh $v0, 0x48($s1) /* BED17C 8024038C 080900FF */ j .L802403FC /* BED180 80240390 E6200030 */ swc1 $f0, 0x30($s1) +glabel L80240394_BED184 /* BED184 80240394 0000202D */ daddu $a0, $zero, $zero /* BED188 80240398 3C054210 */ lui $a1, 0x4210 /* BED18C 8024039C 3C064198 */ lui $a2, 0x4198 @@ -151,14 +155,15 @@ glabel func_802401AC_BECF9C /* BED1E4 802403F4 A6200046 */ sh $zero, 0x46($s1) /* BED1E8 802403F8 E6200034 */ swc1 $f0, 0x34($s1) .L802403FC: +glabel L802403FC_BED1EC /* BED1EC 802403FC 8623004A */ lh $v1, 0x4a($s1) /* BED1F0 80240400 24020001 */ addiu $v0, $zero, 1 /* BED1F4 80240404 10620005 */ beq $v1, $v0, .L8024041C /* BED1F8 80240408 24020002 */ addiu $v0, $zero, 2 /* BED1FC 8024040C 1062001E */ beq $v1, $v0, .L80240488 -/* BED200 80240410 00000000 */ nop +/* BED200 80240410 00000000 */ nop /* BED204 80240414 0809014C */ j .L80240530 -/* BED208 80240418 00000000 */ nop +/* BED208 80240418 00000000 */ nop .L8024041C: /* BED20C 8024041C 8627004C */ lh $a3, 0x4c($s1) /* BED210 80240420 24100078 */ addiu $s0, $zero, 0x78 @@ -190,12 +195,12 @@ glabel func_802401AC_BECF9C .L80240488: /* BED278 80240488 8622004C */ lh $v0, 0x4c($s1) /* BED27C 8024048C 44826000 */ mtc1 $v0, $f12 -/* BED280 80240490 00000000 */ nop +/* BED280 80240490 00000000 */ nop /* BED284 80240494 0C00A8BB */ jal sin_deg /* BED288 80240498 46806320 */ cvt.s.w $f12, $f12 /* BED28C 8024049C 3C013F80 */ lui $at, 0x3f80 /* BED290 802404A0 44811000 */ mtc1 $at, $f2 -/* BED294 802404A4 00000000 */ nop +/* BED294 802404A4 00000000 */ nop /* BED298 802404A8 46020000 */ add.s $f0, $f0, $f2 /* BED29C 802404AC 46000000 */ add.s $f0, $f0, $f0 /* BED2A0 802404B0 C6220024 */ lwc1 $f2, 0x24($s1) @@ -203,7 +208,7 @@ glabel func_802401AC_BECF9C /* BED2A8 802404B8 46001080 */ add.s $f2, $f2, $f0 /* BED2AC 802404BC 24420008 */ addiu $v0, $v0, 8 /* BED2B0 802404C0 44826000 */ mtc1 $v0, $f12 -/* BED2B4 802404C4 00000000 */ nop +/* BED2B4 802404C4 00000000 */ nop /* BED2B8 802404C8 46806320 */ cvt.s.w $f12, $f12 /* BED2BC 802404CC 0C00A6C9 */ jal clamp_angle /* BED2C0 802404D0 E6220004 */ swc1 $f2, 4($s1) @@ -224,9 +229,9 @@ glabel func_802401AC_BECF9C /* BED2FC 8024050C 460E1380 */ add.s $f14, $f2, $f14 /* BED300 80240510 3C0141F0 */ lui $at, 0x41f0 /* BED304 80240514 44811000 */ mtc1 $at, $f2 -/* BED308 80240518 00000000 */ nop +/* BED308 80240518 00000000 */ nop /* BED30C 8024051C 4600103C */ c.lt.s $f2, $f0 -/* BED310 80240520 00000000 */ nop +/* BED310 80240520 00000000 */ nop /* BED314 80240524 45010002 */ bc1t .L80240530 /* BED318 80240528 24020003 */ addiu $v0, $zero, 3 .L8024052C: @@ -237,9 +242,9 @@ glabel func_802401AC_BECF9C /* BED328 80240538 10620005 */ beq $v1, $v0, .L80240550 /* BED32C 8024053C 24020002 */ addiu $v0, $zero, 2 /* BED330 80240540 10620008 */ beq $v1, $v0, .L80240564 -/* BED334 80240544 00000000 */ nop +/* BED334 80240544 00000000 */ nop /* BED338 80240548 08090169 */ j .L802405A4 -/* BED33C 8024054C 00000000 */ nop +/* BED33C 8024054C 00000000 */ nop .L80240550: /* BED340 80240550 C620002C */ lwc1 $f0, 0x2c($s1) /* BED344 80240554 C62C0030 */ lwc1 $f12, 0x30($s1) diff --git a/asm/nonmatchings/world/area_arn/arn_07/BECDF0/func_80240708_BED4F8.s b/asm/nonmatchings/world/area_arn/arn_07/BECDF0/func_80240708_BED4F8.s index 561e77540f..4152671378 100644 --- a/asm/nonmatchings/world/area_arn/arn_07/BECDF0/func_80240708_BED4F8.s +++ b/asm/nonmatchings/world/area_arn/arn_07/BECDF0/func_80240708_BED4F8.s @@ -8,12 +8,12 @@ glabel func_80240708_BED4F8 /* BED504 80240714 8C900084 */ lw $s0, 0x84($a0) /* BED508 80240718 8602004C */ lh $v0, 0x4c($s0) /* BED50C 8024071C 44826000 */ mtc1 $v0, $f12 -/* BED510 80240720 00000000 */ nop +/* BED510 80240720 00000000 */ nop /* BED514 80240724 0C00A8BB */ jal sin_deg /* BED518 80240728 46806320 */ cvt.s.w $f12, $f12 /* BED51C 8024072C 3C013F80 */ lui $at, 0x3f80 /* BED520 80240730 44811000 */ mtc1 $at, $f2 -/* BED524 80240734 00000000 */ nop +/* BED524 80240734 00000000 */ nop /* BED528 80240738 46020000 */ add.s $f0, $f0, $f2 /* BED52C 8024073C 46000000 */ add.s $f0, $f0, $f0 /* BED530 80240740 C6020024 */ lwc1 $f2, 0x24($s0) @@ -21,13 +21,13 @@ glabel func_80240708_BED4F8 /* BED538 80240748 46001080 */ add.s $f2, $f2, $f0 /* BED53C 8024074C 24420008 */ addiu $v0, $v0, 8 /* BED540 80240750 44826000 */ mtc1 $v0, $f12 -/* BED544 80240754 00000000 */ nop +/* BED544 80240754 00000000 */ nop /* BED548 80240758 46806320 */ cvt.s.w $f12, $f12 /* BED54C 8024075C 0C00A6C9 */ jal clamp_angle /* BED550 80240760 E6020004 */ swc1 $f2, 4($s0) /* BED554 80240764 4600010D */ trunc.w.s $f4, $f0 /* BED558 80240768 44022000 */ mfc1 $v0, $f4 -/* BED55C 8024076C 00000000 */ nop +/* BED55C 8024076C 00000000 */ nop /* BED560 80240770 A602004C */ sh $v0, 0x4c($s0) /* BED564 80240774 3C028011 */ lui $v0, %hi(gPlayerStatus) /* BED568 80240778 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) @@ -38,9 +38,9 @@ glabel func_80240708_BED4F8 /* BED57C 8024078C 8E070020 */ lw $a3, 0x20($s0) /* BED580 80240790 3C0141F0 */ lui $at, 0x41f0 /* BED584 80240794 44811000 */ mtc1 $at, $f2 -/* BED588 80240798 00000000 */ nop +/* BED588 80240798 00000000 */ nop /* BED58C 8024079C 4602003E */ c.le.s $f0, $f2 -/* BED590 802407A0 00000000 */ nop +/* BED590 802407A0 00000000 */ nop /* BED594 802407A4 45000002 */ bc1f .L802407B0 /* BED598 802407A8 24020003 */ addiu $v0, $zero, 3 /* BED59C 802407AC A602004E */ sh $v0, 0x4e($s0) @@ -62,6 +62,6 @@ glabel func_80240708_BED4F8 /* BED5D8 802407E8 0000102D */ daddu $v0, $zero, $zero /* BED5DC 802407EC 03E00008 */ jr $ra /* BED5E0 802407F0 27BD0018 */ addiu $sp, $sp, 0x18 -/* BED5E4 802407F4 00000000 */ nop -/* BED5E8 802407F8 00000000 */ nop -/* BED5EC 802407FC 00000000 */ nop +/* BED5E4 802407F4 00000000 */ nop +/* BED5E8 802407F8 00000000 */ nop +/* BED5EC 802407FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED5F0/func_80240800_BED5F0.s b/asm/nonmatchings/world/area_arn/arn_07/BED5F0/func_80240800_BED5F0.s index db7c71ce41..2b134722cf 100644 --- a/asm/nonmatchings/world/area_arn/arn_07/BED5F0/func_80240800_BED5F0.s +++ b/asm/nonmatchings/world/area_arn/arn_07/BED5F0/func_80240800_BED5F0.s @@ -14,7 +14,7 @@ glabel func_80240800_BED5F0 /* BED614 80240824 D4247940 */ ldc1 $f4, %lo(D_80247940)($at) /* BED618 80240828 46001021 */ cvt.d.s $f0, $f2 /* BED61C 8024082C 4620203E */ c.le.d $f4, $f0 -/* BED620 80240830 00000000 */ nop +/* BED620 80240830 00000000 */ nop /* BED624 80240834 45000003 */ bc1f .L80240844 /* BED628 80240838 0200202D */ daddu $a0, $s0, $zero /* BED62C 8024083C 46240001 */ sub.d $f0, $f0, $f4 @@ -29,5 +29,5 @@ glabel func_80240800_BED5F0 /* BED64C 8024085C 24020002 */ addiu $v0, $zero, 2 /* BED650 80240860 03E00008 */ jr $ra /* BED654 80240864 27BD0018 */ addiu $sp, $sp, 0x18 -/* BED658 80240868 00000000 */ nop -/* BED65C 8024086C 00000000 */ nop +/* BED658 80240868 00000000 */ nop +/* BED65C 8024086C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80240950_BED740.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80240950_BED740.s index 2fb9e2d31d..007c5d37f4 100644 --- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80240950_BED740.s +++ b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80240950_BED740.s @@ -47,7 +47,7 @@ glabel func_80240950_BED740 /* BED7E8 802409F8 0C0123F5 */ jal is_point_within_region /* BED7EC 802409FC 8E070038 */ lw $a3, 0x38($s0) /* BED7F0 80240A00 1040000E */ beqz $v0, .L80240A3C -/* BED7F4 80240A04 00000000 */ nop +/* BED7F4 80240A04 00000000 */ nop /* BED7F8 80240A08 8E2200D0 */ lw $v0, 0xd0($s1) /* BED7FC 80240A0C C60C0038 */ lwc1 $f12, 0x38($s0) /* BED800 80240A10 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240950_BED740 /* BED814 80240A24 468031A0 */ cvt.s.w $f6, $f6 /* BED818 80240A28 44073000 */ mfc1 $a3, $f6 /* BED81C 80240A2C 0C00A720 */ jal atan2 -/* BED820 80240A30 00000000 */ nop +/* BED820 80240A30 00000000 */ nop /* BED824 80240A34 0809029B */ j .L80240A6C /* BED828 80240A38 E600000C */ swc1 $f0, 0xc($s0) .L80240A3C: @@ -66,7 +66,7 @@ glabel func_80240950_BED740 /* BED830 80240A40 2404003C */ addiu $a0, $zero, 0x3c /* BED834 80240A44 C60C000C */ lwc1 $f12, 0xc($s0) /* BED838 80240A48 44820000 */ mtc1 $v0, $f0 -/* BED83C 80240A4C 00000000 */ nop +/* BED83C 80240A4C 00000000 */ nop /* BED840 80240A50 46800020 */ cvt.s.w $f0, $f0 /* BED844 80240A54 46006300 */ add.s $f12, $f12, $f0 /* BED848 80240A58 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240950_BED740 /* BED86C 80240A7C 8E2200D0 */ lw $v0, 0xd0($s1) /* BED870 80240A80 8C420014 */ lw $v0, 0x14($v0) /* BED874 80240A84 04410004 */ bgez $v0, .L80240A98 -/* BED878 80240A88 00000000 */ nop +/* BED878 80240A88 00000000 */ nop /* BED87C 80240A8C C6400000 */ lwc1 $f0, ($s2) /* BED880 80240A90 080902AE */ j .L80240AB8 /* BED884 80240A94 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240950_BED740 /* BED888 80240A98 3C018024 */ lui $at, %hi(D_80247950) /* BED88C 80240A9C D4227950 */ ldc1 $f2, %lo(D_80247950)($at) /* BED890 80240AA0 44820000 */ mtc1 $v0, $f0 -/* BED894 80240AA4 00000000 */ nop +/* BED894 80240AA4 00000000 */ nop /* BED898 80240AA8 46800021 */ cvt.d.w $f0, $f0 /* BED89C 80240AAC 46220003 */ div.d $f0, $f0, $f2 /* BED8A0 80240AB0 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240950_BED740 /* BED8B4 80240AC4 44801000 */ mtc1 $zero, $f2 /* BED8B8 80240AC8 46000021 */ cvt.d.s $f0, $f0 /* BED8BC 80240ACC 46220002 */ mul.d $f0, $f0, $f2 -/* BED8C0 80240AD0 00000000 */ nop +/* BED8C0 80240AD0 00000000 */ nop /* BED8C4 80240AD4 24020001 */ addiu $v0, $zero, 1 /* BED8C8 80240AD8 4620018D */ trunc.w.d $f6, $f0 /* BED8CC 80240ADC E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80240B00_BED8F0.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80240B00_BED8F0.s index 418f8efd7a..7db35cc96e 100644 --- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80240B00_BED8F0.s +++ b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80240B00_BED8F0.s @@ -34,7 +34,7 @@ glabel func_80240B00_BED8F0 /* BED964 80240B74 44803000 */ mtc1 $zero, $f6 /* BED968 80240B78 46000021 */ cvt.d.s $f0, $f0 /* BED96C 80240B7C 46260002 */ mul.d $f0, $f0, $f6 -/* BED970 80240B80 00000000 */ nop +/* BED970 80240B80 00000000 */ nop /* BED974 80240B84 24020001 */ addiu $v0, $zero, 1 /* BED978 80240B88 8E24006C */ lw $a0, 0x6c($s1) /* BED97C 80240B8C 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80240B00_BED8F0 /* BED9D8 80240BE8 C600003C */ lwc1 $f0, 0x3c($s0) /* BED9DC 80240BEC 4600C001 */ sub.s $f0, $f24, $f0 /* BED9E0 80240BF0 4600B03C */ c.lt.s $f22, $f0 -/* BED9E4 80240BF4 00000000 */ nop +/* BED9E4 80240BF4 00000000 */ nop /* BED9E8 80240BF8 4500001B */ bc1f .L80240C68 /* BED9EC 80240BFC 34820010 */ ori $v0, $a0, 0x10 /* BED9F0 80240C00 0809031A */ j .L80240C68 @@ -87,9 +87,9 @@ glabel func_80240B00_BED8F0 /* BEDA34 80240C44 C7A00034 */ lwc1 $f0, 0x34($sp) /* BEDA38 80240C48 4600D001 */ sub.s $f0, $f26, $f0 /* BEDA3C 80240C4C 4600B03C */ c.lt.s $f22, $f0 -/* BEDA40 80240C50 00000000 */ nop +/* BEDA40 80240C50 00000000 */ nop /* BEDA44 80240C54 45000004 */ bc1f .L80240C68 -/* BEDA48 80240C58 00000000 */ nop +/* BEDA48 80240C58 00000000 */ nop /* BEDA4C 80240C5C 8E22006C */ lw $v0, 0x6c($s1) /* BEDA50 80240C60 34420010 */ ori $v0, $v0, 0x10 /* BEDA54 80240C64 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80240B00_BED8F0 /* BEDA5C 80240C6C 24030011 */ addiu $v1, $zero, 0x11 /* BEDA60 80240C70 30420011 */ andi $v0, $v0, 0x11 /* BEDA64 80240C74 14430039 */ bne $v0, $v1, .L80240D5C -/* BEDA68 80240C78 00000000 */ nop +/* BEDA68 80240C78 00000000 */ nop /* BEDA6C 80240C7C 8E020000 */ lw $v0, ($s0) /* BEDA70 80240C80 30420008 */ andi $v0, $v0, 8 /* BEDA74 80240C84 1040000A */ beqz $v0, .L80240CB0 @@ -108,7 +108,7 @@ glabel func_80240B00_BED8F0 /* BEDA84 80240C94 D4207958 */ ldc1 $f0, %lo(D_80247958)($at) /* BEDA88 80240C98 460010A1 */ cvt.d.s $f2, $f2 /* BEDA8C 80240C9C 46201082 */ mul.d $f2, $f2, $f0 -/* BEDA90 80240CA0 00000000 */ nop +/* BEDA90 80240CA0 00000000 */ nop /* BEDA94 80240CA4 4600A021 */ cvt.d.s $f0, $f20 /* BEDA98 80240CA8 08090345 */ j .L80240D14 /* BEDA9C 80240CAC 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80240B00_BED8F0 /* BEDAEC 80240CFC D4207960 */ ldc1 $f0, %lo(D_80247960)($at) /* BEDAF0 80240D00 460010A1 */ cvt.d.s $f2, $f2 /* BEDAF4 80240D04 46201082 */ mul.d $f2, $f2, $f0 -/* BEDAF8 80240D08 00000000 */ nop +/* BEDAF8 80240D08 00000000 */ nop /* BEDAFC 80240D0C 4600A021 */ cvt.d.s $f0, $f20 /* BEDB00 80240D10 46220000 */ add.d $f0, $f0, $f2 .L80240D14: @@ -149,7 +149,7 @@ glabel func_80240B00_BED8F0 /* BEDB20 80240D30 46000005 */ abs.s $f0, $f0 /* BEDB24 80240D34 46000021 */ cvt.d.s $f0, $f0 /* BEDB28 80240D38 4622003C */ c.lt.d $f0, $f2 -/* BEDB2C 80240D3C 00000000 */ nop +/* BEDB2C 80240D3C 00000000 */ nop /* BEDB30 80240D40 45000036 */ bc1f .L80240E1C /* BEDB34 80240D44 2403FFEF */ addiu $v1, $zero, -0x11 /* BEDB38 80240D48 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80240B00_BED8F0 .L80240D5C: /* BEDB4C 80240D5C 8E220070 */ lw $v0, 0x70($s1) /* BEDB50 80240D60 1840002E */ blez $v0, .L80240E1C -/* BEDB54 80240D64 00000000 */ nop +/* BEDB54 80240D64 00000000 */ nop /* BEDB58 80240D68 C62C0074 */ lwc1 $f12, 0x74($s1) /* BEDB5C 80240D6C 0C00A8BB */ jal sin_deg /* BEDB60 80240D70 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80240B00_BED8F0 /* BEDBB8 80240DC8 27A70030 */ addiu $a3, $sp, 0x30 .L80240DCC: /* BEDBBC 80240DCC 10400007 */ beqz $v0, .L80240DEC -/* BEDBC0 80240DD0 00000000 */ nop +/* BEDBC0 80240DD0 00000000 */ nop /* BEDBC4 80240DD4 4616A082 */ mul.s $f2, $f20, $f22 -/* BEDBC8 80240DD8 00000000 */ nop +/* BEDBC8 80240DD8 00000000 */ nop /* BEDBCC 80240DDC C7A0002C */ lwc1 $f0, 0x2c($sp) /* BEDBD0 80240DE0 461A0000 */ add.s $f0, $f0, $f26 /* BEDBD4 80240DE4 0809037E */ j .L80240DF8 /* BEDBD8 80240DE8 46020000 */ add.s $f0, $f0, $f2 .L80240DEC: /* BEDBDC 80240DEC 4616A002 */ mul.s $f0, $f20, $f22 -/* BEDBE0 80240DF0 00000000 */ nop +/* BEDBE0 80240DF0 00000000 */ nop /* BEDBE4 80240DF4 4600C000 */ add.s $f0, $f24, $f0 .L80240DF8: /* BEDBE8 80240DF8 E600003C */ swc1 $f0, 0x3c($s0) /* BEDBEC 80240DFC 8E220074 */ lw $v0, 0x74($s1) /* BEDBF0 80240E00 2442000A */ addiu $v0, $v0, 0xa /* BEDBF4 80240E04 44826000 */ mtc1 $v0, $f12 -/* BEDBF8 80240E08 00000000 */ nop +/* BEDBF8 80240E08 00000000 */ nop /* BEDBFC 80240E0C 0C00A6C9 */ jal clamp_angle /* BEDC00 80240E10 46806320 */ cvt.s.w $f12, $f12 /* BEDC04 80240E14 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80240B00_BED8F0 /* BEDC14 80240E24 2442FFFF */ addiu $v0, $v0, -1 /* BEDC18 80240E28 8E430014 */ lw $v1, 0x14($s2) /* BEDC1C 80240E2C 04600048 */ bltz $v1, .L80240F50 -/* BEDC20 80240E30 00000000 */ nop +/* BEDC20 80240E30 00000000 */ nop /* BEDC24 80240E34 8E620074 */ lw $v0, 0x74($s3) /* BEDC28 80240E38 1C400042 */ bgtz $v0, .L80240F44 /* BEDC2C 80240E3C 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80240B00_BED8F0 /* BEDC34 80240E44 860200A8 */ lh $v0, 0xa8($s0) /* BEDC38 80240E48 C602003C */ lwc1 $f2, 0x3c($s0) /* BEDC3C 80240E4C 44820000 */ mtc1 $v0, $f0 -/* BEDC40 80240E50 00000000 */ nop +/* BEDC40 80240E50 00000000 */ nop /* BEDC44 80240E54 46800020 */ cvt.s.w $f0, $f0 /* BEDC48 80240E58 46001080 */ add.s $f2, $f2, $f0 /* BEDC4C 80240E5C 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80240B00_BED8F0 /* BEDC68 80240E78 C440002C */ lwc1 $f0, 0x2c($v0) /* BEDC6C 80240E7C 46000021 */ cvt.d.s $f0, $f0 /* BEDC70 80240E80 4622003C */ c.lt.d $f0, $f2 -/* BEDC74 80240E84 00000000 */ nop +/* BEDC74 80240E84 00000000 */ nop /* BEDC78 80240E88 4500002C */ bc1f .L80240F3C /* BEDC7C 80240E8C 02A0202D */ daddu $a0, $s5, $zero /* BEDC80 80240E90 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80240B00_BED8F0 /* BEDCBC 80240ECC 3C01C1A0 */ lui $at, 0xc1a0 /* BEDCC0 80240ED0 44812000 */ mtc1 $at, $f4 /* BEDCC4 80240ED4 44834000 */ mtc1 $v1, $f8 -/* BEDCC8 80240ED8 00000000 */ nop +/* BEDCC8 80240ED8 00000000 */ nop /* BEDCCC 80240EDC 46804220 */ cvt.s.w $f8, $f8 /* BEDCD0 80240EE0 44074000 */ mfc1 $a3, $f8 /* BEDCD4 80240EE4 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80240B00_BED8F0 /* BEDD88 80240F98 0C0123F5 */ jal is_point_within_region /* BEDD8C 80240F9C 8E070038 */ lw $a3, 0x38($s0) /* BEDD90 80240FA0 1040001A */ beqz $v0, .L8024100C -/* BEDD94 80240FA4 00000000 */ nop +/* BEDD94 80240FA4 00000000 */ nop /* BEDD98 80240FA8 8E060038 */ lw $a2, 0x38($s0) /* BEDD9C 80240FAC 8E2200D0 */ lw $v0, 0xd0($s1) /* BEDDA0 80240FB0 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80240B00_BED8F0 /* BEDDB4 80240FC4 468073A0 */ cvt.s.w $f14, $f14 /* BEDDB8 80240FC8 C6020018 */ lwc1 $f2, 0x18($s0) /* BEDDBC 80240FCC 4600103C */ c.lt.s $f2, $f0 -/* BEDDC0 80240FD0 00000000 */ nop +/* BEDDC0 80240FD0 00000000 */ nop /* BEDDC4 80240FD4 4500000D */ bc1f .L8024100C /* BEDDC8 80240FD8 E7A00034 */ swc1 $f0, 0x34($sp) /* BEDDCC 80240FDC C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80240B00_BED8F0 /* BEDE08 80241018 00621825 */ or $v1, $v1, $v0 /* BEDE0C 8024101C 00741825 */ or $v1, $v1, $s4 /* BEDE10 80241020 10600008 */ beqz $v1, .L80241044 -/* BEDE14 80241024 00000000 */ nop +/* BEDE14 80241024 00000000 */ nop /* BEDE18 80241028 8602008C */ lh $v0, 0x8c($s0) /* BEDE1C 8024102C 14400031 */ bnez $v0, .L802410F4 -/* BEDE20 80241030 00000000 */ nop +/* BEDE20 80241030 00000000 */ nop /* BEDE24 80241034 8E050018 */ lw $a1, 0x18($s0) /* BEDE28 80241038 8E06000C */ lw $a2, 0xc($s0) /* BEDE2C 8024103C 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_80240B00_BED8F0 /* BEDE40 80241050 44801000 */ mtc1 $zero, $f2 /* BEDE44 80241054 46000021 */ cvt.d.s $f0, $f0 /* BEDE48 80241058 46220002 */ mul.d $f0, $f0, $f2 -/* BEDE4C 8024105C 00000000 */ nop +/* BEDE4C 8024105C 00000000 */ nop /* BEDE50 80241060 4620020D */ trunc.w.d $f8, $f0 /* BEDE54 80241064 E628007C */ swc1 $f8, 0x7c($s1) /* BEDE58 80241068 8E420004 */ lw $v0, 4($s2) /* BEDE5C 8024106C 18400021 */ blez $v0, .L802410F4 -/* BEDE60 80241070 00000000 */ nop +/* BEDE60 80241070 00000000 */ nop /* BEDE64 80241074 8602008E */ lh $v0, 0x8e($s0) /* BEDE68 80241078 9603008E */ lhu $v1, 0x8e($s0) /* BEDE6C 8024107C 18400005 */ blez $v0, .L80241094 @@ -375,7 +375,7 @@ glabel func_80240B00_BED8F0 /* BEDE74 80241084 A602008E */ sh $v0, 0x8e($s0) /* BEDE78 80241088 00021400 */ sll $v0, $v0, 0x10 /* BEDE7C 8024108C 1C400019 */ bgtz $v0, .L802410F4 -/* BEDE80 80241090 00000000 */ nop +/* BEDE80 80241090 00000000 */ nop .L80241094: /* BEDE84 80241094 240403E8 */ addiu $a0, $zero, 0x3e8 /* BEDE88 80241098 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80240B00_BED8F0 /* BEDED0 802410E0 18400003 */ blez $v0, .L802410F0 /* BEDED4 802410E4 28620003 */ slti $v0, $v1, 3 /* BEDED8 802410E8 10400002 */ beqz $v0, .L802410F4 -/* BEDEDC 802410EC 00000000 */ nop +/* BEDEDC 802410EC 00000000 */ nop .L802410F0: /* BEDEE0 802410F0 AE600070 */ sw $zero, 0x70($s3) .L802410F4: diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_802411E8_BEDFD8.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_802411E8_BEDFD8.s index 5c6f025648..555b4ab1cf 100644 --- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_802411E8_BEDFD8.s +++ b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_802411E8_BEDFD8.s @@ -42,11 +42,11 @@ glabel func_802411E8_BEDFD8 .L8024127C: /* BEE06C 8024127C 8E220070 */ lw $v0, 0x70($s1) /* BEE070 80241280 18400034 */ blez $v0, .L80241354 -/* BEE074 80241284 00000000 */ nop +/* BEE074 80241284 00000000 */ nop /* BEE078 80241288 C62C0074 */ lwc1 $f12, 0x74($s1) /* BEE07C 8024128C 46806320 */ cvt.s.w $f12, $f12 /* BEE080 80241290 44820000 */ mtc1 $v0, $f0 -/* BEE084 80241294 00000000 */ nop +/* BEE084 80241294 00000000 */ nop /* BEE088 80241298 46800020 */ cvt.s.w $f0, $f0 /* BEE08C 8024129C 46000021 */ cvt.d.s $f0, $f0 /* BEE090 802412A0 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_802411E8_BEDFD8 /* BEE0F0 80241300 27A70030 */ addiu $a3, $sp, 0x30 .L80241304: /* BEE0F4 80241304 10400007 */ beqz $v0, .L80241324 -/* BEE0F8 80241308 00000000 */ nop +/* BEE0F8 80241308 00000000 */ nop /* BEE0FC 8024130C 4616A082 */ mul.s $f2, $f20, $f22 -/* BEE100 80241310 00000000 */ nop +/* BEE100 80241310 00000000 */ nop /* BEE104 80241314 C7A0002C */ lwc1 $f0, 0x2c($sp) /* BEE108 80241318 46180000 */ add.s $f0, $f0, $f24 /* BEE10C 8024131C 080904CC */ j .L80241330 /* BEE110 80241320 46020000 */ add.s $f0, $f0, $f2 .L80241324: /* BEE114 80241324 4616A002 */ mul.s $f0, $f20, $f22 -/* BEE118 80241328 00000000 */ nop +/* BEE118 80241328 00000000 */ nop /* BEE11C 8024132C 4600D000 */ add.s $f0, $f26, $f0 .L80241330: /* BEE120 80241330 E600003C */ swc1 $f0, 0x3c($s0) /* BEE124 80241334 8E220074 */ lw $v0, 0x74($s1) /* BEE128 80241338 2442000A */ addiu $v0, $v0, 0xa /* BEE12C 8024133C 44826000 */ mtc1 $v0, $f12 -/* BEE130 80241340 00000000 */ nop +/* BEE130 80241340 00000000 */ nop /* BEE134 80241344 0C00A6C9 */ jal clamp_angle /* BEE138 80241348 46806320 */ cvt.s.w $f12, $f12 /* BEE13C 8024134C 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_802411E8_BEDFD8 /* BEE150 80241360 860200A8 */ lh $v0, 0xa8($s0) /* BEE154 80241364 C600003C */ lwc1 $f0, 0x3c($s0) /* BEE158 80241368 44821000 */ mtc1 $v0, $f2 -/* BEE15C 8024136C 00000000 */ nop +/* BEE15C 8024136C 00000000 */ nop /* BEE160 80241370 468010A0 */ cvt.s.w $f2, $f2 /* BEE164 80241374 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* BEE168 80241378 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_802411E8_BEDFD8 /* BEE184 80241394 46240000 */ add.d $f0, $f0, $f4 /* BEE188 80241398 460010A1 */ cvt.d.s $f2, $f2 /* BEE18C 8024139C 4620103C */ c.lt.d $f2, $f0 -/* BEE190 802413A0 00000000 */ nop +/* BEE190 802413A0 00000000 */ nop /* BEE194 802413A4 4500002E */ bc1f .L80241460 /* BEE198 802413A8 0280202D */ daddu $a0, $s4, $zero /* BEE19C 802413AC 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_802411E8_BEDFD8 /* BEE1DC 802413EC 3C01C1A0 */ lui $at, 0xc1a0 /* BEE1E0 802413F0 44812000 */ mtc1 $at, $f4 /* BEE1E4 802413F4 44834000 */ mtc1 $v1, $f8 -/* BEE1E8 802413F8 00000000 */ nop +/* BEE1E8 802413F8 00000000 */ nop /* BEE1EC 802413FC 46804220 */ cvt.s.w $f8, $f8 /* BEE1F0 80241400 44074000 */ mfc1 $a3, $f8 /* BEE1F4 80241404 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_802411E8_BEDFD8 .L80241460: /* BEE250 80241460 8602008C */ lh $v0, 0x8c($s0) /* BEE254 80241464 14400025 */ bnez $v0, .L802414FC -/* BEE258 80241468 00000000 */ nop +/* BEE258 80241468 00000000 */ nop /* BEE25C 8024146C 8602008E */ lh $v0, 0x8e($s0) /* BEE260 80241470 1C400022 */ bgtz $v0, .L802414FC -/* BEE264 80241474 00000000 */ nop +/* BEE264 80241474 00000000 */ nop /* BEE268 80241478 8E620074 */ lw $v0, 0x74($s3) /* BEE26C 8024147C 2442FFFF */ addiu $v0, $v0, -1 /* BEE270 80241480 1840001D */ blez $v0, .L802414F8 @@ -183,7 +183,7 @@ glabel func_802411E8_BEDFD8 /* BEE27C 8024148C 9442002A */ lhu $v0, 0x2a($v0) /* BEE280 80241490 30420010 */ andi $v0, $v0, 0x10 /* BEE284 80241494 14400007 */ bnez $v0, .L802414B4 -/* BEE288 80241498 00000000 */ nop +/* BEE288 80241498 00000000 */ nop /* BEE28C 8024149C C600000C */ lwc1 $f0, 0xc($s0) /* BEE290 802414A0 3C014334 */ lui $at, 0x4334 /* BEE294 802414A4 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241610_BEE400.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241610_BEE400.s index 81f069221b..62a084de67 100644 --- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241610_BEE400.s +++ b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241610_BEE400.s @@ -60,18 +60,18 @@ glabel func_80241610_BEE400 /* BEE4D8 802416E8 C6200038 */ lwc1 $f0, 0x38($s1) /* BEE4DC 802416EC 4600018D */ trunc.w.s $f6, $f0 /* BEE4E0 802416F0 44023000 */ mfc1 $v0, $f6 -/* BEE4E4 802416F4 00000000 */ nop +/* BEE4E4 802416F4 00000000 */ nop /* BEE4E8 802416F8 A6420010 */ sh $v0, 0x10($s2) /* BEE4EC 802416FC C620003C */ lwc1 $f0, 0x3c($s1) /* BEE4F0 80241700 4600018D */ trunc.w.s $f6, $f0 /* BEE4F4 80241704 44023000 */ mfc1 $v0, $f6 -/* BEE4F8 80241708 00000000 */ nop +/* BEE4F8 80241708 00000000 */ nop /* BEE4FC 8024170C A6420012 */ sh $v0, 0x12($s2) /* BEE500 80241710 C6200040 */ lwc1 $f0, 0x40($s1) /* BEE504 80241714 A2430007 */ sb $v1, 7($s2) /* BEE508 80241718 4600018D */ trunc.w.s $f6, $f0 /* BEE50C 8024171C 44023000 */ mfc1 $v0, $f6 -/* BEE510 80241720 00000000 */ nop +/* BEE510 80241720 00000000 */ nop /* BEE514 80241724 A6420014 */ sh $v0, 0x14($s2) .L80241728: /* BEE518 80241728 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_802417A8_BEE598.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_802417A8_BEE598.s index b185933fa8..fa2fc20c4d 100644 --- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_802417A8_BEE598.s +++ b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_802417A8_BEE598.s @@ -42,9 +42,9 @@ glabel func_802417A8_BEE598 /* BEE62C 8024183C 44801800 */ mtc1 $zero, $f3 /* BEE630 80241840 46002021 */ cvt.d.s $f0, $f4 /* BEE634 80241844 4620103E */ c.le.d $f2, $f0 -/* BEE638 80241848 00000000 */ nop +/* BEE638 80241848 00000000 */ nop /* BEE63C 8024184C 45000030 */ bc1f .L80241910 -/* BEE640 80241850 00000000 */ nop +/* BEE640 80241850 00000000 */ nop /* BEE644 80241854 C600003C */ lwc1 $f0, 0x3c($s0) /* BEE648 80241858 46040000 */ add.s $f0, $f0, $f4 /* BEE64C 8024185C E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_802417A8_BEE598 /* BEE6AC 802418BC 27A70020 */ addiu $a3, $sp, 0x20 .L802418C0: /* BEE6B0 802418C0 1040000B */ beqz $v0, .L802418F0 -/* BEE6B4 802418C4 00000000 */ nop +/* BEE6B4 802418C4 00000000 */ nop /* BEE6B8 802418C8 C7A0001C */ lwc1 $f0, 0x1c($sp) /* BEE6BC 802418CC 46140080 */ add.s $f2, $f0, $f20 /* BEE6C0 802418D0 C600003C */ lwc1 $f0, 0x3c($s0) /* BEE6C4 802418D4 4600103E */ c.le.s $f2, $f0 -/* BEE6C8 802418D8 00000000 */ nop +/* BEE6C8 802418D8 00000000 */ nop /* BEE6CC 802418DC 4500008D */ bc1f .L80241B14 -/* BEE6D0 802418E0 00000000 */ nop +/* BEE6D0 802418E0 00000000 */ nop /* BEE6D4 802418E4 E602003C */ swc1 $f2, 0x3c($s0) /* BEE6D8 802418E8 080906C5 */ j .L80241B14 /* BEE6DC 802418EC AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_802417A8_BEE598 /* BEE6E0 802418F0 C602003C */ lwc1 $f2, 0x3c($s0) /* BEE6E4 802418F4 C6000064 */ lwc1 $f0, 0x64($s0) /* BEE6E8 802418F8 4602003E */ c.le.s $f0, $f2 -/* BEE6EC 802418FC 00000000 */ nop +/* BEE6EC 802418FC 00000000 */ nop /* BEE6F0 80241900 45030084 */ bc1tl .L80241B14 /* BEE6F4 80241904 AE400070 */ sw $zero, 0x70($s2) /* BEE6F8 80241908 080906C5 */ j .L80241B14 -/* BEE6FC 8024190C 00000000 */ nop +/* BEE6FC 8024190C 00000000 */ nop .L80241910: /* BEE700 80241910 4622003C */ c.lt.d $f0, $f2 -/* BEE704 80241914 00000000 */ nop +/* BEE704 80241914 00000000 */ nop /* BEE708 80241918 4500007E */ bc1f .L80241B14 -/* BEE70C 8024191C 00000000 */ nop +/* BEE70C 8024191C 00000000 */ nop /* BEE710 80241920 9602008E */ lhu $v0, 0x8e($s0) /* BEE714 80241924 24420001 */ addiu $v0, $v0, 1 /* BEE718 80241928 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_802417A8_BEE598 /* BEE724 80241934 00021403 */ sra $v0, $v0, 0x10 /* BEE728 80241938 0043102A */ slt $v0, $v0, $v1 /* BEE72C 8024193C 14400026 */ bnez $v0, .L802419D8 -/* BEE730 80241940 00000000 */ nop +/* BEE730 80241940 00000000 */ nop /* BEE734 80241944 C60C0038 */ lwc1 $f12, 0x38($s0) /* BEE738 80241948 C60E0040 */ lwc1 $f14, 0x40($s0) /* BEE73C 8024194C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_802417A8_BEE598 /* BEE768 80241978 8E62001C */ lw $v0, 0x1c($s3) /* BEE76C 8024197C 46001005 */ abs.s $f0, $f2 /* BEE770 80241980 44822000 */ mtc1 $v0, $f4 -/* BEE774 80241984 00000000 */ nop +/* BEE774 80241984 00000000 */ nop /* BEE778 80241988 46802120 */ cvt.s.w $f4, $f4 /* BEE77C 8024198C 4600203C */ c.lt.s $f4, $f0 -/* BEE780 80241990 00000000 */ nop +/* BEE780 80241990 00000000 */ nop /* BEE784 80241994 4500000D */ bc1f .L802419CC -/* BEE788 80241998 00000000 */ nop +/* BEE788 80241998 00000000 */ nop /* BEE78C 8024199C 44800000 */ mtc1 $zero, $f0 /* BEE790 802419A0 C614000C */ lwc1 $f20, 0xc($s0) /* BEE794 802419A4 4600103C */ c.lt.s $f2, $f0 -/* BEE798 802419A8 00000000 */ nop +/* BEE798 802419A8 00000000 */ nop /* BEE79C 802419AC 45000006 */ bc1f .L802419C8 /* BEE7A0 802419B0 00021023 */ negu $v0, $v0 /* BEE7A4 802419B4 44820000 */ mtc1 $v0, $f0 -/* BEE7A8 802419B8 00000000 */ nop +/* BEE7A8 802419B8 00000000 */ nop /* BEE7AC 802419BC 46800020 */ cvt.s.w $f0, $f0 /* BEE7B0 802419C0 08090673 */ j .L802419CC /* BEE7B4 802419C4 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_802417A8_BEE598 /* BEE7DC 802419EC C600001C */ lwc1 $f0, 0x1c($s0) /* BEE7E0 802419F0 46001080 */ add.s $f2, $f2, $f0 /* BEE7E4 802419F4 4616103C */ c.lt.s $f2, $f22 -/* BEE7E8 802419F8 00000000 */ nop +/* BEE7E8 802419F8 00000000 */ nop /* BEE7EC 802419FC 45020045 */ bc1fl .L80241B14 /* BEE7F0 80241A00 E602003C */ swc1 $f2, 0x3c($s0) /* BEE7F4 80241A04 080906C4 */ j .L80241B10 @@ -169,7 +169,7 @@ glabel func_802417A8_BEE598 /* BEE80C 80241A1C C600001C */ lwc1 $f0, 0x1c($s0) /* BEE810 80241A20 C604003C */ lwc1 $f4, 0x3c($s0) /* BEE814 80241A24 44821000 */ mtc1 $v0, $f2 -/* BEE818 80241A28 00000000 */ nop +/* BEE818 80241A28 00000000 */ nop /* BEE81C 80241A2C 468010A0 */ cvt.s.w $f2, $f2 /* BEE820 80241A30 46000005 */ abs.s $f0, $f0 /* BEE824 80241A34 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_802417A8_BEE598 /* BEE860 80241A70 0C0372DF */ jal func_800DCB7C /* BEE864 80241A74 27A70020 */ addiu $a3, $sp, 0x20 /* BEE868 80241A78 10400015 */ beqz $v0, .L80241AD0 -/* BEE86C 80241A7C 00000000 */ nop +/* BEE86C 80241A7C 00000000 */ nop /* BEE870 80241A80 860200A8 */ lh $v0, 0xa8($s0) /* BEE874 80241A84 C604001C */ lwc1 $f4, 0x1c($s0) /* BEE878 80241A88 44820000 */ mtc1 $v0, $f0 -/* BEE87C 80241A8C 00000000 */ nop +/* BEE87C 80241A8C 00000000 */ nop /* BEE880 80241A90 46800020 */ cvt.s.w $f0, $f0 /* BEE884 80241A94 46002085 */ abs.s $f2, $f4 /* BEE888 80241A98 46020000 */ add.s $f0, $f0, $f2 /* BEE88C 80241A9C C7A20024 */ lwc1 $f2, 0x24($sp) /* BEE890 80241AA0 4600103E */ c.le.s $f2, $f0 -/* BEE894 80241AA4 00000000 */ nop +/* BEE894 80241AA4 00000000 */ nop /* BEE898 80241AA8 45000005 */ bc1f .L80241AC0 -/* BEE89C 80241AAC 00000000 */ nop +/* BEE89C 80241AAC 00000000 */ nop /* BEE8A0 80241AB0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* BEE8A4 80241AB4 AE00001C */ sw $zero, 0x1c($s0) /* BEE8A8 80241AB8 080906C5 */ j .L80241B14 @@ -217,13 +217,13 @@ glabel func_802417A8_BEE598 /* BEE8C4 80241AD4 860200A8 */ lh $v0, 0xa8($s0) /* BEE8C8 80241AD8 46163081 */ sub.s $f2, $f6, $f22 /* BEE8CC 80241ADC 44820000 */ mtc1 $v0, $f0 -/* BEE8D0 80241AE0 00000000 */ nop +/* BEE8D0 80241AE0 00000000 */ nop /* BEE8D4 80241AE4 46800020 */ cvt.s.w $f0, $f0 /* BEE8D8 80241AE8 46001080 */ add.s $f2, $f2, $f0 /* BEE8DC 80241AEC C604001C */ lwc1 $f4, 0x1c($s0) /* BEE8E0 80241AF0 46002005 */ abs.s $f0, $f4 /* BEE8E4 80241AF4 4602003C */ c.lt.s $f0, $f2 -/* BEE8E8 80241AF8 00000000 */ nop +/* BEE8E8 80241AF8 00000000 */ nop /* BEE8EC 80241AFC 45020005 */ bc1fl .L80241B14 /* BEE8F0 80241B00 AE00001C */ sw $zero, 0x1c($s0) /* BEE8F4 80241B04 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241B38_BEE928.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241B38_BEE928.s index 87dcb47f21..281cb2d957 100644 --- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241B38_BEE928.s +++ b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241B38_BEE928.s @@ -49,15 +49,15 @@ glabel func_80241B38_BEE928 /* BEE9D0 80241BE0 44802000 */ mtc1 $zero, $f4 /* BEE9D4 80241BE4 460010A1 */ cvt.d.s $f2, $f2 /* BEE9D8 80241BE8 46241082 */ mul.d $f2, $f2, $f4 -/* BEE9DC 80241BEC 00000000 */ nop +/* BEE9DC 80241BEC 00000000 */ nop /* BEE9E0 80241BF0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* BEE9E4 80241BF4 46000021 */ cvt.d.s $f0, $f0 /* BEE9E8 80241BF8 46240002 */ mul.d $f0, $f0, $f4 -/* BEE9EC 80241BFC 00000000 */ nop +/* BEE9EC 80241BFC 00000000 */ nop /* BEE9F0 80241C00 3C013FE0 */ lui $at, 0x3fe0 /* BEE9F4 80241C04 44812800 */ mtc1 $at, $f5 /* BEE9F8 80241C08 44802000 */ mtc1 $zero, $f4 -/* BEE9FC 80241C0C 00000000 */ nop +/* BEE9FC 80241C0C 00000000 */ nop /* BEEA00 80241C10 46241080 */ add.d $f2, $f2, $f4 /* BEEA04 80241C14 AE000074 */ sw $zero, 0x74($s0) /* BEEA08 80241C18 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s index cd8ff492a6..bf936d3124 100644 --- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s +++ b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s @@ -54,7 +54,7 @@ glabel func_80241C5C_BEEA4C /* BEEB0C 80241D1C 8E4300B0 */ lw $v1, 0xb0($s2) /* BEEB10 80241D20 30620004 */ andi $v0, $v1, 4 /* BEEB14 80241D24 10400007 */ beqz $v0, .L80241D44 -/* BEEB18 80241D28 00000000 */ nop +/* BEEB18 80241D28 00000000 */ nop /* BEEB1C 80241D2C 824200B4 */ lb $v0, 0xb4($s2) /* BEEB20 80241D30 1440003C */ bnez $v0, .L80241E24 /* BEEB24 80241D34 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_80241C5C_BEEA4C /* BEEB38 80241D48 2C62000F */ sltiu $v0, $v1, 0xf /* BEEB3C 80241D4C 10400034 */ beqz $v0, .L80241E20 /* BEEB40 80241D50 00031080 */ sll $v0, $v1, 2 -/* BEEB44 80241D54 3C018024 */ lui $at, %hi(D_80247968) +/* BEEB44 80241D54 3C018024 */ lui $at, %hi(jtbl_80247968_BF4758) /* BEEB48 80241D58 00220821 */ addu $at, $at, $v0 -/* BEEB4C 80241D5C 8C227968 */ lw $v0, %lo(D_80247968)($at) +/* BEEB4C 80241D5C 8C227968 */ lw $v0, %lo(jtbl_80247968_BF4758)($at) /* BEEB50 80241D60 00400008 */ jr $v0 -/* BEEB54 80241D64 00000000 */ nop +/* BEEB54 80241D64 00000000 */ nop +glabel L80241D68_BEEB58 /* BEEB58 80241D68 0280202D */ daddu $a0, $s4, $zero /* BEEB5C 80241D6C 0200282D */ daddu $a1, $s0, $zero /* BEEB60 80241D70 0C090254 */ jal func_80240950_BED740 /* BEEB64 80241D74 0260302D */ daddu $a2, $s3, $zero +glabel L80241D78_BEEB68 /* BEEB68 80241D78 0280202D */ daddu $a0, $s4, $zero /* BEEB6C 80241D7C 0200282D */ daddu $a1, $s0, $zero /* BEEB70 80241D80 0C0902C0 */ jal func_80240B00_BED8F0 /* BEEB74 80241D84 0260302D */ daddu $a2, $s3, $zero /* BEEB78 80241D88 08090789 */ j .L80241E24 /* BEEB7C 80241D8C 0000102D */ daddu $v0, $zero, $zero +glabel L80241D90_BEEB80 /* BEEB80 80241D90 0280202D */ daddu $a0, $s4, $zero /* BEEB84 80241D94 0200282D */ daddu $a1, $s0, $zero /* BEEB88 80241D98 0C09044A */ jal arn_07_UnkNpcAIFunc1 /* BEEB8C 80241D9C 0260302D */ daddu $a2, $s3, $zero +glabel L80241DA0_BEEB90 /* BEEB90 80241DA0 0280202D */ daddu $a0, $s4, $zero /* BEEB94 80241DA4 0200282D */ daddu $a1, $s0, $zero /* BEEB98 80241DA8 0C09047A */ jal func_802411E8_BEDFD8 /* BEEB9C 80241DAC 0260302D */ daddu $a2, $s3, $zero /* BEEBA0 80241DB0 08090789 */ j .L80241E24 /* BEEBA4 80241DB4 0000102D */ daddu $v0, $zero, $zero +glabel L80241DB8_BEEBA8 /* BEEBA8 80241DB8 0280202D */ daddu $a0, $s4, $zero /* BEEBAC 80241DBC 0200282D */ daddu $a1, $s0, $zero /* BEEBB0 80241DC0 0C09054B */ jal arn_07_UnkNpcAIFunc2 /* BEEBB4 80241DC4 0260302D */ daddu $a2, $s3, $zero +glabel L80241DC8_BEEBB8 /* BEEBB8 80241DC8 0280202D */ daddu $a0, $s4, $zero /* BEEBBC 80241DCC 0200282D */ daddu $a1, $s0, $zero /* BEEBC0 80241DD0 0C090569 */ jal func_802415A4_BEE394 /* BEEBC4 80241DD4 0260302D */ daddu $a2, $s3, $zero /* BEEBC8 80241DD8 08090789 */ j .L80241E24 /* BEEBCC 80241DDC 0000102D */ daddu $v0, $zero, $zero +glabel L80241DE0_BEEBD0 /* BEEBD0 80241DE0 0280202D */ daddu $a0, $s4, $zero /* BEEBD4 80241DE4 0200282D */ daddu $a1, $s0, $zero /* BEEBD8 80241DE8 0C090584 */ jal func_80241610_BEE400 /* BEEBDC 80241DEC 0260302D */ daddu $a2, $s3, $zero /* BEEBE0 80241DF0 08090789 */ j .L80241E24 /* BEEBE4 80241DF4 0000102D */ daddu $v0, $zero, $zero +glabel L80241DF8_BEEBE8 /* BEEBE8 80241DF8 0280202D */ daddu $a0, $s4, $zero /* BEEBEC 80241DFC 0200282D */ daddu $a1, $s0, $zero /* BEEBF0 80241E00 0C0905D1 */ jal arn_07_UnkNpcAIFunc3 /* BEEBF4 80241E04 0260302D */ daddu $a2, $s3, $zero /* BEEBF8 80241E08 08090789 */ j .L80241E24 /* BEEBFC 80241E0C 0000102D */ daddu $v0, $zero, $zero +glabel L80241E10_BEEC00 /* BEEC00 80241E10 0280202D */ daddu $a0, $s4, $zero /* BEEC04 80241E14 0200282D */ daddu $a1, $s0, $zero /* BEEC08 80241E18 0C0905EA */ jal func_802417A8_BEE598 /* BEEC0C 80241E1C 0260302D */ daddu $a2, $s3, $zero .L80241E20: +glabel L80241E20_BEEC10 /* BEEC10 80241E20 0000102D */ daddu $v0, $zero, $zero .L80241E24: /* BEEC14 80241E24 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_arn/arn_08/BF47A0/func_80240000_BF47A0.s b/asm/nonmatchings/world/area_arn/arn_08/BF47A0/func_80240000_BF47A0.s index b2ac287b51..dbecdd5bee 100644 --- a/asm/nonmatchings/world/area_arn/arn_08/BF47A0/func_80240000_BF47A0.s +++ b/asm/nonmatchings/world/area_arn/arn_08/BF47A0/func_80240000_BF47A0.s @@ -14,7 +14,7 @@ glabel func_80240000_BF47A0 /* BF47C4 80240024 34840007 */ ori $a0, $a0, 7 .L80240028: /* BF47C8 80240028 0C038D36 */ jal func_800E34D8 -/* BF47CC 8024002C 00000000 */ nop +/* BF47CC 8024002C 00000000 */ nop /* BF47D0 80240030 46000506 */ mov.s $f20, $f0 /* BF47D4 80240034 4600A306 */ mov.s $f12, $f20 /* BF47D8 80240038 0C038D45 */ jal func_800E3514 @@ -28,7 +28,7 @@ glabel func_80240000_BF47A0 /* BF47F8 80240058 46140000 */ add.s $f0, $f0, $f20 /* BF47FC 8024005C 4600008D */ trunc.w.s $f2, $f0 /* BF4800 80240060 44021000 */ mfc1 $v0, $f2 -/* BF4804 80240064 00000000 */ nop +/* BF4804 80240064 00000000 */ nop /* BF4808 80240068 AE020070 */ sw $v0, 0x70($s0) /* BF480C 8024006C 28420033 */ slti $v0, $v0, 0x33 /* BF4810 80240070 38420001 */ xori $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_arn/arn_08/BF47A0/func_8024008C_BF482C.s b/asm/nonmatchings/world/area_arn/arn_08/BF47A0/func_8024008C_BF482C.s index 90898b872b..b543a6678f 100644 --- a/asm/nonmatchings/world/area_arn/arn_08/BF47A0/func_8024008C_BF482C.s +++ b/asm/nonmatchings/world/area_arn/arn_08/BF47A0/func_8024008C_BF482C.s @@ -6,13 +6,13 @@ glabel func_8024008C_BF482C /* BF4830 80240090 C422EFF4 */ lwc1 $f2, %lo(gPlayerStatus+0x2C)($at) /* BF4834 80240094 3C01C120 */ lui $at, 0xc120 /* BF4838 80240098 44810000 */ mtc1 $at, $f0 -/* BF483C 8024009C 00000000 */ nop +/* BF483C 8024009C 00000000 */ nop /* BF4840 802400A0 4600103C */ c.lt.s $f2, $f0 -/* BF4844 802400A4 00000000 */ nop +/* BF4844 802400A4 00000000 */ nop /* BF4848 802400A8 45010002 */ bc1t .L802400B4 /* BF484C 802400AC 24020002 */ addiu $v0, $zero, 2 /* BF4850 802400B0 0000102D */ daddu $v0, $zero, $zero .L802400B4: /* BF4854 802400B4 03E00008 */ jr $ra -/* BF4858 802400B8 00000000 */ nop -/* BF485C 802400BC 00000000 */ nop +/* BF4858 802400B8 00000000 */ nop +/* BF485C 802400BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_08/BF4860/func_802400D4_BF4874.s b/asm/nonmatchings/world/area_arn/arn_08/BF4860/func_802400D4_BF4874.s index ebdba23951..76b40e8d9a 100644 --- a/asm/nonmatchings/world/area_arn/arn_08/BF4860/func_802400D4_BF4874.s +++ b/asm/nonmatchings/world/area_arn/arn_08/BF4860/func_802400D4_BF4874.s @@ -5,7 +5,7 @@ glabel func_802400D4_BF4874 /* BF4874 802400D4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* BF4878 802400D8 AFBF0010 */ sw $ra, 0x10($sp) /* BF487C 802400DC 0C03BCC0 */ jal func_800EF300 -/* BF4880 802400E0 00000000 */ nop +/* BF4880 802400E0 00000000 */ nop /* BF4884 802400E4 8FBF0010 */ lw $ra, 0x10($sp) /* BF4888 802400E8 24020002 */ addiu $v0, $zero, 2 /* BF488C 802400EC 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_arn/arn_08/BF4860/func_802400F4_BF4894.s b/asm/nonmatchings/world/area_arn/arn_08/BF4860/func_802400F4_BF4894.s index 83115fab8f..65489b21d7 100644 --- a/asm/nonmatchings/world/area_arn/arn_08/BF4860/func_802400F4_BF4894.s +++ b/asm/nonmatchings/world/area_arn/arn_08/BF4860/func_802400F4_BF4894.s @@ -16,13 +16,13 @@ glabel func_802400F4_BF4894 /* BF48BC 8024011C C622002C */ lwc1 $f2, 0x2c($s1) /* BF48C0 80240120 3C01C120 */ lui $at, 0xc120 /* BF48C4 80240124 44810000 */ mtc1 $at, $f0 -/* BF48C8 80240128 00000000 */ nop +/* BF48C8 80240128 00000000 */ nop /* BF48CC 8024012C 4602003C */ c.lt.s $f0, $f2 -/* BF48D0 80240130 00000000 */ nop +/* BF48D0 80240130 00000000 */ nop /* BF48D4 80240134 45010013 */ bc1t .L80240184 /* BF48D8 80240138 0000102D */ daddu $v0, $zero, $zero /* BF48DC 8024013C 0C038D36 */ jal func_800E34D8 -/* BF48E0 80240140 00000000 */ nop +/* BF48E0 80240140 00000000 */ nop /* BF48E4 80240144 46000506 */ mov.s $f20, $f0 /* BF48E8 80240148 4600A306 */ mov.s $f12, $f20 /* BF48EC 8024014C 0C038D45 */ jal func_800E3514 @@ -34,7 +34,7 @@ glabel func_802400F4_BF4894 /* BF4904 80240164 46140000 */ add.s $f0, $f0, $f20 /* BF4908 80240168 4600010D */ trunc.w.s $f4, $f0 /* BF490C 8024016C 44032000 */ mfc1 $v1, $f4 -/* BF4910 80240170 00000000 */ nop +/* BF4910 80240170 00000000 */ nop /* BF4914 80240174 28620033 */ slti $v0, $v1, 0x33 /* BF4918 80240178 38420001 */ xori $v0, $v0, 1 /* BF491C 8024017C 00021040 */ sll $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_arn/arn_08/BF4860/func_8024019C_BF493C.s b/asm/nonmatchings/world/area_arn/arn_08/BF4860/func_8024019C_BF493C.s index 8356516cd2..b388170e45 100644 --- a/asm/nonmatchings/world/area_arn/arn_08/BF4860/func_8024019C_BF493C.s +++ b/asm/nonmatchings/world/area_arn/arn_08/BF4860/func_8024019C_BF493C.s @@ -20,12 +20,12 @@ glabel func_8024019C_BF493C /* BF4978 802401D8 10600007 */ beqz $v1, .L802401F8 /* BF497C 802401DC 0000102D */ daddu $v0, $zero, $zero /* BF4980 802401E0 0809009D */ j .L80240274 -/* BF4984 802401E4 00000000 */ nop +/* BF4984 802401E4 00000000 */ nop .L802401E8: /* BF4988 802401E8 10620008 */ beq $v1, $v0, .L8024020C /* BF498C 802401EC 0000102D */ daddu $v0, $zero, $zero /* BF4990 802401F0 0809009D */ j .L80240274 -/* BF4994 802401F4 00000000 */ nop +/* BF4994 802401F4 00000000 */ nop .L802401F8: /* BF4998 802401F8 24020001 */ addiu $v0, $zero, 1 /* BF499C 802401FC 0809009C */ j .L80240270 @@ -45,7 +45,7 @@ glabel func_8024019C_BF493C /* BF49CC 8024022C 4600110D */ trunc.w.s $f4, $f2 /* BF49D0 80240230 44052000 */ mfc1 $a1, $f4 /* BF49D4 80240234 0C03BCF0 */ jal func_800EF3C0 -/* BF49D8 80240238 00000000 */ nop +/* BF49D8 80240238 00000000 */ nop /* BF49DC 8024023C 0C03BCF5 */ jal func_800EF3D4 /* BF49E0 80240240 0000202D */ daddu $a0, $zero, $zero /* BF49E4 80240244 3C0142B4 */ lui $at, 0x42b4 @@ -53,7 +53,7 @@ glabel func_8024019C_BF493C /* BF49EC 8024024C 8E040000 */ lw $a0, ($s0) /* BF49F0 80240250 4405A000 */ mfc1 $a1, $f20 /* BF49F4 80240254 0C00ECD0 */ jal set_npc_yaw -/* BF49F8 80240258 00000000 */ nop +/* BF49F8 80240258 00000000 */ nop /* BF49FC 8024025C 24020002 */ addiu $v0, $zero, 2 /* BF4A00 80240260 E6340080 */ swc1 $f20, 0x80($s1) /* BF4A04 80240264 E6340084 */ swc1 $f20, 0x84($s1) @@ -68,4 +68,4 @@ glabel func_8024019C_BF493C /* BF4A20 80240280 D7B40020 */ ldc1 $f20, 0x20($sp) /* BF4A24 80240284 03E00008 */ jr $ra /* BF4A28 80240288 27BD0028 */ addiu $sp, $sp, 0x28 -/* BF4A2C 8024028C 00000000 */ nop +/* BF4A2C 8024028C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_09/BF6060/func_80240000_BF6060.s b/asm/nonmatchings/world/area_arn/arn_09/BF6060/func_80240000_BF6060.s index 8e8fc728d3..fa6618d8c8 100644 --- a/asm/nonmatchings/world/area_arn/arn_09/BF6060/func_80240000_BF6060.s +++ b/asm/nonmatchings/world/area_arn/arn_09/BF6060/func_80240000_BF6060.s @@ -12,10 +12,10 @@ glabel func_80240000_BF6060 /* BF607C 8024001C 3C050000 */ lui $a1, 0 /* BF6080 80240020 24A501E4 */ addiu $a1, $a1, 0x1e4 /* BF6084 80240024 0C048052 */ jal play_model_animation -/* BF6088 80240028 00000000 */ nop +/* BF6088 80240028 00000000 */ nop /* BF608C 8024002C 24020002 */ addiu $v0, $zero, 2 .L80240030: /* BF6090 80240030 8FBF0010 */ lw $ra, 0x10($sp) /* BF6094 80240034 03E00008 */ jr $ra /* BF6098 80240038 27BD0018 */ addiu $sp, $sp, 0x18 -/* BF609C 8024003C 00000000 */ nop +/* BF609C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_00/BFA0A0/func_80240000_BFA0A0.s b/asm/nonmatchings/world/area_dgb/dgb_00/BFA0A0/func_80240000_BFA0A0.s index c2cb77dcd8..9e83457e69 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_00/BFA0A0/func_80240000_BFA0A0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_00/BFA0A0/func_80240000_BFA0A0.s @@ -9,7 +9,7 @@ glabel func_80240000_BFA0A0 /* BFA0B0 80240010 24A537A0 */ addiu $a1, $a1, %lo(D_802437A0) /* BFA0B4 80240014 AFBF0010 */ sw $ra, 0x10($sp) /* BFA0B8 80240018 0C01953C */ jal sprintf -/* BFA0BC 8024001C 00000000 */ nop +/* BFA0BC 8024001C 00000000 */ nop /* BFA0C0 80240020 3C04800E */ lui $a0, %hi(D_800D91E0) /* BFA0C4 80240024 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) /* BFA0C8 80240028 3C058024 */ lui $a1, %hi(D_802437B0) @@ -24,5 +24,5 @@ glabel func_80240000_BFA0A0 /* BFA0EC 8024004C 0000102D */ daddu $v0, $zero, $zero /* BFA0F0 80240050 03E00008 */ jr $ra /* BFA0F4 80240054 27BD0018 */ addiu $sp, $sp, 0x18 -/* BFA0F8 80240058 00000000 */ nop -/* BFA0FC 8024005C 00000000 */ nop +/* BFA0F8 80240058 00000000 */ nop +/* BFA0FC 8024005C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240120_BFD9A0.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240120_BFD9A0.s index c78ba1b267..a6a71f17d1 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240120_BFD9A0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240120_BFD9A0.s @@ -47,7 +47,7 @@ glabel func_80240120_BFD9A0 /* BFDA48 802401C8 0C0123F5 */ jal is_point_within_region /* BFDA4C 802401CC 8E070038 */ lw $a3, 0x38($s0) /* BFDA50 802401D0 1040000E */ beqz $v0, .L8024020C -/* BFDA54 802401D4 00000000 */ nop +/* BFDA54 802401D4 00000000 */ nop /* BFDA58 802401D8 8E2200D0 */ lw $v0, 0xd0($s1) /* BFDA5C 802401DC C60C0038 */ lwc1 $f12, 0x38($s0) /* BFDA60 802401E0 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240120_BFD9A0 /* BFDA74 802401F4 468031A0 */ cvt.s.w $f6, $f6 /* BFDA78 802401F8 44073000 */ mfc1 $a3, $f6 /* BFDA7C 802401FC 0C00A720 */ jal atan2 -/* BFDA80 80240200 00000000 */ nop +/* BFDA80 80240200 00000000 */ nop /* BFDA84 80240204 0809008F */ j .L8024023C /* BFDA88 80240208 E600000C */ swc1 $f0, 0xc($s0) .L8024020C: @@ -66,7 +66,7 @@ glabel func_80240120_BFD9A0 /* BFDA90 80240210 2404003C */ addiu $a0, $zero, 0x3c /* BFDA94 80240214 C60C000C */ lwc1 $f12, 0xc($s0) /* BFDA98 80240218 44820000 */ mtc1 $v0, $f0 -/* BFDA9C 8024021C 00000000 */ nop +/* BFDA9C 8024021C 00000000 */ nop /* BFDAA0 80240220 46800020 */ cvt.s.w $f0, $f0 /* BFDAA4 80240224 46006300 */ add.s $f12, $f12, $f0 /* BFDAA8 80240228 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240120_BFD9A0 /* BFDACC 8024024C 8E2200D0 */ lw $v0, 0xd0($s1) /* BFDAD0 80240250 8C420014 */ lw $v0, 0x14($v0) /* BFDAD4 80240254 04410004 */ bgez $v0, .L80240268 -/* BFDAD8 80240258 00000000 */ nop +/* BFDAD8 80240258 00000000 */ nop /* BFDADC 8024025C C6400000 */ lwc1 $f0, ($s2) /* BFDAE0 80240260 080900A2 */ j .L80240288 /* BFDAE4 80240264 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240120_BFD9A0 /* BFDAE8 80240268 3C018026 */ lui $at, %hi(D_80263420) /* BFDAEC 8024026C D4223420 */ ldc1 $f2, %lo(D_80263420)($at) /* BFDAF0 80240270 44820000 */ mtc1 $v0, $f0 -/* BFDAF4 80240274 00000000 */ nop +/* BFDAF4 80240274 00000000 */ nop /* BFDAF8 80240278 46800021 */ cvt.d.w $f0, $f0 /* BFDAFC 8024027C 46220003 */ div.d $f0, $f0, $f2 /* BFDB00 80240280 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240120_BFD9A0 /* BFDB14 80240294 44801000 */ mtc1 $zero, $f2 /* BFDB18 80240298 46000021 */ cvt.d.s $f0, $f0 /* BFDB1C 8024029C 46220002 */ mul.d $f0, $f0, $f2 -/* BFDB20 802402A0 00000000 */ nop +/* BFDB20 802402A0 00000000 */ nop /* BFDB24 802402A4 24020001 */ addiu $v0, $zero, 1 /* BFDB28 802402A8 4620018D */ trunc.w.d $f6, $f0 /* BFDB2C 802402AC E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802402D0_BFDB50.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802402D0_BFDB50.s index 54dd5dfedd..ac80850e41 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802402D0_BFDB50.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802402D0_BFDB50.s @@ -34,7 +34,7 @@ glabel func_802402D0_BFDB50 /* BFDBC4 80240344 44803000 */ mtc1 $zero, $f6 /* BFDBC8 80240348 46000021 */ cvt.d.s $f0, $f0 /* BFDBCC 8024034C 46260002 */ mul.d $f0, $f0, $f6 -/* BFDBD0 80240350 00000000 */ nop +/* BFDBD0 80240350 00000000 */ nop /* BFDBD4 80240354 24020001 */ addiu $v0, $zero, 1 /* BFDBD8 80240358 8E24006C */ lw $a0, 0x6c($s1) /* BFDBDC 8024035C 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_802402D0_BFDB50 /* BFDC38 802403B8 C600003C */ lwc1 $f0, 0x3c($s0) /* BFDC3C 802403BC 4600C001 */ sub.s $f0, $f24, $f0 /* BFDC40 802403C0 4600B03C */ c.lt.s $f22, $f0 -/* BFDC44 802403C4 00000000 */ nop +/* BFDC44 802403C4 00000000 */ nop /* BFDC48 802403C8 4500001B */ bc1f .L80240438 /* BFDC4C 802403CC 34820010 */ ori $v0, $a0, 0x10 /* BFDC50 802403D0 0809010E */ j .L80240438 @@ -87,9 +87,9 @@ glabel func_802402D0_BFDB50 /* BFDC94 80240414 C7A00034 */ lwc1 $f0, 0x34($sp) /* BFDC98 80240418 4600D001 */ sub.s $f0, $f26, $f0 /* BFDC9C 8024041C 4600B03C */ c.lt.s $f22, $f0 -/* BFDCA0 80240420 00000000 */ nop +/* BFDCA0 80240420 00000000 */ nop /* BFDCA4 80240424 45000004 */ bc1f .L80240438 -/* BFDCA8 80240428 00000000 */ nop +/* BFDCA8 80240428 00000000 */ nop /* BFDCAC 8024042C 8E22006C */ lw $v0, 0x6c($s1) /* BFDCB0 80240430 34420010 */ ori $v0, $v0, 0x10 /* BFDCB4 80240434 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_802402D0_BFDB50 /* BFDCBC 8024043C 24030011 */ addiu $v1, $zero, 0x11 /* BFDCC0 80240440 30420011 */ andi $v0, $v0, 0x11 /* BFDCC4 80240444 14430039 */ bne $v0, $v1, .L8024052C -/* BFDCC8 80240448 00000000 */ nop +/* BFDCC8 80240448 00000000 */ nop /* BFDCCC 8024044C 8E020000 */ lw $v0, ($s0) /* BFDCD0 80240450 30420008 */ andi $v0, $v0, 8 /* BFDCD4 80240454 1040000A */ beqz $v0, .L80240480 @@ -108,7 +108,7 @@ glabel func_802402D0_BFDB50 /* BFDCE4 80240464 D4203428 */ ldc1 $f0, %lo(D_80263428)($at) /* BFDCE8 80240468 460010A1 */ cvt.d.s $f2, $f2 /* BFDCEC 8024046C 46201082 */ mul.d $f2, $f2, $f0 -/* BFDCF0 80240470 00000000 */ nop +/* BFDCF0 80240470 00000000 */ nop /* BFDCF4 80240474 4600A021 */ cvt.d.s $f0, $f20 /* BFDCF8 80240478 08090139 */ j .L802404E4 /* BFDCFC 8024047C 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_802402D0_BFDB50 /* BFDD4C 802404CC D4203430 */ ldc1 $f0, %lo(D_80263430)($at) /* BFDD50 802404D0 460010A1 */ cvt.d.s $f2, $f2 /* BFDD54 802404D4 46201082 */ mul.d $f2, $f2, $f0 -/* BFDD58 802404D8 00000000 */ nop +/* BFDD58 802404D8 00000000 */ nop /* BFDD5C 802404DC 4600A021 */ cvt.d.s $f0, $f20 /* BFDD60 802404E0 46220000 */ add.d $f0, $f0, $f2 .L802404E4: @@ -149,7 +149,7 @@ glabel func_802402D0_BFDB50 /* BFDD80 80240500 46000005 */ abs.s $f0, $f0 /* BFDD84 80240504 46000021 */ cvt.d.s $f0, $f0 /* BFDD88 80240508 4622003C */ c.lt.d $f0, $f2 -/* BFDD8C 8024050C 00000000 */ nop +/* BFDD8C 8024050C 00000000 */ nop /* BFDD90 80240510 45000036 */ bc1f .L802405EC /* BFDD94 80240514 2403FFEF */ addiu $v1, $zero, -0x11 /* BFDD98 80240518 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_802402D0_BFDB50 .L8024052C: /* BFDDAC 8024052C 8E220070 */ lw $v0, 0x70($s1) /* BFDDB0 80240530 1840002E */ blez $v0, .L802405EC -/* BFDDB4 80240534 00000000 */ nop +/* BFDDB4 80240534 00000000 */ nop /* BFDDB8 80240538 C62C0074 */ lwc1 $f12, 0x74($s1) /* BFDDBC 8024053C 0C00A8BB */ jal sin_deg /* BFDDC0 80240540 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_802402D0_BFDB50 /* BFDE18 80240598 27A70030 */ addiu $a3, $sp, 0x30 .L8024059C: /* BFDE1C 8024059C 10400007 */ beqz $v0, .L802405BC -/* BFDE20 802405A0 00000000 */ nop +/* BFDE20 802405A0 00000000 */ nop /* BFDE24 802405A4 4616A082 */ mul.s $f2, $f20, $f22 -/* BFDE28 802405A8 00000000 */ nop +/* BFDE28 802405A8 00000000 */ nop /* BFDE2C 802405AC C7A0002C */ lwc1 $f0, 0x2c($sp) /* BFDE30 802405B0 461A0000 */ add.s $f0, $f0, $f26 /* BFDE34 802405B4 08090172 */ j .L802405C8 /* BFDE38 802405B8 46020000 */ add.s $f0, $f0, $f2 .L802405BC: /* BFDE3C 802405BC 4616A002 */ mul.s $f0, $f20, $f22 -/* BFDE40 802405C0 00000000 */ nop +/* BFDE40 802405C0 00000000 */ nop /* BFDE44 802405C4 4600C000 */ add.s $f0, $f24, $f0 .L802405C8: /* BFDE48 802405C8 E600003C */ swc1 $f0, 0x3c($s0) /* BFDE4C 802405CC 8E220074 */ lw $v0, 0x74($s1) /* BFDE50 802405D0 2442000A */ addiu $v0, $v0, 0xa /* BFDE54 802405D4 44826000 */ mtc1 $v0, $f12 -/* BFDE58 802405D8 00000000 */ nop +/* BFDE58 802405D8 00000000 */ nop /* BFDE5C 802405DC 0C00A6C9 */ jal clamp_angle /* BFDE60 802405E0 46806320 */ cvt.s.w $f12, $f12 /* BFDE64 802405E4 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_802402D0_BFDB50 /* BFDE74 802405F4 2442FFFF */ addiu $v0, $v0, -1 /* BFDE78 802405F8 8E430014 */ lw $v1, 0x14($s2) /* BFDE7C 802405FC 04600048 */ bltz $v1, .L80240720 -/* BFDE80 80240600 00000000 */ nop +/* BFDE80 80240600 00000000 */ nop /* BFDE84 80240604 8E620074 */ lw $v0, 0x74($s3) /* BFDE88 80240608 1C400042 */ bgtz $v0, .L80240714 /* BFDE8C 8024060C 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_802402D0_BFDB50 /* BFDE94 80240614 860200A8 */ lh $v0, 0xa8($s0) /* BFDE98 80240618 C602003C */ lwc1 $f2, 0x3c($s0) /* BFDE9C 8024061C 44820000 */ mtc1 $v0, $f0 -/* BFDEA0 80240620 00000000 */ nop +/* BFDEA0 80240620 00000000 */ nop /* BFDEA4 80240624 46800020 */ cvt.s.w $f0, $f0 /* BFDEA8 80240628 46001080 */ add.s $f2, $f2, $f0 /* BFDEAC 8024062C 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_802402D0_BFDB50 /* BFDEC8 80240648 C440002C */ lwc1 $f0, 0x2c($v0) /* BFDECC 8024064C 46000021 */ cvt.d.s $f0, $f0 /* BFDED0 80240650 4622003C */ c.lt.d $f0, $f2 -/* BFDED4 80240654 00000000 */ nop +/* BFDED4 80240654 00000000 */ nop /* BFDED8 80240658 4500002C */ bc1f .L8024070C /* BFDEDC 8024065C 02A0202D */ daddu $a0, $s5, $zero /* BFDEE0 80240660 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_802402D0_BFDB50 /* BFDF1C 8024069C 3C01C1A0 */ lui $at, 0xc1a0 /* BFDF20 802406A0 44812000 */ mtc1 $at, $f4 /* BFDF24 802406A4 44834000 */ mtc1 $v1, $f8 -/* BFDF28 802406A8 00000000 */ nop +/* BFDF28 802406A8 00000000 */ nop /* BFDF2C 802406AC 46804220 */ cvt.s.w $f8, $f8 /* BFDF30 802406B0 44074000 */ mfc1 $a3, $f8 /* BFDF34 802406B4 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_802402D0_BFDB50 /* BFDFE8 80240768 0C0123F5 */ jal is_point_within_region /* BFDFEC 8024076C 8E070038 */ lw $a3, 0x38($s0) /* BFDFF0 80240770 1040001A */ beqz $v0, .L802407DC -/* BFDFF4 80240774 00000000 */ nop +/* BFDFF4 80240774 00000000 */ nop /* BFDFF8 80240778 8E060038 */ lw $a2, 0x38($s0) /* BFDFFC 8024077C 8E2200D0 */ lw $v0, 0xd0($s1) /* BFE000 80240780 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_802402D0_BFDB50 /* BFE014 80240794 468073A0 */ cvt.s.w $f14, $f14 /* BFE018 80240798 C6020018 */ lwc1 $f2, 0x18($s0) /* BFE01C 8024079C 4600103C */ c.lt.s $f2, $f0 -/* BFE020 802407A0 00000000 */ nop +/* BFE020 802407A0 00000000 */ nop /* BFE024 802407A4 4500000D */ bc1f .L802407DC /* BFE028 802407A8 E7A00034 */ swc1 $f0, 0x34($sp) /* BFE02C 802407AC C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_802402D0_BFDB50 /* BFE068 802407E8 00621825 */ or $v1, $v1, $v0 /* BFE06C 802407EC 00741825 */ or $v1, $v1, $s4 /* BFE070 802407F0 10600008 */ beqz $v1, .L80240814 -/* BFE074 802407F4 00000000 */ nop +/* BFE074 802407F4 00000000 */ nop /* BFE078 802407F8 8602008C */ lh $v0, 0x8c($s0) /* BFE07C 802407FC 14400031 */ bnez $v0, .L802408C4 -/* BFE080 80240800 00000000 */ nop +/* BFE080 80240800 00000000 */ nop /* BFE084 80240804 8E050018 */ lw $a1, 0x18($s0) /* BFE088 80240808 8E06000C */ lw $a2, 0xc($s0) /* BFE08C 8024080C 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_802402D0_BFDB50 /* BFE0A0 80240820 44801000 */ mtc1 $zero, $f2 /* BFE0A4 80240824 46000021 */ cvt.d.s $f0, $f0 /* BFE0A8 80240828 46220002 */ mul.d $f0, $f0, $f2 -/* BFE0AC 8024082C 00000000 */ nop +/* BFE0AC 8024082C 00000000 */ nop /* BFE0B0 80240830 4620020D */ trunc.w.d $f8, $f0 /* BFE0B4 80240834 E628007C */ swc1 $f8, 0x7c($s1) /* BFE0B8 80240838 8E420004 */ lw $v0, 4($s2) /* BFE0BC 8024083C 18400021 */ blez $v0, .L802408C4 -/* BFE0C0 80240840 00000000 */ nop +/* BFE0C0 80240840 00000000 */ nop /* BFE0C4 80240844 8602008E */ lh $v0, 0x8e($s0) /* BFE0C8 80240848 9603008E */ lhu $v1, 0x8e($s0) /* BFE0CC 8024084C 18400005 */ blez $v0, .L80240864 @@ -375,7 +375,7 @@ glabel func_802402D0_BFDB50 /* BFE0D4 80240854 A602008E */ sh $v0, 0x8e($s0) /* BFE0D8 80240858 00021400 */ sll $v0, $v0, 0x10 /* BFE0DC 8024085C 1C400019 */ bgtz $v0, .L802408C4 -/* BFE0E0 80240860 00000000 */ nop +/* BFE0E0 80240860 00000000 */ nop .L80240864: /* BFE0E4 80240864 240403E8 */ addiu $a0, $zero, 0x3e8 /* BFE0E8 80240868 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_802402D0_BFDB50 /* BFE130 802408B0 18400003 */ blez $v0, .L802408C0 /* BFE134 802408B4 28620003 */ slti $v0, $v1, 3 /* BFE138 802408B8 10400002 */ beqz $v0, .L802408C4 -/* BFE13C 802408BC 00000000 */ nop +/* BFE13C 802408BC 00000000 */ nop .L802408C0: /* BFE140 802408C0 AE600070 */ sw $zero, 0x70($s3) .L802408C4: diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802409B8_BFE238.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802409B8_BFE238.s index 9cf2d05306..1beda5d94b 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802409B8_BFE238.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802409B8_BFE238.s @@ -42,11 +42,11 @@ glabel func_802409B8_BFE238 .L80240A4C: /* BFE2CC 80240A4C 8E220070 */ lw $v0, 0x70($s1) /* BFE2D0 80240A50 18400034 */ blez $v0, .L80240B24 -/* BFE2D4 80240A54 00000000 */ nop +/* BFE2D4 80240A54 00000000 */ nop /* BFE2D8 80240A58 C62C0074 */ lwc1 $f12, 0x74($s1) /* BFE2DC 80240A5C 46806320 */ cvt.s.w $f12, $f12 /* BFE2E0 80240A60 44820000 */ mtc1 $v0, $f0 -/* BFE2E4 80240A64 00000000 */ nop +/* BFE2E4 80240A64 00000000 */ nop /* BFE2E8 80240A68 46800020 */ cvt.s.w $f0, $f0 /* BFE2EC 80240A6C 46000021 */ cvt.d.s $f0, $f0 /* BFE2F0 80240A70 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_802409B8_BFE238 /* BFE350 80240AD0 27A70030 */ addiu $a3, $sp, 0x30 .L80240AD4: /* BFE354 80240AD4 10400007 */ beqz $v0, .L80240AF4 -/* BFE358 80240AD8 00000000 */ nop +/* BFE358 80240AD8 00000000 */ nop /* BFE35C 80240ADC 4616A082 */ mul.s $f2, $f20, $f22 -/* BFE360 80240AE0 00000000 */ nop +/* BFE360 80240AE0 00000000 */ nop /* BFE364 80240AE4 C7A0002C */ lwc1 $f0, 0x2c($sp) /* BFE368 80240AE8 46180000 */ add.s $f0, $f0, $f24 /* BFE36C 80240AEC 080902C0 */ j .L80240B00 /* BFE370 80240AF0 46020000 */ add.s $f0, $f0, $f2 .L80240AF4: /* BFE374 80240AF4 4616A002 */ mul.s $f0, $f20, $f22 -/* BFE378 80240AF8 00000000 */ nop +/* BFE378 80240AF8 00000000 */ nop /* BFE37C 80240AFC 4600D000 */ add.s $f0, $f26, $f0 .L80240B00: /* BFE380 80240B00 E600003C */ swc1 $f0, 0x3c($s0) /* BFE384 80240B04 8E220074 */ lw $v0, 0x74($s1) /* BFE388 80240B08 2442000A */ addiu $v0, $v0, 0xa /* BFE38C 80240B0C 44826000 */ mtc1 $v0, $f12 -/* BFE390 80240B10 00000000 */ nop +/* BFE390 80240B10 00000000 */ nop /* BFE394 80240B14 0C00A6C9 */ jal clamp_angle /* BFE398 80240B18 46806320 */ cvt.s.w $f12, $f12 /* BFE39C 80240B1C 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_802409B8_BFE238 /* BFE3B0 80240B30 860200A8 */ lh $v0, 0xa8($s0) /* BFE3B4 80240B34 C600003C */ lwc1 $f0, 0x3c($s0) /* BFE3B8 80240B38 44821000 */ mtc1 $v0, $f2 -/* BFE3BC 80240B3C 00000000 */ nop +/* BFE3BC 80240B3C 00000000 */ nop /* BFE3C0 80240B40 468010A0 */ cvt.s.w $f2, $f2 /* BFE3C4 80240B44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* BFE3C8 80240B48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_802409B8_BFE238 /* BFE3E4 80240B64 46240000 */ add.d $f0, $f0, $f4 /* BFE3E8 80240B68 460010A1 */ cvt.d.s $f2, $f2 /* BFE3EC 80240B6C 4620103C */ c.lt.d $f2, $f0 -/* BFE3F0 80240B70 00000000 */ nop +/* BFE3F0 80240B70 00000000 */ nop /* BFE3F4 80240B74 4500002E */ bc1f .L80240C30 /* BFE3F8 80240B78 0280202D */ daddu $a0, $s4, $zero /* BFE3FC 80240B7C 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_802409B8_BFE238 /* BFE43C 80240BBC 3C01C1A0 */ lui $at, 0xc1a0 /* BFE440 80240BC0 44812000 */ mtc1 $at, $f4 /* BFE444 80240BC4 44834000 */ mtc1 $v1, $f8 -/* BFE448 80240BC8 00000000 */ nop +/* BFE448 80240BC8 00000000 */ nop /* BFE44C 80240BCC 46804220 */ cvt.s.w $f8, $f8 /* BFE450 80240BD0 44074000 */ mfc1 $a3, $f8 /* BFE454 80240BD4 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_802409B8_BFE238 .L80240C30: /* BFE4B0 80240C30 8602008C */ lh $v0, 0x8c($s0) /* BFE4B4 80240C34 14400025 */ bnez $v0, .L80240CCC -/* BFE4B8 80240C38 00000000 */ nop +/* BFE4B8 80240C38 00000000 */ nop /* BFE4BC 80240C3C 8602008E */ lh $v0, 0x8e($s0) /* BFE4C0 80240C40 1C400022 */ bgtz $v0, .L80240CCC -/* BFE4C4 80240C44 00000000 */ nop +/* BFE4C4 80240C44 00000000 */ nop /* BFE4C8 80240C48 8E620074 */ lw $v0, 0x74($s3) /* BFE4CC 80240C4C 2442FFFF */ addiu $v0, $v0, -1 /* BFE4D0 80240C50 1840001D */ blez $v0, .L80240CC8 @@ -183,7 +183,7 @@ glabel func_802409B8_BFE238 /* BFE4DC 80240C5C 9442002A */ lhu $v0, 0x2a($v0) /* BFE4E0 80240C60 30420010 */ andi $v0, $v0, 0x10 /* BFE4E4 80240C64 14400007 */ bnez $v0, .L80240C84 -/* BFE4E8 80240C68 00000000 */ nop +/* BFE4E8 80240C68 00000000 */ nop /* BFE4EC 80240C6C C600000C */ lwc1 $f0, 0xc($s0) /* BFE4F0 80240C70 3C014334 */ lui $at, 0x4334 /* BFE4F4 80240C74 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240DE0_BFE660.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240DE0_BFE660.s index 3c843d4fca..9676dc5a7b 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240DE0_BFE660.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240DE0_BFE660.s @@ -60,18 +60,18 @@ glabel func_80240DE0_BFE660 /* BFE738 80240EB8 C6200038 */ lwc1 $f0, 0x38($s1) /* BFE73C 80240EBC 4600018D */ trunc.w.s $f6, $f0 /* BFE740 80240EC0 44023000 */ mfc1 $v0, $f6 -/* BFE744 80240EC4 00000000 */ nop +/* BFE744 80240EC4 00000000 */ nop /* BFE748 80240EC8 A6420010 */ sh $v0, 0x10($s2) /* BFE74C 80240ECC C620003C */ lwc1 $f0, 0x3c($s1) /* BFE750 80240ED0 4600018D */ trunc.w.s $f6, $f0 /* BFE754 80240ED4 44023000 */ mfc1 $v0, $f6 -/* BFE758 80240ED8 00000000 */ nop +/* BFE758 80240ED8 00000000 */ nop /* BFE75C 80240EDC A6420012 */ sh $v0, 0x12($s2) /* BFE760 80240EE0 C6200040 */ lwc1 $f0, 0x40($s1) /* BFE764 80240EE4 A2430007 */ sb $v1, 7($s2) /* BFE768 80240EE8 4600018D */ trunc.w.s $f6, $f0 /* BFE76C 80240EEC 44023000 */ mfc1 $v0, $f6 -/* BFE770 80240EF0 00000000 */ nop +/* BFE770 80240EF0 00000000 */ nop /* BFE774 80240EF4 A6420014 */ sh $v0, 0x14($s2) .L80240EF8: /* BFE778 80240EF8 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240F78_BFE7F8.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240F78_BFE7F8.s index a92b11c029..b43761c88a 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240F78_BFE7F8.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240F78_BFE7F8.s @@ -42,9 +42,9 @@ glabel func_80240F78_BFE7F8 /* BFE88C 8024100C 44801800 */ mtc1 $zero, $f3 /* BFE890 80241010 46002021 */ cvt.d.s $f0, $f4 /* BFE894 80241014 4620103E */ c.le.d $f2, $f0 -/* BFE898 80241018 00000000 */ nop +/* BFE898 80241018 00000000 */ nop /* BFE89C 8024101C 45000030 */ bc1f .L802410E0 -/* BFE8A0 80241020 00000000 */ nop +/* BFE8A0 80241020 00000000 */ nop /* BFE8A4 80241024 C600003C */ lwc1 $f0, 0x3c($s0) /* BFE8A8 80241028 46040000 */ add.s $f0, $f0, $f4 /* BFE8AC 8024102C E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_80240F78_BFE7F8 /* BFE90C 8024108C 27A70020 */ addiu $a3, $sp, 0x20 .L80241090: /* BFE910 80241090 1040000B */ beqz $v0, .L802410C0 -/* BFE914 80241094 00000000 */ nop +/* BFE914 80241094 00000000 */ nop /* BFE918 80241098 C7A0001C */ lwc1 $f0, 0x1c($sp) /* BFE91C 8024109C 46140080 */ add.s $f2, $f0, $f20 /* BFE920 802410A0 C600003C */ lwc1 $f0, 0x3c($s0) /* BFE924 802410A4 4600103E */ c.le.s $f2, $f0 -/* BFE928 802410A8 00000000 */ nop +/* BFE928 802410A8 00000000 */ nop /* BFE92C 802410AC 4500008D */ bc1f .L802412E4 -/* BFE930 802410B0 00000000 */ nop +/* BFE930 802410B0 00000000 */ nop /* BFE934 802410B4 E602003C */ swc1 $f2, 0x3c($s0) /* BFE938 802410B8 080904B9 */ j .L802412E4 /* BFE93C 802410BC AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_80240F78_BFE7F8 /* BFE940 802410C0 C602003C */ lwc1 $f2, 0x3c($s0) /* BFE944 802410C4 C6000064 */ lwc1 $f0, 0x64($s0) /* BFE948 802410C8 4602003E */ c.le.s $f0, $f2 -/* BFE94C 802410CC 00000000 */ nop +/* BFE94C 802410CC 00000000 */ nop /* BFE950 802410D0 45030084 */ bc1tl .L802412E4 /* BFE954 802410D4 AE400070 */ sw $zero, 0x70($s2) /* BFE958 802410D8 080904B9 */ j .L802412E4 -/* BFE95C 802410DC 00000000 */ nop +/* BFE95C 802410DC 00000000 */ nop .L802410E0: /* BFE960 802410E0 4622003C */ c.lt.d $f0, $f2 -/* BFE964 802410E4 00000000 */ nop +/* BFE964 802410E4 00000000 */ nop /* BFE968 802410E8 4500007E */ bc1f .L802412E4 -/* BFE96C 802410EC 00000000 */ nop +/* BFE96C 802410EC 00000000 */ nop /* BFE970 802410F0 9602008E */ lhu $v0, 0x8e($s0) /* BFE974 802410F4 24420001 */ addiu $v0, $v0, 1 /* BFE978 802410F8 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_80240F78_BFE7F8 /* BFE984 80241104 00021403 */ sra $v0, $v0, 0x10 /* BFE988 80241108 0043102A */ slt $v0, $v0, $v1 /* BFE98C 8024110C 14400026 */ bnez $v0, .L802411A8 -/* BFE990 80241110 00000000 */ nop +/* BFE990 80241110 00000000 */ nop /* BFE994 80241114 C60C0038 */ lwc1 $f12, 0x38($s0) /* BFE998 80241118 C60E0040 */ lwc1 $f14, 0x40($s0) /* BFE99C 8024111C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_80240F78_BFE7F8 /* BFE9C8 80241148 8E62001C */ lw $v0, 0x1c($s3) /* BFE9CC 8024114C 46001005 */ abs.s $f0, $f2 /* BFE9D0 80241150 44822000 */ mtc1 $v0, $f4 -/* BFE9D4 80241154 00000000 */ nop +/* BFE9D4 80241154 00000000 */ nop /* BFE9D8 80241158 46802120 */ cvt.s.w $f4, $f4 /* BFE9DC 8024115C 4600203C */ c.lt.s $f4, $f0 -/* BFE9E0 80241160 00000000 */ nop +/* BFE9E0 80241160 00000000 */ nop /* BFE9E4 80241164 4500000D */ bc1f .L8024119C -/* BFE9E8 80241168 00000000 */ nop +/* BFE9E8 80241168 00000000 */ nop /* BFE9EC 8024116C 44800000 */ mtc1 $zero, $f0 /* BFE9F0 80241170 C614000C */ lwc1 $f20, 0xc($s0) /* BFE9F4 80241174 4600103C */ c.lt.s $f2, $f0 -/* BFE9F8 80241178 00000000 */ nop +/* BFE9F8 80241178 00000000 */ nop /* BFE9FC 8024117C 45000006 */ bc1f .L80241198 /* BFEA00 80241180 00021023 */ negu $v0, $v0 /* BFEA04 80241184 44820000 */ mtc1 $v0, $f0 -/* BFEA08 80241188 00000000 */ nop +/* BFEA08 80241188 00000000 */ nop /* BFEA0C 8024118C 46800020 */ cvt.s.w $f0, $f0 /* BFEA10 80241190 08090467 */ j .L8024119C /* BFEA14 80241194 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_80240F78_BFE7F8 /* BFEA3C 802411BC C600001C */ lwc1 $f0, 0x1c($s0) /* BFEA40 802411C0 46001080 */ add.s $f2, $f2, $f0 /* BFEA44 802411C4 4616103C */ c.lt.s $f2, $f22 -/* BFEA48 802411C8 00000000 */ nop +/* BFEA48 802411C8 00000000 */ nop /* BFEA4C 802411CC 45020045 */ bc1fl .L802412E4 /* BFEA50 802411D0 E602003C */ swc1 $f2, 0x3c($s0) /* BFEA54 802411D4 080904B8 */ j .L802412E0 @@ -169,7 +169,7 @@ glabel func_80240F78_BFE7F8 /* BFEA6C 802411EC C600001C */ lwc1 $f0, 0x1c($s0) /* BFEA70 802411F0 C604003C */ lwc1 $f4, 0x3c($s0) /* BFEA74 802411F4 44821000 */ mtc1 $v0, $f2 -/* BFEA78 802411F8 00000000 */ nop +/* BFEA78 802411F8 00000000 */ nop /* BFEA7C 802411FC 468010A0 */ cvt.s.w $f2, $f2 /* BFEA80 80241200 46000005 */ abs.s $f0, $f0 /* BFEA84 80241204 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_80240F78_BFE7F8 /* BFEAC0 80241240 0C0372DF */ jal func_800DCB7C /* BFEAC4 80241244 27A70020 */ addiu $a3, $sp, 0x20 /* BFEAC8 80241248 10400015 */ beqz $v0, .L802412A0 -/* BFEACC 8024124C 00000000 */ nop +/* BFEACC 8024124C 00000000 */ nop /* BFEAD0 80241250 860200A8 */ lh $v0, 0xa8($s0) /* BFEAD4 80241254 C604001C */ lwc1 $f4, 0x1c($s0) /* BFEAD8 80241258 44820000 */ mtc1 $v0, $f0 -/* BFEADC 8024125C 00000000 */ nop +/* BFEADC 8024125C 00000000 */ nop /* BFEAE0 80241260 46800020 */ cvt.s.w $f0, $f0 /* BFEAE4 80241264 46002085 */ abs.s $f2, $f4 /* BFEAE8 80241268 46020000 */ add.s $f0, $f0, $f2 /* BFEAEC 8024126C C7A20024 */ lwc1 $f2, 0x24($sp) /* BFEAF0 80241270 4600103E */ c.le.s $f2, $f0 -/* BFEAF4 80241274 00000000 */ nop +/* BFEAF4 80241274 00000000 */ nop /* BFEAF8 80241278 45000005 */ bc1f .L80241290 -/* BFEAFC 8024127C 00000000 */ nop +/* BFEAFC 8024127C 00000000 */ nop /* BFEB00 80241280 C7A0001C */ lwc1 $f0, 0x1c($sp) /* BFEB04 80241284 AE00001C */ sw $zero, 0x1c($s0) /* BFEB08 80241288 080904B9 */ j .L802412E4 @@ -217,13 +217,13 @@ glabel func_80240F78_BFE7F8 /* BFEB24 802412A4 860200A8 */ lh $v0, 0xa8($s0) /* BFEB28 802412A8 46163081 */ sub.s $f2, $f6, $f22 /* BFEB2C 802412AC 44820000 */ mtc1 $v0, $f0 -/* BFEB30 802412B0 00000000 */ nop +/* BFEB30 802412B0 00000000 */ nop /* BFEB34 802412B4 46800020 */ cvt.s.w $f0, $f0 /* BFEB38 802412B8 46001080 */ add.s $f2, $f2, $f0 /* BFEB3C 802412BC C604001C */ lwc1 $f4, 0x1c($s0) /* BFEB40 802412C0 46002005 */ abs.s $f0, $f4 /* BFEB44 802412C4 4602003C */ c.lt.s $f0, $f2 -/* BFEB48 802412C8 00000000 */ nop +/* BFEB48 802412C8 00000000 */ nop /* BFEB4C 802412CC 45020005 */ bc1fl .L802412E4 /* BFEB50 802412D0 AE00001C */ sw $zero, 0x1c($s0) /* BFEB54 802412D4 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241308_BFEB88.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241308_BFEB88.s index 087e6894bd..048b20e48d 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241308_BFEB88.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241308_BFEB88.s @@ -49,15 +49,15 @@ glabel func_80241308_BFEB88 /* BFEC30 802413B0 44802000 */ mtc1 $zero, $f4 /* BFEC34 802413B4 460010A1 */ cvt.d.s $f2, $f2 /* BFEC38 802413B8 46241082 */ mul.d $f2, $f2, $f4 -/* BFEC3C 802413BC 00000000 */ nop +/* BFEC3C 802413BC 00000000 */ nop /* BFEC40 802413C0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* BFEC44 802413C4 46000021 */ cvt.d.s $f0, $f0 /* BFEC48 802413C8 46240002 */ mul.d $f0, $f0, $f4 -/* BFEC4C 802413CC 00000000 */ nop +/* BFEC4C 802413CC 00000000 */ nop /* BFEC50 802413D0 3C013FE0 */ lui $at, 0x3fe0 /* BFEC54 802413D4 44812800 */ mtc1 $at, $f5 /* BFEC58 802413D8 44802000 */ mtc1 $zero, $f4 -/* BFEC5C 802413DC 00000000 */ nop +/* BFEC5C 802413DC 00000000 */ nop /* BFEC60 802413E0 46241080 */ add.d $f2, $f2, $f4 /* BFEC64 802413E4 AE000074 */ sw $zero, 0x74($s0) /* BFEC68 802413E8 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s index fbc3d75d4d..a3569fc3f8 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s @@ -54,7 +54,7 @@ glabel func_8024142C_BFECAC /* BFED6C 802414EC 8E4300B0 */ lw $v1, 0xb0($s2) /* BFED70 802414F0 30620004 */ andi $v0, $v1, 4 /* BFED74 802414F4 10400007 */ beqz $v0, .L80241514 -/* BFED78 802414F8 00000000 */ nop +/* BFED78 802414F8 00000000 */ nop /* BFED7C 802414FC 824200B4 */ lb $v0, 0xb4($s2) /* BFED80 80241500 1440003C */ bnez $v0, .L802415F4 /* BFED84 80241504 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_8024142C_BFECAC /* BFED98 80241518 2C62000F */ sltiu $v0, $v1, 0xf /* BFED9C 8024151C 10400034 */ beqz $v0, .L802415F0 /* BFEDA0 80241520 00031080 */ sll $v0, $v1, 2 -/* BFEDA4 80241524 3C018026 */ lui $at, %hi(D_80263438) +/* BFEDA4 80241524 3C018026 */ lui $at, %hi(jtbl_80263438_C20CB8) /* BFEDA8 80241528 00220821 */ addu $at, $at, $v0 -/* BFEDAC 8024152C 8C223438 */ lw $v0, %lo(D_80263438)($at) +/* BFEDAC 8024152C 8C223438 */ lw $v0, %lo(jtbl_80263438_C20CB8)($at) /* BFEDB0 80241530 00400008 */ jr $v0 -/* BFEDB4 80241534 00000000 */ nop +/* BFEDB4 80241534 00000000 */ nop +glabel L80241538_BFEDB8 /* BFEDB8 80241538 0280202D */ daddu $a0, $s4, $zero /* BFEDBC 8024153C 0200282D */ daddu $a1, $s0, $zero /* BFEDC0 80241540 0C090048 */ jal func_80240120_BFD9A0 /* BFEDC4 80241544 0260302D */ daddu $a2, $s3, $zero +glabel L80241548_BFEDC8 /* BFEDC8 80241548 0280202D */ daddu $a0, $s4, $zero /* BFEDCC 8024154C 0200282D */ daddu $a1, $s0, $zero /* BFEDD0 80241550 0C0900B4 */ jal func_802402D0_BFDB50 /* BFEDD4 80241554 0260302D */ daddu $a2, $s3, $zero /* BFEDD8 80241558 0809057D */ j .L802415F4 /* BFEDDC 8024155C 0000102D */ daddu $v0, $zero, $zero +glabel L80241560_BFEDE0 /* BFEDE0 80241560 0280202D */ daddu $a0, $s4, $zero /* BFEDE4 80241564 0200282D */ daddu $a1, $s0, $zero /* BFEDE8 80241568 0C09023E */ jal dgb_01_UnkNpcAIFunc1 /* BFEDEC 8024156C 0260302D */ daddu $a2, $s3, $zero +glabel L80241570_BFEDF0 /* BFEDF0 80241570 0280202D */ daddu $a0, $s4, $zero /* BFEDF4 80241574 0200282D */ daddu $a1, $s0, $zero /* BFEDF8 80241578 0C09026E */ jal func_802409B8_BFE238 /* BFEDFC 8024157C 0260302D */ daddu $a2, $s3, $zero /* BFEE00 80241580 0809057D */ j .L802415F4 /* BFEE04 80241584 0000102D */ daddu $v0, $zero, $zero +glabel L80241588_BFEE08 /* BFEE08 80241588 0280202D */ daddu $a0, $s4, $zero /* BFEE0C 8024158C 0200282D */ daddu $a1, $s0, $zero /* BFEE10 80241590 0C09033F */ jal dgb_01_UnkNpcAIFunc2 /* BFEE14 80241594 0260302D */ daddu $a2, $s3, $zero +glabel L80241598_BFEE18 /* BFEE18 80241598 0280202D */ daddu $a0, $s4, $zero /* BFEE1C 8024159C 0200282D */ daddu $a1, $s0, $zero /* BFEE20 802415A0 0C09035D */ jal func_80240D74_BFE5F4 /* BFEE24 802415A4 0260302D */ daddu $a2, $s3, $zero /* BFEE28 802415A8 0809057D */ j .L802415F4 /* BFEE2C 802415AC 0000102D */ daddu $v0, $zero, $zero +glabel L802415B0_BFEE30 /* BFEE30 802415B0 0280202D */ daddu $a0, $s4, $zero /* BFEE34 802415B4 0200282D */ daddu $a1, $s0, $zero /* BFEE38 802415B8 0C090378 */ jal func_80240DE0_BFE660 /* BFEE3C 802415BC 0260302D */ daddu $a2, $s3, $zero /* BFEE40 802415C0 0809057D */ j .L802415F4 /* BFEE44 802415C4 0000102D */ daddu $v0, $zero, $zero +glabel L802415C8_BFEE48 /* BFEE48 802415C8 0280202D */ daddu $a0, $s4, $zero /* BFEE4C 802415CC 0200282D */ daddu $a1, $s0, $zero /* BFEE50 802415D0 0C0903C5 */ jal dgb_01_UnkNpcAIFunc3 /* BFEE54 802415D4 0260302D */ daddu $a2, $s3, $zero /* BFEE58 802415D8 0809057D */ j .L802415F4 /* BFEE5C 802415DC 0000102D */ daddu $v0, $zero, $zero +glabel L802415E0_BFEE60 /* BFEE60 802415E0 0280202D */ daddu $a0, $s4, $zero /* BFEE64 802415E4 0200282D */ daddu $a1, $s0, $zero /* BFEE68 802415E8 0C0903DE */ jal func_80240F78_BFE7F8 /* BFEE6C 802415EC 0260302D */ daddu $a2, $s3, $zero .L802415F0: +glabel L802415F0_BFEE70 /* BFEE70 802415F0 0000102D */ daddu $v0, $zero, $zero .L802415F4: /* BFEE74 802415F4 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241618_BFEE98.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241618_BFEE98.s index 4adaac682f..7b9137c590 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241618_BFEE98.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241618_BFEE98.s @@ -57,20 +57,20 @@ glabel func_80241618_BFEE98 /* BFEF68 802416E8 8E22001C */ lw $v0, 0x1c($s1) /* BFEF6C 802416EC 46001005 */ abs.s $f0, $f2 /* BFEF70 802416F0 44822000 */ mtc1 $v0, $f4 -/* BFEF74 802416F4 00000000 */ nop +/* BFEF74 802416F4 00000000 */ nop /* BFEF78 802416F8 46802120 */ cvt.s.w $f4, $f4 /* BFEF7C 802416FC 4600203C */ c.lt.s $f4, $f0 -/* BFEF80 80241700 00000000 */ nop +/* BFEF80 80241700 00000000 */ nop /* BFEF84 80241704 4500000D */ bc1f .L8024173C -/* BFEF88 80241708 00000000 */ nop +/* BFEF88 80241708 00000000 */ nop /* BFEF8C 8024170C 44800000 */ mtc1 $zero, $f0 /* BFEF90 80241710 C614000C */ lwc1 $f20, 0xc($s0) /* BFEF94 80241714 4600103C */ c.lt.s $f2, $f0 -/* BFEF98 80241718 00000000 */ nop +/* BFEF98 80241718 00000000 */ nop /* BFEF9C 8024171C 45000006 */ bc1f .L80241738 /* BFEFA0 80241720 00021023 */ negu $v0, $v0 /* BFEFA4 80241724 44820000 */ mtc1 $v0, $f0 -/* BFEFA8 80241728 00000000 */ nop +/* BFEFA8 80241728 00000000 */ nop /* BFEFAC 8024172C 46800020 */ cvt.s.w $f0, $f0 /* BFEFB0 80241730 080905CF */ j .L8024173C /* BFEFB4 80241734 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241770_BFEFF0.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241770_BFEFF0.s index 77648bd85a..a9db1e53bc 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241770_BFEFF0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241770_BFEFF0.s @@ -41,10 +41,10 @@ glabel func_80241770_BFEFF0 /* BFF080 80241800 44802000 */ mtc1 $zero, $f4 /* BFF084 80241804 460010A1 */ cvt.d.s $f2, $f2 /* BFF088 80241808 46241082 */ mul.d $f2, $f2, $f4 -/* BFF08C 8024180C 00000000 */ nop +/* BFF08C 8024180C 00000000 */ nop /* BFF090 80241810 46000021 */ cvt.d.s $f0, $f0 /* BFF094 80241814 4622003E */ c.le.d $f0, $f2 -/* BFF098 80241818 00000000 */ nop +/* BFF098 80241818 00000000 */ nop /* BFF09C 8024181C 45000003 */ bc1f .L8024182C /* BFF0A0 80241820 2402000E */ addiu $v0, $zero, 0xe /* BFF0A4 80241824 08090615 */ j .L80241854 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241874_BFF0F4.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241874_BFF0F4.s index 7bd7dc4778..346d526fd0 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241874_BFF0F4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241874_BFF0F4.s @@ -27,7 +27,7 @@ glabel func_80241874_BFF0F4 .L802418C8: /* BFF148 802418C8 2A020004 */ slti $v0, $s0, 4 /* BFF14C 802418CC 1440FFF5 */ bnez $v0, .L802418A4 -/* BFF150 802418D0 00000000 */ nop +/* BFF150 802418D0 00000000 */ nop /* BFF154 802418D4 8E42006C */ lw $v0, 0x6c($s2) /* BFF158 802418D8 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) /* BFF15C 802418DC 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241954_BFF1D4.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241954_BFF1D4.s index 4a161afb8f..9b04fb7c36 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241954_BFF1D4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241954_BFF1D4.s @@ -73,7 +73,7 @@ glabel func_80241954_BFF1D4 /* BFF2DC 80241A5C 344260B7 */ ori $v0, $v0, 0x60b7 /* BFF2E0 80241A60 4600020D */ trunc.w.s $f8, $f0 /* BFF2E4 80241A64 44044000 */ mfc1 $a0, $f8 -/* BFF2E8 80241A68 00000000 */ nop +/* BFF2E8 80241A68 00000000 */ nop /* BFF2EC 80241A6C 00820018 */ mult $a0, $v0 /* BFF2F0 80241A70 00041FC3 */ sra $v1, $a0, 0x1f /* BFF2F4 80241A74 00004010 */ mfhi $t0 @@ -91,9 +91,9 @@ glabel func_80241954_BFF1D4 /* BFF324 80241AA4 00042403 */ sra $a0, $a0, 0x10 /* BFF328 80241AA8 3C014260 */ lui $at, 0x4260 /* BFF32C 80241AAC 44811000 */ mtc1 $at, $f2 -/* BFF330 80241AB0 00000000 */ nop +/* BFF330 80241AB0 00000000 */ nop /* BFF334 80241AB4 46020002 */ mul.s $f0, $f0, $f2 -/* BFF338 80241AB8 00000000 */ nop +/* BFF338 80241AB8 00000000 */ nop /* BFF33C 80241ABC 24050006 */ addiu $a1, $zero, 6 /* BFF340 80241AC0 3C01437F */ lui $at, 0x437f /* BFF344 80241AC4 44811000 */ mtc1 $at, $f2 @@ -103,7 +103,7 @@ glabel func_80241954_BFF1D4 /* BFF354 80241AD4 AFA00018 */ sw $zero, 0x18($sp) /* BFF358 80241AD8 4600120D */ trunc.w.s $f8, $f2 /* BFF35C 80241ADC 44064000 */ mfc1 $a2, $f8 -/* BFF360 80241AE0 00000000 */ nop +/* BFF360 80241AE0 00000000 */ nop /* BFF364 80241AE4 AFA60010 */ sw $a2, 0x10($sp) /* BFF368 80241AE8 8E440024 */ lw $a0, 0x24($s2) /* BFF36C 80241AEC 0C0B7A25 */ jal func_802DE894 @@ -134,7 +134,7 @@ glabel func_80241954_BFF1D4 /* BFF3D0 80241B50 46000005 */ abs.s $f0, $f0 /* BFF3D4 80241B54 46000021 */ cvt.d.s $f0, $f0 /* BFF3D8 80241B58 4620103C */ c.lt.d $f2, $f0 -/* BFF3DC 80241B5C 00000000 */ nop +/* BFF3DC 80241B5C 00000000 */ nop /* BFF3E0 80241B60 45000008 */ bc1f .L80241B84 /* BFF3E4 80241B64 3C03FFDF */ lui $v1, 0xffdf /* BFF3E8 80241B68 3C018026 */ lui $at, %hi(D_80263480) @@ -156,9 +156,9 @@ glabel func_80241954_BFF1D4 /* BFF424 80241BA4 10620009 */ beq $v1, $v0, .L80241BCC /* BFF428 80241BA8 24020010 */ addiu $v0, $zero, 0x10 /* BFF42C 80241BAC 0C03805E */ jal disable_player_input -/* BFF430 80241BB0 00000000 */ nop +/* BFF430 80241BB0 00000000 */ nop /* BFF434 80241BB4 0C03BD8A */ jal func_800EF628 -/* BFF438 80241BB8 00000000 */ nop +/* BFF438 80241BB8 00000000 */ nop /* BFF43C 80241BBC 24020014 */ addiu $v0, $zero, 0x14 /* BFF440 80241BC0 080906F3 */ j .L80241BCC /* BFF444 80241BC4 A640008E */ sh $zero, 0x8e($s2) diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241BF0_BFF470.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241BF0_BFF470.s index ce253883ea..4630932c64 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241BF0_BFF470.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241BF0_BFF470.s @@ -27,7 +27,7 @@ glabel func_80241BF0_BFF470 /* BFF4C8 80241C48 8E02006C */ lw $v0, 0x6c($s0) /* BFF4CC 80241C4C 30421000 */ andi $v0, $v0, 0x1000 /* BFF4D0 80241C50 10400008 */ beqz $v0, .L80241C74 -/* BFF4D4 80241C54 00000000 */ nop +/* BFF4D4 80241C54 00000000 */ nop /* BFF4D8 80241C58 3C048000 */ lui $a0, 0x8000 /* BFF4DC 80241C5C 0C05271B */ jal stop_sound /* BFF4E0 80241C60 34840011 */ ori $a0, $a0, 0x11 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241CA8_BFF528.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241CA8_BFF528.s index d0e4daaa9c..dd00c68286 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241CA8_BFF528.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241CA8_BFF528.s @@ -49,9 +49,9 @@ glabel func_80241CA8_BFF528 /* BFF5D8 80241D58 46140000 */ add.s $f0, $f0, $f20 /* BFF5DC 80241D5C C622003C */ lwc1 $f2, 0x3c($s1) /* BFF5E0 80241D60 4600103C */ c.lt.s $f2, $f0 -/* BFF5E4 80241D64 00000000 */ nop +/* BFF5E4 80241D64 00000000 */ nop /* BFF5E8 80241D68 45010028 */ bc1t .L80241E0C -/* BFF5EC 80241D6C 00000000 */ nop +/* BFF5EC 80241D6C 00000000 */ nop /* BFF5F0 80241D70 8E0200D0 */ lw $v0, 0xd0($s0) /* BFF5F4 80241D74 C62C0038 */ lwc1 $f12, 0x38($s1) /* BFF5F8 80241D78 C62E0040 */ lwc1 $f14, 0x40($s1) @@ -76,7 +76,7 @@ glabel func_80241CA8_BFF528 /* BFF644 80241DC4 3C01C1A0 */ lui $at, 0xc1a0 /* BFF648 80241DC8 44813000 */ mtc1 $at, $f6 /* BFF64C 80241DCC 44825000 */ mtc1 $v0, $f10 -/* BFF650 80241DD0 00000000 */ nop +/* BFF650 80241DD0 00000000 */ nop /* BFF654 80241DD4 468052A0 */ cvt.s.w $f10, $f10 /* BFF658 80241DD8 46141080 */ add.s $f2, $f2, $f20 /* BFF65C 80241DDC 44075000 */ mfc1 $a3, $f10 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E70_BFF6F0.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E70_BFF6F0.s index b2967de2f4..52ed86f384 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E70_BFF6F0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E70_BFF6F0.s @@ -26,9 +26,9 @@ glabel func_80241E70_BFF6F0 /* BFF744 80241EC4 A480008E */ sh $zero, 0x8e($a0) .L80241EC8: /* BFF748 80241EC8 0C038069 */ jal enable_player_input -/* BFF74C 80241ECC 00000000 */ nop +/* BFF74C 80241ECC 00000000 */ nop /* BFF750 80241ED0 0C03BD80 */ jal func_800EF600 -/* BFF754 80241ED4 00000000 */ nop +/* BFF754 80241ED4 00000000 */ nop /* BFF758 80241ED8 24020010 */ addiu $v0, $zero, 0x10 .L80241EDC: /* BFF75C 80241EDC AE020070 */ sw $v0, 0x70($s0) diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241EF0_BFF770.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241EF0_BFF770.s index b1ee6f5c00..cf63b3a01a 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241EF0_BFF770.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241EF0_BFF770.s @@ -33,7 +33,7 @@ glabel func_80241EF0_BFF770 /* BFF7E0 80241F60 44801000 */ mtc1 $zero, $f2 /* BFF7E4 80241F64 46000021 */ cvt.d.s $f0, $f0 /* BFF7E8 80241F68 46220002 */ mul.d $f0, $f0, $f2 -/* BFF7EC 80241F6C 00000000 */ nop +/* BFF7EC 80241F6C 00000000 */ nop /* BFF7F0 80241F70 2402001E */ addiu $v0, $zero, 0x1e /* BFF7F4 80241F74 4620010D */ trunc.w.d $f4, $f0 /* BFF7F8 80241F78 E604007C */ swc1 $f4, 0x7c($s0) diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241F98_BFF818.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241F98_BFF818.s index 3ed99dbe57..078e65a414 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241F98_BFF818.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241F98_BFF818.s @@ -60,23 +60,23 @@ glabel func_80241F98_BFF818 /* BFF8F4 80242074 0C0372DF */ jal func_800DCB7C /* BFF8F8 80242078 46000506 */ mov.s $f20, $f0 /* BFF8FC 8024207C 10400007 */ beqz $v0, .L8024209C -/* BFF900 80242080 00000000 */ nop +/* BFF900 80242080 00000000 */ nop /* BFF904 80242084 4616A082 */ mul.s $f2, $f20, $f22 -/* BFF908 80242088 00000000 */ nop +/* BFF908 80242088 00000000 */ nop /* BFF90C 8024208C C7A0002C */ lwc1 $f0, 0x2c($sp) /* BFF910 80242090 461A0000 */ add.s $f0, $f0, $f26 /* BFF914 80242094 0809082A */ j .L802420A8 /* BFF918 80242098 46020000 */ add.s $f0, $f0, $f2 .L8024209C: /* BFF91C 8024209C 4616A002 */ mul.s $f0, $f20, $f22 -/* BFF920 802420A0 00000000 */ nop +/* BFF920 802420A0 00000000 */ nop /* BFF924 802420A4 4600C000 */ add.s $f0, $f24, $f0 .L802420A8: /* BFF928 802420A8 E620003C */ swc1 $f0, 0x3c($s1) /* BFF92C 802420AC 8E020074 */ lw $v0, 0x74($s0) /* BFF930 802420B0 2442000C */ addiu $v0, $v0, 0xc /* BFF934 802420B4 44826000 */ mtc1 $v0, $f12 -/* BFF938 802420B8 00000000 */ nop +/* BFF938 802420B8 00000000 */ nop /* BFF93C 802420BC 0C00A6C9 */ jal clamp_angle /* BFF940 802420C0 46806320 */ cvt.s.w $f12, $f12 /* BFF944 802420C4 4600020D */ trunc.w.s $f8, $f0 @@ -92,11 +92,11 @@ glabel func_80241F98_BFF818 /* BFF96C 802420EC 44802000 */ mtc1 $zero, $f4 /* BFF970 802420F0 460010A1 */ cvt.d.s $f2, $f2 /* BFF974 802420F4 46241082 */ mul.d $f2, $f2, $f4 -/* BFF978 802420F8 00000000 */ nop +/* BFF978 802420F8 00000000 */ nop /* BFF97C 802420FC C6600010 */ lwc1 $f0, 0x10($s3) /* BFF980 80242100 46000021 */ cvt.d.s $f0, $f0 /* BFF984 80242104 46240002 */ mul.d $f0, $f0, $f4 -/* BFF988 80242108 00000000 */ nop +/* BFF988 80242108 00000000 */ nop /* BFF98C 8024210C 0280202D */ daddu $a0, $s4, $zero /* BFF990 80242110 462010A0 */ cvt.s.d $f2, $f2 /* BFF994 80242114 46200020 */ cvt.s.d $f0, $f0 @@ -118,7 +118,7 @@ glabel func_80241F98_BFF818 /* BFF9D4 80242154 3C01C1A0 */ lui $at, 0xc1a0 /* BFF9D8 80242158 44812000 */ mtc1 $at, $f4 /* BFF9DC 8024215C 44834000 */ mtc1 $v1, $f8 -/* BFF9E0 80242160 00000000 */ nop +/* BFF9E0 80242160 00000000 */ nop /* BFF9E4 80242164 46804220 */ cvt.s.w $f8, $f8 /* BFF9E8 80242168 44074000 */ mfc1 $a3, $f8 /* BFF9EC 8024216C 27A20038 */ addiu $v0, $sp, 0x38 @@ -143,7 +143,7 @@ glabel func_80241F98_BFF818 /* BFFA30 802421B0 AE420074 */ sw $v0, 0x74($s2) /* BFFA34 802421B4 8622008C */ lh $v0, 0x8c($s1) /* BFFA38 802421B8 14400031 */ bnez $v0, .L80242280 -/* BFFA3C 802421BC 00000000 */ nop +/* BFFA3C 802421BC 00000000 */ nop /* BFFA40 802421C0 C62C0038 */ lwc1 $f12, 0x38($s1) /* BFFA44 802421C4 8E0200D0 */ lw $v0, 0xd0($s0) /* BFFA48 802421C8 C62E0040 */ lwc1 $f14, 0x40($s1) @@ -154,7 +154,7 @@ glabel func_80241F98_BFF818 /* BFFA5C 802421DC 46804220 */ cvt.s.w $f8, $f8 /* BFFA60 802421E0 44074000 */ mfc1 $a3, $f8 /* BFFA64 802421E4 0C00A720 */ jal atan2 -/* BFFA68 802421E8 00000000 */ nop +/* BFFA68 802421E8 00000000 */ nop /* BFFA6C 802421EC 8E250018 */ lw $a1, 0x18($s1) /* BFFA70 802421F0 44060000 */ mfc1 $a2, $f0 /* BFFA74 802421F4 0220202D */ daddu $a0, $s1, $zero @@ -170,11 +170,11 @@ glabel func_80241F98_BFF818 /* BFFA9C 8024221C 46804220 */ cvt.s.w $f8, $f8 /* BFFAA0 80242220 44074000 */ mfc1 $a3, $f8 /* BFFAA4 80242224 0C00A7B5 */ jal dist2D -/* BFFAA8 80242228 00000000 */ nop +/* BFFAA8 80242228 00000000 */ nop /* BFFAAC 8024222C C6220018 */ lwc1 $f2, 0x18($s1) /* BFFAB0 80242230 46021080 */ add.s $f2, $f2, $f2 /* BFFAB4 80242234 4602003E */ c.le.s $f0, $f2 -/* BFFAB8 80242238 00000000 */ nop +/* BFFAB8 80242238 00000000 */ nop /* BFFABC 8024223C 45000010 */ bc1f .L80242280 /* BFFAC0 80242240 E7A00034 */ swc1 $f0, 0x34($sp) /* BFFAC4 80242244 0C00A67F */ jal rand_int diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s index 251bef0a21..b66b81675a 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s @@ -54,11 +54,12 @@ glabel func_802422B0_BFFB30 /* BFFBF0 80242370 2C620020 */ sltiu $v0, $v1, 0x20 /* BFFBF4 80242374 10400060 */ beqz $v0, .L802424F8 /* BFFBF8 80242378 00031080 */ sll $v0, $v1, 2 -/* BFFBFC 8024237C 3C018026 */ lui $at, %hi(D_80263488) +/* BFFBFC 8024237C 3C018026 */ lui $at, %hi(jtbl_80263488_C20D08) /* BFFC00 80242380 00220821 */ addu $at, $at, $v0 -/* BFFC04 80242384 8C223488 */ lw $v0, %lo(D_80263488)($at) +/* BFFC04 80242384 8C223488 */ lw $v0, %lo(jtbl_80263488_C20D08)($at) /* BFFC08 80242388 00400008 */ jr $v0 -/* BFFC0C 8024238C 00000000 */ nop +/* BFFC0C 8024238C 00000000 */ nop +glabel L80242390_BFFC10 /* BFFC10 80242390 0280202D */ daddu $a0, $s4, $zero /* BFFC14 80242394 0220282D */ daddu $a1, $s1, $zero /* BFFC18 80242398 0C090048 */ jal func_80240120_BFD9A0 @@ -71,16 +72,19 @@ glabel func_802422B0_BFFB30 /* BFFC34 802423B4 8EA40024 */ lw $a0, 0x24($s5) /* BFFC38 802423B8 0C0B7A25 */ jal func_802DE894 /* BFFC3C 802423BC 00A0382D */ daddu $a3, $a1, $zero +glabel L802423C0_BFFC40 /* BFFC40 802423C0 0280202D */ daddu $a0, $s4, $zero /* BFFC44 802423C4 0220282D */ daddu $a1, $s1, $zero /* BFFC48 802423C8 0C0900B4 */ jal func_802402D0_BFDB50 /* BFFC4C 802423CC 0260302D */ daddu $a2, $s3, $zero /* BFFC50 802423D0 080908FE */ j .L802423F8 -/* BFFC54 802423D4 00000000 */ nop +/* BFFC54 802423D4 00000000 */ nop +glabel L802423D8_BFFC58 /* BFFC58 802423D8 0280202D */ daddu $a0, $s4, $zero /* BFFC5C 802423DC 0220282D */ daddu $a1, $s1, $zero /* BFFC60 802423E0 0C09023E */ jal dgb_01_UnkNpcAIFunc1 /* BFFC64 802423E4 0260302D */ daddu $a2, $s3, $zero +glabel L802423E8_BFFC68 /* BFFC68 802423E8 0280202D */ daddu $a0, $s4, $zero /* BFFC6C 802423EC 0220282D */ daddu $a1, $s1, $zero /* BFFC70 802423F0 0C09026E */ jal func_802409B8_BFE238 @@ -92,6 +96,7 @@ glabel func_802422B0_BFFB30 /* BFFC84 80242404 24020006 */ addiu $v0, $zero, 6 /* BFFC88 80242408 0809093E */ j .L802424F8 /* BFFC8C 8024240C A6A2008E */ sh $v0, 0x8e($s5) +glabel L80242410_BFFC90 /* BFFC90 80242410 0280202D */ daddu $a0, $s4, $zero /* BFFC94 80242414 0220282D */ daddu $a1, $s1, $zero /* BFFC98 80242418 0C090586 */ jal func_80241618_BFEE98 @@ -99,13 +104,15 @@ glabel func_802422B0_BFFB30 /* BFFCA0 80242420 8E830070 */ lw $v1, 0x70($s4) /* BFFCA4 80242424 2402000D */ addiu $v0, $zero, 0xd /* BFFCA8 80242428 14620033 */ bne $v1, $v0, .L802424F8 -/* BFFCAC 8024242C 00000000 */ nop +/* BFFCAC 8024242C 00000000 */ nop +glabel L80242430_BFFCB0 /* BFFCB0 80242430 0280202D */ daddu $a0, $s4, $zero /* BFFCB4 80242434 0220282D */ daddu $a1, $s1, $zero /* BFFCB8 80242438 0C0905DC */ jal func_80241770_BFEFF0 /* BFFCBC 8024243C 0260302D */ daddu $a2, $s3, $zero /* BFFCC0 80242440 0809093E */ j .L802424F8 -/* BFFCC4 80242444 00000000 */ nop +/* BFFCC4 80242444 00000000 */ nop +glabel L80242448_BFFCC8 /* BFFCC8 80242448 0280202D */ daddu $a0, $s4, $zero /* BFFCCC 8024244C 0220282D */ daddu $a1, $s1, $zero /* BFFCD0 80242450 0C09061D */ jal func_80241874_BFF0F4 @@ -113,44 +120,52 @@ glabel func_802422B0_BFFB30 /* BFFCD8 80242458 8E830070 */ lw $v1, 0x70($s4) /* BFFCDC 8024245C 2402000F */ addiu $v0, $zero, 0xf /* BFFCE0 80242460 14620025 */ bne $v1, $v0, .L802424F8 -/* BFFCE4 80242464 00000000 */ nop +/* BFFCE4 80242464 00000000 */ nop +glabel L80242468_BFFCE8 /* BFFCE8 80242468 0280202D */ daddu $a0, $s4, $zero /* BFFCEC 8024246C 0220282D */ daddu $a1, $s1, $zero /* BFFCF0 80242470 0C090655 */ jal func_80241954_BFF1D4 /* BFFCF4 80242474 0260302D */ daddu $a2, $s3, $zero /* BFFCF8 80242478 0809093E */ j .L802424F8 -/* BFFCFC 8024247C 00000000 */ nop +/* BFFCFC 8024247C 00000000 */ nop +glabel L80242480_BFFD00 /* BFFD00 80242480 0280202D */ daddu $a0, $s4, $zero /* BFFD04 80242484 0220282D */ daddu $a1, $s1, $zero /* BFFD08 80242488 0C0906FC */ jal func_80241BF0_BFF470 /* BFFD0C 8024248C 0260302D */ daddu $a2, $s3, $zero +glabel L80242490_BFFD10 /* BFFD10 80242490 0280202D */ daddu $a0, $s4, $zero /* BFFD14 80242494 0220282D */ daddu $a1, $s1, $zero /* BFFD18 80242498 0C09072A */ jal func_80241CA8_BFF528 /* BFFD1C 8024249C 0260302D */ daddu $a2, $s3, $zero /* BFFD20 802424A0 0809093E */ j .L802424F8 -/* BFFD24 802424A4 00000000 */ nop +/* BFFD24 802424A4 00000000 */ nop +glabel L802424A8_BFFD28 /* BFFD28 802424A8 0280202D */ daddu $a0, $s4, $zero /* BFFD2C 802424AC 0220282D */ daddu $a1, $s1, $zero /* BFFD30 802424B0 0C09078A */ jal func_80241E28_BFF6A8 /* BFFD34 802424B4 0260302D */ daddu $a2, $s3, $zero /* BFFD38 802424B8 0809093E */ j .L802424F8 -/* BFFD3C 802424BC 00000000 */ nop +/* BFFD3C 802424BC 00000000 */ nop +glabel L802424C0_BFFD40 /* BFFD40 802424C0 0280202D */ daddu $a0, $s4, $zero /* BFFD44 802424C4 0220282D */ daddu $a1, $s1, $zero /* BFFD48 802424C8 0C09079C */ jal func_80241E70_BFF6F0 /* BFFD4C 802424CC 0260302D */ daddu $a2, $s3, $zero /* BFFD50 802424D0 0809093E */ j .L802424F8 -/* BFFD54 802424D4 00000000 */ nop +/* BFFD54 802424D4 00000000 */ nop +glabel L802424D8_BFFD58 /* BFFD58 802424D8 0280202D */ daddu $a0, $s4, $zero /* BFFD5C 802424DC 0220282D */ daddu $a1, $s1, $zero /* BFFD60 802424E0 0C0907BC */ jal func_80241EF0_BFF770 /* BFFD64 802424E4 0260302D */ daddu $a2, $s3, $zero +glabel L802424E8_BFFD68 /* BFFD68 802424E8 0280202D */ daddu $a0, $s4, $zero /* BFFD6C 802424EC 0220282D */ daddu $a1, $s1, $zero /* BFFD70 802424F0 0C0907E6 */ jal func_80241F98_BFF818 /* BFFD74 802424F4 0260302D */ daddu $a2, $s3, $zero .L802424F8: +glabel L802424F8_BFFD78 /* BFFD78 802424F8 8E820070 */ lw $v0, 0x70($s4) /* BFFD7C 802424FC 8FBF0058 */ lw $ra, 0x58($sp) /* BFFD80 80242500 8FB50054 */ lw $s5, 0x54($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024252C_BFFDAC.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024252C_BFFDAC.s index 098e285b19..cf0d50a04f 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024252C_BFFDAC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024252C_BFFDAC.s @@ -45,7 +45,7 @@ glabel func_8024252C_BFFDAC /* BFFE48 802425C8 0C00A7B5 */ jal dist2D /* BFFE4C 802425CC 4600B386 */ mov.s $f14, $f22 /* BFFE50 802425D0 4614003C */ c.lt.s $f0, $f20 -/* BFFE54 802425D4 00000000 */ nop +/* BFFE54 802425D4 00000000 */ nop /* BFFE58 802425D8 45000003 */ bc1f .L802425E8 /* BFFE5C 802425DC 2631000C */ addiu $s1, $s1, 0xc /* BFFE60 802425E0 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_8024252C_BFFDAC /* BFFE8C 8024260C 8E6200D0 */ lw $v0, 0xd0($s3) /* BFFE90 80242610 8C42007C */ lw $v0, 0x7c($v0) /* BFFE94 80242614 04410004 */ bgez $v0, .L80242628 -/* BFFE98 80242618 00000000 */ nop +/* BFFE98 80242618 00000000 */ nop /* BFFE9C 8024261C C6C00000 */ lwc1 $f0, ($s6) /* BFFEA0 80242620 08090992 */ j .L80242648 /* BFFEA4 80242624 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_8024252C_BFFDAC /* BFFEA8 80242628 3C018026 */ lui $at, %hi(D_80263510) /* BFFEAC 8024262C D4223510 */ ldc1 $f2, %lo(D_80263510)($at) /* BFFEB0 80242630 44820000 */ mtc1 $v0, $f0 -/* BFFEB4 80242634 00000000 */ nop +/* BFFEB4 80242634 00000000 */ nop /* BFFEB8 80242638 46800021 */ cvt.d.w $f0, $f0 /* BFFEBC 8024263C 46220003 */ div.d $f0, $f0, $f2 /* BFFEC0 80242640 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242684_BFFF04.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242684_BFFF04.s index c3b1b9ad70..3ea6a48499 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242684_BFFF04.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242684_BFFF04.s @@ -44,7 +44,7 @@ glabel func_80242684_BFFF04 /* BFFFA0 80242720 2402000F */ addiu $v0, $zero, 0xf /* BFFFA4 80242724 AFA2001C */ sw $v0, 0x1c($sp) /* BFFFA8 80242728 44833000 */ mtc1 $v1, $f6 -/* BFFFAC 8024272C 00000000 */ nop +/* BFFFAC 8024272C 00000000 */ nop /* BFFFB0 80242730 468031A0 */ cvt.s.w $f6, $f6 /* BFFFB4 80242734 44073000 */ mfc1 $a3, $f6 /* BFFFB8 80242738 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_80242684_BFFF04 .L80242788: /* C00008 80242788 8602008C */ lh $v0, 0x8c($s0) /* C0000C 8024278C 1440005D */ bnez $v0, .L80242904 -/* C00010 80242790 00000000 */ nop +/* C00010 80242790 00000000 */ nop /* C00014 80242794 C6000018 */ lwc1 $f0, 0x18($s0) /* C00018 80242798 3C014010 */ lui $at, 0x4010 /* C0001C 8024279C 44811800 */ mtc1 $at, $f3 /* C00020 802427A0 44801000 */ mtc1 $zero, $f2 /* C00024 802427A4 46000021 */ cvt.d.s $f0, $f0 /* C00028 802427A8 4622003C */ c.lt.d $f0, $f2 -/* C0002C 802427AC 00000000 */ nop +/* C0002C 802427AC 00000000 */ nop /* C00030 802427B0 45000003 */ bc1f .L802427C0 /* C00034 802427B4 0200202D */ daddu $a0, $s0, $zero /* C00038 802427B8 080909F1 */ j .L802427C4 @@ -88,7 +88,7 @@ glabel func_80242684_BFFF04 /* C00040 802427C0 24050001 */ addiu $a1, $zero, 1 .L802427C4: /* C00044 802427C4 0C00F598 */ jal func_8003D660 -/* C00048 802427C8 00000000 */ nop +/* C00048 802427C8 00000000 */ nop /* C0004C 802427CC C60C0038 */ lwc1 $f12, 0x38($s0) /* C00050 802427D0 8E430078 */ lw $v1, 0x78($s2) /* C00054 802427D4 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_80242684_BFFF04 /* C0007C 802427FC 4406B000 */ mfc1 $a2, $f22 /* C00080 80242800 4407A000 */ mfc1 $a3, $f20 /* C00084 80242804 0C00A720 */ jal atan2 -/* C00088 80242808 00000000 */ nop +/* C00088 80242808 00000000 */ nop /* C0008C 8024280C 8E050018 */ lw $a1, 0x18($s0) /* C00090 80242810 44060000 */ mfc1 $a2, $f0 /* C00094 80242814 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_80242684_BFFF04 /* C000A8 80242828 4406B000 */ mfc1 $a2, $f22 /* C000AC 8024282C 4407A000 */ mfc1 $a3, $f20 /* C000B0 80242830 0C00A7B5 */ jal dist2D -/* C000B4 80242834 00000000 */ nop +/* C000B4 80242834 00000000 */ nop /* C000B8 80242838 C6020018 */ lwc1 $f2, 0x18($s0) /* C000BC 8024283C 4602003E */ c.le.s $f0, $f2 -/* C000C0 80242840 00000000 */ nop +/* C000C0 80242840 00000000 */ nop /* C000C4 80242844 4500002F */ bc1f .L80242904 /* C000C8 80242848 240403E8 */ addiu $a0, $zero, 0x3e8 /* C000CC 8024284C 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_80242684_BFFF04 /* C00120 802428A0 18400003 */ blez $v0, .L802428B0 /* C00124 802428A4 24020004 */ addiu $v0, $zero, 4 /* C00128 802428A8 14600002 */ bnez $v1, .L802428B4 -/* C0012C 802428AC 00000000 */ nop +/* C0012C 802428AC 00000000 */ nop .L802428B0: /* C00130 802428B0 AE420070 */ sw $v0, 0x70($s2) .L802428B4: diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802429EC_C0026C.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802429EC_C0026C.s index 79d8316f3a..a5ddcb2312 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802429EC_C0026C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802429EC_C0026C.s @@ -38,7 +38,7 @@ glabel func_802429EC_C0026C /* C002F0 80242A70 2402000F */ addiu $v0, $zero, 0xf /* C002F4 80242A74 AFA2001C */ sw $v0, 0x1c($sp) /* C002F8 80242A78 44833000 */ mtc1 $v1, $f6 -/* C002FC 80242A7C 00000000 */ nop +/* C002FC 80242A7C 00000000 */ nop /* C00300 80242A80 468031A0 */ cvt.s.w $f6, $f6 /* C00304 80242A84 44073000 */ mfc1 $a3, $f6 /* C00308 80242A88 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_802429EC_C0026C .L80242AEC: /* C0036C 80242AEC 8602008C */ lh $v0, 0x8c($s0) /* C00370 80242AF0 14400025 */ bnez $v0, .L80242B88 -/* C00374 80242AF4 00000000 */ nop +/* C00374 80242AF4 00000000 */ nop /* C00378 80242AF8 9602008E */ lhu $v0, 0x8e($s0) /* C0037C 80242AFC 2442FFFF */ addiu $v0, $v0, -1 /* C00380 80242B00 A602008E */ sh $v0, 0x8e($s0) /* C00384 80242B04 00021400 */ sll $v0, $v0, 0x10 /* C00388 80242B08 1440001F */ bnez $v0, .L80242B88 -/* C0038C 80242B0C 00000000 */ nop +/* C0038C 80242B0C 00000000 */ nop /* C00390 80242B10 8E820074 */ lw $v0, 0x74($s4) /* C00394 80242B14 2442FFFF */ addiu $v0, $v0, -1 /* C00398 80242B18 10400019 */ beqz $v0, .L80242B80 @@ -84,7 +84,7 @@ glabel func_802429EC_C0026C /* C003A4 80242B24 9442002A */ lhu $v0, 0x2a($v0) /* C003A8 80242B28 30420010 */ andi $v0, $v0, 0x10 /* C003AC 80242B2C 14400007 */ bnez $v0, .L80242B4C -/* C003B0 80242B30 00000000 */ nop +/* C003B0 80242B30 00000000 */ nop /* C003B4 80242B34 C600000C */ lwc1 $f0, 0xc($s0) /* C003B8 80242B38 3C014334 */ lui $at, 0x4334 /* C003BC 80242B3C 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242BA8_C00428.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242BA8_C00428.s index 80a736377e..352c361cad 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242BA8_C00428.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242BA8_C00428.s @@ -28,7 +28,7 @@ glabel func_80242BA8_C00428 /* C00480 80242C00 8E0200D0 */ lw $v0, 0xd0($s0) /* C00484 80242C04 8C42007C */ lw $v0, 0x7c($v0) /* C00488 80242C08 04410004 */ bgez $v0, .L80242C1C -/* C0048C 80242C0C 00000000 */ nop +/* C0048C 80242C0C 00000000 */ nop /* C00490 80242C10 C6400000 */ lwc1 $f0, ($s2) /* C00494 80242C14 08090B0F */ j .L80242C3C /* C00498 80242C18 E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_80242BA8_C00428 /* C0049C 80242C1C 3C018026 */ lui $at, %hi(D_80263518) /* C004A0 80242C20 D4223518 */ ldc1 $f2, %lo(D_80263518)($at) /* C004A4 80242C24 44820000 */ mtc1 $v0, $f0 -/* C004A8 80242C28 00000000 */ nop +/* C004A8 80242C28 00000000 */ nop /* C004AC 80242C2C 46800021 */ cvt.d.w $f0, $f0 /* C004B0 80242C30 46220003 */ div.d $f0, $f0, $f2 /* C004B4 80242C34 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242D48_C005C8.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242D48_C005C8.s index 8f746d80e5..cdc0aabb10 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242D48_C005C8.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242D48_C005C8.s @@ -47,20 +47,20 @@ glabel func_80242D48_C005C8 /* C00670 80242DF0 8E02001C */ lw $v0, 0x1c($s0) /* C00674 80242DF4 46001005 */ abs.s $f0, $f2 /* C00678 80242DF8 44822000 */ mtc1 $v0, $f4 -/* C0067C 80242DFC 00000000 */ nop +/* C0067C 80242DFC 00000000 */ nop /* C00680 80242E00 46802120 */ cvt.s.w $f4, $f4 /* C00684 80242E04 4600203C */ c.lt.s $f4, $f0 -/* C00688 80242E08 00000000 */ nop +/* C00688 80242E08 00000000 */ nop /* C0068C 80242E0C 4500000D */ bc1f .L80242E44 -/* C00690 80242E10 00000000 */ nop +/* C00690 80242E10 00000000 */ nop /* C00694 80242E14 44800000 */ mtc1 $zero, $f0 /* C00698 80242E18 C654000C */ lwc1 $f20, 0xc($s2) /* C0069C 80242E1C 4600103C */ c.lt.s $f2, $f0 -/* C006A0 80242E20 00000000 */ nop +/* C006A0 80242E20 00000000 */ nop /* C006A4 80242E24 45000006 */ bc1f .L80242E40 /* C006A8 80242E28 00021023 */ negu $v0, $v0 /* C006AC 80242E2C 44820000 */ mtc1 $v0, $f0 -/* C006B0 80242E30 00000000 */ nop +/* C006B0 80242E30 00000000 */ nop /* C006B4 80242E34 46800020 */ cvt.s.w $f0, $f0 /* C006B8 80242E38 08090B91 */ j .L80242E44 /* C006BC 80242E3C 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242E78_C006F8.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242E78_C006F8.s index ecae26ceab..975d01847c 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242E78_C006F8.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242E78_C006F8.s @@ -37,7 +37,7 @@ glabel func_80242E78_C006F8 /* C00778 80242EF8 2402000F */ addiu $v0, $zero, 0xf /* C0077C 80242EFC AFA2001C */ sw $v0, 0x1c($sp) /* C00780 80242F00 44833000 */ mtc1 $v1, $f6 -/* C00784 80242F04 00000000 */ nop +/* C00784 80242F04 00000000 */ nop /* C00788 80242F08 468031A0 */ cvt.s.w $f6, $f6 /* C0078C 80242F0C 44073000 */ mfc1 $a3, $f6 /* C00790 80242F10 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80243000_C00880.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80243000_C00880.s index 3752f7d2f3..ad775cb660 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80243000_C00880.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80243000_C00880.s @@ -28,7 +28,7 @@ glabel func_80243000_C00880 /* C008D8 80243058 C4400008 */ lwc1 $f0, 8($v0) /* C008DC 8024305C 46800020 */ cvt.s.w $f0, $f0 /* C008E0 80243060 4602003E */ c.le.s $f0, $f2 -/* C008E4 80243064 00000000 */ nop +/* C008E4 80243064 00000000 */ nop /* C008E8 80243068 45020003 */ bc1fl .L80243078 /* C008EC 8024306C 24840001 */ addiu $a0, $a0, 1 /* C008F0 80243070 08090C22 */ j .L80243088 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s index 6e8292da8e..59301f642e 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s @@ -46,7 +46,7 @@ glabel func_802430C0_C00940 /* C009E4 80243164 8E2200B0 */ lw $v0, 0xb0($s1) /* C009E8 80243168 30420004 */ andi $v0, $v0, 4 /* C009EC 8024316C 10400044 */ beqz $v0, .L80243280 -/* C009F0 80243170 00000000 */ nop +/* C009F0 80243170 00000000 */ nop .L80243174: /* C009F4 80243174 2404F7FF */ addiu $a0, $zero, -0x801 /* C009F8 80243178 AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_802430C0_C00940 /* C00AAC 8024322C 3C0142C8 */ lui $at, 0x42c8 /* C00AB0 80243230 44812000 */ mtc1 $at, $f4 /* C00AB4 80243234 44823000 */ mtc1 $v0, $f6 -/* C00AB8 80243238 00000000 */ nop +/* C00AB8 80243238 00000000 */ nop /* C00ABC 8024323C 468031A0 */ cvt.s.w $f6, $f6 /* C00AC0 80243240 27A20044 */ addiu $v0, $sp, 0x44 /* C00AC4 80243244 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_802430C0_C00940 /* C00AE8 80243268 0C0372DF */ jal func_800DCB7C /* C00AEC 8024326C 27A70040 */ addiu $a3, $sp, 0x40 /* C00AF0 80243270 10400003 */ beqz $v0, .L80243280 -/* C00AF4 80243274 00000000 */ nop +/* C00AF4 80243274 00000000 */ nop /* C00AF8 80243278 C7A0003C */ lwc1 $f0, 0x3c($sp) /* C00AFC 8024327C E640003C */ swc1 $f0, 0x3c($s2) .L80243280: @@ -124,72 +124,85 @@ glabel func_802430C0_C00940 /* C00B04 80243284 2C620064 */ sltiu $v0, $v1, 0x64 /* C00B08 80243288 10400042 */ beqz $v0, .L80243394 /* C00B0C 8024328C 00031080 */ sll $v0, $v1, 2 -/* C00B10 80243290 3C018026 */ lui $at, %hi(D_80263520) +/* C00B10 80243290 3C018026 */ lui $at, %hi(jtbl_80263520_C20DA0) /* C00B14 80243294 00220821 */ addu $at, $at, $v0 -/* C00B18 80243298 8C223520 */ lw $v0, %lo(D_80263520)($at) +/* C00B18 80243298 8C223520 */ lw $v0, %lo(jtbl_80263520_C20DA0)($at) /* C00B1C 8024329C 00400008 */ jr $v0 -/* C00B20 802432A0 00000000 */ nop +/* C00B20 802432A0 00000000 */ nop +glabel L802432A4_C00B24 /* C00B24 802432A4 0280202D */ daddu $a0, $s4, $zero /* C00B28 802432A8 0260282D */ daddu $a1, $s3, $zero /* C00B2C 802432AC 0C09094B */ jal func_8024252C_BFFDAC /* C00B30 802432B0 02A0302D */ daddu $a2, $s5, $zero +glabel L802432B4_C00B34 /* C00B34 802432B4 0280202D */ daddu $a0, $s4, $zero /* C00B38 802432B8 0260282D */ daddu $a1, $s3, $zero /* C00B3C 802432BC 0C0909A1 */ jal func_80242684_BFFF04 /* C00B40 802432C0 02A0302D */ daddu $a2, $s5, $zero /* C00B44 802432C4 08090CE5 */ j .L80243394 -/* C00B48 802432C8 00000000 */ nop +/* C00B48 802432C8 00000000 */ nop +glabel L802432CC_C00B4C /* C00B4C 802432CC 0280202D */ daddu $a0, $s4, $zero /* C00B50 802432D0 0260282D */ daddu $a1, $s3, $zero /* C00B54 802432D4 0C090A4B */ jal dup_dgb_01_UnkNpcAIFunc1 /* C00B58 802432D8 02A0302D */ daddu $a2, $s5, $zero +glabel L802432DC_C00B5C /* C00B5C 802432DC 0280202D */ daddu $a0, $s4, $zero /* C00B60 802432E0 0260282D */ daddu $a1, $s3, $zero /* C00B64 802432E4 0C090A7B */ jal func_802429EC_C0026C /* C00B68 802432E8 02A0302D */ daddu $a2, $s5, $zero /* C00B6C 802432EC 08090CE5 */ j .L80243394 -/* C00B70 802432F0 00000000 */ nop +/* C00B70 802432F0 00000000 */ nop +glabel L802432F4_C00B74 /* C00B74 802432F4 0280202D */ daddu $a0, $s4, $zero /* C00B78 802432F8 0260282D */ daddu $a1, $s3, $zero /* C00B7C 802432FC 0C090AEA */ jal func_80242BA8_C00428 /* C00B80 80243300 02A0302D */ daddu $a2, $s5, $zero /* C00B84 80243304 08090CE5 */ j .L80243394 -/* C00B88 80243308 00000000 */ nop +/* C00B88 80243308 00000000 */ nop +glabel L8024330C_C00B8C /* C00B8C 8024330C 0280202D */ daddu $a0, $s4, $zero /* C00B90 80243310 0260282D */ daddu $a1, $s3, $zero /* C00B94 80243314 0C090B17 */ jal dgb_01_NpcJumpFunc2 /* C00B98 80243318 02A0302D */ daddu $a2, $s5, $zero +glabel L8024331C_C00B9C /* C00B9C 8024331C 0280202D */ daddu $a0, $s4, $zero /* C00BA0 80243320 0260282D */ daddu $a1, $s3, $zero /* C00BA4 80243324 0C090B34 */ jal dgb_01_NpcJumpFunc /* C00BA8 80243328 02A0302D */ daddu $a2, $s5, $zero /* C00BAC 8024332C 08090CE5 */ j .L80243394 -/* C00BB0 80243330 00000000 */ nop +/* C00BB0 80243330 00000000 */ nop +glabel L80243334_C00BB4 /* C00BB4 80243334 0280202D */ daddu $a0, $s4, $zero /* C00BB8 80243338 0260282D */ daddu $a1, $s3, $zero /* C00BBC 8024333C 0C090B52 */ jal func_80242D48_C005C8 /* C00BC0 80243340 02A0302D */ daddu $a2, $s5, $zero +glabel L80243344_C00BC4 /* C00BC4 80243344 0280202D */ daddu $a0, $s4, $zero /* C00BC8 80243348 0260282D */ daddu $a1, $s3, $zero /* C00BCC 8024334C 0C090B9E */ jal func_80242E78_C006F8 /* C00BD0 80243350 02A0302D */ daddu $a2, $s5, $zero /* C00BD4 80243354 08090CE5 */ j .L80243394 -/* C00BD8 80243358 00000000 */ nop +/* C00BD8 80243358 00000000 */ nop +glabel L8024335C_C00BDC /* C00BDC 8024335C 0280202D */ daddu $a0, $s4, $zero /* C00BE0 80243360 0260282D */ daddu $a1, $s3, $zero /* C00BE4 80243364 0C090BE6 */ jal dgb_01_UnkNpcDurationFlagFunc /* C00BE8 80243368 02A0302D */ daddu $a2, $s5, $zero /* C00BEC 8024336C 08090CE5 */ j .L80243394 -/* C00BF0 80243370 00000000 */ nop +/* C00BF0 80243370 00000000 */ nop +glabel L80243374_C00BF4 /* C00BF4 80243374 0280202D */ daddu $a0, $s4, $zero /* C00BF8 80243378 0260282D */ daddu $a1, $s3, $zero /* C00BFC 8024337C 0C090C00 */ jal func_80243000_C00880 /* C00C00 80243380 02A0302D */ daddu $a2, $s5, $zero /* C00C04 80243384 08090CE5 */ j .L80243394 -/* C00C08 80243388 00000000 */ nop +/* C00C08 80243388 00000000 */ nop +glabel L8024338C_C00C0C /* C00C0C 8024338C 0C0129CF */ jal func_8004A73C /* C00C10 80243390 0280202D */ daddu $a0, $s4, $zero .L80243394: +glabel L80243394_C00C14 /* C00C14 80243394 8FBF0060 */ lw $ra, 0x60($sp) /* C00C18 80243398 8FB5005C */ lw $s5, 0x5c($sp) /* C00C1C 8024339C 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240208_C2EDA8.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240208_C2EDA8.s index 6de7d44b55..44748a5297 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240208_C2EDA8.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240208_C2EDA8.s @@ -42,7 +42,7 @@ glabel func_80240208_C2EDA8 /* C2EE3C 8024029C C6620074 */ lwc1 $f2, 0x74($s3) /* C2EE40 802402A0 468010A0 */ cvt.s.w $f2, $f2 /* C2EE44 802402A4 4600103C */ c.lt.s $f2, $f0 -/* C2EE48 802402A8 00000000 */ nop +/* C2EE48 802402A8 00000000 */ nop /* C2EE4C 802402AC 45030001 */ bc1tl .L802402B4 /* C2EE50 802402B0 0000882D */ daddu $s1, $zero, $zero .L802402B4: @@ -51,16 +51,16 @@ glabel func_80240208_C2EDA8 /* C2EE5C 802402BC 3C014387 */ lui $at, 0x4387 /* C2EE60 802402C0 4481A000 */ mtc1 $at, $f20 /* C2EE64 802402C4 0C00A70A */ jal get_clamped_angle_diff -/* C2EE68 802402C8 00000000 */ nop +/* C2EE68 802402C8 00000000 */ nop /* C2EE6C 802402CC 0C00A6C9 */ jal clamp_angle /* C2EE70 802402D0 46000306 */ mov.s $f12, $f0 /* C2EE74 802402D4 3C018024 */ lui $at, %hi(D_80242610) /* C2EE78 802402D8 D4222610 */ ldc1 $f2, %lo(D_80242610)($at) /* C2EE7C 802402DC 46000021 */ cvt.d.s $f0, $f0 /* C2EE80 802402E0 4622003C */ c.lt.d $f0, $f2 -/* C2EE84 802402E4 00000000 */ nop +/* C2EE84 802402E4 00000000 */ nop /* C2EE88 802402E8 45000003 */ bc1f .L802402F8 -/* C2EE8C 802402EC 00000000 */ nop +/* C2EE8C 802402EC 00000000 */ nop /* C2EE90 802402F0 3C0142B4 */ lui $at, 0x42b4 /* C2EE94 802402F4 4481A000 */ mtc1 $at, $f20 .L802402F8: @@ -77,7 +77,7 @@ glabel func_80240208_C2EDA8 /* C2EEC0 80240320 468010A0 */ cvt.s.w $f2, $f2 /* C2EEC4 80240324 46000005 */ abs.s $f0, $f0 /* C2EEC8 80240328 4600103C */ c.lt.s $f2, $f0 -/* C2EECC 8024032C 00000000 */ nop +/* C2EECC 8024032C 00000000 */ nop /* C2EED0 80240330 45030001 */ bc1tl .L80240338 /* C2EED4 80240334 0000882D */ daddu $s1, $zero, $zero .L80240338: @@ -87,13 +87,13 @@ glabel func_80240208_C2EDA8 /* C2EEE4 80240344 860200A8 */ lh $v0, 0xa8($s0) /* C2EEE8 80240348 46020001 */ sub.s $f0, $f0, $f2 /* C2EEEC 8024034C 44821000 */ mtc1 $v0, $f2 -/* C2EEF0 80240350 00000000 */ nop +/* C2EEF0 80240350 00000000 */ nop /* C2EEF4 80240354 468010A1 */ cvt.d.w $f2, $f2 /* C2EEF8 80240358 46221080 */ add.d $f2, $f2, $f2 /* C2EEFC 8024035C 46000005 */ abs.s $f0, $f0 /* C2EF00 80240360 46000021 */ cvt.d.s $f0, $f0 /* C2EF04 80240364 4620103E */ c.le.d $f2, $f0 -/* C2EF08 80240368 00000000 */ nop +/* C2EF08 80240368 00000000 */ nop /* C2EF0C 8024036C 45030001 */ bc1tl .L80240374 /* C2EF10 80240370 0000882D */ daddu $s1, $zero, $zero .L80240374: diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s index 16ff5d94a5..5696e455ca 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s @@ -100,78 +100,93 @@ glabel func_8024061C_C2F1BC /* C2F320 80240780 2C620064 */ sltiu $v0, $v1, 0x64 /* C2F324 80240784 10400048 */ beqz $v0, .L802408A8 /* C2F328 80240788 00031080 */ sll $v0, $v1, 2 -/* C2F32C 8024078C 3C018024 */ lui $at, %hi(func_80242618_A18838) +/* C2F32C 8024078C 3C018024 */ lui $at, %hi(jtbl_80242618_C311B8) /* C2F330 80240790 00220821 */ addu $at, $at, $v0 -/* C2F334 80240794 8C222618 */ lw $v0, %lo(func_80242618_A18838)($at) +/* C2F334 80240794 8C222618 */ lw $v0, %lo(jtbl_80242618_C311B8)($at) /* C2F338 80240798 00400008 */ jr $v0 /* C2F33C 8024079C 00000000 */ nop +glabel L802407A0_C2F340 /* C2F340 802407A0 0240202D */ daddu $a0, $s2, $zero /* C2F344 802407A4 0260282D */ daddu $a1, $s3, $zero /* C2F348 802407A8 0C012568 */ jal func_800495A0 /* C2F34C 802407AC 0280302D */ daddu $a2, $s4, $zero +glabel L802407B0_C2F350 /* C2F350 802407B0 0240202D */ daddu $a0, $s2, $zero /* C2F354 802407B4 0260282D */ daddu $a1, $s3, $zero /* C2F358 802407B8 0C0125AE */ jal func_800496B8 /* C2F35C 802407BC 0280302D */ daddu $a2, $s4, $zero /* C2F360 802407C0 0809022A */ j .L802408A8 /* C2F364 802407C4 00000000 */ nop +glabel L802407C8_C2F368 /* C2F368 802407C8 0240202D */ daddu $a0, $s2, $zero /* C2F36C 802407CC 0260282D */ daddu $a1, $s3, $zero /* C2F370 802407D0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C2F374 802407D4 0280302D */ daddu $a2, $s4, $zero +glabel L802407D8_C2F378 /* C2F378 802407D8 0240202D */ daddu $a0, $s2, $zero /* C2F37C 802407DC 0260282D */ daddu $a1, $s3, $zero /* C2F380 802407E0 0C012701 */ jal func_80049C04 /* C2F384 802407E4 0280302D */ daddu $a2, $s4, $zero /* C2F388 802407E8 0809022A */ j .L802408A8 /* C2F38C 802407EC 00000000 */ nop +glabel L802407F0_C2F390 /* C2F390 802407F0 0240202D */ daddu $a0, $s2, $zero /* C2F394 802407F4 0260282D */ daddu $a1, $s3, $zero /* C2F398 802407F8 0C01278F */ jal func_80049E3C /* C2F39C 802407FC 0280302D */ daddu $a2, $s4, $zero +glabel L80240800_C2F3A0 /* C2F3A0 80240800 0240202D */ daddu $a0, $s2, $zero /* C2F3A4 80240804 0260282D */ daddu $a1, $s3, $zero /* C2F3A8 80240808 0C0127B3 */ jal func_80049ECC /* C2F3AC 8024080C 0280302D */ daddu $a2, $s4, $zero /* C2F3B0 80240810 0809022A */ j .L802408A8 /* C2F3B4 80240814 00000000 */ nop +glabel L80240818_C2F3B8 /* C2F3B8 80240818 0240202D */ daddu $a0, $s2, $zero /* C2F3BC 8024081C 0260282D */ daddu $a1, $s3, $zero /* C2F3C0 80240820 0C0127DF */ jal func_80049F7C /* C2F3C4 80240824 0280302D */ daddu $a2, $s4, $zero +glabel L80240828_C2F3C8 /* C2F3C8 80240828 0240202D */ daddu $a0, $s2, $zero /* C2F3CC 8024082C 0260282D */ daddu $a1, $s3, $zero /* C2F3D0 80240830 0C012849 */ jal func_8004A124 /* C2F3D4 80240834 0280302D */ daddu $a2, $s4, $zero /* C2F3D8 80240838 0809022A */ j .L802408A8 /* C2F3DC 8024083C 00000000 */ nop +glabel L80240840_C2F3E0 /* C2F3E0 80240840 0240202D */ daddu $a0, $s2, $zero /* C2F3E4 80240844 0260282D */ daddu $a1, $s3, $zero /* C2F3E8 80240848 0C0128FA */ jal func_8004A3E8 /* C2F3EC 8024084C 0280302D */ daddu $a2, $s4, $zero /* C2F3F0 80240850 0809022A */ j .L802408A8 /* C2F3F4 80240854 00000000 */ nop +glabel L80240858_C2F3F8 /* C2F3F8 80240858 0C090000 */ jal dgb_02_UnkNpcAIFunc6 /* C2F3FC 8024085C 0240202D */ daddu $a0, $s2, $zero +glabel L80240860_C2F400 /* C2F400 80240860 0C09001B */ jal dgb_02_UnkNpcAIFunc7 /* C2F404 80240864 0240202D */ daddu $a0, $s2, $zero /* C2F408 80240868 8E430070 */ lw $v1, 0x70($s2) /* C2F40C 8024086C 24020020 */ addiu $v0, $zero, 0x20 /* C2F410 80240870 1462000D */ bne $v1, $v0, .L802408A8 /* C2F414 80240874 00000000 */ nop +glabel L80240878_C2F418 /* C2F418 80240878 0C090037 */ jal dgb_02_UnkNpcAIFunc8 /* C2F41C 8024087C 0240202D */ daddu $a0, $s2, $zero /* C2F420 80240880 8E430070 */ lw $v1, 0x70($s2) /* C2F424 80240884 24020021 */ addiu $v0, $zero, 0x21 /* C2F428 80240888 14620007 */ bne $v1, $v0, .L802408A8 /* C2F42C 8024088C 00000000 */ nop +glabel L80240890_C2F430 /* C2F430 80240890 0C09006D */ jal dgb_02_UnkNpcAIFunc5 /* C2F434 80240894 0240202D */ daddu $a0, $s2, $zero /* C2F438 80240898 0809022A */ j .L802408A8 /* C2F43C 8024089C 00000000 */ nop +glabel L802408A0_C2F440 /* C2F440 802408A0 0C0129CF */ jal func_8004A73C /* C2F444 802408A4 0240202D */ daddu $a0, $s2, $zero .L802408A8: +glabel L802408A8_C2F448 /* C2F448 802408A8 8FBF0048 */ lw $ra, 0x48($sp) /* C2F44C 802408AC 8FB50044 */ lw $s5, 0x44($sp) /* C2F450 802408B0 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802408D0_C2F470.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802408D0_C2F470.s index e964266343..dd88ffd921 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802408D0_C2F470.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802408D0_C2F470.s @@ -20,14 +20,14 @@ glabel func_802408D0_C2F470 /* C2F4A8 80240908 8482008E */ lh $v0, 0x8e($a0) /* C2F4AC 8024090C 24030001 */ addiu $v1, $zero, 1 /* C2F4B0 80240910 14430005 */ bne $v0, $v1, .L80240928 -/* C2F4B4 80240914 00000000 */ nop +/* C2F4B4 80240914 00000000 */ nop /* C2F4B8 80240918 8E0200CC */ lw $v0, 0xcc($s0) /* C2F4BC 8024091C 8C420030 */ lw $v0, 0x30($v0) /* C2F4C0 80240920 08090251 */ j .L80240944 /* C2F4C4 80240924 AC820028 */ sw $v0, 0x28($a0) .L80240928: /* C2F4C8 80240928 1C400006 */ bgtz $v0, .L80240944 -/* C2F4CC 8024092C 00000000 */ nop +/* C2F4CC 8024092C 00000000 */ nop /* C2F4D0 80240930 8E0200CC */ lw $v0, 0xcc($s0) /* C2F4D4 80240934 8C420028 */ lw $v0, 0x28($v0) /* C2F4D8 80240938 A480008E */ sh $zero, 0x8e($a0) diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240958_C2F4F8.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240958_C2F4F8.s index 2925a34262..9733287e55 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240958_C2F4F8.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240958_C2F4F8.s @@ -25,7 +25,7 @@ glabel func_80240958_C2F4F8 /* C2F548 802409A8 0C01242D */ jal func_800490B4 /* C2F54C 802409AC AFA00010 */ sw $zero, 0x10($sp) /* C2F550 802409B0 10400022 */ beqz $v0, .L80240A3C -/* C2F554 802409B4 00000000 */ nop +/* C2F554 802409B4 00000000 */ nop /* C2F558 802409B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C2F55C 802409BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* C2F560 802409C0 804300B4 */ lb $v1, 0xb4($v0) @@ -49,7 +49,7 @@ glabel func_80240958_C2F4F8 /* C2F5A8 80240A08 10620003 */ beq $v1, $v0, .L80240A18 /* C2F5AC 80240A0C 24020025 */ addiu $v0, $zero, 0x25 /* C2F5B0 80240A10 14620002 */ bne $v1, $v0, .L80240A1C -/* C2F5B4 80240A14 00000000 */ nop +/* C2F5B4 80240A14 00000000 */ nop .L80240A18: /* C2F5B8 80240A18 24120001 */ addiu $s2, $zero, 1 .L80240A1C: @@ -98,9 +98,9 @@ glabel func_80240958_C2F4F8 /* C2F650 80240AB0 8C470040 */ lw $a3, 0x40($v0) /* C2F654 80240AB4 3C0142A0 */ lui $at, 0x42a0 /* C2F658 80240AB8 44811000 */ mtc1 $at, $f2 -/* C2F65C 80240ABC 00000000 */ nop +/* C2F65C 80240ABC 00000000 */ nop /* C2F660 80240AC0 4602003E */ c.le.s $f0, $f2 -/* C2F664 80240AC4 00000000 */ nop +/* C2F664 80240AC4 00000000 */ nop /* C2F668 80240AC8 45030001 */ bc1tl .L80240AD0 /* C2F66C 80240ACC 24120001 */ addiu $s2, $zero, 1 .L80240AD0: @@ -122,7 +122,7 @@ glabel func_80240958_C2F4F8 /* C2F6AC 80240B0C 3C01C1A0 */ lui $at, 0xc1a0 /* C2F6B0 80240B10 44812000 */ mtc1 $at, $f4 /* C2F6B4 80240B14 44823000 */ mtc1 $v0, $f6 -/* C2F6B8 80240B18 00000000 */ nop +/* C2F6B8 80240B18 00000000 */ nop /* C2F6BC 80240B1C 468031A0 */ cvt.s.w $f6, $f6 /* C2F6C0 80240B20 44073000 */ mfc1 $a3, $f6 /* C2F6C4 80240B24 8C63002C */ lw $v1, 0x2c($v1) @@ -166,7 +166,7 @@ glabel func_80240958_C2F4F8 /* C2F750 80240BB0 0C012530 */ jal func_800494C0 /* C2F754 80240BB4 0000302D */ daddu $a2, $zero, $zero /* C2F758 80240BB8 080902FC */ j .L80240BF0 -/* C2F75C 80240BBC 00000000 */ nop +/* C2F75C 80240BBC 00000000 */ nop .L80240BC0: /* C2F760 80240BC0 14620005 */ bne $v1, $v0, .L80240BD8 /* C2F764 80240BC4 2402003C */ addiu $v0, $zero, 0x3c @@ -176,7 +176,7 @@ glabel func_80240958_C2F4F8 /* C2F774 80240BD4 AE220028 */ sw $v0, 0x28($s1) .L80240BD8: /* C2F778 80240BD8 14620005 */ bne $v1, $v0, .L80240BF0 -/* C2F77C 80240BDC 00000000 */ nop +/* C2F77C 80240BDC 00000000 */ nop /* C2F780 80240BE0 8E6200CC */ lw $v0, 0xcc($s3) /* C2F784 80240BE4 8C420028 */ lw $v0, 0x28($v0) /* C2F788 80240BE8 A620008E */ sh $zero, 0x8e($s1) diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240C74_C2F814.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240C74_C2F814.s index 1605608790..4d64b891cd 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240C74_C2F814.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240C74_C2F814.s @@ -16,7 +16,7 @@ glabel func_80240C74_C2F814 /* C2F840 80240CA0 0040802D */ daddu $s0, $v0, $zero /* C2F844 80240CA4 C60C000C */ lwc1 $f12, 0xc($s0) /* C2F848 80240CA8 44820000 */ mtc1 $v0, $f0 -/* C2F84C 80240CAC 00000000 */ nop +/* C2F84C 80240CAC 00000000 */ nop /* C2F850 80240CB0 46800020 */ cvt.s.w $f0, $f0 /* C2F854 80240CB4 46006300 */ add.s $f12, $f12, $f0 /* C2F858 80240CB8 3C0142B4 */ lui $at, 0x42b4 diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240D1C_C2F8BC.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240D1C_C2F8BC.s index 28d12dc56f..5eb9af9496 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240D1C_C2F8BC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240D1C_C2F8BC.s @@ -22,7 +22,7 @@ glabel func_80240D1C_C2F8BC /* C2F900 80240D60 0C01242D */ jal func_800490B4 /* C2F904 80240D64 0220282D */ daddu $a1, $s1, $zero /* C2F908 80240D68 1040000C */ beqz $v0, .L80240D9C -/* C2F90C 80240D6C 00000000 */ nop +/* C2F90C 80240D6C 00000000 */ nop /* C2F910 80240D70 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C2F914 80240D74 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* C2F918 80240D78 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -40,7 +40,7 @@ glabel func_80240D1C_C2F8BC /* C2F944 80240DA4 A602008E */ sh $v0, 0x8e($s0) /* C2F948 80240DA8 00021400 */ sll $v0, $v0, 0x10 /* C2F94C 80240DAC 1C400022 */ bgtz $v0, .L80240E38 -/* C2F950 80240DB0 00000000 */ nop +/* C2F950 80240DB0 00000000 */ nop /* C2F954 80240DB4 8E420074 */ lw $v0, 0x74($s2) /* C2F958 80240DB8 2442FFFF */ addiu $v0, $v0, -1 /* C2F95C 80240DBC 18400014 */ blez $v0, .L80240E10 diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240E54_C2F9F4.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240E54_C2F9F4.s index 00745eb240..e6eff51be3 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240E54_C2F9F4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240E54_C2F9F4.s @@ -18,14 +18,14 @@ glabel func_80240E54_C2F9F4 /* C2FA28 80240E88 A462008E */ sh $v0, 0x8e($v1) /* C2FA2C 80240E8C 00021400 */ sll $v0, $v0, 0x10 /* C2FA30 80240E90 1C400015 */ bgtz $v0, .L80240EE8 -/* C2FA34 80240E94 00000000 */ nop +/* C2FA34 80240E94 00000000 */ nop /* C2FA38 80240E98 8E0200CC */ lw $v0, 0xcc($s0) /* C2FA3C 80240E9C 8C420004 */ lw $v0, 4($v0) /* C2FA40 80240EA0 AC620028 */ sw $v0, 0x28($v1) /* C2FA44 80240EA4 8E0200D0 */ lw $v0, 0xd0($s0) /* C2FA48 80240EA8 8C420014 */ lw $v0, 0x14($v0) /* C2FA4C 80240EAC 04410004 */ bgez $v0, .L80240EC0 -/* C2FA50 80240EB0 00000000 */ nop +/* C2FA50 80240EB0 00000000 */ nop /* C2FA54 80240EB4 C6200000 */ lwc1 $f0, ($s1) /* C2FA58 80240EB8 080903B8 */ j .L80240EE0 /* C2FA5C 80240EBC E4600018 */ swc1 $f0, 0x18($v1) @@ -33,7 +33,7 @@ glabel func_80240E54_C2F9F4 /* C2FA60 80240EC0 3C018024 */ lui $at, %hi(D_802427A8) /* C2FA64 80240EC4 D42227A8 */ ldc1 $f2, %lo(D_802427A8)($at) /* C2FA68 80240EC8 44820000 */ mtc1 $v0, $f0 -/* C2FA6C 80240ECC 00000000 */ nop +/* C2FA6C 80240ECC 00000000 */ nop /* C2FA70 80240ED0 46800021 */ cvt.d.w $f0, $f0 /* C2FA74 80240ED4 46220003 */ div.d $f0, $f0, $f2 /* C2FA78 80240ED8 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240F00_C2FAA0.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240F00_C2FAA0.s index 868fc4fbd4..fa417d0d26 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240F00_C2FAA0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240F00_C2FAA0.s @@ -22,7 +22,7 @@ glabel func_80240F00_C2FAA0 /* C2FAE4 80240F44 0C01242D */ jal func_800490B4 /* C2FAE8 80240F48 0040802D */ daddu $s0, $v0, $zero /* C2FAEC 80240F4C 1040000C */ beqz $v0, .L80240F80 -/* C2FAF0 80240F50 00000000 */ nop +/* C2FAF0 80240F50 00000000 */ nop /* C2FAF4 80240F54 C60C0038 */ lwc1 $f12, 0x38($s0) /* C2FAF8 80240F58 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C2FAFC 80240F5C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -45,12 +45,12 @@ glabel func_80240F00_C2FAA0 /* C2FB3C 80240F9C 46802120 */ cvt.s.w $f4, $f4 /* C2FB40 80240FA0 44072000 */ mfc1 $a3, $f4 /* C2FB44 80240FA4 0C00A7B5 */ jal dist2D -/* C2FB48 80240FA8 00000000 */ nop +/* C2FB48 80240FA8 00000000 */ nop /* C2FB4C 80240FAC C6020018 */ lwc1 $f2, 0x18($s0) /* C2FB50 80240FB0 4602003E */ c.le.s $f0, $f2 -/* C2FB54 80240FB4 00000000 */ nop +/* C2FB54 80240FB4 00000000 */ nop /* C2FB58 80240FB8 4500000B */ bc1f .L80240FE8 -/* C2FB5C 80240FBC 00000000 */ nop +/* C2FB5C 80240FBC 00000000 */ nop /* C2FB60 80240FC0 8E4200CC */ lw $v0, 0xcc($s2) /* C2FB64 80240FC4 8C430000 */ lw $v1, ($v0) /* C2FB68 80240FC8 2402000F */ addiu $v0, $zero, 0xf @@ -85,7 +85,7 @@ glabel func_80240F00_C2FAA0 /* C2FBD8 80241038 46802120 */ cvt.s.w $f4, $f4 /* C2FBDC 8024103C 44072000 */ mfc1 $a3, $f4 /* C2FBE0 80241040 0C00A720 */ jal atan2 -/* C2FBE4 80241044 00000000 */ nop +/* C2FBE4 80241044 00000000 */ nop /* C2FBE8 80241048 8E050018 */ lw $a1, 0x18($s0) /* C2FBEC 8024104C 44060000 */ mfc1 $a2, $f0 /* C2FBF0 80241050 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80241078_C2FC18.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80241078_C2FC18.s index adac4f1fdd..c4b4345cf7 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80241078_C2FC18.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80241078_C2FC18.s @@ -12,13 +12,13 @@ glabel func_80241078_C2FC18 /* C2FC34 80241094 0040182D */ daddu $v1, $v0, $zero /* C2FC38 80241098 8462008C */ lh $v0, 0x8c($v1) /* C2FC3C 8024109C 14400009 */ bnez $v0, .L802410C4 -/* C2FC40 802410A0 00000000 */ nop +/* C2FC40 802410A0 00000000 */ nop /* C2FC44 802410A4 9462008E */ lhu $v0, 0x8e($v1) /* C2FC48 802410A8 2442FFFF */ addiu $v0, $v0, -1 /* C2FC4C 802410AC A462008E */ sh $v0, 0x8e($v1) /* C2FC50 802410B0 00021400 */ sll $v0, $v0, 0x10 /* C2FC54 802410B4 1C400003 */ bgtz $v0, .L802410C4 -/* C2FC58 802410B8 00000000 */ nop +/* C2FC58 802410B8 00000000 */ nop /* C2FC5C 802410BC A460008E */ sh $zero, 0x8e($v1) /* C2FC60 802410C0 AE000070 */ sw $zero, 0x70($s0) .L802410C4: diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s index c129553c38..c144b55e22 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s @@ -46,7 +46,7 @@ glabel func_802410D4_C2FC74 /* C2FD18 80241178 8E2200B0 */ lw $v0, 0xb0($s1) /* C2FD1C 8024117C 30420004 */ andi $v0, $v0, 4 /* C2FD20 80241180 10400027 */ beqz $v0, .L80241220 -/* C2FD24 80241184 00000000 */ nop +/* C2FD24 80241184 00000000 */ nop .L80241188: /* C2FD28 80241188 2402001E */ addiu $v0, $zero, 0x1e /* C2FD2C 8024118C 2404F7FF */ addiu $a0, $zero, -0x801 @@ -94,10 +94,10 @@ glabel func_802410D4_C2FC74 /* C2FDC4 80241224 2442FFF6 */ addiu $v0, $v0, -0xa /* C2FDC8 80241228 2C420014 */ sltiu $v0, $v0, 0x14 /* C2FDCC 8024122C 10400009 */ beqz $v0, .L80241254 -/* C2FDD0 80241230 00000000 */ nop +/* C2FDD0 80241230 00000000 */ nop /* C2FDD4 80241234 8E22006C */ lw $v0, 0x6c($s1) /* C2FDD8 80241238 14400006 */ bnez $v0, .L80241254 -/* C2FDDC 8024123C 00000000 */ nop +/* C2FDDC 8024123C 00000000 */ nop /* C2FDE0 80241240 0C090082 */ jal func_80240208_C2EDA8 /* C2FDE4 80241244 0240202D */ daddu $a0, $s2, $zero /* C2FDE8 80241248 10400002 */ beqz $v0, .L80241254 @@ -108,41 +108,47 @@ glabel func_802410D4_C2FC74 /* C2FDF8 80241258 2C620064 */ sltiu $v0, $v1, 0x64 /* C2FDFC 8024125C 10400067 */ beqz $v0, .L802413FC /* C2FE00 80241260 00031080 */ sll $v0, $v1, 2 -/* C2FE04 80241264 3C018024 */ lui $at, %hi(func_802427B0_BE5F60) +/* C2FE04 80241264 3C018024 */ lui $at, %hi(jtbl_802427B0_C31350) /* C2FE08 80241268 00220821 */ addu $at, $at, $v0 -/* C2FE0C 8024126C 8C2227B0 */ lw $v0, %lo(func_802427B0_BE5F60)($at) +/* C2FE0C 8024126C 8C2227B0 */ lw $v0, %lo(jtbl_802427B0_C31350)($at) /* C2FE10 80241270 00400008 */ jr $v0 -/* C2FE14 80241274 00000000 */ nop +/* C2FE14 80241274 00000000 */ nop +glabel L80241278_C2FE18 /* C2FE18 80241278 0240202D */ daddu $a0, $s2, $zero /* C2FE1C 8024127C 0260282D */ daddu $a1, $s3, $zero /* C2FE20 80241280 0C090234 */ jal func_802408D0_C2F470 /* C2FE24 80241284 02A0302D */ daddu $a2, $s5, $zero /* C2FE28 80241288 080904FF */ j .L802413FC -/* C2FE2C 8024128C 00000000 */ nop +/* C2FE2C 8024128C 00000000 */ nop +glabel L80241290_C2FE30 /* C2FE30 80241290 0240202D */ daddu $a0, $s2, $zero /* C2FE34 80241294 0260282D */ daddu $a1, $s3, $zero /* C2FE38 80241298 0C090256 */ jal func_80240958_C2F4F8 /* C2FE3C 8024129C 02A0302D */ daddu $a2, $s5, $zero /* C2FE40 802412A0 080904FF */ j .L802413FC -/* C2FE44 802412A4 00000000 */ nop +/* C2FE44 802412A4 00000000 */ nop +glabel L802412A8_C2FE48 /* C2FE48 802412A8 0240202D */ daddu $a0, $s2, $zero /* C2FE4C 802412AC 0260282D */ daddu $a1, $s3, $zero /* C2FE50 802412B0 0C090304 */ jal func_80240C10_C2F7B0 /* C2FE54 802412B4 02A0302D */ daddu $a2, $s5, $zero /* C2FE58 802412B8 080904FF */ j .L802413FC -/* C2FE5C 802412BC 00000000 */ nop +/* C2FE5C 802412BC 00000000 */ nop +glabel L802412C0_C2FE60 /* C2FE60 802412C0 0240202D */ daddu $a0, $s2, $zero /* C2FE64 802412C4 0260282D */ daddu $a1, $s3, $zero /* C2FE68 802412C8 0C09031D */ jal func_80240C74_C2F814 /* C2FE6C 802412CC 02A0302D */ daddu $a2, $s5, $zero /* C2FE70 802412D0 080904FF */ j .L802413FC -/* C2FE74 802412D4 00000000 */ nop +/* C2FE74 802412D4 00000000 */ nop +glabel L802412D8_C2FE78 /* C2FE78 802412D8 0240202D */ daddu $a0, $s2, $zero /* C2FE7C 802412DC 0260282D */ daddu $a1, $s3, $zero /* C2FE80 802412E0 0C090347 */ jal func_80240D1C_C2F8BC /* C2FE84 802412E4 02A0302D */ daddu $a2, $s5, $zero /* C2FE88 802412E8 080904FF */ j .L802413FC -/* C2FE8C 802412EC 00000000 */ nop +/* C2FE8C 802412EC 00000000 */ nop +glabel L802412F0_C2FE90 /* C2FE90 802412F0 0240202D */ daddu $a0, $s2, $zero /* C2FE94 802412F4 0260282D */ daddu $a1, $s3, $zero /* C2FE98 802412F8 0C0127DF */ jal func_80049F7C @@ -150,13 +156,15 @@ glabel func_802410D4_C2FC74 /* C2FEA0 80241300 8E430070 */ lw $v1, 0x70($s2) /* C2FEA4 80241304 2402000D */ addiu $v0, $zero, 0xd /* C2FEA8 80241308 1462003C */ bne $v1, $v0, .L802413FC -/* C2FEAC 8024130C 00000000 */ nop +/* C2FEAC 8024130C 00000000 */ nop +glabel L80241310_C2FEB0 /* C2FEB0 80241310 0240202D */ daddu $a0, $s2, $zero /* C2FEB4 80241314 0260282D */ daddu $a1, $s3, $zero /* C2FEB8 80241318 0C012849 */ jal func_8004A124 /* C2FEBC 8024131C 02A0302D */ daddu $a2, $s5, $zero /* C2FEC0 80241320 080904FF */ j .L802413FC -/* C2FEC4 80241324 00000000 */ nop +/* C2FEC4 80241324 00000000 */ nop +glabel L80241328_C2FEC8 /* C2FEC8 80241328 0240202D */ daddu $a0, $s2, $zero /* C2FECC 8024132C 0260282D */ daddu $a1, $s3, $zero /* C2FED0 80241330 0C0128FA */ jal func_8004A3E8 @@ -168,26 +176,31 @@ glabel func_802410D4_C2FC74 /* C2FEE8 80241348 24020003 */ addiu $v0, $zero, 3 /* C2FEEC 8024134C 080904FF */ j .L802413FC /* C2FEF0 80241350 AE420070 */ sw $v0, 0x70($s2) +glabel L80241354_C2FEF4 /* C2FEF4 80241354 0C090000 */ jal dgb_02_UnkNpcAIFunc6 /* C2FEF8 80241358 0240202D */ daddu $a0, $s2, $zero /* C2FEFC 8024135C 8E430070 */ lw $v1, 0x70($s2) /* C2FF00 80241360 2402001F */ addiu $v0, $zero, 0x1f /* C2FF04 80241364 14620025 */ bne $v1, $v0, .L802413FC -/* C2FF08 80241368 00000000 */ nop +/* C2FF08 80241368 00000000 */ nop +glabel L8024136C_C2FF0C /* C2FF0C 8024136C 0C09001B */ jal dgb_02_UnkNpcAIFunc7 /* C2FF10 80241370 0240202D */ daddu $a0, $s2, $zero /* C2FF14 80241374 8E430070 */ lw $v1, 0x70($s2) /* C2FF18 80241378 24020020 */ addiu $v0, $zero, 0x20 /* C2FF1C 8024137C 1462001F */ bne $v1, $v0, .L802413FC -/* C2FF20 80241380 00000000 */ nop +/* C2FF20 80241380 00000000 */ nop +glabel L80241384_C2FF24 /* C2FF24 80241384 0C090037 */ jal dgb_02_UnkNpcAIFunc8 /* C2FF28 80241388 0240202D */ daddu $a0, $s2, $zero /* C2FF2C 8024138C 080904FF */ j .L802413FC -/* C2FF30 80241390 00000000 */ nop +/* C2FF30 80241390 00000000 */ nop +glabel L80241394_C2FF34 /* C2FF34 80241394 0C09006D */ jal dgb_02_UnkNpcAIFunc5 /* C2FF38 80241398 0240202D */ daddu $a0, $s2, $zero /* C2FF3C 8024139C 080904FF */ j .L802413FC -/* C2FF40 802413A0 00000000 */ nop +/* C2FF40 802413A0 00000000 */ nop +glabel L802413A4_C2FF44 /* C2FF44 802413A4 0240202D */ daddu $a0, $s2, $zero /* C2FF48 802413A8 0260282D */ daddu $a1, $s3, $zero /* C2FF4C 802413AC 0C090395 */ jal func_80240E54_C2F9F4 @@ -195,22 +208,26 @@ glabel func_802410D4_C2FC74 /* C2FF54 802413B4 8E430070 */ lw $v1, 0x70($s2) /* C2FF58 802413B8 24020029 */ addiu $v0, $zero, 0x29 /* C2FF5C 802413BC 1462000F */ bne $v1, $v0, .L802413FC -/* C2FF60 802413C0 00000000 */ nop +/* C2FF60 802413C0 00000000 */ nop +glabel L802413C4_C2FF64 /* C2FF64 802413C4 0240202D */ daddu $a0, $s2, $zero /* C2FF68 802413C8 0260282D */ daddu $a1, $s3, $zero /* C2FF6C 802413CC 0C0903C0 */ jal func_80240F00_C2FAA0 /* C2FF70 802413D0 02A0302D */ daddu $a2, $s5, $zero /* C2FF74 802413D4 080904FF */ j .L802413FC -/* C2FF78 802413D8 00000000 */ nop +/* C2FF78 802413D8 00000000 */ nop +glabel L802413DC_C2FF7C /* C2FF7C 802413DC 0240202D */ daddu $a0, $s2, $zero /* C2FF80 802413E0 0260282D */ daddu $a1, $s3, $zero /* C2FF84 802413E4 0C09041E */ jal func_80241078_C2FC18 /* C2FF88 802413E8 02A0302D */ daddu $a2, $s5, $zero /* C2FF8C 802413EC 080904FF */ j .L802413FC -/* C2FF90 802413F0 00000000 */ nop +/* C2FF90 802413F0 00000000 */ nop +glabel L802413F4_C2FF94 /* C2FF94 802413F4 0C0129CF */ jal func_8004A73C /* C2FF98 802413F8 0240202D */ daddu $a0, $s2, $zero .L802413FC: +glabel L802413FC_C2FF9C /* C2FF9C 802413FC 8FBF0048 */ lw $ra, 0x48($sp) /* C2FFA0 80241400 8FB50044 */ lw $s5, 0x44($sp) /* C2FFA4 80241404 8FB40040 */ lw $s4, 0x40($sp) @@ -221,6 +238,6 @@ glabel func_802410D4_C2FC74 /* C2FFB8 80241418 0000102D */ daddu $v0, $zero, $zero /* C2FFBC 8024141C 03E00008 */ jr $ra /* C2FFC0 80241420 27BD0050 */ addiu $sp, $sp, 0x50 -/* C2FFC4 80241424 00000000 */ nop -/* C2FFC8 80241428 00000000 */ nop -/* C2FFCC 8024142C 00000000 */ nop +/* C2FFC4 80241424 00000000 */ nop +/* C2FFC8 80241428 00000000 */ nop +/* C2FFCC 8024142C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/update_starpoints_display_C2EF5C.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/update_starpoints_display_C2EF5C.s index f2098d8934..6f76c6dd0f 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/update_starpoints_display_C2EF5C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/update_starpoints_display_C2EF5C.s @@ -19,7 +19,7 @@ glabel update_starpoints_display_C2EF5C /* C2EF94 802403F4 8E2200B0 */ lw $v0, 0xb0($s1) /* C2EF98 802403F8 30420004 */ andi $v0, $v0, 4 /* C2EF9C 802403FC 10400015 */ beqz $v0, .L80240454 -/* C2EFA0 80240400 00000000 */ nop +/* C2EFA0 80240400 00000000 */ nop .L80240404: /* C2EFA4 80240404 AE800070 */ sw $zero, 0x70($s4) /* C2EFA8 80240408 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel update_starpoints_display_C2EF5C /* C2EFF8 80240458 12600005 */ beqz $s3, .L80240470 /* C2EFFC 8024045C 24020001 */ addiu $v0, $zero, 1 /* C2F000 80240460 12620048 */ beq $s3, $v0, .L80240584 -/* C2F004 80240464 00000000 */ nop +/* C2F004 80240464 00000000 */ nop /* C2F008 80240468 0809017E */ j .L802405F8 -/* C2F00C 8024046C 00000000 */ nop +/* C2F00C 8024046C 00000000 */ nop .L80240470: /* C2F010 80240470 86240008 */ lh $a0, 8($s1) /* C2F014 80240474 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel update_starpoints_display_C2EF5C /* C2F034 80240494 8E03006C */ lw $v1, 0x6c($s0) /* C2F038 80240498 24020003 */ addiu $v0, $zero, 3 /* C2F03C 8024049C 14620056 */ bne $v1, $v0, .L802405F8 -/* C2F040 802404A0 00000000 */ nop +/* C2F040 802404A0 00000000 */ nop /* C2F044 802404A4 8E2500A8 */ lw $a1, 0xa8($s1) /* C2F048 802404A8 10A00003 */ beqz $a1, .L802404B8 /* C2F04C 802404AC 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel update_starpoints_display_C2EF5C /* C2F0C4 80240524 C7A20014 */ lwc1 $f2, 0x14($sp) /* C2F0C8 80240528 4600020D */ trunc.w.s $f8, $f0 /* C2F0CC 8024052C 44024000 */ mfc1 $v0, $f8 -/* C2F0D0 80240530 00000000 */ nop +/* C2F0D0 80240530 00000000 */ nop /* C2F0D4 80240534 A6220012 */ sh $v0, 0x12($s1) /* C2F0D8 80240538 4600120D */ trunc.w.s $f8, $f2 /* C2F0DC 8024053C 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_80240000_C314E0.s b/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_80240000_C314E0.s index e229730845..e7100bfdfd 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_80240000_C314E0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_80240000_C314E0.s @@ -18,13 +18,13 @@ glabel func_80240000_C314E0 /* C31514 80240034 24020014 */ addiu $v0, $zero, 0x14 /* C31518 80240038 808300B4 */ lb $v1, 0xb4($a0) /* C3151C 8024003C 10620006 */ beq $v1, $v0, .L80240058 -/* C31520 80240040 00000000 */ nop +/* C31520 80240040 00000000 */ nop .L80240044: /* C31524 80240044 8C820014 */ lw $v0, 0x14($a0) /* C31528 80240048 3C03FFFF */ lui $v1, 0xffff /* C3152C 8024004C 00431024 */ and $v0, $v0, $v1 /* C31530 80240050 10400005 */ beqz $v0, .L80240068 -/* C31534 80240054 00000000 */ nop +/* C31534 80240054 00000000 */ nop .L80240058: /* C31538 80240058 0C039769 */ jal set_action_state /* C3153C 8024005C 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_802400BC_C3159C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_802400BC_C3159C.s index edafbf479e..7ed26a7a1c 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_802400BC_C3159C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_802400BC_C3159C.s @@ -9,7 +9,7 @@ glabel func_802400BC_C3159C /* C315AC 802400CC 3C108011 */ lui $s0, %hi(gPlayerStatus) /* C315B0 802400D0 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* C315B4 802400D4 14400005 */ bnez $v0, .L802400EC -/* C315B8 802400D8 00000000 */ nop +/* C315B8 802400D8 00000000 */ nop /* C315BC 802400DC C4800084 */ lwc1 $f0, 0x84($a0) /* C315C0 802400E0 46800020 */ cvt.s.w $f0, $f0 /* C315C4 802400E4 0809003E */ j .L802400F8 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458_C31938.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458_C31938.s index 84d10d843e..694107eef7 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458_C31938.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458_C31938.s @@ -42,7 +42,7 @@ glabel func_80240458_C31938 /* C319CC 802404EC C6620074 */ lwc1 $f2, 0x74($s3) /* C319D0 802404F0 468010A0 */ cvt.s.w $f2, $f2 /* C319D4 802404F4 4600103C */ c.lt.s $f2, $f0 -/* C319D8 802404F8 00000000 */ nop +/* C319D8 802404F8 00000000 */ nop /* C319DC 802404FC 45030001 */ bc1tl .L80240504 /* C319E0 80240500 0000882D */ daddu $s1, $zero, $zero .L80240504: @@ -51,16 +51,16 @@ glabel func_80240458_C31938 /* C319EC 8024050C 3C014387 */ lui $at, 0x4387 /* C319F0 80240510 4481A000 */ mtc1 $at, $f20 /* C319F4 80240514 0C00A70A */ jal get_clamped_angle_diff -/* C319F8 80240518 00000000 */ nop +/* C319F8 80240518 00000000 */ nop /* C319FC 8024051C 0C00A6C9 */ jal clamp_angle /* C31A00 80240520 46000306 */ mov.s $f12, $f0 /* C31A04 80240524 3C018024 */ lui $at, %hi(func_802449F0_A2EC30) /* C31A08 80240528 D42249F0 */ ldc1 $f2, %lo(func_802449F0_A2EC30)($at) /* C31A0C 8024052C 46000021 */ cvt.d.s $f0, $f0 /* C31A10 80240530 4622003C */ c.lt.d $f0, $f2 -/* C31A14 80240534 00000000 */ nop +/* C31A14 80240534 00000000 */ nop /* C31A18 80240538 45000003 */ bc1f .L80240548 -/* C31A1C 8024053C 00000000 */ nop +/* C31A1C 8024053C 00000000 */ nop /* C31A20 80240540 3C0142B4 */ lui $at, 0x42b4 /* C31A24 80240544 4481A000 */ mtc1 $at, $f20 .L80240548: @@ -77,7 +77,7 @@ glabel func_80240458_C31938 /* C31A50 80240570 468010A0 */ cvt.s.w $f2, $f2 /* C31A54 80240574 46000005 */ abs.s $f0, $f0 /* C31A58 80240578 4600103C */ c.lt.s $f2, $f0 -/* C31A5C 8024057C 00000000 */ nop +/* C31A5C 8024057C 00000000 */ nop /* C31A60 80240580 45030001 */ bc1tl .L80240588 /* C31A64 80240584 0000882D */ daddu $s1, $zero, $zero .L80240588: @@ -87,13 +87,13 @@ glabel func_80240458_C31938 /* C31A74 80240594 860200A8 */ lh $v0, 0xa8($s0) /* C31A78 80240598 46020001 */ sub.s $f0, $f0, $f2 /* C31A7C 8024059C 44821000 */ mtc1 $v0, $f2 -/* C31A80 802405A0 00000000 */ nop +/* C31A80 802405A0 00000000 */ nop /* C31A84 802405A4 468010A1 */ cvt.d.w $f2, $f2 /* C31A88 802405A8 46221080 */ add.d $f2, $f2, $f2 /* C31A8C 802405AC 46000005 */ abs.s $f0, $f0 /* C31A90 802405B0 46000021 */ cvt.d.s $f0, $f0 /* C31A94 802405B4 4620103E */ c.le.d $f2, $f0 -/* C31A98 802405B8 00000000 */ nop +/* C31A98 802405B8 00000000 */ nop /* C31A9C 802405BC 45030001 */ bc1tl .L802405C4 /* C31AA0 802405C0 0000882D */ daddu $s1, $zero, $zero .L802405C4: diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024060C_C31AEC.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024060C_C31AEC.s index aaacbf029a..f2e2472c28 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024060C_C31AEC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024060C_C31AEC.s @@ -19,7 +19,7 @@ glabel func_8024060C_C31AEC /* C31B24 80240644 8E2200B0 */ lw $v0, 0xb0($s1) /* C31B28 80240648 30420004 */ andi $v0, $v0, 4 /* C31B2C 8024064C 10400015 */ beqz $v0, .L802406A4 -/* C31B30 80240650 00000000 */ nop +/* C31B30 80240650 00000000 */ nop .L80240654: /* C31B34 80240654 AE800070 */ sw $zero, 0x70($s4) /* C31B38 80240658 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel func_8024060C_C31AEC /* C31B88 802406A8 12600005 */ beqz $s3, .L802406C0 /* C31B8C 802406AC 24020001 */ addiu $v0, $zero, 1 /* C31B90 802406B0 12620048 */ beq $s3, $v0, .L802407D4 -/* C31B94 802406B4 00000000 */ nop +/* C31B94 802406B4 00000000 */ nop /* C31B98 802406B8 08090212 */ j .L80240848 -/* C31B9C 802406BC 00000000 */ nop +/* C31B9C 802406BC 00000000 */ nop .L802406C0: /* C31BA0 802406C0 86240008 */ lh $a0, 8($s1) /* C31BA4 802406C4 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel func_8024060C_C31AEC /* C31BC4 802406E4 8E03006C */ lw $v1, 0x6c($s0) /* C31BC8 802406E8 24020003 */ addiu $v0, $zero, 3 /* C31BCC 802406EC 14620056 */ bne $v1, $v0, .L80240848 -/* C31BD0 802406F0 00000000 */ nop +/* C31BD0 802406F0 00000000 */ nop /* C31BD4 802406F4 8E2500A8 */ lw $a1, 0xa8($s1) /* C31BD8 802406F8 10A00003 */ beqz $a1, .L80240708 /* C31BDC 802406FC 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel func_8024060C_C31AEC /* C31C54 80240774 C7A20014 */ lwc1 $f2, 0x14($sp) /* C31C58 80240778 4600020D */ trunc.w.s $f8, $f0 /* C31C5C 8024077C 44024000 */ mfc1 $v0, $f8 -/* C31C60 80240780 00000000 */ nop +/* C31C60 80240780 00000000 */ nop /* C31C64 80240784 A6220012 */ sh $v0, 0x12($s1) /* C31C68 80240788 4600120D */ trunc.w.s $f8, $f2 /* C31C6C 8024078C 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s index 055175ae83..9a54d400ad 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s @@ -100,78 +100,93 @@ glabel func_8024086C_C31D4C /* C31EB0 802409D0 2C620064 */ sltiu $v0, $v1, 0x64 /* C31EB4 802409D4 10400048 */ beqz $v0, .L80240AF8 /* C31EB8 802409D8 00031080 */ sll $v0, $v1, 2 -/* C31EBC 802409DC 3C018024 */ lui $at, %hi(func_802449F8_805278) +/* C31EBC 802409DC 3C018024 */ lui $at, %hi(jtbl_802449F8_C35ED8) /* C31EC0 802409E0 00220821 */ addu $at, $at, $v0 -/* C31EC4 802409E4 8C2249F8 */ lw $v0, %lo(func_802449F8_805278)($at) +/* C31EC4 802409E4 8C2249F8 */ lw $v0, %lo(jtbl_802449F8_C35ED8)($at) /* C31EC8 802409E8 00400008 */ jr $v0 /* C31ECC 802409EC 00000000 */ nop +glabel L802409F0_C31ED0 /* C31ED0 802409F0 0240202D */ daddu $a0, $s2, $zero /* C31ED4 802409F4 0260282D */ daddu $a1, $s3, $zero /* C31ED8 802409F8 0C012568 */ jal func_800495A0 /* C31EDC 802409FC 0280302D */ daddu $a2, $s4, $zero +glabel L80240A00_C31EE0 /* C31EE0 80240A00 0240202D */ daddu $a0, $s2, $zero /* C31EE4 80240A04 0260282D */ daddu $a1, $s3, $zero /* C31EE8 80240A08 0C0125AE */ jal func_800496B8 /* C31EEC 80240A0C 0280302D */ daddu $a2, $s4, $zero /* C31EF0 80240A10 080902BE */ j .L80240AF8 /* C31EF4 80240A14 00000000 */ nop +glabel L80240A18_C31EF8 /* C31EF8 80240A18 0240202D */ daddu $a0, $s2, $zero /* C31EFC 80240A1C 0260282D */ daddu $a1, $s3, $zero /* C31F00 80240A20 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C31F04 80240A24 0280302D */ daddu $a2, $s4, $zero +glabel L80240A28_C31F08 /* C31F08 80240A28 0240202D */ daddu $a0, $s2, $zero /* C31F0C 80240A2C 0260282D */ daddu $a1, $s3, $zero /* C31F10 80240A30 0C012701 */ jal func_80049C04 /* C31F14 80240A34 0280302D */ daddu $a2, $s4, $zero /* C31F18 80240A38 080902BE */ j .L80240AF8 /* C31F1C 80240A3C 00000000 */ nop +glabel L80240A40_C31F20 /* C31F20 80240A40 0240202D */ daddu $a0, $s2, $zero /* C31F24 80240A44 0260282D */ daddu $a1, $s3, $zero /* C31F28 80240A48 0C01278F */ jal func_80049E3C /* C31F2C 80240A4C 0280302D */ daddu $a2, $s4, $zero +glabel L80240A50_C31F30 /* C31F30 80240A50 0240202D */ daddu $a0, $s2, $zero /* C31F34 80240A54 0260282D */ daddu $a1, $s3, $zero /* C31F38 80240A58 0C0127B3 */ jal func_80049ECC /* C31F3C 80240A5C 0280302D */ daddu $a2, $s4, $zero /* C31F40 80240A60 080902BE */ j .L80240AF8 /* C31F44 80240A64 00000000 */ nop +glabel L80240A68_C31F48 /* C31F48 80240A68 0240202D */ daddu $a0, $s2, $zero /* C31F4C 80240A6C 0260282D */ daddu $a1, $s3, $zero /* C31F50 80240A70 0C0127DF */ jal func_80049F7C /* C31F54 80240A74 0280302D */ daddu $a2, $s4, $zero +glabel L80240A78_C31F58 /* C31F58 80240A78 0240202D */ daddu $a0, $s2, $zero /* C31F5C 80240A7C 0260282D */ daddu $a1, $s3, $zero /* C31F60 80240A80 0C012849 */ jal func_8004A124 /* C31F64 80240A84 0280302D */ daddu $a2, $s4, $zero /* C31F68 80240A88 080902BE */ j .L80240AF8 /* C31F6C 80240A8C 00000000 */ nop +glabel L80240A90_C31F70 /* C31F70 80240A90 0240202D */ daddu $a0, $s2, $zero /* C31F74 80240A94 0260282D */ daddu $a1, $s3, $zero /* C31F78 80240A98 0C0128FA */ jal func_8004A3E8 /* C31F7C 80240A9C 0280302D */ daddu $a2, $s4, $zero /* C31F80 80240AA0 080902BE */ j .L80240AF8 /* C31F84 80240AA4 00000000 */ nop +glabel L80240AA8_C31F88 /* C31F88 80240AA8 0C090094 */ jal dgb_03_UnkNpcAIFunc6 /* C31F8C 80240AAC 0240202D */ daddu $a0, $s2, $zero +glabel L80240AB0_C31F90 /* C31F90 80240AB0 0C0900AF */ jal dgb_03_UnkNpcAIFunc7 /* C31F94 80240AB4 0240202D */ daddu $a0, $s2, $zero /* C31F98 80240AB8 8E430070 */ lw $v1, 0x70($s2) /* C31F9C 80240ABC 24020020 */ addiu $v0, $zero, 0x20 /* C31FA0 80240AC0 1462000D */ bne $v1, $v0, .L80240AF8 /* C31FA4 80240AC4 00000000 */ nop +glabel L80240AC8_C31FA8 /* C31FA8 80240AC8 0C0900CB */ jal dgb_03_UnkNpcAIFunc8 /* C31FAC 80240ACC 0240202D */ daddu $a0, $s2, $zero /* C31FB0 80240AD0 8E430070 */ lw $v1, 0x70($s2) /* C31FB4 80240AD4 24020021 */ addiu $v0, $zero, 0x21 /* C31FB8 80240AD8 14620007 */ bne $v1, $v0, .L80240AF8 /* C31FBC 80240ADC 00000000 */ nop +glabel L80240AE0_C31FC0 /* C31FC0 80240AE0 0C090101 */ jal dgb_03_UnkNpcAIFunc5 /* C31FC4 80240AE4 0240202D */ daddu $a0, $s2, $zero /* C31FC8 80240AE8 080902BE */ j .L80240AF8 /* C31FCC 80240AEC 00000000 */ nop +glabel L80240AF0_C31FD0 /* C31FD0 80240AF0 0C0129CF */ jal func_8004A73C /* C31FD4 80240AF4 0240202D */ daddu $a0, $s2, $zero .L80240AF8: +glabel L80240AF8_C31FD8 /* C31FD8 80240AF8 8FBF0048 */ lw $ra, 0x48($sp) /* C31FDC 80240AFC 8FB50044 */ lw $s5, 0x44($sp) /* C31FE0 80240B00 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240B20_C32000.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240B20_C32000.s index aef791cce5..7697f4c8b5 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240B20_C32000.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240B20_C32000.s @@ -45,7 +45,7 @@ glabel func_80240B20_C32000 /* C3209C 80240BBC 0C00A7B5 */ jal dist2D /* C320A0 80240BC0 4600B386 */ mov.s $f14, $f22 /* C320A4 80240BC4 4614003C */ c.lt.s $f0, $f20 -/* C320A8 80240BC8 00000000 */ nop +/* C320A8 80240BC8 00000000 */ nop /* C320AC 80240BCC 45000003 */ bc1f .L80240BDC /* C320B0 80240BD0 2631000C */ addiu $s1, $s1, 0xc /* C320B4 80240BD4 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_80240B20_C32000 /* C320E0 80240C00 8E6200D0 */ lw $v0, 0xd0($s3) /* C320E4 80240C04 8C42007C */ lw $v0, 0x7c($v0) /* C320E8 80240C08 04410004 */ bgez $v0, .L80240C1C -/* C320EC 80240C0C 00000000 */ nop +/* C320EC 80240C0C 00000000 */ nop /* C320F0 80240C10 C6C00000 */ lwc1 $f0, ($s6) /* C320F4 80240C14 0809030F */ j .L80240C3C /* C320F8 80240C18 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_80240B20_C32000 /* C320FC 80240C1C 3C018024 */ lui $at, %hi(D_80244B88) /* C32100 80240C20 D4224B88 */ ldc1 $f2, %lo(D_80244B88)($at) /* C32104 80240C24 44820000 */ mtc1 $v0, $f0 -/* C32108 80240C28 00000000 */ nop +/* C32108 80240C28 00000000 */ nop /* C3210C 80240C2C 46800021 */ cvt.d.w $f0, $f0 /* C32110 80240C30 46220003 */ div.d $f0, $f0, $f2 /* C32114 80240C34 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240C78_C32158.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240C78_C32158.s index df8888468c..05eae73459 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240C78_C32158.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240C78_C32158.s @@ -44,7 +44,7 @@ glabel func_80240C78_C32158 /* C321F4 80240D14 2402000F */ addiu $v0, $zero, 0xf /* C321F8 80240D18 AFA2001C */ sw $v0, 0x1c($sp) /* C321FC 80240D1C 44833000 */ mtc1 $v1, $f6 -/* C32200 80240D20 00000000 */ nop +/* C32200 80240D20 00000000 */ nop /* C32204 80240D24 468031A0 */ cvt.s.w $f6, $f6 /* C32208 80240D28 44073000 */ mfc1 $a3, $f6 /* C3220C 80240D2C 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_80240C78_C32158 .L80240D7C: /* C3225C 80240D7C 8602008C */ lh $v0, 0x8c($s0) /* C32260 80240D80 1440005D */ bnez $v0, .L80240EF8 -/* C32264 80240D84 00000000 */ nop +/* C32264 80240D84 00000000 */ nop /* C32268 80240D88 C6000018 */ lwc1 $f0, 0x18($s0) /* C3226C 80240D8C 3C014010 */ lui $at, 0x4010 /* C32270 80240D90 44811800 */ mtc1 $at, $f3 /* C32274 80240D94 44801000 */ mtc1 $zero, $f2 /* C32278 80240D98 46000021 */ cvt.d.s $f0, $f0 /* C3227C 80240D9C 4622003C */ c.lt.d $f0, $f2 -/* C32280 80240DA0 00000000 */ nop +/* C32280 80240DA0 00000000 */ nop /* C32284 80240DA4 45000003 */ bc1f .L80240DB4 /* C32288 80240DA8 0200202D */ daddu $a0, $s0, $zero /* C3228C 80240DAC 0809036E */ j .L80240DB8 @@ -88,7 +88,7 @@ glabel func_80240C78_C32158 /* C32294 80240DB4 24050001 */ addiu $a1, $zero, 1 .L80240DB8: /* C32298 80240DB8 0C00F598 */ jal func_8003D660 -/* C3229C 80240DBC 00000000 */ nop +/* C3229C 80240DBC 00000000 */ nop /* C322A0 80240DC0 C60C0038 */ lwc1 $f12, 0x38($s0) /* C322A4 80240DC4 8E430078 */ lw $v1, 0x78($s2) /* C322A8 80240DC8 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_80240C78_C32158 /* C322D0 80240DF0 4406B000 */ mfc1 $a2, $f22 /* C322D4 80240DF4 4407A000 */ mfc1 $a3, $f20 /* C322D8 80240DF8 0C00A720 */ jal atan2 -/* C322DC 80240DFC 00000000 */ nop +/* C322DC 80240DFC 00000000 */ nop /* C322E0 80240E00 8E050018 */ lw $a1, 0x18($s0) /* C322E4 80240E04 44060000 */ mfc1 $a2, $f0 /* C322E8 80240E08 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_80240C78_C32158 /* C322FC 80240E1C 4406B000 */ mfc1 $a2, $f22 /* C32300 80240E20 4407A000 */ mfc1 $a3, $f20 /* C32304 80240E24 0C00A7B5 */ jal dist2D -/* C32308 80240E28 00000000 */ nop +/* C32308 80240E28 00000000 */ nop /* C3230C 80240E2C C6020018 */ lwc1 $f2, 0x18($s0) /* C32310 80240E30 4602003E */ c.le.s $f0, $f2 -/* C32314 80240E34 00000000 */ nop +/* C32314 80240E34 00000000 */ nop /* C32318 80240E38 4500002F */ bc1f .L80240EF8 /* C3231C 80240E3C 240403E8 */ addiu $a0, $zero, 0x3e8 /* C32320 80240E40 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_80240C78_C32158 /* C32374 80240E94 18400003 */ blez $v0, .L80240EA4 /* C32378 80240E98 24020004 */ addiu $v0, $zero, 4 /* C3237C 80240E9C 14600002 */ bnez $v1, .L80240EA8 -/* C32380 80240EA0 00000000 */ nop +/* C32380 80240EA0 00000000 */ nop .L80240EA4: /* C32384 80240EA4 AE420070 */ sw $v0, 0x70($s2) .L80240EA8: diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240FE0_C324C0.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240FE0_C324C0.s index 098bc41100..f8fe043b81 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240FE0_C324C0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240FE0_C324C0.s @@ -38,7 +38,7 @@ glabel func_80240FE0_C324C0 /* C32544 80241064 2402000F */ addiu $v0, $zero, 0xf /* C32548 80241068 AFA2001C */ sw $v0, 0x1c($sp) /* C3254C 8024106C 44833000 */ mtc1 $v1, $f6 -/* C32550 80241070 00000000 */ nop +/* C32550 80241070 00000000 */ nop /* C32554 80241074 468031A0 */ cvt.s.w $f6, $f6 /* C32558 80241078 44073000 */ mfc1 $a3, $f6 /* C3255C 8024107C 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_80240FE0_C324C0 .L802410E0: /* C325C0 802410E0 8602008C */ lh $v0, 0x8c($s0) /* C325C4 802410E4 14400025 */ bnez $v0, .L8024117C -/* C325C8 802410E8 00000000 */ nop +/* C325C8 802410E8 00000000 */ nop /* C325CC 802410EC 9602008E */ lhu $v0, 0x8e($s0) /* C325D0 802410F0 2442FFFF */ addiu $v0, $v0, -1 /* C325D4 802410F4 A602008E */ sh $v0, 0x8e($s0) /* C325D8 802410F8 00021400 */ sll $v0, $v0, 0x10 /* C325DC 802410FC 1440001F */ bnez $v0, .L8024117C -/* C325E0 80241100 00000000 */ nop +/* C325E0 80241100 00000000 */ nop /* C325E4 80241104 8E820074 */ lw $v0, 0x74($s4) /* C325E8 80241108 2442FFFF */ addiu $v0, $v0, -1 /* C325EC 8024110C 10400019 */ beqz $v0, .L80241174 @@ -84,7 +84,7 @@ glabel func_80240FE0_C324C0 /* C325F8 80241118 9442002A */ lhu $v0, 0x2a($v0) /* C325FC 8024111C 30420010 */ andi $v0, $v0, 0x10 /* C32600 80241120 14400007 */ bnez $v0, .L80241140 -/* C32604 80241124 00000000 */ nop +/* C32604 80241124 00000000 */ nop /* C32608 80241128 C600000C */ lwc1 $f0, 0xc($s0) /* C3260C 8024112C 3C014334 */ lui $at, 0x4334 /* C32610 80241130 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024119C_C3267C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024119C_C3267C.s index 02c86e03af..a5a9834677 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024119C_C3267C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024119C_C3267C.s @@ -28,7 +28,7 @@ glabel func_8024119C_C3267C /* C326D4 802411F4 8E0200D0 */ lw $v0, 0xd0($s0) /* C326D8 802411F8 8C42007C */ lw $v0, 0x7c($v0) /* C326DC 802411FC 04410004 */ bgez $v0, .L80241210 -/* C326E0 80241200 00000000 */ nop +/* C326E0 80241200 00000000 */ nop /* C326E4 80241204 C6400000 */ lwc1 $f0, ($s2) /* C326E8 80241208 0809048C */ j .L80241230 /* C326EC 8024120C E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_8024119C_C3267C /* C326F0 80241210 3C018024 */ lui $at, %hi(pause_tabs_draw_invis) /* C326F4 80241214 D4224B90 */ ldc1 $f2, %lo(pause_tabs_draw_invis)($at) /* C326F8 80241218 44820000 */ mtc1 $v0, $f0 -/* C326FC 8024121C 00000000 */ nop +/* C326FC 8024121C 00000000 */ nop /* C32700 80241220 46800021 */ cvt.d.w $f0, $f0 /* C32704 80241224 46220003 */ div.d $f0, $f0, $f2 /* C32708 80241228 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024133C_C3281C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024133C_C3281C.s index afdd2e5eba..e2c958bd51 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024133C_C3281C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024133C_C3281C.s @@ -47,20 +47,20 @@ glabel func_8024133C_C3281C /* C328C4 802413E4 8E02001C */ lw $v0, 0x1c($s0) /* C328C8 802413E8 46001005 */ abs.s $f0, $f2 /* C328CC 802413EC 44822000 */ mtc1 $v0, $f4 -/* C328D0 802413F0 00000000 */ nop +/* C328D0 802413F0 00000000 */ nop /* C328D4 802413F4 46802120 */ cvt.s.w $f4, $f4 /* C328D8 802413F8 4600203C */ c.lt.s $f4, $f0 -/* C328DC 802413FC 00000000 */ nop +/* C328DC 802413FC 00000000 */ nop /* C328E0 80241400 4500000D */ bc1f .L80241438 -/* C328E4 80241404 00000000 */ nop +/* C328E4 80241404 00000000 */ nop /* C328E8 80241408 44800000 */ mtc1 $zero, $f0 /* C328EC 8024140C C654000C */ lwc1 $f20, 0xc($s2) /* C328F0 80241410 4600103C */ c.lt.s $f2, $f0 -/* C328F4 80241414 00000000 */ nop +/* C328F4 80241414 00000000 */ nop /* C328F8 80241418 45000006 */ bc1f .L80241434 /* C328FC 8024141C 00021023 */ negu $v0, $v0 /* C32900 80241420 44820000 */ mtc1 $v0, $f0 -/* C32904 80241424 00000000 */ nop +/* C32904 80241424 00000000 */ nop /* C32908 80241428 46800020 */ cvt.s.w $f0, $f0 /* C3290C 8024142C 0809050E */ j .L80241438 /* C32910 80241430 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024146C_C3294C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024146C_C3294C.s index 93c01b3fc4..cdfac14b19 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024146C_C3294C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024146C_C3294C.s @@ -37,7 +37,7 @@ glabel func_8024146C_C3294C /* C329CC 802414EC 2402000F */ addiu $v0, $zero, 0xf /* C329D0 802414F0 AFA2001C */ sw $v0, 0x1c($sp) /* C329D4 802414F4 44833000 */ mtc1 $v1, $f6 -/* C329D8 802414F8 00000000 */ nop +/* C329D8 802414F8 00000000 */ nop /* C329DC 802414FC 468031A0 */ cvt.s.w $f6, $f6 /* C329E0 80241500 44073000 */ mfc1 $a3, $f6 /* C329E4 80241504 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802415F4_C32AD4.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802415F4_C32AD4.s index 24e87670c4..a4fe8b8d7b 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802415F4_C32AD4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802415F4_C32AD4.s @@ -28,7 +28,7 @@ glabel func_802415F4_C32AD4 /* C32B2C 8024164C C4400008 */ lwc1 $f0, 8($v0) /* C32B30 80241650 46800020 */ cvt.s.w $f0, $f0 /* C32B34 80241654 4602003E */ c.le.s $f0, $f2 -/* C32B38 80241658 00000000 */ nop +/* C32B38 80241658 00000000 */ nop /* C32B3C 8024165C 45020003 */ bc1fl .L8024166C /* C32B40 80241660 24840001 */ addiu $a0, $a0, 1 /* C32B44 80241664 0809059F */ j .L8024167C diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s index 26aba59b30..8c513caeea 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s @@ -46,7 +46,7 @@ glabel func_802416B4_C32B94 /* C32C38 80241758 8E2200B0 */ lw $v0, 0xb0($s1) /* C32C3C 8024175C 30420004 */ andi $v0, $v0, 4 /* C32C40 80241760 10400044 */ beqz $v0, .L80241874 -/* C32C44 80241764 00000000 */ nop +/* C32C44 80241764 00000000 */ nop .L80241768: /* C32C48 80241768 2404F7FF */ addiu $a0, $zero, -0x801 /* C32C4C 8024176C AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_802416B4_C32B94 /* C32D00 80241820 3C0142C8 */ lui $at, 0x42c8 /* C32D04 80241824 44812000 */ mtc1 $at, $f4 /* C32D08 80241828 44823000 */ mtc1 $v0, $f6 -/* C32D0C 8024182C 00000000 */ nop +/* C32D0C 8024182C 00000000 */ nop /* C32D10 80241830 468031A0 */ cvt.s.w $f6, $f6 /* C32D14 80241834 27A20044 */ addiu $v0, $sp, 0x44 /* C32D18 80241838 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_802416B4_C32B94 /* C32D3C 8024185C 0C0372DF */ jal func_800DCB7C /* C32D40 80241860 27A70040 */ addiu $a3, $sp, 0x40 /* C32D44 80241864 10400003 */ beqz $v0, .L80241874 -/* C32D48 80241868 00000000 */ nop +/* C32D48 80241868 00000000 */ nop /* C32D4C 8024186C C7A0003C */ lwc1 $f0, 0x3c($sp) /* C32D50 80241870 E640003C */ swc1 $f0, 0x3c($s2) .L80241874: @@ -124,72 +124,85 @@ glabel func_802416B4_C32B94 /* C32D58 80241878 2C620064 */ sltiu $v0, $v1, 0x64 /* C32D5C 8024187C 10400042 */ beqz $v0, .L80241988 /* C32D60 80241880 00031080 */ sll $v0, $v1, 2 -/* C32D64 80241884 3C018024 */ lui $at, %hi(pause_tabs_draw_stats_805418) +/* C32D64 80241884 3C018024 */ lui $at, %hi(jtbl_80244B98_C36078) /* C32D68 80241888 00220821 */ addu $at, $at, $v0 -/* C32D6C 8024188C 8C224B98 */ lw $v0, %lo(pause_tabs_draw_stats_805418)($at) +/* C32D6C 8024188C 8C224B98 */ lw $v0, %lo(jtbl_80244B98_C36078)($at) /* C32D70 80241890 00400008 */ jr $v0 -/* C32D74 80241894 00000000 */ nop +/* C32D74 80241894 00000000 */ nop +glabel L80241898_C32D78 /* C32D78 80241898 0280202D */ daddu $a0, $s4, $zero /* C32D7C 8024189C 0260282D */ daddu $a1, $s3, $zero /* C32D80 802418A0 0C0902C8 */ jal func_80240B20_C32000 /* C32D84 802418A4 02A0302D */ daddu $a2, $s5, $zero +glabel L802418A8_C32D88 /* C32D88 802418A8 0280202D */ daddu $a0, $s4, $zero /* C32D8C 802418AC 0260282D */ daddu $a1, $s3, $zero /* C32D90 802418B0 0C09031E */ jal func_80240C78_C32158 /* C32D94 802418B4 02A0302D */ daddu $a2, $s5, $zero /* C32D98 802418B8 08090662 */ j .L80241988 -/* C32D9C 802418BC 00000000 */ nop +/* C32D9C 802418BC 00000000 */ nop +glabel L802418C0_C32DA0 /* C32DA0 802418C0 0280202D */ daddu $a0, $s4, $zero /* C32DA4 802418C4 0260282D */ daddu $a1, $s3, $zero /* C32DA8 802418C8 0C0903C8 */ jal dgb_03_UnkNpcAIFunc1 /* C32DAC 802418CC 02A0302D */ daddu $a2, $s5, $zero +glabel L802418D0_C32DB0 /* C32DB0 802418D0 0280202D */ daddu $a0, $s4, $zero /* C32DB4 802418D4 0260282D */ daddu $a1, $s3, $zero /* C32DB8 802418D8 0C0903F8 */ jal func_80240FE0_C324C0 /* C32DBC 802418DC 02A0302D */ daddu $a2, $s5, $zero /* C32DC0 802418E0 08090662 */ j .L80241988 -/* C32DC4 802418E4 00000000 */ nop +/* C32DC4 802418E4 00000000 */ nop +glabel L802418E8_C32DC8 /* C32DC8 802418E8 0280202D */ daddu $a0, $s4, $zero /* C32DCC 802418EC 0260282D */ daddu $a1, $s3, $zero /* C32DD0 802418F0 0C090467 */ jal func_8024119C_C3267C /* C32DD4 802418F4 02A0302D */ daddu $a2, $s5, $zero /* C32DD8 802418F8 08090662 */ j .L80241988 -/* C32DDC 802418FC 00000000 */ nop +/* C32DDC 802418FC 00000000 */ nop +glabel L80241900_C32DE0 /* C32DE0 80241900 0280202D */ daddu $a0, $s4, $zero /* C32DE4 80241904 0260282D */ daddu $a1, $s3, $zero /* C32DE8 80241908 0C090494 */ jal dgb_03_NpcJumpFunc2 /* C32DEC 8024190C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241910_C32DF0 /* C32DF0 80241910 0280202D */ daddu $a0, $s4, $zero /* C32DF4 80241914 0260282D */ daddu $a1, $s3, $zero /* C32DF8 80241918 0C0904B1 */ jal dgb_03_NpcJumpFunc /* C32DFC 8024191C 02A0302D */ daddu $a2, $s5, $zero /* C32E00 80241920 08090662 */ j .L80241988 -/* C32E04 80241924 00000000 */ nop +/* C32E04 80241924 00000000 */ nop +glabel L80241928_C32E08 /* C32E08 80241928 0280202D */ daddu $a0, $s4, $zero /* C32E0C 8024192C 0260282D */ daddu $a1, $s3, $zero /* C32E10 80241930 0C0904CF */ jal func_8024133C_C3281C /* C32E14 80241934 02A0302D */ daddu $a2, $s5, $zero +glabel L80241938_C32E18 /* C32E18 80241938 0280202D */ daddu $a0, $s4, $zero /* C32E1C 8024193C 0260282D */ daddu $a1, $s3, $zero /* C32E20 80241940 0C09051B */ jal func_8024146C_C3294C /* C32E24 80241944 02A0302D */ daddu $a2, $s5, $zero /* C32E28 80241948 08090662 */ j .L80241988 -/* C32E2C 8024194C 00000000 */ nop +/* C32E2C 8024194C 00000000 */ nop +glabel L80241950_C32E30 /* C32E30 80241950 0280202D */ daddu $a0, $s4, $zero /* C32E34 80241954 0260282D */ daddu $a1, $s3, $zero /* C32E38 80241958 0C090563 */ jal dgb_03_UnkNpcDurationFlagFunc /* C32E3C 8024195C 02A0302D */ daddu $a2, $s5, $zero /* C32E40 80241960 08090662 */ j .L80241988 -/* C32E44 80241964 00000000 */ nop +/* C32E44 80241964 00000000 */ nop +glabel L80241968_C32E48 /* C32E48 80241968 0280202D */ daddu $a0, $s4, $zero /* C32E4C 8024196C 0260282D */ daddu $a1, $s3, $zero /* C32E50 80241970 0C09057D */ jal func_802415F4_C32AD4 /* C32E54 80241974 02A0302D */ daddu $a2, $s5, $zero /* C32E58 80241978 08090662 */ j .L80241988 -/* C32E5C 8024197C 00000000 */ nop +/* C32E5C 8024197C 00000000 */ nop +glabel L80241980_C32E60 /* C32E60 80241980 0C0129CF */ jal func_8004A73C /* C32E64 80241984 0280202D */ daddu $a0, $s4, $zero .L80241988: +glabel L80241988_C32E68 /* C32E68 80241988 8FBF0060 */ lw $ra, 0x60($sp) /* C32E6C 8024198C 8FB5005C */ lw $s5, 0x5c($sp) /* C32E70 80241990 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s index da232a6e8b..ad890e1359 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s @@ -46,7 +46,7 @@ glabel func_802419B0_C32E90 /* C32F34 80241A54 8E2200B0 */ lw $v0, 0xb0($s1) /* C32F38 80241A58 30420004 */ andi $v0, $v0, 4 /* C32F3C 80241A5C 10400020 */ beqz $v0, .L80241AE0 -/* C32F40 80241A60 00000000 */ nop +/* C32F40 80241A60 00000000 */ nop .L80241A64: /* C32F44 80241A64 2404F7FF */ addiu $a0, $zero, -0x801 /* C32F48 80241A68 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_802419B0_C32E90 /* C32FC0 80241AE0 8E420070 */ lw $v0, 0x70($s2) /* C32FC4 80241AE4 2842001E */ slti $v0, $v0, 0x1e /* C32FC8 80241AE8 10400009 */ beqz $v0, .L80241B10 -/* C32FCC 80241AEC 00000000 */ nop +/* C32FCC 80241AEC 00000000 */ nop /* C32FD0 80241AF0 8E22006C */ lw $v0, 0x6c($s1) /* C32FD4 80241AF4 14400006 */ bnez $v0, .L80241B10 -/* C32FD8 80241AF8 00000000 */ nop +/* C32FD8 80241AF8 00000000 */ nop /* C32FDC 80241AFC 0C090116 */ jal func_80240458_C31938 /* C32FE0 80241B00 0240202D */ daddu $a0, $s2, $zero /* C32FE4 80241B04 10400002 */ beqz $v0, .L80241B10 @@ -100,84 +100,100 @@ glabel func_802419B0_C32E90 /* C32FF4 80241B14 2C620064 */ sltiu $v0, $v1, 0x64 /* C32FF8 80241B18 1040004E */ beqz $v0, .L80241C54 /* C32FFC 80241B1C 00031080 */ sll $v0, $v1, 2 -/* C33000 80241B20 3C018024 */ lui $at, %hi(D_80244D28) +/* C33000 80241B20 3C018024 */ lui $at, %hi(jtbl_80244D28_C36208) /* C33004 80241B24 00220821 */ addu $at, $at, $v0 -/* C33008 80241B28 8C224D28 */ lw $v0, %lo(D_80244D28)($at) +/* C33008 80241B28 8C224D28 */ lw $v0, %lo(jtbl_80244D28_C36208)($at) /* C3300C 80241B2C 00400008 */ jr $v0 -/* C33010 80241B30 00000000 */ nop +/* C33010 80241B30 00000000 */ nop +glabel L80241B34_C33014 /* C33014 80241B34 0240202D */ daddu $a0, $s2, $zero /* C33018 80241B38 0260282D */ daddu $a1, $s3, $zero /* C3301C 80241B3C 0C0902C8 */ jal func_80240B20_C32000 /* C33020 80241B40 0280302D */ daddu $a2, $s4, $zero +glabel L80241B44_C33024 /* C33024 80241B44 0240202D */ daddu $a0, $s2, $zero /* C33028 80241B48 0260282D */ daddu $a1, $s3, $zero /* C3302C 80241B4C 0C09031E */ jal func_80240C78_C32158 /* C33030 80241B50 0280302D */ daddu $a2, $s4, $zero /* C33034 80241B54 08090715 */ j .L80241C54 -/* C33038 80241B58 00000000 */ nop +/* C33038 80241B58 00000000 */ nop +glabel L80241B5C_C3303C /* C3303C 80241B5C 0240202D */ daddu $a0, $s2, $zero /* C33040 80241B60 0260282D */ daddu $a1, $s3, $zero /* C33044 80241B64 0C0903C8 */ jal dgb_03_UnkNpcAIFunc1 /* C33048 80241B68 0280302D */ daddu $a2, $s4, $zero +glabel L80241B6C_C3304C /* C3304C 80241B6C 0240202D */ daddu $a0, $s2, $zero /* C33050 80241B70 0260282D */ daddu $a1, $s3, $zero /* C33054 80241B74 0C0903F8 */ jal func_80240FE0_C324C0 /* C33058 80241B78 0280302D */ daddu $a2, $s4, $zero /* C3305C 80241B7C 08090715 */ j .L80241C54 -/* C33060 80241B80 00000000 */ nop +/* C33060 80241B80 00000000 */ nop +glabel L80241B84_C33064 /* C33064 80241B84 0240202D */ daddu $a0, $s2, $zero /* C33068 80241B88 0260282D */ daddu $a1, $s3, $zero /* C3306C 80241B8C 0C090467 */ jal func_8024119C_C3267C /* C33070 80241B90 0280302D */ daddu $a2, $s4, $zero /* C33074 80241B94 08090715 */ j .L80241C54 -/* C33078 80241B98 00000000 */ nop +/* C33078 80241B98 00000000 */ nop +glabel L80241B9C_C3307C /* C3307C 80241B9C 0240202D */ daddu $a0, $s2, $zero /* C33080 80241BA0 0260282D */ daddu $a1, $s3, $zero /* C33084 80241BA4 0C090494 */ jal dgb_03_NpcJumpFunc2 /* C33088 80241BA8 0280302D */ daddu $a2, $s4, $zero +glabel L80241BAC_C3308C /* C3308C 80241BAC 0240202D */ daddu $a0, $s2, $zero /* C33090 80241BB0 0260282D */ daddu $a1, $s3, $zero /* C33094 80241BB4 0C0904B1 */ jal dgb_03_NpcJumpFunc /* C33098 80241BB8 0280302D */ daddu $a2, $s4, $zero /* C3309C 80241BBC 08090715 */ j .L80241C54 -/* C330A0 80241BC0 00000000 */ nop +/* C330A0 80241BC0 00000000 */ nop +glabel L80241BC4_C330A4 /* C330A4 80241BC4 0240202D */ daddu $a0, $s2, $zero /* C330A8 80241BC8 0260282D */ daddu $a1, $s3, $zero /* C330AC 80241BCC 0C0904CF */ jal func_8024133C_C3281C /* C330B0 80241BD0 0280302D */ daddu $a2, $s4, $zero +glabel L80241BD4_C330B4 /* C330B4 80241BD4 0240202D */ daddu $a0, $s2, $zero /* C330B8 80241BD8 0260282D */ daddu $a1, $s3, $zero /* C330BC 80241BDC 0C09051B */ jal func_8024146C_C3294C /* C330C0 80241BE0 0280302D */ daddu $a2, $s4, $zero /* C330C4 80241BE4 08090715 */ j .L80241C54 -/* C330C8 80241BE8 00000000 */ nop +/* C330C8 80241BE8 00000000 */ nop +glabel L80241BEC_C330CC /* C330CC 80241BEC 0240202D */ daddu $a0, $s2, $zero /* C330D0 80241BF0 0260282D */ daddu $a1, $s3, $zero /* C330D4 80241BF4 0C090563 */ jal dgb_03_UnkNpcDurationFlagFunc /* C330D8 80241BF8 0280302D */ daddu $a2, $s4, $zero /* C330DC 80241BFC 08090715 */ j .L80241C54 -/* C330E0 80241C00 00000000 */ nop +/* C330E0 80241C00 00000000 */ nop +glabel L80241C04_C330E4 /* C330E4 80241C04 0C090094 */ jal dgb_03_UnkNpcAIFunc6 /* C330E8 80241C08 0240202D */ daddu $a0, $s2, $zero +glabel L80241C0C_C330EC /* C330EC 80241C0C 0C0900AF */ jal dgb_03_UnkNpcAIFunc7 /* C330F0 80241C10 0240202D */ daddu $a0, $s2, $zero /* C330F4 80241C14 8E430070 */ lw $v1, 0x70($s2) /* C330F8 80241C18 24020020 */ addiu $v0, $zero, 0x20 /* C330FC 80241C1C 1462000D */ bne $v1, $v0, .L80241C54 -/* C33100 80241C20 00000000 */ nop +/* C33100 80241C20 00000000 */ nop +glabel L80241C24_C33104 /* C33104 80241C24 0C0900CB */ jal dgb_03_UnkNpcAIFunc8 /* C33108 80241C28 0240202D */ daddu $a0, $s2, $zero /* C3310C 80241C2C 8E430070 */ lw $v1, 0x70($s2) /* C33110 80241C30 24020021 */ addiu $v0, $zero, 0x21 /* C33114 80241C34 14620007 */ bne $v1, $v0, .L80241C54 -/* C33118 80241C38 00000000 */ nop +/* C33118 80241C38 00000000 */ nop +glabel L80241C3C_C3311C /* C3311C 80241C3C 0C090101 */ jal dgb_03_UnkNpcAIFunc5 /* C33120 80241C40 0240202D */ daddu $a0, $s2, $zero /* C33124 80241C44 08090715 */ j .L80241C54 -/* C33128 80241C48 00000000 */ nop +/* C33128 80241C48 00000000 */ nop +glabel L80241C4C_C3312C /* C3312C 80241C4C 0C0129CF */ jal func_8004A73C /* C33130 80241C50 0240202D */ daddu $a0, $s2, $zero .L80241C54: +glabel L80241C54_C33134 /* C33134 80241C54 8FBF0048 */ lw $ra, 0x48($sp) /* C33138 80241C58 8FB50044 */ lw $s5, 0x44($sp) /* C3313C 80241C5C 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241C7C_C3315C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241C7C_C3315C.s index 3d04214fc1..615f129235 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241C7C_C3315C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241C7C_C3315C.s @@ -20,14 +20,14 @@ glabel func_80241C7C_C3315C /* C33194 80241CB4 8482008E */ lh $v0, 0x8e($a0) /* C33198 80241CB8 24030001 */ addiu $v1, $zero, 1 /* C3319C 80241CBC 14430005 */ bne $v0, $v1, .L80241CD4 -/* C331A0 80241CC0 00000000 */ nop +/* C331A0 80241CC0 00000000 */ nop /* C331A4 80241CC4 8E0200CC */ lw $v0, 0xcc($s0) /* C331A8 80241CC8 8C420030 */ lw $v0, 0x30($v0) /* C331AC 80241CCC 0809073C */ j .L80241CF0 /* C331B0 80241CD0 AC820028 */ sw $v0, 0x28($a0) .L80241CD4: /* C331B4 80241CD4 1C400006 */ bgtz $v0, .L80241CF0 -/* C331B8 80241CD8 00000000 */ nop +/* C331B8 80241CD8 00000000 */ nop /* C331BC 80241CDC 8E0200CC */ lw $v0, 0xcc($s0) /* C331C0 80241CE0 8C420028 */ lw $v0, 0x28($v0) /* C331C4 80241CE4 A480008E */ sh $zero, 0x8e($a0) diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241D04_C331E4.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241D04_C331E4.s index a5f80c2149..cc31cceec8 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241D04_C331E4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241D04_C331E4.s @@ -25,7 +25,7 @@ glabel func_80241D04_C331E4 /* C33234 80241D54 0C01242D */ jal func_800490B4 /* C33238 80241D58 AFA00010 */ sw $zero, 0x10($sp) /* C3323C 80241D5C 10400022 */ beqz $v0, .L80241DE8 -/* C33240 80241D60 00000000 */ nop +/* C33240 80241D60 00000000 */ nop /* C33244 80241D64 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C33248 80241D68 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* C3324C 80241D6C 804300B4 */ lb $v1, 0xb4($v0) @@ -49,7 +49,7 @@ glabel func_80241D04_C331E4 /* C33294 80241DB4 10620003 */ beq $v1, $v0, .L80241DC4 /* C33298 80241DB8 24020025 */ addiu $v0, $zero, 0x25 /* C3329C 80241DBC 14620002 */ bne $v1, $v0, .L80241DC8 -/* C332A0 80241DC0 00000000 */ nop +/* C332A0 80241DC0 00000000 */ nop .L80241DC4: /* C332A4 80241DC4 24120001 */ addiu $s2, $zero, 1 .L80241DC8: @@ -98,9 +98,9 @@ glabel func_80241D04_C331E4 /* C3333C 80241E5C 8C470040 */ lw $a3, 0x40($v0) /* C33340 80241E60 3C0142A0 */ lui $at, 0x42a0 /* C33344 80241E64 44811000 */ mtc1 $at, $f2 -/* C33348 80241E68 00000000 */ nop +/* C33348 80241E68 00000000 */ nop /* C3334C 80241E6C 4602003E */ c.le.s $f0, $f2 -/* C33350 80241E70 00000000 */ nop +/* C33350 80241E70 00000000 */ nop /* C33354 80241E74 45030001 */ bc1tl .L80241E7C /* C33358 80241E78 24120001 */ addiu $s2, $zero, 1 .L80241E7C: @@ -122,7 +122,7 @@ glabel func_80241D04_C331E4 /* C33398 80241EB8 3C01C1A0 */ lui $at, 0xc1a0 /* C3339C 80241EBC 44812000 */ mtc1 $at, $f4 /* C333A0 80241EC0 44823000 */ mtc1 $v0, $f6 -/* C333A4 80241EC4 00000000 */ nop +/* C333A4 80241EC4 00000000 */ nop /* C333A8 80241EC8 468031A0 */ cvt.s.w $f6, $f6 /* C333AC 80241ECC 44073000 */ mfc1 $a3, $f6 /* C333B0 80241ED0 8C63002C */ lw $v1, 0x2c($v1) @@ -166,7 +166,7 @@ glabel func_80241D04_C331E4 /* C3343C 80241F5C 0C012530 */ jal func_800494C0 /* C33440 80241F60 0000302D */ daddu $a2, $zero, $zero /* C33444 80241F64 080907E7 */ j .L80241F9C -/* C33448 80241F68 00000000 */ nop +/* C33448 80241F68 00000000 */ nop .L80241F6C: /* C3344C 80241F6C 14620005 */ bne $v1, $v0, .L80241F84 /* C33450 80241F70 2402003C */ addiu $v0, $zero, 0x3c @@ -176,7 +176,7 @@ glabel func_80241D04_C331E4 /* C33460 80241F80 AE220028 */ sw $v0, 0x28($s1) .L80241F84: /* C33464 80241F84 14620005 */ bne $v1, $v0, .L80241F9C -/* C33468 80241F88 00000000 */ nop +/* C33468 80241F88 00000000 */ nop /* C3346C 80241F8C 8E6200CC */ lw $v0, 0xcc($s3) /* C33470 80241F90 8C420028 */ lw $v0, 0x28($v0) /* C33474 80241F94 A620008E */ sh $zero, 0x8e($s1) diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242020_C33500.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242020_C33500.s index 5b64453361..1b55f46c17 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242020_C33500.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242020_C33500.s @@ -16,7 +16,7 @@ glabel func_80242020_C33500 /* C3352C 8024204C 0040802D */ daddu $s0, $v0, $zero /* C33530 80242050 C60C000C */ lwc1 $f12, 0xc($s0) /* C33534 80242054 44820000 */ mtc1 $v0, $f0 -/* C33538 80242058 00000000 */ nop +/* C33538 80242058 00000000 */ nop /* C3353C 8024205C 46800020 */ cvt.s.w $f0, $f0 /* C33540 80242060 46006300 */ add.s $f12, $f12, $f0 /* C33544 80242064 3C0142B4 */ lui $at, 0x42b4 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802420C8_C335A8.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802420C8_C335A8.s index 3b1c185f73..0c92dc4535 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802420C8_C335A8.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802420C8_C335A8.s @@ -22,7 +22,7 @@ glabel func_802420C8_C335A8 /* C335EC 8024210C 0C01242D */ jal func_800490B4 /* C335F0 80242110 0220282D */ daddu $a1, $s1, $zero /* C335F4 80242114 1040000C */ beqz $v0, .L80242148 -/* C335F8 80242118 00000000 */ nop +/* C335F8 80242118 00000000 */ nop /* C335FC 8024211C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C33600 80242120 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* C33604 80242124 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -40,7 +40,7 @@ glabel func_802420C8_C335A8 /* C33630 80242150 A602008E */ sh $v0, 0x8e($s0) /* C33634 80242154 00021400 */ sll $v0, $v0, 0x10 /* C33638 80242158 1C400022 */ bgtz $v0, .L802421E4 -/* C3363C 8024215C 00000000 */ nop +/* C3363C 8024215C 00000000 */ nop /* C33640 80242160 8E420074 */ lw $v0, 0x74($s2) /* C33644 80242164 2442FFFF */ addiu $v0, $v0, -1 /* C33648 80242168 18400014 */ blez $v0, .L802421BC diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242200_C336E0.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242200_C336E0.s index 0ee798d792..8076016fec 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242200_C336E0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242200_C336E0.s @@ -18,14 +18,14 @@ glabel func_80242200_C336E0 /* C33714 80242234 A462008E */ sh $v0, 0x8e($v1) /* C33718 80242238 00021400 */ sll $v0, $v0, 0x10 /* C3371C 8024223C 1C400015 */ bgtz $v0, .L80242294 -/* C33720 80242240 00000000 */ nop +/* C33720 80242240 00000000 */ nop /* C33724 80242244 8E0200CC */ lw $v0, 0xcc($s0) /* C33728 80242248 8C420004 */ lw $v0, 4($v0) /* C3372C 8024224C AC620028 */ sw $v0, 0x28($v1) /* C33730 80242250 8E0200D0 */ lw $v0, 0xd0($s0) /* C33734 80242254 8C420014 */ lw $v0, 0x14($v0) /* C33738 80242258 04410004 */ bgez $v0, .L8024226C -/* C3373C 8024225C 00000000 */ nop +/* C3373C 8024225C 00000000 */ nop /* C33740 80242260 C6200000 */ lwc1 $f0, ($s1) /* C33744 80242264 080908A3 */ j .L8024228C /* C33748 80242268 E4600018 */ swc1 $f0, 0x18($v1) @@ -33,7 +33,7 @@ glabel func_80242200_C336E0 /* C3374C 8024226C 3C018024 */ lui $at, %hi(D_80244EB8) /* C33750 80242270 D4224EB8 */ ldc1 $f2, %lo(D_80244EB8)($at) /* C33754 80242274 44820000 */ mtc1 $v0, $f0 -/* C33758 80242278 00000000 */ nop +/* C33758 80242278 00000000 */ nop /* C3375C 8024227C 46800021 */ cvt.d.w $f0, $f0 /* C33760 80242280 46220003 */ div.d $f0, $f0, $f2 /* C33764 80242284 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802422AC_C3378C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802422AC_C3378C.s index 4d4851bbe4..fc6de42625 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802422AC_C3378C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802422AC_C3378C.s @@ -22,7 +22,7 @@ glabel func_802422AC_C3378C /* C337D0 802422F0 0C01242D */ jal func_800490B4 /* C337D4 802422F4 0040802D */ daddu $s0, $v0, $zero /* C337D8 802422F8 1040000C */ beqz $v0, .L8024232C -/* C337DC 802422FC 00000000 */ nop +/* C337DC 802422FC 00000000 */ nop /* C337E0 80242300 C60C0038 */ lwc1 $f12, 0x38($s0) /* C337E4 80242304 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C337E8 80242308 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -45,12 +45,12 @@ glabel func_802422AC_C3378C /* C33828 80242348 46802120 */ cvt.s.w $f4, $f4 /* C3382C 8024234C 44072000 */ mfc1 $a3, $f4 /* C33830 80242350 0C00A7B5 */ jal dist2D -/* C33834 80242354 00000000 */ nop +/* C33834 80242354 00000000 */ nop /* C33838 80242358 C6020018 */ lwc1 $f2, 0x18($s0) /* C3383C 8024235C 4602003E */ c.le.s $f0, $f2 -/* C33840 80242360 00000000 */ nop +/* C33840 80242360 00000000 */ nop /* C33844 80242364 4500000B */ bc1f .L80242394 -/* C33848 80242368 00000000 */ nop +/* C33848 80242368 00000000 */ nop /* C3384C 8024236C 8E4200CC */ lw $v0, 0xcc($s2) /* C33850 80242370 8C430000 */ lw $v1, ($v0) /* C33854 80242374 2402000F */ addiu $v0, $zero, 0xf @@ -85,7 +85,7 @@ glabel func_802422AC_C3378C /* C338C4 802423E4 46802120 */ cvt.s.w $f4, $f4 /* C338C8 802423E8 44072000 */ mfc1 $a3, $f4 /* C338CC 802423EC 0C00A720 */ jal atan2 -/* C338D0 802423F0 00000000 */ nop +/* C338D0 802423F0 00000000 */ nop /* C338D4 802423F4 8E050018 */ lw $a1, 0x18($s0) /* C338D8 802423F8 44060000 */ mfc1 $a2, $f0 /* C338DC 802423FC 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242424_C33904.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242424_C33904.s index e8b64af1fb..198cb8c21a 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242424_C33904.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242424_C33904.s @@ -12,13 +12,13 @@ glabel func_80242424_C33904 /* C33920 80242440 0040182D */ daddu $v1, $v0, $zero /* C33924 80242444 8462008C */ lh $v0, 0x8c($v1) /* C33928 80242448 14400009 */ bnez $v0, .L80242470 -/* C3392C 8024244C 00000000 */ nop +/* C3392C 8024244C 00000000 */ nop /* C33930 80242450 9462008E */ lhu $v0, 0x8e($v1) /* C33934 80242454 2442FFFF */ addiu $v0, $v0, -1 /* C33938 80242458 A462008E */ sh $v0, 0x8e($v1) /* C3393C 8024245C 00021400 */ sll $v0, $v0, 0x10 /* C33940 80242460 1C400003 */ bgtz $v0, .L80242470 -/* C33944 80242464 00000000 */ nop +/* C33944 80242464 00000000 */ nop /* C33948 80242468 A460008E */ sh $zero, 0x8e($v1) /* C3394C 8024246C AE000070 */ sw $zero, 0x70($s0) .L80242470: diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s index 21fb865cf8..f7a8d617a0 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s @@ -46,7 +46,7 @@ glabel func_80242480_C33960 /* C33A04 80242524 8E2200B0 */ lw $v0, 0xb0($s1) /* C33A08 80242528 30420004 */ andi $v0, $v0, 4 /* C33A0C 8024252C 10400027 */ beqz $v0, .L802425CC -/* C33A10 80242530 00000000 */ nop +/* C33A10 80242530 00000000 */ nop .L80242534: /* C33A14 80242534 2402001E */ addiu $v0, $zero, 0x1e /* C33A18 80242538 2404F7FF */ addiu $a0, $zero, -0x801 @@ -94,10 +94,10 @@ glabel func_80242480_C33960 /* C33AB0 802425D0 2442FFF6 */ addiu $v0, $v0, -0xa /* C33AB4 802425D4 2C420014 */ sltiu $v0, $v0, 0x14 /* C33AB8 802425D8 10400009 */ beqz $v0, .L80242600 -/* C33ABC 802425DC 00000000 */ nop +/* C33ABC 802425DC 00000000 */ nop /* C33AC0 802425E0 8E22006C */ lw $v0, 0x6c($s1) /* C33AC4 802425E4 14400006 */ bnez $v0, .L80242600 -/* C33AC8 802425E8 00000000 */ nop +/* C33AC8 802425E8 00000000 */ nop /* C33ACC 802425EC 0C090116 */ jal func_80240458_C31938 /* C33AD0 802425F0 0240202D */ daddu $a0, $s2, $zero /* C33AD4 802425F4 10400002 */ beqz $v0, .L80242600 @@ -108,41 +108,47 @@ glabel func_80242480_C33960 /* C33AE4 80242604 2C620064 */ sltiu $v0, $v1, 0x64 /* C33AE8 80242608 10400067 */ beqz $v0, .L802427A8 /* C33AEC 8024260C 00031080 */ sll $v0, $v1, 2 -/* C33AF0 80242610 3C018024 */ lui $at, %hi(D_80244EC0) +/* C33AF0 80242610 3C018024 */ lui $at, %hi(jtbl_80244EC0_C363A0) /* C33AF4 80242614 00220821 */ addu $at, $at, $v0 -/* C33AF8 80242618 8C224EC0 */ lw $v0, %lo(D_80244EC0)($at) +/* C33AF8 80242618 8C224EC0 */ lw $v0, %lo(jtbl_80244EC0_C363A0)($at) /* C33AFC 8024261C 00400008 */ jr $v0 -/* C33B00 80242620 00000000 */ nop +/* C33B00 80242620 00000000 */ nop +glabel L80242624_C33B04 /* C33B04 80242624 0240202D */ daddu $a0, $s2, $zero /* C33B08 80242628 0260282D */ daddu $a1, $s3, $zero /* C33B0C 8024262C 0C09071F */ jal func_80241C7C_C3315C /* C33B10 80242630 02A0302D */ daddu $a2, $s5, $zero /* C33B14 80242634 080909EA */ j .L802427A8 -/* C33B18 80242638 00000000 */ nop +/* C33B18 80242638 00000000 */ nop +glabel L8024263C_C33B1C /* C33B1C 8024263C 0240202D */ daddu $a0, $s2, $zero /* C33B20 80242640 0260282D */ daddu $a1, $s3, $zero /* C33B24 80242644 0C090741 */ jal func_80241D04_C331E4 /* C33B28 80242648 02A0302D */ daddu $a2, $s5, $zero /* C33B2C 8024264C 080909EA */ j .L802427A8 -/* C33B30 80242650 00000000 */ nop +/* C33B30 80242650 00000000 */ nop +glabel L80242654_C33B34 /* C33B34 80242654 0240202D */ daddu $a0, $s2, $zero /* C33B38 80242658 0260282D */ daddu $a1, $s3, $zero /* C33B3C 8024265C 0C0907EF */ jal func_80241FBC_C3349C /* C33B40 80242660 02A0302D */ daddu $a2, $s5, $zero /* C33B44 80242664 080909EA */ j .L802427A8 -/* C33B48 80242668 00000000 */ nop +/* C33B48 80242668 00000000 */ nop +glabel L8024266C_C33B4C /* C33B4C 8024266C 0240202D */ daddu $a0, $s2, $zero /* C33B50 80242670 0260282D */ daddu $a1, $s3, $zero /* C33B54 80242674 0C090808 */ jal func_80242020_C33500 /* C33B58 80242678 02A0302D */ daddu $a2, $s5, $zero /* C33B5C 8024267C 080909EA */ j .L802427A8 -/* C33B60 80242680 00000000 */ nop +/* C33B60 80242680 00000000 */ nop +glabel L80242684_C33B64 /* C33B64 80242684 0240202D */ daddu $a0, $s2, $zero /* C33B68 80242688 0260282D */ daddu $a1, $s3, $zero /* C33B6C 8024268C 0C090832 */ jal func_802420C8_C335A8 /* C33B70 80242690 02A0302D */ daddu $a2, $s5, $zero /* C33B74 80242694 080909EA */ j .L802427A8 -/* C33B78 80242698 00000000 */ nop +/* C33B78 80242698 00000000 */ nop +glabel L8024269C_C33B7C /* C33B7C 8024269C 0240202D */ daddu $a0, $s2, $zero /* C33B80 802426A0 0260282D */ daddu $a1, $s3, $zero /* C33B84 802426A4 0C0127DF */ jal func_80049F7C @@ -150,13 +156,15 @@ glabel func_80242480_C33960 /* C33B8C 802426AC 8E430070 */ lw $v1, 0x70($s2) /* C33B90 802426B0 2402000D */ addiu $v0, $zero, 0xd /* C33B94 802426B4 1462003C */ bne $v1, $v0, .L802427A8 -/* C33B98 802426B8 00000000 */ nop +/* C33B98 802426B8 00000000 */ nop +glabel L802426BC_C33B9C /* C33B9C 802426BC 0240202D */ daddu $a0, $s2, $zero /* C33BA0 802426C0 0260282D */ daddu $a1, $s3, $zero /* C33BA4 802426C4 0C012849 */ jal func_8004A124 /* C33BA8 802426C8 02A0302D */ daddu $a2, $s5, $zero /* C33BAC 802426CC 080909EA */ j .L802427A8 -/* C33BB0 802426D0 00000000 */ nop +/* C33BB0 802426D0 00000000 */ nop +glabel L802426D4_C33BB4 /* C33BB4 802426D4 0240202D */ daddu $a0, $s2, $zero /* C33BB8 802426D8 0260282D */ daddu $a1, $s3, $zero /* C33BBC 802426DC 0C0128FA */ jal func_8004A3E8 @@ -168,26 +176,31 @@ glabel func_80242480_C33960 /* C33BD4 802426F4 24020003 */ addiu $v0, $zero, 3 /* C33BD8 802426F8 080909EA */ j .L802427A8 /* C33BDC 802426FC AE420070 */ sw $v0, 0x70($s2) +glabel L80242700_C33BE0 /* C33BE0 80242700 0C090094 */ jal dgb_03_UnkNpcAIFunc6 /* C33BE4 80242704 0240202D */ daddu $a0, $s2, $zero /* C33BE8 80242708 8E430070 */ lw $v1, 0x70($s2) /* C33BEC 8024270C 2402001F */ addiu $v0, $zero, 0x1f /* C33BF0 80242710 14620025 */ bne $v1, $v0, .L802427A8 -/* C33BF4 80242714 00000000 */ nop +/* C33BF4 80242714 00000000 */ nop +glabel L80242718_C33BF8 /* C33BF8 80242718 0C0900AF */ jal dgb_03_UnkNpcAIFunc7 /* C33BFC 8024271C 0240202D */ daddu $a0, $s2, $zero /* C33C00 80242720 8E430070 */ lw $v1, 0x70($s2) /* C33C04 80242724 24020020 */ addiu $v0, $zero, 0x20 /* C33C08 80242728 1462001F */ bne $v1, $v0, .L802427A8 -/* C33C0C 8024272C 00000000 */ nop +/* C33C0C 8024272C 00000000 */ nop +glabel L80242730_C33C10 /* C33C10 80242730 0C0900CB */ jal dgb_03_UnkNpcAIFunc8 /* C33C14 80242734 0240202D */ daddu $a0, $s2, $zero /* C33C18 80242738 080909EA */ j .L802427A8 -/* C33C1C 8024273C 00000000 */ nop +/* C33C1C 8024273C 00000000 */ nop +glabel L80242740_C33C20 /* C33C20 80242740 0C090101 */ jal dgb_03_UnkNpcAIFunc5 /* C33C24 80242744 0240202D */ daddu $a0, $s2, $zero /* C33C28 80242748 080909EA */ j .L802427A8 -/* C33C2C 8024274C 00000000 */ nop +/* C33C2C 8024274C 00000000 */ nop +glabel L80242750_C33C30 /* C33C30 80242750 0240202D */ daddu $a0, $s2, $zero /* C33C34 80242754 0260282D */ daddu $a1, $s3, $zero /* C33C38 80242758 0C090880 */ jal func_80242200_C336E0 @@ -195,22 +208,26 @@ glabel func_80242480_C33960 /* C33C40 80242760 8E430070 */ lw $v1, 0x70($s2) /* C33C44 80242764 24020029 */ addiu $v0, $zero, 0x29 /* C33C48 80242768 1462000F */ bne $v1, $v0, .L802427A8 -/* C33C4C 8024276C 00000000 */ nop +/* C33C4C 8024276C 00000000 */ nop +glabel L80242770_C33C50 /* C33C50 80242770 0240202D */ daddu $a0, $s2, $zero /* C33C54 80242774 0260282D */ daddu $a1, $s3, $zero /* C33C58 80242778 0C0908AB */ jal func_802422AC_C3378C /* C33C5C 8024277C 02A0302D */ daddu $a2, $s5, $zero /* C33C60 80242780 080909EA */ j .L802427A8 -/* C33C64 80242784 00000000 */ nop +/* C33C64 80242784 00000000 */ nop +glabel L80242788_C33C68 /* C33C68 80242788 0240202D */ daddu $a0, $s2, $zero /* C33C6C 8024278C 0260282D */ daddu $a1, $s3, $zero /* C33C70 80242790 0C090909 */ jal func_80242424_C33904 /* C33C74 80242794 02A0302D */ daddu $a2, $s5, $zero /* C33C78 80242798 080909EA */ j .L802427A8 -/* C33C7C 8024279C 00000000 */ nop +/* C33C7C 8024279C 00000000 */ nop +glabel L802427A0_C33C80 /* C33C80 802427A0 0C0129CF */ jal func_8004A73C /* C33C84 802427A4 0240202D */ daddu $a0, $s2, $zero .L802427A8: +glabel L802427A8_C33C88 /* C33C88 802427A8 8FBF0048 */ lw $ra, 0x48($sp) /* C33C8C 802427AC 8FB50044 */ lw $s5, 0x44($sp) /* C33C90 802427B0 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240000_C36530.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240000_C36530.s index 93afcc46ae..4c752fda60 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240000_C36530.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240000_C36530.s @@ -47,7 +47,7 @@ glabel func_80240000_C36530 /* C365D8 802400A8 0C0123F5 */ jal is_point_within_region /* C365DC 802400AC 8E070038 */ lw $a3, 0x38($s0) /* C365E0 802400B0 1040000E */ beqz $v0, .L802400EC -/* C365E4 802400B4 00000000 */ nop +/* C365E4 802400B4 00000000 */ nop /* C365E8 802400B8 8E2200D0 */ lw $v0, 0xd0($s1) /* C365EC 802400BC C60C0038 */ lwc1 $f12, 0x38($s0) /* C365F0 802400C0 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240000_C36530 /* C36604 802400D4 468031A0 */ cvt.s.w $f6, $f6 /* C36608 802400D8 44073000 */ mfc1 $a3, $f6 /* C3660C 802400DC 0C00A720 */ jal atan2 -/* C36610 802400E0 00000000 */ nop +/* C36610 802400E0 00000000 */ nop /* C36614 802400E4 08090047 */ j .L8024011C /* C36618 802400E8 E600000C */ swc1 $f0, 0xc($s0) .L802400EC: @@ -66,7 +66,7 @@ glabel func_80240000_C36530 /* C36620 802400F0 2404003C */ addiu $a0, $zero, 0x3c /* C36624 802400F4 C60C000C */ lwc1 $f12, 0xc($s0) /* C36628 802400F8 44820000 */ mtc1 $v0, $f0 -/* C3662C 802400FC 00000000 */ nop +/* C3662C 802400FC 00000000 */ nop /* C36630 80240100 46800020 */ cvt.s.w $f0, $f0 /* C36634 80240104 46006300 */ add.s $f12, $f12, $f0 /* C36638 80240108 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240000_C36530 /* C3665C 8024012C 8E2200D0 */ lw $v0, 0xd0($s1) /* C36660 80240130 8C420014 */ lw $v0, 0x14($v0) /* C36664 80240134 04410004 */ bgez $v0, .L80240148 -/* C36668 80240138 00000000 */ nop +/* C36668 80240138 00000000 */ nop /* C3666C 8024013C C6400000 */ lwc1 $f0, ($s2) /* C36670 80240140 0809005A */ j .L80240168 /* C36674 80240144 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240000_C36530 /* C36678 80240148 3C018024 */ lui $at, %hi(D_802443F0) /* C3667C 8024014C D42243F0 */ ldc1 $f2, %lo(D_802443F0)($at) /* C36680 80240150 44820000 */ mtc1 $v0, $f0 -/* C36684 80240154 00000000 */ nop +/* C36684 80240154 00000000 */ nop /* C36688 80240158 46800021 */ cvt.d.w $f0, $f0 /* C3668C 8024015C 46220003 */ div.d $f0, $f0, $f2 /* C36690 80240160 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240000_C36530 /* C366A4 80240174 44801000 */ mtc1 $zero, $f2 /* C366A8 80240178 46000021 */ cvt.d.s $f0, $f0 /* C366AC 8024017C 46220002 */ mul.d $f0, $f0, $f2 -/* C366B0 80240180 00000000 */ nop +/* C366B0 80240180 00000000 */ nop /* C366B4 80240184 24020001 */ addiu $v0, $zero, 1 /* C366B8 80240188 4620018D */ trunc.w.d $f6, $f0 /* C366BC 8024018C E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802401B0_C366E0.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802401B0_C366E0.s index 70415171d3..028577da46 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802401B0_C366E0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802401B0_C366E0.s @@ -34,7 +34,7 @@ glabel func_802401B0_C366E0 /* C36754 80240224 44803000 */ mtc1 $zero, $f6 /* C36758 80240228 46000021 */ cvt.d.s $f0, $f0 /* C3675C 8024022C 46260002 */ mul.d $f0, $f0, $f6 -/* C36760 80240230 00000000 */ nop +/* C36760 80240230 00000000 */ nop /* C36764 80240234 24020001 */ addiu $v0, $zero, 1 /* C36768 80240238 8E24006C */ lw $a0, 0x6c($s1) /* C3676C 8024023C 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_802401B0_C366E0 /* C367C8 80240298 C600003C */ lwc1 $f0, 0x3c($s0) /* C367CC 8024029C 4600C001 */ sub.s $f0, $f24, $f0 /* C367D0 802402A0 4600B03C */ c.lt.s $f22, $f0 -/* C367D4 802402A4 00000000 */ nop +/* C367D4 802402A4 00000000 */ nop /* C367D8 802402A8 4500001B */ bc1f .L80240318 /* C367DC 802402AC 34820010 */ ori $v0, $a0, 0x10 /* C367E0 802402B0 080900C6 */ j .L80240318 @@ -87,9 +87,9 @@ glabel func_802401B0_C366E0 /* C36824 802402F4 C7A00034 */ lwc1 $f0, 0x34($sp) /* C36828 802402F8 4600D001 */ sub.s $f0, $f26, $f0 /* C3682C 802402FC 4600B03C */ c.lt.s $f22, $f0 -/* C36830 80240300 00000000 */ nop +/* C36830 80240300 00000000 */ nop /* C36834 80240304 45000004 */ bc1f .L80240318 -/* C36838 80240308 00000000 */ nop +/* C36838 80240308 00000000 */ nop /* C3683C 8024030C 8E22006C */ lw $v0, 0x6c($s1) /* C36840 80240310 34420010 */ ori $v0, $v0, 0x10 /* C36844 80240314 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_802401B0_C366E0 /* C3684C 8024031C 24030011 */ addiu $v1, $zero, 0x11 /* C36850 80240320 30420011 */ andi $v0, $v0, 0x11 /* C36854 80240324 14430039 */ bne $v0, $v1, .L8024040C -/* C36858 80240328 00000000 */ nop +/* C36858 80240328 00000000 */ nop /* C3685C 8024032C 8E020000 */ lw $v0, ($s0) /* C36860 80240330 30420008 */ andi $v0, $v0, 8 /* C36864 80240334 1040000A */ beqz $v0, .L80240360 @@ -108,7 +108,7 @@ glabel func_802401B0_C366E0 /* C36874 80240344 D42043F8 */ ldc1 $f0, %lo(D_802443F8)($at) /* C36878 80240348 460010A1 */ cvt.d.s $f2, $f2 /* C3687C 8024034C 46201082 */ mul.d $f2, $f2, $f0 -/* C36880 80240350 00000000 */ nop +/* C36880 80240350 00000000 */ nop /* C36884 80240354 4600A021 */ cvt.d.s $f0, $f20 /* C36888 80240358 080900F1 */ j .L802403C4 /* C3688C 8024035C 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_802401B0_C366E0 /* C368DC 802403AC D4204400 */ ldc1 $f0, %lo(D_80244400)($at) /* C368E0 802403B0 460010A1 */ cvt.d.s $f2, $f2 /* C368E4 802403B4 46201082 */ mul.d $f2, $f2, $f0 -/* C368E8 802403B8 00000000 */ nop +/* C368E8 802403B8 00000000 */ nop /* C368EC 802403BC 4600A021 */ cvt.d.s $f0, $f20 /* C368F0 802403C0 46220000 */ add.d $f0, $f0, $f2 .L802403C4: @@ -149,7 +149,7 @@ glabel func_802401B0_C366E0 /* C36910 802403E0 46000005 */ abs.s $f0, $f0 /* C36914 802403E4 46000021 */ cvt.d.s $f0, $f0 /* C36918 802403E8 4622003C */ c.lt.d $f0, $f2 -/* C3691C 802403EC 00000000 */ nop +/* C3691C 802403EC 00000000 */ nop /* C36920 802403F0 45000036 */ bc1f .L802404CC /* C36924 802403F4 2403FFEF */ addiu $v1, $zero, -0x11 /* C36928 802403F8 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_802401B0_C366E0 .L8024040C: /* C3693C 8024040C 8E220070 */ lw $v0, 0x70($s1) /* C36940 80240410 1840002E */ blez $v0, .L802404CC -/* C36944 80240414 00000000 */ nop +/* C36944 80240414 00000000 */ nop /* C36948 80240418 C62C0074 */ lwc1 $f12, 0x74($s1) /* C3694C 8024041C 0C00A8BB */ jal sin_deg /* C36950 80240420 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_802401B0_C366E0 /* C369A8 80240478 27A70030 */ addiu $a3, $sp, 0x30 .L8024047C: /* C369AC 8024047C 10400007 */ beqz $v0, .L8024049C -/* C369B0 80240480 00000000 */ nop +/* C369B0 80240480 00000000 */ nop /* C369B4 80240484 4616A082 */ mul.s $f2, $f20, $f22 -/* C369B8 80240488 00000000 */ nop +/* C369B8 80240488 00000000 */ nop /* C369BC 8024048C C7A0002C */ lwc1 $f0, 0x2c($sp) /* C369C0 80240490 461A0000 */ add.s $f0, $f0, $f26 /* C369C4 80240494 0809012A */ j .L802404A8 /* C369C8 80240498 46020000 */ add.s $f0, $f0, $f2 .L8024049C: /* C369CC 8024049C 4616A002 */ mul.s $f0, $f20, $f22 -/* C369D0 802404A0 00000000 */ nop +/* C369D0 802404A0 00000000 */ nop /* C369D4 802404A4 4600C000 */ add.s $f0, $f24, $f0 .L802404A8: /* C369D8 802404A8 E600003C */ swc1 $f0, 0x3c($s0) /* C369DC 802404AC 8E220074 */ lw $v0, 0x74($s1) /* C369E0 802404B0 2442000A */ addiu $v0, $v0, 0xa /* C369E4 802404B4 44826000 */ mtc1 $v0, $f12 -/* C369E8 802404B8 00000000 */ nop +/* C369E8 802404B8 00000000 */ nop /* C369EC 802404BC 0C00A6C9 */ jal clamp_angle /* C369F0 802404C0 46806320 */ cvt.s.w $f12, $f12 /* C369F4 802404C4 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_802401B0_C366E0 /* C36A04 802404D4 2442FFFF */ addiu $v0, $v0, -1 /* C36A08 802404D8 8E430014 */ lw $v1, 0x14($s2) /* C36A0C 802404DC 04600048 */ bltz $v1, .L80240600 -/* C36A10 802404E0 00000000 */ nop +/* C36A10 802404E0 00000000 */ nop /* C36A14 802404E4 8E620074 */ lw $v0, 0x74($s3) /* C36A18 802404E8 1C400042 */ bgtz $v0, .L802405F4 /* C36A1C 802404EC 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_802401B0_C366E0 /* C36A24 802404F4 860200A8 */ lh $v0, 0xa8($s0) /* C36A28 802404F8 C602003C */ lwc1 $f2, 0x3c($s0) /* C36A2C 802404FC 44820000 */ mtc1 $v0, $f0 -/* C36A30 80240500 00000000 */ nop +/* C36A30 80240500 00000000 */ nop /* C36A34 80240504 46800020 */ cvt.s.w $f0, $f0 /* C36A38 80240508 46001080 */ add.s $f2, $f2, $f0 /* C36A3C 8024050C 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_802401B0_C366E0 /* C36A58 80240528 C440002C */ lwc1 $f0, 0x2c($v0) /* C36A5C 8024052C 46000021 */ cvt.d.s $f0, $f0 /* C36A60 80240530 4622003C */ c.lt.d $f0, $f2 -/* C36A64 80240534 00000000 */ nop +/* C36A64 80240534 00000000 */ nop /* C36A68 80240538 4500002C */ bc1f .L802405EC /* C36A6C 8024053C 02A0202D */ daddu $a0, $s5, $zero /* C36A70 80240540 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_802401B0_C366E0 /* C36AAC 8024057C 3C01C1A0 */ lui $at, 0xc1a0 /* C36AB0 80240580 44812000 */ mtc1 $at, $f4 /* C36AB4 80240584 44834000 */ mtc1 $v1, $f8 -/* C36AB8 80240588 00000000 */ nop +/* C36AB8 80240588 00000000 */ nop /* C36ABC 8024058C 46804220 */ cvt.s.w $f8, $f8 /* C36AC0 80240590 44074000 */ mfc1 $a3, $f8 /* C36AC4 80240594 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_802401B0_C366E0 /* C36B78 80240648 0C0123F5 */ jal is_point_within_region /* C36B7C 8024064C 8E070038 */ lw $a3, 0x38($s0) /* C36B80 80240650 1040001A */ beqz $v0, .L802406BC -/* C36B84 80240654 00000000 */ nop +/* C36B84 80240654 00000000 */ nop /* C36B88 80240658 8E060038 */ lw $a2, 0x38($s0) /* C36B8C 8024065C 8E2200D0 */ lw $v0, 0xd0($s1) /* C36B90 80240660 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_802401B0_C366E0 /* C36BA4 80240674 468073A0 */ cvt.s.w $f14, $f14 /* C36BA8 80240678 C6020018 */ lwc1 $f2, 0x18($s0) /* C36BAC 8024067C 4600103C */ c.lt.s $f2, $f0 -/* C36BB0 80240680 00000000 */ nop +/* C36BB0 80240680 00000000 */ nop /* C36BB4 80240684 4500000D */ bc1f .L802406BC /* C36BB8 80240688 E7A00034 */ swc1 $f0, 0x34($sp) /* C36BBC 8024068C C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_802401B0_C366E0 /* C36BF8 802406C8 00621825 */ or $v1, $v1, $v0 /* C36BFC 802406CC 00741825 */ or $v1, $v1, $s4 /* C36C00 802406D0 10600008 */ beqz $v1, .L802406F4 -/* C36C04 802406D4 00000000 */ nop +/* C36C04 802406D4 00000000 */ nop /* C36C08 802406D8 8602008C */ lh $v0, 0x8c($s0) /* C36C0C 802406DC 14400031 */ bnez $v0, .L802407A4 -/* C36C10 802406E0 00000000 */ nop +/* C36C10 802406E0 00000000 */ nop /* C36C14 802406E4 8E050018 */ lw $a1, 0x18($s0) /* C36C18 802406E8 8E06000C */ lw $a2, 0xc($s0) /* C36C1C 802406EC 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_802401B0_C366E0 /* C36C30 80240700 44801000 */ mtc1 $zero, $f2 /* C36C34 80240704 46000021 */ cvt.d.s $f0, $f0 /* C36C38 80240708 46220002 */ mul.d $f0, $f0, $f2 -/* C36C3C 8024070C 00000000 */ nop +/* C36C3C 8024070C 00000000 */ nop /* C36C40 80240710 4620020D */ trunc.w.d $f8, $f0 /* C36C44 80240714 E628007C */ swc1 $f8, 0x7c($s1) /* C36C48 80240718 8E420004 */ lw $v0, 4($s2) /* C36C4C 8024071C 18400021 */ blez $v0, .L802407A4 -/* C36C50 80240720 00000000 */ nop +/* C36C50 80240720 00000000 */ nop /* C36C54 80240724 8602008E */ lh $v0, 0x8e($s0) /* C36C58 80240728 9603008E */ lhu $v1, 0x8e($s0) /* C36C5C 8024072C 18400005 */ blez $v0, .L80240744 @@ -375,7 +375,7 @@ glabel func_802401B0_C366E0 /* C36C64 80240734 A602008E */ sh $v0, 0x8e($s0) /* C36C68 80240738 00021400 */ sll $v0, $v0, 0x10 /* C36C6C 8024073C 1C400019 */ bgtz $v0, .L802407A4 -/* C36C70 80240740 00000000 */ nop +/* C36C70 80240740 00000000 */ nop .L80240744: /* C36C74 80240744 240403E8 */ addiu $a0, $zero, 0x3e8 /* C36C78 80240748 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_802401B0_C366E0 /* C36CC0 80240790 18400003 */ blez $v0, .L802407A0 /* C36CC4 80240794 28620003 */ slti $v0, $v1, 3 /* C36CC8 80240798 10400002 */ beqz $v0, .L802407A4 -/* C36CCC 8024079C 00000000 */ nop +/* C36CCC 8024079C 00000000 */ nop .L802407A0: /* C36CD0 802407A0 AE600070 */ sw $zero, 0x70($s3) .L802407A4: diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240898_C36DC8.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240898_C36DC8.s index b9b66e4006..44f2b7289e 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240898_C36DC8.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240898_C36DC8.s @@ -42,11 +42,11 @@ glabel func_80240898_C36DC8 .L8024092C: /* C36E5C 8024092C 8E220070 */ lw $v0, 0x70($s1) /* C36E60 80240930 18400034 */ blez $v0, .L80240A04 -/* C36E64 80240934 00000000 */ nop +/* C36E64 80240934 00000000 */ nop /* C36E68 80240938 C62C0074 */ lwc1 $f12, 0x74($s1) /* C36E6C 8024093C 46806320 */ cvt.s.w $f12, $f12 /* C36E70 80240940 44820000 */ mtc1 $v0, $f0 -/* C36E74 80240944 00000000 */ nop +/* C36E74 80240944 00000000 */ nop /* C36E78 80240948 46800020 */ cvt.s.w $f0, $f0 /* C36E7C 8024094C 46000021 */ cvt.d.s $f0, $f0 /* C36E80 80240950 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_80240898_C36DC8 /* C36EE0 802409B0 27A70030 */ addiu $a3, $sp, 0x30 .L802409B4: /* C36EE4 802409B4 10400007 */ beqz $v0, .L802409D4 -/* C36EE8 802409B8 00000000 */ nop +/* C36EE8 802409B8 00000000 */ nop /* C36EEC 802409BC 4616A082 */ mul.s $f2, $f20, $f22 -/* C36EF0 802409C0 00000000 */ nop +/* C36EF0 802409C0 00000000 */ nop /* C36EF4 802409C4 C7A0002C */ lwc1 $f0, 0x2c($sp) /* C36EF8 802409C8 46180000 */ add.s $f0, $f0, $f24 /* C36EFC 802409CC 08090278 */ j .L802409E0 /* C36F00 802409D0 46020000 */ add.s $f0, $f0, $f2 .L802409D4: /* C36F04 802409D4 4616A002 */ mul.s $f0, $f20, $f22 -/* C36F08 802409D8 00000000 */ nop +/* C36F08 802409D8 00000000 */ nop /* C36F0C 802409DC 4600D000 */ add.s $f0, $f26, $f0 .L802409E0: /* C36F10 802409E0 E600003C */ swc1 $f0, 0x3c($s0) /* C36F14 802409E4 8E220074 */ lw $v0, 0x74($s1) /* C36F18 802409E8 2442000A */ addiu $v0, $v0, 0xa /* C36F1C 802409EC 44826000 */ mtc1 $v0, $f12 -/* C36F20 802409F0 00000000 */ nop +/* C36F20 802409F0 00000000 */ nop /* C36F24 802409F4 0C00A6C9 */ jal clamp_angle /* C36F28 802409F8 46806320 */ cvt.s.w $f12, $f12 /* C36F2C 802409FC 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_80240898_C36DC8 /* C36F40 80240A10 860200A8 */ lh $v0, 0xa8($s0) /* C36F44 80240A14 C600003C */ lwc1 $f0, 0x3c($s0) /* C36F48 80240A18 44821000 */ mtc1 $v0, $f2 -/* C36F4C 80240A1C 00000000 */ nop +/* C36F4C 80240A1C 00000000 */ nop /* C36F50 80240A20 468010A0 */ cvt.s.w $f2, $f2 /* C36F54 80240A24 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C36F58 80240A28 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_80240898_C36DC8 /* C36F74 80240A44 46240000 */ add.d $f0, $f0, $f4 /* C36F78 80240A48 460010A1 */ cvt.d.s $f2, $f2 /* C36F7C 80240A4C 4620103C */ c.lt.d $f2, $f0 -/* C36F80 80240A50 00000000 */ nop +/* C36F80 80240A50 00000000 */ nop /* C36F84 80240A54 4500002E */ bc1f .L80240B10 /* C36F88 80240A58 0280202D */ daddu $a0, $s4, $zero /* C36F8C 80240A5C 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_80240898_C36DC8 /* C36FCC 80240A9C 3C01C1A0 */ lui $at, 0xc1a0 /* C36FD0 80240AA0 44812000 */ mtc1 $at, $f4 /* C36FD4 80240AA4 44834000 */ mtc1 $v1, $f8 -/* C36FD8 80240AA8 00000000 */ nop +/* C36FD8 80240AA8 00000000 */ nop /* C36FDC 80240AAC 46804220 */ cvt.s.w $f8, $f8 /* C36FE0 80240AB0 44074000 */ mfc1 $a3, $f8 /* C36FE4 80240AB4 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_80240898_C36DC8 .L80240B10: /* C37040 80240B10 8602008C */ lh $v0, 0x8c($s0) /* C37044 80240B14 14400025 */ bnez $v0, .L80240BAC -/* C37048 80240B18 00000000 */ nop +/* C37048 80240B18 00000000 */ nop /* C3704C 80240B1C 8602008E */ lh $v0, 0x8e($s0) /* C37050 80240B20 1C400022 */ bgtz $v0, .L80240BAC -/* C37054 80240B24 00000000 */ nop +/* C37054 80240B24 00000000 */ nop /* C37058 80240B28 8E620074 */ lw $v0, 0x74($s3) /* C3705C 80240B2C 2442FFFF */ addiu $v0, $v0, -1 /* C37060 80240B30 1840001D */ blez $v0, .L80240BA8 @@ -183,7 +183,7 @@ glabel func_80240898_C36DC8 /* C3706C 80240B3C 9442002A */ lhu $v0, 0x2a($v0) /* C37070 80240B40 30420010 */ andi $v0, $v0, 0x10 /* C37074 80240B44 14400007 */ bnez $v0, .L80240B64 -/* C37078 80240B48 00000000 */ nop +/* C37078 80240B48 00000000 */ nop /* C3707C 80240B4C C600000C */ lwc1 $f0, 0xc($s0) /* C37080 80240B50 3C014334 */ lui $at, 0x4334 /* C37084 80240B54 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240CC0_C371F0.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240CC0_C371F0.s index c2fdef28b1..f1f59cf01f 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240CC0_C371F0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240CC0_C371F0.s @@ -60,18 +60,18 @@ glabel func_80240CC0_C371F0 /* C372C8 80240D98 C6200038 */ lwc1 $f0, 0x38($s1) /* C372CC 80240D9C 4600018D */ trunc.w.s $f6, $f0 /* C372D0 80240DA0 44023000 */ mfc1 $v0, $f6 -/* C372D4 80240DA4 00000000 */ nop +/* C372D4 80240DA4 00000000 */ nop /* C372D8 80240DA8 A6420010 */ sh $v0, 0x10($s2) /* C372DC 80240DAC C620003C */ lwc1 $f0, 0x3c($s1) /* C372E0 80240DB0 4600018D */ trunc.w.s $f6, $f0 /* C372E4 80240DB4 44023000 */ mfc1 $v0, $f6 -/* C372E8 80240DB8 00000000 */ nop +/* C372E8 80240DB8 00000000 */ nop /* C372EC 80240DBC A6420012 */ sh $v0, 0x12($s2) /* C372F0 80240DC0 C6200040 */ lwc1 $f0, 0x40($s1) /* C372F4 80240DC4 A2430007 */ sb $v1, 7($s2) /* C372F8 80240DC8 4600018D */ trunc.w.s $f6, $f0 /* C372FC 80240DCC 44023000 */ mfc1 $v0, $f6 -/* C37300 80240DD0 00000000 */ nop +/* C37300 80240DD0 00000000 */ nop /* C37304 80240DD4 A6420014 */ sh $v0, 0x14($s2) .L80240DD8: /* C37308 80240DD8 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240E58_C37388.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240E58_C37388.s index 4c56e68b9b..f7daf15c39 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240E58_C37388.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240E58_C37388.s @@ -42,9 +42,9 @@ glabel func_80240E58_C37388 /* C3741C 80240EEC 44801800 */ mtc1 $zero, $f3 /* C37420 80240EF0 46002021 */ cvt.d.s $f0, $f4 /* C37424 80240EF4 4620103E */ c.le.d $f2, $f0 -/* C37428 80240EF8 00000000 */ nop +/* C37428 80240EF8 00000000 */ nop /* C3742C 80240EFC 45000030 */ bc1f .L80240FC0 -/* C37430 80240F00 00000000 */ nop +/* C37430 80240F00 00000000 */ nop /* C37434 80240F04 C600003C */ lwc1 $f0, 0x3c($s0) /* C37438 80240F08 46040000 */ add.s $f0, $f0, $f4 /* C3743C 80240F0C E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_80240E58_C37388 /* C3749C 80240F6C 27A70020 */ addiu $a3, $sp, 0x20 .L80240F70: /* C374A0 80240F70 1040000B */ beqz $v0, .L80240FA0 -/* C374A4 80240F74 00000000 */ nop +/* C374A4 80240F74 00000000 */ nop /* C374A8 80240F78 C7A0001C */ lwc1 $f0, 0x1c($sp) /* C374AC 80240F7C 46140080 */ add.s $f2, $f0, $f20 /* C374B0 80240F80 C600003C */ lwc1 $f0, 0x3c($s0) /* C374B4 80240F84 4600103E */ c.le.s $f2, $f0 -/* C374B8 80240F88 00000000 */ nop +/* C374B8 80240F88 00000000 */ nop /* C374BC 80240F8C 4500008D */ bc1f .L802411C4 -/* C374C0 80240F90 00000000 */ nop +/* C374C0 80240F90 00000000 */ nop /* C374C4 80240F94 E602003C */ swc1 $f2, 0x3c($s0) /* C374C8 80240F98 08090471 */ j .L802411C4 /* C374CC 80240F9C AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_80240E58_C37388 /* C374D0 80240FA0 C602003C */ lwc1 $f2, 0x3c($s0) /* C374D4 80240FA4 C6000064 */ lwc1 $f0, 0x64($s0) /* C374D8 80240FA8 4602003E */ c.le.s $f0, $f2 -/* C374DC 80240FAC 00000000 */ nop +/* C374DC 80240FAC 00000000 */ nop /* C374E0 80240FB0 45030084 */ bc1tl .L802411C4 /* C374E4 80240FB4 AE400070 */ sw $zero, 0x70($s2) /* C374E8 80240FB8 08090471 */ j .L802411C4 -/* C374EC 80240FBC 00000000 */ nop +/* C374EC 80240FBC 00000000 */ nop .L80240FC0: /* C374F0 80240FC0 4622003C */ c.lt.d $f0, $f2 -/* C374F4 80240FC4 00000000 */ nop +/* C374F4 80240FC4 00000000 */ nop /* C374F8 80240FC8 4500007E */ bc1f .L802411C4 -/* C374FC 80240FCC 00000000 */ nop +/* C374FC 80240FCC 00000000 */ nop /* C37500 80240FD0 9602008E */ lhu $v0, 0x8e($s0) /* C37504 80240FD4 24420001 */ addiu $v0, $v0, 1 /* C37508 80240FD8 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_80240E58_C37388 /* C37514 80240FE4 00021403 */ sra $v0, $v0, 0x10 /* C37518 80240FE8 0043102A */ slt $v0, $v0, $v1 /* C3751C 80240FEC 14400026 */ bnez $v0, .L80241088 -/* C37520 80240FF0 00000000 */ nop +/* C37520 80240FF0 00000000 */ nop /* C37524 80240FF4 C60C0038 */ lwc1 $f12, 0x38($s0) /* C37528 80240FF8 C60E0040 */ lwc1 $f14, 0x40($s0) /* C3752C 80240FFC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_80240E58_C37388 /* C37558 80241028 8E62001C */ lw $v0, 0x1c($s3) /* C3755C 8024102C 46001005 */ abs.s $f0, $f2 /* C37560 80241030 44822000 */ mtc1 $v0, $f4 -/* C37564 80241034 00000000 */ nop +/* C37564 80241034 00000000 */ nop /* C37568 80241038 46802120 */ cvt.s.w $f4, $f4 /* C3756C 8024103C 4600203C */ c.lt.s $f4, $f0 -/* C37570 80241040 00000000 */ nop +/* C37570 80241040 00000000 */ nop /* C37574 80241044 4500000D */ bc1f .L8024107C -/* C37578 80241048 00000000 */ nop +/* C37578 80241048 00000000 */ nop /* C3757C 8024104C 44800000 */ mtc1 $zero, $f0 /* C37580 80241050 C614000C */ lwc1 $f20, 0xc($s0) /* C37584 80241054 4600103C */ c.lt.s $f2, $f0 -/* C37588 80241058 00000000 */ nop +/* C37588 80241058 00000000 */ nop /* C3758C 8024105C 45000006 */ bc1f .L80241078 /* C37590 80241060 00021023 */ negu $v0, $v0 /* C37594 80241064 44820000 */ mtc1 $v0, $f0 -/* C37598 80241068 00000000 */ nop +/* C37598 80241068 00000000 */ nop /* C3759C 8024106C 46800020 */ cvt.s.w $f0, $f0 /* C375A0 80241070 0809041F */ j .L8024107C /* C375A4 80241074 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_80240E58_C37388 /* C375CC 8024109C C600001C */ lwc1 $f0, 0x1c($s0) /* C375D0 802410A0 46001080 */ add.s $f2, $f2, $f0 /* C375D4 802410A4 4616103C */ c.lt.s $f2, $f22 -/* C375D8 802410A8 00000000 */ nop +/* C375D8 802410A8 00000000 */ nop /* C375DC 802410AC 45020045 */ bc1fl .L802411C4 /* C375E0 802410B0 E602003C */ swc1 $f2, 0x3c($s0) /* C375E4 802410B4 08090470 */ j .L802411C0 @@ -169,7 +169,7 @@ glabel func_80240E58_C37388 /* C375FC 802410CC C600001C */ lwc1 $f0, 0x1c($s0) /* C37600 802410D0 C604003C */ lwc1 $f4, 0x3c($s0) /* C37604 802410D4 44821000 */ mtc1 $v0, $f2 -/* C37608 802410D8 00000000 */ nop +/* C37608 802410D8 00000000 */ nop /* C3760C 802410DC 468010A0 */ cvt.s.w $f2, $f2 /* C37610 802410E0 46000005 */ abs.s $f0, $f0 /* C37614 802410E4 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_80240E58_C37388 /* C37650 80241120 0C0372DF */ jal func_800DCB7C /* C37654 80241124 27A70020 */ addiu $a3, $sp, 0x20 /* C37658 80241128 10400015 */ beqz $v0, .L80241180 -/* C3765C 8024112C 00000000 */ nop +/* C3765C 8024112C 00000000 */ nop /* C37660 80241130 860200A8 */ lh $v0, 0xa8($s0) /* C37664 80241134 C604001C */ lwc1 $f4, 0x1c($s0) /* C37668 80241138 44820000 */ mtc1 $v0, $f0 -/* C3766C 8024113C 00000000 */ nop +/* C3766C 8024113C 00000000 */ nop /* C37670 80241140 46800020 */ cvt.s.w $f0, $f0 /* C37674 80241144 46002085 */ abs.s $f2, $f4 /* C37678 80241148 46020000 */ add.s $f0, $f0, $f2 /* C3767C 8024114C C7A20024 */ lwc1 $f2, 0x24($sp) /* C37680 80241150 4600103E */ c.le.s $f2, $f0 -/* C37684 80241154 00000000 */ nop +/* C37684 80241154 00000000 */ nop /* C37688 80241158 45000005 */ bc1f .L80241170 -/* C3768C 8024115C 00000000 */ nop +/* C3768C 8024115C 00000000 */ nop /* C37690 80241160 C7A0001C */ lwc1 $f0, 0x1c($sp) /* C37694 80241164 AE00001C */ sw $zero, 0x1c($s0) /* C37698 80241168 08090471 */ j .L802411C4 @@ -217,13 +217,13 @@ glabel func_80240E58_C37388 /* C376B4 80241184 860200A8 */ lh $v0, 0xa8($s0) /* C376B8 80241188 46163081 */ sub.s $f2, $f6, $f22 /* C376BC 8024118C 44820000 */ mtc1 $v0, $f0 -/* C376C0 80241190 00000000 */ nop +/* C376C0 80241190 00000000 */ nop /* C376C4 80241194 46800020 */ cvt.s.w $f0, $f0 /* C376C8 80241198 46001080 */ add.s $f2, $f2, $f0 /* C376CC 8024119C C604001C */ lwc1 $f4, 0x1c($s0) /* C376D0 802411A0 46002005 */ abs.s $f0, $f4 /* C376D4 802411A4 4602003C */ c.lt.s $f0, $f2 -/* C376D8 802411A8 00000000 */ nop +/* C376D8 802411A8 00000000 */ nop /* C376DC 802411AC 45020005 */ bc1fl .L802411C4 /* C376E0 802411B0 AE00001C */ sw $zero, 0x1c($s0) /* C376E4 802411B4 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802411E8_C37718.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802411E8_C37718.s index 67916706c7..f68e6f193b 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802411E8_C37718.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802411E8_C37718.s @@ -49,15 +49,15 @@ glabel func_802411E8_C37718 /* C377C0 80241290 44802000 */ mtc1 $zero, $f4 /* C377C4 80241294 460010A1 */ cvt.d.s $f2, $f2 /* C377C8 80241298 46241082 */ mul.d $f2, $f2, $f4 -/* C377CC 8024129C 00000000 */ nop +/* C377CC 8024129C 00000000 */ nop /* C377D0 802412A0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* C377D4 802412A4 46000021 */ cvt.d.s $f0, $f0 /* C377D8 802412A8 46240002 */ mul.d $f0, $f0, $f4 -/* C377DC 802412AC 00000000 */ nop +/* C377DC 802412AC 00000000 */ nop /* C377E0 802412B0 3C013FE0 */ lui $at, 0x3fe0 /* C377E4 802412B4 44812800 */ mtc1 $at, $f5 /* C377E8 802412B8 44802000 */ mtc1 $zero, $f4 -/* C377EC 802412BC 00000000 */ nop +/* C377EC 802412BC 00000000 */ nop /* C377F0 802412C0 46241080 */ add.d $f2, $f2, $f4 /* C377F4 802412C4 AE000074 */ sw $zero, 0x74($s0) /* C377F8 802412C8 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s index d60ba2100b..ad5257e9c5 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s @@ -54,7 +54,7 @@ glabel func_8024130C_C3783C /* C378FC 802413CC 8E4300B0 */ lw $v1, 0xb0($s2) /* C37900 802413D0 30620004 */ andi $v0, $v1, 4 /* C37904 802413D4 10400007 */ beqz $v0, .L802413F4 -/* C37908 802413D8 00000000 */ nop +/* C37908 802413D8 00000000 */ nop /* C3790C 802413DC 824200B4 */ lb $v0, 0xb4($s2) /* C37910 802413E0 1440003C */ bnez $v0, .L802414D4 /* C37914 802413E4 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_8024130C_C3783C /* C37928 802413F8 2C62000F */ sltiu $v0, $v1, 0xf /* C3792C 802413FC 10400034 */ beqz $v0, .L802414D0 /* C37930 80241400 00031080 */ sll $v0, $v1, 2 -/* C37934 80241404 3C018024 */ lui $at, %hi(D_80244408) +/* C37934 80241404 3C018024 */ lui $at, %hi(jtbl_80244408_C3A938) /* C37938 80241408 00220821 */ addu $at, $at, $v0 -/* C3793C 8024140C 8C224408 */ lw $v0, %lo(D_80244408)($at) +/* C3793C 8024140C 8C224408 */ lw $v0, %lo(jtbl_80244408_C3A938)($at) /* C37940 80241410 00400008 */ jr $v0 -/* C37944 80241414 00000000 */ nop +/* C37944 80241414 00000000 */ nop +glabel L80241418_C37948 /* C37948 80241418 0280202D */ daddu $a0, $s4, $zero /* C3794C 8024141C 0200282D */ daddu $a1, $s0, $zero /* C37950 80241420 0C090000 */ jal func_80240000_C36530 /* C37954 80241424 0260302D */ daddu $a2, $s3, $zero +glabel L80241428_C37958 /* C37958 80241428 0280202D */ daddu $a0, $s4, $zero /* C3795C 8024142C 0200282D */ daddu $a1, $s0, $zero /* C37960 80241430 0C09006C */ jal func_802401B0_C366E0 /* C37964 80241434 0260302D */ daddu $a2, $s3, $zero /* C37968 80241438 08090535 */ j .L802414D4 /* C3796C 8024143C 0000102D */ daddu $v0, $zero, $zero +glabel L80241440_C37970 /* C37970 80241440 0280202D */ daddu $a0, $s4, $zero /* C37974 80241444 0200282D */ daddu $a1, $s0, $zero /* C37978 80241448 0C0901F6 */ jal dgb_04_UnkNpcAIFunc1 /* C3797C 8024144C 0260302D */ daddu $a2, $s3, $zero +glabel L80241450_C37980 /* C37980 80241450 0280202D */ daddu $a0, $s4, $zero /* C37984 80241454 0200282D */ daddu $a1, $s0, $zero /* C37988 80241458 0C090226 */ jal func_80240898_C36DC8 /* C3798C 8024145C 0260302D */ daddu $a2, $s3, $zero /* C37990 80241460 08090535 */ j .L802414D4 /* C37994 80241464 0000102D */ daddu $v0, $zero, $zero +glabel L80241468_C37998 /* C37998 80241468 0280202D */ daddu $a0, $s4, $zero /* C3799C 8024146C 0200282D */ daddu $a1, $s0, $zero /* C379A0 80241470 0C0902F7 */ jal dgb_04_UnkNpcAIFunc2 /* C379A4 80241474 0260302D */ daddu $a2, $s3, $zero +glabel L80241478_C379A8 /* C379A8 80241478 0280202D */ daddu $a0, $s4, $zero /* C379AC 8024147C 0200282D */ daddu $a1, $s0, $zero /* C379B0 80241480 0C090315 */ jal func_80240C54_C37184 /* C379B4 80241484 0260302D */ daddu $a2, $s3, $zero /* C379B8 80241488 08090535 */ j .L802414D4 /* C379BC 8024148C 0000102D */ daddu $v0, $zero, $zero +glabel L80241490_C379C0 /* C379C0 80241490 0280202D */ daddu $a0, $s4, $zero /* C379C4 80241494 0200282D */ daddu $a1, $s0, $zero /* C379C8 80241498 0C090330 */ jal func_80240CC0_C371F0 /* C379CC 8024149C 0260302D */ daddu $a2, $s3, $zero /* C379D0 802414A0 08090535 */ j .L802414D4 /* C379D4 802414A4 0000102D */ daddu $v0, $zero, $zero +glabel L802414A8_C379D8 /* C379D8 802414A8 0280202D */ daddu $a0, $s4, $zero /* C379DC 802414AC 0200282D */ daddu $a1, $s0, $zero /* C379E0 802414B0 0C09037D */ jal dgb_04_UnkNpcAIFunc3 /* C379E4 802414B4 0260302D */ daddu $a2, $s3, $zero /* C379E8 802414B8 08090535 */ j .L802414D4 /* C379EC 802414BC 0000102D */ daddu $v0, $zero, $zero +glabel L802414C0_C379F0 /* C379F0 802414C0 0280202D */ daddu $a0, $s4, $zero /* C379F4 802414C4 0200282D */ daddu $a1, $s0, $zero /* C379F8 802414C8 0C090396 */ jal func_80240E58_C37388 /* C379FC 802414CC 0260302D */ daddu $a2, $s3, $zero .L802414D0: +glabel L802414D0_C37A00 /* C37A00 802414D0 0000102D */ daddu $v0, $zero, $zero .L802414D4: /* C37A04 802414D4 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802414F8_C37A28.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802414F8_C37A28.s index 60b602905b..5726af57d6 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802414F8_C37A28.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802414F8_C37A28.s @@ -57,20 +57,20 @@ glabel func_802414F8_C37A28 /* C37AF8 802415C8 8E22001C */ lw $v0, 0x1c($s1) /* C37AFC 802415CC 46001005 */ abs.s $f0, $f2 /* C37B00 802415D0 44822000 */ mtc1 $v0, $f4 -/* C37B04 802415D4 00000000 */ nop +/* C37B04 802415D4 00000000 */ nop /* C37B08 802415D8 46802120 */ cvt.s.w $f4, $f4 /* C37B0C 802415DC 4600203C */ c.lt.s $f4, $f0 -/* C37B10 802415E0 00000000 */ nop +/* C37B10 802415E0 00000000 */ nop /* C37B14 802415E4 4500000D */ bc1f .L8024161C -/* C37B18 802415E8 00000000 */ nop +/* C37B18 802415E8 00000000 */ nop /* C37B1C 802415EC 44800000 */ mtc1 $zero, $f0 /* C37B20 802415F0 C614000C */ lwc1 $f20, 0xc($s0) /* C37B24 802415F4 4600103C */ c.lt.s $f2, $f0 -/* C37B28 802415F8 00000000 */ nop +/* C37B28 802415F8 00000000 */ nop /* C37B2C 802415FC 45000006 */ bc1f .L80241618 /* C37B30 80241600 00021023 */ negu $v0, $v0 /* C37B34 80241604 44820000 */ mtc1 $v0, $f0 -/* C37B38 80241608 00000000 */ nop +/* C37B38 80241608 00000000 */ nop /* C37B3C 8024160C 46800020 */ cvt.s.w $f0, $f0 /* C37B40 80241610 08090587 */ j .L8024161C /* C37B44 80241614 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241650_C37B80.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241650_C37B80.s index 8503a37bef..47b96ce5b1 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241650_C37B80.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241650_C37B80.s @@ -41,10 +41,10 @@ glabel func_80241650_C37B80 /* C37C10 802416E0 44802000 */ mtc1 $zero, $f4 /* C37C14 802416E4 460010A1 */ cvt.d.s $f2, $f2 /* C37C18 802416E8 46241082 */ mul.d $f2, $f2, $f4 -/* C37C1C 802416EC 00000000 */ nop +/* C37C1C 802416EC 00000000 */ nop /* C37C20 802416F0 46000021 */ cvt.d.s $f0, $f0 /* C37C24 802416F4 4622003E */ c.le.d $f0, $f2 -/* C37C28 802416F8 00000000 */ nop +/* C37C28 802416F8 00000000 */ nop /* C37C2C 802416FC 45000003 */ bc1f .L8024170C /* C37C30 80241700 2402000E */ addiu $v0, $zero, 0xe /* C37C34 80241704 080905CD */ j .L80241734 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8_C37D28.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8_C37D28.s index 5710b49d24..7987982d89 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8_C37D28.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8_C37D28.s @@ -73,7 +73,7 @@ glabel func_802417F8_C37D28 /* C37E30 80241900 344260B7 */ ori $v0, $v0, 0x60b7 /* C37E34 80241904 4600020D */ trunc.w.s $f8, $f0 /* C37E38 80241908 44044000 */ mfc1 $a0, $f8 -/* C37E3C 8024190C 00000000 */ nop +/* C37E3C 8024190C 00000000 */ nop /* C37E40 80241910 00820018 */ mult $a0, $v0 /* C37E44 80241914 00041FC3 */ sra $v1, $a0, 0x1f /* C37E48 80241918 00004010 */ mfhi $t0 @@ -91,9 +91,9 @@ glabel func_802417F8_C37D28 /* C37E78 80241948 00042403 */ sra $a0, $a0, 0x10 /* C37E7C 8024194C 3C014260 */ lui $at, 0x4260 /* C37E80 80241950 44811000 */ mtc1 $at, $f2 -/* C37E84 80241954 00000000 */ nop +/* C37E84 80241954 00000000 */ nop /* C37E88 80241958 46020002 */ mul.s $f0, $f0, $f2 -/* C37E8C 8024195C 00000000 */ nop +/* C37E8C 8024195C 00000000 */ nop /* C37E90 80241960 24050006 */ addiu $a1, $zero, 6 /* C37E94 80241964 3C01437F */ lui $at, 0x437f /* C37E98 80241968 44811000 */ mtc1 $at, $f2 @@ -103,7 +103,7 @@ glabel func_802417F8_C37D28 /* C37EA8 80241978 AFA00018 */ sw $zero, 0x18($sp) /* C37EAC 8024197C 4600120D */ trunc.w.s $f8, $f2 /* C37EB0 80241980 44064000 */ mfc1 $a2, $f8 -/* C37EB4 80241984 00000000 */ nop +/* C37EB4 80241984 00000000 */ nop /* C37EB8 80241988 AFA60010 */ sw $a2, 0x10($sp) /* C37EBC 8024198C 8E440024 */ lw $a0, 0x24($s2) /* C37EC0 80241990 0C0B7A25 */ jal func_802DE894 @@ -134,7 +134,7 @@ glabel func_802417F8_C37D28 /* C37F24 802419F4 46000005 */ abs.s $f0, $f0 /* C37F28 802419F8 46000021 */ cvt.d.s $f0, $f0 /* C37F2C 802419FC 4620103C */ c.lt.d $f2, $f0 -/* C37F30 80241A00 00000000 */ nop +/* C37F30 80241A00 00000000 */ nop /* C37F34 80241A04 45000008 */ bc1f .L80241A28 /* C37F38 80241A08 3C03FFDF */ lui $v1, 0xffdf /* C37F3C 80241A0C 3C018024 */ lui $at, %hi(D_80244450) @@ -156,9 +156,9 @@ glabel func_802417F8_C37D28 /* C37F78 80241A48 10620009 */ beq $v1, $v0, .L80241A70 /* C37F7C 80241A4C 24020010 */ addiu $v0, $zero, 0x10 /* C37F80 80241A50 0C03805E */ jal disable_player_input -/* C37F84 80241A54 00000000 */ nop +/* C37F84 80241A54 00000000 */ nop /* C37F88 80241A58 0C03BD8A */ jal func_800EF628 -/* C37F8C 80241A5C 00000000 */ nop +/* C37F8C 80241A5C 00000000 */ nop /* C37F90 80241A60 24020014 */ addiu $v0, $zero, 0x14 /* C37F94 80241A64 0809069C */ j .L80241A70 /* C37F98 80241A68 A640008E */ sh $zero, 0x8e($s2) diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241A94_C37FC4.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241A94_C37FC4.s index 3d58b96168..d8c4fb131d 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241A94_C37FC4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241A94_C37FC4.s @@ -27,7 +27,7 @@ glabel func_80241A94_C37FC4 /* C3801C 80241AEC 8E02006C */ lw $v0, 0x6c($s0) /* C38020 80241AF0 30421000 */ andi $v0, $v0, 0x1000 /* C38024 80241AF4 10400008 */ beqz $v0, .L80241B18 -/* C38028 80241AF8 00000000 */ nop +/* C38028 80241AF8 00000000 */ nop /* C3802C 80241AFC 3C048000 */ lui $a0, 0x8000 /* C38030 80241B00 0C05271B */ jal stop_sound /* C38034 80241B04 34840011 */ ori $a0, $a0, 0x11 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241B4C_C3807C.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241B4C_C3807C.s index b42710073f..5a1cb0e92f 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241B4C_C3807C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241B4C_C3807C.s @@ -49,9 +49,9 @@ glabel func_80241B4C_C3807C /* C3812C 80241BFC 46140000 */ add.s $f0, $f0, $f20 /* C38130 80241C00 C622003C */ lwc1 $f2, 0x3c($s1) /* C38134 80241C04 4600103C */ c.lt.s $f2, $f0 -/* C38138 80241C08 00000000 */ nop +/* C38138 80241C08 00000000 */ nop /* C3813C 80241C0C 45010028 */ bc1t .L80241CB0 -/* C38140 80241C10 00000000 */ nop +/* C38140 80241C10 00000000 */ nop /* C38144 80241C14 8E0200D0 */ lw $v0, 0xd0($s0) /* C38148 80241C18 C62C0038 */ lwc1 $f12, 0x38($s1) /* C3814C 80241C1C C62E0040 */ lwc1 $f14, 0x40($s1) @@ -76,7 +76,7 @@ glabel func_80241B4C_C3807C /* C38198 80241C68 3C01C1A0 */ lui $at, 0xc1a0 /* C3819C 80241C6C 44813000 */ mtc1 $at, $f6 /* C381A0 80241C70 44825000 */ mtc1 $v0, $f10 -/* C381A4 80241C74 00000000 */ nop +/* C381A4 80241C74 00000000 */ nop /* C381A8 80241C78 468052A0 */ cvt.s.w $f10, $f10 /* C381AC 80241C7C 46141080 */ add.s $f2, $f2, $f20 /* C381B0 80241C80 44075000 */ mfc1 $a3, $f10 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D14_C38244.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D14_C38244.s index 8e623f7ee0..0cfe84cd7a 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D14_C38244.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D14_C38244.s @@ -26,9 +26,9 @@ glabel func_80241D14_C38244 /* C38298 80241D68 A480008E */ sh $zero, 0x8e($a0) .L80241D6C: /* C3829C 80241D6C 0C038069 */ jal enable_player_input -/* C382A0 80241D70 00000000 */ nop +/* C382A0 80241D70 00000000 */ nop /* C382A4 80241D74 0C03BD80 */ jal func_800EF600 -/* C382A8 80241D78 00000000 */ nop +/* C382A8 80241D78 00000000 */ nop /* C382AC 80241D7C 24020010 */ addiu $v0, $zero, 0x10 .L80241D80: /* C382B0 80241D80 AE020070 */ sw $v0, 0x70($s0) diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D94_C382C4.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D94_C382C4.s index ce8a6b5e84..792eba34c5 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D94_C382C4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D94_C382C4.s @@ -33,7 +33,7 @@ glabel func_80241D94_C382C4 /* C38334 80241E04 44801000 */ mtc1 $zero, $f2 /* C38338 80241E08 46000021 */ cvt.d.s $f0, $f0 /* C3833C 80241E0C 46220002 */ mul.d $f0, $f0, $f2 -/* C38340 80241E10 00000000 */ nop +/* C38340 80241E10 00000000 */ nop /* C38344 80241E14 2402001E */ addiu $v0, $zero, 0x1e /* C38348 80241E18 4620010D */ trunc.w.d $f4, $f0 /* C3834C 80241E1C E604007C */ swc1 $f4, 0x7c($s0) diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241E3C_C3836C.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241E3C_C3836C.s index 108c44cec6..09c2c7ee24 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241E3C_C3836C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241E3C_C3836C.s @@ -60,23 +60,23 @@ glabel func_80241E3C_C3836C /* C38448 80241F18 0C0372DF */ jal func_800DCB7C /* C3844C 80241F1C 46000506 */ mov.s $f20, $f0 /* C38450 80241F20 10400007 */ beqz $v0, .L80241F40 -/* C38454 80241F24 00000000 */ nop +/* C38454 80241F24 00000000 */ nop /* C38458 80241F28 4616A082 */ mul.s $f2, $f20, $f22 -/* C3845C 80241F2C 00000000 */ nop +/* C3845C 80241F2C 00000000 */ nop /* C38460 80241F30 C7A0002C */ lwc1 $f0, 0x2c($sp) /* C38464 80241F34 461A0000 */ add.s $f0, $f0, $f26 /* C38468 80241F38 080907D3 */ j .L80241F4C /* C3846C 80241F3C 46020000 */ add.s $f0, $f0, $f2 .L80241F40: /* C38470 80241F40 4616A002 */ mul.s $f0, $f20, $f22 -/* C38474 80241F44 00000000 */ nop +/* C38474 80241F44 00000000 */ nop /* C38478 80241F48 4600C000 */ add.s $f0, $f24, $f0 .L80241F4C: /* C3847C 80241F4C E620003C */ swc1 $f0, 0x3c($s1) /* C38480 80241F50 8E020074 */ lw $v0, 0x74($s0) /* C38484 80241F54 2442000C */ addiu $v0, $v0, 0xc /* C38488 80241F58 44826000 */ mtc1 $v0, $f12 -/* C3848C 80241F5C 00000000 */ nop +/* C3848C 80241F5C 00000000 */ nop /* C38490 80241F60 0C00A6C9 */ jal clamp_angle /* C38494 80241F64 46806320 */ cvt.s.w $f12, $f12 /* C38498 80241F68 4600020D */ trunc.w.s $f8, $f0 @@ -92,11 +92,11 @@ glabel func_80241E3C_C3836C /* C384C0 80241F90 44802000 */ mtc1 $zero, $f4 /* C384C4 80241F94 460010A1 */ cvt.d.s $f2, $f2 /* C384C8 80241F98 46241082 */ mul.d $f2, $f2, $f4 -/* C384CC 80241F9C 00000000 */ nop +/* C384CC 80241F9C 00000000 */ nop /* C384D0 80241FA0 C6600010 */ lwc1 $f0, 0x10($s3) /* C384D4 80241FA4 46000021 */ cvt.d.s $f0, $f0 /* C384D8 80241FA8 46240002 */ mul.d $f0, $f0, $f4 -/* C384DC 80241FAC 00000000 */ nop +/* C384DC 80241FAC 00000000 */ nop /* C384E0 80241FB0 0280202D */ daddu $a0, $s4, $zero /* C384E4 80241FB4 462010A0 */ cvt.s.d $f2, $f2 /* C384E8 80241FB8 46200020 */ cvt.s.d $f0, $f0 @@ -118,7 +118,7 @@ glabel func_80241E3C_C3836C /* C38528 80241FF8 3C01C1A0 */ lui $at, 0xc1a0 /* C3852C 80241FFC 44812000 */ mtc1 $at, $f4 /* C38530 80242000 44834000 */ mtc1 $v1, $f8 -/* C38534 80242004 00000000 */ nop +/* C38534 80242004 00000000 */ nop /* C38538 80242008 46804220 */ cvt.s.w $f8, $f8 /* C3853C 8024200C 44074000 */ mfc1 $a3, $f8 /* C38540 80242010 27A20038 */ addiu $v0, $sp, 0x38 @@ -143,7 +143,7 @@ glabel func_80241E3C_C3836C /* C38584 80242054 AE420074 */ sw $v0, 0x74($s2) /* C38588 80242058 8622008C */ lh $v0, 0x8c($s1) /* C3858C 8024205C 14400031 */ bnez $v0, .L80242124 -/* C38590 80242060 00000000 */ nop +/* C38590 80242060 00000000 */ nop /* C38594 80242064 C62C0038 */ lwc1 $f12, 0x38($s1) /* C38598 80242068 8E0200D0 */ lw $v0, 0xd0($s0) /* C3859C 8024206C C62E0040 */ lwc1 $f14, 0x40($s1) @@ -154,7 +154,7 @@ glabel func_80241E3C_C3836C /* C385B0 80242080 46804220 */ cvt.s.w $f8, $f8 /* C385B4 80242084 44074000 */ mfc1 $a3, $f8 /* C385B8 80242088 0C00A720 */ jal atan2 -/* C385BC 8024208C 00000000 */ nop +/* C385BC 8024208C 00000000 */ nop /* C385C0 80242090 8E250018 */ lw $a1, 0x18($s1) /* C385C4 80242094 44060000 */ mfc1 $a2, $f0 /* C385C8 80242098 0220202D */ daddu $a0, $s1, $zero @@ -170,11 +170,11 @@ glabel func_80241E3C_C3836C /* C385F0 802420C0 46804220 */ cvt.s.w $f8, $f8 /* C385F4 802420C4 44074000 */ mfc1 $a3, $f8 /* C385F8 802420C8 0C00A7B5 */ jal dist2D -/* C385FC 802420CC 00000000 */ nop +/* C385FC 802420CC 00000000 */ nop /* C38600 802420D0 C6220018 */ lwc1 $f2, 0x18($s1) /* C38604 802420D4 46021080 */ add.s $f2, $f2, $f2 /* C38608 802420D8 4602003E */ c.le.s $f0, $f2 -/* C3860C 802420DC 00000000 */ nop +/* C3860C 802420DC 00000000 */ nop /* C38610 802420E0 45000010 */ bc1f .L80242124 /* C38614 802420E4 E7A00034 */ swc1 $f0, 0x34($sp) /* C38618 802420E8 0C00A67F */ jal rand_int diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s index 16ee101d8a..4221207890 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s @@ -54,11 +54,12 @@ glabel func_80242154_C38684 /* C38744 80242214 2C620020 */ sltiu $v0, $v1, 0x20 /* C38748 80242218 10400060 */ beqz $v0, .L8024239C /* C3874C 8024221C 00031080 */ sll $v0, $v1, 2 -/* C38750 80242220 3C018024 */ lui $at, %hi(D_80244458) +/* C38750 80242220 3C018024 */ lui $at, %hi(jtbl_80244458_C3A988) /* C38754 80242224 00220821 */ addu $at, $at, $v0 -/* C38758 80242228 8C224458 */ lw $v0, %lo(D_80244458)($at) +/* C38758 80242228 8C224458 */ lw $v0, %lo(jtbl_80244458_C3A988)($at) /* C3875C 8024222C 00400008 */ jr $v0 -/* C38760 80242230 00000000 */ nop +/* C38760 80242230 00000000 */ nop +glabel L80242234_C38764 /* C38764 80242234 0280202D */ daddu $a0, $s4, $zero /* C38768 80242238 0220282D */ daddu $a1, $s1, $zero /* C3876C 8024223C 0C090000 */ jal func_80240000_C36530 @@ -71,16 +72,19 @@ glabel func_80242154_C38684 /* C38788 80242258 8EA40024 */ lw $a0, 0x24($s5) /* C3878C 8024225C 0C0B7A25 */ jal func_802DE894 /* C38790 80242260 00A0382D */ daddu $a3, $a1, $zero +glabel L80242264_C38794 /* C38794 80242264 0280202D */ daddu $a0, $s4, $zero /* C38798 80242268 0220282D */ daddu $a1, $s1, $zero /* C3879C 8024226C 0C09006C */ jal func_802401B0_C366E0 /* C387A0 80242270 0260302D */ daddu $a2, $s3, $zero /* C387A4 80242274 080908A7 */ j .L8024229C -/* C387A8 80242278 00000000 */ nop +/* C387A8 80242278 00000000 */ nop +glabel L8024227C_C387AC /* C387AC 8024227C 0280202D */ daddu $a0, $s4, $zero /* C387B0 80242280 0220282D */ daddu $a1, $s1, $zero /* C387B4 80242284 0C0901F6 */ jal dgb_04_UnkNpcAIFunc1 /* C387B8 80242288 0260302D */ daddu $a2, $s3, $zero +glabel L8024228C_C387BC /* C387BC 8024228C 0280202D */ daddu $a0, $s4, $zero /* C387C0 80242290 0220282D */ daddu $a1, $s1, $zero /* C387C4 80242294 0C090226 */ jal func_80240898_C36DC8 @@ -92,6 +96,7 @@ glabel func_80242154_C38684 /* C387D8 802422A8 24020006 */ addiu $v0, $zero, 6 /* C387DC 802422AC 080908E7 */ j .L8024239C /* C387E0 802422B0 A6A2008E */ sh $v0, 0x8e($s5) +glabel L802422B4_C387E4 /* C387E4 802422B4 0280202D */ daddu $a0, $s4, $zero /* C387E8 802422B8 0220282D */ daddu $a1, $s1, $zero /* C387EC 802422BC 0C09053E */ jal func_802414F8_C37A28 @@ -99,13 +104,15 @@ glabel func_80242154_C38684 /* C387F4 802422C4 8E830070 */ lw $v1, 0x70($s4) /* C387F8 802422C8 2402000D */ addiu $v0, $zero, 0xd /* C387FC 802422CC 14620033 */ bne $v1, $v0, .L8024239C -/* C38800 802422D0 00000000 */ nop +/* C38800 802422D0 00000000 */ nop +glabel L802422D4_C38804 /* C38804 802422D4 0280202D */ daddu $a0, $s4, $zero /* C38808 802422D8 0220282D */ daddu $a1, $s1, $zero /* C3880C 802422DC 0C090594 */ jal func_80241650_C37B80 /* C38810 802422E0 0260302D */ daddu $a2, $s3, $zero /* C38814 802422E4 080908E7 */ j .L8024239C -/* C38818 802422E8 00000000 */ nop +/* C38818 802422E8 00000000 */ nop +glabel L802422EC_C3881C /* C3881C 802422EC 0280202D */ daddu $a0, $s4, $zero /* C38820 802422F0 0220282D */ daddu $a1, $s1, $zero /* C38824 802422F4 0C0905D5 */ jal func_80241754_C37C84 @@ -113,44 +120,52 @@ glabel func_80242154_C38684 /* C3882C 802422FC 8E830070 */ lw $v1, 0x70($s4) /* C38830 80242300 2402000F */ addiu $v0, $zero, 0xf /* C38834 80242304 14620025 */ bne $v1, $v0, .L8024239C -/* C38838 80242308 00000000 */ nop +/* C38838 80242308 00000000 */ nop +glabel L8024230C_C3883C /* C3883C 8024230C 0280202D */ daddu $a0, $s4, $zero /* C38840 80242310 0220282D */ daddu $a1, $s1, $zero /* C38844 80242314 0C0905FE */ jal func_802417F8_C37D28 /* C38848 80242318 0260302D */ daddu $a2, $s3, $zero /* C3884C 8024231C 080908E7 */ j .L8024239C -/* C38850 80242320 00000000 */ nop +/* C38850 80242320 00000000 */ nop +glabel L80242324_C38854 /* C38854 80242324 0280202D */ daddu $a0, $s4, $zero /* C38858 80242328 0220282D */ daddu $a1, $s1, $zero /* C3885C 8024232C 0C0906A5 */ jal func_80241A94_C37FC4 /* C38860 80242330 0260302D */ daddu $a2, $s3, $zero +glabel L80242334_C38864 /* C38864 80242334 0280202D */ daddu $a0, $s4, $zero /* C38868 80242338 0220282D */ daddu $a1, $s1, $zero /* C3886C 8024233C 0C0906D3 */ jal func_80241B4C_C3807C /* C38870 80242340 0260302D */ daddu $a2, $s3, $zero /* C38874 80242344 080908E7 */ j .L8024239C -/* C38878 80242348 00000000 */ nop +/* C38878 80242348 00000000 */ nop +glabel L8024234C_C3887C /* C3887C 8024234C 0280202D */ daddu $a0, $s4, $zero /* C38880 80242350 0220282D */ daddu $a1, $s1, $zero /* C38884 80242354 0C090733 */ jal func_80241CCC_C381FC /* C38888 80242358 0260302D */ daddu $a2, $s3, $zero /* C3888C 8024235C 080908E7 */ j .L8024239C -/* C38890 80242360 00000000 */ nop +/* C38890 80242360 00000000 */ nop +glabel L80242364_C38894 /* C38894 80242364 0280202D */ daddu $a0, $s4, $zero /* C38898 80242368 0220282D */ daddu $a1, $s1, $zero /* C3889C 8024236C 0C090745 */ jal func_80241D14_C38244 /* C388A0 80242370 0260302D */ daddu $a2, $s3, $zero /* C388A4 80242374 080908E7 */ j .L8024239C -/* C388A8 80242378 00000000 */ nop +/* C388A8 80242378 00000000 */ nop +glabel L8024237C_C388AC /* C388AC 8024237C 0280202D */ daddu $a0, $s4, $zero /* C388B0 80242380 0220282D */ daddu $a1, $s1, $zero /* C388B4 80242384 0C090765 */ jal func_80241D94_C382C4 /* C388B8 80242388 0260302D */ daddu $a2, $s3, $zero +glabel L8024238C_C388BC /* C388BC 8024238C 0280202D */ daddu $a0, $s4, $zero /* C388C0 80242390 0220282D */ daddu $a1, $s1, $zero /* C388C4 80242394 0C09078F */ jal func_80241E3C_C3836C /* C388C8 80242398 0260302D */ daddu $a2, $s3, $zero .L8024239C: +glabel L8024239C_C388CC /* C388CC 8024239C 8E820070 */ lw $v0, 0x70($s4) /* C388D0 802423A0 8FBF0058 */ lw $ra, 0x58($sp) /* C388D4 802423A4 8FB50054 */ lw $s5, 0x54($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424A4_C389D4.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424A4_C389D4.s index ec31123bb2..f986deb7e4 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424A4_C389D4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424A4_C389D4.s @@ -8,7 +8,7 @@ glabel func_802424A4_C389D4 /* C389E0 802424B0 00822021 */ addu $a0, $a0, $v0 /* C389E4 802424B4 90820014 */ lbu $v0, 0x14($a0) /* C389E8 802424B8 10400009 */ beqz $v0, .L802424E0 -/* C389EC 802424BC 00000000 */ nop +/* C389EC 802424BC 00000000 */ nop /* C389F0 802424C0 90820015 */ lbu $v0, 0x15($a0) /* C389F4 802424C4 00022600 */ sll $a0, $v0, 0x18 /* C389F8 802424C8 00041E03 */ sra $v1, $a0, 0x18 @@ -16,7 +16,7 @@ glabel func_802424A4_C389D4 /* C38A00 802424D0 00021403 */ sra $v0, $v0, 0x10 /* C38A04 802424D4 0043102A */ slt $v0, $v0, $v1 /* C38A08 802424D8 10400003 */ beqz $v0, .L802424E8 -/* C38A0C 802424DC 00000000 */ nop +/* C38A0C 802424DC 00000000 */ nop .L802424E0: /* C38A10 802424E0 03E00008 */ jr $ra /* C38A14 802424E4 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024259C_C38ACC.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024259C_C38ACC.s index 870237a31b..f1826f62b7 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024259C_C38ACC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024259C_C38ACC.s @@ -108,20 +108,20 @@ glabel func_8024259C_C38ACC /* C38C54 80242724 10400009 */ beqz $v0, .L8024274C /* C38C58 80242728 AEA20074 */ sw $v0, 0x74($s5) /* C38C5C 8024272C 0C03C4EC */ jal func_800F13B0 -/* C38C60 80242730 00000000 */ nop +/* C38C60 80242730 00000000 */ nop /* C38C64 80242734 8EA20070 */ lw $v0, 0x70($s5) /* C38C68 80242738 24420001 */ addiu $v0, $v0, 1 .L8024273C: /* C38C6C 8024273C AEA20070 */ sw $v0, 0x70($s5) /* C38C70 80242740 2842000F */ slti $v0, $v0, 0xf /* C38C74 80242744 10400003 */ beqz $v0, .L80242754 -/* C38C78 80242748 00000000 */ nop +/* C38C78 80242748 00000000 */ nop .L8024274C: /* C38C7C 8024274C 080909EF */ j .L802427BC /* C38C80 80242750 0000102D */ daddu $v0, $zero, $zero .L80242754: /* C38C84 80242754 0C03C54E */ jal func_800F1538 -/* C38C88 80242758 00000000 */ nop +/* C38C88 80242758 00000000 */ nop /* C38C8C 8024275C 8EA30074 */ lw $v1, 0x74($s5) /* C38C90 80242760 240200FF */ addiu $v0, $zero, 0xff /* C38C94 80242764 10620010 */ beq $v1, $v0, .L802427A8 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802429D0_C38F00.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802429D0_C38F00.s index 5ee5d502d9..236299a403 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802429D0_C38F00.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802429D0_C38F00.s @@ -36,7 +36,7 @@ glabel func_802429D0_C38F00 /* C38F7C 80242A4C 0C00A88D */ jal sin_cos_deg /* C38F80 80242A50 0040A82D */ daddu $s5, $v0, $zero /* C38F84 80242A54 1200005D */ beqz $s0, .L80242BCC -/* C38F88 80242A58 00000000 */ nop +/* C38F88 80242A58 00000000 */ nop /* C38F8C 80242A5C 0C00AB0A */ jal general_heap_malloc /* C38F90 80242A60 24040068 */ addiu $a0, $zero, 0x68 /* C38F94 80242A64 0040902D */ daddu $s2, $v0, $zero @@ -98,10 +98,10 @@ glabel func_802429D0_C38F00 /* C3906C 80242B3C C7A2001C */ lwc1 $f2, 0x1c($sp) /* C39070 80242B40 C7A40020 */ lwc1 $f4, 0x20($sp) /* C39074 80242B44 46041082 */ mul.s $f2, $f2, $f4 -/* C39078 80242B48 00000000 */ nop +/* C39078 80242B48 00000000 */ nop /* C3907C 80242B4C C7A00018 */ lwc1 $f0, 0x18($sp) /* C39080 80242B50 46040002 */ mul.s $f0, $f0, $f4 -/* C39084 80242B54 00000000 */ nop +/* C39084 80242B54 00000000 */ nop /* C39088 80242B58 E6020038 */ swc1 $f2, 0x38($s0) /* C3908C 80242B5C E6000050 */ swc1 $f0, 0x50($s0) /* C39090 80242B60 8E42005C */ lw $v0, 0x5c($s2) @@ -142,12 +142,12 @@ glabel func_802429D0_C38F00 /* C39118 80242BE8 10600007 */ beqz $v1, .L80242C08 /* C3911C 80242BEC 24040005 */ addiu $a0, $zero, 5 /* C39120 80242BF0 08090B68 */ j .L80242DA0 -/* C39124 80242BF4 00000000 */ nop +/* C39124 80242BF4 00000000 */ nop .L80242BF8: /* C39128 80242BF8 10620058 */ beq $v1, $v0, .L80242D5C -/* C3912C 80242BFC 00000000 */ nop +/* C3912C 80242BFC 00000000 */ nop /* C39130 80242C00 08090B68 */ j .L80242DA0 -/* C39134 80242C04 00000000 */ nop +/* C39134 80242C04 00000000 */ nop .L80242C08: /* C39138 80242C08 0000882D */ daddu $s1, $zero, $zero /* C3913C 80242C0C 3C148024 */ lui $s4, %hi(D_80243D88) @@ -174,11 +174,11 @@ glabel func_802429D0_C38F00 /* C3918C 80242C5C C7A4001C */ lwc1 $f4, 0x1c($sp) /* C39190 80242C60 C7A00020 */ lwc1 $f0, 0x20($sp) /* C39194 80242C64 46002102 */ mul.s $f4, $f4, $f0 -/* C39198 80242C68 00000000 */ nop +/* C39198 80242C68 00000000 */ nop /* C3919C 80242C6C C7A20018 */ lwc1 $f2, 0x18($sp) /* C391A0 80242C70 26940004 */ addiu $s4, $s4, 4 /* C391A4 80242C74 46001082 */ mul.s $f2, $f2, $f0 -/* C391A8 80242C78 00000000 */ nop +/* C391A8 80242C78 00000000 */ nop /* C391AC 80242C7C 26730004 */ addiu $s3, $s3, 4 /* C391B0 80242C80 26310001 */ addiu $s1, $s1, 1 /* C391B4 80242C84 2A220003 */ slti $v0, $s1, 3 @@ -215,11 +215,11 @@ glabel func_802429D0_C38F00 /* C39228 80242CF8 C7A4001C */ lwc1 $f4, 0x1c($sp) /* C3922C 80242CFC C7A00020 */ lwc1 $f0, 0x20($sp) /* C39230 80242D00 46002102 */ mul.s $f4, $f4, $f0 -/* C39234 80242D04 00000000 */ nop +/* C39234 80242D04 00000000 */ nop /* C39238 80242D08 C7A20018 */ lwc1 $f2, 0x18($sp) /* C3923C 80242D0C 26940004 */ addiu $s4, $s4, 4 /* C39240 80242D10 46001082 */ mul.s $f2, $f2, $f0 -/* C39244 80242D14 00000000 */ nop +/* C39244 80242D14 00000000 */ nop /* C39248 80242D18 26730004 */ addiu $s3, $s3, 4 /* C3924C 80242D1C 26310001 */ addiu $s1, $s1, 1 /* C39250 80242D20 2A220003 */ slti $v0, $s1, 3 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242F08_C39438.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242F08_C39438.s index 3d10bc953d..1493384173 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242F08_C39438.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242F08_C39438.s @@ -36,16 +36,16 @@ glabel func_80242F08_C39438 /* C394B0 80242F80 10600007 */ beqz $v1, .L80242FA0 /* C394B4 80242F84 240500FF */ addiu $a1, $zero, 0xff /* C394B8 80242F88 08090C06 */ j .L80243018 -/* C394BC 80242F8C 00000000 */ nop +/* C394BC 80242F8C 00000000 */ nop .L80242F90: /* C394C0 80242F90 10620019 */ beq $v1, $v0, .L80242FF8 -/* C394C4 80242F94 00000000 */ nop +/* C394C4 80242F94 00000000 */ nop /* C394C8 80242F98 08090C06 */ j .L80243018 -/* C394CC 80242F9C 00000000 */ nop +/* C394CC 80242F9C 00000000 */ nop .L80242FA0: /* C394D0 80242FA0 8E220074 */ lw $v0, 0x74($s1) /* C394D4 80242FA4 14450004 */ bne $v0, $a1, .L80242FB8 -/* C394D8 80242FA8 00000000 */ nop +/* C394D8 80242FA8 00000000 */ nop /* C394DC 80242FAC AE240070 */ sw $a0, 0x70($s1) /* C394E0 80242FB0 AE200078 */ sw $zero, 0x78($s1) /* C394E4 80242FB4 8E220074 */ lw $v0, 0x74($s1) @@ -57,7 +57,7 @@ glabel func_80242F08_C39438 /* C394F8 80242FC8 50400013 */ beql $v0, $zero, .L80243018 /* C394FC 80242FCC AE250074 */ sw $a1, 0x74($s1) /* C39500 80242FD0 08090C06 */ j .L80243018 -/* C39504 80242FD4 00000000 */ nop +/* C39504 80242FD4 00000000 */ nop .L80242FD8: /* C39508 80242FD8 8E220078 */ lw $v0, 0x78($s1) /* C3950C 80242FDC 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802430D8_C39608.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802430D8_C39608.s index 73c3006f77..c12ac096e6 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802430D8_C39608.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802430D8_C39608.s @@ -15,5 +15,5 @@ glabel func_802430D8_C39608 .L80243100: /* C39630 80243100 03E00008 */ jr $ra /* C39634 80243104 24020002 */ addiu $v0, $zero, 2 -/* C39638 80243108 00000000 */ nop -/* C3963C 8024310C 00000000 */ nop +/* C39638 80243108 00000000 */ nop +/* C3963C 8024310C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240000_C3AA10.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240000_C3AA10.s index 5a79919dfe..6b851094a5 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240000_C3AA10.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240000_C3AA10.s @@ -6,12 +6,12 @@ glabel func_80240000_C3AA10 /* C3AA14 80240004 C422EFF4 */ lwc1 $f2, %lo(gPlayerStatus+0x2C)($at) /* C3AA18 80240008 3C01C352 */ lui $at, 0xc352 /* C3AA1C 8024000C 44810000 */ mtc1 $at, $f0 -/* C3AA20 80240010 00000000 */ nop +/* C3AA20 80240010 00000000 */ nop /* C3AA24 80240014 4602003E */ c.le.s $f0, $f2 -/* C3AA28 80240018 00000000 */ nop +/* C3AA28 80240018 00000000 */ nop /* C3AA2C 8024001C 45010002 */ bc1t .L80240028 /* C3AA30 80240020 0000102D */ daddu $v0, $zero, $zero /* C3AA34 80240024 24020002 */ addiu $v0, $zero, 2 .L80240028: /* C3AA38 80240028 03E00008 */ jr $ra -/* C3AA3C 8024002C 00000000 */ nop +/* C3AA3C 8024002C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240030_C3AA40.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240030_C3AA40.s index 9f887d929d..20dc52b4e7 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240030_C3AA40.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240030_C3AA40.s @@ -6,12 +6,12 @@ glabel func_80240030_C3AA40 /* C3AA44 80240034 C422EFF4 */ lwc1 $f2, %lo(gPlayerStatus+0x2C)($at) /* C3AA48 80240038 3C01C387 */ lui $at, 0xc387 /* C3AA4C 8024003C 44810000 */ mtc1 $at, $f0 -/* C3AA50 80240040 00000000 */ nop +/* C3AA50 80240040 00000000 */ nop /* C3AA54 80240044 4602003C */ c.lt.s $f0, $f2 -/* C3AA58 80240048 00000000 */ nop +/* C3AA58 80240048 00000000 */ nop /* C3AA5C 8024004C 45010002 */ bc1t .L80240058 /* C3AA60 80240050 0000102D */ daddu $v0, $zero, $zero /* C3AA64 80240054 24020002 */ addiu $v0, $zero, 2 .L80240058: /* C3AA68 80240058 03E00008 */ jr $ra -/* C3AA6C 8024005C 00000000 */ nop +/* C3AA6C 8024005C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240268_C3AC78.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240268_C3AC78.s index 4cb5af5d3b..1ef123e126 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240268_C3AC78.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240268_C3AC78.s @@ -42,7 +42,7 @@ glabel func_80240268_C3AC78 /* C3AD0C 802402FC C6620074 */ lwc1 $f2, 0x74($s3) /* C3AD10 80240300 468010A0 */ cvt.s.w $f2, $f2 /* C3AD14 80240304 4600103C */ c.lt.s $f2, $f0 -/* C3AD18 80240308 00000000 */ nop +/* C3AD18 80240308 00000000 */ nop /* C3AD1C 8024030C 45030001 */ bc1tl .L80240314 /* C3AD20 80240310 0000882D */ daddu $s1, $zero, $zero .L80240314: @@ -51,16 +51,16 @@ glabel func_80240268_C3AC78 /* C3AD2C 8024031C 3C014387 */ lui $at, 0x4387 /* C3AD30 80240320 4481A000 */ mtc1 $at, $f20 /* C3AD34 80240324 0C00A70A */ jal get_clamped_angle_diff -/* C3AD38 80240328 00000000 */ nop +/* C3AD38 80240328 00000000 */ nop /* C3AD3C 8024032C 0C00A6C9 */ jal clamp_angle /* C3AD40 80240330 46000306 */ mov.s $f12, $f0 /* C3AD44 80240334 3C018024 */ lui $at, %hi(D_80242340) /* C3AD48 80240338 D4222340 */ ldc1 $f2, %lo(D_80242340)($at) /* C3AD4C 8024033C 46000021 */ cvt.d.s $f0, $f0 /* C3AD50 80240340 4622003C */ c.lt.d $f0, $f2 -/* C3AD54 80240344 00000000 */ nop +/* C3AD54 80240344 00000000 */ nop /* C3AD58 80240348 45000003 */ bc1f .L80240358 -/* C3AD5C 8024034C 00000000 */ nop +/* C3AD5C 8024034C 00000000 */ nop /* C3AD60 80240350 3C0142B4 */ lui $at, 0x42b4 /* C3AD64 80240354 4481A000 */ mtc1 $at, $f20 .L80240358: @@ -77,7 +77,7 @@ glabel func_80240268_C3AC78 /* C3AD90 80240380 468010A0 */ cvt.s.w $f2, $f2 /* C3AD94 80240384 46000005 */ abs.s $f0, $f0 /* C3AD98 80240388 4600103C */ c.lt.s $f2, $f0 -/* C3AD9C 8024038C 00000000 */ nop +/* C3AD9C 8024038C 00000000 */ nop /* C3ADA0 80240390 45030001 */ bc1tl .L80240398 /* C3ADA4 80240394 0000882D */ daddu $s1, $zero, $zero .L80240398: @@ -87,13 +87,13 @@ glabel func_80240268_C3AC78 /* C3ADB4 802403A4 860200A8 */ lh $v0, 0xa8($s0) /* C3ADB8 802403A8 46020001 */ sub.s $f0, $f0, $f2 /* C3ADBC 802403AC 44821000 */ mtc1 $v0, $f2 -/* C3ADC0 802403B0 00000000 */ nop +/* C3ADC0 802403B0 00000000 */ nop /* C3ADC4 802403B4 468010A1 */ cvt.d.w $f2, $f2 /* C3ADC8 802403B8 46221080 */ add.d $f2, $f2, $f2 /* C3ADCC 802403BC 46000005 */ abs.s $f0, $f0 /* C3ADD0 802403C0 46000021 */ cvt.d.s $f0, $f0 /* C3ADD4 802403C4 4620103E */ c.le.d $f2, $f0 -/* C3ADD8 802403C8 00000000 */ nop +/* C3ADD8 802403C8 00000000 */ nop /* C3ADDC 802403CC 45030001 */ bc1tl .L802403D4 /* C3ADE0 802403D0 0000882D */ daddu $s1, $zero, $zero .L802403D4: diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_8024041C_C3AE2C.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_8024041C_C3AE2C.s index 7b6db14a8f..c01f826070 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_8024041C_C3AE2C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_8024041C_C3AE2C.s @@ -19,7 +19,7 @@ glabel func_8024041C_C3AE2C /* C3AE64 80240454 8E2200B0 */ lw $v0, 0xb0($s1) /* C3AE68 80240458 30420004 */ andi $v0, $v0, 4 /* C3AE6C 8024045C 10400015 */ beqz $v0, .L802404B4 -/* C3AE70 80240460 00000000 */ nop +/* C3AE70 80240460 00000000 */ nop .L80240464: /* C3AE74 80240464 AE800070 */ sw $zero, 0x70($s4) /* C3AE78 80240468 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel func_8024041C_C3AE2C /* C3AEC8 802404B8 12600005 */ beqz $s3, .L802404D0 /* C3AECC 802404BC 24020001 */ addiu $v0, $zero, 1 /* C3AED0 802404C0 12620048 */ beq $s3, $v0, .L802405E4 -/* C3AED4 802404C4 00000000 */ nop +/* C3AED4 802404C4 00000000 */ nop /* C3AED8 802404C8 08090196 */ j .L80240658 -/* C3AEDC 802404CC 00000000 */ nop +/* C3AEDC 802404CC 00000000 */ nop .L802404D0: /* C3AEE0 802404D0 86240008 */ lh $a0, 8($s1) /* C3AEE4 802404D4 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel func_8024041C_C3AE2C /* C3AF04 802404F4 8E03006C */ lw $v1, 0x6c($s0) /* C3AF08 802404F8 24020003 */ addiu $v0, $zero, 3 /* C3AF0C 802404FC 14620056 */ bne $v1, $v0, .L80240658 -/* C3AF10 80240500 00000000 */ nop +/* C3AF10 80240500 00000000 */ nop /* C3AF14 80240504 8E2500A8 */ lw $a1, 0xa8($s1) /* C3AF18 80240508 10A00003 */ beqz $a1, .L80240518 /* C3AF1C 8024050C 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel func_8024041C_C3AE2C /* C3AF94 80240584 C7A20014 */ lwc1 $f2, 0x14($sp) /* C3AF98 80240588 4600020D */ trunc.w.s $f8, $f0 /* C3AF9C 8024058C 44024000 */ mfc1 $v0, $f8 -/* C3AFA0 80240590 00000000 */ nop +/* C3AFA0 80240590 00000000 */ nop /* C3AFA4 80240594 A6220012 */ sh $v0, 0x12($s1) /* C3AFA8 80240598 4600120D */ trunc.w.s $f8, $f2 /* C3AFAC 8024059C 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_8024067C_C3B08C.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_8024067C_C3B08C.s index 396b87090a..83bf52c3af 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_8024067C_C3B08C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_8024067C_C3B08C.s @@ -20,14 +20,14 @@ glabel func_8024067C_C3B08C /* C3B0C4 802406B4 8482008E */ lh $v0, 0x8e($a0) /* C3B0C8 802406B8 24030001 */ addiu $v1, $zero, 1 /* C3B0CC 802406BC 14430005 */ bne $v0, $v1, .L802406D4 -/* C3B0D0 802406C0 00000000 */ nop +/* C3B0D0 802406C0 00000000 */ nop /* C3B0D4 802406C4 8E0200CC */ lw $v0, 0xcc($s0) /* C3B0D8 802406C8 8C420030 */ lw $v0, 0x30($v0) /* C3B0DC 802406CC 080901BC */ j .L802406F0 /* C3B0E0 802406D0 AC820028 */ sw $v0, 0x28($a0) .L802406D4: /* C3B0E4 802406D4 1C400006 */ bgtz $v0, .L802406F0 -/* C3B0E8 802406D8 00000000 */ nop +/* C3B0E8 802406D8 00000000 */ nop /* C3B0EC 802406DC 8E0200CC */ lw $v0, 0xcc($s0) /* C3B0F0 802406E0 8C420028 */ lw $v0, 0x28($v0) /* C3B0F4 802406E4 A480008E */ sh $zero, 0x8e($a0) diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240704_C3B114.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240704_C3B114.s index 5bdf7262b7..dccf459ecb 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240704_C3B114.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240704_C3B114.s @@ -25,7 +25,7 @@ glabel func_80240704_C3B114 /* C3B164 80240754 0C01242D */ jal func_800490B4 /* C3B168 80240758 AFA00010 */ sw $zero, 0x10($sp) /* C3B16C 8024075C 10400022 */ beqz $v0, .L802407E8 -/* C3B170 80240760 00000000 */ nop +/* C3B170 80240760 00000000 */ nop /* C3B174 80240764 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C3B178 80240768 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* C3B17C 8024076C 804300B4 */ lb $v1, 0xb4($v0) @@ -49,7 +49,7 @@ glabel func_80240704_C3B114 /* C3B1C4 802407B4 10620003 */ beq $v1, $v0, .L802407C4 /* C3B1C8 802407B8 24020025 */ addiu $v0, $zero, 0x25 /* C3B1CC 802407BC 14620002 */ bne $v1, $v0, .L802407C8 -/* C3B1D0 802407C0 00000000 */ nop +/* C3B1D0 802407C0 00000000 */ nop .L802407C4: /* C3B1D4 802407C4 24120001 */ addiu $s2, $zero, 1 .L802407C8: @@ -98,9 +98,9 @@ glabel func_80240704_C3B114 /* C3B26C 8024085C 8C470040 */ lw $a3, 0x40($v0) /* C3B270 80240860 3C0142A0 */ lui $at, 0x42a0 /* C3B274 80240864 44811000 */ mtc1 $at, $f2 -/* C3B278 80240868 00000000 */ nop +/* C3B278 80240868 00000000 */ nop /* C3B27C 8024086C 4602003E */ c.le.s $f0, $f2 -/* C3B280 80240870 00000000 */ nop +/* C3B280 80240870 00000000 */ nop /* C3B284 80240874 45030001 */ bc1tl .L8024087C /* C3B288 80240878 24120001 */ addiu $s2, $zero, 1 .L8024087C: @@ -122,7 +122,7 @@ glabel func_80240704_C3B114 /* C3B2C8 802408B8 3C01C1A0 */ lui $at, 0xc1a0 /* C3B2CC 802408BC 44812000 */ mtc1 $at, $f4 /* C3B2D0 802408C0 44823000 */ mtc1 $v0, $f6 -/* C3B2D4 802408C4 00000000 */ nop +/* C3B2D4 802408C4 00000000 */ nop /* C3B2D8 802408C8 468031A0 */ cvt.s.w $f6, $f6 /* C3B2DC 802408CC 44073000 */ mfc1 $a3, $f6 /* C3B2E0 802408D0 8C63002C */ lw $v1, 0x2c($v1) @@ -166,7 +166,7 @@ glabel func_80240704_C3B114 /* C3B36C 8024095C 0C012530 */ jal func_800494C0 /* C3B370 80240960 0000302D */ daddu $a2, $zero, $zero /* C3B374 80240964 08090267 */ j .L8024099C -/* C3B378 80240968 00000000 */ nop +/* C3B378 80240968 00000000 */ nop .L8024096C: /* C3B37C 8024096C 14620005 */ bne $v1, $v0, .L80240984 /* C3B380 80240970 2402003C */ addiu $v0, $zero, 0x3c @@ -176,7 +176,7 @@ glabel func_80240704_C3B114 /* C3B390 80240980 AE220028 */ sw $v0, 0x28($s1) .L80240984: /* C3B394 80240984 14620005 */ bne $v1, $v0, .L8024099C -/* C3B398 80240988 00000000 */ nop +/* C3B398 80240988 00000000 */ nop /* C3B39C 8024098C 8E6200CC */ lw $v0, 0xcc($s3) /* C3B3A0 80240990 8C420028 */ lw $v0, 0x28($v0) /* C3B3A4 80240994 A620008E */ sh $zero, 0x8e($s1) diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240A20_C3B430.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240A20_C3B430.s index 5d94a53670..9d5573c7b6 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240A20_C3B430.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240A20_C3B430.s @@ -16,7 +16,7 @@ glabel func_80240A20_C3B430 /* C3B45C 80240A4C 0040802D */ daddu $s0, $v0, $zero /* C3B460 80240A50 C60C000C */ lwc1 $f12, 0xc($s0) /* C3B464 80240A54 44820000 */ mtc1 $v0, $f0 -/* C3B468 80240A58 00000000 */ nop +/* C3B468 80240A58 00000000 */ nop /* C3B46C 80240A5C 46800020 */ cvt.s.w $f0, $f0 /* C3B470 80240A60 46006300 */ add.s $f12, $f12, $f0 /* C3B474 80240A64 3C0142B4 */ lui $at, 0x42b4 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240AC8_C3B4D8.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240AC8_C3B4D8.s index 77f8bffc06..896396003d 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240AC8_C3B4D8.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240AC8_C3B4D8.s @@ -22,7 +22,7 @@ glabel func_80240AC8_C3B4D8 /* C3B51C 80240B0C 0C01242D */ jal func_800490B4 /* C3B520 80240B10 0220282D */ daddu $a1, $s1, $zero /* C3B524 80240B14 1040000C */ beqz $v0, .L80240B48 -/* C3B528 80240B18 00000000 */ nop +/* C3B528 80240B18 00000000 */ nop /* C3B52C 80240B1C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C3B530 80240B20 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* C3B534 80240B24 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -40,7 +40,7 @@ glabel func_80240AC8_C3B4D8 /* C3B560 80240B50 A602008E */ sh $v0, 0x8e($s0) /* C3B564 80240B54 00021400 */ sll $v0, $v0, 0x10 /* C3B568 80240B58 1C400022 */ bgtz $v0, .L80240BE4 -/* C3B56C 80240B5C 00000000 */ nop +/* C3B56C 80240B5C 00000000 */ nop /* C3B570 80240B60 8E420074 */ lw $v0, 0x74($s2) /* C3B574 80240B64 2442FFFF */ addiu $v0, $v0, -1 /* C3B578 80240B68 18400014 */ blez $v0, .L80240BBC diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240C00_C3B610.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240C00_C3B610.s index 9c40b36491..1207156841 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240C00_C3B610.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240C00_C3B610.s @@ -18,14 +18,14 @@ glabel func_80240C00_C3B610 /* C3B644 80240C34 A462008E */ sh $v0, 0x8e($v1) /* C3B648 80240C38 00021400 */ sll $v0, $v0, 0x10 /* C3B64C 80240C3C 1C400015 */ bgtz $v0, .L80240C94 -/* C3B650 80240C40 00000000 */ nop +/* C3B650 80240C40 00000000 */ nop /* C3B654 80240C44 8E0200CC */ lw $v0, 0xcc($s0) /* C3B658 80240C48 8C420004 */ lw $v0, 4($v0) /* C3B65C 80240C4C AC620028 */ sw $v0, 0x28($v1) /* C3B660 80240C50 8E0200D0 */ lw $v0, 0xd0($s0) /* C3B664 80240C54 8C420014 */ lw $v0, 0x14($v0) /* C3B668 80240C58 04410004 */ bgez $v0, .L80240C6C -/* C3B66C 80240C5C 00000000 */ nop +/* C3B66C 80240C5C 00000000 */ nop /* C3B670 80240C60 C6200000 */ lwc1 $f0, ($s1) /* C3B674 80240C64 08090323 */ j .L80240C8C /* C3B678 80240C68 E4600018 */ swc1 $f0, 0x18($v1) @@ -33,7 +33,7 @@ glabel func_80240C00_C3B610 /* C3B67C 80240C6C 3C018024 */ lui $at, %hi(func_80242348_A1D448) /* C3B680 80240C70 D4222348 */ ldc1 $f2, %lo(func_80242348_A1D448)($at) /* C3B684 80240C74 44820000 */ mtc1 $v0, $f0 -/* C3B688 80240C78 00000000 */ nop +/* C3B688 80240C78 00000000 */ nop /* C3B68C 80240C7C 46800021 */ cvt.d.w $f0, $f0 /* C3B690 80240C80 46220003 */ div.d $f0, $f0, $f2 /* C3B694 80240C84 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240CAC_C3B6BC.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240CAC_C3B6BC.s index 696d7b7971..062ab5ffb1 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240CAC_C3B6BC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240CAC_C3B6BC.s @@ -22,7 +22,7 @@ glabel func_80240CAC_C3B6BC /* C3B700 80240CF0 0C01242D */ jal func_800490B4 /* C3B704 80240CF4 0040802D */ daddu $s0, $v0, $zero /* C3B708 80240CF8 1040000C */ beqz $v0, .L80240D2C -/* C3B70C 80240CFC 00000000 */ nop +/* C3B70C 80240CFC 00000000 */ nop /* C3B710 80240D00 C60C0038 */ lwc1 $f12, 0x38($s0) /* C3B714 80240D04 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C3B718 80240D08 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -45,12 +45,12 @@ glabel func_80240CAC_C3B6BC /* C3B758 80240D48 46802120 */ cvt.s.w $f4, $f4 /* C3B75C 80240D4C 44072000 */ mfc1 $a3, $f4 /* C3B760 80240D50 0C00A7B5 */ jal dist2D -/* C3B764 80240D54 00000000 */ nop +/* C3B764 80240D54 00000000 */ nop /* C3B768 80240D58 C6020018 */ lwc1 $f2, 0x18($s0) /* C3B76C 80240D5C 4602003E */ c.le.s $f0, $f2 -/* C3B770 80240D60 00000000 */ nop +/* C3B770 80240D60 00000000 */ nop /* C3B774 80240D64 4500000B */ bc1f .L80240D94 -/* C3B778 80240D68 00000000 */ nop +/* C3B778 80240D68 00000000 */ nop /* C3B77C 80240D6C 8E4200CC */ lw $v0, 0xcc($s2) /* C3B780 80240D70 8C430000 */ lw $v1, ($v0) /* C3B784 80240D74 2402000F */ addiu $v0, $zero, 0xf @@ -85,7 +85,7 @@ glabel func_80240CAC_C3B6BC /* C3B7F4 80240DE4 46802120 */ cvt.s.w $f4, $f4 /* C3B7F8 80240DE8 44072000 */ mfc1 $a3, $f4 /* C3B7FC 80240DEC 0C00A720 */ jal atan2 -/* C3B800 80240DF0 00000000 */ nop +/* C3B800 80240DF0 00000000 */ nop /* C3B804 80240DF4 8E050018 */ lw $a1, 0x18($s0) /* C3B808 80240DF8 44060000 */ mfc1 $a2, $f0 /* C3B80C 80240DFC 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E24_C3B834.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E24_C3B834.s index 45a298c215..612e23d371 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E24_C3B834.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E24_C3B834.s @@ -12,13 +12,13 @@ glabel func_80240E24_C3B834 /* C3B850 80240E40 0040182D */ daddu $v1, $v0, $zero /* C3B854 80240E44 8462008C */ lh $v0, 0x8c($v1) /* C3B858 80240E48 14400009 */ bnez $v0, .L80240E70 -/* C3B85C 80240E4C 00000000 */ nop +/* C3B85C 80240E4C 00000000 */ nop /* C3B860 80240E50 9462008E */ lhu $v0, 0x8e($v1) /* C3B864 80240E54 2442FFFF */ addiu $v0, $v0, -1 /* C3B868 80240E58 A462008E */ sh $v0, 0x8e($v1) /* C3B86C 80240E5C 00021400 */ sll $v0, $v0, 0x10 /* C3B870 80240E60 1C400003 */ bgtz $v0, .L80240E70 -/* C3B874 80240E64 00000000 */ nop +/* C3B874 80240E64 00000000 */ nop /* C3B878 80240E68 A460008E */ sh $zero, 0x8e($v1) /* C3B87C 80240E6C AE000070 */ sw $zero, 0x70($s0) .L80240E70: diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s index 640bb9c448..028c9e203d 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s @@ -46,7 +46,7 @@ glabel func_80240E80_C3B890 /* C3B934 80240F24 8E2200B0 */ lw $v0, 0xb0($s1) /* C3B938 80240F28 30420004 */ andi $v0, $v0, 4 /* C3B93C 80240F2C 10400027 */ beqz $v0, .L80240FCC -/* C3B940 80240F30 00000000 */ nop +/* C3B940 80240F30 00000000 */ nop .L80240F34: /* C3B944 80240F34 2402001E */ addiu $v0, $zero, 0x1e /* C3B948 80240F38 2404F7FF */ addiu $a0, $zero, -0x801 @@ -94,10 +94,10 @@ glabel func_80240E80_C3B890 /* C3B9E0 80240FD0 2442FFF6 */ addiu $v0, $v0, -0xa /* C3B9E4 80240FD4 2C420014 */ sltiu $v0, $v0, 0x14 /* C3B9E8 80240FD8 10400009 */ beqz $v0, .L80241000 -/* C3B9EC 80240FDC 00000000 */ nop +/* C3B9EC 80240FDC 00000000 */ nop /* C3B9F0 80240FE0 8E22006C */ lw $v0, 0x6c($s1) /* C3B9F4 80240FE4 14400006 */ bnez $v0, .L80241000 -/* C3B9F8 80240FE8 00000000 */ nop +/* C3B9F8 80240FE8 00000000 */ nop /* C3B9FC 80240FEC 0C09009A */ jal func_80240268_C3AC78 /* C3BA00 80240FF0 0240202D */ daddu $a0, $s2, $zero /* C3BA04 80240FF4 10400002 */ beqz $v0, .L80241000 @@ -108,41 +108,47 @@ glabel func_80240E80_C3B890 /* C3BA14 80241004 2C620064 */ sltiu $v0, $v1, 0x64 /* C3BA18 80241008 10400067 */ beqz $v0, .L802411A8 /* C3BA1C 8024100C 00031080 */ sll $v0, $v1, 2 -/* C3BA20 80241010 3C018024 */ lui $at, %hi(D_80242350) +/* C3BA20 80241010 3C018024 */ lui $at, %hi(jtbl_80242350_C3CD60) /* C3BA24 80241014 00220821 */ addu $at, $at, $v0 -/* C3BA28 80241018 8C222350 */ lw $v0, %lo(D_80242350)($at) +/* C3BA28 80241018 8C222350 */ lw $v0, %lo(jtbl_80242350_C3CD60)($at) /* C3BA2C 8024101C 00400008 */ jr $v0 -/* C3BA30 80241020 00000000 */ nop +/* C3BA30 80241020 00000000 */ nop +glabel L80241024_C3BA34 /* C3BA34 80241024 0240202D */ daddu $a0, $s2, $zero /* C3BA38 80241028 0260282D */ daddu $a1, $s3, $zero /* C3BA3C 8024102C 0C09019F */ jal func_8024067C_C3B08C /* C3BA40 80241030 02A0302D */ daddu $a2, $s5, $zero /* C3BA44 80241034 0809046A */ j .L802411A8 -/* C3BA48 80241038 00000000 */ nop +/* C3BA48 80241038 00000000 */ nop +glabel L8024103C_C3BA4C /* C3BA4C 8024103C 0240202D */ daddu $a0, $s2, $zero /* C3BA50 80241040 0260282D */ daddu $a1, $s3, $zero /* C3BA54 80241044 0C0901C1 */ jal func_80240704_C3B114 /* C3BA58 80241048 02A0302D */ daddu $a2, $s5, $zero /* C3BA5C 8024104C 0809046A */ j .L802411A8 -/* C3BA60 80241050 00000000 */ nop +/* C3BA60 80241050 00000000 */ nop +glabel L80241054_C3BA64 /* C3BA64 80241054 0240202D */ daddu $a0, $s2, $zero /* C3BA68 80241058 0260282D */ daddu $a1, $s3, $zero /* C3BA6C 8024105C 0C09026F */ jal func_802409BC_C3B3CC /* C3BA70 80241060 02A0302D */ daddu $a2, $s5, $zero /* C3BA74 80241064 0809046A */ j .L802411A8 -/* C3BA78 80241068 00000000 */ nop +/* C3BA78 80241068 00000000 */ nop +glabel L8024106C_C3BA7C /* C3BA7C 8024106C 0240202D */ daddu $a0, $s2, $zero /* C3BA80 80241070 0260282D */ daddu $a1, $s3, $zero /* C3BA84 80241074 0C090288 */ jal func_80240A20_C3B430 /* C3BA88 80241078 02A0302D */ daddu $a2, $s5, $zero /* C3BA8C 8024107C 0809046A */ j .L802411A8 -/* C3BA90 80241080 00000000 */ nop +/* C3BA90 80241080 00000000 */ nop +glabel L80241084_C3BA94 /* C3BA94 80241084 0240202D */ daddu $a0, $s2, $zero /* C3BA98 80241088 0260282D */ daddu $a1, $s3, $zero /* C3BA9C 8024108C 0C0902B2 */ jal func_80240AC8_C3B4D8 /* C3BAA0 80241090 02A0302D */ daddu $a2, $s5, $zero /* C3BAA4 80241094 0809046A */ j .L802411A8 -/* C3BAA8 80241098 00000000 */ nop +/* C3BAA8 80241098 00000000 */ nop +glabel L8024109C_C3BAAC /* C3BAAC 8024109C 0240202D */ daddu $a0, $s2, $zero /* C3BAB0 802410A0 0260282D */ daddu $a1, $s3, $zero /* C3BAB4 802410A4 0C0127DF */ jal func_80049F7C @@ -150,13 +156,15 @@ glabel func_80240E80_C3B890 /* C3BABC 802410AC 8E430070 */ lw $v1, 0x70($s2) /* C3BAC0 802410B0 2402000D */ addiu $v0, $zero, 0xd /* C3BAC4 802410B4 1462003C */ bne $v1, $v0, .L802411A8 -/* C3BAC8 802410B8 00000000 */ nop +/* C3BAC8 802410B8 00000000 */ nop +glabel L802410BC_C3BACC /* C3BACC 802410BC 0240202D */ daddu $a0, $s2, $zero /* C3BAD0 802410C0 0260282D */ daddu $a1, $s3, $zero /* C3BAD4 802410C4 0C012849 */ jal func_8004A124 /* C3BAD8 802410C8 02A0302D */ daddu $a2, $s5, $zero /* C3BADC 802410CC 0809046A */ j .L802411A8 -/* C3BAE0 802410D0 00000000 */ nop +/* C3BAE0 802410D0 00000000 */ nop +glabel L802410D4_C3BAE4 /* C3BAE4 802410D4 0240202D */ daddu $a0, $s2, $zero /* C3BAE8 802410D8 0260282D */ daddu $a1, $s3, $zero /* C3BAEC 802410DC 0C0128FA */ jal func_8004A3E8 @@ -168,26 +176,31 @@ glabel func_80240E80_C3B890 /* C3BB04 802410F4 24020003 */ addiu $v0, $zero, 3 /* C3BB08 802410F8 0809046A */ j .L802411A8 /* C3BB0C 802410FC AE420070 */ sw $v0, 0x70($s2) +glabel L80241100_C3BB10 /* C3BB10 80241100 0C090018 */ jal dgb_05_UnkNpcAIFunc6 /* C3BB14 80241104 0240202D */ daddu $a0, $s2, $zero /* C3BB18 80241108 8E430070 */ lw $v1, 0x70($s2) /* C3BB1C 8024110C 2402001F */ addiu $v0, $zero, 0x1f /* C3BB20 80241110 14620025 */ bne $v1, $v0, .L802411A8 -/* C3BB24 80241114 00000000 */ nop +/* C3BB24 80241114 00000000 */ nop +glabel L80241118_C3BB28 /* C3BB28 80241118 0C090033 */ jal dgb_05_UnkNpcAIFunc7 /* C3BB2C 8024111C 0240202D */ daddu $a0, $s2, $zero /* C3BB30 80241120 8E430070 */ lw $v1, 0x70($s2) /* C3BB34 80241124 24020020 */ addiu $v0, $zero, 0x20 /* C3BB38 80241128 1462001F */ bne $v1, $v0, .L802411A8 -/* C3BB3C 8024112C 00000000 */ nop +/* C3BB3C 8024112C 00000000 */ nop +glabel L80241130_C3BB40 /* C3BB40 80241130 0C09004F */ jal dgb_05_UnkNpcAIFunc8 /* C3BB44 80241134 0240202D */ daddu $a0, $s2, $zero /* C3BB48 80241138 0809046A */ j .L802411A8 -/* C3BB4C 8024113C 00000000 */ nop +/* C3BB4C 8024113C 00000000 */ nop +glabel L80241140_C3BB50 /* C3BB50 80241140 0C090085 */ jal dgb_05_UnkNpcAIFunc5 /* C3BB54 80241144 0240202D */ daddu $a0, $s2, $zero /* C3BB58 80241148 0809046A */ j .L802411A8 -/* C3BB5C 8024114C 00000000 */ nop +/* C3BB5C 8024114C 00000000 */ nop +glabel L80241150_C3BB60 /* C3BB60 80241150 0240202D */ daddu $a0, $s2, $zero /* C3BB64 80241154 0260282D */ daddu $a1, $s3, $zero /* C3BB68 80241158 0C090300 */ jal func_80240C00_C3B610 @@ -195,22 +208,26 @@ glabel func_80240E80_C3B890 /* C3BB70 80241160 8E430070 */ lw $v1, 0x70($s2) /* C3BB74 80241164 24020029 */ addiu $v0, $zero, 0x29 /* C3BB78 80241168 1462000F */ bne $v1, $v0, .L802411A8 -/* C3BB7C 8024116C 00000000 */ nop +/* C3BB7C 8024116C 00000000 */ nop +glabel L80241170_C3BB80 /* C3BB80 80241170 0240202D */ daddu $a0, $s2, $zero /* C3BB84 80241174 0260282D */ daddu $a1, $s3, $zero /* C3BB88 80241178 0C09032B */ jal func_80240CAC_C3B6BC /* C3BB8C 8024117C 02A0302D */ daddu $a2, $s5, $zero /* C3BB90 80241180 0809046A */ j .L802411A8 -/* C3BB94 80241184 00000000 */ nop +/* C3BB94 80241184 00000000 */ nop +glabel L80241188_C3BB98 /* C3BB98 80241188 0240202D */ daddu $a0, $s2, $zero /* C3BB9C 8024118C 0260282D */ daddu $a1, $s3, $zero /* C3BBA0 80241190 0C090389 */ jal func_80240E24_C3B834 /* C3BBA4 80241194 02A0302D */ daddu $a2, $s5, $zero /* C3BBA8 80241198 0809046A */ j .L802411A8 -/* C3BBAC 8024119C 00000000 */ nop +/* C3BBAC 8024119C 00000000 */ nop +glabel L802411A0_C3BBB0 /* C3BBB0 802411A0 0C0129CF */ jal func_8004A73C /* C3BBB4 802411A4 0240202D */ daddu $a0, $s2, $zero .L802411A8: +glabel L802411A8_C3BBB8 /* C3BBB8 802411A8 8FBF0048 */ lw $ra, 0x48($sp) /* C3BBBC 802411AC 8FB50044 */ lw $s5, 0x44($sp) /* C3BBC0 802411B0 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s index 465ca3ba5c..a437712286 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s @@ -100,78 +100,93 @@ glabel func_802411D0_C3BBE0 /* C3BD44 80241334 2C620064 */ sltiu $v0, $v1, 0x64 /* C3BD48 80241338 10400048 */ beqz $v0, .L8024145C /* C3BD4C 8024133C 00031080 */ sll $v0, $v1, 2 -/* C3BD50 80241340 3C018024 */ lui $at, %hi(D_802424E0) +/* C3BD50 80241340 3C018024 */ lui $at, %hi(jtbl_802424E0_C3CEF0) /* C3BD54 80241344 00220821 */ addu $at, $at, $v0 -/* C3BD58 80241348 8C2224E0 */ lw $v0, %lo(D_802424E0)($at) +/* C3BD58 80241348 8C2224E0 */ lw $v0, %lo(jtbl_802424E0_C3CEF0)($at) /* C3BD5C 8024134C 00400008 */ jr $v0 /* C3BD60 80241350 00000000 */ nop +glabel L80241354_C3BD64 /* C3BD64 80241354 0240202D */ daddu $a0, $s2, $zero /* C3BD68 80241358 0260282D */ daddu $a1, $s3, $zero /* C3BD6C 8024135C 0C012568 */ jal func_800495A0 /* C3BD70 80241360 0280302D */ daddu $a2, $s4, $zero +glabel L80241364_C3BD74 /* C3BD74 80241364 0240202D */ daddu $a0, $s2, $zero /* C3BD78 80241368 0260282D */ daddu $a1, $s3, $zero /* C3BD7C 8024136C 0C0125AE */ jal func_800496B8 /* C3BD80 80241370 0280302D */ daddu $a2, $s4, $zero /* C3BD84 80241374 08090517 */ j .L8024145C /* C3BD88 80241378 00000000 */ nop +glabel L8024137C_C3BD8C /* C3BD8C 8024137C 0240202D */ daddu $a0, $s2, $zero /* C3BD90 80241380 0260282D */ daddu $a1, $s3, $zero /* C3BD94 80241384 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C3BD98 80241388 0280302D */ daddu $a2, $s4, $zero +glabel L8024138C_C3BD9C /* C3BD9C 8024138C 0240202D */ daddu $a0, $s2, $zero /* C3BDA0 80241390 0260282D */ daddu $a1, $s3, $zero /* C3BDA4 80241394 0C012701 */ jal func_80049C04 /* C3BDA8 80241398 0280302D */ daddu $a2, $s4, $zero /* C3BDAC 8024139C 08090517 */ j .L8024145C /* C3BDB0 802413A0 00000000 */ nop +glabel L802413A4_C3BDB4 /* C3BDB4 802413A4 0240202D */ daddu $a0, $s2, $zero /* C3BDB8 802413A8 0260282D */ daddu $a1, $s3, $zero /* C3BDBC 802413AC 0C01278F */ jal func_80049E3C /* C3BDC0 802413B0 0280302D */ daddu $a2, $s4, $zero +glabel L802413B4_C3BDC4 /* C3BDC4 802413B4 0240202D */ daddu $a0, $s2, $zero /* C3BDC8 802413B8 0260282D */ daddu $a1, $s3, $zero /* C3BDCC 802413BC 0C0127B3 */ jal func_80049ECC /* C3BDD0 802413C0 0280302D */ daddu $a2, $s4, $zero /* C3BDD4 802413C4 08090517 */ j .L8024145C /* C3BDD8 802413C8 00000000 */ nop +glabel L802413CC_C3BDDC /* C3BDDC 802413CC 0240202D */ daddu $a0, $s2, $zero /* C3BDE0 802413D0 0260282D */ daddu $a1, $s3, $zero /* C3BDE4 802413D4 0C0127DF */ jal func_80049F7C /* C3BDE8 802413D8 0280302D */ daddu $a2, $s4, $zero +glabel L802413DC_C3BDEC /* C3BDEC 802413DC 0240202D */ daddu $a0, $s2, $zero /* C3BDF0 802413E0 0260282D */ daddu $a1, $s3, $zero /* C3BDF4 802413E4 0C012849 */ jal func_8004A124 /* C3BDF8 802413E8 0280302D */ daddu $a2, $s4, $zero /* C3BDFC 802413EC 08090517 */ j .L8024145C /* C3BE00 802413F0 00000000 */ nop +glabel L802413F4_C3BE04 /* C3BE04 802413F4 0240202D */ daddu $a0, $s2, $zero /* C3BE08 802413F8 0260282D */ daddu $a1, $s3, $zero /* C3BE0C 802413FC 0C0128FA */ jal func_8004A3E8 /* C3BE10 80241400 0280302D */ daddu $a2, $s4, $zero /* C3BE14 80241404 08090517 */ j .L8024145C /* C3BE18 80241408 00000000 */ nop +glabel L8024140C_C3BE1C /* C3BE1C 8024140C 0C090018 */ jal dgb_05_UnkNpcAIFunc6 /* C3BE20 80241410 0240202D */ daddu $a0, $s2, $zero +glabel L80241414_C3BE24 /* C3BE24 80241414 0C090033 */ jal dgb_05_UnkNpcAIFunc7 /* C3BE28 80241418 0240202D */ daddu $a0, $s2, $zero /* C3BE2C 8024141C 8E430070 */ lw $v1, 0x70($s2) /* C3BE30 80241420 24020020 */ addiu $v0, $zero, 0x20 /* C3BE34 80241424 1462000D */ bne $v1, $v0, .L8024145C /* C3BE38 80241428 00000000 */ nop +glabel L8024142C_C3BE3C /* C3BE3C 8024142C 0C09004F */ jal dgb_05_UnkNpcAIFunc8 /* C3BE40 80241430 0240202D */ daddu $a0, $s2, $zero /* C3BE44 80241434 8E430070 */ lw $v1, 0x70($s2) /* C3BE48 80241438 24020021 */ addiu $v0, $zero, 0x21 /* C3BE4C 8024143C 14620007 */ bne $v1, $v0, .L8024145C /* C3BE50 80241440 00000000 */ nop +glabel L80241444_C3BE54 /* C3BE54 80241444 0C090085 */ jal dgb_05_UnkNpcAIFunc5 /* C3BE58 80241448 0240202D */ daddu $a0, $s2, $zero /* C3BE5C 8024144C 08090517 */ j .L8024145C /* C3BE60 80241450 00000000 */ nop +glabel L80241454_C3BE64 /* C3BE64 80241454 0C0129CF */ jal func_8004A73C /* C3BE68 80241458 0240202D */ daddu $a0, $s2, $zero .L8024145C: +glabel L8024145C_C3BE6C /* C3BE6C 8024145C 8FBF0048 */ lw $ra, 0x48($sp) /* C3BE70 80241460 8FB50044 */ lw $s5, 0x44($sp) /* C3BE74 80241464 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240000_C3D080.s b/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240000_C3D080.s index 367c6fd651..50d2a6dab3 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240000_C3D080.s +++ b/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240000_C3D080.s @@ -26,7 +26,7 @@ glabel func_80240000_C3D080 /* C3D0D0 80240050 1440FFFA */ bnez $v0, .L8024003C /* C3D0D4 80240054 24A50004 */ addiu $a1, $a1, 4 /* C3D0D8 80240058 08090027 */ j .L8024009C -/* C3D0DC 8024005C 00000000 */ nop +/* C3D0DC 8024005C 00000000 */ nop .L80240060: /* C3D0E0 80240060 0000182D */ daddu $v1, $zero, $zero /* C3D0E4 80240064 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240208_C3DDF8.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240208_C3DDF8.s index a86215744e..9f118d3e08 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240208_C3DDF8.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240208_C3DDF8.s @@ -42,7 +42,7 @@ glabel func_80240208_C3DDF8 /* C3DE8C 8024029C C6620074 */ lwc1 $f2, 0x74($s3) /* C3DE90 802402A0 468010A0 */ cvt.s.w $f2, $f2 /* C3DE94 802402A4 4600103C */ c.lt.s $f2, $f0 -/* C3DE98 802402A8 00000000 */ nop +/* C3DE98 802402A8 00000000 */ nop /* C3DE9C 802402AC 45030001 */ bc1tl .L802402B4 /* C3DEA0 802402B0 0000882D */ daddu $s1, $zero, $zero .L802402B4: @@ -51,16 +51,16 @@ glabel func_80240208_C3DDF8 /* C3DEAC 802402BC 3C014387 */ lui $at, 0x4387 /* C3DEB0 802402C0 4481A000 */ mtc1 $at, $f20 /* C3DEB4 802402C4 0C00A70A */ jal get_clamped_angle_diff -/* C3DEB8 802402C8 00000000 */ nop +/* C3DEB8 802402C8 00000000 */ nop /* C3DEBC 802402CC 0C00A6C9 */ jal clamp_angle /* C3DEC0 802402D0 46000306 */ mov.s $f12, $f0 /* C3DEC4 802402D4 3C018024 */ lui $at, %hi(func_80241E90_8B1F00) /* C3DEC8 802402D8 D4221E90 */ ldc1 $f2, %lo(func_80241E90_8B1F00)($at) /* C3DECC 802402DC 46000021 */ cvt.d.s $f0, $f0 /* C3DED0 802402E0 4622003C */ c.lt.d $f0, $f2 -/* C3DED4 802402E4 00000000 */ nop +/* C3DED4 802402E4 00000000 */ nop /* C3DED8 802402E8 45000003 */ bc1f .L802402F8 -/* C3DEDC 802402EC 00000000 */ nop +/* C3DEDC 802402EC 00000000 */ nop /* C3DEE0 802402F0 3C0142B4 */ lui $at, 0x42b4 /* C3DEE4 802402F4 4481A000 */ mtc1 $at, $f20 .L802402F8: @@ -77,7 +77,7 @@ glabel func_80240208_C3DDF8 /* C3DF10 80240320 468010A0 */ cvt.s.w $f2, $f2 /* C3DF14 80240324 46000005 */ abs.s $f0, $f0 /* C3DF18 80240328 4600103C */ c.lt.s $f2, $f0 -/* C3DF1C 8024032C 00000000 */ nop +/* C3DF1C 8024032C 00000000 */ nop /* C3DF20 80240330 45030001 */ bc1tl .L80240338 /* C3DF24 80240334 0000882D */ daddu $s1, $zero, $zero .L80240338: @@ -87,13 +87,13 @@ glabel func_80240208_C3DDF8 /* C3DF34 80240344 860200A8 */ lh $v0, 0xa8($s0) /* C3DF38 80240348 46020001 */ sub.s $f0, $f0, $f2 /* C3DF3C 8024034C 44821000 */ mtc1 $v0, $f2 -/* C3DF40 80240350 00000000 */ nop +/* C3DF40 80240350 00000000 */ nop /* C3DF44 80240354 468010A1 */ cvt.d.w $f2, $f2 /* C3DF48 80240358 46221080 */ add.d $f2, $f2, $f2 /* C3DF4C 8024035C 46000005 */ abs.s $f0, $f0 /* C3DF50 80240360 46000021 */ cvt.d.s $f0, $f0 /* C3DF54 80240364 4620103E */ c.le.d $f2, $f0 -/* C3DF58 80240368 00000000 */ nop +/* C3DF58 80240368 00000000 */ nop /* C3DF5C 8024036C 45030001 */ bc1tl .L80240374 /* C3DF60 80240370 0000882D */ daddu $s1, $zero, $zero .L80240374: diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_8024061C_C3E20C.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_8024061C_C3E20C.s index b06762ed77..ba0a40cb38 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_8024061C_C3E20C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_8024061C_C3E20C.s @@ -20,14 +20,14 @@ glabel func_8024061C_C3E20C /* C3E244 80240654 8482008E */ lh $v0, 0x8e($a0) /* C3E248 80240658 24030001 */ addiu $v1, $zero, 1 /* C3E24C 8024065C 14430005 */ bne $v0, $v1, .L80240674 -/* C3E250 80240660 00000000 */ nop +/* C3E250 80240660 00000000 */ nop /* C3E254 80240664 8E0200CC */ lw $v0, 0xcc($s0) /* C3E258 80240668 8C420030 */ lw $v0, 0x30($v0) /* C3E25C 8024066C 080901A4 */ j .L80240690 /* C3E260 80240670 AC820028 */ sw $v0, 0x28($a0) .L80240674: /* C3E264 80240674 1C400006 */ bgtz $v0, .L80240690 -/* C3E268 80240678 00000000 */ nop +/* C3E268 80240678 00000000 */ nop /* C3E26C 8024067C 8E0200CC */ lw $v0, 0xcc($s0) /* C3E270 80240680 8C420028 */ lw $v0, 0x28($v0) /* C3E274 80240684 A480008E */ sh $zero, 0x8e($a0) diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802406A4_C3E294.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802406A4_C3E294.s index 87d9b1c782..dc9c8927a7 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802406A4_C3E294.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802406A4_C3E294.s @@ -25,7 +25,7 @@ glabel func_802406A4_C3E294 /* C3E2E4 802406F4 0C01242D */ jal func_800490B4 /* C3E2E8 802406F8 AFA00010 */ sw $zero, 0x10($sp) /* C3E2EC 802406FC 10400022 */ beqz $v0, .L80240788 -/* C3E2F0 80240700 00000000 */ nop +/* C3E2F0 80240700 00000000 */ nop /* C3E2F4 80240704 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C3E2F8 80240708 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* C3E2FC 8024070C 804300B4 */ lb $v1, 0xb4($v0) @@ -49,7 +49,7 @@ glabel func_802406A4_C3E294 /* C3E344 80240754 10620003 */ beq $v1, $v0, .L80240764 /* C3E348 80240758 24020025 */ addiu $v0, $zero, 0x25 /* C3E34C 8024075C 14620002 */ bne $v1, $v0, .L80240768 -/* C3E350 80240760 00000000 */ nop +/* C3E350 80240760 00000000 */ nop .L80240764: /* C3E354 80240764 24120001 */ addiu $s2, $zero, 1 .L80240768: @@ -98,9 +98,9 @@ glabel func_802406A4_C3E294 /* C3E3EC 802407FC 8C470040 */ lw $a3, 0x40($v0) /* C3E3F0 80240800 3C0142A0 */ lui $at, 0x42a0 /* C3E3F4 80240804 44811000 */ mtc1 $at, $f2 -/* C3E3F8 80240808 00000000 */ nop +/* C3E3F8 80240808 00000000 */ nop /* C3E3FC 8024080C 4602003E */ c.le.s $f0, $f2 -/* C3E400 80240810 00000000 */ nop +/* C3E400 80240810 00000000 */ nop /* C3E404 80240814 45030001 */ bc1tl .L8024081C /* C3E408 80240818 24120001 */ addiu $s2, $zero, 1 .L8024081C: @@ -122,7 +122,7 @@ glabel func_802406A4_C3E294 /* C3E448 80240858 3C01C1A0 */ lui $at, 0xc1a0 /* C3E44C 8024085C 44812000 */ mtc1 $at, $f4 /* C3E450 80240860 44823000 */ mtc1 $v0, $f6 -/* C3E454 80240864 00000000 */ nop +/* C3E454 80240864 00000000 */ nop /* C3E458 80240868 468031A0 */ cvt.s.w $f6, $f6 /* C3E45C 8024086C 44073000 */ mfc1 $a3, $f6 /* C3E460 80240870 8C63002C */ lw $v1, 0x2c($v1) @@ -166,7 +166,7 @@ glabel func_802406A4_C3E294 /* C3E4EC 802408FC 0C012530 */ jal func_800494C0 /* C3E4F0 80240900 0000302D */ daddu $a2, $zero, $zero /* C3E4F4 80240904 0809024F */ j .L8024093C -/* C3E4F8 80240908 00000000 */ nop +/* C3E4F8 80240908 00000000 */ nop .L8024090C: /* C3E4FC 8024090C 14620005 */ bne $v1, $v0, .L80240924 /* C3E500 80240910 2402003C */ addiu $v0, $zero, 0x3c @@ -176,7 +176,7 @@ glabel func_802406A4_C3E294 /* C3E510 80240920 AE220028 */ sw $v0, 0x28($s1) .L80240924: /* C3E514 80240924 14620005 */ bne $v1, $v0, .L8024093C -/* C3E518 80240928 00000000 */ nop +/* C3E518 80240928 00000000 */ nop /* C3E51C 8024092C 8E6200CC */ lw $v0, 0xcc($s3) /* C3E520 80240930 8C420028 */ lw $v0, 0x28($v0) /* C3E524 80240934 A620008E */ sh $zero, 0x8e($s1) diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802409C0_C3E5B0.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802409C0_C3E5B0.s index 3e1c35fd4b..d4e6ccba07 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802409C0_C3E5B0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802409C0_C3E5B0.s @@ -16,7 +16,7 @@ glabel func_802409C0_C3E5B0 /* C3E5DC 802409EC 0040802D */ daddu $s0, $v0, $zero /* C3E5E0 802409F0 C60C000C */ lwc1 $f12, 0xc($s0) /* C3E5E4 802409F4 44820000 */ mtc1 $v0, $f0 -/* C3E5E8 802409F8 00000000 */ nop +/* C3E5E8 802409F8 00000000 */ nop /* C3E5EC 802409FC 46800020 */ cvt.s.w $f0, $f0 /* C3E5F0 80240A00 46006300 */ add.s $f12, $f12, $f0 /* C3E5F4 80240A04 3C0142B4 */ lui $at, 0x42b4 diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240A68_C3E658.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240A68_C3E658.s index 1738828a13..69533dfffa 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240A68_C3E658.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240A68_C3E658.s @@ -22,7 +22,7 @@ glabel func_80240A68_C3E658 /* C3E69C 80240AAC 0C01242D */ jal func_800490B4 /* C3E6A0 80240AB0 0220282D */ daddu $a1, $s1, $zero /* C3E6A4 80240AB4 1040000C */ beqz $v0, .L80240AE8 -/* C3E6A8 80240AB8 00000000 */ nop +/* C3E6A8 80240AB8 00000000 */ nop /* C3E6AC 80240ABC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C3E6B0 80240AC0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* C3E6B4 80240AC4 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -40,7 +40,7 @@ glabel func_80240A68_C3E658 /* C3E6E0 80240AF0 A602008E */ sh $v0, 0x8e($s0) /* C3E6E4 80240AF4 00021400 */ sll $v0, $v0, 0x10 /* C3E6E8 80240AF8 1C400022 */ bgtz $v0, .L80240B84 -/* C3E6EC 80240AFC 00000000 */ nop +/* C3E6EC 80240AFC 00000000 */ nop /* C3E6F0 80240B00 8E420074 */ lw $v0, 0x74($s2) /* C3E6F4 80240B04 2442FFFF */ addiu $v0, $v0, -1 /* C3E6F8 80240B08 18400014 */ blez $v0, .L80240B5C diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240BA0_C3E790.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240BA0_C3E790.s index 12d045992d..f9aa4a6f97 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240BA0_C3E790.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240BA0_C3E790.s @@ -18,14 +18,14 @@ glabel func_80240BA0_C3E790 /* C3E7C4 80240BD4 A462008E */ sh $v0, 0x8e($v1) /* C3E7C8 80240BD8 00021400 */ sll $v0, $v0, 0x10 /* C3E7CC 80240BDC 1C400015 */ bgtz $v0, .L80240C34 -/* C3E7D0 80240BE0 00000000 */ nop +/* C3E7D0 80240BE0 00000000 */ nop /* C3E7D4 80240BE4 8E0200CC */ lw $v0, 0xcc($s0) /* C3E7D8 80240BE8 8C420004 */ lw $v0, 4($v0) /* C3E7DC 80240BEC AC620028 */ sw $v0, 0x28($v1) /* C3E7E0 80240BF0 8E0200D0 */ lw $v0, 0xd0($s0) /* C3E7E4 80240BF4 8C420014 */ lw $v0, 0x14($v0) /* C3E7E8 80240BF8 04410004 */ bgez $v0, .L80240C0C -/* C3E7EC 80240BFC 00000000 */ nop +/* C3E7EC 80240BFC 00000000 */ nop /* C3E7F0 80240C00 C6200000 */ lwc1 $f0, ($s1) /* C3E7F4 80240C04 0809030B */ j .L80240C2C /* C3E7F8 80240C08 E4600018 */ swc1 $f0, 0x18($v1) @@ -33,7 +33,7 @@ glabel func_80240BA0_C3E790 /* C3E7FC 80240C0C 3C018024 */ lui $at, %hi(func_80241E98_A1CF98) /* C3E800 80240C10 D4221E98 */ ldc1 $f2, %lo(func_80241E98_A1CF98)($at) /* C3E804 80240C14 44820000 */ mtc1 $v0, $f0 -/* C3E808 80240C18 00000000 */ nop +/* C3E808 80240C18 00000000 */ nop /* C3E80C 80240C1C 46800021 */ cvt.d.w $f0, $f0 /* C3E810 80240C20 46220003 */ div.d $f0, $f0, $f2 /* C3E814 80240C24 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240C4C_C3E83C.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240C4C_C3E83C.s index d721dc9bab..b7b0191e42 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240C4C_C3E83C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240C4C_C3E83C.s @@ -22,7 +22,7 @@ glabel func_80240C4C_C3E83C /* C3E880 80240C90 0C01242D */ jal func_800490B4 /* C3E884 80240C94 0040802D */ daddu $s0, $v0, $zero /* C3E888 80240C98 1040000C */ beqz $v0, .L80240CCC -/* C3E88C 80240C9C 00000000 */ nop +/* C3E88C 80240C9C 00000000 */ nop /* C3E890 80240CA0 C60C0038 */ lwc1 $f12, 0x38($s0) /* C3E894 80240CA4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C3E898 80240CA8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -45,12 +45,12 @@ glabel func_80240C4C_C3E83C /* C3E8D8 80240CE8 46802120 */ cvt.s.w $f4, $f4 /* C3E8DC 80240CEC 44072000 */ mfc1 $a3, $f4 /* C3E8E0 80240CF0 0C00A7B5 */ jal dist2D -/* C3E8E4 80240CF4 00000000 */ nop +/* C3E8E4 80240CF4 00000000 */ nop /* C3E8E8 80240CF8 C6020018 */ lwc1 $f2, 0x18($s0) /* C3E8EC 80240CFC 4602003E */ c.le.s $f0, $f2 -/* C3E8F0 80240D00 00000000 */ nop +/* C3E8F0 80240D00 00000000 */ nop /* C3E8F4 80240D04 4500000B */ bc1f .L80240D34 -/* C3E8F8 80240D08 00000000 */ nop +/* C3E8F8 80240D08 00000000 */ nop /* C3E8FC 80240D0C 8E4200CC */ lw $v0, 0xcc($s2) /* C3E900 80240D10 8C430000 */ lw $v1, ($v0) /* C3E904 80240D14 2402000F */ addiu $v0, $zero, 0xf @@ -85,7 +85,7 @@ glabel func_80240C4C_C3E83C /* C3E974 80240D84 46802120 */ cvt.s.w $f4, $f4 /* C3E978 80240D88 44072000 */ mfc1 $a3, $f4 /* C3E97C 80240D8C 0C00A720 */ jal atan2 -/* C3E980 80240D90 00000000 */ nop +/* C3E980 80240D90 00000000 */ nop /* C3E984 80240D94 8E050018 */ lw $a1, 0x18($s0) /* C3E988 80240D98 44060000 */ mfc1 $a2, $f0 /* C3E98C 80240D9C 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240DC4_C3E9B4.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240DC4_C3E9B4.s index c849bb54ce..2a3a8aec68 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240DC4_C3E9B4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240DC4_C3E9B4.s @@ -12,13 +12,13 @@ glabel func_80240DC4_C3E9B4 /* C3E9D0 80240DE0 0040182D */ daddu $v1, $v0, $zero /* C3E9D4 80240DE4 8462008C */ lh $v0, 0x8c($v1) /* C3E9D8 80240DE8 14400009 */ bnez $v0, .L80240E10 -/* C3E9DC 80240DEC 00000000 */ nop +/* C3E9DC 80240DEC 00000000 */ nop /* C3E9E0 80240DF0 9462008E */ lhu $v0, 0x8e($v1) /* C3E9E4 80240DF4 2442FFFF */ addiu $v0, $v0, -1 /* C3E9E8 80240DF8 A462008E */ sh $v0, 0x8e($v1) /* C3E9EC 80240DFC 00021400 */ sll $v0, $v0, 0x10 /* C3E9F0 80240E00 1C400003 */ bgtz $v0, .L80240E10 -/* C3E9F4 80240E04 00000000 */ nop +/* C3E9F4 80240E04 00000000 */ nop /* C3E9F8 80240E08 A460008E */ sh $zero, 0x8e($v1) /* C3E9FC 80240E0C AE000070 */ sw $zero, 0x70($s0) .L80240E10: diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s index 19d0880f12..41ff520314 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s @@ -46,7 +46,7 @@ glabel func_80240E20_C3EA10 /* C3EAB4 80240EC4 8E2200B0 */ lw $v0, 0xb0($s1) /* C3EAB8 80240EC8 30420004 */ andi $v0, $v0, 4 /* C3EABC 80240ECC 10400027 */ beqz $v0, .L80240F6C -/* C3EAC0 80240ED0 00000000 */ nop +/* C3EAC0 80240ED0 00000000 */ nop .L80240ED4: /* C3EAC4 80240ED4 2402001E */ addiu $v0, $zero, 0x1e /* C3EAC8 80240ED8 2404F7FF */ addiu $a0, $zero, -0x801 @@ -94,10 +94,10 @@ glabel func_80240E20_C3EA10 /* C3EB60 80240F70 2442FFF6 */ addiu $v0, $v0, -0xa /* C3EB64 80240F74 2C420014 */ sltiu $v0, $v0, 0x14 /* C3EB68 80240F78 10400009 */ beqz $v0, .L80240FA0 -/* C3EB6C 80240F7C 00000000 */ nop +/* C3EB6C 80240F7C 00000000 */ nop /* C3EB70 80240F80 8E22006C */ lw $v0, 0x6c($s1) /* C3EB74 80240F84 14400006 */ bnez $v0, .L80240FA0 -/* C3EB78 80240F88 00000000 */ nop +/* C3EB78 80240F88 00000000 */ nop /* C3EB7C 80240F8C 0C090082 */ jal func_80240208_C3DDF8 /* C3EB80 80240F90 0240202D */ daddu $a0, $s2, $zero /* C3EB84 80240F94 10400002 */ beqz $v0, .L80240FA0 @@ -108,41 +108,47 @@ glabel func_80240E20_C3EA10 /* C3EB94 80240FA4 2C620064 */ sltiu $v0, $v1, 0x64 /* C3EB98 80240FA8 10400067 */ beqz $v0, .L80241148 /* C3EB9C 80240FAC 00031080 */ sll $v0, $v1, 2 -/* C3EBA0 80240FB0 3C018024 */ lui $at, %hi(D_80241EA0) +/* C3EBA0 80240FB0 3C018024 */ lui $at, %hi(jtbl_80241EA0_C3FA90) /* C3EBA4 80240FB4 00220821 */ addu $at, $at, $v0 -/* C3EBA8 80240FB8 8C221EA0 */ lw $v0, %lo(D_80241EA0)($at) +/* C3EBA8 80240FB8 8C221EA0 */ lw $v0, %lo(jtbl_80241EA0_C3FA90)($at) /* C3EBAC 80240FBC 00400008 */ jr $v0 -/* C3EBB0 80240FC0 00000000 */ nop +/* C3EBB0 80240FC0 00000000 */ nop +glabel L80240FC4_C3EBB4 /* C3EBB4 80240FC4 0240202D */ daddu $a0, $s2, $zero /* C3EBB8 80240FC8 0260282D */ daddu $a1, $s3, $zero /* C3EBBC 80240FCC 0C090187 */ jal func_8024061C_C3E20C /* C3EBC0 80240FD0 02A0302D */ daddu $a2, $s5, $zero /* C3EBC4 80240FD4 08090452 */ j .L80241148 -/* C3EBC8 80240FD8 00000000 */ nop +/* C3EBC8 80240FD8 00000000 */ nop +glabel L80240FDC_C3EBCC /* C3EBCC 80240FDC 0240202D */ daddu $a0, $s2, $zero /* C3EBD0 80240FE0 0260282D */ daddu $a1, $s3, $zero /* C3EBD4 80240FE4 0C0901A9 */ jal func_802406A4_C3E294 /* C3EBD8 80240FE8 02A0302D */ daddu $a2, $s5, $zero /* C3EBDC 80240FEC 08090452 */ j .L80241148 -/* C3EBE0 80240FF0 00000000 */ nop +/* C3EBE0 80240FF0 00000000 */ nop +glabel L80240FF4_C3EBE4 /* C3EBE4 80240FF4 0240202D */ daddu $a0, $s2, $zero /* C3EBE8 80240FF8 0260282D */ daddu $a1, $s3, $zero /* C3EBEC 80240FFC 0C090257 */ jal func_8024095C_C3E54C /* C3EBF0 80241000 02A0302D */ daddu $a2, $s5, $zero /* C3EBF4 80241004 08090452 */ j .L80241148 -/* C3EBF8 80241008 00000000 */ nop +/* C3EBF8 80241008 00000000 */ nop +glabel L8024100C_C3EBFC /* C3EBFC 8024100C 0240202D */ daddu $a0, $s2, $zero /* C3EC00 80241010 0260282D */ daddu $a1, $s3, $zero /* C3EC04 80241014 0C090270 */ jal func_802409C0_C3E5B0 /* C3EC08 80241018 02A0302D */ daddu $a2, $s5, $zero /* C3EC0C 8024101C 08090452 */ j .L80241148 -/* C3EC10 80241020 00000000 */ nop +/* C3EC10 80241020 00000000 */ nop +glabel L80241024_C3EC14 /* C3EC14 80241024 0240202D */ daddu $a0, $s2, $zero /* C3EC18 80241028 0260282D */ daddu $a1, $s3, $zero /* C3EC1C 8024102C 0C09029A */ jal func_80240A68_C3E658 /* C3EC20 80241030 02A0302D */ daddu $a2, $s5, $zero /* C3EC24 80241034 08090452 */ j .L80241148 -/* C3EC28 80241038 00000000 */ nop +/* C3EC28 80241038 00000000 */ nop +glabel L8024103C_C3EC2C /* C3EC2C 8024103C 0240202D */ daddu $a0, $s2, $zero /* C3EC30 80241040 0260282D */ daddu $a1, $s3, $zero /* C3EC34 80241044 0C0127DF */ jal func_80049F7C @@ -150,13 +156,15 @@ glabel func_80240E20_C3EA10 /* C3EC3C 8024104C 8E430070 */ lw $v1, 0x70($s2) /* C3EC40 80241050 2402000D */ addiu $v0, $zero, 0xd /* C3EC44 80241054 1462003C */ bne $v1, $v0, .L80241148 -/* C3EC48 80241058 00000000 */ nop +/* C3EC48 80241058 00000000 */ nop +glabel L8024105C_C3EC4C /* C3EC4C 8024105C 0240202D */ daddu $a0, $s2, $zero /* C3EC50 80241060 0260282D */ daddu $a1, $s3, $zero /* C3EC54 80241064 0C012849 */ jal func_8004A124 /* C3EC58 80241068 02A0302D */ daddu $a2, $s5, $zero /* C3EC5C 8024106C 08090452 */ j .L80241148 -/* C3EC60 80241070 00000000 */ nop +/* C3EC60 80241070 00000000 */ nop +glabel L80241074_C3EC64 /* C3EC64 80241074 0240202D */ daddu $a0, $s2, $zero /* C3EC68 80241078 0260282D */ daddu $a1, $s3, $zero /* C3EC6C 8024107C 0C0128FA */ jal func_8004A3E8 @@ -168,26 +176,31 @@ glabel func_80240E20_C3EA10 /* C3EC84 80241094 24020003 */ addiu $v0, $zero, 3 /* C3EC88 80241098 08090452 */ j .L80241148 /* C3EC8C 8024109C AE420070 */ sw $v0, 0x70($s2) +glabel L802410A0_C3EC90 /* C3EC90 802410A0 0C090000 */ jal dgb_07_UnkNpcAIFunc6 /* C3EC94 802410A4 0240202D */ daddu $a0, $s2, $zero /* C3EC98 802410A8 8E430070 */ lw $v1, 0x70($s2) /* C3EC9C 802410AC 2402001F */ addiu $v0, $zero, 0x1f /* C3ECA0 802410B0 14620025 */ bne $v1, $v0, .L80241148 -/* C3ECA4 802410B4 00000000 */ nop +/* C3ECA4 802410B4 00000000 */ nop +glabel L802410B8_C3ECA8 /* C3ECA8 802410B8 0C09001B */ jal dgb_07_UnkNpcAIFunc7 /* C3ECAC 802410BC 0240202D */ daddu $a0, $s2, $zero /* C3ECB0 802410C0 8E430070 */ lw $v1, 0x70($s2) /* C3ECB4 802410C4 24020020 */ addiu $v0, $zero, 0x20 /* C3ECB8 802410C8 1462001F */ bne $v1, $v0, .L80241148 -/* C3ECBC 802410CC 00000000 */ nop +/* C3ECBC 802410CC 00000000 */ nop +glabel L802410D0_C3ECC0 /* C3ECC0 802410D0 0C090037 */ jal dgb_07_UnkNpcAIFunc8 /* C3ECC4 802410D4 0240202D */ daddu $a0, $s2, $zero /* C3ECC8 802410D8 08090452 */ j .L80241148 -/* C3ECCC 802410DC 00000000 */ nop +/* C3ECCC 802410DC 00000000 */ nop +glabel L802410E0_C3ECD0 /* C3ECD0 802410E0 0C09006D */ jal dgb_07_UnkNpcAIFunc5 /* C3ECD4 802410E4 0240202D */ daddu $a0, $s2, $zero /* C3ECD8 802410E8 08090452 */ j .L80241148 -/* C3ECDC 802410EC 00000000 */ nop +/* C3ECDC 802410EC 00000000 */ nop +glabel L802410F0_C3ECE0 /* C3ECE0 802410F0 0240202D */ daddu $a0, $s2, $zero /* C3ECE4 802410F4 0260282D */ daddu $a1, $s3, $zero /* C3ECE8 802410F8 0C0902E8 */ jal func_80240BA0_C3E790 @@ -195,22 +208,26 @@ glabel func_80240E20_C3EA10 /* C3ECF0 80241100 8E430070 */ lw $v1, 0x70($s2) /* C3ECF4 80241104 24020029 */ addiu $v0, $zero, 0x29 /* C3ECF8 80241108 1462000F */ bne $v1, $v0, .L80241148 -/* C3ECFC 8024110C 00000000 */ nop +/* C3ECFC 8024110C 00000000 */ nop +glabel L80241110_C3ED00 /* C3ED00 80241110 0240202D */ daddu $a0, $s2, $zero /* C3ED04 80241114 0260282D */ daddu $a1, $s3, $zero /* C3ED08 80241118 0C090313 */ jal func_80240C4C_C3E83C /* C3ED0C 8024111C 02A0302D */ daddu $a2, $s5, $zero /* C3ED10 80241120 08090452 */ j .L80241148 -/* C3ED14 80241124 00000000 */ nop +/* C3ED14 80241124 00000000 */ nop +glabel L80241128_C3ED18 /* C3ED18 80241128 0240202D */ daddu $a0, $s2, $zero /* C3ED1C 8024112C 0260282D */ daddu $a1, $s3, $zero /* C3ED20 80241130 0C090371 */ jal func_80240DC4_C3E9B4 /* C3ED24 80241134 02A0302D */ daddu $a2, $s5, $zero /* C3ED28 80241138 08090452 */ j .L80241148 -/* C3ED2C 8024113C 00000000 */ nop +/* C3ED2C 8024113C 00000000 */ nop +glabel L80241140_C3ED30 /* C3ED30 80241140 0C0129CF */ jal func_8004A73C /* C3ED34 80241144 0240202D */ daddu $a0, $s2, $zero .L80241148: +glabel L80241148_C3ED38 /* C3ED38 80241148 8FBF0048 */ lw $ra, 0x48($sp) /* C3ED3C 8024114C 8FB50044 */ lw $s5, 0x44($sp) /* C3ED40 80241150 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s index 5bc6206671..a673981fa5 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s @@ -100,78 +100,93 @@ glabel func_80241170_C3ED60 /* C3EEC4 802412D4 2C620064 */ sltiu $v0, $v1, 0x64 /* C3EEC8 802412D8 10400048 */ beqz $v0, .L802413FC /* C3EECC 802412DC 00031080 */ sll $v0, $v1, 2 -/* C3EED0 802412E0 3C018024 */ lui $at, %hi(func_80242030_8EDE50) +/* C3EED0 802412E0 3C018024 */ lui $at, %hi(jtbl_80242030_C3FC20) /* C3EED4 802412E4 00220821 */ addu $at, $at, $v0 -/* C3EED8 802412E8 8C222030 */ lw $v0, %lo(func_80242030_8EDE50)($at) +/* C3EED8 802412E8 8C222030 */ lw $v0, %lo(jtbl_80242030_C3FC20)($at) /* C3EEDC 802412EC 00400008 */ jr $v0 /* C3EEE0 802412F0 00000000 */ nop +glabel L802412F4_C3EEE4 /* C3EEE4 802412F4 0240202D */ daddu $a0, $s2, $zero /* C3EEE8 802412F8 0260282D */ daddu $a1, $s3, $zero /* C3EEEC 802412FC 0C012568 */ jal func_800495A0 /* C3EEF0 80241300 0280302D */ daddu $a2, $s4, $zero +glabel L80241304_C3EEF4 /* C3EEF4 80241304 0240202D */ daddu $a0, $s2, $zero /* C3EEF8 80241308 0260282D */ daddu $a1, $s3, $zero /* C3EEFC 8024130C 0C0125AE */ jal func_800496B8 /* C3EF00 80241310 0280302D */ daddu $a2, $s4, $zero /* C3EF04 80241314 080904FF */ j .L802413FC /* C3EF08 80241318 00000000 */ nop +glabel L8024131C_C3EF0C /* C3EF0C 8024131C 0240202D */ daddu $a0, $s2, $zero /* C3EF10 80241320 0260282D */ daddu $a1, $s3, $zero /* C3EF14 80241324 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C3EF18 80241328 0280302D */ daddu $a2, $s4, $zero +glabel L8024132C_C3EF1C /* C3EF1C 8024132C 0240202D */ daddu $a0, $s2, $zero /* C3EF20 80241330 0260282D */ daddu $a1, $s3, $zero /* C3EF24 80241334 0C012701 */ jal func_80049C04 /* C3EF28 80241338 0280302D */ daddu $a2, $s4, $zero /* C3EF2C 8024133C 080904FF */ j .L802413FC /* C3EF30 80241340 00000000 */ nop +glabel L80241344_C3EF34 /* C3EF34 80241344 0240202D */ daddu $a0, $s2, $zero /* C3EF38 80241348 0260282D */ daddu $a1, $s3, $zero /* C3EF3C 8024134C 0C01278F */ jal func_80049E3C /* C3EF40 80241350 0280302D */ daddu $a2, $s4, $zero +glabel L80241354_C3EF44 /* C3EF44 80241354 0240202D */ daddu $a0, $s2, $zero /* C3EF48 80241358 0260282D */ daddu $a1, $s3, $zero /* C3EF4C 8024135C 0C0127B3 */ jal func_80049ECC /* C3EF50 80241360 0280302D */ daddu $a2, $s4, $zero /* C3EF54 80241364 080904FF */ j .L802413FC /* C3EF58 80241368 00000000 */ nop +glabel L8024136C_C3EF5C /* C3EF5C 8024136C 0240202D */ daddu $a0, $s2, $zero /* C3EF60 80241370 0260282D */ daddu $a1, $s3, $zero /* C3EF64 80241374 0C0127DF */ jal func_80049F7C /* C3EF68 80241378 0280302D */ daddu $a2, $s4, $zero +glabel L8024137C_C3EF6C /* C3EF6C 8024137C 0240202D */ daddu $a0, $s2, $zero /* C3EF70 80241380 0260282D */ daddu $a1, $s3, $zero /* C3EF74 80241384 0C012849 */ jal func_8004A124 /* C3EF78 80241388 0280302D */ daddu $a2, $s4, $zero /* C3EF7C 8024138C 080904FF */ j .L802413FC /* C3EF80 80241390 00000000 */ nop +glabel L80241394_C3EF84 /* C3EF84 80241394 0240202D */ daddu $a0, $s2, $zero /* C3EF88 80241398 0260282D */ daddu $a1, $s3, $zero /* C3EF8C 8024139C 0C0128FA */ jal func_8004A3E8 /* C3EF90 802413A0 0280302D */ daddu $a2, $s4, $zero /* C3EF94 802413A4 080904FF */ j .L802413FC /* C3EF98 802413A8 00000000 */ nop +glabel L802413AC_C3EF9C /* C3EF9C 802413AC 0C090000 */ jal dgb_07_UnkNpcAIFunc6 /* C3EFA0 802413B0 0240202D */ daddu $a0, $s2, $zero +glabel L802413B4_C3EFA4 /* C3EFA4 802413B4 0C09001B */ jal dgb_07_UnkNpcAIFunc7 /* C3EFA8 802413B8 0240202D */ daddu $a0, $s2, $zero /* C3EFAC 802413BC 8E430070 */ lw $v1, 0x70($s2) /* C3EFB0 802413C0 24020020 */ addiu $v0, $zero, 0x20 /* C3EFB4 802413C4 1462000D */ bne $v1, $v0, .L802413FC /* C3EFB8 802413C8 00000000 */ nop +glabel L802413CC_C3EFBC /* C3EFBC 802413CC 0C090037 */ jal dgb_07_UnkNpcAIFunc8 /* C3EFC0 802413D0 0240202D */ daddu $a0, $s2, $zero /* C3EFC4 802413D4 8E430070 */ lw $v1, 0x70($s2) /* C3EFC8 802413D8 24020021 */ addiu $v0, $zero, 0x21 /* C3EFCC 802413DC 14620007 */ bne $v1, $v0, .L802413FC /* C3EFD0 802413E0 00000000 */ nop +glabel L802413E4_C3EFD4 /* C3EFD4 802413E4 0C09006D */ jal dgb_07_UnkNpcAIFunc5 /* C3EFD8 802413E8 0240202D */ daddu $a0, $s2, $zero /* C3EFDC 802413EC 080904FF */ j .L802413FC /* C3EFE0 802413F0 00000000 */ nop +glabel L802413F4_C3EFE4 /* C3EFE4 802413F4 0C0129CF */ jal func_8004A73C /* C3EFE8 802413F8 0240202D */ daddu $a0, $s2, $zero .L802413FC: +glabel L802413FC_C3EFEC /* C3EFEC 802413FC 8FBF0048 */ lw $ra, 0x48($sp) /* C3EFF0 80241400 8FB50044 */ lw $s5, 0x44($sp) /* C3EFF4 80241404 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/update_starpoints_display_C3DFAC.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/update_starpoints_display_C3DFAC.s index 4388e72948..70454f5f47 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/update_starpoints_display_C3DFAC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/update_starpoints_display_C3DFAC.s @@ -19,7 +19,7 @@ glabel update_starpoints_display_C3DFAC /* C3DFE4 802403F4 8E2200B0 */ lw $v0, 0xb0($s1) /* C3DFE8 802403F8 30420004 */ andi $v0, $v0, 4 /* C3DFEC 802403FC 10400015 */ beqz $v0, .L80240454 -/* C3DFF0 80240400 00000000 */ nop +/* C3DFF0 80240400 00000000 */ nop .L80240404: /* C3DFF4 80240404 AE800070 */ sw $zero, 0x70($s4) /* C3DFF8 80240408 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel update_starpoints_display_C3DFAC /* C3E048 80240458 12600005 */ beqz $s3, .L80240470 /* C3E04C 8024045C 24020001 */ addiu $v0, $zero, 1 /* C3E050 80240460 12620048 */ beq $s3, $v0, .L80240584 -/* C3E054 80240464 00000000 */ nop +/* C3E054 80240464 00000000 */ nop /* C3E058 80240468 0809017E */ j .L802405F8 -/* C3E05C 8024046C 00000000 */ nop +/* C3E05C 8024046C 00000000 */ nop .L80240470: /* C3E060 80240470 86240008 */ lh $a0, 8($s1) /* C3E064 80240474 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel update_starpoints_display_C3DFAC /* C3E084 80240494 8E03006C */ lw $v1, 0x6c($s0) /* C3E088 80240498 24020003 */ addiu $v0, $zero, 3 /* C3E08C 8024049C 14620056 */ bne $v1, $v0, .L802405F8 -/* C3E090 802404A0 00000000 */ nop +/* C3E090 802404A0 00000000 */ nop /* C3E094 802404A4 8E2500A8 */ lw $a1, 0xa8($s1) /* C3E098 802404A8 10A00003 */ beqz $a1, .L802404B8 /* C3E09C 802404AC 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel update_starpoints_display_C3DFAC /* C3E114 80240524 C7A20014 */ lwc1 $f2, 0x14($sp) /* C3E118 80240528 4600020D */ trunc.w.s $f8, $f0 /* C3E11C 8024052C 44024000 */ mfc1 $v0, $f8 -/* C3E120 80240530 00000000 */ nop +/* C3E120 80240530 00000000 */ nop /* C3E124 80240534 A6220012 */ sh $v0, 0x12($s1) /* C3E128 80240538 4600120D */ trunc.w.s $f8, $f2 /* C3E12C 8024053C 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240000_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240000_C3FDB0.s index cba120c0c8..eafa54df16 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240000_C3FDB0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240000_C3FDB0.s @@ -45,7 +45,7 @@ glabel func_80240000_C3FDB0 /* C3FE4C 8024009C 0C00A7B5 */ jal dist2D /* C3FE50 802400A0 4600B386 */ mov.s $f14, $f22 /* C3FE54 802400A4 4614003C */ c.lt.s $f0, $f20 -/* C3FE58 802400A8 00000000 */ nop +/* C3FE58 802400A8 00000000 */ nop /* C3FE5C 802400AC 45000003 */ bc1f .L802400BC /* C3FE60 802400B0 2631000C */ addiu $s1, $s1, 0xc /* C3FE64 802400B4 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_80240000_C3FDB0 /* C3FE90 802400E0 8E6200D0 */ lw $v0, 0xd0($s3) /* C3FE94 802400E4 8C42007C */ lw $v0, 0x7c($v0) /* C3FE98 802400E8 04410004 */ bgez $v0, .L802400FC -/* C3FE9C 802400EC 00000000 */ nop +/* C3FE9C 802400EC 00000000 */ nop /* C3FEA0 802400F0 C6C00000 */ lwc1 $f0, ($s6) /* C3FEA4 802400F4 08090047 */ j .L8024011C /* C3FEA8 802400F8 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_80240000_C3FDB0 /* C3FEAC 802400FC 3C018024 */ lui $at, %hi(D_80246A00) /* C3FEB0 80240100 D4226A00 */ ldc1 $f2, %lo(D_80246A00)($at) /* C3FEB4 80240104 44820000 */ mtc1 $v0, $f0 -/* C3FEB8 80240108 00000000 */ nop +/* C3FEB8 80240108 00000000 */ nop /* C3FEBC 8024010C 46800021 */ cvt.d.w $f0, $f0 /* C3FEC0 80240110 46220003 */ div.d $f0, $f0, $f2 /* C3FEC4 80240114 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240158_C3FF08.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240158_C3FF08.s index e44fa74a8a..3b849886b2 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240158_C3FF08.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240158_C3FF08.s @@ -44,7 +44,7 @@ glabel func_80240158_C3FF08 /* C3FFA4 802401F4 2402000F */ addiu $v0, $zero, 0xf /* C3FFA8 802401F8 AFA2001C */ sw $v0, 0x1c($sp) /* C3FFAC 802401FC 44833000 */ mtc1 $v1, $f6 -/* C3FFB0 80240200 00000000 */ nop +/* C3FFB0 80240200 00000000 */ nop /* C3FFB4 80240204 468031A0 */ cvt.s.w $f6, $f6 /* C3FFB8 80240208 44073000 */ mfc1 $a3, $f6 /* C3FFBC 8024020C 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_80240158_C3FF08 .L8024025C: /* C4000C 8024025C 8602008C */ lh $v0, 0x8c($s0) /* C40010 80240260 1440005D */ bnez $v0, .L802403D8 -/* C40014 80240264 00000000 */ nop +/* C40014 80240264 00000000 */ nop /* C40018 80240268 C6000018 */ lwc1 $f0, 0x18($s0) /* C4001C 8024026C 3C014010 */ lui $at, 0x4010 /* C40020 80240270 44811800 */ mtc1 $at, $f3 /* C40024 80240274 44801000 */ mtc1 $zero, $f2 /* C40028 80240278 46000021 */ cvt.d.s $f0, $f0 /* C4002C 8024027C 4622003C */ c.lt.d $f0, $f2 -/* C40030 80240280 00000000 */ nop +/* C40030 80240280 00000000 */ nop /* C40034 80240284 45000003 */ bc1f .L80240294 /* C40038 80240288 0200202D */ daddu $a0, $s0, $zero /* C4003C 8024028C 080900A6 */ j .L80240298 @@ -88,7 +88,7 @@ glabel func_80240158_C3FF08 /* C40044 80240294 24050001 */ addiu $a1, $zero, 1 .L80240298: /* C40048 80240298 0C00F598 */ jal func_8003D660 -/* C4004C 8024029C 00000000 */ nop +/* C4004C 8024029C 00000000 */ nop /* C40050 802402A0 C60C0038 */ lwc1 $f12, 0x38($s0) /* C40054 802402A4 8E430078 */ lw $v1, 0x78($s2) /* C40058 802402A8 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_80240158_C3FF08 /* C40080 802402D0 4406B000 */ mfc1 $a2, $f22 /* C40084 802402D4 4407A000 */ mfc1 $a3, $f20 /* C40088 802402D8 0C00A720 */ jal atan2 -/* C4008C 802402DC 00000000 */ nop +/* C4008C 802402DC 00000000 */ nop /* C40090 802402E0 8E050018 */ lw $a1, 0x18($s0) /* C40094 802402E4 44060000 */ mfc1 $a2, $f0 /* C40098 802402E8 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_80240158_C3FF08 /* C400AC 802402FC 4406B000 */ mfc1 $a2, $f22 /* C400B0 80240300 4407A000 */ mfc1 $a3, $f20 /* C400B4 80240304 0C00A7B5 */ jal dist2D -/* C400B8 80240308 00000000 */ nop +/* C400B8 80240308 00000000 */ nop /* C400BC 8024030C C6020018 */ lwc1 $f2, 0x18($s0) /* C400C0 80240310 4602003E */ c.le.s $f0, $f2 -/* C400C4 80240314 00000000 */ nop +/* C400C4 80240314 00000000 */ nop /* C400C8 80240318 4500002F */ bc1f .L802403D8 /* C400CC 8024031C 240403E8 */ addiu $a0, $zero, 0x3e8 /* C400D0 80240320 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_80240158_C3FF08 /* C40124 80240374 18400003 */ blez $v0, .L80240384 /* C40128 80240378 24020004 */ addiu $v0, $zero, 4 /* C4012C 8024037C 14600002 */ bnez $v1, .L80240388 -/* C40130 80240380 00000000 */ nop +/* C40130 80240380 00000000 */ nop .L80240384: /* C40134 80240384 AE420070 */ sw $v0, 0x70($s2) .L80240388: diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802404C0_C40270.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802404C0_C40270.s index db3983086d..eabff7f791 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802404C0_C40270.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802404C0_C40270.s @@ -38,7 +38,7 @@ glabel func_802404C0_C40270 /* C402F4 80240544 2402000F */ addiu $v0, $zero, 0xf /* C402F8 80240548 AFA2001C */ sw $v0, 0x1c($sp) /* C402FC 8024054C 44833000 */ mtc1 $v1, $f6 -/* C40300 80240550 00000000 */ nop +/* C40300 80240550 00000000 */ nop /* C40304 80240554 468031A0 */ cvt.s.w $f6, $f6 /* C40308 80240558 44073000 */ mfc1 $a3, $f6 /* C4030C 8024055C 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_802404C0_C40270 .L802405C0: /* C40370 802405C0 8602008C */ lh $v0, 0x8c($s0) /* C40374 802405C4 14400025 */ bnez $v0, .L8024065C -/* C40378 802405C8 00000000 */ nop +/* C40378 802405C8 00000000 */ nop /* C4037C 802405CC 9602008E */ lhu $v0, 0x8e($s0) /* C40380 802405D0 2442FFFF */ addiu $v0, $v0, -1 /* C40384 802405D4 A602008E */ sh $v0, 0x8e($s0) /* C40388 802405D8 00021400 */ sll $v0, $v0, 0x10 /* C4038C 802405DC 1440001F */ bnez $v0, .L8024065C -/* C40390 802405E0 00000000 */ nop +/* C40390 802405E0 00000000 */ nop /* C40394 802405E4 8E820074 */ lw $v0, 0x74($s4) /* C40398 802405E8 2442FFFF */ addiu $v0, $v0, -1 /* C4039C 802405EC 10400019 */ beqz $v0, .L80240654 @@ -84,7 +84,7 @@ glabel func_802404C0_C40270 /* C403A8 802405F8 9442002A */ lhu $v0, 0x2a($v0) /* C403AC 802405FC 30420010 */ andi $v0, $v0, 0x10 /* C403B0 80240600 14400007 */ bnez $v0, .L80240620 -/* C403B4 80240604 00000000 */ nop +/* C403B4 80240604 00000000 */ nop /* C403B8 80240608 C600000C */ lwc1 $f0, 0xc($s0) /* C403BC 8024060C 3C014334 */ lui $at, 0x4334 /* C403C0 80240610 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024067C_C4042C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024067C_C4042C.s index b2e5fcbd3f..95f7e9e0fd 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024067C_C4042C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024067C_C4042C.s @@ -28,7 +28,7 @@ glabel func_8024067C_C4042C /* C40484 802406D4 8E0200D0 */ lw $v0, 0xd0($s0) /* C40488 802406D8 8C42007C */ lw $v0, 0x7c($v0) /* C4048C 802406DC 04410004 */ bgez $v0, .L802406F0 -/* C40490 802406E0 00000000 */ nop +/* C40490 802406E0 00000000 */ nop /* C40494 802406E4 C6400000 */ lwc1 $f0, ($s2) /* C40498 802406E8 080901C4 */ j .L80240710 /* C4049C 802406EC E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_8024067C_C4042C /* C404A0 802406F0 3C018024 */ lui $at, %hi(D_80246A08) /* C404A4 802406F4 D4226A08 */ ldc1 $f2, %lo(D_80246A08)($at) /* C404A8 802406F8 44820000 */ mtc1 $v0, $f0 -/* C404AC 802406FC 00000000 */ nop +/* C404AC 802406FC 00000000 */ nop /* C404B0 80240700 46800021 */ cvt.d.w $f0, $f0 /* C404B4 80240704 46220003 */ div.d $f0, $f0, $f2 /* C404B8 80240708 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024081C_C405CC.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024081C_C405CC.s index e852984e1f..c4a771d88f 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024081C_C405CC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024081C_C405CC.s @@ -47,20 +47,20 @@ glabel func_8024081C_C405CC /* C40674 802408C4 8E02001C */ lw $v0, 0x1c($s0) /* C40678 802408C8 46001005 */ abs.s $f0, $f2 /* C4067C 802408CC 44822000 */ mtc1 $v0, $f4 -/* C40680 802408D0 00000000 */ nop +/* C40680 802408D0 00000000 */ nop /* C40684 802408D4 46802120 */ cvt.s.w $f4, $f4 /* C40688 802408D8 4600203C */ c.lt.s $f4, $f0 -/* C4068C 802408DC 00000000 */ nop +/* C4068C 802408DC 00000000 */ nop /* C40690 802408E0 4500000D */ bc1f .L80240918 -/* C40694 802408E4 00000000 */ nop +/* C40694 802408E4 00000000 */ nop /* C40698 802408E8 44800000 */ mtc1 $zero, $f0 /* C4069C 802408EC C654000C */ lwc1 $f20, 0xc($s2) /* C406A0 802408F0 4600103C */ c.lt.s $f2, $f0 -/* C406A4 802408F4 00000000 */ nop +/* C406A4 802408F4 00000000 */ nop /* C406A8 802408F8 45000006 */ bc1f .L80240914 /* C406AC 802408FC 00021023 */ negu $v0, $v0 /* C406B0 80240900 44820000 */ mtc1 $v0, $f0 -/* C406B4 80240904 00000000 */ nop +/* C406B4 80240904 00000000 */ nop /* C406B8 80240908 46800020 */ cvt.s.w $f0, $f0 /* C406BC 8024090C 08090246 */ j .L80240918 /* C406C0 80240910 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024094C_C406FC.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024094C_C406FC.s index 7997a0de78..83026d5f8f 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024094C_C406FC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024094C_C406FC.s @@ -37,7 +37,7 @@ glabel func_8024094C_C406FC /* C4077C 802409CC 2402000F */ addiu $v0, $zero, 0xf /* C40780 802409D0 AFA2001C */ sw $v0, 0x1c($sp) /* C40784 802409D4 44833000 */ mtc1 $v1, $f6 -/* C40788 802409D8 00000000 */ nop +/* C40788 802409D8 00000000 */ nop /* C4078C 802409DC 468031A0 */ cvt.s.w $f6, $f6 /* C40790 802409E0 44073000 */ mfc1 $a3, $f6 /* C40794 802409E4 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240AD4_C40884.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240AD4_C40884.s index 1c16bf5657..9c92700679 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240AD4_C40884.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240AD4_C40884.s @@ -28,7 +28,7 @@ glabel func_80240AD4_C40884 /* C408DC 80240B2C C4400008 */ lwc1 $f0, 8($v0) /* C408E0 80240B30 46800020 */ cvt.s.w $f0, $f0 /* C408E4 80240B34 4602003E */ c.le.s $f0, $f2 -/* C408E8 80240B38 00000000 */ nop +/* C408E8 80240B38 00000000 */ nop /* C408EC 80240B3C 45020003 */ bc1fl .L80240B4C /* C408F0 80240B40 24840001 */ addiu $a0, $a0, 1 /* C408F4 80240B44 080902D7 */ j .L80240B5C diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s index 171cee1c1a..b8a4e506e8 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s @@ -46,7 +46,7 @@ glabel func_80240B94_C40944 /* C409E8 80240C38 8E2200B0 */ lw $v0, 0xb0($s1) /* C409EC 80240C3C 30420004 */ andi $v0, $v0, 4 /* C409F0 80240C40 10400044 */ beqz $v0, .L80240D54 -/* C409F4 80240C44 00000000 */ nop +/* C409F4 80240C44 00000000 */ nop .L80240C48: /* C409F8 80240C48 2404F7FF */ addiu $a0, $zero, -0x801 /* C409FC 80240C4C AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80240B94_C40944 /* C40AB0 80240D00 3C0142C8 */ lui $at, 0x42c8 /* C40AB4 80240D04 44812000 */ mtc1 $at, $f4 /* C40AB8 80240D08 44823000 */ mtc1 $v0, $f6 -/* C40ABC 80240D0C 00000000 */ nop +/* C40ABC 80240D0C 00000000 */ nop /* C40AC0 80240D10 468031A0 */ cvt.s.w $f6, $f6 /* C40AC4 80240D14 27A20044 */ addiu $v0, $sp, 0x44 /* C40AC8 80240D18 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80240B94_C40944 /* C40AEC 80240D3C 0C0372DF */ jal func_800DCB7C /* C40AF0 80240D40 27A70040 */ addiu $a3, $sp, 0x40 /* C40AF4 80240D44 10400003 */ beqz $v0, .L80240D54 -/* C40AF8 80240D48 00000000 */ nop +/* C40AF8 80240D48 00000000 */ nop /* C40AFC 80240D4C C7A0003C */ lwc1 $f0, 0x3c($sp) /* C40B00 80240D50 E640003C */ swc1 $f0, 0x3c($s2) .L80240D54: @@ -124,72 +124,85 @@ glabel func_80240B94_C40944 /* C40B08 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 /* C40B0C 80240D5C 10400042 */ beqz $v0, .L80240E68 /* C40B10 80240D60 00031080 */ sll $v0, $v1, 2 -/* C40B14 80240D64 3C018024 */ lui $at, %hi(D_80246A10) +/* C40B14 80240D64 3C018024 */ lui $at, %hi(jtbl_80246A10_C467C0) /* C40B18 80240D68 00220821 */ addu $at, $at, $v0 -/* C40B1C 80240D6C 8C226A10 */ lw $v0, %lo(D_80246A10)($at) +/* C40B1C 80240D6C 8C226A10 */ lw $v0, %lo(jtbl_80246A10_C467C0)($at) /* C40B20 80240D70 00400008 */ jr $v0 -/* C40B24 80240D74 00000000 */ nop +/* C40B24 80240D74 00000000 */ nop +glabel L80240D78_C40B28 /* C40B28 80240D78 0280202D */ daddu $a0, $s4, $zero /* C40B2C 80240D7C 0260282D */ daddu $a1, $s3, $zero /* C40B30 80240D80 0C090000 */ jal func_80240000_C3FDB0 /* C40B34 80240D84 02A0302D */ daddu $a2, $s5, $zero +glabel L80240D88_C40B38 /* C40B38 80240D88 0280202D */ daddu $a0, $s4, $zero /* C40B3C 80240D8C 0260282D */ daddu $a1, $s3, $zero /* C40B40 80240D90 0C090056 */ jal func_80240158_C3FF08 /* C40B44 80240D94 02A0302D */ daddu $a2, $s5, $zero /* C40B48 80240D98 0809039A */ j .L80240E68 -/* C40B4C 80240D9C 00000000 */ nop +/* C40B4C 80240D9C 00000000 */ nop +glabel L80240DA0_C40B50 /* C40B50 80240DA0 0280202D */ daddu $a0, $s4, $zero /* C40B54 80240DA4 0260282D */ daddu $a1, $s3, $zero /* C40B58 80240DA8 0C090100 */ jal dgb_08_UnkNpcAIFunc1 /* C40B5C 80240DAC 02A0302D */ daddu $a2, $s5, $zero +glabel L80240DB0_C40B60 /* C40B60 80240DB0 0280202D */ daddu $a0, $s4, $zero /* C40B64 80240DB4 0260282D */ daddu $a1, $s3, $zero /* C40B68 80240DB8 0C090130 */ jal func_802404C0_C40270 /* C40B6C 80240DBC 02A0302D */ daddu $a2, $s5, $zero /* C40B70 80240DC0 0809039A */ j .L80240E68 -/* C40B74 80240DC4 00000000 */ nop +/* C40B74 80240DC4 00000000 */ nop +glabel L80240DC8_C40B78 /* C40B78 80240DC8 0280202D */ daddu $a0, $s4, $zero /* C40B7C 80240DCC 0260282D */ daddu $a1, $s3, $zero /* C40B80 80240DD0 0C09019F */ jal func_8024067C_C4042C /* C40B84 80240DD4 02A0302D */ daddu $a2, $s5, $zero /* C40B88 80240DD8 0809039A */ j .L80240E68 -/* C40B8C 80240DDC 00000000 */ nop +/* C40B8C 80240DDC 00000000 */ nop +glabel L80240DE0_C40B90 /* C40B90 80240DE0 0280202D */ daddu $a0, $s4, $zero /* C40B94 80240DE4 0260282D */ daddu $a1, $s3, $zero /* C40B98 80240DE8 0C0901CC */ jal dgb_08_NpcJumpFunc2 /* C40B9C 80240DEC 02A0302D */ daddu $a2, $s5, $zero +glabel L80240DF0_C40BA0 /* C40BA0 80240DF0 0280202D */ daddu $a0, $s4, $zero /* C40BA4 80240DF4 0260282D */ daddu $a1, $s3, $zero /* C40BA8 80240DF8 0C0901E9 */ jal dgb_08_NpcJumpFunc /* C40BAC 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* C40BB0 80240E00 0809039A */ j .L80240E68 -/* C40BB4 80240E04 00000000 */ nop +/* C40BB4 80240E04 00000000 */ nop +glabel L80240E08_C40BB8 /* C40BB8 80240E08 0280202D */ daddu $a0, $s4, $zero /* C40BBC 80240E0C 0260282D */ daddu $a1, $s3, $zero /* C40BC0 80240E10 0C090207 */ jal func_8024081C_C405CC /* C40BC4 80240E14 02A0302D */ daddu $a2, $s5, $zero +glabel L80240E18_C40BC8 /* C40BC8 80240E18 0280202D */ daddu $a0, $s4, $zero /* C40BCC 80240E1C 0260282D */ daddu $a1, $s3, $zero /* C40BD0 80240E20 0C090253 */ jal func_8024094C_C406FC /* C40BD4 80240E24 02A0302D */ daddu $a2, $s5, $zero /* C40BD8 80240E28 0809039A */ j .L80240E68 -/* C40BDC 80240E2C 00000000 */ nop +/* C40BDC 80240E2C 00000000 */ nop +glabel L80240E30_C40BE0 /* C40BE0 80240E30 0280202D */ daddu $a0, $s4, $zero /* C40BE4 80240E34 0260282D */ daddu $a1, $s3, $zero /* C40BE8 80240E38 0C09029B */ jal dgb_08_UnkNpcDurationFlagFunc /* C40BEC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* C40BF0 80240E40 0809039A */ j .L80240E68 -/* C40BF4 80240E44 00000000 */ nop +/* C40BF4 80240E44 00000000 */ nop +glabel L80240E48_C40BF8 /* C40BF8 80240E48 0280202D */ daddu $a0, $s4, $zero /* C40BFC 80240E4C 0260282D */ daddu $a1, $s3, $zero /* C40C00 80240E50 0C0902B5 */ jal func_80240AD4_C40884 /* C40C04 80240E54 02A0302D */ daddu $a2, $s5, $zero /* C40C08 80240E58 0809039A */ j .L80240E68 -/* C40C0C 80240E5C 00000000 */ nop +/* C40C0C 80240E5C 00000000 */ nop +glabel L80240E60_C40C10 /* C40C10 80240E60 0C0129CF */ jal func_8004A73C /* C40C14 80240E64 0280202D */ daddu $a0, $s4, $zero .L80240E68: +glabel L80240E68_C40C18 /* C40C18 80240E68 8FBF0060 */ lw $ra, 0x60($sp) /* C40C1C 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) /* C40C20 80240E70 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241098_C40E48.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241098_C40E48.s index 9ab037f5be..db4722c22d 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241098_C40E48.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241098_C40E48.s @@ -42,7 +42,7 @@ glabel func_80241098_C40E48 /* C40EDC 8024112C C6620074 */ lwc1 $f2, 0x74($s3) /* C40EE0 80241130 468010A0 */ cvt.s.w $f2, $f2 /* C40EE4 80241134 4600103C */ c.lt.s $f2, $f0 -/* C40EE8 80241138 00000000 */ nop +/* C40EE8 80241138 00000000 */ nop /* C40EEC 8024113C 45030001 */ bc1tl .L80241144 /* C40EF0 80241140 0000882D */ daddu $s1, $zero, $zero .L80241144: @@ -51,16 +51,16 @@ glabel func_80241098_C40E48 /* C40EFC 8024114C 3C014387 */ lui $at, 0x4387 /* C40F00 80241150 4481A000 */ mtc1 $at, $f20 /* C40F04 80241154 0C00A70A */ jal get_clamped_angle_diff -/* C40F08 80241158 00000000 */ nop +/* C40F08 80241158 00000000 */ nop /* C40F0C 8024115C 0C00A6C9 */ jal clamp_angle /* C40F10 80241160 46000306 */ mov.s $f12, $f0 /* C40F14 80241164 3C018024 */ lui $at, %hi(D_80246BA0) /* C40F18 80241168 D4226BA0 */ ldc1 $f2, %lo(D_80246BA0)($at) /* C40F1C 8024116C 46000021 */ cvt.d.s $f0, $f0 /* C40F20 80241170 4622003C */ c.lt.d $f0, $f2 -/* C40F24 80241174 00000000 */ nop +/* C40F24 80241174 00000000 */ nop /* C40F28 80241178 45000003 */ bc1f .L80241188 -/* C40F2C 8024117C 00000000 */ nop +/* C40F2C 8024117C 00000000 */ nop /* C40F30 80241180 3C0142B4 */ lui $at, 0x42b4 /* C40F34 80241184 4481A000 */ mtc1 $at, $f20 .L80241188: @@ -77,7 +77,7 @@ glabel func_80241098_C40E48 /* C40F60 802411B0 468010A0 */ cvt.s.w $f2, $f2 /* C40F64 802411B4 46000005 */ abs.s $f0, $f0 /* C40F68 802411B8 4600103C */ c.lt.s $f2, $f0 -/* C40F6C 802411BC 00000000 */ nop +/* C40F6C 802411BC 00000000 */ nop /* C40F70 802411C0 45030001 */ bc1tl .L802411C8 /* C40F74 802411C4 0000882D */ daddu $s1, $zero, $zero .L802411C8: @@ -87,13 +87,13 @@ glabel func_80241098_C40E48 /* C40F84 802411D4 860200A8 */ lh $v0, 0xa8($s0) /* C40F88 802411D8 46020001 */ sub.s $f0, $f0, $f2 /* C40F8C 802411DC 44821000 */ mtc1 $v0, $f2 -/* C40F90 802411E0 00000000 */ nop +/* C40F90 802411E0 00000000 */ nop /* C40F94 802411E4 468010A1 */ cvt.d.w $f2, $f2 /* C40F98 802411E8 46221080 */ add.d $f2, $f2, $f2 /* C40F9C 802411EC 46000005 */ abs.s $f0, $f0 /* C40FA0 802411F0 46000021 */ cvt.d.s $f0, $f0 /* C40FA4 802411F4 4620103E */ c.le.d $f2, $f0 -/* C40FA8 802411F8 00000000 */ nop +/* C40FA8 802411F8 00000000 */ nop /* C40FAC 802411FC 45030001 */ bc1tl .L80241204 /* C40FB0 80241200 0000882D */ daddu $s1, $zero, $zero .L80241204: diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024124C_C40FFC.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024124C_C40FFC.s index 55d4c2013a..c9f4e89897 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024124C_C40FFC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024124C_C40FFC.s @@ -19,7 +19,7 @@ glabel func_8024124C_C40FFC /* C41034 80241284 8E2200B0 */ lw $v0, 0xb0($s1) /* C41038 80241288 30420004 */ andi $v0, $v0, 4 /* C4103C 8024128C 10400015 */ beqz $v0, .L802412E4 -/* C41040 80241290 00000000 */ nop +/* C41040 80241290 00000000 */ nop .L80241294: /* C41044 80241294 AE800070 */ sw $zero, 0x70($s4) /* C41048 80241298 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel func_8024124C_C40FFC /* C41098 802412E8 12600005 */ beqz $s3, .L80241300 /* C4109C 802412EC 24020001 */ addiu $v0, $zero, 1 /* C410A0 802412F0 12620048 */ beq $s3, $v0, .L80241414 -/* C410A4 802412F4 00000000 */ nop +/* C410A4 802412F4 00000000 */ nop /* C410A8 802412F8 08090522 */ j .L80241488 -/* C410AC 802412FC 00000000 */ nop +/* C410AC 802412FC 00000000 */ nop .L80241300: /* C410B0 80241300 86240008 */ lh $a0, 8($s1) /* C410B4 80241304 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel func_8024124C_C40FFC /* C410D4 80241324 8E03006C */ lw $v1, 0x6c($s0) /* C410D8 80241328 24020003 */ addiu $v0, $zero, 3 /* C410DC 8024132C 14620056 */ bne $v1, $v0, .L80241488 -/* C410E0 80241330 00000000 */ nop +/* C410E0 80241330 00000000 */ nop /* C410E4 80241334 8E2500A8 */ lw $a1, 0xa8($s1) /* C410E8 80241338 10A00003 */ beqz $a1, .L80241348 /* C410EC 8024133C 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel func_8024124C_C40FFC /* C41164 802413B4 C7A20014 */ lwc1 $f2, 0x14($sp) /* C41168 802413B8 4600020D */ trunc.w.s $f8, $f0 /* C4116C 802413BC 44024000 */ mfc1 $v0, $f8 -/* C41170 802413C0 00000000 */ nop +/* C41170 802413C0 00000000 */ nop /* C41174 802413C4 A6220012 */ sh $v0, 0x12($s1) /* C41178 802413C8 4600120D */ trunc.w.s $f8, $f2 /* C4117C 802413CC 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s index ee9b4c96f4..3d0475e840 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s @@ -100,78 +100,93 @@ glabel func_802414AC_C4125C /* C413C0 80241610 2C620064 */ sltiu $v0, $v1, 0x64 /* C413C4 80241614 10400048 */ beqz $v0, .L80241738 /* C413C8 80241618 00031080 */ sll $v0, $v1, 2 -/* C413CC 8024161C 3C018024 */ lui $at, %hi(D_80246BA8) +/* C413CC 8024161C 3C018024 */ lui $at, %hi(jtbl_80246BA8_C46958) /* C413D0 80241620 00220821 */ addu $at, $at, $v0 -/* C413D4 80241624 8C226BA8 */ lw $v0, %lo(D_80246BA8)($at) +/* C413D4 80241624 8C226BA8 */ lw $v0, %lo(jtbl_80246BA8_C46958)($at) /* C413D8 80241628 00400008 */ jr $v0 /* C413DC 8024162C 00000000 */ nop +glabel L80241630_C413E0 /* C413E0 80241630 0240202D */ daddu $a0, $s2, $zero /* C413E4 80241634 0260282D */ daddu $a1, $s3, $zero /* C413E8 80241638 0C012568 */ jal func_800495A0 /* C413EC 8024163C 0280302D */ daddu $a2, $s4, $zero +glabel L80241640_C413F0 /* C413F0 80241640 0240202D */ daddu $a0, $s2, $zero /* C413F4 80241644 0260282D */ daddu $a1, $s3, $zero /* C413F8 80241648 0C0125AE */ jal func_800496B8 /* C413FC 8024164C 0280302D */ daddu $a2, $s4, $zero /* C41400 80241650 080905CE */ j .L80241738 /* C41404 80241654 00000000 */ nop +glabel L80241658_C41408 /* C41408 80241658 0240202D */ daddu $a0, $s2, $zero /* C4140C 8024165C 0260282D */ daddu $a1, $s3, $zero /* C41410 80241660 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C41414 80241664 0280302D */ daddu $a2, $s4, $zero +glabel L80241668_C41418 /* C41418 80241668 0240202D */ daddu $a0, $s2, $zero /* C4141C 8024166C 0260282D */ daddu $a1, $s3, $zero /* C41420 80241670 0C012701 */ jal func_80049C04 /* C41424 80241674 0280302D */ daddu $a2, $s4, $zero /* C41428 80241678 080905CE */ j .L80241738 /* C4142C 8024167C 00000000 */ nop +glabel L80241680_C41430 /* C41430 80241680 0240202D */ daddu $a0, $s2, $zero /* C41434 80241684 0260282D */ daddu $a1, $s3, $zero /* C41438 80241688 0C01278F */ jal func_80049E3C /* C4143C 8024168C 0280302D */ daddu $a2, $s4, $zero +glabel L80241690_C41440 /* C41440 80241690 0240202D */ daddu $a0, $s2, $zero /* C41444 80241694 0260282D */ daddu $a1, $s3, $zero /* C41448 80241698 0C0127B3 */ jal func_80049ECC /* C4144C 8024169C 0280302D */ daddu $a2, $s4, $zero /* C41450 802416A0 080905CE */ j .L80241738 /* C41454 802416A4 00000000 */ nop +glabel L802416A8_C41458 /* C41458 802416A8 0240202D */ daddu $a0, $s2, $zero /* C4145C 802416AC 0260282D */ daddu $a1, $s3, $zero /* C41460 802416B0 0C0127DF */ jal func_80049F7C /* C41464 802416B4 0280302D */ daddu $a2, $s4, $zero +glabel L802416B8_C41468 /* C41468 802416B8 0240202D */ daddu $a0, $s2, $zero /* C4146C 802416BC 0260282D */ daddu $a1, $s3, $zero /* C41470 802416C0 0C012849 */ jal func_8004A124 /* C41474 802416C4 0280302D */ daddu $a2, $s4, $zero /* C41478 802416C8 080905CE */ j .L80241738 /* C4147C 802416CC 00000000 */ nop +glabel L802416D0_C41480 /* C41480 802416D0 0240202D */ daddu $a0, $s2, $zero /* C41484 802416D4 0260282D */ daddu $a1, $s3, $zero /* C41488 802416D8 0C0128FA */ jal func_8004A3E8 /* C4148C 802416DC 0280302D */ daddu $a2, $s4, $zero /* C41490 802416E0 080905CE */ j .L80241738 /* C41494 802416E4 00000000 */ nop +glabel L802416E8_C41498 /* C41498 802416E8 0C0903A4 */ jal dgb_08_UnkNpcAIFunc6 /* C4149C 802416EC 0240202D */ daddu $a0, $s2, $zero +glabel L802416F0_C414A0 /* C414A0 802416F0 0C0903BF */ jal dgb_08_UnkNpcAIFunc7 /* C414A4 802416F4 0240202D */ daddu $a0, $s2, $zero /* C414A8 802416F8 8E430070 */ lw $v1, 0x70($s2) /* C414AC 802416FC 24020020 */ addiu $v0, $zero, 0x20 /* C414B0 80241700 1462000D */ bne $v1, $v0, .L80241738 /* C414B4 80241704 00000000 */ nop +glabel L80241708_C414B8 /* C414B8 80241708 0C0903DB */ jal dgb_08_UnkNpcAIFunc8 /* C414BC 8024170C 0240202D */ daddu $a0, $s2, $zero /* C414C0 80241710 8E430070 */ lw $v1, 0x70($s2) /* C414C4 80241714 24020021 */ addiu $v0, $zero, 0x21 /* C414C8 80241718 14620007 */ bne $v1, $v0, .L80241738 /* C414CC 8024171C 00000000 */ nop +glabel L80241720_C414D0 /* C414D0 80241720 0C090411 */ jal dgb_08_UnkNpcAIFunc5 /* C414D4 80241724 0240202D */ daddu $a0, $s2, $zero /* C414D8 80241728 080905CE */ j .L80241738 /* C414DC 8024172C 00000000 */ nop +glabel L80241730_C414E0 /* C414E0 80241730 0C0129CF */ jal func_8004A73C /* C414E4 80241734 0240202D */ daddu $a0, $s2, $zero .L80241738: +glabel L80241738_C414E8 /* C414E8 80241738 8FBF0048 */ lw $ra, 0x48($sp) /* C414EC 8024173C 8FB50044 */ lw $s5, 0x44($sp) /* C414F0 80241740 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241760_C41510.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241760_C41510.s index 90ffcb0f37..eda4a366cf 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241760_C41510.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241760_C41510.s @@ -47,7 +47,7 @@ glabel func_80241760_C41510 /* C415B8 80241808 0C0123F5 */ jal is_point_within_region /* C415BC 8024180C 8E070038 */ lw $a3, 0x38($s0) /* C415C0 80241810 1040000E */ beqz $v0, .L8024184C -/* C415C4 80241814 00000000 */ nop +/* C415C4 80241814 00000000 */ nop /* C415C8 80241818 8E2200D0 */ lw $v0, 0xd0($s1) /* C415CC 8024181C C60C0038 */ lwc1 $f12, 0x38($s0) /* C415D0 80241820 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80241760_C41510 /* C415E4 80241834 468031A0 */ cvt.s.w $f6, $f6 /* C415E8 80241838 44073000 */ mfc1 $a3, $f6 /* C415EC 8024183C 0C00A720 */ jal atan2 -/* C415F0 80241840 00000000 */ nop +/* C415F0 80241840 00000000 */ nop /* C415F4 80241844 0809061F */ j .L8024187C /* C415F8 80241848 E600000C */ swc1 $f0, 0xc($s0) .L8024184C: @@ -66,7 +66,7 @@ glabel func_80241760_C41510 /* C41600 80241850 2404003C */ addiu $a0, $zero, 0x3c /* C41604 80241854 C60C000C */ lwc1 $f12, 0xc($s0) /* C41608 80241858 44820000 */ mtc1 $v0, $f0 -/* C4160C 8024185C 00000000 */ nop +/* C4160C 8024185C 00000000 */ nop /* C41610 80241860 46800020 */ cvt.s.w $f0, $f0 /* C41614 80241864 46006300 */ add.s $f12, $f12, $f0 /* C41618 80241868 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80241760_C41510 /* C4163C 8024188C 8E2200D0 */ lw $v0, 0xd0($s1) /* C41640 80241890 8C420014 */ lw $v0, 0x14($v0) /* C41644 80241894 04410004 */ bgez $v0, .L802418A8 -/* C41648 80241898 00000000 */ nop +/* C41648 80241898 00000000 */ nop /* C4164C 8024189C C6400000 */ lwc1 $f0, ($s2) /* C41650 802418A0 08090632 */ j .L802418C8 /* C41654 802418A4 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80241760_C41510 /* C41658 802418A8 3C018024 */ lui $at, %hi(D_80246D38) /* C4165C 802418AC D4226D38 */ ldc1 $f2, %lo(D_80246D38)($at) /* C41660 802418B0 44820000 */ mtc1 $v0, $f0 -/* C41664 802418B4 00000000 */ nop +/* C41664 802418B4 00000000 */ nop /* C41668 802418B8 46800021 */ cvt.d.w $f0, $f0 /* C4166C 802418BC 46220003 */ div.d $f0, $f0, $f2 /* C41670 802418C0 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80241760_C41510 /* C41684 802418D4 44801000 */ mtc1 $zero, $f2 /* C41688 802418D8 46000021 */ cvt.d.s $f0, $f0 /* C4168C 802418DC 46220002 */ mul.d $f0, $f0, $f2 -/* C41690 802418E0 00000000 */ nop +/* C41690 802418E0 00000000 */ nop /* C41694 802418E4 24020001 */ addiu $v0, $zero, 1 /* C41698 802418E8 4620018D */ trunc.w.d $f6, $f0 /* C4169C 802418EC E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241910_C416C0.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241910_C416C0.s index 31b3f7c06d..70006a9b02 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241910_C416C0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241910_C416C0.s @@ -34,7 +34,7 @@ glabel func_80241910_C416C0 /* C41734 80241984 44803000 */ mtc1 $zero, $f6 /* C41738 80241988 46000021 */ cvt.d.s $f0, $f0 /* C4173C 8024198C 46260002 */ mul.d $f0, $f0, $f6 -/* C41740 80241990 00000000 */ nop +/* C41740 80241990 00000000 */ nop /* C41744 80241994 24020001 */ addiu $v0, $zero, 1 /* C41748 80241998 8E24006C */ lw $a0, 0x6c($s1) /* C4174C 8024199C 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80241910_C416C0 /* C417A8 802419F8 C600003C */ lwc1 $f0, 0x3c($s0) /* C417AC 802419FC 4600C001 */ sub.s $f0, $f24, $f0 /* C417B0 80241A00 4600B03C */ c.lt.s $f22, $f0 -/* C417B4 80241A04 00000000 */ nop +/* C417B4 80241A04 00000000 */ nop /* C417B8 80241A08 4500001B */ bc1f .L80241A78 /* C417BC 80241A0C 34820010 */ ori $v0, $a0, 0x10 /* C417C0 80241A10 0809069E */ j .L80241A78 @@ -87,9 +87,9 @@ glabel func_80241910_C416C0 /* C41804 80241A54 C7A00034 */ lwc1 $f0, 0x34($sp) /* C41808 80241A58 4600D001 */ sub.s $f0, $f26, $f0 /* C4180C 80241A5C 4600B03C */ c.lt.s $f22, $f0 -/* C41810 80241A60 00000000 */ nop +/* C41810 80241A60 00000000 */ nop /* C41814 80241A64 45000004 */ bc1f .L80241A78 -/* C41818 80241A68 00000000 */ nop +/* C41818 80241A68 00000000 */ nop /* C4181C 80241A6C 8E22006C */ lw $v0, 0x6c($s1) /* C41820 80241A70 34420010 */ ori $v0, $v0, 0x10 /* C41824 80241A74 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80241910_C416C0 /* C4182C 80241A7C 24030011 */ addiu $v1, $zero, 0x11 /* C41830 80241A80 30420011 */ andi $v0, $v0, 0x11 /* C41834 80241A84 14430039 */ bne $v0, $v1, .L80241B6C -/* C41838 80241A88 00000000 */ nop +/* C41838 80241A88 00000000 */ nop /* C4183C 80241A8C 8E020000 */ lw $v0, ($s0) /* C41840 80241A90 30420008 */ andi $v0, $v0, 8 /* C41844 80241A94 1040000A */ beqz $v0, .L80241AC0 @@ -108,7 +108,7 @@ glabel func_80241910_C416C0 /* C41854 80241AA4 D4206D40 */ ldc1 $f0, %lo(D_80246D40)($at) /* C41858 80241AA8 460010A1 */ cvt.d.s $f2, $f2 /* C4185C 80241AAC 46201082 */ mul.d $f2, $f2, $f0 -/* C41860 80241AB0 00000000 */ nop +/* C41860 80241AB0 00000000 */ nop /* C41864 80241AB4 4600A021 */ cvt.d.s $f0, $f20 /* C41868 80241AB8 080906C9 */ j .L80241B24 /* C4186C 80241ABC 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80241910_C416C0 /* C418BC 80241B0C D4206D48 */ ldc1 $f0, %lo(D_80246D48)($at) /* C418C0 80241B10 460010A1 */ cvt.d.s $f2, $f2 /* C418C4 80241B14 46201082 */ mul.d $f2, $f2, $f0 -/* C418C8 80241B18 00000000 */ nop +/* C418C8 80241B18 00000000 */ nop /* C418CC 80241B1C 4600A021 */ cvt.d.s $f0, $f20 /* C418D0 80241B20 46220000 */ add.d $f0, $f0, $f2 .L80241B24: @@ -149,7 +149,7 @@ glabel func_80241910_C416C0 /* C418F0 80241B40 46000005 */ abs.s $f0, $f0 /* C418F4 80241B44 46000021 */ cvt.d.s $f0, $f0 /* C418F8 80241B48 4622003C */ c.lt.d $f0, $f2 -/* C418FC 80241B4C 00000000 */ nop +/* C418FC 80241B4C 00000000 */ nop /* C41900 80241B50 45000036 */ bc1f .L80241C2C /* C41904 80241B54 2403FFEF */ addiu $v1, $zero, -0x11 /* C41908 80241B58 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80241910_C416C0 .L80241B6C: /* C4191C 80241B6C 8E220070 */ lw $v0, 0x70($s1) /* C41920 80241B70 1840002E */ blez $v0, .L80241C2C -/* C41924 80241B74 00000000 */ nop +/* C41924 80241B74 00000000 */ nop /* C41928 80241B78 C62C0074 */ lwc1 $f12, 0x74($s1) /* C4192C 80241B7C 0C00A8BB */ jal sin_deg /* C41930 80241B80 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80241910_C416C0 /* C41988 80241BD8 27A70030 */ addiu $a3, $sp, 0x30 .L80241BDC: /* C4198C 80241BDC 10400007 */ beqz $v0, .L80241BFC -/* C41990 80241BE0 00000000 */ nop +/* C41990 80241BE0 00000000 */ nop /* C41994 80241BE4 4616A082 */ mul.s $f2, $f20, $f22 -/* C41998 80241BE8 00000000 */ nop +/* C41998 80241BE8 00000000 */ nop /* C4199C 80241BEC C7A0002C */ lwc1 $f0, 0x2c($sp) /* C419A0 80241BF0 461A0000 */ add.s $f0, $f0, $f26 /* C419A4 80241BF4 08090702 */ j .L80241C08 /* C419A8 80241BF8 46020000 */ add.s $f0, $f0, $f2 .L80241BFC: /* C419AC 80241BFC 4616A002 */ mul.s $f0, $f20, $f22 -/* C419B0 80241C00 00000000 */ nop +/* C419B0 80241C00 00000000 */ nop /* C419B4 80241C04 4600C000 */ add.s $f0, $f24, $f0 .L80241C08: /* C419B8 80241C08 E600003C */ swc1 $f0, 0x3c($s0) /* C419BC 80241C0C 8E220074 */ lw $v0, 0x74($s1) /* C419C0 80241C10 2442000A */ addiu $v0, $v0, 0xa /* C419C4 80241C14 44826000 */ mtc1 $v0, $f12 -/* C419C8 80241C18 00000000 */ nop +/* C419C8 80241C18 00000000 */ nop /* C419CC 80241C1C 0C00A6C9 */ jal clamp_angle /* C419D0 80241C20 46806320 */ cvt.s.w $f12, $f12 /* C419D4 80241C24 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80241910_C416C0 /* C419E4 80241C34 2442FFFF */ addiu $v0, $v0, -1 /* C419E8 80241C38 8E430014 */ lw $v1, 0x14($s2) /* C419EC 80241C3C 04600048 */ bltz $v1, .L80241D60 -/* C419F0 80241C40 00000000 */ nop +/* C419F0 80241C40 00000000 */ nop /* C419F4 80241C44 8E620074 */ lw $v0, 0x74($s3) /* C419F8 80241C48 1C400042 */ bgtz $v0, .L80241D54 /* C419FC 80241C4C 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80241910_C416C0 /* C41A04 80241C54 860200A8 */ lh $v0, 0xa8($s0) /* C41A08 80241C58 C602003C */ lwc1 $f2, 0x3c($s0) /* C41A0C 80241C5C 44820000 */ mtc1 $v0, $f0 -/* C41A10 80241C60 00000000 */ nop +/* C41A10 80241C60 00000000 */ nop /* C41A14 80241C64 46800020 */ cvt.s.w $f0, $f0 /* C41A18 80241C68 46001080 */ add.s $f2, $f2, $f0 /* C41A1C 80241C6C 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80241910_C416C0 /* C41A38 80241C88 C440002C */ lwc1 $f0, 0x2c($v0) /* C41A3C 80241C8C 46000021 */ cvt.d.s $f0, $f0 /* C41A40 80241C90 4622003C */ c.lt.d $f0, $f2 -/* C41A44 80241C94 00000000 */ nop +/* C41A44 80241C94 00000000 */ nop /* C41A48 80241C98 4500002C */ bc1f .L80241D4C /* C41A4C 80241C9C 02A0202D */ daddu $a0, $s5, $zero /* C41A50 80241CA0 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80241910_C416C0 /* C41A8C 80241CDC 3C01C1A0 */ lui $at, 0xc1a0 /* C41A90 80241CE0 44812000 */ mtc1 $at, $f4 /* C41A94 80241CE4 44834000 */ mtc1 $v1, $f8 -/* C41A98 80241CE8 00000000 */ nop +/* C41A98 80241CE8 00000000 */ nop /* C41A9C 80241CEC 46804220 */ cvt.s.w $f8, $f8 /* C41AA0 80241CF0 44074000 */ mfc1 $a3, $f8 /* C41AA4 80241CF4 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80241910_C416C0 /* C41B58 80241DA8 0C0123F5 */ jal is_point_within_region /* C41B5C 80241DAC 8E070038 */ lw $a3, 0x38($s0) /* C41B60 80241DB0 1040001A */ beqz $v0, .L80241E1C -/* C41B64 80241DB4 00000000 */ nop +/* C41B64 80241DB4 00000000 */ nop /* C41B68 80241DB8 8E060038 */ lw $a2, 0x38($s0) /* C41B6C 80241DBC 8E2200D0 */ lw $v0, 0xd0($s1) /* C41B70 80241DC0 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80241910_C416C0 /* C41B84 80241DD4 468073A0 */ cvt.s.w $f14, $f14 /* C41B88 80241DD8 C6020018 */ lwc1 $f2, 0x18($s0) /* C41B8C 80241DDC 4600103C */ c.lt.s $f2, $f0 -/* C41B90 80241DE0 00000000 */ nop +/* C41B90 80241DE0 00000000 */ nop /* C41B94 80241DE4 4500000D */ bc1f .L80241E1C /* C41B98 80241DE8 E7A00034 */ swc1 $f0, 0x34($sp) /* C41B9C 80241DEC C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80241910_C416C0 /* C41BD8 80241E28 00621825 */ or $v1, $v1, $v0 /* C41BDC 80241E2C 00741825 */ or $v1, $v1, $s4 /* C41BE0 80241E30 10600008 */ beqz $v1, .L80241E54 -/* C41BE4 80241E34 00000000 */ nop +/* C41BE4 80241E34 00000000 */ nop /* C41BE8 80241E38 8602008C */ lh $v0, 0x8c($s0) /* C41BEC 80241E3C 14400031 */ bnez $v0, .L80241F04 -/* C41BF0 80241E40 00000000 */ nop +/* C41BF0 80241E40 00000000 */ nop /* C41BF4 80241E44 8E050018 */ lw $a1, 0x18($s0) /* C41BF8 80241E48 8E06000C */ lw $a2, 0xc($s0) /* C41BFC 80241E4C 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_80241910_C416C0 /* C41C10 80241E60 44801000 */ mtc1 $zero, $f2 /* C41C14 80241E64 46000021 */ cvt.d.s $f0, $f0 /* C41C18 80241E68 46220002 */ mul.d $f0, $f0, $f2 -/* C41C1C 80241E6C 00000000 */ nop +/* C41C1C 80241E6C 00000000 */ nop /* C41C20 80241E70 4620020D */ trunc.w.d $f8, $f0 /* C41C24 80241E74 E628007C */ swc1 $f8, 0x7c($s1) /* C41C28 80241E78 8E420004 */ lw $v0, 4($s2) /* C41C2C 80241E7C 18400021 */ blez $v0, .L80241F04 -/* C41C30 80241E80 00000000 */ nop +/* C41C30 80241E80 00000000 */ nop /* C41C34 80241E84 8602008E */ lh $v0, 0x8e($s0) /* C41C38 80241E88 9603008E */ lhu $v1, 0x8e($s0) /* C41C3C 80241E8C 18400005 */ blez $v0, .L80241EA4 @@ -375,7 +375,7 @@ glabel func_80241910_C416C0 /* C41C44 80241E94 A602008E */ sh $v0, 0x8e($s0) /* C41C48 80241E98 00021400 */ sll $v0, $v0, 0x10 /* C41C4C 80241E9C 1C400019 */ bgtz $v0, .L80241F04 -/* C41C50 80241EA0 00000000 */ nop +/* C41C50 80241EA0 00000000 */ nop .L80241EA4: /* C41C54 80241EA4 240403E8 */ addiu $a0, $zero, 0x3e8 /* C41C58 80241EA8 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80241910_C416C0 /* C41CA0 80241EF0 18400003 */ blez $v0, .L80241F00 /* C41CA4 80241EF4 28620003 */ slti $v0, $v1, 3 /* C41CA8 80241EF8 10400002 */ beqz $v0, .L80241F04 -/* C41CAC 80241EFC 00000000 */ nop +/* C41CAC 80241EFC 00000000 */ nop .L80241F00: /* C41CB0 80241F00 AE600070 */ sw $zero, 0x70($s3) .L80241F04: diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241FF8_C41DA8.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241FF8_C41DA8.s index d28a459faa..3cecddf7e7 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241FF8_C41DA8.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241FF8_C41DA8.s @@ -42,11 +42,11 @@ glabel func_80241FF8_C41DA8 .L8024208C: /* C41E3C 8024208C 8E220070 */ lw $v0, 0x70($s1) /* C41E40 80242090 18400034 */ blez $v0, .L80242164 -/* C41E44 80242094 00000000 */ nop +/* C41E44 80242094 00000000 */ nop /* C41E48 80242098 C62C0074 */ lwc1 $f12, 0x74($s1) /* C41E4C 8024209C 46806320 */ cvt.s.w $f12, $f12 /* C41E50 802420A0 44820000 */ mtc1 $v0, $f0 -/* C41E54 802420A4 00000000 */ nop +/* C41E54 802420A4 00000000 */ nop /* C41E58 802420A8 46800020 */ cvt.s.w $f0, $f0 /* C41E5C 802420AC 46000021 */ cvt.d.s $f0, $f0 /* C41E60 802420B0 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_80241FF8_C41DA8 /* C41EC0 80242110 27A70030 */ addiu $a3, $sp, 0x30 .L80242114: /* C41EC4 80242114 10400007 */ beqz $v0, .L80242134 -/* C41EC8 80242118 00000000 */ nop +/* C41EC8 80242118 00000000 */ nop /* C41ECC 8024211C 4616A082 */ mul.s $f2, $f20, $f22 -/* C41ED0 80242120 00000000 */ nop +/* C41ED0 80242120 00000000 */ nop /* C41ED4 80242124 C7A0002C */ lwc1 $f0, 0x2c($sp) /* C41ED8 80242128 46180000 */ add.s $f0, $f0, $f24 /* C41EDC 8024212C 08090850 */ j .L80242140 /* C41EE0 80242130 46020000 */ add.s $f0, $f0, $f2 .L80242134: /* C41EE4 80242134 4616A002 */ mul.s $f0, $f20, $f22 -/* C41EE8 80242138 00000000 */ nop +/* C41EE8 80242138 00000000 */ nop /* C41EEC 8024213C 4600D000 */ add.s $f0, $f26, $f0 .L80242140: /* C41EF0 80242140 E600003C */ swc1 $f0, 0x3c($s0) /* C41EF4 80242144 8E220074 */ lw $v0, 0x74($s1) /* C41EF8 80242148 2442000A */ addiu $v0, $v0, 0xa /* C41EFC 8024214C 44826000 */ mtc1 $v0, $f12 -/* C41F00 80242150 00000000 */ nop +/* C41F00 80242150 00000000 */ nop /* C41F04 80242154 0C00A6C9 */ jal clamp_angle /* C41F08 80242158 46806320 */ cvt.s.w $f12, $f12 /* C41F0C 8024215C 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_80241FF8_C41DA8 /* C41F20 80242170 860200A8 */ lh $v0, 0xa8($s0) /* C41F24 80242174 C600003C */ lwc1 $f0, 0x3c($s0) /* C41F28 80242178 44821000 */ mtc1 $v0, $f2 -/* C41F2C 8024217C 00000000 */ nop +/* C41F2C 8024217C 00000000 */ nop /* C41F30 80242180 468010A0 */ cvt.s.w $f2, $f2 /* C41F34 80242184 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C41F38 80242188 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_80241FF8_C41DA8 /* C41F54 802421A4 46240000 */ add.d $f0, $f0, $f4 /* C41F58 802421A8 460010A1 */ cvt.d.s $f2, $f2 /* C41F5C 802421AC 4620103C */ c.lt.d $f2, $f0 -/* C41F60 802421B0 00000000 */ nop +/* C41F60 802421B0 00000000 */ nop /* C41F64 802421B4 4500002E */ bc1f .L80242270 /* C41F68 802421B8 0280202D */ daddu $a0, $s4, $zero /* C41F6C 802421BC 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_80241FF8_C41DA8 /* C41FAC 802421FC 3C01C1A0 */ lui $at, 0xc1a0 /* C41FB0 80242200 44812000 */ mtc1 $at, $f4 /* C41FB4 80242204 44834000 */ mtc1 $v1, $f8 -/* C41FB8 80242208 00000000 */ nop +/* C41FB8 80242208 00000000 */ nop /* C41FBC 8024220C 46804220 */ cvt.s.w $f8, $f8 /* C41FC0 80242210 44074000 */ mfc1 $a3, $f8 /* C41FC4 80242214 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_80241FF8_C41DA8 .L80242270: /* C42020 80242270 8602008C */ lh $v0, 0x8c($s0) /* C42024 80242274 14400025 */ bnez $v0, .L8024230C -/* C42028 80242278 00000000 */ nop +/* C42028 80242278 00000000 */ nop /* C4202C 8024227C 8602008E */ lh $v0, 0x8e($s0) /* C42030 80242280 1C400022 */ bgtz $v0, .L8024230C -/* C42034 80242284 00000000 */ nop +/* C42034 80242284 00000000 */ nop /* C42038 80242288 8E620074 */ lw $v0, 0x74($s3) /* C4203C 8024228C 2442FFFF */ addiu $v0, $v0, -1 /* C42040 80242290 1840001D */ blez $v0, .L80242308 @@ -183,7 +183,7 @@ glabel func_80241FF8_C41DA8 /* C4204C 8024229C 9442002A */ lhu $v0, 0x2a($v0) /* C42050 802422A0 30420010 */ andi $v0, $v0, 0x10 /* C42054 802422A4 14400007 */ bnez $v0, .L802422C4 -/* C42058 802422A8 00000000 */ nop +/* C42058 802422A8 00000000 */ nop /* C4205C 802422AC C600000C */ lwc1 $f0, 0xc($s0) /* C42060 802422B0 3C014334 */ lui $at, 0x4334 /* C42064 802422B4 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242420_C421D0.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242420_C421D0.s index b7ca413631..17009a25c4 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242420_C421D0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242420_C421D0.s @@ -60,18 +60,18 @@ glabel func_80242420_C421D0 /* C422A8 802424F8 C6200038 */ lwc1 $f0, 0x38($s1) /* C422AC 802424FC 4600018D */ trunc.w.s $f6, $f0 /* C422B0 80242500 44023000 */ mfc1 $v0, $f6 -/* C422B4 80242504 00000000 */ nop +/* C422B4 80242504 00000000 */ nop /* C422B8 80242508 A6420010 */ sh $v0, 0x10($s2) /* C422BC 8024250C C620003C */ lwc1 $f0, 0x3c($s1) /* C422C0 80242510 4600018D */ trunc.w.s $f6, $f0 /* C422C4 80242514 44023000 */ mfc1 $v0, $f6 -/* C422C8 80242518 00000000 */ nop +/* C422C8 80242518 00000000 */ nop /* C422CC 8024251C A6420012 */ sh $v0, 0x12($s2) /* C422D0 80242520 C6200040 */ lwc1 $f0, 0x40($s1) /* C422D4 80242524 A2430007 */ sb $v1, 7($s2) /* C422D8 80242528 4600018D */ trunc.w.s $f6, $f0 /* C422DC 8024252C 44023000 */ mfc1 $v0, $f6 -/* C422E0 80242530 00000000 */ nop +/* C422E0 80242530 00000000 */ nop /* C422E4 80242534 A6420014 */ sh $v0, 0x14($s2) .L80242538: /* C422E8 80242538 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802425B8_C42368.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802425B8_C42368.s index a6a0bed56b..d6fa5bdb1c 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802425B8_C42368.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802425B8_C42368.s @@ -42,9 +42,9 @@ glabel func_802425B8_C42368 /* C423FC 8024264C 44801800 */ mtc1 $zero, $f3 /* C42400 80242650 46002021 */ cvt.d.s $f0, $f4 /* C42404 80242654 4620103E */ c.le.d $f2, $f0 -/* C42408 80242658 00000000 */ nop +/* C42408 80242658 00000000 */ nop /* C4240C 8024265C 45000030 */ bc1f .L80242720 -/* C42410 80242660 00000000 */ nop +/* C42410 80242660 00000000 */ nop /* C42414 80242664 C600003C */ lwc1 $f0, 0x3c($s0) /* C42418 80242668 46040000 */ add.s $f0, $f0, $f4 /* C4241C 8024266C E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_802425B8_C42368 /* C4247C 802426CC 27A70020 */ addiu $a3, $sp, 0x20 .L802426D0: /* C42480 802426D0 1040000B */ beqz $v0, .L80242700 -/* C42484 802426D4 00000000 */ nop +/* C42484 802426D4 00000000 */ nop /* C42488 802426D8 C7A0001C */ lwc1 $f0, 0x1c($sp) /* C4248C 802426DC 46140080 */ add.s $f2, $f0, $f20 /* C42490 802426E0 C600003C */ lwc1 $f0, 0x3c($s0) /* C42494 802426E4 4600103E */ c.le.s $f2, $f0 -/* C42498 802426E8 00000000 */ nop +/* C42498 802426E8 00000000 */ nop /* C4249C 802426EC 4500008D */ bc1f .L80242924 -/* C424A0 802426F0 00000000 */ nop +/* C424A0 802426F0 00000000 */ nop /* C424A4 802426F4 E602003C */ swc1 $f2, 0x3c($s0) /* C424A8 802426F8 08090A49 */ j .L80242924 /* C424AC 802426FC AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_802425B8_C42368 /* C424B0 80242700 C602003C */ lwc1 $f2, 0x3c($s0) /* C424B4 80242704 C6000064 */ lwc1 $f0, 0x64($s0) /* C424B8 80242708 4602003E */ c.le.s $f0, $f2 -/* C424BC 8024270C 00000000 */ nop +/* C424BC 8024270C 00000000 */ nop /* C424C0 80242710 45030084 */ bc1tl .L80242924 /* C424C4 80242714 AE400070 */ sw $zero, 0x70($s2) /* C424C8 80242718 08090A49 */ j .L80242924 -/* C424CC 8024271C 00000000 */ nop +/* C424CC 8024271C 00000000 */ nop .L80242720: /* C424D0 80242720 4622003C */ c.lt.d $f0, $f2 -/* C424D4 80242724 00000000 */ nop +/* C424D4 80242724 00000000 */ nop /* C424D8 80242728 4500007E */ bc1f .L80242924 -/* C424DC 8024272C 00000000 */ nop +/* C424DC 8024272C 00000000 */ nop /* C424E0 80242730 9602008E */ lhu $v0, 0x8e($s0) /* C424E4 80242734 24420001 */ addiu $v0, $v0, 1 /* C424E8 80242738 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_802425B8_C42368 /* C424F4 80242744 00021403 */ sra $v0, $v0, 0x10 /* C424F8 80242748 0043102A */ slt $v0, $v0, $v1 /* C424FC 8024274C 14400026 */ bnez $v0, .L802427E8 -/* C42500 80242750 00000000 */ nop +/* C42500 80242750 00000000 */ nop /* C42504 80242754 C60C0038 */ lwc1 $f12, 0x38($s0) /* C42508 80242758 C60E0040 */ lwc1 $f14, 0x40($s0) /* C4250C 8024275C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_802425B8_C42368 /* C42538 80242788 8E62001C */ lw $v0, 0x1c($s3) /* C4253C 8024278C 46001005 */ abs.s $f0, $f2 /* C42540 80242790 44822000 */ mtc1 $v0, $f4 -/* C42544 80242794 00000000 */ nop +/* C42544 80242794 00000000 */ nop /* C42548 80242798 46802120 */ cvt.s.w $f4, $f4 /* C4254C 8024279C 4600203C */ c.lt.s $f4, $f0 -/* C42550 802427A0 00000000 */ nop +/* C42550 802427A0 00000000 */ nop /* C42554 802427A4 4500000D */ bc1f .L802427DC -/* C42558 802427A8 00000000 */ nop +/* C42558 802427A8 00000000 */ nop /* C4255C 802427AC 44800000 */ mtc1 $zero, $f0 /* C42560 802427B0 C614000C */ lwc1 $f20, 0xc($s0) /* C42564 802427B4 4600103C */ c.lt.s $f2, $f0 -/* C42568 802427B8 00000000 */ nop +/* C42568 802427B8 00000000 */ nop /* C4256C 802427BC 45000006 */ bc1f .L802427D8 /* C42570 802427C0 00021023 */ negu $v0, $v0 /* C42574 802427C4 44820000 */ mtc1 $v0, $f0 -/* C42578 802427C8 00000000 */ nop +/* C42578 802427C8 00000000 */ nop /* C4257C 802427CC 46800020 */ cvt.s.w $f0, $f0 /* C42580 802427D0 080909F7 */ j .L802427DC /* C42584 802427D4 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_802425B8_C42368 /* C425AC 802427FC C600001C */ lwc1 $f0, 0x1c($s0) /* C425B0 80242800 46001080 */ add.s $f2, $f2, $f0 /* C425B4 80242804 4616103C */ c.lt.s $f2, $f22 -/* C425B8 80242808 00000000 */ nop +/* C425B8 80242808 00000000 */ nop /* C425BC 8024280C 45020045 */ bc1fl .L80242924 /* C425C0 80242810 E602003C */ swc1 $f2, 0x3c($s0) /* C425C4 80242814 08090A48 */ j .L80242920 @@ -169,7 +169,7 @@ glabel func_802425B8_C42368 /* C425DC 8024282C C600001C */ lwc1 $f0, 0x1c($s0) /* C425E0 80242830 C604003C */ lwc1 $f4, 0x3c($s0) /* C425E4 80242834 44821000 */ mtc1 $v0, $f2 -/* C425E8 80242838 00000000 */ nop +/* C425E8 80242838 00000000 */ nop /* C425EC 8024283C 468010A0 */ cvt.s.w $f2, $f2 /* C425F0 80242840 46000005 */ abs.s $f0, $f0 /* C425F4 80242844 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_802425B8_C42368 /* C42630 80242880 0C0372DF */ jal func_800DCB7C /* C42634 80242884 27A70020 */ addiu $a3, $sp, 0x20 /* C42638 80242888 10400015 */ beqz $v0, .L802428E0 -/* C4263C 8024288C 00000000 */ nop +/* C4263C 8024288C 00000000 */ nop /* C42640 80242890 860200A8 */ lh $v0, 0xa8($s0) /* C42644 80242894 C604001C */ lwc1 $f4, 0x1c($s0) /* C42648 80242898 44820000 */ mtc1 $v0, $f0 -/* C4264C 8024289C 00000000 */ nop +/* C4264C 8024289C 00000000 */ nop /* C42650 802428A0 46800020 */ cvt.s.w $f0, $f0 /* C42654 802428A4 46002085 */ abs.s $f2, $f4 /* C42658 802428A8 46020000 */ add.s $f0, $f0, $f2 /* C4265C 802428AC C7A20024 */ lwc1 $f2, 0x24($sp) /* C42660 802428B0 4600103E */ c.le.s $f2, $f0 -/* C42664 802428B4 00000000 */ nop +/* C42664 802428B4 00000000 */ nop /* C42668 802428B8 45000005 */ bc1f .L802428D0 -/* C4266C 802428BC 00000000 */ nop +/* C4266C 802428BC 00000000 */ nop /* C42670 802428C0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* C42674 802428C4 AE00001C */ sw $zero, 0x1c($s0) /* C42678 802428C8 08090A49 */ j .L80242924 @@ -217,13 +217,13 @@ glabel func_802425B8_C42368 /* C42694 802428E4 860200A8 */ lh $v0, 0xa8($s0) /* C42698 802428E8 46163081 */ sub.s $f2, $f6, $f22 /* C4269C 802428EC 44820000 */ mtc1 $v0, $f0 -/* C426A0 802428F0 00000000 */ nop +/* C426A0 802428F0 00000000 */ nop /* C426A4 802428F4 46800020 */ cvt.s.w $f0, $f0 /* C426A8 802428F8 46001080 */ add.s $f2, $f2, $f0 /* C426AC 802428FC C604001C */ lwc1 $f4, 0x1c($s0) /* C426B0 80242900 46002005 */ abs.s $f0, $f4 /* C426B4 80242904 4602003C */ c.lt.s $f0, $f2 -/* C426B8 80242908 00000000 */ nop +/* C426B8 80242908 00000000 */ nop /* C426BC 8024290C 45020005 */ bc1fl .L80242924 /* C426C0 80242910 AE00001C */ sw $zero, 0x1c($s0) /* C426C4 80242914 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242948_C426F8.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242948_C426F8.s index 3bb4ce226f..634946db20 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242948_C426F8.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242948_C426F8.s @@ -49,15 +49,15 @@ glabel func_80242948_C426F8 /* C427A0 802429F0 44802000 */ mtc1 $zero, $f4 /* C427A4 802429F4 460010A1 */ cvt.d.s $f2, $f2 /* C427A8 802429F8 46241082 */ mul.d $f2, $f2, $f4 -/* C427AC 802429FC 00000000 */ nop +/* C427AC 802429FC 00000000 */ nop /* C427B0 80242A00 C7A0001C */ lwc1 $f0, 0x1c($sp) /* C427B4 80242A04 46000021 */ cvt.d.s $f0, $f0 /* C427B8 80242A08 46240002 */ mul.d $f0, $f0, $f4 -/* C427BC 80242A0C 00000000 */ nop +/* C427BC 80242A0C 00000000 */ nop /* C427C0 80242A10 3C013FE0 */ lui $at, 0x3fe0 /* C427C4 80242A14 44812800 */ mtc1 $at, $f5 /* C427C8 80242A18 44802000 */ mtc1 $zero, $f4 -/* C427CC 80242A1C 00000000 */ nop +/* C427CC 80242A1C 00000000 */ nop /* C427D0 80242A20 46241080 */ add.d $f2, $f2, $f4 /* C427D4 80242A24 AE000074 */ sw $zero, 0x74($s0) /* C427D8 80242A28 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s index c07faf3acc..a965021fcc 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s @@ -54,7 +54,7 @@ glabel func_80242A6C_C4281C /* C428DC 80242B2C 8E4300B0 */ lw $v1, 0xb0($s2) /* C428E0 80242B30 30620004 */ andi $v0, $v1, 4 /* C428E4 80242B34 10400007 */ beqz $v0, .L80242B54 -/* C428E8 80242B38 00000000 */ nop +/* C428E8 80242B38 00000000 */ nop /* C428EC 80242B3C 824200B4 */ lb $v0, 0xb4($s2) /* C428F0 80242B40 1440003C */ bnez $v0, .L80242C34 /* C428F4 80242B44 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_80242A6C_C4281C /* C42908 80242B58 2C62000F */ sltiu $v0, $v1, 0xf /* C4290C 80242B5C 10400034 */ beqz $v0, .L80242C30 /* C42910 80242B60 00031080 */ sll $v0, $v1, 2 -/* C42914 80242B64 3C018024 */ lui $at, %hi(D_80246D50) +/* C42914 80242B64 3C018024 */ lui $at, %hi(jtbl_80246D50_C46B00) /* C42918 80242B68 00220821 */ addu $at, $at, $v0 -/* C4291C 80242B6C 8C226D50 */ lw $v0, %lo(D_80246D50)($at) +/* C4291C 80242B6C 8C226D50 */ lw $v0, %lo(jtbl_80246D50_C46B00)($at) /* C42920 80242B70 00400008 */ jr $v0 -/* C42924 80242B74 00000000 */ nop +/* C42924 80242B74 00000000 */ nop +glabel L80242B78_C42928 /* C42928 80242B78 0280202D */ daddu $a0, $s4, $zero /* C4292C 80242B7C 0200282D */ daddu $a1, $s0, $zero /* C42930 80242B80 0C0905D8 */ jal func_80241760_C41510 /* C42934 80242B84 0260302D */ daddu $a2, $s3, $zero +glabel L80242B88_C42938 /* C42938 80242B88 0280202D */ daddu $a0, $s4, $zero /* C4293C 80242B8C 0200282D */ daddu $a1, $s0, $zero /* C42940 80242B90 0C090644 */ jal func_80241910_C416C0 /* C42944 80242B94 0260302D */ daddu $a2, $s3, $zero /* C42948 80242B98 08090B0D */ j .L80242C34 /* C4294C 80242B9C 0000102D */ daddu $v0, $zero, $zero +glabel L80242BA0_C42950 /* C42950 80242BA0 0280202D */ daddu $a0, $s4, $zero /* C42954 80242BA4 0200282D */ daddu $a1, $s0, $zero /* C42958 80242BA8 0C0907CE */ jal dup_dgb_08_UnkNpcAIFunc1 /* C4295C 80242BAC 0260302D */ daddu $a2, $s3, $zero +glabel L80242BB0_C42960 /* C42960 80242BB0 0280202D */ daddu $a0, $s4, $zero /* C42964 80242BB4 0200282D */ daddu $a1, $s0, $zero /* C42968 80242BB8 0C0907FE */ jal func_80241FF8_C41DA8 /* C4296C 80242BBC 0260302D */ daddu $a2, $s3, $zero /* C42970 80242BC0 08090B0D */ j .L80242C34 /* C42974 80242BC4 0000102D */ daddu $v0, $zero, $zero +glabel L80242BC8_C42978 /* C42978 80242BC8 0280202D */ daddu $a0, $s4, $zero /* C4297C 80242BCC 0200282D */ daddu $a1, $s0, $zero /* C42980 80242BD0 0C0908CF */ jal dgb_08_UnkNpcAIFunc2 /* C42984 80242BD4 0260302D */ daddu $a2, $s3, $zero +glabel L80242BD8_C42988 /* C42988 80242BD8 0280202D */ daddu $a0, $s4, $zero /* C4298C 80242BDC 0200282D */ daddu $a1, $s0, $zero /* C42990 80242BE0 0C0908ED */ jal func_802423B4_C42164 /* C42994 80242BE4 0260302D */ daddu $a2, $s3, $zero /* C42998 80242BE8 08090B0D */ j .L80242C34 /* C4299C 80242BEC 0000102D */ daddu $v0, $zero, $zero +glabel L80242BF0_C429A0 /* C429A0 80242BF0 0280202D */ daddu $a0, $s4, $zero /* C429A4 80242BF4 0200282D */ daddu $a1, $s0, $zero /* C429A8 80242BF8 0C090908 */ jal func_80242420_C421D0 /* C429AC 80242BFC 0260302D */ daddu $a2, $s3, $zero /* C429B0 80242C00 08090B0D */ j .L80242C34 /* C429B4 80242C04 0000102D */ daddu $v0, $zero, $zero +glabel L80242C08_C429B8 /* C429B8 80242C08 0280202D */ daddu $a0, $s4, $zero /* C429BC 80242C0C 0200282D */ daddu $a1, $s0, $zero /* C429C0 80242C10 0C090955 */ jal dgb_08_UnkNpcAIFunc3 /* C429C4 80242C14 0260302D */ daddu $a2, $s3, $zero /* C429C8 80242C18 08090B0D */ j .L80242C34 /* C429CC 80242C1C 0000102D */ daddu $v0, $zero, $zero +glabel L80242C20_C429D0 /* C429D0 80242C20 0280202D */ daddu $a0, $s4, $zero /* C429D4 80242C24 0200282D */ daddu $a1, $s0, $zero /* C429D8 80242C28 0C09096E */ jal func_802425B8_C42368 /* C429DC 80242C2C 0260302D */ daddu $a2, $s3, $zero .L80242C30: +glabel L80242C30_C429E0 /* C429E0 80242C30 0000102D */ daddu $v0, $zero, $zero .L80242C34: /* C429E4 80242C34 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242C58_C42A08.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242C58_C42A08.s index b05e61b4cb..0c0a879dda 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242C58_C42A08.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242C58_C42A08.s @@ -57,20 +57,20 @@ glabel func_80242C58_C42A08 /* C42AD8 80242D28 8E22001C */ lw $v0, 0x1c($s1) /* C42ADC 80242D2C 46001005 */ abs.s $f0, $f2 /* C42AE0 80242D30 44822000 */ mtc1 $v0, $f4 -/* C42AE4 80242D34 00000000 */ nop +/* C42AE4 80242D34 00000000 */ nop /* C42AE8 80242D38 46802120 */ cvt.s.w $f4, $f4 /* C42AEC 80242D3C 4600203C */ c.lt.s $f4, $f0 -/* C42AF0 80242D40 00000000 */ nop +/* C42AF0 80242D40 00000000 */ nop /* C42AF4 80242D44 4500000D */ bc1f .L80242D7C -/* C42AF8 80242D48 00000000 */ nop +/* C42AF8 80242D48 00000000 */ nop /* C42AFC 80242D4C 44800000 */ mtc1 $zero, $f0 /* C42B00 80242D50 C614000C */ lwc1 $f20, 0xc($s0) /* C42B04 80242D54 4600103C */ c.lt.s $f2, $f0 -/* C42B08 80242D58 00000000 */ nop +/* C42B08 80242D58 00000000 */ nop /* C42B0C 80242D5C 45000006 */ bc1f .L80242D78 /* C42B10 80242D60 00021023 */ negu $v0, $v0 /* C42B14 80242D64 44820000 */ mtc1 $v0, $f0 -/* C42B18 80242D68 00000000 */ nop +/* C42B18 80242D68 00000000 */ nop /* C42B1C 80242D6C 46800020 */ cvt.s.w $f0, $f0 /* C42B20 80242D70 08090B5F */ j .L80242D7C /* C42B24 80242D74 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242DB0_C42B60.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242DB0_C42B60.s index 073b33f17a..ec2a1527c1 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242DB0_C42B60.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242DB0_C42B60.s @@ -41,10 +41,10 @@ glabel func_80242DB0_C42B60 /* C42BF0 80242E40 44802000 */ mtc1 $zero, $f4 /* C42BF4 80242E44 460010A1 */ cvt.d.s $f2, $f2 /* C42BF8 80242E48 46241082 */ mul.d $f2, $f2, $f4 -/* C42BFC 80242E4C 00000000 */ nop +/* C42BFC 80242E4C 00000000 */ nop /* C42C00 80242E50 46000021 */ cvt.d.s $f0, $f0 /* C42C04 80242E54 4622003E */ c.le.d $f0, $f2 -/* C42C08 80242E58 00000000 */ nop +/* C42C08 80242E58 00000000 */ nop /* C42C0C 80242E5C 45000003 */ bc1f .L80242E6C /* C42C10 80242E60 2402000E */ addiu $v0, $zero, 0xe /* C42C14 80242E64 08090BA5 */ j .L80242E94 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242EB4_C42C64.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242EB4_C42C64.s index 80cd7ee603..cdc5f7e59c 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242EB4_C42C64.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242EB4_C42C64.s @@ -27,7 +27,7 @@ glabel func_80242EB4_C42C64 .L80242F08: /* C42CB8 80242F08 2A020009 */ slti $v0, $s0, 9 /* C42CBC 80242F0C 1440FFF5 */ bnez $v0, .L80242EE4 -/* C42CC0 80242F10 00000000 */ nop +/* C42CC0 80242F10 00000000 */ nop /* C42CC4 80242F14 8E42006C */ lw $v0, 0x6c($s2) /* C42CC8 80242F18 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) /* C42CCC 80242F1C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242F94_C42D44.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242F94_C42D44.s index 31b2561e8b..4fbbaaa24f 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242F94_C42D44.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242F94_C42D44.s @@ -73,7 +73,7 @@ glabel func_80242F94_C42D44 /* C42E4C 8024309C 344260B7 */ ori $v0, $v0, 0x60b7 /* C42E50 802430A0 4600020D */ trunc.w.s $f8, $f0 /* C42E54 802430A4 44044000 */ mfc1 $a0, $f8 -/* C42E58 802430A8 00000000 */ nop +/* C42E58 802430A8 00000000 */ nop /* C42E5C 802430AC 00820018 */ mult $a0, $v0 /* C42E60 802430B0 00041FC3 */ sra $v1, $a0, 0x1f /* C42E64 802430B4 00004010 */ mfhi $t0 @@ -91,9 +91,9 @@ glabel func_80242F94_C42D44 /* C42E94 802430E4 00042403 */ sra $a0, $a0, 0x10 /* C42E98 802430E8 3C014260 */ lui $at, 0x4260 /* C42E9C 802430EC 44811000 */ mtc1 $at, $f2 -/* C42EA0 802430F0 00000000 */ nop +/* C42EA0 802430F0 00000000 */ nop /* C42EA4 802430F4 46020002 */ mul.s $f0, $f0, $f2 -/* C42EA8 802430F8 00000000 */ nop +/* C42EA8 802430F8 00000000 */ nop /* C42EAC 802430FC 24050006 */ addiu $a1, $zero, 6 /* C42EB0 80243100 3C01437F */ lui $at, 0x437f /* C42EB4 80243104 44811000 */ mtc1 $at, $f2 @@ -103,7 +103,7 @@ glabel func_80242F94_C42D44 /* C42EC4 80243114 AFA00018 */ sw $zero, 0x18($sp) /* C42EC8 80243118 4600120D */ trunc.w.s $f8, $f2 /* C42ECC 8024311C 44064000 */ mfc1 $a2, $f8 -/* C42ED0 80243120 00000000 */ nop +/* C42ED0 80243120 00000000 */ nop /* C42ED4 80243124 AFA60010 */ sw $a2, 0x10($sp) /* C42ED8 80243128 8E440024 */ lw $a0, 0x24($s2) /* C42EDC 8024312C 0C0B7A25 */ jal func_802DE894 @@ -134,7 +134,7 @@ glabel func_80242F94_C42D44 /* C42F40 80243190 46000005 */ abs.s $f0, $f0 /* C42F44 80243194 46000021 */ cvt.d.s $f0, $f0 /* C42F48 80243198 4620103C */ c.lt.d $f2, $f0 -/* C42F4C 8024319C 00000000 */ nop +/* C42F4C 8024319C 00000000 */ nop /* C42F50 802431A0 45000008 */ bc1f .L802431C4 /* C42F54 802431A4 3C03FFDF */ lui $v1, 0xffdf /* C42F58 802431A8 3C018024 */ lui $at, %hi(D_80246D98) @@ -156,9 +156,9 @@ glabel func_80242F94_C42D44 /* C42F94 802431E4 10620009 */ beq $v1, $v0, .L8024320C /* C42F98 802431E8 24020010 */ addiu $v0, $zero, 0x10 /* C42F9C 802431EC 0C03805E */ jal disable_player_input -/* C42FA0 802431F0 00000000 */ nop +/* C42FA0 802431F0 00000000 */ nop /* C42FA4 802431F4 0C03BD8A */ jal func_800EF628 -/* C42FA8 802431F8 00000000 */ nop +/* C42FA8 802431F8 00000000 */ nop /* C42FAC 802431FC 24020014 */ addiu $v0, $zero, 0x14 /* C42FB0 80243200 08090C83 */ j .L8024320C /* C42FB4 80243204 A640008E */ sh $zero, 0x8e($s2) diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243230_C42FE0.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243230_C42FE0.s index bcb9fb4d1a..939747ad49 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243230_C42FE0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243230_C42FE0.s @@ -27,7 +27,7 @@ glabel func_80243230_C42FE0 /* C43038 80243288 8E02006C */ lw $v0, 0x6c($s0) /* C4303C 8024328C 30421000 */ andi $v0, $v0, 0x1000 /* C43040 80243290 10400008 */ beqz $v0, .L802432B4 -/* C43044 80243294 00000000 */ nop +/* C43044 80243294 00000000 */ nop /* C43048 80243298 3C048000 */ lui $a0, 0x8000 /* C4304C 8024329C 0C05271B */ jal stop_sound /* C43050 802432A0 34840011 */ ori $a0, $a0, 0x11 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802432E8_C43098.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802432E8_C43098.s index 4da36cb61c..6d3c5bf1d2 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802432E8_C43098.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802432E8_C43098.s @@ -49,9 +49,9 @@ glabel func_802432E8_C43098 /* C43148 80243398 46140000 */ add.s $f0, $f0, $f20 /* C4314C 8024339C C622003C */ lwc1 $f2, 0x3c($s1) /* C43150 802433A0 4600103C */ c.lt.s $f2, $f0 -/* C43154 802433A4 00000000 */ nop +/* C43154 802433A4 00000000 */ nop /* C43158 802433A8 45010028 */ bc1t .L8024344C -/* C4315C 802433AC 00000000 */ nop +/* C4315C 802433AC 00000000 */ nop /* C43160 802433B0 8E0200D0 */ lw $v0, 0xd0($s0) /* C43164 802433B4 C62C0038 */ lwc1 $f12, 0x38($s1) /* C43168 802433B8 C62E0040 */ lwc1 $f14, 0x40($s1) @@ -76,7 +76,7 @@ glabel func_802432E8_C43098 /* C431B4 80243404 3C01C1A0 */ lui $at, 0xc1a0 /* C431B8 80243408 44813000 */ mtc1 $at, $f6 /* C431BC 8024340C 44825000 */ mtc1 $v0, $f10 -/* C431C0 80243410 00000000 */ nop +/* C431C0 80243410 00000000 */ nop /* C431C4 80243414 468052A0 */ cvt.s.w $f10, $f10 /* C431C8 80243418 46141080 */ add.s $f2, $f2, $f20 /* C431CC 8024341C 44075000 */ mfc1 $a3, $f10 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802434B0_C43260.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802434B0_C43260.s index 087f2657dc..a1963a290c 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802434B0_C43260.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802434B0_C43260.s @@ -26,9 +26,9 @@ glabel func_802434B0_C43260 /* C432B4 80243504 A480008E */ sh $zero, 0x8e($a0) .L80243508: /* C432B8 80243508 0C038069 */ jal enable_player_input -/* C432BC 8024350C 00000000 */ nop +/* C432BC 8024350C 00000000 */ nop /* C432C0 80243510 0C03BD80 */ jal func_800EF600 -/* C432C4 80243514 00000000 */ nop +/* C432C4 80243514 00000000 */ nop /* C432C8 80243518 24020010 */ addiu $v0, $zero, 0x10 .L8024351C: /* C432CC 8024351C AE020070 */ sw $v0, 0x70($s0) diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243530_C432E0.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243530_C432E0.s index 2ed32133b9..d34e5ad80f 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243530_C432E0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243530_C432E0.s @@ -33,7 +33,7 @@ glabel func_80243530_C432E0 /* C43350 802435A0 44801000 */ mtc1 $zero, $f2 /* C43354 802435A4 46000021 */ cvt.d.s $f0, $f0 /* C43358 802435A8 46220002 */ mul.d $f0, $f0, $f2 -/* C4335C 802435AC 00000000 */ nop +/* C4335C 802435AC 00000000 */ nop /* C43360 802435B0 2402001E */ addiu $v0, $zero, 0x1e /* C43364 802435B4 4620010D */ trunc.w.d $f4, $f0 /* C43368 802435B8 E604007C */ swc1 $f4, 0x7c($s0) diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802435D8_C43388.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802435D8_C43388.s index 830b93941c..3a50b2bd34 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802435D8_C43388.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802435D8_C43388.s @@ -60,23 +60,23 @@ glabel func_802435D8_C43388 /* C43464 802436B4 0C0372DF */ jal func_800DCB7C /* C43468 802436B8 46000506 */ mov.s $f20, $f0 /* C4346C 802436BC 10400007 */ beqz $v0, .L802436DC -/* C43470 802436C0 00000000 */ nop +/* C43470 802436C0 00000000 */ nop /* C43474 802436C4 4616A082 */ mul.s $f2, $f20, $f22 -/* C43478 802436C8 00000000 */ nop +/* C43478 802436C8 00000000 */ nop /* C4347C 802436CC C7A0002C */ lwc1 $f0, 0x2c($sp) /* C43480 802436D0 461A0000 */ add.s $f0, $f0, $f26 /* C43484 802436D4 08090DBA */ j .L802436E8 /* C43488 802436D8 46020000 */ add.s $f0, $f0, $f2 .L802436DC: /* C4348C 802436DC 4616A002 */ mul.s $f0, $f20, $f22 -/* C43490 802436E0 00000000 */ nop +/* C43490 802436E0 00000000 */ nop /* C43494 802436E4 4600C000 */ add.s $f0, $f24, $f0 .L802436E8: /* C43498 802436E8 E620003C */ swc1 $f0, 0x3c($s1) /* C4349C 802436EC 8E020074 */ lw $v0, 0x74($s0) /* C434A0 802436F0 2442000C */ addiu $v0, $v0, 0xc /* C434A4 802436F4 44826000 */ mtc1 $v0, $f12 -/* C434A8 802436F8 00000000 */ nop +/* C434A8 802436F8 00000000 */ nop /* C434AC 802436FC 0C00A6C9 */ jal clamp_angle /* C434B0 80243700 46806320 */ cvt.s.w $f12, $f12 /* C434B4 80243704 4600020D */ trunc.w.s $f8, $f0 @@ -92,11 +92,11 @@ glabel func_802435D8_C43388 /* C434DC 8024372C 44802000 */ mtc1 $zero, $f4 /* C434E0 80243730 460010A1 */ cvt.d.s $f2, $f2 /* C434E4 80243734 46241082 */ mul.d $f2, $f2, $f4 -/* C434E8 80243738 00000000 */ nop +/* C434E8 80243738 00000000 */ nop /* C434EC 8024373C C6600010 */ lwc1 $f0, 0x10($s3) /* C434F0 80243740 46000021 */ cvt.d.s $f0, $f0 /* C434F4 80243744 46240002 */ mul.d $f0, $f0, $f4 -/* C434F8 80243748 00000000 */ nop +/* C434F8 80243748 00000000 */ nop /* C434FC 8024374C 0280202D */ daddu $a0, $s4, $zero /* C43500 80243750 462010A0 */ cvt.s.d $f2, $f2 /* C43504 80243754 46200020 */ cvt.s.d $f0, $f0 @@ -118,7 +118,7 @@ glabel func_802435D8_C43388 /* C43544 80243794 3C01C1A0 */ lui $at, 0xc1a0 /* C43548 80243798 44812000 */ mtc1 $at, $f4 /* C4354C 8024379C 44834000 */ mtc1 $v1, $f8 -/* C43550 802437A0 00000000 */ nop +/* C43550 802437A0 00000000 */ nop /* C43554 802437A4 46804220 */ cvt.s.w $f8, $f8 /* C43558 802437A8 44074000 */ mfc1 $a3, $f8 /* C4355C 802437AC 27A20038 */ addiu $v0, $sp, 0x38 @@ -143,7 +143,7 @@ glabel func_802435D8_C43388 /* C435A0 802437F0 AE420074 */ sw $v0, 0x74($s2) /* C435A4 802437F4 8622008C */ lh $v0, 0x8c($s1) /* C435A8 802437F8 14400031 */ bnez $v0, .L802438C0 -/* C435AC 802437FC 00000000 */ nop +/* C435AC 802437FC 00000000 */ nop /* C435B0 80243800 C62C0038 */ lwc1 $f12, 0x38($s1) /* C435B4 80243804 8E0200D0 */ lw $v0, 0xd0($s0) /* C435B8 80243808 C62E0040 */ lwc1 $f14, 0x40($s1) @@ -154,7 +154,7 @@ glabel func_802435D8_C43388 /* C435CC 8024381C 46804220 */ cvt.s.w $f8, $f8 /* C435D0 80243820 44074000 */ mfc1 $a3, $f8 /* C435D4 80243824 0C00A720 */ jal atan2 -/* C435D8 80243828 00000000 */ nop +/* C435D8 80243828 00000000 */ nop /* C435DC 8024382C 8E250018 */ lw $a1, 0x18($s1) /* C435E0 80243830 44060000 */ mfc1 $a2, $f0 /* C435E4 80243834 0220202D */ daddu $a0, $s1, $zero @@ -170,11 +170,11 @@ glabel func_802435D8_C43388 /* C4360C 8024385C 46804220 */ cvt.s.w $f8, $f8 /* C43610 80243860 44074000 */ mfc1 $a3, $f8 /* C43614 80243864 0C00A7B5 */ jal dist2D -/* C43618 80243868 00000000 */ nop +/* C43618 80243868 00000000 */ nop /* C4361C 8024386C C6220018 */ lwc1 $f2, 0x18($s1) /* C43620 80243870 46021080 */ add.s $f2, $f2, $f2 /* C43624 80243874 4602003E */ c.le.s $f0, $f2 -/* C43628 80243878 00000000 */ nop +/* C43628 80243878 00000000 */ nop /* C4362C 8024387C 45000010 */ bc1f .L802438C0 /* C43630 80243880 E7A00034 */ swc1 $f0, 0x34($sp) /* C43634 80243884 0C00A67F */ jal rand_int diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s index ef8018f549..c9d83a00ea 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s @@ -54,11 +54,12 @@ glabel func_802438F0_C436A0 /* C43760 802439B0 2C620020 */ sltiu $v0, $v1, 0x20 /* C43764 802439B4 10400060 */ beqz $v0, .L80243B38 /* C43768 802439B8 00031080 */ sll $v0, $v1, 2 -/* C4376C 802439BC 3C018024 */ lui $at, %hi(D_80246DA0) +/* C4376C 802439BC 3C018024 */ lui $at, %hi(jtbl_80246DA0_C46B50) /* C43770 802439C0 00220821 */ addu $at, $at, $v0 -/* C43774 802439C4 8C226DA0 */ lw $v0, %lo(D_80246DA0)($at) +/* C43774 802439C4 8C226DA0 */ lw $v0, %lo(jtbl_80246DA0_C46B50)($at) /* C43778 802439C8 00400008 */ jr $v0 -/* C4377C 802439CC 00000000 */ nop +/* C4377C 802439CC 00000000 */ nop +glabel L802439D0_C43780 /* C43780 802439D0 0280202D */ daddu $a0, $s4, $zero /* C43784 802439D4 0220282D */ daddu $a1, $s1, $zero /* C43788 802439D8 0C0905D8 */ jal func_80241760_C41510 @@ -71,16 +72,19 @@ glabel func_802438F0_C436A0 /* C437A4 802439F4 8EA40024 */ lw $a0, 0x24($s5) /* C437A8 802439F8 0C0B7A25 */ jal func_802DE894 /* C437AC 802439FC 00A0382D */ daddu $a3, $a1, $zero +glabel L80243A00_C437B0 /* C437B0 80243A00 0280202D */ daddu $a0, $s4, $zero /* C437B4 80243A04 0220282D */ daddu $a1, $s1, $zero /* C437B8 80243A08 0C090644 */ jal func_80241910_C416C0 /* C437BC 80243A0C 0260302D */ daddu $a2, $s3, $zero /* C437C0 80243A10 08090E8E */ j .L80243A38 -/* C437C4 80243A14 00000000 */ nop +/* C437C4 80243A14 00000000 */ nop +glabel L80243A18_C437C8 /* C437C8 80243A18 0280202D */ daddu $a0, $s4, $zero /* C437CC 80243A1C 0220282D */ daddu $a1, $s1, $zero /* C437D0 80243A20 0C0907CE */ jal dup_dgb_08_UnkNpcAIFunc1 /* C437D4 80243A24 0260302D */ daddu $a2, $s3, $zero +glabel L80243A28_C437D8 /* C437D8 80243A28 0280202D */ daddu $a0, $s4, $zero /* C437DC 80243A2C 0220282D */ daddu $a1, $s1, $zero /* C437E0 80243A30 0C0907FE */ jal func_80241FF8_C41DA8 @@ -92,6 +96,7 @@ glabel func_802438F0_C436A0 /* C437F4 80243A44 24020006 */ addiu $v0, $zero, 6 /* C437F8 80243A48 08090ECE */ j .L80243B38 /* C437FC 80243A4C A6A2008E */ sh $v0, 0x8e($s5) +glabel L80243A50_C43800 /* C43800 80243A50 0280202D */ daddu $a0, $s4, $zero /* C43804 80243A54 0220282D */ daddu $a1, $s1, $zero /* C43808 80243A58 0C090B16 */ jal func_80242C58_C42A08 @@ -99,13 +104,15 @@ glabel func_802438F0_C436A0 /* C43810 80243A60 8E830070 */ lw $v1, 0x70($s4) /* C43814 80243A64 2402000D */ addiu $v0, $zero, 0xd /* C43818 80243A68 14620033 */ bne $v1, $v0, .L80243B38 -/* C4381C 80243A6C 00000000 */ nop +/* C4381C 80243A6C 00000000 */ nop +glabel L80243A70_C43820 /* C43820 80243A70 0280202D */ daddu $a0, $s4, $zero /* C43824 80243A74 0220282D */ daddu $a1, $s1, $zero /* C43828 80243A78 0C090B6C */ jal func_80242DB0_C42B60 /* C4382C 80243A7C 0260302D */ daddu $a2, $s3, $zero /* C43830 80243A80 08090ECE */ j .L80243B38 -/* C43834 80243A84 00000000 */ nop +/* C43834 80243A84 00000000 */ nop +glabel L80243A88_C43838 /* C43838 80243A88 0280202D */ daddu $a0, $s4, $zero /* C4383C 80243A8C 0220282D */ daddu $a1, $s1, $zero /* C43840 80243A90 0C090BAD */ jal func_80242EB4_C42C64 @@ -113,44 +120,52 @@ glabel func_802438F0_C436A0 /* C43848 80243A98 8E830070 */ lw $v1, 0x70($s4) /* C4384C 80243A9C 2402000F */ addiu $v0, $zero, 0xf /* C43850 80243AA0 14620025 */ bne $v1, $v0, .L80243B38 -/* C43854 80243AA4 00000000 */ nop +/* C43854 80243AA4 00000000 */ nop +glabel L80243AA8_C43858 /* C43858 80243AA8 0280202D */ daddu $a0, $s4, $zero /* C4385C 80243AAC 0220282D */ daddu $a1, $s1, $zero /* C43860 80243AB0 0C090BE5 */ jal func_80242F94_C42D44 /* C43864 80243AB4 0260302D */ daddu $a2, $s3, $zero /* C43868 80243AB8 08090ECE */ j .L80243B38 -/* C4386C 80243ABC 00000000 */ nop +/* C4386C 80243ABC 00000000 */ nop +glabel L80243AC0_C43870 /* C43870 80243AC0 0280202D */ daddu $a0, $s4, $zero /* C43874 80243AC4 0220282D */ daddu $a1, $s1, $zero /* C43878 80243AC8 0C090C8C */ jal func_80243230_C42FE0 /* C4387C 80243ACC 0260302D */ daddu $a2, $s3, $zero +glabel L80243AD0_C43880 /* C43880 80243AD0 0280202D */ daddu $a0, $s4, $zero /* C43884 80243AD4 0220282D */ daddu $a1, $s1, $zero /* C43888 80243AD8 0C090CBA */ jal func_802432E8_C43098 /* C4388C 80243ADC 0260302D */ daddu $a2, $s3, $zero /* C43890 80243AE0 08090ECE */ j .L80243B38 -/* C43894 80243AE4 00000000 */ nop +/* C43894 80243AE4 00000000 */ nop +glabel L80243AE8_C43898 /* C43898 80243AE8 0280202D */ daddu $a0, $s4, $zero /* C4389C 80243AEC 0220282D */ daddu $a1, $s1, $zero /* C438A0 80243AF0 0C090D1A */ jal func_80243468_C43218 /* C438A4 80243AF4 0260302D */ daddu $a2, $s3, $zero /* C438A8 80243AF8 08090ECE */ j .L80243B38 -/* C438AC 80243AFC 00000000 */ nop +/* C438AC 80243AFC 00000000 */ nop +glabel L80243B00_C438B0 /* C438B0 80243B00 0280202D */ daddu $a0, $s4, $zero /* C438B4 80243B04 0220282D */ daddu $a1, $s1, $zero /* C438B8 80243B08 0C090D2C */ jal func_802434B0_C43260 /* C438BC 80243B0C 0260302D */ daddu $a2, $s3, $zero /* C438C0 80243B10 08090ECE */ j .L80243B38 -/* C438C4 80243B14 00000000 */ nop +/* C438C4 80243B14 00000000 */ nop +glabel L80243B18_C438C8 /* C438C8 80243B18 0280202D */ daddu $a0, $s4, $zero /* C438CC 80243B1C 0220282D */ daddu $a1, $s1, $zero /* C438D0 80243B20 0C090D4C */ jal func_80243530_C432E0 /* C438D4 80243B24 0260302D */ daddu $a2, $s3, $zero +glabel L80243B28_C438D8 /* C438D8 80243B28 0280202D */ daddu $a0, $s4, $zero /* C438DC 80243B2C 0220282D */ daddu $a1, $s1, $zero /* C438E0 80243B30 0C090D76 */ jal func_802435D8_C43388 /* C438E4 80243B34 0260302D */ daddu $a2, $s3, $zero .L80243B38: +glabel L80243B38_C438E8 /* C438E8 80243B38 8E820070 */ lw $v0, 0x70($s4) /* C438EC 80243B3C 8FBF0058 */ lw $ra, 0x58($sp) /* C438F0 80243B40 8FB50054 */ lw $s5, 0x54($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243C50_C43A00.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243C50_C43A00.s index a084f2e1d5..a4d45a525e 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243C50_C43A00.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243C50_C43A00.s @@ -15,6 +15,6 @@ glabel func_80243C50_C43A00 /* C43A28 80243C78 24020002 */ addiu $v0, $zero, 2 /* C43A2C 80243C7C 03E00008 */ jr $ra /* C43A30 80243C80 27BD0018 */ addiu $sp, $sp, 0x18 -/* C43A34 80243C84 00000000 */ nop -/* C43A38 80243C88 00000000 */ nop -/* C43A3C 80243C8C 00000000 */ nop +/* C43A34 80243C84 00000000 */ nop +/* C43A38 80243C88 00000000 */ nop +/* C43A3C 80243C8C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240208_C46DE8.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240208_C46DE8.s index f94a77ce70..f91c010e71 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240208_C46DE8.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240208_C46DE8.s @@ -42,7 +42,7 @@ glabel func_80240208_C46DE8 /* C46E7C 8024029C C6620074 */ lwc1 $f2, 0x74($s3) /* C46E80 802402A0 468010A0 */ cvt.s.w $f2, $f2 /* C46E84 802402A4 4600103C */ c.lt.s $f2, $f0 -/* C46E88 802402A8 00000000 */ nop +/* C46E88 802402A8 00000000 */ nop /* C46E8C 802402AC 45030001 */ bc1tl .L802402B4 /* C46E90 802402B0 0000882D */ daddu $s1, $zero, $zero .L802402B4: @@ -51,16 +51,16 @@ glabel func_80240208_C46DE8 /* C46E9C 802402BC 3C014387 */ lui $at, 0x4387 /* C46EA0 802402C0 4481A000 */ mtc1 $at, $f20 /* C46EA4 802402C4 0C00A70A */ jal get_clamped_angle_diff -/* C46EA8 802402C8 00000000 */ nop +/* C46EA8 802402C8 00000000 */ nop /* C46EAC 802402CC 0C00A6C9 */ jal clamp_angle /* C46EB0 802402D0 46000306 */ mov.s $f12, $f0 /* C46EB4 802402D4 3C018024 */ lui $at, %hi(D_80245390) /* C46EB8 802402D8 D4225390 */ ldc1 $f2, %lo(D_80245390)($at) /* C46EBC 802402DC 46000021 */ cvt.d.s $f0, $f0 /* C46EC0 802402E0 4622003C */ c.lt.d $f0, $f2 -/* C46EC4 802402E4 00000000 */ nop +/* C46EC4 802402E4 00000000 */ nop /* C46EC8 802402E8 45000003 */ bc1f .L802402F8 -/* C46ECC 802402EC 00000000 */ nop +/* C46ECC 802402EC 00000000 */ nop /* C46ED0 802402F0 3C0142B4 */ lui $at, 0x42b4 /* C46ED4 802402F4 4481A000 */ mtc1 $at, $f20 .L802402F8: @@ -77,7 +77,7 @@ glabel func_80240208_C46DE8 /* C46F00 80240320 468010A0 */ cvt.s.w $f2, $f2 /* C46F04 80240324 46000005 */ abs.s $f0, $f0 /* C46F08 80240328 4600103C */ c.lt.s $f2, $f0 -/* C46F0C 8024032C 00000000 */ nop +/* C46F0C 8024032C 00000000 */ nop /* C46F10 80240330 45030001 */ bc1tl .L80240338 /* C46F14 80240334 0000882D */ daddu $s1, $zero, $zero .L80240338: @@ -87,13 +87,13 @@ glabel func_80240208_C46DE8 /* C46F24 80240344 860200A8 */ lh $v0, 0xa8($s0) /* C46F28 80240348 46020001 */ sub.s $f0, $f0, $f2 /* C46F2C 8024034C 44821000 */ mtc1 $v0, $f2 -/* C46F30 80240350 00000000 */ nop +/* C46F30 80240350 00000000 */ nop /* C46F34 80240354 468010A1 */ cvt.d.w $f2, $f2 /* C46F38 80240358 46221080 */ add.d $f2, $f2, $f2 /* C46F3C 8024035C 46000005 */ abs.s $f0, $f0 /* C46F40 80240360 46000021 */ cvt.d.s $f0, $f0 /* C46F44 80240364 4620103E */ c.le.d $f2, $f0 -/* C46F48 80240368 00000000 */ nop +/* C46F48 80240368 00000000 */ nop /* C46F4C 8024036C 45030001 */ bc1tl .L80240374 /* C46F50 80240370 0000882D */ daddu $s1, $zero, $zero .L80240374: diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s index b091ed3403..e21792c0eb 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s @@ -100,78 +100,93 @@ glabel func_8024061C_C471FC /* C47360 80240780 2C620064 */ sltiu $v0, $v1, 0x64 /* C47364 80240784 10400048 */ beqz $v0, .L802408A8 /* C47368 80240788 00031080 */ sll $v0, $v1, 2 -/* C4736C 8024078C 3C018024 */ lui $at, %hi(D_80245398) +/* C4736C 8024078C 3C018024 */ lui $at, %hi(jtbl_80245398_C4BF78) /* C47370 80240790 00220821 */ addu $at, $at, $v0 -/* C47374 80240794 8C225398 */ lw $v0, %lo(D_80245398)($at) +/* C47374 80240794 8C225398 */ lw $v0, %lo(jtbl_80245398_C4BF78)($at) /* C47378 80240798 00400008 */ jr $v0 /* C4737C 8024079C 00000000 */ nop +glabel L802407A0_C47380 /* C47380 802407A0 0240202D */ daddu $a0, $s2, $zero /* C47384 802407A4 0260282D */ daddu $a1, $s3, $zero /* C47388 802407A8 0C012568 */ jal func_800495A0 /* C4738C 802407AC 0280302D */ daddu $a2, $s4, $zero +glabel L802407B0_C47390 /* C47390 802407B0 0240202D */ daddu $a0, $s2, $zero /* C47394 802407B4 0260282D */ daddu $a1, $s3, $zero /* C47398 802407B8 0C0125AE */ jal func_800496B8 /* C4739C 802407BC 0280302D */ daddu $a2, $s4, $zero /* C473A0 802407C0 0809022A */ j .L802408A8 /* C473A4 802407C4 00000000 */ nop +glabel L802407C8_C473A8 /* C473A8 802407C8 0240202D */ daddu $a0, $s2, $zero /* C473AC 802407CC 0260282D */ daddu $a1, $s3, $zero /* C473B0 802407D0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C473B4 802407D4 0280302D */ daddu $a2, $s4, $zero +glabel L802407D8_C473B8 /* C473B8 802407D8 0240202D */ daddu $a0, $s2, $zero /* C473BC 802407DC 0260282D */ daddu $a1, $s3, $zero /* C473C0 802407E0 0C012701 */ jal func_80049C04 /* C473C4 802407E4 0280302D */ daddu $a2, $s4, $zero /* C473C8 802407E8 0809022A */ j .L802408A8 /* C473CC 802407EC 00000000 */ nop +glabel L802407F0_C473D0 /* C473D0 802407F0 0240202D */ daddu $a0, $s2, $zero /* C473D4 802407F4 0260282D */ daddu $a1, $s3, $zero /* C473D8 802407F8 0C01278F */ jal func_80049E3C /* C473DC 802407FC 0280302D */ daddu $a2, $s4, $zero +glabel L80240800_C473E0 /* C473E0 80240800 0240202D */ daddu $a0, $s2, $zero /* C473E4 80240804 0260282D */ daddu $a1, $s3, $zero /* C473E8 80240808 0C0127B3 */ jal func_80049ECC /* C473EC 8024080C 0280302D */ daddu $a2, $s4, $zero /* C473F0 80240810 0809022A */ j .L802408A8 /* C473F4 80240814 00000000 */ nop +glabel L80240818_C473F8 /* C473F8 80240818 0240202D */ daddu $a0, $s2, $zero /* C473FC 8024081C 0260282D */ daddu $a1, $s3, $zero /* C47400 80240820 0C0127DF */ jal func_80049F7C /* C47404 80240824 0280302D */ daddu $a2, $s4, $zero +glabel L80240828_C47408 /* C47408 80240828 0240202D */ daddu $a0, $s2, $zero /* C4740C 8024082C 0260282D */ daddu $a1, $s3, $zero /* C47410 80240830 0C012849 */ jal func_8004A124 /* C47414 80240834 0280302D */ daddu $a2, $s4, $zero /* C47418 80240838 0809022A */ j .L802408A8 /* C4741C 8024083C 00000000 */ nop +glabel L80240840_C47420 /* C47420 80240840 0240202D */ daddu $a0, $s2, $zero /* C47424 80240844 0260282D */ daddu $a1, $s3, $zero /* C47428 80240848 0C0128FA */ jal func_8004A3E8 /* C4742C 8024084C 0280302D */ daddu $a2, $s4, $zero /* C47430 80240850 0809022A */ j .L802408A8 /* C47434 80240854 00000000 */ nop +glabel L80240858_C47438 /* C47438 80240858 0C090000 */ jal dgb_09_UnkNpcAIFunc6 /* C4743C 8024085C 0240202D */ daddu $a0, $s2, $zero +glabel L80240860_C47440 /* C47440 80240860 0C09001B */ jal dgb_09_UnkNpcAIFunc7 /* C47444 80240864 0240202D */ daddu $a0, $s2, $zero /* C47448 80240868 8E430070 */ lw $v1, 0x70($s2) /* C4744C 8024086C 24020020 */ addiu $v0, $zero, 0x20 /* C47450 80240870 1462000D */ bne $v1, $v0, .L802408A8 /* C47454 80240874 00000000 */ nop +glabel L80240878_C47458 /* C47458 80240878 0C090037 */ jal dgb_09_UnkNpcAIFunc8 /* C4745C 8024087C 0240202D */ daddu $a0, $s2, $zero /* C47460 80240880 8E430070 */ lw $v1, 0x70($s2) /* C47464 80240884 24020021 */ addiu $v0, $zero, 0x21 /* C47468 80240888 14620007 */ bne $v1, $v0, .L802408A8 /* C4746C 8024088C 00000000 */ nop +glabel L80240890_C47470 /* C47470 80240890 0C09006D */ jal dgb_09_UnkNpcAIFunc5 /* C47474 80240894 0240202D */ daddu $a0, $s2, $zero /* C47478 80240898 0809022A */ j .L802408A8 /* C4747C 8024089C 00000000 */ nop +glabel L802408A0_C47480 /* C47480 802408A0 0C0129CF */ jal func_8004A73C /* C47484 802408A4 0240202D */ daddu $a0, $s2, $zero .L802408A8: +glabel L802408A8_C47488 /* C47488 802408A8 8FBF0048 */ lw $ra, 0x48($sp) /* C4748C 802408AC 8FB50044 */ lw $s5, 0x44($sp) /* C47490 802408B0 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802408D0_C474B0.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802408D0_C474B0.s index 6ccc31010f..3dbc9f89ef 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802408D0_C474B0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802408D0_C474B0.s @@ -20,14 +20,14 @@ glabel func_802408D0_C474B0 /* C474E8 80240908 8482008E */ lh $v0, 0x8e($a0) /* C474EC 8024090C 24030001 */ addiu $v1, $zero, 1 /* C474F0 80240910 14430005 */ bne $v0, $v1, .L80240928 -/* C474F4 80240914 00000000 */ nop +/* C474F4 80240914 00000000 */ nop /* C474F8 80240918 8E0200CC */ lw $v0, 0xcc($s0) /* C474FC 8024091C 8C420030 */ lw $v0, 0x30($v0) /* C47500 80240920 08090251 */ j .L80240944 /* C47504 80240924 AC820028 */ sw $v0, 0x28($a0) .L80240928: /* C47508 80240928 1C400006 */ bgtz $v0, .L80240944 -/* C4750C 8024092C 00000000 */ nop +/* C4750C 8024092C 00000000 */ nop /* C47510 80240930 8E0200CC */ lw $v0, 0xcc($s0) /* C47514 80240934 8C420028 */ lw $v0, 0x28($v0) /* C47518 80240938 A480008E */ sh $zero, 0x8e($a0) diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240958_C47538.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240958_C47538.s index 5af333cadd..7a29053781 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240958_C47538.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240958_C47538.s @@ -25,7 +25,7 @@ glabel func_80240958_C47538 /* C47588 802409A8 0C01242D */ jal func_800490B4 /* C4758C 802409AC AFA00010 */ sw $zero, 0x10($sp) /* C47590 802409B0 10400022 */ beqz $v0, .L80240A3C -/* C47594 802409B4 00000000 */ nop +/* C47594 802409B4 00000000 */ nop /* C47598 802409B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C4759C 802409BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* C475A0 802409C0 804300B4 */ lb $v1, 0xb4($v0) @@ -49,7 +49,7 @@ glabel func_80240958_C47538 /* C475E8 80240A08 10620003 */ beq $v1, $v0, .L80240A18 /* C475EC 80240A0C 24020025 */ addiu $v0, $zero, 0x25 /* C475F0 80240A10 14620002 */ bne $v1, $v0, .L80240A1C -/* C475F4 80240A14 00000000 */ nop +/* C475F4 80240A14 00000000 */ nop .L80240A18: /* C475F8 80240A18 24120001 */ addiu $s2, $zero, 1 .L80240A1C: @@ -98,9 +98,9 @@ glabel func_80240958_C47538 /* C47690 80240AB0 8C470040 */ lw $a3, 0x40($v0) /* C47694 80240AB4 3C0142A0 */ lui $at, 0x42a0 /* C47698 80240AB8 44811000 */ mtc1 $at, $f2 -/* C4769C 80240ABC 00000000 */ nop +/* C4769C 80240ABC 00000000 */ nop /* C476A0 80240AC0 4602003E */ c.le.s $f0, $f2 -/* C476A4 80240AC4 00000000 */ nop +/* C476A4 80240AC4 00000000 */ nop /* C476A8 80240AC8 45030001 */ bc1tl .L80240AD0 /* C476AC 80240ACC 24120001 */ addiu $s2, $zero, 1 .L80240AD0: @@ -122,7 +122,7 @@ glabel func_80240958_C47538 /* C476EC 80240B0C 3C01C1A0 */ lui $at, 0xc1a0 /* C476F0 80240B10 44812000 */ mtc1 $at, $f4 /* C476F4 80240B14 44823000 */ mtc1 $v0, $f6 -/* C476F8 80240B18 00000000 */ nop +/* C476F8 80240B18 00000000 */ nop /* C476FC 80240B1C 468031A0 */ cvt.s.w $f6, $f6 /* C47700 80240B20 44073000 */ mfc1 $a3, $f6 /* C47704 80240B24 8C63002C */ lw $v1, 0x2c($v1) @@ -166,7 +166,7 @@ glabel func_80240958_C47538 /* C47790 80240BB0 0C012530 */ jal func_800494C0 /* C47794 80240BB4 0000302D */ daddu $a2, $zero, $zero /* C47798 80240BB8 080902FC */ j .L80240BF0 -/* C4779C 80240BBC 00000000 */ nop +/* C4779C 80240BBC 00000000 */ nop .L80240BC0: /* C477A0 80240BC0 14620005 */ bne $v1, $v0, .L80240BD8 /* C477A4 80240BC4 2402003C */ addiu $v0, $zero, 0x3c @@ -176,7 +176,7 @@ glabel func_80240958_C47538 /* C477B4 80240BD4 AE220028 */ sw $v0, 0x28($s1) .L80240BD8: /* C477B8 80240BD8 14620005 */ bne $v1, $v0, .L80240BF0 -/* C477BC 80240BDC 00000000 */ nop +/* C477BC 80240BDC 00000000 */ nop /* C477C0 80240BE0 8E6200CC */ lw $v0, 0xcc($s3) /* C477C4 80240BE4 8C420028 */ lw $v0, 0x28($v0) /* C477C8 80240BE8 A620008E */ sh $zero, 0x8e($s1) diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240C74_C47854.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240C74_C47854.s index 04efbef90f..506213dff0 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240C74_C47854.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240C74_C47854.s @@ -16,7 +16,7 @@ glabel func_80240C74_C47854 /* C47880 80240CA0 0040802D */ daddu $s0, $v0, $zero /* C47884 80240CA4 C60C000C */ lwc1 $f12, 0xc($s0) /* C47888 80240CA8 44820000 */ mtc1 $v0, $f0 -/* C4788C 80240CAC 00000000 */ nop +/* C4788C 80240CAC 00000000 */ nop /* C47890 80240CB0 46800020 */ cvt.s.w $f0, $f0 /* C47894 80240CB4 46006300 */ add.s $f12, $f12, $f0 /* C47898 80240CB8 3C0142B4 */ lui $at, 0x42b4 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240D1C_C478FC.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240D1C_C478FC.s index d01942d192..4f07357085 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240D1C_C478FC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240D1C_C478FC.s @@ -22,7 +22,7 @@ glabel func_80240D1C_C478FC /* C47940 80240D60 0C01242D */ jal func_800490B4 /* C47944 80240D64 0220282D */ daddu $a1, $s1, $zero /* C47948 80240D68 1040000C */ beqz $v0, .L80240D9C -/* C4794C 80240D6C 00000000 */ nop +/* C4794C 80240D6C 00000000 */ nop /* C47950 80240D70 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C47954 80240D74 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* C47958 80240D78 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -40,7 +40,7 @@ glabel func_80240D1C_C478FC /* C47984 80240DA4 A602008E */ sh $v0, 0x8e($s0) /* C47988 80240DA8 00021400 */ sll $v0, $v0, 0x10 /* C4798C 80240DAC 1C400022 */ bgtz $v0, .L80240E38 -/* C47990 80240DB0 00000000 */ nop +/* C47990 80240DB0 00000000 */ nop /* C47994 80240DB4 8E420074 */ lw $v0, 0x74($s2) /* C47998 80240DB8 2442FFFF */ addiu $v0, $v0, -1 /* C4799C 80240DBC 18400014 */ blez $v0, .L80240E10 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240E54_C47A34.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240E54_C47A34.s index 1b9640aadc..3288fdd8c1 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240E54_C47A34.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240E54_C47A34.s @@ -18,14 +18,14 @@ glabel func_80240E54_C47A34 /* C47A68 80240E88 A462008E */ sh $v0, 0x8e($v1) /* C47A6C 80240E8C 00021400 */ sll $v0, $v0, 0x10 /* C47A70 80240E90 1C400015 */ bgtz $v0, .L80240EE8 -/* C47A74 80240E94 00000000 */ nop +/* C47A74 80240E94 00000000 */ nop /* C47A78 80240E98 8E0200CC */ lw $v0, 0xcc($s0) /* C47A7C 80240E9C 8C420004 */ lw $v0, 4($v0) /* C47A80 80240EA0 AC620028 */ sw $v0, 0x28($v1) /* C47A84 80240EA4 8E0200D0 */ lw $v0, 0xd0($s0) /* C47A88 80240EA8 8C420014 */ lw $v0, 0x14($v0) /* C47A8C 80240EAC 04410004 */ bgez $v0, .L80240EC0 -/* C47A90 80240EB0 00000000 */ nop +/* C47A90 80240EB0 00000000 */ nop /* C47A94 80240EB4 C6200000 */ lwc1 $f0, ($s1) /* C47A98 80240EB8 080903B8 */ j .L80240EE0 /* C47A9C 80240EBC E4600018 */ swc1 $f0, 0x18($v1) @@ -33,7 +33,7 @@ glabel func_80240E54_C47A34 /* C47AA0 80240EC0 3C018024 */ lui $at, %hi(D_80245528) /* C47AA4 80240EC4 D4225528 */ ldc1 $f2, %lo(D_80245528)($at) /* C47AA8 80240EC8 44820000 */ mtc1 $v0, $f0 -/* C47AAC 80240ECC 00000000 */ nop +/* C47AAC 80240ECC 00000000 */ nop /* C47AB0 80240ED0 46800021 */ cvt.d.w $f0, $f0 /* C47AB4 80240ED4 46220003 */ div.d $f0, $f0, $f2 /* C47AB8 80240ED8 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240F00_C47AE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240F00_C47AE0.s index 49bfdb877f..2f54b203d5 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240F00_C47AE0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240F00_C47AE0.s @@ -22,7 +22,7 @@ glabel func_80240F00_C47AE0 /* C47B24 80240F44 0C01242D */ jal func_800490B4 /* C47B28 80240F48 0040802D */ daddu $s0, $v0, $zero /* C47B2C 80240F4C 1040000C */ beqz $v0, .L80240F80 -/* C47B30 80240F50 00000000 */ nop +/* C47B30 80240F50 00000000 */ nop /* C47B34 80240F54 C60C0038 */ lwc1 $f12, 0x38($s0) /* C47B38 80240F58 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C47B3C 80240F5C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -45,12 +45,12 @@ glabel func_80240F00_C47AE0 /* C47B7C 80240F9C 46802120 */ cvt.s.w $f4, $f4 /* C47B80 80240FA0 44072000 */ mfc1 $a3, $f4 /* C47B84 80240FA4 0C00A7B5 */ jal dist2D -/* C47B88 80240FA8 00000000 */ nop +/* C47B88 80240FA8 00000000 */ nop /* C47B8C 80240FAC C6020018 */ lwc1 $f2, 0x18($s0) /* C47B90 80240FB0 4602003E */ c.le.s $f0, $f2 -/* C47B94 80240FB4 00000000 */ nop +/* C47B94 80240FB4 00000000 */ nop /* C47B98 80240FB8 4500000B */ bc1f .L80240FE8 -/* C47B9C 80240FBC 00000000 */ nop +/* C47B9C 80240FBC 00000000 */ nop /* C47BA0 80240FC0 8E4200CC */ lw $v0, 0xcc($s2) /* C47BA4 80240FC4 8C430000 */ lw $v1, ($v0) /* C47BA8 80240FC8 2402000F */ addiu $v0, $zero, 0xf @@ -85,7 +85,7 @@ glabel func_80240F00_C47AE0 /* C47C18 80241038 46802120 */ cvt.s.w $f4, $f4 /* C47C1C 8024103C 44072000 */ mfc1 $a3, $f4 /* C47C20 80241040 0C00A720 */ jal atan2 -/* C47C24 80241044 00000000 */ nop +/* C47C24 80241044 00000000 */ nop /* C47C28 80241048 8E050018 */ lw $a1, 0x18($s0) /* C47C2C 8024104C 44060000 */ mfc1 $a2, $f0 /* C47C30 80241050 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241078_C47C58.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241078_C47C58.s index fe93740b61..16014b5dfd 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241078_C47C58.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241078_C47C58.s @@ -12,13 +12,13 @@ glabel func_80241078_C47C58 /* C47C74 80241094 0040182D */ daddu $v1, $v0, $zero /* C47C78 80241098 8462008C */ lh $v0, 0x8c($v1) /* C47C7C 8024109C 14400009 */ bnez $v0, .L802410C4 -/* C47C80 802410A0 00000000 */ nop +/* C47C80 802410A0 00000000 */ nop /* C47C84 802410A4 9462008E */ lhu $v0, 0x8e($v1) /* C47C88 802410A8 2442FFFF */ addiu $v0, $v0, -1 /* C47C8C 802410AC A462008E */ sh $v0, 0x8e($v1) /* C47C90 802410B0 00021400 */ sll $v0, $v0, 0x10 /* C47C94 802410B4 1C400003 */ bgtz $v0, .L802410C4 -/* C47C98 802410B8 00000000 */ nop +/* C47C98 802410B8 00000000 */ nop /* C47C9C 802410BC A460008E */ sh $zero, 0x8e($v1) /* C47CA0 802410C0 AE000070 */ sw $zero, 0x70($s0) .L802410C4: diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s index 89a3872ec7..8d223647d5 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s @@ -46,7 +46,7 @@ glabel func_802410D4_C47CB4 /* C47D58 80241178 8E2200B0 */ lw $v0, 0xb0($s1) /* C47D5C 8024117C 30420004 */ andi $v0, $v0, 4 /* C47D60 80241180 10400027 */ beqz $v0, .L80241220 -/* C47D64 80241184 00000000 */ nop +/* C47D64 80241184 00000000 */ nop .L80241188: /* C47D68 80241188 2402001E */ addiu $v0, $zero, 0x1e /* C47D6C 8024118C 2404F7FF */ addiu $a0, $zero, -0x801 @@ -94,10 +94,10 @@ glabel func_802410D4_C47CB4 /* C47E04 80241224 2442FFF6 */ addiu $v0, $v0, -0xa /* C47E08 80241228 2C420014 */ sltiu $v0, $v0, 0x14 /* C47E0C 8024122C 10400009 */ beqz $v0, .L80241254 -/* C47E10 80241230 00000000 */ nop +/* C47E10 80241230 00000000 */ nop /* C47E14 80241234 8E22006C */ lw $v0, 0x6c($s1) /* C47E18 80241238 14400006 */ bnez $v0, .L80241254 -/* C47E1C 8024123C 00000000 */ nop +/* C47E1C 8024123C 00000000 */ nop /* C47E20 80241240 0C090082 */ jal func_80240208_C46DE8 /* C47E24 80241244 0240202D */ daddu $a0, $s2, $zero /* C47E28 80241248 10400002 */ beqz $v0, .L80241254 @@ -108,41 +108,47 @@ glabel func_802410D4_C47CB4 /* C47E38 80241258 2C620064 */ sltiu $v0, $v1, 0x64 /* C47E3C 8024125C 10400067 */ beqz $v0, .L802413FC /* C47E40 80241260 00031080 */ sll $v0, $v1, 2 -/* C47E44 80241264 3C018024 */ lui $at, %hi(D_80245530) +/* C47E44 80241264 3C018024 */ lui $at, %hi(jtbl_80245530_C4C110) /* C47E48 80241268 00220821 */ addu $at, $at, $v0 -/* C47E4C 8024126C 8C225530 */ lw $v0, %lo(D_80245530)($at) +/* C47E4C 8024126C 8C225530 */ lw $v0, %lo(jtbl_80245530_C4C110)($at) /* C47E50 80241270 00400008 */ jr $v0 -/* C47E54 80241274 00000000 */ nop +/* C47E54 80241274 00000000 */ nop +glabel L80241278_C47E58 /* C47E58 80241278 0240202D */ daddu $a0, $s2, $zero /* C47E5C 8024127C 0260282D */ daddu $a1, $s3, $zero /* C47E60 80241280 0C090234 */ jal func_802408D0_C474B0 /* C47E64 80241284 02A0302D */ daddu $a2, $s5, $zero /* C47E68 80241288 080904FF */ j .L802413FC -/* C47E6C 8024128C 00000000 */ nop +/* C47E6C 8024128C 00000000 */ nop +glabel L80241290_C47E70 /* C47E70 80241290 0240202D */ daddu $a0, $s2, $zero /* C47E74 80241294 0260282D */ daddu $a1, $s3, $zero /* C47E78 80241298 0C090256 */ jal func_80240958_C47538 /* C47E7C 8024129C 02A0302D */ daddu $a2, $s5, $zero /* C47E80 802412A0 080904FF */ j .L802413FC -/* C47E84 802412A4 00000000 */ nop +/* C47E84 802412A4 00000000 */ nop +glabel L802412A8_C47E88 /* C47E88 802412A8 0240202D */ daddu $a0, $s2, $zero /* C47E8C 802412AC 0260282D */ daddu $a1, $s3, $zero /* C47E90 802412B0 0C090304 */ jal func_80240C10_C477F0 /* C47E94 802412B4 02A0302D */ daddu $a2, $s5, $zero /* C47E98 802412B8 080904FF */ j .L802413FC -/* C47E9C 802412BC 00000000 */ nop +/* C47E9C 802412BC 00000000 */ nop +glabel L802412C0_C47EA0 /* C47EA0 802412C0 0240202D */ daddu $a0, $s2, $zero /* C47EA4 802412C4 0260282D */ daddu $a1, $s3, $zero /* C47EA8 802412C8 0C09031D */ jal func_80240C74_C47854 /* C47EAC 802412CC 02A0302D */ daddu $a2, $s5, $zero /* C47EB0 802412D0 080904FF */ j .L802413FC -/* C47EB4 802412D4 00000000 */ nop +/* C47EB4 802412D4 00000000 */ nop +glabel L802412D8_C47EB8 /* C47EB8 802412D8 0240202D */ daddu $a0, $s2, $zero /* C47EBC 802412DC 0260282D */ daddu $a1, $s3, $zero /* C47EC0 802412E0 0C090347 */ jal func_80240D1C_C478FC /* C47EC4 802412E4 02A0302D */ daddu $a2, $s5, $zero /* C47EC8 802412E8 080904FF */ j .L802413FC -/* C47ECC 802412EC 00000000 */ nop +/* C47ECC 802412EC 00000000 */ nop +glabel L802412F0_C47ED0 /* C47ED0 802412F0 0240202D */ daddu $a0, $s2, $zero /* C47ED4 802412F4 0260282D */ daddu $a1, $s3, $zero /* C47ED8 802412F8 0C0127DF */ jal func_80049F7C @@ -150,13 +156,15 @@ glabel func_802410D4_C47CB4 /* C47EE0 80241300 8E430070 */ lw $v1, 0x70($s2) /* C47EE4 80241304 2402000D */ addiu $v0, $zero, 0xd /* C47EE8 80241308 1462003C */ bne $v1, $v0, .L802413FC -/* C47EEC 8024130C 00000000 */ nop +/* C47EEC 8024130C 00000000 */ nop +glabel L80241310_C47EF0 /* C47EF0 80241310 0240202D */ daddu $a0, $s2, $zero /* C47EF4 80241314 0260282D */ daddu $a1, $s3, $zero /* C47EF8 80241318 0C012849 */ jal func_8004A124 /* C47EFC 8024131C 02A0302D */ daddu $a2, $s5, $zero /* C47F00 80241320 080904FF */ j .L802413FC -/* C47F04 80241324 00000000 */ nop +/* C47F04 80241324 00000000 */ nop +glabel L80241328_C47F08 /* C47F08 80241328 0240202D */ daddu $a0, $s2, $zero /* C47F0C 8024132C 0260282D */ daddu $a1, $s3, $zero /* C47F10 80241330 0C0128FA */ jal func_8004A3E8 @@ -168,26 +176,31 @@ glabel func_802410D4_C47CB4 /* C47F28 80241348 24020003 */ addiu $v0, $zero, 3 /* C47F2C 8024134C 080904FF */ j .L802413FC /* C47F30 80241350 AE420070 */ sw $v0, 0x70($s2) +glabel L80241354_C47F34 /* C47F34 80241354 0C090000 */ jal dgb_09_UnkNpcAIFunc6 /* C47F38 80241358 0240202D */ daddu $a0, $s2, $zero /* C47F3C 8024135C 8E430070 */ lw $v1, 0x70($s2) /* C47F40 80241360 2402001F */ addiu $v0, $zero, 0x1f /* C47F44 80241364 14620025 */ bne $v1, $v0, .L802413FC -/* C47F48 80241368 00000000 */ nop +/* C47F48 80241368 00000000 */ nop +glabel L8024136C_C47F4C /* C47F4C 8024136C 0C09001B */ jal dgb_09_UnkNpcAIFunc7 /* C47F50 80241370 0240202D */ daddu $a0, $s2, $zero /* C47F54 80241374 8E430070 */ lw $v1, 0x70($s2) /* C47F58 80241378 24020020 */ addiu $v0, $zero, 0x20 /* C47F5C 8024137C 1462001F */ bne $v1, $v0, .L802413FC -/* C47F60 80241380 00000000 */ nop +/* C47F60 80241380 00000000 */ nop +glabel L80241384_C47F64 /* C47F64 80241384 0C090037 */ jal dgb_09_UnkNpcAIFunc8 /* C47F68 80241388 0240202D */ daddu $a0, $s2, $zero /* C47F6C 8024138C 080904FF */ j .L802413FC -/* C47F70 80241390 00000000 */ nop +/* C47F70 80241390 00000000 */ nop +glabel L80241394_C47F74 /* C47F74 80241394 0C09006D */ jal dgb_09_UnkNpcAIFunc5 /* C47F78 80241398 0240202D */ daddu $a0, $s2, $zero /* C47F7C 8024139C 080904FF */ j .L802413FC -/* C47F80 802413A0 00000000 */ nop +/* C47F80 802413A0 00000000 */ nop +glabel L802413A4_C47F84 /* C47F84 802413A4 0240202D */ daddu $a0, $s2, $zero /* C47F88 802413A8 0260282D */ daddu $a1, $s3, $zero /* C47F8C 802413AC 0C090395 */ jal func_80240E54_C47A34 @@ -195,22 +208,26 @@ glabel func_802410D4_C47CB4 /* C47F94 802413B4 8E430070 */ lw $v1, 0x70($s2) /* C47F98 802413B8 24020029 */ addiu $v0, $zero, 0x29 /* C47F9C 802413BC 1462000F */ bne $v1, $v0, .L802413FC -/* C47FA0 802413C0 00000000 */ nop +/* C47FA0 802413C0 00000000 */ nop +glabel L802413C4_C47FA4 /* C47FA4 802413C4 0240202D */ daddu $a0, $s2, $zero /* C47FA8 802413C8 0260282D */ daddu $a1, $s3, $zero /* C47FAC 802413CC 0C0903C0 */ jal func_80240F00_C47AE0 /* C47FB0 802413D0 02A0302D */ daddu $a2, $s5, $zero /* C47FB4 802413D4 080904FF */ j .L802413FC -/* C47FB8 802413D8 00000000 */ nop +/* C47FB8 802413D8 00000000 */ nop +glabel L802413DC_C47FBC /* C47FBC 802413DC 0240202D */ daddu $a0, $s2, $zero /* C47FC0 802413E0 0260282D */ daddu $a1, $s3, $zero /* C47FC4 802413E4 0C09041E */ jal func_80241078_C47C58 /* C47FC8 802413E8 02A0302D */ daddu $a2, $s5, $zero /* C47FCC 802413EC 080904FF */ j .L802413FC -/* C47FD0 802413F0 00000000 */ nop +/* C47FD0 802413F0 00000000 */ nop +glabel L802413F4_C47FD4 /* C47FD4 802413F4 0C0129CF */ jal func_8004A73C /* C47FD8 802413F8 0240202D */ daddu $a0, $s2, $zero .L802413FC: +glabel L802413FC_C47FDC /* C47FDC 802413FC 8FBF0048 */ lw $ra, 0x48($sp) /* C47FE0 80241400 8FB50044 */ lw $s5, 0x44($sp) /* C47FE4 80241404 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241424_C48004.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241424_C48004.s index a00f86d39e..e58309b849 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241424_C48004.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241424_C48004.s @@ -47,7 +47,7 @@ glabel func_80241424_C48004 /* C480AC 802414CC 0C0123F5 */ jal is_point_within_region /* C480B0 802414D0 8E070038 */ lw $a3, 0x38($s0) /* C480B4 802414D4 1040000E */ beqz $v0, .L80241510 -/* C480B8 802414D8 00000000 */ nop +/* C480B8 802414D8 00000000 */ nop /* C480BC 802414DC 8E2200D0 */ lw $v0, 0xd0($s1) /* C480C0 802414E0 C60C0038 */ lwc1 $f12, 0x38($s0) /* C480C4 802414E4 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80241424_C48004 /* C480D8 802414F8 468031A0 */ cvt.s.w $f6, $f6 /* C480DC 802414FC 44073000 */ mfc1 $a3, $f6 /* C480E0 80241500 0C00A720 */ jal atan2 -/* C480E4 80241504 00000000 */ nop +/* C480E4 80241504 00000000 */ nop /* C480E8 80241508 08090550 */ j .L80241540 /* C480EC 8024150C E600000C */ swc1 $f0, 0xc($s0) .L80241510: @@ -66,7 +66,7 @@ glabel func_80241424_C48004 /* C480F4 80241514 2404003C */ addiu $a0, $zero, 0x3c /* C480F8 80241518 C60C000C */ lwc1 $f12, 0xc($s0) /* C480FC 8024151C 44820000 */ mtc1 $v0, $f0 -/* C48100 80241520 00000000 */ nop +/* C48100 80241520 00000000 */ nop /* C48104 80241524 46800020 */ cvt.s.w $f0, $f0 /* C48108 80241528 46006300 */ add.s $f12, $f12, $f0 /* C4810C 8024152C 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80241424_C48004 /* C48130 80241550 8E2200D0 */ lw $v0, 0xd0($s1) /* C48134 80241554 8C420014 */ lw $v0, 0x14($v0) /* C48138 80241558 04410004 */ bgez $v0, .L8024156C -/* C4813C 8024155C 00000000 */ nop +/* C4813C 8024155C 00000000 */ nop /* C48140 80241560 C6400000 */ lwc1 $f0, ($s2) /* C48144 80241564 08090563 */ j .L8024158C /* C48148 80241568 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80241424_C48004 /* C4814C 8024156C 3C018024 */ lui $at, %hi(D_802456C0) /* C48150 80241570 D42256C0 */ ldc1 $f2, %lo(D_802456C0)($at) /* C48154 80241574 44820000 */ mtc1 $v0, $f0 -/* C48158 80241578 00000000 */ nop +/* C48158 80241578 00000000 */ nop /* C4815C 8024157C 46800021 */ cvt.d.w $f0, $f0 /* C48160 80241580 46220003 */ div.d $f0, $f0, $f2 /* C48164 80241584 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80241424_C48004 /* C48178 80241598 44801000 */ mtc1 $zero, $f2 /* C4817C 8024159C 46000021 */ cvt.d.s $f0, $f0 /* C48180 802415A0 46220002 */ mul.d $f0, $f0, $f2 -/* C48184 802415A4 00000000 */ nop +/* C48184 802415A4 00000000 */ nop /* C48188 802415A8 24020001 */ addiu $v0, $zero, 1 /* C4818C 802415AC 4620018D */ trunc.w.d $f6, $f0 /* C48190 802415B0 E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802415D4_C481B4.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802415D4_C481B4.s index d4bb587865..71ae06107f 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802415D4_C481B4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802415D4_C481B4.s @@ -34,7 +34,7 @@ glabel func_802415D4_C481B4 /* C48228 80241648 44803000 */ mtc1 $zero, $f6 /* C4822C 8024164C 46000021 */ cvt.d.s $f0, $f0 /* C48230 80241650 46260002 */ mul.d $f0, $f0, $f6 -/* C48234 80241654 00000000 */ nop +/* C48234 80241654 00000000 */ nop /* C48238 80241658 24020001 */ addiu $v0, $zero, 1 /* C4823C 8024165C 8E24006C */ lw $a0, 0x6c($s1) /* C48240 80241660 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_802415D4_C481B4 /* C4829C 802416BC C600003C */ lwc1 $f0, 0x3c($s0) /* C482A0 802416C0 4600C001 */ sub.s $f0, $f24, $f0 /* C482A4 802416C4 4600B03C */ c.lt.s $f22, $f0 -/* C482A8 802416C8 00000000 */ nop +/* C482A8 802416C8 00000000 */ nop /* C482AC 802416CC 4500001B */ bc1f .L8024173C /* C482B0 802416D0 34820010 */ ori $v0, $a0, 0x10 /* C482B4 802416D4 080905CF */ j .L8024173C @@ -87,9 +87,9 @@ glabel func_802415D4_C481B4 /* C482F8 80241718 C7A00034 */ lwc1 $f0, 0x34($sp) /* C482FC 8024171C 4600D001 */ sub.s $f0, $f26, $f0 /* C48300 80241720 4600B03C */ c.lt.s $f22, $f0 -/* C48304 80241724 00000000 */ nop +/* C48304 80241724 00000000 */ nop /* C48308 80241728 45000004 */ bc1f .L8024173C -/* C4830C 8024172C 00000000 */ nop +/* C4830C 8024172C 00000000 */ nop /* C48310 80241730 8E22006C */ lw $v0, 0x6c($s1) /* C48314 80241734 34420010 */ ori $v0, $v0, 0x10 /* C48318 80241738 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_802415D4_C481B4 /* C48320 80241740 24030011 */ addiu $v1, $zero, 0x11 /* C48324 80241744 30420011 */ andi $v0, $v0, 0x11 /* C48328 80241748 14430039 */ bne $v0, $v1, .L80241830 -/* C4832C 8024174C 00000000 */ nop +/* C4832C 8024174C 00000000 */ nop /* C48330 80241750 8E020000 */ lw $v0, ($s0) /* C48334 80241754 30420008 */ andi $v0, $v0, 8 /* C48338 80241758 1040000A */ beqz $v0, .L80241784 @@ -108,7 +108,7 @@ glabel func_802415D4_C481B4 /* C48348 80241768 D42056C8 */ ldc1 $f0, %lo(func_802456C8_A2F908)($at) /* C4834C 8024176C 460010A1 */ cvt.d.s $f2, $f2 /* C48350 80241770 46201082 */ mul.d $f2, $f2, $f0 -/* C48354 80241774 00000000 */ nop +/* C48354 80241774 00000000 */ nop /* C48358 80241778 4600A021 */ cvt.d.s $f0, $f20 /* C4835C 8024177C 080905FA */ j .L802417E8 /* C48360 80241780 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_802415D4_C481B4 /* C483B0 802417D0 D42056D0 */ ldc1 $f0, %lo(D_802456D0)($at) /* C483B4 802417D4 460010A1 */ cvt.d.s $f2, $f2 /* C483B8 802417D8 46201082 */ mul.d $f2, $f2, $f0 -/* C483BC 802417DC 00000000 */ nop +/* C483BC 802417DC 00000000 */ nop /* C483C0 802417E0 4600A021 */ cvt.d.s $f0, $f20 /* C483C4 802417E4 46220000 */ add.d $f0, $f0, $f2 .L802417E8: @@ -149,7 +149,7 @@ glabel func_802415D4_C481B4 /* C483E4 80241804 46000005 */ abs.s $f0, $f0 /* C483E8 80241808 46000021 */ cvt.d.s $f0, $f0 /* C483EC 8024180C 4622003C */ c.lt.d $f0, $f2 -/* C483F0 80241810 00000000 */ nop +/* C483F0 80241810 00000000 */ nop /* C483F4 80241814 45000036 */ bc1f .L802418F0 /* C483F8 80241818 2403FFEF */ addiu $v1, $zero, -0x11 /* C483FC 8024181C E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_802415D4_C481B4 .L80241830: /* C48410 80241830 8E220070 */ lw $v0, 0x70($s1) /* C48414 80241834 1840002E */ blez $v0, .L802418F0 -/* C48418 80241838 00000000 */ nop +/* C48418 80241838 00000000 */ nop /* C4841C 8024183C C62C0074 */ lwc1 $f12, 0x74($s1) /* C48420 80241840 0C00A8BB */ jal sin_deg /* C48424 80241844 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_802415D4_C481B4 /* C4847C 8024189C 27A70030 */ addiu $a3, $sp, 0x30 .L802418A0: /* C48480 802418A0 10400007 */ beqz $v0, .L802418C0 -/* C48484 802418A4 00000000 */ nop +/* C48484 802418A4 00000000 */ nop /* C48488 802418A8 4616A082 */ mul.s $f2, $f20, $f22 -/* C4848C 802418AC 00000000 */ nop +/* C4848C 802418AC 00000000 */ nop /* C48490 802418B0 C7A0002C */ lwc1 $f0, 0x2c($sp) /* C48494 802418B4 461A0000 */ add.s $f0, $f0, $f26 /* C48498 802418B8 08090633 */ j .L802418CC /* C4849C 802418BC 46020000 */ add.s $f0, $f0, $f2 .L802418C0: /* C484A0 802418C0 4616A002 */ mul.s $f0, $f20, $f22 -/* C484A4 802418C4 00000000 */ nop +/* C484A4 802418C4 00000000 */ nop /* C484A8 802418C8 4600C000 */ add.s $f0, $f24, $f0 .L802418CC: /* C484AC 802418CC E600003C */ swc1 $f0, 0x3c($s0) /* C484B0 802418D0 8E220074 */ lw $v0, 0x74($s1) /* C484B4 802418D4 2442000A */ addiu $v0, $v0, 0xa /* C484B8 802418D8 44826000 */ mtc1 $v0, $f12 -/* C484BC 802418DC 00000000 */ nop +/* C484BC 802418DC 00000000 */ nop /* C484C0 802418E0 0C00A6C9 */ jal clamp_angle /* C484C4 802418E4 46806320 */ cvt.s.w $f12, $f12 /* C484C8 802418E8 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_802415D4_C481B4 /* C484D8 802418F8 2442FFFF */ addiu $v0, $v0, -1 /* C484DC 802418FC 8E430014 */ lw $v1, 0x14($s2) /* C484E0 80241900 04600048 */ bltz $v1, .L80241A24 -/* C484E4 80241904 00000000 */ nop +/* C484E4 80241904 00000000 */ nop /* C484E8 80241908 8E620074 */ lw $v0, 0x74($s3) /* C484EC 8024190C 1C400042 */ bgtz $v0, .L80241A18 /* C484F0 80241910 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_802415D4_C481B4 /* C484F8 80241918 860200A8 */ lh $v0, 0xa8($s0) /* C484FC 8024191C C602003C */ lwc1 $f2, 0x3c($s0) /* C48500 80241920 44820000 */ mtc1 $v0, $f0 -/* C48504 80241924 00000000 */ nop +/* C48504 80241924 00000000 */ nop /* C48508 80241928 46800020 */ cvt.s.w $f0, $f0 /* C4850C 8024192C 46001080 */ add.s $f2, $f2, $f0 /* C48510 80241930 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_802415D4_C481B4 /* C4852C 8024194C C440002C */ lwc1 $f0, 0x2c($v0) /* C48530 80241950 46000021 */ cvt.d.s $f0, $f0 /* C48534 80241954 4622003C */ c.lt.d $f0, $f2 -/* C48538 80241958 00000000 */ nop +/* C48538 80241958 00000000 */ nop /* C4853C 8024195C 4500002C */ bc1f .L80241A10 /* C48540 80241960 02A0202D */ daddu $a0, $s5, $zero /* C48544 80241964 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_802415D4_C481B4 /* C48580 802419A0 3C01C1A0 */ lui $at, 0xc1a0 /* C48584 802419A4 44812000 */ mtc1 $at, $f4 /* C48588 802419A8 44834000 */ mtc1 $v1, $f8 -/* C4858C 802419AC 00000000 */ nop +/* C4858C 802419AC 00000000 */ nop /* C48590 802419B0 46804220 */ cvt.s.w $f8, $f8 /* C48594 802419B4 44074000 */ mfc1 $a3, $f8 /* C48598 802419B8 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_802415D4_C481B4 /* C4864C 80241A6C 0C0123F5 */ jal is_point_within_region /* C48650 80241A70 8E070038 */ lw $a3, 0x38($s0) /* C48654 80241A74 1040001A */ beqz $v0, .L80241AE0 -/* C48658 80241A78 00000000 */ nop +/* C48658 80241A78 00000000 */ nop /* C4865C 80241A7C 8E060038 */ lw $a2, 0x38($s0) /* C48660 80241A80 8E2200D0 */ lw $v0, 0xd0($s1) /* C48664 80241A84 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_802415D4_C481B4 /* C48678 80241A98 468073A0 */ cvt.s.w $f14, $f14 /* C4867C 80241A9C C6020018 */ lwc1 $f2, 0x18($s0) /* C48680 80241AA0 4600103C */ c.lt.s $f2, $f0 -/* C48684 80241AA4 00000000 */ nop +/* C48684 80241AA4 00000000 */ nop /* C48688 80241AA8 4500000D */ bc1f .L80241AE0 /* C4868C 80241AAC E7A00034 */ swc1 $f0, 0x34($sp) /* C48690 80241AB0 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_802415D4_C481B4 /* C486CC 80241AEC 00621825 */ or $v1, $v1, $v0 /* C486D0 80241AF0 00741825 */ or $v1, $v1, $s4 /* C486D4 80241AF4 10600008 */ beqz $v1, .L80241B18 -/* C486D8 80241AF8 00000000 */ nop +/* C486D8 80241AF8 00000000 */ nop /* C486DC 80241AFC 8602008C */ lh $v0, 0x8c($s0) /* C486E0 80241B00 14400031 */ bnez $v0, .L80241BC8 -/* C486E4 80241B04 00000000 */ nop +/* C486E4 80241B04 00000000 */ nop /* C486E8 80241B08 8E050018 */ lw $a1, 0x18($s0) /* C486EC 80241B0C 8E06000C */ lw $a2, 0xc($s0) /* C486F0 80241B10 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_802415D4_C481B4 /* C48704 80241B24 44801000 */ mtc1 $zero, $f2 /* C48708 80241B28 46000021 */ cvt.d.s $f0, $f0 /* C4870C 80241B2C 46220002 */ mul.d $f0, $f0, $f2 -/* C48710 80241B30 00000000 */ nop +/* C48710 80241B30 00000000 */ nop /* C48714 80241B34 4620020D */ trunc.w.d $f8, $f0 /* C48718 80241B38 E628007C */ swc1 $f8, 0x7c($s1) /* C4871C 80241B3C 8E420004 */ lw $v0, 4($s2) /* C48720 80241B40 18400021 */ blez $v0, .L80241BC8 -/* C48724 80241B44 00000000 */ nop +/* C48724 80241B44 00000000 */ nop /* C48728 80241B48 8602008E */ lh $v0, 0x8e($s0) /* C4872C 80241B4C 9603008E */ lhu $v1, 0x8e($s0) /* C48730 80241B50 18400005 */ blez $v0, .L80241B68 @@ -375,7 +375,7 @@ glabel func_802415D4_C481B4 /* C48738 80241B58 A602008E */ sh $v0, 0x8e($s0) /* C4873C 80241B5C 00021400 */ sll $v0, $v0, 0x10 /* C48740 80241B60 1C400019 */ bgtz $v0, .L80241BC8 -/* C48744 80241B64 00000000 */ nop +/* C48744 80241B64 00000000 */ nop .L80241B68: /* C48748 80241B68 240403E8 */ addiu $a0, $zero, 0x3e8 /* C4874C 80241B6C 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_802415D4_C481B4 /* C48794 80241BB4 18400003 */ blez $v0, .L80241BC4 /* C48798 80241BB8 28620003 */ slti $v0, $v1, 3 /* C4879C 80241BBC 10400002 */ beqz $v0, .L80241BC8 -/* C487A0 80241BC0 00000000 */ nop +/* C487A0 80241BC0 00000000 */ nop .L80241BC4: /* C487A4 80241BC4 AE600070 */ sw $zero, 0x70($s3) .L80241BC8: diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241CBC_C4889C.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241CBC_C4889C.s index 5f6164e7d5..980c3d5860 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241CBC_C4889C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241CBC_C4889C.s @@ -42,11 +42,11 @@ glabel func_80241CBC_C4889C .L80241D50: /* C48930 80241D50 8E220070 */ lw $v0, 0x70($s1) /* C48934 80241D54 18400034 */ blez $v0, .L80241E28 -/* C48938 80241D58 00000000 */ nop +/* C48938 80241D58 00000000 */ nop /* C4893C 80241D5C C62C0074 */ lwc1 $f12, 0x74($s1) /* C48940 80241D60 46806320 */ cvt.s.w $f12, $f12 /* C48944 80241D64 44820000 */ mtc1 $v0, $f0 -/* C48948 80241D68 00000000 */ nop +/* C48948 80241D68 00000000 */ nop /* C4894C 80241D6C 46800020 */ cvt.s.w $f0, $f0 /* C48950 80241D70 46000021 */ cvt.d.s $f0, $f0 /* C48954 80241D74 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_80241CBC_C4889C /* C489B4 80241DD4 27A70030 */ addiu $a3, $sp, 0x30 .L80241DD8: /* C489B8 80241DD8 10400007 */ beqz $v0, .L80241DF8 -/* C489BC 80241DDC 00000000 */ nop +/* C489BC 80241DDC 00000000 */ nop /* C489C0 80241DE0 4616A082 */ mul.s $f2, $f20, $f22 -/* C489C4 80241DE4 00000000 */ nop +/* C489C4 80241DE4 00000000 */ nop /* C489C8 80241DE8 C7A0002C */ lwc1 $f0, 0x2c($sp) /* C489CC 80241DEC 46180000 */ add.s $f0, $f0, $f24 /* C489D0 80241DF0 08090781 */ j .L80241E04 /* C489D4 80241DF4 46020000 */ add.s $f0, $f0, $f2 .L80241DF8: /* C489D8 80241DF8 4616A002 */ mul.s $f0, $f20, $f22 -/* C489DC 80241DFC 00000000 */ nop +/* C489DC 80241DFC 00000000 */ nop /* C489E0 80241E00 4600D000 */ add.s $f0, $f26, $f0 .L80241E04: /* C489E4 80241E04 E600003C */ swc1 $f0, 0x3c($s0) /* C489E8 80241E08 8E220074 */ lw $v0, 0x74($s1) /* C489EC 80241E0C 2442000A */ addiu $v0, $v0, 0xa /* C489F0 80241E10 44826000 */ mtc1 $v0, $f12 -/* C489F4 80241E14 00000000 */ nop +/* C489F4 80241E14 00000000 */ nop /* C489F8 80241E18 0C00A6C9 */ jal clamp_angle /* C489FC 80241E1C 46806320 */ cvt.s.w $f12, $f12 /* C48A00 80241E20 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_80241CBC_C4889C /* C48A14 80241E34 860200A8 */ lh $v0, 0xa8($s0) /* C48A18 80241E38 C600003C */ lwc1 $f0, 0x3c($s0) /* C48A1C 80241E3C 44821000 */ mtc1 $v0, $f2 -/* C48A20 80241E40 00000000 */ nop +/* C48A20 80241E40 00000000 */ nop /* C48A24 80241E44 468010A0 */ cvt.s.w $f2, $f2 /* C48A28 80241E48 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C48A2C 80241E4C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_80241CBC_C4889C /* C48A48 80241E68 46240000 */ add.d $f0, $f0, $f4 /* C48A4C 80241E6C 460010A1 */ cvt.d.s $f2, $f2 /* C48A50 80241E70 4620103C */ c.lt.d $f2, $f0 -/* C48A54 80241E74 00000000 */ nop +/* C48A54 80241E74 00000000 */ nop /* C48A58 80241E78 4500002E */ bc1f .L80241F34 /* C48A5C 80241E7C 0280202D */ daddu $a0, $s4, $zero /* C48A60 80241E80 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_80241CBC_C4889C /* C48AA0 80241EC0 3C01C1A0 */ lui $at, 0xc1a0 /* C48AA4 80241EC4 44812000 */ mtc1 $at, $f4 /* C48AA8 80241EC8 44834000 */ mtc1 $v1, $f8 -/* C48AAC 80241ECC 00000000 */ nop +/* C48AAC 80241ECC 00000000 */ nop /* C48AB0 80241ED0 46804220 */ cvt.s.w $f8, $f8 /* C48AB4 80241ED4 44074000 */ mfc1 $a3, $f8 /* C48AB8 80241ED8 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_80241CBC_C4889C .L80241F34: /* C48B14 80241F34 8602008C */ lh $v0, 0x8c($s0) /* C48B18 80241F38 14400025 */ bnez $v0, .L80241FD0 -/* C48B1C 80241F3C 00000000 */ nop +/* C48B1C 80241F3C 00000000 */ nop /* C48B20 80241F40 8602008E */ lh $v0, 0x8e($s0) /* C48B24 80241F44 1C400022 */ bgtz $v0, .L80241FD0 -/* C48B28 80241F48 00000000 */ nop +/* C48B28 80241F48 00000000 */ nop /* C48B2C 80241F4C 8E620074 */ lw $v0, 0x74($s3) /* C48B30 80241F50 2442FFFF */ addiu $v0, $v0, -1 /* C48B34 80241F54 1840001D */ blez $v0, .L80241FCC @@ -183,7 +183,7 @@ glabel func_80241CBC_C4889C /* C48B40 80241F60 9442002A */ lhu $v0, 0x2a($v0) /* C48B44 80241F64 30420010 */ andi $v0, $v0, 0x10 /* C48B48 80241F68 14400007 */ bnez $v0, .L80241F88 -/* C48B4C 80241F6C 00000000 */ nop +/* C48B4C 80241F6C 00000000 */ nop /* C48B50 80241F70 C600000C */ lwc1 $f0, 0xc($s0) /* C48B54 80241F74 3C014334 */ lui $at, 0x4334 /* C48B58 80241F78 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802420E4_C48CC4.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802420E4_C48CC4.s index d59e4fc60e..59106aa732 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802420E4_C48CC4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802420E4_C48CC4.s @@ -60,18 +60,18 @@ glabel func_802420E4_C48CC4 /* C48D9C 802421BC C6200038 */ lwc1 $f0, 0x38($s1) /* C48DA0 802421C0 4600018D */ trunc.w.s $f6, $f0 /* C48DA4 802421C4 44023000 */ mfc1 $v0, $f6 -/* C48DA8 802421C8 00000000 */ nop +/* C48DA8 802421C8 00000000 */ nop /* C48DAC 802421CC A6420010 */ sh $v0, 0x10($s2) /* C48DB0 802421D0 C620003C */ lwc1 $f0, 0x3c($s1) /* C48DB4 802421D4 4600018D */ trunc.w.s $f6, $f0 /* C48DB8 802421D8 44023000 */ mfc1 $v0, $f6 -/* C48DBC 802421DC 00000000 */ nop +/* C48DBC 802421DC 00000000 */ nop /* C48DC0 802421E0 A6420012 */ sh $v0, 0x12($s2) /* C48DC4 802421E4 C6200040 */ lwc1 $f0, 0x40($s1) /* C48DC8 802421E8 A2430007 */ sb $v1, 7($s2) /* C48DCC 802421EC 4600018D */ trunc.w.s $f6, $f0 /* C48DD0 802421F0 44023000 */ mfc1 $v0, $f6 -/* C48DD4 802421F4 00000000 */ nop +/* C48DD4 802421F4 00000000 */ nop /* C48DD8 802421F8 A6420014 */ sh $v0, 0x14($s2) .L802421FC: /* C48DDC 802421FC 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024227C_C48E5C.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024227C_C48E5C.s index c372fabd92..63eadc937a 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024227C_C48E5C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024227C_C48E5C.s @@ -42,9 +42,9 @@ glabel func_8024227C_C48E5C /* C48EF0 80242310 44801800 */ mtc1 $zero, $f3 /* C48EF4 80242314 46002021 */ cvt.d.s $f0, $f4 /* C48EF8 80242318 4620103E */ c.le.d $f2, $f0 -/* C48EFC 8024231C 00000000 */ nop +/* C48EFC 8024231C 00000000 */ nop /* C48F00 80242320 45000030 */ bc1f .L802423E4 -/* C48F04 80242324 00000000 */ nop +/* C48F04 80242324 00000000 */ nop /* C48F08 80242328 C600003C */ lwc1 $f0, 0x3c($s0) /* C48F0C 8024232C 46040000 */ add.s $f0, $f0, $f4 /* C48F10 80242330 E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_8024227C_C48E5C /* C48F70 80242390 27A70020 */ addiu $a3, $sp, 0x20 .L80242394: /* C48F74 80242394 1040000B */ beqz $v0, .L802423C4 -/* C48F78 80242398 00000000 */ nop +/* C48F78 80242398 00000000 */ nop /* C48F7C 8024239C C7A0001C */ lwc1 $f0, 0x1c($sp) /* C48F80 802423A0 46140080 */ add.s $f2, $f0, $f20 /* C48F84 802423A4 C600003C */ lwc1 $f0, 0x3c($s0) /* C48F88 802423A8 4600103E */ c.le.s $f2, $f0 -/* C48F8C 802423AC 00000000 */ nop +/* C48F8C 802423AC 00000000 */ nop /* C48F90 802423B0 4500008D */ bc1f .L802425E8 -/* C48F94 802423B4 00000000 */ nop +/* C48F94 802423B4 00000000 */ nop /* C48F98 802423B8 E602003C */ swc1 $f2, 0x3c($s0) /* C48F9C 802423BC 0809097A */ j .L802425E8 /* C48FA0 802423C0 AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_8024227C_C48E5C /* C48FA4 802423C4 C602003C */ lwc1 $f2, 0x3c($s0) /* C48FA8 802423C8 C6000064 */ lwc1 $f0, 0x64($s0) /* C48FAC 802423CC 4602003E */ c.le.s $f0, $f2 -/* C48FB0 802423D0 00000000 */ nop +/* C48FB0 802423D0 00000000 */ nop /* C48FB4 802423D4 45030084 */ bc1tl .L802425E8 /* C48FB8 802423D8 AE400070 */ sw $zero, 0x70($s2) /* C48FBC 802423DC 0809097A */ j .L802425E8 -/* C48FC0 802423E0 00000000 */ nop +/* C48FC0 802423E0 00000000 */ nop .L802423E4: /* C48FC4 802423E4 4622003C */ c.lt.d $f0, $f2 -/* C48FC8 802423E8 00000000 */ nop +/* C48FC8 802423E8 00000000 */ nop /* C48FCC 802423EC 4500007E */ bc1f .L802425E8 -/* C48FD0 802423F0 00000000 */ nop +/* C48FD0 802423F0 00000000 */ nop /* C48FD4 802423F4 9602008E */ lhu $v0, 0x8e($s0) /* C48FD8 802423F8 24420001 */ addiu $v0, $v0, 1 /* C48FDC 802423FC A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_8024227C_C48E5C /* C48FE8 80242408 00021403 */ sra $v0, $v0, 0x10 /* C48FEC 8024240C 0043102A */ slt $v0, $v0, $v1 /* C48FF0 80242410 14400026 */ bnez $v0, .L802424AC -/* C48FF4 80242414 00000000 */ nop +/* C48FF4 80242414 00000000 */ nop /* C48FF8 80242418 C60C0038 */ lwc1 $f12, 0x38($s0) /* C48FFC 8024241C C60E0040 */ lwc1 $f14, 0x40($s0) /* C49000 80242420 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_8024227C_C48E5C /* C4902C 8024244C 8E62001C */ lw $v0, 0x1c($s3) /* C49030 80242450 46001005 */ abs.s $f0, $f2 /* C49034 80242454 44822000 */ mtc1 $v0, $f4 -/* C49038 80242458 00000000 */ nop +/* C49038 80242458 00000000 */ nop /* C4903C 8024245C 46802120 */ cvt.s.w $f4, $f4 /* C49040 80242460 4600203C */ c.lt.s $f4, $f0 -/* C49044 80242464 00000000 */ nop +/* C49044 80242464 00000000 */ nop /* C49048 80242468 4500000D */ bc1f .L802424A0 -/* C4904C 8024246C 00000000 */ nop +/* C4904C 8024246C 00000000 */ nop /* C49050 80242470 44800000 */ mtc1 $zero, $f0 /* C49054 80242474 C614000C */ lwc1 $f20, 0xc($s0) /* C49058 80242478 4600103C */ c.lt.s $f2, $f0 -/* C4905C 8024247C 00000000 */ nop +/* C4905C 8024247C 00000000 */ nop /* C49060 80242480 45000006 */ bc1f .L8024249C /* C49064 80242484 00021023 */ negu $v0, $v0 /* C49068 80242488 44820000 */ mtc1 $v0, $f0 -/* C4906C 8024248C 00000000 */ nop +/* C4906C 8024248C 00000000 */ nop /* C49070 80242490 46800020 */ cvt.s.w $f0, $f0 /* C49074 80242494 08090928 */ j .L802424A0 /* C49078 80242498 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_8024227C_C48E5C /* C490A0 802424C0 C600001C */ lwc1 $f0, 0x1c($s0) /* C490A4 802424C4 46001080 */ add.s $f2, $f2, $f0 /* C490A8 802424C8 4616103C */ c.lt.s $f2, $f22 -/* C490AC 802424CC 00000000 */ nop +/* C490AC 802424CC 00000000 */ nop /* C490B0 802424D0 45020045 */ bc1fl .L802425E8 /* C490B4 802424D4 E602003C */ swc1 $f2, 0x3c($s0) /* C490B8 802424D8 08090979 */ j .L802425E4 @@ -169,7 +169,7 @@ glabel func_8024227C_C48E5C /* C490D0 802424F0 C600001C */ lwc1 $f0, 0x1c($s0) /* C490D4 802424F4 C604003C */ lwc1 $f4, 0x3c($s0) /* C490D8 802424F8 44821000 */ mtc1 $v0, $f2 -/* C490DC 802424FC 00000000 */ nop +/* C490DC 802424FC 00000000 */ nop /* C490E0 80242500 468010A0 */ cvt.s.w $f2, $f2 /* C490E4 80242504 46000005 */ abs.s $f0, $f0 /* C490E8 80242508 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_8024227C_C48E5C /* C49124 80242544 0C0372DF */ jal func_800DCB7C /* C49128 80242548 27A70020 */ addiu $a3, $sp, 0x20 /* C4912C 8024254C 10400015 */ beqz $v0, .L802425A4 -/* C49130 80242550 00000000 */ nop +/* C49130 80242550 00000000 */ nop /* C49134 80242554 860200A8 */ lh $v0, 0xa8($s0) /* C49138 80242558 C604001C */ lwc1 $f4, 0x1c($s0) /* C4913C 8024255C 44820000 */ mtc1 $v0, $f0 -/* C49140 80242560 00000000 */ nop +/* C49140 80242560 00000000 */ nop /* C49144 80242564 46800020 */ cvt.s.w $f0, $f0 /* C49148 80242568 46002085 */ abs.s $f2, $f4 /* C4914C 8024256C 46020000 */ add.s $f0, $f0, $f2 /* C49150 80242570 C7A20024 */ lwc1 $f2, 0x24($sp) /* C49154 80242574 4600103E */ c.le.s $f2, $f0 -/* C49158 80242578 00000000 */ nop +/* C49158 80242578 00000000 */ nop /* C4915C 8024257C 45000005 */ bc1f .L80242594 -/* C49160 80242580 00000000 */ nop +/* C49160 80242580 00000000 */ nop /* C49164 80242584 C7A0001C */ lwc1 $f0, 0x1c($sp) /* C49168 80242588 AE00001C */ sw $zero, 0x1c($s0) /* C4916C 8024258C 0809097A */ j .L802425E8 @@ -217,13 +217,13 @@ glabel func_8024227C_C48E5C /* C49188 802425A8 860200A8 */ lh $v0, 0xa8($s0) /* C4918C 802425AC 46163081 */ sub.s $f2, $f6, $f22 /* C49190 802425B0 44820000 */ mtc1 $v0, $f0 -/* C49194 802425B4 00000000 */ nop +/* C49194 802425B4 00000000 */ nop /* C49198 802425B8 46800020 */ cvt.s.w $f0, $f0 /* C4919C 802425BC 46001080 */ add.s $f2, $f2, $f0 /* C491A0 802425C0 C604001C */ lwc1 $f4, 0x1c($s0) /* C491A4 802425C4 46002005 */ abs.s $f0, $f4 /* C491A8 802425C8 4602003C */ c.lt.s $f0, $f2 -/* C491AC 802425CC 00000000 */ nop +/* C491AC 802425CC 00000000 */ nop /* C491B0 802425D0 45020005 */ bc1fl .L802425E8 /* C491B4 802425D4 AE00001C */ sw $zero, 0x1c($s0) /* C491B8 802425D8 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024260C_C491EC.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024260C_C491EC.s index ee2d2cf4fb..302b57dbb2 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024260C_C491EC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024260C_C491EC.s @@ -49,15 +49,15 @@ glabel func_8024260C_C491EC /* C49294 802426B4 44802000 */ mtc1 $zero, $f4 /* C49298 802426B8 460010A1 */ cvt.d.s $f2, $f2 /* C4929C 802426BC 46241082 */ mul.d $f2, $f2, $f4 -/* C492A0 802426C0 00000000 */ nop +/* C492A0 802426C0 00000000 */ nop /* C492A4 802426C4 C7A0001C */ lwc1 $f0, 0x1c($sp) /* C492A8 802426C8 46000021 */ cvt.d.s $f0, $f0 /* C492AC 802426CC 46240002 */ mul.d $f0, $f0, $f4 -/* C492B0 802426D0 00000000 */ nop +/* C492B0 802426D0 00000000 */ nop /* C492B4 802426D4 3C013FE0 */ lui $at, 0x3fe0 /* C492B8 802426D8 44812800 */ mtc1 $at, $f5 /* C492BC 802426DC 44802000 */ mtc1 $zero, $f4 -/* C492C0 802426E0 00000000 */ nop +/* C492C0 802426E0 00000000 */ nop /* C492C4 802426E4 46241080 */ add.d $f2, $f2, $f4 /* C492C8 802426E8 AE000074 */ sw $zero, 0x74($s0) /* C492CC 802426EC 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s index 9367003356..6f654c0dd0 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s @@ -54,7 +54,7 @@ glabel func_80242730_C49310 /* C493D0 802427F0 8E4300B0 */ lw $v1, 0xb0($s2) /* C493D4 802427F4 30620004 */ andi $v0, $v1, 4 /* C493D8 802427F8 10400007 */ beqz $v0, .L80242818 -/* C493DC 802427FC 00000000 */ nop +/* C493DC 802427FC 00000000 */ nop /* C493E0 80242800 824200B4 */ lb $v0, 0xb4($s2) /* C493E4 80242804 1440003C */ bnez $v0, .L802428F8 /* C493E8 80242808 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_80242730_C49310 /* C493FC 8024281C 2C62000F */ sltiu $v0, $v1, 0xf /* C49400 80242820 10400034 */ beqz $v0, .L802428F4 /* C49404 80242824 00031080 */ sll $v0, $v1, 2 -/* C49408 80242828 3C018024 */ lui $at, %hi(DisablePartnerBlur) +/* C49408 80242828 3C018024 */ lui $at, %hi(jtbl_802456D8_C4C2B8) /* C4940C 8024282C 00220821 */ addu $at, $at, $v0 -/* C49410 80242830 8C2256D8 */ lw $v0, %lo(DisablePartnerBlur)($at) +/* C49410 80242830 8C2256D8 */ lw $v0, %lo(jtbl_802456D8_C4C2B8)($at) /* C49414 80242834 00400008 */ jr $v0 -/* C49418 80242838 00000000 */ nop +/* C49418 80242838 00000000 */ nop +glabel L8024283C_C4941C /* C4941C 8024283C 0280202D */ daddu $a0, $s4, $zero /* C49420 80242840 0200282D */ daddu $a1, $s0, $zero /* C49424 80242844 0C090509 */ jal func_80241424_C48004 /* C49428 80242848 0260302D */ daddu $a2, $s3, $zero +glabel L8024284C_C4942C /* C4942C 8024284C 0280202D */ daddu $a0, $s4, $zero /* C49430 80242850 0200282D */ daddu $a1, $s0, $zero /* C49434 80242854 0C090575 */ jal func_802415D4_C481B4 /* C49438 80242858 0260302D */ daddu $a2, $s3, $zero /* C4943C 8024285C 08090A3E */ j .L802428F8 /* C49440 80242860 0000102D */ daddu $v0, $zero, $zero +glabel L80242864_C49444 /* C49444 80242864 0280202D */ daddu $a0, $s4, $zero /* C49448 80242868 0200282D */ daddu $a1, $s0, $zero /* C4944C 8024286C 0C0906FF */ jal dgb_09_UnkNpcAIFunc1 /* C49450 80242870 0260302D */ daddu $a2, $s3, $zero +glabel L80242874_C49454 /* C49454 80242874 0280202D */ daddu $a0, $s4, $zero /* C49458 80242878 0200282D */ daddu $a1, $s0, $zero /* C4945C 8024287C 0C09072F */ jal func_80241CBC_C4889C /* C49460 80242880 0260302D */ daddu $a2, $s3, $zero /* C49464 80242884 08090A3E */ j .L802428F8 /* C49468 80242888 0000102D */ daddu $v0, $zero, $zero +glabel L8024288C_C4946C /* C4946C 8024288C 0280202D */ daddu $a0, $s4, $zero /* C49470 80242890 0200282D */ daddu $a1, $s0, $zero /* C49474 80242894 0C090800 */ jal func_80242000_C48BE0 /* C49478 80242898 0260302D */ daddu $a2, $s3, $zero +glabel L8024289C_C4947C /* C4947C 8024289C 0280202D */ daddu $a0, $s4, $zero /* C49480 802428A0 0200282D */ daddu $a1, $s0, $zero /* C49484 802428A4 0C09081E */ jal func_80242078_C48C58 /* C49488 802428A8 0260302D */ daddu $a2, $s3, $zero /* C4948C 802428AC 08090A3E */ j .L802428F8 /* C49490 802428B0 0000102D */ daddu $v0, $zero, $zero +glabel L802428B4_C49494 /* C49494 802428B4 0280202D */ daddu $a0, $s4, $zero /* C49498 802428B8 0200282D */ daddu $a1, $s0, $zero /* C4949C 802428BC 0C090839 */ jal func_802420E4_C48CC4 /* C494A0 802428C0 0260302D */ daddu $a2, $s3, $zero /* C494A4 802428C4 08090A3E */ j .L802428F8 /* C494A8 802428C8 0000102D */ daddu $v0, $zero, $zero +glabel L802428CC_C494AC /* C494AC 802428CC 0280202D */ daddu $a0, $s4, $zero /* C494B0 802428D0 0200282D */ daddu $a1, $s0, $zero /* C494B4 802428D4 0C090886 */ jal dgb_09_UnkNpcAIFunc3 /* C494B8 802428D8 0260302D */ daddu $a2, $s3, $zero /* C494BC 802428DC 08090A3E */ j .L802428F8 /* C494C0 802428E0 0000102D */ daddu $v0, $zero, $zero +glabel L802428E4_C494C4 /* C494C4 802428E4 0280202D */ daddu $a0, $s4, $zero /* C494C8 802428E8 0200282D */ daddu $a1, $s0, $zero /* C494CC 802428EC 0C09089F */ jal func_8024227C_C48E5C /* C494D0 802428F0 0260302D */ daddu $a2, $s3, $zero .L802428F4: +glabel L802428F4_C494D4 /* C494D4 802428F4 0000102D */ daddu $v0, $zero, $zero .L802428F8: /* C494D8 802428F8 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024291C_C494FC.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024291C_C494FC.s index f810c77aaf..221e569241 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024291C_C494FC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024291C_C494FC.s @@ -57,20 +57,20 @@ glabel func_8024291C_C494FC /* C495CC 802429EC 8E22001C */ lw $v0, 0x1c($s1) /* C495D0 802429F0 46001005 */ abs.s $f0, $f2 /* C495D4 802429F4 44822000 */ mtc1 $v0, $f4 -/* C495D8 802429F8 00000000 */ nop +/* C495D8 802429F8 00000000 */ nop /* C495DC 802429FC 46802120 */ cvt.s.w $f4, $f4 /* C495E0 80242A00 4600203C */ c.lt.s $f4, $f0 -/* C495E4 80242A04 00000000 */ nop +/* C495E4 80242A04 00000000 */ nop /* C495E8 80242A08 4500000D */ bc1f .L80242A40 -/* C495EC 80242A0C 00000000 */ nop +/* C495EC 80242A0C 00000000 */ nop /* C495F0 80242A10 44800000 */ mtc1 $zero, $f0 /* C495F4 80242A14 C614000C */ lwc1 $f20, 0xc($s0) /* C495F8 80242A18 4600103C */ c.lt.s $f2, $f0 -/* C495FC 80242A1C 00000000 */ nop +/* C495FC 80242A1C 00000000 */ nop /* C49600 80242A20 45000006 */ bc1f .L80242A3C /* C49604 80242A24 00021023 */ negu $v0, $v0 /* C49608 80242A28 44820000 */ mtc1 $v0, $f0 -/* C4960C 80242A2C 00000000 */ nop +/* C4960C 80242A2C 00000000 */ nop /* C49610 80242A30 46800020 */ cvt.s.w $f0, $f0 /* C49614 80242A34 08090A90 */ j .L80242A40 /* C49618 80242A38 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242A74_C49654.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242A74_C49654.s index fd391c6f9f..ac7b59b456 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242A74_C49654.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242A74_C49654.s @@ -41,10 +41,10 @@ glabel func_80242A74_C49654 /* C496E4 80242B04 44802000 */ mtc1 $zero, $f4 /* C496E8 80242B08 460010A1 */ cvt.d.s $f2, $f2 /* C496EC 80242B0C 46241082 */ mul.d $f2, $f2, $f4 -/* C496F0 80242B10 00000000 */ nop +/* C496F0 80242B10 00000000 */ nop /* C496F4 80242B14 46000021 */ cvt.d.s $f0, $f0 /* C496F8 80242B18 4622003E */ c.le.d $f0, $f2 -/* C496FC 80242B1C 00000000 */ nop +/* C496FC 80242B1C 00000000 */ nop /* C49700 80242B20 45000003 */ bc1f .L80242B30 /* C49704 80242B24 2402000E */ addiu $v0, $zero, 0xe /* C49708 80242B28 08090AD6 */ j .L80242B58 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s index 6ccc9656f9..3bfa17bfda 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s @@ -73,7 +73,7 @@ glabel func_80242C1C_C497FC /* C49904 80242D24 344260B7 */ ori $v0, $v0, 0x60b7 /* C49908 80242D28 4600020D */ trunc.w.s $f8, $f0 /* C4990C 80242D2C 44044000 */ mfc1 $a0, $f8 -/* C49910 80242D30 00000000 */ nop +/* C49910 80242D30 00000000 */ nop /* C49914 80242D34 00820018 */ mult $a0, $v0 /* C49918 80242D38 00041FC3 */ sra $v1, $a0, 0x1f /* C4991C 80242D3C 00004010 */ mfhi $t0 @@ -91,9 +91,9 @@ glabel func_80242C1C_C497FC /* C4994C 80242D6C 00042403 */ sra $a0, $a0, 0x10 /* C49950 80242D70 3C014260 */ lui $at, 0x4260 /* C49954 80242D74 44811000 */ mtc1 $at, $f2 -/* C49958 80242D78 00000000 */ nop +/* C49958 80242D78 00000000 */ nop /* C4995C 80242D7C 46020002 */ mul.s $f0, $f0, $f2 -/* C49960 80242D80 00000000 */ nop +/* C49960 80242D80 00000000 */ nop /* C49964 80242D84 24050006 */ addiu $a1, $zero, 6 /* C49968 80242D88 3C01437F */ lui $at, 0x437f /* C4996C 80242D8C 44811000 */ mtc1 $at, $f2 @@ -103,7 +103,7 @@ glabel func_80242C1C_C497FC /* C4997C 80242D9C AFA00018 */ sw $zero, 0x18($sp) /* C49980 80242DA0 4600120D */ trunc.w.s $f8, $f2 /* C49984 80242DA4 44064000 */ mfc1 $a2, $f8 -/* C49988 80242DA8 00000000 */ nop +/* C49988 80242DA8 00000000 */ nop /* C4998C 80242DAC AFA60010 */ sw $a2, 0x10($sp) /* C49990 80242DB0 8E440024 */ lw $a0, 0x24($s2) /* C49994 80242DB4 0C0B7A25 */ jal func_802DE894 @@ -134,7 +134,7 @@ glabel func_80242C1C_C497FC /* C499F8 80242E18 46000005 */ abs.s $f0, $f0 /* C499FC 80242E1C 46000021 */ cvt.d.s $f0, $f0 /* C49A00 80242E20 4620103C */ c.lt.d $f2, $f0 -/* C49A04 80242E24 00000000 */ nop +/* C49A04 80242E24 00000000 */ nop /* C49A08 80242E28 45000008 */ bc1f .L80242E4C /* C49A0C 80242E2C 3C03FFDF */ lui $v1, 0xffdf /* C49A10 80242E30 3C018024 */ lui $at, %hi(D_80245720) @@ -156,9 +156,9 @@ glabel func_80242C1C_C497FC /* C49A4C 80242E6C 10620009 */ beq $v1, $v0, .L80242E94 /* C49A50 80242E70 24020010 */ addiu $v0, $zero, 0x10 /* C49A54 80242E74 0C03805E */ jal disable_player_input -/* C49A58 80242E78 00000000 */ nop +/* C49A58 80242E78 00000000 */ nop /* C49A5C 80242E7C 0C03BD8A */ jal func_800EF628 -/* C49A60 80242E80 00000000 */ nop +/* C49A60 80242E80 00000000 */ nop /* C49A64 80242E84 24020014 */ addiu $v0, $zero, 0x14 /* C49A68 80242E88 08090BA5 */ j .L80242E94 /* C49A6C 80242E8C A640008E */ sh $zero, 0x8e($s2) diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242EB8_C49A98.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242EB8_C49A98.s index 3ed3ec7648..a46ba72de9 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242EB8_C49A98.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242EB8_C49A98.s @@ -27,7 +27,7 @@ glabel func_80242EB8_C49A98 /* C49AF0 80242F10 8E02006C */ lw $v0, 0x6c($s0) /* C49AF4 80242F14 30421000 */ andi $v0, $v0, 0x1000 /* C49AF8 80242F18 10400008 */ beqz $v0, .L80242F3C -/* C49AFC 80242F1C 00000000 */ nop +/* C49AFC 80242F1C 00000000 */ nop /* C49B00 80242F20 3C048000 */ lui $a0, 0x8000 /* C49B04 80242F24 0C05271B */ jal stop_sound /* C49B08 80242F28 34840011 */ ori $a0, $a0, 0x11 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242F70_C49B50.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242F70_C49B50.s index 393a8122b2..5cc3703862 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242F70_C49B50.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242F70_C49B50.s @@ -49,9 +49,9 @@ glabel func_80242F70_C49B50 /* C49C00 80243020 46140000 */ add.s $f0, $f0, $f20 /* C49C04 80243024 C622003C */ lwc1 $f2, 0x3c($s1) /* C49C08 80243028 4600103C */ c.lt.s $f2, $f0 -/* C49C0C 8024302C 00000000 */ nop +/* C49C0C 8024302C 00000000 */ nop /* C49C10 80243030 45010028 */ bc1t .L802430D4 -/* C49C14 80243034 00000000 */ nop +/* C49C14 80243034 00000000 */ nop /* C49C18 80243038 8E0200D0 */ lw $v0, 0xd0($s0) /* C49C1C 8024303C C62C0038 */ lwc1 $f12, 0x38($s1) /* C49C20 80243040 C62E0040 */ lwc1 $f14, 0x40($s1) @@ -76,7 +76,7 @@ glabel func_80242F70_C49B50 /* C49C6C 8024308C 3C01C1A0 */ lui $at, 0xc1a0 /* C49C70 80243090 44813000 */ mtc1 $at, $f6 /* C49C74 80243094 44825000 */ mtc1 $v0, $f10 -/* C49C78 80243098 00000000 */ nop +/* C49C78 80243098 00000000 */ nop /* C49C7C 8024309C 468052A0 */ cvt.s.w $f10, $f10 /* C49C80 802430A0 46141080 */ add.s $f2, $f2, $f20 /* C49C84 802430A4 44075000 */ mfc1 $a3, $f10 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243138_C49D18.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243138_C49D18.s index 4149d83fd3..70a8768d83 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243138_C49D18.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243138_C49D18.s @@ -26,9 +26,9 @@ glabel func_80243138_C49D18 /* C49D6C 8024318C A480008E */ sh $zero, 0x8e($a0) .L80243190: /* C49D70 80243190 0C038069 */ jal enable_player_input -/* C49D74 80243194 00000000 */ nop +/* C49D74 80243194 00000000 */ nop /* C49D78 80243198 0C03BD80 */ jal func_800EF600 -/* C49D7C 8024319C 00000000 */ nop +/* C49D7C 8024319C 00000000 */ nop /* C49D80 802431A0 24020010 */ addiu $v0, $zero, 0x10 .L802431A4: /* C49D84 802431A4 AE020070 */ sw $v0, 0x70($s0) diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802431B8_C49D98.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802431B8_C49D98.s index d1bddfa119..900f2c1c25 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802431B8_C49D98.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802431B8_C49D98.s @@ -33,7 +33,7 @@ glabel func_802431B8_C49D98 /* C49E08 80243228 44801000 */ mtc1 $zero, $f2 /* C49E0C 8024322C 46000021 */ cvt.d.s $f0, $f0 /* C49E10 80243230 46220002 */ mul.d $f0, $f0, $f2 -/* C49E14 80243234 00000000 */ nop +/* C49E14 80243234 00000000 */ nop /* C49E18 80243238 2402001E */ addiu $v0, $zero, 0x1e /* C49E1C 8024323C 4620010D */ trunc.w.d $f4, $f0 /* C49E20 80243240 E604007C */ swc1 $f4, 0x7c($s0) diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243260_C49E40.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243260_C49E40.s index 24f21d1e67..a7c6399796 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243260_C49E40.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243260_C49E40.s @@ -60,23 +60,23 @@ glabel func_80243260_C49E40 /* C49F1C 8024333C 0C0372DF */ jal func_800DCB7C /* C49F20 80243340 46000506 */ mov.s $f20, $f0 /* C49F24 80243344 10400007 */ beqz $v0, .L80243364 -/* C49F28 80243348 00000000 */ nop +/* C49F28 80243348 00000000 */ nop /* C49F2C 8024334C 4616A082 */ mul.s $f2, $f20, $f22 -/* C49F30 80243350 00000000 */ nop +/* C49F30 80243350 00000000 */ nop /* C49F34 80243354 C7A0002C */ lwc1 $f0, 0x2c($sp) /* C49F38 80243358 461A0000 */ add.s $f0, $f0, $f26 /* C49F3C 8024335C 08090CDC */ j .L80243370 /* C49F40 80243360 46020000 */ add.s $f0, $f0, $f2 .L80243364: /* C49F44 80243364 4616A002 */ mul.s $f0, $f20, $f22 -/* C49F48 80243368 00000000 */ nop +/* C49F48 80243368 00000000 */ nop /* C49F4C 8024336C 4600C000 */ add.s $f0, $f24, $f0 .L80243370: /* C49F50 80243370 E620003C */ swc1 $f0, 0x3c($s1) /* C49F54 80243374 8E020074 */ lw $v0, 0x74($s0) /* C49F58 80243378 2442000C */ addiu $v0, $v0, 0xc /* C49F5C 8024337C 44826000 */ mtc1 $v0, $f12 -/* C49F60 80243380 00000000 */ nop +/* C49F60 80243380 00000000 */ nop /* C49F64 80243384 0C00A6C9 */ jal clamp_angle /* C49F68 80243388 46806320 */ cvt.s.w $f12, $f12 /* C49F6C 8024338C 4600020D */ trunc.w.s $f8, $f0 @@ -92,11 +92,11 @@ glabel func_80243260_C49E40 /* C49F94 802433B4 44802000 */ mtc1 $zero, $f4 /* C49F98 802433B8 460010A1 */ cvt.d.s $f2, $f2 /* C49F9C 802433BC 46241082 */ mul.d $f2, $f2, $f4 -/* C49FA0 802433C0 00000000 */ nop +/* C49FA0 802433C0 00000000 */ nop /* C49FA4 802433C4 C6600010 */ lwc1 $f0, 0x10($s3) /* C49FA8 802433C8 46000021 */ cvt.d.s $f0, $f0 /* C49FAC 802433CC 46240002 */ mul.d $f0, $f0, $f4 -/* C49FB0 802433D0 00000000 */ nop +/* C49FB0 802433D0 00000000 */ nop /* C49FB4 802433D4 0280202D */ daddu $a0, $s4, $zero /* C49FB8 802433D8 462010A0 */ cvt.s.d $f2, $f2 /* C49FBC 802433DC 46200020 */ cvt.s.d $f0, $f0 @@ -118,7 +118,7 @@ glabel func_80243260_C49E40 /* C49FFC 8024341C 3C01C1A0 */ lui $at, 0xc1a0 /* C4A000 80243420 44812000 */ mtc1 $at, $f4 /* C4A004 80243424 44834000 */ mtc1 $v1, $f8 -/* C4A008 80243428 00000000 */ nop +/* C4A008 80243428 00000000 */ nop /* C4A00C 8024342C 46804220 */ cvt.s.w $f8, $f8 /* C4A010 80243430 44074000 */ mfc1 $a3, $f8 /* C4A014 80243434 27A20038 */ addiu $v0, $sp, 0x38 @@ -143,7 +143,7 @@ glabel func_80243260_C49E40 /* C4A058 80243478 AE420074 */ sw $v0, 0x74($s2) /* C4A05C 8024347C 8622008C */ lh $v0, 0x8c($s1) /* C4A060 80243480 14400031 */ bnez $v0, .L80243548 -/* C4A064 80243484 00000000 */ nop +/* C4A064 80243484 00000000 */ nop /* C4A068 80243488 C62C0038 */ lwc1 $f12, 0x38($s1) /* C4A06C 8024348C 8E0200D0 */ lw $v0, 0xd0($s0) /* C4A070 80243490 C62E0040 */ lwc1 $f14, 0x40($s1) @@ -154,7 +154,7 @@ glabel func_80243260_C49E40 /* C4A084 802434A4 46804220 */ cvt.s.w $f8, $f8 /* C4A088 802434A8 44074000 */ mfc1 $a3, $f8 /* C4A08C 802434AC 0C00A720 */ jal atan2 -/* C4A090 802434B0 00000000 */ nop +/* C4A090 802434B0 00000000 */ nop /* C4A094 802434B4 8E250018 */ lw $a1, 0x18($s1) /* C4A098 802434B8 44060000 */ mfc1 $a2, $f0 /* C4A09C 802434BC 0220202D */ daddu $a0, $s1, $zero @@ -170,11 +170,11 @@ glabel func_80243260_C49E40 /* C4A0C4 802434E4 46804220 */ cvt.s.w $f8, $f8 /* C4A0C8 802434E8 44074000 */ mfc1 $a3, $f8 /* C4A0CC 802434EC 0C00A7B5 */ jal dist2D -/* C4A0D0 802434F0 00000000 */ nop +/* C4A0D0 802434F0 00000000 */ nop /* C4A0D4 802434F4 C6220018 */ lwc1 $f2, 0x18($s1) /* C4A0D8 802434F8 46021080 */ add.s $f2, $f2, $f2 /* C4A0DC 802434FC 4602003E */ c.le.s $f0, $f2 -/* C4A0E0 80243500 00000000 */ nop +/* C4A0E0 80243500 00000000 */ nop /* C4A0E4 80243504 45000010 */ bc1f .L80243548 /* C4A0E8 80243508 E7A00034 */ swc1 $f0, 0x34($sp) /* C4A0EC 8024350C 0C00A67F */ jal rand_int diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s index 37e34b8974..695e7c1271 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s @@ -54,11 +54,12 @@ glabel func_80243578_C4A158 /* C4A218 80243638 2C620020 */ sltiu $v0, $v1, 0x20 /* C4A21C 8024363C 10400060 */ beqz $v0, .L802437C0 /* C4A220 80243640 00031080 */ sll $v0, $v1, 2 -/* C4A224 80243644 3C018024 */ lui $at, %hi(D_80245728) +/* C4A224 80243644 3C018024 */ lui $at, %hi(jtbl_80245728_C4C308) /* C4A228 80243648 00220821 */ addu $at, $at, $v0 -/* C4A22C 8024364C 8C225728 */ lw $v0, %lo(D_80245728)($at) +/* C4A22C 8024364C 8C225728 */ lw $v0, %lo(jtbl_80245728_C4C308)($at) /* C4A230 80243650 00400008 */ jr $v0 -/* C4A234 80243654 00000000 */ nop +/* C4A234 80243654 00000000 */ nop +glabel L80243658_C4A238 /* C4A238 80243658 0280202D */ daddu $a0, $s4, $zero /* C4A23C 8024365C 0220282D */ daddu $a1, $s1, $zero /* C4A240 80243660 0C090509 */ jal func_80241424_C48004 @@ -71,16 +72,19 @@ glabel func_80243578_C4A158 /* C4A25C 8024367C 8EA40024 */ lw $a0, 0x24($s5) /* C4A260 80243680 0C0B7A25 */ jal func_802DE894 /* C4A264 80243684 00A0382D */ daddu $a3, $a1, $zero +glabel L80243688_C4A268 /* C4A268 80243688 0280202D */ daddu $a0, $s4, $zero /* C4A26C 8024368C 0220282D */ daddu $a1, $s1, $zero /* C4A270 80243690 0C090575 */ jal func_802415D4_C481B4 /* C4A274 80243694 0260302D */ daddu $a2, $s3, $zero /* C4A278 80243698 08090DB0 */ j .L802436C0 -/* C4A27C 8024369C 00000000 */ nop +/* C4A27C 8024369C 00000000 */ nop +glabel L802436A0_C4A280 /* C4A280 802436A0 0280202D */ daddu $a0, $s4, $zero /* C4A284 802436A4 0220282D */ daddu $a1, $s1, $zero /* C4A288 802436A8 0C0906FF */ jal dgb_09_UnkNpcAIFunc1 /* C4A28C 802436AC 0260302D */ daddu $a2, $s3, $zero +glabel L802436B0_C4A290 /* C4A290 802436B0 0280202D */ daddu $a0, $s4, $zero /* C4A294 802436B4 0220282D */ daddu $a1, $s1, $zero /* C4A298 802436B8 0C09072F */ jal func_80241CBC_C4889C @@ -92,6 +96,7 @@ glabel func_80243578_C4A158 /* C4A2AC 802436CC 24020006 */ addiu $v0, $zero, 6 /* C4A2B0 802436D0 08090DF0 */ j .L802437C0 /* C4A2B4 802436D4 A6A2008E */ sh $v0, 0x8e($s5) +glabel L802436D8_C4A2B8 /* C4A2B8 802436D8 0280202D */ daddu $a0, $s4, $zero /* C4A2BC 802436DC 0220282D */ daddu $a1, $s1, $zero /* C4A2C0 802436E0 0C090A47 */ jal func_8024291C_C494FC @@ -99,13 +104,15 @@ glabel func_80243578_C4A158 /* C4A2C8 802436E8 8E830070 */ lw $v1, 0x70($s4) /* C4A2CC 802436EC 2402000D */ addiu $v0, $zero, 0xd /* C4A2D0 802436F0 14620033 */ bne $v1, $v0, .L802437C0 -/* C4A2D4 802436F4 00000000 */ nop +/* C4A2D4 802436F4 00000000 */ nop +glabel L802436F8_C4A2D8 /* C4A2D8 802436F8 0280202D */ daddu $a0, $s4, $zero /* C4A2DC 802436FC 0220282D */ daddu $a1, $s1, $zero /* C4A2E0 80243700 0C090A9D */ jal func_80242A74_C49654 /* C4A2E4 80243704 0260302D */ daddu $a2, $s3, $zero /* C4A2E8 80243708 08090DF0 */ j .L802437C0 -/* C4A2EC 8024370C 00000000 */ nop +/* C4A2EC 8024370C 00000000 */ nop +glabel L80243710_C4A2F0 /* C4A2F0 80243710 0280202D */ daddu $a0, $s4, $zero /* C4A2F4 80243714 0220282D */ daddu $a1, $s1, $zero /* C4A2F8 80243718 0C090ADE */ jal func_80242B78_C49758 @@ -113,44 +120,52 @@ glabel func_80243578_C4A158 /* C4A300 80243720 8E830070 */ lw $v1, 0x70($s4) /* C4A304 80243724 2402000F */ addiu $v0, $zero, 0xf /* C4A308 80243728 14620025 */ bne $v1, $v0, .L802437C0 -/* C4A30C 8024372C 00000000 */ nop +/* C4A30C 8024372C 00000000 */ nop +glabel L80243730_C4A310 /* C4A310 80243730 0280202D */ daddu $a0, $s4, $zero /* C4A314 80243734 0220282D */ daddu $a1, $s1, $zero /* C4A318 80243738 0C090B07 */ jal func_80242C1C_C497FC /* C4A31C 8024373C 0260302D */ daddu $a2, $s3, $zero /* C4A320 80243740 08090DF0 */ j .L802437C0 -/* C4A324 80243744 00000000 */ nop +/* C4A324 80243744 00000000 */ nop +glabel L80243748_C4A328 /* C4A328 80243748 0280202D */ daddu $a0, $s4, $zero /* C4A32C 8024374C 0220282D */ daddu $a1, $s1, $zero /* C4A330 80243750 0C090BAE */ jal func_80242EB8_C49A98 /* C4A334 80243754 0260302D */ daddu $a2, $s3, $zero +glabel L80243758_C4A338 /* C4A338 80243758 0280202D */ daddu $a0, $s4, $zero /* C4A33C 8024375C 0220282D */ daddu $a1, $s1, $zero /* C4A340 80243760 0C090BDC */ jal func_80242F70_C49B50 /* C4A344 80243764 0260302D */ daddu $a2, $s3, $zero /* C4A348 80243768 08090DF0 */ j .L802437C0 -/* C4A34C 8024376C 00000000 */ nop +/* C4A34C 8024376C 00000000 */ nop +glabel L80243770_C4A350 /* C4A350 80243770 0280202D */ daddu $a0, $s4, $zero /* C4A354 80243774 0220282D */ daddu $a1, $s1, $zero /* C4A358 80243778 0C090C3C */ jal func_802430F0_C49CD0 /* C4A35C 8024377C 0260302D */ daddu $a2, $s3, $zero /* C4A360 80243780 08090DF0 */ j .L802437C0 -/* C4A364 80243784 00000000 */ nop +/* C4A364 80243784 00000000 */ nop +glabel L80243788_C4A368 /* C4A368 80243788 0280202D */ daddu $a0, $s4, $zero /* C4A36C 8024378C 0220282D */ daddu $a1, $s1, $zero /* C4A370 80243790 0C090C4E */ jal func_80243138_C49D18 /* C4A374 80243794 0260302D */ daddu $a2, $s3, $zero /* C4A378 80243798 08090DF0 */ j .L802437C0 -/* C4A37C 8024379C 00000000 */ nop +/* C4A37C 8024379C 00000000 */ nop +glabel L802437A0_C4A380 /* C4A380 802437A0 0280202D */ daddu $a0, $s4, $zero /* C4A384 802437A4 0220282D */ daddu $a1, $s1, $zero /* C4A388 802437A8 0C090C6E */ jal func_802431B8_C49D98 /* C4A38C 802437AC 0260302D */ daddu $a2, $s3, $zero +glabel L802437B0_C4A390 /* C4A390 802437B0 0280202D */ daddu $a0, $s4, $zero /* C4A394 802437B4 0220282D */ daddu $a1, $s1, $zero /* C4A398 802437B8 0C090C98 */ jal func_80243260_C49E40 /* C4A39C 802437BC 0260302D */ daddu $a2, $s3, $zero .L802437C0: +glabel L802437C0_C4A3A0 /* C4A3A0 802437C0 8E820070 */ lw $v0, 0x70($s4) /* C4A3A4 802437C4 8FBF0058 */ lw $ra, 0x58($sp) /* C4A3A8 802437C8 8FB50054 */ lw $s5, 0x54($sp) @@ -164,6 +179,6 @@ glabel func_80243578_C4A158 /* C4A3C8 802437E8 00021040 */ sll $v0, $v0, 1 /* C4A3CC 802437EC 03E00008 */ jr $ra /* C4A3D0 802437F0 27BD0060 */ addiu $sp, $sp, 0x60 -/* C4A3D4 802437F4 00000000 */ nop -/* C4A3D8 802437F8 00000000 */ nop -/* C4A3DC 802437FC 00000000 */ nop +/* C4A3D4 802437F4 00000000 */ nop +/* C4A3D8 802437F8 00000000 */ nop +/* C4A3DC 802437FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/update_starpoints_display_C46F9C.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/update_starpoints_display_C46F9C.s index aa14e1a4ef..082b86dfa0 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/update_starpoints_display_C46F9C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/update_starpoints_display_C46F9C.s @@ -19,7 +19,7 @@ glabel update_starpoints_display_C46F9C /* C46FD4 802403F4 8E2200B0 */ lw $v0, 0xb0($s1) /* C46FD8 802403F8 30420004 */ andi $v0, $v0, 4 /* C46FDC 802403FC 10400015 */ beqz $v0, .L80240454 -/* C46FE0 80240400 00000000 */ nop +/* C46FE0 80240400 00000000 */ nop .L80240404: /* C46FE4 80240404 AE800070 */ sw $zero, 0x70($s4) /* C46FE8 80240408 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel update_starpoints_display_C46F9C /* C47038 80240458 12600005 */ beqz $s3, .L80240470 /* C4703C 8024045C 24020001 */ addiu $v0, $zero, 1 /* C47040 80240460 12620048 */ beq $s3, $v0, .L80240584 -/* C47044 80240464 00000000 */ nop +/* C47044 80240464 00000000 */ nop /* C47048 80240468 0809017E */ j .L802405F8 -/* C4704C 8024046C 00000000 */ nop +/* C4704C 8024046C 00000000 */ nop .L80240470: /* C47050 80240470 86240008 */ lh $a0, 8($s1) /* C47054 80240474 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel update_starpoints_display_C46F9C /* C47074 80240494 8E03006C */ lw $v1, 0x6c($s0) /* C47078 80240498 24020003 */ addiu $v0, $zero, 3 /* C4707C 8024049C 14620056 */ bne $v1, $v0, .L802405F8 -/* C47080 802404A0 00000000 */ nop +/* C47080 802404A0 00000000 */ nop /* C47084 802404A4 8E2500A8 */ lw $a1, 0xa8($s1) /* C47088 802404A8 10A00003 */ beqz $a1, .L802404B8 /* C4708C 802404AC 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel update_starpoints_display_C46F9C /* C47104 80240524 C7A20014 */ lwc1 $f2, 0x14($sp) /* C47108 80240528 4600020D */ trunc.w.s $f8, $f0 /* C4710C 8024052C 44024000 */ mfc1 $v0, $f8 -/* C47110 80240530 00000000 */ nop +/* C47110 80240530 00000000 */ nop /* C47114 80240534 A6220012 */ sh $v0, 0x12($s1) /* C47118 80240538 4600120D */ trunc.w.s $f8, $f2 /* C4711C 8024053C 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_80240000_C4C390.s b/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_80240000_C4C390.s index 3d0195dc34..1b050ad97e 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_80240000_C4C390.s +++ b/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_80240000_C4C390.s @@ -19,7 +19,7 @@ glabel func_80240000_C4C390 /* C4C3C8 80240038 46802120 */ cvt.s.w $f4, $f4 /* C4C3CC 8024003C 44072000 */ mfc1 $a3, $f4 /* C4C3D0 80240040 0C00A7B5 */ jal dist2D -/* C4C3D4 80240044 00000000 */ nop +/* C4C3D4 80240044 00000000 */ nop /* C4C3D8 80240048 24020001 */ addiu $v0, $zero, 1 /* C4C3DC 8024004C AE220084 */ sw $v0, 0x84($s1) /* C4C3E0 80240050 820300B4 */ lb $v1, 0xb4($s0) @@ -34,7 +34,7 @@ glabel func_80240000_C4C390 /* C4C400 80240070 C4400010 */ lwc1 $f0, 0x10($v0) /* C4C404 80240074 46800020 */ cvt.s.w $f0, $f0 /* C4C408 80240078 4602003E */ c.le.s $f0, $f2 -/* C4C40C 8024007C 00000000 */ nop +/* C4C40C 8024007C 00000000 */ nop /* C4C410 80240080 45030001 */ bc1tl .L80240088 /* C4C414 80240084 AE200084 */ sw $zero, 0x84($s1) .L80240088: diff --git a/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_802400A0_C4C430.s b/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_802400A0_C4C430.s index 3fc53d1d07..5b8ef0a88e 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_802400A0_C4C430.s +++ b/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_802400A0_C4C430.s @@ -18,12 +18,12 @@ glabel func_802400A0_C4C430 /* C4C464 802400D4 468031A0 */ cvt.s.w $f6, $f6 /* C4C468 802400D8 44073000 */ mfc1 $a3, $f6 /* C4C46C 802400DC 0C00A7B5 */ jal dist2D -/* C4C470 802400E0 00000000 */ nop +/* C4C470 802400E0 00000000 */ nop /* C4C474 802400E4 3C0142E1 */ lui $at, 0x42e1 /* C4C478 802400E8 44811000 */ mtc1 $at, $f2 /* C4C47C 802400EC 46000106 */ mov.s $f4, $f0 /* C4C480 802400F0 4602203C */ c.lt.s $f4, $f2 -/* C4C484 802400F4 00000000 */ nop +/* C4C484 802400F4 00000000 */ nop /* C4C488 802400F8 45000003 */ bc1f .L80240108 /* C4C48C 802400FC AE000084 */ sw $zero, 0x84($s0) /* C4C490 80240100 24020002 */ addiu $v0, $zero, 2 @@ -31,9 +31,9 @@ glabel func_802400A0_C4C430 .L80240108: /* C4C498 80240108 3C014216 */ lui $at, 0x4216 /* C4C49C 8024010C 44810000 */ mtc1 $at, $f0 -/* C4C4A0 80240110 00000000 */ nop +/* C4C4A0 80240110 00000000 */ nop /* C4C4A4 80240114 4600203C */ c.lt.s $f4, $f0 -/* C4C4A8 80240118 00000000 */ nop +/* C4C4A8 80240118 00000000 */ nop /* C4C4AC 8024011C 45000002 */ bc1f .L80240128 /* C4C4B0 80240120 24020001 */ addiu $v0, $zero, 1 /* C4C4B4 80240124 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_8024013C_C4C4CC.s b/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_8024013C_C4C4CC.s index 57fdfc7a3d..9c7b7feb78 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_8024013C_C4C4CC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_8024013C_C4C4CC.s @@ -6,9 +6,9 @@ glabel func_8024013C_C4C4CC /* C4C4D0 80240140 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) /* C4C4D4 80240144 C442002C */ lwc1 $f2, 0x2c($v0) /* C4C4D8 80240148 44800000 */ mtc1 $zero, $f0 -/* C4C4DC 8024014C 00000000 */ nop +/* C4C4DC 8024014C 00000000 */ nop /* C4C4E0 80240150 4602003E */ c.le.s $f0, $f2 -/* C4C4E4 80240154 00000000 */ nop +/* C4C4E4 80240154 00000000 */ nop /* C4C4E8 80240158 45000003 */ bc1f .L80240168 /* C4C4EC 8024015C 0040182D */ daddu $v1, $v0, $zero /* C4C4F0 80240160 03E00008 */ jr $ra @@ -17,20 +17,20 @@ glabel func_8024013C_C4C4CC /* C4C4F8 80240168 C4420028 */ lwc1 $f2, 0x28($v0) /* C4C4FC 8024016C 3C0143DC */ lui $at, 0x43dc /* C4C500 80240170 44810000 */ mtc1 $at, $f0 -/* C4C504 80240174 00000000 */ nop +/* C4C504 80240174 00000000 */ nop /* C4C508 80240178 4600103C */ c.lt.s $f2, $f0 -/* C4C50C 8024017C 00000000 */ nop +/* C4C50C 8024017C 00000000 */ nop /* C4C510 80240180 45000003 */ bc1f .L80240190 -/* C4C514 80240184 00000000 */ nop +/* C4C514 80240184 00000000 */ nop /* C4C518 80240188 0809006D */ j .L802401B4 /* C4C51C 8024018C 24020003 */ addiu $v0, $zero, 3 .L80240190: /* C4C520 80240190 C4620030 */ lwc1 $f2, 0x30($v1) /* C4C524 80240194 3C01C32A */ lui $at, 0xc32a /* C4C528 80240198 44810000 */ mtc1 $at, $f0 -/* C4C52C 8024019C 00000000 */ nop +/* C4C52C 8024019C 00000000 */ nop /* C4C530 802401A0 4600103C */ c.lt.s $f2, $f0 -/* C4C534 802401A4 00000000 */ nop +/* C4C534 802401A4 00000000 */ nop /* C4C538 802401A8 45000002 */ bc1f .L802401B4 /* C4C53C 802401AC 24020001 */ addiu $v0, $zero, 1 /* C4C540 802401B0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_802401C0_C4C550.s b/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_802401C0_C4C550.s index 244303540a..23dd1b8fdd 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_802401C0_C4C550.s +++ b/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_802401C0_C4C550.s @@ -6,12 +6,12 @@ glabel func_802401C0_C4C550 /* C4C554 802401C4 C422EFF4 */ lwc1 $f2, %lo(gPlayerStatus+0x2C)($at) /* C4C558 802401C8 3C01C270 */ lui $at, 0xc270 /* C4C55C 802401CC 44810000 */ mtc1 $at, $f0 -/* C4C560 802401D0 00000000 */ nop +/* C4C560 802401D0 00000000 */ nop /* C4C564 802401D4 4602003C */ c.lt.s $f0, $f2 -/* C4C568 802401D8 00000000 */ nop +/* C4C568 802401D8 00000000 */ nop /* C4C56C 802401DC 45010002 */ bc1t .L802401E8 /* C4C570 802401E0 0000102D */ daddu $v0, $zero, $zero /* C4C574 802401E4 24020002 */ addiu $v0, $zero, 2 .L802401E8: /* C4C578 802401E8 03E00008 */ jr $ra -/* C4C57C 802401EC 00000000 */ nop +/* C4C57C 802401EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_11/C4D3E0/func_80240000_C4D3E0.s b/asm/nonmatchings/world/area_dgb/dgb_11/C4D3E0/func_80240000_C4D3E0.s index f1dbe368a6..886907e10f 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_11/C4D3E0/func_80240000_C4D3E0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_11/C4D3E0/func_80240000_C4D3E0.s @@ -16,10 +16,10 @@ glabel func_80240000_C4D3E0 /* C4D40C 8024002C 3C050000 */ lui $a1, 0 /* C4D410 80240030 24A501E4 */ addiu $a1, $a1, 0x1e4 /* C4D414 80240034 0C048052 */ jal play_model_animation -/* C4D418 80240038 00000000 */ nop +/* C4D418 80240038 00000000 */ nop /* C4D41C 8024003C 24020002 */ addiu $v0, $zero, 2 .L80240040: /* C4D420 80240040 8FBF0010 */ lw $ra, 0x10($sp) /* C4D424 80240044 03E00008 */ jr $ra /* C4D428 80240048 27BD0018 */ addiu $sp, $sp, 0x18 -/* C4D42C 8024004C 00000000 */ nop +/* C4D42C 8024004C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240000_C4DEF0.s b/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240000_C4DEF0.s index 3f77f06418..baa43ca5d0 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240000_C4DEF0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240000_C4DEF0.s @@ -26,7 +26,7 @@ glabel func_80240000_C4DEF0 /* C4DF40 80240050 1440FFFA */ bnez $v0, .L8024003C /* C4DF44 80240054 24A50004 */ addiu $a1, $a1, 4 /* C4DF48 80240058 08090027 */ j .L8024009C -/* C4DF4C 8024005C 00000000 */ nop +/* C4DF4C 8024005C 00000000 */ nop .L80240060: /* C4DF50 80240060 0000182D */ daddu $v1, $zero, $zero /* C4DF54 80240064 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240208_C4F718.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240208_C4F718.s index 69682c7bcc..bd6ace32bf 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240208_C4F718.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240208_C4F718.s @@ -42,7 +42,7 @@ glabel func_80240208_C4F718 /* C4F7AC 8024029C C6620074 */ lwc1 $f2, 0x74($s3) /* C4F7B0 802402A0 468010A0 */ cvt.s.w $f2, $f2 /* C4F7B4 802402A4 4600103C */ c.lt.s $f2, $f0 -/* C4F7B8 802402A8 00000000 */ nop +/* C4F7B8 802402A8 00000000 */ nop /* C4F7BC 802402AC 45030001 */ bc1tl .L802402B4 /* C4F7C0 802402B0 0000882D */ daddu $s1, $zero, $zero .L802402B4: @@ -51,16 +51,16 @@ glabel func_80240208_C4F718 /* C4F7CC 802402BC 3C014387 */ lui $at, 0x4387 /* C4F7D0 802402C0 4481A000 */ mtc1 $at, $f20 /* C4F7D4 802402C4 0C00A70A */ jal get_clamped_angle_diff -/* C4F7D8 802402C8 00000000 */ nop +/* C4F7D8 802402C8 00000000 */ nop /* C4F7DC 802402CC 0C00A6C9 */ jal clamp_angle /* C4F7E0 802402D0 46000306 */ mov.s $f12, $f0 /* C4F7E4 802402D4 3C018024 */ lui $at, %hi(D_80242CF0) /* C4F7E8 802402D8 D4222CF0 */ ldc1 $f2, %lo(D_80242CF0)($at) /* C4F7EC 802402DC 46000021 */ cvt.d.s $f0, $f0 /* C4F7F0 802402E0 4622003C */ c.lt.d $f0, $f2 -/* C4F7F4 802402E4 00000000 */ nop +/* C4F7F4 802402E4 00000000 */ nop /* C4F7F8 802402E8 45000003 */ bc1f .L802402F8 -/* C4F7FC 802402EC 00000000 */ nop +/* C4F7FC 802402EC 00000000 */ nop /* C4F800 802402F0 3C0142B4 */ lui $at, 0x42b4 /* C4F804 802402F4 4481A000 */ mtc1 $at, $f20 .L802402F8: @@ -77,7 +77,7 @@ glabel func_80240208_C4F718 /* C4F830 80240320 468010A0 */ cvt.s.w $f2, $f2 /* C4F834 80240324 46000005 */ abs.s $f0, $f0 /* C4F838 80240328 4600103C */ c.lt.s $f2, $f0 -/* C4F83C 8024032C 00000000 */ nop +/* C4F83C 8024032C 00000000 */ nop /* C4F840 80240330 45030001 */ bc1tl .L80240338 /* C4F844 80240334 0000882D */ daddu $s1, $zero, $zero .L80240338: @@ -87,13 +87,13 @@ glabel func_80240208_C4F718 /* C4F854 80240344 860200A8 */ lh $v0, 0xa8($s0) /* C4F858 80240348 46020001 */ sub.s $f0, $f0, $f2 /* C4F85C 8024034C 44821000 */ mtc1 $v0, $f2 -/* C4F860 80240350 00000000 */ nop +/* C4F860 80240350 00000000 */ nop /* C4F864 80240354 468010A1 */ cvt.d.w $f2, $f2 /* C4F868 80240358 46221080 */ add.d $f2, $f2, $f2 /* C4F86C 8024035C 46000005 */ abs.s $f0, $f0 /* C4F870 80240360 46000021 */ cvt.d.s $f0, $f0 /* C4F874 80240364 4620103E */ c.le.d $f2, $f0 -/* C4F878 80240368 00000000 */ nop +/* C4F878 80240368 00000000 */ nop /* C4F87C 8024036C 45030001 */ bc1tl .L80240374 /* C4F880 80240370 0000882D */ daddu $s1, $zero, $zero .L80240374: diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s index b67a8a9d99..eaba705e42 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s @@ -100,78 +100,93 @@ glabel func_8024061C_C4FB2C /* C4FC90 80240780 2C620064 */ sltiu $v0, $v1, 0x64 /* C4FC94 80240784 10400048 */ beqz $v0, .L802408A8 /* C4FC98 80240788 00031080 */ sll $v0, $v1, 2 -/* C4FC9C 8024078C 3C018024 */ lui $at, %hi(func_80242CF8_9D9D18) +/* C4FC9C 8024078C 3C018024 */ lui $at, %hi(jtbl_80242CF8_C52208) /* C4FCA0 80240790 00220821 */ addu $at, $at, $v0 -/* C4FCA4 80240794 8C222CF8 */ lw $v0, %lo(func_80242CF8_9D9D18)($at) +/* C4FCA4 80240794 8C222CF8 */ lw $v0, %lo(jtbl_80242CF8_C52208)($at) /* C4FCA8 80240798 00400008 */ jr $v0 /* C4FCAC 8024079C 00000000 */ nop +glabel L802407A0_C4FCB0 /* C4FCB0 802407A0 0240202D */ daddu $a0, $s2, $zero /* C4FCB4 802407A4 0260282D */ daddu $a1, $s3, $zero /* C4FCB8 802407A8 0C012568 */ jal func_800495A0 /* C4FCBC 802407AC 0280302D */ daddu $a2, $s4, $zero +glabel L802407B0_C4FCC0 /* C4FCC0 802407B0 0240202D */ daddu $a0, $s2, $zero /* C4FCC4 802407B4 0260282D */ daddu $a1, $s3, $zero /* C4FCC8 802407B8 0C0125AE */ jal func_800496B8 /* C4FCCC 802407BC 0280302D */ daddu $a2, $s4, $zero /* C4FCD0 802407C0 0809022A */ j .L802408A8 /* C4FCD4 802407C4 00000000 */ nop +glabel L802407C8_C4FCD8 /* C4FCD8 802407C8 0240202D */ daddu $a0, $s2, $zero /* C4FCDC 802407CC 0260282D */ daddu $a1, $s3, $zero /* C4FCE0 802407D0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C4FCE4 802407D4 0280302D */ daddu $a2, $s4, $zero +glabel L802407D8_C4FCE8 /* C4FCE8 802407D8 0240202D */ daddu $a0, $s2, $zero /* C4FCEC 802407DC 0260282D */ daddu $a1, $s3, $zero /* C4FCF0 802407E0 0C012701 */ jal func_80049C04 /* C4FCF4 802407E4 0280302D */ daddu $a2, $s4, $zero /* C4FCF8 802407E8 0809022A */ j .L802408A8 /* C4FCFC 802407EC 00000000 */ nop +glabel L802407F0_C4FD00 /* C4FD00 802407F0 0240202D */ daddu $a0, $s2, $zero /* C4FD04 802407F4 0260282D */ daddu $a1, $s3, $zero /* C4FD08 802407F8 0C01278F */ jal func_80049E3C /* C4FD0C 802407FC 0280302D */ daddu $a2, $s4, $zero +glabel L80240800_C4FD10 /* C4FD10 80240800 0240202D */ daddu $a0, $s2, $zero /* C4FD14 80240804 0260282D */ daddu $a1, $s3, $zero /* C4FD18 80240808 0C0127B3 */ jal func_80049ECC /* C4FD1C 8024080C 0280302D */ daddu $a2, $s4, $zero /* C4FD20 80240810 0809022A */ j .L802408A8 /* C4FD24 80240814 00000000 */ nop +glabel L80240818_C4FD28 /* C4FD28 80240818 0240202D */ daddu $a0, $s2, $zero /* C4FD2C 8024081C 0260282D */ daddu $a1, $s3, $zero /* C4FD30 80240820 0C0127DF */ jal func_80049F7C /* C4FD34 80240824 0280302D */ daddu $a2, $s4, $zero +glabel L80240828_C4FD38 /* C4FD38 80240828 0240202D */ daddu $a0, $s2, $zero /* C4FD3C 8024082C 0260282D */ daddu $a1, $s3, $zero /* C4FD40 80240830 0C012849 */ jal func_8004A124 /* C4FD44 80240834 0280302D */ daddu $a2, $s4, $zero /* C4FD48 80240838 0809022A */ j .L802408A8 /* C4FD4C 8024083C 00000000 */ nop +glabel L80240840_C4FD50 /* C4FD50 80240840 0240202D */ daddu $a0, $s2, $zero /* C4FD54 80240844 0260282D */ daddu $a1, $s3, $zero /* C4FD58 80240848 0C0128FA */ jal func_8004A3E8 /* C4FD5C 8024084C 0280302D */ daddu $a2, $s4, $zero /* C4FD60 80240850 0809022A */ j .L802408A8 /* C4FD64 80240854 00000000 */ nop +glabel L80240858_C4FD68 /* C4FD68 80240858 0C090000 */ jal dgb_15_UnkNpcAIFunc6 /* C4FD6C 8024085C 0240202D */ daddu $a0, $s2, $zero +glabel L80240860_C4FD70 /* C4FD70 80240860 0C09001B */ jal dgb_15_UnkNpcAIFunc7 /* C4FD74 80240864 0240202D */ daddu $a0, $s2, $zero /* C4FD78 80240868 8E430070 */ lw $v1, 0x70($s2) /* C4FD7C 8024086C 24020020 */ addiu $v0, $zero, 0x20 /* C4FD80 80240870 1462000D */ bne $v1, $v0, .L802408A8 /* C4FD84 80240874 00000000 */ nop +glabel L80240878_C4FD88 /* C4FD88 80240878 0C090037 */ jal dgb_15_UnkNpcAIFunc8 /* C4FD8C 8024087C 0240202D */ daddu $a0, $s2, $zero /* C4FD90 80240880 8E430070 */ lw $v1, 0x70($s2) /* C4FD94 80240884 24020021 */ addiu $v0, $zero, 0x21 /* C4FD98 80240888 14620007 */ bne $v1, $v0, .L802408A8 /* C4FD9C 8024088C 00000000 */ nop +glabel L80240890_C4FDA0 /* C4FDA0 80240890 0C09006D */ jal dgb_15_UnkNpcAIFunc5 /* C4FDA4 80240894 0240202D */ daddu $a0, $s2, $zero /* C4FDA8 80240898 0809022A */ j .L802408A8 /* C4FDAC 8024089C 00000000 */ nop +glabel L802408A0_C4FDB0 /* C4FDB0 802408A0 0C0129CF */ jal func_8004A73C /* C4FDB4 802408A4 0240202D */ daddu $a0, $s2, $zero .L802408A8: +glabel L802408A8_C4FDB8 /* C4FDB8 802408A8 8FBF0048 */ lw $ra, 0x48($sp) /* C4FDBC 802408AC 8FB50044 */ lw $s5, 0x44($sp) /* C4FDC0 802408B0 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802408D0_C4FDE0.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802408D0_C4FDE0.s index 44d4b43a5f..146742cdf6 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802408D0_C4FDE0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802408D0_C4FDE0.s @@ -45,7 +45,7 @@ glabel func_802408D0_C4FDE0 /* C4FE7C 8024096C 0C00A7B5 */ jal dist2D /* C4FE80 80240970 4600B386 */ mov.s $f14, $f22 /* C4FE84 80240974 4614003C */ c.lt.s $f0, $f20 -/* C4FE88 80240978 00000000 */ nop +/* C4FE88 80240978 00000000 */ nop /* C4FE8C 8024097C 45000003 */ bc1f .L8024098C /* C4FE90 80240980 2631000C */ addiu $s1, $s1, 0xc /* C4FE94 80240984 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_802408D0_C4FDE0 /* C4FEC0 802409B0 8E6200D0 */ lw $v0, 0xd0($s3) /* C4FEC4 802409B4 8C42007C */ lw $v0, 0x7c($v0) /* C4FEC8 802409B8 04410004 */ bgez $v0, .L802409CC -/* C4FECC 802409BC 00000000 */ nop +/* C4FECC 802409BC 00000000 */ nop /* C4FED0 802409C0 C6C00000 */ lwc1 $f0, ($s6) /* C4FED4 802409C4 0809027B */ j .L802409EC /* C4FED8 802409C8 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_802408D0_C4FDE0 /* C4FEDC 802409CC 3C018024 */ lui $at, %hi(func_80242E88_95E088) /* C4FEE0 802409D0 D4222E88 */ ldc1 $f2, %lo(func_80242E88_95E088)($at) /* C4FEE4 802409D4 44820000 */ mtc1 $v0, $f0 -/* C4FEE8 802409D8 00000000 */ nop +/* C4FEE8 802409D8 00000000 */ nop /* C4FEEC 802409DC 46800021 */ cvt.d.w $f0, $f0 /* C4FEF0 802409E0 46220003 */ div.d $f0, $f0, $f2 /* C4FEF4 802409E4 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240A28_C4FF38.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240A28_C4FF38.s index ac06c4f872..368cee895f 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240A28_C4FF38.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240A28_C4FF38.s @@ -44,7 +44,7 @@ glabel func_80240A28_C4FF38 /* C4FFD4 80240AC4 2402000F */ addiu $v0, $zero, 0xf /* C4FFD8 80240AC8 AFA2001C */ sw $v0, 0x1c($sp) /* C4FFDC 80240ACC 44833000 */ mtc1 $v1, $f6 -/* C4FFE0 80240AD0 00000000 */ nop +/* C4FFE0 80240AD0 00000000 */ nop /* C4FFE4 80240AD4 468031A0 */ cvt.s.w $f6, $f6 /* C4FFE8 80240AD8 44073000 */ mfc1 $a3, $f6 /* C4FFEC 80240ADC 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_80240A28_C4FF38 .L80240B2C: /* C5003C 80240B2C 8602008C */ lh $v0, 0x8c($s0) /* C50040 80240B30 1440005D */ bnez $v0, .L80240CA8 -/* C50044 80240B34 00000000 */ nop +/* C50044 80240B34 00000000 */ nop /* C50048 80240B38 C6000018 */ lwc1 $f0, 0x18($s0) /* C5004C 80240B3C 3C014010 */ lui $at, 0x4010 /* C50050 80240B40 44811800 */ mtc1 $at, $f3 /* C50054 80240B44 44801000 */ mtc1 $zero, $f2 /* C50058 80240B48 46000021 */ cvt.d.s $f0, $f0 /* C5005C 80240B4C 4622003C */ c.lt.d $f0, $f2 -/* C50060 80240B50 00000000 */ nop +/* C50060 80240B50 00000000 */ nop /* C50064 80240B54 45000003 */ bc1f .L80240B64 /* C50068 80240B58 0200202D */ daddu $a0, $s0, $zero /* C5006C 80240B5C 080902DA */ j .L80240B68 @@ -88,7 +88,7 @@ glabel func_80240A28_C4FF38 /* C50074 80240B64 24050001 */ addiu $a1, $zero, 1 .L80240B68: /* C50078 80240B68 0C00F598 */ jal func_8003D660 -/* C5007C 80240B6C 00000000 */ nop +/* C5007C 80240B6C 00000000 */ nop /* C50080 80240B70 C60C0038 */ lwc1 $f12, 0x38($s0) /* C50084 80240B74 8E430078 */ lw $v1, 0x78($s2) /* C50088 80240B78 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_80240A28_C4FF38 /* C500B0 80240BA0 4406B000 */ mfc1 $a2, $f22 /* C500B4 80240BA4 4407A000 */ mfc1 $a3, $f20 /* C500B8 80240BA8 0C00A720 */ jal atan2 -/* C500BC 80240BAC 00000000 */ nop +/* C500BC 80240BAC 00000000 */ nop /* C500C0 80240BB0 8E050018 */ lw $a1, 0x18($s0) /* C500C4 80240BB4 44060000 */ mfc1 $a2, $f0 /* C500C8 80240BB8 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_80240A28_C4FF38 /* C500DC 80240BCC 4406B000 */ mfc1 $a2, $f22 /* C500E0 80240BD0 4407A000 */ mfc1 $a3, $f20 /* C500E4 80240BD4 0C00A7B5 */ jal dist2D -/* C500E8 80240BD8 00000000 */ nop +/* C500E8 80240BD8 00000000 */ nop /* C500EC 80240BDC C6020018 */ lwc1 $f2, 0x18($s0) /* C500F0 80240BE0 4602003E */ c.le.s $f0, $f2 -/* C500F4 80240BE4 00000000 */ nop +/* C500F4 80240BE4 00000000 */ nop /* C500F8 80240BE8 4500002F */ bc1f .L80240CA8 /* C500FC 80240BEC 240403E8 */ addiu $a0, $zero, 0x3e8 /* C50100 80240BF0 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_80240A28_C4FF38 /* C50154 80240C44 18400003 */ blez $v0, .L80240C54 /* C50158 80240C48 24020004 */ addiu $v0, $zero, 4 /* C5015C 80240C4C 14600002 */ bnez $v1, .L80240C58 -/* C50160 80240C50 00000000 */ nop +/* C50160 80240C50 00000000 */ nop .L80240C54: /* C50164 80240C54 AE420070 */ sw $v0, 0x70($s2) .L80240C58: diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240D90_C502A0.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240D90_C502A0.s index 1438fbd616..6979c0043b 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240D90_C502A0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240D90_C502A0.s @@ -38,7 +38,7 @@ glabel func_80240D90_C502A0 /* C50324 80240E14 2402000F */ addiu $v0, $zero, 0xf /* C50328 80240E18 AFA2001C */ sw $v0, 0x1c($sp) /* C5032C 80240E1C 44833000 */ mtc1 $v1, $f6 -/* C50330 80240E20 00000000 */ nop +/* C50330 80240E20 00000000 */ nop /* C50334 80240E24 468031A0 */ cvt.s.w $f6, $f6 /* C50338 80240E28 44073000 */ mfc1 $a3, $f6 /* C5033C 80240E2C 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_80240D90_C502A0 .L80240E90: /* C503A0 80240E90 8602008C */ lh $v0, 0x8c($s0) /* C503A4 80240E94 14400025 */ bnez $v0, .L80240F2C -/* C503A8 80240E98 00000000 */ nop +/* C503A8 80240E98 00000000 */ nop /* C503AC 80240E9C 9602008E */ lhu $v0, 0x8e($s0) /* C503B0 80240EA0 2442FFFF */ addiu $v0, $v0, -1 /* C503B4 80240EA4 A602008E */ sh $v0, 0x8e($s0) /* C503B8 80240EA8 00021400 */ sll $v0, $v0, 0x10 /* C503BC 80240EAC 1440001F */ bnez $v0, .L80240F2C -/* C503C0 80240EB0 00000000 */ nop +/* C503C0 80240EB0 00000000 */ nop /* C503C4 80240EB4 8E820074 */ lw $v0, 0x74($s4) /* C503C8 80240EB8 2442FFFF */ addiu $v0, $v0, -1 /* C503CC 80240EBC 10400019 */ beqz $v0, .L80240F24 @@ -84,7 +84,7 @@ glabel func_80240D90_C502A0 /* C503D8 80240EC8 9442002A */ lhu $v0, 0x2a($v0) /* C503DC 80240ECC 30420010 */ andi $v0, $v0, 0x10 /* C503E0 80240ED0 14400007 */ bnez $v0, .L80240EF0 -/* C503E4 80240ED4 00000000 */ nop +/* C503E4 80240ED4 00000000 */ nop /* C503E8 80240ED8 C600000C */ lwc1 $f0, 0xc($s0) /* C503EC 80240EDC 3C014334 */ lui $at, 0x4334 /* C503F0 80240EE0 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240F4C_C5045C.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240F4C_C5045C.s index 37f31ff003..c5f5ba8001 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240F4C_C5045C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240F4C_C5045C.s @@ -28,7 +28,7 @@ glabel func_80240F4C_C5045C /* C504B4 80240FA4 8E0200D0 */ lw $v0, 0xd0($s0) /* C504B8 80240FA8 8C42007C */ lw $v0, 0x7c($v0) /* C504BC 80240FAC 04410004 */ bgez $v0, .L80240FC0 -/* C504C0 80240FB0 00000000 */ nop +/* C504C0 80240FB0 00000000 */ nop /* C504C4 80240FB4 C6400000 */ lwc1 $f0, ($s2) /* C504C8 80240FB8 080903F8 */ j .L80240FE0 /* C504CC 80240FBC E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_80240F4C_C5045C /* C504D0 80240FC0 3C018024 */ lui $at, %hi(D_80242E90) /* C504D4 80240FC4 D4222E90 */ ldc1 $f2, %lo(D_80242E90)($at) /* C504D8 80240FC8 44820000 */ mtc1 $v0, $f0 -/* C504DC 80240FCC 00000000 */ nop +/* C504DC 80240FCC 00000000 */ nop /* C504E0 80240FD0 46800021 */ cvt.d.w $f0, $f0 /* C504E4 80240FD4 46220003 */ div.d $f0, $f0, $f2 /* C504E8 80240FD8 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802410EC_C505FC.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802410EC_C505FC.s index c229ffd46c..d5802ff9f9 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802410EC_C505FC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802410EC_C505FC.s @@ -47,20 +47,20 @@ glabel func_802410EC_C505FC /* C506A4 80241194 8E02001C */ lw $v0, 0x1c($s0) /* C506A8 80241198 46001005 */ abs.s $f0, $f2 /* C506AC 8024119C 44822000 */ mtc1 $v0, $f4 -/* C506B0 802411A0 00000000 */ nop +/* C506B0 802411A0 00000000 */ nop /* C506B4 802411A4 46802120 */ cvt.s.w $f4, $f4 /* C506B8 802411A8 4600203C */ c.lt.s $f4, $f0 -/* C506BC 802411AC 00000000 */ nop +/* C506BC 802411AC 00000000 */ nop /* C506C0 802411B0 4500000D */ bc1f .L802411E8 -/* C506C4 802411B4 00000000 */ nop +/* C506C4 802411B4 00000000 */ nop /* C506C8 802411B8 44800000 */ mtc1 $zero, $f0 /* C506CC 802411BC C654000C */ lwc1 $f20, 0xc($s2) /* C506D0 802411C0 4600103C */ c.lt.s $f2, $f0 -/* C506D4 802411C4 00000000 */ nop +/* C506D4 802411C4 00000000 */ nop /* C506D8 802411C8 45000006 */ bc1f .L802411E4 /* C506DC 802411CC 00021023 */ negu $v0, $v0 /* C506E0 802411D0 44820000 */ mtc1 $v0, $f0 -/* C506E4 802411D4 00000000 */ nop +/* C506E4 802411D4 00000000 */ nop /* C506E8 802411D8 46800020 */ cvt.s.w $f0, $f0 /* C506EC 802411DC 0809047A */ j .L802411E8 /* C506F0 802411E0 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024121C_C5072C.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024121C_C5072C.s index 54db2faeca..45f74b33ca 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024121C_C5072C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024121C_C5072C.s @@ -37,7 +37,7 @@ glabel func_8024121C_C5072C /* C507AC 8024129C 2402000F */ addiu $v0, $zero, 0xf /* C507B0 802412A0 AFA2001C */ sw $v0, 0x1c($sp) /* C507B4 802412A4 44833000 */ mtc1 $v1, $f6 -/* C507B8 802412A8 00000000 */ nop +/* C507B8 802412A8 00000000 */ nop /* C507BC 802412AC 468031A0 */ cvt.s.w $f6, $f6 /* C507C0 802412B0 44073000 */ mfc1 $a3, $f6 /* C507C4 802412B4 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802413A4_C508B4.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802413A4_C508B4.s index 0a815dc43f..4e3c19e24d 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802413A4_C508B4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802413A4_C508B4.s @@ -28,7 +28,7 @@ glabel func_802413A4_C508B4 /* C5090C 802413FC C4400008 */ lwc1 $f0, 8($v0) /* C50910 80241400 46800020 */ cvt.s.w $f0, $f0 /* C50914 80241404 4602003E */ c.le.s $f0, $f2 -/* C50918 80241408 00000000 */ nop +/* C50918 80241408 00000000 */ nop /* C5091C 8024140C 45020003 */ bc1fl .L8024141C /* C50920 80241410 24840001 */ addiu $a0, $a0, 1 /* C50924 80241414 0809050B */ j .L8024142C diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s index ff6d5a1333..ff40460cef 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s @@ -46,7 +46,7 @@ glabel func_80241464_C50974 /* C50A18 80241508 8E2200B0 */ lw $v0, 0xb0($s1) /* C50A1C 8024150C 30420004 */ andi $v0, $v0, 4 /* C50A20 80241510 10400044 */ beqz $v0, .L80241624 -/* C50A24 80241514 00000000 */ nop +/* C50A24 80241514 00000000 */ nop .L80241518: /* C50A28 80241518 2404F7FF */ addiu $a0, $zero, -0x801 /* C50A2C 8024151C AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80241464_C50974 /* C50AE0 802415D0 3C0142C8 */ lui $at, 0x42c8 /* C50AE4 802415D4 44812000 */ mtc1 $at, $f4 /* C50AE8 802415D8 44823000 */ mtc1 $v0, $f6 -/* C50AEC 802415DC 00000000 */ nop +/* C50AEC 802415DC 00000000 */ nop /* C50AF0 802415E0 468031A0 */ cvt.s.w $f6, $f6 /* C50AF4 802415E4 27A20044 */ addiu $v0, $sp, 0x44 /* C50AF8 802415E8 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80241464_C50974 /* C50B1C 8024160C 0C0372DF */ jal func_800DCB7C /* C50B20 80241610 27A70040 */ addiu $a3, $sp, 0x40 /* C50B24 80241614 10400003 */ beqz $v0, .L80241624 -/* C50B28 80241618 00000000 */ nop +/* C50B28 80241618 00000000 */ nop /* C50B2C 8024161C C7A0003C */ lwc1 $f0, 0x3c($sp) /* C50B30 80241620 E640003C */ swc1 $f0, 0x3c($s2) .L80241624: @@ -124,72 +124,85 @@ glabel func_80241464_C50974 /* C50B38 80241628 2C620064 */ sltiu $v0, $v1, 0x64 /* C50B3C 8024162C 10400042 */ beqz $v0, .L80241738 /* C50B40 80241630 00031080 */ sll $v0, $v1, 2 -/* C50B44 80241634 3C018024 */ lui $at, %hi(D_80242E98) +/* C50B44 80241634 3C018024 */ lui $at, %hi(jtbl_80242E98_C523A8) /* C50B48 80241638 00220821 */ addu $at, $at, $v0 -/* C50B4C 8024163C 8C222E98 */ lw $v0, %lo(D_80242E98)($at) +/* C50B4C 8024163C 8C222E98 */ lw $v0, %lo(jtbl_80242E98_C523A8)($at) /* C50B50 80241640 00400008 */ jr $v0 -/* C50B54 80241644 00000000 */ nop +/* C50B54 80241644 00000000 */ nop +glabel L80241648_C50B58 /* C50B58 80241648 0280202D */ daddu $a0, $s4, $zero /* C50B5C 8024164C 0260282D */ daddu $a1, $s3, $zero /* C50B60 80241650 0C090234 */ jal func_802408D0_C4FDE0 /* C50B64 80241654 02A0302D */ daddu $a2, $s5, $zero +glabel L80241658_C50B68 /* C50B68 80241658 0280202D */ daddu $a0, $s4, $zero /* C50B6C 8024165C 0260282D */ daddu $a1, $s3, $zero /* C50B70 80241660 0C09028A */ jal func_80240A28_C4FF38 /* C50B74 80241664 02A0302D */ daddu $a2, $s5, $zero /* C50B78 80241668 080905CE */ j .L80241738 -/* C50B7C 8024166C 00000000 */ nop +/* C50B7C 8024166C 00000000 */ nop +glabel L80241670_C50B80 /* C50B80 80241670 0280202D */ daddu $a0, $s4, $zero /* C50B84 80241674 0260282D */ daddu $a1, $s3, $zero /* C50B88 80241678 0C090334 */ jal dgb_15_UnkNpcAIFunc1 /* C50B8C 8024167C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241680_C50B90 /* C50B90 80241680 0280202D */ daddu $a0, $s4, $zero /* C50B94 80241684 0260282D */ daddu $a1, $s3, $zero /* C50B98 80241688 0C090364 */ jal func_80240D90_C502A0 /* C50B9C 8024168C 02A0302D */ daddu $a2, $s5, $zero /* C50BA0 80241690 080905CE */ j .L80241738 -/* C50BA4 80241694 00000000 */ nop +/* C50BA4 80241694 00000000 */ nop +glabel L80241698_C50BA8 /* C50BA8 80241698 0280202D */ daddu $a0, $s4, $zero /* C50BAC 8024169C 0260282D */ daddu $a1, $s3, $zero /* C50BB0 802416A0 0C0903D3 */ jal func_80240F4C_C5045C /* C50BB4 802416A4 02A0302D */ daddu $a2, $s5, $zero /* C50BB8 802416A8 080905CE */ j .L80241738 -/* C50BBC 802416AC 00000000 */ nop +/* C50BBC 802416AC 00000000 */ nop +glabel L802416B0_C50BC0 /* C50BC0 802416B0 0280202D */ daddu $a0, $s4, $zero /* C50BC4 802416B4 0260282D */ daddu $a1, $s3, $zero /* C50BC8 802416B8 0C090400 */ jal dgb_15_NpcJumpFunc2 /* C50BCC 802416BC 02A0302D */ daddu $a2, $s5, $zero +glabel L802416C0_C50BD0 /* C50BD0 802416C0 0280202D */ daddu $a0, $s4, $zero /* C50BD4 802416C4 0260282D */ daddu $a1, $s3, $zero /* C50BD8 802416C8 0C09041D */ jal dgb_15_NpcJumpFunc /* C50BDC 802416CC 02A0302D */ daddu $a2, $s5, $zero /* C50BE0 802416D0 080905CE */ j .L80241738 -/* C50BE4 802416D4 00000000 */ nop +/* C50BE4 802416D4 00000000 */ nop +glabel L802416D8_C50BE8 /* C50BE8 802416D8 0280202D */ daddu $a0, $s4, $zero /* C50BEC 802416DC 0260282D */ daddu $a1, $s3, $zero /* C50BF0 802416E0 0C09043B */ jal func_802410EC_C505FC /* C50BF4 802416E4 02A0302D */ daddu $a2, $s5, $zero +glabel L802416E8_C50BF8 /* C50BF8 802416E8 0280202D */ daddu $a0, $s4, $zero /* C50BFC 802416EC 0260282D */ daddu $a1, $s3, $zero /* C50C00 802416F0 0C090487 */ jal func_8024121C_C5072C /* C50C04 802416F4 02A0302D */ daddu $a2, $s5, $zero /* C50C08 802416F8 080905CE */ j .L80241738 -/* C50C0C 802416FC 00000000 */ nop +/* C50C0C 802416FC 00000000 */ nop +glabel L80241700_C50C10 /* C50C10 80241700 0280202D */ daddu $a0, $s4, $zero /* C50C14 80241704 0260282D */ daddu $a1, $s3, $zero /* C50C18 80241708 0C0904CF */ jal dgb_15_UnkNpcDurationFlagFunc /* C50C1C 8024170C 02A0302D */ daddu $a2, $s5, $zero /* C50C20 80241710 080905CE */ j .L80241738 -/* C50C24 80241714 00000000 */ nop +/* C50C24 80241714 00000000 */ nop +glabel L80241718_C50C28 /* C50C28 80241718 0280202D */ daddu $a0, $s4, $zero /* C50C2C 8024171C 0260282D */ daddu $a1, $s3, $zero /* C50C30 80241720 0C0904E9 */ jal func_802413A4_C508B4 /* C50C34 80241724 02A0302D */ daddu $a2, $s5, $zero /* C50C38 80241728 080905CE */ j .L80241738 -/* C50C3C 8024172C 00000000 */ nop +/* C50C3C 8024172C 00000000 */ nop +glabel L80241730_C50C40 /* C50C40 80241730 0C0129CF */ jal func_8004A73C /* C50C44 80241734 0280202D */ daddu $a0, $s4, $zero .L80241738: +glabel L80241738_C50C48 /* C50C48 80241738 8FBF0060 */ lw $ra, 0x60($sp) /* C50C4C 8024173C 8FB5005C */ lw $s5, 0x5c($sp) /* C50C50 80241740 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/update_starpoints_display_C4F8CC.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/update_starpoints_display_C4F8CC.s index 980347d650..b616655563 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/update_starpoints_display_C4F8CC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/update_starpoints_display_C4F8CC.s @@ -19,7 +19,7 @@ glabel update_starpoints_display_C4F8CC /* C4F904 802403F4 8E2200B0 */ lw $v0, 0xb0($s1) /* C4F908 802403F8 30420004 */ andi $v0, $v0, 4 /* C4F90C 802403FC 10400015 */ beqz $v0, .L80240454 -/* C4F910 80240400 00000000 */ nop +/* C4F910 80240400 00000000 */ nop .L80240404: /* C4F914 80240404 AE800070 */ sw $zero, 0x70($s4) /* C4F918 80240408 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel update_starpoints_display_C4F8CC /* C4F968 80240458 12600005 */ beqz $s3, .L80240470 /* C4F96C 8024045C 24020001 */ addiu $v0, $zero, 1 /* C4F970 80240460 12620048 */ beq $s3, $v0, .L80240584 -/* C4F974 80240464 00000000 */ nop +/* C4F974 80240464 00000000 */ nop /* C4F978 80240468 0809017E */ j .L802405F8 -/* C4F97C 8024046C 00000000 */ nop +/* C4F97C 8024046C 00000000 */ nop .L80240470: /* C4F980 80240470 86240008 */ lh $a0, 8($s1) /* C4F984 80240474 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel update_starpoints_display_C4F8CC /* C4F9A4 80240494 8E03006C */ lw $v1, 0x6c($s0) /* C4F9A8 80240498 24020003 */ addiu $v0, $zero, 3 /* C4F9AC 8024049C 14620056 */ bne $v1, $v0, .L802405F8 -/* C4F9B0 802404A0 00000000 */ nop +/* C4F9B0 802404A0 00000000 */ nop /* C4F9B4 802404A4 8E2500A8 */ lw $a1, 0xa8($s1) /* C4F9B8 802404A8 10A00003 */ beqz $a1, .L802404B8 /* C4F9BC 802404AC 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel update_starpoints_display_C4F8CC /* C4FA34 80240524 C7A20014 */ lwc1 $f2, 0x14($sp) /* C4FA38 80240528 4600020D */ trunc.w.s $f8, $f0 /* C4FA3C 8024052C 44024000 */ mfc1 $v0, $f8 -/* C4FA40 80240530 00000000 */ nop +/* C4FA40 80240530 00000000 */ nop /* C4FA44 80240534 A6220012 */ sh $v0, 0x12($s1) /* C4FA48 80240538 4600120D */ trunc.w.s $f8, $f2 /* C4FA4C 8024053C 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240208_C52748.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240208_C52748.s index ead10bba27..e92137416d 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240208_C52748.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240208_C52748.s @@ -42,7 +42,7 @@ glabel func_80240208_C52748 /* C527DC 8024029C C6620074 */ lwc1 $f2, 0x74($s3) /* C527E0 802402A0 468010A0 */ cvt.s.w $f2, $f2 /* C527E4 802402A4 4600103C */ c.lt.s $f2, $f0 -/* C527E8 802402A8 00000000 */ nop +/* C527E8 802402A8 00000000 */ nop /* C527EC 802402AC 45030001 */ bc1tl .L802402B4 /* C527F0 802402B0 0000882D */ daddu $s1, $zero, $zero .L802402B4: @@ -51,16 +51,16 @@ glabel func_80240208_C52748 /* C527FC 802402BC 3C014387 */ lui $at, 0x4387 /* C52800 802402C0 4481A000 */ mtc1 $at, $f20 /* C52804 802402C4 0C00A70A */ jal get_clamped_angle_diff -/* C52808 802402C8 00000000 */ nop +/* C52808 802402C8 00000000 */ nop /* C5280C 802402CC 0C00A6C9 */ jal clamp_angle /* C52810 802402D0 46000306 */ mov.s $f12, $f0 /* C52814 802402D4 3C018024 */ lui $at, %hi(D_802431F0) /* C52818 802402D8 D42231F0 */ ldc1 $f2, %lo(D_802431F0)($at) /* C5281C 802402DC 46000021 */ cvt.d.s $f0, $f0 /* C52820 802402E0 4622003C */ c.lt.d $f0, $f2 -/* C52824 802402E4 00000000 */ nop +/* C52824 802402E4 00000000 */ nop /* C52828 802402E8 45000003 */ bc1f .L802402F8 -/* C5282C 802402EC 00000000 */ nop +/* C5282C 802402EC 00000000 */ nop /* C52830 802402F0 3C0142B4 */ lui $at, 0x42b4 /* C52834 802402F4 4481A000 */ mtc1 $at, $f20 .L802402F8: @@ -77,7 +77,7 @@ glabel func_80240208_C52748 /* C52860 80240320 468010A0 */ cvt.s.w $f2, $f2 /* C52864 80240324 46000005 */ abs.s $f0, $f0 /* C52868 80240328 4600103C */ c.lt.s $f2, $f0 -/* C5286C 8024032C 00000000 */ nop +/* C5286C 8024032C 00000000 */ nop /* C52870 80240330 45030001 */ bc1tl .L80240338 /* C52874 80240334 0000882D */ daddu $s1, $zero, $zero .L80240338: @@ -87,13 +87,13 @@ glabel func_80240208_C52748 /* C52884 80240344 860200A8 */ lh $v0, 0xa8($s0) /* C52888 80240348 46020001 */ sub.s $f0, $f0, $f2 /* C5288C 8024034C 44821000 */ mtc1 $v0, $f2 -/* C52890 80240350 00000000 */ nop +/* C52890 80240350 00000000 */ nop /* C52894 80240354 468010A1 */ cvt.d.w $f2, $f2 /* C52898 80240358 46221080 */ add.d $f2, $f2, $f2 /* C5289C 8024035C 46000005 */ abs.s $f0, $f0 /* C528A0 80240360 46000021 */ cvt.d.s $f0, $f0 /* C528A4 80240364 4620103E */ c.le.d $f2, $f0 -/* C528A8 80240368 00000000 */ nop +/* C528A8 80240368 00000000 */ nop /* C528AC 8024036C 45030001 */ bc1tl .L80240374 /* C528B0 80240370 0000882D */ daddu $s1, $zero, $zero .L80240374: diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_8024061C_C52B5C.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_8024061C_C52B5C.s index d6239df6fa..355df56af3 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_8024061C_C52B5C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_8024061C_C52B5C.s @@ -20,14 +20,14 @@ glabel func_8024061C_C52B5C /* C52B94 80240654 8482008E */ lh $v0, 0x8e($a0) /* C52B98 80240658 24030001 */ addiu $v1, $zero, 1 /* C52B9C 8024065C 14430005 */ bne $v0, $v1, .L80240674 -/* C52BA0 80240660 00000000 */ nop +/* C52BA0 80240660 00000000 */ nop /* C52BA4 80240664 8E0200CC */ lw $v0, 0xcc($s0) /* C52BA8 80240668 8C420030 */ lw $v0, 0x30($v0) /* C52BAC 8024066C 080901A4 */ j .L80240690 /* C52BB0 80240670 AC820028 */ sw $v0, 0x28($a0) .L80240674: /* C52BB4 80240674 1C400006 */ bgtz $v0, .L80240690 -/* C52BB8 80240678 00000000 */ nop +/* C52BB8 80240678 00000000 */ nop /* C52BBC 8024067C 8E0200CC */ lw $v0, 0xcc($s0) /* C52BC0 80240680 8C420028 */ lw $v0, 0x28($v0) /* C52BC4 80240684 A480008E */ sh $zero, 0x8e($a0) diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802406A4_C52BE4.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802406A4_C52BE4.s index 17680b3256..fb97844d84 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802406A4_C52BE4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802406A4_C52BE4.s @@ -25,7 +25,7 @@ glabel func_802406A4_C52BE4 /* C52C34 802406F4 0C01242D */ jal func_800490B4 /* C52C38 802406F8 AFA00010 */ sw $zero, 0x10($sp) /* C52C3C 802406FC 10400022 */ beqz $v0, .L80240788 -/* C52C40 80240700 00000000 */ nop +/* C52C40 80240700 00000000 */ nop /* C52C44 80240704 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C52C48 80240708 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* C52C4C 8024070C 804300B4 */ lb $v1, 0xb4($v0) @@ -49,7 +49,7 @@ glabel func_802406A4_C52BE4 /* C52C94 80240754 10620003 */ beq $v1, $v0, .L80240764 /* C52C98 80240758 24020025 */ addiu $v0, $zero, 0x25 /* C52C9C 8024075C 14620002 */ bne $v1, $v0, .L80240768 -/* C52CA0 80240760 00000000 */ nop +/* C52CA0 80240760 00000000 */ nop .L80240764: /* C52CA4 80240764 24120001 */ addiu $s2, $zero, 1 .L80240768: @@ -98,9 +98,9 @@ glabel func_802406A4_C52BE4 /* C52D3C 802407FC 8C470040 */ lw $a3, 0x40($v0) /* C52D40 80240800 3C0142A0 */ lui $at, 0x42a0 /* C52D44 80240804 44811000 */ mtc1 $at, $f2 -/* C52D48 80240808 00000000 */ nop +/* C52D48 80240808 00000000 */ nop /* C52D4C 8024080C 4602003E */ c.le.s $f0, $f2 -/* C52D50 80240810 00000000 */ nop +/* C52D50 80240810 00000000 */ nop /* C52D54 80240814 45030001 */ bc1tl .L8024081C /* C52D58 80240818 24120001 */ addiu $s2, $zero, 1 .L8024081C: @@ -122,7 +122,7 @@ glabel func_802406A4_C52BE4 /* C52D98 80240858 3C01C1A0 */ lui $at, 0xc1a0 /* C52D9C 8024085C 44812000 */ mtc1 $at, $f4 /* C52DA0 80240860 44823000 */ mtc1 $v0, $f6 -/* C52DA4 80240864 00000000 */ nop +/* C52DA4 80240864 00000000 */ nop /* C52DA8 80240868 468031A0 */ cvt.s.w $f6, $f6 /* C52DAC 8024086C 44073000 */ mfc1 $a3, $f6 /* C52DB0 80240870 8C63002C */ lw $v1, 0x2c($v1) @@ -166,7 +166,7 @@ glabel func_802406A4_C52BE4 /* C52E3C 802408FC 0C012530 */ jal func_800494C0 /* C52E40 80240900 0000302D */ daddu $a2, $zero, $zero /* C52E44 80240904 0809024F */ j .L8024093C -/* C52E48 80240908 00000000 */ nop +/* C52E48 80240908 00000000 */ nop .L8024090C: /* C52E4C 8024090C 14620005 */ bne $v1, $v0, .L80240924 /* C52E50 80240910 2402003C */ addiu $v0, $zero, 0x3c @@ -176,7 +176,7 @@ glabel func_802406A4_C52BE4 /* C52E60 80240920 AE220028 */ sw $v0, 0x28($s1) .L80240924: /* C52E64 80240924 14620005 */ bne $v1, $v0, .L8024093C -/* C52E68 80240928 00000000 */ nop +/* C52E68 80240928 00000000 */ nop /* C52E6C 8024092C 8E6200CC */ lw $v0, 0xcc($s3) /* C52E70 80240930 8C420028 */ lw $v0, 0x28($v0) /* C52E74 80240934 A620008E */ sh $zero, 0x8e($s1) diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802409C0_C52F00.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802409C0_C52F00.s index f0b4a65dd8..3115c98662 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802409C0_C52F00.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802409C0_C52F00.s @@ -16,7 +16,7 @@ glabel func_802409C0_C52F00 /* C52F2C 802409EC 0040802D */ daddu $s0, $v0, $zero /* C52F30 802409F0 C60C000C */ lwc1 $f12, 0xc($s0) /* C52F34 802409F4 44820000 */ mtc1 $v0, $f0 -/* C52F38 802409F8 00000000 */ nop +/* C52F38 802409F8 00000000 */ nop /* C52F3C 802409FC 46800020 */ cvt.s.w $f0, $f0 /* C52F40 80240A00 46006300 */ add.s $f12, $f12, $f0 /* C52F44 80240A04 3C0142B4 */ lui $at, 0x42b4 diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240A68_C52FA8.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240A68_C52FA8.s index ed6c4fd7d4..62e1bebae2 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240A68_C52FA8.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240A68_C52FA8.s @@ -22,7 +22,7 @@ glabel func_80240A68_C52FA8 /* C52FEC 80240AAC 0C01242D */ jal func_800490B4 /* C52FF0 80240AB0 0220282D */ daddu $a1, $s1, $zero /* C52FF4 80240AB4 1040000C */ beqz $v0, .L80240AE8 -/* C52FF8 80240AB8 00000000 */ nop +/* C52FF8 80240AB8 00000000 */ nop /* C52FFC 80240ABC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C53000 80240AC0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* C53004 80240AC4 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -40,7 +40,7 @@ glabel func_80240A68_C52FA8 /* C53030 80240AF0 A602008E */ sh $v0, 0x8e($s0) /* C53034 80240AF4 00021400 */ sll $v0, $v0, 0x10 /* C53038 80240AF8 1C400022 */ bgtz $v0, .L80240B84 -/* C5303C 80240AFC 00000000 */ nop +/* C5303C 80240AFC 00000000 */ nop /* C53040 80240B00 8E420074 */ lw $v0, 0x74($s2) /* C53044 80240B04 2442FFFF */ addiu $v0, $v0, -1 /* C53048 80240B08 18400014 */ blez $v0, .L80240B5C diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240BA0_C530E0.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240BA0_C530E0.s index 79513a79ec..6a51e07797 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240BA0_C530E0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240BA0_C530E0.s @@ -18,14 +18,14 @@ glabel func_80240BA0_C530E0 /* C53114 80240BD4 A462008E */ sh $v0, 0x8e($v1) /* C53118 80240BD8 00021400 */ sll $v0, $v0, 0x10 /* C5311C 80240BDC 1C400015 */ bgtz $v0, .L80240C34 -/* C53120 80240BE0 00000000 */ nop +/* C53120 80240BE0 00000000 */ nop /* C53124 80240BE4 8E0200CC */ lw $v0, 0xcc($s0) /* C53128 80240BE8 8C420004 */ lw $v0, 4($v0) /* C5312C 80240BEC AC620028 */ sw $v0, 0x28($v1) /* C53130 80240BF0 8E0200D0 */ lw $v0, 0xd0($s0) /* C53134 80240BF4 8C420014 */ lw $v0, 0x14($v0) /* C53138 80240BF8 04410004 */ bgez $v0, .L80240C0C -/* C5313C 80240BFC 00000000 */ nop +/* C5313C 80240BFC 00000000 */ nop /* C53140 80240C00 C6200000 */ lwc1 $f0, ($s1) /* C53144 80240C04 0809030B */ j .L80240C2C /* C53148 80240C08 E4600018 */ swc1 $f0, 0x18($v1) @@ -33,7 +33,7 @@ glabel func_80240BA0_C530E0 /* C5314C 80240C0C 3C018024 */ lui $at, %hi(D_802431F8) /* C53150 80240C10 D42231F8 */ ldc1 $f2, %lo(D_802431F8)($at) /* C53154 80240C14 44820000 */ mtc1 $v0, $f0 -/* C53158 80240C18 00000000 */ nop +/* C53158 80240C18 00000000 */ nop /* C5315C 80240C1C 46800021 */ cvt.d.w $f0, $f0 /* C53160 80240C20 46220003 */ div.d $f0, $f0, $f2 /* C53164 80240C24 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240C4C_C5318C.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240C4C_C5318C.s index fbfe04b938..fa4a77f6c9 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240C4C_C5318C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240C4C_C5318C.s @@ -22,7 +22,7 @@ glabel func_80240C4C_C5318C /* C531D0 80240C90 0C01242D */ jal func_800490B4 /* C531D4 80240C94 0040802D */ daddu $s0, $v0, $zero /* C531D8 80240C98 1040000C */ beqz $v0, .L80240CCC -/* C531DC 80240C9C 00000000 */ nop +/* C531DC 80240C9C 00000000 */ nop /* C531E0 80240CA0 C60C0038 */ lwc1 $f12, 0x38($s0) /* C531E4 80240CA4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C531E8 80240CA8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -45,12 +45,12 @@ glabel func_80240C4C_C5318C /* C53228 80240CE8 46802120 */ cvt.s.w $f4, $f4 /* C5322C 80240CEC 44072000 */ mfc1 $a3, $f4 /* C53230 80240CF0 0C00A7B5 */ jal dist2D -/* C53234 80240CF4 00000000 */ nop +/* C53234 80240CF4 00000000 */ nop /* C53238 80240CF8 C6020018 */ lwc1 $f2, 0x18($s0) /* C5323C 80240CFC 4602003E */ c.le.s $f0, $f2 -/* C53240 80240D00 00000000 */ nop +/* C53240 80240D00 00000000 */ nop /* C53244 80240D04 4500000B */ bc1f .L80240D34 -/* C53248 80240D08 00000000 */ nop +/* C53248 80240D08 00000000 */ nop /* C5324C 80240D0C 8E4200CC */ lw $v0, 0xcc($s2) /* C53250 80240D10 8C430000 */ lw $v1, ($v0) /* C53254 80240D14 2402000F */ addiu $v0, $zero, 0xf @@ -85,7 +85,7 @@ glabel func_80240C4C_C5318C /* C532C4 80240D84 46802120 */ cvt.s.w $f4, $f4 /* C532C8 80240D88 44072000 */ mfc1 $a3, $f4 /* C532CC 80240D8C 0C00A720 */ jal atan2 -/* C532D0 80240D90 00000000 */ nop +/* C532D0 80240D90 00000000 */ nop /* C532D4 80240D94 8E050018 */ lw $a1, 0x18($s0) /* C532D8 80240D98 44060000 */ mfc1 $a2, $f0 /* C532DC 80240D9C 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240DC4_C53304.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240DC4_C53304.s index 1eba4663ac..b005504091 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240DC4_C53304.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240DC4_C53304.s @@ -12,13 +12,13 @@ glabel func_80240DC4_C53304 /* C53320 80240DE0 0040182D */ daddu $v1, $v0, $zero /* C53324 80240DE4 8462008C */ lh $v0, 0x8c($v1) /* C53328 80240DE8 14400009 */ bnez $v0, .L80240E10 -/* C5332C 80240DEC 00000000 */ nop +/* C5332C 80240DEC 00000000 */ nop /* C53330 80240DF0 9462008E */ lhu $v0, 0x8e($v1) /* C53334 80240DF4 2442FFFF */ addiu $v0, $v0, -1 /* C53338 80240DF8 A462008E */ sh $v0, 0x8e($v1) /* C5333C 80240DFC 00021400 */ sll $v0, $v0, 0x10 /* C53340 80240E00 1C400003 */ bgtz $v0, .L80240E10 -/* C53344 80240E04 00000000 */ nop +/* C53344 80240E04 00000000 */ nop /* C53348 80240E08 A460008E */ sh $zero, 0x8e($v1) /* C5334C 80240E0C AE000070 */ sw $zero, 0x70($s0) .L80240E10: diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s index 479ea753d4..a77598ba59 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s @@ -46,7 +46,7 @@ glabel func_80240E20_C53360 /* C53404 80240EC4 8E2200B0 */ lw $v0, 0xb0($s1) /* C53408 80240EC8 30420004 */ andi $v0, $v0, 4 /* C5340C 80240ECC 10400027 */ beqz $v0, .L80240F6C -/* C53410 80240ED0 00000000 */ nop +/* C53410 80240ED0 00000000 */ nop .L80240ED4: /* C53414 80240ED4 2402001E */ addiu $v0, $zero, 0x1e /* C53418 80240ED8 2404F7FF */ addiu $a0, $zero, -0x801 @@ -94,10 +94,10 @@ glabel func_80240E20_C53360 /* C534B0 80240F70 2442FFF6 */ addiu $v0, $v0, -0xa /* C534B4 80240F74 2C420014 */ sltiu $v0, $v0, 0x14 /* C534B8 80240F78 10400009 */ beqz $v0, .L80240FA0 -/* C534BC 80240F7C 00000000 */ nop +/* C534BC 80240F7C 00000000 */ nop /* C534C0 80240F80 8E22006C */ lw $v0, 0x6c($s1) /* C534C4 80240F84 14400006 */ bnez $v0, .L80240FA0 -/* C534C8 80240F88 00000000 */ nop +/* C534C8 80240F88 00000000 */ nop /* C534CC 80240F8C 0C090082 */ jal func_80240208_C52748 /* C534D0 80240F90 0240202D */ daddu $a0, $s2, $zero /* C534D4 80240F94 10400002 */ beqz $v0, .L80240FA0 @@ -108,41 +108,47 @@ glabel func_80240E20_C53360 /* C534E4 80240FA4 2C620064 */ sltiu $v0, $v1, 0x64 /* C534E8 80240FA8 10400067 */ beqz $v0, .L80241148 /* C534EC 80240FAC 00031080 */ sll $v0, $v1, 2 -/* C534F0 80240FB0 3C018024 */ lui $at, %hi(D_80243200) +/* C534F0 80240FB0 3C018024 */ lui $at, %hi(jtbl_80243200_C55740) /* C534F4 80240FB4 00220821 */ addu $at, $at, $v0 -/* C534F8 80240FB8 8C223200 */ lw $v0, %lo(D_80243200)($at) +/* C534F8 80240FB8 8C223200 */ lw $v0, %lo(jtbl_80243200_C55740)($at) /* C534FC 80240FBC 00400008 */ jr $v0 -/* C53500 80240FC0 00000000 */ nop +/* C53500 80240FC0 00000000 */ nop +glabel L80240FC4_C53504 /* C53504 80240FC4 0240202D */ daddu $a0, $s2, $zero /* C53508 80240FC8 0260282D */ daddu $a1, $s3, $zero /* C5350C 80240FCC 0C090187 */ jal func_8024061C_C52B5C /* C53510 80240FD0 02A0302D */ daddu $a2, $s5, $zero /* C53514 80240FD4 08090452 */ j .L80241148 -/* C53518 80240FD8 00000000 */ nop +/* C53518 80240FD8 00000000 */ nop +glabel L80240FDC_C5351C /* C5351C 80240FDC 0240202D */ daddu $a0, $s2, $zero /* C53520 80240FE0 0260282D */ daddu $a1, $s3, $zero /* C53524 80240FE4 0C0901A9 */ jal func_802406A4_C52BE4 /* C53528 80240FE8 02A0302D */ daddu $a2, $s5, $zero /* C5352C 80240FEC 08090452 */ j .L80241148 -/* C53530 80240FF0 00000000 */ nop +/* C53530 80240FF0 00000000 */ nop +glabel L80240FF4_C53534 /* C53534 80240FF4 0240202D */ daddu $a0, $s2, $zero /* C53538 80240FF8 0260282D */ daddu $a1, $s3, $zero /* C5353C 80240FFC 0C090257 */ jal func_8024095C_C52E9C /* C53540 80241000 02A0302D */ daddu $a2, $s5, $zero /* C53544 80241004 08090452 */ j .L80241148 -/* C53548 80241008 00000000 */ nop +/* C53548 80241008 00000000 */ nop +glabel L8024100C_C5354C /* C5354C 8024100C 0240202D */ daddu $a0, $s2, $zero /* C53550 80241010 0260282D */ daddu $a1, $s3, $zero /* C53554 80241014 0C090270 */ jal func_802409C0_C52F00 /* C53558 80241018 02A0302D */ daddu $a2, $s5, $zero /* C5355C 8024101C 08090452 */ j .L80241148 -/* C53560 80241020 00000000 */ nop +/* C53560 80241020 00000000 */ nop +glabel L80241024_C53564 /* C53564 80241024 0240202D */ daddu $a0, $s2, $zero /* C53568 80241028 0260282D */ daddu $a1, $s3, $zero /* C5356C 8024102C 0C09029A */ jal func_80240A68_C52FA8 /* C53570 80241030 02A0302D */ daddu $a2, $s5, $zero /* C53574 80241034 08090452 */ j .L80241148 -/* C53578 80241038 00000000 */ nop +/* C53578 80241038 00000000 */ nop +glabel L8024103C_C5357C /* C5357C 8024103C 0240202D */ daddu $a0, $s2, $zero /* C53580 80241040 0260282D */ daddu $a1, $s3, $zero /* C53584 80241044 0C0127DF */ jal func_80049F7C @@ -150,13 +156,15 @@ glabel func_80240E20_C53360 /* C5358C 8024104C 8E430070 */ lw $v1, 0x70($s2) /* C53590 80241050 2402000D */ addiu $v0, $zero, 0xd /* C53594 80241054 1462003C */ bne $v1, $v0, .L80241148 -/* C53598 80241058 00000000 */ nop +/* C53598 80241058 00000000 */ nop +glabel L8024105C_C5359C /* C5359C 8024105C 0240202D */ daddu $a0, $s2, $zero /* C535A0 80241060 0260282D */ daddu $a1, $s3, $zero /* C535A4 80241064 0C012849 */ jal func_8004A124 /* C535A8 80241068 02A0302D */ daddu $a2, $s5, $zero /* C535AC 8024106C 08090452 */ j .L80241148 -/* C535B0 80241070 00000000 */ nop +/* C535B0 80241070 00000000 */ nop +glabel L80241074_C535B4 /* C535B4 80241074 0240202D */ daddu $a0, $s2, $zero /* C535B8 80241078 0260282D */ daddu $a1, $s3, $zero /* C535BC 8024107C 0C0128FA */ jal func_8004A3E8 @@ -168,26 +176,31 @@ glabel func_80240E20_C53360 /* C535D4 80241094 24020003 */ addiu $v0, $zero, 3 /* C535D8 80241098 08090452 */ j .L80241148 /* C535DC 8024109C AE420070 */ sw $v0, 0x70($s2) +glabel L802410A0_C535E0 /* C535E0 802410A0 0C090000 */ jal dgb_16_UnkNpcAIFunc6 /* C535E4 802410A4 0240202D */ daddu $a0, $s2, $zero /* C535E8 802410A8 8E430070 */ lw $v1, 0x70($s2) /* C535EC 802410AC 2402001F */ addiu $v0, $zero, 0x1f /* C535F0 802410B0 14620025 */ bne $v1, $v0, .L80241148 -/* C535F4 802410B4 00000000 */ nop +/* C535F4 802410B4 00000000 */ nop +glabel L802410B8_C535F8 /* C535F8 802410B8 0C09001B */ jal dgb_16_UnkNpcAIFunc7 /* C535FC 802410BC 0240202D */ daddu $a0, $s2, $zero /* C53600 802410C0 8E430070 */ lw $v1, 0x70($s2) /* C53604 802410C4 24020020 */ addiu $v0, $zero, 0x20 /* C53608 802410C8 1462001F */ bne $v1, $v0, .L80241148 -/* C5360C 802410CC 00000000 */ nop +/* C5360C 802410CC 00000000 */ nop +glabel L802410D0_C53610 /* C53610 802410D0 0C090037 */ jal dgb_16_UnkNpcAIFunc8 /* C53614 802410D4 0240202D */ daddu $a0, $s2, $zero /* C53618 802410D8 08090452 */ j .L80241148 -/* C5361C 802410DC 00000000 */ nop +/* C5361C 802410DC 00000000 */ nop +glabel L802410E0_C53620 /* C53620 802410E0 0C09006D */ jal dgb_16_UnkNpcAIFunc5 /* C53624 802410E4 0240202D */ daddu $a0, $s2, $zero /* C53628 802410E8 08090452 */ j .L80241148 -/* C5362C 802410EC 00000000 */ nop +/* C5362C 802410EC 00000000 */ nop +glabel L802410F0_C53630 /* C53630 802410F0 0240202D */ daddu $a0, $s2, $zero /* C53634 802410F4 0260282D */ daddu $a1, $s3, $zero /* C53638 802410F8 0C0902E8 */ jal func_80240BA0_C530E0 @@ -195,22 +208,26 @@ glabel func_80240E20_C53360 /* C53640 80241100 8E430070 */ lw $v1, 0x70($s2) /* C53644 80241104 24020029 */ addiu $v0, $zero, 0x29 /* C53648 80241108 1462000F */ bne $v1, $v0, .L80241148 -/* C5364C 8024110C 00000000 */ nop +/* C5364C 8024110C 00000000 */ nop +glabel L80241110_C53650 /* C53650 80241110 0240202D */ daddu $a0, $s2, $zero /* C53654 80241114 0260282D */ daddu $a1, $s3, $zero /* C53658 80241118 0C090313 */ jal func_80240C4C_C5318C /* C5365C 8024111C 02A0302D */ daddu $a2, $s5, $zero /* C53660 80241120 08090452 */ j .L80241148 -/* C53664 80241124 00000000 */ nop +/* C53664 80241124 00000000 */ nop +glabel L80241128_C53668 /* C53668 80241128 0240202D */ daddu $a0, $s2, $zero /* C5366C 8024112C 0260282D */ daddu $a1, $s3, $zero /* C53670 80241130 0C090371 */ jal func_80240DC4_C53304 /* C53674 80241134 02A0302D */ daddu $a2, $s5, $zero /* C53678 80241138 08090452 */ j .L80241148 -/* C5367C 8024113C 00000000 */ nop +/* C5367C 8024113C 00000000 */ nop +glabel L80241140_C53680 /* C53680 80241140 0C0129CF */ jal func_8004A73C /* C53684 80241144 0240202D */ daddu $a0, $s2, $zero .L80241148: +glabel L80241148_C53688 /* C53688 80241148 8FBF0048 */ lw $ra, 0x48($sp) /* C5368C 8024114C 8FB50044 */ lw $s5, 0x44($sp) /* C53690 80241150 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s index 761ade26fb..74dc8a2d99 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s @@ -100,78 +100,93 @@ glabel func_80241170_C536B0 /* C53814 802412D4 2C620064 */ sltiu $v0, $v1, 0x64 /* C53818 802412D8 10400048 */ beqz $v0, .L802413FC /* C5381C 802412DC 00031080 */ sll $v0, $v1, 2 -/* C53820 802412E0 3C018024 */ lui $at, %hi(D_80243390) +/* C53820 802412E0 3C018024 */ lui $at, %hi(jtbl_80243390_C558D0) /* C53824 802412E4 00220821 */ addu $at, $at, $v0 -/* C53828 802412E8 8C223390 */ lw $v0, %lo(D_80243390)($at) +/* C53828 802412E8 8C223390 */ lw $v0, %lo(jtbl_80243390_C558D0)($at) /* C5382C 802412EC 00400008 */ jr $v0 /* C53830 802412F0 00000000 */ nop +glabel L802412F4_C53834 /* C53834 802412F4 0240202D */ daddu $a0, $s2, $zero /* C53838 802412F8 0260282D */ daddu $a1, $s3, $zero /* C5383C 802412FC 0C012568 */ jal func_800495A0 /* C53840 80241300 0280302D */ daddu $a2, $s4, $zero +glabel L80241304_C53844 /* C53844 80241304 0240202D */ daddu $a0, $s2, $zero /* C53848 80241308 0260282D */ daddu $a1, $s3, $zero /* C5384C 8024130C 0C0125AE */ jal func_800496B8 /* C53850 80241310 0280302D */ daddu $a2, $s4, $zero /* C53854 80241314 080904FF */ j .L802413FC /* C53858 80241318 00000000 */ nop +glabel L8024131C_C5385C /* C5385C 8024131C 0240202D */ daddu $a0, $s2, $zero /* C53860 80241320 0260282D */ daddu $a1, $s3, $zero /* C53864 80241324 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C53868 80241328 0280302D */ daddu $a2, $s4, $zero +glabel L8024132C_C5386C /* C5386C 8024132C 0240202D */ daddu $a0, $s2, $zero /* C53870 80241330 0260282D */ daddu $a1, $s3, $zero /* C53874 80241334 0C012701 */ jal func_80049C04 /* C53878 80241338 0280302D */ daddu $a2, $s4, $zero /* C5387C 8024133C 080904FF */ j .L802413FC /* C53880 80241340 00000000 */ nop +glabel L80241344_C53884 /* C53884 80241344 0240202D */ daddu $a0, $s2, $zero /* C53888 80241348 0260282D */ daddu $a1, $s3, $zero /* C5388C 8024134C 0C01278F */ jal func_80049E3C /* C53890 80241350 0280302D */ daddu $a2, $s4, $zero +glabel L80241354_C53894 /* C53894 80241354 0240202D */ daddu $a0, $s2, $zero /* C53898 80241358 0260282D */ daddu $a1, $s3, $zero /* C5389C 8024135C 0C0127B3 */ jal func_80049ECC /* C538A0 80241360 0280302D */ daddu $a2, $s4, $zero /* C538A4 80241364 080904FF */ j .L802413FC /* C538A8 80241368 00000000 */ nop +glabel L8024136C_C538AC /* C538AC 8024136C 0240202D */ daddu $a0, $s2, $zero /* C538B0 80241370 0260282D */ daddu $a1, $s3, $zero /* C538B4 80241374 0C0127DF */ jal func_80049F7C /* C538B8 80241378 0280302D */ daddu $a2, $s4, $zero +glabel L8024137C_C538BC /* C538BC 8024137C 0240202D */ daddu $a0, $s2, $zero /* C538C0 80241380 0260282D */ daddu $a1, $s3, $zero /* C538C4 80241384 0C012849 */ jal func_8004A124 /* C538C8 80241388 0280302D */ daddu $a2, $s4, $zero /* C538CC 8024138C 080904FF */ j .L802413FC /* C538D0 80241390 00000000 */ nop +glabel L80241394_C538D4 /* C538D4 80241394 0240202D */ daddu $a0, $s2, $zero /* C538D8 80241398 0260282D */ daddu $a1, $s3, $zero /* C538DC 8024139C 0C0128FA */ jal func_8004A3E8 /* C538E0 802413A0 0280302D */ daddu $a2, $s4, $zero /* C538E4 802413A4 080904FF */ j .L802413FC /* C538E8 802413A8 00000000 */ nop +glabel L802413AC_C538EC /* C538EC 802413AC 0C090000 */ jal dgb_16_UnkNpcAIFunc6 /* C538F0 802413B0 0240202D */ daddu $a0, $s2, $zero +glabel L802413B4_C538F4 /* C538F4 802413B4 0C09001B */ jal dgb_16_UnkNpcAIFunc7 /* C538F8 802413B8 0240202D */ daddu $a0, $s2, $zero /* C538FC 802413BC 8E430070 */ lw $v1, 0x70($s2) /* C53900 802413C0 24020020 */ addiu $v0, $zero, 0x20 /* C53904 802413C4 1462000D */ bne $v1, $v0, .L802413FC /* C53908 802413C8 00000000 */ nop +glabel L802413CC_C5390C /* C5390C 802413CC 0C090037 */ jal dgb_16_UnkNpcAIFunc8 /* C53910 802413D0 0240202D */ daddu $a0, $s2, $zero /* C53914 802413D4 8E430070 */ lw $v1, 0x70($s2) /* C53918 802413D8 24020021 */ addiu $v0, $zero, 0x21 /* C5391C 802413DC 14620007 */ bne $v1, $v0, .L802413FC /* C53920 802413E0 00000000 */ nop +glabel L802413E4_C53924 /* C53924 802413E4 0C09006D */ jal dgb_16_UnkNpcAIFunc5 /* C53928 802413E8 0240202D */ daddu $a0, $s2, $zero /* C5392C 802413EC 080904FF */ j .L802413FC /* C53930 802413F0 00000000 */ nop +glabel L802413F4_C53934 /* C53934 802413F4 0C0129CF */ jal func_8004A73C /* C53938 802413F8 0240202D */ daddu $a0, $s2, $zero .L802413FC: +glabel L802413FC_C5393C /* C5393C 802413FC 8FBF0048 */ lw $ra, 0x48($sp) /* C53940 80241400 8FB50044 */ lw $s5, 0x44($sp) /* C53944 80241404 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/update_starpoints_display_C528FC.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/update_starpoints_display_C528FC.s index 2c4d284f33..cb98fd7d4c 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/update_starpoints_display_C528FC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/update_starpoints_display_C528FC.s @@ -19,7 +19,7 @@ glabel update_starpoints_display_C528FC /* C52934 802403F4 8E2200B0 */ lw $v0, 0xb0($s1) /* C52938 802403F8 30420004 */ andi $v0, $v0, 4 /* C5293C 802403FC 10400015 */ beqz $v0, .L80240454 -/* C52940 80240400 00000000 */ nop +/* C52940 80240400 00000000 */ nop .L80240404: /* C52944 80240404 AE800070 */ sw $zero, 0x70($s4) /* C52948 80240408 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel update_starpoints_display_C528FC /* C52998 80240458 12600005 */ beqz $s3, .L80240470 /* C5299C 8024045C 24020001 */ addiu $v0, $zero, 1 /* C529A0 80240460 12620048 */ beq $s3, $v0, .L80240584 -/* C529A4 80240464 00000000 */ nop +/* C529A4 80240464 00000000 */ nop /* C529A8 80240468 0809017E */ j .L802405F8 -/* C529AC 8024046C 00000000 */ nop +/* C529AC 8024046C 00000000 */ nop .L80240470: /* C529B0 80240470 86240008 */ lh $a0, 8($s1) /* C529B4 80240474 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel update_starpoints_display_C528FC /* C529D4 80240494 8E03006C */ lw $v1, 0x6c($s0) /* C529D8 80240498 24020003 */ addiu $v0, $zero, 3 /* C529DC 8024049C 14620056 */ bne $v1, $v0, .L802405F8 -/* C529E0 802404A0 00000000 */ nop +/* C529E0 802404A0 00000000 */ nop /* C529E4 802404A4 8E2500A8 */ lw $a1, 0xa8($s1) /* C529E8 802404A8 10A00003 */ beqz $a1, .L802404B8 /* C529EC 802404AC 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel update_starpoints_display_C528FC /* C52A64 80240524 C7A20014 */ lwc1 $f2, 0x14($sp) /* C52A68 80240528 4600020D */ trunc.w.s $f8, $f0 /* C52A6C 8024052C 44024000 */ mfc1 $v0, $f8 -/* C52A70 80240530 00000000 */ nop +/* C52A70 80240530 00000000 */ nop /* C52A74 80240534 A6220012 */ sh $v0, 0x12($s1) /* C52A78 80240538 4600120D */ trunc.w.s $f8, $f2 /* C52A7C 8024053C 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240000_C55F40.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240000_C55F40.s index c1373768e9..97f50ba3eb 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240000_C55F40.s +++ b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240000_C55F40.s @@ -45,7 +45,7 @@ glabel func_80240000_C55F40 /* C55FDC 8024009C 0C00A7B5 */ jal dist2D /* C55FE0 802400A0 4600B386 */ mov.s $f14, $f22 /* C55FE4 802400A4 4614003C */ c.lt.s $f0, $f20 -/* C55FE8 802400A8 00000000 */ nop +/* C55FE8 802400A8 00000000 */ nop /* C55FEC 802400AC 45000003 */ bc1f .L802400BC /* C55FF0 802400B0 2631000C */ addiu $s1, $s1, 0xc /* C55FF4 802400B4 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_80240000_C55F40 /* C56020 802400E0 8E6200D0 */ lw $v0, 0xd0($s3) /* C56024 802400E4 8C42007C */ lw $v0, 0x7c($v0) /* C56028 802400E8 04410004 */ bgez $v0, .L802400FC -/* C5602C 802400EC 00000000 */ nop +/* C5602C 802400EC 00000000 */ nop /* C56030 802400F0 C6C00000 */ lwc1 $f0, ($s6) /* C56034 802400F4 08090047 */ j .L8024011C /* C56038 802400F8 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_80240000_C55F40 /* C5603C 802400FC 3C018024 */ lui $at, %hi(D_802438E0) /* C56040 80240100 D42238E0 */ ldc1 $f2, %lo(D_802438E0)($at) /* C56044 80240104 44820000 */ mtc1 $v0, $f0 -/* C56048 80240108 00000000 */ nop +/* C56048 80240108 00000000 */ nop /* C5604C 8024010C 46800021 */ cvt.d.w $f0, $f0 /* C56050 80240110 46220003 */ div.d $f0, $f0, $f2 /* C56054 80240114 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240158_C56098.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240158_C56098.s index ef112d540e..90e80a2560 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240158_C56098.s +++ b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240158_C56098.s @@ -44,7 +44,7 @@ glabel func_80240158_C56098 /* C56134 802401F4 2402000F */ addiu $v0, $zero, 0xf /* C56138 802401F8 AFA2001C */ sw $v0, 0x1c($sp) /* C5613C 802401FC 44833000 */ mtc1 $v1, $f6 -/* C56140 80240200 00000000 */ nop +/* C56140 80240200 00000000 */ nop /* C56144 80240204 468031A0 */ cvt.s.w $f6, $f6 /* C56148 80240208 44073000 */ mfc1 $a3, $f6 /* C5614C 8024020C 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_80240158_C56098 .L8024025C: /* C5619C 8024025C 8602008C */ lh $v0, 0x8c($s0) /* C561A0 80240260 1440005D */ bnez $v0, .L802403D8 -/* C561A4 80240264 00000000 */ nop +/* C561A4 80240264 00000000 */ nop /* C561A8 80240268 C6000018 */ lwc1 $f0, 0x18($s0) /* C561AC 8024026C 3C014010 */ lui $at, 0x4010 /* C561B0 80240270 44811800 */ mtc1 $at, $f3 /* C561B4 80240274 44801000 */ mtc1 $zero, $f2 /* C561B8 80240278 46000021 */ cvt.d.s $f0, $f0 /* C561BC 8024027C 4622003C */ c.lt.d $f0, $f2 -/* C561C0 80240280 00000000 */ nop +/* C561C0 80240280 00000000 */ nop /* C561C4 80240284 45000003 */ bc1f .L80240294 /* C561C8 80240288 0200202D */ daddu $a0, $s0, $zero /* C561CC 8024028C 080900A6 */ j .L80240298 @@ -88,7 +88,7 @@ glabel func_80240158_C56098 /* C561D4 80240294 24050001 */ addiu $a1, $zero, 1 .L80240298: /* C561D8 80240298 0C00F598 */ jal func_8003D660 -/* C561DC 8024029C 00000000 */ nop +/* C561DC 8024029C 00000000 */ nop /* C561E0 802402A0 C60C0038 */ lwc1 $f12, 0x38($s0) /* C561E4 802402A4 8E430078 */ lw $v1, 0x78($s2) /* C561E8 802402A8 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_80240158_C56098 /* C56210 802402D0 4406B000 */ mfc1 $a2, $f22 /* C56214 802402D4 4407A000 */ mfc1 $a3, $f20 /* C56218 802402D8 0C00A720 */ jal atan2 -/* C5621C 802402DC 00000000 */ nop +/* C5621C 802402DC 00000000 */ nop /* C56220 802402E0 8E050018 */ lw $a1, 0x18($s0) /* C56224 802402E4 44060000 */ mfc1 $a2, $f0 /* C56228 802402E8 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_80240158_C56098 /* C5623C 802402FC 4406B000 */ mfc1 $a2, $f22 /* C56240 80240300 4407A000 */ mfc1 $a3, $f20 /* C56244 80240304 0C00A7B5 */ jal dist2D -/* C56248 80240308 00000000 */ nop +/* C56248 80240308 00000000 */ nop /* C5624C 8024030C C6020018 */ lwc1 $f2, 0x18($s0) /* C56250 80240310 4602003E */ c.le.s $f0, $f2 -/* C56254 80240314 00000000 */ nop +/* C56254 80240314 00000000 */ nop /* C56258 80240318 4500002F */ bc1f .L802403D8 /* C5625C 8024031C 240403E8 */ addiu $a0, $zero, 0x3e8 /* C56260 80240320 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_80240158_C56098 /* C562B4 80240374 18400003 */ blez $v0, .L80240384 /* C562B8 80240378 24020004 */ addiu $v0, $zero, 4 /* C562BC 8024037C 14600002 */ bnez $v1, .L80240388 -/* C562C0 80240380 00000000 */ nop +/* C562C0 80240380 00000000 */ nop .L80240384: /* C562C4 80240384 AE420070 */ sw $v0, 0x70($s2) .L80240388: diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_802404C0_C56400.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_802404C0_C56400.s index 5d45ce5521..80ba7ef140 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_802404C0_C56400.s +++ b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_802404C0_C56400.s @@ -38,7 +38,7 @@ glabel func_802404C0_C56400 /* C56484 80240544 2402000F */ addiu $v0, $zero, 0xf /* C56488 80240548 AFA2001C */ sw $v0, 0x1c($sp) /* C5648C 8024054C 44833000 */ mtc1 $v1, $f6 -/* C56490 80240550 00000000 */ nop +/* C56490 80240550 00000000 */ nop /* C56494 80240554 468031A0 */ cvt.s.w $f6, $f6 /* C56498 80240558 44073000 */ mfc1 $a3, $f6 /* C5649C 8024055C 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_802404C0_C56400 .L802405C0: /* C56500 802405C0 8602008C */ lh $v0, 0x8c($s0) /* C56504 802405C4 14400025 */ bnez $v0, .L8024065C -/* C56508 802405C8 00000000 */ nop +/* C56508 802405C8 00000000 */ nop /* C5650C 802405CC 9602008E */ lhu $v0, 0x8e($s0) /* C56510 802405D0 2442FFFF */ addiu $v0, $v0, -1 /* C56514 802405D4 A602008E */ sh $v0, 0x8e($s0) /* C56518 802405D8 00021400 */ sll $v0, $v0, 0x10 /* C5651C 802405DC 1440001F */ bnez $v0, .L8024065C -/* C56520 802405E0 00000000 */ nop +/* C56520 802405E0 00000000 */ nop /* C56524 802405E4 8E820074 */ lw $v0, 0x74($s4) /* C56528 802405E8 2442FFFF */ addiu $v0, $v0, -1 /* C5652C 802405EC 10400019 */ beqz $v0, .L80240654 @@ -84,7 +84,7 @@ glabel func_802404C0_C56400 /* C56538 802405F8 9442002A */ lhu $v0, 0x2a($v0) /* C5653C 802405FC 30420010 */ andi $v0, $v0, 0x10 /* C56540 80240600 14400007 */ bnez $v0, .L80240620 -/* C56544 80240604 00000000 */ nop +/* C56544 80240604 00000000 */ nop /* C56548 80240608 C600000C */ lwc1 $f0, 0xc($s0) /* C5654C 8024060C 3C014334 */ lui $at, 0x4334 /* C56550 80240610 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_8024067C_C565BC.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_8024067C_C565BC.s index 9211e07b66..ce1bc48443 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_8024067C_C565BC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_8024067C_C565BC.s @@ -28,7 +28,7 @@ glabel func_8024067C_C565BC /* C56614 802406D4 8E0200D0 */ lw $v0, 0xd0($s0) /* C56618 802406D8 8C42007C */ lw $v0, 0x7c($v0) /* C5661C 802406DC 04410004 */ bgez $v0, .L802406F0 -/* C56620 802406E0 00000000 */ nop +/* C56620 802406E0 00000000 */ nop /* C56624 802406E4 C6400000 */ lwc1 $f0, ($s2) /* C56628 802406E8 080901C4 */ j .L80240710 /* C5662C 802406EC E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_8024067C_C565BC /* C56630 802406F0 3C018024 */ lui $at, %hi(D_802438E8) /* C56634 802406F4 D42238E8 */ ldc1 $f2, %lo(D_802438E8)($at) /* C56638 802406F8 44820000 */ mtc1 $v0, $f0 -/* C5663C 802406FC 00000000 */ nop +/* C5663C 802406FC 00000000 */ nop /* C56640 80240700 46800021 */ cvt.d.w $f0, $f0 /* C56644 80240704 46220003 */ div.d $f0, $f0, $f2 /* C56648 80240708 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_8024081C_C5675C.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_8024081C_C5675C.s index 55115fedee..ed2033a7b0 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_8024081C_C5675C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_8024081C_C5675C.s @@ -47,20 +47,20 @@ glabel func_8024081C_C5675C /* C56804 802408C4 8E02001C */ lw $v0, 0x1c($s0) /* C56808 802408C8 46001005 */ abs.s $f0, $f2 /* C5680C 802408CC 44822000 */ mtc1 $v0, $f4 -/* C56810 802408D0 00000000 */ nop +/* C56810 802408D0 00000000 */ nop /* C56814 802408D4 46802120 */ cvt.s.w $f4, $f4 /* C56818 802408D8 4600203C */ c.lt.s $f4, $f0 -/* C5681C 802408DC 00000000 */ nop +/* C5681C 802408DC 00000000 */ nop /* C56820 802408E0 4500000D */ bc1f .L80240918 -/* C56824 802408E4 00000000 */ nop +/* C56824 802408E4 00000000 */ nop /* C56828 802408E8 44800000 */ mtc1 $zero, $f0 /* C5682C 802408EC C654000C */ lwc1 $f20, 0xc($s2) /* C56830 802408F0 4600103C */ c.lt.s $f2, $f0 -/* C56834 802408F4 00000000 */ nop +/* C56834 802408F4 00000000 */ nop /* C56838 802408F8 45000006 */ bc1f .L80240914 /* C5683C 802408FC 00021023 */ negu $v0, $v0 /* C56840 80240900 44820000 */ mtc1 $v0, $f0 -/* C56844 80240904 00000000 */ nop +/* C56844 80240904 00000000 */ nop /* C56848 80240908 46800020 */ cvt.s.w $f0, $f0 /* C5684C 8024090C 08090246 */ j .L80240918 /* C56850 80240910 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_8024094C_C5688C.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_8024094C_C5688C.s index 529ba84707..531a476cac 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_8024094C_C5688C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_8024094C_C5688C.s @@ -37,7 +37,7 @@ glabel func_8024094C_C5688C /* C5690C 802409CC 2402000F */ addiu $v0, $zero, 0xf /* C56910 802409D0 AFA2001C */ sw $v0, 0x1c($sp) /* C56914 802409D4 44833000 */ mtc1 $v1, $f6 -/* C56918 802409D8 00000000 */ nop +/* C56918 802409D8 00000000 */ nop /* C5691C 802409DC 468031A0 */ cvt.s.w $f6, $f6 /* C56920 802409E0 44073000 */ mfc1 $a3, $f6 /* C56924 802409E4 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240AD4_C56A14.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240AD4_C56A14.s index 7ca7f0d074..c9b47fb370 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240AD4_C56A14.s +++ b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240AD4_C56A14.s @@ -28,7 +28,7 @@ glabel func_80240AD4_C56A14 /* C56A6C 80240B2C C4400008 */ lwc1 $f0, 8($v0) /* C56A70 80240B30 46800020 */ cvt.s.w $f0, $f0 /* C56A74 80240B34 4602003E */ c.le.s $f0, $f2 -/* C56A78 80240B38 00000000 */ nop +/* C56A78 80240B38 00000000 */ nop /* C56A7C 80240B3C 45020003 */ bc1fl .L80240B4C /* C56A80 80240B40 24840001 */ addiu $a0, $a0, 1 /* C56A84 80240B44 080902D7 */ j .L80240B5C diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s index dfd0986dfb..a5b9169b4c 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s @@ -46,7 +46,7 @@ glabel func_80240B94_C56AD4 /* C56B78 80240C38 8E2200B0 */ lw $v0, 0xb0($s1) /* C56B7C 80240C3C 30420004 */ andi $v0, $v0, 4 /* C56B80 80240C40 10400044 */ beqz $v0, .L80240D54 -/* C56B84 80240C44 00000000 */ nop +/* C56B84 80240C44 00000000 */ nop .L80240C48: /* C56B88 80240C48 2404F7FF */ addiu $a0, $zero, -0x801 /* C56B8C 80240C4C AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80240B94_C56AD4 /* C56C40 80240D00 3C0142C8 */ lui $at, 0x42c8 /* C56C44 80240D04 44812000 */ mtc1 $at, $f4 /* C56C48 80240D08 44823000 */ mtc1 $v0, $f6 -/* C56C4C 80240D0C 00000000 */ nop +/* C56C4C 80240D0C 00000000 */ nop /* C56C50 80240D10 468031A0 */ cvt.s.w $f6, $f6 /* C56C54 80240D14 27A20044 */ addiu $v0, $sp, 0x44 /* C56C58 80240D18 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80240B94_C56AD4 /* C56C7C 80240D3C 0C0372DF */ jal func_800DCB7C /* C56C80 80240D40 27A70040 */ addiu $a3, $sp, 0x40 /* C56C84 80240D44 10400003 */ beqz $v0, .L80240D54 -/* C56C88 80240D48 00000000 */ nop +/* C56C88 80240D48 00000000 */ nop /* C56C8C 80240D4C C7A0003C */ lwc1 $f0, 0x3c($sp) /* C56C90 80240D50 E640003C */ swc1 $f0, 0x3c($s2) .L80240D54: @@ -124,72 +124,85 @@ glabel func_80240B94_C56AD4 /* C56C98 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 /* C56C9C 80240D5C 10400042 */ beqz $v0, .L80240E68 /* C56CA0 80240D60 00031080 */ sll $v0, $v1, 2 -/* C56CA4 80240D64 3C018024 */ lui $at, %hi(func_802438F0_C436A0) +/* C56CA4 80240D64 3C018024 */ lui $at, %hi(jtbl_802438F0_C59830) /* C56CA8 80240D68 00220821 */ addu $at, $at, $v0 -/* C56CAC 80240D6C 8C2238F0 */ lw $v0, %lo(func_802438F0_C436A0)($at) +/* C56CAC 80240D6C 8C2238F0 */ lw $v0, %lo(jtbl_802438F0_C59830)($at) /* C56CB0 80240D70 00400008 */ jr $v0 -/* C56CB4 80240D74 00000000 */ nop +/* C56CB4 80240D74 00000000 */ nop +glabel L80240D78_C56CB8 /* C56CB8 80240D78 0280202D */ daddu $a0, $s4, $zero /* C56CBC 80240D7C 0260282D */ daddu $a1, $s3, $zero /* C56CC0 80240D80 0C090000 */ jal func_80240000_C55F40 /* C56CC4 80240D84 02A0302D */ daddu $a2, $s5, $zero +glabel L80240D88_C56CC8 /* C56CC8 80240D88 0280202D */ daddu $a0, $s4, $zero /* C56CCC 80240D8C 0260282D */ daddu $a1, $s3, $zero /* C56CD0 80240D90 0C090056 */ jal func_80240158_C56098 /* C56CD4 80240D94 02A0302D */ daddu $a2, $s5, $zero /* C56CD8 80240D98 0809039A */ j .L80240E68 -/* C56CDC 80240D9C 00000000 */ nop +/* C56CDC 80240D9C 00000000 */ nop +glabel L80240DA0_C56CE0 /* C56CE0 80240DA0 0280202D */ daddu $a0, $s4, $zero /* C56CE4 80240DA4 0260282D */ daddu $a1, $s3, $zero /* C56CE8 80240DA8 0C090100 */ jal dgb_18_UnkNpcAIFunc1 /* C56CEC 80240DAC 02A0302D */ daddu $a2, $s5, $zero +glabel L80240DB0_C56CF0 /* C56CF0 80240DB0 0280202D */ daddu $a0, $s4, $zero /* C56CF4 80240DB4 0260282D */ daddu $a1, $s3, $zero /* C56CF8 80240DB8 0C090130 */ jal func_802404C0_C56400 /* C56CFC 80240DBC 02A0302D */ daddu $a2, $s5, $zero /* C56D00 80240DC0 0809039A */ j .L80240E68 -/* C56D04 80240DC4 00000000 */ nop +/* C56D04 80240DC4 00000000 */ nop +glabel L80240DC8_C56D08 /* C56D08 80240DC8 0280202D */ daddu $a0, $s4, $zero /* C56D0C 80240DCC 0260282D */ daddu $a1, $s3, $zero /* C56D10 80240DD0 0C09019F */ jal func_8024067C_C565BC /* C56D14 80240DD4 02A0302D */ daddu $a2, $s5, $zero /* C56D18 80240DD8 0809039A */ j .L80240E68 -/* C56D1C 80240DDC 00000000 */ nop +/* C56D1C 80240DDC 00000000 */ nop +glabel L80240DE0_C56D20 /* C56D20 80240DE0 0280202D */ daddu $a0, $s4, $zero /* C56D24 80240DE4 0260282D */ daddu $a1, $s3, $zero /* C56D28 80240DE8 0C0901CC */ jal dgb_18_NpcJumpFunc2 /* C56D2C 80240DEC 02A0302D */ daddu $a2, $s5, $zero +glabel L80240DF0_C56D30 /* C56D30 80240DF0 0280202D */ daddu $a0, $s4, $zero /* C56D34 80240DF4 0260282D */ daddu $a1, $s3, $zero /* C56D38 80240DF8 0C0901E9 */ jal dgb_18_NpcJumpFunc /* C56D3C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* C56D40 80240E00 0809039A */ j .L80240E68 -/* C56D44 80240E04 00000000 */ nop +/* C56D44 80240E04 00000000 */ nop +glabel L80240E08_C56D48 /* C56D48 80240E08 0280202D */ daddu $a0, $s4, $zero /* C56D4C 80240E0C 0260282D */ daddu $a1, $s3, $zero /* C56D50 80240E10 0C090207 */ jal func_8024081C_C5675C /* C56D54 80240E14 02A0302D */ daddu $a2, $s5, $zero +glabel L80240E18_C56D58 /* C56D58 80240E18 0280202D */ daddu $a0, $s4, $zero /* C56D5C 80240E1C 0260282D */ daddu $a1, $s3, $zero /* C56D60 80240E20 0C090253 */ jal func_8024094C_C5688C /* C56D64 80240E24 02A0302D */ daddu $a2, $s5, $zero /* C56D68 80240E28 0809039A */ j .L80240E68 -/* C56D6C 80240E2C 00000000 */ nop +/* C56D6C 80240E2C 00000000 */ nop +glabel L80240E30_C56D70 /* C56D70 80240E30 0280202D */ daddu $a0, $s4, $zero /* C56D74 80240E34 0260282D */ daddu $a1, $s3, $zero /* C56D78 80240E38 0C09029B */ jal dgb_18_UnkNpcDurationFlagFunc /* C56D7C 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* C56D80 80240E40 0809039A */ j .L80240E68 -/* C56D84 80240E44 00000000 */ nop +/* C56D84 80240E44 00000000 */ nop +glabel L80240E48_C56D88 /* C56D88 80240E48 0280202D */ daddu $a0, $s4, $zero /* C56D8C 80240E4C 0260282D */ daddu $a1, $s3, $zero /* C56D90 80240E50 0C0902B5 */ jal func_80240AD4_C56A14 /* C56D94 80240E54 02A0302D */ daddu $a2, $s5, $zero /* C56D98 80240E58 0809039A */ j .L80240E68 -/* C56D9C 80240E5C 00000000 */ nop +/* C56D9C 80240E5C 00000000 */ nop +glabel L80240E60_C56DA0 /* C56DA0 80240E60 0C0129CF */ jal func_8004A73C /* C56DA4 80240E64 0280202D */ daddu $a0, $s4, $zero .L80240E68: +glabel L80240E68_C56DA8 /* C56DA8 80240E68 8FBF0060 */ lw $ra, 0x60($sp) /* C56DAC 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) /* C56DB0 80240E70 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240EBC_C56DFC.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240EBC_C56DFC.s index 7df4bc968f..f6ce713194 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240EBC_C56DFC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240EBC_C56DFC.s @@ -34,10 +34,10 @@ glabel func_80240EBC_C56DFC .L80240F30: /* C56E70 80240F30 8E620074 */ lw $v0, 0x74($s3) /* C56E74 80240F34 1440000F */ bnez $v0, .L80240F74 -/* C56E78 80240F38 00000000 */ nop +/* C56E78 80240F38 00000000 */ nop /* C56E7C 80240F3C 8622008E */ lh $v0, 0x8e($s1) /* C56E80 80240F40 14400009 */ bnez $v0, .L80240F68 -/* C56E84 80240F44 00000000 */ nop +/* C56E84 80240F44 00000000 */ nop /* C56E88 80240F48 C62C0038 */ lwc1 $f12, 0x38($s1) /* C56E8C 80240F4C C62E0040 */ lwc1 $f14, 0x40($s1) /* C56E90 80240F50 8E860028 */ lw $a2, 0x28($s4) @@ -64,5 +64,5 @@ glabel func_80240EBC_C56DFC /* C56EDC 80240F9C 0000102D */ daddu $v0, $zero, $zero /* C56EE0 80240FA0 03E00008 */ jr $ra /* C56EE4 80240FA4 27BD0028 */ addiu $sp, $sp, 0x28 -/* C56EE8 80240FA8 00000000 */ nop -/* C56EEC 80240FAC 00000000 */ nop +/* C56EE8 80240FA8 00000000 */ nop +/* C56EEC 80240FAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/func_80240FB0_C56EF0.s b/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/func_80240FB0_C56EF0.s index d81144a00b..f630852543 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/func_80240FB0_C56EF0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/func_80240FB0_C56EF0.s @@ -26,7 +26,7 @@ glabel func_80240FB0_C56EF0 /* C56F40 80241000 1440FFFA */ bnez $v0, .L80240FEC /* C56F44 80241004 24A50004 */ addiu $a1, $a1, 4 /* C56F48 80241008 08090413 */ j .L8024104C -/* C56F4C 8024100C 00000000 */ nop +/* C56F4C 8024100C 00000000 */ nop .L80241010: /* C56F50 80241010 0000182D */ daddu $v1, $zero, $zero /* C56F54 80241014 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B200/func_80240034_95B234.s b/asm/nonmatchings/world/area_dro/dro_01/95B200/func_80240034_95B234.s index df14ec29ae..4456baeb55 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B200/func_80240034_95B234.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B200/func_80240034_95B234.s @@ -22,16 +22,16 @@ glabel func_80240034_95B234 /* 95B274 80240074 00021023 */ negu $v0, $v0 .L80240078: /* 95B278 80240078 14400003 */ bnez $v0, .L80240088 -/* 95B27C 8024007C 00000000 */ nop +/* 95B27C 8024007C 00000000 */ nop /* 95B280 80240080 50E00017 */ beql $a3, $zero, .L802400E0 /* 95B284 80240084 0000102D */ daddu $v0, $zero, $zero .L80240088: /* 95B288 80240088 44822000 */ mtc1 $v0, $f4 -/* 95B28C 8024008C 00000000 */ nop +/* 95B28C 8024008C 00000000 */ nop /* 95B290 80240090 46802120 */ cvt.s.w $f4, $f4 /* 95B294 80240094 44062000 */ mfc1 $a2, $f4 /* 95B298 80240098 44872000 */ mtc1 $a3, $f4 -/* 95B29C 8024009C 00000000 */ nop +/* 95B29C 8024009C 00000000 */ nop /* 95B2A0 802400A0 46802120 */ cvt.s.w $f4, $f4 /* 95B2A4 802400A4 44806000 */ mtc1 $zero, $f12 /* 95B2A8 802400A8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240034_95B234 /* 95B2B0 802400B0 46006386 */ mov.s $f14, $f12 /* 95B2B4 802400B4 3C014270 */ lui $at, 0x4270 /* 95B2B8 802400B8 44811000 */ mtc1 $at, $f2 -/* 95B2BC 802400BC 00000000 */ nop +/* 95B2BC 802400BC 00000000 */ nop /* 95B2C0 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 95B2C4 802400C4 00000000 */ nop +/* 95B2C4 802400C4 00000000 */ nop /* 95B2C8 802400C8 45000004 */ bc1f .L802400DC /* 95B2CC 802400CC 24020001 */ addiu $v0, $zero, 1 /* 95B2D0 802400D0 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B200/func_802402E0_95B4E0.s b/asm/nonmatchings/world/area_dro/dro_01/95B200/func_802402E0_95B4E0.s index 37fc1ceec1..e2fcee11f8 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B200/func_802402E0_95B4E0.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B200/func_802402E0_95B4E0.s @@ -37,12 +37,12 @@ glabel func_802402E0_95B4E0 /* 95B55C 8024035C 12400007 */ beqz $s2, .L8024037C /* 95B560 80240360 3412FFFF */ ori $s2, $zero, 0xffff /* 95B564 80240364 080900FB */ j .L802403EC -/* 95B568 80240368 00000000 */ nop +/* 95B568 80240368 00000000 */ nop .L8024036C: /* 95B56C 8024036C 1242001B */ beq $s2, $v0, .L802403DC /* 95B570 80240370 24020002 */ addiu $v0, $zero, 2 /* 95B574 80240374 080900FB */ j .L802403EC -/* 95B578 80240378 00000000 */ nop +/* 95B578 80240378 00000000 */ nop .L8024037C: /* 95B57C 8024037C 8E040000 */ lw $a0, ($s0) /* 95B580 80240380 1092001A */ beq $a0, $s2, .L802403EC @@ -56,7 +56,7 @@ glabel func_802402E0_95B4E0 /* 95B5A0 802403A0 0C046F1F */ jal func_8011BC7C /* 95B5A4 802403A4 0220302D */ daddu $a2, $s1, $zero /* 95B5A8 802403A8 080900DF */ j .L8024037C -/* 95B5AC 802403AC 00000000 */ nop +/* 95B5AC 802403AC 00000000 */ nop .L802403B0: /* 95B5B0 802403B0 3412FFFF */ ori $s2, $zero, 0xffff .L802403B4: @@ -69,7 +69,7 @@ glabel func_802402E0_95B4E0 /* 95B5CC 802403CC 0C046E54 */ jal func_8011B950 /* 95B5D0 802403D0 0000382D */ daddu $a3, $zero, $zero /* 95B5D4 802403D4 080900ED */ j .L802403B4 -/* 95B5D8 802403D8 00000000 */ nop +/* 95B5D8 802403D8 00000000 */ nop .L802403DC: /* 95B5DC 802403DC 3C028015 */ lui $v0, %hi(D_801512F0) /* 95B5E0 802403E0 8C4212F0 */ lw $v0, %lo(D_801512F0)($v0) diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B200/func_80240404_95B604.s b/asm/nonmatchings/world/area_dro/dro_01/95B200/func_80240404_95B604.s index 252440ab76..99b679934b 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B200/func_80240404_95B604.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B200/func_80240404_95B604.s @@ -71,20 +71,20 @@ glabel func_80240404_95B604 /* 95B70C 8024050C 12620008 */ beq $s3, $v0, .L80240530 /* 95B710 80240510 32C400FF */ andi $a0, $s6, 0xff /* 95B714 80240514 08090169 */ j .L802405A4 -/* 95B718 80240518 00000000 */ nop +/* 95B718 80240518 00000000 */ nop .L8024051C: /* 95B71C 8024051C 24020003 */ addiu $v0, $zero, 3 /* 95B720 80240520 12620018 */ beq $s3, $v0, .L80240584 /* 95B724 80240524 32C400FF */ andi $a0, $s6, 0xff /* 95B728 80240528 08090169 */ j .L802405A4 -/* 95B72C 8024052C 00000000 */ nop +/* 95B72C 8024052C 00000000 */ nop .L80240530: /* 95B730 80240530 32A500FF */ andi $a1, $s5, 0xff /* 95B734 80240534 328600FF */ andi $a2, $s4, 0xff /* 95B738 80240538 0C046F97 */ jal set_background_color_blend /* 95B73C 8024053C 324700FF */ andi $a3, $s2, 0xff /* 95B740 80240540 08090169 */ j .L802405A4 -/* 95B744 80240544 00000000 */ nop +/* 95B744 80240544 00000000 */ nop .L80240548: /* 95B748 80240548 32C400FF */ andi $a0, $s6, 0xff /* 95B74C 8024054C 32A500FF */ andi $a1, $s5, 0xff @@ -100,7 +100,7 @@ glabel func_80240404_95B604 /* 95B774 80240574 0C046FAD */ jal func_8011BEB4 /* 95B778 80240578 AFA20018 */ sw $v0, 0x18($sp) /* 95B77C 8024057C 08090169 */ j .L802405A4 -/* 95B780 80240580 00000000 */ nop +/* 95B780 80240580 00000000 */ nop .L80240584: /* 95B784 80240584 32A500FF */ andi $a1, $s5, 0xff /* 95B788 80240588 328600FF */ andi $a2, $s4, 0xff @@ -124,5 +124,5 @@ glabel func_80240404_95B604 /* 95B7CC 802405CC 24020002 */ addiu $v0, $zero, 2 /* 95B7D0 802405D0 03E00008 */ jr $ra /* 95B7D4 802405D4 27BD0058 */ addiu $sp, $sp, 0x58 -/* 95B7D8 802405D8 00000000 */ nop -/* 95B7DC 802405DC 00000000 */ nop +/* 95B7D8 802405D8 00000000 */ nop +/* 95B7DC 802405DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802405E0_95B7E0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802405E0_95B7E0.s index 84485f19c8..84b1a7df2c 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802405E0_95B7E0.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802405E0_95B7E0.s @@ -45,7 +45,7 @@ glabel func_802405E0_95B7E0 /* 95B87C 8024067C 0C00A7B5 */ jal dist2D /* 95B880 80240680 4600B386 */ mov.s $f14, $f22 /* 95B884 80240684 4614003C */ c.lt.s $f0, $f20 -/* 95B888 80240688 00000000 */ nop +/* 95B888 80240688 00000000 */ nop /* 95B88C 8024068C 45000003 */ bc1f .L8024069C /* 95B890 80240690 2631000C */ addiu $s1, $s1, 0xc /* 95B894 80240694 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_802405E0_95B7E0 /* 95B8C0 802406C0 8E6200D0 */ lw $v0, 0xd0($s3) /* 95B8C4 802406C4 8C42007C */ lw $v0, 0x7c($v0) /* 95B8C8 802406C8 04410004 */ bgez $v0, .L802406DC -/* 95B8CC 802406CC 00000000 */ nop +/* 95B8CC 802406CC 00000000 */ nop /* 95B8D0 802406D0 C6C00000 */ lwc1 $f0, ($s6) /* 95B8D4 802406D4 080901BF */ j .L802406FC /* 95B8D8 802406D8 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_802405E0_95B7E0 /* 95B8DC 802406DC 3C018025 */ lui $at, %hi(D_8024DDE0) /* 95B8E0 802406E0 D422DDE0 */ ldc1 $f2, %lo(D_8024DDE0)($at) /* 95B8E4 802406E4 44820000 */ mtc1 $v0, $f0 -/* 95B8E8 802406E8 00000000 */ nop +/* 95B8E8 802406E8 00000000 */ nop /* 95B8EC 802406EC 46800021 */ cvt.d.w $f0, $f0 /* 95B8F0 802406F0 46220003 */ div.d $f0, $f0, $f2 /* 95B8F4 802406F4 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240738_95B938.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240738_95B938.s index 41e2d96ab7..daf03a85da 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240738_95B938.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240738_95B938.s @@ -44,7 +44,7 @@ glabel func_80240738_95B938 /* 95B9D4 802407D4 2402000F */ addiu $v0, $zero, 0xf /* 95B9D8 802407D8 AFA2001C */ sw $v0, 0x1c($sp) /* 95B9DC 802407DC 44833000 */ mtc1 $v1, $f6 -/* 95B9E0 802407E0 00000000 */ nop +/* 95B9E0 802407E0 00000000 */ nop /* 95B9E4 802407E4 468031A0 */ cvt.s.w $f6, $f6 /* 95B9E8 802407E8 44073000 */ mfc1 $a3, $f6 /* 95B9EC 802407EC 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_80240738_95B938 .L8024083C: /* 95BA3C 8024083C 8602008C */ lh $v0, 0x8c($s0) /* 95BA40 80240840 1440005D */ bnez $v0, .L802409B8 -/* 95BA44 80240844 00000000 */ nop +/* 95BA44 80240844 00000000 */ nop /* 95BA48 80240848 C6000018 */ lwc1 $f0, 0x18($s0) /* 95BA4C 8024084C 3C014010 */ lui $at, 0x4010 /* 95BA50 80240850 44811800 */ mtc1 $at, $f3 /* 95BA54 80240854 44801000 */ mtc1 $zero, $f2 /* 95BA58 80240858 46000021 */ cvt.d.s $f0, $f0 /* 95BA5C 8024085C 4622003C */ c.lt.d $f0, $f2 -/* 95BA60 80240860 00000000 */ nop +/* 95BA60 80240860 00000000 */ nop /* 95BA64 80240864 45000003 */ bc1f .L80240874 /* 95BA68 80240868 0200202D */ daddu $a0, $s0, $zero /* 95BA6C 8024086C 0809021E */ j .L80240878 @@ -88,7 +88,7 @@ glabel func_80240738_95B938 /* 95BA74 80240874 24050001 */ addiu $a1, $zero, 1 .L80240878: /* 95BA78 80240878 0C00F598 */ jal func_8003D660 -/* 95BA7C 8024087C 00000000 */ nop +/* 95BA7C 8024087C 00000000 */ nop /* 95BA80 80240880 C60C0038 */ lwc1 $f12, 0x38($s0) /* 95BA84 80240884 8E430078 */ lw $v1, 0x78($s2) /* 95BA88 80240888 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_80240738_95B938 /* 95BAB0 802408B0 4406B000 */ mfc1 $a2, $f22 /* 95BAB4 802408B4 4407A000 */ mfc1 $a3, $f20 /* 95BAB8 802408B8 0C00A720 */ jal atan2 -/* 95BABC 802408BC 00000000 */ nop +/* 95BABC 802408BC 00000000 */ nop /* 95BAC0 802408C0 8E050018 */ lw $a1, 0x18($s0) /* 95BAC4 802408C4 44060000 */ mfc1 $a2, $f0 /* 95BAC8 802408C8 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_80240738_95B938 /* 95BADC 802408DC 4406B000 */ mfc1 $a2, $f22 /* 95BAE0 802408E0 4407A000 */ mfc1 $a3, $f20 /* 95BAE4 802408E4 0C00A7B5 */ jal dist2D -/* 95BAE8 802408E8 00000000 */ nop +/* 95BAE8 802408E8 00000000 */ nop /* 95BAEC 802408EC C6020018 */ lwc1 $f2, 0x18($s0) /* 95BAF0 802408F0 4602003E */ c.le.s $f0, $f2 -/* 95BAF4 802408F4 00000000 */ nop +/* 95BAF4 802408F4 00000000 */ nop /* 95BAF8 802408F8 4500002F */ bc1f .L802409B8 /* 95BAFC 802408FC 240403E8 */ addiu $a0, $zero, 0x3e8 /* 95BB00 80240900 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_80240738_95B938 /* 95BB54 80240954 18400003 */ blez $v0, .L80240964 /* 95BB58 80240958 24020004 */ addiu $v0, $zero, 4 /* 95BB5C 8024095C 14600002 */ bnez $v1, .L80240968 -/* 95BB60 80240960 00000000 */ nop +/* 95BB60 80240960 00000000 */ nop .L80240964: /* 95BB64 80240964 AE420070 */ sw $v0, 0x70($s2) .L80240968: diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240AA0_95BCA0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240AA0_95BCA0.s index 7e72cece0a..1df6780c64 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240AA0_95BCA0.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240AA0_95BCA0.s @@ -38,7 +38,7 @@ glabel func_80240AA0_95BCA0 /* 95BD24 80240B24 2402000F */ addiu $v0, $zero, 0xf /* 95BD28 80240B28 AFA2001C */ sw $v0, 0x1c($sp) /* 95BD2C 80240B2C 44833000 */ mtc1 $v1, $f6 -/* 95BD30 80240B30 00000000 */ nop +/* 95BD30 80240B30 00000000 */ nop /* 95BD34 80240B34 468031A0 */ cvt.s.w $f6, $f6 /* 95BD38 80240B38 44073000 */ mfc1 $a3, $f6 /* 95BD3C 80240B3C 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_80240AA0_95BCA0 .L80240BA0: /* 95BDA0 80240BA0 8602008C */ lh $v0, 0x8c($s0) /* 95BDA4 80240BA4 14400025 */ bnez $v0, .L80240C3C -/* 95BDA8 80240BA8 00000000 */ nop +/* 95BDA8 80240BA8 00000000 */ nop /* 95BDAC 80240BAC 9602008E */ lhu $v0, 0x8e($s0) /* 95BDB0 80240BB0 2442FFFF */ addiu $v0, $v0, -1 /* 95BDB4 80240BB4 A602008E */ sh $v0, 0x8e($s0) /* 95BDB8 80240BB8 00021400 */ sll $v0, $v0, 0x10 /* 95BDBC 80240BBC 1440001F */ bnez $v0, .L80240C3C -/* 95BDC0 80240BC0 00000000 */ nop +/* 95BDC0 80240BC0 00000000 */ nop /* 95BDC4 80240BC4 8E820074 */ lw $v0, 0x74($s4) /* 95BDC8 80240BC8 2442FFFF */ addiu $v0, $v0, -1 /* 95BDCC 80240BCC 10400019 */ beqz $v0, .L80240C34 @@ -84,7 +84,7 @@ glabel func_80240AA0_95BCA0 /* 95BDD8 80240BD8 9442002A */ lhu $v0, 0x2a($v0) /* 95BDDC 80240BDC 30420010 */ andi $v0, $v0, 0x10 /* 95BDE0 80240BE0 14400007 */ bnez $v0, .L80240C00 -/* 95BDE4 80240BE4 00000000 */ nop +/* 95BDE4 80240BE4 00000000 */ nop /* 95BDE8 80240BE8 C600000C */ lwc1 $f0, 0xc($s0) /* 95BDEC 80240BEC 3C014334 */ lui $at, 0x4334 /* 95BDF0 80240BF0 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240C5C_95BE5C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240C5C_95BE5C.s index f2d2aa7928..e312353380 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240C5C_95BE5C.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240C5C_95BE5C.s @@ -28,7 +28,7 @@ glabel func_80240C5C_95BE5C /* 95BEB4 80240CB4 8E0200D0 */ lw $v0, 0xd0($s0) /* 95BEB8 80240CB8 8C42007C */ lw $v0, 0x7c($v0) /* 95BEBC 80240CBC 04410004 */ bgez $v0, .L80240CD0 -/* 95BEC0 80240CC0 00000000 */ nop +/* 95BEC0 80240CC0 00000000 */ nop /* 95BEC4 80240CC4 C6400000 */ lwc1 $f0, ($s2) /* 95BEC8 80240CC8 0809033C */ j .L80240CF0 /* 95BECC 80240CCC E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_80240C5C_95BE5C /* 95BED0 80240CD0 3C018025 */ lui $at, %hi(D_8024DDE8) /* 95BED4 80240CD4 D422DDE8 */ ldc1 $f2, %lo(D_8024DDE8)($at) /* 95BED8 80240CD8 44820000 */ mtc1 $v0, $f0 -/* 95BEDC 80240CDC 00000000 */ nop +/* 95BEDC 80240CDC 00000000 */ nop /* 95BEE0 80240CE0 46800021 */ cvt.d.w $f0, $f0 /* 95BEE4 80240CE4 46220003 */ div.d $f0, $f0, $f2 /* 95BEE8 80240CE8 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240DFC_95BFFC.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240DFC_95BFFC.s index 2e049467a1..b3a26f8cf8 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240DFC_95BFFC.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240DFC_95BFFC.s @@ -47,20 +47,20 @@ glabel func_80240DFC_95BFFC /* 95C0A4 80240EA4 8E02001C */ lw $v0, 0x1c($s0) /* 95C0A8 80240EA8 46001005 */ abs.s $f0, $f2 /* 95C0AC 80240EAC 44822000 */ mtc1 $v0, $f4 -/* 95C0B0 80240EB0 00000000 */ nop +/* 95C0B0 80240EB0 00000000 */ nop /* 95C0B4 80240EB4 46802120 */ cvt.s.w $f4, $f4 /* 95C0B8 80240EB8 4600203C */ c.lt.s $f4, $f0 -/* 95C0BC 80240EBC 00000000 */ nop +/* 95C0BC 80240EBC 00000000 */ nop /* 95C0C0 80240EC0 4500000D */ bc1f .L80240EF8 -/* 95C0C4 80240EC4 00000000 */ nop +/* 95C0C4 80240EC4 00000000 */ nop /* 95C0C8 80240EC8 44800000 */ mtc1 $zero, $f0 /* 95C0CC 80240ECC C654000C */ lwc1 $f20, 0xc($s2) /* 95C0D0 80240ED0 4600103C */ c.lt.s $f2, $f0 -/* 95C0D4 80240ED4 00000000 */ nop +/* 95C0D4 80240ED4 00000000 */ nop /* 95C0D8 80240ED8 45000006 */ bc1f .L80240EF4 /* 95C0DC 80240EDC 00021023 */ negu $v0, $v0 /* 95C0E0 80240EE0 44820000 */ mtc1 $v0, $f0 -/* 95C0E4 80240EE4 00000000 */ nop +/* 95C0E4 80240EE4 00000000 */ nop /* 95C0E8 80240EE8 46800020 */ cvt.s.w $f0, $f0 /* 95C0EC 80240EEC 080903BE */ j .L80240EF8 /* 95C0F0 80240EF0 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240F2C_95C12C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240F2C_95C12C.s index 251f84a206..e0a1f5a9d8 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240F2C_95C12C.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240F2C_95C12C.s @@ -37,7 +37,7 @@ glabel func_80240F2C_95C12C /* 95C1AC 80240FAC 2402000F */ addiu $v0, $zero, 0xf /* 95C1B0 80240FB0 AFA2001C */ sw $v0, 0x1c($sp) /* 95C1B4 80240FB4 44833000 */ mtc1 $v1, $f6 -/* 95C1B8 80240FB8 00000000 */ nop +/* 95C1B8 80240FB8 00000000 */ nop /* 95C1BC 80240FBC 468031A0 */ cvt.s.w $f6, $f6 /* 95C1C0 80240FC0 44073000 */ mfc1 $a3, $f6 /* 95C1C4 80240FC4 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802410B4_95C2B4.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802410B4_95C2B4.s index cb8d57ad40..f880b8f5f1 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802410B4_95C2B4.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802410B4_95C2B4.s @@ -28,7 +28,7 @@ glabel func_802410B4_95C2B4 /* 95C30C 8024110C C4400008 */ lwc1 $f0, 8($v0) /* 95C310 80241110 46800020 */ cvt.s.w $f0, $f0 /* 95C314 80241114 4602003E */ c.le.s $f0, $f2 -/* 95C318 80241118 00000000 */ nop +/* 95C318 80241118 00000000 */ nop /* 95C31C 8024111C 45020003 */ bc1fl .L8024112C /* 95C320 80241120 24840001 */ addiu $a0, $a0, 1 /* 95C324 80241124 0809044F */ j .L8024113C diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s index 011bbcf8ac..e04e557d57 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s @@ -46,7 +46,7 @@ glabel func_80241174_95C374 /* 95C418 80241218 8E2200B0 */ lw $v0, 0xb0($s1) /* 95C41C 8024121C 30420004 */ andi $v0, $v0, 4 /* 95C420 80241220 10400044 */ beqz $v0, .L80241334 -/* 95C424 80241224 00000000 */ nop +/* 95C424 80241224 00000000 */ nop .L80241228: /* 95C428 80241228 2404F7FF */ addiu $a0, $zero, -0x801 /* 95C42C 8024122C AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80241174_95C374 /* 95C4E0 802412E0 3C0142C8 */ lui $at, 0x42c8 /* 95C4E4 802412E4 44812000 */ mtc1 $at, $f4 /* 95C4E8 802412E8 44823000 */ mtc1 $v0, $f6 -/* 95C4EC 802412EC 00000000 */ nop +/* 95C4EC 802412EC 00000000 */ nop /* 95C4F0 802412F0 468031A0 */ cvt.s.w $f6, $f6 /* 95C4F4 802412F4 27A20044 */ addiu $v0, $sp, 0x44 /* 95C4F8 802412F8 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80241174_95C374 /* 95C51C 8024131C 0C0372DF */ jal func_800DCB7C /* 95C520 80241320 27A70040 */ addiu $a3, $sp, 0x40 /* 95C524 80241324 10400003 */ beqz $v0, .L80241334 -/* 95C528 80241328 00000000 */ nop +/* 95C528 80241328 00000000 */ nop /* 95C52C 8024132C C7A0003C */ lwc1 $f0, 0x3c($sp) /* 95C530 80241330 E640003C */ swc1 $f0, 0x3c($s2) .L80241334: @@ -124,72 +124,85 @@ glabel func_80241174_95C374 /* 95C538 80241338 2C620064 */ sltiu $v0, $v1, 0x64 /* 95C53C 8024133C 10400042 */ beqz $v0, .L80241448 /* 95C540 80241340 00031080 */ sll $v0, $v1, 2 -/* 95C544 80241344 3C018025 */ lui $at, %hi(D_8024DDF0) +/* 95C544 80241344 3C018025 */ lui $at, %hi(jtbl_8024DDF0_968FF0) /* 95C548 80241348 00220821 */ addu $at, $at, $v0 -/* 95C54C 8024134C 8C22DDF0 */ lw $v0, %lo(D_8024DDF0)($at) +/* 95C54C 8024134C 8C22DDF0 */ lw $v0, %lo(jtbl_8024DDF0_968FF0)($at) /* 95C550 80241350 00400008 */ jr $v0 -/* 95C554 80241354 00000000 */ nop +/* 95C554 80241354 00000000 */ nop +glabel L80241358_95C558 /* 95C558 80241358 0280202D */ daddu $a0, $s4, $zero /* 95C55C 8024135C 0260282D */ daddu $a1, $s3, $zero /* 95C560 80241360 0C090178 */ jal func_802405E0_95B7E0 /* 95C564 80241364 02A0302D */ daddu $a2, $s5, $zero +glabel L80241368_95C568 /* 95C568 80241368 0280202D */ daddu $a0, $s4, $zero /* 95C56C 8024136C 0260282D */ daddu $a1, $s3, $zero /* 95C570 80241370 0C0901CE */ jal func_80240738_95B938 /* 95C574 80241374 02A0302D */ daddu $a2, $s5, $zero /* 95C578 80241378 08090512 */ j .L80241448 -/* 95C57C 8024137C 00000000 */ nop +/* 95C57C 8024137C 00000000 */ nop +glabel L80241380_95C580 /* 95C580 80241380 0280202D */ daddu $a0, $s4, $zero /* 95C584 80241384 0260282D */ daddu $a1, $s3, $zero /* 95C588 80241388 0C090278 */ jal dro_01_UnkNpcAIFunc1 /* 95C58C 8024138C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241390_95C590 /* 95C590 80241390 0280202D */ daddu $a0, $s4, $zero /* 95C594 80241394 0260282D */ daddu $a1, $s3, $zero /* 95C598 80241398 0C0902A8 */ jal func_80240AA0_95BCA0 /* 95C59C 8024139C 02A0302D */ daddu $a2, $s5, $zero /* 95C5A0 802413A0 08090512 */ j .L80241448 -/* 95C5A4 802413A4 00000000 */ nop +/* 95C5A4 802413A4 00000000 */ nop +glabel L802413A8_95C5A8 /* 95C5A8 802413A8 0280202D */ daddu $a0, $s4, $zero /* 95C5AC 802413AC 0260282D */ daddu $a1, $s3, $zero /* 95C5B0 802413B0 0C090317 */ jal func_80240C5C_95BE5C /* 95C5B4 802413B4 02A0302D */ daddu $a2, $s5, $zero /* 95C5B8 802413B8 08090512 */ j .L80241448 -/* 95C5BC 802413BC 00000000 */ nop +/* 95C5BC 802413BC 00000000 */ nop +glabel L802413C0_95C5C0 /* 95C5C0 802413C0 0280202D */ daddu $a0, $s4, $zero /* 95C5C4 802413C4 0260282D */ daddu $a1, $s3, $zero /* 95C5C8 802413C8 0C090344 */ jal dro_01_NpcJumpFunc2 /* 95C5CC 802413CC 02A0302D */ daddu $a2, $s5, $zero +glabel L802413D0_95C5D0 /* 95C5D0 802413D0 0280202D */ daddu $a0, $s4, $zero /* 95C5D4 802413D4 0260282D */ daddu $a1, $s3, $zero /* 95C5D8 802413D8 0C090361 */ jal dro_01_NpcJumpFunc /* 95C5DC 802413DC 02A0302D */ daddu $a2, $s5, $zero /* 95C5E0 802413E0 08090512 */ j .L80241448 -/* 95C5E4 802413E4 00000000 */ nop +/* 95C5E4 802413E4 00000000 */ nop +glabel L802413E8_95C5E8 /* 95C5E8 802413E8 0280202D */ daddu $a0, $s4, $zero /* 95C5EC 802413EC 0260282D */ daddu $a1, $s3, $zero /* 95C5F0 802413F0 0C09037F */ jal func_80240DFC_95BFFC /* 95C5F4 802413F4 02A0302D */ daddu $a2, $s5, $zero +glabel L802413F8_95C5F8 /* 95C5F8 802413F8 0280202D */ daddu $a0, $s4, $zero /* 95C5FC 802413FC 0260282D */ daddu $a1, $s3, $zero /* 95C600 80241400 0C0903CB */ jal func_80240F2C_95C12C /* 95C604 80241404 02A0302D */ daddu $a2, $s5, $zero /* 95C608 80241408 08090512 */ j .L80241448 -/* 95C60C 8024140C 00000000 */ nop +/* 95C60C 8024140C 00000000 */ nop +glabel L80241410_95C610 /* 95C610 80241410 0280202D */ daddu $a0, $s4, $zero /* 95C614 80241414 0260282D */ daddu $a1, $s3, $zero /* 95C618 80241418 0C090413 */ jal dro_01_UnkNpcDurationFlagFunc /* 95C61C 8024141C 02A0302D */ daddu $a2, $s5, $zero /* 95C620 80241420 08090512 */ j .L80241448 -/* 95C624 80241424 00000000 */ nop +/* 95C624 80241424 00000000 */ nop +glabel L80241428_95C628 /* 95C628 80241428 0280202D */ daddu $a0, $s4, $zero /* 95C62C 8024142C 0260282D */ daddu $a1, $s3, $zero /* 95C630 80241430 0C09042D */ jal func_802410B4_95C2B4 /* 95C634 80241434 02A0302D */ daddu $a2, $s5, $zero /* 95C638 80241438 08090512 */ j .L80241448 -/* 95C63C 8024143C 00000000 */ nop +/* 95C63C 8024143C 00000000 */ nop +glabel L80241440_95C640 /* 95C640 80241440 0C0129CF */ jal func_8004A73C /* 95C644 80241444 0280202D */ daddu $a0, $s4, $zero .L80241448: +glabel L80241448_95C648 /* 95C648 80241448 8FBF0060 */ lw $ra, 0x60($sp) /* 95C64C 8024144C 8FB5005C */ lw $s5, 0x5c($sp) /* 95C650 80241450 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241470_95C670.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241470_95C670.s index 094238df30..73ec607d04 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241470_95C670.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241470_95C670.s @@ -26,7 +26,7 @@ glabel func_80241470_95C670 /* 95C6C0 802414C0 1440FFFA */ bnez $v0, .L802414AC /* 95C6C4 802414C4 24A50004 */ addiu $a1, $a1, 4 /* 95C6C8 802414C8 08090543 */ j .L8024150C -/* 95C6CC 802414CC 00000000 */ nop +/* 95C6CC 802414CC 00000000 */ nop .L802414D0: /* 95C6D0 802414D0 0000182D */ daddu $v1, $zero, $zero /* 95C6D4 802414D4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802415AC_95C7AC.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802415AC_95C7AC.s index 46ff1aac36..3b96872dec 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802415AC_95C7AC.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802415AC_95C7AC.s @@ -115,7 +115,7 @@ glabel func_802415AC_95C7AC /* 95C954 80241754 14E20005 */ bne $a3, $v0, .L8024176C /* 95C958 80241758 32E2FFFF */ andi $v0, $s7, 0xffff /* 95C95C 8024175C 14400003 */ bnez $v0, .L8024176C -/* 95C960 80241760 00000000 */ nop +/* 95C960 80241760 00000000 */ nop /* 95C964 80241764 14800008 */ bnez $a0, .L80241788 /* 95C968 80241768 24020001 */ addiu $v0, $zero, 1 .L8024176C: @@ -123,7 +123,7 @@ glabel func_802415AC_95C7AC /* 95C970 80241770 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 95C974 80241774 80420075 */ lb $v0, 0x75($v0) /* 95C978 80241778 10400005 */ beqz $v0, .L80241790 -/* 95C97C 8024177C 00000000 */ nop +/* 95C97C 8024177C 00000000 */ nop /* 95C980 80241780 10800003 */ beqz $a0, .L80241790 /* 95C984 80241784 24020001 */ addiu $v0, $zero, 1 .L80241788: diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024189C_95CA9C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024189C_95CA9C.s index f03b1ce6f2..2a7e9451b2 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024189C_95CA9C.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024189C_95CA9C.s @@ -39,13 +39,13 @@ glabel func_8024189C_95CA9C /* 95CB20 80241920 10740005 */ beq $v1, $s4, .L80241938 /* 95CB24 80241924 26100001 */ addiu $s0, $s0, 1 /* 95CB28 80241928 10730003 */ beq $v1, $s3, .L80241938 -/* 95CB2C 8024192C 00000000 */ nop +/* 95CB2C 8024192C 00000000 */ nop /* 95CB30 80241930 00521025 */ or $v0, $v0, $s2 /* 95CB34 80241934 AC820000 */ sw $v0, ($a0) .L80241938: /* 95CB38 80241938 2A020040 */ slti $v0, $s0, 0x40 /* 95CB3C 8024193C 1440FFEF */ bnez $v0, .L802418FC -/* 95CB40 80241940 00000000 */ nop +/* 95CB40 80241940 00000000 */ nop /* 95CB44 80241944 0000802D */ daddu $s0, $zero, $zero /* 95CB48 80241948 3C120800 */ lui $s2, 0x800 .L8024194C: @@ -57,13 +57,13 @@ glabel func_8024189C_95CA9C /* 95CB60 80241960 8C640000 */ lw $a0, ($v1) /* 95CB64 80241964 30820010 */ andi $v0, $a0, 0x10 /* 95CB68 80241968 10400003 */ beqz $v0, .L80241978 -/* 95CB6C 8024196C 00000000 */ nop +/* 95CB6C 8024196C 00000000 */ nop /* 95CB70 80241970 00921025 */ or $v0, $a0, $s2 /* 95CB74 80241974 AC620000 */ sw $v0, ($v1) .L80241978: /* 95CB78 80241978 2A020100 */ slti $v0, $s0, 0x100 /* 95CB7C 8024197C 1440FFF3 */ bnez $v0, .L8024194C -/* 95CB80 80241980 00000000 */ nop +/* 95CB80 80241980 00000000 */ nop /* 95CB84 80241984 AE200070 */ sw $zero, 0x70($s1) .L80241988: /* 95CB88 80241988 8E220070 */ lw $v0, 0x70($s1) diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802419E8_95CBE8.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802419E8_95CBE8.s index 22eea16142..caa55eb97e 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802419E8_95CBE8.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802419E8_95CBE8.s @@ -32,7 +32,7 @@ glabel func_802419E8_95CBE8 /* 95CC4C 80241A4C 0080302D */ daddu $a2, $a0, $zero /* 95CC50 80241A50 8E020070 */ lw $v0, 0x70($s0) /* 95CC54 80241A54 14400006 */ bnez $v0, .L80241A70 -/* 95CC58 80241A58 00000000 */ nop +/* 95CC58 80241A58 00000000 */ nop /* 95CC5C 80241A5C 8E020074 */ lw $v0, 0x74($s0) /* 95CC60 80241A60 14400003 */ bnez $v0, .L80241A70 /* 95CC64 80241A64 24020001 */ addiu $v0, $zero, 1 @@ -66,13 +66,13 @@ glabel func_802419E8_95CBE8 /* 95CCCC 80241ACC 10730005 */ beq $v1, $s3, .L80241AE4 /* 95CCD0 80241AD0 26100001 */ addiu $s0, $s0, 1 /* 95CCD4 80241AD4 10720003 */ beq $v1, $s2, .L80241AE4 -/* 95CCD8 80241AD8 00000000 */ nop +/* 95CCD8 80241AD8 00000000 */ nop /* 95CCDC 80241ADC 00511024 */ and $v0, $v0, $s1 /* 95CCE0 80241AE0 AC820000 */ sw $v0, ($a0) .L80241AE4: /* 95CCE4 80241AE4 2A020040 */ slti $v0, $s0, 0x40 /* 95CCE8 80241AE8 1440FFEF */ bnez $v0, .L80241AA8 -/* 95CCEC 80241AEC 00000000 */ nop +/* 95CCEC 80241AEC 00000000 */ nop /* 95CCF0 80241AF0 0000802D */ daddu $s0, $zero, $zero /* 95CCF4 80241AF4 3C11F7FF */ lui $s1, 0xf7ff /* 95CCF8 80241AF8 3631FFFF */ ori $s1, $s1, 0xffff @@ -85,7 +85,7 @@ glabel func_802419E8_95CBE8 /* 95CD10 80241B10 8C640000 */ lw $a0, ($v1) /* 95CD14 80241B14 30820010 */ andi $v0, $a0, 0x10 /* 95CD18 80241B18 10400003 */ beqz $v0, .L80241B28 -/* 95CD1C 80241B1C 00000000 */ nop +/* 95CD1C 80241B1C 00000000 */ nop /* 95CD20 80241B20 00911024 */ and $v0, $a0, $s1 /* 95CD24 80241B24 AC620000 */ sw $v0, ($v1) .L80241B28: @@ -93,7 +93,7 @@ glabel func_802419E8_95CBE8 /* 95CD2C 80241B2C 1440FFF3 */ bnez $v0, .L80241AFC /* 95CD30 80241B30 24020002 */ addiu $v0, $zero, 2 /* 95CD34 80241B34 080906D0 */ j .L80241B40 -/* 95CD38 80241B38 00000000 */ nop +/* 95CD38 80241B38 00000000 */ nop .L80241B3C: /* 95CD3C 80241B3C 0000102D */ daddu $v0, $zero, $zero .L80241B40: diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241BE0_95CDE0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241BE0_95CDE0.s index 61b4e419d5..7879f8d5db 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241BE0_95CDE0.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241BE0_95CDE0.s @@ -16,19 +16,19 @@ glabel func_80241BE0_95CDE0 /* 95CE0C 80241C0C 0220202D */ daddu $a0, $s1, $zero /* 95CE10 80241C10 3C05F4AC */ lui $a1, 0xf4ac /* 95CE14 80241C14 4482B000 */ mtc1 $v0, $f22 -/* 95CE18 80241C18 00000000 */ nop +/* 95CE18 80241C18 00000000 */ nop /* 95CE1C 80241C1C 4680B5A0 */ cvt.s.w $f22, $f22 /* 95CE20 80241C20 0C0B1EAF */ jal get_variable /* 95CE24 80241C24 34A5D482 */ ori $a1, $a1, 0xd482 /* 95CE28 80241C28 0220202D */ daddu $a0, $s1, $zero /* 95CE2C 80241C2C 3C05F4AC */ lui $a1, 0xf4ac /* 95CE30 80241C30 4482A000 */ mtc1 $v0, $f20 -/* 95CE34 80241C34 00000000 */ nop +/* 95CE34 80241C34 00000000 */ nop /* 95CE38 80241C38 4680A520 */ cvt.s.w $f20, $f20 /* 95CE3C 80241C3C 0C0B1EAF */ jal get_variable /* 95CE40 80241C40 34A5D483 */ ori $a1, $a1, 0xd483 /* 95CE44 80241C44 44821000 */ mtc1 $v0, $f2 -/* 95CE48 80241C48 00000000 */ nop +/* 95CE48 80241C48 00000000 */ nop /* 95CE4C 80241C4C 468010A0 */ cvt.s.w $f2, $f2 /* 95CE50 80241C50 4405B000 */ mfc1 $a1, $f22 /* 95CE54 80241C54 4406A000 */ mfc1 $a2, $f20 @@ -45,19 +45,19 @@ glabel func_80241BE0_95CDE0 /* 95CE80 80241C80 0220202D */ daddu $a0, $s1, $zero /* 95CE84 80241C84 3C05F4AC */ lui $a1, 0xf4ac /* 95CE88 80241C88 4482B000 */ mtc1 $v0, $f22 -/* 95CE8C 80241C8C 00000000 */ nop +/* 95CE8C 80241C8C 00000000 */ nop /* 95CE90 80241C90 4680B5A0 */ cvt.s.w $f22, $f22 /* 95CE94 80241C94 0C0B1EAF */ jal get_variable /* 95CE98 80241C98 34A5D482 */ ori $a1, $a1, 0xd482 /* 95CE9C 80241C9C 0220202D */ daddu $a0, $s1, $zero /* 95CEA0 80241CA0 3C05F4AC */ lui $a1, 0xf4ac /* 95CEA4 80241CA4 4482A000 */ mtc1 $v0, $f20 -/* 95CEA8 80241CA8 00000000 */ nop +/* 95CEA8 80241CA8 00000000 */ nop /* 95CEAC 80241CAC 4680A520 */ cvt.s.w $f20, $f20 /* 95CEB0 80241CB0 0C0B1EAF */ jal get_variable /* 95CEB4 80241CB4 34A5D483 */ ori $a1, $a1, 0xd483 /* 95CEB8 80241CB8 44821000 */ mtc1 $v0, $f2 -/* 95CEBC 80241CBC 00000000 */ nop +/* 95CEBC 80241CBC 00000000 */ nop /* 95CEC0 80241CC0 468010A0 */ cvt.s.w $f2, $f2 /* 95CEC4 80241CC4 4405B000 */ mfc1 $a1, $f22 /* 95CEC8 80241CC8 4406A000 */ mfc1 $a2, $f20 @@ -73,19 +73,19 @@ glabel func_80241BE0_95CDE0 /* 95CEF0 80241CF0 0220202D */ daddu $a0, $s1, $zero /* 95CEF4 80241CF4 3C05F4AC */ lui $a1, 0xf4ac /* 95CEF8 80241CF8 4482B000 */ mtc1 $v0, $f22 -/* 95CEFC 80241CFC 00000000 */ nop +/* 95CEFC 80241CFC 00000000 */ nop /* 95CF00 80241D00 4680B5A0 */ cvt.s.w $f22, $f22 /* 95CF04 80241D04 0C0B1EAF */ jal get_variable /* 95CF08 80241D08 34A5D482 */ ori $a1, $a1, 0xd482 /* 95CF0C 80241D0C 0220202D */ daddu $a0, $s1, $zero /* 95CF10 80241D10 3C05F4AC */ lui $a1, 0xf4ac /* 95CF14 80241D14 4482A000 */ mtc1 $v0, $f20 -/* 95CF18 80241D18 00000000 */ nop +/* 95CF18 80241D18 00000000 */ nop /* 95CF1C 80241D1C 4680A520 */ cvt.s.w $f20, $f20 /* 95CF20 80241D20 0C0B1EAF */ jal get_variable /* 95CF24 80241D24 34A5D483 */ ori $a1, $a1, 0xd483 /* 95CF28 80241D28 44821000 */ mtc1 $v0, $f2 -/* 95CF2C 80241D2C 00000000 */ nop +/* 95CF2C 80241D2C 00000000 */ nop /* 95CF30 80241D30 468010A0 */ cvt.s.w $f2, $f2 /* 95CF34 80241D34 4405B000 */ mfc1 $a1, $f22 /* 95CF38 80241D38 4406A000 */ mfc1 $a2, $f20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241DF8_95CFF8.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241DF8_95CFF8.s index 487584f563..ee46e84905 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241DF8_95CFF8.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241DF8_95CFF8.s @@ -44,7 +44,7 @@ glabel func_80241DF8_95CFF8 /* 95D08C 80241E8C 3C048025 */ lui $a0, %hi(D_8024DFC0) /* 95D090 80241E90 8C84DFC0 */ lw $a0, %lo(D_8024DFC0)($a0) /* 95D094 80241E94 0C048D70 */ jal func_801235C0 -/* 95D098 80241E98 00000000 */ nop +/* 95D098 80241E98 00000000 */ nop /* 95D09C 80241E9C 24020002 */ addiu $v0, $zero, 2 .L80241EA0: /* 95D0A0 80241EA0 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242468_95D668.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242468_95D668.s index 5661c5c5e6..fd7d0d1cf4 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242468_95D668.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242468_95D668.s @@ -13,7 +13,7 @@ glabel func_80242468_95D668 /* 95D688 80242488 14620006 */ bne $v1, $v0, .L802424A4 /* 95D68C 8024248C 24020002 */ addiu $v0, $zero, 2 /* 95D690 80242490 44800000 */ mtc1 $zero, $f0 -/* 95D694 80242494 00000000 */ nop +/* 95D694 80242494 00000000 */ nop /* 95D698 80242498 44050000 */ mfc1 $a1, $f0 /* 95D69C 8024249C 0809092F */ j .L802424BC /* 95D6A0 802424A0 0000202D */ daddu $a0, $zero, $zero @@ -21,9 +21,9 @@ glabel func_80242468_95D668 /* 95D6A4 802424A4 14620008 */ bne $v1, $v0, .L802424C8 /* 95D6A8 802424A8 24040001 */ addiu $a0, $zero, 1 /* 95D6AC 802424AC 44800000 */ mtc1 $zero, $f0 -/* 95D6B0 802424B0 00000000 */ nop +/* 95D6B0 802424B0 00000000 */ nop /* 95D6B4 802424B4 44050000 */ mfc1 $a1, $f0 -/* 95D6B8 802424B8 00000000 */ nop +/* 95D6B8 802424B8 00000000 */ nop .L802424BC: /* 95D6BC 802424BC 00A0302D */ daddu $a2, $a1, $zero /* 95D6C0 802424C0 0C01C5A4 */ jal func_80071690 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802427BC_95D9BC.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802427BC_95D9BC.s index 0957f3286e..d0244d51f7 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802427BC_95D9BC.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802427BC_95D9BC.s @@ -28,7 +28,7 @@ glabel func_802427BC_95D9BC /* 95DA10 80242810 00220821 */ addu $at, $at, $v0 /* 95DA14 80242814 AC20DFF0 */ sw $zero, %lo(D_8024DFF0)($at) /* 95DA18 80242818 08090A12 */ j .L80242848 -/* 95DA1C 8024281C 00000000 */ nop +/* 95DA1C 8024281C 00000000 */ nop .L80242820: /* 95DA20 80242820 3C038025 */ lui $v1, %hi(D_8024DFF0) /* 95DA24 80242824 2463DFF0 */ addiu $v1, $v1, %lo(D_8024DFF0) diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242858_95DA58.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242858_95DA58.s index 9f73f189b3..cf2515e5b4 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242858_95DA58.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242858_95DA58.s @@ -49,11 +49,12 @@ glabel func_80242858_95DA58 /* 95DB04 80242904 2C620005 */ sltiu $v0, $v1, 5 /* 95DB08 80242908 10400116 */ beqz $v0, .L80242D64 /* 95DB0C 8024290C 00031080 */ sll $v0, $v1, 2 -/* 95DB10 80242910 3C018025 */ lui $at, %hi(D_8024DF80) +/* 95DB10 80242910 3C018025 */ lui $at, %hi(jtbl_8024DF80_969180) /* 95DB14 80242914 00220821 */ addu $at, $at, $v0 -/* 95DB18 80242918 8C22DF80 */ lw $v0, %lo(D_8024DF80)($at) +/* 95DB18 80242918 8C22DF80 */ lw $v0, %lo(jtbl_8024DF80_969180)($at) /* 95DB1C 8024291C 00400008 */ jr $v0 -/* 95DB20 80242920 00000000 */ nop +/* 95DB20 80242920 00000000 */ nop +glabel L80242924_95DB24 /* 95DB24 80242924 C60C0000 */ lwc1 $f12, ($s0) /* 95DB28 80242928 46806320 */ cvt.s.w $f12, $f12 /* 95DB2C 8024292C C60E0008 */ lwc1 $f14, 8($s0) @@ -62,10 +63,10 @@ glabel func_80242858_95DA58 /* 95DB38 80242938 8E02000C */ lw $v0, 0xc($s0) /* 95DB3C 8024293C 4600010D */ trunc.w.s $f4, $f0 /* 95DB40 80242940 44032000 */ mfc1 $v1, $f4 -/* 95DB44 80242944 00000000 */ nop +/* 95DB44 80242944 00000000 */ nop /* 95DB48 80242948 0062102A */ slt $v0, $v1, $v0 /* 95DB4C 8024294C 10400105 */ beqz $v0, .L80242D64 -/* 95DB50 80242950 00000000 */ nop +/* 95DB50 80242950 00000000 */ nop /* 95DB54 80242954 C6600028 */ lwc1 $f0, 0x28($s3) /* 95DB58 80242958 8E020020 */ lw $v0, 0x20($s0) /* 95DB5C 8024295C E6000024 */ swc1 $f0, 0x24($s0) @@ -74,6 +75,7 @@ glabel func_80242858_95DA58 /* 95DB68 80242968 AE020020 */ sw $v0, 0x20($s0) /* 95DB6C 8024296C 08090B59 */ j .L80242D64 /* 95DB70 80242970 E6000028 */ swc1 $f0, 0x28($s0) +glabel L80242974_95DB74 /* 95DB74 80242974 C60C0000 */ lwc1 $f12, ($s0) /* 95DB78 80242978 46806320 */ cvt.s.w $f12, $f12 /* 95DB7C 8024297C C60E0008 */ lwc1 $f14, 8($s0) @@ -82,7 +84,7 @@ glabel func_80242858_95DA58 /* 95DB88 80242988 8E02000C */ lw $v0, 0xc($s0) /* 95DB8C 8024298C 4600010D */ trunc.w.s $f4, $f0 /* 95DB90 80242990 44032000 */ mfc1 $v1, $f4 -/* 95DB94 80242994 00000000 */ nop +/* 95DB94 80242994 00000000 */ nop /* 95DB98 80242998 0062102A */ slt $v0, $v1, $v0 /* 95DB9C 8024299C 504000F1 */ beql $v0, $zero, .L80242D64 /* 95DBA0 802429A0 AE000020 */ sw $zero, 0x20($s0) @@ -105,22 +107,23 @@ glabel func_80242858_95DA58 /* 95DBE4 802429E4 4600010D */ trunc.w.s $f4, $f0 /* 95DBE8 802429E8 44022000 */ mfc1 $v0, $f4 /* 95DBEC 802429EC 44916000 */ mtc1 $s1, $f12 -/* 95DBF0 802429F0 00000000 */ nop +/* 95DBF0 802429F0 00000000 */ nop /* 95DBF4 802429F4 46806320 */ cvt.s.w $f12, $f12 /* 95DBF8 802429F8 44827000 */ mtc1 $v0, $f14 -/* 95DBFC 802429FC 00000000 */ nop +/* 95DBFC 802429FC 00000000 */ nop /* 95DC00 80242A00 0C00A70A */ jal get_clamped_angle_diff /* 95DC04 80242A04 468073A0 */ cvt.s.w $f14, $f14 /* 95DC08 80242A08 4600010D */ trunc.w.s $f4, $f0 /* 95DC0C 80242A0C 44022000 */ mfc1 $v0, $f4 -/* 95DC10 80242A10 00000000 */ nop +/* 95DC10 80242A10 00000000 */ nop /* 95DC14 80242A14 44826000 */ mtc1 $v0, $f12 -/* 95DC18 80242A18 00000000 */ nop +/* 95DC18 80242A18 00000000 */ nop /* 95DC1C 80242A1C 0C00A69F */ jal signF /* 95DC20 80242A20 46806320 */ cvt.s.w $f12, $f12 /* 95DC24 80242A24 8E020020 */ lw $v0, 0x20($s0) /* 95DC28 80242A28 08090B52 */ j .L80242D48 /* 95DC2C 80242A2C E6000034 */ swc1 $f0, 0x34($s0) +glabel L80242A30_95DC30 /* 95DC30 80242A30 C60C0000 */ lwc1 $f12, ($s0) /* 95DC34 80242A34 46806320 */ cvt.s.w $f12, $f12 /* 95DC38 80242A38 C60E0008 */ lwc1 $f14, 8($s0) @@ -129,7 +132,7 @@ glabel func_80242858_95DA58 /* 95DC44 80242A44 8E02000C */ lw $v0, 0xc($s0) /* 95DC48 80242A48 4600010D */ trunc.w.s $f4, $f0 /* 95DC4C 80242A4C 44032000 */ mfc1 $v1, $f4 -/* 95DC50 80242A50 00000000 */ nop +/* 95DC50 80242A50 00000000 */ nop /* 95DC54 80242A54 0062102A */ slt $v0, $v1, $v0 /* 95DC58 80242A58 504000C2 */ beql $v0, $zero, .L80242D64 /* 95DC5C 80242A5C AE000020 */ sw $zero, 0x20($s0) @@ -152,22 +155,22 @@ glabel func_80242858_95DA58 /* 95DCA0 80242AA0 4600010D */ trunc.w.s $f4, $f0 /* 95DCA4 80242AA4 44022000 */ mfc1 $v0, $f4 /* 95DCA8 80242AA8 44916000 */ mtc1 $s1, $f12 -/* 95DCAC 80242AAC 00000000 */ nop +/* 95DCAC 80242AAC 00000000 */ nop /* 95DCB0 80242AB0 46806320 */ cvt.s.w $f12, $f12 /* 95DCB4 80242AB4 44827000 */ mtc1 $v0, $f14 -/* 95DCB8 80242AB8 00000000 */ nop +/* 95DCB8 80242AB8 00000000 */ nop /* 95DCBC 80242ABC 0C00A70A */ jal get_clamped_angle_diff /* 95DCC0 80242AC0 468073A0 */ cvt.s.w $f14, $f14 /* 95DCC4 80242AC4 4600010D */ trunc.w.s $f4, $f0 /* 95DCC8 80242AC8 44022000 */ mfc1 $v0, $f4 -/* 95DCCC 80242ACC 00000000 */ nop +/* 95DCCC 80242ACC 00000000 */ nop /* 95DCD0 80242AD0 44826000 */ mtc1 $v0, $f12 -/* 95DCD4 80242AD4 00000000 */ nop +/* 95DCD4 80242AD4 00000000 */ nop /* 95DCD8 80242AD8 0C00A69F */ jal signF /* 95DCDC 80242ADC 46806320 */ cvt.s.w $f12, $f12 /* 95DCE0 80242AE0 C6020034 */ lwc1 $f2, 0x34($s0) /* 95DCE4 80242AE4 46001032 */ c.eq.s $f2, $f0 -/* 95DCE8 80242AE8 00000000 */ nop +/* 95DCE8 80242AE8 00000000 */ nop /* 95DCEC 80242AEC 4502009D */ bc1fl .L80242D64 /* 95DCF0 80242AF0 AE000020 */ sw $zero, 0x20($s0) /* 95DCF4 80242AF4 C60C0000 */ lwc1 $f12, ($s0) @@ -189,25 +192,25 @@ glabel func_80242858_95DA58 /* 95DD34 80242B34 4600010D */ trunc.w.s $f4, $f0 /* 95DD38 80242B38 44022000 */ mfc1 $v0, $f4 /* 95DD3C 80242B3C 44916000 */ mtc1 $s1, $f12 -/* 95DD40 80242B40 00000000 */ nop +/* 95DD40 80242B40 00000000 */ nop /* 95DD44 80242B44 46806320 */ cvt.s.w $f12, $f12 /* 95DD48 80242B48 44827000 */ mtc1 $v0, $f14 -/* 95DD4C 80242B4C 00000000 */ nop +/* 95DD4C 80242B4C 00000000 */ nop /* 95DD50 80242B50 0C00A70A */ jal get_clamped_angle_diff /* 95DD54 80242B54 468073A0 */ cvt.s.w $f14, $f14 /* 95DD58 80242B58 4600010D */ trunc.w.s $f4, $f0 /* 95DD5C 80242B5C 44022000 */ mfc1 $v0, $f4 -/* 95DD60 80242B60 00000000 */ nop +/* 95DD60 80242B60 00000000 */ nop /* 95DD64 80242B64 44820000 */ mtc1 $v0, $f0 -/* 95DD68 80242B68 00000000 */ nop +/* 95DD68 80242B68 00000000 */ nop /* 95DD6C 80242B6C 46800020 */ cvt.s.w $f0, $f0 /* 95DD70 80242B70 3C0142B4 */ lui $at, 0x42b4 /* 95DD74 80242B74 44811000 */ mtc1 $at, $f2 /* 95DD78 80242B78 46000505 */ abs.s $f20, $f0 /* 95DD7C 80242B7C 4614103C */ c.lt.s $f2, $f20 -/* 95DD80 80242B80 00000000 */ nop +/* 95DD80 80242B80 00000000 */ nop /* 95DD84 80242B84 45000077 */ bc1f .L80242D64 -/* 95DD88 80242B88 00000000 */ nop +/* 95DD88 80242B88 00000000 */ nop /* 95DD8C 80242B8C 8E020014 */ lw $v0, 0x14($s0) /* 95DD90 80242B90 10400003 */ beqz $v0, .L80242BA0 /* 95DD94 80242B94 0200202D */ daddu $a0, $s0, $zero @@ -223,6 +226,7 @@ glabel func_80242858_95DA58 /* 95DDB8 80242BB8 4600010D */ trunc.w.s $f4, $f0 /* 95DDBC 80242BBC 08090B59 */ j .L80242D64 /* 95DDC0 80242BC0 E6040018 */ swc1 $f4, 0x18($s0) +glabel L80242BC4_95DDC4 /* 95DDC4 80242BC4 C60C0000 */ lwc1 $f12, ($s0) /* 95DDC8 80242BC8 46806320 */ cvt.s.w $f12, $f12 /* 95DDCC 80242BCC C60E0008 */ lwc1 $f14, 8($s0) @@ -231,10 +235,10 @@ glabel func_80242858_95DA58 /* 95DDD8 80242BD8 8E020010 */ lw $v0, 0x10($s0) /* 95DDDC 80242BDC 4600010D */ trunc.w.s $f4, $f0 /* 95DDE0 80242BE0 44032000 */ mfc1 $v1, $f4 -/* 95DDE4 80242BE4 00000000 */ nop +/* 95DDE4 80242BE4 00000000 */ nop /* 95DDE8 80242BE8 0062102A */ slt $v0, $v1, $v0 /* 95DDEC 80242BEC 10400050 */ beqz $v0, .L80242D30 -/* 95DDF0 80242BF0 00000000 */ nop +/* 95DDF0 80242BF0 00000000 */ nop /* 95DDF4 80242BF4 C60C0000 */ lwc1 $f12, ($s0) /* 95DDF8 80242BF8 46806320 */ cvt.s.w $f12, $f12 /* 95DDFC 80242BFC 8E06002C */ lw $a2, 0x2c($s0) @@ -254,23 +258,23 @@ glabel func_80242858_95DA58 /* 95DE34 80242C34 4600010D */ trunc.w.s $f4, $f0 /* 95DE38 80242C38 44022000 */ mfc1 $v0, $f4 /* 95DE3C 80242C3C 44916000 */ mtc1 $s1, $f12 -/* 95DE40 80242C40 00000000 */ nop +/* 95DE40 80242C40 00000000 */ nop /* 95DE44 80242C44 46806320 */ cvt.s.w $f12, $f12 /* 95DE48 80242C48 44827000 */ mtc1 $v0, $f14 -/* 95DE4C 80242C4C 00000000 */ nop +/* 95DE4C 80242C4C 00000000 */ nop /* 95DE50 80242C50 0C00A70A */ jal get_clamped_angle_diff /* 95DE54 80242C54 468073A0 */ cvt.s.w $f14, $f14 /* 95DE58 80242C58 4600010D */ trunc.w.s $f4, $f0 /* 95DE5C 80242C5C 44022000 */ mfc1 $v0, $f4 -/* 95DE60 80242C60 00000000 */ nop +/* 95DE60 80242C60 00000000 */ nop /* 95DE64 80242C64 4482A000 */ mtc1 $v0, $f20 -/* 95DE68 80242C68 00000000 */ nop +/* 95DE68 80242C68 00000000 */ nop /* 95DE6C 80242C6C 4680A520 */ cvt.s.w $f20, $f20 /* 95DE70 80242C70 0C00A69F */ jal signF /* 95DE74 80242C74 4600A306 */ mov.s $f12, $f20 /* 95DE78 80242C78 C6020034 */ lwc1 $f2, 0x34($s0) /* 95DE7C 80242C7C 46001032 */ c.eq.s $f2, $f0 -/* 95DE80 80242C80 00000000 */ nop +/* 95DE80 80242C80 00000000 */ nop /* 95DE84 80242C84 4503000A */ bc1tl .L80242CB0 /* 95DE88 80242C88 4600A005 */ abs.s $f0, $f20 /* 95DE8C 80242C8C 8E020014 */ lw $v0, 0x14($s0) @@ -291,7 +295,7 @@ glabel func_80242858_95DA58 /* 95DEC0 80242CC0 344260B7 */ ori $v0, $v0, 0x60b7 /* 95DEC4 80242CC4 4600110D */ trunc.w.s $f4, $f2 /* 95DEC8 80242CC8 44032000 */ mfc1 $v1, $f4 -/* 95DECC 80242CCC 00000000 */ nop +/* 95DECC 80242CCC 00000000 */ nop /* 95DED0 80242CD0 00620018 */ mult $v1, $v0 /* 95DED4 80242CD4 8E040038 */ lw $a0, 0x38($s0) /* 95DED8 80242CD8 AE030018 */ sw $v1, 0x18($s0) @@ -317,7 +321,7 @@ glabel func_80242858_95DA58 /* 95DF20 80242D20 0040F809 */ jalr $v0 /* 95DF24 80242D24 24050002 */ addiu $a1, $zero, 2 /* 95DF28 80242D28 08090B59 */ j .L80242D64 -/* 95DF2C 80242D2C 00000000 */ nop +/* 95DF2C 80242D2C 00000000 */ nop .L80242D30: /* 95DF30 80242D30 8E020014 */ lw $v0, 0x14($s0) /* 95DF34 80242D34 10400003 */ beqz $v0, .L80242D44 @@ -330,6 +334,7 @@ glabel func_80242858_95DA58 /* 95DF48 80242D48 24420001 */ addiu $v0, $v0, 1 /* 95DF4C 80242D4C 08090B59 */ j .L80242D64 /* 95DF50 80242D50 AE020020 */ sw $v0, 0x20($s0) +glabel L80242D54_95DF54 /* 95DF54 80242D54 AE000018 */ sw $zero, 0x18($s0) /* 95DF58 80242D58 AE00001C */ sw $zero, 0x1c($s0) /* 95DF5C 80242D5C AE000038 */ sw $zero, 0x38($s0) diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802430C8_95E2C8.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802430C8_95E2C8.s index a8931ae66b..ecb38dadc5 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802430C8_95E2C8.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802430C8_95E2C8.s @@ -14,15 +14,16 @@ glabel func_802430C8_95E2C8 /* 95E2EC 802430EC 1040002A */ beqz $v0, .L80243198 /* 95E2F0 802430F0 0080882D */ daddu $s1, $a0, $zero /* 95E2F4 802430F4 00051080 */ sll $v0, $a1, 2 -/* 95E2F8 802430F8 3C018025 */ lui $at, %hi(D_8024DF98) +/* 95E2F8 802430F8 3C018025 */ lui $at, %hi(jtbl_8024DF98_969198) /* 95E2FC 802430FC 00220821 */ addu $at, $at, $v0 -/* 95E300 80243100 8C22DF98 */ lw $v0, %lo(D_8024DF98)($at) +/* 95E300 80243100 8C22DF98 */ lw $v0, %lo(jtbl_8024DF98_969198)($at) /* 95E304 80243104 00400008 */ jr $v0 -/* 95E308 80243108 00000000 */ nop +/* 95E308 80243108 00000000 */ nop +glabel L8024310C_95E30C /* 95E30C 8024310C 8E22001C */ lw $v0, 0x1c($s1) /* 95E310 80243110 28420006 */ slti $v0, $v0, 6 /* 95E314 80243114 14400020 */ bnez $v0, .L80243198 -/* 95E318 80243118 00000000 */ nop +/* 95E318 80243118 00000000 */ nop /* 95E31C 8024311C 3C064318 */ lui $a2, 0x4318 /* 95E320 80243120 3C07C274 */ lui $a3, 0xc274 /* 95E324 80243124 3C0142FA */ lui $at, 0x42fa @@ -45,7 +46,7 @@ glabel func_802430C8_95E2C8 /* 95E368 80243168 44811000 */ mtc1 $at, $f2 /* 95E36C 8024316C 46000005 */ abs.s $f0, $f0 /* 95E370 80243170 4602003C */ c.lt.s $f0, $f2 -/* 95E374 80243174 00000000 */ nop +/* 95E374 80243174 00000000 */ nop /* 95E378 80243178 45000007 */ bc1f .L80243198 /* 95E37C 8024317C 0000302D */ daddu $a2, $zero, $zero /* 95E380 80243180 3C048025 */ lui $a0, %hi(D_80248504) @@ -55,6 +56,7 @@ glabel func_802430C8_95E2C8 /* 95E390 80243190 24020004 */ addiu $v0, $zero, 4 /* 95E394 80243194 AE220020 */ sw $v0, 0x20($s1) .L80243198: +glabel L80243198_95E398 /* 95E398 80243198 8FBF0018 */ lw $ra, 0x18($sp) /* 95E39C 8024319C 8FB10014 */ lw $s1, 0x14($sp) /* 95E3A0 802431A0 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802431FC_95E3FC.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802431FC_95E3FC.s index f2e4e9a280..0fdbd7e935 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802431FC_95E3FC.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802431FC_95E3FC.s @@ -38,19 +38,19 @@ glabel func_802431FC_95E3FC /* 95E480 80243280 0C00A67F */ jal rand_int /* 95E484 80243284 2404000A */ addiu $a0, $zero, 0xa /* 95E488 80243288 44800000 */ mtc1 $zero, $f0 -/* 95E48C 8024328C 00000000 */ nop +/* 95E48C 8024328C 00000000 */ nop /* 95E490 80243290 4600C03C */ c.lt.s $f24, $f0 -/* 95E494 80243294 00000000 */ nop +/* 95E494 80243294 00000000 */ nop /* 95E498 80243298 45000006 */ bc1f .L802432B4 /* 95E49C 8024329C 2450001E */ addiu $s0, $v0, 0x1e /* 95E4A0 802432A0 44900000 */ mtc1 $s0, $f0 -/* 95E4A4 802432A4 00000000 */ nop +/* 95E4A4 802432A4 00000000 */ nop /* 95E4A8 802432A8 46800020 */ cvt.s.w $f0, $f0 /* 95E4AC 802432AC 08090CB1 */ j .L802432C4 /* 95E4B0 802432B0 4600B580 */ add.s $f22, $f22, $f0 .L802432B4: /* 95E4B4 802432B4 44900000 */ mtc1 $s0, $f0 -/* 95E4B8 802432B8 00000000 */ nop +/* 95E4B8 802432B8 00000000 */ nop /* 95E4BC 802432BC 46800020 */ cvt.s.w $f0, $f0 /* 95E4C0 802432C0 4600B581 */ sub.s $f22, $f22, $f0 .L802432C4: @@ -60,23 +60,23 @@ glabel func_802431FC_95E3FC /* 95E4D0 802432D0 0C00A8BB */ jal sin_deg /* 95E4D4 802432D4 4600B306 */ mov.s $f12, $f22 /* 95E4D8 802432D8 4490A000 */ mtc1 $s0, $f20 -/* 95E4DC 802432DC 00000000 */ nop +/* 95E4DC 802432DC 00000000 */ nop /* 95E4E0 802432E0 4680A520 */ cvt.s.w $f20, $f20 /* 95E4E4 802432E4 46140002 */ mul.s $f0, $f0, $f20 -/* 95E4E8 802432E8 00000000 */ nop +/* 95E4E8 802432E8 00000000 */ nop /* 95E4EC 802432EC 3C014337 */ lui $at, 0x4337 /* 95E4F0 802432F0 44811000 */ mtc1 $at, $f2 -/* 95E4F4 802432F4 00000000 */ nop +/* 95E4F4 802432F4 00000000 */ nop /* 95E4F8 802432F8 46020000 */ add.s $f0, $f0, $f2 /* 95E4FC 802432FC 4600010D */ trunc.w.s $f4, $f0 /* 95E500 80243300 E6240084 */ swc1 $f4, 0x84($s1) /* 95E504 80243304 0C00A8D4 */ jal cos_deg /* 95E508 80243308 4600B306 */ mov.s $f12, $f22 /* 95E50C 8024330C 46140002 */ mul.s $f0, $f0, $f20 -/* 95E510 80243310 00000000 */ nop +/* 95E510 80243310 00000000 */ nop /* 95E514 80243314 3C01C296 */ lui $at, 0xc296 /* 95E518 80243318 44811000 */ mtc1 $at, $f2 -/* 95E51C 8024331C 00000000 */ nop +/* 95E51C 8024331C 00000000 */ nop /* 95E520 80243320 46001081 */ sub.s $f2, $f2, $f0 /* 95E524 80243324 4600110D */ trunc.w.s $f4, $f2 /* 95E528 80243328 E6240088 */ swc1 $f4, 0x88($s1) diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243350_95E550.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243350_95E550.s index 711dfcde01..48be5cf83a 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243350_95E550.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243350_95E550.s @@ -17,41 +17,41 @@ glabel func_80243350_95E550 /* 95E580 80243380 8E050000 */ lw $a1, ($s0) /* 95E584 80243384 26100004 */ addiu $s0, $s0, 4 /* 95E588 80243388 4482C000 */ mtc1 $v0, $f24 -/* 95E58C 8024338C 00000000 */ nop +/* 95E58C 8024338C 00000000 */ nop /* 95E590 80243390 4680C620 */ cvt.s.w $f24, $f24 /* 95E594 80243394 0C0B1EAF */ jal get_variable /* 95E598 80243398 0220202D */ daddu $a0, $s1, $zero /* 95E59C 8024339C 8E050000 */ lw $a1, ($s0) /* 95E5A0 802433A0 26100004 */ addiu $s0, $s0, 4 /* 95E5A4 802433A4 4482B000 */ mtc1 $v0, $f22 -/* 95E5A8 802433A8 00000000 */ nop +/* 95E5A8 802433A8 00000000 */ nop /* 95E5AC 802433AC 4680B5A0 */ cvt.s.w $f22, $f22 /* 95E5B0 802433B0 0C0B1EAF */ jal get_variable /* 95E5B4 802433B4 0220202D */ daddu $a0, $s1, $zero /* 95E5B8 802433B8 8E050000 */ lw $a1, ($s0) /* 95E5BC 802433BC 4482A000 */ mtc1 $v0, $f20 -/* 95E5C0 802433C0 00000000 */ nop +/* 95E5C0 802433C0 00000000 */ nop /* 95E5C4 802433C4 4680A520 */ cvt.s.w $f20, $f20 /* 95E5C8 802433C8 0C0B1EAF */ jal get_variable /* 95E5CC 802433CC 0220202D */ daddu $a0, $s1, $zero /* 95E5D0 802433D0 44820000 */ mtc1 $v0, $f0 -/* 95E5D4 802433D4 00000000 */ nop +/* 95E5D4 802433D4 00000000 */ nop /* 95E5D8 802433D8 46800020 */ cvt.s.w $f0, $f0 /* 95E5DC 802433DC 46160001 */ sub.s $f0, $f0, $f22 /* 95E5E0 802433E0 4618A501 */ sub.s $f20, $f20, $f24 /* 95E5E4 802433E4 46140003 */ div.s $f0, $f0, $f20 /* 95E5E8 802433E8 46180602 */ mul.s $f24, $f0, $f24 -/* 95E5EC 802433EC 00000000 */ nop +/* 95E5EC 802433EC 00000000 */ nop /* 95E5F0 802433F0 3C028011 */ lui $v0, %hi(gPlayerStatus) /* 95E5F4 802433F4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) /* 95E5F8 802433F8 C4420028 */ lwc1 $f2, 0x28($v0) /* 95E5FC 802433FC 46020002 */ mul.s $f0, $f0, $f2 -/* 95E600 80243400 00000000 */ nop +/* 95E600 80243400 00000000 */ nop /* 95E604 80243404 4618B581 */ sub.s $f22, $f22, $f24 /* 95E608 80243408 46160000 */ add.s $f0, $f0, $f22 /* 95E60C 8024340C C4420030 */ lwc1 $f2, 0x30($v0) /* 95E610 80243410 4600103C */ c.lt.s $f2, $f0 -/* 95E614 80243414 00000000 */ nop +/* 95E614 80243414 00000000 */ nop /* 95E618 80243418 45030005 */ bc1tl .L80243430 /* 95E61C 8024341C AE200084 */ sw $zero, 0x84($s1) /* 95E620 80243420 24020001 */ addiu $v0, $zero, 1 @@ -69,6 +69,6 @@ glabel func_80243350_95E550 /* 95E648 80243448 D7B40020 */ ldc1 $f20, 0x20($sp) /* 95E64C 8024344C 03E00008 */ jr $ra /* 95E650 80243450 27BD0038 */ addiu $sp, $sp, 0x38 -/* 95E654 80243454 00000000 */ nop -/* 95E658 80243458 00000000 */ nop -/* 95E65C 8024345C 00000000 */ nop +/* 95E654 80243454 00000000 */ nop +/* 95E658 80243458 00000000 */ nop +/* 95E65C 8024345C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243460_95E660.s b/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243460_95E660.s index 01ddec8488..1b056f48bc 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243460_95E660.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243460_95E660.s @@ -26,7 +26,7 @@ glabel func_80243460_95E660 /* 95E6B0 802434B0 1440FFFA */ bnez $v0, .L8024349C /* 95E6B4 802434B4 24A50004 */ addiu $a1, $a1, 4 /* 95E6B8 802434B8 08090D3F */ j .L802434FC -/* 95E6BC 802434BC 00000000 */ nop +/* 95E6BC 802434BC 00000000 */ nop .L802434C0: /* 95E6C0 802434C0 0000182D */ daddu $v1, $zero, $zero /* 95E6C4 802434C4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243578_95E778.s b/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243578_95E778.s index c825af588f..7c3984657c 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243578_95E778.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243578_95E778.s @@ -5,10 +5,10 @@ glabel func_80243578_95E778 /* 95E778 80243578 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 95E77C 8024357C AFBF0010 */ sw $ra, 0x10($sp) /* 95E780 80243580 0C03A5B2 */ jal func_800E96C8 -/* 95E784 80243584 00000000 */ nop +/* 95E784 80243584 00000000 */ nop /* 95E788 80243588 8FBF0010 */ lw $ra, 0x10($sp) /* 95E78C 8024358C 24020002 */ addiu $v0, $zero, 2 /* 95E790 80243590 03E00008 */ jr $ra /* 95E794 80243594 27BD0018 */ addiu $sp, $sp, 0x18 -/* 95E798 80243598 00000000 */ nop -/* 95E79C 8024359C 00000000 */ nop +/* 95E798 80243598 00000000 */ nop +/* 95E79C 8024359C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435D4_95E7D4.s b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435D4_95E7D4.s index 9f3a86bfb7..14f9b148bd 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435D4_95E7D4.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435D4_95E7D4.s @@ -22,16 +22,16 @@ glabel func_802435D4_95E7D4 /* 95E814 80243614 00021023 */ negu $v0, $v0 .L80243618: /* 95E818 80243618 14400003 */ bnez $v0, .L80243628 -/* 95E81C 8024361C 00000000 */ nop +/* 95E81C 8024361C 00000000 */ nop /* 95E820 80243620 50E00017 */ beql $a3, $zero, .L80243680 /* 95E824 80243624 0000102D */ daddu $v0, $zero, $zero .L80243628: /* 95E828 80243628 44822000 */ mtc1 $v0, $f4 -/* 95E82C 8024362C 00000000 */ nop +/* 95E82C 8024362C 00000000 */ nop /* 95E830 80243630 46802120 */ cvt.s.w $f4, $f4 /* 95E834 80243634 44062000 */ mfc1 $a2, $f4 /* 95E838 80243638 44872000 */ mtc1 $a3, $f4 -/* 95E83C 8024363C 00000000 */ nop +/* 95E83C 8024363C 00000000 */ nop /* 95E840 80243640 46802120 */ cvt.s.w $f4, $f4 /* 95E844 80243644 44806000 */ mtc1 $zero, $f12 /* 95E848 80243648 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_802435D4_95E7D4 /* 95E850 80243650 46006386 */ mov.s $f14, $f12 /* 95E854 80243654 3C014270 */ lui $at, 0x4270 /* 95E858 80243658 44811000 */ mtc1 $at, $f2 -/* 95E85C 8024365C 00000000 */ nop +/* 95E85C 8024365C 00000000 */ nop /* 95E860 80243660 4602003C */ c.lt.s $f0, $f2 -/* 95E864 80243664 00000000 */ nop +/* 95E864 80243664 00000000 */ nop /* 95E868 80243668 45000004 */ bc1f .L8024367C /* 95E86C 8024366C 24020001 */ addiu $v0, $zero, 1 /* 95E870 80243670 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_dro/dro_02/9691C0/func_80240000_9691C0.s b/asm/nonmatchings/world/area_dro/dro_02/9691C0/func_80240000_9691C0.s index 0d09e69da8..67ea1376cf 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9691C0/func_80240000_9691C0.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9691C0/func_80240000_9691C0.s @@ -37,12 +37,12 @@ glabel func_80240000_9691C0 /* 96923C 8024007C 12400007 */ beqz $s2, .L8024009C /* 969240 80240080 3412FFFF */ ori $s2, $zero, 0xffff /* 969244 80240084 08090043 */ j .L8024010C -/* 969248 80240088 00000000 */ nop +/* 969248 80240088 00000000 */ nop .L8024008C: /* 96924C 8024008C 1242001B */ beq $s2, $v0, .L802400FC /* 969250 80240090 24020002 */ addiu $v0, $zero, 2 /* 969254 80240094 08090043 */ j .L8024010C -/* 969258 80240098 00000000 */ nop +/* 969258 80240098 00000000 */ nop .L8024009C: /* 96925C 8024009C 8E040000 */ lw $a0, ($s0) /* 969260 802400A0 1092001A */ beq $a0, $s2, .L8024010C @@ -56,7 +56,7 @@ glabel func_80240000_9691C0 /* 969280 802400C0 0C046F1F */ jal func_8011BC7C /* 969284 802400C4 0220302D */ daddu $a2, $s1, $zero /* 969288 802400C8 08090027 */ j .L8024009C -/* 96928C 802400CC 00000000 */ nop +/* 96928C 802400CC 00000000 */ nop .L802400D0: /* 969290 802400D0 3412FFFF */ ori $s2, $zero, 0xffff .L802400D4: @@ -69,7 +69,7 @@ glabel func_80240000_9691C0 /* 9692AC 802400EC 0C046E54 */ jal func_8011B950 /* 9692B0 802400F0 0000382D */ daddu $a3, $zero, $zero /* 9692B4 802400F4 08090035 */ j .L802400D4 -/* 9692B8 802400F8 00000000 */ nop +/* 9692B8 802400F8 00000000 */ nop .L802400FC: /* 9692BC 802400FC 3C028015 */ lui $v0, %hi(D_801512F0) /* 9692C0 80240100 8C4212F0 */ lw $v0, %lo(D_801512F0)($v0) diff --git a/asm/nonmatchings/world/area_dro/dro_02/9691C0/func_80240124_9692E4.s b/asm/nonmatchings/world/area_dro/dro_02/9691C0/func_80240124_9692E4.s index 4b2108a004..7a10c10f5a 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9691C0/func_80240124_9692E4.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9691C0/func_80240124_9692E4.s @@ -71,20 +71,20 @@ glabel func_80240124_9692E4 /* 9693EC 8024022C 12620008 */ beq $s3, $v0, .L80240250 /* 9693F0 80240230 32C400FF */ andi $a0, $s6, 0xff /* 9693F4 80240234 080900B1 */ j .L802402C4 -/* 9693F8 80240238 00000000 */ nop +/* 9693F8 80240238 00000000 */ nop .L8024023C: /* 9693FC 8024023C 24020003 */ addiu $v0, $zero, 3 /* 969400 80240240 12620018 */ beq $s3, $v0, .L802402A4 /* 969404 80240244 32C400FF */ andi $a0, $s6, 0xff /* 969408 80240248 080900B1 */ j .L802402C4 -/* 96940C 8024024C 00000000 */ nop +/* 96940C 8024024C 00000000 */ nop .L80240250: /* 969410 80240250 32A500FF */ andi $a1, $s5, 0xff /* 969414 80240254 328600FF */ andi $a2, $s4, 0xff /* 969418 80240258 0C046F97 */ jal set_background_color_blend /* 96941C 8024025C 324700FF */ andi $a3, $s2, 0xff /* 969420 80240260 080900B1 */ j .L802402C4 -/* 969424 80240264 00000000 */ nop +/* 969424 80240264 00000000 */ nop .L80240268: /* 969428 80240268 32C400FF */ andi $a0, $s6, 0xff /* 96942C 8024026C 32A500FF */ andi $a1, $s5, 0xff @@ -100,7 +100,7 @@ glabel func_80240124_9692E4 /* 969454 80240294 0C046FAD */ jal func_8011BEB4 /* 969458 80240298 AFA20018 */ sw $v0, 0x18($sp) /* 96945C 8024029C 080900B1 */ j .L802402C4 -/* 969460 802402A0 00000000 */ nop +/* 969460 802402A0 00000000 */ nop .L802402A4: /* 969464 802402A4 32A500FF */ andi $a1, $s5, 0xff /* 969468 802402A8 328600FF */ andi $a2, $s4, 0xff @@ -124,5 +124,5 @@ glabel func_80240124_9692E4 /* 9694AC 802402EC 24020002 */ addiu $v0, $zero, 2 /* 9694B0 802402F0 03E00008 */ jr $ra /* 9694B4 802402F4 27BD0058 */ addiu $sp, $sp, 0x58 -/* 9694B8 802402F8 00000000 */ nop -/* 9694BC 802402FC 00000000 */ nop +/* 9694B8 802402F8 00000000 */ nop +/* 9694BC 802402FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240300_9694C0.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240300_9694C0.s index db88412219..e79492b49b 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240300_9694C0.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240300_9694C0.s @@ -26,7 +26,7 @@ glabel func_80240300_9694C0 /* 969510 80240350 1440FFFA */ bnez $v0, .L8024033C /* 969514 80240354 24A50004 */ addiu $a1, $a1, 4 /* 969518 80240358 080900E7 */ j .L8024039C -/* 96951C 8024035C 00000000 */ nop +/* 96951C 8024035C 00000000 */ nop .L80240360: /* 969520 80240360 0000182D */ daddu $v1, $zero, $zero /* 969524 80240364 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024043C_9695FC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024043C_9695FC.s index 50da4603af..b48c5787ed 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024043C_9695FC.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024043C_9695FC.s @@ -115,7 +115,7 @@ glabel func_8024043C_9695FC /* 9697A4 802405E4 14E20005 */ bne $a3, $v0, .L802405FC /* 9697A8 802405E8 32E2FFFF */ andi $v0, $s7, 0xffff /* 9697AC 802405EC 14400003 */ bnez $v0, .L802405FC -/* 9697B0 802405F0 00000000 */ nop +/* 9697B0 802405F0 00000000 */ nop /* 9697B4 802405F4 14800008 */ bnez $a0, .L80240618 /* 9697B8 802405F8 24020001 */ addiu $v0, $zero, 1 .L802405FC: @@ -123,7 +123,7 @@ glabel func_8024043C_9695FC /* 9697C0 80240600 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 9697C4 80240604 80420075 */ lb $v0, 0x75($v0) /* 9697C8 80240608 10400005 */ beqz $v0, .L80240620 -/* 9697CC 8024060C 00000000 */ nop +/* 9697CC 8024060C 00000000 */ nop /* 9697D0 80240610 10800003 */ beqz $a0, .L80240620 /* 9697D4 80240614 24020001 */ addiu $v0, $zero, 1 .L80240618: diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024072C_9698EC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024072C_9698EC.s index 06c2688b99..910db3e9cc 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024072C_9698EC.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024072C_9698EC.s @@ -39,13 +39,13 @@ glabel func_8024072C_9698EC /* 969970 802407B0 10740005 */ beq $v1, $s4, .L802407C8 /* 969974 802407B4 26100001 */ addiu $s0, $s0, 1 /* 969978 802407B8 10730003 */ beq $v1, $s3, .L802407C8 -/* 96997C 802407BC 00000000 */ nop +/* 96997C 802407BC 00000000 */ nop /* 969980 802407C0 00521025 */ or $v0, $v0, $s2 /* 969984 802407C4 AC820000 */ sw $v0, ($a0) .L802407C8: /* 969988 802407C8 2A020040 */ slti $v0, $s0, 0x40 /* 96998C 802407CC 1440FFEF */ bnez $v0, .L8024078C -/* 969990 802407D0 00000000 */ nop +/* 969990 802407D0 00000000 */ nop /* 969994 802407D4 0000802D */ daddu $s0, $zero, $zero /* 969998 802407D8 3C120800 */ lui $s2, 0x800 .L802407DC: @@ -57,13 +57,13 @@ glabel func_8024072C_9698EC /* 9699B0 802407F0 8C640000 */ lw $a0, ($v1) /* 9699B4 802407F4 30820010 */ andi $v0, $a0, 0x10 /* 9699B8 802407F8 10400003 */ beqz $v0, .L80240808 -/* 9699BC 802407FC 00000000 */ nop +/* 9699BC 802407FC 00000000 */ nop /* 9699C0 80240800 00921025 */ or $v0, $a0, $s2 /* 9699C4 80240804 AC620000 */ sw $v0, ($v1) .L80240808: /* 9699C8 80240808 2A020100 */ slti $v0, $s0, 0x100 /* 9699CC 8024080C 1440FFF3 */ bnez $v0, .L802407DC -/* 9699D0 80240810 00000000 */ nop +/* 9699D0 80240810 00000000 */ nop /* 9699D4 80240814 AE200070 */ sw $zero, 0x70($s1) .L80240818: /* 9699D8 80240818 8E220070 */ lw $v0, 0x70($s1) diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240878_969A38.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240878_969A38.s index 69e13c8380..0e02e8626c 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240878_969A38.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240878_969A38.s @@ -32,7 +32,7 @@ glabel func_80240878_969A38 /* 969A9C 802408DC 0080302D */ daddu $a2, $a0, $zero /* 969AA0 802408E0 8E020070 */ lw $v0, 0x70($s0) /* 969AA4 802408E4 14400006 */ bnez $v0, .L80240900 -/* 969AA8 802408E8 00000000 */ nop +/* 969AA8 802408E8 00000000 */ nop /* 969AAC 802408EC 8E020074 */ lw $v0, 0x74($s0) /* 969AB0 802408F0 14400003 */ bnez $v0, .L80240900 /* 969AB4 802408F4 24020001 */ addiu $v0, $zero, 1 @@ -66,13 +66,13 @@ glabel func_80240878_969A38 /* 969B1C 8024095C 10730005 */ beq $v1, $s3, .L80240974 /* 969B20 80240960 26100001 */ addiu $s0, $s0, 1 /* 969B24 80240964 10720003 */ beq $v1, $s2, .L80240974 -/* 969B28 80240968 00000000 */ nop +/* 969B28 80240968 00000000 */ nop /* 969B2C 8024096C 00511024 */ and $v0, $v0, $s1 /* 969B30 80240970 AC820000 */ sw $v0, ($a0) .L80240974: /* 969B34 80240974 2A020040 */ slti $v0, $s0, 0x40 /* 969B38 80240978 1440FFEF */ bnez $v0, .L80240938 -/* 969B3C 8024097C 00000000 */ nop +/* 969B3C 8024097C 00000000 */ nop /* 969B40 80240980 0000802D */ daddu $s0, $zero, $zero /* 969B44 80240984 3C11F7FF */ lui $s1, 0xf7ff /* 969B48 80240988 3631FFFF */ ori $s1, $s1, 0xffff @@ -85,7 +85,7 @@ glabel func_80240878_969A38 /* 969B60 802409A0 8C640000 */ lw $a0, ($v1) /* 969B64 802409A4 30820010 */ andi $v0, $a0, 0x10 /* 969B68 802409A8 10400003 */ beqz $v0, .L802409B8 -/* 969B6C 802409AC 00000000 */ nop +/* 969B6C 802409AC 00000000 */ nop /* 969B70 802409B0 00911024 */ and $v0, $a0, $s1 /* 969B74 802409B4 AC620000 */ sw $v0, ($v1) .L802409B8: @@ -93,7 +93,7 @@ glabel func_80240878_969A38 /* 969B7C 802409BC 1440FFF3 */ bnez $v0, .L8024098C /* 969B80 802409C0 24020002 */ addiu $v0, $zero, 2 /* 969B84 802409C4 08090274 */ j .L802409D0 -/* 969B88 802409C8 00000000 */ nop +/* 969B88 802409C8 00000000 */ nop .L802409CC: /* 969B8C 802409CC 0000102D */ daddu $v0, $zero, $zero .L802409D0: diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240A70_969C30.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240A70_969C30.s index e01f108bdc..4914e75846 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240A70_969C30.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240A70_969C30.s @@ -16,19 +16,19 @@ glabel func_80240A70_969C30 /* 969C5C 80240A9C 0220202D */ daddu $a0, $s1, $zero /* 969C60 80240AA0 3C05F4AC */ lui $a1, 0xf4ac /* 969C64 80240AA4 4482B000 */ mtc1 $v0, $f22 -/* 969C68 80240AA8 00000000 */ nop +/* 969C68 80240AA8 00000000 */ nop /* 969C6C 80240AAC 4680B5A0 */ cvt.s.w $f22, $f22 /* 969C70 80240AB0 0C0B1EAF */ jal get_variable /* 969C74 80240AB4 34A5D482 */ ori $a1, $a1, 0xd482 /* 969C78 80240AB8 0220202D */ daddu $a0, $s1, $zero /* 969C7C 80240ABC 3C05F4AC */ lui $a1, 0xf4ac /* 969C80 80240AC0 4482A000 */ mtc1 $v0, $f20 -/* 969C84 80240AC4 00000000 */ nop +/* 969C84 80240AC4 00000000 */ nop /* 969C88 80240AC8 4680A520 */ cvt.s.w $f20, $f20 /* 969C8C 80240ACC 0C0B1EAF */ jal get_variable /* 969C90 80240AD0 34A5D483 */ ori $a1, $a1, 0xd483 /* 969C94 80240AD4 44821000 */ mtc1 $v0, $f2 -/* 969C98 80240AD8 00000000 */ nop +/* 969C98 80240AD8 00000000 */ nop /* 969C9C 80240ADC 468010A0 */ cvt.s.w $f2, $f2 /* 969CA0 80240AE0 4405B000 */ mfc1 $a1, $f22 /* 969CA4 80240AE4 4406A000 */ mfc1 $a2, $f20 @@ -45,19 +45,19 @@ glabel func_80240A70_969C30 /* 969CD0 80240B10 0220202D */ daddu $a0, $s1, $zero /* 969CD4 80240B14 3C05F4AC */ lui $a1, 0xf4ac /* 969CD8 80240B18 4482B000 */ mtc1 $v0, $f22 -/* 969CDC 80240B1C 00000000 */ nop +/* 969CDC 80240B1C 00000000 */ nop /* 969CE0 80240B20 4680B5A0 */ cvt.s.w $f22, $f22 /* 969CE4 80240B24 0C0B1EAF */ jal get_variable /* 969CE8 80240B28 34A5D482 */ ori $a1, $a1, 0xd482 /* 969CEC 80240B2C 0220202D */ daddu $a0, $s1, $zero /* 969CF0 80240B30 3C05F4AC */ lui $a1, 0xf4ac /* 969CF4 80240B34 4482A000 */ mtc1 $v0, $f20 -/* 969CF8 80240B38 00000000 */ nop +/* 969CF8 80240B38 00000000 */ nop /* 969CFC 80240B3C 4680A520 */ cvt.s.w $f20, $f20 /* 969D00 80240B40 0C0B1EAF */ jal get_variable /* 969D04 80240B44 34A5D483 */ ori $a1, $a1, 0xd483 /* 969D08 80240B48 44821000 */ mtc1 $v0, $f2 -/* 969D0C 80240B4C 00000000 */ nop +/* 969D0C 80240B4C 00000000 */ nop /* 969D10 80240B50 468010A0 */ cvt.s.w $f2, $f2 /* 969D14 80240B54 4405B000 */ mfc1 $a1, $f22 /* 969D18 80240B58 4406A000 */ mfc1 $a2, $f20 @@ -73,19 +73,19 @@ glabel func_80240A70_969C30 /* 969D40 80240B80 0220202D */ daddu $a0, $s1, $zero /* 969D44 80240B84 3C05F4AC */ lui $a1, 0xf4ac /* 969D48 80240B88 4482B000 */ mtc1 $v0, $f22 -/* 969D4C 80240B8C 00000000 */ nop +/* 969D4C 80240B8C 00000000 */ nop /* 969D50 80240B90 4680B5A0 */ cvt.s.w $f22, $f22 /* 969D54 80240B94 0C0B1EAF */ jal get_variable /* 969D58 80240B98 34A5D482 */ ori $a1, $a1, 0xd482 /* 969D5C 80240B9C 0220202D */ daddu $a0, $s1, $zero /* 969D60 80240BA0 3C05F4AC */ lui $a1, 0xf4ac /* 969D64 80240BA4 4482A000 */ mtc1 $v0, $f20 -/* 969D68 80240BA8 00000000 */ nop +/* 969D68 80240BA8 00000000 */ nop /* 969D6C 80240BAC 4680A520 */ cvt.s.w $f20, $f20 /* 969D70 80240BB0 0C0B1EAF */ jal get_variable /* 969D74 80240BB4 34A5D483 */ ori $a1, $a1, 0xd483 /* 969D78 80240BB8 44821000 */ mtc1 $v0, $f2 -/* 969D7C 80240BBC 00000000 */ nop +/* 969D7C 80240BBC 00000000 */ nop /* 969D80 80240BC0 468010A0 */ cvt.s.w $f2, $f2 /* 969D84 80240BC4 4405B000 */ mfc1 $a1, $f22 /* 969D88 80240BC8 4406A000 */ mfc1 $a2, $f20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240C88_969E48.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240C88_969E48.s index b64c6f9d9b..05f1482bae 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240C88_969E48.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240C88_969E48.s @@ -44,7 +44,7 @@ glabel func_80240C88_969E48 /* 969EDC 80240D1C 3C048025 */ lui $a0, %hi(gPauseMenuCursorPosY) /* 969EE0 80240D20 8C84EFA0 */ lw $a0, %lo(gPauseMenuCursorPosY)($a0) /* 969EE4 80240D24 0C048D70 */ jal func_801235C0 -/* 969EE8 80240D28 00000000 */ nop +/* 969EE8 80240D28 00000000 */ nop /* 969EEC 80240D2C 24020002 */ addiu $v0, $zero, 2 .L80240D30: /* 969EF0 80240D30 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802412F8_96A4B8.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802412F8_96A4B8.s index e61891742c..a5386fc484 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802412F8_96A4B8.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802412F8_96A4B8.s @@ -13,7 +13,7 @@ glabel func_802412F8_96A4B8 /* 96A4D8 80241318 14620006 */ bne $v1, $v0, .L80241334 /* 96A4DC 8024131C 24020002 */ addiu $v0, $zero, 2 /* 96A4E0 80241320 44800000 */ mtc1 $zero, $f0 -/* 96A4E4 80241324 00000000 */ nop +/* 96A4E4 80241324 00000000 */ nop /* 96A4E8 80241328 44050000 */ mfc1 $a1, $f0 /* 96A4EC 8024132C 080904D3 */ j .L8024134C /* 96A4F0 80241330 0000202D */ daddu $a0, $zero, $zero @@ -21,9 +21,9 @@ glabel func_802412F8_96A4B8 /* 96A4F4 80241334 14620008 */ bne $v1, $v0, .L80241358 /* 96A4F8 80241338 24040001 */ addiu $a0, $zero, 1 /* 96A4FC 8024133C 44800000 */ mtc1 $zero, $f0 -/* 96A500 80241340 00000000 */ nop +/* 96A500 80241340 00000000 */ nop /* 96A504 80241344 44050000 */ mfc1 $a1, $f0 -/* 96A508 80241348 00000000 */ nop +/* 96A508 80241348 00000000 */ nop .L8024134C: /* 96A50C 8024134C 00A0302D */ daddu $a2, $a1, $zero /* 96A510 80241350 0C01C5A4 */ jal func_80071690 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241394_96A554.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241394_96A554.s index 3a6796d5b8..5901268a69 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241394_96A554.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241394_96A554.s @@ -80,7 +80,7 @@ glabel func_80241394_96A554 /* 96A658 80241498 0000302D */ daddu $a2, $zero, $zero .L8024149C: /* 96A65C 8024149C 0C0B2026 */ jal set_variable -/* 96A660 802414A0 00000000 */ nop +/* 96A660 802414A0 00000000 */ nop /* 96A664 802414A4 8FBF001C */ lw $ra, 0x1c($sp) /* 96A668 802414A8 8FB20018 */ lw $s2, 0x18($sp) /* 96A66C 802414AC 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802414C0_96A680.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802414C0_96A680.s index 50f26d8530..996a19733e 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802414C0_96A680.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802414C0_96A680.s @@ -39,13 +39,13 @@ glabel func_802414C0_96A680 /* 96A704 80241544 10740005 */ beq $v1, $s4, .L8024155C /* 96A708 80241548 26100001 */ addiu $s0, $s0, 1 /* 96A70C 8024154C 10730003 */ beq $v1, $s3, .L8024155C -/* 96A710 80241550 00000000 */ nop +/* 96A710 80241550 00000000 */ nop /* 96A714 80241554 00521025 */ or $v0, $v0, $s2 /* 96A718 80241558 AC820000 */ sw $v0, ($a0) .L8024155C: /* 96A71C 8024155C 2A020040 */ slti $v0, $s0, 0x40 /* 96A720 80241560 1440FFEF */ bnez $v0, .L80241520 -/* 96A724 80241564 00000000 */ nop +/* 96A724 80241564 00000000 */ nop /* 96A728 80241568 AE200070 */ sw $zero, 0x70($s1) .L8024156C: /* 96A72C 8024156C 8E220070 */ lw $v0, 0x70($s1) diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802415CC_96A78C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802415CC_96A78C.s index 96de3b8af9..173cb85933 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802415CC_96A78C.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802415CC_96A78C.s @@ -32,7 +32,7 @@ glabel func_802415CC_96A78C /* 96A7F0 80241630 0080302D */ daddu $a2, $a0, $zero /* 96A7F4 80241634 8E020070 */ lw $v0, 0x70($s0) /* 96A7F8 80241638 14400006 */ bnez $v0, .L80241654 -/* 96A7FC 8024163C 00000000 */ nop +/* 96A7FC 8024163C 00000000 */ nop /* 96A800 80241640 8E020074 */ lw $v0, 0x74($s0) /* 96A804 80241644 14400003 */ bnez $v0, .L80241654 /* 96A808 80241648 24020001 */ addiu $v0, $zero, 1 @@ -66,7 +66,7 @@ glabel func_802415CC_96A78C /* 96A870 802416B0 10730005 */ beq $v1, $s3, .L802416C8 /* 96A874 802416B4 26100001 */ addiu $s0, $s0, 1 /* 96A878 802416B8 10720003 */ beq $v1, $s2, .L802416C8 -/* 96A87C 802416BC 00000000 */ nop +/* 96A87C 802416BC 00000000 */ nop /* 96A880 802416C0 00511024 */ and $v0, $v0, $s1 /* 96A884 802416C4 AC820000 */ sw $v0, ($a0) .L802416C8: @@ -74,7 +74,7 @@ glabel func_802415CC_96A78C /* 96A88C 802416CC 1440FFEF */ bnez $v0, .L8024168C /* 96A890 802416D0 24020002 */ addiu $v0, $zero, 2 /* 96A894 802416D4 080905B8 */ j .L802416E0 -/* 96A898 802416D8 00000000 */ nop +/* 96A898 802416D8 00000000 */ nop .L802416DC: /* 96A89C 802416DC 0000102D */ daddu $v0, $zero, $zero .L802416E0: diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802416FC_96A8BC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802416FC_96A8BC.s index e5f39b2ee5..0ca9ef384d 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802416FC_96A8BC.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802416FC_96A8BC.s @@ -82,7 +82,7 @@ glabel func_802416FC_96A8BC /* 96A9F0 80241830 3C058024 */ lui $a1, %hi(func_80242EAC_96C06C) /* 96A9F4 80241834 24A52EAC */ addiu $a1, $a1, %lo(func_80242EAC_96C06C) /* 96A9F8 80241838 0C048C56 */ jal bind_dynamic_entity_3 -/* 96A9FC 8024183C 00000000 */ nop +/* 96A9FC 8024183C 00000000 */ nop /* 96AA00 80241840 0240202D */ daddu $a0, $s2, $zero /* 96AA04 80241844 3C05F4AC */ lui $a1, 0xf4ac /* 96AA08 80241848 34A5D487 */ ori $a1, $a1, 0xd487 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242214_96B3D4.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242214_96B3D4.s index 5e060f247f..90bdbb06d0 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242214_96B3D4.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242214_96B3D4.s @@ -28,13 +28,13 @@ glabel func_80242214_96B3D4 /* 96B430 80242270 3C05F4AC */ lui $a1, 0xf4ac /* 96B434 80242274 8E040000 */ lw $a0, ($s0) /* 96B438 80242278 4482C000 */ mtc1 $v0, $f24 -/* 96B43C 8024227C 00000000 */ nop +/* 96B43C 8024227C 00000000 */ nop /* 96B440 80242280 4680C620 */ cvt.s.w $f24, $f24 /* 96B444 80242284 0C0B1EAF */ jal get_variable /* 96B448 80242288 34A5D485 */ ori $a1, $a1, 0xd485 /* 96B44C 8024228C 3C05F4AC */ lui $a1, 0xf4ac /* 96B450 80242290 4482A000 */ mtc1 $v0, $f20 -/* 96B454 80242294 00000000 */ nop +/* 96B454 80242294 00000000 */ nop /* 96B458 80242298 4680A520 */ cvt.s.w $f20, $f20 /* 96B45C 8024229C 8E040000 */ lw $a0, ($s0) /* 96B460 802422A0 4480B000 */ mtc1 $zero, $f22 @@ -63,7 +63,7 @@ glabel func_80242214_96B3D4 /* 96B4BC 802422FC 46001087 */ neg.s $f2, $f2 /* 96B4C0 80242300 44061000 */ mfc1 $a2, $f2 /* 96B4C4 80242304 44820000 */ mtc1 $v0, $f0 -/* 96B4C8 80242308 00000000 */ nop +/* 96B4C8 80242308 00000000 */ nop /* 96B4CC 8024230C 46800020 */ cvt.s.w $f0, $f0 /* 96B4D0 80242310 E7B80014 */ swc1 $f24, 0x14($sp) /* 96B4D4 80242314 E7B40018 */ swc1 $f20, 0x18($sp) diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s index 40794c625b..81617a76fc 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s @@ -16,11 +16,12 @@ glabel func_8024240C_96B5CC /* 96B5F8 80242438 2C62000E */ sltiu $v0, $v1, 0xe /* 96B5FC 8024243C 10400295 */ beqz $v0, .L80242E94 /* 96B600 80242440 00031080 */ sll $v0, $v1, 2 -/* 96B604 80242444 3C018025 */ lui $at, %hi(D_8024EF20) +/* 96B604 80242444 3C018025 */ lui $at, %hi(jtbl_8024EF20_9780E0) /* 96B608 80242448 00220821 */ addu $at, $at, $v0 -/* 96B60C 8024244C 8C22EF20 */ lw $v0, %lo(D_8024EF20)($at) +/* 96B60C 8024244C 8C22EF20 */ lw $v0, %lo(jtbl_8024EF20_9780E0)($at) /* 96B610 80242450 00400008 */ jr $v0 -/* 96B614 80242454 00000000 */ nop +/* 96B614 80242454 00000000 */ nop +glabel L80242458_96B618 /* 96B618 80242458 3C05F4AC */ lui $a1, 0xf4ac /* 96B61C 8024245C 34A5D489 */ ori $a1, $a1, 0xd489 /* 96B620 80242460 3C048025 */ lui $a0, %hi(D_8024EFCC) @@ -74,6 +75,7 @@ glabel func_8024240C_96B5CC /* 96B6E0 80242520 E4400050 */ swc1 $f0, 0x50($v0) /* 96B6E4 80242524 08090BA5 */ j .L80242E94 /* 96B6E8 80242528 E4460054 */ swc1 $f6, 0x54($v0) +glabel L8024252C_96B6EC /* 96B6EC 8024252C 3C028025 */ lui $v0, %hi(D_8024F010) /* 96B6F0 80242530 2442F010 */ addiu $v0, $v0, %lo(D_8024F010) /* 96B6F4 80242534 3C108025 */ lui $s0, %hi(D_8024EF88) @@ -96,17 +98,17 @@ glabel func_8024240C_96B5CC /* 96B738 80242578 E4400050 */ swc1 $f0, 0x50($v0) /* 96B73C 8024257C 24020012 */ addiu $v0, $zero, 0x12 /* 96B740 80242580 14620006 */ bne $v1, $v0, .L8024259C -/* 96B744 80242584 00000000 */ nop +/* 96B744 80242584 00000000 */ nop /* 96B748 80242588 3C01C47A */ lui $at, 0xc47a /* 96B74C 8024258C 44810000 */ mtc1 $at, $f0 -/* 96B750 80242590 00000000 */ nop +/* 96B750 80242590 00000000 */ nop /* 96B754 80242594 3C018011 */ lui $at, %hi(gPlayerStatus+0x2C) /* 96B758 80242598 E420EFF4 */ swc1 $f0, %lo(gPlayerStatus+0x2C)($at) .L8024259C: /* 96B75C 8024259C 8E030000 */ lw $v1, ($s0) /* 96B760 802425A0 24020014 */ addiu $v0, $zero, 0x14 /* 96B764 802425A4 1462023B */ bne $v1, $v0, .L80242E94 -/* 96B768 802425A8 00000000 */ nop +/* 96B768 802425A8 00000000 */ nop /* 96B76C 802425AC 3C05F4AC */ lui $a1, 0xf4ac /* 96B770 802425B0 34A5D489 */ ori $a1, $a1, 0xd489 /* 96B774 802425B4 3C048025 */ lui $a0, %hi(D_8024EFCC) @@ -115,6 +117,7 @@ glabel func_8024240C_96B5CC /* 96B780 802425C0 24060002 */ addiu $a2, $zero, 2 /* 96B784 802425C4 08090BA5 */ j .L80242E94 /* 96B788 802425C8 AE000000 */ sw $zero, ($s0) +glabel L802425CC_96B78C /* 96B78C 802425CC 3C028025 */ lui $v0, %hi(D_8024F010) /* 96B790 802425D0 2442F010 */ addiu $v0, $v0, %lo(D_8024F010) /* 96B794 802425D4 24030002 */ addiu $v1, $zero, 2 @@ -125,6 +128,7 @@ glabel func_8024240C_96B5CC /* 96B7A8 802425E8 AC400008 */ sw $zero, 8($v0) /* 96B7AC 802425EC 08090BA5 */ j .L80242E94 /* 96B7B0 802425F0 AC40000C */ sw $zero, 0xc($v0) +glabel L802425F4_96B7B4 /* 96B7B4 802425F4 3C038025 */ lui $v1, %hi(D_8024F010) /* 96B7B8 802425F8 2463F010 */ addiu $v1, $v1, %lo(D_8024F010) /* 96B7BC 802425FC 24020001 */ addiu $v0, $zero, 1 @@ -152,6 +156,7 @@ glabel func_8024240C_96B5CC /* 96B814 80242654 8C84EFCC */ lw $a0, %lo(D_8024EFCC)($a0) /* 96B818 80242658 08090A91 */ j .L80242A44 /* 96B81C 8024265C 24060004 */ addiu $a2, $zero, 4 +glabel L80242660_96B820 /* 96B820 80242660 3C078025 */ lui $a3, %hi(D_8024EF88) /* 96B824 80242664 24E7EF88 */ addiu $a3, $a3, %lo(D_8024EF88) /* 96B828 80242668 3C01C2C8 */ lui $at, 0xc2c8 @@ -189,6 +194,7 @@ glabel func_8024240C_96B5CC /* 96B8A8 802426E8 0000282D */ daddu $a1, $zero, $zero /* 96B8AC 802426EC 08090A26 */ j .L80242898 /* 96B8B0 802426F0 24060018 */ addiu $a2, $zero, 0x18 +glabel L802426F4_96B8B4 /* 96B8B4 802426F4 3C028025 */ lui $v0, %hi(D_8024F010) /* 96B8B8 802426F8 2442F010 */ addiu $v0, $v0, %lo(D_8024F010) /* 96B8BC 802426FC C4400010 */ lwc1 $f0, 0x10($v0) @@ -215,7 +221,7 @@ glabel func_8024240C_96B5CC /* 96B910 80242750 C7A2001C */ lwc1 $f2, 0x1c($sp) /* 96B914 80242754 3C0141A0 */ lui $at, 0x41a0 /* 96B918 80242758 44810000 */ mtc1 $at, $f0 -/* 96B91C 8024275C 00000000 */ nop +/* 96B91C 8024275C 00000000 */ nop /* 96B920 80242760 46001080 */ add.s $f2, $f2, $f0 /* 96B924 80242764 C7A00018 */ lwc1 $f0, 0x18($sp) /* 96B928 80242768 44050000 */ mfc1 $a1, $f0 @@ -242,6 +248,7 @@ glabel func_8024240C_96B5CC /* 96B978 802427B8 0000282D */ daddu $a1, $zero, $zero /* 96B97C 802427BC 08090A26 */ j .L80242898 /* 96B980 802427C0 24060040 */ addiu $a2, $zero, 0x40 +glabel L802427C4_96B984 /* 96B984 802427C4 3C028025 */ lui $v0, %hi(D_8024F010) /* 96B988 802427C8 2442F010 */ addiu $v0, $v0, %lo(D_8024F010) /* 96B98C 802427CC C4420010 */ lwc1 $f2, 0x10($v0) @@ -270,7 +277,7 @@ glabel func_8024240C_96B5CC /* 96B9E8 80242828 C7A2002C */ lwc1 $f2, 0x2c($sp) /* 96B9EC 8024282C 3C0141A0 */ lui $at, 0x41a0 /* 96B9F0 80242830 44810000 */ mtc1 $at, $f0 -/* 96B9F4 80242834 00000000 */ nop +/* 96B9F4 80242834 00000000 */ nop /* 96B9F8 80242838 46001080 */ add.s $f2, $f2, $f0 /* 96B9FC 8024283C C7A00028 */ lwc1 $f0, 0x28($sp) /* 96BA00 80242840 44050000 */ mfc1 $a1, $f0 @@ -300,7 +307,8 @@ glabel func_8024240C_96B5CC /* 96BA58 80242898 0C0526AE */ jal _play_sound /* 96BA5C 8024289C 00A0382D */ daddu $a3, $a1, $zero /* 96BA60 802428A0 08090BA5 */ j .L80242E94 -/* 96BA64 802428A4 00000000 */ nop +/* 96BA64 802428A4 00000000 */ nop +glabel L802428A8_96BA68 /* 96BA68 802428A8 3C028025 */ lui $v0, %hi(D_8024F010) /* 96BA6C 802428AC 2442F010 */ addiu $v0, $v0, %lo(D_8024F010) /* 96BA70 802428B0 C4420034 */ lwc1 $f2, 0x34($v0) @@ -329,7 +337,7 @@ glabel func_8024240C_96B5CC /* 96BACC 8024290C C7A2003C */ lwc1 $f2, 0x3c($sp) /* 96BAD0 80242910 3C0141A0 */ lui $at, 0x41a0 /* 96BAD4 80242914 44810000 */ mtc1 $at, $f0 -/* 96BAD8 80242918 00000000 */ nop +/* 96BAD8 80242918 00000000 */ nop /* 96BADC 8024291C 46001080 */ add.s $f2, $f2, $f0 /* 96BAE0 80242920 C7A00038 */ lwc1 $f0, 0x38($sp) /* 96BAE4 80242924 44050000 */ mfc1 $a1, $f0 @@ -353,7 +361,8 @@ glabel func_8024240C_96B5CC /* 96BB28 80242968 0C0B2026 */ jal set_variable /* 96BB2C 8024296C AE000000 */ sw $zero, ($s0) /* 96BB30 80242970 08090BA5 */ j .L80242E94 -/* 96BB34 80242974 00000000 */ nop +/* 96BB34 80242974 00000000 */ nop +glabel L80242978_96BB38 /* 96BB38 80242978 3C028025 */ lui $v0, %hi(D_8024F010) /* 96BB3C 8024297C 2442F010 */ addiu $v0, $v0, %lo(D_8024F010) /* 96BB40 80242980 C4400034 */ lwc1 $f0, 0x34($v0) @@ -376,6 +385,7 @@ glabel func_8024240C_96B5CC /* 96BB84 802429C4 8C84EFCC */ lw $a0, %lo(D_8024EFCC)($a0) /* 96BB88 802429C8 08090A91 */ j .L80242A44 /* 96BB8C 802429CC 34A5D489 */ ori $a1, $a1, 0xd489 +glabel L802429D0_96BB90 /* 96BB90 802429D0 3C028025 */ lui $v0, %hi(D_8024F010) /* 96BB94 802429D4 2442F010 */ addiu $v0, $v0, %lo(D_8024F010) /* 96BB98 802429D8 C4420004 */ lwc1 $f2, 4($v0) @@ -409,7 +419,8 @@ glabel func_8024240C_96B5CC /* 96BC04 80242A44 0C0B2026 */ jal set_variable /* 96BC08 80242A48 ACE00000 */ sw $zero, ($a3) /* 96BC0C 80242A4C 08090BA5 */ j .L80242E94 -/* 96BC10 80242A50 00000000 */ nop +/* 96BC10 80242A50 00000000 */ nop +glabel L80242A54_96BC14 /* 96BC14 80242A54 3C038025 */ lui $v1, %hi(D_8024F010) /* 96BC18 80242A58 2463F010 */ addiu $v1, $v1, %lo(D_8024F010) /* 96BC1C 80242A5C 24020003 */ addiu $v0, $zero, 3 @@ -421,6 +432,7 @@ glabel func_8024240C_96B5CC /* 96BC34 80242A74 AC600048 */ sw $zero, 0x48($v1) /* 96BC38 80242A78 08090BA5 */ j .L80242E94 /* 96BC3C 80242A7C AC62001C */ sw $v0, 0x1c($v1) +glabel L80242A80_96BC40 /* 96BC40 80242A80 3C05F4AC */ lui $a1, 0xf4ac /* 96BC44 80242A84 34A5D489 */ ori $a1, $a1, 0xd489 /* 96BC48 80242A88 2406000C */ addiu $a2, $zero, 0xc @@ -474,7 +486,7 @@ glabel func_8024240C_96B5CC /* 96BD04 80242B44 C7A2004C */ lwc1 $f2, 0x4c($sp) /* 96BD08 80242B48 3C0141A0 */ lui $at, 0x41a0 /* 96BD0C 80242B4C 44810000 */ mtc1 $at, $f0 -/* 96BD10 80242B50 00000000 */ nop +/* 96BD10 80242B50 00000000 */ nop /* 96BD14 80242B54 46001080 */ add.s $f2, $f2, $f0 /* 96BD18 80242B58 C7A00048 */ lwc1 $f0, 0x48($sp) /* 96BD1C 80242B5C 24040002 */ addiu $a0, $zero, 2 @@ -514,7 +526,7 @@ glabel func_8024240C_96B5CC /* 96BDA0 80242BE0 C4400038 */ lwc1 $f0, 0x38($v0) /* 96BDA4 80242BE4 46000021 */ cvt.d.s $f0, $f0 /* 96BDA8 80242BE8 46340002 */ mul.d $f0, $f0, $f20 -/* 96BDAC 80242BEC 00000000 */ nop +/* 96BDAC 80242BEC 00000000 */ nop /* 96BDB0 80242BF0 46200020 */ cvt.s.d $f0, $f0 /* 96BDB4 80242BF4 E4400038 */ swc1 $f0, 0x38($v0) /* 96BDB8 80242BF8 8E020000 */ lw $v0, ($s0) @@ -528,9 +540,10 @@ glabel func_8024240C_96B5CC /* 96BDD4 80242C14 26220010 */ addiu $v0, $s1, 0x10 /* 96BDD8 80242C18 0202102A */ slt $v0, $s0, $v0 /* 96BDDC 80242C1C 1040009D */ beqz $v0, .L80242E94 -/* 96BDE0 80242C20 00000000 */ nop +/* 96BDE0 80242C20 00000000 */ nop /* 96BDE4 80242C24 08090AD1 */ j .L80242B44 -/* 96BDE8 80242C28 00000000 */ nop +/* 96BDE8 80242C28 00000000 */ nop +glabel L80242C2C_96BDEC /* 96BDEC 80242C2C 24040001 */ addiu $a0, $zero, 1 /* 96BDF0 80242C30 27A50058 */ addiu $a1, $sp, 0x58 /* 96BDF4 80242C34 27A6005C */ addiu $a2, $sp, 0x5c @@ -577,7 +590,7 @@ glabel func_8024240C_96B5CC /* 96BE94 80242CD4 C4400034 */ lwc1 $f0, 0x34($v0) /* 96BE98 80242CD8 46000021 */ cvt.d.s $f0, $f0 /* 96BE9C 80242CDC 4624003C */ c.lt.d $f0, $f4 -/* 96BEA0 80242CE0 00000000 */ nop +/* 96BEA0 80242CE0 00000000 */ nop /* 96BEA4 80242CE4 45030001 */ bc1tl .L80242CEC /* 96BEA8 80242CE8 E44C0034 */ swc1 $f12, 0x34($v0) .L80242CEC: @@ -608,7 +621,7 @@ glabel func_8024240C_96B5CC .L80242D48: /* 96BF08 80242D48 00A7102A */ slt $v0, $a1, $a3 /* 96BF0C 80242D4C 1440FFCF */ bnez $v0, .L80242C8C -/* 96BF10 80242D50 00000000 */ nop +/* 96BF10 80242D50 00000000 */ nop /* 96BF14 80242D54 3C108025 */ lui $s0, %hi(D_8024F010) /* 96BF18 80242D58 2610F010 */ addiu $s0, $s0, %lo(D_8024F010) /* 96BF1C 80242D5C 3C048025 */ lui $a0, %hi(gPauseMenuTabs) @@ -664,7 +677,7 @@ glabel func_8024240C_96B5CC /* 96BFE4 80242E24 C7A2006C */ lwc1 $f2, 0x6c($sp) /* 96BFE8 80242E28 3C0141A0 */ lui $at, 0x41a0 /* 96BFEC 80242E2C 44810000 */ mtc1 $at, $f0 -/* 96BFF0 80242E30 00000000 */ nop +/* 96BFF0 80242E30 00000000 */ nop /* 96BFF4 80242E34 46001080 */ add.s $f2, $f2, $f0 /* 96BFF8 80242E38 C7A00068 */ lwc1 $f0, 0x68($sp) /* 96BFFC 80242E3C 44050000 */ mfc1 $a1, $f0 @@ -691,6 +704,7 @@ glabel func_8024240C_96B5CC /* 96C04C 80242E8C 1440FFF9 */ bnez $v0, .L80242E74 /* 96C050 80242E90 24840004 */ addiu $a0, $a0, 4 .L80242E94: +glabel L80242E94_96C054 /* 96C054 80242E94 8FBF0080 */ lw $ra, 0x80($sp) /* 96C058 80242E98 8FB1007C */ lw $s1, 0x7c($sp) /* 96C05C 80242E9C 8FB00078 */ lw $s0, 0x78($sp) diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242EAC_96C06C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242EAC_96C06C.s index 89c6cd235b..0200b55ebd 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242EAC_96C06C.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242EAC_96C06C.s @@ -18,14 +18,14 @@ glabel func_80242EAC_96C06C /* 96C0A0 80242EE0 3C05F4AC */ lui $a1, 0xf4ac /* 96C0A4 80242EE4 8E440000 */ lw $a0, ($s2) /* 96C0A8 80242EE8 4482B000 */ mtc1 $v0, $f22 -/* 96C0AC 80242EEC 00000000 */ nop +/* 96C0AC 80242EEC 00000000 */ nop /* 96C0B0 80242EF0 4680B5A0 */ cvt.s.w $f22, $f22 /* 96C0B4 80242EF4 0C0B1EAF */ jal get_variable /* 96C0B8 80242EF8 34A5D485 */ ori $a1, $a1, 0xd485 /* 96C0BC 80242EFC 3C05F4AC */ lui $a1, 0xf4ac /* 96C0C0 80242F00 8E440000 */ lw $a0, ($s2) /* 96C0C4 80242F04 4482A000 */ mtc1 $v0, $f20 -/* 96C0C8 80242F08 00000000 */ nop +/* 96C0C8 80242F08 00000000 */ nop /* 96C0CC 80242F0C 4680A520 */ cvt.s.w $f20, $f20 /* 96C0D0 80242F10 0C0B1EAF */ jal get_variable /* 96C0D4 80242F14 34A5D486 */ ori $a1, $a1, 0xd486 @@ -51,7 +51,7 @@ glabel func_80242EAC_96C06C /* 96C124 80242F64 E7B40018 */ swc1 $f20, 0x18($sp) /* 96C128 80242F68 E7A00010 */ swc1 $f0, 0x10($sp) /* 96C12C 80242F6C 44820000 */ mtc1 $v0, $f0 -/* 96C130 80242F70 00000000 */ nop +/* 96C130 80242F70 00000000 */ nop /* 96C134 80242F74 46800020 */ cvt.s.w $f0, $f0 /* 96C138 80242F78 46001087 */ neg.s $f2, $f2 /* 96C13C 80242F7C 44061000 */ mfc1 $a2, $f2 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024334C_96C50C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024334C_96C50C.s index dc5f9b0f84..f5d527d747 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024334C_96C50C.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024334C_96C50C.s @@ -28,7 +28,7 @@ glabel func_8024334C_96C50C /* 96C560 802433A0 00220821 */ addu $at, $at, $v0 /* 96C564 802433A4 AC20F080 */ sw $zero, %lo(D_8024F080)($at) /* 96C568 802433A8 08090CF6 */ j .L802433D8 -/* 96C56C 802433AC 00000000 */ nop +/* 96C56C 802433AC 00000000 */ nop .L802433B0: /* 96C570 802433B0 3C038025 */ lui $v1, %hi(D_8024F080) /* 96C574 802433B4 2463F080 */ addiu $v1, $v1, %lo(D_8024F080) diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802433E8_96C5A8.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802433E8_96C5A8.s index fcd6c2edd9..3c4433ac42 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802433E8_96C5A8.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802433E8_96C5A8.s @@ -28,7 +28,7 @@ glabel func_802433E8_96C5A8 /* 96C5FC 8024343C 00220821 */ addu $at, $at, $v0 /* 96C600 80243440 AC20F248 */ sw $zero, %lo(D_8024F248)($at) /* 96C604 80243444 08090D1D */ j .L80243474 -/* 96C608 80243448 00000000 */ nop +/* 96C608 80243448 00000000 */ nop .L8024344C: /* 96C60C 8024344C 3C038025 */ lui $v1, %hi(D_8024F248) /* 96C610 80243450 2463F248 */ addiu $v1, $v1, %lo(D_8024F248) diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434CC_96C68C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434CC_96C68C.s index fc267ce697..4dc066c5af 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434CC_96C68C.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434CC_96C68C.s @@ -22,7 +22,7 @@ glabel func_802434CC_96C68C /* 96C6D0 80243510 0C04DF93 */ jal func_80137E4C /* 96C6D4 80243514 24070091 */ addiu $a3, $zero, 0x91 /* 96C6D8 80243518 44900000 */ mtc1 $s0, $f0 -/* 96C6DC 8024351C 00000000 */ nop +/* 96C6DC 8024351C 00000000 */ nop /* 96C6E0 80243520 46800020 */ cvt.s.w $f0, $f0 /* 96C6E4 80243524 44050000 */ mfc1 $a1, $f0 /* 96C6E8 80243528 0C04DF62 */ jal func_80137D88 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243548_96C708.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243548_96C708.s index e8f582a6e8..304d1c85ea 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243548_96C708.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243548_96C708.s @@ -16,7 +16,7 @@ glabel func_80243548_96C708 /* 96C734 80243574 0C0B1EAF */ jal get_variable /* 96C738 80243578 0040802D */ daddu $s0, $v0, $zero /* 96C73C 8024357C 44820000 */ mtc1 $v0, $f0 -/* 96C740 80243580 00000000 */ nop +/* 96C740 80243580 00000000 */ nop /* 96C744 80243584 46800020 */ cvt.s.w $f0, $f0 /* 96C748 80243588 24020002 */ addiu $v0, $zero, 2 /* 96C74C 8024358C 00501804 */ sllv $v1, $s0, $v0 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243644_96C804.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243644_96C804.s index dd97296550..2c5bdadb2b 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243644_96C804.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243644_96C804.s @@ -12,7 +12,7 @@ glabel func_80243644_96C804 /* 96C820 80243660 80A30006 */ lb $v1, 6($a1) /* 96C824 80243664 80A20005 */ lb $v0, 5($a1) /* 96C828 80243668 14620007 */ bne $v1, $v0, .L80243688 -/* 96C82C 8024366C 00000000 */ nop +/* 96C82C 8024366C 00000000 */ nop /* 96C830 80243670 80C2028E */ lb $v0, 0x28e($a2) /* 96C834 80243674 84C30290 */ lh $v1, 0x290($a2) /* 96C838 80243678 00021200 */ sll $v0, $v0, 8 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243A40_96CC00.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243A40_96CC00.s index b467f77d22..e781c8b483 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243A40_96CC00.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243A40_96CC00.s @@ -13,4 +13,4 @@ glabel func_80243A40_96CC00 /* 96CC20 80243A60 24020002 */ addiu $v0, $zero, 2 /* 96CC24 80243A64 03E00008 */ jr $ra /* 96CC28 80243A68 27BD0018 */ addiu $sp, $sp, 0x18 -/* 96CC2C 80243A6C 00000000 */ nop +/* 96CC2C 80243A6C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A00/func_80240000_DF6A00.s b/asm/nonmatchings/world/area_end/end_00/DF6A00/func_80240000_DF6A00.s index 0628bf40e4..155bce70b7 100644 --- a/asm/nonmatchings/world/area_end/end_00/DF6A00/func_80240000_DF6A00.s +++ b/asm/nonmatchings/world/area_end/end_00/DF6A00/func_80240000_DF6A00.s @@ -8,5 +8,5 @@ glabel func_80240000_DF6A00 /* DF6A0C 8024000C A0620084 */ sb $v0, 0x84($v1) /* DF6A10 80240010 03E00008 */ jr $ra /* DF6A14 80240014 0000102D */ daddu $v0, $zero, $zero -/* DF6A18 80240018 00000000 */ nop -/* DF6A1C 8024001C 00000000 */ nop +/* DF6A18 80240018 00000000 */ nop +/* DF6A1C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240EB0_DF78B0.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240EB0_DF78B0.s index a1e1353da8..b855ac22f6 100644 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240EB0_DF78B0.s +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240EB0_DF78B0.s @@ -40,7 +40,7 @@ glabel func_80240EB0_DF78B0 /* DF793C 80240F3C AFA20018 */ sw $v0, 0x18($sp) /* DF7940 80240F40 4600B08D */ trunc.w.s $f2, $f22 /* DF7944 80240F44 44021000 */ mfc1 $v0, $f2 -/* DF7948 80240F48 00000000 */ nop +/* DF7948 80240F48 00000000 */ nop /* DF794C 80240F4C 00021400 */ sll $v0, $v0, 0x10 /* DF7950 80240F50 3C014F00 */ lui $at, 0x4f00 /* DF7954 80240F54 44810000 */ mtc1 $at, $f0 @@ -55,7 +55,7 @@ glabel func_80240EB0_DF78B0 /* DF7978 80240F78 240200C8 */ addiu $v0, $zero, 0xc8 /* DF797C 80240F7C AFA2002C */ sw $v0, 0x2c($sp) /* DF7980 80240F80 4618003E */ c.le.s $f0, $f24 -/* DF7984 80240F84 00000000 */ nop +/* DF7984 80240F84 00000000 */ nop /* DF7988 80240F88 45010005 */ bc1t .L80240FA0 /* DF798C 80240F8C AFA30014 */ sw $v1, 0x14($sp) /* DF7990 80240F90 4600C08D */ trunc.w.s $f2, $f24 @@ -67,7 +67,7 @@ glabel func_80240EB0_DF78B0 /* DF79A4 80240FA4 3C028000 */ lui $v0, 0x8000 /* DF79A8 80240FA8 4600008D */ trunc.w.s $f2, $f0 /* DF79AC 80240FAC 44031000 */ mfc1 $v1, $f2 -/* DF79B0 80240FB0 00000000 */ nop +/* DF79B0 80240FB0 00000000 */ nop /* DF79B4 80240FB4 00621825 */ or $v1, $v1, $v0 /* DF79B8 80240FB8 306200FF */ andi $v0, $v1, 0xff .L80240FBC: diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802411CC_DF7BCC.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802411CC_DF7BCC.s index a2ff3a58d1..a29fab82d6 100644 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802411CC_DF7BCC.s +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802411CC_DF7BCC.s @@ -29,7 +29,7 @@ glabel func_802411CC_DF7BCC /* DF7C2C 8024122C AFA20018 */ sw $v0, 0x18($sp) /* DF7C30 80241230 4600B00D */ trunc.w.s $f0, $f22 /* DF7C34 80241234 44020000 */ mfc1 $v0, $f0 -/* DF7C38 80241238 00000000 */ nop +/* DF7C38 80241238 00000000 */ nop /* DF7C3C 8024123C 00021400 */ sll $v0, $v0, 0x10 /* DF7C40 80241240 00021403 */ sra $v0, $v0, 0x10 /* DF7C44 80241244 AFA2001C */ sw $v0, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802419F8_DF83F8.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802419F8_DF83F8.s index 687c723182..f2e92918e0 100644 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802419F8_DF83F8.s +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802419F8_DF83F8.s @@ -40,7 +40,7 @@ glabel func_802419F8_DF83F8 /* DF8484 80241A84 AFA20018 */ sw $v0, 0x18($sp) /* DF8488 80241A88 4600B08D */ trunc.w.s $f2, $f22 /* DF848C 80241A8C 44021000 */ mfc1 $v0, $f2 -/* DF8490 80241A90 00000000 */ nop +/* DF8490 80241A90 00000000 */ nop /* DF8494 80241A94 00021400 */ sll $v0, $v0, 0x10 /* DF8498 80241A98 3C014F00 */ lui $at, 0x4f00 /* DF849C 80241A9C 44810000 */ mtc1 $at, $f0 @@ -55,7 +55,7 @@ glabel func_802419F8_DF83F8 /* DF84C0 80241AC0 240200C8 */ addiu $v0, $zero, 0xc8 /* DF84C4 80241AC4 AFA2002C */ sw $v0, 0x2c($sp) /* DF84C8 80241AC8 4618003E */ c.le.s $f0, $f24 -/* DF84CC 80241ACC 00000000 */ nop +/* DF84CC 80241ACC 00000000 */ nop /* DF84D0 80241AD0 45010005 */ bc1t .L80241AE8 /* DF84D4 80241AD4 AFA30014 */ sw $v1, 0x14($sp) /* DF84D8 80241AD8 4600C08D */ trunc.w.s $f2, $f24 @@ -67,7 +67,7 @@ glabel func_802419F8_DF83F8 /* DF84EC 80241AEC 3C028000 */ lui $v0, 0x8000 /* DF84F0 80241AF0 4600008D */ trunc.w.s $f2, $f0 /* DF84F4 80241AF4 44031000 */ mfc1 $v1, $f2 -/* DF84F8 80241AF8 00000000 */ nop +/* DF84F8 80241AF8 00000000 */ nop /* DF84FC 80241AFC 00621825 */ or $v1, $v1, $v0 /* DF8500 80241B00 306200FF */ andi $v0, $v1, 0xff .L80241B04: diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s index f287451a36..787cab2600 100644 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s @@ -56,7 +56,7 @@ glabel func_80241B34_DF8534 /* DF85F8 80241BF8 00491021 */ addu $v0, $v0, $t1 /* DF85FC 80241BFC 8C420000 */ lw $v0, ($v0) /* DF8600 80241C00 00400008 */ jr $v0 -/* DF8604 80241C04 00000000 */ nop +/* DF8604 80241C04 00000000 */ nop /* DF8608 80241C08 2682FF0D */ addiu $v0, $s4, -0xf3 /* DF860C 80241C0C 08090743 */ j .L80241D0C /* DF8610 80241C10 AE020008 */ sw $v0, 8($s0) @@ -94,7 +94,7 @@ glabel func_80241B34_DF8534 /* DF868C 80241C8C 24A52CD8 */ addiu $a1, $a1, %lo(func_80242CD8_C799B8) /* DF8690 80241C90 24090004 */ addiu $t1, $zero, 4 /* DF8694 80241C94 14890003 */ bne $a0, $t1, .L80241CA4 -/* DF8698 80241C98 00000000 */ nop +/* DF8698 80241C98 00000000 */ nop /* DF869C 80241C9C 3C058024 */ lui $a1, %hi(func_80242C70_9AB060) /* DF86A0 80241CA0 24A52C70 */ addiu $a1, $a1, %lo(func_80242C70_9AB060) .L80241CA4: @@ -128,28 +128,28 @@ glabel func_80241B34_DF8534 .L80241D00: /* DF8700 80241D00 84820002 */ lh $v0, 2($a0) /* DF8704 80241D04 1440FFF3 */ bnez $v0, .L80241CD4 -/* DF8708 80241D08 00000000 */ nop +/* DF8708 80241D08 00000000 */ nop .L80241D0C: /* DF870C 80241D0C 32C2FFFF */ andi $v0, $s6, 0xffff /* DF8710 80241D10 1040FFAC */ beqz $v0, .L80241BC4 -/* DF8714 80241D14 00000000 */ nop +/* DF8714 80241D14 00000000 */ nop /* DF8718 80241D18 96620070 */ lhu $v0, 0x70($s3) /* DF871C 80241D1C 8FA30044 */ lw $v1, 0x44($sp) /* DF8720 80241D20 30420001 */ andi $v0, $v0, 1 /* DF8724 80241D24 10400015 */ beqz $v0, .L80241D7C /* DF8728 80241D28 AE630014 */ sw $v1, 0x14($s3) /* DF872C 80241D2C 44831000 */ mtc1 $v1, $f2 -/* DF8730 80241D30 00000000 */ nop +/* DF8730 80241D30 00000000 */ nop /* DF8734 80241D34 468010A0 */ cvt.s.w $f2, $f2 /* DF8738 80241D38 3C013FE0 */ lui $at, 0x3fe0 /* DF873C 80241D3C 44810800 */ mtc1 $at, $f1 /* DF8740 80241D40 44800000 */ mtc1 $zero, $f0 /* DF8744 80241D44 460010A1 */ cvt.d.s $f2, $f2 /* DF8748 80241D48 46201082 */ mul.d $f2, $f2, $f0 -/* DF874C 80241D4C 00000000 */ nop +/* DF874C 80241D4C 00000000 */ nop /* DF8750 80241D50 44800000 */ mtc1 $zero, $f0 /* DF8754 80241D54 44800800 */ mtc1 $zero, $f1 -/* DF8758 80241D58 00000000 */ nop +/* DF8758 80241D58 00000000 */ nop /* DF875C 80241D5C 46201080 */ add.d $f2, $f2, $f0 /* DF8760 80241D60 C6600068 */ lwc1 $f0, 0x68($s3) /* DF8764 80241D64 46800021 */ cvt.d.w $f0, $f0 @@ -179,17 +179,20 @@ glabel func_80241B34_DF8534 /* DF87B8 80241DB8 2C830010 */ sltiu $v1, $a0, 0x10 /* DF87BC 80241DBC 10600016 */ beqz $v1, .L80241E18 /* DF87C0 80241DC0 00041080 */ sll $v0, $a0, 2 -/* DF87C4 80241DC4 3C018025 */ lui $at, %hi(D_8024E900) +/* DF87C4 80241DC4 3C018025 */ lui $at, %hi(jtbl_8024E900_E05300) /* DF87C8 80241DC8 00220821 */ addu $at, $at, $v0 -/* DF87CC 80241DCC 8C22E900 */ lw $v0, %lo(D_8024E900)($at) +/* DF87CC 80241DCC 8C22E900 */ lw $v0, %lo(jtbl_8024E900_E05300)($at) /* DF87D0 80241DD0 00400008 */ jr $v0 -/* DF87D4 80241DD4 00000000 */ nop +/* DF87D4 80241DD4 00000000 */ nop +glabel L80241DD8_DF87D8 /* DF87D8 80241DD8 2682FF0D */ addiu $v0, $s4, -0xf3 /* DF87DC 80241DDC 0809083B */ j .L802420EC /* DF87E0 80241DE0 AE020008 */ sw $v0, 8($s0) +glabel L80241DE4_DF87E4 /* DF87E4 80241DE4 24090001 */ addiu $t1, $zero, 1 /* DF87E8 80241DE8 0809083B */ j .L802420EC /* DF87EC 80241DEC A7A90050 */ sh $t1, 0x50($sp) +glabel L80241DF0_DF87F0 /* DF87F0 80241DF0 8E630000 */ lw $v1, ($s3) /* DF87F4 80241DF4 00711021 */ addu $v0, $v1, $s1 /* DF87F8 80241DF8 90420000 */ lbu $v0, ($v0) @@ -201,6 +204,7 @@ glabel func_80241B34_DF8534 /* DF8810 80241E10 0809083B */ j .L802420EC /* DF8814 80241E14 AE020004 */ sw $v0, 4($s0) .L80241E18: +glabel L80241E18_DF8818 /* DF8818 80241E18 328300FF */ andi $v1, $s4, 0xff /* DF881C 80241E1C 2C6200F0 */ sltiu $v0, $v1, 0xf0 /* DF8820 80241E20 10400083 */ beqz $v0, .L80242030 @@ -215,12 +219,12 @@ glabel func_80241B34_DF8534 /* DF8844 80241E44 50400005 */ beql $v0, $zero, .L80241E5C /* DF8848 80241E48 24090002 */ addiu $t1, $zero, 2 /* DF884C 80241E4C 10600007 */ beqz $v1, .L80241E6C -/* DF8850 80241E50 00000000 */ nop +/* DF8850 80241E50 00000000 */ nop /* DF8854 80241E54 0809080D */ j .L80242034 /* DF8858 80241E58 26F70001 */ addiu $s7, $s7, 1 .L80241E5C: /* DF885C 80241E5C 10690043 */ beq $v1, $t1, .L80241F6C -/* DF8860 80241E60 00000000 */ nop +/* DF8860 80241E60 00000000 */ nop /* DF8864 80241E64 0809080C */ j .L80242030 /* DF8868 80241E68 26F70001 */ addiu $s7, $s7, 1 .L80241E6C: @@ -238,7 +242,7 @@ glabel func_80241B34_DF8534 .L80241E98: /* DF8898 80241E98 240900FD */ addiu $t1, $zero, 0xfd /* DF889C 80241E9C 16C90005 */ bne $s6, $t1, .L80241EB4 -/* DF88A0 80241EA0 00000000 */ nop +/* DF88A0 80241EA0 00000000 */ nop /* DF88A4 80241EA4 8E030018 */ lw $v1, 0x18($s0) /* DF88A8 80241EA8 8E62001C */ lw $v0, 0x1c($s3) /* DF88AC 80241EAC 50620001 */ beql $v1, $v0, .L80241EB4 @@ -248,31 +252,36 @@ glabel func_80241B34_DF8534 /* DF88B8 80241EB8 2C620006 */ sltiu $v0, $v1, 6 /* DF88BC 80241EBC 1040005B */ beqz $v0, .L8024202C /* DF88C0 80241EC0 00031080 */ sll $v0, $v1, 2 -/* DF88C4 80241EC4 3C018025 */ lui $at, %hi(D_8024E940) +/* DF88C4 80241EC4 3C018025 */ lui $at, %hi(jtbl_8024E940_E05340) /* DF88C8 80241EC8 00220821 */ addu $at, $at, $v0 -/* DF88CC 80241ECC 8C22E940 */ lw $v0, %lo(D_8024E940)($at) +/* DF88CC 80241ECC 8C22E940 */ lw $v0, %lo(jtbl_8024E940_E05340)($at) /* DF88D0 80241ED0 00400008 */ jr $v0 -/* DF88D4 80241ED4 00000000 */ nop +/* DF88D4 80241ED4 00000000 */ nop +glabel L80241ED8_DF88D8 /* DF88D8 80241ED8 0260202D */ daddu $a0, $s3, $zero /* DF88DC 80241EDC 0C09009C */ jal func_80240270_DF6C70 /* DF88E0 80241EE0 0200282D */ daddu $a1, $s0, $zero /* DF88E4 80241EE4 0809080C */ j .L80242030 /* DF88E8 80241EE8 26F70001 */ addiu $s7, $s7, 1 +glabel L80241EEC_DF88EC /* DF88EC 80241EEC 0260202D */ daddu $a0, $s3, $zero /* DF88F0 80241EF0 0C090150 */ jal func_80240540_DF6F40 /* DF88F4 80241EF4 0200282D */ daddu $a1, $s0, $zero /* DF88F8 80241EF8 0809080C */ j .L80242030 /* DF88FC 80241EFC 26F70001 */ addiu $s7, $s7, 1 +glabel L80241F00_DF8900 /* DF8900 80241F00 0260202D */ daddu $a0, $s3, $zero /* DF8904 80241F04 0C090207 */ jal func_8024081C_DF721C /* DF8908 80241F08 0200282D */ daddu $a1, $s0, $zero /* DF890C 80241F0C 0809080C */ j .L80242030 /* DF8910 80241F10 26F70001 */ addiu $s7, $s7, 1 +glabel L80241F14_DF8914 /* DF8914 80241F14 0260202D */ daddu $a0, $s3, $zero /* DF8918 80241F18 0C0902BA */ jal func_80240AE8_DF74E8 /* DF891C 80241F1C 0200282D */ daddu $a1, $s0, $zero /* DF8920 80241F20 0809080C */ j .L80242030 /* DF8924 80241F24 26F70001 */ addiu $s7, $s7, 1 +glabel L80241F28_DF8928 /* DF8928 80241F28 0260202D */ daddu $a0, $s3, $zero /* DF892C 80241F2C 0C0903AC */ jal func_80240EB0_DF78B0 /* DF8930 80241F30 0200282D */ daddu $a1, $s0, $zero @@ -310,7 +319,7 @@ glabel func_80241B34_DF8534 .L80241FA0: /* DF89A0 80241FA0 240900FD */ addiu $t1, $zero, 0xfd /* DF89A4 80241FA4 16C90005 */ bne $s6, $t1, .L80241FBC -/* DF89A8 80241FA8 00000000 */ nop +/* DF89A8 80241FA8 00000000 */ nop /* DF89AC 80241FAC 8E030018 */ lw $v1, 0x18($s0) /* DF89B0 80241FB0 8E620050 */ lw $v0, 0x50($s3) /* DF89B4 80241FB4 50620001 */ beql $v1, $v0, .L80241FBC @@ -367,12 +376,12 @@ glabel func_80241B34_DF8534 /* DF8A60 80242060 2482FFFD */ addiu $v0, $a0, -3 /* DF8A64 80242064 2C420002 */ sltiu $v0, $v0, 2 /* DF8A68 80242068 10400020 */ beqz $v0, .L802420EC -/* DF8A6C 8024206C 00000000 */ nop +/* DF8A6C 8024206C 00000000 */ nop /* DF8A70 80242070 3C058024 */ lui $a1, %hi(func_80242CD8_C799B8) /* DF8A74 80242074 24A52CD8 */ addiu $a1, $a1, %lo(func_80242CD8_C799B8) /* DF8A78 80242078 24090004 */ addiu $t1, $zero, 4 /* DF8A7C 8024207C 14890003 */ bne $a0, $t1, .L8024208C -/* DF8A80 80242080 00000000 */ nop +/* DF8A80 80242080 00000000 */ nop /* DF8A84 80242084 3C058024 */ lui $a1, %hi(func_80242C70_9AB060) /* DF8A88 80242088 24A52C70 */ addiu $a1, $a1, %lo(func_80242C70_9AB060) .L8024208C: @@ -403,14 +412,14 @@ glabel func_80241B34_DF8534 .L802420E0: /* DF8AE0 802420E0 84820002 */ lh $v0, 2($a0) /* DF8AE4 802420E4 1440FFF5 */ bnez $v0, .L802420BC -/* DF8AE8 802420E8 00000000 */ nop +/* DF8AE8 802420E8 00000000 */ nop .L802420EC: /* DF8AEC 802420EC 97A20050 */ lhu $v0, 0x50($sp) /* DF8AF0 802420F0 1040FF29 */ beqz $v0, .L80241D98 -/* DF8AF4 802420F4 00000000 */ nop +/* DF8AF4 802420F4 00000000 */ nop /* DF8AF8 802420F8 8E62000C */ lw $v0, 0xc($s3) /* DF8AFC 802420FC 14400015 */ bnez $v0, .L80242154 -/* DF8B00 80242100 00000000 */ nop +/* DF8B00 80242100 00000000 */ nop /* DF8B04 80242104 13C00013 */ beqz $fp, .L80242154 /* DF8B08 80242108 0000282D */ daddu $a1, $zero, $zero /* DF8B0C 8024210C 00A0302D */ daddu $a2, $a1, $zero @@ -446,9 +455,9 @@ glabel func_80241B34_DF8534 /* DF8B7C 8024217C 24020002 */ addiu $v0, $zero, 2 .L80242180: /* DF8B80 80242180 14620006 */ bne $v1, $v0, .L8024219C -/* DF8B84 80242184 00000000 */ nop +/* DF8B84 80242184 00000000 */ nop /* DF8B88 80242188 13C00004 */ beqz $fp, .L8024219C -/* DF8B8C 8024218C 00000000 */ nop +/* DF8B8C 8024218C 00000000 */ nop /* DF8B90 80242190 96620070 */ lhu $v0, 0x70($s3) /* DF8B94 80242194 3042FFFE */ andi $v0, $v0, 0xfffe /* DF8B98 80242198 A6620070 */ sh $v0, 0x70($s3) diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242358_DF8D58.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242358_DF8D58.s index 55ad23b1da..007200db6a 100644 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242358_DF8D58.s +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242358_DF8D58.s @@ -23,7 +23,7 @@ glabel func_80242358_DF8D58 /* DF8D9C 8024239C 10640051 */ beq $v1, $a0, .L802424E4 /* DF8DA0 802423A0 24A50074 */ addiu $a1, $a1, 0x74 /* DF8DA4 802423A4 080908E2 */ j .L80242388 -/* DF8DA8 802423A8 00000000 */ nop +/* DF8DA8 802423A8 00000000 */ nop .L802423AC: /* DF8DAC 802423AC 00431023 */ subu $v0, $v0, $v1 /* DF8DB0 802423B0 00021080 */ sll $v0, $v0, 2 @@ -82,7 +82,7 @@ glabel func_80242358_DF8D58 /* DF8E7C 8024247C AE220038 */ sw $v0, 0x38($s1) /* DF8E80 80242480 8E440018 */ lw $a0, 0x18($s2) /* DF8E84 80242484 1080000C */ beqz $a0, .L802424B8 -/* DF8E88 80242488 00000000 */ nop +/* DF8E88 80242488 00000000 */ nop /* DF8E8C 8024248C 8FA20024 */ lw $v0, 0x24($sp) /* DF8E90 80242490 8FA30020 */ lw $v1, 0x20($sp) /* DF8E94 80242494 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242558_DF8F58.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242558_DF8F58.s index b05d0d2e71..fe0548c02a 100644 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242558_DF8F58.s +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242558_DF8F58.s @@ -5,7 +5,7 @@ glabel func_80242558_DF8F58 /* DF8F58 80242558 27BDFFE8 */ addiu $sp, $sp, -0x18 /* DF8F5C 8024255C AFBF0010 */ sw $ra, 0x10($sp) /* DF8F60 80242560 0C090940 */ jal func_80242500_DF8F00 -/* DF8F64 80242564 00000000 */ nop +/* DF8F64 80242564 00000000 */ nop /* DF8F68 80242568 0C048DCD */ jal load_font /* DF8F6C 8024256C 24040001 */ addiu $a0, $zero, 1 /* DF8F70 80242570 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242580_DF8F80.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242580_DF8F80.s index aa91a20c11..450daf8e21 100644 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242580_DF8F80.s +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242580_DF8F80.s @@ -25,7 +25,7 @@ glabel func_80242580_DF8F80 /* DF8FCC 802425CC 10620020 */ beq $v1, $v0, .L80242650 /* DF8FD0 802425D0 0000102D */ daddu $v0, $zero, $zero /* DF8FD4 802425D4 0809099A */ j .L80242668 -/* DF8FD8 802425D8 00000000 */ nop +/* DF8FD8 802425D8 00000000 */ nop .L802425DC: /* DF8FDC 802425DC 2410FFFF */ addiu $s0, $zero, -1 .L802425E0: @@ -36,9 +36,9 @@ glabel func_80242580_DF8F80 /* DF8FF0 802425F0 00722021 */ addu $a0, $v1, $s2 /* DF8FF4 802425F4 8C820000 */ lw $v0, ($a0) /* DF8FF8 802425F8 10400003 */ beqz $v0, .L80242608 -/* DF8FFC 802425FC 00000000 */ nop +/* DF8FFC 802425FC 00000000 */ nop /* DF9000 80242600 0C0908D6 */ jal func_80242358_DF8D58 -/* DF9004 80242604 00000000 */ nop +/* DF9004 80242604 00000000 */ nop .L80242608: /* DF9008 80242608 8E23008C */ lw $v1, 0x8c($s1) /* DF900C 8024260C 000310C0 */ sll $v0, $v1, 3 @@ -55,7 +55,7 @@ glabel func_80242580_DF8F80 /* DF9038 80242638 1470FFE9 */ bne $v1, $s0, .L802425E0 /* DF903C 8024263C 24020002 */ addiu $v0, $zero, 2 /* DF9040 80242640 0809099A */ j .L80242668 -/* DF9044 80242644 00000000 */ nop +/* DF9044 80242644 00000000 */ nop .L80242648: /* DF9048 80242648 24020001 */ addiu $v0, $zero, 1 /* DF904C 8024264C AE220084 */ sw $v0, 0x84($s1) diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242898_DF9298.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242898_DF9298.s index dfd328794e..324e25bcbe 100644 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242898_DF9298.s +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242898_DF9298.s @@ -26,6 +26,6 @@ glabel func_80242898_DF9298 /* DF92E8 802428E8 0000102D */ daddu $v0, $zero, $zero /* DF92EC 802428EC 03E00008 */ jr $ra /* DF92F0 802428F0 27BD0018 */ addiu $sp, $sp, 0x18 -/* DF92F4 802428F4 00000000 */ nop -/* DF92F8 802428F8 00000000 */ nop -/* DF92FC 802428FC 00000000 */ nop +/* DF92F4 802428F4 00000000 */ nop +/* DF92F8 802428F8 00000000 */ nop +/* DF92FC 802428FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_end/end_00/DF9300/func_80242AD4_DF94D4.s b/asm/nonmatchings/world/area_end/end_00/DF9300/func_80242AD4_DF94D4.s index 5ad028f6df..c1d9a13408 100644 --- a/asm/nonmatchings/world/area_end/end_00/DF9300/func_80242AD4_DF94D4.s +++ b/asm/nonmatchings/world/area_end/end_00/DF9300/func_80242AD4_DF94D4.s @@ -14,6 +14,6 @@ glabel func_80242AD4_DF94D4 /* DF94F8 80242AF8 24020002 */ addiu $v0, $zero, 2 /* DF94FC 80242AFC 03E00008 */ jr $ra /* DF9500 80242B00 27BD0018 */ addiu $sp, $sp, 0x18 -/* DF9504 80242B04 00000000 */ nop -/* DF9508 80242B08 00000000 */ nop -/* DF950C 80242B0C 00000000 */ nop +/* DF9504 80242B04 00000000 */ nop +/* DF9508 80242B08 00000000 */ nop +/* DF950C 80242B0C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_end/end_00/DF9510/func_80242B10_DF9510.s b/asm/nonmatchings/world/area_end/end_00/DF9510/func_80242B10_DF9510.s index a5059966ca..b5ce2f9238 100644 --- a/asm/nonmatchings/world/area_end/end_00/DF9510/func_80242B10_DF9510.s +++ b/asm/nonmatchings/world/area_end/end_00/DF9510/func_80242B10_DF9510.s @@ -13,4 +13,4 @@ glabel func_80242B10_DF9510 /* DF9530 80242B30 24020002 */ addiu $v0, $zero, 2 /* DF9534 80242B34 03E00008 */ jr $ra /* DF9538 80242B38 27BD0018 */ addiu $sp, $sp, 0x18 -/* DF953C 80242B3C 00000000 */ nop +/* DF953C 80242B3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_end/end_01/E05360/func_80240000_E05360.s b/asm/nonmatchings/world/area_end/end_01/E05360/func_80240000_E05360.s index e6695316a2..9402eb1da0 100644 --- a/asm/nonmatchings/world/area_end/end_01/E05360/func_80240000_E05360.s +++ b/asm/nonmatchings/world/area_end/end_01/E05360/func_80240000_E05360.s @@ -4,5 +4,5 @@ glabel func_80240000_E05360 /* E05360 80240000 03E00008 */ jr $ra /* E05364 80240004 0000102D */ daddu $v0, $zero, $zero -/* E05368 80240008 00000000 */ nop -/* E0536C 8024000C 00000000 */ nop +/* E05368 80240008 00000000 */ nop +/* E0536C 8024000C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_end/end_01/E05370/func_80240010_E05370.s b/asm/nonmatchings/world/area_end/end_01/E05370/func_80240010_E05370.s index 463680ed78..0f8c476430 100644 --- a/asm/nonmatchings/world/area_end/end_01/E05370/func_80240010_E05370.s +++ b/asm/nonmatchings/world/area_end/end_01/E05370/func_80240010_E05370.s @@ -4,9 +4,9 @@ glabel func_80240010_E05370 /* E05370 80240010 3C01420C */ lui $at, 0x420c /* E05374 80240014 44810000 */ mtc1 $at, $f0 -/* E05378 80240018 00000000 */ nop +/* E05378 80240018 00000000 */ nop /* E0537C 8024001C 3C01800B */ lui $at, %hi(D_800B1D98) /* E05380 80240020 E4201D98 */ swc1 $f0, %lo(D_800B1D98)($at) /* E05384 80240024 03E00008 */ jr $ra /* E05388 80240028 24020002 */ addiu $v0, $zero, 2 -/* E0538C 8024002C 00000000 */ nop +/* E0538C 8024002C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80240EC0_E06220.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80240EC0_E06220.s index 5bf94d13a0..9c72509d47 100644 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80240EC0_E06220.s +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80240EC0_E06220.s @@ -40,7 +40,7 @@ glabel func_80240EC0_E06220 /* E062AC 80240F4C AFA20018 */ sw $v0, 0x18($sp) /* E062B0 80240F50 4600B08D */ trunc.w.s $f2, $f22 /* E062B4 80240F54 44021000 */ mfc1 $v0, $f2 -/* E062B8 80240F58 00000000 */ nop +/* E062B8 80240F58 00000000 */ nop /* E062BC 80240F5C 00021400 */ sll $v0, $v0, 0x10 /* E062C0 80240F60 3C014F00 */ lui $at, 0x4f00 /* E062C4 80240F64 44810000 */ mtc1 $at, $f0 @@ -55,7 +55,7 @@ glabel func_80240EC0_E06220 /* E062E8 80240F88 240200C8 */ addiu $v0, $zero, 0xc8 /* E062EC 80240F8C AFA2002C */ sw $v0, 0x2c($sp) /* E062F0 80240F90 4618003E */ c.le.s $f0, $f24 -/* E062F4 80240F94 00000000 */ nop +/* E062F4 80240F94 00000000 */ nop /* E062F8 80240F98 45010005 */ bc1t .L80240FB0 /* E062FC 80240F9C AFA30014 */ sw $v1, 0x14($sp) /* E06300 80240FA0 4600C08D */ trunc.w.s $f2, $f24 @@ -67,7 +67,7 @@ glabel func_80240EC0_E06220 /* E06314 80240FB4 3C028000 */ lui $v0, 0x8000 /* E06318 80240FB8 4600008D */ trunc.w.s $f2, $f0 /* E0631C 80240FBC 44031000 */ mfc1 $v1, $f2 -/* E06320 80240FC0 00000000 */ nop +/* E06320 80240FC0 00000000 */ nop /* E06324 80240FC4 00621825 */ or $v1, $v1, $v0 /* E06328 80240FC8 306200FF */ andi $v0, $v1, 0xff .L80240FCC: diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_802411DC_E0653C.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_802411DC_E0653C.s index e7c3283e16..a43cdb693d 100644 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_802411DC_E0653C.s +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_802411DC_E0653C.s @@ -29,7 +29,7 @@ glabel func_802411DC_E0653C /* E0659C 8024123C AFA20018 */ sw $v0, 0x18($sp) /* E065A0 80241240 4600B00D */ trunc.w.s $f0, $f22 /* E065A4 80241244 44020000 */ mfc1 $v0, $f0 -/* E065A8 80241248 00000000 */ nop +/* E065A8 80241248 00000000 */ nop /* E065AC 8024124C 00021400 */ sll $v0, $v0, 0x10 /* E065B0 80241250 00021403 */ sra $v0, $v0, 0x10 /* E065B4 80241254 AFA2001C */ sw $v0, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80241A08_E06D68.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80241A08_E06D68.s index 95843426e9..c7a1be34ef 100644 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80241A08_E06D68.s +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80241A08_E06D68.s @@ -40,7 +40,7 @@ glabel func_80241A08_E06D68 /* E06DF4 80241A94 AFA20018 */ sw $v0, 0x18($sp) /* E06DF8 80241A98 4600B08D */ trunc.w.s $f2, $f22 /* E06DFC 80241A9C 44021000 */ mfc1 $v0, $f2 -/* E06E00 80241AA0 00000000 */ nop +/* E06E00 80241AA0 00000000 */ nop /* E06E04 80241AA4 00021400 */ sll $v0, $v0, 0x10 /* E06E08 80241AA8 3C014F00 */ lui $at, 0x4f00 /* E06E0C 80241AAC 44810000 */ mtc1 $at, $f0 @@ -55,7 +55,7 @@ glabel func_80241A08_E06D68 /* E06E30 80241AD0 240200C8 */ addiu $v0, $zero, 0xc8 /* E06E34 80241AD4 AFA2002C */ sw $v0, 0x2c($sp) /* E06E38 80241AD8 4618003E */ c.le.s $f0, $f24 -/* E06E3C 80241ADC 00000000 */ nop +/* E06E3C 80241ADC 00000000 */ nop /* E06E40 80241AE0 45010005 */ bc1t .L80241AF8 /* E06E44 80241AE4 AFA30014 */ sw $v1, 0x14($sp) /* E06E48 80241AE8 4600C08D */ trunc.w.s $f2, $f24 @@ -67,7 +67,7 @@ glabel func_80241A08_E06D68 /* E06E5C 80241AFC 3C028000 */ lui $v0, 0x8000 /* E06E60 80241B00 4600008D */ trunc.w.s $f2, $f0 /* E06E64 80241B04 44031000 */ mfc1 $v1, $f2 -/* E06E68 80241B08 00000000 */ nop +/* E06E68 80241B08 00000000 */ nop /* E06E6C 80241B0C 00621825 */ or $v1, $v1, $v0 /* E06E70 80241B10 306200FF */ andi $v0, $v1, 0xff .L80241B14: diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44_E06EA4.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44_E06EA4.s index 06a749bcc0..0cf0323f07 100644 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44_E06EA4.s +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44_E06EA4.s @@ -56,7 +56,7 @@ glabel func_80241B44_E06EA4 /* E06F68 80241C08 00491021 */ addu $v0, $v0, $t1 /* E06F6C 80241C0C 8C420000 */ lw $v0, ($v0) /* E06F70 80241C10 00400008 */ jr $v0 -/* E06F74 80241C14 00000000 */ nop +/* E06F74 80241C14 00000000 */ nop /* E06F78 80241C18 2682FF0D */ addiu $v0, $s4, -0xf3 /* E06F7C 80241C1C 08090747 */ j .L80241D1C /* E06F80 80241C20 AE020008 */ sw $v0, 8($s0) @@ -94,7 +94,7 @@ glabel func_80241B44_E06EA4 /* E06FFC 80241C9C 24A53178 */ addiu $a1, $a1, %lo(D_80243178) /* E07000 80241CA0 24090004 */ addiu $t1, $zero, 4 /* E07004 80241CA4 14890003 */ bne $a0, $t1, .L80241CB4 -/* E07008 80241CA8 00000000 */ nop +/* E07008 80241CA8 00000000 */ nop /* E0700C 80241CAC 3C058024 */ lui $a1, %hi(D_80243110) /* E07010 80241CB0 24A53110 */ addiu $a1, $a1, %lo(D_80243110) .L80241CB4: @@ -128,28 +128,28 @@ glabel func_80241B44_E06EA4 .L80241D10: /* E07070 80241D10 84820002 */ lh $v0, 2($a0) /* E07074 80241D14 1440FFF3 */ bnez $v0, .L80241CE4 -/* E07078 80241D18 00000000 */ nop +/* E07078 80241D18 00000000 */ nop .L80241D1C: /* E0707C 80241D1C 32C2FFFF */ andi $v0, $s6, 0xffff /* E07080 80241D20 1040FFAC */ beqz $v0, .L80241BD4 -/* E07084 80241D24 00000000 */ nop +/* E07084 80241D24 00000000 */ nop /* E07088 80241D28 96620070 */ lhu $v0, 0x70($s3) /* E0708C 80241D2C 8FA30044 */ lw $v1, 0x44($sp) /* E07090 80241D30 30420001 */ andi $v0, $v0, 1 /* E07094 80241D34 10400015 */ beqz $v0, .L80241D8C /* E07098 80241D38 AE630014 */ sw $v1, 0x14($s3) /* E0709C 80241D3C 44831000 */ mtc1 $v1, $f2 -/* E070A0 80241D40 00000000 */ nop +/* E070A0 80241D40 00000000 */ nop /* E070A4 80241D44 468010A0 */ cvt.s.w $f2, $f2 /* E070A8 80241D48 3C013FE0 */ lui $at, 0x3fe0 /* E070AC 80241D4C 44810800 */ mtc1 $at, $f1 /* E070B0 80241D50 44800000 */ mtc1 $zero, $f0 /* E070B4 80241D54 460010A1 */ cvt.d.s $f2, $f2 /* E070B8 80241D58 46201082 */ mul.d $f2, $f2, $f0 -/* E070BC 80241D5C 00000000 */ nop +/* E070BC 80241D5C 00000000 */ nop /* E070C0 80241D60 44800000 */ mtc1 $zero, $f0 /* E070C4 80241D64 44800800 */ mtc1 $zero, $f1 -/* E070C8 80241D68 00000000 */ nop +/* E070C8 80241D68 00000000 */ nop /* E070CC 80241D6C 46201080 */ add.d $f2, $f2, $f0 /* E070D0 80241D70 C6600068 */ lwc1 $f0, 0x68($s3) /* E070D4 80241D74 46800021 */ cvt.d.w $f0, $f0 @@ -179,17 +179,20 @@ glabel func_80241B44_E06EA4 /* E07128 80241DC8 2C830010 */ sltiu $v1, $a0, 0x10 /* E0712C 80241DCC 10600016 */ beqz $v1, .L80241E28 /* E07130 80241DD0 00041080 */ sll $v0, $a0, 2 -/* E07134 80241DD4 3C018025 */ lui $at, %hi(D_802493E0) +/* E07134 80241DD4 3C018025 */ lui $at, %hi(jtbl_802493E0_E0E740) /* E07138 80241DD8 00220821 */ addu $at, $at, $v0 -/* E0713C 80241DDC 8C2293E0 */ lw $v0, %lo(D_802493E0)($at) +/* E0713C 80241DDC 8C2293E0 */ lw $v0, %lo(jtbl_802493E0_E0E740)($at) /* E07140 80241DE0 00400008 */ jr $v0 -/* E07144 80241DE4 00000000 */ nop +/* E07144 80241DE4 00000000 */ nop +glabel L80241DE8_E07148 /* E07148 80241DE8 2682FF0D */ addiu $v0, $s4, -0xf3 /* E0714C 80241DEC 0809083F */ j .L802420FC /* E07150 80241DF0 AE020008 */ sw $v0, 8($s0) +glabel L80241DF4_E07154 /* E07154 80241DF4 24090001 */ addiu $t1, $zero, 1 /* E07158 80241DF8 0809083F */ j .L802420FC /* E0715C 80241DFC A7A90050 */ sh $t1, 0x50($sp) +glabel L80241E00_E07160 /* E07160 80241E00 8E630000 */ lw $v1, ($s3) /* E07164 80241E04 00711021 */ addu $v0, $v1, $s1 /* E07168 80241E08 90420000 */ lbu $v0, ($v0) @@ -201,6 +204,7 @@ glabel func_80241B44_E06EA4 /* E07180 80241E20 0809083F */ j .L802420FC /* E07184 80241E24 AE020004 */ sw $v0, 4($s0) .L80241E28: +glabel L80241E28_E07188 /* E07188 80241E28 328300FF */ andi $v1, $s4, 0xff /* E0718C 80241E2C 2C6200F0 */ sltiu $v0, $v1, 0xf0 /* E07190 80241E30 10400083 */ beqz $v0, .L80242040 @@ -215,12 +219,12 @@ glabel func_80241B44_E06EA4 /* E071B4 80241E54 50400005 */ beql $v0, $zero, .L80241E6C /* E071B8 80241E58 24090002 */ addiu $t1, $zero, 2 /* E071BC 80241E5C 10600007 */ beqz $v1, .L80241E7C -/* E071C0 80241E60 00000000 */ nop +/* E071C0 80241E60 00000000 */ nop /* E071C4 80241E64 08090811 */ j .L80242044 /* E071C8 80241E68 26F70001 */ addiu $s7, $s7, 1 .L80241E6C: /* E071CC 80241E6C 10690043 */ beq $v1, $t1, .L80241F7C -/* E071D0 80241E70 00000000 */ nop +/* E071D0 80241E70 00000000 */ nop /* E071D4 80241E74 08090810 */ j .L80242040 /* E071D8 80241E78 26F70001 */ addiu $s7, $s7, 1 .L80241E7C: @@ -238,7 +242,7 @@ glabel func_80241B44_E06EA4 .L80241EA8: /* E07208 80241EA8 240900FD */ addiu $t1, $zero, 0xfd /* E0720C 80241EAC 16C90005 */ bne $s6, $t1, .L80241EC4 -/* E07210 80241EB0 00000000 */ nop +/* E07210 80241EB0 00000000 */ nop /* E07214 80241EB4 8E030018 */ lw $v1, 0x18($s0) /* E07218 80241EB8 8E62001C */ lw $v0, 0x1c($s3) /* E0721C 80241EBC 50620001 */ beql $v1, $v0, .L80241EC4 @@ -248,31 +252,36 @@ glabel func_80241B44_E06EA4 /* E07228 80241EC8 2C620006 */ sltiu $v0, $v1, 6 /* E0722C 80241ECC 1040005B */ beqz $v0, .L8024203C /* E07230 80241ED0 00031080 */ sll $v0, $v1, 2 -/* E07234 80241ED4 3C018025 */ lui $at, %hi(D_80249420) +/* E07234 80241ED4 3C018025 */ lui $at, %hi(jtbl_80249420_E0E780) /* E07238 80241ED8 00220821 */ addu $at, $at, $v0 -/* E0723C 80241EDC 8C229420 */ lw $v0, %lo(D_80249420)($at) +/* E0723C 80241EDC 8C229420 */ lw $v0, %lo(jtbl_80249420_E0E780)($at) /* E07240 80241EE0 00400008 */ jr $v0 -/* E07244 80241EE4 00000000 */ nop +/* E07244 80241EE4 00000000 */ nop +glabel L80241EE8_E07248 /* E07248 80241EE8 0260202D */ daddu $a0, $s3, $zero /* E0724C 80241EEC 0C0900A0 */ jal func_80240280_E055E0 /* E07250 80241EF0 0200282D */ daddu $a1, $s0, $zero /* E07254 80241EF4 08090810 */ j .L80242040 /* E07258 80241EF8 26F70001 */ addiu $s7, $s7, 1 +glabel L80241EFC_E0725C /* E0725C 80241EFC 0260202D */ daddu $a0, $s3, $zero /* E07260 80241F00 0C090154 */ jal func_80240550_E058B0 /* E07264 80241F04 0200282D */ daddu $a1, $s0, $zero /* E07268 80241F08 08090810 */ j .L80242040 /* E0726C 80241F0C 26F70001 */ addiu $s7, $s7, 1 +glabel L80241F10_E07270 /* E07270 80241F10 0260202D */ daddu $a0, $s3, $zero /* E07274 80241F14 0C09020B */ jal func_8024082C_E05B8C /* E07278 80241F18 0200282D */ daddu $a1, $s0, $zero /* E0727C 80241F1C 08090810 */ j .L80242040 /* E07280 80241F20 26F70001 */ addiu $s7, $s7, 1 +glabel L80241F24_E07284 /* E07284 80241F24 0260202D */ daddu $a0, $s3, $zero /* E07288 80241F28 0C0902BE */ jal func_80240AF8_E05E58 /* E0728C 80241F2C 0200282D */ daddu $a1, $s0, $zero /* E07290 80241F30 08090810 */ j .L80242040 /* E07294 80241F34 26F70001 */ addiu $s7, $s7, 1 +glabel L80241F38_E07298 /* E07298 80241F38 0260202D */ daddu $a0, $s3, $zero /* E0729C 80241F3C 0C0903B0 */ jal func_80240EC0_E06220 /* E072A0 80241F40 0200282D */ daddu $a1, $s0, $zero @@ -310,7 +319,7 @@ glabel func_80241B44_E06EA4 .L80241FB0: /* E07310 80241FB0 240900FD */ addiu $t1, $zero, 0xfd /* E07314 80241FB4 16C90005 */ bne $s6, $t1, .L80241FCC -/* E07318 80241FB8 00000000 */ nop +/* E07318 80241FB8 00000000 */ nop /* E0731C 80241FBC 8E030018 */ lw $v1, 0x18($s0) /* E07320 80241FC0 8E620050 */ lw $v0, 0x50($s3) /* E07324 80241FC4 50620001 */ beql $v1, $v0, .L80241FCC @@ -367,12 +376,12 @@ glabel func_80241B44_E06EA4 /* E073D0 80242070 2482FFFD */ addiu $v0, $a0, -3 /* E073D4 80242074 2C420002 */ sltiu $v0, $v0, 2 /* E073D8 80242078 10400020 */ beqz $v0, .L802420FC -/* E073DC 8024207C 00000000 */ nop +/* E073DC 8024207C 00000000 */ nop /* E073E0 80242080 3C058024 */ lui $a1, %hi(D_80243178) /* E073E4 80242084 24A53178 */ addiu $a1, $a1, %lo(D_80243178) /* E073E8 80242088 24090004 */ addiu $t1, $zero, 4 /* E073EC 8024208C 14890003 */ bne $a0, $t1, .L8024209C -/* E073F0 80242090 00000000 */ nop +/* E073F0 80242090 00000000 */ nop /* E073F4 80242094 3C058024 */ lui $a1, %hi(D_80243110) /* E073F8 80242098 24A53110 */ addiu $a1, $a1, %lo(D_80243110) .L8024209C: @@ -403,14 +412,14 @@ glabel func_80241B44_E06EA4 .L802420F0: /* E07450 802420F0 84820002 */ lh $v0, 2($a0) /* E07454 802420F4 1440FFF5 */ bnez $v0, .L802420CC -/* E07458 802420F8 00000000 */ nop +/* E07458 802420F8 00000000 */ nop .L802420FC: /* E0745C 802420FC 97A20050 */ lhu $v0, 0x50($sp) /* E07460 80242100 1040FF29 */ beqz $v0, .L80241DA8 -/* E07464 80242104 00000000 */ nop +/* E07464 80242104 00000000 */ nop /* E07468 80242108 8E62000C */ lw $v0, 0xc($s3) /* E0746C 8024210C 14400015 */ bnez $v0, .L80242164 -/* E07470 80242110 00000000 */ nop +/* E07470 80242110 00000000 */ nop /* E07474 80242114 13C00013 */ beqz $fp, .L80242164 /* E07478 80242118 0000282D */ daddu $a1, $zero, $zero /* E0747C 8024211C 00A0302D */ daddu $a2, $a1, $zero @@ -446,9 +455,9 @@ glabel func_80241B44_E06EA4 /* E074EC 8024218C 24020002 */ addiu $v0, $zero, 2 .L80242190: /* E074F0 80242190 14620006 */ bne $v1, $v0, .L802421AC -/* E074F4 80242194 00000000 */ nop +/* E074F4 80242194 00000000 */ nop /* E074F8 80242198 13C00004 */ beqz $fp, .L802421AC -/* E074FC 8024219C 00000000 */ nop +/* E074FC 8024219C 00000000 */ nop /* E07500 802421A0 96620070 */ lhu $v0, 0x70($s3) /* E07504 802421A4 3042FFFE */ andi $v0, $v0, 0xfffe /* E07508 802421A8 A6620070 */ sh $v0, 0x70($s3) diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242368_E076C8.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242368_E076C8.s index b2a4f38fe5..3f2317a4b2 100644 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242368_E076C8.s +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242368_E076C8.s @@ -23,7 +23,7 @@ glabel func_80242368_E076C8 /* E0770C 802423AC 10640051 */ beq $v1, $a0, .L802424F4 /* E07710 802423B0 24A50074 */ addiu $a1, $a1, 0x74 /* E07714 802423B4 080908E6 */ j .L80242398 -/* E07718 802423B8 00000000 */ nop +/* E07718 802423B8 00000000 */ nop .L802423BC: /* E0771C 802423BC 00431023 */ subu $v0, $v0, $v1 /* E07720 802423C0 00021080 */ sll $v0, $v0, 2 @@ -82,7 +82,7 @@ glabel func_80242368_E076C8 /* E077EC 8024248C AE220038 */ sw $v0, 0x38($s1) /* E077F0 80242490 8E440018 */ lw $a0, 0x18($s2) /* E077F4 80242494 1080000C */ beqz $a0, .L802424C8 -/* E077F8 80242498 00000000 */ nop +/* E077F8 80242498 00000000 */ nop /* E077FC 8024249C 8FA20024 */ lw $v0, 0x24($sp) /* E07800 802424A0 8FA30020 */ lw $v1, 0x20($sp) /* E07804 802424A4 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242568_E078C8.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242568_E078C8.s index b64e727ddb..28e86738b8 100644 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242568_E078C8.s +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242568_E078C8.s @@ -5,7 +5,7 @@ glabel func_80242568_E078C8 /* E078C8 80242568 27BDFFE8 */ addiu $sp, $sp, -0x18 /* E078CC 8024256C AFBF0010 */ sw $ra, 0x10($sp) /* E078D0 80242570 0C090944 */ jal func_80242510_E07870 -/* E078D4 80242574 00000000 */ nop +/* E078D4 80242574 00000000 */ nop /* E078D8 80242578 0C048DCD */ jal load_font /* E078DC 8024257C 24040001 */ addiu $a0, $zero, 1 /* E078E0 80242580 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242590_E078F0.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242590_E078F0.s index 1c408adf2f..0e7d44ecfe 100644 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242590_E078F0.s +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242590_E078F0.s @@ -25,7 +25,7 @@ glabel func_80242590_E078F0 /* E0793C 802425DC 10620020 */ beq $v1, $v0, .L80242660 /* E07940 802425E0 0000102D */ daddu $v0, $zero, $zero /* E07944 802425E4 0809099E */ j .L80242678 -/* E07948 802425E8 00000000 */ nop +/* E07948 802425E8 00000000 */ nop .L802425EC: /* E0794C 802425EC 2410FFFF */ addiu $s0, $zero, -1 .L802425F0: @@ -36,9 +36,9 @@ glabel func_80242590_E078F0 /* E07960 80242600 00722021 */ addu $a0, $v1, $s2 /* E07964 80242604 8C820000 */ lw $v0, ($a0) /* E07968 80242608 10400003 */ beqz $v0, .L80242618 -/* E0796C 8024260C 00000000 */ nop +/* E0796C 8024260C 00000000 */ nop /* E07970 80242610 0C0908DA */ jal func_80242368_E076C8 -/* E07974 80242614 00000000 */ nop +/* E07974 80242614 00000000 */ nop .L80242618: /* E07978 80242618 8E23008C */ lw $v1, 0x8c($s1) /* E0797C 8024261C 000310C0 */ sll $v0, $v1, 3 @@ -55,7 +55,7 @@ glabel func_80242590_E078F0 /* E079A8 80242648 1470FFE9 */ bne $v1, $s0, .L802425F0 /* E079AC 8024264C 24020002 */ addiu $v0, $zero, 2 /* E079B0 80242650 0809099E */ j .L80242678 -/* E079B4 80242654 00000000 */ nop +/* E079B4 80242654 00000000 */ nop .L80242658: /* E079B8 80242658 24020001 */ addiu $v0, $zero, 1 /* E079BC 8024265C AE220084 */ sw $v0, 0x84($s1) diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_8024289C_E07BFC.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_8024289C_E07BFC.s index 0a785f91a5..ee94aa759b 100644 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_8024289C_E07BFC.s +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_8024289C_E07BFC.s @@ -9,5 +9,5 @@ glabel func_8024289C_E07BFC /* E07C0C 802428AC 0002102B */ sltu $v0, $zero, $v0 /* E07C10 802428B0 03E00008 */ jr $ra /* E07C14 802428B4 00021040 */ sll $v0, $v0, 1 -/* E07C18 802428B8 00000000 */ nop -/* E07C1C 802428BC 00000000 */ nop +/* E07C18 802428B8 00000000 */ nop +/* E07C1C 802428BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242978_E07CD8.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242978_E07CD8.s index 125c322ce3..3be3de1673 100644 --- a/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242978_E07CD8.s +++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242978_E07CD8.s @@ -12,7 +12,7 @@ glabel func_80242978_E07CD8 /* E07CF4 80242994 0080902D */ daddu $s2, $a0, $zero /* E07CF8 80242998 8E4400AC */ lw $a0, 0xac($s2) /* E07CFC 8024299C 0C00EAD2 */ jal get_npc_safe -/* E07D00 802429A0 00000000 */ nop +/* E07D00 802429A0 00000000 */ nop /* E07D04 802429A4 AE420078 */ sw $v0, 0x78($s2) /* E07D08 802429A8 AE400070 */ sw $zero, 0x70($s2) .L802429AC: @@ -35,9 +35,9 @@ glabel func_80242978_E07CD8 /* E07D4C 802429EC 24040004 */ addiu $a0, $zero, 4 /* E07D50 802429F0 3C014F00 */ lui $at, 0x4f00 /* E07D54 802429F4 44811000 */ mtc1 $at, $f2 -/* E07D58 802429F8 00000000 */ nop +/* E07D58 802429F8 00000000 */ nop /* E07D5C 802429FC 4600103E */ c.le.s $f2, $f0 -/* E07D60 80242A00 00000000 */ nop +/* E07D60 80242A00 00000000 */ nop /* E07D64 80242A04 45010005 */ bc1t .L80242A1C /* E07D68 80242A08 263100AC */ addiu $s1, $s1, 0xac /* E07D6C 80242A0C 4600010D */ trunc.w.s $f4, $f0 @@ -49,7 +49,7 @@ glabel func_80242978_E07CD8 /* E07D80 80242A20 3C028000 */ lui $v0, 0x8000 /* E07D84 80242A24 4600010D */ trunc.w.s $f4, $f0 /* E07D88 80242A28 44032000 */ mfc1 $v1, $f4 -/* E07D8C 80242A2C 00000000 */ nop +/* E07D8C 80242A2C 00000000 */ nop /* E07D90 80242A30 00621825 */ or $v1, $v1, $v0 /* E07D94 80242A34 A2230000 */ sb $v1, ($s1) .L80242A38: diff --git a/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242A68_E07DC8.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242A68_E07DC8.s index 63b94e3d1c..7c60619723 100644 --- a/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242A68_E07DC8.s +++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242A68_E07DC8.s @@ -36,9 +36,9 @@ glabel func_80242A68_E07DC8 /* E07E40 80242AE0 E62C007C */ swc1 $f12, 0x7c($s1) /* E07E44 80242AE4 3C0140C0 */ lui $at, 0x40c0 /* E07E48 80242AE8 44811000 */ mtc1 $at, $f2 -/* E07E4C 80242AEC 00000000 */ nop +/* E07E4C 80242AEC 00000000 */ nop /* E07E50 80242AF0 46020002 */ mul.s $f0, $f0, $f2 -/* E07E54 80242AF4 00000000 */ nop +/* E07E54 80242AF4 00000000 */ nop /* E07E58 80242AF8 C6020038 */ lwc1 $f2, 0x38($s0) /* E07E5C 80242AFC 46001080 */ add.s $f2, $f2, $f0 /* E07E60 80242B00 E6020038 */ swc1 $f2, 0x38($s0) @@ -46,9 +46,9 @@ glabel func_80242A68_E07DC8 /* E07E68 80242B08 C62C007C */ lwc1 $f12, 0x7c($s1) /* E07E6C 80242B0C 3C014020 */ lui $at, 0x4020 /* E07E70 80242B10 44811000 */ mtc1 $at, $f2 -/* E07E74 80242B14 00000000 */ nop +/* E07E74 80242B14 00000000 */ nop /* E07E78 80242B18 46020002 */ mul.s $f0, $f0, $f2 -/* E07E7C 80242B1C 00000000 */ nop +/* E07E7C 80242B1C 00000000 */ nop /* E07E80 80242B20 C6020040 */ lwc1 $f2, 0x40($s0) /* E07E84 80242B24 46001080 */ add.s $f2, $f2, $f0 /* E07E88 80242B28 3C014334 */ lui $at, 0x4334 diff --git a/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242B68_E07EC8.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242B68_E07EC8.s index b6d654c039..ba9b89c25d 100644 --- a/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242B68_E07EC8.s +++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242B68_E07EC8.s @@ -36,9 +36,9 @@ glabel func_80242B68_E07EC8 /* E07F40 80242BE0 E62C007C */ swc1 $f12, 0x7c($s1) /* E07F44 80242BE4 3C0140C0 */ lui $at, 0x40c0 /* E07F48 80242BE8 44811000 */ mtc1 $at, $f2 -/* E07F4C 80242BEC 00000000 */ nop +/* E07F4C 80242BEC 00000000 */ nop /* E07F50 80242BF0 46020002 */ mul.s $f0, $f0, $f2 -/* E07F54 80242BF4 00000000 */ nop +/* E07F54 80242BF4 00000000 */ nop /* E07F58 80242BF8 C6020038 */ lwc1 $f2, 0x38($s0) /* E07F5C 80242BFC 46001080 */ add.s $f2, $f2, $f0 /* E07F60 80242C00 E6020038 */ swc1 $f2, 0x38($s0) @@ -46,9 +46,9 @@ glabel func_80242B68_E07EC8 /* E07F68 80242C08 C62C007C */ lwc1 $f12, 0x7c($s1) /* E07F6C 80242C0C 3C014020 */ lui $at, 0x4020 /* E07F70 80242C10 44811000 */ mtc1 $at, $f2 -/* E07F74 80242C14 00000000 */ nop +/* E07F74 80242C14 00000000 */ nop /* E07F78 80242C18 46020002 */ mul.s $f0, $f0, $f2 -/* E07F7C 80242C1C 00000000 */ nop +/* E07F7C 80242C1C 00000000 */ nop /* E07F80 80242C20 C6020040 */ lwc1 $f2, 0x40($s0) /* E07F84 80242C24 46001080 */ add.s $f2, $f2, $f0 /* E07F88 80242C28 3C014334 */ lui $at, 0x4334 diff --git a/asm/nonmatchings/world/area_end/end_01/E08050/func_80242CF0_E08050.s b/asm/nonmatchings/world/area_end/end_01/E08050/func_80242CF0_E08050.s index 459f4ed9b6..c62a265fd2 100644 --- a/asm/nonmatchings/world/area_end/end_01/E08050/func_80242CF0_E08050.s +++ b/asm/nonmatchings/world/area_end/end_01/E08050/func_80242CF0_E08050.s @@ -37,12 +37,12 @@ glabel func_80242CF0_E08050 /* E080CC 80242D6C 12400007 */ beqz $s2, .L80242D8C /* E080D0 80242D70 3412FFFF */ ori $s2, $zero, 0xffff /* E080D4 80242D74 08090B7F */ j .L80242DFC -/* E080D8 80242D78 00000000 */ nop +/* E080D8 80242D78 00000000 */ nop .L80242D7C: /* E080DC 80242D7C 1242001B */ beq $s2, $v0, .L80242DEC /* E080E0 80242D80 24020002 */ addiu $v0, $zero, 2 /* E080E4 80242D84 08090B7F */ j .L80242DFC -/* E080E8 80242D88 00000000 */ nop +/* E080E8 80242D88 00000000 */ nop .L80242D8C: /* E080EC 80242D8C 8E040000 */ lw $a0, ($s0) /* E080F0 80242D90 1092001A */ beq $a0, $s2, .L80242DFC @@ -56,7 +56,7 @@ glabel func_80242CF0_E08050 /* E08110 80242DB0 0C046F1F */ jal func_8011BC7C /* E08114 80242DB4 0220302D */ daddu $a2, $s1, $zero /* E08118 80242DB8 08090B63 */ j .L80242D8C -/* E0811C 80242DBC 00000000 */ nop +/* E0811C 80242DBC 00000000 */ nop .L80242DC0: /* E08120 80242DC0 3412FFFF */ ori $s2, $zero, 0xffff .L80242DC4: @@ -69,7 +69,7 @@ glabel func_80242CF0_E08050 /* E0813C 80242DDC 0C046E54 */ jal func_8011B950 /* E08140 80242DE0 0000382D */ daddu $a3, $zero, $zero /* E08144 80242DE4 08090B71 */ j .L80242DC4 -/* E08148 80242DE8 00000000 */ nop +/* E08148 80242DE8 00000000 */ nop .L80242DEC: /* E0814C 80242DEC 3C028015 */ lui $v0, %hi(D_801512F0) /* E08150 80242DF0 8C4212F0 */ lw $v0, %lo(D_801512F0)($v0) diff --git a/asm/nonmatchings/world/area_end/end_01/E08050/func_80242E14_E08174.s b/asm/nonmatchings/world/area_end/end_01/E08050/func_80242E14_E08174.s index 307d828f17..9b58666fc6 100644 --- a/asm/nonmatchings/world/area_end/end_01/E08050/func_80242E14_E08174.s +++ b/asm/nonmatchings/world/area_end/end_01/E08050/func_80242E14_E08174.s @@ -71,20 +71,20 @@ glabel func_80242E14_E08174 /* E0827C 80242F1C 12620008 */ beq $s3, $v0, .L80242F40 /* E08280 80242F20 32C400FF */ andi $a0, $s6, 0xff /* E08284 80242F24 08090BED */ j .L80242FB4 -/* E08288 80242F28 00000000 */ nop +/* E08288 80242F28 00000000 */ nop .L80242F2C: /* E0828C 80242F2C 24020003 */ addiu $v0, $zero, 3 /* E08290 80242F30 12620018 */ beq $s3, $v0, .L80242F94 /* E08294 80242F34 32C400FF */ andi $a0, $s6, 0xff /* E08298 80242F38 08090BED */ j .L80242FB4 -/* E0829C 80242F3C 00000000 */ nop +/* E0829C 80242F3C 00000000 */ nop .L80242F40: /* E082A0 80242F40 32A500FF */ andi $a1, $s5, 0xff /* E082A4 80242F44 328600FF */ andi $a2, $s4, 0xff /* E082A8 80242F48 0C046F97 */ jal set_background_color_blend /* E082AC 80242F4C 324700FF */ andi $a3, $s2, 0xff /* E082B0 80242F50 08090BED */ j .L80242FB4 -/* E082B4 80242F54 00000000 */ nop +/* E082B4 80242F54 00000000 */ nop .L80242F58: /* E082B8 80242F58 32C400FF */ andi $a0, $s6, 0xff /* E082BC 80242F5C 32A500FF */ andi $a1, $s5, 0xff @@ -100,7 +100,7 @@ glabel func_80242E14_E08174 /* E082E4 80242F84 0C046FAD */ jal func_8011BEB4 /* E082E8 80242F88 AFA20018 */ sw $v0, 0x18($sp) /* E082EC 80242F8C 08090BED */ j .L80242FB4 -/* E082F0 80242F90 00000000 */ nop +/* E082F0 80242F90 00000000 */ nop .L80242F94: /* E082F4 80242F94 32A500FF */ andi $a1, $s5, 0xff /* E082F8 80242F98 328600FF */ andi $a2, $s4, 0xff @@ -124,5 +124,5 @@ glabel func_80242E14_E08174 /* E0833C 80242FDC 24020002 */ addiu $v0, $zero, 2 /* E08340 80242FE0 03E00008 */ jr $ra /* E08344 80242FE4 27BD0058 */ addiu $sp, $sp, 0x58 -/* E08348 80242FE8 00000000 */ nop -/* E0834C 80242FEC 00000000 */ nop +/* E08348 80242FE8 00000000 */ nop +/* E0834C 80242FEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF20/func_80240000_C9DF20.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF20/func_80240000_C9DF20.s index 56540bca7f..a86c7b95c4 100644 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF20/func_80240000_C9DF20.s +++ b/asm/nonmatchings/world/area_flo/flo_00/C9DF20/func_80240000_C9DF20.s @@ -15,6 +15,6 @@ glabel func_80240000_C9DF20 /* C9DF48 80240028 24020002 */ addiu $v0, $zero, 2 /* C9DF4C 8024002C 03E00008 */ jr $ra /* C9DF50 80240030 27BD0020 */ addiu $sp, $sp, 0x20 -/* C9DF54 80240034 00000000 */ nop -/* C9DF58 80240038 00000000 */ nop -/* C9DF5C 8024003C 00000000 */ nop +/* C9DF54 80240034 00000000 */ nop +/* C9DF58 80240038 00000000 */ nop +/* C9DF5C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240040_C9DF60.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240040_C9DF60.s index 7ee55a7644..4e849473ca 100644 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240040_C9DF60.s +++ b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240040_C9DF60.s @@ -45,7 +45,7 @@ glabel func_80240040_C9DF60 /* C9DFFC 802400DC 0C00A7B5 */ jal dist2D /* C9E000 802400E0 4600B386 */ mov.s $f14, $f22 /* C9E004 802400E4 4614003C */ c.lt.s $f0, $f20 -/* C9E008 802400E8 00000000 */ nop +/* C9E008 802400E8 00000000 */ nop /* C9E00C 802400EC 45000003 */ bc1f .L802400FC /* C9E010 802400F0 2631000C */ addiu $s1, $s1, 0xc /* C9E014 802400F4 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_80240040_C9DF60 /* C9E040 80240120 8E6200D0 */ lw $v0, 0xd0($s3) /* C9E044 80240124 8C42007C */ lw $v0, 0x7c($v0) /* C9E048 80240128 04410004 */ bgez $v0, .L8024013C -/* C9E04C 8024012C 00000000 */ nop +/* C9E04C 8024012C 00000000 */ nop /* C9E050 80240130 C6C00000 */ lwc1 $f0, ($s6) /* C9E054 80240134 08090057 */ j .L8024015C /* C9E058 80240138 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_80240040_C9DF60 /* C9E05C 8024013C 3C018025 */ lui $at, %hi(D_802491C0) /* C9E060 80240140 D42291C0 */ ldc1 $f2, %lo(D_802491C0)($at) /* C9E064 80240144 44820000 */ mtc1 $v0, $f0 -/* C9E068 80240148 00000000 */ nop +/* C9E068 80240148 00000000 */ nop /* C9E06C 8024014C 46800021 */ cvt.d.w $f0, $f0 /* C9E070 80240150 46220003 */ div.d $f0, $f0, $f2 /* C9E074 80240154 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240198_C9E0B8.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240198_C9E0B8.s index 5fc04f5558..b4b4c7ff10 100644 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240198_C9E0B8.s +++ b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240198_C9E0B8.s @@ -44,7 +44,7 @@ glabel func_80240198_C9E0B8 /* C9E154 80240234 2402000F */ addiu $v0, $zero, 0xf /* C9E158 80240238 AFA2001C */ sw $v0, 0x1c($sp) /* C9E15C 8024023C 44833000 */ mtc1 $v1, $f6 -/* C9E160 80240240 00000000 */ nop +/* C9E160 80240240 00000000 */ nop /* C9E164 80240244 468031A0 */ cvt.s.w $f6, $f6 /* C9E168 80240248 44073000 */ mfc1 $a3, $f6 /* C9E16C 8024024C 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_80240198_C9E0B8 .L8024029C: /* C9E1BC 8024029C 8602008C */ lh $v0, 0x8c($s0) /* C9E1C0 802402A0 1440005D */ bnez $v0, .L80240418 -/* C9E1C4 802402A4 00000000 */ nop +/* C9E1C4 802402A4 00000000 */ nop /* C9E1C8 802402A8 C6000018 */ lwc1 $f0, 0x18($s0) /* C9E1CC 802402AC 3C014010 */ lui $at, 0x4010 /* C9E1D0 802402B0 44811800 */ mtc1 $at, $f3 /* C9E1D4 802402B4 44801000 */ mtc1 $zero, $f2 /* C9E1D8 802402B8 46000021 */ cvt.d.s $f0, $f0 /* C9E1DC 802402BC 4622003C */ c.lt.d $f0, $f2 -/* C9E1E0 802402C0 00000000 */ nop +/* C9E1E0 802402C0 00000000 */ nop /* C9E1E4 802402C4 45000003 */ bc1f .L802402D4 /* C9E1E8 802402C8 0200202D */ daddu $a0, $s0, $zero /* C9E1EC 802402CC 080900B6 */ j .L802402D8 @@ -88,7 +88,7 @@ glabel func_80240198_C9E0B8 /* C9E1F4 802402D4 24050001 */ addiu $a1, $zero, 1 .L802402D8: /* C9E1F8 802402D8 0C00F598 */ jal func_8003D660 -/* C9E1FC 802402DC 00000000 */ nop +/* C9E1FC 802402DC 00000000 */ nop /* C9E200 802402E0 C60C0038 */ lwc1 $f12, 0x38($s0) /* C9E204 802402E4 8E430078 */ lw $v1, 0x78($s2) /* C9E208 802402E8 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_80240198_C9E0B8 /* C9E230 80240310 4406B000 */ mfc1 $a2, $f22 /* C9E234 80240314 4407A000 */ mfc1 $a3, $f20 /* C9E238 80240318 0C00A720 */ jal atan2 -/* C9E23C 8024031C 00000000 */ nop +/* C9E23C 8024031C 00000000 */ nop /* C9E240 80240320 8E050018 */ lw $a1, 0x18($s0) /* C9E244 80240324 44060000 */ mfc1 $a2, $f0 /* C9E248 80240328 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_80240198_C9E0B8 /* C9E25C 8024033C 4406B000 */ mfc1 $a2, $f22 /* C9E260 80240340 4407A000 */ mfc1 $a3, $f20 /* C9E264 80240344 0C00A7B5 */ jal dist2D -/* C9E268 80240348 00000000 */ nop +/* C9E268 80240348 00000000 */ nop /* C9E26C 8024034C C6020018 */ lwc1 $f2, 0x18($s0) /* C9E270 80240350 4602003E */ c.le.s $f0, $f2 -/* C9E274 80240354 00000000 */ nop +/* C9E274 80240354 00000000 */ nop /* C9E278 80240358 4500002F */ bc1f .L80240418 /* C9E27C 8024035C 240403E8 */ addiu $a0, $zero, 0x3e8 /* C9E280 80240360 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_80240198_C9E0B8 /* C9E2D4 802403B4 18400003 */ blez $v0, .L802403C4 /* C9E2D8 802403B8 24020004 */ addiu $v0, $zero, 4 /* C9E2DC 802403BC 14600002 */ bnez $v1, .L802403C8 -/* C9E2E0 802403C0 00000000 */ nop +/* C9E2E0 802403C0 00000000 */ nop .L802403C4: /* C9E2E4 802403C4 AE420070 */ sw $v0, 0x70($s2) .L802403C8: diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240500_C9E420.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240500_C9E420.s index 20e62e9e01..17f3ad979c 100644 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240500_C9E420.s +++ b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240500_C9E420.s @@ -38,7 +38,7 @@ glabel func_80240500_C9E420 /* C9E4A4 80240584 2402000F */ addiu $v0, $zero, 0xf /* C9E4A8 80240588 AFA2001C */ sw $v0, 0x1c($sp) /* C9E4AC 8024058C 44833000 */ mtc1 $v1, $f6 -/* C9E4B0 80240590 00000000 */ nop +/* C9E4B0 80240590 00000000 */ nop /* C9E4B4 80240594 468031A0 */ cvt.s.w $f6, $f6 /* C9E4B8 80240598 44073000 */ mfc1 $a3, $f6 /* C9E4BC 8024059C 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_80240500_C9E420 .L80240600: /* C9E520 80240600 8602008C */ lh $v0, 0x8c($s0) /* C9E524 80240604 14400025 */ bnez $v0, .L8024069C -/* C9E528 80240608 00000000 */ nop +/* C9E528 80240608 00000000 */ nop /* C9E52C 8024060C 9602008E */ lhu $v0, 0x8e($s0) /* C9E530 80240610 2442FFFF */ addiu $v0, $v0, -1 /* C9E534 80240614 A602008E */ sh $v0, 0x8e($s0) /* C9E538 80240618 00021400 */ sll $v0, $v0, 0x10 /* C9E53C 8024061C 1440001F */ bnez $v0, .L8024069C -/* C9E540 80240620 00000000 */ nop +/* C9E540 80240620 00000000 */ nop /* C9E544 80240624 8E820074 */ lw $v0, 0x74($s4) /* C9E548 80240628 2442FFFF */ addiu $v0, $v0, -1 /* C9E54C 8024062C 10400019 */ beqz $v0, .L80240694 @@ -84,7 +84,7 @@ glabel func_80240500_C9E420 /* C9E558 80240638 9442002A */ lhu $v0, 0x2a($v0) /* C9E55C 8024063C 30420010 */ andi $v0, $v0, 0x10 /* C9E560 80240640 14400007 */ bnez $v0, .L80240660 -/* C9E564 80240644 00000000 */ nop +/* C9E564 80240644 00000000 */ nop /* C9E568 80240648 C600000C */ lwc1 $f0, 0xc($s0) /* C9E56C 8024064C 3C014334 */ lui $at, 0x4334 /* C9E570 80240650 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_802406BC_C9E5DC.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_802406BC_C9E5DC.s index e024a3f76a..d893568cbc 100644 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_802406BC_C9E5DC.s +++ b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_802406BC_C9E5DC.s @@ -28,7 +28,7 @@ glabel func_802406BC_C9E5DC /* C9E634 80240714 8E0200D0 */ lw $v0, 0xd0($s0) /* C9E638 80240718 8C42007C */ lw $v0, 0x7c($v0) /* C9E63C 8024071C 04410004 */ bgez $v0, .L80240730 -/* C9E640 80240720 00000000 */ nop +/* C9E640 80240720 00000000 */ nop /* C9E644 80240724 C6400000 */ lwc1 $f0, ($s2) /* C9E648 80240728 080901D4 */ j .L80240750 /* C9E64C 8024072C E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_802406BC_C9E5DC /* C9E650 80240730 3C018025 */ lui $at, %hi(D_802491C8) /* C9E654 80240734 D42291C8 */ ldc1 $f2, %lo(D_802491C8)($at) /* C9E658 80240738 44820000 */ mtc1 $v0, $f0 -/* C9E65C 8024073C 00000000 */ nop +/* C9E65C 8024073C 00000000 */ nop /* C9E660 80240740 46800021 */ cvt.d.w $f0, $f0 /* C9E664 80240744 46220003 */ div.d $f0, $f0, $f2 /* C9E668 80240748 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_8024085C_C9E77C.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_8024085C_C9E77C.s index f2a5e50174..841ba80ea6 100644 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_8024085C_C9E77C.s +++ b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_8024085C_C9E77C.s @@ -47,20 +47,20 @@ glabel func_8024085C_C9E77C /* C9E824 80240904 8E02001C */ lw $v0, 0x1c($s0) /* C9E828 80240908 46001005 */ abs.s $f0, $f2 /* C9E82C 8024090C 44822000 */ mtc1 $v0, $f4 -/* C9E830 80240910 00000000 */ nop +/* C9E830 80240910 00000000 */ nop /* C9E834 80240914 46802120 */ cvt.s.w $f4, $f4 /* C9E838 80240918 4600203C */ c.lt.s $f4, $f0 -/* C9E83C 8024091C 00000000 */ nop +/* C9E83C 8024091C 00000000 */ nop /* C9E840 80240920 4500000D */ bc1f .L80240958 -/* C9E844 80240924 00000000 */ nop +/* C9E844 80240924 00000000 */ nop /* C9E848 80240928 44800000 */ mtc1 $zero, $f0 /* C9E84C 8024092C C654000C */ lwc1 $f20, 0xc($s2) /* C9E850 80240930 4600103C */ c.lt.s $f2, $f0 -/* C9E854 80240934 00000000 */ nop +/* C9E854 80240934 00000000 */ nop /* C9E858 80240938 45000006 */ bc1f .L80240954 /* C9E85C 8024093C 00021023 */ negu $v0, $v0 /* C9E860 80240940 44820000 */ mtc1 $v0, $f0 -/* C9E864 80240944 00000000 */ nop +/* C9E864 80240944 00000000 */ nop /* C9E868 80240948 46800020 */ cvt.s.w $f0, $f0 /* C9E86C 8024094C 08090256 */ j .L80240958 /* C9E870 80240950 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_8024098C_C9E8AC.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_8024098C_C9E8AC.s index 9a6d3f8b16..8e8764ff02 100644 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_8024098C_C9E8AC.s +++ b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_8024098C_C9E8AC.s @@ -37,7 +37,7 @@ glabel func_8024098C_C9E8AC /* C9E92C 80240A0C 2402000F */ addiu $v0, $zero, 0xf /* C9E930 80240A10 AFA2001C */ sw $v0, 0x1c($sp) /* C9E934 80240A14 44833000 */ mtc1 $v1, $f6 -/* C9E938 80240A18 00000000 */ nop +/* C9E938 80240A18 00000000 */ nop /* C9E93C 80240A1C 468031A0 */ cvt.s.w $f6, $f6 /* C9E940 80240A20 44073000 */ mfc1 $a3, $f6 /* C9E944 80240A24 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240B14_C9EA34.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240B14_C9EA34.s index 106876158f..6a323fdfd9 100644 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240B14_C9EA34.s +++ b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240B14_C9EA34.s @@ -28,7 +28,7 @@ glabel func_80240B14_C9EA34 /* C9EA8C 80240B6C C4400008 */ lwc1 $f0, 8($v0) /* C9EA90 80240B70 46800020 */ cvt.s.w $f0, $f0 /* C9EA94 80240B74 4602003E */ c.le.s $f0, $f2 -/* C9EA98 80240B78 00000000 */ nop +/* C9EA98 80240B78 00000000 */ nop /* C9EA9C 80240B7C 45020003 */ bc1fl .L80240B8C /* C9EAA0 80240B80 24840001 */ addiu $a0, $a0, 1 /* C9EAA4 80240B84 080902E7 */ j .L80240B9C diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s index 14732d382c..19136d8bb5 100644 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s +++ b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s @@ -46,7 +46,7 @@ glabel func_80240BD4_C9EAF4 /* C9EB98 80240C78 8E2200B0 */ lw $v0, 0xb0($s1) /* C9EB9C 80240C7C 30420004 */ andi $v0, $v0, 4 /* C9EBA0 80240C80 10400044 */ beqz $v0, .L80240D94 -/* C9EBA4 80240C84 00000000 */ nop +/* C9EBA4 80240C84 00000000 */ nop .L80240C88: /* C9EBA8 80240C88 2404F7FF */ addiu $a0, $zero, -0x801 /* C9EBAC 80240C8C AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80240BD4_C9EAF4 /* C9EC60 80240D40 3C0142C8 */ lui $at, 0x42c8 /* C9EC64 80240D44 44812000 */ mtc1 $at, $f4 /* C9EC68 80240D48 44823000 */ mtc1 $v0, $f6 -/* C9EC6C 80240D4C 00000000 */ nop +/* C9EC6C 80240D4C 00000000 */ nop /* C9EC70 80240D50 468031A0 */ cvt.s.w $f6, $f6 /* C9EC74 80240D54 27A20044 */ addiu $v0, $sp, 0x44 /* C9EC78 80240D58 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80240BD4_C9EAF4 /* C9EC9C 80240D7C 0C0372DF */ jal func_800DCB7C /* C9ECA0 80240D80 27A70040 */ addiu $a3, $sp, 0x40 /* C9ECA4 80240D84 10400003 */ beqz $v0, .L80240D94 -/* C9ECA8 80240D88 00000000 */ nop +/* C9ECA8 80240D88 00000000 */ nop /* C9ECAC 80240D8C C7A0003C */ lwc1 $f0, 0x3c($sp) /* C9ECB0 80240D90 E640003C */ swc1 $f0, 0x3c($s2) .L80240D94: @@ -124,72 +124,85 @@ glabel func_80240BD4_C9EAF4 /* C9ECB8 80240D98 2C620064 */ sltiu $v0, $v1, 0x64 /* C9ECBC 80240D9C 10400042 */ beqz $v0, .L80240EA8 /* C9ECC0 80240DA0 00031080 */ sll $v0, $v1, 2 -/* C9ECC4 80240DA4 3C018025 */ lui $at, %hi(D_802491D0) +/* C9ECC4 80240DA4 3C018025 */ lui $at, %hi(jtbl_802491D0_CA70F0) /* C9ECC8 80240DA8 00220821 */ addu $at, $at, $v0 -/* C9ECCC 80240DAC 8C2291D0 */ lw $v0, %lo(D_802491D0)($at) +/* C9ECCC 80240DAC 8C2291D0 */ lw $v0, %lo(jtbl_802491D0_CA70F0)($at) /* C9ECD0 80240DB0 00400008 */ jr $v0 -/* C9ECD4 80240DB4 00000000 */ nop +/* C9ECD4 80240DB4 00000000 */ nop +glabel L80240DB8_C9ECD8 /* C9ECD8 80240DB8 0280202D */ daddu $a0, $s4, $zero /* C9ECDC 80240DBC 0260282D */ daddu $a1, $s3, $zero /* C9ECE0 80240DC0 0C090010 */ jal func_80240040_C9DF60 /* C9ECE4 80240DC4 02A0302D */ daddu $a2, $s5, $zero +glabel L80240DC8_C9ECE8 /* C9ECE8 80240DC8 0280202D */ daddu $a0, $s4, $zero /* C9ECEC 80240DCC 0260282D */ daddu $a1, $s3, $zero /* C9ECF0 80240DD0 0C090066 */ jal func_80240198_C9E0B8 /* C9ECF4 80240DD4 02A0302D */ daddu $a2, $s5, $zero /* C9ECF8 80240DD8 080903AA */ j .L80240EA8 -/* C9ECFC 80240DDC 00000000 */ nop +/* C9ECFC 80240DDC 00000000 */ nop +glabel L80240DE0_C9ED00 /* C9ED00 80240DE0 0280202D */ daddu $a0, $s4, $zero /* C9ED04 80240DE4 0260282D */ daddu $a1, $s3, $zero /* C9ED08 80240DE8 0C090110 */ jal flo_00_UnkNpcAIFunc1 /* C9ED0C 80240DEC 02A0302D */ daddu $a2, $s5, $zero +glabel L80240DF0_C9ED10 /* C9ED10 80240DF0 0280202D */ daddu $a0, $s4, $zero /* C9ED14 80240DF4 0260282D */ daddu $a1, $s3, $zero /* C9ED18 80240DF8 0C090140 */ jal func_80240500_C9E420 /* C9ED1C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* C9ED20 80240E00 080903AA */ j .L80240EA8 -/* C9ED24 80240E04 00000000 */ nop +/* C9ED24 80240E04 00000000 */ nop +glabel L80240E08_C9ED28 /* C9ED28 80240E08 0280202D */ daddu $a0, $s4, $zero /* C9ED2C 80240E0C 0260282D */ daddu $a1, $s3, $zero /* C9ED30 80240E10 0C0901AF */ jal func_802406BC_C9E5DC /* C9ED34 80240E14 02A0302D */ daddu $a2, $s5, $zero /* C9ED38 80240E18 080903AA */ j .L80240EA8 -/* C9ED3C 80240E1C 00000000 */ nop +/* C9ED3C 80240E1C 00000000 */ nop +glabel L80240E20_C9ED40 /* C9ED40 80240E20 0280202D */ daddu $a0, $s4, $zero /* C9ED44 80240E24 0260282D */ daddu $a1, $s3, $zero /* C9ED48 80240E28 0C0901DC */ jal flo_00_NpcJumpFunc2 /* C9ED4C 80240E2C 02A0302D */ daddu $a2, $s5, $zero +glabel L80240E30_C9ED50 /* C9ED50 80240E30 0280202D */ daddu $a0, $s4, $zero /* C9ED54 80240E34 0260282D */ daddu $a1, $s3, $zero /* C9ED58 80240E38 0C0901F9 */ jal flo_00_NpcJumpFunc /* C9ED5C 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* C9ED60 80240E40 080903AA */ j .L80240EA8 -/* C9ED64 80240E44 00000000 */ nop +/* C9ED64 80240E44 00000000 */ nop +glabel L80240E48_C9ED68 /* C9ED68 80240E48 0280202D */ daddu $a0, $s4, $zero /* C9ED6C 80240E4C 0260282D */ daddu $a1, $s3, $zero /* C9ED70 80240E50 0C090217 */ jal func_8024085C_C9E77C /* C9ED74 80240E54 02A0302D */ daddu $a2, $s5, $zero +glabel L80240E58_C9ED78 /* C9ED78 80240E58 0280202D */ daddu $a0, $s4, $zero /* C9ED7C 80240E5C 0260282D */ daddu $a1, $s3, $zero /* C9ED80 80240E60 0C090263 */ jal func_8024098C_C9E8AC /* C9ED84 80240E64 02A0302D */ daddu $a2, $s5, $zero /* C9ED88 80240E68 080903AA */ j .L80240EA8 -/* C9ED8C 80240E6C 00000000 */ nop +/* C9ED8C 80240E6C 00000000 */ nop +glabel L80240E70_C9ED90 /* C9ED90 80240E70 0280202D */ daddu $a0, $s4, $zero /* C9ED94 80240E74 0260282D */ daddu $a1, $s3, $zero /* C9ED98 80240E78 0C0902AB */ jal flo_00_UnkNpcDurationFlagFunc /* C9ED9C 80240E7C 02A0302D */ daddu $a2, $s5, $zero /* C9EDA0 80240E80 080903AA */ j .L80240EA8 -/* C9EDA4 80240E84 00000000 */ nop +/* C9EDA4 80240E84 00000000 */ nop +glabel L80240E88_C9EDA8 /* C9EDA8 80240E88 0280202D */ daddu $a0, $s4, $zero /* C9EDAC 80240E8C 0260282D */ daddu $a1, $s3, $zero /* C9EDB0 80240E90 0C0902C5 */ jal func_80240B14_C9EA34 /* C9EDB4 80240E94 02A0302D */ daddu $a2, $s5, $zero /* C9EDB8 80240E98 080903AA */ j .L80240EA8 -/* C9EDBC 80240E9C 00000000 */ nop +/* C9EDBC 80240E9C 00000000 */ nop +glabel L80240EA0_C9EDC0 /* C9EDC0 80240EA0 0C0129CF */ jal func_8004A73C /* C9EDC4 80240EA4 0280202D */ daddu $a0, $s4, $zero .L80240EA8: +glabel L80240EA8_C9EDC8 /* C9EDC8 80240EA8 8FBF0060 */ lw $ra, 0x60($sp) /* C9EDCC 80240EAC 8FB5005C */ lw $s5, 0x5c($sp) /* C9EDD0 80240EB0 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_80240F80_C9EEA0.s b/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_80240F80_C9EEA0.s index ef0dec8934..9ad4978354 100644 --- a/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_80240F80_C9EEA0.s +++ b/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_80240F80_C9EEA0.s @@ -20,7 +20,7 @@ glabel func_80240F80_C9EEA0 /* C9EEDC 80240FBC C60200B0 */ lwc1 $f2, 0xb0($s0) /* C9EEE0 80240FC0 468010A0 */ cvt.s.w $f2, $f2 /* C9EEE4 80240FC4 4482A000 */ mtc1 $v0, $f20 -/* C9EEE8 80240FC8 00000000 */ nop +/* C9EEE8 80240FC8 00000000 */ nop /* C9EEEC 80240FCC 4680A520 */ cvt.s.w $f20, $f20 /* C9EEF0 80240FD0 3C01C2A6 */ lui $at, 0xc2a6 /* C9EEF4 80240FD4 4481C000 */ mtc1 $at, $f24 @@ -46,7 +46,7 @@ glabel func_80240F80_C9EEA0 /* C9EF44 80241024 0C00A8BB */ jal sin_deg /* C9EF48 80241028 4600A306 */ mov.s $f12, $f20 /* C9EF4C 8024102C 4600B002 */ mul.s $f0, $f22, $f0 -/* C9EF50 80241030 00000000 */ nop +/* C9EF50 80241030 00000000 */ nop /* C9EF54 80241034 46180000 */ add.s $f0, $f0, $f24 /* C9EF58 80241038 3C118011 */ lui $s1, %hi(gPlayerStatus) /* C9EF5C 8024103C 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) @@ -61,12 +61,12 @@ glabel func_80240F80_C9EEA0 /* C9EF80 80241060 4600A306 */ mov.s $f12, $f20 /* C9EF84 80241064 02028021 */ addu $s0, $s0, $v0 /* C9EF88 80241068 44900000 */ mtc1 $s0, $f0 -/* C9EF8C 8024106C 00000000 */ nop +/* C9EF8C 8024106C 00000000 */ nop /* C9EF90 80241070 46800020 */ cvt.s.w $f0, $f0 /* C9EF94 80241074 0C00A8D4 */ jal cos_deg /* C9EF98 80241078 E620002C */ swc1 $f0, 0x2c($s1) /* C9EF9C 8024107C 4600B582 */ mul.s $f22, $f22, $f0 -/* C9EFA0 80241080 00000000 */ nop +/* C9EFA0 80241080 00000000 */ nop /* C9EFA4 80241084 4616D681 */ sub.s $f26, $f26, $f22 /* C9EFA8 80241088 E63A0030 */ swc1 $f26, 0x30($s1) /* C9EFAC 8024108C 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_802410B4_C9EFD4.s b/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_802410B4_C9EFD4.s index b6f2d2c4e2..1575cecfbe 100644 --- a/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_802410B4_C9EFD4.s +++ b/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_802410B4_C9EFD4.s @@ -23,7 +23,7 @@ glabel func_802410B4_C9EFD4 /* C9F01C 802410FC C60200BC */ lwc1 $f2, 0xbc($s0) /* C9F020 80241100 468010A0 */ cvt.s.w $f2, $f2 /* C9F024 80241104 4482A000 */ mtc1 $v0, $f20 -/* C9F028 80241108 00000000 */ nop +/* C9F028 80241108 00000000 */ nop /* C9F02C 8024110C 4680A520 */ cvt.s.w $f20, $f20 /* C9F030 80241110 3C01C2A6 */ lui $at, 0xc2a6 /* C9F034 80241114 4481C000 */ mtc1 $at, $f24 @@ -49,7 +49,7 @@ glabel func_802410B4_C9EFD4 /* C9F084 80241164 0C00A8BB */ jal sin_deg /* C9F088 80241168 4600A306 */ mov.s $f12, $f20 /* C9F08C 8024116C 4600B002 */ mul.s $f0, $f22, $f0 -/* C9F090 80241170 00000000 */ nop +/* C9F090 80241170 00000000 */ nop /* C9F094 80241174 46180000 */ add.s $f0, $f0, $f24 /* C9F098 80241178 E6200038 */ swc1 $f0, 0x38($s1) /* C9F09C 8024117C 8E0500B8 */ lw $a1, 0xb8($s0) @@ -62,12 +62,12 @@ glabel func_802410B4_C9EFD4 /* C9F0B8 80241198 4600A306 */ mov.s $f12, $f20 /* C9F0BC 8024119C 02028021 */ addu $s0, $s0, $v0 /* C9F0C0 802411A0 44900000 */ mtc1 $s0, $f0 -/* C9F0C4 802411A4 00000000 */ nop +/* C9F0C4 802411A4 00000000 */ nop /* C9F0C8 802411A8 46800020 */ cvt.s.w $f0, $f0 /* C9F0CC 802411AC 0C00A8D4 */ jal cos_deg /* C9F0D0 802411B0 E620003C */ swc1 $f0, 0x3c($s1) /* C9F0D4 802411B4 4600B582 */ mul.s $f22, $f22, $f0 -/* C9F0D8 802411B8 00000000 */ nop +/* C9F0D8 802411B8 00000000 */ nop /* C9F0DC 802411BC 4616D681 */ sub.s $f26, $f26, $f22 /* C9F0E0 802411C0 E63A0040 */ swc1 $f26, 0x40($s1) /* C9F0E4 802411C4 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_8024139C_C9F2BC.s b/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_8024139C_C9F2BC.s index 888c1b13a6..102bdbb716 100644 --- a/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_8024139C_C9F2BC.s +++ b/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_8024139C_C9F2BC.s @@ -5,7 +5,7 @@ glabel func_8024139C_C9F2BC /* C9F2BC 8024139C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* C9F2C0 802413A0 AFBF0010 */ sw $ra, 0x10($sp) /* C9F2C4 802413A4 0C03A6D5 */ jal increment_status_menu_disabled -/* C9F2C8 802413A8 00000000 */ nop +/* C9F2C8 802413A8 00000000 */ nop /* C9F2CC 802413AC 8FBF0010 */ lw $ra, 0x10($sp) /* C9F2D0 802413B0 24020002 */ addiu $v0, $zero, 2 /* C9F2D4 802413B4 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_802413BC_C9F2DC.s b/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_802413BC_C9F2DC.s index e6a5dd21a0..96e9d2b228 100644 --- a/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_802413BC_C9F2DC.s +++ b/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_802413BC_C9F2DC.s @@ -5,9 +5,9 @@ glabel func_802413BC_C9F2DC /* C9F2DC 802413BC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* C9F2E0 802413C0 AFBF0010 */ sw $ra, 0x10($sp) /* C9F2E4 802413C4 0C03A6CC */ jal decrement_status_menu_disabled -/* C9F2E8 802413C8 00000000 */ nop +/* C9F2E8 802413C8 00000000 */ nop /* C9F2EC 802413CC 8FBF0010 */ lw $ra, 0x10($sp) /* C9F2F0 802413D0 24020002 */ addiu $v0, $zero, 2 /* C9F2F4 802413D4 03E00008 */ jr $ra /* C9F2F8 802413D8 27BD0018 */ addiu $sp, $sp, 0x18 -/* C9F2FC 802413DC 00000000 */ nop +/* C9F2FC 802413DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_03/CA72A0/func_80240000_CA72A0.s b/asm/nonmatchings/world/area_flo/flo_03/CA72A0/func_80240000_CA72A0.s index 0f39d889ac..2b9071deae 100644 --- a/asm/nonmatchings/world/area_flo/flo_03/CA72A0/func_80240000_CA72A0.s +++ b/asm/nonmatchings/world/area_flo/flo_03/CA72A0/func_80240000_CA72A0.s @@ -15,6 +15,6 @@ glabel func_80240000_CA72A0 /* CA72C8 80240028 24020002 */ addiu $v0, $zero, 2 /* CA72CC 8024002C 03E00008 */ jr $ra /* CA72D0 80240030 27BD0020 */ addiu $sp, $sp, 0x20 -/* CA72D4 80240034 00000000 */ nop -/* CA72D8 80240038 00000000 */ nop -/* CA72DC 8024003C 00000000 */ nop +/* CA72D4 80240034 00000000 */ nop +/* CA72D8 80240038 00000000 */ nop +/* CA72DC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240040_CA72E0.s b/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240040_CA72E0.s index 2c0a5ac9da..9d9c590e41 100644 --- a/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240040_CA72E0.s +++ b/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240040_CA72E0.s @@ -26,7 +26,7 @@ glabel func_80240040_CA72E0 /* CA7330 80240090 1440FFFA */ bnez $v0, .L8024007C /* CA7334 80240094 24A50004 */ addiu $a1, $a1, 4 /* CA7338 80240098 08090037 */ j .L802400DC -/* CA733C 8024009C 00000000 */ nop +/* CA733C 8024009C 00000000 */ nop .L802400A0: /* CA7340 802400A0 0000182D */ daddu $v1, $zero, $zero /* CA7344 802400A4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240158_CA73F8.s b/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240158_CA73F8.s index d6537ff607..5248edd5b0 100644 --- a/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240158_CA73F8.s +++ b/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240158_CA73F8.s @@ -46,7 +46,7 @@ glabel func_80240158_CA73F8 /* CA749C 802401FC 44801000 */ mtc1 $zero, $f2 /* CA74A0 80240200 46000121 */ cvt.d.s $f4, $f0 /* CA74A4 80240204 4624103C */ c.lt.d $f2, $f4 -/* CA74A8 80240208 00000000 */ nop +/* CA74A8 80240208 00000000 */ nop /* CA74AC 8024020C 45000053 */ bc1f .L8024035C /* CA74B0 80240210 4600B306 */ mov.s $f12, $f22 /* CA74B4 80240214 8E060038 */ lw $a2, 0x38($s0) @@ -66,42 +66,42 @@ glabel func_80240158_CA73F8 /* CA74EC 8024024C 4600A101 */ sub.s $f4, $f20, $f0 /* CA74F0 80240250 4600218D */ trunc.w.s $f6, $f4 /* CA74F4 80240254 44023000 */ mfc1 $v0, $f6 -/* CA74F8 80240258 00000000 */ nop +/* CA74F8 80240258 00000000 */ nop /* CA74FC 8024025C 04420001 */ bltzl $v0, .L80240264 /* CA7500 80240260 00021023 */ negu $v0, $v0 .L80240264: /* CA7504 80240264 28420015 */ slti $v0, $v0, 0x15 /* CA7508 80240268 1440002D */ bnez $v0, .L80240320 -/* CA750C 8024026C 00000000 */ nop +/* CA750C 8024026C 00000000 */ nop /* CA7510 80240270 4604D03E */ c.le.s $f26, $f4 -/* CA7514 80240274 00000000 */ nop +/* CA7514 80240274 00000000 */ nop /* CA7518 80240278 45000005 */ bc1f .L80240290 /* CA751C 8024027C 46002086 */ mov.s $f2, $f4 /* CA7520 80240280 3C0143B4 */ lui $at, 0x43b4 /* CA7524 80240284 44810000 */ mtc1 $at, $f0 -/* CA7528 80240288 00000000 */ nop +/* CA7528 80240288 00000000 */ nop /* CA752C 8024028C 46002081 */ sub.s $f2, $f4, $f0 .L80240290: /* CA7530 80240290 3C01C334 */ lui $at, 0xc334 /* CA7534 80240294 44810000 */ mtc1 $at, $f0 -/* CA7538 80240298 00000000 */ nop +/* CA7538 80240298 00000000 */ nop /* CA753C 8024029C 4600103E */ c.le.s $f2, $f0 -/* CA7540 802402A0 00000000 */ nop +/* CA7540 802402A0 00000000 */ nop /* CA7544 802402A4 45000005 */ bc1f .L802402BC -/* CA7548 802402A8 00000000 */ nop +/* CA7548 802402A8 00000000 */ nop /* CA754C 802402AC 3C0143B4 */ lui $at, 0x43b4 /* CA7550 802402B0 44810000 */ mtc1 $at, $f0 -/* CA7554 802402B4 00000000 */ nop +/* CA7554 802402B4 00000000 */ nop /* CA7558 802402B8 46001080 */ add.s $f2, $f2, $f0 .L802402BC: /* CA755C 802402BC 46022032 */ c.eq.s $f4, $f2 -/* CA7560 802402C0 00000000 */ nop +/* CA7560 802402C0 00000000 */ nop /* CA7564 802402C4 45000016 */ bc1f .L80240320 -/* CA7568 802402C8 00000000 */ nop +/* CA7568 802402C8 00000000 */ nop /* CA756C 802402CC 44800000 */ mtc1 $zero, $f0 /* CA7570 802402D0 E7B60010 */ swc1 $f22, 0x10($sp) /* CA7574 802402D4 4604003E */ c.le.s $f0, $f4 -/* CA7578 802402D8 00000000 */ nop +/* CA7578 802402D8 00000000 */ nop /* CA757C 802402DC 45000005 */ bc1f .L802402F4 /* CA7580 802402E0 E7B80014 */ swc1 $f24, 0x14($sp) /* CA7584 802402E4 3C0141A0 */ lui $at, 0x41a0 @@ -111,11 +111,11 @@ glabel func_80240158_CA73F8 .L802402F4: /* CA7594 802402F4 3C0141A0 */ lui $at, 0x41a0 /* CA7598 802402F8 44816000 */ mtc1 $at, $f12 -/* CA759C 802402FC 00000000 */ nop +/* CA759C 802402FC 00000000 */ nop /* CA75A0 80240300 460CA300 */ add.s $f12, $f20, $f12 .L80240304: /* CA75A4 80240304 0C00A6C9 */ jal clamp_angle -/* CA75A8 80240308 00000000 */ nop +/* CA75A8 80240308 00000000 */ nop /* CA75AC 8024030C 27A40010 */ addiu $a0, $sp, 0x10 /* CA75B0 80240310 3C064238 */ lui $a2, 0x4238 /* CA75B4 80240314 44070000 */ mfc1 $a3, $f0 @@ -136,14 +136,14 @@ glabel func_80240158_CA73F8 /* CA75EC 8024034C 0C00EA95 */ jal npc_move_heading /* CA75F0 80240350 AC86000C */ sw $a2, 0xc($a0) /* CA75F4 80240354 080900F2 */ j .L802403C8 -/* CA75F8 80240358 00000000 */ nop +/* CA75F8 80240358 00000000 */ nop .L8024035C: /* CA75FC 8024035C 3C018024 */ lui $at, %hi(D_80244F48) /* CA7600 80240360 D4204F48 */ ldc1 $f0, %lo(D_80244F48)($at) /* CA7604 80240364 4624003C */ c.lt.d $f0, $f4 -/* CA7608 80240368 00000000 */ nop +/* CA7608 80240368 00000000 */ nop /* CA760C 8024036C 4500000F */ bc1f .L802403AC -/* CA7610 80240370 00000000 */ nop +/* CA7610 80240370 00000000 */ nop /* CA7614 80240374 C60C0038 */ lwc1 $f12, 0x38($s0) /* CA7618 80240378 C60E0040 */ lwc1 $f14, 0x40($s0) /* CA761C 8024037C 8FA60010 */ lw $a2, 0x10($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_07/CAC1F0/func_80240344_CAC534.s b/asm/nonmatchings/world/area_flo/flo_07/CAC1F0/func_80240344_CAC534.s index 39ccafa5f1..1f94945178 100644 --- a/asm/nonmatchings/world/area_flo/flo_07/CAC1F0/func_80240344_CAC534.s +++ b/asm/nonmatchings/world/area_flo/flo_07/CAC1F0/func_80240344_CAC534.s @@ -39,5 +39,5 @@ glabel func_80240344_CAC534 /* CAC5BC 802403CC 24020002 */ addiu $v0, $zero, 2 /* CAC5C0 802403D0 03E00008 */ jr $ra /* CAC5C4 802403D4 27BD0030 */ addiu $sp, $sp, 0x30 -/* CAC5C8 802403D8 00000000 */ nop -/* CAC5CC 802403DC 00000000 */ nop +/* CAC5C8 802403D8 00000000 */ nop +/* CAC5CC 802403DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_07/CAC5D0/func_8024061C_CAC80C.s b/asm/nonmatchings/world/area_flo/flo_07/CAC5D0/func_8024061C_CAC80C.s index 868b5a3359..e5cdf804b1 100644 --- a/asm/nonmatchings/world/area_flo/flo_07/CAC5D0/func_8024061C_CAC80C.s +++ b/asm/nonmatchings/world/area_flo/flo_07/CAC5D0/func_8024061C_CAC80C.s @@ -26,7 +26,7 @@ glabel func_8024061C_CAC80C /* CAC85C 8024066C 1440FFFA */ bnez $v0, .L80240658 /* CAC860 80240670 24A50004 */ addiu $a1, $a1, 4 /* CAC864 80240674 080901AE */ j .L802406B8 -/* CAC868 80240678 00000000 */ nop +/* CAC868 80240678 00000000 */ nop .L8024067C: /* CAC86C 8024067C 0000182D */ daddu $v1, $zero, $zero /* CAC870 80240680 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802400D4_CAEE14.s b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802400D4_CAEE14.s index 89a8e69494..6aeb4fdc3a 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802400D4_CAEE14.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802400D4_CAEE14.s @@ -8,7 +8,7 @@ glabel func_802400D4_CAEE14 /* CAEE20 802400E0 00822021 */ addu $a0, $a0, $v0 /* CAEE24 802400E4 90820014 */ lbu $v0, 0x14($a0) /* CAEE28 802400E8 10400009 */ beqz $v0, .L80240110 -/* CAEE2C 802400EC 00000000 */ nop +/* CAEE2C 802400EC 00000000 */ nop /* CAEE30 802400F0 90820015 */ lbu $v0, 0x15($a0) /* CAEE34 802400F4 00022600 */ sll $a0, $v0, 0x18 /* CAEE38 802400F8 00041E03 */ sra $v1, $a0, 0x18 @@ -16,7 +16,7 @@ glabel func_802400D4_CAEE14 /* CAEE40 80240100 00021403 */ sra $v0, $v0, 0x10 /* CAEE44 80240104 0043102A */ slt $v0, $v0, $v1 /* CAEE48 80240108 10400003 */ beqz $v0, .L80240118 -/* CAEE4C 8024010C 00000000 */ nop +/* CAEE4C 8024010C 00000000 */ nop .L80240110: /* CAEE50 80240110 03E00008 */ jr $ra /* CAEE54 80240114 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802401CC_CAEF0C.s b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802401CC_CAEF0C.s index 3de3f20cb0..2922338bf3 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802401CC_CAEF0C.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802401CC_CAEF0C.s @@ -108,20 +108,20 @@ glabel func_802401CC_CAEF0C /* CAF094 80240354 10400009 */ beqz $v0, .L8024037C /* CAF098 80240358 AEA20074 */ sw $v0, 0x74($s5) /* CAF09C 8024035C 0C03C4EC */ jal func_800F13B0 -/* CAF0A0 80240360 00000000 */ nop +/* CAF0A0 80240360 00000000 */ nop /* CAF0A4 80240364 8EA20070 */ lw $v0, 0x70($s5) /* CAF0A8 80240368 24420001 */ addiu $v0, $v0, 1 .L8024036C: /* CAF0AC 8024036C AEA20070 */ sw $v0, 0x70($s5) /* CAF0B0 80240370 2842000F */ slti $v0, $v0, 0xf /* CAF0B4 80240374 10400003 */ beqz $v0, .L80240384 -/* CAF0B8 80240378 00000000 */ nop +/* CAF0B8 80240378 00000000 */ nop .L8024037C: /* CAF0BC 8024037C 080900FB */ j .L802403EC /* CAF0C0 80240380 0000102D */ daddu $v0, $zero, $zero .L80240384: /* CAF0C4 80240384 0C03C54E */ jal func_800F1538 -/* CAF0C8 80240388 00000000 */ nop +/* CAF0C8 80240388 00000000 */ nop /* CAF0CC 8024038C 8EA30074 */ lw $v1, 0x74($s5) /* CAF0D0 80240390 240200FF */ addiu $v0, $zero, 0xff /* CAF0D4 80240394 10620010 */ beq $v1, $v0, .L802403D8 diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240600_CAF340.s b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240600_CAF340.s index 20e8c55110..3107a2c550 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240600_CAF340.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240600_CAF340.s @@ -36,7 +36,7 @@ glabel func_80240600_CAF340 /* CAF3BC 8024067C 0C00A88D */ jal sin_cos_deg /* CAF3C0 80240680 0040A82D */ daddu $s5, $v0, $zero /* CAF3C4 80240684 1200005D */ beqz $s0, .L802407FC -/* CAF3C8 80240688 00000000 */ nop +/* CAF3C8 80240688 00000000 */ nop /* CAF3CC 8024068C 0C00AB0A */ jal general_heap_malloc /* CAF3D0 80240690 24040068 */ addiu $a0, $zero, 0x68 /* CAF3D4 80240694 0040902D */ daddu $s2, $v0, $zero @@ -98,10 +98,10 @@ glabel func_80240600_CAF340 /* CAF4AC 8024076C C7A2001C */ lwc1 $f2, 0x1c($sp) /* CAF4B0 80240770 C7A40020 */ lwc1 $f4, 0x20($sp) /* CAF4B4 80240774 46041082 */ mul.s $f2, $f2, $f4 -/* CAF4B8 80240778 00000000 */ nop +/* CAF4B8 80240778 00000000 */ nop /* CAF4BC 8024077C C7A00018 */ lwc1 $f0, 0x18($sp) /* CAF4C0 80240780 46040002 */ mul.s $f0, $f0, $f4 -/* CAF4C4 80240784 00000000 */ nop +/* CAF4C4 80240784 00000000 */ nop /* CAF4C8 80240788 E6020038 */ swc1 $f2, 0x38($s0) /* CAF4CC 8024078C E6000050 */ swc1 $f0, 0x50($s0) /* CAF4D0 80240790 8E42005C */ lw $v0, 0x5c($s2) @@ -142,12 +142,12 @@ glabel func_80240600_CAF340 /* CAF558 80240818 10600007 */ beqz $v1, .L80240838 /* CAF55C 8024081C 24040005 */ addiu $a0, $zero, 5 /* CAF560 80240820 08090274 */ j .L802409D0 -/* CAF564 80240824 00000000 */ nop +/* CAF564 80240824 00000000 */ nop .L80240828: /* CAF568 80240828 10620058 */ beq $v1, $v0, .L8024098C -/* CAF56C 8024082C 00000000 */ nop +/* CAF56C 8024082C 00000000 */ nop /* CAF570 80240830 08090274 */ j .L802409D0 -/* CAF574 80240834 00000000 */ nop +/* CAF574 80240834 00000000 */ nop .L80240838: /* CAF578 80240838 0000882D */ daddu $s1, $zero, $zero /* CAF57C 8024083C 3C148024 */ lui $s4, %hi(D_80242008) @@ -174,11 +174,11 @@ glabel func_80240600_CAF340 /* CAF5CC 8024088C C7A4001C */ lwc1 $f4, 0x1c($sp) /* CAF5D0 80240890 C7A00020 */ lwc1 $f0, 0x20($sp) /* CAF5D4 80240894 46002102 */ mul.s $f4, $f4, $f0 -/* CAF5D8 80240898 00000000 */ nop +/* CAF5D8 80240898 00000000 */ nop /* CAF5DC 8024089C C7A20018 */ lwc1 $f2, 0x18($sp) /* CAF5E0 802408A0 26940004 */ addiu $s4, $s4, 4 /* CAF5E4 802408A4 46001082 */ mul.s $f2, $f2, $f0 -/* CAF5E8 802408A8 00000000 */ nop +/* CAF5E8 802408A8 00000000 */ nop /* CAF5EC 802408AC 26730004 */ addiu $s3, $s3, 4 /* CAF5F0 802408B0 26310001 */ addiu $s1, $s1, 1 /* CAF5F4 802408B4 2A220003 */ slti $v0, $s1, 3 @@ -215,11 +215,11 @@ glabel func_80240600_CAF340 /* CAF668 80240928 C7A4001C */ lwc1 $f4, 0x1c($sp) /* CAF66C 8024092C C7A00020 */ lwc1 $f0, 0x20($sp) /* CAF670 80240930 46002102 */ mul.s $f4, $f4, $f0 -/* CAF674 80240934 00000000 */ nop +/* CAF674 80240934 00000000 */ nop /* CAF678 80240938 C7A20018 */ lwc1 $f2, 0x18($sp) /* CAF67C 8024093C 26940004 */ addiu $s4, $s4, 4 /* CAF680 80240940 46001082 */ mul.s $f2, $f2, $f0 -/* CAF684 80240944 00000000 */ nop +/* CAF684 80240944 00000000 */ nop /* CAF688 80240948 26730004 */ addiu $s3, $s3, 4 /* CAF68C 8024094C 26310001 */ addiu $s1, $s1, 1 /* CAF690 80240950 2A220003 */ slti $v0, $s1, 3 diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240B38_CAF878.s b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240B38_CAF878.s index 79455e53ab..09457bb3b5 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240B38_CAF878.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240B38_CAF878.s @@ -36,16 +36,16 @@ glabel func_80240B38_CAF878 /* CAF8F0 80240BB0 10600007 */ beqz $v1, .L80240BD0 /* CAF8F4 80240BB4 240500FF */ addiu $a1, $zero, 0xff /* CAF8F8 80240BB8 08090312 */ j .L80240C48 -/* CAF8FC 80240BBC 00000000 */ nop +/* CAF8FC 80240BBC 00000000 */ nop .L80240BC0: /* CAF900 80240BC0 10620019 */ beq $v1, $v0, .L80240C28 -/* CAF904 80240BC4 00000000 */ nop +/* CAF904 80240BC4 00000000 */ nop /* CAF908 80240BC8 08090312 */ j .L80240C48 -/* CAF90C 80240BCC 00000000 */ nop +/* CAF90C 80240BCC 00000000 */ nop .L80240BD0: /* CAF910 80240BD0 8E220074 */ lw $v0, 0x74($s1) /* CAF914 80240BD4 14450004 */ bne $v0, $a1, .L80240BE8 -/* CAF918 80240BD8 00000000 */ nop +/* CAF918 80240BD8 00000000 */ nop /* CAF91C 80240BDC AE240070 */ sw $a0, 0x70($s1) /* CAF920 80240BE0 AE200078 */ sw $zero, 0x78($s1) /* CAF924 80240BE4 8E220074 */ lw $v0, 0x74($s1) @@ -57,7 +57,7 @@ glabel func_80240B38_CAF878 /* CAF938 80240BF8 50400013 */ beql $v0, $zero, .L80240C48 /* CAF93C 80240BFC AE250074 */ sw $a1, 0x74($s1) /* CAF940 80240C00 08090312 */ j .L80240C48 -/* CAF944 80240C04 00000000 */ nop +/* CAF944 80240C04 00000000 */ nop .L80240C08: /* CAF948 80240C08 8E220078 */ lw $v0, 0x78($s1) /* CAF94C 80240C0C 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240D08_CAFA48.s b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240D08_CAFA48.s index 5ad4eca0c7..8e676fbd21 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240D08_CAFA48.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240D08_CAFA48.s @@ -15,5 +15,5 @@ glabel func_80240D08_CAFA48 .L80240D30: /* CAFA70 80240D30 03E00008 */ jr $ra /* CAFA74 80240D34 24020002 */ addiu $v0, $zero, 2 -/* CAFA78 80240D38 00000000 */ nop -/* CAFA7C 80240D3C 00000000 */ nop +/* CAFA78 80240D38 00000000 */ nop +/* CAFA7C 80240D3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAFA80/func_80240D40_CAFA80.s b/asm/nonmatchings/world/area_flo/flo_08/CAFA80/func_80240D40_CAFA80.s index 0d16835395..02b3b8368b 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAFA80/func_80240D40_CAFA80.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAFA80/func_80240D40_CAFA80.s @@ -15,6 +15,6 @@ glabel func_80240D40_CAFA80 /* CAFAA8 80240D68 24020002 */ addiu $v0, $zero, 2 /* CAFAAC 80240D6C 03E00008 */ jr $ra /* CAFAB0 80240D70 27BD0020 */ addiu $sp, $sp, 0x20 -/* CAFAB4 80240D74 00000000 */ nop -/* CAFAB8 80240D78 00000000 */ nop -/* CAFABC 80240D7C 00000000 */ nop +/* CAFAB4 80240D74 00000000 */ nop +/* CAFAB8 80240D78 00000000 */ nop +/* CAFABC 80240D7C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80240D80_CAFAC0.s b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80240D80_CAFAC0.s index 990d1dfa72..7ab6c6272e 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80240D80_CAFAC0.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80240D80_CAFAC0.s @@ -61,20 +61,20 @@ glabel func_80240D80_CAFAC0 /* CAFBA0 80240E60 8E22001C */ lw $v0, 0x1c($s1) /* CAFBA4 80240E64 46001005 */ abs.s $f0, $f2 /* CAFBA8 80240E68 44822000 */ mtc1 $v0, $f4 -/* CAFBAC 80240E6C 00000000 */ nop +/* CAFBAC 80240E6C 00000000 */ nop /* CAFBB0 80240E70 46802120 */ cvt.s.w $f4, $f4 /* CAFBB4 80240E74 4600203C */ c.lt.s $f4, $f0 -/* CAFBB8 80240E78 00000000 */ nop +/* CAFBB8 80240E78 00000000 */ nop /* CAFBBC 80240E7C 4500000D */ bc1f .L80240EB4 -/* CAFBC0 80240E80 00000000 */ nop +/* CAFBC0 80240E80 00000000 */ nop /* CAFBC4 80240E84 44800000 */ mtc1 $zero, $f0 /* CAFBC8 80240E88 C614000C */ lwc1 $f20, 0xc($s0) /* CAFBCC 80240E8C 4600103C */ c.lt.s $f2, $f0 -/* CAFBD0 80240E90 00000000 */ nop +/* CAFBD0 80240E90 00000000 */ nop /* CAFBD4 80240E94 45000006 */ bc1f .L80240EB0 /* CAFBD8 80240E98 00021023 */ negu $v0, $v0 /* CAFBDC 80240E9C 44820000 */ mtc1 $v0, $f0 -/* CAFBE0 80240EA0 00000000 */ nop +/* CAFBE0 80240EA0 00000000 */ nop /* CAFBE4 80240EA4 46800020 */ cvt.s.w $f0, $f0 /* CAFBE8 80240EA8 080903AD */ j .L80240EB4 /* CAFBEC 80240EAC 4600A500 */ add.s $f20, $f20, $f0 @@ -108,7 +108,7 @@ glabel func_80240D80_CAFAC0 /* CAFC54 80240F14 4480E000 */ mtc1 $zero, $f28 /* CAFC58 80240F18 460010A1 */ cvt.d.s $f2, $f2 /* CAFC5C 80240F1C 463C1082 */ mul.d $f2, $f2, $f28 -/* CAFC60 80240F20 00000000 */ nop +/* CAFC60 80240F20 00000000 */ nop /* CAFC64 80240F24 46000506 */ mov.s $f20, $f0 /* CAFC68 80240F28 27A50020 */ addiu $a1, $sp, 0x20 /* CAFC6C 80240F2C 27A60024 */ addiu $a2, $sp, 0x24 @@ -119,20 +119,20 @@ glabel func_80240D80_CAFAC0 /* CAFC80 80240F40 860200A8 */ lh $v0, 0xa8($s0) /* CAFC84 80240F44 4480B000 */ mtc1 $zero, $f22 /* CAFC88 80240F48 44820000 */ mtc1 $v0, $f0 -/* CAFC8C 80240F4C 00000000 */ nop +/* CAFC8C 80240F4C 00000000 */ nop /* CAFC90 80240F50 46800020 */ cvt.s.w $f0, $f0 /* CAFC94 80240F54 E7A00018 */ swc1 $f0, 0x18($sp) /* CAFC98 80240F58 860200A6 */ lh $v0, 0xa6($s0) /* CAFC9C 80240F5C 4600B606 */ mov.s $f24, $f22 /* CAFCA0 80240F60 44820000 */ mtc1 $v0, $f0 -/* CAFCA4 80240F64 00000000 */ nop +/* CAFCA4 80240F64 00000000 */ nop /* CAFCA8 80240F68 46800020 */ cvt.s.w $f0, $f0 /* CAFCAC 80240F6C E7A0001C */ swc1 $f0, 0x1c($sp) /* CAFCB0 80240F70 8E040080 */ lw $a0, 0x80($s0) /* CAFCB4 80240F74 0C03773B */ jal func_800DDCEC /* CAFCB8 80240F78 4600C686 */ mov.s $f26, $f24 /* CAFCBC 80240F7C 104000E1 */ beqz $v0, .L80241304 -/* CAFCC0 80240F80 00000000 */ nop +/* CAFCC0 80240F80 00000000 */ nop /* CAFCC4 80240F84 C60C0038 */ lwc1 $f12, 0x38($s0) /* CAFCC8 80240F88 C60E0040 */ lwc1 $f14, 0x40($s0) /* CAFCCC 80240F8C 8FA60020 */ lw $a2, 0x20($sp) @@ -152,27 +152,27 @@ glabel func_80240D80_CAFAC0 /* CAFD04 80240FC4 C6020018 */ lwc1 $f2, 0x18($s0) /* CAFD08 80240FC8 460010A1 */ cvt.d.s $f2, $f2 /* CAFD0C 80240FCC 463C1082 */ mul.d $f2, $f2, $f28 -/* CAFD10 80240FD0 00000000 */ nop +/* CAFD10 80240FD0 00000000 */ nop /* CAFD14 80240FD4 E7A00014 */ swc1 $f0, 0x14($sp) /* CAFD18 80240FD8 462010A0 */ cvt.s.d $f2, $f2 /* CAFD1C 80240FDC E7A20010 */ swc1 $f2, 0x10($sp) /* CAFD20 80240FE0 860200A8 */ lh $v0, 0xa8($s0) /* CAFD24 80240FE4 27A5002C */ addiu $a1, $sp, 0x2c /* CAFD28 80240FE8 44820000 */ mtc1 $v0, $f0 -/* CAFD2C 80240FEC 00000000 */ nop +/* CAFD2C 80240FEC 00000000 */ nop /* CAFD30 80240FF0 46800020 */ cvt.s.w $f0, $f0 /* CAFD34 80240FF4 E7A00018 */ swc1 $f0, 0x18($sp) /* CAFD38 80240FF8 860200A6 */ lh $v0, 0xa6($s0) /* CAFD3C 80240FFC 27A60030 */ addiu $a2, $sp, 0x30 /* CAFD40 80241000 44820000 */ mtc1 $v0, $f0 -/* CAFD44 80241004 00000000 */ nop +/* CAFD44 80241004 00000000 */ nop /* CAFD48 80241008 46800020 */ cvt.s.w $f0, $f0 /* CAFD4C 8024100C E7A0001C */ swc1 $f0, 0x1c($sp) /* CAFD50 80241010 8E040080 */ lw $a0, 0x80($s0) /* CAFD54 80241014 0C03773B */ jal func_800DDCEC /* CAFD58 80241018 27A70034 */ addiu $a3, $sp, 0x34 /* CAFD5C 8024101C 10400007 */ beqz $v0, .L8024103C -/* CAFD60 80241020 00000000 */ nop +/* CAFD60 80241020 00000000 */ nop /* CAFD64 80241024 C60C0038 */ lwc1 $f12, 0x38($s0) /* CAFD68 80241028 C60E0040 */ lwc1 $f14, 0x40($s0) /* CAFD6C 8024102C 8FA6002C */ lw $a2, 0x2c($sp) @@ -191,27 +191,27 @@ glabel func_80240D80_CAFAC0 /* CAFD9C 8024105C C6020018 */ lwc1 $f2, 0x18($s0) /* CAFDA0 80241060 460010A1 */ cvt.d.s $f2, $f2 /* CAFDA4 80241064 463C1082 */ mul.d $f2, $f2, $f28 -/* CAFDA8 80241068 00000000 */ nop +/* CAFDA8 80241068 00000000 */ nop /* CAFDAC 8024106C E7A00014 */ swc1 $f0, 0x14($sp) /* CAFDB0 80241070 462010A0 */ cvt.s.d $f2, $f2 /* CAFDB4 80241074 E7A20010 */ swc1 $f2, 0x10($sp) /* CAFDB8 80241078 860200A8 */ lh $v0, 0xa8($s0) /* CAFDBC 8024107C 27A50038 */ addiu $a1, $sp, 0x38 /* CAFDC0 80241080 44820000 */ mtc1 $v0, $f0 -/* CAFDC4 80241084 00000000 */ nop +/* CAFDC4 80241084 00000000 */ nop /* CAFDC8 80241088 46800020 */ cvt.s.w $f0, $f0 /* CAFDCC 8024108C E7A00018 */ swc1 $f0, 0x18($sp) /* CAFDD0 80241090 860200A6 */ lh $v0, 0xa6($s0) /* CAFDD4 80241094 27A6003C */ addiu $a2, $sp, 0x3c /* CAFDD8 80241098 44820000 */ mtc1 $v0, $f0 -/* CAFDDC 8024109C 00000000 */ nop +/* CAFDDC 8024109C 00000000 */ nop /* CAFDE0 802410A0 46800020 */ cvt.s.w $f0, $f0 /* CAFDE4 802410A4 E7A0001C */ swc1 $f0, 0x1c($sp) /* CAFDE8 802410A8 8E040080 */ lw $a0, 0x80($s0) /* CAFDEC 802410AC 0C03773B */ jal func_800DDCEC /* CAFDF0 802410B0 27A70040 */ addiu $a3, $sp, 0x40 /* CAFDF4 802410B4 10400007 */ beqz $v0, .L802410D4 -/* CAFDF8 802410B8 00000000 */ nop +/* CAFDF8 802410B8 00000000 */ nop /* CAFDFC 802410BC C60C0038 */ lwc1 $f12, 0x38($s0) /* CAFE00 802410C0 C60E0040 */ lwc1 $f14, 0x40($s0) /* CAFE04 802410C4 8FA60038 */ lw $a2, 0x38($sp) @@ -231,20 +231,20 @@ glabel func_80240D80_CAFAC0 /* CAFE38 802410F8 44801000 */ mtc1 $zero, $f2 /* CAFE3C 802410FC 46000021 */ cvt.d.s $f0, $f0 /* CAFE40 80241100 46220082 */ mul.d $f2, $f0, $f2 -/* CAFE44 80241104 00000000 */ nop +/* CAFE44 80241104 00000000 */ nop /* CAFE48 80241108 4600B021 */ cvt.d.s $f0, $f22 /* CAFE4C 8024110C 4622003C */ c.lt.d $f0, $f2 -/* CAFE50 80241110 00000000 */ nop +/* CAFE50 80241110 00000000 */ nop /* CAFE54 80241114 45000012 */ bc1f .L80241160 -/* CAFE58 80241118 00000000 */ nop +/* CAFE58 80241118 00000000 */ nop /* CAFE5C 8024111C 4600C021 */ cvt.d.s $f0, $f24 /* CAFE60 80241120 4622003C */ c.lt.d $f0, $f2 -/* CAFE64 80241124 00000000 */ nop +/* CAFE64 80241124 00000000 */ nop /* CAFE68 80241128 4500000D */ bc1f .L80241160 -/* CAFE6C 8024112C 00000000 */ nop +/* CAFE6C 8024112C 00000000 */ nop /* CAFE70 80241130 4600D021 */ cvt.d.s $f0, $f26 /* CAFE74 80241134 4622003C */ c.lt.d $f0, $f2 -/* CAFE78 80241138 00000000 */ nop +/* CAFE78 80241138 00000000 */ nop /* CAFE7C 8024113C 45000008 */ bc1f .L80241160 /* CAFE80 80241140 02A0202D */ daddu $a0, $s5, $zero /* CAFE84 80241144 AFA00010 */ sw $zero, 0x10($sp) @@ -258,13 +258,13 @@ glabel func_80240D80_CAFAC0 /* CAFEA0 80241160 1660006A */ bnez $s3, .L8024130C /* CAFEA4 80241164 2402000A */ addiu $v0, $zero, 0xa /* CAFEA8 80241168 4616C03C */ c.lt.s $f24, $f22 -/* CAFEAC 8024116C 00000000 */ nop +/* CAFEAC 8024116C 00000000 */ nop /* CAFEB0 80241170 4500000C */ bc1f .L802411A4 -/* CAFEB4 80241174 00000000 */ nop +/* CAFEB4 80241174 00000000 */ nop /* CAFEB8 80241178 4618D03C */ c.lt.s $f26, $f24 -/* CAFEBC 8024117C 00000000 */ nop +/* CAFEBC 8024117C 00000000 */ nop /* CAFEC0 80241180 45000006 */ bc1f .L8024119C -/* CAFEC4 80241184 00000000 */ nop +/* CAFEC4 80241184 00000000 */ nop /* CAFEC8 80241188 C60C0038 */ lwc1 $f12, 0x38($s0) /* CAFECC 8024118C C60E0040 */ lwc1 $f14, 0x40($s0) /* CAFED0 80241190 8FA60020 */ lw $a2, 0x20($sp) @@ -272,14 +272,14 @@ glabel func_80240D80_CAFAC0 /* CAFED8 80241198 8FA70028 */ lw $a3, 0x28($sp) .L8024119C: /* CAFEDC 8024119C 4616C03C */ c.lt.s $f24, $f22 -/* CAFEE0 802411A0 00000000 */ nop +/* CAFEE0 802411A0 00000000 */ nop .L802411A4: /* CAFEE4 802411A4 4500000A */ bc1f .L802411D0 -/* CAFEE8 802411A8 00000000 */ nop +/* CAFEE8 802411A8 00000000 */ nop /* CAFEEC 802411AC 461AC03C */ c.lt.s $f24, $f26 -/* CAFEF0 802411B0 00000000 */ nop +/* CAFEF0 802411B0 00000000 */ nop /* CAFEF4 802411B4 45000006 */ bc1f .L802411D0 -/* CAFEF8 802411B8 00000000 */ nop +/* CAFEF8 802411B8 00000000 */ nop /* CAFEFC 802411BC C60C0038 */ lwc1 $f12, 0x38($s0) /* CAFF00 802411C0 C60E0040 */ lwc1 $f14, 0x40($s0) /* CAFF04 802411C4 8FA60020 */ lw $a2, 0x20($sp) @@ -287,13 +287,13 @@ glabel func_80240D80_CAFAC0 /* CAFF0C 802411CC 8FA70028 */ lw $a3, 0x28($sp) .L802411D0: /* CAFF10 802411D0 4618B03C */ c.lt.s $f22, $f24 -/* CAFF14 802411D4 00000000 */ nop +/* CAFF14 802411D4 00000000 */ nop /* CAFF18 802411D8 4500000A */ bc1f .L80241204 -/* CAFF1C 802411DC 00000000 */ nop +/* CAFF1C 802411DC 00000000 */ nop /* CAFF20 802411E0 4616D03C */ c.lt.s $f26, $f22 -/* CAFF24 802411E4 00000000 */ nop +/* CAFF24 802411E4 00000000 */ nop /* CAFF28 802411E8 45000006 */ bc1f .L80241204 -/* CAFF2C 802411EC 00000000 */ nop +/* CAFF2C 802411EC 00000000 */ nop /* CAFF30 802411F0 C60C0038 */ lwc1 $f12, 0x38($s0) /* CAFF34 802411F4 C60E0040 */ lwc1 $f14, 0x40($s0) /* CAFF38 802411F8 8FA6002C */ lw $a2, 0x2c($sp) @@ -301,13 +301,13 @@ glabel func_80240D80_CAFAC0 /* CAFF40 80241200 8FA70034 */ lw $a3, 0x34($sp) .L80241204: /* CAFF44 80241204 4618D03C */ c.lt.s $f26, $f24 -/* CAFF48 80241208 00000000 */ nop +/* CAFF48 80241208 00000000 */ nop /* CAFF4C 8024120C 4500000A */ bc1f .L80241238 -/* CAFF50 80241210 00000000 */ nop +/* CAFF50 80241210 00000000 */ nop /* CAFF54 80241214 461AB03C */ c.lt.s $f22, $f26 -/* CAFF58 80241218 00000000 */ nop +/* CAFF58 80241218 00000000 */ nop /* CAFF5C 8024121C 45000008 */ bc1f .L80241240 -/* CAFF60 80241220 00000000 */ nop +/* CAFF60 80241220 00000000 */ nop /* CAFF64 80241224 C60C0038 */ lwc1 $f12, 0x38($s0) /* CAFF68 80241228 C60E0040 */ lwc1 $f14, 0x40($s0) /* CAFF6C 8024122C 8FA6002C */ lw $a2, 0x2c($sp) @@ -315,23 +315,23 @@ glabel func_80240D80_CAFAC0 /* CAFF74 80241234 8FA70034 */ lw $a3, 0x34($sp) .L80241238: /* CAFF78 80241238 461AB03C */ c.lt.s $f22, $f26 -/* CAFF7C 8024123C 00000000 */ nop +/* CAFF7C 8024123C 00000000 */ nop .L80241240: /* CAFF80 80241240 45000005 */ bc1f .L80241258 -/* CAFF84 80241244 00000000 */ nop +/* CAFF84 80241244 00000000 */ nop /* CAFF88 80241248 4616C03C */ c.lt.s $f24, $f22 -/* CAFF8C 8024124C 00000000 */ nop +/* CAFF8C 8024124C 00000000 */ nop /* CAFF90 80241250 45010009 */ bc1t .L80241278 -/* CAFF94 80241254 00000000 */ nop +/* CAFF94 80241254 00000000 */ nop .L80241258: /* CAFF98 80241258 461AC03C */ c.lt.s $f24, $f26 -/* CAFF9C 8024125C 00000000 */ nop +/* CAFF9C 8024125C 00000000 */ nop /* CAFFA0 80241260 4500000C */ bc1f .L80241294 -/* CAFFA4 80241264 00000000 */ nop +/* CAFFA4 80241264 00000000 */ nop /* CAFFA8 80241268 4618B03C */ c.lt.s $f22, $f24 -/* CAFFAC 8024126C 00000000 */ nop +/* CAFFAC 8024126C 00000000 */ nop /* CAFFB0 80241270 45000008 */ bc1f .L80241294 -/* CAFFB4 80241274 00000000 */ nop +/* CAFFB4 80241274 00000000 */ nop .L80241278: /* CAFFB8 80241278 C60C0038 */ lwc1 $f12, 0x38($s0) /* CAFFBC 8024127C C60E0040 */ lwc1 $f14, 0x40($s0) @@ -339,7 +339,7 @@ glabel func_80240D80_CAFAC0 /* CAFFC4 80241284 8FA70040 */ lw $a3, 0x40($sp) .L80241288: /* CAFFC8 80241288 0C00A720 */ jal atan2 -/* CAFFCC 8024128C 00000000 */ nop +/* CAFFCC 8024128C 00000000 */ nop /* CAFFD0 80241290 46000506 */ mov.s $f20, $f0 .L80241294: /* CAFFD4 80241294 C60C000C */ lwc1 $f12, 0xc($s0) @@ -349,20 +349,20 @@ glabel func_80240D80_CAFAC0 /* CAFFE4 802412A4 8E22001C */ lw $v0, 0x1c($s1) /* CAFFE8 802412A8 46001005 */ abs.s $f0, $f2 /* CAFFEC 802412AC 44822000 */ mtc1 $v0, $f4 -/* CAFFF0 802412B0 00000000 */ nop +/* CAFFF0 802412B0 00000000 */ nop /* CAFFF4 802412B4 46802120 */ cvt.s.w $f4, $f4 /* CAFFF8 802412B8 4600203C */ c.lt.s $f4, $f0 -/* CAFFFC 802412BC 00000000 */ nop +/* CAFFFC 802412BC 00000000 */ nop /* CB0000 802412C0 4500000D */ bc1f .L802412F8 -/* CB0004 802412C4 00000000 */ nop +/* CB0004 802412C4 00000000 */ nop /* CB0008 802412C8 44800000 */ mtc1 $zero, $f0 /* CB000C 802412CC C614000C */ lwc1 $f20, 0xc($s0) /* CB0010 802412D0 4600103C */ c.lt.s $f2, $f0 -/* CB0014 802412D4 00000000 */ nop +/* CB0014 802412D4 00000000 */ nop /* CB0018 802412D8 45000006 */ bc1f .L802412F4 /* CB001C 802412DC 00021023 */ negu $v0, $v0 /* CB0020 802412E0 44820000 */ mtc1 $v0, $f0 -/* CB0024 802412E4 00000000 */ nop +/* CB0024 802412E4 00000000 */ nop /* CB0028 802412E8 46800020 */ cvt.s.w $f0, $f0 /* CB002C 802412EC 080904BE */ j .L802412F8 /* CB0030 802412F0 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241364_CB00A4.s b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241364_CB00A4.s index 6d795db7a2..91a579b8c1 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241364_CB00A4.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241364_CB00A4.s @@ -36,7 +36,7 @@ glabel func_80241364_CB00A4 /* CB0120 802413E0 2402000F */ addiu $v0, $zero, 0xf /* CB0124 802413E4 AFA2001C */ sw $v0, 0x1c($sp) /* CB0128 802413E8 44833000 */ mtc1 $v1, $f6 -/* CB012C 802413EC 00000000 */ nop +/* CB012C 802413EC 00000000 */ nop /* CB0130 802413F0 468031A0 */ cvt.s.w $f6, $f6 /* CB0134 802413F4 44073000 */ mfc1 $a3, $f6 /* CB0138 802413F8 27A20028 */ addiu $v0, $sp, 0x28 @@ -57,14 +57,14 @@ glabel func_80241364_CB00A4 /* CB0170 80241430 8E030028 */ lw $v1, 0x28($s0) /* CB0174 80241434 8C420020 */ lw $v0, 0x20($v0) /* CB0178 80241438 10620014 */ beq $v1, $v0, .L8024148C -/* CB017C 8024143C 00000000 */ nop +/* CB017C 8024143C 00000000 */ nop /* CB0180 80241440 C6000018 */ lwc1 $f0, 0x18($s0) /* CB0184 80241444 3C014010 */ lui $at, 0x4010 /* CB0188 80241448 44811800 */ mtc1 $at, $f3 /* CB018C 8024144C 44801000 */ mtc1 $zero, $f2 /* CB0190 80241450 46000021 */ cvt.d.s $f0, $f0 /* CB0194 80241454 4622003C */ c.lt.d $f0, $f2 -/* CB0198 80241458 00000000 */ nop +/* CB0198 80241458 00000000 */ nop /* CB019C 8024145C 45000003 */ bc1f .L8024146C /* CB01A0 80241460 0000282D */ daddu $a1, $zero, $zero /* CB01A4 80241464 0809051D */ j .L80241474 @@ -74,7 +74,7 @@ glabel func_80241364_CB00A4 /* CB01B0 80241470 24050001 */ addiu $a1, $zero, 1 .L80241474: /* CB01B4 80241474 0C00F598 */ jal func_8003D660 -/* CB01B8 80241478 00000000 */ nop +/* CB01B8 80241478 00000000 */ nop /* CB01BC 8024147C 8E050018 */ lw $a1, 0x18($s0) /* CB01C0 80241480 8E06000C */ lw $a2, 0xc($s0) /* CB01C4 80241484 0C00EA95 */ jal npc_move_heading diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s index a9f3de1f3f..8f7febb43e 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s @@ -85,60 +85,71 @@ glabel func_8024150C_CB024C /* CB037C 8024163C 2C620064 */ sltiu $v0, $v1, 0x64 /* CB0380 80241640 10400036 */ beqz $v0, .L8024171C /* CB0384 80241644 00031080 */ sll $v0, $v1, 2 -/* CB0388 80241648 3C018024 */ lui $at, %hi(D_80246130) +/* CB0388 80241648 3C018024 */ lui $at, %hi(jtbl_80246130_CB4E70) /* CB038C 8024164C 00220821 */ addu $at, $at, $v0 -/* CB0390 80241650 8C226130 */ lw $v0, %lo(D_80246130)($at) +/* CB0390 80241650 8C226130 */ lw $v0, %lo(jtbl_80246130_CB4E70)($at) /* CB0394 80241654 00400008 */ jr $v0 /* CB0398 80241658 00000000 */ nop +glabel L8024165C_CB039C /* CB039C 8024165C 0280202D */ daddu $a0, $s4, $zero /* CB03A0 80241660 0240282D */ daddu $a1, $s2, $zero /* CB03A4 80241664 0C012568 */ jal func_800495A0 /* CB03A8 80241668 0260302D */ daddu $a2, $s3, $zero +glabel L8024166C_CB03AC /* CB03AC 8024166C 0280202D */ daddu $a0, $s4, $zero /* CB03B0 80241670 0240282D */ daddu $a1, $s2, $zero /* CB03B4 80241674 0C0125AE */ jal func_800496B8 /* CB03B8 80241678 0260302D */ daddu $a2, $s3, $zero /* CB03BC 8024167C 080905C7 */ j .L8024171C /* CB03C0 80241680 00000000 */ nop +glabel L80241684_CB03C4 /* CB03C4 80241684 0280202D */ daddu $a0, $s4, $zero /* CB03C8 80241688 0240282D */ daddu $a1, $s2, $zero /* CB03CC 8024168C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* CB03D0 80241690 0260302D */ daddu $a2, $s3, $zero +glabel L80241694_CB03D4 /* CB03D4 80241694 0280202D */ daddu $a0, $s4, $zero /* CB03D8 80241698 0240282D */ daddu $a1, $s2, $zero /* CB03DC 8024169C 0C012701 */ jal func_80049C04 /* CB03E0 802416A0 0260302D */ daddu $a2, $s3, $zero /* CB03E4 802416A4 080905C7 */ j .L8024171C /* CB03E8 802416A8 00000000 */ nop +glabel L802416AC_CB03EC /* CB03EC 802416AC 0280202D */ daddu $a0, $s4, $zero /* CB03F0 802416B0 0240282D */ daddu $a1, $s2, $zero /* CB03F4 802416B4 0C01278F */ jal func_80049E3C /* CB03F8 802416B8 0260302D */ daddu $a2, $s3, $zero +glabel L802416BC_CB03FC /* CB03FC 802416BC 0280202D */ daddu $a0, $s4, $zero /* CB0400 802416C0 0240282D */ daddu $a1, $s2, $zero /* CB0404 802416C4 0C0127B3 */ jal func_80049ECC /* CB0408 802416C8 0260302D */ daddu $a2, $s3, $zero /* CB040C 802416CC 080905C7 */ j .L8024171C /* CB0410 802416D0 00000000 */ nop +glabel L802416D4_CB0414 /* CB0414 802416D4 0280202D */ daddu $a0, $s4, $zero /* CB0418 802416D8 0240282D */ daddu $a1, $s2, $zero /* CB041C 802416DC 0C090360 */ jal func_80240D80_CAFAC0 /* CB0420 802416E0 0260302D */ daddu $a2, $s3, $zero +glabel L802416E4_CB0424 /* CB0424 802416E4 0280202D */ daddu $a0, $s4, $zero /* CB0428 802416E8 0240282D */ daddu $a1, $s2, $zero /* CB042C 802416EC 0C0904D9 */ jal func_80241364_CB00A4 /* CB0430 802416F0 0260302D */ daddu $a2, $s3, $zero /* CB0434 802416F4 080905C7 */ j .L8024171C /* CB0438 802416F8 00000000 */ nop +glabel L802416FC_CB043C /* CB043C 802416FC 0280202D */ daddu $a0, $s4, $zero /* CB0440 80241700 0240282D */ daddu $a1, $s2, $zero /* CB0444 80241704 0C090532 */ jal func_802414C8_CB0208 /* CB0448 80241708 0260302D */ daddu $a2, $s3, $zero /* CB044C 8024170C 080905C7 */ j .L8024171C /* CB0450 80241710 00000000 */ nop +glabel L80241714_CB0454 /* CB0454 80241714 0C0129CF */ jal func_8004A73C /* CB0458 80241718 0280202D */ daddu $a0, $s4, $zero .L8024171C: +glabel L8024171C_CB045C /* CB045C 8024171C 8FBF0048 */ lw $ra, 0x48($sp) /* CB0460 80241720 8FB50044 */ lw $s5, 0x44($sp) /* CB0464 80241724 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419FC_CB073C.s b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419FC_CB073C.s index 3f5cf9020e..84b6b48860 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419FC_CB073C.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419FC_CB073C.s @@ -28,7 +28,7 @@ glabel func_802419FC_CB073C /* CB0790 80241A50 00220821 */ addu $at, $at, $v0 /* CB0794 80241A54 AC2062C0 */ sw $zero, %lo(D_802462C0)($at) /* CB0798 80241A58 080906A2 */ j .L80241A88 -/* CB079C 80241A5C 00000000 */ nop +/* CB079C 80241A5C 00000000 */ nop .L80241A60: /* CB07A0 80241A60 3C038024 */ lui $v1, %hi(D_802462C0) /* CB07A4 80241A64 246362C0 */ addiu $v1, $v1, %lo(D_802462C0) diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241A98_CB07D8.s b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241A98_CB07D8.s index 0b0ce63e54..f5e49334e6 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241A98_CB07D8.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241A98_CB07D8.s @@ -32,15 +32,15 @@ glabel func_80241A98_CB07D8 /* CB0844 80241B04 0040802D */ daddu $s0, $v0, $zero /* CB0848 80241B08 0040182D */ daddu $v1, $v0, $zero /* CB084C 80241B0C 44920000 */ mtc1 $s2, $f0 -/* CB0850 80241B10 00000000 */ nop +/* CB0850 80241B10 00000000 */ nop /* CB0854 80241B14 46800020 */ cvt.s.w $f0, $f0 /* CB0858 80241B18 E4600008 */ swc1 $f0, 8($v1) /* CB085C 80241B1C 44910000 */ mtc1 $s1, $f0 -/* CB0860 80241B20 00000000 */ nop +/* CB0860 80241B20 00000000 */ nop /* CB0864 80241B24 46800020 */ cvt.s.w $f0, $f0 /* CB0868 80241B28 E460000C */ swc1 $f0, 0xc($v1) /* CB086C 80241B2C 44900000 */ mtc1 $s0, $f0 -/* CB0870 80241B30 00000000 */ nop +/* CB0870 80241B30 00000000 */ nop /* CB0874 80241B34 46800020 */ cvt.s.w $f0, $f0 /* CB0878 80241B38 E4600010 */ swc1 $f0, 0x10($v1) /* CB087C 80241B3C 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_08/CB0B80/func_80241E40_CB0B80.s b/asm/nonmatchings/world/area_flo/flo_08/CB0B80/func_80241E40_CB0B80.s index 220ed73b7f..7bedbffd27 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CB0B80/func_80241E40_CB0B80.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CB0B80/func_80241E40_CB0B80.s @@ -6,33 +6,33 @@ glabel func_80241E40_CB0B80 /* CB0B84 80241E44 8C830090 */ lw $v1, 0x90($a0) /* CB0B88 80241E48 00431023 */ subu $v0, $v0, $v1 /* CB0B8C 80241E4C 44821000 */ mtc1 $v0, $f2 -/* CB0B90 80241E50 00000000 */ nop +/* CB0B90 80241E50 00000000 */ nop /* CB0B94 80241E54 468010A0 */ cvt.s.w $f2, $f2 /* CB0B98 80241E58 8C820088 */ lw $v0, 0x88($a0) /* CB0B9C 80241E5C 8C830094 */ lw $v1, 0x94($a0) /* CB0BA0 80241E60 46021082 */ mul.s $f2, $f2, $f2 -/* CB0BA4 80241E64 00000000 */ nop +/* CB0BA4 80241E64 00000000 */ nop /* CB0BA8 80241E68 00431023 */ subu $v0, $v0, $v1 /* CB0BAC 80241E6C 44822000 */ mtc1 $v0, $f4 -/* CB0BB0 80241E70 00000000 */ nop +/* CB0BB0 80241E70 00000000 */ nop /* CB0BB4 80241E74 46802120 */ cvt.s.w $f4, $f4 /* CB0BB8 80241E78 8C82008C */ lw $v0, 0x8c($a0) /* CB0BBC 80241E7C 46042102 */ mul.s $f4, $f4, $f4 -/* CB0BC0 80241E80 00000000 */ nop +/* CB0BC0 80241E80 00000000 */ nop /* CB0BC4 80241E84 8C830098 */ lw $v1, 0x98($a0) /* CB0BC8 80241E88 00431023 */ subu $v0, $v0, $v1 /* CB0BCC 80241E8C 44820000 */ mtc1 $v0, $f0 -/* CB0BD0 80241E90 00000000 */ nop +/* CB0BD0 80241E90 00000000 */ nop /* CB0BD4 80241E94 46800020 */ cvt.s.w $f0, $f0 /* CB0BD8 80241E98 46000002 */ mul.s $f0, $f0, $f0 -/* CB0BDC 80241E9C 00000000 */ nop +/* CB0BDC 80241E9C 00000000 */ nop /* CB0BE0 80241EA0 46041080 */ add.s $f2, $f2, $f4 /* CB0BE4 80241EA4 46001080 */ add.s $f2, $f2, $f0 /* CB0BE8 80241EA8 3C014561 */ lui $at, 0x4561 /* CB0BEC 80241EAC 44810000 */ mtc1 $at, $f0 -/* CB0BF0 80241EB0 00000000 */ nop +/* CB0BF0 80241EB0 00000000 */ nop /* CB0BF4 80241EB4 4600103C */ c.lt.s $f2, $f0 -/* CB0BF8 80241EB8 00000000 */ nop +/* CB0BF8 80241EB8 00000000 */ nop /* CB0BFC 80241EBC 45010002 */ bc1t .L80241EC8 /* CB0C00 80241EC0 24020001 */ addiu $v0, $zero, 1 /* CB0C04 80241EC4 0000102D */ daddu $v0, $zero, $zero @@ -40,6 +40,6 @@ glabel func_80241E40_CB0B80 /* CB0C08 80241EC8 AC820084 */ sw $v0, 0x84($a0) /* CB0C0C 80241ECC 03E00008 */ jr $ra /* CB0C10 80241ED0 24020002 */ addiu $v0, $zero, 2 -/* CB0C14 80241ED4 00000000 */ nop -/* CB0C18 80241ED8 00000000 */ nop -/* CB0C1C 80241EDC 00000000 */ nop +/* CB0C14 80241ED4 00000000 */ nop +/* CB0C18 80241ED8 00000000 */ nop +/* CB0C1C 80241EDC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5000/func_80240000_CB5000.s b/asm/nonmatchings/world/area_flo/flo_09/CB5000/func_80240000_CB5000.s index bb08aa17d0..4b7b3ae4a8 100644 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5000/func_80240000_CB5000.s +++ b/asm/nonmatchings/world/area_flo/flo_09/CB5000/func_80240000_CB5000.s @@ -15,6 +15,6 @@ glabel func_80240000_CB5000 /* CB5028 80240028 24020002 */ addiu $v0, $zero, 2 /* CB502C 8024002C 03E00008 */ jr $ra /* CB5030 80240030 27BD0020 */ addiu $sp, $sp, 0x20 -/* CB5034 80240034 00000000 */ nop -/* CB5038 80240038 00000000 */ nop -/* CB503C 8024003C 00000000 */ nop +/* CB5034 80240034 00000000 */ nop +/* CB5038 80240038 00000000 */ nop +/* CB503C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5040/func_80240040_CB5040.s b/asm/nonmatchings/world/area_flo/flo_09/CB5040/func_80240040_CB5040.s index 2c6e87fbd1..4dc336a0aa 100644 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5040/func_80240040_CB5040.s +++ b/asm/nonmatchings/world/area_flo/flo_09/CB5040/func_80240040_CB5040.s @@ -6,33 +6,33 @@ glabel func_80240040_CB5040 /* CB5044 80240044 8C830090 */ lw $v1, 0x90($a0) /* CB5048 80240048 00431023 */ subu $v0, $v0, $v1 /* CB504C 8024004C 44821000 */ mtc1 $v0, $f2 -/* CB5050 80240050 00000000 */ nop +/* CB5050 80240050 00000000 */ nop /* CB5054 80240054 468010A0 */ cvt.s.w $f2, $f2 /* CB5058 80240058 8C820088 */ lw $v0, 0x88($a0) /* CB505C 8024005C 8C830094 */ lw $v1, 0x94($a0) /* CB5060 80240060 46021082 */ mul.s $f2, $f2, $f2 -/* CB5064 80240064 00000000 */ nop +/* CB5064 80240064 00000000 */ nop /* CB5068 80240068 00431023 */ subu $v0, $v0, $v1 /* CB506C 8024006C 44822000 */ mtc1 $v0, $f4 -/* CB5070 80240070 00000000 */ nop +/* CB5070 80240070 00000000 */ nop /* CB5074 80240074 46802120 */ cvt.s.w $f4, $f4 /* CB5078 80240078 8C82008C */ lw $v0, 0x8c($a0) /* CB507C 8024007C 46042102 */ mul.s $f4, $f4, $f4 -/* CB5080 80240080 00000000 */ nop +/* CB5080 80240080 00000000 */ nop /* CB5084 80240084 8C830098 */ lw $v1, 0x98($a0) /* CB5088 80240088 00431023 */ subu $v0, $v0, $v1 /* CB508C 8024008C 44820000 */ mtc1 $v0, $f0 -/* CB5090 80240090 00000000 */ nop +/* CB5090 80240090 00000000 */ nop /* CB5094 80240094 46800020 */ cvt.s.w $f0, $f0 /* CB5098 80240098 46000002 */ mul.s $f0, $f0, $f0 -/* CB509C 8024009C 00000000 */ nop +/* CB509C 8024009C 00000000 */ nop /* CB50A0 802400A0 46041080 */ add.s $f2, $f2, $f4 /* CB50A4 802400A4 46001080 */ add.s $f2, $f2, $f0 /* CB50A8 802400A8 3C014561 */ lui $at, 0x4561 /* CB50AC 802400AC 44810000 */ mtc1 $at, $f0 -/* CB50B0 802400B0 00000000 */ nop +/* CB50B0 802400B0 00000000 */ nop /* CB50B4 802400B4 4600103C */ c.lt.s $f2, $f0 -/* CB50B8 802400B8 00000000 */ nop +/* CB50B8 802400B8 00000000 */ nop /* CB50BC 802400BC 45010002 */ bc1t .L802400C8 /* CB50C0 802400C0 24020001 */ addiu $v0, $zero, 1 /* CB50C4 802400C4 0000102D */ daddu $v0, $zero, $zero @@ -40,6 +40,6 @@ glabel func_80240040_CB5040 /* CB50C8 802400C8 AC820084 */ sw $v0, 0x84($a0) /* CB50CC 802400CC 03E00008 */ jr $ra /* CB50D0 802400D0 24020002 */ addiu $v0, $zero, 2 -/* CB50D4 802400D4 00000000 */ nop -/* CB50D8 802400D8 00000000 */ nop -/* CB50DC 802400DC 00000000 */ nop +/* CB50D4 802400D4 00000000 */ nop +/* CB50D8 802400D8 00000000 */ nop +/* CB50DC 802400DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240320_CB5320.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240320_CB5320.s index 755714ecf8..2d825baa35 100644 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240320_CB5320.s +++ b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240320_CB5320.s @@ -47,7 +47,7 @@ glabel func_80240320_CB5320 /* CB53C8 802403C8 0C0123F5 */ jal is_point_within_region /* CB53CC 802403CC 8E070038 */ lw $a3, 0x38($s0) /* CB53D0 802403D0 1040000E */ beqz $v0, .L8024040C -/* CB53D4 802403D4 00000000 */ nop +/* CB53D4 802403D4 00000000 */ nop /* CB53D8 802403D8 8E2200D0 */ lw $v0, 0xd0($s1) /* CB53DC 802403DC C60C0038 */ lwc1 $f12, 0x38($s0) /* CB53E0 802403E0 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240320_CB5320 /* CB53F4 802403F4 468031A0 */ cvt.s.w $f6, $f6 /* CB53F8 802403F8 44073000 */ mfc1 $a3, $f6 /* CB53FC 802403FC 0C00A720 */ jal atan2 -/* CB5400 80240400 00000000 */ nop +/* CB5400 80240400 00000000 */ nop /* CB5404 80240404 0809010F */ j .L8024043C /* CB5408 80240408 E600000C */ swc1 $f0, 0xc($s0) .L8024040C: @@ -66,7 +66,7 @@ glabel func_80240320_CB5320 /* CB5410 80240410 2404003C */ addiu $a0, $zero, 0x3c /* CB5414 80240414 C60C000C */ lwc1 $f12, 0xc($s0) /* CB5418 80240418 44820000 */ mtc1 $v0, $f0 -/* CB541C 8024041C 00000000 */ nop +/* CB541C 8024041C 00000000 */ nop /* CB5420 80240420 46800020 */ cvt.s.w $f0, $f0 /* CB5424 80240424 46006300 */ add.s $f12, $f12, $f0 /* CB5428 80240428 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240320_CB5320 /* CB544C 8024044C 8E2200D0 */ lw $v0, 0xd0($s1) /* CB5450 80240450 8C420014 */ lw $v0, 0x14($v0) /* CB5454 80240454 04410004 */ bgez $v0, .L80240468 -/* CB5458 80240458 00000000 */ nop +/* CB5458 80240458 00000000 */ nop /* CB545C 8024045C C6400000 */ lwc1 $f0, ($s2) /* CB5460 80240460 08090122 */ j .L80240488 /* CB5464 80240464 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240320_CB5320 /* CB5468 80240468 3C018024 */ lui $at, %hi(D_802441A0) /* CB546C 8024046C D42241A0 */ ldc1 $f2, %lo(D_802441A0)($at) /* CB5470 80240470 44820000 */ mtc1 $v0, $f0 -/* CB5474 80240474 00000000 */ nop +/* CB5474 80240474 00000000 */ nop /* CB5478 80240478 46800021 */ cvt.d.w $f0, $f0 /* CB547C 8024047C 46220003 */ div.d $f0, $f0, $f2 /* CB5480 80240480 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240320_CB5320 /* CB5494 80240494 44801000 */ mtc1 $zero, $f2 /* CB5498 80240498 46000021 */ cvt.d.s $f0, $f0 /* CB549C 8024049C 46220002 */ mul.d $f0, $f0, $f2 -/* CB54A0 802404A0 00000000 */ nop +/* CB54A0 802404A0 00000000 */ nop /* CB54A4 802404A4 24020001 */ addiu $v0, $zero, 1 /* CB54A8 802404A8 4620018D */ trunc.w.d $f6, $f0 /* CB54AC 802404AC E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_802404D0_CB54D0.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_802404D0_CB54D0.s index e082458ba2..69cbbd6d12 100644 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_802404D0_CB54D0.s +++ b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_802404D0_CB54D0.s @@ -34,7 +34,7 @@ glabel func_802404D0_CB54D0 /* CB5544 80240544 44803000 */ mtc1 $zero, $f6 /* CB5548 80240548 46000021 */ cvt.d.s $f0, $f0 /* CB554C 8024054C 46260002 */ mul.d $f0, $f0, $f6 -/* CB5550 80240550 00000000 */ nop +/* CB5550 80240550 00000000 */ nop /* CB5554 80240554 24020001 */ addiu $v0, $zero, 1 /* CB5558 80240558 8E24006C */ lw $a0, 0x6c($s1) /* CB555C 8024055C 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_802404D0_CB54D0 /* CB55B8 802405B8 C600003C */ lwc1 $f0, 0x3c($s0) /* CB55BC 802405BC 4600C001 */ sub.s $f0, $f24, $f0 /* CB55C0 802405C0 4600B03C */ c.lt.s $f22, $f0 -/* CB55C4 802405C4 00000000 */ nop +/* CB55C4 802405C4 00000000 */ nop /* CB55C8 802405C8 4500001B */ bc1f .L80240638 /* CB55CC 802405CC 34820010 */ ori $v0, $a0, 0x10 /* CB55D0 802405D0 0809018E */ j .L80240638 @@ -87,9 +87,9 @@ glabel func_802404D0_CB54D0 /* CB5614 80240614 C7A00034 */ lwc1 $f0, 0x34($sp) /* CB5618 80240618 4600D001 */ sub.s $f0, $f26, $f0 /* CB561C 8024061C 4600B03C */ c.lt.s $f22, $f0 -/* CB5620 80240620 00000000 */ nop +/* CB5620 80240620 00000000 */ nop /* CB5624 80240624 45000004 */ bc1f .L80240638 -/* CB5628 80240628 00000000 */ nop +/* CB5628 80240628 00000000 */ nop /* CB562C 8024062C 8E22006C */ lw $v0, 0x6c($s1) /* CB5630 80240630 34420010 */ ori $v0, $v0, 0x10 /* CB5634 80240634 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_802404D0_CB54D0 /* CB563C 8024063C 24030011 */ addiu $v1, $zero, 0x11 /* CB5640 80240640 30420011 */ andi $v0, $v0, 0x11 /* CB5644 80240644 14430039 */ bne $v0, $v1, .L8024072C -/* CB5648 80240648 00000000 */ nop +/* CB5648 80240648 00000000 */ nop /* CB564C 8024064C 8E020000 */ lw $v0, ($s0) /* CB5650 80240650 30420008 */ andi $v0, $v0, 8 /* CB5654 80240654 1040000A */ beqz $v0, .L80240680 @@ -108,7 +108,7 @@ glabel func_802404D0_CB54D0 /* CB5664 80240664 D42041A8 */ ldc1 $f0, %lo(D_802441A8)($at) /* CB5668 80240668 460010A1 */ cvt.d.s $f2, $f2 /* CB566C 8024066C 46201082 */ mul.d $f2, $f2, $f0 -/* CB5670 80240670 00000000 */ nop +/* CB5670 80240670 00000000 */ nop /* CB5674 80240674 4600A021 */ cvt.d.s $f0, $f20 /* CB5678 80240678 080901B9 */ j .L802406E4 /* CB567C 8024067C 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_802404D0_CB54D0 /* CB56CC 802406CC D42041B0 */ ldc1 $f0, %lo(D_802441B0)($at) /* CB56D0 802406D0 460010A1 */ cvt.d.s $f2, $f2 /* CB56D4 802406D4 46201082 */ mul.d $f2, $f2, $f0 -/* CB56D8 802406D8 00000000 */ nop +/* CB56D8 802406D8 00000000 */ nop /* CB56DC 802406DC 4600A021 */ cvt.d.s $f0, $f20 /* CB56E0 802406E0 46220000 */ add.d $f0, $f0, $f2 .L802406E4: @@ -149,7 +149,7 @@ glabel func_802404D0_CB54D0 /* CB5700 80240700 46000005 */ abs.s $f0, $f0 /* CB5704 80240704 46000021 */ cvt.d.s $f0, $f0 /* CB5708 80240708 4622003C */ c.lt.d $f0, $f2 -/* CB570C 8024070C 00000000 */ nop +/* CB570C 8024070C 00000000 */ nop /* CB5710 80240710 45000036 */ bc1f .L802407EC /* CB5714 80240714 2403FFEF */ addiu $v1, $zero, -0x11 /* CB5718 80240718 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_802404D0_CB54D0 .L8024072C: /* CB572C 8024072C 8E220070 */ lw $v0, 0x70($s1) /* CB5730 80240730 1840002E */ blez $v0, .L802407EC -/* CB5734 80240734 00000000 */ nop +/* CB5734 80240734 00000000 */ nop /* CB5738 80240738 C62C0074 */ lwc1 $f12, 0x74($s1) /* CB573C 8024073C 0C00A8BB */ jal sin_deg /* CB5740 80240740 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_802404D0_CB54D0 /* CB5798 80240798 27A70030 */ addiu $a3, $sp, 0x30 .L8024079C: /* CB579C 8024079C 10400007 */ beqz $v0, .L802407BC -/* CB57A0 802407A0 00000000 */ nop +/* CB57A0 802407A0 00000000 */ nop /* CB57A4 802407A4 4616A082 */ mul.s $f2, $f20, $f22 -/* CB57A8 802407A8 00000000 */ nop +/* CB57A8 802407A8 00000000 */ nop /* CB57AC 802407AC C7A0002C */ lwc1 $f0, 0x2c($sp) /* CB57B0 802407B0 461A0000 */ add.s $f0, $f0, $f26 /* CB57B4 802407B4 080901F2 */ j .L802407C8 /* CB57B8 802407B8 46020000 */ add.s $f0, $f0, $f2 .L802407BC: /* CB57BC 802407BC 4616A002 */ mul.s $f0, $f20, $f22 -/* CB57C0 802407C0 00000000 */ nop +/* CB57C0 802407C0 00000000 */ nop /* CB57C4 802407C4 4600C000 */ add.s $f0, $f24, $f0 .L802407C8: /* CB57C8 802407C8 E600003C */ swc1 $f0, 0x3c($s0) /* CB57CC 802407CC 8E220074 */ lw $v0, 0x74($s1) /* CB57D0 802407D0 2442000A */ addiu $v0, $v0, 0xa /* CB57D4 802407D4 44826000 */ mtc1 $v0, $f12 -/* CB57D8 802407D8 00000000 */ nop +/* CB57D8 802407D8 00000000 */ nop /* CB57DC 802407DC 0C00A6C9 */ jal clamp_angle /* CB57E0 802407E0 46806320 */ cvt.s.w $f12, $f12 /* CB57E4 802407E4 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_802404D0_CB54D0 /* CB57F4 802407F4 2442FFFF */ addiu $v0, $v0, -1 /* CB57F8 802407F8 8E430014 */ lw $v1, 0x14($s2) /* CB57FC 802407FC 04600048 */ bltz $v1, .L80240920 -/* CB5800 80240800 00000000 */ nop +/* CB5800 80240800 00000000 */ nop /* CB5804 80240804 8E620074 */ lw $v0, 0x74($s3) /* CB5808 80240808 1C400042 */ bgtz $v0, .L80240914 /* CB580C 8024080C 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_802404D0_CB54D0 /* CB5814 80240814 860200A8 */ lh $v0, 0xa8($s0) /* CB5818 80240818 C602003C */ lwc1 $f2, 0x3c($s0) /* CB581C 8024081C 44820000 */ mtc1 $v0, $f0 -/* CB5820 80240820 00000000 */ nop +/* CB5820 80240820 00000000 */ nop /* CB5824 80240824 46800020 */ cvt.s.w $f0, $f0 /* CB5828 80240828 46001080 */ add.s $f2, $f2, $f0 /* CB582C 8024082C 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_802404D0_CB54D0 /* CB5848 80240848 C440002C */ lwc1 $f0, 0x2c($v0) /* CB584C 8024084C 46000021 */ cvt.d.s $f0, $f0 /* CB5850 80240850 4622003C */ c.lt.d $f0, $f2 -/* CB5854 80240854 00000000 */ nop +/* CB5854 80240854 00000000 */ nop /* CB5858 80240858 4500002C */ bc1f .L8024090C /* CB585C 8024085C 02A0202D */ daddu $a0, $s5, $zero /* CB5860 80240860 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_802404D0_CB54D0 /* CB589C 8024089C 3C01C1A0 */ lui $at, 0xc1a0 /* CB58A0 802408A0 44812000 */ mtc1 $at, $f4 /* CB58A4 802408A4 44834000 */ mtc1 $v1, $f8 -/* CB58A8 802408A8 00000000 */ nop +/* CB58A8 802408A8 00000000 */ nop /* CB58AC 802408AC 46804220 */ cvt.s.w $f8, $f8 /* CB58B0 802408B0 44074000 */ mfc1 $a3, $f8 /* CB58B4 802408B4 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_802404D0_CB54D0 /* CB5968 80240968 0C0123F5 */ jal is_point_within_region /* CB596C 8024096C 8E070038 */ lw $a3, 0x38($s0) /* CB5970 80240970 1040001A */ beqz $v0, .L802409DC -/* CB5974 80240974 00000000 */ nop +/* CB5974 80240974 00000000 */ nop /* CB5978 80240978 8E060038 */ lw $a2, 0x38($s0) /* CB597C 8024097C 8E2200D0 */ lw $v0, 0xd0($s1) /* CB5980 80240980 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_802404D0_CB54D0 /* CB5994 80240994 468073A0 */ cvt.s.w $f14, $f14 /* CB5998 80240998 C6020018 */ lwc1 $f2, 0x18($s0) /* CB599C 8024099C 4600103C */ c.lt.s $f2, $f0 -/* CB59A0 802409A0 00000000 */ nop +/* CB59A0 802409A0 00000000 */ nop /* CB59A4 802409A4 4500000D */ bc1f .L802409DC /* CB59A8 802409A8 E7A00034 */ swc1 $f0, 0x34($sp) /* CB59AC 802409AC C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_802404D0_CB54D0 /* CB59E8 802409E8 00621825 */ or $v1, $v1, $v0 /* CB59EC 802409EC 00741825 */ or $v1, $v1, $s4 /* CB59F0 802409F0 10600008 */ beqz $v1, .L80240A14 -/* CB59F4 802409F4 00000000 */ nop +/* CB59F4 802409F4 00000000 */ nop /* CB59F8 802409F8 8602008C */ lh $v0, 0x8c($s0) /* CB59FC 802409FC 14400031 */ bnez $v0, .L80240AC4 -/* CB5A00 80240A00 00000000 */ nop +/* CB5A00 80240A00 00000000 */ nop /* CB5A04 80240A04 8E050018 */ lw $a1, 0x18($s0) /* CB5A08 80240A08 8E06000C */ lw $a2, 0xc($s0) /* CB5A0C 80240A0C 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_802404D0_CB54D0 /* CB5A20 80240A20 44801000 */ mtc1 $zero, $f2 /* CB5A24 80240A24 46000021 */ cvt.d.s $f0, $f0 /* CB5A28 80240A28 46220002 */ mul.d $f0, $f0, $f2 -/* CB5A2C 80240A2C 00000000 */ nop +/* CB5A2C 80240A2C 00000000 */ nop /* CB5A30 80240A30 4620020D */ trunc.w.d $f8, $f0 /* CB5A34 80240A34 E628007C */ swc1 $f8, 0x7c($s1) /* CB5A38 80240A38 8E420004 */ lw $v0, 4($s2) /* CB5A3C 80240A3C 18400021 */ blez $v0, .L80240AC4 -/* CB5A40 80240A40 00000000 */ nop +/* CB5A40 80240A40 00000000 */ nop /* CB5A44 80240A44 8602008E */ lh $v0, 0x8e($s0) /* CB5A48 80240A48 9603008E */ lhu $v1, 0x8e($s0) /* CB5A4C 80240A4C 18400005 */ blez $v0, .L80240A64 @@ -375,7 +375,7 @@ glabel func_802404D0_CB54D0 /* CB5A54 80240A54 A602008E */ sh $v0, 0x8e($s0) /* CB5A58 80240A58 00021400 */ sll $v0, $v0, 0x10 /* CB5A5C 80240A5C 1C400019 */ bgtz $v0, .L80240AC4 -/* CB5A60 80240A60 00000000 */ nop +/* CB5A60 80240A60 00000000 */ nop .L80240A64: /* CB5A64 80240A64 240403E8 */ addiu $a0, $zero, 0x3e8 /* CB5A68 80240A68 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_802404D0_CB54D0 /* CB5AB0 80240AB0 18400003 */ blez $v0, .L80240AC0 /* CB5AB4 80240AB4 28620003 */ slti $v0, $v1, 3 /* CB5AB8 80240AB8 10400002 */ beqz $v0, .L80240AC4 -/* CB5ABC 80240ABC 00000000 */ nop +/* CB5ABC 80240ABC 00000000 */ nop .L80240AC0: /* CB5AC0 80240AC0 AE600070 */ sw $zero, 0x70($s3) .L80240AC4: diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240BB8_CB5BB8.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240BB8_CB5BB8.s index 5e33565603..ed66dac7c2 100644 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240BB8_CB5BB8.s +++ b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240BB8_CB5BB8.s @@ -42,11 +42,11 @@ glabel func_80240BB8_CB5BB8 .L80240C4C: /* CB5C4C 80240C4C 8E220070 */ lw $v0, 0x70($s1) /* CB5C50 80240C50 18400034 */ blez $v0, .L80240D24 -/* CB5C54 80240C54 00000000 */ nop +/* CB5C54 80240C54 00000000 */ nop /* CB5C58 80240C58 C62C0074 */ lwc1 $f12, 0x74($s1) /* CB5C5C 80240C5C 46806320 */ cvt.s.w $f12, $f12 /* CB5C60 80240C60 44820000 */ mtc1 $v0, $f0 -/* CB5C64 80240C64 00000000 */ nop +/* CB5C64 80240C64 00000000 */ nop /* CB5C68 80240C68 46800020 */ cvt.s.w $f0, $f0 /* CB5C6C 80240C6C 46000021 */ cvt.d.s $f0, $f0 /* CB5C70 80240C70 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_80240BB8_CB5BB8 /* CB5CD0 80240CD0 27A70030 */ addiu $a3, $sp, 0x30 .L80240CD4: /* CB5CD4 80240CD4 10400007 */ beqz $v0, .L80240CF4 -/* CB5CD8 80240CD8 00000000 */ nop +/* CB5CD8 80240CD8 00000000 */ nop /* CB5CDC 80240CDC 4616A082 */ mul.s $f2, $f20, $f22 -/* CB5CE0 80240CE0 00000000 */ nop +/* CB5CE0 80240CE0 00000000 */ nop /* CB5CE4 80240CE4 C7A0002C */ lwc1 $f0, 0x2c($sp) /* CB5CE8 80240CE8 46180000 */ add.s $f0, $f0, $f24 /* CB5CEC 80240CEC 08090340 */ j .L80240D00 /* CB5CF0 80240CF0 46020000 */ add.s $f0, $f0, $f2 .L80240CF4: /* CB5CF4 80240CF4 4616A002 */ mul.s $f0, $f20, $f22 -/* CB5CF8 80240CF8 00000000 */ nop +/* CB5CF8 80240CF8 00000000 */ nop /* CB5CFC 80240CFC 4600D000 */ add.s $f0, $f26, $f0 .L80240D00: /* CB5D00 80240D00 E600003C */ swc1 $f0, 0x3c($s0) /* CB5D04 80240D04 8E220074 */ lw $v0, 0x74($s1) /* CB5D08 80240D08 2442000A */ addiu $v0, $v0, 0xa /* CB5D0C 80240D0C 44826000 */ mtc1 $v0, $f12 -/* CB5D10 80240D10 00000000 */ nop +/* CB5D10 80240D10 00000000 */ nop /* CB5D14 80240D14 0C00A6C9 */ jal clamp_angle /* CB5D18 80240D18 46806320 */ cvt.s.w $f12, $f12 /* CB5D1C 80240D1C 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_80240BB8_CB5BB8 /* CB5D30 80240D30 860200A8 */ lh $v0, 0xa8($s0) /* CB5D34 80240D34 C600003C */ lwc1 $f0, 0x3c($s0) /* CB5D38 80240D38 44821000 */ mtc1 $v0, $f2 -/* CB5D3C 80240D3C 00000000 */ nop +/* CB5D3C 80240D3C 00000000 */ nop /* CB5D40 80240D40 468010A0 */ cvt.s.w $f2, $f2 /* CB5D44 80240D44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* CB5D48 80240D48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_80240BB8_CB5BB8 /* CB5D64 80240D64 46240000 */ add.d $f0, $f0, $f4 /* CB5D68 80240D68 460010A1 */ cvt.d.s $f2, $f2 /* CB5D6C 80240D6C 4620103C */ c.lt.d $f2, $f0 -/* CB5D70 80240D70 00000000 */ nop +/* CB5D70 80240D70 00000000 */ nop /* CB5D74 80240D74 4500002E */ bc1f .L80240E30 /* CB5D78 80240D78 0280202D */ daddu $a0, $s4, $zero /* CB5D7C 80240D7C 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_80240BB8_CB5BB8 /* CB5DBC 80240DBC 3C01C1A0 */ lui $at, 0xc1a0 /* CB5DC0 80240DC0 44812000 */ mtc1 $at, $f4 /* CB5DC4 80240DC4 44834000 */ mtc1 $v1, $f8 -/* CB5DC8 80240DC8 00000000 */ nop +/* CB5DC8 80240DC8 00000000 */ nop /* CB5DCC 80240DCC 46804220 */ cvt.s.w $f8, $f8 /* CB5DD0 80240DD0 44074000 */ mfc1 $a3, $f8 /* CB5DD4 80240DD4 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_80240BB8_CB5BB8 .L80240E30: /* CB5E30 80240E30 8602008C */ lh $v0, 0x8c($s0) /* CB5E34 80240E34 14400025 */ bnez $v0, .L80240ECC -/* CB5E38 80240E38 00000000 */ nop +/* CB5E38 80240E38 00000000 */ nop /* CB5E3C 80240E3C 8602008E */ lh $v0, 0x8e($s0) /* CB5E40 80240E40 1C400022 */ bgtz $v0, .L80240ECC -/* CB5E44 80240E44 00000000 */ nop +/* CB5E44 80240E44 00000000 */ nop /* CB5E48 80240E48 8E620074 */ lw $v0, 0x74($s3) /* CB5E4C 80240E4C 2442FFFF */ addiu $v0, $v0, -1 /* CB5E50 80240E50 1840001D */ blez $v0, .L80240EC8 @@ -183,7 +183,7 @@ glabel func_80240BB8_CB5BB8 /* CB5E5C 80240E5C 9442002A */ lhu $v0, 0x2a($v0) /* CB5E60 80240E60 30420010 */ andi $v0, $v0, 0x10 /* CB5E64 80240E64 14400007 */ bnez $v0, .L80240E84 -/* CB5E68 80240E68 00000000 */ nop +/* CB5E68 80240E68 00000000 */ nop /* CB5E6C 80240E6C C600000C */ lwc1 $f0, 0xc($s0) /* CB5E70 80240E70 3C014334 */ lui $at, 0x4334 /* CB5E74 80240E74 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240FE0_CB5FE0.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240FE0_CB5FE0.s index ff44f26419..9d7ca94088 100644 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240FE0_CB5FE0.s +++ b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240FE0_CB5FE0.s @@ -60,18 +60,18 @@ glabel func_80240FE0_CB5FE0 /* CB60B8 802410B8 C6200038 */ lwc1 $f0, 0x38($s1) /* CB60BC 802410BC 4600018D */ trunc.w.s $f6, $f0 /* CB60C0 802410C0 44023000 */ mfc1 $v0, $f6 -/* CB60C4 802410C4 00000000 */ nop +/* CB60C4 802410C4 00000000 */ nop /* CB60C8 802410C8 A6420010 */ sh $v0, 0x10($s2) /* CB60CC 802410CC C620003C */ lwc1 $f0, 0x3c($s1) /* CB60D0 802410D0 4600018D */ trunc.w.s $f6, $f0 /* CB60D4 802410D4 44023000 */ mfc1 $v0, $f6 -/* CB60D8 802410D8 00000000 */ nop +/* CB60D8 802410D8 00000000 */ nop /* CB60DC 802410DC A6420012 */ sh $v0, 0x12($s2) /* CB60E0 802410E0 C6200040 */ lwc1 $f0, 0x40($s1) /* CB60E4 802410E4 A2430007 */ sb $v1, 7($s2) /* CB60E8 802410E8 4600018D */ trunc.w.s $f6, $f0 /* CB60EC 802410EC 44023000 */ mfc1 $v0, $f6 -/* CB60F0 802410F0 00000000 */ nop +/* CB60F0 802410F0 00000000 */ nop /* CB60F4 802410F4 A6420014 */ sh $v0, 0x14($s2) .L802410F8: /* CB60F8 802410F8 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241178_CB6178.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241178_CB6178.s index 118a915c47..1e73d6bd80 100644 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241178_CB6178.s +++ b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241178_CB6178.s @@ -42,9 +42,9 @@ glabel func_80241178_CB6178 /* CB620C 8024120C 44801800 */ mtc1 $zero, $f3 /* CB6210 80241210 46002021 */ cvt.d.s $f0, $f4 /* CB6214 80241214 4620103E */ c.le.d $f2, $f0 -/* CB6218 80241218 00000000 */ nop +/* CB6218 80241218 00000000 */ nop /* CB621C 8024121C 45000030 */ bc1f .L802412E0 -/* CB6220 80241220 00000000 */ nop +/* CB6220 80241220 00000000 */ nop /* CB6224 80241224 C600003C */ lwc1 $f0, 0x3c($s0) /* CB6228 80241228 46040000 */ add.s $f0, $f0, $f4 /* CB622C 8024122C E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_80241178_CB6178 /* CB628C 8024128C 27A70020 */ addiu $a3, $sp, 0x20 .L80241290: /* CB6290 80241290 1040000B */ beqz $v0, .L802412C0 -/* CB6294 80241294 00000000 */ nop +/* CB6294 80241294 00000000 */ nop /* CB6298 80241298 C7A0001C */ lwc1 $f0, 0x1c($sp) /* CB629C 8024129C 46140080 */ add.s $f2, $f0, $f20 /* CB62A0 802412A0 C600003C */ lwc1 $f0, 0x3c($s0) /* CB62A4 802412A4 4600103E */ c.le.s $f2, $f0 -/* CB62A8 802412A8 00000000 */ nop +/* CB62A8 802412A8 00000000 */ nop /* CB62AC 802412AC 4500008D */ bc1f .L802414E4 -/* CB62B0 802412B0 00000000 */ nop +/* CB62B0 802412B0 00000000 */ nop /* CB62B4 802412B4 E602003C */ swc1 $f2, 0x3c($s0) /* CB62B8 802412B8 08090539 */ j .L802414E4 /* CB62BC 802412BC AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_80241178_CB6178 /* CB62C0 802412C0 C602003C */ lwc1 $f2, 0x3c($s0) /* CB62C4 802412C4 C6000064 */ lwc1 $f0, 0x64($s0) /* CB62C8 802412C8 4602003E */ c.le.s $f0, $f2 -/* CB62CC 802412CC 00000000 */ nop +/* CB62CC 802412CC 00000000 */ nop /* CB62D0 802412D0 45030084 */ bc1tl .L802414E4 /* CB62D4 802412D4 AE400070 */ sw $zero, 0x70($s2) /* CB62D8 802412D8 08090539 */ j .L802414E4 -/* CB62DC 802412DC 00000000 */ nop +/* CB62DC 802412DC 00000000 */ nop .L802412E0: /* CB62E0 802412E0 4622003C */ c.lt.d $f0, $f2 -/* CB62E4 802412E4 00000000 */ nop +/* CB62E4 802412E4 00000000 */ nop /* CB62E8 802412E8 4500007E */ bc1f .L802414E4 -/* CB62EC 802412EC 00000000 */ nop +/* CB62EC 802412EC 00000000 */ nop /* CB62F0 802412F0 9602008E */ lhu $v0, 0x8e($s0) /* CB62F4 802412F4 24420001 */ addiu $v0, $v0, 1 /* CB62F8 802412F8 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_80241178_CB6178 /* CB6304 80241304 00021403 */ sra $v0, $v0, 0x10 /* CB6308 80241308 0043102A */ slt $v0, $v0, $v1 /* CB630C 8024130C 14400026 */ bnez $v0, .L802413A8 -/* CB6310 80241310 00000000 */ nop +/* CB6310 80241310 00000000 */ nop /* CB6314 80241314 C60C0038 */ lwc1 $f12, 0x38($s0) /* CB6318 80241318 C60E0040 */ lwc1 $f14, 0x40($s0) /* CB631C 8024131C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_80241178_CB6178 /* CB6348 80241348 8E62001C */ lw $v0, 0x1c($s3) /* CB634C 8024134C 46001005 */ abs.s $f0, $f2 /* CB6350 80241350 44822000 */ mtc1 $v0, $f4 -/* CB6354 80241354 00000000 */ nop +/* CB6354 80241354 00000000 */ nop /* CB6358 80241358 46802120 */ cvt.s.w $f4, $f4 /* CB635C 8024135C 4600203C */ c.lt.s $f4, $f0 -/* CB6360 80241360 00000000 */ nop +/* CB6360 80241360 00000000 */ nop /* CB6364 80241364 4500000D */ bc1f .L8024139C -/* CB6368 80241368 00000000 */ nop +/* CB6368 80241368 00000000 */ nop /* CB636C 8024136C 44800000 */ mtc1 $zero, $f0 /* CB6370 80241370 C614000C */ lwc1 $f20, 0xc($s0) /* CB6374 80241374 4600103C */ c.lt.s $f2, $f0 -/* CB6378 80241378 00000000 */ nop +/* CB6378 80241378 00000000 */ nop /* CB637C 8024137C 45000006 */ bc1f .L80241398 /* CB6380 80241380 00021023 */ negu $v0, $v0 /* CB6384 80241384 44820000 */ mtc1 $v0, $f0 -/* CB6388 80241388 00000000 */ nop +/* CB6388 80241388 00000000 */ nop /* CB638C 8024138C 46800020 */ cvt.s.w $f0, $f0 /* CB6390 80241390 080904E7 */ j .L8024139C /* CB6394 80241394 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_80241178_CB6178 /* CB63BC 802413BC C600001C */ lwc1 $f0, 0x1c($s0) /* CB63C0 802413C0 46001080 */ add.s $f2, $f2, $f0 /* CB63C4 802413C4 4616103C */ c.lt.s $f2, $f22 -/* CB63C8 802413C8 00000000 */ nop +/* CB63C8 802413C8 00000000 */ nop /* CB63CC 802413CC 45020045 */ bc1fl .L802414E4 /* CB63D0 802413D0 E602003C */ swc1 $f2, 0x3c($s0) /* CB63D4 802413D4 08090538 */ j .L802414E0 @@ -169,7 +169,7 @@ glabel func_80241178_CB6178 /* CB63EC 802413EC C600001C */ lwc1 $f0, 0x1c($s0) /* CB63F0 802413F0 C604003C */ lwc1 $f4, 0x3c($s0) /* CB63F4 802413F4 44821000 */ mtc1 $v0, $f2 -/* CB63F8 802413F8 00000000 */ nop +/* CB63F8 802413F8 00000000 */ nop /* CB63FC 802413FC 468010A0 */ cvt.s.w $f2, $f2 /* CB6400 80241400 46000005 */ abs.s $f0, $f0 /* CB6404 80241404 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_80241178_CB6178 /* CB6440 80241440 0C0372DF */ jal func_800DCB7C /* CB6444 80241444 27A70020 */ addiu $a3, $sp, 0x20 /* CB6448 80241448 10400015 */ beqz $v0, .L802414A0 -/* CB644C 8024144C 00000000 */ nop +/* CB644C 8024144C 00000000 */ nop /* CB6450 80241450 860200A8 */ lh $v0, 0xa8($s0) /* CB6454 80241454 C604001C */ lwc1 $f4, 0x1c($s0) /* CB6458 80241458 44820000 */ mtc1 $v0, $f0 -/* CB645C 8024145C 00000000 */ nop +/* CB645C 8024145C 00000000 */ nop /* CB6460 80241460 46800020 */ cvt.s.w $f0, $f0 /* CB6464 80241464 46002085 */ abs.s $f2, $f4 /* CB6468 80241468 46020000 */ add.s $f0, $f0, $f2 /* CB646C 8024146C C7A20024 */ lwc1 $f2, 0x24($sp) /* CB6470 80241470 4600103E */ c.le.s $f2, $f0 -/* CB6474 80241474 00000000 */ nop +/* CB6474 80241474 00000000 */ nop /* CB6478 80241478 45000005 */ bc1f .L80241490 -/* CB647C 8024147C 00000000 */ nop +/* CB647C 8024147C 00000000 */ nop /* CB6480 80241480 C7A0001C */ lwc1 $f0, 0x1c($sp) /* CB6484 80241484 AE00001C */ sw $zero, 0x1c($s0) /* CB6488 80241488 08090539 */ j .L802414E4 @@ -217,13 +217,13 @@ glabel func_80241178_CB6178 /* CB64A4 802414A4 860200A8 */ lh $v0, 0xa8($s0) /* CB64A8 802414A8 46163081 */ sub.s $f2, $f6, $f22 /* CB64AC 802414AC 44820000 */ mtc1 $v0, $f0 -/* CB64B0 802414B0 00000000 */ nop +/* CB64B0 802414B0 00000000 */ nop /* CB64B4 802414B4 46800020 */ cvt.s.w $f0, $f0 /* CB64B8 802414B8 46001080 */ add.s $f2, $f2, $f0 /* CB64BC 802414BC C604001C */ lwc1 $f4, 0x1c($s0) /* CB64C0 802414C0 46002005 */ abs.s $f0, $f4 /* CB64C4 802414C4 4602003C */ c.lt.s $f0, $f2 -/* CB64C8 802414C8 00000000 */ nop +/* CB64C8 802414C8 00000000 */ nop /* CB64CC 802414CC 45020005 */ bc1fl .L802414E4 /* CB64D0 802414D0 AE00001C */ sw $zero, 0x1c($s0) /* CB64D4 802414D4 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241508_CB6508.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241508_CB6508.s index a2c8690257..3da598c2ce 100644 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241508_CB6508.s +++ b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241508_CB6508.s @@ -49,15 +49,15 @@ glabel func_80241508_CB6508 /* CB65B0 802415B0 44802000 */ mtc1 $zero, $f4 /* CB65B4 802415B4 460010A1 */ cvt.d.s $f2, $f2 /* CB65B8 802415B8 46241082 */ mul.d $f2, $f2, $f4 -/* CB65BC 802415BC 00000000 */ nop +/* CB65BC 802415BC 00000000 */ nop /* CB65C0 802415C0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* CB65C4 802415C4 46000021 */ cvt.d.s $f0, $f0 /* CB65C8 802415C8 46240002 */ mul.d $f0, $f0, $f4 -/* CB65CC 802415CC 00000000 */ nop +/* CB65CC 802415CC 00000000 */ nop /* CB65D0 802415D0 3C013FE0 */ lui $at, 0x3fe0 /* CB65D4 802415D4 44812800 */ mtc1 $at, $f5 /* CB65D8 802415D8 44802000 */ mtc1 $zero, $f4 -/* CB65DC 802415DC 00000000 */ nop +/* CB65DC 802415DC 00000000 */ nop /* CB65E0 802415E0 46241080 */ add.d $f2, $f2, $f4 /* CB65E4 802415E4 AE000074 */ sw $zero, 0x74($s0) /* CB65E8 802415E8 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s index e1d0b13e8b..76f7a3ea47 100644 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s +++ b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s @@ -54,7 +54,7 @@ glabel func_8024162C_CB662C /* CB66EC 802416EC 8E4300B0 */ lw $v1, 0xb0($s2) /* CB66F0 802416F0 30620004 */ andi $v0, $v1, 4 /* CB66F4 802416F4 10400007 */ beqz $v0, .L80241714 -/* CB66F8 802416F8 00000000 */ nop +/* CB66F8 802416F8 00000000 */ nop /* CB66FC 802416FC 824200B4 */ lb $v0, 0xb4($s2) /* CB6700 80241700 1440003C */ bnez $v0, .L802417F4 /* CB6704 80241704 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_8024162C_CB662C /* CB6718 80241718 2C62000F */ sltiu $v0, $v1, 0xf /* CB671C 8024171C 10400034 */ beqz $v0, .L802417F0 /* CB6720 80241720 00031080 */ sll $v0, $v1, 2 -/* CB6724 80241724 3C018024 */ lui $at, %hi(D_802441B8) +/* CB6724 80241724 3C018024 */ lui $at, %hi(jtbl_802441B8_CB91B8) /* CB6728 80241728 00220821 */ addu $at, $at, $v0 -/* CB672C 8024172C 8C2241B8 */ lw $v0, %lo(D_802441B8)($at) +/* CB672C 8024172C 8C2241B8 */ lw $v0, %lo(jtbl_802441B8_CB91B8)($at) /* CB6730 80241730 00400008 */ jr $v0 -/* CB6734 80241734 00000000 */ nop +/* CB6734 80241734 00000000 */ nop +glabel L80241738_CB6738 /* CB6738 80241738 0280202D */ daddu $a0, $s4, $zero /* CB673C 8024173C 0200282D */ daddu $a1, $s0, $zero /* CB6740 80241740 0C0900C8 */ jal func_80240320_CB5320 /* CB6744 80241744 0260302D */ daddu $a2, $s3, $zero +glabel L80241748_CB6748 /* CB6748 80241748 0280202D */ daddu $a0, $s4, $zero /* CB674C 8024174C 0200282D */ daddu $a1, $s0, $zero /* CB6750 80241750 0C090134 */ jal func_802404D0_CB54D0 /* CB6754 80241754 0260302D */ daddu $a2, $s3, $zero /* CB6758 80241758 080905FD */ j .L802417F4 /* CB675C 8024175C 0000102D */ daddu $v0, $zero, $zero +glabel L80241760_CB6760 /* CB6760 80241760 0280202D */ daddu $a0, $s4, $zero /* CB6764 80241764 0200282D */ daddu $a1, $s0, $zero /* CB6768 80241768 0C0902BE */ jal flo_09_UnkNpcAIFunc1 /* CB676C 8024176C 0260302D */ daddu $a2, $s3, $zero +glabel L80241770_CB6770 /* CB6770 80241770 0280202D */ daddu $a0, $s4, $zero /* CB6774 80241774 0200282D */ daddu $a1, $s0, $zero /* CB6778 80241778 0C0902EE */ jal func_80240BB8_CB5BB8 /* CB677C 8024177C 0260302D */ daddu $a2, $s3, $zero /* CB6780 80241780 080905FD */ j .L802417F4 /* CB6784 80241784 0000102D */ daddu $v0, $zero, $zero +glabel L80241788_CB6788 /* CB6788 80241788 0280202D */ daddu $a0, $s4, $zero /* CB678C 8024178C 0200282D */ daddu $a1, $s0, $zero /* CB6790 80241790 0C0903BF */ jal flo_09_UnkNpcAIFunc2 /* CB6794 80241794 0260302D */ daddu $a2, $s3, $zero +glabel L80241798_CB6798 /* CB6798 80241798 0280202D */ daddu $a0, $s4, $zero /* CB679C 8024179C 0200282D */ daddu $a1, $s0, $zero /* CB67A0 802417A0 0C0903DD */ jal func_80240F74_CB5F74 /* CB67A4 802417A4 0260302D */ daddu $a2, $s3, $zero /* CB67A8 802417A8 080905FD */ j .L802417F4 /* CB67AC 802417AC 0000102D */ daddu $v0, $zero, $zero +glabel L802417B0_CB67B0 /* CB67B0 802417B0 0280202D */ daddu $a0, $s4, $zero /* CB67B4 802417B4 0200282D */ daddu $a1, $s0, $zero /* CB67B8 802417B8 0C0903F8 */ jal func_80240FE0_CB5FE0 /* CB67BC 802417BC 0260302D */ daddu $a2, $s3, $zero /* CB67C0 802417C0 080905FD */ j .L802417F4 /* CB67C4 802417C4 0000102D */ daddu $v0, $zero, $zero +glabel L802417C8_CB67C8 /* CB67C8 802417C8 0280202D */ daddu $a0, $s4, $zero /* CB67CC 802417CC 0200282D */ daddu $a1, $s0, $zero /* CB67D0 802417D0 0C090445 */ jal flo_09_UnkNpcAIFunc3 /* CB67D4 802417D4 0260302D */ daddu $a2, $s3, $zero /* CB67D8 802417D8 080905FD */ j .L802417F4 /* CB67DC 802417DC 0000102D */ daddu $v0, $zero, $zero +glabel L802417E0_CB67E0 /* CB67E0 802417E0 0280202D */ daddu $a0, $s4, $zero /* CB67E4 802417E4 0200282D */ daddu $a1, $s0, $zero /* CB67E8 802417E8 0C09045E */ jal func_80241178_CB6178 /* CB67EC 802417EC 0260302D */ daddu $a2, $s3, $zero .L802417F0: +glabel L802417F0_CB67F0 /* CB67F0 802417F0 0000102D */ daddu $v0, $zero, $zero .L802417F4: /* CB67F4 802417F4 8FBF0048 */ lw $ra, 0x48($sp) @@ -129,5 +139,5 @@ glabel func_8024162C_CB662C /* CB680C 8024180C 8FB00030 */ lw $s0, 0x30($sp) /* CB6810 80241810 03E00008 */ jr $ra /* CB6814 80241814 27BD0050 */ addiu $sp, $sp, 0x50 -/* CB6818 80241818 00000000 */ nop -/* CB681C 8024181C 00000000 */ nop +/* CB6818 80241818 00000000 */ nop +/* CB681C 8024181C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_10/CB9200/func_80240000_CB9200.s b/asm/nonmatchings/world/area_flo/flo_10/CB9200/func_80240000_CB9200.s index c755a5b0c2..5a28092c42 100644 --- a/asm/nonmatchings/world/area_flo/flo_10/CB9200/func_80240000_CB9200.s +++ b/asm/nonmatchings/world/area_flo/flo_10/CB9200/func_80240000_CB9200.s @@ -18,4 +18,4 @@ glabel func_80240000_CB9200 /* CB9230 80240030 8FBF0010 */ lw $ra, 0x10($sp) /* CB9234 80240034 03E00008 */ jr $ra /* CB9238 80240038 27BD0018 */ addiu $sp, $sp, 0x18 -/* CB923C 8024003C 00000000 */ nop +/* CB923C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_10/CB9240/func_80240040_CB9240.s b/asm/nonmatchings/world/area_flo/flo_10/CB9240/func_80240040_CB9240.s index a5164e987e..6a22d188cd 100644 --- a/asm/nonmatchings/world/area_flo/flo_10/CB9240/func_80240040_CB9240.s +++ b/asm/nonmatchings/world/area_flo/flo_10/CB9240/func_80240040_CB9240.s @@ -15,6 +15,6 @@ glabel func_80240040_CB9240 /* CB9268 80240068 24020002 */ addiu $v0, $zero, 2 /* CB926C 8024006C 03E00008 */ jr $ra /* CB9270 80240070 27BD0020 */ addiu $sp, $sp, 0x20 -/* CB9274 80240074 00000000 */ nop -/* CB9278 80240078 00000000 */ nop -/* CB927C 8024007C 00000000 */ nop +/* CB9274 80240074 00000000 */ nop +/* CB9278 80240078 00000000 */ nop +/* CB927C 8024007C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_10/CB9280/func_80240080_CB9280.s b/asm/nonmatchings/world/area_flo/flo_10/CB9280/func_80240080_CB9280.s index 988f395546..edd8bc578c 100644 --- a/asm/nonmatchings/world/area_flo/flo_10/CB9280/func_80240080_CB9280.s +++ b/asm/nonmatchings/world/area_flo/flo_10/CB9280/func_80240080_CB9280.s @@ -26,7 +26,7 @@ glabel func_80240080_CB9280 /* CB92D0 802400D0 1440FFFA */ bnez $v0, .L802400BC /* CB92D4 802400D4 24A50004 */ addiu $a1, $a1, 4 /* CB92D8 802400D8 08090047 */ j .L8024011C -/* CB92DC 802400DC 00000000 */ nop +/* CB92DC 802400DC 00000000 */ nop .L802400E0: /* CB92E0 802400E0 0000182D */ daddu $v1, $zero, $zero /* CB92E4 802400E4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_80240034_CBDD04.s b/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_80240034_CBDD04.s index 3bde1f4867..57d561f327 100644 --- a/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_80240034_CBDD04.s +++ b/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_80240034_CBDD04.s @@ -22,16 +22,16 @@ glabel func_80240034_CBDD04 /* CBDD44 80240074 00021023 */ negu $v0, $v0 .L80240078: /* CBDD48 80240078 14400003 */ bnez $v0, .L80240088 -/* CBDD4C 8024007C 00000000 */ nop +/* CBDD4C 8024007C 00000000 */ nop /* CBDD50 80240080 50E00017 */ beql $a3, $zero, .L802400E0 /* CBDD54 80240084 0000102D */ daddu $v0, $zero, $zero .L80240088: /* CBDD58 80240088 44822000 */ mtc1 $v0, $f4 -/* CBDD5C 8024008C 00000000 */ nop +/* CBDD5C 8024008C 00000000 */ nop /* CBDD60 80240090 46802120 */ cvt.s.w $f4, $f4 /* CBDD64 80240094 44062000 */ mfc1 $a2, $f4 /* CBDD68 80240098 44872000 */ mtc1 $a3, $f4 -/* CBDD6C 8024009C 00000000 */ nop +/* CBDD6C 8024009C 00000000 */ nop /* CBDD70 802400A0 46802120 */ cvt.s.w $f4, $f4 /* CBDD74 802400A4 44806000 */ mtc1 $zero, $f12 /* CBDD78 802400A8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240034_CBDD04 /* CBDD80 802400B0 46006386 */ mov.s $f14, $f12 /* CBDD84 802400B4 3C014270 */ lui $at, 0x4270 /* CBDD88 802400B8 44811000 */ mtc1 $at, $f2 -/* CBDD8C 802400BC 00000000 */ nop +/* CBDD8C 802400BC 00000000 */ nop /* CBDD90 802400C0 4602003C */ c.lt.s $f0, $f2 -/* CBDD94 802400C4 00000000 */ nop +/* CBDD94 802400C4 00000000 */ nop /* CBDD98 802400C8 45000004 */ bc1f .L802400DC /* CBDD9C 802400CC 24020001 */ addiu $v0, $zero, 1 /* CBDDA0 802400D0 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_802402E0_CBDFB0.s b/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_802402E0_CBDFB0.s index a478869eb7..ce5ed5b7fe 100644 --- a/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_802402E0_CBDFB0.s +++ b/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_802402E0_CBDFB0.s @@ -15,6 +15,6 @@ glabel func_802402E0_CBDFB0 /* CBDFD8 80240308 24020002 */ addiu $v0, $zero, 2 /* CBDFDC 8024030C 03E00008 */ jr $ra /* CBDFE0 80240310 27BD0020 */ addiu $sp, $sp, 0x20 -/* CBDFE4 80240314 00000000 */ nop -/* CBDFE8 80240318 00000000 */ nop -/* CBDFEC 8024031C 00000000 */ nop +/* CBDFE4 80240314 00000000 */ nop +/* CBDFE8 80240318 00000000 */ nop +/* CBDFEC 8024031C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_12/CC0E30/func_80240000_CC0E30.s b/asm/nonmatchings/world/area_flo/flo_12/CC0E30/func_80240000_CC0E30.s index 43ea0e1e09..cda6b92750 100644 --- a/asm/nonmatchings/world/area_flo/flo_12/CC0E30/func_80240000_CC0E30.s +++ b/asm/nonmatchings/world/area_flo/flo_12/CC0E30/func_80240000_CC0E30.s @@ -15,6 +15,6 @@ glabel func_80240000_CC0E30 /* CC0E58 80240028 24020002 */ addiu $v0, $zero, 2 /* CC0E5C 8024002C 03E00008 */ jr $ra /* CC0E60 80240030 27BD0020 */ addiu $sp, $sp, 0x20 -/* CC0E64 80240034 00000000 */ nop -/* CC0E68 80240038 00000000 */ nop -/* CC0E6C 8024003C 00000000 */ nop +/* CC0E64 80240034 00000000 */ nop +/* CC0E68 80240038 00000000 */ nop +/* CC0E6C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024027C_CC10AC.s b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024027C_CC10AC.s index 7201487547..becd093466 100644 --- a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024027C_CC10AC.s +++ b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024027C_CC10AC.s @@ -26,7 +26,7 @@ glabel func_8024027C_CC10AC /* CC10FC 802402CC 1440FFFA */ bnez $v0, .L802402B8 /* CC1100 802402D0 24A50004 */ addiu $a1, $a1, 4 /* CC1104 802402D4 080900C6 */ j .L80240318 -/* CC1108 802402D8 00000000 */ nop +/* CC1108 802402D8 00000000 */ nop .L802402DC: /* CC110C 802402DC 0000182D */ daddu $v1, $zero, $zero /* CC1110 802402E0 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024064C_CC147C.s b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024064C_CC147C.s index cabd3121b4..4e710da7f7 100644 --- a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024064C_CC147C.s +++ b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024064C_CC147C.s @@ -28,7 +28,7 @@ glabel func_8024064C_CC147C /* CC14D0 802406A0 00220821 */ addu $at, $at, $v0 /* CC14D4 802406A4 AC2029E0 */ sw $zero, %lo(D_802429E0)($at) /* CC14D8 802406A8 080901B6 */ j .L802406D8 -/* CC14DC 802406AC 00000000 */ nop +/* CC14DC 802406AC 00000000 */ nop .L802406B0: /* CC14E0 802406B0 3C038024 */ lui $v1, %hi(D_802429E0) /* CC14E4 802406B4 246329E0 */ addiu $v1, $v1, %lo(D_802429E0) @@ -46,5 +46,5 @@ glabel func_8024064C_CC147C /* CC150C 802406DC 24020002 */ addiu $v0, $zero, 2 /* CC1510 802406E0 03E00008 */ jr $ra /* CC1514 802406E4 27BD0018 */ addiu $sp, $sp, 0x18 -/* CC1518 802406E8 00000000 */ nop -/* CC151C 802406EC 00000000 */ nop +/* CC1518 802406E8 00000000 */ nop +/* CC151C 802406EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3810/func_80240000_CC3810.s b/asm/nonmatchings/world/area_flo/flo_13/CC3810/func_80240000_CC3810.s index 5e33e8e9c7..2ca398b893 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3810/func_80240000_CC3810.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3810/func_80240000_CC3810.s @@ -15,6 +15,6 @@ glabel func_80240000_CC3810 /* CC3838 80240028 24020002 */ addiu $v0, $zero, 2 /* CC383C 8024002C 03E00008 */ jr $ra /* CC3840 80240030 27BD0020 */ addiu $sp, $sp, 0x20 -/* CC3844 80240034 00000000 */ nop -/* CC3848 80240038 00000000 */ nop -/* CC384C 8024003C 00000000 */ nop +/* CC3844 80240034 00000000 */ nop +/* CC3848 80240038 00000000 */ nop +/* CC384C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240040_CC3850.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240040_CC3850.s index 9d473b0635..7470fe4208 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240040_CC3850.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240040_CC3850.s @@ -41,14 +41,14 @@ glabel func_80240040_CC3850 /* CC38DC 802400CC 10600009 */ beqz $v1, .L802400F4 /* CC38E0 802400D0 0000102D */ daddu $v0, $zero, $zero /* CC38E4 802400D4 08090069 */ j .L802401A4 -/* CC38E8 802400D8 00000000 */ nop +/* CC38E8 802400D8 00000000 */ nop .L802400DC: /* CC38EC 802400DC 10620013 */ beq $v1, $v0, .L8024012C /* CC38F0 802400E0 24020003 */ addiu $v0, $zero, 3 /* CC38F4 802400E4 1062001E */ beq $v1, $v0, .L80240160 /* CC38F8 802400E8 0000102D */ daddu $v0, $zero, $zero /* CC38FC 802400EC 08090069 */ j .L802401A4 -/* CC3900 802400F0 00000000 */ nop +/* CC3900 802400F0 00000000 */ nop .L802400F4: /* CC3904 802400F4 0C03AC5A */ jal func_800EB168 /* CC3908 802400F8 0000202D */ daddu $a0, $zero, $zero @@ -75,7 +75,7 @@ glabel func_80240040_CC3850 /* CC3954 80240144 A0510014 */ sb $s1, 0x14($v0) /* CC3958 80240148 82640012 */ lb $a0, 0x12($s3) /* CC395C 8024014C 0C03ACA9 */ jal func_800EB2A4 -/* CC3960 80240150 00000000 */ nop +/* CC3960 80240150 00000000 */ nop /* CC3964 80240154 24020003 */ addiu $v0, $zero, 3 /* CC3968 80240158 08090068 */ j .L802401A0 /* CC396C 8024015C AE420070 */ sw $v0, 0x70($s2) diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802401C4_CC39D4.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802401C4_CC39D4.s index 4e4371943e..623657b843 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802401C4_CC39D4.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802401C4_CC39D4.s @@ -47,7 +47,7 @@ glabel func_802401C4_CC39D4 /* CC3A7C 8024026C 0C0123F5 */ jal is_point_within_region /* CC3A80 80240270 8E070038 */ lw $a3, 0x38($s0) /* CC3A84 80240274 1040000E */ beqz $v0, .L802402B0 -/* CC3A88 80240278 00000000 */ nop +/* CC3A88 80240278 00000000 */ nop /* CC3A8C 8024027C 8E2200D0 */ lw $v0, 0xd0($s1) /* CC3A90 80240280 C60C0038 */ lwc1 $f12, 0x38($s0) /* CC3A94 80240284 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_802401C4_CC39D4 /* CC3AA8 80240298 468031A0 */ cvt.s.w $f6, $f6 /* CC3AAC 8024029C 44073000 */ mfc1 $a3, $f6 /* CC3AB0 802402A0 0C00A720 */ jal atan2 -/* CC3AB4 802402A4 00000000 */ nop +/* CC3AB4 802402A4 00000000 */ nop /* CC3AB8 802402A8 080900B8 */ j .L802402E0 /* CC3ABC 802402AC E600000C */ swc1 $f0, 0xc($s0) .L802402B0: @@ -66,7 +66,7 @@ glabel func_802401C4_CC39D4 /* CC3AC4 802402B4 2404003C */ addiu $a0, $zero, 0x3c /* CC3AC8 802402B8 C60C000C */ lwc1 $f12, 0xc($s0) /* CC3ACC 802402BC 44820000 */ mtc1 $v0, $f0 -/* CC3AD0 802402C0 00000000 */ nop +/* CC3AD0 802402C0 00000000 */ nop /* CC3AD4 802402C4 46800020 */ cvt.s.w $f0, $f0 /* CC3AD8 802402C8 46006300 */ add.s $f12, $f12, $f0 /* CC3ADC 802402CC 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_802401C4_CC39D4 /* CC3B00 802402F0 8E2200D0 */ lw $v0, 0xd0($s1) /* CC3B04 802402F4 8C420014 */ lw $v0, 0x14($v0) /* CC3B08 802402F8 04410004 */ bgez $v0, .L8024030C -/* CC3B0C 802402FC 00000000 */ nop +/* CC3B0C 802402FC 00000000 */ nop /* CC3B10 80240300 C6400000 */ lwc1 $f0, ($s2) /* CC3B14 80240304 080900CB */ j .L8024032C /* CC3B18 80240308 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_802401C4_CC39D4 /* CC3B1C 8024030C 3C018024 */ lui $at, %hi(D_80247A30) /* CC3B20 80240310 D4227A30 */ ldc1 $f2, %lo(D_80247A30)($at) /* CC3B24 80240314 44820000 */ mtc1 $v0, $f0 -/* CC3B28 80240318 00000000 */ nop +/* CC3B28 80240318 00000000 */ nop /* CC3B2C 8024031C 46800021 */ cvt.d.w $f0, $f0 /* CC3B30 80240320 46220003 */ div.d $f0, $f0, $f2 /* CC3B34 80240324 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_802401C4_CC39D4 /* CC3B48 80240338 44801000 */ mtc1 $zero, $f2 /* CC3B4C 8024033C 46000021 */ cvt.d.s $f0, $f0 /* CC3B50 80240340 46220002 */ mul.d $f0, $f0, $f2 -/* CC3B54 80240344 00000000 */ nop +/* CC3B54 80240344 00000000 */ nop /* CC3B58 80240348 24020001 */ addiu $v0, $zero, 1 /* CC3B5C 8024034C 4620018D */ trunc.w.d $f6, $f0 /* CC3B60 80240350 E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240374_CC3B84.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240374_CC3B84.s index a97dfb1dab..90b0feca86 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240374_CC3B84.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240374_CC3B84.s @@ -34,7 +34,7 @@ glabel func_80240374_CC3B84 /* CC3BF8 802403E8 44803000 */ mtc1 $zero, $f6 /* CC3BFC 802403EC 46000021 */ cvt.d.s $f0, $f0 /* CC3C00 802403F0 46260002 */ mul.d $f0, $f0, $f6 -/* CC3C04 802403F4 00000000 */ nop +/* CC3C04 802403F4 00000000 */ nop /* CC3C08 802403F8 24020001 */ addiu $v0, $zero, 1 /* CC3C0C 802403FC 8E24006C */ lw $a0, 0x6c($s1) /* CC3C10 80240400 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80240374_CC3B84 /* CC3C6C 8024045C C600003C */ lwc1 $f0, 0x3c($s0) /* CC3C70 80240460 4600C001 */ sub.s $f0, $f24, $f0 /* CC3C74 80240464 4600B03C */ c.lt.s $f22, $f0 -/* CC3C78 80240468 00000000 */ nop +/* CC3C78 80240468 00000000 */ nop /* CC3C7C 8024046C 4500001B */ bc1f .L802404DC /* CC3C80 80240470 34820010 */ ori $v0, $a0, 0x10 /* CC3C84 80240474 08090137 */ j .L802404DC @@ -87,9 +87,9 @@ glabel func_80240374_CC3B84 /* CC3CC8 802404B8 C7A00034 */ lwc1 $f0, 0x34($sp) /* CC3CCC 802404BC 4600D001 */ sub.s $f0, $f26, $f0 /* CC3CD0 802404C0 4600B03C */ c.lt.s $f22, $f0 -/* CC3CD4 802404C4 00000000 */ nop +/* CC3CD4 802404C4 00000000 */ nop /* CC3CD8 802404C8 45000004 */ bc1f .L802404DC -/* CC3CDC 802404CC 00000000 */ nop +/* CC3CDC 802404CC 00000000 */ nop /* CC3CE0 802404D0 8E22006C */ lw $v0, 0x6c($s1) /* CC3CE4 802404D4 34420010 */ ori $v0, $v0, 0x10 /* CC3CE8 802404D8 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80240374_CC3B84 /* CC3CF0 802404E0 24030011 */ addiu $v1, $zero, 0x11 /* CC3CF4 802404E4 30420011 */ andi $v0, $v0, 0x11 /* CC3CF8 802404E8 14430039 */ bne $v0, $v1, .L802405D0 -/* CC3CFC 802404EC 00000000 */ nop +/* CC3CFC 802404EC 00000000 */ nop /* CC3D00 802404F0 8E020000 */ lw $v0, ($s0) /* CC3D04 802404F4 30420008 */ andi $v0, $v0, 8 /* CC3D08 802404F8 1040000A */ beqz $v0, .L80240524 @@ -108,7 +108,7 @@ glabel func_80240374_CC3B84 /* CC3D18 80240508 D4207A38 */ ldc1 $f0, %lo(D_80247A38)($at) /* CC3D1C 8024050C 460010A1 */ cvt.d.s $f2, $f2 /* CC3D20 80240510 46201082 */ mul.d $f2, $f2, $f0 -/* CC3D24 80240514 00000000 */ nop +/* CC3D24 80240514 00000000 */ nop /* CC3D28 80240518 4600A021 */ cvt.d.s $f0, $f20 /* CC3D2C 8024051C 08090162 */ j .L80240588 /* CC3D30 80240520 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80240374_CC3B84 /* CC3D80 80240570 D4207A40 */ ldc1 $f0, %lo(D_80247A40)($at) /* CC3D84 80240574 460010A1 */ cvt.d.s $f2, $f2 /* CC3D88 80240578 46201082 */ mul.d $f2, $f2, $f0 -/* CC3D8C 8024057C 00000000 */ nop +/* CC3D8C 8024057C 00000000 */ nop /* CC3D90 80240580 4600A021 */ cvt.d.s $f0, $f20 /* CC3D94 80240584 46220000 */ add.d $f0, $f0, $f2 .L80240588: @@ -149,7 +149,7 @@ glabel func_80240374_CC3B84 /* CC3DB4 802405A4 46000005 */ abs.s $f0, $f0 /* CC3DB8 802405A8 46000021 */ cvt.d.s $f0, $f0 /* CC3DBC 802405AC 4622003C */ c.lt.d $f0, $f2 -/* CC3DC0 802405B0 00000000 */ nop +/* CC3DC0 802405B0 00000000 */ nop /* CC3DC4 802405B4 45000036 */ bc1f .L80240690 /* CC3DC8 802405B8 2403FFEF */ addiu $v1, $zero, -0x11 /* CC3DCC 802405BC E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80240374_CC3B84 .L802405D0: /* CC3DE0 802405D0 8E220070 */ lw $v0, 0x70($s1) /* CC3DE4 802405D4 1840002E */ blez $v0, .L80240690 -/* CC3DE8 802405D8 00000000 */ nop +/* CC3DE8 802405D8 00000000 */ nop /* CC3DEC 802405DC C62C0074 */ lwc1 $f12, 0x74($s1) /* CC3DF0 802405E0 0C00A8BB */ jal sin_deg /* CC3DF4 802405E4 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80240374_CC3B84 /* CC3E4C 8024063C 27A70030 */ addiu $a3, $sp, 0x30 .L80240640: /* CC3E50 80240640 10400007 */ beqz $v0, .L80240660 -/* CC3E54 80240644 00000000 */ nop +/* CC3E54 80240644 00000000 */ nop /* CC3E58 80240648 4616A082 */ mul.s $f2, $f20, $f22 -/* CC3E5C 8024064C 00000000 */ nop +/* CC3E5C 8024064C 00000000 */ nop /* CC3E60 80240650 C7A0002C */ lwc1 $f0, 0x2c($sp) /* CC3E64 80240654 461A0000 */ add.s $f0, $f0, $f26 /* CC3E68 80240658 0809019B */ j .L8024066C /* CC3E6C 8024065C 46020000 */ add.s $f0, $f0, $f2 .L80240660: /* CC3E70 80240660 4616A002 */ mul.s $f0, $f20, $f22 -/* CC3E74 80240664 00000000 */ nop +/* CC3E74 80240664 00000000 */ nop /* CC3E78 80240668 4600C000 */ add.s $f0, $f24, $f0 .L8024066C: /* CC3E7C 8024066C E600003C */ swc1 $f0, 0x3c($s0) /* CC3E80 80240670 8E220074 */ lw $v0, 0x74($s1) /* CC3E84 80240674 2442000A */ addiu $v0, $v0, 0xa /* CC3E88 80240678 44826000 */ mtc1 $v0, $f12 -/* CC3E8C 8024067C 00000000 */ nop +/* CC3E8C 8024067C 00000000 */ nop /* CC3E90 80240680 0C00A6C9 */ jal clamp_angle /* CC3E94 80240684 46806320 */ cvt.s.w $f12, $f12 /* CC3E98 80240688 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80240374_CC3B84 /* CC3EA8 80240698 2442FFFF */ addiu $v0, $v0, -1 /* CC3EAC 8024069C 8E430014 */ lw $v1, 0x14($s2) /* CC3EB0 802406A0 04600048 */ bltz $v1, .L802407C4 -/* CC3EB4 802406A4 00000000 */ nop +/* CC3EB4 802406A4 00000000 */ nop /* CC3EB8 802406A8 8E620074 */ lw $v0, 0x74($s3) /* CC3EBC 802406AC 1C400042 */ bgtz $v0, .L802407B8 /* CC3EC0 802406B0 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80240374_CC3B84 /* CC3EC8 802406B8 860200A8 */ lh $v0, 0xa8($s0) /* CC3ECC 802406BC C602003C */ lwc1 $f2, 0x3c($s0) /* CC3ED0 802406C0 44820000 */ mtc1 $v0, $f0 -/* CC3ED4 802406C4 00000000 */ nop +/* CC3ED4 802406C4 00000000 */ nop /* CC3ED8 802406C8 46800020 */ cvt.s.w $f0, $f0 /* CC3EDC 802406CC 46001080 */ add.s $f2, $f2, $f0 /* CC3EE0 802406D0 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80240374_CC3B84 /* CC3EFC 802406EC C440002C */ lwc1 $f0, 0x2c($v0) /* CC3F00 802406F0 46000021 */ cvt.d.s $f0, $f0 /* CC3F04 802406F4 4622003C */ c.lt.d $f0, $f2 -/* CC3F08 802406F8 00000000 */ nop +/* CC3F08 802406F8 00000000 */ nop /* CC3F0C 802406FC 4500002C */ bc1f .L802407B0 /* CC3F10 80240700 02A0202D */ daddu $a0, $s5, $zero /* CC3F14 80240704 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80240374_CC3B84 /* CC3F50 80240740 3C01C1A0 */ lui $at, 0xc1a0 /* CC3F54 80240744 44812000 */ mtc1 $at, $f4 /* CC3F58 80240748 44834000 */ mtc1 $v1, $f8 -/* CC3F5C 8024074C 00000000 */ nop +/* CC3F5C 8024074C 00000000 */ nop /* CC3F60 80240750 46804220 */ cvt.s.w $f8, $f8 /* CC3F64 80240754 44074000 */ mfc1 $a3, $f8 /* CC3F68 80240758 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80240374_CC3B84 /* CC401C 8024080C 0C0123F5 */ jal is_point_within_region /* CC4020 80240810 8E070038 */ lw $a3, 0x38($s0) /* CC4024 80240814 1040001A */ beqz $v0, .L80240880 -/* CC4028 80240818 00000000 */ nop +/* CC4028 80240818 00000000 */ nop /* CC402C 8024081C 8E060038 */ lw $a2, 0x38($s0) /* CC4030 80240820 8E2200D0 */ lw $v0, 0xd0($s1) /* CC4034 80240824 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80240374_CC3B84 /* CC4048 80240838 468073A0 */ cvt.s.w $f14, $f14 /* CC404C 8024083C C6020018 */ lwc1 $f2, 0x18($s0) /* CC4050 80240840 4600103C */ c.lt.s $f2, $f0 -/* CC4054 80240844 00000000 */ nop +/* CC4054 80240844 00000000 */ nop /* CC4058 80240848 4500000D */ bc1f .L80240880 /* CC405C 8024084C E7A00034 */ swc1 $f0, 0x34($sp) /* CC4060 80240850 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80240374_CC3B84 /* CC409C 8024088C 00621825 */ or $v1, $v1, $v0 /* CC40A0 80240890 00741825 */ or $v1, $v1, $s4 /* CC40A4 80240894 10600008 */ beqz $v1, .L802408B8 -/* CC40A8 80240898 00000000 */ nop +/* CC40A8 80240898 00000000 */ nop /* CC40AC 8024089C 8602008C */ lh $v0, 0x8c($s0) /* CC40B0 802408A0 14400031 */ bnez $v0, .L80240968 -/* CC40B4 802408A4 00000000 */ nop +/* CC40B4 802408A4 00000000 */ nop /* CC40B8 802408A8 8E050018 */ lw $a1, 0x18($s0) /* CC40BC 802408AC 8E06000C */ lw $a2, 0xc($s0) /* CC40C0 802408B0 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_80240374_CC3B84 /* CC40D4 802408C4 44801000 */ mtc1 $zero, $f2 /* CC40D8 802408C8 46000021 */ cvt.d.s $f0, $f0 /* CC40DC 802408CC 46220002 */ mul.d $f0, $f0, $f2 -/* CC40E0 802408D0 00000000 */ nop +/* CC40E0 802408D0 00000000 */ nop /* CC40E4 802408D4 4620020D */ trunc.w.d $f8, $f0 /* CC40E8 802408D8 E628007C */ swc1 $f8, 0x7c($s1) /* CC40EC 802408DC 8E420004 */ lw $v0, 4($s2) /* CC40F0 802408E0 18400021 */ blez $v0, .L80240968 -/* CC40F4 802408E4 00000000 */ nop +/* CC40F4 802408E4 00000000 */ nop /* CC40F8 802408E8 8602008E */ lh $v0, 0x8e($s0) /* CC40FC 802408EC 9603008E */ lhu $v1, 0x8e($s0) /* CC4100 802408F0 18400005 */ blez $v0, .L80240908 @@ -375,7 +375,7 @@ glabel func_80240374_CC3B84 /* CC4108 802408F8 A602008E */ sh $v0, 0x8e($s0) /* CC410C 802408FC 00021400 */ sll $v0, $v0, 0x10 /* CC4110 80240900 1C400019 */ bgtz $v0, .L80240968 -/* CC4114 80240904 00000000 */ nop +/* CC4114 80240904 00000000 */ nop .L80240908: /* CC4118 80240908 240403E8 */ addiu $a0, $zero, 0x3e8 /* CC411C 8024090C 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80240374_CC3B84 /* CC4164 80240954 18400003 */ blez $v0, .L80240964 /* CC4168 80240958 28620003 */ slti $v0, $v1, 3 /* CC416C 8024095C 10400002 */ beqz $v0, .L80240968 -/* CC4170 80240960 00000000 */ nop +/* CC4170 80240960 00000000 */ nop .L80240964: /* CC4174 80240964 AE600070 */ sw $zero, 0x70($s3) .L80240968: diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240A5C_CC426C.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240A5C_CC426C.s index ac20673a86..943ef2e6a3 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240A5C_CC426C.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240A5C_CC426C.s @@ -42,11 +42,11 @@ glabel func_80240A5C_CC426C .L80240AF0: /* CC4300 80240AF0 8E220070 */ lw $v0, 0x70($s1) /* CC4304 80240AF4 18400034 */ blez $v0, .L80240BC8 -/* CC4308 80240AF8 00000000 */ nop +/* CC4308 80240AF8 00000000 */ nop /* CC430C 80240AFC C62C0074 */ lwc1 $f12, 0x74($s1) /* CC4310 80240B00 46806320 */ cvt.s.w $f12, $f12 /* CC4314 80240B04 44820000 */ mtc1 $v0, $f0 -/* CC4318 80240B08 00000000 */ nop +/* CC4318 80240B08 00000000 */ nop /* CC431C 80240B0C 46800020 */ cvt.s.w $f0, $f0 /* CC4320 80240B10 46000021 */ cvt.d.s $f0, $f0 /* CC4324 80240B14 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_80240A5C_CC426C /* CC4384 80240B74 27A70030 */ addiu $a3, $sp, 0x30 .L80240B78: /* CC4388 80240B78 10400007 */ beqz $v0, .L80240B98 -/* CC438C 80240B7C 00000000 */ nop +/* CC438C 80240B7C 00000000 */ nop /* CC4390 80240B80 4616A082 */ mul.s $f2, $f20, $f22 -/* CC4394 80240B84 00000000 */ nop +/* CC4394 80240B84 00000000 */ nop /* CC4398 80240B88 C7A0002C */ lwc1 $f0, 0x2c($sp) /* CC439C 80240B8C 46180000 */ add.s $f0, $f0, $f24 /* CC43A0 80240B90 080902E9 */ j .L80240BA4 /* CC43A4 80240B94 46020000 */ add.s $f0, $f0, $f2 .L80240B98: /* CC43A8 80240B98 4616A002 */ mul.s $f0, $f20, $f22 -/* CC43AC 80240B9C 00000000 */ nop +/* CC43AC 80240B9C 00000000 */ nop /* CC43B0 80240BA0 4600D000 */ add.s $f0, $f26, $f0 .L80240BA4: /* CC43B4 80240BA4 E600003C */ swc1 $f0, 0x3c($s0) /* CC43B8 80240BA8 8E220074 */ lw $v0, 0x74($s1) /* CC43BC 80240BAC 2442000A */ addiu $v0, $v0, 0xa /* CC43C0 80240BB0 44826000 */ mtc1 $v0, $f12 -/* CC43C4 80240BB4 00000000 */ nop +/* CC43C4 80240BB4 00000000 */ nop /* CC43C8 80240BB8 0C00A6C9 */ jal clamp_angle /* CC43CC 80240BBC 46806320 */ cvt.s.w $f12, $f12 /* CC43D0 80240BC0 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_80240A5C_CC426C /* CC43E4 80240BD4 860200A8 */ lh $v0, 0xa8($s0) /* CC43E8 80240BD8 C600003C */ lwc1 $f0, 0x3c($s0) /* CC43EC 80240BDC 44821000 */ mtc1 $v0, $f2 -/* CC43F0 80240BE0 00000000 */ nop +/* CC43F0 80240BE0 00000000 */ nop /* CC43F4 80240BE4 468010A0 */ cvt.s.w $f2, $f2 /* CC43F8 80240BE8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* CC43FC 80240BEC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_80240A5C_CC426C /* CC4418 80240C08 46240000 */ add.d $f0, $f0, $f4 /* CC441C 80240C0C 460010A1 */ cvt.d.s $f2, $f2 /* CC4420 80240C10 4620103C */ c.lt.d $f2, $f0 -/* CC4424 80240C14 00000000 */ nop +/* CC4424 80240C14 00000000 */ nop /* CC4428 80240C18 4500002E */ bc1f .L80240CD4 /* CC442C 80240C1C 0280202D */ daddu $a0, $s4, $zero /* CC4430 80240C20 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_80240A5C_CC426C /* CC4470 80240C60 3C01C1A0 */ lui $at, 0xc1a0 /* CC4474 80240C64 44812000 */ mtc1 $at, $f4 /* CC4478 80240C68 44834000 */ mtc1 $v1, $f8 -/* CC447C 80240C6C 00000000 */ nop +/* CC447C 80240C6C 00000000 */ nop /* CC4480 80240C70 46804220 */ cvt.s.w $f8, $f8 /* CC4484 80240C74 44074000 */ mfc1 $a3, $f8 /* CC4488 80240C78 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_80240A5C_CC426C .L80240CD4: /* CC44E4 80240CD4 8602008C */ lh $v0, 0x8c($s0) /* CC44E8 80240CD8 14400025 */ bnez $v0, .L80240D70 -/* CC44EC 80240CDC 00000000 */ nop +/* CC44EC 80240CDC 00000000 */ nop /* CC44F0 80240CE0 8602008E */ lh $v0, 0x8e($s0) /* CC44F4 80240CE4 1C400022 */ bgtz $v0, .L80240D70 -/* CC44F8 80240CE8 00000000 */ nop +/* CC44F8 80240CE8 00000000 */ nop /* CC44FC 80240CEC 8E620074 */ lw $v0, 0x74($s3) /* CC4500 80240CF0 2442FFFF */ addiu $v0, $v0, -1 /* CC4504 80240CF4 1840001D */ blez $v0, .L80240D6C @@ -183,7 +183,7 @@ glabel func_80240A5C_CC426C /* CC4510 80240D00 9442002A */ lhu $v0, 0x2a($v0) /* CC4514 80240D04 30420010 */ andi $v0, $v0, 0x10 /* CC4518 80240D08 14400007 */ bnez $v0, .L80240D28 -/* CC451C 80240D0C 00000000 */ nop +/* CC451C 80240D0C 00000000 */ nop /* CC4520 80240D10 C600000C */ lwc1 $f0, 0xc($s0) /* CC4524 80240D14 3C014334 */ lui $at, 0x4334 /* CC4528 80240D18 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240E84_CC4694.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240E84_CC4694.s index 341148f28f..97ef424781 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240E84_CC4694.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240E84_CC4694.s @@ -60,18 +60,18 @@ glabel func_80240E84_CC4694 /* CC476C 80240F5C C6200038 */ lwc1 $f0, 0x38($s1) /* CC4770 80240F60 4600018D */ trunc.w.s $f6, $f0 /* CC4774 80240F64 44023000 */ mfc1 $v0, $f6 -/* CC4778 80240F68 00000000 */ nop +/* CC4778 80240F68 00000000 */ nop /* CC477C 80240F6C A6420010 */ sh $v0, 0x10($s2) /* CC4780 80240F70 C620003C */ lwc1 $f0, 0x3c($s1) /* CC4784 80240F74 4600018D */ trunc.w.s $f6, $f0 /* CC4788 80240F78 44023000 */ mfc1 $v0, $f6 -/* CC478C 80240F7C 00000000 */ nop +/* CC478C 80240F7C 00000000 */ nop /* CC4790 80240F80 A6420012 */ sh $v0, 0x12($s2) /* CC4794 80240F84 C6200040 */ lwc1 $f0, 0x40($s1) /* CC4798 80240F88 A2430007 */ sb $v1, 7($s2) /* CC479C 80240F8C 4600018D */ trunc.w.s $f6, $f0 /* CC47A0 80240F90 44023000 */ mfc1 $v0, $f6 -/* CC47A4 80240F94 00000000 */ nop +/* CC47A4 80240F94 00000000 */ nop /* CC47A8 80240F98 A6420014 */ sh $v0, 0x14($s2) .L80240F9C: /* CC47AC 80240F9C 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024101C_CC482C.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024101C_CC482C.s index 90c6883203..56c3155545 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024101C_CC482C.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024101C_CC482C.s @@ -42,9 +42,9 @@ glabel func_8024101C_CC482C /* CC48C0 802410B0 44801800 */ mtc1 $zero, $f3 /* CC48C4 802410B4 46002021 */ cvt.d.s $f0, $f4 /* CC48C8 802410B8 4620103E */ c.le.d $f2, $f0 -/* CC48CC 802410BC 00000000 */ nop +/* CC48CC 802410BC 00000000 */ nop /* CC48D0 802410C0 45000030 */ bc1f .L80241184 -/* CC48D4 802410C4 00000000 */ nop +/* CC48D4 802410C4 00000000 */ nop /* CC48D8 802410C8 C600003C */ lwc1 $f0, 0x3c($s0) /* CC48DC 802410CC 46040000 */ add.s $f0, $f0, $f4 /* CC48E0 802410D0 E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_8024101C_CC482C /* CC4940 80241130 27A70020 */ addiu $a3, $sp, 0x20 .L80241134: /* CC4944 80241134 1040000B */ beqz $v0, .L80241164 -/* CC4948 80241138 00000000 */ nop +/* CC4948 80241138 00000000 */ nop /* CC494C 8024113C C7A0001C */ lwc1 $f0, 0x1c($sp) /* CC4950 80241140 46140080 */ add.s $f2, $f0, $f20 /* CC4954 80241144 C600003C */ lwc1 $f0, 0x3c($s0) /* CC4958 80241148 4600103E */ c.le.s $f2, $f0 -/* CC495C 8024114C 00000000 */ nop +/* CC495C 8024114C 00000000 */ nop /* CC4960 80241150 4500008D */ bc1f .L80241388 -/* CC4964 80241154 00000000 */ nop +/* CC4964 80241154 00000000 */ nop /* CC4968 80241158 E602003C */ swc1 $f2, 0x3c($s0) /* CC496C 8024115C 080904E2 */ j .L80241388 /* CC4970 80241160 AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_8024101C_CC482C /* CC4974 80241164 C602003C */ lwc1 $f2, 0x3c($s0) /* CC4978 80241168 C6000064 */ lwc1 $f0, 0x64($s0) /* CC497C 8024116C 4602003E */ c.le.s $f0, $f2 -/* CC4980 80241170 00000000 */ nop +/* CC4980 80241170 00000000 */ nop /* CC4984 80241174 45030084 */ bc1tl .L80241388 /* CC4988 80241178 AE400070 */ sw $zero, 0x70($s2) /* CC498C 8024117C 080904E2 */ j .L80241388 -/* CC4990 80241180 00000000 */ nop +/* CC4990 80241180 00000000 */ nop .L80241184: /* CC4994 80241184 4622003C */ c.lt.d $f0, $f2 -/* CC4998 80241188 00000000 */ nop +/* CC4998 80241188 00000000 */ nop /* CC499C 8024118C 4500007E */ bc1f .L80241388 -/* CC49A0 80241190 00000000 */ nop +/* CC49A0 80241190 00000000 */ nop /* CC49A4 80241194 9602008E */ lhu $v0, 0x8e($s0) /* CC49A8 80241198 24420001 */ addiu $v0, $v0, 1 /* CC49AC 8024119C A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_8024101C_CC482C /* CC49B8 802411A8 00021403 */ sra $v0, $v0, 0x10 /* CC49BC 802411AC 0043102A */ slt $v0, $v0, $v1 /* CC49C0 802411B0 14400026 */ bnez $v0, .L8024124C -/* CC49C4 802411B4 00000000 */ nop +/* CC49C4 802411B4 00000000 */ nop /* CC49C8 802411B8 C60C0038 */ lwc1 $f12, 0x38($s0) /* CC49CC 802411BC C60E0040 */ lwc1 $f14, 0x40($s0) /* CC49D0 802411C0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_8024101C_CC482C /* CC49FC 802411EC 8E62001C */ lw $v0, 0x1c($s3) /* CC4A00 802411F0 46001005 */ abs.s $f0, $f2 /* CC4A04 802411F4 44822000 */ mtc1 $v0, $f4 -/* CC4A08 802411F8 00000000 */ nop +/* CC4A08 802411F8 00000000 */ nop /* CC4A0C 802411FC 46802120 */ cvt.s.w $f4, $f4 /* CC4A10 80241200 4600203C */ c.lt.s $f4, $f0 -/* CC4A14 80241204 00000000 */ nop +/* CC4A14 80241204 00000000 */ nop /* CC4A18 80241208 4500000D */ bc1f .L80241240 -/* CC4A1C 8024120C 00000000 */ nop +/* CC4A1C 8024120C 00000000 */ nop /* CC4A20 80241210 44800000 */ mtc1 $zero, $f0 /* CC4A24 80241214 C614000C */ lwc1 $f20, 0xc($s0) /* CC4A28 80241218 4600103C */ c.lt.s $f2, $f0 -/* CC4A2C 8024121C 00000000 */ nop +/* CC4A2C 8024121C 00000000 */ nop /* CC4A30 80241220 45000006 */ bc1f .L8024123C /* CC4A34 80241224 00021023 */ negu $v0, $v0 /* CC4A38 80241228 44820000 */ mtc1 $v0, $f0 -/* CC4A3C 8024122C 00000000 */ nop +/* CC4A3C 8024122C 00000000 */ nop /* CC4A40 80241230 46800020 */ cvt.s.w $f0, $f0 /* CC4A44 80241234 08090490 */ j .L80241240 /* CC4A48 80241238 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_8024101C_CC482C /* CC4A70 80241260 C600001C */ lwc1 $f0, 0x1c($s0) /* CC4A74 80241264 46001080 */ add.s $f2, $f2, $f0 /* CC4A78 80241268 4616103C */ c.lt.s $f2, $f22 -/* CC4A7C 8024126C 00000000 */ nop +/* CC4A7C 8024126C 00000000 */ nop /* CC4A80 80241270 45020045 */ bc1fl .L80241388 /* CC4A84 80241274 E602003C */ swc1 $f2, 0x3c($s0) /* CC4A88 80241278 080904E1 */ j .L80241384 @@ -169,7 +169,7 @@ glabel func_8024101C_CC482C /* CC4AA0 80241290 C600001C */ lwc1 $f0, 0x1c($s0) /* CC4AA4 80241294 C604003C */ lwc1 $f4, 0x3c($s0) /* CC4AA8 80241298 44821000 */ mtc1 $v0, $f2 -/* CC4AAC 8024129C 00000000 */ nop +/* CC4AAC 8024129C 00000000 */ nop /* CC4AB0 802412A0 468010A0 */ cvt.s.w $f2, $f2 /* CC4AB4 802412A4 46000005 */ abs.s $f0, $f0 /* CC4AB8 802412A8 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_8024101C_CC482C /* CC4AF4 802412E4 0C0372DF */ jal func_800DCB7C /* CC4AF8 802412E8 27A70020 */ addiu $a3, $sp, 0x20 /* CC4AFC 802412EC 10400015 */ beqz $v0, .L80241344 -/* CC4B00 802412F0 00000000 */ nop +/* CC4B00 802412F0 00000000 */ nop /* CC4B04 802412F4 860200A8 */ lh $v0, 0xa8($s0) /* CC4B08 802412F8 C604001C */ lwc1 $f4, 0x1c($s0) /* CC4B0C 802412FC 44820000 */ mtc1 $v0, $f0 -/* CC4B10 80241300 00000000 */ nop +/* CC4B10 80241300 00000000 */ nop /* CC4B14 80241304 46800020 */ cvt.s.w $f0, $f0 /* CC4B18 80241308 46002085 */ abs.s $f2, $f4 /* CC4B1C 8024130C 46020000 */ add.s $f0, $f0, $f2 /* CC4B20 80241310 C7A20024 */ lwc1 $f2, 0x24($sp) /* CC4B24 80241314 4600103E */ c.le.s $f2, $f0 -/* CC4B28 80241318 00000000 */ nop +/* CC4B28 80241318 00000000 */ nop /* CC4B2C 8024131C 45000005 */ bc1f .L80241334 -/* CC4B30 80241320 00000000 */ nop +/* CC4B30 80241320 00000000 */ nop /* CC4B34 80241324 C7A0001C */ lwc1 $f0, 0x1c($sp) /* CC4B38 80241328 AE00001C */ sw $zero, 0x1c($s0) /* CC4B3C 8024132C 080904E2 */ j .L80241388 @@ -217,13 +217,13 @@ glabel func_8024101C_CC482C /* CC4B58 80241348 860200A8 */ lh $v0, 0xa8($s0) /* CC4B5C 8024134C 46163081 */ sub.s $f2, $f6, $f22 /* CC4B60 80241350 44820000 */ mtc1 $v0, $f0 -/* CC4B64 80241354 00000000 */ nop +/* CC4B64 80241354 00000000 */ nop /* CC4B68 80241358 46800020 */ cvt.s.w $f0, $f0 /* CC4B6C 8024135C 46001080 */ add.s $f2, $f2, $f0 /* CC4B70 80241360 C604001C */ lwc1 $f4, 0x1c($s0) /* CC4B74 80241364 46002005 */ abs.s $f0, $f4 /* CC4B78 80241368 4602003C */ c.lt.s $f0, $f2 -/* CC4B7C 8024136C 00000000 */ nop +/* CC4B7C 8024136C 00000000 */ nop /* CC4B80 80241370 45020005 */ bc1fl .L80241388 /* CC4B84 80241374 AE00001C */ sw $zero, 0x1c($s0) /* CC4B88 80241378 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802413AC_CC4BBC.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802413AC_CC4BBC.s index aa550297bb..d73cdd5601 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802413AC_CC4BBC.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802413AC_CC4BBC.s @@ -49,15 +49,15 @@ glabel func_802413AC_CC4BBC /* CC4C64 80241454 44802000 */ mtc1 $zero, $f4 /* CC4C68 80241458 460010A1 */ cvt.d.s $f2, $f2 /* CC4C6C 8024145C 46241082 */ mul.d $f2, $f2, $f4 -/* CC4C70 80241460 00000000 */ nop +/* CC4C70 80241460 00000000 */ nop /* CC4C74 80241464 C7A0001C */ lwc1 $f0, 0x1c($sp) /* CC4C78 80241468 46000021 */ cvt.d.s $f0, $f0 /* CC4C7C 8024146C 46240002 */ mul.d $f0, $f0, $f4 -/* CC4C80 80241470 00000000 */ nop +/* CC4C80 80241470 00000000 */ nop /* CC4C84 80241474 3C013FE0 */ lui $at, 0x3fe0 /* CC4C88 80241478 44812800 */ mtc1 $at, $f5 /* CC4C8C 8024147C 44802000 */ mtc1 $zero, $f4 -/* CC4C90 80241480 00000000 */ nop +/* CC4C90 80241480 00000000 */ nop /* CC4C94 80241484 46241080 */ add.d $f2, $f2, $f4 /* CC4C98 80241488 AE000074 */ sw $zero, 0x74($s0) /* CC4C9C 8024148C 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s index 773f2c1348..dae1fa8aa3 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s @@ -54,7 +54,7 @@ glabel func_802414D0_CC4CE0 /* CC4DA0 80241590 8E4300B0 */ lw $v1, 0xb0($s2) /* CC4DA4 80241594 30620004 */ andi $v0, $v1, 4 /* CC4DA8 80241598 10400007 */ beqz $v0, .L802415B8 -/* CC4DAC 8024159C 00000000 */ nop +/* CC4DAC 8024159C 00000000 */ nop /* CC4DB0 802415A0 824200B4 */ lb $v0, 0xb4($s2) /* CC4DB4 802415A4 1440003C */ bnez $v0, .L80241698 /* CC4DB8 802415A8 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_802414D0_CC4CE0 /* CC4DCC 802415BC 2C62000F */ sltiu $v0, $v1, 0xf /* CC4DD0 802415C0 10400034 */ beqz $v0, .L80241694 /* CC4DD4 802415C4 00031080 */ sll $v0, $v1, 2 -/* CC4DD8 802415C8 3C018024 */ lui $at, %hi(D_80247A48) +/* CC4DD8 802415C8 3C018024 */ lui $at, %hi(jtbl_80247A48_CCB258) /* CC4DDC 802415CC 00220821 */ addu $at, $at, $v0 -/* CC4DE0 802415D0 8C227A48 */ lw $v0, %lo(D_80247A48)($at) +/* CC4DE0 802415D0 8C227A48 */ lw $v0, %lo(jtbl_80247A48_CCB258)($at) /* CC4DE4 802415D4 00400008 */ jr $v0 -/* CC4DE8 802415D8 00000000 */ nop +/* CC4DE8 802415D8 00000000 */ nop +glabel L802415DC_CC4DEC /* CC4DEC 802415DC 0280202D */ daddu $a0, $s4, $zero /* CC4DF0 802415E0 0200282D */ daddu $a1, $s0, $zero /* CC4DF4 802415E4 0C090071 */ jal func_802401C4_CC39D4 /* CC4DF8 802415E8 0260302D */ daddu $a2, $s3, $zero +glabel L802415EC_CC4DFC /* CC4DFC 802415EC 0280202D */ daddu $a0, $s4, $zero /* CC4E00 802415F0 0200282D */ daddu $a1, $s0, $zero /* CC4E04 802415F4 0C0900DD */ jal func_80240374_CC3B84 /* CC4E08 802415F8 0260302D */ daddu $a2, $s3, $zero /* CC4E0C 802415FC 080905A6 */ j .L80241698 /* CC4E10 80241600 0000102D */ daddu $v0, $zero, $zero +glabel L80241604_CC4E14 /* CC4E14 80241604 0280202D */ daddu $a0, $s4, $zero /* CC4E18 80241608 0200282D */ daddu $a1, $s0, $zero /* CC4E1C 8024160C 0C090267 */ jal flo_13_UnkNpcAIFunc1 /* CC4E20 80241610 0260302D */ daddu $a2, $s3, $zero +glabel L80241614_CC4E24 /* CC4E24 80241614 0280202D */ daddu $a0, $s4, $zero /* CC4E28 80241618 0200282D */ daddu $a1, $s0, $zero /* CC4E2C 8024161C 0C090297 */ jal func_80240A5C_CC426C /* CC4E30 80241620 0260302D */ daddu $a2, $s3, $zero /* CC4E34 80241624 080905A6 */ j .L80241698 /* CC4E38 80241628 0000102D */ daddu $v0, $zero, $zero +glabel L8024162C_CC4E3C /* CC4E3C 8024162C 0280202D */ daddu $a0, $s4, $zero /* CC4E40 80241630 0200282D */ daddu $a1, $s0, $zero /* CC4E44 80241634 0C090368 */ jal flo_13_UnkNpcAIFunc2 /* CC4E48 80241638 0260302D */ daddu $a2, $s3, $zero +glabel L8024163C_CC4E4C /* CC4E4C 8024163C 0280202D */ daddu $a0, $s4, $zero /* CC4E50 80241640 0200282D */ daddu $a1, $s0, $zero /* CC4E54 80241644 0C090386 */ jal func_80240E18_CC4628 /* CC4E58 80241648 0260302D */ daddu $a2, $s3, $zero /* CC4E5C 8024164C 080905A6 */ j .L80241698 /* CC4E60 80241650 0000102D */ daddu $v0, $zero, $zero +glabel L80241654_CC4E64 /* CC4E64 80241654 0280202D */ daddu $a0, $s4, $zero /* CC4E68 80241658 0200282D */ daddu $a1, $s0, $zero /* CC4E6C 8024165C 0C0903A1 */ jal func_80240E84_CC4694 /* CC4E70 80241660 0260302D */ daddu $a2, $s3, $zero /* CC4E74 80241664 080905A6 */ j .L80241698 /* CC4E78 80241668 0000102D */ daddu $v0, $zero, $zero +glabel L8024166C_CC4E7C /* CC4E7C 8024166C 0280202D */ daddu $a0, $s4, $zero /* CC4E80 80241670 0200282D */ daddu $a1, $s0, $zero /* CC4E84 80241674 0C0903EE */ jal flo_13_UnkNpcAIFunc3 /* CC4E88 80241678 0260302D */ daddu $a2, $s3, $zero /* CC4E8C 8024167C 080905A6 */ j .L80241698 /* CC4E90 80241680 0000102D */ daddu $v0, $zero, $zero +glabel L80241684_CC4E94 /* CC4E94 80241684 0280202D */ daddu $a0, $s4, $zero /* CC4E98 80241688 0200282D */ daddu $a1, $s0, $zero /* CC4E9C 8024168C 0C090407 */ jal func_8024101C_CC482C /* CC4EA0 80241690 0260302D */ daddu $a2, $s3, $zero .L80241694: +glabel L80241694_CC4EA4 /* CC4EA4 80241694 0000102D */ daddu $v0, $zero, $zero .L80241698: /* CC4EA8 80241698 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241704_CC4F14.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241704_CC4F14.s index 5ebe475ef6..eba9ed31c9 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241704_CC4F14.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241704_CC4F14.s @@ -71,7 +71,7 @@ glabel func_80241704_CC4F14 /* CC5018 80241808 0C00A8BB */ jal sin_deg /* CC501C 8024180C 46806320 */ cvt.s.w $f12, $f12 /* CC5020 80241810 46140002 */ mul.s $f0, $f0, $f20 -/* CC5024 80241814 00000000 */ nop +/* CC5024 80241814 00000000 */ nop /* CC5028 80241818 C7A2002C */ lwc1 $f2, 0x2c($sp) /* CC502C 8024181C 46181080 */ add.s $f2, $f2, $f24 /* CC5030 80241820 46001080 */ add.s $f2, $f2, $f0 @@ -79,14 +79,14 @@ glabel func_80241704_CC4F14 /* CC5038 80241828 8E220074 */ lw $v0, 0x74($s1) /* CC503C 8024182C 2442000C */ addiu $v0, $v0, 0xc /* CC5040 80241830 44826000 */ mtc1 $v0, $f12 -/* CC5044 80241834 00000000 */ nop +/* CC5044 80241834 00000000 */ nop /* CC5048 80241838 0C00A6C9 */ jal clamp_angle /* CC504C 8024183C 46806320 */ cvt.s.w $f12, $f12 /* CC5050 80241840 4600020D */ trunc.w.s $f8, $f0 /* CC5054 80241844 E6280074 */ swc1 $f8, 0x74($s1) /* CC5058 80241848 8EE30014 */ lw $v1, 0x14($s7) /* CC505C 8024184C 0460003C */ bltz $v1, .L80241940 -/* CC5060 80241850 00000000 */ nop +/* CC5060 80241850 00000000 */ nop /* CC5064 80241854 8E420074 */ lw $v0, 0x74($s2) /* CC5068 80241858 1C400038 */ bgtz $v0, .L8024193C /* CC506C 8024185C 2442FFFF */ addiu $v0, $v0, -1 @@ -111,7 +111,7 @@ glabel func_80241704_CC4F14 /* CC50B8 802418A8 2402000F */ addiu $v0, $zero, 0xf /* CC50BC 802418AC AFA2001C */ sw $v0, 0x1c($sp) /* CC50C0 802418B0 44834000 */ mtc1 $v1, $f8 -/* CC50C4 802418B4 00000000 */ nop +/* CC50C4 802418B4 00000000 */ nop /* CC50C8 802418B8 46804220 */ cvt.s.w $f8, $f8 /* CC50CC 802418BC 44074000 */ mfc1 $a3, $f8 /* CC50D0 802418C0 27A20038 */ addiu $v0, $sp, 0x38 @@ -170,7 +170,7 @@ glabel func_80241704_CC4F14 /* CC5198 80241988 0C0123F5 */ jal is_point_within_region /* CC519C 8024198C 8E070038 */ lw $a3, 0x38($s0) /* CC51A0 80241990 1040000D */ beqz $v0, .L802419C8 -/* CC51A4 80241994 00000000 */ nop +/* CC51A4 80241994 00000000 */ nop /* CC51A8 80241998 8E2200D0 */ lw $v0, 0xd0($s1) /* CC51AC 8024199C C60C0038 */ lwc1 $f12, 0x38($s0) /* CC51B0 802419A0 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -181,12 +181,12 @@ glabel func_80241704_CC4F14 /* CC51C4 802419B4 46804220 */ cvt.s.w $f8, $f8 /* CC51C8 802419B8 44074000 */ mfc1 $a3, $f8 /* CC51CC 802419BC 0C00A720 */ jal atan2 -/* CC51D0 802419C0 00000000 */ nop +/* CC51D0 802419C0 00000000 */ nop /* CC51D4 802419C4 E600000C */ swc1 $f0, 0xc($s0) .L802419C8: /* CC51D8 802419C8 8602008C */ lh $v0, 0x8c($s0) /* CC51DC 802419CC 14400056 */ bnez $v0, .L80241B28 -/* CC51E0 802419D0 00000000 */ nop +/* CC51E0 802419D0 00000000 */ nop /* CC51E4 802419D4 8602008E */ lh $v0, 0x8e($s0) /* CC51E8 802419D8 1840003D */ blez $v0, .L80241AD0 /* CC51EC 802419DC 240403E8 */ addiu $a0, $zero, 0x3e8 @@ -221,7 +221,7 @@ glabel func_80241704_CC4F14 /* CC5260 80241A50 E7A4002C */ swc1 $f4, 0x2c($sp) /* CC5264 80241A54 460000A1 */ cvt.d.s $f2, $f0 /* CC5268 80241A58 4622303C */ c.lt.d $f6, $f2 -/* CC526C 80241A5C 00000000 */ nop +/* CC526C 80241A5C 00000000 */ nop /* CC5270 80241A60 45000005 */ bc1f .L80241A78 /* CC5274 80241A64 E7A00034 */ swc1 $f0, 0x34($sp) /* CC5278 80241A68 4600B021 */ cvt.d.s $f0, $f22 @@ -232,9 +232,9 @@ glabel func_80241704_CC4F14 /* CC5288 80241A78 3C01C000 */ lui $at, 0xc000 /* CC528C 80241A7C 44810800 */ mtc1 $at, $f1 /* CC5290 80241A80 44800000 */ mtc1 $zero, $f0 -/* CC5294 80241A84 00000000 */ nop +/* CC5294 80241A84 00000000 */ nop /* CC5298 80241A88 4620103C */ c.lt.d $f2, $f0 -/* CC529C 80241A8C 00000000 */ nop +/* CC529C 80241A8C 00000000 */ nop /* CC52A0 80241A90 45020004 */ bc1fl .L80241AA4 /* CC52A4 80241A94 46002586 */ mov.s $f22, $f4 /* CC52A8 80241A98 4600B021 */ cvt.d.s $f0, $f22 @@ -246,7 +246,7 @@ glabel func_80241704_CC4F14 /* CC52BC 80241AAC 44801000 */ mtc1 $zero, $f2 /* CC52C0 80241AB0 4600B021 */ cvt.d.s $f0, $f22 /* CC52C4 80241AB4 46220002 */ mul.d $f0, $f0, $f2 -/* CC52C8 80241AB8 00000000 */ nop +/* CC52C8 80241AB8 00000000 */ nop /* CC52CC 80241ABC 4620020D */ trunc.w.d $f8, $f0 /* CC52D0 80241AC0 E628007C */ swc1 $f8, 0x7c($s1) .L80241AC4: diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241B68_CC5378.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241B68_CC5378.s index c82fc76421..54b2ec662d 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241B68_CC5378.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241B68_CC5378.s @@ -57,7 +57,7 @@ glabel func_80241B68_CC5378 /* CC5444 80241C34 0C00A8BB */ jal sin_deg /* CC5448 80241C38 46806320 */ cvt.s.w $f12, $f12 /* CC544C 80241C3C 46140002 */ mul.s $f0, $f0, $f20 -/* CC5450 80241C40 00000000 */ nop +/* CC5450 80241C40 00000000 */ nop /* CC5454 80241C44 C7A2002C */ lwc1 $f2, 0x2c($sp) /* CC5458 80241C48 46161080 */ add.s $f2, $f2, $f22 /* CC545C 80241C4C 46001080 */ add.s $f2, $f2, $f0 @@ -65,7 +65,7 @@ glabel func_80241B68_CC5378 /* CC5464 80241C54 8E220074 */ lw $v0, 0x74($s1) /* CC5468 80241C58 2442000C */ addiu $v0, $v0, 0xc /* CC546C 80241C5C 44826000 */ mtc1 $v0, $f12 -/* CC5470 80241C60 00000000 */ nop +/* CC5470 80241C60 00000000 */ nop /* CC5474 80241C64 0C00A6C9 */ jal clamp_angle /* CC5478 80241C68 46806320 */ cvt.s.w $f12, $f12 /* CC547C 80241C6C 4600028D */ trunc.w.s $f10, $f0 @@ -91,7 +91,7 @@ glabel func_80241B68_CC5378 /* CC54CC 80241CBC 2402000F */ addiu $v0, $zero, 0xf /* CC54D0 80241CC0 AFA2001C */ sw $v0, 0x1c($sp) /* CC54D4 80241CC4 44835000 */ mtc1 $v1, $f10 -/* CC54D8 80241CC8 00000000 */ nop +/* CC54D8 80241CC8 00000000 */ nop /* CC54DC 80241CCC 468052A0 */ cvt.s.w $f10, $f10 /* CC54E0 80241CD0 44075000 */ mfc1 $a3, $f10 /* CC54E4 80241CD4 27A20038 */ addiu $v0, $sp, 0x38 @@ -110,10 +110,10 @@ glabel func_80241B68_CC5378 .L80241D08: /* CC5518 80241D08 8602008C */ lh $v0, 0x8c($s0) /* CC551C 80241D0C 14400020 */ bnez $v0, .L80241D90 -/* CC5520 80241D10 00000000 */ nop +/* CC5520 80241D10 00000000 */ nop /* CC5524 80241D14 8602008E */ lh $v0, 0x8e($s0) /* CC5528 80241D18 1C40001D */ bgtz $v0, .L80241D90 -/* CC552C 80241D1C 00000000 */ nop +/* CC552C 80241D1C 00000000 */ nop /* CC5530 80241D20 8E420074 */ lw $v0, 0x74($s2) /* CC5534 80241D24 2442FFFF */ addiu $v0, $v0, -1 /* CC5538 80241D28 18400018 */ blez $v0, .L80241D8C diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s index 1fbd568542..967235fb43 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s @@ -57,7 +57,7 @@ glabel func_80241DB8_CC55C8 /* CC5694 80241E84 8E6300B0 */ lw $v1, 0xb0($s3) /* CC5698 80241E88 30620004 */ andi $v0, $v1, 4 /* CC569C 80241E8C 10400007 */ beqz $v0, .L80241EAC -/* CC56A0 80241E90 00000000 */ nop +/* CC56A0 80241E90 00000000 */ nop /* CC56A4 80241E94 826200B4 */ lb $v0, 0xb4($s3) /* CC56A8 80241E98 144000F4 */ bnez $v0, .L8024226C /* CC56AC 80241E9C 0000102D */ daddu $v0, $zero, $zero @@ -74,14 +74,14 @@ glabel func_80241DB8_CC55C8 /* CC56D4 80241EC4 10600009 */ beqz $v1, .L80241EEC /* CC56D8 80241EC8 2402000C */ addiu $v0, $zero, 0xc /* CC56DC 80241ECC 080907CF */ j .L80241F3C -/* CC56E0 80241ED0 00000000 */ nop +/* CC56E0 80241ED0 00000000 */ nop .L80241ED4: /* CC56E4 80241ED4 1062000F */ beq $v1, $v0, .L80241F14 /* CC56E8 80241ED8 24020003 */ addiu $v0, $zero, 3 /* CC56EC 80241EDC 10620012 */ beq $v1, $v0, .L80241F28 /* CC56F0 80241EE0 0280202D */ daddu $a0, $s4, $zero /* CC56F4 80241EE4 080907CD */ j .L80241F34 -/* CC56F8 80241EE8 00000000 */ nop +/* CC56F8 80241EE8 00000000 */ nop .L80241EEC: /* CC56FC 80241EEC 0280202D */ daddu $a0, $s4, $zero /* CC5700 80241EF0 02C0282D */ daddu $a1, $s6, $zero @@ -93,7 +93,7 @@ glabel func_80241DB8_CC55C8 /* CC5714 80241F04 0C0905C1 */ jal func_80241704_CC4F14 /* CC5718 80241F08 02A0302D */ daddu $a2, $s5, $zero /* CC571C 80241F0C 080907CD */ j .L80241F34 -/* CC5720 80241F10 00000000 */ nop +/* CC5720 80241F10 00000000 */ nop .L80241F14: /* CC5724 80241F14 0280202D */ daddu $a0, $s4, $zero /* CC5728 80241F18 02C0282D */ daddu $a1, $s6, $zero @@ -109,7 +109,7 @@ glabel func_80241DB8_CC55C8 /* CC5748 80241F38 2402000C */ addiu $v0, $zero, 0xc .L80241F3C: /* CC574C 80241F3C 1462001A */ bne $v1, $v0, .L80241FA8 -/* CC5750 80241F40 00000000 */ nop +/* CC5750 80241F40 00000000 */ nop /* CC5754 80241F44 C64C0038 */ lwc1 $f12, 0x38($s2) /* CC5758 80241F48 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* CC575C 80241F4C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -145,13 +145,13 @@ glabel func_80241DB8_CC55C8 /* CC57D0 80241FC0 10620008 */ beq $v1, $v0, .L80241FE4 /* CC57D4 80241FC4 2410001F */ addiu $s0, $zero, 0x1f /* CC57D8 80241FC8 08090808 */ j .L80242020 -/* CC57DC 80241FCC 00000000 */ nop +/* CC57DC 80241FCC 00000000 */ nop .L80241FD0: /* CC57E0 80241FD0 2402000E */ addiu $v0, $zero, 0xe /* CC57E4 80241FD4 1062000D */ beq $v1, $v0, .L8024200C /* CC57E8 80241FD8 0280202D */ daddu $a0, $s4, $zero /* CC57EC 80241FDC 08090806 */ j .L80242018 -/* CC57F0 80241FE0 00000000 */ nop +/* CC57F0 80241FE0 00000000 */ nop .L80241FE4: /* CC57F4 80241FE4 0280202D */ daddu $a0, $s4, $zero /* CC57F8 80241FE8 02C0282D */ daddu $a1, $s6, $zero @@ -163,7 +163,7 @@ glabel func_80241DB8_CC55C8 /* CC580C 80241FFC 0C0903EE */ jal flo_13_UnkNpcAIFunc3 /* CC5810 80242000 02A0302D */ daddu $a2, $s5, $zero /* CC5814 80242004 08090806 */ j .L80242018 -/* CC5818 80242008 00000000 */ nop +/* CC5818 80242008 00000000 */ nop .L8024200C: /* CC581C 8024200C 02C0282D */ daddu $a1, $s6, $zero /* CC5820 80242010 0C090407 */ jal func_8024101C_CC482C @@ -177,24 +177,24 @@ glabel func_80241DB8_CC55C8 /* CC5838 80242028 10400005 */ beqz $v0, .L80242040 /* CC583C 8024202C 2402001E */ addiu $v0, $zero, 0x1e /* CC5840 80242030 1062000A */ beq $v1, $v0, .L8024205C -/* CC5844 80242034 00000000 */ nop +/* CC5844 80242034 00000000 */ nop /* CC5848 80242038 08090843 */ j .L8024210C -/* CC584C 8024203C 00000000 */ nop +/* CC584C 8024203C 00000000 */ nop .L80242040: /* CC5850 80242040 24020020 */ addiu $v0, $zero, 0x20 /* CC5854 80242044 10620022 */ beq $v1, $v0, .L802420D0 /* CC5858 80242048 24020021 */ addiu $v0, $zero, 0x21 /* CC585C 8024204C 10620029 */ beq $v1, $v0, .L802420F4 -/* CC5860 80242050 00000000 */ nop +/* CC5860 80242050 00000000 */ nop /* CC5864 80242054 08090843 */ j .L8024210C -/* CC5868 80242058 00000000 */ nop +/* CC5868 80242058 00000000 */ nop .L8024205C: /* CC586C 8024205C 9642008E */ lhu $v0, 0x8e($s2) /* CC5870 80242060 2442FFFF */ addiu $v0, $v0, -1 /* CC5874 80242064 A642008E */ sh $v0, 0x8e($s2) /* CC5878 80242068 00021400 */ sll $v0, $v0, 0x10 /* CC587C 8024206C 1C400027 */ bgtz $v0, .L8024210C -/* CC5880 80242070 00000000 */ nop +/* CC5880 80242070 00000000 */ nop /* CC5884 80242074 0C00FB3A */ jal get_enemy /* CC5888 80242078 8E64007C */ lw $a0, 0x7c($s3) /* CC588C 8024207C 24030002 */ addiu $v1, $zero, 2 @@ -282,25 +282,25 @@ glabel func_80241DB8_CC55C8 /* CC59C4 802421B4 44800000 */ mtc1 $zero, $f0 /* CC59C8 802421B8 4600A0A1 */ cvt.d.s $f2, $f20 /* CC59CC 802421BC 4622003C */ c.lt.d $f0, $f2 -/* CC59D0 802421C0 00000000 */ nop +/* CC59D0 802421C0 00000000 */ nop /* CC59D4 802421C4 45000029 */ bc1f .L8024226C -/* CC59D8 802421C8 00000000 */ nop +/* CC59D8 802421C8 00000000 */ nop /* CC59DC 802421CC 8642008C */ lh $v0, 0x8c($s2) /* CC59E0 802421D0 54400026 */ bnel $v0, $zero, .L8024226C /* CC59E4 802421D4 0000102D */ daddu $v0, $zero, $zero /* CC59E8 802421D8 3C014034 */ lui $at, 0x4034 /* CC59EC 802421DC 44810800 */ mtc1 $at, $f1 /* CC59F0 802421E0 44800000 */ mtc1 $zero, $f0 -/* CC59F4 802421E4 00000000 */ nop +/* CC59F4 802421E4 00000000 */ nop /* CC59F8 802421E8 46201001 */ sub.d $f0, $f2, $f0 /* CC59FC 802421EC 44801000 */ mtc1 $zero, $f2 /* CC5A00 802421F0 44801800 */ mtc1 $zero, $f3 /* CC5A04 802421F4 46200120 */ cvt.s.d $f4, $f0 /* CC5A08 802421F8 46002021 */ cvt.d.s $f0, $f4 /* CC5A0C 802421FC 4622003C */ c.lt.d $f0, $f2 -/* CC5A10 80242200 00000000 */ nop +/* CC5A10 80242200 00000000 */ nop /* CC5A14 80242204 45000002 */ bc1f .L80242210 -/* CC5A18 80242208 00000000 */ nop +/* CC5A18 80242208 00000000 */ nop /* CC5A1C 8024220C 44802000 */ mtc1 $zero, $f4 .L80242210: /* CC5A20 80242210 3C014069 */ lui $at, 0x4069 @@ -308,7 +308,7 @@ glabel func_80241DB8_CC55C8 /* CC5A28 80242218 44801000 */ mtc1 $zero, $f2 /* CC5A2C 8024221C 46002021 */ cvt.d.s $f0, $f4 /* CC5A30 80242220 4620103C */ c.lt.d $f2, $f0 -/* CC5A34 80242224 00000000 */ nop +/* CC5A34 80242224 00000000 */ nop /* CC5A38 80242228 45000003 */ bc1f .L80242238 /* CC5A3C 8024222C 240200C8 */ addiu $v0, $zero, 0xc8 /* CC5A40 80242230 3C014348 */ lui $at, 0x4348 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242314_CC5B24.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242314_CC5B24.s index ca176cdc13..ed9c0c6b8b 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242314_CC5B24.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242314_CC5B24.s @@ -21,11 +21,11 @@ glabel func_80242314_CC5B24 /* CC5B64 80242354 A602008E */ sh $v0, 0x8e($s0) /* CC5B68 80242358 00021400 */ sll $v0, $v0, 0x10 /* CC5B6C 8024235C 1C400033 */ bgtz $v0, .L8024242C -/* CC5B70 80242360 00000000 */ nop +/* CC5B70 80242360 00000000 */ nop .L80242364: /* CC5B74 80242364 8602008C */ lh $v0, 0x8c($s0) /* CC5B78 80242368 14400030 */ bnez $v0, .L8024242C -/* CC5B7C 8024236C 00000000 */ nop +/* CC5B7C 8024236C 00000000 */ nop /* CC5B80 80242370 8E2200CC */ lw $v0, 0xcc($s1) /* CC5B84 80242374 8C420024 */ lw $v0, 0x24($v0) /* CC5B88 80242378 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_80242314_CC5B24 /* CC5B94 80242384 8E230088 */ lw $v1, 0x88($s1) /* CC5B98 80242388 24020005 */ addiu $v0, $zero, 5 /* CC5B9C 8024238C 10620005 */ beq $v1, $v0, .L802423A4 -/* CC5BA0 80242390 00000000 */ nop +/* CC5BA0 80242390 00000000 */ nop /* CC5BA4 80242394 10600003 */ beqz $v1, .L802423A4 /* CC5BA8 80242398 24020001 */ addiu $v0, $zero, 1 /* CC5BAC 8024239C 14620006 */ bne $v1, $v0, .L802423B8 -/* CC5BB0 802423A0 00000000 */ nop +/* CC5BB0 802423A0 00000000 */ nop .L802423A4: /* CC5BB4 802423A4 8E220084 */ lw $v0, 0x84($s1) /* CC5BB8 802423A8 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_80242314_CC5B24 /* CC5BF8 802423E8 46220000 */ add.d $f0, $f0, $f2 /* CC5BFC 802423EC 4620010D */ trunc.w.d $f4, $f0 /* CC5C00 802423F0 44022000 */ mfc1 $v0, $f4 -/* CC5C04 802423F4 00000000 */ nop +/* CC5C04 802423F4 00000000 */ nop /* CC5C08 802423F8 A602008E */ sh $v0, 0x8e($s0) /* CC5C0C 802423FC 00021400 */ sll $v0, $v0, 0x10 /* CC5C10 80242400 8E230078 */ lw $v1, 0x78($s1) /* CC5C14 80242404 00021403 */ sra $v0, $v0, 0x10 /* CC5C18 80242408 0043102A */ slt $v0, $v0, $v1 /* CC5C1C 8024240C 10400003 */ beqz $v0, .L8024241C -/* CC5C20 80242410 00000000 */ nop +/* CC5C20 80242410 00000000 */ nop /* CC5C24 80242414 9622007A */ lhu $v0, 0x7a($s1) /* CC5C28 80242418 A602008E */ sh $v0, 0x8e($s0) .L8024241C: diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s index 3363a92d50..0b25325678 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s @@ -244,7 +244,7 @@ glabel func_8024262C_CC5E3C .L802429A4: /* CC61B4 802429A4 0260202D */ daddu $a0, $s3, $zero /* CC61B8 802429A8 0280282D */ daddu $a1, $s4, $zero -/* CC61BC 802429AC 0C090912 */ jal func_80242448_CC5C58 +/* CC61BC 802429AC 0C090912 */ jal flo_13_UnkNpcAIFunc12 /* CC61C0 802429B0 02A0302D */ daddu $a2, $s5, $zero /* CC61C4 802429B4 08090A76 */ j .L802429D8 /* CC61C8 802429B8 00000000 */ nop @@ -279,15 +279,17 @@ glabel func_8024262C_CC5E3C /* CC6228 80242A18 2C620015 */ sltiu $v0, $v1, 0x15 /* CC622C 80242A1C 10400009 */ beqz $v0, .L80242A44 /* CC6230 80242A20 00031080 */ sll $v0, $v1, 2 -/* CC6234 80242A24 3C018024 */ lui $at, %hi(D_80247A90) +/* CC6234 80242A24 3C018024 */ lui $at, %hi(jtbl_80247A90_CCB2A0) /* CC6238 80242A28 00220821 */ addu $at, $at, $v0 -/* CC623C 80242A2C 8C227A90 */ lw $v0, %lo(D_80247A90)($at) +/* CC623C 80242A2C 8C227A90 */ lw $v0, %lo(jtbl_80247A90_CCB2A0)($at) /* CC6240 80242A30 00400008 */ jr $v0 /* CC6244 80242A34 00000000 */ nop +glabel L80242A38_CC6248 /* CC6248 80242A38 8E420028 */ lw $v0, 0x28($s2) /* CC624C 80242A3C 24420001 */ addiu $v0, $v0, 1 /* CC6250 80242A40 AE420028 */ sw $v0, 0x28($s2) .L80242A44: +glabel L80242A44_CC6254 /* CC6254 80242A44 0000102D */ daddu $v0, $zero, $zero .L80242A48: /* CC6258 80242A48 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s index 0fce68decf..56276e86ce 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s @@ -281,7 +281,7 @@ glabel func_80242A6C_CC627C .L80242E6C: /* CC667C 80242E6C 02A0202D */ daddu $a0, $s5, $zero /* CC6680 80242E70 0260282D */ daddu $a1, $s3, $zero -/* CC6684 80242E74 0C090912 */ jal func_80242448_CC5C58 +/* CC6684 80242E74 0C090912 */ jal flo_13_UnkNpcAIFunc12 /* CC6688 80242E78 0280302D */ daddu $a2, $s4, $zero /* CC668C 80242E7C 08090CCE */ j .L80243338 /* CC6690 80242E80 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802433C0_CC6BD0.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802433C0_CC6BD0.s index 6cc0fb6131..f5fce7e06a 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802433C0_CC6BD0.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802433C0_CC6BD0.s @@ -53,7 +53,7 @@ glabel func_802433C0_CC6BD0 /* CC6C8C 8024347C 24040295 */ addiu $a0, $zero, 0x295 /* CC6C90 80243480 4600008D */ trunc.w.s $f2, $f0 /* CC6C94 80243484 44071000 */ mfc1 $a3, $f2 -/* CC6C98 80243488 00000000 */ nop +/* CC6C98 80243488 00000000 */ nop /* CC6C9C 8024348C 00073C00 */ sll $a3, $a3, 0x10 /* CC6CA0 80243490 92050001 */ lbu $a1, 1($s0) /* CC6CA4 80243494 92260001 */ lbu $a2, 1($s1) diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802434D4_CC6CE4.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802434D4_CC6CE4.s index 1fcc213552..a5f9222d60 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802434D4_CC6CE4.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802434D4_CC6CE4.s @@ -47,7 +47,7 @@ glabel func_802434D4_CC6CE4 /* CC6D88 80243578 24040295 */ addiu $a0, $zero, 0x295 /* CC6D8C 8024357C 4600008D */ trunc.w.s $f2, $f0 /* CC6D90 80243580 44071000 */ mfc1 $a3, $f2 -/* CC6D94 80243584 00000000 */ nop +/* CC6D94 80243584 00000000 */ nop /* CC6D98 80243588 00073C00 */ sll $a3, $a3, 0x10 /* CC6D9C 8024358C 92050001 */ lbu $a1, 1($s0) /* CC6DA0 80243590 92260001 */ lbu $a2, 1($s1) @@ -66,4 +66,4 @@ glabel func_802434D4_CC6CE4 /* CC6DD0 802435C0 00021040 */ sll $v0, $v0, 1 /* CC6DD4 802435C4 03E00008 */ jr $ra /* CC6DD8 802435C8 27BD0030 */ addiu $sp, $sp, 0x30 -/* CC6DDC 802435CC 00000000 */ nop +/* CC6DDC 802435CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC6DE0/func_802435D0_CC6DE0.s b/asm/nonmatchings/world/area_flo/flo_13/CC6DE0/func_802435D0_CC6DE0.s index 795f0a504c..1fe81d8c1e 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC6DE0/func_802435D0_CC6DE0.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC6DE0/func_802435D0_CC6DE0.s @@ -39,6 +39,6 @@ glabel func_802435D0_CC6DE0 /* CC6E68 80243658 24020002 */ addiu $v0, $zero, 2 /* CC6E6C 8024365C 03E00008 */ jr $ra /* CC6E70 80243660 27BD0028 */ addiu $sp, $sp, 0x28 -/* CC6E74 80243664 00000000 */ nop -/* CC6E78 80243668 00000000 */ nop -/* CC6E7C 8024366C 00000000 */ nop +/* CC6E74 80243664 00000000 */ nop +/* CC6E78 80243668 00000000 */ nop +/* CC6E7C 8024366C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240340_CCB650.s b/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240340_CCB650.s index 915d5f18b0..2c5fdf4bba 100644 --- a/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240340_CCB650.s +++ b/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240340_CCB650.s @@ -6,33 +6,33 @@ glabel func_80240340_CCB650 /* CCB654 80240344 8C830090 */ lw $v1, 0x90($a0) /* CCB658 80240348 00431023 */ subu $v0, $v0, $v1 /* CCB65C 8024034C 44821000 */ mtc1 $v0, $f2 -/* CCB660 80240350 00000000 */ nop +/* CCB660 80240350 00000000 */ nop /* CCB664 80240354 468010A0 */ cvt.s.w $f2, $f2 /* CCB668 80240358 8C820088 */ lw $v0, 0x88($a0) /* CCB66C 8024035C 8C830094 */ lw $v1, 0x94($a0) /* CCB670 80240360 46021082 */ mul.s $f2, $f2, $f2 -/* CCB674 80240364 00000000 */ nop +/* CCB674 80240364 00000000 */ nop /* CCB678 80240368 00431023 */ subu $v0, $v0, $v1 /* CCB67C 8024036C 44822000 */ mtc1 $v0, $f4 -/* CCB680 80240370 00000000 */ nop +/* CCB680 80240370 00000000 */ nop /* CCB684 80240374 46802120 */ cvt.s.w $f4, $f4 /* CCB688 80240378 8C82008C */ lw $v0, 0x8c($a0) /* CCB68C 8024037C 46042102 */ mul.s $f4, $f4, $f4 -/* CCB690 80240380 00000000 */ nop +/* CCB690 80240380 00000000 */ nop /* CCB694 80240384 8C830098 */ lw $v1, 0x98($a0) /* CCB698 80240388 00431023 */ subu $v0, $v0, $v1 /* CCB69C 8024038C 44820000 */ mtc1 $v0, $f0 -/* CCB6A0 80240390 00000000 */ nop +/* CCB6A0 80240390 00000000 */ nop /* CCB6A4 80240394 46800020 */ cvt.s.w $f0, $f0 /* CCB6A8 80240398 46000002 */ mul.s $f0, $f0, $f0 -/* CCB6AC 8024039C 00000000 */ nop +/* CCB6AC 8024039C 00000000 */ nop /* CCB6B0 802403A0 46041080 */ add.s $f2, $f2, $f4 /* CCB6B4 802403A4 46001080 */ add.s $f2, $f2, $f0 /* CCB6B8 802403A8 3C014561 */ lui $at, 0x4561 /* CCB6BC 802403AC 44810000 */ mtc1 $at, $f0 -/* CCB6C0 802403B0 00000000 */ nop +/* CCB6C0 802403B0 00000000 */ nop /* CCB6C4 802403B4 4600103C */ c.lt.s $f2, $f0 -/* CCB6C8 802403B8 00000000 */ nop +/* CCB6C8 802403B8 00000000 */ nop /* CCB6CC 802403BC 45010002 */ bc1t .L802403C8 /* CCB6D0 802403C0 24020001 */ addiu $v0, $zero, 1 /* CCB6D4 802403C4 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_8024046C_CCB77C.s b/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_8024046C_CCB77C.s index 59a693cf3b..637e983d82 100644 --- a/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_8024046C_CCB77C.s +++ b/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_8024046C_CCB77C.s @@ -29,7 +29,7 @@ glabel func_8024046C_CCB77C /* CCB7DC 802404CC 44060000 */ mfc1 $a2, $f0 /* CCB7E0 802404D0 44071000 */ mfc1 $a3, $f2 /* CCB7E4 802404D4 44820000 */ mtc1 $v0, $f0 -/* CCB7E8 802404D8 00000000 */ nop +/* CCB7E8 802404D8 00000000 */ nop /* CCB7EC 802404DC 46800020 */ cvt.s.w $f0, $f0 /* CCB7F0 802404E0 AE220078 */ sw $v0, 0x78($s1) /* CCB7F4 802404E4 0C05267B */ jal func_801499EC diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80240B10_CCBE20.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80240B10_CCBE20.s index 8adc8fe739..e36531a2c5 100644 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80240B10_CCBE20.s +++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80240B10_CCBE20.s @@ -47,7 +47,7 @@ glabel func_80240B10_CCBE20 /* CCBEC8 80240BB8 0C0123F5 */ jal is_point_within_region /* CCBECC 80240BBC 8E070038 */ lw $a3, 0x38($s0) /* CCBED0 80240BC0 1040000E */ beqz $v0, .L80240BFC -/* CCBED4 80240BC4 00000000 */ nop +/* CCBED4 80240BC4 00000000 */ nop /* CCBED8 80240BC8 8E2200D0 */ lw $v0, 0xd0($s1) /* CCBEDC 80240BCC C60C0038 */ lwc1 $f12, 0x38($s0) /* CCBEE0 80240BD0 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240B10_CCBE20 /* CCBEF4 80240BE4 468031A0 */ cvt.s.w $f6, $f6 /* CCBEF8 80240BE8 44073000 */ mfc1 $a3, $f6 /* CCBEFC 80240BEC 0C00A720 */ jal atan2 -/* CCBF00 80240BF0 00000000 */ nop +/* CCBF00 80240BF0 00000000 */ nop /* CCBF04 80240BF4 0809030B */ j .L80240C2C /* CCBF08 80240BF8 E600000C */ swc1 $f0, 0xc($s0) .L80240BFC: @@ -66,7 +66,7 @@ glabel func_80240B10_CCBE20 /* CCBF10 80240C00 2404003C */ addiu $a0, $zero, 0x3c /* CCBF14 80240C04 C60C000C */ lwc1 $f12, 0xc($s0) /* CCBF18 80240C08 44820000 */ mtc1 $v0, $f0 -/* CCBF1C 80240C0C 00000000 */ nop +/* CCBF1C 80240C0C 00000000 */ nop /* CCBF20 80240C10 46800020 */ cvt.s.w $f0, $f0 /* CCBF24 80240C14 46006300 */ add.s $f12, $f12, $f0 /* CCBF28 80240C18 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240B10_CCBE20 /* CCBF4C 80240C3C 8E2200D0 */ lw $v0, 0xd0($s1) /* CCBF50 80240C40 8C420014 */ lw $v0, 0x14($v0) /* CCBF54 80240C44 04410004 */ bgez $v0, .L80240C58 -/* CCBF58 80240C48 00000000 */ nop +/* CCBF58 80240C48 00000000 */ nop /* CCBF5C 80240C4C C6400000 */ lwc1 $f0, ($s2) /* CCBF60 80240C50 0809031E */ j .L80240C78 /* CCBF64 80240C54 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240B10_CCBE20 /* CCBF68 80240C58 3C018024 */ lui $at, %hi(D_80245350) /* CCBF6C 80240C5C D4225350 */ ldc1 $f2, %lo(D_80245350)($at) /* CCBF70 80240C60 44820000 */ mtc1 $v0, $f0 -/* CCBF74 80240C64 00000000 */ nop +/* CCBF74 80240C64 00000000 */ nop /* CCBF78 80240C68 46800021 */ cvt.d.w $f0, $f0 /* CCBF7C 80240C6C 46220003 */ div.d $f0, $f0, $f2 /* CCBF80 80240C70 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240B10_CCBE20 /* CCBF94 80240C84 44801000 */ mtc1 $zero, $f2 /* CCBF98 80240C88 46000021 */ cvt.d.s $f0, $f0 /* CCBF9C 80240C8C 46220002 */ mul.d $f0, $f0, $f2 -/* CCBFA0 80240C90 00000000 */ nop +/* CCBFA0 80240C90 00000000 */ nop /* CCBFA4 80240C94 24020001 */ addiu $v0, $zero, 1 /* CCBFA8 80240C98 4620018D */ trunc.w.d $f6, $f0 /* CCBFAC 80240C9C E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80240CC0_CCBFD0.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80240CC0_CCBFD0.s index 5676c2bd1d..fd59743e66 100644 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80240CC0_CCBFD0.s +++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80240CC0_CCBFD0.s @@ -34,7 +34,7 @@ glabel func_80240CC0_CCBFD0 /* CCC044 80240D34 44803000 */ mtc1 $zero, $f6 /* CCC048 80240D38 46000021 */ cvt.d.s $f0, $f0 /* CCC04C 80240D3C 46260002 */ mul.d $f0, $f0, $f6 -/* CCC050 80240D40 00000000 */ nop +/* CCC050 80240D40 00000000 */ nop /* CCC054 80240D44 24020001 */ addiu $v0, $zero, 1 /* CCC058 80240D48 8E24006C */ lw $a0, 0x6c($s1) /* CCC05C 80240D4C 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80240CC0_CCBFD0 /* CCC0B8 80240DA8 C600003C */ lwc1 $f0, 0x3c($s0) /* CCC0BC 80240DAC 4600C001 */ sub.s $f0, $f24, $f0 /* CCC0C0 80240DB0 4600B03C */ c.lt.s $f22, $f0 -/* CCC0C4 80240DB4 00000000 */ nop +/* CCC0C4 80240DB4 00000000 */ nop /* CCC0C8 80240DB8 4500001B */ bc1f .L80240E28 /* CCC0CC 80240DBC 34820010 */ ori $v0, $a0, 0x10 /* CCC0D0 80240DC0 0809038A */ j .L80240E28 @@ -87,9 +87,9 @@ glabel func_80240CC0_CCBFD0 /* CCC114 80240E04 C7A00034 */ lwc1 $f0, 0x34($sp) /* CCC118 80240E08 4600D001 */ sub.s $f0, $f26, $f0 /* CCC11C 80240E0C 4600B03C */ c.lt.s $f22, $f0 -/* CCC120 80240E10 00000000 */ nop +/* CCC120 80240E10 00000000 */ nop /* CCC124 80240E14 45000004 */ bc1f .L80240E28 -/* CCC128 80240E18 00000000 */ nop +/* CCC128 80240E18 00000000 */ nop /* CCC12C 80240E1C 8E22006C */ lw $v0, 0x6c($s1) /* CCC130 80240E20 34420010 */ ori $v0, $v0, 0x10 /* CCC134 80240E24 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80240CC0_CCBFD0 /* CCC13C 80240E2C 24030011 */ addiu $v1, $zero, 0x11 /* CCC140 80240E30 30420011 */ andi $v0, $v0, 0x11 /* CCC144 80240E34 14430039 */ bne $v0, $v1, .L80240F1C -/* CCC148 80240E38 00000000 */ nop +/* CCC148 80240E38 00000000 */ nop /* CCC14C 80240E3C 8E020000 */ lw $v0, ($s0) /* CCC150 80240E40 30420008 */ andi $v0, $v0, 8 /* CCC154 80240E44 1040000A */ beqz $v0, .L80240E70 @@ -108,7 +108,7 @@ glabel func_80240CC0_CCBFD0 /* CCC164 80240E54 D4205358 */ ldc1 $f0, %lo(D_80245358)($at) /* CCC168 80240E58 460010A1 */ cvt.d.s $f2, $f2 /* CCC16C 80240E5C 46201082 */ mul.d $f2, $f2, $f0 -/* CCC170 80240E60 00000000 */ nop +/* CCC170 80240E60 00000000 */ nop /* CCC174 80240E64 4600A021 */ cvt.d.s $f0, $f20 /* CCC178 80240E68 080903B5 */ j .L80240ED4 /* CCC17C 80240E6C 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80240CC0_CCBFD0 /* CCC1CC 80240EBC D4205360 */ ldc1 $f0, %lo(D_80245360)($at) /* CCC1D0 80240EC0 460010A1 */ cvt.d.s $f2, $f2 /* CCC1D4 80240EC4 46201082 */ mul.d $f2, $f2, $f0 -/* CCC1D8 80240EC8 00000000 */ nop +/* CCC1D8 80240EC8 00000000 */ nop /* CCC1DC 80240ECC 4600A021 */ cvt.d.s $f0, $f20 /* CCC1E0 80240ED0 46220000 */ add.d $f0, $f0, $f2 .L80240ED4: @@ -149,7 +149,7 @@ glabel func_80240CC0_CCBFD0 /* CCC200 80240EF0 46000005 */ abs.s $f0, $f0 /* CCC204 80240EF4 46000021 */ cvt.d.s $f0, $f0 /* CCC208 80240EF8 4622003C */ c.lt.d $f0, $f2 -/* CCC20C 80240EFC 00000000 */ nop +/* CCC20C 80240EFC 00000000 */ nop /* CCC210 80240F00 45000036 */ bc1f .L80240FDC /* CCC214 80240F04 2403FFEF */ addiu $v1, $zero, -0x11 /* CCC218 80240F08 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80240CC0_CCBFD0 .L80240F1C: /* CCC22C 80240F1C 8E220070 */ lw $v0, 0x70($s1) /* CCC230 80240F20 1840002E */ blez $v0, .L80240FDC -/* CCC234 80240F24 00000000 */ nop +/* CCC234 80240F24 00000000 */ nop /* CCC238 80240F28 C62C0074 */ lwc1 $f12, 0x74($s1) /* CCC23C 80240F2C 0C00A8BB */ jal sin_deg /* CCC240 80240F30 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80240CC0_CCBFD0 /* CCC298 80240F88 27A70030 */ addiu $a3, $sp, 0x30 .L80240F8C: /* CCC29C 80240F8C 10400007 */ beqz $v0, .L80240FAC -/* CCC2A0 80240F90 00000000 */ nop +/* CCC2A0 80240F90 00000000 */ nop /* CCC2A4 80240F94 4616A082 */ mul.s $f2, $f20, $f22 -/* CCC2A8 80240F98 00000000 */ nop +/* CCC2A8 80240F98 00000000 */ nop /* CCC2AC 80240F9C C7A0002C */ lwc1 $f0, 0x2c($sp) /* CCC2B0 80240FA0 461A0000 */ add.s $f0, $f0, $f26 /* CCC2B4 80240FA4 080903EE */ j .L80240FB8 /* CCC2B8 80240FA8 46020000 */ add.s $f0, $f0, $f2 .L80240FAC: /* CCC2BC 80240FAC 4616A002 */ mul.s $f0, $f20, $f22 -/* CCC2C0 80240FB0 00000000 */ nop +/* CCC2C0 80240FB0 00000000 */ nop /* CCC2C4 80240FB4 4600C000 */ add.s $f0, $f24, $f0 .L80240FB8: /* CCC2C8 80240FB8 E600003C */ swc1 $f0, 0x3c($s0) /* CCC2CC 80240FBC 8E220074 */ lw $v0, 0x74($s1) /* CCC2D0 80240FC0 2442000A */ addiu $v0, $v0, 0xa /* CCC2D4 80240FC4 44826000 */ mtc1 $v0, $f12 -/* CCC2D8 80240FC8 00000000 */ nop +/* CCC2D8 80240FC8 00000000 */ nop /* CCC2DC 80240FCC 0C00A6C9 */ jal clamp_angle /* CCC2E0 80240FD0 46806320 */ cvt.s.w $f12, $f12 /* CCC2E4 80240FD4 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80240CC0_CCBFD0 /* CCC2F4 80240FE4 2442FFFF */ addiu $v0, $v0, -1 /* CCC2F8 80240FE8 8E430014 */ lw $v1, 0x14($s2) /* CCC2FC 80240FEC 04600048 */ bltz $v1, .L80241110 -/* CCC300 80240FF0 00000000 */ nop +/* CCC300 80240FF0 00000000 */ nop /* CCC304 80240FF4 8E620074 */ lw $v0, 0x74($s3) /* CCC308 80240FF8 1C400042 */ bgtz $v0, .L80241104 /* CCC30C 80240FFC 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80240CC0_CCBFD0 /* CCC314 80241004 860200A8 */ lh $v0, 0xa8($s0) /* CCC318 80241008 C602003C */ lwc1 $f2, 0x3c($s0) /* CCC31C 8024100C 44820000 */ mtc1 $v0, $f0 -/* CCC320 80241010 00000000 */ nop +/* CCC320 80241010 00000000 */ nop /* CCC324 80241014 46800020 */ cvt.s.w $f0, $f0 /* CCC328 80241018 46001080 */ add.s $f2, $f2, $f0 /* CCC32C 8024101C 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80240CC0_CCBFD0 /* CCC348 80241038 C440002C */ lwc1 $f0, 0x2c($v0) /* CCC34C 8024103C 46000021 */ cvt.d.s $f0, $f0 /* CCC350 80241040 4622003C */ c.lt.d $f0, $f2 -/* CCC354 80241044 00000000 */ nop +/* CCC354 80241044 00000000 */ nop /* CCC358 80241048 4500002C */ bc1f .L802410FC /* CCC35C 8024104C 02A0202D */ daddu $a0, $s5, $zero /* CCC360 80241050 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80240CC0_CCBFD0 /* CCC39C 8024108C 3C01C1A0 */ lui $at, 0xc1a0 /* CCC3A0 80241090 44812000 */ mtc1 $at, $f4 /* CCC3A4 80241094 44834000 */ mtc1 $v1, $f8 -/* CCC3A8 80241098 00000000 */ nop +/* CCC3A8 80241098 00000000 */ nop /* CCC3AC 8024109C 46804220 */ cvt.s.w $f8, $f8 /* CCC3B0 802410A0 44074000 */ mfc1 $a3, $f8 /* CCC3B4 802410A4 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80240CC0_CCBFD0 /* CCC468 80241158 0C0123F5 */ jal is_point_within_region /* CCC46C 8024115C 8E070038 */ lw $a3, 0x38($s0) /* CCC470 80241160 1040001A */ beqz $v0, .L802411CC -/* CCC474 80241164 00000000 */ nop +/* CCC474 80241164 00000000 */ nop /* CCC478 80241168 8E060038 */ lw $a2, 0x38($s0) /* CCC47C 8024116C 8E2200D0 */ lw $v0, 0xd0($s1) /* CCC480 80241170 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80240CC0_CCBFD0 /* CCC494 80241184 468073A0 */ cvt.s.w $f14, $f14 /* CCC498 80241188 C6020018 */ lwc1 $f2, 0x18($s0) /* CCC49C 8024118C 4600103C */ c.lt.s $f2, $f0 -/* CCC4A0 80241190 00000000 */ nop +/* CCC4A0 80241190 00000000 */ nop /* CCC4A4 80241194 4500000D */ bc1f .L802411CC /* CCC4A8 80241198 E7A00034 */ swc1 $f0, 0x34($sp) /* CCC4AC 8024119C C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80240CC0_CCBFD0 /* CCC4E8 802411D8 00621825 */ or $v1, $v1, $v0 /* CCC4EC 802411DC 00741825 */ or $v1, $v1, $s4 /* CCC4F0 802411E0 10600008 */ beqz $v1, .L80241204 -/* CCC4F4 802411E4 00000000 */ nop +/* CCC4F4 802411E4 00000000 */ nop /* CCC4F8 802411E8 8602008C */ lh $v0, 0x8c($s0) /* CCC4FC 802411EC 14400031 */ bnez $v0, .L802412B4 -/* CCC500 802411F0 00000000 */ nop +/* CCC500 802411F0 00000000 */ nop /* CCC504 802411F4 8E050018 */ lw $a1, 0x18($s0) /* CCC508 802411F8 8E06000C */ lw $a2, 0xc($s0) /* CCC50C 802411FC 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_80240CC0_CCBFD0 /* CCC520 80241210 44801000 */ mtc1 $zero, $f2 /* CCC524 80241214 46000021 */ cvt.d.s $f0, $f0 /* CCC528 80241218 46220002 */ mul.d $f0, $f0, $f2 -/* CCC52C 8024121C 00000000 */ nop +/* CCC52C 8024121C 00000000 */ nop /* CCC530 80241220 4620020D */ trunc.w.d $f8, $f0 /* CCC534 80241224 E628007C */ swc1 $f8, 0x7c($s1) /* CCC538 80241228 8E420004 */ lw $v0, 4($s2) /* CCC53C 8024122C 18400021 */ blez $v0, .L802412B4 -/* CCC540 80241230 00000000 */ nop +/* CCC540 80241230 00000000 */ nop /* CCC544 80241234 8602008E */ lh $v0, 0x8e($s0) /* CCC548 80241238 9603008E */ lhu $v1, 0x8e($s0) /* CCC54C 8024123C 18400005 */ blez $v0, .L80241254 @@ -375,7 +375,7 @@ glabel func_80240CC0_CCBFD0 /* CCC554 80241244 A602008E */ sh $v0, 0x8e($s0) /* CCC558 80241248 00021400 */ sll $v0, $v0, 0x10 /* CCC55C 8024124C 1C400019 */ bgtz $v0, .L802412B4 -/* CCC560 80241250 00000000 */ nop +/* CCC560 80241250 00000000 */ nop .L80241254: /* CCC564 80241254 240403E8 */ addiu $a0, $zero, 0x3e8 /* CCC568 80241258 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80240CC0_CCBFD0 /* CCC5B0 802412A0 18400003 */ blez $v0, .L802412B0 /* CCC5B4 802412A4 28620003 */ slti $v0, $v1, 3 /* CCC5B8 802412A8 10400002 */ beqz $v0, .L802412B4 -/* CCC5BC 802412AC 00000000 */ nop +/* CCC5BC 802412AC 00000000 */ nop .L802412B0: /* CCC5C0 802412B0 AE600070 */ sw $zero, 0x70($s3) .L802412B4: diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802413A8_CCC6B8.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802413A8_CCC6B8.s index 9b030e2efc..161caa9d87 100644 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802413A8_CCC6B8.s +++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802413A8_CCC6B8.s @@ -42,11 +42,11 @@ glabel func_802413A8_CCC6B8 .L8024143C: /* CCC74C 8024143C 8E220070 */ lw $v0, 0x70($s1) /* CCC750 80241440 18400034 */ blez $v0, .L80241514 -/* CCC754 80241444 00000000 */ nop +/* CCC754 80241444 00000000 */ nop /* CCC758 80241448 C62C0074 */ lwc1 $f12, 0x74($s1) /* CCC75C 8024144C 46806320 */ cvt.s.w $f12, $f12 /* CCC760 80241450 44820000 */ mtc1 $v0, $f0 -/* CCC764 80241454 00000000 */ nop +/* CCC764 80241454 00000000 */ nop /* CCC768 80241458 46800020 */ cvt.s.w $f0, $f0 /* CCC76C 8024145C 46000021 */ cvt.d.s $f0, $f0 /* CCC770 80241460 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_802413A8_CCC6B8 /* CCC7D0 802414C0 27A70030 */ addiu $a3, $sp, 0x30 .L802414C4: /* CCC7D4 802414C4 10400007 */ beqz $v0, .L802414E4 -/* CCC7D8 802414C8 00000000 */ nop +/* CCC7D8 802414C8 00000000 */ nop /* CCC7DC 802414CC 4616A082 */ mul.s $f2, $f20, $f22 -/* CCC7E0 802414D0 00000000 */ nop +/* CCC7E0 802414D0 00000000 */ nop /* CCC7E4 802414D4 C7A0002C */ lwc1 $f0, 0x2c($sp) /* CCC7E8 802414D8 46180000 */ add.s $f0, $f0, $f24 /* CCC7EC 802414DC 0809053C */ j .L802414F0 /* CCC7F0 802414E0 46020000 */ add.s $f0, $f0, $f2 .L802414E4: /* CCC7F4 802414E4 4616A002 */ mul.s $f0, $f20, $f22 -/* CCC7F8 802414E8 00000000 */ nop +/* CCC7F8 802414E8 00000000 */ nop /* CCC7FC 802414EC 4600D000 */ add.s $f0, $f26, $f0 .L802414F0: /* CCC800 802414F0 E600003C */ swc1 $f0, 0x3c($s0) /* CCC804 802414F4 8E220074 */ lw $v0, 0x74($s1) /* CCC808 802414F8 2442000A */ addiu $v0, $v0, 0xa /* CCC80C 802414FC 44826000 */ mtc1 $v0, $f12 -/* CCC810 80241500 00000000 */ nop +/* CCC810 80241500 00000000 */ nop /* CCC814 80241504 0C00A6C9 */ jal clamp_angle /* CCC818 80241508 46806320 */ cvt.s.w $f12, $f12 /* CCC81C 8024150C 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_802413A8_CCC6B8 /* CCC830 80241520 860200A8 */ lh $v0, 0xa8($s0) /* CCC834 80241524 C600003C */ lwc1 $f0, 0x3c($s0) /* CCC838 80241528 44821000 */ mtc1 $v0, $f2 -/* CCC83C 8024152C 00000000 */ nop +/* CCC83C 8024152C 00000000 */ nop /* CCC840 80241530 468010A0 */ cvt.s.w $f2, $f2 /* CCC844 80241534 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* CCC848 80241538 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_802413A8_CCC6B8 /* CCC864 80241554 46240000 */ add.d $f0, $f0, $f4 /* CCC868 80241558 460010A1 */ cvt.d.s $f2, $f2 /* CCC86C 8024155C 4620103C */ c.lt.d $f2, $f0 -/* CCC870 80241560 00000000 */ nop +/* CCC870 80241560 00000000 */ nop /* CCC874 80241564 4500002E */ bc1f .L80241620 /* CCC878 80241568 0280202D */ daddu $a0, $s4, $zero /* CCC87C 8024156C 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_802413A8_CCC6B8 /* CCC8BC 802415AC 3C01C1A0 */ lui $at, 0xc1a0 /* CCC8C0 802415B0 44812000 */ mtc1 $at, $f4 /* CCC8C4 802415B4 44834000 */ mtc1 $v1, $f8 -/* CCC8C8 802415B8 00000000 */ nop +/* CCC8C8 802415B8 00000000 */ nop /* CCC8CC 802415BC 46804220 */ cvt.s.w $f8, $f8 /* CCC8D0 802415C0 44074000 */ mfc1 $a3, $f8 /* CCC8D4 802415C4 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_802413A8_CCC6B8 .L80241620: /* CCC930 80241620 8602008C */ lh $v0, 0x8c($s0) /* CCC934 80241624 14400025 */ bnez $v0, .L802416BC -/* CCC938 80241628 00000000 */ nop +/* CCC938 80241628 00000000 */ nop /* CCC93C 8024162C 8602008E */ lh $v0, 0x8e($s0) /* CCC940 80241630 1C400022 */ bgtz $v0, .L802416BC -/* CCC944 80241634 00000000 */ nop +/* CCC944 80241634 00000000 */ nop /* CCC948 80241638 8E620074 */ lw $v0, 0x74($s3) /* CCC94C 8024163C 2442FFFF */ addiu $v0, $v0, -1 /* CCC950 80241640 1840001D */ blez $v0, .L802416B8 @@ -183,7 +183,7 @@ glabel func_802413A8_CCC6B8 /* CCC95C 8024164C 9442002A */ lhu $v0, 0x2a($v0) /* CCC960 80241650 30420010 */ andi $v0, $v0, 0x10 /* CCC964 80241654 14400007 */ bnez $v0, .L80241674 -/* CCC968 80241658 00000000 */ nop +/* CCC968 80241658 00000000 */ nop /* CCC96C 8024165C C600000C */ lwc1 $f0, 0xc($s0) /* CCC970 80241660 3C014334 */ lui $at, 0x4334 /* CCC974 80241664 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802417D0_CCCAE0.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802417D0_CCCAE0.s index 6b0bd83605..94a64af97d 100644 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802417D0_CCCAE0.s +++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802417D0_CCCAE0.s @@ -60,18 +60,18 @@ glabel func_802417D0_CCCAE0 /* CCCBB8 802418A8 C6200038 */ lwc1 $f0, 0x38($s1) /* CCCBBC 802418AC 4600018D */ trunc.w.s $f6, $f0 /* CCCBC0 802418B0 44023000 */ mfc1 $v0, $f6 -/* CCCBC4 802418B4 00000000 */ nop +/* CCCBC4 802418B4 00000000 */ nop /* CCCBC8 802418B8 A6420010 */ sh $v0, 0x10($s2) /* CCCBCC 802418BC C620003C */ lwc1 $f0, 0x3c($s1) /* CCCBD0 802418C0 4600018D */ trunc.w.s $f6, $f0 /* CCCBD4 802418C4 44023000 */ mfc1 $v0, $f6 -/* CCCBD8 802418C8 00000000 */ nop +/* CCCBD8 802418C8 00000000 */ nop /* CCCBDC 802418CC A6420012 */ sh $v0, 0x12($s2) /* CCCBE0 802418D0 C6200040 */ lwc1 $f0, 0x40($s1) /* CCCBE4 802418D4 A2430007 */ sb $v1, 7($s2) /* CCCBE8 802418D8 4600018D */ trunc.w.s $f6, $f0 /* CCCBEC 802418DC 44023000 */ mfc1 $v0, $f6 -/* CCCBF0 802418E0 00000000 */ nop +/* CCCBF0 802418E0 00000000 */ nop /* CCCBF4 802418E4 A6420014 */ sh $v0, 0x14($s2) .L802418E8: /* CCCBF8 802418E8 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241968_CCCC78.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241968_CCCC78.s index 0b01c66e1a..54a855e28f 100644 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241968_CCCC78.s +++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241968_CCCC78.s @@ -42,9 +42,9 @@ glabel func_80241968_CCCC78 /* CCCD0C 802419FC 44801800 */ mtc1 $zero, $f3 /* CCCD10 80241A00 46002021 */ cvt.d.s $f0, $f4 /* CCCD14 80241A04 4620103E */ c.le.d $f2, $f0 -/* CCCD18 80241A08 00000000 */ nop +/* CCCD18 80241A08 00000000 */ nop /* CCCD1C 80241A0C 45000030 */ bc1f .L80241AD0 -/* CCCD20 80241A10 00000000 */ nop +/* CCCD20 80241A10 00000000 */ nop /* CCCD24 80241A14 C600003C */ lwc1 $f0, 0x3c($s0) /* CCCD28 80241A18 46040000 */ add.s $f0, $f0, $f4 /* CCCD2C 80241A1C E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_80241968_CCCC78 /* CCCD8C 80241A7C 27A70020 */ addiu $a3, $sp, 0x20 .L80241A80: /* CCCD90 80241A80 1040000B */ beqz $v0, .L80241AB0 -/* CCCD94 80241A84 00000000 */ nop +/* CCCD94 80241A84 00000000 */ nop /* CCCD98 80241A88 C7A0001C */ lwc1 $f0, 0x1c($sp) /* CCCD9C 80241A8C 46140080 */ add.s $f2, $f0, $f20 /* CCCDA0 80241A90 C600003C */ lwc1 $f0, 0x3c($s0) /* CCCDA4 80241A94 4600103E */ c.le.s $f2, $f0 -/* CCCDA8 80241A98 00000000 */ nop +/* CCCDA8 80241A98 00000000 */ nop /* CCCDAC 80241A9C 4500008D */ bc1f .L80241CD4 -/* CCCDB0 80241AA0 00000000 */ nop +/* CCCDB0 80241AA0 00000000 */ nop /* CCCDB4 80241AA4 E602003C */ swc1 $f2, 0x3c($s0) /* CCCDB8 80241AA8 08090735 */ j .L80241CD4 /* CCCDBC 80241AAC AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_80241968_CCCC78 /* CCCDC0 80241AB0 C602003C */ lwc1 $f2, 0x3c($s0) /* CCCDC4 80241AB4 C6000064 */ lwc1 $f0, 0x64($s0) /* CCCDC8 80241AB8 4602003E */ c.le.s $f0, $f2 -/* CCCDCC 80241ABC 00000000 */ nop +/* CCCDCC 80241ABC 00000000 */ nop /* CCCDD0 80241AC0 45030084 */ bc1tl .L80241CD4 /* CCCDD4 80241AC4 AE400070 */ sw $zero, 0x70($s2) /* CCCDD8 80241AC8 08090735 */ j .L80241CD4 -/* CCCDDC 80241ACC 00000000 */ nop +/* CCCDDC 80241ACC 00000000 */ nop .L80241AD0: /* CCCDE0 80241AD0 4622003C */ c.lt.d $f0, $f2 -/* CCCDE4 80241AD4 00000000 */ nop +/* CCCDE4 80241AD4 00000000 */ nop /* CCCDE8 80241AD8 4500007E */ bc1f .L80241CD4 -/* CCCDEC 80241ADC 00000000 */ nop +/* CCCDEC 80241ADC 00000000 */ nop /* CCCDF0 80241AE0 9602008E */ lhu $v0, 0x8e($s0) /* CCCDF4 80241AE4 24420001 */ addiu $v0, $v0, 1 /* CCCDF8 80241AE8 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_80241968_CCCC78 /* CCCE04 80241AF4 00021403 */ sra $v0, $v0, 0x10 /* CCCE08 80241AF8 0043102A */ slt $v0, $v0, $v1 /* CCCE0C 80241AFC 14400026 */ bnez $v0, .L80241B98 -/* CCCE10 80241B00 00000000 */ nop +/* CCCE10 80241B00 00000000 */ nop /* CCCE14 80241B04 C60C0038 */ lwc1 $f12, 0x38($s0) /* CCCE18 80241B08 C60E0040 */ lwc1 $f14, 0x40($s0) /* CCCE1C 80241B0C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_80241968_CCCC78 /* CCCE48 80241B38 8E62001C */ lw $v0, 0x1c($s3) /* CCCE4C 80241B3C 46001005 */ abs.s $f0, $f2 /* CCCE50 80241B40 44822000 */ mtc1 $v0, $f4 -/* CCCE54 80241B44 00000000 */ nop +/* CCCE54 80241B44 00000000 */ nop /* CCCE58 80241B48 46802120 */ cvt.s.w $f4, $f4 /* CCCE5C 80241B4C 4600203C */ c.lt.s $f4, $f0 -/* CCCE60 80241B50 00000000 */ nop +/* CCCE60 80241B50 00000000 */ nop /* CCCE64 80241B54 4500000D */ bc1f .L80241B8C -/* CCCE68 80241B58 00000000 */ nop +/* CCCE68 80241B58 00000000 */ nop /* CCCE6C 80241B5C 44800000 */ mtc1 $zero, $f0 /* CCCE70 80241B60 C614000C */ lwc1 $f20, 0xc($s0) /* CCCE74 80241B64 4600103C */ c.lt.s $f2, $f0 -/* CCCE78 80241B68 00000000 */ nop +/* CCCE78 80241B68 00000000 */ nop /* CCCE7C 80241B6C 45000006 */ bc1f .L80241B88 /* CCCE80 80241B70 00021023 */ negu $v0, $v0 /* CCCE84 80241B74 44820000 */ mtc1 $v0, $f0 -/* CCCE88 80241B78 00000000 */ nop +/* CCCE88 80241B78 00000000 */ nop /* CCCE8C 80241B7C 46800020 */ cvt.s.w $f0, $f0 /* CCCE90 80241B80 080906E3 */ j .L80241B8C /* CCCE94 80241B84 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_80241968_CCCC78 /* CCCEBC 80241BAC C600001C */ lwc1 $f0, 0x1c($s0) /* CCCEC0 80241BB0 46001080 */ add.s $f2, $f2, $f0 /* CCCEC4 80241BB4 4616103C */ c.lt.s $f2, $f22 -/* CCCEC8 80241BB8 00000000 */ nop +/* CCCEC8 80241BB8 00000000 */ nop /* CCCECC 80241BBC 45020045 */ bc1fl .L80241CD4 /* CCCED0 80241BC0 E602003C */ swc1 $f2, 0x3c($s0) /* CCCED4 80241BC4 08090734 */ j .L80241CD0 @@ -169,7 +169,7 @@ glabel func_80241968_CCCC78 /* CCCEEC 80241BDC C600001C */ lwc1 $f0, 0x1c($s0) /* CCCEF0 80241BE0 C604003C */ lwc1 $f4, 0x3c($s0) /* CCCEF4 80241BE4 44821000 */ mtc1 $v0, $f2 -/* CCCEF8 80241BE8 00000000 */ nop +/* CCCEF8 80241BE8 00000000 */ nop /* CCCEFC 80241BEC 468010A0 */ cvt.s.w $f2, $f2 /* CCCF00 80241BF0 46000005 */ abs.s $f0, $f0 /* CCCF04 80241BF4 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_80241968_CCCC78 /* CCCF40 80241C30 0C0372DF */ jal func_800DCB7C /* CCCF44 80241C34 27A70020 */ addiu $a3, $sp, 0x20 /* CCCF48 80241C38 10400015 */ beqz $v0, .L80241C90 -/* CCCF4C 80241C3C 00000000 */ nop +/* CCCF4C 80241C3C 00000000 */ nop /* CCCF50 80241C40 860200A8 */ lh $v0, 0xa8($s0) /* CCCF54 80241C44 C604001C */ lwc1 $f4, 0x1c($s0) /* CCCF58 80241C48 44820000 */ mtc1 $v0, $f0 -/* CCCF5C 80241C4C 00000000 */ nop +/* CCCF5C 80241C4C 00000000 */ nop /* CCCF60 80241C50 46800020 */ cvt.s.w $f0, $f0 /* CCCF64 80241C54 46002085 */ abs.s $f2, $f4 /* CCCF68 80241C58 46020000 */ add.s $f0, $f0, $f2 /* CCCF6C 80241C5C C7A20024 */ lwc1 $f2, 0x24($sp) /* CCCF70 80241C60 4600103E */ c.le.s $f2, $f0 -/* CCCF74 80241C64 00000000 */ nop +/* CCCF74 80241C64 00000000 */ nop /* CCCF78 80241C68 45000005 */ bc1f .L80241C80 -/* CCCF7C 80241C6C 00000000 */ nop +/* CCCF7C 80241C6C 00000000 */ nop /* CCCF80 80241C70 C7A0001C */ lwc1 $f0, 0x1c($sp) /* CCCF84 80241C74 AE00001C */ sw $zero, 0x1c($s0) /* CCCF88 80241C78 08090735 */ j .L80241CD4 @@ -217,13 +217,13 @@ glabel func_80241968_CCCC78 /* CCCFA4 80241C94 860200A8 */ lh $v0, 0xa8($s0) /* CCCFA8 80241C98 46163081 */ sub.s $f2, $f6, $f22 /* CCCFAC 80241C9C 44820000 */ mtc1 $v0, $f0 -/* CCCFB0 80241CA0 00000000 */ nop +/* CCCFB0 80241CA0 00000000 */ nop /* CCCFB4 80241CA4 46800020 */ cvt.s.w $f0, $f0 /* CCCFB8 80241CA8 46001080 */ add.s $f2, $f2, $f0 /* CCCFBC 80241CAC C604001C */ lwc1 $f4, 0x1c($s0) /* CCCFC0 80241CB0 46002005 */ abs.s $f0, $f4 /* CCCFC4 80241CB4 4602003C */ c.lt.s $f0, $f2 -/* CCCFC8 80241CB8 00000000 */ nop +/* CCCFC8 80241CB8 00000000 */ nop /* CCCFCC 80241CBC 45020005 */ bc1fl .L80241CD4 /* CCCFD0 80241CC0 AE00001C */ sw $zero, 0x1c($s0) /* CCCFD4 80241CC4 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241CF8_CCD008.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241CF8_CCD008.s index efe55f6c01..8599343ff9 100644 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241CF8_CCD008.s +++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241CF8_CCD008.s @@ -49,15 +49,15 @@ glabel func_80241CF8_CCD008 /* CCD0B0 80241DA0 44802000 */ mtc1 $zero, $f4 /* CCD0B4 80241DA4 460010A1 */ cvt.d.s $f2, $f2 /* CCD0B8 80241DA8 46241082 */ mul.d $f2, $f2, $f4 -/* CCD0BC 80241DAC 00000000 */ nop +/* CCD0BC 80241DAC 00000000 */ nop /* CCD0C0 80241DB0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* CCD0C4 80241DB4 46000021 */ cvt.d.s $f0, $f0 /* CCD0C8 80241DB8 46240002 */ mul.d $f0, $f0, $f4 -/* CCD0CC 80241DBC 00000000 */ nop +/* CCD0CC 80241DBC 00000000 */ nop /* CCD0D0 80241DC0 3C013FE0 */ lui $at, 0x3fe0 /* CCD0D4 80241DC4 44812800 */ mtc1 $at, $f5 /* CCD0D8 80241DC8 44802000 */ mtc1 $zero, $f4 -/* CCD0DC 80241DCC 00000000 */ nop +/* CCD0DC 80241DCC 00000000 */ nop /* CCD0E0 80241DD0 46241080 */ add.d $f2, $f2, $f4 /* CCD0E4 80241DD4 AE000074 */ sw $zero, 0x74($s0) /* CCD0E8 80241DD8 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s index 3f4d4ca4ae..31c9363115 100644 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s +++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s @@ -54,7 +54,7 @@ glabel func_80241E1C_CCD12C /* CCD1EC 80241EDC 8E4300B0 */ lw $v1, 0xb0($s2) /* CCD1F0 80241EE0 30620004 */ andi $v0, $v1, 4 /* CCD1F4 80241EE4 10400007 */ beqz $v0, .L80241F04 -/* CCD1F8 80241EE8 00000000 */ nop +/* CCD1F8 80241EE8 00000000 */ nop /* CCD1FC 80241EEC 824200B4 */ lb $v0, 0xb4($s2) /* CCD200 80241EF0 1440003C */ bnez $v0, .L80241FE4 /* CCD204 80241EF4 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_80241E1C_CCD12C /* CCD218 80241F08 2C62000F */ sltiu $v0, $v1, 0xf /* CCD21C 80241F0C 10400034 */ beqz $v0, .L80241FE0 /* CCD220 80241F10 00031080 */ sll $v0, $v1, 2 -/* CCD224 80241F14 3C018024 */ lui $at, %hi(D_80245368) +/* CCD224 80241F14 3C018024 */ lui $at, %hi(jtbl_80245368_CD0678) /* CCD228 80241F18 00220821 */ addu $at, $at, $v0 -/* CCD22C 80241F1C 8C225368 */ lw $v0, %lo(D_80245368)($at) +/* CCD22C 80241F1C 8C225368 */ lw $v0, %lo(jtbl_80245368_CD0678)($at) /* CCD230 80241F20 00400008 */ jr $v0 -/* CCD234 80241F24 00000000 */ nop +/* CCD234 80241F24 00000000 */ nop +glabel L80241F28_CCD238 /* CCD238 80241F28 0280202D */ daddu $a0, $s4, $zero /* CCD23C 80241F2C 0200282D */ daddu $a1, $s0, $zero /* CCD240 80241F30 0C0902C4 */ jal func_80240B10_CCBE20 /* CCD244 80241F34 0260302D */ daddu $a2, $s3, $zero +glabel L80241F38_CCD248 /* CCD248 80241F38 0280202D */ daddu $a0, $s4, $zero /* CCD24C 80241F3C 0200282D */ daddu $a1, $s0, $zero /* CCD250 80241F40 0C090330 */ jal func_80240CC0_CCBFD0 /* CCD254 80241F44 0260302D */ daddu $a2, $s3, $zero /* CCD258 80241F48 080907F9 */ j .L80241FE4 /* CCD25C 80241F4C 0000102D */ daddu $v0, $zero, $zero +glabel L80241F50_CCD260 /* CCD260 80241F50 0280202D */ daddu $a0, $s4, $zero /* CCD264 80241F54 0200282D */ daddu $a1, $s0, $zero /* CCD268 80241F58 0C0904BA */ jal flo_14_UnkNpcAIFunc1 /* CCD26C 80241F5C 0260302D */ daddu $a2, $s3, $zero +glabel L80241F60_CCD270 /* CCD270 80241F60 0280202D */ daddu $a0, $s4, $zero /* CCD274 80241F64 0200282D */ daddu $a1, $s0, $zero /* CCD278 80241F68 0C0904EA */ jal func_802413A8_CCC6B8 /* CCD27C 80241F6C 0260302D */ daddu $a2, $s3, $zero /* CCD280 80241F70 080907F9 */ j .L80241FE4 /* CCD284 80241F74 0000102D */ daddu $v0, $zero, $zero +glabel L80241F78_CCD288 /* CCD288 80241F78 0280202D */ daddu $a0, $s4, $zero /* CCD28C 80241F7C 0200282D */ daddu $a1, $s0, $zero /* CCD290 80241F80 0C0905BB */ jal flo_14_UnkNpcAIFunc2 /* CCD294 80241F84 0260302D */ daddu $a2, $s3, $zero +glabel L80241F88_CCD298 /* CCD298 80241F88 0280202D */ daddu $a0, $s4, $zero /* CCD29C 80241F8C 0200282D */ daddu $a1, $s0, $zero /* CCD2A0 80241F90 0C0905D9 */ jal func_80241764_CCCA74 /* CCD2A4 80241F94 0260302D */ daddu $a2, $s3, $zero /* CCD2A8 80241F98 080907F9 */ j .L80241FE4 /* CCD2AC 80241F9C 0000102D */ daddu $v0, $zero, $zero +glabel L80241FA0_CCD2B0 /* CCD2B0 80241FA0 0280202D */ daddu $a0, $s4, $zero /* CCD2B4 80241FA4 0200282D */ daddu $a1, $s0, $zero /* CCD2B8 80241FA8 0C0905F4 */ jal func_802417D0_CCCAE0 /* CCD2BC 80241FAC 0260302D */ daddu $a2, $s3, $zero /* CCD2C0 80241FB0 080907F9 */ j .L80241FE4 /* CCD2C4 80241FB4 0000102D */ daddu $v0, $zero, $zero +glabel L80241FB8_CCD2C8 /* CCD2C8 80241FB8 0280202D */ daddu $a0, $s4, $zero /* CCD2CC 80241FBC 0200282D */ daddu $a1, $s0, $zero /* CCD2D0 80241FC0 0C090641 */ jal flo_14_UnkNpcAIFunc3 /* CCD2D4 80241FC4 0260302D */ daddu $a2, $s3, $zero /* CCD2D8 80241FC8 080907F9 */ j .L80241FE4 /* CCD2DC 80241FCC 0000102D */ daddu $v0, $zero, $zero +glabel L80241FD0_CCD2E0 /* CCD2E0 80241FD0 0280202D */ daddu $a0, $s4, $zero /* CCD2E4 80241FD4 0200282D */ daddu $a1, $s0, $zero /* CCD2E8 80241FD8 0C09065A */ jal func_80241968_CCCC78 /* CCD2EC 80241FDC 0260302D */ daddu $a2, $s3, $zero .L80241FE0: +glabel L80241FE0_CCD2F0 /* CCD2F0 80241FE0 0000102D */ daddu $v0, $zero, $zero .L80241FE4: /* CCD2F4 80241FE4 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802422C0_CCD5D0.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802422C0_CCD5D0.s index 6831e91172..7ab748019a 100644 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802422C0_CCD5D0.s +++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802422C0_CCD5D0.s @@ -28,7 +28,7 @@ glabel func_802422C0_CCD5D0 /* CCD624 80242314 00220821 */ addu $at, $at, $v0 /* CCD628 80242318 AC2053B0 */ sw $zero, %lo(D_802453B0)($at) /* CCD62C 8024231C 080908D3 */ j .L8024234C -/* CCD630 80242320 00000000 */ nop +/* CCD630 80242320 00000000 */ nop .L80242324: /* CCD634 80242324 3C038024 */ lui $v1, %hi(D_802453B0) /* CCD638 80242328 246353B0 */ addiu $v1, $v1, %lo(D_802453B0) @@ -46,4 +46,4 @@ glabel func_802422C0_CCD5D0 /* CCD660 80242350 24020002 */ addiu $v0, $zero, 2 /* CCD664 80242354 03E00008 */ jr $ra /* CCD668 80242358 27BD0018 */ addiu $sp, $sp, 0x18 -/* CCD66C 8024235C 00000000 */ nop +/* CCD66C 8024235C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCD670/func_80242360_CCD670.s b/asm/nonmatchings/world/area_flo/flo_14/CCD670/func_80242360_CCD670.s index b26e143298..1072091f0d 100644 --- a/asm/nonmatchings/world/area_flo/flo_14/CCD670/func_80242360_CCD670.s +++ b/asm/nonmatchings/world/area_flo/flo_14/CCD670/func_80242360_CCD670.s @@ -13,4 +13,4 @@ glabel func_80242360_CCD670 /* CCD690 80242380 24020002 */ addiu $v0, $zero, 2 /* CCD694 80242384 03E00008 */ jr $ra /* CCD698 80242388 27BD0018 */ addiu $sp, $sp, 0x18 -/* CCD69C 8024238C 00000000 */ nop +/* CCD69C 8024238C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1E30/func_80240000_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/CD1E30/func_80240000_CD1E30.s index 3d9ddbd4ad..a886f68b83 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD1E30/func_80240000_CD1E30.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD1E30/func_80240000_CD1E30.s @@ -15,6 +15,6 @@ glabel func_80240000_CD1E30 /* CD1E58 80240028 24020002 */ addiu $v0, $zero, 2 /* CD1E5C 8024002C 03E00008 */ jr $ra /* CD1E60 80240030 27BD0020 */ addiu $sp, $sp, 0x20 -/* CD1E64 80240034 00000000 */ nop -/* CD1E68 80240038 00000000 */ nop -/* CD1E6C 8024003C 00000000 */ nop +/* CD1E64 80240034 00000000 */ nop +/* CD1E68 80240038 00000000 */ nop +/* CD1E6C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1E70/func_80240040_CD1E70.s b/asm/nonmatchings/world/area_flo/flo_16/CD1E70/func_80240040_CD1E70.s index 7c82b6e2f7..e8c86241b2 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD1E70/func_80240040_CD1E70.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD1E70/func_80240040_CD1E70.s @@ -6,33 +6,33 @@ glabel func_80240040_CD1E70 /* CD1E74 80240044 8C830090 */ lw $v1, 0x90($a0) /* CD1E78 80240048 00431023 */ subu $v0, $v0, $v1 /* CD1E7C 8024004C 44821000 */ mtc1 $v0, $f2 -/* CD1E80 80240050 00000000 */ nop +/* CD1E80 80240050 00000000 */ nop /* CD1E84 80240054 468010A0 */ cvt.s.w $f2, $f2 /* CD1E88 80240058 8C820088 */ lw $v0, 0x88($a0) /* CD1E8C 8024005C 8C830094 */ lw $v1, 0x94($a0) /* CD1E90 80240060 46021082 */ mul.s $f2, $f2, $f2 -/* CD1E94 80240064 00000000 */ nop +/* CD1E94 80240064 00000000 */ nop /* CD1E98 80240068 00431023 */ subu $v0, $v0, $v1 /* CD1E9C 8024006C 44822000 */ mtc1 $v0, $f4 -/* CD1EA0 80240070 00000000 */ nop +/* CD1EA0 80240070 00000000 */ nop /* CD1EA4 80240074 46802120 */ cvt.s.w $f4, $f4 /* CD1EA8 80240078 8C82008C */ lw $v0, 0x8c($a0) /* CD1EAC 8024007C 46042102 */ mul.s $f4, $f4, $f4 -/* CD1EB0 80240080 00000000 */ nop +/* CD1EB0 80240080 00000000 */ nop /* CD1EB4 80240084 8C830098 */ lw $v1, 0x98($a0) /* CD1EB8 80240088 00431023 */ subu $v0, $v0, $v1 /* CD1EBC 8024008C 44820000 */ mtc1 $v0, $f0 -/* CD1EC0 80240090 00000000 */ nop +/* CD1EC0 80240090 00000000 */ nop /* CD1EC4 80240094 46800020 */ cvt.s.w $f0, $f0 /* CD1EC8 80240098 46000002 */ mul.s $f0, $f0, $f0 -/* CD1ECC 8024009C 00000000 */ nop +/* CD1ECC 8024009C 00000000 */ nop /* CD1ED0 802400A0 46041080 */ add.s $f2, $f2, $f4 /* CD1ED4 802400A4 46001080 */ add.s $f2, $f2, $f0 /* CD1ED8 802400A8 3C014561 */ lui $at, 0x4561 /* CD1EDC 802400AC 44810000 */ mtc1 $at, $f0 -/* CD1EE0 802400B0 00000000 */ nop +/* CD1EE0 802400B0 00000000 */ nop /* CD1EE4 802400B4 4600103C */ c.lt.s $f2, $f0 -/* CD1EE8 802400B8 00000000 */ nop +/* CD1EE8 802400B8 00000000 */ nop /* CD1EEC 802400BC 45010002 */ bc1t .L802400C8 /* CD1EF0 802400C0 24020001 */ addiu $v0, $zero, 1 /* CD1EF4 802400C4 0000102D */ daddu $v0, $zero, $zero @@ -40,6 +40,6 @@ glabel func_80240040_CD1E70 /* CD1EF8 802400C8 AC820084 */ sw $v0, 0x84($a0) /* CD1EFC 802400CC 03E00008 */ jr $ra /* CD1F00 802400D0 24020002 */ addiu $v0, $zero, 2 -/* CD1F04 802400D4 00000000 */ nop -/* CD1F08 802400D8 00000000 */ nop -/* CD1F0C 802400DC 00000000 */ nop +/* CD1F04 802400D4 00000000 */ nop +/* CD1F08 802400D8 00000000 */ nop +/* CD1F0C 802400DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802401B4_CD1FE4.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802401B4_CD1FE4.s index e91a92f61a..3c7d376af0 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802401B4_CD1FE4.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802401B4_CD1FE4.s @@ -8,7 +8,7 @@ glabel func_802401B4_CD1FE4 /* CD1FF0 802401C0 00822021 */ addu $a0, $a0, $v0 /* CD1FF4 802401C4 90820014 */ lbu $v0, 0x14($a0) /* CD1FF8 802401C8 10400009 */ beqz $v0, .L802401F0 -/* CD1FFC 802401CC 00000000 */ nop +/* CD1FFC 802401CC 00000000 */ nop /* CD2000 802401D0 90820015 */ lbu $v0, 0x15($a0) /* CD2004 802401D4 00022600 */ sll $a0, $v0, 0x18 /* CD2008 802401D8 00041E03 */ sra $v1, $a0, 0x18 @@ -16,7 +16,7 @@ glabel func_802401B4_CD1FE4 /* CD2010 802401E0 00021403 */ sra $v0, $v0, 0x10 /* CD2014 802401E4 0043102A */ slt $v0, $v0, $v1 /* CD2018 802401E8 10400003 */ beqz $v0, .L802401F8 -/* CD201C 802401EC 00000000 */ nop +/* CD201C 802401EC 00000000 */ nop .L802401F0: /* CD2020 802401F0 03E00008 */ jr $ra /* CD2024 802401F4 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802402AC_CD20DC.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802402AC_CD20DC.s index a2debf1f55..84a41feb90 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802402AC_CD20DC.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802402AC_CD20DC.s @@ -108,20 +108,20 @@ glabel func_802402AC_CD20DC /* CD2264 80240434 10400009 */ beqz $v0, .L8024045C /* CD2268 80240438 AEA20074 */ sw $v0, 0x74($s5) /* CD226C 8024043C 0C03C4EC */ jal func_800F13B0 -/* CD2270 80240440 00000000 */ nop +/* CD2270 80240440 00000000 */ nop /* CD2274 80240444 8EA20070 */ lw $v0, 0x70($s5) /* CD2278 80240448 24420001 */ addiu $v0, $v0, 1 .L8024044C: /* CD227C 8024044C AEA20070 */ sw $v0, 0x70($s5) /* CD2280 80240450 2842000F */ slti $v0, $v0, 0xf /* CD2284 80240454 10400003 */ beqz $v0, .L80240464 -/* CD2288 80240458 00000000 */ nop +/* CD2288 80240458 00000000 */ nop .L8024045C: /* CD228C 8024045C 08090133 */ j .L802404CC /* CD2290 80240460 0000102D */ daddu $v0, $zero, $zero .L80240464: /* CD2294 80240464 0C03C54E */ jal func_800F1538 -/* CD2298 80240468 00000000 */ nop +/* CD2298 80240468 00000000 */ nop /* CD229C 8024046C 8EA30074 */ lw $v1, 0x74($s5) /* CD22A0 80240470 240200FF */ addiu $v0, $zero, 0xff /* CD22A4 80240474 10620010 */ beq $v1, $v0, .L802404B8 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802406E0_CD2510.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802406E0_CD2510.s index d5991a28ee..73f8200a32 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802406E0_CD2510.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802406E0_CD2510.s @@ -36,7 +36,7 @@ glabel func_802406E0_CD2510 /* CD258C 8024075C 0C00A88D */ jal sin_cos_deg /* CD2590 80240760 0040A82D */ daddu $s5, $v0, $zero /* CD2594 80240764 1200005D */ beqz $s0, .L802408DC -/* CD2598 80240768 00000000 */ nop +/* CD2598 80240768 00000000 */ nop /* CD259C 8024076C 0C00AB0A */ jal general_heap_malloc /* CD25A0 80240770 24040068 */ addiu $a0, $zero, 0x68 /* CD25A4 80240774 0040902D */ daddu $s2, $v0, $zero @@ -98,10 +98,10 @@ glabel func_802406E0_CD2510 /* CD267C 8024084C C7A2001C */ lwc1 $f2, 0x1c($sp) /* CD2680 80240850 C7A40020 */ lwc1 $f4, 0x20($sp) /* CD2684 80240854 46041082 */ mul.s $f2, $f2, $f4 -/* CD2688 80240858 00000000 */ nop +/* CD2688 80240858 00000000 */ nop /* CD268C 8024085C C7A00018 */ lwc1 $f0, 0x18($sp) /* CD2690 80240860 46040002 */ mul.s $f0, $f0, $f4 -/* CD2694 80240864 00000000 */ nop +/* CD2694 80240864 00000000 */ nop /* CD2698 80240868 E6020038 */ swc1 $f2, 0x38($s0) /* CD269C 8024086C E6000050 */ swc1 $f0, 0x50($s0) /* CD26A0 80240870 8E42005C */ lw $v0, 0x5c($s2) @@ -142,12 +142,12 @@ glabel func_802406E0_CD2510 /* CD2728 802408F8 10600007 */ beqz $v1, .L80240918 /* CD272C 802408FC 24040005 */ addiu $a0, $zero, 5 /* CD2730 80240900 080902AC */ j .L80240AB0 -/* CD2734 80240904 00000000 */ nop +/* CD2734 80240904 00000000 */ nop .L80240908: /* CD2738 80240908 10620058 */ beq $v1, $v0, .L80240A6C -/* CD273C 8024090C 00000000 */ nop +/* CD273C 8024090C 00000000 */ nop /* CD2740 80240910 080902AC */ j .L80240AB0 -/* CD2744 80240914 00000000 */ nop +/* CD2744 80240914 00000000 */ nop .L80240918: /* CD2748 80240918 0000882D */ daddu $s1, $zero, $zero /* CD274C 8024091C 3C148024 */ lui $s4, %hi(func_80243758_A2D998) @@ -174,11 +174,11 @@ glabel func_802406E0_CD2510 /* CD279C 8024096C C7A4001C */ lwc1 $f4, 0x1c($sp) /* CD27A0 80240970 C7A00020 */ lwc1 $f0, 0x20($sp) /* CD27A4 80240974 46002102 */ mul.s $f4, $f4, $f0 -/* CD27A8 80240978 00000000 */ nop +/* CD27A8 80240978 00000000 */ nop /* CD27AC 8024097C C7A20018 */ lwc1 $f2, 0x18($sp) /* CD27B0 80240980 26940004 */ addiu $s4, $s4, 4 /* CD27B4 80240984 46001082 */ mul.s $f2, $f2, $f0 -/* CD27B8 80240988 00000000 */ nop +/* CD27B8 80240988 00000000 */ nop /* CD27BC 8024098C 26730004 */ addiu $s3, $s3, 4 /* CD27C0 80240990 26310001 */ addiu $s1, $s1, 1 /* CD27C4 80240994 2A220003 */ slti $v0, $s1, 3 @@ -215,11 +215,11 @@ glabel func_802406E0_CD2510 /* CD2838 80240A08 C7A4001C */ lwc1 $f4, 0x1c($sp) /* CD283C 80240A0C C7A00020 */ lwc1 $f0, 0x20($sp) /* CD2840 80240A10 46002102 */ mul.s $f4, $f4, $f0 -/* CD2844 80240A14 00000000 */ nop +/* CD2844 80240A14 00000000 */ nop /* CD2848 80240A18 C7A20018 */ lwc1 $f2, 0x18($sp) /* CD284C 80240A1C 26940004 */ addiu $s4, $s4, 4 /* CD2850 80240A20 46001082 */ mul.s $f2, $f2, $f0 -/* CD2854 80240A24 00000000 */ nop +/* CD2854 80240A24 00000000 */ nop /* CD2858 80240A28 26730004 */ addiu $s3, $s3, 4 /* CD285C 80240A2C 26310001 */ addiu $s1, $s1, 1 /* CD2860 80240A30 2A220003 */ slti $v0, $s1, 3 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240C18_CD2A48.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240C18_CD2A48.s index 394076ea91..e362416627 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240C18_CD2A48.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240C18_CD2A48.s @@ -36,16 +36,16 @@ glabel func_80240C18_CD2A48 /* CD2AC0 80240C90 10600007 */ beqz $v1, .L80240CB0 /* CD2AC4 80240C94 240500FF */ addiu $a1, $zero, 0xff /* CD2AC8 80240C98 0809034A */ j .L80240D28 -/* CD2ACC 80240C9C 00000000 */ nop +/* CD2ACC 80240C9C 00000000 */ nop .L80240CA0: /* CD2AD0 80240CA0 10620019 */ beq $v1, $v0, .L80240D08 -/* CD2AD4 80240CA4 00000000 */ nop +/* CD2AD4 80240CA4 00000000 */ nop /* CD2AD8 80240CA8 0809034A */ j .L80240D28 -/* CD2ADC 80240CAC 00000000 */ nop +/* CD2ADC 80240CAC 00000000 */ nop .L80240CB0: /* CD2AE0 80240CB0 8E220074 */ lw $v0, 0x74($s1) /* CD2AE4 80240CB4 14450004 */ bne $v0, $a1, .L80240CC8 -/* CD2AE8 80240CB8 00000000 */ nop +/* CD2AE8 80240CB8 00000000 */ nop /* CD2AEC 80240CBC AE240070 */ sw $a0, 0x70($s1) /* CD2AF0 80240CC0 AE200078 */ sw $zero, 0x78($s1) /* CD2AF4 80240CC4 8E220074 */ lw $v0, 0x74($s1) @@ -57,7 +57,7 @@ glabel func_80240C18_CD2A48 /* CD2B08 80240CD8 50400013 */ beql $v0, $zero, .L80240D28 /* CD2B0C 80240CDC AE250074 */ sw $a1, 0x74($s1) /* CD2B10 80240CE0 0809034A */ j .L80240D28 -/* CD2B14 80240CE4 00000000 */ nop +/* CD2B14 80240CE4 00000000 */ nop .L80240CE8: /* CD2B18 80240CE8 8E220078 */ lw $v0, 0x78($s1) /* CD2B1C 80240CEC 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240E18_CD2C48.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240E18_CD2C48.s index ce539dd5a3..03598b2c13 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240E18_CD2C48.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240E18_CD2C48.s @@ -16,5 +16,5 @@ glabel func_80240E18_CD2C48 .L80240E40: /* CD2C70 80240E40 03E00008 */ jr $ra /* CD2C74 80240E44 24020002 */ addiu $v0, $zero, 2 -/* CD2C78 80240E48 00000000 */ nop -/* CD2C7C 80240E4C 00000000 */ nop +/* CD2C78 80240E48 00000000 */ nop +/* CD2C7C 80240E4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80240E50_CD2C80.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80240E50_CD2C80.s index 07ca94cddd..7ff5bd829c 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80240E50_CD2C80.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80240E50_CD2C80.s @@ -47,7 +47,7 @@ glabel func_80240E50_CD2C80 /* CD2D28 80240EF8 0C0123F5 */ jal is_point_within_region /* CD2D2C 80240EFC 8E070038 */ lw $a3, 0x38($s0) /* CD2D30 80240F00 1040000E */ beqz $v0, .L80240F3C -/* CD2D34 80240F04 00000000 */ nop +/* CD2D34 80240F04 00000000 */ nop /* CD2D38 80240F08 8E2200D0 */ lw $v0, 0xd0($s1) /* CD2D3C 80240F0C C60C0038 */ lwc1 $f12, 0x38($s0) /* CD2D40 80240F10 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240E50_CD2C80 /* CD2D54 80240F24 468031A0 */ cvt.s.w $f6, $f6 /* CD2D58 80240F28 44073000 */ mfc1 $a3, $f6 /* CD2D5C 80240F2C 0C00A720 */ jal atan2 -/* CD2D60 80240F30 00000000 */ nop +/* CD2D60 80240F30 00000000 */ nop /* CD2D64 80240F34 080903DB */ j .L80240F6C /* CD2D68 80240F38 E600000C */ swc1 $f0, 0xc($s0) .L80240F3C: @@ -66,7 +66,7 @@ glabel func_80240E50_CD2C80 /* CD2D70 80240F40 2404003C */ addiu $a0, $zero, 0x3c /* CD2D74 80240F44 C60C000C */ lwc1 $f12, 0xc($s0) /* CD2D78 80240F48 44820000 */ mtc1 $v0, $f0 -/* CD2D7C 80240F4C 00000000 */ nop +/* CD2D7C 80240F4C 00000000 */ nop /* CD2D80 80240F50 46800020 */ cvt.s.w $f0, $f0 /* CD2D84 80240F54 46006300 */ add.s $f12, $f12, $f0 /* CD2D88 80240F58 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240E50_CD2C80 /* CD2DAC 80240F7C 8E2200D0 */ lw $v0, 0xd0($s1) /* CD2DB0 80240F80 8C420014 */ lw $v0, 0x14($v0) /* CD2DB4 80240F84 04410004 */ bgez $v0, .L80240F98 -/* CD2DB8 80240F88 00000000 */ nop +/* CD2DB8 80240F88 00000000 */ nop /* CD2DBC 80240F8C C6400000 */ lwc1 $f0, ($s2) /* CD2DC0 80240F90 080903EE */ j .L80240FB8 /* CD2DC4 80240F94 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240E50_CD2C80 /* CD2DC8 80240F98 3C018024 */ lui $at, %hi(D_802453F0) /* CD2DCC 80240F9C D42253F0 */ ldc1 $f2, %lo(D_802453F0)($at) /* CD2DD0 80240FA0 44820000 */ mtc1 $v0, $f0 -/* CD2DD4 80240FA4 00000000 */ nop +/* CD2DD4 80240FA4 00000000 */ nop /* CD2DD8 80240FA8 46800021 */ cvt.d.w $f0, $f0 /* CD2DDC 80240FAC 46220003 */ div.d $f0, $f0, $f2 /* CD2DE0 80240FB0 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240E50_CD2C80 /* CD2DF4 80240FC4 44801000 */ mtc1 $zero, $f2 /* CD2DF8 80240FC8 46000021 */ cvt.d.s $f0, $f0 /* CD2DFC 80240FCC 46220002 */ mul.d $f0, $f0, $f2 -/* CD2E00 80240FD0 00000000 */ nop +/* CD2E00 80240FD0 00000000 */ nop /* CD2E04 80240FD4 24020001 */ addiu $v0, $zero, 1 /* CD2E08 80240FD8 4620018D */ trunc.w.d $f6, $f0 /* CD2E0C 80240FDC E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241000_CD2E30.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241000_CD2E30.s index 0e4013257b..045560b5c3 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241000_CD2E30.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241000_CD2E30.s @@ -34,7 +34,7 @@ glabel func_80241000_CD2E30 /* CD2EA4 80241074 44803000 */ mtc1 $zero, $f6 /* CD2EA8 80241078 46000021 */ cvt.d.s $f0, $f0 /* CD2EAC 8024107C 46260002 */ mul.d $f0, $f0, $f6 -/* CD2EB0 80241080 00000000 */ nop +/* CD2EB0 80241080 00000000 */ nop /* CD2EB4 80241084 24020001 */ addiu $v0, $zero, 1 /* CD2EB8 80241088 8E24006C */ lw $a0, 0x6c($s1) /* CD2EBC 8024108C 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80241000_CD2E30 /* CD2F18 802410E8 C600003C */ lwc1 $f0, 0x3c($s0) /* CD2F1C 802410EC 4600C001 */ sub.s $f0, $f24, $f0 /* CD2F20 802410F0 4600B03C */ c.lt.s $f22, $f0 -/* CD2F24 802410F4 00000000 */ nop +/* CD2F24 802410F4 00000000 */ nop /* CD2F28 802410F8 4500001B */ bc1f .L80241168 /* CD2F2C 802410FC 34820010 */ ori $v0, $a0, 0x10 /* CD2F30 80241100 0809045A */ j .L80241168 @@ -87,9 +87,9 @@ glabel func_80241000_CD2E30 /* CD2F74 80241144 C7A00034 */ lwc1 $f0, 0x34($sp) /* CD2F78 80241148 4600D001 */ sub.s $f0, $f26, $f0 /* CD2F7C 8024114C 4600B03C */ c.lt.s $f22, $f0 -/* CD2F80 80241150 00000000 */ nop +/* CD2F80 80241150 00000000 */ nop /* CD2F84 80241154 45000004 */ bc1f .L80241168 -/* CD2F88 80241158 00000000 */ nop +/* CD2F88 80241158 00000000 */ nop /* CD2F8C 8024115C 8E22006C */ lw $v0, 0x6c($s1) /* CD2F90 80241160 34420010 */ ori $v0, $v0, 0x10 /* CD2F94 80241164 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80241000_CD2E30 /* CD2F9C 8024116C 24030011 */ addiu $v1, $zero, 0x11 /* CD2FA0 80241170 30420011 */ andi $v0, $v0, 0x11 /* CD2FA4 80241174 14430039 */ bne $v0, $v1, .L8024125C -/* CD2FA8 80241178 00000000 */ nop +/* CD2FA8 80241178 00000000 */ nop /* CD2FAC 8024117C 8E020000 */ lw $v0, ($s0) /* CD2FB0 80241180 30420008 */ andi $v0, $v0, 8 /* CD2FB4 80241184 1040000A */ beqz $v0, .L802411B0 @@ -108,7 +108,7 @@ glabel func_80241000_CD2E30 /* CD2FC4 80241194 D42053F8 */ ldc1 $f0, %lo(D_802453F8)($at) /* CD2FC8 80241198 460010A1 */ cvt.d.s $f2, $f2 /* CD2FCC 8024119C 46201082 */ mul.d $f2, $f2, $f0 -/* CD2FD0 802411A0 00000000 */ nop +/* CD2FD0 802411A0 00000000 */ nop /* CD2FD4 802411A4 4600A021 */ cvt.d.s $f0, $f20 /* CD2FD8 802411A8 08090485 */ j .L80241214 /* CD2FDC 802411AC 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80241000_CD2E30 /* CD302C 802411FC D4205400 */ ldc1 $f0, %lo(D_80245400)($at) /* CD3030 80241200 460010A1 */ cvt.d.s $f2, $f2 /* CD3034 80241204 46201082 */ mul.d $f2, $f2, $f0 -/* CD3038 80241208 00000000 */ nop +/* CD3038 80241208 00000000 */ nop /* CD303C 8024120C 4600A021 */ cvt.d.s $f0, $f20 /* CD3040 80241210 46220000 */ add.d $f0, $f0, $f2 .L80241214: @@ -149,7 +149,7 @@ glabel func_80241000_CD2E30 /* CD3060 80241230 46000005 */ abs.s $f0, $f0 /* CD3064 80241234 46000021 */ cvt.d.s $f0, $f0 /* CD3068 80241238 4622003C */ c.lt.d $f0, $f2 -/* CD306C 8024123C 00000000 */ nop +/* CD306C 8024123C 00000000 */ nop /* CD3070 80241240 45000036 */ bc1f .L8024131C /* CD3074 80241244 2403FFEF */ addiu $v1, $zero, -0x11 /* CD3078 80241248 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80241000_CD2E30 .L8024125C: /* CD308C 8024125C 8E220070 */ lw $v0, 0x70($s1) /* CD3090 80241260 1840002E */ blez $v0, .L8024131C -/* CD3094 80241264 00000000 */ nop +/* CD3094 80241264 00000000 */ nop /* CD3098 80241268 C62C0074 */ lwc1 $f12, 0x74($s1) /* CD309C 8024126C 0C00A8BB */ jal sin_deg /* CD30A0 80241270 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80241000_CD2E30 /* CD30F8 802412C8 27A70030 */ addiu $a3, $sp, 0x30 .L802412CC: /* CD30FC 802412CC 10400007 */ beqz $v0, .L802412EC -/* CD3100 802412D0 00000000 */ nop +/* CD3100 802412D0 00000000 */ nop /* CD3104 802412D4 4616A082 */ mul.s $f2, $f20, $f22 -/* CD3108 802412D8 00000000 */ nop +/* CD3108 802412D8 00000000 */ nop /* CD310C 802412DC C7A0002C */ lwc1 $f0, 0x2c($sp) /* CD3110 802412E0 461A0000 */ add.s $f0, $f0, $f26 /* CD3114 802412E4 080904BE */ j .L802412F8 /* CD3118 802412E8 46020000 */ add.s $f0, $f0, $f2 .L802412EC: /* CD311C 802412EC 4616A002 */ mul.s $f0, $f20, $f22 -/* CD3120 802412F0 00000000 */ nop +/* CD3120 802412F0 00000000 */ nop /* CD3124 802412F4 4600C000 */ add.s $f0, $f24, $f0 .L802412F8: /* CD3128 802412F8 E600003C */ swc1 $f0, 0x3c($s0) /* CD312C 802412FC 8E220074 */ lw $v0, 0x74($s1) /* CD3130 80241300 2442000A */ addiu $v0, $v0, 0xa /* CD3134 80241304 44826000 */ mtc1 $v0, $f12 -/* CD3138 80241308 00000000 */ nop +/* CD3138 80241308 00000000 */ nop /* CD313C 8024130C 0C00A6C9 */ jal clamp_angle /* CD3140 80241310 46806320 */ cvt.s.w $f12, $f12 /* CD3144 80241314 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80241000_CD2E30 /* CD3154 80241324 2442FFFF */ addiu $v0, $v0, -1 /* CD3158 80241328 8E430014 */ lw $v1, 0x14($s2) /* CD315C 8024132C 04600048 */ bltz $v1, .L80241450 -/* CD3160 80241330 00000000 */ nop +/* CD3160 80241330 00000000 */ nop /* CD3164 80241334 8E620074 */ lw $v0, 0x74($s3) /* CD3168 80241338 1C400042 */ bgtz $v0, .L80241444 /* CD316C 8024133C 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80241000_CD2E30 /* CD3174 80241344 860200A8 */ lh $v0, 0xa8($s0) /* CD3178 80241348 C602003C */ lwc1 $f2, 0x3c($s0) /* CD317C 8024134C 44820000 */ mtc1 $v0, $f0 -/* CD3180 80241350 00000000 */ nop +/* CD3180 80241350 00000000 */ nop /* CD3184 80241354 46800020 */ cvt.s.w $f0, $f0 /* CD3188 80241358 46001080 */ add.s $f2, $f2, $f0 /* CD318C 8024135C 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80241000_CD2E30 /* CD31A8 80241378 C440002C */ lwc1 $f0, 0x2c($v0) /* CD31AC 8024137C 46000021 */ cvt.d.s $f0, $f0 /* CD31B0 80241380 4622003C */ c.lt.d $f0, $f2 -/* CD31B4 80241384 00000000 */ nop +/* CD31B4 80241384 00000000 */ nop /* CD31B8 80241388 4500002C */ bc1f .L8024143C /* CD31BC 8024138C 02A0202D */ daddu $a0, $s5, $zero /* CD31C0 80241390 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80241000_CD2E30 /* CD31FC 802413CC 3C01C1A0 */ lui $at, 0xc1a0 /* CD3200 802413D0 44812000 */ mtc1 $at, $f4 /* CD3204 802413D4 44834000 */ mtc1 $v1, $f8 -/* CD3208 802413D8 00000000 */ nop +/* CD3208 802413D8 00000000 */ nop /* CD320C 802413DC 46804220 */ cvt.s.w $f8, $f8 /* CD3210 802413E0 44074000 */ mfc1 $a3, $f8 /* CD3214 802413E4 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80241000_CD2E30 /* CD32C8 80241498 0C0123F5 */ jal is_point_within_region /* CD32CC 8024149C 8E070038 */ lw $a3, 0x38($s0) /* CD32D0 802414A0 1040001A */ beqz $v0, .L8024150C -/* CD32D4 802414A4 00000000 */ nop +/* CD32D4 802414A4 00000000 */ nop /* CD32D8 802414A8 8E060038 */ lw $a2, 0x38($s0) /* CD32DC 802414AC 8E2200D0 */ lw $v0, 0xd0($s1) /* CD32E0 802414B0 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80241000_CD2E30 /* CD32F4 802414C4 468073A0 */ cvt.s.w $f14, $f14 /* CD32F8 802414C8 C6020018 */ lwc1 $f2, 0x18($s0) /* CD32FC 802414CC 4600103C */ c.lt.s $f2, $f0 -/* CD3300 802414D0 00000000 */ nop +/* CD3300 802414D0 00000000 */ nop /* CD3304 802414D4 4500000D */ bc1f .L8024150C /* CD3308 802414D8 E7A00034 */ swc1 $f0, 0x34($sp) /* CD330C 802414DC C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80241000_CD2E30 /* CD3348 80241518 00621825 */ or $v1, $v1, $v0 /* CD334C 8024151C 00741825 */ or $v1, $v1, $s4 /* CD3350 80241520 10600008 */ beqz $v1, .L80241544 -/* CD3354 80241524 00000000 */ nop +/* CD3354 80241524 00000000 */ nop /* CD3358 80241528 8602008C */ lh $v0, 0x8c($s0) /* CD335C 8024152C 14400031 */ bnez $v0, .L802415F4 -/* CD3360 80241530 00000000 */ nop +/* CD3360 80241530 00000000 */ nop /* CD3364 80241534 8E050018 */ lw $a1, 0x18($s0) /* CD3368 80241538 8E06000C */ lw $a2, 0xc($s0) /* CD336C 8024153C 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_80241000_CD2E30 /* CD3380 80241550 44801000 */ mtc1 $zero, $f2 /* CD3384 80241554 46000021 */ cvt.d.s $f0, $f0 /* CD3388 80241558 46220002 */ mul.d $f0, $f0, $f2 -/* CD338C 8024155C 00000000 */ nop +/* CD338C 8024155C 00000000 */ nop /* CD3390 80241560 4620020D */ trunc.w.d $f8, $f0 /* CD3394 80241564 E628007C */ swc1 $f8, 0x7c($s1) /* CD3398 80241568 8E420004 */ lw $v0, 4($s2) /* CD339C 8024156C 18400021 */ blez $v0, .L802415F4 -/* CD33A0 80241570 00000000 */ nop +/* CD33A0 80241570 00000000 */ nop /* CD33A4 80241574 8602008E */ lh $v0, 0x8e($s0) /* CD33A8 80241578 9603008E */ lhu $v1, 0x8e($s0) /* CD33AC 8024157C 18400005 */ blez $v0, .L80241594 @@ -375,7 +375,7 @@ glabel func_80241000_CD2E30 /* CD33B4 80241584 A602008E */ sh $v0, 0x8e($s0) /* CD33B8 80241588 00021400 */ sll $v0, $v0, 0x10 /* CD33BC 8024158C 1C400019 */ bgtz $v0, .L802415F4 -/* CD33C0 80241590 00000000 */ nop +/* CD33C0 80241590 00000000 */ nop .L80241594: /* CD33C4 80241594 240403E8 */ addiu $a0, $zero, 0x3e8 /* CD33C8 80241598 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80241000_CD2E30 /* CD3410 802415E0 18400003 */ blez $v0, .L802415F0 /* CD3414 802415E4 28620003 */ slti $v0, $v1, 3 /* CD3418 802415E8 10400002 */ beqz $v0, .L802415F4 -/* CD341C 802415EC 00000000 */ nop +/* CD341C 802415EC 00000000 */ nop .L802415F0: /* CD3420 802415F0 AE600070 */ sw $zero, 0x70($s3) .L802415F4: diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_802416E8_CD3518.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_802416E8_CD3518.s index 8e4fb46a66..f8d77ce62f 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_802416E8_CD3518.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_802416E8_CD3518.s @@ -42,11 +42,11 @@ glabel func_802416E8_CD3518 .L8024177C: /* CD35AC 8024177C 8E220070 */ lw $v0, 0x70($s1) /* CD35B0 80241780 18400034 */ blez $v0, .L80241854 -/* CD35B4 80241784 00000000 */ nop +/* CD35B4 80241784 00000000 */ nop /* CD35B8 80241788 C62C0074 */ lwc1 $f12, 0x74($s1) /* CD35BC 8024178C 46806320 */ cvt.s.w $f12, $f12 /* CD35C0 80241790 44820000 */ mtc1 $v0, $f0 -/* CD35C4 80241794 00000000 */ nop +/* CD35C4 80241794 00000000 */ nop /* CD35C8 80241798 46800020 */ cvt.s.w $f0, $f0 /* CD35CC 8024179C 46000021 */ cvt.d.s $f0, $f0 /* CD35D0 802417A0 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_802416E8_CD3518 /* CD3630 80241800 27A70030 */ addiu $a3, $sp, 0x30 .L80241804: /* CD3634 80241804 10400007 */ beqz $v0, .L80241824 -/* CD3638 80241808 00000000 */ nop +/* CD3638 80241808 00000000 */ nop /* CD363C 8024180C 4616A082 */ mul.s $f2, $f20, $f22 -/* CD3640 80241810 00000000 */ nop +/* CD3640 80241810 00000000 */ nop /* CD3644 80241814 C7A0002C */ lwc1 $f0, 0x2c($sp) /* CD3648 80241818 46180000 */ add.s $f0, $f0, $f24 /* CD364C 8024181C 0809060C */ j .L80241830 /* CD3650 80241820 46020000 */ add.s $f0, $f0, $f2 .L80241824: /* CD3654 80241824 4616A002 */ mul.s $f0, $f20, $f22 -/* CD3658 80241828 00000000 */ nop +/* CD3658 80241828 00000000 */ nop /* CD365C 8024182C 4600D000 */ add.s $f0, $f26, $f0 .L80241830: /* CD3660 80241830 E600003C */ swc1 $f0, 0x3c($s0) /* CD3664 80241834 8E220074 */ lw $v0, 0x74($s1) /* CD3668 80241838 2442000A */ addiu $v0, $v0, 0xa /* CD366C 8024183C 44826000 */ mtc1 $v0, $f12 -/* CD3670 80241840 00000000 */ nop +/* CD3670 80241840 00000000 */ nop /* CD3674 80241844 0C00A6C9 */ jal clamp_angle /* CD3678 80241848 46806320 */ cvt.s.w $f12, $f12 /* CD367C 8024184C 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_802416E8_CD3518 /* CD3690 80241860 860200A8 */ lh $v0, 0xa8($s0) /* CD3694 80241864 C600003C */ lwc1 $f0, 0x3c($s0) /* CD3698 80241868 44821000 */ mtc1 $v0, $f2 -/* CD369C 8024186C 00000000 */ nop +/* CD369C 8024186C 00000000 */ nop /* CD36A0 80241870 468010A0 */ cvt.s.w $f2, $f2 /* CD36A4 80241874 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* CD36A8 80241878 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_802416E8_CD3518 /* CD36C4 80241894 46240000 */ add.d $f0, $f0, $f4 /* CD36C8 80241898 460010A1 */ cvt.d.s $f2, $f2 /* CD36CC 8024189C 4620103C */ c.lt.d $f2, $f0 -/* CD36D0 802418A0 00000000 */ nop +/* CD36D0 802418A0 00000000 */ nop /* CD36D4 802418A4 4500002E */ bc1f .L80241960 /* CD36D8 802418A8 0280202D */ daddu $a0, $s4, $zero /* CD36DC 802418AC 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_802416E8_CD3518 /* CD371C 802418EC 3C01C1A0 */ lui $at, 0xc1a0 /* CD3720 802418F0 44812000 */ mtc1 $at, $f4 /* CD3724 802418F4 44834000 */ mtc1 $v1, $f8 -/* CD3728 802418F8 00000000 */ nop +/* CD3728 802418F8 00000000 */ nop /* CD372C 802418FC 46804220 */ cvt.s.w $f8, $f8 /* CD3730 80241900 44074000 */ mfc1 $a3, $f8 /* CD3734 80241904 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_802416E8_CD3518 .L80241960: /* CD3790 80241960 8602008C */ lh $v0, 0x8c($s0) /* CD3794 80241964 14400025 */ bnez $v0, .L802419FC -/* CD3798 80241968 00000000 */ nop +/* CD3798 80241968 00000000 */ nop /* CD379C 8024196C 8602008E */ lh $v0, 0x8e($s0) /* CD37A0 80241970 1C400022 */ bgtz $v0, .L802419FC -/* CD37A4 80241974 00000000 */ nop +/* CD37A4 80241974 00000000 */ nop /* CD37A8 80241978 8E620074 */ lw $v0, 0x74($s3) /* CD37AC 8024197C 2442FFFF */ addiu $v0, $v0, -1 /* CD37B0 80241980 1840001D */ blez $v0, .L802419F8 @@ -183,7 +183,7 @@ glabel func_802416E8_CD3518 /* CD37BC 8024198C 9442002A */ lhu $v0, 0x2a($v0) /* CD37C0 80241990 30420010 */ andi $v0, $v0, 0x10 /* CD37C4 80241994 14400007 */ bnez $v0, .L802419B4 -/* CD37C8 80241998 00000000 */ nop +/* CD37C8 80241998 00000000 */ nop /* CD37CC 8024199C C600000C */ lwc1 $f0, 0xc($s0) /* CD37D0 802419A0 3C014334 */ lui $at, 0x4334 /* CD37D4 802419A4 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241B10_CD3940.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241B10_CD3940.s index 6c31e6d39e..9bcd863831 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241B10_CD3940.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241B10_CD3940.s @@ -60,18 +60,18 @@ glabel func_80241B10_CD3940 /* CD3A18 80241BE8 C6200038 */ lwc1 $f0, 0x38($s1) /* CD3A1C 80241BEC 4600018D */ trunc.w.s $f6, $f0 /* CD3A20 80241BF0 44023000 */ mfc1 $v0, $f6 -/* CD3A24 80241BF4 00000000 */ nop +/* CD3A24 80241BF4 00000000 */ nop /* CD3A28 80241BF8 A6420010 */ sh $v0, 0x10($s2) /* CD3A2C 80241BFC C620003C */ lwc1 $f0, 0x3c($s1) /* CD3A30 80241C00 4600018D */ trunc.w.s $f6, $f0 /* CD3A34 80241C04 44023000 */ mfc1 $v0, $f6 -/* CD3A38 80241C08 00000000 */ nop +/* CD3A38 80241C08 00000000 */ nop /* CD3A3C 80241C0C A6420012 */ sh $v0, 0x12($s2) /* CD3A40 80241C10 C6200040 */ lwc1 $f0, 0x40($s1) /* CD3A44 80241C14 A2430007 */ sb $v1, 7($s2) /* CD3A48 80241C18 4600018D */ trunc.w.s $f6, $f0 /* CD3A4C 80241C1C 44023000 */ mfc1 $v0, $f6 -/* CD3A50 80241C20 00000000 */ nop +/* CD3A50 80241C20 00000000 */ nop /* CD3A54 80241C24 A6420014 */ sh $v0, 0x14($s2) .L80241C28: /* CD3A58 80241C28 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241CA8_CD3AD8.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241CA8_CD3AD8.s index d5fee89fff..b16f36b725 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241CA8_CD3AD8.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241CA8_CD3AD8.s @@ -42,9 +42,9 @@ glabel func_80241CA8_CD3AD8 /* CD3B6C 80241D3C 44801800 */ mtc1 $zero, $f3 /* CD3B70 80241D40 46002021 */ cvt.d.s $f0, $f4 /* CD3B74 80241D44 4620103E */ c.le.d $f2, $f0 -/* CD3B78 80241D48 00000000 */ nop +/* CD3B78 80241D48 00000000 */ nop /* CD3B7C 80241D4C 45000030 */ bc1f .L80241E10 -/* CD3B80 80241D50 00000000 */ nop +/* CD3B80 80241D50 00000000 */ nop /* CD3B84 80241D54 C600003C */ lwc1 $f0, 0x3c($s0) /* CD3B88 80241D58 46040000 */ add.s $f0, $f0, $f4 /* CD3B8C 80241D5C E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_80241CA8_CD3AD8 /* CD3BEC 80241DBC 27A70020 */ addiu $a3, $sp, 0x20 .L80241DC0: /* CD3BF0 80241DC0 1040000B */ beqz $v0, .L80241DF0 -/* CD3BF4 80241DC4 00000000 */ nop +/* CD3BF4 80241DC4 00000000 */ nop /* CD3BF8 80241DC8 C7A0001C */ lwc1 $f0, 0x1c($sp) /* CD3BFC 80241DCC 46140080 */ add.s $f2, $f0, $f20 /* CD3C00 80241DD0 C600003C */ lwc1 $f0, 0x3c($s0) /* CD3C04 80241DD4 4600103E */ c.le.s $f2, $f0 -/* CD3C08 80241DD8 00000000 */ nop +/* CD3C08 80241DD8 00000000 */ nop /* CD3C0C 80241DDC 4500008D */ bc1f .L80242014 -/* CD3C10 80241DE0 00000000 */ nop +/* CD3C10 80241DE0 00000000 */ nop /* CD3C14 80241DE4 E602003C */ swc1 $f2, 0x3c($s0) /* CD3C18 80241DE8 08090805 */ j .L80242014 /* CD3C1C 80241DEC AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_80241CA8_CD3AD8 /* CD3C20 80241DF0 C602003C */ lwc1 $f2, 0x3c($s0) /* CD3C24 80241DF4 C6000064 */ lwc1 $f0, 0x64($s0) /* CD3C28 80241DF8 4602003E */ c.le.s $f0, $f2 -/* CD3C2C 80241DFC 00000000 */ nop +/* CD3C2C 80241DFC 00000000 */ nop /* CD3C30 80241E00 45030084 */ bc1tl .L80242014 /* CD3C34 80241E04 AE400070 */ sw $zero, 0x70($s2) /* CD3C38 80241E08 08090805 */ j .L80242014 -/* CD3C3C 80241E0C 00000000 */ nop +/* CD3C3C 80241E0C 00000000 */ nop .L80241E10: /* CD3C40 80241E10 4622003C */ c.lt.d $f0, $f2 -/* CD3C44 80241E14 00000000 */ nop +/* CD3C44 80241E14 00000000 */ nop /* CD3C48 80241E18 4500007E */ bc1f .L80242014 -/* CD3C4C 80241E1C 00000000 */ nop +/* CD3C4C 80241E1C 00000000 */ nop /* CD3C50 80241E20 9602008E */ lhu $v0, 0x8e($s0) /* CD3C54 80241E24 24420001 */ addiu $v0, $v0, 1 /* CD3C58 80241E28 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_80241CA8_CD3AD8 /* CD3C64 80241E34 00021403 */ sra $v0, $v0, 0x10 /* CD3C68 80241E38 0043102A */ slt $v0, $v0, $v1 /* CD3C6C 80241E3C 14400026 */ bnez $v0, .L80241ED8 -/* CD3C70 80241E40 00000000 */ nop +/* CD3C70 80241E40 00000000 */ nop /* CD3C74 80241E44 C60C0038 */ lwc1 $f12, 0x38($s0) /* CD3C78 80241E48 C60E0040 */ lwc1 $f14, 0x40($s0) /* CD3C7C 80241E4C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_80241CA8_CD3AD8 /* CD3CA8 80241E78 8E62001C */ lw $v0, 0x1c($s3) /* CD3CAC 80241E7C 46001005 */ abs.s $f0, $f2 /* CD3CB0 80241E80 44822000 */ mtc1 $v0, $f4 -/* CD3CB4 80241E84 00000000 */ nop +/* CD3CB4 80241E84 00000000 */ nop /* CD3CB8 80241E88 46802120 */ cvt.s.w $f4, $f4 /* CD3CBC 80241E8C 4600203C */ c.lt.s $f4, $f0 -/* CD3CC0 80241E90 00000000 */ nop +/* CD3CC0 80241E90 00000000 */ nop /* CD3CC4 80241E94 4500000D */ bc1f .L80241ECC -/* CD3CC8 80241E98 00000000 */ nop +/* CD3CC8 80241E98 00000000 */ nop /* CD3CCC 80241E9C 44800000 */ mtc1 $zero, $f0 /* CD3CD0 80241EA0 C614000C */ lwc1 $f20, 0xc($s0) /* CD3CD4 80241EA4 4600103C */ c.lt.s $f2, $f0 -/* CD3CD8 80241EA8 00000000 */ nop +/* CD3CD8 80241EA8 00000000 */ nop /* CD3CDC 80241EAC 45000006 */ bc1f .L80241EC8 /* CD3CE0 80241EB0 00021023 */ negu $v0, $v0 /* CD3CE4 80241EB4 44820000 */ mtc1 $v0, $f0 -/* CD3CE8 80241EB8 00000000 */ nop +/* CD3CE8 80241EB8 00000000 */ nop /* CD3CEC 80241EBC 46800020 */ cvt.s.w $f0, $f0 /* CD3CF0 80241EC0 080907B3 */ j .L80241ECC /* CD3CF4 80241EC4 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_80241CA8_CD3AD8 /* CD3D1C 80241EEC C600001C */ lwc1 $f0, 0x1c($s0) /* CD3D20 80241EF0 46001080 */ add.s $f2, $f2, $f0 /* CD3D24 80241EF4 4616103C */ c.lt.s $f2, $f22 -/* CD3D28 80241EF8 00000000 */ nop +/* CD3D28 80241EF8 00000000 */ nop /* CD3D2C 80241EFC 45020045 */ bc1fl .L80242014 /* CD3D30 80241F00 E602003C */ swc1 $f2, 0x3c($s0) /* CD3D34 80241F04 08090804 */ j .L80242010 @@ -169,7 +169,7 @@ glabel func_80241CA8_CD3AD8 /* CD3D4C 80241F1C C600001C */ lwc1 $f0, 0x1c($s0) /* CD3D50 80241F20 C604003C */ lwc1 $f4, 0x3c($s0) /* CD3D54 80241F24 44821000 */ mtc1 $v0, $f2 -/* CD3D58 80241F28 00000000 */ nop +/* CD3D58 80241F28 00000000 */ nop /* CD3D5C 80241F2C 468010A0 */ cvt.s.w $f2, $f2 /* CD3D60 80241F30 46000005 */ abs.s $f0, $f0 /* CD3D64 80241F34 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_80241CA8_CD3AD8 /* CD3DA0 80241F70 0C0372DF */ jal func_800DCB7C /* CD3DA4 80241F74 27A70020 */ addiu $a3, $sp, 0x20 /* CD3DA8 80241F78 10400015 */ beqz $v0, .L80241FD0 -/* CD3DAC 80241F7C 00000000 */ nop +/* CD3DAC 80241F7C 00000000 */ nop /* CD3DB0 80241F80 860200A8 */ lh $v0, 0xa8($s0) /* CD3DB4 80241F84 C604001C */ lwc1 $f4, 0x1c($s0) /* CD3DB8 80241F88 44820000 */ mtc1 $v0, $f0 -/* CD3DBC 80241F8C 00000000 */ nop +/* CD3DBC 80241F8C 00000000 */ nop /* CD3DC0 80241F90 46800020 */ cvt.s.w $f0, $f0 /* CD3DC4 80241F94 46002085 */ abs.s $f2, $f4 /* CD3DC8 80241F98 46020000 */ add.s $f0, $f0, $f2 /* CD3DCC 80241F9C C7A20024 */ lwc1 $f2, 0x24($sp) /* CD3DD0 80241FA0 4600103E */ c.le.s $f2, $f0 -/* CD3DD4 80241FA4 00000000 */ nop +/* CD3DD4 80241FA4 00000000 */ nop /* CD3DD8 80241FA8 45000005 */ bc1f .L80241FC0 -/* CD3DDC 80241FAC 00000000 */ nop +/* CD3DDC 80241FAC 00000000 */ nop /* CD3DE0 80241FB0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* CD3DE4 80241FB4 AE00001C */ sw $zero, 0x1c($s0) /* CD3DE8 80241FB8 08090805 */ j .L80242014 @@ -217,13 +217,13 @@ glabel func_80241CA8_CD3AD8 /* CD3E04 80241FD4 860200A8 */ lh $v0, 0xa8($s0) /* CD3E08 80241FD8 46163081 */ sub.s $f2, $f6, $f22 /* CD3E0C 80241FDC 44820000 */ mtc1 $v0, $f0 -/* CD3E10 80241FE0 00000000 */ nop +/* CD3E10 80241FE0 00000000 */ nop /* CD3E14 80241FE4 46800020 */ cvt.s.w $f0, $f0 /* CD3E18 80241FE8 46001080 */ add.s $f2, $f2, $f0 /* CD3E1C 80241FEC C604001C */ lwc1 $f4, 0x1c($s0) /* CD3E20 80241FF0 46002005 */ abs.s $f0, $f4 /* CD3E24 80241FF4 4602003C */ c.lt.s $f0, $f2 -/* CD3E28 80241FF8 00000000 */ nop +/* CD3E28 80241FF8 00000000 */ nop /* CD3E2C 80241FFC 45020005 */ bc1fl .L80242014 /* CD3E30 80242000 AE00001C */ sw $zero, 0x1c($s0) /* CD3E34 80242004 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242038_CD3E68.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242038_CD3E68.s index bcde9a5b4c..76d620ef72 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242038_CD3E68.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242038_CD3E68.s @@ -49,15 +49,15 @@ glabel func_80242038_CD3E68 /* CD3F10 802420E0 44802000 */ mtc1 $zero, $f4 /* CD3F14 802420E4 460010A1 */ cvt.d.s $f2, $f2 /* CD3F18 802420E8 46241082 */ mul.d $f2, $f2, $f4 -/* CD3F1C 802420EC 00000000 */ nop +/* CD3F1C 802420EC 00000000 */ nop /* CD3F20 802420F0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* CD3F24 802420F4 46000021 */ cvt.d.s $f0, $f0 /* CD3F28 802420F8 46240002 */ mul.d $f0, $f0, $f4 -/* CD3F2C 802420FC 00000000 */ nop +/* CD3F2C 802420FC 00000000 */ nop /* CD3F30 80242100 3C013FE0 */ lui $at, 0x3fe0 /* CD3F34 80242104 44812800 */ mtc1 $at, $f5 /* CD3F38 80242108 44802000 */ mtc1 $zero, $f4 -/* CD3F3C 8024210C 00000000 */ nop +/* CD3F3C 8024210C 00000000 */ nop /* CD3F40 80242110 46241080 */ add.d $f2, $f2, $f4 /* CD3F44 80242114 AE000074 */ sw $zero, 0x74($s0) /* CD3F48 80242118 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s index 67eec98450..baf298352b 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s @@ -54,7 +54,7 @@ glabel func_8024215C_CD3F8C /* CD404C 8024221C 8E4300B0 */ lw $v1, 0xb0($s2) /* CD4050 80242220 30620004 */ andi $v0, $v1, 4 /* CD4054 80242224 10400007 */ beqz $v0, .L80242244 -/* CD4058 80242228 00000000 */ nop +/* CD4058 80242228 00000000 */ nop /* CD405C 8024222C 824200B4 */ lb $v0, 0xb4($s2) /* CD4060 80242230 1440003C */ bnez $v0, .L80242324 /* CD4064 80242234 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_8024215C_CD3F8C /* CD4078 80242248 2C62000F */ sltiu $v0, $v1, 0xf /* CD407C 8024224C 10400034 */ beqz $v0, .L80242320 /* CD4080 80242250 00031080 */ sll $v0, $v1, 2 -/* CD4084 80242254 3C018024 */ lui $at, %hi(D_80245408) +/* CD4084 80242254 3C018024 */ lui $at, %hi(jtbl_80245408_CD7238) /* CD4088 80242258 00220821 */ addu $at, $at, $v0 -/* CD408C 8024225C 8C225408 */ lw $v0, %lo(D_80245408)($at) +/* CD408C 8024225C 8C225408 */ lw $v0, %lo(jtbl_80245408_CD7238)($at) /* CD4090 80242260 00400008 */ jr $v0 -/* CD4094 80242264 00000000 */ nop +/* CD4094 80242264 00000000 */ nop +glabel L80242268_CD4098 /* CD4098 80242268 0280202D */ daddu $a0, $s4, $zero /* CD409C 8024226C 0200282D */ daddu $a1, $s0, $zero /* CD40A0 80242270 0C090394 */ jal func_80240E50_CD2C80 /* CD40A4 80242274 0260302D */ daddu $a2, $s3, $zero +glabel L80242278_CD40A8 /* CD40A8 80242278 0280202D */ daddu $a0, $s4, $zero /* CD40AC 8024227C 0200282D */ daddu $a1, $s0, $zero /* CD40B0 80242280 0C090400 */ jal func_80241000_CD2E30 /* CD40B4 80242284 0260302D */ daddu $a2, $s3, $zero /* CD40B8 80242288 080908C9 */ j .L80242324 /* CD40BC 8024228C 0000102D */ daddu $v0, $zero, $zero +glabel L80242290_CD40C0 /* CD40C0 80242290 0280202D */ daddu $a0, $s4, $zero /* CD40C4 80242294 0200282D */ daddu $a1, $s0, $zero /* CD40C8 80242298 0C09058A */ jal flo_16_UnkNpcAIFunc1 /* CD40CC 8024229C 0260302D */ daddu $a2, $s3, $zero +glabel L802422A0_CD40D0 /* CD40D0 802422A0 0280202D */ daddu $a0, $s4, $zero /* CD40D4 802422A4 0200282D */ daddu $a1, $s0, $zero /* CD40D8 802422A8 0C0905BA */ jal func_802416E8_CD3518 /* CD40DC 802422AC 0260302D */ daddu $a2, $s3, $zero /* CD40E0 802422B0 080908C9 */ j .L80242324 /* CD40E4 802422B4 0000102D */ daddu $v0, $zero, $zero +glabel L802422B8_CD40E8 /* CD40E8 802422B8 0280202D */ daddu $a0, $s4, $zero /* CD40EC 802422BC 0200282D */ daddu $a1, $s0, $zero /* CD40F0 802422C0 0C09068B */ jal flo_16_UnkNpcAIFunc2 /* CD40F4 802422C4 0260302D */ daddu $a2, $s3, $zero +glabel L802422C8_CD40F8 /* CD40F8 802422C8 0280202D */ daddu $a0, $s4, $zero /* CD40FC 802422CC 0200282D */ daddu $a1, $s0, $zero /* CD4100 802422D0 0C0906A9 */ jal func_80241AA4_CD38D4 /* CD4104 802422D4 0260302D */ daddu $a2, $s3, $zero /* CD4108 802422D8 080908C9 */ j .L80242324 /* CD410C 802422DC 0000102D */ daddu $v0, $zero, $zero +glabel L802422E0_CD4110 /* CD4110 802422E0 0280202D */ daddu $a0, $s4, $zero /* CD4114 802422E4 0200282D */ daddu $a1, $s0, $zero /* CD4118 802422E8 0C0906C4 */ jal func_80241B10_CD3940 /* CD411C 802422EC 0260302D */ daddu $a2, $s3, $zero /* CD4120 802422F0 080908C9 */ j .L80242324 /* CD4124 802422F4 0000102D */ daddu $v0, $zero, $zero +glabel L802422F8_CD4128 /* CD4128 802422F8 0280202D */ daddu $a0, $s4, $zero /* CD412C 802422FC 0200282D */ daddu $a1, $s0, $zero /* CD4130 80242300 0C090711 */ jal flo_16_UnkNpcAIFunc3 /* CD4134 80242304 0260302D */ daddu $a2, $s3, $zero /* CD4138 80242308 080908C9 */ j .L80242324 /* CD413C 8024230C 0000102D */ daddu $v0, $zero, $zero +glabel L80242310_CD4140 /* CD4140 80242310 0280202D */ daddu $a0, $s4, $zero /* CD4144 80242314 0200282D */ daddu $a1, $s0, $zero /* CD4148 80242318 0C09072A */ jal func_80241CA8_CD3AD8 /* CD414C 8024231C 0260302D */ daddu $a2, $s3, $zero .L80242320: +glabel L80242320_CD4150 /* CD4150 80242320 0000102D */ daddu $v0, $zero, $zero .L80242324: /* CD4154 80242324 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242348_CD4178.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242348_CD4178.s index 43b43be27c..b25fa13cff 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242348_CD4178.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242348_CD4178.s @@ -47,20 +47,20 @@ glabel func_80242348_CD4178 /* CD4220 802423F0 8E02001C */ lw $v0, 0x1c($s0) /* CD4224 802423F4 46001005 */ abs.s $f0, $f2 /* CD4228 802423F8 44822000 */ mtc1 $v0, $f4 -/* CD422C 802423FC 00000000 */ nop +/* CD422C 802423FC 00000000 */ nop /* CD4230 80242400 46802120 */ cvt.s.w $f4, $f4 /* CD4234 80242404 4600203C */ c.lt.s $f4, $f0 -/* CD4238 80242408 00000000 */ nop +/* CD4238 80242408 00000000 */ nop /* CD423C 8024240C 4500000D */ bc1f .L80242444 -/* CD4240 80242410 00000000 */ nop +/* CD4240 80242410 00000000 */ nop /* CD4244 80242414 44800000 */ mtc1 $zero, $f0 /* CD4248 80242418 C654000C */ lwc1 $f20, 0xc($s2) /* CD424C 8024241C 4600103C */ c.lt.s $f2, $f0 -/* CD4250 80242420 00000000 */ nop +/* CD4250 80242420 00000000 */ nop /* CD4254 80242424 45000006 */ bc1f .L80242440 /* CD4258 80242428 00021023 */ negu $v0, $v0 /* CD425C 8024242C 44820000 */ mtc1 $v0, $f0 -/* CD4260 80242430 00000000 */ nop +/* CD4260 80242430 00000000 */ nop /* CD4264 80242434 46800020 */ cvt.s.w $f0, $f0 /* CD4268 80242438 08090911 */ j .L80242444 /* CD426C 8024243C 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242478_CD42A8.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242478_CD42A8.s index ec4d646ea1..a562d87979 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242478_CD42A8.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242478_CD42A8.s @@ -36,7 +36,7 @@ glabel func_80242478_CD42A8 /* CD4324 802424F4 2402000F */ addiu $v0, $zero, 0xf /* CD4328 802424F8 AFA2001C */ sw $v0, 0x1c($sp) /* CD432C 802424FC 44834000 */ mtc1 $v1, $f8 -/* CD4330 80242500 00000000 */ nop +/* CD4330 80242500 00000000 */ nop /* CD4334 80242504 46804220 */ cvt.s.w $f8, $f8 /* CD4338 80242508 44074000 */ mfc1 $a3, $f8 /* CD433C 8024250C 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,14 +69,14 @@ glabel func_80242478_CD42A8 /* CD43A4 80242574 860200A8 */ lh $v0, 0xa8($s0) /* CD43A8 80242578 C6000038 */ lwc1 $f0, 0x38($s0) /* CD43AC 8024257C 44821000 */ mtc1 $v0, $f2 -/* CD43B0 80242580 00000000 */ nop +/* CD43B0 80242580 00000000 */ nop /* CD43B4 80242584 468010A0 */ cvt.s.w $f2, $f2 /* CD43B8 80242588 E7A0002C */ swc1 $f0, 0x2c($sp) /* CD43BC 8024258C 860200A8 */ lh $v0, 0xa8($s0) /* CD43C0 80242590 C604003C */ lwc1 $f4, 0x3c($s0) /* CD43C4 80242594 C6060040 */ lwc1 $f6, 0x40($s0) /* CD43C8 80242598 44820000 */ mtc1 $v0, $f0 -/* CD43CC 8024259C 00000000 */ nop +/* CD43CC 8024259C 00000000 */ nop /* CD43D0 802425A0 46800021 */ cvt.d.w $f0, $f0 /* CD43D4 802425A4 46022100 */ add.s $f4, $f4, $f2 /* CD43D8 802425A8 3C014008 */ lui $at, 0x4008 @@ -93,19 +93,19 @@ glabel func_80242478_CD42A8 /* CD4404 802425D4 0C0372DF */ jal func_800DCB7C /* CD4408 802425D8 27A70034 */ addiu $a3, $sp, 0x34 /* CD440C 802425DC 1040000A */ beqz $v0, .L80242608 -/* CD4410 802425E0 00000000 */ nop +/* CD4410 802425E0 00000000 */ nop /* CD4414 802425E4 860200A8 */ lh $v0, 0xa8($s0) /* CD4418 802425E8 C7A20038 */ lwc1 $f2, 0x38($sp) /* CD441C 802425EC 44820000 */ mtc1 $v0, $f0 -/* CD4420 802425F0 00000000 */ nop +/* CD4420 802425F0 00000000 */ nop /* CD4424 802425F4 46800020 */ cvt.s.w $f0, $f0 /* CD4428 802425F8 4600103C */ c.lt.s $f2, $f0 -/* CD442C 802425FC 00000000 */ nop +/* CD442C 802425FC 00000000 */ nop /* CD4430 80242600 45030001 */ bc1tl .L80242608 /* CD4434 80242604 24110001 */ addiu $s1, $zero, 1 .L80242608: /* CD4438 80242608 12200008 */ beqz $s1, .L8024262C -/* CD443C 8024260C 00000000 */ nop +/* CD443C 8024260C 00000000 */ nop /* CD4440 80242610 C7A00030 */ lwc1 $f0, 0x30($sp) /* CD4444 80242614 3C013FF0 */ lui $at, 0x3ff0 /* CD4448 80242618 44811800 */ mtc1 $at, $f3 @@ -130,24 +130,24 @@ glabel func_80242478_CD42A8 /* CD4490 80242660 44800800 */ mtc1 $zero, $f1 /* CD4494 80242664 460030A1 */ cvt.d.s $f2, $f6 /* CD4498 80242668 4620103C */ c.lt.d $f2, $f0 -/* CD449C 8024266C 00000000 */ nop +/* CD449C 8024266C 00000000 */ nop /* CD44A0 80242670 45010009 */ bc1t .L80242698 -/* CD44A4 80242674 00000000 */ nop +/* CD44A4 80242674 00000000 */ nop /* CD44A8 80242678 3C014010 */ lui $at, 0x4010 /* CD44AC 8024267C 44810800 */ mtc1 $at, $f1 /* CD44B0 80242680 44800000 */ mtc1 $zero, $f0 -/* CD44B4 80242684 00000000 */ nop +/* CD44B4 80242684 00000000 */ nop /* CD44B8 80242688 4622003C */ c.lt.d $f0, $f2 -/* CD44BC 8024268C 00000000 */ nop +/* CD44BC 8024268C 00000000 */ nop /* CD44C0 80242690 4500000A */ bc1f .L802426BC -/* CD44C4 80242694 00000000 */ nop +/* CD44C4 80242694 00000000 */ nop .L80242698: /* CD44C8 80242698 3C018024 */ lui $at, %hi(D_80245448) /* CD44CC 8024269C D4225448 */ ldc1 $f2, %lo(D_80245448)($at) /* CD44D0 802426A0 46003187 */ neg.s $f6, $f6 /* CD44D4 802426A4 46003021 */ cvt.d.s $f0, $f6 /* CD44D8 802426A8 46220002 */ mul.d $f0, $f0, $f2 -/* CD44DC 802426AC 00000000 */ nop +/* CD44DC 802426AC 00000000 */ nop /* CD44E0 802426B0 46202000 */ add.d $f0, $f4, $f0 .L802426B4: /* CD44E4 802426B4 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_802426F8_CD4528.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_802426F8_CD4528.s index beca83fe44..3ac6288ea5 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_802426F8_CD4528.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_802426F8_CD4528.s @@ -16,7 +16,7 @@ glabel func_802426F8_CD4528 /* CD4554 80242724 A462008E */ sh $v0, 0x8e($v1) /* CD4558 80242728 00021400 */ sll $v0, $v0, 0x10 /* CD455C 8024272C 1C400004 */ bgtz $v0, .L80242740 -/* CD4560 80242730 00000000 */ nop +/* CD4560 80242730 00000000 */ nop /* CD4564 80242734 AE000074 */ sw $zero, 0x74($s0) /* CD4568 80242738 A460008E */ sh $zero, 0x8e($v1) /* CD456C 8024273C AE200070 */ sw $zero, 0x70($s1) diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s index 851421c8ff..4b2a60aee5 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s @@ -55,7 +55,7 @@ glabel func_80242754_CD4584 /* CD4648 80242818 8E4300B0 */ lw $v1, 0xb0($s2) /* CD464C 8024281C 30620004 */ andi $v0, $v1, 4 /* CD4650 80242820 10400007 */ beqz $v0, .L80242840 -/* CD4654 80242824 00000000 */ nop +/* CD4654 80242824 00000000 */ nop /* CD4658 80242828 824200B4 */ lb $v0, 0xb4($s2) /* CD465C 8024282C 1440003A */ bnez $v0, .L80242918 /* CD4660 80242830 0000102D */ daddu $v0, $zero, $zero @@ -67,56 +67,66 @@ glabel func_80242754_CD4584 /* CD4674 80242844 2C620015 */ sltiu $v0, $v1, 0x15 /* CD4678 80242848 10400032 */ beqz $v0, .L80242914 /* CD467C 8024284C 00031080 */ sll $v0, $v1, 2 -/* CD4680 80242850 3C018024 */ lui $at, %hi(D_80245450) +/* CD4680 80242850 3C018024 */ lui $at, %hi(jtbl_80245450_CD7280) /* CD4684 80242854 00220821 */ addu $at, $at, $v0 -/* CD4688 80242858 8C225450 */ lw $v0, %lo(D_80245450)($at) +/* CD4688 80242858 8C225450 */ lw $v0, %lo(jtbl_80245450_CD7280)($at) /* CD468C 8024285C 00400008 */ jr $v0 -/* CD4690 80242860 00000000 */ nop +/* CD4690 80242860 00000000 */ nop +glabel L80242864_CD4694 /* CD4694 80242864 0280202D */ daddu $a0, $s4, $zero /* CD4698 80242868 0200282D */ daddu $a1, $s0, $zero /* CD469C 8024286C 0C090394 */ jal func_80240E50_CD2C80 /* CD46A0 80242870 0260302D */ daddu $a2, $s3, $zero +glabel L80242874_CD46A4 /* CD46A4 80242874 0280202D */ daddu $a0, $s4, $zero /* CD46A8 80242878 0200282D */ daddu $a1, $s0, $zero /* CD46AC 8024287C 0C090400 */ jal func_80241000_CD2E30 /* CD46B0 80242880 0260302D */ daddu $a2, $s3, $zero /* CD46B4 80242884 08090A46 */ j .L80242918 /* CD46B8 80242888 0000102D */ daddu $v0, $zero, $zero +glabel L8024288C_CD46BC /* CD46BC 8024288C 0280202D */ daddu $a0, $s4, $zero /* CD46C0 80242890 0200282D */ daddu $a1, $s0, $zero /* CD46C4 80242894 0C09058A */ jal flo_16_UnkNpcAIFunc1 /* CD46C8 80242898 0260302D */ daddu $a2, $s3, $zero +glabel L8024289C_CD46CC /* CD46CC 8024289C 0280202D */ daddu $a0, $s4, $zero /* CD46D0 802428A0 0200282D */ daddu $a1, $s0, $zero /* CD46D4 802428A4 0C0905BA */ jal func_802416E8_CD3518 /* CD46D8 802428A8 0260302D */ daddu $a2, $s3, $zero /* CD46DC 802428AC 08090A46 */ j .L80242918 /* CD46E0 802428B0 0000102D */ daddu $v0, $zero, $zero +glabel L802428B4_CD46E4 /* CD46E4 802428B4 0280202D */ daddu $a0, $s4, $zero /* CD46E8 802428B8 0200282D */ daddu $a1, $s0, $zero /* CD46EC 802428BC 0C09068B */ jal flo_16_UnkNpcAIFunc2 /* CD46F0 802428C0 0260302D */ daddu $a2, $s3, $zero +glabel L802428C4_CD46F4 /* CD46F4 802428C4 0280202D */ daddu $a0, $s4, $zero /* CD46F8 802428C8 0200282D */ daddu $a1, $s0, $zero /* CD46FC 802428CC 0C0906A9 */ jal func_80241AA4_CD38D4 /* CD4700 802428D0 0260302D */ daddu $a2, $s3, $zero /* CD4704 802428D4 08090A46 */ j .L80242918 /* CD4708 802428D8 0000102D */ daddu $v0, $zero, $zero +glabel L802428DC_CD470C /* CD470C 802428DC 0280202D */ daddu $a0, $s4, $zero /* CD4710 802428E0 0200282D */ daddu $a1, $s0, $zero /* CD4714 802428E4 0C0908D2 */ jal func_80242348_CD4178 /* CD4718 802428E8 0260302D */ daddu $a2, $s3, $zero +glabel L802428EC_CD471C /* CD471C 802428EC 0280202D */ daddu $a0, $s4, $zero /* CD4720 802428F0 0200282D */ daddu $a1, $s0, $zero /* CD4724 802428F4 0C09091E */ jal func_80242478_CD42A8 /* CD4728 802428F8 0260302D */ daddu $a2, $s3, $zero /* CD472C 802428FC 08090A46 */ j .L80242918 /* CD4730 80242900 0000102D */ daddu $v0, $zero, $zero +glabel L80242904_CD4734 /* CD4734 80242904 0280202D */ daddu $a0, $s4, $zero /* CD4738 80242908 0200282D */ daddu $a1, $s0, $zero /* CD473C 8024290C 0C0909BE */ jal func_802426F8_CD4528 /* CD4740 80242910 0260302D */ daddu $a2, $s3, $zero .L80242914: +glabel L80242914_CD4744 /* CD4744 80242914 0000102D */ daddu $v0, $zero, $zero .L80242918: /* CD4748 80242918 8FBF0048 */ lw $ra, 0x48($sp) @@ -128,4 +138,4 @@ glabel func_80242754_CD4584 /* CD4760 80242930 8FB00030 */ lw $s0, 0x30($sp) /* CD4764 80242934 03E00008 */ jr $ra /* CD4768 80242938 27BD0050 */ addiu $sp, $sp, 0x50 -/* CD476C 8024293C 00000000 */ nop +/* CD476C 8024293C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD72E0/func_80240000_CD72E0.s b/asm/nonmatchings/world/area_flo/flo_17/CD72E0/func_80240000_CD72E0.s index 65ab62c1b3..18defe33cd 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD72E0/func_80240000_CD72E0.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD72E0/func_80240000_CD72E0.s @@ -15,6 +15,6 @@ glabel func_80240000_CD72E0 /* CD7308 80240028 24020002 */ addiu $v0, $zero, 2 /* CD730C 8024002C 03E00008 */ jr $ra /* CD7310 80240030 27BD0020 */ addiu $sp, $sp, 0x20 -/* CD7314 80240034 00000000 */ nop -/* CD7318 80240038 00000000 */ nop -/* CD731C 8024003C 00000000 */ nop +/* CD7314 80240034 00000000 */ nop +/* CD7318 80240038 00000000 */ nop +/* CD731C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7320/func_80240040_CD7320.s b/asm/nonmatchings/world/area_flo/flo_17/CD7320/func_80240040_CD7320.s index 3a1955c51c..82d233776e 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7320/func_80240040_CD7320.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7320/func_80240040_CD7320.s @@ -13,4 +13,4 @@ glabel func_80240040_CD7320 /* CD7340 80240060 24020002 */ addiu $v0, $zero, 2 /* CD7344 80240064 03E00008 */ jr $ra /* CD7348 80240068 27BD0018 */ addiu $sp, $sp, 0x18 -/* CD734C 8024006C 00000000 */ nop +/* CD734C 8024006C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240070_CD7350.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240070_CD7350.s index c738096150..ff86cae064 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240070_CD7350.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240070_CD7350.s @@ -47,7 +47,7 @@ glabel func_80240070_CD7350 /* CD73F8 80240118 0C0123F5 */ jal is_point_within_region /* CD73FC 8024011C 8E070038 */ lw $a3, 0x38($s0) /* CD7400 80240120 1040000E */ beqz $v0, .L8024015C -/* CD7404 80240124 00000000 */ nop +/* CD7404 80240124 00000000 */ nop /* CD7408 80240128 8E2200D0 */ lw $v0, 0xd0($s1) /* CD740C 8024012C C60C0038 */ lwc1 $f12, 0x38($s0) /* CD7410 80240130 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240070_CD7350 /* CD7424 80240144 468031A0 */ cvt.s.w $f6, $f6 /* CD7428 80240148 44073000 */ mfc1 $a3, $f6 /* CD742C 8024014C 0C00A720 */ jal atan2 -/* CD7430 80240150 00000000 */ nop +/* CD7430 80240150 00000000 */ nop /* CD7434 80240154 08090063 */ j .L8024018C /* CD7438 80240158 E600000C */ swc1 $f0, 0xc($s0) .L8024015C: @@ -66,7 +66,7 @@ glabel func_80240070_CD7350 /* CD7440 80240160 2404003C */ addiu $a0, $zero, 0x3c /* CD7444 80240164 C60C000C */ lwc1 $f12, 0xc($s0) /* CD7448 80240168 44820000 */ mtc1 $v0, $f0 -/* CD744C 8024016C 00000000 */ nop +/* CD744C 8024016C 00000000 */ nop /* CD7450 80240170 46800020 */ cvt.s.w $f0, $f0 /* CD7454 80240174 46006300 */ add.s $f12, $f12, $f0 /* CD7458 80240178 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240070_CD7350 /* CD747C 8024019C 8E2200D0 */ lw $v0, 0xd0($s1) /* CD7480 802401A0 8C420014 */ lw $v0, 0x14($v0) /* CD7484 802401A4 04410004 */ bgez $v0, .L802401B8 -/* CD7488 802401A8 00000000 */ nop +/* CD7488 802401A8 00000000 */ nop /* CD748C 802401AC C6400000 */ lwc1 $f0, ($s2) /* CD7490 802401B0 08090076 */ j .L802401D8 /* CD7494 802401B4 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240070_CD7350 /* CD7498 802401B8 3C018024 */ lui $at, %hi(D_80245300) /* CD749C 802401BC D4225300 */ ldc1 $f2, %lo(D_80245300)($at) /* CD74A0 802401C0 44820000 */ mtc1 $v0, $f0 -/* CD74A4 802401C4 00000000 */ nop +/* CD74A4 802401C4 00000000 */ nop /* CD74A8 802401C8 46800021 */ cvt.d.w $f0, $f0 /* CD74AC 802401CC 46220003 */ div.d $f0, $f0, $f2 /* CD74B0 802401D0 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240070_CD7350 /* CD74C4 802401E4 44801000 */ mtc1 $zero, $f2 /* CD74C8 802401E8 46000021 */ cvt.d.s $f0, $f0 /* CD74CC 802401EC 46220002 */ mul.d $f0, $f0, $f2 -/* CD74D0 802401F0 00000000 */ nop +/* CD74D0 802401F0 00000000 */ nop /* CD74D4 802401F4 24020001 */ addiu $v0, $zero, 1 /* CD74D8 802401F8 4620018D */ trunc.w.d $f6, $f0 /* CD74DC 802401FC E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240220_CD7500.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240220_CD7500.s index cd75a848b0..1bc792e16f 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240220_CD7500.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240220_CD7500.s @@ -34,7 +34,7 @@ glabel func_80240220_CD7500 /* CD7574 80240294 44803000 */ mtc1 $zero, $f6 /* CD7578 80240298 46000021 */ cvt.d.s $f0, $f0 /* CD757C 8024029C 46260002 */ mul.d $f0, $f0, $f6 -/* CD7580 802402A0 00000000 */ nop +/* CD7580 802402A0 00000000 */ nop /* CD7584 802402A4 24020001 */ addiu $v0, $zero, 1 /* CD7588 802402A8 8E24006C */ lw $a0, 0x6c($s1) /* CD758C 802402AC 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80240220_CD7500 /* CD75E8 80240308 C600003C */ lwc1 $f0, 0x3c($s0) /* CD75EC 8024030C 4600C001 */ sub.s $f0, $f24, $f0 /* CD75F0 80240310 4600B03C */ c.lt.s $f22, $f0 -/* CD75F4 80240314 00000000 */ nop +/* CD75F4 80240314 00000000 */ nop /* CD75F8 80240318 4500001B */ bc1f .L80240388 /* CD75FC 8024031C 34820010 */ ori $v0, $a0, 0x10 /* CD7600 80240320 080900E2 */ j .L80240388 @@ -87,9 +87,9 @@ glabel func_80240220_CD7500 /* CD7644 80240364 C7A00034 */ lwc1 $f0, 0x34($sp) /* CD7648 80240368 4600D001 */ sub.s $f0, $f26, $f0 /* CD764C 8024036C 4600B03C */ c.lt.s $f22, $f0 -/* CD7650 80240370 00000000 */ nop +/* CD7650 80240370 00000000 */ nop /* CD7654 80240374 45000004 */ bc1f .L80240388 -/* CD7658 80240378 00000000 */ nop +/* CD7658 80240378 00000000 */ nop /* CD765C 8024037C 8E22006C */ lw $v0, 0x6c($s1) /* CD7660 80240380 34420010 */ ori $v0, $v0, 0x10 /* CD7664 80240384 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80240220_CD7500 /* CD766C 8024038C 24030011 */ addiu $v1, $zero, 0x11 /* CD7670 80240390 30420011 */ andi $v0, $v0, 0x11 /* CD7674 80240394 14430039 */ bne $v0, $v1, .L8024047C -/* CD7678 80240398 00000000 */ nop +/* CD7678 80240398 00000000 */ nop /* CD767C 8024039C 8E020000 */ lw $v0, ($s0) /* CD7680 802403A0 30420008 */ andi $v0, $v0, 8 /* CD7684 802403A4 1040000A */ beqz $v0, .L802403D0 @@ -108,7 +108,7 @@ glabel func_80240220_CD7500 /* CD7694 802403B4 D4205308 */ ldc1 $f0, %lo(D_80245308)($at) /* CD7698 802403B8 460010A1 */ cvt.d.s $f2, $f2 /* CD769C 802403BC 46201082 */ mul.d $f2, $f2, $f0 -/* CD76A0 802403C0 00000000 */ nop +/* CD76A0 802403C0 00000000 */ nop /* CD76A4 802403C4 4600A021 */ cvt.d.s $f0, $f20 /* CD76A8 802403C8 0809010D */ j .L80240434 /* CD76AC 802403CC 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80240220_CD7500 /* CD76FC 8024041C D4205310 */ ldc1 $f0, %lo(D_80245310)($at) /* CD7700 80240420 460010A1 */ cvt.d.s $f2, $f2 /* CD7704 80240424 46201082 */ mul.d $f2, $f2, $f0 -/* CD7708 80240428 00000000 */ nop +/* CD7708 80240428 00000000 */ nop /* CD770C 8024042C 4600A021 */ cvt.d.s $f0, $f20 /* CD7710 80240430 46220000 */ add.d $f0, $f0, $f2 .L80240434: @@ -149,7 +149,7 @@ glabel func_80240220_CD7500 /* CD7730 80240450 46000005 */ abs.s $f0, $f0 /* CD7734 80240454 46000021 */ cvt.d.s $f0, $f0 /* CD7738 80240458 4622003C */ c.lt.d $f0, $f2 -/* CD773C 8024045C 00000000 */ nop +/* CD773C 8024045C 00000000 */ nop /* CD7740 80240460 45000036 */ bc1f .L8024053C /* CD7744 80240464 2403FFEF */ addiu $v1, $zero, -0x11 /* CD7748 80240468 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80240220_CD7500 .L8024047C: /* CD775C 8024047C 8E220070 */ lw $v0, 0x70($s1) /* CD7760 80240480 1840002E */ blez $v0, .L8024053C -/* CD7764 80240484 00000000 */ nop +/* CD7764 80240484 00000000 */ nop /* CD7768 80240488 C62C0074 */ lwc1 $f12, 0x74($s1) /* CD776C 8024048C 0C00A8BB */ jal sin_deg /* CD7770 80240490 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80240220_CD7500 /* CD77C8 802404E8 27A70030 */ addiu $a3, $sp, 0x30 .L802404EC: /* CD77CC 802404EC 10400007 */ beqz $v0, .L8024050C -/* CD77D0 802404F0 00000000 */ nop +/* CD77D0 802404F0 00000000 */ nop /* CD77D4 802404F4 4616A082 */ mul.s $f2, $f20, $f22 -/* CD77D8 802404F8 00000000 */ nop +/* CD77D8 802404F8 00000000 */ nop /* CD77DC 802404FC C7A0002C */ lwc1 $f0, 0x2c($sp) /* CD77E0 80240500 461A0000 */ add.s $f0, $f0, $f26 /* CD77E4 80240504 08090146 */ j .L80240518 /* CD77E8 80240508 46020000 */ add.s $f0, $f0, $f2 .L8024050C: /* CD77EC 8024050C 4616A002 */ mul.s $f0, $f20, $f22 -/* CD77F0 80240510 00000000 */ nop +/* CD77F0 80240510 00000000 */ nop /* CD77F4 80240514 4600C000 */ add.s $f0, $f24, $f0 .L80240518: /* CD77F8 80240518 E600003C */ swc1 $f0, 0x3c($s0) /* CD77FC 8024051C 8E220074 */ lw $v0, 0x74($s1) /* CD7800 80240520 2442000A */ addiu $v0, $v0, 0xa /* CD7804 80240524 44826000 */ mtc1 $v0, $f12 -/* CD7808 80240528 00000000 */ nop +/* CD7808 80240528 00000000 */ nop /* CD780C 8024052C 0C00A6C9 */ jal clamp_angle /* CD7810 80240530 46806320 */ cvt.s.w $f12, $f12 /* CD7814 80240534 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80240220_CD7500 /* CD7824 80240544 2442FFFF */ addiu $v0, $v0, -1 /* CD7828 80240548 8E430014 */ lw $v1, 0x14($s2) /* CD782C 8024054C 04600048 */ bltz $v1, .L80240670 -/* CD7830 80240550 00000000 */ nop +/* CD7830 80240550 00000000 */ nop /* CD7834 80240554 8E620074 */ lw $v0, 0x74($s3) /* CD7838 80240558 1C400042 */ bgtz $v0, .L80240664 /* CD783C 8024055C 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80240220_CD7500 /* CD7844 80240564 860200A8 */ lh $v0, 0xa8($s0) /* CD7848 80240568 C602003C */ lwc1 $f2, 0x3c($s0) /* CD784C 8024056C 44820000 */ mtc1 $v0, $f0 -/* CD7850 80240570 00000000 */ nop +/* CD7850 80240570 00000000 */ nop /* CD7854 80240574 46800020 */ cvt.s.w $f0, $f0 /* CD7858 80240578 46001080 */ add.s $f2, $f2, $f0 /* CD785C 8024057C 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80240220_CD7500 /* CD7878 80240598 C440002C */ lwc1 $f0, 0x2c($v0) /* CD787C 8024059C 46000021 */ cvt.d.s $f0, $f0 /* CD7880 802405A0 4622003C */ c.lt.d $f0, $f2 -/* CD7884 802405A4 00000000 */ nop +/* CD7884 802405A4 00000000 */ nop /* CD7888 802405A8 4500002C */ bc1f .L8024065C /* CD788C 802405AC 02A0202D */ daddu $a0, $s5, $zero /* CD7890 802405B0 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80240220_CD7500 /* CD78CC 802405EC 3C01C1A0 */ lui $at, 0xc1a0 /* CD78D0 802405F0 44812000 */ mtc1 $at, $f4 /* CD78D4 802405F4 44834000 */ mtc1 $v1, $f8 -/* CD78D8 802405F8 00000000 */ nop +/* CD78D8 802405F8 00000000 */ nop /* CD78DC 802405FC 46804220 */ cvt.s.w $f8, $f8 /* CD78E0 80240600 44074000 */ mfc1 $a3, $f8 /* CD78E4 80240604 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80240220_CD7500 /* CD7998 802406B8 0C0123F5 */ jal is_point_within_region /* CD799C 802406BC 8E070038 */ lw $a3, 0x38($s0) /* CD79A0 802406C0 1040001A */ beqz $v0, .L8024072C -/* CD79A4 802406C4 00000000 */ nop +/* CD79A4 802406C4 00000000 */ nop /* CD79A8 802406C8 8E060038 */ lw $a2, 0x38($s0) /* CD79AC 802406CC 8E2200D0 */ lw $v0, 0xd0($s1) /* CD79B0 802406D0 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80240220_CD7500 /* CD79C4 802406E4 468073A0 */ cvt.s.w $f14, $f14 /* CD79C8 802406E8 C6020018 */ lwc1 $f2, 0x18($s0) /* CD79CC 802406EC 4600103C */ c.lt.s $f2, $f0 -/* CD79D0 802406F0 00000000 */ nop +/* CD79D0 802406F0 00000000 */ nop /* CD79D4 802406F4 4500000D */ bc1f .L8024072C /* CD79D8 802406F8 E7A00034 */ swc1 $f0, 0x34($sp) /* CD79DC 802406FC C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80240220_CD7500 /* CD7A18 80240738 00621825 */ or $v1, $v1, $v0 /* CD7A1C 8024073C 00741825 */ or $v1, $v1, $s4 /* CD7A20 80240740 10600008 */ beqz $v1, .L80240764 -/* CD7A24 80240744 00000000 */ nop +/* CD7A24 80240744 00000000 */ nop /* CD7A28 80240748 8602008C */ lh $v0, 0x8c($s0) /* CD7A2C 8024074C 14400031 */ bnez $v0, .L80240814 -/* CD7A30 80240750 00000000 */ nop +/* CD7A30 80240750 00000000 */ nop /* CD7A34 80240754 8E050018 */ lw $a1, 0x18($s0) /* CD7A38 80240758 8E06000C */ lw $a2, 0xc($s0) /* CD7A3C 8024075C 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_80240220_CD7500 /* CD7A50 80240770 44801000 */ mtc1 $zero, $f2 /* CD7A54 80240774 46000021 */ cvt.d.s $f0, $f0 /* CD7A58 80240778 46220002 */ mul.d $f0, $f0, $f2 -/* CD7A5C 8024077C 00000000 */ nop +/* CD7A5C 8024077C 00000000 */ nop /* CD7A60 80240780 4620020D */ trunc.w.d $f8, $f0 /* CD7A64 80240784 E628007C */ swc1 $f8, 0x7c($s1) /* CD7A68 80240788 8E420004 */ lw $v0, 4($s2) /* CD7A6C 8024078C 18400021 */ blez $v0, .L80240814 -/* CD7A70 80240790 00000000 */ nop +/* CD7A70 80240790 00000000 */ nop /* CD7A74 80240794 8602008E */ lh $v0, 0x8e($s0) /* CD7A78 80240798 9603008E */ lhu $v1, 0x8e($s0) /* CD7A7C 8024079C 18400005 */ blez $v0, .L802407B4 @@ -375,7 +375,7 @@ glabel func_80240220_CD7500 /* CD7A84 802407A4 A602008E */ sh $v0, 0x8e($s0) /* CD7A88 802407A8 00021400 */ sll $v0, $v0, 0x10 /* CD7A8C 802407AC 1C400019 */ bgtz $v0, .L80240814 -/* CD7A90 802407B0 00000000 */ nop +/* CD7A90 802407B0 00000000 */ nop .L802407B4: /* CD7A94 802407B4 240403E8 */ addiu $a0, $zero, 0x3e8 /* CD7A98 802407B8 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80240220_CD7500 /* CD7AE0 80240800 18400003 */ blez $v0, .L80240810 /* CD7AE4 80240804 28620003 */ slti $v0, $v1, 3 /* CD7AE8 80240808 10400002 */ beqz $v0, .L80240814 -/* CD7AEC 8024080C 00000000 */ nop +/* CD7AEC 8024080C 00000000 */ nop .L80240810: /* CD7AF0 80240810 AE600070 */ sw $zero, 0x70($s3) .L80240814: diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240908_CD7BE8.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240908_CD7BE8.s index 0ede8b2436..0898fbfc5f 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240908_CD7BE8.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240908_CD7BE8.s @@ -42,11 +42,11 @@ glabel func_80240908_CD7BE8 .L8024099C: /* CD7C7C 8024099C 8E220070 */ lw $v0, 0x70($s1) /* CD7C80 802409A0 18400034 */ blez $v0, .L80240A74 -/* CD7C84 802409A4 00000000 */ nop +/* CD7C84 802409A4 00000000 */ nop /* CD7C88 802409A8 C62C0074 */ lwc1 $f12, 0x74($s1) /* CD7C8C 802409AC 46806320 */ cvt.s.w $f12, $f12 /* CD7C90 802409B0 44820000 */ mtc1 $v0, $f0 -/* CD7C94 802409B4 00000000 */ nop +/* CD7C94 802409B4 00000000 */ nop /* CD7C98 802409B8 46800020 */ cvt.s.w $f0, $f0 /* CD7C9C 802409BC 46000021 */ cvt.d.s $f0, $f0 /* CD7CA0 802409C0 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_80240908_CD7BE8 /* CD7D00 80240A20 27A70030 */ addiu $a3, $sp, 0x30 .L80240A24: /* CD7D04 80240A24 10400007 */ beqz $v0, .L80240A44 -/* CD7D08 80240A28 00000000 */ nop +/* CD7D08 80240A28 00000000 */ nop /* CD7D0C 80240A2C 4616A082 */ mul.s $f2, $f20, $f22 -/* CD7D10 80240A30 00000000 */ nop +/* CD7D10 80240A30 00000000 */ nop /* CD7D14 80240A34 C7A0002C */ lwc1 $f0, 0x2c($sp) /* CD7D18 80240A38 46180000 */ add.s $f0, $f0, $f24 /* CD7D1C 80240A3C 08090294 */ j .L80240A50 /* CD7D20 80240A40 46020000 */ add.s $f0, $f0, $f2 .L80240A44: /* CD7D24 80240A44 4616A002 */ mul.s $f0, $f20, $f22 -/* CD7D28 80240A48 00000000 */ nop +/* CD7D28 80240A48 00000000 */ nop /* CD7D2C 80240A4C 4600D000 */ add.s $f0, $f26, $f0 .L80240A50: /* CD7D30 80240A50 E600003C */ swc1 $f0, 0x3c($s0) /* CD7D34 80240A54 8E220074 */ lw $v0, 0x74($s1) /* CD7D38 80240A58 2442000A */ addiu $v0, $v0, 0xa /* CD7D3C 80240A5C 44826000 */ mtc1 $v0, $f12 -/* CD7D40 80240A60 00000000 */ nop +/* CD7D40 80240A60 00000000 */ nop /* CD7D44 80240A64 0C00A6C9 */ jal clamp_angle /* CD7D48 80240A68 46806320 */ cvt.s.w $f12, $f12 /* CD7D4C 80240A6C 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_80240908_CD7BE8 /* CD7D60 80240A80 860200A8 */ lh $v0, 0xa8($s0) /* CD7D64 80240A84 C600003C */ lwc1 $f0, 0x3c($s0) /* CD7D68 80240A88 44821000 */ mtc1 $v0, $f2 -/* CD7D6C 80240A8C 00000000 */ nop +/* CD7D6C 80240A8C 00000000 */ nop /* CD7D70 80240A90 468010A0 */ cvt.s.w $f2, $f2 /* CD7D74 80240A94 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* CD7D78 80240A98 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_80240908_CD7BE8 /* CD7D94 80240AB4 46240000 */ add.d $f0, $f0, $f4 /* CD7D98 80240AB8 460010A1 */ cvt.d.s $f2, $f2 /* CD7D9C 80240ABC 4620103C */ c.lt.d $f2, $f0 -/* CD7DA0 80240AC0 00000000 */ nop +/* CD7DA0 80240AC0 00000000 */ nop /* CD7DA4 80240AC4 4500002E */ bc1f .L80240B80 /* CD7DA8 80240AC8 0280202D */ daddu $a0, $s4, $zero /* CD7DAC 80240ACC 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_80240908_CD7BE8 /* CD7DEC 80240B0C 3C01C1A0 */ lui $at, 0xc1a0 /* CD7DF0 80240B10 44812000 */ mtc1 $at, $f4 /* CD7DF4 80240B14 44834000 */ mtc1 $v1, $f8 -/* CD7DF8 80240B18 00000000 */ nop +/* CD7DF8 80240B18 00000000 */ nop /* CD7DFC 80240B1C 46804220 */ cvt.s.w $f8, $f8 /* CD7E00 80240B20 44074000 */ mfc1 $a3, $f8 /* CD7E04 80240B24 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_80240908_CD7BE8 .L80240B80: /* CD7E60 80240B80 8602008C */ lh $v0, 0x8c($s0) /* CD7E64 80240B84 14400025 */ bnez $v0, .L80240C1C -/* CD7E68 80240B88 00000000 */ nop +/* CD7E68 80240B88 00000000 */ nop /* CD7E6C 80240B8C 8602008E */ lh $v0, 0x8e($s0) /* CD7E70 80240B90 1C400022 */ bgtz $v0, .L80240C1C -/* CD7E74 80240B94 00000000 */ nop +/* CD7E74 80240B94 00000000 */ nop /* CD7E78 80240B98 8E620074 */ lw $v0, 0x74($s3) /* CD7E7C 80240B9C 2442FFFF */ addiu $v0, $v0, -1 /* CD7E80 80240BA0 1840001D */ blez $v0, .L80240C18 @@ -183,7 +183,7 @@ glabel func_80240908_CD7BE8 /* CD7E8C 80240BAC 9442002A */ lhu $v0, 0x2a($v0) /* CD7E90 80240BB0 30420010 */ andi $v0, $v0, 0x10 /* CD7E94 80240BB4 14400007 */ bnez $v0, .L80240BD4 -/* CD7E98 80240BB8 00000000 */ nop +/* CD7E98 80240BB8 00000000 */ nop /* CD7E9C 80240BBC C600000C */ lwc1 $f0, 0xc($s0) /* CD7EA0 80240BC0 3C014334 */ lui $at, 0x4334 /* CD7EA4 80240BC4 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240D30_CD8010.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240D30_CD8010.s index 771c970692..b830a81c9a 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240D30_CD8010.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240D30_CD8010.s @@ -60,18 +60,18 @@ glabel func_80240D30_CD8010 /* CD80E8 80240E08 C6200038 */ lwc1 $f0, 0x38($s1) /* CD80EC 80240E0C 4600018D */ trunc.w.s $f6, $f0 /* CD80F0 80240E10 44023000 */ mfc1 $v0, $f6 -/* CD80F4 80240E14 00000000 */ nop +/* CD80F4 80240E14 00000000 */ nop /* CD80F8 80240E18 A6420010 */ sh $v0, 0x10($s2) /* CD80FC 80240E1C C620003C */ lwc1 $f0, 0x3c($s1) /* CD8100 80240E20 4600018D */ trunc.w.s $f6, $f0 /* CD8104 80240E24 44023000 */ mfc1 $v0, $f6 -/* CD8108 80240E28 00000000 */ nop +/* CD8108 80240E28 00000000 */ nop /* CD810C 80240E2C A6420012 */ sh $v0, 0x12($s2) /* CD8110 80240E30 C6200040 */ lwc1 $f0, 0x40($s1) /* CD8114 80240E34 A2430007 */ sb $v1, 7($s2) /* CD8118 80240E38 4600018D */ trunc.w.s $f6, $f0 /* CD811C 80240E3C 44023000 */ mfc1 $v0, $f6 -/* CD8120 80240E40 00000000 */ nop +/* CD8120 80240E40 00000000 */ nop /* CD8124 80240E44 A6420014 */ sh $v0, 0x14($s2) .L80240E48: /* CD8128 80240E48 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240EC8_CD81A8.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240EC8_CD81A8.s index 2a3b2e9557..fc73f48cdd 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240EC8_CD81A8.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240EC8_CD81A8.s @@ -42,9 +42,9 @@ glabel func_80240EC8_CD81A8 /* CD823C 80240F5C 44801800 */ mtc1 $zero, $f3 /* CD8240 80240F60 46002021 */ cvt.d.s $f0, $f4 /* CD8244 80240F64 4620103E */ c.le.d $f2, $f0 -/* CD8248 80240F68 00000000 */ nop +/* CD8248 80240F68 00000000 */ nop /* CD824C 80240F6C 45000030 */ bc1f .L80241030 -/* CD8250 80240F70 00000000 */ nop +/* CD8250 80240F70 00000000 */ nop /* CD8254 80240F74 C600003C */ lwc1 $f0, 0x3c($s0) /* CD8258 80240F78 46040000 */ add.s $f0, $f0, $f4 /* CD825C 80240F7C E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_80240EC8_CD81A8 /* CD82BC 80240FDC 27A70020 */ addiu $a3, $sp, 0x20 .L80240FE0: /* CD82C0 80240FE0 1040000B */ beqz $v0, .L80241010 -/* CD82C4 80240FE4 00000000 */ nop +/* CD82C4 80240FE4 00000000 */ nop /* CD82C8 80240FE8 C7A0001C */ lwc1 $f0, 0x1c($sp) /* CD82CC 80240FEC 46140080 */ add.s $f2, $f0, $f20 /* CD82D0 80240FF0 C600003C */ lwc1 $f0, 0x3c($s0) /* CD82D4 80240FF4 4600103E */ c.le.s $f2, $f0 -/* CD82D8 80240FF8 00000000 */ nop +/* CD82D8 80240FF8 00000000 */ nop /* CD82DC 80240FFC 4500008D */ bc1f .L80241234 -/* CD82E0 80241000 00000000 */ nop +/* CD82E0 80241000 00000000 */ nop /* CD82E4 80241004 E602003C */ swc1 $f2, 0x3c($s0) /* CD82E8 80241008 0809048D */ j .L80241234 /* CD82EC 8024100C AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_80240EC8_CD81A8 /* CD82F0 80241010 C602003C */ lwc1 $f2, 0x3c($s0) /* CD82F4 80241014 C6000064 */ lwc1 $f0, 0x64($s0) /* CD82F8 80241018 4602003E */ c.le.s $f0, $f2 -/* CD82FC 8024101C 00000000 */ nop +/* CD82FC 8024101C 00000000 */ nop /* CD8300 80241020 45030084 */ bc1tl .L80241234 /* CD8304 80241024 AE400070 */ sw $zero, 0x70($s2) /* CD8308 80241028 0809048D */ j .L80241234 -/* CD830C 8024102C 00000000 */ nop +/* CD830C 8024102C 00000000 */ nop .L80241030: /* CD8310 80241030 4622003C */ c.lt.d $f0, $f2 -/* CD8314 80241034 00000000 */ nop +/* CD8314 80241034 00000000 */ nop /* CD8318 80241038 4500007E */ bc1f .L80241234 -/* CD831C 8024103C 00000000 */ nop +/* CD831C 8024103C 00000000 */ nop /* CD8320 80241040 9602008E */ lhu $v0, 0x8e($s0) /* CD8324 80241044 24420001 */ addiu $v0, $v0, 1 /* CD8328 80241048 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_80240EC8_CD81A8 /* CD8334 80241054 00021403 */ sra $v0, $v0, 0x10 /* CD8338 80241058 0043102A */ slt $v0, $v0, $v1 /* CD833C 8024105C 14400026 */ bnez $v0, .L802410F8 -/* CD8340 80241060 00000000 */ nop +/* CD8340 80241060 00000000 */ nop /* CD8344 80241064 C60C0038 */ lwc1 $f12, 0x38($s0) /* CD8348 80241068 C60E0040 */ lwc1 $f14, 0x40($s0) /* CD834C 8024106C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_80240EC8_CD81A8 /* CD8378 80241098 8E62001C */ lw $v0, 0x1c($s3) /* CD837C 8024109C 46001005 */ abs.s $f0, $f2 /* CD8380 802410A0 44822000 */ mtc1 $v0, $f4 -/* CD8384 802410A4 00000000 */ nop +/* CD8384 802410A4 00000000 */ nop /* CD8388 802410A8 46802120 */ cvt.s.w $f4, $f4 /* CD838C 802410AC 4600203C */ c.lt.s $f4, $f0 -/* CD8390 802410B0 00000000 */ nop +/* CD8390 802410B0 00000000 */ nop /* CD8394 802410B4 4500000D */ bc1f .L802410EC -/* CD8398 802410B8 00000000 */ nop +/* CD8398 802410B8 00000000 */ nop /* CD839C 802410BC 44800000 */ mtc1 $zero, $f0 /* CD83A0 802410C0 C614000C */ lwc1 $f20, 0xc($s0) /* CD83A4 802410C4 4600103C */ c.lt.s $f2, $f0 -/* CD83A8 802410C8 00000000 */ nop +/* CD83A8 802410C8 00000000 */ nop /* CD83AC 802410CC 45000006 */ bc1f .L802410E8 /* CD83B0 802410D0 00021023 */ negu $v0, $v0 /* CD83B4 802410D4 44820000 */ mtc1 $v0, $f0 -/* CD83B8 802410D8 00000000 */ nop +/* CD83B8 802410D8 00000000 */ nop /* CD83BC 802410DC 46800020 */ cvt.s.w $f0, $f0 /* CD83C0 802410E0 0809043B */ j .L802410EC /* CD83C4 802410E4 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_80240EC8_CD81A8 /* CD83EC 8024110C C600001C */ lwc1 $f0, 0x1c($s0) /* CD83F0 80241110 46001080 */ add.s $f2, $f2, $f0 /* CD83F4 80241114 4616103C */ c.lt.s $f2, $f22 -/* CD83F8 80241118 00000000 */ nop +/* CD83F8 80241118 00000000 */ nop /* CD83FC 8024111C 45020045 */ bc1fl .L80241234 /* CD8400 80241120 E602003C */ swc1 $f2, 0x3c($s0) /* CD8404 80241124 0809048C */ j .L80241230 @@ -169,7 +169,7 @@ glabel func_80240EC8_CD81A8 /* CD841C 8024113C C600001C */ lwc1 $f0, 0x1c($s0) /* CD8420 80241140 C604003C */ lwc1 $f4, 0x3c($s0) /* CD8424 80241144 44821000 */ mtc1 $v0, $f2 -/* CD8428 80241148 00000000 */ nop +/* CD8428 80241148 00000000 */ nop /* CD842C 8024114C 468010A0 */ cvt.s.w $f2, $f2 /* CD8430 80241150 46000005 */ abs.s $f0, $f0 /* CD8434 80241154 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_80240EC8_CD81A8 /* CD8470 80241190 0C0372DF */ jal func_800DCB7C /* CD8474 80241194 27A70020 */ addiu $a3, $sp, 0x20 /* CD8478 80241198 10400015 */ beqz $v0, .L802411F0 -/* CD847C 8024119C 00000000 */ nop +/* CD847C 8024119C 00000000 */ nop /* CD8480 802411A0 860200A8 */ lh $v0, 0xa8($s0) /* CD8484 802411A4 C604001C */ lwc1 $f4, 0x1c($s0) /* CD8488 802411A8 44820000 */ mtc1 $v0, $f0 -/* CD848C 802411AC 00000000 */ nop +/* CD848C 802411AC 00000000 */ nop /* CD8490 802411B0 46800020 */ cvt.s.w $f0, $f0 /* CD8494 802411B4 46002085 */ abs.s $f2, $f4 /* CD8498 802411B8 46020000 */ add.s $f0, $f0, $f2 /* CD849C 802411BC C7A20024 */ lwc1 $f2, 0x24($sp) /* CD84A0 802411C0 4600103E */ c.le.s $f2, $f0 -/* CD84A4 802411C4 00000000 */ nop +/* CD84A4 802411C4 00000000 */ nop /* CD84A8 802411C8 45000005 */ bc1f .L802411E0 -/* CD84AC 802411CC 00000000 */ nop +/* CD84AC 802411CC 00000000 */ nop /* CD84B0 802411D0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* CD84B4 802411D4 AE00001C */ sw $zero, 0x1c($s0) /* CD84B8 802411D8 0809048D */ j .L80241234 @@ -217,13 +217,13 @@ glabel func_80240EC8_CD81A8 /* CD84D4 802411F4 860200A8 */ lh $v0, 0xa8($s0) /* CD84D8 802411F8 46163081 */ sub.s $f2, $f6, $f22 /* CD84DC 802411FC 44820000 */ mtc1 $v0, $f0 -/* CD84E0 80241200 00000000 */ nop +/* CD84E0 80241200 00000000 */ nop /* CD84E4 80241204 46800020 */ cvt.s.w $f0, $f0 /* CD84E8 80241208 46001080 */ add.s $f2, $f2, $f0 /* CD84EC 8024120C C604001C */ lwc1 $f4, 0x1c($s0) /* CD84F0 80241210 46002005 */ abs.s $f0, $f4 /* CD84F4 80241214 4602003C */ c.lt.s $f0, $f2 -/* CD84F8 80241218 00000000 */ nop +/* CD84F8 80241218 00000000 */ nop /* CD84FC 8024121C 45020005 */ bc1fl .L80241234 /* CD8500 80241220 AE00001C */ sw $zero, 0x1c($s0) /* CD8504 80241224 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241258_CD8538.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241258_CD8538.s index 92f641807d..885d271ad4 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241258_CD8538.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241258_CD8538.s @@ -49,15 +49,15 @@ glabel func_80241258_CD8538 /* CD85E0 80241300 44802000 */ mtc1 $zero, $f4 /* CD85E4 80241304 460010A1 */ cvt.d.s $f2, $f2 /* CD85E8 80241308 46241082 */ mul.d $f2, $f2, $f4 -/* CD85EC 8024130C 00000000 */ nop +/* CD85EC 8024130C 00000000 */ nop /* CD85F0 80241310 C7A0001C */ lwc1 $f0, 0x1c($sp) /* CD85F4 80241314 46000021 */ cvt.d.s $f0, $f0 /* CD85F8 80241318 46240002 */ mul.d $f0, $f0, $f4 -/* CD85FC 8024131C 00000000 */ nop +/* CD85FC 8024131C 00000000 */ nop /* CD8600 80241320 3C013FE0 */ lui $at, 0x3fe0 /* CD8604 80241324 44812800 */ mtc1 $at, $f5 /* CD8608 80241328 44802000 */ mtc1 $zero, $f4 -/* CD860C 8024132C 00000000 */ nop +/* CD860C 8024132C 00000000 */ nop /* CD8610 80241330 46241080 */ add.d $f2, $f2, $f4 /* CD8614 80241334 AE000074 */ sw $zero, 0x74($s0) /* CD8618 80241338 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s index 12d2232757..4aa1647a86 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s @@ -54,7 +54,7 @@ glabel func_8024137C_CD865C /* CD871C 8024143C 8E4300B0 */ lw $v1, 0xb0($s2) /* CD8720 80241440 30620004 */ andi $v0, $v1, 4 /* CD8724 80241444 10400007 */ beqz $v0, .L80241464 -/* CD8728 80241448 00000000 */ nop +/* CD8728 80241448 00000000 */ nop /* CD872C 8024144C 824200B4 */ lb $v0, 0xb4($s2) /* CD8730 80241450 1440003C */ bnez $v0, .L80241544 /* CD8734 80241454 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_8024137C_CD865C /* CD8748 80241468 2C62000F */ sltiu $v0, $v1, 0xf /* CD874C 8024146C 10400034 */ beqz $v0, .L80241540 /* CD8750 80241470 00031080 */ sll $v0, $v1, 2 -/* CD8754 80241474 3C018024 */ lui $at, %hi(D_80245318) +/* CD8754 80241474 3C018024 */ lui $at, %hi(jtbl_80245318_CDC5F8) /* CD8758 80241478 00220821 */ addu $at, $at, $v0 -/* CD875C 8024147C 8C225318 */ lw $v0, %lo(D_80245318)($at) +/* CD875C 8024147C 8C225318 */ lw $v0, %lo(jtbl_80245318_CDC5F8)($at) /* CD8760 80241480 00400008 */ jr $v0 -/* CD8764 80241484 00000000 */ nop +/* CD8764 80241484 00000000 */ nop +glabel L80241488_CD8768 /* CD8768 80241488 0280202D */ daddu $a0, $s4, $zero /* CD876C 8024148C 0200282D */ daddu $a1, $s0, $zero /* CD8770 80241490 0C09001C */ jal func_80240070_CD7350 /* CD8774 80241494 0260302D */ daddu $a2, $s3, $zero +glabel L80241498_CD8778 /* CD8778 80241498 0280202D */ daddu $a0, $s4, $zero /* CD877C 8024149C 0200282D */ daddu $a1, $s0, $zero /* CD8780 802414A0 0C090088 */ jal func_80240220_CD7500 /* CD8784 802414A4 0260302D */ daddu $a2, $s3, $zero /* CD8788 802414A8 08090551 */ j .L80241544 /* CD878C 802414AC 0000102D */ daddu $v0, $zero, $zero +glabel L802414B0_CD8790 /* CD8790 802414B0 0280202D */ daddu $a0, $s4, $zero /* CD8794 802414B4 0200282D */ daddu $a1, $s0, $zero /* CD8798 802414B8 0C090212 */ jal flo_17_UnkNpcAIFunc1 /* CD879C 802414BC 0260302D */ daddu $a2, $s3, $zero +glabel L802414C0_CD87A0 /* CD87A0 802414C0 0280202D */ daddu $a0, $s4, $zero /* CD87A4 802414C4 0200282D */ daddu $a1, $s0, $zero /* CD87A8 802414C8 0C090242 */ jal func_80240908_CD7BE8 /* CD87AC 802414CC 0260302D */ daddu $a2, $s3, $zero /* CD87B0 802414D0 08090551 */ j .L80241544 /* CD87B4 802414D4 0000102D */ daddu $v0, $zero, $zero +glabel L802414D8_CD87B8 /* CD87B8 802414D8 0280202D */ daddu $a0, $s4, $zero /* CD87BC 802414DC 0200282D */ daddu $a1, $s0, $zero /* CD87C0 802414E0 0C090313 */ jal flo_17_UnkNpcAIFunc2 /* CD87C4 802414E4 0260302D */ daddu $a2, $s3, $zero +glabel L802414E8_CD87C8 /* CD87C8 802414E8 0280202D */ daddu $a0, $s4, $zero /* CD87CC 802414EC 0200282D */ daddu $a1, $s0, $zero /* CD87D0 802414F0 0C090331 */ jal func_80240CC4_CD7FA4 /* CD87D4 802414F4 0260302D */ daddu $a2, $s3, $zero /* CD87D8 802414F8 08090551 */ j .L80241544 /* CD87DC 802414FC 0000102D */ daddu $v0, $zero, $zero +glabel L80241500_CD87E0 /* CD87E0 80241500 0280202D */ daddu $a0, $s4, $zero /* CD87E4 80241504 0200282D */ daddu $a1, $s0, $zero /* CD87E8 80241508 0C09034C */ jal func_80240D30_CD8010 /* CD87EC 8024150C 0260302D */ daddu $a2, $s3, $zero /* CD87F0 80241510 08090551 */ j .L80241544 /* CD87F4 80241514 0000102D */ daddu $v0, $zero, $zero +glabel L80241518_CD87F8 /* CD87F8 80241518 0280202D */ daddu $a0, $s4, $zero /* CD87FC 8024151C 0200282D */ daddu $a1, $s0, $zero /* CD8800 80241520 0C090399 */ jal flo_17_UnkNpcAIFunc3 /* CD8804 80241524 0260302D */ daddu $a2, $s3, $zero /* CD8808 80241528 08090551 */ j .L80241544 /* CD880C 8024152C 0000102D */ daddu $v0, $zero, $zero +glabel L80241530_CD8810 /* CD8810 80241530 0280202D */ daddu $a0, $s4, $zero /* CD8814 80241534 0200282D */ daddu $a1, $s0, $zero /* CD8818 80241538 0C0903B2 */ jal func_80240EC8_CD81A8 /* CD881C 8024153C 0260302D */ daddu $a2, $s3, $zero .L80241540: +glabel L80241540_CD8820 /* CD8820 80241540 0000102D */ daddu $v0, $zero, $zero .L80241544: /* CD8824 80241544 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802415B0_CD8890.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802415B0_CD8890.s index fbf58d9e86..d1ea718cc6 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802415B0_CD8890.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802415B0_CD8890.s @@ -71,7 +71,7 @@ glabel func_802415B0_CD8890 /* CD8994 802416B4 0C00A8BB */ jal sin_deg /* CD8998 802416B8 46806320 */ cvt.s.w $f12, $f12 /* CD899C 802416BC 46140002 */ mul.s $f0, $f0, $f20 -/* CD89A0 802416C0 00000000 */ nop +/* CD89A0 802416C0 00000000 */ nop /* CD89A4 802416C4 C7A2002C */ lwc1 $f2, 0x2c($sp) /* CD89A8 802416C8 46181080 */ add.s $f2, $f2, $f24 /* CD89AC 802416CC 46001080 */ add.s $f2, $f2, $f0 @@ -79,14 +79,14 @@ glabel func_802415B0_CD8890 /* CD89B4 802416D4 8E220074 */ lw $v0, 0x74($s1) /* CD89B8 802416D8 2442000C */ addiu $v0, $v0, 0xc /* CD89BC 802416DC 44826000 */ mtc1 $v0, $f12 -/* CD89C0 802416E0 00000000 */ nop +/* CD89C0 802416E0 00000000 */ nop /* CD89C4 802416E4 0C00A6C9 */ jal clamp_angle /* CD89C8 802416E8 46806320 */ cvt.s.w $f12, $f12 /* CD89CC 802416EC 4600020D */ trunc.w.s $f8, $f0 /* CD89D0 802416F0 E6280074 */ swc1 $f8, 0x74($s1) /* CD89D4 802416F4 8EE30014 */ lw $v1, 0x14($s7) /* CD89D8 802416F8 0460003C */ bltz $v1, .L802417EC -/* CD89DC 802416FC 00000000 */ nop +/* CD89DC 802416FC 00000000 */ nop /* CD89E0 80241700 8E420074 */ lw $v0, 0x74($s2) /* CD89E4 80241704 1C400038 */ bgtz $v0, .L802417E8 /* CD89E8 80241708 2442FFFF */ addiu $v0, $v0, -1 @@ -111,7 +111,7 @@ glabel func_802415B0_CD8890 /* CD8A34 80241754 2402000F */ addiu $v0, $zero, 0xf /* CD8A38 80241758 AFA2001C */ sw $v0, 0x1c($sp) /* CD8A3C 8024175C 44834000 */ mtc1 $v1, $f8 -/* CD8A40 80241760 00000000 */ nop +/* CD8A40 80241760 00000000 */ nop /* CD8A44 80241764 46804220 */ cvt.s.w $f8, $f8 /* CD8A48 80241768 44074000 */ mfc1 $a3, $f8 /* CD8A4C 8024176C 27A20038 */ addiu $v0, $sp, 0x38 @@ -170,7 +170,7 @@ glabel func_802415B0_CD8890 /* CD8B14 80241834 0C0123F5 */ jal is_point_within_region /* CD8B18 80241838 8E070038 */ lw $a3, 0x38($s0) /* CD8B1C 8024183C 1040000D */ beqz $v0, .L80241874 -/* CD8B20 80241840 00000000 */ nop +/* CD8B20 80241840 00000000 */ nop /* CD8B24 80241844 8E2200D0 */ lw $v0, 0xd0($s1) /* CD8B28 80241848 C60C0038 */ lwc1 $f12, 0x38($s0) /* CD8B2C 8024184C C60E0040 */ lwc1 $f14, 0x40($s0) @@ -181,12 +181,12 @@ glabel func_802415B0_CD8890 /* CD8B40 80241860 46804220 */ cvt.s.w $f8, $f8 /* CD8B44 80241864 44074000 */ mfc1 $a3, $f8 /* CD8B48 80241868 0C00A720 */ jal atan2 -/* CD8B4C 8024186C 00000000 */ nop +/* CD8B4C 8024186C 00000000 */ nop /* CD8B50 80241870 E600000C */ swc1 $f0, 0xc($s0) .L80241874: /* CD8B54 80241874 8602008C */ lh $v0, 0x8c($s0) /* CD8B58 80241878 14400056 */ bnez $v0, .L802419D4 -/* CD8B5C 8024187C 00000000 */ nop +/* CD8B5C 8024187C 00000000 */ nop /* CD8B60 80241880 8602008E */ lh $v0, 0x8e($s0) /* CD8B64 80241884 1840003D */ blez $v0, .L8024197C /* CD8B68 80241888 240403E8 */ addiu $a0, $zero, 0x3e8 @@ -221,7 +221,7 @@ glabel func_802415B0_CD8890 /* CD8BDC 802418FC E7A4002C */ swc1 $f4, 0x2c($sp) /* CD8BE0 80241900 460000A1 */ cvt.d.s $f2, $f0 /* CD8BE4 80241904 4622303C */ c.lt.d $f6, $f2 -/* CD8BE8 80241908 00000000 */ nop +/* CD8BE8 80241908 00000000 */ nop /* CD8BEC 8024190C 45000005 */ bc1f .L80241924 /* CD8BF0 80241910 E7A00034 */ swc1 $f0, 0x34($sp) /* CD8BF4 80241914 4600B021 */ cvt.d.s $f0, $f22 @@ -232,9 +232,9 @@ glabel func_802415B0_CD8890 /* CD8C04 80241924 3C01C000 */ lui $at, 0xc000 /* CD8C08 80241928 44810800 */ mtc1 $at, $f1 /* CD8C0C 8024192C 44800000 */ mtc1 $zero, $f0 -/* CD8C10 80241930 00000000 */ nop +/* CD8C10 80241930 00000000 */ nop /* CD8C14 80241934 4620103C */ c.lt.d $f2, $f0 -/* CD8C18 80241938 00000000 */ nop +/* CD8C18 80241938 00000000 */ nop /* CD8C1C 8024193C 45020004 */ bc1fl .L80241950 /* CD8C20 80241940 46002586 */ mov.s $f22, $f4 /* CD8C24 80241944 4600B021 */ cvt.d.s $f0, $f22 @@ -246,7 +246,7 @@ glabel func_802415B0_CD8890 /* CD8C38 80241958 44801000 */ mtc1 $zero, $f2 /* CD8C3C 8024195C 4600B021 */ cvt.d.s $f0, $f22 /* CD8C40 80241960 46220002 */ mul.d $f0, $f0, $f2 -/* CD8C44 80241964 00000000 */ nop +/* CD8C44 80241964 00000000 */ nop /* CD8C48 80241968 4620020D */ trunc.w.d $f8, $f0 /* CD8C4C 8024196C E628007C */ swc1 $f8, 0x7c($s1) .L80241970: diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241A14_CD8CF4.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241A14_CD8CF4.s index a0327cb53e..3ceed9db5d 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241A14_CD8CF4.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241A14_CD8CF4.s @@ -57,7 +57,7 @@ glabel func_80241A14_CD8CF4 /* CD8DC0 80241AE0 0C00A8BB */ jal sin_deg /* CD8DC4 80241AE4 46806320 */ cvt.s.w $f12, $f12 /* CD8DC8 80241AE8 46140002 */ mul.s $f0, $f0, $f20 -/* CD8DCC 80241AEC 00000000 */ nop +/* CD8DCC 80241AEC 00000000 */ nop /* CD8DD0 80241AF0 C7A2002C */ lwc1 $f2, 0x2c($sp) /* CD8DD4 80241AF4 46161080 */ add.s $f2, $f2, $f22 /* CD8DD8 80241AF8 46001080 */ add.s $f2, $f2, $f0 @@ -65,7 +65,7 @@ glabel func_80241A14_CD8CF4 /* CD8DE0 80241B00 8E220074 */ lw $v0, 0x74($s1) /* CD8DE4 80241B04 2442000C */ addiu $v0, $v0, 0xc /* CD8DE8 80241B08 44826000 */ mtc1 $v0, $f12 -/* CD8DEC 80241B0C 00000000 */ nop +/* CD8DEC 80241B0C 00000000 */ nop /* CD8DF0 80241B10 0C00A6C9 */ jal clamp_angle /* CD8DF4 80241B14 46806320 */ cvt.s.w $f12, $f12 /* CD8DF8 80241B18 4600028D */ trunc.w.s $f10, $f0 @@ -91,7 +91,7 @@ glabel func_80241A14_CD8CF4 /* CD8E48 80241B68 2402000F */ addiu $v0, $zero, 0xf /* CD8E4C 80241B6C AFA2001C */ sw $v0, 0x1c($sp) /* CD8E50 80241B70 44835000 */ mtc1 $v1, $f10 -/* CD8E54 80241B74 00000000 */ nop +/* CD8E54 80241B74 00000000 */ nop /* CD8E58 80241B78 468052A0 */ cvt.s.w $f10, $f10 /* CD8E5C 80241B7C 44075000 */ mfc1 $a3, $f10 /* CD8E60 80241B80 27A20038 */ addiu $v0, $sp, 0x38 @@ -110,10 +110,10 @@ glabel func_80241A14_CD8CF4 .L80241BB4: /* CD8E94 80241BB4 8602008C */ lh $v0, 0x8c($s0) /* CD8E98 80241BB8 14400020 */ bnez $v0, .L80241C3C -/* CD8E9C 80241BBC 00000000 */ nop +/* CD8E9C 80241BBC 00000000 */ nop /* CD8EA0 80241BC0 8602008E */ lh $v0, 0x8e($s0) /* CD8EA4 80241BC4 1C40001D */ bgtz $v0, .L80241C3C -/* CD8EA8 80241BC8 00000000 */ nop +/* CD8EA8 80241BC8 00000000 */ nop /* CD8EAC 80241BCC 8E420074 */ lw $v0, 0x74($s2) /* CD8EB0 80241BD0 2442FFFF */ addiu $v0, $v0, -1 /* CD8EB4 80241BD4 18400018 */ blez $v0, .L80241C38 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s index 5b3100ed02..dfb0881690 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s @@ -57,7 +57,7 @@ glabel func_80241C64_CD8F44 /* CD9010 80241D30 8E6300B0 */ lw $v1, 0xb0($s3) /* CD9014 80241D34 30620004 */ andi $v0, $v1, 4 /* CD9018 80241D38 10400007 */ beqz $v0, .L80241D58 -/* CD901C 80241D3C 00000000 */ nop +/* CD901C 80241D3C 00000000 */ nop /* CD9020 80241D40 826200B4 */ lb $v0, 0xb4($s3) /* CD9024 80241D44 144000F4 */ bnez $v0, .L80242118 /* CD9028 80241D48 0000102D */ daddu $v0, $zero, $zero @@ -74,14 +74,14 @@ glabel func_80241C64_CD8F44 /* CD9050 80241D70 10600009 */ beqz $v1, .L80241D98 /* CD9054 80241D74 2402000C */ addiu $v0, $zero, 0xc /* CD9058 80241D78 0809077A */ j .L80241DE8 -/* CD905C 80241D7C 00000000 */ nop +/* CD905C 80241D7C 00000000 */ nop .L80241D80: /* CD9060 80241D80 1062000F */ beq $v1, $v0, .L80241DC0 /* CD9064 80241D84 24020003 */ addiu $v0, $zero, 3 /* CD9068 80241D88 10620012 */ beq $v1, $v0, .L80241DD4 /* CD906C 80241D8C 0280202D */ daddu $a0, $s4, $zero /* CD9070 80241D90 08090778 */ j .L80241DE0 -/* CD9074 80241D94 00000000 */ nop +/* CD9074 80241D94 00000000 */ nop .L80241D98: /* CD9078 80241D98 0280202D */ daddu $a0, $s4, $zero /* CD907C 80241D9C 02C0282D */ daddu $a1, $s6, $zero @@ -93,7 +93,7 @@ glabel func_80241C64_CD8F44 /* CD9090 80241DB0 0C09056C */ jal func_802415B0_CD8890 /* CD9094 80241DB4 02A0302D */ daddu $a2, $s5, $zero /* CD9098 80241DB8 08090778 */ j .L80241DE0 -/* CD909C 80241DBC 00000000 */ nop +/* CD909C 80241DBC 00000000 */ nop .L80241DC0: /* CD90A0 80241DC0 0280202D */ daddu $a0, $s4, $zero /* CD90A4 80241DC4 02C0282D */ daddu $a1, $s6, $zero @@ -109,7 +109,7 @@ glabel func_80241C64_CD8F44 /* CD90C4 80241DE4 2402000C */ addiu $v0, $zero, 0xc .L80241DE8: /* CD90C8 80241DE8 1462001A */ bne $v1, $v0, .L80241E54 -/* CD90CC 80241DEC 00000000 */ nop +/* CD90CC 80241DEC 00000000 */ nop /* CD90D0 80241DF0 C64C0038 */ lwc1 $f12, 0x38($s2) /* CD90D4 80241DF4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* CD90D8 80241DF8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -145,13 +145,13 @@ glabel func_80241C64_CD8F44 /* CD914C 80241E6C 10620008 */ beq $v1, $v0, .L80241E90 /* CD9150 80241E70 2410001F */ addiu $s0, $zero, 0x1f /* CD9154 80241E74 080907B3 */ j .L80241ECC -/* CD9158 80241E78 00000000 */ nop +/* CD9158 80241E78 00000000 */ nop .L80241E7C: /* CD915C 80241E7C 2402000E */ addiu $v0, $zero, 0xe /* CD9160 80241E80 1062000D */ beq $v1, $v0, .L80241EB8 /* CD9164 80241E84 0280202D */ daddu $a0, $s4, $zero /* CD9168 80241E88 080907B1 */ j .L80241EC4 -/* CD916C 80241E8C 00000000 */ nop +/* CD916C 80241E8C 00000000 */ nop .L80241E90: /* CD9170 80241E90 0280202D */ daddu $a0, $s4, $zero /* CD9174 80241E94 02C0282D */ daddu $a1, $s6, $zero @@ -163,7 +163,7 @@ glabel func_80241C64_CD8F44 /* CD9188 80241EA8 0C090399 */ jal flo_17_UnkNpcAIFunc3 /* CD918C 80241EAC 02A0302D */ daddu $a2, $s5, $zero /* CD9190 80241EB0 080907B1 */ j .L80241EC4 -/* CD9194 80241EB4 00000000 */ nop +/* CD9194 80241EB4 00000000 */ nop .L80241EB8: /* CD9198 80241EB8 02C0282D */ daddu $a1, $s6, $zero /* CD919C 80241EBC 0C0903B2 */ jal func_80240EC8_CD81A8 @@ -177,24 +177,24 @@ glabel func_80241C64_CD8F44 /* CD91B4 80241ED4 10400005 */ beqz $v0, .L80241EEC /* CD91B8 80241ED8 2402001E */ addiu $v0, $zero, 0x1e /* CD91BC 80241EDC 1062000A */ beq $v1, $v0, .L80241F08 -/* CD91C0 80241EE0 00000000 */ nop +/* CD91C0 80241EE0 00000000 */ nop /* CD91C4 80241EE4 080907EE */ j .L80241FB8 -/* CD91C8 80241EE8 00000000 */ nop +/* CD91C8 80241EE8 00000000 */ nop .L80241EEC: /* CD91CC 80241EEC 24020020 */ addiu $v0, $zero, 0x20 /* CD91D0 80241EF0 10620022 */ beq $v1, $v0, .L80241F7C /* CD91D4 80241EF4 24020021 */ addiu $v0, $zero, 0x21 /* CD91D8 80241EF8 10620029 */ beq $v1, $v0, .L80241FA0 -/* CD91DC 80241EFC 00000000 */ nop +/* CD91DC 80241EFC 00000000 */ nop /* CD91E0 80241F00 080907EE */ j .L80241FB8 -/* CD91E4 80241F04 00000000 */ nop +/* CD91E4 80241F04 00000000 */ nop .L80241F08: /* CD91E8 80241F08 9642008E */ lhu $v0, 0x8e($s2) /* CD91EC 80241F0C 2442FFFF */ addiu $v0, $v0, -1 /* CD91F0 80241F10 A642008E */ sh $v0, 0x8e($s2) /* CD91F4 80241F14 00021400 */ sll $v0, $v0, 0x10 /* CD91F8 80241F18 1C400027 */ bgtz $v0, .L80241FB8 -/* CD91FC 80241F1C 00000000 */ nop +/* CD91FC 80241F1C 00000000 */ nop /* CD9200 80241F20 0C00FB3A */ jal get_enemy /* CD9204 80241F24 8E64007C */ lw $a0, 0x7c($s3) /* CD9208 80241F28 24030002 */ addiu $v1, $zero, 2 @@ -282,25 +282,25 @@ glabel func_80241C64_CD8F44 /* CD9340 80242060 44800000 */ mtc1 $zero, $f0 /* CD9344 80242064 4600A0A1 */ cvt.d.s $f2, $f20 /* CD9348 80242068 4622003C */ c.lt.d $f0, $f2 -/* CD934C 8024206C 00000000 */ nop +/* CD934C 8024206C 00000000 */ nop /* CD9350 80242070 45000029 */ bc1f .L80242118 -/* CD9354 80242074 00000000 */ nop +/* CD9354 80242074 00000000 */ nop /* CD9358 80242078 8642008C */ lh $v0, 0x8c($s2) /* CD935C 8024207C 54400026 */ bnel $v0, $zero, .L80242118 /* CD9360 80242080 0000102D */ daddu $v0, $zero, $zero /* CD9364 80242084 3C014034 */ lui $at, 0x4034 /* CD9368 80242088 44810800 */ mtc1 $at, $f1 /* CD936C 8024208C 44800000 */ mtc1 $zero, $f0 -/* CD9370 80242090 00000000 */ nop +/* CD9370 80242090 00000000 */ nop /* CD9374 80242094 46201001 */ sub.d $f0, $f2, $f0 /* CD9378 80242098 44801000 */ mtc1 $zero, $f2 /* CD937C 8024209C 44801800 */ mtc1 $zero, $f3 /* CD9380 802420A0 46200120 */ cvt.s.d $f4, $f0 /* CD9384 802420A4 46002021 */ cvt.d.s $f0, $f4 /* CD9388 802420A8 4622003C */ c.lt.d $f0, $f2 -/* CD938C 802420AC 00000000 */ nop +/* CD938C 802420AC 00000000 */ nop /* CD9390 802420B0 45000002 */ bc1f .L802420BC -/* CD9394 802420B4 00000000 */ nop +/* CD9394 802420B4 00000000 */ nop /* CD9398 802420B8 44802000 */ mtc1 $zero, $f4 .L802420BC: /* CD939C 802420BC 3C014069 */ lui $at, 0x4069 @@ -308,7 +308,7 @@ glabel func_80241C64_CD8F44 /* CD93A4 802420C4 44801000 */ mtc1 $zero, $f2 /* CD93A8 802420C8 46002021 */ cvt.d.s $f0, $f4 /* CD93AC 802420CC 4620103C */ c.lt.d $f2, $f0 -/* CD93B0 802420D0 00000000 */ nop +/* CD93B0 802420D0 00000000 */ nop /* CD93B4 802420D4 45000003 */ bc1f .L802420E4 /* CD93B8 802420D8 240200C8 */ addiu $v0, $zero, 0xc8 /* CD93BC 802420DC 3C014348 */ lui $at, 0x4348 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802421C0_CD94A0.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802421C0_CD94A0.s index db694c13cb..f91f8feb91 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802421C0_CD94A0.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802421C0_CD94A0.s @@ -21,11 +21,11 @@ glabel func_802421C0_CD94A0 /* CD94E0 80242200 A602008E */ sh $v0, 0x8e($s0) /* CD94E4 80242204 00021400 */ sll $v0, $v0, 0x10 /* CD94E8 80242208 1C400033 */ bgtz $v0, .L802422D8 -/* CD94EC 8024220C 00000000 */ nop +/* CD94EC 8024220C 00000000 */ nop .L80242210: /* CD94F0 80242210 8602008C */ lh $v0, 0x8c($s0) /* CD94F4 80242214 14400030 */ bnez $v0, .L802422D8 -/* CD94F8 80242218 00000000 */ nop +/* CD94F8 80242218 00000000 */ nop /* CD94FC 8024221C 8E2200CC */ lw $v0, 0xcc($s1) /* CD9500 80242220 8C420024 */ lw $v0, 0x24($v0) /* CD9504 80242224 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_802421C0_CD94A0 /* CD9510 80242230 8E230088 */ lw $v1, 0x88($s1) /* CD9514 80242234 24020005 */ addiu $v0, $zero, 5 /* CD9518 80242238 10620005 */ beq $v1, $v0, .L80242250 -/* CD951C 8024223C 00000000 */ nop +/* CD951C 8024223C 00000000 */ nop /* CD9520 80242240 10600003 */ beqz $v1, .L80242250 /* CD9524 80242244 24020001 */ addiu $v0, $zero, 1 /* CD9528 80242248 14620006 */ bne $v1, $v0, .L80242264 -/* CD952C 8024224C 00000000 */ nop +/* CD952C 8024224C 00000000 */ nop .L80242250: /* CD9530 80242250 8E220084 */ lw $v0, 0x84($s1) /* CD9534 80242254 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_802421C0_CD94A0 /* CD9574 80242294 46220000 */ add.d $f0, $f0, $f2 /* CD9578 80242298 4620010D */ trunc.w.d $f4, $f0 /* CD957C 8024229C 44022000 */ mfc1 $v0, $f4 -/* CD9580 802422A0 00000000 */ nop +/* CD9580 802422A0 00000000 */ nop /* CD9584 802422A4 A602008E */ sh $v0, 0x8e($s0) /* CD9588 802422A8 00021400 */ sll $v0, $v0, 0x10 /* CD958C 802422AC 8E230078 */ lw $v1, 0x78($s1) /* CD9590 802422B0 00021403 */ sra $v0, $v0, 0x10 /* CD9594 802422B4 0043102A */ slt $v0, $v0, $v1 /* CD9598 802422B8 10400003 */ beqz $v0, .L802422C8 -/* CD959C 802422BC 00000000 */ nop +/* CD959C 802422BC 00000000 */ nop /* CD95A0 802422C0 9622007A */ lhu $v0, 0x7a($s1) /* CD95A4 802422C4 A602008E */ sh $v0, 0x8e($s0) .L802422C8: diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s index d4cf8c8a21..f0b4b635e1 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s @@ -279,15 +279,17 @@ glabel func_802424D8_CD97B8 /* CD9BA4 802428C4 2C620015 */ sltiu $v0, $v1, 0x15 /* CD9BA8 802428C8 10400009 */ beqz $v0, .L802428F0 /* CD9BAC 802428CC 00031080 */ sll $v0, $v1, 2 -/* CD9BB0 802428D0 3C018024 */ lui $at, %hi(D_80245360) +/* CD9BB0 802428D0 3C018024 */ lui $at, %hi(jtbl_80245360_CDC640) /* CD9BB4 802428D4 00220821 */ addu $at, $at, $v0 -/* CD9BB8 802428D8 8C225360 */ lw $v0, %lo(D_80245360)($at) +/* CD9BB8 802428D8 8C225360 */ lw $v0, %lo(jtbl_80245360_CDC640)($at) /* CD9BBC 802428DC 00400008 */ jr $v0 /* CD9BC0 802428E0 00000000 */ nop +glabel L802428E4_CD9BC4 /* CD9BC4 802428E4 8E420028 */ lw $v0, 0x28($s2) /* CD9BC8 802428E8 24420001 */ addiu $v0, $v0, 1 /* CD9BCC 802428EC AE420028 */ sw $v0, 0x28($s2) .L802428F0: +glabel L802428F0_CD9BD0 /* CD9BD0 802428F0 0000102D */ daddu $v0, $zero, $zero .L802428F4: /* CD9BD4 802428F4 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_18/CDCBD0/func_80240530_CDCBD0.s b/asm/nonmatchings/world/area_flo/flo_18/CDCBD0/func_80240530_CDCBD0.s index 0d79c46658..fa52900bf2 100644 --- a/asm/nonmatchings/world/area_flo/flo_18/CDCBD0/func_80240530_CDCBD0.s +++ b/asm/nonmatchings/world/area_flo/flo_18/CDCBD0/func_80240530_CDCBD0.s @@ -24,5 +24,5 @@ glabel func_80240530_CDCBD0 /* CDCC1C 8024057C 24020002 */ addiu $v0, $zero, 2 /* CDCC20 80240580 03E00008 */ jr $ra /* CDCC24 80240584 27BD0018 */ addiu $sp, $sp, 0x18 -/* CDCC28 80240588 00000000 */ nop -/* CDCC2C 8024058C 00000000 */ nop +/* CDCC28 80240588 00000000 */ nop +/* CDCC2C 8024058C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240340_CE3A30.s b/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240340_CE3A30.s index 226345618d..6ac0e23021 100644 --- a/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240340_CE3A30.s +++ b/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240340_CE3A30.s @@ -52,13 +52,13 @@ glabel func_80240340_CE3A30 /* CE3AEC 802403FC 44812000 */ mtc1 $at, $f4 /* CE3AF0 80240400 46020003 */ div.s $f0, $f0, $f2 /* CE3AF4 80240404 46040582 */ mul.s $f22, $f0, $f4 -/* CE3AF8 80240408 00000000 */ nop +/* CE3AF8 80240408 00000000 */ nop /* CE3AFC 8024040C 4618A501 */ sub.s $f20, $f20, $f24 /* CE3B00 80240410 3C013F00 */ lui $at, 0x3f00 /* CE3B04 80240414 44810000 */ mtc1 $at, $f0 /* CE3B08 80240418 4600A505 */ abs.s $f20, $f20 /* CE3B0C 8024041C 4600A502 */ mul.s $f20, $f20, $f0 -/* CE3B10 80240420 00000000 */ nop +/* CE3B10 80240420 00000000 */ nop /* CE3B14 80240424 12000007 */ beqz $s0, .L80240444 /* CE3B18 80240428 0233102A */ slt $v0, $s1, $s3 /* CE3B1C 8024042C 10400005 */ beqz $v0, .L80240444 @@ -72,18 +72,18 @@ glabel func_80240340_CE3A30 /* CE3B38 80240448 34210FD8 */ ori $at, $at, 0xfd8 /* CE3B3C 8024044C 44810000 */ mtc1 $at, $f0 /* CE3B40 80240450 44936000 */ mtc1 $s3, $f12 -/* CE3B44 80240454 00000000 */ nop +/* CE3B44 80240454 00000000 */ nop /* CE3B48 80240458 46806320 */ cvt.s.w $f12, $f12 /* CE3B4C 8024045C 46006302 */ mul.s $f12, $f12, $f0 -/* CE3B50 80240460 00000000 */ nop +/* CE3B50 80240460 00000000 */ nop /* CE3B54 80240464 44910000 */ mtc1 $s1, $f0 -/* CE3B58 80240468 00000000 */ nop +/* CE3B58 80240468 00000000 */ nop /* CE3B5C 8024046C 46800020 */ cvt.s.w $f0, $f0 /* CE3B60 80240470 46006303 */ div.s $f12, $f12, $f0 /* CE3B64 80240474 0C00A874 */ jal cos_rad /* CE3B68 80240478 46166300 */ add.s $f12, $f12, $f22 /* CE3B6C 8024047C 4600A002 */ mul.s $f0, $f20, $f0 -/* CE3B70 80240480 00000000 */ nop +/* CE3B70 80240480 00000000 */ nop /* CE3B74 80240484 4614C080 */ add.s $f2, $f24, $f20 /* CE3B78 80240488 46001081 */ sub.s $f2, $f2, $f0 /* CE3B7C 8024048C 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240540_CE3C30.s b/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240540_CE3C30.s index 88bac9acad..47f801f103 100644 --- a/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240540_CE3C30.s +++ b/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240540_CE3C30.s @@ -22,7 +22,7 @@ glabel func_80240540_CE3C30 /* CE3C74 80240584 468010A0 */ cvt.s.w $f2, $f2 /* CE3C78 80240588 44071000 */ mfc1 $a3, $f2 /* CE3C7C 8024058C 4482A000 */ mtc1 $v0, $f20 -/* CE3C80 80240590 00000000 */ nop +/* CE3C80 80240590 00000000 */ nop /* CE3C84 80240594 4680A520 */ cvt.s.w $f20, $f20 /* CE3C88 80240598 0C00A7B5 */ jal dist2D /* CE3C8C 8024059C 4600B386 */ mov.s $f14, $f22 @@ -42,7 +42,7 @@ glabel func_80240540_CE3C30 /* CE3CC4 802405D4 0C00A8BB */ jal sin_deg /* CE3CC8 802405D8 4600A306 */ mov.s $f12, $f20 /* CE3CCC 802405DC 4600C002 */ mul.s $f0, $f24, $f0 -/* CE3CD0 802405E0 00000000 */ nop +/* CE3CD0 802405E0 00000000 */ nop /* CE3CD4 802405E4 46160000 */ add.s $f0, $f0, $f22 /* CE3CD8 802405E8 3C118011 */ lui $s1, %hi(gPlayerStatus) /* CE3CDC 802405EC 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) @@ -57,12 +57,12 @@ glabel func_80240540_CE3C30 /* CE3D00 80240610 4600A306 */ mov.s $f12, $f20 /* CE3D04 80240614 02028021 */ addu $s0, $s0, $v0 /* CE3D08 80240618 44900000 */ mtc1 $s0, $f0 -/* CE3D0C 8024061C 00000000 */ nop +/* CE3D0C 8024061C 00000000 */ nop /* CE3D10 80240620 46800020 */ cvt.s.w $f0, $f0 /* CE3D14 80240624 0C00A8D4 */ jal cos_deg /* CE3D18 80240628 E620002C */ swc1 $f0, 0x2c($s1) /* CE3D1C 8024062C 4600C602 */ mul.s $f24, $f24, $f0 -/* CE3D20 80240630 00000000 */ nop +/* CE3D20 80240630 00000000 */ nop /* CE3D24 80240634 4618B581 */ sub.s $f22, $f22, $f24 /* CE3D28 80240638 E6360030 */ swc1 $f22, 0x30($s1) /* CE3D2C 8024063C 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240660_CE3D50.s b/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240660_CE3D50.s index b7bfe9b4a9..172af61515 100644 --- a/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240660_CE3D50.s +++ b/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240660_CE3D50.s @@ -25,7 +25,7 @@ glabel func_80240660_CE3D50 /* CE3DA0 802406B0 468010A0 */ cvt.s.w $f2, $f2 /* CE3DA4 802406B4 44071000 */ mfc1 $a3, $f2 /* CE3DA8 802406B8 4482A000 */ mtc1 $v0, $f20 -/* CE3DAC 802406BC 00000000 */ nop +/* CE3DAC 802406BC 00000000 */ nop /* CE3DB0 802406C0 4680A520 */ cvt.s.w $f20, $f20 /* CE3DB4 802406C4 0C00A7B5 */ jal dist2D /* CE3DB8 802406C8 4600B386 */ mov.s $f14, $f22 @@ -45,7 +45,7 @@ glabel func_80240660_CE3D50 /* CE3DF0 80240700 0C00A8BB */ jal sin_deg /* CE3DF4 80240704 4600A306 */ mov.s $f12, $f20 /* CE3DF8 80240708 4600C002 */ mul.s $f0, $f24, $f0 -/* CE3DFC 8024070C 00000000 */ nop +/* CE3DFC 8024070C 00000000 */ nop /* CE3E00 80240710 46160000 */ add.s $f0, $f0, $f22 /* CE3E04 80240714 E6200038 */ swc1 $f0, 0x38($s1) /* CE3E08 80240718 8E0500B8 */ lw $a1, 0xb8($s0) @@ -58,12 +58,12 @@ glabel func_80240660_CE3D50 /* CE3E24 80240734 4600A306 */ mov.s $f12, $f20 /* CE3E28 80240738 02028021 */ addu $s0, $s0, $v0 /* CE3E2C 8024073C 44900000 */ mtc1 $s0, $f0 -/* CE3E30 80240740 00000000 */ nop +/* CE3E30 80240740 00000000 */ nop /* CE3E34 80240744 46800020 */ cvt.s.w $f0, $f0 /* CE3E38 80240748 0C00A8D4 */ jal cos_deg /* CE3E3C 8024074C E620003C */ swc1 $f0, 0x3c($s1) /* CE3E40 80240750 4600C602 */ mul.s $f24, $f24, $f0 -/* CE3E44 80240754 00000000 */ nop +/* CE3E44 80240754 00000000 */ nop /* CE3E48 80240758 4618B581 */ sub.s $f22, $f22, $f24 /* CE3E4C 8024075C E6360040 */ swc1 $f22, 0x40($s1) /* CE3E50 80240760 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_802401AC_CE68AC.s b/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_802401AC_CE68AC.s index 959b52b7f3..dfdc17b0bf 100644 --- a/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_802401AC_CE68AC.s +++ b/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_802401AC_CE68AC.s @@ -13,11 +13,12 @@ glabel func_802401AC_CE68AC /* CE68CC 802401CC 2C620005 */ sltiu $v0, $v1, 5 /* CE68D0 802401D0 1040008A */ beqz $v0, .L802403FC /* CE68D4 802401D4 00031080 */ sll $v0, $v1, 2 -/* CE68D8 802401D8 3C018024 */ lui $at, %hi(D_80245B10) +/* CE68D8 802401D8 3C018024 */ lui $at, %hi(jtbl_80245B10_CEC210) /* CE68DC 802401DC 00220821 */ addu $at, $at, $v0 -/* CE68E0 802401E0 8C225B10 */ lw $v0, %lo(D_80245B10)($at) +/* CE68E0 802401E0 8C225B10 */ lw $v0, %lo(jtbl_80245B10_CEC210)($at) /* CE68E4 802401E4 00400008 */ jr $v0 -/* CE68E8 802401E8 00000000 */ nop +/* CE68E8 802401E8 00000000 */ nop +glabel L802401EC_CE68EC /* CE68EC 802401EC 8E22003C */ lw $v0, 0x3c($s1) /* CE68F0 802401F0 86270046 */ lh $a3, 0x46($s1) /* CE68F4 802401F4 AFA20010 */ sw $v0, 0x10($sp) @@ -66,6 +67,7 @@ glabel func_802401AC_CE68AC /* CE69A0 802402A0 A6220044 */ sh $v0, 0x44($s1) /* CE69A4 802402A4 080900FF */ j .L802403FC /* CE69A8 802402A8 A6200046 */ sh $zero, 0x46($s1) +glabel L802402AC_CE69AC /* CE69AC 802402AC 96220046 */ lhu $v0, 0x46($s1) /* CE69B0 802402B0 24420001 */ addiu $v0, $v0, 1 /* CE69B4 802402B4 A6220046 */ sh $v0, 0x46($s1) @@ -84,6 +86,7 @@ glabel func_802401AC_CE68AC /* CE69E8 802402E8 8C42000C */ lw $v0, 0xc($v0) /* CE69EC 802402EC 080900FF */ j .L802403FC /* CE69F0 802402F0 AC400074 */ sw $zero, 0x74($v0) +glabel L802402F4_CE69F4 /* CE69F4 802402F4 96220046 */ lhu $v0, 0x46($s1) /* CE69F8 802402F8 24420001 */ addiu $v0, $v0, 1 /* CE69FC 802402FC A6220046 */ sh $v0, 0x46($s1) @@ -91,7 +94,7 @@ glabel func_802401AC_CE68AC /* CE6A04 80240304 00021403 */ sra $v0, $v0, 0x10 /* CE6A08 80240308 2842003C */ slti $v0, $v0, 0x3c /* CE6A0C 8024030C 1440003B */ bnez $v0, .L802403FC -/* CE6A10 80240310 00000000 */ nop +/* CE6A10 80240310 00000000 */ nop /* CE6A14 80240314 3C013F80 */ lui $at, 0x3f80 /* CE6A18 80240318 44810000 */ mtc1 $at, $f0 /* CE6A1C 8024031C AFA00014 */ sw $zero, 0x14($sp) @@ -124,6 +127,7 @@ glabel func_802401AC_CE68AC /* CE6A88 80240388 A6220048 */ sh $v0, 0x48($s1) /* CE6A8C 8024038C 080900FF */ j .L802403FC /* CE6A90 80240390 E6200030 */ swc1 $f0, 0x30($s1) +glabel L80240394_CE6A94 /* CE6A94 80240394 0000202D */ daddu $a0, $zero, $zero /* CE6A98 80240398 3C054210 */ lui $a1, 0x4210 /* CE6A9C 8024039C 3C064198 */ lui $a2, 0x4198 @@ -151,14 +155,15 @@ glabel func_802401AC_CE68AC /* CE6AF4 802403F4 A6200046 */ sh $zero, 0x46($s1) /* CE6AF8 802403F8 E6200034 */ swc1 $f0, 0x34($s1) .L802403FC: +glabel L802403FC_CE6AFC /* CE6AFC 802403FC 8623004A */ lh $v1, 0x4a($s1) /* CE6B00 80240400 24020001 */ addiu $v0, $zero, 1 /* CE6B04 80240404 10620005 */ beq $v1, $v0, .L8024041C /* CE6B08 80240408 24020002 */ addiu $v0, $zero, 2 /* CE6B0C 8024040C 1062001E */ beq $v1, $v0, .L80240488 -/* CE6B10 80240410 00000000 */ nop +/* CE6B10 80240410 00000000 */ nop /* CE6B14 80240414 0809014C */ j .L80240530 -/* CE6B18 80240418 00000000 */ nop +/* CE6B18 80240418 00000000 */ nop .L8024041C: /* CE6B1C 8024041C 8627004C */ lh $a3, 0x4c($s1) /* CE6B20 80240420 24100078 */ addiu $s0, $zero, 0x78 @@ -190,12 +195,12 @@ glabel func_802401AC_CE68AC .L80240488: /* CE6B88 80240488 8622004C */ lh $v0, 0x4c($s1) /* CE6B8C 8024048C 44826000 */ mtc1 $v0, $f12 -/* CE6B90 80240490 00000000 */ nop +/* CE6B90 80240490 00000000 */ nop /* CE6B94 80240494 0C00A8BB */ jal sin_deg /* CE6B98 80240498 46806320 */ cvt.s.w $f12, $f12 /* CE6B9C 8024049C 3C013F80 */ lui $at, 0x3f80 /* CE6BA0 802404A0 44811000 */ mtc1 $at, $f2 -/* CE6BA4 802404A4 00000000 */ nop +/* CE6BA4 802404A4 00000000 */ nop /* CE6BA8 802404A8 46020000 */ add.s $f0, $f0, $f2 /* CE6BAC 802404AC 46000000 */ add.s $f0, $f0, $f0 /* CE6BB0 802404B0 C6220024 */ lwc1 $f2, 0x24($s1) @@ -203,7 +208,7 @@ glabel func_802401AC_CE68AC /* CE6BB8 802404B8 46001080 */ add.s $f2, $f2, $f0 /* CE6BBC 802404BC 24420008 */ addiu $v0, $v0, 8 /* CE6BC0 802404C0 44826000 */ mtc1 $v0, $f12 -/* CE6BC4 802404C4 00000000 */ nop +/* CE6BC4 802404C4 00000000 */ nop /* CE6BC8 802404C8 46806320 */ cvt.s.w $f12, $f12 /* CE6BCC 802404CC 0C00A6C9 */ jal clamp_angle /* CE6BD0 802404D0 E6220004 */ swc1 $f2, 4($s1) @@ -224,9 +229,9 @@ glabel func_802401AC_CE68AC /* CE6C0C 8024050C 460E1380 */ add.s $f14, $f2, $f14 /* CE6C10 80240510 3C0141F0 */ lui $at, 0x41f0 /* CE6C14 80240514 44811000 */ mtc1 $at, $f2 -/* CE6C18 80240518 00000000 */ nop +/* CE6C18 80240518 00000000 */ nop /* CE6C1C 8024051C 4600103C */ c.lt.s $f2, $f0 -/* CE6C20 80240520 00000000 */ nop +/* CE6C20 80240520 00000000 */ nop /* CE6C24 80240524 45010002 */ bc1t .L80240530 /* CE6C28 80240528 24020003 */ addiu $v0, $zero, 3 .L8024052C: @@ -237,9 +242,9 @@ glabel func_802401AC_CE68AC /* CE6C38 80240538 10620005 */ beq $v1, $v0, .L80240550 /* CE6C3C 8024053C 24020002 */ addiu $v0, $zero, 2 /* CE6C40 80240540 10620008 */ beq $v1, $v0, .L80240564 -/* CE6C44 80240544 00000000 */ nop +/* CE6C44 80240544 00000000 */ nop /* CE6C48 80240548 08090169 */ j .L802405A4 -/* CE6C4C 8024054C 00000000 */ nop +/* CE6C4C 8024054C 00000000 */ nop .L80240550: /* CE6C50 80240550 C620002C */ lwc1 $f0, 0x2c($s1) /* CE6C54 80240554 C62C0030 */ lwc1 $f12, 0x30($s1) diff --git a/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240708_CE6E08.s b/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240708_CE6E08.s index 5ff52bbd0f..b593e49823 100644 --- a/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240708_CE6E08.s +++ b/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240708_CE6E08.s @@ -8,12 +8,12 @@ glabel func_80240708_CE6E08 /* CE6E14 80240714 8C900084 */ lw $s0, 0x84($a0) /* CE6E18 80240718 8602004C */ lh $v0, 0x4c($s0) /* CE6E1C 8024071C 44826000 */ mtc1 $v0, $f12 -/* CE6E20 80240720 00000000 */ nop +/* CE6E20 80240720 00000000 */ nop /* CE6E24 80240724 0C00A8BB */ jal sin_deg /* CE6E28 80240728 46806320 */ cvt.s.w $f12, $f12 /* CE6E2C 8024072C 3C013F80 */ lui $at, 0x3f80 /* CE6E30 80240730 44811000 */ mtc1 $at, $f2 -/* CE6E34 80240734 00000000 */ nop +/* CE6E34 80240734 00000000 */ nop /* CE6E38 80240738 46020000 */ add.s $f0, $f0, $f2 /* CE6E3C 8024073C 46000000 */ add.s $f0, $f0, $f0 /* CE6E40 80240740 C6020024 */ lwc1 $f2, 0x24($s0) @@ -21,13 +21,13 @@ glabel func_80240708_CE6E08 /* CE6E48 80240748 46001080 */ add.s $f2, $f2, $f0 /* CE6E4C 8024074C 24420008 */ addiu $v0, $v0, 8 /* CE6E50 80240750 44826000 */ mtc1 $v0, $f12 -/* CE6E54 80240754 00000000 */ nop +/* CE6E54 80240754 00000000 */ nop /* CE6E58 80240758 46806320 */ cvt.s.w $f12, $f12 /* CE6E5C 8024075C 0C00A6C9 */ jal clamp_angle /* CE6E60 80240760 E6020004 */ swc1 $f2, 4($s0) /* CE6E64 80240764 4600010D */ trunc.w.s $f4, $f0 /* CE6E68 80240768 44022000 */ mfc1 $v0, $f4 -/* CE6E6C 8024076C 00000000 */ nop +/* CE6E6C 8024076C 00000000 */ nop /* CE6E70 80240770 A602004C */ sh $v0, 0x4c($s0) /* CE6E74 80240774 3C028011 */ lui $v0, %hi(gPlayerStatus) /* CE6E78 80240778 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) @@ -38,9 +38,9 @@ glabel func_80240708_CE6E08 /* CE6E8C 8024078C 8E070020 */ lw $a3, 0x20($s0) /* CE6E90 80240790 3C0141F0 */ lui $at, 0x41f0 /* CE6E94 80240794 44811000 */ mtc1 $at, $f2 -/* CE6E98 80240798 00000000 */ nop +/* CE6E98 80240798 00000000 */ nop /* CE6E9C 8024079C 4602003E */ c.le.s $f0, $f2 -/* CE6EA0 802407A0 00000000 */ nop +/* CE6EA0 802407A0 00000000 */ nop /* CE6EA4 802407A4 45000002 */ bc1f .L802407B0 /* CE6EA8 802407A8 24020003 */ addiu $v0, $zero, 3 /* CE6EAC 802407AC A602004E */ sh $v0, 0x4e($s0) diff --git a/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240B00_CE7200.s b/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240B00_CE7200.s index fb2330530e..698f1b945d 100644 --- a/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240B00_CE7200.s +++ b/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240B00_CE7200.s @@ -15,6 +15,6 @@ glabel func_80240B00_CE7200 /* CE7228 80240B28 24020002 */ addiu $v0, $zero, 2 /* CE722C 80240B2C 03E00008 */ jr $ra /* CE7230 80240B30 27BD0020 */ addiu $sp, $sp, 0x20 -/* CE7234 80240B34 00000000 */ nop -/* CE7238 80240B38 00000000 */ nop -/* CE723C 80240B3C 00000000 */ nop +/* CE7234 80240B34 00000000 */ nop +/* CE7238 80240B38 00000000 */ nop +/* CE723C 80240B3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_22/CEC240/func_80240000_CEC240.s b/asm/nonmatchings/world/area_flo/flo_22/CEC240/func_80240000_CEC240.s index 49f69b6166..cf1c64e7a4 100644 --- a/asm/nonmatchings/world/area_flo/flo_22/CEC240/func_80240000_CEC240.s +++ b/asm/nonmatchings/world/area_flo/flo_22/CEC240/func_80240000_CEC240.s @@ -15,6 +15,6 @@ glabel func_80240000_CEC240 /* CEC268 80240028 24020002 */ addiu $v0, $zero, 2 /* CEC26C 8024002C 03E00008 */ jr $ra /* CEC270 80240030 27BD0020 */ addiu $sp, $sp, 0x20 -/* CEC274 80240034 00000000 */ nop -/* CEC278 80240038 00000000 */ nop -/* CEC27C 8024003C 00000000 */ nop +/* CEC274 80240034 00000000 */ nop +/* CEC278 80240038 00000000 */ nop +/* CEC27C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_22/CEC280/func_80240040_CEC280.s b/asm/nonmatchings/world/area_flo/flo_22/CEC280/func_80240040_CEC280.s index d61a102d81..129511daa2 100644 --- a/asm/nonmatchings/world/area_flo/flo_22/CEC280/func_80240040_CEC280.s +++ b/asm/nonmatchings/world/area_flo/flo_22/CEC280/func_80240040_CEC280.s @@ -4,5 +4,5 @@ glabel func_80240040_CEC280 /* CEC280 80240040 03E00008 */ jr $ra /* CEC284 80240044 24020002 */ addiu $v0, $zero, 2 -/* CEC288 80240048 00000000 */ nop -/* CEC28C 8024004C 00000000 */ nop +/* CEC288 80240048 00000000 */ nop +/* CEC28C 8024004C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_23/CEE260/func_80240000_CEE260.s b/asm/nonmatchings/world/area_flo/flo_23/CEE260/func_80240000_CEE260.s index f46154e9a0..0ab655caa2 100644 --- a/asm/nonmatchings/world/area_flo/flo_23/CEE260/func_80240000_CEE260.s +++ b/asm/nonmatchings/world/area_flo/flo_23/CEE260/func_80240000_CEE260.s @@ -15,6 +15,6 @@ glabel func_80240000_CEE260 /* CEE288 80240028 24020002 */ addiu $v0, $zero, 2 /* CEE28C 8024002C 03E00008 */ jr $ra /* CEE290 80240030 27BD0020 */ addiu $sp, $sp, 0x20 -/* CEE294 80240034 00000000 */ nop -/* CEE298 80240038 00000000 */ nop -/* CEE29C 8024003C 00000000 */ nop +/* CEE294 80240034 00000000 */ nop +/* CEE298 80240038 00000000 */ nop +/* CEE29C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402F8_CEE558.s b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402F8_CEE558.s index 8ed0cac4b3..6a0667d433 100644 --- a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402F8_CEE558.s +++ b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402F8_CEE558.s @@ -28,7 +28,7 @@ glabel func_802402F8_CEE558 /* CEE5AC 8024034C 00220821 */ addu $at, $at, $v0 /* CEE5B0 80240350 AC2026E0 */ sw $zero, %lo(func_802426E0_BA6E60)($at) /* CEE5B4 80240354 080900E1 */ j .L80240384 -/* CEE5B8 80240358 00000000 */ nop +/* CEE5B8 80240358 00000000 */ nop .L8024035C: /* CEE5BC 8024035C 3C038024 */ lui $v1, %hi(func_802426E0_BA6E60) /* CEE5C0 80240360 246326E0 */ addiu $v1, $v1, %lo(func_802426E0_BA6E60) diff --git a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240410_CEE670.s b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240410_CEE670.s index 7f6205de97..61416d857a 100644 --- a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240410_CEE670.s +++ b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240410_CEE670.s @@ -21,11 +21,11 @@ glabel func_80240410_CEE670 /* CEE6B0 80240450 A602008E */ sh $v0, 0x8e($s0) /* CEE6B4 80240454 00021400 */ sll $v0, $v0, 0x10 /* CEE6B8 80240458 1C400033 */ bgtz $v0, .L80240528 -/* CEE6BC 8024045C 00000000 */ nop +/* CEE6BC 8024045C 00000000 */ nop .L80240460: /* CEE6C0 80240460 8602008C */ lh $v0, 0x8c($s0) /* CEE6C4 80240464 14400030 */ bnez $v0, .L80240528 -/* CEE6C8 80240468 00000000 */ nop +/* CEE6C8 80240468 00000000 */ nop /* CEE6CC 8024046C 8E2200CC */ lw $v0, 0xcc($s1) /* CEE6D0 80240470 8C420024 */ lw $v0, 0x24($v0) /* CEE6D4 80240474 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_80240410_CEE670 /* CEE6E0 80240480 8E230088 */ lw $v1, 0x88($s1) /* CEE6E4 80240484 24020005 */ addiu $v0, $zero, 5 /* CEE6E8 80240488 10620005 */ beq $v1, $v0, .L802404A0 -/* CEE6EC 8024048C 00000000 */ nop +/* CEE6EC 8024048C 00000000 */ nop /* CEE6F0 80240490 10600003 */ beqz $v1, .L802404A0 /* CEE6F4 80240494 24020001 */ addiu $v0, $zero, 1 /* CEE6F8 80240498 14620006 */ bne $v1, $v0, .L802404B4 -/* CEE6FC 8024049C 00000000 */ nop +/* CEE6FC 8024049C 00000000 */ nop .L802404A0: /* CEE700 802404A0 8E220084 */ lw $v0, 0x84($s1) /* CEE704 802404A4 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_80240410_CEE670 /* CEE744 802404E4 46220000 */ add.d $f0, $f0, $f2 /* CEE748 802404E8 4620010D */ trunc.w.d $f4, $f0 /* CEE74C 802404EC 44022000 */ mfc1 $v0, $f4 -/* CEE750 802404F0 00000000 */ nop +/* CEE750 802404F0 00000000 */ nop /* CEE754 802404F4 A602008E */ sh $v0, 0x8e($s0) /* CEE758 802404F8 00021400 */ sll $v0, $v0, 0x10 /* CEE75C 802404FC 8E230078 */ lw $v1, 0x78($s1) /* CEE760 80240500 00021403 */ sra $v0, $v0, 0x10 /* CEE764 80240504 0043102A */ slt $v0, $v0, $v1 /* CEE768 80240508 10400003 */ beqz $v0, .L80240518 -/* CEE76C 8024050C 00000000 */ nop +/* CEE76C 8024050C 00000000 */ nop /* CEE770 80240510 9622007A */ lhu $v0, 0x7a($s1) /* CEE774 80240514 A602008E */ sh $v0, 0x8e($s0) .L80240518: diff --git a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s index da73d0964f..fe6817349e 100644 --- a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s +++ b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s @@ -279,15 +279,17 @@ glabel func_80240728_CEE988 /* CEED74 80240B14 2C620015 */ sltiu $v0, $v1, 0x15 /* CEED78 80240B18 10400009 */ beqz $v0, .L80240B40 /* CEED7C 80240B1C 00031080 */ sll $v0, $v1, 2 -/* CEED80 80240B20 3C018024 */ lui $at, %hi(func_80242688_C79368) +/* CEED80 80240B20 3C018024 */ lui $at, %hi(jtbl_80242688_CF08E8) /* CEED84 80240B24 00220821 */ addu $at, $at, $v0 -/* CEED88 80240B28 8C222688 */ lw $v0, %lo(func_80242688_C79368)($at) +/* CEED88 80240B28 8C222688 */ lw $v0, %lo(jtbl_80242688_CF08E8)($at) /* CEED8C 80240B2C 00400008 */ jr $v0 /* CEED90 80240B30 00000000 */ nop +glabel L80240B34_CEED94 /* CEED94 80240B34 8E420028 */ lw $v0, 0x28($s2) /* CEED98 80240B38 24420001 */ addiu $v0, $v0, 1 /* CEED9C 80240B3C AE420028 */ sw $v0, 0x28($s2) .L80240B40: +glabel L80240B40_CEEDA0 /* CEEDA0 80240B40 0000102D */ daddu $v0, $zero, $zero .L80240B44: /* CEEDA4 80240B44 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240B68_CEEDC8.s b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240B68_CEEDC8.s index c36394f3f2..0b26cd2b6b 100644 --- a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240B68_CEEDC8.s +++ b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240B68_CEEDC8.s @@ -32,15 +32,15 @@ glabel func_80240B68_CEEDC8 /* CEEE34 80240BD4 0040802D */ daddu $s0, $v0, $zero /* CEEE38 80240BD8 0040182D */ daddu $v1, $v0, $zero /* CEEE3C 80240BDC 44920000 */ mtc1 $s2, $f0 -/* CEEE40 80240BE0 00000000 */ nop +/* CEEE40 80240BE0 00000000 */ nop /* CEEE44 80240BE4 46800020 */ cvt.s.w $f0, $f0 /* CEEE48 80240BE8 E4600008 */ swc1 $f0, 8($v1) /* CEEE4C 80240BEC 44910000 */ mtc1 $s1, $f0 -/* CEEE50 80240BF0 00000000 */ nop +/* CEEE50 80240BF0 00000000 */ nop /* CEEE54 80240BF4 46800020 */ cvt.s.w $f0, $f0 /* CEEE58 80240BF8 E460000C */ swc1 $f0, 0xc($v1) /* CEEE5C 80240BFC 44900000 */ mtc1 $s0, $f0 -/* CEEE60 80240C00 00000000 */ nop +/* CEEE60 80240C00 00000000 */ nop /* CEEE64 80240C04 46800020 */ cvt.s.w $f0, $f0 /* CEEE68 80240C08 E4600010 */ swc1 $f0, 0x10($v1) /* CEEE6C 80240C0C 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_24/CF0940/func_80240000_CF0940.s b/asm/nonmatchings/world/area_flo/flo_24/CF0940/func_80240000_CF0940.s index 194916aefc..aac5fc8ec6 100644 --- a/asm/nonmatchings/world/area_flo/flo_24/CF0940/func_80240000_CF0940.s +++ b/asm/nonmatchings/world/area_flo/flo_24/CF0940/func_80240000_CF0940.s @@ -15,6 +15,6 @@ glabel func_80240000_CF0940 /* CF0968 80240028 24020002 */ addiu $v0, $zero, 2 /* CF096C 8024002C 03E00008 */ jr $ra /* CF0970 80240030 27BD0020 */ addiu $sp, $sp, 0x20 -/* CF0974 80240034 00000000 */ nop -/* CF0978 80240038 00000000 */ nop -/* CF097C 8024003C 00000000 */ nop +/* CF0974 80240034 00000000 */ nop +/* CF0978 80240038 00000000 */ nop +/* CF097C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2BD0/func_80240000_CF2BD0.s b/asm/nonmatchings/world/area_flo/flo_25/CF2BD0/func_80240000_CF2BD0.s index 7f3ea831cb..f53e4905fe 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2BD0/func_80240000_CF2BD0.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2BD0/func_80240000_CF2BD0.s @@ -15,6 +15,6 @@ glabel func_80240000_CF2BD0 /* CF2BF8 80240028 24020002 */ addiu $v0, $zero, 2 /* CF2BFC 8024002C 03E00008 */ jr $ra /* CF2C00 80240030 27BD0020 */ addiu $sp, $sp, 0x20 -/* CF2C04 80240034 00000000 */ nop -/* CF2C08 80240038 00000000 */ nop -/* CF2C0C 8024003C 00000000 */ nop +/* CF2C04 80240034 00000000 */ nop +/* CF2C08 80240038 00000000 */ nop +/* CF2C0C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240040_CF2C10.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240040_CF2C10.s index 7f72328abd..b016d230db 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240040_CF2C10.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240040_CF2C10.s @@ -47,7 +47,7 @@ glabel func_80240040_CF2C10 /* CF2CB8 802400E8 0C0123F5 */ jal is_point_within_region /* CF2CBC 802400EC 8E070038 */ lw $a3, 0x38($s0) /* CF2CC0 802400F0 1040000E */ beqz $v0, .L8024012C -/* CF2CC4 802400F4 00000000 */ nop +/* CF2CC4 802400F4 00000000 */ nop /* CF2CC8 802400F8 8E2200D0 */ lw $v0, 0xd0($s1) /* CF2CCC 802400FC C60C0038 */ lwc1 $f12, 0x38($s0) /* CF2CD0 80240100 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240040_CF2C10 /* CF2CE4 80240114 468031A0 */ cvt.s.w $f6, $f6 /* CF2CE8 80240118 44073000 */ mfc1 $a3, $f6 /* CF2CEC 8024011C 0C00A720 */ jal atan2 -/* CF2CF0 80240120 00000000 */ nop +/* CF2CF0 80240120 00000000 */ nop /* CF2CF4 80240124 08090057 */ j .L8024015C /* CF2CF8 80240128 E600000C */ swc1 $f0, 0xc($s0) .L8024012C: @@ -66,7 +66,7 @@ glabel func_80240040_CF2C10 /* CF2D00 80240130 2404003C */ addiu $a0, $zero, 0x3c /* CF2D04 80240134 C60C000C */ lwc1 $f12, 0xc($s0) /* CF2D08 80240138 44820000 */ mtc1 $v0, $f0 -/* CF2D0C 8024013C 00000000 */ nop +/* CF2D0C 8024013C 00000000 */ nop /* CF2D10 80240140 46800020 */ cvt.s.w $f0, $f0 /* CF2D14 80240144 46006300 */ add.s $f12, $f12, $f0 /* CF2D18 80240148 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240040_CF2C10 /* CF2D3C 8024016C 8E2200D0 */ lw $v0, 0xd0($s1) /* CF2D40 80240170 8C420014 */ lw $v0, 0x14($v0) /* CF2D44 80240174 04410004 */ bgez $v0, .L80240188 -/* CF2D48 80240178 00000000 */ nop +/* CF2D48 80240178 00000000 */ nop /* CF2D4C 8024017C C6400000 */ lwc1 $f0, ($s2) /* CF2D50 80240180 0809006A */ j .L802401A8 /* CF2D54 80240184 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240040_CF2C10 /* CF2D58 80240188 3C018024 */ lui $at, %hi(D_80244EE0) /* CF2D5C 8024018C D4224EE0 */ ldc1 $f2, %lo(D_80244EE0)($at) /* CF2D60 80240190 44820000 */ mtc1 $v0, $f0 -/* CF2D64 80240194 00000000 */ nop +/* CF2D64 80240194 00000000 */ nop /* CF2D68 80240198 46800021 */ cvt.d.w $f0, $f0 /* CF2D6C 8024019C 46220003 */ div.d $f0, $f0, $f2 /* CF2D70 802401A0 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240040_CF2C10 /* CF2D84 802401B4 44801000 */ mtc1 $zero, $f2 /* CF2D88 802401B8 46000021 */ cvt.d.s $f0, $f0 /* CF2D8C 802401BC 46220002 */ mul.d $f0, $f0, $f2 -/* CF2D90 802401C0 00000000 */ nop +/* CF2D90 802401C0 00000000 */ nop /* CF2D94 802401C4 24020001 */ addiu $v0, $zero, 1 /* CF2D98 802401C8 4620018D */ trunc.w.d $f6, $f0 /* CF2D9C 802401CC E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802401F0_CF2DC0.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802401F0_CF2DC0.s index 93f2cd1faa..01dc2f0e28 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802401F0_CF2DC0.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802401F0_CF2DC0.s @@ -34,7 +34,7 @@ glabel func_802401F0_CF2DC0 /* CF2E34 80240264 44803000 */ mtc1 $zero, $f6 /* CF2E38 80240268 46000021 */ cvt.d.s $f0, $f0 /* CF2E3C 8024026C 46260002 */ mul.d $f0, $f0, $f6 -/* CF2E40 80240270 00000000 */ nop +/* CF2E40 80240270 00000000 */ nop /* CF2E44 80240274 24020001 */ addiu $v0, $zero, 1 /* CF2E48 80240278 8E24006C */ lw $a0, 0x6c($s1) /* CF2E4C 8024027C 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_802401F0_CF2DC0 /* CF2EA8 802402D8 C600003C */ lwc1 $f0, 0x3c($s0) /* CF2EAC 802402DC 4600C001 */ sub.s $f0, $f24, $f0 /* CF2EB0 802402E0 4600B03C */ c.lt.s $f22, $f0 -/* CF2EB4 802402E4 00000000 */ nop +/* CF2EB4 802402E4 00000000 */ nop /* CF2EB8 802402E8 4500001B */ bc1f .L80240358 /* CF2EBC 802402EC 34820010 */ ori $v0, $a0, 0x10 /* CF2EC0 802402F0 080900D6 */ j .L80240358 @@ -87,9 +87,9 @@ glabel func_802401F0_CF2DC0 /* CF2F04 80240334 C7A00034 */ lwc1 $f0, 0x34($sp) /* CF2F08 80240338 4600D001 */ sub.s $f0, $f26, $f0 /* CF2F0C 8024033C 4600B03C */ c.lt.s $f22, $f0 -/* CF2F10 80240340 00000000 */ nop +/* CF2F10 80240340 00000000 */ nop /* CF2F14 80240344 45000004 */ bc1f .L80240358 -/* CF2F18 80240348 00000000 */ nop +/* CF2F18 80240348 00000000 */ nop /* CF2F1C 8024034C 8E22006C */ lw $v0, 0x6c($s1) /* CF2F20 80240350 34420010 */ ori $v0, $v0, 0x10 /* CF2F24 80240354 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_802401F0_CF2DC0 /* CF2F2C 8024035C 24030011 */ addiu $v1, $zero, 0x11 /* CF2F30 80240360 30420011 */ andi $v0, $v0, 0x11 /* CF2F34 80240364 14430039 */ bne $v0, $v1, .L8024044C -/* CF2F38 80240368 00000000 */ nop +/* CF2F38 80240368 00000000 */ nop /* CF2F3C 8024036C 8E020000 */ lw $v0, ($s0) /* CF2F40 80240370 30420008 */ andi $v0, $v0, 8 /* CF2F44 80240374 1040000A */ beqz $v0, .L802403A0 @@ -108,7 +108,7 @@ glabel func_802401F0_CF2DC0 /* CF2F54 80240384 D4204EE8 */ ldc1 $f0, %lo(D_80244EE8)($at) /* CF2F58 80240388 460010A1 */ cvt.d.s $f2, $f2 /* CF2F5C 8024038C 46201082 */ mul.d $f2, $f2, $f0 -/* CF2F60 80240390 00000000 */ nop +/* CF2F60 80240390 00000000 */ nop /* CF2F64 80240394 4600A021 */ cvt.d.s $f0, $f20 /* CF2F68 80240398 08090101 */ j .L80240404 /* CF2F6C 8024039C 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_802401F0_CF2DC0 /* CF2FBC 802403EC D4204EF0 */ ldc1 $f0, %lo(D_80244EF0)($at) /* CF2FC0 802403F0 460010A1 */ cvt.d.s $f2, $f2 /* CF2FC4 802403F4 46201082 */ mul.d $f2, $f2, $f0 -/* CF2FC8 802403F8 00000000 */ nop +/* CF2FC8 802403F8 00000000 */ nop /* CF2FCC 802403FC 4600A021 */ cvt.d.s $f0, $f20 /* CF2FD0 80240400 46220000 */ add.d $f0, $f0, $f2 .L80240404: @@ -149,7 +149,7 @@ glabel func_802401F0_CF2DC0 /* CF2FF0 80240420 46000005 */ abs.s $f0, $f0 /* CF2FF4 80240424 46000021 */ cvt.d.s $f0, $f0 /* CF2FF8 80240428 4622003C */ c.lt.d $f0, $f2 -/* CF2FFC 8024042C 00000000 */ nop +/* CF2FFC 8024042C 00000000 */ nop /* CF3000 80240430 45000036 */ bc1f .L8024050C /* CF3004 80240434 2403FFEF */ addiu $v1, $zero, -0x11 /* CF3008 80240438 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_802401F0_CF2DC0 .L8024044C: /* CF301C 8024044C 8E220070 */ lw $v0, 0x70($s1) /* CF3020 80240450 1840002E */ blez $v0, .L8024050C -/* CF3024 80240454 00000000 */ nop +/* CF3024 80240454 00000000 */ nop /* CF3028 80240458 C62C0074 */ lwc1 $f12, 0x74($s1) /* CF302C 8024045C 0C00A8BB */ jal sin_deg /* CF3030 80240460 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_802401F0_CF2DC0 /* CF3088 802404B8 27A70030 */ addiu $a3, $sp, 0x30 .L802404BC: /* CF308C 802404BC 10400007 */ beqz $v0, .L802404DC -/* CF3090 802404C0 00000000 */ nop +/* CF3090 802404C0 00000000 */ nop /* CF3094 802404C4 4616A082 */ mul.s $f2, $f20, $f22 -/* CF3098 802404C8 00000000 */ nop +/* CF3098 802404C8 00000000 */ nop /* CF309C 802404CC C7A0002C */ lwc1 $f0, 0x2c($sp) /* CF30A0 802404D0 461A0000 */ add.s $f0, $f0, $f26 /* CF30A4 802404D4 0809013A */ j .L802404E8 /* CF30A8 802404D8 46020000 */ add.s $f0, $f0, $f2 .L802404DC: /* CF30AC 802404DC 4616A002 */ mul.s $f0, $f20, $f22 -/* CF30B0 802404E0 00000000 */ nop +/* CF30B0 802404E0 00000000 */ nop /* CF30B4 802404E4 4600C000 */ add.s $f0, $f24, $f0 .L802404E8: /* CF30B8 802404E8 E600003C */ swc1 $f0, 0x3c($s0) /* CF30BC 802404EC 8E220074 */ lw $v0, 0x74($s1) /* CF30C0 802404F0 2442000A */ addiu $v0, $v0, 0xa /* CF30C4 802404F4 44826000 */ mtc1 $v0, $f12 -/* CF30C8 802404F8 00000000 */ nop +/* CF30C8 802404F8 00000000 */ nop /* CF30CC 802404FC 0C00A6C9 */ jal clamp_angle /* CF30D0 80240500 46806320 */ cvt.s.w $f12, $f12 /* CF30D4 80240504 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_802401F0_CF2DC0 /* CF30E4 80240514 2442FFFF */ addiu $v0, $v0, -1 /* CF30E8 80240518 8E430014 */ lw $v1, 0x14($s2) /* CF30EC 8024051C 04600048 */ bltz $v1, .L80240640 -/* CF30F0 80240520 00000000 */ nop +/* CF30F0 80240520 00000000 */ nop /* CF30F4 80240524 8E620074 */ lw $v0, 0x74($s3) /* CF30F8 80240528 1C400042 */ bgtz $v0, .L80240634 /* CF30FC 8024052C 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_802401F0_CF2DC0 /* CF3104 80240534 860200A8 */ lh $v0, 0xa8($s0) /* CF3108 80240538 C602003C */ lwc1 $f2, 0x3c($s0) /* CF310C 8024053C 44820000 */ mtc1 $v0, $f0 -/* CF3110 80240540 00000000 */ nop +/* CF3110 80240540 00000000 */ nop /* CF3114 80240544 46800020 */ cvt.s.w $f0, $f0 /* CF3118 80240548 46001080 */ add.s $f2, $f2, $f0 /* CF311C 8024054C 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_802401F0_CF2DC0 /* CF3138 80240568 C440002C */ lwc1 $f0, 0x2c($v0) /* CF313C 8024056C 46000021 */ cvt.d.s $f0, $f0 /* CF3140 80240570 4622003C */ c.lt.d $f0, $f2 -/* CF3144 80240574 00000000 */ nop +/* CF3144 80240574 00000000 */ nop /* CF3148 80240578 4500002C */ bc1f .L8024062C /* CF314C 8024057C 02A0202D */ daddu $a0, $s5, $zero /* CF3150 80240580 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_802401F0_CF2DC0 /* CF318C 802405BC 3C01C1A0 */ lui $at, 0xc1a0 /* CF3190 802405C0 44812000 */ mtc1 $at, $f4 /* CF3194 802405C4 44834000 */ mtc1 $v1, $f8 -/* CF3198 802405C8 00000000 */ nop +/* CF3198 802405C8 00000000 */ nop /* CF319C 802405CC 46804220 */ cvt.s.w $f8, $f8 /* CF31A0 802405D0 44074000 */ mfc1 $a3, $f8 /* CF31A4 802405D4 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_802401F0_CF2DC0 /* CF3258 80240688 0C0123F5 */ jal is_point_within_region /* CF325C 8024068C 8E070038 */ lw $a3, 0x38($s0) /* CF3260 80240690 1040001A */ beqz $v0, .L802406FC -/* CF3264 80240694 00000000 */ nop +/* CF3264 80240694 00000000 */ nop /* CF3268 80240698 8E060038 */ lw $a2, 0x38($s0) /* CF326C 8024069C 8E2200D0 */ lw $v0, 0xd0($s1) /* CF3270 802406A0 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_802401F0_CF2DC0 /* CF3284 802406B4 468073A0 */ cvt.s.w $f14, $f14 /* CF3288 802406B8 C6020018 */ lwc1 $f2, 0x18($s0) /* CF328C 802406BC 4600103C */ c.lt.s $f2, $f0 -/* CF3290 802406C0 00000000 */ nop +/* CF3290 802406C0 00000000 */ nop /* CF3294 802406C4 4500000D */ bc1f .L802406FC /* CF3298 802406C8 E7A00034 */ swc1 $f0, 0x34($sp) /* CF329C 802406CC C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_802401F0_CF2DC0 /* CF32D8 80240708 00621825 */ or $v1, $v1, $v0 /* CF32DC 8024070C 00741825 */ or $v1, $v1, $s4 /* CF32E0 80240710 10600008 */ beqz $v1, .L80240734 -/* CF32E4 80240714 00000000 */ nop +/* CF32E4 80240714 00000000 */ nop /* CF32E8 80240718 8602008C */ lh $v0, 0x8c($s0) /* CF32EC 8024071C 14400031 */ bnez $v0, .L802407E4 -/* CF32F0 80240720 00000000 */ nop +/* CF32F0 80240720 00000000 */ nop /* CF32F4 80240724 8E050018 */ lw $a1, 0x18($s0) /* CF32F8 80240728 8E06000C */ lw $a2, 0xc($s0) /* CF32FC 8024072C 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_802401F0_CF2DC0 /* CF3310 80240740 44801000 */ mtc1 $zero, $f2 /* CF3314 80240744 46000021 */ cvt.d.s $f0, $f0 /* CF3318 80240748 46220002 */ mul.d $f0, $f0, $f2 -/* CF331C 8024074C 00000000 */ nop +/* CF331C 8024074C 00000000 */ nop /* CF3320 80240750 4620020D */ trunc.w.d $f8, $f0 /* CF3324 80240754 E628007C */ swc1 $f8, 0x7c($s1) /* CF3328 80240758 8E420004 */ lw $v0, 4($s2) /* CF332C 8024075C 18400021 */ blez $v0, .L802407E4 -/* CF3330 80240760 00000000 */ nop +/* CF3330 80240760 00000000 */ nop /* CF3334 80240764 8602008E */ lh $v0, 0x8e($s0) /* CF3338 80240768 9603008E */ lhu $v1, 0x8e($s0) /* CF333C 8024076C 18400005 */ blez $v0, .L80240784 @@ -375,7 +375,7 @@ glabel func_802401F0_CF2DC0 /* CF3344 80240774 A602008E */ sh $v0, 0x8e($s0) /* CF3348 80240778 00021400 */ sll $v0, $v0, 0x10 /* CF334C 8024077C 1C400019 */ bgtz $v0, .L802407E4 -/* CF3350 80240780 00000000 */ nop +/* CF3350 80240780 00000000 */ nop .L80240784: /* CF3354 80240784 240403E8 */ addiu $a0, $zero, 0x3e8 /* CF3358 80240788 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_802401F0_CF2DC0 /* CF33A0 802407D0 18400003 */ blez $v0, .L802407E0 /* CF33A4 802407D4 28620003 */ slti $v0, $v1, 3 /* CF33A8 802407D8 10400002 */ beqz $v0, .L802407E4 -/* CF33AC 802407DC 00000000 */ nop +/* CF33AC 802407DC 00000000 */ nop .L802407E0: /* CF33B0 802407E0 AE600070 */ sw $zero, 0x70($s3) .L802407E4: diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802408D8_CF34A8.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802408D8_CF34A8.s index f641fb9e9e..a77a86598d 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802408D8_CF34A8.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802408D8_CF34A8.s @@ -42,11 +42,11 @@ glabel func_802408D8_CF34A8 .L8024096C: /* CF353C 8024096C 8E220070 */ lw $v0, 0x70($s1) /* CF3540 80240970 18400034 */ blez $v0, .L80240A44 -/* CF3544 80240974 00000000 */ nop +/* CF3544 80240974 00000000 */ nop /* CF3548 80240978 C62C0074 */ lwc1 $f12, 0x74($s1) /* CF354C 8024097C 46806320 */ cvt.s.w $f12, $f12 /* CF3550 80240980 44820000 */ mtc1 $v0, $f0 -/* CF3554 80240984 00000000 */ nop +/* CF3554 80240984 00000000 */ nop /* CF3558 80240988 46800020 */ cvt.s.w $f0, $f0 /* CF355C 8024098C 46000021 */ cvt.d.s $f0, $f0 /* CF3560 80240990 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_802408D8_CF34A8 /* CF35C0 802409F0 27A70030 */ addiu $a3, $sp, 0x30 .L802409F4: /* CF35C4 802409F4 10400007 */ beqz $v0, .L80240A14 -/* CF35C8 802409F8 00000000 */ nop +/* CF35C8 802409F8 00000000 */ nop /* CF35CC 802409FC 4616A082 */ mul.s $f2, $f20, $f22 -/* CF35D0 80240A00 00000000 */ nop +/* CF35D0 80240A00 00000000 */ nop /* CF35D4 80240A04 C7A0002C */ lwc1 $f0, 0x2c($sp) /* CF35D8 80240A08 46180000 */ add.s $f0, $f0, $f24 /* CF35DC 80240A0C 08090288 */ j .L80240A20 /* CF35E0 80240A10 46020000 */ add.s $f0, $f0, $f2 .L80240A14: /* CF35E4 80240A14 4616A002 */ mul.s $f0, $f20, $f22 -/* CF35E8 80240A18 00000000 */ nop +/* CF35E8 80240A18 00000000 */ nop /* CF35EC 80240A1C 4600D000 */ add.s $f0, $f26, $f0 .L80240A20: /* CF35F0 80240A20 E600003C */ swc1 $f0, 0x3c($s0) /* CF35F4 80240A24 8E220074 */ lw $v0, 0x74($s1) /* CF35F8 80240A28 2442000A */ addiu $v0, $v0, 0xa /* CF35FC 80240A2C 44826000 */ mtc1 $v0, $f12 -/* CF3600 80240A30 00000000 */ nop +/* CF3600 80240A30 00000000 */ nop /* CF3604 80240A34 0C00A6C9 */ jal clamp_angle /* CF3608 80240A38 46806320 */ cvt.s.w $f12, $f12 /* CF360C 80240A3C 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_802408D8_CF34A8 /* CF3620 80240A50 860200A8 */ lh $v0, 0xa8($s0) /* CF3624 80240A54 C600003C */ lwc1 $f0, 0x3c($s0) /* CF3628 80240A58 44821000 */ mtc1 $v0, $f2 -/* CF362C 80240A5C 00000000 */ nop +/* CF362C 80240A5C 00000000 */ nop /* CF3630 80240A60 468010A0 */ cvt.s.w $f2, $f2 /* CF3634 80240A64 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* CF3638 80240A68 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_802408D8_CF34A8 /* CF3654 80240A84 46240000 */ add.d $f0, $f0, $f4 /* CF3658 80240A88 460010A1 */ cvt.d.s $f2, $f2 /* CF365C 80240A8C 4620103C */ c.lt.d $f2, $f0 -/* CF3660 80240A90 00000000 */ nop +/* CF3660 80240A90 00000000 */ nop /* CF3664 80240A94 4500002E */ bc1f .L80240B50 /* CF3668 80240A98 0280202D */ daddu $a0, $s4, $zero /* CF366C 80240A9C 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_802408D8_CF34A8 /* CF36AC 80240ADC 3C01C1A0 */ lui $at, 0xc1a0 /* CF36B0 80240AE0 44812000 */ mtc1 $at, $f4 /* CF36B4 80240AE4 44834000 */ mtc1 $v1, $f8 -/* CF36B8 80240AE8 00000000 */ nop +/* CF36B8 80240AE8 00000000 */ nop /* CF36BC 80240AEC 46804220 */ cvt.s.w $f8, $f8 /* CF36C0 80240AF0 44074000 */ mfc1 $a3, $f8 /* CF36C4 80240AF4 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_802408D8_CF34A8 .L80240B50: /* CF3720 80240B50 8602008C */ lh $v0, 0x8c($s0) /* CF3724 80240B54 14400025 */ bnez $v0, .L80240BEC -/* CF3728 80240B58 00000000 */ nop +/* CF3728 80240B58 00000000 */ nop /* CF372C 80240B5C 8602008E */ lh $v0, 0x8e($s0) /* CF3730 80240B60 1C400022 */ bgtz $v0, .L80240BEC -/* CF3734 80240B64 00000000 */ nop +/* CF3734 80240B64 00000000 */ nop /* CF3738 80240B68 8E620074 */ lw $v0, 0x74($s3) /* CF373C 80240B6C 2442FFFF */ addiu $v0, $v0, -1 /* CF3740 80240B70 1840001D */ blez $v0, .L80240BE8 @@ -183,7 +183,7 @@ glabel func_802408D8_CF34A8 /* CF374C 80240B7C 9442002A */ lhu $v0, 0x2a($v0) /* CF3750 80240B80 30420010 */ andi $v0, $v0, 0x10 /* CF3754 80240B84 14400007 */ bnez $v0, .L80240BA4 -/* CF3758 80240B88 00000000 */ nop +/* CF3758 80240B88 00000000 */ nop /* CF375C 80240B8C C600000C */ lwc1 $f0, 0xc($s0) /* CF3760 80240B90 3C014334 */ lui $at, 0x4334 /* CF3764 80240B94 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240D00_CF38D0.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240D00_CF38D0.s index 294fa3a1c3..080c399ad4 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240D00_CF38D0.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240D00_CF38D0.s @@ -60,18 +60,18 @@ glabel func_80240D00_CF38D0 /* CF39A8 80240DD8 C6200038 */ lwc1 $f0, 0x38($s1) /* CF39AC 80240DDC 4600018D */ trunc.w.s $f6, $f0 /* CF39B0 80240DE0 44023000 */ mfc1 $v0, $f6 -/* CF39B4 80240DE4 00000000 */ nop +/* CF39B4 80240DE4 00000000 */ nop /* CF39B8 80240DE8 A6420010 */ sh $v0, 0x10($s2) /* CF39BC 80240DEC C620003C */ lwc1 $f0, 0x3c($s1) /* CF39C0 80240DF0 4600018D */ trunc.w.s $f6, $f0 /* CF39C4 80240DF4 44023000 */ mfc1 $v0, $f6 -/* CF39C8 80240DF8 00000000 */ nop +/* CF39C8 80240DF8 00000000 */ nop /* CF39CC 80240DFC A6420012 */ sh $v0, 0x12($s2) /* CF39D0 80240E00 C6200040 */ lwc1 $f0, 0x40($s1) /* CF39D4 80240E04 A2430007 */ sb $v1, 7($s2) /* CF39D8 80240E08 4600018D */ trunc.w.s $f6, $f0 /* CF39DC 80240E0C 44023000 */ mfc1 $v0, $f6 -/* CF39E0 80240E10 00000000 */ nop +/* CF39E0 80240E10 00000000 */ nop /* CF39E4 80240E14 A6420014 */ sh $v0, 0x14($s2) .L80240E18: /* CF39E8 80240E18 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240E98_CF3A68.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240E98_CF3A68.s index f5d4f90c2b..58f5da181b 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240E98_CF3A68.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240E98_CF3A68.s @@ -42,9 +42,9 @@ glabel func_80240E98_CF3A68 /* CF3AFC 80240F2C 44801800 */ mtc1 $zero, $f3 /* CF3B00 80240F30 46002021 */ cvt.d.s $f0, $f4 /* CF3B04 80240F34 4620103E */ c.le.d $f2, $f0 -/* CF3B08 80240F38 00000000 */ nop +/* CF3B08 80240F38 00000000 */ nop /* CF3B0C 80240F3C 45000030 */ bc1f .L80241000 -/* CF3B10 80240F40 00000000 */ nop +/* CF3B10 80240F40 00000000 */ nop /* CF3B14 80240F44 C600003C */ lwc1 $f0, 0x3c($s0) /* CF3B18 80240F48 46040000 */ add.s $f0, $f0, $f4 /* CF3B1C 80240F4C E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_80240E98_CF3A68 /* CF3B7C 80240FAC 27A70020 */ addiu $a3, $sp, 0x20 .L80240FB0: /* CF3B80 80240FB0 1040000B */ beqz $v0, .L80240FE0 -/* CF3B84 80240FB4 00000000 */ nop +/* CF3B84 80240FB4 00000000 */ nop /* CF3B88 80240FB8 C7A0001C */ lwc1 $f0, 0x1c($sp) /* CF3B8C 80240FBC 46140080 */ add.s $f2, $f0, $f20 /* CF3B90 80240FC0 C600003C */ lwc1 $f0, 0x3c($s0) /* CF3B94 80240FC4 4600103E */ c.le.s $f2, $f0 -/* CF3B98 80240FC8 00000000 */ nop +/* CF3B98 80240FC8 00000000 */ nop /* CF3B9C 80240FCC 4500008D */ bc1f .L80241204 -/* CF3BA0 80240FD0 00000000 */ nop +/* CF3BA0 80240FD0 00000000 */ nop /* CF3BA4 80240FD4 E602003C */ swc1 $f2, 0x3c($s0) /* CF3BA8 80240FD8 08090481 */ j .L80241204 /* CF3BAC 80240FDC AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_80240E98_CF3A68 /* CF3BB0 80240FE0 C602003C */ lwc1 $f2, 0x3c($s0) /* CF3BB4 80240FE4 C6000064 */ lwc1 $f0, 0x64($s0) /* CF3BB8 80240FE8 4602003E */ c.le.s $f0, $f2 -/* CF3BBC 80240FEC 00000000 */ nop +/* CF3BBC 80240FEC 00000000 */ nop /* CF3BC0 80240FF0 45030084 */ bc1tl .L80241204 /* CF3BC4 80240FF4 AE400070 */ sw $zero, 0x70($s2) /* CF3BC8 80240FF8 08090481 */ j .L80241204 -/* CF3BCC 80240FFC 00000000 */ nop +/* CF3BCC 80240FFC 00000000 */ nop .L80241000: /* CF3BD0 80241000 4622003C */ c.lt.d $f0, $f2 -/* CF3BD4 80241004 00000000 */ nop +/* CF3BD4 80241004 00000000 */ nop /* CF3BD8 80241008 4500007E */ bc1f .L80241204 -/* CF3BDC 8024100C 00000000 */ nop +/* CF3BDC 8024100C 00000000 */ nop /* CF3BE0 80241010 9602008E */ lhu $v0, 0x8e($s0) /* CF3BE4 80241014 24420001 */ addiu $v0, $v0, 1 /* CF3BE8 80241018 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_80240E98_CF3A68 /* CF3BF4 80241024 00021403 */ sra $v0, $v0, 0x10 /* CF3BF8 80241028 0043102A */ slt $v0, $v0, $v1 /* CF3BFC 8024102C 14400026 */ bnez $v0, .L802410C8 -/* CF3C00 80241030 00000000 */ nop +/* CF3C00 80241030 00000000 */ nop /* CF3C04 80241034 C60C0038 */ lwc1 $f12, 0x38($s0) /* CF3C08 80241038 C60E0040 */ lwc1 $f14, 0x40($s0) /* CF3C0C 8024103C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_80240E98_CF3A68 /* CF3C38 80241068 8E62001C */ lw $v0, 0x1c($s3) /* CF3C3C 8024106C 46001005 */ abs.s $f0, $f2 /* CF3C40 80241070 44822000 */ mtc1 $v0, $f4 -/* CF3C44 80241074 00000000 */ nop +/* CF3C44 80241074 00000000 */ nop /* CF3C48 80241078 46802120 */ cvt.s.w $f4, $f4 /* CF3C4C 8024107C 4600203C */ c.lt.s $f4, $f0 -/* CF3C50 80241080 00000000 */ nop +/* CF3C50 80241080 00000000 */ nop /* CF3C54 80241084 4500000D */ bc1f .L802410BC -/* CF3C58 80241088 00000000 */ nop +/* CF3C58 80241088 00000000 */ nop /* CF3C5C 8024108C 44800000 */ mtc1 $zero, $f0 /* CF3C60 80241090 C614000C */ lwc1 $f20, 0xc($s0) /* CF3C64 80241094 4600103C */ c.lt.s $f2, $f0 -/* CF3C68 80241098 00000000 */ nop +/* CF3C68 80241098 00000000 */ nop /* CF3C6C 8024109C 45000006 */ bc1f .L802410B8 /* CF3C70 802410A0 00021023 */ negu $v0, $v0 /* CF3C74 802410A4 44820000 */ mtc1 $v0, $f0 -/* CF3C78 802410A8 00000000 */ nop +/* CF3C78 802410A8 00000000 */ nop /* CF3C7C 802410AC 46800020 */ cvt.s.w $f0, $f0 /* CF3C80 802410B0 0809042F */ j .L802410BC /* CF3C84 802410B4 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_80240E98_CF3A68 /* CF3CAC 802410DC C600001C */ lwc1 $f0, 0x1c($s0) /* CF3CB0 802410E0 46001080 */ add.s $f2, $f2, $f0 /* CF3CB4 802410E4 4616103C */ c.lt.s $f2, $f22 -/* CF3CB8 802410E8 00000000 */ nop +/* CF3CB8 802410E8 00000000 */ nop /* CF3CBC 802410EC 45020045 */ bc1fl .L80241204 /* CF3CC0 802410F0 E602003C */ swc1 $f2, 0x3c($s0) /* CF3CC4 802410F4 08090480 */ j .L80241200 @@ -169,7 +169,7 @@ glabel func_80240E98_CF3A68 /* CF3CDC 8024110C C600001C */ lwc1 $f0, 0x1c($s0) /* CF3CE0 80241110 C604003C */ lwc1 $f4, 0x3c($s0) /* CF3CE4 80241114 44821000 */ mtc1 $v0, $f2 -/* CF3CE8 80241118 00000000 */ nop +/* CF3CE8 80241118 00000000 */ nop /* CF3CEC 8024111C 468010A0 */ cvt.s.w $f2, $f2 /* CF3CF0 80241120 46000005 */ abs.s $f0, $f0 /* CF3CF4 80241124 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_80240E98_CF3A68 /* CF3D30 80241160 0C0372DF */ jal func_800DCB7C /* CF3D34 80241164 27A70020 */ addiu $a3, $sp, 0x20 /* CF3D38 80241168 10400015 */ beqz $v0, .L802411C0 -/* CF3D3C 8024116C 00000000 */ nop +/* CF3D3C 8024116C 00000000 */ nop /* CF3D40 80241170 860200A8 */ lh $v0, 0xa8($s0) /* CF3D44 80241174 C604001C */ lwc1 $f4, 0x1c($s0) /* CF3D48 80241178 44820000 */ mtc1 $v0, $f0 -/* CF3D4C 8024117C 00000000 */ nop +/* CF3D4C 8024117C 00000000 */ nop /* CF3D50 80241180 46800020 */ cvt.s.w $f0, $f0 /* CF3D54 80241184 46002085 */ abs.s $f2, $f4 /* CF3D58 80241188 46020000 */ add.s $f0, $f0, $f2 /* CF3D5C 8024118C C7A20024 */ lwc1 $f2, 0x24($sp) /* CF3D60 80241190 4600103E */ c.le.s $f2, $f0 -/* CF3D64 80241194 00000000 */ nop +/* CF3D64 80241194 00000000 */ nop /* CF3D68 80241198 45000005 */ bc1f .L802411B0 -/* CF3D6C 8024119C 00000000 */ nop +/* CF3D6C 8024119C 00000000 */ nop /* CF3D70 802411A0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* CF3D74 802411A4 AE00001C */ sw $zero, 0x1c($s0) /* CF3D78 802411A8 08090481 */ j .L80241204 @@ -217,13 +217,13 @@ glabel func_80240E98_CF3A68 /* CF3D94 802411C4 860200A8 */ lh $v0, 0xa8($s0) /* CF3D98 802411C8 46163081 */ sub.s $f2, $f6, $f22 /* CF3D9C 802411CC 44820000 */ mtc1 $v0, $f0 -/* CF3DA0 802411D0 00000000 */ nop +/* CF3DA0 802411D0 00000000 */ nop /* CF3DA4 802411D4 46800020 */ cvt.s.w $f0, $f0 /* CF3DA8 802411D8 46001080 */ add.s $f2, $f2, $f0 /* CF3DAC 802411DC C604001C */ lwc1 $f4, 0x1c($s0) /* CF3DB0 802411E0 46002005 */ abs.s $f0, $f4 /* CF3DB4 802411E4 4602003C */ c.lt.s $f0, $f2 -/* CF3DB8 802411E8 00000000 */ nop +/* CF3DB8 802411E8 00000000 */ nop /* CF3DBC 802411EC 45020005 */ bc1fl .L80241204 /* CF3DC0 802411F0 AE00001C */ sw $zero, 0x1c($s0) /* CF3DC4 802411F4 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241228_CF3DF8.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241228_CF3DF8.s index a8fd2c5e29..036933e10d 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241228_CF3DF8.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241228_CF3DF8.s @@ -49,15 +49,15 @@ glabel func_80241228_CF3DF8 /* CF3EA0 802412D0 44802000 */ mtc1 $zero, $f4 /* CF3EA4 802412D4 460010A1 */ cvt.d.s $f2, $f2 /* CF3EA8 802412D8 46241082 */ mul.d $f2, $f2, $f4 -/* CF3EAC 802412DC 00000000 */ nop +/* CF3EAC 802412DC 00000000 */ nop /* CF3EB0 802412E0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* CF3EB4 802412E4 46000021 */ cvt.d.s $f0, $f0 /* CF3EB8 802412E8 46240002 */ mul.d $f0, $f0, $f4 -/* CF3EBC 802412EC 00000000 */ nop +/* CF3EBC 802412EC 00000000 */ nop /* CF3EC0 802412F0 3C013FE0 */ lui $at, 0x3fe0 /* CF3EC4 802412F4 44812800 */ mtc1 $at, $f5 /* CF3EC8 802412F8 44802000 */ mtc1 $zero, $f4 -/* CF3ECC 802412FC 00000000 */ nop +/* CF3ECC 802412FC 00000000 */ nop /* CF3ED0 80241300 46241080 */ add.d $f2, $f2, $f4 /* CF3ED4 80241304 AE000074 */ sw $zero, 0x74($s0) /* CF3ED8 80241308 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s index 6f13f59157..670c181dfe 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s @@ -54,7 +54,7 @@ glabel func_8024134C_CF3F1C /* CF3FDC 8024140C 8E4300B0 */ lw $v1, 0xb0($s2) /* CF3FE0 80241410 30620004 */ andi $v0, $v1, 4 /* CF3FE4 80241414 10400007 */ beqz $v0, .L80241434 -/* CF3FE8 80241418 00000000 */ nop +/* CF3FE8 80241418 00000000 */ nop /* CF3FEC 8024141C 824200B4 */ lb $v0, 0xb4($s2) /* CF3FF0 80241420 1440003C */ bnez $v0, .L80241514 /* CF3FF4 80241424 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_8024134C_CF3F1C /* CF4008 80241438 2C62000F */ sltiu $v0, $v1, 0xf /* CF400C 8024143C 10400034 */ beqz $v0, .L80241510 /* CF4010 80241440 00031080 */ sll $v0, $v1, 2 -/* CF4014 80241444 3C018024 */ lui $at, %hi(func_80244EF8) +/* CF4014 80241444 3C018024 */ lui $at, %hi(jtbl_80244EF8_CF7AC8) /* CF4018 80241448 00220821 */ addu $at, $at, $v0 -/* CF401C 8024144C 8C224EF8 */ lw $v0, %lo(func_80244EF8)($at) +/* CF401C 8024144C 8C224EF8 */ lw $v0, %lo(jtbl_80244EF8_CF7AC8)($at) /* CF4020 80241450 00400008 */ jr $v0 -/* CF4024 80241454 00000000 */ nop +/* CF4024 80241454 00000000 */ nop +glabel L80241458_CF4028 /* CF4028 80241458 0280202D */ daddu $a0, $s4, $zero /* CF402C 8024145C 0200282D */ daddu $a1, $s0, $zero /* CF4030 80241460 0C090010 */ jal func_80240040_CF2C10 /* CF4034 80241464 0260302D */ daddu $a2, $s3, $zero +glabel L80241468_CF4038 /* CF4038 80241468 0280202D */ daddu $a0, $s4, $zero /* CF403C 8024146C 0200282D */ daddu $a1, $s0, $zero /* CF4040 80241470 0C09007C */ jal func_802401F0_CF2DC0 /* CF4044 80241474 0260302D */ daddu $a2, $s3, $zero /* CF4048 80241478 08090545 */ j .L80241514 /* CF404C 8024147C 0000102D */ daddu $v0, $zero, $zero +glabel L80241480_CF4050 /* CF4050 80241480 0280202D */ daddu $a0, $s4, $zero /* CF4054 80241484 0200282D */ daddu $a1, $s0, $zero /* CF4058 80241488 0C090206 */ jal flo_25_UnkNpcAIFunc1 /* CF405C 8024148C 0260302D */ daddu $a2, $s3, $zero +glabel L80241490_CF4060 /* CF4060 80241490 0280202D */ daddu $a0, $s4, $zero /* CF4064 80241494 0200282D */ daddu $a1, $s0, $zero /* CF4068 80241498 0C090236 */ jal func_802408D8_CF34A8 /* CF406C 8024149C 0260302D */ daddu $a2, $s3, $zero /* CF4070 802414A0 08090545 */ j .L80241514 /* CF4074 802414A4 0000102D */ daddu $v0, $zero, $zero +glabel L802414A8_CF4078 /* CF4078 802414A8 0280202D */ daddu $a0, $s4, $zero /* CF407C 802414AC 0200282D */ daddu $a1, $s0, $zero /* CF4080 802414B0 0C090307 */ jal flo_25_UnkNpcAIFunc2 /* CF4084 802414B4 0260302D */ daddu $a2, $s3, $zero +glabel L802414B8_CF4088 /* CF4088 802414B8 0280202D */ daddu $a0, $s4, $zero /* CF408C 802414BC 0200282D */ daddu $a1, $s0, $zero /* CF4090 802414C0 0C090325 */ jal func_80240C94_CF3864 /* CF4094 802414C4 0260302D */ daddu $a2, $s3, $zero /* CF4098 802414C8 08090545 */ j .L80241514 /* CF409C 802414CC 0000102D */ daddu $v0, $zero, $zero +glabel L802414D0_CF40A0 /* CF40A0 802414D0 0280202D */ daddu $a0, $s4, $zero /* CF40A4 802414D4 0200282D */ daddu $a1, $s0, $zero /* CF40A8 802414D8 0C090340 */ jal func_80240D00_CF38D0 /* CF40AC 802414DC 0260302D */ daddu $a2, $s3, $zero /* CF40B0 802414E0 08090545 */ j .L80241514 /* CF40B4 802414E4 0000102D */ daddu $v0, $zero, $zero +glabel L802414E8_CF40B8 /* CF40B8 802414E8 0280202D */ daddu $a0, $s4, $zero /* CF40BC 802414EC 0200282D */ daddu $a1, $s0, $zero /* CF40C0 802414F0 0C09038D */ jal flo_25_UnkNpcAIFunc3 /* CF40C4 802414F4 0260302D */ daddu $a2, $s3, $zero /* CF40C8 802414F8 08090545 */ j .L80241514 /* CF40CC 802414FC 0000102D */ daddu $v0, $zero, $zero +glabel L80241500_CF40D0 /* CF40D0 80241500 0280202D */ daddu $a0, $s4, $zero /* CF40D4 80241504 0200282D */ daddu $a1, $s0, $zero /* CF40D8 80241508 0C0903A6 */ jal func_80240E98_CF3A68 /* CF40DC 8024150C 0260302D */ daddu $a2, $s3, $zero .L80241510: +glabel L80241510_CF40E0 /* CF40E0 80241510 0000102D */ daddu $v0, $zero, $zero .L80241514: /* CF40E4 80241514 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241538_CF4108.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241538_CF4108.s index e11afb82a7..2bb9989eb2 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241538_CF4108.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241538_CF4108.s @@ -47,20 +47,20 @@ glabel func_80241538_CF4108 /* CF41B0 802415E0 8E02001C */ lw $v0, 0x1c($s0) /* CF41B4 802415E4 46001005 */ abs.s $f0, $f2 /* CF41B8 802415E8 44822000 */ mtc1 $v0, $f4 -/* CF41BC 802415EC 00000000 */ nop +/* CF41BC 802415EC 00000000 */ nop /* CF41C0 802415F0 46802120 */ cvt.s.w $f4, $f4 /* CF41C4 802415F4 4600203C */ c.lt.s $f4, $f0 -/* CF41C8 802415F8 00000000 */ nop +/* CF41C8 802415F8 00000000 */ nop /* CF41CC 802415FC 4500000D */ bc1f .L80241634 -/* CF41D0 80241600 00000000 */ nop +/* CF41D0 80241600 00000000 */ nop /* CF41D4 80241604 44800000 */ mtc1 $zero, $f0 /* CF41D8 80241608 C654000C */ lwc1 $f20, 0xc($s2) /* CF41DC 8024160C 4600103C */ c.lt.s $f2, $f0 -/* CF41E0 80241610 00000000 */ nop +/* CF41E0 80241610 00000000 */ nop /* CF41E4 80241614 45000006 */ bc1f .L80241630 /* CF41E8 80241618 00021023 */ negu $v0, $v0 /* CF41EC 8024161C 44820000 */ mtc1 $v0, $f0 -/* CF41F0 80241620 00000000 */ nop +/* CF41F0 80241620 00000000 */ nop /* CF41F4 80241624 46800020 */ cvt.s.w $f0, $f0 /* CF41F8 80241628 0809058D */ j .L80241634 /* CF41FC 8024162C 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241668_CF4238.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241668_CF4238.s index 34c8583ca0..f2b11a4fa5 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241668_CF4238.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241668_CF4238.s @@ -36,7 +36,7 @@ glabel func_80241668_CF4238 /* CF42B4 802416E4 2402000F */ addiu $v0, $zero, 0xf /* CF42B8 802416E8 AFA2001C */ sw $v0, 0x1c($sp) /* CF42BC 802416EC 44834000 */ mtc1 $v1, $f8 -/* CF42C0 802416F0 00000000 */ nop +/* CF42C0 802416F0 00000000 */ nop /* CF42C4 802416F4 46804220 */ cvt.s.w $f8, $f8 /* CF42C8 802416F8 44074000 */ mfc1 $a3, $f8 /* CF42CC 802416FC 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,14 +69,14 @@ glabel func_80241668_CF4238 /* CF4334 80241764 860200A8 */ lh $v0, 0xa8($s0) /* CF4338 80241768 C6000038 */ lwc1 $f0, 0x38($s0) /* CF433C 8024176C 44821000 */ mtc1 $v0, $f2 -/* CF4340 80241770 00000000 */ nop +/* CF4340 80241770 00000000 */ nop /* CF4344 80241774 468010A0 */ cvt.s.w $f2, $f2 /* CF4348 80241778 E7A0002C */ swc1 $f0, 0x2c($sp) /* CF434C 8024177C 860200A8 */ lh $v0, 0xa8($s0) /* CF4350 80241780 C604003C */ lwc1 $f4, 0x3c($s0) /* CF4354 80241784 C6060040 */ lwc1 $f6, 0x40($s0) /* CF4358 80241788 44820000 */ mtc1 $v0, $f0 -/* CF435C 8024178C 00000000 */ nop +/* CF435C 8024178C 00000000 */ nop /* CF4360 80241790 46800021 */ cvt.d.w $f0, $f0 /* CF4364 80241794 46022100 */ add.s $f4, $f4, $f2 /* CF4368 80241798 3C014008 */ lui $at, 0x4008 @@ -93,19 +93,19 @@ glabel func_80241668_CF4238 /* CF4394 802417C4 0C0372DF */ jal func_800DCB7C /* CF4398 802417C8 27A70034 */ addiu $a3, $sp, 0x34 /* CF439C 802417CC 1040000A */ beqz $v0, .L802417F8 -/* CF43A0 802417D0 00000000 */ nop +/* CF43A0 802417D0 00000000 */ nop /* CF43A4 802417D4 860200A8 */ lh $v0, 0xa8($s0) /* CF43A8 802417D8 C7A20038 */ lwc1 $f2, 0x38($sp) /* CF43AC 802417DC 44820000 */ mtc1 $v0, $f0 -/* CF43B0 802417E0 00000000 */ nop +/* CF43B0 802417E0 00000000 */ nop /* CF43B4 802417E4 46800020 */ cvt.s.w $f0, $f0 /* CF43B8 802417E8 4600103C */ c.lt.s $f2, $f0 -/* CF43BC 802417EC 00000000 */ nop +/* CF43BC 802417EC 00000000 */ nop /* CF43C0 802417F0 45030001 */ bc1tl .L802417F8 /* CF43C4 802417F4 24110001 */ addiu $s1, $zero, 1 .L802417F8: /* CF43C8 802417F8 12200008 */ beqz $s1, .L8024181C -/* CF43CC 802417FC 00000000 */ nop +/* CF43CC 802417FC 00000000 */ nop /* CF43D0 80241800 C7A00030 */ lwc1 $f0, 0x30($sp) /* CF43D4 80241804 3C013FF0 */ lui $at, 0x3ff0 /* CF43D8 80241808 44811800 */ mtc1 $at, $f3 @@ -130,24 +130,24 @@ glabel func_80241668_CF4238 /* CF4420 80241850 44800800 */ mtc1 $zero, $f1 /* CF4424 80241854 460030A1 */ cvt.d.s $f2, $f6 /* CF4428 80241858 4620103C */ c.lt.d $f2, $f0 -/* CF442C 8024185C 00000000 */ nop +/* CF442C 8024185C 00000000 */ nop /* CF4430 80241860 45010009 */ bc1t .L80241888 -/* CF4434 80241864 00000000 */ nop +/* CF4434 80241864 00000000 */ nop /* CF4438 80241868 3C014010 */ lui $at, 0x4010 /* CF443C 8024186C 44810800 */ mtc1 $at, $f1 /* CF4440 80241870 44800000 */ mtc1 $zero, $f0 -/* CF4444 80241874 00000000 */ nop +/* CF4444 80241874 00000000 */ nop /* CF4448 80241878 4622003C */ c.lt.d $f0, $f2 -/* CF444C 8024187C 00000000 */ nop +/* CF444C 8024187C 00000000 */ nop /* CF4450 80241880 4500000A */ bc1f .L802418AC -/* CF4454 80241884 00000000 */ nop +/* CF4454 80241884 00000000 */ nop .L80241888: /* CF4458 80241888 3C018024 */ lui $at, %hi(D_80244F38) /* CF445C 8024188C D4224F38 */ ldc1 $f2, %lo(D_80244F38)($at) /* CF4460 80241890 46003187 */ neg.s $f6, $f6 /* CF4464 80241894 46003021 */ cvt.d.s $f0, $f6 /* CF4468 80241898 46220002 */ mul.d $f0, $f0, $f2 -/* CF446C 8024189C 00000000 */ nop +/* CF446C 8024189C 00000000 */ nop /* CF4470 802418A0 46202000 */ add.d $f0, $f4, $f0 .L802418A4: /* CF4474 802418A4 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802418E8_CF44B8.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802418E8_CF44B8.s index 8693eaadc6..3c5cabc861 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802418E8_CF44B8.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802418E8_CF44B8.s @@ -16,7 +16,7 @@ glabel func_802418E8_CF44B8 /* CF44E4 80241914 A462008E */ sh $v0, 0x8e($v1) /* CF44E8 80241918 00021400 */ sll $v0, $v0, 0x10 /* CF44EC 8024191C 1C400004 */ bgtz $v0, .L80241930 -/* CF44F0 80241920 00000000 */ nop +/* CF44F0 80241920 00000000 */ nop /* CF44F4 80241924 AE000074 */ sw $zero, 0x74($s0) /* CF44F8 80241928 A460008E */ sh $zero, 0x8e($v1) /* CF44FC 8024192C AE200070 */ sw $zero, 0x70($s1) diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s index d7c403492e..93ab29b7e9 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s @@ -55,7 +55,7 @@ glabel func_80241944_CF4514 /* CF45D8 80241A08 8E4300B0 */ lw $v1, 0xb0($s2) /* CF45DC 80241A0C 30620004 */ andi $v0, $v1, 4 /* CF45E0 80241A10 10400007 */ beqz $v0, .L80241A30 -/* CF45E4 80241A14 00000000 */ nop +/* CF45E4 80241A14 00000000 */ nop /* CF45E8 80241A18 824200B4 */ lb $v0, 0xb4($s2) /* CF45EC 80241A1C 1440003A */ bnez $v0, .L80241B08 /* CF45F0 80241A20 0000102D */ daddu $v0, $zero, $zero @@ -67,56 +67,66 @@ glabel func_80241944_CF4514 /* CF4604 80241A34 2C620015 */ sltiu $v0, $v1, 0x15 /* CF4608 80241A38 10400032 */ beqz $v0, .L80241B04 /* CF460C 80241A3C 00031080 */ sll $v0, $v1, 2 -/* CF4610 80241A40 3C018024 */ lui $at, %hi(D_80244F40) +/* CF4610 80241A40 3C018024 */ lui $at, %hi(jtbl_80244F40_CF7B10) /* CF4614 80241A44 00220821 */ addu $at, $at, $v0 -/* CF4618 80241A48 8C224F40 */ lw $v0, %lo(D_80244F40)($at) +/* CF4618 80241A48 8C224F40 */ lw $v0, %lo(jtbl_80244F40_CF7B10)($at) /* CF461C 80241A4C 00400008 */ jr $v0 -/* CF4620 80241A50 00000000 */ nop +/* CF4620 80241A50 00000000 */ nop +glabel L80241A54_CF4624 /* CF4624 80241A54 0280202D */ daddu $a0, $s4, $zero /* CF4628 80241A58 0200282D */ daddu $a1, $s0, $zero /* CF462C 80241A5C 0C090010 */ jal func_80240040_CF2C10 /* CF4630 80241A60 0260302D */ daddu $a2, $s3, $zero +glabel L80241A64_CF4634 /* CF4634 80241A64 0280202D */ daddu $a0, $s4, $zero /* CF4638 80241A68 0200282D */ daddu $a1, $s0, $zero /* CF463C 80241A6C 0C09007C */ jal func_802401F0_CF2DC0 /* CF4640 80241A70 0260302D */ daddu $a2, $s3, $zero /* CF4644 80241A74 080906C2 */ j .L80241B08 /* CF4648 80241A78 0000102D */ daddu $v0, $zero, $zero +glabel L80241A7C_CF464C /* CF464C 80241A7C 0280202D */ daddu $a0, $s4, $zero /* CF4650 80241A80 0200282D */ daddu $a1, $s0, $zero /* CF4654 80241A84 0C090206 */ jal flo_25_UnkNpcAIFunc1 /* CF4658 80241A88 0260302D */ daddu $a2, $s3, $zero +glabel L80241A8C_CF465C /* CF465C 80241A8C 0280202D */ daddu $a0, $s4, $zero /* CF4660 80241A90 0200282D */ daddu $a1, $s0, $zero /* CF4664 80241A94 0C090236 */ jal func_802408D8_CF34A8 /* CF4668 80241A98 0260302D */ daddu $a2, $s3, $zero /* CF466C 80241A9C 080906C2 */ j .L80241B08 /* CF4670 80241AA0 0000102D */ daddu $v0, $zero, $zero +glabel L80241AA4_CF4674 /* CF4674 80241AA4 0280202D */ daddu $a0, $s4, $zero /* CF4678 80241AA8 0200282D */ daddu $a1, $s0, $zero /* CF467C 80241AAC 0C090307 */ jal flo_25_UnkNpcAIFunc2 /* CF4680 80241AB0 0260302D */ daddu $a2, $s3, $zero +glabel L80241AB4_CF4684 /* CF4684 80241AB4 0280202D */ daddu $a0, $s4, $zero /* CF4688 80241AB8 0200282D */ daddu $a1, $s0, $zero /* CF468C 80241ABC 0C090325 */ jal func_80240C94_CF3864 /* CF4690 80241AC0 0260302D */ daddu $a2, $s3, $zero /* CF4694 80241AC4 080906C2 */ j .L80241B08 /* CF4698 80241AC8 0000102D */ daddu $v0, $zero, $zero +glabel L80241ACC_CF469C /* CF469C 80241ACC 0280202D */ daddu $a0, $s4, $zero /* CF46A0 80241AD0 0200282D */ daddu $a1, $s0, $zero /* CF46A4 80241AD4 0C09054E */ jal func_80241538_CF4108 /* CF46A8 80241AD8 0260302D */ daddu $a2, $s3, $zero +glabel L80241ADC_CF46AC /* CF46AC 80241ADC 0280202D */ daddu $a0, $s4, $zero /* CF46B0 80241AE0 0200282D */ daddu $a1, $s0, $zero /* CF46B4 80241AE4 0C09059A */ jal func_80241668_CF4238 /* CF46B8 80241AE8 0260302D */ daddu $a2, $s3, $zero /* CF46BC 80241AEC 080906C2 */ j .L80241B08 /* CF46C0 80241AF0 0000102D */ daddu $v0, $zero, $zero +glabel L80241AF4_CF46C4 /* CF46C4 80241AF4 0280202D */ daddu $a0, $s4, $zero /* CF46C8 80241AF8 0200282D */ daddu $a1, $s0, $zero /* CF46CC 80241AFC 0C09063A */ jal func_802418E8_CF44B8 /* CF46D0 80241B00 0260302D */ daddu $a2, $s3, $zero .L80241B04: +glabel L80241B04_CF46D4 /* CF46D4 80241B04 0000102D */ daddu $v0, $zero, $zero .L80241B08: /* CF46D8 80241B08 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241DE4_CF49B4.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241DE4_CF49B4.s index 94c12c6178..41f3390237 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241DE4_CF49B4.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241DE4_CF49B4.s @@ -28,7 +28,7 @@ glabel func_80241DE4_CF49B4 /* CF4A08 80241E38 00220821 */ addu $at, $at, $v0 /* CF4A0C 80241E3C AC204FA0 */ sw $zero, %lo(D_80244FA0)($at) /* CF4A10 80241E40 0809079C */ j .L80241E70 -/* CF4A14 80241E44 00000000 */ nop +/* CF4A14 80241E44 00000000 */ nop .L80241E48: /* CF4A18 80241E48 3C038024 */ lui $v1, %hi(D_80244FA0) /* CF4A1C 80241E4C 24634FA0 */ addiu $v1, $v1, %lo(D_80244FA0) diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241E80_CF4A50.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241E80_CF4A50.s index 20a54e0c81..38b57b720d 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241E80_CF4A50.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241E80_CF4A50.s @@ -32,15 +32,15 @@ glabel func_80241E80_CF4A50 /* CF4ABC 80241EEC 0040802D */ daddu $s0, $v0, $zero /* CF4AC0 80241EF0 0040182D */ daddu $v1, $v0, $zero /* CF4AC4 80241EF4 44920000 */ mtc1 $s2, $f0 -/* CF4AC8 80241EF8 00000000 */ nop +/* CF4AC8 80241EF8 00000000 */ nop /* CF4ACC 80241EFC 46800020 */ cvt.s.w $f0, $f0 /* CF4AD0 80241F00 E4600008 */ swc1 $f0, 8($v1) /* CF4AD4 80241F04 44910000 */ mtc1 $s1, $f0 -/* CF4AD8 80241F08 00000000 */ nop +/* CF4AD8 80241F08 00000000 */ nop /* CF4ADC 80241F0C 46800020 */ cvt.s.w $f0, $f0 /* CF4AE0 80241F10 E460000C */ swc1 $f0, 0xc($v1) /* CF4AE4 80241F14 44900000 */ mtc1 $s0, $f0 -/* CF4AE8 80241F18 00000000 */ nop +/* CF4AE8 80241F18 00000000 */ nop /* CF4AEC 80241F1C 46800020 */ cvt.s.w $f0, $f0 /* CF4AF0 80241F20 E4600010 */ swc1 $f0, 0x10($v1) /* CF4AF4 80241F24 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241FB4_CF4B84.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241FB4_CF4B84.s index 9a42d0df21..408dd72e25 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241FB4_CF4B84.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241FB4_CF4B84.s @@ -16,5 +16,5 @@ glabel func_80241FB4_CF4B84 /* CF4BAC 80241FDC AC20527C */ sw $zero, %lo(D_8024527C)($at) /* CF4BB0 80241FE0 03E00008 */ jr $ra /* CF4BB4 80241FE4 24020002 */ addiu $v0, $zero, 2 -/* CF4BB8 80241FE8 00000000 */ nop -/* CF4BBC 80241FEC 00000000 */ nop +/* CF4BB8 80241FE8 00000000 */ nop +/* CF4BBC 80241FEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF4E00/func_80242230_CF4E00.s b/asm/nonmatchings/world/area_flo/flo_25/CF4E00/func_80242230_CF4E00.s index da1a6813aa..5d33556b46 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF4E00/func_80242230_CF4E00.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF4E00/func_80242230_CF4E00.s @@ -6,33 +6,33 @@ glabel func_80242230_CF4E00 /* CF4E04 80242234 8C830090 */ lw $v1, 0x90($a0) /* CF4E08 80242238 00431023 */ subu $v0, $v0, $v1 /* CF4E0C 8024223C 44821000 */ mtc1 $v0, $f2 -/* CF4E10 80242240 00000000 */ nop +/* CF4E10 80242240 00000000 */ nop /* CF4E14 80242244 468010A0 */ cvt.s.w $f2, $f2 /* CF4E18 80242248 8C820088 */ lw $v0, 0x88($a0) /* CF4E1C 8024224C 8C830094 */ lw $v1, 0x94($a0) /* CF4E20 80242250 46021082 */ mul.s $f2, $f2, $f2 -/* CF4E24 80242254 00000000 */ nop +/* CF4E24 80242254 00000000 */ nop /* CF4E28 80242258 00431023 */ subu $v0, $v0, $v1 /* CF4E2C 8024225C 44822000 */ mtc1 $v0, $f4 -/* CF4E30 80242260 00000000 */ nop +/* CF4E30 80242260 00000000 */ nop /* CF4E34 80242264 46802120 */ cvt.s.w $f4, $f4 /* CF4E38 80242268 8C82008C */ lw $v0, 0x8c($a0) /* CF4E3C 8024226C 46042102 */ mul.s $f4, $f4, $f4 -/* CF4E40 80242270 00000000 */ nop +/* CF4E40 80242270 00000000 */ nop /* CF4E44 80242274 8C830098 */ lw $v1, 0x98($a0) /* CF4E48 80242278 00431023 */ subu $v0, $v0, $v1 /* CF4E4C 8024227C 44820000 */ mtc1 $v0, $f0 -/* CF4E50 80242280 00000000 */ nop +/* CF4E50 80242280 00000000 */ nop /* CF4E54 80242284 46800020 */ cvt.s.w $f0, $f0 /* CF4E58 80242288 46000002 */ mul.s $f0, $f0, $f0 -/* CF4E5C 8024228C 00000000 */ nop +/* CF4E5C 8024228C 00000000 */ nop /* CF4E60 80242290 46041080 */ add.s $f2, $f2, $f4 /* CF4E64 80242294 46001080 */ add.s $f2, $f2, $f0 /* CF4E68 80242298 3C014561 */ lui $at, 0x4561 /* CF4E6C 8024229C 44810000 */ mtc1 $at, $f0 -/* CF4E70 802422A0 00000000 */ nop +/* CF4E70 802422A0 00000000 */ nop /* CF4E74 802422A4 4600103C */ c.lt.s $f2, $f0 -/* CF4E78 802422A8 00000000 */ nop +/* CF4E78 802422A8 00000000 */ nop /* CF4E7C 802422AC 45010002 */ bc1t .L802422B8 /* CF4E80 802422B0 24020001 */ addiu $v0, $zero, 1 /* CF4E84 802422B4 0000102D */ daddu $v0, $zero, $zero @@ -40,6 +40,6 @@ glabel func_80242230_CF4E00 /* CF4E88 802422B8 AC820084 */ sw $v0, 0x84($a0) /* CF4E8C 802422BC 03E00008 */ jr $ra /* CF4E90 802422C0 24020002 */ addiu $v0, $zero, 2 -/* CF4E94 802422C4 00000000 */ nop -/* CF4E98 802422C8 00000000 */ nop -/* CF4E9C 802422CC 00000000 */ nop +/* CF4E94 802422C4 00000000 */ nop +/* CF4E98 802422C8 00000000 */ nop +/* CF4E9C 802422CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240034_E1E494.s b/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240034_E1E494.s index 62b36f585e..9e780da04c 100644 --- a/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240034_E1E494.s +++ b/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240034_E1E494.s @@ -22,16 +22,16 @@ glabel func_80240034_E1E494 /* E1E4D4 80240074 00021023 */ negu $v0, $v0 .L80240078: /* E1E4D8 80240078 14400003 */ bnez $v0, .L80240088 -/* E1E4DC 8024007C 00000000 */ nop +/* E1E4DC 8024007C 00000000 */ nop /* E1E4E0 80240080 50E00017 */ beql $a3, $zero, .L802400E0 /* E1E4E4 80240084 0000102D */ daddu $v0, $zero, $zero .L80240088: /* E1E4E8 80240088 44822000 */ mtc1 $v0, $f4 -/* E1E4EC 8024008C 00000000 */ nop +/* E1E4EC 8024008C 00000000 */ nop /* E1E4F0 80240090 46802120 */ cvt.s.w $f4, $f4 /* E1E4F4 80240094 44062000 */ mfc1 $a2, $f4 /* E1E4F8 80240098 44872000 */ mtc1 $a3, $f4 -/* E1E4FC 8024009C 00000000 */ nop +/* E1E4FC 8024009C 00000000 */ nop /* E1E500 802400A0 46802120 */ cvt.s.w $f4, $f4 /* E1E504 802400A4 44806000 */ mtc1 $zero, $f12 /* E1E508 802400A8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240034_E1E494 /* E1E510 802400B0 46006386 */ mov.s $f14, $f12 /* E1E514 802400B4 3C014270 */ lui $at, 0x4270 /* E1E518 802400B8 44811000 */ mtc1 $at, $f2 -/* E1E51C 802400BC 00000000 */ nop +/* E1E51C 802400BC 00000000 */ nop /* E1E520 802400C0 4602003C */ c.lt.s $f0, $f2 -/* E1E524 802400C4 00000000 */ nop +/* E1E524 802400C4 00000000 */ nop /* E1E528 802400C8 45000004 */ bc1f .L802400DC /* E1E52C 802400CC 24020001 */ addiu $v0, $zero, 1 /* E1E530 802400D0 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240688_E1EAE8.s b/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240688_E1EAE8.s index c5f6dc6596..95fc1dc26a 100644 --- a/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240688_E1EAE8.s +++ b/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240688_E1EAE8.s @@ -22,53 +22,53 @@ glabel func_80240688_E1EAE8 /* E1EB2C 802406CC 0C00AB00 */ jal general_heap_create /* E1EB30 802406D0 AC820000 */ sw $v0, ($a0) /* E1EB34 802406D4 0C047624 */ jal func_8011D890 -/* E1EB38 802406D8 00000000 */ nop +/* E1EB38 802406D8 00000000 */ nop /* E1EB3C 802406DC 0C048C2E */ jal clear_dynamic_entity_list -/* E1EB40 802406E0 00000000 */ nop +/* E1EB40 802406E0 00000000 */ nop /* E1EB44 802406E4 0C0B0C77 */ jal clear_script_list -/* E1EB48 802406E8 00000000 */ nop +/* E1EB48 802406E8 00000000 */ nop /* E1EB4C 802406EC 0C00B7BD */ jal create_cameras_a -/* E1EB50 802406F0 00000000 */ nop +/* E1EB50 802406F0 00000000 */ nop /* E1EB54 802406F4 0C0B763E */ jal func_802DD8F8 /* E1EB58 802406F8 0000202D */ daddu $a0, $zero, $zero /* E1EB5C 802406FC 0C0482EC */ jal clear_virtual_models -/* E1EB60 80240700 00000000 */ nop +/* E1EB60 80240700 00000000 */ nop /* E1EB64 80240704 0C047889 */ jal func_8011E224 -/* E1EB68 80240708 00000000 */ nop +/* E1EB68 80240708 00000000 */ nop /* E1EB6C 8024070C 0C045751 */ jal clear_model_data -/* E1EB70 80240710 00000000 */ nop +/* E1EB70 80240710 00000000 */ nop /* E1EB74 80240714 0C052010 */ jal func_80148040 -/* E1EB78 80240718 00000000 */ nop +/* E1EB78 80240718 00000000 */ nop /* E1EB7C 8024071C 0C05177E */ jal func_80145DF8 -/* E1EB80 80240720 00000000 */ nop +/* E1EB80 80240720 00000000 */ nop /* E1EB84 80240724 0C050440 */ jal func_80141100 -/* E1EB88 80240728 00000000 */ nop +/* E1EB88 80240728 00000000 */ nop /* E1EB8C 8024072C 0C0515A0 */ jal clear_trigger_data -/* E1EB90 80240730 00000000 */ nop +/* E1EB90 80240730 00000000 */ nop /* E1EB94 80240734 0C048D9D */ jal clear_printers -/* E1EB98 80240738 00000000 */ nop +/* E1EB98 80240738 00000000 */ nop /* E1EB9C 8024073C 0C04432E */ jal clear_entity_data /* E1EBA0 80240740 0000202D */ daddu $a0, $zero, $zero /* E1EBA4 80240744 0C04E042 */ jal func_80138108 -/* E1EBA8 80240748 00000000 */ nop +/* E1EBA8 80240748 00000000 */ nop /* E1EBAC 8024074C 0C037F14 */ jal clear_player_status -/* E1EBB0 80240750 00000000 */ nop +/* E1EBB0 80240750 00000000 */ nop /* E1EBB4 80240754 0C00E12F */ jal clear_npcs -/* E1EBB8 80240758 00000000 */ nop +/* E1EBB8 80240758 00000000 */ nop /* E1EBBC 8024075C 0C039CE8 */ jal clear_player_data -/* E1EBC0 80240760 00000000 */ nop +/* E1EBC0 80240760 00000000 */ nop /* E1EBC4 80240764 0C01CACC */ jal func_80072B30 -/* E1EBC8 80240768 00000000 */ nop +/* E1EBC8 80240768 00000000 */ nop /* E1EBCC 8024076C 0C00F8CE */ jal func_8003E338 -/* E1EBD0 80240770 00000000 */ nop +/* E1EBD0 80240770 00000000 */ nop /* E1EBD4 80240774 0C016727 */ jal func_80059C9C -/* E1EBD8 80240778 00000000 */ nop +/* E1EBD8 80240778 00000000 */ nop /* E1EBDC 8024077C 0C04C3FC */ jal clear_item_entity_data -/* E1EBE0 80240780 00000000 */ nop +/* E1EBE0 80240780 00000000 */ nop /* E1EBE4 80240784 0C0514C8 */ jal clear_saved_variables -/* E1EBE8 80240788 00000000 */ nop +/* E1EBE8 80240788 00000000 */ nop /* E1EBEC 8024078C 0C016BE5 */ jal initialize_collision -/* E1EBF0 80240790 00000000 */ nop +/* E1EBF0 80240790 00000000 */ nop /* E1EBF4 80240794 0C00CDF4 */ jal intro_logos_set_fade_alpha /* E1EBF8 80240798 240400FF */ addiu $a0, $zero, 0xff /* E1EBFC 8024079C 0C00CDF8 */ jal intro_logos_set_fade_color @@ -79,4 +79,4 @@ glabel func_80240688_E1EAE8 /* E1EC10 802407B0 240200FF */ addiu $v0, $zero, 0xff /* E1EC14 802407B4 03E00008 */ jr $ra /* E1EC18 802407B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* E1EC1C 802407BC 00000000 */ nop +/* E1EC1C 802407BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0BCF0/func_80240000_A0BCF0.s b/asm/nonmatchings/world/area_hos/hos_00/A0BCF0/func_80240000_A0BCF0.s index 115b9281c3..93fa53bd5d 100644 --- a/asm/nonmatchings/world/area_hos/hos_00/A0BCF0/func_80240000_A0BCF0.s +++ b/asm/nonmatchings/world/area_hos/hos_00/A0BCF0/func_80240000_A0BCF0.s @@ -9,7 +9,7 @@ glabel func_80240000_A0BCF0 /* A0BD00 80240010 8443008E */ lh $v1, 0x8e($v0) /* A0BD04 80240014 24020003 */ addiu $v0, $zero, 3 /* A0BD08 80240018 14620006 */ bne $v1, $v0, .L80240034 -/* A0BD0C 8024001C 00000000 */ nop +/* A0BD0C 8024001C 00000000 */ nop /* A0BD10 80240020 3C04800E */ lui $a0, %hi(D_800D9668) /* A0BD14 80240024 24849668 */ addiu $a0, $a0, %lo(D_800D9668) /* A0BD18 80240028 3C058024 */ lui $a1, %hi(D_80244B30) @@ -20,6 +20,6 @@ glabel func_80240000_A0BCF0 /* A0BD28 80240038 0000102D */ daddu $v0, $zero, $zero /* A0BD2C 8024003C 03E00008 */ jr $ra /* A0BD30 80240040 27BD0018 */ addiu $sp, $sp, 0x18 -/* A0BD34 80240044 00000000 */ nop -/* A0BD38 80240048 00000000 */ nop -/* A0BD3C 8024004C 00000000 */ nop +/* A0BD34 80240044 00000000 */ nop +/* A0BD38 80240048 00000000 */ nop +/* A0BD3C 8024004C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240170_A0BE60.s b/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240170_A0BE60.s index 6ac15e4e8b..7f3ae3d0c7 100644 --- a/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240170_A0BE60.s +++ b/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240170_A0BE60.s @@ -15,7 +15,7 @@ glabel func_80240170_A0BE60 /* A0BE88 80240198 AFBF0034 */ sw $ra, 0x34($sp) /* A0BE8C 8024019C 4600D683 */ div.s $f26, $f26, $f0 /* A0BE90 802401A0 4602D682 */ mul.s $f26, $f26, $f2 -/* A0BE94 802401A4 00000000 */ nop +/* A0BE94 802401A4 00000000 */ nop /* A0BE98 802401A8 AFB00030 */ sw $s0, 0x30($sp) /* A0BE9C 802401AC F7B60040 */ sdc1 $f22, 0x40($sp) /* A0BEA0 802401B0 F7B40038 */ sdc1 $f20, 0x38($sp) @@ -32,25 +32,25 @@ glabel func_80240170_A0BE60 /* A0BECC 802401DC 4620A520 */ cvt.s.d $f20, $f20 /* A0BED0 802401E0 2442FF06 */ addiu $v0, $v0, -0xfa /* A0BED4 802401E4 4482C000 */ mtc1 $v0, $f24 -/* A0BED8 802401E8 00000000 */ nop +/* A0BED8 802401E8 00000000 */ nop /* A0BEDC 802401EC 4680C620 */ cvt.s.w $f24, $f24 /* A0BEE0 802401F0 0C00A67F */ jal rand_int /* A0BEE4 802401F4 240401F4 */ addiu $a0, $zero, 0x1f4 /* A0BEE8 802401F8 24040064 */ addiu $a0, $zero, 0x64 /* A0BEEC 802401FC 2442FF06 */ addiu $v0, $v0, -0xfa /* A0BEF0 80240200 44822000 */ mtc1 $v0, $f4 -/* A0BEF4 80240204 00000000 */ nop +/* A0BEF4 80240204 00000000 */ nop /* A0BEF8 80240208 46802120 */ cvt.s.w $f4, $f4 /* A0BEFC 8024020C 0C00A67F */ jal rand_int /* A0BF00 80240210 E7A40028 */ swc1 $f4, 0x28($sp) /* A0BF04 80240214 24420258 */ addiu $v0, $v0, 0x258 /* A0BF08 80240218 4482E000 */ mtc1 $v0, $f28 -/* A0BF0C 8024021C 00000000 */ nop +/* A0BF0C 8024021C 00000000 */ nop /* A0BF10 80240220 4680E720 */ cvt.s.w $f28, $f28 /* A0BF14 80240224 0C00A85B */ jal sin_rad /* A0BF18 80240228 4600D306 */ mov.s $f12, $f26 /* A0BF1C 8024022C 4600E002 */ mul.s $f0, $f28, $f0 -/* A0BF20 80240230 00000000 */ nop +/* A0BF20 80240230 00000000 */ nop /* A0BF24 80240234 3C108011 */ lui $s0, %hi(gPlayerStatus) /* A0BF28 80240238 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* A0BF2C 8024023C C6020028 */ lwc1 $f2, 0x28($s0) @@ -58,50 +58,50 @@ glabel func_80240170_A0BE60 /* A0BF34 80240244 0C00A85B */ jal sin_rad /* A0BF38 80240248 4600B306 */ mov.s $f12, $f22 /* A0BF3C 8024024C 4600C002 */ mul.s $f0, $f24, $f0 -/* A0BF40 80240250 00000000 */ nop +/* A0BF40 80240250 00000000 */ nop /* A0BF44 80240254 C602002C */ lwc1 $f2, 0x2c($s0) /* A0BF48 80240258 4600F780 */ add.s $f30, $f30, $f0 /* A0BF4C 8024025C 3C014348 */ lui $at, 0x4348 /* A0BF50 80240260 44810000 */ mtc1 $at, $f0 -/* A0BF54 80240264 00000000 */ nop +/* A0BF54 80240264 00000000 */ nop /* A0BF58 80240268 46001080 */ add.s $f2, $f2, $f0 /* A0BF5C 8024026C 4600D306 */ mov.s $f12, $f26 /* A0BF60 80240270 E7BE0020 */ swc1 $f30, 0x20($sp) /* A0BF64 80240274 0C00A874 */ jal cos_rad /* A0BF68 80240278 E7A20024 */ swc1 $f2, 0x24($sp) /* A0BF6C 8024027C 4600E002 */ mul.s $f0, $f28, $f0 -/* A0BF70 80240280 00000000 */ nop +/* A0BF70 80240280 00000000 */ nop /* A0BF74 80240284 C61E0030 */ lwc1 $f30, 0x30($s0) /* A0BF78 80240288 4600F781 */ sub.s $f30, $f30, $f0 /* A0BF7C 8024028C 0C00A874 */ jal cos_rad /* A0BF80 80240290 4600B306 */ mov.s $f12, $f22 /* A0BF84 80240294 4600C602 */ mul.s $f24, $f24, $f0 -/* A0BF88 80240298 00000000 */ nop +/* A0BF88 80240298 00000000 */ nop /* A0BF8C 8024029C 4618F781 */ sub.s $f30, $f30, $f24 /* A0BF90 802402A0 0C00A85B */ jal sin_rad /* A0BF94 802402A4 4600D306 */ mov.s $f12, $f26 /* A0BF98 802402A8 4600E002 */ mul.s $f0, $f28, $f0 -/* A0BF9C 802402AC 00000000 */ nop +/* A0BF9C 802402AC 00000000 */ nop /* A0BFA0 802402B0 C6180028 */ lwc1 $f24, 0x28($s0) /* A0BFA4 802402B4 4600A306 */ mov.s $f12, $f20 /* A0BFA8 802402B8 0C00A85B */ jal sin_rad /* A0BFAC 802402BC 4600C600 */ add.s $f24, $f24, $f0 /* A0BFB0 802402C0 C7A40028 */ lwc1 $f4, 0x28($sp) /* A0BFB4 802402C4 46002002 */ mul.s $f0, $f4, $f0 -/* A0BFB8 802402C8 00000000 */ nop +/* A0BFB8 802402C8 00000000 */ nop /* A0BFBC 802402CC 4600D306 */ mov.s $f12, $f26 /* A0BFC0 802402D0 C61A002C */ lwc1 $f26, 0x2c($s0) /* A0BFC4 802402D4 0C00A874 */ jal cos_rad /* A0BFC8 802402D8 4600C600 */ add.s $f24, $f24, $f0 /* A0BFCC 802402DC 4600E702 */ mul.s $f28, $f28, $f0 -/* A0BFD0 802402E0 00000000 */ nop +/* A0BFD0 802402E0 00000000 */ nop /* A0BFD4 802402E4 C6160030 */ lwc1 $f22, 0x30($s0) /* A0BFD8 802402E8 4600A306 */ mov.s $f12, $f20 /* A0BFDC 802402EC 0C00A874 */ jal cos_rad /* A0BFE0 802402F0 461CB581 */ sub.s $f22, $f22, $f28 /* A0BFE4 802402F4 C7A40028 */ lwc1 $f4, 0x28($sp) /* A0BFE8 802402F8 46002002 */ mul.s $f0, $f4, $f0 -/* A0BFEC 802402FC 00000000 */ nop +/* A0BFEC 802402FC 00000000 */ nop /* A0BFF0 80240300 2404000A */ addiu $a0, $zero, 0xa /* A0BFF4 80240304 0C00A67F */ jal rand_int /* A0BFF8 80240308 4600B581 */ sub.s $f22, $f22, $f0 @@ -111,7 +111,7 @@ glabel func_80240170_A0BE60 /* A0C008 80240318 8FA60024 */ lw $a2, 0x24($sp) /* A0C00C 8024031C 4407F000 */ mfc1 $a3, $f30 /* A0C010 80240320 44820000 */ mtc1 $v0, $f0 -/* A0C014 80240324 00000000 */ nop +/* A0C014 80240324 00000000 */ nop /* A0C018 80240328 46800020 */ cvt.s.w $f0, $f0 /* A0C01C 8024032C E7B80010 */ swc1 $f24, 0x10($sp) /* A0C020 80240330 E7BA0014 */ swc1 $f26, 0x14($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_8024036C_A0C05C.s b/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_8024036C_A0C05C.s index 20e43f9508..84c09b9fe8 100644 --- a/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_8024036C_A0C05C.s +++ b/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_8024036C_A0C05C.s @@ -15,7 +15,7 @@ glabel func_8024036C_A0C05C /* A0C084 80240394 F7BE0060 */ sdc1 $f30, 0x60($sp) /* A0C088 80240398 46020003 */ div.s $f0, $f0, $f2 /* A0C08C 8024039C 46040782 */ mul.s $f30, $f0, $f4 -/* A0C090 802403A0 00000000 */ nop +/* A0C090 802403A0 00000000 */ nop /* A0C094 802403A4 AFB00030 */ sw $s0, 0x30($sp) /* A0C098 802403A8 F7BC0058 */ sdc1 $f28, 0x58($sp) /* A0C09C 802403AC F7BA0050 */ sdc1 $f26, 0x50($sp) @@ -34,14 +34,14 @@ glabel func_8024036C_A0C05C /* A0C0D0 802403E0 E7A00024 */ swc1 $f0, 0x24($sp) /* A0C0D4 802403E4 2442FF6A */ addiu $v0, $v0, -0x96 /* A0C0D8 802403E8 4482B000 */ mtc1 $v0, $f22 -/* A0C0DC 802403EC 00000000 */ nop +/* A0C0DC 802403EC 00000000 */ nop /* A0C0E0 802403F0 4680B5A0 */ cvt.s.w $f22, $f22 /* A0C0E4 802403F4 0C00A67F */ jal rand_int /* A0C0E8 802403F8 2404012C */ addiu $a0, $zero, 0x12c /* A0C0EC 802403FC 24040064 */ addiu $a0, $zero, 0x64 /* A0C0F0 80240400 2442FF6A */ addiu $v0, $v0, -0x96 /* A0C0F4 80240404 44823000 */ mtc1 $v0, $f6 -/* A0C0F8 80240408 00000000 */ nop +/* A0C0F8 80240408 00000000 */ nop /* A0C0FC 8024040C 468031A0 */ cvt.s.w $f6, $f6 /* A0C100 80240410 0C00A67F */ jal rand_int /* A0C104 80240414 E7A60028 */ swc1 $f6, 0x28($sp) @@ -52,63 +52,63 @@ glabel func_8024036C_A0C05C /* A0C118 80240428 3C01437A */ lui $at, 0x437a /* A0C11C 8024042C 44810000 */ mtc1 $at, $f0 /* A0C120 80240430 4482A000 */ mtc1 $v0, $f20 -/* A0C124 80240434 00000000 */ nop +/* A0C124 80240434 00000000 */ nop /* A0C128 80240438 4680A520 */ cvt.s.w $f20, $f20 /* A0C12C 8024043C 4602003E */ c.le.s $f0, $f2 -/* A0C130 80240440 00000000 */ nop +/* A0C130 80240440 00000000 */ nop /* A0C134 80240444 45010045 */ bc1t .L8024055C /* A0C138 80240448 24020002 */ addiu $v0, $zero, 2 /* A0C13C 8024044C 0C00A85B */ jal sin_rad /* A0C140 80240450 4600F306 */ mov.s $f12, $f30 /* A0C144 80240454 4600A002 */ mul.s $f0, $f20, $f0 -/* A0C148 80240458 00000000 */ nop +/* A0C148 80240458 00000000 */ nop /* A0C14C 8024045C C61A0028 */ lwc1 $f26, 0x28($s0) /* A0C150 80240460 C7AC0020 */ lwc1 $f12, 0x20($sp) /* A0C154 80240464 0C00A85B */ jal sin_rad /* A0C158 80240468 4600D681 */ sub.s $f26, $f26, $f0 /* A0C15C 8024046C 4600B002 */ mul.s $f0, $f22, $f0 -/* A0C160 80240470 00000000 */ nop +/* A0C160 80240470 00000000 */ nop /* A0C164 80240474 C61C002C */ lwc1 $f28, 0x2c($s0) /* A0C168 80240478 4600D680 */ add.s $f26, $f26, $f0 /* A0C16C 8024047C 3C014348 */ lui $at, 0x4348 /* A0C170 80240480 44810000 */ mtc1 $at, $f0 -/* A0C174 80240484 00000000 */ nop +/* A0C174 80240484 00000000 */ nop /* A0C178 80240488 4600E700 */ add.s $f28, $f28, $f0 /* A0C17C 8024048C 0C00A874 */ jal cos_rad /* A0C180 80240490 4600F306 */ mov.s $f12, $f30 /* A0C184 80240494 4600A002 */ mul.s $f0, $f20, $f0 -/* A0C188 80240498 00000000 */ nop +/* A0C188 80240498 00000000 */ nop /* A0C18C 8024049C C6180030 */ lwc1 $f24, 0x30($s0) /* A0C190 802404A0 C7AC0020 */ lwc1 $f12, 0x20($sp) /* A0C194 802404A4 0C00A874 */ jal cos_rad /* A0C198 802404A8 4600C600 */ add.s $f24, $f24, $f0 /* A0C19C 802404AC 4600B002 */ mul.s $f0, $f22, $f0 -/* A0C1A0 802404B0 00000000 */ nop +/* A0C1A0 802404B0 00000000 */ nop /* A0C1A4 802404B4 4600C601 */ sub.s $f24, $f24, $f0 /* A0C1A8 802404B8 0C00A85B */ jal sin_rad /* A0C1AC 802404BC 4600F306 */ mov.s $f12, $f30 /* A0C1B0 802404C0 4600A002 */ mul.s $f0, $f20, $f0 -/* A0C1B4 802404C4 00000000 */ nop +/* A0C1B4 802404C4 00000000 */ nop /* A0C1B8 802404C8 C6160028 */ lwc1 $f22, 0x28($s0) /* A0C1BC 802404CC C7AC0024 */ lwc1 $f12, 0x24($sp) /* A0C1C0 802404D0 0C00A85B */ jal sin_rad /* A0C1C4 802404D4 4600B581 */ sub.s $f22, $f22, $f0 /* A0C1C8 802404D8 C7A60028 */ lwc1 $f6, 0x28($sp) /* A0C1CC 802404DC 46003002 */ mul.s $f0, $f6, $f0 -/* A0C1D0 802404E0 00000000 */ nop +/* A0C1D0 802404E0 00000000 */ nop /* A0C1D4 802404E4 4600F306 */ mov.s $f12, $f30 /* A0C1D8 802404E8 C61E002C */ lwc1 $f30, 0x2c($s0) /* A0C1DC 802404EC 0C00A874 */ jal cos_rad /* A0C1E0 802404F0 4600B580 */ add.s $f22, $f22, $f0 /* A0C1E4 802404F4 4600A002 */ mul.s $f0, $f20, $f0 -/* A0C1E8 802404F8 00000000 */ nop +/* A0C1E8 802404F8 00000000 */ nop /* A0C1EC 802404FC C6140030 */ lwc1 $f20, 0x30($s0) /* A0C1F0 80240500 C7AC0024 */ lwc1 $f12, 0x24($sp) /* A0C1F4 80240504 0C00A874 */ jal cos_rad /* A0C1F8 80240508 4600A500 */ add.s $f20, $f20, $f0 /* A0C1FC 8024050C C7A60028 */ lwc1 $f6, 0x28($sp) /* A0C200 80240510 46003002 */ mul.s $f0, $f6, $f0 -/* A0C204 80240514 00000000 */ nop +/* A0C204 80240514 00000000 */ nop /* A0C208 80240518 2404000A */ addiu $a0, $zero, 0xa /* A0C20C 8024051C 0C00A67F */ jal rand_int /* A0C210 80240520 4600A501 */ sub.s $f20, $f20, $f0 @@ -118,7 +118,7 @@ glabel func_8024036C_A0C05C /* A0C220 80240530 4406E000 */ mfc1 $a2, $f28 /* A0C224 80240534 4407C000 */ mfc1 $a3, $f24 /* A0C228 80240538 44820000 */ mtc1 $v0, $f0 -/* A0C22C 8024053C 00000000 */ nop +/* A0C22C 8024053C 00000000 */ nop /* A0C230 80240540 46800020 */ cvt.s.w $f0, $f0 /* A0C234 80240544 E7B60010 */ swc1 $f22, 0x10($sp) /* A0C238 80240548 E7BE0014 */ swc1 $f30, 0x14($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240584_A0C274.s b/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240584_A0C274.s index 474215ded2..6605f50e1a 100644 --- a/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240584_A0C274.s +++ b/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240584_A0C274.s @@ -17,7 +17,7 @@ glabel func_80240584_A0C274 /* A0C2A4 802405B4 F7BE0068 */ sdc1 $f30, 0x68($sp) /* A0C2A8 802405B8 46020003 */ div.s $f0, $f0, $f2 /* A0C2AC 802405BC 46040782 */ mul.s $f30, $f0, $f4 -/* A0C2B0 802405C0 00000000 */ nop +/* A0C2B0 802405C0 00000000 */ nop /* A0C2B4 802405C4 AFB00030 */ sw $s0, 0x30($sp) /* A0C2B8 802405C8 F7BC0060 */ sdc1 $f28, 0x60($sp) /* A0C2BC 802405CC F7BA0058 */ sdc1 $f26, 0x58($sp) @@ -36,13 +36,13 @@ glabel func_80240584_A0C274 /* A0C2F0 80240600 E7A00024 */ swc1 $f0, 0x24($sp) /* A0C2F4 80240604 24040096 */ addiu $a0, $zero, 0x96 /* A0C2F8 80240608 44823000 */ mtc1 $v0, $f6 -/* A0C2FC 8024060C 00000000 */ nop +/* A0C2FC 8024060C 00000000 */ nop /* A0C300 80240610 468031A0 */ cvt.s.w $f6, $f6 /* A0C304 80240614 0C00A67F */ jal rand_int /* A0C308 80240618 E7A60028 */ swc1 $f6, 0x28($sp) /* A0C30C 8024061C 24040064 */ addiu $a0, $zero, 0x64 /* A0C310 80240620 44823000 */ mtc1 $v0, $f6 -/* A0C314 80240624 00000000 */ nop +/* A0C314 80240624 00000000 */ nop /* A0C318 80240628 468031A0 */ cvt.s.w $f6, $f6 /* A0C31C 8024062C 0C00A67F */ jal rand_int /* A0C320 80240630 E7A6002C */ swc1 $f6, 0x2c($sp) @@ -53,37 +53,37 @@ glabel func_80240584_A0C274 /* A0C334 80240644 3C014348 */ lui $at, 0x4348 /* A0C338 80240648 4481B000 */ mtc1 $at, $f22 /* A0C33C 8024064C 4482A000 */ mtc1 $v0, $f20 -/* A0C340 80240650 00000000 */ nop +/* A0C340 80240650 00000000 */ nop /* A0C344 80240654 4680A520 */ cvt.s.w $f20, $f20 /* A0C348 80240658 4616003C */ c.lt.s $f0, $f22 -/* A0C34C 8024065C 00000000 */ nop +/* A0C34C 8024065C 00000000 */ nop /* A0C350 80240660 4501004A */ bc1t .L8024078C /* A0C354 80240664 24020002 */ addiu $v0, $zero, 2 /* A0C358 80240668 0C00A85B */ jal sin_rad /* A0C35C 8024066C 4600F306 */ mov.s $f12, $f30 /* A0C360 80240670 4600A002 */ mul.s $f0, $f20, $f0 -/* A0C364 80240674 00000000 */ nop +/* A0C364 80240674 00000000 */ nop /* A0C368 80240678 C61A0028 */ lwc1 $f26, 0x28($s0) /* A0C36C 8024067C C7AC0020 */ lwc1 $f12, 0x20($sp) /* A0C370 80240680 0C00A85B */ jal sin_rad /* A0C374 80240684 4600D681 */ sub.s $f26, $f26, $f0 /* A0C378 80240688 C7A60028 */ lwc1 $f6, 0x28($sp) /* A0C37C 8024068C 46003002 */ mul.s $f0, $f6, $f0 -/* A0C380 80240690 00000000 */ nop +/* A0C380 80240690 00000000 */ nop /* A0C384 80240694 C61C002C */ lwc1 $f28, 0x2c($s0) /* A0C388 80240698 4616E700 */ add.s $f28, $f28, $f22 /* A0C38C 8024069C 4600D680 */ add.s $f26, $f26, $f0 /* A0C390 802406A0 0C00A874 */ jal cos_rad /* A0C394 802406A4 4600F306 */ mov.s $f12, $f30 /* A0C398 802406A8 4600A002 */ mul.s $f0, $f20, $f0 -/* A0C39C 802406AC 00000000 */ nop +/* A0C39C 802406AC 00000000 */ nop /* A0C3A0 802406B0 C6180030 */ lwc1 $f24, 0x30($s0) /* A0C3A4 802406B4 C7AC0020 */ lwc1 $f12, 0x20($sp) /* A0C3A8 802406B8 0C00A874 */ jal cos_rad /* A0C3AC 802406BC 4600C600 */ add.s $f24, $f24, $f0 /* A0C3B0 802406C0 C7A60028 */ lwc1 $f6, 0x28($sp) /* A0C3B4 802406C4 46003002 */ mul.s $f0, $f6, $f0 -/* A0C3B8 802406C8 00000000 */ nop +/* A0C3B8 802406C8 00000000 */ nop /* A0C3BC 802406CC 4600C601 */ sub.s $f24, $f24, $f0 /* A0C3C0 802406D0 4600D18D */ trunc.w.s $f6, $f26 /* A0C3C4 802406D4 E6260088 */ swc1 $f6, 0x88($s1) @@ -94,27 +94,27 @@ glabel func_80240584_A0C274 /* A0C3D8 802406E8 0C00A85B */ jal sin_rad /* A0C3DC 802406EC 4600F306 */ mov.s $f12, $f30 /* A0C3E0 802406F0 4600A002 */ mul.s $f0, $f20, $f0 -/* A0C3E4 802406F4 00000000 */ nop +/* A0C3E4 802406F4 00000000 */ nop /* A0C3E8 802406F8 C6160028 */ lwc1 $f22, 0x28($s0) /* A0C3EC 802406FC C7AC0024 */ lwc1 $f12, 0x24($sp) /* A0C3F0 80240700 0C00A85B */ jal sin_rad /* A0C3F4 80240704 4600B581 */ sub.s $f22, $f22, $f0 /* A0C3F8 80240708 C7A6002C */ lwc1 $f6, 0x2c($sp) /* A0C3FC 8024070C 46003002 */ mul.s $f0, $f6, $f0 -/* A0C400 80240710 00000000 */ nop +/* A0C400 80240710 00000000 */ nop /* A0C404 80240714 4600F306 */ mov.s $f12, $f30 /* A0C408 80240718 C61E002C */ lwc1 $f30, 0x2c($s0) /* A0C40C 8024071C 0C00A874 */ jal cos_rad /* A0C410 80240720 4600B580 */ add.s $f22, $f22, $f0 /* A0C414 80240724 4600A002 */ mul.s $f0, $f20, $f0 -/* A0C418 80240728 00000000 */ nop +/* A0C418 80240728 00000000 */ nop /* A0C41C 8024072C C6140030 */ lwc1 $f20, 0x30($s0) /* A0C420 80240730 C7AC0024 */ lwc1 $f12, 0x24($sp) /* A0C424 80240734 0C00A874 */ jal cos_rad /* A0C428 80240738 4600A500 */ add.s $f20, $f20, $f0 /* A0C42C 8024073C C7A6002C */ lwc1 $f6, 0x2c($sp) /* A0C430 80240740 46003002 */ mul.s $f0, $f6, $f0 -/* A0C434 80240744 00000000 */ nop +/* A0C434 80240744 00000000 */ nop /* A0C438 80240748 24040004 */ addiu $a0, $zero, 4 /* A0C43C 8024074C 0C00A67F */ jal rand_int /* A0C440 80240750 4600A501 */ sub.s $f20, $f20, $f0 @@ -124,7 +124,7 @@ glabel func_80240584_A0C274 /* A0C450 80240760 4406E000 */ mfc1 $a2, $f28 /* A0C454 80240764 4407C000 */ mfc1 $a3, $f24 /* A0C458 80240768 44820000 */ mtc1 $v0, $f0 -/* A0C45C 8024076C 00000000 */ nop +/* A0C45C 8024076C 00000000 */ nop /* A0C460 80240770 46800020 */ cvt.s.w $f0, $f0 /* A0C464 80240774 E7B60010 */ swc1 $f22, 0x10($sp) /* A0C468 80240778 E7BE0014 */ swc1 $f30, 0x14($sp) @@ -144,5 +144,5 @@ glabel func_80240584_A0C274 /* A0C49C 802407AC D7B40040 */ ldc1 $f20, 0x40($sp) /* A0C4A0 802407B0 03E00008 */ jr $ra /* A0C4A4 802407B4 27BD0070 */ addiu $sp, $sp, 0x70 -/* A0C4A8 802407B8 00000000 */ nop -/* A0C4AC 802407BC 00000000 */ nop +/* A0C4A8 802407B8 00000000 */ nop +/* A0C4AC 802407BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0C4B0/func_802407C0_A0C4B0.s b/asm/nonmatchings/world/area_hos/hos_00/A0C4B0/func_802407C0_A0C4B0.s index 231a5b2a96..220edbf207 100644 --- a/asm/nonmatchings/world/area_hos/hos_00/A0C4B0/func_802407C0_A0C4B0.s +++ b/asm/nonmatchings/world/area_hos/hos_00/A0C4B0/func_802407C0_A0C4B0.s @@ -13,4 +13,4 @@ glabel func_802407C0_A0C4B0 /* A0C4D0 802407E0 24020002 */ addiu $v0, $zero, 2 /* A0C4D4 802407E4 03E00008 */ jr $ra /* A0C4D8 802407E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* A0C4DC 802407EC 00000000 */ nop +/* A0C4DC 802407EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_802407F0_A0C4E0.s b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_802407F0_A0C4E0.s index 09a1b4bf05..9454134b9e 100644 --- a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_802407F0_A0C4E0.s +++ b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_802407F0_A0C4E0.s @@ -26,7 +26,7 @@ glabel func_802407F0_A0C4E0 /* A0C530 80240840 1440FFFA */ bnez $v0, .L8024082C /* A0C534 80240844 24A50004 */ addiu $a1, $a1, 4 /* A0C538 80240848 08090223 */ j .L8024088C -/* A0C53C 8024084C 00000000 */ nop +/* A0C53C 8024084C 00000000 */ nop .L80240850: /* A0C540 80240850 0000182D */ daddu $v1, $zero, $zero /* A0C544 80240854 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_8024091C_A0C60C.s b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_8024091C_A0C60C.s index b9933b0752..e9aa9142b4 100644 --- a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_8024091C_A0C60C.s +++ b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_8024091C_A0C60C.s @@ -19,7 +19,7 @@ glabel func_8024091C_A0C60C /* A0C644 80240954 0C00A8BB */ jal sin_deg /* A0C648 80240958 46000306 */ mov.s $f12, $f0 /* A0C64C 8024095C 4600A502 */ mul.s $f20, $f20, $f0 -/* A0C650 80240960 00000000 */ nop +/* A0C650 80240960 00000000 */ nop /* A0C654 80240964 26100004 */ addiu $s0, $s0, 4 /* A0C658 80240968 8E050000 */ lw $a1, ($s0) /* A0C65C 8024096C 4406A000 */ mfc1 $a2, $f20 diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240A54_A0C744.s b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240A54_A0C744.s index 88f8d18054..7a45d2b124 100644 --- a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240A54_A0C744.s +++ b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240A54_A0C744.s @@ -13,11 +13,11 @@ glabel func_80240A54_A0C744 /* A0C764 80240A74 C602000C */ lwc1 $f2, 0xc($s0) /* A0C768 80240A78 3C014334 */ lui $at, 0x4334 /* A0C76C 80240A7C 44810000 */ mtc1 $at, $f0 -/* A0C770 80240A80 00000000 */ nop +/* A0C770 80240A80 00000000 */ nop /* A0C774 80240A84 4600103C */ c.lt.s $f2, $f0 -/* A0C778 80240A88 00000000 */ nop +/* A0C778 80240A88 00000000 */ nop /* A0C77C 80240A8C 45000006 */ bc1f .L80240AA8 -/* A0C780 80240A90 00000000 */ nop +/* A0C780 80240A90 00000000 */ nop /* A0C784 80240A94 C6000038 */ lwc1 $f0, 0x38($s0) /* A0C788 80240A98 3C014220 */ lui $at, 0x4220 /* A0C78C 80240A9C 44811000 */ mtc1 $at, $f2 @@ -27,7 +27,7 @@ glabel func_80240A54_A0C744 /* A0C798 80240AA8 C6000038 */ lwc1 $f0, 0x38($s0) /* A0C79C 80240AAC 3C014220 */ lui $at, 0x4220 /* A0C7A0 80240AB0 44811000 */ mtc1 $at, $f2 -/* A0C7A4 80240AB4 00000000 */ nop +/* A0C7A4 80240AB4 00000000 */ nop /* A0C7A8 80240AB8 46020000 */ add.s $f0, $f0, $f2 .L80240ABC: /* A0C7AC 80240ABC 3C014120 */ lui $at, 0x4120 diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240B3C_A0C82C.s b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240B3C_A0C82C.s index 1872d26d35..83de5820a4 100644 --- a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240B3C_A0C82C.s +++ b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240B3C_A0C82C.s @@ -21,9 +21,9 @@ glabel func_80240B3C_A0C82C /* A0C86C 80240B7C 0C00A8BB */ jal sin_deg /* A0C870 80240B80 4600A306 */ mov.s $f12, $f20 /* A0C874 80240B84 46180002 */ mul.s $f0, $f0, $f24 -/* A0C878 80240B88 00000000 */ nop +/* A0C878 80240B88 00000000 */ nop /* A0C87C 80240B8C 4491B000 */ mtc1 $s1, $f22 -/* A0C880 80240B90 00000000 */ nop +/* A0C880 80240B90 00000000 */ nop /* A0C884 80240B94 4680B5A0 */ cvt.s.w $f22, $f22 /* A0C888 80240B98 4600B000 */ add.s $f0, $f22, $f0 /* A0C88C 80240B9C 4600008D */ trunc.w.s $f2, $f0 @@ -31,9 +31,9 @@ glabel func_80240B3C_A0C82C /* A0C894 80240BA4 0C00A8D4 */ jal cos_deg /* A0C898 80240BA8 4600A306 */ mov.s $f12, $f20 /* A0C89C 80240BAC 46180002 */ mul.s $f0, $f0, $f24 -/* A0C8A0 80240BB0 00000000 */ nop +/* A0C8A0 80240BB0 00000000 */ nop /* A0C8A4 80240BB4 4492A000 */ mtc1 $s2, $f20 -/* A0C8A8 80240BB8 00000000 */ nop +/* A0C8A8 80240BB8 00000000 */ nop /* A0C8AC 80240BBC 4680A520 */ cvt.s.w $f20, $f20 /* A0C8B0 80240BC0 3C014302 */ lui $at, 0x4302 /* A0C8B4 80240BC4 4481D000 */ mtc1 $at, $f26 @@ -43,14 +43,14 @@ glabel func_80240B3C_A0C82C /* A0C8C4 80240BD4 0C00A8BB */ jal sin_deg /* A0C8C8 80240BD8 4600D306 */ mov.s $f12, $f26 /* A0C8CC 80240BDC 46180002 */ mul.s $f0, $f0, $f24 -/* A0C8D0 80240BE0 00000000 */ nop +/* A0C8D0 80240BE0 00000000 */ nop /* A0C8D4 80240BE4 4600B580 */ add.s $f22, $f22, $f0 /* A0C8D8 80240BE8 4600B08D */ trunc.w.s $f2, $f22 /* A0C8DC 80240BEC E602008C */ swc1 $f2, 0x8c($s0) /* A0C8E0 80240BF0 0C00A8D4 */ jal cos_deg /* A0C8E4 80240BF4 4600D306 */ mov.s $f12, $f26 /* A0C8E8 80240BF8 46180002 */ mul.s $f0, $f0, $f24 -/* A0C8EC 80240BFC 00000000 */ nop +/* A0C8EC 80240BFC 00000000 */ nop /* A0C8F0 80240C00 4600A501 */ sub.s $f20, $f20, $f0 /* A0C8F4 80240C04 4600A08D */ trunc.w.s $f2, $f20 /* A0C8F8 80240C08 E6020090 */ swc1 $f2, 0x90($s0) @@ -65,5 +65,5 @@ glabel func_80240B3C_A0C82C /* A0C91C 80240C2C 24020002 */ addiu $v0, $zero, 2 /* A0C920 80240C30 03E00008 */ jr $ra /* A0C924 80240C34 27BD0040 */ addiu $sp, $sp, 0x40 -/* A0C928 80240C38 00000000 */ nop -/* A0C92C 80240C3C 00000000 */ nop +/* A0C928 80240C38 00000000 */ nop +/* A0C92C 80240C3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240120_A109A0.s b/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240120_A109A0.s index bc5da11e40..fea5fe3359 100644 --- a/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240120_A109A0.s +++ b/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240120_A109A0.s @@ -15,7 +15,7 @@ glabel func_80240120_A109A0 /* A109C8 80240148 AFBF0034 */ sw $ra, 0x34($sp) /* A109CC 8024014C 4600D683 */ div.s $f26, $f26, $f0 /* A109D0 80240150 4602D682 */ mul.s $f26, $f26, $f2 -/* A109D4 80240154 00000000 */ nop +/* A109D4 80240154 00000000 */ nop /* A109D8 80240158 AFB00030 */ sw $s0, 0x30($sp) /* A109DC 8024015C F7B60040 */ sdc1 $f22, 0x40($sp) /* A109E0 80240160 F7B40038 */ sdc1 $f20, 0x38($sp) @@ -32,25 +32,25 @@ glabel func_80240120_A109A0 /* A10A0C 8024018C 4620A520 */ cvt.s.d $f20, $f20 /* A10A10 80240190 2442FF06 */ addiu $v0, $v0, -0xfa /* A10A14 80240194 4482C000 */ mtc1 $v0, $f24 -/* A10A18 80240198 00000000 */ nop +/* A10A18 80240198 00000000 */ nop /* A10A1C 8024019C 4680C620 */ cvt.s.w $f24, $f24 /* A10A20 802401A0 0C00A67F */ jal rand_int /* A10A24 802401A4 240401F4 */ addiu $a0, $zero, 0x1f4 /* A10A28 802401A8 24040064 */ addiu $a0, $zero, 0x64 /* A10A2C 802401AC 2442FF06 */ addiu $v0, $v0, -0xfa /* A10A30 802401B0 44822000 */ mtc1 $v0, $f4 -/* A10A34 802401B4 00000000 */ nop +/* A10A34 802401B4 00000000 */ nop /* A10A38 802401B8 46802120 */ cvt.s.w $f4, $f4 /* A10A3C 802401BC 0C00A67F */ jal rand_int /* A10A40 802401C0 E7A40028 */ swc1 $f4, 0x28($sp) /* A10A44 802401C4 24420258 */ addiu $v0, $v0, 0x258 /* A10A48 802401C8 4482E000 */ mtc1 $v0, $f28 -/* A10A4C 802401CC 00000000 */ nop +/* A10A4C 802401CC 00000000 */ nop /* A10A50 802401D0 4680E720 */ cvt.s.w $f28, $f28 /* A10A54 802401D4 0C00A85B */ jal sin_rad /* A10A58 802401D8 4600D306 */ mov.s $f12, $f26 /* A10A5C 802401DC 4600E002 */ mul.s $f0, $f28, $f0 -/* A10A60 802401E0 00000000 */ nop +/* A10A60 802401E0 00000000 */ nop /* A10A64 802401E4 3C108011 */ lui $s0, %hi(gPlayerStatus) /* A10A68 802401E8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* A10A6C 802401EC C6020028 */ lwc1 $f2, 0x28($s0) @@ -58,50 +58,50 @@ glabel func_80240120_A109A0 /* A10A74 802401F4 0C00A85B */ jal sin_rad /* A10A78 802401F8 4600B306 */ mov.s $f12, $f22 /* A10A7C 802401FC 4600C002 */ mul.s $f0, $f24, $f0 -/* A10A80 80240200 00000000 */ nop +/* A10A80 80240200 00000000 */ nop /* A10A84 80240204 C602002C */ lwc1 $f2, 0x2c($s0) /* A10A88 80240208 4600F780 */ add.s $f30, $f30, $f0 /* A10A8C 8024020C 3C014348 */ lui $at, 0x4348 /* A10A90 80240210 44810000 */ mtc1 $at, $f0 -/* A10A94 80240214 00000000 */ nop +/* A10A94 80240214 00000000 */ nop /* A10A98 80240218 46001080 */ add.s $f2, $f2, $f0 /* A10A9C 8024021C 4600D306 */ mov.s $f12, $f26 /* A10AA0 80240220 E7BE0020 */ swc1 $f30, 0x20($sp) /* A10AA4 80240224 0C00A874 */ jal cos_rad /* A10AA8 80240228 E7A20024 */ swc1 $f2, 0x24($sp) /* A10AAC 8024022C 4600E002 */ mul.s $f0, $f28, $f0 -/* A10AB0 80240230 00000000 */ nop +/* A10AB0 80240230 00000000 */ nop /* A10AB4 80240234 C61E0030 */ lwc1 $f30, 0x30($s0) /* A10AB8 80240238 4600F781 */ sub.s $f30, $f30, $f0 /* A10ABC 8024023C 0C00A874 */ jal cos_rad /* A10AC0 80240240 4600B306 */ mov.s $f12, $f22 /* A10AC4 80240244 4600C602 */ mul.s $f24, $f24, $f0 -/* A10AC8 80240248 00000000 */ nop +/* A10AC8 80240248 00000000 */ nop /* A10ACC 8024024C 4618F781 */ sub.s $f30, $f30, $f24 /* A10AD0 80240250 0C00A85B */ jal sin_rad /* A10AD4 80240254 4600D306 */ mov.s $f12, $f26 /* A10AD8 80240258 4600E002 */ mul.s $f0, $f28, $f0 -/* A10ADC 8024025C 00000000 */ nop +/* A10ADC 8024025C 00000000 */ nop /* A10AE0 80240260 C6180028 */ lwc1 $f24, 0x28($s0) /* A10AE4 80240264 4600A306 */ mov.s $f12, $f20 /* A10AE8 80240268 0C00A85B */ jal sin_rad /* A10AEC 8024026C 4600C600 */ add.s $f24, $f24, $f0 /* A10AF0 80240270 C7A40028 */ lwc1 $f4, 0x28($sp) /* A10AF4 80240274 46002002 */ mul.s $f0, $f4, $f0 -/* A10AF8 80240278 00000000 */ nop +/* A10AF8 80240278 00000000 */ nop /* A10AFC 8024027C 4600D306 */ mov.s $f12, $f26 /* A10B00 80240280 C61A002C */ lwc1 $f26, 0x2c($s0) /* A10B04 80240284 0C00A874 */ jal cos_rad /* A10B08 80240288 4600C600 */ add.s $f24, $f24, $f0 /* A10B0C 8024028C 4600E702 */ mul.s $f28, $f28, $f0 -/* A10B10 80240290 00000000 */ nop +/* A10B10 80240290 00000000 */ nop /* A10B14 80240294 C6160030 */ lwc1 $f22, 0x30($s0) /* A10B18 80240298 4600A306 */ mov.s $f12, $f20 /* A10B1C 8024029C 0C00A874 */ jal cos_rad /* A10B20 802402A0 461CB581 */ sub.s $f22, $f22, $f28 /* A10B24 802402A4 C7A40028 */ lwc1 $f4, 0x28($sp) /* A10B28 802402A8 46002002 */ mul.s $f0, $f4, $f0 -/* A10B2C 802402AC 00000000 */ nop +/* A10B2C 802402AC 00000000 */ nop /* A10B30 802402B0 2404000A */ addiu $a0, $zero, 0xa /* A10B34 802402B4 0C00A67F */ jal rand_int /* A10B38 802402B8 4600B581 */ sub.s $f22, $f22, $f0 @@ -111,7 +111,7 @@ glabel func_80240120_A109A0 /* A10B48 802402C8 8FA60024 */ lw $a2, 0x24($sp) /* A10B4C 802402CC 4407F000 */ mfc1 $a3, $f30 /* A10B50 802402D0 44820000 */ mtc1 $v0, $f0 -/* A10B54 802402D4 00000000 */ nop +/* A10B54 802402D4 00000000 */ nop /* A10B58 802402D8 46800020 */ cvt.s.w $f0, $f0 /* A10B5C 802402DC E7B80010 */ swc1 $f24, 0x10($sp) /* A10B60 802402E0 E7BA0014 */ swc1 $f26, 0x14($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_01/A10880/func_8024031C_A10B9C.s b/asm/nonmatchings/world/area_hos/hos_01/A10880/func_8024031C_A10B9C.s index f94dfd8b3f..d3de9f9b78 100644 --- a/asm/nonmatchings/world/area_hos/hos_01/A10880/func_8024031C_A10B9C.s +++ b/asm/nonmatchings/world/area_hos/hos_01/A10880/func_8024031C_A10B9C.s @@ -15,7 +15,7 @@ glabel func_8024031C_A10B9C /* A10BC4 80240344 F7BE0060 */ sdc1 $f30, 0x60($sp) /* A10BC8 80240348 46020003 */ div.s $f0, $f0, $f2 /* A10BCC 8024034C 46040782 */ mul.s $f30, $f0, $f4 -/* A10BD0 80240350 00000000 */ nop +/* A10BD0 80240350 00000000 */ nop /* A10BD4 80240354 AFB00030 */ sw $s0, 0x30($sp) /* A10BD8 80240358 F7BC0058 */ sdc1 $f28, 0x58($sp) /* A10BDC 8024035C F7BA0050 */ sdc1 $f26, 0x50($sp) @@ -34,14 +34,14 @@ glabel func_8024031C_A10B9C /* A10C10 80240390 E7A00024 */ swc1 $f0, 0x24($sp) /* A10C14 80240394 2442FF6A */ addiu $v0, $v0, -0x96 /* A10C18 80240398 4482B000 */ mtc1 $v0, $f22 -/* A10C1C 8024039C 00000000 */ nop +/* A10C1C 8024039C 00000000 */ nop /* A10C20 802403A0 4680B5A0 */ cvt.s.w $f22, $f22 /* A10C24 802403A4 0C00A67F */ jal rand_int /* A10C28 802403A8 2404012C */ addiu $a0, $zero, 0x12c /* A10C2C 802403AC 24040064 */ addiu $a0, $zero, 0x64 /* A10C30 802403B0 2442FF6A */ addiu $v0, $v0, -0x96 /* A10C34 802403B4 44823000 */ mtc1 $v0, $f6 -/* A10C38 802403B8 00000000 */ nop +/* A10C38 802403B8 00000000 */ nop /* A10C3C 802403BC 468031A0 */ cvt.s.w $f6, $f6 /* A10C40 802403C0 0C00A67F */ jal rand_int /* A10C44 802403C4 E7A60028 */ swc1 $f6, 0x28($sp) @@ -52,63 +52,63 @@ glabel func_8024031C_A10B9C /* A10C58 802403D8 3C01437A */ lui $at, 0x437a /* A10C5C 802403DC 44810000 */ mtc1 $at, $f0 /* A10C60 802403E0 4482A000 */ mtc1 $v0, $f20 -/* A10C64 802403E4 00000000 */ nop +/* A10C64 802403E4 00000000 */ nop /* A10C68 802403E8 4680A520 */ cvt.s.w $f20, $f20 /* A10C6C 802403EC 4602003E */ c.le.s $f0, $f2 -/* A10C70 802403F0 00000000 */ nop +/* A10C70 802403F0 00000000 */ nop /* A10C74 802403F4 45010045 */ bc1t .L8024050C /* A10C78 802403F8 24020002 */ addiu $v0, $zero, 2 /* A10C7C 802403FC 0C00A85B */ jal sin_rad /* A10C80 80240400 4600F306 */ mov.s $f12, $f30 /* A10C84 80240404 4600A002 */ mul.s $f0, $f20, $f0 -/* A10C88 80240408 00000000 */ nop +/* A10C88 80240408 00000000 */ nop /* A10C8C 8024040C C61A0028 */ lwc1 $f26, 0x28($s0) /* A10C90 80240410 C7AC0020 */ lwc1 $f12, 0x20($sp) /* A10C94 80240414 0C00A85B */ jal sin_rad /* A10C98 80240418 4600D681 */ sub.s $f26, $f26, $f0 /* A10C9C 8024041C 4600B002 */ mul.s $f0, $f22, $f0 -/* A10CA0 80240420 00000000 */ nop +/* A10CA0 80240420 00000000 */ nop /* A10CA4 80240424 C61C002C */ lwc1 $f28, 0x2c($s0) /* A10CA8 80240428 4600D680 */ add.s $f26, $f26, $f0 /* A10CAC 8024042C 3C014348 */ lui $at, 0x4348 /* A10CB0 80240430 44810000 */ mtc1 $at, $f0 -/* A10CB4 80240434 00000000 */ nop +/* A10CB4 80240434 00000000 */ nop /* A10CB8 80240438 4600E700 */ add.s $f28, $f28, $f0 /* A10CBC 8024043C 0C00A874 */ jal cos_rad /* A10CC0 80240440 4600F306 */ mov.s $f12, $f30 /* A10CC4 80240444 4600A002 */ mul.s $f0, $f20, $f0 -/* A10CC8 80240448 00000000 */ nop +/* A10CC8 80240448 00000000 */ nop /* A10CCC 8024044C C6180030 */ lwc1 $f24, 0x30($s0) /* A10CD0 80240450 C7AC0020 */ lwc1 $f12, 0x20($sp) /* A10CD4 80240454 0C00A874 */ jal cos_rad /* A10CD8 80240458 4600C600 */ add.s $f24, $f24, $f0 /* A10CDC 8024045C 4600B002 */ mul.s $f0, $f22, $f0 -/* A10CE0 80240460 00000000 */ nop +/* A10CE0 80240460 00000000 */ nop /* A10CE4 80240464 4600C601 */ sub.s $f24, $f24, $f0 /* A10CE8 80240468 0C00A85B */ jal sin_rad /* A10CEC 8024046C 4600F306 */ mov.s $f12, $f30 /* A10CF0 80240470 4600A002 */ mul.s $f0, $f20, $f0 -/* A10CF4 80240474 00000000 */ nop +/* A10CF4 80240474 00000000 */ nop /* A10CF8 80240478 C6160028 */ lwc1 $f22, 0x28($s0) /* A10CFC 8024047C C7AC0024 */ lwc1 $f12, 0x24($sp) /* A10D00 80240480 0C00A85B */ jal sin_rad /* A10D04 80240484 4600B581 */ sub.s $f22, $f22, $f0 /* A10D08 80240488 C7A60028 */ lwc1 $f6, 0x28($sp) /* A10D0C 8024048C 46003002 */ mul.s $f0, $f6, $f0 -/* A10D10 80240490 00000000 */ nop +/* A10D10 80240490 00000000 */ nop /* A10D14 80240494 4600F306 */ mov.s $f12, $f30 /* A10D18 80240498 C61E002C */ lwc1 $f30, 0x2c($s0) /* A10D1C 8024049C 0C00A874 */ jal cos_rad /* A10D20 802404A0 4600B580 */ add.s $f22, $f22, $f0 /* A10D24 802404A4 4600A002 */ mul.s $f0, $f20, $f0 -/* A10D28 802404A8 00000000 */ nop +/* A10D28 802404A8 00000000 */ nop /* A10D2C 802404AC C6140030 */ lwc1 $f20, 0x30($s0) /* A10D30 802404B0 C7AC0024 */ lwc1 $f12, 0x24($sp) /* A10D34 802404B4 0C00A874 */ jal cos_rad /* A10D38 802404B8 4600A500 */ add.s $f20, $f20, $f0 /* A10D3C 802404BC C7A60028 */ lwc1 $f6, 0x28($sp) /* A10D40 802404C0 46003002 */ mul.s $f0, $f6, $f0 -/* A10D44 802404C4 00000000 */ nop +/* A10D44 802404C4 00000000 */ nop /* A10D48 802404C8 2404000A */ addiu $a0, $zero, 0xa /* A10D4C 802404CC 0C00A67F */ jal rand_int /* A10D50 802404D0 4600A501 */ sub.s $f20, $f20, $f0 @@ -118,7 +118,7 @@ glabel func_8024031C_A10B9C /* A10D60 802404E0 4406E000 */ mfc1 $a2, $f28 /* A10D64 802404E4 4407C000 */ mfc1 $a3, $f24 /* A10D68 802404E8 44820000 */ mtc1 $v0, $f0 -/* A10D6C 802404EC 00000000 */ nop +/* A10D6C 802404EC 00000000 */ nop /* A10D70 802404F0 46800020 */ cvt.s.w $f0, $f0 /* A10D74 802404F4 E7B60010 */ swc1 $f22, 0x10($sp) /* A10D78 802404F8 E7BE0014 */ swc1 $f30, 0x14($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240534_A10DB4.s b/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240534_A10DB4.s index 53985d026d..5a1a5232ba 100644 --- a/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240534_A10DB4.s +++ b/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240534_A10DB4.s @@ -17,7 +17,7 @@ glabel func_80240534_A10DB4 /* A10DE4 80240564 F7BE0068 */ sdc1 $f30, 0x68($sp) /* A10DE8 80240568 46020003 */ div.s $f0, $f0, $f2 /* A10DEC 8024056C 46040782 */ mul.s $f30, $f0, $f4 -/* A10DF0 80240570 00000000 */ nop +/* A10DF0 80240570 00000000 */ nop /* A10DF4 80240574 AFB00030 */ sw $s0, 0x30($sp) /* A10DF8 80240578 F7BC0060 */ sdc1 $f28, 0x60($sp) /* A10DFC 8024057C F7BA0058 */ sdc1 $f26, 0x58($sp) @@ -36,13 +36,13 @@ glabel func_80240534_A10DB4 /* A10E30 802405B0 E7A00024 */ swc1 $f0, 0x24($sp) /* A10E34 802405B4 24040096 */ addiu $a0, $zero, 0x96 /* A10E38 802405B8 44823000 */ mtc1 $v0, $f6 -/* A10E3C 802405BC 00000000 */ nop +/* A10E3C 802405BC 00000000 */ nop /* A10E40 802405C0 468031A0 */ cvt.s.w $f6, $f6 /* A10E44 802405C4 0C00A67F */ jal rand_int /* A10E48 802405C8 E7A60028 */ swc1 $f6, 0x28($sp) /* A10E4C 802405CC 24040064 */ addiu $a0, $zero, 0x64 /* A10E50 802405D0 44823000 */ mtc1 $v0, $f6 -/* A10E54 802405D4 00000000 */ nop +/* A10E54 802405D4 00000000 */ nop /* A10E58 802405D8 468031A0 */ cvt.s.w $f6, $f6 /* A10E5C 802405DC 0C00A67F */ jal rand_int /* A10E60 802405E0 E7A6002C */ swc1 $f6, 0x2c($sp) @@ -53,37 +53,37 @@ glabel func_80240534_A10DB4 /* A10E74 802405F4 3C014348 */ lui $at, 0x4348 /* A10E78 802405F8 4481B000 */ mtc1 $at, $f22 /* A10E7C 802405FC 4482A000 */ mtc1 $v0, $f20 -/* A10E80 80240600 00000000 */ nop +/* A10E80 80240600 00000000 */ nop /* A10E84 80240604 4680A520 */ cvt.s.w $f20, $f20 /* A10E88 80240608 4616003C */ c.lt.s $f0, $f22 -/* A10E8C 8024060C 00000000 */ nop +/* A10E8C 8024060C 00000000 */ nop /* A10E90 80240610 4501004A */ bc1t .L8024073C /* A10E94 80240614 24020002 */ addiu $v0, $zero, 2 /* A10E98 80240618 0C00A85B */ jal sin_rad /* A10E9C 8024061C 4600F306 */ mov.s $f12, $f30 /* A10EA0 80240620 4600A002 */ mul.s $f0, $f20, $f0 -/* A10EA4 80240624 00000000 */ nop +/* A10EA4 80240624 00000000 */ nop /* A10EA8 80240628 C61A0028 */ lwc1 $f26, 0x28($s0) /* A10EAC 8024062C C7AC0020 */ lwc1 $f12, 0x20($sp) /* A10EB0 80240630 0C00A85B */ jal sin_rad /* A10EB4 80240634 4600D681 */ sub.s $f26, $f26, $f0 /* A10EB8 80240638 C7A60028 */ lwc1 $f6, 0x28($sp) /* A10EBC 8024063C 46003002 */ mul.s $f0, $f6, $f0 -/* A10EC0 80240640 00000000 */ nop +/* A10EC0 80240640 00000000 */ nop /* A10EC4 80240644 C61C002C */ lwc1 $f28, 0x2c($s0) /* A10EC8 80240648 4616E700 */ add.s $f28, $f28, $f22 /* A10ECC 8024064C 4600D680 */ add.s $f26, $f26, $f0 /* A10ED0 80240650 0C00A874 */ jal cos_rad /* A10ED4 80240654 4600F306 */ mov.s $f12, $f30 /* A10ED8 80240658 4600A002 */ mul.s $f0, $f20, $f0 -/* A10EDC 8024065C 00000000 */ nop +/* A10EDC 8024065C 00000000 */ nop /* A10EE0 80240660 C6180030 */ lwc1 $f24, 0x30($s0) /* A10EE4 80240664 C7AC0020 */ lwc1 $f12, 0x20($sp) /* A10EE8 80240668 0C00A874 */ jal cos_rad /* A10EEC 8024066C 4600C600 */ add.s $f24, $f24, $f0 /* A10EF0 80240670 C7A60028 */ lwc1 $f6, 0x28($sp) /* A10EF4 80240674 46003002 */ mul.s $f0, $f6, $f0 -/* A10EF8 80240678 00000000 */ nop +/* A10EF8 80240678 00000000 */ nop /* A10EFC 8024067C 4600C601 */ sub.s $f24, $f24, $f0 /* A10F00 80240680 4600D18D */ trunc.w.s $f6, $f26 /* A10F04 80240684 E6260088 */ swc1 $f6, 0x88($s1) @@ -94,27 +94,27 @@ glabel func_80240534_A10DB4 /* A10F18 80240698 0C00A85B */ jal sin_rad /* A10F1C 8024069C 4600F306 */ mov.s $f12, $f30 /* A10F20 802406A0 4600A002 */ mul.s $f0, $f20, $f0 -/* A10F24 802406A4 00000000 */ nop +/* A10F24 802406A4 00000000 */ nop /* A10F28 802406A8 C6160028 */ lwc1 $f22, 0x28($s0) /* A10F2C 802406AC C7AC0024 */ lwc1 $f12, 0x24($sp) /* A10F30 802406B0 0C00A85B */ jal sin_rad /* A10F34 802406B4 4600B581 */ sub.s $f22, $f22, $f0 /* A10F38 802406B8 C7A6002C */ lwc1 $f6, 0x2c($sp) /* A10F3C 802406BC 46003002 */ mul.s $f0, $f6, $f0 -/* A10F40 802406C0 00000000 */ nop +/* A10F40 802406C0 00000000 */ nop /* A10F44 802406C4 4600F306 */ mov.s $f12, $f30 /* A10F48 802406C8 C61E002C */ lwc1 $f30, 0x2c($s0) /* A10F4C 802406CC 0C00A874 */ jal cos_rad /* A10F50 802406D0 4600B580 */ add.s $f22, $f22, $f0 /* A10F54 802406D4 4600A002 */ mul.s $f0, $f20, $f0 -/* A10F58 802406D8 00000000 */ nop +/* A10F58 802406D8 00000000 */ nop /* A10F5C 802406DC C6140030 */ lwc1 $f20, 0x30($s0) /* A10F60 802406E0 C7AC0024 */ lwc1 $f12, 0x24($sp) /* A10F64 802406E4 0C00A874 */ jal cos_rad /* A10F68 802406E8 4600A500 */ add.s $f20, $f20, $f0 /* A10F6C 802406EC C7A6002C */ lwc1 $f6, 0x2c($sp) /* A10F70 802406F0 46003002 */ mul.s $f0, $f6, $f0 -/* A10F74 802406F4 00000000 */ nop +/* A10F74 802406F4 00000000 */ nop /* A10F78 802406F8 24040004 */ addiu $a0, $zero, 4 /* A10F7C 802406FC 0C00A67F */ jal rand_int /* A10F80 80240700 4600A501 */ sub.s $f20, $f20, $f0 @@ -124,7 +124,7 @@ glabel func_80240534_A10DB4 /* A10F90 80240710 4406E000 */ mfc1 $a2, $f28 /* A10F94 80240714 4407C000 */ mfc1 $a3, $f24 /* A10F98 80240718 44820000 */ mtc1 $v0, $f0 -/* A10F9C 8024071C 00000000 */ nop +/* A10F9C 8024071C 00000000 */ nop /* A10FA0 80240720 46800020 */ cvt.s.w $f0, $f0 /* A10FA4 80240724 E7B60010 */ swc1 $f22, 0x10($sp) /* A10FA8 80240728 E7BE0014 */ swc1 $f30, 0x14($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240768_A10FE8.s b/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240768_A10FE8.s index a0359b293a..244237370c 100644 --- a/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240768_A10FE8.s +++ b/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240768_A10FE8.s @@ -13,6 +13,6 @@ glabel func_80240768_A10FE8 /* A11008 80240788 24020002 */ addiu $v0, $zero, 2 /* A1100C 8024078C 03E00008 */ jr $ra /* A11010 80240790 27BD0018 */ addiu $sp, $sp, 0x18 -/* A11014 80240794 00000000 */ nop -/* A11018 80240798 00000000 */ nop -/* A1101C 8024079C 00000000 */ nop +/* A11014 80240794 00000000 */ nop +/* A11018 80240798 00000000 */ nop +/* A1101C 8024079C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240AAC_A1132C.s b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240AAC_A1132C.s index 6bd22733e1..b082c9c1ad 100644 --- a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240AAC_A1132C.s +++ b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240AAC_A1132C.s @@ -10,18 +10,18 @@ glabel func_80240AAC_A1132C /* A11340 80240AC0 8C43000C */ lw $v1, 0xc($v0) /* A11344 80240AC4 3C01433E */ lui $at, 0x433e /* A11348 80240AC8 44810000 */ mtc1 $at, $f0 -/* A1134C 80240ACC 00000000 */ nop +/* A1134C 80240ACC 00000000 */ nop /* A11350 80240AD0 E4600078 */ swc1 $f0, 0x78($v1) /* A11354 80240AD4 8C43000C */ lw $v1, 0xc($v0) /* A11358 80240AD8 3C01435C */ lui $at, 0x435c /* A1135C 80240ADC 44810000 */ mtc1 $at, $f0 -/* A11360 80240AE0 00000000 */ nop +/* A11360 80240AE0 00000000 */ nop /* A11364 80240AE4 E460007C */ swc1 $f0, 0x7c($v1) /* A11368 80240AE8 8C43000C */ lw $v1, 0xc($v0) /* A1136C 80240AEC 3C013F33 */ lui $at, 0x3f33 /* A11370 80240AF0 34213333 */ ori $at, $at, 0x3333 /* A11374 80240AF4 44810000 */ mtc1 $at, $f0 -/* A11378 80240AF8 00000000 */ nop +/* A11378 80240AF8 00000000 */ nop /* A1137C 80240AFC E4600068 */ swc1 $f0, 0x68($v1) /* A11380 80240B00 8FBF0010 */ lw $ra, 0x10($sp) /* A11384 80240B04 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240B10_A11390.s b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240B10_A11390.s index 570cdd8510..91ccc97e28 100644 --- a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240B10_A11390.s +++ b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240B10_A11390.s @@ -10,14 +10,14 @@ glabel func_80240B10_A11390 /* A113A4 80240B24 8C43000C */ lw $v1, 0xc($v0) /* A113A8 80240B28 3C01432A */ lui $at, 0x432a /* A113AC 80240B2C 44810000 */ mtc1 $at, $f0 -/* A113B0 80240B30 00000000 */ nop +/* A113B0 80240B30 00000000 */ nop /* A113B4 80240B34 E4600078 */ swc1 $f0, 0x78($v1) /* A113B8 80240B38 8C43000C */ lw $v1, 0xc($v0) /* A113BC 80240B3C E460007C */ swc1 $f0, 0x7c($v1) /* A113C0 80240B40 8C43000C */ lw $v1, 0xc($v0) /* A113C4 80240B44 3C014000 */ lui $at, 0x4000 /* A113C8 80240B48 44810000 */ mtc1 $at, $f0 -/* A113CC 80240B4C 00000000 */ nop +/* A113CC 80240B4C 00000000 */ nop /* A113D0 80240B50 E4600068 */ swc1 $f0, 0x68($v1) /* A113D4 80240B54 8FBF0010 */ lw $ra, 0x10($sp) /* A113D8 80240B58 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240CDC_A1155C.s b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240CDC_A1155C.s index 9ae068e23f..0cf8f28a43 100644 --- a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240CDC_A1155C.s +++ b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240CDC_A1155C.s @@ -35,19 +35,19 @@ glabel func_80240CDC_A1155C /* A115D4 80240D54 0040802D */ daddu $s0, $v0, $zero /* A115D8 80240D58 0280202D */ daddu $a0, $s4, $zero /* A115DC 80240D5C 44931000 */ mtc1 $s3, $f2 -/* A115E0 80240D60 00000000 */ nop +/* A115E0 80240D60 00000000 */ nop /* A115E4 80240D64 468010A0 */ cvt.s.w $f2, $f2 /* A115E8 80240D68 44051000 */ mfc1 $a1, $f2 /* A115EC 80240D6C 44921000 */ mtc1 $s2, $f2 -/* A115F0 80240D70 00000000 */ nop +/* A115F0 80240D70 00000000 */ nop /* A115F4 80240D74 468010A0 */ cvt.s.w $f2, $f2 /* A115F8 80240D78 44061000 */ mfc1 $a2, $f2 /* A115FC 80240D7C 44901000 */ mtc1 $s0, $f2 -/* A11600 80240D80 00000000 */ nop +/* A11600 80240D80 00000000 */ nop /* A11604 80240D84 468010A0 */ cvt.s.w $f2, $f2 /* A11608 80240D88 44071000 */ mfc1 $a3, $f2 /* A1160C 80240D8C 44820000 */ mtc1 $v0, $f0 -/* A11610 80240D90 00000000 */ nop +/* A11610 80240D90 00000000 */ nop /* A11614 80240D94 46800020 */ cvt.s.w $f0, $f0 /* A11618 80240D98 0C01BFBC */ jal func_8006FEF0 /* A1161C 80240D9C E7A00010 */ swc1 $f0, 0x10($sp) @@ -60,6 +60,6 @@ glabel func_80240CDC_A1155C /* A11638 80240DB8 24020002 */ addiu $v0, $zero, 2 /* A1163C 80240DBC 03E00008 */ jr $ra /* A11640 80240DC0 27BD0030 */ addiu $sp, $sp, 0x30 -/* A11644 80240DC4 00000000 */ nop -/* A11648 80240DC8 00000000 */ nop -/* A1164C 80240DCC 00000000 */ nop +/* A11644 80240DC4 00000000 */ nop +/* A11648 80240DC8 00000000 */ nop +/* A1164C 80240DCC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_01/A11650/func_80240DEC_A1166C.s b/asm/nonmatchings/world/area_hos/hos_01/A11650/func_80240DEC_A1166C.s index 78b18d0e9f..73afe01325 100644 --- a/asm/nonmatchings/world/area_hos/hos_01/A11650/func_80240DEC_A1166C.s +++ b/asm/nonmatchings/world/area_hos/hos_01/A11650/func_80240DEC_A1166C.s @@ -13,5 +13,5 @@ glabel func_80240DEC_A1166C /* A1168C 80240E0C 24020002 */ addiu $v0, $zero, 2 /* A11690 80240E10 03E00008 */ jr $ra /* A11694 80240E14 27BD0018 */ addiu $sp, $sp, 0x18 -/* A11698 80240E18 00000000 */ nop -/* A1169C 80240E1C 00000000 */ nop +/* A11698 80240E18 00000000 */ nop +/* A1169C 80240E1C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240EF4_A17114.s b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240EF4_A17114.s index 8f25757d45..47dd48143f 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240EF4_A17114.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240EF4_A17114.s @@ -11,18 +11,18 @@ glabel func_80240EF4_A17114 /* A1712C 80240F0C 8C62000C */ lw $v0, 0xc($v1) /* A17130 80240F10 3C01433E */ lui $at, 0x433e /* A17134 80240F14 44810000 */ mtc1 $at, $f0 -/* A17138 80240F18 00000000 */ nop +/* A17138 80240F18 00000000 */ nop /* A1713C 80240F1C E4400078 */ swc1 $f0, 0x78($v0) /* A17140 80240F20 8C62000C */ lw $v0, 0xc($v1) /* A17144 80240F24 3C01435C */ lui $at, 0x435c /* A17148 80240F28 44810000 */ mtc1 $at, $f0 -/* A1714C 80240F2C 00000000 */ nop +/* A1714C 80240F2C 00000000 */ nop /* A17150 80240F30 E440007C */ swc1 $f0, 0x7c($v0) /* A17154 80240F34 8C64000C */ lw $a0, 0xc($v1) /* A17158 80240F38 3C013F33 */ lui $at, 0x3f33 /* A1715C 80240F3C 34213333 */ ori $at, $at, 0x3333 /* A17160 80240F40 44810000 */ mtc1 $at, $f0 -/* A17164 80240F44 00000000 */ nop +/* A17164 80240F44 00000000 */ nop /* A17168 80240F48 E4800068 */ swc1 $f0, 0x68($a0) /* A1716C 80240F4C 8C64000C */ lw $a0, 0xc($v1) /* A17170 80240F50 240300FF */ addiu $v1, $zero, 0xff diff --git a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240F68_A17188.s b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240F68_A17188.s index d3ca24f749..d1c3f23608 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240F68_A17188.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240F68_A17188.s @@ -11,14 +11,14 @@ glabel func_80240F68_A17188 /* A171A0 80240F80 8C62000C */ lw $v0, 0xc($v1) /* A171A4 80240F84 3C01432A */ lui $at, 0x432a /* A171A8 80240F88 44810000 */ mtc1 $at, $f0 -/* A171AC 80240F8C 00000000 */ nop +/* A171AC 80240F8C 00000000 */ nop /* A171B0 80240F90 E4400078 */ swc1 $f0, 0x78($v0) /* A171B4 80240F94 8C62000C */ lw $v0, 0xc($v1) /* A171B8 80240F98 E440007C */ swc1 $f0, 0x7c($v0) /* A171BC 80240F9C 8C64000C */ lw $a0, 0xc($v1) /* A171C0 80240FA0 3C014000 */ lui $at, 0x4000 /* A171C4 80240FA4 44810000 */ mtc1 $at, $f0 -/* A171C8 80240FA8 00000000 */ nop +/* A171C8 80240FA8 00000000 */ nop /* A171CC 80240FAC E4800068 */ swc1 $f0, 0x68($a0) /* A171D0 80240FB0 8C64000C */ lw $a0, 0xc($v1) /* A171D4 80240FB4 240300FF */ addiu $v1, $zero, 0xff @@ -27,4 +27,4 @@ glabel func_80240F68_A17188 /* A171E0 80240FC0 24020002 */ addiu $v0, $zero, 2 /* A171E4 80240FC4 03E00008 */ jr $ra /* A171E8 80240FC8 27BD0018 */ addiu $sp, $sp, 0x18 -/* A171EC 80240FCC 00000000 */ nop +/* A171EC 80240FCC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240FD0_A171F0.s b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240FD0_A171F0.s index 476038b74b..578c91130b 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240FD0_A171F0.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240FD0_A171F0.s @@ -8,5 +8,5 @@ glabel func_80240FD0_A171F0 /* A171FC 80240FDC AC820084 */ sw $v0, 0x84($a0) /* A17200 80240FE0 03E00008 */ jr $ra /* A17204 80240FE4 24020002 */ addiu $v0, $zero, 2 -/* A17208 80240FE8 00000000 */ nop -/* A1720C 80240FEC 00000000 */ nop +/* A17208 80240FE8 00000000 */ nop +/* A1720C 80240FEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80240FF0_A17210.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80240FF0_A17210.s index fe12d91dd9..5c3e9e6231 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80240FF0_A17210.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80240FF0_A17210.s @@ -47,7 +47,7 @@ glabel func_80240FF0_A17210 /* A172B8 80241098 0C0123F5 */ jal is_point_within_region /* A172BC 8024109C 8E070038 */ lw $a3, 0x38($s0) /* A172C0 802410A0 1040000E */ beqz $v0, .L802410DC -/* A172C4 802410A4 00000000 */ nop +/* A172C4 802410A4 00000000 */ nop /* A172C8 802410A8 8E2200D0 */ lw $v0, 0xd0($s1) /* A172CC 802410AC C60C0038 */ lwc1 $f12, 0x38($s0) /* A172D0 802410B0 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240FF0_A17210 /* A172E4 802410C4 468031A0 */ cvt.s.w $f6, $f6 /* A172E8 802410C8 44073000 */ mfc1 $a3, $f6 /* A172EC 802410CC 0C00A720 */ jal atan2 -/* A172F0 802410D0 00000000 */ nop +/* A172F0 802410D0 00000000 */ nop /* A172F4 802410D4 08090443 */ j .L8024110C /* A172F8 802410D8 E600000C */ swc1 $f0, 0xc($s0) .L802410DC: @@ -66,7 +66,7 @@ glabel func_80240FF0_A17210 /* A17300 802410E0 2404003C */ addiu $a0, $zero, 0x3c /* A17304 802410E4 C60C000C */ lwc1 $f12, 0xc($s0) /* A17308 802410E8 44820000 */ mtc1 $v0, $f0 -/* A1730C 802410EC 00000000 */ nop +/* A1730C 802410EC 00000000 */ nop /* A17310 802410F0 46800020 */ cvt.s.w $f0, $f0 /* A17314 802410F4 46006300 */ add.s $f12, $f12, $f0 /* A17318 802410F8 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240FF0_A17210 /* A1733C 8024111C 8E2200D0 */ lw $v0, 0xd0($s1) /* A17340 80241120 8C420014 */ lw $v0, 0x14($v0) /* A17344 80241124 04410004 */ bgez $v0, .L80241138 -/* A17348 80241128 00000000 */ nop +/* A17348 80241128 00000000 */ nop /* A1734C 8024112C C6400000 */ lwc1 $f0, ($s2) /* A17350 80241130 08090456 */ j .L80241158 /* A17354 80241134 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240FF0_A17210 /* A17358 80241138 3C018024 */ lui $at, %hi(D_80244E20) /* A1735C 8024113C D4224E20 */ ldc1 $f2, %lo(D_80244E20)($at) /* A17360 80241140 44820000 */ mtc1 $v0, $f0 -/* A17364 80241144 00000000 */ nop +/* A17364 80241144 00000000 */ nop /* A17368 80241148 46800021 */ cvt.d.w $f0, $f0 /* A1736C 8024114C 46220003 */ div.d $f0, $f0, $f2 /* A17370 80241150 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240FF0_A17210 /* A17384 80241164 44801000 */ mtc1 $zero, $f2 /* A17388 80241168 46000021 */ cvt.d.s $f0, $f0 /* A1738C 8024116C 46220002 */ mul.d $f0, $f0, $f2 -/* A17390 80241170 00000000 */ nop +/* A17390 80241170 00000000 */ nop /* A17394 80241174 24020001 */ addiu $v0, $zero, 1 /* A17398 80241178 4620018D */ trunc.w.d $f6, $f0 /* A1739C 8024117C E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802411A0_A173C0.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802411A0_A173C0.s index fc1b1cf496..303d046a7d 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802411A0_A173C0.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802411A0_A173C0.s @@ -34,7 +34,7 @@ glabel func_802411A0_A173C0 /* A17434 80241214 44803000 */ mtc1 $zero, $f6 /* A17438 80241218 46000021 */ cvt.d.s $f0, $f0 /* A1743C 8024121C 46260002 */ mul.d $f0, $f0, $f6 -/* A17440 80241220 00000000 */ nop +/* A17440 80241220 00000000 */ nop /* A17444 80241224 24020001 */ addiu $v0, $zero, 1 /* A17448 80241228 8E24006C */ lw $a0, 0x6c($s1) /* A1744C 8024122C 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_802411A0_A173C0 /* A174A8 80241288 C600003C */ lwc1 $f0, 0x3c($s0) /* A174AC 8024128C 4600C001 */ sub.s $f0, $f24, $f0 /* A174B0 80241290 4600B03C */ c.lt.s $f22, $f0 -/* A174B4 80241294 00000000 */ nop +/* A174B4 80241294 00000000 */ nop /* A174B8 80241298 4500001B */ bc1f .L80241308 /* A174BC 8024129C 34820010 */ ori $v0, $a0, 0x10 /* A174C0 802412A0 080904C2 */ j .L80241308 @@ -87,9 +87,9 @@ glabel func_802411A0_A173C0 /* A17504 802412E4 C7A00034 */ lwc1 $f0, 0x34($sp) /* A17508 802412E8 4600D001 */ sub.s $f0, $f26, $f0 /* A1750C 802412EC 4600B03C */ c.lt.s $f22, $f0 -/* A17510 802412F0 00000000 */ nop +/* A17510 802412F0 00000000 */ nop /* A17514 802412F4 45000004 */ bc1f .L80241308 -/* A17518 802412F8 00000000 */ nop +/* A17518 802412F8 00000000 */ nop /* A1751C 802412FC 8E22006C */ lw $v0, 0x6c($s1) /* A17520 80241300 34420010 */ ori $v0, $v0, 0x10 /* A17524 80241304 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_802411A0_A173C0 /* A1752C 8024130C 24030011 */ addiu $v1, $zero, 0x11 /* A17530 80241310 30420011 */ andi $v0, $v0, 0x11 /* A17534 80241314 14430039 */ bne $v0, $v1, .L802413FC -/* A17538 80241318 00000000 */ nop +/* A17538 80241318 00000000 */ nop /* A1753C 8024131C 8E020000 */ lw $v0, ($s0) /* A17540 80241320 30420008 */ andi $v0, $v0, 8 /* A17544 80241324 1040000A */ beqz $v0, .L80241350 @@ -108,7 +108,7 @@ glabel func_802411A0_A173C0 /* A17554 80241334 D4204E28 */ ldc1 $f0, %lo(D_80244E28)($at) /* A17558 80241338 460010A1 */ cvt.d.s $f2, $f2 /* A1755C 8024133C 46201082 */ mul.d $f2, $f2, $f0 -/* A17560 80241340 00000000 */ nop +/* A17560 80241340 00000000 */ nop /* A17564 80241344 4600A021 */ cvt.d.s $f0, $f20 /* A17568 80241348 080904ED */ j .L802413B4 /* A1756C 8024134C 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_802411A0_A173C0 /* A175BC 8024139C D4204E30 */ ldc1 $f0, %lo(D_80244E30)($at) /* A175C0 802413A0 460010A1 */ cvt.d.s $f2, $f2 /* A175C4 802413A4 46201082 */ mul.d $f2, $f2, $f0 -/* A175C8 802413A8 00000000 */ nop +/* A175C8 802413A8 00000000 */ nop /* A175CC 802413AC 4600A021 */ cvt.d.s $f0, $f20 /* A175D0 802413B0 46220000 */ add.d $f0, $f0, $f2 .L802413B4: @@ -149,7 +149,7 @@ glabel func_802411A0_A173C0 /* A175F0 802413D0 46000005 */ abs.s $f0, $f0 /* A175F4 802413D4 46000021 */ cvt.d.s $f0, $f0 /* A175F8 802413D8 4622003C */ c.lt.d $f0, $f2 -/* A175FC 802413DC 00000000 */ nop +/* A175FC 802413DC 00000000 */ nop /* A17600 802413E0 45000036 */ bc1f .L802414BC /* A17604 802413E4 2403FFEF */ addiu $v1, $zero, -0x11 /* A17608 802413E8 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_802411A0_A173C0 .L802413FC: /* A1761C 802413FC 8E220070 */ lw $v0, 0x70($s1) /* A17620 80241400 1840002E */ blez $v0, .L802414BC -/* A17624 80241404 00000000 */ nop +/* A17624 80241404 00000000 */ nop /* A17628 80241408 C62C0074 */ lwc1 $f12, 0x74($s1) /* A1762C 8024140C 0C00A8BB */ jal sin_deg /* A17630 80241410 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_802411A0_A173C0 /* A17688 80241468 27A70030 */ addiu $a3, $sp, 0x30 .L8024146C: /* A1768C 8024146C 10400007 */ beqz $v0, .L8024148C -/* A17690 80241470 00000000 */ nop +/* A17690 80241470 00000000 */ nop /* A17694 80241474 4616A082 */ mul.s $f2, $f20, $f22 -/* A17698 80241478 00000000 */ nop +/* A17698 80241478 00000000 */ nop /* A1769C 8024147C C7A0002C */ lwc1 $f0, 0x2c($sp) /* A176A0 80241480 461A0000 */ add.s $f0, $f0, $f26 /* A176A4 80241484 08090526 */ j .L80241498 /* A176A8 80241488 46020000 */ add.s $f0, $f0, $f2 .L8024148C: /* A176AC 8024148C 4616A002 */ mul.s $f0, $f20, $f22 -/* A176B0 80241490 00000000 */ nop +/* A176B0 80241490 00000000 */ nop /* A176B4 80241494 4600C000 */ add.s $f0, $f24, $f0 .L80241498: /* A176B8 80241498 E600003C */ swc1 $f0, 0x3c($s0) /* A176BC 8024149C 8E220074 */ lw $v0, 0x74($s1) /* A176C0 802414A0 2442000A */ addiu $v0, $v0, 0xa /* A176C4 802414A4 44826000 */ mtc1 $v0, $f12 -/* A176C8 802414A8 00000000 */ nop +/* A176C8 802414A8 00000000 */ nop /* A176CC 802414AC 0C00A6C9 */ jal clamp_angle /* A176D0 802414B0 46806320 */ cvt.s.w $f12, $f12 /* A176D4 802414B4 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_802411A0_A173C0 /* A176E4 802414C4 2442FFFF */ addiu $v0, $v0, -1 /* A176E8 802414C8 8E430014 */ lw $v1, 0x14($s2) /* A176EC 802414CC 04600048 */ bltz $v1, .L802415F0 -/* A176F0 802414D0 00000000 */ nop +/* A176F0 802414D0 00000000 */ nop /* A176F4 802414D4 8E620074 */ lw $v0, 0x74($s3) /* A176F8 802414D8 1C400042 */ bgtz $v0, .L802415E4 /* A176FC 802414DC 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_802411A0_A173C0 /* A17704 802414E4 860200A8 */ lh $v0, 0xa8($s0) /* A17708 802414E8 C602003C */ lwc1 $f2, 0x3c($s0) /* A1770C 802414EC 44820000 */ mtc1 $v0, $f0 -/* A17710 802414F0 00000000 */ nop +/* A17710 802414F0 00000000 */ nop /* A17714 802414F4 46800020 */ cvt.s.w $f0, $f0 /* A17718 802414F8 46001080 */ add.s $f2, $f2, $f0 /* A1771C 802414FC 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_802411A0_A173C0 /* A17738 80241518 C440002C */ lwc1 $f0, 0x2c($v0) /* A1773C 8024151C 46000021 */ cvt.d.s $f0, $f0 /* A17740 80241520 4622003C */ c.lt.d $f0, $f2 -/* A17744 80241524 00000000 */ nop +/* A17744 80241524 00000000 */ nop /* A17748 80241528 4500002C */ bc1f .L802415DC /* A1774C 8024152C 02A0202D */ daddu $a0, $s5, $zero /* A17750 80241530 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_802411A0_A173C0 /* A1778C 8024156C 3C01C1A0 */ lui $at, 0xc1a0 /* A17790 80241570 44812000 */ mtc1 $at, $f4 /* A17794 80241574 44834000 */ mtc1 $v1, $f8 -/* A17798 80241578 00000000 */ nop +/* A17798 80241578 00000000 */ nop /* A1779C 8024157C 46804220 */ cvt.s.w $f8, $f8 /* A177A0 80241580 44074000 */ mfc1 $a3, $f8 /* A177A4 80241584 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_802411A0_A173C0 /* A17858 80241638 0C0123F5 */ jal is_point_within_region /* A1785C 8024163C 8E070038 */ lw $a3, 0x38($s0) /* A17860 80241640 1040001A */ beqz $v0, .L802416AC -/* A17864 80241644 00000000 */ nop +/* A17864 80241644 00000000 */ nop /* A17868 80241648 8E060038 */ lw $a2, 0x38($s0) /* A1786C 8024164C 8E2200D0 */ lw $v0, 0xd0($s1) /* A17870 80241650 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_802411A0_A173C0 /* A17884 80241664 468073A0 */ cvt.s.w $f14, $f14 /* A17888 80241668 C6020018 */ lwc1 $f2, 0x18($s0) /* A1788C 8024166C 4600103C */ c.lt.s $f2, $f0 -/* A17890 80241670 00000000 */ nop +/* A17890 80241670 00000000 */ nop /* A17894 80241674 4500000D */ bc1f .L802416AC /* A17898 80241678 E7A00034 */ swc1 $f0, 0x34($sp) /* A1789C 8024167C C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_802411A0_A173C0 /* A178D8 802416B8 00621825 */ or $v1, $v1, $v0 /* A178DC 802416BC 00741825 */ or $v1, $v1, $s4 /* A178E0 802416C0 10600008 */ beqz $v1, .L802416E4 -/* A178E4 802416C4 00000000 */ nop +/* A178E4 802416C4 00000000 */ nop /* A178E8 802416C8 8602008C */ lh $v0, 0x8c($s0) /* A178EC 802416CC 14400031 */ bnez $v0, .L80241794 -/* A178F0 802416D0 00000000 */ nop +/* A178F0 802416D0 00000000 */ nop /* A178F4 802416D4 8E050018 */ lw $a1, 0x18($s0) /* A178F8 802416D8 8E06000C */ lw $a2, 0xc($s0) /* A178FC 802416DC 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_802411A0_A173C0 /* A17910 802416F0 44801000 */ mtc1 $zero, $f2 /* A17914 802416F4 46000021 */ cvt.d.s $f0, $f0 /* A17918 802416F8 46220002 */ mul.d $f0, $f0, $f2 -/* A1791C 802416FC 00000000 */ nop +/* A1791C 802416FC 00000000 */ nop /* A17920 80241700 4620020D */ trunc.w.d $f8, $f0 /* A17924 80241704 E628007C */ swc1 $f8, 0x7c($s1) /* A17928 80241708 8E420004 */ lw $v0, 4($s2) /* A1792C 8024170C 18400021 */ blez $v0, .L80241794 -/* A17930 80241710 00000000 */ nop +/* A17930 80241710 00000000 */ nop /* A17934 80241714 8602008E */ lh $v0, 0x8e($s0) /* A17938 80241718 9603008E */ lhu $v1, 0x8e($s0) /* A1793C 8024171C 18400005 */ blez $v0, .L80241734 @@ -375,7 +375,7 @@ glabel func_802411A0_A173C0 /* A17944 80241724 A602008E */ sh $v0, 0x8e($s0) /* A17948 80241728 00021400 */ sll $v0, $v0, 0x10 /* A1794C 8024172C 1C400019 */ bgtz $v0, .L80241794 -/* A17950 80241730 00000000 */ nop +/* A17950 80241730 00000000 */ nop .L80241734: /* A17954 80241734 240403E8 */ addiu $a0, $zero, 0x3e8 /* A17958 80241738 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_802411A0_A173C0 /* A179A0 80241780 18400003 */ blez $v0, .L80241790 /* A179A4 80241784 28620003 */ slti $v0, $v1, 3 /* A179A8 80241788 10400002 */ beqz $v0, .L80241794 -/* A179AC 8024178C 00000000 */ nop +/* A179AC 8024178C 00000000 */ nop .L80241790: /* A179B0 80241790 AE600070 */ sw $zero, 0x70($s3) .L80241794: diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241888_A17AA8.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241888_A17AA8.s index e283472907..5cce169ef3 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241888_A17AA8.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241888_A17AA8.s @@ -42,11 +42,11 @@ glabel func_80241888_A17AA8 .L8024191C: /* A17B3C 8024191C 8E220070 */ lw $v0, 0x70($s1) /* A17B40 80241920 18400034 */ blez $v0, .L802419F4 -/* A17B44 80241924 00000000 */ nop +/* A17B44 80241924 00000000 */ nop /* A17B48 80241928 C62C0074 */ lwc1 $f12, 0x74($s1) /* A17B4C 8024192C 46806320 */ cvt.s.w $f12, $f12 /* A17B50 80241930 44820000 */ mtc1 $v0, $f0 -/* A17B54 80241934 00000000 */ nop +/* A17B54 80241934 00000000 */ nop /* A17B58 80241938 46800020 */ cvt.s.w $f0, $f0 /* A17B5C 8024193C 46000021 */ cvt.d.s $f0, $f0 /* A17B60 80241940 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_80241888_A17AA8 /* A17BC0 802419A0 27A70030 */ addiu $a3, $sp, 0x30 .L802419A4: /* A17BC4 802419A4 10400007 */ beqz $v0, .L802419C4 -/* A17BC8 802419A8 00000000 */ nop +/* A17BC8 802419A8 00000000 */ nop /* A17BCC 802419AC 4616A082 */ mul.s $f2, $f20, $f22 -/* A17BD0 802419B0 00000000 */ nop +/* A17BD0 802419B0 00000000 */ nop /* A17BD4 802419B4 C7A0002C */ lwc1 $f0, 0x2c($sp) /* A17BD8 802419B8 46180000 */ add.s $f0, $f0, $f24 /* A17BDC 802419BC 08090674 */ j .L802419D0 /* A17BE0 802419C0 46020000 */ add.s $f0, $f0, $f2 .L802419C4: /* A17BE4 802419C4 4616A002 */ mul.s $f0, $f20, $f22 -/* A17BE8 802419C8 00000000 */ nop +/* A17BE8 802419C8 00000000 */ nop /* A17BEC 802419CC 4600D000 */ add.s $f0, $f26, $f0 .L802419D0: /* A17BF0 802419D0 E600003C */ swc1 $f0, 0x3c($s0) /* A17BF4 802419D4 8E220074 */ lw $v0, 0x74($s1) /* A17BF8 802419D8 2442000A */ addiu $v0, $v0, 0xa /* A17BFC 802419DC 44826000 */ mtc1 $v0, $f12 -/* A17C00 802419E0 00000000 */ nop +/* A17C00 802419E0 00000000 */ nop /* A17C04 802419E4 0C00A6C9 */ jal clamp_angle /* A17C08 802419E8 46806320 */ cvt.s.w $f12, $f12 /* A17C0C 802419EC 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_80241888_A17AA8 /* A17C20 80241A00 860200A8 */ lh $v0, 0xa8($s0) /* A17C24 80241A04 C600003C */ lwc1 $f0, 0x3c($s0) /* A17C28 80241A08 44821000 */ mtc1 $v0, $f2 -/* A17C2C 80241A0C 00000000 */ nop +/* A17C2C 80241A0C 00000000 */ nop /* A17C30 80241A10 468010A0 */ cvt.s.w $f2, $f2 /* A17C34 80241A14 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A17C38 80241A18 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_80241888_A17AA8 /* A17C54 80241A34 46240000 */ add.d $f0, $f0, $f4 /* A17C58 80241A38 460010A1 */ cvt.d.s $f2, $f2 /* A17C5C 80241A3C 4620103C */ c.lt.d $f2, $f0 -/* A17C60 80241A40 00000000 */ nop +/* A17C60 80241A40 00000000 */ nop /* A17C64 80241A44 4500002E */ bc1f .L80241B00 /* A17C68 80241A48 0280202D */ daddu $a0, $s4, $zero /* A17C6C 80241A4C 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_80241888_A17AA8 /* A17CAC 80241A8C 3C01C1A0 */ lui $at, 0xc1a0 /* A17CB0 80241A90 44812000 */ mtc1 $at, $f4 /* A17CB4 80241A94 44834000 */ mtc1 $v1, $f8 -/* A17CB8 80241A98 00000000 */ nop +/* A17CB8 80241A98 00000000 */ nop /* A17CBC 80241A9C 46804220 */ cvt.s.w $f8, $f8 /* A17CC0 80241AA0 44074000 */ mfc1 $a3, $f8 /* A17CC4 80241AA4 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_80241888_A17AA8 .L80241B00: /* A17D20 80241B00 8602008C */ lh $v0, 0x8c($s0) /* A17D24 80241B04 14400025 */ bnez $v0, .L80241B9C -/* A17D28 80241B08 00000000 */ nop +/* A17D28 80241B08 00000000 */ nop /* A17D2C 80241B0C 8602008E */ lh $v0, 0x8e($s0) /* A17D30 80241B10 1C400022 */ bgtz $v0, .L80241B9C -/* A17D34 80241B14 00000000 */ nop +/* A17D34 80241B14 00000000 */ nop /* A17D38 80241B18 8E620074 */ lw $v0, 0x74($s3) /* A17D3C 80241B1C 2442FFFF */ addiu $v0, $v0, -1 /* A17D40 80241B20 1840001D */ blez $v0, .L80241B98 @@ -183,7 +183,7 @@ glabel func_80241888_A17AA8 /* A17D4C 80241B2C 9442002A */ lhu $v0, 0x2a($v0) /* A17D50 80241B30 30420010 */ andi $v0, $v0, 0x10 /* A17D54 80241B34 14400007 */ bnez $v0, .L80241B54 -/* A17D58 80241B38 00000000 */ nop +/* A17D58 80241B38 00000000 */ nop /* A17D5C 80241B3C C600000C */ lwc1 $f0, 0xc($s0) /* A17D60 80241B40 3C014334 */ lui $at, 0x4334 /* A17D64 80241B44 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241CB0_A17ED0.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241CB0_A17ED0.s index 054b0499bd..7f7ce35b88 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241CB0_A17ED0.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241CB0_A17ED0.s @@ -60,18 +60,18 @@ glabel func_80241CB0_A17ED0 /* A17FA8 80241D88 C6200038 */ lwc1 $f0, 0x38($s1) /* A17FAC 80241D8C 4600018D */ trunc.w.s $f6, $f0 /* A17FB0 80241D90 44023000 */ mfc1 $v0, $f6 -/* A17FB4 80241D94 00000000 */ nop +/* A17FB4 80241D94 00000000 */ nop /* A17FB8 80241D98 A6420010 */ sh $v0, 0x10($s2) /* A17FBC 80241D9C C620003C */ lwc1 $f0, 0x3c($s1) /* A17FC0 80241DA0 4600018D */ trunc.w.s $f6, $f0 /* A17FC4 80241DA4 44023000 */ mfc1 $v0, $f6 -/* A17FC8 80241DA8 00000000 */ nop +/* A17FC8 80241DA8 00000000 */ nop /* A17FCC 80241DAC A6420012 */ sh $v0, 0x12($s2) /* A17FD0 80241DB0 C6200040 */ lwc1 $f0, 0x40($s1) /* A17FD4 80241DB4 A2430007 */ sb $v1, 7($s2) /* A17FD8 80241DB8 4600018D */ trunc.w.s $f6, $f0 /* A17FDC 80241DBC 44023000 */ mfc1 $v0, $f6 -/* A17FE0 80241DC0 00000000 */ nop +/* A17FE0 80241DC0 00000000 */ nop /* A17FE4 80241DC4 A6420014 */ sh $v0, 0x14($s2) .L80241DC8: /* A17FE8 80241DC8 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241E48_A18068.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241E48_A18068.s index 97e801a5d1..a60dc0d82e 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241E48_A18068.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241E48_A18068.s @@ -42,9 +42,9 @@ glabel func_80241E48_A18068 /* A180FC 80241EDC 44801800 */ mtc1 $zero, $f3 /* A18100 80241EE0 46002021 */ cvt.d.s $f0, $f4 /* A18104 80241EE4 4620103E */ c.le.d $f2, $f0 -/* A18108 80241EE8 00000000 */ nop +/* A18108 80241EE8 00000000 */ nop /* A1810C 80241EEC 45000030 */ bc1f .L80241FB0 -/* A18110 80241EF0 00000000 */ nop +/* A18110 80241EF0 00000000 */ nop /* A18114 80241EF4 C600003C */ lwc1 $f0, 0x3c($s0) /* A18118 80241EF8 46040000 */ add.s $f0, $f0, $f4 /* A1811C 80241EFC E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_80241E48_A18068 /* A1817C 80241F5C 27A70020 */ addiu $a3, $sp, 0x20 .L80241F60: /* A18180 80241F60 1040000B */ beqz $v0, .L80241F90 -/* A18184 80241F64 00000000 */ nop +/* A18184 80241F64 00000000 */ nop /* A18188 80241F68 C7A0001C */ lwc1 $f0, 0x1c($sp) /* A1818C 80241F6C 46140080 */ add.s $f2, $f0, $f20 /* A18190 80241F70 C600003C */ lwc1 $f0, 0x3c($s0) /* A18194 80241F74 4600103E */ c.le.s $f2, $f0 -/* A18198 80241F78 00000000 */ nop +/* A18198 80241F78 00000000 */ nop /* A1819C 80241F7C 4500008D */ bc1f .L802421B4 -/* A181A0 80241F80 00000000 */ nop +/* A181A0 80241F80 00000000 */ nop /* A181A4 80241F84 E602003C */ swc1 $f2, 0x3c($s0) /* A181A8 80241F88 0809086D */ j .L802421B4 /* A181AC 80241F8C AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_80241E48_A18068 /* A181B0 80241F90 C602003C */ lwc1 $f2, 0x3c($s0) /* A181B4 80241F94 C6000064 */ lwc1 $f0, 0x64($s0) /* A181B8 80241F98 4602003E */ c.le.s $f0, $f2 -/* A181BC 80241F9C 00000000 */ nop +/* A181BC 80241F9C 00000000 */ nop /* A181C0 80241FA0 45030084 */ bc1tl .L802421B4 /* A181C4 80241FA4 AE400070 */ sw $zero, 0x70($s2) /* A181C8 80241FA8 0809086D */ j .L802421B4 -/* A181CC 80241FAC 00000000 */ nop +/* A181CC 80241FAC 00000000 */ nop .L80241FB0: /* A181D0 80241FB0 4622003C */ c.lt.d $f0, $f2 -/* A181D4 80241FB4 00000000 */ nop +/* A181D4 80241FB4 00000000 */ nop /* A181D8 80241FB8 4500007E */ bc1f .L802421B4 -/* A181DC 80241FBC 00000000 */ nop +/* A181DC 80241FBC 00000000 */ nop /* A181E0 80241FC0 9602008E */ lhu $v0, 0x8e($s0) /* A181E4 80241FC4 24420001 */ addiu $v0, $v0, 1 /* A181E8 80241FC8 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_80241E48_A18068 /* A181F4 80241FD4 00021403 */ sra $v0, $v0, 0x10 /* A181F8 80241FD8 0043102A */ slt $v0, $v0, $v1 /* A181FC 80241FDC 14400026 */ bnez $v0, .L80242078 -/* A18200 80241FE0 00000000 */ nop +/* A18200 80241FE0 00000000 */ nop /* A18204 80241FE4 C60C0038 */ lwc1 $f12, 0x38($s0) /* A18208 80241FE8 C60E0040 */ lwc1 $f14, 0x40($s0) /* A1820C 80241FEC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_80241E48_A18068 /* A18238 80242018 8E62001C */ lw $v0, 0x1c($s3) /* A1823C 8024201C 46001005 */ abs.s $f0, $f2 /* A18240 80242020 44822000 */ mtc1 $v0, $f4 -/* A18244 80242024 00000000 */ nop +/* A18244 80242024 00000000 */ nop /* A18248 80242028 46802120 */ cvt.s.w $f4, $f4 /* A1824C 8024202C 4600203C */ c.lt.s $f4, $f0 -/* A18250 80242030 00000000 */ nop +/* A18250 80242030 00000000 */ nop /* A18254 80242034 4500000D */ bc1f .L8024206C -/* A18258 80242038 00000000 */ nop +/* A18258 80242038 00000000 */ nop /* A1825C 8024203C 44800000 */ mtc1 $zero, $f0 /* A18260 80242040 C614000C */ lwc1 $f20, 0xc($s0) /* A18264 80242044 4600103C */ c.lt.s $f2, $f0 -/* A18268 80242048 00000000 */ nop +/* A18268 80242048 00000000 */ nop /* A1826C 8024204C 45000006 */ bc1f .L80242068 /* A18270 80242050 00021023 */ negu $v0, $v0 /* A18274 80242054 44820000 */ mtc1 $v0, $f0 -/* A18278 80242058 00000000 */ nop +/* A18278 80242058 00000000 */ nop /* A1827C 8024205C 46800020 */ cvt.s.w $f0, $f0 /* A18280 80242060 0809081B */ j .L8024206C /* A18284 80242064 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_80241E48_A18068 /* A182AC 8024208C C600001C */ lwc1 $f0, 0x1c($s0) /* A182B0 80242090 46001080 */ add.s $f2, $f2, $f0 /* A182B4 80242094 4616103C */ c.lt.s $f2, $f22 -/* A182B8 80242098 00000000 */ nop +/* A182B8 80242098 00000000 */ nop /* A182BC 8024209C 45020045 */ bc1fl .L802421B4 /* A182C0 802420A0 E602003C */ swc1 $f2, 0x3c($s0) /* A182C4 802420A4 0809086C */ j .L802421B0 @@ -169,7 +169,7 @@ glabel func_80241E48_A18068 /* A182DC 802420BC C600001C */ lwc1 $f0, 0x1c($s0) /* A182E0 802420C0 C604003C */ lwc1 $f4, 0x3c($s0) /* A182E4 802420C4 44821000 */ mtc1 $v0, $f2 -/* A182E8 802420C8 00000000 */ nop +/* A182E8 802420C8 00000000 */ nop /* A182EC 802420CC 468010A0 */ cvt.s.w $f2, $f2 /* A182F0 802420D0 46000005 */ abs.s $f0, $f0 /* A182F4 802420D4 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_80241E48_A18068 /* A18330 80242110 0C0372DF */ jal func_800DCB7C /* A18334 80242114 27A70020 */ addiu $a3, $sp, 0x20 /* A18338 80242118 10400015 */ beqz $v0, .L80242170 -/* A1833C 8024211C 00000000 */ nop +/* A1833C 8024211C 00000000 */ nop /* A18340 80242120 860200A8 */ lh $v0, 0xa8($s0) /* A18344 80242124 C604001C */ lwc1 $f4, 0x1c($s0) /* A18348 80242128 44820000 */ mtc1 $v0, $f0 -/* A1834C 8024212C 00000000 */ nop +/* A1834C 8024212C 00000000 */ nop /* A18350 80242130 46800020 */ cvt.s.w $f0, $f0 /* A18354 80242134 46002085 */ abs.s $f2, $f4 /* A18358 80242138 46020000 */ add.s $f0, $f0, $f2 /* A1835C 8024213C C7A20024 */ lwc1 $f2, 0x24($sp) /* A18360 80242140 4600103E */ c.le.s $f2, $f0 -/* A18364 80242144 00000000 */ nop +/* A18364 80242144 00000000 */ nop /* A18368 80242148 45000005 */ bc1f .L80242160 -/* A1836C 8024214C 00000000 */ nop +/* A1836C 8024214C 00000000 */ nop /* A18370 80242150 C7A0001C */ lwc1 $f0, 0x1c($sp) /* A18374 80242154 AE00001C */ sw $zero, 0x1c($s0) /* A18378 80242158 0809086D */ j .L802421B4 @@ -217,13 +217,13 @@ glabel func_80241E48_A18068 /* A18394 80242174 860200A8 */ lh $v0, 0xa8($s0) /* A18398 80242178 46163081 */ sub.s $f2, $f6, $f22 /* A1839C 8024217C 44820000 */ mtc1 $v0, $f0 -/* A183A0 80242180 00000000 */ nop +/* A183A0 80242180 00000000 */ nop /* A183A4 80242184 46800020 */ cvt.s.w $f0, $f0 /* A183A8 80242188 46001080 */ add.s $f2, $f2, $f0 /* A183AC 8024218C C604001C */ lwc1 $f4, 0x1c($s0) /* A183B0 80242190 46002005 */ abs.s $f0, $f4 /* A183B4 80242194 4602003C */ c.lt.s $f0, $f2 -/* A183B8 80242198 00000000 */ nop +/* A183B8 80242198 00000000 */ nop /* A183BC 8024219C 45020005 */ bc1fl .L802421B4 /* A183C0 802421A0 AE00001C */ sw $zero, 0x1c($s0) /* A183C4 802421A4 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802421D8_A183F8.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802421D8_A183F8.s index 7df3578ac2..5967e899e1 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802421D8_A183F8.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802421D8_A183F8.s @@ -49,15 +49,15 @@ glabel func_802421D8_A183F8 /* A184A0 80242280 44802000 */ mtc1 $zero, $f4 /* A184A4 80242284 460010A1 */ cvt.d.s $f2, $f2 /* A184A8 80242288 46241082 */ mul.d $f2, $f2, $f4 -/* A184AC 8024228C 00000000 */ nop +/* A184AC 8024228C 00000000 */ nop /* A184B0 80242290 C7A0001C */ lwc1 $f0, 0x1c($sp) /* A184B4 80242294 46000021 */ cvt.d.s $f0, $f0 /* A184B8 80242298 46240002 */ mul.d $f0, $f0, $f4 -/* A184BC 8024229C 00000000 */ nop +/* A184BC 8024229C 00000000 */ nop /* A184C0 802422A0 3C013FE0 */ lui $at, 0x3fe0 /* A184C4 802422A4 44812800 */ mtc1 $at, $f5 /* A184C8 802422A8 44802000 */ mtc1 $zero, $f4 -/* A184CC 802422AC 00000000 */ nop +/* A184CC 802422AC 00000000 */ nop /* A184D0 802422B0 46241080 */ add.d $f2, $f2, $f4 /* A184D4 802422B4 AE000074 */ sw $zero, 0x74($s0) /* A184D8 802422B8 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s index 816af0db8f..60d62e1369 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s @@ -54,7 +54,7 @@ glabel func_802422FC_A1851C /* A185DC 802423BC 8E4300B0 */ lw $v1, 0xb0($s2) /* A185E0 802423C0 30620004 */ andi $v0, $v1, 4 /* A185E4 802423C4 10400007 */ beqz $v0, .L802423E4 -/* A185E8 802423C8 00000000 */ nop +/* A185E8 802423C8 00000000 */ nop /* A185EC 802423CC 824200B4 */ lb $v0, 0xb4($s2) /* A185F0 802423D0 1440003C */ bnez $v0, .L802424C4 /* A185F4 802423D4 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_802422FC_A1851C /* A18608 802423E8 2C62000F */ sltiu $v0, $v1, 0xf /* A1860C 802423EC 10400034 */ beqz $v0, .L802424C0 /* A18610 802423F0 00031080 */ sll $v0, $v1, 2 -/* A18614 802423F4 3C018024 */ lui $at, %hi(func_80244E38) +/* A18614 802423F4 3C018024 */ lui $at, %hi(jtbl_80244E38_A1B058) /* A18618 802423F8 00220821 */ addu $at, $at, $v0 -/* A1861C 802423FC 8C224E38 */ lw $v0, %lo(func_80244E38)($at) +/* A1861C 802423FC 8C224E38 */ lw $v0, %lo(jtbl_80244E38_A1B058)($at) /* A18620 80242400 00400008 */ jr $v0 -/* A18624 80242404 00000000 */ nop +/* A18624 80242404 00000000 */ nop +glabel L80242408_A18628 /* A18628 80242408 0280202D */ daddu $a0, $s4, $zero /* A1862C 8024240C 0200282D */ daddu $a1, $s0, $zero /* A18630 80242410 0C0903FC */ jal func_80240FF0_A17210 /* A18634 80242414 0260302D */ daddu $a2, $s3, $zero +glabel L80242418_A18638 /* A18638 80242418 0280202D */ daddu $a0, $s4, $zero /* A1863C 8024241C 0200282D */ daddu $a1, $s0, $zero /* A18640 80242420 0C090468 */ jal func_802411A0_A173C0 /* A18644 80242424 0260302D */ daddu $a2, $s3, $zero /* A18648 80242428 08090931 */ j .L802424C4 /* A1864C 8024242C 0000102D */ daddu $v0, $zero, $zero +glabel L80242430_A18650 /* A18650 80242430 0280202D */ daddu $a0, $s4, $zero /* A18654 80242434 0200282D */ daddu $a1, $s0, $zero /* A18658 80242438 0C0905F2 */ jal hos_02_UnkNpcAIFunc1 /* A1865C 8024243C 0260302D */ daddu $a2, $s3, $zero +glabel L80242440_A18660 /* A18660 80242440 0280202D */ daddu $a0, $s4, $zero /* A18664 80242444 0200282D */ daddu $a1, $s0, $zero /* A18668 80242448 0C090622 */ jal func_80241888_A17AA8 /* A1866C 8024244C 0260302D */ daddu $a2, $s3, $zero /* A18670 80242450 08090931 */ j .L802424C4 /* A18674 80242454 0000102D */ daddu $v0, $zero, $zero +glabel L80242458_A18678 /* A18678 80242458 0280202D */ daddu $a0, $s4, $zero /* A1867C 8024245C 0200282D */ daddu $a1, $s0, $zero /* A18680 80242460 0C0906F3 */ jal hos_02_UnkNpcAIFunc2 /* A18684 80242464 0260302D */ daddu $a2, $s3, $zero +glabel L80242468_A18688 /* A18688 80242468 0280202D */ daddu $a0, $s4, $zero /* A1868C 8024246C 0200282D */ daddu $a1, $s0, $zero /* A18690 80242470 0C090711 */ jal func_80241C44_A17E64 /* A18694 80242474 0260302D */ daddu $a2, $s3, $zero /* A18698 80242478 08090931 */ j .L802424C4 /* A1869C 8024247C 0000102D */ daddu $v0, $zero, $zero +glabel L80242480_A186A0 /* A186A0 80242480 0280202D */ daddu $a0, $s4, $zero /* A186A4 80242484 0200282D */ daddu $a1, $s0, $zero /* A186A8 80242488 0C09072C */ jal func_80241CB0_A17ED0 /* A186AC 8024248C 0260302D */ daddu $a2, $s3, $zero /* A186B0 80242490 08090931 */ j .L802424C4 /* A186B4 80242494 0000102D */ daddu $v0, $zero, $zero +glabel L80242498_A186B8 /* A186B8 80242498 0280202D */ daddu $a0, $s4, $zero /* A186BC 8024249C 0200282D */ daddu $a1, $s0, $zero /* A186C0 802424A0 0C090779 */ jal hos_02_UnkNpcAIFunc3 /* A186C4 802424A4 0260302D */ daddu $a2, $s3, $zero /* A186C8 802424A8 08090931 */ j .L802424C4 /* A186CC 802424AC 0000102D */ daddu $v0, $zero, $zero +glabel L802424B0_A186D0 /* A186D0 802424B0 0280202D */ daddu $a0, $s4, $zero /* A186D4 802424B4 0200282D */ daddu $a1, $s0, $zero /* A186D8 802424B8 0C090792 */ jal func_80241E48_A18068 /* A186DC 802424BC 0260302D */ daddu $a2, $s3, $zero .L802424C0: +glabel L802424C0_A186E0 /* A186E0 802424C0 0000102D */ daddu $v0, $zero, $zero .L802424C4: /* A186E4 802424C4 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802424E8_A18708.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802424E8_A18708.s index 45ae82938f..5d4a1d6a62 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802424E8_A18708.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802424E8_A18708.s @@ -47,20 +47,20 @@ glabel func_802424E8_A18708 /* A187B0 80242590 8E02001C */ lw $v0, 0x1c($s0) /* A187B4 80242594 46001005 */ abs.s $f0, $f2 /* A187B8 80242598 44822000 */ mtc1 $v0, $f4 -/* A187BC 8024259C 00000000 */ nop +/* A187BC 8024259C 00000000 */ nop /* A187C0 802425A0 46802120 */ cvt.s.w $f4, $f4 /* A187C4 802425A4 4600203C */ c.lt.s $f4, $f0 -/* A187C8 802425A8 00000000 */ nop +/* A187C8 802425A8 00000000 */ nop /* A187CC 802425AC 4500000D */ bc1f .L802425E4 -/* A187D0 802425B0 00000000 */ nop +/* A187D0 802425B0 00000000 */ nop /* A187D4 802425B4 44800000 */ mtc1 $zero, $f0 /* A187D8 802425B8 C654000C */ lwc1 $f20, 0xc($s2) /* A187DC 802425BC 4600103C */ c.lt.s $f2, $f0 -/* A187E0 802425C0 00000000 */ nop +/* A187E0 802425C0 00000000 */ nop /* A187E4 802425C4 45000006 */ bc1f .L802425E0 /* A187E8 802425C8 00021023 */ negu $v0, $v0 /* A187EC 802425CC 44820000 */ mtc1 $v0, $f0 -/* A187F0 802425D0 00000000 */ nop +/* A187F0 802425D0 00000000 */ nop /* A187F4 802425D4 46800020 */ cvt.s.w $f0, $f0 /* A187F8 802425D8 08090979 */ j .L802425E4 /* A187FC 802425DC 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242618_A18838.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242618_A18838.s index cde7b1932e..c94b8252eb 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242618_A18838.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242618_A18838.s @@ -36,7 +36,7 @@ glabel func_80242618_A18838 /* A188B4 80242694 2402000F */ addiu $v0, $zero, 0xf /* A188B8 80242698 AFA2001C */ sw $v0, 0x1c($sp) /* A188BC 8024269C 44834000 */ mtc1 $v1, $f8 -/* A188C0 802426A0 00000000 */ nop +/* A188C0 802426A0 00000000 */ nop /* A188C4 802426A4 46804220 */ cvt.s.w $f8, $f8 /* A188C8 802426A8 44074000 */ mfc1 $a3, $f8 /* A188CC 802426AC 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,14 +69,14 @@ glabel func_80242618_A18838 /* A18934 80242714 860200A8 */ lh $v0, 0xa8($s0) /* A18938 80242718 C6000038 */ lwc1 $f0, 0x38($s0) /* A1893C 8024271C 44821000 */ mtc1 $v0, $f2 -/* A18940 80242720 00000000 */ nop +/* A18940 80242720 00000000 */ nop /* A18944 80242724 468010A0 */ cvt.s.w $f2, $f2 /* A18948 80242728 E7A0002C */ swc1 $f0, 0x2c($sp) /* A1894C 8024272C 860200A8 */ lh $v0, 0xa8($s0) /* A18950 80242730 C604003C */ lwc1 $f4, 0x3c($s0) /* A18954 80242734 C6060040 */ lwc1 $f6, 0x40($s0) /* A18958 80242738 44820000 */ mtc1 $v0, $f0 -/* A1895C 8024273C 00000000 */ nop +/* A1895C 8024273C 00000000 */ nop /* A18960 80242740 46800021 */ cvt.d.w $f0, $f0 /* A18964 80242744 46022100 */ add.s $f4, $f4, $f2 /* A18968 80242748 3C014008 */ lui $at, 0x4008 @@ -93,19 +93,19 @@ glabel func_80242618_A18838 /* A18994 80242774 0C0372DF */ jal func_800DCB7C /* A18998 80242778 27A70034 */ addiu $a3, $sp, 0x34 /* A1899C 8024277C 1040000A */ beqz $v0, .L802427A8 -/* A189A0 80242780 00000000 */ nop +/* A189A0 80242780 00000000 */ nop /* A189A4 80242784 860200A8 */ lh $v0, 0xa8($s0) /* A189A8 80242788 C7A20038 */ lwc1 $f2, 0x38($sp) /* A189AC 8024278C 44820000 */ mtc1 $v0, $f0 -/* A189B0 80242790 00000000 */ nop +/* A189B0 80242790 00000000 */ nop /* A189B4 80242794 46800020 */ cvt.s.w $f0, $f0 /* A189B8 80242798 4600103C */ c.lt.s $f2, $f0 -/* A189BC 8024279C 00000000 */ nop +/* A189BC 8024279C 00000000 */ nop /* A189C0 802427A0 45030001 */ bc1tl .L802427A8 /* A189C4 802427A4 24110001 */ addiu $s1, $zero, 1 .L802427A8: /* A189C8 802427A8 12200008 */ beqz $s1, .L802427CC -/* A189CC 802427AC 00000000 */ nop +/* A189CC 802427AC 00000000 */ nop /* A189D0 802427B0 C7A00030 */ lwc1 $f0, 0x30($sp) /* A189D4 802427B4 3C013FF0 */ lui $at, 0x3ff0 /* A189D8 802427B8 44811800 */ mtc1 $at, $f3 @@ -130,24 +130,24 @@ glabel func_80242618_A18838 /* A18A20 80242800 44800800 */ mtc1 $zero, $f1 /* A18A24 80242804 460030A1 */ cvt.d.s $f2, $f6 /* A18A28 80242808 4620103C */ c.lt.d $f2, $f0 -/* A18A2C 8024280C 00000000 */ nop +/* A18A2C 8024280C 00000000 */ nop /* A18A30 80242810 45010009 */ bc1t .L80242838 -/* A18A34 80242814 00000000 */ nop +/* A18A34 80242814 00000000 */ nop /* A18A38 80242818 3C014010 */ lui $at, 0x4010 /* A18A3C 8024281C 44810800 */ mtc1 $at, $f1 /* A18A40 80242820 44800000 */ mtc1 $zero, $f0 -/* A18A44 80242824 00000000 */ nop +/* A18A44 80242824 00000000 */ nop /* A18A48 80242828 4622003C */ c.lt.d $f0, $f2 -/* A18A4C 8024282C 00000000 */ nop +/* A18A4C 8024282C 00000000 */ nop /* A18A50 80242830 4500000A */ bc1f .L8024285C -/* A18A54 80242834 00000000 */ nop +/* A18A54 80242834 00000000 */ nop .L80242838: /* A18A58 80242838 3C018024 */ lui $at, %hi(D_80244E78) /* A18A5C 8024283C D4224E78 */ ldc1 $f2, %lo(D_80244E78)($at) /* A18A60 80242840 46003187 */ neg.s $f6, $f6 /* A18A64 80242844 46003021 */ cvt.d.s $f0, $f6 /* A18A68 80242848 46220002 */ mul.d $f0, $f0, $f2 -/* A18A6C 8024284C 00000000 */ nop +/* A18A6C 8024284C 00000000 */ nop /* A18A70 80242850 46202000 */ add.d $f0, $f4, $f0 .L80242854: /* A18A74 80242854 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242898_A18AB8.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242898_A18AB8.s index cab346ae19..1271f125a0 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242898_A18AB8.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242898_A18AB8.s @@ -16,7 +16,7 @@ glabel func_80242898_A18AB8 /* A18AE4 802428C4 A462008E */ sh $v0, 0x8e($v1) /* A18AE8 802428C8 00021400 */ sll $v0, $v0, 0x10 /* A18AEC 802428CC 1C400004 */ bgtz $v0, .L802428E0 -/* A18AF0 802428D0 00000000 */ nop +/* A18AF0 802428D0 00000000 */ nop /* A18AF4 802428D4 AE000074 */ sw $zero, 0x74($s0) /* A18AF8 802428D8 A460008E */ sh $zero, 0x8e($v1) /* A18AFC 802428DC AE200070 */ sw $zero, 0x70($s1) diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s index 5d94b79ebd..71a03f6acc 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s @@ -55,7 +55,7 @@ glabel func_802428F4_A18B14 /* A18BD8 802429B8 8E4300B0 */ lw $v1, 0xb0($s2) /* A18BDC 802429BC 30620004 */ andi $v0, $v1, 4 /* A18BE0 802429C0 10400007 */ beqz $v0, .L802429E0 -/* A18BE4 802429C4 00000000 */ nop +/* A18BE4 802429C4 00000000 */ nop /* A18BE8 802429C8 824200B4 */ lb $v0, 0xb4($s2) /* A18BEC 802429CC 1440003A */ bnez $v0, .L80242AB8 /* A18BF0 802429D0 0000102D */ daddu $v0, $zero, $zero @@ -67,56 +67,66 @@ glabel func_802428F4_A18B14 /* A18C04 802429E4 2C620015 */ sltiu $v0, $v1, 0x15 /* A18C08 802429E8 10400032 */ beqz $v0, .L80242AB4 /* A18C0C 802429EC 00031080 */ sll $v0, $v1, 2 -/* A18C10 802429F0 3C018024 */ lui $at, %hi(D_80244E80) +/* A18C10 802429F0 3C018024 */ lui $at, %hi(jtbl_80244E80_A1B0A0) /* A18C14 802429F4 00220821 */ addu $at, $at, $v0 -/* A18C18 802429F8 8C224E80 */ lw $v0, %lo(D_80244E80)($at) +/* A18C18 802429F8 8C224E80 */ lw $v0, %lo(jtbl_80244E80_A1B0A0)($at) /* A18C1C 802429FC 00400008 */ jr $v0 -/* A18C20 80242A00 00000000 */ nop +/* A18C20 80242A00 00000000 */ nop +glabel L80242A04_A18C24 /* A18C24 80242A04 0280202D */ daddu $a0, $s4, $zero /* A18C28 80242A08 0200282D */ daddu $a1, $s0, $zero /* A18C2C 80242A0C 0C0903FC */ jal func_80240FF0_A17210 /* A18C30 80242A10 0260302D */ daddu $a2, $s3, $zero +glabel L80242A14_A18C34 /* A18C34 80242A14 0280202D */ daddu $a0, $s4, $zero /* A18C38 80242A18 0200282D */ daddu $a1, $s0, $zero /* A18C3C 80242A1C 0C090468 */ jal func_802411A0_A173C0 /* A18C40 80242A20 0260302D */ daddu $a2, $s3, $zero /* A18C44 80242A24 08090AAE */ j .L80242AB8 /* A18C48 80242A28 0000102D */ daddu $v0, $zero, $zero +glabel L80242A2C_A18C4C /* A18C4C 80242A2C 0280202D */ daddu $a0, $s4, $zero /* A18C50 80242A30 0200282D */ daddu $a1, $s0, $zero /* A18C54 80242A34 0C0905F2 */ jal hos_02_UnkNpcAIFunc1 /* A18C58 80242A38 0260302D */ daddu $a2, $s3, $zero +glabel L80242A3C_A18C5C /* A18C5C 80242A3C 0280202D */ daddu $a0, $s4, $zero /* A18C60 80242A40 0200282D */ daddu $a1, $s0, $zero /* A18C64 80242A44 0C090622 */ jal func_80241888_A17AA8 /* A18C68 80242A48 0260302D */ daddu $a2, $s3, $zero /* A18C6C 80242A4C 08090AAE */ j .L80242AB8 /* A18C70 80242A50 0000102D */ daddu $v0, $zero, $zero +glabel L80242A54_A18C74 /* A18C74 80242A54 0280202D */ daddu $a0, $s4, $zero /* A18C78 80242A58 0200282D */ daddu $a1, $s0, $zero /* A18C7C 80242A5C 0C0906F3 */ jal hos_02_UnkNpcAIFunc2 /* A18C80 80242A60 0260302D */ daddu $a2, $s3, $zero +glabel L80242A64_A18C84 /* A18C84 80242A64 0280202D */ daddu $a0, $s4, $zero /* A18C88 80242A68 0200282D */ daddu $a1, $s0, $zero /* A18C8C 80242A6C 0C090711 */ jal func_80241C44_A17E64 /* A18C90 80242A70 0260302D */ daddu $a2, $s3, $zero /* A18C94 80242A74 08090AAE */ j .L80242AB8 /* A18C98 80242A78 0000102D */ daddu $v0, $zero, $zero +glabel L80242A7C_A18C9C /* A18C9C 80242A7C 0280202D */ daddu $a0, $s4, $zero /* A18CA0 80242A80 0200282D */ daddu $a1, $s0, $zero /* A18CA4 80242A84 0C09093A */ jal func_802424E8_A18708 /* A18CA8 80242A88 0260302D */ daddu $a2, $s3, $zero +glabel L80242A8C_A18CAC /* A18CAC 80242A8C 0280202D */ daddu $a0, $s4, $zero /* A18CB0 80242A90 0200282D */ daddu $a1, $s0, $zero /* A18CB4 80242A94 0C090986 */ jal func_80242618_A18838 /* A18CB8 80242A98 0260302D */ daddu $a2, $s3, $zero /* A18CBC 80242A9C 08090AAE */ j .L80242AB8 /* A18CC0 80242AA0 0000102D */ daddu $v0, $zero, $zero +glabel L80242AA4_A18CC4 /* A18CC4 80242AA4 0280202D */ daddu $a0, $s4, $zero /* A18CC8 80242AA8 0200282D */ daddu $a1, $s0, $zero /* A18CCC 80242AAC 0C090A26 */ jal func_80242898_A18AB8 /* A18CD0 80242AB0 0260302D */ daddu $a2, $s3, $zero .L80242AB4: +glabel L80242AB4_A18CD4 /* A18CD4 80242AB4 0000102D */ daddu $v0, $zero, $zero .L80242AB8: /* A18CD8 80242AB8 8FBF0048 */ lw $ra, 0x48($sp) @@ -128,4 +138,4 @@ glabel func_802428F4_A18B14 /* A18CF0 80242AD0 8FB00030 */ lw $s0, 0x30($sp) /* A18CF4 80242AD4 03E00008 */ jr $ra /* A18CF8 80242AD8 27BD0050 */ addiu $sp, $sp, 0x50 -/* A18CFC 80242ADC 00000000 */ nop +/* A18CFC 80242ADC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1B100/func_80240000_A1B100.s b/asm/nonmatchings/world/area_hos/hos_03/A1B100/func_80240000_A1B100.s index 2ded107f08..90a3c7c175 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1B100/func_80240000_A1B100.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1B100/func_80240000_A1B100.s @@ -13,4 +13,4 @@ glabel func_80240000_A1B100 /* A1B120 80240020 24020002 */ addiu $v0, $zero, 2 /* A1B124 80240024 03E00008 */ jr $ra /* A1B128 80240028 27BD0018 */ addiu $sp, $sp, 0x18 -/* A1B12C 8024002C 00000000 */ nop +/* A1B12C 8024002C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240A50_A1BB50.s b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240A50_A1BB50.s index 1de1756e06..df3c3914e8 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240A50_A1BB50.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240A50_A1BB50.s @@ -8,5 +8,5 @@ glabel func_80240A50_A1BB50 /* A1BB5C 80240A5C AC820084 */ sw $v0, 0x84($a0) /* A1BB60 80240A60 03E00008 */ jr $ra /* A1BB64 80240A64 24020002 */ addiu $v0, $zero, 2 -/* A1BB68 80240A68 00000000 */ nop -/* A1BB6C 80240A6C 00000000 */ nop +/* A1BB68 80240A68 00000000 */ nop +/* A1BB6C 80240A6C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80240CB0_A1BDB0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80240CB0_A1BDB0.s index abb4c0b6e7..cabffc0191 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80240CB0_A1BDB0.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80240CB0_A1BDB0.s @@ -47,7 +47,7 @@ glabel func_80240CB0_A1BDB0 /* A1BE58 80240D58 0C0123F5 */ jal is_point_within_region /* A1BE5C 80240D5C 8E070038 */ lw $a3, 0x38($s0) /* A1BE60 80240D60 1040000E */ beqz $v0, .L80240D9C -/* A1BE64 80240D64 00000000 */ nop +/* A1BE64 80240D64 00000000 */ nop /* A1BE68 80240D68 8E2200D0 */ lw $v0, 0xd0($s1) /* A1BE6C 80240D6C C60C0038 */ lwc1 $f12, 0x38($s0) /* A1BE70 80240D70 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240CB0_A1BDB0 /* A1BE84 80240D84 468031A0 */ cvt.s.w $f6, $f6 /* A1BE88 80240D88 44073000 */ mfc1 $a3, $f6 /* A1BE8C 80240D8C 0C00A720 */ jal atan2 -/* A1BE90 80240D90 00000000 */ nop +/* A1BE90 80240D90 00000000 */ nop /* A1BE94 80240D94 08090373 */ j .L80240DCC /* A1BE98 80240D98 E600000C */ swc1 $f0, 0xc($s0) .L80240D9C: @@ -66,7 +66,7 @@ glabel func_80240CB0_A1BDB0 /* A1BEA0 80240DA0 2404003C */ addiu $a0, $zero, 0x3c /* A1BEA4 80240DA4 C60C000C */ lwc1 $f12, 0xc($s0) /* A1BEA8 80240DA8 44820000 */ mtc1 $v0, $f0 -/* A1BEAC 80240DAC 00000000 */ nop +/* A1BEAC 80240DAC 00000000 */ nop /* A1BEB0 80240DB0 46800020 */ cvt.s.w $f0, $f0 /* A1BEB4 80240DB4 46006300 */ add.s $f12, $f12, $f0 /* A1BEB8 80240DB8 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240CB0_A1BDB0 /* A1BEDC 80240DDC 8E2200D0 */ lw $v0, 0xd0($s1) /* A1BEE0 80240DE0 8C420014 */ lw $v0, 0x14($v0) /* A1BEE4 80240DE4 04410004 */ bgez $v0, .L80240DF8 -/* A1BEE8 80240DE8 00000000 */ nop +/* A1BEE8 80240DE8 00000000 */ nop /* A1BEEC 80240DEC C6400000 */ lwc1 $f0, ($s2) /* A1BEF0 80240DF0 08090386 */ j .L80240E18 /* A1BEF4 80240DF4 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240CB0_A1BDB0 /* A1BEF8 80240DF8 3C018025 */ lui $at, %hi(D_8024BD70) /* A1BEFC 80240DFC D422BD70 */ ldc1 $f2, %lo(D_8024BD70)($at) /* A1BF00 80240E00 44820000 */ mtc1 $v0, $f0 -/* A1BF04 80240E04 00000000 */ nop +/* A1BF04 80240E04 00000000 */ nop /* A1BF08 80240E08 46800021 */ cvt.d.w $f0, $f0 /* A1BF0C 80240E0C 46220003 */ div.d $f0, $f0, $f2 /* A1BF10 80240E10 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240CB0_A1BDB0 /* A1BF24 80240E24 44801000 */ mtc1 $zero, $f2 /* A1BF28 80240E28 46000021 */ cvt.d.s $f0, $f0 /* A1BF2C 80240E2C 46220002 */ mul.d $f0, $f0, $f2 -/* A1BF30 80240E30 00000000 */ nop +/* A1BF30 80240E30 00000000 */ nop /* A1BF34 80240E34 24020001 */ addiu $v0, $zero, 1 /* A1BF38 80240E38 4620018D */ trunc.w.d $f6, $f0 /* A1BF3C 80240E3C E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80240E60_A1BF60.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80240E60_A1BF60.s index 51ab0a132f..5c6bd6798f 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80240E60_A1BF60.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80240E60_A1BF60.s @@ -34,7 +34,7 @@ glabel func_80240E60_A1BF60 /* A1BFD4 80240ED4 44803000 */ mtc1 $zero, $f6 /* A1BFD8 80240ED8 46000021 */ cvt.d.s $f0, $f0 /* A1BFDC 80240EDC 46260002 */ mul.d $f0, $f0, $f6 -/* A1BFE0 80240EE0 00000000 */ nop +/* A1BFE0 80240EE0 00000000 */ nop /* A1BFE4 80240EE4 24020001 */ addiu $v0, $zero, 1 /* A1BFE8 80240EE8 8E24006C */ lw $a0, 0x6c($s1) /* A1BFEC 80240EEC 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80240E60_A1BF60 /* A1C048 80240F48 C600003C */ lwc1 $f0, 0x3c($s0) /* A1C04C 80240F4C 4600C001 */ sub.s $f0, $f24, $f0 /* A1C050 80240F50 4600B03C */ c.lt.s $f22, $f0 -/* A1C054 80240F54 00000000 */ nop +/* A1C054 80240F54 00000000 */ nop /* A1C058 80240F58 4500001B */ bc1f .L80240FC8 /* A1C05C 80240F5C 34820010 */ ori $v0, $a0, 0x10 /* A1C060 80240F60 080903F2 */ j .L80240FC8 @@ -87,9 +87,9 @@ glabel func_80240E60_A1BF60 /* A1C0A4 80240FA4 C7A00034 */ lwc1 $f0, 0x34($sp) /* A1C0A8 80240FA8 4600D001 */ sub.s $f0, $f26, $f0 /* A1C0AC 80240FAC 4600B03C */ c.lt.s $f22, $f0 -/* A1C0B0 80240FB0 00000000 */ nop +/* A1C0B0 80240FB0 00000000 */ nop /* A1C0B4 80240FB4 45000004 */ bc1f .L80240FC8 -/* A1C0B8 80240FB8 00000000 */ nop +/* A1C0B8 80240FB8 00000000 */ nop /* A1C0BC 80240FBC 8E22006C */ lw $v0, 0x6c($s1) /* A1C0C0 80240FC0 34420010 */ ori $v0, $v0, 0x10 /* A1C0C4 80240FC4 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80240E60_A1BF60 /* A1C0CC 80240FCC 24030011 */ addiu $v1, $zero, 0x11 /* A1C0D0 80240FD0 30420011 */ andi $v0, $v0, 0x11 /* A1C0D4 80240FD4 14430039 */ bne $v0, $v1, .L802410BC -/* A1C0D8 80240FD8 00000000 */ nop +/* A1C0D8 80240FD8 00000000 */ nop /* A1C0DC 80240FDC 8E020000 */ lw $v0, ($s0) /* A1C0E0 80240FE0 30420008 */ andi $v0, $v0, 8 /* A1C0E4 80240FE4 1040000A */ beqz $v0, .L80241010 @@ -108,7 +108,7 @@ glabel func_80240E60_A1BF60 /* A1C0F4 80240FF4 D420BD78 */ ldc1 $f0, %lo(D_8024BD78)($at) /* A1C0F8 80240FF8 460010A1 */ cvt.d.s $f2, $f2 /* A1C0FC 80240FFC 46201082 */ mul.d $f2, $f2, $f0 -/* A1C100 80241000 00000000 */ nop +/* A1C100 80241000 00000000 */ nop /* A1C104 80241004 4600A021 */ cvt.d.s $f0, $f20 /* A1C108 80241008 0809041D */ j .L80241074 /* A1C10C 8024100C 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80240E60_A1BF60 /* A1C15C 8024105C D420BD80 */ ldc1 $f0, %lo(D_8024BD80)($at) /* A1C160 80241060 460010A1 */ cvt.d.s $f2, $f2 /* A1C164 80241064 46201082 */ mul.d $f2, $f2, $f0 -/* A1C168 80241068 00000000 */ nop +/* A1C168 80241068 00000000 */ nop /* A1C16C 8024106C 4600A021 */ cvt.d.s $f0, $f20 /* A1C170 80241070 46220000 */ add.d $f0, $f0, $f2 .L80241074: @@ -149,7 +149,7 @@ glabel func_80240E60_A1BF60 /* A1C190 80241090 46000005 */ abs.s $f0, $f0 /* A1C194 80241094 46000021 */ cvt.d.s $f0, $f0 /* A1C198 80241098 4622003C */ c.lt.d $f0, $f2 -/* A1C19C 8024109C 00000000 */ nop +/* A1C19C 8024109C 00000000 */ nop /* A1C1A0 802410A0 45000036 */ bc1f .L8024117C /* A1C1A4 802410A4 2403FFEF */ addiu $v1, $zero, -0x11 /* A1C1A8 802410A8 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80240E60_A1BF60 .L802410BC: /* A1C1BC 802410BC 8E220070 */ lw $v0, 0x70($s1) /* A1C1C0 802410C0 1840002E */ blez $v0, .L8024117C -/* A1C1C4 802410C4 00000000 */ nop +/* A1C1C4 802410C4 00000000 */ nop /* A1C1C8 802410C8 C62C0074 */ lwc1 $f12, 0x74($s1) /* A1C1CC 802410CC 0C00A8BB */ jal sin_deg /* A1C1D0 802410D0 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80240E60_A1BF60 /* A1C228 80241128 27A70030 */ addiu $a3, $sp, 0x30 .L8024112C: /* A1C22C 8024112C 10400007 */ beqz $v0, .L8024114C -/* A1C230 80241130 00000000 */ nop +/* A1C230 80241130 00000000 */ nop /* A1C234 80241134 4616A082 */ mul.s $f2, $f20, $f22 -/* A1C238 80241138 00000000 */ nop +/* A1C238 80241138 00000000 */ nop /* A1C23C 8024113C C7A0002C */ lwc1 $f0, 0x2c($sp) /* A1C240 80241140 461A0000 */ add.s $f0, $f0, $f26 /* A1C244 80241144 08090456 */ j .L80241158 /* A1C248 80241148 46020000 */ add.s $f0, $f0, $f2 .L8024114C: /* A1C24C 8024114C 4616A002 */ mul.s $f0, $f20, $f22 -/* A1C250 80241150 00000000 */ nop +/* A1C250 80241150 00000000 */ nop /* A1C254 80241154 4600C000 */ add.s $f0, $f24, $f0 .L80241158: /* A1C258 80241158 E600003C */ swc1 $f0, 0x3c($s0) /* A1C25C 8024115C 8E220074 */ lw $v0, 0x74($s1) /* A1C260 80241160 2442000A */ addiu $v0, $v0, 0xa /* A1C264 80241164 44826000 */ mtc1 $v0, $f12 -/* A1C268 80241168 00000000 */ nop +/* A1C268 80241168 00000000 */ nop /* A1C26C 8024116C 0C00A6C9 */ jal clamp_angle /* A1C270 80241170 46806320 */ cvt.s.w $f12, $f12 /* A1C274 80241174 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80240E60_A1BF60 /* A1C284 80241184 2442FFFF */ addiu $v0, $v0, -1 /* A1C288 80241188 8E430014 */ lw $v1, 0x14($s2) /* A1C28C 8024118C 04600048 */ bltz $v1, .L802412B0 -/* A1C290 80241190 00000000 */ nop +/* A1C290 80241190 00000000 */ nop /* A1C294 80241194 8E620074 */ lw $v0, 0x74($s3) /* A1C298 80241198 1C400042 */ bgtz $v0, .L802412A4 /* A1C29C 8024119C 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80240E60_A1BF60 /* A1C2A4 802411A4 860200A8 */ lh $v0, 0xa8($s0) /* A1C2A8 802411A8 C602003C */ lwc1 $f2, 0x3c($s0) /* A1C2AC 802411AC 44820000 */ mtc1 $v0, $f0 -/* A1C2B0 802411B0 00000000 */ nop +/* A1C2B0 802411B0 00000000 */ nop /* A1C2B4 802411B4 46800020 */ cvt.s.w $f0, $f0 /* A1C2B8 802411B8 46001080 */ add.s $f2, $f2, $f0 /* A1C2BC 802411BC 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80240E60_A1BF60 /* A1C2D8 802411D8 C440002C */ lwc1 $f0, 0x2c($v0) /* A1C2DC 802411DC 46000021 */ cvt.d.s $f0, $f0 /* A1C2E0 802411E0 4622003C */ c.lt.d $f0, $f2 -/* A1C2E4 802411E4 00000000 */ nop +/* A1C2E4 802411E4 00000000 */ nop /* A1C2E8 802411E8 4500002C */ bc1f .L8024129C /* A1C2EC 802411EC 02A0202D */ daddu $a0, $s5, $zero /* A1C2F0 802411F0 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80240E60_A1BF60 /* A1C32C 8024122C 3C01C1A0 */ lui $at, 0xc1a0 /* A1C330 80241230 44812000 */ mtc1 $at, $f4 /* A1C334 80241234 44834000 */ mtc1 $v1, $f8 -/* A1C338 80241238 00000000 */ nop +/* A1C338 80241238 00000000 */ nop /* A1C33C 8024123C 46804220 */ cvt.s.w $f8, $f8 /* A1C340 80241240 44074000 */ mfc1 $a3, $f8 /* A1C344 80241244 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80240E60_A1BF60 /* A1C3F8 802412F8 0C0123F5 */ jal is_point_within_region /* A1C3FC 802412FC 8E070038 */ lw $a3, 0x38($s0) /* A1C400 80241300 1040001A */ beqz $v0, .L8024136C -/* A1C404 80241304 00000000 */ nop +/* A1C404 80241304 00000000 */ nop /* A1C408 80241308 8E060038 */ lw $a2, 0x38($s0) /* A1C40C 8024130C 8E2200D0 */ lw $v0, 0xd0($s1) /* A1C410 80241310 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80240E60_A1BF60 /* A1C424 80241324 468073A0 */ cvt.s.w $f14, $f14 /* A1C428 80241328 C6020018 */ lwc1 $f2, 0x18($s0) /* A1C42C 8024132C 4600103C */ c.lt.s $f2, $f0 -/* A1C430 80241330 00000000 */ nop +/* A1C430 80241330 00000000 */ nop /* A1C434 80241334 4500000D */ bc1f .L8024136C /* A1C438 80241338 E7A00034 */ swc1 $f0, 0x34($sp) /* A1C43C 8024133C C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80240E60_A1BF60 /* A1C478 80241378 00621825 */ or $v1, $v1, $v0 /* A1C47C 8024137C 00741825 */ or $v1, $v1, $s4 /* A1C480 80241380 10600008 */ beqz $v1, .L802413A4 -/* A1C484 80241384 00000000 */ nop +/* A1C484 80241384 00000000 */ nop /* A1C488 80241388 8602008C */ lh $v0, 0x8c($s0) /* A1C48C 8024138C 14400031 */ bnez $v0, .L80241454 -/* A1C490 80241390 00000000 */ nop +/* A1C490 80241390 00000000 */ nop /* A1C494 80241394 8E050018 */ lw $a1, 0x18($s0) /* A1C498 80241398 8E06000C */ lw $a2, 0xc($s0) /* A1C49C 8024139C 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_80240E60_A1BF60 /* A1C4B0 802413B0 44801000 */ mtc1 $zero, $f2 /* A1C4B4 802413B4 46000021 */ cvt.d.s $f0, $f0 /* A1C4B8 802413B8 46220002 */ mul.d $f0, $f0, $f2 -/* A1C4BC 802413BC 00000000 */ nop +/* A1C4BC 802413BC 00000000 */ nop /* A1C4C0 802413C0 4620020D */ trunc.w.d $f8, $f0 /* A1C4C4 802413C4 E628007C */ swc1 $f8, 0x7c($s1) /* A1C4C8 802413C8 8E420004 */ lw $v0, 4($s2) /* A1C4CC 802413CC 18400021 */ blez $v0, .L80241454 -/* A1C4D0 802413D0 00000000 */ nop +/* A1C4D0 802413D0 00000000 */ nop /* A1C4D4 802413D4 8602008E */ lh $v0, 0x8e($s0) /* A1C4D8 802413D8 9603008E */ lhu $v1, 0x8e($s0) /* A1C4DC 802413DC 18400005 */ blez $v0, .L802413F4 @@ -375,7 +375,7 @@ glabel func_80240E60_A1BF60 /* A1C4E4 802413E4 A602008E */ sh $v0, 0x8e($s0) /* A1C4E8 802413E8 00021400 */ sll $v0, $v0, 0x10 /* A1C4EC 802413EC 1C400019 */ bgtz $v0, .L80241454 -/* A1C4F0 802413F0 00000000 */ nop +/* A1C4F0 802413F0 00000000 */ nop .L802413F4: /* A1C4F4 802413F4 240403E8 */ addiu $a0, $zero, 0x3e8 /* A1C4F8 802413F8 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80240E60_A1BF60 /* A1C540 80241440 18400003 */ blez $v0, .L80241450 /* A1C544 80241444 28620003 */ slti $v0, $v1, 3 /* A1C548 80241448 10400002 */ beqz $v0, .L80241454 -/* A1C54C 8024144C 00000000 */ nop +/* A1C54C 8024144C 00000000 */ nop .L80241450: /* A1C550 80241450 AE600070 */ sw $zero, 0x70($s3) .L80241454: diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241548_A1C648.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241548_A1C648.s index dad2e69bda..69c13bea53 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241548_A1C648.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241548_A1C648.s @@ -42,11 +42,11 @@ glabel func_80241548_A1C648 .L802415DC: /* A1C6DC 802415DC 8E220070 */ lw $v0, 0x70($s1) /* A1C6E0 802415E0 18400034 */ blez $v0, .L802416B4 -/* A1C6E4 802415E4 00000000 */ nop +/* A1C6E4 802415E4 00000000 */ nop /* A1C6E8 802415E8 C62C0074 */ lwc1 $f12, 0x74($s1) /* A1C6EC 802415EC 46806320 */ cvt.s.w $f12, $f12 /* A1C6F0 802415F0 44820000 */ mtc1 $v0, $f0 -/* A1C6F4 802415F4 00000000 */ nop +/* A1C6F4 802415F4 00000000 */ nop /* A1C6F8 802415F8 46800020 */ cvt.s.w $f0, $f0 /* A1C6FC 802415FC 46000021 */ cvt.d.s $f0, $f0 /* A1C700 80241600 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_80241548_A1C648 /* A1C760 80241660 27A70030 */ addiu $a3, $sp, 0x30 .L80241664: /* A1C764 80241664 10400007 */ beqz $v0, .L80241684 -/* A1C768 80241668 00000000 */ nop +/* A1C768 80241668 00000000 */ nop /* A1C76C 8024166C 4616A082 */ mul.s $f2, $f20, $f22 -/* A1C770 80241670 00000000 */ nop +/* A1C770 80241670 00000000 */ nop /* A1C774 80241674 C7A0002C */ lwc1 $f0, 0x2c($sp) /* A1C778 80241678 46180000 */ add.s $f0, $f0, $f24 /* A1C77C 8024167C 080905A4 */ j .L80241690 /* A1C780 80241680 46020000 */ add.s $f0, $f0, $f2 .L80241684: /* A1C784 80241684 4616A002 */ mul.s $f0, $f20, $f22 -/* A1C788 80241688 00000000 */ nop +/* A1C788 80241688 00000000 */ nop /* A1C78C 8024168C 4600D000 */ add.s $f0, $f26, $f0 .L80241690: /* A1C790 80241690 E600003C */ swc1 $f0, 0x3c($s0) /* A1C794 80241694 8E220074 */ lw $v0, 0x74($s1) /* A1C798 80241698 2442000A */ addiu $v0, $v0, 0xa /* A1C79C 8024169C 44826000 */ mtc1 $v0, $f12 -/* A1C7A0 802416A0 00000000 */ nop +/* A1C7A0 802416A0 00000000 */ nop /* A1C7A4 802416A4 0C00A6C9 */ jal clamp_angle /* A1C7A8 802416A8 46806320 */ cvt.s.w $f12, $f12 /* A1C7AC 802416AC 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_80241548_A1C648 /* A1C7C0 802416C0 860200A8 */ lh $v0, 0xa8($s0) /* A1C7C4 802416C4 C600003C */ lwc1 $f0, 0x3c($s0) /* A1C7C8 802416C8 44821000 */ mtc1 $v0, $f2 -/* A1C7CC 802416CC 00000000 */ nop +/* A1C7CC 802416CC 00000000 */ nop /* A1C7D0 802416D0 468010A0 */ cvt.s.w $f2, $f2 /* A1C7D4 802416D4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A1C7D8 802416D8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_80241548_A1C648 /* A1C7F4 802416F4 46240000 */ add.d $f0, $f0, $f4 /* A1C7F8 802416F8 460010A1 */ cvt.d.s $f2, $f2 /* A1C7FC 802416FC 4620103C */ c.lt.d $f2, $f0 -/* A1C800 80241700 00000000 */ nop +/* A1C800 80241700 00000000 */ nop /* A1C804 80241704 4500002E */ bc1f .L802417C0 /* A1C808 80241708 0280202D */ daddu $a0, $s4, $zero /* A1C80C 8024170C 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_80241548_A1C648 /* A1C84C 8024174C 3C01C1A0 */ lui $at, 0xc1a0 /* A1C850 80241750 44812000 */ mtc1 $at, $f4 /* A1C854 80241754 44834000 */ mtc1 $v1, $f8 -/* A1C858 80241758 00000000 */ nop +/* A1C858 80241758 00000000 */ nop /* A1C85C 8024175C 46804220 */ cvt.s.w $f8, $f8 /* A1C860 80241760 44074000 */ mfc1 $a3, $f8 /* A1C864 80241764 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_80241548_A1C648 .L802417C0: /* A1C8C0 802417C0 8602008C */ lh $v0, 0x8c($s0) /* A1C8C4 802417C4 14400025 */ bnez $v0, .L8024185C -/* A1C8C8 802417C8 00000000 */ nop +/* A1C8C8 802417C8 00000000 */ nop /* A1C8CC 802417CC 8602008E */ lh $v0, 0x8e($s0) /* A1C8D0 802417D0 1C400022 */ bgtz $v0, .L8024185C -/* A1C8D4 802417D4 00000000 */ nop +/* A1C8D4 802417D4 00000000 */ nop /* A1C8D8 802417D8 8E620074 */ lw $v0, 0x74($s3) /* A1C8DC 802417DC 2442FFFF */ addiu $v0, $v0, -1 /* A1C8E0 802417E0 1840001D */ blez $v0, .L80241858 @@ -183,7 +183,7 @@ glabel func_80241548_A1C648 /* A1C8EC 802417EC 9442002A */ lhu $v0, 0x2a($v0) /* A1C8F0 802417F0 30420010 */ andi $v0, $v0, 0x10 /* A1C8F4 802417F4 14400007 */ bnez $v0, .L80241814 -/* A1C8F8 802417F8 00000000 */ nop +/* A1C8F8 802417F8 00000000 */ nop /* A1C8FC 802417FC C600000C */ lwc1 $f0, 0xc($s0) /* A1C900 80241800 3C014334 */ lui $at, 0x4334 /* A1C904 80241804 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241970_A1CA70.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241970_A1CA70.s index cf7ce58c5d..9659155504 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241970_A1CA70.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241970_A1CA70.s @@ -60,18 +60,18 @@ glabel func_80241970_A1CA70 /* A1CB48 80241A48 C6200038 */ lwc1 $f0, 0x38($s1) /* A1CB4C 80241A4C 4600018D */ trunc.w.s $f6, $f0 /* A1CB50 80241A50 44023000 */ mfc1 $v0, $f6 -/* A1CB54 80241A54 00000000 */ nop +/* A1CB54 80241A54 00000000 */ nop /* A1CB58 80241A58 A6420010 */ sh $v0, 0x10($s2) /* A1CB5C 80241A5C C620003C */ lwc1 $f0, 0x3c($s1) /* A1CB60 80241A60 4600018D */ trunc.w.s $f6, $f0 /* A1CB64 80241A64 44023000 */ mfc1 $v0, $f6 -/* A1CB68 80241A68 00000000 */ nop +/* A1CB68 80241A68 00000000 */ nop /* A1CB6C 80241A6C A6420012 */ sh $v0, 0x12($s2) /* A1CB70 80241A70 C6200040 */ lwc1 $f0, 0x40($s1) /* A1CB74 80241A74 A2430007 */ sb $v1, 7($s2) /* A1CB78 80241A78 4600018D */ trunc.w.s $f6, $f0 /* A1CB7C 80241A7C 44023000 */ mfc1 $v0, $f6 -/* A1CB80 80241A80 00000000 */ nop +/* A1CB80 80241A80 00000000 */ nop /* A1CB84 80241A84 A6420014 */ sh $v0, 0x14($s2) .L80241A88: /* A1CB88 80241A88 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241B08_A1CC08.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241B08_A1CC08.s index 237468e9a5..25110468cc 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241B08_A1CC08.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241B08_A1CC08.s @@ -42,9 +42,9 @@ glabel func_80241B08_A1CC08 /* A1CC9C 80241B9C 44801800 */ mtc1 $zero, $f3 /* A1CCA0 80241BA0 46002021 */ cvt.d.s $f0, $f4 /* A1CCA4 80241BA4 4620103E */ c.le.d $f2, $f0 -/* A1CCA8 80241BA8 00000000 */ nop +/* A1CCA8 80241BA8 00000000 */ nop /* A1CCAC 80241BAC 45000030 */ bc1f .L80241C70 -/* A1CCB0 80241BB0 00000000 */ nop +/* A1CCB0 80241BB0 00000000 */ nop /* A1CCB4 80241BB4 C600003C */ lwc1 $f0, 0x3c($s0) /* A1CCB8 80241BB8 46040000 */ add.s $f0, $f0, $f4 /* A1CCBC 80241BBC E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_80241B08_A1CC08 /* A1CD1C 80241C1C 27A70020 */ addiu $a3, $sp, 0x20 .L80241C20: /* A1CD20 80241C20 1040000B */ beqz $v0, .L80241C50 -/* A1CD24 80241C24 00000000 */ nop +/* A1CD24 80241C24 00000000 */ nop /* A1CD28 80241C28 C7A0001C */ lwc1 $f0, 0x1c($sp) /* A1CD2C 80241C2C 46140080 */ add.s $f2, $f0, $f20 /* A1CD30 80241C30 C600003C */ lwc1 $f0, 0x3c($s0) /* A1CD34 80241C34 4600103E */ c.le.s $f2, $f0 -/* A1CD38 80241C38 00000000 */ nop +/* A1CD38 80241C38 00000000 */ nop /* A1CD3C 80241C3C 4500008D */ bc1f .L80241E74 -/* A1CD40 80241C40 00000000 */ nop +/* A1CD40 80241C40 00000000 */ nop /* A1CD44 80241C44 E602003C */ swc1 $f2, 0x3c($s0) /* A1CD48 80241C48 0809079D */ j .L80241E74 /* A1CD4C 80241C4C AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_80241B08_A1CC08 /* A1CD50 80241C50 C602003C */ lwc1 $f2, 0x3c($s0) /* A1CD54 80241C54 C6000064 */ lwc1 $f0, 0x64($s0) /* A1CD58 80241C58 4602003E */ c.le.s $f0, $f2 -/* A1CD5C 80241C5C 00000000 */ nop +/* A1CD5C 80241C5C 00000000 */ nop /* A1CD60 80241C60 45030084 */ bc1tl .L80241E74 /* A1CD64 80241C64 AE400070 */ sw $zero, 0x70($s2) /* A1CD68 80241C68 0809079D */ j .L80241E74 -/* A1CD6C 80241C6C 00000000 */ nop +/* A1CD6C 80241C6C 00000000 */ nop .L80241C70: /* A1CD70 80241C70 4622003C */ c.lt.d $f0, $f2 -/* A1CD74 80241C74 00000000 */ nop +/* A1CD74 80241C74 00000000 */ nop /* A1CD78 80241C78 4500007E */ bc1f .L80241E74 -/* A1CD7C 80241C7C 00000000 */ nop +/* A1CD7C 80241C7C 00000000 */ nop /* A1CD80 80241C80 9602008E */ lhu $v0, 0x8e($s0) /* A1CD84 80241C84 24420001 */ addiu $v0, $v0, 1 /* A1CD88 80241C88 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_80241B08_A1CC08 /* A1CD94 80241C94 00021403 */ sra $v0, $v0, 0x10 /* A1CD98 80241C98 0043102A */ slt $v0, $v0, $v1 /* A1CD9C 80241C9C 14400026 */ bnez $v0, .L80241D38 -/* A1CDA0 80241CA0 00000000 */ nop +/* A1CDA0 80241CA0 00000000 */ nop /* A1CDA4 80241CA4 C60C0038 */ lwc1 $f12, 0x38($s0) /* A1CDA8 80241CA8 C60E0040 */ lwc1 $f14, 0x40($s0) /* A1CDAC 80241CAC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_80241B08_A1CC08 /* A1CDD8 80241CD8 8E62001C */ lw $v0, 0x1c($s3) /* A1CDDC 80241CDC 46001005 */ abs.s $f0, $f2 /* A1CDE0 80241CE0 44822000 */ mtc1 $v0, $f4 -/* A1CDE4 80241CE4 00000000 */ nop +/* A1CDE4 80241CE4 00000000 */ nop /* A1CDE8 80241CE8 46802120 */ cvt.s.w $f4, $f4 /* A1CDEC 80241CEC 4600203C */ c.lt.s $f4, $f0 -/* A1CDF0 80241CF0 00000000 */ nop +/* A1CDF0 80241CF0 00000000 */ nop /* A1CDF4 80241CF4 4500000D */ bc1f .L80241D2C -/* A1CDF8 80241CF8 00000000 */ nop +/* A1CDF8 80241CF8 00000000 */ nop /* A1CDFC 80241CFC 44800000 */ mtc1 $zero, $f0 /* A1CE00 80241D00 C614000C */ lwc1 $f20, 0xc($s0) /* A1CE04 80241D04 4600103C */ c.lt.s $f2, $f0 -/* A1CE08 80241D08 00000000 */ nop +/* A1CE08 80241D08 00000000 */ nop /* A1CE0C 80241D0C 45000006 */ bc1f .L80241D28 /* A1CE10 80241D10 00021023 */ negu $v0, $v0 /* A1CE14 80241D14 44820000 */ mtc1 $v0, $f0 -/* A1CE18 80241D18 00000000 */ nop +/* A1CE18 80241D18 00000000 */ nop /* A1CE1C 80241D1C 46800020 */ cvt.s.w $f0, $f0 /* A1CE20 80241D20 0809074B */ j .L80241D2C /* A1CE24 80241D24 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_80241B08_A1CC08 /* A1CE4C 80241D4C C600001C */ lwc1 $f0, 0x1c($s0) /* A1CE50 80241D50 46001080 */ add.s $f2, $f2, $f0 /* A1CE54 80241D54 4616103C */ c.lt.s $f2, $f22 -/* A1CE58 80241D58 00000000 */ nop +/* A1CE58 80241D58 00000000 */ nop /* A1CE5C 80241D5C 45020045 */ bc1fl .L80241E74 /* A1CE60 80241D60 E602003C */ swc1 $f2, 0x3c($s0) /* A1CE64 80241D64 0809079C */ j .L80241E70 @@ -169,7 +169,7 @@ glabel func_80241B08_A1CC08 /* A1CE7C 80241D7C C600001C */ lwc1 $f0, 0x1c($s0) /* A1CE80 80241D80 C604003C */ lwc1 $f4, 0x3c($s0) /* A1CE84 80241D84 44821000 */ mtc1 $v0, $f2 -/* A1CE88 80241D88 00000000 */ nop +/* A1CE88 80241D88 00000000 */ nop /* A1CE8C 80241D8C 468010A0 */ cvt.s.w $f2, $f2 /* A1CE90 80241D90 46000005 */ abs.s $f0, $f0 /* A1CE94 80241D94 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_80241B08_A1CC08 /* A1CED0 80241DD0 0C0372DF */ jal func_800DCB7C /* A1CED4 80241DD4 27A70020 */ addiu $a3, $sp, 0x20 /* A1CED8 80241DD8 10400015 */ beqz $v0, .L80241E30 -/* A1CEDC 80241DDC 00000000 */ nop +/* A1CEDC 80241DDC 00000000 */ nop /* A1CEE0 80241DE0 860200A8 */ lh $v0, 0xa8($s0) /* A1CEE4 80241DE4 C604001C */ lwc1 $f4, 0x1c($s0) /* A1CEE8 80241DE8 44820000 */ mtc1 $v0, $f0 -/* A1CEEC 80241DEC 00000000 */ nop +/* A1CEEC 80241DEC 00000000 */ nop /* A1CEF0 80241DF0 46800020 */ cvt.s.w $f0, $f0 /* A1CEF4 80241DF4 46002085 */ abs.s $f2, $f4 /* A1CEF8 80241DF8 46020000 */ add.s $f0, $f0, $f2 /* A1CEFC 80241DFC C7A20024 */ lwc1 $f2, 0x24($sp) /* A1CF00 80241E00 4600103E */ c.le.s $f2, $f0 -/* A1CF04 80241E04 00000000 */ nop +/* A1CF04 80241E04 00000000 */ nop /* A1CF08 80241E08 45000005 */ bc1f .L80241E20 -/* A1CF0C 80241E0C 00000000 */ nop +/* A1CF0C 80241E0C 00000000 */ nop /* A1CF10 80241E10 C7A0001C */ lwc1 $f0, 0x1c($sp) /* A1CF14 80241E14 AE00001C */ sw $zero, 0x1c($s0) /* A1CF18 80241E18 0809079D */ j .L80241E74 @@ -217,13 +217,13 @@ glabel func_80241B08_A1CC08 /* A1CF34 80241E34 860200A8 */ lh $v0, 0xa8($s0) /* A1CF38 80241E38 46163081 */ sub.s $f2, $f6, $f22 /* A1CF3C 80241E3C 44820000 */ mtc1 $v0, $f0 -/* A1CF40 80241E40 00000000 */ nop +/* A1CF40 80241E40 00000000 */ nop /* A1CF44 80241E44 46800020 */ cvt.s.w $f0, $f0 /* A1CF48 80241E48 46001080 */ add.s $f2, $f2, $f0 /* A1CF4C 80241E4C C604001C */ lwc1 $f4, 0x1c($s0) /* A1CF50 80241E50 46002005 */ abs.s $f0, $f4 /* A1CF54 80241E54 4602003C */ c.lt.s $f0, $f2 -/* A1CF58 80241E58 00000000 */ nop +/* A1CF58 80241E58 00000000 */ nop /* A1CF5C 80241E5C 45020005 */ bc1fl .L80241E74 /* A1CF60 80241E60 AE00001C */ sw $zero, 0x1c($s0) /* A1CF64 80241E64 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241E98_A1CF98.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241E98_A1CF98.s index ea01e8fe3c..e14d7e5e8e 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241E98_A1CF98.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241E98_A1CF98.s @@ -49,15 +49,15 @@ glabel func_80241E98_A1CF98 /* A1D040 80241F40 44802000 */ mtc1 $zero, $f4 /* A1D044 80241F44 460010A1 */ cvt.d.s $f2, $f2 /* A1D048 80241F48 46241082 */ mul.d $f2, $f2, $f4 -/* A1D04C 80241F4C 00000000 */ nop +/* A1D04C 80241F4C 00000000 */ nop /* A1D050 80241F50 C7A0001C */ lwc1 $f0, 0x1c($sp) /* A1D054 80241F54 46000021 */ cvt.d.s $f0, $f0 /* A1D058 80241F58 46240002 */ mul.d $f0, $f0, $f4 -/* A1D05C 80241F5C 00000000 */ nop +/* A1D05C 80241F5C 00000000 */ nop /* A1D060 80241F60 3C013FE0 */ lui $at, 0x3fe0 /* A1D064 80241F64 44812800 */ mtc1 $at, $f5 /* A1D068 80241F68 44802000 */ mtc1 $zero, $f4 -/* A1D06C 80241F6C 00000000 */ nop +/* A1D06C 80241F6C 00000000 */ nop /* A1D070 80241F70 46241080 */ add.d $f2, $f2, $f4 /* A1D074 80241F74 AE000074 */ sw $zero, 0x74($s0) /* A1D078 80241F78 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s index 8ebd79c537..5f16f5b92e 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s @@ -54,7 +54,7 @@ glabel func_80241FBC_A1D0BC /* A1D17C 8024207C 8E4300B0 */ lw $v1, 0xb0($s2) /* A1D180 80242080 30620004 */ andi $v0, $v1, 4 /* A1D184 80242084 10400007 */ beqz $v0, .L802420A4 -/* A1D188 80242088 00000000 */ nop +/* A1D188 80242088 00000000 */ nop /* A1D18C 8024208C 824200B4 */ lb $v0, 0xb4($s2) /* A1D190 80242090 1440003C */ bnez $v0, .L80242184 /* A1D194 80242094 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_80241FBC_A1D0BC /* A1D1A8 802420A8 2C62000F */ sltiu $v0, $v1, 0xf /* A1D1AC 802420AC 10400034 */ beqz $v0, .L80242180 /* A1D1B0 802420B0 00031080 */ sll $v0, $v1, 2 -/* A1D1B4 802420B4 3C018025 */ lui $at, %hi(D_8024BD88) +/* A1D1B4 802420B4 3C018025 */ lui $at, %hi(jtbl_8024BD88_A26E88) /* A1D1B8 802420B8 00220821 */ addu $at, $at, $v0 -/* A1D1BC 802420BC 8C22BD88 */ lw $v0, %lo(D_8024BD88)($at) +/* A1D1BC 802420BC 8C22BD88 */ lw $v0, %lo(jtbl_8024BD88_A26E88)($at) /* A1D1C0 802420C0 00400008 */ jr $v0 -/* A1D1C4 802420C4 00000000 */ nop +/* A1D1C4 802420C4 00000000 */ nop +glabel L802420C8_A1D1C8 /* A1D1C8 802420C8 0280202D */ daddu $a0, $s4, $zero /* A1D1CC 802420CC 0200282D */ daddu $a1, $s0, $zero /* A1D1D0 802420D0 0C09032C */ jal func_80240CB0_A1BDB0 /* A1D1D4 802420D4 0260302D */ daddu $a2, $s3, $zero +glabel L802420D8_A1D1D8 /* A1D1D8 802420D8 0280202D */ daddu $a0, $s4, $zero /* A1D1DC 802420DC 0200282D */ daddu $a1, $s0, $zero /* A1D1E0 802420E0 0C090398 */ jal func_80240E60_A1BF60 /* A1D1E4 802420E4 0260302D */ daddu $a2, $s3, $zero /* A1D1E8 802420E8 08090861 */ j .L80242184 /* A1D1EC 802420EC 0000102D */ daddu $v0, $zero, $zero +glabel L802420F0_A1D1F0 /* A1D1F0 802420F0 0280202D */ daddu $a0, $s4, $zero /* A1D1F4 802420F4 0200282D */ daddu $a1, $s0, $zero /* A1D1F8 802420F8 0C090522 */ jal hos_03_UnkNpcAIFunc1 /* A1D1FC 802420FC 0260302D */ daddu $a2, $s3, $zero +glabel L80242100_A1D200 /* A1D200 80242100 0280202D */ daddu $a0, $s4, $zero /* A1D204 80242104 0200282D */ daddu $a1, $s0, $zero /* A1D208 80242108 0C090552 */ jal func_80241548_A1C648 /* A1D20C 8024210C 0260302D */ daddu $a2, $s3, $zero /* A1D210 80242110 08090861 */ j .L80242184 /* A1D214 80242114 0000102D */ daddu $v0, $zero, $zero +glabel L80242118_A1D218 /* A1D218 80242118 0280202D */ daddu $a0, $s4, $zero /* A1D21C 8024211C 0200282D */ daddu $a1, $s0, $zero /* A1D220 80242120 0C090623 */ jal hos_03_UnkNpcAIFunc2 /* A1D224 80242124 0260302D */ daddu $a2, $s3, $zero +glabel L80242128_A1D228 /* A1D228 80242128 0280202D */ daddu $a0, $s4, $zero /* A1D22C 8024212C 0200282D */ daddu $a1, $s0, $zero /* A1D230 80242130 0C090641 */ jal func_80241904_A1CA04 /* A1D234 80242134 0260302D */ daddu $a2, $s3, $zero /* A1D238 80242138 08090861 */ j .L80242184 /* A1D23C 8024213C 0000102D */ daddu $v0, $zero, $zero +glabel L80242140_A1D240 /* A1D240 80242140 0280202D */ daddu $a0, $s4, $zero /* A1D244 80242144 0200282D */ daddu $a1, $s0, $zero /* A1D248 80242148 0C09065C */ jal func_80241970_A1CA70 /* A1D24C 8024214C 0260302D */ daddu $a2, $s3, $zero /* A1D250 80242150 08090861 */ j .L80242184 /* A1D254 80242154 0000102D */ daddu $v0, $zero, $zero +glabel L80242158_A1D258 /* A1D258 80242158 0280202D */ daddu $a0, $s4, $zero /* A1D25C 8024215C 0200282D */ daddu $a1, $s0, $zero /* A1D260 80242160 0C0906A9 */ jal hos_03_UnkNpcAIFunc3 /* A1D264 80242164 0260302D */ daddu $a2, $s3, $zero /* A1D268 80242168 08090861 */ j .L80242184 /* A1D26C 8024216C 0000102D */ daddu $v0, $zero, $zero +glabel L80242170_A1D270 /* A1D270 80242170 0280202D */ daddu $a0, $s4, $zero /* A1D274 80242174 0200282D */ daddu $a1, $s0, $zero /* A1D278 80242178 0C0906C2 */ jal func_80241B08_A1CC08 /* A1D27C 8024217C 0260302D */ daddu $a2, $s3, $zero .L80242180: +glabel L80242180_A1D280 /* A1D280 80242180 0000102D */ daddu $v0, $zero, $zero .L80242184: /* A1D284 80242184 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421F0_A1D2F0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421F0_A1D2F0.s index 1e51a61a3e..2f20dbdcb4 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421F0_A1D2F0.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421F0_A1D2F0.s @@ -22,7 +22,7 @@ glabel func_802421F0_A1D2F0 /* A1D334 80242234 0C04DF93 */ jal func_80137E4C /* A1D338 80242238 24070091 */ addiu $a3, $zero, 0x91 /* A1D33C 8024223C 44900000 */ mtc1 $s0, $f0 -/* A1D340 80242240 00000000 */ nop +/* A1D340 80242240 00000000 */ nop /* A1D344 80242244 46800020 */ cvt.s.w $f0, $f0 /* A1D348 80242248 44050000 */ mfc1 $a1, $f0 /* A1D34C 8024224C 0C04DF62 */ jal func_80137D88 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024226C_A1D36C.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024226C_A1D36C.s index a105fa29ce..3fe6865a31 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024226C_A1D36C.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024226C_A1D36C.s @@ -16,7 +16,7 @@ glabel func_8024226C_A1D36C /* A1D398 80242298 0C0B1EAF */ jal get_variable /* A1D39C 8024229C 0040802D */ daddu $s0, $v0, $zero /* A1D3A0 802422A0 44820000 */ mtc1 $v0, $f0 -/* A1D3A4 802422A4 00000000 */ nop +/* A1D3A4 802422A4 00000000 */ nop /* A1D3A8 802422A8 46800020 */ cvt.s.w $f0, $f0 /* A1D3AC 802422AC 24020002 */ addiu $v0, $zero, 2 /* A1D3B0 802422B0 00501804 */ sllv $v1, $s0, $v0 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242368_A1D468.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242368_A1D468.s index 954400bbac..d0f2c0b9cb 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242368_A1D468.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242368_A1D468.s @@ -12,7 +12,7 @@ glabel func_80242368_A1D468 /* A1D484 80242384 80A30006 */ lb $v1, 6($a1) /* A1D488 80242388 80A20005 */ lb $v0, 5($a1) /* A1D48C 8024238C 14620007 */ bne $v1, $v0, .L802423AC -/* A1D490 80242390 00000000 */ nop +/* A1D490 80242390 00000000 */ nop /* A1D494 80242394 80C2028E */ lb $v0, 0x28e($a2) /* A1D498 80242398 84C30290 */ lh $v1, 0x290($a2) /* A1D49C 8024239C 00021200 */ sll $v0, $v0, 8 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802424A4_A1D5A4.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802424A4_A1D5A4.s index 19d088a168..6e8dbf3940 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802424A4_A1D5A4.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802424A4_A1D5A4.s @@ -26,7 +26,7 @@ glabel func_802424A4_A1D5A4 /* A1D5F4 802424F4 1440FFFA */ bnez $v0, .L802424E0 /* A1D5F8 802424F8 24A50004 */ addiu $a1, $a1, 4 /* A1D5FC 802424FC 08090950 */ j .L80242540 -/* A1D600 80242500 00000000 */ nop +/* A1D600 80242500 00000000 */ nop .L80242504: /* A1D604 80242504 0000182D */ daddu $v1, $zero, $zero /* A1D608 80242508 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425E0_A1D6E0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425E0_A1D6E0.s index b3207fa62d..dd0e4297fb 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425E0_A1D6E0.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425E0_A1D6E0.s @@ -115,7 +115,7 @@ glabel func_802425E0_A1D6E0 /* A1D888 80242788 14E20005 */ bne $a3, $v0, .L802427A0 /* A1D88C 8024278C 32E2FFFF */ andi $v0, $s7, 0xffff /* A1D890 80242790 14400003 */ bnez $v0, .L802427A0 -/* A1D894 80242794 00000000 */ nop +/* A1D894 80242794 00000000 */ nop /* A1D898 80242798 14800008 */ bnez $a0, .L802427BC /* A1D89C 8024279C 24020001 */ addiu $v0, $zero, 1 .L802427A0: @@ -123,7 +123,7 @@ glabel func_802425E0_A1D6E0 /* A1D8A4 802427A4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* A1D8A8 802427A8 80420075 */ lb $v0, 0x75($v0) /* A1D8AC 802427AC 10400005 */ beqz $v0, .L802427C4 -/* A1D8B0 802427B0 00000000 */ nop +/* A1D8B0 802427B0 00000000 */ nop /* A1D8B4 802427B4 10800003 */ beqz $a0, .L802427C4 /* A1D8B8 802427B8 24020001 */ addiu $v0, $zero, 1 .L802427BC: diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802428D0_A1D9D0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802428D0_A1D9D0.s index 9c2831740d..b92384e308 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802428D0_A1D9D0.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802428D0_A1D9D0.s @@ -39,13 +39,13 @@ glabel func_802428D0_A1D9D0 /* A1DA54 80242954 10740005 */ beq $v1, $s4, .L8024296C /* A1DA58 80242958 26100001 */ addiu $s0, $s0, 1 /* A1DA5C 8024295C 10730003 */ beq $v1, $s3, .L8024296C -/* A1DA60 80242960 00000000 */ nop +/* A1DA60 80242960 00000000 */ nop /* A1DA64 80242964 00521025 */ or $v0, $v0, $s2 /* A1DA68 80242968 AC820000 */ sw $v0, ($a0) .L8024296C: /* A1DA6C 8024296C 2A020040 */ slti $v0, $s0, 0x40 /* A1DA70 80242970 1440FFEF */ bnez $v0, .L80242930 -/* A1DA74 80242974 00000000 */ nop +/* A1DA74 80242974 00000000 */ nop /* A1DA78 80242978 0000802D */ daddu $s0, $zero, $zero /* A1DA7C 8024297C 3C120800 */ lui $s2, 0x800 .L80242980: @@ -57,13 +57,13 @@ glabel func_802428D0_A1D9D0 /* A1DA94 80242994 8C640000 */ lw $a0, ($v1) /* A1DA98 80242998 30820010 */ andi $v0, $a0, 0x10 /* A1DA9C 8024299C 10400003 */ beqz $v0, .L802429AC -/* A1DAA0 802429A0 00000000 */ nop +/* A1DAA0 802429A0 00000000 */ nop /* A1DAA4 802429A4 00921025 */ or $v0, $a0, $s2 /* A1DAA8 802429A8 AC620000 */ sw $v0, ($v1) .L802429AC: /* A1DAAC 802429AC 2A020100 */ slti $v0, $s0, 0x100 /* A1DAB0 802429B0 1440FFF3 */ bnez $v0, .L80242980 -/* A1DAB4 802429B4 00000000 */ nop +/* A1DAB4 802429B4 00000000 */ nop /* A1DAB8 802429B8 AE200070 */ sw $zero, 0x70($s1) .L802429BC: /* A1DABC 802429BC 8E220070 */ lw $v0, 0x70($s1) diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242A1C_A1DB1C.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242A1C_A1DB1C.s index 3d198cd3e5..aab4b7307b 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242A1C_A1DB1C.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242A1C_A1DB1C.s @@ -32,7 +32,7 @@ glabel func_80242A1C_A1DB1C /* A1DB80 80242A80 0080302D */ daddu $a2, $a0, $zero /* A1DB84 80242A84 8E020070 */ lw $v0, 0x70($s0) /* A1DB88 80242A88 14400006 */ bnez $v0, .L80242AA4 -/* A1DB8C 80242A8C 00000000 */ nop +/* A1DB8C 80242A8C 00000000 */ nop /* A1DB90 80242A90 8E020074 */ lw $v0, 0x74($s0) /* A1DB94 80242A94 14400003 */ bnez $v0, .L80242AA4 /* A1DB98 80242A98 24020001 */ addiu $v0, $zero, 1 @@ -66,13 +66,13 @@ glabel func_80242A1C_A1DB1C /* A1DC00 80242B00 10730005 */ beq $v1, $s3, .L80242B18 /* A1DC04 80242B04 26100001 */ addiu $s0, $s0, 1 /* A1DC08 80242B08 10720003 */ beq $v1, $s2, .L80242B18 -/* A1DC0C 80242B0C 00000000 */ nop +/* A1DC0C 80242B0C 00000000 */ nop /* A1DC10 80242B10 00511024 */ and $v0, $v0, $s1 /* A1DC14 80242B14 AC820000 */ sw $v0, ($a0) .L80242B18: /* A1DC18 80242B18 2A020040 */ slti $v0, $s0, 0x40 /* A1DC1C 80242B1C 1440FFEF */ bnez $v0, .L80242ADC -/* A1DC20 80242B20 00000000 */ nop +/* A1DC20 80242B20 00000000 */ nop /* A1DC24 80242B24 0000802D */ daddu $s0, $zero, $zero /* A1DC28 80242B28 3C11F7FF */ lui $s1, 0xf7ff /* A1DC2C 80242B2C 3631FFFF */ ori $s1, $s1, 0xffff @@ -85,7 +85,7 @@ glabel func_80242A1C_A1DB1C /* A1DC44 80242B44 8C640000 */ lw $a0, ($v1) /* A1DC48 80242B48 30820010 */ andi $v0, $a0, 0x10 /* A1DC4C 80242B4C 10400003 */ beqz $v0, .L80242B5C -/* A1DC50 80242B50 00000000 */ nop +/* A1DC50 80242B50 00000000 */ nop /* A1DC54 80242B54 00911024 */ and $v0, $a0, $s1 /* A1DC58 80242B58 AC620000 */ sw $v0, ($v1) .L80242B5C: @@ -93,7 +93,7 @@ glabel func_80242A1C_A1DB1C /* A1DC60 80242B60 1440FFF3 */ bnez $v0, .L80242B30 /* A1DC64 80242B64 24020002 */ addiu $v0, $zero, 2 /* A1DC68 80242B68 08090ADD */ j .L80242B74 -/* A1DC6C 80242B6C 00000000 */ nop +/* A1DC6C 80242B6C 00000000 */ nop .L80242B70: /* A1DC70 80242B70 0000102D */ daddu $v0, $zero, $zero .L80242B74: diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242C14_A1DD14.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242C14_A1DD14.s index f4f8d63cd5..6b1f236042 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242C14_A1DD14.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242C14_A1DD14.s @@ -16,19 +16,19 @@ glabel func_80242C14_A1DD14 /* A1DD40 80242C40 0220202D */ daddu $a0, $s1, $zero /* A1DD44 80242C44 3C05F4AC */ lui $a1, 0xf4ac /* A1DD48 80242C48 4482B000 */ mtc1 $v0, $f22 -/* A1DD4C 80242C4C 00000000 */ nop +/* A1DD4C 80242C4C 00000000 */ nop /* A1DD50 80242C50 4680B5A0 */ cvt.s.w $f22, $f22 /* A1DD54 80242C54 0C0B1EAF */ jal get_variable /* A1DD58 80242C58 34A5D482 */ ori $a1, $a1, 0xd482 /* A1DD5C 80242C5C 0220202D */ daddu $a0, $s1, $zero /* A1DD60 80242C60 3C05F4AC */ lui $a1, 0xf4ac /* A1DD64 80242C64 4482A000 */ mtc1 $v0, $f20 -/* A1DD68 80242C68 00000000 */ nop +/* A1DD68 80242C68 00000000 */ nop /* A1DD6C 80242C6C 4680A520 */ cvt.s.w $f20, $f20 /* A1DD70 80242C70 0C0B1EAF */ jal get_variable /* A1DD74 80242C74 34A5D483 */ ori $a1, $a1, 0xd483 /* A1DD78 80242C78 44821000 */ mtc1 $v0, $f2 -/* A1DD7C 80242C7C 00000000 */ nop +/* A1DD7C 80242C7C 00000000 */ nop /* A1DD80 80242C80 468010A0 */ cvt.s.w $f2, $f2 /* A1DD84 80242C84 4405B000 */ mfc1 $a1, $f22 /* A1DD88 80242C88 4406A000 */ mfc1 $a2, $f20 @@ -45,19 +45,19 @@ glabel func_80242C14_A1DD14 /* A1DDB4 80242CB4 0220202D */ daddu $a0, $s1, $zero /* A1DDB8 80242CB8 3C05F4AC */ lui $a1, 0xf4ac /* A1DDBC 80242CBC 4482B000 */ mtc1 $v0, $f22 -/* A1DDC0 80242CC0 00000000 */ nop +/* A1DDC0 80242CC0 00000000 */ nop /* A1DDC4 80242CC4 4680B5A0 */ cvt.s.w $f22, $f22 /* A1DDC8 80242CC8 0C0B1EAF */ jal get_variable /* A1DDCC 80242CCC 34A5D482 */ ori $a1, $a1, 0xd482 /* A1DDD0 80242CD0 0220202D */ daddu $a0, $s1, $zero /* A1DDD4 80242CD4 3C05F4AC */ lui $a1, 0xf4ac /* A1DDD8 80242CD8 4482A000 */ mtc1 $v0, $f20 -/* A1DDDC 80242CDC 00000000 */ nop +/* A1DDDC 80242CDC 00000000 */ nop /* A1DDE0 80242CE0 4680A520 */ cvt.s.w $f20, $f20 /* A1DDE4 80242CE4 0C0B1EAF */ jal get_variable /* A1DDE8 80242CE8 34A5D483 */ ori $a1, $a1, 0xd483 /* A1DDEC 80242CEC 44821000 */ mtc1 $v0, $f2 -/* A1DDF0 80242CF0 00000000 */ nop +/* A1DDF0 80242CF0 00000000 */ nop /* A1DDF4 80242CF4 468010A0 */ cvt.s.w $f2, $f2 /* A1DDF8 80242CF8 4405B000 */ mfc1 $a1, $f22 /* A1DDFC 80242CFC 4406A000 */ mfc1 $a2, $f20 @@ -73,19 +73,19 @@ glabel func_80242C14_A1DD14 /* A1DE24 80242D24 0220202D */ daddu $a0, $s1, $zero /* A1DE28 80242D28 3C05F4AC */ lui $a1, 0xf4ac /* A1DE2C 80242D2C 4482B000 */ mtc1 $v0, $f22 -/* A1DE30 80242D30 00000000 */ nop +/* A1DE30 80242D30 00000000 */ nop /* A1DE34 80242D34 4680B5A0 */ cvt.s.w $f22, $f22 /* A1DE38 80242D38 0C0B1EAF */ jal get_variable /* A1DE3C 80242D3C 34A5D482 */ ori $a1, $a1, 0xd482 /* A1DE40 80242D40 0220202D */ daddu $a0, $s1, $zero /* A1DE44 80242D44 3C05F4AC */ lui $a1, 0xf4ac /* A1DE48 80242D48 4482A000 */ mtc1 $v0, $f20 -/* A1DE4C 80242D4C 00000000 */ nop +/* A1DE4C 80242D4C 00000000 */ nop /* A1DE50 80242D50 4680A520 */ cvt.s.w $f20, $f20 /* A1DE54 80242D54 0C0B1EAF */ jal get_variable /* A1DE58 80242D58 34A5D483 */ ori $a1, $a1, 0xd483 /* A1DE5C 80242D5C 44821000 */ mtc1 $v0, $f2 -/* A1DE60 80242D60 00000000 */ nop +/* A1DE60 80242D60 00000000 */ nop /* A1DE64 80242D64 468010A0 */ cvt.s.w $f2, $f2 /* A1DE68 80242D68 4405B000 */ mfc1 $a1, $f22 /* A1DE6C 80242D6C 4406A000 */ mfc1 $a2, $f20 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242E2C_A1DF2C.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242E2C_A1DF2C.s index aaf32412af..f820f17e4e 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242E2C_A1DF2C.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242E2C_A1DF2C.s @@ -44,7 +44,7 @@ glabel func_80242E2C_A1DF2C /* A1DFC0 80242EC0 3C048025 */ lui $a0, %hi(D_8024BDD0) /* A1DFC4 80242EC4 8C84BDD0 */ lw $a0, %lo(D_8024BDD0)($a0) /* A1DFC8 80242EC8 0C048D70 */ jal func_801235C0 -/* A1DFCC 80242ECC 00000000 */ nop +/* A1DFCC 80242ECC 00000000 */ nop /* A1DFD0 80242ED0 24020002 */ addiu $v0, $zero, 2 .L80242ED4: /* A1DFD4 80242ED4 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024349C_A1E59C.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024349C_A1E59C.s index 79e25a33c5..df02cd15be 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024349C_A1E59C.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024349C_A1E59C.s @@ -13,7 +13,7 @@ glabel func_8024349C_A1E59C /* A1E5BC 802434BC 14620006 */ bne $v1, $v0, .L802434D8 /* A1E5C0 802434C0 24020002 */ addiu $v0, $zero, 2 /* A1E5C4 802434C4 44800000 */ mtc1 $zero, $f0 -/* A1E5C8 802434C8 00000000 */ nop +/* A1E5C8 802434C8 00000000 */ nop /* A1E5CC 802434CC 44050000 */ mfc1 $a1, $f0 /* A1E5D0 802434D0 08090D3C */ j .L802434F0 /* A1E5D4 802434D4 0000202D */ daddu $a0, $zero, $zero @@ -21,9 +21,9 @@ glabel func_8024349C_A1E59C /* A1E5D8 802434D8 14620008 */ bne $v1, $v0, .L802434FC /* A1E5DC 802434DC 24040001 */ addiu $a0, $zero, 1 /* A1E5E0 802434E0 44800000 */ mtc1 $zero, $f0 -/* A1E5E4 802434E4 00000000 */ nop +/* A1E5E4 802434E4 00000000 */ nop /* A1E5E8 802434E8 44050000 */ mfc1 $a1, $f0 -/* A1E5EC 802434EC 00000000 */ nop +/* A1E5EC 802434EC 00000000 */ nop .L802434F0: /* A1E5F0 802434F0 00A0302D */ daddu $a2, $a1, $zero /* A1E5F4 802434F4 0C01C5A4 */ jal func_80071690 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243508_A1E608.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243508_A1E608.s index 5debee2b10..6303740de1 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243508_A1E608.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243508_A1E608.s @@ -14,5 +14,5 @@ glabel func_80243508_A1E608 /* A1E62C 8024352C 24020002 */ addiu $v0, $zero, 2 /* A1E630 80243530 03E00008 */ jr $ra /* A1E634 80243534 27BD0018 */ addiu $sp, $sp, 0x18 -/* A1E638 80243538 00000000 */ nop -/* A1E63C 8024353C 00000000 */ nop +/* A1E638 80243538 00000000 */ nop +/* A1E63C 8024353C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_04/A27490/func_802405C0_A27490.s b/asm/nonmatchings/world/area_hos/hos_04/A27490/func_802405C0_A27490.s index 68711bfde8..0c8170f39e 100644 --- a/asm/nonmatchings/world/area_hos/hos_04/A27490/func_802405C0_A27490.s +++ b/asm/nonmatchings/world/area_hos/hos_04/A27490/func_802405C0_A27490.s @@ -8,5 +8,5 @@ glabel func_802405C0_A27490 /* A2749C 802405CC AC820084 */ sw $v0, 0x84($a0) /* A274A0 802405D0 03E00008 */ jr $ra /* A274A4 802405D4 24020002 */ addiu $v0, $zero, 2 -/* A274A8 802405D8 00000000 */ nop -/* A274AC 802405DC 00000000 */ nop +/* A274A8 802405D8 00000000 */ nop +/* A274AC 802405DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240694_A27564.s b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240694_A27564.s index 3628e9dae4..7780504bf1 100644 --- a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240694_A27564.s +++ b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240694_A27564.s @@ -8,35 +8,35 @@ glabel func_80240694_A27564 /* A27570 802406A0 44872000 */ mtc1 $a3, $f4 /* A27574 802406A4 8FA20010 */ lw $v0, 0x10($sp) /* A27578 802406A8 460C003C */ c.lt.s $f0, $f12 -/* A2757C 802406AC 00000000 */ nop +/* A2757C 802406AC 00000000 */ nop /* A27580 802406B0 4500000F */ bc1f .L802406F0 /* A27584 802406B4 46067081 */ sub.s $f2, $f14, $f6 /* A27588 802406B8 4600103C */ c.lt.s $f2, $f0 -/* A2758C 802406BC 00000000 */ nop +/* A2758C 802406BC 00000000 */ nop /* A27590 802406C0 45000003 */ bc1f .L802406D0 -/* A27594 802406C4 00000000 */ nop +/* A27594 802406C4 00000000 */ nop .L802406C8: /* A27598 802406C8 03E00008 */ jr $ra /* A2759C 802406CC E44E0000 */ swc1 $f14, ($v0) .L802406D0: /* A275A0 802406D0 4602203C */ c.lt.s $f4, $f2 -/* A275A4 802406D4 00000000 */ nop +/* A275A4 802406D4 00000000 */ nop /* A275A8 802406D8 45000012 */ bc1f .L80240724 -/* A275AC 802406DC 00000000 */ nop +/* A275AC 802406DC 00000000 */ nop /* A275B0 802406E0 C4400000 */ lwc1 $f0, ($v0) /* A275B4 802406E4 46040000 */ add.s $f0, $f0, $f4 /* A275B8 802406E8 03E00008 */ jr $ra /* A275BC 802406EC E4400000 */ swc1 $f0, ($v0) .L802406F0: /* A275C0 802406F0 4602003C */ c.lt.s $f0, $f2 -/* A275C4 802406F4 00000000 */ nop +/* A275C4 802406F4 00000000 */ nop /* A275C8 802406F8 4501FFF3 */ bc1t .L802406C8 -/* A275CC 802406FC 00000000 */ nop +/* A275CC 802406FC 00000000 */ nop /* A275D0 80240700 46002007 */ neg.s $f0, $f4 /* A275D4 80240704 4600103C */ c.lt.s $f2, $f0 -/* A275D8 80240708 00000000 */ nop +/* A275D8 80240708 00000000 */ nop /* A275DC 8024070C 45000005 */ bc1f .L80240724 -/* A275E0 80240710 00000000 */ nop +/* A275E0 80240710 00000000 */ nop /* A275E4 80240714 C4400000 */ lwc1 $f0, ($v0) /* A275E8 80240718 46040001 */ sub.s $f0, $f0, $f4 /* A275EC 8024071C 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240734_A27604.s b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240734_A27604.s index 97faa562d8..9fe6ad7e5f 100644 --- a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240734_A27604.s +++ b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240734_A27604.s @@ -10,7 +10,7 @@ glabel func_80240734_A27604 /* A27618 80240748 44876000 */ mtc1 $a3, $f12 /* A2761C 8024074C C7A20038 */ lwc1 $f2, 0x38($sp) /* A27620 80240750 460C103C */ c.lt.s $f2, $f12 -/* A27624 80240754 00000000 */ nop +/* A27624 80240754 00000000 */ nop /* A27628 80240758 45000002 */ bc1f .L80240764 /* A2762C 8024075C AFBF0010 */ sw $ra, 0x10($sp) /* A27630 80240760 46001306 */ mov.s $f12, $f2 @@ -19,24 +19,26 @@ glabel func_80240734_A27604 /* A27638 80240768 2C820005 */ sltiu $v0, $a0, 5 /* A2763C 8024076C 10400056 */ beqz $v0, .L802408C8 /* A27640 80240770 00041080 */ sll $v0, $a0, 2 -/* A27644 80240774 3C018024 */ lui $at, %hi(func_80243310_9AB700) +/* A27644 80240774 3C018024 */ lui $at, %hi(jtbl_80243310_A2A1E0) /* A27648 80240778 00220821 */ addu $at, $at, $v0 -/* A2764C 8024077C 8C223310 */ lw $v0, %lo(func_80243310_9AB700)($at) +/* A2764C 8024077C 8C223310 */ lw $v0, %lo(jtbl_80243310_A2A1E0)($at) /* A27650 80240780 00400008 */ jr $v0 -/* A27654 80240784 00000000 */ nop +/* A27654 80240784 00000000 */ nop +glabel L80240788_A27658 /* A27658 80240788 3C0142B4 */ lui $at, 0x42b4 /* A2765C 8024078C 44810000 */ mtc1 $at, $f0 /* A27660 80240790 46026303 */ div.s $f12, $f12, $f2 /* A27664 80240794 46006302 */ mul.s $f12, $f12, $f0 /* A27668 80240798 0C00A8BB */ jal sin_deg -/* A2766C 8024079C 00000000 */ nop +/* A2766C 8024079C 00000000 */ nop /* A27670 802407A0 08090233 */ j .L802408CC /* A27674 802407A4 46000306 */ mov.s $f12, $f0 +glabel L802407A8_A27678 /* A27678 802407A8 3C0141F0 */ lui $at, 0x41f0 /* A2767C 802407AC 44810000 */ mtc1 $at, $f0 -/* A27680 802407B0 00000000 */ nop +/* A27680 802407B0 00000000 */ nop /* A27684 802407B4 4600603C */ c.lt.s $f12, $f0 -/* A27688 802407B8 00000000 */ nop +/* A27688 802407B8 00000000 */ nop /* A2768C 802407BC 45020004 */ bc1fl .L802407D0 /* A27690 802407C0 46006301 */ sub.s $f12, $f12, $f0 /* A27694 802407C4 44806000 */ mtc1 $zero, $f12 @@ -48,56 +50,59 @@ glabel func_80240734_A27604 /* A276A8 802407D8 44811000 */ mtc1 $at, $f2 /* A276AC 802407DC 46006303 */ div.s $f12, $f12, $f0 /* A276B0 802407E0 46026302 */ mul.s $f12, $f12, $f2 -/* A276B4 802407E4 00000000 */ nop +/* A276B4 802407E4 00000000 */ nop /* A276B8 802407E8 3C01C2B4 */ lui $at, 0xc2b4 /* A276BC 802407EC 44810000 */ mtc1 $at, $f0 /* A276C0 802407F0 08090219 */ j .L80240864 /* A276C4 802407F4 46006300 */ add.s $f12, $f12, $f0 +glabel L802407F8_A276C8 /* A276C8 802407F8 3C014334 */ lui $at, 0x4334 /* A276CC 802407FC 44810000 */ mtc1 $at, $f0 /* A276D0 80240800 46026303 */ div.s $f12, $f12, $f2 /* A276D4 80240804 46006302 */ mul.s $f12, $f12, $f0 -/* A276D8 80240808 00000000 */ nop +/* A276D8 80240808 00000000 */ nop /* A276DC 8024080C 3C0142B4 */ lui $at, 0x42b4 /* A276E0 80240810 44810000 */ mtc1 $at, $f0 /* A276E4 80240814 0C00A8BB */ jal sin_deg /* A276E8 80240818 46006301 */ sub.s $f12, $f12, $f0 /* A276EC 8024081C 3C013F80 */ lui $at, 0x3f80 /* A276F0 80240820 44811000 */ mtc1 $at, $f2 -/* A276F4 80240824 00000000 */ nop +/* A276F4 80240824 00000000 */ nop /* A276F8 80240828 46020000 */ add.s $f0, $f0, $f2 /* A276FC 8024082C 3C013FE0 */ lui $at, 0x3fe0 /* A27700 80240830 44811800 */ mtc1 $at, $f3 /* A27704 80240834 44801000 */ mtc1 $zero, $f2 /* A27708 80240838 46000021 */ cvt.d.s $f0, $f0 /* A2770C 8024083C 46220002 */ mul.d $f0, $f0, $f2 -/* A27710 80240840 00000000 */ nop +/* A27710 80240840 00000000 */ nop /* A27714 80240844 08090233 */ j .L802408CC /* A27718 80240848 46200320 */ cvt.s.d $f12, $f0 +glabel L8024084C_A2771C /* A2771C 8024084C 3C0142B4 */ lui $at, 0x42b4 /* A27720 80240850 44810000 */ mtc1 $at, $f0 /* A27724 80240854 46026303 */ div.s $f12, $f12, $f2 /* A27728 80240858 46006302 */ mul.s $f12, $f12, $f0 -/* A2772C 8024085C 00000000 */ nop +/* A2772C 8024085C 00000000 */ nop /* A27730 80240860 46006301 */ sub.s $f12, $f12, $f0 .L80240864: /* A27734 80240864 0C00A8BB */ jal sin_deg -/* A27738 80240868 00000000 */ nop +/* A27738 80240868 00000000 */ nop /* A2773C 8024086C 3C013F80 */ lui $at, 0x3f80 /* A27740 80240870 44811000 */ mtc1 $at, $f2 /* A27744 80240874 08090233 */ j .L802408CC /* A27748 80240878 46020300 */ add.s $f12, $f0, $f2 +glabel L8024087C_A2774C /* A2774C 8024087C 3C014270 */ lui $at, 0x4270 /* A27750 80240880 44810000 */ mtc1 $at, $f0 /* A27754 80240884 46026303 */ div.s $f12, $f12, $f2 /* A27758 80240888 46006302 */ mul.s $f12, $f12, $f0 -/* A2775C 8024088C 00000000 */ nop +/* A2775C 8024088C 00000000 */ nop /* A27760 80240890 0C00A8BB */ jal sin_deg /* A27764 80240894 46006301 */ sub.s $f12, $f12, $f0 /* A27768 80240898 3C013F5D */ lui $at, 0x3f5d /* A2776C 8024089C 3421B3D7 */ ori $at, $at, 0xb3d7 /* A27770 802408A0 44811000 */ mtc1 $at, $f2 -/* A27774 802408A4 00000000 */ nop +/* A27774 802408A4 00000000 */ nop /* A27778 802408A8 46020000 */ add.s $f0, $f0, $f2 /* A2777C 802408AC 46000021 */ cvt.d.s $f0, $f0 /* A27780 802408B0 46200000 */ add.d $f0, $f0, $f0 @@ -112,7 +117,7 @@ glabel func_80240734_A27604 /* A2779C 802408CC 4614B001 */ sub.s $f0, $f22, $f20 .L802408D0: /* A277A0 802408D0 460C0002 */ mul.s $f0, $f0, $f12 -/* A277A4 802408D4 00000000 */ nop +/* A277A4 802408D4 00000000 */ nop /* A277A8 802408D8 4600A000 */ add.s $f0, $f20, $f0 /* A277AC 802408DC 8FA2003C */ lw $v0, 0x3c($sp) /* A277B0 802408E0 E4400000 */ swc1 $f0, ($v0) diff --git a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84_A27954.s b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84_A27954.s index be8f07fb42..52cde08792 100644 --- a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84_A27954.s +++ b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84_A27954.s @@ -57,4 +57,4 @@ glabel func_80240A84_A27954 /* A27A20 80240B50 00021040 */ sll $v0, $v0, 1 /* A27A24 80240B54 03E00008 */ jr $ra /* A27A28 80240B58 27BD0028 */ addiu $sp, $sp, 0x28 -/* A27A2C 80240B5C 00000000 */ nop +/* A27A2C 80240B5C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_04/A27A30/func_80240B60_A27A30.s b/asm/nonmatchings/world/area_hos/hos_04/A27A30/func_80240B60_A27A30.s index 022d25856c..bba20b703f 100644 --- a/asm/nonmatchings/world/area_hos/hos_04/A27A30/func_80240B60_A27A30.s +++ b/asm/nonmatchings/world/area_hos/hos_04/A27A30/func_80240B60_A27A30.s @@ -30,5 +30,5 @@ glabel func_80240B60_A27A30 /* A27A8C 80240BBC 00021040 */ sll $v0, $v0, 1 /* A27A90 80240BC0 03E00008 */ jr $ra /* A27A94 80240BC4 27BD0018 */ addiu $sp, $sp, 0x18 -/* A27A98 80240BC8 00000000 */ nop -/* A27A9C 80240BCC 00000000 */ nop +/* A27A98 80240BC8 00000000 */ nop +/* A27A9C 80240BCC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240BD0_A27AA0.s b/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240BD0_A27AA0.s index bd9f4cbe85..99e66c7788 100644 --- a/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240BD0_A27AA0.s +++ b/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240BD0_A27AA0.s @@ -11,7 +11,7 @@ glabel func_80240BD0_A27AA0 /* A27AB8 80240BE8 AFB00028 */ sw $s0, 0x28($sp) /* A27ABC 80240BEC 8C620000 */ lw $v0, ($v1) /* A27AC0 80240BF0 14400007 */ bnez $v0, .L80240C10 -/* A27AC4 80240BF4 00000000 */ nop +/* A27AC4 80240BF4 00000000 */ nop /* A27AC8 80240BF8 3C028007 */ lui $v0, %hi(D_800779B0) /* A27ACC 80240BFC 904279B0 */ lbu $v0, %lo(D_800779B0)($v0) /* A27AD0 80240C00 00021080 */ sll $v0, $v0, 2 @@ -24,11 +24,12 @@ glabel func_80240BD0_A27AA0 /* A27AE8 80240C18 2C620005 */ sltiu $v0, $v1, 5 /* A27AEC 80240C1C 10400050 */ beqz $v0, .L80240D60 /* A27AF0 80240C20 00031080 */ sll $v0, $v1, 2 -/* A27AF4 80240C24 3C018024 */ lui $at, %hi(D_80243358) +/* A27AF4 80240C24 3C018024 */ lui $at, %hi(jtbl_80243358_A2A228) /* A27AF8 80240C28 00220821 */ addu $at, $at, $v0 -/* A27AFC 80240C2C 8C223358 */ lw $v0, %lo(D_80243358)($at) +/* A27AFC 80240C2C 8C223358 */ lw $v0, %lo(jtbl_80243358_A2A228)($at) /* A27B00 80240C30 00400008 */ jr $v0 -/* A27B04 80240C34 00000000 */ nop +/* A27B04 80240C34 00000000 */ nop +glabel L80240C38_A27B08 /* A27B08 80240C38 3C048024 */ lui $a0, %hi(D_80243258) /* A27B0C 80240C3C 8C843258 */ lw $a0, %lo(D_80243258)($a0) /* A27B10 80240C40 8C830000 */ lw $v1, ($a0) @@ -37,7 +38,7 @@ glabel func_80240BD0_A27AA0 /* A27B1C 80240C4C 24020004 */ addiu $v0, $zero, 4 /* A27B20 80240C50 8C830004 */ lw $v1, 4($a0) /* A27B24 80240C54 08090323 */ j .L80240C8C -/* A27B28 80240C58 00000000 */ nop +/* A27B28 80240C58 00000000 */ nop .L80240C5C: /* A27B2C 80240C5C 3C038024 */ lui $v1, %hi(func_80243254_8553C4) /* A27B30 80240C60 24633254 */ addiu $v1, $v1, %lo(func_80243254_8553C4) @@ -58,6 +59,7 @@ glabel func_80240BD0_A27AA0 /* A27B68 80240C98 AC233380 */ sw $v1, %lo(func_80243380_8554F0)($at) /* A27B6C 80240C9C 08090359 */ j .L80240D64 /* A27B70 80240CA0 24040001 */ addiu $a0, $zero, 1 +glabel L80240CA4_A27B74 /* A27B74 80240CA4 3C038024 */ lui $v1, %hi(func_80243380_8554F0) /* A27B78 80240CA8 24633380 */ addiu $v1, $v1, %lo(func_80243380_8554F0) /* A27B7C 80240CAC 8C620000 */ lw $v0, ($v1) @@ -68,6 +70,7 @@ glabel func_80240BD0_A27AA0 /* A27B90 80240CC0 AC223250 */ sw $v0, %lo(D_80243250)($at) /* A27B94 80240CC4 08090359 */ j .L80240D64 /* A27B98 80240CC8 24040001 */ addiu $a0, $zero, 1 +glabel L80240CCC_A27B9C /* A27B9C 80240CCC 3C048024 */ lui $a0, %hi(func_80243254_8553C4) /* A27BA0 80240CD0 24843254 */ addiu $a0, $a0, %lo(func_80243254_8553C4) /* A27BA4 80240CD4 8C820000 */ lw $v0, ($a0) @@ -83,7 +86,8 @@ glabel func_80240BD0_A27AA0 /* A27BCC 80240CFC 10800011 */ beqz $a0, .L80240D44 /* A27BD0 80240D00 AC430000 */ sw $v1, ($v0) /* A27BD4 80240D04 08090356 */ j .L80240D58 -/* A27BD8 80240D08 00000000 */ nop +/* A27BD8 80240D08 00000000 */ nop +glabel L80240D0C_A27BDC /* A27BDC 80240D0C 3C038024 */ lui $v1, %hi(func_80243380_8554F0) /* A27BE0 80240D10 24633380 */ addiu $v1, $v1, %lo(func_80243380_8554F0) /* A27BE4 80240D14 8C620000 */ lw $v0, ($v1) @@ -110,6 +114,7 @@ glabel func_80240BD0_A27AA0 /* A27C28 80240D58 3C018024 */ lui $at, %hi(D_80243250) /* A27C2C 80240D5C AC203250 */ sw $zero, %lo(D_80243250)($at) .L80240D60: +glabel L80240D60_A27C30 /* A27C30 80240D60 24040001 */ addiu $a0, $zero, 1 .L80240D64: /* A27C34 80240D64 27B00018 */ addiu $s0, $sp, 0x18 @@ -123,30 +128,30 @@ glabel func_80240BD0_A27AA0 /* A27C54 80240D84 C7A2001C */ lwc1 $f2, 0x1c($sp) /* A27C58 80240D88 3C01437F */ lui $at, 0x437f /* A27C5C 80240D8C 44812000 */ mtc1 $at, $f4 -/* A27C60 80240D90 00000000 */ nop +/* A27C60 80240D90 00000000 */ nop /* A27C64 80240D94 46022081 */ sub.s $f2, $f4, $f2 /* A27C68 80240D98 3C018024 */ lui $at, %hi(func_80243254_8553C4) /* A27C6C 80240D9C C4203254 */ lwc1 $f0, %lo(func_80243254_8553C4)($at) /* A27C70 80240DA0 46800020 */ cvt.s.w $f0, $f0 /* A27C74 80240DA4 46020002 */ mul.s $f0, $f0, $f2 -/* A27C78 80240DA8 00000000 */ nop +/* A27C78 80240DA8 00000000 */ nop /* A27C7C 80240DAC C7A20020 */ lwc1 $f2, 0x20($sp) /* A27C80 80240DB0 46022081 */ sub.s $f2, $f4, $f2 /* A27C84 80240DB4 46020002 */ mul.s $f0, $f0, $f2 -/* A27C88 80240DB8 00000000 */ nop +/* A27C88 80240DB8 00000000 */ nop /* A27C8C 80240DBC 46040003 */ div.s $f0, $f0, $f4 /* A27C90 80240DC0 46040003 */ div.s $f0, $f0, $f4 /* A27C94 80240DC4 4600018D */ trunc.w.s $f6, $f0 /* A27C98 80240DC8 44113000 */ mfc1 $s1, $f6 -/* A27C9C 80240DCC 00000000 */ nop +/* A27C9C 80240DCC 00000000 */ nop /* A27CA0 80240DD0 1A200015 */ blez $s1, .L80240E28 -/* A27CA4 80240DD4 00000000 */ nop +/* A27CA4 80240DD4 00000000 */ nop /* A27CA8 80240DD8 3C128024 */ lui $s2, %hi(D_80243258) /* A27CAC 80240DDC 26523258 */ addiu $s2, $s2, %lo(D_80243258) /* A27CB0 80240DE0 8E420000 */ lw $v0, ($s2) /* A27CB4 80240DE4 8C440000 */ lw $a0, ($v0) /* A27CB8 80240DE8 1080000F */ beqz $a0, .L80240E28 -/* A27CBC 80240DEC 00000000 */ nop +/* A27CBC 80240DEC 00000000 */ nop /* A27CC0 80240DF0 0C04992C */ jal func_801264B0 /* A27CC4 80240DF4 0000802D */ daddu $s0, $zero, $zero /* A27CC8 80240DF8 28420002 */ slti $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E6C_A27D3C.s b/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E6C_A27D3C.s index 6895e892e3..9a961af151 100644 --- a/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E6C_A27D3C.s +++ b/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E6C_A27D3C.s @@ -7,7 +7,7 @@ glabel func_80240E6C_A27D3C /* A27D44 80240E74 24843284 */ addiu $a0, $a0, %lo(func_80243284_8B32F4) /* A27D48 80240E78 AFBF0010 */ sw $ra, 0x10($sp) /* A27D4C 80240E7C 0C0902F4 */ jal func_80240BD0_A27AA0 -/* A27D50 80240E80 00000000 */ nop +/* A27D50 80240E80 00000000 */ nop /* A27D54 80240E84 8FBF0010 */ lw $ra, 0x10($sp) /* A27D58 80240E88 03E00008 */ jr $ra /* A27D5C 80240E8C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240000_A2A240.s b/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240000_A2A240.s index ec5d4ad870..06a83c95cd 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240000_A2A240.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240000_A2A240.s @@ -37,12 +37,12 @@ glabel func_80240000_A2A240 /* A2A2BC 8024007C 12400007 */ beqz $s2, .L8024009C /* A2A2C0 80240080 3412FFFF */ ori $s2, $zero, 0xffff /* A2A2C4 80240084 08090043 */ j .L8024010C -/* A2A2C8 80240088 00000000 */ nop +/* A2A2C8 80240088 00000000 */ nop .L8024008C: /* A2A2CC 8024008C 1242001B */ beq $s2, $v0, .L802400FC /* A2A2D0 80240090 24020002 */ addiu $v0, $zero, 2 /* A2A2D4 80240094 08090043 */ j .L8024010C -/* A2A2D8 80240098 00000000 */ nop +/* A2A2D8 80240098 00000000 */ nop .L8024009C: /* A2A2DC 8024009C 8E040000 */ lw $a0, ($s0) /* A2A2E0 802400A0 1092001A */ beq $a0, $s2, .L8024010C @@ -56,7 +56,7 @@ glabel func_80240000_A2A240 /* A2A300 802400C0 0C046F1F */ jal func_8011BC7C /* A2A304 802400C4 0220302D */ daddu $a2, $s1, $zero /* A2A308 802400C8 08090027 */ j .L8024009C -/* A2A30C 802400CC 00000000 */ nop +/* A2A30C 802400CC 00000000 */ nop .L802400D0: /* A2A310 802400D0 3412FFFF */ ori $s2, $zero, 0xffff .L802400D4: @@ -69,7 +69,7 @@ glabel func_80240000_A2A240 /* A2A32C 802400EC 0C046E54 */ jal func_8011B950 /* A2A330 802400F0 0000382D */ daddu $a3, $zero, $zero /* A2A334 802400F4 08090035 */ j .L802400D4 -/* A2A338 802400F8 00000000 */ nop +/* A2A338 802400F8 00000000 */ nop .L802400FC: /* A2A33C 802400FC 3C028015 */ lui $v0, %hi(D_801512F0) /* A2A340 80240100 8C4212F0 */ lw $v0, %lo(D_801512F0)($v0) diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240124_A2A364.s b/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240124_A2A364.s index bd24af57d4..13d14231f7 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240124_A2A364.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240124_A2A364.s @@ -71,20 +71,20 @@ glabel func_80240124_A2A364 /* A2A46C 8024022C 12620008 */ beq $s3, $v0, .L80240250 /* A2A470 80240230 32C400FF */ andi $a0, $s6, 0xff /* A2A474 80240234 080900B1 */ j .L802402C4 -/* A2A478 80240238 00000000 */ nop +/* A2A478 80240238 00000000 */ nop .L8024023C: /* A2A47C 8024023C 24020003 */ addiu $v0, $zero, 3 /* A2A480 80240240 12620018 */ beq $s3, $v0, .L802402A4 /* A2A484 80240244 32C400FF */ andi $a0, $s6, 0xff /* A2A488 80240248 080900B1 */ j .L802402C4 -/* A2A48C 8024024C 00000000 */ nop +/* A2A48C 8024024C 00000000 */ nop .L80240250: /* A2A490 80240250 32A500FF */ andi $a1, $s5, 0xff /* A2A494 80240254 328600FF */ andi $a2, $s4, 0xff /* A2A498 80240258 0C046F97 */ jal set_background_color_blend /* A2A49C 8024025C 324700FF */ andi $a3, $s2, 0xff /* A2A4A0 80240260 080900B1 */ j .L802402C4 -/* A2A4A4 80240264 00000000 */ nop +/* A2A4A4 80240264 00000000 */ nop .L80240268: /* A2A4A8 80240268 32C400FF */ andi $a0, $s6, 0xff /* A2A4AC 8024026C 32A500FF */ andi $a1, $s5, 0xff @@ -100,7 +100,7 @@ glabel func_80240124_A2A364 /* A2A4D4 80240294 0C046FAD */ jal func_8011BEB4 /* A2A4D8 80240298 AFA20018 */ sw $v0, 0x18($sp) /* A2A4DC 8024029C 080900B1 */ j .L802402C4 -/* A2A4E0 802402A0 00000000 */ nop +/* A2A4E0 802402A0 00000000 */ nop .L802402A4: /* A2A4E4 802402A4 32A500FF */ andi $a1, $s5, 0xff /* A2A4E8 802402A8 328600FF */ andi $a2, $s4, 0xff diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240690_A2A8D0.s b/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240690_A2A8D0.s index d9a79ac8ba..3024a4519c 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240690_A2A8D0.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240690_A2A8D0.s @@ -23,7 +23,7 @@ glabel func_80240690_A2A8D0 /* A2A918 802406D8 34210FD8 */ ori $at, $at, 0xfd8 /* A2A91C 802406DC 44811000 */ mtc1 $at, $f2 /* A2A920 802406E0 4600D682 */ mul.s $f26, $f26, $f0 -/* A2A924 802406E4 00000000 */ nop +/* A2A924 802406E4 00000000 */ nop /* A2A928 802406E8 C616008C */ lwc1 $f22, 0x8c($s0) /* A2A92C 802406EC 4680B5A0 */ cvt.s.w $f22, $f22 /* A2A930 802406F0 AE02008C */ sw $v0, 0x8c($s0) @@ -32,7 +32,7 @@ glabel func_80240690_A2A8D0 /* A2A93C 802406FC 0C00A67F */ jal rand_int /* A2A940 80240700 4602D683 */ div.s $f26, $f26, $f2 /* A2A944 80240704 4482A000 */ mtc1 $v0, $f20 -/* A2A948 80240708 00000000 */ nop +/* A2A948 80240708 00000000 */ nop /* A2A94C 8024070C 4680A520 */ cvt.s.w $f20, $f20 /* A2A950 80240710 3C014040 */ lui $at, 0x4040 /* A2A954 80240714 44810000 */ mtc1 $at, $f0 @@ -41,16 +41,16 @@ glabel func_80240690_A2A8D0 /* A2A960 80240720 0C00A874 */ jal cos_rad /* A2A964 80240724 4600D306 */ mov.s $f12, $f26 /* A2A968 80240728 4600A002 */ mul.s $f0, $f20, $f0 -/* A2A96C 8024072C 00000000 */ nop +/* A2A96C 8024072C 00000000 */ nop /* A2A970 80240730 3C014480 */ lui $at, 0x4480 /* A2A974 80240734 4481C000 */ mtc1 $at, $f24 -/* A2A978 80240738 00000000 */ nop +/* A2A978 80240738 00000000 */ nop /* A2A97C 8024073C 46180002 */ mul.s $f0, $f0, $f24 -/* A2A980 80240740 00000000 */ nop +/* A2A980 80240740 00000000 */ nop /* A2A984 80240744 3C01CD5B */ lui $at, 0xcd5b /* A2A988 80240748 34215858 */ ori $at, $at, 0x5858 /* A2A98C 8024074C 4481B000 */ mtc1 $at, $f22 -/* A2A990 80240750 00000000 */ nop +/* A2A990 80240750 00000000 */ nop /* A2A994 80240754 46160000 */ add.s $f0, $f0, $f22 /* A2A998 80240758 4600010D */ trunc.w.s $f4, $f0 /* A2A99C 8024075C E60400AC */ swc1 $f4, 0xac($s0) @@ -58,19 +58,19 @@ glabel func_80240690_A2A8D0 /* A2A9A4 80240764 2404000F */ addiu $a0, $zero, 0xf /* A2A9A8 80240768 24420005 */ addiu $v0, $v0, 5 /* A2A9AC 8024076C 44820000 */ mtc1 $v0, $f0 -/* A2A9B0 80240770 00000000 */ nop +/* A2A9B0 80240770 00000000 */ nop /* A2A9B4 80240774 46800020 */ cvt.s.w $f0, $f0 /* A2A9B8 80240778 46180002 */ mul.s $f0, $f0, $f24 -/* A2A9BC 8024077C 00000000 */ nop +/* A2A9BC 8024077C 00000000 */ nop /* A2A9C0 80240780 46160000 */ add.s $f0, $f0, $f22 /* A2A9C4 80240784 4600010D */ trunc.w.s $f4, $f0 /* A2A9C8 80240788 E60400B0 */ swc1 $f4, 0xb0($s0) /* A2A9CC 8024078C 0C00A85B */ jal sin_rad /* A2A9D0 80240790 4600D306 */ mov.s $f12, $f26 /* A2A9D4 80240794 4600A502 */ mul.s $f20, $f20, $f0 -/* A2A9D8 80240798 00000000 */ nop +/* A2A9D8 80240798 00000000 */ nop /* A2A9DC 8024079C 4618A502 */ mul.s $f20, $f20, $f24 -/* A2A9E0 802407A0 00000000 */ nop +/* A2A9E0 802407A0 00000000 */ nop /* A2A9E4 802407A4 4616A500 */ add.s $f20, $f20, $f22 /* A2A9E8 802407A8 4600A10D */ trunc.w.s $f4, $f20 /* A2A9EC 802407AC E60400B4 */ swc1 $f4, 0xb4($s0) @@ -78,19 +78,19 @@ glabel func_80240690_A2A8D0 /* A2A9F4 802407B4 2404000A */ addiu $a0, $zero, 0xa /* A2A9F8 802407B8 2442000A */ addiu $v0, $v0, 0xa /* A2A9FC 802407BC 44820000 */ mtc1 $v0, $f0 -/* A2AA00 802407C0 00000000 */ nop +/* A2AA00 802407C0 00000000 */ nop /* A2AA04 802407C4 46800020 */ cvt.s.w $f0, $f0 /* A2AA08 802407C8 3C018025 */ lui $at, %hi(D_8024F1D0) /* A2AA0C 802407CC D422F1D0 */ ldc1 $f2, %lo(D_8024F1D0)($at) /* A2AA10 802407D0 46000021 */ cvt.d.s $f0, $f0 /* A2AA14 802407D4 46220002 */ mul.d $f0, $f0, $f2 -/* A2AA18 802407D8 00000000 */ nop +/* A2AA18 802407D8 00000000 */ nop /* A2AA1C 802407DC 3C014090 */ lui $at, 0x4090 /* A2AA20 802407E0 44811800 */ mtc1 $at, $f3 /* A2AA24 802407E4 44801000 */ mtc1 $zero, $f2 -/* A2AA28 802407E8 00000000 */ nop +/* A2AA28 802407E8 00000000 */ nop /* A2AA2C 802407EC 46220002 */ mul.d $f0, $f0, $f2 -/* A2AA30 802407F0 00000000 */ nop +/* A2AA30 802407F0 00000000 */ nop /* A2AA34 802407F4 3C018025 */ lui $at, %hi(D_8024F1D8) /* A2AA38 802407F8 D422F1D8 */ ldc1 $f2, %lo(D_8024F1D8)($at) /* A2AA3C 802407FC 46220000 */ add.d $f0, $f0, $f2 @@ -105,4 +105,4 @@ glabel func_80240690_A2A8D0 /* A2AA60 80240820 24020002 */ addiu $v0, $zero, 2 /* A2AA64 80240824 03E00008 */ jr $ra /* A2AA68 80240828 27BD0038 */ addiu $sp, $sp, 0x38 -/* A2AA6C 8024082C 00000000 */ nop +/* A2AA6C 8024082C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AA70/func_80240830_A2AA70.s b/asm/nonmatchings/world/area_hos/hos_05/A2AA70/func_80240830_A2AA70.s index aa96ccb8ca..f6d47608a3 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AA70/func_80240830_A2AA70.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AA70/func_80240830_A2AA70.s @@ -20,5 +20,5 @@ glabel func_80240830_A2AA70 /* A2AAAC 8024086C 24020002 */ addiu $v0, $zero, 2 /* A2AAB0 80240870 03E00008 */ jr $ra /* A2AAB4 80240874 27BD0018 */ addiu $sp, $sp, 0x18 -/* A2AAB8 80240878 00000000 */ nop -/* A2AABC 8024087C 00000000 */ nop +/* A2AAB8 80240878 00000000 */ nop +/* A2AABC 8024087C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802409C4_A2AC04.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802409C4_A2AC04.s index 5f4a9ab828..7213f73db7 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802409C4_A2AC04.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802409C4_A2AC04.s @@ -72,7 +72,7 @@ glabel func_802409C4_A2AC04 /* A2AD0C 80240ACC 2631F2C0 */ addiu $s1, $s1, %lo(D_8024F2C0) /* A2AD10 80240AD0 8E2F0000 */ lw $t7, ($s1) /* A2AD14 80240AD4 19E0008A */ blez $t7, .L80240D00 -/* A2AD18 80240AD8 00000000 */ nop +/* A2AD18 80240AD8 00000000 */ nop /* A2AD1C 80240ADC 3C108025 */ lui $s0, %hi(D_8024F2C4) /* A2AD20 80240AE0 2610F2C4 */ addiu $s0, $s0, %lo(D_8024F2C4) /* A2AD24 80240AE4 8E030000 */ lw $v1, ($s0) @@ -86,7 +86,7 @@ glabel func_802409C4_A2AC04 /* A2AD44 80240B04 00441023 */ subu $v0, $v0, $a0 /* A2AD48 80240B08 00430018 */ mult $v0, $v1 /* A2AD4C 80240B0C 00004012 */ mflo $t0 -/* A2AD50 80240B10 00000000 */ nop +/* A2AD50 80240B10 00000000 */ nop /* A2AD54 80240B14 15E00002 */ bnez $t7, .L80240B20 /* A2AD58 80240B18 010F001A */ div $zero, $t0, $t7 /* A2AD5C 80240B1C 0007000D */ break 7 @@ -95,7 +95,7 @@ glabel func_802409C4_A2AC04 /* A2AD64 80240B24 15E10004 */ bne $t7, $at, .L80240B38 /* A2AD68 80240B28 3C018000 */ lui $at, 0x8000 /* A2AD6C 80240B2C 15010002 */ bne $t0, $at, .L80240B38 -/* A2AD70 80240B30 00000000 */ nop +/* A2AD70 80240B30 00000000 */ nop /* A2AD74 80240B34 0006000D */ break 6 .L80240B38: /* A2AD78 80240B38 00007012 */ mflo $t6 @@ -106,7 +106,7 @@ glabel func_802409C4_A2AC04 /* A2AD8C 80240B4C 00451023 */ subu $v0, $v0, $a1 /* A2AD90 80240B50 00430018 */ mult $v0, $v1 /* A2AD94 80240B54 00004012 */ mflo $t0 -/* A2AD98 80240B58 00000000 */ nop +/* A2AD98 80240B58 00000000 */ nop /* A2AD9C 80240B5C 15E00002 */ bnez $t7, .L80240B68 /* A2ADA0 80240B60 010F001A */ div $zero, $t0, $t7 /* A2ADA4 80240B64 0007000D */ break 7 @@ -115,7 +115,7 @@ glabel func_802409C4_A2AC04 /* A2ADAC 80240B6C 15E10004 */ bne $t7, $at, .L80240B80 /* A2ADB0 80240B70 3C018000 */ lui $at, 0x8000 /* A2ADB4 80240B74 15010002 */ bne $t0, $at, .L80240B80 -/* A2ADB8 80240B78 00000000 */ nop +/* A2ADB8 80240B78 00000000 */ nop /* A2ADBC 80240B7C 0006000D */ break 6 .L80240B80: /* A2ADC0 80240B80 00006812 */ mflo $t5 @@ -126,7 +126,7 @@ glabel func_802409C4_A2AC04 /* A2ADD4 80240B94 00461023 */ subu $v0, $v0, $a2 /* A2ADD8 80240B98 00430018 */ mult $v0, $v1 /* A2ADDC 80240B9C 00004012 */ mflo $t0 -/* A2ADE0 80240BA0 00000000 */ nop +/* A2ADE0 80240BA0 00000000 */ nop /* A2ADE4 80240BA4 15E00002 */ bnez $t7, .L80240BB0 /* A2ADE8 80240BA8 010F001A */ div $zero, $t0, $t7 /* A2ADEC 80240BAC 0007000D */ break 7 @@ -135,7 +135,7 @@ glabel func_802409C4_A2AC04 /* A2ADF4 80240BB4 15E10004 */ bne $t7, $at, .L80240BC8 /* A2ADF8 80240BB8 3C018000 */ lui $at, 0x8000 /* A2ADFC 80240BBC 15010002 */ bne $t0, $at, .L80240BC8 -/* A2AE00 80240BC0 00000000 */ nop +/* A2AE00 80240BC0 00000000 */ nop /* A2AE04 80240BC4 0006000D */ break 6 .L80240BC8: /* A2AE08 80240BC8 00006012 */ mflo $t4 @@ -146,7 +146,7 @@ glabel func_802409C4_A2AC04 /* A2AE1C 80240BDC 00471023 */ subu $v0, $v0, $a3 /* A2AE20 80240BE0 00430018 */ mult $v0, $v1 /* A2AE24 80240BE4 00004012 */ mflo $t0 -/* A2AE28 80240BE8 00000000 */ nop +/* A2AE28 80240BE8 00000000 */ nop /* A2AE2C 80240BEC 15E00002 */ bnez $t7, .L80240BF8 /* A2AE30 80240BF0 010F001A */ div $zero, $t0, $t7 /* A2AE34 80240BF4 0007000D */ break 7 @@ -155,7 +155,7 @@ glabel func_802409C4_A2AC04 /* A2AE3C 80240BFC 15E10004 */ bne $t7, $at, .L80240C10 /* A2AE40 80240C00 3C018000 */ lui $at, 0x8000 /* A2AE44 80240C04 15010002 */ bne $t0, $at, .L80240C10 -/* A2AE48 80240C08 00000000 */ nop +/* A2AE48 80240C08 00000000 */ nop /* A2AE4C 80240C0C 0006000D */ break 6 .L80240C10: /* A2AE50 80240C10 00005812 */ mflo $t3 @@ -166,7 +166,7 @@ glabel func_802409C4_A2AC04 /* A2AE64 80240C24 00491023 */ subu $v0, $v0, $t1 /* A2AE68 80240C28 00430018 */ mult $v0, $v1 /* A2AE6C 80240C2C 00004012 */ mflo $t0 -/* A2AE70 80240C30 00000000 */ nop +/* A2AE70 80240C30 00000000 */ nop /* A2AE74 80240C34 15E00002 */ bnez $t7, .L80240C40 /* A2AE78 80240C38 010F001A */ div $zero, $t0, $t7 /* A2AE7C 80240C3C 0007000D */ break 7 @@ -175,7 +175,7 @@ glabel func_802409C4_A2AC04 /* A2AE84 80240C44 15E10004 */ bne $t7, $at, .L80240C58 /* A2AE88 80240C48 3C018000 */ lui $at, 0x8000 /* A2AE8C 80240C4C 15010002 */ bne $t0, $at, .L80240C58 -/* A2AE90 80240C50 00000000 */ nop +/* A2AE90 80240C50 00000000 */ nop /* A2AE94 80240C54 0006000D */ break 6 .L80240C58: /* A2AE98 80240C58 00005012 */ mflo $t2 @@ -186,7 +186,7 @@ glabel func_802409C4_A2AC04 /* A2AEAC 80240C6C 00481023 */ subu $v0, $v0, $t0 /* A2AEB0 80240C70 00430018 */ mult $v0, $v1 /* A2AEB4 80240C74 0000C812 */ mflo $t9 -/* A2AEB8 80240C78 00000000 */ nop +/* A2AEB8 80240C78 00000000 */ nop /* A2AEBC 80240C7C 15E00002 */ bnez $t7, .L80240C88 /* A2AEC0 80240C80 032F001A */ div $zero, $t9, $t7 /* A2AEC4 80240C84 0007000D */ break 7 @@ -195,7 +195,7 @@ glabel func_802409C4_A2AC04 /* A2AECC 80240C8C 15E10004 */ bne $t7, $at, .L80240CA0 /* A2AED0 80240C90 3C018000 */ lui $at, 0x8000 /* A2AED4 80240C94 17210002 */ bne $t9, $at, .L80240CA0 -/* A2AED8 80240C98 00000000 */ nop +/* A2AED8 80240C98 00000000 */ nop /* A2AEDC 80240C9C 0006000D */ break 6 .L80240CA0: /* A2AEE0 80240CA0 00001012 */ mflo $v0 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240D54_A2AF94.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240D54_A2AF94.s index 770d1abe0e..5dedd5e579 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240D54_A2AF94.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240D54_A2AF94.s @@ -7,7 +7,7 @@ glabel func_80240D54_A2AF94 /* A2AF9C 80240D5C D422F1E0 */ ldc1 $f2, %lo(D_8024F1E0)($at) /* A2AFA0 80240D60 46002021 */ cvt.d.s $f0, $f4 /* A2AFA4 80240D64 46220002 */ mul.d $f0, $f0, $f2 -/* A2AFA8 80240D68 00000000 */ nop +/* A2AFA8 80240D68 00000000 */ nop /* A2AFAC 80240D6C 00041080 */ sll $v0, $a0, 2 /* A2AFB0 80240D70 00441021 */ addu $v0, $v0, $a0 /* A2AFB4 80240D74 00021080 */ sll $v0, $v0, 2 @@ -20,4 +20,4 @@ glabel func_80240D54_A2AF94 /* A2AFD0 80240D90 00220821 */ addu $at, $at, $v0 /* A2AFD4 80240D94 E4201D98 */ swc1 $f0, %lo(D_800B1D98)($at) /* A2AFD8 80240D98 03E00008 */ jr $ra -/* A2AFDC 80240D9C 00000000 */ nop +/* A2AFDC 80240D9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240E50_A2B090.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240E50_A2B090.s index 2875b298af..b65a635777 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240E50_A2B090.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240E50_A2B090.s @@ -35,19 +35,19 @@ glabel func_80240E50_A2B090 /* A2B108 80240EC8 0220202D */ daddu $a0, $s1, $zero /* A2B10C 80240ECC 8E43000C */ lw $v1, 0xc($s2) /* A2B110 80240ED0 44931000 */ mtc1 $s3, $f2 -/* A2B114 80240ED4 00000000 */ nop +/* A2B114 80240ED4 00000000 */ nop /* A2B118 80240ED8 468010A0 */ cvt.s.w $f2, $f2 /* A2B11C 80240EDC E4620004 */ swc1 $f2, 4($v1) /* A2B120 80240EE0 8E43000C */ lw $v1, 0xc($s2) /* A2B124 80240EE4 44901000 */ mtc1 $s0, $f2 -/* A2B128 80240EE8 00000000 */ nop +/* A2B128 80240EE8 00000000 */ nop /* A2B12C 80240EEC 468010A0 */ cvt.s.w $f2, $f2 /* A2B130 80240EF0 E4620008 */ swc1 $f2, 8($v1) /* A2B134 80240EF4 4600010D */ trunc.w.s $f4, $f0 /* A2B138 80240EF8 44032000 */ mfc1 $v1, $f4 /* A2B13C 80240EFC 8E44000C */ lw $a0, 0xc($s2) /* A2B140 80240F00 44830000 */ mtc1 $v1, $f0 -/* A2B144 80240F04 00000000 */ nop +/* A2B144 80240F04 00000000 */ nop /* A2B148 80240F08 46800020 */ cvt.s.w $f0, $f0 /* A2B14C 80240F0C E480000C */ swc1 $f0, 0xc($a0) /* A2B150 80240F10 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241044_A2B284.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241044_A2B284.s index f46e53f21a..51c89dd91f 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241044_A2B284.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241044_A2B284.s @@ -8,35 +8,35 @@ glabel func_80241044_A2B284 /* A2B290 80241050 44872000 */ mtc1 $a3, $f4 /* A2B294 80241054 8FA20010 */ lw $v0, 0x10($sp) /* A2B298 80241058 460C003C */ c.lt.s $f0, $f12 -/* A2B29C 8024105C 00000000 */ nop +/* A2B29C 8024105C 00000000 */ nop /* A2B2A0 80241060 4500000F */ bc1f .L802410A0 /* A2B2A4 80241064 46067081 */ sub.s $f2, $f14, $f6 /* A2B2A8 80241068 4600103C */ c.lt.s $f2, $f0 -/* A2B2AC 8024106C 00000000 */ nop +/* A2B2AC 8024106C 00000000 */ nop /* A2B2B0 80241070 45000003 */ bc1f .L80241080 -/* A2B2B4 80241074 00000000 */ nop +/* A2B2B4 80241074 00000000 */ nop .L80241078: /* A2B2B8 80241078 03E00008 */ jr $ra /* A2B2BC 8024107C E44E0000 */ swc1 $f14, ($v0) .L80241080: /* A2B2C0 80241080 4602203C */ c.lt.s $f4, $f2 -/* A2B2C4 80241084 00000000 */ nop +/* A2B2C4 80241084 00000000 */ nop /* A2B2C8 80241088 45000012 */ bc1f .L802410D4 -/* A2B2CC 8024108C 00000000 */ nop +/* A2B2CC 8024108C 00000000 */ nop /* A2B2D0 80241090 C4400000 */ lwc1 $f0, ($v0) /* A2B2D4 80241094 46040000 */ add.s $f0, $f0, $f4 /* A2B2D8 80241098 03E00008 */ jr $ra /* A2B2DC 8024109C E4400000 */ swc1 $f0, ($v0) .L802410A0: /* A2B2E0 802410A0 4602003C */ c.lt.s $f0, $f2 -/* A2B2E4 802410A4 00000000 */ nop +/* A2B2E4 802410A4 00000000 */ nop /* A2B2E8 802410A8 4501FFF3 */ bc1t .L80241078 -/* A2B2EC 802410AC 00000000 */ nop +/* A2B2EC 802410AC 00000000 */ nop /* A2B2F0 802410B0 46002007 */ neg.s $f0, $f4 /* A2B2F4 802410B4 4600103C */ c.lt.s $f2, $f0 -/* A2B2F8 802410B8 00000000 */ nop +/* A2B2F8 802410B8 00000000 */ nop /* A2B2FC 802410BC 45000005 */ bc1f .L802410D4 -/* A2B300 802410C0 00000000 */ nop +/* A2B300 802410C0 00000000 */ nop /* A2B304 802410C4 C4400000 */ lwc1 $f0, ($v0) /* A2B308 802410C8 46040001 */ sub.s $f0, $f0, $f4 /* A2B30C 802410CC 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802410E4_A2B324.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802410E4_A2B324.s index 6860d47a41..8b2d92384c 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802410E4_A2B324.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802410E4_A2B324.s @@ -10,7 +10,7 @@ glabel func_802410E4_A2B324 /* A2B338 802410F8 44876000 */ mtc1 $a3, $f12 /* A2B33C 802410FC C7A20038 */ lwc1 $f2, 0x38($sp) /* A2B340 80241100 460C103C */ c.lt.s $f2, $f12 -/* A2B344 80241104 00000000 */ nop +/* A2B344 80241104 00000000 */ nop /* A2B348 80241108 45000002 */ bc1f .L80241114 /* A2B34C 8024110C AFBF0010 */ sw $ra, 0x10($sp) /* A2B350 80241110 46001306 */ mov.s $f12, $f2 @@ -35,18 +35,18 @@ glabel func_802410E4_A2B324 .L80241154: /* A2B394 80241154 3C0142B4 */ lui $at, 0x42b4 /* A2B398 80241158 44810000 */ mtc1 $at, $f0 -/* A2B39C 8024115C 00000000 */ nop +/* A2B39C 8024115C 00000000 */ nop /* A2B3A0 80241160 46006302 */ mul.s $f12, $f12, $f0 /* A2B3A4 80241164 0C00A8BB */ jal sin_deg -/* A2B3A8 80241168 00000000 */ nop +/* A2B3A8 80241168 00000000 */ nop /* A2B3AC 8024116C 08090492 */ j .L80241248 /* A2B3B0 80241170 46000306 */ mov.s $f12, $f0 .L80241174: /* A2B3B4 80241174 3C0141F0 */ lui $at, 0x41f0 /* A2B3B8 80241178 44810000 */ mtc1 $at, $f0 -/* A2B3BC 8024117C 00000000 */ nop +/* A2B3BC 8024117C 00000000 */ nop /* A2B3C0 80241180 4600603C */ c.lt.s $f12, $f0 -/* A2B3C4 80241184 00000000 */ nop +/* A2B3C4 80241184 00000000 */ nop /* A2B3C8 80241188 45020004 */ bc1fl .L8024119C /* A2B3CC 8024118C 46006301 */ sub.s $f12, $f12, $f0 /* A2B3D0 80241190 44806000 */ mtc1 $zero, $f12 @@ -58,7 +58,7 @@ glabel func_802410E4_A2B324 /* A2B3E4 802411A4 44811000 */ mtc1 $at, $f2 /* A2B3E8 802411A8 46006303 */ div.s $f12, $f12, $f0 /* A2B3EC 802411AC 46026302 */ mul.s $f12, $f12, $f2 -/* A2B3F0 802411B0 00000000 */ nop +/* A2B3F0 802411B0 00000000 */ nop /* A2B3F4 802411B4 3C01C2B4 */ lui $at, 0xc2b4 /* A2B3F8 802411B8 44810000 */ mtc1 $at, $f0 /* A2B3FC 802411BC 0809048C */ j .L80241230 @@ -68,42 +68,42 @@ glabel func_802410E4_A2B324 /* A2B408 802411C8 44810000 */ mtc1 $at, $f0 /* A2B40C 802411CC 46026303 */ div.s $f12, $f12, $f2 /* A2B410 802411D0 46006302 */ mul.s $f12, $f12, $f0 -/* A2B414 802411D4 00000000 */ nop +/* A2B414 802411D4 00000000 */ nop /* A2B418 802411D8 3C0142B4 */ lui $at, 0x42b4 /* A2B41C 802411DC 44810000 */ mtc1 $at, $f0 /* A2B420 802411E0 0C00A8BB */ jal sin_deg /* A2B424 802411E4 46006301 */ sub.s $f12, $f12, $f0 /* A2B428 802411E8 3C013F80 */ lui $at, 0x3f80 /* A2B42C 802411EC 44811000 */ mtc1 $at, $f2 -/* A2B430 802411F0 00000000 */ nop +/* A2B430 802411F0 00000000 */ nop /* A2B434 802411F4 46020000 */ add.s $f0, $f0, $f2 /* A2B438 802411F8 3C013FE0 */ lui $at, 0x3fe0 /* A2B43C 802411FC 44811800 */ mtc1 $at, $f3 /* A2B440 80241200 44801000 */ mtc1 $zero, $f2 /* A2B444 80241204 46000021 */ cvt.d.s $f0, $f0 /* A2B448 80241208 46220002 */ mul.d $f0, $f0, $f2 -/* A2B44C 8024120C 00000000 */ nop +/* A2B44C 8024120C 00000000 */ nop /* A2B450 80241210 08090492 */ j .L80241248 /* A2B454 80241214 46200320 */ cvt.s.d $f12, $f0 .L80241218: /* A2B458 80241218 3C0142B4 */ lui $at, 0x42b4 /* A2B45C 8024121C 44810000 */ mtc1 $at, $f0 -/* A2B460 80241220 00000000 */ nop +/* A2B460 80241220 00000000 */ nop /* A2B464 80241224 46006302 */ mul.s $f12, $f12, $f0 -/* A2B468 80241228 00000000 */ nop +/* A2B468 80241228 00000000 */ nop /* A2B46C 8024122C 46006301 */ sub.s $f12, $f12, $f0 .L80241230: /* A2B470 80241230 0C00A8BB */ jal sin_deg -/* A2B474 80241234 00000000 */ nop +/* A2B474 80241234 00000000 */ nop /* A2B478 80241238 3C013F80 */ lui $at, 0x3f80 /* A2B47C 8024123C 44811000 */ mtc1 $at, $f2 -/* A2B480 80241240 00000000 */ nop +/* A2B480 80241240 00000000 */ nop /* A2B484 80241244 46020300 */ add.s $f12, $f0, $f2 .L80241248: /* A2B488 80241248 4614B001 */ sub.s $f0, $f22, $f20 .L8024124C: /* A2B48C 8024124C 460C0002 */ mul.s $f0, $f0, $f12 -/* A2B490 80241250 00000000 */ nop +/* A2B490 80241250 00000000 */ nop /* A2B494 80241254 4600A000 */ add.s $f0, $f20, $f0 /* A2B498 80241258 8FA2003C */ lw $v0, 0x3c($sp) /* A2B49C 8024125C E4400000 */ swc1 $f0, ($v0) diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241274_A2B4B4.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241274_A2B4B4.s index 8e335819ad..1a25b8cd5e 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241274_A2B4B4.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241274_A2B4B4.s @@ -101,17 +101,17 @@ glabel func_80241274_A2B4B4 /* A2B634 802413F4 E6A404FC */ swc1 $f4, 0x4fc($s5) /* A2B638 802413F8 3C0143FA */ lui $at, 0x43fa /* A2B63C 802413FC 44811000 */ mtc1 $at, $f2 -/* A2B640 80241400 00000000 */ nop +/* A2B640 80241400 00000000 */ nop /* A2B644 80241404 46020002 */ mul.s $f0, $f0, $f2 -/* A2B648 80241408 00000000 */ nop +/* A2B648 80241408 00000000 */ nop /* A2B64C 8024140C C66C0000 */ lwc1 $f12, ($s3) /* A2B650 80241410 0C00A8D4 */ jal cos_deg /* A2B654 80241414 E6A004F0 */ swc1 $f0, 0x4f0($s5) /* A2B658 80241418 3C01C3FA */ lui $at, 0xc3fa /* A2B65C 8024141C 44811000 */ mtc1 $at, $f2 -/* A2B660 80241420 00000000 */ nop +/* A2B660 80241420 00000000 */ nop /* A2B664 80241424 46020002 */ mul.s $f0, $f0, $f2 -/* A2B668 80241428 00000000 */ nop +/* A2B668 80241428 00000000 */ nop /* A2B66C 8024142C 24020002 */ addiu $v0, $zero, 2 /* A2B670 80241430 24030001 */ addiu $v1, $zero, 1 /* A2B674 80241434 A6A30506 */ sh $v1, 0x506($s5) diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024146C_A2B6AC.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024146C_A2B6AC.s index e7e03a0ea8..1882cc4151 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024146C_A2B6AC.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024146C_A2B6AC.s @@ -110,9 +110,9 @@ glabel func_8024146C_A2B6AC /* A2B84C 8024160C E6C404FC */ swc1 $f4, 0x4fc($s6) /* A2B850 80241610 3C0143FA */ lui $at, 0x43fa /* A2B854 80241614 44811000 */ mtc1 $at, $f2 -/* A2B858 80241618 00000000 */ nop +/* A2B858 80241618 00000000 */ nop /* A2B85C 8024161C 46020002 */ mul.s $f0, $f0, $f2 -/* A2B860 80241620 00000000 */ nop +/* A2B860 80241620 00000000 */ nop /* A2B864 80241624 C66C0000 */ lwc1 $f12, ($s3) /* A2B868 80241628 0C00A8D4 */ jal cos_deg /* A2B86C 8024162C E6C004F0 */ swc1 $f0, 0x4f0($s6) @@ -121,13 +121,13 @@ glabel func_8024146C_A2B6AC /* A2B878 80241638 24020001 */ addiu $v0, $zero, 1 /* A2B87C 8024163C A6C20506 */ sh $v0, 0x506($s6) /* A2B880 80241640 46020002 */ mul.s $f0, $f0, $f2 -/* A2B884 80241644 00000000 */ nop +/* A2B884 80241644 00000000 */ nop /* A2B888 80241648 8E820000 */ lw $v0, ($s4) /* A2B88C 8024164C C6620000 */ lwc1 $f2, ($s3) /* A2B890 80241650 24420001 */ addiu $v0, $v0, 1 /* A2B894 80241654 AE820000 */ sw $v0, ($s4) /* A2B898 80241658 46161032 */ c.eq.s $f2, $f22 -/* A2B89C 8024165C 00000000 */ nop +/* A2B89C 8024165C 00000000 */ nop /* A2B8A0 80241660 45000006 */ bc1f .L8024167C /* A2B8A4 80241664 E6C004F8 */ swc1 $f0, 0x4f8($s6) /* A2B8A8 80241668 3C038025 */ lui $v1, %hi(D_802498F8) diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802416BC_A2B8FC.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802416BC_A2B8FC.s index 4980f4794f..6c4cf14012 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802416BC_A2B8FC.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802416BC_A2B8FC.s @@ -38,7 +38,7 @@ glabel func_802416BC_A2B8FC /* A2B97C 8024173C 00431023 */ subu $v0, $v0, $v1 /* A2B980 80241740 00021040 */ sll $v0, $v0, 1 /* A2B984 80241744 44826000 */ mtc1 $v0, $f12 -/* A2B988 80241748 00000000 */ nop +/* A2B988 80241748 00000000 */ nop /* A2B98C 8024174C 46806320 */ cvt.s.w $f12, $f12 /* A2B990 80241750 0C00A8BB */ jal sin_deg /* A2B994 80241754 26530194 */ addiu $s3, $s2, 0x194 @@ -50,16 +50,16 @@ glabel func_802416BC_A2B8FC /* A2B9AC 8024176C 00431023 */ subu $v0, $v0, $v1 /* A2B9B0 80241770 00021040 */ sll $v0, $v0, 1 /* A2B9B4 80241774 4600A502 */ mul.s $f20, $f20, $f0 -/* A2B9B8 80241778 00000000 */ nop +/* A2B9B8 80241778 00000000 */ nop /* A2B9BC 8024177C 44826000 */ mtc1 $v0, $f12 -/* A2B9C0 80241780 00000000 */ nop +/* A2B9C0 80241780 00000000 */ nop /* A2B9C4 80241784 0C00A8D4 */ jal cos_deg /* A2B9C8 80241788 46806320 */ cvt.s.w $f12, $f12 /* A2B9CC 8024178C C6020000 */ lwc1 $f2, ($s0) /* A2B9D0 80241790 46001082 */ mul.s $f2, $f2, $f0 -/* A2B9D4 80241794 00000000 */ nop +/* A2B9D4 80241794 00000000 */ nop /* A2B9D8 80241798 4480B000 */ mtc1 $zero, $f22 -/* A2B9DC 8024179C 00000000 */ nop +/* A2B9DC 8024179C 00000000 */ nop /* A2B9E0 802417A0 4407B000 */ mfc1 $a3, $f22 /* A2B9E4 802417A4 4405A000 */ mfc1 $a1, $f20 /* A2B9E8 802417A8 44061000 */ mfc1 $a2, $f2 @@ -68,13 +68,13 @@ glabel func_802416BC_A2B8FC /* A2B9F4 802417B4 C6020000 */ lwc1 $f2, ($s0) /* A2B9F8 802417B8 3C014140 */ lui $at, 0x4140 /* A2B9FC 802417BC 44810000 */ mtc1 $at, $f0 -/* A2BA00 802417C0 00000000 */ nop +/* A2BA00 802417C0 00000000 */ nop /* A2BA04 802417C4 46020001 */ sub.s $f0, $f0, $f2 /* A2BA08 802417C8 3C018025 */ lui $at, %hi(D_8024F1E8) /* A2BA0C 802417CC D424F1E8 */ ldc1 $f4, %lo(D_8024F1E8)($at) /* A2BA10 802417D0 46000021 */ cvt.d.s $f0, $f0 /* A2BA14 802417D4 46240002 */ mul.d $f0, $f0, $f4 -/* A2BA18 802417D8 00000000 */ nop +/* A2BA18 802417D8 00000000 */ nop /* A2BA1C 802417DC 8E220000 */ lw $v0, ($s1) /* A2BA20 802417E0 460010A1 */ cvt.d.s $f2, $f2 /* A2BA24 802417E4 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241850_A2BA90.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241850_A2BA90.s index 82ea6aa00e..4adee3ddf9 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241850_A2BA90.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241850_A2BA90.s @@ -38,7 +38,7 @@ glabel func_80241850_A2BA90 /* A2BB10 802418D0 00431023 */ subu $v0, $v0, $v1 /* A2BB14 802418D4 00021040 */ sll $v0, $v0, 1 /* A2BB18 802418D8 44826000 */ mtc1 $v0, $f12 -/* A2BB1C 802418DC 00000000 */ nop +/* A2BB1C 802418DC 00000000 */ nop /* A2BB20 802418E0 0C00A8BB */ jal sin_deg /* A2BB24 802418E4 46806320 */ cvt.s.w $f12, $f12 /* A2BB28 802418E8 3C108025 */ lui $s0, %hi(D_8024990C) @@ -49,14 +49,14 @@ glabel func_80241850_A2BA90 /* A2BB3C 802418FC 00431023 */ subu $v0, $v0, $v1 /* A2BB40 80241900 00021040 */ sll $v0, $v0, 1 /* A2BB44 80241904 4600B582 */ mul.s $f22, $f22, $f0 -/* A2BB48 80241908 00000000 */ nop +/* A2BB48 80241908 00000000 */ nop /* A2BB4C 8024190C 44826000 */ mtc1 $v0, $f12 -/* A2BB50 80241910 00000000 */ nop +/* A2BB50 80241910 00000000 */ nop /* A2BB54 80241914 0C00A8D4 */ jal cos_deg /* A2BB58 80241918 46806320 */ cvt.s.w $f12, $f12 /* A2BB5C 8024191C C6140000 */ lwc1 $f20, ($s0) /* A2BB60 80241920 4600A502 */ mul.s $f20, $f20, $f0 -/* A2BB64 80241924 00000000 */ nop +/* A2BB64 80241924 00000000 */ nop /* A2BB68 80241928 4480C000 */ mtc1 $zero, $f24 /* A2BB6C 8024192C 26300194 */ addiu $s0, $s1, 0x194 /* A2BB70 80241930 4407C000 */ mfc1 $a3, $f24 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802419F4_A2BC34.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802419F4_A2BC34.s index 1b3f901e7c..bd98e1d900 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802419F4_A2BC34.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802419F4_A2BC34.s @@ -48,7 +48,7 @@ glabel func_802419F4_A2BC34 /* A2BCDC 80241A9C 00220821 */ addu $at, $at, $v0 /* A2BCE0 80241AA0 84229934 */ lh $v0, %lo(D_80249934)($at) /* A2BCE4 80241AA4 44820000 */ mtc1 $v0, $f0 -/* A2BCE8 80241AA8 00000000 */ nop +/* A2BCE8 80241AA8 00000000 */ nop /* A2BCEC 80241AAC 46800020 */ cvt.s.w $f0, $f0 /* A2BCF0 80241AB0 080906BE */ j .L80241AF8 /* A2BCF4 80241AB4 E600003C */ swc1 $f0, 0x3c($s0) @@ -62,10 +62,10 @@ glabel func_802419F4_A2BC34 /* A2BD10 80241AD0 3421CCCD */ ori $at, $at, 0xcccd /* A2BD14 80241AD4 44810000 */ mtc1 $at, $f0 /* A2BD18 80241AD8 44821000 */ mtc1 $v0, $f2 -/* A2BD1C 80241ADC 00000000 */ nop +/* A2BD1C 80241ADC 00000000 */ nop /* A2BD20 80241AE0 468010A0 */ cvt.s.w $f2, $f2 /* A2BD24 80241AE4 46001082 */ mul.s $f2, $f2, $f0 -/* A2BD28 80241AE8 00000000 */ nop +/* A2BD28 80241AE8 00000000 */ nop /* A2BD2C 80241AEC C600003C */ lwc1 $f0, 0x3c($s0) /* A2BD30 80241AF0 46020000 */ add.s $f0, $f0, $f2 /* A2BD34 80241AF4 E600003C */ swc1 $f0, 0x3c($s0) diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241B40_A2BD80.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241B40_A2BD80.s index 734b067363..8356782118 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241B40_A2BD80.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241B40_A2BD80.s @@ -51,10 +51,10 @@ glabel func_80241B40_A2BD80 /* A2BE34 80241BF4 3421CCCD */ ori $at, $at, 0xcccd /* A2BE38 80241BF8 44810000 */ mtc1 $at, $f0 /* A2BE3C 80241BFC 44821000 */ mtc1 $v0, $f2 -/* A2BE40 80241C00 00000000 */ nop +/* A2BE40 80241C00 00000000 */ nop /* A2BE44 80241C04 468010A0 */ cvt.s.w $f2, $f2 /* A2BE48 80241C08 46001082 */ mul.s $f2, $f2, $f0 -/* A2BE4C 80241C0C 00000000 */ nop +/* A2BE4C 80241C0C 00000000 */ nop /* A2BE50 80241C10 C600003C */ lwc1 $f0, 0x3c($s0) /* A2BE54 80241C14 46020000 */ add.s $f0, $f0, $f2 /* A2BE58 80241C18 E600003C */ swc1 $f0, 0x3c($s0) diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241C54_A2BE94.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241C54_A2BE94.s index 6ceb781eda..e164a27f18 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241C54_A2BE94.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241C54_A2BE94.s @@ -37,7 +37,7 @@ glabel func_80241C54_A2BE94 /* A2BF14 80241CD4 C6200000 */ lwc1 $f0, ($s1) /* A2BF18 80241CD8 0040182D */ daddu $v1, $v0, $zero /* A2BF1C 80241CDC 46140032 */ c.eq.s $f0, $f20 -/* A2BF20 80241CE0 00000000 */ nop +/* A2BF20 80241CE0 00000000 */ nop /* A2BF24 80241CE4 45010002 */ bc1t .L80241CF0 /* A2BF28 80241CE8 A6030506 */ sh $v1, 0x506($s0) /* A2BF2C 80241CEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241D08_A2BF48.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241D08_A2BF48.s index 2619359a01..3ed3db69f6 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241D08_A2BF48.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241D08_A2BF48.s @@ -22,7 +22,7 @@ glabel func_80241D08_A2BF48 /* A2BF8C 80241D4C A4820000 */ sh $v0, ($a0) .L80241D50: /* A2BF90 80241D50 44800000 */ mtc1 $zero, $f0 -/* A2BF94 80241D54 00000000 */ nop +/* A2BF94 80241D54 00000000 */ nop /* A2BF98 80241D58 44050000 */ mfc1 $a1, $f0 /* A2BF9C 80241D5C 24840194 */ addiu $a0, $a0, 0x194 /* A2BFA0 80241D60 00A0302D */ daddu $a2, $a1, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241D7C_A2BFBC.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241D7C_A2BFBC.s index bdb5e200af..15e4dd028b 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241D7C_A2BFBC.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241D7C_A2BFBC.s @@ -29,10 +29,10 @@ glabel func_80241D7C_A2BFBC /* A2C018 80241DD8 8C830000 */ lw $v1, ($a0) /* A2C01C 80241DDC 2402001E */ addiu $v0, $zero, 0x1e /* A2C020 80241DE0 14620005 */ bne $v1, $v0, .L80241DF8 -/* A2C024 80241DE4 00000000 */ nop +/* A2C024 80241DE4 00000000 */ nop /* A2C028 80241DE8 3C0142B4 */ lui $at, 0x42b4 /* A2C02C 80241DEC 44810000 */ mtc1 $at, $f0 -/* A2C030 80241DF0 00000000 */ nop +/* A2C030 80241DF0 00000000 */ nop /* A2C034 80241DF4 E4A0000C */ swc1 $f0, 0xc($a1) .L80241DF8: /* A2C038 80241DF8 8C860000 */ lw $a2, ($a0) @@ -46,7 +46,7 @@ glabel func_80241D7C_A2BFBC /* A2C058 80241E18 3C0491A2 */ lui $a0, 0x91a2 /* A2C05C 80241E1C 2442FF6F */ addiu $v0, $v0, -0x91 /* A2C060 80241E20 44820000 */ mtc1 $v0, $f0 -/* A2C064 80241E24 00000000 */ nop +/* A2C064 80241E24 00000000 */ nop /* A2C068 80241E28 46800020 */ cvt.s.w $f0, $f0 /* A2C06C 80241E2C E4A00038 */ swc1 $f0, 0x38($a1) /* A2C070 80241E30 84620002 */ lh $v0, 2($v1) @@ -65,7 +65,7 @@ glabel func_80241D7C_A2BFBC /* A2C0A4 80241E64 00431023 */ subu $v0, $v0, $v1 /* A2C0A8 80241E68 24420093 */ addiu $v0, $v0, 0x93 /* A2C0AC 80241E6C 44820000 */ mtc1 $v0, $f0 -/* A2C0B0 80241E70 00000000 */ nop +/* A2C0B0 80241E70 00000000 */ nop /* A2C0B4 80241E74 46800020 */ cvt.s.w $f0, $f0 /* A2C0B8 80241E78 28C20014 */ slti $v0, $a2, 0x14 /* A2C0BC 80241E7C 1040000F */ beqz $v0, .L80241EBC @@ -73,10 +73,10 @@ glabel func_80241D7C_A2BFBC /* A2C0C4 80241E84 3C0141F0 */ lui $at, 0x41f0 /* A2C0C8 80241E88 44810000 */ mtc1 $at, $f0 /* A2C0CC 80241E8C 44861000 */ mtc1 $a2, $f2 -/* A2C0D0 80241E90 00000000 */ nop +/* A2C0D0 80241E90 00000000 */ nop /* A2C0D4 80241E94 468010A0 */ cvt.s.w $f2, $f2 /* A2C0D8 80241E98 46001082 */ mul.s $f2, $f2, $f0 -/* A2C0DC 80241E9C 00000000 */ nop +/* A2C0DC 80241E9C 00000000 */ nop /* A2C0E0 80241EA0 3C0141A0 */ lui $at, 0x41a0 /* A2C0E4 80241EA4 44812000 */ mtc1 $at, $f4 /* A2C0E8 80241EA8 3C0142E4 */ lui $at, 0x42e4 @@ -87,7 +87,7 @@ glabel func_80241D7C_A2BFBC .L80241EBC: /* A2C0FC 80241EBC 3C0142A8 */ lui $at, 0x42a8 /* A2C100 80241EC0 44810000 */ mtc1 $at, $f0 -/* A2C104 80241EC4 00000000 */ nop +/* A2C104 80241EC4 00000000 */ nop .L80241EC8: /* A2C108 80241EC8 E4A00040 */ swc1 $f0, 0x40($a1) /* A2C10C 80241ECC C4A00038 */ lwc1 $f0, 0x38($a1) @@ -105,10 +105,10 @@ glabel func_80241D7C_A2BFBC /* A2C138 80241EF8 3421CCCD */ ori $at, $at, 0xcccd /* A2C13C 80241EFC 44810000 */ mtc1 $at, $f0 /* A2C140 80241F00 44821000 */ mtc1 $v0, $f2 -/* A2C144 80241F04 00000000 */ nop +/* A2C144 80241F04 00000000 */ nop /* A2C148 80241F08 468010A0 */ cvt.s.w $f2, $f2 /* A2C14C 80241F0C 46001082 */ mul.s $f2, $f2, $f0 -/* A2C150 80241F10 00000000 */ nop +/* A2C150 80241F10 00000000 */ nop /* A2C154 80241F14 C4A0003C */ lwc1 $f0, 0x3c($a1) /* A2C158 80241F18 46020000 */ add.s $f0, $f0, $f2 /* A2C15C 80241F1C E4A0003C */ swc1 $f0, 0x3c($a1) diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241F54_A2C194.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241F54_A2C194.s index 6e404336b7..7a2ab3066a 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241F54_A2C194.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241F54_A2C194.s @@ -39,10 +39,10 @@ glabel func_80241F54_A2C194 /* A2C218 80241FD8 3421CCCD */ ori $at, $at, 0xcccd /* A2C21C 80241FDC 44810000 */ mtc1 $at, $f0 /* A2C220 80241FE0 44821000 */ mtc1 $v0, $f2 -/* A2C224 80241FE4 00000000 */ nop +/* A2C224 80241FE4 00000000 */ nop /* A2C228 80241FE8 468010A0 */ cvt.s.w $f2, $f2 /* A2C22C 80241FEC 46001082 */ mul.s $f2, $f2, $f0 -/* A2C230 80241FF0 00000000 */ nop +/* A2C230 80241FF0 00000000 */ nop /* A2C234 80241FF4 C4A0003C */ lwc1 $f0, 0x3c($a1) /* A2C238 80241FF8 24630001 */ addiu $v1, $v1, 1 /* A2C23C 80241FFC 46020000 */ add.s $f0, $f0, $f2 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802425A0_A2C7E0.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802425A0_A2C7E0.s index 4cbcffe61f..59107b4401 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802425A0_A2C7E0.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802425A0_A2C7E0.s @@ -70,12 +70,12 @@ glabel func_802425A0_A2C7E0 /* A2C8E4 802426A4 0C00A8BB */ jal sin_deg /* A2C8E8 802426A8 E60204B8 */ swc1 $f2, 0x4b8($s0) /* A2C8EC 802426AC 46140002 */ mul.s $f0, $f0, $f20 -/* A2C8F0 802426B0 00000000 */ nop +/* A2C8F0 802426B0 00000000 */ nop /* A2C8F4 802426B4 C62C0000 */ lwc1 $f12, ($s1) /* A2C8F8 802426B8 0C00A8D4 */ jal cos_deg /* A2C8FC 802426BC E60004F0 */ swc1 $f0, 0x4f0($s0) /* A2C900 802426C0 46140002 */ mul.s $f0, $f0, $f20 -/* A2C904 802426C4 00000000 */ nop +/* A2C904 802426C4 00000000 */ nop /* A2C908 802426C8 8E420000 */ lw $v0, ($s2) /* A2C90C 802426CC 24420001 */ addiu $v0, $v0, 1 /* A2C910 802426D0 AE420000 */ sw $v0, ($s2) diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242704_A2C944.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242704_A2C944.s index f93f360e25..7316709189 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242704_A2C944.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242704_A2C944.s @@ -81,14 +81,14 @@ glabel func_80242704_A2C944 /* A2CA74 80242834 3C0143FA */ lui $at, 0x43fa /* A2CA78 80242838 4481A000 */ mtc1 $at, $f20 /* A2CA7C 8024283C 0C00A8BB */ jal sin_deg -/* A2CA80 80242840 00000000 */ nop +/* A2CA80 80242840 00000000 */ nop /* A2CA84 80242844 46140002 */ mul.s $f0, $f0, $f20 -/* A2CA88 80242848 00000000 */ nop +/* A2CA88 80242848 00000000 */ nop /* A2CA8C 8024284C C66C0000 */ lwc1 $f12, ($s3) /* A2CA90 80242850 0C00A8D4 */ jal cos_deg /* A2CA94 80242854 E60004F0 */ swc1 $f0, 0x4f0($s0) /* A2CA98 80242858 46140002 */ mul.s $f0, $f0, $f20 -/* A2CA9C 8024285C 00000000 */ nop +/* A2CA9C 8024285C 00000000 */ nop /* A2CAA0 80242860 8EA50000 */ lw $a1, ($s5) /* A2CAA4 80242864 0000202D */ daddu $a0, $zero, $zero /* A2CAA8 80242868 0C090355 */ jal func_80240D54_A2AF94 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802428C8_A2CB08.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802428C8_A2CB08.s index f2dd749e6e..f83f3c0936 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802428C8_A2CB08.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802428C8_A2CB08.s @@ -42,11 +42,12 @@ glabel func_802428C8_A2CB08 /* A2CB9C 8024295C 104000CE */ beqz $v0, .L80242C98 /* A2CBA0 80242960 0080882D */ daddu $s1, $a0, $zero /* A2CBA4 80242964 00031080 */ sll $v0, $v1, 2 -/* A2CBA8 80242968 3C018025 */ lui $at, %hi(D_8024F1F0) +/* A2CBA8 80242968 3C018025 */ lui $at, %hi(jtbl_8024F1F0_A39430) /* A2CBAC 8024296C 00220821 */ addu $at, $at, $v0 -/* A2CBB0 80242970 8C22F1F0 */ lw $v0, %lo(D_8024F1F0)($at) +/* A2CBB0 80242970 8C22F1F0 */ lw $v0, %lo(jtbl_8024F1F0_A39430)($at) /* A2CBB4 80242974 00400008 */ jr $v0 -/* A2CBB8 80242978 00000000 */ nop +/* A2CBB8 80242978 00000000 */ nop +glabel L8024297C_A2CBBC /* A2CBBC 8024297C 3C108025 */ lui $s0, %hi(D_8024F3F8) /* A2CBC0 80242980 2610F3F8 */ addiu $s0, $s0, %lo(D_8024F3F8) /* A2CBC4 80242984 0200902D */ daddu $s2, $s0, $zero @@ -57,25 +58,26 @@ glabel func_802428C8_A2CB08 /* A2CBD8 80242998 4481F000 */ mtc1 $at, $f30 /* A2CBDC 8024299C 00551021 */ addu $v0, $v0, $s5 /* A2CBE0 802429A0 44821000 */ mtc1 $v0, $f2 -/* A2CBE4 802429A4 00000000 */ nop +/* A2CBE4 802429A4 00000000 */ nop /* A2CBE8 802429A8 468010A1 */ cvt.d.w $f2, $f2 /* A2CBEC 802429AC 04410006 */ bgez $v0, .L802429C8 /* A2CBF0 802429B0 24140003 */ addiu $s4, $zero, 3 /* A2CBF4 802429B4 3C0141F0 */ lui $at, 0x41f0 /* A2CBF8 802429B8 44810800 */ mtc1 $at, $f1 /* A2CBFC 802429BC 44800000 */ mtc1 $zero, $f0 -/* A2CC00 802429C0 00000000 */ nop +/* A2CC00 802429C0 00000000 */ nop /* A2CC04 802429C4 46201080 */ add.d $f2, $f2, $f0 .L802429C8: /* A2CC08 802429C8 3C014080 */ lui $at, 0x4080 /* A2CC0C 802429CC 44810000 */ mtc1 $at, $f0 /* A2CC10 802429D0 46201520 */ cvt.s.d $f20, $f2 /* A2CC14 802429D4 4600A502 */ mul.s $f20, $f20, $f0 -/* A2CC18 802429D8 00000000 */ nop +/* A2CC18 802429D8 00000000 */ nop /* A2CC1C 802429DC 3C018025 */ lui $at, %hi(D_8024F208) /* A2CC20 802429E0 D420F208 */ ldc1 $f0, %lo(D_8024F208)($at) /* A2CC24 802429E4 08090B41 */ j .L80242D04 /* A2CC28 802429E8 4600A521 */ cvt.d.s $f20, $f20 +glabel L802429EC_A2CC2C /* A2CC2C 802429EC 3C108025 */ lui $s0, %hi(D_8024F420) /* A2CC30 802429F0 2610F420 */ addiu $s0, $s0, %lo(D_8024F420) /* A2CC34 802429F4 0200902D */ daddu $s2, $s0, $zero @@ -86,25 +88,26 @@ glabel func_802428C8_A2CB08 /* A2CC48 80242A08 4481F000 */ mtc1 $at, $f30 /* A2CC4C 80242A0C 00551021 */ addu $v0, $v0, $s5 /* A2CC50 80242A10 44821000 */ mtc1 $v0, $f2 -/* A2CC54 80242A14 00000000 */ nop +/* A2CC54 80242A14 00000000 */ nop /* A2CC58 80242A18 468010A1 */ cvt.d.w $f2, $f2 /* A2CC5C 80242A1C 04410006 */ bgez $v0, .L80242A38 /* A2CC60 80242A20 24140003 */ addiu $s4, $zero, 3 /* A2CC64 80242A24 3C0141F0 */ lui $at, 0x41f0 /* A2CC68 80242A28 44810800 */ mtc1 $at, $f1 /* A2CC6C 80242A2C 44800000 */ mtc1 $zero, $f0 -/* A2CC70 80242A30 00000000 */ nop +/* A2CC70 80242A30 00000000 */ nop /* A2CC74 80242A34 46201080 */ add.d $f2, $f2, $f0 .L80242A38: /* A2CC78 80242A38 3C014080 */ lui $at, 0x4080 /* A2CC7C 80242A3C 44810000 */ mtc1 $at, $f0 /* A2CC80 80242A40 46201520 */ cvt.s.d $f20, $f2 /* A2CC84 80242A44 4600A502 */ mul.s $f20, $f20, $f0 -/* A2CC88 80242A48 00000000 */ nop +/* A2CC88 80242A48 00000000 */ nop /* A2CC8C 80242A4C 3C018025 */ lui $at, %hi(D_8024F210) /* A2CC90 80242A50 D420F210 */ ldc1 $f0, %lo(D_8024F210)($at) /* A2CC94 80242A54 08090B41 */ j .L80242D04 /* A2CC98 80242A58 4600A521 */ cvt.d.s $f20, $f20 +glabel L80242A5C_A2CC9C /* A2CC9C 80242A5C 3C108025 */ lui $s0, %hi(D_8024F448) /* A2CCA0 80242A60 2610F448 */ addiu $s0, $s0, %lo(D_8024F448) /* A2CCA4 80242A64 0200902D */ daddu $s2, $s0, $zero @@ -115,25 +118,26 @@ glabel func_802428C8_A2CB08 /* A2CCB8 80242A78 4481F000 */ mtc1 $at, $f30 /* A2CCBC 80242A7C 00551021 */ addu $v0, $v0, $s5 /* A2CCC0 80242A80 44821000 */ mtc1 $v0, $f2 -/* A2CCC4 80242A84 00000000 */ nop +/* A2CCC4 80242A84 00000000 */ nop /* A2CCC8 80242A88 468010A1 */ cvt.d.w $f2, $f2 /* A2CCCC 80242A8C 04410006 */ bgez $v0, .L80242AA8 /* A2CCD0 80242A90 24140003 */ addiu $s4, $zero, 3 /* A2CCD4 80242A94 3C0141F0 */ lui $at, 0x41f0 /* A2CCD8 80242A98 44810800 */ mtc1 $at, $f1 /* A2CCDC 80242A9C 44800000 */ mtc1 $zero, $f0 -/* A2CCE0 80242AA0 00000000 */ nop +/* A2CCE0 80242AA0 00000000 */ nop /* A2CCE4 80242AA4 46201080 */ add.d $f2, $f2, $f0 .L80242AA8: /* A2CCE8 80242AA8 3C014080 */ lui $at, 0x4080 /* A2CCEC 80242AAC 44810000 */ mtc1 $at, $f0 /* A2CCF0 80242AB0 46201520 */ cvt.s.d $f20, $f2 /* A2CCF4 80242AB4 4600A502 */ mul.s $f20, $f20, $f0 -/* A2CCF8 80242AB8 00000000 */ nop +/* A2CCF8 80242AB8 00000000 */ nop /* A2CCFC 80242ABC 3C018025 */ lui $at, %hi(D_8024F218) /* A2CD00 80242AC0 D420F218 */ ldc1 $f0, %lo(D_8024F218)($at) /* A2CD04 80242AC4 08090B41 */ j .L80242D04 /* A2CD08 80242AC8 4600A521 */ cvt.d.s $f20, $f20 +glabel L80242ACC_A2CD0C /* A2CD0C 80242ACC 3C108025 */ lui $s0, %hi(D_8024F470) /* A2CD10 80242AD0 2610F470 */ addiu $s0, $s0, %lo(D_8024F470) /* A2CD14 80242AD4 8E22000C */ lw $v0, 0xc($s1) @@ -143,21 +147,21 @@ glabel func_802428C8_A2CB08 /* A2CD24 80242AE4 4481F000 */ mtc1 $at, $f30 /* A2CD28 80242AE8 00551021 */ addu $v0, $v0, $s5 /* A2CD2C 80242AEC 44821000 */ mtc1 $v0, $f2 -/* A2CD30 80242AF0 00000000 */ nop +/* A2CD30 80242AF0 00000000 */ nop /* A2CD34 80242AF4 468010A1 */ cvt.d.w $f2, $f2 /* A2CD38 80242AF8 04410006 */ bgez $v0, .L80242B14 /* A2CD3C 80242AFC 0200902D */ daddu $s2, $s0, $zero /* A2CD40 80242B00 3C0141F0 */ lui $at, 0x41f0 /* A2CD44 80242B04 44810800 */ mtc1 $at, $f1 /* A2CD48 80242B08 44800000 */ mtc1 $zero, $f0 -/* A2CD4C 80242B0C 00000000 */ nop +/* A2CD4C 80242B0C 00000000 */ nop /* A2CD50 80242B10 46201080 */ add.d $f2, $f2, $f0 .L80242B14: /* A2CD54 80242B14 3C014080 */ lui $at, 0x4080 /* A2CD58 80242B18 44810000 */ mtc1 $at, $f0 /* A2CD5C 80242B1C 46201520 */ cvt.s.d $f20, $f2 /* A2CD60 80242B20 4600A502 */ mul.s $f20, $f20, $f0 -/* A2CD64 80242B24 00000000 */ nop +/* A2CD64 80242B24 00000000 */ nop /* A2CD68 80242B28 3C018025 */ lui $at, %hi(D_8024F220) /* A2CD6C 80242B2C D420F220 */ ldc1 $f0, %lo(D_8024F220)($at) /* A2CD70 80242B30 4600A521 */ cvt.d.s $f20, $f20 @@ -171,29 +175,30 @@ glabel func_802428C8_A2CB08 /* A2CD90 80242B50 0C00A8BB */ jal sin_deg /* A2CD94 80242B54 46000606 */ mov.s $f24, $f0 /* A2CD98 80242B58 46160002 */ mul.s $f0, $f0, $f22 -/* A2CD9C 80242B5C 00000000 */ nop +/* A2CD9C 80242B5C 00000000 */ nop /* A2CDA0 80242B60 46180002 */ mul.s $f0, $f0, $f24 -/* A2CDA4 80242B64 00000000 */ nop +/* A2CDA4 80242B64 00000000 */ nop /* A2CDA8 80242B68 8E22000C */ lw $v0, 0xc($s1) /* A2CDAC 80242B6C C4420004 */ lwc1 $f2, 4($v0) /* A2CDB0 80242B70 46001680 */ add.s $f26, $f2, $f0 /* A2CDB4 80242B74 0C00A8D4 */ jal cos_deg /* A2CDB8 80242B78 4600A306 */ mov.s $f12, $f20 /* A2CDBC 80242B7C 46160002 */ mul.s $f0, $f0, $f22 -/* A2CDC0 80242B80 00000000 */ nop +/* A2CDC0 80242B80 00000000 */ nop /* A2CDC4 80242B84 8E22000C */ lw $v0, 0xc($s1) /* A2CDC8 80242B88 C4420008 */ lwc1 $f2, 8($v0) /* A2CDCC 80242B8C 46001500 */ add.s $f20, $f2, $f0 /* A2CDD0 80242B90 0C00A8BB */ jal sin_deg /* A2CDD4 80242B94 4600F306 */ mov.s $f12, $f30 /* A2CDD8 80242B98 46160002 */ mul.s $f0, $f0, $f22 -/* A2CDDC 80242B9C 00000000 */ nop +/* A2CDDC 80242B9C 00000000 */ nop /* A2CDE0 80242BA0 46180002 */ mul.s $f0, $f0, $f24 -/* A2CDE4 80242BA4 00000000 */ nop +/* A2CDE4 80242BA4 00000000 */ nop /* A2CDE8 80242BA8 8E22000C */ lw $v0, 0xc($s1) /* A2CDEC 80242BAC C442000C */ lwc1 $f2, 0xc($v0) /* A2CDF0 80242BB0 08090B60 */ j .L80242D80 /* A2CDF4 80242BB4 24140003 */ addiu $s4, $zero, 3 +glabel L80242BB8_A2CDF8 /* A2CDF8 80242BB8 3C108025 */ lui $s0, %hi(D_8024F498) /* A2CDFC 80242BBC 2610F498 */ addiu $s0, $s0, %lo(D_8024F498) /* A2CE00 80242BC0 0200902D */ daddu $s2, $s0, $zero @@ -204,25 +209,26 @@ glabel func_802428C8_A2CB08 /* A2CE14 80242BD4 4481F000 */ mtc1 $at, $f30 /* A2CE18 80242BD8 00551021 */ addu $v0, $v0, $s5 /* A2CE1C 80242BDC 44821000 */ mtc1 $v0, $f2 -/* A2CE20 80242BE0 00000000 */ nop +/* A2CE20 80242BE0 00000000 */ nop /* A2CE24 80242BE4 468010A1 */ cvt.d.w $f2, $f2 /* A2CE28 80242BE8 04410006 */ bgez $v0, .L80242C04 /* A2CE2C 80242BEC 24140003 */ addiu $s4, $zero, 3 /* A2CE30 80242BF0 3C0141F0 */ lui $at, 0x41f0 /* A2CE34 80242BF4 44810800 */ mtc1 $at, $f1 /* A2CE38 80242BF8 44800000 */ mtc1 $zero, $f0 -/* A2CE3C 80242BFC 00000000 */ nop +/* A2CE3C 80242BFC 00000000 */ nop /* A2CE40 80242C00 46201080 */ add.d $f2, $f2, $f0 .L80242C04: /* A2CE44 80242C04 3C014080 */ lui $at, 0x4080 /* A2CE48 80242C08 44810000 */ mtc1 $at, $f0 /* A2CE4C 80242C0C 46201520 */ cvt.s.d $f20, $f2 /* A2CE50 80242C10 4600A502 */ mul.s $f20, $f20, $f0 -/* A2CE54 80242C14 00000000 */ nop +/* A2CE54 80242C14 00000000 */ nop /* A2CE58 80242C18 3C018025 */ lui $at, %hi(D_8024F228) /* A2CE5C 80242C1C D420F228 */ ldc1 $f0, %lo(D_8024F228)($at) /* A2CE60 80242C20 08090B41 */ j .L80242D04 /* A2CE64 80242C24 4600A521 */ cvt.d.s $f20, $f20 +glabel L80242C28_A2CE68 /* A2CE68 80242C28 3C108025 */ lui $s0, %hi(D_8024F4C0) /* A2CE6C 80242C2C 2610F4C0 */ addiu $s0, $s0, %lo(D_8024F4C0) /* A2CE70 80242C30 0200902D */ daddu $s2, $s0, $zero @@ -233,21 +239,21 @@ glabel func_802428C8_A2CB08 /* A2CE84 80242C44 4481F000 */ mtc1 $at, $f30 /* A2CE88 80242C48 00551021 */ addu $v0, $v0, $s5 /* A2CE8C 80242C4C 44821000 */ mtc1 $v0, $f2 -/* A2CE90 80242C50 00000000 */ nop +/* A2CE90 80242C50 00000000 */ nop /* A2CE94 80242C54 468010A1 */ cvt.d.w $f2, $f2 /* A2CE98 80242C58 04410006 */ bgez $v0, .L80242C74 /* A2CE9C 80242C5C 24140003 */ addiu $s4, $zero, 3 /* A2CEA0 80242C60 3C0141F0 */ lui $at, 0x41f0 /* A2CEA4 80242C64 44810800 */ mtc1 $at, $f1 /* A2CEA8 80242C68 44800000 */ mtc1 $zero, $f0 -/* A2CEAC 80242C6C 00000000 */ nop +/* A2CEAC 80242C6C 00000000 */ nop /* A2CEB0 80242C70 46201080 */ add.d $f2, $f2, $f0 .L80242C74: /* A2CEB4 80242C74 3C014080 */ lui $at, 0x4080 /* A2CEB8 80242C78 44810000 */ mtc1 $at, $f0 /* A2CEBC 80242C7C 46201520 */ cvt.s.d $f20, $f2 /* A2CEC0 80242C80 4600A502 */ mul.s $f20, $f20, $f0 -/* A2CEC4 80242C84 00000000 */ nop +/* A2CEC4 80242C84 00000000 */ nop /* A2CEC8 80242C88 3C018025 */ lui $at, %hi(D_8024F230) /* A2CECC 80242C8C D420F230 */ ldc1 $f0, %lo(D_8024F230)($at) /* A2CED0 80242C90 08090B41 */ j .L80242D04 @@ -263,21 +269,21 @@ glabel func_802428C8_A2CB08 /* A2CEF4 80242CB4 4481F000 */ mtc1 $at, $f30 /* A2CEF8 80242CB8 00551021 */ addu $v0, $v0, $s5 /* A2CEFC 80242CBC 44821000 */ mtc1 $v0, $f2 -/* A2CF00 80242CC0 00000000 */ nop +/* A2CF00 80242CC0 00000000 */ nop /* A2CF04 80242CC4 468010A1 */ cvt.d.w $f2, $f2 /* A2CF08 80242CC8 04410006 */ bgez $v0, .L80242CE4 /* A2CF0C 80242CCC 24140003 */ addiu $s4, $zero, 3 /* A2CF10 80242CD0 3C0141F0 */ lui $at, 0x41f0 /* A2CF14 80242CD4 44810800 */ mtc1 $at, $f1 /* A2CF18 80242CD8 44800000 */ mtc1 $zero, $f0 -/* A2CF1C 80242CDC 00000000 */ nop +/* A2CF1C 80242CDC 00000000 */ nop /* A2CF20 80242CE0 46201080 */ add.d $f2, $f2, $f0 .L80242CE4: /* A2CF24 80242CE4 3C014080 */ lui $at, 0x4080 /* A2CF28 80242CE8 44810000 */ mtc1 $at, $f0 /* A2CF2C 80242CEC 46201520 */ cvt.s.d $f20, $f2 /* A2CF30 80242CF0 4600A502 */ mul.s $f20, $f20, $f0 -/* A2CF34 80242CF4 00000000 */ nop +/* A2CF34 80242CF4 00000000 */ nop /* A2CF38 80242CF8 3C018025 */ lui $at, %hi(D_8024F238) /* A2CF3C 80242CFC D420F238 */ ldc1 $f0, %lo(D_8024F238)($at) /* A2CF40 80242D00 4600A521 */ cvt.d.s $f20, $f20 @@ -292,25 +298,25 @@ glabel func_802428C8_A2CB08 /* A2CF60 80242D20 0C00A8BB */ jal sin_deg /* A2CF64 80242D24 46000606 */ mov.s $f24, $f0 /* A2CF68 80242D28 46160002 */ mul.s $f0, $f0, $f22 -/* A2CF6C 80242D2C 00000000 */ nop +/* A2CF6C 80242D2C 00000000 */ nop /* A2CF70 80242D30 46180002 */ mul.s $f0, $f0, $f24 -/* A2CF74 80242D34 00000000 */ nop +/* A2CF74 80242D34 00000000 */ nop /* A2CF78 80242D38 8E22000C */ lw $v0, 0xc($s1) /* A2CF7C 80242D3C C4420004 */ lwc1 $f2, 4($v0) /* A2CF80 80242D40 46001680 */ add.s $f26, $f2, $f0 /* A2CF84 80242D44 0C00A8D4 */ jal cos_deg /* A2CF88 80242D48 4600A306 */ mov.s $f12, $f20 /* A2CF8C 80242D4C 46160002 */ mul.s $f0, $f0, $f22 -/* A2CF90 80242D50 00000000 */ nop +/* A2CF90 80242D50 00000000 */ nop /* A2CF94 80242D54 8E22000C */ lw $v0, 0xc($s1) /* A2CF98 80242D58 C4420008 */ lwc1 $f2, 8($v0) /* A2CF9C 80242D5C 46001500 */ add.s $f20, $f2, $f0 /* A2CFA0 80242D60 0C00A8BB */ jal sin_deg /* A2CFA4 80242D64 4600F306 */ mov.s $f12, $f30 /* A2CFA8 80242D68 46160002 */ mul.s $f0, $f0, $f22 -/* A2CFAC 80242D6C 00000000 */ nop +/* A2CFAC 80242D6C 00000000 */ nop /* A2CFB0 80242D70 46180002 */ mul.s $f0, $f0, $f24 -/* A2CFB4 80242D74 00000000 */ nop +/* A2CFB4 80242D74 00000000 */ nop /* A2CFB8 80242D78 8E22000C */ lw $v0, 0xc($s1) /* A2CFBC 80242D7C C442000C */ lwc1 $f2, 0xc($v0) .L80242D80: @@ -342,14 +348,14 @@ glabel func_802428C8_A2CB08 /* A2D024 80242DE4 0C0B210B */ jal get_float_variable /* A2D028 80242DE8 34A53C80 */ ori $a1, $a1, 0x3c80 /* A2D02C 80242DEC 461C0002 */ mul.s $f0, $f0, $f28 -/* A2D030 80242DF0 00000000 */ nop +/* A2D030 80242DF0 00000000 */ nop /* A2D034 80242DF4 3C013F80 */ lui $at, 0x3f80 /* A2D038 80242DF8 4481A000 */ mtc1 $at, $f20 -/* A2D03C 80242DFC 00000000 */ nop +/* A2D03C 80242DFC 00000000 */ nop /* A2D040 80242E00 461CA501 */ sub.s $f20, $f20, $f28 /* A2D044 80242E04 C6220000 */ lwc1 $f2, ($s1) /* A2D048 80242E08 46141082 */ mul.s $f2, $f2, $f20 -/* A2D04C 80242E0C 00000000 */ nop +/* A2D04C 80242E0C 00000000 */ nop /* A2D050 80242E10 0260202D */ daddu $a0, $s3, $zero /* A2D054 80242E14 46020000 */ add.s $f0, $f0, $f2 /* A2D058 80242E18 3C05FE36 */ lui $a1, 0xfe36 @@ -357,10 +363,10 @@ glabel func_802428C8_A2CB08 /* A2D060 80242E20 0C0B210B */ jal get_float_variable /* A2D064 80242E24 E6400000 */ swc1 $f0, ($s2) /* A2D068 80242E28 461C0002 */ mul.s $f0, $f0, $f28 -/* A2D06C 80242E2C 00000000 */ nop +/* A2D06C 80242E2C 00000000 */ nop /* A2D070 80242E30 C6220004 */ lwc1 $f2, 4($s1) /* A2D074 80242E34 46141082 */ mul.s $f2, $f2, $f20 -/* A2D078 80242E38 00000000 */ nop +/* A2D078 80242E38 00000000 */ nop /* A2D07C 80242E3C 46020000 */ add.s $f0, $f0, $f2 /* A2D080 80242E40 C7A40010 */ lwc1 $f4, 0x10($sp) /* A2D084 80242E44 0260202D */ daddu $a0, $s3, $zero @@ -370,10 +376,10 @@ glabel func_802428C8_A2CB08 /* A2D094 80242E54 0C0B210B */ jal get_float_variable /* A2D098 80242E58 E6400004 */ swc1 $f0, 4($s2) /* A2D09C 80242E5C 461C0002 */ mul.s $f0, $f0, $f28 -/* A2D0A0 80242E60 00000000 */ nop +/* A2D0A0 80242E60 00000000 */ nop /* A2D0A4 80242E64 C6220008 */ lwc1 $f2, 8($s1) /* A2D0A8 80242E68 46141082 */ mul.s $f2, $f2, $f20 -/* A2D0AC 80242E6C 00000000 */ nop +/* A2D0AC 80242E6C 00000000 */ nop /* A2D0B0 80242E70 08090BC8 */ j .L80242F20 /* A2D0B4 80242E74 46020000 */ add.s $f0, $f0, $f2 .L80242E78: @@ -382,14 +388,14 @@ glabel func_802428C8_A2CB08 /* A2D0C0 80242E80 0C0B210B */ jal get_float_variable /* A2D0C4 80242E84 34A53C80 */ ori $a1, $a1, 0x3c80 /* A2D0C8 80242E88 461C0002 */ mul.s $f0, $f0, $f28 -/* A2D0CC 80242E8C 00000000 */ nop +/* A2D0CC 80242E8C 00000000 */ nop /* A2D0D0 80242E90 3C013F80 */ lui $at, 0x3f80 /* A2D0D4 80242E94 4481A000 */ mtc1 $at, $f20 -/* A2D0D8 80242E98 00000000 */ nop +/* A2D0D8 80242E98 00000000 */ nop /* A2D0DC 80242E9C 461CA501 */ sub.s $f20, $f20, $f28 /* A2D0E0 80242EA0 C6220000 */ lwc1 $f2, ($s1) /* A2D0E4 80242EA4 46141082 */ mul.s $f2, $f2, $f20 -/* A2D0E8 80242EA8 00000000 */ nop +/* A2D0E8 80242EA8 00000000 */ nop /* A2D0EC 80242EAC 46020000 */ add.s $f0, $f0, $f2 /* A2D0F0 80242EB0 3C014248 */ lui $at, 0x4248 /* A2D0F4 80242EB4 4481B000 */ mtc1 $at, $f22 @@ -400,10 +406,10 @@ glabel func_802428C8_A2CB08 /* A2D108 80242EC8 0C0B210B */ jal get_float_variable /* A2D10C 80242ECC E6400000 */ swc1 $f0, ($s2) /* A2D110 80242ED0 461C0002 */ mul.s $f0, $f0, $f28 -/* A2D114 80242ED4 00000000 */ nop +/* A2D114 80242ED4 00000000 */ nop /* A2D118 80242ED8 C6220004 */ lwc1 $f2, 4($s1) /* A2D11C 80242EDC 46141082 */ mul.s $f2, $f2, $f20 -/* A2D120 80242EE0 00000000 */ nop +/* A2D120 80242EE0 00000000 */ nop /* A2D124 80242EE4 46020000 */ add.s $f0, $f0, $f2 /* A2D128 80242EE8 C7A40010 */ lwc1 $f4, 0x10($sp) /* A2D12C 80242EEC 0260202D */ daddu $a0, $s3, $zero @@ -413,10 +419,10 @@ glabel func_802428C8_A2CB08 /* A2D13C 80242EFC 0C0B210B */ jal get_float_variable /* A2D140 80242F00 E6400004 */ swc1 $f0, 4($s2) /* A2D144 80242F04 461C0002 */ mul.s $f0, $f0, $f28 -/* A2D148 80242F08 00000000 */ nop +/* A2D148 80242F08 00000000 */ nop /* A2D14C 80242F0C C6220008 */ lwc1 $f2, 8($s1) /* A2D150 80242F10 46141082 */ mul.s $f2, $f2, $f20 -/* A2D154 80242F14 00000000 */ nop +/* A2D154 80242F14 00000000 */ nop /* A2D158 80242F18 46020000 */ add.s $f0, $f0, $f2 /* A2D15C 80242F1C 46160001 */ sub.s $f0, $f0, $f22 .L80242F20: diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242F74_A2D1B4.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242F74_A2D1B4.s index 9af3a3e1d1..3c235c7292 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242F74_A2D1B4.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242F74_A2D1B4.s @@ -35,7 +35,7 @@ glabel func_80242F74_A2D1B4 /* A2D22C 80242FEC 0040182D */ daddu $v1, $v0, $zero /* A2D230 80242FF0 A6030506 */ sh $v1, 0x506($s0) /* A2D234 80242FF4 46020032 */ c.eq.s $f0, $f2 -/* A2D238 80242FF8 00000000 */ nop +/* A2D238 80242FF8 00000000 */ nop /* A2D23C 80242FFC 45010002 */ bc1t .L80243008 /* A2D240 80243000 E60004DC */ swc1 $f0, 0x4dc($s0) /* A2D244 80243004 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243ED0_A2E110.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243ED0_A2E110.s index d2b2c30902..40dabcd188 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243ED0_A2E110.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243ED0_A2E110.s @@ -17,7 +17,7 @@ glabel func_80243ED0_A2E110 /* A2E13C 80243EFC 0461FFFD */ bgez $v1, .L80243EF4 /* A2E140 80243F00 24420002 */ addiu $v0, $v0, 2 /* A2E144 80243F04 08090FEE */ j .L80243FB8 -/* A2E148 80243F08 00000000 */ nop +/* A2E148 80243F08 00000000 */ nop .L80243F0C: /* A2E14C 80243F0C 14800010 */ bnez $a0, .L80243F50 /* A2E150 80243F10 00052080 */ sll $a0, $a1, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802440D0_A2E310.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802440D0_A2E310.s index fc586d8f66..6be2357aa9 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802440D0_A2E310.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802440D0_A2E310.s @@ -10,16 +10,18 @@ glabel func_802440D0_A2E310 /* A2E324 802440E4 104000D4 */ beqz $v0, .L80244438 /* A2E328 802440E8 AFB00010 */ sw $s0, 0x10($sp) /* A2E32C 802440EC 00031080 */ sll $v0, $v1, 2 -/* A2E330 802440F0 3C018025 */ lui $at, %hi(D_8024F240) +/* A2E330 802440F0 3C018025 */ lui $at, %hi(jtbl_8024F240_A39480) /* A2E334 802440F4 00220821 */ addu $at, $at, $v0 -/* A2E338 802440F8 8C22F240 */ lw $v0, %lo(D_8024F240)($at) +/* A2E338 802440F8 8C22F240 */ lw $v0, %lo(jtbl_8024F240_A39480)($at) /* A2E33C 802440FC 00400008 */ jr $v0 -/* A2E340 80244100 00000000 */ nop +/* A2E340 80244100 00000000 */ nop +glabel L80244104_A2E344 /* A2E344 80244104 3C048025 */ lui $a0, %hi(D_8024AAB0) /* A2E348 80244108 2484AAB0 */ addiu $a0, $a0, %lo(D_8024AAB0) /* A2E34C 8024410C 3C038025 */ lui $v1, %hi(D_8024AAB4) /* A2E350 80244110 08091097 */ j .L8024425C /* A2E354 80244114 8C63AAB4 */ lw $v1, %lo(D_8024AAB4)($v1) +glabel L80244118_A2E358 /* A2E358 80244118 3C068025 */ lui $a2, %hi(D_8024AAB8) /* A2E35C 8024411C 24C6AAB8 */ addiu $a2, $a2, %lo(D_8024AAB8) /* A2E360 80244120 8CC20000 */ lw $v0, ($a2) @@ -39,6 +41,7 @@ glabel func_802440D0_A2E310 /* A2E394 80244154 AC430000 */ sw $v1, ($v0) /* A2E398 80244158 08091111 */ j .L80244444 /* A2E39C 8024415C 0000102D */ daddu $v0, $zero, $zero +glabel L80244160_A2E3A0 /* A2E3A0 80244160 3C058025 */ lui $a1, %hi(D_8024AAB8) /* A2E3A4 80244164 24A5AAB8 */ addiu $a1, $a1, %lo(D_8024AAB8) /* A2E3A8 80244168 8CA30000 */ lw $v1, ($a1) @@ -60,7 +63,7 @@ glabel func_802440D0_A2E310 /* A2E3E4 802441A4 AC620000 */ sw $v0, ($v1) /* A2E3E8 802441A8 28A20005 */ slti $v0, $a1, 5 /* A2E3EC 802441AC 10400011 */ beqz $v0, .L802441F4 -/* A2E3F0 802441B0 00000000 */ nop +/* A2E3F0 802441B0 00000000 */ nop /* A2E3F4 802441B4 3C108025 */ lui $s0, %hi(D_8024AA20) /* A2E3F8 802441B8 2610AA20 */ addiu $s0, $s0, %lo(D_8024AA20) /* A2E3FC 802441BC 8E020000 */ lw $v0, ($s0) @@ -100,6 +103,7 @@ glabel func_802440D0_A2E310 /* A2E478 80244238 A4820000 */ sh $v0, ($a0) /* A2E47C 8024423C 08091110 */ j .L80244440 /* A2E480 80244240 ACA30000 */ sw $v1, ($a1) +glabel L80244244_A2E484 /* A2E484 80244244 3C038025 */ lui $v1, %hi(D_8024AAB4) /* A2E488 80244248 8C63AAB4 */ lw $v1, %lo(D_8024AAB4)($v1) /* A2E48C 8024424C 3C048025 */ lui $a0, %hi(D_8024AAB0) @@ -118,6 +122,7 @@ glabel func_802440D0_A2E310 /* A2E4BC 8024427C AC23AAB8 */ sw $v1, %lo(D_8024AAB8)($at) /* A2E4C0 80244280 08091111 */ j .L80244444 /* A2E4C4 80244284 0000102D */ daddu $v0, $zero, $zero +glabel L80244288_A2E4C8 /* A2E4C8 80244288 3C068025 */ lui $a2, %hi(D_8024AAB8) /* A2E4CC 8024428C 24C6AAB8 */ addiu $a2, $a2, %lo(D_8024AAB8) /* A2E4D0 80244290 8CC30000 */ lw $v1, ($a2) @@ -132,7 +137,7 @@ glabel func_802440D0_A2E310 /* A2E4F4 802442B4 2442FEF4 */ addiu $v0, $v0, -0x10c /* A2E4F8 802442B8 0062102A */ slt $v0, $v1, $v0 /* A2E4FC 802442BC 10400028 */ beqz $v0, .L80244360 -/* A2E500 802442C0 00000000 */ nop +/* A2E500 802442C0 00000000 */ nop /* A2E504 802442C4 3C048025 */ lui $a0, %hi(D_8024AABC) /* A2E508 802442C8 8C84AABC */ lw $a0, %lo(D_8024AABC)($a0) /* A2E50C 802442CC 2C820140 */ sltiu $v0, $a0, 0x140 @@ -160,7 +165,7 @@ glabel func_802440D0_A2E310 /* A2E560 80244320 A4A20044 */ sh $v0, 0x44($a1) /* A2E564 80244324 2C62000D */ sltiu $v0, $v1, 0xd /* A2E568 80244328 10400008 */ beqz $v0, .L8024434C -/* A2E56C 8024432C 00000000 */ nop +/* A2E56C 8024432C 00000000 */ nop /* A2E570 80244330 3C028025 */ lui $v0, %hi(D_8024AC7B) /* A2E574 80244334 9042AC7B */ lbu $v0, %lo(D_8024AC7B)($v0) /* A2E578 80244338 3C038025 */ lui $v1, %hi(D_8024AC9C) @@ -196,6 +201,7 @@ glabel func_802440D0_A2E310 /* A2E5E4 802443A4 A462005C */ sh $v0, 0x5c($v1) /* A2E5E8 802443A8 08091111 */ j .L80244444 /* A2E5EC 802443AC 0000102D */ daddu $v0, $zero, $zero +glabel L802443B0_A2E5F0 /* A2E5F0 802443B0 3C058025 */ lui $a1, %hi(D_8024AAB8) /* A2E5F4 802443B4 24A5AAB8 */ addiu $a1, $a1, %lo(D_8024AAB8) /* A2E5F8 802443B8 8CA30000 */ lw $v1, ($a1) @@ -234,6 +240,7 @@ glabel func_802440D0_A2E310 /* A2E670 80244430 08091110 */ j .L80244440 /* A2E674 80244434 AC620000 */ sw $v0, ($v1) .L80244438: +glabel L80244438_A2E678 /* A2E678 80244438 08091111 */ j .L80244444 /* A2E67C 8024443C 24020001 */ addiu $v0, $zero, 1 .L80244440: diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244774_A2E9B4.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244774_A2E9B4.s index f8cf061aaa..627232e455 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244774_A2E9B4.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244774_A2E9B4.s @@ -53,7 +53,7 @@ glabel func_80244774_A2E9B4 /* A2EA70 80244830 24020001 */ addiu $v0, $zero, 1 /* A2EA74 80244834 E6620070 */ swc1 $f2, 0x70($s3) /* A2EA78 80244838 4600A03C */ c.lt.s $f20, $f0 -/* A2EA7C 8024483C 00000000 */ nop +/* A2EA7C 8024483C 00000000 */ nop /* A2EA80 80244840 45010002 */ bc1t .L8024484C /* A2EA84 80244844 E6000000 */ swc1 $f0, ($s0) /* A2EA88 80244848 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024486C_A2EAAC.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024486C_A2EAAC.s index ea074e3af1..3a4f10f5d7 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024486C_A2EAAC.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024486C_A2EAAC.s @@ -37,13 +37,13 @@ glabel func_8024486C_A2EAAC /* A2EB28 802448E8 C6020000 */ lwc1 $f2, ($s0) /* A2EB2C 802448EC 3C013F80 */ lui $at, 0x3f80 /* A2EB30 802448F0 44810000 */ mtc1 $at, $f0 -/* A2EB34 802448F4 00000000 */ nop +/* A2EB34 802448F4 00000000 */ nop /* A2EB38 802448F8 46001080 */ add.s $f2, $f2, $f0 /* A2EB3C 802448FC C620003C */ lwc1 $f0, 0x3c($s1) /* A2EB40 80244900 24020001 */ addiu $v0, $zero, 1 /* A2EB44 80244904 E6200070 */ swc1 $f0, 0x70($s1) /* A2EB48 80244908 4602A03C */ c.lt.s $f20, $f2 -/* A2EB4C 8024490C 00000000 */ nop +/* A2EB4C 8024490C 00000000 */ nop /* A2EB50 80244910 45010002 */ bc1t .L8024491C /* A2EB54 80244914 E6020000 */ swc1 $f2, ($s0) /* A2EB58 80244918 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244934_A2EB74.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244934_A2EB74.s index df9d36bc18..ad2edb12af 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244934_A2EB74.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244934_A2EB74.s @@ -23,12 +23,12 @@ glabel func_80244934_A2EB74 /* A2EBB8 80244978 000210C0 */ sll $v0, $v0, 3 /* A2EBBC 8024497C 00431021 */ addu $v0, $v0, $v1 /* A2EBC0 80244980 44820000 */ mtc1 $v0, $f0 -/* A2EBC4 80244984 00000000 */ nop +/* A2EBC4 80244984 00000000 */ nop /* A2EBC8 80244988 46800020 */ cvt.s.w $f0, $f0 /* A2EBCC 8024498C 44050000 */ mfc1 $a1, $f0 .L80244990: /* A2EBD0 80244990 0C04DF69 */ jal func_80137DA4 -/* A2EBD4 80244994 00000000 */ nop +/* A2EBD4 80244994 00000000 */ nop /* A2EBD8 80244998 24040001 */ addiu $a0, $zero, 1 /* A2EBDC 8024499C 240500FA */ addiu $a1, $zero, 0xfa /* A2EBE0 802449A0 00A0302D */ daddu $a2, $a1, $zero @@ -50,6 +50,6 @@ glabel func_80244934_A2EB74 /* A2EC18 802449D8 8FBF0010 */ lw $ra, 0x10($sp) /* A2EC1C 802449DC 03E00008 */ jr $ra /* A2EC20 802449E0 27BD0018 */ addiu $sp, $sp, 0x18 -/* A2EC24 802449E4 00000000 */ nop -/* A2EC28 802449E8 00000000 */ nop -/* A2EC2C 802449EC 00000000 */ nop +/* A2EC24 802449E4 00000000 */ nop +/* A2EC28 802449E8 00000000 */ nop +/* A2EC2C 802449EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/update_heroes_start_turn_A2C264.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/update_heroes_start_turn_A2C264.s index c3caee949d..316d5ffa89 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/update_heroes_start_turn_A2C264.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/update_heroes_start_turn_A2C264.s @@ -56,7 +56,7 @@ glabel update_heroes_start_turn_A2C264 /* A2C330 802420F0 1482002C */ bne $a0, $v0, .L802421A4 /* A2C334 802420F4 E60004DC */ swc1 $f0, 0x4dc($s0) /* A2C338 802420F8 46140032 */ c.eq.s $f0, $f20 -/* A2C33C 802420FC 00000000 */ nop +/* A2C33C 802420FC 00000000 */ nop /* A2C340 80242100 45010028 */ bc1t .L802421A4 /* A2C344 80242104 0260202D */ daddu $a0, $s3, $zero /* A2C348 80242108 0C0B36B0 */ jal resolve_npc @@ -74,7 +74,7 @@ glabel update_heroes_start_turn_A2C264 /* A2C378 80242138 44810000 */ mtc1 $at, $f0 /* A2C37C 8024213C 2463FFFB */ addiu $v1, $v1, -5 /* A2C380 80242140 44831000 */ mtc1 $v1, $f2 -/* A2C384 80242144 00000000 */ nop +/* A2C384 80242144 00000000 */ nop /* A2C388 80242148 468010A0 */ cvt.s.w $f2, $f2 /* A2C38C 8024214C 46002101 */ sub.s $f4, $f4, $f0 /* A2C390 80242150 E7A20010 */ swc1 $f2, 0x10($sp) @@ -94,7 +94,7 @@ glabel update_heroes_start_turn_A2C264 /* A2C3C8 80242188 AFA20024 */ sw $v0, 0x24($sp) /* A2C3CC 8024218C 2463FFE2 */ addiu $v1, $v1, -0x1e /* A2C3D0 80242190 44830000 */ mtc1 $v1, $f0 -/* A2C3D4 80242194 00000000 */ nop +/* A2C3D4 80242194 00000000 */ nop /* A2C3D8 80242198 46800020 */ cvt.s.w $f0, $f0 /* A2C3DC 8024219C 0C01C34C */ jal func_80070D30 /* A2C3E0 802421A0 E7A00018 */ swc1 $f0, 0x18($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0_A2EC30.s b/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0_A2EC30.s index 5175723fd2..6140ff4ad2 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0_A2EC30.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0_A2EC30.s @@ -11,7 +11,7 @@ glabel func_802449F0_A2EC30 /* A2EC48 80244A08 AFB00028 */ sw $s0, 0x28($sp) /* A2EC4C 80244A0C 8C620000 */ lw $v0, ($v1) /* A2EC50 80244A10 14400007 */ bnez $v0, .L80244A30 -/* A2EC54 80244A14 00000000 */ nop +/* A2EC54 80244A14 00000000 */ nop /* A2EC58 80244A18 3C028007 */ lui $v0, %hi(D_800779B0) /* A2EC5C 80244A1C 904279B0 */ lbu $v0, %lo(D_800779B0)($v0) /* A2EC60 80244A20 00021080 */ sll $v0, $v0, 2 @@ -24,11 +24,12 @@ glabel func_802449F0_A2EC30 /* A2EC78 80244A38 2C620005 */ sltiu $v0, $v1, 5 /* A2EC7C 80244A3C 10400050 */ beqz $v0, .L80244B80 /* A2EC80 80244A40 00031080 */ sll $v0, $v1, 2 -/* A2EC84 80244A44 3C018025 */ lui $at, %hi(D_8024F260) +/* A2EC84 80244A44 3C018025 */ lui $at, %hi(jtbl_8024F260_A394A0) /* A2EC88 80244A48 00220821 */ addu $at, $at, $v0 -/* A2EC8C 80244A4C 8C22F260 */ lw $v0, %lo(D_8024F260)($at) +/* A2EC8C 80244A4C 8C22F260 */ lw $v0, %lo(jtbl_8024F260_A394A0)($at) /* A2EC90 80244A50 00400008 */ jr $v0 -/* A2EC94 80244A54 00000000 */ nop +/* A2EC94 80244A54 00000000 */ nop +glabel L80244A58_A2EC98 /* A2EC98 80244A58 3C048025 */ lui $a0, %hi(D_8024DA98) /* A2EC9C 80244A5C 8C84DA98 */ lw $a0, %lo(D_8024DA98)($a0) /* A2ECA0 80244A60 8C830000 */ lw $v1, ($a0) @@ -37,7 +38,7 @@ glabel func_802449F0_A2EC30 /* A2ECAC 80244A6C 24020004 */ addiu $v0, $zero, 4 /* A2ECB0 80244A70 8C830004 */ lw $v1, 4($a0) /* A2ECB4 80244A74 080912AB */ j .L80244AAC -/* A2ECB8 80244A78 00000000 */ nop +/* A2ECB8 80244A78 00000000 */ nop .L80244A7C: /* A2ECBC 80244A7C 3C038025 */ lui $v1, %hi(D_8024DA94) /* A2ECC0 80244A80 2463DA94 */ addiu $v1, $v1, %lo(D_8024DA94) @@ -58,6 +59,7 @@ glabel func_802449F0_A2EC30 /* A2ECF8 80244AB8 AC23F570 */ sw $v1, %lo(D_8024F570)($at) /* A2ECFC 80244ABC 080912E1 */ j .L80244B84 /* A2ED00 80244AC0 24040001 */ addiu $a0, $zero, 1 +glabel L80244AC4_A2ED04 /* A2ED04 80244AC4 3C038025 */ lui $v1, %hi(D_8024F570) /* A2ED08 80244AC8 2463F570 */ addiu $v1, $v1, %lo(D_8024F570) /* A2ED0C 80244ACC 8C620000 */ lw $v0, ($v1) @@ -68,6 +70,7 @@ glabel func_802449F0_A2EC30 /* A2ED20 80244AE0 AC22DA90 */ sw $v0, %lo(D_8024DA90)($at) /* A2ED24 80244AE4 080912E1 */ j .L80244B84 /* A2ED28 80244AE8 24040001 */ addiu $a0, $zero, 1 +glabel L80244AEC_A2ED2C /* A2ED2C 80244AEC 3C048025 */ lui $a0, %hi(D_8024DA94) /* A2ED30 80244AF0 2484DA94 */ addiu $a0, $a0, %lo(D_8024DA94) /* A2ED34 80244AF4 8C820000 */ lw $v0, ($a0) @@ -83,7 +86,8 @@ glabel func_802449F0_A2EC30 /* A2ED5C 80244B1C 10800011 */ beqz $a0, .L80244B64 /* A2ED60 80244B20 AC430000 */ sw $v1, ($v0) /* A2ED64 80244B24 080912DE */ j .L80244B78 -/* A2ED68 80244B28 00000000 */ nop +/* A2ED68 80244B28 00000000 */ nop +glabel L80244B2C_A2ED6C /* A2ED6C 80244B2C 3C038025 */ lui $v1, %hi(D_8024F570) /* A2ED70 80244B30 2463F570 */ addiu $v1, $v1, %lo(D_8024F570) /* A2ED74 80244B34 8C620000 */ lw $v0, ($v1) @@ -110,6 +114,7 @@ glabel func_802449F0_A2EC30 /* A2EDB8 80244B78 3C018025 */ lui $at, %hi(D_8024DA90) /* A2EDBC 80244B7C AC20DA90 */ sw $zero, %lo(D_8024DA90)($at) .L80244B80: +glabel L80244B80_A2EDC0 /* A2EDC0 80244B80 24040001 */ addiu $a0, $zero, 1 .L80244B84: /* A2EDC4 80244B84 27B00018 */ addiu $s0, $sp, 0x18 @@ -123,30 +128,30 @@ glabel func_802449F0_A2EC30 /* A2EDE4 80244BA4 C7A2001C */ lwc1 $f2, 0x1c($sp) /* A2EDE8 80244BA8 3C01437F */ lui $at, 0x437f /* A2EDEC 80244BAC 44812000 */ mtc1 $at, $f4 -/* A2EDF0 80244BB0 00000000 */ nop +/* A2EDF0 80244BB0 00000000 */ nop /* A2EDF4 80244BB4 46022081 */ sub.s $f2, $f4, $f2 /* A2EDF8 80244BB8 3C018025 */ lui $at, %hi(D_8024DA94) /* A2EDFC 80244BBC C420DA94 */ lwc1 $f0, %lo(D_8024DA94)($at) /* A2EE00 80244BC0 46800020 */ cvt.s.w $f0, $f0 /* A2EE04 80244BC4 46020002 */ mul.s $f0, $f0, $f2 -/* A2EE08 80244BC8 00000000 */ nop +/* A2EE08 80244BC8 00000000 */ nop /* A2EE0C 80244BCC C7A20020 */ lwc1 $f2, 0x20($sp) /* A2EE10 80244BD0 46022081 */ sub.s $f2, $f4, $f2 /* A2EE14 80244BD4 46020002 */ mul.s $f0, $f0, $f2 -/* A2EE18 80244BD8 00000000 */ nop +/* A2EE18 80244BD8 00000000 */ nop /* A2EE1C 80244BDC 46040003 */ div.s $f0, $f0, $f4 /* A2EE20 80244BE0 46040003 */ div.s $f0, $f0, $f4 /* A2EE24 80244BE4 4600018D */ trunc.w.s $f6, $f0 /* A2EE28 80244BE8 44113000 */ mfc1 $s1, $f6 -/* A2EE2C 80244BEC 00000000 */ nop +/* A2EE2C 80244BEC 00000000 */ nop /* A2EE30 80244BF0 1A200015 */ blez $s1, .L80244C48 -/* A2EE34 80244BF4 00000000 */ nop +/* A2EE34 80244BF4 00000000 */ nop /* A2EE38 80244BF8 3C128025 */ lui $s2, %hi(D_8024DA98) /* A2EE3C 80244BFC 2652DA98 */ addiu $s2, $s2, %lo(D_8024DA98) /* A2EE40 80244C00 8E420000 */ lw $v0, ($s2) /* A2EE44 80244C04 8C440000 */ lw $a0, ($v0) /* A2EE48 80244C08 1080000F */ beqz $a0, .L80244C48 -/* A2EE4C 80244C0C 00000000 */ nop +/* A2EE4C 80244C0C 00000000 */ nop /* A2EE50 80244C10 0C04992C */ jal func_801264B0 /* A2EE54 80244C14 0000802D */ daddu $s0, $zero, $zero /* A2EE58 80244C18 28420002 */ slti $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_80244C8C_A2EECC.s b/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_80244C8C_A2EECC.s index 111d9bf828..01406ab605 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_80244C8C_A2EECC.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_80244C8C_A2EECC.s @@ -5,13 +5,13 @@ glabel func_80244C8C_A2EECC /* A2EECC 80244C8C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* A2EED0 80244C90 AFBF0010 */ sw $ra, 0x10($sp) /* A2EED4 80244C94 0C090C40 */ jal func_80243100_A2D340 -/* A2EED8 80244C98 00000000 */ nop +/* A2EED8 80244C98 00000000 */ nop /* A2EEDC 80244C9C 3C048025 */ lui $a0, %hi(D_8024DBCC) /* A2EEE0 80244CA0 0C09127C */ jal func_802449F0_A2EC30 /* A2EEE4 80244CA4 2484DBCC */ addiu $a0, $a0, %lo(D_8024DBCC) /* A2EEE8 80244CA8 8FBF0010 */ lw $ra, 0x10($sp) /* A2EEEC 80244CAC 03E00008 */ jr $ra /* A2EEF0 80244CB0 27BD0018 */ addiu $sp, $sp, 0x18 -/* A2EEF4 80244CB4 00000000 */ nop -/* A2EEF8 80244CB8 00000000 */ nop -/* A2EEFC 80244CBC 00000000 */ nop +/* A2EEF4 80244CB4 00000000 */ nop +/* A2EEF8 80244CB8 00000000 */ nop +/* A2EEFC 80244CBC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80244DE4_A2F024.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80244DE4_A2F024.s index 5c3137a869..cb9e408cea 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80244DE4_A2F024.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80244DE4_A2F024.s @@ -71,20 +71,20 @@ glabel func_80244DE4_A2F024 /* A2F12C 80244EEC 12620008 */ beq $s3, $v0, .L80244F10 /* A2F130 80244EF0 32C400FF */ andi $a0, $s6, 0xff /* A2F134 80244EF4 080913E1 */ j .L80244F84 -/* A2F138 80244EF8 00000000 */ nop +/* A2F138 80244EF8 00000000 */ nop .L80244EFC: /* A2F13C 80244EFC 24020003 */ addiu $v0, $zero, 3 /* A2F140 80244F00 12620018 */ beq $s3, $v0, .L80244F64 /* A2F144 80244F04 32C400FF */ andi $a0, $s6, 0xff /* A2F148 80244F08 080913E1 */ j .L80244F84 -/* A2F14C 80244F0C 00000000 */ nop +/* A2F14C 80244F0C 00000000 */ nop .L80244F10: /* A2F150 80244F10 32A500FF */ andi $a1, $s5, 0xff /* A2F154 80244F14 328600FF */ andi $a2, $s4, 0xff /* A2F158 80244F18 0C046F97 */ jal set_background_color_blend /* A2F15C 80244F1C 324700FF */ andi $a3, $s2, 0xff /* A2F160 80244F20 080913E1 */ j .L80244F84 -/* A2F164 80244F24 00000000 */ nop +/* A2F164 80244F24 00000000 */ nop .L80244F28: /* A2F168 80244F28 32C400FF */ andi $a0, $s6, 0xff /* A2F16C 80244F2C 32A500FF */ andi $a1, $s5, 0xff @@ -100,7 +100,7 @@ glabel func_80244DE4_A2F024 /* A2F194 80244F54 0C046FAD */ jal func_8011BEB4 /* A2F198 80244F58 AFA20018 */ sw $v0, 0x18($sp) /* A2F19C 80244F5C 080913E1 */ j .L80244F84 -/* A2F1A0 80244F60 00000000 */ nop +/* A2F1A0 80244F60 00000000 */ nop .L80244F64: /* A2F1A4 80244F64 32A500FF */ andi $a1, $s5, 0xff /* A2F1A8 80244F68 328600FF */ andi $a2, $s4, 0xff diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802452C4_A2F504.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802452C4_A2F504.s index 213a614b51..4cb4f90008 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802452C4_A2F504.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802452C4_A2F504.s @@ -72,7 +72,7 @@ glabel func_802452C4_A2F504 /* A2F60C 802453CC 2631F5A0 */ addiu $s1, $s1, %lo(D_8024F5A0) /* A2F610 802453D0 8E2F0000 */ lw $t7, ($s1) /* A2F614 802453D4 19E00088 */ blez $t7, .L802455F8 -/* A2F618 802453D8 00000000 */ nop +/* A2F618 802453D8 00000000 */ nop /* A2F61C 802453DC 3C108025 */ lui $s0, %hi(D_8024F5A4) /* A2F620 802453E0 2610F5A4 */ addiu $s0, $s0, %lo(D_8024F5A4) /* A2F624 802453E4 8E030000 */ lw $v1, ($s0) @@ -84,7 +84,7 @@ glabel func_802452C4_A2F504 /* A2F63C 802453FC 00441023 */ subu $v0, $v0, $a0 /* A2F640 80245400 00430018 */ mult $v0, $v1 /* A2F644 80245404 00004012 */ mflo $t0 -/* A2F648 80245408 00000000 */ nop +/* A2F648 80245408 00000000 */ nop /* A2F64C 8024540C 15E00002 */ bnez $t7, .L80245418 /* A2F650 80245410 010F001A */ div $zero, $t0, $t7 /* A2F654 80245414 0007000D */ break 7 @@ -93,7 +93,7 @@ glabel func_802452C4_A2F504 /* A2F65C 8024541C 15E10004 */ bne $t7, $at, .L80245430 /* A2F660 80245420 3C018000 */ lui $at, 0x8000 /* A2F664 80245424 15010002 */ bne $t0, $at, .L80245430 -/* A2F668 80245428 00000000 */ nop +/* A2F668 80245428 00000000 */ nop /* A2F66C 8024542C 0006000D */ break 6 .L80245430: /* A2F670 80245430 00007012 */ mflo $t6 @@ -104,7 +104,7 @@ glabel func_802452C4_A2F504 /* A2F684 80245444 00451023 */ subu $v0, $v0, $a1 /* A2F688 80245448 00430018 */ mult $v0, $v1 /* A2F68C 8024544C 00004012 */ mflo $t0 -/* A2F690 80245450 00000000 */ nop +/* A2F690 80245450 00000000 */ nop /* A2F694 80245454 15E00002 */ bnez $t7, .L80245460 /* A2F698 80245458 010F001A */ div $zero, $t0, $t7 /* A2F69C 8024545C 0007000D */ break 7 @@ -113,7 +113,7 @@ glabel func_802452C4_A2F504 /* A2F6A4 80245464 15E10004 */ bne $t7, $at, .L80245478 /* A2F6A8 80245468 3C018000 */ lui $at, 0x8000 /* A2F6AC 8024546C 15010002 */ bne $t0, $at, .L80245478 -/* A2F6B0 80245470 00000000 */ nop +/* A2F6B0 80245470 00000000 */ nop /* A2F6B4 80245474 0006000D */ break 6 .L80245478: /* A2F6B8 80245478 00006812 */ mflo $t5 @@ -124,7 +124,7 @@ glabel func_802452C4_A2F504 /* A2F6CC 8024548C 00461023 */ subu $v0, $v0, $a2 /* A2F6D0 80245490 00430018 */ mult $v0, $v1 /* A2F6D4 80245494 00004012 */ mflo $t0 -/* A2F6D8 80245498 00000000 */ nop +/* A2F6D8 80245498 00000000 */ nop /* A2F6DC 8024549C 15E00002 */ bnez $t7, .L802454A8 /* A2F6E0 802454A0 010F001A */ div $zero, $t0, $t7 /* A2F6E4 802454A4 0007000D */ break 7 @@ -133,7 +133,7 @@ glabel func_802452C4_A2F504 /* A2F6EC 802454AC 15E10004 */ bne $t7, $at, .L802454C0 /* A2F6F0 802454B0 3C018000 */ lui $at, 0x8000 /* A2F6F4 802454B4 15010002 */ bne $t0, $at, .L802454C0 -/* A2F6F8 802454B8 00000000 */ nop +/* A2F6F8 802454B8 00000000 */ nop /* A2F6FC 802454BC 0006000D */ break 6 .L802454C0: /* A2F700 802454C0 00006012 */ mflo $t4 @@ -144,7 +144,7 @@ glabel func_802452C4_A2F504 /* A2F714 802454D4 00471023 */ subu $v0, $v0, $a3 /* A2F718 802454D8 00430018 */ mult $v0, $v1 /* A2F71C 802454DC 00004012 */ mflo $t0 -/* A2F720 802454E0 00000000 */ nop +/* A2F720 802454E0 00000000 */ nop /* A2F724 802454E4 15E00002 */ bnez $t7, .L802454F0 /* A2F728 802454E8 010F001A */ div $zero, $t0, $t7 /* A2F72C 802454EC 0007000D */ break 7 @@ -153,7 +153,7 @@ glabel func_802452C4_A2F504 /* A2F734 802454F4 15E10004 */ bne $t7, $at, .L80245508 /* A2F738 802454F8 3C018000 */ lui $at, 0x8000 /* A2F73C 802454FC 15010002 */ bne $t0, $at, .L80245508 -/* A2F740 80245500 00000000 */ nop +/* A2F740 80245500 00000000 */ nop /* A2F744 80245504 0006000D */ break 6 .L80245508: /* A2F748 80245508 00005812 */ mflo $t3 @@ -164,7 +164,7 @@ glabel func_802452C4_A2F504 /* A2F75C 8024551C 00491023 */ subu $v0, $v0, $t1 /* A2F760 80245520 00430018 */ mult $v0, $v1 /* A2F764 80245524 00004012 */ mflo $t0 -/* A2F768 80245528 00000000 */ nop +/* A2F768 80245528 00000000 */ nop /* A2F76C 8024552C 15E00002 */ bnez $t7, .L80245538 /* A2F770 80245530 010F001A */ div $zero, $t0, $t7 /* A2F774 80245534 0007000D */ break 7 @@ -173,7 +173,7 @@ glabel func_802452C4_A2F504 /* A2F77C 8024553C 15E10004 */ bne $t7, $at, .L80245550 /* A2F780 80245540 3C018000 */ lui $at, 0x8000 /* A2F784 80245544 15010002 */ bne $t0, $at, .L80245550 -/* A2F788 80245548 00000000 */ nop +/* A2F788 80245548 00000000 */ nop /* A2F78C 8024554C 0006000D */ break 6 .L80245550: /* A2F790 80245550 00005012 */ mflo $t2 @@ -184,7 +184,7 @@ glabel func_802452C4_A2F504 /* A2F7A4 80245564 00481023 */ subu $v0, $v0, $t0 /* A2F7A8 80245568 00430018 */ mult $v0, $v1 /* A2F7AC 8024556C 0000C812 */ mflo $t9 -/* A2F7B0 80245570 00000000 */ nop +/* A2F7B0 80245570 00000000 */ nop /* A2F7B4 80245574 15E00002 */ bnez $t7, .L80245580 /* A2F7B8 80245578 032F001A */ div $zero, $t9, $t7 /* A2F7BC 8024557C 0007000D */ break 7 @@ -193,7 +193,7 @@ glabel func_802452C4_A2F504 /* A2F7C4 80245584 15E10004 */ bne $t7, $at, .L80245598 /* A2F7C8 80245588 3C018000 */ lui $at, 0x8000 /* A2F7CC 8024558C 17210002 */ bne $t9, $at, .L80245598 -/* A2F7D0 80245590 00000000 */ nop +/* A2F7D0 80245590 00000000 */ nop /* A2F7D4 80245594 0006000D */ break 6 .L80245598: /* A2F7D8 80245598 00001012 */ mflo $v0 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802457C0_A2FA00.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802457C0_A2FA00.s index d98dedeb8b..2e9065a80f 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802457C0_A2FA00.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802457C0_A2FA00.s @@ -17,18 +17,18 @@ glabel func_802457C0_A2FA00 /* A2FA2C 802457EC 24020028 */ addiu $v0, $zero, 0x28 /* A2FA30 802457F0 8CE50444 */ lw $a1, 0x444($a3) /* A2FA34 802457F4 10A00014 */ beqz $a1, .L80245848 -/* A2FA38 802457F8 00000000 */ nop +/* A2FA38 802457F8 00000000 */ nop /* A2FA3C 802457FC 24020028 */ addiu $v0, $zero, 0x28 .L80245800: /* A2FA40 80245800 00431023 */ subu $v0, $v0, $v1 /* A2FA44 80245804 44821000 */ mtc1 $v0, $f2 -/* A2FA48 80245808 00000000 */ nop +/* A2FA48 80245808 00000000 */ nop /* A2FA4C 8024580C 468010A0 */ cvt.s.w $f2, $f2 /* A2FA50 80245810 3C018025 */ lui $at, %hi(D_8024F280) /* A2FA54 80245814 D420F280 */ ldc1 $f0, %lo(D_8024F280)($at) /* A2FA58 80245818 460010A1 */ cvt.d.s $f2, $f2 /* A2FA5C 8024581C 46201082 */ mul.d $f2, $f2, $f0 -/* A2FA60 80245820 00000000 */ nop +/* A2FA60 80245820 00000000 */ nop /* A2FA64 80245824 3C013FF0 */ lui $at, 0x3ff0 /* A2FA68 80245828 44812800 */ mtc1 $at, $f5 /* A2FA6C 8024582C 44802000 */ mtc1 $zero, $f4 @@ -43,5 +43,5 @@ glabel func_802457C0_A2FA00 /* A2FA8C 8024584C 2C420001 */ sltiu $v0, $v0, 1 /* A2FA90 80245850 03E00008 */ jr $ra /* A2FA94 80245854 00021040 */ sll $v0, $v0, 1 -/* A2FA98 80245858 00000000 */ nop -/* A2FA9C 8024585C 00000000 */ nop +/* A2FA98 80245858 00000000 */ nop +/* A2FA9C 8024585C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/pause_tabs_draw_badges_A2EF00.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/pause_tabs_draw_badges_A2EF00.s index 14fa1cdef7..2b089103f8 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/pause_tabs_draw_badges_A2EF00.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/pause_tabs_draw_badges_A2EF00.s @@ -37,12 +37,12 @@ glabel pause_tabs_draw_badges_A2EF00 /* A2EF7C 80244D3C 12400007 */ beqz $s2, .L80244D5C /* A2EF80 80244D40 3412FFFF */ ori $s2, $zero, 0xffff /* A2EF84 80244D44 08091373 */ j .L80244DCC -/* A2EF88 80244D48 00000000 */ nop +/* A2EF88 80244D48 00000000 */ nop .L80244D4C: /* A2EF8C 80244D4C 1242001B */ beq $s2, $v0, .L80244DBC /* A2EF90 80244D50 24020002 */ addiu $v0, $zero, 2 /* A2EF94 80244D54 08091373 */ j .L80244DCC -/* A2EF98 80244D58 00000000 */ nop +/* A2EF98 80244D58 00000000 */ nop .L80244D5C: /* A2EF9C 80244D5C 8E040000 */ lw $a0, ($s0) /* A2EFA0 80244D60 1092001A */ beq $a0, $s2, .L80244DCC @@ -56,7 +56,7 @@ glabel pause_tabs_draw_badges_A2EF00 /* A2EFC0 80244D80 0C046F1F */ jal func_8011BC7C /* A2EFC4 80244D84 0220302D */ daddu $a2, $s1, $zero /* A2EFC8 80244D88 08091357 */ j .L80244D5C -/* A2EFCC 80244D8C 00000000 */ nop +/* A2EFCC 80244D8C 00000000 */ nop .L80244D90: /* A2EFD0 80244D90 3412FFFF */ ori $s2, $zero, 0xffff .L80244D94: @@ -69,7 +69,7 @@ glabel pause_tabs_draw_badges_A2EF00 /* A2EFEC 80244DAC 0C046E54 */ jal func_8011B950 /* A2EFF0 80244DB0 0000382D */ daddu $a3, $zero, $zero /* A2EFF4 80244DB4 08091365 */ j .L80244D94 -/* A2EFF8 80244DB8 00000000 */ nop +/* A2EFF8 80244DB8 00000000 */ nop .L80244DBC: /* A2EFFC 80244DBC 3C028015 */ lui $v0, %hi(D_801512F0) /* A2F000 80244DC0 8C4212F0 */ lw $v0, %lo(D_801512F0)($v0) diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240310_A397F0.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240310_A397F0.s index b00d9f5dee..777cbcea8b 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240310_A397F0.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240310_A397F0.s @@ -26,7 +26,7 @@ glabel func_80240310_A397F0 /* A39840 80240360 1440FFFA */ bnez $v0, .L8024034C /* A39844 80240364 24A50004 */ addiu $a1, $a1, 4 /* A39848 80240368 080900EB */ j .L802403AC -/* A3984C 8024036C 00000000 */ nop +/* A3984C 8024036C 00000000 */ nop .L80240370: /* A39850 80240370 0000182D */ daddu $v1, $zero, $zero /* A39854 80240374 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406E0_A39BC0.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406E0_A39BC0.s index e0cb6b1abc..eee8b99346 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406E0_A39BC0.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406E0_A39BC0.s @@ -28,7 +28,7 @@ glabel func_802406E0_A39BC0 /* A39C14 80240734 00220821 */ addu $at, $at, $v0 /* A39C18 80240738 AC206260 */ sw $zero, %lo(D_80246260)($at) /* A39C1C 8024073C 080901DB */ j .L8024076C -/* A39C20 80240740 00000000 */ nop +/* A39C20 80240740 00000000 */ nop .L80240744: /* A39C24 80240744 3C038024 */ lui $v1, %hi(D_80246260) /* A39C28 80240748 24636260 */ addiu $v1, $v1, %lo(D_80246260) diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s index dd913dad36..6bea1d3d45 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s @@ -58,7 +58,7 @@ glabel func_80240AD0_A39FB0 /* A3A080 80240BA0 8E230004 */ lw $v1, 4($s1) /* A3A084 80240BA4 0043102A */ slt $v0, $v0, $v1 /* A3A088 80240BA8 10400004 */ beqz $v0, .L80240BBC -/* A3A08C 80240BAC 00000000 */ nop +/* A3A08C 80240BAC 00000000 */ nop /* A3A090 80240BB0 8C820004 */ lw $v0, 4($a0) /* A3A094 80240BB4 AE00018C */ sw $zero, 0x18c($s0) /* A3A098 80240BB8 AE020000 */ sw $v0, ($s0) @@ -90,20 +90,20 @@ glabel func_80240AD0_A39FB0 /* A3A0F4 80240C14 10400009 */ beqz $v0, .L80240C3C /* A3A0F8 80240C18 AE620074 */ sw $v0, 0x74($s3) /* A3A0FC 80240C1C 0C03C4EC */ jal func_800F13B0 -/* A3A100 80240C20 00000000 */ nop +/* A3A100 80240C20 00000000 */ nop /* A3A104 80240C24 8E620070 */ lw $v0, 0x70($s3) /* A3A108 80240C28 24420001 */ addiu $v0, $v0, 1 .L80240C2C: /* A3A10C 80240C2C AE620070 */ sw $v0, 0x70($s3) /* A3A110 80240C30 28420014 */ slti $v0, $v0, 0x14 /* A3A114 80240C34 10400003 */ beqz $v0, .L80240C44 -/* A3A118 80240C38 00000000 */ nop +/* A3A118 80240C38 00000000 */ nop .L80240C3C: /* A3A11C 80240C3C 0809033D */ j .L80240CF4 /* A3A120 80240C40 0000102D */ daddu $v0, $zero, $zero .L80240C44: /* A3A124 80240C44 0C03C54E */ jal func_800F1538 -/* A3A128 80240C48 00000000 */ nop +/* A3A128 80240C48 00000000 */ nop /* A3A12C 80240C4C 8E630074 */ lw $v1, 0x74($s3) /* A3A130 80240C50 240200FF */ addiu $v0, $zero, 0xff /* A3A134 80240C54 10620022 */ beq $v1, $v0, .L80240CE0 @@ -161,6 +161,6 @@ glabel func_80240AD0_A39FB0 /* A3A1F8 80240D18 8FB00010 */ lw $s0, 0x10($sp) /* A3A1FC 80240D1C 03E00008 */ jr $ra /* A3A200 80240D20 27BD0038 */ addiu $sp, $sp, 0x38 -/* A3A204 80240D24 00000000 */ nop -/* A3A208 80240D28 00000000 */ nop -/* A3A20C 80240D2C 00000000 */ nop +/* A3A204 80240D24 00000000 */ nop +/* A3A208 80240D28 00000000 */ nop +/* A3A20C 80240D2C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A210/func_80240D30_A3A210.s b/asm/nonmatchings/world/area_hos/hos_06/A3A210/func_80240D30_A3A210.s index b7c87f5a6d..518290123e 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A210/func_80240D30_A3A210.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A3A210/func_80240D30_A3A210.s @@ -8,5 +8,5 @@ glabel func_80240D30_A3A210 /* A3A21C 80240D3C AC820084 */ sw $v0, 0x84($a0) /* A3A220 80240D40 03E00008 */ jr $ra /* A3A224 80240D44 24020002 */ addiu $v0, $zero, 2 -/* A3A228 80240D48 00000000 */ nop -/* A3A22C 80240D4C 00000000 */ nop +/* A3A228 80240D48 00000000 */ nop +/* A3A22C 80240D4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241008_A3A4E8.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241008_A3A4E8.s index aa86c06220..f6a1d12591 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241008_A3A4E8.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241008_A3A4E8.s @@ -28,7 +28,7 @@ glabel func_80241008_A3A4E8 /* A3A53C 8024105C 00220821 */ addu $at, $at, $v0 /* A3A540 80241060 AC206430 */ sw $zero, %lo(D_80246430)($at) /* A3A544 80241064 08090425 */ j .L80241094 -/* A3A548 80241068 00000000 */ nop +/* A3A548 80241068 00000000 */ nop .L8024106C: /* A3A54C 8024106C 3C038024 */ lui $v1, %hi(D_80246430) /* A3A550 80241070 24636430 */ addiu $v1, $v1, %lo(D_80246430) diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802410A4_A3A584.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802410A4_A3A584.s index 902e7e8d12..3d7fe4dbee 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802410A4_A3A584.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802410A4_A3A584.s @@ -26,7 +26,7 @@ glabel func_802410A4_A3A584 /* A3A5D4 802410F4 1440FFFA */ bnez $v0, .L802410E0 /* A3A5D8 802410F8 24A50004 */ addiu $a1, $a1, 4 /* A3A5DC 802410FC 08090450 */ j .L80241140 -/* A3A5E0 80241100 00000000 */ nop +/* A3A5E0 80241100 00000000 */ nop .L80241104: /* A3A5E4 80241104 0000182D */ daddu $v1, $zero, $zero /* A3A5E8 80241108 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_8024126C_A3A74C.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_8024126C_A3A74C.s index 75a2f62e80..ce6b8606ce 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_8024126C_A3A74C.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_8024126C_A3A74C.s @@ -33,7 +33,7 @@ glabel func_8024126C_A3A74C /* A3A7B8 802412D8 26100001 */ addiu $s0, $s0, 1 /* A3A7BC 802412DC 8E240000 */ lw $a0, ($s1) /* A3A7C0 802412E0 0C09046F */ jal func_802411BC_A3A69C -/* A3A7C4 802412E4 00000000 */ nop +/* A3A7C4 802412E4 00000000 */ nop /* A3A7C8 802412E8 54400007 */ bnel $v0, $zero, .L80241308 /* A3A7CC 802412EC 26100001 */ addiu $s0, $s0, 1 /* A3A7D0 802412F0 0000202D */ daddu $a0, $zero, $zero @@ -67,7 +67,7 @@ glabel func_8024126C_A3A74C /* A3A834 80241354 26100001 */ addiu $s0, $s0, 1 /* A3A838 80241358 8E440000 */ lw $a0, ($s2) /* A3A83C 8024135C 0C09046F */ jal func_802411BC_A3A69C -/* A3A840 80241360 00000000 */ nop +/* A3A840 80241360 00000000 */ nop /* A3A844 80241364 5440000A */ bnel $v0, $zero, .L80241390 /* A3A848 80241368 26100001 */ addiu $s0, $s0, 1 /* A3A84C 8024136C 0000202D */ daddu $a0, $zero, $zero @@ -111,7 +111,7 @@ glabel func_8024126C_A3A74C /* A3A8CC 802413EC 26100001 */ addiu $s0, $s0, 1 /* A3A8D0 802413F0 8E240000 */ lw $a0, ($s1) /* A3A8D4 802413F4 0C09046F */ jal func_802411BC_A3A69C -/* A3A8D8 802413F8 00000000 */ nop +/* A3A8D8 802413F8 00000000 */ nop /* A3A8DC 802413FC 54400007 */ bnel $v0, $zero, .L8024141C /* A3A8E0 80241400 26100001 */ addiu $s0, $s0, 1 /* A3A8E4 80241404 0000202D */ daddu $a0, $zero, $zero @@ -144,7 +144,7 @@ glabel func_8024126C_A3A74C /* A3A944 80241464 26100001 */ addiu $s0, $s0, 1 /* A3A948 80241468 8E240000 */ lw $a0, ($s1) /* A3A94C 8024146C 0C09046F */ jal func_802411BC_A3A69C -/* A3A950 80241470 00000000 */ nop +/* A3A950 80241470 00000000 */ nop /* A3A954 80241474 5440000A */ bnel $v0, $zero, .L802414A0 /* A3A958 80241478 26100001 */ addiu $s0, $s0, 1 /* A3A95C 8024147C 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802414E4_A3A9C4.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802414E4_A3A9C4.s index 014908d11a..c00913eb76 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802414E4_A3A9C4.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802414E4_A3A9C4.s @@ -48,7 +48,7 @@ glabel func_802414E4_A3A9C4 /* A3AA64 80241584 1440FFEF */ bnez $v0, .L80241544 /* A3AA68 80241588 2631000C */ addiu $s1, $s1, 0xc /* A3AA6C 8024158C 12800029 */ beqz $s4, .L80241634 -/* A3AA70 80241590 00000000 */ nop +/* A3AA70 80241590 00000000 */ nop /* A3AA74 80241594 0C00A67F */ jal rand_int /* A3AA78 80241598 2684FFFF */ addiu $a0, $s4, -1 /* A3AA7C 8024159C 0040B82D */ daddu $s7, $v0, $zero @@ -84,7 +84,7 @@ glabel func_802414E4_A3A9C4 /* A3AAF0 80241610 0C0B2026 */ jal set_variable /* A3AAF4 80241614 AFC20088 */ sw $v0, 0x88($fp) /* A3AAF8 80241618 0809058D */ j .L80241634 -/* A3AAFC 8024161C 00000000 */ nop +/* A3AAFC 8024161C 00000000 */ nop .L80241620: /* A3AB00 80241620 26100001 */ addiu $s0, $s0, 1 .L80241624: diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241668_A3AB48.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241668_A3AB48.s index ff17ad28c9..8cb741d4bd 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241668_A3AB48.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241668_A3AB48.s @@ -48,7 +48,7 @@ glabel func_80241668_A3AB48 /* A3ABE8 80241708 1440FFEF */ bnez $v0, .L802416C8 /* A3ABEC 8024170C 2631000C */ addiu $s1, $s1, 0xc /* A3ABF0 80241710 12800029 */ beqz $s4, .L802417B8 -/* A3ABF4 80241714 00000000 */ nop +/* A3ABF4 80241714 00000000 */ nop /* A3ABF8 80241718 0C00A67F */ jal rand_int /* A3ABFC 8024171C 2684FFFF */ addiu $a0, $s4, -1 /* A3AC00 80241720 0040B82D */ daddu $s7, $v0, $zero @@ -84,7 +84,7 @@ glabel func_80241668_A3AB48 /* A3AC74 80241794 0C0B2026 */ jal set_variable /* A3AC78 80241798 AFC20088 */ sw $v0, 0x88($fp) /* A3AC7C 8024179C 080905EE */ j .L802417B8 -/* A3AC80 802417A0 00000000 */ nop +/* A3AC80 802417A0 00000000 */ nop .L802417A4: /* A3AC84 802417A4 26100001 */ addiu $s0, $s0, 1 .L802417A8: diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s index d42dc39c26..83d59cf348 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s @@ -26,7 +26,7 @@ glabel func_802417EC_A3ACCC /* A3AD1C 8024183C 0000302D */ daddu $a2, $zero, $zero .L80241840: /* A3AD20 80241840 0C0B2026 */ jal set_variable -/* A3AD24 80241844 00000000 */ nop +/* A3AD24 80241844 00000000 */ nop /* A3AD28 80241848 8FBF0018 */ lw $ra, 0x18($sp) /* A3AD2C 8024184C 8FB10014 */ lw $s1, 0x14($sp) /* A3AD30 80241850 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241A58_A3AF38.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241A58_A3AF38.s index f48d992fe3..f1a3da47b7 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241A58_A3AF38.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241A58_A3AF38.s @@ -14,7 +14,7 @@ glabel func_80241A58_A3AF38 .L80241A7C: /* A3AF5C 80241A7C 8E020074 */ lw $v0, 0x74($s0) /* A3AF60 80241A80 1440001A */ bnez $v0, .L80241AEC -/* A3AF64 80241A84 00000000 */ nop +/* A3AF64 80241A84 00000000 */ nop /* A3AF68 80241A88 8E020070 */ lw $v0, 0x70($s0) /* A3AF6C 80241A8C 24420004 */ addiu $v0, $v0, 4 /* A3AF70 80241A90 AE020070 */ sw $v0, 0x70($s0) @@ -36,7 +36,7 @@ glabel func_80241A58_A3AF38 /* A3AFA8 80241AC8 8E030070 */ lw $v1, 0x70($s0) /* A3AFAC 80241ACC 2402007F */ addiu $v0, $zero, 0x7f /* A3AFB0 80241AD0 14620014 */ bne $v1, $v0, .L80241B24 -/* A3AFB4 80241AD4 00000000 */ nop +/* A3AFB4 80241AD4 00000000 */ nop /* A3AFB8 80241AD8 8E020078 */ lw $v0, 0x78($s0) /* A3AFBC 80241ADC 14430011 */ bne $v0, $v1, .L80241B24 /* A3AFC0 80241AE0 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241CCC_A3B1AC.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241CCC_A3B1AC.s index be0bcc485f..e060ef240f 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241CCC_A3B1AC.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241CCC_A3B1AC.s @@ -52,7 +52,7 @@ glabel func_80241CCC_A3B1AC /* A3B264 80241D84 0C00A8BB */ jal sin_deg /* A3B268 80241D88 27B20068 */ addiu $s2, $sp, 0x68 /* A3B26C 80241D8C 46140002 */ mul.s $f0, $f0, $f20 -/* A3B270 80241D90 00000000 */ nop +/* A3B270 80241D90 00000000 */ nop /* A3B274 80241D94 0220A02D */ daddu $s4, $s1, $zero /* A3B278 80241D98 C66C0070 */ lwc1 $f12, 0x70($s3) /* A3B27C 80241D9C 46806320 */ cvt.s.w $f12, $f12 @@ -65,12 +65,12 @@ glabel func_80241CCC_A3B1AC /* A3B298 80241DB8 44811000 */ mtc1 $at, $f2 /* A3B29C 80241DBC 8E630070 */ lw $v1, 0x70($s3) /* A3B2A0 80241DC0 46020002 */ mul.s $f0, $f0, $f2 -/* A3B2A4 80241DC4 00000000 */ nop +/* A3B2A4 80241DC4 00000000 */ nop /* A3B2A8 80241DC8 00031080 */ sll $v0, $v1, 2 /* A3B2AC 80241DCC 00431021 */ addu $v0, $v0, $v1 /* A3B2B0 80241DD0 00021040 */ sll $v0, $v0, 1 /* A3B2B4 80241DD4 4482C000 */ mtc1 $v0, $f24 -/* A3B2B8 80241DD8 00000000 */ nop +/* A3B2B8 80241DD8 00000000 */ nop /* A3B2BC 80241DDC 4680C620 */ cvt.s.w $f24, $f24 /* A3B2C0 80241DE0 46140700 */ add.s $f28, $f0, $f20 .L80241DE4: @@ -93,7 +93,7 @@ glabel func_80241CCC_A3B1AC /* A3B304 80241E24 0C019EC8 */ jal guRotateF /* A3B308 80241E28 E7B60010 */ swc1 $f22, 0x10($sp) /* A3B30C 80241E2C 44942000 */ mtc1 $s4, $f4 -/* A3B310 80241E30 00000000 */ nop +/* A3B310 80241E30 00000000 */ nop /* A3B314 80241E34 46802120 */ cvt.s.w $f4, $f4 /* A3B318 80241E38 4406B000 */ mfc1 $a2, $f22 /* A3B31C 80241E3C 4407B000 */ mfc1 $a3, $f22 @@ -108,11 +108,11 @@ glabel func_80241CCC_A3B1AC /* A3B340 80241E60 0C00A8BB */ jal sin_deg /* A3B344 80241E64 4600C306 */ mov.s $f12, $f24 /* A3B348 80241E68 4600F502 */ mul.s $f20, $f30, $f0 -/* A3B34C 80241E6C 00000000 */ nop +/* A3B34C 80241E6C 00000000 */ nop /* A3B350 80241E70 0C00A8D4 */ jal cos_deg /* A3B354 80241E74 4600C306 */ mov.s $f12, $f24 /* A3B358 80241E78 4600E002 */ mul.s $f0, $f28, $f0 -/* A3B35C 80241E7C 00000000 */ nop +/* A3B35C 80241E7C 00000000 */ nop /* A3B360 80241E80 4407B000 */ mfc1 $a3, $f22 /* A3B364 80241E84 44060000 */ mfc1 $a2, $f0 /* A3B368 80241E88 4405A000 */ mfc1 $a1, $f20 @@ -146,7 +146,7 @@ glabel func_80241CCC_A3B1AC /* A3B3D8 80241EF8 AE620070 */ sw $v0, 0x70($s3) /* A3B3DC 80241EFC 28420010 */ slti $v0, $v0, 0x10 /* A3B3E0 80241F00 1040000A */ beqz $v0, .L80241F2C -/* A3B3E4 80241F04 00000000 */ nop +/* A3B3E4 80241F04 00000000 */ nop /* A3B3E8 80241F08 0000882D */ daddu $s1, $zero, $zero .L80241F0C: /* A3B3EC 80241F0C 8C820000 */ lw $v0, ($a0) diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241F98_A3B478.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241F98_A3B478.s index a618826c36..b2e8c7a58f 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241F98_A3B478.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241F98_A3B478.s @@ -15,4 +15,4 @@ glabel func_80241F98_A3B478 /* A3B4A0 80241FC0 24020002 */ addiu $v0, $zero, 2 /* A3B4A4 80241FC4 03E00008 */ jr $ra /* A3B4A8 80241FC8 27BD0018 */ addiu $sp, $sp, 0x18 -/* A3B4AC 80241FCC 00000000 */ nop +/* A3B4AC 80241FCC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80241FD0_A3B4B0.s b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80241FD0_A3B4B0.s index 8297befba7..d0cd987a8a 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80241FD0_A3B4B0.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80241FD0_A3B4B0.s @@ -26,7 +26,7 @@ glabel func_80241FD0_A3B4B0 /* A3B500 80242020 1440FFFA */ bnez $v0, .L8024200C /* A3B504 80242024 24A50004 */ addiu $a1, $a1, 4 /* A3B508 80242028 0809081B */ j .L8024206C -/* A3B50C 8024202C 00000000 */ nop +/* A3B50C 8024202C 00000000 */ nop .L80242030: /* A3B510 80242030 0000182D */ daddu $v1, $zero, $zero /* A3B514 80242034 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_8024228C_A3B76C.s b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_8024228C_A3B76C.s index ada03b1739..888f747102 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_8024228C_A3B76C.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_8024228C_A3B76C.s @@ -103,20 +103,20 @@ glabel func_8024228C_A3B76C /* A3B8DC 802423FC 10400009 */ beqz $v0, .L80242424 /* A3B8E0 80242400 AE620074 */ sw $v0, 0x74($s3) /* A3B8E4 80242404 0C03C4EC */ jal func_800F13B0 -/* A3B8E8 80242408 00000000 */ nop +/* A3B8E8 80242408 00000000 */ nop /* A3B8EC 8024240C 8E620070 */ lw $v0, 0x70($s3) /* A3B8F0 80242410 24420001 */ addiu $v0, $v0, 1 .L80242414: /* A3B8F4 80242414 AE620070 */ sw $v0, 0x70($s3) /* A3B8F8 80242418 2842000F */ slti $v0, $v0, 0xf /* A3B8FC 8024241C 10400003 */ beqz $v0, .L8024242C -/* A3B900 80242420 00000000 */ nop +/* A3B900 80242420 00000000 */ nop .L80242424: /* A3B904 80242424 08090927 */ j .L8024249C /* A3B908 80242428 0000102D */ daddu $v0, $zero, $zero .L8024242C: /* A3B90C 8024242C 0C03C54E */ jal func_800F1538 -/* A3B910 80242430 00000000 */ nop +/* A3B910 80242430 00000000 */ nop /* A3B914 80242434 8E630074 */ lw $v1, 0x74($s3) /* A3B918 80242438 240200FF */ addiu $v0, $zero, 0xff /* A3B91C 8024243C 14620004 */ bne $v1, $v0, .L80242450 @@ -143,7 +143,7 @@ glabel func_8024228C_A3B76C .L8024248C: /* A3B96C 8024248C 8E640078 */ lw $a0, 0x78($s3) /* A3B970 80242490 0C00AB4B */ jal heap_free -/* A3B974 80242494 00000000 */ nop +/* A3B974 80242494 00000000 */ nop .L80242498: /* A3B978 80242498 24020002 */ addiu $v0, $zero, 2 .L8024249C: diff --git a/asm/nonmatchings/world/area_hos/hos_10/A3F740/func_80240000_A3F740.s b/asm/nonmatchings/world/area_hos/hos_10/A3F740/func_80240000_A3F740.s index 72f8ed5d2b..f53bb66d93 100644 --- a/asm/nonmatchings/world/area_hos/hos_10/A3F740/func_80240000_A3F740.s +++ b/asm/nonmatchings/world/area_hos/hos_10/A3F740/func_80240000_A3F740.s @@ -8,5 +8,5 @@ glabel func_80240000_A3F740 /* A3F74C 8024000C A0620084 */ sb $v0, 0x84($v1) /* A3F750 80240010 03E00008 */ jr $ra /* A3F754 80240014 0000102D */ daddu $v0, $zero, $zero -/* A3F758 80240018 00000000 */ nop -/* A3F75C 8024001C 00000000 */ nop +/* A3F758 80240018 00000000 */ nop +/* A3F75C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240364_A3FAA4.s b/asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240364_A3FAA4.s index 15ba2b48fa..8c080ea5be 100644 --- a/asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240364_A3FAA4.s +++ b/asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240364_A3FAA4.s @@ -8,35 +8,35 @@ glabel func_80240364_A3FAA4 /* A3FAB0 80240370 44872000 */ mtc1 $a3, $f4 /* A3FAB4 80240374 8FA20010 */ lw $v0, 0x10($sp) /* A3FAB8 80240378 460C003C */ c.lt.s $f0, $f12 -/* A3FABC 8024037C 00000000 */ nop +/* A3FABC 8024037C 00000000 */ nop /* A3FAC0 80240380 4500000F */ bc1f .L802403C0 /* A3FAC4 80240384 46067081 */ sub.s $f2, $f14, $f6 /* A3FAC8 80240388 4600103C */ c.lt.s $f2, $f0 -/* A3FACC 8024038C 00000000 */ nop +/* A3FACC 8024038C 00000000 */ nop /* A3FAD0 80240390 45000003 */ bc1f .L802403A0 -/* A3FAD4 80240394 00000000 */ nop +/* A3FAD4 80240394 00000000 */ nop .L80240398: /* A3FAD8 80240398 03E00008 */ jr $ra /* A3FADC 8024039C E44E0000 */ swc1 $f14, ($v0) .L802403A0: /* A3FAE0 802403A0 4602203C */ c.lt.s $f4, $f2 -/* A3FAE4 802403A4 00000000 */ nop +/* A3FAE4 802403A4 00000000 */ nop /* A3FAE8 802403A8 45000012 */ bc1f .L802403F4 -/* A3FAEC 802403AC 00000000 */ nop +/* A3FAEC 802403AC 00000000 */ nop /* A3FAF0 802403B0 C4400000 */ lwc1 $f0, ($v0) /* A3FAF4 802403B4 46040000 */ add.s $f0, $f0, $f4 /* A3FAF8 802403B8 03E00008 */ jr $ra /* A3FAFC 802403BC E4400000 */ swc1 $f0, ($v0) .L802403C0: /* A3FB00 802403C0 4602003C */ c.lt.s $f0, $f2 -/* A3FB04 802403C4 00000000 */ nop +/* A3FB04 802403C4 00000000 */ nop /* A3FB08 802403C8 4501FFF3 */ bc1t .L80240398 -/* A3FB0C 802403CC 00000000 */ nop +/* A3FB0C 802403CC 00000000 */ nop /* A3FB10 802403D0 46002007 */ neg.s $f0, $f4 /* A3FB14 802403D4 4600103C */ c.lt.s $f2, $f0 -/* A3FB18 802403D8 00000000 */ nop +/* A3FB18 802403D8 00000000 */ nop /* A3FB1C 802403DC 45000005 */ bc1f .L802403F4 -/* A3FB20 802403E0 00000000 */ nop +/* A3FB20 802403E0 00000000 */ nop /* A3FB24 802403E4 C4400000 */ lwc1 $f0, ($v0) /* A3FB28 802403E8 46040001 */ sub.s $f0, $f0, $f4 /* A3FB2C 802403EC 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240404_A3FB44.s b/asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240404_A3FB44.s index 22d36fbc8e..796a40ffd4 100644 --- a/asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240404_A3FB44.s +++ b/asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240404_A3FB44.s @@ -23,5 +23,5 @@ glabel func_80240404_A3FB44 /* A3FB8C 8024044C 24020002 */ addiu $v0, $zero, 2 /* A3FB90 80240450 03E00008 */ jr $ra /* A3FB94 80240454 27BD0028 */ addiu $sp, $sp, 0x28 -/* A3FB98 80240458 00000000 */ nop -/* A3FB9C 8024045C 00000000 */ nop +/* A3FB98 80240458 00000000 */ nop +/* A3FB9C 8024045C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240770_A3FEB0.s b/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240770_A3FEB0.s index b1bd48ae26..67a0439689 100644 --- a/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240770_A3FEB0.s +++ b/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240770_A3FEB0.s @@ -37,7 +37,7 @@ glabel func_80240770_A3FEB0 /* A3FF2C 802407EC 10620048 */ beq $v1, $v0, .L80240910 /* A3FF30 802407F0 26040038 */ addiu $a0, $s0, 0x38 /* A3FF34 802407F4 08090293 */ j .L80240A4C -/* A3FF38 802407F8 00000000 */ nop +/* A3FF38 802407F8 00000000 */ nop .L802407FC: /* A3FF3C 802407FC C6400028 */ lwc1 $f0, 0x28($s2) /* A3FF40 80240800 E6000038 */ swc1 $f0, 0x38($s0) @@ -52,7 +52,7 @@ glabel func_80240770_A3FEB0 /* A3FF64 80240824 00431021 */ addu $v0, $v0, $v1 /* A3FF68 80240828 E6000064 */ swc1 $f0, 0x64($s0) /* A3FF6C 8024082C 44820000 */ mtc1 $v0, $f0 -/* A3FF70 80240830 00000000 */ nop +/* A3FF70 80240830 00000000 */ nop /* A3FF74 80240834 46800020 */ cvt.s.w $f0, $f0 /* A3FF78 80240838 E6000060 */ swc1 $f0, 0x60($s0) /* A3FF7C 8024083C 8E230078 */ lw $v1, 0x78($s1) @@ -62,12 +62,12 @@ glabel func_80240770_A3FEB0 /* A3FF8C 8024084C 00021900 */ sll $v1, $v0, 4 /* A3FF90 80240850 00431021 */ addu $v0, $v0, $v1 /* A3FF94 80240854 44820000 */ mtc1 $v0, $f0 -/* A3FF98 80240858 00000000 */ nop +/* A3FF98 80240858 00000000 */ nop /* A3FF9C 8024085C 46800020 */ cvt.s.w $f0, $f0 /* A3FFA0 80240860 46001080 */ add.s $f2, $f2, $f0 /* A3FFA4 80240864 3C014319 */ lui $at, 0x4319 /* A3FFA8 80240868 44810000 */ mtc1 $at, $f0 -/* A3FFAC 8024086C 00000000 */ nop +/* A3FFAC 8024086C 00000000 */ nop /* A3FFB0 80240870 46001080 */ add.s $f2, $f2, $f0 /* A3FFB4 80240874 26040038 */ addiu $a0, $s0, 0x38 /* A3FFB8 80240878 3C06428C */ lui $a2, 0x428c @@ -89,11 +89,11 @@ glabel func_80240770_A3FEB0 /* A3FFF8 802408B8 00021080 */ sll $v0, $v0, 2 /* A3FFFC 802408BC 00431021 */ addu $v0, $v0, $v1 /* A40000 802408C0 1482000C */ bne $a0, $v0, .L802408F4 -/* A40004 802408C4 00000000 */ nop +/* A40004 802408C4 00000000 */ nop /* A40008 802408C8 C602003C */ lwc1 $f2, 0x3c($s0) /* A4000C 802408CC 3C014120 */ lui $at, 0x4120 /* A40010 802408D0 44810000 */ mtc1 $at, $f0 -/* A40014 802408D4 00000000 */ nop +/* A40014 802408D4 00000000 */ nop /* A40018 802408D8 46001080 */ add.s $f2, $f2, $f0 /* A4001C 802408DC E7A00010 */ swc1 $f0, 0x10($sp) /* A40020 802408E0 8E050038 */ lw $a1, 0x38($s0) @@ -123,7 +123,7 @@ glabel func_80240770_A3FEB0 /* A40078 80240938 00031040 */ sll $v0, $v1, 1 /* A4007C 8024093C 00431021 */ addu $v0, $v0, $v1 /* A40080 80240940 44820000 */ mtc1 $v0, $f0 -/* A40084 80240944 00000000 */ nop +/* A40084 80240944 00000000 */ nop /* A40088 80240948 46800020 */ cvt.s.w $f0, $f0 /* A4008C 8024094C 240200BE */ addiu $v0, $zero, 0xbe /* A40090 80240950 E6000060 */ swc1 $f0, 0x60($s0) @@ -132,7 +132,7 @@ glabel func_80240770_A3FEB0 /* A4009C 8024095C 44810000 */ mtc1 $at, $f0 /* A400A0 80240960 00431023 */ subu $v0, $v0, $v1 /* A400A4 80240964 44822000 */ mtc1 $v0, $f4 -/* A400A8 80240968 00000000 */ nop +/* A400A8 80240968 00000000 */ nop /* A400AC 8024096C 46802120 */ cvt.s.w $f4, $f4 /* A400B0 80240970 46002103 */ div.s $f4, $f4, $f0 /* A400B4 80240974 8E230078 */ lw $v1, 0x78($s1) @@ -141,17 +141,17 @@ glabel func_80240770_A3FEB0 /* A400C0 80240980 00031040 */ sll $v0, $v1, 1 /* A400C4 80240984 00431021 */ addu $v0, $v0, $v1 /* A400C8 80240988 46002102 */ mul.s $f4, $f4, $f0 -/* A400CC 8024098C 00000000 */ nop +/* A400CC 8024098C 00000000 */ nop /* A400D0 80240990 00021900 */ sll $v1, $v0, 4 /* A400D4 80240994 00431021 */ addu $v0, $v0, $v1 /* A400D8 80240998 C6000060 */ lwc1 $f0, 0x60($s0) /* A400DC 8024099C 44821000 */ mtc1 $v0, $f2 -/* A400E0 802409A0 00000000 */ nop +/* A400E0 802409A0 00000000 */ nop /* A400E4 802409A4 468010A0 */ cvt.s.w $f2, $f2 /* A400E8 802409A8 46020000 */ add.s $f0, $f0, $f2 /* A400EC 802409AC 3C014319 */ lui $at, 0x4319 /* A400F0 802409B0 44811000 */ mtc1 $at, $f2 -/* A400F4 802409B4 00000000 */ nop +/* A400F4 802409B4 00000000 */ nop /* A400F8 802409B8 46020000 */ add.s $f0, $f0, $f2 /* A400FC 802409BC 46062100 */ add.s $f4, $f4, $f6 /* A40100 802409C0 44070000 */ mfc1 $a3, $f0 @@ -173,11 +173,11 @@ glabel func_80240770_A3FEB0 /* A40140 80240A00 00021080 */ sll $v0, $v0, 2 /* A40144 80240A04 00431021 */ addu $v0, $v0, $v1 /* A40148 80240A08 1482000C */ bne $a0, $v0, .L80240A3C -/* A4014C 80240A0C 00000000 */ nop +/* A4014C 80240A0C 00000000 */ nop /* A40150 80240A10 C602003C */ lwc1 $f2, 0x3c($s0) /* A40154 80240A14 3C014120 */ lui $at, 0x4120 /* A40158 80240A18 44810000 */ mtc1 $at, $f0 -/* A4015C 80240A1C 00000000 */ nop +/* A4015C 80240A1C 00000000 */ nop /* A40160 80240A20 46001080 */ add.s $f2, $f2, $f0 /* A40164 80240A24 E7A00010 */ swc1 $f0, 0x10($sp) /* A40168 80240A28 8E050038 */ lw $a1, 0x38($s0) diff --git a/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240A84_A401C4.s b/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240A84_A401C4.s index 45e62c65a7..24e440dfa2 100644 --- a/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240A84_A401C4.s +++ b/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240A84_A401C4.s @@ -22,13 +22,13 @@ glabel func_80240A84_A401C4 /* A40208 80240AC8 8E050000 */ lw $a1, ($s0) /* A4020C 80240ACC 26100004 */ addiu $s0, $s0, 4 /* A40210 80240AD0 4482B000 */ mtc1 $v0, $f22 -/* A40214 80240AD4 00000000 */ nop +/* A40214 80240AD4 00000000 */ nop /* A40218 80240AD8 4680B5A0 */ cvt.s.w $f22, $f22 /* A4021C 80240ADC 0C0B1EAF */ jal get_variable /* A40220 80240AE0 0220202D */ daddu $a0, $s1, $zero /* A40224 80240AE4 8E050000 */ lw $a1, ($s0) /* A40228 80240AE8 4482A000 */ mtc1 $v0, $f20 -/* A4022C 80240AEC 00000000 */ nop +/* A4022C 80240AEC 00000000 */ nop /* A40230 80240AF0 4680A520 */ cvt.s.w $f20, $f20 /* A40234 80240AF4 0C0B1EAF */ jal get_variable /* A40238 80240AF8 0220202D */ daddu $a0, $s1, $zero @@ -38,7 +38,7 @@ glabel func_80240A84_A401C4 /* A40248 80240B08 E4740008 */ swc1 $f20, 8($v1) /* A4024C 80240B0C 8E43000C */ lw $v1, 0xc($s2) /* A40250 80240B10 44820000 */ mtc1 $v0, $f0 -/* A40254 80240B14 00000000 */ nop +/* A40254 80240B14 00000000 */ nop /* A40258 80240B18 46800020 */ cvt.s.w $f0, $f0 /* A4025C 80240B1C E460000C */ swc1 $f0, 0xc($v1) /* A40260 80240B20 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BFC_A4033C.s b/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BFC_A4033C.s index 07ee885c90..cf50c62cd5 100644 --- a/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BFC_A4033C.s +++ b/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BFC_A4033C.s @@ -37,5 +37,5 @@ glabel func_80240BFC_A4033C /* A403AC 80240C6C 8FB00010 */ lw $s0, 0x10($sp) /* A403B0 80240C70 03E00008 */ jr $ra /* A403B4 80240C74 27BD0018 */ addiu $sp, $sp, 0x18 -/* A403B8 80240C78 00000000 */ nop -/* A403BC 80240C7C 00000000 */ nop +/* A403B8 80240C78 00000000 */ nop +/* A403BC 80240C7C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_20/A45C40/func_80240310_A45C40.s b/asm/nonmatchings/world/area_hos/hos_20/A45C40/func_80240310_A45C40.s index 76badaf188..dadd24250d 100644 --- a/asm/nonmatchings/world/area_hos/hos_20/A45C40/func_80240310_A45C40.s +++ b/asm/nonmatchings/world/area_hos/hos_20/A45C40/func_80240310_A45C40.s @@ -21,6 +21,6 @@ glabel func_80240310_A45C40 .L8024034C: /* A45C7C 8024034C 03E00008 */ jr $ra /* A45C80 80240350 24020002 */ addiu $v0, $zero, 2 -/* A45C84 80240354 00000000 */ nop -/* A45C88 80240358 00000000 */ nop -/* A45C8C 8024035C 00000000 */ nop +/* A45C84 80240354 00000000 */ nop +/* A45C88 80240358 00000000 */ nop +/* A45C8C 8024035C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_02/978750/func_80240040_978750.s b/asm/nonmatchings/world/area_isk/isk_02/978750/func_80240040_978750.s index 398710ae12..4bc60686cf 100644 --- a/asm/nonmatchings/world/area_isk/isk_02/978750/func_80240040_978750.s +++ b/asm/nonmatchings/world/area_isk/isk_02/978750/func_80240040_978750.s @@ -14,7 +14,7 @@ glabel func_80240040_978750 /* 978774 80240064 26100004 */ addiu $s0, $s0, 4 /* 978778 80240068 8E050000 */ lw $a1, ($s0) /* 97877C 8024006C 4482A000 */ mtc1 $v0, $f20 -/* 978780 80240070 00000000 */ nop +/* 978780 80240070 00000000 */ nop /* 978784 80240074 4680A520 */ cvt.s.w $f20, $f20 /* 978788 80240078 0C0B1EAF */ jal get_variable /* 97878C 8024007C 0220202D */ daddu $a0, $s1, $zero @@ -23,15 +23,15 @@ glabel func_80240040_978750 /* 978798 80240088 8C660028 */ lw $a2, 0x28($v1) /* 97879C 8024008C 8C670030 */ lw $a3, 0x30($v1) /* 9787A0 80240090 44827000 */ mtc1 $v0, $f14 -/* 9787A4 80240094 00000000 */ nop +/* 9787A4 80240094 00000000 */ nop /* 9787A8 80240098 468073A0 */ cvt.s.w $f14, $f14 /* 9787AC 8024009C 0C00A7B5 */ jal dist2D /* 9787B0 802400A0 4600A306 */ mov.s $f12, $f20 /* 9787B4 802400A4 3C01437A */ lui $at, 0x437a /* 9787B8 802400A8 44811000 */ mtc1 $at, $f2 -/* 9787BC 802400AC 00000000 */ nop +/* 9787BC 802400AC 00000000 */ nop /* 9787C0 802400B0 4600103C */ c.lt.s $f2, $f0 -/* 9787C4 802400B4 00000000 */ nop +/* 9787C4 802400B4 00000000 */ nop /* 9787C8 802400B8 45000003 */ bc1f .L802400C8 /* 9787CC 802400BC 24020001 */ addiu $v0, $zero, 1 /* 9787D0 802400C0 08090033 */ j .L802400CC @@ -46,5 +46,5 @@ glabel func_80240040_978750 /* 9787EC 802400DC 24020002 */ addiu $v0, $zero, 2 /* 9787F0 802400E0 03E00008 */ jr $ra /* 9787F4 802400E4 27BD0028 */ addiu $sp, $sp, 0x28 -/* 9787F8 802400E8 00000000 */ nop -/* 9787FC 802400EC 00000000 */ nop +/* 9787F8 802400E8 00000000 */ nop +/* 9787FC 802400EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802400BC_97B6EC.s b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802400BC_97B6EC.s index 8a34fbfcf8..ace412795a 100644 --- a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802400BC_97B6EC.s +++ b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802400BC_97B6EC.s @@ -21,11 +21,11 @@ glabel func_802400BC_97B6EC /* 97B72C 802400FC A602008E */ sh $v0, 0x8e($s0) /* 97B730 80240100 00021400 */ sll $v0, $v0, 0x10 /* 97B734 80240104 1C400033 */ bgtz $v0, .L802401D4 -/* 97B738 80240108 00000000 */ nop +/* 97B738 80240108 00000000 */ nop .L8024010C: /* 97B73C 8024010C 8602008C */ lh $v0, 0x8c($s0) /* 97B740 80240110 14400030 */ bnez $v0, .L802401D4 -/* 97B744 80240114 00000000 */ nop +/* 97B744 80240114 00000000 */ nop /* 97B748 80240118 8E2200CC */ lw $v0, 0xcc($s1) /* 97B74C 8024011C 8C420024 */ lw $v0, 0x24($v0) /* 97B750 80240120 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_802400BC_97B6EC /* 97B75C 8024012C 8E230088 */ lw $v1, 0x88($s1) /* 97B760 80240130 24020005 */ addiu $v0, $zero, 5 /* 97B764 80240134 10620005 */ beq $v1, $v0, .L8024014C -/* 97B768 80240138 00000000 */ nop +/* 97B768 80240138 00000000 */ nop /* 97B76C 8024013C 10600003 */ beqz $v1, .L8024014C /* 97B770 80240140 24020001 */ addiu $v0, $zero, 1 /* 97B774 80240144 14620006 */ bne $v1, $v0, .L80240160 -/* 97B778 80240148 00000000 */ nop +/* 97B778 80240148 00000000 */ nop .L8024014C: /* 97B77C 8024014C 8E220084 */ lw $v0, 0x84($s1) /* 97B780 80240150 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_802400BC_97B6EC /* 97B7C0 80240190 46220000 */ add.d $f0, $f0, $f2 /* 97B7C4 80240194 4620010D */ trunc.w.d $f4, $f0 /* 97B7C8 80240198 44022000 */ mfc1 $v0, $f4 -/* 97B7CC 8024019C 00000000 */ nop +/* 97B7CC 8024019C 00000000 */ nop /* 97B7D0 802401A0 A602008E */ sh $v0, 0x8e($s0) /* 97B7D4 802401A4 00021400 */ sll $v0, $v0, 0x10 /* 97B7D8 802401A8 8E230078 */ lw $v1, 0x78($s1) /* 97B7DC 802401AC 00021403 */ sra $v0, $v0, 0x10 /* 97B7E0 802401B0 0043102A */ slt $v0, $v0, $v1 /* 97B7E4 802401B4 10400003 */ beqz $v0, .L802401C4 -/* 97B7E8 802401B8 00000000 */ nop +/* 97B7E8 802401B8 00000000 */ nop /* 97B7EC 802401BC 9622007A */ lhu $v0, 0x7a($s1) /* 97B7F0 802401C0 A602008E */ sh $v0, 0x8e($s0) .L802401C4: diff --git a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s index da10e611a4..afd2c1dbdb 100644 --- a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s +++ b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s @@ -279,15 +279,17 @@ glabel func_802403D4_97BA04 /* 97BDF0 802407C0 2C620015 */ sltiu $v0, $v1, 0x15 /* 97BDF4 802407C4 10400009 */ beqz $v0, .L802407EC /* 97BDF8 802407C8 00031080 */ sll $v0, $v1, 2 -/* 97BDFC 802407CC 3C018024 */ lui $at, %hi(D_80242438) +/* 97BDFC 802407CC 3C018024 */ lui $at, %hi(jtbl_80242438_97DA68) /* 97BE00 802407D0 00220821 */ addu $at, $at, $v0 -/* 97BE04 802407D4 8C222438 */ lw $v0, %lo(D_80242438)($at) +/* 97BE04 802407D4 8C222438 */ lw $v0, %lo(jtbl_80242438_97DA68)($at) /* 97BE08 802407D8 00400008 */ jr $v0 /* 97BE0C 802407DC 00000000 */ nop +glabel L802407E0_97BE10 /* 97BE10 802407E0 8E420028 */ lw $v0, 0x28($s2) /* 97BE14 802407E4 24420001 */ addiu $v0, $v0, 1 /* 97BE18 802407E8 AE420028 */ sw $v0, 0x28($s2) .L802407EC: +glabel L802407EC_97BE1C /* 97BE1C 802407EC 0000102D */ daddu $v0, $zero, $zero .L802407F0: /* 97BE20 802407F0 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_isk/isk_04/97BF60/func_8024095C_97BF8C.s b/asm/nonmatchings/world/area_isk/isk_04/97BF60/func_8024095C_97BF8C.s index 32d33b670c..c8bc598af8 100644 --- a/asm/nonmatchings/world/area_isk/isk_04/97BF60/func_8024095C_97BF8C.s +++ b/asm/nonmatchings/world/area_isk/isk_04/97BF60/func_8024095C_97BF8C.s @@ -20,12 +20,12 @@ glabel func_8024095C_97BF8C /* 97BFC8 80240998 10600007 */ beqz $v1, .L802409B8 /* 97BFCC 8024099C 0000102D */ daddu $v0, $zero, $zero /* 97BFD0 802409A0 08090295 */ j .L80240A54 -/* 97BFD4 802409A4 00000000 */ nop +/* 97BFD4 802409A4 00000000 */ nop .L802409A8: /* 97BFD8 802409A8 10620008 */ beq $v1, $v0, .L802409CC /* 97BFDC 802409AC 0000102D */ daddu $v0, $zero, $zero /* 97BFE0 802409B0 08090295 */ j .L80240A54 -/* 97BFE4 802409B4 00000000 */ nop +/* 97BFE4 802409B4 00000000 */ nop .L802409B8: /* 97BFE8 802409B8 24020001 */ addiu $v0, $zero, 1 /* 97BFEC 802409BC 08090294 */ j .L80240A50 @@ -53,7 +53,7 @@ glabel func_8024095C_97BF8C /* 97C03C 80240A0C 4600110D */ trunc.w.s $f4, $f2 /* 97C040 80240A10 44052000 */ mfc1 $a1, $f4 /* 97C044 80240A14 0C03BCF0 */ jal func_800EF3C0 -/* 97C048 80240A18 00000000 */ nop +/* 97C048 80240A18 00000000 */ nop /* 97C04C 80240A1C 0C03BCF5 */ jal func_800EF3D4 /* 97C050 80240A20 0000202D */ daddu $a0, $zero, $zero /* 97C054 80240A24 3C0142B4 */ lui $at, 0x42b4 @@ -61,7 +61,7 @@ glabel func_8024095C_97BF8C /* 97C05C 80240A2C 8E040000 */ lw $a0, ($s0) /* 97C060 80240A30 4405A000 */ mfc1 $a1, $f20 /* 97C064 80240A34 0C00ECD0 */ jal set_npc_yaw -/* 97C068 80240A38 00000000 */ nop +/* 97C068 80240A38 00000000 */ nop /* 97C06C 80240A3C 24020002 */ addiu $v0, $zero, 2 /* 97C070 80240A40 E6340080 */ swc1 $f20, 0x80($s1) /* 97C074 80240A44 E6340084 */ swc1 $f20, 0x84($s1) @@ -76,4 +76,4 @@ glabel func_8024095C_97BF8C /* 97C090 80240A60 D7B40020 */ ldc1 $f20, 0x20($sp) /* 97C094 80240A64 03E00008 */ jr $ra /* 97C098 80240A68 27BD0028 */ addiu $sp, $sp, 0x28 -/* 97C09C 80240A6C 00000000 */ nop +/* 97C09C 80240A6C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240000_97DAD0.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240000_97DAD0.s index 4d0b085696..cca8b60ce6 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240000_97DAD0.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240000_97DAD0.s @@ -30,7 +30,7 @@ glabel func_80240000_97DAD0 /* 97DB34 80240064 3C05B000 */ lui $a1, 0xb000 /* 97DB38 80240068 34A50017 */ ori $a1, $a1, 0x17 /* 97DB3C 8024006C 44820000 */ mtc1 $v0, $f0 -/* 97DB40 80240070 00000000 */ nop +/* 97DB40 80240070 00000000 */ nop /* 97DB44 80240074 46800021 */ cvt.d.w $f0, $f0 /* 97DB48 80240078 3C014024 */ lui $at, 0x4024 /* 97DB4C 8024007C 44811800 */ mtc1 $at, $f3 @@ -68,7 +68,7 @@ glabel func_80240000_97DAD0 /* 97DBCC 802400FC 0C0123F5 */ jal is_point_within_region /* 97DBD0 80240100 8E070038 */ lw $a3, 0x38($s0) /* 97DBD4 80240104 10400035 */ beqz $v0, .L802401DC -/* 97DBD8 80240108 00000000 */ nop +/* 97DBD8 80240108 00000000 */ nop /* 97DBDC 8024010C C60C0038 */ lwc1 $f12, 0x38($s0) /* 97DBE0 80240110 3C0141C8 */ lui $at, 0x41c8 /* 97DBE4 80240114 4481B000 */ mtc1 $at, $f22 @@ -99,13 +99,13 @@ glabel func_80240000_97DAD0 /* 97DC44 80240174 860200A8 */ lh $v0, 0xa8($s0) /* 97DC48 80240178 27A50020 */ addiu $a1, $sp, 0x20 /* 97DC4C 8024017C 44820000 */ mtc1 $v0, $f0 -/* 97DC50 80240180 00000000 */ nop +/* 97DC50 80240180 00000000 */ nop /* 97DC54 80240184 46800020 */ cvt.s.w $f0, $f0 /* 97DC58 80240188 E7A00018 */ swc1 $f0, 0x18($sp) /* 97DC5C 8024018C 860200A6 */ lh $v0, 0xa6($s0) /* 97DC60 80240190 27A60024 */ addiu $a2, $sp, 0x24 /* 97DC64 80240194 44820000 */ mtc1 $v0, $f0 -/* 97DC68 80240198 00000000 */ nop +/* 97DC68 80240198 00000000 */ nop /* 97DC6C 8024019C 46800020 */ cvt.s.w $f0, $f0 /* 97DC70 802401A0 E7A0001C */ swc1 $f0, 0x1c($sp) /* 97DC74 802401A4 8E040080 */ lw $a0, 0x80($s0) @@ -121,13 +121,13 @@ glabel func_80240000_97DAD0 /* 97DC9C 802401CC 1440FFE6 */ bnez $v0, .L80240168 /* 97DCA0 802401D0 E600000C */ swc1 $f0, 0xc($s0) /* 97DCA4 802401D4 08090083 */ j .L8024020C -/* 97DCA8 802401D8 00000000 */ nop +/* 97DCA8 802401D8 00000000 */ nop .L802401DC: /* 97DCAC 802401DC 0C00A67F */ jal rand_int /* 97DCB0 802401E0 2404003C */ addiu $a0, $zero, 0x3c /* 97DCB4 802401E4 C60C000C */ lwc1 $f12, 0xc($s0) /* 97DCB8 802401E8 44820000 */ mtc1 $v0, $f0 -/* 97DCBC 802401EC 00000000 */ nop +/* 97DCBC 802401EC 00000000 */ nop /* 97DCC0 802401F0 46800020 */ cvt.s.w $f0, $f0 /* 97DCC4 802401F4 46006300 */ add.s $f12, $f12, $f0 /* 97DCC8 802401F8 3C0141F0 */ lui $at, 0x41f0 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240230_97DD00.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240230_97DD00.s index 72159bcfb4..e11ed080e2 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240230_97DD00.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240230_97DD00.s @@ -43,7 +43,7 @@ glabel func_80240230_97DD00 /* 97DD98 802402C8 2402000F */ addiu $v0, $zero, 0xf /* 97DD9C 802402CC AFA2001C */ sw $v0, 0x1c($sp) /* 97DDA0 802402D0 44835000 */ mtc1 $v1, $f10 -/* 97DDA4 802402D4 00000000 */ nop +/* 97DDA4 802402D4 00000000 */ nop /* 97DDA8 802402D8 468052A0 */ cvt.s.w $f10, $f10 /* 97DDAC 802402DC 44075000 */ mfc1 $a3, $f10 /* 97DDB0 802402E0 27A20028 */ addiu $v0, $sp, 0x28 @@ -78,7 +78,7 @@ glabel func_80240230_97DD00 /* 97DE18 80240348 44801800 */ mtc1 $zero, $f3 /* 97DE1C 8024034C 46000021 */ cvt.d.s $f0, $f0 /* 97DE20 80240350 4620103C */ c.lt.d $f2, $f0 -/* 97DE24 80240354 00000000 */ nop +/* 97DE24 80240354 00000000 */ nop /* 97DE28 80240358 45000025 */ bc1f .L802403F0 /* 97DE2C 8024035C 27A5002C */ addiu $a1, $sp, 0x2c /* 97DE30 80240360 C6000038 */ lwc1 $f0, 0x38($s0) @@ -88,7 +88,7 @@ glabel func_80240230_97DD00 /* 97DE40 80240370 27A60030 */ addiu $a2, $sp, 0x30 /* 97DE44 80240374 E7A0002C */ swc1 $f0, 0x2c($sp) /* 97DE48 80240378 44820000 */ mtc1 $v0, $f0 -/* 97DE4C 8024037C 00000000 */ nop +/* 97DE4C 8024037C 00000000 */ nop /* 97DE50 80240380 46800020 */ cvt.s.w $f0, $f0 /* 97DE54 80240384 46000021 */ cvt.d.s $f0, $f0 /* 97DE58 80240388 C604003C */ lwc1 $f4, 0x3c($s0) @@ -96,13 +96,13 @@ glabel func_80240230_97DD00 /* 97DE60 80240390 C6080018 */ lwc1 $f8, 0x18($s0) /* 97DE64 80240394 860200A8 */ lh $v0, 0xa8($s0) /* 97DE68 80240398 46220002 */ mul.d $f0, $f0, $f2 -/* 97DE6C 8024039C 00000000 */ nop +/* 97DE6C 8024039C 00000000 */ nop /* 97DE70 802403A0 E7A40030 */ swc1 $f4, 0x30($sp) /* 97DE74 802403A4 E7A60034 */ swc1 $f6, 0x34($sp) /* 97DE78 802403A8 E7A80010 */ swc1 $f8, 0x10($sp) /* 97DE7C 802403AC C604000C */ lwc1 $f4, 0xc($s0) /* 97DE80 802403B0 44821000 */ mtc1 $v0, $f2 -/* 97DE84 802403B4 00000000 */ nop +/* 97DE84 802403B4 00000000 */ nop /* 97DE88 802403B8 468010A0 */ cvt.s.w $f2, $f2 /* 97DE8C 802403BC E7A20018 */ swc1 $f2, 0x18($sp) /* 97DE90 802403C0 E7A40014 */ swc1 $f4, 0x14($sp) @@ -123,7 +123,7 @@ glabel func_80240230_97DD00 /* 97DEC8 802403F8 44801800 */ mtc1 $zero, $f3 /* 97DECC 802403FC 46000021 */ cvt.d.s $f0, $f0 /* 97DED0 80240400 4622003C */ c.lt.d $f0, $f2 -/* 97DED4 80240404 00000000 */ nop +/* 97DED4 80240404 00000000 */ nop /* 97DED8 80240408 45000047 */ bc1f .L80240528 /* 97DEDC 8024040C 27A5002C */ addiu $a1, $sp, 0x2c /* 97DEE0 80240410 27A60030 */ addiu $a2, $sp, 0x30 @@ -154,7 +154,7 @@ glabel func_80240230_97DD00 /* 97DF44 80240474 0C0372DF */ jal func_800DCB7C /* 97DF48 80240478 27A70034 */ addiu $a3, $sp, 0x34 /* 97DF4C 8024047C 1040002A */ beqz $v0, .L80240528 -/* 97DF50 80240480 00000000 */ nop +/* 97DF50 80240480 00000000 */ nop /* 97DF54 80240484 C600001C */ lwc1 $f0, 0x1c($s0) /* 97DF58 80240488 C7A20038 */ lwc1 $f2, 0x38($sp) /* 97DF5C 8024048C 46000005 */ abs.s $f0, $f0 @@ -162,7 +162,7 @@ glabel func_80240230_97DD00 /* 97DF64 80240494 46340000 */ add.d $f0, $f0, $f20 /* 97DF68 80240498 460010A1 */ cvt.d.s $f2, $f2 /* 97DF6C 8024049C 4620103E */ c.le.d $f2, $f0 -/* 97DF70 802404A0 00000000 */ nop +/* 97DF70 802404A0 00000000 */ nop /* 97DF74 802404A4 45000020 */ bc1f .L80240528 /* 97DF78 802404A8 240403E8 */ addiu $a0, $zero, 0x3e8 /* 97DF7C 802404AC C7A00030 */ lwc1 $f0, 0x30($sp) @@ -193,7 +193,7 @@ glabel func_80240230_97DD00 /* 97DFE0 80240510 5840000C */ blezl $v0, .L80240544 /* 97DFE4 80240514 AE600070 */ sw $zero, 0x70($s3) /* 97DFE8 80240518 1460000A */ bnez $v1, .L80240544 -/* 97DFEC 8024051C 00000000 */ nop +/* 97DFEC 8024051C 00000000 */ nop /* 97DFF0 80240520 08090151 */ j .L80240544 /* 97DFF4 80240524 AE600070 */ sw $zero, 0x70($s3) .L80240528: diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240628_97E0F8.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240628_97E0F8.s index 72845c5bc1..7656d359f4 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240628_97E0F8.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240628_97E0F8.s @@ -38,7 +38,7 @@ glabel func_80240628_97E0F8 /* 97E17C 802406AC 2402000F */ addiu $v0, $zero, 0xf /* 97E180 802406B0 AFA2001C */ sw $v0, 0x1c($sp) /* 97E184 802406B4 44833000 */ mtc1 $v1, $f6 -/* 97E188 802406B8 00000000 */ nop +/* 97E188 802406B8 00000000 */ nop /* 97E18C 802406BC 468031A0 */ cvt.s.w $f6, $f6 /* 97E190 802406C0 44073000 */ mfc1 $a3, $f6 /* 97E194 802406C4 27A20028 */ addiu $v0, $sp, 0x28 @@ -65,13 +65,13 @@ glabel func_80240628_97E0F8 .L80240718: /* 97E1E8 80240718 8602008C */ lh $v0, 0x8c($s0) /* 97E1EC 8024071C 14400023 */ bnez $v0, .L802407AC -/* 97E1F0 80240720 00000000 */ nop +/* 97E1F0 80240720 00000000 */ nop /* 97E1F4 80240724 9602008E */ lhu $v0, 0x8e($s0) /* 97E1F8 80240728 2442FFFF */ addiu $v0, $v0, -1 /* 97E1FC 8024072C A602008E */ sh $v0, 0x8e($s0) /* 97E200 80240730 00021400 */ sll $v0, $v0, 0x10 /* 97E204 80240734 1C40001D */ bgtz $v0, .L802407AC -/* 97E208 80240738 00000000 */ nop +/* 97E208 80240738 00000000 */ nop /* 97E20C 8024073C 8E820074 */ lw $v0, 0x74($s4) /* 97E210 80240740 2442FFFF */ addiu $v0, $v0, -1 /* 97E214 80240744 18400018 */ blez $v0, .L802407A8 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802407CC_97E29C.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802407CC_97E29C.s index f301708b4f..a999944d3f 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802407CC_97E29C.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802407CC_97E29C.s @@ -24,7 +24,7 @@ glabel func_802407CC_97E29C /* 97E2E8 80240818 0C00A67F */ jal rand_int /* 97E2EC 8024081C AE020000 */ sw $v0, ($s0) /* 97E2F0 80240820 44820000 */ mtc1 $v0, $f0 -/* 97E2F4 80240824 00000000 */ nop +/* 97E2F4 80240824 00000000 */ nop /* 97E2F8 80240828 46800021 */ cvt.d.w $f0, $f0 /* 97E2FC 8024082C 3C014024 */ lui $at, 0x4024 /* 97E300 80240830 44811800 */ mtc1 $at, $f3 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802408AC_97E37C.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802408AC_97E37C.s index f9f713c99a..e7ea1a8768 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802408AC_97E37C.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802408AC_97E37C.s @@ -25,7 +25,7 @@ glabel func_802408AC_97E37C /* 97E3CC 802408FC 44801800 */ mtc1 $zero, $f3 /* 97E3D0 80240900 46000021 */ cvt.d.s $f0, $f0 /* 97E3D4 80240904 4620103C */ c.lt.d $f2, $f0 -/* 97E3D8 80240908 00000000 */ nop +/* 97E3D8 80240908 00000000 */ nop /* 97E3DC 8024090C 45000021 */ bc1f .L80240994 /* 97E3E0 80240910 27A50028 */ addiu $a1, $sp, 0x28 /* 97E3E4 80240914 C6600038 */ lwc1 $f0, 0x38($s3) @@ -40,20 +40,20 @@ glabel func_802408AC_97E37C /* 97E408 80240938 E7A00014 */ swc1 $f0, 0x14($sp) /* 97E40C 8024093C 866200A8 */ lh $v0, 0xa8($s3) /* 97E410 80240940 44820000 */ mtc1 $v0, $f0 -/* 97E414 80240944 00000000 */ nop +/* 97E414 80240944 00000000 */ nop /* 97E418 80240948 46800020 */ cvt.s.w $f0, $f0 /* 97E41C 8024094C E7A00018 */ swc1 $f0, 0x18($sp) /* 97E420 80240950 866200A6 */ lh $v0, 0xa6($s3) /* 97E424 80240954 27A6002C */ addiu $a2, $sp, 0x2c /* 97E428 80240958 44820000 */ mtc1 $v0, $f0 -/* 97E42C 8024095C 00000000 */ nop +/* 97E42C 8024095C 00000000 */ nop /* 97E430 80240960 46800020 */ cvt.s.w $f0, $f0 /* 97E434 80240964 E7A0001C */ swc1 $f0, 0x1c($sp) /* 97E438 80240968 8E640080 */ lw $a0, 0x80($s3) /* 97E43C 8024096C 0C037711 */ jal func_800DDC44 /* 97E440 80240970 27A70030 */ addiu $a3, $sp, 0x30 /* 97E444 80240974 10400003 */ beqz $v0, .L80240984 -/* 97E448 80240978 00000000 */ nop +/* 97E448 80240978 00000000 */ nop /* 97E44C 8024097C 08090265 */ j .L80240994 /* 97E450 80240980 AE600018 */ sw $zero, 0x18($s3) .L80240984: @@ -67,7 +67,7 @@ glabel func_802408AC_97E37C /* 97E46C 8024099C 44801800 */ mtc1 $zero, $f3 /* 97E470 802409A0 46000021 */ cvt.d.s $f0, $f0 /* 97E474 802409A4 4622003C */ c.lt.d $f0, $f2 -/* 97E478 802409A8 00000000 */ nop +/* 97E478 802409A8 00000000 */ nop /* 97E47C 802409AC 4500006C */ bc1f .L80240B60 /* 97E480 802409B0 27B00028 */ addiu $s0, $sp, 0x28 /* 97E484 802409B4 0200282D */ daddu $a1, $s0, $zero @@ -116,7 +116,7 @@ glabel func_802408AC_97E37C /* 97E530 80240A60 0C0372DF */ jal func_800DCB7C /* 97E534 80240A64 0220382D */ daddu $a3, $s1, $zero /* 97E538 80240A68 1040003D */ beqz $v0, .L80240B60 -/* 97E53C 80240A6C 00000000 */ nop +/* 97E53C 80240A6C 00000000 */ nop /* 97E540 80240A70 C660001C */ lwc1 $f0, 0x1c($s3) /* 97E544 80240A74 C7A20038 */ lwc1 $f2, 0x38($sp) /* 97E548 80240A78 46000005 */ abs.s $f0, $f0 @@ -124,7 +124,7 @@ glabel func_802408AC_97E37C /* 97E550 80240A80 46340000 */ add.d $f0, $f0, $f20 /* 97E554 80240A84 460010A1 */ cvt.d.s $f2, $f2 /* 97E558 80240A88 4620103E */ c.le.d $f2, $f0 -/* 97E55C 80240A8C 00000000 */ nop +/* 97E55C 80240A8C 00000000 */ nop /* 97E560 80240A90 45000033 */ bc1f .L80240B60 /* 97E564 80240A94 2403F7FF */ addiu $v1, $zero, -0x801 /* 97E568 80240A98 C7A0002C */ lwc1 $f0, 0x2c($sp) @@ -163,7 +163,7 @@ glabel func_802408AC_97E37C /* 97E5EC 80240B1C 2402000F */ addiu $v0, $zero, 0xf /* 97E5F0 80240B20 AFA2001C */ sw $v0, 0x1c($sp) /* 97E5F4 80240B24 44834000 */ mtc1 $v1, $f8 -/* 97E5F8 80240B28 00000000 */ nop +/* 97E5F8 80240B28 00000000 */ nop /* 97E5FC 80240B2C 46804220 */ cvt.s.w $f8, $f8 /* 97E600 80240B30 44074000 */ mfc1 $a3, $f8 /* 97E604 80240B34 27A2003C */ addiu $v0, $sp, 0x3c diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s index d2d83c9f54..40920cc4ae 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s @@ -76,7 +76,7 @@ glabel func_80240BF0_97E6C0 /* 97E7D8 80240D08 8E4300B0 */ lw $v1, 0xb0($s2) /* 97E7DC 80240D0C 30620004 */ andi $v0, $v1, 4 /* 97E7E0 80240D10 10400007 */ beqz $v0, .L80240D30 -/* 97E7E4 80240D14 00000000 */ nop +/* 97E7E4 80240D14 00000000 */ nop /* 97E7E8 80240D18 824200B4 */ lb $v0, 0xb4($s2) /* 97E7EC 80240D1C 14400034 */ bnez $v0, .L80240DF0 /* 97E7F0 80240D20 0000102D */ daddu $v0, $zero, $zero @@ -88,21 +88,24 @@ glabel func_80240BF0_97E6C0 /* 97E804 80240D34 2C62000F */ sltiu $v0, $v1, 0xf /* 97E808 80240D38 1040002C */ beqz $v0, .L80240DEC /* 97E80C 80240D3C 00031080 */ sll $v0, $v1, 2 -/* 97E810 80240D40 3C018024 */ lui $at, %hi(D_80242EB8) +/* 97E810 80240D40 3C018024 */ lui $at, %hi(jtbl_80242EB8_980988) /* 97E814 80240D44 00220821 */ addu $at, $at, $v0 -/* 97E818 80240D48 8C222EB8 */ lw $v0, %lo(D_80242EB8)($at) +/* 97E818 80240D48 8C222EB8 */ lw $v0, %lo(jtbl_80242EB8_980988)($at) /* 97E81C 80240D4C 00400008 */ jr $v0 -/* 97E820 80240D50 00000000 */ nop +/* 97E820 80240D50 00000000 */ nop +glabel L80240D54_97E824 /* 97E824 80240D54 0260202D */ daddu $a0, $s3, $zero /* 97E828 80240D58 0280282D */ daddu $a1, $s4, $zero /* 97E82C 80240D5C 0C090000 */ jal func_80240000_97DAD0 /* 97E830 80240D60 0200302D */ daddu $a2, $s0, $zero +glabel L80240D64_97E834 /* 97E834 80240D64 0260202D */ daddu $a0, $s3, $zero /* 97E838 80240D68 0280282D */ daddu $a1, $s4, $zero /* 97E83C 80240D6C 0C09008C */ jal func_80240230_97DD00 /* 97E840 80240D70 0200302D */ daddu $a2, $s0, $zero /* 97E844 80240D74 0809037C */ j .L80240DF0 /* 97E848 80240D78 0000102D */ daddu $v0, $zero, $zero +glabel L80240D7C_97E84C /* 97E84C 80240D7C 0260202D */ daddu $a0, $s3, $zero /* 97E850 80240D80 0280282D */ daddu $a1, $s4, $zero /* 97E854 80240D84 0C09015A */ jal isk_05_UnkNpcAIFunc1 @@ -111,27 +114,32 @@ glabel func_80240BF0_97E6C0 /* 97E860 80240D90 24020003 */ addiu $v0, $zero, 3 /* 97E864 80240D94 14620016 */ bne $v1, $v0, .L80240DF0 /* 97E868 80240D98 0000102D */ daddu $v0, $zero, $zero +glabel L80240D9C_97E86C /* 97E86C 80240D9C 0260202D */ daddu $a0, $s3, $zero /* 97E870 80240DA0 0280282D */ daddu $a1, $s4, $zero /* 97E874 80240DA4 0C09018A */ jal func_80240628_97E0F8 /* 97E878 80240DA8 0200302D */ daddu $a2, $s0, $zero /* 97E87C 80240DAC 0809037C */ j .L80240DF0 /* 97E880 80240DB0 0000102D */ daddu $v0, $zero, $zero +glabel L80240DB4_97E884 /* 97E884 80240DB4 0260202D */ daddu $a0, $s3, $zero /* 97E888 80240DB8 0280282D */ daddu $a1, $s4, $zero /* 97E88C 80240DBC 0C0901F3 */ jal func_802407CC_97E29C /* 97E890 80240DC0 0200302D */ daddu $a2, $s0, $zero +glabel L80240DC4_97E894 /* 97E894 80240DC4 0260202D */ daddu $a0, $s3, $zero /* 97E898 80240DC8 0280282D */ daddu $a1, $s4, $zero /* 97E89C 80240DCC 0C09022B */ jal func_802408AC_97E37C /* 97E8A0 80240DD0 0200302D */ daddu $a2, $s0, $zero /* 97E8A4 80240DD4 0809037C */ j .L80240DF0 /* 97E8A8 80240DD8 0000102D */ daddu $v0, $zero, $zero +glabel L80240DDC_97E8AC /* 97E8AC 80240DDC 0260202D */ daddu $a0, $s3, $zero /* 97E8B0 80240DE0 0280282D */ daddu $a1, $s4, $zero /* 97E8B4 80240DE4 0C0902EB */ jal isk_05_UnkDurationCheck /* 97E8B8 80240DE8 0200302D */ daddu $a2, $s0, $zero .L80240DEC: +glabel L80240DEC_97E8BC /* 97E8BC 80240DEC 0000102D */ daddu $v0, $zero, $zero .L80240DF0: /* 97E8C0 80240DF0 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240E14_97E8E4.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240E14_97E8E4.s index eac8c36e2f..3e911bbc6c 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240E14_97E8E4.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240E14_97E8E4.s @@ -24,12 +24,12 @@ glabel func_80240E14_97E8E4 /* 97E930 80240E60 44811800 */ mtc1 $at, $f3 /* 97E934 80240E64 44801000 */ mtc1 $zero, $f2 /* 97E938 80240E68 44820000 */ mtc1 $v0, $f0 -/* 97E93C 80240E6C 00000000 */ nop +/* 97E93C 80240E6C 00000000 */ nop /* 97E940 80240E70 46800021 */ cvt.d.w $f0, $f0 /* 97E944 80240E74 46220000 */ add.d $f0, $f0, $f2 /* 97E948 80240E78 3C013FC0 */ lui $at, 0x3fc0 /* 97E94C 80240E7C 44811000 */ mtc1 $at, $f2 -/* 97E950 80240E80 00000000 */ nop +/* 97E950 80240E80 00000000 */ nop /* 97E954 80240E84 E6020014 */ swc1 $f2, 0x14($s0) /* 97E958 80240E88 46200020 */ cvt.s.d $f0, $f0 /* 97E95C 80240E8C E600001C */ swc1 $f0, 0x1c($s0) diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240EA8_97E978.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240EA8_97E978.s index 0e6f3eb980..5f2f7052b9 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240EA8_97E978.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240EA8_97E978.s @@ -24,12 +24,12 @@ glabel func_80240EA8_97E978 /* 97E9C4 80240EF4 44811800 */ mtc1 $at, $f3 /* 97E9C8 80240EF8 44801000 */ mtc1 $zero, $f2 /* 97E9CC 80240EFC 44820000 */ mtc1 $v0, $f0 -/* 97E9D0 80240F00 00000000 */ nop +/* 97E9D0 80240F00 00000000 */ nop /* 97E9D4 80240F04 46800021 */ cvt.d.w $f0, $f0 /* 97E9D8 80240F08 46220000 */ add.d $f0, $f0, $f2 /* 97E9DC 80240F0C 3C013FC0 */ lui $at, 0x3fc0 /* 97E9E0 80240F10 44811000 */ mtc1 $at, $f2 -/* 97E9E4 80240F14 00000000 */ nop +/* 97E9E4 80240F14 00000000 */ nop /* 97E9E8 80240F18 E6020014 */ swc1 $f2, 0x14($s0) /* 97E9EC 80240F1C 46200020 */ cvt.s.d $f0, $f0 /* 97E9F0 80240F20 E600001C */ swc1 $f0, 0x1c($s0) diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s index 94309281e7..4f672b4b0b 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s @@ -69,46 +69,54 @@ glabel func_80240F3C_97EA0C /* 97EB08 80241038 2C62000F */ sltiu $v0, $v1, 0xf /* 97EB0C 8024103C 10400028 */ beqz $v0, .L802410E0 /* 97EB10 80241040 00031080 */ sll $v0, $v1, 2 -/* 97EB14 80241044 3C018024 */ lui $at, %hi(func_80242EF8) +/* 97EB14 80241044 3C018024 */ lui $at, %hi(jtbl_80242EF8_9809C8) /* 97EB18 80241048 00220821 */ addu $at, $at, $v0 -/* 97EB1C 8024104C 8C222EF8 */ lw $v0, %lo(func_80242EF8)($at) +/* 97EB1C 8024104C 8C222EF8 */ lw $v0, %lo(jtbl_80242EF8_9809C8)($at) /* 97EB20 80241050 00400008 */ jr $v0 -/* 97EB24 80241054 00000000 */ nop +/* 97EB24 80241054 00000000 */ nop +glabel L80241058_97EB28 /* 97EB28 80241058 0280202D */ daddu $a0, $s4, $zero /* 97EB2C 8024105C 0200282D */ daddu $a1, $s0, $zero /* 97EB30 80241060 0C090385 */ jal func_80240E14_97E8E4 /* 97EB34 80241064 0260302D */ daddu $a2, $s3, $zero +glabel L80241068_97EB38 /* 97EB38 80241068 0280202D */ daddu $a0, $s4, $zero /* 97EB3C 8024106C 0200282D */ daddu $a1, $s0, $zero /* 97EB40 80241070 0C09008C */ jal func_80240230_97DD00 /* 97EB44 80241074 0260302D */ daddu $a2, $s3, $zero /* 97EB48 80241078 08090438 */ j .L802410E0 -/* 97EB4C 8024107C 00000000 */ nop +/* 97EB4C 8024107C 00000000 */ nop +glabel L80241080_97EB50 /* 97EB50 80241080 0280202D */ daddu $a0, $s4, $zero /* 97EB54 80241084 0200282D */ daddu $a1, $s0, $zero /* 97EB58 80241088 0C09015A */ jal isk_05_UnkNpcAIFunc1 /* 97EB5C 8024108C 0260302D */ daddu $a2, $s3, $zero +glabel L80241090_97EB60 /* 97EB60 80241090 0280202D */ daddu $a0, $s4, $zero /* 97EB64 80241094 0200282D */ daddu $a1, $s0, $zero /* 97EB68 80241098 0C09018A */ jal func_80240628_97E0F8 /* 97EB6C 8024109C 0260302D */ daddu $a2, $s3, $zero /* 97EB70 802410A0 08090438 */ j .L802410E0 -/* 97EB74 802410A4 00000000 */ nop +/* 97EB74 802410A4 00000000 */ nop +glabel L802410A8_97EB78 /* 97EB78 802410A8 0280202D */ daddu $a0, $s4, $zero /* 97EB7C 802410AC 0200282D */ daddu $a1, $s0, $zero /* 97EB80 802410B0 0C0903AA */ jal func_80240EA8_97E978 /* 97EB84 802410B4 0260302D */ daddu $a2, $s3, $zero +glabel L802410B8_97EB88 /* 97EB88 802410B8 0280202D */ daddu $a0, $s4, $zero /* 97EB8C 802410BC 0200282D */ daddu $a1, $s0, $zero /* 97EB90 802410C0 0C09022B */ jal func_802408AC_97E37C /* 97EB94 802410C4 0260302D */ daddu $a2, $s3, $zero /* 97EB98 802410C8 08090438 */ j .L802410E0 -/* 97EB9C 802410CC 00000000 */ nop +/* 97EB9C 802410CC 00000000 */ nop +glabel L802410D0_97EBA0 /* 97EBA0 802410D0 0280202D */ daddu $a0, $s4, $zero /* 97EBA4 802410D4 0200282D */ daddu $a1, $s0, $zero /* 97EBA8 802410D8 0C0902EB */ jal isk_05_UnkDurationCheck /* 97EBAC 802410DC 0260302D */ daddu $a2, $s3, $zero .L802410E0: +glabel L802410E0_97EBB0 /* 97EBB0 802410E0 8FBF0048 */ lw $ra, 0x48($sp) /* 97EBB4 802410E4 8FB50044 */ lw $s5, 0x44($sp) /* 97EBB8 802410E8 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802411F8_97ECC8.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802411F8_97ECC8.s index 0305dd7a53..f226a6307c 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802411F8_97ECC8.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802411F8_97ECC8.s @@ -28,10 +28,10 @@ glabel func_802411F8_97ECC8 /* 97ED24 80241254 44810000 */ mtc1 $at, $f0 /* 97ED28 80241258 C6860038 */ lwc1 $f6, 0x38($s4) /* 97ED2C 8024125C 44821000 */ mtc1 $v0, $f2 -/* 97ED30 80241260 00000000 */ nop +/* 97ED30 80241260 00000000 */ nop /* 97ED34 80241264 468010A0 */ cvt.s.w $f2, $f2 /* 97ED38 80241268 46001082 */ mul.s $f2, $f2, $f0 -/* 97ED3C 8024126C 00000000 */ nop +/* 97ED3C 8024126C 00000000 */ nop /* 97ED40 80241270 C688003C */ lwc1 $f8, 0x3c($s4) /* 97ED44 80241274 3C014334 */ lui $at, 0x4334 /* 97ED48 80241278 44816000 */ mtc1 $at, $f12 @@ -47,10 +47,10 @@ glabel func_802411F8_97ECC8 /* 97ED70 802412A0 3421999A */ ori $at, $at, 0x999a /* 97ED74 802412A4 44812000 */ mtc1 $at, $f4 /* 97ED78 802412A8 44821000 */ mtc1 $v0, $f2 -/* 97ED7C 802412AC 00000000 */ nop +/* 97ED7C 802412AC 00000000 */ nop /* 97ED80 802412B0 468010A0 */ cvt.s.w $f2, $f2 /* 97ED84 802412B4 46041082 */ mul.s $f2, $f2, $f4 -/* 97ED88 802412B8 00000000 */ nop +/* 97ED88 802412B8 00000000 */ nop /* 97ED8C 802412BC 27A40018 */ addiu $a0, $sp, 0x18 /* 97ED90 802412C0 44070000 */ mfc1 $a3, $f0 /* 97ED94 802412C4 44061000 */ mfc1 $a2, $f2 @@ -97,22 +97,22 @@ glabel func_802411F8_97ECC8 /* 97EE2C 8024135C 8E060040 */ lw $a2, 0x40($s0) /* 97EE30 80241360 44071000 */ mfc1 $a3, $f2 /* 97EE34 80241364 0C00A7CB */ jal dist3D -/* 97EE38 80241368 00000000 */ nop +/* 97EE38 80241368 00000000 */ nop /* 97EE3C 8024136C 46000021 */ cvt.d.s $f0, $f0 /* 97EE40 80241370 4620C03E */ c.le.d $f24, $f0 -/* 97EE44 80241374 00000000 */ nop +/* 97EE44 80241374 00000000 */ nop /* 97EE48 80241378 45000047 */ bc1f .L80241498 -/* 97EE4C 8024137C 00000000 */ nop +/* 97EE4C 8024137C 00000000 */ nop /* 97EE50 80241380 C60C0038 */ lwc1 $f12, 0x38($s0) /* 97EE54 80241384 C7A40018 */ lwc1 $f4, 0x18($sp) /* 97EE58 80241388 46046301 */ sub.s $f12, $f12, $f4 /* 97EE5C 8024138C 46166302 */ mul.s $f12, $f12, $f22 -/* 97EE60 80241390 00000000 */ nop +/* 97EE60 80241390 00000000 */ nop /* 97EE64 80241394 C6000040 */ lwc1 $f0, 0x40($s0) /* 97EE68 80241398 C7A2001C */ lwc1 $f2, 0x1c($sp) /* 97EE6C 8024139C 46020001 */ sub.s $f0, $f0, $f2 /* 97EE70 802413A0 46160002 */ mul.s $f0, $f0, $f22 -/* 97EE74 802413A4 00000000 */ nop +/* 97EE74 802413A4 00000000 */ nop /* 97EE78 802413A8 E7B40010 */ swc1 $f20, 0x10($sp) /* 97EE7C 802413AC E7A20014 */ swc1 $f2, 0x14($sp) /* 97EE80 802413B0 46020000 */ add.s $f0, $f0, $f2 @@ -125,40 +125,40 @@ glabel func_802411F8_97ECC8 /* 97EE9C 802413CC C7A20018 */ lwc1 $f2, 0x18($sp) /* 97EEA0 802413D0 46024201 */ sub.s $f8, $f8, $f2 /* 97EEA4 802413D4 46164202 */ mul.s $f8, $f8, $f22 -/* 97EEA8 802413D8 00000000 */ nop +/* 97EEA8 802413D8 00000000 */ nop /* 97EEAC 802413DC C606003C */ lwc1 $f6, 0x3c($s0) /* 97EEB0 802413E0 46000021 */ cvt.d.s $f0, $f0 /* 97EEB4 802413E4 46143181 */ sub.s $f6, $f6, $f20 /* 97EEB8 802413E8 4620C003 */ div.d $f0, $f24, $f0 /* 97EEBC 802413EC 46200020 */ cvt.s.d $f0, $f0 /* 97EEC0 802413F0 46003182 */ mul.s $f6, $f6, $f0 -/* 97EEC4 802413F4 00000000 */ nop +/* 97EEC4 802413F4 00000000 */ nop /* 97EEC8 802413F8 C6040040 */ lwc1 $f4, 0x40($s0) /* 97EECC 802413FC C7AA001C */ lwc1 $f10, 0x1c($sp) /* 97EED0 80241400 460A2101 */ sub.s $f4, $f4, $f10 /* 97EED4 80241404 46162102 */ mul.s $f4, $f4, $f22 -/* 97EED8 80241408 00000000 */ nop +/* 97EED8 80241408 00000000 */ nop /* 97EEDC 8024140C 46004202 */ mul.s $f8, $f8, $f0 -/* 97EEE0 80241410 00000000 */ nop +/* 97EEE0 80241410 00000000 */ nop /* 97EEE4 80241414 46002102 */ mul.s $f4, $f4, $f0 -/* 97EEE8 80241418 00000000 */ nop +/* 97EEE8 80241418 00000000 */ nop /* 97EEEC 8024141C 46024200 */ add.s $f8, $f8, $f2 /* 97EEF0 80241420 C6020038 */ lwc1 $f2, 0x38($s0) /* 97EEF4 80241424 46024081 */ sub.s $f2, $f8, $f2 /* 97EEF8 80241428 461C1082 */ mul.s $f2, $f2, $f28 -/* 97EEFC 8024142C 00000000 */ nop +/* 97EEFC 8024142C 00000000 */ nop /* 97EF00 80241430 4606A500 */ add.s $f20, $f20, $f6 /* 97EF04 80241434 E622FFFC */ swc1 $f2, -4($s1) /* 97EF08 80241438 C602003C */ lwc1 $f2, 0x3c($s0) /* 97EF0C 8024143C 4602A081 */ sub.s $f2, $f20, $f2 /* 97EF10 80241440 461C1082 */ mul.s $f2, $f2, $f28 -/* 97EF14 80241444 00000000 */ nop +/* 97EF14 80241444 00000000 */ nop /* 97EF18 80241448 460A2100 */ add.s $f4, $f4, $f10 /* 97EF1C 8024144C E6220000 */ swc1 $f2, ($s1) /* 97EF20 80241450 C6000040 */ lwc1 $f0, 0x40($s0) /* 97EF24 80241454 46002001 */ sub.s $f0, $f4, $f0 /* 97EF28 80241458 461C0002 */ mul.s $f0, $f0, $f28 -/* 97EF2C 8024145C 00000000 */ nop +/* 97EF2C 8024145C 00000000 */ nop /* 97EF30 80241460 3C014120 */ lui $at, 0x4120 /* 97EF34 80241464 44818000 */ mtc1 $at, $f16 /* 97EF38 80241468 E6200004 */ swc1 $f0, 4($s1) @@ -168,7 +168,7 @@ glabel func_802411F8_97ECC8 /* 97EF48 80241478 C6200000 */ lwc1 $f0, ($s1) /* 97EF4C 8024147C E7A80018 */ swc1 $f8, 0x18($sp) /* 97EF50 80241480 4600803C */ c.lt.s $f16, $f0 -/* 97EF54 80241484 00000000 */ nop +/* 97EF54 80241484 00000000 */ nop /* 97EF58 80241488 45000016 */ bc1f .L802414E4 /* 97EF5C 8024148C E7A4001C */ swc1 $f4, 0x1c($sp) /* 97EF60 80241490 08090539 */ j .L802414E4 @@ -178,12 +178,12 @@ glabel func_802411F8_97ECC8 /* 97EF6C 8024149C 3C013F66 */ lui $at, 0x3f66 /* 97EF70 802414A0 34216666 */ ori $at, $at, 0x6666 /* 97EF74 802414A4 44818000 */ mtc1 $at, $f16 -/* 97EF78 802414A8 00000000 */ nop +/* 97EF78 802414A8 00000000 */ nop /* 97EF7C 802414AC 46101082 */ mul.s $f2, $f2, $f16 -/* 97EF80 802414B0 00000000 */ nop +/* 97EF80 802414B0 00000000 */ nop /* 97EF84 802414B4 C6200004 */ lwc1 $f0, 4($s1) /* 97EF88 802414B8 46100002 */ mul.s $f0, $f0, $f16 -/* 97EF8C 802414BC 00000000 */ nop +/* 97EF8C 802414BC 00000000 */ nop /* 97EF90 802414C0 E622FFFC */ swc1 $f2, -4($s1) /* 97EF94 802414C4 E6200004 */ swc1 $f0, 4($s1) /* 97EF98 802414C8 C6000038 */ lwc1 $f0, 0x38($s0) @@ -197,10 +197,10 @@ glabel func_802411F8_97ECC8 /* 97EFB4 802414E4 C6220000 */ lwc1 $f2, ($s1) /* 97EFB8 802414E8 3C013F80 */ lui $at, 0x3f80 /* 97EFBC 802414EC 44810000 */ mtc1 $at, $f0 -/* 97EFC0 802414F0 00000000 */ nop +/* 97EFC0 802414F0 00000000 */ nop /* 97EFC4 802414F4 46001081 */ sub.s $f2, $f2, $f0 /* 97EFC8 802414F8 461E103C */ c.lt.s $f2, $f30 -/* 97EFCC 802414FC 00000000 */ nop +/* 97EFCC 802414FC 00000000 */ nop /* 97EFD0 80241500 45000002 */ bc1f .L8024150C /* 97EFD4 80241504 E6220000 */ swc1 $f2, ($s1) /* 97EFD8 80241508 E63E0000 */ swc1 $f30, ($s1) @@ -209,7 +209,7 @@ glabel func_802411F8_97ECC8 /* 97EFE0 80241510 C6200000 */ lwc1 $f0, ($s1) /* 97EFE4 80241514 46001080 */ add.s $f2, $f2, $f0 /* 97EFE8 80241518 461A103E */ c.le.s $f2, $f26 -/* 97EFEC 8024151C 00000000 */ nop +/* 97EFEC 8024151C 00000000 */ nop /* 97EFF0 80241520 4500000C */ bc1f .L80241554 /* 97EFF4 80241524 E602003C */ swc1 $f2, 0x3c($s0) /* 97EFF8 80241528 E61A003C */ swc1 $f26, 0x3c($s0) @@ -220,7 +220,7 @@ glabel func_802411F8_97ECC8 /* 97F00C 8024153C 46000007 */ neg.s $f0, $f0 /* 97F010 80241540 46000021 */ cvt.d.s $f0, $f0 /* 97F014 80241544 46220002 */ mul.d $f0, $f0, $f2 -/* 97F018 80241548 00000000 */ nop +/* 97F018 80241548 00000000 */ nop /* 97F01C 8024154C 46200020 */ cvt.s.d $f0, $f0 /* 97F020 80241550 E6200000 */ swc1 $f0, ($s1) .L80241554: diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241B28_97F5F8.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241B28_97F5F8.s index 9cd0d682ee..f81a93978a 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241B28_97F5F8.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241B28_97F5F8.s @@ -25,7 +25,7 @@ glabel func_80241B28_97F5F8 /* 97F648 80241B78 D4202F38 */ ldc1 $f0, %lo(D_80242F38)($at) /* 97F64C 80241B7C 460030A1 */ cvt.d.s $f2, $f6 /* 97F650 80241B80 46201082 */ mul.d $f2, $f2, $f0 -/* 97F654 80241B84 00000000 */ nop +/* 97F654 80241B84 00000000 */ nop /* 97F658 80241B88 3C013FE0 */ lui $at, 0x3fe0 /* 97F65C 80241B8C 44812800 */ mtc1 $at, $f5 /* 97F660 80241B90 44802000 */ mtc1 $zero, $f4 @@ -33,7 +33,7 @@ glabel func_80241B28_97F5F8 /* 97F668 80241B98 46800020 */ cvt.s.w $f0, $f0 /* 97F66C 80241B9C E600003C */ swc1 $f0, 0x3c($s0) /* 97F670 80241BA0 46241082 */ mul.d $f2, $f2, $f4 -/* 97F674 80241BA4 00000000 */ nop +/* 97F674 80241BA4 00000000 */ nop /* 97F678 80241BA8 E6060040 */ swc1 $f6, 0x40($s0) /* 97F67C 80241BAC C6200038 */ lwc1 $f0, 0x38($s1) /* 97F680 80241BB0 E6000010 */ swc1 $f0, 0x10($s0) diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C34_97F704.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C34_97F704.s index 5c4898bc1d..09ec49f70e 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C34_97F704.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C34_97F704.s @@ -7,7 +7,7 @@ glabel func_80241C34_97F704 /* 97F70C 80241C3C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 97F710 80241C40 AFBF0010 */ sw $ra, 0x10($sp) /* 97F714 80241C44 0C048D70 */ jal func_801235C0 -/* 97F718 80241C48 00000000 */ nop +/* 97F718 80241C48 00000000 */ nop /* 97F71C 80241C4C 8FBF0010 */ lw $ra, 0x10($sp) /* 97F720 80241C50 24020002 */ addiu $v0, $zero, 2 /* 97F724 80241C54 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C5C_97F72C.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C5C_97F72C.s index 20b2121617..828885cd7a 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C5C_97F72C.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C5C_97F72C.s @@ -30,25 +30,25 @@ glabel func_80241C5C_97F72C /* 97F790 80241CC0 D4242F40 */ ldc1 $f4, %lo(D_80242F40)($at) /* 97F794 80241CC4 460010A1 */ cvt.d.s $f2, $f2 /* 97F798 80241CC8 46241082 */ mul.d $f2, $f2, $f4 -/* 97F79C 80241CCC 00000000 */ nop +/* 97F79C 80241CCC 00000000 */ nop /* 97F7A0 80241CD0 3C013FE0 */ lui $at, 0x3fe0 /* 97F7A4 80241CD4 44812800 */ mtc1 $at, $f5 /* 97F7A8 80241CD8 44802000 */ mtc1 $zero, $f4 -/* 97F7AC 80241CDC 00000000 */ nop +/* 97F7AC 80241CDC 00000000 */ nop /* 97F7B0 80241CE0 46241082 */ mul.d $f2, $f2, $f4 -/* 97F7B4 80241CE4 00000000 */ nop +/* 97F7B4 80241CE4 00000000 */ nop /* 97F7B8 80241CE8 4600018D */ trunc.w.s $f6, $f0 /* 97F7BC 80241CEC 44033000 */ mfc1 $v1, $f6 /* 97F7C0 80241CF0 44900000 */ mtc1 $s0, $f0 -/* 97F7C4 80241CF4 00000000 */ nop +/* 97F7C4 80241CF4 00000000 */ nop /* 97F7C8 80241CF8 46800021 */ cvt.d.w $f0, $f0 /* 97F7CC 80241CFC 44922000 */ mtc1 $s2, $f4 -/* 97F7D0 80241D00 00000000 */ nop +/* 97F7D0 80241D00 00000000 */ nop /* 97F7D4 80241D04 46802120 */ cvt.s.w $f4, $f4 /* 97F7D8 80241D08 E4440010 */ swc1 $f4, 0x10($v0) /* 97F7DC 80241D0C 46220000 */ add.d $f0, $f0, $f2 /* 97F7E0 80241D10 44831000 */ mtc1 $v1, $f2 -/* 97F7E4 80241D14 00000000 */ nop +/* 97F7E4 80241D14 00000000 */ nop /* 97F7E8 80241D18 468010A0 */ cvt.s.w $f2, $f2 /* 97F7EC 80241D1C E4420018 */ swc1 $f2, 0x18($v0) /* 97F7F0 80241D20 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241D44_97F814.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241D44_97F814.s index f75893bcc3..4bc19dcc7d 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241D44_97F814.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241D44_97F814.s @@ -26,17 +26,17 @@ glabel func_80241D44_97F814 /* 97F868 80241D98 3C038024 */ lui $v1, %hi(D_80242614) /* 97F86C 80241D9C 24632614 */ addiu $v1, $v1, %lo(D_80242614) /* 97F870 80241DA0 44921000 */ mtc1 $s2, $f2 -/* 97F874 80241DA4 00000000 */ nop +/* 97F874 80241DA4 00000000 */ nop /* 97F878 80241DA8 468010A0 */ cvt.s.w $f2, $f2 /* 97F87C 80241DAC E462001C */ swc1 $f2, 0x1c($v1) /* 97F880 80241DB0 44901000 */ mtc1 $s0, $f2 -/* 97F884 80241DB4 00000000 */ nop +/* 97F884 80241DB4 00000000 */ nop /* 97F888 80241DB8 468010A0 */ cvt.s.w $f2, $f2 /* 97F88C 80241DBC 4600010D */ trunc.w.s $f4, $f0 /* 97F890 80241DC0 44022000 */ mfc1 $v0, $f4 -/* 97F894 80241DC4 00000000 */ nop +/* 97F894 80241DC4 00000000 */ nop /* 97F898 80241DC8 44820000 */ mtc1 $v0, $f0 -/* 97F89C 80241DCC 00000000 */ nop +/* 97F89C 80241DCC 00000000 */ nop /* 97F8A0 80241DD0 46800020 */ cvt.s.w $f0, $f0 /* 97F8A4 80241DD4 E4620020 */ swc1 $f2, 0x20($v1) /* 97F8A8 80241DD8 E4600024 */ swc1 $f0, 0x24($v1) diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241E24_97F8F4.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241E24_97F8F4.s index 76267bed09..730d56d578 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241E24_97F8F4.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241E24_97F8F4.s @@ -14,19 +14,19 @@ glabel func_80241E24_97F8F4 /* 97F918 80241E48 0200202D */ daddu $a0, $s0, $zero /* 97F91C 80241E4C 3C05FE36 */ lui $a1, 0xfe36 /* 97F920 80241E50 4482B000 */ mtc1 $v0, $f22 -/* 97F924 80241E54 00000000 */ nop +/* 97F924 80241E54 00000000 */ nop /* 97F928 80241E58 4680B5A0 */ cvt.s.w $f22, $f22 /* 97F92C 80241E5C 0C0B1EAF */ jal get_variable /* 97F930 80241E60 34A53C80 */ ori $a1, $a1, 0x3c80 /* 97F934 80241E64 0200202D */ daddu $a0, $s0, $zero /* 97F938 80241E68 3C05FE36 */ lui $a1, 0xfe36 /* 97F93C 80241E6C 4482A000 */ mtc1 $v0, $f20 -/* 97F940 80241E70 00000000 */ nop +/* 97F940 80241E70 00000000 */ nop /* 97F944 80241E74 4680A520 */ cvt.s.w $f20, $f20 /* 97F948 80241E78 0C0B1EAF */ jal get_variable /* 97F94C 80241E7C 34A53C84 */ ori $a1, $a1, 0x3c84 /* 97F950 80241E80 44820000 */ mtc1 $v0, $f0 -/* 97F954 80241E84 00000000 */ nop +/* 97F954 80241E84 00000000 */ nop /* 97F958 80241E88 46800020 */ cvt.s.w $f0, $f0 /* 97F95C 80241E8C 4405B000 */ mfc1 $a1, $f22 /* 97F960 80241E90 4406A000 */ mfc1 $a2, $f20 diff --git a/asm/nonmatchings/world/area_isk/isk_07/982440/func_80240014_982454.s b/asm/nonmatchings/world/area_isk/isk_07/982440/func_80240014_982454.s index bd969eca9a..f58ed6b2b3 100644 --- a/asm/nonmatchings/world/area_isk/isk_07/982440/func_80240014_982454.s +++ b/asm/nonmatchings/world/area_isk/isk_07/982440/func_80240014_982454.s @@ -46,6 +46,6 @@ glabel func_80240014_982454 /* 9824DC 8024009C AC880088 */ sw $t0, 0x88($a0) .L802400A0: /* 9824E0 802400A0 03E00008 */ jr $ra -/* 9824E4 802400A4 00000000 */ nop -/* 9824E8 802400A8 00000000 */ nop -/* 9824EC 802400AC 00000000 */ nop +/* 9824E4 802400A4 00000000 */ nop +/* 9824E8 802400A8 00000000 */ nop +/* 9824EC 802400AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_07/982530/func_802400F0_982530.s b/asm/nonmatchings/world/area_isk/isk_07/982530/func_802400F0_982530.s index 30f4416268..5c9fb0ade6 100644 --- a/asm/nonmatchings/world/area_isk/isk_07/982530/func_802400F0_982530.s +++ b/asm/nonmatchings/world/area_isk/isk_07/982530/func_802400F0_982530.s @@ -8,5 +8,5 @@ glabel func_802400F0_982530 /* 98253C 802400FC 0002102B */ sltu $v0, $zero, $v0 /* 982540 80240100 03E00008 */ jr $ra /* 982544 80240104 00021040 */ sll $v0, $v0, 1 -/* 982548 80240108 00000000 */ nop -/* 98254C 8024010C 00000000 */ nop +/* 982548 80240108 00000000 */ nop +/* 98254C 8024010C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_8024007C_984EAC.s b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_8024007C_984EAC.s index 4686d0abba..a569b4c6e1 100644 --- a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_8024007C_984EAC.s +++ b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_8024007C_984EAC.s @@ -21,11 +21,11 @@ glabel func_8024007C_984EAC /* 984EEC 802400BC A602008E */ sh $v0, 0x8e($s0) /* 984EF0 802400C0 00021400 */ sll $v0, $v0, 0x10 /* 984EF4 802400C4 1C400033 */ bgtz $v0, .L80240194 -/* 984EF8 802400C8 00000000 */ nop +/* 984EF8 802400C8 00000000 */ nop .L802400CC: /* 984EFC 802400CC 8602008C */ lh $v0, 0x8c($s0) /* 984F00 802400D0 14400030 */ bnez $v0, .L80240194 -/* 984F04 802400D4 00000000 */ nop +/* 984F04 802400D4 00000000 */ nop /* 984F08 802400D8 8E2200CC */ lw $v0, 0xcc($s1) /* 984F0C 802400DC 8C420024 */ lw $v0, 0x24($v0) /* 984F10 802400E0 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_8024007C_984EAC /* 984F1C 802400EC 8E230088 */ lw $v1, 0x88($s1) /* 984F20 802400F0 24020005 */ addiu $v0, $zero, 5 /* 984F24 802400F4 10620005 */ beq $v1, $v0, .L8024010C -/* 984F28 802400F8 00000000 */ nop +/* 984F28 802400F8 00000000 */ nop /* 984F2C 802400FC 10600003 */ beqz $v1, .L8024010C /* 984F30 80240100 24020001 */ addiu $v0, $zero, 1 /* 984F34 80240104 14620006 */ bne $v1, $v0, .L80240120 -/* 984F38 80240108 00000000 */ nop +/* 984F38 80240108 00000000 */ nop .L8024010C: /* 984F3C 8024010C 8E220084 */ lw $v0, 0x84($s1) /* 984F40 80240110 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_8024007C_984EAC /* 984F80 80240150 46220000 */ add.d $f0, $f0, $f2 /* 984F84 80240154 4620010D */ trunc.w.d $f4, $f0 /* 984F88 80240158 44022000 */ mfc1 $v0, $f4 -/* 984F8C 8024015C 00000000 */ nop +/* 984F8C 8024015C 00000000 */ nop /* 984F90 80240160 A602008E */ sh $v0, 0x8e($s0) /* 984F94 80240164 00021400 */ sll $v0, $v0, 0x10 /* 984F98 80240168 8E230078 */ lw $v1, 0x78($s1) /* 984F9C 8024016C 00021403 */ sra $v0, $v0, 0x10 /* 984FA0 80240170 0043102A */ slt $v0, $v0, $v1 /* 984FA4 80240174 10400003 */ beqz $v0, .L80240184 -/* 984FA8 80240178 00000000 */ nop +/* 984FA8 80240178 00000000 */ nop /* 984FAC 8024017C 9622007A */ lhu $v0, 0x7a($s1) /* 984FB0 80240180 A602008E */ sh $v0, 0x8e($s0) .L80240184: diff --git a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s index 73c9b49363..2cc9f5e009 100644 --- a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s +++ b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s @@ -279,15 +279,17 @@ glabel func_80240394_9851C4 /* 9855B0 80240780 2C620015 */ sltiu $v0, $v1, 0x15 /* 9855B4 80240784 10400009 */ beqz $v0, .L802407AC /* 9855B8 80240788 00031080 */ sll $v0, $v1, 2 -/* 9855BC 8024078C 3C018024 */ lui $at, %hi(func_80241658_8B16C8) +/* 9855BC 8024078C 3C018024 */ lui $at, %hi(jtbl_80241658_986488) /* 9855C0 80240790 00220821 */ addu $at, $at, $v0 -/* 9855C4 80240794 8C221658 */ lw $v0, %lo(func_80241658_8B16C8)($at) +/* 9855C4 80240794 8C221658 */ lw $v0, %lo(jtbl_80241658_986488)($at) /* 9855C8 80240798 00400008 */ jr $v0 /* 9855CC 8024079C 00000000 */ nop +glabel L802407A0_9855D0 /* 9855D0 802407A0 8E420028 */ lw $v0, 0x28($s2) /* 9855D4 802407A4 24420001 */ addiu $v0, $v0, 1 /* 9855D8 802407A8 AE420028 */ sw $v0, 0x28($s2) .L802407AC: +glabel L802407AC_9855DC /* 9855DC 802407AC 0000102D */ daddu $v0, $zero, $zero .L802407B0: /* 9855E0 802407B0 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240000_9864E0.s b/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240000_9864E0.s index c3875599f6..6c0f06e7b1 100644 --- a/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240000_9864E0.s +++ b/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240000_9864E0.s @@ -26,7 +26,7 @@ glabel func_80240000_9864E0 /* 986530 80240050 1440FFFA */ bnez $v0, .L8024003C /* 986534 80240054 24A50004 */ addiu $a1, $a1, 4 /* 986538 80240058 08090027 */ j .L8024009C -/* 98653C 8024005C 00000000 */ nop +/* 98653C 8024005C 00000000 */ nop .L80240060: /* 986540 80240060 0000182D */ daddu $v1, $zero, $zero /* 986544 80240064 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_802402BC_98679C.s b/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_802402BC_98679C.s index 7663670515..9c87d9498c 100644 --- a/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_802402BC_98679C.s +++ b/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_802402BC_98679C.s @@ -13,5 +13,5 @@ glabel func_802402BC_98679C /* 9867BC 802402DC 24020002 */ addiu $v0, $zero, 2 /* 9867C0 802402E0 03E00008 */ jr $ra /* 9867C4 802402E4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 9867C8 802402E8 00000000 */ nop -/* 9867CC 802402EC 00000000 */ nop +/* 9867C8 802402E8 00000000 */ nop +/* 9867CC 802402EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_09/9867D0/func_802402F0_9867D0.s b/asm/nonmatchings/world/area_isk/isk_09/9867D0/func_802402F0_9867D0.s index dfcdaad820..c61101ff87 100644 --- a/asm/nonmatchings/world/area_isk/isk_09/9867D0/func_802402F0_9867D0.s +++ b/asm/nonmatchings/world/area_isk/isk_09/9867D0/func_802402F0_9867D0.s @@ -15,6 +15,6 @@ glabel func_802402F0_9867D0 /* 9867F8 80240318 00031040 */ sll $v0, $v1, 1 /* 9867FC 8024031C 03E00008 */ jr $ra /* 986800 80240320 27BD0018 */ addiu $sp, $sp, 0x18 -/* 986804 80240324 00000000 */ nop -/* 986808 80240328 00000000 */ nop -/* 98680C 8024032C 00000000 */ nop +/* 986804 80240324 00000000 */ nop +/* 986808 80240328 00000000 */ nop +/* 98680C 8024032C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802400D4_988C34.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802400D4_988C34.s index daa8851308..e27f00a73b 100644 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802400D4_988C34.s +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802400D4_988C34.s @@ -8,7 +8,7 @@ glabel func_802400D4_988C34 /* 988C40 802400E0 00822021 */ addu $a0, $a0, $v0 /* 988C44 802400E4 90820014 */ lbu $v0, 0x14($a0) /* 988C48 802400E8 10400009 */ beqz $v0, .L80240110 -/* 988C4C 802400EC 00000000 */ nop +/* 988C4C 802400EC 00000000 */ nop /* 988C50 802400F0 90820015 */ lbu $v0, 0x15($a0) /* 988C54 802400F4 00022600 */ sll $a0, $v0, 0x18 /* 988C58 802400F8 00041E03 */ sra $v1, $a0, 0x18 @@ -16,7 +16,7 @@ glabel func_802400D4_988C34 /* 988C60 80240100 00021403 */ sra $v0, $v0, 0x10 /* 988C64 80240104 0043102A */ slt $v0, $v0, $v1 /* 988C68 80240108 10400003 */ beqz $v0, .L80240118 -/* 988C6C 8024010C 00000000 */ nop +/* 988C6C 8024010C 00000000 */ nop .L80240110: /* 988C70 80240110 03E00008 */ jr $ra /* 988C74 80240114 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s index f8ca845b90..38bb3fa0f9 100644 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s @@ -108,20 +108,20 @@ glabel func_802401CC_988D2C /* 988EB4 80240354 10400009 */ beqz $v0, .L8024037C /* 988EB8 80240358 AEA20074 */ sw $v0, 0x74($s5) /* 988EBC 8024035C 0C03C4EC */ jal func_800F13B0 -/* 988EC0 80240360 00000000 */ nop +/* 988EC0 80240360 00000000 */ nop /* 988EC4 80240364 8EA20070 */ lw $v0, 0x70($s5) /* 988EC8 80240368 24420001 */ addiu $v0, $v0, 1 .L8024036C: /* 988ECC 8024036C AEA20070 */ sw $v0, 0x70($s5) /* 988ED0 80240370 2842000F */ slti $v0, $v0, 0xf /* 988ED4 80240374 10400003 */ beqz $v0, .L80240384 -/* 988ED8 80240378 00000000 */ nop +/* 988ED8 80240378 00000000 */ nop .L8024037C: /* 988EDC 8024037C 080900FB */ j .L802403EC /* 988EE0 80240380 0000102D */ daddu $v0, $zero, $zero .L80240384: /* 988EE4 80240384 0C03C54E */ jal func_800F1538 -/* 988EE8 80240388 00000000 */ nop +/* 988EE8 80240388 00000000 */ nop /* 988EEC 8024038C 8EA30074 */ lw $v1, 0x74($s5) /* 988EF0 80240390 240200FF */ addiu $v0, $zero, 0xff /* 988EF4 80240394 10620010 */ beq $v1, $v0, .L802403D8 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240600_989160.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240600_989160.s index e9203e06d9..36b818d561 100644 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240600_989160.s +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240600_989160.s @@ -36,7 +36,7 @@ glabel func_80240600_989160 /* 9891DC 8024067C 0C00A88D */ jal sin_cos_deg /* 9891E0 80240680 0040A82D */ daddu $s5, $v0, $zero /* 9891E4 80240684 1200005D */ beqz $s0, .L802407FC -/* 9891E8 80240688 00000000 */ nop +/* 9891E8 80240688 00000000 */ nop /* 9891EC 8024068C 0C00AB0A */ jal general_heap_malloc /* 9891F0 80240690 24040068 */ addiu $a0, $zero, 0x68 /* 9891F4 80240694 0040902D */ daddu $s2, $v0, $zero @@ -98,10 +98,10 @@ glabel func_80240600_989160 /* 9892CC 8024076C C7A2001C */ lwc1 $f2, 0x1c($sp) /* 9892D0 80240770 C7A40020 */ lwc1 $f4, 0x20($sp) /* 9892D4 80240774 46041082 */ mul.s $f2, $f2, $f4 -/* 9892D8 80240778 00000000 */ nop +/* 9892D8 80240778 00000000 */ nop /* 9892DC 8024077C C7A00018 */ lwc1 $f0, 0x18($sp) /* 9892E0 80240780 46040002 */ mul.s $f0, $f0, $f4 -/* 9892E4 80240784 00000000 */ nop +/* 9892E4 80240784 00000000 */ nop /* 9892E8 80240788 E6020038 */ swc1 $f2, 0x38($s0) /* 9892EC 8024078C E6000050 */ swc1 $f0, 0x50($s0) /* 9892F0 80240790 8E42005C */ lw $v0, 0x5c($s2) @@ -142,12 +142,12 @@ glabel func_80240600_989160 /* 989378 80240818 10600007 */ beqz $v1, .L80240838 /* 98937C 8024081C 24040005 */ addiu $a0, $zero, 5 /* 989380 80240820 08090274 */ j .L802409D0 -/* 989384 80240824 00000000 */ nop +/* 989384 80240824 00000000 */ nop .L80240828: /* 989388 80240828 10620058 */ beq $v1, $v0, .L8024098C -/* 98938C 8024082C 00000000 */ nop +/* 98938C 8024082C 00000000 */ nop /* 989390 80240830 08090274 */ j .L802409D0 -/* 989394 80240834 00000000 */ nop +/* 989394 80240834 00000000 */ nop .L80240838: /* 989398 80240838 0000882D */ daddu $s1, $zero, $zero /* 98939C 8024083C 3C148024 */ lui $s4, %hi(D_80241158) @@ -174,11 +174,11 @@ glabel func_80240600_989160 /* 9893EC 8024088C C7A4001C */ lwc1 $f4, 0x1c($sp) /* 9893F0 80240890 C7A00020 */ lwc1 $f0, 0x20($sp) /* 9893F4 80240894 46002102 */ mul.s $f4, $f4, $f0 -/* 9893F8 80240898 00000000 */ nop +/* 9893F8 80240898 00000000 */ nop /* 9893FC 8024089C C7A20018 */ lwc1 $f2, 0x18($sp) /* 989400 802408A0 26940004 */ addiu $s4, $s4, 4 /* 989404 802408A4 46001082 */ mul.s $f2, $f2, $f0 -/* 989408 802408A8 00000000 */ nop +/* 989408 802408A8 00000000 */ nop /* 98940C 802408AC 26730004 */ addiu $s3, $s3, 4 /* 989410 802408B0 26310001 */ addiu $s1, $s1, 1 /* 989414 802408B4 2A220003 */ slti $v0, $s1, 3 @@ -215,11 +215,11 @@ glabel func_80240600_989160 /* 989488 80240928 C7A4001C */ lwc1 $f4, 0x1c($sp) /* 98948C 8024092C C7A00020 */ lwc1 $f0, 0x20($sp) /* 989490 80240930 46002102 */ mul.s $f4, $f4, $f0 -/* 989494 80240934 00000000 */ nop +/* 989494 80240934 00000000 */ nop /* 989498 80240938 C7A20018 */ lwc1 $f2, 0x18($sp) /* 98949C 8024093C 26940004 */ addiu $s4, $s4, 4 /* 9894A0 80240940 46001082 */ mul.s $f2, $f2, $f0 -/* 9894A4 80240944 00000000 */ nop +/* 9894A4 80240944 00000000 */ nop /* 9894A8 80240948 26730004 */ addiu $s3, $s3, 4 /* 9894AC 8024094C 26310001 */ addiu $s1, $s1, 1 /* 9894B0 80240950 2A220003 */ slti $v0, $s1, 3 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240B38_989698.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240B38_989698.s index a262665bbf..ccbb30a035 100644 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240B38_989698.s +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240B38_989698.s @@ -36,16 +36,16 @@ glabel func_80240B38_989698 /* 989710 80240BB0 10600007 */ beqz $v1, .L80240BD0 /* 989714 80240BB4 240500FF */ addiu $a1, $zero, 0xff /* 989718 80240BB8 08090312 */ j .L80240C48 -/* 98971C 80240BBC 00000000 */ nop +/* 98971C 80240BBC 00000000 */ nop .L80240BC0: /* 989720 80240BC0 10620019 */ beq $v1, $v0, .L80240C28 -/* 989724 80240BC4 00000000 */ nop +/* 989724 80240BC4 00000000 */ nop /* 989728 80240BC8 08090312 */ j .L80240C48 -/* 98972C 80240BCC 00000000 */ nop +/* 98972C 80240BCC 00000000 */ nop .L80240BD0: /* 989730 80240BD0 8E220074 */ lw $v0, 0x74($s1) /* 989734 80240BD4 14450004 */ bne $v0, $a1, .L80240BE8 -/* 989738 80240BD8 00000000 */ nop +/* 989738 80240BD8 00000000 */ nop /* 98973C 80240BDC AE240070 */ sw $a0, 0x70($s1) /* 989740 80240BE0 AE200078 */ sw $zero, 0x78($s1) /* 989744 80240BE4 8E220074 */ lw $v0, 0x74($s1) @@ -57,7 +57,7 @@ glabel func_80240B38_989698 /* 989758 80240BF8 50400013 */ beql $v0, $zero, .L80240C48 /* 98975C 80240BFC AE250074 */ sw $a1, 0x74($s1) /* 989760 80240C00 08090312 */ j .L80240C48 -/* 989764 80240C04 00000000 */ nop +/* 989764 80240C04 00000000 */ nop .L80240C08: /* 989768 80240C08 8E220078 */ lw $v0, 0x78($s1) /* 98976C 80240C0C 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s index 264efe9e96..8af4282633 100644 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s @@ -9,10 +9,10 @@ glabel func_80240D38_989898 /* 9898A8 80240D48 D4201EA0 */ ldc1 $f0, %lo(D_80241EA0)($at) /* 9898AC 80240D4C 2406FFFF */ addiu $a2, $zero, -1 /* 9898B0 80240D50 44821000 */ mtc1 $v0, $f2 -/* 9898B4 80240D54 00000000 */ nop +/* 9898B4 80240D54 00000000 */ nop /* 9898B8 80240D58 468010A1 */ cvt.d.w $f2, $f2 /* 9898BC 80240D5C 4622003C */ c.lt.d $f0, $f2 -/* 9898C0 80240D60 00000000 */ nop +/* 9898C0 80240D60 00000000 */ nop /* 9898C4 80240D64 45000002 */ bc1f .L80240D70 /* 9898C8 80240D68 AFBF0010 */ sw $ra, 0x10($sp) /* 9898CC 80240D6C 0000302D */ daddu $a2, $zero, $zero @@ -20,12 +20,12 @@ glabel func_80240D38_989898 /* 9898D0 80240D70 3C018024 */ lui $at, %hi(D_80241EA8) /* 9898D4 80240D74 D4201EA8 */ ldc1 $f0, %lo(D_80241EA8)($at) /* 9898D8 80240D78 4620103C */ c.lt.d $f2, $f0 -/* 9898DC 80240D7C 00000000 */ nop +/* 9898DC 80240D7C 00000000 */ nop /* 9898E0 80240D80 45030001 */ bc1tl .L80240D88 /* 9898E4 80240D84 24060001 */ addiu $a2, $zero, 1 .L80240D88: /* 9898E8 80240D88 04C00004 */ bltz $a2, .L80240D9C -/* 9898EC 80240D8C 00000000 */ nop +/* 9898EC 80240D8C 00000000 */ nop /* 9898F0 80240D90 3C05FD05 */ lui $a1, 0xfd05 /* 9898F4 80240D94 0C0B2026 */ jal set_variable /* 9898F8 80240D98 34A50F89 */ ori $a1, $a1, 0xf89 @@ -34,4 +34,4 @@ glabel func_80240D38_989898 /* 989900 80240DA0 0000102D */ daddu $v0, $zero, $zero /* 989904 80240DA4 03E00008 */ jr $ra /* 989908 80240DA8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 98990C 80240DAC 00000000 */ nop +/* 98990C 80240DAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_11/98AA10/func_80240000_98AA10.s b/asm/nonmatchings/world/area_isk/isk_11/98AA10/func_80240000_98AA10.s index 3d4d8641b3..92ec8d5df1 100644 --- a/asm/nonmatchings/world/area_isk/isk_11/98AA10/func_80240000_98AA10.s +++ b/asm/nonmatchings/world/area_isk/isk_11/98AA10/func_80240000_98AA10.s @@ -43,6 +43,6 @@ glabel func_80240000_98AA10 /* 98AAA8 80240098 24020002 */ addiu $v0, $zero, 2 /* 98AAAC 8024009C 03E00008 */ jr $ra /* 98AAB0 802400A0 27BD0040 */ addiu $sp, $sp, 0x40 -/* 98AAB4 802400A4 00000000 */ nop -/* 98AAB8 802400A8 00000000 */ nop -/* 98AABC 802400AC 00000000 */ nop +/* 98AAB4 802400A4 00000000 */ nop +/* 98AAB8 802400A8 00000000 */ nop +/* 98AABC 802400AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_11/98AAC0/func_802400B0_98AAC0.s b/asm/nonmatchings/world/area_isk/isk_11/98AAC0/func_802400B0_98AAC0.s index 976ff01238..f67a55f3a7 100644 --- a/asm/nonmatchings/world/area_isk/isk_11/98AAC0/func_802400B0_98AAC0.s +++ b/asm/nonmatchings/world/area_isk/isk_11/98AAC0/func_802400B0_98AAC0.s @@ -27,6 +27,6 @@ glabel func_802400B0_98AAC0 /* 98AB18 80240108 24020002 */ addiu $v0, $zero, 2 /* 98AB1C 8024010C 03E00008 */ jr $ra /* 98AB20 80240110 27BD0020 */ addiu $sp, $sp, 0x20 -/* 98AB24 80240114 00000000 */ nop -/* 98AB28 80240118 00000000 */ nop -/* 98AB2C 8024011C 00000000 */ nop +/* 98AB24 80240114 00000000 */ nop +/* 98AB28 80240118 00000000 */ nop +/* 98AB2C 8024011C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240000_98F7E0.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240000_98F7E0.s index ee261d5494..814428d6e5 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240000_98F7E0.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240000_98F7E0.s @@ -30,7 +30,7 @@ glabel func_80240000_98F7E0 /* 98F844 80240064 3C05B000 */ lui $a1, 0xb000 /* 98F848 80240068 34A50017 */ ori $a1, $a1, 0x17 /* 98F84C 8024006C 44820000 */ mtc1 $v0, $f0 -/* 98F850 80240070 00000000 */ nop +/* 98F850 80240070 00000000 */ nop /* 98F854 80240074 46800021 */ cvt.d.w $f0, $f0 /* 98F858 80240078 3C014024 */ lui $at, 0x4024 /* 98F85C 8024007C 44811800 */ mtc1 $at, $f3 @@ -68,7 +68,7 @@ glabel func_80240000_98F7E0 /* 98F8DC 802400FC 0C0123F5 */ jal is_point_within_region /* 98F8E0 80240100 8E070038 */ lw $a3, 0x38($s0) /* 98F8E4 80240104 10400035 */ beqz $v0, .L802401DC -/* 98F8E8 80240108 00000000 */ nop +/* 98F8E8 80240108 00000000 */ nop /* 98F8EC 8024010C C60C0038 */ lwc1 $f12, 0x38($s0) /* 98F8F0 80240110 3C0141C8 */ lui $at, 0x41c8 /* 98F8F4 80240114 4481B000 */ mtc1 $at, $f22 @@ -99,13 +99,13 @@ glabel func_80240000_98F7E0 /* 98F954 80240174 860200A8 */ lh $v0, 0xa8($s0) /* 98F958 80240178 27A50020 */ addiu $a1, $sp, 0x20 /* 98F95C 8024017C 44820000 */ mtc1 $v0, $f0 -/* 98F960 80240180 00000000 */ nop +/* 98F960 80240180 00000000 */ nop /* 98F964 80240184 46800020 */ cvt.s.w $f0, $f0 /* 98F968 80240188 E7A00018 */ swc1 $f0, 0x18($sp) /* 98F96C 8024018C 860200A6 */ lh $v0, 0xa6($s0) /* 98F970 80240190 27A60024 */ addiu $a2, $sp, 0x24 /* 98F974 80240194 44820000 */ mtc1 $v0, $f0 -/* 98F978 80240198 00000000 */ nop +/* 98F978 80240198 00000000 */ nop /* 98F97C 8024019C 46800020 */ cvt.s.w $f0, $f0 /* 98F980 802401A0 E7A0001C */ swc1 $f0, 0x1c($sp) /* 98F984 802401A4 8E040080 */ lw $a0, 0x80($s0) @@ -121,13 +121,13 @@ glabel func_80240000_98F7E0 /* 98F9AC 802401CC 1440FFE6 */ bnez $v0, .L80240168 /* 98F9B0 802401D0 E600000C */ swc1 $f0, 0xc($s0) /* 98F9B4 802401D4 08090083 */ j .L8024020C -/* 98F9B8 802401D8 00000000 */ nop +/* 98F9B8 802401D8 00000000 */ nop .L802401DC: /* 98F9BC 802401DC 0C00A67F */ jal rand_int /* 98F9C0 802401E0 2404003C */ addiu $a0, $zero, 0x3c /* 98F9C4 802401E4 C60C000C */ lwc1 $f12, 0xc($s0) /* 98F9C8 802401E8 44820000 */ mtc1 $v0, $f0 -/* 98F9CC 802401EC 00000000 */ nop +/* 98F9CC 802401EC 00000000 */ nop /* 98F9D0 802401F0 46800020 */ cvt.s.w $f0, $f0 /* 98F9D4 802401F4 46006300 */ add.s $f12, $f12, $f0 /* 98F9D8 802401F8 3C0141F0 */ lui $at, 0x41f0 diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240230_98FA10.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240230_98FA10.s index 5c94bbeb03..925291a69b 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240230_98FA10.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240230_98FA10.s @@ -43,7 +43,7 @@ glabel func_80240230_98FA10 /* 98FAA8 802402C8 2402000F */ addiu $v0, $zero, 0xf /* 98FAAC 802402CC AFA2001C */ sw $v0, 0x1c($sp) /* 98FAB0 802402D0 44835000 */ mtc1 $v1, $f10 -/* 98FAB4 802402D4 00000000 */ nop +/* 98FAB4 802402D4 00000000 */ nop /* 98FAB8 802402D8 468052A0 */ cvt.s.w $f10, $f10 /* 98FABC 802402DC 44075000 */ mfc1 $a3, $f10 /* 98FAC0 802402E0 27A20028 */ addiu $v0, $sp, 0x28 @@ -78,7 +78,7 @@ glabel func_80240230_98FA10 /* 98FB28 80240348 44801800 */ mtc1 $zero, $f3 /* 98FB2C 8024034C 46000021 */ cvt.d.s $f0, $f0 /* 98FB30 80240350 4620103C */ c.lt.d $f2, $f0 -/* 98FB34 80240354 00000000 */ nop +/* 98FB34 80240354 00000000 */ nop /* 98FB38 80240358 45000025 */ bc1f .L802403F0 /* 98FB3C 8024035C 27A5002C */ addiu $a1, $sp, 0x2c /* 98FB40 80240360 C6000038 */ lwc1 $f0, 0x38($s0) @@ -88,7 +88,7 @@ glabel func_80240230_98FA10 /* 98FB50 80240370 27A60030 */ addiu $a2, $sp, 0x30 /* 98FB54 80240374 E7A0002C */ swc1 $f0, 0x2c($sp) /* 98FB58 80240378 44820000 */ mtc1 $v0, $f0 -/* 98FB5C 8024037C 00000000 */ nop +/* 98FB5C 8024037C 00000000 */ nop /* 98FB60 80240380 46800020 */ cvt.s.w $f0, $f0 /* 98FB64 80240384 46000021 */ cvt.d.s $f0, $f0 /* 98FB68 80240388 C604003C */ lwc1 $f4, 0x3c($s0) @@ -96,13 +96,13 @@ glabel func_80240230_98FA10 /* 98FB70 80240390 C6080018 */ lwc1 $f8, 0x18($s0) /* 98FB74 80240394 860200A8 */ lh $v0, 0xa8($s0) /* 98FB78 80240398 46220002 */ mul.d $f0, $f0, $f2 -/* 98FB7C 8024039C 00000000 */ nop +/* 98FB7C 8024039C 00000000 */ nop /* 98FB80 802403A0 E7A40030 */ swc1 $f4, 0x30($sp) /* 98FB84 802403A4 E7A60034 */ swc1 $f6, 0x34($sp) /* 98FB88 802403A8 E7A80010 */ swc1 $f8, 0x10($sp) /* 98FB8C 802403AC C604000C */ lwc1 $f4, 0xc($s0) /* 98FB90 802403B0 44821000 */ mtc1 $v0, $f2 -/* 98FB94 802403B4 00000000 */ nop +/* 98FB94 802403B4 00000000 */ nop /* 98FB98 802403B8 468010A0 */ cvt.s.w $f2, $f2 /* 98FB9C 802403BC E7A20018 */ swc1 $f2, 0x18($sp) /* 98FBA0 802403C0 E7A40014 */ swc1 $f4, 0x14($sp) @@ -123,7 +123,7 @@ glabel func_80240230_98FA10 /* 98FBD8 802403F8 44801800 */ mtc1 $zero, $f3 /* 98FBDC 802403FC 46000021 */ cvt.d.s $f0, $f0 /* 98FBE0 80240400 4622003C */ c.lt.d $f0, $f2 -/* 98FBE4 80240404 00000000 */ nop +/* 98FBE4 80240404 00000000 */ nop /* 98FBE8 80240408 45000047 */ bc1f .L80240528 /* 98FBEC 8024040C 27A5002C */ addiu $a1, $sp, 0x2c /* 98FBF0 80240410 27A60030 */ addiu $a2, $sp, 0x30 @@ -154,7 +154,7 @@ glabel func_80240230_98FA10 /* 98FC54 80240474 0C0372DF */ jal func_800DCB7C /* 98FC58 80240478 27A70034 */ addiu $a3, $sp, 0x34 /* 98FC5C 8024047C 1040002A */ beqz $v0, .L80240528 -/* 98FC60 80240480 00000000 */ nop +/* 98FC60 80240480 00000000 */ nop /* 98FC64 80240484 C600001C */ lwc1 $f0, 0x1c($s0) /* 98FC68 80240488 C7A20038 */ lwc1 $f2, 0x38($sp) /* 98FC6C 8024048C 46000005 */ abs.s $f0, $f0 @@ -162,7 +162,7 @@ glabel func_80240230_98FA10 /* 98FC74 80240494 46340000 */ add.d $f0, $f0, $f20 /* 98FC78 80240498 460010A1 */ cvt.d.s $f2, $f2 /* 98FC7C 8024049C 4620103E */ c.le.d $f2, $f0 -/* 98FC80 802404A0 00000000 */ nop +/* 98FC80 802404A0 00000000 */ nop /* 98FC84 802404A4 45000020 */ bc1f .L80240528 /* 98FC88 802404A8 240403E8 */ addiu $a0, $zero, 0x3e8 /* 98FC8C 802404AC C7A00030 */ lwc1 $f0, 0x30($sp) @@ -193,7 +193,7 @@ glabel func_80240230_98FA10 /* 98FCF0 80240510 5840000C */ blezl $v0, .L80240544 /* 98FCF4 80240514 AE600070 */ sw $zero, 0x70($s3) /* 98FCF8 80240518 1460000A */ bnez $v1, .L80240544 -/* 98FCFC 8024051C 00000000 */ nop +/* 98FCFC 8024051C 00000000 */ nop /* 98FD00 80240520 08090151 */ j .L80240544 /* 98FD04 80240524 AE600070 */ sw $zero, 0x70($s3) .L80240528: diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240628_98FE08.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240628_98FE08.s index 137ca28269..f5d79a9106 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240628_98FE08.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240628_98FE08.s @@ -38,7 +38,7 @@ glabel func_80240628_98FE08 /* 98FE8C 802406AC 2402000F */ addiu $v0, $zero, 0xf /* 98FE90 802406B0 AFA2001C */ sw $v0, 0x1c($sp) /* 98FE94 802406B4 44833000 */ mtc1 $v1, $f6 -/* 98FE98 802406B8 00000000 */ nop +/* 98FE98 802406B8 00000000 */ nop /* 98FE9C 802406BC 468031A0 */ cvt.s.w $f6, $f6 /* 98FEA0 802406C0 44073000 */ mfc1 $a3, $f6 /* 98FEA4 802406C4 27A20028 */ addiu $v0, $sp, 0x28 @@ -65,13 +65,13 @@ glabel func_80240628_98FE08 .L80240718: /* 98FEF8 80240718 8602008C */ lh $v0, 0x8c($s0) /* 98FEFC 8024071C 14400023 */ bnez $v0, .L802407AC -/* 98FF00 80240720 00000000 */ nop +/* 98FF00 80240720 00000000 */ nop /* 98FF04 80240724 9602008E */ lhu $v0, 0x8e($s0) /* 98FF08 80240728 2442FFFF */ addiu $v0, $v0, -1 /* 98FF0C 8024072C A602008E */ sh $v0, 0x8e($s0) /* 98FF10 80240730 00021400 */ sll $v0, $v0, 0x10 /* 98FF14 80240734 1C40001D */ bgtz $v0, .L802407AC -/* 98FF18 80240738 00000000 */ nop +/* 98FF18 80240738 00000000 */ nop /* 98FF1C 8024073C 8E820074 */ lw $v0, 0x74($s4) /* 98FF20 80240740 2442FFFF */ addiu $v0, $v0, -1 /* 98FF24 80240744 18400018 */ blez $v0, .L802407A8 diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_802407CC_98FFAC.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_802407CC_98FFAC.s index 22e7a9440e..4dfcb04855 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_802407CC_98FFAC.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_802407CC_98FFAC.s @@ -24,7 +24,7 @@ glabel func_802407CC_98FFAC /* 98FFF8 80240818 0C00A67F */ jal rand_int /* 98FFFC 8024081C AE020000 */ sw $v0, ($s0) /* 990000 80240820 44820000 */ mtc1 $v0, $f0 -/* 990004 80240824 00000000 */ nop +/* 990004 80240824 00000000 */ nop /* 990008 80240828 46800021 */ cvt.d.w $f0, $f0 /* 99000C 8024082C 3C014024 */ lui $at, 0x4024 /* 990010 80240830 44811800 */ mtc1 $at, $f3 diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_802408AC_99008C.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_802408AC_99008C.s index a8cb4ebad8..a0a098ab34 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_802408AC_99008C.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_802408AC_99008C.s @@ -25,7 +25,7 @@ glabel func_802408AC_99008C /* 9900DC 802408FC 44801800 */ mtc1 $zero, $f3 /* 9900E0 80240900 46000021 */ cvt.d.s $f0, $f0 /* 9900E4 80240904 4620103C */ c.lt.d $f2, $f0 -/* 9900E8 80240908 00000000 */ nop +/* 9900E8 80240908 00000000 */ nop /* 9900EC 8024090C 45000021 */ bc1f .L80240994 /* 9900F0 80240910 27A50028 */ addiu $a1, $sp, 0x28 /* 9900F4 80240914 C6600038 */ lwc1 $f0, 0x38($s3) @@ -40,20 +40,20 @@ glabel func_802408AC_99008C /* 990118 80240938 E7A00014 */ swc1 $f0, 0x14($sp) /* 99011C 8024093C 866200A8 */ lh $v0, 0xa8($s3) /* 990120 80240940 44820000 */ mtc1 $v0, $f0 -/* 990124 80240944 00000000 */ nop +/* 990124 80240944 00000000 */ nop /* 990128 80240948 46800020 */ cvt.s.w $f0, $f0 /* 99012C 8024094C E7A00018 */ swc1 $f0, 0x18($sp) /* 990130 80240950 866200A6 */ lh $v0, 0xa6($s3) /* 990134 80240954 27A6002C */ addiu $a2, $sp, 0x2c /* 990138 80240958 44820000 */ mtc1 $v0, $f0 -/* 99013C 8024095C 00000000 */ nop +/* 99013C 8024095C 00000000 */ nop /* 990140 80240960 46800020 */ cvt.s.w $f0, $f0 /* 990144 80240964 E7A0001C */ swc1 $f0, 0x1c($sp) /* 990148 80240968 8E640080 */ lw $a0, 0x80($s3) /* 99014C 8024096C 0C037711 */ jal func_800DDC44 /* 990150 80240970 27A70030 */ addiu $a3, $sp, 0x30 /* 990154 80240974 10400003 */ beqz $v0, .L80240984 -/* 990158 80240978 00000000 */ nop +/* 990158 80240978 00000000 */ nop /* 99015C 8024097C 08090265 */ j .L80240994 /* 990160 80240980 AE600018 */ sw $zero, 0x18($s3) .L80240984: @@ -67,7 +67,7 @@ glabel func_802408AC_99008C /* 99017C 8024099C 44801800 */ mtc1 $zero, $f3 /* 990180 802409A0 46000021 */ cvt.d.s $f0, $f0 /* 990184 802409A4 4622003C */ c.lt.d $f0, $f2 -/* 990188 802409A8 00000000 */ nop +/* 990188 802409A8 00000000 */ nop /* 99018C 802409AC 4500006C */ bc1f .L80240B60 /* 990190 802409B0 27B00028 */ addiu $s0, $sp, 0x28 /* 990194 802409B4 0200282D */ daddu $a1, $s0, $zero @@ -116,7 +116,7 @@ glabel func_802408AC_99008C /* 990240 80240A60 0C0372DF */ jal func_800DCB7C /* 990244 80240A64 0220382D */ daddu $a3, $s1, $zero /* 990248 80240A68 1040003D */ beqz $v0, .L80240B60 -/* 99024C 80240A6C 00000000 */ nop +/* 99024C 80240A6C 00000000 */ nop /* 990250 80240A70 C660001C */ lwc1 $f0, 0x1c($s3) /* 990254 80240A74 C7A20038 */ lwc1 $f2, 0x38($sp) /* 990258 80240A78 46000005 */ abs.s $f0, $f0 @@ -124,7 +124,7 @@ glabel func_802408AC_99008C /* 990260 80240A80 46340000 */ add.d $f0, $f0, $f20 /* 990264 80240A84 460010A1 */ cvt.d.s $f2, $f2 /* 990268 80240A88 4620103E */ c.le.d $f2, $f0 -/* 99026C 80240A8C 00000000 */ nop +/* 99026C 80240A8C 00000000 */ nop /* 990270 80240A90 45000033 */ bc1f .L80240B60 /* 990274 80240A94 2403F7FF */ addiu $v1, $zero, -0x801 /* 990278 80240A98 C7A0002C */ lwc1 $f0, 0x2c($sp) @@ -163,7 +163,7 @@ glabel func_802408AC_99008C /* 9902FC 80240B1C 2402000F */ addiu $v0, $zero, 0xf /* 990300 80240B20 AFA2001C */ sw $v0, 0x1c($sp) /* 990304 80240B24 44834000 */ mtc1 $v1, $f8 -/* 990308 80240B28 00000000 */ nop +/* 990308 80240B28 00000000 */ nop /* 99030C 80240B2C 46804220 */ cvt.s.w $f8, $f8 /* 990310 80240B30 44074000 */ mfc1 $a3, $f8 /* 990314 80240B34 27A2003C */ addiu $v0, $sp, 0x3c diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s index 5a42424c27..42d169050e 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s @@ -76,7 +76,7 @@ glabel func_80240BF0_9903D0 /* 9904E8 80240D08 8E4300B0 */ lw $v1, 0xb0($s2) /* 9904EC 80240D0C 30620004 */ andi $v0, $v1, 4 /* 9904F0 80240D10 10400007 */ beqz $v0, .L80240D30 -/* 9904F4 80240D14 00000000 */ nop +/* 9904F4 80240D14 00000000 */ nop /* 9904F8 80240D18 824200B4 */ lb $v0, 0xb4($s2) /* 9904FC 80240D1C 14400034 */ bnez $v0, .L80240DF0 /* 990500 80240D20 0000102D */ daddu $v0, $zero, $zero @@ -88,21 +88,24 @@ glabel func_80240BF0_9903D0 /* 990514 80240D34 2C62000F */ sltiu $v0, $v1, 0xf /* 990518 80240D38 1040002C */ beqz $v0, .L80240DEC /* 99051C 80240D3C 00031080 */ sll $v0, $v1, 2 -/* 990520 80240D40 3C018024 */ lui $at, %hi(D_80242EB8) +/* 990520 80240D40 3C018024 */ lui $at, %hi(jtbl_80242EB8_992698) /* 990524 80240D44 00220821 */ addu $at, $at, $v0 -/* 990528 80240D48 8C222EB8 */ lw $v0, %lo(D_80242EB8)($at) +/* 990528 80240D48 8C222EB8 */ lw $v0, %lo(jtbl_80242EB8_992698)($at) /* 99052C 80240D4C 00400008 */ jr $v0 -/* 990530 80240D50 00000000 */ nop +/* 990530 80240D50 00000000 */ nop +glabel L80240D54_990534 /* 990534 80240D54 0260202D */ daddu $a0, $s3, $zero /* 990538 80240D58 0280282D */ daddu $a1, $s4, $zero /* 99053C 80240D5C 0C090000 */ jal func_80240000_98F7E0 /* 990540 80240D60 0200302D */ daddu $a2, $s0, $zero +glabel L80240D64_990544 /* 990544 80240D64 0260202D */ daddu $a0, $s3, $zero /* 990548 80240D68 0280282D */ daddu $a1, $s4, $zero /* 99054C 80240D6C 0C09008C */ jal func_80240230_98FA10 /* 990550 80240D70 0200302D */ daddu $a2, $s0, $zero /* 990554 80240D74 0809037C */ j .L80240DF0 /* 990558 80240D78 0000102D */ daddu $v0, $zero, $zero +glabel L80240D7C_99055C /* 99055C 80240D7C 0260202D */ daddu $a0, $s3, $zero /* 990560 80240D80 0280282D */ daddu $a1, $s4, $zero /* 990564 80240D84 0C09015A */ jal isk_13_UnkNpcAIFunc1 @@ -111,27 +114,32 @@ glabel func_80240BF0_9903D0 /* 990570 80240D90 24020003 */ addiu $v0, $zero, 3 /* 990574 80240D94 14620016 */ bne $v1, $v0, .L80240DF0 /* 990578 80240D98 0000102D */ daddu $v0, $zero, $zero +glabel L80240D9C_99057C /* 99057C 80240D9C 0260202D */ daddu $a0, $s3, $zero /* 990580 80240DA0 0280282D */ daddu $a1, $s4, $zero /* 990584 80240DA4 0C09018A */ jal func_80240628_98FE08 /* 990588 80240DA8 0200302D */ daddu $a2, $s0, $zero /* 99058C 80240DAC 0809037C */ j .L80240DF0 /* 990590 80240DB0 0000102D */ daddu $v0, $zero, $zero +glabel L80240DB4_990594 /* 990594 80240DB4 0260202D */ daddu $a0, $s3, $zero /* 990598 80240DB8 0280282D */ daddu $a1, $s4, $zero /* 99059C 80240DBC 0C0901F3 */ jal func_802407CC_98FFAC /* 9905A0 80240DC0 0200302D */ daddu $a2, $s0, $zero +glabel L80240DC4_9905A4 /* 9905A4 80240DC4 0260202D */ daddu $a0, $s3, $zero /* 9905A8 80240DC8 0280282D */ daddu $a1, $s4, $zero /* 9905AC 80240DCC 0C09022B */ jal func_802408AC_99008C /* 9905B0 80240DD0 0200302D */ daddu $a2, $s0, $zero /* 9905B4 80240DD4 0809037C */ j .L80240DF0 /* 9905B8 80240DD8 0000102D */ daddu $v0, $zero, $zero +glabel L80240DDC_9905BC /* 9905BC 80240DDC 0260202D */ daddu $a0, $s3, $zero /* 9905C0 80240DE0 0280282D */ daddu $a1, $s4, $zero /* 9905C4 80240DE4 0C0902EB */ jal isk_13_UnkDurationCheck /* 9905C8 80240DE8 0200302D */ daddu $a2, $s0, $zero .L80240DEC: +glabel L80240DEC_9905CC /* 9905CC 80240DEC 0000102D */ daddu $v0, $zero, $zero .L80240DF0: /* 9905D0 80240DF0 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240E14_9905F4.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240E14_9905F4.s index 5dd79c0428..1330bd4ff0 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240E14_9905F4.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240E14_9905F4.s @@ -24,12 +24,12 @@ glabel func_80240E14_9905F4 /* 990640 80240E60 44811800 */ mtc1 $at, $f3 /* 990644 80240E64 44801000 */ mtc1 $zero, $f2 /* 990648 80240E68 44820000 */ mtc1 $v0, $f0 -/* 99064C 80240E6C 00000000 */ nop +/* 99064C 80240E6C 00000000 */ nop /* 990650 80240E70 46800021 */ cvt.d.w $f0, $f0 /* 990654 80240E74 46220000 */ add.d $f0, $f0, $f2 /* 990658 80240E78 3C013FC0 */ lui $at, 0x3fc0 /* 99065C 80240E7C 44811000 */ mtc1 $at, $f2 -/* 990660 80240E80 00000000 */ nop +/* 990660 80240E80 00000000 */ nop /* 990664 80240E84 E6020014 */ swc1 $f2, 0x14($s0) /* 990668 80240E88 46200020 */ cvt.s.d $f0, $f0 /* 99066C 80240E8C E600001C */ swc1 $f0, 0x1c($s0) diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240EA8_990688.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240EA8_990688.s index 19e060af41..aa000c8301 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240EA8_990688.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240EA8_990688.s @@ -24,12 +24,12 @@ glabel func_80240EA8_990688 /* 9906D4 80240EF4 44811800 */ mtc1 $at, $f3 /* 9906D8 80240EF8 44801000 */ mtc1 $zero, $f2 /* 9906DC 80240EFC 44820000 */ mtc1 $v0, $f0 -/* 9906E0 80240F00 00000000 */ nop +/* 9906E0 80240F00 00000000 */ nop /* 9906E4 80240F04 46800021 */ cvt.d.w $f0, $f0 /* 9906E8 80240F08 46220000 */ add.d $f0, $f0, $f2 /* 9906EC 80240F0C 3C013FC0 */ lui $at, 0x3fc0 /* 9906F0 80240F10 44811000 */ mtc1 $at, $f2 -/* 9906F4 80240F14 00000000 */ nop +/* 9906F4 80240F14 00000000 */ nop /* 9906F8 80240F18 E6020014 */ swc1 $f2, 0x14($s0) /* 9906FC 80240F1C 46200020 */ cvt.s.d $f0, $f0 /* 990700 80240F20 E600001C */ swc1 $f0, 0x1c($s0) diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s index 4721d37fed..c60d7f4b89 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s @@ -69,46 +69,54 @@ glabel func_80240F3C_99071C /* 990818 80241038 2C62000F */ sltiu $v0, $v1, 0xf /* 99081C 8024103C 10400028 */ beqz $v0, .L802410E0 /* 990820 80241040 00031080 */ sll $v0, $v1, 2 -/* 990824 80241044 3C018024 */ lui $at, %hi(func_80242EF8) +/* 990824 80241044 3C018024 */ lui $at, %hi(jtbl_80242EF8_9926D8) /* 990828 80241048 00220821 */ addu $at, $at, $v0 -/* 99082C 8024104C 8C222EF8 */ lw $v0, %lo(func_80242EF8)($at) +/* 99082C 8024104C 8C222EF8 */ lw $v0, %lo(jtbl_80242EF8_9926D8)($at) /* 990830 80241050 00400008 */ jr $v0 -/* 990834 80241054 00000000 */ nop +/* 990834 80241054 00000000 */ nop +glabel L80241058_990838 /* 990838 80241058 0280202D */ daddu $a0, $s4, $zero /* 99083C 8024105C 0200282D */ daddu $a1, $s0, $zero /* 990840 80241060 0C090385 */ jal func_80240E14_9905F4 /* 990844 80241064 0260302D */ daddu $a2, $s3, $zero +glabel L80241068_990848 /* 990848 80241068 0280202D */ daddu $a0, $s4, $zero /* 99084C 8024106C 0200282D */ daddu $a1, $s0, $zero /* 990850 80241070 0C09008C */ jal func_80240230_98FA10 /* 990854 80241074 0260302D */ daddu $a2, $s3, $zero /* 990858 80241078 08090438 */ j .L802410E0 -/* 99085C 8024107C 00000000 */ nop +/* 99085C 8024107C 00000000 */ nop +glabel L80241080_990860 /* 990860 80241080 0280202D */ daddu $a0, $s4, $zero /* 990864 80241084 0200282D */ daddu $a1, $s0, $zero /* 990868 80241088 0C09015A */ jal isk_13_UnkNpcAIFunc1 /* 99086C 8024108C 0260302D */ daddu $a2, $s3, $zero +glabel L80241090_990870 /* 990870 80241090 0280202D */ daddu $a0, $s4, $zero /* 990874 80241094 0200282D */ daddu $a1, $s0, $zero /* 990878 80241098 0C09018A */ jal func_80240628_98FE08 /* 99087C 8024109C 0260302D */ daddu $a2, $s3, $zero /* 990880 802410A0 08090438 */ j .L802410E0 -/* 990884 802410A4 00000000 */ nop +/* 990884 802410A4 00000000 */ nop +glabel L802410A8_990888 /* 990888 802410A8 0280202D */ daddu $a0, $s4, $zero /* 99088C 802410AC 0200282D */ daddu $a1, $s0, $zero /* 990890 802410B0 0C0903AA */ jal func_80240EA8_990688 /* 990894 802410B4 0260302D */ daddu $a2, $s3, $zero +glabel L802410B8_990898 /* 990898 802410B8 0280202D */ daddu $a0, $s4, $zero /* 99089C 802410BC 0200282D */ daddu $a1, $s0, $zero /* 9908A0 802410C0 0C09022B */ jal func_802408AC_99008C /* 9908A4 802410C4 0260302D */ daddu $a2, $s3, $zero /* 9908A8 802410C8 08090438 */ j .L802410E0 -/* 9908AC 802410CC 00000000 */ nop +/* 9908AC 802410CC 00000000 */ nop +glabel L802410D0_9908B0 /* 9908B0 802410D0 0280202D */ daddu $a0, $s4, $zero /* 9908B4 802410D4 0200282D */ daddu $a1, $s0, $zero /* 9908B8 802410D8 0C0902EB */ jal isk_13_UnkDurationCheck /* 9908BC 802410DC 0260302D */ daddu $a2, $s3, $zero .L802410E0: +glabel L802410E0_9908C0 /* 9908C0 802410E0 8FBF0048 */ lw $ra, 0x48($sp) /* 9908C4 802410E4 8FB50044 */ lw $s5, 0x44($sp) /* 9908C8 802410E8 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_802411F8_9909D8.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_802411F8_9909D8.s index dec6f70f24..4bda3d3212 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_802411F8_9909D8.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_802411F8_9909D8.s @@ -28,10 +28,10 @@ glabel func_802411F8_9909D8 /* 990A34 80241254 44810000 */ mtc1 $at, $f0 /* 990A38 80241258 C6860038 */ lwc1 $f6, 0x38($s4) /* 990A3C 8024125C 44821000 */ mtc1 $v0, $f2 -/* 990A40 80241260 00000000 */ nop +/* 990A40 80241260 00000000 */ nop /* 990A44 80241264 468010A0 */ cvt.s.w $f2, $f2 /* 990A48 80241268 46001082 */ mul.s $f2, $f2, $f0 -/* 990A4C 8024126C 00000000 */ nop +/* 990A4C 8024126C 00000000 */ nop /* 990A50 80241270 C688003C */ lwc1 $f8, 0x3c($s4) /* 990A54 80241274 3C014334 */ lui $at, 0x4334 /* 990A58 80241278 44816000 */ mtc1 $at, $f12 @@ -47,10 +47,10 @@ glabel func_802411F8_9909D8 /* 990A80 802412A0 3421999A */ ori $at, $at, 0x999a /* 990A84 802412A4 44812000 */ mtc1 $at, $f4 /* 990A88 802412A8 44821000 */ mtc1 $v0, $f2 -/* 990A8C 802412AC 00000000 */ nop +/* 990A8C 802412AC 00000000 */ nop /* 990A90 802412B0 468010A0 */ cvt.s.w $f2, $f2 /* 990A94 802412B4 46041082 */ mul.s $f2, $f2, $f4 -/* 990A98 802412B8 00000000 */ nop +/* 990A98 802412B8 00000000 */ nop /* 990A9C 802412BC 27A40018 */ addiu $a0, $sp, 0x18 /* 990AA0 802412C0 44070000 */ mfc1 $a3, $f0 /* 990AA4 802412C4 44061000 */ mfc1 $a2, $f2 @@ -97,22 +97,22 @@ glabel func_802411F8_9909D8 /* 990B3C 8024135C 8E060040 */ lw $a2, 0x40($s0) /* 990B40 80241360 44071000 */ mfc1 $a3, $f2 /* 990B44 80241364 0C00A7CB */ jal dist3D -/* 990B48 80241368 00000000 */ nop +/* 990B48 80241368 00000000 */ nop /* 990B4C 8024136C 46000021 */ cvt.d.s $f0, $f0 /* 990B50 80241370 4620C03E */ c.le.d $f24, $f0 -/* 990B54 80241374 00000000 */ nop +/* 990B54 80241374 00000000 */ nop /* 990B58 80241378 45000047 */ bc1f .L80241498 -/* 990B5C 8024137C 00000000 */ nop +/* 990B5C 8024137C 00000000 */ nop /* 990B60 80241380 C60C0038 */ lwc1 $f12, 0x38($s0) /* 990B64 80241384 C7A40018 */ lwc1 $f4, 0x18($sp) /* 990B68 80241388 46046301 */ sub.s $f12, $f12, $f4 /* 990B6C 8024138C 46166302 */ mul.s $f12, $f12, $f22 -/* 990B70 80241390 00000000 */ nop +/* 990B70 80241390 00000000 */ nop /* 990B74 80241394 C6000040 */ lwc1 $f0, 0x40($s0) /* 990B78 80241398 C7A2001C */ lwc1 $f2, 0x1c($sp) /* 990B7C 8024139C 46020001 */ sub.s $f0, $f0, $f2 /* 990B80 802413A0 46160002 */ mul.s $f0, $f0, $f22 -/* 990B84 802413A4 00000000 */ nop +/* 990B84 802413A4 00000000 */ nop /* 990B88 802413A8 E7B40010 */ swc1 $f20, 0x10($sp) /* 990B8C 802413AC E7A20014 */ swc1 $f2, 0x14($sp) /* 990B90 802413B0 46020000 */ add.s $f0, $f0, $f2 @@ -125,40 +125,40 @@ glabel func_802411F8_9909D8 /* 990BAC 802413CC C7A20018 */ lwc1 $f2, 0x18($sp) /* 990BB0 802413D0 46024201 */ sub.s $f8, $f8, $f2 /* 990BB4 802413D4 46164202 */ mul.s $f8, $f8, $f22 -/* 990BB8 802413D8 00000000 */ nop +/* 990BB8 802413D8 00000000 */ nop /* 990BBC 802413DC C606003C */ lwc1 $f6, 0x3c($s0) /* 990BC0 802413E0 46000021 */ cvt.d.s $f0, $f0 /* 990BC4 802413E4 46143181 */ sub.s $f6, $f6, $f20 /* 990BC8 802413E8 4620C003 */ div.d $f0, $f24, $f0 /* 990BCC 802413EC 46200020 */ cvt.s.d $f0, $f0 /* 990BD0 802413F0 46003182 */ mul.s $f6, $f6, $f0 -/* 990BD4 802413F4 00000000 */ nop +/* 990BD4 802413F4 00000000 */ nop /* 990BD8 802413F8 C6040040 */ lwc1 $f4, 0x40($s0) /* 990BDC 802413FC C7AA001C */ lwc1 $f10, 0x1c($sp) /* 990BE0 80241400 460A2101 */ sub.s $f4, $f4, $f10 /* 990BE4 80241404 46162102 */ mul.s $f4, $f4, $f22 -/* 990BE8 80241408 00000000 */ nop +/* 990BE8 80241408 00000000 */ nop /* 990BEC 8024140C 46004202 */ mul.s $f8, $f8, $f0 -/* 990BF0 80241410 00000000 */ nop +/* 990BF0 80241410 00000000 */ nop /* 990BF4 80241414 46002102 */ mul.s $f4, $f4, $f0 -/* 990BF8 80241418 00000000 */ nop +/* 990BF8 80241418 00000000 */ nop /* 990BFC 8024141C 46024200 */ add.s $f8, $f8, $f2 /* 990C00 80241420 C6020038 */ lwc1 $f2, 0x38($s0) /* 990C04 80241424 46024081 */ sub.s $f2, $f8, $f2 /* 990C08 80241428 461C1082 */ mul.s $f2, $f2, $f28 -/* 990C0C 8024142C 00000000 */ nop +/* 990C0C 8024142C 00000000 */ nop /* 990C10 80241430 4606A500 */ add.s $f20, $f20, $f6 /* 990C14 80241434 E622FFFC */ swc1 $f2, -4($s1) /* 990C18 80241438 C602003C */ lwc1 $f2, 0x3c($s0) /* 990C1C 8024143C 4602A081 */ sub.s $f2, $f20, $f2 /* 990C20 80241440 461C1082 */ mul.s $f2, $f2, $f28 -/* 990C24 80241444 00000000 */ nop +/* 990C24 80241444 00000000 */ nop /* 990C28 80241448 460A2100 */ add.s $f4, $f4, $f10 /* 990C2C 8024144C E6220000 */ swc1 $f2, ($s1) /* 990C30 80241450 C6000040 */ lwc1 $f0, 0x40($s0) /* 990C34 80241454 46002001 */ sub.s $f0, $f4, $f0 /* 990C38 80241458 461C0002 */ mul.s $f0, $f0, $f28 -/* 990C3C 8024145C 00000000 */ nop +/* 990C3C 8024145C 00000000 */ nop /* 990C40 80241460 3C014120 */ lui $at, 0x4120 /* 990C44 80241464 44818000 */ mtc1 $at, $f16 /* 990C48 80241468 E6200004 */ swc1 $f0, 4($s1) @@ -168,7 +168,7 @@ glabel func_802411F8_9909D8 /* 990C58 80241478 C6200000 */ lwc1 $f0, ($s1) /* 990C5C 8024147C E7A80018 */ swc1 $f8, 0x18($sp) /* 990C60 80241480 4600803C */ c.lt.s $f16, $f0 -/* 990C64 80241484 00000000 */ nop +/* 990C64 80241484 00000000 */ nop /* 990C68 80241488 45000016 */ bc1f .L802414E4 /* 990C6C 8024148C E7A4001C */ swc1 $f4, 0x1c($sp) /* 990C70 80241490 08090539 */ j .L802414E4 @@ -178,12 +178,12 @@ glabel func_802411F8_9909D8 /* 990C7C 8024149C 3C013F66 */ lui $at, 0x3f66 /* 990C80 802414A0 34216666 */ ori $at, $at, 0x6666 /* 990C84 802414A4 44818000 */ mtc1 $at, $f16 -/* 990C88 802414A8 00000000 */ nop +/* 990C88 802414A8 00000000 */ nop /* 990C8C 802414AC 46101082 */ mul.s $f2, $f2, $f16 -/* 990C90 802414B0 00000000 */ nop +/* 990C90 802414B0 00000000 */ nop /* 990C94 802414B4 C6200004 */ lwc1 $f0, 4($s1) /* 990C98 802414B8 46100002 */ mul.s $f0, $f0, $f16 -/* 990C9C 802414BC 00000000 */ nop +/* 990C9C 802414BC 00000000 */ nop /* 990CA0 802414C0 E622FFFC */ swc1 $f2, -4($s1) /* 990CA4 802414C4 E6200004 */ swc1 $f0, 4($s1) /* 990CA8 802414C8 C6000038 */ lwc1 $f0, 0x38($s0) @@ -197,10 +197,10 @@ glabel func_802411F8_9909D8 /* 990CC4 802414E4 C6220000 */ lwc1 $f2, ($s1) /* 990CC8 802414E8 3C013F80 */ lui $at, 0x3f80 /* 990CCC 802414EC 44810000 */ mtc1 $at, $f0 -/* 990CD0 802414F0 00000000 */ nop +/* 990CD0 802414F0 00000000 */ nop /* 990CD4 802414F4 46001081 */ sub.s $f2, $f2, $f0 /* 990CD8 802414F8 461E103C */ c.lt.s $f2, $f30 -/* 990CDC 802414FC 00000000 */ nop +/* 990CDC 802414FC 00000000 */ nop /* 990CE0 80241500 45000002 */ bc1f .L8024150C /* 990CE4 80241504 E6220000 */ swc1 $f2, ($s1) /* 990CE8 80241508 E63E0000 */ swc1 $f30, ($s1) @@ -209,7 +209,7 @@ glabel func_802411F8_9909D8 /* 990CF0 80241510 C6200000 */ lwc1 $f0, ($s1) /* 990CF4 80241514 46001080 */ add.s $f2, $f2, $f0 /* 990CF8 80241518 461A103E */ c.le.s $f2, $f26 -/* 990CFC 8024151C 00000000 */ nop +/* 990CFC 8024151C 00000000 */ nop /* 990D00 80241520 4500000C */ bc1f .L80241554 /* 990D04 80241524 E602003C */ swc1 $f2, 0x3c($s0) /* 990D08 80241528 E61A003C */ swc1 $f26, 0x3c($s0) @@ -220,7 +220,7 @@ glabel func_802411F8_9909D8 /* 990D1C 8024153C 46000007 */ neg.s $f0, $f0 /* 990D20 80241540 46000021 */ cvt.d.s $f0, $f0 /* 990D24 80241544 46220002 */ mul.d $f0, $f0, $f2 -/* 990D28 80241548 00000000 */ nop +/* 990D28 80241548 00000000 */ nop /* 990D2C 8024154C 46200020 */ cvt.s.d $f0, $f0 /* 990D30 80241550 E6200000 */ swc1 $f0, ($s1) .L80241554: diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241BA8_991388.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241BA8_991388.s index 6535796bad..07f02dbca7 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241BA8_991388.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241BA8_991388.s @@ -34,13 +34,13 @@ glabel func_80241BA8_991388 /* 9913FC 80241C1C D4202F38 */ ldc1 $f0, %lo(D_80242F38)($at) /* 991400 80241C20 460010A1 */ cvt.d.s $f2, $f2 /* 991404 80241C24 46201082 */ mul.d $f2, $f2, $f0 -/* 991408 80241C28 00000000 */ nop +/* 991408 80241C28 00000000 */ nop /* 99140C 80241C2C 3C013FE0 */ lui $at, 0x3fe0 /* 991410 80241C30 44810800 */ mtc1 $at, $f1 /* 991414 80241C34 44800000 */ mtc1 $zero, $f0 -/* 991418 80241C38 00000000 */ nop +/* 991418 80241C38 00000000 */ nop /* 99141C 80241C3C 46201082 */ mul.d $f2, $f2, $f0 -/* 991420 80241C40 00000000 */ nop +/* 991420 80241C40 00000000 */ nop /* 991424 80241C44 3C014270 */ lui $at, 0x4270 /* 991428 80241C48 44813000 */ mtc1 $at, $f6 /* 99142C 80241C4C C6200038 */ lwc1 $f0, 0x38($s1) diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241D08_9914E8.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241D08_9914E8.s index 26d6c89a2d..06b0fcb8bf 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241D08_9914E8.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241D08_9914E8.s @@ -9,7 +9,7 @@ glabel func_80241D08_9914E8 /* 9914F8 80241D18 34A50F8A */ ori $a1, $a1, 0xf8a /* 9914FC 80241D1C 8C440008 */ lw $a0, 8($v0) /* 991500 80241D20 0C048D70 */ jal func_801235C0 -/* 991504 80241D24 00000000 */ nop +/* 991504 80241D24 00000000 */ nop /* 991508 80241D28 8FBF0010 */ lw $ra, 0x10($sp) /* 99150C 80241D2C 24020002 */ addiu $v0, $zero, 2 /* 991510 80241D30 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241D38_991518.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241D38_991518.s index 5829ffa6ac..2f7d392c60 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241D38_991518.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241D38_991518.s @@ -36,23 +36,23 @@ glabel func_80241D38_991518 /* 991594 80241DB4 D4222F40 */ ldc1 $f2, %lo(D_80242F40)($at) /* 991598 80241DB8 46000021 */ cvt.d.s $f0, $f0 /* 99159C 80241DBC 46220002 */ mul.d $f0, $f0, $f2 -/* 9915A0 80241DC0 00000000 */ nop +/* 9915A0 80241DC0 00000000 */ nop /* 9915A4 80241DC4 3C013FE0 */ lui $at, 0x3fe0 /* 9915A8 80241DC8 44811800 */ mtc1 $at, $f3 /* 9915AC 80241DCC 44801000 */ mtc1 $zero, $f2 -/* 9915B0 80241DD0 00000000 */ nop +/* 9915B0 80241DD0 00000000 */ nop /* 9915B4 80241DD4 46220002 */ mul.d $f0, $f0, $f2 -/* 9915B8 80241DD8 00000000 */ nop +/* 9915B8 80241DD8 00000000 */ nop /* 9915BC 80241DDC 44931000 */ mtc1 $s3, $f2 -/* 9915C0 80241DE0 00000000 */ nop +/* 9915C0 80241DE0 00000000 */ nop /* 9915C4 80241DE4 468010A0 */ cvt.s.w $f2, $f2 /* 9915C8 80241DE8 E4620014 */ swc1 $f2, 0x14($v1) /* 9915CC 80241DEC 44921000 */ mtc1 $s2, $f2 -/* 9915D0 80241DF0 00000000 */ nop +/* 9915D0 80241DF0 00000000 */ nop /* 9915D4 80241DF4 468010A1 */ cvt.d.w $f2, $f2 /* 9915D8 80241DF8 46201080 */ add.d $f2, $f2, $f0 /* 9915DC 80241DFC 44900000 */ mtc1 $s0, $f0 -/* 9915E0 80241E00 00000000 */ nop +/* 9915E0 80241E00 00000000 */ nop /* 9915E4 80241E04 46800020 */ cvt.s.w $f0, $f0 /* 9915E8 80241E08 E460001C */ swc1 $f0, 0x1c($v1) /* 9915EC 80241E0C 462010A0 */ cvt.s.d $f2, $f2 diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241E34_991614.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241E34_991614.s index 44d4fe72e3..95a86e70b4 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241E34_991614.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241E34_991614.s @@ -32,15 +32,15 @@ glabel func_80241E34_991614 /* 991680 80241EA0 34A50F8A */ ori $a1, $a1, 0xf8a /* 991684 80241EA4 0040182D */ daddu $v1, $v0, $zero /* 991688 80241EA8 44930000 */ mtc1 $s3, $f0 -/* 99168C 80241EAC 00000000 */ nop +/* 99168C 80241EAC 00000000 */ nop /* 991690 80241EB0 46800020 */ cvt.s.w $f0, $f0 /* 991694 80241EB4 E4600020 */ swc1 $f0, 0x20($v1) /* 991698 80241EB8 44920000 */ mtc1 $s2, $f0 -/* 99169C 80241EBC 00000000 */ nop +/* 99169C 80241EBC 00000000 */ nop /* 9916A0 80241EC0 46800020 */ cvt.s.w $f0, $f0 /* 9916A4 80241EC4 E4600024 */ swc1 $f0, 0x24($v1) /* 9916A8 80241EC8 44900000 */ mtc1 $s0, $f0 -/* 9916AC 80241ECC 00000000 */ nop +/* 9916AC 80241ECC 00000000 */ nop /* 9916B0 80241ED0 46800020 */ cvt.s.w $f0, $f0 /* 9916B4 80241ED4 E4600028 */ swc1 $f0, 0x28($v1) /* 9916B8 80241ED8 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241EF8_9916D8.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241EF8_9916D8.s index bfe50941e0..a4e4bd973a 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241EF8_9916D8.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241EF8_9916D8.s @@ -35,47 +35,47 @@ glabel func_80241EF8_9916D8 /* 991750 80241F70 0C0B210B */ jal get_float_variable /* 991754 80241F74 0220202D */ daddu $a0, $s1, $zero /* 991758 80241F78 44801000 */ mtc1 $zero, $f2 -/* 99175C 80241F7C 00000000 */ nop +/* 99175C 80241F7C 00000000 */ nop /* 991760 80241F80 4602C03C */ c.lt.s $f24, $f2 -/* 991764 80241F84 00000000 */ nop +/* 991764 80241F84 00000000 */ nop /* 991768 80241F88 45030001 */ bc1tl .L80241F90 /* 99176C 80241F8C 46001606 */ mov.s $f24, $f2 .L80241F90: /* 991770 80241F90 4602B03C */ c.lt.s $f22, $f2 -/* 991774 80241F94 00000000 */ nop +/* 991774 80241F94 00000000 */ nop /* 991778 80241F98 45030001 */ bc1tl .L80241FA0 /* 99177C 80241F9C 46001586 */ mov.s $f22, $f2 .L80241FA0: /* 991780 80241FA0 4602A03C */ c.lt.s $f20, $f2 -/* 991784 80241FA4 00000000 */ nop +/* 991784 80241FA4 00000000 */ nop /* 991788 80241FA8 45030001 */ bc1tl .L80241FB0 /* 99178C 80241FAC 46001506 */ mov.s $f20, $f2 .L80241FB0: /* 991790 80241FB0 4602003C */ c.lt.s $f0, $f2 -/* 991794 80241FB4 00000000 */ nop +/* 991794 80241FB4 00000000 */ nop /* 991798 80241FB8 45030001 */ bc1tl .L80241FC0 /* 99179C 80241FBC 46001006 */ mov.s $f0, $f2 .L80241FC0: /* 9917A0 80241FC0 3C01437F */ lui $at, 0x437f /* 9917A4 80241FC4 44811000 */ mtc1 $at, $f2 -/* 9917A8 80241FC8 00000000 */ nop +/* 9917A8 80241FC8 00000000 */ nop /* 9917AC 80241FCC 4618103C */ c.lt.s $f2, $f24 -/* 9917B0 80241FD0 00000000 */ nop +/* 9917B0 80241FD0 00000000 */ nop /* 9917B4 80241FD4 45030001 */ bc1tl .L80241FDC /* 9917B8 80241FD8 46001606 */ mov.s $f24, $f2 .L80241FDC: /* 9917BC 80241FDC 4616103C */ c.lt.s $f2, $f22 -/* 9917C0 80241FE0 00000000 */ nop +/* 9917C0 80241FE0 00000000 */ nop /* 9917C4 80241FE4 45030001 */ bc1tl .L80241FEC /* 9917C8 80241FE8 46001586 */ mov.s $f22, $f2 .L80241FEC: /* 9917CC 80241FEC 4614103C */ c.lt.s $f2, $f20 -/* 9917D0 80241FF0 00000000 */ nop +/* 9917D0 80241FF0 00000000 */ nop /* 9917D4 80241FF4 45030001 */ bc1tl .L80241FFC /* 9917D8 80241FF8 46001506 */ mov.s $f20, $f2 .L80241FFC: /* 9917DC 80241FFC 4600103C */ c.lt.s $f2, $f0 -/* 9917E0 80242000 00000000 */ nop +/* 9917E0 80242000 00000000 */ nop /* 9917E4 80242004 45030001 */ bc1tl .L8024200C /* 9917E8 80242008 46001006 */ mov.s $f0, $f2 .L8024200C: diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240000_992730.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240000_992730.s index 6112482c75..779a8cdfd6 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240000_992730.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240000_992730.s @@ -30,7 +30,7 @@ glabel func_80240000_992730 /* 992794 80240064 3C05B000 */ lui $a1, 0xb000 /* 992798 80240068 34A50017 */ ori $a1, $a1, 0x17 /* 99279C 8024006C 44820000 */ mtc1 $v0, $f0 -/* 9927A0 80240070 00000000 */ nop +/* 9927A0 80240070 00000000 */ nop /* 9927A4 80240074 46800021 */ cvt.d.w $f0, $f0 /* 9927A8 80240078 3C014024 */ lui $at, 0x4024 /* 9927AC 8024007C 44811800 */ mtc1 $at, $f3 @@ -68,7 +68,7 @@ glabel func_80240000_992730 /* 99282C 802400FC 0C0123F5 */ jal is_point_within_region /* 992830 80240100 8E070038 */ lw $a3, 0x38($s0) /* 992834 80240104 10400035 */ beqz $v0, .L802401DC -/* 992838 80240108 00000000 */ nop +/* 992838 80240108 00000000 */ nop /* 99283C 8024010C C60C0038 */ lwc1 $f12, 0x38($s0) /* 992840 80240110 3C0141C8 */ lui $at, 0x41c8 /* 992844 80240114 4481B000 */ mtc1 $at, $f22 @@ -99,13 +99,13 @@ glabel func_80240000_992730 /* 9928A4 80240174 860200A8 */ lh $v0, 0xa8($s0) /* 9928A8 80240178 27A50020 */ addiu $a1, $sp, 0x20 /* 9928AC 8024017C 44820000 */ mtc1 $v0, $f0 -/* 9928B0 80240180 00000000 */ nop +/* 9928B0 80240180 00000000 */ nop /* 9928B4 80240184 46800020 */ cvt.s.w $f0, $f0 /* 9928B8 80240188 E7A00018 */ swc1 $f0, 0x18($sp) /* 9928BC 8024018C 860200A6 */ lh $v0, 0xa6($s0) /* 9928C0 80240190 27A60024 */ addiu $a2, $sp, 0x24 /* 9928C4 80240194 44820000 */ mtc1 $v0, $f0 -/* 9928C8 80240198 00000000 */ nop +/* 9928C8 80240198 00000000 */ nop /* 9928CC 8024019C 46800020 */ cvt.s.w $f0, $f0 /* 9928D0 802401A0 E7A0001C */ swc1 $f0, 0x1c($sp) /* 9928D4 802401A4 8E040080 */ lw $a0, 0x80($s0) @@ -121,13 +121,13 @@ glabel func_80240000_992730 /* 9928FC 802401CC 1440FFE6 */ bnez $v0, .L80240168 /* 992900 802401D0 E600000C */ swc1 $f0, 0xc($s0) /* 992904 802401D4 08090083 */ j .L8024020C -/* 992908 802401D8 00000000 */ nop +/* 992908 802401D8 00000000 */ nop .L802401DC: /* 99290C 802401DC 0C00A67F */ jal rand_int /* 992910 802401E0 2404003C */ addiu $a0, $zero, 0x3c /* 992914 802401E4 C60C000C */ lwc1 $f12, 0xc($s0) /* 992918 802401E8 44820000 */ mtc1 $v0, $f0 -/* 99291C 802401EC 00000000 */ nop +/* 99291C 802401EC 00000000 */ nop /* 992920 802401F0 46800020 */ cvt.s.w $f0, $f0 /* 992924 802401F4 46006300 */ add.s $f12, $f12, $f0 /* 992928 802401F8 3C0141F0 */ lui $at, 0x41f0 diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240230_992960.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240230_992960.s index 8da381eb07..0406d01862 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240230_992960.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240230_992960.s @@ -43,7 +43,7 @@ glabel func_80240230_992960 /* 9929F8 802402C8 2402000F */ addiu $v0, $zero, 0xf /* 9929FC 802402CC AFA2001C */ sw $v0, 0x1c($sp) /* 992A00 802402D0 44835000 */ mtc1 $v1, $f10 -/* 992A04 802402D4 00000000 */ nop +/* 992A04 802402D4 00000000 */ nop /* 992A08 802402D8 468052A0 */ cvt.s.w $f10, $f10 /* 992A0C 802402DC 44075000 */ mfc1 $a3, $f10 /* 992A10 802402E0 27A20028 */ addiu $v0, $sp, 0x28 @@ -78,7 +78,7 @@ glabel func_80240230_992960 /* 992A78 80240348 44801800 */ mtc1 $zero, $f3 /* 992A7C 8024034C 46000021 */ cvt.d.s $f0, $f0 /* 992A80 80240350 4620103C */ c.lt.d $f2, $f0 -/* 992A84 80240354 00000000 */ nop +/* 992A84 80240354 00000000 */ nop /* 992A88 80240358 45000025 */ bc1f .L802403F0 /* 992A8C 8024035C 27A5002C */ addiu $a1, $sp, 0x2c /* 992A90 80240360 C6000038 */ lwc1 $f0, 0x38($s0) @@ -88,7 +88,7 @@ glabel func_80240230_992960 /* 992AA0 80240370 27A60030 */ addiu $a2, $sp, 0x30 /* 992AA4 80240374 E7A0002C */ swc1 $f0, 0x2c($sp) /* 992AA8 80240378 44820000 */ mtc1 $v0, $f0 -/* 992AAC 8024037C 00000000 */ nop +/* 992AAC 8024037C 00000000 */ nop /* 992AB0 80240380 46800020 */ cvt.s.w $f0, $f0 /* 992AB4 80240384 46000021 */ cvt.d.s $f0, $f0 /* 992AB8 80240388 C604003C */ lwc1 $f4, 0x3c($s0) @@ -96,13 +96,13 @@ glabel func_80240230_992960 /* 992AC0 80240390 C6080018 */ lwc1 $f8, 0x18($s0) /* 992AC4 80240394 860200A8 */ lh $v0, 0xa8($s0) /* 992AC8 80240398 46220002 */ mul.d $f0, $f0, $f2 -/* 992ACC 8024039C 00000000 */ nop +/* 992ACC 8024039C 00000000 */ nop /* 992AD0 802403A0 E7A40030 */ swc1 $f4, 0x30($sp) /* 992AD4 802403A4 E7A60034 */ swc1 $f6, 0x34($sp) /* 992AD8 802403A8 E7A80010 */ swc1 $f8, 0x10($sp) /* 992ADC 802403AC C604000C */ lwc1 $f4, 0xc($s0) /* 992AE0 802403B0 44821000 */ mtc1 $v0, $f2 -/* 992AE4 802403B4 00000000 */ nop +/* 992AE4 802403B4 00000000 */ nop /* 992AE8 802403B8 468010A0 */ cvt.s.w $f2, $f2 /* 992AEC 802403BC E7A20018 */ swc1 $f2, 0x18($sp) /* 992AF0 802403C0 E7A40014 */ swc1 $f4, 0x14($sp) @@ -123,7 +123,7 @@ glabel func_80240230_992960 /* 992B28 802403F8 44801800 */ mtc1 $zero, $f3 /* 992B2C 802403FC 46000021 */ cvt.d.s $f0, $f0 /* 992B30 80240400 4622003C */ c.lt.d $f0, $f2 -/* 992B34 80240404 00000000 */ nop +/* 992B34 80240404 00000000 */ nop /* 992B38 80240408 45000047 */ bc1f .L80240528 /* 992B3C 8024040C 27A5002C */ addiu $a1, $sp, 0x2c /* 992B40 80240410 27A60030 */ addiu $a2, $sp, 0x30 @@ -154,7 +154,7 @@ glabel func_80240230_992960 /* 992BA4 80240474 0C0372DF */ jal func_800DCB7C /* 992BA8 80240478 27A70034 */ addiu $a3, $sp, 0x34 /* 992BAC 8024047C 1040002A */ beqz $v0, .L80240528 -/* 992BB0 80240480 00000000 */ nop +/* 992BB0 80240480 00000000 */ nop /* 992BB4 80240484 C600001C */ lwc1 $f0, 0x1c($s0) /* 992BB8 80240488 C7A20038 */ lwc1 $f2, 0x38($sp) /* 992BBC 8024048C 46000005 */ abs.s $f0, $f0 @@ -162,7 +162,7 @@ glabel func_80240230_992960 /* 992BC4 80240494 46340000 */ add.d $f0, $f0, $f20 /* 992BC8 80240498 460010A1 */ cvt.d.s $f2, $f2 /* 992BCC 8024049C 4620103E */ c.le.d $f2, $f0 -/* 992BD0 802404A0 00000000 */ nop +/* 992BD0 802404A0 00000000 */ nop /* 992BD4 802404A4 45000020 */ bc1f .L80240528 /* 992BD8 802404A8 240403E8 */ addiu $a0, $zero, 0x3e8 /* 992BDC 802404AC C7A00030 */ lwc1 $f0, 0x30($sp) @@ -193,7 +193,7 @@ glabel func_80240230_992960 /* 992C40 80240510 5840000C */ blezl $v0, .L80240544 /* 992C44 80240514 AE600070 */ sw $zero, 0x70($s3) /* 992C48 80240518 1460000A */ bnez $v1, .L80240544 -/* 992C4C 8024051C 00000000 */ nop +/* 992C4C 8024051C 00000000 */ nop /* 992C50 80240520 08090151 */ j .L80240544 /* 992C54 80240524 AE600070 */ sw $zero, 0x70($s3) .L80240528: diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240628_992D58.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240628_992D58.s index 803359363d..a10e073c8f 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240628_992D58.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240628_992D58.s @@ -38,7 +38,7 @@ glabel func_80240628_992D58 /* 992DDC 802406AC 2402000F */ addiu $v0, $zero, 0xf /* 992DE0 802406B0 AFA2001C */ sw $v0, 0x1c($sp) /* 992DE4 802406B4 44833000 */ mtc1 $v1, $f6 -/* 992DE8 802406B8 00000000 */ nop +/* 992DE8 802406B8 00000000 */ nop /* 992DEC 802406BC 468031A0 */ cvt.s.w $f6, $f6 /* 992DF0 802406C0 44073000 */ mfc1 $a3, $f6 /* 992DF4 802406C4 27A20028 */ addiu $v0, $sp, 0x28 @@ -65,13 +65,13 @@ glabel func_80240628_992D58 .L80240718: /* 992E48 80240718 8602008C */ lh $v0, 0x8c($s0) /* 992E4C 8024071C 14400023 */ bnez $v0, .L802407AC -/* 992E50 80240720 00000000 */ nop +/* 992E50 80240720 00000000 */ nop /* 992E54 80240724 9602008E */ lhu $v0, 0x8e($s0) /* 992E58 80240728 2442FFFF */ addiu $v0, $v0, -1 /* 992E5C 8024072C A602008E */ sh $v0, 0x8e($s0) /* 992E60 80240730 00021400 */ sll $v0, $v0, 0x10 /* 992E64 80240734 1C40001D */ bgtz $v0, .L802407AC -/* 992E68 80240738 00000000 */ nop +/* 992E68 80240738 00000000 */ nop /* 992E6C 8024073C 8E820074 */ lw $v0, 0x74($s4) /* 992E70 80240740 2442FFFF */ addiu $v0, $v0, -1 /* 992E74 80240744 18400018 */ blez $v0, .L802407A8 diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_802407CC_992EFC.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_802407CC_992EFC.s index 71bd9806f7..e7142c16ab 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_802407CC_992EFC.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_802407CC_992EFC.s @@ -24,7 +24,7 @@ glabel func_802407CC_992EFC /* 992F48 80240818 0C00A67F */ jal rand_int /* 992F4C 8024081C AE020000 */ sw $v0, ($s0) /* 992F50 80240820 44820000 */ mtc1 $v0, $f0 -/* 992F54 80240824 00000000 */ nop +/* 992F54 80240824 00000000 */ nop /* 992F58 80240828 46800021 */ cvt.d.w $f0, $f0 /* 992F5C 8024082C 3C014024 */ lui $at, 0x4024 /* 992F60 80240830 44811800 */ mtc1 $at, $f3 diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_802408AC_992FDC.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_802408AC_992FDC.s index 60688c0364..7453425edf 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_802408AC_992FDC.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_802408AC_992FDC.s @@ -25,7 +25,7 @@ glabel func_802408AC_992FDC /* 99302C 802408FC 44801800 */ mtc1 $zero, $f3 /* 993030 80240900 46000021 */ cvt.d.s $f0, $f0 /* 993034 80240904 4620103C */ c.lt.d $f2, $f0 -/* 993038 80240908 00000000 */ nop +/* 993038 80240908 00000000 */ nop /* 99303C 8024090C 45000021 */ bc1f .L80240994 /* 993040 80240910 27A50028 */ addiu $a1, $sp, 0x28 /* 993044 80240914 C6600038 */ lwc1 $f0, 0x38($s3) @@ -40,20 +40,20 @@ glabel func_802408AC_992FDC /* 993068 80240938 E7A00014 */ swc1 $f0, 0x14($sp) /* 99306C 8024093C 866200A8 */ lh $v0, 0xa8($s3) /* 993070 80240940 44820000 */ mtc1 $v0, $f0 -/* 993074 80240944 00000000 */ nop +/* 993074 80240944 00000000 */ nop /* 993078 80240948 46800020 */ cvt.s.w $f0, $f0 /* 99307C 8024094C E7A00018 */ swc1 $f0, 0x18($sp) /* 993080 80240950 866200A6 */ lh $v0, 0xa6($s3) /* 993084 80240954 27A6002C */ addiu $a2, $sp, 0x2c /* 993088 80240958 44820000 */ mtc1 $v0, $f0 -/* 99308C 8024095C 00000000 */ nop +/* 99308C 8024095C 00000000 */ nop /* 993090 80240960 46800020 */ cvt.s.w $f0, $f0 /* 993094 80240964 E7A0001C */ swc1 $f0, 0x1c($sp) /* 993098 80240968 8E640080 */ lw $a0, 0x80($s3) /* 99309C 8024096C 0C037711 */ jal func_800DDC44 /* 9930A0 80240970 27A70030 */ addiu $a3, $sp, 0x30 /* 9930A4 80240974 10400003 */ beqz $v0, .L80240984 -/* 9930A8 80240978 00000000 */ nop +/* 9930A8 80240978 00000000 */ nop /* 9930AC 8024097C 08090265 */ j .L80240994 /* 9930B0 80240980 AE600018 */ sw $zero, 0x18($s3) .L80240984: @@ -67,7 +67,7 @@ glabel func_802408AC_992FDC /* 9930CC 8024099C 44801800 */ mtc1 $zero, $f3 /* 9930D0 802409A0 46000021 */ cvt.d.s $f0, $f0 /* 9930D4 802409A4 4622003C */ c.lt.d $f0, $f2 -/* 9930D8 802409A8 00000000 */ nop +/* 9930D8 802409A8 00000000 */ nop /* 9930DC 802409AC 4500006C */ bc1f .L80240B60 /* 9930E0 802409B0 27B00028 */ addiu $s0, $sp, 0x28 /* 9930E4 802409B4 0200282D */ daddu $a1, $s0, $zero @@ -116,7 +116,7 @@ glabel func_802408AC_992FDC /* 993190 80240A60 0C0372DF */ jal func_800DCB7C /* 993194 80240A64 0220382D */ daddu $a3, $s1, $zero /* 993198 80240A68 1040003D */ beqz $v0, .L80240B60 -/* 99319C 80240A6C 00000000 */ nop +/* 99319C 80240A6C 00000000 */ nop /* 9931A0 80240A70 C660001C */ lwc1 $f0, 0x1c($s3) /* 9931A4 80240A74 C7A20038 */ lwc1 $f2, 0x38($sp) /* 9931A8 80240A78 46000005 */ abs.s $f0, $f0 @@ -124,7 +124,7 @@ glabel func_802408AC_992FDC /* 9931B0 80240A80 46340000 */ add.d $f0, $f0, $f20 /* 9931B4 80240A84 460010A1 */ cvt.d.s $f2, $f2 /* 9931B8 80240A88 4620103E */ c.le.d $f2, $f0 -/* 9931BC 80240A8C 00000000 */ nop +/* 9931BC 80240A8C 00000000 */ nop /* 9931C0 80240A90 45000033 */ bc1f .L80240B60 /* 9931C4 80240A94 2403F7FF */ addiu $v1, $zero, -0x801 /* 9931C8 80240A98 C7A0002C */ lwc1 $f0, 0x2c($sp) @@ -163,7 +163,7 @@ glabel func_802408AC_992FDC /* 99324C 80240B1C 2402000F */ addiu $v0, $zero, 0xf /* 993250 80240B20 AFA2001C */ sw $v0, 0x1c($sp) /* 993254 80240B24 44834000 */ mtc1 $v1, $f8 -/* 993258 80240B28 00000000 */ nop +/* 993258 80240B28 00000000 */ nop /* 99325C 80240B2C 46804220 */ cvt.s.w $f8, $f8 /* 993260 80240B30 44074000 */ mfc1 $a3, $f8 /* 993264 80240B34 27A2003C */ addiu $v0, $sp, 0x3c diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s index 39e6ea9bac..8bfd79267f 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s @@ -76,7 +76,7 @@ glabel func_80240BF0_993320 /* 993438 80240D08 8E4300B0 */ lw $v1, 0xb0($s2) /* 99343C 80240D0C 30620004 */ andi $v0, $v1, 4 /* 993440 80240D10 10400007 */ beqz $v0, .L80240D30 -/* 993444 80240D14 00000000 */ nop +/* 993444 80240D14 00000000 */ nop /* 993448 80240D18 824200B4 */ lb $v0, 0xb4($s2) /* 99344C 80240D1C 14400034 */ bnez $v0, .L80240DF0 /* 993450 80240D20 0000102D */ daddu $v0, $zero, $zero @@ -88,21 +88,24 @@ glabel func_80240BF0_993320 /* 993464 80240D34 2C62000F */ sltiu $v0, $v1, 0xf /* 993468 80240D38 1040002C */ beqz $v0, .L80240DEC /* 99346C 80240D3C 00031080 */ sll $v0, $v1, 2 -/* 993470 80240D40 3C018024 */ lui $at, %hi(D_80242A38) +/* 993470 80240D40 3C018024 */ lui $at, %hi(jtbl_80242A38_995168) /* 993474 80240D44 00220821 */ addu $at, $at, $v0 -/* 993478 80240D48 8C222A38 */ lw $v0, %lo(D_80242A38)($at) +/* 993478 80240D48 8C222A38 */ lw $v0, %lo(jtbl_80242A38_995168)($at) /* 99347C 80240D4C 00400008 */ jr $v0 -/* 993480 80240D50 00000000 */ nop +/* 993480 80240D50 00000000 */ nop +glabel L80240D54_993484 /* 993484 80240D54 0260202D */ daddu $a0, $s3, $zero /* 993488 80240D58 0280282D */ daddu $a1, $s4, $zero /* 99348C 80240D5C 0C090000 */ jal func_80240000_992730 /* 993490 80240D60 0200302D */ daddu $a2, $s0, $zero +glabel L80240D64_993494 /* 993494 80240D64 0260202D */ daddu $a0, $s3, $zero /* 993498 80240D68 0280282D */ daddu $a1, $s4, $zero /* 99349C 80240D6C 0C09008C */ jal func_80240230_992960 /* 9934A0 80240D70 0200302D */ daddu $a2, $s0, $zero /* 9934A4 80240D74 0809037C */ j .L80240DF0 /* 9934A8 80240D78 0000102D */ daddu $v0, $zero, $zero +glabel L80240D7C_9934AC /* 9934AC 80240D7C 0260202D */ daddu $a0, $s3, $zero /* 9934B0 80240D80 0280282D */ daddu $a1, $s4, $zero /* 9934B4 80240D84 0C09015A */ jal isk_14_UnkNpcAIFunc1 @@ -111,27 +114,32 @@ glabel func_80240BF0_993320 /* 9934C0 80240D90 24020003 */ addiu $v0, $zero, 3 /* 9934C4 80240D94 14620016 */ bne $v1, $v0, .L80240DF0 /* 9934C8 80240D98 0000102D */ daddu $v0, $zero, $zero +glabel L80240D9C_9934CC /* 9934CC 80240D9C 0260202D */ daddu $a0, $s3, $zero /* 9934D0 80240DA0 0280282D */ daddu $a1, $s4, $zero /* 9934D4 80240DA4 0C09018A */ jal func_80240628_992D58 /* 9934D8 80240DA8 0200302D */ daddu $a2, $s0, $zero /* 9934DC 80240DAC 0809037C */ j .L80240DF0 /* 9934E0 80240DB0 0000102D */ daddu $v0, $zero, $zero +glabel L80240DB4_9934E4 /* 9934E4 80240DB4 0260202D */ daddu $a0, $s3, $zero /* 9934E8 80240DB8 0280282D */ daddu $a1, $s4, $zero /* 9934EC 80240DBC 0C0901F3 */ jal func_802407CC_992EFC /* 9934F0 80240DC0 0200302D */ daddu $a2, $s0, $zero +glabel L80240DC4_9934F4 /* 9934F4 80240DC4 0260202D */ daddu $a0, $s3, $zero /* 9934F8 80240DC8 0280282D */ daddu $a1, $s4, $zero /* 9934FC 80240DCC 0C09022B */ jal func_802408AC_992FDC /* 993500 80240DD0 0200302D */ daddu $a2, $s0, $zero /* 993504 80240DD4 0809037C */ j .L80240DF0 /* 993508 80240DD8 0000102D */ daddu $v0, $zero, $zero +glabel L80240DDC_99350C /* 99350C 80240DDC 0260202D */ daddu $a0, $s3, $zero /* 993510 80240DE0 0280282D */ daddu $a1, $s4, $zero /* 993514 80240DE4 0C0902EB */ jal isk_14_UnkDurationCheck /* 993518 80240DE8 0200302D */ daddu $a2, $s0, $zero .L80240DEC: +glabel L80240DEC_99351C /* 99351C 80240DEC 0000102D */ daddu $v0, $zero, $zero .L80240DF0: /* 993520 80240DF0 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240E14_993544.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240E14_993544.s index 9234d61273..3b9e0f9ebd 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240E14_993544.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240E14_993544.s @@ -24,12 +24,12 @@ glabel func_80240E14_993544 /* 993590 80240E60 44811800 */ mtc1 $at, $f3 /* 993594 80240E64 44801000 */ mtc1 $zero, $f2 /* 993598 80240E68 44820000 */ mtc1 $v0, $f0 -/* 99359C 80240E6C 00000000 */ nop +/* 99359C 80240E6C 00000000 */ nop /* 9935A0 80240E70 46800021 */ cvt.d.w $f0, $f0 /* 9935A4 80240E74 46220000 */ add.d $f0, $f0, $f2 /* 9935A8 80240E78 3C013FC0 */ lui $at, 0x3fc0 /* 9935AC 80240E7C 44811000 */ mtc1 $at, $f2 -/* 9935B0 80240E80 00000000 */ nop +/* 9935B0 80240E80 00000000 */ nop /* 9935B4 80240E84 E6020014 */ swc1 $f2, 0x14($s0) /* 9935B8 80240E88 46200020 */ cvt.s.d $f0, $f0 /* 9935BC 80240E8C E600001C */ swc1 $f0, 0x1c($s0) diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240EA8_9935D8.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240EA8_9935D8.s index c037dad3d4..cbef652096 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240EA8_9935D8.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240EA8_9935D8.s @@ -24,12 +24,12 @@ glabel func_80240EA8_9935D8 /* 993624 80240EF4 44811800 */ mtc1 $at, $f3 /* 993628 80240EF8 44801000 */ mtc1 $zero, $f2 /* 99362C 80240EFC 44820000 */ mtc1 $v0, $f0 -/* 993630 80240F00 00000000 */ nop +/* 993630 80240F00 00000000 */ nop /* 993634 80240F04 46800021 */ cvt.d.w $f0, $f0 /* 993638 80240F08 46220000 */ add.d $f0, $f0, $f2 /* 99363C 80240F0C 3C013FC0 */ lui $at, 0x3fc0 /* 993640 80240F10 44811000 */ mtc1 $at, $f2 -/* 993644 80240F14 00000000 */ nop +/* 993644 80240F14 00000000 */ nop /* 993648 80240F18 E6020014 */ swc1 $f2, 0x14($s0) /* 99364C 80240F1C 46200020 */ cvt.s.d $f0, $f0 /* 993650 80240F20 E600001C */ swc1 $f0, 0x1c($s0) diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s index 82bf0ad38c..f22ad9a43e 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s @@ -69,46 +69,54 @@ glabel func_80240F3C_99366C /* 993768 80241038 2C62000F */ sltiu $v0, $v1, 0xf /* 99376C 8024103C 10400028 */ beqz $v0, .L802410E0 /* 993770 80241040 00031080 */ sll $v0, $v1, 2 -/* 993774 80241044 3C018024 */ lui $at, %hi(D_80242A78) +/* 993774 80241044 3C018024 */ lui $at, %hi(jtbl_80242A78_9951A8) /* 993778 80241048 00220821 */ addu $at, $at, $v0 -/* 99377C 8024104C 8C222A78 */ lw $v0, %lo(D_80242A78)($at) +/* 99377C 8024104C 8C222A78 */ lw $v0, %lo(jtbl_80242A78_9951A8)($at) /* 993780 80241050 00400008 */ jr $v0 -/* 993784 80241054 00000000 */ nop +/* 993784 80241054 00000000 */ nop +glabel L80241058_993788 /* 993788 80241058 0280202D */ daddu $a0, $s4, $zero /* 99378C 8024105C 0200282D */ daddu $a1, $s0, $zero /* 993790 80241060 0C090385 */ jal func_80240E14_993544 /* 993794 80241064 0260302D */ daddu $a2, $s3, $zero +glabel L80241068_993798 /* 993798 80241068 0280202D */ daddu $a0, $s4, $zero /* 99379C 8024106C 0200282D */ daddu $a1, $s0, $zero /* 9937A0 80241070 0C09008C */ jal func_80240230_992960 /* 9937A4 80241074 0260302D */ daddu $a2, $s3, $zero /* 9937A8 80241078 08090438 */ j .L802410E0 -/* 9937AC 8024107C 00000000 */ nop +/* 9937AC 8024107C 00000000 */ nop +glabel L80241080_9937B0 /* 9937B0 80241080 0280202D */ daddu $a0, $s4, $zero /* 9937B4 80241084 0200282D */ daddu $a1, $s0, $zero /* 9937B8 80241088 0C09015A */ jal isk_14_UnkNpcAIFunc1 /* 9937BC 8024108C 0260302D */ daddu $a2, $s3, $zero +glabel L80241090_9937C0 /* 9937C0 80241090 0280202D */ daddu $a0, $s4, $zero /* 9937C4 80241094 0200282D */ daddu $a1, $s0, $zero /* 9937C8 80241098 0C09018A */ jal func_80240628_992D58 /* 9937CC 8024109C 0260302D */ daddu $a2, $s3, $zero /* 9937D0 802410A0 08090438 */ j .L802410E0 -/* 9937D4 802410A4 00000000 */ nop +/* 9937D4 802410A4 00000000 */ nop +glabel L802410A8_9937D8 /* 9937D8 802410A8 0280202D */ daddu $a0, $s4, $zero /* 9937DC 802410AC 0200282D */ daddu $a1, $s0, $zero /* 9937E0 802410B0 0C0903AA */ jal func_80240EA8_9935D8 /* 9937E4 802410B4 0260302D */ daddu $a2, $s3, $zero +glabel L802410B8_9937E8 /* 9937E8 802410B8 0280202D */ daddu $a0, $s4, $zero /* 9937EC 802410BC 0200282D */ daddu $a1, $s0, $zero /* 9937F0 802410C0 0C09022B */ jal func_802408AC_992FDC /* 9937F4 802410C4 0260302D */ daddu $a2, $s3, $zero /* 9937F8 802410C8 08090438 */ j .L802410E0 -/* 9937FC 802410CC 00000000 */ nop +/* 9937FC 802410CC 00000000 */ nop +glabel L802410D0_993800 /* 993800 802410D0 0280202D */ daddu $a0, $s4, $zero /* 993804 802410D4 0200282D */ daddu $a1, $s0, $zero /* 993808 802410D8 0C0902EB */ jal isk_14_UnkDurationCheck /* 99380C 802410DC 0260302D */ daddu $a2, $s3, $zero .L802410E0: +glabel L802410E0_993810 /* 993810 802410E0 8FBF0048 */ lw $ra, 0x48($sp) /* 993814 802410E4 8FB50044 */ lw $s5, 0x44($sp) /* 993818 802410E8 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_802411F8_993928.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_802411F8_993928.s index c13b6206ba..5d07c915a4 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_802411F8_993928.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_802411F8_993928.s @@ -28,10 +28,10 @@ glabel func_802411F8_993928 /* 993984 80241254 44810000 */ mtc1 $at, $f0 /* 993988 80241258 C6860038 */ lwc1 $f6, 0x38($s4) /* 99398C 8024125C 44821000 */ mtc1 $v0, $f2 -/* 993990 80241260 00000000 */ nop +/* 993990 80241260 00000000 */ nop /* 993994 80241264 468010A0 */ cvt.s.w $f2, $f2 /* 993998 80241268 46001082 */ mul.s $f2, $f2, $f0 -/* 99399C 8024126C 00000000 */ nop +/* 99399C 8024126C 00000000 */ nop /* 9939A0 80241270 C688003C */ lwc1 $f8, 0x3c($s4) /* 9939A4 80241274 3C014334 */ lui $at, 0x4334 /* 9939A8 80241278 44816000 */ mtc1 $at, $f12 @@ -47,10 +47,10 @@ glabel func_802411F8_993928 /* 9939D0 802412A0 3421999A */ ori $at, $at, 0x999a /* 9939D4 802412A4 44812000 */ mtc1 $at, $f4 /* 9939D8 802412A8 44821000 */ mtc1 $v0, $f2 -/* 9939DC 802412AC 00000000 */ nop +/* 9939DC 802412AC 00000000 */ nop /* 9939E0 802412B0 468010A0 */ cvt.s.w $f2, $f2 /* 9939E4 802412B4 46041082 */ mul.s $f2, $f2, $f4 -/* 9939E8 802412B8 00000000 */ nop +/* 9939E8 802412B8 00000000 */ nop /* 9939EC 802412BC 27A40018 */ addiu $a0, $sp, 0x18 /* 9939F0 802412C0 44070000 */ mfc1 $a3, $f0 /* 9939F4 802412C4 44061000 */ mfc1 $a2, $f2 @@ -97,22 +97,22 @@ glabel func_802411F8_993928 /* 993A8C 8024135C 8E060040 */ lw $a2, 0x40($s0) /* 993A90 80241360 44071000 */ mfc1 $a3, $f2 /* 993A94 80241364 0C00A7CB */ jal dist3D -/* 993A98 80241368 00000000 */ nop +/* 993A98 80241368 00000000 */ nop /* 993A9C 8024136C 46000021 */ cvt.d.s $f0, $f0 /* 993AA0 80241370 4620C03E */ c.le.d $f24, $f0 -/* 993AA4 80241374 00000000 */ nop +/* 993AA4 80241374 00000000 */ nop /* 993AA8 80241378 45000047 */ bc1f .L80241498 -/* 993AAC 8024137C 00000000 */ nop +/* 993AAC 8024137C 00000000 */ nop /* 993AB0 80241380 C60C0038 */ lwc1 $f12, 0x38($s0) /* 993AB4 80241384 C7A40018 */ lwc1 $f4, 0x18($sp) /* 993AB8 80241388 46046301 */ sub.s $f12, $f12, $f4 /* 993ABC 8024138C 46166302 */ mul.s $f12, $f12, $f22 -/* 993AC0 80241390 00000000 */ nop +/* 993AC0 80241390 00000000 */ nop /* 993AC4 80241394 C6000040 */ lwc1 $f0, 0x40($s0) /* 993AC8 80241398 C7A2001C */ lwc1 $f2, 0x1c($sp) /* 993ACC 8024139C 46020001 */ sub.s $f0, $f0, $f2 /* 993AD0 802413A0 46160002 */ mul.s $f0, $f0, $f22 -/* 993AD4 802413A4 00000000 */ nop +/* 993AD4 802413A4 00000000 */ nop /* 993AD8 802413A8 E7B40010 */ swc1 $f20, 0x10($sp) /* 993ADC 802413AC E7A20014 */ swc1 $f2, 0x14($sp) /* 993AE0 802413B0 46020000 */ add.s $f0, $f0, $f2 @@ -125,40 +125,40 @@ glabel func_802411F8_993928 /* 993AFC 802413CC C7A20018 */ lwc1 $f2, 0x18($sp) /* 993B00 802413D0 46024201 */ sub.s $f8, $f8, $f2 /* 993B04 802413D4 46164202 */ mul.s $f8, $f8, $f22 -/* 993B08 802413D8 00000000 */ nop +/* 993B08 802413D8 00000000 */ nop /* 993B0C 802413DC C606003C */ lwc1 $f6, 0x3c($s0) /* 993B10 802413E0 46000021 */ cvt.d.s $f0, $f0 /* 993B14 802413E4 46143181 */ sub.s $f6, $f6, $f20 /* 993B18 802413E8 4620C003 */ div.d $f0, $f24, $f0 /* 993B1C 802413EC 46200020 */ cvt.s.d $f0, $f0 /* 993B20 802413F0 46003182 */ mul.s $f6, $f6, $f0 -/* 993B24 802413F4 00000000 */ nop +/* 993B24 802413F4 00000000 */ nop /* 993B28 802413F8 C6040040 */ lwc1 $f4, 0x40($s0) /* 993B2C 802413FC C7AA001C */ lwc1 $f10, 0x1c($sp) /* 993B30 80241400 460A2101 */ sub.s $f4, $f4, $f10 /* 993B34 80241404 46162102 */ mul.s $f4, $f4, $f22 -/* 993B38 80241408 00000000 */ nop +/* 993B38 80241408 00000000 */ nop /* 993B3C 8024140C 46004202 */ mul.s $f8, $f8, $f0 -/* 993B40 80241410 00000000 */ nop +/* 993B40 80241410 00000000 */ nop /* 993B44 80241414 46002102 */ mul.s $f4, $f4, $f0 -/* 993B48 80241418 00000000 */ nop +/* 993B48 80241418 00000000 */ nop /* 993B4C 8024141C 46024200 */ add.s $f8, $f8, $f2 /* 993B50 80241420 C6020038 */ lwc1 $f2, 0x38($s0) /* 993B54 80241424 46024081 */ sub.s $f2, $f8, $f2 /* 993B58 80241428 461C1082 */ mul.s $f2, $f2, $f28 -/* 993B5C 8024142C 00000000 */ nop +/* 993B5C 8024142C 00000000 */ nop /* 993B60 80241430 4606A500 */ add.s $f20, $f20, $f6 /* 993B64 80241434 E622FFFC */ swc1 $f2, -4($s1) /* 993B68 80241438 C602003C */ lwc1 $f2, 0x3c($s0) /* 993B6C 8024143C 4602A081 */ sub.s $f2, $f20, $f2 /* 993B70 80241440 461C1082 */ mul.s $f2, $f2, $f28 -/* 993B74 80241444 00000000 */ nop +/* 993B74 80241444 00000000 */ nop /* 993B78 80241448 460A2100 */ add.s $f4, $f4, $f10 /* 993B7C 8024144C E6220000 */ swc1 $f2, ($s1) /* 993B80 80241450 C6000040 */ lwc1 $f0, 0x40($s0) /* 993B84 80241454 46002001 */ sub.s $f0, $f4, $f0 /* 993B88 80241458 461C0002 */ mul.s $f0, $f0, $f28 -/* 993B8C 8024145C 00000000 */ nop +/* 993B8C 8024145C 00000000 */ nop /* 993B90 80241460 3C014120 */ lui $at, 0x4120 /* 993B94 80241464 44818000 */ mtc1 $at, $f16 /* 993B98 80241468 E6200004 */ swc1 $f0, 4($s1) @@ -168,7 +168,7 @@ glabel func_802411F8_993928 /* 993BA8 80241478 C6200000 */ lwc1 $f0, ($s1) /* 993BAC 8024147C E7A80018 */ swc1 $f8, 0x18($sp) /* 993BB0 80241480 4600803C */ c.lt.s $f16, $f0 -/* 993BB4 80241484 00000000 */ nop +/* 993BB4 80241484 00000000 */ nop /* 993BB8 80241488 45000016 */ bc1f .L802414E4 /* 993BBC 8024148C E7A4001C */ swc1 $f4, 0x1c($sp) /* 993BC0 80241490 08090539 */ j .L802414E4 @@ -178,12 +178,12 @@ glabel func_802411F8_993928 /* 993BCC 8024149C 3C013F66 */ lui $at, 0x3f66 /* 993BD0 802414A0 34216666 */ ori $at, $at, 0x6666 /* 993BD4 802414A4 44818000 */ mtc1 $at, $f16 -/* 993BD8 802414A8 00000000 */ nop +/* 993BD8 802414A8 00000000 */ nop /* 993BDC 802414AC 46101082 */ mul.s $f2, $f2, $f16 -/* 993BE0 802414B0 00000000 */ nop +/* 993BE0 802414B0 00000000 */ nop /* 993BE4 802414B4 C6200004 */ lwc1 $f0, 4($s1) /* 993BE8 802414B8 46100002 */ mul.s $f0, $f0, $f16 -/* 993BEC 802414BC 00000000 */ nop +/* 993BEC 802414BC 00000000 */ nop /* 993BF0 802414C0 E622FFFC */ swc1 $f2, -4($s1) /* 993BF4 802414C4 E6200004 */ swc1 $f0, 4($s1) /* 993BF8 802414C8 C6000038 */ lwc1 $f0, 0x38($s0) @@ -197,10 +197,10 @@ glabel func_802411F8_993928 /* 993C14 802414E4 C6220000 */ lwc1 $f2, ($s1) /* 993C18 802414E8 3C013F80 */ lui $at, 0x3f80 /* 993C1C 802414EC 44810000 */ mtc1 $at, $f0 -/* 993C20 802414F0 00000000 */ nop +/* 993C20 802414F0 00000000 */ nop /* 993C24 802414F4 46001081 */ sub.s $f2, $f2, $f0 /* 993C28 802414F8 461E103C */ c.lt.s $f2, $f30 -/* 993C2C 802414FC 00000000 */ nop +/* 993C2C 802414FC 00000000 */ nop /* 993C30 80241500 45000002 */ bc1f .L8024150C /* 993C34 80241504 E6220000 */ swc1 $f2, ($s1) /* 993C38 80241508 E63E0000 */ swc1 $f30, ($s1) @@ -209,7 +209,7 @@ glabel func_802411F8_993928 /* 993C40 80241510 C6200000 */ lwc1 $f0, ($s1) /* 993C44 80241514 46001080 */ add.s $f2, $f2, $f0 /* 993C48 80241518 461A103E */ c.le.s $f2, $f26 -/* 993C4C 8024151C 00000000 */ nop +/* 993C4C 8024151C 00000000 */ nop /* 993C50 80241520 4500000C */ bc1f .L80241554 /* 993C54 80241524 E602003C */ swc1 $f2, 0x3c($s0) /* 993C58 80241528 E61A003C */ swc1 $f26, 0x3c($s0) @@ -220,7 +220,7 @@ glabel func_802411F8_993928 /* 993C6C 8024153C 46000007 */ neg.s $f0, $f0 /* 993C70 80241540 46000021 */ cvt.d.s $f0, $f0 /* 993C74 80241544 46220002 */ mul.d $f0, $f0, $f2 -/* 993C78 80241548 00000000 */ nop +/* 993C78 80241548 00000000 */ nop /* 993C7C 8024154C 46200020 */ cvt.s.d $f0, $f0 /* 993C80 80241550 E6200000 */ swc1 $f0, ($s1) .L80241554: diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BC4_9942F4.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BC4_9942F4.s index 05450d6373..02e5eb6a1a 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BC4_9942F4.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BC4_9942F4.s @@ -7,7 +7,7 @@ glabel func_80241BC4_9942F4 /* 9942FC 80241BCC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 994300 80241BD0 AFBF0010 */ sw $ra, 0x10($sp) /* 994304 80241BD4 0C048D70 */ jal func_801235C0 -/* 994308 80241BD8 00000000 */ nop +/* 994308 80241BD8 00000000 */ nop /* 99430C 80241BDC 8FBF0010 */ lw $ra, 0x10($sp) /* 994310 80241BE0 24020002 */ addiu $v0, $zero, 2 /* 994314 80241BE4 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BEC_99431C.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BEC_99431C.s index 0fd7b616a0..4708148b87 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BEC_99431C.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BEC_99431C.s @@ -26,17 +26,17 @@ glabel func_80241BEC_99431C /* 994370 80241C40 3C038024 */ lui $v1, %hi(func_80242AC0) /* 994374 80241C44 24632AC0 */ addiu $v1, $v1, %lo(func_80242AC0) /* 994378 80241C48 44921000 */ mtc1 $s2, $f2 -/* 99437C 80241C4C 00000000 */ nop +/* 99437C 80241C4C 00000000 */ nop /* 994380 80241C50 468010A0 */ cvt.s.w $f2, $f2 /* 994384 80241C54 E4620010 */ swc1 $f2, 0x10($v1) /* 994388 80241C58 44901000 */ mtc1 $s0, $f2 -/* 99438C 80241C5C 00000000 */ nop +/* 99438C 80241C5C 00000000 */ nop /* 994390 80241C60 468010A0 */ cvt.s.w $f2, $f2 /* 994394 80241C64 4600010D */ trunc.w.s $f4, $f0 /* 994398 80241C68 44022000 */ mfc1 $v0, $f4 -/* 99439C 80241C6C 00000000 */ nop +/* 99439C 80241C6C 00000000 */ nop /* 9943A0 80241C70 44820000 */ mtc1 $v0, $f0 -/* 9943A4 80241C74 00000000 */ nop +/* 9943A4 80241C74 00000000 */ nop /* 9943A8 80241C78 46800020 */ cvt.s.w $f0, $f0 /* 9943AC 80241C7C E4620014 */ swc1 $f2, 0x14($v1) /* 9943B0 80241C80 E4600018 */ swc1 $f0, 0x18($v1) diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241CA0_9943D0.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241CA0_9943D0.s index 66e77aab7b..f6a3c01870 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241CA0_9943D0.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241CA0_9943D0.s @@ -26,17 +26,17 @@ glabel func_80241CA0_9943D0 /* 994424 80241CF4 3C038024 */ lui $v1, %hi(func_80242AC0) /* 994428 80241CF8 24632AC0 */ addiu $v1, $v1, %lo(func_80242AC0) /* 99442C 80241CFC 44921000 */ mtc1 $s2, $f2 -/* 994430 80241D00 00000000 */ nop +/* 994430 80241D00 00000000 */ nop /* 994434 80241D04 468010A0 */ cvt.s.w $f2, $f2 /* 994438 80241D08 E462001C */ swc1 $f2, 0x1c($v1) /* 99443C 80241D0C 44901000 */ mtc1 $s0, $f2 -/* 994440 80241D10 00000000 */ nop +/* 994440 80241D10 00000000 */ nop /* 994444 80241D14 468010A0 */ cvt.s.w $f2, $f2 /* 994448 80241D18 4600010D */ trunc.w.s $f4, $f0 /* 99444C 80241D1C 44022000 */ mfc1 $v0, $f4 -/* 994450 80241D20 00000000 */ nop +/* 994450 80241D20 00000000 */ nop /* 994454 80241D24 44820000 */ mtc1 $v0, $f0 -/* 994458 80241D28 00000000 */ nop +/* 994458 80241D28 00000000 */ nop /* 99445C 80241D2C 46800020 */ cvt.s.w $f0, $f0 /* 994460 80241D30 E4620020 */ swc1 $f2, 0x20($v1) /* 994464 80241D34 E4600024 */ swc1 $f0, 0x24($v1) @@ -47,6 +47,6 @@ glabel func_80241CA0_9943D0 /* 994478 80241D48 24020002 */ addiu $v0, $zero, 2 /* 99447C 80241D4C 03E00008 */ jr $ra /* 994480 80241D50 27BD0020 */ addiu $sp, $sp, 0x20 -/* 994484 80241D54 00000000 */ nop -/* 994488 80241D58 00000000 */ nop -/* 99448C 80241D5C 00000000 */ nop +/* 994484 80241D54 00000000 */ nop +/* 994488 80241D58 00000000 */ nop +/* 99448C 80241D5C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802401AC_99539C.s b/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802401AC_99539C.s index 435a259633..986db54a85 100644 --- a/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802401AC_99539C.s +++ b/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802401AC_99539C.s @@ -13,11 +13,12 @@ glabel func_802401AC_99539C /* 9953BC 802401CC 2C620005 */ sltiu $v0, $v1, 5 /* 9953C0 802401D0 1040008A */ beqz $v0, .L802403FC /* 9953C4 802401D4 00031080 */ sll $v0, $v1, 2 -/* 9953C8 802401D8 3C018024 */ lui $at, %hi(D_80242D50) +/* 9953C8 802401D8 3C018024 */ lui $at, %hi(jtbl_80242D50_997F40) /* 9953CC 802401DC 00220821 */ addu $at, $at, $v0 -/* 9953D0 802401E0 8C222D50 */ lw $v0, %lo(D_80242D50)($at) +/* 9953D0 802401E0 8C222D50 */ lw $v0, %lo(jtbl_80242D50_997F40)($at) /* 9953D4 802401E4 00400008 */ jr $v0 -/* 9953D8 802401E8 00000000 */ nop +/* 9953D8 802401E8 00000000 */ nop +glabel L802401EC_9953DC /* 9953DC 802401EC 8E22003C */ lw $v0, 0x3c($s1) /* 9953E0 802401F0 86270046 */ lh $a3, 0x46($s1) /* 9953E4 802401F4 AFA20010 */ sw $v0, 0x10($sp) @@ -66,6 +67,7 @@ glabel func_802401AC_99539C /* 995490 802402A0 A6220044 */ sh $v0, 0x44($s1) /* 995494 802402A4 080900FF */ j .L802403FC /* 995498 802402A8 A6200046 */ sh $zero, 0x46($s1) +glabel L802402AC_99549C /* 99549C 802402AC 96220046 */ lhu $v0, 0x46($s1) /* 9954A0 802402B0 24420001 */ addiu $v0, $v0, 1 /* 9954A4 802402B4 A6220046 */ sh $v0, 0x46($s1) @@ -84,6 +86,7 @@ glabel func_802401AC_99539C /* 9954D8 802402E8 8C42000C */ lw $v0, 0xc($v0) /* 9954DC 802402EC 080900FF */ j .L802403FC /* 9954E0 802402F0 AC400074 */ sw $zero, 0x74($v0) +glabel L802402F4_9954E4 /* 9954E4 802402F4 96220046 */ lhu $v0, 0x46($s1) /* 9954E8 802402F8 24420001 */ addiu $v0, $v0, 1 /* 9954EC 802402FC A6220046 */ sh $v0, 0x46($s1) @@ -91,7 +94,7 @@ glabel func_802401AC_99539C /* 9954F4 80240304 00021403 */ sra $v0, $v0, 0x10 /* 9954F8 80240308 2842003C */ slti $v0, $v0, 0x3c /* 9954FC 8024030C 1440003B */ bnez $v0, .L802403FC -/* 995500 80240310 00000000 */ nop +/* 995500 80240310 00000000 */ nop /* 995504 80240314 3C013F80 */ lui $at, 0x3f80 /* 995508 80240318 44810000 */ mtc1 $at, $f0 /* 99550C 8024031C AFA00014 */ sw $zero, 0x14($sp) @@ -124,6 +127,7 @@ glabel func_802401AC_99539C /* 995578 80240388 A6220048 */ sh $v0, 0x48($s1) /* 99557C 8024038C 080900FF */ j .L802403FC /* 995580 80240390 E6200030 */ swc1 $f0, 0x30($s1) +glabel L80240394_995584 /* 995584 80240394 0000202D */ daddu $a0, $zero, $zero /* 995588 80240398 3C054210 */ lui $a1, 0x4210 /* 99558C 8024039C 3C064198 */ lui $a2, 0x4198 @@ -151,14 +155,15 @@ glabel func_802401AC_99539C /* 9955E4 802403F4 A6200046 */ sh $zero, 0x46($s1) /* 9955E8 802403F8 E6200034 */ swc1 $f0, 0x34($s1) .L802403FC: +glabel L802403FC_9955EC /* 9955EC 802403FC 8623004A */ lh $v1, 0x4a($s1) /* 9955F0 80240400 24020001 */ addiu $v0, $zero, 1 /* 9955F4 80240404 10620005 */ beq $v1, $v0, .L8024041C /* 9955F8 80240408 24020002 */ addiu $v0, $zero, 2 /* 9955FC 8024040C 1062001E */ beq $v1, $v0, .L80240488 -/* 995600 80240410 00000000 */ nop +/* 995600 80240410 00000000 */ nop /* 995604 80240414 0809014C */ j .L80240530 -/* 995608 80240418 00000000 */ nop +/* 995608 80240418 00000000 */ nop .L8024041C: /* 99560C 8024041C 8627004C */ lh $a3, 0x4c($s1) /* 995610 80240420 24100078 */ addiu $s0, $zero, 0x78 @@ -190,12 +195,12 @@ glabel func_802401AC_99539C .L80240488: /* 995678 80240488 8622004C */ lh $v0, 0x4c($s1) /* 99567C 8024048C 44826000 */ mtc1 $v0, $f12 -/* 995680 80240490 00000000 */ nop +/* 995680 80240490 00000000 */ nop /* 995684 80240494 0C00A8BB */ jal sin_deg /* 995688 80240498 46806320 */ cvt.s.w $f12, $f12 /* 99568C 8024049C 3C013F80 */ lui $at, 0x3f80 /* 995690 802404A0 44811000 */ mtc1 $at, $f2 -/* 995694 802404A4 00000000 */ nop +/* 995694 802404A4 00000000 */ nop /* 995698 802404A8 46020000 */ add.s $f0, $f0, $f2 /* 99569C 802404AC 46000000 */ add.s $f0, $f0, $f0 /* 9956A0 802404B0 C6220024 */ lwc1 $f2, 0x24($s1) @@ -203,7 +208,7 @@ glabel func_802401AC_99539C /* 9956A8 802404B8 46001080 */ add.s $f2, $f2, $f0 /* 9956AC 802404BC 24420008 */ addiu $v0, $v0, 8 /* 9956B0 802404C0 44826000 */ mtc1 $v0, $f12 -/* 9956B4 802404C4 00000000 */ nop +/* 9956B4 802404C4 00000000 */ nop /* 9956B8 802404C8 46806320 */ cvt.s.w $f12, $f12 /* 9956BC 802404CC 0C00A6C9 */ jal clamp_angle /* 9956C0 802404D0 E6220004 */ swc1 $f2, 4($s1) @@ -224,9 +229,9 @@ glabel func_802401AC_99539C /* 9956FC 8024050C 460E1380 */ add.s $f14, $f2, $f14 /* 995700 80240510 3C0141F0 */ lui $at, 0x41f0 /* 995704 80240514 44811000 */ mtc1 $at, $f2 -/* 995708 80240518 00000000 */ nop +/* 995708 80240518 00000000 */ nop /* 99570C 8024051C 4600103C */ c.lt.s $f2, $f0 -/* 995710 80240520 00000000 */ nop +/* 995710 80240520 00000000 */ nop /* 995714 80240524 45010002 */ bc1t .L80240530 /* 995718 80240528 24020003 */ addiu $v0, $zero, 3 .L8024052C: @@ -237,9 +242,9 @@ glabel func_802401AC_99539C /* 995728 80240538 10620005 */ beq $v1, $v0, .L80240550 /* 99572C 8024053C 24020002 */ addiu $v0, $zero, 2 /* 995730 80240540 10620008 */ beq $v1, $v0, .L80240564 -/* 995734 80240544 00000000 */ nop +/* 995734 80240544 00000000 */ nop /* 995738 80240548 08090169 */ j .L802405A4 -/* 99573C 8024054C 00000000 */ nop +/* 99573C 8024054C 00000000 */ nop .L80240550: /* 995740 80240550 C620002C */ lwc1 $f0, 0x2c($s1) /* 995744 80240554 C62C0030 */ lwc1 $f12, 0x30($s1) diff --git a/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_80240708_9958F8.s b/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_80240708_9958F8.s index 2c631d5000..93747fd644 100644 --- a/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_80240708_9958F8.s +++ b/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_80240708_9958F8.s @@ -8,12 +8,12 @@ glabel func_80240708_9958F8 /* 995904 80240714 8C900084 */ lw $s0, 0x84($a0) /* 995908 80240718 8602004C */ lh $v0, 0x4c($s0) /* 99590C 8024071C 44826000 */ mtc1 $v0, $f12 -/* 995910 80240720 00000000 */ nop +/* 995910 80240720 00000000 */ nop /* 995914 80240724 0C00A8BB */ jal sin_deg /* 995918 80240728 46806320 */ cvt.s.w $f12, $f12 /* 99591C 8024072C 3C013F80 */ lui $at, 0x3f80 /* 995920 80240730 44811000 */ mtc1 $at, $f2 -/* 995924 80240734 00000000 */ nop +/* 995924 80240734 00000000 */ nop /* 995928 80240738 46020000 */ add.s $f0, $f0, $f2 /* 99592C 8024073C 46000000 */ add.s $f0, $f0, $f0 /* 995930 80240740 C6020024 */ lwc1 $f2, 0x24($s0) @@ -21,13 +21,13 @@ glabel func_80240708_9958F8 /* 995938 80240748 46001080 */ add.s $f2, $f2, $f0 /* 99593C 8024074C 24420008 */ addiu $v0, $v0, 8 /* 995940 80240750 44826000 */ mtc1 $v0, $f12 -/* 995944 80240754 00000000 */ nop +/* 995944 80240754 00000000 */ nop /* 995948 80240758 46806320 */ cvt.s.w $f12, $f12 /* 99594C 8024075C 0C00A6C9 */ jal clamp_angle /* 995950 80240760 E6020004 */ swc1 $f2, 4($s0) /* 995954 80240764 4600010D */ trunc.w.s $f4, $f0 /* 995958 80240768 44022000 */ mfc1 $v0, $f4 -/* 99595C 8024076C 00000000 */ nop +/* 99595C 8024076C 00000000 */ nop /* 995960 80240770 A602004C */ sh $v0, 0x4c($s0) /* 995964 80240774 3C028011 */ lui $v0, %hi(gPlayerStatus) /* 995968 80240778 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) @@ -38,9 +38,9 @@ glabel func_80240708_9958F8 /* 99597C 8024078C 8E070020 */ lw $a3, 0x20($s0) /* 995980 80240790 3C0141F0 */ lui $at, 0x41f0 /* 995984 80240794 44811000 */ mtc1 $at, $f2 -/* 995988 80240798 00000000 */ nop +/* 995988 80240798 00000000 */ nop /* 99598C 8024079C 4602003E */ c.le.s $f0, $f2 -/* 995990 802407A0 00000000 */ nop +/* 995990 802407A0 00000000 */ nop /* 995994 802407A4 45000002 */ bc1f .L802407B0 /* 995998 802407A8 24020003 */ addiu $v0, $zero, 3 /* 99599C 802407AC A602004E */ sh $v0, 0x4e($s0) @@ -62,6 +62,6 @@ glabel func_80240708_9958F8 /* 9959D8 802407E8 0000102D */ daddu $v0, $zero, $zero /* 9959DC 802407EC 03E00008 */ jr $ra /* 9959E0 802407F0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 9959E4 802407F4 00000000 */ nop -/* 9959E8 802407F8 00000000 */ nop -/* 9959EC 802407FC 00000000 */ nop +/* 9959E4 802407F4 00000000 */ nop +/* 9959E8 802407F8 00000000 */ nop +/* 9959EC 802407FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_16/9959F0/func_80240800_9959F0.s b/asm/nonmatchings/world/area_isk/isk_16/9959F0/func_80240800_9959F0.s index 9659535dfe..176ca9780f 100644 --- a/asm/nonmatchings/world/area_isk/isk_16/9959F0/func_80240800_9959F0.s +++ b/asm/nonmatchings/world/area_isk/isk_16/9959F0/func_80240800_9959F0.s @@ -37,12 +37,12 @@ glabel func_80240800_9959F0 /* 995A6C 8024087C 12400007 */ beqz $s2, .L8024089C /* 995A70 80240880 3412FFFF */ ori $s2, $zero, 0xffff /* 995A74 80240884 08090243 */ j .L8024090C -/* 995A78 80240888 00000000 */ nop +/* 995A78 80240888 00000000 */ nop .L8024088C: /* 995A7C 8024088C 1242001B */ beq $s2, $v0, .L802408FC /* 995A80 80240890 24020002 */ addiu $v0, $zero, 2 /* 995A84 80240894 08090243 */ j .L8024090C -/* 995A88 80240898 00000000 */ nop +/* 995A88 80240898 00000000 */ nop .L8024089C: /* 995A8C 8024089C 8E040000 */ lw $a0, ($s0) /* 995A90 802408A0 1092001A */ beq $a0, $s2, .L8024090C @@ -56,7 +56,7 @@ glabel func_80240800_9959F0 /* 995AB0 802408C0 0C046F1F */ jal func_8011BC7C /* 995AB4 802408C4 0220302D */ daddu $a2, $s1, $zero /* 995AB8 802408C8 08090227 */ j .L8024089C -/* 995ABC 802408CC 00000000 */ nop +/* 995ABC 802408CC 00000000 */ nop .L802408D0: /* 995AC0 802408D0 3412FFFF */ ori $s2, $zero, 0xffff .L802408D4: @@ -69,7 +69,7 @@ glabel func_80240800_9959F0 /* 995ADC 802408EC 0C046E54 */ jal func_8011B950 /* 995AE0 802408F0 0000382D */ daddu $a3, $zero, $zero /* 995AE4 802408F4 08090235 */ j .L802408D4 -/* 995AE8 802408F8 00000000 */ nop +/* 995AE8 802408F8 00000000 */ nop .L802408FC: /* 995AEC 802408FC 3C028015 */ lui $v0, %hi(D_801512F0) /* 995AF0 80240900 8C4212F0 */ lw $v0, %lo(D_801512F0)($v0) diff --git a/asm/nonmatchings/world/area_isk/isk_16/9959F0/func_80240924_995B14.s b/asm/nonmatchings/world/area_isk/isk_16/9959F0/func_80240924_995B14.s index a46e110f89..668f32bdaa 100644 --- a/asm/nonmatchings/world/area_isk/isk_16/9959F0/func_80240924_995B14.s +++ b/asm/nonmatchings/world/area_isk/isk_16/9959F0/func_80240924_995B14.s @@ -71,20 +71,20 @@ glabel func_80240924_995B14 /* 995C1C 80240A2C 12620008 */ beq $s3, $v0, .L80240A50 /* 995C20 80240A30 32C400FF */ andi $a0, $s6, 0xff /* 995C24 80240A34 080902B1 */ j .L80240AC4 -/* 995C28 80240A38 00000000 */ nop +/* 995C28 80240A38 00000000 */ nop .L80240A3C: /* 995C2C 80240A3C 24020003 */ addiu $v0, $zero, 3 /* 995C30 80240A40 12620018 */ beq $s3, $v0, .L80240AA4 /* 995C34 80240A44 32C400FF */ andi $a0, $s6, 0xff /* 995C38 80240A48 080902B1 */ j .L80240AC4 -/* 995C3C 80240A4C 00000000 */ nop +/* 995C3C 80240A4C 00000000 */ nop .L80240A50: /* 995C40 80240A50 32A500FF */ andi $a1, $s5, 0xff /* 995C44 80240A54 328600FF */ andi $a2, $s4, 0xff /* 995C48 80240A58 0C046F97 */ jal set_background_color_blend /* 995C4C 80240A5C 324700FF */ andi $a3, $s2, 0xff /* 995C50 80240A60 080902B1 */ j .L80240AC4 -/* 995C54 80240A64 00000000 */ nop +/* 995C54 80240A64 00000000 */ nop .L80240A68: /* 995C58 80240A68 32C400FF */ andi $a0, $s6, 0xff /* 995C5C 80240A6C 32A500FF */ andi $a1, $s5, 0xff @@ -100,7 +100,7 @@ glabel func_80240924_995B14 /* 995C84 80240A94 0C046FAD */ jal func_8011BEB4 /* 995C88 80240A98 AFA20018 */ sw $v0, 0x18($sp) /* 995C8C 80240A9C 080902B1 */ j .L80240AC4 -/* 995C90 80240AA0 00000000 */ nop +/* 995C90 80240AA0 00000000 */ nop .L80240AA4: /* 995C94 80240AA4 32A500FF */ andi $a1, $s5, 0xff /* 995C98 80240AA8 328600FF */ andi $a2, $s4, 0xff @@ -124,5 +124,5 @@ glabel func_80240924_995B14 /* 995CDC 80240AEC 24020002 */ addiu $v0, $zero, 2 /* 995CE0 80240AF0 03E00008 */ jr $ra /* 995CE4 80240AF4 27BD0058 */ addiu $sp, $sp, 0x58 -/* 995CE8 80240AF8 00000000 */ nop -/* 995CEC 80240AFC 00000000 */ nop +/* 995CE8 80240AF8 00000000 */ nop +/* 995CEC 80240AFC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_18/997F70/func_8024007C_997FEC.s b/asm/nonmatchings/world/area_isk/isk_18/997F70/func_8024007C_997FEC.s index cb507a85b9..7a85f1dac5 100644 --- a/asm/nonmatchings/world/area_isk/isk_18/997F70/func_8024007C_997FEC.s +++ b/asm/nonmatchings/world/area_isk/isk_18/997F70/func_8024007C_997FEC.s @@ -21,11 +21,11 @@ glabel func_8024007C_997FEC /* 99802C 802400BC A602008E */ sh $v0, 0x8e($s0) /* 998030 802400C0 00021400 */ sll $v0, $v0, 0x10 /* 998034 802400C4 1C400033 */ bgtz $v0, .L80240194 -/* 998038 802400C8 00000000 */ nop +/* 998038 802400C8 00000000 */ nop .L802400CC: /* 99803C 802400CC 8602008C */ lh $v0, 0x8c($s0) /* 998040 802400D0 14400030 */ bnez $v0, .L80240194 -/* 998044 802400D4 00000000 */ nop +/* 998044 802400D4 00000000 */ nop /* 998048 802400D8 8E2200CC */ lw $v0, 0xcc($s1) /* 99804C 802400DC 8C420024 */ lw $v0, 0x24($v0) /* 998050 802400E0 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_8024007C_997FEC /* 99805C 802400EC 8E230088 */ lw $v1, 0x88($s1) /* 998060 802400F0 24020005 */ addiu $v0, $zero, 5 /* 998064 802400F4 10620005 */ beq $v1, $v0, .L8024010C -/* 998068 802400F8 00000000 */ nop +/* 998068 802400F8 00000000 */ nop /* 99806C 802400FC 10600003 */ beqz $v1, .L8024010C /* 998070 80240100 24020001 */ addiu $v0, $zero, 1 /* 998074 80240104 14620006 */ bne $v1, $v0, .L80240120 -/* 998078 80240108 00000000 */ nop +/* 998078 80240108 00000000 */ nop .L8024010C: /* 99807C 8024010C 8E220084 */ lw $v0, 0x84($s1) /* 998080 80240110 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_8024007C_997FEC /* 9980C0 80240150 46220000 */ add.d $f0, $f0, $f2 /* 9980C4 80240154 4620010D */ trunc.w.d $f4, $f0 /* 9980C8 80240158 44022000 */ mfc1 $v0, $f4 -/* 9980CC 8024015C 00000000 */ nop +/* 9980CC 8024015C 00000000 */ nop /* 9980D0 80240160 A602008E */ sh $v0, 0x8e($s0) /* 9980D4 80240164 00021400 */ sll $v0, $v0, 0x10 /* 9980D8 80240168 8E230078 */ lw $v1, 0x78($s1) /* 9980DC 8024016C 00021403 */ sra $v0, $v0, 0x10 /* 9980E0 80240170 0043102A */ slt $v0, $v0, $v1 /* 9980E4 80240174 10400003 */ beqz $v0, .L80240184 -/* 9980E8 80240178 00000000 */ nop +/* 9980E8 80240178 00000000 */ nop /* 9980EC 8024017C 9622007A */ lhu $v0, 0x7a($s1) /* 9980F0 80240180 A602008E */ sh $v0, 0x8e($s0) .L80240184: diff --git a/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s b/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s index d7b07a228f..de7071144c 100644 --- a/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s +++ b/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s @@ -279,15 +279,17 @@ glabel func_80240394_998304 /* 9986F0 80240780 2C620015 */ sltiu $v0, $v1, 0x15 /* 9986F4 80240784 10400009 */ beqz $v0, .L802407AC /* 9986F8 80240788 00031080 */ sll $v0, $v1, 2 -/* 9986FC 8024078C 3C018024 */ lui $at, %hi(D_80241778) +/* 9986FC 8024078C 3C018024 */ lui $at, %hi(jtbl_80241778_9996E8) /* 998700 80240790 00220821 */ addu $at, $at, $v0 -/* 998704 80240794 8C221778 */ lw $v0, %lo(D_80241778)($at) +/* 998704 80240794 8C221778 */ lw $v0, %lo(jtbl_80241778_9996E8)($at) /* 998708 80240798 00400008 */ jr $v0 /* 99870C 8024079C 00000000 */ nop +glabel L802407A0_998710 /* 998710 802407A0 8E420028 */ lw $v0, 0x28($s2) /* 998714 802407A4 24420001 */ addiu $v0, $v0, 1 /* 998718 802407A8 AE420028 */ sw $v0, 0x28($s2) .L802407AC: +glabel L802407AC_99871C /* 99871C 802407AC 0000102D */ daddu $v0, $zero, $zero .L802407B0: /* 998720 802407B0 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240000_90CC40.s b/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240000_90CC40.s index 2291e189eb..cefce013a5 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240000_90CC40.s +++ b/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240000_90CC40.s @@ -26,7 +26,7 @@ glabel func_80240000_90CC40 /* 90CC90 80240050 1440FFFA */ bnez $v0, .L8024003C /* 90CC94 80240054 24A50004 */ addiu $a1, $a1, 4 /* 90CC98 80240058 08090027 */ j .L8024009C -/* 90CC9C 8024005C 00000000 */ nop +/* 90CC9C 8024005C 00000000 */ nop .L80240060: /* 90CCA0 80240060 0000182D */ daddu $v1, $zero, $zero /* 90CCA4 80240064 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240118_90CD58.s b/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240118_90CD58.s index 643126b404..a6330181aa 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240118_90CD58.s +++ b/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240118_90CD58.s @@ -34,7 +34,7 @@ glabel func_80240118_90CD58 /* 90CDC0 80240180 8E430074 */ lw $v1, 0x74($s2) /* 90CDC4 80240184 2402000F */ addiu $v0, $zero, 0xf /* 90CDC8 80240188 1462002A */ bne $v1, $v0, .L80240234 -/* 90CDCC 8024018C 00000000 */ nop +/* 90CDCC 8024018C 00000000 */ nop /* 90CDD0 80240190 240403E5 */ addiu $a0, $zero, 0x3e5 /* 90CDD4 80240194 962300A8 */ lhu $v1, 0xa8($s1) /* 90CDD8 80240198 C620003C */ lwc1 $f0, 0x3c($s1) @@ -45,7 +45,7 @@ glabel func_80240118_90CD58 /* 90CDEC 802401AC 00431021 */ addu $v0, $v0, $v1 /* 90CDF0 802401B0 00021043 */ sra $v0, $v0, 1 /* 90CDF4 802401B4 44822000 */ mtc1 $v0, $f4 -/* 90CDF8 802401B8 00000000 */ nop +/* 90CDF8 802401B8 00000000 */ nop /* 90CDFC 802401BC 46802120 */ cvt.s.w $f4, $f4 /* 90CE00 802401C0 46040000 */ add.s $f0, $f0, $f4 /* 90CE04 802401C4 E7A20010 */ swc1 $f2, 0x10($sp) @@ -67,7 +67,7 @@ glabel func_80240118_90CD58 /* 90CE44 80240204 00431021 */ addu $v0, $v0, $v1 /* 90CE48 80240208 00021043 */ sra $v0, $v0, 1 /* 90CE4C 8024020C 44820000 */ mtc1 $v0, $f0 -/* 90CE50 80240210 00000000 */ nop +/* 90CE50 80240210 00000000 */ nop /* 90CE54 80240214 46800020 */ cvt.s.w $f0, $f0 /* 90CE58 80240218 46002100 */ add.s $f4, $f4, $f0 /* 90CE5C 8024021C E7A20014 */ swc1 $f2, 0x14($sp) @@ -80,7 +80,7 @@ glabel func_80240118_90CD58 /* 90CE74 80240234 8E500074 */ lw $s0, 0x74($s2) /* 90CE78 80240238 2402000A */ addiu $v0, $zero, 0xa /* 90CE7C 8024023C 1602000F */ bne $s0, $v0, .L8024027C -/* 90CE80 80240240 00000000 */ nop +/* 90CE80 80240240 00000000 */ nop /* 90CE84 80240244 3C014120 */ lui $at, 0x4120 /* 90CE88 80240248 44811000 */ mtc1 $at, $f2 /* 90CE8C 8024024C C6200040 */ lwc1 $f0, 0x40($s1) @@ -92,7 +92,7 @@ glabel func_80240118_90CD58 /* 90CEA4 80240264 46027380 */ add.s $f14, $f14, $f2 /* 90CEA8 80240268 8E420074 */ lw $v0, 0x74($s2) /* 90CEAC 8024026C 14500003 */ bne $v0, $s0, .L8024027C -/* 90CEB0 80240270 00000000 */ nop +/* 90CEB0 80240270 00000000 */ nop /* 90CEB4 80240274 0C0120A0 */ jal spawn_drops /* 90CEB8 80240278 0260202D */ daddu $a0, $s3, $zero .L8024027C: @@ -107,5 +107,5 @@ glabel func_80240118_90CD58 /* 90CEDC 8024029C 2C620001 */ sltiu $v0, $v1, 1 /* 90CEE0 802402A0 03E00008 */ jr $ra /* 90CEE4 802402A4 27BD0038 */ addiu $sp, $sp, 0x38 -/* 90CEE8 802402A8 00000000 */ nop -/* 90CEEC 802402AC 00000000 */ nop +/* 90CEE8 802402A8 00000000 */ nop +/* 90CEEC 802402AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_00/90CEF0/func_802402B0_90CEF0.s b/asm/nonmatchings/world/area_iwa/iwa_00/90CEF0/func_802402B0_90CEF0.s index 04f1321c81..3e650baf98 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_00/90CEF0/func_802402B0_90CEF0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_00/90CEF0/func_802402B0_90CEF0.s @@ -11,6 +11,6 @@ glabel func_802402B0_90CEF0 /* 90CF08 802402C8 AC430000 */ sw $v1, ($v0) /* 90CF0C 802402CC 03E00008 */ jr $ra /* 90CF10 802402D0 24020002 */ addiu $v0, $zero, 2 -/* 90CF14 802402D4 00000000 */ nop -/* 90CF18 802402D8 00000000 */ nop -/* 90CF1C 802402DC 00000000 */ nop +/* 90CF14 802402D4 00000000 */ nop +/* 90CF18 802402D8 00000000 */ nop +/* 90CF1C 802402DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240398_90FA48.s b/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240398_90FA48.s index c975abdd34..aa10d90c6c 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240398_90FA48.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240398_90FA48.s @@ -42,22 +42,22 @@ glabel func_80240398_90FA48 /* 90FAD8 80240428 000710C3 */ sra $v0, $a3, 3 /* 90FADC 8024042C 00431023 */ subu $v0, $v0, $v1 /* 90FAE0 80240430 44820000 */ mtc1 $v0, $f0 -/* 90FAE4 80240434 00000000 */ nop +/* 90FAE4 80240434 00000000 */ nop /* 90FAE8 80240438 46800020 */ cvt.s.w $f0, $f0 /* 90FAEC 8024043C 0C00A67F */ jal rand_int /* 90FAF0 80240440 E600FFEC */ swc1 $f0, -0x14($s0) /* 90FAF4 80240444 44921000 */ mtc1 $s2, $f2 -/* 90FAF8 80240448 00000000 */ nop +/* 90FAF8 80240448 00000000 */ nop /* 90FAFC 8024044C 468010A0 */ cvt.s.w $f2, $f2 /* 90FB00 80240450 460010A1 */ cvt.d.s $f2, $f2 /* 90FB04 80240454 46341082 */ mul.d $f2, $f2, $f20 -/* 90FB08 80240458 00000000 */ nop +/* 90FB08 80240458 00000000 */ nop /* 90FB0C 8024045C 2631FFE2 */ addiu $s1, $s1, -0x1e /* 90FB10 80240460 26730028 */ addiu $s3, $s3, 0x28 /* 90FB14 80240464 24040167 */ addiu $a0, $zero, 0x167 /* 90FB18 80240468 26520001 */ addiu $s2, $s2, 1 /* 90FB1C 8024046C 44820000 */ mtc1 $v0, $f0 -/* 90FB20 80240470 00000000 */ nop +/* 90FB20 80240470 00000000 */ nop /* 90FB24 80240474 46800020 */ cvt.s.w $f0, $f0 /* 90FB28 80240478 46180003 */ div.s $f0, $f0, $f24 /* 90FB2C 8024047C 46000021 */ cvt.d.s $f0, $f0 @@ -69,18 +69,18 @@ glabel func_80240398_90FA48 /* 90FB44 80240494 E6000008 */ swc1 $f0, 8($s0) /* 90FB48 80240498 24040167 */ addiu $a0, $zero, 0x167 /* 90FB4C 8024049C 44820000 */ mtc1 $v0, $f0 -/* 90FB50 802404A0 00000000 */ nop +/* 90FB50 802404A0 00000000 */ nop /* 90FB54 802404A4 46800020 */ cvt.s.w $f0, $f0 /* 90FB58 802404A8 0C00A67F */ jal rand_int /* 90FB5C 802404AC E600FFF8 */ swc1 $f0, -8($s0) /* 90FB60 802404B0 24040167 */ addiu $a0, $zero, 0x167 /* 90FB64 802404B4 44820000 */ mtc1 $v0, $f0 -/* 90FB68 802404B8 00000000 */ nop +/* 90FB68 802404B8 00000000 */ nop /* 90FB6C 802404BC 46800020 */ cvt.s.w $f0, $f0 /* 90FB70 802404C0 0C00A67F */ jal rand_int /* 90FB74 802404C4 E600FFFC */ swc1 $f0, -4($s0) /* 90FB78 802404C8 44820000 */ mtc1 $v0, $f0 -/* 90FB7C 802404CC 00000000 */ nop +/* 90FB7C 802404CC 00000000 */ nop /* 90FB80 802404D0 46800020 */ cvt.s.w $f0, $f0 /* 90FB84 802404D4 E6000000 */ swc1 $f0, ($s0) /* 90FB88 802404D8 2A420014 */ slti $v0, $s2, 0x14 @@ -98,6 +98,6 @@ glabel func_80240398_90FA48 /* 90FBB8 80240508 24020002 */ addiu $v0, $zero, 2 /* 90FBBC 8024050C 03E00008 */ jr $ra /* 90FBC0 80240510 27BD0040 */ addiu $sp, $sp, 0x40 -/* 90FBC4 80240514 00000000 */ nop -/* 90FBC8 80240518 00000000 */ nop -/* 90FBCC 8024051C 00000000 */ nop +/* 90FBC4 80240514 00000000 */ nop +/* 90FBC8 80240518 00000000 */ nop +/* 90FBCC 8024051C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520_90FBD0.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520_90FBD0.s index 24804fbe3b..97f722ef2e 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520_90FBD0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520_90FBD0.s @@ -42,16 +42,16 @@ glabel func_80240520_90FBD0 /* 90FC64 802405B4 3C014387 */ lui $at, 0x4387 /* 90FC68 802405B8 4481A000 */ mtc1 $at, $f20 /* 90FC6C 802405BC 0C00A70A */ jal get_clamped_angle_diff -/* 90FC70 802405C0 00000000 */ nop +/* 90FC70 802405C0 00000000 */ nop /* 90FC74 802405C4 0C00A6C9 */ jal clamp_angle /* 90FC78 802405C8 46000306 */ mov.s $f12, $f0 /* 90FC7C 802405CC 3C018024 */ lui $at, %hi(D_80246390) /* 90FC80 802405D0 D4226390 */ ldc1 $f2, %lo(D_80246390)($at) /* 90FC84 802405D4 46000021 */ cvt.d.s $f0, $f0 /* 90FC88 802405D8 4622003C */ c.lt.d $f0, $f2 -/* 90FC8C 802405DC 00000000 */ nop +/* 90FC8C 802405DC 00000000 */ nop /* 90FC90 802405E0 45000003 */ bc1f .L802405F0 -/* 90FC94 802405E4 00000000 */ nop +/* 90FC94 802405E4 00000000 */ nop /* 90FC98 802405E8 3C0142B4 */ lui $at, 0x42b4 /* 90FC9C 802405EC 4481A000 */ mtc1 $at, $f20 .L802405F0: @@ -71,7 +71,7 @@ glabel func_80240520_90FBD0 /* 90FCD4 80240624 D4226398 */ ldc1 $f2, %lo(D_80246398)($at) /* 90FCD8 80240628 46000021 */ cvt.d.s $f0, $f0 /* 90FCDC 8024062C 4620103C */ c.lt.d $f2, $f0 -/* 90FCE0 80240630 00000000 */ nop +/* 90FCE0 80240630 00000000 */ nop /* 90FCE4 80240634 4501002E */ bc1t .L802406F0 /* 90FCE8 80240638 2402FFFF */ addiu $v0, $zero, -1 /* 90FCEC 8024063C 8E220000 */ lw $v0, ($s1) @@ -80,13 +80,13 @@ glabel func_80240520_90FBD0 /* 90FCF8 80240648 860200A8 */ lh $v0, 0xa8($s0) /* 90FCFC 8024064C 46020001 */ sub.s $f0, $f0, $f2 /* 90FD00 80240650 44821000 */ mtc1 $v0, $f2 -/* 90FD04 80240654 00000000 */ nop +/* 90FD04 80240654 00000000 */ nop /* 90FD08 80240658 468010A1 */ cvt.d.w $f2, $f2 /* 90FD0C 8024065C 46221080 */ add.d $f2, $f2, $f2 /* 90FD10 80240660 46000005 */ abs.s $f0, $f0 /* 90FD14 80240664 46000021 */ cvt.d.s $f0, $f0 /* 90FD18 80240668 4620103E */ c.le.d $f2, $f0 -/* 90FD1C 8024066C 00000000 */ nop +/* 90FD1C 8024066C 00000000 */ nop /* 90FD20 80240670 4501001F */ bc1t .L802406F0 /* 90FD24 80240674 2402FFFF */ addiu $v0, $zero, -1 /* 90FD28 80240678 3C038011 */ lui $v1, %hi(D_8010EBB3) @@ -97,7 +97,7 @@ glabel func_80240520_90FBD0 /* 90FD3C 8024068C 14620005 */ bne $v1, $v0, .L802406A4 /* 90FD40 80240690 2402FFFF */ addiu $v0, $zero, -1 /* 90FD44 80240694 080901BC */ j .L802406F0 -/* 90FD48 80240698 00000000 */ nop +/* 90FD48 80240698 00000000 */ nop .L8024069C: /* 90FD4C 8024069C 080901BC */ j .L802406F0 /* 90FD50 802406A0 0240102D */ daddu $v0, $s2, $zero @@ -120,7 +120,7 @@ glabel func_80240520_90FBD0 /* 90FD8C 802406DC 8E620078 */ lw $v0, 0x78($s3) /* 90FD90 802406E0 0222102A */ slt $v0, $s1, $v0 /* 90FD94 802406E4 1440FFF2 */ bnez $v0, .L802406B0 -/* 90FD98 802406E8 00000000 */ nop +/* 90FD98 802406E8 00000000 */ nop .L802406EC: /* 90FD9C 802406EC 2402FFFF */ addiu $v0, $zero, -1 .L802406F0: diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240710_90FDC0.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240710_90FDC0.s index 2a833b7a83..d5e7578f60 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240710_90FDC0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240710_90FDC0.s @@ -38,7 +38,7 @@ glabel func_80240710_90FDC0 /* 90FE44 80240794 2402000F */ addiu $v0, $zero, 0xf /* 90FE48 80240798 AFA2001C */ sw $v0, 0x1c($sp) /* 90FE4C 8024079C 44833000 */ mtc1 $v1, $f6 -/* 90FE50 802407A0 00000000 */ nop +/* 90FE50 802407A0 00000000 */ nop /* 90FE54 802407A4 468031A0 */ cvt.s.w $f6, $f6 /* 90FE58 802407A8 44073000 */ mfc1 $a3, $f6 /* 90FE5C 802407AC 27A20028 */ addiu $v0, $sp, 0x28 @@ -60,15 +60,15 @@ glabel func_80240710_90FDC0 /* 90FE98 802407E8 0040202D */ daddu $a0, $v0, $zero /* 90FE9C 802407EC 2402FFFF */ addiu $v0, $zero, -1 /* 90FEA0 802407F0 10820010 */ beq $a0, $v0, .L80240834 -/* 90FEA4 802407F4 00000000 */ nop +/* 90FEA4 802407F4 00000000 */ nop /* 90FEA8 802407F8 0C00FB3A */ jal get_enemy -/* 90FEAC 802407FC 00000000 */ nop +/* 90FEAC 802407FC 00000000 */ nop /* 90FEB0 80240800 8C42006C */ lw $v0, 0x6c($v0) /* 90FEB4 80240804 1440000B */ bnez $v0, .L80240834 -/* 90FEB8 80240808 00000000 */ nop +/* 90FEB8 80240808 00000000 */ nop /* 90FEBC 8024080C 8602008C */ lh $v0, 0x8c($s0) /* 90FEC0 80240810 14400008 */ bnez $v0, .L80240834 -/* 90FEC4 80240814 00000000 */ nop +/* 90FEC4 80240814 00000000 */ nop /* 90FEC8 80240818 8E2200CC */ lw $v0, 0xcc($s1) /* 90FECC 8024081C 8C420020 */ lw $v0, 0x20($v0) /* 90FED0 80240820 AE020028 */ sw $v0, 0x28($s0) diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240854_90FF04.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240854_90FF04.s index 7d26b2e095..ba7101a535 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240854_90FF04.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240854_90FF04.s @@ -17,7 +17,7 @@ glabel func_80240854_90FF04 /* 90FF34 80240884 A602008E */ sh $v0, 0x8e($s0) /* 90FF38 80240888 00021400 */ sll $v0, $v0, 0x10 /* 90FF3C 8024088C 1C40002B */ bgtz $v0, .L8024093C -/* 90FF40 80240890 00000000 */ nop +/* 90FF40 80240890 00000000 */ nop /* 90FF44 80240894 0C090148 */ jal func_80240520_90FBD0 /* 90FF48 80240898 0240202D */ daddu $a0, $s2, $zero /* 90FF4C 8024089C 0040202D */ daddu $a0, $v0, $zero @@ -35,7 +35,7 @@ glabel func_80240854_90FF04 /* 90FF7C 802408CC 3C01C1A0 */ lui $at, 0xc1a0 /* 90FF80 802408D0 44812000 */ mtc1 $at, $f4 /* 90FF84 802408D4 44833000 */ mtc1 $v1, $f6 -/* 90FF88 802408D8 00000000 */ nop +/* 90FF88 802408D8 00000000 */ nop /* 90FF8C 802408DC 468031A0 */ cvt.s.w $f6, $f6 /* 90FF90 802408E0 44073000 */ mfc1 $a3, $f6 /* 90FF94 802408E4 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240A7C_91012C.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240A7C_91012C.s index 3cbd8cfc52..7b1d69a569 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240A7C_91012C.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240A7C_91012C.s @@ -47,7 +47,7 @@ glabel func_80240A7C_91012C /* 9101D0 80240B20 8E6200B0 */ lw $v0, 0xb0($s3) /* 9101D4 80240B24 30420004 */ andi $v0, $v0, 4 /* 9101D8 80240B28 10400019 */ beqz $v0, .L80240B90 -/* 9101DC 80240B2C 00000000 */ nop +/* 9101DC 80240B2C 00000000 */ nop .L80240B30: /* 9101E0 80240B30 34630102 */ ori $v1, $v1, 0x102 /* 9101E4 80240B34 AEE00070 */ sw $zero, 0x70($s7) @@ -83,12 +83,12 @@ glabel func_80240A7C_91012C /* 910258 80240BA8 10600007 */ beqz $v1, .L80240BC8 /* 91025C 80240BAC 0000102D */ daddu $v0, $zero, $zero /* 910260 80240BB0 080903E3 */ j .L80240F8C -/* 910264 80240BB4 00000000 */ nop +/* 910264 80240BB4 00000000 */ nop .L80240BB8: /* 910268 80240BB8 1062005B */ beq $v1, $v0, .L80240D28 /* 91026C 80240BBC 0000102D */ daddu $v0, $zero, $zero /* 910270 80240BC0 080903E3 */ j .L80240F8C -/* 910274 80240BC4 00000000 */ nop +/* 910274 80240BC4 00000000 */ nop .L80240BC8: /* 910278 80240BC8 8E420000 */ lw $v0, ($s2) /* 91027C 80240BCC 0240202D */ daddu $a0, $s2, $zero @@ -131,17 +131,17 @@ glabel func_80240A7C_91012C /* 91030C 80240C5C C6400038 */ lwc1 $f0, 0x38($s2) /* 910310 80240C60 4600020D */ trunc.w.s $f8, $f0 /* 910314 80240C64 44024000 */ mfc1 $v0, $f8 -/* 910318 80240C68 00000000 */ nop +/* 910318 80240C68 00000000 */ nop /* 91031C 80240C6C A6620010 */ sh $v0, 0x10($s3) /* 910320 80240C70 C640003C */ lwc1 $f0, 0x3c($s2) /* 910324 80240C74 4600020D */ trunc.w.s $f8, $f0 /* 910328 80240C78 44024000 */ mfc1 $v0, $f8 -/* 91032C 80240C7C 00000000 */ nop +/* 91032C 80240C7C 00000000 */ nop /* 910330 80240C80 A6620012 */ sh $v0, 0x12($s3) /* 910334 80240C84 C6400040 */ lwc1 $f0, 0x40($s2) /* 910338 80240C88 4600020D */ trunc.w.s $f8, $f0 /* 91033C 80240C8C 44024000 */ mfc1 $v0, $f8 -/* 910340 80240C90 00000000 */ nop +/* 910340 80240C90 00000000 */ nop /* 910344 80240C94 A6620014 */ sh $v0, 0x14($s3) /* 910348 80240C98 AE400044 */ sw $zero, 0x44($s2) /* 91034C 80240C9C AE400048 */ sw $zero, 0x48($s2) @@ -187,10 +187,10 @@ glabel func_80240A7C_91012C /* 9103E8 80240D38 44810800 */ mtc1 $at, $f1 /* 9103EC 80240D3C 44800000 */ mtc1 $zero, $f0 /* 9103F0 80240D40 44821000 */ mtc1 $v0, $f2 -/* 9103F4 80240D44 00000000 */ nop +/* 9103F4 80240D44 00000000 */ nop /* 9103F8 80240D48 468010A1 */ cvt.d.w $f2, $f2 /* 9103FC 80240D4C 46201082 */ mul.d $f2, $f2, $f0 -/* 910400 80240D50 00000000 */ nop +/* 910400 80240D50 00000000 */ nop /* 910404 80240D54 0200282D */ daddu $a1, $s0, $zero /* 910408 80240D58 C6440038 */ lwc1 $f4, 0x38($s2) /* 91040C 80240D5C C640003C */ lwc1 $f0, 0x3c($s2) @@ -210,13 +210,13 @@ glabel func_80240A7C_91012C /* 910444 80240D94 864200A6 */ lh $v0, 0xa6($s2) /* 910448 80240D98 27B40028 */ addiu $s4, $sp, 0x28 /* 91044C 80240D9C 44820000 */ mtc1 $v0, $f0 -/* 910450 80240DA0 00000000 */ nop +/* 910450 80240DA0 00000000 */ nop /* 910454 80240DA4 46800020 */ cvt.s.w $f0, $f0 /* 910458 80240DA8 E7A00018 */ swc1 $f0, 0x18($sp) /* 91045C 80240DAC 864200A8 */ lh $v0, 0xa8($s2) /* 910460 80240DB0 0280382D */ daddu $a3, $s4, $zero /* 910464 80240DB4 44820000 */ mtc1 $v0, $f0 -/* 910468 80240DB8 00000000 */ nop +/* 910468 80240DB8 00000000 */ nop /* 91046C 80240DBC 46800020 */ cvt.s.w $f0, $f0 /* 910470 80240DC0 0C0376B9 */ jal func_800DDAE4 /* 910474 80240DC4 E7A0001C */ swc1 $f0, 0x1c($sp) @@ -240,14 +240,14 @@ glabel func_80240A7C_91012C /* 9104B8 80240E08 0C0372DF */ jal func_800DCB7C /* 9104BC 80240E0C 0280382D */ daddu $a3, $s4, $zero /* 9104C0 80240E10 10400019 */ beqz $v0, .L80240E78 -/* 9104C4 80240E14 00000000 */ nop +/* 9104C4 80240E14 00000000 */ nop /* 9104C8 80240E18 C640001C */ lwc1 $f0, 0x1c($s2) /* 9104CC 80240E1C C7A2002C */ lwc1 $f2, 0x2c($sp) /* 9104D0 80240E20 46000005 */ abs.s $f0, $f0 /* 9104D4 80240E24 4600103C */ c.lt.s $f2, $f0 -/* 9104D8 80240E28 00000000 */ nop +/* 9104D8 80240E28 00000000 */ nop /* 9104DC 80240E2C 45000012 */ bc1f .L80240E78 -/* 9104E0 80240E30 00000000 */ nop +/* 9104E0 80240E30 00000000 */ nop /* 9104E4 80240E34 C7A40024 */ lwc1 $f4, 0x24($sp) /* 9104E8 80240E38 C6400064 */ lwc1 $f0, 0x64($s2) /* 9104EC 80240E3C 46002001 */ sub.s $f0, $f4, $f0 @@ -257,7 +257,7 @@ glabel func_80240A7C_91012C /* 9104FC 80240E4C 46000005 */ abs.s $f0, $f0 /* 910500 80240E50 46000021 */ cvt.d.s $f0, $f0 /* 910504 80240E54 4622003C */ c.lt.d $f0, $f2 -/* 910508 80240E58 00000000 */ nop +/* 910508 80240E58 00000000 */ nop /* 91050C 80240E5C 45000006 */ bc1f .L80240E78 /* 910510 80240E60 0240202D */ daddu $a0, $s2, $zero /* 910514 80240E64 8E450018 */ lw $a1, 0x18($s2) @@ -272,7 +272,7 @@ glabel func_80240A7C_91012C /* 910534 80240E84 44801000 */ mtc1 $zero, $f2 /* 910538 80240E88 46000021 */ cvt.d.s $f0, $f0 /* 91053C 80240E8C 4622003C */ c.lt.d $f0, $f2 -/* 910540 80240E90 00000000 */ nop +/* 910540 80240E90 00000000 */ nop /* 910544 80240E94 45030001 */ bc1tl .L80240E9C /* 910548 80240E98 2416000B */ addiu $s6, $zero, 0xb .L80240E9C: @@ -288,7 +288,7 @@ glabel func_80240A7C_91012C /* 91056C 80240EBC 8E620070 */ lw $v0, 0x70($s3) /* 910570 80240EC0 30420001 */ andi $v0, $v0, 1 /* 910574 80240EC4 10400009 */ beqz $v0, .L80240EEC -/* 910578 80240EC8 00000000 */ nop +/* 910578 80240EC8 00000000 */ nop /* 91057C 80240ECC C640004C */ lwc1 $f0, 0x4c($s2) /* 910580 80240ED0 3C014044 */ lui $at, 0x4044 /* 910584 80240ED4 44811800 */ mtc1 $at, $f3 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240FB8_910668.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240FB8_910668.s index 9dba1a150b..5408eb166b 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240FB8_910668.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240FB8_910668.s @@ -50,7 +50,7 @@ glabel func_80240FB8_910668 .L80241064: /* 910714 80241064 86240008 */ lh $a0, 8($s1) /* 910718 80241068 0C00FB5A */ jal get_enemy_safe -/* 91071C 8024106C 00000000 */ nop +/* 91071C 8024106C 00000000 */ nop /* 910720 80241070 14400005 */ bnez $v0, .L80241088 /* 910724 80241074 0260202D */ daddu $a0, $s3, $zero /* 910728 80241078 3C05FE36 */ lui $a1, 0xfe36 @@ -60,7 +60,7 @@ glabel func_80240FB8_910668 .L80241088: /* 910738 80241088 86240008 */ lh $a0, 8($s1) /* 91073C 8024108C 0C00EABB */ jal get_npc_unsafe -/* 910740 80241090 00000000 */ nop +/* 910740 80241090 00000000 */ nop /* 910744 80241094 8E630070 */ lw $v1, 0x70($s3) /* 910748 80241098 10600006 */ beqz $v1, .L802410B4 /* 91074C 8024109C 0040802D */ daddu $s0, $v0, $zero @@ -68,7 +68,7 @@ glabel func_80240FB8_910668 /* 910754 802410A4 1062003F */ beq $v1, $v0, .L802411A4 /* 910758 802410A8 0000102D */ daddu $v0, $zero, $zero /* 91075C 802410AC 080904FA */ j .L802413E8 -/* 910760 802410B0 00000000 */ nop +/* 910760 802410B0 00000000 */ nop .L802410B4: /* 910764 802410B4 AFA00010 */ sw $zero, 0x10($sp) /* 910768 802410B8 AFA00014 */ sw $zero, 0x14($sp) @@ -79,7 +79,7 @@ glabel func_80240FB8_910668 /* 91077C 802410CC 24040002 */ addiu $a0, $zero, 2 /* 910780 802410D0 C64C006C */ lwc1 $f12, 0x6c($s2) /* 910784 802410D4 0C00A6C9 */ jal clamp_angle -/* 910788 802410D8 00000000 */ nop +/* 910788 802410D8 00000000 */ nop /* 91078C 802410DC 3C018024 */ lui $at, %hi(D_802463A0) /* 910790 802410E0 D43863A0 */ ldc1 $f24, %lo(D_802463A0)($at) /* 910794 802410E4 46000521 */ cvt.d.s $f20, $f0 @@ -107,7 +107,7 @@ glabel func_80240FB8_910668 /* 9107EC 8024113C 46000306 */ mov.s $f12, $f0 /* 9107F0 80241140 46000021 */ cvt.d.s $f0, $f0 /* 9107F4 80241144 4638003C */ c.lt.d $f0, $f24 -/* 9107F8 80241148 00000000 */ nop +/* 9107F8 80241148 00000000 */ nop /* 9107FC 8024114C 45020002 */ bc1fl .L80241158 /* 910800 80241150 E614000C */ swc1 $f20, 0xc($s0) /* 910804 80241154 E616000C */ swc1 $f22, 0xc($s0) @@ -117,7 +117,7 @@ glabel func_80240FB8_910668 /* 910810 80241160 D42263B0 */ ldc1 $f2, %lo(D_802463B0)($at) /* 910814 80241164 46000021 */ cvt.d.s $f0, $f0 /* 910818 80241168 46220002 */ mul.d $f0, $f0, $f2 -/* 91081C 8024116C 00000000 */ nop +/* 91081C 8024116C 00000000 */ nop /* 910820 80241170 3C013F66 */ lui $at, 0x3f66 /* 910824 80241174 34216666 */ ori $at, $at, 0x6666 /* 910828 80241178 44812000 */ mtc1 $at, $f4 @@ -147,13 +147,13 @@ glabel func_80240FB8_910668 /* 910884 802411D4 860200A6 */ lh $v0, 0xa6($s0) /* 910888 802411D8 27A60024 */ addiu $a2, $sp, 0x24 /* 91088C 802411DC 44820000 */ mtc1 $v0, $f0 -/* 910890 802411E0 00000000 */ nop +/* 910890 802411E0 00000000 */ nop /* 910894 802411E4 46800020 */ cvt.s.w $f0, $f0 /* 910898 802411E8 E7A00018 */ swc1 $f0, 0x18($sp) /* 91089C 802411EC 860200A8 */ lh $v0, 0xa8($s0) /* 9108A0 802411F0 27A70028 */ addiu $a3, $sp, 0x28 /* 9108A4 802411F4 44820000 */ mtc1 $v0, $f0 -/* 9108A8 802411F8 00000000 */ nop +/* 9108A8 802411F8 00000000 */ nop /* 9108AC 802411FC 46800020 */ cvt.s.w $f0, $f0 /* 9108B0 80241200 0C037711 */ jal func_800DDC44 /* 9108B4 80241204 E7A0001C */ swc1 $f0, 0x1c($sp) @@ -173,7 +173,7 @@ glabel func_80240FB8_910668 /* 9108E4 80241234 44801800 */ mtc1 $zero, $f3 /* 9108E8 80241238 46000021 */ cvt.d.s $f0, $f0 /* 9108EC 8024123C 4622003C */ c.lt.d $f0, $f2 -/* 9108F0 80241240 00000000 */ nop +/* 9108F0 80241240 00000000 */ nop /* 9108F4 80241244 45000028 */ bc1f .L802412E8 /* 9108F8 80241248 27A50020 */ addiu $a1, $sp, 0x20 /* 9108FC 8024124C 27A60024 */ addiu $a2, $sp, 0x24 @@ -204,7 +204,7 @@ glabel func_80240FB8_910668 /* 910960 802412B0 0C0372DF */ jal func_800DCB7C /* 910964 802412B4 27A70028 */ addiu $a3, $sp, 0x28 /* 910968 802412B8 1040000B */ beqz $v0, .L802412E8 -/* 91096C 802412BC 00000000 */ nop +/* 91096C 802412BC 00000000 */ nop /* 910970 802412C0 C600001C */ lwc1 $f0, 0x1c($s0) /* 910974 802412C4 C7A2002C */ lwc1 $f2, 0x2c($sp) /* 910978 802412C8 46000005 */ abs.s $f0, $f0 @@ -212,7 +212,7 @@ glabel func_80240FB8_910668 /* 910980 802412D0 46340000 */ add.d $f0, $f0, $f20 /* 910984 802412D4 460010A1 */ cvt.d.s $f2, $f2 /* 910988 802412D8 4620103E */ c.le.d $f2, $f0 -/* 91098C 802412DC 00000000 */ nop +/* 91098C 802412DC 00000000 */ nop /* 910990 802412E0 45030001 */ bc1tl .L802412E8 /* 910994 802412E4 24120001 */ addiu $s2, $zero, 1 .L802412E8: @@ -234,7 +234,7 @@ glabel func_80240FB8_910668 /* 9109D0 80241320 2414000B */ addiu $s4, $zero, 0xb .L80241324: /* 9109D4 80241324 12800024 */ beqz $s4, .L802413B8 -/* 9109D8 80241328 00000000 */ nop +/* 9109D8 80241328 00000000 */ nop /* 9109DC 8024132C AFA00010 */ sw $zero, 0x10($sp) /* 9109E0 80241330 AFA00014 */ sw $zero, 0x14($sp) /* 9109E4 80241334 8E050038 */ lw $a1, 0x38($s0) @@ -268,7 +268,7 @@ glabel func_80240FB8_910668 /* 910A54 802413A4 AC800070 */ sw $zero, 0x70($a0) .L802413A8: /* 910A58 802413A8 0C0B2026 */ jal set_variable -/* 910A5C 802413AC 00000000 */ nop +/* 910A5C 802413AC 00000000 */ nop /* 910A60 802413B0 080904FA */ j .L802413E8 /* 910A64 802413B4 24020002 */ addiu $v0, $zero, 2 .L802413B8: diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241414_910AC4.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241414_910AC4.s index b2a284e417..6c9686756e 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241414_910AC4.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241414_910AC4.s @@ -31,7 +31,7 @@ glabel func_80241414_910AC4 /* 910B2C 8024147C 0220282D */ daddu $a1, $s1, $zero /* 910B30 80241480 AFA00010 */ sw $zero, 0x10($sp) /* 910B34 80241484 4620A502 */ mul.d $f20, $f20, $f0 -/* 910B38 80241488 00000000 */ nop +/* 910B38 80241488 00000000 */ nop /* 910B3C 8024148C 00028080 */ sll $s0, $v0, 2 /* 910B40 80241490 02028021 */ addu $s0, $s0, $v0 /* 910B44 80241494 00108080 */ sll $s0, $s0, 2 @@ -53,9 +53,9 @@ glabel func_80241414_910AC4 /* 910B84 802414D4 D42263C0 */ ldc1 $f2, %lo(D_802463C0)($at) /* 910B88 802414D8 46000021 */ cvt.d.s $f0, $f0 /* 910B8C 802414DC 4622003C */ c.lt.d $f0, $f2 -/* 910B90 802414E0 00000000 */ nop +/* 910B90 802414E0 00000000 */ nop /* 910B94 802414E4 45000003 */ bc1f .L802414F4 -/* 910B98 802414E8 00000000 */ nop +/* 910B98 802414E8 00000000 */ nop /* 910B9C 802414EC 3C0142B4 */ lui $at, 0x42b4 /* 910BA0 802414F0 4481C000 */ mtc1 $at, $f24 .L802414F4: @@ -76,7 +76,7 @@ glabel func_80241414_910AC4 /* 910BDC 8024152C 44801000 */ mtc1 $zero, $f2 /* 910BE0 80241530 46000021 */ cvt.d.s $f0, $f0 /* 910BE4 80241534 4620103C */ c.lt.d $f2, $f0 -/* 910BE8 80241538 00000000 */ nop +/* 910BE8 80241538 00000000 */ nop /* 910BEC 8024153C 45030001 */ bc1tl .L80241544 /* 910BF0 80241540 0000802D */ daddu $s0, $zero, $zero .L80241544: @@ -88,10 +88,10 @@ glabel func_80241414_910AC4 /* 910C08 80241558 848200B2 */ lh $v0, 0xb2($a0) /* 910C0C 8024155C 00431021 */ addu $v0, $v0, $v1 /* 910C10 80241560 44821000 */ mtc1 $v0, $f2 -/* 910C14 80241564 00000000 */ nop +/* 910C14 80241564 00000000 */ nop /* 910C18 80241568 468010A0 */ cvt.s.w $f2, $f2 /* 910C1C 8024156C 4602003C */ c.lt.s $f0, $f2 -/* 910C20 80241570 00000000 */ nop +/* 910C20 80241570 00000000 */ nop /* 910C24 80241574 45030001 */ bc1tl .L8024157C /* 910C28 80241578 0000802D */ daddu $s0, $zero, $zero .L8024157C: @@ -102,7 +102,7 @@ glabel func_80241414_910AC4 /* 910C3C 8024158C 44811000 */ mtc1 $at, $f2 /* 910C40 80241590 46000005 */ abs.s $f0, $f0 /* 910C44 80241594 4600103E */ c.le.s $f2, $f0 -/* 910C48 80241598 00000000 */ nop +/* 910C48 80241598 00000000 */ nop /* 910C4C 8024159C 45030001 */ bc1tl .L802415A4 /* 910C50 802415A0 0000802D */ daddu $s0, $zero, $zero .L802415A4: diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802415E0_910C90.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802415E0_910C90.s index 6ee86b6d24..f5bc033cbe 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802415E0_910C90.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802415E0_910C90.s @@ -30,7 +30,7 @@ glabel func_802415E0_910C90 /* 910CF4 80241644 A603008E */ sh $v1, 0x8e($s0) /* 910CF8 80241648 C60C000C */ lwc1 $f12, 0xc($s0) /* 910CFC 8024164C 44820000 */ mtc1 $v0, $f0 -/* 910D00 80241650 00000000 */ nop +/* 910D00 80241650 00000000 */ nop /* 910D04 80241654 46800020 */ cvt.s.w $f0, $f0 /* 910D08 80241658 46006300 */ add.s $f12, $f12, $f0 /* 910D0C 8024165C 3C0141F0 */ lui $at, 0x41f0 @@ -41,7 +41,7 @@ glabel func_802415E0_910C90 /* 910D20 80241670 8E2200D0 */ lw $v0, 0xd0($s1) /* 910D24 80241674 8C420014 */ lw $v0, 0x14($v0) /* 910D28 80241678 04410004 */ bgez $v0, .L8024168C -/* 910D2C 8024167C 00000000 */ nop +/* 910D2C 8024167C 00000000 */ nop /* 910D30 80241680 C6400000 */ lwc1 $f0, ($s2) /* 910D34 80241684 080905AB */ j .L802416AC /* 910D38 80241688 E6000018 */ swc1 $f0, 0x18($s0) @@ -49,7 +49,7 @@ glabel func_802415E0_910C90 /* 910D3C 8024168C 3C018024 */ lui $at, %hi(D_802463C8) /* 910D40 80241690 D42263C8 */ ldc1 $f2, %lo(D_802463C8)($at) /* 910D44 80241694 44820000 */ mtc1 $v0, $f0 -/* 910D48 80241698 00000000 */ nop +/* 910D48 80241698 00000000 */ nop /* 910D4C 8024169C 46800021 */ cvt.d.w $f0, $f0 /* 910D50 802416A0 46220003 */ div.d $f0, $f0, $f2 /* 910D54 802416A4 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802416F0_910DA0.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802416F0_910DA0.s index 56f9d9dcf3..b3aba847b6 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802416F0_910DA0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802416F0_910DA0.s @@ -37,7 +37,7 @@ glabel func_802416F0_910DA0 /* 910E20 80241770 0C0123F5 */ jal is_point_within_region /* 910E24 80241774 8E070038 */ lw $a3, 0x38($s0) /* 910E28 80241778 1040000D */ beqz $v0, .L802417B0 -/* 910E2C 8024177C 00000000 */ nop +/* 910E2C 8024177C 00000000 */ nop /* 910E30 80241780 8E2200D0 */ lw $v0, 0xd0($s1) /* 910E34 80241784 C60C0038 */ lwc1 $f12, 0x38($s0) /* 910E38 80241788 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -48,7 +48,7 @@ glabel func_802416F0_910DA0 /* 910E4C 8024179C 468031A0 */ cvt.s.w $f6, $f6 /* 910E50 802417A0 44073000 */ mfc1 $a3, $f6 /* 910E54 802417A4 0C00A720 */ jal atan2 -/* 910E58 802417A8 00000000 */ nop +/* 910E58 802417A8 00000000 */ nop /* 910E5C 802417AC E600000C */ swc1 $f0, 0xc($s0) .L802417B0: /* 910E60 802417B0 C6000038 */ lwc1 $f0, 0x38($s0) @@ -63,7 +63,7 @@ glabel func_802416F0_910DA0 /* 910E84 802417D4 860200A6 */ lh $v0, 0xa6($s0) /* 910E88 802417D8 C6020018 */ lwc1 $f2, 0x18($s0) /* 910E8C 802417DC 44820000 */ mtc1 $v0, $f0 -/* 910E90 802417E0 00000000 */ nop +/* 910E90 802417E0 00000000 */ nop /* 910E94 802417E4 46800020 */ cvt.s.w $f0, $f0 /* 910E98 802417E8 46001080 */ add.s $f2, $f2, $f0 /* 910E9C 802417EC 8E06000C */ lw $a2, 0xc($s0) @@ -81,15 +81,15 @@ glabel func_802416F0_910DA0 /* 910ECC 8024181C 0C0372DF */ jal func_800DCB7C /* 910ED0 80241820 AFA20010 */ sw $v0, 0x10($sp) /* 910ED4 80241824 1040000D */ beqz $v0, .L8024185C -/* 910ED8 80241828 00000000 */ nop +/* 910ED8 80241828 00000000 */ nop /* 910EDC 8024182C C7A20360 */ lwc1 $f2, 0x360($sp) /* 910EE0 80241830 3C0140A0 */ lui $at, 0x40a0 /* 910EE4 80241834 44810000 */ mtc1 $at, $f0 -/* 910EE8 80241838 00000000 */ nop +/* 910EE8 80241838 00000000 */ nop /* 910EEC 8024183C 4600103C */ c.lt.s $f2, $f0 -/* 910EF0 80241840 00000000 */ nop +/* 910EF0 80241840 00000000 */ nop /* 910EF4 80241844 45000005 */ bc1f .L8024185C -/* 910EF8 80241848 00000000 */ nop +/* 910EF8 80241848 00000000 */ nop /* 910EFC 8024184C 8E050018 */ lw $a1, 0x18($s0) /* 910F00 80241850 8E06000C */ lw $a2, 0xc($s0) /* 910F04 80241854 0C00EA95 */ jal npc_move_heading @@ -102,7 +102,7 @@ glabel func_802416F0_910DA0 .L8024186C: /* 910F1C 8024186C 8E630014 */ lw $v1, 0x14($s3) /* 910F20 80241870 04600012 */ bltz $v1, .L802418BC -/* 910F24 80241874 00000000 */ nop +/* 910F24 80241874 00000000 */ nop /* 910F28 80241878 8E420074 */ lw $v0, 0x74($s2) /* 910F2C 8024187C 1C40000E */ bgtz $v0, .L802418B8 /* 910F30 80241880 2442FFFF */ addiu $v0, $v0, -1 @@ -126,16 +126,16 @@ glabel func_802416F0_910DA0 /* 910F6C 802418BC 8E020000 */ lw $v0, ($s0) /* 910F70 802418C0 30421008 */ andi $v0, $v0, 0x1008 /* 910F74 802418C4 1440000B */ bnez $v0, .L802418F4 -/* 910F78 802418C8 00000000 */ nop +/* 910F78 802418C8 00000000 */ nop /* 910F7C 802418CC C6000038 */ lwc1 $f0, 0x38($s0) /* 910F80 802418D0 C6020040 */ lwc1 $f2, 0x40($s0) /* 910F84 802418D4 4600018D */ trunc.w.s $f6, $f0 /* 910F88 802418D8 44023000 */ mfc1 $v0, $f6 -/* 910F8C 802418DC 00000000 */ nop +/* 910F8C 802418DC 00000000 */ nop /* 910F90 802418E0 A6020090 */ sh $v0, 0x90($s0) /* 910F94 802418E4 4600118D */ trunc.w.s $f6, $f2 /* 910F98 802418E8 44023000 */ mfc1 $v0, $f6 -/* 910F9C 802418EC 00000000 */ nop +/* 910F9C 802418EC 00000000 */ nop /* 910FA0 802418F0 A6020094 */ sh $v0, 0x94($s0) .L802418F4: /* 910FA4 802418F4 9602008E */ lhu $v0, 0x8e($s0) diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241A4C_9110FC.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241A4C_9110FC.s index a88fc67457..fe3820bed2 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241A4C_9110FC.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241A4C_9110FC.s @@ -26,7 +26,7 @@ glabel func_80241A4C_9110FC /* 911150 80241AA0 D42263D0 */ ldc1 $f2, %lo(D_802463D0)($at) /* 911154 80241AA4 46000021 */ cvt.d.s $f0, $f0 /* 911158 80241AA8 46220002 */ mul.d $f0, $f0, $f2 -/* 91115C 80241AAC 00000000 */ nop +/* 91115C 80241AAC 00000000 */ nop /* 911160 80241AB0 8E470010 */ lw $a3, 0x10($s2) /* 911164 80241AB4 46200020 */ cvt.s.d $f0, $f0 /* 911168 80241AB8 44060000 */ mfc1 $a2, $f0 @@ -47,7 +47,7 @@ glabel func_80241A4C_9110FC /* 9111A4 80241AF4 2402000F */ addiu $v0, $zero, 0xf /* 9111A8 80241AF8 AFA2001C */ sw $v0, 0x1c($sp) /* 9111AC 80241AFC 44833000 */ mtc1 $v1, $f6 -/* 9111B0 80241B00 00000000 */ nop +/* 9111B0 80241B00 00000000 */ nop /* 9111B4 80241B04 468031A0 */ cvt.s.w $f6, $f6 /* 9111B8 80241B08 44073000 */ mfc1 $a3, $f6 /* 9111BC 80241B0C 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241B74_911224.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241B74_911224.s index c9fb0f2f07..39f186e834 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241B74_911224.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241B74_911224.s @@ -19,7 +19,7 @@ glabel func_80241B74_911224 /* 91125C 80241BAC 00021400 */ sll $v0, $v0, 0x10 /* 911260 80241BB0 00021403 */ sra $v0, $v0, 0x10 /* 911264 80241BB4 14430008 */ bne $v0, $v1, .L80241BD8 -/* 911268 80241BB8 00000000 */ nop +/* 911268 80241BB8 00000000 */ nop /* 91126C 80241BBC 86240008 */ lh $a0, 8($s1) /* 911270 80241BC0 0C00FB3A */ jal get_enemy /* 911274 80241BC4 24840001 */ addiu $a0, $a0, 1 @@ -31,7 +31,7 @@ glabel func_80241B74_911224 /* 911288 80241BD8 8602008E */ lh $v0, 0x8e($s0) /* 91128C 80241BDC 28420008 */ slti $v0, $v0, 8 /* 911290 80241BE0 10400012 */ beqz $v0, .L80241C2C -/* 911294 80241BE4 00000000 */ nop +/* 911294 80241BE4 00000000 */ nop /* 911298 80241BE8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 91129C 80241BEC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* 9112A0 80241BF0 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -44,7 +44,7 @@ glabel func_80241B74_911224 /* 9112BC 80241C0C 44801000 */ mtc1 $zero, $f2 /* 9112C0 80241C10 46000021 */ cvt.d.s $f0, $f0 /* 9112C4 80241C14 4620103C */ c.lt.d $f2, $f0 -/* 9112C8 80241C18 00000000 */ nop +/* 9112C8 80241C18 00000000 */ nop /* 9112CC 80241C1C 45000003 */ bc1f .L80241C2C /* 9112D0 80241C20 3C02002F */ lui $v0, 0x2f /* 9112D4 80241C24 34420015 */ ori $v0, $v0, 0x15 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241CF0_9113A0.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241CF0_9113A0.s index 711cb71b1d..23ee6b6bc4 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241CF0_9113A0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241CF0_9113A0.s @@ -25,7 +25,7 @@ glabel func_80241CF0_9113A0 .L80241D40: /* 9113F0 80241D40 8482008E */ lh $v0, 0x8e($a0) /* 9113F4 80241D44 1C400005 */ bgtz $v0, .L80241D5C -/* 9113F8 80241D48 00000000 */ nop +/* 9113F8 80241D48 00000000 */ nop /* 9113FC 80241D4C 8C820000 */ lw $v0, ($a0) /* 911400 80241D50 34420002 */ ori $v0, $v0, 2 /* 911404 80241D54 AC820000 */ sw $v0, ($a0) diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241D70_911420.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241D70_911420.s index 14e5a97f35..554e82a5c9 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241D70_911420.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241D70_911420.s @@ -56,7 +56,7 @@ glabel func_80241D70_911420 /* 9114E8 80241E38 8E4300B0 */ lw $v1, 0xb0($s2) /* 9114EC 80241E3C 30620004 */ andi $v0, $v1, 4 /* 9114F0 80241E40 10400007 */ beqz $v0, .L80241E60 -/* 9114F4 80241E44 00000000 */ nop +/* 9114F4 80241E44 00000000 */ nop /* 9114F8 80241E48 824200B4 */ lb $v0, 0xb4($s2) /* 9114FC 80241E4C 1440003E */ bnez $v0, .L80241F48 /* 911500 80241E50 0000102D */ daddu $v0, $zero, $zero @@ -68,25 +68,29 @@ glabel func_80241D70_911420 /* 911514 80241E64 2C620016 */ sltiu $v0, $v1, 0x16 /* 911518 80241E68 10400036 */ beqz $v0, .L80241F44 /* 91151C 80241E6C 00031080 */ sll $v0, $v1, 2 -/* 911520 80241E70 3C018024 */ lui $at, %hi(D_802463D8) +/* 911520 80241E70 3C018024 */ lui $at, %hi(jtbl_802463D8_915A88) /* 911524 80241E74 00220821 */ addu $at, $at, $v0 -/* 911528 80241E78 8C2263D8 */ lw $v0, %lo(D_802463D8)($at) +/* 911528 80241E78 8C2263D8 */ lw $v0, %lo(jtbl_802463D8_915A88)($at) /* 91152C 80241E7C 00400008 */ jr $v0 -/* 911530 80241E80 00000000 */ nop +/* 911530 80241E80 00000000 */ nop +glabel L80241E84_911534 /* 911534 80241E84 0280202D */ daddu $a0, $s4, $zero /* 911538 80241E88 0200282D */ daddu $a1, $s0, $zero /* 91153C 80241E8C 0C090578 */ jal func_802415E0_910C90 /* 911540 80241E90 0260302D */ daddu $a2, $s3, $zero +glabel L80241E94_911544 /* 911544 80241E94 0280202D */ daddu $a0, $s4, $zero /* 911548 80241E98 0200282D */ daddu $a1, $s0, $zero /* 91154C 80241E9C 0C0905BC */ jal func_802416F0_910DA0 /* 911550 80241EA0 0260302D */ daddu $a2, $s3, $zero /* 911554 80241EA4 080907D2 */ j .L80241F48 /* 911558 80241EA8 0000102D */ daddu $v0, $zero, $zero +glabel L80241EAC_91155C /* 91155C 80241EAC 0280202D */ daddu $a0, $s4, $zero /* 911560 80241EB0 0200282D */ daddu $a1, $s0, $zero /* 911564 80241EB4 0C09064B */ jal func_8024192C_910FDC /* 911568 80241EB8 0260302D */ daddu $a2, $s3, $zero +glabel L80241EBC_91156C /* 91156C 80241EBC 0280202D */ daddu $a0, $s4, $zero /* 911570 80241EC0 0200282D */ daddu $a1, $s0, $zero /* 911574 80241EC4 0C090670 */ jal func_802419C0_911070 @@ -95,6 +99,7 @@ glabel func_80241D70_911420 /* 911580 80241ED0 2402000E */ addiu $v0, $zero, 0xe /* 911584 80241ED4 1462001C */ bne $v1, $v0, .L80241F48 /* 911588 80241ED8 0000102D */ daddu $v0, $zero, $zero +glabel L80241EDC_91158C /* 91158C 80241EDC 0280202D */ daddu $a0, $s4, $zero /* 911590 80241EE0 0200282D */ daddu $a1, $s0, $zero /* 911594 80241EE4 0C090693 */ jal func_80241A4C_9110FC @@ -103,6 +108,7 @@ glabel func_80241D70_911420 /* 9115A0 80241EF0 2402000F */ addiu $v0, $zero, 0xf /* 9115A4 80241EF4 14620014 */ bne $v1, $v0, .L80241F48 /* 9115A8 80241EF8 0000102D */ daddu $v0, $zero, $zero +glabel L80241EFC_9115AC /* 9115AC 80241EFC 0280202D */ daddu $a0, $s4, $zero /* 9115B0 80241F00 0200282D */ daddu $a1, $s0, $zero /* 9115B4 80241F04 0C0906DD */ jal func_80241B74_911224 @@ -111,17 +117,20 @@ glabel func_80241D70_911420 /* 9115C0 80241F10 24020010 */ addiu $v0, $zero, 0x10 /* 9115C4 80241F14 1462000C */ bne $v1, $v0, .L80241F48 /* 9115C8 80241F18 0000102D */ daddu $v0, $zero, $zero +glabel L80241F1C_9115CC /* 9115CC 80241F1C 0280202D */ daddu $a0, $s4, $zero /* 9115D0 80241F20 0200282D */ daddu $a1, $s0, $zero /* 9115D4 80241F24 0C09071E */ jal func_80241C78_911328 /* 9115D8 80241F28 0260302D */ daddu $a2, $s3, $zero /* 9115DC 80241F2C 080907D2 */ j .L80241F48 /* 9115E0 80241F30 0000102D */ daddu $v0, $zero, $zero +glabel L80241F34_9115E4 /* 9115E4 80241F34 0280202D */ daddu $a0, $s4, $zero /* 9115E8 80241F38 0200282D */ daddu $a1, $s0, $zero /* 9115EC 80241F3C 0C09073C */ jal func_80241CF0_9113A0 /* 9115F0 80241F40 0260302D */ daddu $a2, $s3, $zero .L80241F44: +glabel L80241F44_9115F4 /* 9115F4 80241F44 0000102D */ daddu $v0, $zero, $zero .L80241F48: /* 9115F8 80241F48 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s index 9f58dafa23..f444a552e3 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s @@ -103,41 +103,48 @@ glabel func_80241F6C_91161C /* 91178C 802420DC 2C620064 */ sltiu $v0, $v1, 0x64 /* 911790 802420E0 10400060 */ beqz $v0, .L80242264 /* 911794 802420E4 00031080 */ sll $v0, $v1, 2 -/* 911798 802420E8 3C018024 */ lui $at, %hi(D_80246430) +/* 911798 802420E8 3C018024 */ lui $at, %hi(jtbl_80246430_915AE0) /* 91179C 802420EC 00220821 */ addu $at, $at, $v0 -/* 9117A0 802420F0 8C226430 */ lw $v0, %lo(D_80246430)($at) +/* 9117A0 802420F0 8C226430 */ lw $v0, %lo(jtbl_80246430_915AE0)($at) /* 9117A4 802420F4 00400008 */ jr $v0 /* 9117A8 802420F8 00000000 */ nop +glabel L802420FC_9117AC /* 9117AC 802420FC 0260202D */ daddu $a0, $s3, $zero /* 9117B0 80242100 0200282D */ daddu $a1, $s0, $zero /* 9117B4 80242104 0C012568 */ jal func_800495A0 /* 9117B8 80242108 02A0302D */ daddu $a2, $s5, $zero +glabel L8024210C_9117BC /* 9117BC 8024210C 0260202D */ daddu $a0, $s3, $zero /* 9117C0 80242110 0200282D */ daddu $a1, $s0, $zero /* 9117C4 80242114 0C0125AE */ jal func_800496B8 /* 9117C8 80242118 02A0302D */ daddu $a2, $s5, $zero /* 9117CC 8024211C 08090899 */ j .L80242264 /* 9117D0 80242120 00000000 */ nop +glabel L80242124_9117D4 /* 9117D4 80242124 0260202D */ daddu $a0, $s3, $zero /* 9117D8 80242128 0200282D */ daddu $a1, $s0, $zero /* 9117DC 8024212C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* 9117E0 80242130 02A0302D */ daddu $a2, $s5, $zero +glabel L80242134_9117E4 /* 9117E4 80242134 0260202D */ daddu $a0, $s3, $zero /* 9117E8 80242138 0200282D */ daddu $a1, $s0, $zero /* 9117EC 8024213C 0C012701 */ jal func_80049C04 /* 9117F0 80242140 02A0302D */ daddu $a2, $s5, $zero /* 9117F4 80242144 08090899 */ j .L80242264 /* 9117F8 80242148 00000000 */ nop +glabel L8024214C_9117FC /* 9117FC 8024214C 0260202D */ daddu $a0, $s3, $zero /* 911800 80242150 0200282D */ daddu $a1, $s0, $zero /* 911804 80242154 0C01278F */ jal func_80049E3C /* 911808 80242158 02A0302D */ daddu $a2, $s5, $zero +glabel L8024215C_91180C /* 91180C 8024215C 0260202D */ daddu $a0, $s3, $zero /* 911810 80242160 0200282D */ daddu $a1, $s0, $zero /* 911814 80242164 0C0127B3 */ jal func_80049ECC /* 911818 80242168 02A0302D */ daddu $a2, $s5, $zero /* 91181C 8024216C 08090899 */ j .L80242264 /* 911820 80242170 00000000 */ nop +glabel L80242174_911824 /* 911824 80242174 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 911828 80242178 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* 91182C 8024217C C68C0038 */ lwc1 $f12, 0x38($s4) @@ -170,37 +177,45 @@ glabel func_80241F6C_91161C /* 911890 802421E0 0200282D */ daddu $a1, $s0, $zero /* 911894 802421E4 0C0127DF */ jal func_80049F7C /* 911898 802421E8 02A0302D */ daddu $a2, $s5, $zero +glabel L802421EC_91189C /* 91189C 802421EC 0260202D */ daddu $a0, $s3, $zero /* 9118A0 802421F0 0200282D */ daddu $a1, $s0, $zero /* 9118A4 802421F4 0C012849 */ jal func_8004A124 /* 9118A8 802421F8 02A0302D */ daddu $a2, $s5, $zero /* 9118AC 802421FC 08090899 */ j .L80242264 /* 9118B0 80242200 00000000 */ nop +glabel L80242204_9118B4 /* 9118B4 80242204 0260202D */ daddu $a0, $s3, $zero /* 9118B8 80242208 0200282D */ daddu $a1, $s0, $zero /* 9118BC 8024220C 0C0128FA */ jal func_8004A3E8 /* 9118C0 80242210 02A0302D */ daddu $a2, $s5, $zero /* 9118C4 80242214 08090899 */ j .L80242264 /* 9118C8 80242218 00000000 */ nop +glabel L8024221C_9118CC /* 9118CC 8024221C 0C090215 */ jal func_80240854_90FF04 /* 9118D0 80242220 0260202D */ daddu $a0, $s3, $zero /* 9118D4 80242224 08090899 */ j .L80242264 /* 9118D8 80242228 00000000 */ nop +glabel L8024222C_9118DC /* 9118DC 8024222C 0C090255 */ jal iwa_01_UnkSetDurationFunc /* 9118E0 80242230 0260202D */ daddu $a0, $s3, $zero /* 9118E4 80242234 08090899 */ j .L80242264 /* 9118E8 80242238 00000000 */ nop +glabel L8024223C_9118EC /* 9118EC 8024223C 0C090266 */ jal iwa_01_UnkNpcAIFunc9 /* 9118F0 80242240 0260202D */ daddu $a0, $s3, $zero /* 9118F4 80242244 08090899 */ j .L80242264 /* 9118F8 80242248 00000000 */ nop +glabel L8024224C_9118FC /* 9118FC 8024224C 0C09028E */ jal iwa_01_UnkDurationCheck /* 911900 80242250 0260202D */ daddu $a0, $s3, $zero /* 911904 80242254 08090899 */ j .L80242264 /* 911908 80242258 00000000 */ nop +glabel L8024225C_91190C /* 91190C 8024225C 0C0129CF */ jal func_8004A73C /* 911910 80242260 0260202D */ daddu $a0, $s3, $zero .L80242264: +glabel L80242264_911914 /* 911914 80242264 8FBF0048 */ lw $ra, 0x48($sp) /* 911918 80242268 8FB50044 */ lw $s5, 0x44($sp) /* 91191C 8024226C 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4_911974.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4_911974.s index 7145e63b92..030b43bf0b 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4_911974.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4_911974.s @@ -42,9 +42,9 @@ glabel func_802422C4_911974 /* 911A08 80242358 D42265C0 */ ldc1 $f2, %lo(D_802465C0)($at) /* 911A0C 8024235C 46000021 */ cvt.d.s $f0, $f0 /* 911A10 80242360 4622003C */ c.lt.d $f0, $f2 -/* 911A14 80242364 00000000 */ nop +/* 911A14 80242364 00000000 */ nop /* 911A18 80242368 45000003 */ bc1f .L80242378 -/* 911A1C 8024236C 00000000 */ nop +/* 911A1C 8024236C 00000000 */ nop /* 911A20 80242370 3C0142B4 */ lui $at, 0x42b4 /* 911A24 80242374 4481A000 */ mtc1 $at, $f20 .L80242378: @@ -64,7 +64,7 @@ glabel func_802422C4_911974 /* 911A5C 802423AC D42265C8 */ ldc1 $f2, %lo(D_802465C8)($at) /* 911A60 802423B0 46000021 */ cvt.d.s $f0, $f0 /* 911A64 802423B4 4620103C */ c.lt.d $f2, $f0 -/* 911A68 802423B8 00000000 */ nop +/* 911A68 802423B8 00000000 */ nop /* 911A6C 802423BC 45030001 */ bc1tl .L802423C4 /* 911A70 802423C0 0000802D */ daddu $s0, $zero, $zero .L802423C4: @@ -76,7 +76,7 @@ glabel func_802422C4_911974 /* 911A88 802423D8 44811000 */ mtc1 $at, $f2 /* 911A8C 802423DC 46000005 */ abs.s $f0, $f0 /* 911A90 802423E0 4600103E */ c.le.s $f2, $f0 -/* 911A94 802423E4 00000000 */ nop +/* 911A94 802423E4 00000000 */ nop /* 911A98 802423E8 45030001 */ bc1tl .L802423F0 /* 911A9C 802423EC 0000802D */ daddu $s0, $zero, $zero .L802423F0: diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242498_911B48.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242498_911B48.s index c6edfb1401..033a83b14a 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242498_911B48.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242498_911B48.s @@ -25,7 +25,7 @@ glabel func_80242498_911B48 /* 911B98 802424E8 D42265D0 */ ldc1 $f2, %lo(D_802465D0)($at) /* 911B9C 802424EC 46000021 */ cvt.d.s $f0, $f0 /* 911BA0 802424F0 46220002 */ mul.d $f0, $f0, $f2 -/* 911BA4 802424F4 00000000 */ nop +/* 911BA4 802424F4 00000000 */ nop /* 911BA8 802424F8 0280202D */ daddu $a0, $s4, $zero /* 911BAC 802424FC AFA00010 */ sw $zero, 0x10($sp) /* 911BB0 80242500 8E470010 */ lw $a3, 0x10($s2) @@ -47,7 +47,7 @@ glabel func_80242498_911B48 /* 911BF0 80242540 3C01C1A0 */ lui $at, 0xc1a0 /* 911BF4 80242544 44812000 */ mtc1 $at, $f4 /* 911BF8 80242548 44823000 */ mtc1 $v0, $f6 -/* 911BFC 8024254C 00000000 */ nop +/* 911BFC 8024254C 00000000 */ nop /* 911C00 80242550 468031A0 */ cvt.s.w $f6, $f6 /* 911C04 80242554 44073000 */ mfc1 $a3, $f6 /* 911C08 80242558 2402000F */ addiu $v0, $zero, 0xf diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802425C8_911C78.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802425C8_911C78.s index ad3b2fd6ee..1c3106fe77 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802425C8_911C78.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802425C8_911C78.s @@ -17,7 +17,7 @@ glabel func_802425C8_911C78 /* 911CA8 802425F8 A602008E */ sh $v0, 0x8e($s0) /* 911CAC 802425FC 00021400 */ sll $v0, $v0, 0x10 /* 911CB0 80242600 1C400012 */ bgtz $v0, .L8024264C -/* 911CB4 80242604 00000000 */ nop +/* 911CB4 80242604 00000000 */ nop /* 911CB8 80242608 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 911CBC 8024260C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* 911CC0 80242610 C60C0038 */ lwc1 $f12, 0x38($s0) diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242664_911D14.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242664_911D14.s index 7095da917b..705c17626e 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242664_911D14.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242664_911D14.s @@ -16,7 +16,7 @@ glabel func_80242664_911D14 /* 911D40 80242690 A602008E */ sh $v0, 0x8e($s0) /* 911D44 80242694 00021400 */ sll $v0, $v0, 0x10 /* 911D48 80242698 1C40000F */ bgtz $v0, .L802426D8 -/* 911D4C 8024269C 00000000 */ nop +/* 911D4C 8024269C 00000000 */ nop /* 911D50 802426A0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 911D54 802426A4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* 911D58 802426A8 C60C0038 */ lwc1 $f12, 0x38($s0) diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802426EC_911D9C.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802426EC_911D9C.s index 5c6a79e6a5..6e1e66f304 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802426EC_911D9C.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802426EC_911D9C.s @@ -16,7 +16,7 @@ glabel func_802426EC_911D9C /* 911DC8 80242718 0040802D */ daddu $s0, $v0, $zero /* 911DCC 8024271C C60C000C */ lwc1 $f12, 0xc($s0) /* 911DD0 80242720 44820000 */ mtc1 $v0, $f0 -/* 911DD4 80242724 00000000 */ nop +/* 911DD4 80242724 00000000 */ nop /* 911DD8 80242728 46800020 */ cvt.s.w $f0, $f0 /* 911DDC 8024272C 46006300 */ add.s $f12, $f12, $f0 /* 911DE0 80242730 3C0142B4 */ lui $at, 0x42b4 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242794_911E44.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242794_911E44.s index f83c27a6bb..c64a2f5d2c 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242794_911E44.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242794_911E44.s @@ -22,7 +22,7 @@ glabel func_80242794_911E44 /* 911E88 802427D8 0C01242D */ jal func_800490B4 /* 911E8C 802427DC 0040802D */ daddu $s0, $v0, $zero /* 911E90 802427E0 1040000B */ beqz $v0, .L80242810 -/* 911E94 802427E4 00000000 */ nop +/* 911E94 802427E4 00000000 */ nop /* 911E98 802427E8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 911E9C 802427EC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* 911EA0 802427F0 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -39,7 +39,7 @@ glabel func_80242794_911E44 /* 911EC8 80242818 A602008E */ sh $v0, 0x8e($s0) /* 911ECC 8024281C 00021400 */ sll $v0, $v0, 0x10 /* 911ED0 80242820 1C400032 */ bgtz $v0, .L802428EC -/* 911ED4 80242824 00000000 */ nop +/* 911ED4 80242824 00000000 */ nop /* 911ED8 80242828 8E620074 */ lw $v0, 0x74($s3) /* 911EDC 8024282C 2442FFFF */ addiu $v0, $v0, -1 /* 911EE0 80242830 18400014 */ blez $v0, .L80242884 @@ -77,7 +77,7 @@ glabel func_80242794_911E44 /* 911F5C 802428AC 2402000C */ addiu $v0, $zero, 0xc /* 911F60 802428B0 AFA2001C */ sw $v0, 0x1c($sp) /* 911F64 802428B4 44833000 */ mtc1 $v1, $f6 -/* 911F68 802428B8 00000000 */ nop +/* 911F68 802428B8 00000000 */ nop /* 911F6C 802428BC 468031A0 */ cvt.s.w $f6, $f6 /* 911F70 802428C0 44073000 */ mfc1 $a3, $f6 /* 911F74 802428C4 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242958_912008.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242958_912008.s index 6156e015a3..e2dfd4d2a3 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242958_912008.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242958_912008.s @@ -55,23 +55,23 @@ glabel func_80242958_912008 /* 9120CC 80242A1C A602008E */ sh $v0, 0x8e($s0) /* 9120D0 80242A20 00021400 */ sll $v0, $v0, 0x10 /* 9120D4 80242A24 1C40002C */ bgtz $v0, .L80242AD8 -/* 9120D8 80242A28 00000000 */ nop +/* 9120D8 80242A28 00000000 */ nop /* 9120DC 80242A2C C6000038 */ lwc1 $f0, 0x38($s0) /* 9120E0 80242A30 4600010D */ trunc.w.s $f4, $f0 /* 9120E4 80242A34 44022000 */ mfc1 $v0, $f4 -/* 9120E8 80242A38 00000000 */ nop +/* 9120E8 80242A38 00000000 */ nop /* 9120EC 80242A3C A6220010 */ sh $v0, 0x10($s1) /* 9120F0 80242A40 C600003C */ lwc1 $f0, 0x3c($s0) /* 9120F4 80242A44 4600010D */ trunc.w.s $f4, $f0 /* 9120F8 80242A48 44022000 */ mfc1 $v0, $f4 -/* 9120FC 80242A4C 00000000 */ nop +/* 9120FC 80242A4C 00000000 */ nop /* 912100 80242A50 A6220012 */ sh $v0, 0x12($s1) /* 912104 80242A54 C6000040 */ lwc1 $f0, 0x40($s0) /* 912108 80242A58 24020001 */ addiu $v0, $zero, 1 /* 91210C 80242A5C A2220007 */ sb $v0, 7($s1) /* 912110 80242A60 4600010D */ trunc.w.s $f4, $f0 /* 912114 80242A64 44022000 */ mfc1 $v0, $f4 -/* 912118 80242A68 00000000 */ nop +/* 912118 80242A68 00000000 */ nop /* 91211C 80242A6C A6220014 */ sh $v0, 0x14($s1) /* 912120 80242A70 C6800018 */ lwc1 $f0, 0x18($s4) /* 912124 80242A74 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -89,7 +89,7 @@ glabel func_80242958_912008 /* 912154 80242AA4 46220000 */ add.d $f0, $f0, $f2 /* 912158 80242AA8 4620010D */ trunc.w.d $f4, $f0 /* 91215C 80242AAC 44022000 */ mfc1 $v0, $f4 -/* 912160 80242AB0 00000000 */ nop +/* 912160 80242AB0 00000000 */ nop /* 912164 80242AB4 A602008E */ sh $v0, 0x8e($s0) /* 912168 80242AB8 00021400 */ sll $v0, $v0, 0x10 /* 91216C 80242ABC 00021403 */ sra $v0, $v0, 0x10 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242AF8_9121A8.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242AF8_9121A8.s index 1c9745e3e3..bb8ab9b738 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242AF8_9121A8.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242AF8_9121A8.s @@ -55,13 +55,13 @@ glabel func_80242AF8_9121A8 /* 912270 80242BC0 860200A8 */ lh $v0, 0xa8($s0) /* 912274 80242BC4 27A50020 */ addiu $a1, $sp, 0x20 /* 912278 80242BC8 44820000 */ mtc1 $v0, $f0 -/* 91227C 80242BCC 00000000 */ nop +/* 91227C 80242BCC 00000000 */ nop /* 912280 80242BD0 46800020 */ cvt.s.w $f0, $f0 /* 912284 80242BD4 E7A00018 */ swc1 $f0, 0x18($sp) /* 912288 80242BD8 860200A6 */ lh $v0, 0xa6($s0) /* 91228C 80242BDC 27A60024 */ addiu $a2, $sp, 0x24 /* 912290 80242BE0 44820000 */ mtc1 $v0, $f0 -/* 912294 80242BE4 00000000 */ nop +/* 912294 80242BE4 00000000 */ nop /* 912298 80242BE8 46800020 */ cvt.s.w $f0, $f0 /* 91229C 80242BEC E7A0001C */ swc1 $f0, 0x1c($sp) /* 9122A0 80242BF0 8E040080 */ lw $a0, 0x80($s0) diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242C48_9122F8.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242C48_9122F8.s index df7db8831e..a43cfbf194 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242C48_9122F8.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242C48_9122F8.s @@ -18,14 +18,14 @@ glabel func_80242C48_9122F8 /* 91232C 80242C7C A462008E */ sh $v0, 0x8e($v1) /* 912330 80242C80 00021400 */ sll $v0, $v0, 0x10 /* 912334 80242C84 1C400015 */ bgtz $v0, .L80242CDC -/* 912338 80242C88 00000000 */ nop +/* 912338 80242C88 00000000 */ nop /* 91233C 80242C8C 8E0200CC */ lw $v0, 0xcc($s0) /* 912340 80242C90 8C420004 */ lw $v0, 4($v0) /* 912344 80242C94 AC620028 */ sw $v0, 0x28($v1) /* 912348 80242C98 8E0200D0 */ lw $v0, 0xd0($s0) /* 91234C 80242C9C 8C420014 */ lw $v0, 0x14($v0) /* 912350 80242CA0 04410004 */ bgez $v0, .L80242CB4 -/* 912354 80242CA4 00000000 */ nop +/* 912354 80242CA4 00000000 */ nop /* 912358 80242CA8 C6200000 */ lwc1 $f0, ($s1) /* 91235C 80242CAC 08090B35 */ j .L80242CD4 /* 912360 80242CB0 E4600018 */ swc1 $f0, 0x18($v1) @@ -33,7 +33,7 @@ glabel func_80242C48_9122F8 /* 912364 80242CB4 3C018024 */ lui $at, %hi(D_802465E0) /* 912368 80242CB8 D42265E0 */ ldc1 $f2, %lo(D_802465E0)($at) /* 91236C 80242CBC 44820000 */ mtc1 $v0, $f0 -/* 912370 80242CC0 00000000 */ nop +/* 912370 80242CC0 00000000 */ nop /* 912374 80242CC4 46800021 */ cvt.d.w $f0, $f0 /* 912378 80242CC8 46220003 */ div.d $f0, $f0, $f2 /* 91237C 80242CCC 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242CF4_9123A4.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242CF4_9123A4.s index e93fdb4aba..97ba90320d 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242CF4_9123A4.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242CF4_9123A4.s @@ -22,7 +22,7 @@ glabel func_80242CF4_9123A4 /* 9123E8 80242D38 0C01242D */ jal func_800490B4 /* 9123EC 80242D3C 0040802D */ daddu $s0, $v0, $zero /* 9123F0 80242D40 1040000C */ beqz $v0, .L80242D74 -/* 9123F4 80242D44 00000000 */ nop +/* 9123F4 80242D44 00000000 */ nop /* 9123F8 80242D48 C60C0038 */ lwc1 $f12, 0x38($s0) /* 9123FC 80242D4C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 912400 80242D50 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -45,10 +45,10 @@ glabel func_80242CF4_9123A4 /* 912440 80242D90 46802120 */ cvt.s.w $f4, $f4 /* 912444 80242D94 44072000 */ mfc1 $a3, $f4 /* 912448 80242D98 0C00A7B5 */ jal dist2D -/* 91244C 80242D9C 00000000 */ nop +/* 91244C 80242D9C 00000000 */ nop /* 912450 80242DA0 C6020018 */ lwc1 $f2, 0x18($s0) /* 912454 80242DA4 4602003E */ c.le.s $f0, $f2 -/* 912458 80242DA8 00000000 */ nop +/* 912458 80242DA8 00000000 */ nop /* 91245C 80242DAC 45000005 */ bc1f .L80242DC4 /* 912460 80242DB0 2402000A */ addiu $v0, $zero, 0xa /* 912464 80242DB4 A602008E */ sh $v0, 0x8e($s0) @@ -58,7 +58,7 @@ glabel func_80242CF4_9123A4 .L80242DC4: /* 912474 80242DC4 8602008C */ lh $v0, 0x8c($s0) /* 912478 80242DC8 14400011 */ bnez $v0, .L80242E10 -/* 91247C 80242DCC 00000000 */ nop +/* 91247C 80242DCC 00000000 */ nop /* 912480 80242DD0 C60C0038 */ lwc1 $f12, 0x38($s0) /* 912484 80242DD4 8E4200D0 */ lw $v0, 0xd0($s2) /* 912488 80242DD8 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -69,7 +69,7 @@ glabel func_80242CF4_9123A4 /* 91249C 80242DEC 46802120 */ cvt.s.w $f4, $f4 /* 9124A0 80242DF0 44072000 */ mfc1 $a3, $f4 /* 9124A4 80242DF4 0C00A720 */ jal atan2 -/* 9124A8 80242DF8 00000000 */ nop +/* 9124A8 80242DF8 00000000 */ nop /* 9124AC 80242DFC 8E050018 */ lw $a1, 0x18($s0) /* 9124B0 80242E00 44060000 */ mfc1 $a2, $f0 /* 9124B4 80242E04 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242E2C_9124DC.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242E2C_9124DC.s index da6167078a..196a21bac6 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242E2C_9124DC.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242E2C_9124DC.s @@ -19,7 +19,7 @@ glabel func_80242E2C_9124DC .L80242E64: /* 912514 80242E64 8482008C */ lh $v0, 0x8c($a0) /* 912518 80242E68 1440000A */ bnez $v0, .L80242E94 -/* 91251C 80242E6C 00000000 */ nop +/* 91251C 80242E6C 00000000 */ nop /* 912520 80242E70 8482008E */ lh $v0, 0x8e($a0) /* 912524 80242E74 1C400007 */ bgtz $v0, .L80242E94 /* 912528 80242E78 24020008 */ addiu $v0, $zero, 8 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s index b404079867..f921af6e99 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s @@ -71,7 +71,7 @@ glabel func_80242F54_912604 /* 912700 80243050 8E4300B0 */ lw $v1, 0xb0($s2) /* 912704 80243054 30620004 */ andi $v0, $v1, 4 /* 912708 80243058 10400007 */ beqz $v0, .L80243078 -/* 91270C 8024305C 00000000 */ nop +/* 91270C 8024305C 00000000 */ nop /* 912710 80243060 824200B4 */ lb $v0, 0xb4($s2) /* 912714 80243064 14400086 */ bnez $v0, .L80243280 /* 912718 80243068 0000102D */ daddu $v0, $zero, $zero @@ -95,15 +95,17 @@ glabel func_80242F54_912604 /* 912758 802430A8 2C620035 */ sltiu $v0, $v1, 0x35 /* 91275C 802430AC 10400073 */ beqz $v0, .L8024327C /* 912760 802430B0 00031080 */ sll $v0, $v1, 2 -/* 912764 802430B4 3C018024 */ lui $at, %hi(D_802465E8) +/* 912764 802430B4 3C018024 */ lui $at, %hi(jtbl_802465E8_915C98) /* 912768 802430B8 00220821 */ addu $at, $at, $v0 -/* 91276C 802430BC 8C2265E8 */ lw $v0, %lo(D_802465E8)($at) +/* 91276C 802430BC 8C2265E8 */ lw $v0, %lo(jtbl_802465E8_915C98)($at) /* 912770 802430C0 00400008 */ jr $v0 -/* 912774 802430C4 00000000 */ nop +/* 912774 802430C4 00000000 */ nop +glabel L802430C8_912778 /* 912778 802430C8 0260202D */ daddu $a0, $s3, $zero /* 91277C 802430CC 0280282D */ daddu $a1, $s4, $zero /* 912780 802430D0 0C090909 */ jal func_80242424_911AD4 /* 912784 802430D4 0200302D */ daddu $a2, $s0, $zero +glabel L802430D8_912788 /* 912788 802430D8 0260202D */ daddu $a0, $s3, $zero /* 91278C 802430DC 0280282D */ daddu $a1, $s4, $zero /* 912790 802430E0 0C090926 */ jal func_80242498_911B48 @@ -112,6 +114,7 @@ glabel func_80242F54_912604 /* 91279C 802430EC 24020002 */ addiu $v0, $zero, 2 /* 9127A0 802430F0 14620063 */ bne $v1, $v0, .L80243280 /* 9127A4 802430F4 0000102D */ daddu $v0, $zero, $zero +glabel L802430F8_9127A8 /* 9127A8 802430F8 0260202D */ daddu $a0, $s3, $zero /* 9127AC 802430FC 0280282D */ daddu $a1, $s4, $zero /* 9127B0 80243100 0C090972 */ jal func_802425C8_911C78 @@ -120,6 +123,7 @@ glabel func_80242F54_912604 /* 9127BC 8024310C 24020003 */ addiu $v0, $zero, 3 /* 9127C0 80243110 1462005B */ bne $v1, $v0, .L80243280 /* 9127C4 80243114 0000102D */ daddu $v0, $zero, $zero +glabel L80243118_9127C8 /* 9127C8 80243118 0260202D */ daddu $a0, $s3, $zero /* 9127CC 8024311C 0280282D */ daddu $a1, $s4, $zero /* 9127D0 80243120 0C090999 */ jal func_80242664_911D14 @@ -128,16 +132,19 @@ glabel func_80242F54_912604 /* 9127DC 8024312C 24020004 */ addiu $v0, $zero, 4 /* 9127E0 80243130 14620053 */ bne $v1, $v0, .L80243280 /* 9127E4 80243134 0000102D */ daddu $v0, $zero, $zero +glabel L80243138_9127E8 /* 9127E8 80243138 0260202D */ daddu $a0, $s3, $zero /* 9127EC 8024313C 0280282D */ daddu $a1, $s4, $zero /* 9127F0 80243140 0C0909BB */ jal func_802426EC_911D9C /* 9127F4 80243144 0200302D */ daddu $a2, $s0, $zero +glabel L80243148_9127F8 /* 9127F8 80243148 0260202D */ daddu $a0, $s3, $zero /* 9127FC 8024314C 0280282D */ daddu $a1, $s4, $zero /* 912800 80243150 0C0909E5 */ jal func_80242794_911E44 /* 912804 80243154 0200302D */ daddu $a2, $s0, $zero /* 912808 80243158 08090CA0 */ j .L80243280 /* 91280C 8024315C 0000102D */ daddu $v0, $zero, $zero +glabel L80243160_912810 /* 912810 80243160 0260202D */ daddu $a0, $s3, $zero /* 912814 80243164 0280282D */ daddu $a1, $s4, $zero /* 912818 80243168 0C0127DF */ jal func_80049F7C @@ -146,6 +153,7 @@ glabel func_80242F54_912604 /* 912824 80243174 2402000D */ addiu $v0, $zero, 0xd /* 912828 80243178 14620041 */ bne $v1, $v0, .L80243280 /* 91282C 8024317C 0000102D */ daddu $v0, $zero, $zero +glabel L80243180_912830 /* 912830 80243180 0260202D */ daddu $a0, $s3, $zero /* 912834 80243184 0280282D */ daddu $a1, $s4, $zero /* 912838 80243188 0C012849 */ jal func_8004A124 @@ -154,6 +162,7 @@ glabel func_80242F54_912604 /* 912844 80243194 2402000E */ addiu $v0, $zero, 0xe /* 912848 80243198 14620039 */ bne $v1, $v0, .L80243280 /* 91284C 8024319C 0000102D */ daddu $v0, $zero, $zero +glabel L802431A0_912850 /* 912850 802431A0 96A2008E */ lhu $v0, 0x8e($s5) /* 912854 802431A4 2442FFFF */ addiu $v0, $v0, -1 /* 912858 802431A8 A6A2008E */ sh $v0, 0x8e($s5) @@ -163,22 +172,26 @@ glabel func_80242F54_912604 /* 912868 802431B8 24020028 */ addiu $v0, $zero, 0x28 /* 91286C 802431BC 08090C9F */ j .L8024327C /* 912870 802431C0 AE620070 */ sw $v0, 0x70($s3) +glabel L802431C4_912874 /* 912874 802431C4 0260202D */ daddu $a0, $s3, $zero /* 912878 802431C8 0280282D */ daddu $a1, $s4, $zero /* 91287C 802431CC 0C090A42 */ jal func_80242908_911FB8 /* 912880 802431D0 0200302D */ daddu $a2, $s0, $zero +glabel L802431D4_912884 /* 912884 802431D4 0260202D */ daddu $a0, $s3, $zero /* 912888 802431D8 0280282D */ daddu $a1, $s4, $zero /* 91288C 802431DC 0C090A56 */ jal func_80242958_912008 /* 912890 802431E0 0200302D */ daddu $a2, $s0, $zero /* 912894 802431E4 08090CA0 */ j .L80243280 /* 912898 802431E8 0000102D */ daddu $v0, $zero, $zero +glabel L802431EC_91289C /* 91289C 802431EC 0260202D */ daddu $a0, $s3, $zero /* 9128A0 802431F0 0280282D */ daddu $a1, $s4, $zero /* 9128A4 802431F4 0C090ABE */ jal func_80242AF8_9121A8 /* 9128A8 802431F8 0200302D */ daddu $a2, $s0, $zero /* 9128AC 802431FC 08090CA0 */ j .L80243280 /* 9128B0 80243200 0000102D */ daddu $v0, $zero, $zero +glabel L80243204_9128B4 /* 9128B4 80243204 0260202D */ daddu $a0, $s3, $zero /* 9128B8 80243208 0280282D */ daddu $a1, $s4, $zero /* 9128BC 8024320C 0C090B12 */ jal func_80242C48_9122F8 @@ -187,16 +200,19 @@ glabel func_80242F54_912604 /* 9128C8 80243218 24020029 */ addiu $v0, $zero, 0x29 /* 9128CC 8024321C 14620018 */ bne $v1, $v0, .L80243280 /* 9128D0 80243220 0000102D */ daddu $v0, $zero, $zero +glabel L80243224_9128D4 /* 9128D4 80243224 0260202D */ daddu $a0, $s3, $zero /* 9128D8 80243228 0280282D */ daddu $a1, $s4, $zero /* 9128DC 8024322C 0C090B3D */ jal func_80242CF4_9123A4 /* 9128E0 80243230 0200302D */ daddu $a2, $s0, $zero /* 9128E4 80243234 08090CA0 */ j .L80243280 /* 9128E8 80243238 0000102D */ daddu $v0, $zero, $zero +glabel L8024323C_9128EC /* 9128EC 8024323C 0260202D */ daddu $a0, $s3, $zero /* 9128F0 80243240 0280282D */ daddu $a1, $s4, $zero /* 9128F4 80243244 0C090B8B */ jal func_80242E2C_9124DC /* 9128F8 80243248 0200302D */ daddu $a2, $s0, $zero +glabel L8024324C_9128FC /* 9128FC 8024324C 0260202D */ daddu $a0, $s3, $zero /* 912900 80243250 0280282D */ daddu $a1, $s4, $zero /* 912904 80243254 0C090BAA */ jal func_80242EA8_912558 @@ -205,11 +221,13 @@ glabel func_80242F54_912604 /* 912910 80243260 24020034 */ addiu $v0, $zero, 0x34 /* 912914 80243264 14620006 */ bne $v1, $v0, .L80243280 /* 912918 80243268 0000102D */ daddu $v0, $zero, $zero +glabel L8024326C_91291C /* 91291C 8024326C 0260202D */ daddu $a0, $s3, $zero /* 912920 80243270 0280282D */ daddu $a1, $s4, $zero /* 912924 80243274 0C090BC4 */ jal dup_iwa_01_UnkDurationCheck /* 912928 80243278 0200302D */ daddu $a2, $s0, $zero .L8024327C: +glabel L8024327C_91292C /* 91292C 8024327C 0000102D */ daddu $v0, $zero, $zero .L80243280: /* 912930 80243280 8FBF0048 */ lw $ra, 0x48($sp) @@ -221,6 +239,6 @@ glabel func_80242F54_912604 /* 912948 80243298 8FB00030 */ lw $s0, 0x30($sp) /* 91294C 8024329C 03E00008 */ jr $ra /* 912950 802432A0 27BD0050 */ addiu $sp, $sp, 0x50 -/* 912954 802432A4 00000000 */ nop -/* 912958 802432A8 00000000 */ nop -/* 91295C 802432AC 00000000 */ nop +/* 912954 802432A4 00000000 */ nop +/* 912958 802432A8 00000000 */ nop +/* 91295C 802432AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/912960/func_802432B0_912960.s b/asm/nonmatchings/world/area_iwa/iwa_01/912960/func_802432B0_912960.s index a794c4c105..fb2287e4a2 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/912960/func_802432B0_912960.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/912960/func_802432B0_912960.s @@ -11,6 +11,6 @@ glabel func_802432B0_912960 /* 912978 802432C8 AC430000 */ sw $v1, ($v0) /* 91297C 802432CC 03E00008 */ jr $ra /* 912980 802432D0 24020002 */ addiu $v0, $zero, 2 -/* 912984 802432D4 00000000 */ nop -/* 912988 802432D8 00000000 */ nop -/* 91298C 802432DC 00000000 */ nop +/* 912984 802432D4 00000000 */ nop +/* 912988 802432D8 00000000 */ nop +/* 91298C 802432DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240000_915D70.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240000_915D70.s index 867bdcd10f..8b9e9a7295 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240000_915D70.s +++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240000_915D70.s @@ -42,9 +42,9 @@ glabel func_80240000_915D70 /* 915E04 80240094 D4222D40 */ ldc1 $f2, %lo(D_80242D40)($at) /* 915E08 80240098 46000021 */ cvt.d.s $f0, $f0 /* 915E0C 8024009C 4622003C */ c.lt.d $f0, $f2 -/* 915E10 802400A0 00000000 */ nop +/* 915E10 802400A0 00000000 */ nop /* 915E14 802400A4 45000003 */ bc1f .L802400B4 -/* 915E18 802400A8 00000000 */ nop +/* 915E18 802400A8 00000000 */ nop /* 915E1C 802400AC 3C0142B4 */ lui $at, 0x42b4 /* 915E20 802400B0 4481A000 */ mtc1 $at, $f20 .L802400B4: @@ -64,7 +64,7 @@ glabel func_80240000_915D70 /* 915E58 802400E8 D4222D48 */ ldc1 $f2, %lo(D_80242D48)($at) /* 915E5C 802400EC 46000021 */ cvt.d.s $f0, $f0 /* 915E60 802400F0 4620103C */ c.lt.d $f2, $f0 -/* 915E64 802400F4 00000000 */ nop +/* 915E64 802400F4 00000000 */ nop /* 915E68 802400F8 45030001 */ bc1tl .L80240100 /* 915E6C 802400FC 0000802D */ daddu $s0, $zero, $zero .L80240100: @@ -76,7 +76,7 @@ glabel func_80240000_915D70 /* 915E84 80240114 44811000 */ mtc1 $at, $f2 /* 915E88 80240118 46000005 */ abs.s $f0, $f0 /* 915E8C 8024011C 4600103E */ c.le.s $f2, $f0 -/* 915E90 80240120 00000000 */ nop +/* 915E90 80240120 00000000 */ nop /* 915E94 80240124 45030001 */ bc1tl .L8024012C /* 915E98 80240128 0000802D */ daddu $s0, $zero, $zero .L8024012C: diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802401D4_915F44.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802401D4_915F44.s index 9abafbafc7..ca2231c3ab 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802401D4_915F44.s +++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802401D4_915F44.s @@ -25,7 +25,7 @@ glabel func_802401D4_915F44 /* 915F94 80240224 D4222D50 */ ldc1 $f2, %lo(D_80242D50)($at) /* 915F98 80240228 46000021 */ cvt.d.s $f0, $f0 /* 915F9C 8024022C 46220002 */ mul.d $f0, $f0, $f2 -/* 915FA0 80240230 00000000 */ nop +/* 915FA0 80240230 00000000 */ nop /* 915FA4 80240234 0280202D */ daddu $a0, $s4, $zero /* 915FA8 80240238 AFA00010 */ sw $zero, 0x10($sp) /* 915FAC 8024023C 8E470010 */ lw $a3, 0x10($s2) @@ -47,7 +47,7 @@ glabel func_802401D4_915F44 /* 915FEC 8024027C 3C01C1A0 */ lui $at, 0xc1a0 /* 915FF0 80240280 44812000 */ mtc1 $at, $f4 /* 915FF4 80240284 44823000 */ mtc1 $v0, $f6 -/* 915FF8 80240288 00000000 */ nop +/* 915FF8 80240288 00000000 */ nop /* 915FFC 8024028C 468031A0 */ cvt.s.w $f6, $f6 /* 916000 80240290 44073000 */ mfc1 $a3, $f6 /* 916004 80240294 2402000F */ addiu $v0, $zero, 0xf diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240304_916074.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240304_916074.s index 8a9ffd2448..3241946e57 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240304_916074.s +++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240304_916074.s @@ -17,7 +17,7 @@ glabel func_80240304_916074 /* 9160A4 80240334 A602008E */ sh $v0, 0x8e($s0) /* 9160A8 80240338 00021400 */ sll $v0, $v0, 0x10 /* 9160AC 8024033C 1C400012 */ bgtz $v0, .L80240388 -/* 9160B0 80240340 00000000 */ nop +/* 9160B0 80240340 00000000 */ nop /* 9160B4 80240344 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 9160B8 80240348 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* 9160BC 8024034C C60C0038 */ lwc1 $f12, 0x38($s0) diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802403A0_916110.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802403A0_916110.s index 44ff5f8e13..81feab3b05 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802403A0_916110.s +++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802403A0_916110.s @@ -16,7 +16,7 @@ glabel func_802403A0_916110 /* 91613C 802403CC A602008E */ sh $v0, 0x8e($s0) /* 916140 802403D0 00021400 */ sll $v0, $v0, 0x10 /* 916144 802403D4 1C40000F */ bgtz $v0, .L80240414 -/* 916148 802403D8 00000000 */ nop +/* 916148 802403D8 00000000 */ nop /* 91614C 802403DC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 916150 802403E0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* 916154 802403E4 C60C0038 */ lwc1 $f12, 0x38($s0) diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240428_916198.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240428_916198.s index af86815b50..01ad9bc2ac 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240428_916198.s +++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240428_916198.s @@ -16,7 +16,7 @@ glabel func_80240428_916198 /* 9161C4 80240454 0040802D */ daddu $s0, $v0, $zero /* 9161C8 80240458 C60C000C */ lwc1 $f12, 0xc($s0) /* 9161CC 8024045C 44820000 */ mtc1 $v0, $f0 -/* 9161D0 80240460 00000000 */ nop +/* 9161D0 80240460 00000000 */ nop /* 9161D4 80240464 46800020 */ cvt.s.w $f0, $f0 /* 9161D8 80240468 46006300 */ add.s $f12, $f12, $f0 /* 9161DC 8024046C 3C0142B4 */ lui $at, 0x42b4 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802404D0_916240.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802404D0_916240.s index ebc098402a..9db64e6d4e 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802404D0_916240.s +++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802404D0_916240.s @@ -22,7 +22,7 @@ glabel func_802404D0_916240 /* 916284 80240514 0C01242D */ jal func_800490B4 /* 916288 80240518 0040802D */ daddu $s0, $v0, $zero /* 91628C 8024051C 1040000B */ beqz $v0, .L8024054C -/* 916290 80240520 00000000 */ nop +/* 916290 80240520 00000000 */ nop /* 916294 80240524 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 916298 80240528 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* 91629C 8024052C C60C0038 */ lwc1 $f12, 0x38($s0) @@ -39,7 +39,7 @@ glabel func_802404D0_916240 /* 9162C4 80240554 A602008E */ sh $v0, 0x8e($s0) /* 9162C8 80240558 00021400 */ sll $v0, $v0, 0x10 /* 9162CC 8024055C 1C400032 */ bgtz $v0, .L80240628 -/* 9162D0 80240560 00000000 */ nop +/* 9162D0 80240560 00000000 */ nop /* 9162D4 80240564 8E620074 */ lw $v0, 0x74($s3) /* 9162D8 80240568 2442FFFF */ addiu $v0, $v0, -1 /* 9162DC 8024056C 18400014 */ blez $v0, .L802405C0 @@ -77,7 +77,7 @@ glabel func_802404D0_916240 /* 916358 802405E8 2402000C */ addiu $v0, $zero, 0xc /* 91635C 802405EC AFA2001C */ sw $v0, 0x1c($sp) /* 916360 802405F0 44833000 */ mtc1 $v1, $f6 -/* 916364 802405F4 00000000 */ nop +/* 916364 802405F4 00000000 */ nop /* 916368 802405F8 468031A0 */ cvt.s.w $f6, $f6 /* 91636C 802405FC 44073000 */ mfc1 $a3, $f6 /* 916370 80240600 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240694_916404.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240694_916404.s index bf01e01e10..0aea12f694 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240694_916404.s +++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240694_916404.s @@ -55,23 +55,23 @@ glabel func_80240694_916404 /* 9164C8 80240758 A602008E */ sh $v0, 0x8e($s0) /* 9164CC 8024075C 00021400 */ sll $v0, $v0, 0x10 /* 9164D0 80240760 1C40002C */ bgtz $v0, .L80240814 -/* 9164D4 80240764 00000000 */ nop +/* 9164D4 80240764 00000000 */ nop /* 9164D8 80240768 C6000038 */ lwc1 $f0, 0x38($s0) /* 9164DC 8024076C 4600010D */ trunc.w.s $f4, $f0 /* 9164E0 80240770 44022000 */ mfc1 $v0, $f4 -/* 9164E4 80240774 00000000 */ nop +/* 9164E4 80240774 00000000 */ nop /* 9164E8 80240778 A6220010 */ sh $v0, 0x10($s1) /* 9164EC 8024077C C600003C */ lwc1 $f0, 0x3c($s0) /* 9164F0 80240780 4600010D */ trunc.w.s $f4, $f0 /* 9164F4 80240784 44022000 */ mfc1 $v0, $f4 -/* 9164F8 80240788 00000000 */ nop +/* 9164F8 80240788 00000000 */ nop /* 9164FC 8024078C A6220012 */ sh $v0, 0x12($s1) /* 916500 80240790 C6000040 */ lwc1 $f0, 0x40($s0) /* 916504 80240794 24020001 */ addiu $v0, $zero, 1 /* 916508 80240798 A2220007 */ sb $v0, 7($s1) /* 91650C 8024079C 4600010D */ trunc.w.s $f4, $f0 /* 916510 802407A0 44022000 */ mfc1 $v0, $f4 -/* 916514 802407A4 00000000 */ nop +/* 916514 802407A4 00000000 */ nop /* 916518 802407A8 A6220014 */ sh $v0, 0x14($s1) /* 91651C 802407AC C6800018 */ lwc1 $f0, 0x18($s4) /* 916520 802407B0 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -89,7 +89,7 @@ glabel func_80240694_916404 /* 916550 802407E0 46220000 */ add.d $f0, $f0, $f2 /* 916554 802407E4 4620010D */ trunc.w.d $f4, $f0 /* 916558 802407E8 44022000 */ mfc1 $v0, $f4 -/* 91655C 802407EC 00000000 */ nop +/* 91655C 802407EC 00000000 */ nop /* 916560 802407F0 A602008E */ sh $v0, 0x8e($s0) /* 916564 802407F4 00021400 */ sll $v0, $v0, 0x10 /* 916568 802407F8 00021403 */ sra $v0, $v0, 0x10 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240834_9165A4.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240834_9165A4.s index 254f6bdab9..7bc20ae35a 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240834_9165A4.s +++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240834_9165A4.s @@ -55,13 +55,13 @@ glabel func_80240834_9165A4 /* 91666C 802408FC 860200A8 */ lh $v0, 0xa8($s0) /* 916670 80240900 27A50020 */ addiu $a1, $sp, 0x20 /* 916674 80240904 44820000 */ mtc1 $v0, $f0 -/* 916678 80240908 00000000 */ nop +/* 916678 80240908 00000000 */ nop /* 91667C 8024090C 46800020 */ cvt.s.w $f0, $f0 /* 916680 80240910 E7A00018 */ swc1 $f0, 0x18($sp) /* 916684 80240914 860200A6 */ lh $v0, 0xa6($s0) /* 916688 80240918 27A60024 */ addiu $a2, $sp, 0x24 /* 91668C 8024091C 44820000 */ mtc1 $v0, $f0 -/* 916690 80240920 00000000 */ nop +/* 916690 80240920 00000000 */ nop /* 916694 80240924 46800020 */ cvt.s.w $f0, $f0 /* 916698 80240928 E7A0001C */ swc1 $f0, 0x1c($sp) /* 91669C 8024092C 8E040080 */ lw $a0, 0x80($s0) diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240984_9166F4.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240984_9166F4.s index 2b3bdf1620..8e9abc8ad7 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240984_9166F4.s +++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240984_9166F4.s @@ -18,14 +18,14 @@ glabel func_80240984_9166F4 /* 916728 802409B8 A462008E */ sh $v0, 0x8e($v1) /* 91672C 802409BC 00021400 */ sll $v0, $v0, 0x10 /* 916730 802409C0 1C400015 */ bgtz $v0, .L80240A18 -/* 916734 802409C4 00000000 */ nop +/* 916734 802409C4 00000000 */ nop /* 916738 802409C8 8E0200CC */ lw $v0, 0xcc($s0) /* 91673C 802409CC 8C420004 */ lw $v0, 4($v0) /* 916740 802409D0 AC620028 */ sw $v0, 0x28($v1) /* 916744 802409D4 8E0200D0 */ lw $v0, 0xd0($s0) /* 916748 802409D8 8C420014 */ lw $v0, 0x14($v0) /* 91674C 802409DC 04410004 */ bgez $v0, .L802409F0 -/* 916750 802409E0 00000000 */ nop +/* 916750 802409E0 00000000 */ nop /* 916754 802409E4 C6200000 */ lwc1 $f0, ($s1) /* 916758 802409E8 08090284 */ j .L80240A10 /* 91675C 802409EC E4600018 */ swc1 $f0, 0x18($v1) @@ -33,7 +33,7 @@ glabel func_80240984_9166F4 /* 916760 802409F0 3C018024 */ lui $at, %hi(D_80242D60) /* 916764 802409F4 D4222D60 */ ldc1 $f2, %lo(D_80242D60)($at) /* 916768 802409F8 44820000 */ mtc1 $v0, $f0 -/* 91676C 802409FC 00000000 */ nop +/* 91676C 802409FC 00000000 */ nop /* 916770 80240A00 46800021 */ cvt.d.w $f0, $f0 /* 916774 80240A04 46220003 */ div.d $f0, $f0, $f2 /* 916778 80240A08 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240A30_9167A0.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240A30_9167A0.s index 589e6d3656..c922dfe796 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240A30_9167A0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240A30_9167A0.s @@ -22,7 +22,7 @@ glabel func_80240A30_9167A0 /* 9167E4 80240A74 0C01242D */ jal func_800490B4 /* 9167E8 80240A78 0040802D */ daddu $s0, $v0, $zero /* 9167EC 80240A7C 1040000C */ beqz $v0, .L80240AB0 -/* 9167F0 80240A80 00000000 */ nop +/* 9167F0 80240A80 00000000 */ nop /* 9167F4 80240A84 C60C0038 */ lwc1 $f12, 0x38($s0) /* 9167F8 80240A88 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 9167FC 80240A8C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -45,10 +45,10 @@ glabel func_80240A30_9167A0 /* 91683C 80240ACC 46802120 */ cvt.s.w $f4, $f4 /* 916840 80240AD0 44072000 */ mfc1 $a3, $f4 /* 916844 80240AD4 0C00A7B5 */ jal dist2D -/* 916848 80240AD8 00000000 */ nop +/* 916848 80240AD8 00000000 */ nop /* 91684C 80240ADC C6020018 */ lwc1 $f2, 0x18($s0) /* 916850 80240AE0 4602003E */ c.le.s $f0, $f2 -/* 916854 80240AE4 00000000 */ nop +/* 916854 80240AE4 00000000 */ nop /* 916858 80240AE8 45000005 */ bc1f .L80240B00 /* 91685C 80240AEC 2402000A */ addiu $v0, $zero, 0xa /* 916860 80240AF0 A602008E */ sh $v0, 0x8e($s0) @@ -58,7 +58,7 @@ glabel func_80240A30_9167A0 .L80240B00: /* 916870 80240B00 8602008C */ lh $v0, 0x8c($s0) /* 916874 80240B04 14400011 */ bnez $v0, .L80240B4C -/* 916878 80240B08 00000000 */ nop +/* 916878 80240B08 00000000 */ nop /* 91687C 80240B0C C60C0038 */ lwc1 $f12, 0x38($s0) /* 916880 80240B10 8E4200D0 */ lw $v0, 0xd0($s2) /* 916884 80240B14 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -69,7 +69,7 @@ glabel func_80240A30_9167A0 /* 916898 80240B28 46802120 */ cvt.s.w $f4, $f4 /* 91689C 80240B2C 44072000 */ mfc1 $a3, $f4 /* 9168A0 80240B30 0C00A720 */ jal atan2 -/* 9168A4 80240B34 00000000 */ nop +/* 9168A4 80240B34 00000000 */ nop /* 9168A8 80240B38 8E050018 */ lw $a1, 0x18($s0) /* 9168AC 80240B3C 44060000 */ mfc1 $a2, $f0 /* 9168B0 80240B40 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240B68_9168D8.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240B68_9168D8.s index 6374ddb5c5..44e6d0b52f 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240B68_9168D8.s +++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240B68_9168D8.s @@ -19,7 +19,7 @@ glabel func_80240B68_9168D8 .L80240BA0: /* 916910 80240BA0 8482008C */ lh $v0, 0x8c($a0) /* 916914 80240BA4 1440000A */ bnez $v0, .L80240BD0 -/* 916918 80240BA8 00000000 */ nop +/* 916918 80240BA8 00000000 */ nop /* 91691C 80240BAC 8482008E */ lh $v0, 0x8e($a0) /* 916920 80240BB0 1C400007 */ bgtz $v0, .L80240BD0 /* 916924 80240BB4 24020008 */ addiu $v0, $zero, 8 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s index e1eb3ac9c4..3dbf4d5f74 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s +++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s @@ -71,7 +71,7 @@ glabel func_80240C90_916A00 /* 916AFC 80240D8C 8E4300B0 */ lw $v1, 0xb0($s2) /* 916B00 80240D90 30620004 */ andi $v0, $v1, 4 /* 916B04 80240D94 10400007 */ beqz $v0, .L80240DB4 -/* 916B08 80240D98 00000000 */ nop +/* 916B08 80240D98 00000000 */ nop /* 916B0C 80240D9C 824200B4 */ lb $v0, 0xb4($s2) /* 916B10 80240DA0 14400086 */ bnez $v0, .L80240FBC /* 916B14 80240DA4 0000102D */ daddu $v0, $zero, $zero @@ -95,15 +95,17 @@ glabel func_80240C90_916A00 /* 916B54 80240DE4 2C620035 */ sltiu $v0, $v1, 0x35 /* 916B58 80240DE8 10400073 */ beqz $v0, .L80240FB8 /* 916B5C 80240DEC 00031080 */ sll $v0, $v1, 2 -/* 916B60 80240DF0 3C018024 */ lui $at, %hi(D_80242D68) +/* 916B60 80240DF0 3C018024 */ lui $at, %hi(jtbl_80242D68_918AD8) /* 916B64 80240DF4 00220821 */ addu $at, $at, $v0 -/* 916B68 80240DF8 8C222D68 */ lw $v0, %lo(D_80242D68)($at) +/* 916B68 80240DF8 8C222D68 */ lw $v0, %lo(jtbl_80242D68_918AD8)($at) /* 916B6C 80240DFC 00400008 */ jr $v0 -/* 916B70 80240E00 00000000 */ nop +/* 916B70 80240E00 00000000 */ nop +glabel L80240E04_916B74 /* 916B74 80240E04 0260202D */ daddu $a0, $s3, $zero /* 916B78 80240E08 0280282D */ daddu $a1, $s4, $zero /* 916B7C 80240E0C 0C090058 */ jal func_80240160_915ED0 /* 916B80 80240E10 0200302D */ daddu $a2, $s0, $zero +glabel L80240E14_916B84 /* 916B84 80240E14 0260202D */ daddu $a0, $s3, $zero /* 916B88 80240E18 0280282D */ daddu $a1, $s4, $zero /* 916B8C 80240E1C 0C090075 */ jal func_802401D4_915F44 @@ -112,6 +114,7 @@ glabel func_80240C90_916A00 /* 916B98 80240E28 24020002 */ addiu $v0, $zero, 2 /* 916B9C 80240E2C 14620063 */ bne $v1, $v0, .L80240FBC /* 916BA0 80240E30 0000102D */ daddu $v0, $zero, $zero +glabel L80240E34_916BA4 /* 916BA4 80240E34 0260202D */ daddu $a0, $s3, $zero /* 916BA8 80240E38 0280282D */ daddu $a1, $s4, $zero /* 916BAC 80240E3C 0C0900C1 */ jal func_80240304_916074 @@ -120,6 +123,7 @@ glabel func_80240C90_916A00 /* 916BB8 80240E48 24020003 */ addiu $v0, $zero, 3 /* 916BBC 80240E4C 1462005B */ bne $v1, $v0, .L80240FBC /* 916BC0 80240E50 0000102D */ daddu $v0, $zero, $zero +glabel L80240E54_916BC4 /* 916BC4 80240E54 0260202D */ daddu $a0, $s3, $zero /* 916BC8 80240E58 0280282D */ daddu $a1, $s4, $zero /* 916BCC 80240E5C 0C0900E8 */ jal func_802403A0_916110 @@ -128,16 +132,19 @@ glabel func_80240C90_916A00 /* 916BD8 80240E68 24020004 */ addiu $v0, $zero, 4 /* 916BDC 80240E6C 14620053 */ bne $v1, $v0, .L80240FBC /* 916BE0 80240E70 0000102D */ daddu $v0, $zero, $zero +glabel L80240E74_916BE4 /* 916BE4 80240E74 0260202D */ daddu $a0, $s3, $zero /* 916BE8 80240E78 0280282D */ daddu $a1, $s4, $zero /* 916BEC 80240E7C 0C09010A */ jal func_80240428_916198 /* 916BF0 80240E80 0200302D */ daddu $a2, $s0, $zero +glabel L80240E84_916BF4 /* 916BF4 80240E84 0260202D */ daddu $a0, $s3, $zero /* 916BF8 80240E88 0280282D */ daddu $a1, $s4, $zero /* 916BFC 80240E8C 0C090134 */ jal func_802404D0_916240 /* 916C00 80240E90 0200302D */ daddu $a2, $s0, $zero /* 916C04 80240E94 080903EF */ j .L80240FBC /* 916C08 80240E98 0000102D */ daddu $v0, $zero, $zero +glabel L80240E9C_916C0C /* 916C0C 80240E9C 0260202D */ daddu $a0, $s3, $zero /* 916C10 80240EA0 0280282D */ daddu $a1, $s4, $zero /* 916C14 80240EA4 0C0127DF */ jal func_80049F7C @@ -146,6 +153,7 @@ glabel func_80240C90_916A00 /* 916C20 80240EB0 2402000D */ addiu $v0, $zero, 0xd /* 916C24 80240EB4 14620041 */ bne $v1, $v0, .L80240FBC /* 916C28 80240EB8 0000102D */ daddu $v0, $zero, $zero +glabel L80240EBC_916C2C /* 916C2C 80240EBC 0260202D */ daddu $a0, $s3, $zero /* 916C30 80240EC0 0280282D */ daddu $a1, $s4, $zero /* 916C34 80240EC4 0C012849 */ jal func_8004A124 @@ -154,6 +162,7 @@ glabel func_80240C90_916A00 /* 916C40 80240ED0 2402000E */ addiu $v0, $zero, 0xe /* 916C44 80240ED4 14620039 */ bne $v1, $v0, .L80240FBC /* 916C48 80240ED8 0000102D */ daddu $v0, $zero, $zero +glabel L80240EDC_916C4C /* 916C4C 80240EDC 96A2008E */ lhu $v0, 0x8e($s5) /* 916C50 80240EE0 2442FFFF */ addiu $v0, $v0, -1 /* 916C54 80240EE4 A6A2008E */ sh $v0, 0x8e($s5) @@ -163,22 +172,26 @@ glabel func_80240C90_916A00 /* 916C64 80240EF4 24020028 */ addiu $v0, $zero, 0x28 /* 916C68 80240EF8 080903EE */ j .L80240FB8 /* 916C6C 80240EFC AE620070 */ sw $v0, 0x70($s3) +glabel L80240F00_916C70 /* 916C70 80240F00 0260202D */ daddu $a0, $s3, $zero /* 916C74 80240F04 0280282D */ daddu $a1, $s4, $zero /* 916C78 80240F08 0C090191 */ jal func_80240644_9163B4 /* 916C7C 80240F0C 0200302D */ daddu $a2, $s0, $zero +glabel L80240F10_916C80 /* 916C80 80240F10 0260202D */ daddu $a0, $s3, $zero /* 916C84 80240F14 0280282D */ daddu $a1, $s4, $zero /* 916C88 80240F18 0C0901A5 */ jal func_80240694_916404 /* 916C8C 80240F1C 0200302D */ daddu $a2, $s0, $zero /* 916C90 80240F20 080903EF */ j .L80240FBC /* 916C94 80240F24 0000102D */ daddu $v0, $zero, $zero +glabel L80240F28_916C98 /* 916C98 80240F28 0260202D */ daddu $a0, $s3, $zero /* 916C9C 80240F2C 0280282D */ daddu $a1, $s4, $zero /* 916CA0 80240F30 0C09020D */ jal func_80240834_9165A4 /* 916CA4 80240F34 0200302D */ daddu $a2, $s0, $zero /* 916CA8 80240F38 080903EF */ j .L80240FBC /* 916CAC 80240F3C 0000102D */ daddu $v0, $zero, $zero +glabel L80240F40_916CB0 /* 916CB0 80240F40 0260202D */ daddu $a0, $s3, $zero /* 916CB4 80240F44 0280282D */ daddu $a1, $s4, $zero /* 916CB8 80240F48 0C090261 */ jal func_80240984_9166F4 @@ -187,16 +200,19 @@ glabel func_80240C90_916A00 /* 916CC4 80240F54 24020029 */ addiu $v0, $zero, 0x29 /* 916CC8 80240F58 14620018 */ bne $v1, $v0, .L80240FBC /* 916CCC 80240F5C 0000102D */ daddu $v0, $zero, $zero +glabel L80240F60_916CD0 /* 916CD0 80240F60 0260202D */ daddu $a0, $s3, $zero /* 916CD4 80240F64 0280282D */ daddu $a1, $s4, $zero /* 916CD8 80240F68 0C09028C */ jal func_80240A30_9167A0 /* 916CDC 80240F6C 0200302D */ daddu $a2, $s0, $zero /* 916CE0 80240F70 080903EF */ j .L80240FBC /* 916CE4 80240F74 0000102D */ daddu $v0, $zero, $zero +glabel L80240F78_916CE8 /* 916CE8 80240F78 0260202D */ daddu $a0, $s3, $zero /* 916CEC 80240F7C 0280282D */ daddu $a1, $s4, $zero /* 916CF0 80240F80 0C0902DA */ jal func_80240B68_9168D8 /* 916CF4 80240F84 0200302D */ daddu $a2, $s0, $zero +glabel L80240F88_916CF8 /* 916CF8 80240F88 0260202D */ daddu $a0, $s3, $zero /* 916CFC 80240F8C 0280282D */ daddu $a1, $s4, $zero /* 916D00 80240F90 0C0902F9 */ jal func_80240BE4_916954 @@ -205,11 +221,13 @@ glabel func_80240C90_916A00 /* 916D0C 80240F9C 24020034 */ addiu $v0, $zero, 0x34 /* 916D10 80240FA0 14620006 */ bne $v1, $v0, .L80240FBC /* 916D14 80240FA4 0000102D */ daddu $v0, $zero, $zero +glabel L80240FA8_916D18 /* 916D18 80240FA8 0260202D */ daddu $a0, $s3, $zero /* 916D1C 80240FAC 0280282D */ daddu $a1, $s4, $zero /* 916D20 80240FB0 0C090313 */ jal iwa_02_UnkDurationCheck /* 916D24 80240FB4 0200302D */ daddu $a2, $s0, $zero .L80240FB8: +glabel L80240FB8_916D28 /* 916D28 80240FB8 0000102D */ daddu $v0, $zero, $zero .L80240FBC: /* 916D2C 80240FBC 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240FE0_916D50.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240FE0_916D50.s index 2b08cedef9..33a93e0d99 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240FE0_916D50.s +++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240FE0_916D50.s @@ -26,7 +26,7 @@ glabel func_80240FE0_916D50 /* 916DA0 80241030 1440FFFA */ bnez $v0, .L8024101C /* 916DA4 80241034 24A50004 */ addiu $a1, $a1, 4 /* 916DA8 80241038 0809041F */ j .L8024107C -/* 916DAC 8024103C 00000000 */ nop +/* 916DAC 8024103C 00000000 */ nop .L80241040: /* 916DB0 80241040 0000182D */ daddu $v1, $zero, $zero /* 916DB4 80241044 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240000_918BB0.s b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240000_918BB0.s index 8ab6fa136d..218782d9c8 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240000_918BB0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240000_918BB0.s @@ -26,7 +26,7 @@ glabel func_80240000_918BB0 /* 918C00 80240050 1440FFFA */ bnez $v0, .L8024003C /* 918C04 80240054 24A50004 */ addiu $a1, $a1, 4 /* 918C08 80240058 08090027 */ j .L8024009C -/* 918C0C 8024005C 00000000 */ nop +/* 918C0C 8024005C 00000000 */ nop .L80240060: /* 918C10 80240060 0000182D */ daddu $v1, $zero, $zero /* 918C14 80240064 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s index 3e46faef59..fda9bf828e 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s @@ -10,10 +10,10 @@ glabel func_802402BC_918E6C /* 918E80 802402D0 44800000 */ mtc1 $zero, $f0 /* 918E84 802402D4 2406FFFF */ addiu $a2, $zero, -1 /* 918E88 802402D8 44821000 */ mtc1 $v0, $f2 -/* 918E8C 802402DC 00000000 */ nop +/* 918E8C 802402DC 00000000 */ nop /* 918E90 802402E0 468010A1 */ cvt.d.w $f2, $f2 /* 918E94 802402E4 4622003C */ c.lt.d $f0, $f2 -/* 918E98 802402E8 00000000 */ nop +/* 918E98 802402E8 00000000 */ nop /* 918E9C 802402EC 45000002 */ bc1f .L802402F8 /* 918EA0 802402F0 AFBF0010 */ sw $ra, 0x10($sp) /* 918EA4 802402F4 0000302D */ daddu $a2, $zero, $zero @@ -21,14 +21,14 @@ glabel func_802402BC_918E6C /* 918EA8 802402F8 3C014044 */ lui $at, 0x4044 /* 918EAC 802402FC 44810800 */ mtc1 $at, $f1 /* 918EB0 80240300 44800000 */ mtc1 $zero, $f0 -/* 918EB4 80240304 00000000 */ nop +/* 918EB4 80240304 00000000 */ nop /* 918EB8 80240308 4620103C */ c.lt.d $f2, $f0 -/* 918EBC 8024030C 00000000 */ nop +/* 918EBC 8024030C 00000000 */ nop /* 918EC0 80240310 45030001 */ bc1tl .L80240318 /* 918EC4 80240314 24060001 */ addiu $a2, $zero, 1 .L80240318: /* 918EC8 80240318 04C00004 */ bltz $a2, .L8024032C -/* 918ECC 8024031C 00000000 */ nop +/* 918ECC 8024031C 00000000 */ nop /* 918ED0 80240320 3C05FD05 */ lui $a1, 0xfd05 /* 918ED4 80240324 0C0B2026 */ jal set_variable /* 918ED8 80240328 34A50F89 */ ori $a1, $a1, 0xf89 @@ -37,4 +37,4 @@ glabel func_802402BC_918E6C /* 918EE0 80240330 0000102D */ daddu $v0, $zero, $zero /* 918EE4 80240334 03E00008 */ jr $ra /* 918EE8 80240338 27BD0018 */ addiu $sp, $sp, 0x18 -/* 918EEC 8024033C 00000000 */ nop +/* 918EEC 8024033C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240340_918EF0.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240340_918EF0.s index 881cdbd590..3e890f9563 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240340_918EF0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240340_918EF0.s @@ -42,9 +42,9 @@ glabel func_80240340_918EF0 /* 918F84 802403D4 D4222C30 */ ldc1 $f2, %lo(D_80242C30)($at) /* 918F88 802403D8 46000021 */ cvt.d.s $f0, $f0 /* 918F8C 802403DC 4622003C */ c.lt.d $f0, $f2 -/* 918F90 802403E0 00000000 */ nop +/* 918F90 802403E0 00000000 */ nop /* 918F94 802403E4 45000003 */ bc1f .L802403F4 -/* 918F98 802403E8 00000000 */ nop +/* 918F98 802403E8 00000000 */ nop /* 918F9C 802403EC 3C0142B4 */ lui $at, 0x42b4 /* 918FA0 802403F0 4481A000 */ mtc1 $at, $f20 .L802403F4: @@ -64,7 +64,7 @@ glabel func_80240340_918EF0 /* 918FD8 80240428 D4222C38 */ ldc1 $f2, %lo(D_80242C38)($at) /* 918FDC 8024042C 46000021 */ cvt.d.s $f0, $f0 /* 918FE0 80240430 4620103C */ c.lt.d $f2, $f0 -/* 918FE4 80240434 00000000 */ nop +/* 918FE4 80240434 00000000 */ nop /* 918FE8 80240438 45030001 */ bc1tl .L80240440 /* 918FEC 8024043C 0000802D */ daddu $s0, $zero, $zero .L80240440: @@ -76,7 +76,7 @@ glabel func_80240340_918EF0 /* 919004 80240454 44811000 */ mtc1 $at, $f2 /* 919008 80240458 46000005 */ abs.s $f0, $f0 /* 91900C 8024045C 4600103E */ c.le.s $f2, $f0 -/* 919010 80240460 00000000 */ nop +/* 919010 80240460 00000000 */ nop /* 919014 80240464 45030001 */ bc1tl .L8024046C /* 919018 80240468 0000802D */ daddu $s0, $zero, $zero .L8024046C: diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240514_9190C4.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240514_9190C4.s index 8076d5e302..a057a23149 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240514_9190C4.s +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240514_9190C4.s @@ -25,7 +25,7 @@ glabel func_80240514_9190C4 /* 919114 80240564 D4222C40 */ ldc1 $f2, %lo(D_80242C40)($at) /* 919118 80240568 46000021 */ cvt.d.s $f0, $f0 /* 91911C 8024056C 46220002 */ mul.d $f0, $f0, $f2 -/* 919120 80240570 00000000 */ nop +/* 919120 80240570 00000000 */ nop /* 919124 80240574 0280202D */ daddu $a0, $s4, $zero /* 919128 80240578 AFA00010 */ sw $zero, 0x10($sp) /* 91912C 8024057C 8E470010 */ lw $a3, 0x10($s2) @@ -47,7 +47,7 @@ glabel func_80240514_9190C4 /* 91916C 802405BC 3C01C1A0 */ lui $at, 0xc1a0 /* 919170 802405C0 44812000 */ mtc1 $at, $f4 /* 919174 802405C4 44823000 */ mtc1 $v0, $f6 -/* 919178 802405C8 00000000 */ nop +/* 919178 802405C8 00000000 */ nop /* 91917C 802405CC 468031A0 */ cvt.s.w $f6, $f6 /* 919180 802405D0 44073000 */ mfc1 $a3, $f6 /* 919184 802405D4 2402000F */ addiu $v0, $zero, 0xf diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240644_9191F4.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240644_9191F4.s index de0c1f72b8..72e6855771 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240644_9191F4.s +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240644_9191F4.s @@ -17,7 +17,7 @@ glabel func_80240644_9191F4 /* 919224 80240674 A602008E */ sh $v0, 0x8e($s0) /* 919228 80240678 00021400 */ sll $v0, $v0, 0x10 /* 91922C 8024067C 1C400012 */ bgtz $v0, .L802406C8 -/* 919230 80240680 00000000 */ nop +/* 919230 80240680 00000000 */ nop /* 919234 80240684 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 919238 80240688 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* 91923C 8024068C C60C0038 */ lwc1 $f12, 0x38($s0) diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802406E0_919290.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802406E0_919290.s index 57e4a45613..4fe1957cc0 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802406E0_919290.s +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802406E0_919290.s @@ -16,7 +16,7 @@ glabel func_802406E0_919290 /* 9192BC 8024070C A602008E */ sh $v0, 0x8e($s0) /* 9192C0 80240710 00021400 */ sll $v0, $v0, 0x10 /* 9192C4 80240714 1C40000F */ bgtz $v0, .L80240754 -/* 9192C8 80240718 00000000 */ nop +/* 9192C8 80240718 00000000 */ nop /* 9192CC 8024071C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 9192D0 80240720 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* 9192D4 80240724 C60C0038 */ lwc1 $f12, 0x38($s0) diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240768_919318.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240768_919318.s index 693410b994..6cae3e94cd 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240768_919318.s +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240768_919318.s @@ -16,7 +16,7 @@ glabel func_80240768_919318 /* 919344 80240794 0040802D */ daddu $s0, $v0, $zero /* 919348 80240798 C60C000C */ lwc1 $f12, 0xc($s0) /* 91934C 8024079C 44820000 */ mtc1 $v0, $f0 -/* 919350 802407A0 00000000 */ nop +/* 919350 802407A0 00000000 */ nop /* 919354 802407A4 46800020 */ cvt.s.w $f0, $f0 /* 919358 802407A8 46006300 */ add.s $f12, $f12, $f0 /* 91935C 802407AC 3C0142B4 */ lui $at, 0x42b4 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240810_9193C0.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240810_9193C0.s index 4fdf15b106..e0a1417a1a 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240810_9193C0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240810_9193C0.s @@ -22,7 +22,7 @@ glabel func_80240810_9193C0 /* 919404 80240854 0C01242D */ jal func_800490B4 /* 919408 80240858 0040802D */ daddu $s0, $v0, $zero /* 91940C 8024085C 1040000B */ beqz $v0, .L8024088C -/* 919410 80240860 00000000 */ nop +/* 919410 80240860 00000000 */ nop /* 919414 80240864 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 919418 80240868 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* 91941C 8024086C C60C0038 */ lwc1 $f12, 0x38($s0) @@ -39,7 +39,7 @@ glabel func_80240810_9193C0 /* 919444 80240894 A602008E */ sh $v0, 0x8e($s0) /* 919448 80240898 00021400 */ sll $v0, $v0, 0x10 /* 91944C 8024089C 1C400032 */ bgtz $v0, .L80240968 -/* 919450 802408A0 00000000 */ nop +/* 919450 802408A0 00000000 */ nop /* 919454 802408A4 8E620074 */ lw $v0, 0x74($s3) /* 919458 802408A8 2442FFFF */ addiu $v0, $v0, -1 /* 91945C 802408AC 18400014 */ blez $v0, .L80240900 @@ -77,7 +77,7 @@ glabel func_80240810_9193C0 /* 9194D8 80240928 2402000C */ addiu $v0, $zero, 0xc /* 9194DC 8024092C AFA2001C */ sw $v0, 0x1c($sp) /* 9194E0 80240930 44833000 */ mtc1 $v1, $f6 -/* 9194E4 80240934 00000000 */ nop +/* 9194E4 80240934 00000000 */ nop /* 9194E8 80240938 468031A0 */ cvt.s.w $f6, $f6 /* 9194EC 8024093C 44073000 */ mfc1 $a3, $f6 /* 9194F0 80240940 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4_919584.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4_919584.s index b2a2afc77f..76b979f667 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4_919584.s +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4_919584.s @@ -55,23 +55,23 @@ glabel func_802409D4_919584 /* 919648 80240A98 A602008E */ sh $v0, 0x8e($s0) /* 91964C 80240A9C 00021400 */ sll $v0, $v0, 0x10 /* 919650 80240AA0 1C40002C */ bgtz $v0, .L80240B54 -/* 919654 80240AA4 00000000 */ nop +/* 919654 80240AA4 00000000 */ nop /* 919658 80240AA8 C6000038 */ lwc1 $f0, 0x38($s0) /* 91965C 80240AAC 4600010D */ trunc.w.s $f4, $f0 /* 919660 80240AB0 44022000 */ mfc1 $v0, $f4 -/* 919664 80240AB4 00000000 */ nop +/* 919664 80240AB4 00000000 */ nop /* 919668 80240AB8 A6220010 */ sh $v0, 0x10($s1) /* 91966C 80240ABC C600003C */ lwc1 $f0, 0x3c($s0) /* 919670 80240AC0 4600010D */ trunc.w.s $f4, $f0 /* 919674 80240AC4 44022000 */ mfc1 $v0, $f4 -/* 919678 80240AC8 00000000 */ nop +/* 919678 80240AC8 00000000 */ nop /* 91967C 80240ACC A6220012 */ sh $v0, 0x12($s1) /* 919680 80240AD0 C6000040 */ lwc1 $f0, 0x40($s0) /* 919684 80240AD4 24020001 */ addiu $v0, $zero, 1 /* 919688 80240AD8 A2220007 */ sb $v0, 7($s1) /* 91968C 80240ADC 4600010D */ trunc.w.s $f4, $f0 /* 919690 80240AE0 44022000 */ mfc1 $v0, $f4 -/* 919694 80240AE4 00000000 */ nop +/* 919694 80240AE4 00000000 */ nop /* 919698 80240AE8 A6220014 */ sh $v0, 0x14($s1) /* 91969C 80240AEC C6800018 */ lwc1 $f0, 0x18($s4) /* 9196A0 80240AF0 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -89,7 +89,7 @@ glabel func_802409D4_919584 /* 9196D0 80240B20 46220000 */ add.d $f0, $f0, $f2 /* 9196D4 80240B24 4620010D */ trunc.w.d $f4, $f0 /* 9196D8 80240B28 44022000 */ mfc1 $v0, $f4 -/* 9196DC 80240B2C 00000000 */ nop +/* 9196DC 80240B2C 00000000 */ nop /* 9196E0 80240B30 A602008E */ sh $v0, 0x8e($s0) /* 9196E4 80240B34 00021400 */ sll $v0, $v0, 0x10 /* 9196E8 80240B38 00021403 */ sra $v0, $v0, 0x10 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240B74_919724.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240B74_919724.s index c28d82ce37..c4a216a8eb 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240B74_919724.s +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240B74_919724.s @@ -55,13 +55,13 @@ glabel func_80240B74_919724 /* 9197EC 80240C3C 860200A8 */ lh $v0, 0xa8($s0) /* 9197F0 80240C40 27A50020 */ addiu $a1, $sp, 0x20 /* 9197F4 80240C44 44820000 */ mtc1 $v0, $f0 -/* 9197F8 80240C48 00000000 */ nop +/* 9197F8 80240C48 00000000 */ nop /* 9197FC 80240C4C 46800020 */ cvt.s.w $f0, $f0 /* 919800 80240C50 E7A00018 */ swc1 $f0, 0x18($sp) /* 919804 80240C54 860200A6 */ lh $v0, 0xa6($s0) /* 919808 80240C58 27A60024 */ addiu $a2, $sp, 0x24 /* 91980C 80240C5C 44820000 */ mtc1 $v0, $f0 -/* 919810 80240C60 00000000 */ nop +/* 919810 80240C60 00000000 */ nop /* 919814 80240C64 46800020 */ cvt.s.w $f0, $f0 /* 919818 80240C68 E7A0001C */ swc1 $f0, 0x1c($sp) /* 91981C 80240C6C 8E040080 */ lw $a0, 0x80($s0) diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240CC4_919874.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240CC4_919874.s index 4e6fbff08a..96e2bf83e8 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240CC4_919874.s +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240CC4_919874.s @@ -18,14 +18,14 @@ glabel func_80240CC4_919874 /* 9198A8 80240CF8 A462008E */ sh $v0, 0x8e($v1) /* 9198AC 80240CFC 00021400 */ sll $v0, $v0, 0x10 /* 9198B0 80240D00 1C400015 */ bgtz $v0, .L80240D58 -/* 9198B4 80240D04 00000000 */ nop +/* 9198B4 80240D04 00000000 */ nop /* 9198B8 80240D08 8E0200CC */ lw $v0, 0xcc($s0) /* 9198BC 80240D0C 8C420004 */ lw $v0, 4($v0) /* 9198C0 80240D10 AC620028 */ sw $v0, 0x28($v1) /* 9198C4 80240D14 8E0200D0 */ lw $v0, 0xd0($s0) /* 9198C8 80240D18 8C420014 */ lw $v0, 0x14($v0) /* 9198CC 80240D1C 04410004 */ bgez $v0, .L80240D30 -/* 9198D0 80240D20 00000000 */ nop +/* 9198D0 80240D20 00000000 */ nop /* 9198D4 80240D24 C6200000 */ lwc1 $f0, ($s1) /* 9198D8 80240D28 08090354 */ j .L80240D50 /* 9198DC 80240D2C E4600018 */ swc1 $f0, 0x18($v1) @@ -33,7 +33,7 @@ glabel func_80240CC4_919874 /* 9198E0 80240D30 3C018024 */ lui $at, %hi(D_80242C50) /* 9198E4 80240D34 D4222C50 */ ldc1 $f2, %lo(D_80242C50)($at) /* 9198E8 80240D38 44820000 */ mtc1 $v0, $f0 -/* 9198EC 80240D3C 00000000 */ nop +/* 9198EC 80240D3C 00000000 */ nop /* 9198F0 80240D40 46800021 */ cvt.d.w $f0, $f0 /* 9198F4 80240D44 46220003 */ div.d $f0, $f0, $f2 /* 9198F8 80240D48 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240D70_919920.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240D70_919920.s index 88f9eeeda5..c5a57d6a72 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240D70_919920.s +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240D70_919920.s @@ -22,7 +22,7 @@ glabel func_80240D70_919920 /* 919964 80240DB4 0C01242D */ jal func_800490B4 /* 919968 80240DB8 0040802D */ daddu $s0, $v0, $zero /* 91996C 80240DBC 1040000C */ beqz $v0, .L80240DF0 -/* 919970 80240DC0 00000000 */ nop +/* 919970 80240DC0 00000000 */ nop /* 919974 80240DC4 C60C0038 */ lwc1 $f12, 0x38($s0) /* 919978 80240DC8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 91997C 80240DCC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -45,10 +45,10 @@ glabel func_80240D70_919920 /* 9199BC 80240E0C 46802120 */ cvt.s.w $f4, $f4 /* 9199C0 80240E10 44072000 */ mfc1 $a3, $f4 /* 9199C4 80240E14 0C00A7B5 */ jal dist2D -/* 9199C8 80240E18 00000000 */ nop +/* 9199C8 80240E18 00000000 */ nop /* 9199CC 80240E1C C6020018 */ lwc1 $f2, 0x18($s0) /* 9199D0 80240E20 4602003E */ c.le.s $f0, $f2 -/* 9199D4 80240E24 00000000 */ nop +/* 9199D4 80240E24 00000000 */ nop /* 9199D8 80240E28 45000005 */ bc1f .L80240E40 /* 9199DC 80240E2C 2402000A */ addiu $v0, $zero, 0xa /* 9199E0 80240E30 A602008E */ sh $v0, 0x8e($s0) @@ -58,7 +58,7 @@ glabel func_80240D70_919920 .L80240E40: /* 9199F0 80240E40 8602008C */ lh $v0, 0x8c($s0) /* 9199F4 80240E44 14400011 */ bnez $v0, .L80240E8C -/* 9199F8 80240E48 00000000 */ nop +/* 9199F8 80240E48 00000000 */ nop /* 9199FC 80240E4C C60C0038 */ lwc1 $f12, 0x38($s0) /* 919A00 80240E50 8E4200D0 */ lw $v0, 0xd0($s2) /* 919A04 80240E54 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -69,7 +69,7 @@ glabel func_80240D70_919920 /* 919A18 80240E68 46802120 */ cvt.s.w $f4, $f4 /* 919A1C 80240E6C 44072000 */ mfc1 $a3, $f4 /* 919A20 80240E70 0C00A720 */ jal atan2 -/* 919A24 80240E74 00000000 */ nop +/* 919A24 80240E74 00000000 */ nop /* 919A28 80240E78 8E050018 */ lw $a1, 0x18($s0) /* 919A2C 80240E7C 44060000 */ mfc1 $a2, $f0 /* 919A30 80240E80 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240EA8_919A58.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240EA8_919A58.s index 7401a0a8be..3cba03d20f 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240EA8_919A58.s +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240EA8_919A58.s @@ -19,7 +19,7 @@ glabel func_80240EA8_919A58 .L80240EE0: /* 919A90 80240EE0 8482008C */ lh $v0, 0x8c($a0) /* 919A94 80240EE4 1440000A */ bnez $v0, .L80240F10 -/* 919A98 80240EE8 00000000 */ nop +/* 919A98 80240EE8 00000000 */ nop /* 919A9C 80240EEC 8482008E */ lh $v0, 0x8e($a0) /* 919AA0 80240EF0 1C400007 */ bgtz $v0, .L80240F10 /* 919AA4 80240EF4 24020008 */ addiu $v0, $zero, 8 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s index 23f02db23a..0925f74da4 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s @@ -71,7 +71,7 @@ glabel func_80240FD0_919B80 /* 919C7C 802410CC 8E4300B0 */ lw $v1, 0xb0($s2) /* 919C80 802410D0 30620004 */ andi $v0, $v1, 4 /* 919C84 802410D4 10400007 */ beqz $v0, .L802410F4 -/* 919C88 802410D8 00000000 */ nop +/* 919C88 802410D8 00000000 */ nop /* 919C8C 802410DC 824200B4 */ lb $v0, 0xb4($s2) /* 919C90 802410E0 14400086 */ bnez $v0, .L802412FC /* 919C94 802410E4 0000102D */ daddu $v0, $zero, $zero @@ -95,15 +95,17 @@ glabel func_80240FD0_919B80 /* 919CD4 80241124 2C620035 */ sltiu $v0, $v1, 0x35 /* 919CD8 80241128 10400073 */ beqz $v0, .L802412F8 /* 919CDC 8024112C 00031080 */ sll $v0, $v1, 2 -/* 919CE0 80241130 3C018024 */ lui $at, %hi(D_80242C58) +/* 919CE0 80241130 3C018024 */ lui $at, %hi(jtbl_80242C58_91B808) /* 919CE4 80241134 00220821 */ addu $at, $at, $v0 -/* 919CE8 80241138 8C222C58 */ lw $v0, %lo(D_80242C58)($at) +/* 919CE8 80241138 8C222C58 */ lw $v0, %lo(jtbl_80242C58_91B808)($at) /* 919CEC 8024113C 00400008 */ jr $v0 -/* 919CF0 80241140 00000000 */ nop +/* 919CF0 80241140 00000000 */ nop +glabel L80241144_919CF4 /* 919CF4 80241144 0260202D */ daddu $a0, $s3, $zero /* 919CF8 80241148 0280282D */ daddu $a1, $s4, $zero /* 919CFC 8024114C 0C090128 */ jal func_802404A0_919050 /* 919D00 80241150 0200302D */ daddu $a2, $s0, $zero +glabel L80241154_919D04 /* 919D04 80241154 0260202D */ daddu $a0, $s3, $zero /* 919D08 80241158 0280282D */ daddu $a1, $s4, $zero /* 919D0C 8024115C 0C090145 */ jal func_80240514_9190C4 @@ -112,6 +114,7 @@ glabel func_80240FD0_919B80 /* 919D18 80241168 24020002 */ addiu $v0, $zero, 2 /* 919D1C 8024116C 14620063 */ bne $v1, $v0, .L802412FC /* 919D20 80241170 0000102D */ daddu $v0, $zero, $zero +glabel L80241174_919D24 /* 919D24 80241174 0260202D */ daddu $a0, $s3, $zero /* 919D28 80241178 0280282D */ daddu $a1, $s4, $zero /* 919D2C 8024117C 0C090191 */ jal func_80240644_9191F4 @@ -120,6 +123,7 @@ glabel func_80240FD0_919B80 /* 919D38 80241188 24020003 */ addiu $v0, $zero, 3 /* 919D3C 8024118C 1462005B */ bne $v1, $v0, .L802412FC /* 919D40 80241190 0000102D */ daddu $v0, $zero, $zero +glabel L80241194_919D44 /* 919D44 80241194 0260202D */ daddu $a0, $s3, $zero /* 919D48 80241198 0280282D */ daddu $a1, $s4, $zero /* 919D4C 8024119C 0C0901B8 */ jal func_802406E0_919290 @@ -128,16 +132,19 @@ glabel func_80240FD0_919B80 /* 919D58 802411A8 24020004 */ addiu $v0, $zero, 4 /* 919D5C 802411AC 14620053 */ bne $v1, $v0, .L802412FC /* 919D60 802411B0 0000102D */ daddu $v0, $zero, $zero +glabel L802411B4_919D64 /* 919D64 802411B4 0260202D */ daddu $a0, $s3, $zero /* 919D68 802411B8 0280282D */ daddu $a1, $s4, $zero /* 919D6C 802411BC 0C0901DA */ jal func_80240768_919318 /* 919D70 802411C0 0200302D */ daddu $a2, $s0, $zero +glabel L802411C4_919D74 /* 919D74 802411C4 0260202D */ daddu $a0, $s3, $zero /* 919D78 802411C8 0280282D */ daddu $a1, $s4, $zero /* 919D7C 802411CC 0C090204 */ jal func_80240810_9193C0 /* 919D80 802411D0 0200302D */ daddu $a2, $s0, $zero /* 919D84 802411D4 080904BF */ j .L802412FC /* 919D88 802411D8 0000102D */ daddu $v0, $zero, $zero +glabel L802411DC_919D8C /* 919D8C 802411DC 0260202D */ daddu $a0, $s3, $zero /* 919D90 802411E0 0280282D */ daddu $a1, $s4, $zero /* 919D94 802411E4 0C0127DF */ jal func_80049F7C @@ -146,6 +153,7 @@ glabel func_80240FD0_919B80 /* 919DA0 802411F0 2402000D */ addiu $v0, $zero, 0xd /* 919DA4 802411F4 14620041 */ bne $v1, $v0, .L802412FC /* 919DA8 802411F8 0000102D */ daddu $v0, $zero, $zero +glabel L802411FC_919DAC /* 919DAC 802411FC 0260202D */ daddu $a0, $s3, $zero /* 919DB0 80241200 0280282D */ daddu $a1, $s4, $zero /* 919DB4 80241204 0C012849 */ jal func_8004A124 @@ -154,6 +162,7 @@ glabel func_80240FD0_919B80 /* 919DC0 80241210 2402000E */ addiu $v0, $zero, 0xe /* 919DC4 80241214 14620039 */ bne $v1, $v0, .L802412FC /* 919DC8 80241218 0000102D */ daddu $v0, $zero, $zero +glabel L8024121C_919DCC /* 919DCC 8024121C 96A2008E */ lhu $v0, 0x8e($s5) /* 919DD0 80241220 2442FFFF */ addiu $v0, $v0, -1 /* 919DD4 80241224 A6A2008E */ sh $v0, 0x8e($s5) @@ -163,22 +172,26 @@ glabel func_80240FD0_919B80 /* 919DE4 80241234 24020028 */ addiu $v0, $zero, 0x28 /* 919DE8 80241238 080904BE */ j .L802412F8 /* 919DEC 8024123C AE620070 */ sw $v0, 0x70($s3) +glabel L80241240_919DF0 /* 919DF0 80241240 0260202D */ daddu $a0, $s3, $zero /* 919DF4 80241244 0280282D */ daddu $a1, $s4, $zero /* 919DF8 80241248 0C090261 */ jal func_80240984_919534 /* 919DFC 8024124C 0200302D */ daddu $a2, $s0, $zero +glabel L80241250_919E00 /* 919E00 80241250 0260202D */ daddu $a0, $s3, $zero /* 919E04 80241254 0280282D */ daddu $a1, $s4, $zero /* 919E08 80241258 0C090275 */ jal func_802409D4_919584 /* 919E0C 8024125C 0200302D */ daddu $a2, $s0, $zero /* 919E10 80241260 080904BF */ j .L802412FC /* 919E14 80241264 0000102D */ daddu $v0, $zero, $zero +glabel L80241268_919E18 /* 919E18 80241268 0260202D */ daddu $a0, $s3, $zero /* 919E1C 8024126C 0280282D */ daddu $a1, $s4, $zero /* 919E20 80241270 0C0902DD */ jal func_80240B74_919724 /* 919E24 80241274 0200302D */ daddu $a2, $s0, $zero /* 919E28 80241278 080904BF */ j .L802412FC /* 919E2C 8024127C 0000102D */ daddu $v0, $zero, $zero +glabel L80241280_919E30 /* 919E30 80241280 0260202D */ daddu $a0, $s3, $zero /* 919E34 80241284 0280282D */ daddu $a1, $s4, $zero /* 919E38 80241288 0C090331 */ jal func_80240CC4_919874 @@ -187,16 +200,19 @@ glabel func_80240FD0_919B80 /* 919E44 80241294 24020029 */ addiu $v0, $zero, 0x29 /* 919E48 80241298 14620018 */ bne $v1, $v0, .L802412FC /* 919E4C 8024129C 0000102D */ daddu $v0, $zero, $zero +glabel L802412A0_919E50 /* 919E50 802412A0 0260202D */ daddu $a0, $s3, $zero /* 919E54 802412A4 0280282D */ daddu $a1, $s4, $zero /* 919E58 802412A8 0C09035C */ jal func_80240D70_919920 /* 919E5C 802412AC 0200302D */ daddu $a2, $s0, $zero /* 919E60 802412B0 080904BF */ j .L802412FC /* 919E64 802412B4 0000102D */ daddu $v0, $zero, $zero +glabel L802412B8_919E68 /* 919E68 802412B8 0260202D */ daddu $a0, $s3, $zero /* 919E6C 802412BC 0280282D */ daddu $a1, $s4, $zero /* 919E70 802412C0 0C0903AA */ jal func_80240EA8_919A58 /* 919E74 802412C4 0200302D */ daddu $a2, $s0, $zero +glabel L802412C8_919E78 /* 919E78 802412C8 0260202D */ daddu $a0, $s3, $zero /* 919E7C 802412CC 0280282D */ daddu $a1, $s4, $zero /* 919E80 802412D0 0C0903C9 */ jal func_80240F24_919AD4 @@ -205,11 +221,13 @@ glabel func_80240FD0_919B80 /* 919E8C 802412DC 24020034 */ addiu $v0, $zero, 0x34 /* 919E90 802412E0 14620006 */ bne $v1, $v0, .L802412FC /* 919E94 802412E4 0000102D */ daddu $v0, $zero, $zero +glabel L802412E8_919E98 /* 919E98 802412E8 0260202D */ daddu $a0, $s3, $zero /* 919E9C 802412EC 0280282D */ daddu $a1, $s4, $zero /* 919EA0 802412F0 0C0903E3 */ jal iwa_03_UnkDurationCheck /* 919EA4 802412F4 0200302D */ daddu $a2, $s0, $zero .L802412F8: +glabel L802412F8_919EA8 /* 919EA8 802412F8 0000102D */ daddu $v0, $zero, $zero .L802412FC: /* 919EAC 802412FC 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80241320_919ED0.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80241320_919ED0.s index 2945dc47ab..02e92063ce 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80241320_919ED0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80241320_919ED0.s @@ -11,6 +11,6 @@ glabel func_80241320_919ED0 /* 919EE8 80241338 AC430000 */ sw $v1, ($v0) /* 919EEC 8024133C 03E00008 */ jr $ra /* 919EF0 80241340 24020002 */ addiu $v0, $zero, 2 -/* 919EF4 80241344 00000000 */ nop -/* 919EF8 80241348 00000000 */ nop -/* 919EFC 8024134C 00000000 */ nop +/* 919EF4 80241344 00000000 */ nop +/* 919EF8 80241348 00000000 */ nop +/* 919EFC 8024134C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s index 81b2d5b654..df2af31344 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s @@ -10,10 +10,10 @@ glabel func_80240000_91B8E0 /* 91B8F4 80240014 44800000 */ mtc1 $zero, $f0 /* 91B8F8 80240018 2406FFFF */ addiu $a2, $zero, -1 /* 91B8FC 8024001C 44821000 */ mtc1 $v0, $f2 -/* 91B900 80240020 00000000 */ nop +/* 91B900 80240020 00000000 */ nop /* 91B904 80240024 468010A1 */ cvt.d.w $f2, $f2 /* 91B908 80240028 4622003C */ c.lt.d $f0, $f2 -/* 91B90C 8024002C 00000000 */ nop +/* 91B90C 8024002C 00000000 */ nop /* 91B910 80240030 45000002 */ bc1f .L8024003C /* 91B914 80240034 AFBF0010 */ sw $ra, 0x10($sp) /* 91B918 80240038 0000302D */ daddu $a2, $zero, $zero @@ -21,14 +21,14 @@ glabel func_80240000_91B8E0 /* 91B91C 8024003C 3C01C06E */ lui $at, 0xc06e /* 91B920 80240040 44810800 */ mtc1 $at, $f1 /* 91B924 80240044 44800000 */ mtc1 $zero, $f0 -/* 91B928 80240048 00000000 */ nop +/* 91B928 80240048 00000000 */ nop /* 91B92C 8024004C 4620103C */ c.lt.d $f2, $f0 -/* 91B930 80240050 00000000 */ nop +/* 91B930 80240050 00000000 */ nop /* 91B934 80240054 45030001 */ bc1tl .L8024005C /* 91B938 80240058 24060001 */ addiu $a2, $zero, 1 .L8024005C: /* 91B93C 8024005C 04C00004 */ bltz $a2, .L80240070 -/* 91B940 80240060 00000000 */ nop +/* 91B940 80240060 00000000 */ nop /* 91B944 80240064 3C05FD05 */ lui $a1, 0xfd05 /* 91B948 80240068 0C0B2026 */ jal set_variable /* 91B94C 8024006C 34A50F89 */ ori $a1, $a1, 0xf89 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s index b5d9639280..9e91c4ab57 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s @@ -42,9 +42,9 @@ glabel func_80240080_91B960 /* 91B9F4 80240114 D4222B90 */ ldc1 $f2, %lo(func_80242B90_803410)($at) /* 91B9F8 80240118 46000021 */ cvt.d.s $f0, $f0 /* 91B9FC 8024011C 4622003C */ c.lt.d $f0, $f2 -/* 91BA00 80240120 00000000 */ nop +/* 91BA00 80240120 00000000 */ nop /* 91BA04 80240124 45000003 */ bc1f .L80240134 -/* 91BA08 80240128 00000000 */ nop +/* 91BA08 80240128 00000000 */ nop /* 91BA0C 8024012C 3C0142B4 */ lui $at, 0x42b4 /* 91BA10 80240130 4481A000 */ mtc1 $at, $f20 .L80240134: @@ -64,7 +64,7 @@ glabel func_80240080_91B960 /* 91BA48 80240168 D4222B98 */ ldc1 $f2, %lo(D_80242B98)($at) /* 91BA4C 8024016C 46000021 */ cvt.d.s $f0, $f0 /* 91BA50 80240170 4620103C */ c.lt.d $f2, $f0 -/* 91BA54 80240174 00000000 */ nop +/* 91BA54 80240174 00000000 */ nop /* 91BA58 80240178 45030001 */ bc1tl .L80240180 /* 91BA5C 8024017C 0000802D */ daddu $s0, $zero, $zero .L80240180: @@ -76,7 +76,7 @@ glabel func_80240080_91B960 /* 91BA74 80240194 44811000 */ mtc1 $at, $f2 /* 91BA78 80240198 46000005 */ abs.s $f0, $f0 /* 91BA7C 8024019C 4600103E */ c.le.s $f2, $f0 -/* 91BA80 802401A0 00000000 */ nop +/* 91BA80 802401A0 00000000 */ nop /* 91BA84 802401A4 45030001 */ bc1tl .L802401AC /* 91BA88 802401A8 0000802D */ daddu $s0, $zero, $zero .L802401AC: diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240254_91BB34.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240254_91BB34.s index 799b9bf350..8fcda45b70 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240254_91BB34.s +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240254_91BB34.s @@ -25,7 +25,7 @@ glabel func_80240254_91BB34 /* 91BB84 802402A4 D4222BA0 */ ldc1 $f2, %lo(pause_set_cursor_opacity)($at) /* 91BB88 802402A8 46000021 */ cvt.d.s $f0, $f0 /* 91BB8C 802402AC 46220002 */ mul.d $f0, $f0, $f2 -/* 91BB90 802402B0 00000000 */ nop +/* 91BB90 802402B0 00000000 */ nop /* 91BB94 802402B4 0280202D */ daddu $a0, $s4, $zero /* 91BB98 802402B8 AFA00010 */ sw $zero, 0x10($sp) /* 91BB9C 802402BC 8E470010 */ lw $a3, 0x10($s2) @@ -47,7 +47,7 @@ glabel func_80240254_91BB34 /* 91BBDC 802402FC 3C01C1A0 */ lui $at, 0xc1a0 /* 91BBE0 80240300 44812000 */ mtc1 $at, $f4 /* 91BBE4 80240304 44823000 */ mtc1 $v0, $f6 -/* 91BBE8 80240308 00000000 */ nop +/* 91BBE8 80240308 00000000 */ nop /* 91BBEC 8024030C 468031A0 */ cvt.s.w $f6, $f6 /* 91BBF0 80240310 44073000 */ mfc1 $a3, $f6 /* 91BBF4 80240314 2402000F */ addiu $v0, $zero, 0xf diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240384_91BC64.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240384_91BC64.s index 31bfd30720..7213373834 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240384_91BC64.s +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240384_91BC64.s @@ -17,7 +17,7 @@ glabel func_80240384_91BC64 /* 91BC94 802403B4 A602008E */ sh $v0, 0x8e($s0) /* 91BC98 802403B8 00021400 */ sll $v0, $v0, 0x10 /* 91BC9C 802403BC 1C400012 */ bgtz $v0, .L80240408 -/* 91BCA0 802403C0 00000000 */ nop +/* 91BCA0 802403C0 00000000 */ nop /* 91BCA4 802403C4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 91BCA8 802403C8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* 91BCAC 802403CC C60C0038 */ lwc1 $f12, 0x38($s0) diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240420_91BD00.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240420_91BD00.s index 1009182204..e35b7d8b05 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240420_91BD00.s +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240420_91BD00.s @@ -16,7 +16,7 @@ glabel func_80240420_91BD00 /* 91BD2C 8024044C A602008E */ sh $v0, 0x8e($s0) /* 91BD30 80240450 00021400 */ sll $v0, $v0, 0x10 /* 91BD34 80240454 1C40000F */ bgtz $v0, .L80240494 -/* 91BD38 80240458 00000000 */ nop +/* 91BD38 80240458 00000000 */ nop /* 91BD3C 8024045C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 91BD40 80240460 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* 91BD44 80240464 C60C0038 */ lwc1 $f12, 0x38($s0) diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_802404A8_91BD88.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_802404A8_91BD88.s index 1dbb910c38..7c84739636 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_802404A8_91BD88.s +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_802404A8_91BD88.s @@ -16,7 +16,7 @@ glabel func_802404A8_91BD88 /* 91BDB4 802404D4 0040802D */ daddu $s0, $v0, $zero /* 91BDB8 802404D8 C60C000C */ lwc1 $f12, 0xc($s0) /* 91BDBC 802404DC 44820000 */ mtc1 $v0, $f0 -/* 91BDC0 802404E0 00000000 */ nop +/* 91BDC0 802404E0 00000000 */ nop /* 91BDC4 802404E4 46800020 */ cvt.s.w $f0, $f0 /* 91BDC8 802404E8 46006300 */ add.s $f12, $f12, $f0 /* 91BDCC 802404EC 3C0142B4 */ lui $at, 0x42b4 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240550_91BE30.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240550_91BE30.s index c8cca79339..0edabc85b7 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240550_91BE30.s +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240550_91BE30.s @@ -22,7 +22,7 @@ glabel func_80240550_91BE30 /* 91BE74 80240594 0C01242D */ jal func_800490B4 /* 91BE78 80240598 0040802D */ daddu $s0, $v0, $zero /* 91BE7C 8024059C 1040000B */ beqz $v0, .L802405CC -/* 91BE80 802405A0 00000000 */ nop +/* 91BE80 802405A0 00000000 */ nop /* 91BE84 802405A4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 91BE88 802405A8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* 91BE8C 802405AC C60C0038 */ lwc1 $f12, 0x38($s0) @@ -39,7 +39,7 @@ glabel func_80240550_91BE30 /* 91BEB4 802405D4 A602008E */ sh $v0, 0x8e($s0) /* 91BEB8 802405D8 00021400 */ sll $v0, $v0, 0x10 /* 91BEBC 802405DC 1C400032 */ bgtz $v0, .L802406A8 -/* 91BEC0 802405E0 00000000 */ nop +/* 91BEC0 802405E0 00000000 */ nop /* 91BEC4 802405E4 8E620074 */ lw $v0, 0x74($s3) /* 91BEC8 802405E8 2442FFFF */ addiu $v0, $v0, -1 /* 91BECC 802405EC 18400014 */ blez $v0, .L80240640 @@ -77,7 +77,7 @@ glabel func_80240550_91BE30 /* 91BF48 80240668 2402000C */ addiu $v0, $zero, 0xc /* 91BF4C 8024066C AFA2001C */ sw $v0, 0x1c($sp) /* 91BF50 80240670 44833000 */ mtc1 $v1, $f6 -/* 91BF54 80240674 00000000 */ nop +/* 91BF54 80240674 00000000 */ nop /* 91BF58 80240678 468031A0 */ cvt.s.w $f6, $f6 /* 91BF5C 8024067C 44073000 */ mfc1 $a3, $f6 /* 91BF60 80240680 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714_91BFF4.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714_91BFF4.s index 54015bb640..a5d649769f 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714_91BFF4.s +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714_91BFF4.s @@ -55,23 +55,23 @@ glabel func_80240714_91BFF4 /* 91C0B8 802407D8 A602008E */ sh $v0, 0x8e($s0) /* 91C0BC 802407DC 00021400 */ sll $v0, $v0, 0x10 /* 91C0C0 802407E0 1C40002C */ bgtz $v0, .L80240894 -/* 91C0C4 802407E4 00000000 */ nop +/* 91C0C4 802407E4 00000000 */ nop /* 91C0C8 802407E8 C6000038 */ lwc1 $f0, 0x38($s0) /* 91C0CC 802407EC 4600010D */ trunc.w.s $f4, $f0 /* 91C0D0 802407F0 44022000 */ mfc1 $v0, $f4 -/* 91C0D4 802407F4 00000000 */ nop +/* 91C0D4 802407F4 00000000 */ nop /* 91C0D8 802407F8 A6220010 */ sh $v0, 0x10($s1) /* 91C0DC 802407FC C600003C */ lwc1 $f0, 0x3c($s0) /* 91C0E0 80240800 4600010D */ trunc.w.s $f4, $f0 /* 91C0E4 80240804 44022000 */ mfc1 $v0, $f4 -/* 91C0E8 80240808 00000000 */ nop +/* 91C0E8 80240808 00000000 */ nop /* 91C0EC 8024080C A6220012 */ sh $v0, 0x12($s1) /* 91C0F0 80240810 C6000040 */ lwc1 $f0, 0x40($s0) /* 91C0F4 80240814 24020001 */ addiu $v0, $zero, 1 /* 91C0F8 80240818 A2220007 */ sb $v0, 7($s1) /* 91C0FC 8024081C 4600010D */ trunc.w.s $f4, $f0 /* 91C100 80240820 44022000 */ mfc1 $v0, $f4 -/* 91C104 80240824 00000000 */ nop +/* 91C104 80240824 00000000 */ nop /* 91C108 80240828 A6220014 */ sh $v0, 0x14($s1) /* 91C10C 8024082C C6800018 */ lwc1 $f0, 0x18($s4) /* 91C110 80240830 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -89,7 +89,7 @@ glabel func_80240714_91BFF4 /* 91C140 80240860 46220000 */ add.d $f0, $f0, $f2 /* 91C144 80240864 4620010D */ trunc.w.d $f4, $f0 /* 91C148 80240868 44022000 */ mfc1 $v0, $f4 -/* 91C14C 8024086C 00000000 */ nop +/* 91C14C 8024086C 00000000 */ nop /* 91C150 80240870 A602008E */ sh $v0, 0x8e($s0) /* 91C154 80240874 00021400 */ sll $v0, $v0, 0x10 /* 91C158 80240878 00021403 */ sra $v0, $v0, 0x10 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_802408B4_91C194.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_802408B4_91C194.s index ec5ac37f3e..3b9ab0b5e8 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_802408B4_91C194.s +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_802408B4_91C194.s @@ -55,13 +55,13 @@ glabel func_802408B4_91C194 /* 91C25C 8024097C 860200A8 */ lh $v0, 0xa8($s0) /* 91C260 80240980 27A50020 */ addiu $a1, $sp, 0x20 /* 91C264 80240984 44820000 */ mtc1 $v0, $f0 -/* 91C268 80240988 00000000 */ nop +/* 91C268 80240988 00000000 */ nop /* 91C26C 8024098C 46800020 */ cvt.s.w $f0, $f0 /* 91C270 80240990 E7A00018 */ swc1 $f0, 0x18($sp) /* 91C274 80240994 860200A6 */ lh $v0, 0xa6($s0) /* 91C278 80240998 27A60024 */ addiu $a2, $sp, 0x24 /* 91C27C 8024099C 44820000 */ mtc1 $v0, $f0 -/* 91C280 802409A0 00000000 */ nop +/* 91C280 802409A0 00000000 */ nop /* 91C284 802409A4 46800020 */ cvt.s.w $f0, $f0 /* 91C288 802409A8 E7A0001C */ swc1 $f0, 0x1c($sp) /* 91C28C 802409AC 8E040080 */ lw $a0, 0x80($s0) diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240A04_91C2E4.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240A04_91C2E4.s index 24a15ff220..2c7eb1e9fa 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240A04_91C2E4.s +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240A04_91C2E4.s @@ -18,14 +18,14 @@ glabel func_80240A04_91C2E4 /* 91C318 80240A38 A462008E */ sh $v0, 0x8e($v1) /* 91C31C 80240A3C 00021400 */ sll $v0, $v0, 0x10 /* 91C320 80240A40 1C400015 */ bgtz $v0, .L80240A98 -/* 91C324 80240A44 00000000 */ nop +/* 91C324 80240A44 00000000 */ nop /* 91C328 80240A48 8E0200CC */ lw $v0, 0xcc($s0) /* 91C32C 80240A4C 8C420004 */ lw $v0, 4($v0) /* 91C330 80240A50 AC620028 */ sw $v0, 0x28($v1) /* 91C334 80240A54 8E0200D0 */ lw $v0, 0xd0($s0) /* 91C338 80240A58 8C420014 */ lw $v0, 0x14($v0) /* 91C33C 80240A5C 04410004 */ bgez $v0, .L80240A70 -/* 91C340 80240A60 00000000 */ nop +/* 91C340 80240A60 00000000 */ nop /* 91C344 80240A64 C6200000 */ lwc1 $f0, ($s1) /* 91C348 80240A68 080902A4 */ j .L80240A90 /* 91C34C 80240A6C E4600018 */ swc1 $f0, 0x18($v1) @@ -33,7 +33,7 @@ glabel func_80240A04_91C2E4 /* 91C350 80240A70 3C018024 */ lui $at, %hi(update_end_player_turn) /* 91C354 80240A74 D4222BB0 */ ldc1 $f2, %lo(update_end_player_turn)($at) /* 91C358 80240A78 44820000 */ mtc1 $v0, $f0 -/* 91C35C 80240A7C 00000000 */ nop +/* 91C35C 80240A7C 00000000 */ nop /* 91C360 80240A80 46800021 */ cvt.d.w $f0, $f0 /* 91C364 80240A84 46220003 */ div.d $f0, $f0, $f2 /* 91C368 80240A88 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240AB0_91C390.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240AB0_91C390.s index dbdd038a4c..56a598456f 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240AB0_91C390.s +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240AB0_91C390.s @@ -22,7 +22,7 @@ glabel func_80240AB0_91C390 /* 91C3D4 80240AF4 0C01242D */ jal func_800490B4 /* 91C3D8 80240AF8 0040802D */ daddu $s0, $v0, $zero /* 91C3DC 80240AFC 1040000C */ beqz $v0, .L80240B30 -/* 91C3E0 80240B00 00000000 */ nop +/* 91C3E0 80240B00 00000000 */ nop /* 91C3E4 80240B04 C60C0038 */ lwc1 $f12, 0x38($s0) /* 91C3E8 80240B08 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 91C3EC 80240B0C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -45,10 +45,10 @@ glabel func_80240AB0_91C390 /* 91C42C 80240B4C 46802120 */ cvt.s.w $f4, $f4 /* 91C430 80240B50 44072000 */ mfc1 $a3, $f4 /* 91C434 80240B54 0C00A7B5 */ jal dist2D -/* 91C438 80240B58 00000000 */ nop +/* 91C438 80240B58 00000000 */ nop /* 91C43C 80240B5C C6020018 */ lwc1 $f2, 0x18($s0) /* 91C440 80240B60 4602003E */ c.le.s $f0, $f2 -/* 91C444 80240B64 00000000 */ nop +/* 91C444 80240B64 00000000 */ nop /* 91C448 80240B68 45000005 */ bc1f .L80240B80 /* 91C44C 80240B6C 2402000A */ addiu $v0, $zero, 0xa /* 91C450 80240B70 A602008E */ sh $v0, 0x8e($s0) @@ -58,7 +58,7 @@ glabel func_80240AB0_91C390 .L80240B80: /* 91C460 80240B80 8602008C */ lh $v0, 0x8c($s0) /* 91C464 80240B84 14400011 */ bnez $v0, .L80240BCC -/* 91C468 80240B88 00000000 */ nop +/* 91C468 80240B88 00000000 */ nop /* 91C46C 80240B8C C60C0038 */ lwc1 $f12, 0x38($s0) /* 91C470 80240B90 8E4200D0 */ lw $v0, 0xd0($s2) /* 91C474 80240B94 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -69,7 +69,7 @@ glabel func_80240AB0_91C390 /* 91C488 80240BA8 46802120 */ cvt.s.w $f4, $f4 /* 91C48C 80240BAC 44072000 */ mfc1 $a3, $f4 /* 91C490 80240BB0 0C00A720 */ jal atan2 -/* 91C494 80240BB4 00000000 */ nop +/* 91C494 80240BB4 00000000 */ nop /* 91C498 80240BB8 8E050018 */ lw $a1, 0x18($s0) /* 91C49C 80240BBC 44060000 */ mfc1 $a2, $f0 /* 91C4A0 80240BC0 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240BE8_91C4C8.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240BE8_91C4C8.s index 4fe2d25116..375a399409 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240BE8_91C4C8.s +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240BE8_91C4C8.s @@ -19,7 +19,7 @@ glabel func_80240BE8_91C4C8 .L80240C20: /* 91C500 80240C20 8482008C */ lh $v0, 0x8c($a0) /* 91C504 80240C24 1440000A */ bnez $v0, .L80240C50 -/* 91C508 80240C28 00000000 */ nop +/* 91C508 80240C28 00000000 */ nop /* 91C50C 80240C2C 8482008E */ lh $v0, 0x8e($a0) /* 91C510 80240C30 1C400007 */ bgtz $v0, .L80240C50 /* 91C514 80240C34 24020008 */ addiu $v0, $zero, 8 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s index 3eb47f22e1..f1a45728f6 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s @@ -71,7 +71,7 @@ glabel func_80240D10_91C5F0 /* 91C6EC 80240E0C 8E4300B0 */ lw $v1, 0xb0($s2) /* 91C6F0 80240E10 30620004 */ andi $v0, $v1, 4 /* 91C6F4 80240E14 10400007 */ beqz $v0, .L80240E34 -/* 91C6F8 80240E18 00000000 */ nop +/* 91C6F8 80240E18 00000000 */ nop /* 91C6FC 80240E1C 824200B4 */ lb $v0, 0xb4($s2) /* 91C700 80240E20 14400086 */ bnez $v0, .L8024103C /* 91C704 80240E24 0000102D */ daddu $v0, $zero, $zero @@ -95,15 +95,17 @@ glabel func_80240D10_91C5F0 /* 91C744 80240E64 2C620035 */ sltiu $v0, $v1, 0x35 /* 91C748 80240E68 10400073 */ beqz $v0, .L80241038 /* 91C74C 80240E6C 00031080 */ sll $v0, $v1, 2 -/* 91C750 80240E70 3C018024 */ lui $at, %hi(D_80242BB8) +/* 91C750 80240E70 3C018024 */ lui $at, %hi(jtbl_80242BB8_91E498) /* 91C754 80240E74 00220821 */ addu $at, $at, $v0 -/* 91C758 80240E78 8C222BB8 */ lw $v0, %lo(D_80242BB8)($at) +/* 91C758 80240E78 8C222BB8 */ lw $v0, %lo(jtbl_80242BB8_91E498)($at) /* 91C75C 80240E7C 00400008 */ jr $v0 -/* 91C760 80240E80 00000000 */ nop +/* 91C760 80240E80 00000000 */ nop +glabel L80240E84_91C764 /* 91C764 80240E84 0260202D */ daddu $a0, $s3, $zero /* 91C768 80240E88 0280282D */ daddu $a1, $s4, $zero /* 91C76C 80240E8C 0C090078 */ jal func_802401E0_91BAC0 /* 91C770 80240E90 0200302D */ daddu $a2, $s0, $zero +glabel L80240E94_91C774 /* 91C774 80240E94 0260202D */ daddu $a0, $s3, $zero /* 91C778 80240E98 0280282D */ daddu $a1, $s4, $zero /* 91C77C 80240E9C 0C090095 */ jal func_80240254_91BB34 @@ -112,6 +114,7 @@ glabel func_80240D10_91C5F0 /* 91C788 80240EA8 24020002 */ addiu $v0, $zero, 2 /* 91C78C 80240EAC 14620063 */ bne $v1, $v0, .L8024103C /* 91C790 80240EB0 0000102D */ daddu $v0, $zero, $zero +glabel L80240EB4_91C794 /* 91C794 80240EB4 0260202D */ daddu $a0, $s3, $zero /* 91C798 80240EB8 0280282D */ daddu $a1, $s4, $zero /* 91C79C 80240EBC 0C0900E1 */ jal func_80240384_91BC64 @@ -120,6 +123,7 @@ glabel func_80240D10_91C5F0 /* 91C7A8 80240EC8 24020003 */ addiu $v0, $zero, 3 /* 91C7AC 80240ECC 1462005B */ bne $v1, $v0, .L8024103C /* 91C7B0 80240ED0 0000102D */ daddu $v0, $zero, $zero +glabel L80240ED4_91C7B4 /* 91C7B4 80240ED4 0260202D */ daddu $a0, $s3, $zero /* 91C7B8 80240ED8 0280282D */ daddu $a1, $s4, $zero /* 91C7BC 80240EDC 0C090108 */ jal func_80240420_91BD00 @@ -128,16 +132,19 @@ glabel func_80240D10_91C5F0 /* 91C7C8 80240EE8 24020004 */ addiu $v0, $zero, 4 /* 91C7CC 80240EEC 14620053 */ bne $v1, $v0, .L8024103C /* 91C7D0 80240EF0 0000102D */ daddu $v0, $zero, $zero +glabel L80240EF4_91C7D4 /* 91C7D4 80240EF4 0260202D */ daddu $a0, $s3, $zero /* 91C7D8 80240EF8 0280282D */ daddu $a1, $s4, $zero /* 91C7DC 80240EFC 0C09012A */ jal func_802404A8_91BD88 /* 91C7E0 80240F00 0200302D */ daddu $a2, $s0, $zero +glabel L80240F04_91C7E4 /* 91C7E4 80240F04 0260202D */ daddu $a0, $s3, $zero /* 91C7E8 80240F08 0280282D */ daddu $a1, $s4, $zero /* 91C7EC 80240F0C 0C090154 */ jal func_80240550_91BE30 /* 91C7F0 80240F10 0200302D */ daddu $a2, $s0, $zero /* 91C7F4 80240F14 0809040F */ j .L8024103C /* 91C7F8 80240F18 0000102D */ daddu $v0, $zero, $zero +glabel L80240F1C_91C7FC /* 91C7FC 80240F1C 0260202D */ daddu $a0, $s3, $zero /* 91C800 80240F20 0280282D */ daddu $a1, $s4, $zero /* 91C804 80240F24 0C0127DF */ jal func_80049F7C @@ -146,6 +153,7 @@ glabel func_80240D10_91C5F0 /* 91C810 80240F30 2402000D */ addiu $v0, $zero, 0xd /* 91C814 80240F34 14620041 */ bne $v1, $v0, .L8024103C /* 91C818 80240F38 0000102D */ daddu $v0, $zero, $zero +glabel L80240F3C_91C81C /* 91C81C 80240F3C 0260202D */ daddu $a0, $s3, $zero /* 91C820 80240F40 0280282D */ daddu $a1, $s4, $zero /* 91C824 80240F44 0C012849 */ jal func_8004A124 @@ -154,6 +162,7 @@ glabel func_80240D10_91C5F0 /* 91C830 80240F50 2402000E */ addiu $v0, $zero, 0xe /* 91C834 80240F54 14620039 */ bne $v1, $v0, .L8024103C /* 91C838 80240F58 0000102D */ daddu $v0, $zero, $zero +glabel L80240F5C_91C83C /* 91C83C 80240F5C 96A2008E */ lhu $v0, 0x8e($s5) /* 91C840 80240F60 2442FFFF */ addiu $v0, $v0, -1 /* 91C844 80240F64 A6A2008E */ sh $v0, 0x8e($s5) @@ -163,22 +172,26 @@ glabel func_80240D10_91C5F0 /* 91C854 80240F74 24020028 */ addiu $v0, $zero, 0x28 /* 91C858 80240F78 0809040E */ j .L80241038 /* 91C85C 80240F7C AE620070 */ sw $v0, 0x70($s3) +glabel L80240F80_91C860 /* 91C860 80240F80 0260202D */ daddu $a0, $s3, $zero /* 91C864 80240F84 0280282D */ daddu $a1, $s4, $zero /* 91C868 80240F88 0C0901B1 */ jal func_802406C4_91BFA4 /* 91C86C 80240F8C 0200302D */ daddu $a2, $s0, $zero +glabel L80240F90_91C870 /* 91C870 80240F90 0260202D */ daddu $a0, $s3, $zero /* 91C874 80240F94 0280282D */ daddu $a1, $s4, $zero /* 91C878 80240F98 0C0901C5 */ jal func_80240714_91BFF4 /* 91C87C 80240F9C 0200302D */ daddu $a2, $s0, $zero /* 91C880 80240FA0 0809040F */ j .L8024103C /* 91C884 80240FA4 0000102D */ daddu $v0, $zero, $zero +glabel L80240FA8_91C888 /* 91C888 80240FA8 0260202D */ daddu $a0, $s3, $zero /* 91C88C 80240FAC 0280282D */ daddu $a1, $s4, $zero /* 91C890 80240FB0 0C09022D */ jal func_802408B4_91C194 /* 91C894 80240FB4 0200302D */ daddu $a2, $s0, $zero /* 91C898 80240FB8 0809040F */ j .L8024103C /* 91C89C 80240FBC 0000102D */ daddu $v0, $zero, $zero +glabel L80240FC0_91C8A0 /* 91C8A0 80240FC0 0260202D */ daddu $a0, $s3, $zero /* 91C8A4 80240FC4 0280282D */ daddu $a1, $s4, $zero /* 91C8A8 80240FC8 0C090281 */ jal func_80240A04_91C2E4 @@ -187,16 +200,19 @@ glabel func_80240D10_91C5F0 /* 91C8B4 80240FD4 24020029 */ addiu $v0, $zero, 0x29 /* 91C8B8 80240FD8 14620018 */ bne $v1, $v0, .L8024103C /* 91C8BC 80240FDC 0000102D */ daddu $v0, $zero, $zero +glabel L80240FE0_91C8C0 /* 91C8C0 80240FE0 0260202D */ daddu $a0, $s3, $zero /* 91C8C4 80240FE4 0280282D */ daddu $a1, $s4, $zero /* 91C8C8 80240FE8 0C0902AC */ jal func_80240AB0_91C390 /* 91C8CC 80240FEC 0200302D */ daddu $a2, $s0, $zero /* 91C8D0 80240FF0 0809040F */ j .L8024103C /* 91C8D4 80240FF4 0000102D */ daddu $v0, $zero, $zero +glabel L80240FF8_91C8D8 /* 91C8D8 80240FF8 0260202D */ daddu $a0, $s3, $zero /* 91C8DC 80240FFC 0280282D */ daddu $a1, $s4, $zero /* 91C8E0 80241000 0C0902FA */ jal func_80240BE8_91C4C8 /* 91C8E4 80241004 0200302D */ daddu $a2, $s0, $zero +glabel L80241008_91C8E8 /* 91C8E8 80241008 0260202D */ daddu $a0, $s3, $zero /* 91C8EC 8024100C 0280282D */ daddu $a1, $s4, $zero /* 91C8F0 80241010 0C090319 */ jal func_80240C64_91C544 @@ -205,11 +221,13 @@ glabel func_80240D10_91C5F0 /* 91C8FC 8024101C 24020034 */ addiu $v0, $zero, 0x34 /* 91C900 80241020 14620006 */ bne $v1, $v0, .L8024103C /* 91C904 80241024 0000102D */ daddu $v0, $zero, $zero +glabel L80241028_91C908 /* 91C908 80241028 0260202D */ daddu $a0, $s3, $zero /* 91C90C 8024102C 0280282D */ daddu $a1, $s4, $zero /* 91C910 80241030 0C090333 */ jal iwa_04_UnkDurationCheck /* 91C914 80241034 0200302D */ daddu $a2, $s0, $zero .L80241038: +glabel L80241038_91C918 /* 91C918 80241038 0000102D */ daddu $v0, $zero, $zero .L8024103C: /* 91C91C 8024103C 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80241060_91C940.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80241060_91C940.s index cd0fb56302..11307f0719 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80241060_91C940.s +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80241060_91C940.s @@ -4,7 +4,7 @@ glabel func_80241060_91C940 /* 91C940 80241060 3C013F80 */ lui $at, 0x3f80 /* 91C944 80241064 44810000 */ mtc1 $at, $f0 -/* 91C948 80241068 00000000 */ nop +/* 91C948 80241068 00000000 */ nop /* 91C94C 8024106C 3C01800B */ lui $at, %hi(D_800B2218) /* 91C950 80241070 E4202218 */ swc1 $f0, %lo(D_800B2218)($at) /* 91C954 80241074 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_8024107C_91C95C.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_8024107C_91C95C.s index 1669e3c5f7..6e36cdc983 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_8024107C_91C95C.s +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_8024107C_91C95C.s @@ -15,7 +15,7 @@ glabel func_8024107C_91C95C /* 91C984 802410A4 0C0B1EAF */ jal get_variable /* 91C988 802410A8 0040802D */ daddu $s0, $v0, $zero /* 91C98C 802410AC 44820000 */ mtc1 $v0, $f0 -/* 91C990 802410B0 00000000 */ nop +/* 91C990 802410B0 00000000 */ nop /* 91C994 802410B4 46800020 */ cvt.s.w $f0, $f0 /* 91C998 802410B8 E6000034 */ swc1 $f0, 0x34($s0) /* 91C99C 802410BC 8FBF0018 */ lw $ra, 0x18($sp) @@ -24,6 +24,6 @@ glabel func_8024107C_91C95C /* 91C9A8 802410C8 24020002 */ addiu $v0, $zero, 2 /* 91C9AC 802410CC 03E00008 */ jr $ra /* 91C9B0 802410D0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 91C9B4 802410D4 00000000 */ nop -/* 91C9B8 802410D8 00000000 */ nop -/* 91C9BC 802410DC 00000000 */ nop +/* 91C9B4 802410D4 00000000 */ nop +/* 91C9B8 802410D8 00000000 */ nop +/* 91C9BC 802410DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E570/func_80240000_91E570.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E570/func_80240000_91E570.s index 05fc100e0d..ce36e159f9 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E570/func_80240000_91E570.s +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E570/func_80240000_91E570.s @@ -18,4 +18,4 @@ glabel func_80240000_91E570 /* 91E5A0 80240030 24020002 */ addiu $v0, $zero, 2 /* 91E5A4 80240034 03E00008 */ jr $ra /* 91E5A8 80240038 AC830088 */ sw $v1, 0x88($a0) -/* 91E5AC 8024003C 00000000 */ nop +/* 91E5AC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E5B0/func_80240040_91E5B0.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E5B0/func_80240040_91E5B0.s index d4e8adbd52..4002b8a65b 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E5B0/func_80240040_91E5B0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E5B0/func_80240040_91E5B0.s @@ -26,7 +26,7 @@ glabel func_80240040_91E5B0 /* 91E600 80240090 1440FFFA */ bnez $v0, .L8024007C /* 91E604 80240094 24A50004 */ addiu $a1, $a1, 4 /* 91E608 80240098 08090037 */ j .L802400DC -/* 91E60C 8024009C 00000000 */ nop +/* 91E60C 8024009C 00000000 */ nop .L802400A0: /* 91E610 802400A0 0000182D */ daddu $v1, $zero, $zero /* 91E614 802400A4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802403C4_91E934.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802403C4_91E934.s index 656df75bc8..b837b6a945 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802403C4_91E934.s +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802403C4_91E934.s @@ -8,7 +8,7 @@ glabel func_802403C4_91E934 /* 91E940 802403D0 00822021 */ addu $a0, $a0, $v0 /* 91E944 802403D4 90820014 */ lbu $v0, 0x14($a0) /* 91E948 802403D8 10400009 */ beqz $v0, .L80240400 -/* 91E94C 802403DC 00000000 */ nop +/* 91E94C 802403DC 00000000 */ nop /* 91E950 802403E0 90820015 */ lbu $v0, 0x15($a0) /* 91E954 802403E4 00022600 */ sll $a0, $v0, 0x18 /* 91E958 802403E8 00041E03 */ sra $v1, $a0, 0x18 @@ -16,7 +16,7 @@ glabel func_802403C4_91E934 /* 91E960 802403F0 00021403 */ sra $v0, $v0, 0x10 /* 91E964 802403F4 0043102A */ slt $v0, $v0, $v1 /* 91E968 802403F8 10400003 */ beqz $v0, .L80240408 -/* 91E96C 802403FC 00000000 */ nop +/* 91E96C 802403FC 00000000 */ nop .L80240400: /* 91E970 80240400 03E00008 */ jr $ra /* 91E974 80240404 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802404BC_91EA2C.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802404BC_91EA2C.s index 4464205cf7..152d6d644c 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802404BC_91EA2C.s +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802404BC_91EA2C.s @@ -108,20 +108,20 @@ glabel func_802404BC_91EA2C /* 91EBB4 80240644 10400009 */ beqz $v0, .L8024066C /* 91EBB8 80240648 AEA20074 */ sw $v0, 0x74($s5) /* 91EBBC 8024064C 0C03C4EC */ jal func_800F13B0 -/* 91EBC0 80240650 00000000 */ nop +/* 91EBC0 80240650 00000000 */ nop /* 91EBC4 80240654 8EA20070 */ lw $v0, 0x70($s5) /* 91EBC8 80240658 24420001 */ addiu $v0, $v0, 1 .L8024065C: /* 91EBCC 8024065C AEA20070 */ sw $v0, 0x70($s5) /* 91EBD0 80240660 2842000F */ slti $v0, $v0, 0xf /* 91EBD4 80240664 10400003 */ beqz $v0, .L80240674 -/* 91EBD8 80240668 00000000 */ nop +/* 91EBD8 80240668 00000000 */ nop .L8024066C: /* 91EBDC 8024066C 080901B7 */ j .L802406DC /* 91EBE0 80240670 0000102D */ daddu $v0, $zero, $zero .L80240674: /* 91EBE4 80240674 0C03C54E */ jal func_800F1538 -/* 91EBE8 80240678 00000000 */ nop +/* 91EBE8 80240678 00000000 */ nop /* 91EBEC 8024067C 8EA30074 */ lw $v1, 0x74($s5) /* 91EBF0 80240680 240200FF */ addiu $v0, $zero, 0xff /* 91EBF4 80240684 10620010 */ beq $v1, $v0, .L802406C8 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802408F0_91EE60.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802408F0_91EE60.s index ce271abf36..90c9d22273 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802408F0_91EE60.s +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802408F0_91EE60.s @@ -36,7 +36,7 @@ glabel func_802408F0_91EE60 /* 91EEDC 8024096C 0C00A88D */ jal sin_cos_deg /* 91EEE0 80240970 0040A82D */ daddu $s5, $v0, $zero /* 91EEE4 80240974 1200005D */ beqz $s0, .L80240AEC -/* 91EEE8 80240978 00000000 */ nop +/* 91EEE8 80240978 00000000 */ nop /* 91EEEC 8024097C 0C00AB0A */ jal general_heap_malloc /* 91EEF0 80240980 24040068 */ addiu $a0, $zero, 0x68 /* 91EEF4 80240984 0040902D */ daddu $s2, $v0, $zero @@ -98,10 +98,10 @@ glabel func_802408F0_91EE60 /* 91EFCC 80240A5C C7A2001C */ lwc1 $f2, 0x1c($sp) /* 91EFD0 80240A60 C7A40020 */ lwc1 $f4, 0x20($sp) /* 91EFD4 80240A64 46041082 */ mul.s $f2, $f2, $f4 -/* 91EFD8 80240A68 00000000 */ nop +/* 91EFD8 80240A68 00000000 */ nop /* 91EFDC 80240A6C C7A00018 */ lwc1 $f0, 0x18($sp) /* 91EFE0 80240A70 46040002 */ mul.s $f0, $f0, $f4 -/* 91EFE4 80240A74 00000000 */ nop +/* 91EFE4 80240A74 00000000 */ nop /* 91EFE8 80240A78 E6020038 */ swc1 $f2, 0x38($s0) /* 91EFEC 80240A7C E6000050 */ swc1 $f0, 0x50($s0) /* 91EFF0 80240A80 8E42005C */ lw $v0, 0x5c($s2) @@ -142,12 +142,12 @@ glabel func_802408F0_91EE60 /* 91F078 80240B08 10600007 */ beqz $v1, .L80240B28 /* 91F07C 80240B0C 24040005 */ addiu $a0, $zero, 5 /* 91F080 80240B10 08090330 */ j .L80240CC0 -/* 91F084 80240B14 00000000 */ nop +/* 91F084 80240B14 00000000 */ nop .L80240B18: /* 91F088 80240B18 10620058 */ beq $v1, $v0, .L80240C7C -/* 91F08C 80240B1C 00000000 */ nop +/* 91F08C 80240B1C 00000000 */ nop /* 91F090 80240B20 08090330 */ j .L80240CC0 -/* 91F094 80240B24 00000000 */ nop +/* 91F094 80240B24 00000000 */ nop .L80240B28: /* 91F098 80240B28 0000882D */ daddu $s1, $zero, $zero /* 91F09C 80240B2C 3C148024 */ lui $s4, %hi(D_80245AB8) @@ -174,11 +174,11 @@ glabel func_802408F0_91EE60 /* 91F0EC 80240B7C C7A4001C */ lwc1 $f4, 0x1c($sp) /* 91F0F0 80240B80 C7A00020 */ lwc1 $f0, 0x20($sp) /* 91F0F4 80240B84 46002102 */ mul.s $f4, $f4, $f0 -/* 91F0F8 80240B88 00000000 */ nop +/* 91F0F8 80240B88 00000000 */ nop /* 91F0FC 80240B8C C7A20018 */ lwc1 $f2, 0x18($sp) /* 91F100 80240B90 26940004 */ addiu $s4, $s4, 4 /* 91F104 80240B94 46001082 */ mul.s $f2, $f2, $f0 -/* 91F108 80240B98 00000000 */ nop +/* 91F108 80240B98 00000000 */ nop /* 91F10C 80240B9C 26730004 */ addiu $s3, $s3, 4 /* 91F110 80240BA0 26310001 */ addiu $s1, $s1, 1 /* 91F114 80240BA4 2A220003 */ slti $v0, $s1, 3 @@ -215,11 +215,11 @@ glabel func_802408F0_91EE60 /* 91F188 80240C18 C7A4001C */ lwc1 $f4, 0x1c($sp) /* 91F18C 80240C1C C7A00020 */ lwc1 $f0, 0x20($sp) /* 91F190 80240C20 46002102 */ mul.s $f4, $f4, $f0 -/* 91F194 80240C24 00000000 */ nop +/* 91F194 80240C24 00000000 */ nop /* 91F198 80240C28 C7A20018 */ lwc1 $f2, 0x18($sp) /* 91F19C 80240C2C 26940004 */ addiu $s4, $s4, 4 /* 91F1A0 80240C30 46001082 */ mul.s $f2, $f2, $f0 -/* 91F1A4 80240C34 00000000 */ nop +/* 91F1A4 80240C34 00000000 */ nop /* 91F1A8 80240C38 26730004 */ addiu $s3, $s3, 4 /* 91F1AC 80240C3C 26310001 */ addiu $s1, $s1, 1 /* 91F1B0 80240C40 2A220003 */ slti $v0, $s1, 3 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240E28_91F398.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240E28_91F398.s index 791e9bb388..0a429f6dd0 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240E28_91F398.s +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240E28_91F398.s @@ -36,16 +36,16 @@ glabel func_80240E28_91F398 /* 91F410 80240EA0 10600007 */ beqz $v1, .L80240EC0 /* 91F414 80240EA4 240500FF */ addiu $a1, $zero, 0xff /* 91F418 80240EA8 080903CE */ j .L80240F38 -/* 91F41C 80240EAC 00000000 */ nop +/* 91F41C 80240EAC 00000000 */ nop .L80240EB0: /* 91F420 80240EB0 10620019 */ beq $v1, $v0, .L80240F18 -/* 91F424 80240EB4 00000000 */ nop +/* 91F424 80240EB4 00000000 */ nop /* 91F428 80240EB8 080903CE */ j .L80240F38 -/* 91F42C 80240EBC 00000000 */ nop +/* 91F42C 80240EBC 00000000 */ nop .L80240EC0: /* 91F430 80240EC0 8E220074 */ lw $v0, 0x74($s1) /* 91F434 80240EC4 14450004 */ bne $v0, $a1, .L80240ED8 -/* 91F438 80240EC8 00000000 */ nop +/* 91F438 80240EC8 00000000 */ nop /* 91F43C 80240ECC AE240070 */ sw $a0, 0x70($s1) /* 91F440 80240ED0 AE200078 */ sw $zero, 0x78($s1) /* 91F444 80240ED4 8E220074 */ lw $v0, 0x74($s1) @@ -57,7 +57,7 @@ glabel func_80240E28_91F398 /* 91F458 80240EE8 50400013 */ beql $v0, $zero, .L80240F38 /* 91F45C 80240EEC AE250074 */ sw $a1, 0x74($s1) /* 91F460 80240EF0 080903CE */ j .L80240F38 -/* 91F464 80240EF4 00000000 */ nop +/* 91F464 80240EF4 00000000 */ nop .L80240EF8: /* 91F468 80240EF8 8E220078 */ lw $v0, 0x78($s1) /* 91F46C 80240EFC 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240FF8_91F568.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240FF8_91F568.s index 9a09db5dbd..e83e9e19db 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240FF8_91F568.s +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240FF8_91F568.s @@ -15,5 +15,5 @@ glabel func_80240FF8_91F568 .L80241020: /* 91F590 80241020 03E00008 */ jr $ra /* 91F594 80241024 24020002 */ addiu $v0, $zero, 2 -/* 91F598 80241028 00000000 */ nop -/* 91F59C 8024102C 00000000 */ nop +/* 91F598 80241028 00000000 */ nop +/* 91F59C 8024102C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241030_91F5A0.s b/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241030_91F5A0.s index a1b1aeece1..7456517dc6 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241030_91F5A0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241030_91F5A0.s @@ -41,14 +41,14 @@ glabel func_80241030_91F5A0 /* 91F62C 802410BC 10600009 */ beqz $v1, .L802410E4 /* 91F630 802410C0 0000102D */ daddu $v0, $zero, $zero /* 91F634 802410C4 08090465 */ j .L80241194 -/* 91F638 802410C8 00000000 */ nop +/* 91F638 802410C8 00000000 */ nop .L802410CC: /* 91F63C 802410CC 10620013 */ beq $v1, $v0, .L8024111C /* 91F640 802410D0 24020003 */ addiu $v0, $zero, 3 /* 91F644 802410D4 1062001E */ beq $v1, $v0, .L80241150 /* 91F648 802410D8 0000102D */ daddu $v0, $zero, $zero /* 91F64C 802410DC 08090465 */ j .L80241194 -/* 91F650 802410E0 00000000 */ nop +/* 91F650 802410E0 00000000 */ nop .L802410E4: /* 91F654 802410E4 0C03AC5A */ jal func_800EB168 /* 91F658 802410E8 0000202D */ daddu $a0, $zero, $zero @@ -75,7 +75,7 @@ glabel func_80241030_91F5A0 /* 91F6A4 80241134 A0510014 */ sb $s1, 0x14($v0) /* 91F6A8 80241138 82640012 */ lb $a0, 0x12($s3) /* 91F6AC 8024113C 0C03ACA9 */ jal func_800EB2A4 -/* 91F6B0 80241140 00000000 */ nop +/* 91F6B0 80241140 00000000 */ nop /* 91F6B4 80241144 24020003 */ addiu $v0, $zero, 3 /* 91F6B8 80241148 08090464 */ j .L80241190 /* 91F6BC 8024114C AE420070 */ sw $v0, 0x70($s2) diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_8024146C_91F9DC.s b/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_8024146C_91F9DC.s index ae8c415e4e..fb9df8adfd 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_8024146C_91F9DC.s +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_8024146C_91F9DC.s @@ -28,7 +28,7 @@ glabel func_8024146C_91F9DC /* 91FA30 802414C0 00220821 */ addu $at, $at, $v0 /* 91FA34 802414C4 AC208480 */ sw $zero, %lo(D_80248480)($at) /* 91FA38 802414C8 0809053E */ j .L802414F8 -/* 91FA3C 802414CC 00000000 */ nop +/* 91FA3C 802414CC 00000000 */ nop .L802414D0: /* 91FA40 802414D0 3C038025 */ lui $v1, %hi(D_80248480) /* 91FA44 802414D4 24638480 */ addiu $v1, $v1, %lo(D_80248480) @@ -46,5 +46,5 @@ glabel func_8024146C_91F9DC /* 91FA6C 802414FC 24020002 */ addiu $v0, $zero, 2 /* 91FA70 80241500 03E00008 */ jr $ra /* 91FA74 80241504 27BD0018 */ addiu $sp, $sp, 0x18 -/* 91FA78 80241508 00000000 */ nop -/* 91FA7C 8024150C 00000000 */ nop +/* 91FA78 80241508 00000000 */ nop +/* 91FA7C 8024150C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91FA80/func_80241510_91FA80.s b/asm/nonmatchings/world/area_iwa/iwa_10/91FA80/func_80241510_91FA80.s index 4e5fced331..bfac6efb81 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91FA80/func_80241510_91FA80.s +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91FA80/func_80241510_91FA80.s @@ -39,6 +39,6 @@ glabel func_80241510_91FA80 /* 91FB08 80241598 24020002 */ addiu $v0, $zero, 2 /* 91FB0C 8024159C 03E00008 */ jr $ra /* 91FB10 802415A0 27BD0028 */ addiu $sp, $sp, 0x28 -/* 91FB14 802415A4 00000000 */ nop -/* 91FB18 802415A8 00000000 */ nop -/* 91FB1C 802415AC 00000000 */ nop +/* 91FB14 802415A4 00000000 */ nop +/* 91FB18 802415A8 00000000 */ nop +/* 91FB1C 802415AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_11/9269F0/func_80240000_9269F0.s b/asm/nonmatchings/world/area_iwa/iwa_11/9269F0/func_80240000_9269F0.s index 8e5ed3b53e..021010dc06 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_11/9269F0/func_80240000_9269F0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_11/9269F0/func_80240000_9269F0.s @@ -9,4 +9,4 @@ glabel func_80240000_9269F0 /* 926A00 80240010 0002102B */ sltu $v0, $zero, $v0 /* 926A04 80240014 03E00008 */ jr $ra /* 926A08 80240018 00021040 */ sll $v0, $v0, 1 -/* 926A0C 8024001C 00000000 */ nop +/* 926A0C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_802401B0_926BA0.s b/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_802401B0_926BA0.s index 855319718c..a6ab89a2f6 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_802401B0_926BA0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_802401B0_926BA0.s @@ -13,7 +13,7 @@ glabel func_802401B0_926BA0 /* 926BC0 802401D0 46806320 */ cvt.s.w $f12, $f12 /* 926BC4 802401D4 46006302 */ mul.s $f12, $f12, $f0 /* 926BC8 802401D8 0C00A6C9 */ jal clamp_angle -/* 926BCC 802401DC 00000000 */ nop +/* 926BCC 802401DC 00000000 */ nop /* 926BD0 802401E0 3C05FE36 */ lui $a1, 0xfe36 /* 926BD4 802401E4 34A53C80 */ ori $a1, $a1, 0x3c80 /* 926BD8 802401E8 44060000 */ mfc1 $a2, $f0 diff --git a/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_80240208_926BF8.s b/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_80240208_926BF8.s index bc6f5a6a3d..a1a113778f 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_80240208_926BF8.s +++ b/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_80240208_926BF8.s @@ -12,14 +12,14 @@ glabel func_80240208_926BF8 /* 926C14 80240224 C60C008C */ lwc1 $f12, 0x8c($s0) /* 926C18 80240228 46806320 */ cvt.s.w $f12, $f12 /* 926C1C 8024022C 46006302 */ mul.s $f12, $f12, $f0 -/* 926C20 80240230 00000000 */ nop +/* 926C20 80240230 00000000 */ nop /* 926C24 80240234 3C013F19 */ lui $at, 0x3f19 /* 926C28 80240238 3421999A */ ori $at, $at, 0x999a /* 926C2C 8024023C 44810000 */ mtc1 $at, $f0 -/* 926C30 80240240 00000000 */ nop +/* 926C30 80240240 00000000 */ nop /* 926C34 80240244 46006302 */ mul.s $f12, $f12, $f0 /* 926C38 80240248 0C00A6C9 */ jal clamp_angle -/* 926C3C 8024024C 00000000 */ nop +/* 926C3C 8024024C 00000000 */ nop /* 926C40 80240250 3C05FE36 */ lui $a1, 0xfe36 /* 926C44 80240254 34A53C80 */ ori $a1, $a1, 0x3c80 /* 926C48 80240258 44060000 */ mfc1 $a2, $f0 @@ -30,5 +30,5 @@ glabel func_80240208_926BF8 /* 926C5C 8024026C 24020002 */ addiu $v0, $zero, 2 /* 926C60 80240270 03E00008 */ jr $ra /* 926C64 80240274 27BD0018 */ addiu $sp, $sp, 0x18 -/* 926C68 80240278 00000000 */ nop -/* 926C6C 8024027C 00000000 */ nop +/* 926C68 80240278 00000000 */ nop +/* 926C6C 8024027C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_11/926C70/func_80240280_926C70.s b/asm/nonmatchings/world/area_iwa/iwa_11/926C70/func_80240280_926C70.s index a4f603dab1..eccddcf9d1 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_11/926C70/func_80240280_926C70.s +++ b/asm/nonmatchings/world/area_iwa/iwa_11/926C70/func_80240280_926C70.s @@ -39,5 +39,5 @@ glabel func_80240280_926C70 /* 926CEC 802402FC 24A30005 */ addiu $v1, $a1, 5 /* 926CF0 80240300 03E00008 */ jr $ra /* 926CF4 80240304 24020002 */ addiu $v0, $zero, 2 -/* 926CF8 80240308 00000000 */ nop -/* 926CFC 8024030C 00000000 */ nop +/* 926CF8 80240308 00000000 */ nop +/* 926CFC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240340_B20880.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240340_B20880.s index 8244ce351c..4980809b62 100644 --- a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240340_B20880.s +++ b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240340_B20880.s @@ -29,7 +29,7 @@ glabel func_80240340_B20880 /* B208E0 802403A0 46220000 */ add.d $f0, $f0, $f2 /* B208E4 802403A4 AFA00014 */ sw $zero, 0x14($sp) /* B208E8 802403A8 44831000 */ mtc1 $v1, $f2 -/* B208EC 802403AC 00000000 */ nop +/* B208EC 802403AC 00000000 */ nop /* B208F0 802403B0 468010A0 */ cvt.s.w $f2, $f2 /* B208F4 802403B4 46022100 */ add.s $f4, $f4, $f2 /* B208F8 802403B8 8E050038 */ lw $a1, 0x38($s0) diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802403F4_B20934.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802403F4_B20934.s index 96031a03e2..6a5042a146 100644 --- a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802403F4_B20934.s +++ b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802403F4_B20934.s @@ -26,7 +26,7 @@ glabel func_802403F4_B20934 /* B20984 80240444 1440FFFA */ bnez $v0, .L80240430 /* B20988 80240448 24A50004 */ addiu $a1, $a1, 4 /* B2098C 8024044C 08090124 */ j .L80240490 -/* B20990 80240450 00000000 */ nop +/* B20990 80240450 00000000 */ nop .L80240454: /* B20994 80240454 0000182D */ daddu $v1, $zero, $zero /* B20998 80240458 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802407C4_B20D04.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802407C4_B20D04.s index 89ba1b66aa..92df8385d2 100644 --- a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802407C4_B20D04.s +++ b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802407C4_B20D04.s @@ -28,7 +28,7 @@ glabel func_802407C4_B20D04 /* B20D58 80240818 00220821 */ addu $at, $at, $v0 /* B20D5C 8024081C AC207AF0 */ sw $zero, %lo(D_80247AF0)($at) /* B20D60 80240820 08090214 */ j .L80240850 -/* B20D64 80240824 00000000 */ nop +/* B20D64 80240824 00000000 */ nop .L80240828: /* B20D68 80240828 3C038024 */ lui $v1, %hi(D_80247AF0) /* B20D6C 8024082C 24637AF0 */ addiu $v1, $v1, %lo(D_80247AF0) diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240B4C_B2108C.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240B4C_B2108C.s index c57c66db89..2a56ee06c0 100644 --- a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240B4C_B2108C.s +++ b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240B4C_B2108C.s @@ -36,14 +36,14 @@ glabel func_80240B4C_B2108C /* B21108 80240BC8 10400005 */ beqz $v0, .L80240BE0 /* B2110C 80240BCC 24020002 */ addiu $v0, $zero, 2 /* B21110 80240BD0 12200007 */ beqz $s1, .L80240BF0 -/* B21114 80240BD4 00000000 */ nop +/* B21114 80240BD4 00000000 */ nop /* B21118 80240BD8 08090308 */ j .L80240C20 -/* B2111C 80240BDC 00000000 */ nop +/* B2111C 80240BDC 00000000 */ nop .L80240BE0: /* B21120 80240BE0 1222000B */ beq $s1, $v0, .L80240C10 -/* B21124 80240BE4 00000000 */ nop +/* B21124 80240BE4 00000000 */ nop /* B21128 80240BE8 08090308 */ j .L80240C20 -/* B2112C 80240BEC 00000000 */ nop +/* B2112C 80240BEC 00000000 */ nop .L80240BF0: /* B21130 80240BF0 3C014302 */ lui $at, 0x4302 /* B21134 80240BF4 4481B000 */ mtc1 $at, $f22 @@ -71,21 +71,21 @@ glabel func_80240B4C_B2108C /* B2117C 80240C3C 0C00A8BB */ jal sin_deg /* B21180 80240C40 4600A306 */ mov.s $f12, $f20 /* B21184 80240C44 46160002 */ mul.s $f0, $f0, $f22 -/* B21188 80240C48 00000000 */ nop +/* B21188 80240C48 00000000 */ nop /* B2118C 80240C4C C6020038 */ lwc1 $f2, 0x38($s0) /* B21190 80240C50 3C0141F0 */ lui $at, 0x41f0 /* B21194 80240C54 44812000 */ mtc1 $at, $f4 -/* B21198 80240C58 00000000 */ nop +/* B21198 80240C58 00000000 */ nop /* B2119C 80240C5C 46041080 */ add.s $f2, $f2, $f4 /* B211A0 80240C60 46001680 */ add.s $f26, $f2, $f0 /* B211A4 80240C64 0C00A8D4 */ jal cos_deg /* B211A8 80240C68 4600A306 */ mov.s $f12, $f20 /* B211AC 80240C6C 46160002 */ mul.s $f0, $f0, $f22 -/* B211B0 80240C70 00000000 */ nop +/* B211B0 80240C70 00000000 */ nop /* B211B4 80240C74 C604003C */ lwc1 $f4, 0x3c($s0) /* B211B8 80240C78 3C014248 */ lui $at, 0x4248 /* B211BC 80240C7C 44811000 */ mtc1 $at, $f2 -/* B211C0 80240C80 00000000 */ nop +/* B211C0 80240C80 00000000 */ nop /* B211C4 80240C84 46022500 */ add.s $f20, $f4, $f2 /* B211C8 80240C88 C6020040 */ lwc1 $f2, 0x40($s0) /* B211CC 80240C8C 46001600 */ add.s $f24, $f2, $f0 diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240CF8_B21238.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240CF8_B21238.s index 0c5473ea93..32596c9f30 100644 --- a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240CF8_B21238.s +++ b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240CF8_B21238.s @@ -44,21 +44,21 @@ glabel func_80240CF8_B21238 /* B212C4 80240D84 0C00A8BB */ jal sin_deg /* B212C8 80240D88 4600A306 */ mov.s $f12, $f20 /* B212CC 80240D8C 46160002 */ mul.s $f0, $f0, $f22 -/* B212D0 80240D90 00000000 */ nop +/* B212D0 80240D90 00000000 */ nop /* B212D4 80240D94 C6220038 */ lwc1 $f2, 0x38($s1) /* B212D8 80240D98 3C0141F0 */ lui $at, 0x41f0 /* B212DC 80240D9C 44812000 */ mtc1 $at, $f4 -/* B212E0 80240DA0 00000000 */ nop +/* B212E0 80240DA0 00000000 */ nop /* B212E4 80240DA4 46041080 */ add.s $f2, $f2, $f4 /* B212E8 80240DA8 3C014296 */ lui $at, 0x4296 /* B212EC 80240DAC 44812000 */ mtc1 $at, $f4 -/* B212F0 80240DB0 00000000 */ nop +/* B212F0 80240DB0 00000000 */ nop /* B212F4 80240DB4 46041081 */ sub.s $f2, $f2, $f4 /* B212F8 80240DB8 46001600 */ add.s $f24, $f2, $f0 /* B212FC 80240DBC 0C00A8D4 */ jal cos_deg /* B21300 80240DC0 4600A306 */ mov.s $f12, $f20 /* B21304 80240DC4 46160002 */ mul.s $f0, $f0, $f22 -/* B21308 80240DC8 00000000 */ nop +/* B21308 80240DC8 00000000 */ nop /* B2130C 80240DCC 24020001 */ addiu $v0, $zero, 1 /* B21310 80240DD0 C6220040 */ lwc1 $f2, 0x40($s1) /* B21314 80240DD4 C624003C */ lwc1 $f4, 0x3c($s1) @@ -74,12 +74,12 @@ glabel func_80240CF8_B21238 /* B2133C 80240DFC 10800007 */ beqz $a0, .L80240E1C /* B21340 80240E00 0000102D */ daddu $v0, $zero, $zero /* B21344 80240E04 080903BB */ j .L80240EEC -/* B21348 80240E08 00000000 */ nop +/* B21348 80240E08 00000000 */ nop .L80240E0C: /* B2134C 80240E0C 10820027 */ beq $a0, $v0, .L80240EAC /* B21350 80240E10 0000102D */ daddu $v0, $zero, $zero /* B21354 80240E14 080903BB */ j .L80240EEC -/* B21358 80240E18 00000000 */ nop +/* B21358 80240E18 00000000 */ nop .L80240E1C: /* B2135C 80240E1C 3C028011 */ lui $v0, %hi(gPlayerStatus) /* B21360 80240E20 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240F14_B21454.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240F14_B21454.s index 045566b0af..c990c6b79f 100644 --- a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240F14_B21454.s +++ b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240F14_B21454.s @@ -25,7 +25,7 @@ glabel func_80240F14_B21454 /* B214A4 80240F64 1062000C */ beq $v1, $v0, .L80240F98 /* B214A8 80240F68 2402000A */ addiu $v0, $zero, 0xa /* B214AC 80240F6C 080903F2 */ j .L80240FC8 -/* B214B0 80240F70 00000000 */ nop +/* B214B0 80240F70 00000000 */ nop .L80240F74: /* B214B4 80240F74 3C01431E */ lui $at, 0x431e /* B214B8 80240F78 44810000 */ mtc1 $at, $f0 @@ -60,14 +60,14 @@ glabel func_80240F14_B21454 /* B21520 80240FE0 10600009 */ beqz $v1, .L80241008 /* B21524 80240FE4 0000102D */ daddu $v0, $zero, $zero /* B21528 80240FE8 08090446 */ j .L80241118 -/* B2152C 80240FEC 00000000 */ nop +/* B2152C 80240FEC 00000000 */ nop .L80240FF0: /* B21530 80240FF0 1062002D */ beq $v1, $v0, .L802410A8 /* B21534 80240FF4 2402000A */ addiu $v0, $zero, 0xa /* B21538 80240FF8 10620037 */ beq $v1, $v0, .L802410D8 /* B2153C 80240FFC 0000102D */ daddu $v0, $zero, $zero /* B21540 80241000 08090446 */ j .L80241118 -/* B21544 80241004 00000000 */ nop +/* B21544 80241004 00000000 */ nop .L80241008: /* B21548 80241008 3C0200B6 */ lui $v0, 0xb6 /* B2154C 8024100C C624000C */ lwc1 $f4, 0xc($s1) @@ -114,7 +114,7 @@ glabel func_80240F14_B21454 /* B215E8 802410A8 C6200038 */ lwc1 $f0, 0x38($s1) /* B215EC 802410AC 3C014040 */ lui $at, 0x4040 /* B215F0 802410B0 44811000 */ mtc1 $at, $f2 -/* B215F4 802410B4 00000000 */ nop +/* B215F4 802410B4 00000000 */ nop /* B215F8 802410B8 46020001 */ sub.s $f0, $f0, $f2 /* B215FC 802410BC E6200038 */ swc1 $f0, 0x38($s1) /* B21600 802410C0 8E420074 */ lw $v0, 0x74($s2) @@ -127,11 +127,11 @@ glabel func_80240F14_B21454 /* B21618 802410D8 C6220038 */ lwc1 $f2, 0x38($s1) /* B2161C 802410DC 3C014040 */ lui $at, 0x4040 /* B21620 802410E0 44810000 */ mtc1 $at, $f0 -/* B21624 802410E4 00000000 */ nop +/* B21624 802410E4 00000000 */ nop /* B21628 802410E8 46001080 */ add.s $f2, $f2, $f0 /* B2162C 802410EC 3C0142B4 */ lui $at, 0x42b4 /* B21630 802410F0 44810000 */ mtc1 $at, $f0 -/* B21634 802410F4 00000000 */ nop +/* B21634 802410F4 00000000 */ nop /* B21638 802410F8 E620000C */ swc1 $f0, 0xc($s1) /* B2163C 802410FC E6220038 */ swc1 $f2, 0x38($s1) /* B21640 80241100 8E430074 */ lw $v1, 0x74($s2) diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80241134_B21674.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80241134_B21674.s index a39f0e37eb..bb76bb9022 100644 --- a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80241134_B21674.s +++ b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80241134_B21674.s @@ -12,7 +12,7 @@ glabel func_80241134_B21674 /* B21690 80241150 C444003C */ lwc1 $f4, 0x3c($v0) /* B21694 80241154 46001081 */ sub.s $f2, $f2, $f0 /* B21698 80241158 44803000 */ mtc1 $zero, $f6 -/* B2169C 8024115C 00000000 */ nop +/* B2169C 8024115C 00000000 */ nop /* B216A0 80241160 4606203C */ c.lt.s $f4, $f6 /* B216A4 80241164 C4400038 */ lwc1 $f0, 0x38($v0) /* B216A8 80241168 45000006 */ bc1f .L80241184 @@ -27,6 +27,6 @@ glabel func_80241134_B21674 /* B216C8 80241188 0000102D */ daddu $v0, $zero, $zero /* B216CC 8024118C 03E00008 */ jr $ra /* B216D0 80241190 27BD0020 */ addiu $sp, $sp, 0x20 -/* B216D4 80241194 00000000 */ nop -/* B216D8 80241198 00000000 */ nop -/* B216DC 8024119C 00000000 */ nop +/* B216D4 80241194 00000000 */ nop +/* B216D8 80241198 00000000 */ nop +/* B216DC 8024119C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411A0_B216E0.s b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411A0_B216E0.s index f26212db3f..8a7be89de1 100644 --- a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411A0_B216E0.s +++ b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411A0_B216E0.s @@ -10,7 +10,7 @@ glabel func_802411A0_B216E0 /* B216F4 802411B4 AFBF0010 */ sw $ra, 0x10($sp) /* B216F8 802411B8 8C64014C */ lw $a0, 0x14c($v1) /* B216FC 802411BC 08090476 */ j .L802411D8 -/* B21700 802411C0 00000000 */ nop +/* B21700 802411C0 00000000 */ nop .L802411C4: /* B21704 802411C4 3C02EFE8 */ lui $v0, 0xefe8 /* B21708 802411C8 34422080 */ ori $v0, $v0, 0x2080 @@ -19,7 +19,7 @@ glabel func_802411A0_B216E0 /* B21714 802411D4 0080102D */ daddu $v0, $a0, $zero .L802411D8: /* B21718 802411D8 0C00EAD2 */ jal get_npc_safe -/* B2171C 802411DC 00000000 */ nop +/* B2171C 802411DC 00000000 */ nop .L802411E0: /* B21720 802411E0 8FBF0010 */ lw $ra, 0x10($sp) /* B21724 802411E4 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC_B2172C.s b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC_B2172C.s index 536c6f7f73..c26e2ffaf3 100644 --- a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC_B2172C.s +++ b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC_B2172C.s @@ -53,13 +53,13 @@ glabel func_802411EC_B2172C /* B217E4 802412A4 3C028024 */ lui $v0, %hi(func_80245950_8061D0) /* B217E8 802412A8 8C425950 */ lw $v0, %lo(func_80245950_8061D0)($v0) /* B217EC 802412AC 44826000 */ mtc1 $v0, $f12 -/* B217F0 802412B0 00000000 */ nop +/* B217F0 802412B0 00000000 */ nop /* B217F4 802412B4 04410006 */ bgez $v0, .L802412D0 /* B217F8 802412B8 46806321 */ cvt.d.w $f12, $f12 /* B217FC 802412BC 3C0141F0 */ lui $at, 0x41f0 /* B21800 802412C0 44810800 */ mtc1 $at, $f1 /* B21804 802412C4 44800000 */ mtc1 $zero, $f0 -/* B21808 802412C8 00000000 */ nop +/* B21808 802412C8 00000000 */ nop /* B2180C 802412CC 46206300 */ add.d $f12, $f12, $f0 .L802412D0: /* B21810 802412D0 0C00A8BB */ jal sin_deg diff --git a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241338_B21878.s b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241338_B21878.s index d926d8ee59..df58dae312 100644 --- a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241338_B21878.s +++ b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241338_B21878.s @@ -31,17 +31,19 @@ glabel func_80241338_B21878 /* B218E0 802413A0 2C62000D */ sltiu $v0, $v1, 0xd /* B218E4 802413A4 1040000B */ beqz $v0, .L802413D4 /* B218E8 802413A8 00031080 */ sll $v0, $v1, 2 -/* B218EC 802413AC 3C018024 */ lui $at, %hi(D_80247AB8) +/* B218EC 802413AC 3C018024 */ lui $at, %hi(jtbl_80247AB8_B27FF8) /* B218F0 802413B0 00220821 */ addu $at, $at, $v0 -/* B218F4 802413B4 8C227AB8 */ lw $v0, %lo(D_80247AB8)($at) +/* B218F4 802413B4 8C227AB8 */ lw $v0, %lo(jtbl_80247AB8_B27FF8)($at) /* B218F8 802413B8 00400008 */ jr $v0 -/* B218FC 802413BC 00000000 */ nop +/* B218FC 802413BC 00000000 */ nop +glabel L802413C0_B21900 /* B21900 802413C0 8E020000 */ lw $v0, ($s0) /* B21904 802413C4 04410003 */ bgez $v0, .L802413D4 -/* B21908 802413C8 00000000 */ nop +/* B21908 802413C8 00000000 */ nop /* B2190C 802413CC 0000B02D */ daddu $s6, $zero, $zero /* B21910 802413D0 AE000000 */ sw $zero, ($s0) .L802413D4: +glabel L802413D4_B21914 /* B21914 802413D4 1AE00065 */ blez $s7, .L8024156C /* B21918 802413D8 0000A02D */ daddu $s4, $zero, $zero /* B2191C 802413DC 0220982D */ daddu $s3, $s1, $zero @@ -73,74 +75,74 @@ glabel func_80241338_B21878 /* B21980 80241440 0082A823 */ subu $s5, $a0, $v0 .L80241444: /* B21984 80241444 44966000 */ mtc1 $s6, $f12 -/* B21988 80241448 00000000 */ nop +/* B21988 80241448 00000000 */ nop /* B2198C 8024144C 0C00A8BB */ jal sin_deg /* B21990 80241450 46806320 */ cvt.s.w $f12, $f12 /* B21994 80241454 44902000 */ mtc1 $s0, $f4 -/* B21998 80241458 00000000 */ nop +/* B21998 80241458 00000000 */ nop /* B2199C 8024145C 46802120 */ cvt.s.w $f4, $f4 /* B219A0 80241460 461E2083 */ div.s $f2, $f4, $f30 /* B219A4 80241464 46001082 */ mul.s $f2, $f2, $f0 -/* B219A8 80241468 00000000 */ nop +/* B219A8 80241468 00000000 */ nop /* B219AC 8024146C 3C014170 */ lui $at, 0x4170 /* B219B0 80241470 44813000 */ mtc1 $at, $f6 -/* B219B4 80241474 00000000 */ nop +/* B219B4 80241474 00000000 */ nop /* B219B8 80241478 46062103 */ div.s $f4, $f4, $f6 /* B219BC 8024147C 46022580 */ add.s $f22, $f4, $f2 /* B219C0 80241480 0C00A874 */ jal cos_rad /* B219C4 80241484 4600B306 */ mov.s $f12, $f22 /* B219C8 80241488 461C0002 */ mul.s $f0, $f0, $f28 -/* B219CC 8024148C 00000000 */ nop +/* B219CC 8024148C 00000000 */ nop /* B219D0 80241490 4600D680 */ add.s $f26, $f26, $f0 /* B219D4 80241494 0C00A85B */ jal sin_rad /* B219D8 80241498 4600B306 */ mov.s $f12, $f22 /* B219DC 8024149C 461C0002 */ mul.s $f0, $f0, $f28 -/* B219E0 802414A0 00000000 */ nop +/* B219E0 802414A0 00000000 */ nop /* B219E4 802414A4 26100001 */ addiu $s0, $s0, 1 /* B219E8 802414A8 0211102A */ slt $v0, $s0, $s1 /* B219EC 802414AC 1440FFE5 */ bnez $v0, .L80241444 /* B219F0 802414B0 4600C600 */ add.s $f24, $f24, $f0 .L802414B4: /* B219F4 802414B4 44966000 */ mtc1 $s6, $f12 -/* B219F8 802414B8 00000000 */ nop +/* B219F8 802414B8 00000000 */ nop /* B219FC 802414BC 0C00A8BB */ jal sin_deg /* B21A00 802414C0 46806320 */ cvt.s.w $f12, $f12 /* B21A04 802414C4 44902000 */ mtc1 $s0, $f4 -/* B21A08 802414C8 00000000 */ nop +/* B21A08 802414C8 00000000 */ nop /* B21A0C 802414CC 46802120 */ cvt.s.w $f4, $f4 /* B21A10 802414D0 461E2083 */ div.s $f2, $f4, $f30 /* B21A14 802414D4 46001082 */ mul.s $f2, $f2, $f0 -/* B21A18 802414D8 00000000 */ nop +/* B21A18 802414D8 00000000 */ nop /* B21A1C 802414DC 3C014170 */ lui $at, 0x4170 /* B21A20 802414E0 44813000 */ mtc1 $at, $f6 -/* B21A24 802414E4 00000000 */ nop +/* B21A24 802414E4 00000000 */ nop /* B21A28 802414E8 46062103 */ div.s $f4, $f4, $f6 /* B21A2C 802414EC 46022580 */ add.s $f22, $f4, $f2 /* B21A30 802414F0 0C00A874 */ jal cos_rad /* B21A34 802414F4 4600B306 */ mov.s $f12, $f22 /* B21A38 802414F8 4495A000 */ mtc1 $s5, $f20 -/* B21A3C 802414FC 00000000 */ nop +/* B21A3C 802414FC 00000000 */ nop /* B21A40 80241500 4680A520 */ cvt.s.w $f20, $f20 /* B21A44 80241504 4600A002 */ mul.s $f0, $f20, $f0 -/* B21A48 80241508 00000000 */ nop +/* B21A48 80241508 00000000 */ nop /* B21A4C 8024150C 4600D680 */ add.s $f26, $f26, $f0 /* B21A50 80241510 0C00A85B */ jal sin_rad /* B21A54 80241514 4600B306 */ mov.s $f12, $f22 /* B21A58 80241518 4600A502 */ mul.s $f20, $f20, $f0 -/* B21A5C 8024151C 00000000 */ nop +/* B21A5C 8024151C 00000000 */ nop /* B21A60 80241520 4600D18D */ trunc.w.s $f6, $f26 /* B21A64 80241524 44023000 */ mfc1 $v0, $f6 -/* B21A68 80241528 00000000 */ nop +/* B21A68 80241528 00000000 */ nop /* B21A6C 8024152C A6620000 */ sh $v0, ($s3) /* B21A70 80241530 86420002 */ lh $v0, 2($s2) /* B21A74 80241534 4614C600 */ add.s $f24, $f24, $f20 /* B21A78 80241538 44820000 */ mtc1 $v0, $f0 -/* B21A7C 8024153C 00000000 */ nop +/* B21A7C 8024153C 00000000 */ nop /* B21A80 80241540 46800020 */ cvt.s.w $f0, $f0 /* B21A84 80241544 46180000 */ add.s $f0, $f0, $f24 /* B21A88 80241548 4600018D */ trunc.w.s $f6, $f0 /* B21A8C 8024154C 44023000 */ mfc1 $v0, $f6 -/* B21A90 80241550 00000000 */ nop +/* B21A90 80241550 00000000 */ nop /* B21A94 80241554 A6620002 */ sh $v0, 2($s3) /* B21A98 80241558 26730010 */ addiu $s3, $s3, 0x10 .L8024155C: diff --git a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802416F8_B21C38.s b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802416F8_B21C38.s index 4f64ad0101..effd349931 100644 --- a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802416F8_B21C38.s +++ b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802416F8_B21C38.s @@ -48,9 +48,9 @@ glabel func_802416F8_B21C38 /* B21CE4 802417A4 4618A501 */ sub.s $f20, $f20, $f24 /* B21CE8 802417A8 3C013F00 */ lui $at, 0x3f00 /* B21CEC 802417AC 44811000 */ mtc1 $at, $f2 -/* B21CF0 802417B0 00000000 */ nop +/* B21CF0 802417B0 00000000 */ nop /* B21CF4 802417B4 4602A502 */ mul.s $f20, $f20, $f2 -/* B21CF8 802417B8 00000000 */ nop +/* B21CF8 802417B8 00000000 */ nop /* B21CFC 802417BC 12000008 */ beqz $s0, .L802417E0 /* B21D00 802417C0 46000586 */ mov.s $f22, $f0 /* B21D04 802417C4 0233102A */ slt $v0, $s1, $s3 @@ -64,18 +64,18 @@ glabel func_802416F8_B21C38 /* B21D20 802417E0 3C014334 */ lui $at, 0x4334 /* B21D24 802417E4 44810000 */ mtc1 $at, $f0 /* B21D28 802417E8 44936000 */ mtc1 $s3, $f12 -/* B21D2C 802417EC 00000000 */ nop +/* B21D2C 802417EC 00000000 */ nop /* B21D30 802417F0 46806320 */ cvt.s.w $f12, $f12 /* B21D34 802417F4 46006302 */ mul.s $f12, $f12, $f0 -/* B21D38 802417F8 00000000 */ nop +/* B21D38 802417F8 00000000 */ nop /* B21D3C 802417FC 44910000 */ mtc1 $s1, $f0 -/* B21D40 80241800 00000000 */ nop +/* B21D40 80241800 00000000 */ nop /* B21D44 80241804 46800020 */ cvt.s.w $f0, $f0 /* B21D48 80241808 46006303 */ div.s $f12, $f12, $f0 /* B21D4C 8024180C 0C00A8D4 */ jal cos_deg /* B21D50 80241810 46166300 */ add.s $f12, $f12, $f22 /* B21D54 80241814 4600A002 */ mul.s $f0, $f20, $f0 -/* B21D58 80241818 00000000 */ nop +/* B21D58 80241818 00000000 */ nop /* B21D5C 8024181C 4614C080 */ add.s $f2, $f24, $f20 /* B21D60 80241820 46001081 */ sub.s $f2, $f2, $f0 /* B21D64 80241824 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241868_B21DA8.s b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241868_B21DA8.s index 519678798a..171f3076e7 100644 --- a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241868_B21DA8.s +++ b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241868_B21DA8.s @@ -20,18 +20,18 @@ glabel func_80241868_B21DA8 /* B21DE4 802418A4 0C00A8BB */ jal sin_deg /* B21DE8 802418A8 4600A306 */ mov.s $f12, $f20 /* B21DEC 802418AC 46180002 */ mul.s $f0, $f0, $f24 -/* B21DF0 802418B0 00000000 */ nop +/* B21DF0 802418B0 00000000 */ nop /* B21DF4 802418B4 C6160038 */ lwc1 $f22, 0x38($s0) /* B21DF8 802418B8 3C0141F0 */ lui $at, 0x41f0 /* B21DFC 802418BC 44811000 */ mtc1 $at, $f2 -/* B21E00 802418C0 00000000 */ nop +/* B21E00 802418C0 00000000 */ nop /* B21E04 802418C4 4602B580 */ add.s $f22, $f22, $f2 /* B21E08 802418C8 4600A306 */ mov.s $f12, $f20 /* B21E0C 802418CC 0C00A8D4 */ jal cos_deg /* B21E10 802418D0 4600B580 */ add.s $f22, $f22, $f0 /* B21E14 802418D4 0220202D */ daddu $a0, $s1, $zero /* B21E18 802418D8 46180002 */ mul.s $f0, $f0, $f24 -/* B21E1C 802418DC 00000000 */ nop +/* B21E1C 802418DC 00000000 */ nop /* B21E20 802418E0 3C05FE36 */ lui $a1, 0xfe36 /* B21E24 802418E4 34A53C80 */ ori $a1, $a1, 0x3c80 /* B21E28 802418E8 C6180040 */ lwc1 $f24, 0x40($s0) @@ -61,6 +61,6 @@ glabel func_80241868_B21DA8 /* B21E88 80241948 24020002 */ addiu $v0, $zero, 2 /* B21E8C 8024194C 03E00008 */ jr $ra /* B21E90 80241950 27BD0038 */ addiu $sp, $sp, 0x38 -/* B21E94 80241954 00000000 */ nop -/* B21E98 80241958 00000000 */ nop -/* B21E9C 8024195C 00000000 */ nop +/* B21E94 80241954 00000000 */ nop +/* B21E98 80241958 00000000 */ nop +/* B21E9C 8024195C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240340_B28370.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240340_B28370.s index 91f5114d4a..91ff880831 100644 --- a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240340_B28370.s +++ b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240340_B28370.s @@ -30,7 +30,7 @@ glabel func_80240340_B28370 /* B283D4 802403A4 3C05B000 */ lui $a1, 0xb000 /* B283D8 802403A8 34A50017 */ ori $a1, $a1, 0x17 /* B283DC 802403AC 44820000 */ mtc1 $v0, $f0 -/* B283E0 802403B0 00000000 */ nop +/* B283E0 802403B0 00000000 */ nop /* B283E4 802403B4 46800021 */ cvt.d.w $f0, $f0 /* B283E8 802403B8 3C014024 */ lui $at, 0x4024 /* B283EC 802403BC 44811800 */ mtc1 $at, $f3 @@ -68,7 +68,7 @@ glabel func_80240340_B28370 /* B2846C 8024043C 0C0123F5 */ jal is_point_within_region /* B28470 80240440 8E070038 */ lw $a3, 0x38($s0) /* B28474 80240444 10400035 */ beqz $v0, .L8024051C -/* B28478 80240448 00000000 */ nop +/* B28478 80240448 00000000 */ nop /* B2847C 8024044C C60C0038 */ lwc1 $f12, 0x38($s0) /* B28480 80240450 3C0141C8 */ lui $at, 0x41c8 /* B28484 80240454 4481B000 */ mtc1 $at, $f22 @@ -99,13 +99,13 @@ glabel func_80240340_B28370 /* B284E4 802404B4 860200A8 */ lh $v0, 0xa8($s0) /* B284E8 802404B8 27A50020 */ addiu $a1, $sp, 0x20 /* B284EC 802404BC 44820000 */ mtc1 $v0, $f0 -/* B284F0 802404C0 00000000 */ nop +/* B284F0 802404C0 00000000 */ nop /* B284F4 802404C4 46800020 */ cvt.s.w $f0, $f0 /* B284F8 802404C8 E7A00018 */ swc1 $f0, 0x18($sp) /* B284FC 802404CC 860200A6 */ lh $v0, 0xa6($s0) /* B28500 802404D0 27A60024 */ addiu $a2, $sp, 0x24 /* B28504 802404D4 44820000 */ mtc1 $v0, $f0 -/* B28508 802404D8 00000000 */ nop +/* B28508 802404D8 00000000 */ nop /* B2850C 802404DC 46800020 */ cvt.s.w $f0, $f0 /* B28510 802404E0 E7A0001C */ swc1 $f0, 0x1c($sp) /* B28514 802404E4 8E040080 */ lw $a0, 0x80($s0) @@ -121,13 +121,13 @@ glabel func_80240340_B28370 /* B2853C 8024050C 1440FFE6 */ bnez $v0, .L802404A8 /* B28540 80240510 E600000C */ swc1 $f0, 0xc($s0) /* B28544 80240514 08090153 */ j .L8024054C -/* B28548 80240518 00000000 */ nop +/* B28548 80240518 00000000 */ nop .L8024051C: /* B2854C 8024051C 0C00A67F */ jal rand_int /* B28550 80240520 2404003C */ addiu $a0, $zero, 0x3c /* B28554 80240524 C60C000C */ lwc1 $f12, 0xc($s0) /* B28558 80240528 44820000 */ mtc1 $v0, $f0 -/* B2855C 8024052C 00000000 */ nop +/* B2855C 8024052C 00000000 */ nop /* B28560 80240530 46800020 */ cvt.s.w $f0, $f0 /* B28564 80240534 46006300 */ add.s $f12, $f12, $f0 /* B28568 80240538 3C0141F0 */ lui $at, 0x41f0 diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240570_B285A0.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240570_B285A0.s index 74c6b2992e..a8ec5a07a6 100644 --- a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240570_B285A0.s +++ b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240570_B285A0.s @@ -43,7 +43,7 @@ glabel func_80240570_B285A0 /* B28638 80240608 2402000F */ addiu $v0, $zero, 0xf /* B2863C 8024060C AFA2001C */ sw $v0, 0x1c($sp) /* B28640 80240610 44835000 */ mtc1 $v1, $f10 -/* B28644 80240614 00000000 */ nop +/* B28644 80240614 00000000 */ nop /* B28648 80240618 468052A0 */ cvt.s.w $f10, $f10 /* B2864C 8024061C 44075000 */ mfc1 $a3, $f10 /* B28650 80240620 27A20028 */ addiu $v0, $sp, 0x28 @@ -78,7 +78,7 @@ glabel func_80240570_B285A0 /* B286B8 80240688 44801800 */ mtc1 $zero, $f3 /* B286BC 8024068C 46000021 */ cvt.d.s $f0, $f0 /* B286C0 80240690 4620103C */ c.lt.d $f2, $f0 -/* B286C4 80240694 00000000 */ nop +/* B286C4 80240694 00000000 */ nop /* B286C8 80240698 45000025 */ bc1f .L80240730 /* B286CC 8024069C 27A5002C */ addiu $a1, $sp, 0x2c /* B286D0 802406A0 C6000038 */ lwc1 $f0, 0x38($s0) @@ -88,7 +88,7 @@ glabel func_80240570_B285A0 /* B286E0 802406B0 27A60030 */ addiu $a2, $sp, 0x30 /* B286E4 802406B4 E7A0002C */ swc1 $f0, 0x2c($sp) /* B286E8 802406B8 44820000 */ mtc1 $v0, $f0 -/* B286EC 802406BC 00000000 */ nop +/* B286EC 802406BC 00000000 */ nop /* B286F0 802406C0 46800020 */ cvt.s.w $f0, $f0 /* B286F4 802406C4 46000021 */ cvt.d.s $f0, $f0 /* B286F8 802406C8 C604003C */ lwc1 $f4, 0x3c($s0) @@ -96,13 +96,13 @@ glabel func_80240570_B285A0 /* B28700 802406D0 C6080018 */ lwc1 $f8, 0x18($s0) /* B28704 802406D4 860200A8 */ lh $v0, 0xa8($s0) /* B28708 802406D8 46220002 */ mul.d $f0, $f0, $f2 -/* B2870C 802406DC 00000000 */ nop +/* B2870C 802406DC 00000000 */ nop /* B28710 802406E0 E7A40030 */ swc1 $f4, 0x30($sp) /* B28714 802406E4 E7A60034 */ swc1 $f6, 0x34($sp) /* B28718 802406E8 E7A80010 */ swc1 $f8, 0x10($sp) /* B2871C 802406EC C604000C */ lwc1 $f4, 0xc($s0) /* B28720 802406F0 44821000 */ mtc1 $v0, $f2 -/* B28724 802406F4 00000000 */ nop +/* B28724 802406F4 00000000 */ nop /* B28728 802406F8 468010A0 */ cvt.s.w $f2, $f2 /* B2872C 802406FC E7A20018 */ swc1 $f2, 0x18($sp) /* B28730 80240700 E7A40014 */ swc1 $f4, 0x14($sp) @@ -123,7 +123,7 @@ glabel func_80240570_B285A0 /* B28768 80240738 44801800 */ mtc1 $zero, $f3 /* B2876C 8024073C 46000021 */ cvt.d.s $f0, $f0 /* B28770 80240740 4622003C */ c.lt.d $f0, $f2 -/* B28774 80240744 00000000 */ nop +/* B28774 80240744 00000000 */ nop /* B28778 80240748 45000047 */ bc1f .L80240868 /* B2877C 8024074C 27A5002C */ addiu $a1, $sp, 0x2c /* B28780 80240750 27A60030 */ addiu $a2, $sp, 0x30 @@ -154,7 +154,7 @@ glabel func_80240570_B285A0 /* B287E4 802407B4 0C0372DF */ jal func_800DCB7C /* B287E8 802407B8 27A70034 */ addiu $a3, $sp, 0x34 /* B287EC 802407BC 1040002A */ beqz $v0, .L80240868 -/* B287F0 802407C0 00000000 */ nop +/* B287F0 802407C0 00000000 */ nop /* B287F4 802407C4 C600001C */ lwc1 $f0, 0x1c($s0) /* B287F8 802407C8 C7A20038 */ lwc1 $f2, 0x38($sp) /* B287FC 802407CC 46000005 */ abs.s $f0, $f0 @@ -162,7 +162,7 @@ glabel func_80240570_B285A0 /* B28804 802407D4 46340000 */ add.d $f0, $f0, $f20 /* B28808 802407D8 460010A1 */ cvt.d.s $f2, $f2 /* B2880C 802407DC 4620103E */ c.le.d $f2, $f0 -/* B28810 802407E0 00000000 */ nop +/* B28810 802407E0 00000000 */ nop /* B28814 802407E4 45000020 */ bc1f .L80240868 /* B28818 802407E8 240403E8 */ addiu $a0, $zero, 0x3e8 /* B2881C 802407EC C7A00030 */ lwc1 $f0, 0x30($sp) @@ -193,7 +193,7 @@ glabel func_80240570_B285A0 /* B28880 80240850 5840000C */ blezl $v0, .L80240884 /* B28884 80240854 AE600070 */ sw $zero, 0x70($s3) /* B28888 80240858 1460000A */ bnez $v1, .L80240884 -/* B2888C 8024085C 00000000 */ nop +/* B2888C 8024085C 00000000 */ nop /* B28890 80240860 08090221 */ j .L80240884 /* B28894 80240864 AE600070 */ sw $zero, 0x70($s3) .L80240868: diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240968_B28998.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240968_B28998.s index 4b99f05e6c..d9c5d6cd92 100644 --- a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240968_B28998.s +++ b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240968_B28998.s @@ -38,7 +38,7 @@ glabel func_80240968_B28998 /* B28A1C 802409EC 2402000F */ addiu $v0, $zero, 0xf /* B28A20 802409F0 AFA2001C */ sw $v0, 0x1c($sp) /* B28A24 802409F4 44833000 */ mtc1 $v1, $f6 -/* B28A28 802409F8 00000000 */ nop +/* B28A28 802409F8 00000000 */ nop /* B28A2C 802409FC 468031A0 */ cvt.s.w $f6, $f6 /* B28A30 80240A00 44073000 */ mfc1 $a3, $f6 /* B28A34 80240A04 27A20028 */ addiu $v0, $sp, 0x28 @@ -65,13 +65,13 @@ glabel func_80240968_B28998 .L80240A58: /* B28A88 80240A58 8602008C */ lh $v0, 0x8c($s0) /* B28A8C 80240A5C 14400023 */ bnez $v0, .L80240AEC -/* B28A90 80240A60 00000000 */ nop +/* B28A90 80240A60 00000000 */ nop /* B28A94 80240A64 9602008E */ lhu $v0, 0x8e($s0) /* B28A98 80240A68 2442FFFF */ addiu $v0, $v0, -1 /* B28A9C 80240A6C A602008E */ sh $v0, 0x8e($s0) /* B28AA0 80240A70 00021400 */ sll $v0, $v0, 0x10 /* B28AA4 80240A74 1C40001D */ bgtz $v0, .L80240AEC -/* B28AA8 80240A78 00000000 */ nop +/* B28AA8 80240A78 00000000 */ nop /* B28AAC 80240A7C 8E820074 */ lw $v0, 0x74($s4) /* B28AB0 80240A80 2442FFFF */ addiu $v0, $v0, -1 /* B28AB4 80240A84 18400018 */ blez $v0, .L80240AE8 diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240B0C_B28B3C.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240B0C_B28B3C.s index b8d9566497..1b211ce6b1 100644 --- a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240B0C_B28B3C.s +++ b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240B0C_B28B3C.s @@ -24,7 +24,7 @@ glabel func_80240B0C_B28B3C /* B28B88 80240B58 0C00A67F */ jal rand_int /* B28B8C 80240B5C AE020000 */ sw $v0, ($s0) /* B28B90 80240B60 44820000 */ mtc1 $v0, $f0 -/* B28B94 80240B64 00000000 */ nop +/* B28B94 80240B64 00000000 */ nop /* B28B98 80240B68 46800021 */ cvt.d.w $f0, $f0 /* B28B9C 80240B6C 3C014024 */ lui $at, 0x4024 /* B28BA0 80240B70 44811800 */ mtc1 $at, $f3 diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240BEC_B28C1C.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240BEC_B28C1C.s index 884ab868c3..1291ad130c 100644 --- a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240BEC_B28C1C.s +++ b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240BEC_B28C1C.s @@ -25,7 +25,7 @@ glabel func_80240BEC_B28C1C /* B28C6C 80240C3C 44801800 */ mtc1 $zero, $f3 /* B28C70 80240C40 46000021 */ cvt.d.s $f0, $f0 /* B28C74 80240C44 4620103C */ c.lt.d $f2, $f0 -/* B28C78 80240C48 00000000 */ nop +/* B28C78 80240C48 00000000 */ nop /* B28C7C 80240C4C 45000021 */ bc1f .L80240CD4 /* B28C80 80240C50 27A50028 */ addiu $a1, $sp, 0x28 /* B28C84 80240C54 C6600038 */ lwc1 $f0, 0x38($s3) @@ -40,20 +40,20 @@ glabel func_80240BEC_B28C1C /* B28CA8 80240C78 E7A00014 */ swc1 $f0, 0x14($sp) /* B28CAC 80240C7C 866200A8 */ lh $v0, 0xa8($s3) /* B28CB0 80240C80 44820000 */ mtc1 $v0, $f0 -/* B28CB4 80240C84 00000000 */ nop +/* B28CB4 80240C84 00000000 */ nop /* B28CB8 80240C88 46800020 */ cvt.s.w $f0, $f0 /* B28CBC 80240C8C E7A00018 */ swc1 $f0, 0x18($sp) /* B28CC0 80240C90 866200A6 */ lh $v0, 0xa6($s3) /* B28CC4 80240C94 27A6002C */ addiu $a2, $sp, 0x2c /* B28CC8 80240C98 44820000 */ mtc1 $v0, $f0 -/* B28CCC 80240C9C 00000000 */ nop +/* B28CCC 80240C9C 00000000 */ nop /* B28CD0 80240CA0 46800020 */ cvt.s.w $f0, $f0 /* B28CD4 80240CA4 E7A0001C */ swc1 $f0, 0x1c($sp) /* B28CD8 80240CA8 8E640080 */ lw $a0, 0x80($s3) /* B28CDC 80240CAC 0C037711 */ jal func_800DDC44 /* B28CE0 80240CB0 27A70030 */ addiu $a3, $sp, 0x30 /* B28CE4 80240CB4 10400003 */ beqz $v0, .L80240CC4 -/* B28CE8 80240CB8 00000000 */ nop +/* B28CE8 80240CB8 00000000 */ nop /* B28CEC 80240CBC 08090335 */ j .L80240CD4 /* B28CF0 80240CC0 AE600018 */ sw $zero, 0x18($s3) .L80240CC4: @@ -67,7 +67,7 @@ glabel func_80240BEC_B28C1C /* B28D0C 80240CDC 44801800 */ mtc1 $zero, $f3 /* B28D10 80240CE0 46000021 */ cvt.d.s $f0, $f0 /* B28D14 80240CE4 4622003C */ c.lt.d $f0, $f2 -/* B28D18 80240CE8 00000000 */ nop +/* B28D18 80240CE8 00000000 */ nop /* B28D1C 80240CEC 4500006C */ bc1f .L80240EA0 /* B28D20 80240CF0 27B00028 */ addiu $s0, $sp, 0x28 /* B28D24 80240CF4 0200282D */ daddu $a1, $s0, $zero @@ -116,7 +116,7 @@ glabel func_80240BEC_B28C1C /* B28DD0 80240DA0 0C0372DF */ jal func_800DCB7C /* B28DD4 80240DA4 0220382D */ daddu $a3, $s1, $zero /* B28DD8 80240DA8 1040003D */ beqz $v0, .L80240EA0 -/* B28DDC 80240DAC 00000000 */ nop +/* B28DDC 80240DAC 00000000 */ nop /* B28DE0 80240DB0 C660001C */ lwc1 $f0, 0x1c($s3) /* B28DE4 80240DB4 C7A20038 */ lwc1 $f2, 0x38($sp) /* B28DE8 80240DB8 46000005 */ abs.s $f0, $f0 @@ -124,7 +124,7 @@ glabel func_80240BEC_B28C1C /* B28DF0 80240DC0 46340000 */ add.d $f0, $f0, $f20 /* B28DF4 80240DC4 460010A1 */ cvt.d.s $f2, $f2 /* B28DF8 80240DC8 4620103E */ c.le.d $f2, $f0 -/* B28DFC 80240DCC 00000000 */ nop +/* B28DFC 80240DCC 00000000 */ nop /* B28E00 80240DD0 45000033 */ bc1f .L80240EA0 /* B28E04 80240DD4 2403F7FF */ addiu $v1, $zero, -0x801 /* B28E08 80240DD8 C7A0002C */ lwc1 $f0, 0x2c($sp) @@ -163,7 +163,7 @@ glabel func_80240BEC_B28C1C /* B28E8C 80240E5C 2402000F */ addiu $v0, $zero, 0xf /* B28E90 80240E60 AFA2001C */ sw $v0, 0x1c($sp) /* B28E94 80240E64 44834000 */ mtc1 $v1, $f8 -/* B28E98 80240E68 00000000 */ nop +/* B28E98 80240E68 00000000 */ nop /* B28E9C 80240E6C 46804220 */ cvt.s.w $f8, $f8 /* B28EA0 80240E70 44074000 */ mfc1 $a3, $f8 /* B28EA4 80240E74 27A2003C */ addiu $v0, $sp, 0x3c diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s index 9b11943d8b..8d723cbfd5 100644 --- a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s +++ b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s @@ -76,7 +76,7 @@ glabel func_80240F30_B28F60 /* B29078 80241048 8E4300B0 */ lw $v1, 0xb0($s2) /* B2907C 8024104C 30620004 */ andi $v0, $v1, 4 /* B29080 80241050 10400007 */ beqz $v0, .L80241070 -/* B29084 80241054 00000000 */ nop +/* B29084 80241054 00000000 */ nop /* B29088 80241058 824200B4 */ lb $v0, 0xb4($s2) /* B2908C 8024105C 14400034 */ bnez $v0, .L80241130 /* B29090 80241060 0000102D */ daddu $v0, $zero, $zero @@ -88,21 +88,24 @@ glabel func_80240F30_B28F60 /* B290A4 80241074 2C62000F */ sltiu $v0, $v1, 0xf /* B290A8 80241078 1040002C */ beqz $v0, .L8024112C /* B290AC 8024107C 00031080 */ sll $v0, $v1, 2 -/* B290B0 80241080 3C018024 */ lui $at, %hi(D_802443F8) +/* B290B0 80241080 3C018024 */ lui $at, %hi(jtbl_802443F8_B2C428) /* B290B4 80241084 00220821 */ addu $at, $at, $v0 -/* B290B8 80241088 8C2243F8 */ lw $v0, %lo(D_802443F8)($at) +/* B290B8 80241088 8C2243F8 */ lw $v0, %lo(jtbl_802443F8_B2C428)($at) /* B290BC 8024108C 00400008 */ jr $v0 -/* B290C0 80241090 00000000 */ nop +/* B290C0 80241090 00000000 */ nop +glabel L80241094_B290C4 /* B290C4 80241094 0260202D */ daddu $a0, $s3, $zero /* B290C8 80241098 0280282D */ daddu $a1, $s4, $zero /* B290CC 8024109C 0C0900D0 */ jal func_80240340_B28370 /* B290D0 802410A0 0200302D */ daddu $a2, $s0, $zero +glabel L802410A4_B290D4 /* B290D4 802410A4 0260202D */ daddu $a0, $s3, $zero /* B290D8 802410A8 0280282D */ daddu $a1, $s4, $zero /* B290DC 802410AC 0C09015C */ jal func_80240570_B285A0 /* B290E0 802410B0 0200302D */ daddu $a2, $s0, $zero /* B290E4 802410B4 0809044C */ j .L80241130 /* B290E8 802410B8 0000102D */ daddu $v0, $zero, $zero +glabel L802410BC_B290EC /* B290EC 802410BC 0260202D */ daddu $a0, $s3, $zero /* B290F0 802410C0 0280282D */ daddu $a1, $s4, $zero /* B290F4 802410C4 0C09022A */ jal jan_01_UnkNpcAIFunc1 @@ -111,27 +114,32 @@ glabel func_80240F30_B28F60 /* B29100 802410D0 24020003 */ addiu $v0, $zero, 3 /* B29104 802410D4 14620016 */ bne $v1, $v0, .L80241130 /* B29108 802410D8 0000102D */ daddu $v0, $zero, $zero +glabel L802410DC_B2910C /* B2910C 802410DC 0260202D */ daddu $a0, $s3, $zero /* B29110 802410E0 0280282D */ daddu $a1, $s4, $zero /* B29114 802410E4 0C09025A */ jal func_80240968_B28998 /* B29118 802410E8 0200302D */ daddu $a2, $s0, $zero /* B2911C 802410EC 0809044C */ j .L80241130 /* B29120 802410F0 0000102D */ daddu $v0, $zero, $zero +glabel L802410F4_B29124 /* B29124 802410F4 0260202D */ daddu $a0, $s3, $zero /* B29128 802410F8 0280282D */ daddu $a1, $s4, $zero /* B2912C 802410FC 0C0902C3 */ jal func_80240B0C_B28B3C /* B29130 80241100 0200302D */ daddu $a2, $s0, $zero +glabel L80241104_B29134 /* B29134 80241104 0260202D */ daddu $a0, $s3, $zero /* B29138 80241108 0280282D */ daddu $a1, $s4, $zero /* B2913C 8024110C 0C0902FB */ jal func_80240BEC_B28C1C /* B29140 80241110 0200302D */ daddu $a2, $s0, $zero /* B29144 80241114 0809044C */ j .L80241130 /* B29148 80241118 0000102D */ daddu $v0, $zero, $zero +glabel L8024111C_B2914C /* B2914C 8024111C 0260202D */ daddu $a0, $s3, $zero /* B29150 80241120 0280282D */ daddu $a1, $s4, $zero /* B29154 80241124 0C0903BB */ jal jan_01_UnkDurationCheck /* B29158 80241128 0200302D */ daddu $a2, $s0, $zero .L8024112C: +glabel L8024112C_B2915C /* B2915C 8024112C 0000102D */ daddu $v0, $zero, $zero .L80241130: /* B29160 80241130 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80241170_B291A0.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80241170_B291A0.s index 6f285db813..9da4b2cd6c 100644 --- a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80241170_B291A0.s +++ b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80241170_B291A0.s @@ -9,4 +9,4 @@ glabel func_80241170_B291A0 /* B291B0 80241180 A4620000 */ sh $v0, ($v1) /* B291B4 80241184 03E00008 */ jr $ra /* B291B8 80241188 24020002 */ addiu $v0, $zero, 2 -/* B291BC 8024118C 00000000 */ nop +/* B291BC 8024118C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C470/func_80240000_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/B2C470/func_80240000_B2C470.s index 78fe25435f..e94145a4e3 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C470/func_80240000_B2C470.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C470/func_80240000_B2C470.s @@ -11,6 +11,6 @@ glabel func_80240000_B2C470 /* B2C488 80240018 24020002 */ addiu $v0, $zero, 2 /* B2C48C 8024001C 03E00008 */ jr $ra /* B2C490 80240020 27BD0018 */ addiu $sp, $sp, 0x18 -/* B2C494 80240024 00000000 */ nop -/* B2C498 80240028 00000000 */ nop -/* B2C49C 8024002C 00000000 */ nop +/* B2C494 80240024 00000000 */ nop +/* B2C498 80240028 00000000 */ nop +/* B2C49C 8024002C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_80240360_B2C7D0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_80240360_B2C7D0.s index 49b54e531f..b727e1a59b 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_80240360_B2C7D0.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_80240360_B2C7D0.s @@ -16,7 +16,7 @@ glabel func_80240360_B2C7D0 /* B2C7FC 8024038C 10620003 */ beq $v1, $v0, .L8024039C /* B2C800 80240390 2402000D */ addiu $v0, $zero, 0xd /* B2C804 80240394 14620013 */ bne $v1, $v0, .L802403E4 -/* B2C808 80240398 00000000 */ nop +/* B2C808 80240398 00000000 */ nop .L8024039C: /* B2C80C 8024039C 24040009 */ addiu $a0, $zero, 9 /* B2C810 802403A0 24050002 */ addiu $a1, $zero, 2 @@ -30,7 +30,7 @@ glabel func_80240360_B2C7D0 /* B2C82C 802403BC 10620003 */ beq $v1, $v0, .L802403CC /* B2C830 802403C0 2402002B */ addiu $v0, $zero, 0x2b /* B2C834 802403C4 14620007 */ bne $v1, $v0, .L802403E4 -/* B2C838 802403C8 00000000 */ nop +/* B2C838 802403C8 00000000 */ nop .L802403CC: /* B2C83C 802403CC 24040009 */ addiu $a0, $zero, 9 /* B2C840 802403D0 24050002 */ addiu $a1, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_802403F8_B2C868.s b/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_802403F8_B2C868.s index 236883b525..cf9f9fb9f6 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_802403F8_B2C868.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_802403F8_B2C868.s @@ -15,4 +15,4 @@ glabel func_802403F8_B2C868 /* B2C890 80240420 24020002 */ addiu $v0, $zero, 2 /* B2C894 80240424 03E00008 */ jr $ra /* B2C898 80240428 27BD0020 */ addiu $sp, $sp, 0x20 -/* B2C89C 8024042C 00000000 */ nop +/* B2C89C 8024042C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240430_B2C8A0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240430_B2C8A0.s index 1b4443127f..f475788a46 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240430_B2C8A0.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240430_B2C8A0.s @@ -45,7 +45,7 @@ glabel func_80240430_B2C8A0 /* B2C93C 802404CC 0C00A7B5 */ jal dist2D /* B2C940 802404D0 4600B386 */ mov.s $f14, $f22 /* B2C944 802404D4 4614003C */ c.lt.s $f0, $f20 -/* B2C948 802404D8 00000000 */ nop +/* B2C948 802404D8 00000000 */ nop /* B2C94C 802404DC 45000003 */ bc1f .L802404EC /* B2C950 802404E0 2631000C */ addiu $s1, $s1, 0xc /* B2C954 802404E4 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_80240430_B2C8A0 /* B2C980 80240510 8E6200D0 */ lw $v0, 0xd0($s3) /* B2C984 80240514 8C42007C */ lw $v0, 0x7c($v0) /* B2C988 80240518 04410004 */ bgez $v0, .L8024052C -/* B2C98C 8024051C 00000000 */ nop +/* B2C98C 8024051C 00000000 */ nop /* B2C990 80240520 C6C00000 */ lwc1 $f0, ($s6) /* B2C994 80240524 08090153 */ j .L8024054C /* B2C998 80240528 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_80240430_B2C8A0 /* B2C99C 8024052C 3C018025 */ lui $at, %hi(D_802485C0) /* B2C9A0 80240530 D42285C0 */ ldc1 $f2, %lo(D_802485C0)($at) /* B2C9A4 80240534 44820000 */ mtc1 $v0, $f0 -/* B2C9A8 80240538 00000000 */ nop +/* B2C9A8 80240538 00000000 */ nop /* B2C9AC 8024053C 46800021 */ cvt.d.w $f0, $f0 /* B2C9B0 80240540 46220003 */ div.d $f0, $f0, $f2 /* B2C9B4 80240544 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240588_B2C9F8.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240588_B2C9F8.s index 965f51d252..6ae18a926e 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240588_B2C9F8.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240588_B2C9F8.s @@ -44,7 +44,7 @@ glabel func_80240588_B2C9F8 /* B2CA94 80240624 2402000F */ addiu $v0, $zero, 0xf /* B2CA98 80240628 AFA2001C */ sw $v0, 0x1c($sp) /* B2CA9C 8024062C 44833000 */ mtc1 $v1, $f6 -/* B2CAA0 80240630 00000000 */ nop +/* B2CAA0 80240630 00000000 */ nop /* B2CAA4 80240634 468031A0 */ cvt.s.w $f6, $f6 /* B2CAA8 80240638 44073000 */ mfc1 $a3, $f6 /* B2CAAC 8024063C 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_80240588_B2C9F8 .L8024068C: /* B2CAFC 8024068C 8602008C */ lh $v0, 0x8c($s0) /* B2CB00 80240690 1440005D */ bnez $v0, .L80240808 -/* B2CB04 80240694 00000000 */ nop +/* B2CB04 80240694 00000000 */ nop /* B2CB08 80240698 C6000018 */ lwc1 $f0, 0x18($s0) /* B2CB0C 8024069C 3C014010 */ lui $at, 0x4010 /* B2CB10 802406A0 44811800 */ mtc1 $at, $f3 /* B2CB14 802406A4 44801000 */ mtc1 $zero, $f2 /* B2CB18 802406A8 46000021 */ cvt.d.s $f0, $f0 /* B2CB1C 802406AC 4622003C */ c.lt.d $f0, $f2 -/* B2CB20 802406B0 00000000 */ nop +/* B2CB20 802406B0 00000000 */ nop /* B2CB24 802406B4 45000003 */ bc1f .L802406C4 /* B2CB28 802406B8 0200202D */ daddu $a0, $s0, $zero /* B2CB2C 802406BC 080901B2 */ j .L802406C8 @@ -88,7 +88,7 @@ glabel func_80240588_B2C9F8 /* B2CB34 802406C4 24050001 */ addiu $a1, $zero, 1 .L802406C8: /* B2CB38 802406C8 0C00F598 */ jal func_8003D660 -/* B2CB3C 802406CC 00000000 */ nop +/* B2CB3C 802406CC 00000000 */ nop /* B2CB40 802406D0 C60C0038 */ lwc1 $f12, 0x38($s0) /* B2CB44 802406D4 8E430078 */ lw $v1, 0x78($s2) /* B2CB48 802406D8 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_80240588_B2C9F8 /* B2CB70 80240700 4406B000 */ mfc1 $a2, $f22 /* B2CB74 80240704 4407A000 */ mfc1 $a3, $f20 /* B2CB78 80240708 0C00A720 */ jal atan2 -/* B2CB7C 8024070C 00000000 */ nop +/* B2CB7C 8024070C 00000000 */ nop /* B2CB80 80240710 8E050018 */ lw $a1, 0x18($s0) /* B2CB84 80240714 44060000 */ mfc1 $a2, $f0 /* B2CB88 80240718 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_80240588_B2C9F8 /* B2CB9C 8024072C 4406B000 */ mfc1 $a2, $f22 /* B2CBA0 80240730 4407A000 */ mfc1 $a3, $f20 /* B2CBA4 80240734 0C00A7B5 */ jal dist2D -/* B2CBA8 80240738 00000000 */ nop +/* B2CBA8 80240738 00000000 */ nop /* B2CBAC 8024073C C6020018 */ lwc1 $f2, 0x18($s0) /* B2CBB0 80240740 4602003E */ c.le.s $f0, $f2 -/* B2CBB4 80240744 00000000 */ nop +/* B2CBB4 80240744 00000000 */ nop /* B2CBB8 80240748 4500002F */ bc1f .L80240808 /* B2CBBC 8024074C 240403E8 */ addiu $a0, $zero, 0x3e8 /* B2CBC0 80240750 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_80240588_B2C9F8 /* B2CC14 802407A4 18400003 */ blez $v0, .L802407B4 /* B2CC18 802407A8 24020004 */ addiu $v0, $zero, 4 /* B2CC1C 802407AC 14600002 */ bnez $v1, .L802407B8 -/* B2CC20 802407B0 00000000 */ nop +/* B2CC20 802407B0 00000000 */ nop .L802407B4: /* B2CC24 802407B4 AE420070 */ sw $v0, 0x70($s2) .L802407B8: diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802408F0_B2CD60.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802408F0_B2CD60.s index 46d3502ead..504e8b8c16 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802408F0_B2CD60.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802408F0_B2CD60.s @@ -38,7 +38,7 @@ glabel func_802408F0_B2CD60 /* B2CDE4 80240974 2402000F */ addiu $v0, $zero, 0xf /* B2CDE8 80240978 AFA2001C */ sw $v0, 0x1c($sp) /* B2CDEC 8024097C 44833000 */ mtc1 $v1, $f6 -/* B2CDF0 80240980 00000000 */ nop +/* B2CDF0 80240980 00000000 */ nop /* B2CDF4 80240984 468031A0 */ cvt.s.w $f6, $f6 /* B2CDF8 80240988 44073000 */ mfc1 $a3, $f6 /* B2CDFC 8024098C 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_802408F0_B2CD60 .L802409F0: /* B2CE60 802409F0 8602008C */ lh $v0, 0x8c($s0) /* B2CE64 802409F4 14400025 */ bnez $v0, .L80240A8C -/* B2CE68 802409F8 00000000 */ nop +/* B2CE68 802409F8 00000000 */ nop /* B2CE6C 802409FC 9602008E */ lhu $v0, 0x8e($s0) /* B2CE70 80240A00 2442FFFF */ addiu $v0, $v0, -1 /* B2CE74 80240A04 A602008E */ sh $v0, 0x8e($s0) /* B2CE78 80240A08 00021400 */ sll $v0, $v0, 0x10 /* B2CE7C 80240A0C 1440001F */ bnez $v0, .L80240A8C -/* B2CE80 80240A10 00000000 */ nop +/* B2CE80 80240A10 00000000 */ nop /* B2CE84 80240A14 8E820074 */ lw $v0, 0x74($s4) /* B2CE88 80240A18 2442FFFF */ addiu $v0, $v0, -1 /* B2CE8C 80240A1C 10400019 */ beqz $v0, .L80240A84 @@ -84,7 +84,7 @@ glabel func_802408F0_B2CD60 /* B2CE98 80240A28 9442002A */ lhu $v0, 0x2a($v0) /* B2CE9C 80240A2C 30420010 */ andi $v0, $v0, 0x10 /* B2CEA0 80240A30 14400007 */ bnez $v0, .L80240A50 -/* B2CEA4 80240A34 00000000 */ nop +/* B2CEA4 80240A34 00000000 */ nop /* B2CEA8 80240A38 C600000C */ lwc1 $f0, 0xc($s0) /* B2CEAC 80240A3C 3C014334 */ lui $at, 0x4334 /* B2CEB0 80240A40 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240AAC_B2CF1C.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240AAC_B2CF1C.s index 684568fb4b..563814a70b 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240AAC_B2CF1C.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240AAC_B2CF1C.s @@ -28,7 +28,7 @@ glabel func_80240AAC_B2CF1C /* B2CF74 80240B04 8E0200D0 */ lw $v0, 0xd0($s0) /* B2CF78 80240B08 8C42007C */ lw $v0, 0x7c($v0) /* B2CF7C 80240B0C 04410004 */ bgez $v0, .L80240B20 -/* B2CF80 80240B10 00000000 */ nop +/* B2CF80 80240B10 00000000 */ nop /* B2CF84 80240B14 C6400000 */ lwc1 $f0, ($s2) /* B2CF88 80240B18 080902D0 */ j .L80240B40 /* B2CF8C 80240B1C E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_80240AAC_B2CF1C /* B2CF90 80240B20 3C018025 */ lui $at, %hi(D_802485C8) /* B2CF94 80240B24 D42285C8 */ ldc1 $f2, %lo(D_802485C8)($at) /* B2CF98 80240B28 44820000 */ mtc1 $v0, $f0 -/* B2CF9C 80240B2C 00000000 */ nop +/* B2CF9C 80240B2C 00000000 */ nop /* B2CFA0 80240B30 46800021 */ cvt.d.w $f0, $f0 /* B2CFA4 80240B34 46220003 */ div.d $f0, $f0, $f2 /* B2CFA8 80240B38 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240C4C_B2D0BC.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240C4C_B2D0BC.s index 84888a42b2..0c5494f551 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240C4C_B2D0BC.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240C4C_B2D0BC.s @@ -47,20 +47,20 @@ glabel func_80240C4C_B2D0BC /* B2D164 80240CF4 8E02001C */ lw $v0, 0x1c($s0) /* B2D168 80240CF8 46001005 */ abs.s $f0, $f2 /* B2D16C 80240CFC 44822000 */ mtc1 $v0, $f4 -/* B2D170 80240D00 00000000 */ nop +/* B2D170 80240D00 00000000 */ nop /* B2D174 80240D04 46802120 */ cvt.s.w $f4, $f4 /* B2D178 80240D08 4600203C */ c.lt.s $f4, $f0 -/* B2D17C 80240D0C 00000000 */ nop +/* B2D17C 80240D0C 00000000 */ nop /* B2D180 80240D10 4500000D */ bc1f .L80240D48 -/* B2D184 80240D14 00000000 */ nop +/* B2D184 80240D14 00000000 */ nop /* B2D188 80240D18 44800000 */ mtc1 $zero, $f0 /* B2D18C 80240D1C C654000C */ lwc1 $f20, 0xc($s2) /* B2D190 80240D20 4600103C */ c.lt.s $f2, $f0 -/* B2D194 80240D24 00000000 */ nop +/* B2D194 80240D24 00000000 */ nop /* B2D198 80240D28 45000006 */ bc1f .L80240D44 /* B2D19C 80240D2C 00021023 */ negu $v0, $v0 /* B2D1A0 80240D30 44820000 */ mtc1 $v0, $f0 -/* B2D1A4 80240D34 00000000 */ nop +/* B2D1A4 80240D34 00000000 */ nop /* B2D1A8 80240D38 46800020 */ cvt.s.w $f0, $f0 /* B2D1AC 80240D3C 08090352 */ j .L80240D48 /* B2D1B0 80240D40 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240D7C_B2D1EC.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240D7C_B2D1EC.s index d3f41ba88d..bf362c27b6 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240D7C_B2D1EC.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240D7C_B2D1EC.s @@ -37,7 +37,7 @@ glabel func_80240D7C_B2D1EC /* B2D26C 80240DFC 2402000F */ addiu $v0, $zero, 0xf /* B2D270 80240E00 AFA2001C */ sw $v0, 0x1c($sp) /* B2D274 80240E04 44833000 */ mtc1 $v1, $f6 -/* B2D278 80240E08 00000000 */ nop +/* B2D278 80240E08 00000000 */ nop /* B2D27C 80240E0C 468031A0 */ cvt.s.w $f6, $f6 /* B2D280 80240E10 44073000 */ mfc1 $a3, $f6 /* B2D284 80240E14 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240F04_B2D374.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240F04_B2D374.s index 633ea7c3c1..f65ef55836 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240F04_B2D374.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240F04_B2D374.s @@ -28,7 +28,7 @@ glabel func_80240F04_B2D374 /* B2D3CC 80240F5C C4400008 */ lwc1 $f0, 8($v0) /* B2D3D0 80240F60 46800020 */ cvt.s.w $f0, $f0 /* B2D3D4 80240F64 4602003E */ c.le.s $f0, $f2 -/* B2D3D8 80240F68 00000000 */ nop +/* B2D3D8 80240F68 00000000 */ nop /* B2D3DC 80240F6C 45020003 */ bc1fl .L80240F7C /* B2D3E0 80240F70 24840001 */ addiu $a0, $a0, 1 /* B2D3E4 80240F74 080903E3 */ j .L80240F8C diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s index 5e06ba14c4..bae7ef1dea 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s @@ -46,7 +46,7 @@ glabel func_80240FC4_B2D434 /* B2D4D8 80241068 8E2200B0 */ lw $v0, 0xb0($s1) /* B2D4DC 8024106C 30420004 */ andi $v0, $v0, 4 /* B2D4E0 80241070 10400044 */ beqz $v0, .L80241184 -/* B2D4E4 80241074 00000000 */ nop +/* B2D4E4 80241074 00000000 */ nop .L80241078: /* B2D4E8 80241078 2404F7FF */ addiu $a0, $zero, -0x801 /* B2D4EC 8024107C AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80240FC4_B2D434 /* B2D5A0 80241130 3C0142C8 */ lui $at, 0x42c8 /* B2D5A4 80241134 44812000 */ mtc1 $at, $f4 /* B2D5A8 80241138 44823000 */ mtc1 $v0, $f6 -/* B2D5AC 8024113C 00000000 */ nop +/* B2D5AC 8024113C 00000000 */ nop /* B2D5B0 80241140 468031A0 */ cvt.s.w $f6, $f6 /* B2D5B4 80241144 27A20044 */ addiu $v0, $sp, 0x44 /* B2D5B8 80241148 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80240FC4_B2D434 /* B2D5DC 8024116C 0C0372DF */ jal func_800DCB7C /* B2D5E0 80241170 27A70040 */ addiu $a3, $sp, 0x40 /* B2D5E4 80241174 10400003 */ beqz $v0, .L80241184 -/* B2D5E8 80241178 00000000 */ nop +/* B2D5E8 80241178 00000000 */ nop /* B2D5EC 8024117C C7A0003C */ lwc1 $f0, 0x3c($sp) /* B2D5F0 80241180 E640003C */ swc1 $f0, 0x3c($s2) .L80241184: @@ -124,72 +124,85 @@ glabel func_80240FC4_B2D434 /* B2D5F8 80241188 2C620064 */ sltiu $v0, $v1, 0x64 /* B2D5FC 8024118C 10400042 */ beqz $v0, .L80241298 /* B2D600 80241190 00031080 */ sll $v0, $v1, 2 -/* B2D604 80241194 3C018025 */ lui $at, %hi(D_802485D0) +/* B2D604 80241194 3C018025 */ lui $at, %hi(jtbl_802485D0_B34A40) /* B2D608 80241198 00220821 */ addu $at, $at, $v0 -/* B2D60C 8024119C 8C2285D0 */ lw $v0, %lo(D_802485D0)($at) +/* B2D60C 8024119C 8C2285D0 */ lw $v0, %lo(jtbl_802485D0_B34A40)($at) /* B2D610 802411A0 00400008 */ jr $v0 -/* B2D614 802411A4 00000000 */ nop +/* B2D614 802411A4 00000000 */ nop +glabel L802411A8_B2D618 /* B2D618 802411A8 0280202D */ daddu $a0, $s4, $zero /* B2D61C 802411AC 0260282D */ daddu $a1, $s3, $zero /* B2D620 802411B0 0C09010C */ jal func_80240430_B2C8A0 /* B2D624 802411B4 02A0302D */ daddu $a2, $s5, $zero +glabel L802411B8_B2D628 /* B2D628 802411B8 0280202D */ daddu $a0, $s4, $zero /* B2D62C 802411BC 0260282D */ daddu $a1, $s3, $zero /* B2D630 802411C0 0C090162 */ jal func_80240588_B2C9F8 /* B2D634 802411C4 02A0302D */ daddu $a2, $s5, $zero /* B2D638 802411C8 080904A6 */ j .L80241298 -/* B2D63C 802411CC 00000000 */ nop +/* B2D63C 802411CC 00000000 */ nop +glabel L802411D0_B2D640 /* B2D640 802411D0 0280202D */ daddu $a0, $s4, $zero /* B2D644 802411D4 0260282D */ daddu $a1, $s3, $zero /* B2D648 802411D8 0C09020C */ jal jan_02_UnkNpcAIFunc1 /* B2D64C 802411DC 02A0302D */ daddu $a2, $s5, $zero +glabel L802411E0_B2D650 /* B2D650 802411E0 0280202D */ daddu $a0, $s4, $zero /* B2D654 802411E4 0260282D */ daddu $a1, $s3, $zero /* B2D658 802411E8 0C09023C */ jal func_802408F0_B2CD60 /* B2D65C 802411EC 02A0302D */ daddu $a2, $s5, $zero /* B2D660 802411F0 080904A6 */ j .L80241298 -/* B2D664 802411F4 00000000 */ nop +/* B2D664 802411F4 00000000 */ nop +glabel L802411F8_B2D668 /* B2D668 802411F8 0280202D */ daddu $a0, $s4, $zero /* B2D66C 802411FC 0260282D */ daddu $a1, $s3, $zero /* B2D670 80241200 0C0902AB */ jal func_80240AAC_B2CF1C /* B2D674 80241204 02A0302D */ daddu $a2, $s5, $zero /* B2D678 80241208 080904A6 */ j .L80241298 -/* B2D67C 8024120C 00000000 */ nop +/* B2D67C 8024120C 00000000 */ nop +glabel L80241210_B2D680 /* B2D680 80241210 0280202D */ daddu $a0, $s4, $zero /* B2D684 80241214 0260282D */ daddu $a1, $s3, $zero /* B2D688 80241218 0C0902D8 */ jal jan_02_NpcJumpFunc2 /* B2D68C 8024121C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241220_B2D690 /* B2D690 80241220 0280202D */ daddu $a0, $s4, $zero /* B2D694 80241224 0260282D */ daddu $a1, $s3, $zero /* B2D698 80241228 0C0902F5 */ jal jan_02_NpcJumpFunc /* B2D69C 8024122C 02A0302D */ daddu $a2, $s5, $zero /* B2D6A0 80241230 080904A6 */ j .L80241298 -/* B2D6A4 80241234 00000000 */ nop +/* B2D6A4 80241234 00000000 */ nop +glabel L80241238_B2D6A8 /* B2D6A8 80241238 0280202D */ daddu $a0, $s4, $zero /* B2D6AC 8024123C 0260282D */ daddu $a1, $s3, $zero /* B2D6B0 80241240 0C090313 */ jal func_80240C4C_B2D0BC /* B2D6B4 80241244 02A0302D */ daddu $a2, $s5, $zero +glabel L80241248_B2D6B8 /* B2D6B8 80241248 0280202D */ daddu $a0, $s4, $zero /* B2D6BC 8024124C 0260282D */ daddu $a1, $s3, $zero /* B2D6C0 80241250 0C09035F */ jal func_80240D7C_B2D1EC /* B2D6C4 80241254 02A0302D */ daddu $a2, $s5, $zero /* B2D6C8 80241258 080904A6 */ j .L80241298 -/* B2D6CC 8024125C 00000000 */ nop +/* B2D6CC 8024125C 00000000 */ nop +glabel L80241260_B2D6D0 /* B2D6D0 80241260 0280202D */ daddu $a0, $s4, $zero /* B2D6D4 80241264 0260282D */ daddu $a1, $s3, $zero /* B2D6D8 80241268 0C0903A7 */ jal jan_02_UnkNpcDurationFlagFunc /* B2D6DC 8024126C 02A0302D */ daddu $a2, $s5, $zero /* B2D6E0 80241270 080904A6 */ j .L80241298 -/* B2D6E4 80241274 00000000 */ nop +/* B2D6E4 80241274 00000000 */ nop +glabel L80241278_B2D6E8 /* B2D6E8 80241278 0280202D */ daddu $a0, $s4, $zero /* B2D6EC 8024127C 0260282D */ daddu $a1, $s3, $zero /* B2D6F0 80241280 0C0903C1 */ jal func_80240F04_B2D374 /* B2D6F4 80241284 02A0302D */ daddu $a2, $s5, $zero /* B2D6F8 80241288 080904A6 */ j .L80241298 -/* B2D6FC 8024128C 00000000 */ nop +/* B2D6FC 8024128C 00000000 */ nop +glabel L80241290_B2D700 /* B2D700 80241290 0C0129CF */ jal func_8004A73C /* B2D704 80241294 0280202D */ daddu $a0, $s4, $zero .L80241298: +glabel L80241298_B2D708 /* B2D708 80241298 8FBF0060 */ lw $ra, 0x60($sp) /* B2D70C 8024129C 8FB5005C */ lw $s5, 0x5c($sp) /* B2D710 802412A0 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241578_B2D9E8.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241578_B2D9E8.s index 8107c67c0b..d06327047c 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241578_B2D9E8.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241578_B2D9E8.s @@ -28,7 +28,7 @@ glabel func_80241578_B2D9E8 /* B2DA3C 802415CC 00220821 */ addu $at, $at, $v0 /* B2DA40 802415D0 AC208760 */ sw $zero, %lo(D_80248760)($at) /* B2DA44 802415D4 08090581 */ j .L80241604 -/* B2DA48 802415D8 00000000 */ nop +/* B2DA48 802415D8 00000000 */ nop .L802415DC: /* B2DA4C 802415DC 3C038025 */ lui $v1, %hi(D_80248760) /* B2DA50 802415E0 24638760 */ addiu $v1, $v1, %lo(D_80248760) diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241614_B2DA84.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241614_B2DA84.s index ca114974b2..9c30aca6ba 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241614_B2DA84.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241614_B2DA84.s @@ -26,7 +26,7 @@ glabel func_80241614_B2DA84 /* B2DAD4 80241664 1440FFFA */ bnez $v0, .L80241650 /* B2DAD8 80241668 24A50004 */ addiu $a1, $a1, 4 /* B2DADC 8024166C 080905AC */ j .L802416B0 -/* B2DAE0 80241670 00000000 */ nop +/* B2DAE0 80241670 00000000 */ nop .L80241674: /* B2DAE4 80241674 0000182D */ daddu $v1, $zero, $zero /* B2DAE8 80241678 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241750_B2DBC0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241750_B2DBC0.s index a07de4efef..46dac54a53 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241750_B2DBC0.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241750_B2DBC0.s @@ -115,7 +115,7 @@ glabel func_80241750_B2DBC0 /* B2DD68 802418F8 14E20005 */ bne $a3, $v0, .L80241910 /* B2DD6C 802418FC 32E2FFFF */ andi $v0, $s7, 0xffff /* B2DD70 80241900 14400003 */ bnez $v0, .L80241910 -/* B2DD74 80241904 00000000 */ nop +/* B2DD74 80241904 00000000 */ nop /* B2DD78 80241908 14800008 */ bnez $a0, .L8024192C /* B2DD7C 8024190C 24020001 */ addiu $v0, $zero, 1 .L80241910: @@ -123,7 +123,7 @@ glabel func_80241750_B2DBC0 /* B2DD84 80241914 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* B2DD88 80241918 80420075 */ lb $v0, 0x75($v0) /* B2DD8C 8024191C 10400005 */ beqz $v0, .L80241934 -/* B2DD90 80241920 00000000 */ nop +/* B2DD90 80241920 00000000 */ nop /* B2DD94 80241924 10800003 */ beqz $a0, .L80241934 /* B2DD98 80241928 24020001 */ addiu $v0, $zero, 1 .L8024192C: diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241A40_B2DEB0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241A40_B2DEB0.s index 8c2e25b547..4b6264045e 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241A40_B2DEB0.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241A40_B2DEB0.s @@ -39,13 +39,13 @@ glabel func_80241A40_B2DEB0 /* B2DF34 80241AC4 10740005 */ beq $v1, $s4, .L80241ADC /* B2DF38 80241AC8 26100001 */ addiu $s0, $s0, 1 /* B2DF3C 80241ACC 10730003 */ beq $v1, $s3, .L80241ADC -/* B2DF40 80241AD0 00000000 */ nop +/* B2DF40 80241AD0 00000000 */ nop /* B2DF44 80241AD4 00521025 */ or $v0, $v0, $s2 /* B2DF48 80241AD8 AC820000 */ sw $v0, ($a0) .L80241ADC: /* B2DF4C 80241ADC 2A020040 */ slti $v0, $s0, 0x40 /* B2DF50 80241AE0 1440FFEF */ bnez $v0, .L80241AA0 -/* B2DF54 80241AE4 00000000 */ nop +/* B2DF54 80241AE4 00000000 */ nop /* B2DF58 80241AE8 0000802D */ daddu $s0, $zero, $zero /* B2DF5C 80241AEC 3C120800 */ lui $s2, 0x800 .L80241AF0: @@ -57,13 +57,13 @@ glabel func_80241A40_B2DEB0 /* B2DF74 80241B04 8C640000 */ lw $a0, ($v1) /* B2DF78 80241B08 30820010 */ andi $v0, $a0, 0x10 /* B2DF7C 80241B0C 10400003 */ beqz $v0, .L80241B1C -/* B2DF80 80241B10 00000000 */ nop +/* B2DF80 80241B10 00000000 */ nop /* B2DF84 80241B14 00921025 */ or $v0, $a0, $s2 /* B2DF88 80241B18 AC620000 */ sw $v0, ($v1) .L80241B1C: /* B2DF8C 80241B1C 2A020100 */ slti $v0, $s0, 0x100 /* B2DF90 80241B20 1440FFF3 */ bnez $v0, .L80241AF0 -/* B2DF94 80241B24 00000000 */ nop +/* B2DF94 80241B24 00000000 */ nop /* B2DF98 80241B28 AE200070 */ sw $zero, 0x70($s1) .L80241B2C: /* B2DF9C 80241B2C 8E220070 */ lw $v0, 0x70($s1) diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241B8C_B2DFFC.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241B8C_B2DFFC.s index 9c72d26c5a..6df187c69f 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241B8C_B2DFFC.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241B8C_B2DFFC.s @@ -32,7 +32,7 @@ glabel func_80241B8C_B2DFFC /* B2E060 80241BF0 0080302D */ daddu $a2, $a0, $zero /* B2E064 80241BF4 8E020070 */ lw $v0, 0x70($s0) /* B2E068 80241BF8 14400006 */ bnez $v0, .L80241C14 -/* B2E06C 80241BFC 00000000 */ nop +/* B2E06C 80241BFC 00000000 */ nop /* B2E070 80241C00 8E020074 */ lw $v0, 0x74($s0) /* B2E074 80241C04 14400003 */ bnez $v0, .L80241C14 /* B2E078 80241C08 24020001 */ addiu $v0, $zero, 1 @@ -66,13 +66,13 @@ glabel func_80241B8C_B2DFFC /* B2E0E0 80241C70 10730005 */ beq $v1, $s3, .L80241C88 /* B2E0E4 80241C74 26100001 */ addiu $s0, $s0, 1 /* B2E0E8 80241C78 10720003 */ beq $v1, $s2, .L80241C88 -/* B2E0EC 80241C7C 00000000 */ nop +/* B2E0EC 80241C7C 00000000 */ nop /* B2E0F0 80241C80 00511024 */ and $v0, $v0, $s1 /* B2E0F4 80241C84 AC820000 */ sw $v0, ($a0) .L80241C88: /* B2E0F8 80241C88 2A020040 */ slti $v0, $s0, 0x40 /* B2E0FC 80241C8C 1440FFEF */ bnez $v0, .L80241C4C -/* B2E100 80241C90 00000000 */ nop +/* B2E100 80241C90 00000000 */ nop /* B2E104 80241C94 0000802D */ daddu $s0, $zero, $zero /* B2E108 80241C98 3C11F7FF */ lui $s1, 0xf7ff /* B2E10C 80241C9C 3631FFFF */ ori $s1, $s1, 0xffff @@ -85,7 +85,7 @@ glabel func_80241B8C_B2DFFC /* B2E124 80241CB4 8C640000 */ lw $a0, ($v1) /* B2E128 80241CB8 30820010 */ andi $v0, $a0, 0x10 /* B2E12C 80241CBC 10400003 */ beqz $v0, .L80241CCC -/* B2E130 80241CC0 00000000 */ nop +/* B2E130 80241CC0 00000000 */ nop /* B2E134 80241CC4 00911024 */ and $v0, $a0, $s1 /* B2E138 80241CC8 AC620000 */ sw $v0, ($v1) .L80241CCC: @@ -93,7 +93,7 @@ glabel func_80241B8C_B2DFFC /* B2E140 80241CD0 1440FFF3 */ bnez $v0, .L80241CA0 /* B2E144 80241CD4 24020002 */ addiu $v0, $zero, 2 /* B2E148 80241CD8 08090739 */ j .L80241CE4 -/* B2E14C 80241CDC 00000000 */ nop +/* B2E14C 80241CDC 00000000 */ nop .L80241CE0: /* B2E150 80241CE0 0000102D */ daddu $v0, $zero, $zero .L80241CE4: diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241D84_B2E1F4.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241D84_B2E1F4.s index 050a2af3e2..ae855c3e8f 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241D84_B2E1F4.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241D84_B2E1F4.s @@ -16,19 +16,19 @@ glabel func_80241D84_B2E1F4 /* B2E220 80241DB0 0220202D */ daddu $a0, $s1, $zero /* B2E224 80241DB4 3C05F4AC */ lui $a1, 0xf4ac /* B2E228 80241DB8 4482B000 */ mtc1 $v0, $f22 -/* B2E22C 80241DBC 00000000 */ nop +/* B2E22C 80241DBC 00000000 */ nop /* B2E230 80241DC0 4680B5A0 */ cvt.s.w $f22, $f22 /* B2E234 80241DC4 0C0B1EAF */ jal get_variable /* B2E238 80241DC8 34A5D482 */ ori $a1, $a1, 0xd482 /* B2E23C 80241DCC 0220202D */ daddu $a0, $s1, $zero /* B2E240 80241DD0 3C05F4AC */ lui $a1, 0xf4ac /* B2E244 80241DD4 4482A000 */ mtc1 $v0, $f20 -/* B2E248 80241DD8 00000000 */ nop +/* B2E248 80241DD8 00000000 */ nop /* B2E24C 80241DDC 4680A520 */ cvt.s.w $f20, $f20 /* B2E250 80241DE0 0C0B1EAF */ jal get_variable /* B2E254 80241DE4 34A5D483 */ ori $a1, $a1, 0xd483 /* B2E258 80241DE8 44821000 */ mtc1 $v0, $f2 -/* B2E25C 80241DEC 00000000 */ nop +/* B2E25C 80241DEC 00000000 */ nop /* B2E260 80241DF0 468010A0 */ cvt.s.w $f2, $f2 /* B2E264 80241DF4 4405B000 */ mfc1 $a1, $f22 /* B2E268 80241DF8 4406A000 */ mfc1 $a2, $f20 @@ -45,19 +45,19 @@ glabel func_80241D84_B2E1F4 /* B2E294 80241E24 0220202D */ daddu $a0, $s1, $zero /* B2E298 80241E28 3C05F4AC */ lui $a1, 0xf4ac /* B2E29C 80241E2C 4482B000 */ mtc1 $v0, $f22 -/* B2E2A0 80241E30 00000000 */ nop +/* B2E2A0 80241E30 00000000 */ nop /* B2E2A4 80241E34 4680B5A0 */ cvt.s.w $f22, $f22 /* B2E2A8 80241E38 0C0B1EAF */ jal get_variable /* B2E2AC 80241E3C 34A5D482 */ ori $a1, $a1, 0xd482 /* B2E2B0 80241E40 0220202D */ daddu $a0, $s1, $zero /* B2E2B4 80241E44 3C05F4AC */ lui $a1, 0xf4ac /* B2E2B8 80241E48 4482A000 */ mtc1 $v0, $f20 -/* B2E2BC 80241E4C 00000000 */ nop +/* B2E2BC 80241E4C 00000000 */ nop /* B2E2C0 80241E50 4680A520 */ cvt.s.w $f20, $f20 /* B2E2C4 80241E54 0C0B1EAF */ jal get_variable /* B2E2C8 80241E58 34A5D483 */ ori $a1, $a1, 0xd483 /* B2E2CC 80241E5C 44821000 */ mtc1 $v0, $f2 -/* B2E2D0 80241E60 00000000 */ nop +/* B2E2D0 80241E60 00000000 */ nop /* B2E2D4 80241E64 468010A0 */ cvt.s.w $f2, $f2 /* B2E2D8 80241E68 4405B000 */ mfc1 $a1, $f22 /* B2E2DC 80241E6C 4406A000 */ mfc1 $a2, $f20 @@ -73,19 +73,19 @@ glabel func_80241D84_B2E1F4 /* B2E304 80241E94 0220202D */ daddu $a0, $s1, $zero /* B2E308 80241E98 3C05F4AC */ lui $a1, 0xf4ac /* B2E30C 80241E9C 4482B000 */ mtc1 $v0, $f22 -/* B2E310 80241EA0 00000000 */ nop +/* B2E310 80241EA0 00000000 */ nop /* B2E314 80241EA4 4680B5A0 */ cvt.s.w $f22, $f22 /* B2E318 80241EA8 0C0B1EAF */ jal get_variable /* B2E31C 80241EAC 34A5D482 */ ori $a1, $a1, 0xd482 /* B2E320 80241EB0 0220202D */ daddu $a0, $s1, $zero /* B2E324 80241EB4 3C05F4AC */ lui $a1, 0xf4ac /* B2E328 80241EB8 4482A000 */ mtc1 $v0, $f20 -/* B2E32C 80241EBC 00000000 */ nop +/* B2E32C 80241EBC 00000000 */ nop /* B2E330 80241EC0 4680A520 */ cvt.s.w $f20, $f20 /* B2E334 80241EC4 0C0B1EAF */ jal get_variable /* B2E338 80241EC8 34A5D483 */ ori $a1, $a1, 0xd483 /* B2E33C 80241ECC 44821000 */ mtc1 $v0, $f2 -/* B2E340 80241ED0 00000000 */ nop +/* B2E340 80241ED0 00000000 */ nop /* B2E344 80241ED4 468010A0 */ cvt.s.w $f2, $f2 /* B2E348 80241ED8 4405B000 */ mfc1 $a1, $f22 /* B2E34C 80241EDC 4406A000 */ mfc1 $a2, $f20 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241F9C_B2E40C.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241F9C_B2E40C.s index ce84e0dcf5..2236d81852 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241F9C_B2E40C.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241F9C_B2E40C.s @@ -44,7 +44,7 @@ glabel func_80241F9C_B2E40C /* B2E4A0 80242030 3C048025 */ lui $a0, %hi(D_80248924) /* B2E4A4 80242034 8C848924 */ lw $a0, %lo(D_80248924)($a0) /* B2E4A8 80242038 0C048D70 */ jal func_801235C0 -/* B2E4AC 8024203C 00000000 */ nop +/* B2E4AC 8024203C 00000000 */ nop /* B2E4B0 80242040 24020002 */ addiu $v0, $zero, 2 .L80242044: /* B2E4B4 80242044 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024260C_B2EA7C.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024260C_B2EA7C.s index 4f4ca2cf49..83638d8599 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024260C_B2EA7C.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024260C_B2EA7C.s @@ -13,7 +13,7 @@ glabel func_8024260C_B2EA7C /* B2EA9C 8024262C 14620006 */ bne $v1, $v0, .L80242648 /* B2EAA0 80242630 24020002 */ addiu $v0, $zero, 2 /* B2EAA4 80242634 44800000 */ mtc1 $zero, $f0 -/* B2EAA8 80242638 00000000 */ nop +/* B2EAA8 80242638 00000000 */ nop /* B2EAAC 8024263C 44050000 */ mfc1 $a1, $f0 /* B2EAB0 80242640 08090998 */ j .L80242660 /* B2EAB4 80242644 0000202D */ daddu $a0, $zero, $zero @@ -21,9 +21,9 @@ glabel func_8024260C_B2EA7C /* B2EAB8 80242648 14620008 */ bne $v1, $v0, .L8024266C /* B2EABC 8024264C 24040001 */ addiu $a0, $zero, 1 /* B2EAC0 80242650 44800000 */ mtc1 $zero, $f0 -/* B2EAC4 80242654 00000000 */ nop +/* B2EAC4 80242654 00000000 */ nop /* B2EAC8 80242658 44050000 */ mfc1 $a1, $f0 -/* B2EACC 8024265C 00000000 */ nop +/* B2EACC 8024265C 00000000 */ nop .L80242660: /* B2EAD0 80242660 00A0302D */ daddu $a2, $a1, $zero /* B2EAD4 80242664 0C01C5A4 */ jal func_80071690 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802426A8_B2EB18.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802426A8_B2EB18.s index 50fdd62874..298d527a7b 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802426A8_B2EB18.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802426A8_B2EB18.s @@ -13,6 +13,6 @@ glabel func_802426A8_B2EB18 /* B2EB38 802426C8 24020002 */ addiu $v0, $zero, 2 /* B2EB3C 802426CC 03E00008 */ jr $ra /* B2EB40 802426D0 27BD0018 */ addiu $sp, $sp, 0x18 -/* B2EB44 802426D4 00000000 */ nop -/* B2EB48 802426D8 00000000 */ nop -/* B2EB4C 802426DC 00000000 */ nop +/* B2EB44 802426D4 00000000 */ nop +/* B2EB48 802426D8 00000000 */ nop +/* B2EB4C 802426DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240034_B34C04.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240034_B34C04.s index d2ff318eee..56bc1eadd4 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240034_B34C04.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240034_B34C04.s @@ -22,16 +22,16 @@ glabel func_80240034_B34C04 /* B34C44 80240074 00021023 */ negu $v0, $v0 .L80240078: /* B34C48 80240078 14400003 */ bnez $v0, .L80240088 -/* B34C4C 8024007C 00000000 */ nop +/* B34C4C 8024007C 00000000 */ nop /* B34C50 80240080 50E00017 */ beql $a3, $zero, .L802400E0 /* B34C54 80240084 0000102D */ daddu $v0, $zero, $zero .L80240088: /* B34C58 80240088 44822000 */ mtc1 $v0, $f4 -/* B34C5C 8024008C 00000000 */ nop +/* B34C5C 8024008C 00000000 */ nop /* B34C60 80240090 46802120 */ cvt.s.w $f4, $f4 /* B34C64 80240094 44062000 */ mfc1 $a2, $f4 /* B34C68 80240098 44872000 */ mtc1 $a3, $f4 -/* B34C6C 8024009C 00000000 */ nop +/* B34C6C 8024009C 00000000 */ nop /* B34C70 802400A0 46802120 */ cvt.s.w $f4, $f4 /* B34C74 802400A4 44806000 */ mtc1 $zero, $f12 /* B34C78 802400A8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240034_B34C04 /* B34C80 802400B0 46006386 */ mov.s $f14, $f12 /* B34C84 802400B4 3C014270 */ lui $at, 0x4270 /* B34C88 802400B8 44811000 */ mtc1 $at, $f2 -/* B34C8C 802400BC 00000000 */ nop +/* B34C8C 802400BC 00000000 */ nop /* B34C90 802400C0 4602003C */ c.lt.s $f0, $f2 -/* B34C94 802400C4 00000000 */ nop +/* B34C94 802400C4 00000000 */ nop /* B34C98 802400C8 45000004 */ bc1f .L802400DC /* B34C9C 802400CC 24020001 */ addiu $v0, $zero, 1 /* B34CA0 802400D0 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240620_B351F0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240620_B351F0.s index 2efef45d76..f4b5b41a83 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240620_B351F0.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240620_B351F0.s @@ -45,7 +45,7 @@ glabel func_80240620_B351F0 /* B3528C 802406BC 0C00A7B5 */ jal dist2D /* B35290 802406C0 4600B386 */ mov.s $f14, $f22 /* B35294 802406C4 4614003C */ c.lt.s $f0, $f20 -/* B35298 802406C8 00000000 */ nop +/* B35298 802406C8 00000000 */ nop /* B3529C 802406CC 45000003 */ bc1f .L802406DC /* B352A0 802406D0 2631000C */ addiu $s1, $s1, 0xc /* B352A4 802406D4 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_80240620_B351F0 /* B352D0 80240700 8E6200D0 */ lw $v0, 0xd0($s3) /* B352D4 80240704 8C42007C */ lw $v0, 0x7c($v0) /* B352D8 80240708 04410004 */ bgez $v0, .L8024071C -/* B352DC 8024070C 00000000 */ nop +/* B352DC 8024070C 00000000 */ nop /* B352E0 80240710 C6C00000 */ lwc1 $f0, ($s6) /* B352E4 80240714 080901CF */ j .L8024073C /* B352E8 80240718 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_80240620_B351F0 /* B352EC 8024071C 3C018025 */ lui $at, %hi(D_8024F9F0) /* B352F0 80240720 D422F9F0 */ ldc1 $f2, %lo(D_8024F9F0)($at) /* B352F4 80240724 44820000 */ mtc1 $v0, $f0 -/* B352F8 80240728 00000000 */ nop +/* B352F8 80240728 00000000 */ nop /* B352FC 8024072C 46800021 */ cvt.d.w $f0, $f0 /* B35300 80240730 46220003 */ div.d $f0, $f0, $f2 /* B35304 80240734 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240778_B35348.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240778_B35348.s index 69cbef8f13..ab0fcd6ed1 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240778_B35348.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240778_B35348.s @@ -44,7 +44,7 @@ glabel func_80240778_B35348 /* B353E4 80240814 2402000F */ addiu $v0, $zero, 0xf /* B353E8 80240818 AFA2001C */ sw $v0, 0x1c($sp) /* B353EC 8024081C 44833000 */ mtc1 $v1, $f6 -/* B353F0 80240820 00000000 */ nop +/* B353F0 80240820 00000000 */ nop /* B353F4 80240824 468031A0 */ cvt.s.w $f6, $f6 /* B353F8 80240828 44073000 */ mfc1 $a3, $f6 /* B353FC 8024082C 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_80240778_B35348 .L8024087C: /* B3544C 8024087C 8602008C */ lh $v0, 0x8c($s0) /* B35450 80240880 1440005D */ bnez $v0, .L802409F8 -/* B35454 80240884 00000000 */ nop +/* B35454 80240884 00000000 */ nop /* B35458 80240888 C6000018 */ lwc1 $f0, 0x18($s0) /* B3545C 8024088C 3C014010 */ lui $at, 0x4010 /* B35460 80240890 44811800 */ mtc1 $at, $f3 /* B35464 80240894 44801000 */ mtc1 $zero, $f2 /* B35468 80240898 46000021 */ cvt.d.s $f0, $f0 /* B3546C 8024089C 4622003C */ c.lt.d $f0, $f2 -/* B35470 802408A0 00000000 */ nop +/* B35470 802408A0 00000000 */ nop /* B35474 802408A4 45000003 */ bc1f .L802408B4 /* B35478 802408A8 0200202D */ daddu $a0, $s0, $zero /* B3547C 802408AC 0809022E */ j .L802408B8 @@ -88,7 +88,7 @@ glabel func_80240778_B35348 /* B35484 802408B4 24050001 */ addiu $a1, $zero, 1 .L802408B8: /* B35488 802408B8 0C00F598 */ jal func_8003D660 -/* B3548C 802408BC 00000000 */ nop +/* B3548C 802408BC 00000000 */ nop /* B35490 802408C0 C60C0038 */ lwc1 $f12, 0x38($s0) /* B35494 802408C4 8E430078 */ lw $v1, 0x78($s2) /* B35498 802408C8 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_80240778_B35348 /* B354C0 802408F0 4406B000 */ mfc1 $a2, $f22 /* B354C4 802408F4 4407A000 */ mfc1 $a3, $f20 /* B354C8 802408F8 0C00A720 */ jal atan2 -/* B354CC 802408FC 00000000 */ nop +/* B354CC 802408FC 00000000 */ nop /* B354D0 80240900 8E050018 */ lw $a1, 0x18($s0) /* B354D4 80240904 44060000 */ mfc1 $a2, $f0 /* B354D8 80240908 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_80240778_B35348 /* B354EC 8024091C 4406B000 */ mfc1 $a2, $f22 /* B354F0 80240920 4407A000 */ mfc1 $a3, $f20 /* B354F4 80240924 0C00A7B5 */ jal dist2D -/* B354F8 80240928 00000000 */ nop +/* B354F8 80240928 00000000 */ nop /* B354FC 8024092C C6020018 */ lwc1 $f2, 0x18($s0) /* B35500 80240930 4602003E */ c.le.s $f0, $f2 -/* B35504 80240934 00000000 */ nop +/* B35504 80240934 00000000 */ nop /* B35508 80240938 4500002F */ bc1f .L802409F8 /* B3550C 8024093C 240403E8 */ addiu $a0, $zero, 0x3e8 /* B35510 80240940 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_80240778_B35348 /* B35564 80240994 18400003 */ blez $v0, .L802409A4 /* B35568 80240998 24020004 */ addiu $v0, $zero, 4 /* B3556C 8024099C 14600002 */ bnez $v1, .L802409A8 -/* B35570 802409A0 00000000 */ nop +/* B35570 802409A0 00000000 */ nop .L802409A4: /* B35574 802409A4 AE420070 */ sw $v0, 0x70($s2) .L802409A8: diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240AE0_B356B0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240AE0_B356B0.s index efd5ee7344..732299f181 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240AE0_B356B0.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240AE0_B356B0.s @@ -38,7 +38,7 @@ glabel func_80240AE0_B356B0 /* B35734 80240B64 2402000F */ addiu $v0, $zero, 0xf /* B35738 80240B68 AFA2001C */ sw $v0, 0x1c($sp) /* B3573C 80240B6C 44833000 */ mtc1 $v1, $f6 -/* B35740 80240B70 00000000 */ nop +/* B35740 80240B70 00000000 */ nop /* B35744 80240B74 468031A0 */ cvt.s.w $f6, $f6 /* B35748 80240B78 44073000 */ mfc1 $a3, $f6 /* B3574C 80240B7C 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_80240AE0_B356B0 .L80240BE0: /* B357B0 80240BE0 8602008C */ lh $v0, 0x8c($s0) /* B357B4 80240BE4 14400025 */ bnez $v0, .L80240C7C -/* B357B8 80240BE8 00000000 */ nop +/* B357B8 80240BE8 00000000 */ nop /* B357BC 80240BEC 9602008E */ lhu $v0, 0x8e($s0) /* B357C0 80240BF0 2442FFFF */ addiu $v0, $v0, -1 /* B357C4 80240BF4 A602008E */ sh $v0, 0x8e($s0) /* B357C8 80240BF8 00021400 */ sll $v0, $v0, 0x10 /* B357CC 80240BFC 1440001F */ bnez $v0, .L80240C7C -/* B357D0 80240C00 00000000 */ nop +/* B357D0 80240C00 00000000 */ nop /* B357D4 80240C04 8E820074 */ lw $v0, 0x74($s4) /* B357D8 80240C08 2442FFFF */ addiu $v0, $v0, -1 /* B357DC 80240C0C 10400019 */ beqz $v0, .L80240C74 @@ -84,7 +84,7 @@ glabel func_80240AE0_B356B0 /* B357E8 80240C18 9442002A */ lhu $v0, 0x2a($v0) /* B357EC 80240C1C 30420010 */ andi $v0, $v0, 0x10 /* B357F0 80240C20 14400007 */ bnez $v0, .L80240C40 -/* B357F4 80240C24 00000000 */ nop +/* B357F4 80240C24 00000000 */ nop /* B357F8 80240C28 C600000C */ lwc1 $f0, 0xc($s0) /* B357FC 80240C2C 3C014334 */ lui $at, 0x4334 /* B35800 80240C30 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240C9C_B3586C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240C9C_B3586C.s index 58acd2b76a..7b08831bc4 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240C9C_B3586C.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240C9C_B3586C.s @@ -28,7 +28,7 @@ glabel func_80240C9C_B3586C /* B358C4 80240CF4 8E0200D0 */ lw $v0, 0xd0($s0) /* B358C8 80240CF8 8C42007C */ lw $v0, 0x7c($v0) /* B358CC 80240CFC 04410004 */ bgez $v0, .L80240D10 -/* B358D0 80240D00 00000000 */ nop +/* B358D0 80240D00 00000000 */ nop /* B358D4 80240D04 C6400000 */ lwc1 $f0, ($s2) /* B358D8 80240D08 0809034C */ j .L80240D30 /* B358DC 80240D0C E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_80240C9C_B3586C /* B358E0 80240D10 3C018025 */ lui $at, %hi(D_8024F9F8) /* B358E4 80240D14 D422F9F8 */ ldc1 $f2, %lo(D_8024F9F8)($at) /* B358E8 80240D18 44820000 */ mtc1 $v0, $f0 -/* B358EC 80240D1C 00000000 */ nop +/* B358EC 80240D1C 00000000 */ nop /* B358F0 80240D20 46800021 */ cvt.d.w $f0, $f0 /* B358F4 80240D24 46220003 */ div.d $f0, $f0, $f2 /* B358F8 80240D28 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240E3C_B35A0C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240E3C_B35A0C.s index 0d0141ff9e..e7c284acc7 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240E3C_B35A0C.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240E3C_B35A0C.s @@ -47,20 +47,20 @@ glabel func_80240E3C_B35A0C /* B35AB4 80240EE4 8E02001C */ lw $v0, 0x1c($s0) /* B35AB8 80240EE8 46001005 */ abs.s $f0, $f2 /* B35ABC 80240EEC 44822000 */ mtc1 $v0, $f4 -/* B35AC0 80240EF0 00000000 */ nop +/* B35AC0 80240EF0 00000000 */ nop /* B35AC4 80240EF4 46802120 */ cvt.s.w $f4, $f4 /* B35AC8 80240EF8 4600203C */ c.lt.s $f4, $f0 -/* B35ACC 80240EFC 00000000 */ nop +/* B35ACC 80240EFC 00000000 */ nop /* B35AD0 80240F00 4500000D */ bc1f .L80240F38 -/* B35AD4 80240F04 00000000 */ nop +/* B35AD4 80240F04 00000000 */ nop /* B35AD8 80240F08 44800000 */ mtc1 $zero, $f0 /* B35ADC 80240F0C C654000C */ lwc1 $f20, 0xc($s2) /* B35AE0 80240F10 4600103C */ c.lt.s $f2, $f0 -/* B35AE4 80240F14 00000000 */ nop +/* B35AE4 80240F14 00000000 */ nop /* B35AE8 80240F18 45000006 */ bc1f .L80240F34 /* B35AEC 80240F1C 00021023 */ negu $v0, $v0 /* B35AF0 80240F20 44820000 */ mtc1 $v0, $f0 -/* B35AF4 80240F24 00000000 */ nop +/* B35AF4 80240F24 00000000 */ nop /* B35AF8 80240F28 46800020 */ cvt.s.w $f0, $f0 /* B35AFC 80240F2C 080903CE */ j .L80240F38 /* B35B00 80240F30 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240F6C_B35B3C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240F6C_B35B3C.s index 65400da96f..0325f51fdf 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240F6C_B35B3C.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240F6C_B35B3C.s @@ -37,7 +37,7 @@ glabel func_80240F6C_B35B3C /* B35BBC 80240FEC 2402000F */ addiu $v0, $zero, 0xf /* B35BC0 80240FF0 AFA2001C */ sw $v0, 0x1c($sp) /* B35BC4 80240FF4 44833000 */ mtc1 $v1, $f6 -/* B35BC8 80240FF8 00000000 */ nop +/* B35BC8 80240FF8 00000000 */ nop /* B35BCC 80240FFC 468031A0 */ cvt.s.w $f6, $f6 /* B35BD0 80241000 44073000 */ mfc1 $a3, $f6 /* B35BD4 80241004 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802410F4_B35CC4.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802410F4_B35CC4.s index 8001124717..c5f25f08e7 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802410F4_B35CC4.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802410F4_B35CC4.s @@ -28,7 +28,7 @@ glabel func_802410F4_B35CC4 /* B35D1C 8024114C C4400008 */ lwc1 $f0, 8($v0) /* B35D20 80241150 46800020 */ cvt.s.w $f0, $f0 /* B35D24 80241154 4602003E */ c.le.s $f0, $f2 -/* B35D28 80241158 00000000 */ nop +/* B35D28 80241158 00000000 */ nop /* B35D2C 8024115C 45020003 */ bc1fl .L8024116C /* B35D30 80241160 24840001 */ addiu $a0, $a0, 1 /* B35D34 80241164 0809045F */ j .L8024117C diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s index 8c565f69f9..d23790374a 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s @@ -46,7 +46,7 @@ glabel func_802411B4_B35D84 /* B35E28 80241258 8E2200B0 */ lw $v0, 0xb0($s1) /* B35E2C 8024125C 30420004 */ andi $v0, $v0, 4 /* B35E30 80241260 10400044 */ beqz $v0, .L80241374 -/* B35E34 80241264 00000000 */ nop +/* B35E34 80241264 00000000 */ nop .L80241268: /* B35E38 80241268 2404F7FF */ addiu $a0, $zero, -0x801 /* B35E3C 8024126C AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_802411B4_B35D84 /* B35EF0 80241320 3C0142C8 */ lui $at, 0x42c8 /* B35EF4 80241324 44812000 */ mtc1 $at, $f4 /* B35EF8 80241328 44823000 */ mtc1 $v0, $f6 -/* B35EFC 8024132C 00000000 */ nop +/* B35EFC 8024132C 00000000 */ nop /* B35F00 80241330 468031A0 */ cvt.s.w $f6, $f6 /* B35F04 80241334 27A20044 */ addiu $v0, $sp, 0x44 /* B35F08 80241338 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_802411B4_B35D84 /* B35F2C 8024135C 0C0372DF */ jal func_800DCB7C /* B35F30 80241360 27A70040 */ addiu $a3, $sp, 0x40 /* B35F34 80241364 10400003 */ beqz $v0, .L80241374 -/* B35F38 80241368 00000000 */ nop +/* B35F38 80241368 00000000 */ nop /* B35F3C 8024136C C7A0003C */ lwc1 $f0, 0x3c($sp) /* B35F40 80241370 E640003C */ swc1 $f0, 0x3c($s2) .L80241374: @@ -124,72 +124,85 @@ glabel func_802411B4_B35D84 /* B35F48 80241378 2C620064 */ sltiu $v0, $v1, 0x64 /* B35F4C 8024137C 10400042 */ beqz $v0, .L80241488 /* B35F50 80241380 00031080 */ sll $v0, $v1, 2 -/* B35F54 80241384 3C018025 */ lui $at, %hi(D_8024FA00) +/* B35F54 80241384 3C018025 */ lui $at, %hi(jtbl_8024FA00_B445D0) /* B35F58 80241388 00220821 */ addu $at, $at, $v0 -/* B35F5C 8024138C 8C22FA00 */ lw $v0, %lo(D_8024FA00)($at) +/* B35F5C 8024138C 8C22FA00 */ lw $v0, %lo(jtbl_8024FA00_B445D0)($at) /* B35F60 80241390 00400008 */ jr $v0 -/* B35F64 80241394 00000000 */ nop +/* B35F64 80241394 00000000 */ nop +glabel L80241398_B35F68 /* B35F68 80241398 0280202D */ daddu $a0, $s4, $zero /* B35F6C 8024139C 0260282D */ daddu $a1, $s3, $zero /* B35F70 802413A0 0C090188 */ jal func_80240620_B351F0 /* B35F74 802413A4 02A0302D */ daddu $a2, $s5, $zero +glabel L802413A8_B35F78 /* B35F78 802413A8 0280202D */ daddu $a0, $s4, $zero /* B35F7C 802413AC 0260282D */ daddu $a1, $s3, $zero /* B35F80 802413B0 0C0901DE */ jal func_80240778_B35348 /* B35F84 802413B4 02A0302D */ daddu $a2, $s5, $zero /* B35F88 802413B8 08090522 */ j .L80241488 -/* B35F8C 802413BC 00000000 */ nop +/* B35F8C 802413BC 00000000 */ nop +glabel L802413C0_B35F90 /* B35F90 802413C0 0280202D */ daddu $a0, $s4, $zero /* B35F94 802413C4 0260282D */ daddu $a1, $s3, $zero /* B35F98 802413C8 0C090288 */ jal jan_03_UnkNpcAIFunc1 /* B35F9C 802413CC 02A0302D */ daddu $a2, $s5, $zero +glabel L802413D0_B35FA0 /* B35FA0 802413D0 0280202D */ daddu $a0, $s4, $zero /* B35FA4 802413D4 0260282D */ daddu $a1, $s3, $zero /* B35FA8 802413D8 0C0902B8 */ jal func_80240AE0_B356B0 /* B35FAC 802413DC 02A0302D */ daddu $a2, $s5, $zero /* B35FB0 802413E0 08090522 */ j .L80241488 -/* B35FB4 802413E4 00000000 */ nop +/* B35FB4 802413E4 00000000 */ nop +glabel L802413E8_B35FB8 /* B35FB8 802413E8 0280202D */ daddu $a0, $s4, $zero /* B35FBC 802413EC 0260282D */ daddu $a1, $s3, $zero /* B35FC0 802413F0 0C090327 */ jal func_80240C9C_B3586C /* B35FC4 802413F4 02A0302D */ daddu $a2, $s5, $zero /* B35FC8 802413F8 08090522 */ j .L80241488 -/* B35FCC 802413FC 00000000 */ nop +/* B35FCC 802413FC 00000000 */ nop +glabel L80241400_B35FD0 /* B35FD0 80241400 0280202D */ daddu $a0, $s4, $zero /* B35FD4 80241404 0260282D */ daddu $a1, $s3, $zero /* B35FD8 80241408 0C090354 */ jal jan_03_NpcJumpFunc2 /* B35FDC 8024140C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241410_B35FE0 /* B35FE0 80241410 0280202D */ daddu $a0, $s4, $zero /* B35FE4 80241414 0260282D */ daddu $a1, $s3, $zero /* B35FE8 80241418 0C090371 */ jal jan_03_NpcJumpFunc /* B35FEC 8024141C 02A0302D */ daddu $a2, $s5, $zero /* B35FF0 80241420 08090522 */ j .L80241488 -/* B35FF4 80241424 00000000 */ nop +/* B35FF4 80241424 00000000 */ nop +glabel L80241428_B35FF8 /* B35FF8 80241428 0280202D */ daddu $a0, $s4, $zero /* B35FFC 8024142C 0260282D */ daddu $a1, $s3, $zero /* B36000 80241430 0C09038F */ jal func_80240E3C_B35A0C /* B36004 80241434 02A0302D */ daddu $a2, $s5, $zero +glabel L80241438_B36008 /* B36008 80241438 0280202D */ daddu $a0, $s4, $zero /* B3600C 8024143C 0260282D */ daddu $a1, $s3, $zero /* B36010 80241440 0C0903DB */ jal func_80240F6C_B35B3C /* B36014 80241444 02A0302D */ daddu $a2, $s5, $zero /* B36018 80241448 08090522 */ j .L80241488 -/* B3601C 8024144C 00000000 */ nop +/* B3601C 8024144C 00000000 */ nop +glabel L80241450_B36020 /* B36020 80241450 0280202D */ daddu $a0, $s4, $zero /* B36024 80241454 0260282D */ daddu $a1, $s3, $zero /* B36028 80241458 0C090423 */ jal jan_03_UnkNpcDurationFlagFunc /* B3602C 8024145C 02A0302D */ daddu $a2, $s5, $zero /* B36030 80241460 08090522 */ j .L80241488 -/* B36034 80241464 00000000 */ nop +/* B36034 80241464 00000000 */ nop +glabel L80241468_B36038 /* B36038 80241468 0280202D */ daddu $a0, $s4, $zero /* B3603C 8024146C 0260282D */ daddu $a1, $s3, $zero /* B36040 80241470 0C09043D */ jal func_802410F4_B35CC4 /* B36044 80241474 02A0302D */ daddu $a2, $s5, $zero /* B36048 80241478 08090522 */ j .L80241488 -/* B3604C 8024147C 00000000 */ nop +/* B3604C 8024147C 00000000 */ nop +glabel L80241480_B36050 /* B36050 80241480 0C0129CF */ jal func_8004A73C /* B36054 80241484 0280202D */ daddu $a0, $s4, $zero .L80241488: +glabel L80241488_B36058 /* B36058 80241488 8FBF0060 */ lw $ra, 0x60($sp) /* B3605C 8024148C 8FB5005C */ lw $s5, 0x5c($sp) /* B36060 80241490 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414F8_B360C8.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414F8_B360C8.s index 355bd3c89e..0b69b4afea 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414F8_B360C8.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414F8_B360C8.s @@ -22,7 +22,7 @@ glabel func_802414F8_B360C8 /* B3610C 8024153C 0C04DF93 */ jal func_80137E4C /* B36110 80241540 24070091 */ addiu $a3, $zero, 0x91 /* B36114 80241544 44900000 */ mtc1 $s0, $f0 -/* B36118 80241548 00000000 */ nop +/* B36118 80241548 00000000 */ nop /* B3611C 8024154C 46800020 */ cvt.s.w $f0, $f0 /* B36120 80241550 44050000 */ mfc1 $a1, $f0 /* B36124 80241554 0C04DF62 */ jal func_80137D88 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241574_B36144.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241574_B36144.s index ecaedbdafd..2273bdb571 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241574_B36144.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241574_B36144.s @@ -16,7 +16,7 @@ glabel func_80241574_B36144 /* B36170 802415A0 0C0B1EAF */ jal get_variable /* B36174 802415A4 0040802D */ daddu $s0, $v0, $zero /* B36178 802415A8 44820000 */ mtc1 $v0, $f0 -/* B3617C 802415AC 00000000 */ nop +/* B3617C 802415AC 00000000 */ nop /* B36180 802415B0 46800020 */ cvt.s.w $f0, $f0 /* B36184 802415B4 24020002 */ addiu $v0, $zero, 2 /* B36188 802415B8 00501804 */ sllv $v1, $s0, $v0 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241670_B36240.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241670_B36240.s index e343e3ec3c..11ee8052e5 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241670_B36240.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241670_B36240.s @@ -12,7 +12,7 @@ glabel func_80241670_B36240 /* B3625C 8024168C 80A30006 */ lb $v1, 6($a1) /* B36260 80241690 80A20005 */ lb $v0, 5($a1) /* B36264 80241694 14620007 */ bne $v1, $v0, .L802416B4 -/* B36268 80241698 00000000 */ nop +/* B36268 80241698 00000000 */ nop /* B3626C 8024169C 80C2028E */ lb $v0, 0x28e($a2) /* B36270 802416A0 84C30290 */ lh $v1, 0x290($a2) /* B36274 802416A4 00021200 */ sll $v0, $v0, 8 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241A64_B36634.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241A64_B36634.s index 70e0b0b793..1c6d6e39d8 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241A64_B36634.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241A64_B36634.s @@ -28,7 +28,7 @@ glabel func_80241A64_B36634 /* B36688 80241AB8 00220821 */ addu $at, $at, $v0 /* B3668C 80241ABC AC20FBA0 */ sw $zero, %lo(D_8024FBA0)($at) /* B36690 80241AC0 080906BC */ j .L80241AF0 -/* B36694 80241AC4 00000000 */ nop +/* B36694 80241AC4 00000000 */ nop .L80241AC8: /* B36698 80241AC8 3C038025 */ lui $v1, %hi(D_8024FBA0) /* B3669C 80241ACC 2463FBA0 */ addiu $v1, $v1, %lo(D_8024FBA0) diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B00_B366D0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B00_B366D0.s index c98d5ab237..201bb11efd 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B00_B366D0.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B00_B366D0.s @@ -28,7 +28,7 @@ glabel func_80241B00_B366D0 /* B36724 80241B54 00220821 */ addu $at, $at, $v0 /* B36728 80241B58 AC20FD68 */ sw $zero, %lo(D_8024FD68)($at) /* B3672C 80241B5C 080906E3 */ j .L80241B8C -/* B36730 80241B60 00000000 */ nop +/* B36730 80241B60 00000000 */ nop .L80241B64: /* B36734 80241B64 3C038025 */ lui $v1, %hi(D_8024FD68) /* B36738 80241B68 2463FD68 */ addiu $v1, $v1, %lo(D_8024FD68) diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B9C_B3676C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B9C_B3676C.s index e4c5368d12..3b24f53de9 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B9C_B3676C.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B9C_B3676C.s @@ -26,7 +26,7 @@ glabel func_80241B9C_B3676C /* B367BC 80241BEC 1440FFFA */ bnez $v0, .L80241BD8 /* B367C0 80241BF0 24A50004 */ addiu $a1, $a1, 4 /* B367C4 80241BF4 0809070E */ j .L80241C38 -/* B367C8 80241BF8 00000000 */ nop +/* B367C8 80241BF8 00000000 */ nop .L80241BFC: /* B367CC 80241BFC 0000182D */ daddu $v1, $zero, $zero /* B367D0 80241C00 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CD8_B368A8.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CD8_B368A8.s index cbbdcbaf9a..dfa7f9cffa 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CD8_B368A8.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CD8_B368A8.s @@ -115,7 +115,7 @@ glabel func_80241CD8_B368A8 /* B36A50 80241E80 14E20005 */ bne $a3, $v0, .L80241E98 /* B36A54 80241E84 32E2FFFF */ andi $v0, $s7, 0xffff /* B36A58 80241E88 14400003 */ bnez $v0, .L80241E98 -/* B36A5C 80241E8C 00000000 */ nop +/* B36A5C 80241E8C 00000000 */ nop /* B36A60 80241E90 14800008 */ bnez $a0, .L80241EB4 /* B36A64 80241E94 24020001 */ addiu $v0, $zero, 1 .L80241E98: @@ -123,7 +123,7 @@ glabel func_80241CD8_B368A8 /* B36A6C 80241E9C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* B36A70 80241EA0 80420075 */ lb $v0, 0x75($v0) /* B36A74 80241EA4 10400005 */ beqz $v0, .L80241EBC -/* B36A78 80241EA8 00000000 */ nop +/* B36A78 80241EA8 00000000 */ nop /* B36A7C 80241EAC 10800003 */ beqz $a0, .L80241EBC /* B36A80 80241EB0 24020001 */ addiu $v0, $zero, 1 .L80241EB4: diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241FC8_B36B98.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241FC8_B36B98.s index e7d8522c08..e3a6841996 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241FC8_B36B98.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241FC8_B36B98.s @@ -39,13 +39,13 @@ glabel func_80241FC8_B36B98 /* B36C1C 8024204C 10740005 */ beq $v1, $s4, .L80242064 /* B36C20 80242050 26100001 */ addiu $s0, $s0, 1 /* B36C24 80242054 10730003 */ beq $v1, $s3, .L80242064 -/* B36C28 80242058 00000000 */ nop +/* B36C28 80242058 00000000 */ nop /* B36C2C 8024205C 00521025 */ or $v0, $v0, $s2 /* B36C30 80242060 AC820000 */ sw $v0, ($a0) .L80242064: /* B36C34 80242064 2A020040 */ slti $v0, $s0, 0x40 /* B36C38 80242068 1440FFEF */ bnez $v0, .L80242028 -/* B36C3C 8024206C 00000000 */ nop +/* B36C3C 8024206C 00000000 */ nop /* B36C40 80242070 0000802D */ daddu $s0, $zero, $zero /* B36C44 80242074 3C120800 */ lui $s2, 0x800 .L80242078: @@ -57,13 +57,13 @@ glabel func_80241FC8_B36B98 /* B36C5C 8024208C 8C640000 */ lw $a0, ($v1) /* B36C60 80242090 30820010 */ andi $v0, $a0, 0x10 /* B36C64 80242094 10400003 */ beqz $v0, .L802420A4 -/* B36C68 80242098 00000000 */ nop +/* B36C68 80242098 00000000 */ nop /* B36C6C 8024209C 00921025 */ or $v0, $a0, $s2 /* B36C70 802420A0 AC620000 */ sw $v0, ($v1) .L802420A4: /* B36C74 802420A4 2A020100 */ slti $v0, $s0, 0x100 /* B36C78 802420A8 1440FFF3 */ bnez $v0, .L80242078 -/* B36C7C 802420AC 00000000 */ nop +/* B36C7C 802420AC 00000000 */ nop /* B36C80 802420B0 AE200070 */ sw $zero, 0x70($s1) .L802420B4: /* B36C84 802420B4 8E220070 */ lw $v0, 0x70($s1) diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242114_B36CE4.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242114_B36CE4.s index da62d257a5..36b16344be 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242114_B36CE4.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242114_B36CE4.s @@ -32,7 +32,7 @@ glabel func_80242114_B36CE4 /* B36D48 80242178 0080302D */ daddu $a2, $a0, $zero /* B36D4C 8024217C 8E020070 */ lw $v0, 0x70($s0) /* B36D50 80242180 14400006 */ bnez $v0, .L8024219C -/* B36D54 80242184 00000000 */ nop +/* B36D54 80242184 00000000 */ nop /* B36D58 80242188 8E020074 */ lw $v0, 0x74($s0) /* B36D5C 8024218C 14400003 */ bnez $v0, .L8024219C /* B36D60 80242190 24020001 */ addiu $v0, $zero, 1 @@ -66,13 +66,13 @@ glabel func_80242114_B36CE4 /* B36DC8 802421F8 10730005 */ beq $v1, $s3, .L80242210 /* B36DCC 802421FC 26100001 */ addiu $s0, $s0, 1 /* B36DD0 80242200 10720003 */ beq $v1, $s2, .L80242210 -/* B36DD4 80242204 00000000 */ nop +/* B36DD4 80242204 00000000 */ nop /* B36DD8 80242208 00511024 */ and $v0, $v0, $s1 /* B36DDC 8024220C AC820000 */ sw $v0, ($a0) .L80242210: /* B36DE0 80242210 2A020040 */ slti $v0, $s0, 0x40 /* B36DE4 80242214 1440FFEF */ bnez $v0, .L802421D4 -/* B36DE8 80242218 00000000 */ nop +/* B36DE8 80242218 00000000 */ nop /* B36DEC 8024221C 0000802D */ daddu $s0, $zero, $zero /* B36DF0 80242220 3C11F7FF */ lui $s1, 0xf7ff /* B36DF4 80242224 3631FFFF */ ori $s1, $s1, 0xffff @@ -85,7 +85,7 @@ glabel func_80242114_B36CE4 /* B36E0C 8024223C 8C640000 */ lw $a0, ($v1) /* B36E10 80242240 30820010 */ andi $v0, $a0, 0x10 /* B36E14 80242244 10400003 */ beqz $v0, .L80242254 -/* B36E18 80242248 00000000 */ nop +/* B36E18 80242248 00000000 */ nop /* B36E1C 8024224C 00911024 */ and $v0, $a0, $s1 /* B36E20 80242250 AC620000 */ sw $v0, ($v1) .L80242254: @@ -93,7 +93,7 @@ glabel func_80242114_B36CE4 /* B36E28 80242258 1440FFF3 */ bnez $v0, .L80242228 /* B36E2C 8024225C 24020002 */ addiu $v0, $zero, 2 /* B36E30 80242260 0809089B */ j .L8024226C -/* B36E34 80242264 00000000 */ nop +/* B36E34 80242264 00000000 */ nop .L80242268: /* B36E38 80242268 0000102D */ daddu $v0, $zero, $zero .L8024226C: diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024230C_B36EDC.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024230C_B36EDC.s index 8d1699bc70..6d9a5124e0 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024230C_B36EDC.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024230C_B36EDC.s @@ -16,19 +16,19 @@ glabel func_8024230C_B36EDC /* B36F08 80242338 0220202D */ daddu $a0, $s1, $zero /* B36F0C 8024233C 3C05F4AC */ lui $a1, 0xf4ac /* B36F10 80242340 4482B000 */ mtc1 $v0, $f22 -/* B36F14 80242344 00000000 */ nop +/* B36F14 80242344 00000000 */ nop /* B36F18 80242348 4680B5A0 */ cvt.s.w $f22, $f22 /* B36F1C 8024234C 0C0B1EAF */ jal get_variable /* B36F20 80242350 34A5D482 */ ori $a1, $a1, 0xd482 /* B36F24 80242354 0220202D */ daddu $a0, $s1, $zero /* B36F28 80242358 3C05F4AC */ lui $a1, 0xf4ac /* B36F2C 8024235C 4482A000 */ mtc1 $v0, $f20 -/* B36F30 80242360 00000000 */ nop +/* B36F30 80242360 00000000 */ nop /* B36F34 80242364 4680A520 */ cvt.s.w $f20, $f20 /* B36F38 80242368 0C0B1EAF */ jal get_variable /* B36F3C 8024236C 34A5D483 */ ori $a1, $a1, 0xd483 /* B36F40 80242370 44821000 */ mtc1 $v0, $f2 -/* B36F44 80242374 00000000 */ nop +/* B36F44 80242374 00000000 */ nop /* B36F48 80242378 468010A0 */ cvt.s.w $f2, $f2 /* B36F4C 8024237C 4405B000 */ mfc1 $a1, $f22 /* B36F50 80242380 4406A000 */ mfc1 $a2, $f20 @@ -45,19 +45,19 @@ glabel func_8024230C_B36EDC /* B36F7C 802423AC 0220202D */ daddu $a0, $s1, $zero /* B36F80 802423B0 3C05F4AC */ lui $a1, 0xf4ac /* B36F84 802423B4 4482B000 */ mtc1 $v0, $f22 -/* B36F88 802423B8 00000000 */ nop +/* B36F88 802423B8 00000000 */ nop /* B36F8C 802423BC 4680B5A0 */ cvt.s.w $f22, $f22 /* B36F90 802423C0 0C0B1EAF */ jal get_variable /* B36F94 802423C4 34A5D482 */ ori $a1, $a1, 0xd482 /* B36F98 802423C8 0220202D */ daddu $a0, $s1, $zero /* B36F9C 802423CC 3C05F4AC */ lui $a1, 0xf4ac /* B36FA0 802423D0 4482A000 */ mtc1 $v0, $f20 -/* B36FA4 802423D4 00000000 */ nop +/* B36FA4 802423D4 00000000 */ nop /* B36FA8 802423D8 4680A520 */ cvt.s.w $f20, $f20 /* B36FAC 802423DC 0C0B1EAF */ jal get_variable /* B36FB0 802423E0 34A5D483 */ ori $a1, $a1, 0xd483 /* B36FB4 802423E4 44821000 */ mtc1 $v0, $f2 -/* B36FB8 802423E8 00000000 */ nop +/* B36FB8 802423E8 00000000 */ nop /* B36FBC 802423EC 468010A0 */ cvt.s.w $f2, $f2 /* B36FC0 802423F0 4405B000 */ mfc1 $a1, $f22 /* B36FC4 802423F4 4406A000 */ mfc1 $a2, $f20 @@ -73,19 +73,19 @@ glabel func_8024230C_B36EDC /* B36FEC 8024241C 0220202D */ daddu $a0, $s1, $zero /* B36FF0 80242420 3C05F4AC */ lui $a1, 0xf4ac /* B36FF4 80242424 4482B000 */ mtc1 $v0, $f22 -/* B36FF8 80242428 00000000 */ nop +/* B36FF8 80242428 00000000 */ nop /* B36FFC 8024242C 4680B5A0 */ cvt.s.w $f22, $f22 /* B37000 80242430 0C0B1EAF */ jal get_variable /* B37004 80242434 34A5D482 */ ori $a1, $a1, 0xd482 /* B37008 80242438 0220202D */ daddu $a0, $s1, $zero /* B3700C 8024243C 3C05F4AC */ lui $a1, 0xf4ac /* B37010 80242440 4482A000 */ mtc1 $v0, $f20 -/* B37014 80242444 00000000 */ nop +/* B37014 80242444 00000000 */ nop /* B37018 80242448 4680A520 */ cvt.s.w $f20, $f20 /* B3701C 8024244C 0C0B1EAF */ jal get_variable /* B37020 80242450 34A5D483 */ ori $a1, $a1, 0xd483 /* B37024 80242454 44821000 */ mtc1 $v0, $f2 -/* B37028 80242458 00000000 */ nop +/* B37028 80242458 00000000 */ nop /* B3702C 8024245C 468010A0 */ cvt.s.w $f2, $f2 /* B37030 80242460 4405B000 */ mfc1 $a1, $f22 /* B37034 80242464 4406A000 */ mfc1 $a2, $f20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242524_B370F4.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242524_B370F4.s index a0be813130..7cd82c318e 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242524_B370F4.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242524_B370F4.s @@ -44,7 +44,7 @@ glabel func_80242524_B370F4 /* B37188 802425B8 3C048025 */ lui $a0, %hi(D_8024FED8) /* B3718C 802425BC 8C84FED8 */ lw $a0, %lo(D_8024FED8)($a0) /* B37190 802425C0 0C048D70 */ jal func_801235C0 -/* B37194 802425C4 00000000 */ nop +/* B37194 802425C4 00000000 */ nop /* B37198 802425C8 24020002 */ addiu $v0, $zero, 2 .L802425CC: /* B3719C 802425CC 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242B94_B37764.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242B94_B37764.s index 2b5109a763..4147f85a98 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242B94_B37764.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242B94_B37764.s @@ -13,7 +13,7 @@ glabel func_80242B94_B37764 /* B37784 80242BB4 14620006 */ bne $v1, $v0, .L80242BD0 /* B37788 80242BB8 24020002 */ addiu $v0, $zero, 2 /* B3778C 80242BBC 44800000 */ mtc1 $zero, $f0 -/* B37790 80242BC0 00000000 */ nop +/* B37790 80242BC0 00000000 */ nop /* B37794 80242BC4 44050000 */ mfc1 $a1, $f0 /* B37798 80242BC8 08090AFA */ j .L80242BE8 /* B3779C 80242BCC 0000202D */ daddu $a0, $zero, $zero @@ -21,9 +21,9 @@ glabel func_80242B94_B37764 /* B377A0 80242BD0 14620008 */ bne $v1, $v0, .L80242BF4 /* B377A4 80242BD4 24040001 */ addiu $a0, $zero, 1 /* B377A8 80242BD8 44800000 */ mtc1 $zero, $f0 -/* B377AC 80242BDC 00000000 */ nop +/* B377AC 80242BDC 00000000 */ nop /* B377B0 80242BE0 44050000 */ mfc1 $a1, $f0 -/* B377B4 80242BE4 00000000 */ nop +/* B377B4 80242BE4 00000000 */ nop .L80242BE8: /* B377B8 80242BE8 00A0302D */ daddu $a2, $a1, $zero /* B377BC 80242BEC 0C01C5A4 */ jal func_80071690 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242F1C_B37AEC.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242F1C_B37AEC.s index 7cb56a8f42..a7b6fd2768 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242F1C_B37AEC.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242F1C_B37AEC.s @@ -25,17 +25,17 @@ glabel func_80242F1C_B37AEC .L80242F64: /* B37B34 80242F64 8C620000 */ lw $v0, ($v1) /* B37B38 80242F68 1440FFFA */ bnez $v0, .L80242F54 -/* B37B3C 80242F6C 00000000 */ nop +/* B37B3C 80242F6C 00000000 */ nop /* B37B40 80242F70 25290001 */ addiu $t1, $t1, 1 .L80242F74: /* B37B44 80242F74 2922000A */ slti $v0, $t1, 0xa /* B37B48 80242F78 1440FFF0 */ bnez $v0, .L80242F3C /* B37B4C 80242F7C 25080002 */ addiu $t0, $t0, 2 /* B37B50 80242F80 0C0B2026 */ jal set_variable -/* B37B54 80242F84 00000000 */ nop +/* B37B54 80242F84 00000000 */ nop /* B37B58 80242F88 8FBF0010 */ lw $ra, 0x10($sp) /* B37B5C 80242F8C 24020002 */ addiu $v0, $zero, 2 /* B37B60 80242F90 03E00008 */ jr $ra /* B37B64 80242F94 27BD0018 */ addiu $sp, $sp, 0x18 -/* B37B68 80242F98 00000000 */ nop -/* B37B6C 80242F9C 00000000 */ nop +/* B37B68 80242F98 00000000 */ nop +/* B37B6C 80242F9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_03/B37B70/func_80242FA0_B37B70.s b/asm/nonmatchings/world/area_jan/jan_03/B37B70/func_80242FA0_B37B70.s index 2f2f0e9e32..880e3b9536 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B37B70/func_80242FA0_B37B70.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B37B70/func_80242FA0_B37B70.s @@ -16,21 +16,21 @@ glabel func_80242FA0_B37B70 /* B37B9C 80242FCC C6140054 */ lwc1 $f20, 0x54($s0) /* B37BA0 80242FD0 3C0140A0 */ lui $at, 0x40a0 /* B37BA4 80242FD4 4481B000 */ mtc1 $at, $f22 -/* B37BA8 80242FD8 00000000 */ nop +/* B37BA8 80242FD8 00000000 */ nop /* B37BAC 80242FDC 4616A502 */ mul.s $f20, $f20, $f22 -/* B37BB0 80242FE0 00000000 */ nop +/* B37BB0 80242FE0 00000000 */ nop /* B37BB4 80242FE4 C60C0080 */ lwc1 $f12, 0x80($s0) /* B37BB8 80242FE8 4600A502 */ mul.s $f20, $f20, $f0 /* B37BBC 80242FEC 0C00A8D4 */ jal cos_deg -/* B37BC0 80242FF0 00000000 */ nop +/* B37BC0 80242FF0 00000000 */ nop /* B37BC4 80242FF4 C6040054 */ lwc1 $f4, 0x54($s0) /* B37BC8 80242FF8 46162102 */ mul.s $f4, $f4, $f22 -/* B37BCC 80242FFC 00000000 */ nop +/* B37BCC 80242FFC 00000000 */ nop /* B37BD0 80243000 C6020028 */ lwc1 $f2, 0x28($s0) /* B37BD4 80243004 46141080 */ add.s $f2, $f2, $f20 /* B37BD8 80243008 46000007 */ neg.s $f0, $f0 /* B37BDC 8024300C 46002102 */ mul.s $f4, $f4, $f0 -/* B37BE0 80243010 00000000 */ nop +/* B37BE0 80243010 00000000 */ nop /* B37BE4 80243014 4600118D */ trunc.w.s $f6, $f2 /* B37BE8 80243018 E6260084 */ swc1 $f6, 0x84($s1) /* B37BEC 8024301C C6000030 */ lwc1 $f0, 0x30($s0) @@ -45,4 +45,4 @@ glabel func_80242FA0_B37B70 /* B37C10 80243040 24020002 */ addiu $v0, $zero, 2 /* B37C14 80243044 03E00008 */ jr $ra /* B37C18 80243048 27BD0030 */ addiu $sp, $sp, 0x30 -/* B37C1C 8024304C 00000000 */ nop +/* B37C1C 8024304C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_04/B44770/func_80240000_B44770.s b/asm/nonmatchings/world/area_jan/jan_04/B44770/func_80240000_B44770.s index bfe52c0665..a7c636e5fc 100644 --- a/asm/nonmatchings/world/area_jan/jan_04/B44770/func_80240000_B44770.s +++ b/asm/nonmatchings/world/area_jan/jan_04/B44770/func_80240000_B44770.s @@ -18,4 +18,4 @@ glabel func_80240000_B44770 /* B447A0 80240030 8FBF0010 */ lw $ra, 0x10($sp) /* B447A4 80240034 03E00008 */ jr $ra /* B447A8 80240038 27BD0018 */ addiu $sp, $sp, 0x18 -/* B447AC 8024003C 00000000 */ nop +/* B447AC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240350_B44AC0.s b/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240350_B44AC0.s index 260df94591..8d1605c76d 100644 --- a/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240350_B44AC0.s +++ b/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240350_B44AC0.s @@ -26,7 +26,7 @@ glabel func_80240350_B44AC0 /* B44B10 802403A0 1440FFFA */ bnez $v0, .L8024038C /* B44B14 802403A4 24A50004 */ addiu $a1, $a1, 4 /* B44B18 802403A8 080900FB */ j .L802403EC -/* B44B1C 802403AC 00000000 */ nop +/* B44B1C 802403AC 00000000 */ nop .L802403B0: /* B44B20 802403B0 0000182D */ daddu $v1, $zero, $zero /* B44B24 802403B4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_04/B44D80/func_80240610_B44D80.s b/asm/nonmatchings/world/area_jan/jan_04/B44D80/func_80240610_B44D80.s index 0eca582e42..0ea364f25c 100644 --- a/asm/nonmatchings/world/area_jan/jan_04/B44D80/func_80240610_B44D80.s +++ b/asm/nonmatchings/world/area_jan/jan_04/B44D80/func_80240610_B44D80.s @@ -41,14 +41,14 @@ glabel func_80240610_B44D80 /* B44E0C 8024069C 10600009 */ beqz $v1, .L802406C4 /* B44E10 802406A0 0000102D */ daddu $v0, $zero, $zero /* B44E14 802406A4 080901DD */ j .L80240774 -/* B44E18 802406A8 00000000 */ nop +/* B44E18 802406A8 00000000 */ nop .L802406AC: /* B44E1C 802406AC 10620013 */ beq $v1, $v0, .L802406FC /* B44E20 802406B0 24020003 */ addiu $v0, $zero, 3 /* B44E24 802406B4 1062001E */ beq $v1, $v0, .L80240730 /* B44E28 802406B8 0000102D */ daddu $v0, $zero, $zero /* B44E2C 802406BC 080901DD */ j .L80240774 -/* B44E30 802406C0 00000000 */ nop +/* B44E30 802406C0 00000000 */ nop .L802406C4: /* B44E34 802406C4 0C03AC5A */ jal func_800EB168 /* B44E38 802406C8 0000202D */ daddu $a0, $zero, $zero @@ -75,7 +75,7 @@ glabel func_80240610_B44D80 /* B44E84 80240714 A0510014 */ sb $s1, 0x14($v0) /* B44E88 80240718 82640012 */ lb $a0, 0x12($s3) /* B44E8C 8024071C 0C03ACA9 */ jal func_800EB2A4 -/* B44E90 80240720 00000000 */ nop +/* B44E90 80240720 00000000 */ nop /* B44E94 80240724 24020003 */ addiu $v0, $zero, 3 /* B44E98 80240728 080901DC */ j .L80240770 /* B44E9C 8024072C AE420070 */ sw $v0, 0x70($s2) @@ -107,6 +107,6 @@ glabel func_80240610_B44D80 /* B44EF8 80240788 8FB00010 */ lw $s0, 0x10($sp) /* B44EFC 8024078C 03E00008 */ jr $ra /* B44F00 80240790 27BD0028 */ addiu $sp, $sp, 0x28 -/* B44F04 80240794 00000000 */ nop -/* B44F08 80240798 00000000 */ nop -/* B44F0C 8024079C 00000000 */ nop +/* B44F04 80240794 00000000 */ nop +/* B44F08 80240798 00000000 */ nop +/* B44F0C 8024079C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_04/B45150/func_802409E0_B45150.s b/asm/nonmatchings/world/area_jan/jan_04/B45150/func_802409E0_B45150.s index 7daf74e48d..47c42d399b 100644 --- a/asm/nonmatchings/world/area_jan/jan_04/B45150/func_802409E0_B45150.s +++ b/asm/nonmatchings/world/area_jan/jan_04/B45150/func_802409E0_B45150.s @@ -39,6 +39,6 @@ glabel func_802409E0_B45150 /* B451D8 80240A68 24020002 */ addiu $v0, $zero, 2 /* B451DC 80240A6C 03E00008 */ jr $ra /* B451E0 80240A70 27BD0028 */ addiu $sp, $sp, 0x28 -/* B451E4 80240A74 00000000 */ nop -/* B451E8 80240A78 00000000 */ nop -/* B451EC 80240A7C 00000000 */ nop +/* B451E4 80240A74 00000000 */ nop +/* B451E8 80240A78 00000000 */ nop +/* B451EC 80240A7C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240A80_B451F0.s b/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240A80_B451F0.s index 6910183f17..9948472bc8 100644 --- a/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240A80_B451F0.s +++ b/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240A80_B451F0.s @@ -23,18 +23,18 @@ glabel func_80240A80_B451F0 /* B45238 80240AC8 8E050000 */ lw $a1, ($s0) /* B4523C 80240ACC 26100004 */ addiu $s0, $s0, 4 /* B45240 80240AD0 4482C000 */ mtc1 $v0, $f24 -/* B45244 80240AD4 00000000 */ nop +/* B45244 80240AD4 00000000 */ nop /* B45248 80240AD8 4680C620 */ cvt.s.w $f24, $f24 /* B4524C 80240ADC 0C0B1EAF */ jal get_variable /* B45250 80240AE0 0220202D */ daddu $a0, $s1, $zero /* B45254 80240AE4 8E050000 */ lw $a1, ($s0) /* B45258 80240AE8 4482B000 */ mtc1 $v0, $f22 -/* B4525C 80240AEC 00000000 */ nop +/* B4525C 80240AEC 00000000 */ nop /* B45260 80240AF0 4680B5A0 */ cvt.s.w $f22, $f22 /* B45264 80240AF4 0C0B1EAF */ jal get_variable /* B45268 80240AF8 0220202D */ daddu $a0, $s1, $zero /* B4526C 80240AFC 4482A000 */ mtc1 $v0, $f20 -/* B45270 80240B00 00000000 */ nop +/* B45270 80240B00 00000000 */ nop /* B45274 80240B04 4680A520 */ cvt.s.w $f20, $f20 /* B45278 80240B08 0C04417A */ jal get_entity_by_index /* B4527C 80240B0C 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240BE8_B45358.s b/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240BE8_B45358.s index 50089bec82..e3e50423d1 100644 --- a/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240BE8_B45358.s +++ b/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240BE8_B45358.s @@ -23,7 +23,7 @@ glabel func_80240BE8_B45358 /* B4539C 80240C2C 44811000 */ mtc1 $at, $f2 /* B453A0 80240C30 00621023 */ subu $v0, $v1, $v0 /* B453A4 80240C34 44820000 */ mtc1 $v0, $f0 -/* B453A8 80240C38 00000000 */ nop +/* B453A8 80240C38 00000000 */ nop /* B453AC 80240C3C 46800020 */ cvt.s.w $f0, $f0 /* B453B0 80240C40 46020003 */ div.s $f0, $f0, $f2 /* B453B4 80240C44 E6200054 */ swc1 $f0, 0x54($s1) @@ -33,35 +33,35 @@ glabel func_80240BE8_B45358 /* B453C4 80240C54 44816000 */ mtc1 $at, $f12 /* B453C8 80240C58 00621023 */ subu $v0, $v1, $v0 /* B453CC 80240C5C 44820000 */ mtc1 $v0, $f0 -/* B453D0 80240C60 00000000 */ nop +/* B453D0 80240C60 00000000 */ nop /* B453D4 80240C64 46800020 */ cvt.s.w $f0, $f0 /* B453D8 80240C68 46020003 */ div.s $f0, $f0, $f2 /* B453DC 80240C6C E6200058 */ swc1 $f0, 0x58($s1) /* B453E0 80240C70 8E420074 */ lw $v0, 0x74($s2) /* B453E4 80240C74 460C0302 */ mul.s $f12, $f0, $f12 -/* B453E8 80240C78 00000000 */ nop +/* B453E8 80240C78 00000000 */ nop /* B453EC 80240C7C 00621823 */ subu $v1, $v1, $v0 /* B453F0 80240C80 44830000 */ mtc1 $v1, $f0 -/* B453F4 80240C84 00000000 */ nop +/* B453F4 80240C84 00000000 */ nop /* B453F8 80240C88 46800020 */ cvt.s.w $f0, $f0 /* B453FC 80240C8C 46020003 */ div.s $f0, $f0, $f2 /* B45400 80240C90 0C00A874 */ jal cos_rad /* B45404 80240C94 E620005C */ swc1 $f0, 0x5c($s1) /* B45408 80240C98 3C013F80 */ lui $at, 0x3f80 /* B4540C 80240C9C 44811000 */ mtc1 $at, $f2 -/* B45410 80240CA0 00000000 */ nop +/* B45410 80240CA0 00000000 */ nop /* B45414 80240CA4 46001081 */ sub.s $f2, $f2, $f0 /* B45418 80240CA8 3C018024 */ lui $at, %hi(D_802462E0) /* B4541C 80240CAC D42062E0 */ ldc1 $f0, %lo(D_802462E0)($at) /* B45420 80240CB0 460010A1 */ cvt.d.s $f2, $f2 /* B45424 80240CB4 46201082 */ mul.d $f2, $f2, $f0 -/* B45428 80240CB8 00000000 */ nop +/* B45428 80240CB8 00000000 */ nop /* B4542C 80240CBC 3C013FD0 */ lui $at, 0x3fd0 /* B45430 80240CC0 44810800 */ mtc1 $at, $f1 /* B45434 80240CC4 44800000 */ mtc1 $zero, $f0 -/* B45438 80240CC8 00000000 */ nop +/* B45438 80240CC8 00000000 */ nop /* B4543C 80240CCC 46201082 */ mul.d $f2, $f2, $f0 -/* B45440 80240CD0 00000000 */ nop +/* B45440 80240CD0 00000000 */ nop /* B45444 80240CD4 462010A0 */ cvt.s.d $f2, $f2 /* B45448 80240CD8 E6220064 */ swc1 $f2, 0x64($s1) /* B4544C 80240CDC 8E430074 */ lw $v1, 0x74($s2) diff --git a/asm/nonmatchings/world/area_jan/jan_04/B45730/func_80240FC0_B45730.s b/asm/nonmatchings/world/area_jan/jan_04/B45730/func_80240FC0_B45730.s index af7c1cb228..058334af82 100644 --- a/asm/nonmatchings/world/area_jan/jan_04/B45730/func_80240FC0_B45730.s +++ b/asm/nonmatchings/world/area_jan/jan_04/B45730/func_80240FC0_B45730.s @@ -19,16 +19,16 @@ glabel func_80240FC0_B45730 /* B45768 80240FF8 10600008 */ beqz $v1, .L8024101C /* B4576C 80240FFC 0000102D */ daddu $v0, $zero, $zero /* B45770 80241000 08090437 */ j .L802410DC -/* B45774 80241004 00000000 */ nop +/* B45774 80241004 00000000 */ nop .L80241008: /* B45778 80241008 24020003 */ addiu $v0, $zero, 3 /* B4577C 8024100C 10620022 */ beq $v1, $v0, .L80241098 /* B45780 80241010 0000102D */ daddu $v0, $zero, $zero /* B45784 80241014 08090437 */ j .L802410DC -/* B45788 80241018 00000000 */ nop +/* B45788 80241018 00000000 */ nop .L8024101C: /* B4578C 8024101C 0C03AD8E */ jal partner_get_ride_script -/* B45790 80241020 00000000 */ nop +/* B45790 80241020 00000000 */ nop /* B45794 80241024 0040202D */ daddu $a0, $v0, $zero /* B45798 80241028 1080002B */ beqz $a0, .L802410D8 /* B4579C 8024102C 0000282D */ daddu $a1, $zero, $zero @@ -40,7 +40,7 @@ glabel func_80240FC0_B45730 /* B457B4 80241044 C6200028 */ lwc1 $f0, 0x28($s1) /* B457B8 80241048 3C014120 */ lui $at, 0x4120 /* B457BC 8024104C 44811000 */ mtc1 $at, $f2 -/* B457C0 80241050 00000000 */ nop +/* B457C0 80241050 00000000 */ nop /* B457C4 80241054 46020001 */ sub.s $f0, $f0, $f2 /* B457C8 80241058 4600010D */ trunc.w.s $f4, $f0 /* B457CC 8024105C E4440088 */ swc1 $f4, 0x88($v0) diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4AA70/func_80240000_B4AA70.s b/asm/nonmatchings/world/area_jan/jan_05/B4AA70/func_80240000_B4AA70.s index a1cdaf9c31..82c489e53a 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4AA70/func_80240000_B4AA70.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4AA70/func_80240000_B4AA70.s @@ -18,4 +18,4 @@ glabel func_80240000_B4AA70 /* B4AAA0 80240030 8FBF0010 */ lw $ra, 0x10($sp) /* B4AAA4 80240034 03E00008 */ jr $ra /* B4AAA8 80240038 27BD0018 */ addiu $sp, $sp, 0x18 -/* B4AAAC 8024003C 00000000 */ nop +/* B4AAAC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4ADC0/func_80240350_B4ADC0.s b/asm/nonmatchings/world/area_jan/jan_05/B4ADC0/func_80240350_B4ADC0.s index b5133f58a8..07e5be33f9 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4ADC0/func_80240350_B4ADC0.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4ADC0/func_80240350_B4ADC0.s @@ -35,7 +35,7 @@ glabel func_80240350_B4ADC0 /* B4AE34 802403C4 0C0B1EAF */ jal get_variable /* B4AE38 802403C8 0220202D */ daddu $a0, $s1, $zero /* B4AE3C 802403CC 1440002A */ bnez $v0, .L80240478 -/* B4AE40 802403D0 00000000 */ nop +/* B4AE40 802403D0 00000000 */ nop /* B4AE44 802403D4 8E240078 */ lw $a0, 0x78($s1) /* B4AE48 802403D8 0C044181 */ jal get_shadow_by_index /* B4AE4C 802403DC 8E300074 */ lw $s0, 0x74($s1) @@ -80,7 +80,7 @@ glabel func_80240350_B4ADC0 .L80240478: /* B4AEE8 80240478 8E240078 */ lw $a0, 0x78($s1) /* B4AEEC 8024047C 0C0448CA */ jal func_80112328 -/* B4AEF0 80240480 00000000 */ nop +/* B4AEF0 80240480 00000000 */ nop /* B4AEF4 80240484 24020002 */ addiu $v0, $zero, 2 .L80240488: /* B4AEF8 80240488 8FBF0038 */ lw $ra, 0x38($sp) @@ -88,4 +88,4 @@ glabel func_80240350_B4ADC0 /* B4AF00 80240490 8FB00030 */ lw $s0, 0x30($sp) /* B4AF04 80240494 03E00008 */ jr $ra /* B4AF08 80240498 27BD0040 */ addiu $sp, $sp, 0x40 -/* B4AF0C 8024049C 00000000 */ nop +/* B4AF0C 8024049C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_802406DC_B4B14C.s b/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_802406DC_B4B14C.s index 5b34cec244..3fbfc9be6d 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_802406DC_B4B14C.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_802406DC_B4B14C.s @@ -13,7 +13,7 @@ glabel func_802406DC_B4B14C /* B4B16C 802406FC D4207A20 */ ldc1 $f0, %lo(D_80247A20)($at) /* B4B170 80240700 4600A521 */ cvt.d.s $f20, $f20 /* B4B174 80240704 4620A502 */ mul.d $f20, $f20, $f0 -/* B4B178 80240708 00000000 */ nop +/* B4B178 80240708 00000000 */ nop /* B4B17C 8024070C 3C013F80 */ lui $at, 0x3f80 /* B4B180 80240710 44810000 */ mtc1 $at, $f0 /* B4B184 80240714 AE000018 */ sw $zero, 0x18($s0) diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_80240738_B4B1A8.s b/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_80240738_B4B1A8.s index f70ec26966..39986a000e 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_80240738_B4B1A8.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_80240738_B4B1A8.s @@ -25,7 +25,7 @@ glabel func_80240738_B4B1A8 /* B4B1F8 80240788 96020000 */ lhu $v0, ($s0) /* B4B1FC 8024078C 30420400 */ andi $v0, $v0, 0x400 /* B4B200 80240790 14400008 */ bnez $v0, .L802407B4 -/* B4B204 80240794 00000000 */ nop +/* B4B204 80240794 00000000 */ nop /* B4B208 80240798 4405A000 */ mfc1 $a1, $f20 /* B4B20C 8024079C 0C0901B7 */ jal func_802406DC_B4B14C /* B4B210 802407A0 26040058 */ addiu $a0, $s0, 0x58 @@ -49,4 +49,4 @@ glabel func_80240738_B4B1A8 /* B4B250 802407E0 24020002 */ addiu $v0, $zero, 2 /* B4B254 802407E4 03E00008 */ jr $ra /* B4B258 802407E8 27BD0068 */ addiu $sp, $sp, 0x68 -/* B4B25C 802407EC 00000000 */ nop +/* B4B25C 802407EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802407F0_B4B260.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802407F0_B4B260.s index b83d67b7b1..9f9a91269c 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802407F0_B4B260.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802407F0_B4B260.s @@ -29,7 +29,7 @@ glabel func_802407F0_B4B260 /* B4B2C0 80240850 46220000 */ add.d $f0, $f0, $f2 /* B4B2C4 80240854 AFA00014 */ sw $zero, 0x14($sp) /* B4B2C8 80240858 44831000 */ mtc1 $v1, $f2 -/* B4B2CC 8024085C 00000000 */ nop +/* B4B2CC 8024085C 00000000 */ nop /* B4B2D0 80240860 468010A0 */ cvt.s.w $f2, $f2 /* B4B2D4 80240864 46022100 */ add.s $f4, $f4, $f2 /* B4B2D8 80240868 8E050038 */ lw $a1, 0x38($s0) diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802408A4_B4B314.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802408A4_B4B314.s index bb47648b34..97046bc87f 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802408A4_B4B314.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802408A4_B4B314.s @@ -30,7 +30,7 @@ glabel func_802408A4_B4B314 /* B4B378 80240908 3C05B000 */ lui $a1, 0xb000 /* B4B37C 8024090C 34A50017 */ ori $a1, $a1, 0x17 /* B4B380 80240910 44820000 */ mtc1 $v0, $f0 -/* B4B384 80240914 00000000 */ nop +/* B4B384 80240914 00000000 */ nop /* B4B388 80240918 46800021 */ cvt.d.w $f0, $f0 /* B4B38C 8024091C 3C014024 */ lui $at, 0x4024 /* B4B390 80240920 44811800 */ mtc1 $at, $f3 @@ -68,7 +68,7 @@ glabel func_802408A4_B4B314 /* B4B410 802409A0 0C0123F5 */ jal is_point_within_region /* B4B414 802409A4 8E070038 */ lw $a3, 0x38($s0) /* B4B418 802409A8 10400035 */ beqz $v0, .L80240A80 -/* B4B41C 802409AC 00000000 */ nop +/* B4B41C 802409AC 00000000 */ nop /* B4B420 802409B0 C60C0038 */ lwc1 $f12, 0x38($s0) /* B4B424 802409B4 3C0141C8 */ lui $at, 0x41c8 /* B4B428 802409B8 4481B000 */ mtc1 $at, $f22 @@ -99,13 +99,13 @@ glabel func_802408A4_B4B314 /* B4B488 80240A18 860200A8 */ lh $v0, 0xa8($s0) /* B4B48C 80240A1C 27A50020 */ addiu $a1, $sp, 0x20 /* B4B490 80240A20 44820000 */ mtc1 $v0, $f0 -/* B4B494 80240A24 00000000 */ nop +/* B4B494 80240A24 00000000 */ nop /* B4B498 80240A28 46800020 */ cvt.s.w $f0, $f0 /* B4B49C 80240A2C E7A00018 */ swc1 $f0, 0x18($sp) /* B4B4A0 80240A30 860200A6 */ lh $v0, 0xa6($s0) /* B4B4A4 80240A34 27A60024 */ addiu $a2, $sp, 0x24 /* B4B4A8 80240A38 44820000 */ mtc1 $v0, $f0 -/* B4B4AC 80240A3C 00000000 */ nop +/* B4B4AC 80240A3C 00000000 */ nop /* B4B4B0 80240A40 46800020 */ cvt.s.w $f0, $f0 /* B4B4B4 80240A44 E7A0001C */ swc1 $f0, 0x1c($sp) /* B4B4B8 80240A48 8E040080 */ lw $a0, 0x80($s0) @@ -121,13 +121,13 @@ glabel func_802408A4_B4B314 /* B4B4E0 80240A70 1440FFE6 */ bnez $v0, .L80240A0C /* B4B4E4 80240A74 E600000C */ swc1 $f0, 0xc($s0) /* B4B4E8 80240A78 080902AC */ j .L80240AB0 -/* B4B4EC 80240A7C 00000000 */ nop +/* B4B4EC 80240A7C 00000000 */ nop .L80240A80: /* B4B4F0 80240A80 0C00A67F */ jal rand_int /* B4B4F4 80240A84 2404003C */ addiu $a0, $zero, 0x3c /* B4B4F8 80240A88 C60C000C */ lwc1 $f12, 0xc($s0) /* B4B4FC 80240A8C 44820000 */ mtc1 $v0, $f0 -/* B4B500 80240A90 00000000 */ nop +/* B4B500 80240A90 00000000 */ nop /* B4B504 80240A94 46800020 */ cvt.s.w $f0, $f0 /* B4B508 80240A98 46006300 */ add.s $f12, $f12, $f0 /* B4B50C 80240A9C 3C0141F0 */ lui $at, 0x41f0 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240AD4_B4B544.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240AD4_B4B544.s index e4fc08273b..916708aa89 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240AD4_B4B544.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240AD4_B4B544.s @@ -43,7 +43,7 @@ glabel func_80240AD4_B4B544 /* B4B5DC 80240B6C 2402000F */ addiu $v0, $zero, 0xf /* B4B5E0 80240B70 AFA2001C */ sw $v0, 0x1c($sp) /* B4B5E4 80240B74 44835000 */ mtc1 $v1, $f10 -/* B4B5E8 80240B78 00000000 */ nop +/* B4B5E8 80240B78 00000000 */ nop /* B4B5EC 80240B7C 468052A0 */ cvt.s.w $f10, $f10 /* B4B5F0 80240B80 44075000 */ mfc1 $a3, $f10 /* B4B5F4 80240B84 27A20028 */ addiu $v0, $sp, 0x28 @@ -78,7 +78,7 @@ glabel func_80240AD4_B4B544 /* B4B65C 80240BEC 44801800 */ mtc1 $zero, $f3 /* B4B660 80240BF0 46000021 */ cvt.d.s $f0, $f0 /* B4B664 80240BF4 4620103C */ c.lt.d $f2, $f0 -/* B4B668 80240BF8 00000000 */ nop +/* B4B668 80240BF8 00000000 */ nop /* B4B66C 80240BFC 45000025 */ bc1f .L80240C94 /* B4B670 80240C00 27A5002C */ addiu $a1, $sp, 0x2c /* B4B674 80240C04 C6000038 */ lwc1 $f0, 0x38($s0) @@ -88,7 +88,7 @@ glabel func_80240AD4_B4B544 /* B4B684 80240C14 27A60030 */ addiu $a2, $sp, 0x30 /* B4B688 80240C18 E7A0002C */ swc1 $f0, 0x2c($sp) /* B4B68C 80240C1C 44820000 */ mtc1 $v0, $f0 -/* B4B690 80240C20 00000000 */ nop +/* B4B690 80240C20 00000000 */ nop /* B4B694 80240C24 46800020 */ cvt.s.w $f0, $f0 /* B4B698 80240C28 46000021 */ cvt.d.s $f0, $f0 /* B4B69C 80240C2C C604003C */ lwc1 $f4, 0x3c($s0) @@ -96,13 +96,13 @@ glabel func_80240AD4_B4B544 /* B4B6A4 80240C34 C6080018 */ lwc1 $f8, 0x18($s0) /* B4B6A8 80240C38 860200A8 */ lh $v0, 0xa8($s0) /* B4B6AC 80240C3C 46220002 */ mul.d $f0, $f0, $f2 -/* B4B6B0 80240C40 00000000 */ nop +/* B4B6B0 80240C40 00000000 */ nop /* B4B6B4 80240C44 E7A40030 */ swc1 $f4, 0x30($sp) /* B4B6B8 80240C48 E7A60034 */ swc1 $f6, 0x34($sp) /* B4B6BC 80240C4C E7A80010 */ swc1 $f8, 0x10($sp) /* B4B6C0 80240C50 C604000C */ lwc1 $f4, 0xc($s0) /* B4B6C4 80240C54 44821000 */ mtc1 $v0, $f2 -/* B4B6C8 80240C58 00000000 */ nop +/* B4B6C8 80240C58 00000000 */ nop /* B4B6CC 80240C5C 468010A0 */ cvt.s.w $f2, $f2 /* B4B6D0 80240C60 E7A20018 */ swc1 $f2, 0x18($sp) /* B4B6D4 80240C64 E7A40014 */ swc1 $f4, 0x14($sp) @@ -123,7 +123,7 @@ glabel func_80240AD4_B4B544 /* B4B70C 80240C9C 44801800 */ mtc1 $zero, $f3 /* B4B710 80240CA0 46000021 */ cvt.d.s $f0, $f0 /* B4B714 80240CA4 4622003C */ c.lt.d $f0, $f2 -/* B4B718 80240CA8 00000000 */ nop +/* B4B718 80240CA8 00000000 */ nop /* B4B71C 80240CAC 45000047 */ bc1f .L80240DCC /* B4B720 80240CB0 27A5002C */ addiu $a1, $sp, 0x2c /* B4B724 80240CB4 27A60030 */ addiu $a2, $sp, 0x30 @@ -154,7 +154,7 @@ glabel func_80240AD4_B4B544 /* B4B788 80240D18 0C0372DF */ jal func_800DCB7C /* B4B78C 80240D1C 27A70034 */ addiu $a3, $sp, 0x34 /* B4B790 80240D20 1040002A */ beqz $v0, .L80240DCC -/* B4B794 80240D24 00000000 */ nop +/* B4B794 80240D24 00000000 */ nop /* B4B798 80240D28 C600001C */ lwc1 $f0, 0x1c($s0) /* B4B79C 80240D2C C7A20038 */ lwc1 $f2, 0x38($sp) /* B4B7A0 80240D30 46000005 */ abs.s $f0, $f0 @@ -162,7 +162,7 @@ glabel func_80240AD4_B4B544 /* B4B7A8 80240D38 46340000 */ add.d $f0, $f0, $f20 /* B4B7AC 80240D3C 460010A1 */ cvt.d.s $f2, $f2 /* B4B7B0 80240D40 4620103E */ c.le.d $f2, $f0 -/* B4B7B4 80240D44 00000000 */ nop +/* B4B7B4 80240D44 00000000 */ nop /* B4B7B8 80240D48 45000020 */ bc1f .L80240DCC /* B4B7BC 80240D4C 240403E8 */ addiu $a0, $zero, 0x3e8 /* B4B7C0 80240D50 C7A00030 */ lwc1 $f0, 0x30($sp) @@ -193,7 +193,7 @@ glabel func_80240AD4_B4B544 /* B4B824 80240DB4 5840000C */ blezl $v0, .L80240DE8 /* B4B828 80240DB8 AE600070 */ sw $zero, 0x70($s3) /* B4B82C 80240DBC 1460000A */ bnez $v1, .L80240DE8 -/* B4B830 80240DC0 00000000 */ nop +/* B4B830 80240DC0 00000000 */ nop /* B4B834 80240DC4 0809037A */ j .L80240DE8 /* B4B838 80240DC8 AE600070 */ sw $zero, 0x70($s3) .L80240DCC: diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240ECC_B4B93C.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240ECC_B4B93C.s index b6b2027f12..ef789ed043 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240ECC_B4B93C.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240ECC_B4B93C.s @@ -38,7 +38,7 @@ glabel func_80240ECC_B4B93C /* B4B9C0 80240F50 2402000F */ addiu $v0, $zero, 0xf /* B4B9C4 80240F54 AFA2001C */ sw $v0, 0x1c($sp) /* B4B9C8 80240F58 44833000 */ mtc1 $v1, $f6 -/* B4B9CC 80240F5C 00000000 */ nop +/* B4B9CC 80240F5C 00000000 */ nop /* B4B9D0 80240F60 468031A0 */ cvt.s.w $f6, $f6 /* B4B9D4 80240F64 44073000 */ mfc1 $a3, $f6 /* B4B9D8 80240F68 27A20028 */ addiu $v0, $sp, 0x28 @@ -65,13 +65,13 @@ glabel func_80240ECC_B4B93C .L80240FBC: /* B4BA2C 80240FBC 8602008C */ lh $v0, 0x8c($s0) /* B4BA30 80240FC0 14400023 */ bnez $v0, .L80241050 -/* B4BA34 80240FC4 00000000 */ nop +/* B4BA34 80240FC4 00000000 */ nop /* B4BA38 80240FC8 9602008E */ lhu $v0, 0x8e($s0) /* B4BA3C 80240FCC 2442FFFF */ addiu $v0, $v0, -1 /* B4BA40 80240FD0 A602008E */ sh $v0, 0x8e($s0) /* B4BA44 80240FD4 00021400 */ sll $v0, $v0, 0x10 /* B4BA48 80240FD8 1C40001D */ bgtz $v0, .L80241050 -/* B4BA4C 80240FDC 00000000 */ nop +/* B4BA4C 80240FDC 00000000 */ nop /* B4BA50 80240FE0 8E820074 */ lw $v0, 0x74($s4) /* B4BA54 80240FE4 2442FFFF */ addiu $v0, $v0, -1 /* B4BA58 80240FE8 18400018 */ blez $v0, .L8024104C diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241070_B4BAE0.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241070_B4BAE0.s index c1bec817d6..52c7fb7461 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241070_B4BAE0.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241070_B4BAE0.s @@ -24,7 +24,7 @@ glabel func_80241070_B4BAE0 /* B4BB2C 802410BC 0C00A67F */ jal rand_int /* B4BB30 802410C0 AE020000 */ sw $v0, ($s0) /* B4BB34 802410C4 44820000 */ mtc1 $v0, $f0 -/* B4BB38 802410C8 00000000 */ nop +/* B4BB38 802410C8 00000000 */ nop /* B4BB3C 802410CC 46800021 */ cvt.d.w $f0, $f0 /* B4BB40 802410D0 3C014024 */ lui $at, 0x4024 /* B4BB44 802410D4 44811800 */ mtc1 $at, $f3 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241150_B4BBC0.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241150_B4BBC0.s index 88f29bc203..b796e5ba80 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241150_B4BBC0.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241150_B4BBC0.s @@ -25,7 +25,7 @@ glabel func_80241150_B4BBC0 /* B4BC10 802411A0 44801800 */ mtc1 $zero, $f3 /* B4BC14 802411A4 46000021 */ cvt.d.s $f0, $f0 /* B4BC18 802411A8 4620103C */ c.lt.d $f2, $f0 -/* B4BC1C 802411AC 00000000 */ nop +/* B4BC1C 802411AC 00000000 */ nop /* B4BC20 802411B0 45000021 */ bc1f .L80241238 /* B4BC24 802411B4 27A50028 */ addiu $a1, $sp, 0x28 /* B4BC28 802411B8 C6600038 */ lwc1 $f0, 0x38($s3) @@ -40,20 +40,20 @@ glabel func_80241150_B4BBC0 /* B4BC4C 802411DC E7A00014 */ swc1 $f0, 0x14($sp) /* B4BC50 802411E0 866200A8 */ lh $v0, 0xa8($s3) /* B4BC54 802411E4 44820000 */ mtc1 $v0, $f0 -/* B4BC58 802411E8 00000000 */ nop +/* B4BC58 802411E8 00000000 */ nop /* B4BC5C 802411EC 46800020 */ cvt.s.w $f0, $f0 /* B4BC60 802411F0 E7A00018 */ swc1 $f0, 0x18($sp) /* B4BC64 802411F4 866200A6 */ lh $v0, 0xa6($s3) /* B4BC68 802411F8 27A6002C */ addiu $a2, $sp, 0x2c /* B4BC6C 802411FC 44820000 */ mtc1 $v0, $f0 -/* B4BC70 80241200 00000000 */ nop +/* B4BC70 80241200 00000000 */ nop /* B4BC74 80241204 46800020 */ cvt.s.w $f0, $f0 /* B4BC78 80241208 E7A0001C */ swc1 $f0, 0x1c($sp) /* B4BC7C 8024120C 8E640080 */ lw $a0, 0x80($s3) /* B4BC80 80241210 0C037711 */ jal func_800DDC44 /* B4BC84 80241214 27A70030 */ addiu $a3, $sp, 0x30 /* B4BC88 80241218 10400003 */ beqz $v0, .L80241228 -/* B4BC8C 8024121C 00000000 */ nop +/* B4BC8C 8024121C 00000000 */ nop /* B4BC90 80241220 0809048E */ j .L80241238 /* B4BC94 80241224 AE600018 */ sw $zero, 0x18($s3) .L80241228: @@ -67,7 +67,7 @@ glabel func_80241150_B4BBC0 /* B4BCB0 80241240 44801800 */ mtc1 $zero, $f3 /* B4BCB4 80241244 46000021 */ cvt.d.s $f0, $f0 /* B4BCB8 80241248 4622003C */ c.lt.d $f0, $f2 -/* B4BCBC 8024124C 00000000 */ nop +/* B4BCBC 8024124C 00000000 */ nop /* B4BCC0 80241250 4500006C */ bc1f .L80241404 /* B4BCC4 80241254 27B00028 */ addiu $s0, $sp, 0x28 /* B4BCC8 80241258 0200282D */ daddu $a1, $s0, $zero @@ -116,7 +116,7 @@ glabel func_80241150_B4BBC0 /* B4BD74 80241304 0C0372DF */ jal func_800DCB7C /* B4BD78 80241308 0220382D */ daddu $a3, $s1, $zero /* B4BD7C 8024130C 1040003D */ beqz $v0, .L80241404 -/* B4BD80 80241310 00000000 */ nop +/* B4BD80 80241310 00000000 */ nop /* B4BD84 80241314 C660001C */ lwc1 $f0, 0x1c($s3) /* B4BD88 80241318 C7A20038 */ lwc1 $f2, 0x38($sp) /* B4BD8C 8024131C 46000005 */ abs.s $f0, $f0 @@ -124,7 +124,7 @@ glabel func_80241150_B4BBC0 /* B4BD94 80241324 46340000 */ add.d $f0, $f0, $f20 /* B4BD98 80241328 460010A1 */ cvt.d.s $f2, $f2 /* B4BD9C 8024132C 4620103E */ c.le.d $f2, $f0 -/* B4BDA0 80241330 00000000 */ nop +/* B4BDA0 80241330 00000000 */ nop /* B4BDA4 80241334 45000033 */ bc1f .L80241404 /* B4BDA8 80241338 2403F7FF */ addiu $v1, $zero, -0x801 /* B4BDAC 8024133C C7A0002C */ lwc1 $f0, 0x2c($sp) @@ -163,7 +163,7 @@ glabel func_80241150_B4BBC0 /* B4BE30 802413C0 2402000F */ addiu $v0, $zero, 0xf /* B4BE34 802413C4 AFA2001C */ sw $v0, 0x1c($sp) /* B4BE38 802413C8 44834000 */ mtc1 $v1, $f8 -/* B4BE3C 802413CC 00000000 */ nop +/* B4BE3C 802413CC 00000000 */ nop /* B4BE40 802413D0 46804220 */ cvt.s.w $f8, $f8 /* B4BE44 802413D4 44074000 */ mfc1 $a3, $f8 /* B4BE48 802413D8 27A2003C */ addiu $v0, $sp, 0x3c diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s index 85e9798594..0f2288c410 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s @@ -76,7 +76,7 @@ glabel func_80241494_B4BF04 /* B4C01C 802415AC 8E4300B0 */ lw $v1, 0xb0($s2) /* B4C020 802415B0 30620004 */ andi $v0, $v1, 4 /* B4C024 802415B4 10400007 */ beqz $v0, .L802415D4 -/* B4C028 802415B8 00000000 */ nop +/* B4C028 802415B8 00000000 */ nop /* B4C02C 802415BC 824200B4 */ lb $v0, 0xb4($s2) /* B4C030 802415C0 14400034 */ bnez $v0, .L80241694 /* B4C034 802415C4 0000102D */ daddu $v0, $zero, $zero @@ -88,21 +88,24 @@ glabel func_80241494_B4BF04 /* B4C048 802415D8 2C62000F */ sltiu $v0, $v1, 0xf /* B4C04C 802415DC 1040002C */ beqz $v0, .L80241690 /* B4C050 802415E0 00031080 */ sll $v0, $v1, 2 -/* B4C054 802415E4 3C018024 */ lui $at, %hi(D_80247A38) +/* B4C054 802415E4 3C018024 */ lui $at, %hi(jtbl_80247A38_B524A8) /* B4C058 802415E8 00220821 */ addu $at, $at, $v0 -/* B4C05C 802415EC 8C227A38 */ lw $v0, %lo(D_80247A38)($at) +/* B4C05C 802415EC 8C227A38 */ lw $v0, %lo(jtbl_80247A38_B524A8)($at) /* B4C060 802415F0 00400008 */ jr $v0 -/* B4C064 802415F4 00000000 */ nop +/* B4C064 802415F4 00000000 */ nop +glabel L802415F8_B4C068 /* B4C068 802415F8 0260202D */ daddu $a0, $s3, $zero /* B4C06C 802415FC 0280282D */ daddu $a1, $s4, $zero /* B4C070 80241600 0C090229 */ jal func_802408A4_B4B314 /* B4C074 80241604 0200302D */ daddu $a2, $s0, $zero +glabel L80241608_B4C078 /* B4C078 80241608 0260202D */ daddu $a0, $s3, $zero /* B4C07C 8024160C 0280282D */ daddu $a1, $s4, $zero /* B4C080 80241610 0C0902B5 */ jal func_80240AD4_B4B544 /* B4C084 80241614 0200302D */ daddu $a2, $s0, $zero /* B4C088 80241618 080905A5 */ j .L80241694 /* B4C08C 8024161C 0000102D */ daddu $v0, $zero, $zero +glabel L80241620_B4C090 /* B4C090 80241620 0260202D */ daddu $a0, $s3, $zero /* B4C094 80241624 0280282D */ daddu $a1, $s4, $zero /* B4C098 80241628 0C090383 */ jal jan_05_UnkNpcAIFunc1 @@ -111,27 +114,32 @@ glabel func_80241494_B4BF04 /* B4C0A4 80241634 24020003 */ addiu $v0, $zero, 3 /* B4C0A8 80241638 14620016 */ bne $v1, $v0, .L80241694 /* B4C0AC 8024163C 0000102D */ daddu $v0, $zero, $zero +glabel L80241640_B4C0B0 /* B4C0B0 80241640 0260202D */ daddu $a0, $s3, $zero /* B4C0B4 80241644 0280282D */ daddu $a1, $s4, $zero /* B4C0B8 80241648 0C0903B3 */ jal func_80240ECC_B4B93C /* B4C0BC 8024164C 0200302D */ daddu $a2, $s0, $zero /* B4C0C0 80241650 080905A5 */ j .L80241694 /* B4C0C4 80241654 0000102D */ daddu $v0, $zero, $zero +glabel L80241658_B4C0C8 /* B4C0C8 80241658 0260202D */ daddu $a0, $s3, $zero /* B4C0CC 8024165C 0280282D */ daddu $a1, $s4, $zero /* B4C0D0 80241660 0C09041C */ jal func_80241070_B4BAE0 /* B4C0D4 80241664 0200302D */ daddu $a2, $s0, $zero +glabel L80241668_B4C0D8 /* B4C0D8 80241668 0260202D */ daddu $a0, $s3, $zero /* B4C0DC 8024166C 0280282D */ daddu $a1, $s4, $zero /* B4C0E0 80241670 0C090454 */ jal func_80241150_B4BBC0 /* B4C0E4 80241674 0200302D */ daddu $a2, $s0, $zero /* B4C0E8 80241678 080905A5 */ j .L80241694 /* B4C0EC 8024167C 0000102D */ daddu $v0, $zero, $zero +glabel L80241680_B4C0F0 /* B4C0F0 80241680 0260202D */ daddu $a0, $s3, $zero /* B4C0F4 80241684 0280282D */ daddu $a1, $s4, $zero /* B4C0F8 80241688 0C090514 */ jal jan_05_UnkDurationCheck /* B4C0FC 8024168C 0200302D */ daddu $a2, $s0, $zero .L80241690: +glabel L80241690_B4C100 /* B4C100 80241690 0000102D */ daddu $v0, $zero, $zero .L80241694: /* B4C104 80241694 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241708_B4C178.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241708_B4C178.s index b41cc458b1..16133e21b5 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241708_B4C178.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241708_B4C178.s @@ -31,17 +31,19 @@ glabel func_80241708_B4C178 /* B4C1D8 80241768 2C620006 */ sltiu $v0, $v1, 6 /* B4C1DC 8024176C 1040004D */ beqz $v0, .L802418A4 /* B4C1E0 80241770 00031080 */ sll $v0, $v1, 2 -/* B4C1E4 80241774 3C018024 */ lui $at, %hi(D_80247A78) +/* B4C1E4 80241774 3C018024 */ lui $at, %hi(jtbl_80247A78_B524E8) /* B4C1E8 80241778 00220821 */ addu $at, $at, $v0 -/* B4C1EC 8024177C 8C227A78 */ lw $v0, %lo(D_80247A78)($at) +/* B4C1EC 8024177C 8C227A78 */ lw $v0, %lo(jtbl_80247A78_B524E8)($at) /* B4C1F0 80241780 00400008 */ jr $v0 -/* B4C1F4 80241784 00000000 */ nop +/* B4C1F4 80241784 00000000 */ nop +glabel L80241788_B4C1F8 /* B4C1F8 80241788 3C030042 */ lui $v1, 0x42 /* B4C1FC 8024178C 3463000F */ ori $v1, $v1, 0xf /* B4C200 80241790 24020002 */ addiu $v0, $zero, 2 /* B4C204 80241794 AE02006C */ sw $v0, 0x6c($s0) /* B4C208 80241798 AE000070 */ sw $zero, 0x70($s0) /* B4C20C 8024179C AE230028 */ sw $v1, 0x28($s1) +glabel L802417A0_B4C210 /* B4C210 802417A0 8E020070 */ lw $v0, 0x70($s0) /* B4C214 802417A4 24420001 */ addiu $v0, $v0, 1 /* B4C218 802417A8 AE020070 */ sw $v0, 0x70($s0) @@ -50,12 +52,14 @@ glabel func_80241708_B4C178 /* B4C224 802417B4 24020005 */ addiu $v0, $zero, 5 /* B4C228 802417B8 08090629 */ j .L802418A4 /* B4C22C 802417BC AE02006C */ sw $v0, 0x6c($s0) +glabel L802417C0_B4C230 /* B4C230 802417C0 3C030042 */ lui $v1, 0x42 /* B4C234 802417C4 34630010 */ ori $v1, $v1, 0x10 /* B4C238 802417C8 24020004 */ addiu $v0, $zero, 4 /* B4C23C 802417CC AE02006C */ sw $v0, 0x6c($s0) /* B4C240 802417D0 AE000070 */ sw $zero, 0x70($s0) /* B4C244 802417D4 AE230028 */ sw $v1, 0x28($s1) +glabel L802417D8_B4C248 /* B4C248 802417D8 8E020070 */ lw $v0, 0x70($s0) /* B4C24C 802417DC 24030019 */ addiu $v1, $zero, 0x19 /* B4C250 802417E0 24420001 */ addiu $v0, $v0, 1 @@ -63,7 +67,7 @@ glabel func_80241708_B4C178 /* B4C258 802417E8 AE020070 */ sw $v0, 0x70($s0) /* B4C25C 802417EC 3C0142B4 */ lui $at, 0x42b4 /* B4C260 802417F0 44810000 */ mtc1 $at, $f0 -/* B4C264 802417F4 00000000 */ nop +/* B4C264 802417F4 00000000 */ nop /* B4C268 802417F8 E620000C */ swc1 $f0, 0xc($s1) .L802417FC: /* B4C26C 802417FC 8E020070 */ lw $v0, 0x70($s0) @@ -72,6 +76,7 @@ glabel func_80241708_B4C178 /* B4C278 80241808 24020005 */ addiu $v0, $zero, 5 /* B4C27C 8024180C 08090629 */ j .L802418A4 /* B4C280 80241810 AE02006C */ sw $v0, 0x6c($s0) +glabel L80241814_B4C284 /* B4C284 80241814 3C030042 */ lui $v1, 0x42 /* B4C288 80241818 24020006 */ addiu $v0, $zero, 6 /* B4C28C 8024181C 34630003 */ ori $v1, $v1, 3 @@ -83,7 +88,7 @@ glabel func_80241708_B4C178 /* B4C2A4 80241834 AFA00014 */ sw $zero, 0x14($sp) /* B4C2A8 80241838 AFA20018 */ sw $v0, 0x18($sp) /* B4C2AC 8024183C 44840000 */ mtc1 $a0, $f0 -/* B4C2B0 80241840 00000000 */ nop +/* B4C2B0 80241840 00000000 */ nop /* B4C2B4 80241844 46800020 */ cvt.s.w $f0, $f0 /* B4C2B8 80241848 E7A00010 */ swc1 $f0, 0x10($sp) /* B4C2BC 8024184C 8E250038 */ lw $a1, 0x38($s1) @@ -91,12 +96,13 @@ glabel func_80241708_B4C178 /* B4C2C4 80241854 8E270040 */ lw $a3, 0x40($s1) /* B4C2C8 80241858 0C01C1E4 */ jal fx_sweat /* B4C2CC 8024185C 0000202D */ daddu $a0, $zero, $zero +glabel L80241860_B4C2D0 /* B4C2D0 80241860 8E020070 */ lw $v0, 0x70($s0) /* B4C2D4 80241864 24420001 */ addiu $v0, $v0, 1 /* B4C2D8 80241868 AE020070 */ sw $v0, 0x70($s0) /* B4C2DC 8024186C 2842000B */ slti $v0, $v0, 0xb /* B4C2E0 80241870 1440000C */ bnez $v0, .L802418A4 -/* B4C2E4 80241874 00000000 */ nop +/* B4C2E4 80241874 00000000 */ nop /* B4C2E8 80241878 0C00A67F */ jal rand_int /* B4C2EC 8024187C 24040064 */ addiu $a0, $zero, 0x64 /* B4C2F0 80241880 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241AD4_B4C544.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241AD4_B4C544.s index 9ee84bf10a..e34e8b6816 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241AD4_B4C544.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241AD4_B4C544.s @@ -42,7 +42,7 @@ glabel func_80241AD4_B4C544 /* B4C5D8 80241B68 C6620074 */ lwc1 $f2, 0x74($s3) /* B4C5DC 80241B6C 468010A0 */ cvt.s.w $f2, $f2 /* B4C5E0 80241B70 4600103C */ c.lt.s $f2, $f0 -/* B4C5E4 80241B74 00000000 */ nop +/* B4C5E4 80241B74 00000000 */ nop /* B4C5E8 80241B78 45030001 */ bc1tl .L80241B80 /* B4C5EC 80241B7C 0000882D */ daddu $s1, $zero, $zero .L80241B80: @@ -51,16 +51,16 @@ glabel func_80241AD4_B4C544 /* B4C5F8 80241B88 3C014387 */ lui $at, 0x4387 /* B4C5FC 80241B8C 4481A000 */ mtc1 $at, $f20 /* B4C600 80241B90 0C00A70A */ jal get_clamped_angle_diff -/* B4C604 80241B94 00000000 */ nop +/* B4C604 80241B94 00000000 */ nop /* B4C608 80241B98 0C00A6C9 */ jal clamp_angle /* B4C60C 80241B9C 46000306 */ mov.s $f12, $f0 /* B4C610 80241BA0 3C018024 */ lui $at, %hi(D_80247A90) /* B4C614 80241BA4 D4227A90 */ ldc1 $f2, %lo(D_80247A90)($at) /* B4C618 80241BA8 46000021 */ cvt.d.s $f0, $f0 /* B4C61C 80241BAC 4622003C */ c.lt.d $f0, $f2 -/* B4C620 80241BB0 00000000 */ nop +/* B4C620 80241BB0 00000000 */ nop /* B4C624 80241BB4 45000003 */ bc1f .L80241BC4 -/* B4C628 80241BB8 00000000 */ nop +/* B4C628 80241BB8 00000000 */ nop /* B4C62C 80241BBC 3C0142B4 */ lui $at, 0x42b4 /* B4C630 80241BC0 4481A000 */ mtc1 $at, $f20 .L80241BC4: @@ -77,7 +77,7 @@ glabel func_80241AD4_B4C544 /* B4C65C 80241BEC 468010A0 */ cvt.s.w $f2, $f2 /* B4C660 80241BF0 46000005 */ abs.s $f0, $f0 /* B4C664 80241BF4 4600103C */ c.lt.s $f2, $f0 -/* B4C668 80241BF8 00000000 */ nop +/* B4C668 80241BF8 00000000 */ nop /* B4C66C 80241BFC 45030001 */ bc1tl .L80241C04 /* B4C670 80241C00 0000882D */ daddu $s1, $zero, $zero .L80241C04: @@ -87,13 +87,13 @@ glabel func_80241AD4_B4C544 /* B4C680 80241C10 860200A8 */ lh $v0, 0xa8($s0) /* B4C684 80241C14 46020001 */ sub.s $f0, $f0, $f2 /* B4C688 80241C18 44821000 */ mtc1 $v0, $f2 -/* B4C68C 80241C1C 00000000 */ nop +/* B4C68C 80241C1C 00000000 */ nop /* B4C690 80241C20 468010A1 */ cvt.d.w $f2, $f2 /* B4C694 80241C24 46221080 */ add.d $f2, $f2, $f2 /* B4C698 80241C28 46000005 */ abs.s $f0, $f0 /* B4C69C 80241C2C 46000021 */ cvt.d.s $f0, $f0 /* B4C6A0 80241C30 4620103E */ c.le.d $f2, $f0 -/* B4C6A4 80241C34 00000000 */ nop +/* B4C6A4 80241C34 00000000 */ nop /* B4C6A8 80241C38 45030001 */ bc1tl .L80241C40 /* B4C6AC 80241C3C 0000882D */ daddu $s1, $zero, $zero .L80241C40: diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241C88_B4C6F8.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241C88_B4C6F8.s index 0bab27e883..58ddd79860 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241C88_B4C6F8.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241C88_B4C6F8.s @@ -19,7 +19,7 @@ glabel func_80241C88_B4C6F8 /* B4C730 80241CC0 8E2200B0 */ lw $v0, 0xb0($s1) /* B4C734 80241CC4 30420004 */ andi $v0, $v0, 4 /* B4C738 80241CC8 10400015 */ beqz $v0, .L80241D20 -/* B4C73C 80241CCC 00000000 */ nop +/* B4C73C 80241CCC 00000000 */ nop .L80241CD0: /* B4C740 80241CD0 AE800070 */ sw $zero, 0x70($s4) /* B4C744 80241CD4 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel func_80241C88_B4C6F8 /* B4C794 80241D24 12600005 */ beqz $s3, .L80241D3C /* B4C798 80241D28 24020001 */ addiu $v0, $zero, 1 /* B4C79C 80241D2C 12620048 */ beq $s3, $v0, .L80241E50 -/* B4C7A0 80241D30 00000000 */ nop +/* B4C7A0 80241D30 00000000 */ nop /* B4C7A4 80241D34 080907B1 */ j .L80241EC4 -/* B4C7A8 80241D38 00000000 */ nop +/* B4C7A8 80241D38 00000000 */ nop .L80241D3C: /* B4C7AC 80241D3C 86240008 */ lh $a0, 8($s1) /* B4C7B0 80241D40 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel func_80241C88_B4C6F8 /* B4C7D0 80241D60 8E03006C */ lw $v1, 0x6c($s0) /* B4C7D4 80241D64 24020003 */ addiu $v0, $zero, 3 /* B4C7D8 80241D68 14620056 */ bne $v1, $v0, .L80241EC4 -/* B4C7DC 80241D6C 00000000 */ nop +/* B4C7DC 80241D6C 00000000 */ nop /* B4C7E0 80241D70 8E2500A8 */ lw $a1, 0xa8($s1) /* B4C7E4 80241D74 10A00003 */ beqz $a1, .L80241D84 /* B4C7E8 80241D78 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel func_80241C88_B4C6F8 /* B4C860 80241DF0 C7A20014 */ lwc1 $f2, 0x14($sp) /* B4C864 80241DF4 4600020D */ trunc.w.s $f8, $f0 /* B4C868 80241DF8 44024000 */ mfc1 $v0, $f8 -/* B4C86C 80241DFC 00000000 */ nop +/* B4C86C 80241DFC 00000000 */ nop /* B4C870 80241E00 A6220012 */ sh $v0, 0x12($s1) /* B4C874 80241E04 4600120D */ trunc.w.s $f8, $f2 /* B4C878 80241E08 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s index 8e1e790c7b..4c651b333d 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s @@ -100,78 +100,93 @@ glabel func_80241EE8_B4C958 /* B4CABC 8024204C 2C620064 */ sltiu $v0, $v1, 0x64 /* B4CAC0 80242050 10400048 */ beqz $v0, .L80242174 /* B4CAC4 80242054 00031080 */ sll $v0, $v1, 2 -/* B4CAC8 80242058 3C018024 */ lui $at, %hi(D_80247A98) +/* B4CAC8 80242058 3C018024 */ lui $at, %hi(jtbl_80247A98_B52508) /* B4CACC 8024205C 00220821 */ addu $at, $at, $v0 -/* B4CAD0 80242060 8C227A98 */ lw $v0, %lo(D_80247A98)($at) +/* B4CAD0 80242060 8C227A98 */ lw $v0, %lo(jtbl_80247A98_B52508)($at) /* B4CAD4 80242064 00400008 */ jr $v0 /* B4CAD8 80242068 00000000 */ nop +glabel L8024206C_B4CADC /* B4CADC 8024206C 0240202D */ daddu $a0, $s2, $zero /* B4CAE0 80242070 0260282D */ daddu $a1, $s3, $zero /* B4CAE4 80242074 0C012568 */ jal func_800495A0 /* B4CAE8 80242078 0280302D */ daddu $a2, $s4, $zero +glabel L8024207C_B4CAEC /* B4CAEC 8024207C 0240202D */ daddu $a0, $s2, $zero /* B4CAF0 80242080 0260282D */ daddu $a1, $s3, $zero /* B4CAF4 80242084 0C0125AE */ jal func_800496B8 /* B4CAF8 80242088 0280302D */ daddu $a2, $s4, $zero /* B4CAFC 8024208C 0809085D */ j .L80242174 /* B4CB00 80242090 00000000 */ nop +glabel L80242094_B4CB04 /* B4CB04 80242094 0240202D */ daddu $a0, $s2, $zero /* B4CB08 80242098 0260282D */ daddu $a1, $s3, $zero /* B4CB0C 8024209C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* B4CB10 802420A0 0280302D */ daddu $a2, $s4, $zero +glabel L802420A4_B4CB14 /* B4CB14 802420A4 0240202D */ daddu $a0, $s2, $zero /* B4CB18 802420A8 0260282D */ daddu $a1, $s3, $zero /* B4CB1C 802420AC 0C012701 */ jal func_80049C04 /* B4CB20 802420B0 0280302D */ daddu $a2, $s4, $zero /* B4CB24 802420B4 0809085D */ j .L80242174 /* B4CB28 802420B8 00000000 */ nop +glabel L802420BC_B4CB2C /* B4CB2C 802420BC 0240202D */ daddu $a0, $s2, $zero /* B4CB30 802420C0 0260282D */ daddu $a1, $s3, $zero /* B4CB34 802420C4 0C01278F */ jal func_80049E3C /* B4CB38 802420C8 0280302D */ daddu $a2, $s4, $zero +glabel L802420CC_B4CB3C /* B4CB3C 802420CC 0240202D */ daddu $a0, $s2, $zero /* B4CB40 802420D0 0260282D */ daddu $a1, $s3, $zero /* B4CB44 802420D4 0C0127B3 */ jal func_80049ECC /* B4CB48 802420D8 0280302D */ daddu $a2, $s4, $zero /* B4CB4C 802420DC 0809085D */ j .L80242174 /* B4CB50 802420E0 00000000 */ nop +glabel L802420E4_B4CB54 /* B4CB54 802420E4 0240202D */ daddu $a0, $s2, $zero /* B4CB58 802420E8 0260282D */ daddu $a1, $s3, $zero /* B4CB5C 802420EC 0C0127DF */ jal func_80049F7C /* B4CB60 802420F0 0280302D */ daddu $a2, $s4, $zero +glabel L802420F4_B4CB64 /* B4CB64 802420F4 0240202D */ daddu $a0, $s2, $zero /* B4CB68 802420F8 0260282D */ daddu $a1, $s3, $zero /* B4CB6C 802420FC 0C012849 */ jal func_8004A124 /* B4CB70 80242100 0280302D */ daddu $a2, $s4, $zero /* B4CB74 80242104 0809085D */ j .L80242174 /* B4CB78 80242108 00000000 */ nop +glabel L8024210C_B4CB7C /* B4CB7C 8024210C 0240202D */ daddu $a0, $s2, $zero /* B4CB80 80242110 0260282D */ daddu $a1, $s3, $zero /* B4CB84 80242114 0C0128FA */ jal func_8004A3E8 /* B4CB88 80242118 0280302D */ daddu $a2, $s4, $zero /* B4CB8C 8024211C 0809085D */ j .L80242174 /* B4CB90 80242120 00000000 */ nop +glabel L80242124_B4CB94 /* B4CB94 80242124 0C090633 */ jal jan_05_UnkNpcAIFunc6 /* B4CB98 80242128 0240202D */ daddu $a0, $s2, $zero +glabel L8024212C_B4CB9C /* B4CB9C 8024212C 0C09064E */ jal jan_05_UnkNpcAIFunc7 /* B4CBA0 80242130 0240202D */ daddu $a0, $s2, $zero /* B4CBA4 80242134 8E430070 */ lw $v1, 0x70($s2) /* B4CBA8 80242138 24020020 */ addiu $v0, $zero, 0x20 /* B4CBAC 8024213C 1462000D */ bne $v1, $v0, .L80242174 /* B4CBB0 80242140 00000000 */ nop +glabel L80242144_B4CBB4 /* B4CBB4 80242144 0C09066A */ jal jan_05_UnkNpcAIFunc8 /* B4CBB8 80242148 0240202D */ daddu $a0, $s2, $zero /* B4CBBC 8024214C 8E430070 */ lw $v1, 0x70($s2) /* B4CBC0 80242150 24020021 */ addiu $v0, $zero, 0x21 /* B4CBC4 80242154 14620007 */ bne $v1, $v0, .L80242174 /* B4CBC8 80242158 00000000 */ nop +glabel L8024215C_B4CBCC /* B4CBCC 8024215C 0C0906A0 */ jal jan_05_UnkNpcAIFunc5 /* B4CBD0 80242160 0240202D */ daddu $a0, $s2, $zero /* B4CBD4 80242164 0809085D */ j .L80242174 /* B4CBD8 80242168 00000000 */ nop +glabel L8024216C_B4CBDC /* B4CBDC 8024216C 0C0129CF */ jal func_8004A73C /* B4CBE0 80242170 0240202D */ daddu $a0, $s2, $zero .L80242174: +glabel L80242174_B4CBE4 /* B4CBE4 80242174 8FBF0048 */ lw $ra, 0x48($sp) /* B4CBE8 80242178 8FB50044 */ lw $s5, 0x44($sp) /* B4CBEC 8024217C 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s index 153430b770..7ec53f6f71 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s @@ -46,7 +46,7 @@ glabel func_8024219C_B4CC0C /* B4CCB0 80242240 8E2200B0 */ lw $v0, 0xb0($s1) /* B4CCB4 80242244 30420004 */ andi $v0, $v0, 4 /* B4CCB8 80242248 10400020 */ beqz $v0, .L802422CC -/* B4CCBC 8024224C 00000000 */ nop +/* B4CCBC 8024224C 00000000 */ nop .L80242250: /* B4CCC0 80242250 2404F7FF */ addiu $a0, $zero, -0x801 /* B4CCC4 80242254 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024219C_B4CC0C /* B4CD3C 802422CC 8E420070 */ lw $v0, 0x70($s2) /* B4CD40 802422D0 2842001E */ slti $v0, $v0, 0x1e /* B4CD44 802422D4 10400009 */ beqz $v0, .L802422FC -/* B4CD48 802422D8 00000000 */ nop +/* B4CD48 802422D8 00000000 */ nop /* B4CD4C 802422DC 8E22006C */ lw $v0, 0x6c($s1) /* B4CD50 802422E0 14400006 */ bnez $v0, .L802422FC -/* B4CD54 802422E4 00000000 */ nop +/* B4CD54 802422E4 00000000 */ nop /* B4CD58 802422E8 0C0906B5 */ jal func_80241AD4_B4C544 /* B4CD5C 802422EC 0240202D */ daddu $a0, $s2, $zero /* B4CD60 802422F0 10400002 */ beqz $v0, .L802422FC @@ -100,78 +100,93 @@ glabel func_8024219C_B4CC0C /* B4CD70 80242300 2C620064 */ sltiu $v0, $v1, 0x64 /* B4CD74 80242304 10400048 */ beqz $v0, .L80242428 /* B4CD78 80242308 00031080 */ sll $v0, $v1, 2 -/* B4CD7C 8024230C 3C018024 */ lui $at, %hi(D_80247C28) +/* B4CD7C 8024230C 3C018024 */ lui $at, %hi(jtbl_80247C28_B52698) /* B4CD80 80242310 00220821 */ addu $at, $at, $v0 -/* B4CD84 80242314 8C227C28 */ lw $v0, %lo(D_80247C28)($at) +/* B4CD84 80242314 8C227C28 */ lw $v0, %lo(jtbl_80247C28_B52698)($at) /* B4CD88 80242318 00400008 */ jr $v0 -/* B4CD8C 8024231C 00000000 */ nop +/* B4CD8C 8024231C 00000000 */ nop +glabel L80242320_B4CD90 /* B4CD90 80242320 0240202D */ daddu $a0, $s2, $zero /* B4CD94 80242324 0260282D */ daddu $a1, $s3, $zero /* B4CD98 80242328 0C012568 */ jal func_800495A0 /* B4CD9C 8024232C 0280302D */ daddu $a2, $s4, $zero +glabel L80242330_B4CDA0 /* B4CDA0 80242330 0240202D */ daddu $a0, $s2, $zero /* B4CDA4 80242334 0260282D */ daddu $a1, $s3, $zero /* B4CDA8 80242338 0C0125AE */ jal func_800496B8 /* B4CDAC 8024233C 0280302D */ daddu $a2, $s4, $zero /* B4CDB0 80242340 0809090A */ j .L80242428 -/* B4CDB4 80242344 00000000 */ nop +/* B4CDB4 80242344 00000000 */ nop +glabel L80242348_B4CDB8 /* B4CDB8 80242348 0240202D */ daddu $a0, $s2, $zero /* B4CDBC 8024234C 0260282D */ daddu $a1, $s3, $zero /* B4CDC0 80242350 0C0905AE */ jal jan_05_UnkNpcAIFunc4 /* B4CDC4 80242354 0280302D */ daddu $a2, $s4, $zero +glabel L80242358_B4CDC8 /* B4CDC8 80242358 0240202D */ daddu $a0, $s2, $zero /* B4CDCC 8024235C 0260282D */ daddu $a1, $s3, $zero /* B4CDD0 80242360 0C0905C2 */ jal func_80241708_B4C178 /* B4CDD4 80242364 0280302D */ daddu $a2, $s4, $zero /* B4CDD8 80242368 0809090A */ j .L80242428 -/* B4CDDC 8024236C 00000000 */ nop +/* B4CDDC 8024236C 00000000 */ nop +glabel L80242370_B4CDE0 /* B4CDE0 80242370 0240202D */ daddu $a0, $s2, $zero /* B4CDE4 80242374 0260282D */ daddu $a1, $s3, $zero /* B4CDE8 80242378 0C01278F */ jal func_80049E3C /* B4CDEC 8024237C 0280302D */ daddu $a2, $s4, $zero +glabel L80242380_B4CDF0 /* B4CDF0 80242380 0240202D */ daddu $a0, $s2, $zero /* B4CDF4 80242384 0260282D */ daddu $a1, $s3, $zero /* B4CDF8 80242388 0C0127B3 */ jal func_80049ECC /* B4CDFC 8024238C 0280302D */ daddu $a2, $s4, $zero /* B4CE00 80242390 0809090A */ j .L80242428 -/* B4CE04 80242394 00000000 */ nop +/* B4CE04 80242394 00000000 */ nop +glabel L80242398_B4CE08 /* B4CE08 80242398 0240202D */ daddu $a0, $s2, $zero /* B4CE0C 8024239C 0260282D */ daddu $a1, $s3, $zero /* B4CE10 802423A0 0C0127DF */ jal func_80049F7C /* B4CE14 802423A4 0280302D */ daddu $a2, $s4, $zero +glabel L802423A8_B4CE18 /* B4CE18 802423A8 0240202D */ daddu $a0, $s2, $zero /* B4CE1C 802423AC 0260282D */ daddu $a1, $s3, $zero /* B4CE20 802423B0 0C012849 */ jal func_8004A124 /* B4CE24 802423B4 0280302D */ daddu $a2, $s4, $zero /* B4CE28 802423B8 0809090A */ j .L80242428 -/* B4CE2C 802423BC 00000000 */ nop +/* B4CE2C 802423BC 00000000 */ nop +glabel L802423C0_B4CE30 /* B4CE30 802423C0 0240202D */ daddu $a0, $s2, $zero /* B4CE34 802423C4 0260282D */ daddu $a1, $s3, $zero /* B4CE38 802423C8 0C0128FA */ jal func_8004A3E8 /* B4CE3C 802423CC 0280302D */ daddu $a2, $s4, $zero /* B4CE40 802423D0 0809090A */ j .L80242428 -/* B4CE44 802423D4 00000000 */ nop +/* B4CE44 802423D4 00000000 */ nop +glabel L802423D8_B4CE48 /* B4CE48 802423D8 0C090633 */ jal jan_05_UnkNpcAIFunc6 /* B4CE4C 802423DC 0240202D */ daddu $a0, $s2, $zero +glabel L802423E0_B4CE50 /* B4CE50 802423E0 0C09064E */ jal jan_05_UnkNpcAIFunc7 /* B4CE54 802423E4 0240202D */ daddu $a0, $s2, $zero /* B4CE58 802423E8 8E430070 */ lw $v1, 0x70($s2) /* B4CE5C 802423EC 24020020 */ addiu $v0, $zero, 0x20 /* B4CE60 802423F0 1462000D */ bne $v1, $v0, .L80242428 -/* B4CE64 802423F4 00000000 */ nop +/* B4CE64 802423F4 00000000 */ nop +glabel L802423F8_B4CE68 /* B4CE68 802423F8 0C09066A */ jal jan_05_UnkNpcAIFunc8 /* B4CE6C 802423FC 0240202D */ daddu $a0, $s2, $zero /* B4CE70 80242400 8E430070 */ lw $v1, 0x70($s2) /* B4CE74 80242404 24020021 */ addiu $v0, $zero, 0x21 /* B4CE78 80242408 14620007 */ bne $v1, $v0, .L80242428 -/* B4CE7C 8024240C 00000000 */ nop +/* B4CE7C 8024240C 00000000 */ nop +glabel L80242410_B4CE80 /* B4CE80 80242410 0C0906A0 */ jal jan_05_UnkNpcAIFunc5 /* B4CE84 80242414 0240202D */ daddu $a0, $s2, $zero /* B4CE88 80242418 0809090A */ j .L80242428 -/* B4CE8C 8024241C 00000000 */ nop +/* B4CE8C 8024241C 00000000 */ nop +glabel L80242420_B4CE90 /* B4CE90 80242420 0C0129CF */ jal func_8004A73C /* B4CE94 80242424 0240202D */ daddu $a0, $s2, $zero .L80242428: +glabel L80242428_B4CE98 /* B4CE98 80242428 8FBF0048 */ lw $ra, 0x48($sp) /* B4CE9C 8024242C 8FB50044 */ lw $s5, 0x44($sp) /* B4CEA0 80242430 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52B40/func_80240310_B52B40.s b/asm/nonmatchings/world/area_jan/jan_06/B52B40/func_80240310_B52B40.s index 4832f6ec17..c6158b01f9 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52B40/func_80240310_B52B40.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52B40/func_80240310_B52B40.s @@ -29,7 +29,7 @@ glabel func_80240310_B52B40 /* B52BA0 80240370 44060000 */ mfc1 $a2, $f0 /* B52BA4 80240374 44071000 */ mfc1 $a3, $f2 /* B52BA8 80240378 44820000 */ mtc1 $v0, $f0 -/* B52BAC 8024037C 00000000 */ nop +/* B52BAC 8024037C 00000000 */ nop /* B52BB0 80240380 46800020 */ cvt.s.w $f0, $f0 /* B52BB4 80240384 AE220078 */ sw $v0, 0x78($s1) /* B52BB8 80240388 0C05267B */ jal func_801499EC @@ -40,5 +40,5 @@ glabel func_80240310_B52B40 /* B52BCC 8024039C 24020002 */ addiu $v0, $zero, 2 /* B52BD0 802403A0 03E00008 */ jr $ra /* B52BD4 802403A4 27BD0028 */ addiu $sp, $sp, 0x28 -/* B52BD8 802403A8 00000000 */ nop -/* B52BDC 802403AC 00000000 */ nop +/* B52BD8 802403A8 00000000 */ nop +/* B52BDC 802403AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52BE0/func_802403B0_B52BE0.s b/asm/nonmatchings/world/area_jan/jan_06/B52BE0/func_802403B0_B52BE0.s index 25470becb9..f972fc934f 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52BE0/func_802403B0_B52BE0.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52BE0/func_802403B0_B52BE0.s @@ -35,7 +35,7 @@ glabel func_802403B0_B52BE0 /* B52C54 80240424 0C0B1EAF */ jal get_variable /* B52C58 80240428 0220202D */ daddu $a0, $s1, $zero /* B52C5C 8024042C 1440002A */ bnez $v0, .L802404D8 -/* B52C60 80240430 00000000 */ nop +/* B52C60 80240430 00000000 */ nop /* B52C64 80240434 8E240078 */ lw $a0, 0x78($s1) /* B52C68 80240438 0C044181 */ jal get_shadow_by_index /* B52C6C 8024043C 8E300074 */ lw $s0, 0x74($s1) @@ -80,7 +80,7 @@ glabel func_802403B0_B52BE0 .L802404D8: /* B52D08 802404D8 8E240078 */ lw $a0, 0x78($s1) /* B52D0C 802404DC 0C0448CA */ jal func_80112328 -/* B52D10 802404E0 00000000 */ nop +/* B52D10 802404E0 00000000 */ nop /* B52D14 802404E4 24020002 */ addiu $v0, $zero, 2 .L802404E8: /* B52D18 802404E8 8FBF0038 */ lw $ra, 0x38($sp) @@ -88,4 +88,4 @@ glabel func_802403B0_B52BE0 /* B52D20 802404F0 8FB00030 */ lw $s0, 0x30($sp) /* B52D24 802404F4 03E00008 */ jr $ra /* B52D28 802404F8 27BD0040 */ addiu $sp, $sp, 0x40 -/* B52D2C 802404FC 00000000 */ nop +/* B52D2C 802404FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/delete_player_actor_B53598.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/delete_player_actor_B53598.s index 2819a7d50d..6cb4c1313c 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/delete_player_actor_B53598.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/delete_player_actor_B53598.s @@ -38,7 +38,7 @@ glabel delete_player_actor_B53598 /* B5361C 80240DEC 2402000F */ addiu $v0, $zero, 0xf /* B53620 80240DF0 AFA2001C */ sw $v0, 0x1c($sp) /* B53624 80240DF4 44833000 */ mtc1 $v1, $f6 -/* B53628 80240DF8 00000000 */ nop +/* B53628 80240DF8 00000000 */ nop /* B5362C 80240DFC 468031A0 */ cvt.s.w $f6, $f6 /* B53630 80240E00 44073000 */ mfc1 $a3, $f6 /* B53634 80240E04 27A20028 */ addiu $v0, $sp, 0x28 @@ -65,13 +65,13 @@ glabel delete_player_actor_B53598 .L80240E58: /* B53688 80240E58 8602008C */ lh $v0, 0x8c($s0) /* B5368C 80240E5C 14400023 */ bnez $v0, .L80240EEC -/* B53690 80240E60 00000000 */ nop +/* B53690 80240E60 00000000 */ nop /* B53694 80240E64 9602008E */ lhu $v0, 0x8e($s0) /* B53698 80240E68 2442FFFF */ addiu $v0, $v0, -1 /* B5369C 80240E6C A602008E */ sh $v0, 0x8e($s0) /* B536A0 80240E70 00021400 */ sll $v0, $v0, 0x10 /* B536A4 80240E74 1C40001D */ bgtz $v0, .L80240EEC -/* B536A8 80240E78 00000000 */ nop +/* B536A8 80240E78 00000000 */ nop /* B536AC 80240E7C 8E820074 */ lw $v0, 0x74($s4) /* B536B0 80240E80 2442FFFF */ addiu $v0, $v0, -1 /* B536B4 80240E84 18400018 */ blez $v0, .L80240EE8 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240740_B52F70.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240740_B52F70.s index a8f41bb63b..7999d317a3 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240740_B52F70.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240740_B52F70.s @@ -30,7 +30,7 @@ glabel func_80240740_B52F70 /* B52FD4 802407A4 3C05B000 */ lui $a1, 0xb000 /* B52FD8 802407A8 34A50017 */ ori $a1, $a1, 0x17 /* B52FDC 802407AC 44820000 */ mtc1 $v0, $f0 -/* B52FE0 802407B0 00000000 */ nop +/* B52FE0 802407B0 00000000 */ nop /* B52FE4 802407B4 46800021 */ cvt.d.w $f0, $f0 /* B52FE8 802407B8 3C014024 */ lui $at, 0x4024 /* B52FEC 802407BC 44811800 */ mtc1 $at, $f3 @@ -68,7 +68,7 @@ glabel func_80240740_B52F70 /* B5306C 8024083C 0C0123F5 */ jal is_point_within_region /* B53070 80240840 8E070038 */ lw $a3, 0x38($s0) /* B53074 80240844 10400035 */ beqz $v0, .L8024091C -/* B53078 80240848 00000000 */ nop +/* B53078 80240848 00000000 */ nop /* B5307C 8024084C C60C0038 */ lwc1 $f12, 0x38($s0) /* B53080 80240850 3C0141C8 */ lui $at, 0x41c8 /* B53084 80240854 4481B000 */ mtc1 $at, $f22 @@ -99,13 +99,13 @@ glabel func_80240740_B52F70 /* B530E4 802408B4 860200A8 */ lh $v0, 0xa8($s0) /* B530E8 802408B8 27A50020 */ addiu $a1, $sp, 0x20 /* B530EC 802408BC 44820000 */ mtc1 $v0, $f0 -/* B530F0 802408C0 00000000 */ nop +/* B530F0 802408C0 00000000 */ nop /* B530F4 802408C4 46800020 */ cvt.s.w $f0, $f0 /* B530F8 802408C8 E7A00018 */ swc1 $f0, 0x18($sp) /* B530FC 802408CC 860200A6 */ lh $v0, 0xa6($s0) /* B53100 802408D0 27A60024 */ addiu $a2, $sp, 0x24 /* B53104 802408D4 44820000 */ mtc1 $v0, $f0 -/* B53108 802408D8 00000000 */ nop +/* B53108 802408D8 00000000 */ nop /* B5310C 802408DC 46800020 */ cvt.s.w $f0, $f0 /* B53110 802408E0 E7A0001C */ swc1 $f0, 0x1c($sp) /* B53114 802408E4 8E040080 */ lw $a0, 0x80($s0) @@ -121,13 +121,13 @@ glabel func_80240740_B52F70 /* B5313C 8024090C 1440FFE6 */ bnez $v0, .L802408A8 /* B53140 80240910 E600000C */ swc1 $f0, 0xc($s0) /* B53144 80240914 08090253 */ j .L8024094C -/* B53148 80240918 00000000 */ nop +/* B53148 80240918 00000000 */ nop .L8024091C: /* B5314C 8024091C 0C00A67F */ jal rand_int /* B53150 80240920 2404003C */ addiu $a0, $zero, 0x3c /* B53154 80240924 C60C000C */ lwc1 $f12, 0xc($s0) /* B53158 80240928 44820000 */ mtc1 $v0, $f0 -/* B5315C 8024092C 00000000 */ nop +/* B5315C 8024092C 00000000 */ nop /* B53160 80240930 46800020 */ cvt.s.w $f0, $f0 /* B53164 80240934 46006300 */ add.s $f12, $f12, $f0 /* B53168 80240938 3C0141F0 */ lui $at, 0x41f0 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240970_B531A0.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240970_B531A0.s index 6e7ae673d5..7cfbaa4e4a 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240970_B531A0.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240970_B531A0.s @@ -43,7 +43,7 @@ glabel func_80240970_B531A0 /* B53238 80240A08 2402000F */ addiu $v0, $zero, 0xf /* B5323C 80240A0C AFA2001C */ sw $v0, 0x1c($sp) /* B53240 80240A10 44835000 */ mtc1 $v1, $f10 -/* B53244 80240A14 00000000 */ nop +/* B53244 80240A14 00000000 */ nop /* B53248 80240A18 468052A0 */ cvt.s.w $f10, $f10 /* B5324C 80240A1C 44075000 */ mfc1 $a3, $f10 /* B53250 80240A20 27A20028 */ addiu $v0, $sp, 0x28 @@ -78,7 +78,7 @@ glabel func_80240970_B531A0 /* B532B8 80240A88 44801800 */ mtc1 $zero, $f3 /* B532BC 80240A8C 46000021 */ cvt.d.s $f0, $f0 /* B532C0 80240A90 4620103C */ c.lt.d $f2, $f0 -/* B532C4 80240A94 00000000 */ nop +/* B532C4 80240A94 00000000 */ nop /* B532C8 80240A98 45000025 */ bc1f .L80240B30 /* B532CC 80240A9C 27A5002C */ addiu $a1, $sp, 0x2c /* B532D0 80240AA0 C6000038 */ lwc1 $f0, 0x38($s0) @@ -88,7 +88,7 @@ glabel func_80240970_B531A0 /* B532E0 80240AB0 27A60030 */ addiu $a2, $sp, 0x30 /* B532E4 80240AB4 E7A0002C */ swc1 $f0, 0x2c($sp) /* B532E8 80240AB8 44820000 */ mtc1 $v0, $f0 -/* B532EC 80240ABC 00000000 */ nop +/* B532EC 80240ABC 00000000 */ nop /* B532F0 80240AC0 46800020 */ cvt.s.w $f0, $f0 /* B532F4 80240AC4 46000021 */ cvt.d.s $f0, $f0 /* B532F8 80240AC8 C604003C */ lwc1 $f4, 0x3c($s0) @@ -96,13 +96,13 @@ glabel func_80240970_B531A0 /* B53300 80240AD0 C6080018 */ lwc1 $f8, 0x18($s0) /* B53304 80240AD4 860200A8 */ lh $v0, 0xa8($s0) /* B53308 80240AD8 46220002 */ mul.d $f0, $f0, $f2 -/* B5330C 80240ADC 00000000 */ nop +/* B5330C 80240ADC 00000000 */ nop /* B53310 80240AE0 E7A40030 */ swc1 $f4, 0x30($sp) /* B53314 80240AE4 E7A60034 */ swc1 $f6, 0x34($sp) /* B53318 80240AE8 E7A80010 */ swc1 $f8, 0x10($sp) /* B5331C 80240AEC C604000C */ lwc1 $f4, 0xc($s0) /* B53320 80240AF0 44821000 */ mtc1 $v0, $f2 -/* B53324 80240AF4 00000000 */ nop +/* B53324 80240AF4 00000000 */ nop /* B53328 80240AF8 468010A0 */ cvt.s.w $f2, $f2 /* B5332C 80240AFC E7A20018 */ swc1 $f2, 0x18($sp) /* B53330 80240B00 E7A40014 */ swc1 $f4, 0x14($sp) @@ -123,7 +123,7 @@ glabel func_80240970_B531A0 /* B53368 80240B38 44801800 */ mtc1 $zero, $f3 /* B5336C 80240B3C 46000021 */ cvt.d.s $f0, $f0 /* B53370 80240B40 4622003C */ c.lt.d $f0, $f2 -/* B53374 80240B44 00000000 */ nop +/* B53374 80240B44 00000000 */ nop /* B53378 80240B48 45000047 */ bc1f .L80240C68 /* B5337C 80240B4C 27A5002C */ addiu $a1, $sp, 0x2c /* B53380 80240B50 27A60030 */ addiu $a2, $sp, 0x30 @@ -154,7 +154,7 @@ glabel func_80240970_B531A0 /* B533E4 80240BB4 0C0372DF */ jal func_800DCB7C /* B533E8 80240BB8 27A70034 */ addiu $a3, $sp, 0x34 /* B533EC 80240BBC 1040002A */ beqz $v0, .L80240C68 -/* B533F0 80240BC0 00000000 */ nop +/* B533F0 80240BC0 00000000 */ nop /* B533F4 80240BC4 C600001C */ lwc1 $f0, 0x1c($s0) /* B533F8 80240BC8 C7A20038 */ lwc1 $f2, 0x38($sp) /* B533FC 80240BCC 46000005 */ abs.s $f0, $f0 @@ -162,7 +162,7 @@ glabel func_80240970_B531A0 /* B53404 80240BD4 46340000 */ add.d $f0, $f0, $f20 /* B53408 80240BD8 460010A1 */ cvt.d.s $f2, $f2 /* B5340C 80240BDC 4620103E */ c.le.d $f2, $f0 -/* B53410 80240BE0 00000000 */ nop +/* B53410 80240BE0 00000000 */ nop /* B53414 80240BE4 45000020 */ bc1f .L80240C68 /* B53418 80240BE8 240403E8 */ addiu $a0, $zero, 0x3e8 /* B5341C 80240BEC C7A00030 */ lwc1 $f0, 0x30($sp) @@ -193,7 +193,7 @@ glabel func_80240970_B531A0 /* B53480 80240C50 5840000C */ blezl $v0, .L80240C84 /* B53484 80240C54 AE600070 */ sw $zero, 0x70($s3) /* B53488 80240C58 1460000A */ bnez $v1, .L80240C84 -/* B5348C 80240C5C 00000000 */ nop +/* B5348C 80240C5C 00000000 */ nop /* B53490 80240C60 08090321 */ j .L80240C84 /* B53494 80240C64 AE600070 */ sw $zero, 0x70($s3) .L80240C68: diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240F0C_B5373C.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240F0C_B5373C.s index 56035526df..843459ec1a 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240F0C_B5373C.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240F0C_B5373C.s @@ -24,7 +24,7 @@ glabel func_80240F0C_B5373C /* B53788 80240F58 0C00A67F */ jal rand_int /* B5378C 80240F5C AE020000 */ sw $v0, ($s0) /* B53790 80240F60 44820000 */ mtc1 $v0, $f0 -/* B53794 80240F64 00000000 */ nop +/* B53794 80240F64 00000000 */ nop /* B53798 80240F68 46800021 */ cvt.d.w $f0, $f0 /* B5379C 80240F6C 3C014024 */ lui $at, 0x4024 /* B537A0 80240F70 44811800 */ mtc1 $at, $f3 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240FEC_B5381C.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240FEC_B5381C.s index f3253c49f1..a86d102138 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240FEC_B5381C.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240FEC_B5381C.s @@ -25,7 +25,7 @@ glabel func_80240FEC_B5381C /* B5386C 8024103C 44801800 */ mtc1 $zero, $f3 /* B53870 80241040 46000021 */ cvt.d.s $f0, $f0 /* B53874 80241044 4620103C */ c.lt.d $f2, $f0 -/* B53878 80241048 00000000 */ nop +/* B53878 80241048 00000000 */ nop /* B5387C 8024104C 45000021 */ bc1f .L802410D4 /* B53880 80241050 27A50028 */ addiu $a1, $sp, 0x28 /* B53884 80241054 C6600038 */ lwc1 $f0, 0x38($s3) @@ -40,20 +40,20 @@ glabel func_80240FEC_B5381C /* B538A8 80241078 E7A00014 */ swc1 $f0, 0x14($sp) /* B538AC 8024107C 866200A8 */ lh $v0, 0xa8($s3) /* B538B0 80241080 44820000 */ mtc1 $v0, $f0 -/* B538B4 80241084 00000000 */ nop +/* B538B4 80241084 00000000 */ nop /* B538B8 80241088 46800020 */ cvt.s.w $f0, $f0 /* B538BC 8024108C E7A00018 */ swc1 $f0, 0x18($sp) /* B538C0 80241090 866200A6 */ lh $v0, 0xa6($s3) /* B538C4 80241094 27A6002C */ addiu $a2, $sp, 0x2c /* B538C8 80241098 44820000 */ mtc1 $v0, $f0 -/* B538CC 8024109C 00000000 */ nop +/* B538CC 8024109C 00000000 */ nop /* B538D0 802410A0 46800020 */ cvt.s.w $f0, $f0 /* B538D4 802410A4 E7A0001C */ swc1 $f0, 0x1c($sp) /* B538D8 802410A8 8E640080 */ lw $a0, 0x80($s3) /* B538DC 802410AC 0C037711 */ jal func_800DDC44 /* B538E0 802410B0 27A70030 */ addiu $a3, $sp, 0x30 /* B538E4 802410B4 10400003 */ beqz $v0, .L802410C4 -/* B538E8 802410B8 00000000 */ nop +/* B538E8 802410B8 00000000 */ nop /* B538EC 802410BC 08090435 */ j .L802410D4 /* B538F0 802410C0 AE600018 */ sw $zero, 0x18($s3) .L802410C4: @@ -67,7 +67,7 @@ glabel func_80240FEC_B5381C /* B5390C 802410DC 44801800 */ mtc1 $zero, $f3 /* B53910 802410E0 46000021 */ cvt.d.s $f0, $f0 /* B53914 802410E4 4622003C */ c.lt.d $f0, $f2 -/* B53918 802410E8 00000000 */ nop +/* B53918 802410E8 00000000 */ nop /* B5391C 802410EC 4500006C */ bc1f .L802412A0 /* B53920 802410F0 27B00028 */ addiu $s0, $sp, 0x28 /* B53924 802410F4 0200282D */ daddu $a1, $s0, $zero @@ -116,7 +116,7 @@ glabel func_80240FEC_B5381C /* B539D0 802411A0 0C0372DF */ jal func_800DCB7C /* B539D4 802411A4 0220382D */ daddu $a3, $s1, $zero /* B539D8 802411A8 1040003D */ beqz $v0, .L802412A0 -/* B539DC 802411AC 00000000 */ nop +/* B539DC 802411AC 00000000 */ nop /* B539E0 802411B0 C660001C */ lwc1 $f0, 0x1c($s3) /* B539E4 802411B4 C7A20038 */ lwc1 $f2, 0x38($sp) /* B539E8 802411B8 46000005 */ abs.s $f0, $f0 @@ -124,7 +124,7 @@ glabel func_80240FEC_B5381C /* B539F0 802411C0 46340000 */ add.d $f0, $f0, $f20 /* B539F4 802411C4 460010A1 */ cvt.d.s $f2, $f2 /* B539F8 802411C8 4620103E */ c.le.d $f2, $f0 -/* B539FC 802411CC 00000000 */ nop +/* B539FC 802411CC 00000000 */ nop /* B53A00 802411D0 45000033 */ bc1f .L802412A0 /* B53A04 802411D4 2403F7FF */ addiu $v1, $zero, -0x801 /* B53A08 802411D8 C7A0002C */ lwc1 $f0, 0x2c($sp) @@ -163,7 +163,7 @@ glabel func_80240FEC_B5381C /* B53A8C 8024125C 2402000F */ addiu $v0, $zero, 0xf /* B53A90 80241260 AFA2001C */ sw $v0, 0x1c($sp) /* B53A94 80241264 44834000 */ mtc1 $v1, $f8 -/* B53A98 80241268 00000000 */ nop +/* B53A98 80241268 00000000 */ nop /* B53A9C 8024126C 46804220 */ cvt.s.w $f8, $f8 /* B53AA0 80241270 44074000 */ mfc1 $a3, $f8 /* B53AA4 80241274 27A2003C */ addiu $v0, $sp, 0x3c diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s index e1ee49cbee..34f793fb0b 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s @@ -76,7 +76,7 @@ glabel func_80241330_B53B60 /* B53C78 80241448 8E4300B0 */ lw $v1, 0xb0($s2) /* B53C7C 8024144C 30620004 */ andi $v0, $v1, 4 /* B53C80 80241450 10400007 */ beqz $v0, .L80241470 -/* B53C84 80241454 00000000 */ nop +/* B53C84 80241454 00000000 */ nop /* B53C88 80241458 824200B4 */ lb $v0, 0xb4($s2) /* B53C8C 8024145C 14400034 */ bnez $v0, .L80241530 /* B53C90 80241460 0000102D */ daddu $v0, $zero, $zero @@ -88,21 +88,24 @@ glabel func_80241330_B53B60 /* B53CA4 80241474 2C62000F */ sltiu $v0, $v1, 0xf /* B53CA8 80241478 1040002C */ beqz $v0, .L8024152C /* B53CAC 8024147C 00031080 */ sll $v0, $v1, 2 -/* B53CB0 80241480 3C018024 */ lui $at, %hi(D_80246CB8) +/* B53CB0 80241480 3C018024 */ lui $at, %hi(jtbl_80246CB8_B594E8) /* B53CB4 80241484 00220821 */ addu $at, $at, $v0 -/* B53CB8 80241488 8C226CB8 */ lw $v0, %lo(D_80246CB8)($at) +/* B53CB8 80241488 8C226CB8 */ lw $v0, %lo(jtbl_80246CB8_B594E8)($at) /* B53CBC 8024148C 00400008 */ jr $v0 -/* B53CC0 80241490 00000000 */ nop +/* B53CC0 80241490 00000000 */ nop +glabel L80241494_B53CC4 /* B53CC4 80241494 0260202D */ daddu $a0, $s3, $zero /* B53CC8 80241498 0280282D */ daddu $a1, $s4, $zero /* B53CCC 8024149C 0C0901D0 */ jal func_80240740_B52F70 /* B53CD0 802414A0 0200302D */ daddu $a2, $s0, $zero +glabel L802414A4_B53CD4 /* B53CD4 802414A4 0260202D */ daddu $a0, $s3, $zero /* B53CD8 802414A8 0280282D */ daddu $a1, $s4, $zero /* B53CDC 802414AC 0C09025C */ jal func_80240970_B531A0 /* B53CE0 802414B0 0200302D */ daddu $a2, $s0, $zero /* B53CE4 802414B4 0809054C */ j .L80241530 /* B53CE8 802414B8 0000102D */ daddu $v0, $zero, $zero +glabel L802414BC_B53CEC /* B53CEC 802414BC 0260202D */ daddu $a0, $s3, $zero /* B53CF0 802414C0 0280282D */ daddu $a1, $s4, $zero /* B53CF4 802414C4 0C09032A */ jal jan_06_UnkNpcAIFunc1 @@ -111,27 +114,32 @@ glabel func_80241330_B53B60 /* B53D00 802414D0 24020003 */ addiu $v0, $zero, 3 /* B53D04 802414D4 14620016 */ bne $v1, $v0, .L80241530 /* B53D08 802414D8 0000102D */ daddu $v0, $zero, $zero +glabel L802414DC_B53D0C /* B53D0C 802414DC 0260202D */ daddu $a0, $s3, $zero /* B53D10 802414E0 0280282D */ daddu $a1, $s4, $zero /* B53D14 802414E4 0C09035A */ jal delete_player_actor /* B53D18 802414E8 0200302D */ daddu $a2, $s0, $zero /* B53D1C 802414EC 0809054C */ j .L80241530 /* B53D20 802414F0 0000102D */ daddu $v0, $zero, $zero +glabel L802414F4_B53D24 /* B53D24 802414F4 0260202D */ daddu $a0, $s3, $zero /* B53D28 802414F8 0280282D */ daddu $a1, $s4, $zero /* B53D2C 802414FC 0C0903C3 */ jal func_80240F0C_B5373C /* B53D30 80241500 0200302D */ daddu $a2, $s0, $zero +glabel L80241504_B53D34 /* B53D34 80241504 0260202D */ daddu $a0, $s3, $zero /* B53D38 80241508 0280282D */ daddu $a1, $s4, $zero /* B53D3C 8024150C 0C0903FB */ jal func_80240FEC_B5381C /* B53D40 80241510 0200302D */ daddu $a2, $s0, $zero /* B53D44 80241514 0809054C */ j .L80241530 /* B53D48 80241518 0000102D */ daddu $v0, $zero, $zero +glabel L8024151C_B53D4C /* B53D4C 8024151C 0260202D */ daddu $a0, $s3, $zero /* B53D50 80241520 0280282D */ daddu $a1, $s4, $zero /* B53D54 80241524 0C0904BB */ jal jan_06_UnkDurationCheck /* B53D58 80241528 0200302D */ daddu $a2, $s0, $zero .L8024152C: +glabel L8024152C_B53D5C /* B53D5C 8024152C 0000102D */ daddu $v0, $zero, $zero .L80241530: /* B53D60 80241530 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241554_B53D84.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241554_B53D84.s index 75c16bc8a9..1f200e64af 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241554_B53D84.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241554_B53D84.s @@ -29,7 +29,7 @@ glabel func_80241554_B53D84 /* B53DE4 802415B4 46220000 */ add.d $f0, $f0, $f2 /* B53DE8 802415B8 AFA00014 */ sw $zero, 0x14($sp) /* B53DEC 802415BC 44831000 */ mtc1 $v1, $f2 -/* B53DF0 802415C0 00000000 */ nop +/* B53DF0 802415C0 00000000 */ nop /* B53DF4 802415C4 468010A0 */ cvt.s.w $f2, $f2 /* B53DF8 802415C8 46022100 */ add.s $f4, $f4, $f2 /* B53DFC 802415CC 8E050038 */ lw $a1, 0x38($s0) diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241658_B53E88.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241658_B53E88.s index c16a360a23..25f1f9b487 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241658_B53E88.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241658_B53E88.s @@ -31,17 +31,19 @@ glabel func_80241658_B53E88 /* B53EE8 802416B8 2C620006 */ sltiu $v0, $v1, 6 /* B53EEC 802416BC 1040004D */ beqz $v0, .L802417F4 /* B53EF0 802416C0 00031080 */ sll $v0, $v1, 2 -/* B53EF4 802416C4 3C018024 */ lui $at, %hi(D_80246CF8) +/* B53EF4 802416C4 3C018024 */ lui $at, %hi(jtbl_80246CF8_B59528) /* B53EF8 802416C8 00220821 */ addu $at, $at, $v0 -/* B53EFC 802416CC 8C226CF8 */ lw $v0, %lo(D_80246CF8)($at) +/* B53EFC 802416CC 8C226CF8 */ lw $v0, %lo(jtbl_80246CF8_B59528)($at) /* B53F00 802416D0 00400008 */ jr $v0 -/* B53F04 802416D4 00000000 */ nop +/* B53F04 802416D4 00000000 */ nop +glabel L802416D8_B53F08 /* B53F08 802416D8 3C030042 */ lui $v1, 0x42 /* B53F0C 802416DC 3463000F */ ori $v1, $v1, 0xf /* B53F10 802416E0 24020002 */ addiu $v0, $zero, 2 /* B53F14 802416E4 AE02006C */ sw $v0, 0x6c($s0) /* B53F18 802416E8 AE000070 */ sw $zero, 0x70($s0) /* B53F1C 802416EC AE230028 */ sw $v1, 0x28($s1) +glabel L802416F0_B53F20 /* B53F20 802416F0 8E020070 */ lw $v0, 0x70($s0) /* B53F24 802416F4 24420001 */ addiu $v0, $v0, 1 /* B53F28 802416F8 AE020070 */ sw $v0, 0x70($s0) @@ -50,12 +52,14 @@ glabel func_80241658_B53E88 /* B53F34 80241704 24020005 */ addiu $v0, $zero, 5 /* B53F38 80241708 080905FD */ j .L802417F4 /* B53F3C 8024170C AE02006C */ sw $v0, 0x6c($s0) +glabel L80241710_B53F40 /* B53F40 80241710 3C030042 */ lui $v1, 0x42 /* B53F44 80241714 34630010 */ ori $v1, $v1, 0x10 /* B53F48 80241718 24020004 */ addiu $v0, $zero, 4 /* B53F4C 8024171C AE02006C */ sw $v0, 0x6c($s0) /* B53F50 80241720 AE000070 */ sw $zero, 0x70($s0) /* B53F54 80241724 AE230028 */ sw $v1, 0x28($s1) +glabel L80241728_B53F58 /* B53F58 80241728 8E020070 */ lw $v0, 0x70($s0) /* B53F5C 8024172C 24030019 */ addiu $v1, $zero, 0x19 /* B53F60 80241730 24420001 */ addiu $v0, $v0, 1 @@ -63,7 +67,7 @@ glabel func_80241658_B53E88 /* B53F68 80241738 AE020070 */ sw $v0, 0x70($s0) /* B53F6C 8024173C 3C0142B4 */ lui $at, 0x42b4 /* B53F70 80241740 44810000 */ mtc1 $at, $f0 -/* B53F74 80241744 00000000 */ nop +/* B53F74 80241744 00000000 */ nop /* B53F78 80241748 E620000C */ swc1 $f0, 0xc($s1) .L8024174C: /* B53F7C 8024174C 8E020070 */ lw $v0, 0x70($s0) @@ -72,6 +76,7 @@ glabel func_80241658_B53E88 /* B53F88 80241758 24020005 */ addiu $v0, $zero, 5 /* B53F8C 8024175C 080905FD */ j .L802417F4 /* B53F90 80241760 AE02006C */ sw $v0, 0x6c($s0) +glabel L80241764_B53F94 /* B53F94 80241764 3C030042 */ lui $v1, 0x42 /* B53F98 80241768 24020006 */ addiu $v0, $zero, 6 /* B53F9C 8024176C 34630003 */ ori $v1, $v1, 3 @@ -83,7 +88,7 @@ glabel func_80241658_B53E88 /* B53FB4 80241784 AFA00014 */ sw $zero, 0x14($sp) /* B53FB8 80241788 AFA20018 */ sw $v0, 0x18($sp) /* B53FBC 8024178C 44840000 */ mtc1 $a0, $f0 -/* B53FC0 80241790 00000000 */ nop +/* B53FC0 80241790 00000000 */ nop /* B53FC4 80241794 46800020 */ cvt.s.w $f0, $f0 /* B53FC8 80241798 E7A00010 */ swc1 $f0, 0x10($sp) /* B53FCC 8024179C 8E250038 */ lw $a1, 0x38($s1) @@ -91,12 +96,13 @@ glabel func_80241658_B53E88 /* B53FD4 802417A4 8E270040 */ lw $a3, 0x40($s1) /* B53FD8 802417A8 0C01C1E4 */ jal fx_sweat /* B53FDC 802417AC 0000202D */ daddu $a0, $zero, $zero +glabel L802417B0_B53FE0 /* B53FE0 802417B0 8E020070 */ lw $v0, 0x70($s0) /* B53FE4 802417B4 24420001 */ addiu $v0, $v0, 1 /* B53FE8 802417B8 AE020070 */ sw $v0, 0x70($s0) /* B53FEC 802417BC 2842000B */ slti $v0, $v0, 0xb /* B53FF0 802417C0 1440000C */ bnez $v0, .L802417F4 -/* B53FF4 802417C4 00000000 */ nop +/* B53FF4 802417C4 00000000 */ nop /* B53FF8 802417C8 0C00A67F */ jal rand_int /* B53FFC 802417CC 24040064 */ addiu $a0, $zero, 0x64 /* B54000 802417D0 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241A24_B54254.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241A24_B54254.s index c185ebf952..6795293932 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241A24_B54254.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241A24_B54254.s @@ -42,7 +42,7 @@ glabel func_80241A24_B54254 /* B542E8 80241AB8 C6620074 */ lwc1 $f2, 0x74($s3) /* B542EC 80241ABC 468010A0 */ cvt.s.w $f2, $f2 /* B542F0 80241AC0 4600103C */ c.lt.s $f2, $f0 -/* B542F4 80241AC4 00000000 */ nop +/* B542F4 80241AC4 00000000 */ nop /* B542F8 80241AC8 45030001 */ bc1tl .L80241AD0 /* B542FC 80241ACC 0000882D */ daddu $s1, $zero, $zero .L80241AD0: @@ -51,16 +51,16 @@ glabel func_80241A24_B54254 /* B54308 80241AD8 3C014387 */ lui $at, 0x4387 /* B5430C 80241ADC 4481A000 */ mtc1 $at, $f20 /* B54310 80241AE0 0C00A70A */ jal get_clamped_angle_diff -/* B54314 80241AE4 00000000 */ nop +/* B54314 80241AE4 00000000 */ nop /* B54318 80241AE8 0C00A6C9 */ jal clamp_angle /* B5431C 80241AEC 46000306 */ mov.s $f12, $f0 /* B54320 80241AF0 3C018024 */ lui $at, %hi(func_80246D10) /* B54324 80241AF4 D4226D10 */ ldc1 $f2, %lo(func_80246D10)($at) /* B54328 80241AF8 46000021 */ cvt.d.s $f0, $f0 /* B5432C 80241AFC 4622003C */ c.lt.d $f0, $f2 -/* B54330 80241B00 00000000 */ nop +/* B54330 80241B00 00000000 */ nop /* B54334 80241B04 45000003 */ bc1f .L80241B14 -/* B54338 80241B08 00000000 */ nop +/* B54338 80241B08 00000000 */ nop /* B5433C 80241B0C 3C0142B4 */ lui $at, 0x42b4 /* B54340 80241B10 4481A000 */ mtc1 $at, $f20 .L80241B14: @@ -77,7 +77,7 @@ glabel func_80241A24_B54254 /* B5436C 80241B3C 468010A0 */ cvt.s.w $f2, $f2 /* B54370 80241B40 46000005 */ abs.s $f0, $f0 /* B54374 80241B44 4600103C */ c.lt.s $f2, $f0 -/* B54378 80241B48 00000000 */ nop +/* B54378 80241B48 00000000 */ nop /* B5437C 80241B4C 45030001 */ bc1tl .L80241B54 /* B54380 80241B50 0000882D */ daddu $s1, $zero, $zero .L80241B54: @@ -87,13 +87,13 @@ glabel func_80241A24_B54254 /* B54390 80241B60 860200A8 */ lh $v0, 0xa8($s0) /* B54394 80241B64 46020001 */ sub.s $f0, $f0, $f2 /* B54398 80241B68 44821000 */ mtc1 $v0, $f2 -/* B5439C 80241B6C 00000000 */ nop +/* B5439C 80241B6C 00000000 */ nop /* B543A0 80241B70 468010A1 */ cvt.d.w $f2, $f2 /* B543A4 80241B74 46221080 */ add.d $f2, $f2, $f2 /* B543A8 80241B78 46000005 */ abs.s $f0, $f0 /* B543AC 80241B7C 46000021 */ cvt.d.s $f0, $f0 /* B543B0 80241B80 4620103E */ c.le.d $f2, $f0 -/* B543B4 80241B84 00000000 */ nop +/* B543B4 80241B84 00000000 */ nop /* B543B8 80241B88 45030001 */ bc1tl .L80241B90 /* B543BC 80241B8C 0000882D */ daddu $s1, $zero, $zero .L80241B90: diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241BD8_B54408.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241BD8_B54408.s index b76c33d5f5..ed7213509c 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241BD8_B54408.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241BD8_B54408.s @@ -19,7 +19,7 @@ glabel func_80241BD8_B54408 /* B54440 80241C10 8E2200B0 */ lw $v0, 0xb0($s1) /* B54444 80241C14 30420004 */ andi $v0, $v0, 4 /* B54448 80241C18 10400015 */ beqz $v0, .L80241C70 -/* B5444C 80241C1C 00000000 */ nop +/* B5444C 80241C1C 00000000 */ nop .L80241C20: /* B54450 80241C20 AE800070 */ sw $zero, 0x70($s4) /* B54454 80241C24 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel func_80241BD8_B54408 /* B544A4 80241C74 12600005 */ beqz $s3, .L80241C8C /* B544A8 80241C78 24020001 */ addiu $v0, $zero, 1 /* B544AC 80241C7C 12620048 */ beq $s3, $v0, .L80241DA0 -/* B544B0 80241C80 00000000 */ nop +/* B544B0 80241C80 00000000 */ nop /* B544B4 80241C84 08090785 */ j .L80241E14 -/* B544B8 80241C88 00000000 */ nop +/* B544B8 80241C88 00000000 */ nop .L80241C8C: /* B544BC 80241C8C 86240008 */ lh $a0, 8($s1) /* B544C0 80241C90 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel func_80241BD8_B54408 /* B544E0 80241CB0 8E03006C */ lw $v1, 0x6c($s0) /* B544E4 80241CB4 24020003 */ addiu $v0, $zero, 3 /* B544E8 80241CB8 14620056 */ bne $v1, $v0, .L80241E14 -/* B544EC 80241CBC 00000000 */ nop +/* B544EC 80241CBC 00000000 */ nop /* B544F0 80241CC0 8E2500A8 */ lw $a1, 0xa8($s1) /* B544F4 80241CC4 10A00003 */ beqz $a1, .L80241CD4 /* B544F8 80241CC8 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel func_80241BD8_B54408 /* B54570 80241D40 C7A20014 */ lwc1 $f2, 0x14($sp) /* B54574 80241D44 4600020D */ trunc.w.s $f8, $f0 /* B54578 80241D48 44024000 */ mfc1 $v0, $f8 -/* B5457C 80241D4C 00000000 */ nop +/* B5457C 80241D4C 00000000 */ nop /* B54580 80241D50 A6220012 */ sh $v0, 0x12($s1) /* B54584 80241D54 4600120D */ trunc.w.s $f8, $f2 /* B54588 80241D58 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s index aba32b93d9..9e213777a1 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s @@ -100,78 +100,93 @@ glabel func_80241E38_B54668 /* B547CC 80241F9C 2C620064 */ sltiu $v0, $v1, 0x64 /* B547D0 80241FA0 10400048 */ beqz $v0, .L802420C4 /* B547D4 80241FA4 00031080 */ sll $v0, $v1, 2 -/* B547D8 80241FA8 3C018024 */ lui $at, %hi(D_80246D18) +/* B547D8 80241FA8 3C018024 */ lui $at, %hi(jtbl_80246D18_B59548) /* B547DC 80241FAC 00220821 */ addu $at, $at, $v0 -/* B547E0 80241FB0 8C226D18 */ lw $v0, %lo(D_80246D18)($at) +/* B547E0 80241FB0 8C226D18 */ lw $v0, %lo(jtbl_80246D18_B59548)($at) /* B547E4 80241FB4 00400008 */ jr $v0 /* B547E8 80241FB8 00000000 */ nop +glabel L80241FBC_B547EC /* B547EC 80241FBC 0240202D */ daddu $a0, $s2, $zero /* B547F0 80241FC0 0260282D */ daddu $a1, $s3, $zero /* B547F4 80241FC4 0C012568 */ jal func_800495A0 /* B547F8 80241FC8 0280302D */ daddu $a2, $s4, $zero +glabel L80241FCC_B547FC /* B547FC 80241FCC 0240202D */ daddu $a0, $s2, $zero /* B54800 80241FD0 0260282D */ daddu $a1, $s3, $zero /* B54804 80241FD4 0C0125AE */ jal func_800496B8 /* B54808 80241FD8 0280302D */ daddu $a2, $s4, $zero /* B5480C 80241FDC 08090831 */ j .L802420C4 /* B54810 80241FE0 00000000 */ nop +glabel L80241FE4_B54814 /* B54814 80241FE4 0240202D */ daddu $a0, $s2, $zero /* B54818 80241FE8 0260282D */ daddu $a1, $s3, $zero /* B5481C 80241FEC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* B54820 80241FF0 0280302D */ daddu $a2, $s4, $zero +glabel L80241FF4_B54824 /* B54824 80241FF4 0240202D */ daddu $a0, $s2, $zero /* B54828 80241FF8 0260282D */ daddu $a1, $s3, $zero /* B5482C 80241FFC 0C012701 */ jal func_80049C04 /* B54830 80242000 0280302D */ daddu $a2, $s4, $zero /* B54834 80242004 08090831 */ j .L802420C4 /* B54838 80242008 00000000 */ nop +glabel L8024200C_B5483C /* B5483C 8024200C 0240202D */ daddu $a0, $s2, $zero /* B54840 80242010 0260282D */ daddu $a1, $s3, $zero /* B54844 80242014 0C01278F */ jal func_80049E3C /* B54848 80242018 0280302D */ daddu $a2, $s4, $zero +glabel L8024201C_B5484C /* B5484C 8024201C 0240202D */ daddu $a0, $s2, $zero /* B54850 80242020 0260282D */ daddu $a1, $s3, $zero /* B54854 80242024 0C0127B3 */ jal func_80049ECC /* B54858 80242028 0280302D */ daddu $a2, $s4, $zero /* B5485C 8024202C 08090831 */ j .L802420C4 /* B54860 80242030 00000000 */ nop +glabel L80242034_B54864 /* B54864 80242034 0240202D */ daddu $a0, $s2, $zero /* B54868 80242038 0260282D */ daddu $a1, $s3, $zero /* B5486C 8024203C 0C0127DF */ jal func_80049F7C /* B54870 80242040 0280302D */ daddu $a2, $s4, $zero +glabel L80242044_B54874 /* B54874 80242044 0240202D */ daddu $a0, $s2, $zero /* B54878 80242048 0260282D */ daddu $a1, $s3, $zero /* B5487C 8024204C 0C012849 */ jal func_8004A124 /* B54880 80242050 0280302D */ daddu $a2, $s4, $zero /* B54884 80242054 08090831 */ j .L802420C4 /* B54888 80242058 00000000 */ nop +glabel L8024205C_B5488C /* B5488C 8024205C 0240202D */ daddu $a0, $s2, $zero /* B54890 80242060 0260282D */ daddu $a1, $s3, $zero /* B54894 80242064 0C0128FA */ jal func_8004A3E8 /* B54898 80242068 0280302D */ daddu $a2, $s4, $zero /* B5489C 8024206C 08090831 */ j .L802420C4 /* B548A0 80242070 00000000 */ nop +glabel L80242074_B548A4 /* B548A4 80242074 0C090607 */ jal jan_06_UnkNpcAIFunc6 /* B548A8 80242078 0240202D */ daddu $a0, $s2, $zero +glabel L8024207C_B548AC /* B548AC 8024207C 0C090622 */ jal jan_06_UnkNpcAIFunc7 /* B548B0 80242080 0240202D */ daddu $a0, $s2, $zero /* B548B4 80242084 8E430070 */ lw $v1, 0x70($s2) /* B548B8 80242088 24020020 */ addiu $v0, $zero, 0x20 /* B548BC 8024208C 1462000D */ bne $v1, $v0, .L802420C4 /* B548C0 80242090 00000000 */ nop +glabel L80242094_B548C4 /* B548C4 80242094 0C09063E */ jal jan_06_UnkNpcAIFunc8 /* B548C8 80242098 0240202D */ daddu $a0, $s2, $zero /* B548CC 8024209C 8E430070 */ lw $v1, 0x70($s2) /* B548D0 802420A0 24020021 */ addiu $v0, $zero, 0x21 /* B548D4 802420A4 14620007 */ bne $v1, $v0, .L802420C4 /* B548D8 802420A8 00000000 */ nop +glabel L802420AC_B548DC /* B548DC 802420AC 0C090674 */ jal jan_06_UnkNpcAIFunc5 /* B548E0 802420B0 0240202D */ daddu $a0, $s2, $zero /* B548E4 802420B4 08090831 */ j .L802420C4 /* B548E8 802420B8 00000000 */ nop +glabel L802420BC_B548EC /* B548EC 802420BC 0C0129CF */ jal func_8004A73C /* B548F0 802420C0 0240202D */ daddu $a0, $s2, $zero .L802420C4: +glabel L802420C4_B548F4 /* B548F4 802420C4 8FBF0048 */ lw $ra, 0x48($sp) /* B548F8 802420C8 8FB50044 */ lw $s5, 0x44($sp) /* B548FC 802420CC 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s index 1c839d9cd1..dea3891fae 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s @@ -46,7 +46,7 @@ glabel func_802420EC_B5491C /* B549C0 80242190 8E2200B0 */ lw $v0, 0xb0($s1) /* B549C4 80242194 30420004 */ andi $v0, $v0, 4 /* B549C8 80242198 10400020 */ beqz $v0, .L8024221C -/* B549CC 8024219C 00000000 */ nop +/* B549CC 8024219C 00000000 */ nop .L802421A0: /* B549D0 802421A0 2404F7FF */ addiu $a0, $zero, -0x801 /* B549D4 802421A4 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_802420EC_B5491C /* B54A4C 8024221C 8E420070 */ lw $v0, 0x70($s2) /* B54A50 80242220 2842001E */ slti $v0, $v0, 0x1e /* B54A54 80242224 10400009 */ beqz $v0, .L8024224C -/* B54A58 80242228 00000000 */ nop +/* B54A58 80242228 00000000 */ nop /* B54A5C 8024222C 8E22006C */ lw $v0, 0x6c($s1) /* B54A60 80242230 14400006 */ bnez $v0, .L8024224C -/* B54A64 80242234 00000000 */ nop +/* B54A64 80242234 00000000 */ nop /* B54A68 80242238 0C090689 */ jal func_80241A24_B54254 /* B54A6C 8024223C 0240202D */ daddu $a0, $s2, $zero /* B54A70 80242240 10400002 */ beqz $v0, .L8024224C @@ -100,78 +100,93 @@ glabel func_802420EC_B5491C /* B54A80 80242250 2C620064 */ sltiu $v0, $v1, 0x64 /* B54A84 80242254 10400048 */ beqz $v0, .L80242378 /* B54A88 80242258 00031080 */ sll $v0, $v1, 2 -/* B54A8C 8024225C 3C018024 */ lui $at, %hi(D_80246EA8) +/* B54A8C 8024225C 3C018024 */ lui $at, %hi(jtbl_80246EA8_B596D8) /* B54A90 80242260 00220821 */ addu $at, $at, $v0 -/* B54A94 80242264 8C226EA8 */ lw $v0, %lo(D_80246EA8)($at) +/* B54A94 80242264 8C226EA8 */ lw $v0, %lo(jtbl_80246EA8_B596D8)($at) /* B54A98 80242268 00400008 */ jr $v0 -/* B54A9C 8024226C 00000000 */ nop +/* B54A9C 8024226C 00000000 */ nop +glabel L80242270_B54AA0 /* B54AA0 80242270 0240202D */ daddu $a0, $s2, $zero /* B54AA4 80242274 0260282D */ daddu $a1, $s3, $zero /* B54AA8 80242278 0C012568 */ jal func_800495A0 /* B54AAC 8024227C 0280302D */ daddu $a2, $s4, $zero +glabel L80242280_B54AB0 /* B54AB0 80242280 0240202D */ daddu $a0, $s2, $zero /* B54AB4 80242284 0260282D */ daddu $a1, $s3, $zero /* B54AB8 80242288 0C0125AE */ jal func_800496B8 /* B54ABC 8024228C 0280302D */ daddu $a2, $s4, $zero /* B54AC0 80242290 080908DE */ j .L80242378 -/* B54AC4 80242294 00000000 */ nop +/* B54AC4 80242294 00000000 */ nop +glabel L80242298_B54AC8 /* B54AC8 80242298 0240202D */ daddu $a0, $s2, $zero /* B54ACC 8024229C 0260282D */ daddu $a1, $s3, $zero /* B54AD0 802422A0 0C090582 */ jal jan_06_UnkNpcAIFunc4 /* B54AD4 802422A4 0280302D */ daddu $a2, $s4, $zero +glabel L802422A8_B54AD8 /* B54AD8 802422A8 0240202D */ daddu $a0, $s2, $zero /* B54ADC 802422AC 0260282D */ daddu $a1, $s3, $zero /* B54AE0 802422B0 0C090596 */ jal func_80241658_B53E88 /* B54AE4 802422B4 0280302D */ daddu $a2, $s4, $zero /* B54AE8 802422B8 080908DE */ j .L80242378 -/* B54AEC 802422BC 00000000 */ nop +/* B54AEC 802422BC 00000000 */ nop +glabel L802422C0_B54AF0 /* B54AF0 802422C0 0240202D */ daddu $a0, $s2, $zero /* B54AF4 802422C4 0260282D */ daddu $a1, $s3, $zero /* B54AF8 802422C8 0C01278F */ jal func_80049E3C /* B54AFC 802422CC 0280302D */ daddu $a2, $s4, $zero +glabel L802422D0_B54B00 /* B54B00 802422D0 0240202D */ daddu $a0, $s2, $zero /* B54B04 802422D4 0260282D */ daddu $a1, $s3, $zero /* B54B08 802422D8 0C0127B3 */ jal func_80049ECC /* B54B0C 802422DC 0280302D */ daddu $a2, $s4, $zero /* B54B10 802422E0 080908DE */ j .L80242378 -/* B54B14 802422E4 00000000 */ nop +/* B54B14 802422E4 00000000 */ nop +glabel L802422E8_B54B18 /* B54B18 802422E8 0240202D */ daddu $a0, $s2, $zero /* B54B1C 802422EC 0260282D */ daddu $a1, $s3, $zero /* B54B20 802422F0 0C0127DF */ jal func_80049F7C /* B54B24 802422F4 0280302D */ daddu $a2, $s4, $zero +glabel L802422F8_B54B28 /* B54B28 802422F8 0240202D */ daddu $a0, $s2, $zero /* B54B2C 802422FC 0260282D */ daddu $a1, $s3, $zero /* B54B30 80242300 0C012849 */ jal func_8004A124 /* B54B34 80242304 0280302D */ daddu $a2, $s4, $zero /* B54B38 80242308 080908DE */ j .L80242378 -/* B54B3C 8024230C 00000000 */ nop +/* B54B3C 8024230C 00000000 */ nop +glabel L80242310_B54B40 /* B54B40 80242310 0240202D */ daddu $a0, $s2, $zero /* B54B44 80242314 0260282D */ daddu $a1, $s3, $zero /* B54B48 80242318 0C0128FA */ jal func_8004A3E8 /* B54B4C 8024231C 0280302D */ daddu $a2, $s4, $zero /* B54B50 80242320 080908DE */ j .L80242378 -/* B54B54 80242324 00000000 */ nop +/* B54B54 80242324 00000000 */ nop +glabel L80242328_B54B58 /* B54B58 80242328 0C090607 */ jal jan_06_UnkNpcAIFunc6 /* B54B5C 8024232C 0240202D */ daddu $a0, $s2, $zero +glabel L80242330_B54B60 /* B54B60 80242330 0C090622 */ jal jan_06_UnkNpcAIFunc7 /* B54B64 80242334 0240202D */ daddu $a0, $s2, $zero /* B54B68 80242338 8E430070 */ lw $v1, 0x70($s2) /* B54B6C 8024233C 24020020 */ addiu $v0, $zero, 0x20 /* B54B70 80242340 1462000D */ bne $v1, $v0, .L80242378 -/* B54B74 80242344 00000000 */ nop +/* B54B74 80242344 00000000 */ nop +glabel L80242348_B54B78 /* B54B78 80242348 0C09063E */ jal jan_06_UnkNpcAIFunc8 /* B54B7C 8024234C 0240202D */ daddu $a0, $s2, $zero /* B54B80 80242350 8E430070 */ lw $v1, 0x70($s2) /* B54B84 80242354 24020021 */ addiu $v0, $zero, 0x21 /* B54B88 80242358 14620007 */ bne $v1, $v0, .L80242378 -/* B54B8C 8024235C 00000000 */ nop +/* B54B8C 8024235C 00000000 */ nop +glabel L80242360_B54B90 /* B54B90 80242360 0C090674 */ jal jan_06_UnkNpcAIFunc5 /* B54B94 80242364 0240202D */ daddu $a0, $s2, $zero /* B54B98 80242368 080908DE */ j .L80242378 -/* B54B9C 8024236C 00000000 */ nop +/* B54B9C 8024236C 00000000 */ nop +glabel L80242370_B54BA0 /* B54BA0 80242370 0C0129CF */ jal func_8004A73C /* B54BA4 80242374 0240202D */ daddu $a0, $s2, $zero .L80242378: +glabel L80242378_B54BA8 /* B54BA8 80242378 8FBF0048 */ lw $ra, 0x48($sp) /* B54BAC 8024237C 8FB50044 */ lw $s5, 0x44($sp) /* B54BB0 80242380 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240050_B598C0.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240050_B598C0.s index 59c9bcfee3..9a7f2a1f28 100644 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240050_B598C0.s +++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240050_B598C0.s @@ -31,17 +31,19 @@ glabel func_80240050_B598C0 /* B59920 802400B0 2C620006 */ sltiu $v0, $v1, 6 /* B59924 802400B4 1040004D */ beqz $v0, .L802401EC /* B59928 802400B8 00031080 */ sll $v0, $v1, 2 -/* B5992C 802400BC 3C018024 */ lui $at, %hi(D_80244700) +/* B5992C 802400BC 3C018024 */ lui $at, %hi(jtbl_80244700_B5DF70) /* B59930 802400C0 00220821 */ addu $at, $at, $v0 -/* B59934 802400C4 8C224700 */ lw $v0, %lo(D_80244700)($at) +/* B59934 802400C4 8C224700 */ lw $v0, %lo(jtbl_80244700_B5DF70)($at) /* B59938 802400C8 00400008 */ jr $v0 -/* B5993C 802400CC 00000000 */ nop +/* B5993C 802400CC 00000000 */ nop +glabel L802400D0_B59940 /* B59940 802400D0 3C030042 */ lui $v1, 0x42 /* B59944 802400D4 3463000F */ ori $v1, $v1, 0xf /* B59948 802400D8 24020002 */ addiu $v0, $zero, 2 /* B5994C 802400DC AE02006C */ sw $v0, 0x6c($s0) /* B59950 802400E0 AE000070 */ sw $zero, 0x70($s0) /* B59954 802400E4 AE230028 */ sw $v1, 0x28($s1) +glabel L802400E8_B59958 /* B59958 802400E8 8E020070 */ lw $v0, 0x70($s0) /* B5995C 802400EC 24420001 */ addiu $v0, $v0, 1 /* B59960 802400F0 AE020070 */ sw $v0, 0x70($s0) @@ -50,12 +52,14 @@ glabel func_80240050_B598C0 /* B5996C 802400FC 24020005 */ addiu $v0, $zero, 5 /* B59970 80240100 0809007B */ j .L802401EC /* B59974 80240104 AE02006C */ sw $v0, 0x6c($s0) +glabel L80240108_B59978 /* B59978 80240108 3C030042 */ lui $v1, 0x42 /* B5997C 8024010C 34630010 */ ori $v1, $v1, 0x10 /* B59980 80240110 24020004 */ addiu $v0, $zero, 4 /* B59984 80240114 AE02006C */ sw $v0, 0x6c($s0) /* B59988 80240118 AE000070 */ sw $zero, 0x70($s0) /* B5998C 8024011C AE230028 */ sw $v1, 0x28($s1) +glabel L80240120_B59990 /* B59990 80240120 8E020070 */ lw $v0, 0x70($s0) /* B59994 80240124 24030019 */ addiu $v1, $zero, 0x19 /* B59998 80240128 24420001 */ addiu $v0, $v0, 1 @@ -63,7 +67,7 @@ glabel func_80240050_B598C0 /* B599A0 80240130 AE020070 */ sw $v0, 0x70($s0) /* B599A4 80240134 3C0142B4 */ lui $at, 0x42b4 /* B599A8 80240138 44810000 */ mtc1 $at, $f0 -/* B599AC 8024013C 00000000 */ nop +/* B599AC 8024013C 00000000 */ nop /* B599B0 80240140 E620000C */ swc1 $f0, 0xc($s1) .L80240144: /* B599B4 80240144 8E020070 */ lw $v0, 0x70($s0) @@ -72,6 +76,7 @@ glabel func_80240050_B598C0 /* B599C0 80240150 24020005 */ addiu $v0, $zero, 5 /* B599C4 80240154 0809007B */ j .L802401EC /* B599C8 80240158 AE02006C */ sw $v0, 0x6c($s0) +glabel L8024015C_B599CC /* B599CC 8024015C 3C030042 */ lui $v1, 0x42 /* B599D0 80240160 24020006 */ addiu $v0, $zero, 6 /* B599D4 80240164 34630003 */ ori $v1, $v1, 3 @@ -83,7 +88,7 @@ glabel func_80240050_B598C0 /* B599EC 8024017C AFA00014 */ sw $zero, 0x14($sp) /* B599F0 80240180 AFA20018 */ sw $v0, 0x18($sp) /* B599F4 80240184 44840000 */ mtc1 $a0, $f0 -/* B599F8 80240188 00000000 */ nop +/* B599F8 80240188 00000000 */ nop /* B599FC 8024018C 46800020 */ cvt.s.w $f0, $f0 /* B59A00 80240190 E7A00010 */ swc1 $f0, 0x10($sp) /* B59A04 80240194 8E250038 */ lw $a1, 0x38($s1) @@ -91,12 +96,13 @@ glabel func_80240050_B598C0 /* B59A0C 8024019C 8E270040 */ lw $a3, 0x40($s1) /* B59A10 802401A0 0C01C1E4 */ jal fx_sweat /* B59A14 802401A4 0000202D */ daddu $a0, $zero, $zero +glabel L802401A8_B59A18 /* B59A18 802401A8 8E020070 */ lw $v0, 0x70($s0) /* B59A1C 802401AC 24420001 */ addiu $v0, $v0, 1 /* B59A20 802401B0 AE020070 */ sw $v0, 0x70($s0) /* B59A24 802401B4 2842000B */ slti $v0, $v0, 0xb /* B59A28 802401B8 1440000C */ bnez $v0, .L802401EC -/* B59A2C 802401BC 00000000 */ nop +/* B59A2C 802401BC 00000000 */ nop /* B59A30 802401C0 0C00A67F */ jal rand_int /* B59A34 802401C4 24040064 */ addiu $a0, $zero, 0x64 /* B59A38 802401C8 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_8024041C_B59C8C.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_8024041C_B59C8C.s index c67b6ab7a4..17cad12983 100644 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_8024041C_B59C8C.s +++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_8024041C_B59C8C.s @@ -42,7 +42,7 @@ glabel func_8024041C_B59C8C /* B59D20 802404B0 C6620074 */ lwc1 $f2, 0x74($s3) /* B59D24 802404B4 468010A0 */ cvt.s.w $f2, $f2 /* B59D28 802404B8 4600103C */ c.lt.s $f2, $f0 -/* B59D2C 802404BC 00000000 */ nop +/* B59D2C 802404BC 00000000 */ nop /* B59D30 802404C0 45030001 */ bc1tl .L802404C8 /* B59D34 802404C4 0000882D */ daddu $s1, $zero, $zero .L802404C8: @@ -51,16 +51,16 @@ glabel func_8024041C_B59C8C /* B59D40 802404D0 3C014387 */ lui $at, 0x4387 /* B59D44 802404D4 4481A000 */ mtc1 $at, $f20 /* B59D48 802404D8 0C00A70A */ jal get_clamped_angle_diff -/* B59D4C 802404DC 00000000 */ nop +/* B59D4C 802404DC 00000000 */ nop /* B59D50 802404E0 0C00A6C9 */ jal clamp_angle /* B59D54 802404E4 46000306 */ mov.s $f12, $f0 /* B59D58 802404E8 3C018024 */ lui $at, %hi(D_80244718) /* B59D5C 802404EC D4224718 */ ldc1 $f2, %lo(D_80244718)($at) /* B59D60 802404F0 46000021 */ cvt.d.s $f0, $f0 /* B59D64 802404F4 4622003C */ c.lt.d $f0, $f2 -/* B59D68 802404F8 00000000 */ nop +/* B59D68 802404F8 00000000 */ nop /* B59D6C 802404FC 45000003 */ bc1f .L8024050C -/* B59D70 80240500 00000000 */ nop +/* B59D70 80240500 00000000 */ nop /* B59D74 80240504 3C0142B4 */ lui $at, 0x42b4 /* B59D78 80240508 4481A000 */ mtc1 $at, $f20 .L8024050C: @@ -77,7 +77,7 @@ glabel func_8024041C_B59C8C /* B59DA4 80240534 468010A0 */ cvt.s.w $f2, $f2 /* B59DA8 80240538 46000005 */ abs.s $f0, $f0 /* B59DAC 8024053C 4600103C */ c.lt.s $f2, $f0 -/* B59DB0 80240540 00000000 */ nop +/* B59DB0 80240540 00000000 */ nop /* B59DB4 80240544 45030001 */ bc1tl .L8024054C /* B59DB8 80240548 0000882D */ daddu $s1, $zero, $zero .L8024054C: @@ -87,13 +87,13 @@ glabel func_8024041C_B59C8C /* B59DC8 80240558 860200A8 */ lh $v0, 0xa8($s0) /* B59DCC 8024055C 46020001 */ sub.s $f0, $f0, $f2 /* B59DD0 80240560 44821000 */ mtc1 $v0, $f2 -/* B59DD4 80240564 00000000 */ nop +/* B59DD4 80240564 00000000 */ nop /* B59DD8 80240568 468010A1 */ cvt.d.w $f2, $f2 /* B59DDC 8024056C 46221080 */ add.d $f2, $f2, $f2 /* B59DE0 80240570 46000005 */ abs.s $f0, $f0 /* B59DE4 80240574 46000021 */ cvt.d.s $f0, $f0 /* B59DE8 80240578 4620103E */ c.le.d $f2, $f0 -/* B59DEC 8024057C 00000000 */ nop +/* B59DEC 8024057C 00000000 */ nop /* B59DF0 80240580 45030001 */ bc1tl .L80240588 /* B59DF4 80240584 0000882D */ daddu $s1, $zero, $zero .L80240588: diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802405D0_B59E40.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802405D0_B59E40.s index 172c988f80..5a3b3e23ed 100644 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802405D0_B59E40.s +++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802405D0_B59E40.s @@ -19,7 +19,7 @@ glabel func_802405D0_B59E40 /* B59E78 80240608 8E2200B0 */ lw $v0, 0xb0($s1) /* B59E7C 8024060C 30420004 */ andi $v0, $v0, 4 /* B59E80 80240610 10400015 */ beqz $v0, .L80240668 -/* B59E84 80240614 00000000 */ nop +/* B59E84 80240614 00000000 */ nop .L80240618: /* B59E88 80240618 AE800070 */ sw $zero, 0x70($s4) /* B59E8C 8024061C 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel func_802405D0_B59E40 /* B59EDC 8024066C 12600005 */ beqz $s3, .L80240684 /* B59EE0 80240670 24020001 */ addiu $v0, $zero, 1 /* B59EE4 80240674 12620048 */ beq $s3, $v0, .L80240798 -/* B59EE8 80240678 00000000 */ nop +/* B59EE8 80240678 00000000 */ nop /* B59EEC 8024067C 08090203 */ j .L8024080C -/* B59EF0 80240680 00000000 */ nop +/* B59EF0 80240680 00000000 */ nop .L80240684: /* B59EF4 80240684 86240008 */ lh $a0, 8($s1) /* B59EF8 80240688 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel func_802405D0_B59E40 /* B59F18 802406A8 8E03006C */ lw $v1, 0x6c($s0) /* B59F1C 802406AC 24020003 */ addiu $v0, $zero, 3 /* B59F20 802406B0 14620056 */ bne $v1, $v0, .L8024080C -/* B59F24 802406B4 00000000 */ nop +/* B59F24 802406B4 00000000 */ nop /* B59F28 802406B8 8E2500A8 */ lw $a1, 0xa8($s1) /* B59F2C 802406BC 10A00003 */ beqz $a1, .L802406CC /* B59F30 802406C0 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel func_802405D0_B59E40 /* B59FA8 80240738 C7A20014 */ lwc1 $f2, 0x14($sp) /* B59FAC 8024073C 4600020D */ trunc.w.s $f8, $f0 /* B59FB0 80240740 44024000 */ mfc1 $v0, $f8 -/* B59FB4 80240744 00000000 */ nop +/* B59FB4 80240744 00000000 */ nop /* B59FB8 80240748 A6220012 */ sh $v0, 0x12($s1) /* B59FBC 8024074C 4600120D */ trunc.w.s $f8, $f2 /* B59FC0 80240750 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s index 9b085c3755..4af8980344 100644 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s +++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s @@ -100,78 +100,93 @@ glabel func_80240830_B5A0A0 /* B5A204 80240994 2C620064 */ sltiu $v0, $v1, 0x64 /* B5A208 80240998 10400048 */ beqz $v0, .L80240ABC /* B5A20C 8024099C 00031080 */ sll $v0, $v1, 2 -/* B5A210 802409A0 3C018024 */ lui $at, %hi(D_80244720) +/* B5A210 802409A0 3C018024 */ lui $at, %hi(jtbl_80244720_B5DF90) /* B5A214 802409A4 00220821 */ addu $at, $at, $v0 -/* B5A218 802409A8 8C224720 */ lw $v0, %lo(D_80244720)($at) +/* B5A218 802409A8 8C224720 */ lw $v0, %lo(jtbl_80244720_B5DF90)($at) /* B5A21C 802409AC 00400008 */ jr $v0 /* B5A220 802409B0 00000000 */ nop +glabel L802409B4_B5A224 /* B5A224 802409B4 0240202D */ daddu $a0, $s2, $zero /* B5A228 802409B8 0260282D */ daddu $a1, $s3, $zero /* B5A22C 802409BC 0C012568 */ jal func_800495A0 /* B5A230 802409C0 0280302D */ daddu $a2, $s4, $zero +glabel L802409C4_B5A234 /* B5A234 802409C4 0240202D */ daddu $a0, $s2, $zero /* B5A238 802409C8 0260282D */ daddu $a1, $s3, $zero /* B5A23C 802409CC 0C0125AE */ jal func_800496B8 /* B5A240 802409D0 0280302D */ daddu $a2, $s4, $zero /* B5A244 802409D4 080902AF */ j .L80240ABC /* B5A248 802409D8 00000000 */ nop +glabel L802409DC_B5A24C /* B5A24C 802409DC 0240202D */ daddu $a0, $s2, $zero /* B5A250 802409E0 0260282D */ daddu $a1, $s3, $zero /* B5A254 802409E4 0C0126D1 */ jal base_UnkNpcAIFunc1 /* B5A258 802409E8 0280302D */ daddu $a2, $s4, $zero +glabel L802409EC_B5A25C /* B5A25C 802409EC 0240202D */ daddu $a0, $s2, $zero /* B5A260 802409F0 0260282D */ daddu $a1, $s3, $zero /* B5A264 802409F4 0C012701 */ jal func_80049C04 /* B5A268 802409F8 0280302D */ daddu $a2, $s4, $zero /* B5A26C 802409FC 080902AF */ j .L80240ABC /* B5A270 80240A00 00000000 */ nop +glabel L80240A04_B5A274 /* B5A274 80240A04 0240202D */ daddu $a0, $s2, $zero /* B5A278 80240A08 0260282D */ daddu $a1, $s3, $zero /* B5A27C 80240A0C 0C01278F */ jal func_80049E3C /* B5A280 80240A10 0280302D */ daddu $a2, $s4, $zero +glabel L80240A14_B5A284 /* B5A284 80240A14 0240202D */ daddu $a0, $s2, $zero /* B5A288 80240A18 0260282D */ daddu $a1, $s3, $zero /* B5A28C 80240A1C 0C0127B3 */ jal func_80049ECC /* B5A290 80240A20 0280302D */ daddu $a2, $s4, $zero /* B5A294 80240A24 080902AF */ j .L80240ABC /* B5A298 80240A28 00000000 */ nop +glabel L80240A2C_B5A29C /* B5A29C 80240A2C 0240202D */ daddu $a0, $s2, $zero /* B5A2A0 80240A30 0260282D */ daddu $a1, $s3, $zero /* B5A2A4 80240A34 0C0127DF */ jal func_80049F7C /* B5A2A8 80240A38 0280302D */ daddu $a2, $s4, $zero +glabel L80240A3C_B5A2AC /* B5A2AC 80240A3C 0240202D */ daddu $a0, $s2, $zero /* B5A2B0 80240A40 0260282D */ daddu $a1, $s3, $zero /* B5A2B4 80240A44 0C012849 */ jal func_8004A124 /* B5A2B8 80240A48 0280302D */ daddu $a2, $s4, $zero /* B5A2BC 80240A4C 080902AF */ j .L80240ABC /* B5A2C0 80240A50 00000000 */ nop +glabel L80240A54_B5A2C4 /* B5A2C4 80240A54 0240202D */ daddu $a0, $s2, $zero /* B5A2C8 80240A58 0260282D */ daddu $a1, $s3, $zero /* B5A2CC 80240A5C 0C0128FA */ jal func_8004A3E8 /* B5A2D0 80240A60 0280302D */ daddu $a2, $s4, $zero /* B5A2D4 80240A64 080902AF */ j .L80240ABC /* B5A2D8 80240A68 00000000 */ nop +glabel L80240A6C_B5A2DC /* B5A2DC 80240A6C 0C090085 */ jal jan_07_UnkNpcAIFunc6 /* B5A2E0 80240A70 0240202D */ daddu $a0, $s2, $zero +glabel L80240A74_B5A2E4 /* B5A2E4 80240A74 0C0900A0 */ jal jan_07_UnkNpcAIFunc7 /* B5A2E8 80240A78 0240202D */ daddu $a0, $s2, $zero /* B5A2EC 80240A7C 8E430070 */ lw $v1, 0x70($s2) /* B5A2F0 80240A80 24020020 */ addiu $v0, $zero, 0x20 /* B5A2F4 80240A84 1462000D */ bne $v1, $v0, .L80240ABC /* B5A2F8 80240A88 00000000 */ nop +glabel L80240A8C_B5A2FC /* B5A2FC 80240A8C 0C0900BC */ jal jan_07_UnkNpcAIFunc8 /* B5A300 80240A90 0240202D */ daddu $a0, $s2, $zero /* B5A304 80240A94 8E430070 */ lw $v1, 0x70($s2) /* B5A308 80240A98 24020021 */ addiu $v0, $zero, 0x21 /* B5A30C 80240A9C 14620007 */ bne $v1, $v0, .L80240ABC /* B5A310 80240AA0 00000000 */ nop +glabel L80240AA4_B5A314 /* B5A314 80240AA4 0C0900F2 */ jal jan_07_UnkNpcAIFunc5 /* B5A318 80240AA8 0240202D */ daddu $a0, $s2, $zero /* B5A31C 80240AAC 080902AF */ j .L80240ABC /* B5A320 80240AB0 00000000 */ nop +glabel L80240AB4_B5A324 /* B5A324 80240AB4 0C0129CF */ jal func_8004A73C /* B5A328 80240AB8 0240202D */ daddu $a0, $s2, $zero .L80240ABC: +glabel L80240ABC_B5A32C /* B5A32C 80240ABC 8FBF0048 */ lw $ra, 0x48($sp) /* B5A330 80240AC0 8FB50044 */ lw $s5, 0x44($sp) /* B5A334 80240AC4 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s index 1ca0467ab5..bbad8bd4b9 100644 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s +++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s @@ -46,7 +46,7 @@ glabel func_80240AE4_B5A354 /* B5A3F8 80240B88 8E2200B0 */ lw $v0, 0xb0($s1) /* B5A3FC 80240B8C 30420004 */ andi $v0, $v0, 4 /* B5A400 80240B90 10400020 */ beqz $v0, .L80240C14 -/* B5A404 80240B94 00000000 */ nop +/* B5A404 80240B94 00000000 */ nop .L80240B98: /* B5A408 80240B98 2404F7FF */ addiu $a0, $zero, -0x801 /* B5A40C 80240B9C AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80240AE4_B5A354 /* B5A484 80240C14 8E420070 */ lw $v0, 0x70($s2) /* B5A488 80240C18 2842001E */ slti $v0, $v0, 0x1e /* B5A48C 80240C1C 10400009 */ beqz $v0, .L80240C44 -/* B5A490 80240C20 00000000 */ nop +/* B5A490 80240C20 00000000 */ nop /* B5A494 80240C24 8E22006C */ lw $v0, 0x6c($s1) /* B5A498 80240C28 14400006 */ bnez $v0, .L80240C44 -/* B5A49C 80240C2C 00000000 */ nop +/* B5A49C 80240C2C 00000000 */ nop /* B5A4A0 80240C30 0C090107 */ jal func_8024041C_B59C8C /* B5A4A4 80240C34 0240202D */ daddu $a0, $s2, $zero /* B5A4A8 80240C38 10400002 */ beqz $v0, .L80240C44 @@ -100,78 +100,93 @@ glabel func_80240AE4_B5A354 /* B5A4B8 80240C48 2C620064 */ sltiu $v0, $v1, 0x64 /* B5A4BC 80240C4C 10400048 */ beqz $v0, .L80240D70 /* B5A4C0 80240C50 00031080 */ sll $v0, $v1, 2 -/* B5A4C4 80240C54 3C018024 */ lui $at, %hi(D_802448B0) +/* B5A4C4 80240C54 3C018024 */ lui $at, %hi(jtbl_802448B0_B5E120) /* B5A4C8 80240C58 00220821 */ addu $at, $at, $v0 -/* B5A4CC 80240C5C 8C2248B0 */ lw $v0, %lo(D_802448B0)($at) +/* B5A4CC 80240C5C 8C2248B0 */ lw $v0, %lo(jtbl_802448B0_B5E120)($at) /* B5A4D0 80240C60 00400008 */ jr $v0 -/* B5A4D4 80240C64 00000000 */ nop +/* B5A4D4 80240C64 00000000 */ nop +glabel L80240C68_B5A4D8 /* B5A4D8 80240C68 0240202D */ daddu $a0, $s2, $zero /* B5A4DC 80240C6C 0260282D */ daddu $a1, $s3, $zero /* B5A4E0 80240C70 0C012568 */ jal func_800495A0 /* B5A4E4 80240C74 0280302D */ daddu $a2, $s4, $zero +glabel L80240C78_B5A4E8 /* B5A4E8 80240C78 0240202D */ daddu $a0, $s2, $zero /* B5A4EC 80240C7C 0260282D */ daddu $a1, $s3, $zero /* B5A4F0 80240C80 0C0125AE */ jal func_800496B8 /* B5A4F4 80240C84 0280302D */ daddu $a2, $s4, $zero /* B5A4F8 80240C88 0809035C */ j .L80240D70 -/* B5A4FC 80240C8C 00000000 */ nop +/* B5A4FC 80240C8C 00000000 */ nop +glabel L80240C90_B5A500 /* B5A500 80240C90 0240202D */ daddu $a0, $s2, $zero /* B5A504 80240C94 0260282D */ daddu $a1, $s3, $zero /* B5A508 80240C98 0C090000 */ jal jan_07_UnkNpcAIFunc4 /* B5A50C 80240C9C 0280302D */ daddu $a2, $s4, $zero +glabel L80240CA0_B5A510 /* B5A510 80240CA0 0240202D */ daddu $a0, $s2, $zero /* B5A514 80240CA4 0260282D */ daddu $a1, $s3, $zero /* B5A518 80240CA8 0C090014 */ jal func_80240050_B598C0 /* B5A51C 80240CAC 0280302D */ daddu $a2, $s4, $zero /* B5A520 80240CB0 0809035C */ j .L80240D70 -/* B5A524 80240CB4 00000000 */ nop +/* B5A524 80240CB4 00000000 */ nop +glabel L80240CB8_B5A528 /* B5A528 80240CB8 0240202D */ daddu $a0, $s2, $zero /* B5A52C 80240CBC 0260282D */ daddu $a1, $s3, $zero /* B5A530 80240CC0 0C01278F */ jal func_80049E3C /* B5A534 80240CC4 0280302D */ daddu $a2, $s4, $zero +glabel L80240CC8_B5A538 /* B5A538 80240CC8 0240202D */ daddu $a0, $s2, $zero /* B5A53C 80240CCC 0260282D */ daddu $a1, $s3, $zero /* B5A540 80240CD0 0C0127B3 */ jal func_80049ECC /* B5A544 80240CD4 0280302D */ daddu $a2, $s4, $zero /* B5A548 80240CD8 0809035C */ j .L80240D70 -/* B5A54C 80240CDC 00000000 */ nop +/* B5A54C 80240CDC 00000000 */ nop +glabel L80240CE0_B5A550 /* B5A550 80240CE0 0240202D */ daddu $a0, $s2, $zero /* B5A554 80240CE4 0260282D */ daddu $a1, $s3, $zero /* B5A558 80240CE8 0C0127DF */ jal func_80049F7C /* B5A55C 80240CEC 0280302D */ daddu $a2, $s4, $zero +glabel L80240CF0_B5A560 /* B5A560 80240CF0 0240202D */ daddu $a0, $s2, $zero /* B5A564 80240CF4 0260282D */ daddu $a1, $s3, $zero /* B5A568 80240CF8 0C012849 */ jal func_8004A124 /* B5A56C 80240CFC 0280302D */ daddu $a2, $s4, $zero /* B5A570 80240D00 0809035C */ j .L80240D70 -/* B5A574 80240D04 00000000 */ nop +/* B5A574 80240D04 00000000 */ nop +glabel L80240D08_B5A578 /* B5A578 80240D08 0240202D */ daddu $a0, $s2, $zero /* B5A57C 80240D0C 0260282D */ daddu $a1, $s3, $zero /* B5A580 80240D10 0C0128FA */ jal func_8004A3E8 /* B5A584 80240D14 0280302D */ daddu $a2, $s4, $zero /* B5A588 80240D18 0809035C */ j .L80240D70 -/* B5A58C 80240D1C 00000000 */ nop +/* B5A58C 80240D1C 00000000 */ nop +glabel L80240D20_B5A590 /* B5A590 80240D20 0C090085 */ jal jan_07_UnkNpcAIFunc6 /* B5A594 80240D24 0240202D */ daddu $a0, $s2, $zero +glabel L80240D28_B5A598 /* B5A598 80240D28 0C0900A0 */ jal jan_07_UnkNpcAIFunc7 /* B5A59C 80240D2C 0240202D */ daddu $a0, $s2, $zero /* B5A5A0 80240D30 8E430070 */ lw $v1, 0x70($s2) /* B5A5A4 80240D34 24020020 */ addiu $v0, $zero, 0x20 /* B5A5A8 80240D38 1462000D */ bne $v1, $v0, .L80240D70 -/* B5A5AC 80240D3C 00000000 */ nop +/* B5A5AC 80240D3C 00000000 */ nop +glabel L80240D40_B5A5B0 /* B5A5B0 80240D40 0C0900BC */ jal jan_07_UnkNpcAIFunc8 /* B5A5B4 80240D44 0240202D */ daddu $a0, $s2, $zero /* B5A5B8 80240D48 8E430070 */ lw $v1, 0x70($s2) /* B5A5BC 80240D4C 24020021 */ addiu $v0, $zero, 0x21 /* B5A5C0 80240D50 14620007 */ bne $v1, $v0, .L80240D70 -/* B5A5C4 80240D54 00000000 */ nop +/* B5A5C4 80240D54 00000000 */ nop +glabel L80240D58_B5A5C8 /* B5A5C8 80240D58 0C0900F2 */ jal jan_07_UnkNpcAIFunc5 /* B5A5CC 80240D5C 0240202D */ daddu $a0, $s2, $zero /* B5A5D0 80240D60 0809035C */ j .L80240D70 -/* B5A5D4 80240D64 00000000 */ nop +/* B5A5D4 80240D64 00000000 */ nop +glabel L80240D68_B5A5D8 /* B5A5D8 80240D68 0C0129CF */ jal func_8004A73C /* B5A5DC 80240D6C 0240202D */ daddu $a0, $s2, $zero .L80240D70: +glabel L80240D70_B5A5E0 /* B5A5E0 80240D70 8FBF0048 */ lw $ra, 0x48($sp) /* B5A5E4 80240D74 8FB50044 */ lw $s5, 0x44($sp) /* B5A5E8 80240D78 8FB40040 */ lw $s4, 0x40($sp) @@ -182,5 +197,5 @@ glabel func_80240AE4_B5A354 /* B5A5FC 80240D8C 0000102D */ daddu $v0, $zero, $zero /* B5A600 80240D90 03E00008 */ jr $ra /* B5A604 80240D94 27BD0050 */ addiu $sp, $sp, 0x50 -/* B5A608 80240D98 00000000 */ nop -/* B5A60C 80240D9C 00000000 */ nop +/* B5A608 80240D98 00000000 */ nop +/* B5A60C 80240D9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_8024054C_B5E7FC.s b/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_8024054C_B5E7FC.s index 8e24ac6d43..b5075ac57a 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_8024054C_B5E7FC.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_8024054C_B5E7FC.s @@ -13,7 +13,7 @@ glabel func_8024054C_B5E7FC /* B5E81C 8024056C D42074B0 */ ldc1 $f0, %lo(D_802474B0)($at) /* B5E820 80240570 4600A521 */ cvt.d.s $f20, $f20 /* B5E824 80240574 4620A502 */ mul.d $f20, $f20, $f0 -/* B5E828 80240578 00000000 */ nop +/* B5E828 80240578 00000000 */ nop /* B5E82C 8024057C 3C013F80 */ lui $at, 0x3f80 /* B5E830 80240580 44810000 */ mtc1 $at, $f0 /* B5E834 80240584 AE000018 */ sw $zero, 0x18($s0) diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_802405A8_B5E858.s b/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_802405A8_B5E858.s index 0232006cf8..90ac987375 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_802405A8_B5E858.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_802405A8_B5E858.s @@ -25,7 +25,7 @@ glabel func_802405A8_B5E858 /* B5E8A8 802405F8 96020000 */ lhu $v0, ($s0) /* B5E8AC 802405FC 30420400 */ andi $v0, $v0, 0x400 /* B5E8B0 80240600 14400008 */ bnez $v0, .L80240624 -/* B5E8B4 80240604 00000000 */ nop +/* B5E8B4 80240604 00000000 */ nop /* B5E8B8 80240608 4405A000 */ mfc1 $a1, $f20 /* B5E8BC 8024060C 0C090153 */ jal func_8024054C_B5E7FC /* B5E8C0 80240610 26040058 */ addiu $a0, $s0, 0x58 @@ -49,4 +49,4 @@ glabel func_802405A8_B5E858 /* B5E900 80240650 24020002 */ addiu $v0, $zero, 2 /* B5E904 80240654 03E00008 */ jr $ra /* B5E908 80240658 27BD0068 */ addiu $sp, $sp, 0x68 -/* B5E90C 8024065C 00000000 */ nop +/* B5E90C 8024065C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240734_B5E9E4.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240734_B5E9E4.s index c8589e614f..9bc4dae933 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240734_B5E9E4.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240734_B5E9E4.s @@ -8,7 +8,7 @@ glabel func_80240734_B5E9E4 /* B5E9F0 80240740 00822021 */ addu $a0, $a0, $v0 /* B5E9F4 80240744 90820014 */ lbu $v0, 0x14($a0) /* B5E9F8 80240748 10400009 */ beqz $v0, .L80240770 -/* B5E9FC 8024074C 00000000 */ nop +/* B5E9FC 8024074C 00000000 */ nop /* B5EA00 80240750 90820015 */ lbu $v0, 0x15($a0) /* B5EA04 80240754 00022600 */ sll $a0, $v0, 0x18 /* B5EA08 80240758 00041E03 */ sra $v1, $a0, 0x18 @@ -16,7 +16,7 @@ glabel func_80240734_B5E9E4 /* B5EA10 80240760 00021403 */ sra $v0, $v0, 0x10 /* B5EA14 80240764 0043102A */ slt $v0, $v0, $v1 /* B5EA18 80240768 10400003 */ beqz $v0, .L80240778 -/* B5EA1C 8024076C 00000000 */ nop +/* B5EA1C 8024076C 00000000 */ nop .L80240770: /* B5EA20 80240770 03E00008 */ jr $ra /* B5EA24 80240774 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024082C_B5EADC.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024082C_B5EADC.s index 2a0c896da0..889647f7ca 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024082C_B5EADC.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024082C_B5EADC.s @@ -108,20 +108,20 @@ glabel func_8024082C_B5EADC /* B5EC64 802409B4 10400009 */ beqz $v0, .L802409DC /* B5EC68 802409B8 AEA20074 */ sw $v0, 0x74($s5) /* B5EC6C 802409BC 0C03C4EC */ jal func_800F13B0 -/* B5EC70 802409C0 00000000 */ nop +/* B5EC70 802409C0 00000000 */ nop /* B5EC74 802409C4 8EA20070 */ lw $v0, 0x70($s5) /* B5EC78 802409C8 24420001 */ addiu $v0, $v0, 1 .L802409CC: /* B5EC7C 802409CC AEA20070 */ sw $v0, 0x70($s5) /* B5EC80 802409D0 2842000F */ slti $v0, $v0, 0xf /* B5EC84 802409D4 10400003 */ beqz $v0, .L802409E4 -/* B5EC88 802409D8 00000000 */ nop +/* B5EC88 802409D8 00000000 */ nop .L802409DC: /* B5EC8C 802409DC 08090293 */ j .L80240A4C /* B5EC90 802409E0 0000102D */ daddu $v0, $zero, $zero .L802409E4: /* B5EC94 802409E4 0C03C54E */ jal func_800F1538 -/* B5EC98 802409E8 00000000 */ nop +/* B5EC98 802409E8 00000000 */ nop /* B5EC9C 802409EC 8EA30074 */ lw $v1, 0x74($s5) /* B5ECA0 802409F0 240200FF */ addiu $v0, $zero, 0xff /* B5ECA4 802409F4 10620010 */ beq $v1, $v0, .L80240A38 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240C60_B5EF10.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240C60_B5EF10.s index 3c72a5e509..41a5b25206 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240C60_B5EF10.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240C60_B5EF10.s @@ -36,7 +36,7 @@ glabel func_80240C60_B5EF10 /* B5EF8C 80240CDC 0C00A88D */ jal sin_cos_deg /* B5EF90 80240CE0 0040A82D */ daddu $s5, $v0, $zero /* B5EF94 80240CE4 1200005D */ beqz $s0, .L80240E5C -/* B5EF98 80240CE8 00000000 */ nop +/* B5EF98 80240CE8 00000000 */ nop /* B5EF9C 80240CEC 0C00AB0A */ jal general_heap_malloc /* B5EFA0 80240CF0 24040068 */ addiu $a0, $zero, 0x68 /* B5EFA4 80240CF4 0040902D */ daddu $s2, $v0, $zero @@ -98,10 +98,10 @@ glabel func_80240C60_B5EF10 /* B5F07C 80240DCC C7A2001C */ lwc1 $f2, 0x1c($sp) /* B5F080 80240DD0 C7A40020 */ lwc1 $f4, 0x20($sp) /* B5F084 80240DD4 46041082 */ mul.s $f2, $f2, $f4 -/* B5F088 80240DD8 00000000 */ nop +/* B5F088 80240DD8 00000000 */ nop /* B5F08C 80240DDC C7A00018 */ lwc1 $f0, 0x18($sp) /* B5F090 80240DE0 46040002 */ mul.s $f0, $f0, $f4 -/* B5F094 80240DE4 00000000 */ nop +/* B5F094 80240DE4 00000000 */ nop /* B5F098 80240DE8 E6020038 */ swc1 $f2, 0x38($s0) /* B5F09C 80240DEC E6000050 */ swc1 $f0, 0x50($s0) /* B5F0A0 80240DF0 8E42005C */ lw $v0, 0x5c($s2) @@ -142,12 +142,12 @@ glabel func_80240C60_B5EF10 /* B5F128 80240E78 10600007 */ beqz $v1, .L80240E98 /* B5F12C 80240E7C 24040005 */ addiu $a0, $zero, 5 /* B5F130 80240E80 0809040C */ j .L80241030 -/* B5F134 80240E84 00000000 */ nop +/* B5F134 80240E84 00000000 */ nop .L80240E88: /* B5F138 80240E88 10620058 */ beq $v1, $v0, .L80240FEC -/* B5F13C 80240E8C 00000000 */ nop +/* B5F13C 80240E8C 00000000 */ nop /* B5F140 80240E90 0809040C */ j .L80241030 -/* B5F144 80240E94 00000000 */ nop +/* B5F144 80240E94 00000000 */ nop .L80240E98: /* B5F148 80240E98 0000882D */ daddu $s1, $zero, $zero /* B5F14C 80240E9C 3C148024 */ lui $s4, %hi(D_80243E58) @@ -174,11 +174,11 @@ glabel func_80240C60_B5EF10 /* B5F19C 80240EEC C7A4001C */ lwc1 $f4, 0x1c($sp) /* B5F1A0 80240EF0 C7A00020 */ lwc1 $f0, 0x20($sp) /* B5F1A4 80240EF4 46002102 */ mul.s $f4, $f4, $f0 -/* B5F1A8 80240EF8 00000000 */ nop +/* B5F1A8 80240EF8 00000000 */ nop /* B5F1AC 80240EFC C7A20018 */ lwc1 $f2, 0x18($sp) /* B5F1B0 80240F00 26940004 */ addiu $s4, $s4, 4 /* B5F1B4 80240F04 46001082 */ mul.s $f2, $f2, $f0 -/* B5F1B8 80240F08 00000000 */ nop +/* B5F1B8 80240F08 00000000 */ nop /* B5F1BC 80240F0C 26730004 */ addiu $s3, $s3, 4 /* B5F1C0 80240F10 26310001 */ addiu $s1, $s1, 1 /* B5F1C4 80240F14 2A220003 */ slti $v0, $s1, 3 @@ -215,11 +215,11 @@ glabel func_80240C60_B5EF10 /* B5F238 80240F88 C7A4001C */ lwc1 $f4, 0x1c($sp) /* B5F23C 80240F8C C7A00020 */ lwc1 $f0, 0x20($sp) /* B5F240 80240F90 46002102 */ mul.s $f4, $f4, $f0 -/* B5F244 80240F94 00000000 */ nop +/* B5F244 80240F94 00000000 */ nop /* B5F248 80240F98 C7A20018 */ lwc1 $f2, 0x18($sp) /* B5F24C 80240F9C 26940004 */ addiu $s4, $s4, 4 /* B5F250 80240FA0 46001082 */ mul.s $f2, $f2, $f0 -/* B5F254 80240FA4 00000000 */ nop +/* B5F254 80240FA4 00000000 */ nop /* B5F258 80240FA8 26730004 */ addiu $s3, $s3, 4 /* B5F25C 80240FAC 26310001 */ addiu $s1, $s1, 1 /* B5F260 80240FB0 2A220003 */ slti $v0, $s1, 3 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241198_B5F448.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241198_B5F448.s index 8656b490da..6ccbca166b 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241198_B5F448.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241198_B5F448.s @@ -36,16 +36,16 @@ glabel func_80241198_B5F448 /* B5F4C0 80241210 10600007 */ beqz $v1, .L80241230 /* B5F4C4 80241214 240500FF */ addiu $a1, $zero, 0xff /* B5F4C8 80241218 080904AA */ j .L802412A8 -/* B5F4CC 8024121C 00000000 */ nop +/* B5F4CC 8024121C 00000000 */ nop .L80241220: /* B5F4D0 80241220 10620019 */ beq $v1, $v0, .L80241288 -/* B5F4D4 80241224 00000000 */ nop +/* B5F4D4 80241224 00000000 */ nop /* B5F4D8 80241228 080904AA */ j .L802412A8 -/* B5F4DC 8024122C 00000000 */ nop +/* B5F4DC 8024122C 00000000 */ nop .L80241230: /* B5F4E0 80241230 8E220074 */ lw $v0, 0x74($s1) /* B5F4E4 80241234 14450004 */ bne $v0, $a1, .L80241248 -/* B5F4E8 80241238 00000000 */ nop +/* B5F4E8 80241238 00000000 */ nop /* B5F4EC 8024123C AE240070 */ sw $a0, 0x70($s1) /* B5F4F0 80241240 AE200078 */ sw $zero, 0x78($s1) /* B5F4F4 80241244 8E220074 */ lw $v0, 0x74($s1) @@ -57,7 +57,7 @@ glabel func_80241198_B5F448 /* B5F508 80241258 50400013 */ beql $v0, $zero, .L802412A8 /* B5F50C 8024125C AE250074 */ sw $a1, 0x74($s1) /* B5F510 80241260 080904AA */ j .L802412A8 -/* B5F514 80241264 00000000 */ nop +/* B5F514 80241264 00000000 */ nop .L80241268: /* B5F518 80241268 8E220078 */ lw $v0, 0x78($s1) /* B5F51C 8024126C 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241368_B5F618.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241368_B5F618.s index de0e5de4d4..0c9b96679a 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241368_B5F618.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241368_B5F618.s @@ -15,5 +15,5 @@ glabel func_80241368_B5F618 .L80241390: /* B5F640 80241390 03E00008 */ jr $ra /* B5F644 80241394 24020002 */ addiu $v0, $zero, 2 -/* B5F648 80241398 00000000 */ nop -/* B5F64C 8024139C 00000000 */ nop +/* B5F648 80241398 00000000 */ nop +/* B5F64C 8024139C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802413A0_B5F650.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802413A0_B5F650.s index 1e2c6d89fb..d039afc290 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802413A0_B5F650.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802413A0_B5F650.s @@ -29,7 +29,7 @@ glabel func_802413A0_B5F650 /* B5F6B0 80241400 46220000 */ add.d $f0, $f0, $f2 /* B5F6B4 80241404 AFA00014 */ sw $zero, 0x14($sp) /* B5F6B8 80241408 44831000 */ mtc1 $v1, $f2 -/* B5F6BC 8024140C 00000000 */ nop +/* B5F6BC 8024140C 00000000 */ nop /* B5F6C0 80241410 468010A0 */ cvt.s.w $f2, $f2 /* B5F6C4 80241414 46022100 */ add.s $f4, $f4, $f2 /* B5F6C8 80241418 8E050038 */ lw $a1, 0x38($s0) diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802414A4_B5F754.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802414A4_B5F754.s index f469b519f5..2b020489d4 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802414A4_B5F754.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802414A4_B5F754.s @@ -31,17 +31,19 @@ glabel func_802414A4_B5F754 /* B5F7B4 80241504 2C620006 */ sltiu $v0, $v1, 6 /* B5F7B8 80241508 1040004D */ beqz $v0, .L80241640 /* B5F7BC 8024150C 00031080 */ sll $v0, $v1, 2 -/* B5F7C0 80241510 3C018024 */ lui $at, %hi(D_802474C0) +/* B5F7C0 80241510 3C018024 */ lui $at, %hi(jtbl_802474C0_B65770) /* B5F7C4 80241514 00220821 */ addu $at, $at, $v0 -/* B5F7C8 80241518 8C2274C0 */ lw $v0, %lo(D_802474C0)($at) +/* B5F7C8 80241518 8C2274C0 */ lw $v0, %lo(jtbl_802474C0_B65770)($at) /* B5F7CC 8024151C 00400008 */ jr $v0 -/* B5F7D0 80241520 00000000 */ nop +/* B5F7D0 80241520 00000000 */ nop +glabel L80241524_B5F7D4 /* B5F7D4 80241524 3C030042 */ lui $v1, 0x42 /* B5F7D8 80241528 3463000F */ ori $v1, $v1, 0xf /* B5F7DC 8024152C 24020002 */ addiu $v0, $zero, 2 /* B5F7E0 80241530 AE02006C */ sw $v0, 0x6c($s0) /* B5F7E4 80241534 AE000070 */ sw $zero, 0x70($s0) /* B5F7E8 80241538 AE230028 */ sw $v1, 0x28($s1) +glabel L8024153C_B5F7EC /* B5F7EC 8024153C 8E020070 */ lw $v0, 0x70($s0) /* B5F7F0 80241540 24420001 */ addiu $v0, $v0, 1 /* B5F7F4 80241544 AE020070 */ sw $v0, 0x70($s0) @@ -50,12 +52,14 @@ glabel func_802414A4_B5F754 /* B5F800 80241550 24020005 */ addiu $v0, $zero, 5 /* B5F804 80241554 08090590 */ j .L80241640 /* B5F808 80241558 AE02006C */ sw $v0, 0x6c($s0) +glabel L8024155C_B5F80C /* B5F80C 8024155C 3C030042 */ lui $v1, 0x42 /* B5F810 80241560 34630010 */ ori $v1, $v1, 0x10 /* B5F814 80241564 24020004 */ addiu $v0, $zero, 4 /* B5F818 80241568 AE02006C */ sw $v0, 0x6c($s0) /* B5F81C 8024156C AE000070 */ sw $zero, 0x70($s0) /* B5F820 80241570 AE230028 */ sw $v1, 0x28($s1) +glabel L80241574_B5F824 /* B5F824 80241574 8E020070 */ lw $v0, 0x70($s0) /* B5F828 80241578 24030019 */ addiu $v1, $zero, 0x19 /* B5F82C 8024157C 24420001 */ addiu $v0, $v0, 1 @@ -63,7 +67,7 @@ glabel func_802414A4_B5F754 /* B5F834 80241584 AE020070 */ sw $v0, 0x70($s0) /* B5F838 80241588 3C0142B4 */ lui $at, 0x42b4 /* B5F83C 8024158C 44810000 */ mtc1 $at, $f0 -/* B5F840 80241590 00000000 */ nop +/* B5F840 80241590 00000000 */ nop /* B5F844 80241594 E620000C */ swc1 $f0, 0xc($s1) .L80241598: /* B5F848 80241598 8E020070 */ lw $v0, 0x70($s0) @@ -72,6 +76,7 @@ glabel func_802414A4_B5F754 /* B5F854 802415A4 24020005 */ addiu $v0, $zero, 5 /* B5F858 802415A8 08090590 */ j .L80241640 /* B5F85C 802415AC AE02006C */ sw $v0, 0x6c($s0) +glabel L802415B0_B5F860 /* B5F860 802415B0 3C030042 */ lui $v1, 0x42 /* B5F864 802415B4 24020006 */ addiu $v0, $zero, 6 /* B5F868 802415B8 34630003 */ ori $v1, $v1, 3 @@ -83,7 +88,7 @@ glabel func_802414A4_B5F754 /* B5F880 802415D0 AFA00014 */ sw $zero, 0x14($sp) /* B5F884 802415D4 AFA20018 */ sw $v0, 0x18($sp) /* B5F888 802415D8 44840000 */ mtc1 $a0, $f0 -/* B5F88C 802415DC 00000000 */ nop +/* B5F88C 802415DC 00000000 */ nop /* B5F890 802415E0 46800020 */ cvt.s.w $f0, $f0 /* B5F894 802415E4 E7A00010 */ swc1 $f0, 0x10($sp) /* B5F898 802415E8 8E250038 */ lw $a1, 0x38($s1) @@ -91,12 +96,13 @@ glabel func_802414A4_B5F754 /* B5F8A0 802415F0 8E270040 */ lw $a3, 0x40($s1) /* B5F8A4 802415F4 0C01C1E4 */ jal fx_sweat /* B5F8A8 802415F8 0000202D */ daddu $a0, $zero, $zero +glabel L802415FC_B5F8AC /* B5F8AC 802415FC 8E020070 */ lw $v0, 0x70($s0) /* B5F8B0 80241600 24420001 */ addiu $v0, $v0, 1 /* B5F8B4 80241604 AE020070 */ sw $v0, 0x70($s0) /* B5F8B8 80241608 2842000B */ slti $v0, $v0, 0xb /* B5F8BC 8024160C 1440000C */ bnez $v0, .L80241640 -/* B5F8C0 80241610 00000000 */ nop +/* B5F8C0 80241610 00000000 */ nop /* B5F8C4 80241614 0C00A67F */ jal rand_int /* B5F8C8 80241618 24040064 */ addiu $a0, $zero, 0x64 /* B5F8CC 8024161C 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241870_B5FB20.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241870_B5FB20.s index b6a9aef041..6e356b9955 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241870_B5FB20.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241870_B5FB20.s @@ -42,7 +42,7 @@ glabel func_80241870_B5FB20 /* B5FBB4 80241904 C6620074 */ lwc1 $f2, 0x74($s3) /* B5FBB8 80241908 468010A0 */ cvt.s.w $f2, $f2 /* B5FBBC 8024190C 4600103C */ c.lt.s $f2, $f0 -/* B5FBC0 80241910 00000000 */ nop +/* B5FBC0 80241910 00000000 */ nop /* B5FBC4 80241914 45030001 */ bc1tl .L8024191C /* B5FBC8 80241918 0000882D */ daddu $s1, $zero, $zero .L8024191C: @@ -51,16 +51,16 @@ glabel func_80241870_B5FB20 /* B5FBD4 80241924 3C014387 */ lui $at, 0x4387 /* B5FBD8 80241928 4481A000 */ mtc1 $at, $f20 /* B5FBDC 8024192C 0C00A70A */ jal get_clamped_angle_diff -/* B5FBE0 80241930 00000000 */ nop +/* B5FBE0 80241930 00000000 */ nop /* B5FBE4 80241934 0C00A6C9 */ jal clamp_angle /* B5FBE8 80241938 46000306 */ mov.s $f12, $f0 /* B5FBEC 8024193C 3C018024 */ lui $at, %hi(D_802474D8) /* B5FBF0 80241940 D42274D8 */ ldc1 $f2, %lo(D_802474D8)($at) /* B5FBF4 80241944 46000021 */ cvt.d.s $f0, $f0 /* B5FBF8 80241948 4622003C */ c.lt.d $f0, $f2 -/* B5FBFC 8024194C 00000000 */ nop +/* B5FBFC 8024194C 00000000 */ nop /* B5FC00 80241950 45000003 */ bc1f .L80241960 -/* B5FC04 80241954 00000000 */ nop +/* B5FC04 80241954 00000000 */ nop /* B5FC08 80241958 3C0142B4 */ lui $at, 0x42b4 /* B5FC0C 8024195C 4481A000 */ mtc1 $at, $f20 .L80241960: @@ -77,7 +77,7 @@ glabel func_80241870_B5FB20 /* B5FC38 80241988 468010A0 */ cvt.s.w $f2, $f2 /* B5FC3C 8024198C 46000005 */ abs.s $f0, $f0 /* B5FC40 80241990 4600103C */ c.lt.s $f2, $f0 -/* B5FC44 80241994 00000000 */ nop +/* B5FC44 80241994 00000000 */ nop /* B5FC48 80241998 45030001 */ bc1tl .L802419A0 /* B5FC4C 8024199C 0000882D */ daddu $s1, $zero, $zero .L802419A0: @@ -87,13 +87,13 @@ glabel func_80241870_B5FB20 /* B5FC5C 802419AC 860200A8 */ lh $v0, 0xa8($s0) /* B5FC60 802419B0 46020001 */ sub.s $f0, $f0, $f2 /* B5FC64 802419B4 44821000 */ mtc1 $v0, $f2 -/* B5FC68 802419B8 00000000 */ nop +/* B5FC68 802419B8 00000000 */ nop /* B5FC6C 802419BC 468010A1 */ cvt.d.w $f2, $f2 /* B5FC70 802419C0 46221080 */ add.d $f2, $f2, $f2 /* B5FC74 802419C4 46000005 */ abs.s $f0, $f0 /* B5FC78 802419C8 46000021 */ cvt.d.s $f0, $f0 /* B5FC7C 802419CC 4620103E */ c.le.d $f2, $f0 -/* B5FC80 802419D0 00000000 */ nop +/* B5FC80 802419D0 00000000 */ nop /* B5FC84 802419D4 45030001 */ bc1tl .L802419DC /* B5FC88 802419D8 0000882D */ daddu $s1, $zero, $zero .L802419DC: diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241A24_B5FCD4.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241A24_B5FCD4.s index 89006d094b..80fb87cad0 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241A24_B5FCD4.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241A24_B5FCD4.s @@ -19,7 +19,7 @@ glabel func_80241A24_B5FCD4 /* B5FD0C 80241A5C 8E2200B0 */ lw $v0, 0xb0($s1) /* B5FD10 80241A60 30420004 */ andi $v0, $v0, 4 /* B5FD14 80241A64 10400015 */ beqz $v0, .L80241ABC -/* B5FD18 80241A68 00000000 */ nop +/* B5FD18 80241A68 00000000 */ nop .L80241A6C: /* B5FD1C 80241A6C AE800070 */ sw $zero, 0x70($s4) /* B5FD20 80241A70 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel func_80241A24_B5FCD4 /* B5FD70 80241AC0 12600005 */ beqz $s3, .L80241AD8 /* B5FD74 80241AC4 24020001 */ addiu $v0, $zero, 1 /* B5FD78 80241AC8 12620048 */ beq $s3, $v0, .L80241BEC -/* B5FD7C 80241ACC 00000000 */ nop +/* B5FD7C 80241ACC 00000000 */ nop /* B5FD80 80241AD0 08090718 */ j .L80241C60 -/* B5FD84 80241AD4 00000000 */ nop +/* B5FD84 80241AD4 00000000 */ nop .L80241AD8: /* B5FD88 80241AD8 86240008 */ lh $a0, 8($s1) /* B5FD8C 80241ADC 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel func_80241A24_B5FCD4 /* B5FDAC 80241AFC 8E03006C */ lw $v1, 0x6c($s0) /* B5FDB0 80241B00 24020003 */ addiu $v0, $zero, 3 /* B5FDB4 80241B04 14620056 */ bne $v1, $v0, .L80241C60 -/* B5FDB8 80241B08 00000000 */ nop +/* B5FDB8 80241B08 00000000 */ nop /* B5FDBC 80241B0C 8E2500A8 */ lw $a1, 0xa8($s1) /* B5FDC0 80241B10 10A00003 */ beqz $a1, .L80241B20 /* B5FDC4 80241B14 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel func_80241A24_B5FCD4 /* B5FE3C 80241B8C C7A20014 */ lwc1 $f2, 0x14($sp) /* B5FE40 80241B90 4600020D */ trunc.w.s $f8, $f0 /* B5FE44 80241B94 44024000 */ mfc1 $v0, $f8 -/* B5FE48 80241B98 00000000 */ nop +/* B5FE48 80241B98 00000000 */ nop /* B5FE4C 80241B9C A6220012 */ sh $v0, 0x12($s1) /* B5FE50 80241BA0 4600120D */ trunc.w.s $f8, $f2 /* B5FE54 80241BA4 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s index 486798a960..79d2ae4584 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s @@ -100,78 +100,93 @@ glabel func_80241C84_B5FF34 /* B60098 80241DE8 2C620064 */ sltiu $v0, $v1, 0x64 /* B6009C 80241DEC 10400048 */ beqz $v0, .L80241F10 /* B600A0 80241DF0 00031080 */ sll $v0, $v1, 2 -/* B600A4 80241DF4 3C018024 */ lui $at, %hi(D_802474E0) +/* B600A4 80241DF4 3C018024 */ lui $at, %hi(jtbl_802474E0_B65790) /* B600A8 80241DF8 00220821 */ addu $at, $at, $v0 -/* B600AC 80241DFC 8C2274E0 */ lw $v0, %lo(D_802474E0)($at) +/* B600AC 80241DFC 8C2274E0 */ lw $v0, %lo(jtbl_802474E0_B65790)($at) /* B600B0 80241E00 00400008 */ jr $v0 /* B600B4 80241E04 00000000 */ nop +glabel L80241E08_B600B8 /* B600B8 80241E08 0240202D */ daddu $a0, $s2, $zero /* B600BC 80241E0C 0260282D */ daddu $a1, $s3, $zero /* B600C0 80241E10 0C012568 */ jal func_800495A0 /* B600C4 80241E14 0280302D */ daddu $a2, $s4, $zero +glabel L80241E18_B600C8 /* B600C8 80241E18 0240202D */ daddu $a0, $s2, $zero /* B600CC 80241E1C 0260282D */ daddu $a1, $s3, $zero /* B600D0 80241E20 0C0125AE */ jal func_800496B8 /* B600D4 80241E24 0280302D */ daddu $a2, $s4, $zero /* B600D8 80241E28 080907C4 */ j .L80241F10 /* B600DC 80241E2C 00000000 */ nop +glabel L80241E30_B600E0 /* B600E0 80241E30 0240202D */ daddu $a0, $s2, $zero /* B600E4 80241E34 0260282D */ daddu $a1, $s3, $zero /* B600E8 80241E38 0C0126D1 */ jal base_UnkNpcAIFunc1 /* B600EC 80241E3C 0280302D */ daddu $a2, $s4, $zero +glabel L80241E40_B600F0 /* B600F0 80241E40 0240202D */ daddu $a0, $s2, $zero /* B600F4 80241E44 0260282D */ daddu $a1, $s3, $zero /* B600F8 80241E48 0C012701 */ jal func_80049C04 /* B600FC 80241E4C 0280302D */ daddu $a2, $s4, $zero /* B60100 80241E50 080907C4 */ j .L80241F10 /* B60104 80241E54 00000000 */ nop +glabel L80241E58_B60108 /* B60108 80241E58 0240202D */ daddu $a0, $s2, $zero /* B6010C 80241E5C 0260282D */ daddu $a1, $s3, $zero /* B60110 80241E60 0C01278F */ jal func_80049E3C /* B60114 80241E64 0280302D */ daddu $a2, $s4, $zero +glabel L80241E68_B60118 /* B60118 80241E68 0240202D */ daddu $a0, $s2, $zero /* B6011C 80241E6C 0260282D */ daddu $a1, $s3, $zero /* B60120 80241E70 0C0127B3 */ jal func_80049ECC /* B60124 80241E74 0280302D */ daddu $a2, $s4, $zero /* B60128 80241E78 080907C4 */ j .L80241F10 /* B6012C 80241E7C 00000000 */ nop +glabel L80241E80_B60130 /* B60130 80241E80 0240202D */ daddu $a0, $s2, $zero /* B60134 80241E84 0260282D */ daddu $a1, $s3, $zero /* B60138 80241E88 0C0127DF */ jal func_80049F7C /* B6013C 80241E8C 0280302D */ daddu $a2, $s4, $zero +glabel L80241E90_B60140 /* B60140 80241E90 0240202D */ daddu $a0, $s2, $zero /* B60144 80241E94 0260282D */ daddu $a1, $s3, $zero /* B60148 80241E98 0C012849 */ jal func_8004A124 /* B6014C 80241E9C 0280302D */ daddu $a2, $s4, $zero /* B60150 80241EA0 080907C4 */ j .L80241F10 /* B60154 80241EA4 00000000 */ nop +glabel L80241EA8_B60158 /* B60158 80241EA8 0240202D */ daddu $a0, $s2, $zero /* B6015C 80241EAC 0260282D */ daddu $a1, $s3, $zero /* B60160 80241EB0 0C0128FA */ jal func_8004A3E8 /* B60164 80241EB4 0280302D */ daddu $a2, $s4, $zero /* B60168 80241EB8 080907C4 */ j .L80241F10 /* B6016C 80241EBC 00000000 */ nop +glabel L80241EC0_B60170 /* B60170 80241EC0 0C09059A */ jal jan_08_UnkNpcAIFunc6 /* B60174 80241EC4 0240202D */ daddu $a0, $s2, $zero +glabel L80241EC8_B60178 /* B60178 80241EC8 0C0905B5 */ jal jan_08_UnkNpcAIFunc7 /* B6017C 80241ECC 0240202D */ daddu $a0, $s2, $zero /* B60180 80241ED0 8E430070 */ lw $v1, 0x70($s2) /* B60184 80241ED4 24020020 */ addiu $v0, $zero, 0x20 /* B60188 80241ED8 1462000D */ bne $v1, $v0, .L80241F10 /* B6018C 80241EDC 00000000 */ nop +glabel L80241EE0_B60190 /* B60190 80241EE0 0C0905D1 */ jal jan_08_UnkNpcAIFunc8 /* B60194 80241EE4 0240202D */ daddu $a0, $s2, $zero /* B60198 80241EE8 8E430070 */ lw $v1, 0x70($s2) /* B6019C 80241EEC 24020021 */ addiu $v0, $zero, 0x21 /* B601A0 80241EF0 14620007 */ bne $v1, $v0, .L80241F10 /* B601A4 80241EF4 00000000 */ nop +glabel L80241EF8_B601A8 /* B601A8 80241EF8 0C090607 */ jal jan_08_UnkNpcAIFunc5 /* B601AC 80241EFC 0240202D */ daddu $a0, $s2, $zero /* B601B0 80241F00 080907C4 */ j .L80241F10 /* B601B4 80241F04 00000000 */ nop +glabel L80241F08_B601B8 /* B601B8 80241F08 0C0129CF */ jal func_8004A73C /* B601BC 80241F0C 0240202D */ daddu $a0, $s2, $zero .L80241F10: +glabel L80241F10_B601C0 /* B601C0 80241F10 8FBF0048 */ lw $ra, 0x48($sp) /* B601C4 80241F14 8FB50044 */ lw $s5, 0x44($sp) /* B601C8 80241F18 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s index d53dd6ed0f..ec9fa84378 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s @@ -46,7 +46,7 @@ glabel func_80241F38_B601E8 /* B6028C 80241FDC 8E2200B0 */ lw $v0, 0xb0($s1) /* B60290 80241FE0 30420004 */ andi $v0, $v0, 4 /* B60294 80241FE4 10400020 */ beqz $v0, .L80242068 -/* B60298 80241FE8 00000000 */ nop +/* B60298 80241FE8 00000000 */ nop .L80241FEC: /* B6029C 80241FEC 2404F7FF */ addiu $a0, $zero, -0x801 /* B602A0 80241FF0 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80241F38_B601E8 /* B60318 80242068 8E420070 */ lw $v0, 0x70($s2) /* B6031C 8024206C 2842001E */ slti $v0, $v0, 0x1e /* B60320 80242070 10400009 */ beqz $v0, .L80242098 -/* B60324 80242074 00000000 */ nop +/* B60324 80242074 00000000 */ nop /* B60328 80242078 8E22006C */ lw $v0, 0x6c($s1) /* B6032C 8024207C 14400006 */ bnez $v0, .L80242098 -/* B60330 80242080 00000000 */ nop +/* B60330 80242080 00000000 */ nop /* B60334 80242084 0C09061C */ jal func_80241870_B5FB20 /* B60338 80242088 0240202D */ daddu $a0, $s2, $zero /* B6033C 8024208C 10400002 */ beqz $v0, .L80242098 @@ -100,78 +100,93 @@ glabel func_80241F38_B601E8 /* B6034C 8024209C 2C620064 */ sltiu $v0, $v1, 0x64 /* B60350 802420A0 10400048 */ beqz $v0, .L802421C4 /* B60354 802420A4 00031080 */ sll $v0, $v1, 2 -/* B60358 802420A8 3C018024 */ lui $at, %hi(D_80247670) +/* B60358 802420A8 3C018024 */ lui $at, %hi(jtbl_80247670_B65920) /* B6035C 802420AC 00220821 */ addu $at, $at, $v0 -/* B60360 802420B0 8C227670 */ lw $v0, %lo(D_80247670)($at) +/* B60360 802420B0 8C227670 */ lw $v0, %lo(jtbl_80247670_B65920)($at) /* B60364 802420B4 00400008 */ jr $v0 -/* B60368 802420B8 00000000 */ nop +/* B60368 802420B8 00000000 */ nop +glabel L802420BC_B6036C /* B6036C 802420BC 0240202D */ daddu $a0, $s2, $zero /* B60370 802420C0 0260282D */ daddu $a1, $s3, $zero /* B60374 802420C4 0C012568 */ jal func_800495A0 /* B60378 802420C8 0280302D */ daddu $a2, $s4, $zero +glabel L802420CC_B6037C /* B6037C 802420CC 0240202D */ daddu $a0, $s2, $zero /* B60380 802420D0 0260282D */ daddu $a1, $s3, $zero /* B60384 802420D4 0C0125AE */ jal func_800496B8 /* B60388 802420D8 0280302D */ daddu $a2, $s4, $zero /* B6038C 802420DC 08090871 */ j .L802421C4 -/* B60390 802420E0 00000000 */ nop +/* B60390 802420E0 00000000 */ nop +glabel L802420E4_B60394 /* B60394 802420E4 0240202D */ daddu $a0, $s2, $zero /* B60398 802420E8 0260282D */ daddu $a1, $s3, $zero /* B6039C 802420EC 0C090515 */ jal jan_08_UnkNpcAIFunc4 /* B603A0 802420F0 0280302D */ daddu $a2, $s4, $zero +glabel L802420F4_B603A4 /* B603A4 802420F4 0240202D */ daddu $a0, $s2, $zero /* B603A8 802420F8 0260282D */ daddu $a1, $s3, $zero /* B603AC 802420FC 0C090529 */ jal func_802414A4_B5F754 /* B603B0 80242100 0280302D */ daddu $a2, $s4, $zero /* B603B4 80242104 08090871 */ j .L802421C4 -/* B603B8 80242108 00000000 */ nop +/* B603B8 80242108 00000000 */ nop +glabel L8024210C_B603BC /* B603BC 8024210C 0240202D */ daddu $a0, $s2, $zero /* B603C0 80242110 0260282D */ daddu $a1, $s3, $zero /* B603C4 80242114 0C01278F */ jal func_80049E3C /* B603C8 80242118 0280302D */ daddu $a2, $s4, $zero +glabel L8024211C_B603CC /* B603CC 8024211C 0240202D */ daddu $a0, $s2, $zero /* B603D0 80242120 0260282D */ daddu $a1, $s3, $zero /* B603D4 80242124 0C0127B3 */ jal func_80049ECC /* B603D8 80242128 0280302D */ daddu $a2, $s4, $zero /* B603DC 8024212C 08090871 */ j .L802421C4 -/* B603E0 80242130 00000000 */ nop +/* B603E0 80242130 00000000 */ nop +glabel L80242134_B603E4 /* B603E4 80242134 0240202D */ daddu $a0, $s2, $zero /* B603E8 80242138 0260282D */ daddu $a1, $s3, $zero /* B603EC 8024213C 0C0127DF */ jal func_80049F7C /* B603F0 80242140 0280302D */ daddu $a2, $s4, $zero +glabel L80242144_B603F4 /* B603F4 80242144 0240202D */ daddu $a0, $s2, $zero /* B603F8 80242148 0260282D */ daddu $a1, $s3, $zero /* B603FC 8024214C 0C012849 */ jal func_8004A124 /* B60400 80242150 0280302D */ daddu $a2, $s4, $zero /* B60404 80242154 08090871 */ j .L802421C4 -/* B60408 80242158 00000000 */ nop +/* B60408 80242158 00000000 */ nop +glabel L8024215C_B6040C /* B6040C 8024215C 0240202D */ daddu $a0, $s2, $zero /* B60410 80242160 0260282D */ daddu $a1, $s3, $zero /* B60414 80242164 0C0128FA */ jal func_8004A3E8 /* B60418 80242168 0280302D */ daddu $a2, $s4, $zero /* B6041C 8024216C 08090871 */ j .L802421C4 -/* B60420 80242170 00000000 */ nop +/* B60420 80242170 00000000 */ nop +glabel L80242174_B60424 /* B60424 80242174 0C09059A */ jal jan_08_UnkNpcAIFunc6 /* B60428 80242178 0240202D */ daddu $a0, $s2, $zero +glabel L8024217C_B6042C /* B6042C 8024217C 0C0905B5 */ jal jan_08_UnkNpcAIFunc7 /* B60430 80242180 0240202D */ daddu $a0, $s2, $zero /* B60434 80242184 8E430070 */ lw $v1, 0x70($s2) /* B60438 80242188 24020020 */ addiu $v0, $zero, 0x20 /* B6043C 8024218C 1462000D */ bne $v1, $v0, .L802421C4 -/* B60440 80242190 00000000 */ nop +/* B60440 80242190 00000000 */ nop +glabel L80242194_B60444 /* B60444 80242194 0C0905D1 */ jal jan_08_UnkNpcAIFunc8 /* B60448 80242198 0240202D */ daddu $a0, $s2, $zero /* B6044C 8024219C 8E430070 */ lw $v1, 0x70($s2) /* B60450 802421A0 24020021 */ addiu $v0, $zero, 0x21 /* B60454 802421A4 14620007 */ bne $v1, $v0, .L802421C4 -/* B60458 802421A8 00000000 */ nop +/* B60458 802421A8 00000000 */ nop +glabel L802421AC_B6045C /* B6045C 802421AC 0C090607 */ jal jan_08_UnkNpcAIFunc5 /* B60460 802421B0 0240202D */ daddu $a0, $s2, $zero /* B60464 802421B4 08090871 */ j .L802421C4 -/* B60468 802421B8 00000000 */ nop +/* B60468 802421B8 00000000 */ nop +glabel L802421BC_B6046C /* B6046C 802421BC 0C0129CF */ jal func_8004A73C /* B60470 802421C0 0240202D */ daddu $a0, $s2, $zero .L802421C4: +glabel L802421C4_B60474 /* B60474 802421C4 8FBF0048 */ lw $ra, 0x48($sp) /* B60478 802421C8 8FB50044 */ lw $s5, 0x44($sp) /* B6047C 802421CC 8FB40040 */ lw $s4, 0x40($sp) @@ -182,4 +197,4 @@ glabel func_80241F38_B601E8 /* B60490 802421E0 0000102D */ daddu $v0, $zero, $zero /* B60494 802421E4 03E00008 */ jr $ra /* B60498 802421E8 27BD0050 */ addiu $sp, $sp, 0x50 -/* B6049C 802421EC 00000000 */ nop +/* B6049C 802421EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_80240034_B65AE4.s b/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_80240034_B65AE4.s index 7bc9269325..a1a8cc72a4 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_80240034_B65AE4.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_80240034_B65AE4.s @@ -22,16 +22,16 @@ glabel func_80240034_B65AE4 /* B65B24 80240074 00021023 */ negu $v0, $v0 .L80240078: /* B65B28 80240078 14400003 */ bnez $v0, .L80240088 -/* B65B2C 8024007C 00000000 */ nop +/* B65B2C 8024007C 00000000 */ nop /* B65B30 80240080 50E00017 */ beql $a3, $zero, .L802400E0 /* B65B34 80240084 0000102D */ daddu $v0, $zero, $zero .L80240088: /* B65B38 80240088 44822000 */ mtc1 $v0, $f4 -/* B65B3C 8024008C 00000000 */ nop +/* B65B3C 8024008C 00000000 */ nop /* B65B40 80240090 46802120 */ cvt.s.w $f4, $f4 /* B65B44 80240094 44062000 */ mfc1 $a2, $f4 /* B65B48 80240098 44872000 */ mtc1 $a3, $f4 -/* B65B4C 8024009C 00000000 */ nop +/* B65B4C 8024009C 00000000 */ nop /* B65B50 802400A0 46802120 */ cvt.s.w $f4, $f4 /* B65B54 802400A4 44806000 */ mtc1 $zero, $f12 /* B65B58 802400A8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240034_B65AE4 /* B65B60 802400B0 46006386 */ mov.s $f14, $f12 /* B65B64 802400B4 3C014270 */ lui $at, 0x4270 /* B65B68 802400B8 44811000 */ mtc1 $at, $f2 -/* B65B6C 802400BC 00000000 */ nop +/* B65B6C 802400BC 00000000 */ nop /* B65B70 802400C0 4602003C */ c.lt.s $f0, $f2 -/* B65B74 802400C4 00000000 */ nop +/* B65B74 802400C4 00000000 */ nop /* B65B78 802400C8 45000004 */ bc1f .L802400DC /* B65B7C 802400CC 24020001 */ addiu $v0, $zero, 1 /* B65B80 802400D0 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_8024082C_B662DC.s b/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_8024082C_B662DC.s index 6e8f5a6c87..ba21f19739 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_8024082C_B662DC.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_8024082C_B662DC.s @@ -13,7 +13,7 @@ glabel func_8024082C_B662DC /* B662FC 8024084C D4206590 */ ldc1 $f0, %lo(D_80246590)($at) /* B66300 80240850 4600A521 */ cvt.d.s $f20, $f20 /* B66304 80240854 4620A502 */ mul.d $f20, $f20, $f0 -/* B66308 80240858 00000000 */ nop +/* B66308 80240858 00000000 */ nop /* B6630C 8024085C 3C013F80 */ lui $at, 0x3f80 /* B66310 80240860 44810000 */ mtc1 $at, $f0 /* B66314 80240864 AE000018 */ sw $zero, 0x18($s0) diff --git a/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_80240888_B66338.s b/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_80240888_B66338.s index f17b78b6d8..ab207d5214 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_80240888_B66338.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_80240888_B66338.s @@ -25,7 +25,7 @@ glabel func_80240888_B66338 /* B66388 802408D8 96020000 */ lhu $v0, ($s0) /* B6638C 802408DC 30420400 */ andi $v0, $v0, 0x400 /* B66390 802408E0 14400008 */ bnez $v0, .L80240904 -/* B66394 802408E4 00000000 */ nop +/* B66394 802408E4 00000000 */ nop /* B66398 802408E8 4405A000 */ mfc1 $a1, $f20 /* B6639C 802408EC 0C09020B */ jal func_8024082C_B662DC /* B663A0 802408F0 26040058 */ addiu $a0, $s0, 0x58 @@ -49,4 +49,4 @@ glabel func_80240888_B66338 /* B663E0 80240930 24020002 */ addiu $v0, $zero, 2 /* B663E4 80240934 03E00008 */ jr $ra /* B663E8 80240938 27BD0068 */ addiu $sp, $sp, 0x68 -/* B663EC 8024093C 00000000 */ nop +/* B663EC 8024093C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240990_B66440.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240990_B66440.s index 40e4e79dd0..3fe061f795 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240990_B66440.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240990_B66440.s @@ -31,17 +31,19 @@ glabel func_80240990_B66440 /* B664A0 802409F0 2C620006 */ sltiu $v0, $v1, 6 /* B664A4 802409F4 1040004D */ beqz $v0, .L80240B2C /* B664A8 802409F8 00031080 */ sll $v0, $v1, 2 -/* B664AC 802409FC 3C018024 */ lui $at, %hi(D_802465A0) +/* B664AC 802409FC 3C018024 */ lui $at, %hi(jtbl_802465A0_B6C050) /* B664B0 80240A00 00220821 */ addu $at, $at, $v0 -/* B664B4 80240A04 8C2265A0 */ lw $v0, %lo(D_802465A0)($at) +/* B664B4 80240A04 8C2265A0 */ lw $v0, %lo(jtbl_802465A0_B6C050)($at) /* B664B8 80240A08 00400008 */ jr $v0 -/* B664BC 80240A0C 00000000 */ nop +/* B664BC 80240A0C 00000000 */ nop +glabel L80240A10_B664C0 /* B664C0 80240A10 3C030042 */ lui $v1, 0x42 /* B664C4 80240A14 3463000F */ ori $v1, $v1, 0xf /* B664C8 80240A18 24020002 */ addiu $v0, $zero, 2 /* B664CC 80240A1C AE02006C */ sw $v0, 0x6c($s0) /* B664D0 80240A20 AE000070 */ sw $zero, 0x70($s0) /* B664D4 80240A24 AE230028 */ sw $v1, 0x28($s1) +glabel L80240A28_B664D8 /* B664D8 80240A28 8E020070 */ lw $v0, 0x70($s0) /* B664DC 80240A2C 24420001 */ addiu $v0, $v0, 1 /* B664E0 80240A30 AE020070 */ sw $v0, 0x70($s0) @@ -50,12 +52,14 @@ glabel func_80240990_B66440 /* B664EC 80240A3C 24020005 */ addiu $v0, $zero, 5 /* B664F0 80240A40 080902CB */ j .L80240B2C /* B664F4 80240A44 AE02006C */ sw $v0, 0x6c($s0) +glabel L80240A48_B664F8 /* B664F8 80240A48 3C030042 */ lui $v1, 0x42 /* B664FC 80240A4C 34630010 */ ori $v1, $v1, 0x10 /* B66500 80240A50 24020004 */ addiu $v0, $zero, 4 /* B66504 80240A54 AE02006C */ sw $v0, 0x6c($s0) /* B66508 80240A58 AE000070 */ sw $zero, 0x70($s0) /* B6650C 80240A5C AE230028 */ sw $v1, 0x28($s1) +glabel L80240A60_B66510 /* B66510 80240A60 8E020070 */ lw $v0, 0x70($s0) /* B66514 80240A64 24030019 */ addiu $v1, $zero, 0x19 /* B66518 80240A68 24420001 */ addiu $v0, $v0, 1 @@ -63,7 +67,7 @@ glabel func_80240990_B66440 /* B66520 80240A70 AE020070 */ sw $v0, 0x70($s0) /* B66524 80240A74 3C0142B4 */ lui $at, 0x42b4 /* B66528 80240A78 44810000 */ mtc1 $at, $f0 -/* B6652C 80240A7C 00000000 */ nop +/* B6652C 80240A7C 00000000 */ nop /* B66530 80240A80 E620000C */ swc1 $f0, 0xc($s1) .L80240A84: /* B66534 80240A84 8E020070 */ lw $v0, 0x70($s0) @@ -72,6 +76,7 @@ glabel func_80240990_B66440 /* B66540 80240A90 24020005 */ addiu $v0, $zero, 5 /* B66544 80240A94 080902CB */ j .L80240B2C /* B66548 80240A98 AE02006C */ sw $v0, 0x6c($s0) +glabel L80240A9C_B6654C /* B6654C 80240A9C 3C030042 */ lui $v1, 0x42 /* B66550 80240AA0 24020006 */ addiu $v0, $zero, 6 /* B66554 80240AA4 34630003 */ ori $v1, $v1, 3 @@ -83,7 +88,7 @@ glabel func_80240990_B66440 /* B6656C 80240ABC AFA00014 */ sw $zero, 0x14($sp) /* B66570 80240AC0 AFA20018 */ sw $v0, 0x18($sp) /* B66574 80240AC4 44840000 */ mtc1 $a0, $f0 -/* B66578 80240AC8 00000000 */ nop +/* B66578 80240AC8 00000000 */ nop /* B6657C 80240ACC 46800020 */ cvt.s.w $f0, $f0 /* B66580 80240AD0 E7A00010 */ swc1 $f0, 0x10($sp) /* B66584 80240AD4 8E250038 */ lw $a1, 0x38($s1) @@ -91,12 +96,13 @@ glabel func_80240990_B66440 /* B6658C 80240ADC 8E270040 */ lw $a3, 0x40($s1) /* B66590 80240AE0 0C01C1E4 */ jal fx_sweat /* B66594 80240AE4 0000202D */ daddu $a0, $zero, $zero +glabel L80240AE8_B66598 /* B66598 80240AE8 8E020070 */ lw $v0, 0x70($s0) /* B6659C 80240AEC 24420001 */ addiu $v0, $v0, 1 /* B665A0 80240AF0 AE020070 */ sw $v0, 0x70($s0) /* B665A4 80240AF4 2842000B */ slti $v0, $v0, 0xb /* B665A8 80240AF8 1440000C */ bnez $v0, .L80240B2C -/* B665AC 80240AFC 00000000 */ nop +/* B665AC 80240AFC 00000000 */ nop /* B665B0 80240B00 0C00A67F */ jal rand_int /* B665B4 80240B04 24040064 */ addiu $a0, $zero, 0x64 /* B665B8 80240B08 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240D5C_B6680C.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240D5C_B6680C.s index b53c829491..fde3be0208 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240D5C_B6680C.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240D5C_B6680C.s @@ -42,7 +42,7 @@ glabel func_80240D5C_B6680C /* B668A0 80240DF0 C6620074 */ lwc1 $f2, 0x74($s3) /* B668A4 80240DF4 468010A0 */ cvt.s.w $f2, $f2 /* B668A8 80240DF8 4600103C */ c.lt.s $f2, $f0 -/* B668AC 80240DFC 00000000 */ nop +/* B668AC 80240DFC 00000000 */ nop /* B668B0 80240E00 45030001 */ bc1tl .L80240E08 /* B668B4 80240E04 0000882D */ daddu $s1, $zero, $zero .L80240E08: @@ -51,16 +51,16 @@ glabel func_80240D5C_B6680C /* B668C0 80240E10 3C014387 */ lui $at, 0x4387 /* B668C4 80240E14 4481A000 */ mtc1 $at, $f20 /* B668C8 80240E18 0C00A70A */ jal get_clamped_angle_diff -/* B668CC 80240E1C 00000000 */ nop +/* B668CC 80240E1C 00000000 */ nop /* B668D0 80240E20 0C00A6C9 */ jal clamp_angle /* B668D4 80240E24 46000306 */ mov.s $f12, $f0 /* B668D8 80240E28 3C018024 */ lui $at, %hi(D_802465B8) /* B668DC 80240E2C D42265B8 */ ldc1 $f2, %lo(D_802465B8)($at) /* B668E0 80240E30 46000021 */ cvt.d.s $f0, $f0 /* B668E4 80240E34 4622003C */ c.lt.d $f0, $f2 -/* B668E8 80240E38 00000000 */ nop +/* B668E8 80240E38 00000000 */ nop /* B668EC 80240E3C 45000003 */ bc1f .L80240E4C -/* B668F0 80240E40 00000000 */ nop +/* B668F0 80240E40 00000000 */ nop /* B668F4 80240E44 3C0142B4 */ lui $at, 0x42b4 /* B668F8 80240E48 4481A000 */ mtc1 $at, $f20 .L80240E4C: @@ -77,7 +77,7 @@ glabel func_80240D5C_B6680C /* B66924 80240E74 468010A0 */ cvt.s.w $f2, $f2 /* B66928 80240E78 46000005 */ abs.s $f0, $f0 /* B6692C 80240E7C 4600103C */ c.lt.s $f2, $f0 -/* B66930 80240E80 00000000 */ nop +/* B66930 80240E80 00000000 */ nop /* B66934 80240E84 45030001 */ bc1tl .L80240E8C /* B66938 80240E88 0000882D */ daddu $s1, $zero, $zero .L80240E8C: @@ -87,13 +87,13 @@ glabel func_80240D5C_B6680C /* B66948 80240E98 860200A8 */ lh $v0, 0xa8($s0) /* B6694C 80240E9C 46020001 */ sub.s $f0, $f0, $f2 /* B66950 80240EA0 44821000 */ mtc1 $v0, $f2 -/* B66954 80240EA4 00000000 */ nop +/* B66954 80240EA4 00000000 */ nop /* B66958 80240EA8 468010A1 */ cvt.d.w $f2, $f2 /* B6695C 80240EAC 46221080 */ add.d $f2, $f2, $f2 /* B66960 80240EB0 46000005 */ abs.s $f0, $f0 /* B66964 80240EB4 46000021 */ cvt.d.s $f0, $f0 /* B66968 80240EB8 4620103E */ c.le.d $f2, $f0 -/* B6696C 80240EBC 00000000 */ nop +/* B6696C 80240EBC 00000000 */ nop /* B66970 80240EC0 45030001 */ bc1tl .L80240EC8 /* B66974 80240EC4 0000882D */ daddu $s1, $zero, $zero .L80240EC8: diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240F10_B669C0.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240F10_B669C0.s index 61ad28525f..5b5a34d37a 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240F10_B669C0.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240F10_B669C0.s @@ -19,7 +19,7 @@ glabel func_80240F10_B669C0 /* B669F8 80240F48 8E2200B0 */ lw $v0, 0xb0($s1) /* B669FC 80240F4C 30420004 */ andi $v0, $v0, 4 /* B66A00 80240F50 10400015 */ beqz $v0, .L80240FA8 -/* B66A04 80240F54 00000000 */ nop +/* B66A04 80240F54 00000000 */ nop .L80240F58: /* B66A08 80240F58 AE800070 */ sw $zero, 0x70($s4) /* B66A0C 80240F5C 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel func_80240F10_B669C0 /* B66A5C 80240FAC 12600005 */ beqz $s3, .L80240FC4 /* B66A60 80240FB0 24020001 */ addiu $v0, $zero, 1 /* B66A64 80240FB4 12620048 */ beq $s3, $v0, .L802410D8 -/* B66A68 80240FB8 00000000 */ nop +/* B66A68 80240FB8 00000000 */ nop /* B66A6C 80240FBC 08090453 */ j .L8024114C -/* B66A70 80240FC0 00000000 */ nop +/* B66A70 80240FC0 00000000 */ nop .L80240FC4: /* B66A74 80240FC4 86240008 */ lh $a0, 8($s1) /* B66A78 80240FC8 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel func_80240F10_B669C0 /* B66A98 80240FE8 8E03006C */ lw $v1, 0x6c($s0) /* B66A9C 80240FEC 24020003 */ addiu $v0, $zero, 3 /* B66AA0 80240FF0 14620056 */ bne $v1, $v0, .L8024114C -/* B66AA4 80240FF4 00000000 */ nop +/* B66AA4 80240FF4 00000000 */ nop /* B66AA8 80240FF8 8E2500A8 */ lw $a1, 0xa8($s1) /* B66AAC 80240FFC 10A00003 */ beqz $a1, .L8024100C /* B66AB0 80241000 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel func_80240F10_B669C0 /* B66B28 80241078 C7A20014 */ lwc1 $f2, 0x14($sp) /* B66B2C 8024107C 4600020D */ trunc.w.s $f8, $f0 /* B66B30 80241080 44024000 */ mfc1 $v0, $f8 -/* B66B34 80241084 00000000 */ nop +/* B66B34 80241084 00000000 */ nop /* B66B38 80241088 A6220012 */ sh $v0, 0x12($s1) /* B66B3C 8024108C 4600120D */ trunc.w.s $f8, $f2 /* B66B40 80241090 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s index 2293d3c68f..d263b2ed06 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s @@ -100,78 +100,93 @@ glabel func_80241170_B66C20 /* B66D84 802412D4 2C620064 */ sltiu $v0, $v1, 0x64 /* B66D88 802412D8 10400048 */ beqz $v0, .L802413FC /* B66D8C 802412DC 00031080 */ sll $v0, $v1, 2 -/* B66D90 802412E0 3C018024 */ lui $at, %hi(D_802465C0) +/* B66D90 802412E0 3C018024 */ lui $at, %hi(jtbl_802465C0_B6C070) /* B66D94 802412E4 00220821 */ addu $at, $at, $v0 -/* B66D98 802412E8 8C2265C0 */ lw $v0, %lo(D_802465C0)($at) +/* B66D98 802412E8 8C2265C0 */ lw $v0, %lo(jtbl_802465C0_B6C070)($at) /* B66D9C 802412EC 00400008 */ jr $v0 /* B66DA0 802412F0 00000000 */ nop +glabel L802412F4_B66DA4 /* B66DA4 802412F4 0240202D */ daddu $a0, $s2, $zero /* B66DA8 802412F8 0260282D */ daddu $a1, $s3, $zero /* B66DAC 802412FC 0C012568 */ jal func_800495A0 /* B66DB0 80241300 0280302D */ daddu $a2, $s4, $zero +glabel L80241304_B66DB4 /* B66DB4 80241304 0240202D */ daddu $a0, $s2, $zero /* B66DB8 80241308 0260282D */ daddu $a1, $s3, $zero /* B66DBC 8024130C 0C0125AE */ jal func_800496B8 /* B66DC0 80241310 0280302D */ daddu $a2, $s4, $zero /* B66DC4 80241314 080904FF */ j .L802413FC /* B66DC8 80241318 00000000 */ nop +glabel L8024131C_B66DCC /* B66DCC 8024131C 0240202D */ daddu $a0, $s2, $zero /* B66DD0 80241320 0260282D */ daddu $a1, $s3, $zero /* B66DD4 80241324 0C0126D1 */ jal base_UnkNpcAIFunc1 /* B66DD8 80241328 0280302D */ daddu $a2, $s4, $zero +glabel L8024132C_B66DDC /* B66DDC 8024132C 0240202D */ daddu $a0, $s2, $zero /* B66DE0 80241330 0260282D */ daddu $a1, $s3, $zero /* B66DE4 80241334 0C012701 */ jal func_80049C04 /* B66DE8 80241338 0280302D */ daddu $a2, $s4, $zero /* B66DEC 8024133C 080904FF */ j .L802413FC /* B66DF0 80241340 00000000 */ nop +glabel L80241344_B66DF4 /* B66DF4 80241344 0240202D */ daddu $a0, $s2, $zero /* B66DF8 80241348 0260282D */ daddu $a1, $s3, $zero /* B66DFC 8024134C 0C01278F */ jal func_80049E3C /* B66E00 80241350 0280302D */ daddu $a2, $s4, $zero +glabel L80241354_B66E04 /* B66E04 80241354 0240202D */ daddu $a0, $s2, $zero /* B66E08 80241358 0260282D */ daddu $a1, $s3, $zero /* B66E0C 8024135C 0C0127B3 */ jal func_80049ECC /* B66E10 80241360 0280302D */ daddu $a2, $s4, $zero /* B66E14 80241364 080904FF */ j .L802413FC /* B66E18 80241368 00000000 */ nop +glabel L8024136C_B66E1C /* B66E1C 8024136C 0240202D */ daddu $a0, $s2, $zero /* B66E20 80241370 0260282D */ daddu $a1, $s3, $zero /* B66E24 80241374 0C0127DF */ jal func_80049F7C /* B66E28 80241378 0280302D */ daddu $a2, $s4, $zero +glabel L8024137C_B66E2C /* B66E2C 8024137C 0240202D */ daddu $a0, $s2, $zero /* B66E30 80241380 0260282D */ daddu $a1, $s3, $zero /* B66E34 80241384 0C012849 */ jal func_8004A124 /* B66E38 80241388 0280302D */ daddu $a2, $s4, $zero /* B66E3C 8024138C 080904FF */ j .L802413FC /* B66E40 80241390 00000000 */ nop +glabel L80241394_B66E44 /* B66E44 80241394 0240202D */ daddu $a0, $s2, $zero /* B66E48 80241398 0260282D */ daddu $a1, $s3, $zero /* B66E4C 8024139C 0C0128FA */ jal func_8004A3E8 /* B66E50 802413A0 0280302D */ daddu $a2, $s4, $zero /* B66E54 802413A4 080904FF */ j .L802413FC /* B66E58 802413A8 00000000 */ nop +glabel L802413AC_B66E5C /* B66E5C 802413AC 0C0902D5 */ jal jan_09_UnkNpcAIFunc6 /* B66E60 802413B0 0240202D */ daddu $a0, $s2, $zero +glabel L802413B4_B66E64 /* B66E64 802413B4 0C0902F0 */ jal jan_09_UnkNpcAIFunc7 /* B66E68 802413B8 0240202D */ daddu $a0, $s2, $zero /* B66E6C 802413BC 8E430070 */ lw $v1, 0x70($s2) /* B66E70 802413C0 24020020 */ addiu $v0, $zero, 0x20 /* B66E74 802413C4 1462000D */ bne $v1, $v0, .L802413FC /* B66E78 802413C8 00000000 */ nop +glabel L802413CC_B66E7C /* B66E7C 802413CC 0C09030C */ jal jan_09_UnkNpcAIFunc8 /* B66E80 802413D0 0240202D */ daddu $a0, $s2, $zero /* B66E84 802413D4 8E430070 */ lw $v1, 0x70($s2) /* B66E88 802413D8 24020021 */ addiu $v0, $zero, 0x21 /* B66E8C 802413DC 14620007 */ bne $v1, $v0, .L802413FC /* B66E90 802413E0 00000000 */ nop +glabel L802413E4_B66E94 /* B66E94 802413E4 0C090342 */ jal jan_09_UnkNpcAIFunc5 /* B66E98 802413E8 0240202D */ daddu $a0, $s2, $zero /* B66E9C 802413EC 080904FF */ j .L802413FC /* B66EA0 802413F0 00000000 */ nop +glabel L802413F4_B66EA4 /* B66EA4 802413F4 0C0129CF */ jal func_8004A73C /* B66EA8 802413F8 0240202D */ daddu $a0, $s2, $zero .L802413FC: +glabel L802413FC_B66EAC /* B66EAC 802413FC 8FBF0048 */ lw $ra, 0x48($sp) /* B66EB0 80241400 8FB50044 */ lw $s5, 0x44($sp) /* B66EB4 80241404 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s index 5343f6d79f..fed098872c 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s @@ -46,7 +46,7 @@ glabel func_80241424_B66ED4 /* B66F78 802414C8 8E2200B0 */ lw $v0, 0xb0($s1) /* B66F7C 802414CC 30420004 */ andi $v0, $v0, 4 /* B66F80 802414D0 10400020 */ beqz $v0, .L80241554 -/* B66F84 802414D4 00000000 */ nop +/* B66F84 802414D4 00000000 */ nop .L802414D8: /* B66F88 802414D8 2404F7FF */ addiu $a0, $zero, -0x801 /* B66F8C 802414DC AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80241424_B66ED4 /* B67004 80241554 8E420070 */ lw $v0, 0x70($s2) /* B67008 80241558 2842001E */ slti $v0, $v0, 0x1e /* B6700C 8024155C 10400009 */ beqz $v0, .L80241584 -/* B67010 80241560 00000000 */ nop +/* B67010 80241560 00000000 */ nop /* B67014 80241564 8E22006C */ lw $v0, 0x6c($s1) /* B67018 80241568 14400006 */ bnez $v0, .L80241584 -/* B6701C 8024156C 00000000 */ nop +/* B6701C 8024156C 00000000 */ nop /* B67020 80241570 0C090357 */ jal func_80240D5C_B6680C /* B67024 80241574 0240202D */ daddu $a0, $s2, $zero /* B67028 80241578 10400002 */ beqz $v0, .L80241584 @@ -100,78 +100,93 @@ glabel func_80241424_B66ED4 /* B67038 80241588 2C620064 */ sltiu $v0, $v1, 0x64 /* B6703C 8024158C 10400048 */ beqz $v0, .L802416B0 /* B67040 80241590 00031080 */ sll $v0, $v1, 2 -/* B67044 80241594 3C018024 */ lui $at, %hi(D_80246750) +/* B67044 80241594 3C018024 */ lui $at, %hi(jtbl_80246750_B6C200) /* B67048 80241598 00220821 */ addu $at, $at, $v0 -/* B6704C 8024159C 8C226750 */ lw $v0, %lo(D_80246750)($at) +/* B6704C 8024159C 8C226750 */ lw $v0, %lo(jtbl_80246750_B6C200)($at) /* B67050 802415A0 00400008 */ jr $v0 -/* B67054 802415A4 00000000 */ nop +/* B67054 802415A4 00000000 */ nop +glabel L802415A8_B67058 /* B67058 802415A8 0240202D */ daddu $a0, $s2, $zero /* B6705C 802415AC 0260282D */ daddu $a1, $s3, $zero /* B67060 802415B0 0C012568 */ jal func_800495A0 /* B67064 802415B4 0280302D */ daddu $a2, $s4, $zero +glabel L802415B8_B67068 /* B67068 802415B8 0240202D */ daddu $a0, $s2, $zero /* B6706C 802415BC 0260282D */ daddu $a1, $s3, $zero /* B67070 802415C0 0C0125AE */ jal func_800496B8 /* B67074 802415C4 0280302D */ daddu $a2, $s4, $zero /* B67078 802415C8 080905AC */ j .L802416B0 -/* B6707C 802415CC 00000000 */ nop +/* B6707C 802415CC 00000000 */ nop +glabel L802415D0_B67080 /* B67080 802415D0 0240202D */ daddu $a0, $s2, $zero /* B67084 802415D4 0260282D */ daddu $a1, $s3, $zero /* B67088 802415D8 0C090250 */ jal jan_09_UnkNpcAIFunc4 /* B6708C 802415DC 0280302D */ daddu $a2, $s4, $zero +glabel L802415E0_B67090 /* B67090 802415E0 0240202D */ daddu $a0, $s2, $zero /* B67094 802415E4 0260282D */ daddu $a1, $s3, $zero /* B67098 802415E8 0C090264 */ jal func_80240990_B66440 /* B6709C 802415EC 0280302D */ daddu $a2, $s4, $zero /* B670A0 802415F0 080905AC */ j .L802416B0 -/* B670A4 802415F4 00000000 */ nop +/* B670A4 802415F4 00000000 */ nop +glabel L802415F8_B670A8 /* B670A8 802415F8 0240202D */ daddu $a0, $s2, $zero /* B670AC 802415FC 0260282D */ daddu $a1, $s3, $zero /* B670B0 80241600 0C01278F */ jal func_80049E3C /* B670B4 80241604 0280302D */ daddu $a2, $s4, $zero +glabel L80241608_B670B8 /* B670B8 80241608 0240202D */ daddu $a0, $s2, $zero /* B670BC 8024160C 0260282D */ daddu $a1, $s3, $zero /* B670C0 80241610 0C0127B3 */ jal func_80049ECC /* B670C4 80241614 0280302D */ daddu $a2, $s4, $zero /* B670C8 80241618 080905AC */ j .L802416B0 -/* B670CC 8024161C 00000000 */ nop +/* B670CC 8024161C 00000000 */ nop +glabel L80241620_B670D0 /* B670D0 80241620 0240202D */ daddu $a0, $s2, $zero /* B670D4 80241624 0260282D */ daddu $a1, $s3, $zero /* B670D8 80241628 0C0127DF */ jal func_80049F7C /* B670DC 8024162C 0280302D */ daddu $a2, $s4, $zero +glabel L80241630_B670E0 /* B670E0 80241630 0240202D */ daddu $a0, $s2, $zero /* B670E4 80241634 0260282D */ daddu $a1, $s3, $zero /* B670E8 80241638 0C012849 */ jal func_8004A124 /* B670EC 8024163C 0280302D */ daddu $a2, $s4, $zero /* B670F0 80241640 080905AC */ j .L802416B0 -/* B670F4 80241644 00000000 */ nop +/* B670F4 80241644 00000000 */ nop +glabel L80241648_B670F8 /* B670F8 80241648 0240202D */ daddu $a0, $s2, $zero /* B670FC 8024164C 0260282D */ daddu $a1, $s3, $zero /* B67100 80241650 0C0128FA */ jal func_8004A3E8 /* B67104 80241654 0280302D */ daddu $a2, $s4, $zero /* B67108 80241658 080905AC */ j .L802416B0 -/* B6710C 8024165C 00000000 */ nop +/* B6710C 8024165C 00000000 */ nop +glabel L80241660_B67110 /* B67110 80241660 0C0902D5 */ jal jan_09_UnkNpcAIFunc6 /* B67114 80241664 0240202D */ daddu $a0, $s2, $zero +glabel L80241668_B67118 /* B67118 80241668 0C0902F0 */ jal jan_09_UnkNpcAIFunc7 /* B6711C 8024166C 0240202D */ daddu $a0, $s2, $zero /* B67120 80241670 8E430070 */ lw $v1, 0x70($s2) /* B67124 80241674 24020020 */ addiu $v0, $zero, 0x20 /* B67128 80241678 1462000D */ bne $v1, $v0, .L802416B0 -/* B6712C 8024167C 00000000 */ nop +/* B6712C 8024167C 00000000 */ nop +glabel L80241680_B67130 /* B67130 80241680 0C09030C */ jal jan_09_UnkNpcAIFunc8 /* B67134 80241684 0240202D */ daddu $a0, $s2, $zero /* B67138 80241688 8E430070 */ lw $v1, 0x70($s2) /* B6713C 8024168C 24020021 */ addiu $v0, $zero, 0x21 /* B67140 80241690 14620007 */ bne $v1, $v0, .L802416B0 -/* B67144 80241694 00000000 */ nop +/* B67144 80241694 00000000 */ nop +glabel L80241698_B67148 /* B67148 80241698 0C090342 */ jal jan_09_UnkNpcAIFunc5 /* B6714C 8024169C 0240202D */ daddu $a0, $s2, $zero /* B67150 802416A0 080905AC */ j .L802416B0 -/* B67154 802416A4 00000000 */ nop +/* B67154 802416A4 00000000 */ nop +glabel L802416A8_B67158 /* B67158 802416A8 0C0129CF */ jal func_8004A73C /* B6715C 802416AC 0240202D */ daddu $a0, $s2, $zero .L802416B0: +glabel L802416B0_B67160 /* B67160 802416B0 8FBF0048 */ lw $ra, 0x48($sp) /* B67164 802416B4 8FB50044 */ lw $s5, 0x44($sp) /* B67168 802416B8 8FB40040 */ lw $s4, 0x40($sp) @@ -182,5 +197,5 @@ glabel func_80241424_B66ED4 /* B6717C 802416CC 0000102D */ daddu $v0, $zero, $zero /* B67180 802416D0 03E00008 */ jr $ra /* B67184 802416D4 27BD0050 */ addiu $sp, $sp, 0x50 -/* B67188 802416D8 00000000 */ nop -/* B6718C 802416DC 00000000 */ nop +/* B67188 802416D8 00000000 */ nop +/* B6718C 802416DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/delete_actor_B6CF4C.s b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/delete_actor_B6CF4C.s index 832af5d694..cdf1d6a482 100644 --- a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/delete_actor_B6CF4C.s +++ b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/delete_actor_B6CF4C.s @@ -25,7 +25,7 @@ glabel delete_actor_B6CF4C /* B6CF9C 80240C0C 44801800 */ mtc1 $zero, $f3 /* B6CFA0 80240C10 46000021 */ cvt.d.s $f0, $f0 /* B6CFA4 80240C14 4620103C */ c.lt.d $f2, $f0 -/* B6CFA8 80240C18 00000000 */ nop +/* B6CFA8 80240C18 00000000 */ nop /* B6CFAC 80240C1C 45000021 */ bc1f .L80240CA4 /* B6CFB0 80240C20 27A50028 */ addiu $a1, $sp, 0x28 /* B6CFB4 80240C24 C6600038 */ lwc1 $f0, 0x38($s3) @@ -40,20 +40,20 @@ glabel delete_actor_B6CF4C /* B6CFD8 80240C48 E7A00014 */ swc1 $f0, 0x14($sp) /* B6CFDC 80240C4C 866200A8 */ lh $v0, 0xa8($s3) /* B6CFE0 80240C50 44820000 */ mtc1 $v0, $f0 -/* B6CFE4 80240C54 00000000 */ nop +/* B6CFE4 80240C54 00000000 */ nop /* B6CFE8 80240C58 46800020 */ cvt.s.w $f0, $f0 /* B6CFEC 80240C5C E7A00018 */ swc1 $f0, 0x18($sp) /* B6CFF0 80240C60 866200A6 */ lh $v0, 0xa6($s3) /* B6CFF4 80240C64 27A6002C */ addiu $a2, $sp, 0x2c /* B6CFF8 80240C68 44820000 */ mtc1 $v0, $f0 -/* B6CFFC 80240C6C 00000000 */ nop +/* B6CFFC 80240C6C 00000000 */ nop /* B6D000 80240C70 46800020 */ cvt.s.w $f0, $f0 /* B6D004 80240C74 E7A0001C */ swc1 $f0, 0x1c($sp) /* B6D008 80240C78 8E640080 */ lw $a0, 0x80($s3) /* B6D00C 80240C7C 0C037711 */ jal func_800DDC44 /* B6D010 80240C80 27A70030 */ addiu $a3, $sp, 0x30 /* B6D014 80240C84 10400003 */ beqz $v0, .L80240C94 -/* B6D018 80240C88 00000000 */ nop +/* B6D018 80240C88 00000000 */ nop /* B6D01C 80240C8C 08090329 */ j .L80240CA4 /* B6D020 80240C90 AE600018 */ sw $zero, 0x18($s3) .L80240C94: @@ -67,7 +67,7 @@ glabel delete_actor_B6CF4C /* B6D03C 80240CAC 44801800 */ mtc1 $zero, $f3 /* B6D040 80240CB0 46000021 */ cvt.d.s $f0, $f0 /* B6D044 80240CB4 4622003C */ c.lt.d $f0, $f2 -/* B6D048 80240CB8 00000000 */ nop +/* B6D048 80240CB8 00000000 */ nop /* B6D04C 80240CBC 4500006C */ bc1f .L80240E70 /* B6D050 80240CC0 27B00028 */ addiu $s0, $sp, 0x28 /* B6D054 80240CC4 0200282D */ daddu $a1, $s0, $zero @@ -116,7 +116,7 @@ glabel delete_actor_B6CF4C /* B6D100 80240D70 0C0372DF */ jal func_800DCB7C /* B6D104 80240D74 0220382D */ daddu $a3, $s1, $zero /* B6D108 80240D78 1040003D */ beqz $v0, .L80240E70 -/* B6D10C 80240D7C 00000000 */ nop +/* B6D10C 80240D7C 00000000 */ nop /* B6D110 80240D80 C660001C */ lwc1 $f0, 0x1c($s3) /* B6D114 80240D84 C7A20038 */ lwc1 $f2, 0x38($sp) /* B6D118 80240D88 46000005 */ abs.s $f0, $f0 @@ -124,7 +124,7 @@ glabel delete_actor_B6CF4C /* B6D120 80240D90 46340000 */ add.d $f0, $f0, $f20 /* B6D124 80240D94 460010A1 */ cvt.d.s $f2, $f2 /* B6D128 80240D98 4620103E */ c.le.d $f2, $f0 -/* B6D12C 80240D9C 00000000 */ nop +/* B6D12C 80240D9C 00000000 */ nop /* B6D130 80240DA0 45000033 */ bc1f .L80240E70 /* B6D134 80240DA4 2403F7FF */ addiu $v1, $zero, -0x801 /* B6D138 80240DA8 C7A0002C */ lwc1 $f0, 0x2c($sp) @@ -163,7 +163,7 @@ glabel delete_actor_B6CF4C /* B6D1BC 80240E2C 2402000F */ addiu $v0, $zero, 0xf /* B6D1C0 80240E30 AFA2001C */ sw $v0, 0x1c($sp) /* B6D1C4 80240E34 44834000 */ mtc1 $v1, $f8 -/* B6D1C8 80240E38 00000000 */ nop +/* B6D1C8 80240E38 00000000 */ nop /* B6D1CC 80240E3C 46804220 */ cvt.s.w $f8, $f8 /* B6D1D0 80240E40 44074000 */ mfc1 $a3, $f8 /* B6D1D4 80240E44 27A2003C */ addiu $v0, $sp, 0x3c diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240310_B6C6A0.s b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240310_B6C6A0.s index 693e50ac8d..69e8d7c424 100644 --- a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240310_B6C6A0.s +++ b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240310_B6C6A0.s @@ -30,7 +30,7 @@ glabel func_80240310_B6C6A0 /* B6C704 80240374 3C05B000 */ lui $a1, 0xb000 /* B6C708 80240378 34A50017 */ ori $a1, $a1, 0x17 /* B6C70C 8024037C 44820000 */ mtc1 $v0, $f0 -/* B6C710 80240380 00000000 */ nop +/* B6C710 80240380 00000000 */ nop /* B6C714 80240384 46800021 */ cvt.d.w $f0, $f0 /* B6C718 80240388 3C014024 */ lui $at, 0x4024 /* B6C71C 8024038C 44811800 */ mtc1 $at, $f3 @@ -68,7 +68,7 @@ glabel func_80240310_B6C6A0 /* B6C79C 8024040C 0C0123F5 */ jal is_point_within_region /* B6C7A0 80240410 8E070038 */ lw $a3, 0x38($s0) /* B6C7A4 80240414 10400035 */ beqz $v0, .L802404EC -/* B6C7A8 80240418 00000000 */ nop +/* B6C7A8 80240418 00000000 */ nop /* B6C7AC 8024041C C60C0038 */ lwc1 $f12, 0x38($s0) /* B6C7B0 80240420 3C0141C8 */ lui $at, 0x41c8 /* B6C7B4 80240424 4481B000 */ mtc1 $at, $f22 @@ -99,13 +99,13 @@ glabel func_80240310_B6C6A0 /* B6C814 80240484 860200A8 */ lh $v0, 0xa8($s0) /* B6C818 80240488 27A50020 */ addiu $a1, $sp, 0x20 /* B6C81C 8024048C 44820000 */ mtc1 $v0, $f0 -/* B6C820 80240490 00000000 */ nop +/* B6C820 80240490 00000000 */ nop /* B6C824 80240494 46800020 */ cvt.s.w $f0, $f0 /* B6C828 80240498 E7A00018 */ swc1 $f0, 0x18($sp) /* B6C82C 8024049C 860200A6 */ lh $v0, 0xa6($s0) /* B6C830 802404A0 27A60024 */ addiu $a2, $sp, 0x24 /* B6C834 802404A4 44820000 */ mtc1 $v0, $f0 -/* B6C838 802404A8 00000000 */ nop +/* B6C838 802404A8 00000000 */ nop /* B6C83C 802404AC 46800020 */ cvt.s.w $f0, $f0 /* B6C840 802404B0 E7A0001C */ swc1 $f0, 0x1c($sp) /* B6C844 802404B4 8E040080 */ lw $a0, 0x80($s0) @@ -121,13 +121,13 @@ glabel func_80240310_B6C6A0 /* B6C86C 802404DC 1440FFE6 */ bnez $v0, .L80240478 /* B6C870 802404E0 E600000C */ swc1 $f0, 0xc($s0) /* B6C874 802404E4 08090147 */ j .L8024051C -/* B6C878 802404E8 00000000 */ nop +/* B6C878 802404E8 00000000 */ nop .L802404EC: /* B6C87C 802404EC 0C00A67F */ jal rand_int /* B6C880 802404F0 2404003C */ addiu $a0, $zero, 0x3c /* B6C884 802404F4 C60C000C */ lwc1 $f12, 0xc($s0) /* B6C888 802404F8 44820000 */ mtc1 $v0, $f0 -/* B6C88C 802404FC 00000000 */ nop +/* B6C88C 802404FC 00000000 */ nop /* B6C890 80240500 46800020 */ cvt.s.w $f0, $f0 /* B6C894 80240504 46006300 */ add.s $f12, $f12, $f0 /* B6C898 80240508 3C0141F0 */ lui $at, 0x41f0 diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240540_B6C8D0.s b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240540_B6C8D0.s index c24af4d506..824f0efce1 100644 --- a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240540_B6C8D0.s +++ b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240540_B6C8D0.s @@ -43,7 +43,7 @@ glabel func_80240540_B6C8D0 /* B6C968 802405D8 2402000F */ addiu $v0, $zero, 0xf /* B6C96C 802405DC AFA2001C */ sw $v0, 0x1c($sp) /* B6C970 802405E0 44835000 */ mtc1 $v1, $f10 -/* B6C974 802405E4 00000000 */ nop +/* B6C974 802405E4 00000000 */ nop /* B6C978 802405E8 468052A0 */ cvt.s.w $f10, $f10 /* B6C97C 802405EC 44075000 */ mfc1 $a3, $f10 /* B6C980 802405F0 27A20028 */ addiu $v0, $sp, 0x28 @@ -78,7 +78,7 @@ glabel func_80240540_B6C8D0 /* B6C9E8 80240658 44801800 */ mtc1 $zero, $f3 /* B6C9EC 8024065C 46000021 */ cvt.d.s $f0, $f0 /* B6C9F0 80240660 4620103C */ c.lt.d $f2, $f0 -/* B6C9F4 80240664 00000000 */ nop +/* B6C9F4 80240664 00000000 */ nop /* B6C9F8 80240668 45000025 */ bc1f .L80240700 /* B6C9FC 8024066C 27A5002C */ addiu $a1, $sp, 0x2c /* B6CA00 80240670 C6000038 */ lwc1 $f0, 0x38($s0) @@ -88,7 +88,7 @@ glabel func_80240540_B6C8D0 /* B6CA10 80240680 27A60030 */ addiu $a2, $sp, 0x30 /* B6CA14 80240684 E7A0002C */ swc1 $f0, 0x2c($sp) /* B6CA18 80240688 44820000 */ mtc1 $v0, $f0 -/* B6CA1C 8024068C 00000000 */ nop +/* B6CA1C 8024068C 00000000 */ nop /* B6CA20 80240690 46800020 */ cvt.s.w $f0, $f0 /* B6CA24 80240694 46000021 */ cvt.d.s $f0, $f0 /* B6CA28 80240698 C604003C */ lwc1 $f4, 0x3c($s0) @@ -96,13 +96,13 @@ glabel func_80240540_B6C8D0 /* B6CA30 802406A0 C6080018 */ lwc1 $f8, 0x18($s0) /* B6CA34 802406A4 860200A8 */ lh $v0, 0xa8($s0) /* B6CA38 802406A8 46220002 */ mul.d $f0, $f0, $f2 -/* B6CA3C 802406AC 00000000 */ nop +/* B6CA3C 802406AC 00000000 */ nop /* B6CA40 802406B0 E7A40030 */ swc1 $f4, 0x30($sp) /* B6CA44 802406B4 E7A60034 */ swc1 $f6, 0x34($sp) /* B6CA48 802406B8 E7A80010 */ swc1 $f8, 0x10($sp) /* B6CA4C 802406BC C604000C */ lwc1 $f4, 0xc($s0) /* B6CA50 802406C0 44821000 */ mtc1 $v0, $f2 -/* B6CA54 802406C4 00000000 */ nop +/* B6CA54 802406C4 00000000 */ nop /* B6CA58 802406C8 468010A0 */ cvt.s.w $f2, $f2 /* B6CA5C 802406CC E7A20018 */ swc1 $f2, 0x18($sp) /* B6CA60 802406D0 E7A40014 */ swc1 $f4, 0x14($sp) @@ -123,7 +123,7 @@ glabel func_80240540_B6C8D0 /* B6CA98 80240708 44801800 */ mtc1 $zero, $f3 /* B6CA9C 8024070C 46000021 */ cvt.d.s $f0, $f0 /* B6CAA0 80240710 4622003C */ c.lt.d $f0, $f2 -/* B6CAA4 80240714 00000000 */ nop +/* B6CAA4 80240714 00000000 */ nop /* B6CAA8 80240718 45000047 */ bc1f .L80240838 /* B6CAAC 8024071C 27A5002C */ addiu $a1, $sp, 0x2c /* B6CAB0 80240720 27A60030 */ addiu $a2, $sp, 0x30 @@ -154,7 +154,7 @@ glabel func_80240540_B6C8D0 /* B6CB14 80240784 0C0372DF */ jal func_800DCB7C /* B6CB18 80240788 27A70034 */ addiu $a3, $sp, 0x34 /* B6CB1C 8024078C 1040002A */ beqz $v0, .L80240838 -/* B6CB20 80240790 00000000 */ nop +/* B6CB20 80240790 00000000 */ nop /* B6CB24 80240794 C600001C */ lwc1 $f0, 0x1c($s0) /* B6CB28 80240798 C7A20038 */ lwc1 $f2, 0x38($sp) /* B6CB2C 8024079C 46000005 */ abs.s $f0, $f0 @@ -162,7 +162,7 @@ glabel func_80240540_B6C8D0 /* B6CB34 802407A4 46340000 */ add.d $f0, $f0, $f20 /* B6CB38 802407A8 460010A1 */ cvt.d.s $f2, $f2 /* B6CB3C 802407AC 4620103E */ c.le.d $f2, $f0 -/* B6CB40 802407B0 00000000 */ nop +/* B6CB40 802407B0 00000000 */ nop /* B6CB44 802407B4 45000020 */ bc1f .L80240838 /* B6CB48 802407B8 240403E8 */ addiu $a0, $zero, 0x3e8 /* B6CB4C 802407BC C7A00030 */ lwc1 $f0, 0x30($sp) @@ -193,7 +193,7 @@ glabel func_80240540_B6C8D0 /* B6CBB0 80240820 5840000C */ blezl $v0, .L80240854 /* B6CBB4 80240824 AE600070 */ sw $zero, 0x70($s3) /* B6CBB8 80240828 1460000A */ bnez $v1, .L80240854 -/* B6CBBC 8024082C 00000000 */ nop +/* B6CBBC 8024082C 00000000 */ nop /* B6CBC0 80240830 08090215 */ j .L80240854 /* B6CBC4 80240834 AE600070 */ sw $zero, 0x70($s3) .L80240838: diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240938_B6CCC8.s b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240938_B6CCC8.s index 37bd218be6..fc84932e70 100644 --- a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240938_B6CCC8.s +++ b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240938_B6CCC8.s @@ -38,7 +38,7 @@ glabel func_80240938_B6CCC8 /* B6CD4C 802409BC 2402000F */ addiu $v0, $zero, 0xf /* B6CD50 802409C0 AFA2001C */ sw $v0, 0x1c($sp) /* B6CD54 802409C4 44833000 */ mtc1 $v1, $f6 -/* B6CD58 802409C8 00000000 */ nop +/* B6CD58 802409C8 00000000 */ nop /* B6CD5C 802409CC 468031A0 */ cvt.s.w $f6, $f6 /* B6CD60 802409D0 44073000 */ mfc1 $a3, $f6 /* B6CD64 802409D4 27A20028 */ addiu $v0, $sp, 0x28 @@ -65,13 +65,13 @@ glabel func_80240938_B6CCC8 .L80240A28: /* B6CDB8 80240A28 8602008C */ lh $v0, 0x8c($s0) /* B6CDBC 80240A2C 14400023 */ bnez $v0, .L80240ABC -/* B6CDC0 80240A30 00000000 */ nop +/* B6CDC0 80240A30 00000000 */ nop /* B6CDC4 80240A34 9602008E */ lhu $v0, 0x8e($s0) /* B6CDC8 80240A38 2442FFFF */ addiu $v0, $v0, -1 /* B6CDCC 80240A3C A602008E */ sh $v0, 0x8e($s0) /* B6CDD0 80240A40 00021400 */ sll $v0, $v0, 0x10 /* B6CDD4 80240A44 1C40001D */ bgtz $v0, .L80240ABC -/* B6CDD8 80240A48 00000000 */ nop +/* B6CDD8 80240A48 00000000 */ nop /* B6CDDC 80240A4C 8E820074 */ lw $v0, 0x74($s4) /* B6CDE0 80240A50 2442FFFF */ addiu $v0, $v0, -1 /* B6CDE4 80240A54 18400018 */ blez $v0, .L80240AB8 diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240ADC_B6CE6C.s b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240ADC_B6CE6C.s index 67b3507e5b..8e55ca39c8 100644 --- a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240ADC_B6CE6C.s +++ b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240ADC_B6CE6C.s @@ -24,7 +24,7 @@ glabel func_80240ADC_B6CE6C /* B6CEB8 80240B28 0C00A67F */ jal rand_int /* B6CEBC 80240B2C AE020000 */ sw $v0, ($s0) /* B6CEC0 80240B30 44820000 */ mtc1 $v0, $f0 -/* B6CEC4 80240B34 00000000 */ nop +/* B6CEC4 80240B34 00000000 */ nop /* B6CEC8 80240B38 46800021 */ cvt.d.w $f0, $f0 /* B6CECC 80240B3C 3C014024 */ lui $at, 0x4024 /* B6CED0 80240B40 44811800 */ mtc1 $at, $f3 diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s index 7c24495a29..8f54cd5a3c 100644 --- a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s +++ b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s @@ -76,7 +76,7 @@ glabel func_80240F00_B6D290 /* B6D3A8 80241018 8E4300B0 */ lw $v1, 0xb0($s2) /* B6D3AC 8024101C 30620004 */ andi $v0, $v1, 4 /* B6D3B0 80241020 10400007 */ beqz $v0, .L80241040 -/* B6D3B4 80241024 00000000 */ nop +/* B6D3B4 80241024 00000000 */ nop /* B6D3B8 80241028 824200B4 */ lb $v0, 0xb4($s2) /* B6D3BC 8024102C 14400034 */ bnez $v0, .L80241100 /* B6D3C0 80241030 0000102D */ daddu $v0, $zero, $zero @@ -88,21 +88,24 @@ glabel func_80240F00_B6D290 /* B6D3D4 80241044 2C62000F */ sltiu $v0, $v1, 0xf /* B6D3D8 80241048 1040002C */ beqz $v0, .L802410FC /* B6D3DC 8024104C 00031080 */ sll $v0, $v1, 2 -/* B6D3E0 80241050 3C018024 */ lui $at, %hi(D_80244488) +/* B6D3E0 80241050 3C018024 */ lui $at, %hi(jtbl_80244488_B70818) /* B6D3E4 80241054 00220821 */ addu $at, $at, $v0 -/* B6D3E8 80241058 8C224488 */ lw $v0, %lo(D_80244488)($at) +/* B6D3E8 80241058 8C224488 */ lw $v0, %lo(jtbl_80244488_B70818)($at) /* B6D3EC 8024105C 00400008 */ jr $v0 -/* B6D3F0 80241060 00000000 */ nop +/* B6D3F0 80241060 00000000 */ nop +glabel L80241064_B6D3F4 /* B6D3F4 80241064 0260202D */ daddu $a0, $s3, $zero /* B6D3F8 80241068 0280282D */ daddu $a1, $s4, $zero /* B6D3FC 8024106C 0C0900C4 */ jal func_80240310_B6C6A0 /* B6D400 80241070 0200302D */ daddu $a2, $s0, $zero +glabel L80241074_B6D404 /* B6D404 80241074 0260202D */ daddu $a0, $s3, $zero /* B6D408 80241078 0280282D */ daddu $a1, $s4, $zero /* B6D40C 8024107C 0C090150 */ jal func_80240540_B6C8D0 /* B6D410 80241080 0200302D */ daddu $a2, $s0, $zero /* B6D414 80241084 08090440 */ j .L80241100 /* B6D418 80241088 0000102D */ daddu $v0, $zero, $zero +glabel L8024108C_B6D41C /* B6D41C 8024108C 0260202D */ daddu $a0, $s3, $zero /* B6D420 80241090 0280282D */ daddu $a1, $s4, $zero /* B6D424 80241094 0C09021E */ jal jan_10_UnkNpcAIFunc1 @@ -111,27 +114,32 @@ glabel func_80240F00_B6D290 /* B6D430 802410A0 24020003 */ addiu $v0, $zero, 3 /* B6D434 802410A4 14620016 */ bne $v1, $v0, .L80241100 /* B6D438 802410A8 0000102D */ daddu $v0, $zero, $zero +glabel L802410AC_B6D43C /* B6D43C 802410AC 0260202D */ daddu $a0, $s3, $zero /* B6D440 802410B0 0280282D */ daddu $a1, $s4, $zero /* B6D444 802410B4 0C09024E */ jal func_80240938_B6CCC8 /* B6D448 802410B8 0200302D */ daddu $a2, $s0, $zero /* B6D44C 802410BC 08090440 */ j .L80241100 /* B6D450 802410C0 0000102D */ daddu $v0, $zero, $zero +glabel L802410C4_B6D454 /* B6D454 802410C4 0260202D */ daddu $a0, $s3, $zero /* B6D458 802410C8 0280282D */ daddu $a1, $s4, $zero /* B6D45C 802410CC 0C0902B7 */ jal func_80240ADC_B6CE6C /* B6D460 802410D0 0200302D */ daddu $a2, $s0, $zero +glabel L802410D4_B6D464 /* B6D464 802410D4 0260202D */ daddu $a0, $s3, $zero /* B6D468 802410D8 0280282D */ daddu $a1, $s4, $zero /* B6D46C 802410DC 0C0902EF */ jal delete_actor /* B6D470 802410E0 0200302D */ daddu $a2, $s0, $zero /* B6D474 802410E4 08090440 */ j .L80241100 /* B6D478 802410E8 0000102D */ daddu $v0, $zero, $zero +glabel L802410EC_B6D47C /* B6D47C 802410EC 0260202D */ daddu $a0, $s3, $zero /* B6D480 802410F0 0280282D */ daddu $a1, $s4, $zero /* B6D484 802410F4 0C0903AF */ jal jan_10_UnkDurationCheck /* B6D488 802410F8 0200302D */ daddu $a2, $s0, $zero .L802410FC: +glabel L802410FC_B6D48C /* B6D48C 802410FC 0000102D */ daddu $v0, $zero, $zero .L80241100: /* B6D490 80241100 8FBF0048 */ lw $ra, 0x48($sp) @@ -143,6 +151,6 @@ glabel func_80240F00_B6D290 /* B6D4A8 80241118 8FB00030 */ lw $s0, 0x30($sp) /* B6D4AC 8024111C 03E00008 */ jr $ra /* B6D4B0 80241120 27BD0050 */ addiu $sp, $sp, 0x50 -/* B6D4B4 80241124 00000000 */ nop -/* B6D4B8 80241128 00000000 */ nop -/* B6D4BC 8024112C 00000000 */ nop +/* B6D4B4 80241124 00000000 */ nop +/* B6D4B8 80241128 00000000 */ nop +/* B6D4BC 8024112C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6D4C0/func_80241130_B6D4C0.s b/asm/nonmatchings/world/area_jan/jan_10/B6D4C0/func_80241130_B6D4C0.s index 94d23ee5f8..f31ec53c03 100644 --- a/asm/nonmatchings/world/area_jan/jan_10/B6D4C0/func_80241130_B6D4C0.s +++ b/asm/nonmatchings/world/area_jan/jan_10/B6D4C0/func_80241130_B6D4C0.s @@ -35,7 +35,7 @@ glabel func_80241130_B6D4C0 /* B6D534 802411A4 0C0B1EAF */ jal get_variable /* B6D538 802411A8 0220202D */ daddu $a0, $s1, $zero /* B6D53C 802411AC 1440002A */ bnez $v0, .L80241258 -/* B6D540 802411B0 00000000 */ nop +/* B6D540 802411B0 00000000 */ nop /* B6D544 802411B4 8E240078 */ lw $a0, 0x78($s1) /* B6D548 802411B8 0C044181 */ jal get_shadow_by_index /* B6D54C 802411BC 8E300074 */ lw $s0, 0x74($s1) @@ -80,7 +80,7 @@ glabel func_80241130_B6D4C0 .L80241258: /* B6D5E8 80241258 8E240078 */ lw $a0, 0x78($s1) /* B6D5EC 8024125C 0C0448CA */ jal func_80112328 -/* B6D5F0 80241260 00000000 */ nop +/* B6D5F0 80241260 00000000 */ nop /* B6D5F4 80241264 24020002 */ addiu $v0, $zero, 2 .L80241268: /* B6D5F8 80241268 8FBF0038 */ lw $ra, 0x38($sp) @@ -88,4 +88,4 @@ glabel func_80241130_B6D4C0 /* B6D600 80241270 8FB00030 */ lw $s0, 0x30($sp) /* B6D604 80241274 03E00008 */ jr $ra /* B6D608 80241278 27BD0040 */ addiu $sp, $sp, 0x40 -/* B6D60C 8024127C 00000000 */ nop +/* B6D60C 8024127C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6D610/func_802414BC_B6D84C.s b/asm/nonmatchings/world/area_jan/jan_10/B6D610/func_802414BC_B6D84C.s index afb24c9da6..9b6a7b52a8 100644 --- a/asm/nonmatchings/world/area_jan/jan_10/B6D610/func_802414BC_B6D84C.s +++ b/asm/nonmatchings/world/area_jan/jan_10/B6D610/func_802414BC_B6D84C.s @@ -20,4 +20,4 @@ glabel func_802414BC_B6D84C /* B6D880 802414F0 24020002 */ addiu $v0, $zero, 2 /* B6D884 802414F4 03E00008 */ jr $ra /* B6D888 802414F8 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6D88C 802414FC 00000000 */ nop +/* B6D88C 802414FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240000_B70860.s b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240000_B70860.s index 6a499ea44e..73707b553f 100644 --- a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240000_B70860.s +++ b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240000_B70860.s @@ -22,7 +22,7 @@ glabel func_80240000_B70860 /* B708A0 80240040 C460002C */ lwc1 $f0, 0x2c($v1) /* B708A4 80240044 3C014100 */ lui $at, 0x4100 /* B708A8 80240048 44811000 */ mtc1 $at, $f2 -/* B708AC 8024004C 00000000 */ nop +/* B708AC 8024004C 00000000 */ nop /* B708B0 80240050 46020000 */ add.s $f0, $f0, $f2 /* B708B4 80240054 C4620030 */ lwc1 $f2, 0x30($v1) /* B708B8 80240058 C4640028 */ lwc1 $f4, 0x28($v1) @@ -40,7 +40,7 @@ glabel func_80240000_B70860 /* B708E8 80240088 24020006 */ addiu $v0, $zero, 6 /* B708EC 8024008C 82230012 */ lb $v1, 0x12($s1) /* B708F0 80240090 14620022 */ bne $v1, $v0, .L8024011C -/* B708F4 80240094 00000000 */ nop +/* B708F4 80240094 00000000 */ nop /* B708F8 80240098 8E020074 */ lw $v0, 0x74($s0) /* B708FC 8024009C 14400004 */ bnez $v0, .L802400B0 /* B70900 802400A0 24020001 */ addiu $v0, $zero, 1 @@ -62,7 +62,7 @@ glabel func_80240000_B70860 /* B70938 802400D8 240200FF */ addiu $v0, $zero, 0xff /* B7093C 802400DC 8E020074 */ lw $v0, 0x74($s0) /* B70940 802400E0 10400007 */ beqz $v0, .L80240100 -/* B70944 802400E4 00000000 */ nop +/* B70944 802400E4 00000000 */ nop /* B70948 802400E8 8E020070 */ lw $v0, 0x70($s0) /* B7094C 802400EC 284200FF */ slti $v0, $v0, 0xff /* B70950 802400F0 10400003 */ beqz $v0, .L80240100 diff --git a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_8024018C_B709EC.s b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_8024018C_B709EC.s index f60d0814fd..b7fdc24bb8 100644 --- a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_8024018C_B709EC.s +++ b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_8024018C_B709EC.s @@ -22,16 +22,16 @@ glabel func_8024018C_B709EC /* B70A2C 802401CC 00021023 */ negu $v0, $v0 .L802401D0: /* B70A30 802401D0 14400003 */ bnez $v0, .L802401E0 -/* B70A34 802401D4 00000000 */ nop +/* B70A34 802401D4 00000000 */ nop /* B70A38 802401D8 50E00017 */ beql $a3, $zero, .L80240238 /* B70A3C 802401DC 0000102D */ daddu $v0, $zero, $zero .L802401E0: /* B70A40 802401E0 44822000 */ mtc1 $v0, $f4 -/* B70A44 802401E4 00000000 */ nop +/* B70A44 802401E4 00000000 */ nop /* B70A48 802401E8 46802120 */ cvt.s.w $f4, $f4 /* B70A4C 802401EC 44062000 */ mfc1 $a2, $f4 /* B70A50 802401F0 44872000 */ mtc1 $a3, $f4 -/* B70A54 802401F4 00000000 */ nop +/* B70A54 802401F4 00000000 */ nop /* B70A58 802401F8 46802120 */ cvt.s.w $f4, $f4 /* B70A5C 802401FC 44806000 */ mtc1 $zero, $f12 /* B70A60 80240200 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_8024018C_B709EC /* B70A68 80240208 46006386 */ mov.s $f14, $f12 /* B70A6C 8024020C 3C014270 */ lui $at, 0x4270 /* B70A70 80240210 44811000 */ mtc1 $at, $f2 -/* B70A74 80240214 00000000 */ nop +/* B70A74 80240214 00000000 */ nop /* B70A78 80240218 4602003C */ c.lt.s $f0, $f2 -/* B70A7C 8024021C 00000000 */ nop +/* B70A7C 8024021C 00000000 */ nop /* B70A80 80240220 45000004 */ bc1f .L80240234 /* B70A84 80240224 24020001 */ addiu $v0, $zero, 1 /* B70A88 80240228 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240438_B70C98.s b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240438_B70C98.s index 7add07fba2..c62ebf9f2f 100644 --- a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240438_B70C98.s +++ b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240438_B70C98.s @@ -32,58 +32,58 @@ glabel func_80240438_B70C98 /* B70D04 802404A4 C6400098 */ lwc1 $f0, 0x98($s2) /* B70D08 802404A8 46001081 */ sub.s $f2, $f2, $f0 /* B70D0C 802404AC 46021182 */ mul.s $f6, $f2, $f2 -/* B70D10 802404B0 00000000 */ nop +/* B70D10 802404B0 00000000 */ nop /* B70D14 802404B4 C64000A0 */ lwc1 $f0, 0xa0($s2) /* B70D18 802404B8 C4620030 */ lwc1 $f2, 0x30($v1) /* B70D1C 802404BC 46001081 */ sub.s $f2, $f2, $f0 /* B70D20 802404C0 46021102 */ mul.s $f4, $f2, $f2 -/* B70D24 802404C4 00000000 */ nop +/* B70D24 802404C4 00000000 */ nop /* B70D28 802404C8 846200B0 */ lh $v0, 0xb0($v1) /* B70D2C 802404CC C462002C */ lwc1 $f2, 0x2c($v1) /* B70D30 802404D0 44820000 */ mtc1 $v0, $f0 -/* B70D34 802404D4 00000000 */ nop +/* B70D34 802404D4 00000000 */ nop /* B70D38 802404D8 46800020 */ cvt.s.w $f0, $f0 /* B70D3C 802404DC 46001080 */ add.s $f2, $f2, $f0 /* B70D40 802404E0 3C013FC0 */ lui $at, 0x3fc0 /* B70D44 802404E4 44810000 */ mtc1 $at, $f0 -/* B70D48 802404E8 00000000 */ nop +/* B70D48 802404E8 00000000 */ nop /* B70D4C 802404EC 46001081 */ sub.s $f2, $f2, $f0 /* B70D50 802404F0 46043300 */ add.s $f12, $f6, $f4 /* B70D54 802404F4 C640009C */ lwc1 $f0, 0x9c($s2) /* B70D58 802404F8 46001501 */ sub.s $f20, $f2, $f0 /* B70D5C 802404FC 46006084 */ sqrt.s $f2, $f12 /* B70D60 80240500 46021032 */ c.eq.s $f2, $f2 -/* B70D64 80240504 00000000 */ nop +/* B70D64 80240504 00000000 */ nop /* B70D68 80240508 45010004 */ bc1t .L8024051C /* B70D6C 8024050C 0060882D */ daddu $s1, $v1, $zero /* B70D70 80240510 0C0187BC */ jal sqrtf -/* B70D74 80240514 00000000 */ nop +/* B70D74 80240514 00000000 */ nop /* B70D78 80240518 46000086 */ mov.s $f2, $f0 .L8024051C: /* B70D7C 8024051C 44800000 */ mtc1 $zero, $f0 -/* B70D80 80240520 00000000 */ nop +/* B70D80 80240520 00000000 */ nop /* B70D84 80240524 4614003C */ c.lt.s $f0, $f20 -/* B70D88 80240528 00000000 */ nop +/* B70D88 80240528 00000000 */ nop /* B70D8C 8024052C 45000016 */ bc1f .L80240588 /* B70D90 80240530 46001106 */ mov.s $f4, $f2 /* B70D94 80240534 862200B0 */ lh $v0, 0xb0($s1) /* B70D98 80240538 44820000 */ mtc1 $v0, $f0 -/* B70D9C 8024053C 00000000 */ nop +/* B70D9C 8024053C 00000000 */ nop /* B70DA0 80240540 46800020 */ cvt.s.w $f0, $f0 /* B70DA4 80240544 4600A03C */ c.lt.s $f20, $f0 -/* B70DA8 80240548 00000000 */ nop +/* B70DA8 80240548 00000000 */ nop /* B70DAC 8024054C 4500000E */ bc1f .L80240588 -/* B70DB0 80240550 00000000 */ nop +/* B70DB0 80240550 00000000 */ nop /* B70DB4 80240554 862200B2 */ lh $v0, 0xb2($s1) /* B70DB8 80240558 3C013F00 */ lui $at, 0x3f00 /* B70DBC 8024055C 44811000 */ mtc1 $at, $f2 /* B70DC0 80240560 44820000 */ mtc1 $v0, $f0 -/* B70DC4 80240564 00000000 */ nop +/* B70DC4 80240564 00000000 */ nop /* B70DC8 80240568 46800020 */ cvt.s.w $f0, $f0 /* B70DCC 8024056C 46020002 */ mul.s $f0, $f0, $f2 -/* B70DD0 80240570 00000000 */ nop +/* B70DD0 80240570 00000000 */ nop /* B70DD4 80240574 4600203C */ c.lt.s $f4, $f0 -/* B70DD8 80240578 00000000 */ nop +/* B70DD8 80240578 00000000 */ nop /* B70DDC 8024057C 45000002 */ bc1f .L80240588 /* B70DE0 80240580 24020001 */ addiu $v0, $zero, 1 /* B70DE4 80240584 AE62008C */ sw $v0, 0x8c($s3) @@ -92,58 +92,58 @@ glabel func_80240438_B70C98 /* B70DEC 8024058C C6400098 */ lwc1 $f0, 0x98($s2) /* B70DF0 80240590 46001081 */ sub.s $f2, $f2, $f0 /* B70DF4 80240594 46021182 */ mul.s $f6, $f2, $f2 -/* B70DF8 80240598 00000000 */ nop +/* B70DF8 80240598 00000000 */ nop /* B70DFC 8024059C C64000A0 */ lwc1 $f0, 0xa0($s2) /* B70E00 802405A0 C6020040 */ lwc1 $f2, 0x40($s0) /* B70E04 802405A4 46001081 */ sub.s $f2, $f2, $f0 /* B70E08 802405A8 46021102 */ mul.s $f4, $f2, $f2 -/* B70E0C 802405AC 00000000 */ nop +/* B70E0C 802405AC 00000000 */ nop /* B70E10 802405B0 860200A8 */ lh $v0, 0xa8($s0) /* B70E14 802405B4 C602003C */ lwc1 $f2, 0x3c($s0) /* B70E18 802405B8 44820000 */ mtc1 $v0, $f0 -/* B70E1C 802405BC 00000000 */ nop +/* B70E1C 802405BC 00000000 */ nop /* B70E20 802405C0 46800020 */ cvt.s.w $f0, $f0 /* B70E24 802405C4 46001080 */ add.s $f2, $f2, $f0 /* B70E28 802405C8 3C013FC0 */ lui $at, 0x3fc0 /* B70E2C 802405CC 44810000 */ mtc1 $at, $f0 -/* B70E30 802405D0 00000000 */ nop +/* B70E30 802405D0 00000000 */ nop /* B70E34 802405D4 46001081 */ sub.s $f2, $f2, $f0 /* B70E38 802405D8 46043300 */ add.s $f12, $f6, $f4 /* B70E3C 802405DC C640009C */ lwc1 $f0, 0x9c($s2) /* B70E40 802405E0 46001501 */ sub.s $f20, $f2, $f0 /* B70E44 802405E4 46006084 */ sqrt.s $f2, $f12 /* B70E48 802405E8 46021032 */ c.eq.s $f2, $f2 -/* B70E4C 802405EC 00000000 */ nop +/* B70E4C 802405EC 00000000 */ nop /* B70E50 802405F0 45010004 */ bc1t .L80240604 -/* B70E54 802405F4 00000000 */ nop +/* B70E54 802405F4 00000000 */ nop /* B70E58 802405F8 0C0187BC */ jal sqrtf -/* B70E5C 802405FC 00000000 */ nop +/* B70E5C 802405FC 00000000 */ nop /* B70E60 80240600 46000086 */ mov.s $f2, $f0 .L80240604: /* B70E64 80240604 44800000 */ mtc1 $zero, $f0 -/* B70E68 80240608 00000000 */ nop +/* B70E68 80240608 00000000 */ nop /* B70E6C 8024060C 4614003C */ c.lt.s $f0, $f20 -/* B70E70 80240610 00000000 */ nop +/* B70E70 80240610 00000000 */ nop /* B70E74 80240614 45000016 */ bc1f .L80240670 /* B70E78 80240618 46001106 */ mov.s $f4, $f2 /* B70E7C 8024061C 860200A8 */ lh $v0, 0xa8($s0) /* B70E80 80240620 44820000 */ mtc1 $v0, $f0 -/* B70E84 80240624 00000000 */ nop +/* B70E84 80240624 00000000 */ nop /* B70E88 80240628 46800020 */ cvt.s.w $f0, $f0 /* B70E8C 8024062C 4600A03C */ c.lt.s $f20, $f0 -/* B70E90 80240630 00000000 */ nop +/* B70E90 80240630 00000000 */ nop /* B70E94 80240634 4500000F */ bc1f .L80240674 /* B70E98 80240638 0000882D */ daddu $s1, $zero, $zero /* B70E9C 8024063C 860200A6 */ lh $v0, 0xa6($s0) /* B70EA0 80240640 3C013F00 */ lui $at, 0x3f00 /* B70EA4 80240644 44811000 */ mtc1 $at, $f2 /* B70EA8 80240648 44820000 */ mtc1 $v0, $f0 -/* B70EAC 8024064C 00000000 */ nop +/* B70EAC 8024064C 00000000 */ nop /* B70EB0 80240650 46800020 */ cvt.s.w $f0, $f0 /* B70EB4 80240654 46020002 */ mul.s $f0, $f0, $f2 -/* B70EB8 80240658 00000000 */ nop +/* B70EB8 80240658 00000000 */ nop /* B70EBC 8024065C 4600203C */ c.lt.s $f4, $f0 -/* B70EC0 80240660 00000000 */ nop +/* B70EC0 80240660 00000000 */ nop /* B70EC4 80240664 45000003 */ bc1f .L80240674 /* B70EC8 80240668 24020001 */ addiu $v0, $zero, 1 /* B70ECC 8024066C AE62008C */ sw $v0, 0x8c($s3) @@ -165,16 +165,16 @@ glabel func_80240438_B70C98 /* B70F00 802406A0 C6400098 */ lwc1 $f0, 0x98($s2) /* B70F04 802406A4 46001081 */ sub.s $f2, $f2, $f0 /* B70F08 802406A8 46021182 */ mul.s $f6, $f2, $f2 -/* B70F0C 802406AC 00000000 */ nop +/* B70F0C 802406AC 00000000 */ nop /* B70F10 802406B0 C64000A0 */ lwc1 $f0, 0xa0($s2) /* B70F14 802406B4 C6020040 */ lwc1 $f2, 0x40($s0) /* B70F18 802406B8 46001081 */ sub.s $f2, $f2, $f0 /* B70F1C 802406BC 46021102 */ mul.s $f4, $f2, $f2 -/* B70F20 802406C0 00000000 */ nop +/* B70F20 802406C0 00000000 */ nop /* B70F24 802406C4 860200A8 */ lh $v0, 0xa8($s0) /* B70F28 802406C8 C602003C */ lwc1 $f2, 0x3c($s0) /* B70F2C 802406CC 44820000 */ mtc1 $v0, $f0 -/* B70F30 802406D0 00000000 */ nop +/* B70F30 802406D0 00000000 */ nop /* B70F34 802406D4 46800020 */ cvt.s.w $f0, $f0 /* B70F38 802406D8 46001080 */ add.s $f2, $f2, $f0 /* B70F3C 802406DC 461A1081 */ sub.s $f2, $f2, $f26 @@ -183,32 +183,32 @@ glabel func_80240438_B70C98 /* B70F48 802406E8 46001501 */ sub.s $f20, $f2, $f0 /* B70F4C 802406EC 46006004 */ sqrt.s $f0, $f12 /* B70F50 802406F0 46000032 */ c.eq.s $f0, $f0 -/* B70F54 802406F4 00000000 */ nop +/* B70F54 802406F4 00000000 */ nop /* B70F58 802406F8 45010003 */ bc1t .L80240708 -/* B70F5C 802406FC 00000000 */ nop +/* B70F5C 802406FC 00000000 */ nop /* B70F60 80240700 0C0187BC */ jal sqrtf -/* B70F64 80240704 00000000 */ nop +/* B70F64 80240704 00000000 */ nop .L80240708: /* B70F68 80240708 4614C03C */ c.lt.s $f24, $f20 -/* B70F6C 8024070C 00000000 */ nop +/* B70F6C 8024070C 00000000 */ nop /* B70F70 80240710 45000015 */ bc1f .L80240768 /* B70F74 80240714 46000106 */ mov.s $f4, $f0 /* B70F78 80240718 860200A8 */ lh $v0, 0xa8($s0) /* B70F7C 8024071C 44820000 */ mtc1 $v0, $f0 -/* B70F80 80240720 00000000 */ nop +/* B70F80 80240720 00000000 */ nop /* B70F84 80240724 46800020 */ cvt.s.w $f0, $f0 /* B70F88 80240728 4600A03C */ c.lt.s $f20, $f0 -/* B70F8C 8024072C 00000000 */ nop +/* B70F8C 8024072C 00000000 */ nop /* B70F90 80240730 4500000E */ bc1f .L8024076C /* B70F94 80240734 26310001 */ addiu $s1, $s1, 1 /* B70F98 80240738 860200A6 */ lh $v0, 0xa6($s0) /* B70F9C 8024073C 44820000 */ mtc1 $v0, $f0 -/* B70FA0 80240740 00000000 */ nop +/* B70FA0 80240740 00000000 */ nop /* B70FA4 80240744 46800020 */ cvt.s.w $f0, $f0 /* B70FA8 80240748 46160002 */ mul.s $f0, $f0, $f22 -/* B70FAC 8024074C 00000000 */ nop +/* B70FAC 8024074C 00000000 */ nop /* B70FB0 80240750 4600203C */ c.lt.s $f4, $f0 -/* B70FB4 80240754 00000000 */ nop +/* B70FB4 80240754 00000000 */ nop /* B70FB8 80240758 45000004 */ bc1f .L8024076C /* B70FBC 8024075C 24020001 */ addiu $v0, $zero, 1 /* B70FC0 80240760 080901DE */ j .L80240778 @@ -218,7 +218,7 @@ glabel func_80240438_B70C98 .L8024076C: /* B70FCC 8024076C 2A220040 */ slti $v0, $s1, 0x40 /* B70FD0 80240770 1440FFC5 */ bnez $v0, .L80240688 -/* B70FD4 80240774 00000000 */ nop +/* B70FD4 80240774 00000000 */ nop .L80240778: /* B70FD8 80240778 8FBF0020 */ lw $ra, 0x20($sp) /* B70FDC 8024077C 8FB3001C */ lw $s3, 0x1c($sp) @@ -232,5 +232,5 @@ glabel func_80240438_B70C98 /* B70FFC 8024079C 24020002 */ addiu $v0, $zero, 2 /* B71000 802407A0 03E00008 */ jr $ra /* B71004 802407A4 27BD0048 */ addiu $sp, $sp, 0x48 -/* B71008 802407A8 00000000 */ nop -/* B7100C 802407AC 00000000 */ nop +/* B71008 802407A8 00000000 */ nop +/* B7100C 802407AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_80240000_B730B0.s b/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_80240000_B730B0.s index 90633a8a93..79622c990a 100644 --- a/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_80240000_B730B0.s +++ b/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_80240000_B730B0.s @@ -31,26 +31,26 @@ glabel func_80240000_B730B0 /* B73118 80240068 0C0B210B */ jal get_float_variable /* B7311C 8024006C 46000506 */ mov.s $f20, $f0 /* B73120 80240070 46000002 */ mul.s $f0, $f0, $f0 -/* B73124 80240074 00000000 */ nop +/* B73124 80240074 00000000 */ nop /* B73128 80240078 C6240084 */ lwc1 $f4, 0x84($s1) /* B7312C 8024007C 46802120 */ cvt.s.w $f4, $f4 /* B73130 80240080 46182101 */ sub.s $f4, $f4, $f24 /* B73134 80240084 46042102 */ mul.s $f4, $f4, $f4 -/* B73138 80240088 00000000 */ nop +/* B73138 80240088 00000000 */ nop /* B7313C 8024008C C622008C */ lwc1 $f2, 0x8c($s1) /* B73140 80240090 468010A0 */ cvt.s.w $f2, $f2 /* B73144 80240094 46141081 */ sub.s $f2, $f2, $f20 /* B73148 80240098 46021082 */ mul.s $f2, $f2, $f2 -/* B7314C 8024009C 00000000 */ nop +/* B7314C 8024009C 00000000 */ nop /* B73150 802400A0 C6260088 */ lwc1 $f6, 0x88($s1) /* B73154 802400A4 468031A0 */ cvt.s.w $f6, $f6 /* B73158 802400A8 46163181 */ sub.s $f6, $f6, $f22 /* B7315C 802400AC 46063182 */ mul.s $f6, $f6, $f6 -/* B73160 802400B0 00000000 */ nop +/* B73160 802400B0 00000000 */ nop /* B73164 802400B4 46062100 */ add.s $f4, $f4, $f6 /* B73168 802400B8 46022100 */ add.s $f4, $f4, $f2 /* B7316C 802400BC 4600203C */ c.lt.s $f4, $f0 -/* B73170 802400C0 00000000 */ nop +/* B73170 802400C0 00000000 */ nop /* B73174 802400C4 45010002 */ bc1t .L802400D0 /* B73178 802400C8 24020001 */ addiu $v0, $zero, 1 /* B7317C 802400CC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_80240170_B73220.s b/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_80240170_B73220.s index 65d946928a..cd5a7fe648 100644 --- a/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_80240170_B73220.s +++ b/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_80240170_B73220.s @@ -13,7 +13,7 @@ glabel func_80240170_B73220 /* B73240 80240190 D42033B0 */ ldc1 $f0, %lo(D_802433B0)($at) /* B73244 80240194 4600A521 */ cvt.d.s $f20, $f20 /* B73248 80240198 4620A502 */ mul.d $f20, $f20, $f0 -/* B7324C 8024019C 00000000 */ nop +/* B7324C 8024019C 00000000 */ nop /* B73250 802401A0 3C013F80 */ lui $at, 0x3f80 /* B73254 802401A4 44810000 */ mtc1 $at, $f0 /* B73258 802401A8 AE000018 */ sw $zero, 0x18($s0) diff --git a/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802401CC_B7327C.s b/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802401CC_B7327C.s index 6121e83094..a49425567e 100644 --- a/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802401CC_B7327C.s +++ b/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802401CC_B7327C.s @@ -25,7 +25,7 @@ glabel func_802401CC_B7327C /* B732CC 8024021C 96020000 */ lhu $v0, ($s0) /* B732D0 80240220 30420400 */ andi $v0, $v0, 0x400 /* B732D4 80240224 14400008 */ bnez $v0, .L80240248 -/* B732D8 80240228 00000000 */ nop +/* B732D8 80240228 00000000 */ nop /* B732DC 8024022C 4405A000 */ mfc1 $a1, $f20 /* B732E0 80240230 0C09005C */ jal func_80240170_B73220 /* B732E4 80240234 26040058 */ addiu $a0, $s0, 0x58 diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240510_B735C0.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240510_B735C0.s index d9465934c3..1ebd9cd497 100644 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240510_B735C0.s +++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240510_B735C0.s @@ -31,17 +31,19 @@ glabel func_80240510_B735C0 /* B73620 80240570 2C620006 */ sltiu $v0, $v1, 6 /* B73624 80240574 1040004D */ beqz $v0, .L802406AC /* B73628 80240578 00031080 */ sll $v0, $v1, 2 -/* B7362C 8024057C 3C018024 */ lui $at, %hi(D_802433C0) +/* B7362C 8024057C 3C018024 */ lui $at, %hi(jtbl_802433C0_B76470) /* B73630 80240580 00220821 */ addu $at, $at, $v0 -/* B73634 80240584 8C2233C0 */ lw $v0, %lo(D_802433C0)($at) +/* B73634 80240584 8C2233C0 */ lw $v0, %lo(jtbl_802433C0_B76470)($at) /* B73638 80240588 00400008 */ jr $v0 -/* B7363C 8024058C 00000000 */ nop +/* B7363C 8024058C 00000000 */ nop +glabel L80240590_B73640 /* B73640 80240590 3C030042 */ lui $v1, 0x42 /* B73644 80240594 3463000F */ ori $v1, $v1, 0xf /* B73648 80240598 24020002 */ addiu $v0, $zero, 2 /* B7364C 8024059C AE02006C */ sw $v0, 0x6c($s0) /* B73650 802405A0 AE000070 */ sw $zero, 0x70($s0) /* B73654 802405A4 AE230028 */ sw $v1, 0x28($s1) +glabel L802405A8_B73658 /* B73658 802405A8 8E020070 */ lw $v0, 0x70($s0) /* B7365C 802405AC 24420001 */ addiu $v0, $v0, 1 /* B73660 802405B0 AE020070 */ sw $v0, 0x70($s0) @@ -50,12 +52,14 @@ glabel func_80240510_B735C0 /* B7366C 802405BC 24020005 */ addiu $v0, $zero, 5 /* B73670 802405C0 080901AB */ j .L802406AC /* B73674 802405C4 AE02006C */ sw $v0, 0x6c($s0) +glabel L802405C8_B73678 /* B73678 802405C8 3C030042 */ lui $v1, 0x42 /* B7367C 802405CC 34630010 */ ori $v1, $v1, 0x10 /* B73680 802405D0 24020004 */ addiu $v0, $zero, 4 /* B73684 802405D4 AE02006C */ sw $v0, 0x6c($s0) /* B73688 802405D8 AE000070 */ sw $zero, 0x70($s0) /* B7368C 802405DC AE230028 */ sw $v1, 0x28($s1) +glabel L802405E0_B73690 /* B73690 802405E0 8E020070 */ lw $v0, 0x70($s0) /* B73694 802405E4 24030019 */ addiu $v1, $zero, 0x19 /* B73698 802405E8 24420001 */ addiu $v0, $v0, 1 @@ -63,7 +67,7 @@ glabel func_80240510_B735C0 /* B736A0 802405F0 AE020070 */ sw $v0, 0x70($s0) /* B736A4 802405F4 3C0142B4 */ lui $at, 0x42b4 /* B736A8 802405F8 44810000 */ mtc1 $at, $f0 -/* B736AC 802405FC 00000000 */ nop +/* B736AC 802405FC 00000000 */ nop /* B736B0 80240600 E620000C */ swc1 $f0, 0xc($s1) .L80240604: /* B736B4 80240604 8E020070 */ lw $v0, 0x70($s0) @@ -72,6 +76,7 @@ glabel func_80240510_B735C0 /* B736C0 80240610 24020005 */ addiu $v0, $zero, 5 /* B736C4 80240614 080901AB */ j .L802406AC /* B736C8 80240618 AE02006C */ sw $v0, 0x6c($s0) +glabel L8024061C_B736CC /* B736CC 8024061C 3C030042 */ lui $v1, 0x42 /* B736D0 80240620 24020006 */ addiu $v0, $zero, 6 /* B736D4 80240624 34630003 */ ori $v1, $v1, 3 @@ -83,7 +88,7 @@ glabel func_80240510_B735C0 /* B736EC 8024063C AFA00014 */ sw $zero, 0x14($sp) /* B736F0 80240640 AFA20018 */ sw $v0, 0x18($sp) /* B736F4 80240644 44840000 */ mtc1 $a0, $f0 -/* B736F8 80240648 00000000 */ nop +/* B736F8 80240648 00000000 */ nop /* B736FC 8024064C 46800020 */ cvt.s.w $f0, $f0 /* B73700 80240650 E7A00010 */ swc1 $f0, 0x10($sp) /* B73704 80240654 8E250038 */ lw $a1, 0x38($s1) @@ -91,12 +96,13 @@ glabel func_80240510_B735C0 /* B7370C 8024065C 8E270040 */ lw $a3, 0x40($s1) /* B73710 80240660 0C01C1E4 */ jal fx_sweat /* B73714 80240664 0000202D */ daddu $a0, $zero, $zero +glabel L80240668_B73718 /* B73718 80240668 8E020070 */ lw $v0, 0x70($s0) /* B7371C 8024066C 24420001 */ addiu $v0, $v0, 1 /* B73720 80240670 AE020070 */ sw $v0, 0x70($s0) /* B73724 80240674 2842000B */ slti $v0, $v0, 0xb /* B73728 80240678 1440000C */ bnez $v0, .L802406AC -/* B7372C 8024067C 00000000 */ nop +/* B7372C 8024067C 00000000 */ nop /* B73730 80240680 0C00A67F */ jal rand_int /* B73734 80240684 24040064 */ addiu $a0, $zero, 0x64 /* B73738 80240688 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_802408DC_B7398C.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_802408DC_B7398C.s index 3476032329..c854db3cf0 100644 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_802408DC_B7398C.s +++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_802408DC_B7398C.s @@ -42,7 +42,7 @@ glabel func_802408DC_B7398C /* B73A20 80240970 C6620074 */ lwc1 $f2, 0x74($s3) /* B73A24 80240974 468010A0 */ cvt.s.w $f2, $f2 /* B73A28 80240978 4600103C */ c.lt.s $f2, $f0 -/* B73A2C 8024097C 00000000 */ nop +/* B73A2C 8024097C 00000000 */ nop /* B73A30 80240980 45030001 */ bc1tl .L80240988 /* B73A34 80240984 0000882D */ daddu $s1, $zero, $zero .L80240988: @@ -51,16 +51,16 @@ glabel func_802408DC_B7398C /* B73A40 80240990 3C014387 */ lui $at, 0x4387 /* B73A44 80240994 4481A000 */ mtc1 $at, $f20 /* B73A48 80240998 0C00A70A */ jal get_clamped_angle_diff -/* B73A4C 8024099C 00000000 */ nop +/* B73A4C 8024099C 00000000 */ nop /* B73A50 802409A0 0C00A6C9 */ jal clamp_angle /* B73A54 802409A4 46000306 */ mov.s $f12, $f0 /* B73A58 802409A8 3C018024 */ lui $at, %hi(D_802433D8) /* B73A5C 802409AC D42233D8 */ ldc1 $f2, %lo(D_802433D8)($at) /* B73A60 802409B0 46000021 */ cvt.d.s $f0, $f0 /* B73A64 802409B4 4622003C */ c.lt.d $f0, $f2 -/* B73A68 802409B8 00000000 */ nop +/* B73A68 802409B8 00000000 */ nop /* B73A6C 802409BC 45000003 */ bc1f .L802409CC -/* B73A70 802409C0 00000000 */ nop +/* B73A70 802409C0 00000000 */ nop /* B73A74 802409C4 3C0142B4 */ lui $at, 0x42b4 /* B73A78 802409C8 4481A000 */ mtc1 $at, $f20 .L802409CC: @@ -77,7 +77,7 @@ glabel func_802408DC_B7398C /* B73AA4 802409F4 468010A0 */ cvt.s.w $f2, $f2 /* B73AA8 802409F8 46000005 */ abs.s $f0, $f0 /* B73AAC 802409FC 4600103C */ c.lt.s $f2, $f0 -/* B73AB0 80240A00 00000000 */ nop +/* B73AB0 80240A00 00000000 */ nop /* B73AB4 80240A04 45030001 */ bc1tl .L80240A0C /* B73AB8 80240A08 0000882D */ daddu $s1, $zero, $zero .L80240A0C: @@ -87,13 +87,13 @@ glabel func_802408DC_B7398C /* B73AC8 80240A18 860200A8 */ lh $v0, 0xa8($s0) /* B73ACC 80240A1C 46020001 */ sub.s $f0, $f0, $f2 /* B73AD0 80240A20 44821000 */ mtc1 $v0, $f2 -/* B73AD4 80240A24 00000000 */ nop +/* B73AD4 80240A24 00000000 */ nop /* B73AD8 80240A28 468010A1 */ cvt.d.w $f2, $f2 /* B73ADC 80240A2C 46221080 */ add.d $f2, $f2, $f2 /* B73AE0 80240A30 46000005 */ abs.s $f0, $f0 /* B73AE4 80240A34 46000021 */ cvt.d.s $f0, $f0 /* B73AE8 80240A38 4620103E */ c.le.d $f2, $f0 -/* B73AEC 80240A3C 00000000 */ nop +/* B73AEC 80240A3C 00000000 */ nop /* B73AF0 80240A40 45030001 */ bc1tl .L80240A48 /* B73AF4 80240A44 0000882D */ daddu $s1, $zero, $zero .L80240A48: diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240A90_B73B40.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240A90_B73B40.s index 87960cbe58..10292566de 100644 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240A90_B73B40.s +++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240A90_B73B40.s @@ -19,7 +19,7 @@ glabel func_80240A90_B73B40 /* B73B78 80240AC8 8E2200B0 */ lw $v0, 0xb0($s1) /* B73B7C 80240ACC 30420004 */ andi $v0, $v0, 4 /* B73B80 80240AD0 10400015 */ beqz $v0, .L80240B28 -/* B73B84 80240AD4 00000000 */ nop +/* B73B84 80240AD4 00000000 */ nop .L80240AD8: /* B73B88 80240AD8 AE800070 */ sw $zero, 0x70($s4) /* B73B8C 80240ADC 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel func_80240A90_B73B40 /* B73BDC 80240B2C 12600005 */ beqz $s3, .L80240B44 /* B73BE0 80240B30 24020001 */ addiu $v0, $zero, 1 /* B73BE4 80240B34 12620048 */ beq $s3, $v0, .L80240C58 -/* B73BE8 80240B38 00000000 */ nop +/* B73BE8 80240B38 00000000 */ nop /* B73BEC 80240B3C 08090333 */ j .L80240CCC -/* B73BF0 80240B40 00000000 */ nop +/* B73BF0 80240B40 00000000 */ nop .L80240B44: /* B73BF4 80240B44 86240008 */ lh $a0, 8($s1) /* B73BF8 80240B48 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel func_80240A90_B73B40 /* B73C18 80240B68 8E03006C */ lw $v1, 0x6c($s0) /* B73C1C 80240B6C 24020003 */ addiu $v0, $zero, 3 /* B73C20 80240B70 14620056 */ bne $v1, $v0, .L80240CCC -/* B73C24 80240B74 00000000 */ nop +/* B73C24 80240B74 00000000 */ nop /* B73C28 80240B78 8E2500A8 */ lw $a1, 0xa8($s1) /* B73C2C 80240B7C 10A00003 */ beqz $a1, .L80240B8C /* B73C30 80240B80 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel func_80240A90_B73B40 /* B73CA8 80240BF8 C7A20014 */ lwc1 $f2, 0x14($sp) /* B73CAC 80240BFC 4600020D */ trunc.w.s $f8, $f0 /* B73CB0 80240C00 44024000 */ mfc1 $v0, $f8 -/* B73CB4 80240C04 00000000 */ nop +/* B73CB4 80240C04 00000000 */ nop /* B73CB8 80240C08 A6220012 */ sh $v0, 0x12($s1) /* B73CBC 80240C0C 4600120D */ trunc.w.s $f8, $f2 /* B73CC0 80240C10 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s index 15e49ffa14..8f83cfbfef 100644 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s +++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s @@ -100,78 +100,93 @@ glabel func_80240CF0_B73DA0 /* B73F04 80240E54 2C620064 */ sltiu $v0, $v1, 0x64 /* B73F08 80240E58 10400048 */ beqz $v0, .L80240F7C /* B73F0C 80240E5C 00031080 */ sll $v0, $v1, 2 -/* B73F10 80240E60 3C018024 */ lui $at, %hi(D_802433E0) +/* B73F10 80240E60 3C018024 */ lui $at, %hi(jtbl_802433E0_B76490) /* B73F14 80240E64 00220821 */ addu $at, $at, $v0 -/* B73F18 80240E68 8C2233E0 */ lw $v0, %lo(D_802433E0)($at) +/* B73F18 80240E68 8C2233E0 */ lw $v0, %lo(jtbl_802433E0_B76490)($at) /* B73F1C 80240E6C 00400008 */ jr $v0 /* B73F20 80240E70 00000000 */ nop +glabel L80240E74_B73F24 /* B73F24 80240E74 0240202D */ daddu $a0, $s2, $zero /* B73F28 80240E78 0260282D */ daddu $a1, $s3, $zero /* B73F2C 80240E7C 0C012568 */ jal func_800495A0 /* B73F30 80240E80 0280302D */ daddu $a2, $s4, $zero +glabel L80240E84_B73F34 /* B73F34 80240E84 0240202D */ daddu $a0, $s2, $zero /* B73F38 80240E88 0260282D */ daddu $a1, $s3, $zero /* B73F3C 80240E8C 0C0125AE */ jal func_800496B8 /* B73F40 80240E90 0280302D */ daddu $a2, $s4, $zero /* B73F44 80240E94 080903DF */ j .L80240F7C /* B73F48 80240E98 00000000 */ nop +glabel L80240E9C_B73F4C /* B73F4C 80240E9C 0240202D */ daddu $a0, $s2, $zero /* B73F50 80240EA0 0260282D */ daddu $a1, $s3, $zero /* B73F54 80240EA4 0C0126D1 */ jal base_UnkNpcAIFunc1 /* B73F58 80240EA8 0280302D */ daddu $a2, $s4, $zero +glabel L80240EAC_B73F5C /* B73F5C 80240EAC 0240202D */ daddu $a0, $s2, $zero /* B73F60 80240EB0 0260282D */ daddu $a1, $s3, $zero /* B73F64 80240EB4 0C012701 */ jal func_80049C04 /* B73F68 80240EB8 0280302D */ daddu $a2, $s4, $zero /* B73F6C 80240EBC 080903DF */ j .L80240F7C /* B73F70 80240EC0 00000000 */ nop +glabel L80240EC4_B73F74 /* B73F74 80240EC4 0240202D */ daddu $a0, $s2, $zero /* B73F78 80240EC8 0260282D */ daddu $a1, $s3, $zero /* B73F7C 80240ECC 0C01278F */ jal func_80049E3C /* B73F80 80240ED0 0280302D */ daddu $a2, $s4, $zero +glabel L80240ED4_B73F84 /* B73F84 80240ED4 0240202D */ daddu $a0, $s2, $zero /* B73F88 80240ED8 0260282D */ daddu $a1, $s3, $zero /* B73F8C 80240EDC 0C0127B3 */ jal func_80049ECC /* B73F90 80240EE0 0280302D */ daddu $a2, $s4, $zero /* B73F94 80240EE4 080903DF */ j .L80240F7C /* B73F98 80240EE8 00000000 */ nop +glabel L80240EEC_B73F9C /* B73F9C 80240EEC 0240202D */ daddu $a0, $s2, $zero /* B73FA0 80240EF0 0260282D */ daddu $a1, $s3, $zero /* B73FA4 80240EF4 0C0127DF */ jal func_80049F7C /* B73FA8 80240EF8 0280302D */ daddu $a2, $s4, $zero +glabel L80240EFC_B73FAC /* B73FAC 80240EFC 0240202D */ daddu $a0, $s2, $zero /* B73FB0 80240F00 0260282D */ daddu $a1, $s3, $zero /* B73FB4 80240F04 0C012849 */ jal func_8004A124 /* B73FB8 80240F08 0280302D */ daddu $a2, $s4, $zero /* B73FBC 80240F0C 080903DF */ j .L80240F7C /* B73FC0 80240F10 00000000 */ nop +glabel L80240F14_B73FC4 /* B73FC4 80240F14 0240202D */ daddu $a0, $s2, $zero /* B73FC8 80240F18 0260282D */ daddu $a1, $s3, $zero /* B73FCC 80240F1C 0C0128FA */ jal func_8004A3E8 /* B73FD0 80240F20 0280302D */ daddu $a2, $s4, $zero /* B73FD4 80240F24 080903DF */ j .L80240F7C /* B73FD8 80240F28 00000000 */ nop +glabel L80240F2C_B73FDC /* B73FDC 80240F2C 0C0901B5 */ jal jan_12_UnkNpcAIFunc6 /* B73FE0 80240F30 0240202D */ daddu $a0, $s2, $zero +glabel L80240F34_B73FE4 /* B73FE4 80240F34 0C0901D0 */ jal jan_12_UnkNpcAIFunc7 /* B73FE8 80240F38 0240202D */ daddu $a0, $s2, $zero /* B73FEC 80240F3C 8E430070 */ lw $v1, 0x70($s2) /* B73FF0 80240F40 24020020 */ addiu $v0, $zero, 0x20 /* B73FF4 80240F44 1462000D */ bne $v1, $v0, .L80240F7C /* B73FF8 80240F48 00000000 */ nop +glabel L80240F4C_B73FFC /* B73FFC 80240F4C 0C0901EC */ jal jan_12_UnkNpcAIFunc8 /* B74000 80240F50 0240202D */ daddu $a0, $s2, $zero /* B74004 80240F54 8E430070 */ lw $v1, 0x70($s2) /* B74008 80240F58 24020021 */ addiu $v0, $zero, 0x21 /* B7400C 80240F5C 14620007 */ bne $v1, $v0, .L80240F7C /* B74010 80240F60 00000000 */ nop +glabel L80240F64_B74014 /* B74014 80240F64 0C090222 */ jal jan_12_UnkNpcAIFunc5 /* B74018 80240F68 0240202D */ daddu $a0, $s2, $zero /* B7401C 80240F6C 080903DF */ j .L80240F7C /* B74020 80240F70 00000000 */ nop +glabel L80240F74_B74024 /* B74024 80240F74 0C0129CF */ jal func_8004A73C /* B74028 80240F78 0240202D */ daddu $a0, $s2, $zero .L80240F7C: +glabel L80240F7C_B7402C /* B7402C 80240F7C 8FBF0048 */ lw $ra, 0x48($sp) /* B74030 80240F80 8FB50044 */ lw $s5, 0x44($sp) /* B74034 80240F84 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s index 9cfa34956f..708b08cef6 100644 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s +++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s @@ -46,7 +46,7 @@ glabel func_80240FA4_B74054 /* B740F8 80241048 8E2200B0 */ lw $v0, 0xb0($s1) /* B740FC 8024104C 30420004 */ andi $v0, $v0, 4 /* B74100 80241050 10400020 */ beqz $v0, .L802410D4 -/* B74104 80241054 00000000 */ nop +/* B74104 80241054 00000000 */ nop .L80241058: /* B74108 80241058 2404F7FF */ addiu $a0, $zero, -0x801 /* B7410C 8024105C AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80240FA4_B74054 /* B74184 802410D4 8E420070 */ lw $v0, 0x70($s2) /* B74188 802410D8 2842001E */ slti $v0, $v0, 0x1e /* B7418C 802410DC 10400009 */ beqz $v0, .L80241104 -/* B74190 802410E0 00000000 */ nop +/* B74190 802410E0 00000000 */ nop /* B74194 802410E4 8E22006C */ lw $v0, 0x6c($s1) /* B74198 802410E8 14400006 */ bnez $v0, .L80241104 -/* B7419C 802410EC 00000000 */ nop +/* B7419C 802410EC 00000000 */ nop /* B741A0 802410F0 0C090237 */ jal func_802408DC_B7398C /* B741A4 802410F4 0240202D */ daddu $a0, $s2, $zero /* B741A8 802410F8 10400002 */ beqz $v0, .L80241104 @@ -100,78 +100,93 @@ glabel func_80240FA4_B74054 /* B741B8 80241108 2C620064 */ sltiu $v0, $v1, 0x64 /* B741BC 8024110C 10400048 */ beqz $v0, .L80241230 /* B741C0 80241110 00031080 */ sll $v0, $v1, 2 -/* B741C4 80241114 3C018024 */ lui $at, %hi(pause_textbox_draw_contents) +/* B741C4 80241114 3C018024 */ lui $at, %hi(jtbl_80243570_B76620) /* B741C8 80241118 00220821 */ addu $at, $at, $v0 -/* B741CC 8024111C 8C223570 */ lw $v0, %lo(pause_textbox_draw_contents)($at) +/* B741CC 8024111C 8C223570 */ lw $v0, %lo(jtbl_80243570_B76620)($at) /* B741D0 80241120 00400008 */ jr $v0 -/* B741D4 80241124 00000000 */ nop +/* B741D4 80241124 00000000 */ nop +glabel L80241128_B741D8 /* B741D8 80241128 0240202D */ daddu $a0, $s2, $zero /* B741DC 8024112C 0260282D */ daddu $a1, $s3, $zero /* B741E0 80241130 0C012568 */ jal func_800495A0 /* B741E4 80241134 0280302D */ daddu $a2, $s4, $zero +glabel L80241138_B741E8 /* B741E8 80241138 0240202D */ daddu $a0, $s2, $zero /* B741EC 8024113C 0260282D */ daddu $a1, $s3, $zero /* B741F0 80241140 0C0125AE */ jal func_800496B8 /* B741F4 80241144 0280302D */ daddu $a2, $s4, $zero /* B741F8 80241148 0809048C */ j .L80241230 -/* B741FC 8024114C 00000000 */ nop +/* B741FC 8024114C 00000000 */ nop +glabel L80241150_B74200 /* B74200 80241150 0240202D */ daddu $a0, $s2, $zero /* B74204 80241154 0260282D */ daddu $a1, $s3, $zero /* B74208 80241158 0C090130 */ jal jan_12_UnkNpcAIFunc4 /* B7420C 8024115C 0280302D */ daddu $a2, $s4, $zero +glabel L80241160_B74210 /* B74210 80241160 0240202D */ daddu $a0, $s2, $zero /* B74214 80241164 0260282D */ daddu $a1, $s3, $zero /* B74218 80241168 0C090144 */ jal func_80240510_B735C0 /* B7421C 8024116C 0280302D */ daddu $a2, $s4, $zero /* B74220 80241170 0809048C */ j .L80241230 -/* B74224 80241174 00000000 */ nop +/* B74224 80241174 00000000 */ nop +glabel L80241178_B74228 /* B74228 80241178 0240202D */ daddu $a0, $s2, $zero /* B7422C 8024117C 0260282D */ daddu $a1, $s3, $zero /* B74230 80241180 0C01278F */ jal func_80049E3C /* B74234 80241184 0280302D */ daddu $a2, $s4, $zero +glabel L80241188_B74238 /* B74238 80241188 0240202D */ daddu $a0, $s2, $zero /* B7423C 8024118C 0260282D */ daddu $a1, $s3, $zero /* B74240 80241190 0C0127B3 */ jal func_80049ECC /* B74244 80241194 0280302D */ daddu $a2, $s4, $zero /* B74248 80241198 0809048C */ j .L80241230 -/* B7424C 8024119C 00000000 */ nop +/* B7424C 8024119C 00000000 */ nop +glabel L802411A0_B74250 /* B74250 802411A0 0240202D */ daddu $a0, $s2, $zero /* B74254 802411A4 0260282D */ daddu $a1, $s3, $zero /* B74258 802411A8 0C0127DF */ jal func_80049F7C /* B7425C 802411AC 0280302D */ daddu $a2, $s4, $zero +glabel L802411B0_B74260 /* B74260 802411B0 0240202D */ daddu $a0, $s2, $zero /* B74264 802411B4 0260282D */ daddu $a1, $s3, $zero /* B74268 802411B8 0C012849 */ jal func_8004A124 /* B7426C 802411BC 0280302D */ daddu $a2, $s4, $zero /* B74270 802411C0 0809048C */ j .L80241230 -/* B74274 802411C4 00000000 */ nop +/* B74274 802411C4 00000000 */ nop +glabel L802411C8_B74278 /* B74278 802411C8 0240202D */ daddu $a0, $s2, $zero /* B7427C 802411CC 0260282D */ daddu $a1, $s3, $zero /* B74280 802411D0 0C0128FA */ jal func_8004A3E8 /* B74284 802411D4 0280302D */ daddu $a2, $s4, $zero /* B74288 802411D8 0809048C */ j .L80241230 -/* B7428C 802411DC 00000000 */ nop +/* B7428C 802411DC 00000000 */ nop +glabel L802411E0_B74290 /* B74290 802411E0 0C0901B5 */ jal jan_12_UnkNpcAIFunc6 /* B74294 802411E4 0240202D */ daddu $a0, $s2, $zero +glabel L802411E8_B74298 /* B74298 802411E8 0C0901D0 */ jal jan_12_UnkNpcAIFunc7 /* B7429C 802411EC 0240202D */ daddu $a0, $s2, $zero /* B742A0 802411F0 8E430070 */ lw $v1, 0x70($s2) /* B742A4 802411F4 24020020 */ addiu $v0, $zero, 0x20 /* B742A8 802411F8 1462000D */ bne $v1, $v0, .L80241230 -/* B742AC 802411FC 00000000 */ nop +/* B742AC 802411FC 00000000 */ nop +glabel L80241200_B742B0 /* B742B0 80241200 0C0901EC */ jal jan_12_UnkNpcAIFunc8 /* B742B4 80241204 0240202D */ daddu $a0, $s2, $zero /* B742B8 80241208 8E430070 */ lw $v1, 0x70($s2) /* B742BC 8024120C 24020021 */ addiu $v0, $zero, 0x21 /* B742C0 80241210 14620007 */ bne $v1, $v0, .L80241230 -/* B742C4 80241214 00000000 */ nop +/* B742C4 80241214 00000000 */ nop +glabel L80241218_B742C8 /* B742C8 80241218 0C090222 */ jal jan_12_UnkNpcAIFunc5 /* B742CC 8024121C 0240202D */ daddu $a0, $s2, $zero /* B742D0 80241220 0809048C */ j .L80241230 -/* B742D4 80241224 00000000 */ nop +/* B742D4 80241224 00000000 */ nop +glabel L80241228_B742D8 /* B742D8 80241228 0C0129CF */ jal func_8004A73C /* B742DC 8024122C 0240202D */ daddu $a0, $s2, $zero .L80241230: +glabel L80241230_B742E0 /* B742E0 80241230 8FBF0048 */ lw $ra, 0x48($sp) /* B742E4 80241234 8FB50044 */ lw $s5, 0x44($sp) /* B742E8 80241238 8FB40040 */ lw $s4, 0x40($sp) @@ -182,5 +197,5 @@ glabel func_80240FA4_B74054 /* B742FC 8024124C 0000102D */ daddu $v0, $zero, $zero /* B74300 80241250 03E00008 */ jr $ra /* B74304 80241254 27BD0050 */ addiu $sp, $sp, 0x50 -/* B74308 80241258 00000000 */ nop -/* B7430C 8024125C 00000000 */ nop +/* B74308 80241258 00000000 */ nop +/* B7430C 8024125C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_802401AC_B7695C.s b/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_802401AC_B7695C.s index 4c35d3c495..58d40323f9 100644 --- a/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_802401AC_B7695C.s +++ b/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_802401AC_B7695C.s @@ -10,16 +10,16 @@ glabel func_802401AC_B7695C /* B76970 802401C0 44813000 */ mtc1 $at, $f6 /* B76974 802401C4 46041083 */ div.s $f2, $f2, $f4 /* B76978 802401C8 46061082 */ mul.s $f2, $f2, $f6 -/* B7697C 802401CC 00000000 */ nop +/* B7697C 802401CC 00000000 */ nop /* B76980 802401D0 C4800088 */ lwc1 $f0, 0x88($a0) /* B76984 802401D4 46800020 */ cvt.s.w $f0, $f0 /* B76988 802401D8 46040003 */ div.s $f0, $f0, $f4 /* B7698C 802401DC 46060002 */ mul.s $f0, $f0, $f6 -/* B76990 802401E0 00000000 */ nop +/* B76990 802401E0 00000000 */ nop /* B76994 802401E4 3C01CD5B */ lui $at, 0xcd5b /* B76998 802401E8 34215858 */ ori $at, $at, 0x5858 /* B7699C 802401EC 44812000 */ mtc1 $at, $f4 -/* B769A0 802401F0 00000000 */ nop +/* B769A0 802401F0 00000000 */ nop /* B769A4 802401F4 46041080 */ add.s $f2, $f2, $f4 /* B769A8 802401F8 46040000 */ add.s $f0, $f0, $f4 /* B769AC 802401FC 4600120D */ trunc.w.s $f8, $f2 diff --git a/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240214_B769C4.s b/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240214_B769C4.s index 90a638a695..c982d7e8f7 100644 --- a/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240214_B769C4.s +++ b/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240214_B769C4.s @@ -32,7 +32,7 @@ glabel func_80240214_B769C4 /* B76A30 80240280 44060000 */ mfc1 $a2, $f0 /* B76A34 80240284 44071000 */ mfc1 $a3, $f2 /* B76A38 80240288 44820000 */ mtc1 $v0, $f0 -/* B76A3C 8024028C 00000000 */ nop +/* B76A3C 8024028C 00000000 */ nop /* B76A40 80240290 46800020 */ cvt.s.w $f0, $f0 /* B76A44 80240294 AE220078 */ sw $v0, 0x78($s1) /* B76A48 80240298 0C05267B */ jal func_801499EC diff --git a/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_802402B8_B76A68.s b/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_802402B8_B76A68.s index 20bff0509b..fd402d96b5 100644 --- a/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_802402B8_B76A68.s +++ b/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_802402B8_B76A68.s @@ -26,13 +26,13 @@ glabel func_802402B8_B76A68 /* B76ABC 8024030C 44811000 */ mtc1 $at, $f2 /* B76AC0 80240310 4600A503 */ div.s $f20, $f20, $f0 /* B76AC4 80240314 4602A502 */ mul.s $f20, $f20, $f2 -/* B76AC8 80240318 00000000 */ nop +/* B76AC8 80240318 00000000 */ nop /* B76ACC 8024031C 3C0141C8 */ lui $at, 0x41c8 /* B76AD0 80240320 4481B000 */ mtc1 $at, $f22 /* B76AD4 80240324 0C00A85B */ jal sin_rad /* B76AD8 80240328 4600A306 */ mov.s $f12, $f20 /* B76ADC 8024032C 46160002 */ mul.s $f0, $f0, $f22 -/* B76AE0 80240330 00000000 */ nop +/* B76AE0 80240330 00000000 */ nop /* B76AE4 80240334 4600A306 */ mov.s $f12, $f20 /* B76AE8 80240338 4600010D */ trunc.w.s $f4, $f0 /* B76AEC 8024033C 44022000 */ mfc1 $v0, $f4 @@ -40,10 +40,10 @@ glabel func_802402B8_B76A68 /* B76AF4 80240344 02228823 */ subu $s1, $s1, $v0 /* B76AF8 80240348 46000007 */ neg.s $f0, $f0 /* B76AFC 8024034C 46160002 */ mul.s $f0, $f0, $f22 -/* B76B00 80240350 00000000 */ nop +/* B76B00 80240350 00000000 */ nop /* B76B04 80240354 4600010D */ trunc.w.s $f4, $f0 /* B76B08 80240358 44022000 */ mfc1 $v0, $f4 -/* B76B0C 8024035C 00000000 */ nop +/* B76B0C 8024035C 00000000 */ nop /* B76B10 80240360 02028023 */ subu $s0, $s0, $v0 .L80240364: /* B76B14 80240364 AE510084 */ sw $s1, 0x84($s2) diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240000_B7A050.s b/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240000_B7A050.s index 60cc41935e..eaf1000f34 100644 --- a/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240000_B7A050.s +++ b/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240000_B7A050.s @@ -31,26 +31,26 @@ glabel func_80240000_B7A050 /* B7A0B8 80240068 0C0B210B */ jal get_float_variable /* B7A0BC 8024006C 46000506 */ mov.s $f20, $f0 /* B7A0C0 80240070 46000002 */ mul.s $f0, $f0, $f0 -/* B7A0C4 80240074 00000000 */ nop +/* B7A0C4 80240074 00000000 */ nop /* B7A0C8 80240078 C6240084 */ lwc1 $f4, 0x84($s1) /* B7A0CC 8024007C 46802120 */ cvt.s.w $f4, $f4 /* B7A0D0 80240080 46182101 */ sub.s $f4, $f4, $f24 /* B7A0D4 80240084 46042102 */ mul.s $f4, $f4, $f4 -/* B7A0D8 80240088 00000000 */ nop +/* B7A0D8 80240088 00000000 */ nop /* B7A0DC 8024008C C622008C */ lwc1 $f2, 0x8c($s1) /* B7A0E0 80240090 468010A0 */ cvt.s.w $f2, $f2 /* B7A0E4 80240094 46141081 */ sub.s $f2, $f2, $f20 /* B7A0E8 80240098 46021082 */ mul.s $f2, $f2, $f2 -/* B7A0EC 8024009C 00000000 */ nop +/* B7A0EC 8024009C 00000000 */ nop /* B7A0F0 802400A0 C6260088 */ lwc1 $f6, 0x88($s1) /* B7A0F4 802400A4 468031A0 */ cvt.s.w $f6, $f6 /* B7A0F8 802400A8 46163181 */ sub.s $f6, $f6, $f22 /* B7A0FC 802400AC 46063182 */ mul.s $f6, $f6, $f6 -/* B7A100 802400B0 00000000 */ nop +/* B7A100 802400B0 00000000 */ nop /* B7A104 802400B4 46062100 */ add.s $f4, $f4, $f6 /* B7A108 802400B8 46022100 */ add.s $f4, $f4, $f2 /* B7A10C 802400BC 4600203C */ c.lt.s $f4, $f0 -/* B7A110 802400C0 00000000 */ nop +/* B7A110 802400C0 00000000 */ nop /* B7A114 802400C4 45010002 */ bc1t .L802400D0 /* B7A118 802400C8 24020001 */ addiu $v0, $zero, 1 /* B7A11C 802400CC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240170_B7A1C0.s b/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240170_B7A1C0.s index 38086b071a..4bece7c3a8 100644 --- a/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240170_B7A1C0.s +++ b/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240170_B7A1C0.s @@ -13,7 +13,7 @@ glabel func_80240170_B7A1C0 /* B7A1E0 80240190 D4203870 */ ldc1 $f0, %lo(func_80243870_96CA30)($at) /* B7A1E4 80240194 4600A521 */ cvt.d.s $f20, $f20 /* B7A1E8 80240198 4620A502 */ mul.d $f20, $f20, $f0 -/* B7A1EC 8024019C 00000000 */ nop +/* B7A1EC 8024019C 00000000 */ nop /* B7A1F0 802401A0 3C013F80 */ lui $at, 0x3f80 /* B7A1F4 802401A4 44810000 */ mtc1 $at, $f0 /* B7A1F8 802401A8 AE000018 */ sw $zero, 0x18($s0) diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802401CC_B7A21C.s b/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802401CC_B7A21C.s index b733404a7f..753f5cfdff 100644 --- a/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802401CC_B7A21C.s +++ b/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802401CC_B7A21C.s @@ -25,7 +25,7 @@ glabel func_802401CC_B7A21C /* B7A26C 8024021C 96020000 */ lhu $v0, ($s0) /* B7A270 80240220 30420400 */ andi $v0, $v0, 0x400 /* B7A274 80240224 14400008 */ bnez $v0, .L80240248 -/* B7A278 80240228 00000000 */ nop +/* B7A278 80240228 00000000 */ nop /* B7A27C 8024022C 4405A000 */ mfc1 $a1, $f20 /* B7A280 80240230 0C09005C */ jal func_80240170_B7A1C0 /* B7A284 80240234 26040058 */ addiu $a0, $s0, 0x58 diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802404C0_B7A510.s b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802404C0_B7A510.s index 770f6979ed..5175f6e1d1 100644 --- a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802404C0_B7A510.s +++ b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802404C0_B7A510.s @@ -30,7 +30,7 @@ glabel func_802404C0_B7A510 /* B7A574 80240524 3C05B000 */ lui $a1, 0xb000 /* B7A578 80240528 34A50017 */ ori $a1, $a1, 0x17 /* B7A57C 8024052C 44820000 */ mtc1 $v0, $f0 -/* B7A580 80240530 00000000 */ nop +/* B7A580 80240530 00000000 */ nop /* B7A584 80240534 46800021 */ cvt.d.w $f0, $f0 /* B7A588 80240538 3C014024 */ lui $at, 0x4024 /* B7A58C 8024053C 44811800 */ mtc1 $at, $f3 @@ -68,7 +68,7 @@ glabel func_802404C0_B7A510 /* B7A60C 802405BC 0C0123F5 */ jal is_point_within_region /* B7A610 802405C0 8E070038 */ lw $a3, 0x38($s0) /* B7A614 802405C4 10400035 */ beqz $v0, .L8024069C -/* B7A618 802405C8 00000000 */ nop +/* B7A618 802405C8 00000000 */ nop /* B7A61C 802405CC C60C0038 */ lwc1 $f12, 0x38($s0) /* B7A620 802405D0 3C0141C8 */ lui $at, 0x41c8 /* B7A624 802405D4 4481B000 */ mtc1 $at, $f22 @@ -99,13 +99,13 @@ glabel func_802404C0_B7A510 /* B7A684 80240634 860200A8 */ lh $v0, 0xa8($s0) /* B7A688 80240638 27A50020 */ addiu $a1, $sp, 0x20 /* B7A68C 8024063C 44820000 */ mtc1 $v0, $f0 -/* B7A690 80240640 00000000 */ nop +/* B7A690 80240640 00000000 */ nop /* B7A694 80240644 46800020 */ cvt.s.w $f0, $f0 /* B7A698 80240648 E7A00018 */ swc1 $f0, 0x18($sp) /* B7A69C 8024064C 860200A6 */ lh $v0, 0xa6($s0) /* B7A6A0 80240650 27A60024 */ addiu $a2, $sp, 0x24 /* B7A6A4 80240654 44820000 */ mtc1 $v0, $f0 -/* B7A6A8 80240658 00000000 */ nop +/* B7A6A8 80240658 00000000 */ nop /* B7A6AC 8024065C 46800020 */ cvt.s.w $f0, $f0 /* B7A6B0 80240660 E7A0001C */ swc1 $f0, 0x1c($sp) /* B7A6B4 80240664 8E040080 */ lw $a0, 0x80($s0) @@ -121,13 +121,13 @@ glabel func_802404C0_B7A510 /* B7A6DC 8024068C 1440FFE6 */ bnez $v0, .L80240628 /* B7A6E0 80240690 E600000C */ swc1 $f0, 0xc($s0) /* B7A6E4 80240694 080901B3 */ j .L802406CC -/* B7A6E8 80240698 00000000 */ nop +/* B7A6E8 80240698 00000000 */ nop .L8024069C: /* B7A6EC 8024069C 0C00A67F */ jal rand_int /* B7A6F0 802406A0 2404003C */ addiu $a0, $zero, 0x3c /* B7A6F4 802406A4 C60C000C */ lwc1 $f12, 0xc($s0) /* B7A6F8 802406A8 44820000 */ mtc1 $v0, $f0 -/* B7A6FC 802406AC 00000000 */ nop +/* B7A6FC 802406AC 00000000 */ nop /* B7A700 802406B0 46800020 */ cvt.s.w $f0, $f0 /* B7A704 802406B4 46006300 */ add.s $f12, $f12, $f0 /* B7A708 802406B8 3C0141F0 */ lui $at, 0x41f0 diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802406F0_B7A740.s b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802406F0_B7A740.s index 138d82791f..5b224f9902 100644 --- a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802406F0_B7A740.s +++ b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802406F0_B7A740.s @@ -43,7 +43,7 @@ glabel func_802406F0_B7A740 /* B7A7D8 80240788 2402000F */ addiu $v0, $zero, 0xf /* B7A7DC 8024078C AFA2001C */ sw $v0, 0x1c($sp) /* B7A7E0 80240790 44835000 */ mtc1 $v1, $f10 -/* B7A7E4 80240794 00000000 */ nop +/* B7A7E4 80240794 00000000 */ nop /* B7A7E8 80240798 468052A0 */ cvt.s.w $f10, $f10 /* B7A7EC 8024079C 44075000 */ mfc1 $a3, $f10 /* B7A7F0 802407A0 27A20028 */ addiu $v0, $sp, 0x28 @@ -78,7 +78,7 @@ glabel func_802406F0_B7A740 /* B7A858 80240808 44801800 */ mtc1 $zero, $f3 /* B7A85C 8024080C 46000021 */ cvt.d.s $f0, $f0 /* B7A860 80240810 4620103C */ c.lt.d $f2, $f0 -/* B7A864 80240814 00000000 */ nop +/* B7A864 80240814 00000000 */ nop /* B7A868 80240818 45000025 */ bc1f .L802408B0 /* B7A86C 8024081C 27A5002C */ addiu $a1, $sp, 0x2c /* B7A870 80240820 C6000038 */ lwc1 $f0, 0x38($s0) @@ -88,7 +88,7 @@ glabel func_802406F0_B7A740 /* B7A880 80240830 27A60030 */ addiu $a2, $sp, 0x30 /* B7A884 80240834 E7A0002C */ swc1 $f0, 0x2c($sp) /* B7A888 80240838 44820000 */ mtc1 $v0, $f0 -/* B7A88C 8024083C 00000000 */ nop +/* B7A88C 8024083C 00000000 */ nop /* B7A890 80240840 46800020 */ cvt.s.w $f0, $f0 /* B7A894 80240844 46000021 */ cvt.d.s $f0, $f0 /* B7A898 80240848 C604003C */ lwc1 $f4, 0x3c($s0) @@ -96,13 +96,13 @@ glabel func_802406F0_B7A740 /* B7A8A0 80240850 C6080018 */ lwc1 $f8, 0x18($s0) /* B7A8A4 80240854 860200A8 */ lh $v0, 0xa8($s0) /* B7A8A8 80240858 46220002 */ mul.d $f0, $f0, $f2 -/* B7A8AC 8024085C 00000000 */ nop +/* B7A8AC 8024085C 00000000 */ nop /* B7A8B0 80240860 E7A40030 */ swc1 $f4, 0x30($sp) /* B7A8B4 80240864 E7A60034 */ swc1 $f6, 0x34($sp) /* B7A8B8 80240868 E7A80010 */ swc1 $f8, 0x10($sp) /* B7A8BC 8024086C C604000C */ lwc1 $f4, 0xc($s0) /* B7A8C0 80240870 44821000 */ mtc1 $v0, $f2 -/* B7A8C4 80240874 00000000 */ nop +/* B7A8C4 80240874 00000000 */ nop /* B7A8C8 80240878 468010A0 */ cvt.s.w $f2, $f2 /* B7A8CC 8024087C E7A20018 */ swc1 $f2, 0x18($sp) /* B7A8D0 80240880 E7A40014 */ swc1 $f4, 0x14($sp) @@ -123,7 +123,7 @@ glabel func_802406F0_B7A740 /* B7A908 802408B8 44801800 */ mtc1 $zero, $f3 /* B7A90C 802408BC 46000021 */ cvt.d.s $f0, $f0 /* B7A910 802408C0 4622003C */ c.lt.d $f0, $f2 -/* B7A914 802408C4 00000000 */ nop +/* B7A914 802408C4 00000000 */ nop /* B7A918 802408C8 45000047 */ bc1f .L802409E8 /* B7A91C 802408CC 27A5002C */ addiu $a1, $sp, 0x2c /* B7A920 802408D0 27A60030 */ addiu $a2, $sp, 0x30 @@ -154,7 +154,7 @@ glabel func_802406F0_B7A740 /* B7A984 80240934 0C0372DF */ jal func_800DCB7C /* B7A988 80240938 27A70034 */ addiu $a3, $sp, 0x34 /* B7A98C 8024093C 1040002A */ beqz $v0, .L802409E8 -/* B7A990 80240940 00000000 */ nop +/* B7A990 80240940 00000000 */ nop /* B7A994 80240944 C600001C */ lwc1 $f0, 0x1c($s0) /* B7A998 80240948 C7A20038 */ lwc1 $f2, 0x38($sp) /* B7A99C 8024094C 46000005 */ abs.s $f0, $f0 @@ -162,7 +162,7 @@ glabel func_802406F0_B7A740 /* B7A9A4 80240954 46340000 */ add.d $f0, $f0, $f20 /* B7A9A8 80240958 460010A1 */ cvt.d.s $f2, $f2 /* B7A9AC 8024095C 4620103E */ c.le.d $f2, $f0 -/* B7A9B0 80240960 00000000 */ nop +/* B7A9B0 80240960 00000000 */ nop /* B7A9B4 80240964 45000020 */ bc1f .L802409E8 /* B7A9B8 80240968 240403E8 */ addiu $a0, $zero, 0x3e8 /* B7A9BC 8024096C C7A00030 */ lwc1 $f0, 0x30($sp) @@ -193,7 +193,7 @@ glabel func_802406F0_B7A740 /* B7AA20 802409D0 5840000C */ blezl $v0, .L80240A04 /* B7AA24 802409D4 AE600070 */ sw $zero, 0x70($s3) /* B7AA28 802409D8 1460000A */ bnez $v1, .L80240A04 -/* B7AA2C 802409DC 00000000 */ nop +/* B7AA2C 802409DC 00000000 */ nop /* B7AA30 802409E0 08090281 */ j .L80240A04 /* B7AA34 802409E4 AE600070 */ sw $zero, 0x70($s3) .L802409E8: diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240AE8_B7AB38.s b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240AE8_B7AB38.s index 29c0fd4dba..aaf0213dd9 100644 --- a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240AE8_B7AB38.s +++ b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240AE8_B7AB38.s @@ -38,7 +38,7 @@ glabel func_80240AE8_B7AB38 /* B7ABBC 80240B6C 2402000F */ addiu $v0, $zero, 0xf /* B7ABC0 80240B70 AFA2001C */ sw $v0, 0x1c($sp) /* B7ABC4 80240B74 44833000 */ mtc1 $v1, $f6 -/* B7ABC8 80240B78 00000000 */ nop +/* B7ABC8 80240B78 00000000 */ nop /* B7ABCC 80240B7C 468031A0 */ cvt.s.w $f6, $f6 /* B7ABD0 80240B80 44073000 */ mfc1 $a3, $f6 /* B7ABD4 80240B84 27A20028 */ addiu $v0, $sp, 0x28 @@ -65,13 +65,13 @@ glabel func_80240AE8_B7AB38 .L80240BD8: /* B7AC28 80240BD8 8602008C */ lh $v0, 0x8c($s0) /* B7AC2C 80240BDC 14400023 */ bnez $v0, .L80240C6C -/* B7AC30 80240BE0 00000000 */ nop +/* B7AC30 80240BE0 00000000 */ nop /* B7AC34 80240BE4 9602008E */ lhu $v0, 0x8e($s0) /* B7AC38 80240BE8 2442FFFF */ addiu $v0, $v0, -1 /* B7AC3C 80240BEC A602008E */ sh $v0, 0x8e($s0) /* B7AC40 80240BF0 00021400 */ sll $v0, $v0, 0x10 /* B7AC44 80240BF4 1C40001D */ bgtz $v0, .L80240C6C -/* B7AC48 80240BF8 00000000 */ nop +/* B7AC48 80240BF8 00000000 */ nop /* B7AC4C 80240BFC 8E820074 */ lw $v0, 0x74($s4) /* B7AC50 80240C00 2442FFFF */ addiu $v0, $v0, -1 /* B7AC54 80240C04 18400018 */ blez $v0, .L80240C68 diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240C8C_B7ACDC.s b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240C8C_B7ACDC.s index 68363bb544..58966a29f0 100644 --- a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240C8C_B7ACDC.s +++ b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240C8C_B7ACDC.s @@ -24,7 +24,7 @@ glabel func_80240C8C_B7ACDC /* B7AD28 80240CD8 0C00A67F */ jal rand_int /* B7AD2C 80240CDC AE020000 */ sw $v0, ($s0) /* B7AD30 80240CE0 44820000 */ mtc1 $v0, $f0 -/* B7AD34 80240CE4 00000000 */ nop +/* B7AD34 80240CE4 00000000 */ nop /* B7AD38 80240CE8 46800021 */ cvt.d.w $f0, $f0 /* B7AD3C 80240CEC 3C014024 */ lui $at, 0x4024 /* B7AD40 80240CF0 44811800 */ mtc1 $at, $f3 diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240D6C_B7ADBC.s b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240D6C_B7ADBC.s index 023daa0350..d5732f06a6 100644 --- a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240D6C_B7ADBC.s +++ b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240D6C_B7ADBC.s @@ -25,7 +25,7 @@ glabel func_80240D6C_B7ADBC /* B7AE0C 80240DBC 44801800 */ mtc1 $zero, $f3 /* B7AE10 80240DC0 46000021 */ cvt.d.s $f0, $f0 /* B7AE14 80240DC4 4620103C */ c.lt.d $f2, $f0 -/* B7AE18 80240DC8 00000000 */ nop +/* B7AE18 80240DC8 00000000 */ nop /* B7AE1C 80240DCC 45000021 */ bc1f .L80240E54 /* B7AE20 80240DD0 27A50028 */ addiu $a1, $sp, 0x28 /* B7AE24 80240DD4 C6600038 */ lwc1 $f0, 0x38($s3) @@ -40,20 +40,20 @@ glabel func_80240D6C_B7ADBC /* B7AE48 80240DF8 E7A00014 */ swc1 $f0, 0x14($sp) /* B7AE4C 80240DFC 866200A8 */ lh $v0, 0xa8($s3) /* B7AE50 80240E00 44820000 */ mtc1 $v0, $f0 -/* B7AE54 80240E04 00000000 */ nop +/* B7AE54 80240E04 00000000 */ nop /* B7AE58 80240E08 46800020 */ cvt.s.w $f0, $f0 /* B7AE5C 80240E0C E7A00018 */ swc1 $f0, 0x18($sp) /* B7AE60 80240E10 866200A6 */ lh $v0, 0xa6($s3) /* B7AE64 80240E14 27A6002C */ addiu $a2, $sp, 0x2c /* B7AE68 80240E18 44820000 */ mtc1 $v0, $f0 -/* B7AE6C 80240E1C 00000000 */ nop +/* B7AE6C 80240E1C 00000000 */ nop /* B7AE70 80240E20 46800020 */ cvt.s.w $f0, $f0 /* B7AE74 80240E24 E7A0001C */ swc1 $f0, 0x1c($sp) /* B7AE78 80240E28 8E640080 */ lw $a0, 0x80($s3) /* B7AE7C 80240E2C 0C037711 */ jal func_800DDC44 /* B7AE80 80240E30 27A70030 */ addiu $a3, $sp, 0x30 /* B7AE84 80240E34 10400003 */ beqz $v0, .L80240E44 -/* B7AE88 80240E38 00000000 */ nop +/* B7AE88 80240E38 00000000 */ nop /* B7AE8C 80240E3C 08090395 */ j .L80240E54 /* B7AE90 80240E40 AE600018 */ sw $zero, 0x18($s3) .L80240E44: @@ -67,7 +67,7 @@ glabel func_80240D6C_B7ADBC /* B7AEAC 80240E5C 44801800 */ mtc1 $zero, $f3 /* B7AEB0 80240E60 46000021 */ cvt.d.s $f0, $f0 /* B7AEB4 80240E64 4622003C */ c.lt.d $f0, $f2 -/* B7AEB8 80240E68 00000000 */ nop +/* B7AEB8 80240E68 00000000 */ nop /* B7AEBC 80240E6C 4500006C */ bc1f .L80241020 /* B7AEC0 80240E70 27B00028 */ addiu $s0, $sp, 0x28 /* B7AEC4 80240E74 0200282D */ daddu $a1, $s0, $zero @@ -116,7 +116,7 @@ glabel func_80240D6C_B7ADBC /* B7AF70 80240F20 0C0372DF */ jal func_800DCB7C /* B7AF74 80240F24 0220382D */ daddu $a3, $s1, $zero /* B7AF78 80240F28 1040003D */ beqz $v0, .L80241020 -/* B7AF7C 80240F2C 00000000 */ nop +/* B7AF7C 80240F2C 00000000 */ nop /* B7AF80 80240F30 C660001C */ lwc1 $f0, 0x1c($s3) /* B7AF84 80240F34 C7A20038 */ lwc1 $f2, 0x38($sp) /* B7AF88 80240F38 46000005 */ abs.s $f0, $f0 @@ -124,7 +124,7 @@ glabel func_80240D6C_B7ADBC /* B7AF90 80240F40 46340000 */ add.d $f0, $f0, $f20 /* B7AF94 80240F44 460010A1 */ cvt.d.s $f2, $f2 /* B7AF98 80240F48 4620103E */ c.le.d $f2, $f0 -/* B7AF9C 80240F4C 00000000 */ nop +/* B7AF9C 80240F4C 00000000 */ nop /* B7AFA0 80240F50 45000033 */ bc1f .L80241020 /* B7AFA4 80240F54 2403F7FF */ addiu $v1, $zero, -0x801 /* B7AFA8 80240F58 C7A0002C */ lwc1 $f0, 0x2c($sp) @@ -163,7 +163,7 @@ glabel func_80240D6C_B7ADBC /* B7B02C 80240FDC 2402000F */ addiu $v0, $zero, 0xf /* B7B030 80240FE0 AFA2001C */ sw $v0, 0x1c($sp) /* B7B034 80240FE4 44834000 */ mtc1 $v1, $f8 -/* B7B038 80240FE8 00000000 */ nop +/* B7B038 80240FE8 00000000 */ nop /* B7B03C 80240FEC 46804220 */ cvt.s.w $f8, $f8 /* B7B040 80240FF0 44074000 */ mfc1 $a3, $f8 /* B7B044 80240FF4 27A2003C */ addiu $v0, $sp, 0x3c diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s index b8894917fe..b86180a5fa 100644 --- a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s +++ b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s @@ -76,7 +76,7 @@ glabel func_802410B0_B7B100 /* B7B218 802411C8 8E4300B0 */ lw $v1, 0xb0($s2) /* B7B21C 802411CC 30620004 */ andi $v0, $v1, 4 /* B7B220 802411D0 10400007 */ beqz $v0, .L802411F0 -/* B7B224 802411D4 00000000 */ nop +/* B7B224 802411D4 00000000 */ nop /* B7B228 802411D8 824200B4 */ lb $v0, 0xb4($s2) /* B7B22C 802411DC 14400034 */ bnez $v0, .L802412B0 /* B7B230 802411E0 0000102D */ daddu $v0, $zero, $zero @@ -88,21 +88,24 @@ glabel func_802410B0_B7B100 /* B7B244 802411F4 2C62000F */ sltiu $v0, $v1, 0xf /* B7B248 802411F8 1040002C */ beqz $v0, .L802412AC /* B7B24C 802411FC 00031080 */ sll $v0, $v1, 2 -/* B7B250 80241200 3C018024 */ lui $at, %hi(D_80243888) +/* B7B250 80241200 3C018024 */ lui $at, %hi(jtbl_80243888_B7D8D8) /* B7B254 80241204 00220821 */ addu $at, $at, $v0 -/* B7B258 80241208 8C223888 */ lw $v0, %lo(D_80243888)($at) +/* B7B258 80241208 8C223888 */ lw $v0, %lo(jtbl_80243888_B7D8D8)($at) /* B7B25C 8024120C 00400008 */ jr $v0 -/* B7B260 80241210 00000000 */ nop +/* B7B260 80241210 00000000 */ nop +glabel L80241214_B7B264 /* B7B264 80241214 0260202D */ daddu $a0, $s3, $zero /* B7B268 80241218 0280282D */ daddu $a1, $s4, $zero /* B7B26C 8024121C 0C090130 */ jal func_802404C0_B7A510 /* B7B270 80241220 0200302D */ daddu $a2, $s0, $zero +glabel L80241224_B7B274 /* B7B274 80241224 0260202D */ daddu $a0, $s3, $zero /* B7B278 80241228 0280282D */ daddu $a1, $s4, $zero /* B7B27C 8024122C 0C0901BC */ jal func_802406F0_B7A740 /* B7B280 80241230 0200302D */ daddu $a2, $s0, $zero /* B7B284 80241234 080904AC */ j .L802412B0 /* B7B288 80241238 0000102D */ daddu $v0, $zero, $zero +glabel L8024123C_B7B28C /* B7B28C 8024123C 0260202D */ daddu $a0, $s3, $zero /* B7B290 80241240 0280282D */ daddu $a1, $s4, $zero /* B7B294 80241244 0C09028A */ jal jan_14_UnkNpcAIFunc1 @@ -111,27 +114,32 @@ glabel func_802410B0_B7B100 /* B7B2A0 80241250 24020003 */ addiu $v0, $zero, 3 /* B7B2A4 80241254 14620016 */ bne $v1, $v0, .L802412B0 /* B7B2A8 80241258 0000102D */ daddu $v0, $zero, $zero +glabel L8024125C_B7B2AC /* B7B2AC 8024125C 0260202D */ daddu $a0, $s3, $zero /* B7B2B0 80241260 0280282D */ daddu $a1, $s4, $zero /* B7B2B4 80241264 0C0902BA */ jal func_80240AE8_B7AB38 /* B7B2B8 80241268 0200302D */ daddu $a2, $s0, $zero /* B7B2BC 8024126C 080904AC */ j .L802412B0 /* B7B2C0 80241270 0000102D */ daddu $v0, $zero, $zero +glabel L80241274_B7B2C4 /* B7B2C4 80241274 0260202D */ daddu $a0, $s3, $zero /* B7B2C8 80241278 0280282D */ daddu $a1, $s4, $zero /* B7B2CC 8024127C 0C090323 */ jal func_80240C8C_B7ACDC /* B7B2D0 80241280 0200302D */ daddu $a2, $s0, $zero +glabel L80241284_B7B2D4 /* B7B2D4 80241284 0260202D */ daddu $a0, $s3, $zero /* B7B2D8 80241288 0280282D */ daddu $a1, $s4, $zero /* B7B2DC 8024128C 0C09035B */ jal func_80240D6C_B7ADBC /* B7B2E0 80241290 0200302D */ daddu $a2, $s0, $zero /* B7B2E4 80241294 080904AC */ j .L802412B0 /* B7B2E8 80241298 0000102D */ daddu $v0, $zero, $zero +glabel L8024129C_B7B2EC /* B7B2EC 8024129C 0260202D */ daddu $a0, $s3, $zero /* B7B2F0 802412A0 0280282D */ daddu $a1, $s4, $zero /* B7B2F4 802412A4 0C09041B */ jal jan_14_UnkDurationCheck /* B7B2F8 802412A8 0200302D */ daddu $a2, $s0, $zero .L802412AC: +glabel L802412AC_B7B2FC /* B7B2FC 802412AC 0000102D */ daddu $v0, $zero, $zero .L802412B0: /* B7B300 802412B0 8FBF0048 */ lw $ra, 0x48($sp) @@ -143,6 +151,6 @@ glabel func_802410B0_B7B100 /* B7B318 802412C8 8FB00030 */ lw $s0, 0x30($sp) /* B7B31C 802412CC 03E00008 */ jr $ra /* B7B320 802412D0 27BD0050 */ addiu $sp, $sp, 0x50 -/* B7B324 802412D4 00000000 */ nop -/* B7B328 802412D8 00000000 */ nop -/* B7B32C 802412DC 00000000 */ nop +/* B7B324 802412D4 00000000 */ nop +/* B7B328 802412D8 00000000 */ nop +/* B7B32C 802412DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_15/B7D920/func_80240000_B7D920.s b/asm/nonmatchings/world/area_jan/jan_15/B7D920/func_80240000_B7D920.s index 39d7d17963..71dba75aae 100644 --- a/asm/nonmatchings/world/area_jan/jan_15/B7D920/func_80240000_B7D920.s +++ b/asm/nonmatchings/world/area_jan/jan_15/B7D920/func_80240000_B7D920.s @@ -29,7 +29,7 @@ glabel func_80240000_B7D920 /* B7D980 80240060 46220000 */ add.d $f0, $f0, $f2 /* B7D984 80240064 AFA00014 */ sw $zero, 0x14($sp) /* B7D988 80240068 44831000 */ mtc1 $v1, $f2 -/* B7D98C 8024006C 00000000 */ nop +/* B7D98C 8024006C 00000000 */ nop /* B7D990 80240070 468010A0 */ cvt.s.w $f2, $f2 /* B7D994 80240074 46022100 */ add.s $f4, $f4, $f2 /* B7D998 80240078 8E050038 */ lw $a1, 0x38($s0) @@ -48,6 +48,6 @@ glabel func_80240000_B7D920 /* B7D9C8 802400A8 24020002 */ addiu $v0, $zero, 2 /* B7D9CC 802400AC 03E00008 */ jr $ra /* B7D9D0 802400B0 27BD0028 */ addiu $sp, $sp, 0x28 -/* B7D9D4 802400B4 00000000 */ nop -/* B7D9D8 802400B8 00000000 */ nop -/* B7D9DC 802400BC 00000000 */ nop +/* B7D9D4 802400B4 00000000 */ nop +/* B7D9D8 802400B8 00000000 */ nop +/* B7D9DC 802400BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_16/B80000/func_80240000_B80000.s b/asm/nonmatchings/world/area_jan/jan_16/B80000/func_80240000_B80000.s index f2ec26a977..403244d147 100644 --- a/asm/nonmatchings/world/area_jan/jan_16/B80000/func_80240000_B80000.s +++ b/asm/nonmatchings/world/area_jan/jan_16/B80000/func_80240000_B80000.s @@ -37,12 +37,12 @@ glabel func_80240000_B80000 /* B8007C 8024007C 12400007 */ beqz $s2, .L8024009C /* B80080 80240080 3412FFFF */ ori $s2, $zero, 0xffff /* B80084 80240084 08090043 */ j .L8024010C -/* B80088 80240088 00000000 */ nop +/* B80088 80240088 00000000 */ nop .L8024008C: /* B8008C 8024008C 1242001B */ beq $s2, $v0, .L802400FC /* B80090 80240090 24020002 */ addiu $v0, $zero, 2 /* B80094 80240094 08090043 */ j .L8024010C -/* B80098 80240098 00000000 */ nop +/* B80098 80240098 00000000 */ nop .L8024009C: /* B8009C 8024009C 8E040000 */ lw $a0, ($s0) /* B800A0 802400A0 1092001A */ beq $a0, $s2, .L8024010C @@ -56,7 +56,7 @@ glabel func_80240000_B80000 /* B800C0 802400C0 0C046F1F */ jal func_8011BC7C /* B800C4 802400C4 0220302D */ daddu $a2, $s1, $zero /* B800C8 802400C8 08090027 */ j .L8024009C -/* B800CC 802400CC 00000000 */ nop +/* B800CC 802400CC 00000000 */ nop .L802400D0: /* B800D0 802400D0 3412FFFF */ ori $s2, $zero, 0xffff .L802400D4: @@ -69,7 +69,7 @@ glabel func_80240000_B80000 /* B800EC 802400EC 0C046E54 */ jal func_8011B950 /* B800F0 802400F0 0000382D */ daddu $a3, $zero, $zero /* B800F4 802400F4 08090035 */ j .L802400D4 -/* B800F8 802400F8 00000000 */ nop +/* B800F8 802400F8 00000000 */ nop .L802400FC: /* B800FC 802400FC 3C028015 */ lui $v0, %hi(D_801512F0) /* B80100 80240100 8C4212F0 */ lw $v0, %lo(D_801512F0)($v0) diff --git a/asm/nonmatchings/world/area_jan/jan_16/B80000/func_80240124_B80124.s b/asm/nonmatchings/world/area_jan/jan_16/B80000/func_80240124_B80124.s index b7e13ca2a0..a47606fede 100644 --- a/asm/nonmatchings/world/area_jan/jan_16/B80000/func_80240124_B80124.s +++ b/asm/nonmatchings/world/area_jan/jan_16/B80000/func_80240124_B80124.s @@ -71,20 +71,20 @@ glabel func_80240124_B80124 /* B8022C 8024022C 12620008 */ beq $s3, $v0, .L80240250 /* B80230 80240230 32C400FF */ andi $a0, $s6, 0xff /* B80234 80240234 080900B1 */ j .L802402C4 -/* B80238 80240238 00000000 */ nop +/* B80238 80240238 00000000 */ nop .L8024023C: /* B8023C 8024023C 24020003 */ addiu $v0, $zero, 3 /* B80240 80240240 12620018 */ beq $s3, $v0, .L802402A4 /* B80244 80240244 32C400FF */ andi $a0, $s6, 0xff /* B80248 80240248 080900B1 */ j .L802402C4 -/* B8024C 8024024C 00000000 */ nop +/* B8024C 8024024C 00000000 */ nop .L80240250: /* B80250 80240250 32A500FF */ andi $a1, $s5, 0xff /* B80254 80240254 328600FF */ andi $a2, $s4, 0xff /* B80258 80240258 0C046F97 */ jal set_background_color_blend /* B8025C 8024025C 324700FF */ andi $a3, $s2, 0xff /* B80260 80240260 080900B1 */ j .L802402C4 -/* B80264 80240264 00000000 */ nop +/* B80264 80240264 00000000 */ nop .L80240268: /* B80268 80240268 32C400FF */ andi $a0, $s6, 0xff /* B8026C 8024026C 32A500FF */ andi $a1, $s5, 0xff @@ -100,7 +100,7 @@ glabel func_80240124_B80124 /* B80294 80240294 0C046FAD */ jal func_8011BEB4 /* B80298 80240298 AFA20018 */ sw $v0, 0x18($sp) /* B8029C 8024029C 080900B1 */ j .L802402C4 -/* B802A0 802402A0 00000000 */ nop +/* B802A0 802402A0 00000000 */ nop .L802402A4: /* B802A4 802402A4 32A500FF */ andi $a1, $s5, 0xff /* B802A8 802402A8 328600FF */ andi $a2, $s4, 0xff @@ -124,5 +124,5 @@ glabel func_80240124_B80124 /* B802EC 802402EC 24020002 */ addiu $v0, $zero, 2 /* B802F0 802402F0 03E00008 */ jr $ra /* B802F4 802402F4 27BD0058 */ addiu $sp, $sp, 0x58 -/* B802F8 802402F8 00000000 */ nop -/* B802FC 802402FC 00000000 */ nop +/* B802F8 802402F8 00000000 */ nop +/* B802FC 802402FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_17/B837C0/func_80240000_B837C0.s b/asm/nonmatchings/world/area_jan/jan_17/B837C0/func_80240000_B837C0.s index 5a3a1757c1..21c9cba3b3 100644 --- a/asm/nonmatchings/world/area_jan/jan_17/B837C0/func_80240000_B837C0.s +++ b/asm/nonmatchings/world/area_jan/jan_17/B837C0/func_80240000_B837C0.s @@ -5,7 +5,7 @@ glabel func_80240000_B837C0 /* B837C0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B837C4 80240004 AFBF0010 */ sw $ra, 0x10($sp) /* B837C8 80240008 0C046ED4 */ jal enable_world_fog -/* B837CC 8024000C 00000000 */ nop +/* B837CC 8024000C 00000000 */ nop /* B837D0 80240010 8FBF0010 */ lw $ra, 0x10($sp) /* B837D4 80240014 24020002 */ addiu $v0, $zero, 2 /* B837D8 80240018 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_jan/jan_19/B83E60/func_80240000_B83E60.s b/asm/nonmatchings/world/area_jan/jan_19/B83E60/func_80240000_B83E60.s index 60b87ba33f..21b3b349c0 100644 --- a/asm/nonmatchings/world/area_jan/jan_19/B83E60/func_80240000_B83E60.s +++ b/asm/nonmatchings/world/area_jan/jan_19/B83E60/func_80240000_B83E60.s @@ -5,7 +5,7 @@ glabel func_80240000_B83E60 /* B83E60 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B83E64 80240004 AFBF0010 */ sw $ra, 0x10($sp) /* B83E68 80240008 0C046ED4 */ jal enable_world_fog -/* B83E6C 8024000C 00000000 */ nop +/* B83E6C 8024000C 00000000 */ nop /* B83E70 80240010 8FBF0010 */ lw $ra, 0x10($sp) /* B83E74 80240014 24020002 */ addiu $v0, $zero, 2 /* B83E78 80240018 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240000_B84180.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240000_B84180.s index 13af9e332c..59f8c3f396 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240000_B84180.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240000_B84180.s @@ -45,7 +45,7 @@ glabel func_80240000_B84180 /* B8421C 8024009C 0C00A7B5 */ jal dist2D /* B84220 802400A0 4600B386 */ mov.s $f14, $f22 /* B84224 802400A4 4614003C */ c.lt.s $f0, $f20 -/* B84228 802400A8 00000000 */ nop +/* B84228 802400A8 00000000 */ nop /* B8422C 802400AC 45000003 */ bc1f .L802400BC /* B84230 802400B0 2631000C */ addiu $s1, $s1, 0xc /* B84234 802400B4 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_80240000_B84180 /* B84260 802400E0 8E6200D0 */ lw $v0, 0xd0($s3) /* B84264 802400E4 8C42007C */ lw $v0, 0x7c($v0) /* B84268 802400E8 04410004 */ bgez $v0, .L802400FC -/* B8426C 802400EC 00000000 */ nop +/* B8426C 802400EC 00000000 */ nop /* B84270 802400F0 C6C00000 */ lwc1 $f0, ($s6) /* B84274 802400F4 08090047 */ j .L8024011C /* B84278 802400F8 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_80240000_B84180 /* B8427C 802400FC 3C018025 */ lui $at, %hi(func_8024B9A0) /* B84280 80240100 D422B9A0 */ ldc1 $f2, %lo(func_8024B9A0)($at) /* B84284 80240104 44820000 */ mtc1 $v0, $f0 -/* B84288 80240108 00000000 */ nop +/* B84288 80240108 00000000 */ nop /* B8428C 8024010C 46800021 */ cvt.d.w $f0, $f0 /* B84290 80240110 46220003 */ div.d $f0, $f0, $f2 /* B84294 80240114 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240158_B842D8.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240158_B842D8.s index 252427b68c..eaebae3176 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240158_B842D8.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240158_B842D8.s @@ -44,7 +44,7 @@ glabel func_80240158_B842D8 /* B84374 802401F4 2402000F */ addiu $v0, $zero, 0xf /* B84378 802401F8 AFA2001C */ sw $v0, 0x1c($sp) /* B8437C 802401FC 44833000 */ mtc1 $v1, $f6 -/* B84380 80240200 00000000 */ nop +/* B84380 80240200 00000000 */ nop /* B84384 80240204 468031A0 */ cvt.s.w $f6, $f6 /* B84388 80240208 44073000 */ mfc1 $a3, $f6 /* B8438C 8024020C 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_80240158_B842D8 .L8024025C: /* B843DC 8024025C 8602008C */ lh $v0, 0x8c($s0) /* B843E0 80240260 1440005D */ bnez $v0, .L802403D8 -/* B843E4 80240264 00000000 */ nop +/* B843E4 80240264 00000000 */ nop /* B843E8 80240268 C6000018 */ lwc1 $f0, 0x18($s0) /* B843EC 8024026C 3C014010 */ lui $at, 0x4010 /* B843F0 80240270 44811800 */ mtc1 $at, $f3 /* B843F4 80240274 44801000 */ mtc1 $zero, $f2 /* B843F8 80240278 46000021 */ cvt.d.s $f0, $f0 /* B843FC 8024027C 4622003C */ c.lt.d $f0, $f2 -/* B84400 80240280 00000000 */ nop +/* B84400 80240280 00000000 */ nop /* B84404 80240284 45000003 */ bc1f .L80240294 /* B84408 80240288 0200202D */ daddu $a0, $s0, $zero /* B8440C 8024028C 080900A6 */ j .L80240298 @@ -88,7 +88,7 @@ glabel func_80240158_B842D8 /* B84414 80240294 24050001 */ addiu $a1, $zero, 1 .L80240298: /* B84418 80240298 0C00F598 */ jal func_8003D660 -/* B8441C 8024029C 00000000 */ nop +/* B8441C 8024029C 00000000 */ nop /* B84420 802402A0 C60C0038 */ lwc1 $f12, 0x38($s0) /* B84424 802402A4 8E430078 */ lw $v1, 0x78($s2) /* B84428 802402A8 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_80240158_B842D8 /* B84450 802402D0 4406B000 */ mfc1 $a2, $f22 /* B84454 802402D4 4407A000 */ mfc1 $a3, $f20 /* B84458 802402D8 0C00A720 */ jal atan2 -/* B8445C 802402DC 00000000 */ nop +/* B8445C 802402DC 00000000 */ nop /* B84460 802402E0 8E050018 */ lw $a1, 0x18($s0) /* B84464 802402E4 44060000 */ mfc1 $a2, $f0 /* B84468 802402E8 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_80240158_B842D8 /* B8447C 802402FC 4406B000 */ mfc1 $a2, $f22 /* B84480 80240300 4407A000 */ mfc1 $a3, $f20 /* B84484 80240304 0C00A7B5 */ jal dist2D -/* B84488 80240308 00000000 */ nop +/* B84488 80240308 00000000 */ nop /* B8448C 8024030C C6020018 */ lwc1 $f2, 0x18($s0) /* B84490 80240310 4602003E */ c.le.s $f0, $f2 -/* B84494 80240314 00000000 */ nop +/* B84494 80240314 00000000 */ nop /* B84498 80240318 4500002F */ bc1f .L802403D8 /* B8449C 8024031C 240403E8 */ addiu $a0, $zero, 0x3e8 /* B844A0 80240320 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_80240158_B842D8 /* B844F4 80240374 18400003 */ blez $v0, .L80240384 /* B844F8 80240378 24020004 */ addiu $v0, $zero, 4 /* B844FC 8024037C 14600002 */ bnez $v1, .L80240388 -/* B84500 80240380 00000000 */ nop +/* B84500 80240380 00000000 */ nop .L80240384: /* B84504 80240384 AE420070 */ sw $v0, 0x70($s2) .L80240388: diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_802404C0_B84640.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_802404C0_B84640.s index 6b74eff290..83a631c36f 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_802404C0_B84640.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_802404C0_B84640.s @@ -38,7 +38,7 @@ glabel func_802404C0_B84640 /* B846C4 80240544 2402000F */ addiu $v0, $zero, 0xf /* B846C8 80240548 AFA2001C */ sw $v0, 0x1c($sp) /* B846CC 8024054C 44833000 */ mtc1 $v1, $f6 -/* B846D0 80240550 00000000 */ nop +/* B846D0 80240550 00000000 */ nop /* B846D4 80240554 468031A0 */ cvt.s.w $f6, $f6 /* B846D8 80240558 44073000 */ mfc1 $a3, $f6 /* B846DC 8024055C 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_802404C0_B84640 .L802405C0: /* B84740 802405C0 8602008C */ lh $v0, 0x8c($s0) /* B84744 802405C4 14400025 */ bnez $v0, .L8024065C -/* B84748 802405C8 00000000 */ nop +/* B84748 802405C8 00000000 */ nop /* B8474C 802405CC 9602008E */ lhu $v0, 0x8e($s0) /* B84750 802405D0 2442FFFF */ addiu $v0, $v0, -1 /* B84754 802405D4 A602008E */ sh $v0, 0x8e($s0) /* B84758 802405D8 00021400 */ sll $v0, $v0, 0x10 /* B8475C 802405DC 1440001F */ bnez $v0, .L8024065C -/* B84760 802405E0 00000000 */ nop +/* B84760 802405E0 00000000 */ nop /* B84764 802405E4 8E820074 */ lw $v0, 0x74($s4) /* B84768 802405E8 2442FFFF */ addiu $v0, $v0, -1 /* B8476C 802405EC 10400019 */ beqz $v0, .L80240654 @@ -84,7 +84,7 @@ glabel func_802404C0_B84640 /* B84778 802405F8 9442002A */ lhu $v0, 0x2a($v0) /* B8477C 802405FC 30420010 */ andi $v0, $v0, 0x10 /* B84780 80240600 14400007 */ bnez $v0, .L80240620 -/* B84784 80240604 00000000 */ nop +/* B84784 80240604 00000000 */ nop /* B84788 80240608 C600000C */ lwc1 $f0, 0xc($s0) /* B8478C 8024060C 3C014334 */ lui $at, 0x4334 /* B84790 80240610 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_8024067C_B847FC.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_8024067C_B847FC.s index 99394a8f77..260ace47ff 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_8024067C_B847FC.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_8024067C_B847FC.s @@ -28,7 +28,7 @@ glabel func_8024067C_B847FC /* B84854 802406D4 8E0200D0 */ lw $v0, 0xd0($s0) /* B84858 802406D8 8C42007C */ lw $v0, 0x7c($v0) /* B8485C 802406DC 04410004 */ bgez $v0, .L802406F0 -/* B84860 802406E0 00000000 */ nop +/* B84860 802406E0 00000000 */ nop /* B84864 802406E4 C6400000 */ lwc1 $f0, ($s2) /* B84868 802406E8 080901C4 */ j .L80240710 /* B8486C 802406EC E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_8024067C_B847FC /* B84870 802406F0 3C018025 */ lui $at, %hi(D_8024B9A8) /* B84874 802406F4 D422B9A8 */ ldc1 $f2, %lo(D_8024B9A8)($at) /* B84878 802406F8 44820000 */ mtc1 $v0, $f0 -/* B8487C 802406FC 00000000 */ nop +/* B8487C 802406FC 00000000 */ nop /* B84880 80240700 46800021 */ cvt.d.w $f0, $f0 /* B84884 80240704 46220003 */ div.d $f0, $f0, $f2 /* B84888 80240708 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_8024081C_B8499C.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_8024081C_B8499C.s index ef5f4e4b40..cb938be6f7 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_8024081C_B8499C.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_8024081C_B8499C.s @@ -47,20 +47,20 @@ glabel func_8024081C_B8499C /* B84A44 802408C4 8E02001C */ lw $v0, 0x1c($s0) /* B84A48 802408C8 46001005 */ abs.s $f0, $f2 /* B84A4C 802408CC 44822000 */ mtc1 $v0, $f4 -/* B84A50 802408D0 00000000 */ nop +/* B84A50 802408D0 00000000 */ nop /* B84A54 802408D4 46802120 */ cvt.s.w $f4, $f4 /* B84A58 802408D8 4600203C */ c.lt.s $f4, $f0 -/* B84A5C 802408DC 00000000 */ nop +/* B84A5C 802408DC 00000000 */ nop /* B84A60 802408E0 4500000D */ bc1f .L80240918 -/* B84A64 802408E4 00000000 */ nop +/* B84A64 802408E4 00000000 */ nop /* B84A68 802408E8 44800000 */ mtc1 $zero, $f0 /* B84A6C 802408EC C654000C */ lwc1 $f20, 0xc($s2) /* B84A70 802408F0 4600103C */ c.lt.s $f2, $f0 -/* B84A74 802408F4 00000000 */ nop +/* B84A74 802408F4 00000000 */ nop /* B84A78 802408F8 45000006 */ bc1f .L80240914 /* B84A7C 802408FC 00021023 */ negu $v0, $v0 /* B84A80 80240900 44820000 */ mtc1 $v0, $f0 -/* B84A84 80240904 00000000 */ nop +/* B84A84 80240904 00000000 */ nop /* B84A88 80240908 46800020 */ cvt.s.w $f0, $f0 /* B84A8C 8024090C 08090246 */ j .L80240918 /* B84A90 80240910 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_8024094C_B84ACC.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_8024094C_B84ACC.s index 482a75e6b8..503a330f7d 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_8024094C_B84ACC.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_8024094C_B84ACC.s @@ -37,7 +37,7 @@ glabel func_8024094C_B84ACC /* B84B4C 802409CC 2402000F */ addiu $v0, $zero, 0xf /* B84B50 802409D0 AFA2001C */ sw $v0, 0x1c($sp) /* B84B54 802409D4 44833000 */ mtc1 $v1, $f6 -/* B84B58 802409D8 00000000 */ nop +/* B84B58 802409D8 00000000 */ nop /* B84B5C 802409DC 468031A0 */ cvt.s.w $f6, $f6 /* B84B60 802409E0 44073000 */ mfc1 $a3, $f6 /* B84B64 802409E4 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240AD4_B84C54.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240AD4_B84C54.s index 0f7a4674b9..7537995c3b 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240AD4_B84C54.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240AD4_B84C54.s @@ -28,7 +28,7 @@ glabel func_80240AD4_B84C54 /* B84CAC 80240B2C C4400008 */ lwc1 $f0, 8($v0) /* B84CB0 80240B30 46800020 */ cvt.s.w $f0, $f0 /* B84CB4 80240B34 4602003E */ c.le.s $f0, $f2 -/* B84CB8 80240B38 00000000 */ nop +/* B84CB8 80240B38 00000000 */ nop /* B84CBC 80240B3C 45020003 */ bc1fl .L80240B4C /* B84CC0 80240B40 24840001 */ addiu $a0, $a0, 1 /* B84CC4 80240B44 080902D7 */ j .L80240B5C diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s index 8e6436fa0b..2c1b065659 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s @@ -46,7 +46,7 @@ glabel func_80240B94_B84D14 /* B84DB8 80240C38 8E2200B0 */ lw $v0, 0xb0($s1) /* B84DBC 80240C3C 30420004 */ andi $v0, $v0, 4 /* B84DC0 80240C40 10400044 */ beqz $v0, .L80240D54 -/* B84DC4 80240C44 00000000 */ nop +/* B84DC4 80240C44 00000000 */ nop .L80240C48: /* B84DC8 80240C48 2404F7FF */ addiu $a0, $zero, -0x801 /* B84DCC 80240C4C AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80240B94_B84D14 /* B84E80 80240D00 3C0142C8 */ lui $at, 0x42c8 /* B84E84 80240D04 44812000 */ mtc1 $at, $f4 /* B84E88 80240D08 44823000 */ mtc1 $v0, $f6 -/* B84E8C 80240D0C 00000000 */ nop +/* B84E8C 80240D0C 00000000 */ nop /* B84E90 80240D10 468031A0 */ cvt.s.w $f6, $f6 /* B84E94 80240D14 27A20044 */ addiu $v0, $sp, 0x44 /* B84E98 80240D18 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80240B94_B84D14 /* B84EBC 80240D3C 0C0372DF */ jal func_800DCB7C /* B84EC0 80240D40 27A70040 */ addiu $a3, $sp, 0x40 /* B84EC4 80240D44 10400003 */ beqz $v0, .L80240D54 -/* B84EC8 80240D48 00000000 */ nop +/* B84EC8 80240D48 00000000 */ nop /* B84ECC 80240D4C C7A0003C */ lwc1 $f0, 0x3c($sp) /* B84ED0 80240D50 E640003C */ swc1 $f0, 0x3c($s2) .L80240D54: @@ -124,72 +124,85 @@ glabel func_80240B94_B84D14 /* B84ED8 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 /* B84EDC 80240D5C 10400042 */ beqz $v0, .L80240E68 /* B84EE0 80240D60 00031080 */ sll $v0, $v1, 2 -/* B84EE4 80240D64 3C018025 */ lui $at, %hi(D_8024B9B0) +/* B84EE4 80240D64 3C018025 */ lui $at, %hi(jtbl_8024B9B0_B8FB30) /* B84EE8 80240D68 00220821 */ addu $at, $at, $v0 -/* B84EEC 80240D6C 8C22B9B0 */ lw $v0, %lo(D_8024B9B0)($at) +/* B84EEC 80240D6C 8C22B9B0 */ lw $v0, %lo(jtbl_8024B9B0_B8FB30)($at) /* B84EF0 80240D70 00400008 */ jr $v0 -/* B84EF4 80240D74 00000000 */ nop +/* B84EF4 80240D74 00000000 */ nop +glabel L80240D78_B84EF8 /* B84EF8 80240D78 0280202D */ daddu $a0, $s4, $zero /* B84EFC 80240D7C 0260282D */ daddu $a1, $s3, $zero /* B84F00 80240D80 0C090000 */ jal func_80240000_B84180 /* B84F04 80240D84 02A0302D */ daddu $a2, $s5, $zero +glabel L80240D88_B84F08 /* B84F08 80240D88 0280202D */ daddu $a0, $s4, $zero /* B84F0C 80240D8C 0260282D */ daddu $a1, $s3, $zero /* B84F10 80240D90 0C090056 */ jal func_80240158_B842D8 /* B84F14 80240D94 02A0302D */ daddu $a2, $s5, $zero /* B84F18 80240D98 0809039A */ j .L80240E68 -/* B84F1C 80240D9C 00000000 */ nop +/* B84F1C 80240D9C 00000000 */ nop +glabel L80240DA0_B84F20 /* B84F20 80240DA0 0280202D */ daddu $a0, $s4, $zero /* B84F24 80240DA4 0260282D */ daddu $a1, $s3, $zero /* B84F28 80240DA8 0C090100 */ jal jan_22_UnkNpcAIFunc1 /* B84F2C 80240DAC 02A0302D */ daddu $a2, $s5, $zero +glabel L80240DB0_B84F30 /* B84F30 80240DB0 0280202D */ daddu $a0, $s4, $zero /* B84F34 80240DB4 0260282D */ daddu $a1, $s3, $zero /* B84F38 80240DB8 0C090130 */ jal func_802404C0_B84640 /* B84F3C 80240DBC 02A0302D */ daddu $a2, $s5, $zero /* B84F40 80240DC0 0809039A */ j .L80240E68 -/* B84F44 80240DC4 00000000 */ nop +/* B84F44 80240DC4 00000000 */ nop +glabel L80240DC8_B84F48 /* B84F48 80240DC8 0280202D */ daddu $a0, $s4, $zero /* B84F4C 80240DCC 0260282D */ daddu $a1, $s3, $zero /* B84F50 80240DD0 0C09019F */ jal func_8024067C_B847FC /* B84F54 80240DD4 02A0302D */ daddu $a2, $s5, $zero /* B84F58 80240DD8 0809039A */ j .L80240E68 -/* B84F5C 80240DDC 00000000 */ nop +/* B84F5C 80240DDC 00000000 */ nop +glabel L80240DE0_B84F60 /* B84F60 80240DE0 0280202D */ daddu $a0, $s4, $zero /* B84F64 80240DE4 0260282D */ daddu $a1, $s3, $zero /* B84F68 80240DE8 0C0901CC */ jal jan_22_NpcJumpFunc2 /* B84F6C 80240DEC 02A0302D */ daddu $a2, $s5, $zero +glabel L80240DF0_B84F70 /* B84F70 80240DF0 0280202D */ daddu $a0, $s4, $zero /* B84F74 80240DF4 0260282D */ daddu $a1, $s3, $zero /* B84F78 80240DF8 0C0901E9 */ jal jan_22_NpcJumpFunc /* B84F7C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* B84F80 80240E00 0809039A */ j .L80240E68 -/* B84F84 80240E04 00000000 */ nop +/* B84F84 80240E04 00000000 */ nop +glabel L80240E08_B84F88 /* B84F88 80240E08 0280202D */ daddu $a0, $s4, $zero /* B84F8C 80240E0C 0260282D */ daddu $a1, $s3, $zero /* B84F90 80240E10 0C090207 */ jal func_8024081C_B8499C /* B84F94 80240E14 02A0302D */ daddu $a2, $s5, $zero +glabel L80240E18_B84F98 /* B84F98 80240E18 0280202D */ daddu $a0, $s4, $zero /* B84F9C 80240E1C 0260282D */ daddu $a1, $s3, $zero /* B84FA0 80240E20 0C090253 */ jal func_8024094C_B84ACC /* B84FA4 80240E24 02A0302D */ daddu $a2, $s5, $zero /* B84FA8 80240E28 0809039A */ j .L80240E68 -/* B84FAC 80240E2C 00000000 */ nop +/* B84FAC 80240E2C 00000000 */ nop +glabel L80240E30_B84FB0 /* B84FB0 80240E30 0280202D */ daddu $a0, $s4, $zero /* B84FB4 80240E34 0260282D */ daddu $a1, $s3, $zero /* B84FB8 80240E38 0C09029B */ jal jan_22_UnkNpcDurationFlagFunc /* B84FBC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* B84FC0 80240E40 0809039A */ j .L80240E68 -/* B84FC4 80240E44 00000000 */ nop +/* B84FC4 80240E44 00000000 */ nop +glabel L80240E48_B84FC8 /* B84FC8 80240E48 0280202D */ daddu $a0, $s4, $zero /* B84FCC 80240E4C 0260282D */ daddu $a1, $s3, $zero /* B84FD0 80240E50 0C0902B5 */ jal func_80240AD4_B84C54 /* B84FD4 80240E54 02A0302D */ daddu $a2, $s5, $zero /* B84FD8 80240E58 0809039A */ j .L80240E68 -/* B84FDC 80240E5C 00000000 */ nop +/* B84FDC 80240E5C 00000000 */ nop +glabel L80240E60_B84FE0 /* B84FE0 80240E60 0C0129CF */ jal func_8004A73C /* B84FE4 80240E64 0280202D */ daddu $a0, $s4, $zero .L80240E68: +glabel L80240E68_B84FE8 /* B84FE8 80240E68 8FBF0060 */ lw $ra, 0x60($sp) /* B84FEC 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) /* B84FF0 80240E70 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240E90_B85010.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240E90_B85010.s index 3f03f53092..d4b5900e17 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240E90_B85010.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240E90_B85010.s @@ -26,7 +26,7 @@ glabel func_80240E90_B85010 /* B85060 80240EE0 1440FFFA */ bnez $v0, .L80240ECC /* B85064 80240EE4 24A50004 */ addiu $a1, $a1, 4 /* B85068 80240EE8 080903CB */ j .L80240F2C -/* B8506C 80240EEC 00000000 */ nop +/* B8506C 80240EEC 00000000 */ nop .L80240EF0: /* B85070 80240EF0 0000182D */ daddu $v1, $zero, $zero /* B85074 80240EF4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241020_B851A0.s b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241020_B851A0.s index 034ae67ebe..ccff77f830 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241020_B851A0.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241020_B851A0.s @@ -32,7 +32,7 @@ glabel func_80241020_B851A0 /* B8520C 8024108C 44060000 */ mfc1 $a2, $f0 /* B85210 80241090 44071000 */ mfc1 $a3, $f2 /* B85214 80241094 44820000 */ mtc1 $v0, $f0 -/* B85218 80241098 00000000 */ nop +/* B85218 80241098 00000000 */ nop /* B8521C 8024109C 46800020 */ cvt.s.w $f0, $f0 /* B85220 802410A0 AE220078 */ sw $v0, 0x78($s1) /* B85224 802410A4 0C05267B */ jal func_801499EC diff --git a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802410C4_B85244.s b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802410C4_B85244.s index 880360f1f4..9d9033d3a7 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802410C4_B85244.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802410C4_B85244.s @@ -32,7 +32,7 @@ glabel func_802410C4_B85244 /* B852B0 80241130 44060000 */ mfc1 $a2, $f0 /* B852B4 80241134 44071000 */ mfc1 $a3, $f2 /* B852B8 80241138 44820000 */ mtc1 $v0, $f0 -/* B852BC 8024113C 00000000 */ nop +/* B852BC 8024113C 00000000 */ nop /* B852C0 80241140 46800020 */ cvt.s.w $f0, $f0 /* B852C4 80241144 AE220078 */ sw $v0, 0x78($s1) /* B852C8 80241148 0C05267B */ jal func_801499EC diff --git a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241168_B852E8.s b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241168_B852E8.s index 254ea04c94..aabf099e55 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241168_B852E8.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241168_B852E8.s @@ -22,7 +22,7 @@ glabel func_80241168_B852E8 /* B8532C 802411AC 46800020 */ cvt.s.w $f0, $f0 /* B85330 802411B0 46083183 */ div.s $f6, $f6, $f8 /* B85334 802411B4 46003182 */ mul.s $f6, $f6, $f0 -/* B85338 802411B8 00000000 */ nop +/* B85338 802411B8 00000000 */ nop /* B8533C 802411BC C6440010 */ lwc1 $f4, 0x10($s2) /* B85340 802411C0 C6420004 */ lwc1 $f2, 4($s2) /* B85344 802411C4 46022101 */ sub.s $f4, $f4, $f2 @@ -33,10 +33,10 @@ glabel func_80241168_B852E8 /* B85358 802411D8 C6220084 */ lwc1 $f2, 0x84($s1) /* B8535C 802411DC 468010A0 */ cvt.s.w $f2, $f2 /* B85360 802411E0 46022102 */ mul.s $f4, $f4, $f2 -/* B85364 802411E4 00000000 */ nop +/* B85364 802411E4 00000000 */ nop /* B85368 802411E8 46080003 */ div.s $f0, $f0, $f8 /* B8536C 802411EC 46020002 */ mul.s $f0, $f0, $f2 -/* B85370 802411F0 00000000 */ nop +/* B85370 802411F0 00000000 */ nop /* B85374 802411F4 4600328D */ trunc.w.s $f10, $f6 /* B85378 802411F8 E62A0098 */ swc1 $f10, 0x98($s1) /* B8537C 802411FC 4600228D */ trunc.w.s $f10, $f4 @@ -52,21 +52,21 @@ glabel func_80241168_B852E8 /* B853A4 80241224 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* B853A8 80241228 00641821 */ addu $v1, $v1, $a0 /* B853AC 8024122C 44830000 */ mtc1 $v1, $f0 -/* B853B0 80241230 00000000 */ nop +/* B853B0 80241230 00000000 */ nop /* B853B4 80241234 46800020 */ cvt.s.w $f0, $f0 /* B853B8 80241238 E6000028 */ swc1 $f0, 0x28($s0) /* B853BC 8024123C 8E230090 */ lw $v1, 0x90($s1) /* B853C0 80241240 8E24009C */ lw $a0, 0x9c($s1) /* B853C4 80241244 00641821 */ addu $v1, $v1, $a0 /* B853C8 80241248 44830000 */ mtc1 $v1, $f0 -/* B853CC 8024124C 00000000 */ nop +/* B853CC 8024124C 00000000 */ nop /* B853D0 80241250 46800020 */ cvt.s.w $f0, $f0 /* B853D4 80241254 E600002C */ swc1 $f0, 0x2c($s0) /* B853D8 80241258 8E230094 */ lw $v1, 0x94($s1) /* B853DC 8024125C 8E2400A0 */ lw $a0, 0xa0($s1) /* B853E0 80241260 00641821 */ addu $v1, $v1, $a0 /* B853E4 80241264 44830000 */ mtc1 $v1, $f0 -/* B853E8 80241268 00000000 */ nop +/* B853E8 80241268 00000000 */ nop /* B853EC 8024126C 46800020 */ cvt.s.w $f0, $f0 /* B853F0 80241270 E6000030 */ swc1 $f0, 0x30($s0) /* B853F4 80241274 C64C0000 */ lwc1 $f12, ($s2) @@ -81,7 +81,7 @@ glabel func_80241168_B852E8 /* B85418 80241298 C600002C */ lwc1 $f0, 0x2c($s0) /* B8541C 8024129C 3C014120 */ lui $at, 0x4120 /* B85420 802412A0 44811000 */ mtc1 $at, $f2 -/* B85424 802412A4 00000000 */ nop +/* B85424 802412A4 00000000 */ nop /* B85428 802412A8 46020001 */ sub.s $f0, $f0, $f2 /* B8542C 802412AC 3C0140A0 */ lui $at, 0x40a0 /* B85430 802412B0 44811000 */ mtc1 $at, $f2 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802412E0_B85460.s b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802412E0_B85460.s index aa20b33fce..6b00b207ec 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802412E0_B85460.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802412E0_B85460.s @@ -19,38 +19,38 @@ glabel func_802412E0_B85460 /* B85498 80241318 24520011 */ addiu $s2, $v0, 0x11 /* B8549C 8024131C 2403FFFF */ addiu $v1, $zero, -1 /* B854A0 80241320 44900000 */ mtc1 $s0, $f0 -/* B854A4 80241324 00000000 */ nop +/* B854A4 80241324 00000000 */ nop /* B854A8 80241328 46800020 */ cvt.s.w $f0, $f0 /* B854AC 8024132C AE2300A4 */ sw $v1, 0xa4($s1) /* B854B0 80241330 2443FFEF */ addiu $v1, $v0, -0x11 /* B854B4 80241334 3C018011 */ lui $at, %hi(gPlayerStatus+0x28) /* B854B8 80241338 C422EFF0 */ lwc1 $f2, %lo(gPlayerStatus+0x28)($at) /* B854BC 8024133C 4600103C */ c.lt.s $f2, $f0 -/* B854C0 80241340 00000000 */ nop +/* B854C0 80241340 00000000 */ nop /* B854C4 80241344 45010008 */ bc1t .L80241368 /* B854C8 80241348 24420011 */ addiu $v0, $v0, 0x11 /* B854CC 8024134C 44920000 */ mtc1 $s2, $f0 -/* B854D0 80241350 00000000 */ nop +/* B854D0 80241350 00000000 */ nop /* B854D4 80241354 46800020 */ cvt.s.w $f0, $f0 /* B854D8 80241358 4602003C */ c.lt.s $f0, $f2 -/* B854DC 8024135C 00000000 */ nop +/* B854DC 8024135C 00000000 */ nop /* B854E0 80241360 45000014 */ bc1f .L802413B4 -/* B854E4 80241364 00000000 */ nop +/* B854E4 80241364 00000000 */ nop .L80241368: /* B854E8 80241368 44830000 */ mtc1 $v1, $f0 -/* B854EC 8024136C 00000000 */ nop +/* B854EC 8024136C 00000000 */ nop /* B854F0 80241370 46800020 */ cvt.s.w $f0, $f0 /* B854F4 80241374 4600103C */ c.lt.s $f2, $f0 -/* B854F8 80241378 00000000 */ nop +/* B854F8 80241378 00000000 */ nop /* B854FC 8024137C 45010008 */ bc1t .L802413A0 -/* B85500 80241380 00000000 */ nop +/* B85500 80241380 00000000 */ nop /* B85504 80241384 44820000 */ mtc1 $v0, $f0 -/* B85508 80241388 00000000 */ nop +/* B85508 80241388 00000000 */ nop /* B8550C 8024138C 46800020 */ cvt.s.w $f0, $f0 /* B85510 80241390 4602003C */ c.lt.s $f0, $f2 -/* B85514 80241394 00000000 */ nop +/* B85514 80241394 00000000 */ nop /* B85518 80241398 45000006 */ bc1f .L802413B4 -/* B8551C 8024139C 00000000 */ nop +/* B8551C 8024139C 00000000 */ nop .L802413A0: /* B85520 802413A0 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* B85524 802413A4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) diff --git a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_8024160C_B8578C.s b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_8024160C_B8578C.s index e4c1ff76ef..ad66733881 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_8024160C_B8578C.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_8024160C_B8578C.s @@ -13,7 +13,7 @@ glabel func_8024160C_B8578C /* B857AC 8024162C D420BB40 */ ldc1 $f0, %lo(D_8024BB40)($at) /* B857B0 80241630 4600A521 */ cvt.d.s $f20, $f20 /* B857B4 80241634 4620A502 */ mul.d $f20, $f20, $f0 -/* B857B8 80241638 00000000 */ nop +/* B857B8 80241638 00000000 */ nop /* B857BC 8024163C 3C013F80 */ lui $at, 0x3f80 /* B857C0 80241640 44810000 */ mtc1 $at, $f0 /* B857C4 80241644 AE000018 */ sw $zero, 0x18($s0) diff --git a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241668_B857E8.s b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241668_B857E8.s index 6e5b32db27..07db846cec 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241668_B857E8.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241668_B857E8.s @@ -25,7 +25,7 @@ glabel func_80241668_B857E8 /* B85838 802416B8 96020000 */ lhu $v0, ($s0) /* B8583C 802416BC 30420400 */ andi $v0, $v0, 0x400 /* B85840 802416C0 14400008 */ bnez $v0, .L802416E4 -/* B85844 802416C4 00000000 */ nop +/* B85844 802416C4 00000000 */ nop /* B85848 802416C8 4405A000 */ mfc1 $a1, $f20 /* B8584C 802416CC 0C090583 */ jal func_8024160C_B8578C /* B85850 802416D0 26040058 */ addiu $a0, $s0, 0x58 @@ -49,4 +49,4 @@ glabel func_80241668_B857E8 /* B85890 80241710 24020002 */ addiu $v0, $zero, 2 /* B85894 80241714 03E00008 */ jr $ra /* B85898 80241718 27BD0068 */ addiu $sp, $sp, 0x68 -/* B8589C 8024171C 00000000 */ nop +/* B8589C 8024171C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kgr/kgr_01/8A9A10/func_80240000_8A9A10.s b/asm/nonmatchings/world/area_kgr/kgr_01/8A9A10/func_80240000_8A9A10.s index 758f609e2d..13cc96050c 100644 --- a/asm/nonmatchings/world/area_kgr/kgr_01/8A9A10/func_80240000_8A9A10.s +++ b/asm/nonmatchings/world/area_kgr/kgr_01/8A9A10/func_80240000_8A9A10.s @@ -22,7 +22,7 @@ glabel func_80240000_8A9A10 /* 8A9A50 80240040 C460002C */ lwc1 $f0, 0x2c($v1) /* 8A9A54 80240044 3C014100 */ lui $at, 0x4100 /* 8A9A58 80240048 44811000 */ mtc1 $at, $f2 -/* 8A9A5C 8024004C 00000000 */ nop +/* 8A9A5C 8024004C 00000000 */ nop /* 8A9A60 80240050 46020000 */ add.s $f0, $f0, $f2 /* 8A9A64 80240054 C4620030 */ lwc1 $f2, 0x30($v1) /* 8A9A68 80240058 C4640028 */ lwc1 $f4, 0x28($v1) @@ -40,7 +40,7 @@ glabel func_80240000_8A9A10 /* 8A9A98 80240088 24020006 */ addiu $v0, $zero, 6 /* 8A9A9C 8024008C 82230012 */ lb $v1, 0x12($s1) /* 8A9AA0 80240090 14620022 */ bne $v1, $v0, .L8024011C -/* 8A9AA4 80240094 00000000 */ nop +/* 8A9AA4 80240094 00000000 */ nop /* 8A9AA8 80240098 8E020074 */ lw $v0, 0x74($s0) /* 8A9AAC 8024009C 14400004 */ bnez $v0, .L802400B0 /* 8A9AB0 802400A0 24020001 */ addiu $v0, $zero, 1 @@ -62,7 +62,7 @@ glabel func_80240000_8A9A10 /* 8A9AE8 802400D8 240200FF */ addiu $v0, $zero, 0xff /* 8A9AEC 802400DC 8E020074 */ lw $v0, 0x74($s0) /* 8A9AF0 802400E0 10400007 */ beqz $v0, .L80240100 -/* 8A9AF4 802400E4 00000000 */ nop +/* 8A9AF4 802400E4 00000000 */ nop /* 8A9AF8 802400E8 8E020070 */ lw $v0, 0x70($s0) /* 8A9AFC 802400EC 284200FF */ slti $v0, $v0, 0xff /* 8A9B00 802400F0 10400003 */ beqz $v0, .L80240100 @@ -94,5 +94,5 @@ glabel func_80240000_8A9A10 /* 8A9B5C 8024014C 0000102D */ daddu $v0, $zero, $zero /* 8A9B60 80240150 03E00008 */ jr $ra /* 8A9B64 80240154 27BD0028 */ addiu $sp, $sp, 0x28 -/* 8A9B68 80240158 00000000 */ nop -/* 8A9B6C 8024015C 00000000 */ nop +/* 8A9B68 80240158 00000000 */ nop +/* 8A9B6C 8024015C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240160_8A9B70.s b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240160_8A9B70.s index 892706d4b1..2f4033f0e9 100644 --- a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240160_8A9B70.s +++ b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240160_8A9B70.s @@ -26,27 +26,27 @@ glabel func_80240160_8A9B70 /* 8A9BC0 802401B0 86220000 */ lh $v0, ($s1) /* 8A9BC4 802401B4 C6A00028 */ lwc1 $f0, 0x28($s5) /* 8A9BC8 802401B8 44826000 */ mtc1 $v0, $f12 -/* 8A9BCC 802401BC 00000000 */ nop +/* 8A9BCC 802401BC 00000000 */ nop /* 8A9BD0 802401C0 46806320 */ cvt.s.w $f12, $f12 /* 8A9BD4 802401C4 46006001 */ sub.s $f0, $f12, $f0 /* 8A9BD8 802401C8 4600018D */ trunc.w.s $f6, $f0 /* 8A9BDC 802401CC 44023000 */ mfc1 $v0, $f6 -/* 8A9BE0 802401D0 00000000 */ nop +/* 8A9BE0 802401D0 00000000 */ nop /* 8A9BE4 802401D4 00420018 */ mult $v0, $v0 /* 8A9BE8 802401D8 86220004 */ lh $v0, 4($s1) /* 8A9BEC 802401DC C6A00030 */ lwc1 $f0, 0x30($s5) /* 8A9BF0 802401E0 44821000 */ mtc1 $v0, $f2 -/* 8A9BF4 802401E4 00000000 */ nop +/* 8A9BF4 802401E4 00000000 */ nop /* 8A9BF8 802401E8 468010A0 */ cvt.s.w $f2, $f2 /* 8A9BFC 802401EC 46001001 */ sub.s $f0, $f2, $f0 /* 8A9C00 802401F0 00001812 */ mflo $v1 /* 8A9C04 802401F4 4600018D */ trunc.w.s $f6, $f0 /* 8A9C08 802401F8 44023000 */ mfc1 $v0, $f6 -/* 8A9C0C 802401FC 00000000 */ nop +/* 8A9C0C 802401FC 00000000 */ nop /* 8A9C10 80240200 00420018 */ mult $v0, $v0 /* 8A9C14 80240204 00001012 */ mflo $v0 /* 8A9C18 80240208 00621021 */ addu $v0, $v1, $v0 -/* 8A9C1C 8024020C 00000000 */ nop +/* 8A9C1C 8024020C 00000000 */ nop /* 8A9C20 80240210 00540018 */ mult $v0, $s4 /* 8A9C24 80240214 000217C3 */ sra $v0, $v0, 0x1f /* 8A9C28 80240218 00001810 */ mfhi $v1 @@ -60,21 +60,21 @@ glabel func_80240160_8A9B70 /* 8A9C44 80240234 D4200A30 */ ldc1 $f0, %lo(func_80240A30_882BF0)($at) /* 8A9C48 80240238 46006321 */ cvt.d.s $f12, $f12 /* 8A9C4C 8024023C 46206302 */ mul.d $f12, $f12, $f0 -/* 8A9C50 80240240 00000000 */ nop +/* 8A9C50 80240240 00000000 */ nop /* 8A9C54 80240244 3C013CF5 */ lui $at, 0x3cf5 /* 8A9C58 80240248 3421C28F */ ori $at, $at, 0xc28f /* 8A9C5C 8024024C 44810000 */ mtc1 $at, $f0 -/* 8A9C60 80240250 00000000 */ nop +/* 8A9C60 80240250 00000000 */ nop /* 8A9C64 80240254 46001002 */ mul.s $f0, $f2, $f0 -/* 8A9C68 80240258 00000000 */ nop +/* 8A9C68 80240258 00000000 */ nop /* 8A9C6C 8024025C 3C013C23 */ lui $at, 0x3c23 /* 8A9C70 80240260 3421D70A */ ori $at, $at, 0xd70a /* 8A9C74 80240264 44812000 */ mtc1 $at, $f4 /* 8A9C78 80240268 44971000 */ mtc1 $s7, $f2 -/* 8A9C7C 8024026C 00000000 */ nop +/* 8A9C7C 8024026C 00000000 */ nop /* 8A9C80 80240270 468010A0 */ cvt.s.w $f2, $f2 /* 8A9C84 80240274 46041082 */ mul.s $f2, $f2, $f4 -/* 8A9C88 80240278 00000000 */ nop +/* 8A9C88 80240278 00000000 */ nop /* 8A9C8C 8024027C 46000021 */ cvt.d.s $f0, $f0 /* 8A9C90 80240280 46206300 */ add.d $f12, $f12, $f0 /* 8A9C94 80240284 001017C2 */ srl $v0, $s0, 0x1f @@ -87,11 +87,11 @@ glabel func_80240160_8A9B70 /* 8A9CB0 802402A0 46000000 */ add.s $f0, $f0, $f0 /* 8A9CB4 802402A4 3C014000 */ lui $at, 0x4000 /* 8A9CB8 802402A8 44811000 */ mtc1 $at, $f2 -/* 8A9CBC 802402AC 00000000 */ nop +/* 8A9CBC 802402AC 00000000 */ nop /* 8A9CC0 802402B0 46020000 */ add.s $f0, $f0, $f2 /* 8A9CC4 802402B4 4600018D */ trunc.w.s $f6, $f0 /* 8A9CC8 802402B8 44033000 */ mfc1 $v1, $f6 -/* 8A9CCC 802402BC 00000000 */ nop +/* 8A9CCC 802402BC 00000000 */ nop /* 8A9CD0 802402C0 02038021 */ addu $s0, $s0, $v1 /* 8A9CD4 802402C4 86230000 */ lh $v1, ($s1) /* 8A9CD8 802402C8 240200C8 */ addiu $v0, $zero, 0xc8 @@ -105,8 +105,8 @@ glabel func_80240160_8A9B70 .L802402E4: /* 8A9CF4 802402E4 02030018 */ mult $s0, $v1 /* 8A9CF8 802402E8 00001012 */ mflo $v0 -/* 8A9CFC 802402EC 00000000 */ nop -/* 8A9D00 802402F0 00000000 */ nop +/* 8A9CFC 802402EC 00000000 */ nop +/* 8A9D00 802402F0 00000000 */ nop /* 8A9D04 802402F4 00540018 */ mult $v0, $s4 /* 8A9D08 802402F8 96640002 */ lhu $a0, 2($s3) /* 8A9D0C 802402FC 26730010 */ addiu $s3, $s3, 0x10 diff --git a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_802403E0_8A9DF0.s b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_802403E0_8A9DF0.s index 4bc6e56c9f..9754bfc8e2 100644 --- a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_802403E0_8A9DF0.s +++ b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_802403E0_8A9DF0.s @@ -12,24 +12,24 @@ glabel func_802403E0_8A9DF0 /* 8A9E0C 802403FC D4200A38 */ ldc1 $f0, %lo(func_80240A38_898018)($at) /* 8A9E10 80240400 46006321 */ cvt.d.s $f12, $f12 /* 8A9E14 80240404 46206302 */ mul.d $f12, $f12, $f0 -/* 8A9E18 80240408 00000000 */ nop +/* 8A9E18 80240408 00000000 */ nop /* 8A9E1C 8024040C 3C013CF5 */ lui $at, 0x3cf5 /* 8A9E20 80240410 3421C28F */ ori $at, $at, 0xc28f /* 8A9E24 80240414 44810000 */ mtc1 $at, $f0 /* 8A9E28 80240418 C602008C */ lwc1 $f2, 0x8c($s0) /* 8A9E2C 8024041C 468010A0 */ cvt.s.w $f2, $f2 /* 8A9E30 80240420 46001082 */ mul.s $f2, $f2, $f0 -/* 8A9E34 80240424 00000000 */ nop +/* 8A9E34 80240424 00000000 */ nop /* 8A9E38 80240428 3C028024 */ lui $v0, %hi(func_802407C0_843390) /* 8A9E3C 8024042C 944207C0 */ lhu $v0, %lo(func_802407C0_843390)($v0) /* 8A9E40 80240430 3C013C23 */ lui $at, 0x3c23 /* 8A9E44 80240434 3421D70A */ ori $at, $at, 0xd70a /* 8A9E48 80240438 44812000 */ mtc1 $at, $f4 /* 8A9E4C 8024043C 44820000 */ mtc1 $v0, $f0 -/* 8A9E50 80240440 00000000 */ nop +/* 8A9E50 80240440 00000000 */ nop /* 8A9E54 80240444 46800020 */ cvt.s.w $f0, $f0 /* 8A9E58 80240448 46040002 */ mul.s $f0, $f0, $f4 -/* 8A9E5C 8024044C 00000000 */ nop +/* 8A9E5C 8024044C 00000000 */ nop /* 8A9E60 80240450 460010A1 */ cvt.d.s $f2, $f2 /* 8A9E64 80240454 46226300 */ add.d $f12, $f12, $f2 /* 8A9E68 80240458 46000021 */ cvt.d.s $f0, $f0 @@ -43,31 +43,31 @@ glabel func_802403E0_8A9DF0 /* 8A9E88 80240478 46800020 */ cvt.s.w $f0, $f0 /* 8A9E8C 8024047C 46001081 */ sub.s $f2, $f2, $f0 /* 8A9E90 80240480 44800000 */ mtc1 $zero, $f0 -/* 8A9E94 80240484 00000000 */ nop +/* 8A9E94 80240484 00000000 */ nop /* 8A9E98 80240488 4600103C */ c.lt.s $f2, $f0 -/* 8A9E9C 8024048C 00000000 */ nop +/* 8A9E9C 8024048C 00000000 */ nop /* 8A9EA0 80240490 45030001 */ bc1tl .L80240498 /* 8A9EA4 80240494 46000086 */ mov.s $f2, $f0 .L80240498: /* 8A9EA8 80240498 3C0142C8 */ lui $at, 0x42c8 /* 8A9EAC 8024049C 44812000 */ mtc1 $at, $f4 -/* 8A9EB0 802404A0 00000000 */ nop +/* 8A9EB0 802404A0 00000000 */ nop /* 8A9EB4 802404A4 4602203C */ c.lt.s $f4, $f2 -/* 8A9EB8 802404A8 00000000 */ nop +/* 8A9EB8 802404A8 00000000 */ nop /* 8A9EBC 802404AC 45030001 */ bc1tl .L802404B4 /* 8A9EC0 802404B0 46002086 */ mov.s $f2, $f4 .L802404B4: /* 8A9EC4 802404B4 46023082 */ mul.s $f2, $f6, $f2 -/* 8A9EC8 802404B8 00000000 */ nop +/* 8A9EC8 802404B8 00000000 */ nop /* 8A9ECC 802404BC 3C014480 */ lui $at, 0x4480 /* 8A9ED0 802404C0 44810000 */ mtc1 $at, $f0 /* 8A9ED4 802404C4 46041183 */ div.s $f6, $f2, $f4 /* 8A9ED8 802404C8 46003002 */ mul.s $f0, $f6, $f0 -/* 8A9EDC 802404CC 00000000 */ nop +/* 8A9EDC 802404CC 00000000 */ nop /* 8A9EE0 802404D0 3C01CD5B */ lui $at, 0xcd5b /* 8A9EE4 802404D4 34215858 */ ori $at, $at, 0x5858 /* 8A9EE8 802404D8 44811000 */ mtc1 $at, $f2 -/* 8A9EEC 802404DC 00000000 */ nop +/* 8A9EEC 802404DC 00000000 */ nop /* 8A9EF0 802404E0 46020000 */ add.s $f0, $f0, $f2 /* 8A9EF4 802404E4 4600020D */ trunc.w.s $f8, $f0 /* 8A9EF8 802404E8 E6080084 */ swc1 $f8, 0x84($s0) diff --git a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240500_8A9F10.s b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240500_8A9F10.s index d68f25a8cf..45b3780c71 100644 --- a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240500_8A9F10.s +++ b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240500_8A9F10.s @@ -10,4 +10,4 @@ glabel func_80240500_8A9F10 .L80240514: /* 8A9F24 80240514 03E00008 */ jr $ra /* 8A9F28 80240518 24020002 */ addiu $v0, $zero, 2 -/* 8A9F2C 8024051C 00000000 */ nop +/* 8A9F2C 8024051C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kgr/kgr_02/8AA450/func_80240000_8AA450.s b/asm/nonmatchings/world/area_kgr/kgr_02/8AA450/func_80240000_8AA450.s index 5c67bcefd2..e4e46a78ee 100644 --- a/asm/nonmatchings/world/area_kgr/kgr_02/8AA450/func_80240000_8AA450.s +++ b/asm/nonmatchings/world/area_kgr/kgr_02/8AA450/func_80240000_8AA450.s @@ -22,7 +22,7 @@ glabel func_80240000_8AA450 /* 8AA490 80240040 C460002C */ lwc1 $f0, 0x2c($v1) /* 8AA494 80240044 3C014100 */ lui $at, 0x4100 /* 8AA498 80240048 44811000 */ mtc1 $at, $f2 -/* 8AA49C 8024004C 00000000 */ nop +/* 8AA49C 8024004C 00000000 */ nop /* 8AA4A0 80240050 46020000 */ add.s $f0, $f0, $f2 /* 8AA4A4 80240054 C4620030 */ lwc1 $f2, 0x30($v1) /* 8AA4A8 80240058 C4640028 */ lwc1 $f4, 0x28($v1) @@ -40,7 +40,7 @@ glabel func_80240000_8AA450 /* 8AA4D8 80240088 24020006 */ addiu $v0, $zero, 6 /* 8AA4DC 8024008C 82230012 */ lb $v1, 0x12($s1) /* 8AA4E0 80240090 14620022 */ bne $v1, $v0, .L8024011C -/* 8AA4E4 80240094 00000000 */ nop +/* 8AA4E4 80240094 00000000 */ nop /* 8AA4E8 80240098 8E020074 */ lw $v0, 0x74($s0) /* 8AA4EC 8024009C 14400004 */ bnez $v0, .L802400B0 /* 8AA4F0 802400A0 24020001 */ addiu $v0, $zero, 1 @@ -62,7 +62,7 @@ glabel func_80240000_8AA450 /* 8AA528 802400D8 240200FF */ addiu $v0, $zero, 0xff /* 8AA52C 802400DC 8E020074 */ lw $v0, 0x74($s0) /* 8AA530 802400E0 10400007 */ beqz $v0, .L80240100 -/* 8AA534 802400E4 00000000 */ nop +/* 8AA534 802400E4 00000000 */ nop /* 8AA538 802400E8 8E020070 */ lw $v0, 0x70($s0) /* 8AA53C 802400EC 284200FF */ slti $v0, $v0, 0xff /* 8AA540 802400F0 10400003 */ beqz $v0, .L80240100 @@ -94,5 +94,5 @@ glabel func_80240000_8AA450 /* 8AA59C 8024014C 0000102D */ daddu $v0, $zero, $zero /* 8AA5A0 80240150 03E00008 */ jr $ra /* 8AA5A4 80240154 27BD0028 */ addiu $sp, $sp, 0x28 -/* 8AA5A8 80240158 00000000 */ nop -/* 8AA5AC 8024015C 00000000 */ nop +/* 8AA5A8 80240158 00000000 */ nop +/* 8AA5AC 8024015C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240760_8AABB0.s b/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240760_8AABB0.s index e24e7584fc..868738c66f 100644 --- a/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240760_8AABB0.s +++ b/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240760_8AABB0.s @@ -10,4 +10,4 @@ glabel func_80240760_8AABB0 .L80240774: /* 8AABC4 80240774 03E00008 */ jr $ra /* 8AABC8 80240778 24020002 */ addiu $v0, $zero, 2 -/* 8AABCC 8024077C 00000000 */ nop +/* 8AABCC 8024077C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB290/func_80240040_ABB2D0.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB290/func_80240040_ABB2D0.s index 68c1648dc5..f731b381c1 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB290/func_80240040_ABB2D0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB290/func_80240040_ABB2D0.s @@ -10,9 +10,9 @@ glabel func_80240040_ABB2D0 /* ABB2E4 80240054 3C108011 */ lui $s0, %hi(gPlayerStatus) /* ABB2E8 80240058 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* ABB2EC 8024005C 0C0B1EAF */ jal get_variable -/* ABB2F0 80240060 00000000 */ nop +/* ABB2F0 80240060 00000000 */ nop /* ABB2F4 80240064 14400005 */ bnez $v0, .L8024007C -/* ABB2F8 80240068 00000000 */ nop +/* ABB2F8 80240068 00000000 */ nop /* ABB2FC 8024006C 3C028024 */ lui $v0, %hi(D_8024160C) /* ABB300 80240070 2442160C */ addiu $v0, $v0, %lo(D_8024160C) /* ABB304 80240074 08090022 */ j .L80240088 @@ -30,5 +30,5 @@ glabel func_80240040_ABB2D0 /* ABB32C 8024009C 24020002 */ addiu $v0, $zero, 2 /* ABB330 802400A0 03E00008 */ jr $ra /* ABB334 802400A4 27BD0018 */ addiu $sp, $sp, 0x18 -/* ABB338 802400A8 00000000 */ nop -/* ABB33C 802400AC 00000000 */ nop +/* ABB338 802400A8 00000000 */ nop +/* ABB33C 802400AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802400B0_ABB340.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802400B0_ABB340.s index 640fd273fd..3e2eb69b2f 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802400B0_ABB340.s +++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802400B0_ABB340.s @@ -45,7 +45,7 @@ glabel func_802400B0_ABB340 /* ABB3DC 8024014C 0C00A7B5 */ jal dist2D /* ABB3E0 80240150 4600B386 */ mov.s $f14, $f22 /* ABB3E4 80240154 4614003C */ c.lt.s $f0, $f20 -/* ABB3E8 80240158 00000000 */ nop +/* ABB3E8 80240158 00000000 */ nop /* ABB3EC 8024015C 45000003 */ bc1f .L8024016C /* ABB3F0 80240160 2631000C */ addiu $s1, $s1, 0xc /* ABB3F4 80240164 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_802400B0_ABB340 /* ABB420 80240190 8E6200D0 */ lw $v0, 0xd0($s3) /* ABB424 80240194 8C42007C */ lw $v0, 0x7c($v0) /* ABB428 80240198 04410004 */ bgez $v0, .L802401AC -/* ABB42C 8024019C 00000000 */ nop +/* ABB42C 8024019C 00000000 */ nop /* ABB430 802401A0 C6C00000 */ lwc1 $f0, ($s6) /* ABB434 802401A4 08090073 */ j .L802401CC /* ABB438 802401A8 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_802400B0_ABB340 /* ABB43C 802401AC 3C018025 */ lui $at, %hi(D_80249D30) /* ABB440 802401B0 D4229D30 */ ldc1 $f2, %lo(D_80249D30)($at) /* ABB444 802401B4 44820000 */ mtc1 $v0, $f0 -/* ABB448 802401B8 00000000 */ nop +/* ABB448 802401B8 00000000 */ nop /* ABB44C 802401BC 46800021 */ cvt.d.w $f0, $f0 /* ABB450 802401C0 46220003 */ div.d $f0, $f0, $f2 /* ABB454 802401C4 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240208_ABB498.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240208_ABB498.s index 98697b4a97..9405b034b2 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240208_ABB498.s +++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240208_ABB498.s @@ -44,7 +44,7 @@ glabel func_80240208_ABB498 /* ABB534 802402A4 2402000F */ addiu $v0, $zero, 0xf /* ABB538 802402A8 AFA2001C */ sw $v0, 0x1c($sp) /* ABB53C 802402AC 44833000 */ mtc1 $v1, $f6 -/* ABB540 802402B0 00000000 */ nop +/* ABB540 802402B0 00000000 */ nop /* ABB544 802402B4 468031A0 */ cvt.s.w $f6, $f6 /* ABB548 802402B8 44073000 */ mfc1 $a3, $f6 /* ABB54C 802402BC 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_80240208_ABB498 .L8024030C: /* ABB59C 8024030C 8602008C */ lh $v0, 0x8c($s0) /* ABB5A0 80240310 1440005D */ bnez $v0, .L80240488 -/* ABB5A4 80240314 00000000 */ nop +/* ABB5A4 80240314 00000000 */ nop /* ABB5A8 80240318 C6000018 */ lwc1 $f0, 0x18($s0) /* ABB5AC 8024031C 3C014010 */ lui $at, 0x4010 /* ABB5B0 80240320 44811800 */ mtc1 $at, $f3 /* ABB5B4 80240324 44801000 */ mtc1 $zero, $f2 /* ABB5B8 80240328 46000021 */ cvt.d.s $f0, $f0 /* ABB5BC 8024032C 4622003C */ c.lt.d $f0, $f2 -/* ABB5C0 80240330 00000000 */ nop +/* ABB5C0 80240330 00000000 */ nop /* ABB5C4 80240334 45000003 */ bc1f .L80240344 /* ABB5C8 80240338 0200202D */ daddu $a0, $s0, $zero /* ABB5CC 8024033C 080900D2 */ j .L80240348 @@ -88,7 +88,7 @@ glabel func_80240208_ABB498 /* ABB5D4 80240344 24050001 */ addiu $a1, $zero, 1 .L80240348: /* ABB5D8 80240348 0C00F598 */ jal func_8003D660 -/* ABB5DC 8024034C 00000000 */ nop +/* ABB5DC 8024034C 00000000 */ nop /* ABB5E0 80240350 C60C0038 */ lwc1 $f12, 0x38($s0) /* ABB5E4 80240354 8E430078 */ lw $v1, 0x78($s2) /* ABB5E8 80240358 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_80240208_ABB498 /* ABB610 80240380 4406B000 */ mfc1 $a2, $f22 /* ABB614 80240384 4407A000 */ mfc1 $a3, $f20 /* ABB618 80240388 0C00A720 */ jal atan2 -/* ABB61C 8024038C 00000000 */ nop +/* ABB61C 8024038C 00000000 */ nop /* ABB620 80240390 8E050018 */ lw $a1, 0x18($s0) /* ABB624 80240394 44060000 */ mfc1 $a2, $f0 /* ABB628 80240398 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_80240208_ABB498 /* ABB63C 802403AC 4406B000 */ mfc1 $a2, $f22 /* ABB640 802403B0 4407A000 */ mfc1 $a3, $f20 /* ABB644 802403B4 0C00A7B5 */ jal dist2D -/* ABB648 802403B8 00000000 */ nop +/* ABB648 802403B8 00000000 */ nop /* ABB64C 802403BC C6020018 */ lwc1 $f2, 0x18($s0) /* ABB650 802403C0 4602003E */ c.le.s $f0, $f2 -/* ABB654 802403C4 00000000 */ nop +/* ABB654 802403C4 00000000 */ nop /* ABB658 802403C8 4500002F */ bc1f .L80240488 /* ABB65C 802403CC 240403E8 */ addiu $a0, $zero, 0x3e8 /* ABB660 802403D0 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_80240208_ABB498 /* ABB6B4 80240424 18400003 */ blez $v0, .L80240434 /* ABB6B8 80240428 24020004 */ addiu $v0, $zero, 4 /* ABB6BC 8024042C 14600002 */ bnez $v1, .L80240438 -/* ABB6C0 80240430 00000000 */ nop +/* ABB6C0 80240430 00000000 */ nop .L80240434: /* ABB6C4 80240434 AE420070 */ sw $v0, 0x70($s2) .L80240438: diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240570_ABB800.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240570_ABB800.s index c56142a33c..ba134dc7e0 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240570_ABB800.s +++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240570_ABB800.s @@ -38,7 +38,7 @@ glabel func_80240570_ABB800 /* ABB884 802405F4 2402000F */ addiu $v0, $zero, 0xf /* ABB888 802405F8 AFA2001C */ sw $v0, 0x1c($sp) /* ABB88C 802405FC 44833000 */ mtc1 $v1, $f6 -/* ABB890 80240600 00000000 */ nop +/* ABB890 80240600 00000000 */ nop /* ABB894 80240604 468031A0 */ cvt.s.w $f6, $f6 /* ABB898 80240608 44073000 */ mfc1 $a3, $f6 /* ABB89C 8024060C 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_80240570_ABB800 .L80240670: /* ABB900 80240670 8602008C */ lh $v0, 0x8c($s0) /* ABB904 80240674 14400025 */ bnez $v0, .L8024070C -/* ABB908 80240678 00000000 */ nop +/* ABB908 80240678 00000000 */ nop /* ABB90C 8024067C 9602008E */ lhu $v0, 0x8e($s0) /* ABB910 80240680 2442FFFF */ addiu $v0, $v0, -1 /* ABB914 80240684 A602008E */ sh $v0, 0x8e($s0) /* ABB918 80240688 00021400 */ sll $v0, $v0, 0x10 /* ABB91C 8024068C 1440001F */ bnez $v0, .L8024070C -/* ABB920 80240690 00000000 */ nop +/* ABB920 80240690 00000000 */ nop /* ABB924 80240694 8E820074 */ lw $v0, 0x74($s4) /* ABB928 80240698 2442FFFF */ addiu $v0, $v0, -1 /* ABB92C 8024069C 10400019 */ beqz $v0, .L80240704 @@ -84,7 +84,7 @@ glabel func_80240570_ABB800 /* ABB938 802406A8 9442002A */ lhu $v0, 0x2a($v0) /* ABB93C 802406AC 30420010 */ andi $v0, $v0, 0x10 /* ABB940 802406B0 14400007 */ bnez $v0, .L802406D0 -/* ABB944 802406B4 00000000 */ nop +/* ABB944 802406B4 00000000 */ nop /* ABB948 802406B8 C600000C */ lwc1 $f0, 0xc($s0) /* ABB94C 802406BC 3C014334 */ lui $at, 0x4334 /* ABB950 802406C0 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_8024072C_ABB9BC.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_8024072C_ABB9BC.s index 169c1d0913..b8b8bb9ce4 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_8024072C_ABB9BC.s +++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_8024072C_ABB9BC.s @@ -28,7 +28,7 @@ glabel func_8024072C_ABB9BC /* ABBA14 80240784 8E0200D0 */ lw $v0, 0xd0($s0) /* ABBA18 80240788 8C42007C */ lw $v0, 0x7c($v0) /* ABBA1C 8024078C 04410004 */ bgez $v0, .L802407A0 -/* ABBA20 80240790 00000000 */ nop +/* ABBA20 80240790 00000000 */ nop /* ABBA24 80240794 C6400000 */ lwc1 $f0, ($s2) /* ABBA28 80240798 080901F0 */ j .L802407C0 /* ABBA2C 8024079C E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_8024072C_ABB9BC /* ABBA30 802407A0 3C018025 */ lui $at, %hi(D_80249D38) /* ABBA34 802407A4 D4229D38 */ ldc1 $f2, %lo(D_80249D38)($at) /* ABBA38 802407A8 44820000 */ mtc1 $v0, $f0 -/* ABBA3C 802407AC 00000000 */ nop +/* ABBA3C 802407AC 00000000 */ nop /* ABBA40 802407B0 46800021 */ cvt.d.w $f0, $f0 /* ABBA44 802407B4 46220003 */ div.d $f0, $f0, $f2 /* ABBA48 802407B8 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802408CC_ABBB5C.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802408CC_ABBB5C.s index 98c6ff3d2b..2d5217e635 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802408CC_ABBB5C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802408CC_ABBB5C.s @@ -47,20 +47,20 @@ glabel func_802408CC_ABBB5C /* ABBC04 80240974 8E02001C */ lw $v0, 0x1c($s0) /* ABBC08 80240978 46001005 */ abs.s $f0, $f2 /* ABBC0C 8024097C 44822000 */ mtc1 $v0, $f4 -/* ABBC10 80240980 00000000 */ nop +/* ABBC10 80240980 00000000 */ nop /* ABBC14 80240984 46802120 */ cvt.s.w $f4, $f4 /* ABBC18 80240988 4600203C */ c.lt.s $f4, $f0 -/* ABBC1C 8024098C 00000000 */ nop +/* ABBC1C 8024098C 00000000 */ nop /* ABBC20 80240990 4500000D */ bc1f .L802409C8 -/* ABBC24 80240994 00000000 */ nop +/* ABBC24 80240994 00000000 */ nop /* ABBC28 80240998 44800000 */ mtc1 $zero, $f0 /* ABBC2C 8024099C C654000C */ lwc1 $f20, 0xc($s2) /* ABBC30 802409A0 4600103C */ c.lt.s $f2, $f0 -/* ABBC34 802409A4 00000000 */ nop +/* ABBC34 802409A4 00000000 */ nop /* ABBC38 802409A8 45000006 */ bc1f .L802409C4 /* ABBC3C 802409AC 00021023 */ negu $v0, $v0 /* ABBC40 802409B0 44820000 */ mtc1 $v0, $f0 -/* ABBC44 802409B4 00000000 */ nop +/* ABBC44 802409B4 00000000 */ nop /* ABBC48 802409B8 46800020 */ cvt.s.w $f0, $f0 /* ABBC4C 802409BC 08090272 */ j .L802409C8 /* ABBC50 802409C0 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802409FC_ABBC8C.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802409FC_ABBC8C.s index ed2c009a04..2ebf14715d 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802409FC_ABBC8C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802409FC_ABBC8C.s @@ -37,7 +37,7 @@ glabel func_802409FC_ABBC8C /* ABBD0C 80240A7C 2402000F */ addiu $v0, $zero, 0xf /* ABBD10 80240A80 AFA2001C */ sw $v0, 0x1c($sp) /* ABBD14 80240A84 44833000 */ mtc1 $v1, $f6 -/* ABBD18 80240A88 00000000 */ nop +/* ABBD18 80240A88 00000000 */ nop /* ABBD1C 80240A8C 468031A0 */ cvt.s.w $f6, $f6 /* ABBD20 80240A90 44073000 */ mfc1 $a3, $f6 /* ABBD24 80240A94 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B84_ABBE14.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B84_ABBE14.s index 792d61d263..3afe85fe72 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B84_ABBE14.s +++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B84_ABBE14.s @@ -28,7 +28,7 @@ glabel func_80240B84_ABBE14 /* ABBE6C 80240BDC C4400008 */ lwc1 $f0, 8($v0) /* ABBE70 80240BE0 46800020 */ cvt.s.w $f0, $f0 /* ABBE74 80240BE4 4602003E */ c.le.s $f0, $f2 -/* ABBE78 80240BE8 00000000 */ nop +/* ABBE78 80240BE8 00000000 */ nop /* ABBE7C 80240BEC 45020003 */ bc1fl .L80240BFC /* ABBE80 80240BF0 24840001 */ addiu $a0, $a0, 1 /* ABBE84 80240BF4 08090303 */ j .L80240C0C diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s index fd356aad73..7dd709b0a7 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s +++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s @@ -46,7 +46,7 @@ glabel func_80240C44_ABBED4 /* ABBF78 80240CE8 8E2200B0 */ lw $v0, 0xb0($s1) /* ABBF7C 80240CEC 30420004 */ andi $v0, $v0, 4 /* ABBF80 80240CF0 10400044 */ beqz $v0, .L80240E04 -/* ABBF84 80240CF4 00000000 */ nop +/* ABBF84 80240CF4 00000000 */ nop .L80240CF8: /* ABBF88 80240CF8 2404F7FF */ addiu $a0, $zero, -0x801 /* ABBF8C 80240CFC AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80240C44_ABBED4 /* ABC040 80240DB0 3C0142C8 */ lui $at, 0x42c8 /* ABC044 80240DB4 44812000 */ mtc1 $at, $f4 /* ABC048 80240DB8 44823000 */ mtc1 $v0, $f6 -/* ABC04C 80240DBC 00000000 */ nop +/* ABC04C 80240DBC 00000000 */ nop /* ABC050 80240DC0 468031A0 */ cvt.s.w $f6, $f6 /* ABC054 80240DC4 27A20044 */ addiu $v0, $sp, 0x44 /* ABC058 80240DC8 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80240C44_ABBED4 /* ABC07C 80240DEC 0C0372DF */ jal func_800DCB7C /* ABC080 80240DF0 27A70040 */ addiu $a3, $sp, 0x40 /* ABC084 80240DF4 10400003 */ beqz $v0, .L80240E04 -/* ABC088 80240DF8 00000000 */ nop +/* ABC088 80240DF8 00000000 */ nop /* ABC08C 80240DFC C7A0003C */ lwc1 $f0, 0x3c($sp) /* ABC090 80240E00 E640003C */ swc1 $f0, 0x3c($s2) .L80240E04: @@ -124,72 +124,85 @@ glabel func_80240C44_ABBED4 /* ABC098 80240E08 2C620064 */ sltiu $v0, $v1, 0x64 /* ABC09C 80240E0C 10400042 */ beqz $v0, .L80240F18 /* ABC0A0 80240E10 00031080 */ sll $v0, $v1, 2 -/* ABC0A4 80240E14 3C018025 */ lui $at, %hi(D_80249D40) +/* ABC0A4 80240E14 3C018025 */ lui $at, %hi(jtbl_80249D40_AC4FD0) /* ABC0A8 80240E18 00220821 */ addu $at, $at, $v0 -/* ABC0AC 80240E1C 8C229D40 */ lw $v0, %lo(D_80249D40)($at) +/* ABC0AC 80240E1C 8C229D40 */ lw $v0, %lo(jtbl_80249D40_AC4FD0)($at) /* ABC0B0 80240E20 00400008 */ jr $v0 -/* ABC0B4 80240E24 00000000 */ nop +/* ABC0B4 80240E24 00000000 */ nop +glabel L80240E28_ABC0B8 /* ABC0B8 80240E28 0280202D */ daddu $a0, $s4, $zero /* ABC0BC 80240E2C 0260282D */ daddu $a1, $s3, $zero /* ABC0C0 80240E30 0C09002C */ jal func_802400B0_ABB340 /* ABC0C4 80240E34 02A0302D */ daddu $a2, $s5, $zero +glabel L80240E38_ABC0C8 /* ABC0C8 80240E38 0280202D */ daddu $a0, $s4, $zero /* ABC0CC 80240E3C 0260282D */ daddu $a1, $s3, $zero /* ABC0D0 80240E40 0C090082 */ jal func_80240208_ABB498 /* ABC0D4 80240E44 02A0302D */ daddu $a2, $s5, $zero /* ABC0D8 80240E48 080903C6 */ j .L80240F18 -/* ABC0DC 80240E4C 00000000 */ nop +/* ABC0DC 80240E4C 00000000 */ nop +glabel L80240E50_ABC0E0 /* ABC0E0 80240E50 0280202D */ daddu $a0, $s4, $zero /* ABC0E4 80240E54 0260282D */ daddu $a1, $s3, $zero /* ABC0E8 80240E58 0C09012C */ jal kkj_00_UnkNpcAIFunc1 /* ABC0EC 80240E5C 02A0302D */ daddu $a2, $s5, $zero +glabel L80240E60_ABC0F0 /* ABC0F0 80240E60 0280202D */ daddu $a0, $s4, $zero /* ABC0F4 80240E64 0260282D */ daddu $a1, $s3, $zero /* ABC0F8 80240E68 0C09015C */ jal func_80240570_ABB800 /* ABC0FC 80240E6C 02A0302D */ daddu $a2, $s5, $zero /* ABC100 80240E70 080903C6 */ j .L80240F18 -/* ABC104 80240E74 00000000 */ nop +/* ABC104 80240E74 00000000 */ nop +glabel L80240E78_ABC108 /* ABC108 80240E78 0280202D */ daddu $a0, $s4, $zero /* ABC10C 80240E7C 0260282D */ daddu $a1, $s3, $zero /* ABC110 80240E80 0C0901CB */ jal func_8024072C_ABB9BC /* ABC114 80240E84 02A0302D */ daddu $a2, $s5, $zero /* ABC118 80240E88 080903C6 */ j .L80240F18 -/* ABC11C 80240E8C 00000000 */ nop +/* ABC11C 80240E8C 00000000 */ nop +glabel L80240E90_ABC120 /* ABC120 80240E90 0280202D */ daddu $a0, $s4, $zero /* ABC124 80240E94 0260282D */ daddu $a1, $s3, $zero /* ABC128 80240E98 0C0901F8 */ jal kkj_00_NpcJumpFunc2 /* ABC12C 80240E9C 02A0302D */ daddu $a2, $s5, $zero +glabel L80240EA0_ABC130 /* ABC130 80240EA0 0280202D */ daddu $a0, $s4, $zero /* ABC134 80240EA4 0260282D */ daddu $a1, $s3, $zero /* ABC138 80240EA8 0C090215 */ jal kkj_00_NpcJumpFunc /* ABC13C 80240EAC 02A0302D */ daddu $a2, $s5, $zero /* ABC140 80240EB0 080903C6 */ j .L80240F18 -/* ABC144 80240EB4 00000000 */ nop +/* ABC144 80240EB4 00000000 */ nop +glabel L80240EB8_ABC148 /* ABC148 80240EB8 0280202D */ daddu $a0, $s4, $zero /* ABC14C 80240EBC 0260282D */ daddu $a1, $s3, $zero /* ABC150 80240EC0 0C090233 */ jal func_802408CC_ABBB5C /* ABC154 80240EC4 02A0302D */ daddu $a2, $s5, $zero +glabel L80240EC8_ABC158 /* ABC158 80240EC8 0280202D */ daddu $a0, $s4, $zero /* ABC15C 80240ECC 0260282D */ daddu $a1, $s3, $zero /* ABC160 80240ED0 0C09027F */ jal func_802409FC_ABBC8C /* ABC164 80240ED4 02A0302D */ daddu $a2, $s5, $zero /* ABC168 80240ED8 080903C6 */ j .L80240F18 -/* ABC16C 80240EDC 00000000 */ nop +/* ABC16C 80240EDC 00000000 */ nop +glabel L80240EE0_ABC170 /* ABC170 80240EE0 0280202D */ daddu $a0, $s4, $zero /* ABC174 80240EE4 0260282D */ daddu $a1, $s3, $zero /* ABC178 80240EE8 0C0902C7 */ jal kkj_00_UnkNpcDurationFlagFunc /* ABC17C 80240EEC 02A0302D */ daddu $a2, $s5, $zero /* ABC180 80240EF0 080903C6 */ j .L80240F18 -/* ABC184 80240EF4 00000000 */ nop +/* ABC184 80240EF4 00000000 */ nop +glabel L80240EF8_ABC188 /* ABC188 80240EF8 0280202D */ daddu $a0, $s4, $zero /* ABC18C 80240EFC 0260282D */ daddu $a1, $s3, $zero /* ABC190 80240F00 0C0902E1 */ jal func_80240B84_ABBE14 /* ABC194 80240F04 02A0302D */ daddu $a2, $s5, $zero /* ABC198 80240F08 080903C6 */ j .L80240F18 -/* ABC19C 80240F0C 00000000 */ nop +/* ABC19C 80240F0C 00000000 */ nop +glabel L80240F10_ABC1A0 /* ABC1A0 80240F10 0C0129CF */ jal func_8004A73C /* ABC1A4 80240F14 0280202D */ daddu $a0, $s4, $zero .L80240F18: +glabel L80240F18_ABC1A8 /* ABC1A8 80240F18 8FBF0060 */ lw $ra, 0x60($sp) /* ABC1AC 80240F1C 8FB5005C */ lw $s5, 0x5c($sp) /* ABC1B0 80240F20 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240F40_ABC1D0.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240F40_ABC1D0.s index b9452ce05e..18ce43b1f1 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240F40_ABC1D0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240F40_ABC1D0.s @@ -37,4 +37,4 @@ glabel func_80240F40_ABC1D0 /* ABC240 80240FB0 8FB00010 */ lw $s0, 0x10($sp) /* ABC244 80240FB4 03E00008 */ jr $ra /* ABC248 80240FB8 27BD0018 */ addiu $sp, $sp, 0x18 -/* ABC24C 80240FBC 00000000 */ nop +/* ABC24C 80240FBC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240000_AC5170.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240000_AC5170.s index 81b5100e9b..b200bf6617 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240000_AC5170.s +++ b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240000_AC5170.s @@ -45,7 +45,7 @@ glabel func_80240000_AC5170 /* AC520C 8024009C 0C00A7B5 */ jal dist2D /* AC5210 802400A0 4600B386 */ mov.s $f14, $f22 /* AC5214 802400A4 4614003C */ c.lt.s $f0, $f20 -/* AC5218 802400A8 00000000 */ nop +/* AC5218 802400A8 00000000 */ nop /* AC521C 802400AC 45000003 */ bc1f .L802400BC /* AC5220 802400B0 2631000C */ addiu $s1, $s1, 0xc /* AC5224 802400B4 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_80240000_AC5170 /* AC5250 802400E0 8E6200D0 */ lw $v0, 0xd0($s3) /* AC5254 802400E4 8C42007C */ lw $v0, 0x7c($v0) /* AC5258 802400E8 04410004 */ bgez $v0, .L802400FC -/* AC525C 802400EC 00000000 */ nop +/* AC525C 802400EC 00000000 */ nop /* AC5260 802400F0 C6C00000 */ lwc1 $f0, ($s6) /* AC5264 802400F4 08090047 */ j .L8024011C /* AC5268 802400F8 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_80240000_AC5170 /* AC526C 802400FC 3C018024 */ lui $at, %hi(D_80243A10) /* AC5270 80240100 D4223A10 */ ldc1 $f2, %lo(D_80243A10)($at) /* AC5274 80240104 44820000 */ mtc1 $v0, $f0 -/* AC5278 80240108 00000000 */ nop +/* AC5278 80240108 00000000 */ nop /* AC527C 8024010C 46800021 */ cvt.d.w $f0, $f0 /* AC5280 80240110 46220003 */ div.d $f0, $f0, $f2 /* AC5284 80240114 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240158_AC52C8.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240158_AC52C8.s index 5d2326addc..fdeded45fd 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240158_AC52C8.s +++ b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240158_AC52C8.s @@ -44,7 +44,7 @@ glabel func_80240158_AC52C8 /* AC5364 802401F4 2402000F */ addiu $v0, $zero, 0xf /* AC5368 802401F8 AFA2001C */ sw $v0, 0x1c($sp) /* AC536C 802401FC 44833000 */ mtc1 $v1, $f6 -/* AC5370 80240200 00000000 */ nop +/* AC5370 80240200 00000000 */ nop /* AC5374 80240204 468031A0 */ cvt.s.w $f6, $f6 /* AC5378 80240208 44073000 */ mfc1 $a3, $f6 /* AC537C 8024020C 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_80240158_AC52C8 .L8024025C: /* AC53CC 8024025C 8602008C */ lh $v0, 0x8c($s0) /* AC53D0 80240260 1440005D */ bnez $v0, .L802403D8 -/* AC53D4 80240264 00000000 */ nop +/* AC53D4 80240264 00000000 */ nop /* AC53D8 80240268 C6000018 */ lwc1 $f0, 0x18($s0) /* AC53DC 8024026C 3C014010 */ lui $at, 0x4010 /* AC53E0 80240270 44811800 */ mtc1 $at, $f3 /* AC53E4 80240274 44801000 */ mtc1 $zero, $f2 /* AC53E8 80240278 46000021 */ cvt.d.s $f0, $f0 /* AC53EC 8024027C 4622003C */ c.lt.d $f0, $f2 -/* AC53F0 80240280 00000000 */ nop +/* AC53F0 80240280 00000000 */ nop /* AC53F4 80240284 45000003 */ bc1f .L80240294 /* AC53F8 80240288 0200202D */ daddu $a0, $s0, $zero /* AC53FC 8024028C 080900A6 */ j .L80240298 @@ -88,7 +88,7 @@ glabel func_80240158_AC52C8 /* AC5404 80240294 24050001 */ addiu $a1, $zero, 1 .L80240298: /* AC5408 80240298 0C00F598 */ jal func_8003D660 -/* AC540C 8024029C 00000000 */ nop +/* AC540C 8024029C 00000000 */ nop /* AC5410 802402A0 C60C0038 */ lwc1 $f12, 0x38($s0) /* AC5414 802402A4 8E430078 */ lw $v1, 0x78($s2) /* AC5418 802402A8 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_80240158_AC52C8 /* AC5440 802402D0 4406B000 */ mfc1 $a2, $f22 /* AC5444 802402D4 4407A000 */ mfc1 $a3, $f20 /* AC5448 802402D8 0C00A720 */ jal atan2 -/* AC544C 802402DC 00000000 */ nop +/* AC544C 802402DC 00000000 */ nop /* AC5450 802402E0 8E050018 */ lw $a1, 0x18($s0) /* AC5454 802402E4 44060000 */ mfc1 $a2, $f0 /* AC5458 802402E8 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_80240158_AC52C8 /* AC546C 802402FC 4406B000 */ mfc1 $a2, $f22 /* AC5470 80240300 4407A000 */ mfc1 $a3, $f20 /* AC5474 80240304 0C00A7B5 */ jal dist2D -/* AC5478 80240308 00000000 */ nop +/* AC5478 80240308 00000000 */ nop /* AC547C 8024030C C6020018 */ lwc1 $f2, 0x18($s0) /* AC5480 80240310 4602003E */ c.le.s $f0, $f2 -/* AC5484 80240314 00000000 */ nop +/* AC5484 80240314 00000000 */ nop /* AC5488 80240318 4500002F */ bc1f .L802403D8 /* AC548C 8024031C 240403E8 */ addiu $a0, $zero, 0x3e8 /* AC5490 80240320 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_80240158_AC52C8 /* AC54E4 80240374 18400003 */ blez $v0, .L80240384 /* AC54E8 80240378 24020004 */ addiu $v0, $zero, 4 /* AC54EC 8024037C 14600002 */ bnez $v1, .L80240388 -/* AC54F0 80240380 00000000 */ nop +/* AC54F0 80240380 00000000 */ nop .L80240384: /* AC54F4 80240384 AE420070 */ sw $v0, 0x70($s2) .L80240388: diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_802404C0_AC5630.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_802404C0_AC5630.s index 17de51e274..cd2e4bcf38 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_802404C0_AC5630.s +++ b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_802404C0_AC5630.s @@ -38,7 +38,7 @@ glabel func_802404C0_AC5630 /* AC56B4 80240544 2402000F */ addiu $v0, $zero, 0xf /* AC56B8 80240548 AFA2001C */ sw $v0, 0x1c($sp) /* AC56BC 8024054C 44833000 */ mtc1 $v1, $f6 -/* AC56C0 80240550 00000000 */ nop +/* AC56C0 80240550 00000000 */ nop /* AC56C4 80240554 468031A0 */ cvt.s.w $f6, $f6 /* AC56C8 80240558 44073000 */ mfc1 $a3, $f6 /* AC56CC 8024055C 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_802404C0_AC5630 .L802405C0: /* AC5730 802405C0 8602008C */ lh $v0, 0x8c($s0) /* AC5734 802405C4 14400025 */ bnez $v0, .L8024065C -/* AC5738 802405C8 00000000 */ nop +/* AC5738 802405C8 00000000 */ nop /* AC573C 802405CC 9602008E */ lhu $v0, 0x8e($s0) /* AC5740 802405D0 2442FFFF */ addiu $v0, $v0, -1 /* AC5744 802405D4 A602008E */ sh $v0, 0x8e($s0) /* AC5748 802405D8 00021400 */ sll $v0, $v0, 0x10 /* AC574C 802405DC 1440001F */ bnez $v0, .L8024065C -/* AC5750 802405E0 00000000 */ nop +/* AC5750 802405E0 00000000 */ nop /* AC5754 802405E4 8E820074 */ lw $v0, 0x74($s4) /* AC5758 802405E8 2442FFFF */ addiu $v0, $v0, -1 /* AC575C 802405EC 10400019 */ beqz $v0, .L80240654 @@ -84,7 +84,7 @@ glabel func_802404C0_AC5630 /* AC5768 802405F8 9442002A */ lhu $v0, 0x2a($v0) /* AC576C 802405FC 30420010 */ andi $v0, $v0, 0x10 /* AC5770 80240600 14400007 */ bnez $v0, .L80240620 -/* AC5774 80240604 00000000 */ nop +/* AC5774 80240604 00000000 */ nop /* AC5778 80240608 C600000C */ lwc1 $f0, 0xc($s0) /* AC577C 8024060C 3C014334 */ lui $at, 0x4334 /* AC5780 80240610 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_8024067C_AC57EC.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_8024067C_AC57EC.s index 89cdc8a061..8dc492d33b 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_8024067C_AC57EC.s +++ b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_8024067C_AC57EC.s @@ -28,7 +28,7 @@ glabel func_8024067C_AC57EC /* AC5844 802406D4 8E0200D0 */ lw $v0, 0xd0($s0) /* AC5848 802406D8 8C42007C */ lw $v0, 0x7c($v0) /* AC584C 802406DC 04410004 */ bgez $v0, .L802406F0 -/* AC5850 802406E0 00000000 */ nop +/* AC5850 802406E0 00000000 */ nop /* AC5854 802406E4 C6400000 */ lwc1 $f0, ($s2) /* AC5858 802406E8 080901C4 */ j .L80240710 /* AC585C 802406EC E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_8024067C_AC57EC /* AC5860 802406F0 3C018024 */ lui $at, %hi(D_80243A18) /* AC5864 802406F4 D4223A18 */ ldc1 $f2, %lo(D_80243A18)($at) /* AC5868 802406F8 44820000 */ mtc1 $v0, $f0 -/* AC586C 802406FC 00000000 */ nop +/* AC586C 802406FC 00000000 */ nop /* AC5870 80240700 46800021 */ cvt.d.w $f0, $f0 /* AC5874 80240704 46220003 */ div.d $f0, $f0, $f2 /* AC5878 80240708 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_8024081C_AC598C.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_8024081C_AC598C.s index b01ac1c7ce..73299c3114 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_8024081C_AC598C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_8024081C_AC598C.s @@ -47,20 +47,20 @@ glabel func_8024081C_AC598C /* AC5A34 802408C4 8E02001C */ lw $v0, 0x1c($s0) /* AC5A38 802408C8 46001005 */ abs.s $f0, $f2 /* AC5A3C 802408CC 44822000 */ mtc1 $v0, $f4 -/* AC5A40 802408D0 00000000 */ nop +/* AC5A40 802408D0 00000000 */ nop /* AC5A44 802408D4 46802120 */ cvt.s.w $f4, $f4 /* AC5A48 802408D8 4600203C */ c.lt.s $f4, $f0 -/* AC5A4C 802408DC 00000000 */ nop +/* AC5A4C 802408DC 00000000 */ nop /* AC5A50 802408E0 4500000D */ bc1f .L80240918 -/* AC5A54 802408E4 00000000 */ nop +/* AC5A54 802408E4 00000000 */ nop /* AC5A58 802408E8 44800000 */ mtc1 $zero, $f0 /* AC5A5C 802408EC C654000C */ lwc1 $f20, 0xc($s2) /* AC5A60 802408F0 4600103C */ c.lt.s $f2, $f0 -/* AC5A64 802408F4 00000000 */ nop +/* AC5A64 802408F4 00000000 */ nop /* AC5A68 802408F8 45000006 */ bc1f .L80240914 /* AC5A6C 802408FC 00021023 */ negu $v0, $v0 /* AC5A70 80240900 44820000 */ mtc1 $v0, $f0 -/* AC5A74 80240904 00000000 */ nop +/* AC5A74 80240904 00000000 */ nop /* AC5A78 80240908 46800020 */ cvt.s.w $f0, $f0 /* AC5A7C 8024090C 08090246 */ j .L80240918 /* AC5A80 80240910 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_8024094C_AC5ABC.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_8024094C_AC5ABC.s index 33ca2cd7a7..66479c1f6d 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_8024094C_AC5ABC.s +++ b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_8024094C_AC5ABC.s @@ -37,7 +37,7 @@ glabel func_8024094C_AC5ABC /* AC5B3C 802409CC 2402000F */ addiu $v0, $zero, 0xf /* AC5B40 802409D0 AFA2001C */ sw $v0, 0x1c($sp) /* AC5B44 802409D4 44833000 */ mtc1 $v1, $f6 -/* AC5B48 802409D8 00000000 */ nop +/* AC5B48 802409D8 00000000 */ nop /* AC5B4C 802409DC 468031A0 */ cvt.s.w $f6, $f6 /* AC5B50 802409E0 44073000 */ mfc1 $a3, $f6 /* AC5B54 802409E4 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240AD4_AC5C44.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240AD4_AC5C44.s index 2baf0cc329..e5469c5ce1 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240AD4_AC5C44.s +++ b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240AD4_AC5C44.s @@ -28,7 +28,7 @@ glabel func_80240AD4_AC5C44 /* AC5C9C 80240B2C C4400008 */ lwc1 $f0, 8($v0) /* AC5CA0 80240B30 46800020 */ cvt.s.w $f0, $f0 /* AC5CA4 80240B34 4602003E */ c.le.s $f0, $f2 -/* AC5CA8 80240B38 00000000 */ nop +/* AC5CA8 80240B38 00000000 */ nop /* AC5CAC 80240B3C 45020003 */ bc1fl .L80240B4C /* AC5CB0 80240B40 24840001 */ addiu $a0, $a0, 1 /* AC5CB4 80240B44 080902D7 */ j .L80240B5C diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s index 35882169b0..eff1d543f9 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s +++ b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s @@ -46,7 +46,7 @@ glabel func_80240B94_AC5D04 /* AC5DA8 80240C38 8E2200B0 */ lw $v0, 0xb0($s1) /* AC5DAC 80240C3C 30420004 */ andi $v0, $v0, 4 /* AC5DB0 80240C40 10400044 */ beqz $v0, .L80240D54 -/* AC5DB4 80240C44 00000000 */ nop +/* AC5DB4 80240C44 00000000 */ nop .L80240C48: /* AC5DB8 80240C48 2404F7FF */ addiu $a0, $zero, -0x801 /* AC5DBC 80240C4C AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80240B94_AC5D04 /* AC5E70 80240D00 3C0142C8 */ lui $at, 0x42c8 /* AC5E74 80240D04 44812000 */ mtc1 $at, $f4 /* AC5E78 80240D08 44823000 */ mtc1 $v0, $f6 -/* AC5E7C 80240D0C 00000000 */ nop +/* AC5E7C 80240D0C 00000000 */ nop /* AC5E80 80240D10 468031A0 */ cvt.s.w $f6, $f6 /* AC5E84 80240D14 27A20044 */ addiu $v0, $sp, 0x44 /* AC5E88 80240D18 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80240B94_AC5D04 /* AC5EAC 80240D3C 0C0372DF */ jal func_800DCB7C /* AC5EB0 80240D40 27A70040 */ addiu $a3, $sp, 0x40 /* AC5EB4 80240D44 10400003 */ beqz $v0, .L80240D54 -/* AC5EB8 80240D48 00000000 */ nop +/* AC5EB8 80240D48 00000000 */ nop /* AC5EBC 80240D4C C7A0003C */ lwc1 $f0, 0x3c($sp) /* AC5EC0 80240D50 E640003C */ swc1 $f0, 0x3c($s2) .L80240D54: @@ -124,72 +124,85 @@ glabel func_80240B94_AC5D04 /* AC5EC8 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 /* AC5ECC 80240D5C 10400042 */ beqz $v0, .L80240E68 /* AC5ED0 80240D60 00031080 */ sll $v0, $v1, 2 -/* AC5ED4 80240D64 3C018024 */ lui $at, %hi(D_80243A20) +/* AC5ED4 80240D64 3C018024 */ lui $at, %hi(jtbl_80243A20_AC8B90) /* AC5ED8 80240D68 00220821 */ addu $at, $at, $v0 -/* AC5EDC 80240D6C 8C223A20 */ lw $v0, %lo(D_80243A20)($at) +/* AC5EDC 80240D6C 8C223A20 */ lw $v0, %lo(jtbl_80243A20_AC8B90)($at) /* AC5EE0 80240D70 00400008 */ jr $v0 -/* AC5EE4 80240D74 00000000 */ nop +/* AC5EE4 80240D74 00000000 */ nop +glabel L80240D78_AC5EE8 /* AC5EE8 80240D78 0280202D */ daddu $a0, $s4, $zero /* AC5EEC 80240D7C 0260282D */ daddu $a1, $s3, $zero /* AC5EF0 80240D80 0C090000 */ jal func_80240000_AC5170 /* AC5EF4 80240D84 02A0302D */ daddu $a2, $s5, $zero +glabel L80240D88_AC5EF8 /* AC5EF8 80240D88 0280202D */ daddu $a0, $s4, $zero /* AC5EFC 80240D8C 0260282D */ daddu $a1, $s3, $zero /* AC5F00 80240D90 0C090056 */ jal func_80240158_AC52C8 /* AC5F04 80240D94 02A0302D */ daddu $a2, $s5, $zero /* AC5F08 80240D98 0809039A */ j .L80240E68 -/* AC5F0C 80240D9C 00000000 */ nop +/* AC5F0C 80240D9C 00000000 */ nop +glabel L80240DA0_AC5F10 /* AC5F10 80240DA0 0280202D */ daddu $a0, $s4, $zero /* AC5F14 80240DA4 0260282D */ daddu $a1, $s3, $zero /* AC5F18 80240DA8 0C090100 */ jal kkj_01_UnkNpcAIFunc1 /* AC5F1C 80240DAC 02A0302D */ daddu $a2, $s5, $zero +glabel L80240DB0_AC5F20 /* AC5F20 80240DB0 0280202D */ daddu $a0, $s4, $zero /* AC5F24 80240DB4 0260282D */ daddu $a1, $s3, $zero /* AC5F28 80240DB8 0C090130 */ jal func_802404C0_AC5630 /* AC5F2C 80240DBC 02A0302D */ daddu $a2, $s5, $zero /* AC5F30 80240DC0 0809039A */ j .L80240E68 -/* AC5F34 80240DC4 00000000 */ nop +/* AC5F34 80240DC4 00000000 */ nop +glabel L80240DC8_AC5F38 /* AC5F38 80240DC8 0280202D */ daddu $a0, $s4, $zero /* AC5F3C 80240DCC 0260282D */ daddu $a1, $s3, $zero /* AC5F40 80240DD0 0C09019F */ jal func_8024067C_AC57EC /* AC5F44 80240DD4 02A0302D */ daddu $a2, $s5, $zero /* AC5F48 80240DD8 0809039A */ j .L80240E68 -/* AC5F4C 80240DDC 00000000 */ nop +/* AC5F4C 80240DDC 00000000 */ nop +glabel L80240DE0_AC5F50 /* AC5F50 80240DE0 0280202D */ daddu $a0, $s4, $zero /* AC5F54 80240DE4 0260282D */ daddu $a1, $s3, $zero /* AC5F58 80240DE8 0C0901CC */ jal kkj_01_NpcJumpFunc2 /* AC5F5C 80240DEC 02A0302D */ daddu $a2, $s5, $zero +glabel L80240DF0_AC5F60 /* AC5F60 80240DF0 0280202D */ daddu $a0, $s4, $zero /* AC5F64 80240DF4 0260282D */ daddu $a1, $s3, $zero /* AC5F68 80240DF8 0C0901E9 */ jal kkj_01_NpcJumpFunc /* AC5F6C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* AC5F70 80240E00 0809039A */ j .L80240E68 -/* AC5F74 80240E04 00000000 */ nop +/* AC5F74 80240E04 00000000 */ nop +glabel L80240E08_AC5F78 /* AC5F78 80240E08 0280202D */ daddu $a0, $s4, $zero /* AC5F7C 80240E0C 0260282D */ daddu $a1, $s3, $zero /* AC5F80 80240E10 0C090207 */ jal func_8024081C_AC598C /* AC5F84 80240E14 02A0302D */ daddu $a2, $s5, $zero +glabel L80240E18_AC5F88 /* AC5F88 80240E18 0280202D */ daddu $a0, $s4, $zero /* AC5F8C 80240E1C 0260282D */ daddu $a1, $s3, $zero /* AC5F90 80240E20 0C090253 */ jal func_8024094C_AC5ABC /* AC5F94 80240E24 02A0302D */ daddu $a2, $s5, $zero /* AC5F98 80240E28 0809039A */ j .L80240E68 -/* AC5F9C 80240E2C 00000000 */ nop +/* AC5F9C 80240E2C 00000000 */ nop +glabel L80240E30_AC5FA0 /* AC5FA0 80240E30 0280202D */ daddu $a0, $s4, $zero /* AC5FA4 80240E34 0260282D */ daddu $a1, $s3, $zero /* AC5FA8 80240E38 0C09029B */ jal kkj_01_UnkNpcDurationFlagFunc /* AC5FAC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* AC5FB0 80240E40 0809039A */ j .L80240E68 -/* AC5FB4 80240E44 00000000 */ nop +/* AC5FB4 80240E44 00000000 */ nop +glabel L80240E48_AC5FB8 /* AC5FB8 80240E48 0280202D */ daddu $a0, $s4, $zero /* AC5FBC 80240E4C 0260282D */ daddu $a1, $s3, $zero /* AC5FC0 80240E50 0C0902B5 */ jal func_80240AD4_AC5C44 /* AC5FC4 80240E54 02A0302D */ daddu $a2, $s5, $zero /* AC5FC8 80240E58 0809039A */ j .L80240E68 -/* AC5FCC 80240E5C 00000000 */ nop +/* AC5FCC 80240E5C 00000000 */ nop +glabel L80240E60_AC5FD0 /* AC5FD0 80240E60 0C0129CF */ jal func_8004A73C /* AC5FD4 80240E64 0280202D */ daddu $a0, $s4, $zero .L80240E68: +glabel L80240E68_AC5FD8 /* AC5FD8 80240E68 8FBF0060 */ lw $ra, 0x60($sp) /* AC5FDC 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) /* AC5FE0 80240E70 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_03/AC9710/func_80240000_AC9710.s b/asm/nonmatchings/world/area_kkj/kkj_03/AC9710/func_80240000_AC9710.s index 8a89282752..602d080e65 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_03/AC9710/func_80240000_AC9710.s +++ b/asm/nonmatchings/world/area_kkj/kkj_03/AC9710/func_80240000_AC9710.s @@ -8,5 +8,5 @@ glabel func_80240000_AC9710 /* AC971C 8024000C A0620084 */ sb $v0, 0x84($v1) /* AC9720 80240010 03E00008 */ jr $ra /* AC9724 80240014 0000102D */ daddu $v0, $zero, $zero -/* AC9728 80240018 00000000 */ nop -/* AC972C 8024001C 00000000 */ nop +/* AC9728 80240018 00000000 */ nop +/* AC972C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s index a3d711160f..97fa341259 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s +++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s @@ -10,10 +10,10 @@ glabel func_80240034_ACAB54 /* ACAB68 80240048 8FBF0010 */ lw $ra, 0x10($sp) /* ACAB6C 8024004C 4600008D */ trunc.w.s $f2, $f0 /* ACAB70 80240050 44021000 */ mfc1 $v0, $f2 -/* ACAB74 80240054 00000000 */ nop +/* ACAB74 80240054 00000000 */ nop /* ACAB78 80240058 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) /* ACAB7C 8024005C A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) /* ACAB80 80240060 24020002 */ addiu $v0, $zero, 2 /* ACAB84 80240064 03E00008 */ jr $ra /* ACAB88 80240068 27BD0018 */ addiu $sp, $sp, 0x18 -/* ACAB8C 8024006C 00000000 */ nop +/* ACAB8C 8024006C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_802400B0_ACABD0.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_802400B0_ACABD0.s index 8562bbd570..e0d92b27e9 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_802400B0_ACABD0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_802400B0_ACABD0.s @@ -55,30 +55,30 @@ glabel func_802400B0_ACABD0 /* ACAC98 80240178 D42235E0 */ ldc1 $f2, %lo(D_802435E0)($at) /* ACAC9C 8024017C 46002121 */ cvt.d.s $f4, $f4 /* ACACA0 80240180 46222032 */ c.eq.d $f4, $f2 -/* ACACA4 80240184 00000000 */ nop +/* ACACA4 80240184 00000000 */ nop /* ACACA8 80240188 45010007 */ bc1t .L802401A8 /* ACACAC 8024018C 46000086 */ mov.s $f2, $f0 /* ACACB0 80240190 3C018024 */ lui $at, %hi(D_802435E8) /* ACACB4 80240194 D42035E8 */ ldc1 $f0, %lo(D_802435E8)($at) /* ACACB8 80240198 46202032 */ c.eq.d $f4, $f0 -/* ACACBC 8024019C 00000000 */ nop +/* ACACBC 8024019C 00000000 */ nop /* ACACC0 802401A0 45000008 */ bc1f .L802401C4 -/* ACACC4 802401A4 00000000 */ nop +/* ACACC4 802401A4 00000000 */ nop .L802401A8: /* ACACC8 802401A8 4618A03E */ c.le.s $f20, $f24 -/* ACACCC 802401AC 00000000 */ nop +/* ACACCC 802401AC 00000000 */ nop /* ACACD0 802401B0 4500000C */ bc1f .L802401E4 /* ACACD4 802401B4 0000882D */ daddu $s1, $zero, $zero /* ACACD8 802401B8 4616103E */ c.le.s $f2, $f22 /* ACACDC 802401BC 08090077 */ j .L802401DC -/* ACACE0 802401C0 00000000 */ nop +/* ACACE0 802401C0 00000000 */ nop .L802401C4: /* ACACE4 802401C4 4618103E */ c.le.s $f2, $f24 -/* ACACE8 802401C8 00000000 */ nop +/* ACACE8 802401C8 00000000 */ nop /* ACACEC 802401CC 45000005 */ bc1f .L802401E4 /* ACACF0 802401D0 0000882D */ daddu $s1, $zero, $zero /* ACACF4 802401D4 4616A03E */ c.le.s $f20, $f22 -/* ACACF8 802401D8 00000000 */ nop +/* ACACF8 802401D8 00000000 */ nop .L802401DC: /* ACACFC 802401DC 45030001 */ bc1tl .L802401E4 /* ACAD00 802401E0 24110001 */ addiu $s1, $zero, 1 @@ -110,13 +110,13 @@ glabel func_802400B0_ACABD0 /* ACAD64 80240244 860200A6 */ lh $v0, 0xa6($s0) /* ACAD68 80240248 27A60028 */ addiu $a2, $sp, 0x28 /* ACAD6C 8024024C 44820000 */ mtc1 $v0, $f0 -/* ACAD70 80240250 00000000 */ nop +/* ACAD70 80240250 00000000 */ nop /* ACAD74 80240254 46800020 */ cvt.s.w $f0, $f0 /* ACAD78 80240258 E7A00018 */ swc1 $f0, 0x18($sp) /* ACAD7C 8024025C 860200A8 */ lh $v0, 0xa8($s0) /* ACAD80 80240260 27A70024 */ addiu $a3, $sp, 0x24 /* ACAD84 80240264 44820000 */ mtc1 $v0, $f0 -/* ACAD88 80240268 00000000 */ nop +/* ACAD88 80240268 00000000 */ nop /* ACAD8C 8024026C 46800020 */ cvt.s.w $f0, $f0 /* ACAD90 80240270 0C0376B9 */ jal func_800DDAE4 /* ACAD94 80240274 E7A0001C */ swc1 $f0, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_8024036C_ACAE8C.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_8024036C_ACAE8C.s index 21838694a6..d78f447a94 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_8024036C_ACAE8C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_8024036C_ACAE8C.s @@ -84,7 +84,7 @@ glabel func_8024036C_ACAE8C /* ACAFC8 802404A8 0C00A7B5 */ jal dist2D /* ACAFCC 802404AC 0000802D */ daddu $s0, $zero, $zero /* ACAFD0 802404B0 4616003E */ c.le.s $f0, $f22 -/* ACAFD4 802404B4 00000000 */ nop +/* ACAFD4 802404B4 00000000 */ nop /* ACAFD8 802404B8 45000002 */ bc1f .L802404C4 /* ACAFDC 802404BC 0240982D */ daddu $s3, $s2, $zero /* ACAFE0 802404C0 24100001 */ addiu $s0, $zero, 1 @@ -122,7 +122,7 @@ glabel func_8024036C_ACAE8C /* ACB05C 8024053C 0C00A7B5 */ jal dist2D /* ACB060 80240540 8E470030 */ lw $a3, 0x30($s2) /* ACB064 80240544 461A003E */ c.le.s $f0, $f26 -/* ACB068 80240548 00000000 */ nop +/* ACB068 80240548 00000000 */ nop /* ACB06C 8024054C 45030001 */ bc1tl .L80240554 /* ACB070 80240550 36100010 */ ori $s0, $s0, 0x10 .L80240554: @@ -153,13 +153,13 @@ glabel func_8024036C_ACAE8C /* ACB0D4 802405B4 862200A6 */ lh $v0, 0xa6($s1) /* ACB0D8 802405B8 27A60028 */ addiu $a2, $sp, 0x28 /* ACB0DC 802405BC 44820000 */ mtc1 $v0, $f0 -/* ACB0E0 802405C0 00000000 */ nop +/* ACB0E0 802405C0 00000000 */ nop /* ACB0E4 802405C4 46800020 */ cvt.s.w $f0, $f0 /* ACB0E8 802405C8 E7A00018 */ swc1 $f0, 0x18($sp) /* ACB0EC 802405CC 862200A8 */ lh $v0, 0xa8($s1) /* ACB0F0 802405D0 0280382D */ daddu $a3, $s4, $zero /* ACB0F4 802405D4 44820000 */ mtc1 $v0, $f0 -/* ACB0F8 802405D8 00000000 */ nop +/* ACB0F8 802405D8 00000000 */ nop /* ACB0FC 802405DC 46800020 */ cvt.s.w $f0, $f0 /* ACB100 802405E0 0C0376B9 */ jal func_800DDAE4 /* ACB104 802405E4 E7A0001C */ swc1 $f0, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_80240644_ACB164.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_80240644_ACB164.s index 23d5dcd03d..673140ce94 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_80240644_ACB164.s +++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_80240644_ACB164.s @@ -31,18 +31,18 @@ glabel func_80240644_ACB164 /* ACB1CC 802406AC 0C0B1EAF */ jal get_variable /* ACB1D0 802406B0 0040802D */ daddu $s0, $v0, $zero /* ACB1D4 802406B4 44901000 */ mtc1 $s0, $f2 -/* ACB1D8 802406B8 00000000 */ nop +/* ACB1D8 802406B8 00000000 */ nop /* ACB1DC 802406BC 468010A0 */ cvt.s.w $f2, $f2 /* ACB1E0 802406C0 44936000 */ mtc1 $s3, $f12 -/* ACB1E4 802406C4 00000000 */ nop +/* ACB1E4 802406C4 00000000 */ nop /* ACB1E8 802406C8 46806320 */ cvt.s.w $f12, $f12 /* ACB1EC 802406CC 44061000 */ mfc1 $a2, $f2 /* ACB1F0 802406D0 44821000 */ mtc1 $v0, $f2 -/* ACB1F4 802406D4 00000000 */ nop +/* ACB1F4 802406D4 00000000 */ nop /* ACB1F8 802406D8 468010A0 */ cvt.s.w $f2, $f2 /* ACB1FC 802406DC 44071000 */ mfc1 $a3, $f2 /* ACB200 802406E0 44927000 */ mtc1 $s2, $f14 -/* ACB204 802406E4 00000000 */ nop +/* ACB204 802406E4 00000000 */ nop /* ACB208 802406E8 0C00A720 */ jal atan2 /* ACB20C 802406EC 468073A0 */ cvt.s.w $f14, $f14 /* ACB210 802406F0 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_80240728_ACB248.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_80240728_ACB248.s index 0c6b9f0106..9a14306bb8 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_80240728_ACB248.s +++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_80240728_ACB248.s @@ -41,7 +41,7 @@ glabel func_80240728_ACB248 /* ACB2D8 802407B8 0C00A7B5 */ jal dist2D /* ACB2DC 802407BC 24140001 */ addiu $s4, $zero, 1 /* ACB2E0 802407C0 4618003C */ c.lt.s $f0, $f24 -/* ACB2E4 802407C4 00000000 */ nop +/* ACB2E4 802407C4 00000000 */ nop /* ACB2E8 802407C8 45030001 */ bc1tl .L802407D0 /* ACB2EC 802407CC 0000A02D */ daddu $s4, $zero, $zero .L802407D0: @@ -56,13 +56,13 @@ glabel func_80240728_ACB248 /* ACB310 802407F0 0C00A8BB */ jal sin_deg /* ACB314 802407F4 4600A306 */ mov.s $f12, $f20 /* ACB318 802407F8 46180002 */ mul.s $f0, $f0, $f24 -/* ACB31C 802407FC 00000000 */ nop +/* ACB31C 802407FC 00000000 */ nop /* ACB320 80240800 C6560028 */ lwc1 $f22, 0x28($s2) /* ACB324 80240804 4600B580 */ add.s $f22, $f22, $f0 /* ACB328 80240808 0C00A8D4 */ jal cos_deg /* ACB32C 8024080C 4600A306 */ mov.s $f12, $f20 /* ACB330 80240810 46180002 */ mul.s $f0, $f0, $f24 -/* ACB334 80240814 00000000 */ nop +/* ACB334 80240814 00000000 */ nop /* ACB338 80240818 0260202D */ daddu $a0, $s3, $zero /* ACB33C 8024081C 02A0282D */ daddu $a1, $s5, $zero /* ACB340 80240820 C6540030 */ lwc1 $f20, 0x30($s2) @@ -95,6 +95,6 @@ glabel func_80240728_ACB248 /* ACB3A8 80240888 D7B40038 */ ldc1 $f20, 0x38($sp) /* ACB3AC 8024088C 03E00008 */ jr $ra /* ACB3B0 80240890 27BD0050 */ addiu $sp, $sp, 0x50 -/* ACB3B4 80240894 00000000 */ nop -/* ACB3B8 80240898 00000000 */ nop -/* ACB3BC 8024089C 00000000 */ nop +/* ACB3B4 80240894 00000000 */ nop +/* ACB3B8 80240898 00000000 */ nop +/* ACB3BC 8024089C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_802408A0_ACB3C0.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_802408A0_ACB3C0.s index 8b8a6c55bf..2cb987a775 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_802408A0_ACB3C0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_802408A0_ACB3C0.s @@ -55,30 +55,30 @@ glabel func_802408A0_ACB3C0 /* ACB488 80240968 D4223600 */ ldc1 $f2, %lo(D_80243600)($at) /* ACB48C 8024096C 46002121 */ cvt.d.s $f4, $f4 /* ACB490 80240970 46222032 */ c.eq.d $f4, $f2 -/* ACB494 80240974 00000000 */ nop +/* ACB494 80240974 00000000 */ nop /* ACB498 80240978 45010007 */ bc1t .L80240998 /* ACB49C 8024097C 46000086 */ mov.s $f2, $f0 /* ACB4A0 80240980 3C018024 */ lui $at, %hi(D_80243608) /* ACB4A4 80240984 D4203608 */ ldc1 $f0, %lo(D_80243608)($at) /* ACB4A8 80240988 46202032 */ c.eq.d $f4, $f0 -/* ACB4AC 8024098C 00000000 */ nop +/* ACB4AC 8024098C 00000000 */ nop /* ACB4B0 80240990 45000008 */ bc1f .L802409B4 -/* ACB4B4 80240994 00000000 */ nop +/* ACB4B4 80240994 00000000 */ nop .L80240998: /* ACB4B8 80240998 4618A03E */ c.le.s $f20, $f24 -/* ACB4BC 8024099C 00000000 */ nop +/* ACB4BC 8024099C 00000000 */ nop /* ACB4C0 802409A0 4500000C */ bc1f .L802409D4 /* ACB4C4 802409A4 0000882D */ daddu $s1, $zero, $zero /* ACB4C8 802409A8 4616103E */ c.le.s $f2, $f22 /* ACB4CC 802409AC 08090273 */ j .L802409CC -/* ACB4D0 802409B0 00000000 */ nop +/* ACB4D0 802409B0 00000000 */ nop .L802409B4: /* ACB4D4 802409B4 4618103E */ c.le.s $f2, $f24 -/* ACB4D8 802409B8 00000000 */ nop +/* ACB4D8 802409B8 00000000 */ nop /* ACB4DC 802409BC 45000005 */ bc1f .L802409D4 /* ACB4E0 802409C0 0000882D */ daddu $s1, $zero, $zero /* ACB4E4 802409C4 4616A03E */ c.le.s $f20, $f22 -/* ACB4E8 802409C8 00000000 */ nop +/* ACB4E8 802409C8 00000000 */ nop .L802409CC: /* ACB4EC 802409CC 45030001 */ bc1tl .L802409D4 /* ACB4F0 802409D0 24110001 */ addiu $s1, $zero, 1 @@ -110,13 +110,13 @@ glabel func_802408A0_ACB3C0 /* ACB554 80240A34 860200A6 */ lh $v0, 0xa6($s0) /* ACB558 80240A38 27A60028 */ addiu $a2, $sp, 0x28 /* ACB55C 80240A3C 44820000 */ mtc1 $v0, $f0 -/* ACB560 80240A40 00000000 */ nop +/* ACB560 80240A40 00000000 */ nop /* ACB564 80240A44 46800020 */ cvt.s.w $f0, $f0 /* ACB568 80240A48 E7A00018 */ swc1 $f0, 0x18($sp) /* ACB56C 80240A4C 860200A8 */ lh $v0, 0xa8($s0) /* ACB570 80240A50 27A70024 */ addiu $a3, $sp, 0x24 /* ACB574 80240A54 44820000 */ mtc1 $v0, $f0 -/* ACB578 80240A58 00000000 */ nop +/* ACB578 80240A58 00000000 */ nop /* ACB57C 80240A5C 46800020 */ cvt.s.w $f0, $f0 /* ACB580 80240A60 0C0376B9 */ jal func_800DDAE4 /* ACB584 80240A64 E7A0001C */ swc1 $f0, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240B5C_ACB67C.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240B5C_ACB67C.s index 1181ec36be..200c1863d9 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240B5C_ACB67C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240B5C_ACB67C.s @@ -84,7 +84,7 @@ glabel func_80240B5C_ACB67C /* ACB7B8 80240C98 0C00A7B5 */ jal dist2D /* ACB7BC 80240C9C 0000802D */ daddu $s0, $zero, $zero /* ACB7C0 80240CA0 4616003E */ c.le.s $f0, $f22 -/* ACB7C4 80240CA4 00000000 */ nop +/* ACB7C4 80240CA4 00000000 */ nop /* ACB7C8 80240CA8 45000002 */ bc1f .L80240CB4 /* ACB7CC 80240CAC 0240982D */ daddu $s3, $s2, $zero /* ACB7D0 80240CB0 24100001 */ addiu $s0, $zero, 1 @@ -122,7 +122,7 @@ glabel func_80240B5C_ACB67C /* ACB84C 80240D2C 0C00A7B5 */ jal dist2D /* ACB850 80240D30 8E470030 */ lw $a3, 0x30($s2) /* ACB854 80240D34 461A003E */ c.le.s $f0, $f26 -/* ACB858 80240D38 00000000 */ nop +/* ACB858 80240D38 00000000 */ nop /* ACB85C 80240D3C 45030001 */ bc1tl .L80240D44 /* ACB860 80240D40 36100010 */ ori $s0, $s0, 0x10 .L80240D44: @@ -153,13 +153,13 @@ glabel func_80240B5C_ACB67C /* ACB8C4 80240DA4 862200A6 */ lh $v0, 0xa6($s1) /* ACB8C8 80240DA8 27A60028 */ addiu $a2, $sp, 0x28 /* ACB8CC 80240DAC 44820000 */ mtc1 $v0, $f0 -/* ACB8D0 80240DB0 00000000 */ nop +/* ACB8D0 80240DB0 00000000 */ nop /* ACB8D4 80240DB4 46800020 */ cvt.s.w $f0, $f0 /* ACB8D8 80240DB8 E7A00018 */ swc1 $f0, 0x18($sp) /* ACB8DC 80240DBC 862200A8 */ lh $v0, 0xa8($s1) /* ACB8E0 80240DC0 0280382D */ daddu $a3, $s4, $zero /* ACB8E4 80240DC4 44820000 */ mtc1 $v0, $f0 -/* ACB8E8 80240DC8 00000000 */ nop +/* ACB8E8 80240DC8 00000000 */ nop /* ACB8EC 80240DCC 46800020 */ cvt.s.w $f0, $f0 /* ACB8F0 80240DD0 0C0376B9 */ jal func_800DDAE4 /* ACB8F4 80240DD4 E7A0001C */ swc1 $f0, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240E34_ACB954.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240E34_ACB954.s index 4b40b203e4..77aecb79c5 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240E34_ACB954.s +++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240E34_ACB954.s @@ -31,18 +31,18 @@ glabel func_80240E34_ACB954 /* ACB9BC 80240E9C 0C0B1EAF */ jal get_variable /* ACB9C0 80240EA0 0040802D */ daddu $s0, $v0, $zero /* ACB9C4 80240EA4 44901000 */ mtc1 $s0, $f2 -/* ACB9C8 80240EA8 00000000 */ nop +/* ACB9C8 80240EA8 00000000 */ nop /* ACB9CC 80240EAC 468010A0 */ cvt.s.w $f2, $f2 /* ACB9D0 80240EB0 44936000 */ mtc1 $s3, $f12 -/* ACB9D4 80240EB4 00000000 */ nop +/* ACB9D4 80240EB4 00000000 */ nop /* ACB9D8 80240EB8 46806320 */ cvt.s.w $f12, $f12 /* ACB9DC 80240EBC 44061000 */ mfc1 $a2, $f2 /* ACB9E0 80240EC0 44821000 */ mtc1 $v0, $f2 -/* ACB9E4 80240EC4 00000000 */ nop +/* ACB9E4 80240EC4 00000000 */ nop /* ACB9E8 80240EC8 468010A0 */ cvt.s.w $f2, $f2 /* ACB9EC 80240ECC 44071000 */ mfc1 $a3, $f2 /* ACB9F0 80240ED0 44927000 */ mtc1 $s2, $f14 -/* ACB9F4 80240ED4 00000000 */ nop +/* ACB9F4 80240ED4 00000000 */ nop /* ACB9F8 80240ED8 0C00A720 */ jal atan2 /* ACB9FC 80240EDC 468073A0 */ cvt.s.w $f14, $f14 /* ACBA00 80240EE0 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F60_ACBA80.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F60_ACBA80.s index 7cb5b425c4..2e9d920dc5 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F60_ACBA80.s +++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F60_ACBA80.s @@ -41,7 +41,7 @@ glabel func_80240F60_ACBA80 /* ACBB10 80240FF0 0C00A7B5 */ jal dist2D /* ACBB14 80240FF4 24140001 */ addiu $s4, $zero, 1 /* ACBB18 80240FF8 4618003C */ c.lt.s $f0, $f24 -/* ACBB1C 80240FFC 00000000 */ nop +/* ACBB1C 80240FFC 00000000 */ nop /* ACBB20 80241000 45030001 */ bc1tl .L80241008 /* ACBB24 80241004 0000A02D */ daddu $s4, $zero, $zero .L80241008: @@ -56,13 +56,13 @@ glabel func_80240F60_ACBA80 /* ACBB48 80241028 0C00A8BB */ jal sin_deg /* ACBB4C 8024102C 4600A306 */ mov.s $f12, $f20 /* ACBB50 80241030 46180002 */ mul.s $f0, $f0, $f24 -/* ACBB54 80241034 00000000 */ nop +/* ACBB54 80241034 00000000 */ nop /* ACBB58 80241038 C6560028 */ lwc1 $f22, 0x28($s2) /* ACBB5C 8024103C 4600B580 */ add.s $f22, $f22, $f0 /* ACBB60 80241040 0C00A8D4 */ jal cos_deg /* ACBB64 80241044 4600A306 */ mov.s $f12, $f20 /* ACBB68 80241048 46180002 */ mul.s $f0, $f0, $f24 -/* ACBB6C 8024104C 00000000 */ nop +/* ACBB6C 8024104C 00000000 */ nop /* ACBB70 80241050 0260202D */ daddu $a0, $s3, $zero /* ACBB74 80241054 02A0282D */ daddu $a1, $s5, $zero /* ACBB78 80241058 C6540030 */ lwc1 $f20, 0x30($s2) @@ -95,4 +95,4 @@ glabel func_80240F60_ACBA80 /* ACBBE0 802410C0 D7B40038 */ ldc1 $f20, 0x38($sp) /* ACBBE4 802410C4 03E00008 */ jr $ra /* ACBBE8 802410C8 27BD0050 */ addiu $sp, $sp, 0x50 -/* ACBBEC 802410CC 00000000 */ nop +/* ACBBEC 802410CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s b/asm/nonmatchings/world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s index e1c1fc0aec..eca7cb8466 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s +++ b/asm/nonmatchings/world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s @@ -10,10 +10,10 @@ glabel func_80240034_ACE174 /* ACE188 80240048 8FBF0010 */ lw $ra, 0x10($sp) /* ACE18C 8024004C 4600008D */ trunc.w.s $f2, $f0 /* ACE190 80240050 44021000 */ mfc1 $v0, $f2 -/* ACE194 80240054 00000000 */ nop +/* ACE194 80240054 00000000 */ nop /* ACE198 80240058 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) /* ACE19C 8024005C A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) /* ACE1A0 80240060 24020002 */ addiu $v0, $zero, 2 /* ACE1A4 80240064 03E00008 */ jr $ra /* ACE1A8 80240068 27BD0018 */ addiu $sp, $sp, 0x18 -/* ACE1AC 8024006C 00000000 */ nop +/* ACE1AC 8024006C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_802400B0_ACE1F0.s b/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_802400B0_ACE1F0.s index d557b32dcc..bbd05eb160 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_802400B0_ACE1F0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_802400B0_ACE1F0.s @@ -55,30 +55,30 @@ glabel func_802400B0_ACE1F0 /* ACE2B8 80240178 D4225F10 */ ldc1 $f2, %lo(D_80245F10)($at) /* ACE2BC 8024017C 46002121 */ cvt.d.s $f4, $f4 /* ACE2C0 80240180 46222032 */ c.eq.d $f4, $f2 -/* ACE2C4 80240184 00000000 */ nop +/* ACE2C4 80240184 00000000 */ nop /* ACE2C8 80240188 45010007 */ bc1t .L802401A8 /* ACE2CC 8024018C 46000086 */ mov.s $f2, $f0 /* ACE2D0 80240190 3C018024 */ lui $at, %hi(D_80245F18) /* ACE2D4 80240194 D4205F18 */ ldc1 $f0, %lo(D_80245F18)($at) /* ACE2D8 80240198 46202032 */ c.eq.d $f4, $f0 -/* ACE2DC 8024019C 00000000 */ nop +/* ACE2DC 8024019C 00000000 */ nop /* ACE2E0 802401A0 45000008 */ bc1f .L802401C4 -/* ACE2E4 802401A4 00000000 */ nop +/* ACE2E4 802401A4 00000000 */ nop .L802401A8: /* ACE2E8 802401A8 4618A03E */ c.le.s $f20, $f24 -/* ACE2EC 802401AC 00000000 */ nop +/* ACE2EC 802401AC 00000000 */ nop /* ACE2F0 802401B0 4500000C */ bc1f .L802401E4 /* ACE2F4 802401B4 0000882D */ daddu $s1, $zero, $zero /* ACE2F8 802401B8 4616103E */ c.le.s $f2, $f22 /* ACE2FC 802401BC 08090077 */ j .L802401DC -/* ACE300 802401C0 00000000 */ nop +/* ACE300 802401C0 00000000 */ nop .L802401C4: /* ACE304 802401C4 4618103E */ c.le.s $f2, $f24 -/* ACE308 802401C8 00000000 */ nop +/* ACE308 802401C8 00000000 */ nop /* ACE30C 802401CC 45000005 */ bc1f .L802401E4 /* ACE310 802401D0 0000882D */ daddu $s1, $zero, $zero /* ACE314 802401D4 4616A03E */ c.le.s $f20, $f22 -/* ACE318 802401D8 00000000 */ nop +/* ACE318 802401D8 00000000 */ nop .L802401DC: /* ACE31C 802401DC 45030001 */ bc1tl .L802401E4 /* ACE320 802401E0 24110001 */ addiu $s1, $zero, 1 @@ -110,13 +110,13 @@ glabel func_802400B0_ACE1F0 /* ACE384 80240244 860200A6 */ lh $v0, 0xa6($s0) /* ACE388 80240248 27A60028 */ addiu $a2, $sp, 0x28 /* ACE38C 8024024C 44820000 */ mtc1 $v0, $f0 -/* ACE390 80240250 00000000 */ nop +/* ACE390 80240250 00000000 */ nop /* ACE394 80240254 46800020 */ cvt.s.w $f0, $f0 /* ACE398 80240258 E7A00018 */ swc1 $f0, 0x18($sp) /* ACE39C 8024025C 860200A8 */ lh $v0, 0xa8($s0) /* ACE3A0 80240260 27A70024 */ addiu $a3, $sp, 0x24 /* ACE3A4 80240264 44820000 */ mtc1 $v0, $f0 -/* ACE3A8 80240268 00000000 */ nop +/* ACE3A8 80240268 00000000 */ nop /* ACE3AC 8024026C 46800020 */ cvt.s.w $f0, $f0 /* ACE3B0 80240270 0C0376B9 */ jal func_800DDAE4 /* ACE3B4 80240274 E7A0001C */ swc1 $f0, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_8024036C_ACE4AC.s b/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_8024036C_ACE4AC.s index ee2bddbdf0..db001a893a 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_8024036C_ACE4AC.s +++ b/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_8024036C_ACE4AC.s @@ -84,7 +84,7 @@ glabel func_8024036C_ACE4AC /* ACE5E8 802404A8 0C00A7B5 */ jal dist2D /* ACE5EC 802404AC 0000802D */ daddu $s0, $zero, $zero /* ACE5F0 802404B0 4616003E */ c.le.s $f0, $f22 -/* ACE5F4 802404B4 00000000 */ nop +/* ACE5F4 802404B4 00000000 */ nop /* ACE5F8 802404B8 45000002 */ bc1f .L802404C4 /* ACE5FC 802404BC 0240982D */ daddu $s3, $s2, $zero /* ACE600 802404C0 24100001 */ addiu $s0, $zero, 1 @@ -122,7 +122,7 @@ glabel func_8024036C_ACE4AC /* ACE67C 8024053C 0C00A7B5 */ jal dist2D /* ACE680 80240540 8E470030 */ lw $a3, 0x30($s2) /* ACE684 80240544 461A003E */ c.le.s $f0, $f26 -/* ACE688 80240548 00000000 */ nop +/* ACE688 80240548 00000000 */ nop /* ACE68C 8024054C 45030001 */ bc1tl .L80240554 /* ACE690 80240550 36100010 */ ori $s0, $s0, 0x10 .L80240554: @@ -153,13 +153,13 @@ glabel func_8024036C_ACE4AC /* ACE6F4 802405B4 862200A6 */ lh $v0, 0xa6($s1) /* ACE6F8 802405B8 27A60028 */ addiu $a2, $sp, 0x28 /* ACE6FC 802405BC 44820000 */ mtc1 $v0, $f0 -/* ACE700 802405C0 00000000 */ nop +/* ACE700 802405C0 00000000 */ nop /* ACE704 802405C4 46800020 */ cvt.s.w $f0, $f0 /* ACE708 802405C8 E7A00018 */ swc1 $f0, 0x18($sp) /* ACE70C 802405CC 862200A8 */ lh $v0, 0xa8($s1) /* ACE710 802405D0 0280382D */ daddu $a3, $s4, $zero /* ACE714 802405D4 44820000 */ mtc1 $v0, $f0 -/* ACE718 802405D8 00000000 */ nop +/* ACE718 802405D8 00000000 */ nop /* ACE71C 802405DC 46800020 */ cvt.s.w $f0, $f0 /* ACE720 802405E0 0C0376B9 */ jal func_800DDAE4 /* ACE724 802405E4 E7A0001C */ swc1 $f0, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_80240644_ACE784.s b/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_80240644_ACE784.s index cbc583ce69..fe7b7f25ea 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_80240644_ACE784.s +++ b/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_80240644_ACE784.s @@ -31,18 +31,18 @@ glabel func_80240644_ACE784 /* ACE7EC 802406AC 0C0B1EAF */ jal get_variable /* ACE7F0 802406B0 0040802D */ daddu $s0, $v0, $zero /* ACE7F4 802406B4 44901000 */ mtc1 $s0, $f2 -/* ACE7F8 802406B8 00000000 */ nop +/* ACE7F8 802406B8 00000000 */ nop /* ACE7FC 802406BC 468010A0 */ cvt.s.w $f2, $f2 /* ACE800 802406C0 44936000 */ mtc1 $s3, $f12 -/* ACE804 802406C4 00000000 */ nop +/* ACE804 802406C4 00000000 */ nop /* ACE808 802406C8 46806320 */ cvt.s.w $f12, $f12 /* ACE80C 802406CC 44061000 */ mfc1 $a2, $f2 /* ACE810 802406D0 44821000 */ mtc1 $v0, $f2 -/* ACE814 802406D4 00000000 */ nop +/* ACE814 802406D4 00000000 */ nop /* ACE818 802406D8 468010A0 */ cvt.s.w $f2, $f2 /* ACE81C 802406DC 44071000 */ mfc1 $a3, $f2 /* ACE820 802406E0 44927000 */ mtc1 $s2, $f14 -/* ACE824 802406E4 00000000 */ nop +/* ACE824 802406E4 00000000 */ nop /* ACE828 802406E8 0C00A720 */ jal atan2 /* ACE82C 802406EC 468073A0 */ cvt.s.w $f14, $f14 /* ACE830 802406F0 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_80240728_ACE868.s b/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_80240728_ACE868.s index fa0354eeb8..eb749845ac 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_80240728_ACE868.s +++ b/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_80240728_ACE868.s @@ -41,7 +41,7 @@ glabel func_80240728_ACE868 /* ACE8F8 802407B8 0C00A7B5 */ jal dist2D /* ACE8FC 802407BC 24140001 */ addiu $s4, $zero, 1 /* ACE900 802407C0 4618003C */ c.lt.s $f0, $f24 -/* ACE904 802407C4 00000000 */ nop +/* ACE904 802407C4 00000000 */ nop /* ACE908 802407C8 45030001 */ bc1tl .L802407D0 /* ACE90C 802407CC 0000A02D */ daddu $s4, $zero, $zero .L802407D0: @@ -56,13 +56,13 @@ glabel func_80240728_ACE868 /* ACE930 802407F0 0C00A8BB */ jal sin_deg /* ACE934 802407F4 4600A306 */ mov.s $f12, $f20 /* ACE938 802407F8 46180002 */ mul.s $f0, $f0, $f24 -/* ACE93C 802407FC 00000000 */ nop +/* ACE93C 802407FC 00000000 */ nop /* ACE940 80240800 C6560028 */ lwc1 $f22, 0x28($s2) /* ACE944 80240804 4600B580 */ add.s $f22, $f22, $f0 /* ACE948 80240808 0C00A8D4 */ jal cos_deg /* ACE94C 8024080C 4600A306 */ mov.s $f12, $f20 /* ACE950 80240810 46180002 */ mul.s $f0, $f0, $f24 -/* ACE954 80240814 00000000 */ nop +/* ACE954 80240814 00000000 */ nop /* ACE958 80240818 0260202D */ daddu $a0, $s3, $zero /* ACE95C 8024081C 02A0282D */ daddu $a1, $s5, $zero /* ACE960 80240820 C6540030 */ lwc1 $f20, 0x30($s2) @@ -95,6 +95,6 @@ glabel func_80240728_ACE868 /* ACE9C8 80240888 D7B40038 */ ldc1 $f20, 0x38($sp) /* ACE9CC 8024088C 03E00008 */ jr $ra /* ACE9D0 80240890 27BD0050 */ addiu $sp, $sp, 0x50 -/* ACE9D4 80240894 00000000 */ nop -/* ACE9D8 80240898 00000000 */ nop -/* ACE9DC 8024089C 00000000 */ nop +/* ACE9D4 80240894 00000000 */ nop +/* ACE9D8 80240898 00000000 */ nop +/* ACE9DC 8024089C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_802408A0_ACE9E0.s b/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_802408A0_ACE9E0.s index cc685e9fe9..ebd9489ddc 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_802408A0_ACE9E0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_802408A0_ACE9E0.s @@ -55,30 +55,30 @@ glabel func_802408A0_ACE9E0 /* ACEAA8 80240968 D4225F30 */ ldc1 $f2, %lo(D_80245F30)($at) /* ACEAAC 8024096C 46002121 */ cvt.d.s $f4, $f4 /* ACEAB0 80240970 46222032 */ c.eq.d $f4, $f2 -/* ACEAB4 80240974 00000000 */ nop +/* ACEAB4 80240974 00000000 */ nop /* ACEAB8 80240978 45010007 */ bc1t .L80240998 /* ACEABC 8024097C 46000086 */ mov.s $f2, $f0 /* ACEAC0 80240980 3C018024 */ lui $at, %hi(D_80245F38) /* ACEAC4 80240984 D4205F38 */ ldc1 $f0, %lo(D_80245F38)($at) /* ACEAC8 80240988 46202032 */ c.eq.d $f4, $f0 -/* ACEACC 8024098C 00000000 */ nop +/* ACEACC 8024098C 00000000 */ nop /* ACEAD0 80240990 45000008 */ bc1f .L802409B4 -/* ACEAD4 80240994 00000000 */ nop +/* ACEAD4 80240994 00000000 */ nop .L80240998: /* ACEAD8 80240998 4618A03E */ c.le.s $f20, $f24 -/* ACEADC 8024099C 00000000 */ nop +/* ACEADC 8024099C 00000000 */ nop /* ACEAE0 802409A0 4500000C */ bc1f .L802409D4 /* ACEAE4 802409A4 0000882D */ daddu $s1, $zero, $zero /* ACEAE8 802409A8 4616103E */ c.le.s $f2, $f22 /* ACEAEC 802409AC 08090273 */ j .L802409CC -/* ACEAF0 802409B0 00000000 */ nop +/* ACEAF0 802409B0 00000000 */ nop .L802409B4: /* ACEAF4 802409B4 4618103E */ c.le.s $f2, $f24 -/* ACEAF8 802409B8 00000000 */ nop +/* ACEAF8 802409B8 00000000 */ nop /* ACEAFC 802409BC 45000005 */ bc1f .L802409D4 /* ACEB00 802409C0 0000882D */ daddu $s1, $zero, $zero /* ACEB04 802409C4 4616A03E */ c.le.s $f20, $f22 -/* ACEB08 802409C8 00000000 */ nop +/* ACEB08 802409C8 00000000 */ nop .L802409CC: /* ACEB0C 802409CC 45030001 */ bc1tl .L802409D4 /* ACEB10 802409D0 24110001 */ addiu $s1, $zero, 1 @@ -110,13 +110,13 @@ glabel func_802408A0_ACE9E0 /* ACEB74 80240A34 860200A6 */ lh $v0, 0xa6($s0) /* ACEB78 80240A38 27A60028 */ addiu $a2, $sp, 0x28 /* ACEB7C 80240A3C 44820000 */ mtc1 $v0, $f0 -/* ACEB80 80240A40 00000000 */ nop +/* ACEB80 80240A40 00000000 */ nop /* ACEB84 80240A44 46800020 */ cvt.s.w $f0, $f0 /* ACEB88 80240A48 E7A00018 */ swc1 $f0, 0x18($sp) /* ACEB8C 80240A4C 860200A8 */ lh $v0, 0xa8($s0) /* ACEB90 80240A50 27A70024 */ addiu $a3, $sp, 0x24 /* ACEB94 80240A54 44820000 */ mtc1 $v0, $f0 -/* ACEB98 80240A58 00000000 */ nop +/* ACEB98 80240A58 00000000 */ nop /* ACEB9C 80240A5C 46800020 */ cvt.s.w $f0, $f0 /* ACEBA0 80240A60 0C0376B9 */ jal func_800DDAE4 /* ACEBA4 80240A64 E7A0001C */ swc1 $f0, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240B5C_ACEC9C.s b/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240B5C_ACEC9C.s index fef5f93b47..3b87bb46c0 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240B5C_ACEC9C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240B5C_ACEC9C.s @@ -84,7 +84,7 @@ glabel func_80240B5C_ACEC9C /* ACEDD8 80240C98 0C00A7B5 */ jal dist2D /* ACEDDC 80240C9C 0000802D */ daddu $s0, $zero, $zero /* ACEDE0 80240CA0 4616003E */ c.le.s $f0, $f22 -/* ACEDE4 80240CA4 00000000 */ nop +/* ACEDE4 80240CA4 00000000 */ nop /* ACEDE8 80240CA8 45000002 */ bc1f .L80240CB4 /* ACEDEC 80240CAC 0240982D */ daddu $s3, $s2, $zero /* ACEDF0 80240CB0 24100001 */ addiu $s0, $zero, 1 @@ -122,7 +122,7 @@ glabel func_80240B5C_ACEC9C /* ACEE6C 80240D2C 0C00A7B5 */ jal dist2D /* ACEE70 80240D30 8E470030 */ lw $a3, 0x30($s2) /* ACEE74 80240D34 461A003E */ c.le.s $f0, $f26 -/* ACEE78 80240D38 00000000 */ nop +/* ACEE78 80240D38 00000000 */ nop /* ACEE7C 80240D3C 45030001 */ bc1tl .L80240D44 /* ACEE80 80240D40 36100010 */ ori $s0, $s0, 0x10 .L80240D44: @@ -153,13 +153,13 @@ glabel func_80240B5C_ACEC9C /* ACEEE4 80240DA4 862200A6 */ lh $v0, 0xa6($s1) /* ACEEE8 80240DA8 27A60028 */ addiu $a2, $sp, 0x28 /* ACEEEC 80240DAC 44820000 */ mtc1 $v0, $f0 -/* ACEEF0 80240DB0 00000000 */ nop +/* ACEEF0 80240DB0 00000000 */ nop /* ACEEF4 80240DB4 46800020 */ cvt.s.w $f0, $f0 /* ACEEF8 80240DB8 E7A00018 */ swc1 $f0, 0x18($sp) /* ACEEFC 80240DBC 862200A8 */ lh $v0, 0xa8($s1) /* ACEF00 80240DC0 0280382D */ daddu $a3, $s4, $zero /* ACEF04 80240DC4 44820000 */ mtc1 $v0, $f0 -/* ACEF08 80240DC8 00000000 */ nop +/* ACEF08 80240DC8 00000000 */ nop /* ACEF0C 80240DCC 46800020 */ cvt.s.w $f0, $f0 /* ACEF10 80240DD0 0C0376B9 */ jal func_800DDAE4 /* ACEF14 80240DD4 E7A0001C */ swc1 $f0, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240E34_ACEF74.s b/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240E34_ACEF74.s index c5252c1b3c..28189093ac 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240E34_ACEF74.s +++ b/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240E34_ACEF74.s @@ -31,18 +31,18 @@ glabel func_80240E34_ACEF74 /* ACEFDC 80240E9C 0C0B1EAF */ jal get_variable /* ACEFE0 80240EA0 0040802D */ daddu $s0, $v0, $zero /* ACEFE4 80240EA4 44901000 */ mtc1 $s0, $f2 -/* ACEFE8 80240EA8 00000000 */ nop +/* ACEFE8 80240EA8 00000000 */ nop /* ACEFEC 80240EAC 468010A0 */ cvt.s.w $f2, $f2 /* ACEFF0 80240EB0 44936000 */ mtc1 $s3, $f12 -/* ACEFF4 80240EB4 00000000 */ nop +/* ACEFF4 80240EB4 00000000 */ nop /* ACEFF8 80240EB8 46806320 */ cvt.s.w $f12, $f12 /* ACEFFC 80240EBC 44061000 */ mfc1 $a2, $f2 /* ACF000 80240EC0 44821000 */ mtc1 $v0, $f2 -/* ACF004 80240EC4 00000000 */ nop +/* ACF004 80240EC4 00000000 */ nop /* ACF008 80240EC8 468010A0 */ cvt.s.w $f2, $f2 /* ACF00C 80240ECC 44071000 */ mfc1 $a3, $f2 /* ACF010 80240ED0 44927000 */ mtc1 $s2, $f14 -/* ACF014 80240ED4 00000000 */ nop +/* ACF014 80240ED4 00000000 */ nop /* ACF018 80240ED8 0C00A720 */ jal atan2 /* ACF01C 80240EDC 468073A0 */ cvt.s.w $f14, $f14 /* ACF020 80240EE0 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F60_ACF0A0.s b/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F60_ACF0A0.s index 1db34a3b1e..e27a0a85a1 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F60_ACF0A0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F60_ACF0A0.s @@ -41,7 +41,7 @@ glabel func_80240F60_ACF0A0 /* ACF130 80240FF0 0C00A7B5 */ jal dist2D /* ACF134 80240FF4 24140001 */ addiu $s4, $zero, 1 /* ACF138 80240FF8 4618003C */ c.lt.s $f0, $f24 -/* ACF13C 80240FFC 00000000 */ nop +/* ACF13C 80240FFC 00000000 */ nop /* ACF140 80241000 45030001 */ bc1tl .L80241008 /* ACF144 80241004 0000A02D */ daddu $s4, $zero, $zero .L80241008: @@ -56,13 +56,13 @@ glabel func_80240F60_ACF0A0 /* ACF168 80241028 0C00A8BB */ jal sin_deg /* ACF16C 8024102C 4600A306 */ mov.s $f12, $f20 /* ACF170 80241030 46180002 */ mul.s $f0, $f0, $f24 -/* ACF174 80241034 00000000 */ nop +/* ACF174 80241034 00000000 */ nop /* ACF178 80241038 C6560028 */ lwc1 $f22, 0x28($s2) /* ACF17C 8024103C 4600B580 */ add.s $f22, $f22, $f0 /* ACF180 80241040 0C00A8D4 */ jal cos_deg /* ACF184 80241044 4600A306 */ mov.s $f12, $f20 /* ACF188 80241048 46180002 */ mul.s $f0, $f0, $f24 -/* ACF18C 8024104C 00000000 */ nop +/* ACF18C 8024104C 00000000 */ nop /* ACF190 80241050 0260202D */ daddu $a0, $s3, $zero /* ACF194 80241054 02A0282D */ daddu $a1, $s5, $zero /* ACF198 80241058 C6540030 */ lwc1 $f20, 0x30($s2) @@ -95,4 +95,4 @@ glabel func_80240F60_ACF0A0 /* ACF200 802410C0 D7B40038 */ ldc1 $f20, 0x38($sp) /* ACF204 802410C4 03E00008 */ jr $ra /* ACF208 802410C8 27BD0050 */ addiu $sp, $sp, 0x50 -/* ACF20C 802410CC 00000000 */ nop +/* ACF20C 802410CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s b/asm/nonmatchings/world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s index bef78bbf6a..e24d38021f 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s +++ b/asm/nonmatchings/world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s @@ -10,10 +10,10 @@ glabel func_80240034_AD40C4 /* AD40D8 80240048 8FBF0010 */ lw $ra, 0x10($sp) /* AD40DC 8024004C 4600008D */ trunc.w.s $f2, $f0 /* AD40E0 80240050 44021000 */ mfc1 $v0, $f2 -/* AD40E4 80240054 00000000 */ nop +/* AD40E4 80240054 00000000 */ nop /* AD40E8 80240058 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) /* AD40EC 8024005C A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) /* AD40F0 80240060 24020002 */ addiu $v0, $zero, 2 /* AD40F4 80240064 03E00008 */ jr $ra /* AD40F8 80240068 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD40FC 8024006C 00000000 */ nop +/* AD40FC 8024006C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240070_AD4100.s b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240070_AD4100.s index 1562fe0ec8..77add8ccdd 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240070_AD4100.s +++ b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240070_AD4100.s @@ -55,30 +55,30 @@ glabel func_80240070_AD4100 /* AD41C8 80240138 D4221E20 */ ldc1 $f2, %lo(D_80241E20)($at) /* AD41CC 8024013C 46002121 */ cvt.d.s $f4, $f4 /* AD41D0 80240140 46222032 */ c.eq.d $f4, $f2 -/* AD41D4 80240144 00000000 */ nop +/* AD41D4 80240144 00000000 */ nop /* AD41D8 80240148 45010007 */ bc1t .L80240168 /* AD41DC 8024014C 46000086 */ mov.s $f2, $f0 /* AD41E0 80240150 3C018024 */ lui $at, %hi(func_80241E28_853F98) /* AD41E4 80240154 D4201E28 */ ldc1 $f0, %lo(func_80241E28_853F98)($at) /* AD41E8 80240158 46202032 */ c.eq.d $f4, $f0 -/* AD41EC 8024015C 00000000 */ nop +/* AD41EC 8024015C 00000000 */ nop /* AD41F0 80240160 45000008 */ bc1f .L80240184 -/* AD41F4 80240164 00000000 */ nop +/* AD41F4 80240164 00000000 */ nop .L80240168: /* AD41F8 80240168 4618A03E */ c.le.s $f20, $f24 -/* AD41FC 8024016C 00000000 */ nop +/* AD41FC 8024016C 00000000 */ nop /* AD4200 80240170 4500000C */ bc1f .L802401A4 /* AD4204 80240174 0000882D */ daddu $s1, $zero, $zero /* AD4208 80240178 4616103E */ c.le.s $f2, $f22 /* AD420C 8024017C 08090067 */ j .L8024019C -/* AD4210 80240180 00000000 */ nop +/* AD4210 80240180 00000000 */ nop .L80240184: /* AD4214 80240184 4618103E */ c.le.s $f2, $f24 -/* AD4218 80240188 00000000 */ nop +/* AD4218 80240188 00000000 */ nop /* AD421C 8024018C 45000005 */ bc1f .L802401A4 /* AD4220 80240190 0000882D */ daddu $s1, $zero, $zero /* AD4224 80240194 4616A03E */ c.le.s $f20, $f22 -/* AD4228 80240198 00000000 */ nop +/* AD4228 80240198 00000000 */ nop .L8024019C: /* AD422C 8024019C 45030001 */ bc1tl .L802401A4 /* AD4230 802401A0 24110001 */ addiu $s1, $zero, 1 @@ -110,13 +110,13 @@ glabel func_80240070_AD4100 /* AD4294 80240204 860200A6 */ lh $v0, 0xa6($s0) /* AD4298 80240208 27A60028 */ addiu $a2, $sp, 0x28 /* AD429C 8024020C 44820000 */ mtc1 $v0, $f0 -/* AD42A0 80240210 00000000 */ nop +/* AD42A0 80240210 00000000 */ nop /* AD42A4 80240214 46800020 */ cvt.s.w $f0, $f0 /* AD42A8 80240218 E7A00018 */ swc1 $f0, 0x18($sp) /* AD42AC 8024021C 860200A8 */ lh $v0, 0xa8($s0) /* AD42B0 80240220 27A70024 */ addiu $a3, $sp, 0x24 /* AD42B4 80240224 44820000 */ mtc1 $v0, $f0 -/* AD42B8 80240228 00000000 */ nop +/* AD42B8 80240228 00000000 */ nop /* AD42BC 8024022C 46800020 */ cvt.s.w $f0, $f0 /* AD42C0 80240230 0C0376B9 */ jal func_800DDAE4 /* AD42C4 80240234 E7A0001C */ swc1 $f0, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_8024032C_AD43BC.s b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_8024032C_AD43BC.s index 90e025ce4f..2d4f5c2b37 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_8024032C_AD43BC.s +++ b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_8024032C_AD43BC.s @@ -84,7 +84,7 @@ glabel func_8024032C_AD43BC /* AD44F8 80240468 0C00A7B5 */ jal dist2D /* AD44FC 8024046C 0000802D */ daddu $s0, $zero, $zero /* AD4500 80240470 4616003E */ c.le.s $f0, $f22 -/* AD4504 80240474 00000000 */ nop +/* AD4504 80240474 00000000 */ nop /* AD4508 80240478 45000002 */ bc1f .L80240484 /* AD450C 8024047C 0240982D */ daddu $s3, $s2, $zero /* AD4510 80240480 24100001 */ addiu $s0, $zero, 1 @@ -122,7 +122,7 @@ glabel func_8024032C_AD43BC /* AD458C 802404FC 0C00A7B5 */ jal dist2D /* AD4590 80240500 8E470030 */ lw $a3, 0x30($s2) /* AD4594 80240504 461A003E */ c.le.s $f0, $f26 -/* AD4598 80240508 00000000 */ nop +/* AD4598 80240508 00000000 */ nop /* AD459C 8024050C 45030001 */ bc1tl .L80240514 /* AD45A0 80240510 36100010 */ ori $s0, $s0, 0x10 .L80240514: @@ -153,13 +153,13 @@ glabel func_8024032C_AD43BC /* AD4604 80240574 862200A6 */ lh $v0, 0xa6($s1) /* AD4608 80240578 27A60028 */ addiu $a2, $sp, 0x28 /* AD460C 8024057C 44820000 */ mtc1 $v0, $f0 -/* AD4610 80240580 00000000 */ nop +/* AD4610 80240580 00000000 */ nop /* AD4614 80240584 46800020 */ cvt.s.w $f0, $f0 /* AD4618 80240588 E7A00018 */ swc1 $f0, 0x18($sp) /* AD461C 8024058C 862200A8 */ lh $v0, 0xa8($s1) /* AD4620 80240590 0280382D */ daddu $a3, $s4, $zero /* AD4624 80240594 44820000 */ mtc1 $v0, $f0 -/* AD4628 80240598 00000000 */ nop +/* AD4628 80240598 00000000 */ nop /* AD462C 8024059C 46800020 */ cvt.s.w $f0, $f0 /* AD4630 802405A0 0C0376B9 */ jal func_800DDAE4 /* AD4634 802405A4 E7A0001C */ swc1 $f0, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240604_AD4694.s b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240604_AD4694.s index a08b1e3a71..862bf6c9cb 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240604_AD4694.s +++ b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240604_AD4694.s @@ -31,18 +31,18 @@ glabel func_80240604_AD4694 /* AD46FC 8024066C 0C0B1EAF */ jal get_variable /* AD4700 80240670 0040802D */ daddu $s0, $v0, $zero /* AD4704 80240674 44901000 */ mtc1 $s0, $f2 -/* AD4708 80240678 00000000 */ nop +/* AD4708 80240678 00000000 */ nop /* AD470C 8024067C 468010A0 */ cvt.s.w $f2, $f2 /* AD4710 80240680 44936000 */ mtc1 $s3, $f12 -/* AD4714 80240684 00000000 */ nop +/* AD4714 80240684 00000000 */ nop /* AD4718 80240688 46806320 */ cvt.s.w $f12, $f12 /* AD471C 8024068C 44061000 */ mfc1 $a2, $f2 /* AD4720 80240690 44821000 */ mtc1 $v0, $f2 -/* AD4724 80240694 00000000 */ nop +/* AD4724 80240694 00000000 */ nop /* AD4728 80240698 468010A0 */ cvt.s.w $f2, $f2 /* AD472C 8024069C 44071000 */ mfc1 $a3, $f2 /* AD4730 802406A0 44927000 */ mtc1 $s2, $f14 -/* AD4734 802406A4 00000000 */ nop +/* AD4734 802406A4 00000000 */ nop /* AD4738 802406A8 0C00A720 */ jal atan2 /* AD473C 802406AC 468073A0 */ cvt.s.w $f14, $f14 /* AD4740 802406B0 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240730_AD47C0.s b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240730_AD47C0.s index 7d7e177f84..f97c6e25fb 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240730_AD47C0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240730_AD47C0.s @@ -41,7 +41,7 @@ glabel func_80240730_AD47C0 /* AD4850 802407C0 0C00A7B5 */ jal dist2D /* AD4854 802407C4 24140001 */ addiu $s4, $zero, 1 /* AD4858 802407C8 4618003C */ c.lt.s $f0, $f24 -/* AD485C 802407CC 00000000 */ nop +/* AD485C 802407CC 00000000 */ nop /* AD4860 802407D0 45030001 */ bc1tl .L802407D8 /* AD4864 802407D4 0000A02D */ daddu $s4, $zero, $zero .L802407D8: @@ -56,13 +56,13 @@ glabel func_80240730_AD47C0 /* AD4888 802407F8 0C00A8BB */ jal sin_deg /* AD488C 802407FC 4600A306 */ mov.s $f12, $f20 /* AD4890 80240800 46180002 */ mul.s $f0, $f0, $f24 -/* AD4894 80240804 00000000 */ nop +/* AD4894 80240804 00000000 */ nop /* AD4898 80240808 C6560028 */ lwc1 $f22, 0x28($s2) /* AD489C 8024080C 4600B580 */ add.s $f22, $f22, $f0 /* AD48A0 80240810 0C00A8D4 */ jal cos_deg /* AD48A4 80240814 4600A306 */ mov.s $f12, $f20 /* AD48A8 80240818 46180002 */ mul.s $f0, $f0, $f24 -/* AD48AC 8024081C 00000000 */ nop +/* AD48AC 8024081C 00000000 */ nop /* AD48B0 80240820 0260202D */ daddu $a0, $s3, $zero /* AD48B4 80240824 02A0282D */ daddu $a1, $s5, $zero /* AD48B8 80240828 C6540030 */ lwc1 $f20, 0x30($s2) diff --git a/asm/nonmatchings/world/area_kkj/kkj_13/AD5ED0/func_80240000_AD5ED0.s b/asm/nonmatchings/world/area_kkj/kkj_13/AD5ED0/func_80240000_AD5ED0.s index b68e3fb78d..27d784cc2e 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_13/AD5ED0/func_80240000_AD5ED0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_13/AD5ED0/func_80240000_AD5ED0.s @@ -8,5 +8,5 @@ glabel func_80240000_AD5ED0 /* AD5EDC 8024000C A0620084 */ sb $v0, 0x84($v1) /* AD5EE0 80240010 03E00008 */ jr $ra /* AD5EE4 80240014 0000102D */ daddu $v0, $zero, $zero -/* AD5EE8 80240018 00000000 */ nop -/* AD5EEC 8024001C 00000000 */ nop +/* AD5EE8 80240018 00000000 */ nop +/* AD5EEC 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_802404E0_AD63B0.s b/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_802404E0_AD63B0.s index 161aecb2af..46f6c9535c 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_802404E0_AD63B0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_802404E0_AD63B0.s @@ -23,50 +23,50 @@ glabel func_802404E0_AD63B0 /* AD63F4 80240524 86220002 */ lh $v0, 2($s1) /* AD63F8 80240528 32500001 */ andi $s0, $s2, 1 /* AD63FC 8024052C 44826000 */ mtc1 $v0, $f12 -/* AD6400 80240530 00000000 */ nop +/* AD6400 80240530 00000000 */ nop /* AD6404 80240534 46806320 */ cvt.s.w $f12, $f12 /* AD6408 80240538 86220000 */ lh $v0, ($s1) /* AD640C 8024053C 4482A000 */ mtc1 $v0, $f20 -/* AD6410 80240540 00000000 */ nop +/* AD6410 80240540 00000000 */ nop /* AD6414 80240544 4680A520 */ cvt.s.w $f20, $f20 /* AD6418 80240548 0C00A8D4 */ jal cos_deg /* AD641C 8024054C 26100002 */ addiu $s0, $s0, 2 /* AD6420 80240550 4600A002 */ mul.s $f0, $f20, $f0 -/* AD6424 80240554 00000000 */ nop +/* AD6424 80240554 00000000 */ nop /* AD6428 80240558 3C018024 */ lui $at, %hi(D_80244FA8) /* AD642C 8024055C D4224FA8 */ ldc1 $f2, %lo(D_80244FA8)($at) /* AD6430 80240560 46000021 */ cvt.d.s $f0, $f0 /* AD6434 80240564 46220002 */ mul.d $f0, $f0, $f2 -/* AD6438 80240568 00000000 */ nop +/* AD6438 80240568 00000000 */ nop /* AD643C 8024056C 86220002 */ lh $v0, 2($s1) /* AD6440 80240570 44826000 */ mtc1 $v0, $f12 -/* AD6444 80240574 00000000 */ nop +/* AD6444 80240574 00000000 */ nop /* AD6448 80240578 46806320 */ cvt.s.w $f12, $f12 /* AD644C 8024057C 0C00A8BB */ jal sin_deg /* AD6450 80240580 46200620 */ cvt.s.d $f24, $f0 /* AD6454 80240584 4600A002 */ mul.s $f0, $f20, $f0 -/* AD6458 80240588 00000000 */ nop +/* AD6458 80240588 00000000 */ nop /* AD645C 8024058C 3C013FF8 */ lui $at, 0x3ff8 /* AD6460 80240590 44811800 */ mtc1 $at, $f3 /* AD6464 80240594 44801000 */ mtc1 $zero, $f2 /* AD6468 80240598 46000021 */ cvt.d.s $f0, $f0 /* AD646C 8024059C 46220002 */ mul.d $f0, $f0, $f2 -/* AD6470 802405A0 00000000 */ nop +/* AD6470 802405A0 00000000 */ nop /* AD6474 802405A4 4600C0A1 */ cvt.d.s $f2, $f24 /* AD6478 802405A8 463C1082 */ mul.d $f2, $f2, $f28 -/* AD647C 802405AC 00000000 */ nop +/* AD647C 802405AC 00000000 */ nop /* AD6480 802405B0 462006A0 */ cvt.s.d $f26, $f0 /* AD6484 802405B4 4600D021 */ cvt.d.s $f0, $f26 /* AD6488 802405B8 463C0002 */ mul.d $f0, $f0, $f28 -/* AD648C 802405BC 00000000 */ nop +/* AD648C 802405BC 00000000 */ nop /* AD6490 802405C0 3C014170 */ lui $at, 0x4170 /* AD6494 802405C4 44816000 */ mtc1 $at, $f12 -/* AD6498 802405C8 00000000 */ nop +/* AD6498 802405C8 00000000 */ nop /* AD649C 802405CC 460CA302 */ mul.s $f12, $f20, $f12 -/* AD64A0 802405D0 00000000 */ nop +/* AD64A0 802405D0 00000000 */ nop /* AD64A4 802405D4 3C014416 */ lui $at, 0x4416 /* AD64A8 802405D8 4481B000 */ mtc1 $at, $f22 -/* AD64AC 802405DC 00000000 */ nop +/* AD64AC 802405DC 00000000 */ nop /* AD64B0 802405E0 4616C580 */ add.s $f22, $f24, $f22 /* AD64B4 802405E4 3C0142C8 */ lui $at, 0x42c8 /* AD64B8 802405E8 4481A000 */ mtc1 $at, $f20 @@ -78,15 +78,15 @@ glabel func_802404E0_AD63B0 /* AD64D0 80240600 3C018024 */ lui $at, %hi(D_80244FB0) /* AD64D4 80240604 D4244FB0 */ ldc1 $f4, %lo(D_80244FB0)($at) /* AD64D8 80240608 44821000 */ mtc1 $v0, $f2 -/* AD64DC 8024060C 00000000 */ nop +/* AD64DC 8024060C 00000000 */ nop /* AD64E0 80240610 468010A1 */ cvt.d.w $f2, $f2 /* AD64E4 80240614 46241082 */ mul.d $f2, $f2, $f4 -/* AD64E8 80240618 00000000 */ nop +/* AD64E8 80240618 00000000 */ nop /* AD64EC 8024061C 3C0140A0 */ lui $at, 0x40a0 /* AD64F0 80240620 44812000 */ mtc1 $at, $f4 -/* AD64F4 80240624 00000000 */ nop +/* AD64F4 80240624 00000000 */ nop /* AD64F8 80240628 46040002 */ mul.s $f0, $f0, $f4 -/* AD64FC 8024062C 00000000 */ nop +/* AD64FC 8024062C 00000000 */ nop /* AD6500 80240630 0200202D */ daddu $a0, $s0, $zero /* AD6504 80240634 00021080 */ sll $v0, $v0, 2 /* AD6508 80240638 4405B000 */ mfc1 $a1, $f22 @@ -110,10 +110,10 @@ glabel func_802404E0_AD63B0 /* AD6550 80240680 3C018024 */ lui $at, %hi(func_80244FB8_A2F1F8) /* AD6554 80240684 D4224FB8 */ ldc1 $f2, %lo(func_80244FB8_A2F1F8)($at) /* AD6558 80240688 44820000 */ mtc1 $v0, $f0 -/* AD655C 8024068C 00000000 */ nop +/* AD655C 8024068C 00000000 */ nop /* AD6560 80240690 46800021 */ cvt.d.w $f0, $f0 /* AD6564 80240694 46220002 */ mul.d $f0, $f0, $f2 -/* AD6568 80240698 00000000 */ nop +/* AD6568 80240698 00000000 */ nop /* AD656C 8024069C 463C0000 */ add.d $f0, $f0, $f28 /* AD6570 802406A0 2404000A */ addiu $a0, $zero, 0xa /* AD6574 802406A4 8E02000C */ lw $v0, 0xc($s0) @@ -121,14 +121,14 @@ glabel func_802404E0_AD63B0 /* AD657C 802406AC E4400048 */ swc1 $f0, 0x48($v0) /* AD6580 802406B0 8E02000C */ lw $v0, 0xc($s0) /* AD6584 802406B4 44930000 */ mtc1 $s3, $f0 -/* AD6588 802406B8 00000000 */ nop +/* AD6588 802406B8 00000000 */ nop /* AD658C 802406BC 46800020 */ cvt.s.w $f0, $f0 /* AD6590 802406C0 0C00A67F */ jal rand_int /* AD6594 802406C4 E440003C */ swc1 $f0, 0x3c($v0) /* AD6598 802406C8 2442FFFB */ addiu $v0, $v0, -5 /* AD659C 802406CC 8E03000C */ lw $v1, 0xc($s0) /* AD65A0 802406D0 44820000 */ mtc1 $v0, $f0 -/* AD65A4 802406D4 00000000 */ nop +/* AD65A4 802406D4 00000000 */ nop /* AD65A8 802406D8 46800020 */ cvt.s.w $f0, $f0 /* AD65AC 802406DC E4600040 */ swc1 $f0, 0x40($v1) /* AD65B0 802406E0 8E02000C */ lw $v0, 0xc($s0) @@ -145,7 +145,7 @@ glabel func_802404E0_AD63B0 /* AD65DC 8024070C 3C01BDCC */ lui $at, 0xbdcc /* AD65E0 80240710 3421CCCD */ ori $at, $at, 0xcccd /* AD65E4 80240714 44810000 */ mtc1 $at, $f0 -/* AD65E8 80240718 00000000 */ nop +/* AD65E8 80240718 00000000 */ nop /* AD65EC 8024071C E4400058 */ swc1 $f0, 0x58($v0) /* AD65F0 80240720 2A42001C */ slti $v0, $s2, 0x1c /* AD65F4 80240724 1440FF7F */ bnez $v0, .L80240524 diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEA0/func_80240000_ADAEA0.s b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEA0/func_80240000_ADAEA0.s index b29f35b3c7..a6fb6ec1df 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEA0/func_80240000_ADAEA0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEA0/func_80240000_ADAEA0.s @@ -10,7 +10,7 @@ glabel func_80240000_ADAEA0 /* ADAEB4 80240014 34A50180 */ ori $a1, $a1, 0x180 /* ADAEB8 80240018 2403FF80 */ addiu $v1, $zero, -0x80 /* ADAEBC 8024001C 14430006 */ bne $v0, $v1, .L80240038 -/* ADAEC0 80240020 00000000 */ nop +/* ADAEC0 80240020 00000000 */ nop /* ADAEC4 80240024 3C04800E */ lui $a0, %hi(D_800D9668) /* ADAEC8 80240028 24849668 */ addiu $a0, $a0, %lo(D_800D9668) /* ADAECC 8024002C 3C058025 */ lui $a1, %hi(D_8024A6B0) @@ -21,5 +21,5 @@ glabel func_80240000_ADAEA0 /* ADAEDC 8024003C 0000102D */ daddu $v0, $zero, $zero /* ADAEE0 80240040 03E00008 */ jr $ra /* ADAEE4 80240044 27BD0018 */ addiu $sp, $sp, 0x18 -/* ADAEE8 80240048 00000000 */ nop -/* ADAEEC 8024004C 00000000 */ nop +/* ADAEE8 80240048 00000000 */ nop +/* ADAEEC 8024004C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_8024049C_ADB33C.s b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_8024049C_ADB33C.s index b7db36a349..5218858b73 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_8024049C_ADB33C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_8024049C_ADB33C.s @@ -9,5 +9,5 @@ glabel func_8024049C_ADB33C /* ADB34C 802404AC A062007E */ sb $v0, 0x7e($v1) /* ADB350 802404B0 03E00008 */ jr $ra /* ADB354 802404B4 24020002 */ addiu $v0, $zero, 2 -/* ADB358 802404B8 00000000 */ nop -/* ADB35C 802404BC 00000000 */ nop +/* ADB358 802404B8 00000000 */ nop +/* ADB35C 802404BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_8024030C_AE589C.s b/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_8024030C_AE589C.s index a10ef85d26..888196d55f 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_8024030C_AE589C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_8024030C_AE589C.s @@ -12,6 +12,6 @@ glabel func_8024030C_AE589C /* AE58B8 80240328 A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* AE58BC 8024032C 03E00008 */ jr $ra /* AE58C0 80240330 24020002 */ addiu $v0, $zero, 2 -/* AE58C4 80240334 00000000 */ nop -/* AE58C8 80240338 00000000 */ nop -/* AE58CC 8024033C 00000000 */ nop +/* AE58C4 80240334 00000000 */ nop +/* AE58C8 80240338 00000000 */ nop +/* AE58CC 8024033C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_15/AE58D0/func_80240340_AE58D0.s b/asm/nonmatchings/world/area_kkj/kkj_15/AE58D0/func_80240340_AE58D0.s index 6fd0f6575d..96eb28dff0 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_15/AE58D0/func_80240340_AE58D0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_15/AE58D0/func_80240340_AE58D0.s @@ -33,11 +33,11 @@ glabel func_80240340_AE58D0 /* AE5940 802403B0 44810000 */ mtc1 $at, $f0 /* AE5944 802403B4 00641821 */ addu $v1, $v1, $a0 /* AE5948 802403B8 4483C000 */ mtc1 $v1, $f24 -/* AE594C 802403BC 00000000 */ nop +/* AE594C 802403BC 00000000 */ nop /* AE5950 802403C0 4680C620 */ cvt.s.w $f24, $f24 /* AE5954 802403C4 4600B306 */ mov.s $f12, $f22 /* AE5958 802403C8 4600C602 */ mul.s $f24, $f24, $f0 -/* AE595C 802403CC 00000000 */ nop +/* AE595C 802403CC 00000000 */ nop /* AE5960 802403D0 0C00A7B5 */ jal dist2D /* AE5964 802403D4 4600A386 */ mov.s $f14, $f20 /* AE5968 802403D8 46000706 */ mov.s $f28, $f0 @@ -56,7 +56,7 @@ glabel func_80240340_AE58D0 /* AE599C 8024040C 0C00A8BB */ jal sin_deg /* AE59A0 80240410 4600D306 */ mov.s $f12, $f26 /* AE59A4 80240414 4600E002 */ mul.s $f0, $f28, $f0 -/* AE59A8 80240418 00000000 */ nop +/* AE59A8 80240418 00000000 */ nop /* AE59AC 8024041C 46160000 */ add.s $f0, $f0, $f22 /* AE59B0 80240420 4600D306 */ mov.s $f12, $f26 /* AE59B4 80240424 3C118011 */ lui $s1, %hi(gPlayerStatus) @@ -64,7 +64,7 @@ glabel func_80240340_AE58D0 /* AE59BC 8024042C 0C00A8D4 */ jal cos_deg /* AE59C0 80240430 E6200028 */ swc1 $f0, 0x28($s1) /* AE59C4 80240434 4600E002 */ mul.s $f0, $f28, $f0 -/* AE59C8 80240438 00000000 */ nop +/* AE59C8 80240438 00000000 */ nop /* AE59CC 8024043C 4600A001 */ sub.s $f0, $f20, $f0 /* AE59D0 80240440 4600B306 */ mov.s $f12, $f22 /* AE59D4 80240444 E6200030 */ swc1 $f0, 0x30($s1) @@ -92,13 +92,13 @@ glabel func_80240340_AE58D0 /* AE5A2C 8024049C 0C00A8BB */ jal sin_deg /* AE5A30 802404A0 4600D306 */ mov.s $f12, $f26 /* AE5A34 802404A4 4600E002 */ mul.s $f0, $f28, $f0 -/* AE5A38 802404A8 00000000 */ nop +/* AE5A38 802404A8 00000000 */ nop /* AE5A3C 802404AC 46160000 */ add.s $f0, $f0, $f22 /* AE5A40 802404B0 4600D306 */ mov.s $f12, $f26 /* AE5A44 802404B4 0C00A8D4 */ jal cos_deg /* AE5A48 802404B8 E6400038 */ swc1 $f0, 0x38($s2) /* AE5A4C 802404BC 4600E002 */ mul.s $f0, $f28, $f0 -/* AE5A50 802404C0 00000000 */ nop +/* AE5A50 802404C0 00000000 */ nop /* AE5A54 802404C4 4600A501 */ sub.s $f20, $f20, $f0 /* AE5A58 802404C8 E6540040 */ swc1 $f20, 0x40($s2) /* AE5A5C 802404CC 8FBF001C */ lw $ra, 0x1c($sp) @@ -113,4 +113,4 @@ glabel func_80240340_AE58D0 /* AE5A80 802404F0 24020002 */ addiu $v0, $zero, 2 /* AE5A84 802404F4 03E00008 */ jr $ra /* AE5A88 802404F8 27BD0048 */ addiu $sp, $sp, 0x48 -/* AE5A8C 802404FC 00000000 */ nop +/* AE5A8C 802404FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_15/AE5A90/func_80240500_AE5A90.s b/asm/nonmatchings/world/area_kkj/kkj_15/AE5A90/func_80240500_AE5A90.s index 12a497c89c..e58c5b7153 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_15/AE5A90/func_80240500_AE5A90.s +++ b/asm/nonmatchings/world/area_kkj/kkj_15/AE5A90/func_80240500_AE5A90.s @@ -24,14 +24,14 @@ glabel func_80240500_AE5A90 /* AE5ADC 8024054C 0000202D */ daddu $a0, $zero, $zero /* AE5AE0 80240550 24050005 */ addiu $a1, $zero, 5 /* AE5AE4 80240554 44820000 */ mtc1 $v0, $f0 -/* AE5AE8 80240558 00000000 */ nop +/* AE5AE8 80240558 00000000 */ nop /* AE5AEC 8024055C 46800020 */ cvt.s.w $f0, $f0 /* AE5AF0 80240560 44921000 */ mtc1 $s2, $f2 -/* AE5AF4 80240564 00000000 */ nop +/* AE5AF4 80240564 00000000 */ nop /* AE5AF8 80240568 468010A0 */ cvt.s.w $f2, $f2 /* AE5AFC 8024056C 44061000 */ mfc1 $a2, $f2 /* AE5B00 80240570 44901000 */ mtc1 $s0, $f2 -/* AE5B04 80240574 00000000 */ nop +/* AE5B04 80240574 00000000 */ nop /* AE5B08 80240578 468010A0 */ cvt.s.w $f2, $f2 /* AE5B0C 8024057C E7A00010 */ swc1 $f0, 0x10($sp) /* AE5B10 80240580 3C0138D1 */ lui $at, 0x38d1 @@ -52,5 +52,5 @@ glabel func_80240500_AE5A90 /* AE5B4C 802405BC 24020002 */ addiu $v0, $zero, 2 /* AE5B50 802405C0 03E00008 */ jr $ra /* AE5B54 802405C4 27BD0038 */ addiu $sp, $sp, 0x38 -/* AE5B58 802405C8 00000000 */ nop -/* AE5B5C 802405CC 00000000 */ nop +/* AE5B58 802405C8 00000000 */ nop +/* AE5B5C 802405CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_15/AE5B60/func_802405EC_AE5B7C.s b/asm/nonmatchings/world/area_kkj/kkj_15/AE5B60/func_802405EC_AE5B7C.s index 316d3bc687..9429cadf5a 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_15/AE5B60/func_802405EC_AE5B7C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_15/AE5B60/func_802405EC_AE5B7C.s @@ -9,5 +9,5 @@ glabel func_802405EC_AE5B7C /* AE5B8C 802405FC A062007E */ sb $v0, 0x7e($v1) /* AE5B90 80240600 03E00008 */ jr $ra /* AE5B94 80240604 24020002 */ addiu $v0, $zero, 2 -/* AE5B98 80240608 00000000 */ nop -/* AE5B9C 8024060C 00000000 */ nop +/* AE5B98 80240608 00000000 */ nop +/* AE5B9C 8024060C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s index 95c3f3ba12..17fdcd0f5f 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s @@ -10,7 +10,7 @@ glabel func_80240028_AED438 /* AED44C 8024003C 8FBF0010 */ lw $ra, 0x10($sp) /* AED450 80240040 4600008D */ trunc.w.s $f2, $f0 /* AED454 80240044 44021000 */ mfc1 $v0, $f2 -/* AED458 80240048 00000000 */ nop +/* AED458 80240048 00000000 */ nop /* AED45C 8024004C 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) /* AED460 80240050 A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) /* AED464 80240054 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240060_AED470.s b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240060_AED470.s index 8570eb96ce..d86e68597d 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240060_AED470.s +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240060_AED470.s @@ -55,30 +55,30 @@ glabel func_80240060_AED470 /* AED538 80240128 D4224810 */ ldc1 $f2, %lo(D_80244810)($at) /* AED53C 8024012C 46002121 */ cvt.d.s $f4, $f4 /* AED540 80240130 46222032 */ c.eq.d $f4, $f2 -/* AED544 80240134 00000000 */ nop +/* AED544 80240134 00000000 */ nop /* AED548 80240138 45010007 */ bc1t .L80240158 /* AED54C 8024013C 46000086 */ mov.s $f2, $f0 /* AED550 80240140 3C018024 */ lui $at, %hi(D_80244818) /* AED554 80240144 D4204818 */ ldc1 $f0, %lo(D_80244818)($at) /* AED558 80240148 46202032 */ c.eq.d $f4, $f0 -/* AED55C 8024014C 00000000 */ nop +/* AED55C 8024014C 00000000 */ nop /* AED560 80240150 45000008 */ bc1f .L80240174 -/* AED564 80240154 00000000 */ nop +/* AED564 80240154 00000000 */ nop .L80240158: /* AED568 80240158 4618A03E */ c.le.s $f20, $f24 -/* AED56C 8024015C 00000000 */ nop +/* AED56C 8024015C 00000000 */ nop /* AED570 80240160 4500000C */ bc1f .L80240194 /* AED574 80240164 0000882D */ daddu $s1, $zero, $zero /* AED578 80240168 4616103E */ c.le.s $f2, $f22 /* AED57C 8024016C 08090063 */ j .L8024018C -/* AED580 80240170 00000000 */ nop +/* AED580 80240170 00000000 */ nop .L80240174: /* AED584 80240174 4618103E */ c.le.s $f2, $f24 -/* AED588 80240178 00000000 */ nop +/* AED588 80240178 00000000 */ nop /* AED58C 8024017C 45000005 */ bc1f .L80240194 /* AED590 80240180 0000882D */ daddu $s1, $zero, $zero /* AED594 80240184 4616A03E */ c.le.s $f20, $f22 -/* AED598 80240188 00000000 */ nop +/* AED598 80240188 00000000 */ nop .L8024018C: /* AED59C 8024018C 45030001 */ bc1tl .L80240194 /* AED5A0 80240190 24110001 */ addiu $s1, $zero, 1 @@ -110,13 +110,13 @@ glabel func_80240060_AED470 /* AED604 802401F4 860200A6 */ lh $v0, 0xa6($s0) /* AED608 802401F8 27A60028 */ addiu $a2, $sp, 0x28 /* AED60C 802401FC 44820000 */ mtc1 $v0, $f0 -/* AED610 80240200 00000000 */ nop +/* AED610 80240200 00000000 */ nop /* AED614 80240204 46800020 */ cvt.s.w $f0, $f0 /* AED618 80240208 E7A00018 */ swc1 $f0, 0x18($sp) /* AED61C 8024020C 860200A8 */ lh $v0, 0xa8($s0) /* AED620 80240210 27A70024 */ addiu $a3, $sp, 0x24 /* AED624 80240214 44820000 */ mtc1 $v0, $f0 -/* AED628 80240218 00000000 */ nop +/* AED628 80240218 00000000 */ nop /* AED62C 8024021C 46800020 */ cvt.s.w $f0, $f0 /* AED630 80240220 0C0376B9 */ jal func_800DDAE4 /* AED634 80240224 E7A0001C */ swc1 $f0, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_8024031C_AED72C.s b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_8024031C_AED72C.s index 8620a19764..80c024ede1 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_8024031C_AED72C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_8024031C_AED72C.s @@ -84,7 +84,7 @@ glabel func_8024031C_AED72C /* AED868 80240458 0C00A7B5 */ jal dist2D /* AED86C 8024045C 0000802D */ daddu $s0, $zero, $zero /* AED870 80240460 4616003E */ c.le.s $f0, $f22 -/* AED874 80240464 00000000 */ nop +/* AED874 80240464 00000000 */ nop /* AED878 80240468 45000002 */ bc1f .L80240474 /* AED87C 8024046C 0240982D */ daddu $s3, $s2, $zero /* AED880 80240470 24100001 */ addiu $s0, $zero, 1 @@ -122,7 +122,7 @@ glabel func_8024031C_AED72C /* AED8FC 802404EC 0C00A7B5 */ jal dist2D /* AED900 802404F0 8E470030 */ lw $a3, 0x30($s2) /* AED904 802404F4 461A003E */ c.le.s $f0, $f26 -/* AED908 802404F8 00000000 */ nop +/* AED908 802404F8 00000000 */ nop /* AED90C 802404FC 45030001 */ bc1tl .L80240504 /* AED910 80240500 36100010 */ ori $s0, $s0, 0x10 .L80240504: @@ -153,13 +153,13 @@ glabel func_8024031C_AED72C /* AED974 80240564 862200A6 */ lh $v0, 0xa6($s1) /* AED978 80240568 27A60028 */ addiu $a2, $sp, 0x28 /* AED97C 8024056C 44820000 */ mtc1 $v0, $f0 -/* AED980 80240570 00000000 */ nop +/* AED980 80240570 00000000 */ nop /* AED984 80240574 46800020 */ cvt.s.w $f0, $f0 /* AED988 80240578 E7A00018 */ swc1 $f0, 0x18($sp) /* AED98C 8024057C 862200A8 */ lh $v0, 0xa8($s1) /* AED990 80240580 0280382D */ daddu $a3, $s4, $zero /* AED994 80240584 44820000 */ mtc1 $v0, $f0 -/* AED998 80240588 00000000 */ nop +/* AED998 80240588 00000000 */ nop /* AED99C 8024058C 46800020 */ cvt.s.w $f0, $f0 /* AED9A0 80240590 0C0376B9 */ jal func_800DDAE4 /* AED9A4 80240594 E7A0001C */ swc1 $f0, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_802405F4_AEDA04.s b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_802405F4_AEDA04.s index 9023286e8f..f4aab6b2a0 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_802405F4_AEDA04.s +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_802405F4_AEDA04.s @@ -31,18 +31,18 @@ glabel func_802405F4_AEDA04 /* AEDA6C 8024065C 0C0B1EAF */ jal get_variable /* AEDA70 80240660 0040802D */ daddu $s0, $v0, $zero /* AEDA74 80240664 44901000 */ mtc1 $s0, $f2 -/* AEDA78 80240668 00000000 */ nop +/* AEDA78 80240668 00000000 */ nop /* AEDA7C 8024066C 468010A0 */ cvt.s.w $f2, $f2 /* AEDA80 80240670 44936000 */ mtc1 $s3, $f12 -/* AEDA84 80240674 00000000 */ nop +/* AEDA84 80240674 00000000 */ nop /* AEDA88 80240678 46806320 */ cvt.s.w $f12, $f12 /* AEDA8C 8024067C 44061000 */ mfc1 $a2, $f2 /* AEDA90 80240680 44821000 */ mtc1 $v0, $f2 -/* AEDA94 80240684 00000000 */ nop +/* AEDA94 80240684 00000000 */ nop /* AEDA98 80240688 468010A0 */ cvt.s.w $f2, $f2 /* AEDA9C 8024068C 44071000 */ mfc1 $a3, $f2 /* AEDAA0 80240690 44927000 */ mtc1 $s2, $f14 -/* AEDAA4 80240694 00000000 */ nop +/* AEDAA4 80240694 00000000 */ nop /* AEDAA8 80240698 0C00A720 */ jal atan2 /* AEDAAC 8024069C 468073A0 */ cvt.s.w $f14, $f14 /* AEDAB0 802406A0 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_802406D8_AEDAE8.s b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_802406D8_AEDAE8.s index 5613b551ad..3dde078ee0 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_802406D8_AEDAE8.s +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_802406D8_AEDAE8.s @@ -41,7 +41,7 @@ glabel func_802406D8_AEDAE8 /* AEDB78 80240768 0C00A7B5 */ jal dist2D /* AEDB7C 8024076C 24140001 */ addiu $s4, $zero, 1 /* AEDB80 80240770 4618003C */ c.lt.s $f0, $f24 -/* AEDB84 80240774 00000000 */ nop +/* AEDB84 80240774 00000000 */ nop /* AEDB88 80240778 45030001 */ bc1tl .L80240780 /* AEDB8C 8024077C 0000A02D */ daddu $s4, $zero, $zero .L80240780: @@ -56,13 +56,13 @@ glabel func_802406D8_AEDAE8 /* AEDBB0 802407A0 0C00A8BB */ jal sin_deg /* AEDBB4 802407A4 4600A306 */ mov.s $f12, $f20 /* AEDBB8 802407A8 46180002 */ mul.s $f0, $f0, $f24 -/* AEDBBC 802407AC 00000000 */ nop +/* AEDBBC 802407AC 00000000 */ nop /* AEDBC0 802407B0 C6560028 */ lwc1 $f22, 0x28($s2) /* AEDBC4 802407B4 4600B580 */ add.s $f22, $f22, $f0 /* AEDBC8 802407B8 0C00A8D4 */ jal cos_deg /* AEDBCC 802407BC 4600A306 */ mov.s $f12, $f20 /* AEDBD0 802407C0 46180002 */ mul.s $f0, $f0, $f24 -/* AEDBD4 802407C4 00000000 */ nop +/* AEDBD4 802407C4 00000000 */ nop /* AEDBD8 802407C8 0260202D */ daddu $a0, $s3, $zero /* AEDBDC 802407CC 02A0282D */ daddu $a1, $s5, $zero /* AEDBE0 802407D0 C6540030 */ lwc1 $f20, 0x30($s2) @@ -95,6 +95,6 @@ glabel func_802406D8_AEDAE8 /* AEDC48 80240838 D7B40038 */ ldc1 $f20, 0x38($sp) /* AEDC4C 8024083C 03E00008 */ jr $ra /* AEDC50 80240840 27BD0050 */ addiu $sp, $sp, 0x50 -/* AEDC54 80240844 00000000 */ nop -/* AEDC58 80240848 00000000 */ nop -/* AEDC5C 8024084C 00000000 */ nop +/* AEDC54 80240844 00000000 */ nop +/* AEDC58 80240848 00000000 */ nop +/* AEDC5C 8024084C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240850_AEDC60.s b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240850_AEDC60.s index 903d31c021..9d374396bb 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240850_AEDC60.s +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240850_AEDC60.s @@ -55,30 +55,30 @@ glabel func_80240850_AEDC60 /* AEDD28 80240918 D4224830 */ ldc1 $f2, %lo(D_80244830)($at) /* AEDD2C 8024091C 46002121 */ cvt.d.s $f4, $f4 /* AEDD30 80240920 46222032 */ c.eq.d $f4, $f2 -/* AEDD34 80240924 00000000 */ nop +/* AEDD34 80240924 00000000 */ nop /* AEDD38 80240928 45010007 */ bc1t .L80240948 /* AEDD3C 8024092C 46000086 */ mov.s $f2, $f0 /* AEDD40 80240930 3C018024 */ lui $at, %hi(D_80244838) /* AEDD44 80240934 D4204838 */ ldc1 $f0, %lo(D_80244838)($at) /* AEDD48 80240938 46202032 */ c.eq.d $f4, $f0 -/* AEDD4C 8024093C 00000000 */ nop +/* AEDD4C 8024093C 00000000 */ nop /* AEDD50 80240940 45000008 */ bc1f .L80240964 -/* AEDD54 80240944 00000000 */ nop +/* AEDD54 80240944 00000000 */ nop .L80240948: /* AEDD58 80240948 4618A03E */ c.le.s $f20, $f24 -/* AEDD5C 8024094C 00000000 */ nop +/* AEDD5C 8024094C 00000000 */ nop /* AEDD60 80240950 4500000C */ bc1f .L80240984 /* AEDD64 80240954 0000882D */ daddu $s1, $zero, $zero /* AEDD68 80240958 4616103E */ c.le.s $f2, $f22 /* AEDD6C 8024095C 0809025F */ j .L8024097C -/* AEDD70 80240960 00000000 */ nop +/* AEDD70 80240960 00000000 */ nop .L80240964: /* AEDD74 80240964 4618103E */ c.le.s $f2, $f24 -/* AEDD78 80240968 00000000 */ nop +/* AEDD78 80240968 00000000 */ nop /* AEDD7C 8024096C 45000005 */ bc1f .L80240984 /* AEDD80 80240970 0000882D */ daddu $s1, $zero, $zero /* AEDD84 80240974 4616A03E */ c.le.s $f20, $f22 -/* AEDD88 80240978 00000000 */ nop +/* AEDD88 80240978 00000000 */ nop .L8024097C: /* AEDD8C 8024097C 45030001 */ bc1tl .L80240984 /* AEDD90 80240980 24110001 */ addiu $s1, $zero, 1 @@ -110,13 +110,13 @@ glabel func_80240850_AEDC60 /* AEDDF4 802409E4 860200A6 */ lh $v0, 0xa6($s0) /* AEDDF8 802409E8 27A60028 */ addiu $a2, $sp, 0x28 /* AEDDFC 802409EC 44820000 */ mtc1 $v0, $f0 -/* AEDE00 802409F0 00000000 */ nop +/* AEDE00 802409F0 00000000 */ nop /* AEDE04 802409F4 46800020 */ cvt.s.w $f0, $f0 /* AEDE08 802409F8 E7A00018 */ swc1 $f0, 0x18($sp) /* AEDE0C 802409FC 860200A8 */ lh $v0, 0xa8($s0) /* AEDE10 80240A00 27A70024 */ addiu $a3, $sp, 0x24 /* AEDE14 80240A04 44820000 */ mtc1 $v0, $f0 -/* AEDE18 80240A08 00000000 */ nop +/* AEDE18 80240A08 00000000 */ nop /* AEDE1C 80240A0C 46800020 */ cvt.s.w $f0, $f0 /* AEDE20 80240A10 0C0376B9 */ jal func_800DDAE4 /* AEDE24 80240A14 E7A0001C */ swc1 $f0, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240B0C_AEDF1C.s b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240B0C_AEDF1C.s index 22ee4bead6..a25c71dd17 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240B0C_AEDF1C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240B0C_AEDF1C.s @@ -84,7 +84,7 @@ glabel func_80240B0C_AEDF1C /* AEE058 80240C48 0C00A7B5 */ jal dist2D /* AEE05C 80240C4C 0000802D */ daddu $s0, $zero, $zero /* AEE060 80240C50 4616003E */ c.le.s $f0, $f22 -/* AEE064 80240C54 00000000 */ nop +/* AEE064 80240C54 00000000 */ nop /* AEE068 80240C58 45000002 */ bc1f .L80240C64 /* AEE06C 80240C5C 0240982D */ daddu $s3, $s2, $zero /* AEE070 80240C60 24100001 */ addiu $s0, $zero, 1 @@ -122,7 +122,7 @@ glabel func_80240B0C_AEDF1C /* AEE0EC 80240CDC 0C00A7B5 */ jal dist2D /* AEE0F0 80240CE0 8E470030 */ lw $a3, 0x30($s2) /* AEE0F4 80240CE4 461A003E */ c.le.s $f0, $f26 -/* AEE0F8 80240CE8 00000000 */ nop +/* AEE0F8 80240CE8 00000000 */ nop /* AEE0FC 80240CEC 45030001 */ bc1tl .L80240CF4 /* AEE100 80240CF0 36100010 */ ori $s0, $s0, 0x10 .L80240CF4: @@ -153,13 +153,13 @@ glabel func_80240B0C_AEDF1C /* AEE164 80240D54 862200A6 */ lh $v0, 0xa6($s1) /* AEE168 80240D58 27A60028 */ addiu $a2, $sp, 0x28 /* AEE16C 80240D5C 44820000 */ mtc1 $v0, $f0 -/* AEE170 80240D60 00000000 */ nop +/* AEE170 80240D60 00000000 */ nop /* AEE174 80240D64 46800020 */ cvt.s.w $f0, $f0 /* AEE178 80240D68 E7A00018 */ swc1 $f0, 0x18($sp) /* AEE17C 80240D6C 862200A8 */ lh $v0, 0xa8($s1) /* AEE180 80240D70 0280382D */ daddu $a3, $s4, $zero /* AEE184 80240D74 44820000 */ mtc1 $v0, $f0 -/* AEE188 80240D78 00000000 */ nop +/* AEE188 80240D78 00000000 */ nop /* AEE18C 80240D7C 46800020 */ cvt.s.w $f0, $f0 /* AEE190 80240D80 0C0376B9 */ jal func_800DDAE4 /* AEE194 80240D84 E7A0001C */ swc1 $f0, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240DE4_AEE1F4.s b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240DE4_AEE1F4.s index a5e2335781..5d78982901 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240DE4_AEE1F4.s +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240DE4_AEE1F4.s @@ -31,18 +31,18 @@ glabel func_80240DE4_AEE1F4 /* AEE25C 80240E4C 0C0B1EAF */ jal get_variable /* AEE260 80240E50 0040802D */ daddu $s0, $v0, $zero /* AEE264 80240E54 44901000 */ mtc1 $s0, $f2 -/* AEE268 80240E58 00000000 */ nop +/* AEE268 80240E58 00000000 */ nop /* AEE26C 80240E5C 468010A0 */ cvt.s.w $f2, $f2 /* AEE270 80240E60 44936000 */ mtc1 $s3, $f12 -/* AEE274 80240E64 00000000 */ nop +/* AEE274 80240E64 00000000 */ nop /* AEE278 80240E68 46806320 */ cvt.s.w $f12, $f12 /* AEE27C 80240E6C 44061000 */ mfc1 $a2, $f2 /* AEE280 80240E70 44821000 */ mtc1 $v0, $f2 -/* AEE284 80240E74 00000000 */ nop +/* AEE284 80240E74 00000000 */ nop /* AEE288 80240E78 468010A0 */ cvt.s.w $f2, $f2 /* AEE28C 80240E7C 44071000 */ mfc1 $a3, $f2 /* AEE290 80240E80 44927000 */ mtc1 $s2, $f14 -/* AEE294 80240E84 00000000 */ nop +/* AEE294 80240E84 00000000 */ nop /* AEE298 80240E88 0C00A720 */ jal atan2 /* AEE29C 80240E8C 468073A0 */ cvt.s.w $f14, $f14 /* AEE2A0 80240E90 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240F10_AEE320.s b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240F10_AEE320.s index 56a1856f28..08f207f2aa 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240F10_AEE320.s +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240F10_AEE320.s @@ -41,7 +41,7 @@ glabel func_80240F10_AEE320 /* AEE3B0 80240FA0 0C00A7B5 */ jal dist2D /* AEE3B4 80240FA4 24140001 */ addiu $s4, $zero, 1 /* AEE3B8 80240FA8 4618003C */ c.lt.s $f0, $f24 -/* AEE3BC 80240FAC 00000000 */ nop +/* AEE3BC 80240FAC 00000000 */ nop /* AEE3C0 80240FB0 45030001 */ bc1tl .L80240FB8 /* AEE3C4 80240FB4 0000A02D */ daddu $s4, $zero, $zero .L80240FB8: @@ -56,13 +56,13 @@ glabel func_80240F10_AEE320 /* AEE3E8 80240FD8 0C00A8BB */ jal sin_deg /* AEE3EC 80240FDC 4600A306 */ mov.s $f12, $f20 /* AEE3F0 80240FE0 46180002 */ mul.s $f0, $f0, $f24 -/* AEE3F4 80240FE4 00000000 */ nop +/* AEE3F4 80240FE4 00000000 */ nop /* AEE3F8 80240FE8 C6560028 */ lwc1 $f22, 0x28($s2) /* AEE3FC 80240FEC 4600B580 */ add.s $f22, $f22, $f0 /* AEE400 80240FF0 0C00A8D4 */ jal cos_deg /* AEE404 80240FF4 4600A306 */ mov.s $f12, $f20 /* AEE408 80240FF8 46180002 */ mul.s $f0, $f0, $f24 -/* AEE40C 80240FFC 00000000 */ nop +/* AEE40C 80240FFC 00000000 */ nop /* AEE410 80241000 0260202D */ daddu $a0, $s3, $zero /* AEE414 80241004 02A0282D */ daddu $a1, $s5, $zero /* AEE418 80241008 C6540030 */ lwc1 $f20, 0x30($s2) @@ -95,4 +95,4 @@ glabel func_80240F10_AEE320 /* AEE480 80241070 D7B40038 */ ldc1 $f20, 0x38($sp) /* AEE484 80241074 03E00008 */ jr $ra /* AEE488 80241078 27BD0050 */ addiu $sp, $sp, 0x50 -/* AEE48C 8024107C 00000000 */ nop +/* AEE48C 8024107C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240000_AF1C60.s b/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240000_AF1C60.s index 30147ac999..0381dcb637 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240000_AF1C60.s +++ b/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240000_AF1C60.s @@ -26,7 +26,7 @@ glabel func_80240000_AF1C60 /* AF1CB0 80240050 1440FFFA */ bnez $v0, .L8024003C /* AF1CB4 80240054 24A50004 */ addiu $a1, $a1, 4 /* AF1CB8 80240058 08090027 */ j .L8024009C -/* AF1CBC 8024005C 00000000 */ nop +/* AF1CBC 8024005C 00000000 */ nop .L80240060: /* AF1CC0 80240060 0000182D */ daddu $v1, $zero, $zero /* AF1CC4 80240064 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_802402BC_AF1F1C.s b/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_802402BC_AF1F1C.s index b4ec3f7a99..b5e5d66792 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_802402BC_AF1F1C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_802402BC_AF1F1C.s @@ -104,20 +104,20 @@ glabel func_802402BC_AF1F1C /* AF2090 80240430 10400009 */ beqz $v0, .L80240458 /* AF2094 80240434 AE620074 */ sw $v0, 0x74($s3) /* AF2098 80240438 0C03C4EC */ jal func_800F13B0 -/* AF209C 8024043C 00000000 */ nop +/* AF209C 8024043C 00000000 */ nop /* AF20A0 80240440 8E620070 */ lw $v0, 0x70($s3) /* AF20A4 80240444 24420001 */ addiu $v0, $v0, 1 .L80240448: /* AF20A8 80240448 AE620070 */ sw $v0, 0x70($s3) /* AF20AC 8024044C 2842000F */ slti $v0, $v0, 0xf /* AF20B0 80240450 10400003 */ beqz $v0, .L80240460 -/* AF20B4 80240454 00000000 */ nop +/* AF20B4 80240454 00000000 */ nop .L80240458: /* AF20B8 80240458 08090134 */ j .L802404D0 /* AF20BC 8024045C 0000102D */ daddu $v0, $zero, $zero .L80240460: /* AF20C0 80240460 0C03C54E */ jal func_800F1538 -/* AF20C4 80240464 00000000 */ nop +/* AF20C4 80240464 00000000 */ nop /* AF20C8 80240468 8E630074 */ lw $v1, 0x74($s3) /* AF20CC 8024046C 240200FF */ addiu $v0, $zero, 0xff /* AF20D0 80240470 14620004 */ bne $v1, $v0, .L80240484 @@ -144,7 +144,7 @@ glabel func_802402BC_AF1F1C .L802404C0: /* AF2120 802404C0 8E640078 */ lw $a0, 0x78($s3) /* AF2124 802404C4 0C00AB4B */ jal heap_free -/* AF2128 802404C8 00000000 */ nop +/* AF2128 802404C8 00000000 */ nop .L802404CC: /* AF212C 802404CC 24020002 */ addiu $v0, $zero, 2 .L802404D0: diff --git a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240568_AF21C8.s b/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240568_AF21C8.s index 6b3b571c5b..4e29ff0ad3 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240568_AF21C8.s +++ b/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240568_AF21C8.s @@ -13,6 +13,6 @@ glabel func_80240568_AF21C8 /* AF21E8 80240588 24020002 */ addiu $v0, $zero, 2 /* AF21EC 8024058C 03E00008 */ jr $ra /* AF21F0 80240590 27BD0018 */ addiu $sp, $sp, 0x18 -/* AF21F4 80240594 00000000 */ nop -/* AF21F8 80240598 00000000 */ nop -/* AF21FC 8024059C 00000000 */ nop +/* AF21F4 80240594 00000000 */ nop +/* AF21F8 80240598 00000000 */ nop +/* AF21FC 8024059C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_8024030C_AF2FAC.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_8024030C_AF2FAC.s index 440e2f628a..98335f9448 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_8024030C_AF2FAC.s +++ b/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_8024030C_AF2FAC.s @@ -12,6 +12,6 @@ glabel func_8024030C_AF2FAC /* AF2FC8 80240328 A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* AF2FCC 8024032C 03E00008 */ jr $ra /* AF2FD0 80240330 24020002 */ addiu $v0, $zero, 2 -/* AF2FD4 80240334 00000000 */ nop -/* AF2FD8 80240338 00000000 */ nop -/* AF2FDC 8024033C 00000000 */ nop +/* AF2FD4 80240334 00000000 */ nop +/* AF2FD8 80240338 00000000 */ nop +/* AF2FDC 8024033C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_802405F8_AF3298.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_802405F8_AF3298.s index 73d918412a..49254d1a1c 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_802405F8_AF3298.s +++ b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_802405F8_AF3298.s @@ -28,7 +28,7 @@ glabel func_802405F8_AF3298 /* AF32EC 8024064C 00220821 */ addu $at, $at, $v0 /* AF32F0 80240650 AC204CB0 */ sw $zero, %lo(D_80244CB0)($at) /* AF32F4 80240654 080901A1 */ j .L80240684 -/* AF32F8 80240658 00000000 */ nop +/* AF32F8 80240658 00000000 */ nop .L8024065C: /* AF32FC 8024065C 3C038024 */ lui $v1, %hi(D_80244CB0) /* AF3300 80240660 24634CB0 */ addiu $v1, $v1, %lo(D_80244CB0) diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240694_AF3334.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240694_AF3334.s index db2ff229b5..62e6a72dad 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240694_AF3334.s +++ b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240694_AF3334.s @@ -28,7 +28,7 @@ glabel func_80240694_AF3334 /* AF3388 802406E8 00220821 */ addu $at, $at, $v0 /* AF338C 802406EC AC204E78 */ sw $zero, %lo(D_80244E78)($at) /* AF3390 802406F0 080901C8 */ j .L80240720 -/* AF3394 802406F4 00000000 */ nop +/* AF3394 802406F4 00000000 */ nop .L802406F8: /* AF3398 802406F8 3C038024 */ lui $v1, %hi(D_80244E78) /* AF339C 802406FC 24634E78 */ addiu $v1, $v1, %lo(D_80244E78) diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s index 12097d8f4f..8b153555e6 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s @@ -11,7 +11,7 @@ glabel func_80240730_AF33D0 /* AF33E8 80240748 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) /* AF33EC 8024074C 4600008D */ trunc.w.s $f2, $f0 /* AF33F0 80240750 44021000 */ mfc1 $v0, $f2 -/* AF33F4 80240754 00000000 */ nop +/* AF33F4 80240754 00000000 */ nop /* AF33F8 80240758 3C018011 */ lui $at, %hi(gPlayerStatus+0xC4) /* AF33FC 8024075C A022F08C */ sb $v0, %lo(gPlayerStatus+0xC4)($at) /* AF3400 80240760 A0620080 */ sb $v0, 0x80($v1) diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240774_AF3414.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240774_AF3414.s index beca9d6cbc..c5e0ba9b7e 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240774_AF3414.s +++ b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240774_AF3414.s @@ -18,7 +18,7 @@ glabel func_80240774_AF3414 /* AF3444 802407A4 C6000070 */ lwc1 $f0, 0x70($s0) /* AF3448 802407A8 3C014120 */ lui $at, 0x4120 /* AF344C 802407AC 44811000 */ mtc1 $at, $f2 -/* AF3450 802407B0 00000000 */ nop +/* AF3450 802407B0 00000000 */ nop /* AF3454 802407B4 46020000 */ add.s $f0, $f0, $f2 /* AF3458 802407B8 3C01BF80 */ lui $at, 0xbf80 /* AF345C 802407BC 44811000 */ mtc1 $at, $f2 @@ -35,7 +35,7 @@ glabel func_80240774_AF3414 /* AF3488 802407E8 D4224CA0 */ ldc1 $f2, %lo(D_80244CA0)($at) /* AF348C 802407EC 46000021 */ cvt.d.s $f0, $f0 /* AF3490 802407F0 4620103E */ c.le.d $f2, $f0 -/* AF3494 802407F4 00000000 */ nop +/* AF3494 802407F4 00000000 */ nop /* AF3498 802407F8 45010002 */ bc1t .L80240804 /* AF349C 802407FC 24020002 */ addiu $v0, $zero, 2 /* AF34A0 80240800 0000102D */ daddu $v0, $zero, $zero @@ -44,6 +44,6 @@ glabel func_80240774_AF3414 /* AF34A8 80240808 8FB00018 */ lw $s0, 0x18($sp) /* AF34AC 8024080C 03E00008 */ jr $ra /* AF34B0 80240810 27BD0020 */ addiu $sp, $sp, 0x20 -/* AF34B4 80240814 00000000 */ nop -/* AF34B8 80240818 00000000 */ nop -/* AF34BC 8024081C 00000000 */ nop +/* AF34B4 80240814 00000000 */ nop +/* AF34B8 80240818 00000000 */ nop +/* AF34BC 8024081C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802401FC_AF7B4C.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802401FC_AF7B4C.s index e6e9a61d40..f88e429fc6 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802401FC_AF7B4C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802401FC_AF7B4C.s @@ -47,4 +47,4 @@ glabel func_802401FC_AF7B4C /* AF7BF0 802402A0 8FB00018 */ lw $s0, 0x18($sp) /* AF7BF4 802402A4 03E00008 */ jr $ra /* AF7BF8 802402A8 27BD0028 */ addiu $sp, $sp, 0x28 -/* AF7BFC 802402AC 00000000 */ nop +/* AF7BFC 802402AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240568_AF7EB8.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240568_AF7EB8.s index 1638302fcf..748b47522d 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240568_AF7EB8.s +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240568_AF7EB8.s @@ -28,7 +28,7 @@ glabel func_80240568_AF7EB8 /* AF7F0C 802405BC 00220821 */ addu $at, $at, $v0 /* AF7F10 802405C0 AC2061F0 */ sw $zero, %lo(D_802461F0)($at) /* AF7F14 802405C4 0809017D */ j .L802405F4 -/* AF7F18 802405C8 00000000 */ nop +/* AF7F18 802405C8 00000000 */ nop .L802405CC: /* AF7F1C 802405CC 3C038024 */ lui $v1, %hi(D_802461F0) /* AF7F20 802405D0 246361F0 */ addiu $v1, $v1, %lo(D_802461F0) diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240604_AF7F54.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240604_AF7F54.s index 7609f21187..a81078c8a7 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240604_AF7F54.s +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240604_AF7F54.s @@ -28,7 +28,7 @@ glabel func_80240604_AF7F54 /* AF7FA8 80240658 00220821 */ addu $at, $at, $v0 /* AF7FAC 8024065C AC2063B8 */ sw $zero, %lo(D_802463B8)($at) /* AF7FB0 80240660 080901A4 */ j .L80240690 -/* AF7FB4 80240664 00000000 */ nop +/* AF7FB4 80240664 00000000 */ nop .L80240668: /* AF7FB8 80240668 3C038024 */ lui $v1, %hi(D_802463B8) /* AF7FBC 8024066C 246363B8 */ addiu $v1, $v1, %lo(D_802463B8) diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406A0_AF7FF0.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406A0_AF7FF0.s index 08d98e9584..e1e8d25c39 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406A0_AF7FF0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406A0_AF7FF0.s @@ -7,7 +7,7 @@ glabel func_802406A0_AF7FF0 /* AF7FF8 802406A8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* AF7FFC 802406AC AFBF0010 */ sw $ra, 0x10($sp) /* AF8000 802406B0 0C0511EA */ jal draw_icon_0 -/* AF8004 802406B4 00000000 */ nop +/* AF8004 802406B4 00000000 */ nop /* AF8008 802406B8 8FBF0010 */ lw $ra, 0x10($sp) /* AF800C 802406BC 03E00008 */ jr $ra /* AF8010 802406C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s index b73facc5b8..c5bcbdd32b 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s @@ -21,11 +21,12 @@ glabel func_802406C4_AF8014 /* AF8050 80240700 2C62000D */ sltiu $v0, $v1, 0xd /* AF8054 80240704 104000F1 */ beqz $v0, .L80240ACC /* AF8058 80240708 00031080 */ sll $v0, $v1, 2 -/* AF805C 8024070C 3C018024 */ lui $at, %hi(D_802461B0) +/* AF805C 8024070C 3C018024 */ lui $at, %hi(jtbl_802461B0_AFDB00) /* AF8060 80240710 00220821 */ addu $at, $at, $v0 -/* AF8064 80240714 8C2261B0 */ lw $v0, %lo(D_802461B0)($at) +/* AF8064 80240714 8C2261B0 */ lw $v0, %lo(jtbl_802461B0_AFDB00)($at) /* AF8068 80240718 00400008 */ jr $v0 -/* AF806C 8024071C 00000000 */ nop +/* AF806C 8024071C 00000000 */ nop +glabel L80240720_AF8070 /* AF8070 80240720 02A0202D */ daddu $a0, $s5, $zero /* AF8074 80240724 8CC50000 */ lw $a1, ($a2) /* AF8078 80240728 0C0B1EAF */ jal get_variable @@ -96,7 +97,7 @@ glabel func_802406C4_AF8014 /* AF8178 80240828 3C048011 */ lui $a0, %hi(D_80108AFC) /* AF817C 8024082C 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) /* AF8180 80240830 0C050529 */ jal create_icon -/* AF8184 80240834 00000000 */ nop +/* AF8184 80240834 00000000 */ nop /* AF8188 80240838 0040982D */ daddu $s3, $v0, $zero /* AF818C 8024083C 8E250000 */ lw $a1, ($s1) /* AF8190 80240840 8E060000 */ lw $a2, ($s0) @@ -129,6 +130,7 @@ glabel func_802406C4_AF8014 /* AF81FC 802408AC AC226558 */ sw $v0, %lo(D_80246558)($at) /* AF8200 802408B0 080902B3 */ j .L80240ACC /* AF8204 802408B4 AEB40070 */ sw $s4, 0x70($s5) +glabel L802408B8_AF8208 /* AF8208 802408B8 3C128024 */ lui $s2, %hi(D_8024655C) /* AF820C 802408BC 2652655C */ addiu $s2, $s2, %lo(D_8024655C) /* AF8210 802408C0 8E420000 */ lw $v0, ($s2) @@ -162,13 +164,14 @@ glabel func_802406C4_AF8014 /* AF8278 80240928 3C018024 */ lui $at, %hi(D_80246558) /* AF827C 8024092C AC226558 */ sw $v0, %lo(D_80246558)($at) /* AF8280 80240930 080902B3 */ j .L80240ACC -/* AF8284 80240934 00000000 */ nop +/* AF8284 80240934 00000000 */ nop +glabel L80240938_AF8288 /* AF8288 80240938 3C048024 */ lui $a0, %hi(D_80246568) /* AF828C 8024093C 8C846568 */ lw $a0, %lo(D_80246568)($a0) /* AF8290 80240940 3C058011 */ lui $a1, %hi(D_80108B80) /* AF8294 80240944 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) /* AF8298 80240948 0C0511FF */ jal set_menu_icon_script -/* AF829C 8024094C 00000000 */ nop +/* AF829C 8024094C 00000000 */ nop /* AF82A0 80240950 2402000B */ addiu $v0, $zero, 0xb /* AF82A4 80240954 3C018024 */ lui $at, %hi(D_80246528) /* AF82A8 80240958 AC206528 */ sw $zero, %lo(D_80246528)($at) @@ -176,6 +179,7 @@ glabel func_802406C4_AF8014 /* AF82B0 80240960 AC20652C */ sw $zero, %lo(D_8024652C)($at) /* AF82B4 80240964 3C018024 */ lui $at, %hi(D_80246558) /* AF82B8 80240968 AC226558 */ sw $v0, %lo(D_80246558)($at) +glabel L8024096C_AF82BC /* AF82BC 8024096C 3C038024 */ lui $v1, %hi(D_80246550) /* AF82C0 80240970 8C636550 */ lw $v1, %lo(D_80246550)($v1) /* AF82C4 80240974 3C028007 */ lui $v0, %hi(gGameStatusPtr) @@ -187,7 +191,7 @@ glabel func_802406C4_AF8014 /* AF82DC 8024098C 8C846538 */ lw $a0, %lo(D_80246538)($a0) /* AF82E0 80240990 30428000 */ andi $v0, $v0, 0x8000 /* AF82E4 80240994 10400006 */ beqz $v0, .L802409B0 -/* AF82E8 80240998 00000000 */ nop +/* AF82E8 80240998 00000000 */ nop /* AF82EC 8024099C 3C038024 */ lui $v1, %hi(D_80246528) /* AF82F0 802409A0 24636528 */ addiu $v1, $v1, %lo(D_80246528) /* AF82F4 802409A4 8C620000 */ lw $v0, ($v1) @@ -228,7 +232,7 @@ glabel func_802406C4_AF8014 /* AF836C 80240A1C 3C018024 */ lui $at, %hi(D_8024652C) /* AF8370 80240A20 AC22652C */ sw $v0, %lo(D_8024652C)($at) /* AF8374 80240A24 08090291 */ j .L80240A44 -/* AF8378 80240A28 00000000 */ nop +/* AF8378 80240A28 00000000 */ nop .L80240A2C: /* AF837C 80240A2C 3C048024 */ lui $a0, %hi(D_8024652C) /* AF8380 80240A30 2484652C */ addiu $a0, $a0, %lo(D_8024652C) @@ -249,7 +253,8 @@ glabel func_802406C4_AF8014 /* AF83B8 80240A68 3C018024 */ lui $at, %hi(D_80246558) /* AF83BC 80240A6C AC226558 */ sw $v0, %lo(D_80246558)($at) /* AF83C0 80240A70 080902B3 */ j .L80240ACC -/* AF83C4 80240A74 00000000 */ nop +/* AF83C4 80240A74 00000000 */ nop +glabel L80240A78_AF83C8 /* AF83C8 80240A78 3C038024 */ lui $v1, %hi(D_80246534) /* AF83CC 80240A7C 24636534 */ addiu $v1, $v1, %lo(D_80246534) /* AF83D0 80240A80 8C620000 */ lw $v0, ($v1) @@ -267,12 +272,13 @@ glabel func_802406C4_AF8014 /* AF8400 80240AB0 3C048024 */ lui $a0, %hi(D_80246554) /* AF8404 80240AB4 8C846554 */ lw $a0, %lo(D_80246554)($a0) /* AF8408 80240AB8 0C048D70 */ jal func_801235C0 -/* AF840C 80240ABC 00000000 */ nop +/* AF840C 80240ABC 00000000 */ nop /* AF8410 80240AC0 080902CA */ j .L80240B28 /* AF8414 80240AC4 24020002 */ addiu $v0, $zero, 2 .L80240AC8: /* AF8418 80240AC8 AC620000 */ sw $v0, ($v1) .L80240ACC: +glabel L80240ACC_AF841C /* AF841C 80240ACC 3C058024 */ lui $a1, %hi(D_802465A0) /* AF8420 80240AD0 24A565A0 */ addiu $a1, $a1, %lo(D_802465A0) /* AF8424 80240AD4 8CA20000 */ lw $v0, ($a1) diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240CB4_AF8604.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240CB4_AF8604.s index 452b46d794..00076ee093 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240CB4_AF8604.s +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240CB4_AF8604.s @@ -13,7 +13,7 @@ glabel func_80240CB4_AF8604 /* AF8620 80240CD0 18400009 */ blez $v0, .L80240CF8 /* AF8624 80240CD4 AC820074 */ sw $v0, 0x74($a0) /* AF8628 80240CD8 44820000 */ mtc1 $v0, $f0 -/* AF862C 80240CDC 00000000 */ nop +/* AF862C 80240CDC 00000000 */ nop /* AF8630 80240CE0 46800020 */ cvt.s.w $f0, $f0 /* AF8634 80240CE4 44050000 */ mfc1 $a1, $f0 /* AF8638 80240CE8 0C04DF62 */ jal func_80137D88 @@ -27,4 +27,4 @@ glabel func_80240CB4_AF8604 /* AF8650 80240D00 8FBF0010 */ lw $ra, 0x10($sp) /* AF8654 80240D04 03E00008 */ jr $ra /* AF8658 80240D08 27BD0018 */ addiu $sp, $sp, 0x18 -/* AF865C 80240D0C 00000000 */ nop +/* AF865C 80240D0C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240000_AFDB40.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240000_AFDB40.s index 7455bf01bf..1a9144ca50 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240000_AFDB40.s +++ b/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240000_AFDB40.s @@ -26,7 +26,7 @@ glabel func_80240000_AFDB40 /* AFDB90 80240050 1440FFFA */ bnez $v0, .L8024003C /* AFDB94 80240054 24A50004 */ addiu $a1, $a1, 4 /* AFDB98 80240058 08090027 */ j .L8024009C -/* AFDB9C 8024005C 00000000 */ nop +/* AFDB9C 8024005C 00000000 */ nop .L80240060: /* AFDBA0 80240060 0000182D */ daddu $v1, $zero, $zero /* AFDBA4 80240064 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240308_AFDE48.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240308_AFDE48.s index 5e42ae92da..5b63cdfedf 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240308_AFDE48.s +++ b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240308_AFDE48.s @@ -22,7 +22,7 @@ glabel func_80240308_AFDE48 /* AFDE8C 8024034C 0C04DF93 */ jal func_80137E4C /* AFDE90 80240350 24070091 */ addiu $a3, $zero, 0x91 /* AFDE94 80240354 44900000 */ mtc1 $s0, $f0 -/* AFDE98 80240358 00000000 */ nop +/* AFDE98 80240358 00000000 */ nop /* AFDE9C 8024035C 46800020 */ cvt.s.w $f0, $f0 /* AFDEA0 80240360 44050000 */ mfc1 $a1, $f0 /* AFDEA4 80240364 0C04DF62 */ jal func_80137D88 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240384_AFDEC4.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240384_AFDEC4.s index 8ac32ccdec..8cdf95e9f0 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240384_AFDEC4.s +++ b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240384_AFDEC4.s @@ -16,7 +16,7 @@ glabel func_80240384_AFDEC4 /* AFDEF0 802403B0 0C0B1EAF */ jal get_variable /* AFDEF4 802403B4 0040802D */ daddu $s0, $v0, $zero /* AFDEF8 802403B8 44820000 */ mtc1 $v0, $f0 -/* AFDEFC 802403BC 00000000 */ nop +/* AFDEFC 802403BC 00000000 */ nop /* AFDF00 802403C0 46800020 */ cvt.s.w $f0, $f0 /* AFDF04 802403C4 24020002 */ addiu $v0, $zero, 2 /* AFDF08 802403C8 00501804 */ sllv $v1, $s0, $v0 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240480_AFDFC0.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240480_AFDFC0.s index e39992b256..4d5e53ea08 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240480_AFDFC0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240480_AFDFC0.s @@ -12,7 +12,7 @@ glabel func_80240480_AFDFC0 /* AFDFDC 8024049C 80A30006 */ lb $v1, 6($a1) /* AFDFE0 802404A0 80A20005 */ lb $v0, 5($a1) /* AFDFE4 802404A4 14620007 */ bne $v1, $v0, .L802404C4 -/* AFDFE8 802404A8 00000000 */ nop +/* AFDFE8 802404A8 00000000 */ nop /* AFDFEC 802404AC 80C2028E */ lb $v0, 0x28e($a2) /* AFDFF0 802404B0 84C30290 */ lh $v1, 0x290($a2) /* AFDFF4 802404B4 00021200 */ sll $v0, $v0, 8 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s index e2880bba27..190a9cb267 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s +++ b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s @@ -13,5 +13,5 @@ glabel func_802405BC_AFE0FC /* AFE11C 802405DC 24020002 */ addiu $v0, $zero, 2 /* AFE120 802405E0 03E00008 */ jr $ra /* AFE124 802405E4 27BD0018 */ addiu $sp, $sp, 0x18 -/* AFE128 802405E8 00000000 */ nop -/* AFE12C 802405EC 00000000 */ nop +/* AFE128 802405E8 00000000 */ nop +/* AFE12C 802405EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B02880/func_80240000_B02880.s b/asm/nonmatchings/world/area_kkj/kkj_23/B02880/func_80240000_B02880.s index 600e064685..24603063de 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_23/B02880/func_80240000_B02880.s +++ b/asm/nonmatchings/world/area_kkj/kkj_23/B02880/func_80240000_B02880.s @@ -8,5 +8,5 @@ glabel func_80240000_B02880 /* B0288C 8024000C A0620084 */ sb $v0, 0x84($v1) /* B02890 80240010 03E00008 */ jr $ra /* B02894 80240014 0000102D */ daddu $v0, $zero, $zero -/* B02898 80240018 00000000 */ nop -/* B0289C 8024001C 00000000 */ nop +/* B02898 80240018 00000000 */ nop +/* B0289C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s index 888e49bad5..00c5b21f3a 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s +++ b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s @@ -10,7 +10,7 @@ glabel func_80240048_B028C8 /* B028DC 8024005C 8FBF0010 */ lw $ra, 0x10($sp) /* B028E0 80240060 4600008D */ trunc.w.s $f2, $f0 /* B028E4 80240064 44021000 */ mfc1 $v0, $f2 -/* B028E8 80240068 00000000 */ nop +/* B028E8 80240068 00000000 */ nop /* B028EC 8024006C 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) /* B028F0 80240070 A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) /* B028F4 80240074 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_802400E0_B02960.s b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_802400E0_B02960.s index 050450e07e..eee2557cac 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_802400E0_B02960.s +++ b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_802400E0_B02960.s @@ -55,30 +55,30 @@ glabel func_802400E0_B02960 /* B02A28 802401A8 D4223CD0 */ ldc1 $f2, %lo(D_80243CD0)($at) /* B02A2C 802401AC 46002121 */ cvt.d.s $f4, $f4 /* B02A30 802401B0 46222032 */ c.eq.d $f4, $f2 -/* B02A34 802401B4 00000000 */ nop +/* B02A34 802401B4 00000000 */ nop /* B02A38 802401B8 45010007 */ bc1t .L802401D8 /* B02A3C 802401BC 46000086 */ mov.s $f2, $f0 /* B02A40 802401C0 3C018024 */ lui $at, %hi(D_80243CD8) /* B02A44 802401C4 D4203CD8 */ ldc1 $f0, %lo(D_80243CD8)($at) /* B02A48 802401C8 46202032 */ c.eq.d $f4, $f0 -/* B02A4C 802401CC 00000000 */ nop +/* B02A4C 802401CC 00000000 */ nop /* B02A50 802401D0 45000008 */ bc1f .L802401F4 -/* B02A54 802401D4 00000000 */ nop +/* B02A54 802401D4 00000000 */ nop .L802401D8: /* B02A58 802401D8 4618A03E */ c.le.s $f20, $f24 -/* B02A5C 802401DC 00000000 */ nop +/* B02A5C 802401DC 00000000 */ nop /* B02A60 802401E0 4500000C */ bc1f .L80240214 /* B02A64 802401E4 0000882D */ daddu $s1, $zero, $zero /* B02A68 802401E8 4616103E */ c.le.s $f2, $f22 /* B02A6C 802401EC 08090083 */ j .L8024020C -/* B02A70 802401F0 00000000 */ nop +/* B02A70 802401F0 00000000 */ nop .L802401F4: /* B02A74 802401F4 4618103E */ c.le.s $f2, $f24 -/* B02A78 802401F8 00000000 */ nop +/* B02A78 802401F8 00000000 */ nop /* B02A7C 802401FC 45000005 */ bc1f .L80240214 /* B02A80 80240200 0000882D */ daddu $s1, $zero, $zero /* B02A84 80240204 4616A03E */ c.le.s $f20, $f22 -/* B02A88 80240208 00000000 */ nop +/* B02A88 80240208 00000000 */ nop .L8024020C: /* B02A8C 8024020C 45030001 */ bc1tl .L80240214 /* B02A90 80240210 24110001 */ addiu $s1, $zero, 1 @@ -110,13 +110,13 @@ glabel func_802400E0_B02960 /* B02AF4 80240274 860200A6 */ lh $v0, 0xa6($s0) /* B02AF8 80240278 27A60028 */ addiu $a2, $sp, 0x28 /* B02AFC 8024027C 44820000 */ mtc1 $v0, $f0 -/* B02B00 80240280 00000000 */ nop +/* B02B00 80240280 00000000 */ nop /* B02B04 80240284 46800020 */ cvt.s.w $f0, $f0 /* B02B08 80240288 E7A00018 */ swc1 $f0, 0x18($sp) /* B02B0C 8024028C 860200A8 */ lh $v0, 0xa8($s0) /* B02B10 80240290 27A70024 */ addiu $a3, $sp, 0x24 /* B02B14 80240294 44820000 */ mtc1 $v0, $f0 -/* B02B18 80240298 00000000 */ nop +/* B02B18 80240298 00000000 */ nop /* B02B1C 8024029C 46800020 */ cvt.s.w $f0, $f0 /* B02B20 802402A0 0C0376B9 */ jal func_800DDAE4 /* B02B24 802402A4 E7A0001C */ swc1 $f0, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_8024039C_B02C1C.s b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_8024039C_B02C1C.s index add958555c..fe9e0562f3 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_8024039C_B02C1C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_8024039C_B02C1C.s @@ -84,7 +84,7 @@ glabel func_8024039C_B02C1C /* B02D58 802404D8 0C00A7B5 */ jal dist2D /* B02D5C 802404DC 0000802D */ daddu $s0, $zero, $zero /* B02D60 802404E0 4616003E */ c.le.s $f0, $f22 -/* B02D64 802404E4 00000000 */ nop +/* B02D64 802404E4 00000000 */ nop /* B02D68 802404E8 45000002 */ bc1f .L802404F4 /* B02D6C 802404EC 0240982D */ daddu $s3, $s2, $zero /* B02D70 802404F0 24100001 */ addiu $s0, $zero, 1 @@ -122,7 +122,7 @@ glabel func_8024039C_B02C1C /* B02DEC 8024056C 0C00A7B5 */ jal dist2D /* B02DF0 80240570 8E470030 */ lw $a3, 0x30($s2) /* B02DF4 80240574 461A003E */ c.le.s $f0, $f26 -/* B02DF8 80240578 00000000 */ nop +/* B02DF8 80240578 00000000 */ nop /* B02DFC 8024057C 45030001 */ bc1tl .L80240584 /* B02E00 80240580 36100010 */ ori $s0, $s0, 0x10 .L80240584: @@ -153,13 +153,13 @@ glabel func_8024039C_B02C1C /* B02E64 802405E4 862200A6 */ lh $v0, 0xa6($s1) /* B02E68 802405E8 27A60028 */ addiu $a2, $sp, 0x28 /* B02E6C 802405EC 44820000 */ mtc1 $v0, $f0 -/* B02E70 802405F0 00000000 */ nop +/* B02E70 802405F0 00000000 */ nop /* B02E74 802405F4 46800020 */ cvt.s.w $f0, $f0 /* B02E78 802405F8 E7A00018 */ swc1 $f0, 0x18($sp) /* B02E7C 802405FC 862200A8 */ lh $v0, 0xa8($s1) /* B02E80 80240600 0280382D */ daddu $a3, $s4, $zero /* B02E84 80240604 44820000 */ mtc1 $v0, $f0 -/* B02E88 80240608 00000000 */ nop +/* B02E88 80240608 00000000 */ nop /* B02E8C 8024060C 46800020 */ cvt.s.w $f0, $f0 /* B02E90 80240610 0C0376B9 */ jal func_800DDAE4 /* B02E94 80240614 E7A0001C */ swc1 $f0, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240674_B02EF4.s b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240674_B02EF4.s index 1b9af59db8..f95635538a 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240674_B02EF4.s +++ b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240674_B02EF4.s @@ -31,18 +31,18 @@ glabel func_80240674_B02EF4 /* B02F5C 802406DC 0C0B1EAF */ jal get_variable /* B02F60 802406E0 0040802D */ daddu $s0, $v0, $zero /* B02F64 802406E4 44901000 */ mtc1 $s0, $f2 -/* B02F68 802406E8 00000000 */ nop +/* B02F68 802406E8 00000000 */ nop /* B02F6C 802406EC 468010A0 */ cvt.s.w $f2, $f2 /* B02F70 802406F0 44936000 */ mtc1 $s3, $f12 -/* B02F74 802406F4 00000000 */ nop +/* B02F74 802406F4 00000000 */ nop /* B02F78 802406F8 46806320 */ cvt.s.w $f12, $f12 /* B02F7C 802406FC 44061000 */ mfc1 $a2, $f2 /* B02F80 80240700 44821000 */ mtc1 $v0, $f2 -/* B02F84 80240704 00000000 */ nop +/* B02F84 80240704 00000000 */ nop /* B02F88 80240708 468010A0 */ cvt.s.w $f2, $f2 /* B02F8C 8024070C 44071000 */ mfc1 $a3, $f2 /* B02F90 80240710 44927000 */ mtc1 $s2, $f14 -/* B02F94 80240714 00000000 */ nop +/* B02F94 80240714 00000000 */ nop /* B02F98 80240718 0C00A720 */ jal atan2 /* B02F9C 8024071C 468073A0 */ cvt.s.w $f14, $f14 /* B02FA0 80240720 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_802407A0_B03020.s b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_802407A0_B03020.s index 06c873b807..55efc59701 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_802407A0_B03020.s +++ b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_802407A0_B03020.s @@ -41,7 +41,7 @@ glabel func_802407A0_B03020 /* B030B0 80240830 0C00A7B5 */ jal dist2D /* B030B4 80240834 24140001 */ addiu $s4, $zero, 1 /* B030B8 80240838 4618003C */ c.lt.s $f0, $f24 -/* B030BC 8024083C 00000000 */ nop +/* B030BC 8024083C 00000000 */ nop /* B030C0 80240840 45030001 */ bc1tl .L80240848 /* B030C4 80240844 0000A02D */ daddu $s4, $zero, $zero .L80240848: @@ -56,13 +56,13 @@ glabel func_802407A0_B03020 /* B030E8 80240868 0C00A8BB */ jal sin_deg /* B030EC 8024086C 4600A306 */ mov.s $f12, $f20 /* B030F0 80240870 46180002 */ mul.s $f0, $f0, $f24 -/* B030F4 80240874 00000000 */ nop +/* B030F4 80240874 00000000 */ nop /* B030F8 80240878 C6560028 */ lwc1 $f22, 0x28($s2) /* B030FC 8024087C 4600B580 */ add.s $f22, $f22, $f0 /* B03100 80240880 0C00A8D4 */ jal cos_deg /* B03104 80240884 4600A306 */ mov.s $f12, $f20 /* B03108 80240888 46180002 */ mul.s $f0, $f0, $f24 -/* B0310C 8024088C 00000000 */ nop +/* B0310C 8024088C 00000000 */ nop /* B03110 80240890 0260202D */ daddu $a0, $s3, $zero /* B03114 80240894 02A0282D */ daddu $a1, $s5, $zero /* B03118 80240898 C6540030 */ lwc1 $f20, 0x30($s2) @@ -95,4 +95,4 @@ glabel func_802407A0_B03020 /* B03180 80240900 D7B40038 */ ldc1 $f20, 0x38($sp) /* B03184 80240904 03E00008 */ jr $ra /* B03188 80240908 27BD0050 */ addiu $sp, $sp, 0x50 -/* B0318C 8024090C 00000000 */ nop +/* B0318C 8024090C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B03190/func_802409AC_B0322C.s b/asm/nonmatchings/world/area_kkj/kkj_23/B03190/func_802409AC_B0322C.s index 68092da911..b58c3ea96e 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_23/B03190/func_802409AC_B0322C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_23/B03190/func_802409AC_B0322C.s @@ -10,4 +10,4 @@ glabel func_802409AC_B0322C /* B03240 802409C0 24020002 */ addiu $v0, $zero, 2 /* B03244 802409C4 03E00008 */ jr $ra /* B03248 802409C8 27BD0018 */ addiu $sp, $sp, 0x18 -/* B0324C 802409CC 00000000 */ nop +/* B0324C 802409CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_24/B06570/func_80240000_B06570.s b/asm/nonmatchings/world/area_kkj/kkj_24/B06570/func_80240000_B06570.s index d30ba29bbf..872899f34d 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_24/B06570/func_80240000_B06570.s +++ b/asm/nonmatchings/world/area_kkj/kkj_24/B06570/func_80240000_B06570.s @@ -5,7 +5,7 @@ glabel func_80240000_B06570 /* B06570 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B06574 80240004 AFBF0010 */ sw $ra, 0x10($sp) /* B06578 80240008 0C046ED4 */ jal enable_world_fog -/* B0657C 8024000C 00000000 */ nop +/* B0657C 8024000C 00000000 */ nop /* B06580 80240010 8FBF0010 */ lw $ra, 0x10($sp) /* B06584 80240014 24020002 */ addiu $v0, $zero, 2 /* B06588 80240018 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06A00/func_80240000_B06A00.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06A00/func_80240000_B06A00.s index 5fdfe6743b..81f8ec4f9c 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06A00/func_80240000_B06A00.s +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06A00/func_80240000_B06A00.s @@ -8,5 +8,5 @@ glabel func_80240000_B06A00 /* B06A0C 8024000C A0620084 */ sb $v0, 0x84($v1) /* B06A10 80240010 03E00008 */ jr $ra /* B06A14 80240014 0000102D */ daddu $v0, $zero, $zero -/* B06A18 80240018 00000000 */ nop -/* B06A1C 8024001C 00000000 */ nop +/* B06A18 80240018 00000000 */ nop +/* B06A1C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06A20/func_80240020_B06A20.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06A20/func_80240020_B06A20.s index 96bbb3b6ab..47d211fa7a 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06A20/func_80240020_B06A20.s +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06A20/func_80240020_B06A20.s @@ -5,7 +5,7 @@ glabel func_80240020_B06A20 /* B06A20 80240020 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B06A24 80240024 AFBF0010 */ sw $ra, 0x10($sp) /* B06A28 80240028 0C03A6D5 */ jal increment_status_menu_disabled -/* B06A2C 8024002C 00000000 */ nop +/* B06A2C 8024002C 00000000 */ nop /* B06A30 80240030 3C05437F */ lui $a1, 0x437f /* B06A34 80240034 0C04DF69 */ jal func_80137DA4 /* B06A38 80240038 0000202D */ daddu $a0, $zero, $zero @@ -13,4 +13,4 @@ glabel func_80240020_B06A20 /* B06A40 80240040 24020002 */ addiu $v0, $zero, 2 /* B06A44 80240044 03E00008 */ jr $ra /* B06A48 80240048 27BD0018 */ addiu $sp, $sp, 0x18 -/* B06A4C 8024004C 00000000 */ nop +/* B06A4C 8024004C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_802400FC_B06AFC.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_802400FC_B06AFC.s index fe6d3e5e26..2f5a53edfe 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_802400FC_B06AFC.s +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_802400FC_B06AFC.s @@ -23,18 +23,18 @@ glabel func_802400FC_B06AFC /* B06B44 80240144 8E050000 */ lw $a1, ($s0) /* B06B48 80240148 26100004 */ addiu $s0, $s0, 4 /* B06B4C 8024014C 4482C000 */ mtc1 $v0, $f24 -/* B06B50 80240150 00000000 */ nop +/* B06B50 80240150 00000000 */ nop /* B06B54 80240154 4680C620 */ cvt.s.w $f24, $f24 /* B06B58 80240158 0C0B1EAF */ jal get_variable /* B06B5C 8024015C 0220202D */ daddu $a0, $s1, $zero /* B06B60 80240160 8E050000 */ lw $a1, ($s0) /* B06B64 80240164 4482B000 */ mtc1 $v0, $f22 -/* B06B68 80240168 00000000 */ nop +/* B06B68 80240168 00000000 */ nop /* B06B6C 8024016C 4680B5A0 */ cvt.s.w $f22, $f22 /* B06B70 80240170 0C0B1EAF */ jal get_variable /* B06B74 80240174 0220202D */ daddu $a0, $s1, $zero /* B06B78 80240178 4482A000 */ mtc1 $v0, $f20 -/* B06B7C 8024017C 00000000 */ nop +/* B06B7C 8024017C 00000000 */ nop /* B06B80 80240180 4680A520 */ cvt.s.w $f20, $f20 /* B06B84 80240184 0C04417A */ jal get_entity_by_index /* B06B88 80240188 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_80240264_B06C64.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_80240264_B06C64.s index 494bbbac8a..215819ba4d 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_80240264_B06C64.s +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_80240264_B06C64.s @@ -43,5 +43,5 @@ glabel func_80240264_B06C64 /* B06CFC 802402FC 24020002 */ addiu $v0, $zero, 2 /* B06D00 80240300 03E00008 */ jr $ra /* B06D04 80240304 27BD0040 */ addiu $sp, $sp, 0x40 -/* B06D08 80240308 00000000 */ nop -/* B06D0C 8024030C 00000000 */ nop +/* B06D08 80240308 00000000 */ nop +/* B06D0C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802406EC_B070EC.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802406EC_B070EC.s index 6b7af2c52a..66009bb4f8 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802406EC_B070EC.s +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802406EC_B070EC.s @@ -27,12 +27,12 @@ glabel func_802406EC_B070EC /* B07144 80240744 AE11000C */ sw $s1, 0xc($s0) /* B07148 80240748 846200B0 */ lh $v0, 0xb0($v1) /* B0714C 8024074C 44820000 */ mtc1 $v0, $f0 -/* B07150 80240750 00000000 */ nop +/* B07150 80240750 00000000 */ nop /* B07154 80240754 46800020 */ cvt.s.w $f0, $f0 /* B07158 80240758 E6000034 */ swc1 $f0, 0x34($s0) /* B0715C 8024075C 846200B2 */ lh $v0, 0xb2($v1) /* B07160 80240760 44820000 */ mtc1 $v0, $f0 -/* B07164 80240764 00000000 */ nop +/* B07164 80240764 00000000 */ nop /* B07168 80240768 46800020 */ cvt.s.w $f0, $f0 /* B0716C 8024076C E6000038 */ swc1 $f0, 0x38($s0) /* B07170 80240770 C4600028 */ lwc1 $f0, 0x28($v1) diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_8024086C_B0726C.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_8024086C_B0726C.s index b76a3a4b0b..06d12d7055 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_8024086C_B0726C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_8024086C_B0726C.s @@ -23,7 +23,7 @@ glabel func_8024086C_B0726C /* B072B4 802408B4 4600008D */ trunc.w.s $f2, $f0 /* B072B8 802408B8 44111000 */ mfc1 $s1, $f2 /* B072BC 802408BC 0C0B210B */ jal get_float_variable -/* B072C0 802408C0 00000000 */ nop +/* B072C0 802408C0 00000000 */ nop /* B072C4 802408C4 0000202D */ daddu $a0, $zero, $zero /* B072C8 802408C8 3C05FD05 */ lui $a1, 0xfd05 /* B072CC 802408CC 4600008D */ trunc.w.s $f2, $f0 @@ -32,15 +32,15 @@ glabel func_8024086C_B0726C /* B072D8 802408D8 34A50F8A */ ori $a1, $a1, 0xf8a /* B072DC 802408DC 0040182D */ daddu $v1, $v0, $zero /* B072E0 802408E0 44920000 */ mtc1 $s2, $f0 -/* B072E4 802408E4 00000000 */ nop +/* B072E4 802408E4 00000000 */ nop /* B072E8 802408E8 46800020 */ cvt.s.w $f0, $f0 /* B072EC 802408EC E4600010 */ swc1 $f0, 0x10($v1) /* B072F0 802408F0 44910000 */ mtc1 $s1, $f0 -/* B072F4 802408F4 00000000 */ nop +/* B072F4 802408F4 00000000 */ nop /* B072F8 802408F8 46800020 */ cvt.s.w $f0, $f0 /* B072FC 802408FC E4600014 */ swc1 $f0, 0x14($v1) /* B07300 80240900 44900000 */ mtc1 $s0, $f0 -/* B07304 80240904 00000000 */ nop +/* B07304 80240904 00000000 */ nop /* B07308 80240908 46800020 */ cvt.s.w $f0, $f0 /* B0730C 8024090C E4600018 */ swc1 $f0, 0x18($v1) /* B07310 80240910 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_8024092C_B0732C.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_8024092C_B0732C.s index 492e118b5c..af087e7bad 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_8024092C_B0732C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_8024092C_B0732C.s @@ -23,7 +23,7 @@ glabel func_8024092C_B0732C /* B07374 80240974 4600008D */ trunc.w.s $f2, $f0 /* B07378 80240978 44111000 */ mfc1 $s1, $f2 /* B0737C 8024097C 0C0B210B */ jal get_float_variable -/* B07380 80240980 00000000 */ nop +/* B07380 80240980 00000000 */ nop /* B07384 80240984 0000202D */ daddu $a0, $zero, $zero /* B07388 80240988 3C05FD05 */ lui $a1, 0xfd05 /* B0738C 8024098C 4600008D */ trunc.w.s $f2, $f0 @@ -32,15 +32,15 @@ glabel func_8024092C_B0732C /* B07398 80240998 34A50F8A */ ori $a1, $a1, 0xf8a /* B0739C 8024099C 0040182D */ daddu $v1, $v0, $zero /* B073A0 802409A0 44920000 */ mtc1 $s2, $f0 -/* B073A4 802409A4 00000000 */ nop +/* B073A4 802409A4 00000000 */ nop /* B073A8 802409A8 46800020 */ cvt.s.w $f0, $f0 /* B073AC 802409AC E460001C */ swc1 $f0, 0x1c($v1) /* B073B0 802409B0 44910000 */ mtc1 $s1, $f0 -/* B073B4 802409B4 00000000 */ nop +/* B073B4 802409B4 00000000 */ nop /* B073B8 802409B8 46800020 */ cvt.s.w $f0, $f0 /* B073BC 802409BC E4600020 */ swc1 $f0, 0x20($v1) /* B073C0 802409C0 44900000 */ mtc1 $s0, $f0 -/* B073C4 802409C4 00000000 */ nop +/* B073C4 802409C4 00000000 */ nop /* B073C8 802409C8 46800020 */ cvt.s.w $f0, $f0 /* B073CC 802409CC E4600024 */ swc1 $f0, 0x24($v1) /* B073D0 802409D0 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802409EC_B073EC.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802409EC_B073EC.s index 43e3ee944e..48b7e9f715 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802409EC_B073EC.s +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802409EC_B073EC.s @@ -23,7 +23,7 @@ glabel func_802409EC_B073EC /* B07434 80240A34 4600008D */ trunc.w.s $f2, $f0 /* B07438 80240A38 44111000 */ mfc1 $s1, $f2 /* B0743C 80240A3C 0C0B210B */ jal get_float_variable -/* B07440 80240A40 00000000 */ nop +/* B07440 80240A40 00000000 */ nop /* B07444 80240A44 0000202D */ daddu $a0, $zero, $zero /* B07448 80240A48 3C05FD05 */ lui $a1, 0xfd05 /* B0744C 80240A4C 4600008D */ trunc.w.s $f2, $f0 @@ -32,15 +32,15 @@ glabel func_802409EC_B073EC /* B07458 80240A58 34A50F8A */ ori $a1, $a1, 0xf8a /* B0745C 80240A5C 0040182D */ daddu $v1, $v0, $zero /* B07460 80240A60 44920000 */ mtc1 $s2, $f0 -/* B07464 80240A64 00000000 */ nop +/* B07464 80240A64 00000000 */ nop /* B07468 80240A68 46800020 */ cvt.s.w $f0, $f0 /* B0746C 80240A6C E4600028 */ swc1 $f0, 0x28($v1) /* B07470 80240A70 44910000 */ mtc1 $s1, $f0 -/* B07474 80240A74 00000000 */ nop +/* B07474 80240A74 00000000 */ nop /* B07478 80240A78 46800020 */ cvt.s.w $f0, $f0 /* B0747C 80240A7C E460002C */ swc1 $f0, 0x2c($v1) /* B07480 80240A80 44900000 */ mtc1 $s0, $f0 -/* B07484 80240A84 00000000 */ nop +/* B07484 80240A84 00000000 */ nop /* B07488 80240A88 46800020 */ cvt.s.w $f0, $f0 /* B0748C 80240A8C E4600030 */ swc1 $f0, 0x30($v1) /* B07490 80240A90 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240BA0_B075A0.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240BA0_B075A0.s index 369e452920..4050358035 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240BA0_B075A0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240BA0_B075A0.s @@ -29,17 +29,17 @@ glabel func_80240BA0_B075A0 /* B07600 80240C00 0040802D */ daddu $s0, $v0, $zero /* B07604 80240C04 8E43000C */ lw $v1, 0xc($s2) /* B07608 80240C08 44930000 */ mtc1 $s3, $f0 -/* B0760C 80240C0C 00000000 */ nop +/* B0760C 80240C0C 00000000 */ nop /* B07610 80240C10 46800020 */ cvt.s.w $f0, $f0 /* B07614 80240C14 E4600004 */ swc1 $f0, 4($v1) /* B07618 80240C18 8E43000C */ lw $v1, 0xc($s2) /* B0761C 80240C1C 44900000 */ mtc1 $s0, $f0 -/* B07620 80240C20 00000000 */ nop +/* B07620 80240C20 00000000 */ nop /* B07624 80240C24 46800020 */ cvt.s.w $f0, $f0 /* B07628 80240C28 E4600008 */ swc1 $f0, 8($v1) /* B0762C 80240C2C 8E43000C */ lw $v1, 0xc($s2) /* B07630 80240C30 44820000 */ mtc1 $v0, $f0 -/* B07634 80240C34 00000000 */ nop +/* B07634 80240C34 00000000 */ nop /* B07638 80240C38 46800020 */ cvt.s.w $f0, $f0 /* B0763C 80240C3C E460000C */ swc1 $f0, 0xc($v1) /* B07640 80240C40 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240D30_B07730.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240D30_B07730.s index 8f53310d40..33e6d4e5f8 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240D30_B07730.s +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240D30_B07730.s @@ -16,7 +16,7 @@ glabel func_80240D30_B07730 /* B07758 80240D58 10620015 */ beq $v1, $v0, .L80240DB0 /* B0775C 80240D5C 3C048080 */ lui $a0, 0x8080 /* B07760 80240D60 0809038D */ j .L80240E34 -/* B07764 80240D64 00000000 */ nop +/* B07764 80240D64 00000000 */ nop .L80240D68: /* B07768 80240D68 0000202D */ daddu $a0, $zero, $zero /* B0776C 80240D6C 240500D0 */ addiu $a1, $zero, 0xd0 diff --git a/asm/nonmatchings/world/area_kkj/kkj_26/B13120/func_80240000_B13120.s b/asm/nonmatchings/world/area_kkj/kkj_26/B13120/func_80240000_B13120.s index 76b334fb4d..51521b3680 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_26/B13120/func_80240000_B13120.s +++ b/asm/nonmatchings/world/area_kkj/kkj_26/B13120/func_80240000_B13120.s @@ -12,5 +12,5 @@ glabel func_80240000_B13120 /* B1313C 8024001C A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* B13140 80240020 03E00008 */ jr $ra /* B13144 80240024 24020002 */ addiu $v0, $zero, 2 -/* B13148 80240028 00000000 */ nop -/* B1314C 8024002C 00000000 */ nop +/* B13148 80240028 00000000 */ nop +/* B1314C 8024002C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_27/B14080/func_80240310_B14080.s b/asm/nonmatchings/world/area_kkj/kkj_27/B14080/func_80240310_B14080.s index 6f15b0b3fa..baf609940b 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_27/B14080/func_80240310_B14080.s +++ b/asm/nonmatchings/world/area_kkj/kkj_27/B14080/func_80240310_B14080.s @@ -26,11 +26,11 @@ glabel func_80240310_B14080 /* B140D4 80240364 44810000 */ mtc1 $at, $f0 /* B140D8 80240368 00431021 */ addu $v0, $v0, $v1 /* B140DC 8024036C 4482A000 */ mtc1 $v0, $f20 -/* B140E0 80240370 00000000 */ nop +/* B140E0 80240370 00000000 */ nop /* B140E4 80240374 4680A520 */ cvt.s.w $f20, $f20 /* B140E8 80240378 4600D306 */ mov.s $f12, $f26 /* B140EC 8024037C 4600A502 */ mul.s $f20, $f20, $f0 -/* B140F0 80240380 00000000 */ nop +/* B140F0 80240380 00000000 */ nop /* B140F4 80240384 0C00A7B5 */ jal dist2D /* B140F8 80240388 4600C386 */ mov.s $f14, $f24 /* B140FC 8024038C 4600D306 */ mov.s $f12, $f26 @@ -49,7 +49,7 @@ glabel func_80240310_B14080 /* B14130 802403C0 0C00A8BB */ jal sin_deg /* B14134 802403C4 4600A306 */ mov.s $f12, $f20 /* B14138 802403C8 4600B002 */ mul.s $f0, $f22, $f0 -/* B1413C 802403CC 00000000 */ nop +/* B1413C 802403CC 00000000 */ nop /* B14140 802403D0 461A0000 */ add.s $f0, $f0, $f26 /* B14144 802403D4 4600A306 */ mov.s $f12, $f20 /* B14148 802403D8 3C108011 */ lui $s0, %hi(gPlayerStatus) @@ -57,7 +57,7 @@ glabel func_80240310_B14080 /* B14150 802403E0 0C00A8D4 */ jal cos_deg /* B14154 802403E4 E6000028 */ swc1 $f0, 0x28($s0) /* B14158 802403E8 4600B582 */ mul.s $f22, $f22, $f0 -/* B1415C 802403EC 00000000 */ nop +/* B1415C 802403EC 00000000 */ nop /* B14160 802403F0 4616C601 */ sub.s $f24, $f24, $f22 /* B14164 802403F4 E6180030 */ swc1 $f24, 0x30($s0) /* B14168 802403F8 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_29/B150B0/func_80240000_B150B0.s b/asm/nonmatchings/world/area_kkj/kkj_29/B150B0/func_80240000_B150B0.s index a398faff3c..68e55e49e6 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_29/B150B0/func_80240000_B150B0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_29/B150B0/func_80240000_B150B0.s @@ -12,5 +12,5 @@ glabel func_80240000_B150B0 /* B150CC 8024001C A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* B150D0 80240020 03E00008 */ jr $ra /* B150D4 80240024 24020002 */ addiu $v0, $zero, 2 -/* B150D8 80240028 00000000 */ nop -/* B150DC 8024002C 00000000 */ nop +/* B150D8 80240028 00000000 */ nop +/* B150DC 8024002C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_29/B150E0/func_80240030_B150E0.s b/asm/nonmatchings/world/area_kkj/kkj_29/B150E0/func_80240030_B150E0.s index 5943a30adf..5c8bc85496 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_29/B150E0/func_80240030_B150E0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_29/B150E0/func_80240030_B150E0.s @@ -18,4 +18,4 @@ glabel func_80240030_B150E0 /* B15110 80240060 AC820084 */ sw $v0, 0x84($a0) /* B15114 80240064 03E00008 */ jr $ra /* B15118 80240068 24020002 */ addiu $v0, $zero, 2 -/* B1511C 8024006C 00000000 */ nop +/* B1511C 8024006C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240000_8ABF90.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240000_8ABF90.s index 147a4b3ba8..587063fd3a 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240000_8ABF90.s +++ b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240000_8ABF90.s @@ -72,7 +72,7 @@ glabel func_80240000_8ABF90 /* 8AC098 80240108 26314100 */ addiu $s1, $s1, %lo(D_80244100) /* 8AC09C 8024010C 8E2F0000 */ lw $t7, ($s1) /* 8AC0A0 80240110 19E00088 */ blez $t7, .L80240334 -/* 8AC0A4 80240114 00000000 */ nop +/* 8AC0A4 80240114 00000000 */ nop /* 8AC0A8 80240118 3C108024 */ lui $s0, %hi(D_80244104) /* 8AC0AC 8024011C 26104104 */ addiu $s0, $s0, %lo(D_80244104) /* 8AC0B0 80240120 8E030000 */ lw $v1, ($s0) @@ -84,7 +84,7 @@ glabel func_80240000_8ABF90 /* 8AC0C8 80240138 00441023 */ subu $v0, $v0, $a0 /* 8AC0CC 8024013C 00430018 */ mult $v0, $v1 /* 8AC0D0 80240140 00004012 */ mflo $t0 -/* 8AC0D4 80240144 00000000 */ nop +/* 8AC0D4 80240144 00000000 */ nop /* 8AC0D8 80240148 15E00002 */ bnez $t7, .L80240154 /* 8AC0DC 8024014C 010F001A */ div $zero, $t0, $t7 /* 8AC0E0 80240150 0007000D */ break 7 @@ -93,7 +93,7 @@ glabel func_80240000_8ABF90 /* 8AC0E8 80240158 15E10004 */ bne $t7, $at, .L8024016C /* 8AC0EC 8024015C 3C018000 */ lui $at, 0x8000 /* 8AC0F0 80240160 15010002 */ bne $t0, $at, .L8024016C -/* 8AC0F4 80240164 00000000 */ nop +/* 8AC0F4 80240164 00000000 */ nop /* 8AC0F8 80240168 0006000D */ break 6 .L8024016C: /* 8AC0FC 8024016C 00007012 */ mflo $t6 @@ -104,7 +104,7 @@ glabel func_80240000_8ABF90 /* 8AC110 80240180 00451023 */ subu $v0, $v0, $a1 /* 8AC114 80240184 00430018 */ mult $v0, $v1 /* 8AC118 80240188 00004012 */ mflo $t0 -/* 8AC11C 8024018C 00000000 */ nop +/* 8AC11C 8024018C 00000000 */ nop /* 8AC120 80240190 15E00002 */ bnez $t7, .L8024019C /* 8AC124 80240194 010F001A */ div $zero, $t0, $t7 /* 8AC128 80240198 0007000D */ break 7 @@ -113,7 +113,7 @@ glabel func_80240000_8ABF90 /* 8AC130 802401A0 15E10004 */ bne $t7, $at, .L802401B4 /* 8AC134 802401A4 3C018000 */ lui $at, 0x8000 /* 8AC138 802401A8 15010002 */ bne $t0, $at, .L802401B4 -/* 8AC13C 802401AC 00000000 */ nop +/* 8AC13C 802401AC 00000000 */ nop /* 8AC140 802401B0 0006000D */ break 6 .L802401B4: /* 8AC144 802401B4 00006812 */ mflo $t5 @@ -124,7 +124,7 @@ glabel func_80240000_8ABF90 /* 8AC158 802401C8 00461023 */ subu $v0, $v0, $a2 /* 8AC15C 802401CC 00430018 */ mult $v0, $v1 /* 8AC160 802401D0 00004012 */ mflo $t0 -/* 8AC164 802401D4 00000000 */ nop +/* 8AC164 802401D4 00000000 */ nop /* 8AC168 802401D8 15E00002 */ bnez $t7, .L802401E4 /* 8AC16C 802401DC 010F001A */ div $zero, $t0, $t7 /* 8AC170 802401E0 0007000D */ break 7 @@ -133,7 +133,7 @@ glabel func_80240000_8ABF90 /* 8AC178 802401E8 15E10004 */ bne $t7, $at, .L802401FC /* 8AC17C 802401EC 3C018000 */ lui $at, 0x8000 /* 8AC180 802401F0 15010002 */ bne $t0, $at, .L802401FC -/* 8AC184 802401F4 00000000 */ nop +/* 8AC184 802401F4 00000000 */ nop /* 8AC188 802401F8 0006000D */ break 6 .L802401FC: /* 8AC18C 802401FC 00006012 */ mflo $t4 @@ -144,7 +144,7 @@ glabel func_80240000_8ABF90 /* 8AC1A0 80240210 00471023 */ subu $v0, $v0, $a3 /* 8AC1A4 80240214 00430018 */ mult $v0, $v1 /* 8AC1A8 80240218 00004012 */ mflo $t0 -/* 8AC1AC 8024021C 00000000 */ nop +/* 8AC1AC 8024021C 00000000 */ nop /* 8AC1B0 80240220 15E00002 */ bnez $t7, .L8024022C /* 8AC1B4 80240224 010F001A */ div $zero, $t0, $t7 /* 8AC1B8 80240228 0007000D */ break 7 @@ -153,7 +153,7 @@ glabel func_80240000_8ABF90 /* 8AC1C0 80240230 15E10004 */ bne $t7, $at, .L80240244 /* 8AC1C4 80240234 3C018000 */ lui $at, 0x8000 /* 8AC1C8 80240238 15010002 */ bne $t0, $at, .L80240244 -/* 8AC1CC 8024023C 00000000 */ nop +/* 8AC1CC 8024023C 00000000 */ nop /* 8AC1D0 80240240 0006000D */ break 6 .L80240244: /* 8AC1D4 80240244 00005812 */ mflo $t3 @@ -164,7 +164,7 @@ glabel func_80240000_8ABF90 /* 8AC1E8 80240258 00491023 */ subu $v0, $v0, $t1 /* 8AC1EC 8024025C 00430018 */ mult $v0, $v1 /* 8AC1F0 80240260 00004012 */ mflo $t0 -/* 8AC1F4 80240264 00000000 */ nop +/* 8AC1F4 80240264 00000000 */ nop /* 8AC1F8 80240268 15E00002 */ bnez $t7, .L80240274 /* 8AC1FC 8024026C 010F001A */ div $zero, $t0, $t7 /* 8AC200 80240270 0007000D */ break 7 @@ -173,7 +173,7 @@ glabel func_80240000_8ABF90 /* 8AC208 80240278 15E10004 */ bne $t7, $at, .L8024028C /* 8AC20C 8024027C 3C018000 */ lui $at, 0x8000 /* 8AC210 80240280 15010002 */ bne $t0, $at, .L8024028C -/* 8AC214 80240284 00000000 */ nop +/* 8AC214 80240284 00000000 */ nop /* 8AC218 80240288 0006000D */ break 6 .L8024028C: /* 8AC21C 8024028C 00005012 */ mflo $t2 @@ -184,7 +184,7 @@ glabel func_80240000_8ABF90 /* 8AC230 802402A0 00481023 */ subu $v0, $v0, $t0 /* 8AC234 802402A4 00430018 */ mult $v0, $v1 /* 8AC238 802402A8 0000C812 */ mflo $t9 -/* 8AC23C 802402AC 00000000 */ nop +/* 8AC23C 802402AC 00000000 */ nop /* 8AC240 802402B0 15E00002 */ bnez $t7, .L802402BC /* 8AC244 802402B4 032F001A */ div $zero, $t9, $t7 /* 8AC248 802402B8 0007000D */ break 7 @@ -193,7 +193,7 @@ glabel func_80240000_8ABF90 /* 8AC250 802402C0 15E10004 */ bne $t7, $at, .L802402D4 /* 8AC254 802402C4 3C018000 */ lui $at, 0x8000 /* 8AC258 802402C8 17210002 */ bne $t9, $at, .L802402D4 -/* 8AC25C 802402CC 00000000 */ nop +/* 8AC25C 802402CC 00000000 */ nop /* 8AC260 802402D0 0006000D */ break 6 .L802402D4: /* 8AC264 802402D4 00001012 */ mflo $v0 diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404E8_8AC478.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404E8_8AC478.s index c171f9a74f..6dedb32568 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404E8_8AC478.s +++ b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404E8_8AC478.s @@ -10,10 +10,10 @@ glabel func_802404E8_8AC478 /* 8AC48C 802404FC 3421126F */ ori $at, $at, 0x126f /* 8AC490 80240500 44811000 */ mtc1 $at, $f2 /* 8AC494 80240504 44820000 */ mtc1 $v0, $f0 -/* 8AC498 80240508 00000000 */ nop +/* 8AC498 80240508 00000000 */ nop /* 8AC49C 8024050C 46800020 */ cvt.s.w $f0, $f0 /* 8AC4A0 80240510 46020002 */ mul.s $f0, $f0, $f2 -/* 8AC4A4 80240514 00000000 */ nop +/* 8AC4A4 80240514 00000000 */ nop /* 8AC4A8 80240518 8FBF0010 */ lw $ra, 0x10($sp) /* 8AC4AC 8024051C 24020002 */ addiu $v0, $zero, 2 /* 8AC4B0 80240520 3C01800B */ lui $at, %hi(D_800B2260) diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405F0_8AC580.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405F0_8AC580.s index 87f98b76b2..6abb9f9431 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405F0_8AC580.s +++ b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405F0_8AC580.s @@ -42,14 +42,14 @@ glabel func_802405F0_8AC580 /* 8AC610 80240680 10600009 */ beqz $v1, .L802406A8 /* 8AC614 80240684 26040038 */ addiu $a0, $s0, 0x38 /* 8AC618 80240688 080902E5 */ j .L80240B94 -/* 8AC61C 8024068C 00000000 */ nop +/* 8AC61C 8024068C 00000000 */ nop .L80240690: /* 8AC620 80240690 1062009C */ beq $v1, $v0, .L80240904 /* 8AC624 80240694 24020003 */ addiu $v0, $zero, 3 /* 8AC628 80240698 106200EF */ beq $v1, $v0, .L80240A58 /* 8AC62C 8024069C 26040038 */ addiu $a0, $s0, 0x38 /* 8AC630 802406A0 080902E5 */ j .L80240B94 -/* 8AC634 802406A4 00000000 */ nop +/* 8AC634 802406A4 00000000 */ nop .L802406A8: /* 8AC638 802406A8 3C01C47A */ lui $at, 0xc47a /* 8AC63C 802406AC 44810000 */ mtc1 $at, $f0 @@ -65,7 +65,7 @@ glabel func_802405F0_8AC580 /* 8AC664 802406D4 00431021 */ addu $v0, $v0, $v1 /* 8AC668 802406D8 E6000064 */ swc1 $f0, 0x64($s0) /* 8AC66C 802406DC 44820000 */ mtc1 $v0, $f0 -/* 8AC670 802406E0 00000000 */ nop +/* 8AC670 802406E0 00000000 */ nop /* 8AC674 802406E4 46800020 */ cvt.s.w $f0, $f0 /* 8AC678 802406E8 E6000060 */ swc1 $f0, 0x60($s0) /* 8AC67C 802406EC 8E22007C */ lw $v0, 0x7c($s1) @@ -75,7 +75,7 @@ glabel func_802405F0_8AC580 /* 8AC68C 802406FC 26050040 */ addiu $a1, $s0, 0x40 /* 8AC690 80240700 3C0142C8 */ lui $at, 0x42c8 /* 8AC694 80240704 44810000 */ mtc1 $at, $f0 -/* 8AC698 80240708 00000000 */ nop +/* 8AC698 80240708 00000000 */ nop /* 8AC69C 8024070C E600003C */ swc1 $f0, 0x3c($s0) /* 8AC6A0 80240710 8E230078 */ lw $v1, 0x78($s1) /* 8AC6A4 80240714 C6020060 */ lwc1 $f2, 0x60($s0) @@ -84,7 +84,7 @@ glabel func_802405F0_8AC580 /* 8AC6B0 80240720 00021900 */ sll $v1, $v0, 4 /* 8AC6B4 80240724 00431021 */ addu $v0, $v0, $v1 /* 8AC6B8 80240728 44820000 */ mtc1 $v0, $f0 -/* 8AC6BC 8024072C 00000000 */ nop +/* 8AC6BC 8024072C 00000000 */ nop /* 8AC6C0 80240730 46800020 */ cvt.s.w $f0, $f0 /* 8AC6C4 80240734 46001080 */ add.s $f2, $f2, $f0 /* 8AC6C8 80240738 3C014319 */ lui $at, 0x4319 @@ -95,7 +95,7 @@ glabel func_802405F0_8AC580 /* 8AC6DC 8024074C 4406A000 */ mfc1 $a2, $f20 /* 8AC6E0 80240750 44071000 */ mfc1 $a3, $f2 /* 8AC6E4 80240754 0C00A7E7 */ jal add_vec2D_polar -/* 8AC6E8 80240758 00000000 */ nop +/* 8AC6E8 80240758 00000000 */ nop /* 8AC6EC 8024075C C6000040 */ lwc1 $f0, 0x40($s0) /* 8AC6F0 80240760 46000007 */ neg.s $f0, $f0 /* 8AC6F4 80240764 46160000 */ add.s $f0, $f0, $f22 @@ -103,9 +103,9 @@ glabel func_802405F0_8AC580 /* 8AC6FC 8024076C 3C013E19 */ lui $at, 0x3e19 /* 8AC700 80240770 3421999A */ ori $at, $at, 0x999a /* 8AC704 80240774 44811000 */ mtc1 $at, $f2 -/* 8AC708 80240778 00000000 */ nop +/* 8AC708 80240778 00000000 */ nop /* 8AC70C 8024077C 46020002 */ mul.s $f0, $f0, $f2 -/* 8AC710 80240780 00000000 */ nop +/* 8AC710 80240780 00000000 */ nop /* 8AC714 80240784 C602003C */ lwc1 $f2, 0x3c($s0) /* 8AC718 80240788 3C04B000 */ lui $a0, 0xb000 /* 8AC71C 8024078C 46001080 */ add.s $f2, $f2, $f0 @@ -120,7 +120,7 @@ glabel func_802405F0_8AC580 /* 8AC740 802407B0 C602003C */ lwc1 $f2, 0x3c($s0) /* 8AC744 802407B4 3C0141A0 */ lui $at, 0x41a0 /* 8AC748 802407B8 44810000 */ mtc1 $at, $f0 -/* 8AC74C 802407BC 00000000 */ nop +/* 8AC74C 802407BC 00000000 */ nop /* 8AC750 802407C0 46001080 */ add.s $f2, $f2, $f0 /* 8AC754 802407C4 E7A00010 */ swc1 $f0, 0x10($sp) /* 8AC758 802407C8 8E050038 */ lw $a1, 0x38($s0) @@ -145,7 +145,7 @@ glabel func_802405F0_8AC580 /* 8AC7A0 80240810 00021900 */ sll $v1, $v0, 4 /* 8AC7A4 80240814 00431021 */ addu $v0, $v0, $v1 /* 8AC7A8 80240818 44820000 */ mtc1 $v0, $f0 -/* 8AC7AC 8024081C 00000000 */ nop +/* 8AC7AC 8024081C 00000000 */ nop /* 8AC7B0 80240820 46800020 */ cvt.s.w $f0, $f0 /* 8AC7B4 80240824 46001080 */ add.s $f2, $f2, $f0 /* 8AC7B8 80240828 3C014319 */ lui $at, 0x4319 @@ -165,9 +165,9 @@ glabel func_802405F0_8AC580 /* 8AC7F0 80240860 3C013E19 */ lui $at, 0x3e19 /* 8AC7F4 80240864 3421999A */ ori $at, $at, 0x999a /* 8AC7F8 80240868 44811000 */ mtc1 $at, $f2 -/* 8AC7FC 8024086C 00000000 */ nop +/* 8AC7FC 8024086C 00000000 */ nop /* 8AC800 80240870 46020002 */ mul.s $f0, $f0, $f2 -/* 8AC804 80240874 00000000 */ nop +/* 8AC804 80240874 00000000 */ nop /* 8AC808 80240878 C602003C */ lwc1 $f2, 0x3c($s0) /* 8AC80C 8024087C 46001080 */ add.s $f2, $f2, $f0 /* 8AC810 80240880 3C034EC4 */ lui $v1, 0x4ec4 @@ -186,10 +186,10 @@ glabel func_802405F0_8AC580 /* 8AC844 802408B4 00021080 */ sll $v0, $v0, 2 /* 8AC848 802408B8 00431021 */ addu $v0, $v0, $v1 /* 8AC84C 802408BC 1482000B */ bne $a0, $v0, .L802408EC -/* 8AC850 802408C0 00000000 */ nop +/* 8AC850 802408C0 00000000 */ nop /* 8AC854 802408C4 3C014120 */ lui $at, 0x4120 /* 8AC858 802408C8 44810000 */ mtc1 $at, $f0 -/* 8AC85C 802408CC 00000000 */ nop +/* 8AC85C 802408CC 00000000 */ nop /* 8AC860 802408D0 46001080 */ add.s $f2, $f2, $f0 /* 8AC864 802408D4 E7A00010 */ swc1 $f0, 0x10($sp) /* 8AC868 802408D8 8E050038 */ lw $a1, 0x38($s0) @@ -215,10 +215,10 @@ glabel func_802405F0_8AC580 /* 8AC8B0 80240920 C62200BC */ lwc1 $f2, 0xbc($s1) /* 8AC8B4 80240924 468010A0 */ cvt.s.w $f2, $f2 /* 8AC8B8 80240928 46001082 */ mul.s $f2, $f2, $f0 -/* 8AC8BC 8024092C 00000000 */ nop +/* 8AC8BC 8024092C 00000000 */ nop /* 8AC8C0 80240930 3C0142C8 */ lui $at, 0x42c8 /* 8AC8C4 80240934 44810000 */ mtc1 $at, $f0 -/* 8AC8C8 80240938 00000000 */ nop +/* 8AC8C8 80240938 00000000 */ nop /* 8AC8CC 8024093C 46020001 */ sub.s $f0, $f0, $f2 /* 8AC8D0 80240940 E600003C */ swc1 $f0, 0x3c($s0) /* 8AC8D4 80240944 8E230078 */ lw $v1, 0x78($s1) @@ -228,7 +228,7 @@ glabel func_802405F0_8AC580 /* 8AC8E4 80240954 00021900 */ sll $v1, $v0, 4 /* 8AC8E8 80240958 00431021 */ addu $v0, $v0, $v1 /* 8AC8EC 8024095C 44820000 */ mtc1 $v0, $f0 -/* 8AC8F0 80240960 00000000 */ nop +/* 8AC8F0 80240960 00000000 */ nop /* 8AC8F4 80240964 46800020 */ cvt.s.w $f0, $f0 /* 8AC8F8 80240968 46001080 */ add.s $f2, $f2, $f0 /* 8AC8FC 8024096C 3C014319 */ lui $at, 0x4319 @@ -248,9 +248,9 @@ glabel func_802405F0_8AC580 /* 8AC934 802409A4 3C013E19 */ lui $at, 0x3e19 /* 8AC938 802409A8 3421999A */ ori $at, $at, 0x999a /* 8AC93C 802409AC 44811000 */ mtc1 $at, $f2 -/* 8AC940 802409B0 00000000 */ nop +/* 8AC940 802409B0 00000000 */ nop /* 8AC944 802409B4 46020002 */ mul.s $f0, $f0, $f2 -/* 8AC948 802409B8 00000000 */ nop +/* 8AC948 802409B8 00000000 */ nop /* 8AC94C 802409BC C602003C */ lwc1 $f2, 0x3c($s0) /* 8AC950 802409C0 46001080 */ add.s $f2, $f2, $f0 /* 8AC954 802409C4 3C034EC4 */ lui $v1, 0x4ec4 @@ -269,10 +269,10 @@ glabel func_802405F0_8AC580 /* 8AC988 802409F8 00021080 */ sll $v0, $v0, 2 /* 8AC98C 802409FC 00431021 */ addu $v0, $v0, $v1 /* 8AC990 80240A00 1482000B */ bne $a0, $v0, .L80240A30 -/* 8AC994 80240A04 00000000 */ nop +/* 8AC994 80240A04 00000000 */ nop /* 8AC998 80240A08 3C014120 */ lui $at, 0x4120 /* 8AC99C 80240A0C 44810000 */ mtc1 $at, $f0 -/* 8AC9A0 80240A10 00000000 */ nop +/* 8AC9A0 80240A10 00000000 */ nop /* 8AC9A4 80240A14 46001080 */ add.s $f2, $f2, $f0 /* 8AC9A8 80240A18 E7A00010 */ swc1 $f0, 0x10($sp) /* 8AC9AC 80240A1C 8E050038 */ lw $a1, 0x38($s0) @@ -314,7 +314,7 @@ glabel func_802405F0_8AC580 /* 8ACA30 80240AA0 00021900 */ sll $v1, $v0, 4 /* 8ACA34 80240AA4 00431021 */ addu $v0, $v0, $v1 /* 8ACA38 80240AA8 44820000 */ mtc1 $v0, $f0 -/* 8ACA3C 80240AAC 00000000 */ nop +/* 8ACA3C 80240AAC 00000000 */ nop /* 8ACA40 80240AB0 46800020 */ cvt.s.w $f0, $f0 /* 8ACA44 80240AB4 46001080 */ add.s $f2, $f2, $f0 /* 8ACA48 80240AB8 3C014319 */ lui $at, 0x4319 @@ -333,9 +333,9 @@ glabel func_802405F0_8AC580 /* 8ACA7C 80240AEC 3C013E19 */ lui $at, 0x3e19 /* 8ACA80 80240AF0 3421999A */ ori $at, $at, 0x999a /* 8ACA84 80240AF4 44811000 */ mtc1 $at, $f2 -/* 8ACA88 80240AF8 00000000 */ nop +/* 8ACA88 80240AF8 00000000 */ nop /* 8ACA8C 80240AFC 46020002 */ mul.s $f0, $f0, $f2 -/* 8ACA90 80240B00 00000000 */ nop +/* 8ACA90 80240B00 00000000 */ nop /* 8ACA94 80240B04 C602003C */ lwc1 $f2, 0x3c($s0) /* 8ACA98 80240B08 46001080 */ add.s $f2, $f2, $f0 /* 8ACA9C 80240B0C 3C034EC4 */ lui $v1, 0x4ec4 @@ -354,10 +354,10 @@ glabel func_802405F0_8AC580 /* 8ACAD0 80240B40 00021080 */ sll $v0, $v0, 2 /* 8ACAD4 80240B44 00431021 */ addu $v0, $v0, $v1 /* 8ACAD8 80240B48 1482000B */ bne $a0, $v0, .L80240B78 -/* 8ACADC 80240B4C 00000000 */ nop +/* 8ACADC 80240B4C 00000000 */ nop /* 8ACAE0 80240B50 3C014120 */ lui $at, 0x4120 /* 8ACAE4 80240B54 44810000 */ mtc1 $at, $f0 -/* 8ACAE8 80240B58 00000000 */ nop +/* 8ACAE8 80240B58 00000000 */ nop /* 8ACAEC 80240B5C 46001080 */ add.s $f2, $f2, $f0 /* 8ACAF0 80240B60 E7A00010 */ swc1 $f0, 0x10($sp) /* 8ACAF4 80240B64 8E050038 */ lw $a1, 0x38($s0) @@ -368,9 +368,9 @@ glabel func_802405F0_8AC580 .L80240B78: /* 8ACB08 80240B78 C6020064 */ lwc1 $f2, 0x64($s0) /* 8ACB0C 80240B7C 44800000 */ mtc1 $zero, $f0 -/* 8ACB10 80240B80 00000000 */ nop +/* 8ACB10 80240B80 00000000 */ nop /* 8ACB14 80240B84 4600103C */ c.lt.s $f2, $f0 -/* 8ACB18 80240B88 00000000 */ nop +/* 8ACB18 80240B88 00000000 */ nop /* 8ACB1C 80240B8C 45030001 */ bc1tl .L80240B94 /* 8ACB20 80240B90 24130002 */ addiu $s3, $zero, 2 .L80240B94: diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240CB0_8ACC40.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240CB0_8ACC40.s index b861d8f3f2..5f2b2c02f4 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240CB0_8ACC40.s +++ b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240CB0_8ACC40.s @@ -28,14 +28,14 @@ glabel func_80240CB0_8ACC40 /* 8ACC98 80240D08 8E300078 */ lw $s0, 0x78($s1) /* 8ACC9C 80240D0C 3C013FC0 */ lui $at, 0x3fc0 /* 8ACCA0 80240D10 44811000 */ mtc1 $at, $f2 -/* 8ACCA4 80240D14 00000000 */ nop +/* 8ACCA4 80240D14 00000000 */ nop /* 8ACCA8 80240D18 46020002 */ mul.s $f0, $f0, $f2 -/* 8ACCAC 80240D1C 00000000 */ nop +/* 8ACCAC 80240D1C 00000000 */ nop /* 8ACCB0 80240D20 3C014190 */ lui $at, 0x4190 /* 8ACCB4 80240D24 44816000 */ mtc1 $at, $f12 /* 8ACCB8 80240D28 4600010D */ trunc.w.s $f4, $f0 /* 8ACCBC 80240D2C 44022000 */ mfc1 $v0, $f4 -/* 8ACCC0 80240D30 00000000 */ nop +/* 8ACCC0 80240D30 00000000 */ nop /* 8ACCC4 80240D34 A20200AB */ sb $v0, 0xab($s0) /* 8ACCC8 80240D38 C6200074 */ lwc1 $f0, 0x74($s1) /* 8ACCCC 80240D3C 0C00A6C9 */ jal clamp_angle @@ -52,4 +52,4 @@ glabel func_80240CB0_8ACC40 /* 8ACCF0 80240D60 8FB00010 */ lw $s0, 0x10($sp) /* 8ACCF4 80240D64 03E00008 */ jr $ra /* 8ACCF8 80240D68 27BD0020 */ addiu $sp, $sp, 0x20 -/* 8ACCFC 80240D6C 00000000 */ nop +/* 8ACCFC 80240D6C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240034_8B00A4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240034_8B00A4.s index 6e5dbf8d5a..50255ae96f 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240034_8B00A4.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240034_8B00A4.s @@ -22,16 +22,16 @@ glabel func_80240034_8B00A4 /* 8B00E4 80240074 00021023 */ negu $v0, $v0 .L80240078: /* 8B00E8 80240078 14400003 */ bnez $v0, .L80240088 -/* 8B00EC 8024007C 00000000 */ nop +/* 8B00EC 8024007C 00000000 */ nop /* 8B00F0 80240080 50E00017 */ beql $a3, $zero, .L802400E0 /* 8B00F4 80240084 0000102D */ daddu $v0, $zero, $zero .L80240088: /* 8B00F8 80240088 44822000 */ mtc1 $v0, $f4 -/* 8B00FC 8024008C 00000000 */ nop +/* 8B00FC 8024008C 00000000 */ nop /* 8B0100 80240090 46802120 */ cvt.s.w $f4, $f4 /* 8B0104 80240094 44062000 */ mfc1 $a2, $f4 /* 8B0108 80240098 44872000 */ mtc1 $a3, $f4 -/* 8B010C 8024009C 00000000 */ nop +/* 8B010C 8024009C 00000000 */ nop /* 8B0110 802400A0 46802120 */ cvt.s.w $f4, $f4 /* 8B0114 802400A4 44806000 */ mtc1 $zero, $f12 /* 8B0118 802400A8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240034_8B00A4 /* 8B0120 802400B0 46006386 */ mov.s $f14, $f12 /* 8B0124 802400B4 3C014270 */ lui $at, 0x4270 /* 8B0128 802400B8 44811000 */ mtc1 $at, $f2 -/* 8B012C 802400BC 00000000 */ nop +/* 8B012C 802400BC 00000000 */ nop /* 8B0130 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 8B0134 802400C4 00000000 */ nop +/* 8B0134 802400C4 00000000 */ nop /* 8B0138 802400C8 45000004 */ bc1f .L802400DC /* 8B013C 802400CC 24020001 */ addiu $v0, $zero, 1 /* 8B0140 802400D0 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240390_8B0400.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240390_8B0400.s index 5d61e5f345..282b4f9e73 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240390_8B0400.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240390_8B0400.s @@ -26,7 +26,7 @@ glabel func_80240390_8B0400 /* 8B0450 802403E0 1440FFFA */ bnez $v0, .L802403CC /* 8B0454 802403E4 24A50004 */ addiu $a1, $a1, 4 /* 8B0458 802403E8 0809010B */ j .L8024042C -/* 8B045C 802403EC 00000000 */ nop +/* 8B045C 802403EC 00000000 */ nop .L802403F0: /* 8B0460 802403F0 0000182D */ daddu $v1, $zero, $zero /* 8B0464 802403F4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404CC_8B053C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404CC_8B053C.s index d2d742a04b..32e9e45a5d 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404CC_8B053C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404CC_8B053C.s @@ -115,7 +115,7 @@ glabel func_802404CC_8B053C /* 8B06E4 80240674 14E20005 */ bne $a3, $v0, .L8024068C /* 8B06E8 80240678 32E2FFFF */ andi $v0, $s7, 0xffff /* 8B06EC 8024067C 14400003 */ bnez $v0, .L8024068C -/* 8B06F0 80240680 00000000 */ nop +/* 8B06F0 80240680 00000000 */ nop /* 8B06F4 80240684 14800008 */ bnez $a0, .L802406A8 /* 8B06F8 80240688 24020001 */ addiu $v0, $zero, 1 .L8024068C: @@ -123,7 +123,7 @@ glabel func_802404CC_8B053C /* 8B0700 80240690 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 8B0704 80240694 80420075 */ lb $v0, 0x75($v0) /* 8B0708 80240698 10400005 */ beqz $v0, .L802406B0 -/* 8B070C 8024069C 00000000 */ nop +/* 8B070C 8024069C 00000000 */ nop /* 8B0710 802406A0 10800003 */ beqz $a0, .L802406B0 /* 8B0714 802406A4 24020001 */ addiu $v0, $zero, 1 .L802406A8: diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802407BC_8B082C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802407BC_8B082C.s index 50195a3665..d1c9fb020d 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802407BC_8B082C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802407BC_8B082C.s @@ -39,13 +39,13 @@ glabel func_802407BC_8B082C /* 8B08B0 80240840 10740005 */ beq $v1, $s4, .L80240858 /* 8B08B4 80240844 26100001 */ addiu $s0, $s0, 1 /* 8B08B8 80240848 10730003 */ beq $v1, $s3, .L80240858 -/* 8B08BC 8024084C 00000000 */ nop +/* 8B08BC 8024084C 00000000 */ nop /* 8B08C0 80240850 00521025 */ or $v0, $v0, $s2 /* 8B08C4 80240854 AC820000 */ sw $v0, ($a0) .L80240858: /* 8B08C8 80240858 2A020040 */ slti $v0, $s0, 0x40 /* 8B08CC 8024085C 1440FFEF */ bnez $v0, .L8024081C -/* 8B08D0 80240860 00000000 */ nop +/* 8B08D0 80240860 00000000 */ nop /* 8B08D4 80240864 0000802D */ daddu $s0, $zero, $zero /* 8B08D8 80240868 3C120800 */ lui $s2, 0x800 .L8024086C: @@ -57,13 +57,13 @@ glabel func_802407BC_8B082C /* 8B08F0 80240880 8C640000 */ lw $a0, ($v1) /* 8B08F4 80240884 30820010 */ andi $v0, $a0, 0x10 /* 8B08F8 80240888 10400003 */ beqz $v0, .L80240898 -/* 8B08FC 8024088C 00000000 */ nop +/* 8B08FC 8024088C 00000000 */ nop /* 8B0900 80240890 00921025 */ or $v0, $a0, $s2 /* 8B0904 80240894 AC620000 */ sw $v0, ($v1) .L80240898: /* 8B0908 80240898 2A020100 */ slti $v0, $s0, 0x100 /* 8B090C 8024089C 1440FFF3 */ bnez $v0, .L8024086C -/* 8B0910 802408A0 00000000 */ nop +/* 8B0910 802408A0 00000000 */ nop /* 8B0914 802408A4 AE200070 */ sw $zero, 0x70($s1) .L802408A8: /* 8B0918 802408A8 8E220070 */ lw $v0, 0x70($s1) diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240908_8B0978.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240908_8B0978.s index 873820aae0..a0fbddb83e 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240908_8B0978.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240908_8B0978.s @@ -32,7 +32,7 @@ glabel func_80240908_8B0978 /* 8B09DC 8024096C 0080302D */ daddu $a2, $a0, $zero /* 8B09E0 80240970 8E020070 */ lw $v0, 0x70($s0) /* 8B09E4 80240974 14400006 */ bnez $v0, .L80240990 -/* 8B09E8 80240978 00000000 */ nop +/* 8B09E8 80240978 00000000 */ nop /* 8B09EC 8024097C 8E020074 */ lw $v0, 0x74($s0) /* 8B09F0 80240980 14400003 */ bnez $v0, .L80240990 /* 8B09F4 80240984 24020001 */ addiu $v0, $zero, 1 @@ -66,13 +66,13 @@ glabel func_80240908_8B0978 /* 8B0A5C 802409EC 10730005 */ beq $v1, $s3, .L80240A04 /* 8B0A60 802409F0 26100001 */ addiu $s0, $s0, 1 /* 8B0A64 802409F4 10720003 */ beq $v1, $s2, .L80240A04 -/* 8B0A68 802409F8 00000000 */ nop +/* 8B0A68 802409F8 00000000 */ nop /* 8B0A6C 802409FC 00511024 */ and $v0, $v0, $s1 /* 8B0A70 80240A00 AC820000 */ sw $v0, ($a0) .L80240A04: /* 8B0A74 80240A04 2A020040 */ slti $v0, $s0, 0x40 /* 8B0A78 80240A08 1440FFEF */ bnez $v0, .L802409C8 -/* 8B0A7C 80240A0C 00000000 */ nop +/* 8B0A7C 80240A0C 00000000 */ nop /* 8B0A80 80240A10 0000802D */ daddu $s0, $zero, $zero /* 8B0A84 80240A14 3C11F7FF */ lui $s1, 0xf7ff /* 8B0A88 80240A18 3631FFFF */ ori $s1, $s1, 0xffff @@ -85,7 +85,7 @@ glabel func_80240908_8B0978 /* 8B0AA0 80240A30 8C640000 */ lw $a0, ($v1) /* 8B0AA4 80240A34 30820010 */ andi $v0, $a0, 0x10 /* 8B0AA8 80240A38 10400003 */ beqz $v0, .L80240A48 -/* 8B0AAC 80240A3C 00000000 */ nop +/* 8B0AAC 80240A3C 00000000 */ nop /* 8B0AB0 80240A40 00911024 */ and $v0, $a0, $s1 /* 8B0AB4 80240A44 AC620000 */ sw $v0, ($v1) .L80240A48: @@ -93,7 +93,7 @@ glabel func_80240908_8B0978 /* 8B0ABC 80240A4C 1440FFF3 */ bnez $v0, .L80240A1C /* 8B0AC0 80240A50 24020002 */ addiu $v0, $zero, 2 /* 8B0AC4 80240A54 08090298 */ j .L80240A60 -/* 8B0AC8 80240A58 00000000 */ nop +/* 8B0AC8 80240A58 00000000 */ nop .L80240A5C: /* 8B0ACC 80240A5C 0000102D */ daddu $v0, $zero, $zero .L80240A60: diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240B00_8B0B70.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240B00_8B0B70.s index 152e4dc364..692f6e48d0 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240B00_8B0B70.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240B00_8B0B70.s @@ -16,19 +16,19 @@ glabel func_80240B00_8B0B70 /* 8B0B9C 80240B2C 0220202D */ daddu $a0, $s1, $zero /* 8B0BA0 80240B30 3C05F4AC */ lui $a1, 0xf4ac /* 8B0BA4 80240B34 4482B000 */ mtc1 $v0, $f22 -/* 8B0BA8 80240B38 00000000 */ nop +/* 8B0BA8 80240B38 00000000 */ nop /* 8B0BAC 80240B3C 4680B5A0 */ cvt.s.w $f22, $f22 /* 8B0BB0 80240B40 0C0B1EAF */ jal get_variable /* 8B0BB4 80240B44 34A5D482 */ ori $a1, $a1, 0xd482 /* 8B0BB8 80240B48 0220202D */ daddu $a0, $s1, $zero /* 8B0BBC 80240B4C 3C05F4AC */ lui $a1, 0xf4ac /* 8B0BC0 80240B50 4482A000 */ mtc1 $v0, $f20 -/* 8B0BC4 80240B54 00000000 */ nop +/* 8B0BC4 80240B54 00000000 */ nop /* 8B0BC8 80240B58 4680A520 */ cvt.s.w $f20, $f20 /* 8B0BCC 80240B5C 0C0B1EAF */ jal get_variable /* 8B0BD0 80240B60 34A5D483 */ ori $a1, $a1, 0xd483 /* 8B0BD4 80240B64 44821000 */ mtc1 $v0, $f2 -/* 8B0BD8 80240B68 00000000 */ nop +/* 8B0BD8 80240B68 00000000 */ nop /* 8B0BDC 80240B6C 468010A0 */ cvt.s.w $f2, $f2 /* 8B0BE0 80240B70 4405B000 */ mfc1 $a1, $f22 /* 8B0BE4 80240B74 4406A000 */ mfc1 $a2, $f20 @@ -45,19 +45,19 @@ glabel func_80240B00_8B0B70 /* 8B0C10 80240BA0 0220202D */ daddu $a0, $s1, $zero /* 8B0C14 80240BA4 3C05F4AC */ lui $a1, 0xf4ac /* 8B0C18 80240BA8 4482B000 */ mtc1 $v0, $f22 -/* 8B0C1C 80240BAC 00000000 */ nop +/* 8B0C1C 80240BAC 00000000 */ nop /* 8B0C20 80240BB0 4680B5A0 */ cvt.s.w $f22, $f22 /* 8B0C24 80240BB4 0C0B1EAF */ jal get_variable /* 8B0C28 80240BB8 34A5D482 */ ori $a1, $a1, 0xd482 /* 8B0C2C 80240BBC 0220202D */ daddu $a0, $s1, $zero /* 8B0C30 80240BC0 3C05F4AC */ lui $a1, 0xf4ac /* 8B0C34 80240BC4 4482A000 */ mtc1 $v0, $f20 -/* 8B0C38 80240BC8 00000000 */ nop +/* 8B0C38 80240BC8 00000000 */ nop /* 8B0C3C 80240BCC 4680A520 */ cvt.s.w $f20, $f20 /* 8B0C40 80240BD0 0C0B1EAF */ jal get_variable /* 8B0C44 80240BD4 34A5D483 */ ori $a1, $a1, 0xd483 /* 8B0C48 80240BD8 44821000 */ mtc1 $v0, $f2 -/* 8B0C4C 80240BDC 00000000 */ nop +/* 8B0C4C 80240BDC 00000000 */ nop /* 8B0C50 80240BE0 468010A0 */ cvt.s.w $f2, $f2 /* 8B0C54 80240BE4 4405B000 */ mfc1 $a1, $f22 /* 8B0C58 80240BE8 4406A000 */ mfc1 $a2, $f20 @@ -73,19 +73,19 @@ glabel func_80240B00_8B0B70 /* 8B0C80 80240C10 0220202D */ daddu $a0, $s1, $zero /* 8B0C84 80240C14 3C05F4AC */ lui $a1, 0xf4ac /* 8B0C88 80240C18 4482B000 */ mtc1 $v0, $f22 -/* 8B0C8C 80240C1C 00000000 */ nop +/* 8B0C8C 80240C1C 00000000 */ nop /* 8B0C90 80240C20 4680B5A0 */ cvt.s.w $f22, $f22 /* 8B0C94 80240C24 0C0B1EAF */ jal get_variable /* 8B0C98 80240C28 34A5D482 */ ori $a1, $a1, 0xd482 /* 8B0C9C 80240C2C 0220202D */ daddu $a0, $s1, $zero /* 8B0CA0 80240C30 3C05F4AC */ lui $a1, 0xf4ac /* 8B0CA4 80240C34 4482A000 */ mtc1 $v0, $f20 -/* 8B0CA8 80240C38 00000000 */ nop +/* 8B0CA8 80240C38 00000000 */ nop /* 8B0CAC 80240C3C 4680A520 */ cvt.s.w $f20, $f20 /* 8B0CB0 80240C40 0C0B1EAF */ jal get_variable /* 8B0CB4 80240C44 34A5D483 */ ori $a1, $a1, 0xd483 /* 8B0CB8 80240C48 44821000 */ mtc1 $v0, $f2 -/* 8B0CBC 80240C4C 00000000 */ nop +/* 8B0CBC 80240C4C 00000000 */ nop /* 8B0CC0 80240C50 468010A0 */ cvt.s.w $f2, $f2 /* 8B0CC4 80240C54 4405B000 */ mfc1 $a1, $f22 /* 8B0CC8 80240C58 4406A000 */ mfc1 $a2, $f20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240D18_8B0D88.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240D18_8B0D88.s index a7965caa1e..1d1e4c1aa3 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240D18_8B0D88.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240D18_8B0D88.s @@ -44,7 +44,7 @@ glabel func_80240D18_8B0D88 /* 8B0E1C 80240DAC 3C048025 */ lui $a0, %hi(D_80257F2C) /* 8B0E20 80240DB0 8C847F2C */ lw $a0, %lo(D_80257F2C)($a0) /* 8B0E24 80240DB4 0C048D70 */ jal func_801235C0 -/* 8B0E28 80240DB8 00000000 */ nop +/* 8B0E28 80240DB8 00000000 */ nop /* 8B0E2C 80240DBC 24020002 */ addiu $v0, $zero, 2 .L80240DC0: /* 8B0E30 80240DC0 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241388_8B13F8.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241388_8B13F8.s index cd1c366e5c..c5652a54c3 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241388_8B13F8.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241388_8B13F8.s @@ -13,7 +13,7 @@ glabel func_80241388_8B13F8 /* 8B1418 802413A8 14620006 */ bne $v1, $v0, .L802413C4 /* 8B141C 802413AC 24020002 */ addiu $v0, $zero, 2 /* 8B1420 802413B0 44800000 */ mtc1 $zero, $f0 -/* 8B1424 802413B4 00000000 */ nop +/* 8B1424 802413B4 00000000 */ nop /* 8B1428 802413B8 44050000 */ mfc1 $a1, $f0 /* 8B142C 802413BC 080904F7 */ j .L802413DC /* 8B1430 802413C0 0000202D */ daddu $a0, $zero, $zero @@ -21,9 +21,9 @@ glabel func_80241388_8B13F8 /* 8B1434 802413C4 14620008 */ bne $v1, $v0, .L802413E8 /* 8B1438 802413C8 24040001 */ addiu $a0, $zero, 1 /* 8B143C 802413CC 44800000 */ mtc1 $zero, $f0 -/* 8B1440 802413D0 00000000 */ nop +/* 8B1440 802413D0 00000000 */ nop /* 8B1444 802413D4 44050000 */ mfc1 $a1, $f0 -/* 8B1448 802413D8 00000000 */ nop +/* 8B1448 802413D8 00000000 */ nop .L802413DC: /* 8B144C 802413DC 00A0302D */ daddu $a2, $a1, $zero /* 8B1450 802413E0 0C01C5A4 */ jal func_80071690 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241424_8B1494.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241424_8B1494.s index 397bfe78fa..a7c04d562b 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241424_8B1494.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241424_8B1494.s @@ -22,7 +22,7 @@ glabel func_80241424_8B1494 /* 8B14D8 80241468 3C030010 */ lui $v1, 0x10 /* 8B14DC 8024146C 00431024 */ and $v0, $v0, $v1 /* 8B14E0 80241470 10400004 */ beqz $v0, .L80241484 -/* 8B14E4 80241474 00000000 */ nop +/* 8B14E4 80241474 00000000 */ nop /* 8B14E8 80241478 C620006C */ lwc1 $f0, 0x6c($s1) /* 8B14EC 8024147C 46800020 */ cvt.s.w $f0, $f0 /* 8B14F0 80241480 E480000C */ swc1 $f0, 0xc($a0) @@ -30,7 +30,7 @@ glabel func_80241424_8B1494 /* 8B14F4 80241484 8E2200D0 */ lw $v0, 0xd0($s1) /* 8B14F8 80241488 8C420014 */ lw $v0, 0x14($v0) /* 8B14FC 8024148C 1C400004 */ bgtz $v0, .L802414A0 -/* 8B1500 80241490 00000000 */ nop +/* 8B1500 80241490 00000000 */ nop /* 8B1504 80241494 C640000C */ lwc1 $f0, 0xc($s2) /* 8B1508 80241498 08090530 */ j .L802414C0 /* 8B150C 8024149C E4800018 */ swc1 $f0, 0x18($a0) @@ -38,7 +38,7 @@ glabel func_80241424_8B1494 /* 8B1510 802414A0 3C018025 */ lui $at, %hi(D_80257D40) /* 8B1514 802414A4 D4227D40 */ ldc1 $f2, %lo(D_80257D40)($at) /* 8B1518 802414A8 44820000 */ mtc1 $v0, $f0 -/* 8B151C 802414AC 00000000 */ nop +/* 8B151C 802414AC 00000000 */ nop /* 8B1520 802414B0 46800021 */ cvt.d.w $f0, $f0 /* 8B1524 802414B4 46220003 */ div.d $f0, $f0, $f2 /* 8B1528 802414B8 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802414D8_8B1548.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802414D8_8B1548.s index 2bf7a3b9e4..840d2ea0c8 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802414D8_8B1548.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802414D8_8B1548.s @@ -38,7 +38,7 @@ glabel func_802414D8_8B1548 /* 8B15CC 8024155C 2402000F */ addiu $v0, $zero, 0xf /* 8B15D0 80241560 AFA2001C */ sw $v0, 0x1c($sp) /* 8B15D4 80241564 44833000 */ mtc1 $v1, $f6 -/* 8B15D8 80241568 00000000 */ nop +/* 8B15D8 80241568 00000000 */ nop /* 8B15DC 8024156C 468031A0 */ cvt.s.w $f6, $f6 /* 8B15E0 80241570 44073000 */ mfc1 $a3, $f6 /* 8B15E4 80241574 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802416D0_8B1740.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802416D0_8B1740.s index 0e17fbb93f..19df5492e1 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802416D0_8B1740.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802416D0_8B1740.s @@ -47,20 +47,20 @@ glabel func_802416D0_8B1740 /* 8B17E8 80241778 8E020010 */ lw $v0, 0x10($s0) /* 8B17EC 8024177C 46001005 */ abs.s $f0, $f2 /* 8B17F0 80241780 44822000 */ mtc1 $v0, $f4 -/* 8B17F4 80241784 00000000 */ nop +/* 8B17F4 80241784 00000000 */ nop /* 8B17F8 80241788 46802120 */ cvt.s.w $f4, $f4 /* 8B17FC 8024178C 4600203C */ c.lt.s $f4, $f0 -/* 8B1800 80241790 00000000 */ nop +/* 8B1800 80241790 00000000 */ nop /* 8B1804 80241794 4500000D */ bc1f .L802417CC -/* 8B1808 80241798 00000000 */ nop +/* 8B1808 80241798 00000000 */ nop /* 8B180C 8024179C 44800000 */ mtc1 $zero, $f0 /* 8B1810 802417A0 C654000C */ lwc1 $f20, 0xc($s2) /* 8B1814 802417A4 4600103C */ c.lt.s $f2, $f0 -/* 8B1818 802417A8 00000000 */ nop +/* 8B1818 802417A8 00000000 */ nop /* 8B181C 802417AC 45000006 */ bc1f .L802417C8 /* 8B1820 802417B0 00021023 */ negu $v0, $v0 /* 8B1824 802417B4 44820000 */ mtc1 $v0, $f0 -/* 8B1828 802417B8 00000000 */ nop +/* 8B1828 802417B8 00000000 */ nop /* 8B182C 802417BC 46800020 */ cvt.s.w $f0, $f0 /* 8B1830 802417C0 080905F3 */ j .L802417CC /* 8B1834 802417C4 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241964_8B19D4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241964_8B19D4.s index 052966038b..58f5d49dbe 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241964_8B19D4.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241964_8B19D4.s @@ -19,20 +19,20 @@ glabel func_80241964_8B19D4 /* 8B1A0C 8024199C 8E0200D0 */ lw $v0, 0xd0($s0) /* 8B1A10 802419A0 8C420014 */ lw $v0, 0x14($v0) /* 8B1A14 802419A4 04410009 */ bgez $v0, .L802419CC -/* 8B1A18 802419A8 00000000 */ nop +/* 8B1A18 802419A8 00000000 */ nop /* 8B1A1C 802419AC C640000C */ lwc1 $f0, 0xc($s2) /* 8B1A20 802419B0 3C018025 */ lui $at, %hi(D_80257D48) /* 8B1A24 802419B4 D4227D48 */ ldc1 $f2, %lo(D_80257D48)($at) /* 8B1A28 802419B8 46000021 */ cvt.d.s $f0, $f0 /* 8B1A2C 802419BC 46220002 */ mul.d $f0, $f0, $f2 -/* 8B1A30 802419C0 00000000 */ nop +/* 8B1A30 802419C0 00000000 */ nop /* 8B1A34 802419C4 0809067A */ j .L802419E8 /* 8B1A38 802419C8 46200020 */ cvt.s.d $f0, $f0 .L802419CC: /* 8B1A3C 802419CC 3C018025 */ lui $at, %hi(D_80257D50) /* 8B1A40 802419D0 D4227D50 */ ldc1 $f2, %lo(D_80257D50)($at) /* 8B1A44 802419D4 44820000 */ mtc1 $v0, $f0 -/* 8B1A48 802419D8 00000000 */ nop +/* 8B1A48 802419D8 00000000 */ nop /* 8B1A4C 802419DC 46800021 */ cvt.d.w $f0, $f0 /* 8B1A50 802419E0 46220003 */ div.d $f0, $f0, $f2 /* 8B1A54 802419E4 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241A10_8B1A80.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241A10_8B1A80.s index 55fb614bee..0c9d9229ef 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241A10_8B1A80.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241A10_8B1A80.s @@ -42,7 +42,7 @@ glabel func_80241A10_8B1A80 /* 8B1B14 80241AA4 2402000F */ addiu $v0, $zero, 0xf /* 8B1B18 80241AA8 AFA2001C */ sw $v0, 0x1c($sp) /* 8B1B1C 80241AAC 44833000 */ mtc1 $v1, $f6 -/* 8B1B20 80241AB0 00000000 */ nop +/* 8B1B20 80241AB0 00000000 */ nop /* 8B1B24 80241AB4 468031A0 */ cvt.s.w $f6, $f6 /* 8B1B28 80241AB8 44073000 */ mfc1 $a3, $f6 /* 8B1B2C 80241ABC 27A20028 */ addiu $v0, $sp, 0x28 @@ -90,12 +90,12 @@ glabel func_80241A10_8B1A80 /* 8B1BC4 80241B54 468031A0 */ cvt.s.w $f6, $f6 /* 8B1BC8 80241B58 44073000 */ mfc1 $a3, $f6 /* 8B1BCC 80241B5C 0C00A7B5 */ jal dist2D -/* 8B1BD0 80241B60 00000000 */ nop +/* 8B1BD0 80241B60 00000000 */ nop /* 8B1BD4 80241B64 C6020018 */ lwc1 $f2, 0x18($s0) /* 8B1BD8 80241B68 4602003C */ c.lt.s $f0, $f2 -/* 8B1BDC 80241B6C 00000000 */ nop +/* 8B1BDC 80241B6C 00000000 */ nop /* 8B1BE0 80241B70 4500000E */ bc1f .L80241BAC -/* 8B1BE4 80241B74 00000000 */ nop +/* 8B1BE4 80241B74 00000000 */ nop /* 8B1BE8 80241B78 8E2200D0 */ lw $v0, 0xd0($s1) /* 8B1BEC 80241B7C C4400000 */ lwc1 $f0, ($v0) /* 8B1BF0 80241B80 46800020 */ cvt.s.w $f0, $f0 @@ -112,7 +112,7 @@ glabel func_80241A10_8B1A80 .L80241BAC: /* 8B1C1C 80241BAC 8602008C */ lh $v0, 0x8c($s0) /* 8B1C20 80241BB0 14400011 */ bnez $v0, .L80241BF8 -/* 8B1C24 80241BB4 00000000 */ nop +/* 8B1C24 80241BB4 00000000 */ nop /* 8B1C28 80241BB8 C60C0038 */ lwc1 $f12, 0x38($s0) /* 8B1C2C 80241BBC 8E2200D0 */ lw $v0, 0xd0($s1) /* 8B1C30 80241BC0 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -123,7 +123,7 @@ glabel func_80241A10_8B1A80 /* 8B1C44 80241BD4 468031A0 */ cvt.s.w $f6, $f6 /* 8B1C48 80241BD8 44073000 */ mfc1 $a3, $f6 /* 8B1C4C 80241BDC 0C00A720 */ jal atan2 -/* 8B1C50 80241BE0 00000000 */ nop +/* 8B1C50 80241BE0 00000000 */ nop /* 8B1C54 80241BE4 8E050018 */ lw $a1, 0x18($s0) /* 8B1C58 80241BE8 44060000 */ mfc1 $a2, $f0 /* 8B1C5C 80241BEC 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s index a8cda4d71f..9b26cd9fd4 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s @@ -46,7 +46,7 @@ glabel func_80241C18_8B1C88 /* 8B1D2C 80241CBC 8E4200B0 */ lw $v0, 0xb0($s2) /* 8B1D30 80241CC0 30420004 */ andi $v0, $v0, 4 /* 8B1D34 80241CC4 1040002F */ beqz $v0, .L80241D84 -/* 8B1D38 80241CC8 00000000 */ nop +/* 8B1D38 80241CC8 00000000 */ nop .L80241CCC: /* 8B1D3C 80241CCC AE800070 */ sw $zero, 0x70($s4) /* 8B1D40 80241CD0 C600000C */ lwc1 $f0, 0xc($s0) @@ -102,60 +102,71 @@ glabel func_80241C18_8B1C88 /* 8B1DF8 80241D88 2C620064 */ sltiu $v0, $v1, 0x64 /* 8B1DFC 80241D8C 10400036 */ beqz $v0, .L80241E68 /* 8B1E00 80241D90 00031080 */ sll $v0, $v1, 2 -/* 8B1E04 80241D94 3C018025 */ lui $at, %hi(D_80257D58) +/* 8B1E04 80241D94 3C018025 */ lui $at, %hi(jtbl_80257D58_8C7DC8) /* 8B1E08 80241D98 00220821 */ addu $at, $at, $v0 -/* 8B1E0C 80241D9C 8C227D58 */ lw $v0, %lo(D_80257D58)($at) +/* 8B1E0C 80241D9C 8C227D58 */ lw $v0, %lo(jtbl_80257D58_8C7DC8)($at) /* 8B1E10 80241DA0 00400008 */ jr $v0 -/* 8B1E14 80241DA4 00000000 */ nop +/* 8B1E14 80241DA4 00000000 */ nop +glabel L80241DA8_8B1E18 /* 8B1E18 80241DA8 0280202D */ daddu $a0, $s4, $zero /* 8B1E1C 80241DAC 0260282D */ daddu $a1, $s3, $zero /* 8B1E20 80241DB0 0C090509 */ jal func_80241424_8B1494 /* 8B1E24 80241DB4 02A0302D */ daddu $a2, $s5, $zero +glabel L80241DB8_8B1E28 /* 8B1E28 80241DB8 0280202D */ daddu $a0, $s4, $zero /* 8B1E2C 80241DBC 0260282D */ daddu $a1, $s3, $zero /* 8B1E30 80241DC0 0C090536 */ jal func_802414D8_8B1548 /* 8B1E34 80241DC4 02A0302D */ daddu $a2, $s5, $zero /* 8B1E38 80241DC8 0809079A */ j .L80241E68 -/* 8B1E3C 80241DCC 00000000 */ nop +/* 8B1E3C 80241DCC 00000000 */ nop +glabel L80241DD0_8B1E40 /* 8B1E40 80241DD0 0280202D */ daddu $a0, $s4, $zero /* 8B1E44 80241DD4 0260282D */ daddu $a1, $s3, $zero /* 8B1E48 80241DD8 0C09057E */ jal kmr_02_NpcJumpFunc3 /* 8B1E4C 80241DDC 02A0302D */ daddu $a2, $s5, $zero +glabel L80241DE0_8B1E50 /* 8B1E50 80241DE0 0280202D */ daddu $a0, $s4, $zero /* 8B1E54 80241DE4 0260282D */ daddu $a1, $s3, $zero -/* 8B1E58 80241DE8 0C090596 */ jal func_80241658_8B16C8 +/* 8B1E58 80241DE8 0C090596 */ jal kmr_02_NpcJumpFunc /* 8B1E5C 80241DEC 02A0302D */ daddu $a2, $s5, $zero /* 8B1E60 80241DF0 0809079A */ j .L80241E68 -/* 8B1E64 80241DF4 00000000 */ nop +/* 8B1E64 80241DF4 00000000 */ nop +glabel L80241DF8_8B1E68 /* 8B1E68 80241DF8 0280202D */ daddu $a0, $s4, $zero /* 8B1E6C 80241DFC 0260282D */ daddu $a1, $s3, $zero /* 8B1E70 80241E00 0C0905B4 */ jal func_802416D0_8B1740 /* 8B1E74 80241E04 02A0302D */ daddu $a2, $s5, $zero +glabel L80241E08_8B1E78 /* 8B1E78 80241E08 0280202D */ daddu $a0, $s4, $zero /* 8B1E7C 80241E0C 0260282D */ daddu $a1, $s3, $zero /* 8B1E80 80241E10 0C090600 */ jal func_80241800_8B1870 /* 8B1E84 80241E14 02A0302D */ daddu $a2, $s5, $zero /* 8B1E88 80241E18 0809079A */ j .L80241E68 -/* 8B1E8C 80241E1C 00000000 */ nop +/* 8B1E8C 80241E1C 00000000 */ nop +glabel L80241E20_8B1E90 /* 8B1E90 80241E20 0280202D */ daddu $a0, $s4, $zero /* 8B1E94 80241E24 0260282D */ daddu $a1, $s3, $zero /* 8B1E98 80241E28 0C090647 */ jal kmr_02_UnkNpcAIFunc10 /* 8B1E9C 80241E2C 02A0302D */ daddu $a2, $s5, $zero /* 8B1EA0 80241E30 0809079A */ j .L80241E68 -/* 8B1EA4 80241E34 00000000 */ nop +/* 8B1EA4 80241E34 00000000 */ nop +glabel L80241E38_8B1EA8 /* 8B1EA8 80241E38 0280202D */ daddu $a0, $s4, $zero /* 8B1EAC 80241E3C 0260282D */ daddu $a1, $s3, $zero /* 8B1EB0 80241E40 0C090659 */ jal func_80241964_8B19D4 /* 8B1EB4 80241E44 02A0302D */ daddu $a2, $s5, $zero +glabel L80241E48_8B1EB8 /* 8B1EB8 80241E48 0280202D */ daddu $a0, $s4, $zero /* 8B1EBC 80241E4C 0260282D */ daddu $a1, $s3, $zero /* 8B1EC0 80241E50 0C090684 */ jal func_80241A10_8B1A80 /* 8B1EC4 80241E54 02A0302D */ daddu $a2, $s5, $zero /* 8B1EC8 80241E58 0809079A */ j .L80241E68 -/* 8B1ECC 80241E5C 00000000 */ nop +/* 8B1ECC 80241E5C 00000000 */ nop +glabel L80241E60_8B1ED0 /* 8B1ED0 80241E60 0C0129CF */ jal func_8004A73C /* 8B1ED4 80241E64 0280202D */ daddu $a0, $s4, $zero .L80241E68: +glabel L80241E68_8B1ED8 /* 8B1ED8 80241E68 8FBF0048 */ lw $ra, 0x48($sp) /* 8B1EDC 80241E6C 8FB50044 */ lw $s5, 0x44($sp) /* 8B1EE0 80241E70 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241E90_8B1F00.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241E90_8B1F00.s index 633c3f4510..9de8aef0ec 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241E90_8B1F00.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241E90_8B1F00.s @@ -41,14 +41,14 @@ glabel func_80241E90_8B1F00 /* 8B1F8C 80241F1C 10600009 */ beqz $v1, .L80241F44 /* 8B1F90 80241F20 0000102D */ daddu $v0, $zero, $zero /* 8B1F94 80241F24 080907FD */ j .L80241FF4 -/* 8B1F98 80241F28 00000000 */ nop +/* 8B1F98 80241F28 00000000 */ nop .L80241F2C: /* 8B1F9C 80241F2C 10620013 */ beq $v1, $v0, .L80241F7C /* 8B1FA0 80241F30 24020003 */ addiu $v0, $zero, 3 /* 8B1FA4 80241F34 1062001E */ beq $v1, $v0, .L80241FB0 /* 8B1FA8 80241F38 0000102D */ daddu $v0, $zero, $zero /* 8B1FAC 80241F3C 080907FD */ j .L80241FF4 -/* 8B1FB0 80241F40 00000000 */ nop +/* 8B1FB0 80241F40 00000000 */ nop .L80241F44: /* 8B1FB4 80241F44 0C03AC5A */ jal func_800EB168 /* 8B1FB8 80241F48 0000202D */ daddu $a0, $zero, $zero @@ -75,7 +75,7 @@ glabel func_80241E90_8B1F00 /* 8B2004 80241F94 A0510014 */ sb $s1, 0x14($v0) /* 8B2008 80241F98 82640012 */ lb $a0, 0x12($s3) /* 8B200C 80241F9C 0C03ACA9 */ jal func_800EB2A4 -/* 8B2010 80241FA0 00000000 */ nop +/* 8B2010 80241FA0 00000000 */ nop /* 8B2014 80241FA4 24020003 */ addiu $v0, $zero, 3 /* 8B2018 80241FA8 080907FC */ j .L80241FF0 /* 8B201C 80241FAC AE420070 */ sw $v0, 0x70($s2) diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802422F8_8B2368.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802422F8_8B2368.s index 7dce972a11..0dfe9c277a 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802422F8_8B2368.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802422F8_8B2368.s @@ -28,7 +28,7 @@ glabel func_802422F8_8B2368 /* 8B23BC 8024234C 00220821 */ addu $at, $at, $v0 /* 8B23C0 80242350 AC207F58 */ sw $zero, %lo(D_80257F58)($at) /* 8B23C4 80242354 080908E1 */ j .L80242384 -/* 8B23C8 80242358 00000000 */ nop +/* 8B23C8 80242358 00000000 */ nop .L8024235C: /* 8B23CC 8024235C 3C038025 */ lui $v1, %hi(D_80257F58) /* 8B23D0 80242360 24637F58 */ addiu $v1, $v1, %lo(D_80257F58) diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427EC_8B285C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427EC_8B285C.s index cda965bc68..4a2be860d9 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427EC_8B285C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427EC_8B285C.s @@ -5,7 +5,7 @@ glabel func_802427EC_8B285C /* 8B285C 802427EC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 8B2860 802427F0 AFBF0010 */ sw $ra, 0x10($sp) /* 8B2864 802427F4 0C03A5EE */ jal func_800E97B8 -/* 8B2868 802427F8 00000000 */ nop +/* 8B2868 802427F8 00000000 */ nop /* 8B286C 802427FC 8FBF0010 */ lw $ra, 0x10($sp) /* 8B2870 80242800 24020002 */ addiu $v0, $zero, 2 /* 8B2874 80242804 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242860_8B28D0.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242860_8B28D0.s index b44c29e7c0..8bd5663a2f 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242860_8B28D0.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242860_8B28D0.s @@ -25,7 +25,7 @@ glabel func_80242860_8B28D0 /* 8B2920 802428B0 0C00A8BB */ jal sin_deg /* 8B2924 802428B4 46146300 */ add.s $f12, $f12, $f20 /* 8B2928 802428B8 46160002 */ mul.s $f0, $f0, $f22 -/* 8B292C 802428BC 00000000 */ nop +/* 8B292C 802428BC 00000000 */ nop /* 8B2930 802428C0 C6020038 */ lwc1 $f2, 0x38($s0) /* 8B2934 802428C4 46001080 */ add.s $f2, $f2, $f0 /* 8B2938 802428C8 4600110D */ trunc.w.s $f4, $f2 @@ -33,7 +33,7 @@ glabel func_80242860_8B28D0 /* 8B2940 802428D0 C600003C */ lwc1 $f0, 0x3c($s0) /* 8B2944 802428D4 3C014100 */ lui $at, 0x4100 /* 8B2948 802428D8 44811000 */ mtc1 $at, $f2 -/* 8B294C 802428DC 00000000 */ nop +/* 8B294C 802428DC 00000000 */ nop /* 8B2950 802428E0 46020000 */ add.s $f0, $f0, $f2 /* 8B2954 802428E4 4600010D */ trunc.w.s $f4, $f0 /* 8B2958 802428E8 E6240088 */ swc1 $f4, 0x88($s1) @@ -43,7 +43,7 @@ glabel func_80242860_8B28D0 /* 8B2968 802428F8 0C00A8D4 */ jal cos_deg /* 8B296C 802428FC 46146300 */ add.s $f12, $f12, $f20 /* 8B2970 80242900 46160002 */ mul.s $f0, $f0, $f22 -/* 8B2974 80242904 00000000 */ nop +/* 8B2974 80242904 00000000 */ nop /* 8B2978 80242908 C6020040 */ lwc1 $f2, 0x40($s0) /* 8B297C 8024290C 46001081 */ sub.s $f2, $f2, $f0 /* 8B2980 80242910 4600110D */ trunc.w.s $f4, $f2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024295C_8B29CC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024295C_8B29CC.s index a5251f64b0..425359cd84 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024295C_8B29CC.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024295C_8B29CC.s @@ -57,7 +57,7 @@ glabel func_8024295C_8B29CC /* 8B2A98 80242A28 02C41023 */ subu $v0, $s6, $a0 /* 8B2A9C 80242A2C 00430018 */ mult $v0, $v1 /* 8B2AA0 80242A30 00004012 */ mflo $t0 -/* 8B2AA4 80242A34 00000000 */ nop +/* 8B2AA4 80242A34 00000000 */ nop /* 8B2AA8 80242A38 16000002 */ bnez $s0, .L80242A44 /* 8B2AAC 80242A3C 0110001A */ div $zero, $t0, $s0 /* 8B2AB0 80242A40 0007000D */ break 7 @@ -66,7 +66,7 @@ glabel func_8024295C_8B29CC /* 8B2AB8 80242A48 16010004 */ bne $s0, $at, .L80242A5C /* 8B2ABC 80242A4C 3C018000 */ lui $at, 0x8000 /* 8B2AC0 80242A50 15010002 */ bne $t0, $at, .L80242A5C -/* 8B2AC4 80242A54 00000000 */ nop +/* 8B2AC4 80242A54 00000000 */ nop /* 8B2AC8 80242A58 0006000D */ break 6 .L80242A5C: /* 8B2ACC 80242A5C 00005012 */ mflo $t2 @@ -75,7 +75,7 @@ glabel func_8024295C_8B29CC /* 8B2AD8 80242A68 02851023 */ subu $v0, $s4, $a1 /* 8B2ADC 80242A6C 00430018 */ mult $v0, $v1 /* 8B2AE0 80242A70 00004012 */ mflo $t0 -/* 8B2AE4 80242A74 00000000 */ nop +/* 8B2AE4 80242A74 00000000 */ nop /* 8B2AE8 80242A78 16000002 */ bnez $s0, .L80242A84 /* 8B2AEC 80242A7C 0110001A */ div $zero, $t0, $s0 /* 8B2AF0 80242A80 0007000D */ break 7 @@ -84,7 +84,7 @@ glabel func_8024295C_8B29CC /* 8B2AF8 80242A88 16010004 */ bne $s0, $at, .L80242A9C /* 8B2AFC 80242A8C 3C018000 */ lui $at, 0x8000 /* 8B2B00 80242A90 15010002 */ bne $t0, $at, .L80242A9C -/* 8B2B04 80242A94 00000000 */ nop +/* 8B2B04 80242A94 00000000 */ nop /* 8B2B08 80242A98 0006000D */ break 6 .L80242A9C: /* 8B2B0C 80242A9C 00004812 */ mflo $t1 @@ -93,7 +93,7 @@ glabel func_8024295C_8B29CC /* 8B2B18 80242AA8 02661023 */ subu $v0, $s3, $a2 /* 8B2B1C 80242AAC 00430018 */ mult $v0, $v1 /* 8B2B20 80242AB0 00004012 */ mflo $t0 -/* 8B2B24 80242AB4 00000000 */ nop +/* 8B2B24 80242AB4 00000000 */ nop /* 8B2B28 80242AB8 16000002 */ bnez $s0, .L80242AC4 /* 8B2B2C 80242ABC 0110001A */ div $zero, $t0, $s0 /* 8B2B30 80242AC0 0007000D */ break 7 @@ -102,7 +102,7 @@ glabel func_8024295C_8B29CC /* 8B2B38 80242AC8 16010004 */ bne $s0, $at, .L80242ADC /* 8B2B3C 80242ACC 3C018000 */ lui $at, 0x8000 /* 8B2B40 80242AD0 15010002 */ bne $t0, $at, .L80242ADC -/* 8B2B44 80242AD4 00000000 */ nop +/* 8B2B44 80242AD4 00000000 */ nop /* 8B2B48 80242AD8 0006000D */ break 6 .L80242ADC: /* 8B2B4C 80242ADC 00004012 */ mflo $t0 @@ -111,7 +111,7 @@ glabel func_8024295C_8B29CC /* 8B2B58 80242AE8 02A71023 */ subu $v0, $s5, $a3 /* 8B2B5C 80242AEC 00430018 */ mult $v0, $v1 /* 8B2B60 80242AF0 00001812 */ mflo $v1 -/* 8B2B64 80242AF4 00000000 */ nop +/* 8B2B64 80242AF4 00000000 */ nop /* 8B2B68 80242AF8 16000002 */ bnez $s0, .L80242B04 /* 8B2B6C 80242AFC 0070001A */ div $zero, $v1, $s0 /* 8B2B70 80242B00 0007000D */ break 7 @@ -120,7 +120,7 @@ glabel func_8024295C_8B29CC /* 8B2B78 80242B08 16010004 */ bne $s0, $at, .L80242B1C /* 8B2B7C 80242B0C 3C018000 */ lui $at, 0x8000 /* 8B2B80 80242B10 14610002 */ bne $v1, $at, .L80242B1C -/* 8B2B84 80242B14 00000000 */ nop +/* 8B2B84 80242B14 00000000 */ nop /* 8B2B88 80242B18 0006000D */ break 6 .L80242B1C: /* 8B2B8C 80242B1C 00001012 */ mflo $v0 @@ -140,7 +140,7 @@ glabel func_8024295C_8B29CC /* 8B2BC4 80242B54 10400009 */ beqz $v0, .L80242B7C /* 8B2BC8 80242B58 24020002 */ addiu $v0, $zero, 2 /* 8B2BCC 80242B5C 08090AE0 */ j .L80242B80 -/* 8B2BD0 80242B60 00000000 */ nop +/* 8B2BD0 80242B60 00000000 */ nop .L80242B64: /* 8B2BD4 80242B64 328500FF */ andi $a1, $s4, 0xff /* 8B2BD8 80242B68 326600FF */ andi $a2, $s3, 0xff diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242BC0_8B2C30.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242BC0_8B2C30.s index 43b8985912..41d91ceb72 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242BC0_8B2C30.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242BC0_8B2C30.s @@ -75,7 +75,7 @@ glabel func_80242BC0_8B2C30 /* 8B2D44 80242CD4 02C41023 */ subu $v0, $s6, $a0 /* 8B2D48 80242CD8 00480018 */ mult $v0, $t0 /* 8B2D4C 80242CDC 00001812 */ mflo $v1 -/* 8B2D50 80242CE0 00000000 */ nop +/* 8B2D50 80242CE0 00000000 */ nop /* 8B2D54 80242CE4 16000002 */ bnez $s0, .L80242CF0 /* 8B2D58 80242CE8 0070001A */ div $zero, $v1, $s0 /* 8B2D5C 80242CEC 0007000D */ break 7 @@ -84,7 +84,7 @@ glabel func_80242BC0_8B2C30 /* 8B2D64 80242CF4 16010004 */ bne $s0, $at, .L80242D08 /* 8B2D68 80242CF8 3C018000 */ lui $at, 0x8000 /* 8B2D6C 80242CFC 14610002 */ bne $v1, $at, .L80242D08 -/* 8B2D70 80242D00 00000000 */ nop +/* 8B2D70 80242D00 00000000 */ nop /* 8B2D74 80242D04 0006000D */ break 6 .L80242D08: /* 8B2D78 80242D08 00006812 */ mflo $t5 @@ -93,7 +93,7 @@ glabel func_80242BC0_8B2C30 /* 8B2D84 80242D14 02A51023 */ subu $v0, $s5, $a1 /* 8B2D88 80242D18 00480018 */ mult $v0, $t0 /* 8B2D8C 80242D1C 00001812 */ mflo $v1 -/* 8B2D90 80242D20 00000000 */ nop +/* 8B2D90 80242D20 00000000 */ nop /* 8B2D94 80242D24 16000002 */ bnez $s0, .L80242D30 /* 8B2D98 80242D28 0070001A */ div $zero, $v1, $s0 /* 8B2D9C 80242D2C 0007000D */ break 7 @@ -102,7 +102,7 @@ glabel func_80242BC0_8B2C30 /* 8B2DA4 80242D34 16010004 */ bne $s0, $at, .L80242D48 /* 8B2DA8 80242D38 3C018000 */ lui $at, 0x8000 /* 8B2DAC 80242D3C 14610002 */ bne $v1, $at, .L80242D48 -/* 8B2DB0 80242D40 00000000 */ nop +/* 8B2DB0 80242D40 00000000 */ nop /* 8B2DB4 80242D44 0006000D */ break 6 .L80242D48: /* 8B2DB8 80242D48 00006012 */ mflo $t4 @@ -111,7 +111,7 @@ glabel func_80242BC0_8B2C30 /* 8B2DC4 80242D54 02861023 */ subu $v0, $s4, $a2 /* 8B2DC8 80242D58 00480018 */ mult $v0, $t0 /* 8B2DCC 80242D5C 00001812 */ mflo $v1 -/* 8B2DD0 80242D60 00000000 */ nop +/* 8B2DD0 80242D60 00000000 */ nop /* 8B2DD4 80242D64 16000002 */ bnez $s0, .L80242D70 /* 8B2DD8 80242D68 0070001A */ div $zero, $v1, $s0 /* 8B2DDC 80242D6C 0007000D */ break 7 @@ -120,7 +120,7 @@ glabel func_80242BC0_8B2C30 /* 8B2DE4 80242D74 16010004 */ bne $s0, $at, .L80242D88 /* 8B2DE8 80242D78 3C018000 */ lui $at, 0x8000 /* 8B2DEC 80242D7C 14610002 */ bne $v1, $at, .L80242D88 -/* 8B2DF0 80242D80 00000000 */ nop +/* 8B2DF0 80242D80 00000000 */ nop /* 8B2DF4 80242D84 0006000D */ break 6 .L80242D88: /* 8B2DF8 80242D88 00005812 */ mflo $t3 @@ -129,7 +129,7 @@ glabel func_80242BC0_8B2C30 /* 8B2E04 80242D94 02631023 */ subu $v0, $s3, $v1 /* 8B2E08 80242D98 00480018 */ mult $v0, $t0 /* 8B2E0C 80242D9C 00004812 */ mflo $t1 -/* 8B2E10 80242DA0 00000000 */ nop +/* 8B2E10 80242DA0 00000000 */ nop /* 8B2E14 80242DA4 16000002 */ bnez $s0, .L80242DB0 /* 8B2E18 80242DA8 0130001A */ div $zero, $t1, $s0 /* 8B2E1C 80242DAC 0007000D */ break 7 @@ -138,7 +138,7 @@ glabel func_80242BC0_8B2C30 /* 8B2E24 80242DB4 16010004 */ bne $s0, $at, .L80242DC8 /* 8B2E28 80242DB8 3C018000 */ lui $at, 0x8000 /* 8B2E2C 80242DBC 15210002 */ bne $t1, $at, .L80242DC8 -/* 8B2E30 80242DC0 00000000 */ nop +/* 8B2E30 80242DC0 00000000 */ nop /* 8B2E34 80242DC4 0006000D */ break 6 .L80242DC8: /* 8B2E38 80242DC8 00004812 */ mflo $t1 @@ -147,7 +147,7 @@ glabel func_80242BC0_8B2C30 /* 8B2E44 80242DD4 02E71023 */ subu $v0, $s7, $a3 /* 8B2E48 80242DD8 00480018 */ mult $v0, $t0 /* 8B2E4C 80242DDC 00004012 */ mflo $t0 -/* 8B2E50 80242DE0 00000000 */ nop +/* 8B2E50 80242DE0 00000000 */ nop /* 8B2E54 80242DE4 16000002 */ bnez $s0, .L80242DF0 /* 8B2E58 80242DE8 0110001A */ div $zero, $t0, $s0 /* 8B2E5C 80242DEC 0007000D */ break 7 @@ -156,7 +156,7 @@ glabel func_80242BC0_8B2C30 /* 8B2E64 80242DF4 16010004 */ bne $s0, $at, .L80242E08 /* 8B2E68 80242DF8 3C018000 */ lui $at, 0x8000 /* 8B2E6C 80242DFC 15010002 */ bne $t0, $at, .L80242E08 -/* 8B2E70 80242E00 00000000 */ nop +/* 8B2E70 80242E00 00000000 */ nop /* 8B2E74 80242E04 0006000D */ break 6 .L80242E08: /* 8B2E78 80242E08 00005012 */ mflo $t2 @@ -169,7 +169,7 @@ glabel func_80242BC0_8B2C30 /* 8B2E94 80242E24 03C81023 */ subu $v0, $fp, $t0 /* 8B2E98 80242E28 00430018 */ mult $v0, $v1 /* 8B2E9C 80242E2C 00001812 */ mflo $v1 -/* 8B2EA0 80242E30 00000000 */ nop +/* 8B2EA0 80242E30 00000000 */ nop /* 8B2EA4 80242E34 16000002 */ bnez $s0, .L80242E40 /* 8B2EA8 80242E38 0070001A */ div $zero, $v1, $s0 /* 8B2EAC 80242E3C 0007000D */ break 7 @@ -178,7 +178,7 @@ glabel func_80242BC0_8B2C30 /* 8B2EB4 80242E44 16010004 */ bne $s0, $at, .L80242E58 /* 8B2EB8 80242E48 3C018000 */ lui $at, 0x8000 /* 8B2EBC 80242E4C 14610002 */ bne $v1, $at, .L80242E58 -/* 8B2EC0 80242E50 00000000 */ nop +/* 8B2EC0 80242E50 00000000 */ nop /* 8B2EC4 80242E54 0006000D */ break 6 .L80242E58: /* 8B2EC8 80242E58 00001012 */ mflo $v0 @@ -201,7 +201,7 @@ glabel func_80242BC0_8B2C30 /* 8B2F0C 80242E9C 1040000D */ beqz $v0, .L80242ED4 /* 8B2F10 80242EA0 24020002 */ addiu $v0, $zero, 2 /* 8B2F14 80242EA4 08090BB6 */ j .L80242ED8 -/* 8B2F18 80242EA8 00000000 */ nop +/* 8B2F18 80242EA8 00000000 */ nop .L80242EAC: /* 8B2F1C 80242EAC 32A500FF */ andi $a1, $s5, 0xff /* 8B2F20 80242EB0 328600FF */ andi $a2, $s4, 0xff diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F7C_8B2FEC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F7C_8B2FEC.s index 7108dc750d..288c275733 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F7C_8B2FEC.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F7C_8B2FEC.s @@ -27,14 +27,14 @@ glabel func_80242F7C_8B2FEC /* 8B3040 80242FD0 8E300078 */ lw $s0, 0x78($s1) /* 8B3044 80242FD4 3C013FC0 */ lui $at, 0x3fc0 /* 8B3048 80242FD8 44811000 */ mtc1 $at, $f2 -/* 8B304C 80242FDC 00000000 */ nop +/* 8B304C 80242FDC 00000000 */ nop /* 8B3050 80242FE0 46020002 */ mul.s $f0, $f0, $f2 -/* 8B3054 80242FE4 00000000 */ nop +/* 8B3054 80242FE4 00000000 */ nop /* 8B3058 80242FE8 3C014190 */ lui $at, 0x4190 /* 8B305C 80242FEC 44816000 */ mtc1 $at, $f12 /* 8B3060 80242FF0 4600010D */ trunc.w.s $f4, $f0 /* 8B3064 80242FF4 44022000 */ mfc1 $v0, $f4 -/* 8B3068 80242FF8 00000000 */ nop +/* 8B3068 80242FF8 00000000 */ nop /* 8B306C 80242FFC A20200AB */ sb $v0, 0xab($s0) /* 8B3070 80243000 C6200074 */ lwc1 $f0, 0x74($s1) /* 8B3074 80243004 0C00A6C9 */ jal clamp_angle diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80243034_8B30A4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80243034_8B30A4.s index 89910eec8a..9d414f4d3d 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80243034_8B30A4.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80243034_8B30A4.s @@ -9,11 +9,11 @@ glabel func_80243034_8B30A4 /* 8B30B4 80243044 3C013F19 */ lui $at, 0x3f19 /* 8B30B8 80243048 3421999A */ ori $at, $at, 0x999a /* 8B30BC 8024304C 44810000 */ mtc1 $at, $f0 -/* 8B30C0 80243050 00000000 */ nop +/* 8B30C0 80243050 00000000 */ nop /* 8B30C4 80243054 E4400030 */ swc1 $f0, 0x30($v0) /* 8B30C8 80243058 8FBF0010 */ lw $ra, 0x10($sp) /* 8B30CC 8024305C 24020002 */ addiu $v0, $zero, 2 /* 8B30D0 80243060 03E00008 */ jr $ra /* 8B30D4 80243064 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8B30D8 80243068 00000000 */ nop -/* 8B30DC 8024306C 00000000 */ nop +/* 8B30D8 80243068 00000000 */ nop +/* 8B30DC 8024306C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802430B8_8B3128.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802430B8_8B3128.s index b99a2847dd..7620bcd018 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802430B8_8B3128.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802430B8_8B3128.s @@ -22,7 +22,7 @@ glabel func_802430B8_8B3128 /* 8B316C 802430FC 0C04DF93 */ jal func_80137E4C /* 8B3170 80243100 24070091 */ addiu $a3, $zero, 0x91 /* 8B3174 80243104 44900000 */ mtc1 $s0, $f0 -/* 8B3178 80243108 00000000 */ nop +/* 8B3178 80243108 00000000 */ nop /* 8B317C 8024310C 46800020 */ cvt.s.w $f0, $f0 /* 8B3180 80243110 44050000 */ mfc1 $a1, $f0 /* 8B3184 80243114 0C04DF62 */ jal func_80137D88 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243134_8B31A4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243134_8B31A4.s index 24dbe34424..37bb574af5 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243134_8B31A4.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243134_8B31A4.s @@ -16,7 +16,7 @@ glabel func_80243134_8B31A4 /* 8B31D0 80243160 0C0B1EAF */ jal get_variable /* 8B31D4 80243164 0040802D */ daddu $s0, $v0, $zero /* 8B31D8 80243168 44820000 */ mtc1 $v0, $f0 -/* 8B31DC 8024316C 00000000 */ nop +/* 8B31DC 8024316C 00000000 */ nop /* 8B31E0 80243170 46800020 */ cvt.s.w $f0, $f0 /* 8B31E4 80243174 24020002 */ addiu $v0, $zero, 2 /* 8B31E8 80243178 00501804 */ sllv $v1, $s0, $v0 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243230_8B32A0.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243230_8B32A0.s index fc229bb204..1110ac2639 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243230_8B32A0.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243230_8B32A0.s @@ -12,7 +12,7 @@ glabel func_80243230_8B32A0 /* 8B32BC 8024324C 80A30006 */ lb $v1, 6($a1) /* 8B32C0 80243250 80A20005 */ lb $v0, 5($a1) /* 8B32C4 80243254 14620007 */ bne $v1, $v0, .L80243274 -/* 8B32C8 80243258 00000000 */ nop +/* 8B32C8 80243258 00000000 */ nop /* 8B32CC 8024325C 80C2028E */ lb $v0, 0x28e($a2) /* 8B32D0 80243260 84C30290 */ lh $v1, 0x290($a2) /* 8B32D4 80243264 00021200 */ sll $v0, $v0, 8 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243364_8B33D4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243364_8B33D4.s index 2b63052fa7..1bbbab0937 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243364_8B33D4.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243364_8B33D4.s @@ -4,4 +4,4 @@ glabel func_80243364_8B33D4 /* 8B33D4 80243364 03E00008 */ jr $ra /* 8B33D8 80243368 24020002 */ addiu $v0, $zero, 2 -/* 8B33DC 8024336C 00000000 */ nop +/* 8B33DC 8024336C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802433AC_8B341C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802433AC_8B341C.s index c386991911..5bb54c897b 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802433AC_8B341C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802433AC_8B341C.s @@ -23,18 +23,18 @@ glabel func_802433AC_8B341C /* 8B3464 802433F4 8E050000 */ lw $a1, ($s0) /* 8B3468 802433F8 26100004 */ addiu $s0, $s0, 4 /* 8B346C 802433FC 4482C000 */ mtc1 $v0, $f24 -/* 8B3470 80243400 00000000 */ nop +/* 8B3470 80243400 00000000 */ nop /* 8B3474 80243404 4680C620 */ cvt.s.w $f24, $f24 /* 8B3478 80243408 0C0B1EAF */ jal get_variable /* 8B347C 8024340C 0220202D */ daddu $a0, $s1, $zero /* 8B3480 80243410 8E050000 */ lw $a1, ($s0) /* 8B3484 80243414 4482B000 */ mtc1 $v0, $f22 -/* 8B3488 80243418 00000000 */ nop +/* 8B3488 80243418 00000000 */ nop /* 8B348C 8024341C 4680B5A0 */ cvt.s.w $f22, $f22 /* 8B3490 80243420 0C0B1EAF */ jal get_variable /* 8B3494 80243424 0220202D */ daddu $a0, $s1, $zero /* 8B3498 80243428 4482A000 */ mtc1 $v0, $f20 -/* 8B349C 8024342C 00000000 */ nop +/* 8B349C 8024342C 00000000 */ nop /* 8B34A0 80243430 4680A520 */ cvt.s.w $f20, $f20 /* 8B34A4 80243434 0C04417A */ jal get_entity_by_index /* 8B34A8 80243438 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243514_8B3584.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243514_8B3584.s index 1171cb7967..e70beb4bba 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243514_8B3584.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243514_8B3584.s @@ -23,7 +23,7 @@ glabel func_80243514_8B3584 /* 8B35C8 80243558 44811000 */ mtc1 $at, $f2 /* 8B35CC 8024355C 00621023 */ subu $v0, $v1, $v0 /* 8B35D0 80243560 44820000 */ mtc1 $v0, $f0 -/* 8B35D4 80243564 00000000 */ nop +/* 8B35D4 80243564 00000000 */ nop /* 8B35D8 80243568 46800020 */ cvt.s.w $f0, $f0 /* 8B35DC 8024356C 46020003 */ div.s $f0, $f0, $f2 /* 8B35E0 80243570 E6200054 */ swc1 $f0, 0x54($s1) @@ -33,35 +33,35 @@ glabel func_80243514_8B3584 /* 8B35F0 80243580 44816000 */ mtc1 $at, $f12 /* 8B35F4 80243584 00621023 */ subu $v0, $v1, $v0 /* 8B35F8 80243588 44820000 */ mtc1 $v0, $f0 -/* 8B35FC 8024358C 00000000 */ nop +/* 8B35FC 8024358C 00000000 */ nop /* 8B3600 80243590 46800020 */ cvt.s.w $f0, $f0 /* 8B3604 80243594 46020003 */ div.s $f0, $f0, $f2 /* 8B3608 80243598 E6200058 */ swc1 $f0, 0x58($s1) /* 8B360C 8024359C 8E420074 */ lw $v0, 0x74($s2) /* 8B3610 802435A0 460C0302 */ mul.s $f12, $f0, $f12 -/* 8B3614 802435A4 00000000 */ nop +/* 8B3614 802435A4 00000000 */ nop /* 8B3618 802435A8 00621823 */ subu $v1, $v1, $v0 /* 8B361C 802435AC 44830000 */ mtc1 $v1, $f0 -/* 8B3620 802435B0 00000000 */ nop +/* 8B3620 802435B0 00000000 */ nop /* 8B3624 802435B4 46800020 */ cvt.s.w $f0, $f0 /* 8B3628 802435B8 46020003 */ div.s $f0, $f0, $f2 /* 8B362C 802435BC 0C00A874 */ jal cos_rad /* 8B3630 802435C0 E620005C */ swc1 $f0, 0x5c($s1) /* 8B3634 802435C4 3C013F80 */ lui $at, 0x3f80 /* 8B3638 802435C8 44811000 */ mtc1 $at, $f2 -/* 8B363C 802435CC 00000000 */ nop +/* 8B363C 802435CC 00000000 */ nop /* 8B3640 802435D0 46001081 */ sub.s $f2, $f2, $f0 /* 8B3644 802435D4 3C018025 */ lui $at, %hi(D_80257F08) /* 8B3648 802435D8 D4207F08 */ ldc1 $f0, %lo(D_80257F08)($at) /* 8B364C 802435DC 460010A1 */ cvt.d.s $f2, $f2 /* 8B3650 802435E0 46201082 */ mul.d $f2, $f2, $f0 -/* 8B3654 802435E4 00000000 */ nop +/* 8B3654 802435E4 00000000 */ nop /* 8B3658 802435E8 3C013FE0 */ lui $at, 0x3fe0 /* 8B365C 802435EC 44810800 */ mtc1 $at, $f1 /* 8B3660 802435F0 44800000 */ mtc1 $zero, $f0 -/* 8B3664 802435F4 00000000 */ nop +/* 8B3664 802435F4 00000000 */ nop /* 8B3668 802435F8 46201082 */ mul.d $f2, $f2, $f0 -/* 8B366C 802435FC 00000000 */ nop +/* 8B366C 802435FC 00000000 */ nop /* 8B3670 80243600 462010A0 */ cvt.s.d $f2, $f2 /* 8B3674 80243604 E6220064 */ swc1 $f2, 0x64($s1) /* 8B3678 80243608 8E430074 */ lw $v1, 0x74($s2) @@ -76,5 +76,5 @@ glabel func_80243514_8B3584 /* 8B369C 8024362C 00021040 */ sll $v0, $v0, 1 /* 8B36A0 80243630 03E00008 */ jr $ra /* 8B36A4 80243634 27BD0020 */ addiu $sp, $sp, 0x20 -/* 8B36A8 80243638 00000000 */ nop -/* 8B36AC 8024363C 00000000 */ nop +/* 8B36A8 80243638 00000000 */ nop +/* 8B36AC 8024363C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_802436FC_8B376C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_802436FC_8B376C.s index 20f05e64ce..4029116e1a 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_802436FC_8B376C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_802436FC_8B376C.s @@ -24,6 +24,6 @@ glabel func_802436FC_8B376C /* 8B37B8 80243748 24020002 */ addiu $v0, $zero, 2 /* 8B37BC 8024374C 03E00008 */ jr $ra /* 8B37C0 80243750 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8B37C4 80243754 00000000 */ nop -/* 8B37C8 80243758 00000000 */ nop -/* 8B37CC 8024375C 00000000 */ nop +/* 8B37C4 80243754 00000000 */ nop +/* 8B37C8 80243758 00000000 */ nop +/* 8B37CC 8024375C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B3A10/func_802439A0_8B3A10.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B3A10/func_802439A0_8B3A10.s index dfccf84a8e..97530d8594 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B3A10/func_802439A0_8B3A10.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B3A10/func_802439A0_8B3A10.s @@ -39,6 +39,6 @@ glabel func_802439A0_8B3A10 /* 8B3A98 80243A28 24020002 */ addiu $v0, $zero, 2 /* 8B3A9C 80243A2C 03E00008 */ jr $ra /* 8B3AA0 80243A30 27BD0028 */ addiu $sp, $sp, 0x28 -/* 8B3AA4 80243A34 00000000 */ nop -/* 8B3AA8 80243A38 00000000 */ nop -/* 8B3AAC 80243A3C 00000000 */ nop +/* 8B3AA4 80243A34 00000000 */ nop +/* 8B3AA8 80243A38 00000000 */ nop +/* 8B3AAC 80243A3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802402C8_8CABC8.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802402C8_8CABC8.s index fe9c60fbff..f0a3d2a6d0 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802402C8_8CABC8.s +++ b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802402C8_8CABC8.s @@ -26,7 +26,7 @@ glabel func_802402C8_8CABC8 /* 8CAC18 80240318 1440FFFA */ bnez $v0, .L80240304 /* 8CAC1C 8024031C 24A50004 */ addiu $a1, $a1, 4 /* 8CAC20 80240320 080900D9 */ j .L80240364 -/* 8CAC24 80240324 00000000 */ nop +/* 8CAC24 80240324 00000000 */ nop .L80240328: /* 8CAC28 80240328 0000182D */ daddu $v1, $zero, $zero /* 8CAC2C 8024032C 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240000_8CE070.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240000_8CE070.s index 12cec37abd..2e1f73d012 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240000_8CE070.s +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240000_8CE070.s @@ -47,7 +47,7 @@ glabel func_80240000_8CE070 /* 8CE118 802400A8 0C0123F5 */ jal is_point_within_region /* 8CE11C 802400AC 8E070038 */ lw $a3, 0x38($s0) /* 8CE120 802400B0 1040000E */ beqz $v0, .L802400EC -/* 8CE124 802400B4 00000000 */ nop +/* 8CE124 802400B4 00000000 */ nop /* 8CE128 802400B8 8E2200D0 */ lw $v0, 0xd0($s1) /* 8CE12C 802400BC C60C0038 */ lwc1 $f12, 0x38($s0) /* 8CE130 802400C0 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240000_8CE070 /* 8CE144 802400D4 468031A0 */ cvt.s.w $f6, $f6 /* 8CE148 802400D8 44073000 */ mfc1 $a3, $f6 /* 8CE14C 802400DC 0C00A720 */ jal atan2 -/* 8CE150 802400E0 00000000 */ nop +/* 8CE150 802400E0 00000000 */ nop /* 8CE154 802400E4 08090047 */ j .L8024011C /* 8CE158 802400E8 E600000C */ swc1 $f0, 0xc($s0) .L802400EC: @@ -66,7 +66,7 @@ glabel func_80240000_8CE070 /* 8CE160 802400F0 2404003C */ addiu $a0, $zero, 0x3c /* 8CE164 802400F4 C60C000C */ lwc1 $f12, 0xc($s0) /* 8CE168 802400F8 44820000 */ mtc1 $v0, $f0 -/* 8CE16C 802400FC 00000000 */ nop +/* 8CE16C 802400FC 00000000 */ nop /* 8CE170 80240100 46800020 */ cvt.s.w $f0, $f0 /* 8CE174 80240104 46006300 */ add.s $f12, $f12, $f0 /* 8CE178 80240108 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240000_8CE070 /* 8CE19C 8024012C 8E2200D0 */ lw $v0, 0xd0($s1) /* 8CE1A0 80240130 8C420014 */ lw $v0, 0x14($v0) /* 8CE1A4 80240134 04410004 */ bgez $v0, .L80240148 -/* 8CE1A8 80240138 00000000 */ nop +/* 8CE1A8 80240138 00000000 */ nop /* 8CE1AC 8024013C C6400000 */ lwc1 $f0, ($s2) /* 8CE1B0 80240140 0809005A */ j .L80240168 /* 8CE1B4 80240144 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240000_8CE070 /* 8CE1B8 80240148 3C018024 */ lui $at, %hi(D_80243440) /* 8CE1BC 8024014C D4223440 */ ldc1 $f2, %lo(D_80243440)($at) /* 8CE1C0 80240150 44820000 */ mtc1 $v0, $f0 -/* 8CE1C4 80240154 00000000 */ nop +/* 8CE1C4 80240154 00000000 */ nop /* 8CE1C8 80240158 46800021 */ cvt.d.w $f0, $f0 /* 8CE1CC 8024015C 46220003 */ div.d $f0, $f0, $f2 /* 8CE1D0 80240160 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240000_8CE070 /* 8CE1E4 80240174 44801000 */ mtc1 $zero, $f2 /* 8CE1E8 80240178 46000021 */ cvt.d.s $f0, $f0 /* 8CE1EC 8024017C 46220002 */ mul.d $f0, $f0, $f2 -/* 8CE1F0 80240180 00000000 */ nop +/* 8CE1F0 80240180 00000000 */ nop /* 8CE1F4 80240184 24020001 */ addiu $v0, $zero, 1 /* 8CE1F8 80240188 4620018D */ trunc.w.d $f6, $f0 /* 8CE1FC 8024018C E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802401B0_8CE220.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802401B0_8CE220.s index 006b28c6bd..a6af4ae4c6 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802401B0_8CE220.s +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802401B0_8CE220.s @@ -34,7 +34,7 @@ glabel func_802401B0_8CE220 /* 8CE294 80240224 44803000 */ mtc1 $zero, $f6 /* 8CE298 80240228 46000021 */ cvt.d.s $f0, $f0 /* 8CE29C 8024022C 46260002 */ mul.d $f0, $f0, $f6 -/* 8CE2A0 80240230 00000000 */ nop +/* 8CE2A0 80240230 00000000 */ nop /* 8CE2A4 80240234 24020001 */ addiu $v0, $zero, 1 /* 8CE2A8 80240238 8E24006C */ lw $a0, 0x6c($s1) /* 8CE2AC 8024023C 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_802401B0_8CE220 /* 8CE308 80240298 C600003C */ lwc1 $f0, 0x3c($s0) /* 8CE30C 8024029C 4600C001 */ sub.s $f0, $f24, $f0 /* 8CE310 802402A0 4600B03C */ c.lt.s $f22, $f0 -/* 8CE314 802402A4 00000000 */ nop +/* 8CE314 802402A4 00000000 */ nop /* 8CE318 802402A8 4500001B */ bc1f .L80240318 /* 8CE31C 802402AC 34820010 */ ori $v0, $a0, 0x10 /* 8CE320 802402B0 080900C6 */ j .L80240318 @@ -87,9 +87,9 @@ glabel func_802401B0_8CE220 /* 8CE364 802402F4 C7A00034 */ lwc1 $f0, 0x34($sp) /* 8CE368 802402F8 4600D001 */ sub.s $f0, $f26, $f0 /* 8CE36C 802402FC 4600B03C */ c.lt.s $f22, $f0 -/* 8CE370 80240300 00000000 */ nop +/* 8CE370 80240300 00000000 */ nop /* 8CE374 80240304 45000004 */ bc1f .L80240318 -/* 8CE378 80240308 00000000 */ nop +/* 8CE378 80240308 00000000 */ nop /* 8CE37C 8024030C 8E22006C */ lw $v0, 0x6c($s1) /* 8CE380 80240310 34420010 */ ori $v0, $v0, 0x10 /* 8CE384 80240314 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_802401B0_8CE220 /* 8CE38C 8024031C 24030011 */ addiu $v1, $zero, 0x11 /* 8CE390 80240320 30420011 */ andi $v0, $v0, 0x11 /* 8CE394 80240324 14430039 */ bne $v0, $v1, .L8024040C -/* 8CE398 80240328 00000000 */ nop +/* 8CE398 80240328 00000000 */ nop /* 8CE39C 8024032C 8E020000 */ lw $v0, ($s0) /* 8CE3A0 80240330 30420008 */ andi $v0, $v0, 8 /* 8CE3A4 80240334 1040000A */ beqz $v0, .L80240360 @@ -108,7 +108,7 @@ glabel func_802401B0_8CE220 /* 8CE3B4 80240344 D4203448 */ ldc1 $f0, %lo(D_80243448)($at) /* 8CE3B8 80240348 460010A1 */ cvt.d.s $f2, $f2 /* 8CE3BC 8024034C 46201082 */ mul.d $f2, $f2, $f0 -/* 8CE3C0 80240350 00000000 */ nop +/* 8CE3C0 80240350 00000000 */ nop /* 8CE3C4 80240354 4600A021 */ cvt.d.s $f0, $f20 /* 8CE3C8 80240358 080900F1 */ j .L802403C4 /* 8CE3CC 8024035C 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_802401B0_8CE220 /* 8CE41C 802403AC D4203450 */ ldc1 $f0, %lo(D_80243450)($at) /* 8CE420 802403B0 460010A1 */ cvt.d.s $f2, $f2 /* 8CE424 802403B4 46201082 */ mul.d $f2, $f2, $f0 -/* 8CE428 802403B8 00000000 */ nop +/* 8CE428 802403B8 00000000 */ nop /* 8CE42C 802403BC 4600A021 */ cvt.d.s $f0, $f20 /* 8CE430 802403C0 46220000 */ add.d $f0, $f0, $f2 .L802403C4: @@ -149,7 +149,7 @@ glabel func_802401B0_8CE220 /* 8CE450 802403E0 46000005 */ abs.s $f0, $f0 /* 8CE454 802403E4 46000021 */ cvt.d.s $f0, $f0 /* 8CE458 802403E8 4622003C */ c.lt.d $f0, $f2 -/* 8CE45C 802403EC 00000000 */ nop +/* 8CE45C 802403EC 00000000 */ nop /* 8CE460 802403F0 45000036 */ bc1f .L802404CC /* 8CE464 802403F4 2403FFEF */ addiu $v1, $zero, -0x11 /* 8CE468 802403F8 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_802401B0_8CE220 .L8024040C: /* 8CE47C 8024040C 8E220070 */ lw $v0, 0x70($s1) /* 8CE480 80240410 1840002E */ blez $v0, .L802404CC -/* 8CE484 80240414 00000000 */ nop +/* 8CE484 80240414 00000000 */ nop /* 8CE488 80240418 C62C0074 */ lwc1 $f12, 0x74($s1) /* 8CE48C 8024041C 0C00A8BB */ jal sin_deg /* 8CE490 80240420 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_802401B0_8CE220 /* 8CE4E8 80240478 27A70030 */ addiu $a3, $sp, 0x30 .L8024047C: /* 8CE4EC 8024047C 10400007 */ beqz $v0, .L8024049C -/* 8CE4F0 80240480 00000000 */ nop +/* 8CE4F0 80240480 00000000 */ nop /* 8CE4F4 80240484 4616A082 */ mul.s $f2, $f20, $f22 -/* 8CE4F8 80240488 00000000 */ nop +/* 8CE4F8 80240488 00000000 */ nop /* 8CE4FC 8024048C C7A0002C */ lwc1 $f0, 0x2c($sp) /* 8CE500 80240490 461A0000 */ add.s $f0, $f0, $f26 /* 8CE504 80240494 0809012A */ j .L802404A8 /* 8CE508 80240498 46020000 */ add.s $f0, $f0, $f2 .L8024049C: /* 8CE50C 8024049C 4616A002 */ mul.s $f0, $f20, $f22 -/* 8CE510 802404A0 00000000 */ nop +/* 8CE510 802404A0 00000000 */ nop /* 8CE514 802404A4 4600C000 */ add.s $f0, $f24, $f0 .L802404A8: /* 8CE518 802404A8 E600003C */ swc1 $f0, 0x3c($s0) /* 8CE51C 802404AC 8E220074 */ lw $v0, 0x74($s1) /* 8CE520 802404B0 2442000A */ addiu $v0, $v0, 0xa /* 8CE524 802404B4 44826000 */ mtc1 $v0, $f12 -/* 8CE528 802404B8 00000000 */ nop +/* 8CE528 802404B8 00000000 */ nop /* 8CE52C 802404BC 0C00A6C9 */ jal clamp_angle /* 8CE530 802404C0 46806320 */ cvt.s.w $f12, $f12 /* 8CE534 802404C4 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_802401B0_8CE220 /* 8CE544 802404D4 2442FFFF */ addiu $v0, $v0, -1 /* 8CE548 802404D8 8E430014 */ lw $v1, 0x14($s2) /* 8CE54C 802404DC 04600048 */ bltz $v1, .L80240600 -/* 8CE550 802404E0 00000000 */ nop +/* 8CE550 802404E0 00000000 */ nop /* 8CE554 802404E4 8E620074 */ lw $v0, 0x74($s3) /* 8CE558 802404E8 1C400042 */ bgtz $v0, .L802405F4 /* 8CE55C 802404EC 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_802401B0_8CE220 /* 8CE564 802404F4 860200A8 */ lh $v0, 0xa8($s0) /* 8CE568 802404F8 C602003C */ lwc1 $f2, 0x3c($s0) /* 8CE56C 802404FC 44820000 */ mtc1 $v0, $f0 -/* 8CE570 80240500 00000000 */ nop +/* 8CE570 80240500 00000000 */ nop /* 8CE574 80240504 46800020 */ cvt.s.w $f0, $f0 /* 8CE578 80240508 46001080 */ add.s $f2, $f2, $f0 /* 8CE57C 8024050C 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_802401B0_8CE220 /* 8CE598 80240528 C440002C */ lwc1 $f0, 0x2c($v0) /* 8CE59C 8024052C 46000021 */ cvt.d.s $f0, $f0 /* 8CE5A0 80240530 4622003C */ c.lt.d $f0, $f2 -/* 8CE5A4 80240534 00000000 */ nop +/* 8CE5A4 80240534 00000000 */ nop /* 8CE5A8 80240538 4500002C */ bc1f .L802405EC /* 8CE5AC 8024053C 02A0202D */ daddu $a0, $s5, $zero /* 8CE5B0 80240540 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_802401B0_8CE220 /* 8CE5EC 8024057C 3C01C1A0 */ lui $at, 0xc1a0 /* 8CE5F0 80240580 44812000 */ mtc1 $at, $f4 /* 8CE5F4 80240584 44834000 */ mtc1 $v1, $f8 -/* 8CE5F8 80240588 00000000 */ nop +/* 8CE5F8 80240588 00000000 */ nop /* 8CE5FC 8024058C 46804220 */ cvt.s.w $f8, $f8 /* 8CE600 80240590 44074000 */ mfc1 $a3, $f8 /* 8CE604 80240594 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_802401B0_8CE220 /* 8CE6B8 80240648 0C0123F5 */ jal is_point_within_region /* 8CE6BC 8024064C 8E070038 */ lw $a3, 0x38($s0) /* 8CE6C0 80240650 1040001A */ beqz $v0, .L802406BC -/* 8CE6C4 80240654 00000000 */ nop +/* 8CE6C4 80240654 00000000 */ nop /* 8CE6C8 80240658 8E060038 */ lw $a2, 0x38($s0) /* 8CE6CC 8024065C 8E2200D0 */ lw $v0, 0xd0($s1) /* 8CE6D0 80240660 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_802401B0_8CE220 /* 8CE6E4 80240674 468073A0 */ cvt.s.w $f14, $f14 /* 8CE6E8 80240678 C6020018 */ lwc1 $f2, 0x18($s0) /* 8CE6EC 8024067C 4600103C */ c.lt.s $f2, $f0 -/* 8CE6F0 80240680 00000000 */ nop +/* 8CE6F0 80240680 00000000 */ nop /* 8CE6F4 80240684 4500000D */ bc1f .L802406BC /* 8CE6F8 80240688 E7A00034 */ swc1 $f0, 0x34($sp) /* 8CE6FC 8024068C C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_802401B0_8CE220 /* 8CE738 802406C8 00621825 */ or $v1, $v1, $v0 /* 8CE73C 802406CC 00741825 */ or $v1, $v1, $s4 /* 8CE740 802406D0 10600008 */ beqz $v1, .L802406F4 -/* 8CE744 802406D4 00000000 */ nop +/* 8CE744 802406D4 00000000 */ nop /* 8CE748 802406D8 8602008C */ lh $v0, 0x8c($s0) /* 8CE74C 802406DC 14400031 */ bnez $v0, .L802407A4 -/* 8CE750 802406E0 00000000 */ nop +/* 8CE750 802406E0 00000000 */ nop /* 8CE754 802406E4 8E050018 */ lw $a1, 0x18($s0) /* 8CE758 802406E8 8E06000C */ lw $a2, 0xc($s0) /* 8CE75C 802406EC 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_802401B0_8CE220 /* 8CE770 80240700 44801000 */ mtc1 $zero, $f2 /* 8CE774 80240704 46000021 */ cvt.d.s $f0, $f0 /* 8CE778 80240708 46220002 */ mul.d $f0, $f0, $f2 -/* 8CE77C 8024070C 00000000 */ nop +/* 8CE77C 8024070C 00000000 */ nop /* 8CE780 80240710 4620020D */ trunc.w.d $f8, $f0 /* 8CE784 80240714 E628007C */ swc1 $f8, 0x7c($s1) /* 8CE788 80240718 8E420004 */ lw $v0, 4($s2) /* 8CE78C 8024071C 18400021 */ blez $v0, .L802407A4 -/* 8CE790 80240720 00000000 */ nop +/* 8CE790 80240720 00000000 */ nop /* 8CE794 80240724 8602008E */ lh $v0, 0x8e($s0) /* 8CE798 80240728 9603008E */ lhu $v1, 0x8e($s0) /* 8CE79C 8024072C 18400005 */ blez $v0, .L80240744 @@ -375,7 +375,7 @@ glabel func_802401B0_8CE220 /* 8CE7A4 80240734 A602008E */ sh $v0, 0x8e($s0) /* 8CE7A8 80240738 00021400 */ sll $v0, $v0, 0x10 /* 8CE7AC 8024073C 1C400019 */ bgtz $v0, .L802407A4 -/* 8CE7B0 80240740 00000000 */ nop +/* 8CE7B0 80240740 00000000 */ nop .L80240744: /* 8CE7B4 80240744 240403E8 */ addiu $a0, $zero, 0x3e8 /* 8CE7B8 80240748 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_802401B0_8CE220 /* 8CE800 80240790 18400003 */ blez $v0, .L802407A0 /* 8CE804 80240794 28620003 */ slti $v0, $v1, 3 /* 8CE808 80240798 10400002 */ beqz $v0, .L802407A4 -/* 8CE80C 8024079C 00000000 */ nop +/* 8CE80C 8024079C 00000000 */ nop .L802407A0: /* 8CE810 802407A0 AE600070 */ sw $zero, 0x70($s3) .L802407A4: diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240898_8CE908.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240898_8CE908.s index f3dad3d451..962c6618dc 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240898_8CE908.s +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240898_8CE908.s @@ -42,11 +42,11 @@ glabel func_80240898_8CE908 .L8024092C: /* 8CE99C 8024092C 8E220070 */ lw $v0, 0x70($s1) /* 8CE9A0 80240930 18400034 */ blez $v0, .L80240A04 -/* 8CE9A4 80240934 00000000 */ nop +/* 8CE9A4 80240934 00000000 */ nop /* 8CE9A8 80240938 C62C0074 */ lwc1 $f12, 0x74($s1) /* 8CE9AC 8024093C 46806320 */ cvt.s.w $f12, $f12 /* 8CE9B0 80240940 44820000 */ mtc1 $v0, $f0 -/* 8CE9B4 80240944 00000000 */ nop +/* 8CE9B4 80240944 00000000 */ nop /* 8CE9B8 80240948 46800020 */ cvt.s.w $f0, $f0 /* 8CE9BC 8024094C 46000021 */ cvt.d.s $f0, $f0 /* 8CE9C0 80240950 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_80240898_8CE908 /* 8CEA20 802409B0 27A70030 */ addiu $a3, $sp, 0x30 .L802409B4: /* 8CEA24 802409B4 10400007 */ beqz $v0, .L802409D4 -/* 8CEA28 802409B8 00000000 */ nop +/* 8CEA28 802409B8 00000000 */ nop /* 8CEA2C 802409BC 4616A082 */ mul.s $f2, $f20, $f22 -/* 8CEA30 802409C0 00000000 */ nop +/* 8CEA30 802409C0 00000000 */ nop /* 8CEA34 802409C4 C7A0002C */ lwc1 $f0, 0x2c($sp) /* 8CEA38 802409C8 46180000 */ add.s $f0, $f0, $f24 /* 8CEA3C 802409CC 08090278 */ j .L802409E0 /* 8CEA40 802409D0 46020000 */ add.s $f0, $f0, $f2 .L802409D4: /* 8CEA44 802409D4 4616A002 */ mul.s $f0, $f20, $f22 -/* 8CEA48 802409D8 00000000 */ nop +/* 8CEA48 802409D8 00000000 */ nop /* 8CEA4C 802409DC 4600D000 */ add.s $f0, $f26, $f0 .L802409E0: /* 8CEA50 802409E0 E600003C */ swc1 $f0, 0x3c($s0) /* 8CEA54 802409E4 8E220074 */ lw $v0, 0x74($s1) /* 8CEA58 802409E8 2442000A */ addiu $v0, $v0, 0xa /* 8CEA5C 802409EC 44826000 */ mtc1 $v0, $f12 -/* 8CEA60 802409F0 00000000 */ nop +/* 8CEA60 802409F0 00000000 */ nop /* 8CEA64 802409F4 0C00A6C9 */ jal clamp_angle /* 8CEA68 802409F8 46806320 */ cvt.s.w $f12, $f12 /* 8CEA6C 802409FC 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_80240898_8CE908 /* 8CEA80 80240A10 860200A8 */ lh $v0, 0xa8($s0) /* 8CEA84 80240A14 C600003C */ lwc1 $f0, 0x3c($s0) /* 8CEA88 80240A18 44821000 */ mtc1 $v0, $f2 -/* 8CEA8C 80240A1C 00000000 */ nop +/* 8CEA8C 80240A1C 00000000 */ nop /* 8CEA90 80240A20 468010A0 */ cvt.s.w $f2, $f2 /* 8CEA94 80240A24 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 8CEA98 80240A28 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_80240898_8CE908 /* 8CEAB4 80240A44 46240000 */ add.d $f0, $f0, $f4 /* 8CEAB8 80240A48 460010A1 */ cvt.d.s $f2, $f2 /* 8CEABC 80240A4C 4620103C */ c.lt.d $f2, $f0 -/* 8CEAC0 80240A50 00000000 */ nop +/* 8CEAC0 80240A50 00000000 */ nop /* 8CEAC4 80240A54 4500002E */ bc1f .L80240B10 /* 8CEAC8 80240A58 0280202D */ daddu $a0, $s4, $zero /* 8CEACC 80240A5C 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_80240898_8CE908 /* 8CEB0C 80240A9C 3C01C1A0 */ lui $at, 0xc1a0 /* 8CEB10 80240AA0 44812000 */ mtc1 $at, $f4 /* 8CEB14 80240AA4 44834000 */ mtc1 $v1, $f8 -/* 8CEB18 80240AA8 00000000 */ nop +/* 8CEB18 80240AA8 00000000 */ nop /* 8CEB1C 80240AAC 46804220 */ cvt.s.w $f8, $f8 /* 8CEB20 80240AB0 44074000 */ mfc1 $a3, $f8 /* 8CEB24 80240AB4 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_80240898_8CE908 .L80240B10: /* 8CEB80 80240B10 8602008C */ lh $v0, 0x8c($s0) /* 8CEB84 80240B14 14400025 */ bnez $v0, .L80240BAC -/* 8CEB88 80240B18 00000000 */ nop +/* 8CEB88 80240B18 00000000 */ nop /* 8CEB8C 80240B1C 8602008E */ lh $v0, 0x8e($s0) /* 8CEB90 80240B20 1C400022 */ bgtz $v0, .L80240BAC -/* 8CEB94 80240B24 00000000 */ nop +/* 8CEB94 80240B24 00000000 */ nop /* 8CEB98 80240B28 8E620074 */ lw $v0, 0x74($s3) /* 8CEB9C 80240B2C 2442FFFF */ addiu $v0, $v0, -1 /* 8CEBA0 80240B30 1840001D */ blez $v0, .L80240BA8 @@ -183,7 +183,7 @@ glabel func_80240898_8CE908 /* 8CEBAC 80240B3C 9442002A */ lhu $v0, 0x2a($v0) /* 8CEBB0 80240B40 30420010 */ andi $v0, $v0, 0x10 /* 8CEBB4 80240B44 14400007 */ bnez $v0, .L80240B64 -/* 8CEBB8 80240B48 00000000 */ nop +/* 8CEBB8 80240B48 00000000 */ nop /* 8CEBBC 80240B4C C600000C */ lwc1 $f0, 0xc($s0) /* 8CEBC0 80240B50 3C014334 */ lui $at, 0x4334 /* 8CEBC4 80240B54 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240CC0_8CED30.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240CC0_8CED30.s index 0a943fc2e7..acf33e8ae2 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240CC0_8CED30.s +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240CC0_8CED30.s @@ -60,18 +60,18 @@ glabel func_80240CC0_8CED30 /* 8CEE08 80240D98 C6200038 */ lwc1 $f0, 0x38($s1) /* 8CEE0C 80240D9C 4600018D */ trunc.w.s $f6, $f0 /* 8CEE10 80240DA0 44023000 */ mfc1 $v0, $f6 -/* 8CEE14 80240DA4 00000000 */ nop +/* 8CEE14 80240DA4 00000000 */ nop /* 8CEE18 80240DA8 A6420010 */ sh $v0, 0x10($s2) /* 8CEE1C 80240DAC C620003C */ lwc1 $f0, 0x3c($s1) /* 8CEE20 80240DB0 4600018D */ trunc.w.s $f6, $f0 /* 8CEE24 80240DB4 44023000 */ mfc1 $v0, $f6 -/* 8CEE28 80240DB8 00000000 */ nop +/* 8CEE28 80240DB8 00000000 */ nop /* 8CEE2C 80240DBC A6420012 */ sh $v0, 0x12($s2) /* 8CEE30 80240DC0 C6200040 */ lwc1 $f0, 0x40($s1) /* 8CEE34 80240DC4 A2430007 */ sb $v1, 7($s2) /* 8CEE38 80240DC8 4600018D */ trunc.w.s $f6, $f0 /* 8CEE3C 80240DCC 44023000 */ mfc1 $v0, $f6 -/* 8CEE40 80240DD0 00000000 */ nop +/* 8CEE40 80240DD0 00000000 */ nop /* 8CEE44 80240DD4 A6420014 */ sh $v0, 0x14($s2) .L80240DD8: /* 8CEE48 80240DD8 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240E58_8CEEC8.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240E58_8CEEC8.s index 46369ac64f..e7d976a5fc 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240E58_8CEEC8.s +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240E58_8CEEC8.s @@ -42,9 +42,9 @@ glabel func_80240E58_8CEEC8 /* 8CEF5C 80240EEC 44801800 */ mtc1 $zero, $f3 /* 8CEF60 80240EF0 46002021 */ cvt.d.s $f0, $f4 /* 8CEF64 80240EF4 4620103E */ c.le.d $f2, $f0 -/* 8CEF68 80240EF8 00000000 */ nop +/* 8CEF68 80240EF8 00000000 */ nop /* 8CEF6C 80240EFC 45000030 */ bc1f .L80240FC0 -/* 8CEF70 80240F00 00000000 */ nop +/* 8CEF70 80240F00 00000000 */ nop /* 8CEF74 80240F04 C600003C */ lwc1 $f0, 0x3c($s0) /* 8CEF78 80240F08 46040000 */ add.s $f0, $f0, $f4 /* 8CEF7C 80240F0C E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_80240E58_8CEEC8 /* 8CEFDC 80240F6C 27A70020 */ addiu $a3, $sp, 0x20 .L80240F70: /* 8CEFE0 80240F70 1040000B */ beqz $v0, .L80240FA0 -/* 8CEFE4 80240F74 00000000 */ nop +/* 8CEFE4 80240F74 00000000 */ nop /* 8CEFE8 80240F78 C7A0001C */ lwc1 $f0, 0x1c($sp) /* 8CEFEC 80240F7C 46140080 */ add.s $f2, $f0, $f20 /* 8CEFF0 80240F80 C600003C */ lwc1 $f0, 0x3c($s0) /* 8CEFF4 80240F84 4600103E */ c.le.s $f2, $f0 -/* 8CEFF8 80240F88 00000000 */ nop +/* 8CEFF8 80240F88 00000000 */ nop /* 8CEFFC 80240F8C 4500008D */ bc1f .L802411C4 -/* 8CF000 80240F90 00000000 */ nop +/* 8CF000 80240F90 00000000 */ nop /* 8CF004 80240F94 E602003C */ swc1 $f2, 0x3c($s0) /* 8CF008 80240F98 08090471 */ j .L802411C4 /* 8CF00C 80240F9C AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_80240E58_8CEEC8 /* 8CF010 80240FA0 C602003C */ lwc1 $f2, 0x3c($s0) /* 8CF014 80240FA4 C6000064 */ lwc1 $f0, 0x64($s0) /* 8CF018 80240FA8 4602003E */ c.le.s $f0, $f2 -/* 8CF01C 80240FAC 00000000 */ nop +/* 8CF01C 80240FAC 00000000 */ nop /* 8CF020 80240FB0 45030084 */ bc1tl .L802411C4 /* 8CF024 80240FB4 AE400070 */ sw $zero, 0x70($s2) /* 8CF028 80240FB8 08090471 */ j .L802411C4 -/* 8CF02C 80240FBC 00000000 */ nop +/* 8CF02C 80240FBC 00000000 */ nop .L80240FC0: /* 8CF030 80240FC0 4622003C */ c.lt.d $f0, $f2 -/* 8CF034 80240FC4 00000000 */ nop +/* 8CF034 80240FC4 00000000 */ nop /* 8CF038 80240FC8 4500007E */ bc1f .L802411C4 -/* 8CF03C 80240FCC 00000000 */ nop +/* 8CF03C 80240FCC 00000000 */ nop /* 8CF040 80240FD0 9602008E */ lhu $v0, 0x8e($s0) /* 8CF044 80240FD4 24420001 */ addiu $v0, $v0, 1 /* 8CF048 80240FD8 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_80240E58_8CEEC8 /* 8CF054 80240FE4 00021403 */ sra $v0, $v0, 0x10 /* 8CF058 80240FE8 0043102A */ slt $v0, $v0, $v1 /* 8CF05C 80240FEC 14400026 */ bnez $v0, .L80241088 -/* 8CF060 80240FF0 00000000 */ nop +/* 8CF060 80240FF0 00000000 */ nop /* 8CF064 80240FF4 C60C0038 */ lwc1 $f12, 0x38($s0) /* 8CF068 80240FF8 C60E0040 */ lwc1 $f14, 0x40($s0) /* 8CF06C 80240FFC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_80240E58_8CEEC8 /* 8CF098 80241028 8E62001C */ lw $v0, 0x1c($s3) /* 8CF09C 8024102C 46001005 */ abs.s $f0, $f2 /* 8CF0A0 80241030 44822000 */ mtc1 $v0, $f4 -/* 8CF0A4 80241034 00000000 */ nop +/* 8CF0A4 80241034 00000000 */ nop /* 8CF0A8 80241038 46802120 */ cvt.s.w $f4, $f4 /* 8CF0AC 8024103C 4600203C */ c.lt.s $f4, $f0 -/* 8CF0B0 80241040 00000000 */ nop +/* 8CF0B0 80241040 00000000 */ nop /* 8CF0B4 80241044 4500000D */ bc1f .L8024107C -/* 8CF0B8 80241048 00000000 */ nop +/* 8CF0B8 80241048 00000000 */ nop /* 8CF0BC 8024104C 44800000 */ mtc1 $zero, $f0 /* 8CF0C0 80241050 C614000C */ lwc1 $f20, 0xc($s0) /* 8CF0C4 80241054 4600103C */ c.lt.s $f2, $f0 -/* 8CF0C8 80241058 00000000 */ nop +/* 8CF0C8 80241058 00000000 */ nop /* 8CF0CC 8024105C 45000006 */ bc1f .L80241078 /* 8CF0D0 80241060 00021023 */ negu $v0, $v0 /* 8CF0D4 80241064 44820000 */ mtc1 $v0, $f0 -/* 8CF0D8 80241068 00000000 */ nop +/* 8CF0D8 80241068 00000000 */ nop /* 8CF0DC 8024106C 46800020 */ cvt.s.w $f0, $f0 /* 8CF0E0 80241070 0809041F */ j .L8024107C /* 8CF0E4 80241074 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_80240E58_8CEEC8 /* 8CF10C 8024109C C600001C */ lwc1 $f0, 0x1c($s0) /* 8CF110 802410A0 46001080 */ add.s $f2, $f2, $f0 /* 8CF114 802410A4 4616103C */ c.lt.s $f2, $f22 -/* 8CF118 802410A8 00000000 */ nop +/* 8CF118 802410A8 00000000 */ nop /* 8CF11C 802410AC 45020045 */ bc1fl .L802411C4 /* 8CF120 802410B0 E602003C */ swc1 $f2, 0x3c($s0) /* 8CF124 802410B4 08090470 */ j .L802411C0 @@ -169,7 +169,7 @@ glabel func_80240E58_8CEEC8 /* 8CF13C 802410CC C600001C */ lwc1 $f0, 0x1c($s0) /* 8CF140 802410D0 C604003C */ lwc1 $f4, 0x3c($s0) /* 8CF144 802410D4 44821000 */ mtc1 $v0, $f2 -/* 8CF148 802410D8 00000000 */ nop +/* 8CF148 802410D8 00000000 */ nop /* 8CF14C 802410DC 468010A0 */ cvt.s.w $f2, $f2 /* 8CF150 802410E0 46000005 */ abs.s $f0, $f0 /* 8CF154 802410E4 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_80240E58_8CEEC8 /* 8CF190 80241120 0C0372DF */ jal func_800DCB7C /* 8CF194 80241124 27A70020 */ addiu $a3, $sp, 0x20 /* 8CF198 80241128 10400015 */ beqz $v0, .L80241180 -/* 8CF19C 8024112C 00000000 */ nop +/* 8CF19C 8024112C 00000000 */ nop /* 8CF1A0 80241130 860200A8 */ lh $v0, 0xa8($s0) /* 8CF1A4 80241134 C604001C */ lwc1 $f4, 0x1c($s0) /* 8CF1A8 80241138 44820000 */ mtc1 $v0, $f0 -/* 8CF1AC 8024113C 00000000 */ nop +/* 8CF1AC 8024113C 00000000 */ nop /* 8CF1B0 80241140 46800020 */ cvt.s.w $f0, $f0 /* 8CF1B4 80241144 46002085 */ abs.s $f2, $f4 /* 8CF1B8 80241148 46020000 */ add.s $f0, $f0, $f2 /* 8CF1BC 8024114C C7A20024 */ lwc1 $f2, 0x24($sp) /* 8CF1C0 80241150 4600103E */ c.le.s $f2, $f0 -/* 8CF1C4 80241154 00000000 */ nop +/* 8CF1C4 80241154 00000000 */ nop /* 8CF1C8 80241158 45000005 */ bc1f .L80241170 -/* 8CF1CC 8024115C 00000000 */ nop +/* 8CF1CC 8024115C 00000000 */ nop /* 8CF1D0 80241160 C7A0001C */ lwc1 $f0, 0x1c($sp) /* 8CF1D4 80241164 AE00001C */ sw $zero, 0x1c($s0) /* 8CF1D8 80241168 08090471 */ j .L802411C4 @@ -217,13 +217,13 @@ glabel func_80240E58_8CEEC8 /* 8CF1F4 80241184 860200A8 */ lh $v0, 0xa8($s0) /* 8CF1F8 80241188 46163081 */ sub.s $f2, $f6, $f22 /* 8CF1FC 8024118C 44820000 */ mtc1 $v0, $f0 -/* 8CF200 80241190 00000000 */ nop +/* 8CF200 80241190 00000000 */ nop /* 8CF204 80241194 46800020 */ cvt.s.w $f0, $f0 /* 8CF208 80241198 46001080 */ add.s $f2, $f2, $f0 /* 8CF20C 8024119C C604001C */ lwc1 $f4, 0x1c($s0) /* 8CF210 802411A0 46002005 */ abs.s $f0, $f4 /* 8CF214 802411A4 4602003C */ c.lt.s $f0, $f2 -/* 8CF218 802411A8 00000000 */ nop +/* 8CF218 802411A8 00000000 */ nop /* 8CF21C 802411AC 45020005 */ bc1fl .L802411C4 /* 8CF220 802411B0 AE00001C */ sw $zero, 0x1c($s0) /* 8CF224 802411B4 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802411E8_8CF258.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802411E8_8CF258.s index 8ad7075e40..323a48f142 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802411E8_8CF258.s +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802411E8_8CF258.s @@ -49,15 +49,15 @@ glabel func_802411E8_8CF258 /* 8CF300 80241290 44802000 */ mtc1 $zero, $f4 /* 8CF304 80241294 460010A1 */ cvt.d.s $f2, $f2 /* 8CF308 80241298 46241082 */ mul.d $f2, $f2, $f4 -/* 8CF30C 8024129C 00000000 */ nop +/* 8CF30C 8024129C 00000000 */ nop /* 8CF310 802412A0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* 8CF314 802412A4 46000021 */ cvt.d.s $f0, $f0 /* 8CF318 802412A8 46240002 */ mul.d $f0, $f0, $f4 -/* 8CF31C 802412AC 00000000 */ nop +/* 8CF31C 802412AC 00000000 */ nop /* 8CF320 802412B0 3C013FE0 */ lui $at, 0x3fe0 /* 8CF324 802412B4 44812800 */ mtc1 $at, $f5 /* 8CF328 802412B8 44802000 */ mtc1 $zero, $f4 -/* 8CF32C 802412BC 00000000 */ nop +/* 8CF32C 802412BC 00000000 */ nop /* 8CF330 802412C0 46241080 */ add.d $f2, $f2, $f4 /* 8CF334 802412C4 AE000074 */ sw $zero, 0x74($s0) /* 8CF338 802412C8 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s index 79d8522d8a..28e70836bf 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s @@ -54,7 +54,7 @@ glabel func_8024130C_8CF37C /* 8CF43C 802413CC 8E4300B0 */ lw $v1, 0xb0($s2) /* 8CF440 802413D0 30620004 */ andi $v0, $v1, 4 /* 8CF444 802413D4 10400007 */ beqz $v0, .L802413F4 -/* 8CF448 802413D8 00000000 */ nop +/* 8CF448 802413D8 00000000 */ nop /* 8CF44C 802413DC 824200B4 */ lb $v0, 0xb4($s2) /* 8CF450 802413E0 1440003C */ bnez $v0, .L802414D4 /* 8CF454 802413E4 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_8024130C_8CF37C /* 8CF468 802413F8 2C62000F */ sltiu $v0, $v1, 0xf /* 8CF46C 802413FC 10400034 */ beqz $v0, .L802414D0 /* 8CF470 80241400 00031080 */ sll $v0, $v1, 2 -/* 8CF474 80241404 3C018024 */ lui $at, %hi(D_80243458) +/* 8CF474 80241404 3C018024 */ lui $at, %hi(jtbl_80243458_8D14C8) /* 8CF478 80241408 00220821 */ addu $at, $at, $v0 -/* 8CF47C 8024140C 8C223458 */ lw $v0, %lo(D_80243458)($at) +/* 8CF47C 8024140C 8C223458 */ lw $v0, %lo(jtbl_80243458_8D14C8)($at) /* 8CF480 80241410 00400008 */ jr $v0 -/* 8CF484 80241414 00000000 */ nop +/* 8CF484 80241414 00000000 */ nop +glabel L80241418_8CF488 /* 8CF488 80241418 0280202D */ daddu $a0, $s4, $zero /* 8CF48C 8024141C 0200282D */ daddu $a1, $s0, $zero /* 8CF490 80241420 0C090000 */ jal func_80240000_8CE070 /* 8CF494 80241424 0260302D */ daddu $a2, $s3, $zero +glabel L80241428_8CF498 /* 8CF498 80241428 0280202D */ daddu $a0, $s4, $zero /* 8CF49C 8024142C 0200282D */ daddu $a1, $s0, $zero /* 8CF4A0 80241430 0C09006C */ jal func_802401B0_8CE220 /* 8CF4A4 80241434 0260302D */ daddu $a2, $s3, $zero /* 8CF4A8 80241438 08090535 */ j .L802414D4 /* 8CF4AC 8024143C 0000102D */ daddu $v0, $zero, $zero +glabel L80241440_8CF4B0 /* 8CF4B0 80241440 0280202D */ daddu $a0, $s4, $zero /* 8CF4B4 80241444 0200282D */ daddu $a1, $s0, $zero /* 8CF4B8 80241448 0C0901F6 */ jal kmr_05_UnkNpcAIFunc1 /* 8CF4BC 8024144C 0260302D */ daddu $a2, $s3, $zero +glabel L80241450_8CF4C0 /* 8CF4C0 80241450 0280202D */ daddu $a0, $s4, $zero /* 8CF4C4 80241454 0200282D */ daddu $a1, $s0, $zero /* 8CF4C8 80241458 0C090226 */ jal func_80240898_8CE908 /* 8CF4CC 8024145C 0260302D */ daddu $a2, $s3, $zero /* 8CF4D0 80241460 08090535 */ j .L802414D4 /* 8CF4D4 80241464 0000102D */ daddu $v0, $zero, $zero +glabel L80241468_8CF4D8 /* 8CF4D8 80241468 0280202D */ daddu $a0, $s4, $zero /* 8CF4DC 8024146C 0200282D */ daddu $a1, $s0, $zero /* 8CF4E0 80241470 0C0902F7 */ jal kmr_05_UnkNpcAIFunc2 /* 8CF4E4 80241474 0260302D */ daddu $a2, $s3, $zero +glabel L80241478_8CF4E8 /* 8CF4E8 80241478 0280202D */ daddu $a0, $s4, $zero /* 8CF4EC 8024147C 0200282D */ daddu $a1, $s0, $zero /* 8CF4F0 80241480 0C090315 */ jal func_80240C54_8CECC4 /* 8CF4F4 80241484 0260302D */ daddu $a2, $s3, $zero /* 8CF4F8 80241488 08090535 */ j .L802414D4 /* 8CF4FC 8024148C 0000102D */ daddu $v0, $zero, $zero +glabel L80241490_8CF500 /* 8CF500 80241490 0280202D */ daddu $a0, $s4, $zero /* 8CF504 80241494 0200282D */ daddu $a1, $s0, $zero /* 8CF508 80241498 0C090330 */ jal func_80240CC0_8CED30 /* 8CF50C 8024149C 0260302D */ daddu $a2, $s3, $zero /* 8CF510 802414A0 08090535 */ j .L802414D4 /* 8CF514 802414A4 0000102D */ daddu $v0, $zero, $zero +glabel L802414A8_8CF518 /* 8CF518 802414A8 0280202D */ daddu $a0, $s4, $zero /* 8CF51C 802414AC 0200282D */ daddu $a1, $s0, $zero /* 8CF520 802414B0 0C09037D */ jal kmr_05_UnkNpcAIFunc3 /* 8CF524 802414B4 0260302D */ daddu $a2, $s3, $zero /* 8CF528 802414B8 08090535 */ j .L802414D4 /* 8CF52C 802414BC 0000102D */ daddu $v0, $zero, $zero +glabel L802414C0_8CF530 /* 8CF530 802414C0 0280202D */ daddu $a0, $s4, $zero /* 8CF534 802414C4 0200282D */ daddu $a1, $s0, $zero /* 8CF538 802414C8 0C090396 */ jal func_80240E58_8CEEC8 /* 8CF53C 802414CC 0260302D */ daddu $a2, $s3, $zero .L802414D0: +glabel L802414D0_8CF540 /* 8CF540 802414D0 0000102D */ daddu $v0, $zero, $zero .L802414D4: /* 8CF544 802414D4 8FBF0048 */ lw $ra, 0x48($sp) @@ -129,5 +139,5 @@ glabel func_8024130C_8CF37C /* 8CF55C 802414EC 8FB00030 */ lw $s0, 0x30($sp) /* 8CF560 802414F0 03E00008 */ jr $ra /* 8CF564 802414F4 27BD0050 */ addiu $sp, $sp, 0x50 -/* 8CF568 802414F8 00000000 */ nop -/* 8CF56C 802414FC 00000000 */ nop +/* 8CF568 802414F8 00000000 */ nop +/* 8CF56C 802414FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240000_8D1510.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240000_8D1510.s index 32201ac16b..6d33bbd126 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240000_8D1510.s +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240000_8D1510.s @@ -47,7 +47,7 @@ glabel func_80240000_8D1510 /* 8D15B8 802400A8 0C0123F5 */ jal is_point_within_region /* 8D15BC 802400AC 8E070038 */ lw $a3, 0x38($s0) /* 8D15C0 802400B0 1040000E */ beqz $v0, .L802400EC -/* 8D15C4 802400B4 00000000 */ nop +/* 8D15C4 802400B4 00000000 */ nop /* 8D15C8 802400B8 8E2200D0 */ lw $v0, 0xd0($s1) /* 8D15CC 802400BC C60C0038 */ lwc1 $f12, 0x38($s0) /* 8D15D0 802400C0 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240000_8D1510 /* 8D15E4 802400D4 468031A0 */ cvt.s.w $f6, $f6 /* 8D15E8 802400D8 44073000 */ mfc1 $a3, $f6 /* 8D15EC 802400DC 0C00A720 */ jal atan2 -/* 8D15F0 802400E0 00000000 */ nop +/* 8D15F0 802400E0 00000000 */ nop /* 8D15F4 802400E4 08090047 */ j .L8024011C /* 8D15F8 802400E8 E600000C */ swc1 $f0, 0xc($s0) .L802400EC: @@ -66,7 +66,7 @@ glabel func_80240000_8D1510 /* 8D1600 802400F0 2404003C */ addiu $a0, $zero, 0x3c /* 8D1604 802400F4 C60C000C */ lwc1 $f12, 0xc($s0) /* 8D1608 802400F8 44820000 */ mtc1 $v0, $f0 -/* 8D160C 802400FC 00000000 */ nop +/* 8D160C 802400FC 00000000 */ nop /* 8D1610 80240100 46800020 */ cvt.s.w $f0, $f0 /* 8D1614 80240104 46006300 */ add.s $f12, $f12, $f0 /* 8D1618 80240108 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240000_8D1510 /* 8D163C 8024012C 8E2200D0 */ lw $v0, 0xd0($s1) /* 8D1640 80240130 8C420014 */ lw $v0, 0x14($v0) /* 8D1644 80240134 04410004 */ bgez $v0, .L80240148 -/* 8D1648 80240138 00000000 */ nop +/* 8D1648 80240138 00000000 */ nop /* 8D164C 8024013C C6400000 */ lwc1 $f0, ($s2) /* 8D1650 80240140 0809005A */ j .L80240168 /* 8D1654 80240144 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240000_8D1510 /* 8D1658 80240148 3C018024 */ lui $at, %hi(D_80242850) /* 8D165C 8024014C D4222850 */ ldc1 $f2, %lo(D_80242850)($at) /* 8D1660 80240150 44820000 */ mtc1 $v0, $f0 -/* 8D1664 80240154 00000000 */ nop +/* 8D1664 80240154 00000000 */ nop /* 8D1668 80240158 46800021 */ cvt.d.w $f0, $f0 /* 8D166C 8024015C 46220003 */ div.d $f0, $f0, $f2 /* 8D1670 80240160 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240000_8D1510 /* 8D1684 80240174 44801000 */ mtc1 $zero, $f2 /* 8D1688 80240178 46000021 */ cvt.d.s $f0, $f0 /* 8D168C 8024017C 46220002 */ mul.d $f0, $f0, $f2 -/* 8D1690 80240180 00000000 */ nop +/* 8D1690 80240180 00000000 */ nop /* 8D1694 80240184 24020001 */ addiu $v0, $zero, 1 /* 8D1698 80240188 4620018D */ trunc.w.d $f6, $f0 /* 8D169C 8024018C E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802401B0_8D16C0.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802401B0_8D16C0.s index 7a94493ea9..67ee727179 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802401B0_8D16C0.s +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802401B0_8D16C0.s @@ -34,7 +34,7 @@ glabel func_802401B0_8D16C0 /* 8D1734 80240224 44803000 */ mtc1 $zero, $f6 /* 8D1738 80240228 46000021 */ cvt.d.s $f0, $f0 /* 8D173C 8024022C 46260002 */ mul.d $f0, $f0, $f6 -/* 8D1740 80240230 00000000 */ nop +/* 8D1740 80240230 00000000 */ nop /* 8D1744 80240234 24020001 */ addiu $v0, $zero, 1 /* 8D1748 80240238 8E24006C */ lw $a0, 0x6c($s1) /* 8D174C 8024023C 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_802401B0_8D16C0 /* 8D17A8 80240298 C600003C */ lwc1 $f0, 0x3c($s0) /* 8D17AC 8024029C 4600C001 */ sub.s $f0, $f24, $f0 /* 8D17B0 802402A0 4600B03C */ c.lt.s $f22, $f0 -/* 8D17B4 802402A4 00000000 */ nop +/* 8D17B4 802402A4 00000000 */ nop /* 8D17B8 802402A8 4500001B */ bc1f .L80240318 /* 8D17BC 802402AC 34820010 */ ori $v0, $a0, 0x10 /* 8D17C0 802402B0 080900C6 */ j .L80240318 @@ -87,9 +87,9 @@ glabel func_802401B0_8D16C0 /* 8D1804 802402F4 C7A00034 */ lwc1 $f0, 0x34($sp) /* 8D1808 802402F8 4600D001 */ sub.s $f0, $f26, $f0 /* 8D180C 802402FC 4600B03C */ c.lt.s $f22, $f0 -/* 8D1810 80240300 00000000 */ nop +/* 8D1810 80240300 00000000 */ nop /* 8D1814 80240304 45000004 */ bc1f .L80240318 -/* 8D1818 80240308 00000000 */ nop +/* 8D1818 80240308 00000000 */ nop /* 8D181C 8024030C 8E22006C */ lw $v0, 0x6c($s1) /* 8D1820 80240310 34420010 */ ori $v0, $v0, 0x10 /* 8D1824 80240314 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_802401B0_8D16C0 /* 8D182C 8024031C 24030011 */ addiu $v1, $zero, 0x11 /* 8D1830 80240320 30420011 */ andi $v0, $v0, 0x11 /* 8D1834 80240324 14430039 */ bne $v0, $v1, .L8024040C -/* 8D1838 80240328 00000000 */ nop +/* 8D1838 80240328 00000000 */ nop /* 8D183C 8024032C 8E020000 */ lw $v0, ($s0) /* 8D1840 80240330 30420008 */ andi $v0, $v0, 8 /* 8D1844 80240334 1040000A */ beqz $v0, .L80240360 @@ -108,7 +108,7 @@ glabel func_802401B0_8D16C0 /* 8D1854 80240344 D4202858 */ ldc1 $f0, %lo(D_80242858)($at) /* 8D1858 80240348 460010A1 */ cvt.d.s $f2, $f2 /* 8D185C 8024034C 46201082 */ mul.d $f2, $f2, $f0 -/* 8D1860 80240350 00000000 */ nop +/* 8D1860 80240350 00000000 */ nop /* 8D1864 80240354 4600A021 */ cvt.d.s $f0, $f20 /* 8D1868 80240358 080900F1 */ j .L802403C4 /* 8D186C 8024035C 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_802401B0_8D16C0 /* 8D18BC 802403AC D4202860 */ ldc1 $f0, %lo(func_80242860_8B28D0)($at) /* 8D18C0 802403B0 460010A1 */ cvt.d.s $f2, $f2 /* 8D18C4 802403B4 46201082 */ mul.d $f2, $f2, $f0 -/* 8D18C8 802403B8 00000000 */ nop +/* 8D18C8 802403B8 00000000 */ nop /* 8D18CC 802403BC 4600A021 */ cvt.d.s $f0, $f20 /* 8D18D0 802403C0 46220000 */ add.d $f0, $f0, $f2 .L802403C4: @@ -149,7 +149,7 @@ glabel func_802401B0_8D16C0 /* 8D18F0 802403E0 46000005 */ abs.s $f0, $f0 /* 8D18F4 802403E4 46000021 */ cvt.d.s $f0, $f0 /* 8D18F8 802403E8 4622003C */ c.lt.d $f0, $f2 -/* 8D18FC 802403EC 00000000 */ nop +/* 8D18FC 802403EC 00000000 */ nop /* 8D1900 802403F0 45000036 */ bc1f .L802404CC /* 8D1904 802403F4 2403FFEF */ addiu $v1, $zero, -0x11 /* 8D1908 802403F8 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_802401B0_8D16C0 .L8024040C: /* 8D191C 8024040C 8E220070 */ lw $v0, 0x70($s1) /* 8D1920 80240410 1840002E */ blez $v0, .L802404CC -/* 8D1924 80240414 00000000 */ nop +/* 8D1924 80240414 00000000 */ nop /* 8D1928 80240418 C62C0074 */ lwc1 $f12, 0x74($s1) /* 8D192C 8024041C 0C00A8BB */ jal sin_deg /* 8D1930 80240420 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_802401B0_8D16C0 /* 8D1988 80240478 27A70030 */ addiu $a3, $sp, 0x30 .L8024047C: /* 8D198C 8024047C 10400007 */ beqz $v0, .L8024049C -/* 8D1990 80240480 00000000 */ nop +/* 8D1990 80240480 00000000 */ nop /* 8D1994 80240484 4616A082 */ mul.s $f2, $f20, $f22 -/* 8D1998 80240488 00000000 */ nop +/* 8D1998 80240488 00000000 */ nop /* 8D199C 8024048C C7A0002C */ lwc1 $f0, 0x2c($sp) /* 8D19A0 80240490 461A0000 */ add.s $f0, $f0, $f26 /* 8D19A4 80240494 0809012A */ j .L802404A8 /* 8D19A8 80240498 46020000 */ add.s $f0, $f0, $f2 .L8024049C: /* 8D19AC 8024049C 4616A002 */ mul.s $f0, $f20, $f22 -/* 8D19B0 802404A0 00000000 */ nop +/* 8D19B0 802404A0 00000000 */ nop /* 8D19B4 802404A4 4600C000 */ add.s $f0, $f24, $f0 .L802404A8: /* 8D19B8 802404A8 E600003C */ swc1 $f0, 0x3c($s0) /* 8D19BC 802404AC 8E220074 */ lw $v0, 0x74($s1) /* 8D19C0 802404B0 2442000A */ addiu $v0, $v0, 0xa /* 8D19C4 802404B4 44826000 */ mtc1 $v0, $f12 -/* 8D19C8 802404B8 00000000 */ nop +/* 8D19C8 802404B8 00000000 */ nop /* 8D19CC 802404BC 0C00A6C9 */ jal clamp_angle /* 8D19D0 802404C0 46806320 */ cvt.s.w $f12, $f12 /* 8D19D4 802404C4 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_802401B0_8D16C0 /* 8D19E4 802404D4 2442FFFF */ addiu $v0, $v0, -1 /* 8D19E8 802404D8 8E430014 */ lw $v1, 0x14($s2) /* 8D19EC 802404DC 04600048 */ bltz $v1, .L80240600 -/* 8D19F0 802404E0 00000000 */ nop +/* 8D19F0 802404E0 00000000 */ nop /* 8D19F4 802404E4 8E620074 */ lw $v0, 0x74($s3) /* 8D19F8 802404E8 1C400042 */ bgtz $v0, .L802405F4 /* 8D19FC 802404EC 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_802401B0_8D16C0 /* 8D1A04 802404F4 860200A8 */ lh $v0, 0xa8($s0) /* 8D1A08 802404F8 C602003C */ lwc1 $f2, 0x3c($s0) /* 8D1A0C 802404FC 44820000 */ mtc1 $v0, $f0 -/* 8D1A10 80240500 00000000 */ nop +/* 8D1A10 80240500 00000000 */ nop /* 8D1A14 80240504 46800020 */ cvt.s.w $f0, $f0 /* 8D1A18 80240508 46001080 */ add.s $f2, $f2, $f0 /* 8D1A1C 8024050C 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_802401B0_8D16C0 /* 8D1A38 80240528 C440002C */ lwc1 $f0, 0x2c($v0) /* 8D1A3C 8024052C 46000021 */ cvt.d.s $f0, $f0 /* 8D1A40 80240530 4622003C */ c.lt.d $f0, $f2 -/* 8D1A44 80240534 00000000 */ nop +/* 8D1A44 80240534 00000000 */ nop /* 8D1A48 80240538 4500002C */ bc1f .L802405EC /* 8D1A4C 8024053C 02A0202D */ daddu $a0, $s5, $zero /* 8D1A50 80240540 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_802401B0_8D16C0 /* 8D1A8C 8024057C 3C01C1A0 */ lui $at, 0xc1a0 /* 8D1A90 80240580 44812000 */ mtc1 $at, $f4 /* 8D1A94 80240584 44834000 */ mtc1 $v1, $f8 -/* 8D1A98 80240588 00000000 */ nop +/* 8D1A98 80240588 00000000 */ nop /* 8D1A9C 8024058C 46804220 */ cvt.s.w $f8, $f8 /* 8D1AA0 80240590 44074000 */ mfc1 $a3, $f8 /* 8D1AA4 80240594 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_802401B0_8D16C0 /* 8D1B58 80240648 0C0123F5 */ jal is_point_within_region /* 8D1B5C 8024064C 8E070038 */ lw $a3, 0x38($s0) /* 8D1B60 80240650 1040001A */ beqz $v0, .L802406BC -/* 8D1B64 80240654 00000000 */ nop +/* 8D1B64 80240654 00000000 */ nop /* 8D1B68 80240658 8E060038 */ lw $a2, 0x38($s0) /* 8D1B6C 8024065C 8E2200D0 */ lw $v0, 0xd0($s1) /* 8D1B70 80240660 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_802401B0_8D16C0 /* 8D1B84 80240674 468073A0 */ cvt.s.w $f14, $f14 /* 8D1B88 80240678 C6020018 */ lwc1 $f2, 0x18($s0) /* 8D1B8C 8024067C 4600103C */ c.lt.s $f2, $f0 -/* 8D1B90 80240680 00000000 */ nop +/* 8D1B90 80240680 00000000 */ nop /* 8D1B94 80240684 4500000D */ bc1f .L802406BC /* 8D1B98 80240688 E7A00034 */ swc1 $f0, 0x34($sp) /* 8D1B9C 8024068C C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_802401B0_8D16C0 /* 8D1BD8 802406C8 00621825 */ or $v1, $v1, $v0 /* 8D1BDC 802406CC 00741825 */ or $v1, $v1, $s4 /* 8D1BE0 802406D0 10600008 */ beqz $v1, .L802406F4 -/* 8D1BE4 802406D4 00000000 */ nop +/* 8D1BE4 802406D4 00000000 */ nop /* 8D1BE8 802406D8 8602008C */ lh $v0, 0x8c($s0) /* 8D1BEC 802406DC 14400031 */ bnez $v0, .L802407A4 -/* 8D1BF0 802406E0 00000000 */ nop +/* 8D1BF0 802406E0 00000000 */ nop /* 8D1BF4 802406E4 8E050018 */ lw $a1, 0x18($s0) /* 8D1BF8 802406E8 8E06000C */ lw $a2, 0xc($s0) /* 8D1BFC 802406EC 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_802401B0_8D16C0 /* 8D1C10 80240700 44801000 */ mtc1 $zero, $f2 /* 8D1C14 80240704 46000021 */ cvt.d.s $f0, $f0 /* 8D1C18 80240708 46220002 */ mul.d $f0, $f0, $f2 -/* 8D1C1C 8024070C 00000000 */ nop +/* 8D1C1C 8024070C 00000000 */ nop /* 8D1C20 80240710 4620020D */ trunc.w.d $f8, $f0 /* 8D1C24 80240714 E628007C */ swc1 $f8, 0x7c($s1) /* 8D1C28 80240718 8E420004 */ lw $v0, 4($s2) /* 8D1C2C 8024071C 18400021 */ blez $v0, .L802407A4 -/* 8D1C30 80240720 00000000 */ nop +/* 8D1C30 80240720 00000000 */ nop /* 8D1C34 80240724 8602008E */ lh $v0, 0x8e($s0) /* 8D1C38 80240728 9603008E */ lhu $v1, 0x8e($s0) /* 8D1C3C 8024072C 18400005 */ blez $v0, .L80240744 @@ -375,7 +375,7 @@ glabel func_802401B0_8D16C0 /* 8D1C44 80240734 A602008E */ sh $v0, 0x8e($s0) /* 8D1C48 80240738 00021400 */ sll $v0, $v0, 0x10 /* 8D1C4C 8024073C 1C400019 */ bgtz $v0, .L802407A4 -/* 8D1C50 80240740 00000000 */ nop +/* 8D1C50 80240740 00000000 */ nop .L80240744: /* 8D1C54 80240744 240403E8 */ addiu $a0, $zero, 0x3e8 /* 8D1C58 80240748 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_802401B0_8D16C0 /* 8D1CA0 80240790 18400003 */ blez $v0, .L802407A0 /* 8D1CA4 80240794 28620003 */ slti $v0, $v1, 3 /* 8D1CA8 80240798 10400002 */ beqz $v0, .L802407A4 -/* 8D1CAC 8024079C 00000000 */ nop +/* 8D1CAC 8024079C 00000000 */ nop .L802407A0: /* 8D1CB0 802407A0 AE600070 */ sw $zero, 0x70($s3) .L802407A4: diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240898_8D1DA8.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240898_8D1DA8.s index fdae036b45..577f52fa3f 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240898_8D1DA8.s +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240898_8D1DA8.s @@ -42,11 +42,11 @@ glabel func_80240898_8D1DA8 .L8024092C: /* 8D1E3C 8024092C 8E220070 */ lw $v0, 0x70($s1) /* 8D1E40 80240930 18400034 */ blez $v0, .L80240A04 -/* 8D1E44 80240934 00000000 */ nop +/* 8D1E44 80240934 00000000 */ nop /* 8D1E48 80240938 C62C0074 */ lwc1 $f12, 0x74($s1) /* 8D1E4C 8024093C 46806320 */ cvt.s.w $f12, $f12 /* 8D1E50 80240940 44820000 */ mtc1 $v0, $f0 -/* 8D1E54 80240944 00000000 */ nop +/* 8D1E54 80240944 00000000 */ nop /* 8D1E58 80240948 46800020 */ cvt.s.w $f0, $f0 /* 8D1E5C 8024094C 46000021 */ cvt.d.s $f0, $f0 /* 8D1E60 80240950 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_80240898_8D1DA8 /* 8D1EC0 802409B0 27A70030 */ addiu $a3, $sp, 0x30 .L802409B4: /* 8D1EC4 802409B4 10400007 */ beqz $v0, .L802409D4 -/* 8D1EC8 802409B8 00000000 */ nop +/* 8D1EC8 802409B8 00000000 */ nop /* 8D1ECC 802409BC 4616A082 */ mul.s $f2, $f20, $f22 -/* 8D1ED0 802409C0 00000000 */ nop +/* 8D1ED0 802409C0 00000000 */ nop /* 8D1ED4 802409C4 C7A0002C */ lwc1 $f0, 0x2c($sp) /* 8D1ED8 802409C8 46180000 */ add.s $f0, $f0, $f24 /* 8D1EDC 802409CC 08090278 */ j .L802409E0 /* 8D1EE0 802409D0 46020000 */ add.s $f0, $f0, $f2 .L802409D4: /* 8D1EE4 802409D4 4616A002 */ mul.s $f0, $f20, $f22 -/* 8D1EE8 802409D8 00000000 */ nop +/* 8D1EE8 802409D8 00000000 */ nop /* 8D1EEC 802409DC 4600D000 */ add.s $f0, $f26, $f0 .L802409E0: /* 8D1EF0 802409E0 E600003C */ swc1 $f0, 0x3c($s0) /* 8D1EF4 802409E4 8E220074 */ lw $v0, 0x74($s1) /* 8D1EF8 802409E8 2442000A */ addiu $v0, $v0, 0xa /* 8D1EFC 802409EC 44826000 */ mtc1 $v0, $f12 -/* 8D1F00 802409F0 00000000 */ nop +/* 8D1F00 802409F0 00000000 */ nop /* 8D1F04 802409F4 0C00A6C9 */ jal clamp_angle /* 8D1F08 802409F8 46806320 */ cvt.s.w $f12, $f12 /* 8D1F0C 802409FC 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_80240898_8D1DA8 /* 8D1F20 80240A10 860200A8 */ lh $v0, 0xa8($s0) /* 8D1F24 80240A14 C600003C */ lwc1 $f0, 0x3c($s0) /* 8D1F28 80240A18 44821000 */ mtc1 $v0, $f2 -/* 8D1F2C 80240A1C 00000000 */ nop +/* 8D1F2C 80240A1C 00000000 */ nop /* 8D1F30 80240A20 468010A0 */ cvt.s.w $f2, $f2 /* 8D1F34 80240A24 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 8D1F38 80240A28 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_80240898_8D1DA8 /* 8D1F54 80240A44 46240000 */ add.d $f0, $f0, $f4 /* 8D1F58 80240A48 460010A1 */ cvt.d.s $f2, $f2 /* 8D1F5C 80240A4C 4620103C */ c.lt.d $f2, $f0 -/* 8D1F60 80240A50 00000000 */ nop +/* 8D1F60 80240A50 00000000 */ nop /* 8D1F64 80240A54 4500002E */ bc1f .L80240B10 /* 8D1F68 80240A58 0280202D */ daddu $a0, $s4, $zero /* 8D1F6C 80240A5C 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_80240898_8D1DA8 /* 8D1FAC 80240A9C 3C01C1A0 */ lui $at, 0xc1a0 /* 8D1FB0 80240AA0 44812000 */ mtc1 $at, $f4 /* 8D1FB4 80240AA4 44834000 */ mtc1 $v1, $f8 -/* 8D1FB8 80240AA8 00000000 */ nop +/* 8D1FB8 80240AA8 00000000 */ nop /* 8D1FBC 80240AAC 46804220 */ cvt.s.w $f8, $f8 /* 8D1FC0 80240AB0 44074000 */ mfc1 $a3, $f8 /* 8D1FC4 80240AB4 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_80240898_8D1DA8 .L80240B10: /* 8D2020 80240B10 8602008C */ lh $v0, 0x8c($s0) /* 8D2024 80240B14 14400025 */ bnez $v0, .L80240BAC -/* 8D2028 80240B18 00000000 */ nop +/* 8D2028 80240B18 00000000 */ nop /* 8D202C 80240B1C 8602008E */ lh $v0, 0x8e($s0) /* 8D2030 80240B20 1C400022 */ bgtz $v0, .L80240BAC -/* 8D2034 80240B24 00000000 */ nop +/* 8D2034 80240B24 00000000 */ nop /* 8D2038 80240B28 8E620074 */ lw $v0, 0x74($s3) /* 8D203C 80240B2C 2442FFFF */ addiu $v0, $v0, -1 /* 8D2040 80240B30 1840001D */ blez $v0, .L80240BA8 @@ -183,7 +183,7 @@ glabel func_80240898_8D1DA8 /* 8D204C 80240B3C 9442002A */ lhu $v0, 0x2a($v0) /* 8D2050 80240B40 30420010 */ andi $v0, $v0, 0x10 /* 8D2054 80240B44 14400007 */ bnez $v0, .L80240B64 -/* 8D2058 80240B48 00000000 */ nop +/* 8D2058 80240B48 00000000 */ nop /* 8D205C 80240B4C C600000C */ lwc1 $f0, 0xc($s0) /* 8D2060 80240B50 3C014334 */ lui $at, 0x4334 /* 8D2064 80240B54 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240CC0_8D21D0.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240CC0_8D21D0.s index c9057dd5d9..da4166ef2d 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240CC0_8D21D0.s +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240CC0_8D21D0.s @@ -60,18 +60,18 @@ glabel func_80240CC0_8D21D0 /* 8D22A8 80240D98 C6200038 */ lwc1 $f0, 0x38($s1) /* 8D22AC 80240D9C 4600018D */ trunc.w.s $f6, $f0 /* 8D22B0 80240DA0 44023000 */ mfc1 $v0, $f6 -/* 8D22B4 80240DA4 00000000 */ nop +/* 8D22B4 80240DA4 00000000 */ nop /* 8D22B8 80240DA8 A6420010 */ sh $v0, 0x10($s2) /* 8D22BC 80240DAC C620003C */ lwc1 $f0, 0x3c($s1) /* 8D22C0 80240DB0 4600018D */ trunc.w.s $f6, $f0 /* 8D22C4 80240DB4 44023000 */ mfc1 $v0, $f6 -/* 8D22C8 80240DB8 00000000 */ nop +/* 8D22C8 80240DB8 00000000 */ nop /* 8D22CC 80240DBC A6420012 */ sh $v0, 0x12($s2) /* 8D22D0 80240DC0 C6200040 */ lwc1 $f0, 0x40($s1) /* 8D22D4 80240DC4 A2430007 */ sb $v1, 7($s2) /* 8D22D8 80240DC8 4600018D */ trunc.w.s $f6, $f0 /* 8D22DC 80240DCC 44023000 */ mfc1 $v0, $f6 -/* 8D22E0 80240DD0 00000000 */ nop +/* 8D22E0 80240DD0 00000000 */ nop /* 8D22E4 80240DD4 A6420014 */ sh $v0, 0x14($s2) .L80240DD8: /* 8D22E8 80240DD8 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240E58_8D2368.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240E58_8D2368.s index 73efab6336..f43c06201e 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240E58_8D2368.s +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240E58_8D2368.s @@ -42,9 +42,9 @@ glabel func_80240E58_8D2368 /* 8D23FC 80240EEC 44801800 */ mtc1 $zero, $f3 /* 8D2400 80240EF0 46002021 */ cvt.d.s $f0, $f4 /* 8D2404 80240EF4 4620103E */ c.le.d $f2, $f0 -/* 8D2408 80240EF8 00000000 */ nop +/* 8D2408 80240EF8 00000000 */ nop /* 8D240C 80240EFC 45000030 */ bc1f .L80240FC0 -/* 8D2410 80240F00 00000000 */ nop +/* 8D2410 80240F00 00000000 */ nop /* 8D2414 80240F04 C600003C */ lwc1 $f0, 0x3c($s0) /* 8D2418 80240F08 46040000 */ add.s $f0, $f0, $f4 /* 8D241C 80240F0C E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_80240E58_8D2368 /* 8D247C 80240F6C 27A70020 */ addiu $a3, $sp, 0x20 .L80240F70: /* 8D2480 80240F70 1040000B */ beqz $v0, .L80240FA0 -/* 8D2484 80240F74 00000000 */ nop +/* 8D2484 80240F74 00000000 */ nop /* 8D2488 80240F78 C7A0001C */ lwc1 $f0, 0x1c($sp) /* 8D248C 80240F7C 46140080 */ add.s $f2, $f0, $f20 /* 8D2490 80240F80 C600003C */ lwc1 $f0, 0x3c($s0) /* 8D2494 80240F84 4600103E */ c.le.s $f2, $f0 -/* 8D2498 80240F88 00000000 */ nop +/* 8D2498 80240F88 00000000 */ nop /* 8D249C 80240F8C 4500008D */ bc1f .L802411C4 -/* 8D24A0 80240F90 00000000 */ nop +/* 8D24A0 80240F90 00000000 */ nop /* 8D24A4 80240F94 E602003C */ swc1 $f2, 0x3c($s0) /* 8D24A8 80240F98 08090471 */ j .L802411C4 /* 8D24AC 80240F9C AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_80240E58_8D2368 /* 8D24B0 80240FA0 C602003C */ lwc1 $f2, 0x3c($s0) /* 8D24B4 80240FA4 C6000064 */ lwc1 $f0, 0x64($s0) /* 8D24B8 80240FA8 4602003E */ c.le.s $f0, $f2 -/* 8D24BC 80240FAC 00000000 */ nop +/* 8D24BC 80240FAC 00000000 */ nop /* 8D24C0 80240FB0 45030084 */ bc1tl .L802411C4 /* 8D24C4 80240FB4 AE400070 */ sw $zero, 0x70($s2) /* 8D24C8 80240FB8 08090471 */ j .L802411C4 -/* 8D24CC 80240FBC 00000000 */ nop +/* 8D24CC 80240FBC 00000000 */ nop .L80240FC0: /* 8D24D0 80240FC0 4622003C */ c.lt.d $f0, $f2 -/* 8D24D4 80240FC4 00000000 */ nop +/* 8D24D4 80240FC4 00000000 */ nop /* 8D24D8 80240FC8 4500007E */ bc1f .L802411C4 -/* 8D24DC 80240FCC 00000000 */ nop +/* 8D24DC 80240FCC 00000000 */ nop /* 8D24E0 80240FD0 9602008E */ lhu $v0, 0x8e($s0) /* 8D24E4 80240FD4 24420001 */ addiu $v0, $v0, 1 /* 8D24E8 80240FD8 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_80240E58_8D2368 /* 8D24F4 80240FE4 00021403 */ sra $v0, $v0, 0x10 /* 8D24F8 80240FE8 0043102A */ slt $v0, $v0, $v1 /* 8D24FC 80240FEC 14400026 */ bnez $v0, .L80241088 -/* 8D2500 80240FF0 00000000 */ nop +/* 8D2500 80240FF0 00000000 */ nop /* 8D2504 80240FF4 C60C0038 */ lwc1 $f12, 0x38($s0) /* 8D2508 80240FF8 C60E0040 */ lwc1 $f14, 0x40($s0) /* 8D250C 80240FFC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_80240E58_8D2368 /* 8D2538 80241028 8E62001C */ lw $v0, 0x1c($s3) /* 8D253C 8024102C 46001005 */ abs.s $f0, $f2 /* 8D2540 80241030 44822000 */ mtc1 $v0, $f4 -/* 8D2544 80241034 00000000 */ nop +/* 8D2544 80241034 00000000 */ nop /* 8D2548 80241038 46802120 */ cvt.s.w $f4, $f4 /* 8D254C 8024103C 4600203C */ c.lt.s $f4, $f0 -/* 8D2550 80241040 00000000 */ nop +/* 8D2550 80241040 00000000 */ nop /* 8D2554 80241044 4500000D */ bc1f .L8024107C -/* 8D2558 80241048 00000000 */ nop +/* 8D2558 80241048 00000000 */ nop /* 8D255C 8024104C 44800000 */ mtc1 $zero, $f0 /* 8D2560 80241050 C614000C */ lwc1 $f20, 0xc($s0) /* 8D2564 80241054 4600103C */ c.lt.s $f2, $f0 -/* 8D2568 80241058 00000000 */ nop +/* 8D2568 80241058 00000000 */ nop /* 8D256C 8024105C 45000006 */ bc1f .L80241078 /* 8D2570 80241060 00021023 */ negu $v0, $v0 /* 8D2574 80241064 44820000 */ mtc1 $v0, $f0 -/* 8D2578 80241068 00000000 */ nop +/* 8D2578 80241068 00000000 */ nop /* 8D257C 8024106C 46800020 */ cvt.s.w $f0, $f0 /* 8D2580 80241070 0809041F */ j .L8024107C /* 8D2584 80241074 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_80240E58_8D2368 /* 8D25AC 8024109C C600001C */ lwc1 $f0, 0x1c($s0) /* 8D25B0 802410A0 46001080 */ add.s $f2, $f2, $f0 /* 8D25B4 802410A4 4616103C */ c.lt.s $f2, $f22 -/* 8D25B8 802410A8 00000000 */ nop +/* 8D25B8 802410A8 00000000 */ nop /* 8D25BC 802410AC 45020045 */ bc1fl .L802411C4 /* 8D25C0 802410B0 E602003C */ swc1 $f2, 0x3c($s0) /* 8D25C4 802410B4 08090470 */ j .L802411C0 @@ -169,7 +169,7 @@ glabel func_80240E58_8D2368 /* 8D25DC 802410CC C600001C */ lwc1 $f0, 0x1c($s0) /* 8D25E0 802410D0 C604003C */ lwc1 $f4, 0x3c($s0) /* 8D25E4 802410D4 44821000 */ mtc1 $v0, $f2 -/* 8D25E8 802410D8 00000000 */ nop +/* 8D25E8 802410D8 00000000 */ nop /* 8D25EC 802410DC 468010A0 */ cvt.s.w $f2, $f2 /* 8D25F0 802410E0 46000005 */ abs.s $f0, $f0 /* 8D25F4 802410E4 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_80240E58_8D2368 /* 8D2630 80241120 0C0372DF */ jal func_800DCB7C /* 8D2634 80241124 27A70020 */ addiu $a3, $sp, 0x20 /* 8D2638 80241128 10400015 */ beqz $v0, .L80241180 -/* 8D263C 8024112C 00000000 */ nop +/* 8D263C 8024112C 00000000 */ nop /* 8D2640 80241130 860200A8 */ lh $v0, 0xa8($s0) /* 8D2644 80241134 C604001C */ lwc1 $f4, 0x1c($s0) /* 8D2648 80241138 44820000 */ mtc1 $v0, $f0 -/* 8D264C 8024113C 00000000 */ nop +/* 8D264C 8024113C 00000000 */ nop /* 8D2650 80241140 46800020 */ cvt.s.w $f0, $f0 /* 8D2654 80241144 46002085 */ abs.s $f2, $f4 /* 8D2658 80241148 46020000 */ add.s $f0, $f0, $f2 /* 8D265C 8024114C C7A20024 */ lwc1 $f2, 0x24($sp) /* 8D2660 80241150 4600103E */ c.le.s $f2, $f0 -/* 8D2664 80241154 00000000 */ nop +/* 8D2664 80241154 00000000 */ nop /* 8D2668 80241158 45000005 */ bc1f .L80241170 -/* 8D266C 8024115C 00000000 */ nop +/* 8D266C 8024115C 00000000 */ nop /* 8D2670 80241160 C7A0001C */ lwc1 $f0, 0x1c($sp) /* 8D2674 80241164 AE00001C */ sw $zero, 0x1c($s0) /* 8D2678 80241168 08090471 */ j .L802411C4 @@ -217,13 +217,13 @@ glabel func_80240E58_8D2368 /* 8D2694 80241184 860200A8 */ lh $v0, 0xa8($s0) /* 8D2698 80241188 46163081 */ sub.s $f2, $f6, $f22 /* 8D269C 8024118C 44820000 */ mtc1 $v0, $f0 -/* 8D26A0 80241190 00000000 */ nop +/* 8D26A0 80241190 00000000 */ nop /* 8D26A4 80241194 46800020 */ cvt.s.w $f0, $f0 /* 8D26A8 80241198 46001080 */ add.s $f2, $f2, $f0 /* 8D26AC 8024119C C604001C */ lwc1 $f4, 0x1c($s0) /* 8D26B0 802411A0 46002005 */ abs.s $f0, $f4 /* 8D26B4 802411A4 4602003C */ c.lt.s $f0, $f2 -/* 8D26B8 802411A8 00000000 */ nop +/* 8D26B8 802411A8 00000000 */ nop /* 8D26BC 802411AC 45020005 */ bc1fl .L802411C4 /* 8D26C0 802411B0 AE00001C */ sw $zero, 0x1c($s0) /* 8D26C4 802411B4 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802411E8_8D26F8.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802411E8_8D26F8.s index 2360f184ae..a101b1d928 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802411E8_8D26F8.s +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802411E8_8D26F8.s @@ -49,15 +49,15 @@ glabel func_802411E8_8D26F8 /* 8D27A0 80241290 44802000 */ mtc1 $zero, $f4 /* 8D27A4 80241294 460010A1 */ cvt.d.s $f2, $f2 /* 8D27A8 80241298 46241082 */ mul.d $f2, $f2, $f4 -/* 8D27AC 8024129C 00000000 */ nop +/* 8D27AC 8024129C 00000000 */ nop /* 8D27B0 802412A0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* 8D27B4 802412A4 46000021 */ cvt.d.s $f0, $f0 /* 8D27B8 802412A8 46240002 */ mul.d $f0, $f0, $f4 -/* 8D27BC 802412AC 00000000 */ nop +/* 8D27BC 802412AC 00000000 */ nop /* 8D27C0 802412B0 3C013FE0 */ lui $at, 0x3fe0 /* 8D27C4 802412B4 44812800 */ mtc1 $at, $f5 /* 8D27C8 802412B8 44802000 */ mtc1 $zero, $f4 -/* 8D27CC 802412BC 00000000 */ nop +/* 8D27CC 802412BC 00000000 */ nop /* 8D27D0 802412C0 46241080 */ add.d $f2, $f2, $f4 /* 8D27D4 802412C4 AE000074 */ sw $zero, 0x74($s0) /* 8D27D8 802412C8 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s index ca8f296294..ab85361412 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s @@ -54,7 +54,7 @@ glabel func_8024130C_8D281C /* 8D28DC 802413CC 8E4300B0 */ lw $v1, 0xb0($s2) /* 8D28E0 802413D0 30620004 */ andi $v0, $v1, 4 /* 8D28E4 802413D4 10400007 */ beqz $v0, .L802413F4 -/* 8D28E8 802413D8 00000000 */ nop +/* 8D28E8 802413D8 00000000 */ nop /* 8D28EC 802413DC 824200B4 */ lb $v0, 0xb4($s2) /* 8D28F0 802413E0 1440003C */ bnez $v0, .L802414D4 /* 8D28F4 802413E4 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_8024130C_8D281C /* 8D2908 802413F8 2C62000F */ sltiu $v0, $v1, 0xf /* 8D290C 802413FC 10400034 */ beqz $v0, .L802414D0 /* 8D2910 80241400 00031080 */ sll $v0, $v1, 2 -/* 8D2914 80241404 3C018024 */ lui $at, %hi(D_80242868) +/* 8D2914 80241404 3C018024 */ lui $at, %hi(jtbl_80242868_8D3D78) /* 8D2918 80241408 00220821 */ addu $at, $at, $v0 -/* 8D291C 8024140C 8C222868 */ lw $v0, %lo(D_80242868)($at) +/* 8D291C 8024140C 8C222868 */ lw $v0, %lo(jtbl_80242868_8D3D78)($at) /* 8D2920 80241410 00400008 */ jr $v0 -/* 8D2924 80241414 00000000 */ nop +/* 8D2924 80241414 00000000 */ nop +glabel L80241418_8D2928 /* 8D2928 80241418 0280202D */ daddu $a0, $s4, $zero /* 8D292C 8024141C 0200282D */ daddu $a1, $s0, $zero /* 8D2930 80241420 0C090000 */ jal func_80240000_8D1510 /* 8D2934 80241424 0260302D */ daddu $a2, $s3, $zero +glabel L80241428_8D2938 /* 8D2938 80241428 0280202D */ daddu $a0, $s4, $zero /* 8D293C 8024142C 0200282D */ daddu $a1, $s0, $zero /* 8D2940 80241430 0C09006C */ jal func_802401B0_8D16C0 /* 8D2944 80241434 0260302D */ daddu $a2, $s3, $zero /* 8D2948 80241438 08090535 */ j .L802414D4 /* 8D294C 8024143C 0000102D */ daddu $v0, $zero, $zero +glabel L80241440_8D2950 /* 8D2950 80241440 0280202D */ daddu $a0, $s4, $zero /* 8D2954 80241444 0200282D */ daddu $a1, $s0, $zero /* 8D2958 80241448 0C0901F6 */ jal kmr_06_UnkNpcAIFunc1 /* 8D295C 8024144C 0260302D */ daddu $a2, $s3, $zero +glabel L80241450_8D2960 /* 8D2960 80241450 0280202D */ daddu $a0, $s4, $zero /* 8D2964 80241454 0200282D */ daddu $a1, $s0, $zero /* 8D2968 80241458 0C090226 */ jal func_80240898_8D1DA8 /* 8D296C 8024145C 0260302D */ daddu $a2, $s3, $zero /* 8D2970 80241460 08090535 */ j .L802414D4 /* 8D2974 80241464 0000102D */ daddu $v0, $zero, $zero +glabel L80241468_8D2978 /* 8D2978 80241468 0280202D */ daddu $a0, $s4, $zero /* 8D297C 8024146C 0200282D */ daddu $a1, $s0, $zero /* 8D2980 80241470 0C0902F7 */ jal kmr_06_UnkNpcAIFunc2 /* 8D2984 80241474 0260302D */ daddu $a2, $s3, $zero +glabel L80241478_8D2988 /* 8D2988 80241478 0280202D */ daddu $a0, $s4, $zero /* 8D298C 8024147C 0200282D */ daddu $a1, $s0, $zero /* 8D2990 80241480 0C090315 */ jal func_80240C54_8D2164 /* 8D2994 80241484 0260302D */ daddu $a2, $s3, $zero /* 8D2998 80241488 08090535 */ j .L802414D4 /* 8D299C 8024148C 0000102D */ daddu $v0, $zero, $zero +glabel L80241490_8D29A0 /* 8D29A0 80241490 0280202D */ daddu $a0, $s4, $zero /* 8D29A4 80241494 0200282D */ daddu $a1, $s0, $zero /* 8D29A8 80241498 0C090330 */ jal func_80240CC0_8D21D0 /* 8D29AC 8024149C 0260302D */ daddu $a2, $s3, $zero /* 8D29B0 802414A0 08090535 */ j .L802414D4 /* 8D29B4 802414A4 0000102D */ daddu $v0, $zero, $zero +glabel L802414A8_8D29B8 /* 8D29B8 802414A8 0280202D */ daddu $a0, $s4, $zero /* 8D29BC 802414AC 0200282D */ daddu $a1, $s0, $zero /* 8D29C0 802414B0 0C09037D */ jal kmr_06_UnkNpcAIFunc3 /* 8D29C4 802414B4 0260302D */ daddu $a2, $s3, $zero /* 8D29C8 802414B8 08090535 */ j .L802414D4 /* 8D29CC 802414BC 0000102D */ daddu $v0, $zero, $zero +glabel L802414C0_8D29D0 /* 8D29D0 802414C0 0280202D */ daddu $a0, $s4, $zero /* 8D29D4 802414C4 0200282D */ daddu $a1, $s0, $zero /* 8D29D8 802414C8 0C090396 */ jal func_80240E58_8D2368 /* 8D29DC 802414CC 0260302D */ daddu $a2, $s3, $zero .L802414D0: +glabel L802414D0_8D29E0 /* 8D29E0 802414D0 0000102D */ daddu $v0, $zero, $zero .L802414D4: /* 8D29E4 802414D4 8FBF0048 */ lw $ra, 0x48($sp) @@ -129,5 +139,5 @@ glabel func_8024130C_8D281C /* 8D29FC 802414EC 8FB00030 */ lw $s0, 0x30($sp) /* 8D2A00 802414F0 03E00008 */ jr $ra /* 8D2A04 802414F4 27BD0050 */ addiu $sp, $sp, 0x50 -/* 8D2A08 802414F8 00000000 */ nop -/* 8D2A0C 802414FC 00000000 */ nop +/* 8D2A08 802414F8 00000000 */ nop +/* 8D2A0C 802414FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241A68_8D2F78.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241A68_8D2F78.s index 6e36e850ce..5ce49a712d 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241A68_8D2F78.s +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241A68_8D2F78.s @@ -22,7 +22,7 @@ glabel func_80241A68_8D2F78 .L80241AAC: /* 8D2FBC 80241AAC 8E620070 */ lw $v0, 0x70($s3) /* 8D2FC0 80241AB0 14400042 */ bnez $v0, .L80241BBC -/* 8D2FC4 80241AB4 00000000 */ nop +/* 8D2FC4 80241AB4 00000000 */ nop /* 8D2FC8 80241AB8 8E450000 */ lw $a1, ($s2) /* 8D2FCC 80241ABC 26520004 */ addiu $s2, $s2, 4 /* 8D2FD0 80241AC0 0C0B210B */ jal get_float_variable @@ -70,7 +70,7 @@ glabel func_80241A68_8D2F78 /* 8D3078 80241B68 E6280044 */ swc1 $f8, 0x44($s1) .L80241B6C: /* 8D307C 80241B6C 44820000 */ mtc1 $v0, $f0 -/* 8D3080 80241B70 00000000 */ nop +/* 8D3080 80241B70 00000000 */ nop /* 8D3084 80241B74 46800020 */ cvt.s.w $f0, $f0 /* 8D3088 80241B78 4600A003 */ div.s $f0, $f20, $f0 /* 8D308C 80241B7C E6200038 */ swc1 $f0, 0x38($s1) @@ -79,12 +79,12 @@ glabel func_80241A68_8D2F78 /* 8D3094 80241B84 C6220044 */ lwc1 $f2, 0x44($s1) /* 8D3098 80241B88 468010A0 */ cvt.s.w $f2, $f2 /* 8D309C 80241B8C 46020002 */ mul.s $f0, $f0, $f2 -/* 8D30A0 80241B90 00000000 */ nop +/* 8D30A0 80241B90 00000000 */ nop /* 8D30A4 80241B94 3C013F00 */ lui $at, 0x3f00 /* 8D30A8 80241B98 44812000 */ mtc1 $at, $f4 -/* 8D30AC 80241B9C 00000000 */ nop +/* 8D30AC 80241B9C 00000000 */ nop /* 8D30B0 80241BA0 46040002 */ mul.s $f0, $f0, $f4 -/* 8D30B4 80241BA4 00000000 */ nop +/* 8D30B4 80241BA4 00000000 */ nop /* 8D30B8 80241BA8 4602B083 */ div.s $f2, $f22, $f2 /* 8D30BC 80241BAC 46020000 */ add.s $f0, $f0, $f2 /* 8D30C0 80241BB0 24020001 */ addiu $v0, $zero, 1 @@ -95,7 +95,7 @@ glabel func_80241A68_8D2F78 /* 8D30D0 80241BC0 C62C0034 */ lwc1 $f12, 0x34($s1) /* 8D30D4 80241BC4 C6220038 */ lwc1 $f2, 0x38($s1) /* 8D30D8 80241BC8 46001082 */ mul.s $f2, $f2, $f0 -/* 8D30DC 80241BCC 00000000 */ nop +/* 8D30DC 80241BCC 00000000 */ nop /* 8D30E0 80241BD0 C6200008 */ lwc1 $f0, 8($s1) /* 8D30E4 80241BD4 46020000 */ add.s $f0, $f0, $f2 /* 8D30E8 80241BD8 C62C0034 */ lwc1 $f12, 0x34($s1) @@ -103,7 +103,7 @@ glabel func_80241A68_8D2F78 /* 8D30F0 80241BE0 E6200008 */ swc1 $f0, 8($s1) /* 8D30F4 80241BE4 C6260038 */ lwc1 $f6, 0x38($s1) /* 8D30F8 80241BE8 46003182 */ mul.s $f6, $f6, $f0 -/* 8D30FC 80241BEC 00000000 */ nop +/* 8D30FC 80241BEC 00000000 */ nop /* 8D3100 80241BF0 C620003C */ lwc1 $f0, 0x3c($s1) /* 8D3104 80241BF4 C624000C */ lwc1 $f4, 0xc($s1) /* 8D3108 80241BF8 46000086 */ mov.s $f2, $f0 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240000_8D3DC0.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240000_8D3DC0.s index da9906030f..075e10aafb 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240000_8D3DC0.s +++ b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240000_8D3DC0.s @@ -22,7 +22,7 @@ glabel func_80240000_8D3DC0 /* 8D3E04 80240044 3C030010 */ lui $v1, 0x10 /* 8D3E08 80240048 00431024 */ and $v0, $v0, $v1 /* 8D3E0C 8024004C 10400004 */ beqz $v0, .L80240060 -/* 8D3E10 80240050 00000000 */ nop +/* 8D3E10 80240050 00000000 */ nop /* 8D3E14 80240054 C620006C */ lwc1 $f0, 0x6c($s1) /* 8D3E18 80240058 46800020 */ cvt.s.w $f0, $f0 /* 8D3E1C 8024005C E480000C */ swc1 $f0, 0xc($a0) @@ -30,7 +30,7 @@ glabel func_80240000_8D3DC0 /* 8D3E20 80240060 8E2200D0 */ lw $v0, 0xd0($s1) /* 8D3E24 80240064 8C420014 */ lw $v0, 0x14($v0) /* 8D3E28 80240068 1C400004 */ bgtz $v0, .L8024007C -/* 8D3E2C 8024006C 00000000 */ nop +/* 8D3E2C 8024006C 00000000 */ nop /* 8D3E30 80240070 C640000C */ lwc1 $f0, 0xc($s2) /* 8D3E34 80240074 08090027 */ j .L8024009C /* 8D3E38 80240078 E4800018 */ swc1 $f0, 0x18($a0) @@ -38,7 +38,7 @@ glabel func_80240000_8D3DC0 /* 8D3E3C 8024007C 3C018024 */ lui $at, %hi(func_80241E90_8B1F00) /* 8D3E40 80240080 D4221E90 */ ldc1 $f2, %lo(func_80241E90_8B1F00)($at) /* 8D3E44 80240084 44820000 */ mtc1 $v0, $f0 -/* 8D3E48 80240088 00000000 */ nop +/* 8D3E48 80240088 00000000 */ nop /* 8D3E4C 8024008C 46800021 */ cvt.d.w $f0, $f0 /* 8D3E50 80240090 46220003 */ div.d $f0, $f0, $f2 /* 8D3E54 80240094 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802400B4_8D3E74.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802400B4_8D3E74.s index 351a49b383..a74c57cb3a 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802400B4_8D3E74.s +++ b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802400B4_8D3E74.s @@ -38,7 +38,7 @@ glabel func_802400B4_8D3E74 /* 8D3EF8 80240138 2402000F */ addiu $v0, $zero, 0xf /* 8D3EFC 8024013C AFA2001C */ sw $v0, 0x1c($sp) /* 8D3F00 80240140 44833000 */ mtc1 $v1, $f6 -/* 8D3F04 80240144 00000000 */ nop +/* 8D3F04 80240144 00000000 */ nop /* 8D3F08 80240148 468031A0 */ cvt.s.w $f6, $f6 /* 8D3F0C 8024014C 44073000 */ mfc1 $a3, $f6 /* 8D3F10 80240150 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802402AC_8D406C.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802402AC_8D406C.s index 3bd1c44a39..e84d02576e 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802402AC_8D406C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802402AC_8D406C.s @@ -47,20 +47,20 @@ glabel func_802402AC_8D406C /* 8D4114 80240354 8E020010 */ lw $v0, 0x10($s0) /* 8D4118 80240358 46001005 */ abs.s $f0, $f2 /* 8D411C 8024035C 44822000 */ mtc1 $v0, $f4 -/* 8D4120 80240360 00000000 */ nop +/* 8D4120 80240360 00000000 */ nop /* 8D4124 80240364 46802120 */ cvt.s.w $f4, $f4 /* 8D4128 80240368 4600203C */ c.lt.s $f4, $f0 -/* 8D412C 8024036C 00000000 */ nop +/* 8D412C 8024036C 00000000 */ nop /* 8D4130 80240370 4500000D */ bc1f .L802403A8 -/* 8D4134 80240374 00000000 */ nop +/* 8D4134 80240374 00000000 */ nop /* 8D4138 80240378 44800000 */ mtc1 $zero, $f0 /* 8D413C 8024037C C654000C */ lwc1 $f20, 0xc($s2) /* 8D4140 80240380 4600103C */ c.lt.s $f2, $f0 -/* 8D4144 80240384 00000000 */ nop +/* 8D4144 80240384 00000000 */ nop /* 8D4148 80240388 45000006 */ bc1f .L802403A4 /* 8D414C 8024038C 00021023 */ negu $v0, $v0 /* 8D4150 80240390 44820000 */ mtc1 $v0, $f0 -/* 8D4154 80240394 00000000 */ nop +/* 8D4154 80240394 00000000 */ nop /* 8D4158 80240398 46800020 */ cvt.s.w $f0, $f0 /* 8D415C 8024039C 080900EA */ j .L802403A8 /* 8D4160 802403A0 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240540_8D4300.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240540_8D4300.s index 0bd0e2b7e5..57e9dd7654 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240540_8D4300.s +++ b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240540_8D4300.s @@ -19,20 +19,20 @@ glabel func_80240540_8D4300 /* 8D4338 80240578 8E0200D0 */ lw $v0, 0xd0($s0) /* 8D433C 8024057C 8C420014 */ lw $v0, 0x14($v0) /* 8D4340 80240580 04410009 */ bgez $v0, .L802405A8 -/* 8D4344 80240584 00000000 */ nop +/* 8D4344 80240584 00000000 */ nop /* 8D4348 80240588 C640000C */ lwc1 $f0, 0xc($s2) /* 8D434C 8024058C 3C018024 */ lui $at, %hi(D_80241E98) /* 8D4350 80240590 D4221E98 */ ldc1 $f2, %lo(D_80241E98)($at) /* 8D4354 80240594 46000021 */ cvt.d.s $f0, $f0 /* 8D4358 80240598 46220002 */ mul.d $f0, $f0, $f2 -/* 8D435C 8024059C 00000000 */ nop +/* 8D435C 8024059C 00000000 */ nop /* 8D4360 802405A0 08090171 */ j .L802405C4 /* 8D4364 802405A4 46200020 */ cvt.s.d $f0, $f0 .L802405A8: /* 8D4368 802405A8 3C018024 */ lui $at, %hi(D_80241EA0) /* 8D436C 802405AC D4221EA0 */ ldc1 $f2, %lo(D_80241EA0)($at) /* 8D4370 802405B0 44820000 */ mtc1 $v0, $f0 -/* 8D4374 802405B4 00000000 */ nop +/* 8D4374 802405B4 00000000 */ nop /* 8D4378 802405B8 46800021 */ cvt.d.w $f0, $f0 /* 8D437C 802405BC 46220003 */ div.d $f0, $f0, $f2 /* 8D4380 802405C0 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802405EC_8D43AC.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802405EC_8D43AC.s index 7a05f2a431..34479d1ed1 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802405EC_8D43AC.s +++ b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802405EC_8D43AC.s @@ -42,7 +42,7 @@ glabel func_802405EC_8D43AC /* 8D4440 80240680 2402000F */ addiu $v0, $zero, 0xf /* 8D4444 80240684 AFA2001C */ sw $v0, 0x1c($sp) /* 8D4448 80240688 44833000 */ mtc1 $v1, $f6 -/* 8D444C 8024068C 00000000 */ nop +/* 8D444C 8024068C 00000000 */ nop /* 8D4450 80240690 468031A0 */ cvt.s.w $f6, $f6 /* 8D4454 80240694 44073000 */ mfc1 $a3, $f6 /* 8D4458 80240698 27A20028 */ addiu $v0, $sp, 0x28 @@ -90,12 +90,12 @@ glabel func_802405EC_8D43AC /* 8D44F0 80240730 468031A0 */ cvt.s.w $f6, $f6 /* 8D44F4 80240734 44073000 */ mfc1 $a3, $f6 /* 8D44F8 80240738 0C00A7B5 */ jal dist2D -/* 8D44FC 8024073C 00000000 */ nop +/* 8D44FC 8024073C 00000000 */ nop /* 8D4500 80240740 C6020018 */ lwc1 $f2, 0x18($s0) /* 8D4504 80240744 4602003C */ c.lt.s $f0, $f2 -/* 8D4508 80240748 00000000 */ nop +/* 8D4508 80240748 00000000 */ nop /* 8D450C 8024074C 4500000E */ bc1f .L80240788 -/* 8D4510 80240750 00000000 */ nop +/* 8D4510 80240750 00000000 */ nop /* 8D4514 80240754 8E2200D0 */ lw $v0, 0xd0($s1) /* 8D4518 80240758 C4400000 */ lwc1 $f0, ($v0) /* 8D451C 8024075C 46800020 */ cvt.s.w $f0, $f0 @@ -112,7 +112,7 @@ glabel func_802405EC_8D43AC .L80240788: /* 8D4548 80240788 8602008C */ lh $v0, 0x8c($s0) /* 8D454C 8024078C 14400011 */ bnez $v0, .L802407D4 -/* 8D4550 80240790 00000000 */ nop +/* 8D4550 80240790 00000000 */ nop /* 8D4554 80240794 C60C0038 */ lwc1 $f12, 0x38($s0) /* 8D4558 80240798 8E2200D0 */ lw $v0, 0xd0($s1) /* 8D455C 8024079C C60E0040 */ lwc1 $f14, 0x40($s0) @@ -123,7 +123,7 @@ glabel func_802405EC_8D43AC /* 8D4570 802407B0 468031A0 */ cvt.s.w $f6, $f6 /* 8D4574 802407B4 44073000 */ mfc1 $a3, $f6 /* 8D4578 802407B8 0C00A720 */ jal atan2 -/* 8D457C 802407BC 00000000 */ nop +/* 8D457C 802407BC 00000000 */ nop /* 8D4580 802407C0 8E050018 */ lw $a1, 0x18($s0) /* 8D4584 802407C4 44060000 */ mfc1 $a2, $f0 /* 8D4588 802407C8 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s index 64f843f0f0..059d39c38d 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s +++ b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s @@ -46,7 +46,7 @@ glabel func_802407F4_8D45B4 /* 8D4658 80240898 8E4200B0 */ lw $v0, 0xb0($s2) /* 8D465C 8024089C 30420004 */ andi $v0, $v0, 4 /* 8D4660 802408A0 1040002F */ beqz $v0, .L80240960 -/* 8D4664 802408A4 00000000 */ nop +/* 8D4664 802408A4 00000000 */ nop .L802408A8: /* 8D4668 802408A8 AE800070 */ sw $zero, 0x70($s4) /* 8D466C 802408AC C600000C */ lwc1 $f0, 0xc($s0) @@ -102,60 +102,71 @@ glabel func_802407F4_8D45B4 /* 8D4724 80240964 2C620064 */ sltiu $v0, $v1, 0x64 /* 8D4728 80240968 10400036 */ beqz $v0, .L80240A44 /* 8D472C 8024096C 00031080 */ sll $v0, $v1, 2 -/* 8D4730 80240970 3C018024 */ lui $at, %hi(D_80241EA8) +/* 8D4730 80240970 3C018024 */ lui $at, %hi(jtbl_80241EA8_8D5C68) /* 8D4734 80240974 00220821 */ addu $at, $at, $v0 -/* 8D4738 80240978 8C221EA8 */ lw $v0, %lo(D_80241EA8)($at) +/* 8D4738 80240978 8C221EA8 */ lw $v0, %lo(jtbl_80241EA8_8D5C68)($at) /* 8D473C 8024097C 00400008 */ jr $v0 -/* 8D4740 80240980 00000000 */ nop +/* 8D4740 80240980 00000000 */ nop +glabel L80240984_8D4744 /* 8D4744 80240984 0280202D */ daddu $a0, $s4, $zero /* 8D4748 80240988 0260282D */ daddu $a1, $s3, $zero /* 8D474C 8024098C 0C090000 */ jal func_80240000_8D3DC0 /* 8D4750 80240990 02A0302D */ daddu $a2, $s5, $zero +glabel L80240994_8D4754 /* 8D4754 80240994 0280202D */ daddu $a0, $s4, $zero /* 8D4758 80240998 0260282D */ daddu $a1, $s3, $zero /* 8D475C 8024099C 0C09002D */ jal func_802400B4_8D3E74 /* 8D4760 802409A0 02A0302D */ daddu $a2, $s5, $zero /* 8D4764 802409A4 08090291 */ j .L80240A44 -/* 8D4768 802409A8 00000000 */ nop +/* 8D4768 802409A8 00000000 */ nop +glabel L802409AC_8D476C /* 8D476C 802409AC 0280202D */ daddu $a0, $s4, $zero /* 8D4770 802409B0 0260282D */ daddu $a1, $s3, $zero /* 8D4774 802409B4 0C090075 */ jal kmr_07_NpcJumpFunc3 /* 8D4778 802409B8 02A0302D */ daddu $a2, $s5, $zero +glabel L802409BC_8D477C /* 8D477C 802409BC 0280202D */ daddu $a0, $s4, $zero /* 8D4780 802409C0 0260282D */ daddu $a1, $s3, $zero /* 8D4784 802409C4 0C09008D */ jal kmr_07_NpcJumpFunc /* 8D4788 802409C8 02A0302D */ daddu $a2, $s5, $zero /* 8D478C 802409CC 08090291 */ j .L80240A44 -/* 8D4790 802409D0 00000000 */ nop +/* 8D4790 802409D0 00000000 */ nop +glabel L802409D4_8D4794 /* 8D4794 802409D4 0280202D */ daddu $a0, $s4, $zero /* 8D4798 802409D8 0260282D */ daddu $a1, $s3, $zero /* 8D479C 802409DC 0C0900AB */ jal func_802402AC_8D406C /* 8D47A0 802409E0 02A0302D */ daddu $a2, $s5, $zero +glabel L802409E4_8D47A4 /* 8D47A4 802409E4 0280202D */ daddu $a0, $s4, $zero /* 8D47A8 802409E8 0260282D */ daddu $a1, $s3, $zero /* 8D47AC 802409EC 0C0900F7 */ jal kmr_07_UnkNpcAIFunc11 /* 8D47B0 802409F0 02A0302D */ daddu $a2, $s5, $zero /* 8D47B4 802409F4 08090291 */ j .L80240A44 -/* 8D47B8 802409F8 00000000 */ nop +/* 8D47B8 802409F8 00000000 */ nop +glabel L802409FC_8D47BC /* 8D47BC 802409FC 0280202D */ daddu $a0, $s4, $zero /* 8D47C0 80240A00 0260282D */ daddu $a1, $s3, $zero /* 8D47C4 80240A04 0C09013E */ jal kmr_07_UnkNpcAIFunc10 /* 8D47C8 80240A08 02A0302D */ daddu $a2, $s5, $zero /* 8D47CC 80240A0C 08090291 */ j .L80240A44 -/* 8D47D0 80240A10 00000000 */ nop +/* 8D47D0 80240A10 00000000 */ nop +glabel L80240A14_8D47D4 /* 8D47D4 80240A14 0280202D */ daddu $a0, $s4, $zero /* 8D47D8 80240A18 0260282D */ daddu $a1, $s3, $zero /* 8D47DC 80240A1C 0C090150 */ jal func_80240540_8D4300 /* 8D47E0 80240A20 02A0302D */ daddu $a2, $s5, $zero +glabel L80240A24_8D47E4 /* 8D47E4 80240A24 0280202D */ daddu $a0, $s4, $zero /* 8D47E8 80240A28 0260282D */ daddu $a1, $s3, $zero /* 8D47EC 80240A2C 0C09017B */ jal func_802405EC_8D43AC /* 8D47F0 80240A30 02A0302D */ daddu $a2, $s5, $zero /* 8D47F4 80240A34 08090291 */ j .L80240A44 -/* 8D47F8 80240A38 00000000 */ nop +/* 8D47F8 80240A38 00000000 */ nop +glabel L80240A3C_8D47FC /* 8D47FC 80240A3C 0C0129CF */ jal func_8004A73C /* 8D4800 80240A40 0280202D */ daddu $a0, $s4, $zero .L80240A44: +glabel L80240A44_8D4804 /* 8D4804 80240A44 8FBF0048 */ lw $ra, 0x48($sp) /* 8D4808 80240A48 8FB50044 */ lw $s5, 0x44($sp) /* 8D480C 80240A4C 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240000_8D5E00.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240000_8D5E00.s index cdcf0af5f3..0535492bd8 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240000_8D5E00.s +++ b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240000_8D5E00.s @@ -47,7 +47,7 @@ glabel func_80240000_8D5E00 /* 8D5EA8 802400A8 0C0123F5 */ jal is_point_within_region /* 8D5EAC 802400AC 8E070038 */ lw $a3, 0x38($s0) /* 8D5EB0 802400B0 1040000E */ beqz $v0, .L802400EC -/* 8D5EB4 802400B4 00000000 */ nop +/* 8D5EB4 802400B4 00000000 */ nop /* 8D5EB8 802400B8 8E2200D0 */ lw $v0, 0xd0($s1) /* 8D5EBC 802400BC C60C0038 */ lwc1 $f12, 0x38($s0) /* 8D5EC0 802400C0 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240000_8D5E00 /* 8D5ED4 802400D4 468031A0 */ cvt.s.w $f6, $f6 /* 8D5ED8 802400D8 44073000 */ mfc1 $a3, $f6 /* 8D5EDC 802400DC 0C00A720 */ jal atan2 -/* 8D5EE0 802400E0 00000000 */ nop +/* 8D5EE0 802400E0 00000000 */ nop /* 8D5EE4 802400E4 08090047 */ j .L8024011C /* 8D5EE8 802400E8 E600000C */ swc1 $f0, 0xc($s0) .L802400EC: @@ -66,7 +66,7 @@ glabel func_80240000_8D5E00 /* 8D5EF0 802400F0 2404003C */ addiu $a0, $zero, 0x3c /* 8D5EF4 802400F4 C60C000C */ lwc1 $f12, 0xc($s0) /* 8D5EF8 802400F8 44820000 */ mtc1 $v0, $f0 -/* 8D5EFC 802400FC 00000000 */ nop +/* 8D5EFC 802400FC 00000000 */ nop /* 8D5F00 80240100 46800020 */ cvt.s.w $f0, $f0 /* 8D5F04 80240104 46006300 */ add.s $f12, $f12, $f0 /* 8D5F08 80240108 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240000_8D5E00 /* 8D5F2C 8024012C 8E2200D0 */ lw $v0, 0xd0($s1) /* 8D5F30 80240130 8C420014 */ lw $v0, 0x14($v0) /* 8D5F34 80240134 04410004 */ bgez $v0, .L80240148 -/* 8D5F38 80240138 00000000 */ nop +/* 8D5F38 80240138 00000000 */ nop /* 8D5F3C 8024013C C6400000 */ lwc1 $f0, ($s2) /* 8D5F40 80240140 0809005A */ j .L80240168 /* 8D5F44 80240144 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240000_8D5E00 /* 8D5F48 80240148 3C018024 */ lui $at, %hi(D_80242670) /* 8D5F4C 8024014C D4222670 */ ldc1 $f2, %lo(D_80242670)($at) /* 8D5F50 80240150 44820000 */ mtc1 $v0, $f0 -/* 8D5F54 80240154 00000000 */ nop +/* 8D5F54 80240154 00000000 */ nop /* 8D5F58 80240158 46800021 */ cvt.d.w $f0, $f0 /* 8D5F5C 8024015C 46220003 */ div.d $f0, $f0, $f2 /* 8D5F60 80240160 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240000_8D5E00 /* 8D5F74 80240174 44801000 */ mtc1 $zero, $f2 /* 8D5F78 80240178 46000021 */ cvt.d.s $f0, $f0 /* 8D5F7C 8024017C 46220002 */ mul.d $f0, $f0, $f2 -/* 8D5F80 80240180 00000000 */ nop +/* 8D5F80 80240180 00000000 */ nop /* 8D5F84 80240184 24020001 */ addiu $v0, $zero, 1 /* 8D5F88 80240188 4620018D */ trunc.w.d $f6, $f0 /* 8D5F8C 8024018C E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802401B0_8D5FB0.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802401B0_8D5FB0.s index 8e09ebbc96..dcb8a10c36 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802401B0_8D5FB0.s +++ b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802401B0_8D5FB0.s @@ -34,7 +34,7 @@ glabel func_802401B0_8D5FB0 /* 8D6024 80240224 44803000 */ mtc1 $zero, $f6 /* 8D6028 80240228 46000021 */ cvt.d.s $f0, $f0 /* 8D602C 8024022C 46260002 */ mul.d $f0, $f0, $f6 -/* 8D6030 80240230 00000000 */ nop +/* 8D6030 80240230 00000000 */ nop /* 8D6034 80240234 24020001 */ addiu $v0, $zero, 1 /* 8D6038 80240238 8E24006C */ lw $a0, 0x6c($s1) /* 8D603C 8024023C 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_802401B0_8D5FB0 /* 8D6098 80240298 C600003C */ lwc1 $f0, 0x3c($s0) /* 8D609C 8024029C 4600C001 */ sub.s $f0, $f24, $f0 /* 8D60A0 802402A0 4600B03C */ c.lt.s $f22, $f0 -/* 8D60A4 802402A4 00000000 */ nop +/* 8D60A4 802402A4 00000000 */ nop /* 8D60A8 802402A8 4500001B */ bc1f .L80240318 /* 8D60AC 802402AC 34820010 */ ori $v0, $a0, 0x10 /* 8D60B0 802402B0 080900C6 */ j .L80240318 @@ -87,9 +87,9 @@ glabel func_802401B0_8D5FB0 /* 8D60F4 802402F4 C7A00034 */ lwc1 $f0, 0x34($sp) /* 8D60F8 802402F8 4600D001 */ sub.s $f0, $f26, $f0 /* 8D60FC 802402FC 4600B03C */ c.lt.s $f22, $f0 -/* 8D6100 80240300 00000000 */ nop +/* 8D6100 80240300 00000000 */ nop /* 8D6104 80240304 45000004 */ bc1f .L80240318 -/* 8D6108 80240308 00000000 */ nop +/* 8D6108 80240308 00000000 */ nop /* 8D610C 8024030C 8E22006C */ lw $v0, 0x6c($s1) /* 8D6110 80240310 34420010 */ ori $v0, $v0, 0x10 /* 8D6114 80240314 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_802401B0_8D5FB0 /* 8D611C 8024031C 24030011 */ addiu $v1, $zero, 0x11 /* 8D6120 80240320 30420011 */ andi $v0, $v0, 0x11 /* 8D6124 80240324 14430039 */ bne $v0, $v1, .L8024040C -/* 8D6128 80240328 00000000 */ nop +/* 8D6128 80240328 00000000 */ nop /* 8D612C 8024032C 8E020000 */ lw $v0, ($s0) /* 8D6130 80240330 30420008 */ andi $v0, $v0, 8 /* 8D6134 80240334 1040000A */ beqz $v0, .L80240360 @@ -108,7 +108,7 @@ glabel func_802401B0_8D5FB0 /* 8D6144 80240344 D4202678 */ ldc1 $f0, %lo(D_80242678)($at) /* 8D6148 80240348 460010A1 */ cvt.d.s $f2, $f2 /* 8D614C 8024034C 46201082 */ mul.d $f2, $f2, $f0 -/* 8D6150 80240350 00000000 */ nop +/* 8D6150 80240350 00000000 */ nop /* 8D6154 80240354 4600A021 */ cvt.d.s $f0, $f20 /* 8D6158 80240358 080900F1 */ j .L802403C4 /* 8D615C 8024035C 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_802401B0_8D5FB0 /* 8D61AC 802403AC D4202680 */ ldc1 $f0, %lo(func_80242680_802F00)($at) /* 8D61B0 802403B0 460010A1 */ cvt.d.s $f2, $f2 /* 8D61B4 802403B4 46201082 */ mul.d $f2, $f2, $f0 -/* 8D61B8 802403B8 00000000 */ nop +/* 8D61B8 802403B8 00000000 */ nop /* 8D61BC 802403BC 4600A021 */ cvt.d.s $f0, $f20 /* 8D61C0 802403C0 46220000 */ add.d $f0, $f0, $f2 .L802403C4: @@ -149,7 +149,7 @@ glabel func_802401B0_8D5FB0 /* 8D61E0 802403E0 46000005 */ abs.s $f0, $f0 /* 8D61E4 802403E4 46000021 */ cvt.d.s $f0, $f0 /* 8D61E8 802403E8 4622003C */ c.lt.d $f0, $f2 -/* 8D61EC 802403EC 00000000 */ nop +/* 8D61EC 802403EC 00000000 */ nop /* 8D61F0 802403F0 45000036 */ bc1f .L802404CC /* 8D61F4 802403F4 2403FFEF */ addiu $v1, $zero, -0x11 /* 8D61F8 802403F8 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_802401B0_8D5FB0 .L8024040C: /* 8D620C 8024040C 8E220070 */ lw $v0, 0x70($s1) /* 8D6210 80240410 1840002E */ blez $v0, .L802404CC -/* 8D6214 80240414 00000000 */ nop +/* 8D6214 80240414 00000000 */ nop /* 8D6218 80240418 C62C0074 */ lwc1 $f12, 0x74($s1) /* 8D621C 8024041C 0C00A8BB */ jal sin_deg /* 8D6220 80240420 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_802401B0_8D5FB0 /* 8D6278 80240478 27A70030 */ addiu $a3, $sp, 0x30 .L8024047C: /* 8D627C 8024047C 10400007 */ beqz $v0, .L8024049C -/* 8D6280 80240480 00000000 */ nop +/* 8D6280 80240480 00000000 */ nop /* 8D6284 80240484 4616A082 */ mul.s $f2, $f20, $f22 -/* 8D6288 80240488 00000000 */ nop +/* 8D6288 80240488 00000000 */ nop /* 8D628C 8024048C C7A0002C */ lwc1 $f0, 0x2c($sp) /* 8D6290 80240490 461A0000 */ add.s $f0, $f0, $f26 /* 8D6294 80240494 0809012A */ j .L802404A8 /* 8D6298 80240498 46020000 */ add.s $f0, $f0, $f2 .L8024049C: /* 8D629C 8024049C 4616A002 */ mul.s $f0, $f20, $f22 -/* 8D62A0 802404A0 00000000 */ nop +/* 8D62A0 802404A0 00000000 */ nop /* 8D62A4 802404A4 4600C000 */ add.s $f0, $f24, $f0 .L802404A8: /* 8D62A8 802404A8 E600003C */ swc1 $f0, 0x3c($s0) /* 8D62AC 802404AC 8E220074 */ lw $v0, 0x74($s1) /* 8D62B0 802404B0 2442000A */ addiu $v0, $v0, 0xa /* 8D62B4 802404B4 44826000 */ mtc1 $v0, $f12 -/* 8D62B8 802404B8 00000000 */ nop +/* 8D62B8 802404B8 00000000 */ nop /* 8D62BC 802404BC 0C00A6C9 */ jal clamp_angle /* 8D62C0 802404C0 46806320 */ cvt.s.w $f12, $f12 /* 8D62C4 802404C4 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_802401B0_8D5FB0 /* 8D62D4 802404D4 2442FFFF */ addiu $v0, $v0, -1 /* 8D62D8 802404D8 8E430014 */ lw $v1, 0x14($s2) /* 8D62DC 802404DC 04600048 */ bltz $v1, .L80240600 -/* 8D62E0 802404E0 00000000 */ nop +/* 8D62E0 802404E0 00000000 */ nop /* 8D62E4 802404E4 8E620074 */ lw $v0, 0x74($s3) /* 8D62E8 802404E8 1C400042 */ bgtz $v0, .L802405F4 /* 8D62EC 802404EC 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_802401B0_8D5FB0 /* 8D62F4 802404F4 860200A8 */ lh $v0, 0xa8($s0) /* 8D62F8 802404F8 C602003C */ lwc1 $f2, 0x3c($s0) /* 8D62FC 802404FC 44820000 */ mtc1 $v0, $f0 -/* 8D6300 80240500 00000000 */ nop +/* 8D6300 80240500 00000000 */ nop /* 8D6304 80240504 46800020 */ cvt.s.w $f0, $f0 /* 8D6308 80240508 46001080 */ add.s $f2, $f2, $f0 /* 8D630C 8024050C 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_802401B0_8D5FB0 /* 8D6328 80240528 C440002C */ lwc1 $f0, 0x2c($v0) /* 8D632C 8024052C 46000021 */ cvt.d.s $f0, $f0 /* 8D6330 80240530 4622003C */ c.lt.d $f0, $f2 -/* 8D6334 80240534 00000000 */ nop +/* 8D6334 80240534 00000000 */ nop /* 8D6338 80240538 4500002C */ bc1f .L802405EC /* 8D633C 8024053C 02A0202D */ daddu $a0, $s5, $zero /* 8D6340 80240540 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_802401B0_8D5FB0 /* 8D637C 8024057C 3C01C1A0 */ lui $at, 0xc1a0 /* 8D6380 80240580 44812000 */ mtc1 $at, $f4 /* 8D6384 80240584 44834000 */ mtc1 $v1, $f8 -/* 8D6388 80240588 00000000 */ nop +/* 8D6388 80240588 00000000 */ nop /* 8D638C 8024058C 46804220 */ cvt.s.w $f8, $f8 /* 8D6390 80240590 44074000 */ mfc1 $a3, $f8 /* 8D6394 80240594 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_802401B0_8D5FB0 /* 8D6448 80240648 0C0123F5 */ jal is_point_within_region /* 8D644C 8024064C 8E070038 */ lw $a3, 0x38($s0) /* 8D6450 80240650 1040001A */ beqz $v0, .L802406BC -/* 8D6454 80240654 00000000 */ nop +/* 8D6454 80240654 00000000 */ nop /* 8D6458 80240658 8E060038 */ lw $a2, 0x38($s0) /* 8D645C 8024065C 8E2200D0 */ lw $v0, 0xd0($s1) /* 8D6460 80240660 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_802401B0_8D5FB0 /* 8D6474 80240674 468073A0 */ cvt.s.w $f14, $f14 /* 8D6478 80240678 C6020018 */ lwc1 $f2, 0x18($s0) /* 8D647C 8024067C 4600103C */ c.lt.s $f2, $f0 -/* 8D6480 80240680 00000000 */ nop +/* 8D6480 80240680 00000000 */ nop /* 8D6484 80240684 4500000D */ bc1f .L802406BC /* 8D6488 80240688 E7A00034 */ swc1 $f0, 0x34($sp) /* 8D648C 8024068C C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_802401B0_8D5FB0 /* 8D64C8 802406C8 00621825 */ or $v1, $v1, $v0 /* 8D64CC 802406CC 00741825 */ or $v1, $v1, $s4 /* 8D64D0 802406D0 10600008 */ beqz $v1, .L802406F4 -/* 8D64D4 802406D4 00000000 */ nop +/* 8D64D4 802406D4 00000000 */ nop /* 8D64D8 802406D8 8602008C */ lh $v0, 0x8c($s0) /* 8D64DC 802406DC 14400031 */ bnez $v0, .L802407A4 -/* 8D64E0 802406E0 00000000 */ nop +/* 8D64E0 802406E0 00000000 */ nop /* 8D64E4 802406E4 8E050018 */ lw $a1, 0x18($s0) /* 8D64E8 802406E8 8E06000C */ lw $a2, 0xc($s0) /* 8D64EC 802406EC 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_802401B0_8D5FB0 /* 8D6500 80240700 44801000 */ mtc1 $zero, $f2 /* 8D6504 80240704 46000021 */ cvt.d.s $f0, $f0 /* 8D6508 80240708 46220002 */ mul.d $f0, $f0, $f2 -/* 8D650C 8024070C 00000000 */ nop +/* 8D650C 8024070C 00000000 */ nop /* 8D6510 80240710 4620020D */ trunc.w.d $f8, $f0 /* 8D6514 80240714 E628007C */ swc1 $f8, 0x7c($s1) /* 8D6518 80240718 8E420004 */ lw $v0, 4($s2) /* 8D651C 8024071C 18400021 */ blez $v0, .L802407A4 -/* 8D6520 80240720 00000000 */ nop +/* 8D6520 80240720 00000000 */ nop /* 8D6524 80240724 8602008E */ lh $v0, 0x8e($s0) /* 8D6528 80240728 9603008E */ lhu $v1, 0x8e($s0) /* 8D652C 8024072C 18400005 */ blez $v0, .L80240744 @@ -375,7 +375,7 @@ glabel func_802401B0_8D5FB0 /* 8D6534 80240734 A602008E */ sh $v0, 0x8e($s0) /* 8D6538 80240738 00021400 */ sll $v0, $v0, 0x10 /* 8D653C 8024073C 1C400019 */ bgtz $v0, .L802407A4 -/* 8D6540 80240740 00000000 */ nop +/* 8D6540 80240740 00000000 */ nop .L80240744: /* 8D6544 80240744 240403E8 */ addiu $a0, $zero, 0x3e8 /* 8D6548 80240748 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_802401B0_8D5FB0 /* 8D6590 80240790 18400003 */ blez $v0, .L802407A0 /* 8D6594 80240794 28620003 */ slti $v0, $v1, 3 /* 8D6598 80240798 10400002 */ beqz $v0, .L802407A4 -/* 8D659C 8024079C 00000000 */ nop +/* 8D659C 8024079C 00000000 */ nop .L802407A0: /* 8D65A0 802407A0 AE600070 */ sw $zero, 0x70($s3) .L802407A4: diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240898_8D6698.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240898_8D6698.s index c98f9fd9bb..0beed7aa03 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240898_8D6698.s +++ b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240898_8D6698.s @@ -42,11 +42,11 @@ glabel func_80240898_8D6698 .L8024092C: /* 8D672C 8024092C 8E220070 */ lw $v0, 0x70($s1) /* 8D6730 80240930 18400034 */ blez $v0, .L80240A04 -/* 8D6734 80240934 00000000 */ nop +/* 8D6734 80240934 00000000 */ nop /* 8D6738 80240938 C62C0074 */ lwc1 $f12, 0x74($s1) /* 8D673C 8024093C 46806320 */ cvt.s.w $f12, $f12 /* 8D6740 80240940 44820000 */ mtc1 $v0, $f0 -/* 8D6744 80240944 00000000 */ nop +/* 8D6744 80240944 00000000 */ nop /* 8D6748 80240948 46800020 */ cvt.s.w $f0, $f0 /* 8D674C 8024094C 46000021 */ cvt.d.s $f0, $f0 /* 8D6750 80240950 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_80240898_8D6698 /* 8D67B0 802409B0 27A70030 */ addiu $a3, $sp, 0x30 .L802409B4: /* 8D67B4 802409B4 10400007 */ beqz $v0, .L802409D4 -/* 8D67B8 802409B8 00000000 */ nop +/* 8D67B8 802409B8 00000000 */ nop /* 8D67BC 802409BC 4616A082 */ mul.s $f2, $f20, $f22 -/* 8D67C0 802409C0 00000000 */ nop +/* 8D67C0 802409C0 00000000 */ nop /* 8D67C4 802409C4 C7A0002C */ lwc1 $f0, 0x2c($sp) /* 8D67C8 802409C8 46180000 */ add.s $f0, $f0, $f24 /* 8D67CC 802409CC 08090278 */ j .L802409E0 /* 8D67D0 802409D0 46020000 */ add.s $f0, $f0, $f2 .L802409D4: /* 8D67D4 802409D4 4616A002 */ mul.s $f0, $f20, $f22 -/* 8D67D8 802409D8 00000000 */ nop +/* 8D67D8 802409D8 00000000 */ nop /* 8D67DC 802409DC 4600D000 */ add.s $f0, $f26, $f0 .L802409E0: /* 8D67E0 802409E0 E600003C */ swc1 $f0, 0x3c($s0) /* 8D67E4 802409E4 8E220074 */ lw $v0, 0x74($s1) /* 8D67E8 802409E8 2442000A */ addiu $v0, $v0, 0xa /* 8D67EC 802409EC 44826000 */ mtc1 $v0, $f12 -/* 8D67F0 802409F0 00000000 */ nop +/* 8D67F0 802409F0 00000000 */ nop /* 8D67F4 802409F4 0C00A6C9 */ jal clamp_angle /* 8D67F8 802409F8 46806320 */ cvt.s.w $f12, $f12 /* 8D67FC 802409FC 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_80240898_8D6698 /* 8D6810 80240A10 860200A8 */ lh $v0, 0xa8($s0) /* 8D6814 80240A14 C600003C */ lwc1 $f0, 0x3c($s0) /* 8D6818 80240A18 44821000 */ mtc1 $v0, $f2 -/* 8D681C 80240A1C 00000000 */ nop +/* 8D681C 80240A1C 00000000 */ nop /* 8D6820 80240A20 468010A0 */ cvt.s.w $f2, $f2 /* 8D6824 80240A24 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 8D6828 80240A28 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_80240898_8D6698 /* 8D6844 80240A44 46240000 */ add.d $f0, $f0, $f4 /* 8D6848 80240A48 460010A1 */ cvt.d.s $f2, $f2 /* 8D684C 80240A4C 4620103C */ c.lt.d $f2, $f0 -/* 8D6850 80240A50 00000000 */ nop +/* 8D6850 80240A50 00000000 */ nop /* 8D6854 80240A54 4500002E */ bc1f .L80240B10 /* 8D6858 80240A58 0280202D */ daddu $a0, $s4, $zero /* 8D685C 80240A5C 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_80240898_8D6698 /* 8D689C 80240A9C 3C01C1A0 */ lui $at, 0xc1a0 /* 8D68A0 80240AA0 44812000 */ mtc1 $at, $f4 /* 8D68A4 80240AA4 44834000 */ mtc1 $v1, $f8 -/* 8D68A8 80240AA8 00000000 */ nop +/* 8D68A8 80240AA8 00000000 */ nop /* 8D68AC 80240AAC 46804220 */ cvt.s.w $f8, $f8 /* 8D68B0 80240AB0 44074000 */ mfc1 $a3, $f8 /* 8D68B4 80240AB4 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_80240898_8D6698 .L80240B10: /* 8D6910 80240B10 8602008C */ lh $v0, 0x8c($s0) /* 8D6914 80240B14 14400025 */ bnez $v0, .L80240BAC -/* 8D6918 80240B18 00000000 */ nop +/* 8D6918 80240B18 00000000 */ nop /* 8D691C 80240B1C 8602008E */ lh $v0, 0x8e($s0) /* 8D6920 80240B20 1C400022 */ bgtz $v0, .L80240BAC -/* 8D6924 80240B24 00000000 */ nop +/* 8D6924 80240B24 00000000 */ nop /* 8D6928 80240B28 8E620074 */ lw $v0, 0x74($s3) /* 8D692C 80240B2C 2442FFFF */ addiu $v0, $v0, -1 /* 8D6930 80240B30 1840001D */ blez $v0, .L80240BA8 @@ -183,7 +183,7 @@ glabel func_80240898_8D6698 /* 8D693C 80240B3C 9442002A */ lhu $v0, 0x2a($v0) /* 8D6940 80240B40 30420010 */ andi $v0, $v0, 0x10 /* 8D6944 80240B44 14400007 */ bnez $v0, .L80240B64 -/* 8D6948 80240B48 00000000 */ nop +/* 8D6948 80240B48 00000000 */ nop /* 8D694C 80240B4C C600000C */ lwc1 $f0, 0xc($s0) /* 8D6950 80240B50 3C014334 */ lui $at, 0x4334 /* 8D6954 80240B54 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240CC0_8D6AC0.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240CC0_8D6AC0.s index 9bce370949..1ffbca833a 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240CC0_8D6AC0.s +++ b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240CC0_8D6AC0.s @@ -60,18 +60,18 @@ glabel func_80240CC0_8D6AC0 /* 8D6B98 80240D98 C6200038 */ lwc1 $f0, 0x38($s1) /* 8D6B9C 80240D9C 4600018D */ trunc.w.s $f6, $f0 /* 8D6BA0 80240DA0 44023000 */ mfc1 $v0, $f6 -/* 8D6BA4 80240DA4 00000000 */ nop +/* 8D6BA4 80240DA4 00000000 */ nop /* 8D6BA8 80240DA8 A6420010 */ sh $v0, 0x10($s2) /* 8D6BAC 80240DAC C620003C */ lwc1 $f0, 0x3c($s1) /* 8D6BB0 80240DB0 4600018D */ trunc.w.s $f6, $f0 /* 8D6BB4 80240DB4 44023000 */ mfc1 $v0, $f6 -/* 8D6BB8 80240DB8 00000000 */ nop +/* 8D6BB8 80240DB8 00000000 */ nop /* 8D6BBC 80240DBC A6420012 */ sh $v0, 0x12($s2) /* 8D6BC0 80240DC0 C6200040 */ lwc1 $f0, 0x40($s1) /* 8D6BC4 80240DC4 A2430007 */ sb $v1, 7($s2) /* 8D6BC8 80240DC8 4600018D */ trunc.w.s $f6, $f0 /* 8D6BCC 80240DCC 44023000 */ mfc1 $v0, $f6 -/* 8D6BD0 80240DD0 00000000 */ nop +/* 8D6BD0 80240DD0 00000000 */ nop /* 8D6BD4 80240DD4 A6420014 */ sh $v0, 0x14($s2) .L80240DD8: /* 8D6BD8 80240DD8 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240E58_8D6C58.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240E58_8D6C58.s index 76dfcc1c08..2012851360 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240E58_8D6C58.s +++ b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240E58_8D6C58.s @@ -42,9 +42,9 @@ glabel func_80240E58_8D6C58 /* 8D6CEC 80240EEC 44801800 */ mtc1 $zero, $f3 /* 8D6CF0 80240EF0 46002021 */ cvt.d.s $f0, $f4 /* 8D6CF4 80240EF4 4620103E */ c.le.d $f2, $f0 -/* 8D6CF8 80240EF8 00000000 */ nop +/* 8D6CF8 80240EF8 00000000 */ nop /* 8D6CFC 80240EFC 45000030 */ bc1f .L80240FC0 -/* 8D6D00 80240F00 00000000 */ nop +/* 8D6D00 80240F00 00000000 */ nop /* 8D6D04 80240F04 C600003C */ lwc1 $f0, 0x3c($s0) /* 8D6D08 80240F08 46040000 */ add.s $f0, $f0, $f4 /* 8D6D0C 80240F0C E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_80240E58_8D6C58 /* 8D6D6C 80240F6C 27A70020 */ addiu $a3, $sp, 0x20 .L80240F70: /* 8D6D70 80240F70 1040000B */ beqz $v0, .L80240FA0 -/* 8D6D74 80240F74 00000000 */ nop +/* 8D6D74 80240F74 00000000 */ nop /* 8D6D78 80240F78 C7A0001C */ lwc1 $f0, 0x1c($sp) /* 8D6D7C 80240F7C 46140080 */ add.s $f2, $f0, $f20 /* 8D6D80 80240F80 C600003C */ lwc1 $f0, 0x3c($s0) /* 8D6D84 80240F84 4600103E */ c.le.s $f2, $f0 -/* 8D6D88 80240F88 00000000 */ nop +/* 8D6D88 80240F88 00000000 */ nop /* 8D6D8C 80240F8C 4500008D */ bc1f .L802411C4 -/* 8D6D90 80240F90 00000000 */ nop +/* 8D6D90 80240F90 00000000 */ nop /* 8D6D94 80240F94 E602003C */ swc1 $f2, 0x3c($s0) /* 8D6D98 80240F98 08090471 */ j .L802411C4 /* 8D6D9C 80240F9C AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_80240E58_8D6C58 /* 8D6DA0 80240FA0 C602003C */ lwc1 $f2, 0x3c($s0) /* 8D6DA4 80240FA4 C6000064 */ lwc1 $f0, 0x64($s0) /* 8D6DA8 80240FA8 4602003E */ c.le.s $f0, $f2 -/* 8D6DAC 80240FAC 00000000 */ nop +/* 8D6DAC 80240FAC 00000000 */ nop /* 8D6DB0 80240FB0 45030084 */ bc1tl .L802411C4 /* 8D6DB4 80240FB4 AE400070 */ sw $zero, 0x70($s2) /* 8D6DB8 80240FB8 08090471 */ j .L802411C4 -/* 8D6DBC 80240FBC 00000000 */ nop +/* 8D6DBC 80240FBC 00000000 */ nop .L80240FC0: /* 8D6DC0 80240FC0 4622003C */ c.lt.d $f0, $f2 -/* 8D6DC4 80240FC4 00000000 */ nop +/* 8D6DC4 80240FC4 00000000 */ nop /* 8D6DC8 80240FC8 4500007E */ bc1f .L802411C4 -/* 8D6DCC 80240FCC 00000000 */ nop +/* 8D6DCC 80240FCC 00000000 */ nop /* 8D6DD0 80240FD0 9602008E */ lhu $v0, 0x8e($s0) /* 8D6DD4 80240FD4 24420001 */ addiu $v0, $v0, 1 /* 8D6DD8 80240FD8 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_80240E58_8D6C58 /* 8D6DE4 80240FE4 00021403 */ sra $v0, $v0, 0x10 /* 8D6DE8 80240FE8 0043102A */ slt $v0, $v0, $v1 /* 8D6DEC 80240FEC 14400026 */ bnez $v0, .L80241088 -/* 8D6DF0 80240FF0 00000000 */ nop +/* 8D6DF0 80240FF0 00000000 */ nop /* 8D6DF4 80240FF4 C60C0038 */ lwc1 $f12, 0x38($s0) /* 8D6DF8 80240FF8 C60E0040 */ lwc1 $f14, 0x40($s0) /* 8D6DFC 80240FFC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_80240E58_8D6C58 /* 8D6E28 80241028 8E62001C */ lw $v0, 0x1c($s3) /* 8D6E2C 8024102C 46001005 */ abs.s $f0, $f2 /* 8D6E30 80241030 44822000 */ mtc1 $v0, $f4 -/* 8D6E34 80241034 00000000 */ nop +/* 8D6E34 80241034 00000000 */ nop /* 8D6E38 80241038 46802120 */ cvt.s.w $f4, $f4 /* 8D6E3C 8024103C 4600203C */ c.lt.s $f4, $f0 -/* 8D6E40 80241040 00000000 */ nop +/* 8D6E40 80241040 00000000 */ nop /* 8D6E44 80241044 4500000D */ bc1f .L8024107C -/* 8D6E48 80241048 00000000 */ nop +/* 8D6E48 80241048 00000000 */ nop /* 8D6E4C 8024104C 44800000 */ mtc1 $zero, $f0 /* 8D6E50 80241050 C614000C */ lwc1 $f20, 0xc($s0) /* 8D6E54 80241054 4600103C */ c.lt.s $f2, $f0 -/* 8D6E58 80241058 00000000 */ nop +/* 8D6E58 80241058 00000000 */ nop /* 8D6E5C 8024105C 45000006 */ bc1f .L80241078 /* 8D6E60 80241060 00021023 */ negu $v0, $v0 /* 8D6E64 80241064 44820000 */ mtc1 $v0, $f0 -/* 8D6E68 80241068 00000000 */ nop +/* 8D6E68 80241068 00000000 */ nop /* 8D6E6C 8024106C 46800020 */ cvt.s.w $f0, $f0 /* 8D6E70 80241070 0809041F */ j .L8024107C /* 8D6E74 80241074 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_80240E58_8D6C58 /* 8D6E9C 8024109C C600001C */ lwc1 $f0, 0x1c($s0) /* 8D6EA0 802410A0 46001080 */ add.s $f2, $f2, $f0 /* 8D6EA4 802410A4 4616103C */ c.lt.s $f2, $f22 -/* 8D6EA8 802410A8 00000000 */ nop +/* 8D6EA8 802410A8 00000000 */ nop /* 8D6EAC 802410AC 45020045 */ bc1fl .L802411C4 /* 8D6EB0 802410B0 E602003C */ swc1 $f2, 0x3c($s0) /* 8D6EB4 802410B4 08090470 */ j .L802411C0 @@ -169,7 +169,7 @@ glabel func_80240E58_8D6C58 /* 8D6ECC 802410CC C600001C */ lwc1 $f0, 0x1c($s0) /* 8D6ED0 802410D0 C604003C */ lwc1 $f4, 0x3c($s0) /* 8D6ED4 802410D4 44821000 */ mtc1 $v0, $f2 -/* 8D6ED8 802410D8 00000000 */ nop +/* 8D6ED8 802410D8 00000000 */ nop /* 8D6EDC 802410DC 468010A0 */ cvt.s.w $f2, $f2 /* 8D6EE0 802410E0 46000005 */ abs.s $f0, $f0 /* 8D6EE4 802410E4 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_80240E58_8D6C58 /* 8D6F20 80241120 0C0372DF */ jal func_800DCB7C /* 8D6F24 80241124 27A70020 */ addiu $a3, $sp, 0x20 /* 8D6F28 80241128 10400015 */ beqz $v0, .L80241180 -/* 8D6F2C 8024112C 00000000 */ nop +/* 8D6F2C 8024112C 00000000 */ nop /* 8D6F30 80241130 860200A8 */ lh $v0, 0xa8($s0) /* 8D6F34 80241134 C604001C */ lwc1 $f4, 0x1c($s0) /* 8D6F38 80241138 44820000 */ mtc1 $v0, $f0 -/* 8D6F3C 8024113C 00000000 */ nop +/* 8D6F3C 8024113C 00000000 */ nop /* 8D6F40 80241140 46800020 */ cvt.s.w $f0, $f0 /* 8D6F44 80241144 46002085 */ abs.s $f2, $f4 /* 8D6F48 80241148 46020000 */ add.s $f0, $f0, $f2 /* 8D6F4C 8024114C C7A20024 */ lwc1 $f2, 0x24($sp) /* 8D6F50 80241150 4600103E */ c.le.s $f2, $f0 -/* 8D6F54 80241154 00000000 */ nop +/* 8D6F54 80241154 00000000 */ nop /* 8D6F58 80241158 45000005 */ bc1f .L80241170 -/* 8D6F5C 8024115C 00000000 */ nop +/* 8D6F5C 8024115C 00000000 */ nop /* 8D6F60 80241160 C7A0001C */ lwc1 $f0, 0x1c($sp) /* 8D6F64 80241164 AE00001C */ sw $zero, 0x1c($s0) /* 8D6F68 80241168 08090471 */ j .L802411C4 @@ -217,13 +217,13 @@ glabel func_80240E58_8D6C58 /* 8D6F84 80241184 860200A8 */ lh $v0, 0xa8($s0) /* 8D6F88 80241188 46163081 */ sub.s $f2, $f6, $f22 /* 8D6F8C 8024118C 44820000 */ mtc1 $v0, $f0 -/* 8D6F90 80241190 00000000 */ nop +/* 8D6F90 80241190 00000000 */ nop /* 8D6F94 80241194 46800020 */ cvt.s.w $f0, $f0 /* 8D6F98 80241198 46001080 */ add.s $f2, $f2, $f0 /* 8D6F9C 8024119C C604001C */ lwc1 $f4, 0x1c($s0) /* 8D6FA0 802411A0 46002005 */ abs.s $f0, $f4 /* 8D6FA4 802411A4 4602003C */ c.lt.s $f0, $f2 -/* 8D6FA8 802411A8 00000000 */ nop +/* 8D6FA8 802411A8 00000000 */ nop /* 8D6FAC 802411AC 45020005 */ bc1fl .L802411C4 /* 8D6FB0 802411B0 AE00001C */ sw $zero, 0x1c($s0) /* 8D6FB4 802411B4 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802411E8_8D6FE8.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802411E8_8D6FE8.s index d4e91d6eef..c62f1cb59b 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802411E8_8D6FE8.s +++ b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802411E8_8D6FE8.s @@ -49,15 +49,15 @@ glabel func_802411E8_8D6FE8 /* 8D7090 80241290 44802000 */ mtc1 $zero, $f4 /* 8D7094 80241294 460010A1 */ cvt.d.s $f2, $f2 /* 8D7098 80241298 46241082 */ mul.d $f2, $f2, $f4 -/* 8D709C 8024129C 00000000 */ nop +/* 8D709C 8024129C 00000000 */ nop /* 8D70A0 802412A0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* 8D70A4 802412A4 46000021 */ cvt.d.s $f0, $f0 /* 8D70A8 802412A8 46240002 */ mul.d $f0, $f0, $f4 -/* 8D70AC 802412AC 00000000 */ nop +/* 8D70AC 802412AC 00000000 */ nop /* 8D70B0 802412B0 3C013FE0 */ lui $at, 0x3fe0 /* 8D70B4 802412B4 44812800 */ mtc1 $at, $f5 /* 8D70B8 802412B8 44802000 */ mtc1 $zero, $f4 -/* 8D70BC 802412BC 00000000 */ nop +/* 8D70BC 802412BC 00000000 */ nop /* 8D70C0 802412C0 46241080 */ add.d $f2, $f2, $f4 /* 8D70C4 802412C4 AE000074 */ sw $zero, 0x74($s0) /* 8D70C8 802412C8 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s index a3d1c05d99..e6d2d206e1 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s @@ -54,7 +54,7 @@ glabel func_8024130C_8D710C /* 8D71CC 802413CC 8E4300B0 */ lw $v1, 0xb0($s2) /* 8D71D0 802413D0 30620004 */ andi $v0, $v1, 4 /* 8D71D4 802413D4 10400007 */ beqz $v0, .L802413F4 -/* 8D71D8 802413D8 00000000 */ nop +/* 8D71D8 802413D8 00000000 */ nop /* 8D71DC 802413DC 824200B4 */ lb $v0, 0xb4($s2) /* 8D71E0 802413E0 1440003C */ bnez $v0, .L802414D4 /* 8D71E4 802413E4 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_8024130C_8D710C /* 8D71F8 802413F8 2C62000F */ sltiu $v0, $v1, 0xf /* 8D71FC 802413FC 10400034 */ beqz $v0, .L802414D0 /* 8D7200 80241400 00031080 */ sll $v0, $v1, 2 -/* 8D7204 80241404 3C018024 */ lui $at, %hi(D_80242688) +/* 8D7204 80241404 3C018024 */ lui $at, %hi(jtbl_80242688_8D8488) /* 8D7208 80241408 00220821 */ addu $at, $at, $v0 -/* 8D720C 8024140C 8C222688 */ lw $v0, %lo(D_80242688)($at) +/* 8D720C 8024140C 8C222688 */ lw $v0, %lo(jtbl_80242688_8D8488)($at) /* 8D7210 80241410 00400008 */ jr $v0 -/* 8D7214 80241414 00000000 */ nop +/* 8D7214 80241414 00000000 */ nop +glabel L80241418_8D7218 /* 8D7218 80241418 0280202D */ daddu $a0, $s4, $zero /* 8D721C 8024141C 0200282D */ daddu $a1, $s0, $zero /* 8D7220 80241420 0C090000 */ jal func_80240000_8D5E00 /* 8D7224 80241424 0260302D */ daddu $a2, $s3, $zero +glabel L80241428_8D7228 /* 8D7228 80241428 0280202D */ daddu $a0, $s4, $zero /* 8D722C 8024142C 0200282D */ daddu $a1, $s0, $zero /* 8D7230 80241430 0C09006C */ jal func_802401B0_8D5FB0 /* 8D7234 80241434 0260302D */ daddu $a2, $s3, $zero /* 8D7238 80241438 08090535 */ j .L802414D4 /* 8D723C 8024143C 0000102D */ daddu $v0, $zero, $zero +glabel L80241440_8D7240 /* 8D7240 80241440 0280202D */ daddu $a0, $s4, $zero /* 8D7244 80241444 0200282D */ daddu $a1, $s0, $zero /* 8D7248 80241448 0C0901F6 */ jal kmr_09_UnkNpcAIFunc1 /* 8D724C 8024144C 0260302D */ daddu $a2, $s3, $zero +glabel L80241450_8D7250 /* 8D7250 80241450 0280202D */ daddu $a0, $s4, $zero /* 8D7254 80241454 0200282D */ daddu $a1, $s0, $zero /* 8D7258 80241458 0C090226 */ jal func_80240898_8D6698 /* 8D725C 8024145C 0260302D */ daddu $a2, $s3, $zero /* 8D7260 80241460 08090535 */ j .L802414D4 /* 8D7264 80241464 0000102D */ daddu $v0, $zero, $zero +glabel L80241468_8D7268 /* 8D7268 80241468 0280202D */ daddu $a0, $s4, $zero /* 8D726C 8024146C 0200282D */ daddu $a1, $s0, $zero /* 8D7270 80241470 0C0902F7 */ jal kmr_09_UnkNpcAIFunc2 /* 8D7274 80241474 0260302D */ daddu $a2, $s3, $zero +glabel L80241478_8D7278 /* 8D7278 80241478 0280202D */ daddu $a0, $s4, $zero /* 8D727C 8024147C 0200282D */ daddu $a1, $s0, $zero /* 8D7280 80241480 0C090315 */ jal func_80240C54_8D6A54 /* 8D7284 80241484 0260302D */ daddu $a2, $s3, $zero /* 8D7288 80241488 08090535 */ j .L802414D4 /* 8D728C 8024148C 0000102D */ daddu $v0, $zero, $zero +glabel L80241490_8D7290 /* 8D7290 80241490 0280202D */ daddu $a0, $s4, $zero /* 8D7294 80241494 0200282D */ daddu $a1, $s0, $zero /* 8D7298 80241498 0C090330 */ jal func_80240CC0_8D6AC0 /* 8D729C 8024149C 0260302D */ daddu $a2, $s3, $zero /* 8D72A0 802414A0 08090535 */ j .L802414D4 /* 8D72A4 802414A4 0000102D */ daddu $v0, $zero, $zero +glabel L802414A8_8D72A8 /* 8D72A8 802414A8 0280202D */ daddu $a0, $s4, $zero /* 8D72AC 802414AC 0200282D */ daddu $a1, $s0, $zero /* 8D72B0 802414B0 0C09037D */ jal kmr_09_UnkNpcAIFunc3 /* 8D72B4 802414B4 0260302D */ daddu $a2, $s3, $zero /* 8D72B8 802414B8 08090535 */ j .L802414D4 /* 8D72BC 802414BC 0000102D */ daddu $v0, $zero, $zero +glabel L802414C0_8D72C0 /* 8D72C0 802414C0 0280202D */ daddu $a0, $s4, $zero /* 8D72C4 802414C4 0200282D */ daddu $a1, $s0, $zero /* 8D72C8 802414C8 0C090396 */ jal func_80240E58_8D6C58 /* 8D72CC 802414CC 0260302D */ daddu $a2, $s3, $zero .L802414D0: +glabel L802414D0_8D72D0 /* 8D72D0 802414D0 0000102D */ daddu $v0, $zero, $zero .L802414D4: /* 8D72D4 802414D4 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240000_8D84D0.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240000_8D84D0.s index 3d9d056607..90f0d5b4c6 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240000_8D84D0.s +++ b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240000_8D84D0.s @@ -26,7 +26,7 @@ glabel func_80240000_8D84D0 /* 8D8520 80240050 1440FFFA */ bnez $v0, .L8024003C /* 8D8524 80240054 24A50004 */ addiu $a1, $a1, 4 /* 8D8528 80240058 08090027 */ j .L8024009C -/* 8D852C 8024005C 00000000 */ nop +/* 8D852C 8024005C 00000000 */ nop .L80240060: /* 8D8530 80240060 0000182D */ daddu $v1, $zero, $zero /* 8D8534 80240064 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_8024023C_8DA33C.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_8024023C_8DA33C.s index 00ee3cbf09..d3fcf141b9 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_8024023C_8DA33C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_8024023C_8DA33C.s @@ -13,7 +13,7 @@ glabel func_8024023C_8DA33C /* 8DA35C 8024025C 0C046EE2 */ jal set_world_fog_color /* 8DA360 80240260 240700FF */ addiu $a3, $zero, 0xff /* 8DA364 80240264 0C046ED4 */ jal enable_world_fog -/* 8DA368 80240268 00000000 */ nop +/* 8DA368 80240268 00000000 */ nop /* 8DA36C 8024026C 8FBF0010 */ lw $ra, 0x10($sp) /* 8DA370 80240270 24020002 */ addiu $v0, $zero, 2 /* 8DA374 80240274 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_8024027C_8DA37C.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_8024027C_8DA37C.s index 898d2cd2b0..408ae8f275 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_8024027C_8DA37C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_8024027C_8DA37C.s @@ -10,4 +10,4 @@ glabel func_8024027C_8DA37C /* 8DA390 80240290 24020002 */ addiu $v0, $zero, 2 /* 8DA394 80240294 03E00008 */ jr $ra /* 8DA398 80240298 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8DA39C 8024029C 00000000 */ nop +/* 8DA39C 8024029C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240370_8DA470.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240370_8DA470.s index 18b970b3e5..544acbf496 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240370_8DA470.s +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240370_8DA470.s @@ -22,7 +22,7 @@ glabel func_80240370_8DA470 /* 8DA4B4 802403B4 3C030010 */ lui $v1, 0x10 /* 8DA4B8 802403B8 00431024 */ and $v0, $v0, $v1 /* 8DA4BC 802403BC 10400004 */ beqz $v0, .L802403D0 -/* 8DA4C0 802403C0 00000000 */ nop +/* 8DA4C0 802403C0 00000000 */ nop /* 8DA4C4 802403C4 C620006C */ lwc1 $f0, 0x6c($s1) /* 8DA4C8 802403C8 46800020 */ cvt.s.w $f0, $f0 /* 8DA4CC 802403CC E480000C */ swc1 $f0, 0xc($a0) @@ -30,7 +30,7 @@ glabel func_80240370_8DA470 /* 8DA4D0 802403D0 8E2200D0 */ lw $v0, 0xd0($s1) /* 8DA4D4 802403D4 8C420014 */ lw $v0, 0x14($v0) /* 8DA4D8 802403D8 1C400004 */ bgtz $v0, .L802403EC -/* 8DA4DC 802403DC 00000000 */ nop +/* 8DA4DC 802403DC 00000000 */ nop /* 8DA4E0 802403E0 C640000C */ lwc1 $f0, 0xc($s2) /* 8DA4E4 802403E4 08090103 */ j .L8024040C /* 8DA4E8 802403E8 E4800018 */ swc1 $f0, 0x18($a0) @@ -38,7 +38,7 @@ glabel func_80240370_8DA470 /* 8DA4EC 802403EC 3C018025 */ lui $at, %hi(D_802510B0) /* 8DA4F0 802403F0 D42210B0 */ ldc1 $f2, %lo(D_802510B0)($at) /* 8DA4F4 802403F4 44820000 */ mtc1 $v0, $f0 -/* 8DA4F8 802403F8 00000000 */ nop +/* 8DA4F8 802403F8 00000000 */ nop /* 8DA4FC 802403FC 46800021 */ cvt.d.w $f0, $f0 /* 8DA500 80240400 46220003 */ div.d $f0, $f0, $f2 /* 8DA504 80240404 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240424_8DA524.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240424_8DA524.s index 3c57b6a3dc..c104b6da1d 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240424_8DA524.s +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240424_8DA524.s @@ -38,7 +38,7 @@ glabel func_80240424_8DA524 /* 8DA5A8 802404A8 2402000F */ addiu $v0, $zero, 0xf /* 8DA5AC 802404AC AFA2001C */ sw $v0, 0x1c($sp) /* 8DA5B0 802404B0 44833000 */ mtc1 $v1, $f6 -/* 8DA5B4 802404B4 00000000 */ nop +/* 8DA5B4 802404B4 00000000 */ nop /* 8DA5B8 802404B8 468031A0 */ cvt.s.w $f6, $f6 /* 8DA5BC 802404BC 44073000 */ mfc1 $a3, $f6 /* 8DA5C0 802404C0 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_8024061C_8DA71C.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_8024061C_8DA71C.s index 0443a6c882..1909fe7f3c 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_8024061C_8DA71C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_8024061C_8DA71C.s @@ -47,20 +47,20 @@ glabel func_8024061C_8DA71C /* 8DA7C4 802406C4 8E020010 */ lw $v0, 0x10($s0) /* 8DA7C8 802406C8 46001005 */ abs.s $f0, $f2 /* 8DA7CC 802406CC 44822000 */ mtc1 $v0, $f4 -/* 8DA7D0 802406D0 00000000 */ nop +/* 8DA7D0 802406D0 00000000 */ nop /* 8DA7D4 802406D4 46802120 */ cvt.s.w $f4, $f4 /* 8DA7D8 802406D8 4600203C */ c.lt.s $f4, $f0 -/* 8DA7DC 802406DC 00000000 */ nop +/* 8DA7DC 802406DC 00000000 */ nop /* 8DA7E0 802406E0 4500000D */ bc1f .L80240718 -/* 8DA7E4 802406E4 00000000 */ nop +/* 8DA7E4 802406E4 00000000 */ nop /* 8DA7E8 802406E8 44800000 */ mtc1 $zero, $f0 /* 8DA7EC 802406EC C654000C */ lwc1 $f20, 0xc($s2) /* 8DA7F0 802406F0 4600103C */ c.lt.s $f2, $f0 -/* 8DA7F4 802406F4 00000000 */ nop +/* 8DA7F4 802406F4 00000000 */ nop /* 8DA7F8 802406F8 45000006 */ bc1f .L80240714 /* 8DA7FC 802406FC 00021023 */ negu $v0, $v0 /* 8DA800 80240700 44820000 */ mtc1 $v0, $f0 -/* 8DA804 80240704 00000000 */ nop +/* 8DA804 80240704 00000000 */ nop /* 8DA808 80240708 46800020 */ cvt.s.w $f0, $f0 /* 8DA80C 8024070C 080901C6 */ j .L80240718 /* 8DA810 80240710 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802408B0_8DA9B0.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802408B0_8DA9B0.s index 9b0c7092fd..52f5d791fe 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802408B0_8DA9B0.s +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802408B0_8DA9B0.s @@ -19,20 +19,20 @@ glabel func_802408B0_8DA9B0 /* 8DA9E8 802408E8 8E0200D0 */ lw $v0, 0xd0($s0) /* 8DA9EC 802408EC 8C420014 */ lw $v0, 0x14($v0) /* 8DA9F0 802408F0 04410009 */ bgez $v0, .L80240918 -/* 8DA9F4 802408F4 00000000 */ nop +/* 8DA9F4 802408F4 00000000 */ nop /* 8DA9F8 802408F8 C640000C */ lwc1 $f0, 0xc($s2) /* 8DA9FC 802408FC 3C018025 */ lui $at, %hi(D_802510B8) /* 8DAA00 80240900 D42210B8 */ ldc1 $f2, %lo(D_802510B8)($at) /* 8DAA04 80240904 46000021 */ cvt.d.s $f0, $f0 /* 8DAA08 80240908 46220002 */ mul.d $f0, $f0, $f2 -/* 8DAA0C 8024090C 00000000 */ nop +/* 8DAA0C 8024090C 00000000 */ nop /* 8DAA10 80240910 0809024D */ j .L80240934 /* 8DAA14 80240914 46200020 */ cvt.s.d $f0, $f0 .L80240918: /* 8DAA18 80240918 3C018025 */ lui $at, %hi(D_802510C0) /* 8DAA1C 8024091C D42210C0 */ ldc1 $f2, %lo(D_802510C0)($at) /* 8DAA20 80240920 44820000 */ mtc1 $v0, $f0 -/* 8DAA24 80240924 00000000 */ nop +/* 8DAA24 80240924 00000000 */ nop /* 8DAA28 80240928 46800021 */ cvt.d.w $f0, $f0 /* 8DAA2C 8024092C 46220003 */ div.d $f0, $f0, $f2 /* 8DAA30 80240930 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_8024095C_8DAA5C.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_8024095C_8DAA5C.s index b11135d52b..99ea9a962b 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_8024095C_8DAA5C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_8024095C_8DAA5C.s @@ -42,7 +42,7 @@ glabel func_8024095C_8DAA5C /* 8DAAF0 802409F0 2402000F */ addiu $v0, $zero, 0xf /* 8DAAF4 802409F4 AFA2001C */ sw $v0, 0x1c($sp) /* 8DAAF8 802409F8 44833000 */ mtc1 $v1, $f6 -/* 8DAAFC 802409FC 00000000 */ nop +/* 8DAAFC 802409FC 00000000 */ nop /* 8DAB00 80240A00 468031A0 */ cvt.s.w $f6, $f6 /* 8DAB04 80240A04 44073000 */ mfc1 $a3, $f6 /* 8DAB08 80240A08 27A20028 */ addiu $v0, $sp, 0x28 @@ -90,12 +90,12 @@ glabel func_8024095C_8DAA5C /* 8DABA0 80240AA0 468031A0 */ cvt.s.w $f6, $f6 /* 8DABA4 80240AA4 44073000 */ mfc1 $a3, $f6 /* 8DABA8 80240AA8 0C00A7B5 */ jal dist2D -/* 8DABAC 80240AAC 00000000 */ nop +/* 8DABAC 80240AAC 00000000 */ nop /* 8DABB0 80240AB0 C6020018 */ lwc1 $f2, 0x18($s0) /* 8DABB4 80240AB4 4602003C */ c.lt.s $f0, $f2 -/* 8DABB8 80240AB8 00000000 */ nop +/* 8DABB8 80240AB8 00000000 */ nop /* 8DABBC 80240ABC 4500000E */ bc1f .L80240AF8 -/* 8DABC0 80240AC0 00000000 */ nop +/* 8DABC0 80240AC0 00000000 */ nop /* 8DABC4 80240AC4 8E2200D0 */ lw $v0, 0xd0($s1) /* 8DABC8 80240AC8 C4400000 */ lwc1 $f0, ($v0) /* 8DABCC 80240ACC 46800020 */ cvt.s.w $f0, $f0 @@ -112,7 +112,7 @@ glabel func_8024095C_8DAA5C .L80240AF8: /* 8DABF8 80240AF8 8602008C */ lh $v0, 0x8c($s0) /* 8DABFC 80240AFC 14400011 */ bnez $v0, .L80240B44 -/* 8DAC00 80240B00 00000000 */ nop +/* 8DAC00 80240B00 00000000 */ nop /* 8DAC04 80240B04 C60C0038 */ lwc1 $f12, 0x38($s0) /* 8DAC08 80240B08 8E2200D0 */ lw $v0, 0xd0($s1) /* 8DAC0C 80240B0C C60E0040 */ lwc1 $f14, 0x40($s0) @@ -123,7 +123,7 @@ glabel func_8024095C_8DAA5C /* 8DAC20 80240B20 468031A0 */ cvt.s.w $f6, $f6 /* 8DAC24 80240B24 44073000 */ mfc1 $a3, $f6 /* 8DAC28 80240B28 0C00A720 */ jal atan2 -/* 8DAC2C 80240B2C 00000000 */ nop +/* 8DAC2C 80240B2C 00000000 */ nop /* 8DAC30 80240B30 8E050018 */ lw $a1, 0x18($s0) /* 8DAC34 80240B34 44060000 */ mfc1 $a2, $f0 /* 8DAC38 80240B38 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s index 84020f1c0b..60b41f633d 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s @@ -46,7 +46,7 @@ glabel func_80240B64_8DAC64 /* 8DAD08 80240C08 8E4200B0 */ lw $v0, 0xb0($s2) /* 8DAD0C 80240C0C 30420004 */ andi $v0, $v0, 4 /* 8DAD10 80240C10 1040002F */ beqz $v0, .L80240CD0 -/* 8DAD14 80240C14 00000000 */ nop +/* 8DAD14 80240C14 00000000 */ nop .L80240C18: /* 8DAD18 80240C18 AE800070 */ sw $zero, 0x70($s4) /* 8DAD1C 80240C1C C600000C */ lwc1 $f0, 0xc($s0) @@ -102,60 +102,71 @@ glabel func_80240B64_8DAC64 /* 8DADD4 80240CD4 2C620064 */ sltiu $v0, $v1, 0x64 /* 8DADD8 80240CD8 10400036 */ beqz $v0, .L80240DB4 /* 8DADDC 80240CDC 00031080 */ sll $v0, $v1, 2 -/* 8DADE0 80240CE0 3C018025 */ lui $at, %hi(D_802510C8) +/* 8DADE0 80240CE0 3C018025 */ lui $at, %hi(jtbl_802510C8_8EB1C8) /* 8DADE4 80240CE4 00220821 */ addu $at, $at, $v0 -/* 8DADE8 80240CE8 8C2210C8 */ lw $v0, %lo(D_802510C8)($at) +/* 8DADE8 80240CE8 8C2210C8 */ lw $v0, %lo(jtbl_802510C8_8EB1C8)($at) /* 8DADEC 80240CEC 00400008 */ jr $v0 -/* 8DADF0 80240CF0 00000000 */ nop +/* 8DADF0 80240CF0 00000000 */ nop +glabel L80240CF4_8DADF4 /* 8DADF4 80240CF4 0280202D */ daddu $a0, $s4, $zero /* 8DADF8 80240CF8 0260282D */ daddu $a1, $s3, $zero /* 8DADFC 80240CFC 0C0900DC */ jal func_80240370_8DA470 /* 8DAE00 80240D00 02A0302D */ daddu $a2, $s5, $zero +glabel L80240D04_8DAE04 /* 8DAE04 80240D04 0280202D */ daddu $a0, $s4, $zero /* 8DAE08 80240D08 0260282D */ daddu $a1, $s3, $zero /* 8DAE0C 80240D0C 0C090109 */ jal func_80240424_8DA524 /* 8DAE10 80240D10 02A0302D */ daddu $a2, $s5, $zero /* 8DAE14 80240D14 0809036D */ j .L80240DB4 -/* 8DAE18 80240D18 00000000 */ nop +/* 8DAE18 80240D18 00000000 */ nop +glabel L80240D1C_8DAE1C /* 8DAE1C 80240D1C 0280202D */ daddu $a0, $s4, $zero /* 8DAE20 80240D20 0260282D */ daddu $a1, $s3, $zero /* 8DAE24 80240D24 0C090151 */ jal kmr_11_NpcJumpFunc3 /* 8DAE28 80240D28 02A0302D */ daddu $a2, $s5, $zero +glabel L80240D2C_8DAE2C /* 8DAE2C 80240D2C 0280202D */ daddu $a0, $s4, $zero /* 8DAE30 80240D30 0260282D */ daddu $a1, $s3, $zero /* 8DAE34 80240D34 0C090169 */ jal kmr_11_NpcJumpFunc /* 8DAE38 80240D38 02A0302D */ daddu $a2, $s5, $zero /* 8DAE3C 80240D3C 0809036D */ j .L80240DB4 -/* 8DAE40 80240D40 00000000 */ nop +/* 8DAE40 80240D40 00000000 */ nop +glabel L80240D44_8DAE44 /* 8DAE44 80240D44 0280202D */ daddu $a0, $s4, $zero /* 8DAE48 80240D48 0260282D */ daddu $a1, $s3, $zero /* 8DAE4C 80240D4C 0C090187 */ jal func_8024061C_8DA71C /* 8DAE50 80240D50 02A0302D */ daddu $a2, $s5, $zero +glabel L80240D54_8DAE54 /* 8DAE54 80240D54 0280202D */ daddu $a0, $s4, $zero /* 8DAE58 80240D58 0260282D */ daddu $a1, $s3, $zero /* 8DAE5C 80240D5C 0C0901D3 */ jal kmr_11_UnkNpcAIFunc11 /* 8DAE60 80240D60 02A0302D */ daddu $a2, $s5, $zero /* 8DAE64 80240D64 0809036D */ j .L80240DB4 -/* 8DAE68 80240D68 00000000 */ nop +/* 8DAE68 80240D68 00000000 */ nop +glabel L80240D6C_8DAE6C /* 8DAE6C 80240D6C 0280202D */ daddu $a0, $s4, $zero /* 8DAE70 80240D70 0260282D */ daddu $a1, $s3, $zero /* 8DAE74 80240D74 0C09021A */ jal kmr_11_UnkNpcAIFunc10 /* 8DAE78 80240D78 02A0302D */ daddu $a2, $s5, $zero /* 8DAE7C 80240D7C 0809036D */ j .L80240DB4 -/* 8DAE80 80240D80 00000000 */ nop +/* 8DAE80 80240D80 00000000 */ nop +glabel L80240D84_8DAE84 /* 8DAE84 80240D84 0280202D */ daddu $a0, $s4, $zero /* 8DAE88 80240D88 0260282D */ daddu $a1, $s3, $zero /* 8DAE8C 80240D8C 0C09022C */ jal func_802408B0_8DA9B0 /* 8DAE90 80240D90 02A0302D */ daddu $a2, $s5, $zero +glabel L80240D94_8DAE94 /* 8DAE94 80240D94 0280202D */ daddu $a0, $s4, $zero /* 8DAE98 80240D98 0260282D */ daddu $a1, $s3, $zero /* 8DAE9C 80240D9C 0C090257 */ jal func_8024095C_8DAA5C /* 8DAEA0 80240DA0 02A0302D */ daddu $a2, $s5, $zero /* 8DAEA4 80240DA4 0809036D */ j .L80240DB4 -/* 8DAEA8 80240DA8 00000000 */ nop +/* 8DAEA8 80240DA8 00000000 */ nop +glabel L80240DAC_8DAEAC /* 8DAEAC 80240DAC 0C0129CF */ jal func_8004A73C /* 8DAEB0 80240DB0 0280202D */ daddu $a0, $s4, $zero .L80240DB4: +glabel L80240DB4_8DAEB4 /* 8DAEB4 80240DB4 8FBF0048 */ lw $ra, 0x48($sp) /* 8DAEB8 80240DB8 8FB50044 */ lw $s5, 0x44($sp) /* 8DAEBC 80240DBC 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240DDC_8DAEDC.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240DDC_8DAEDC.s index b11ff38391..4c2161b3f5 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240DDC_8DAEDC.s +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240DDC_8DAEDC.s @@ -25,7 +25,7 @@ glabel func_80240DDC_8DAEDC /* 8DAF2C 80240E2C 0C00A8BB */ jal sin_deg /* 8DAF30 80240E30 46146300 */ add.s $f12, $f12, $f20 /* 8DAF34 80240E34 46160002 */ mul.s $f0, $f0, $f22 -/* 8DAF38 80240E38 00000000 */ nop +/* 8DAF38 80240E38 00000000 */ nop /* 8DAF3C 80240E3C C6020038 */ lwc1 $f2, 0x38($s0) /* 8DAF40 80240E40 46001080 */ add.s $f2, $f2, $f0 /* 8DAF44 80240E44 4600110D */ trunc.w.s $f4, $f2 @@ -33,7 +33,7 @@ glabel func_80240DDC_8DAEDC /* 8DAF4C 80240E4C C600003C */ lwc1 $f0, 0x3c($s0) /* 8DAF50 80240E50 3C014100 */ lui $at, 0x4100 /* 8DAF54 80240E54 44811000 */ mtc1 $at, $f2 -/* 8DAF58 80240E58 00000000 */ nop +/* 8DAF58 80240E58 00000000 */ nop /* 8DAF5C 80240E5C 46020000 */ add.s $f0, $f0, $f2 /* 8DAF60 80240E60 4600010D */ trunc.w.s $f4, $f0 /* 8DAF64 80240E64 E6240088 */ swc1 $f4, 0x88($s1) @@ -43,7 +43,7 @@ glabel func_80240DDC_8DAEDC /* 8DAF74 80240E74 0C00A8D4 */ jal cos_deg /* 8DAF78 80240E78 46146300 */ add.s $f12, $f12, $f20 /* 8DAF7C 80240E7C 46160002 */ mul.s $f0, $f0, $f22 -/* 8DAF80 80240E80 00000000 */ nop +/* 8DAF80 80240E80 00000000 */ nop /* 8DAF84 80240E84 C6020040 */ lwc1 $f2, 0x40($s0) /* 8DAF88 80240E88 46001081 */ sub.s $f2, $f2, $f0 /* 8DAF8C 80240E8C 4600110D */ trunc.w.s $f4, $f2 @@ -57,5 +57,5 @@ glabel func_80240DDC_8DAEDC /* 8DAFAC 80240EAC 24020002 */ addiu $v0, $zero, 2 /* 8DAFB0 80240EB0 03E00008 */ jr $ra /* 8DAFB4 80240EB4 27BD0030 */ addiu $sp, $sp, 0x30 -/* 8DAFB8 80240EB8 00000000 */ nop -/* 8DAFBC 80240EBC 00000000 */ nop +/* 8DAFB8 80240EB8 00000000 */ nop +/* 8DAFBC 80240EBC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE20/func_80240000_8EBE20.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE20/func_80240000_8EBE20.s index c08e4a3582..7e489efa0f 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE20/func_80240000_8EBE20.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE20/func_80240000_8EBE20.s @@ -11,6 +11,6 @@ glabel func_80240000_8EBE20 /* 8EBE38 80240018 24020002 */ addiu $v0, $zero, 2 /* 8EBE3C 8024001C 03E00008 */ jr $ra /* 8EBE40 80240020 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8EBE44 80240024 00000000 */ nop -/* 8EBE48 80240028 00000000 */ nop -/* 8EBE4C 8024002C 00000000 */ nop +/* 8EBE44 80240024 00000000 */ nop +/* 8EBE48 80240028 00000000 */ nop +/* 8EBE4C 8024002C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240064_8EBE84.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240064_8EBE84.s index 884bd53520..28ee01ec3f 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240064_8EBE84.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240064_8EBE84.s @@ -22,16 +22,16 @@ glabel func_80240064_8EBE84 /* 8EBEC4 802400A4 00021023 */ negu $v0, $v0 .L802400A8: /* 8EBEC8 802400A8 14400003 */ bnez $v0, .L802400B8 -/* 8EBECC 802400AC 00000000 */ nop +/* 8EBECC 802400AC 00000000 */ nop /* 8EBED0 802400B0 50E00017 */ beql $a3, $zero, .L80240110 /* 8EBED4 802400B4 0000102D */ daddu $v0, $zero, $zero .L802400B8: /* 8EBED8 802400B8 44822000 */ mtc1 $v0, $f4 -/* 8EBEDC 802400BC 00000000 */ nop +/* 8EBEDC 802400BC 00000000 */ nop /* 8EBEE0 802400C0 46802120 */ cvt.s.w $f4, $f4 /* 8EBEE4 802400C4 44062000 */ mfc1 $a2, $f4 /* 8EBEE8 802400C8 44872000 */ mtc1 $a3, $f4 -/* 8EBEEC 802400CC 00000000 */ nop +/* 8EBEEC 802400CC 00000000 */ nop /* 8EBEF0 802400D0 46802120 */ cvt.s.w $f4, $f4 /* 8EBEF4 802400D4 44806000 */ mtc1 $zero, $f12 /* 8EBEF8 802400D8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240064_8EBE84 /* 8EBF00 802400E0 46006386 */ mov.s $f14, $f12 /* 8EBF04 802400E4 3C014270 */ lui $at, 0x4270 /* 8EBF08 802400E8 44811000 */ mtc1 $at, $f2 -/* 8EBF0C 802400EC 00000000 */ nop +/* 8EBF0C 802400EC 00000000 */ nop /* 8EBF10 802400F0 4602003C */ c.lt.s $f0, $f2 -/* 8EBF14 802400F4 00000000 */ nop +/* 8EBF14 802400F4 00000000 */ nop /* 8EBF18 802400F8 45000004 */ bc1f .L8024010C /* 8EBF1C 802400FC 24020001 */ addiu $v0, $zero, 1 /* 8EBF20 80240100 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s index 9a974068a0..9c428ffd75 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s @@ -24,7 +24,7 @@ glabel func_802406C8_8EC4E8 /* 8EC530 80240710 10E20074 */ beq $a3, $v0, .L802408E4 /* 8EC534 80240714 0000102D */ daddu $v0, $zero, $zero /* 8EC538 80240718 080902BC */ j .L80240AF0 -/* 8EC53C 8024071C 00000000 */ nop +/* 8EC53C 8024071C 00000000 */ nop .L80240720: /* 8EC540 80240720 0000B82D */ daddu $s7, $zero, $zero /* 8EC544 80240724 02E0902D */ daddu $s2, $s7, $zero @@ -54,7 +54,7 @@ glabel func_802406C8_8EC4E8 /* 8EC59C 8024077C 3C028011 */ lui $v0, %hi(gPlayerData+0x2C2) /* 8EC5A0 80240780 9442F552 */ lhu $v0, %lo(gPlayerData+0x2C2)($v0) /* 8EC5A4 80240784 10400021 */ beqz $v0, .L8024080C -/* 8EC5A8 80240788 00000000 */ nop +/* 8EC5A8 80240788 00000000 */ nop /* 8EC5AC 8024078C 08090203 */ j .L8024080C /* 8EC5B0 80240790 24130001 */ addiu $s3, $zero, 1 .L80240794: @@ -63,7 +63,7 @@ glabel func_802406C8_8EC4E8 /* 8EC5BC 8024079C 0C0B1EAF */ jal get_variable /* 8EC5C0 802407A0 34A55C9A */ ori $a1, $a1, 0x5c9a /* 8EC5C4 802407A4 10400019 */ beqz $v0, .L8024080C -/* 8EC5C8 802407A8 00000000 */ nop +/* 8EC5C8 802407A8 00000000 */ nop /* 8EC5CC 802407AC 08090203 */ j .L8024080C /* 8EC5D0 802407B0 24130001 */ addiu $s3, $zero, 1 .L802407B4: @@ -81,7 +81,7 @@ glabel func_802406C8_8EC4E8 /* 8EC600 802407E0 0002802B */ sltu $s0, $zero, $v0 .L802407E4: /* 8EC604 802407E4 12000009 */ beqz $s0, .L8024080C -/* 8EC608 802407E8 00000000 */ nop +/* 8EC608 802407E8 00000000 */ nop /* 8EC60C 802407EC 08090203 */ j .L8024080C /* 8EC610 802407F0 24130001 */ addiu $s3, $zero, 1 .L802407F4: @@ -144,9 +144,9 @@ glabel func_802406C8_8EC4E8 /* 8EC6DC 802408BC 0C03D390 */ jal func_800F4E40 /* 8EC6E0 802408C0 AC820328 */ sw $v0, 0x328($a0) /* 8EC6E4 802408C4 0C03A631 */ jal func_800E98C4 -/* 8EC6E8 802408C8 00000000 */ nop +/* 8EC6E8 802408C8 00000000 */ nop /* 8EC6EC 802408CC 0C03A5EE */ jal func_800E97B8 -/* 8EC6F0 802408D0 00000000 */ nop +/* 8EC6F0 802408D0 00000000 */ nop /* 8EC6F4 802408D4 24020001 */ addiu $v0, $zero, 1 /* 8EC6F8 802408D8 AE800074 */ sw $zero, 0x74($s4) /* 8EC6FC 802408DC 080902BB */ j .L80240AEC @@ -160,7 +160,7 @@ glabel func_802406C8_8EC4E8 /* 8EC718 802408F8 1040007C */ beqz $v0, .L80240AEC /* 8EC71C 802408FC AE820078 */ sw $v0, 0x78($s4) /* 8EC720 80240900 0C03C4EC */ jal func_800F13B0 -/* 8EC724 80240904 00000000 */ nop +/* 8EC724 80240904 00000000 */ nop /* 8EC728 80240908 8E820074 */ lw $v0, 0x74($s4) /* 8EC72C 8024090C 24420001 */ addiu $v0, $v0, 1 .L80240910: @@ -169,7 +169,7 @@ glabel func_802406C8_8EC4E8 /* 8EC738 80240918 14400075 */ bnez $v0, .L80240AF0 /* 8EC73C 8024091C 0000102D */ daddu $v0, $zero, $zero /* 8EC740 80240920 0C03C54E */ jal func_800F1538 -/* 8EC744 80240924 00000000 */ nop +/* 8EC744 80240924 00000000 */ nop /* 8EC748 80240928 8E830078 */ lw $v1, 0x78($s4) /* 8EC74C 8024092C 240200FF */ addiu $v0, $zero, 0xff /* 8EC750 80240930 14620005 */ bne $v1, $v0, .L80240948 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B20_8EC940.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B20_8EC940.s index 42c06a2074..c88d48ed2f 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B20_8EC940.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B20_8EC940.s @@ -7,7 +7,7 @@ glabel func_80240B20_8EC940 /* 8EC948 80240B28 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 8EC94C 80240B2C AFBF0010 */ sw $ra, 0x10($sp) /* 8EC950 80240B30 0C048D70 */ jal func_801235C0 -/* 8EC954 80240B34 00000000 */ nop +/* 8EC954 80240B34 00000000 */ nop /* 8EC958 80240B38 8FBF0010 */ lw $ra, 0x10($sp) /* 8EC95C 80240B3C 24020002 */ addiu $v0, $zero, 2 /* 8EC960 80240B40 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54_8EC974.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54_8EC974.s index a493abe96f..f457af59ef 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54_8EC974.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54_8EC974.s @@ -25,7 +25,7 @@ glabel func_80240B54_8EC974 /* 8EC9C0 80240BA0 12620041 */ beq $s3, $v0, .L80240CA8 /* 8EC9C4 80240BA4 0000102D */ daddu $v0, $zero, $zero /* 8EC9C8 80240BA8 0809035D */ j .L80240D74 -/* 8EC9CC 80240BAC 00000000 */ nop +/* 8EC9CC 80240BAC 00000000 */ nop .L80240BB0: /* 8EC9D0 80240BB0 0000A82D */ daddu $s5, $zero, $zero /* 8EC9D4 80240BB4 02A0902D */ daddu $s2, $s5, $zero @@ -87,9 +87,9 @@ glabel func_80240B54_8EC974 /* 8ECAA0 80240C80 0C03D390 */ jal func_800F4E40 /* 8ECAA4 80240C84 AC820328 */ sw $v0, 0x328($a0) /* 8ECAA8 80240C88 0C03A631 */ jal func_800E98C4 -/* 8ECAAC 80240C8C 00000000 */ nop +/* 8ECAAC 80240C8C 00000000 */ nop /* 8ECAB0 80240C90 0C03A5EE */ jal func_800E97B8 -/* 8ECAB4 80240C94 00000000 */ nop +/* 8ECAB4 80240C94 00000000 */ nop /* 8ECAB8 80240C98 24020001 */ addiu $v0, $zero, 1 /* 8ECABC 80240C9C AE800074 */ sw $zero, 0x74($s4) /* 8ECAC0 80240CA0 0809035C */ j .L80240D70 @@ -102,7 +102,7 @@ glabel func_80240B54_8EC974 /* 8ECAD8 80240CB8 1040002D */ beqz $v0, .L80240D70 /* 8ECADC 80240CBC AE820078 */ sw $v0, 0x78($s4) /* 8ECAE0 80240CC0 0C03C4EC */ jal func_800F13B0 -/* 8ECAE4 80240CC4 00000000 */ nop +/* 8ECAE4 80240CC4 00000000 */ nop /* 8ECAE8 80240CC8 8E820074 */ lw $v0, 0x74($s4) /* 8ECAEC 80240CCC 24420001 */ addiu $v0, $v0, 1 .L80240CD0: @@ -111,7 +111,7 @@ glabel func_80240B54_8EC974 /* 8ECAF8 80240CD8 14400026 */ bnez $v0, .L80240D74 /* 8ECAFC 80240CDC 0000102D */ daddu $v0, $zero, $zero /* 8ECB00 80240CE0 0C03C54E */ jal func_800F1538 -/* 8ECB04 80240CE4 00000000 */ nop +/* 8ECB04 80240CE4 00000000 */ nop /* 8ECB08 80240CE8 8E830078 */ lw $v1, 0x78($s4) /* 8ECB0C 80240CEC 240200FF */ addiu $v0, $zero, 0xff /* 8ECB10 80240CF0 14620005 */ bne $v1, $v0, .L80240D08 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240DA4_8ECBC4.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240DA4_8ECBC4.s index de11e47680..6c3b4213cb 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240DA4_8ECBC4.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240DA4_8ECBC4.s @@ -12,4 +12,4 @@ glabel func_80240DA4_8ECBC4 /* 8ECBE0 80240DC0 24020002 */ addiu $v0, $zero, 2 /* 8ECBE4 80240DC4 03E00008 */ jr $ra /* 8ECBE8 80240DC8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8ECBEC 80240DCC 00000000 */ nop +/* 8ECBEC 80240DCC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412E8_8ED108.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412E8_8ED108.s index c1e6b2123b..02567edada 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412E8_8ED108.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412E8_8ED108.s @@ -22,7 +22,7 @@ glabel func_802412E8_8ED108 /* 8ED14C 8024132C 0C04DF93 */ jal func_80137E4C /* 8ED150 80241330 24070091 */ addiu $a3, $zero, 0x91 /* 8ED154 80241334 44900000 */ mtc1 $s0, $f0 -/* 8ED158 80241338 00000000 */ nop +/* 8ED158 80241338 00000000 */ nop /* 8ED15C 8024133C 46800020 */ cvt.s.w $f0, $f0 /* 8ED160 80241340 44050000 */ mfc1 $a1, $f0 /* 8ED164 80241344 0C04DF62 */ jal func_80137D88 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241364_8ED184.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241364_8ED184.s index 2212c07f5a..b5168ddb56 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241364_8ED184.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241364_8ED184.s @@ -16,7 +16,7 @@ glabel func_80241364_8ED184 /* 8ED1B0 80241390 0C0B1EAF */ jal get_variable /* 8ED1B4 80241394 0040802D */ daddu $s0, $v0, $zero /* 8ED1B8 80241398 44820000 */ mtc1 $v0, $f0 -/* 8ED1BC 8024139C 00000000 */ nop +/* 8ED1BC 8024139C 00000000 */ nop /* 8ED1C0 802413A0 46800020 */ cvt.s.w $f0, $f0 /* 8ED1C4 802413A4 24020002 */ addiu $v0, $zero, 2 /* 8ED1C8 802413A8 00501804 */ sllv $v1, $s0, $v0 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241460_8ED280.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241460_8ED280.s index 42143b52b2..82e9d6428c 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241460_8ED280.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241460_8ED280.s @@ -12,7 +12,7 @@ glabel func_80241460_8ED280 /* 8ED29C 8024147C 80A30006 */ lb $v1, 6($a1) /* 8ED2A0 80241480 80A20005 */ lb $v0, 5($a1) /* 8ED2A4 80241484 14620007 */ bne $v1, $v0, .L802414A4 -/* 8ED2A8 80241488 00000000 */ nop +/* 8ED2A8 80241488 00000000 */ nop /* 8ED2AC 8024148C 80C2028E */ lb $v0, 0x28e($a2) /* 8ED2B0 80241490 84C30290 */ lh $v1, 0x290($a2) /* 8ED2B4 80241494 00021200 */ sll $v0, $v0, 8 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802415EC_8ED40C.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802415EC_8ED40C.s index 1cd724db1a..4bf59ba869 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802415EC_8ED40C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802415EC_8ED40C.s @@ -15,4 +15,4 @@ glabel func_802415EC_8ED40C .L80241614: /* 8ED434 80241614 03E00008 */ jr $ra /* 8ED438 80241618 24020002 */ addiu $v0, $zero, 2 -/* 8ED43C 8024161C 00000000 */ nop +/* 8ED43C 8024161C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241620_8ED440.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241620_8ED440.s index 9547f00c81..2002d4cfd8 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241620_8ED440.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241620_8ED440.s @@ -26,7 +26,7 @@ glabel func_80241620_8ED440 /* 8ED490 80241670 1440FFFA */ bnez $v0, .L8024165C /* 8ED494 80241674 24A50004 */ addiu $a1, $a1, 4 /* 8ED498 80241678 080905AF */ j .L802416BC -/* 8ED49C 8024167C 00000000 */ nop +/* 8ED49C 8024167C 00000000 */ nop .L80241680: /* 8ED4A0 80241680 0000182D */ daddu $v1, $zero, $zero /* 8ED4A4 80241684 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241738_8ED558.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241738_8ED558.s index 12fadf1e6d..0ee83e6b82 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241738_8ED558.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241738_8ED558.s @@ -12,12 +12,12 @@ glabel func_80241738_8ED558 /* 8ED574 80241754 3C050000 */ lui $a1, 0 /* 8ED578 80241758 24A501E4 */ addiu $a1, $a1, 0x1e4 /* 8ED57C 8024175C 0C048052 */ jal play_model_animation -/* 8ED580 80241760 00000000 */ nop +/* 8ED580 80241760 00000000 */ nop /* 8ED584 80241764 24020002 */ addiu $v0, $zero, 2 .L80241768: /* 8ED588 80241768 8FBF0010 */ lw $ra, 0x10($sp) /* 8ED58C 8024176C 03E00008 */ jr $ra /* 8ED590 80241770 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8ED594 80241774 00000000 */ nop -/* 8ED598 80241778 00000000 */ nop -/* 8ED59C 8024177C 00000000 */ nop +/* 8ED594 80241774 00000000 */ nop +/* 8ED598 80241778 00000000 */ nop +/* 8ED59C 8024177C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802417B4_8ED5D4.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802417B4_8ED5D4.s index 56e5b8ef59..dc80978139 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802417B4_8ED5D4.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802417B4_8ED5D4.s @@ -22,16 +22,16 @@ glabel func_802417B4_8ED5D4 /* 8ED614 802417F4 00021023 */ negu $v0, $v0 .L802417F8: /* 8ED618 802417F8 14400003 */ bnez $v0, .L80241808 -/* 8ED61C 802417FC 00000000 */ nop +/* 8ED61C 802417FC 00000000 */ nop /* 8ED620 80241800 50E00017 */ beql $a3, $zero, .L80241860 /* 8ED624 80241804 0000102D */ daddu $v0, $zero, $zero .L80241808: /* 8ED628 80241808 44822000 */ mtc1 $v0, $f4 -/* 8ED62C 8024180C 00000000 */ nop +/* 8ED62C 8024180C 00000000 */ nop /* 8ED630 80241810 46802120 */ cvt.s.w $f4, $f4 /* 8ED634 80241814 44062000 */ mfc1 $a2, $f4 /* 8ED638 80241818 44872000 */ mtc1 $a3, $f4 -/* 8ED63C 8024181C 00000000 */ nop +/* 8ED63C 8024181C 00000000 */ nop /* 8ED640 80241820 46802120 */ cvt.s.w $f4, $f4 /* 8ED644 80241824 44806000 */ mtc1 $zero, $f12 /* 8ED648 80241828 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_802417B4_8ED5D4 /* 8ED650 80241830 46006386 */ mov.s $f14, $f12 /* 8ED654 80241834 3C014270 */ lui $at, 0x4270 /* 8ED658 80241838 44811000 */ mtc1 $at, $f2 -/* 8ED65C 8024183C 00000000 */ nop +/* 8ED65C 8024183C 00000000 */ nop /* 8ED660 80241840 4602003C */ c.lt.s $f0, $f2 -/* 8ED664 80241844 00000000 */ nop +/* 8ED664 80241844 00000000 */ nop /* 8ED668 80241848 45000004 */ bc1f .L8024185C /* 8ED66C 8024184C 24020001 */ addiu $v0, $zero, 1 /* 8ED670 80241850 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241D1C_8EDB3C.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241D1C_8EDB3C.s index 7dcccf4530..87a6b22e3e 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241D1C_8EDB3C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241D1C_8EDB3C.s @@ -12,6 +12,6 @@ glabel func_80241D1C_8EDB3C /* 8EDB58 80241D38 24020002 */ addiu $v0, $zero, 2 /* 8EDB5C 80241D3C 03E00008 */ jr $ra /* 8EDB60 80241D40 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8EDB64 80241D44 00000000 */ nop -/* 8EDB68 80241D48 00000000 */ nop -/* 8EDB6C 80241D4C 00000000 */ nop +/* 8EDB64 80241D44 00000000 */ nop +/* 8EDB68 80241D48 00000000 */ nop +/* 8EDB6C 80241D4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D84_8EDBA4.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D84_8EDBA4.s index a07cf929e5..7ad38ca70e 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D84_8EDBA4.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D84_8EDBA4.s @@ -22,16 +22,16 @@ glabel func_80241D84_8EDBA4 /* 8EDBE4 80241DC4 00021023 */ negu $v0, $v0 .L80241DC8: /* 8EDBE8 80241DC8 14400003 */ bnez $v0, .L80241DD8 -/* 8EDBEC 80241DCC 00000000 */ nop +/* 8EDBEC 80241DCC 00000000 */ nop /* 8EDBF0 80241DD0 50E00017 */ beql $a3, $zero, .L80241E30 /* 8EDBF4 80241DD4 0000102D */ daddu $v0, $zero, $zero .L80241DD8: /* 8EDBF8 80241DD8 44822000 */ mtc1 $v0, $f4 -/* 8EDBFC 80241DDC 00000000 */ nop +/* 8EDBFC 80241DDC 00000000 */ nop /* 8EDC00 80241DE0 46802120 */ cvt.s.w $f4, $f4 /* 8EDC04 80241DE4 44062000 */ mfc1 $a2, $f4 /* 8EDC08 80241DE8 44872000 */ mtc1 $a3, $f4 -/* 8EDC0C 80241DEC 00000000 */ nop +/* 8EDC0C 80241DEC 00000000 */ nop /* 8EDC10 80241DF0 46802120 */ cvt.s.w $f4, $f4 /* 8EDC14 80241DF4 44806000 */ mtc1 $zero, $f12 /* 8EDC18 80241DF8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80241D84_8EDBA4 /* 8EDC20 80241E00 46006386 */ mov.s $f14, $f12 /* 8EDC24 80241E04 3C014270 */ lui $at, 0x4270 /* 8EDC28 80241E08 44811000 */ mtc1 $at, $f2 -/* 8EDC2C 80241E0C 00000000 */ nop +/* 8EDC2C 80241E0C 00000000 */ nop /* 8EDC30 80241E10 4602003C */ c.lt.s $f0, $f2 -/* 8EDC34 80241E14 00000000 */ nop +/* 8EDC34 80241E14 00000000 */ nop /* 8EDC38 80241E18 45000004 */ bc1f .L80241E2C /* 8EDC3C 80241E1C 24020001 */ addiu $v0, $zero, 1 /* 8EDC40 80241E20 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_802420EC_8EDF0C.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_802420EC_8EDF0C.s index ff8dc90e8d..4eed322ac3 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_802420EC_8EDF0C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_802420EC_8EDF0C.s @@ -13,7 +13,7 @@ glabel func_802420EC_8EDF0C /* 8EDF28 80242108 18400009 */ blez $v0, .L80242130 /* 8EDF2C 8024210C AC820074 */ sw $v0, 0x74($a0) /* 8EDF30 80242110 44820000 */ mtc1 $v0, $f0 -/* 8EDF34 80242114 00000000 */ nop +/* 8EDF34 80242114 00000000 */ nop /* 8EDF38 80242118 46800020 */ cvt.s.w $f0, $f0 /* 8EDF3C 8024211C 44050000 */ mfc1 $a1, $f0 /* 8EDF40 80242120 0C04DF62 */ jal func_80137D88 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_8024216C_8EDF8C.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_8024216C_8EDF8C.s index 028dd848d0..1023b7d74d 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_8024216C_8EDF8C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_8024216C_8EDF8C.s @@ -12,6 +12,6 @@ glabel func_8024216C_8EDF8C /* 8EDFA8 80242188 24020002 */ addiu $v0, $zero, 2 /* 8EDFAC 8024218C 03E00008 */ jr $ra /* 8EDFB0 80242190 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8EDFB4 80242194 00000000 */ nop -/* 8EDFB8 80242198 00000000 */ nop -/* 8EDFBC 8024219C 00000000 */ nop +/* 8EDFB4 80242194 00000000 */ nop +/* 8EDFB8 80242198 00000000 */ nop +/* 8EDFBC 8024219C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242870_8EE690.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242870_8EE690.s index 2a81d77c76..dfe8707663 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242870_8EE690.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242870_8EE690.s @@ -14,11 +14,12 @@ glabel func_80242870_8EE690 /* 8EE6B4 80242894 2C620005 */ sltiu $v0, $v1, 5 /* 8EE6B8 80242898 10400053 */ beqz $v0, .L802429E8 /* 8EE6BC 8024289C 00031080 */ sll $v0, $v1, 2 -/* 8EE6C0 802428A0 3C018025 */ lui $at, %hi(D_80253040) +/* 8EE6C0 802428A0 3C018025 */ lui $at, %hi(jtbl_80253040_8FEE60) /* 8EE6C4 802428A4 00220821 */ addu $at, $at, $v0 -/* 8EE6C8 802428A8 8C223040 */ lw $v0, %lo(D_80253040)($at) +/* 8EE6C8 802428A8 8C223040 */ lw $v0, %lo(jtbl_80253040_8FEE60)($at) /* 8EE6CC 802428AC 00400008 */ jr $v0 -/* 8EE6D0 802428B0 00000000 */ nop +/* 8EE6D0 802428B0 00000000 */ nop +glabel L802428B4_8EE6D4 /* 8EE6D4 802428B4 2404021C */ addiu $a0, $zero, 0x21c /* 8EE6D8 802428B8 0000282D */ daddu $a1, $zero, $zero /* 8EE6DC 802428BC 00A0302D */ daddu $a2, $a1, $zero @@ -29,6 +30,7 @@ glabel func_80242870_8EE690 /* 8EE6F0 802428D0 AE000004 */ sw $zero, 4($s0) /* 8EE6F4 802428D4 0C015478 */ jal func_800551E0 /* 8EE6F8 802428D8 A6020000 */ sh $v0, ($s0) +glabel L802428DC_8EE6FC /* 8EE6FC 802428DC 3C054200 */ lui $a1, 0x4200 /* 8EE700 802428E0 8E020004 */ lw $v0, 4($s0) /* 8EE704 802428E4 3C06437F */ lui $a2, 0x437f @@ -42,7 +44,7 @@ glabel func_80242870_8EE690 /* 8EE724 80242904 8E020004 */ lw $v0, 4($s0) /* 8EE728 80242908 4600008D */ trunc.w.s $f2, $f0 /* 8EE72C 8024290C 44031000 */ mfc1 $v1, $f2 -/* 8EE730 80242910 00000000 */ nop +/* 8EE730 80242910 00000000 */ nop /* 8EE734 80242914 A603001A */ sh $v1, 0x1a($s0) /* 8EE738 80242918 28420003 */ slti $v0, $v0, 3 /* 8EE73C 8024291C 14400032 */ bnez $v0, .L802429E8 @@ -53,6 +55,7 @@ glabel func_80242870_8EE690 /* 8EE750 80242930 A602001A */ sh $v0, 0x1a($s0) /* 8EE754 80242934 08090A7A */ j .L802429E8 /* 8EE758 80242938 A602001C */ sh $v0, 0x1c($s0) +glabel L8024293C_8EE75C /* 8EE75C 8024293C 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* 8EE760 80242940 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 8EE764 80242944 240200FF */ addiu $v0, $zero, 0xff @@ -67,7 +70,8 @@ glabel func_80242870_8EE690 /* 8EE784 80242964 96030000 */ lhu $v1, ($s0) /* 8EE788 80242968 24020003 */ addiu $v0, $zero, 3 /* 8EE78C 8024296C 1462001E */ bne $v1, $v0, .L802429E8 -/* 8EE790 80242970 00000000 */ nop +/* 8EE790 80242970 00000000 */ nop +glabel L80242974_8EE794 /* 8EE794 80242974 240400CA */ addiu $a0, $zero, 0xca /* 8EE798 80242978 0000282D */ daddu $a1, $zero, $zero /* 8EE79C 8024297C 00A0302D */ daddu $a2, $a1, $zero @@ -75,6 +79,7 @@ glabel func_80242870_8EE690 /* 8EE7A4 80242984 AE000004 */ sw $zero, 4($s0) /* 8EE7A8 80242988 0C015478 */ jal func_800551E0 /* 8EE7AC 8024298C A6020000 */ sh $v0, ($s0) +glabel L80242990_8EE7B0 /* 8EE7B0 80242990 0000202D */ daddu $a0, $zero, $zero /* 8EE7B4 80242994 8E020004 */ lw $v0, 4($s0) /* 8EE7B8 80242998 8603001C */ lh $v1, 0x1c($s0) @@ -82,7 +87,7 @@ glabel func_80242870_8EE690 /* 8EE7C0 802429A0 AE020004 */ sw $v0, 4($s0) /* 8EE7C4 802429A4 24020003 */ addiu $v0, $zero, 3 /* 8EE7C8 802429A8 44831000 */ mtc1 $v1, $f2 -/* 8EE7CC 802429AC 00000000 */ nop +/* 8EE7CC 802429AC 00000000 */ nop /* 8EE7D0 802429B0 468010A0 */ cvt.s.w $f2, $f2 /* 8EE7D4 802429B4 AFA20010 */ sw $v0, 0x10($sp) /* 8EE7D8 802429B8 8E070004 */ lw $a3, 4($s0) diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242B04_8EE924.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242B04_8EE924.s index 3aea5f40a2..eaaa4383bd 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242B04_8EE924.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242B04_8EE924.s @@ -25,7 +25,7 @@ glabel func_80242B04_8EE924 /* 8EE974 80242B54 0200302D */ daddu $a2, $s0, $zero /* 8EE978 80242B58 0C0B2026 */ jal set_variable /* 8EE97C 80242B5C AE020020 */ sw $v0, 0x20($s0) -/* 8EE980 80242B60 0C090A8F */ jal func_80242A3C_8EE85C +/* 8EE980 80242B60 0C090A8F */ jal D_80242A3C /* 8EE984 80242B64 0200202D */ daddu $a0, $s0, $zero .L80242B68: /* 8EE988 80242B68 8E300070 */ lw $s0, 0x70($s1) @@ -35,7 +35,7 @@ glabel func_80242B04_8EE924 /* 8EE998 80242B78 0000102D */ daddu $v0, $zero, $zero /* 8EE99C 80242B7C 8E040020 */ lw $a0, 0x20($s0) /* 8EE9A0 80242B80 0C048D70 */ jal func_801235C0 -/* 8EE9A4 80242B84 00000000 */ nop +/* 8EE9A4 80242B84 00000000 */ nop /* 8EE9A8 80242B88 0C00AB4B */ jal heap_free /* 8EE9AC 80242B8C 0200202D */ daddu $a0, $s0, $zero /* 8EE9B0 80242B90 24020001 */ addiu $v0, $zero, 1 @@ -45,5 +45,5 @@ glabel func_80242B04_8EE924 /* 8EE9BC 80242B9C 8FB00010 */ lw $s0, 0x10($sp) /* 8EE9C0 80242BA0 03E00008 */ jr $ra /* 8EE9C4 80242BA4 27BD0020 */ addiu $sp, $sp, 0x20 -/* 8EE9C8 80242BA8 00000000 */ nop -/* 8EE9CC 80242BAC 00000000 */ nop +/* 8EE9C8 80242BA8 00000000 */ nop +/* 8EE9CC 80242BAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE80/func_80240000_8FEE80.s b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE80/func_80240000_8FEE80.s index 058fe09b21..f011cc4309 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE80/func_80240000_8FEE80.s +++ b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE80/func_80240000_8FEE80.s @@ -4,5 +4,5 @@ glabel func_80240000_8FEE80 /* 8FEE80 80240000 03E00008 */ jr $ra /* 8FEE84 80240004 24020001 */ addiu $v0, $zero, 1 -/* 8FEE88 80240008 00000000 */ nop -/* 8FEE8C 8024000C 00000000 */ nop +/* 8FEE88 80240008 00000000 */ nop +/* 8FEE8C 8024000C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_802402C8_8FF148.s b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_802402C8_8FF148.s index 3ece9755ce..9f53ec1c40 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_802402C8_8FF148.s +++ b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_802402C8_8FF148.s @@ -7,4 +7,4 @@ glabel func_802402C8_8FF148 /* 8FF150 802402D0 AC220334 */ sw $v0, %lo(D_80240334)($at) /* 8FF154 802402D4 03E00008 */ jr $ra /* 8FF158 802402D8 24020002 */ addiu $v0, $zero, 2 -/* 8FF15C 802402DC 00000000 */ nop +/* 8FF15C 802402DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF670/func_80240000_8FF670.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF670/func_80240000_8FF670.s index f68f880f30..cda3d5c1df 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_22/8FF670/func_80240000_8FF670.s +++ b/asm/nonmatchings/world/area_kmr/kmr_22/8FF670/func_80240000_8FF670.s @@ -4,5 +4,5 @@ glabel func_80240000_8FF670 /* 8FF670 80240000 03E00008 */ jr $ra /* 8FF674 80240004 24020001 */ addiu $v0, $zero, 1 -/* 8FF678 80240008 00000000 */ nop -/* 8FF67C 8024000C 00000000 */ nop +/* 8FF678 80240008 00000000 */ nop +/* 8FF67C 8024000C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240010_8FF680.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240010_8FF680.s index 105bb2a931..991cb572bd 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240010_8FF680.s +++ b/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240010_8FF680.s @@ -14,7 +14,7 @@ glabel func_80240010_8FF680 /* 8FF6A4 80240034 24110026 */ addiu $s1, $zero, 0x26 .L80240038: /* 8FF6A8 80240038 10A00012 */ beqz $a1, .L80240084 -/* 8FF6AC 8024003C 00000000 */ nop +/* 8FF6AC 8024003C 00000000 */ nop /* 8FF6B0 80240040 3C013F80 */ lui $at, 0x3f80 /* 8FF6B4 80240044 4481A000 */ mtc1 $at, $f20 /* 8FF6B8 80240048 0C00AFB7 */ jal set_curtain_scale_goal @@ -52,7 +52,7 @@ glabel func_80240010_8FF680 /* 8FF72C 802400BC 3C038025 */ lui $v1, %hi(D_802483C0) /* 8FF730 802400C0 8C6383C0 */ lw $v1, %lo(D_802483C0)($v1) /* 8FF734 802400C4 44840000 */ mtc1 $a0, $f0 -/* 8FF738 802400C8 00000000 */ nop +/* 8FF738 802400C8 00000000 */ nop /* 8FF73C 802400CC 46800020 */ cvt.s.w $f0, $f0 /* 8FF740 802400D0 8C62000C */ lw $v0, 0xc($v1) /* 8FF744 802400D4 E4400004 */ swc1 $f0, 4($v0) @@ -60,7 +60,7 @@ glabel func_80240010_8FF680 /* 8FF74C 802400DC 3C038025 */ lui $v1, %hi(D_802483C4) /* 8FF750 802400E0 8C6383C4 */ lw $v1, %lo(D_802483C4)($v1) /* 8FF754 802400E4 44860000 */ mtc1 $a2, $f0 -/* 8FF758 802400E8 00000000 */ nop +/* 8FF758 802400E8 00000000 */ nop /* 8FF75C 802400EC 46800020 */ cvt.s.w $f0, $f0 /* 8FF760 802400F0 E4400008 */ swc1 $f0, 8($v0) /* 8FF764 802400F4 2862000A */ slti $v0, $v1, 0xa @@ -81,7 +81,7 @@ glabel func_80240010_8FF680 /* 8FF798 80240128 3C038025 */ lui $v1, %hi(D_802483C0) /* 8FF79C 8024012C 8C6383C0 */ lw $v1, %lo(D_802483C0)($v1) /* 8FF7A0 80240130 44840000 */ mtc1 $a0, $f0 -/* 8FF7A4 80240134 00000000 */ nop +/* 8FF7A4 80240134 00000000 */ nop /* 8FF7A8 80240138 46800020 */ cvt.s.w $f0, $f0 /* 8FF7AC 8024013C 8C62000C */ lw $v0, 0xc($v1) /* 8FF7B0 80240140 E4400010 */ swc1 $f0, 0x10($v0) @@ -89,7 +89,7 @@ glabel func_80240010_8FF680 /* 8FF7B8 80240148 3C038025 */ lui $v1, %hi(D_802483C4) /* 8FF7BC 8024014C 8C6383C4 */ lw $v1, %lo(D_802483C4)($v1) /* 8FF7C0 80240150 44860000 */ mtc1 $a2, $f0 -/* 8FF7C4 80240154 00000000 */ nop +/* 8FF7C4 80240154 00000000 */ nop /* 8FF7C8 80240158 46800020 */ cvt.s.w $f0, $f0 /* 8FF7CC 8024015C E4400014 */ swc1 $f0, 0x14($v0) /* 8FF7D0 80240160 28620014 */ slti $v0, $v1, 0x14 diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_802401E0_8FF850.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_802401E0_8FF850.s index e02246c876..a21c508025 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_802401E0_8FF850.s +++ b/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_802401E0_8FF850.s @@ -7,7 +7,7 @@ glabel func_802401E0_8FF850 /* 8FF858 802401E8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 8FF85C 802401EC AFBF0010 */ sw $ra, 0x10($sp) /* 8FF860 802401F0 0C00AFB7 */ jal set_curtain_scale_goal -/* 8FF864 802401F4 00000000 */ nop +/* 8FF864 802401F4 00000000 */ nop /* 8FF868 802401F8 8FBF0010 */ lw $ra, 0x10($sp) /* 8FF86C 802401FC 24020002 */ addiu $v0, $zero, 2 /* 8FF870 80240200 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240208_8FF878.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240208_8FF878.s index eb7375c07d..f55d68f4fb 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240208_8FF878.s +++ b/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240208_8FF878.s @@ -16,4 +16,4 @@ glabel func_80240208_8FF878 .L80240234: /* 8FF8A4 80240234 03E00008 */ jr $ra /* 8FF8A8 80240238 00A0102D */ daddu $v0, $a1, $zero -/* 8FF8AC 8024023C 00000000 */ nop +/* 8FF8AC 8024023C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240314_8FF984.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240314_8FF984.s index 176c6348b8..c546f9aaaa 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240314_8FF984.s +++ b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240314_8FF984.s @@ -48,15 +48,15 @@ glabel func_80240314_8FF984 /* 8FFA30 802403C0 00431804 */ sllv $v1, $v1, $v0 /* 8FFA34 802403C4 00832021 */ addu $a0, $a0, $v1 /* 8FFA38 802403C8 44940000 */ mtc1 $s4, $f0 -/* 8FFA3C 802403CC 00000000 */ nop +/* 8FFA3C 802403CC 00000000 */ nop /* 8FFA40 802403D0 46800020 */ cvt.s.w $f0, $f0 /* 8FFA44 802403D4 E4800000 */ swc1 $f0, ($a0) /* 8FFA48 802403D8 44910000 */ mtc1 $s1, $f0 -/* 8FFA4C 802403DC 00000000 */ nop +/* 8FFA4C 802403DC 00000000 */ nop /* 8FFA50 802403E0 46800020 */ cvt.s.w $f0, $f0 /* 8FFA54 802403E4 E4800004 */ swc1 $f0, 4($a0) /* 8FFA58 802403E8 44900000 */ mtc1 $s0, $f0 -/* 8FFA5C 802403EC 00000000 */ nop +/* 8FFA5C 802403EC 00000000 */ nop /* 8FFA60 802403F0 46800020 */ cvt.s.w $f0, $f0 /* 8FFA64 802403F4 E4800008 */ swc1 $f0, 8($a0) /* 8FFA68 802403F8 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240418_8FFA88.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240418_8FFA88.s index 92db2f0328..08ec52ab2f 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240418_8FFA88.s +++ b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240418_8FFA88.s @@ -43,7 +43,7 @@ glabel func_80240418_8FFA88 /* 8FFB20 802404B0 00529004 */ sllv $s2, $s2, $v0 /* 8FFB24 802404B4 00721821 */ addu $v1, $v1, $s2 /* 8FFB28 802404B8 44900000 */ mtc1 $s0, $f0 -/* 8FFB2C 802404BC 00000000 */ nop +/* 8FFB2C 802404BC 00000000 */ nop /* 8FFB30 802404C0 46800020 */ cvt.s.w $f0, $f0 /* 8FFB34 802404C4 E460006C */ swc1 $f0, 0x6c($v1) /* 8FFB38 802404C8 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240BA8_900218.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240BA8_900218.s index bb0edbf207..2b9d7414d2 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240BA8_900218.s +++ b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240BA8_900218.s @@ -24,14 +24,14 @@ glabel func_80240BA8_900218 /* 900264 80240BF4 12000009 */ beqz $s0, .L80240C1C /* 900268 80240BF8 00041840 */ sll $v1, $a0, 1 /* 90026C 80240BFC 0809033D */ j .L80240CF4 -/* 900270 80240C00 00000000 */ nop +/* 900270 80240C00 00000000 */ nop .L80240C04: /* 900274 80240C04 1202001F */ beq $s0, $v0, .L80240C84 /* 900278 80240C08 24020003 */ addiu $v0, $zero, 3 /* 90027C 80240C0C 1202002B */ beq $s0, $v0, .L80240CBC /* 900280 80240C10 3C068020 */ lui $a2, 0x8020 /* 900284 80240C14 0809033D */ j .L80240CF4 -/* 900288 80240C18 00000000 */ nop +/* 900288 80240C18 00000000 */ nop .L80240C1C: /* 90028C 80240C1C 3C028024 */ lui $v0, %hi(D_80241FE0) /* 900290 80240C20 24421FE0 */ addiu $v0, $v0, %lo(D_80241FE0) @@ -90,7 +90,7 @@ glabel func_80240BA8_900218 /* 900358 80240CE8 34C6A000 */ ori $a2, $a2, 0xa000 .L80240CEC: /* 90035C 80240CEC 0C00A5CF */ jal dma_copy -/* 900360 80240CF0 00000000 */ nop +/* 900360 80240CF0 00000000 */ nop .L80240CF4: /* 900364 80240CF4 8FBF0018 */ lw $ra, 0x18($sp) /* 900368 80240CF8 8FB10014 */ lw $s1, 0x14($sp) @@ -98,4 +98,4 @@ glabel func_80240BA8_900218 /* 900370 80240D00 24020002 */ addiu $v0, $zero, 2 /* 900374 80240D04 03E00008 */ jr $ra /* 900378 80240D08 27BD0020 */ addiu $sp, $sp, 0x20 -/* 90037C 80240D0C 00000000 */ nop +/* 90037C 80240D0C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A30/func_80240000_907A30.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A30/func_80240000_907A30.s index 7d5d75a18a..ebd75cbdb9 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_23/907A30/func_80240000_907A30.s +++ b/asm/nonmatchings/world/area_kmr/kmr_23/907A30/func_80240000_907A30.s @@ -4,5 +4,5 @@ glabel func_80240000_907A30 /* 907A30 80240000 03E00008 */ jr $ra /* 907A34 80240004 24020001 */ addiu $v0, $zero, 1 -/* 907A38 80240008 00000000 */ nop -/* 907A3C 8024000C 00000000 */ nop +/* 907A38 80240008 00000000 */ nop +/* 907A3C 8024000C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240010_907A40.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240010_907A40.s index 1a27325c88..0461747371 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240010_907A40.s +++ b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240010_907A40.s @@ -7,7 +7,7 @@ glabel func_80240010_907A40 /* 907A48 80240018 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 907A4C 8024001C AFBF0010 */ sw $ra, 0x10($sp) /* 907A50 80240020 0C00AFB7 */ jal set_curtain_scale_goal -/* 907A54 80240024 00000000 */ nop +/* 907A54 80240024 00000000 */ nop /* 907A58 80240028 0C00AFC1 */ jal set_curtain_draw_callback /* 907A5C 8024002C 0000202D */ daddu $a0, $zero, $zero /* 907A60 80240030 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240040_907A70.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240040_907A70.s index 5125f58c21..9b8e047ada 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240040_907A70.s +++ b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240040_907A70.s @@ -88,20 +88,20 @@ glabel func_80240040_907A70 /* 907BB8 80240188 0C0B1EAF */ jal get_variable /* 907BBC 8024018C E6400048 */ swc1 $f0, 0x48($s2) /* 907BC0 80240190 14400018 */ bnez $v0, .L802401F4 -/* 907BC4 80240194 00000000 */ nop +/* 907BC4 80240194 00000000 */ nop /* 907BC8 80240198 C6020010 */ lwc1 $f2, 0x10($s0) /* 907BCC 8024019C 3C0142B4 */ lui $at, 0x42b4 /* 907BD0 802401A0 44810000 */ mtc1 $at, $f0 -/* 907BD4 802401A4 00000000 */ nop +/* 907BD4 802401A4 00000000 */ nop /* 907BD8 802401A8 4602003C */ c.lt.s $f0, $f2 -/* 907BDC 802401AC 00000000 */ nop +/* 907BDC 802401AC 00000000 */ nop /* 907BE0 802401B0 45000008 */ bc1f .L802401D4 -/* 907BE4 802401B4 00000000 */ nop +/* 907BE4 802401B4 00000000 */ nop /* 907BE8 802401B8 3C014387 */ lui $at, 0x4387 /* 907BEC 802401BC 44810000 */ mtc1 $at, $f0 -/* 907BF0 802401C0 00000000 */ nop +/* 907BF0 802401C0 00000000 */ nop /* 907BF4 802401C4 4600103C */ c.lt.s $f2, $f0 -/* 907BF8 802401C8 00000000 */ nop +/* 907BF8 802401C8 00000000 */ nop /* 907BFC 802401CC 45030001 */ bc1tl .L802401D4 /* 907C00 802401D0 24110001 */ addiu $s1, $zero, 1 .L802401D4: @@ -116,7 +116,7 @@ glabel func_80240040_907A70 .L802401F4: /* 907C24 802401F4 8E020028 */ lw $v0, 0x28($s0) /* 907C28 802401F8 10400016 */ beqz $v0, .L80240254 -/* 907C2C 802401FC 00000000 */ nop +/* 907C2C 802401FC 00000000 */ nop /* 907C30 80240200 8C42000C */ lw $v0, 0xc($v0) /* 907C34 80240204 C6000010 */ lwc1 $f0, 0x10($s0) /* 907C38 80240208 3C014000 */ lui $at, 0x4000 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240300_907D30.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240300_907D30.s index 08b703edf3..b2f6c327b0 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240300_907D30.s +++ b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240300_907D30.s @@ -19,7 +19,7 @@ glabel func_80240300_907D30 /* 907D68 80240338 0220202D */ daddu $a0, $s1, $zero /* 907D6C 8024033C C6200074 */ lwc1 $f0, 0x74($s1) /* 907D70 80240340 44821000 */ mtc1 $v0, $f2 -/* 907D74 80240344 00000000 */ nop +/* 907D74 80240344 00000000 */ nop /* 907D78 80240348 468010A0 */ cvt.s.w $f2, $f2 /* 907D7C 8024034C AE220078 */ sw $v0, 0x78($s1) /* 907D80 80240350 AE200070 */ sw $zero, 0x70($s1) diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240528_907F58.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240528_907F58.s index 23905ef472..ef1d76fe80 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240528_907F58.s +++ b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240528_907F58.s @@ -19,7 +19,7 @@ glabel func_80240528_907F58 /* 907F90 80240560 0C0B1EAF */ jal get_variable /* 907F94 80240564 0040982D */ daddu $s3, $v0, $zero /* 907F98 80240568 12000006 */ beqz $s0, .L80240584 -/* 907F9C 8024056C 00000000 */ nop +/* 907F9C 8024056C 00000000 */ nop /* 907FA0 80240570 AE200070 */ sw $zero, 0x70($s1) /* 907FA4 80240574 8E450000 */ lw $a1, ($s2) /* 907FA8 80240578 0C0B1EAF */ jal get_variable @@ -35,9 +35,9 @@ glabel func_80240528_907F58 /* 907FCC 8024059C 0000282D */ daddu $a1, $zero, $zero /* 907FD0 802405A0 3C014F00 */ lui $at, 0x4f00 /* 907FD4 802405A4 44811000 */ mtc1 $at, $f2 -/* 907FD8 802405A8 00000000 */ nop +/* 907FD8 802405A8 00000000 */ nop /* 907FDC 802405AC 4600103E */ c.le.s $f2, $f0 -/* 907FE0 802405B0 00000000 */ nop +/* 907FE0 802405B0 00000000 */ nop /* 907FE4 802405B4 45010005 */ bc1t .L802405CC /* 907FE8 802405B8 266400AC */ addiu $a0, $s3, 0xac /* 907FEC 802405BC 4600010D */ trunc.w.s $f4, $f0 @@ -49,7 +49,7 @@ glabel func_80240528_907F58 /* 908000 802405D0 3C028000 */ lui $v0, 0x8000 /* 908004 802405D4 4600010D */ trunc.w.s $f4, $f0 /* 908008 802405D8 44032000 */ mfc1 $v1, $f4 -/* 90800C 802405DC 00000000 */ nop +/* 90800C 802405DC 00000000 */ nop /* 908010 802405E0 00621825 */ or $v1, $v1, $v0 /* 908014 802405E4 A0830000 */ sb $v1, ($a0) .L802405E8: diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_8024061C_90804C.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_8024061C_90804C.s index 2cedab00f8..ce6a61139b 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_8024061C_90804C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_8024061C_90804C.s @@ -25,12 +25,12 @@ glabel func_8024061C_90804C /* 908098 80240668 10600007 */ beqz $v1, .L80240688 /* 90809C 8024066C 0000102D */ daddu $v0, $zero, $zero /* 9080A0 80240670 080901E8 */ j .L802407A0 -/* 9080A4 80240674 00000000 */ nop +/* 9080A4 80240674 00000000 */ nop .L80240678: /* 9080A8 80240678 10620033 */ beq $v1, $v0, .L80240748 /* 9080AC 8024067C 0000102D */ daddu $v0, $zero, $zero /* 9080B0 80240680 080901E8 */ j .L802407A0 -/* 9080B4 80240684 00000000 */ nop +/* 9080B4 80240684 00000000 */ nop .L80240688: /* 9080B8 80240688 0000202D */ daddu $a0, $zero, $zero /* 9080BC 8024068C 240500D0 */ addiu $a1, $zero, 0xd0 @@ -39,7 +39,7 @@ glabel func_8024061C_90804C /* 9080C8 80240698 00A0382D */ daddu $a3, $a1, $zero /* 9080CC 8024069C 86220024 */ lh $v0, 0x24($s1) /* 9080D0 802406A0 44820000 */ mtc1 $v0, $f0 -/* 9080D4 802406A4 00000000 */ nop +/* 9080D4 802406A4 00000000 */ nop /* 9080D8 802406A8 46800020 */ cvt.s.w $f0, $f0 /* 9080DC 802406AC 44050000 */ mfc1 $a1, $f0 /* 9080E0 802406B0 0C04DF62 */ jal func_80137D88 @@ -85,7 +85,7 @@ glabel func_8024061C_90804C .L80240748: /* 908178 80240748 86220024 */ lh $v0, 0x24($s1) /* 90817C 8024074C 44820000 */ mtc1 $v0, $f0 -/* 908180 80240750 00000000 */ nop +/* 908180 80240750 00000000 */ nop /* 908184 80240754 46800020 */ cvt.s.w $f0, $f0 /* 908188 80240758 44050000 */ mfc1 $a1, $f0 /* 90818C 8024075C 0C04DF62 */ jal func_80137D88 @@ -97,7 +97,7 @@ glabel func_8024061C_90804C /* 9081A4 80240774 3C013F80 */ lui $at, 0x3f80 /* 9081A8 80240778 44816000 */ mtc1 $at, $f12 /* 9081AC 8024077C 0C00AFB7 */ jal set_curtain_scale_goal -/* 9081B0 80240780 00000000 */ nop +/* 9081B0 80240780 00000000 */ nop /* 9081B4 80240784 080901E8 */ j .L802407A0 /* 9081B8 80240788 24020001 */ addiu $v0, $zero, 1 .L8024078C: diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_8024088C_9082BC.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_8024088C_9082BC.s index 22efd931e1..ae246fb099 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_8024088C_9082BC.s +++ b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_8024088C_9082BC.s @@ -72,7 +72,7 @@ glabel func_8024088C_9082BC /* 9083C4 80240994 44032000 */ mfc1 $v1, $f4 /* 9083C8 80240998 8C42000C */ lw $v0, 0xc($v0) /* 9083CC 8024099C 44831000 */ mtc1 $v1, $f2 -/* 9083D0 802409A0 00000000 */ nop +/* 9083D0 802409A0 00000000 */ nop /* 9083D4 802409A4 468010A0 */ cvt.s.w $f2, $f2 /* 9083D8 802409A8 E4420008 */ swc1 $f2, 8($v0) /* 9083DC 802409AC 8E62002C */ lw $v0, 0x2c($s3) diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240A00_908430.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240A00_908430.s index 8e5abc6484..82c221d950 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240A00_908430.s +++ b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240A00_908430.s @@ -47,7 +47,7 @@ glabel func_80240A00_908430 /* 9084D4 80240AA4 00021043 */ sra $v0, $v0, 1 /* 9084D8 80240AA8 24420008 */ addiu $v0, $v0, 8 /* 9084DC 80240AAC 44822000 */ mtc1 $v0, $f4 -/* 9084E0 80240AB0 00000000 */ nop +/* 9084E0 80240AB0 00000000 */ nop /* 9084E4 80240AB4 46802120 */ cvt.s.w $f4, $f4 /* 9084E8 80240AB8 4405A000 */ mfc1 $a1, $f20 /* 9084EC 80240ABC 8E470070 */ lw $a3, 0x70($s2) @@ -60,7 +60,7 @@ glabel func_80240A00_908430 /* 908508 80240AD8 00431021 */ addu $v0, $v0, $v1 /* 90850C 80240ADC 00021043 */ sra $v0, $v0, 1 /* 908510 80240AE0 44822000 */ mtc1 $v0, $f4 -/* 908514 80240AE4 00000000 */ nop +/* 908514 80240AE4 00000000 */ nop /* 908518 80240AE8 46802120 */ cvt.s.w $f4, $f4 /* 90851C 80240AEC 8E43007C */ lw $v1, 0x7c($s2) /* 908520 80240AF0 44062000 */ mfc1 $a2, $f4 @@ -75,7 +75,7 @@ glabel func_80240A00_908430 /* 908544 80240B14 00501023 */ subu $v0, $v0, $s0 /* 908548 80240B18 8C63000C */ lw $v1, 0xc($v1) /* 90854C 80240B1C 44821000 */ mtc1 $v0, $f2 -/* 908550 80240B20 00000000 */ nop +/* 908550 80240B20 00000000 */ nop /* 908554 80240B24 468010A0 */ cvt.s.w $f2, $f2 /* 908558 80240B28 E4620004 */ swc1 $f2, 4($v1) /* 90855C 80240B2C 8E62002C */ lw $v0, 0x2c($s3) @@ -90,7 +90,7 @@ glabel func_80240A00_908430 /* 908580 80240B50 00441021 */ addu $v0, $v0, $a0 /* 908584 80240B54 8C63000C */ lw $v1, 0xc($v1) /* 908588 80240B58 44820000 */ mtc1 $v0, $f0 -/* 90858C 80240B5C 00000000 */ nop +/* 90858C 80240B5C 00000000 */ nop /* 908590 80240B60 46800020 */ cvt.s.w $f0, $f0 /* 908594 80240B64 E4600010 */ swc1 $f0, 0x10($v1) /* 908598 80240B68 8E62002C */ lw $v0, 0x2c($s3) diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240DA4_9087D4.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240DA4_9087D4.s index 368836dd72..19291600a1 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240DA4_9087D4.s +++ b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240DA4_9087D4.s @@ -18,16 +18,18 @@ glabel func_80240DA4_9087D4 /* 908808 80240DD8 1040003F */ beqz $v0, .L80240ED8 /* 90880C 80240DDC 24110046 */ addiu $s1, $zero, 0x46 /* 908810 80240DE0 00031080 */ sll $v0, $v1, 2 -/* 908814 80240DE4 3C018024 */ lui $at, %hi(D_802437F0) +/* 908814 80240DE4 3C018024 */ lui $at, %hi(jtbl_802437F0_90B220) /* 908818 80240DE8 00220821 */ addu $at, $at, $v0 -/* 90881C 80240DEC 8C2237F0 */ lw $v0, %lo(D_802437F0)($at) +/* 90881C 80240DEC 8C2237F0 */ lw $v0, %lo(jtbl_802437F0_90B220)($at) /* 908820 80240DF0 00400008 */ jr $v0 /* 908824 80240DF4 00000000 */ nop +glabel L80240DF8_908828 /* 908828 80240DF8 8482001E */ lh $v0, 0x1e($a0) /* 90882C 80240DFC 10400036 */ beqz $v0, .L80240ED8 /* 908830 80240E00 24020001 */ addiu $v0, $zero, 1 /* 908834 80240E04 080903B4 */ j .L80240ED0 /* 908838 80240E08 00000000 */ nop +glabel L80240E0C_90883C /* 90883C 80240E0C 3C048024 */ lui $a0, %hi(D_802417CC) /* 908840 80240E10 248417CC */ addiu $a0, $a0, %lo(D_802417CC) /* 908844 80240E14 3C058024 */ lui $a1, %hi(D_802417D0) @@ -54,11 +56,13 @@ glabel func_80240DA4_9087D4 /* 908890 80240E60 24020002 */ addiu $v0, $zero, 2 /* 908894 80240E64 080903B4 */ j .L80240ED0 /* 908898 80240E68 00000000 */ nop +glabel L80240E6C_90889C /* 90889C 80240E6C 8482001E */ lh $v0, 0x1e($a0) /* 9088A0 80240E70 14400019 */ bnez $v0, .L80240ED8 /* 9088A4 80240E74 24020003 */ addiu $v0, $zero, 3 /* 9088A8 80240E78 080903B4 */ j .L80240ED0 /* 9088AC 80240E7C 00000000 */ nop +glabel L80240E80_9088B0 /* 9088B0 80240E80 3C048024 */ lui $a0, %hi(D_802417CC) /* 9088B4 80240E84 248417CC */ addiu $a0, $a0, %lo(D_802417CC) /* 9088B8 80240E88 3C058024 */ lui $a1, %hi(D_802417D0) @@ -85,6 +89,7 @@ glabel func_80240DA4_9087D4 /* 908900 80240ED0 3C018024 */ lui $at, %hi(D_802417C8) /* 908904 80240ED4 AC2217C8 */ sw $v0, %lo(D_802417C8)($at) .L80240ED8: +glabel L80240ED8_908908 /* 908908 80240ED8 3C028024 */ lui $v0, %hi(D_802417CC) /* 90890C 80240EDC 8C4217CC */ lw $v0, %lo(D_802417CC)($v0) /* 908910 80240EE0 10400074 */ beqz $v0, .L802410B4 diff --git a/asm/nonmatchings/world/area_kmr/kmr_24/90B240/func_80240000_90B240.s b/asm/nonmatchings/world/area_kmr/kmr_24/90B240/func_80240000_90B240.s index df3b1d3df4..cba05016a1 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_24/90B240/func_80240000_90B240.s +++ b/asm/nonmatchings/world/area_kmr/kmr_24/90B240/func_80240000_90B240.s @@ -4,5 +4,5 @@ glabel func_80240000_90B240 /* 90B240 80240000 03E00008 */ jr $ra /* 90B244 80240004 24020001 */ addiu $v0, $zero, 1 -/* 90B248 80240008 00000000 */ nop -/* 90B24C 8024000C 00000000 */ nop +/* 90B248 80240008 00000000 */ nop +/* 90B24C 8024000C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_24/90B250/func_80240074_90B2B4.s b/asm/nonmatchings/world/area_kmr/kmr_24/90B250/func_80240074_90B2B4.s index 8d0188c8c5..801fffe76c 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_24/90B250/func_80240074_90B2B4.s +++ b/asm/nonmatchings/world/area_kmr/kmr_24/90B250/func_80240074_90B2B4.s @@ -40,4 +40,4 @@ glabel func_80240074_90B2B4 /* 90B340 80240100 24020002 */ addiu $v0, $zero, 2 /* 90B344 80240104 03E00008 */ jr $ra /* 90B348 80240108 27BD0030 */ addiu $sp, $sp, 0x30 -/* 90B34C 8024010C 00000000 */ nop +/* 90B34C 8024010C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_01/A46F60/func_80240000_A46F60.s b/asm/nonmatchings/world/area_kpa/kpa_01/A46F60/func_80240000_A46F60.s index f75d6c2d7a..fa0b451c25 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_01/A46F60/func_80240000_A46F60.s +++ b/asm/nonmatchings/world/area_kpa/kpa_01/A46F60/func_80240000_A46F60.s @@ -22,7 +22,7 @@ glabel func_80240000_A46F60 /* A46FA0 80240040 C460002C */ lwc1 $f0, 0x2c($v1) /* A46FA4 80240044 3C014100 */ lui $at, 0x4100 /* A46FA8 80240048 44811000 */ mtc1 $at, $f2 -/* A46FAC 8024004C 00000000 */ nop +/* A46FAC 8024004C 00000000 */ nop /* A46FB0 80240050 46020000 */ add.s $f0, $f0, $f2 /* A46FB4 80240054 C4620030 */ lwc1 $f2, 0x30($v1) /* A46FB8 80240058 C4640028 */ lwc1 $f4, 0x28($v1) @@ -40,7 +40,7 @@ glabel func_80240000_A46F60 /* A46FE8 80240088 24020006 */ addiu $v0, $zero, 6 /* A46FEC 8024008C 82230012 */ lb $v1, 0x12($s1) /* A46FF0 80240090 14620022 */ bne $v1, $v0, .L8024011C -/* A46FF4 80240094 00000000 */ nop +/* A46FF4 80240094 00000000 */ nop /* A46FF8 80240098 8E020074 */ lw $v0, 0x74($s0) /* A46FFC 8024009C 14400004 */ bnez $v0, .L802400B0 /* A47000 802400A0 24020001 */ addiu $v0, $zero, 1 @@ -62,7 +62,7 @@ glabel func_80240000_A46F60 /* A47038 802400D8 240200FF */ addiu $v0, $zero, 0xff /* A4703C 802400DC 8E020074 */ lw $v0, 0x74($s0) /* A47040 802400E0 10400007 */ beqz $v0, .L80240100 -/* A47044 802400E4 00000000 */ nop +/* A47044 802400E4 00000000 */ nop /* A47048 802400E8 8E020070 */ lw $v0, 0x70($s0) /* A4704C 802400EC 284200FF */ slti $v0, $v0, 0xff /* A47050 802400F0 10400003 */ beqz $v0, .L80240100 @@ -94,5 +94,5 @@ glabel func_80240000_A46F60 /* A470AC 8024014C 0000102D */ daddu $v0, $zero, $zero /* A470B0 80240150 03E00008 */ jr $ra /* A470B4 80240154 27BD0028 */ addiu $sp, $sp, 0x28 -/* A470B8 80240158 00000000 */ nop -/* A470BC 8024015C 00000000 */ nop +/* A470B8 80240158 00000000 */ nop +/* A470BC 8024015C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802401DC_A4713C.s b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802401DC_A4713C.s index 21500015e0..06fa583a7c 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802401DC_A4713C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802401DC_A4713C.s @@ -21,11 +21,11 @@ glabel func_802401DC_A4713C /* A4717C 8024021C A602008E */ sh $v0, 0x8e($s0) /* A47180 80240220 00021400 */ sll $v0, $v0, 0x10 /* A47184 80240224 1C400033 */ bgtz $v0, .L802402F4 -/* A47188 80240228 00000000 */ nop +/* A47188 80240228 00000000 */ nop .L8024022C: /* A4718C 8024022C 8602008C */ lh $v0, 0x8c($s0) /* A47190 80240230 14400030 */ bnez $v0, .L802402F4 -/* A47194 80240234 00000000 */ nop +/* A47194 80240234 00000000 */ nop /* A47198 80240238 8E2200CC */ lw $v0, 0xcc($s1) /* A4719C 8024023C 8C420024 */ lw $v0, 0x24($v0) /* A471A0 80240240 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_802401DC_A4713C /* A471AC 8024024C 8E230088 */ lw $v1, 0x88($s1) /* A471B0 80240250 24020005 */ addiu $v0, $zero, 5 /* A471B4 80240254 10620005 */ beq $v1, $v0, .L8024026C -/* A471B8 80240258 00000000 */ nop +/* A471B8 80240258 00000000 */ nop /* A471BC 8024025C 10600003 */ beqz $v1, .L8024026C /* A471C0 80240260 24020001 */ addiu $v0, $zero, 1 /* A471C4 80240264 14620006 */ bne $v1, $v0, .L80240280 -/* A471C8 80240268 00000000 */ nop +/* A471C8 80240268 00000000 */ nop .L8024026C: /* A471CC 8024026C 8E220084 */ lw $v0, 0x84($s1) /* A471D0 80240270 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_802401DC_A4713C /* A47210 802402B0 46220000 */ add.d $f0, $f0, $f2 /* A47214 802402B4 4620010D */ trunc.w.d $f4, $f0 /* A47218 802402B8 44022000 */ mfc1 $v0, $f4 -/* A4721C 802402BC 00000000 */ nop +/* A4721C 802402BC 00000000 */ nop /* A47220 802402C0 A602008E */ sh $v0, 0x8e($s0) /* A47224 802402C4 00021400 */ sll $v0, $v0, 0x10 /* A47228 802402C8 8E230078 */ lw $v1, 0x78($s1) /* A4722C 802402CC 00021403 */ sra $v0, $v0, 0x10 /* A47230 802402D0 0043102A */ slt $v0, $v0, $v1 /* A47234 802402D4 10400003 */ beqz $v0, .L802402E4 -/* A47238 802402D8 00000000 */ nop +/* A47238 802402D8 00000000 */ nop /* A4723C 802402DC 9622007A */ lhu $v0, 0x7a($s1) /* A47240 802402E0 A602008E */ sh $v0, 0x8e($s0) .L802402E4: diff --git a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s index 937f6a1dae..6bd3dbc17b 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s +++ b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s @@ -279,15 +279,17 @@ glabel func_802404F4_A47454 /* A47840 802408E0 2C620015 */ sltiu $v0, $v1, 0x15 /* A47844 802408E4 10400009 */ beqz $v0, .L8024090C /* A47848 802408E8 00031080 */ sll $v0, $v1, 2 -/* A4784C 802408EC 3C018024 */ lui $at, %hi(D_80241608) +/* A4784C 802408EC 3C018024 */ lui $at, %hi(jtbl_80241608_A48568) /* A47850 802408F0 00220821 */ addu $at, $at, $v0 -/* A47854 802408F4 8C221608 */ lw $v0, %lo(D_80241608)($at) +/* A47854 802408F4 8C221608 */ lw $v0, %lo(jtbl_80241608_A48568)($at) /* A47858 802408F8 00400008 */ jr $v0 /* A4785C 802408FC 00000000 */ nop +glabel L80240900_A47860 /* A47860 80240900 8E420028 */ lw $v0, 0x28($s2) /* A47864 80240904 24420001 */ addiu $v0, $v0, 1 /* A47868 80240908 AE420028 */ sw $v0, 0x28($s2) .L8024090C: +glabel L8024090C_A4786C /* A4786C 8024090C 0000102D */ daddu $v0, $zero, $zero .L80240910: /* A47870 80240910 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A485C0/func_80240000_A485C0.s b/asm/nonmatchings/world/area_kpa/kpa_03/A485C0/func_80240000_A485C0.s index 1c251ecc17..1cfdf8c3ba 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A485C0/func_80240000_A485C0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A485C0/func_80240000_A485C0.s @@ -22,7 +22,7 @@ glabel func_80240000_A485C0 /* A48600 80240040 C460002C */ lwc1 $f0, 0x2c($v1) /* A48604 80240044 3C014100 */ lui $at, 0x4100 /* A48608 80240048 44811000 */ mtc1 $at, $f2 -/* A4860C 8024004C 00000000 */ nop +/* A4860C 8024004C 00000000 */ nop /* A48610 80240050 46020000 */ add.s $f0, $f0, $f2 /* A48614 80240054 C4620030 */ lwc1 $f2, 0x30($v1) /* A48618 80240058 C4640028 */ lwc1 $f4, 0x28($v1) @@ -40,7 +40,7 @@ glabel func_80240000_A485C0 /* A48648 80240088 24020006 */ addiu $v0, $zero, 6 /* A4864C 8024008C 82230012 */ lb $v1, 0x12($s1) /* A48650 80240090 14620022 */ bne $v1, $v0, .L8024011C -/* A48654 80240094 00000000 */ nop +/* A48654 80240094 00000000 */ nop /* A48658 80240098 8E020074 */ lw $v0, 0x74($s0) /* A4865C 8024009C 14400004 */ bnez $v0, .L802400B0 /* A48660 802400A0 24020001 */ addiu $v0, $zero, 1 @@ -62,7 +62,7 @@ glabel func_80240000_A485C0 /* A48698 802400D8 240200FF */ addiu $v0, $zero, 0xff /* A4869C 802400DC 8E020074 */ lw $v0, 0x74($s0) /* A486A0 802400E0 10400007 */ beqz $v0, .L80240100 -/* A486A4 802400E4 00000000 */ nop +/* A486A4 802400E4 00000000 */ nop /* A486A8 802400E8 8E020070 */ lw $v0, 0x70($s0) /* A486AC 802400EC 284200FF */ slti $v0, $v0, 0xff /* A486B0 802400F0 10400003 */ beqz $v0, .L80240100 @@ -94,5 +94,5 @@ glabel func_80240000_A485C0 /* A4870C 8024014C 0000102D */ daddu $v0, $zero, $zero /* A48710 80240150 03E00008 */ jr $ra /* A48714 80240154 27BD0028 */ addiu $sp, $sp, 0x28 -/* A48718 80240158 00000000 */ nop -/* A4871C 8024015C 00000000 */ nop +/* A48718 80240158 00000000 */ nop +/* A4871C 8024015C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802401DC_A4879C.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802401DC_A4879C.s index 6aff5b15a1..c7ca704c38 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802401DC_A4879C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802401DC_A4879C.s @@ -21,11 +21,11 @@ glabel func_802401DC_A4879C /* A487DC 8024021C A602008E */ sh $v0, 0x8e($s0) /* A487E0 80240220 00021400 */ sll $v0, $v0, 0x10 /* A487E4 80240224 1C400033 */ bgtz $v0, .L802402F4 -/* A487E8 80240228 00000000 */ nop +/* A487E8 80240228 00000000 */ nop .L8024022C: /* A487EC 8024022C 8602008C */ lh $v0, 0x8c($s0) /* A487F0 80240230 14400030 */ bnez $v0, .L802402F4 -/* A487F4 80240234 00000000 */ nop +/* A487F4 80240234 00000000 */ nop /* A487F8 80240238 8E2200CC */ lw $v0, 0xcc($s1) /* A487FC 8024023C 8C420024 */ lw $v0, 0x24($v0) /* A48800 80240240 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_802401DC_A4879C /* A4880C 8024024C 8E230088 */ lw $v1, 0x88($s1) /* A48810 80240250 24020005 */ addiu $v0, $zero, 5 /* A48814 80240254 10620005 */ beq $v1, $v0, .L8024026C -/* A48818 80240258 00000000 */ nop +/* A48818 80240258 00000000 */ nop /* A4881C 8024025C 10600003 */ beqz $v1, .L8024026C /* A48820 80240260 24020001 */ addiu $v0, $zero, 1 /* A48824 80240264 14620006 */ bne $v1, $v0, .L80240280 -/* A48828 80240268 00000000 */ nop +/* A48828 80240268 00000000 */ nop .L8024026C: /* A4882C 8024026C 8E220084 */ lw $v0, 0x84($s1) /* A48830 80240270 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_802401DC_A4879C /* A48870 802402B0 46220000 */ add.d $f0, $f0, $f2 /* A48874 802402B4 4620010D */ trunc.w.d $f4, $f0 /* A48878 802402B8 44022000 */ mfc1 $v0, $f4 -/* A4887C 802402BC 00000000 */ nop +/* A4887C 802402BC 00000000 */ nop /* A48880 802402C0 A602008E */ sh $v0, 0x8e($s0) /* A48884 802402C4 00021400 */ sll $v0, $v0, 0x10 /* A48888 802402C8 8E230078 */ lw $v1, 0x78($s1) /* A4888C 802402CC 00021403 */ sra $v0, $v0, 0x10 /* A48890 802402D0 0043102A */ slt $v0, $v0, $v1 /* A48894 802402D4 10400003 */ beqz $v0, .L802402E4 -/* A48898 802402D8 00000000 */ nop +/* A48898 802402D8 00000000 */ nop /* A4889C 802402DC 9622007A */ lhu $v0, 0x7a($s1) /* A488A0 802402E0 A602008E */ sh $v0, 0x8e($s0) .L802402E4: diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s index 298626ccf0..0eb5a1b399 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s @@ -279,15 +279,17 @@ glabel func_802404F4_A48AB4 /* A48EA0 802408E0 2C620015 */ sltiu $v0, $v1, 0x15 /* A48EA4 802408E4 10400009 */ beqz $v0, .L8024090C /* A48EA8 802408E8 00031080 */ sll $v0, $v1, 2 -/* A48EAC 802408EC 3C018024 */ lui $at, %hi(D_80243888) +/* A48EAC 802408EC 3C018024 */ lui $at, %hi(jtbl_80243888_A4BE48) /* A48EB0 802408F0 00220821 */ addu $at, $at, $v0 -/* A48EB4 802408F4 8C223888 */ lw $v0, %lo(D_80243888)($at) +/* A48EB4 802408F4 8C223888 */ lw $v0, %lo(jtbl_80243888_A4BE48)($at) /* A48EB8 802408F8 00400008 */ jr $v0 /* A48EBC 802408FC 00000000 */ nop +glabel L80240900_A48EC0 /* A48EC0 80240900 8E420028 */ lw $v0, 0x28($s2) /* A48EC4 80240904 24420001 */ addiu $v0, $v0, 1 /* A48EC8 80240908 AE420028 */ sw $v0, 0x28($s2) .L8024090C: +glabel L8024090C_A48ECC /* A48ECC 8024090C 0000102D */ daddu $v0, $zero, $zero .L80240910: /* A48ED0 80240910 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s index 292e94ade5..e7f5f72bbe 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s @@ -41,16 +41,16 @@ glabel func_80240A48_A49008 /* A49098 80240AD8 3C014387 */ lui $at, 0x4387 /* A4909C 80240ADC 4481A000 */ mtc1 $at, $f20 /* A490A0 80240AE0 0C00A70A */ jal get_clamped_angle_diff -/* A490A4 80240AE4 00000000 */ nop +/* A490A4 80240AE4 00000000 */ nop /* A490A8 80240AE8 0C00A6C9 */ jal clamp_angle /* A490AC 80240AEC 46000306 */ mov.s $f12, $f0 /* A490B0 80240AF0 3C018024 */ lui $at, %hi(D_802438E0) /* A490B4 80240AF4 D42238E0 */ ldc1 $f2, %lo(D_802438E0)($at) /* A490B8 80240AF8 46000021 */ cvt.d.s $f0, $f0 /* A490BC 80240AFC 4622003C */ c.lt.d $f0, $f2 -/* A490C0 80240B00 00000000 */ nop +/* A490C0 80240B00 00000000 */ nop /* A490C4 80240B04 45000003 */ bc1f .L80240B14 -/* A490C8 80240B08 00000000 */ nop +/* A490C8 80240B08 00000000 */ nop /* A490CC 80240B0C 3C0142B4 */ lui $at, 0x42b4 /* A490D0 80240B10 4481A000 */ mtc1 $at, $f20 .L80240B14: @@ -70,7 +70,7 @@ glabel func_80240A48_A49008 /* A49108 80240B48 D42238E8 */ ldc1 $f2, %lo(D_802438E8)($at) /* A4910C 80240B4C 46000021 */ cvt.d.s $f0, $f0 /* A49110 80240B50 4620103C */ c.lt.d $f2, $f0 -/* A49114 80240B54 00000000 */ nop +/* A49114 80240B54 00000000 */ nop /* A49118 80240B58 45010027 */ bc1t .L80240BF8 /* A4911C 80240B5C 2402FFFF */ addiu $v0, $zero, -1 /* A49120 80240B60 8E020000 */ lw $v0, ($s0) @@ -83,7 +83,7 @@ glabel func_80240A48_A49008 /* A4913C 80240B7C 46000005 */ abs.s $f0, $f0 /* A49140 80240B80 44060000 */ mfc1 $a2, $f0 /* A49144 80240B84 0C00A720 */ jal atan2 -/* A49148 80240B88 00000000 */ nop +/* A49148 80240B88 00000000 */ nop /* A4914C 80240B8C 3C018024 */ lui $at, %hi(func_802438F0_95EAF0) /* A49150 80240B90 D42238F0 */ ldc1 $f2, %lo(func_802438F0_95EAF0)($at) /* A49154 80240B94 46000021 */ cvt.d.s $f0, $f0 @@ -94,7 +94,7 @@ glabel func_80240A48_A49008 /* A49168 80240BA8 46000005 */ abs.s $f0, $f0 /* A4916C 80240BAC 46000021 */ cvt.d.s $f0, $f0 /* A49170 80240BB0 4620103C */ c.lt.d $f2, $f0 -/* A49174 80240BB4 00000000 */ nop +/* A49174 80240BB4 00000000 */ nop /* A49178 80240BB8 4501000F */ bc1t .L80240BF8 /* A4917C 80240BBC 2402FFFF */ addiu $v0, $zero, -1 /* A49180 80240BC0 3C038011 */ lui $v1, %hi(D_8010EBB3) diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18_A491D8.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18_A491D8.s index d9b9b0db05..8277d76b98 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18_A491D8.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18_A491D8.s @@ -30,7 +30,7 @@ glabel func_80240C18_A491D8 /* A4923C 80240C7C 8E4200B0 */ lw $v0, 0xb0($s2) /* A49240 80240C80 30420004 */ andi $v0, $v0, 4 /* A49244 80240C84 10400018 */ beqz $v0, .L80240CE8 -/* A49248 80240C88 00000000 */ nop +/* A49248 80240C88 00000000 */ nop .L80240C8C: /* A4924C 80240C8C 3C030024 */ lui $v1, 0x24 /* A49250 80240C90 34630102 */ ori $v1, $v1, 0x102 @@ -60,11 +60,12 @@ glabel func_80240C18_A491D8 /* A492AC 80240CEC 2C620005 */ sltiu $v0, $v1, 5 /* A492B0 80240CF0 10400101 */ beqz $v0, .L802410F8 /* A492B4 80240CF4 00031080 */ sll $v0, $v1, 2 -/* A492B8 80240CF8 3C018024 */ lui $at, %hi(D_80243900) +/* A492B8 80240CF8 3C018024 */ lui $at, %hi(jtbl_80243900_A4BEC0) /* A492BC 80240CFC 00220821 */ addu $at, $at, $v0 -/* A492C0 80240D00 8C223900 */ lw $v0, %lo(D_80243900)($at) +/* A492C0 80240D00 8C223900 */ lw $v0, %lo(jtbl_80243900_A4BEC0)($at) /* A492C4 80240D04 00400008 */ jr $v0 -/* A492C8 80240D08 00000000 */ nop +/* A492C8 80240D08 00000000 */ nop +glabel L80240D0C_A492CC /* A492CC 80240D0C 3C01C47A */ lui $at, 0xc47a /* A492D0 80240D10 44810000 */ mtc1 $at, $f0 /* A492D4 80240D14 24020014 */ addiu $v0, $zero, 0x14 @@ -77,6 +78,7 @@ glabel func_80240C18_A491D8 /* A492F0 80240D30 E620003C */ swc1 $f0, 0x3c($s1) /* A492F4 80240D34 AE40006C */ sw $zero, 0x6c($s2) /* A492F8 80240D38 AEC20070 */ sw $v0, 0x70($s6) +glabel L80240D3C_A492FC /* A492FC 80240D3C 8E50006C */ lw $s0, 0x6c($s2) /* A49300 80240D40 24020001 */ addiu $v0, $zero, 1 /* A49304 80240D44 160200EC */ bne $s0, $v0, .L802410F8 @@ -91,7 +93,7 @@ glabel func_80240C18_A491D8 /* A49328 80240D68 C6820034 */ lwc1 $f2, 0x34($s4) /* A4932C 80240D6C 3C014387 */ lui $at, 0x4387 /* A49330 80240D70 44810000 */ mtc1 $at, $f0 -/* A49334 80240D74 00000000 */ nop +/* A49334 80240D74 00000000 */ nop /* A49338 80240D78 46020001 */ sub.s $f0, $f0, $f2 /* A4933C 80240D7C C6480074 */ lwc1 $f8, 0x74($s2) /* A49340 80240D80 46804220 */ cvt.s.w $f8, $f8 @@ -118,20 +120,20 @@ glabel func_80240C18_A491D8 /* A49394 80240DD4 44811000 */ mtc1 $at, $f2 /* A49398 80240DD8 4600020D */ trunc.w.s $f8, $f0 /* A4939C 80240DDC 44024000 */ mfc1 $v0, $f8 -/* A493A0 80240DE0 00000000 */ nop +/* A493A0 80240DE0 00000000 */ nop /* A493A4 80240DE4 A6420010 */ sh $v0, 0x10($s2) /* A493A8 80240DE8 C620003C */ lwc1 $f0, 0x3c($s1) /* A493AC 80240DEC 3C13800F */ lui $s3, %hi(gPlayerStatusPtr) /* A493B0 80240DF0 26737B30 */ addiu $s3, $s3, %lo(gPlayerStatusPtr) /* A493B4 80240DF4 4600020D */ trunc.w.s $f8, $f0 /* A493B8 80240DF8 44024000 */ mfc1 $v0, $f8 -/* A493BC 80240DFC 00000000 */ nop +/* A493BC 80240DFC 00000000 */ nop /* A493C0 80240E00 A6420012 */ sh $v0, 0x12($s2) /* A493C4 80240E04 C6200040 */ lwc1 $f0, 0x40($s1) /* A493C8 80240E08 8E630000 */ lw $v1, ($s3) /* A493CC 80240E0C 4600020D */ trunc.w.s $f8, $f0 /* A493D0 80240E10 44024000 */ mfc1 $v0, $f8 -/* A493D4 80240E14 00000000 */ nop +/* A493D4 80240E14 00000000 */ nop /* A493D8 80240E18 A6420014 */ sh $v0, 0x14($s2) /* A493DC 80240E1C E6220018 */ swc1 $f2, 0x18($s1) /* A493E0 80240E20 C460002C */ lwc1 $f0, 0x2c($v1) @@ -147,7 +149,7 @@ glabel func_80240C18_A491D8 /* A49408 80240E48 44070000 */ mfc1 $a3, $f0 /* A4940C 80240E4C 44061000 */ mfc1 $a2, $f2 /* A49410 80240E50 0C00A720 */ jal atan2 -/* A49414 80240E54 00000000 */ nop +/* A49414 80240E54 00000000 */ nop /* A49418 80240E58 3C018024 */ lui $at, %hi(switch_order) /* A4941C 80240E5C D4223918 */ ldc1 $f2, %lo(switch_order)($at) /* A49420 80240E60 46000021 */ cvt.d.s $f0, $f0 @@ -155,13 +157,13 @@ glabel func_80240C18_A491D8 /* A49428 80240E68 46200020 */ cvt.s.d $f0, $f0 /* A4942C 80240E6C 4600020D */ trunc.w.s $f8, $f0 /* A49430 80240E70 44044000 */ mfc1 $a0, $f8 -/* A49434 80240E74 00000000 */ nop +/* A49434 80240E74 00000000 */ nop /* A49438 80240E78 00042400 */ sll $a0, $a0, 0x10 /* A4943C 80240E7C 0C00A4F5 */ jal cosine /* A49440 80240E80 00042403 */ sra $a0, $a0, 0x10 /* A49444 80240E84 C6220018 */ lwc1 $f2, 0x18($s1) /* A49448 80240E88 46020002 */ mul.s $f0, $f0, $f2 -/* A4944C 80240E8C 00000000 */ nop +/* A4944C 80240E8C 00000000 */ nop /* A49450 80240E90 C62C0038 */ lwc1 $f12, 0x38($s1) /* A49454 80240E94 C62E0040 */ lwc1 $f14, 0x40($s1) /* A49458 80240E98 8E620000 */ lw $v0, ($s3) @@ -187,7 +189,7 @@ glabel func_80240C18_A491D8 /* A494A8 80240EE8 46020003 */ div.s $f0, $f0, $f2 /* A494AC 80240EEC 4600020D */ trunc.w.s $f8, $f0 /* A494B0 80240EF0 44104000 */ mfc1 $s0, $f8 -/* A494B4 80240EF4 00000000 */ nop +/* A494B4 80240EF4 00000000 */ nop /* A494B8 80240EF8 5A000001 */ blezl $s0, .L80240F00 /* A494BC 80240EFC 24100001 */ addiu $s0, $zero, 1 .L80240F00: @@ -201,7 +203,7 @@ glabel func_80240C18_A491D8 /* A494DC 80240F1C 46020000 */ add.s $f0, $f0, $f2 /* A494E0 80240F20 3C014160 */ lui $at, 0x4160 /* A494E4 80240F24 44811000 */ mtc1 $at, $f2 -/* A494E8 80240F28 00000000 */ nop +/* A494E8 80240F28 00000000 */ nop /* A494EC 80240F2C 46022100 */ add.s $f4, $f4, $f2 /* A494F0 80240F30 46020000 */ add.s $f0, $f0, $f2 /* A494F4 80240F34 44062000 */ mfc1 $a2, $f4 @@ -217,6 +219,7 @@ glabel func_80240C18_A491D8 /* A4951C 80240F5C A630008E */ sh $s0, 0x8e($s1) /* A49520 80240F60 0809043E */ j .L802410F8 /* A49524 80240F64 AED50070 */ sw $s5, 0x70($s6) +glabel L80240F68_A49528 /* A49528 80240F68 9622008E */ lhu $v0, 0x8e($s1) /* A4952C 80240F6C 2442FFFF */ addiu $v0, $v0, -1 /* A49530 80240F70 A622008E */ sh $v0, 0x8e($s1) @@ -225,7 +228,7 @@ glabel func_80240C18_A491D8 /* A4953C 80240F7C 24150014 */ addiu $s5, $zero, 0x14 .L80240F80: /* A49540 80240F80 16A0000A */ bnez $s5, .L80240FAC -/* A49544 80240F84 00000000 */ nop +/* A49544 80240F84 00000000 */ nop /* A49548 80240F88 8E250018 */ lw $a1, 0x18($s1) /* A4954C 80240F8C 8E26000C */ lw $a2, 0xc($s1) /* A49550 80240F90 0C00EA95 */ jal npc_move_heading @@ -236,15 +239,16 @@ glabel func_80240C18_A491D8 /* A49564 80240FA4 0809043E */ j .L802410F8 /* A49568 80240FA8 E620003C */ swc1 $f0, 0x3c($s1) .L80240FAC: +glabel L80240FAC_A4956C /* A4956C 80240FAC 862200A8 */ lh $v0, 0xa8($s1) /* A49570 80240FB0 3C013FE0 */ lui $at, 0x3fe0 /* A49574 80240FB4 44810800 */ mtc1 $at, $f1 /* A49578 80240FB8 44800000 */ mtc1 $zero, $f0 /* A4957C 80240FBC 44821000 */ mtc1 $v0, $f2 -/* A49580 80240FC0 00000000 */ nop +/* A49580 80240FC0 00000000 */ nop /* A49584 80240FC4 468010A1 */ cvt.d.w $f2, $f2 /* A49588 80240FC8 46201082 */ mul.d $f2, $f2, $f0 -/* A4958C 80240FCC 00000000 */ nop +/* A4958C 80240FCC 00000000 */ nop /* A49590 80240FD0 C620003C */ lwc1 $f0, 0x3c($s1) /* A49594 80240FD4 AE20001C */ sw $zero, 0x1c($s1) /* A49598 80240FD8 46000021 */ cvt.d.s $f0, $f0 @@ -258,6 +262,7 @@ glabel func_80240C18_A491D8 /* A495B8 80240FF8 A620008E */ sh $zero, 0x8e($s1) /* A495BC 80240FFC 0809043E */ j .L802410F8 /* A495C0 80241000 AEC20070 */ sw $v0, 0x70($s6) +glabel L80241004_A495C4 /* A495C4 80241004 9622008E */ lhu $v0, 0x8e($s1) /* A495C8 80241008 24420001 */ addiu $v0, $v0, 1 /* A495CC 8024100C A622008E */ sh $v0, 0x8e($s1) @@ -271,17 +276,17 @@ glabel func_80240C18_A491D8 /* A495EC 8024102C 44810800 */ mtc1 $at, $f1 /* A495F0 80241030 44800000 */ mtc1 $zero, $f0 /* A495F4 80241034 44822000 */ mtc1 $v0, $f4 -/* A495F8 80241038 00000000 */ nop +/* A495F8 80241038 00000000 */ nop /* A495FC 8024103C 46802120 */ cvt.s.w $f4, $f4 /* A49600 80241040 46002121 */ cvt.d.s $f4, $f4 /* A49604 80241044 46202102 */ mul.d $f4, $f4, $f0 -/* A49608 80241048 00000000 */ nop +/* A49608 80241048 00000000 */ nop /* A4960C 8024104C 44821000 */ mtc1 $v0, $f2 -/* A49610 80241050 00000000 */ nop +/* A49610 80241050 00000000 */ nop /* A49614 80241054 468010A0 */ cvt.s.w $f2, $f2 /* A49618 80241058 460010A1 */ cvt.d.s $f2, $f2 /* A4961C 8024105C 46201082 */ mul.d $f2, $f2, $f0 -/* A49620 80241060 00000000 */ nop +/* A49620 80241060 00000000 */ nop /* A49624 80241064 C620003C */ lwc1 $f0, 0x3c($s1) /* A49628 80241068 3C01400C */ lui $at, 0x400c /* A4962C 8024106C 44813800 */ mtc1 $at, $f7 @@ -291,14 +296,14 @@ glabel func_80240C18_A491D8 /* A4963C 8024107C 3C014034 */ lui $at, 0x4034 /* A49640 80241080 44813800 */ mtc1 $at, $f7 /* A49644 80241084 44803000 */ mtc1 $zero, $f6 -/* A49648 80241088 00000000 */ nop +/* A49648 80241088 00000000 */ nop /* A4964C 8024108C 46262100 */ add.d $f4, $f4, $f6 /* A49650 80241090 46200020 */ cvt.s.d $f0, $f0 /* A49654 80241094 E620003C */ swc1 $f0, 0x3c($s1) /* A49658 80241098 46261080 */ add.d $f2, $f2, $f6 /* A4965C 8024109C 4620220D */ trunc.w.d $f8, $f4 /* A49660 802410A0 44024000 */ mfc1 $v0, $f8 -/* A49664 802410A4 00000000 */ nop +/* A49664 802410A4 00000000 */ nop /* A49668 802410A8 A62200A6 */ sh $v0, 0xa6($s1) /* A4966C 802410AC 4620120D */ trunc.w.d $f8, $f2 /* A49670 802410B0 44024000 */ mfc1 $v0, $f8 @@ -318,7 +323,7 @@ glabel func_80240C18_A491D8 /* A496A4 802410E4 E620003C */ swc1 $f0, 0x3c($s1) .L802410E8: /* A496A8 802410E8 14400003 */ bnez $v0, .L802410F8 -/* A496AC 802410EC 00000000 */ nop +/* A496AC 802410EC 00000000 */ nop /* A496B0 802410F0 AE40006C */ sw $zero, 0x6c($s2) /* A496B4 802410F4 AEC00070 */ sw $zero, 0x70($s6) .L802410F8: diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024119C_A4975C.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024119C_A4975C.s index 66e93131c0..9d450239e1 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024119C_A4975C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024119C_A4975C.s @@ -44,7 +44,7 @@ glabel func_8024119C_A4975C /* A497F8 80241238 A20200AC */ sb $v0, 0xac($s0) /* A497FC 8024123C 24020004 */ addiu $v0, $zero, 4 /* A49800 80241240 14620007 */ bne $v1, $v0, .L80241260 -/* A49804 80241244 00000000 */ nop +/* A49804 80241244 00000000 */ nop /* A49808 80241248 0C00EAFF */ jal disable_npc_shadow /* A4980C 8024124C 0200202D */ daddu $a0, $s0, $zero /* A49810 80241250 8E420000 */ lw $v0, ($s2) diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802412C8_A49888.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802412C8_A49888.s index 13627cf2f1..6169da9aa8 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802412C8_A49888.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802412C8_A49888.s @@ -21,10 +21,10 @@ glabel func_802412C8_A49888 /* A498C8 80241308 3C014334 */ lui $at, 0x4334 /* A498CC 8024130C 44811000 */ mtc1 $at, $f2 /* A498D0 80241310 44820000 */ mtc1 $v0, $f0 -/* A498D4 80241314 00000000 */ nop +/* A498D4 80241314 00000000 */ nop /* A498D8 80241318 46800020 */ cvt.s.w $f0, $f0 /* A498DC 8024131C 46020002 */ mul.s $f0, $f0, $f2 -/* A498E0 80241320 00000000 */ nop +/* A498E0 80241320 00000000 */ nop /* A498E4 80241324 3C013F4C */ lui $at, 0x3f4c /* A498E8 80241328 3421CCCD */ ori $at, $at, 0xcccd /* A498EC 8024132C 44812000 */ mtc1 $at, $f4 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024150C_A49ACC.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024150C_A49ACC.s index fa6db81c0c..c1df05b6e5 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024150C_A49ACC.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024150C_A49ACC.s @@ -35,11 +35,11 @@ glabel func_8024150C_A49ACC /* A49B38 80241578 3C018024 */ lui $at, %hi(func_80243920_8041A0) /* A49B3C 8024157C D4223920 */ ldc1 $f2, %lo(func_80243920_8041A0)($at) /* A49B40 80241580 44820000 */ mtc1 $v0, $f0 -/* A49B44 80241584 00000000 */ nop +/* A49B44 80241584 00000000 */ nop /* A49B48 80241588 46800020 */ cvt.s.w $f0, $f0 /* A49B4C 8024158C 46000021 */ cvt.d.s $f0, $f0 /* A49B50 80241590 46220002 */ mul.d $f0, $f0, $f2 -/* A49B54 80241594 00000000 */ nop +/* A49B54 80241594 00000000 */ nop /* A49B58 80241598 3C018024 */ lui $at, %hi(D_80243928) /* A49B5C 8024159C D4223928 */ ldc1 $f2, %lo(D_80243928)($at) /* A49B60 802415A0 46220000 */ add.d $f0, $f0, $f2 @@ -51,12 +51,12 @@ glabel func_8024150C_A49ACC /* A49B78 802415B8 E6000054 */ swc1 $f0, 0x54($s0) /* A49B7C 802415BC 46000021 */ cvt.d.s $f0, $f0 /* A49B80 802415C0 4620103C */ c.lt.d $f2, $f0 -/* A49B84 802415C4 00000000 */ nop +/* A49B84 802415C4 00000000 */ nop /* A49B88 802415C8 45000005 */ bc1f .L802415E0 /* A49B8C 802415CC 24030005 */ addiu $v1, $zero, 5 /* A49B90 802415D0 3C013F80 */ lui $at, 0x3f80 /* A49B94 802415D4 44810000 */ mtc1 $at, $f0 -/* A49B98 802415D8 00000000 */ nop +/* A49B98 802415D8 00000000 */ nop /* A49B9C 802415DC E6000054 */ swc1 $f0, 0x54($s0) .L802415E0: /* A49BA0 802415E0 C6000054 */ lwc1 $f0, 0x54($s0) @@ -79,7 +79,7 @@ glabel func_8024150C_A49ACC .L80241624: /* A49BE4 80241624 8E22006C */ lw $v0, 0x6c($s1) /* A49BE8 80241628 1440000E */ bnez $v0, .L80241664 -/* A49BEC 8024162C 00000000 */ nop +/* A49BEC 8024162C 00000000 */ nop /* A49BF0 80241630 8602008E */ lh $v0, 0x8e($s0) /* A49BF4 80241634 28420014 */ slti $v0, $v0, 0x14 /* A49BF8 80241638 14400017 */ bnez $v0, .L80241698 @@ -92,12 +92,12 @@ glabel func_8024150C_A49ACC /* A49C14 80241654 0C0B7A25 */ jal func_802DE894 /* A49C18 80241658 00A0382D */ daddu $a3, $a1, $zero /* A49C1C 8024165C 0809059D */ j .L80241674 -/* A49C20 80241660 00000000 */ nop +/* A49C20 80241660 00000000 */ nop .L80241664: /* A49C24 80241664 8602008E */ lh $v0, 0x8e($s0) /* A49C28 80241668 2842000A */ slti $v0, $v0, 0xa /* A49C2C 8024166C 1440000A */ bnez $v0, .L80241698 -/* A49C30 80241670 00000000 */ nop +/* A49C30 80241670 00000000 */ nop .L80241674: /* A49C34 80241674 3C013F80 */ lui $at, 0x3f80 /* A49C38 80241678 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416EC_A49CAC.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416EC_A49CAC.s index 9e4c25ccdf..61b759dc71 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416EC_A49CAC.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416EC_A49CAC.s @@ -36,7 +36,7 @@ glabel func_802416EC_A49CAC /* A49D28 80241768 3C01C1A0 */ lui $at, 0xc1a0 /* A49D2C 8024176C 44812000 */ mtc1 $at, $f4 /* A49D30 80241770 44824000 */ mtc1 $v0, $f8 -/* A49D34 80241774 00000000 */ nop +/* A49D34 80241774 00000000 */ nop /* A49D38 80241778 46804220 */ cvt.s.w $f8, $f8 /* A49D3C 8024177C 44074000 */ mfc1 $a3, $f8 /* A49D40 80241780 2402000C */ addiu $v0, $zero, 0xc diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802418AC_A49E6C.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802418AC_A49E6C.s index d792de5412..e7a274e484 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802418AC_A49E6C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802418AC_A49E6C.s @@ -16,7 +16,7 @@ glabel func_802418AC_A49E6C /* A49E98 802418D8 A482008E */ sh $v0, 0x8e($a0) /* A49E9C 802418DC 00021400 */ sll $v0, $v0, 0x10 /* A49EA0 802418E0 1C400008 */ bgtz $v0, .L80241904 -/* A49EA4 802418E4 00000000 */ nop +/* A49EA4 802418E4 00000000 */ nop /* A49EA8 802418E8 8E0200CC */ lw $v0, 0xcc($s0) /* A49EAC 802418EC 8C430024 */ lw $v1, 0x24($v0) /* A49EB0 802418F0 24020009 */ addiu $v0, $zero, 9 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241918_A49ED8.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241918_A49ED8.s index 4c3f259980..e22547ad87 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241918_A49ED8.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241918_A49ED8.s @@ -21,7 +21,7 @@ glabel func_80241918_A49ED8 /* A49F18 80241958 A602008E */ sh $v0, 0x8e($s0) /* A49F1C 8024195C 00021400 */ sll $v0, $v0, 0x10 /* A49F20 80241960 1C400032 */ bgtz $v0, .L80241A2C -/* A49F24 80241964 00000000 */ nop +/* A49F24 80241964 00000000 */ nop /* A49F28 80241968 0260202D */ daddu $a0, $s3, $zero /* A49F2C 8024196C 8E250024 */ lw $a1, 0x24($s1) /* A49F30 80241970 8E260028 */ lw $a2, 0x28($s1) @@ -43,7 +43,7 @@ glabel func_80241918_A49ED8 /* A49F70 802419B0 2402000C */ addiu $v0, $zero, 0xc /* A49F74 802419B4 AFA2001C */ sw $v0, 0x1c($sp) /* A49F78 802419B8 44833000 */ mtc1 $v1, $f6 -/* A49F7C 802419BC 00000000 */ nop +/* A49F7C 802419BC 00000000 */ nop /* A49F80 802419C0 468031A0 */ cvt.s.w $f6, $f6 /* A49F84 802419C4 44073000 */ mfc1 $a3, $f6 /* A49F88 802419C8 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241A4C_A4A00C.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241A4C_A4A00C.s index 409592ef0a..fc08254b99 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241A4C_A4A00C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241A4C_A4A00C.s @@ -16,7 +16,7 @@ glabel func_80241A4C_A4A00C /* A4A038 80241A78 A482008E */ sh $v0, 0x8e($a0) /* A4A03C 80241A7C 00021400 */ sll $v0, $v0, 0x10 /* A4A040 80241A80 1C400007 */ bgtz $v0, .L80241AA0 -/* A4A044 80241A84 00000000 */ nop +/* A4A044 80241A84 00000000 */ nop /* A4A048 80241A88 8E0200CC */ lw $v0, 0xcc($s0) /* A4A04C 80241A8C 8C430000 */ lw $v1, ($v0) /* A4A050 80241A90 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241AB4_A4A074.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241AB4_A4A074.s index a5aec9ea65..3f5fca8695 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241AB4_A4A074.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241AB4_A4A074.s @@ -46,7 +46,7 @@ glabel func_80241AB4_A4A074 /* A4A118 80241B58 8E2200B0 */ lw $v0, 0xb0($s1) /* A4A11C 80241B5C 30420004 */ andi $v0, $v0, 4 /* A4A120 80241B60 1040001E */ beqz $v0, .L80241BDC -/* A4A124 80241B64 00000000 */ nop +/* A4A124 80241B64 00000000 */ nop .L80241B68: /* A4A128 80241B68 8E430000 */ lw $v1, ($s2) /* A4A12C 80241B6C 2402F7FF */ addiu $v0, $zero, -0x801 @@ -83,11 +83,12 @@ glabel func_80241AB4_A4A074 /* A4A1A0 80241BE0 2C620019 */ sltiu $v0, $v1, 0x19 /* A4A1A4 80241BE4 10400044 */ beqz $v0, .L80241CF8 /* A4A1A8 80241BE8 00031080 */ sll $v0, $v1, 2 -/* A4A1AC 80241BEC 3C018024 */ lui $at, %hi(D_80243930) +/* A4A1AC 80241BEC 3C018024 */ lui $at, %hi(jtbl_80243930_A4BEF0) /* A4A1B0 80241BF0 00220821 */ addu $at, $at, $v0 -/* A4A1B4 80241BF4 8C223930 */ lw $v0, %lo(D_80243930)($at) +/* A4A1B4 80241BF4 8C223930 */ lw $v0, %lo(jtbl_80243930_A4BEF0)($at) /* A4A1B8 80241BF8 00400008 */ jr $v0 -/* A4A1BC 80241BFC 00000000 */ nop +/* A4A1BC 80241BFC 00000000 */ nop +glabel L80241C00_A4A1C0 /* A4A1C0 80241C00 02A0202D */ daddu $a0, $s5, $zero /* A4A1C4 80241C04 0260282D */ daddu $a1, $s3, $zero /* A4A1C8 80241C08 0C09044A */ jal func_80241128_A496E8 @@ -95,62 +96,73 @@ glabel func_80241AB4_A4A074 /* A4A1D0 80241C10 8EA30070 */ lw $v1, 0x70($s5) /* A4A1D4 80241C14 24020001 */ addiu $v0, $zero, 1 /* A4A1D8 80241C18 14620037 */ bne $v1, $v0, .L80241CF8 -/* A4A1DC 80241C1C 00000000 */ nop +/* A4A1DC 80241C1C 00000000 */ nop +glabel L80241C20_A4A1E0 /* A4A1E0 80241C20 02A0202D */ daddu $a0, $s5, $zero /* A4A1E4 80241C24 0260282D */ daddu $a1, $s3, $zero /* A4A1E8 80241C28 0C090467 */ jal func_8024119C_A4975C /* A4A1EC 80241C2C 0280302D */ daddu $a2, $s4, $zero /* A4A1F0 80241C30 0809073E */ j .L80241CF8 -/* A4A1F4 80241C34 00000000 */ nop +/* A4A1F4 80241C34 00000000 */ nop +glabel L80241C38_A4A1F8 /* A4A1F8 80241C38 02A0202D */ daddu $a0, $s5, $zero /* A4A1FC 80241C3C 0260282D */ daddu $a1, $s3, $zero /* A4A200 80241C40 0C0904B2 */ jal func_802412C8_A49888 /* A4A204 80241C44 0280302D */ daddu $a2, $s4, $zero +glabel L80241C48_A4A208 /* A4A208 80241C48 02A0202D */ daddu $a0, $s5, $zero /* A4A20C 80241C4C 0260282D */ daddu $a1, $s3, $zero /* A4A210 80241C50 0C0904DA */ jal func_80241368_A49928 /* A4A214 80241C54 0280302D */ daddu $a2, $s4, $zero /* A4A218 80241C58 0809073E */ j .L80241CF8 -/* A4A21C 80241C5C 00000000 */ nop +/* A4A21C 80241C5C 00000000 */ nop +glabel L80241C60_A4A220 /* A4A220 80241C60 02A0202D */ daddu $a0, $s5, $zero /* A4A224 80241C64 0260282D */ daddu $a1, $s3, $zero /* A4A228 80241C68 0C0904F3 */ jal func_802413CC_A4998C /* A4A22C 80241C6C 0280302D */ daddu $a2, $s4, $zero +glabel L80241C70_A4A230 /* A4A230 80241C70 02A0202D */ daddu $a0, $s5, $zero /* A4A234 80241C74 0260282D */ daddu $a1, $s3, $zero /* A4A238 80241C78 0C090543 */ jal func_8024150C_A49ACC /* A4A23C 80241C7C 0280302D */ daddu $a2, $s4, $zero /* A4A240 80241C80 0809073E */ j .L80241CF8 -/* A4A244 80241C84 00000000 */ nop +/* A4A244 80241C84 00000000 */ nop +glabel L80241C88_A4A248 /* A4A248 80241C88 02A0202D */ daddu $a0, $s5, $zero /* A4A24C 80241C8C 0260282D */ daddu $a1, $s3, $zero /* A4A250 80241C90 0C0905AC */ jal func_802416B0_A49C70 /* A4A254 80241C94 0280302D */ daddu $a2, $s4, $zero /* A4A258 80241C98 0809073E */ j .L80241CF8 -/* A4A25C 80241C9C 00000000 */ nop +/* A4A25C 80241C9C 00000000 */ nop +glabel L80241CA0_A4A260 /* A4A260 80241CA0 02A0202D */ daddu $a0, $s5, $zero /* A4A264 80241CA4 0260282D */ daddu $a1, $s3, $zero /* A4A268 80241CA8 0C0905BB */ jal func_802416EC_A49CAC /* A4A26C 80241CAC 0280302D */ daddu $a2, $s4, $zero /* A4A270 80241CB0 0809073E */ j .L80241CF8 -/* A4A274 80241CB4 00000000 */ nop +/* A4A274 80241CB4 00000000 */ nop +glabel L80241CB8_A4A278 /* A4A278 80241CB8 02A0202D */ daddu $a0, $s5, $zero /* A4A27C 80241CBC 0260282D */ daddu $a1, $s3, $zero /* A4A280 80241CC0 0C09062B */ jal func_802418AC_A49E6C /* A4A284 80241CC4 0280302D */ daddu $a2, $s4, $zero /* A4A288 80241CC8 0809073E */ j .L80241CF8 -/* A4A28C 80241CCC 00000000 */ nop +/* A4A28C 80241CCC 00000000 */ nop +glabel L80241CD0_A4A290 /* A4A290 80241CD0 02A0202D */ daddu $a0, $s5, $zero /* A4A294 80241CD4 0260282D */ daddu $a1, $s3, $zero /* A4A298 80241CD8 0C090646 */ jal func_80241918_A49ED8 /* A4A29C 80241CDC 0280302D */ daddu $a2, $s4, $zero /* A4A2A0 80241CE0 0809073E */ j .L80241CF8 -/* A4A2A4 80241CE4 00000000 */ nop +/* A4A2A4 80241CE4 00000000 */ nop +glabel L80241CE8_A4A2A8 /* A4A2A8 80241CE8 02A0202D */ daddu $a0, $s5, $zero /* A4A2AC 80241CEC 0260282D */ daddu $a1, $s3, $zero /* A4A2B0 80241CF0 0C090693 */ jal func_80241A4C_A4A00C /* A4A2B4 80241CF4 0280302D */ daddu $a2, $s4, $zero .L80241CF8: +glabel L80241CF8_A4A2B8 /* A4A2B8 80241CF8 8FBF0048 */ lw $ra, 0x48($sp) /* A4A2BC 80241CFC 8FB50044 */ lw $s5, 0x44($sp) /* A4A2C0 80241D00 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DFC_A4A3BC.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DFC_A4A3BC.s index 6faaedf653..d3c9ff0871 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DFC_A4A3BC.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DFC_A4A3BC.s @@ -12,7 +12,7 @@ glabel func_80241DFC_A4A3BC /* A4A3D8 80241E18 8E03006C */ lw $v1, 0x6c($s0) /* A4A3DC 80241E1C 24020002 */ addiu $v0, $zero, 2 /* A4A3E0 80241E20 14620003 */ bne $v1, $v0, .L80241E30 -/* A4A3E4 80241E24 00000000 */ nop +/* A4A3E4 80241E24 00000000 */ nop /* A4A3E8 80241E28 AC80001C */ sw $zero, 0x1c($a0) /* A4A3EC 80241E2C AC800018 */ sw $zero, 0x18($a0) .L80241E30: @@ -21,6 +21,6 @@ glabel func_80241DFC_A4A3BC /* A4A3F8 80241E38 24020002 */ addiu $v0, $zero, 2 /* A4A3FC 80241E3C 03E00008 */ jr $ra /* A4A400 80241E40 27BD0018 */ addiu $sp, $sp, 0x18 -/* A4A404 80241E44 00000000 */ nop -/* A4A408 80241E48 00000000 */ nop -/* A4A40C 80241E4C 00000000 */ nop +/* A4A404 80241E44 00000000 */ nop +/* A4A408 80241E48 00000000 */ nop +/* A4A40C 80241E4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_04/A4BF60/func_80240000_A4BF60.s b/asm/nonmatchings/world/area_kpa/kpa_04/A4BF60/func_80240000_A4BF60.s index 109fa32fcb..81c31079dd 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_04/A4BF60/func_80240000_A4BF60.s +++ b/asm/nonmatchings/world/area_kpa/kpa_04/A4BF60/func_80240000_A4BF60.s @@ -18,13 +18,13 @@ glabel func_80240000_A4BF60 /* A4BF94 80240034 24020014 */ addiu $v0, $zero, 0x14 /* A4BF98 80240038 808300B4 */ lb $v1, 0xb4($a0) /* A4BF9C 8024003C 10620006 */ beq $v1, $v0, .L80240058 -/* A4BFA0 80240040 00000000 */ nop +/* A4BFA0 80240040 00000000 */ nop .L80240044: /* A4BFA4 80240044 8C820014 */ lw $v0, 0x14($a0) /* A4BFA8 80240048 3C03FFFF */ lui $v1, 0xffff /* A4BFAC 8024004C 00431024 */ and $v0, $v0, $v1 /* A4BFB0 80240050 10400005 */ beqz $v0, .L80240068 -/* A4BFB4 80240054 00000000 */ nop +/* A4BFB4 80240054 00000000 */ nop .L80240058: /* A4BFB8 80240058 0C039769 */ jal set_action_state /* A4BFBC 8024005C 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_04/A4BF60/func_802400BC_A4C01C.s b/asm/nonmatchings/world/area_kpa/kpa_04/A4BF60/func_802400BC_A4C01C.s index c9f159fbdc..854f5f8427 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_04/A4BF60/func_802400BC_A4C01C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_04/A4BF60/func_802400BC_A4C01C.s @@ -9,7 +9,7 @@ glabel func_802400BC_A4C01C /* A4C02C 802400CC 3C108011 */ lui $s0, %hi(gPlayerStatus) /* A4C030 802400D0 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* A4C034 802400D4 14400005 */ bnez $v0, .L802400EC -/* A4C038 802400D8 00000000 */ nop +/* A4C038 802400D8 00000000 */ nop /* A4C03C 802400DC C4800084 */ lwc1 $f0, 0x84($a0) /* A4C040 802400E0 46800020 */ cvt.s.w $f0, $f0 /* A4C044 802400E4 0809003E */ j .L802400F8 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CA20/func_8024001C_A4CA3C.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CA20/func_8024001C_A4CA3C.s index 17cfc8e399..db5bc4f8a3 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CA20/func_8024001C_A4CA3C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CA20/func_8024001C_A4CA3C.s @@ -19,11 +19,11 @@ glabel func_8024001C_A4CA3C /* A4CA74 80240054 3C028016 */ lui $v0, %hi(gCollisionStatus+0x2) /* A4CA78 80240058 8442A552 */ lh $v0, %lo(gCollisionStatus+0x2)($v0) /* A4CA7C 8024005C 16020009 */ bne $s0, $v0, .L80240084 -/* A4CA80 80240060 00000000 */ nop +/* A4CA80 80240060 00000000 */ nop /* A4CA84 80240064 8E220084 */ lw $v0, 0x84($s1) /* A4CA88 80240068 00431021 */ addu $v0, $v0, $v1 /* A4CA8C 8024006C 44820000 */ mtc1 $v0, $f0 -/* A4CA90 80240070 00000000 */ nop +/* A4CA90 80240070 00000000 */ nop /* A4CA94 80240074 46800020 */ cvt.s.w $f0, $f0 /* A4CA98 80240078 3C028011 */ lui $v0, %hi(gPlayerStatus) /* A4CA9C 8024007C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) @@ -35,4 +35,4 @@ glabel func_8024001C_A4CA3C /* A4CAB0 80240090 24020002 */ addiu $v0, $zero, 2 /* A4CAB4 80240094 03E00008 */ jr $ra /* A4CAB8 80240098 27BD0020 */ addiu $sp, $sp, 0x20 -/* A4CABC 8024009C 00000000 */ nop +/* A4CABC 8024009C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802400A0_A4CAC0.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802400A0_A4CAC0.s index 687b0a8a7c..255ea964a3 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802400A0_A4CAC0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802400A0_A4CAC0.s @@ -41,16 +41,16 @@ glabel func_802400A0_A4CAC0 /* A4CB50 80240130 3C014387 */ lui $at, 0x4387 /* A4CB54 80240134 4481A000 */ mtc1 $at, $f20 /* A4CB58 80240138 0C00A70A */ jal get_clamped_angle_diff -/* A4CB5C 8024013C 00000000 */ nop +/* A4CB5C 8024013C 00000000 */ nop /* A4CB60 80240140 0C00A6C9 */ jal clamp_angle /* A4CB64 80240144 46000306 */ mov.s $f12, $f0 /* A4CB68 80240148 3C018024 */ lui $at, %hi(D_80242520) /* A4CB6C 8024014C D4222520 */ ldc1 $f2, %lo(D_80242520)($at) /* A4CB70 80240150 46000021 */ cvt.d.s $f0, $f0 /* A4CB74 80240154 4622003C */ c.lt.d $f0, $f2 -/* A4CB78 80240158 00000000 */ nop +/* A4CB78 80240158 00000000 */ nop /* A4CB7C 8024015C 45000003 */ bc1f .L8024016C -/* A4CB80 80240160 00000000 */ nop +/* A4CB80 80240160 00000000 */ nop /* A4CB84 80240164 3C0142B4 */ lui $at, 0x42b4 /* A4CB88 80240168 4481A000 */ mtc1 $at, $f20 .L8024016C: @@ -70,7 +70,7 @@ glabel func_802400A0_A4CAC0 /* A4CBC0 802401A0 D4222528 */ ldc1 $f2, %lo(D_80242528)($at) /* A4CBC4 802401A4 46000021 */ cvt.d.s $f0, $f0 /* A4CBC8 802401A8 4620103C */ c.lt.d $f2, $f0 -/* A4CBCC 802401AC 00000000 */ nop +/* A4CBCC 802401AC 00000000 */ nop /* A4CBD0 802401B0 45010027 */ bc1t .L80240250 /* A4CBD4 802401B4 2402FFFF */ addiu $v0, $zero, -1 /* A4CBD8 802401B8 8E020000 */ lw $v0, ($s0) @@ -83,7 +83,7 @@ glabel func_802400A0_A4CAC0 /* A4CBF4 802401D4 46000005 */ abs.s $f0, $f0 /* A4CBF8 802401D8 44060000 */ mfc1 $a2, $f0 /* A4CBFC 802401DC 0C00A720 */ jal atan2 -/* A4CC00 802401E0 00000000 */ nop +/* A4CC00 802401E0 00000000 */ nop /* A4CC04 802401E4 3C018024 */ lui $at, %hi(D_80242530) /* A4CC08 802401E8 D4222530 */ ldc1 $f2, %lo(D_80242530)($at) /* A4CC0C 802401EC 46000021 */ cvt.d.s $f0, $f0 @@ -94,7 +94,7 @@ glabel func_802400A0_A4CAC0 /* A4CC20 80240200 46000005 */ abs.s $f0, $f0 /* A4CC24 80240204 46000021 */ cvt.d.s $f0, $f0 /* A4CC28 80240208 4620103C */ c.lt.d $f2, $f0 -/* A4CC2C 8024020C 00000000 */ nop +/* A4CC2C 8024020C 00000000 */ nop /* A4CC30 80240210 4501000F */ bc1t .L80240250 /* A4CC34 80240214 2402FFFF */ addiu $v0, $zero, -1 /* A4CC38 80240218 3C038011 */ lui $v1, %hi(D_8010EBB3) diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s index 921b8b5920..76f161b611 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s @@ -30,7 +30,7 @@ glabel func_80240270_A4CC90 /* A4CCF4 802402D4 8E4200B0 */ lw $v0, 0xb0($s2) /* A4CCF8 802402D8 30420004 */ andi $v0, $v0, 4 /* A4CCFC 802402DC 10400018 */ beqz $v0, .L80240340 -/* A4CD00 802402E0 00000000 */ nop +/* A4CD00 802402E0 00000000 */ nop .L802402E4: /* A4CD04 802402E4 3C030024 */ lui $v1, 0x24 /* A4CD08 802402E8 34630102 */ ori $v1, $v1, 0x102 @@ -60,11 +60,12 @@ glabel func_80240270_A4CC90 /* A4CD64 80240344 2C620005 */ sltiu $v0, $v1, 5 /* A4CD68 80240348 10400101 */ beqz $v0, .L80240750 /* A4CD6C 8024034C 00031080 */ sll $v0, $v1, 2 -/* A4CD70 80240350 3C018024 */ lui $at, %hi(func_80242540_A09440) +/* A4CD70 80240350 3C018024 */ lui $at, %hi(jtbl_80242540_A4EF60) /* A4CD74 80240354 00220821 */ addu $at, $at, $v0 -/* A4CD78 80240358 8C222540 */ lw $v0, %lo(func_80242540_A09440)($at) +/* A4CD78 80240358 8C222540 */ lw $v0, %lo(jtbl_80242540_A4EF60)($at) /* A4CD7C 8024035C 00400008 */ jr $v0 -/* A4CD80 80240360 00000000 */ nop +/* A4CD80 80240360 00000000 */ nop +glabel L80240364_A4CD84 /* A4CD84 80240364 3C01C47A */ lui $at, 0xc47a /* A4CD88 80240368 44810000 */ mtc1 $at, $f0 /* A4CD8C 8024036C 24020014 */ addiu $v0, $zero, 0x14 @@ -77,6 +78,7 @@ glabel func_80240270_A4CC90 /* A4CDA8 80240388 E620003C */ swc1 $f0, 0x3c($s1) /* A4CDAC 8024038C AE40006C */ sw $zero, 0x6c($s2) /* A4CDB0 80240390 AEC20070 */ sw $v0, 0x70($s6) +glabel L80240394_A4CDB4 /* A4CDB4 80240394 8E50006C */ lw $s0, 0x6c($s2) /* A4CDB8 80240398 24020001 */ addiu $v0, $zero, 1 /* A4CDBC 8024039C 160200EC */ bne $s0, $v0, .L80240750 @@ -91,7 +93,7 @@ glabel func_80240270_A4CC90 /* A4CDE0 802403C0 C6820034 */ lwc1 $f2, 0x34($s4) /* A4CDE4 802403C4 3C014387 */ lui $at, 0x4387 /* A4CDE8 802403C8 44810000 */ mtc1 $at, $f0 -/* A4CDEC 802403CC 00000000 */ nop +/* A4CDEC 802403CC 00000000 */ nop /* A4CDF0 802403D0 46020001 */ sub.s $f0, $f0, $f2 /* A4CDF4 802403D4 C6480074 */ lwc1 $f8, 0x74($s2) /* A4CDF8 802403D8 46804220 */ cvt.s.w $f8, $f8 @@ -118,20 +120,20 @@ glabel func_80240270_A4CC90 /* A4CE4C 8024042C 44811000 */ mtc1 $at, $f2 /* A4CE50 80240430 4600020D */ trunc.w.s $f8, $f0 /* A4CE54 80240434 44024000 */ mfc1 $v0, $f8 -/* A4CE58 80240438 00000000 */ nop +/* A4CE58 80240438 00000000 */ nop /* A4CE5C 8024043C A6420010 */ sh $v0, 0x10($s2) /* A4CE60 80240440 C620003C */ lwc1 $f0, 0x3c($s1) /* A4CE64 80240444 3C13800F */ lui $s3, %hi(gPlayerStatusPtr) /* A4CE68 80240448 26737B30 */ addiu $s3, $s3, %lo(gPlayerStatusPtr) /* A4CE6C 8024044C 4600020D */ trunc.w.s $f8, $f0 /* A4CE70 80240450 44024000 */ mfc1 $v0, $f8 -/* A4CE74 80240454 00000000 */ nop +/* A4CE74 80240454 00000000 */ nop /* A4CE78 80240458 A6420012 */ sh $v0, 0x12($s2) /* A4CE7C 8024045C C6200040 */ lwc1 $f0, 0x40($s1) /* A4CE80 80240460 8E630000 */ lw $v1, ($s3) /* A4CE84 80240464 4600020D */ trunc.w.s $f8, $f0 /* A4CE88 80240468 44024000 */ mfc1 $v0, $f8 -/* A4CE8C 8024046C 00000000 */ nop +/* A4CE8C 8024046C 00000000 */ nop /* A4CE90 80240470 A6420014 */ sh $v0, 0x14($s2) /* A4CE94 80240474 E6220018 */ swc1 $f2, 0x18($s1) /* A4CE98 80240478 C460002C */ lwc1 $f0, 0x2c($v1) @@ -147,7 +149,7 @@ glabel func_80240270_A4CC90 /* A4CEC0 802404A0 44070000 */ mfc1 $a3, $f0 /* A4CEC4 802404A4 44061000 */ mfc1 $a2, $f2 /* A4CEC8 802404A8 0C00A720 */ jal atan2 -/* A4CECC 802404AC 00000000 */ nop +/* A4CECC 802404AC 00000000 */ nop /* A4CED0 802404B0 3C018024 */ lui $at, %hi(func_80242558_A1D658) /* A4CED4 802404B4 D4222558 */ ldc1 $f2, %lo(func_80242558_A1D658)($at) /* A4CED8 802404B8 46000021 */ cvt.d.s $f0, $f0 @@ -155,13 +157,13 @@ glabel func_80240270_A4CC90 /* A4CEE0 802404C0 46200020 */ cvt.s.d $f0, $f0 /* A4CEE4 802404C4 4600020D */ trunc.w.s $f8, $f0 /* A4CEE8 802404C8 44044000 */ mfc1 $a0, $f8 -/* A4CEEC 802404CC 00000000 */ nop +/* A4CEEC 802404CC 00000000 */ nop /* A4CEF0 802404D0 00042400 */ sll $a0, $a0, 0x10 /* A4CEF4 802404D4 0C00A4F5 */ jal cosine /* A4CEF8 802404D8 00042403 */ sra $a0, $a0, 0x10 /* A4CEFC 802404DC C6220018 */ lwc1 $f2, 0x18($s1) /* A4CF00 802404E0 46020002 */ mul.s $f0, $f0, $f2 -/* A4CF04 802404E4 00000000 */ nop +/* A4CF04 802404E4 00000000 */ nop /* A4CF08 802404E8 C62C0038 */ lwc1 $f12, 0x38($s1) /* A4CF0C 802404EC C62E0040 */ lwc1 $f14, 0x40($s1) /* A4CF10 802404F0 8E620000 */ lw $v0, ($s3) @@ -187,7 +189,7 @@ glabel func_80240270_A4CC90 /* A4CF60 80240540 46020003 */ div.s $f0, $f0, $f2 /* A4CF64 80240544 4600020D */ trunc.w.s $f8, $f0 /* A4CF68 80240548 44104000 */ mfc1 $s0, $f8 -/* A4CF6C 8024054C 00000000 */ nop +/* A4CF6C 8024054C 00000000 */ nop /* A4CF70 80240550 5A000001 */ blezl $s0, .L80240558 /* A4CF74 80240554 24100001 */ addiu $s0, $zero, 1 .L80240558: @@ -201,7 +203,7 @@ glabel func_80240270_A4CC90 /* A4CF94 80240574 46020000 */ add.s $f0, $f0, $f2 /* A4CF98 80240578 3C014160 */ lui $at, 0x4160 /* A4CF9C 8024057C 44811000 */ mtc1 $at, $f2 -/* A4CFA0 80240580 00000000 */ nop +/* A4CFA0 80240580 00000000 */ nop /* A4CFA4 80240584 46022100 */ add.s $f4, $f4, $f2 /* A4CFA8 80240588 46020000 */ add.s $f0, $f0, $f2 /* A4CFAC 8024058C 44062000 */ mfc1 $a2, $f4 @@ -217,6 +219,7 @@ glabel func_80240270_A4CC90 /* A4CFD4 802405B4 A630008E */ sh $s0, 0x8e($s1) /* A4CFD8 802405B8 080901D4 */ j .L80240750 /* A4CFDC 802405BC AED50070 */ sw $s5, 0x70($s6) +glabel L802405C0_A4CFE0 /* A4CFE0 802405C0 9622008E */ lhu $v0, 0x8e($s1) /* A4CFE4 802405C4 2442FFFF */ addiu $v0, $v0, -1 /* A4CFE8 802405C8 A622008E */ sh $v0, 0x8e($s1) @@ -225,7 +228,7 @@ glabel func_80240270_A4CC90 /* A4CFF4 802405D4 24150014 */ addiu $s5, $zero, 0x14 .L802405D8: /* A4CFF8 802405D8 16A0000A */ bnez $s5, .L80240604 -/* A4CFFC 802405DC 00000000 */ nop +/* A4CFFC 802405DC 00000000 */ nop /* A4D000 802405E0 8E250018 */ lw $a1, 0x18($s1) /* A4D004 802405E4 8E26000C */ lw $a2, 0xc($s1) /* A4D008 802405E8 0C00EA95 */ jal npc_move_heading @@ -236,15 +239,16 @@ glabel func_80240270_A4CC90 /* A4D01C 802405FC 080901D4 */ j .L80240750 /* A4D020 80240600 E620003C */ swc1 $f0, 0x3c($s1) .L80240604: +glabel L80240604_A4D024 /* A4D024 80240604 862200A8 */ lh $v0, 0xa8($s1) /* A4D028 80240608 3C013FE0 */ lui $at, 0x3fe0 /* A4D02C 8024060C 44810800 */ mtc1 $at, $f1 /* A4D030 80240610 44800000 */ mtc1 $zero, $f0 /* A4D034 80240614 44821000 */ mtc1 $v0, $f2 -/* A4D038 80240618 00000000 */ nop +/* A4D038 80240618 00000000 */ nop /* A4D03C 8024061C 468010A1 */ cvt.d.w $f2, $f2 /* A4D040 80240620 46201082 */ mul.d $f2, $f2, $f0 -/* A4D044 80240624 00000000 */ nop +/* A4D044 80240624 00000000 */ nop /* A4D048 80240628 C620003C */ lwc1 $f0, 0x3c($s1) /* A4D04C 8024062C AE20001C */ sw $zero, 0x1c($s1) /* A4D050 80240630 46000021 */ cvt.d.s $f0, $f0 @@ -258,6 +262,7 @@ glabel func_80240270_A4CC90 /* A4D070 80240650 A620008E */ sh $zero, 0x8e($s1) /* A4D074 80240654 080901D4 */ j .L80240750 /* A4D078 80240658 AEC20070 */ sw $v0, 0x70($s6) +glabel L8024065C_A4D07C /* A4D07C 8024065C 9622008E */ lhu $v0, 0x8e($s1) /* A4D080 80240660 24420001 */ addiu $v0, $v0, 1 /* A4D084 80240664 A622008E */ sh $v0, 0x8e($s1) @@ -271,17 +276,17 @@ glabel func_80240270_A4CC90 /* A4D0A4 80240684 44810800 */ mtc1 $at, $f1 /* A4D0A8 80240688 44800000 */ mtc1 $zero, $f0 /* A4D0AC 8024068C 44822000 */ mtc1 $v0, $f4 -/* A4D0B0 80240690 00000000 */ nop +/* A4D0B0 80240690 00000000 */ nop /* A4D0B4 80240694 46802120 */ cvt.s.w $f4, $f4 /* A4D0B8 80240698 46002121 */ cvt.d.s $f4, $f4 /* A4D0BC 8024069C 46202102 */ mul.d $f4, $f4, $f0 -/* A4D0C0 802406A0 00000000 */ nop +/* A4D0C0 802406A0 00000000 */ nop /* A4D0C4 802406A4 44821000 */ mtc1 $v0, $f2 -/* A4D0C8 802406A8 00000000 */ nop +/* A4D0C8 802406A8 00000000 */ nop /* A4D0CC 802406AC 468010A0 */ cvt.s.w $f2, $f2 /* A4D0D0 802406B0 460010A1 */ cvt.d.s $f2, $f2 /* A4D0D4 802406B4 46201082 */ mul.d $f2, $f2, $f0 -/* A4D0D8 802406B8 00000000 */ nop +/* A4D0D8 802406B8 00000000 */ nop /* A4D0DC 802406BC C620003C */ lwc1 $f0, 0x3c($s1) /* A4D0E0 802406C0 3C01400C */ lui $at, 0x400c /* A4D0E4 802406C4 44813800 */ mtc1 $at, $f7 @@ -291,14 +296,14 @@ glabel func_80240270_A4CC90 /* A4D0F4 802406D4 3C014034 */ lui $at, 0x4034 /* A4D0F8 802406D8 44813800 */ mtc1 $at, $f7 /* A4D0FC 802406DC 44803000 */ mtc1 $zero, $f6 -/* A4D100 802406E0 00000000 */ nop +/* A4D100 802406E0 00000000 */ nop /* A4D104 802406E4 46262100 */ add.d $f4, $f4, $f6 /* A4D108 802406E8 46200020 */ cvt.s.d $f0, $f0 /* A4D10C 802406EC E620003C */ swc1 $f0, 0x3c($s1) /* A4D110 802406F0 46261080 */ add.d $f2, $f2, $f6 /* A4D114 802406F4 4620220D */ trunc.w.d $f8, $f4 /* A4D118 802406F8 44024000 */ mfc1 $v0, $f8 -/* A4D11C 802406FC 00000000 */ nop +/* A4D11C 802406FC 00000000 */ nop /* A4D120 80240700 A62200A6 */ sh $v0, 0xa6($s1) /* A4D124 80240704 4620120D */ trunc.w.d $f8, $f2 /* A4D128 80240708 44024000 */ mfc1 $v0, $f8 @@ -318,7 +323,7 @@ glabel func_80240270_A4CC90 /* A4D15C 8024073C E620003C */ swc1 $f0, 0x3c($s1) .L80240740: /* A4D160 80240740 14400003 */ bnez $v0, .L80240750 -/* A4D164 80240744 00000000 */ nop +/* A4D164 80240744 00000000 */ nop /* A4D168 80240748 AE40006C */ sw $zero, 0x6c($s2) /* A4D16C 8024074C AEC00070 */ sw $zero, 0x70($s6) .L80240750: diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802407F4_A4D214.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802407F4_A4D214.s index 745d257963..e267841c94 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802407F4_A4D214.s +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802407F4_A4D214.s @@ -44,7 +44,7 @@ glabel func_802407F4_A4D214 /* A4D2B0 80240890 A20200AC */ sb $v0, 0xac($s0) /* A4D2B4 80240894 24020004 */ addiu $v0, $zero, 4 /* A4D2B8 80240898 14620007 */ bne $v1, $v0, .L802408B8 -/* A4D2BC 8024089C 00000000 */ nop +/* A4D2BC 8024089C 00000000 */ nop /* A4D2C0 802408A0 0C00EAFF */ jal disable_npc_shadow /* A4D2C4 802408A4 0200202D */ daddu $a0, $s0, $zero /* A4D2C8 802408A8 8E420000 */ lw $v0, ($s2) diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240920_A4D340.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240920_A4D340.s index 7fb5e2b6b5..f85713921f 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240920_A4D340.s +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240920_A4D340.s @@ -21,10 +21,10 @@ glabel func_80240920_A4D340 /* A4D380 80240960 3C014334 */ lui $at, 0x4334 /* A4D384 80240964 44811000 */ mtc1 $at, $f2 /* A4D388 80240968 44820000 */ mtc1 $v0, $f0 -/* A4D38C 8024096C 00000000 */ nop +/* A4D38C 8024096C 00000000 */ nop /* A4D390 80240970 46800020 */ cvt.s.w $f0, $f0 /* A4D394 80240974 46020002 */ mul.s $f0, $f0, $f2 -/* A4D398 80240978 00000000 */ nop +/* A4D398 80240978 00000000 */ nop /* A4D39C 8024097C 3C013F4C */ lui $at, 0x3f4c /* A4D3A0 80240980 3421CCCD */ ori $at, $at, 0xcccd /* A4D3A4 80240984 44812000 */ mtc1 $at, $f4 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240B64_A4D584.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240B64_A4D584.s index 80b56c553a..0599215114 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240B64_A4D584.s +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240B64_A4D584.s @@ -35,11 +35,11 @@ glabel func_80240B64_A4D584 /* A4D5F0 80240BD0 3C018024 */ lui $at, %hi(func_80242560_95D760) /* A4D5F4 80240BD4 D4222560 */ ldc1 $f2, %lo(func_80242560_95D760)($at) /* A4D5F8 80240BD8 44820000 */ mtc1 $v0, $f0 -/* A4D5FC 80240BDC 00000000 */ nop +/* A4D5FC 80240BDC 00000000 */ nop /* A4D600 80240BE0 46800020 */ cvt.s.w $f0, $f0 /* A4D604 80240BE4 46000021 */ cvt.d.s $f0, $f0 /* A4D608 80240BE8 46220002 */ mul.d $f0, $f0, $f2 -/* A4D60C 80240BEC 00000000 */ nop +/* A4D60C 80240BEC 00000000 */ nop /* A4D610 80240BF0 3C018024 */ lui $at, %hi(D_80242568) /* A4D614 80240BF4 D4222568 */ ldc1 $f2, %lo(D_80242568)($at) /* A4D618 80240BF8 46220000 */ add.d $f0, $f0, $f2 @@ -51,12 +51,12 @@ glabel func_80240B64_A4D584 /* A4D630 80240C10 E6000054 */ swc1 $f0, 0x54($s0) /* A4D634 80240C14 46000021 */ cvt.d.s $f0, $f0 /* A4D638 80240C18 4620103C */ c.lt.d $f2, $f0 -/* A4D63C 80240C1C 00000000 */ nop +/* A4D63C 80240C1C 00000000 */ nop /* A4D640 80240C20 45000005 */ bc1f .L80240C38 /* A4D644 80240C24 24030005 */ addiu $v1, $zero, 5 /* A4D648 80240C28 3C013F80 */ lui $at, 0x3f80 /* A4D64C 80240C2C 44810000 */ mtc1 $at, $f0 -/* A4D650 80240C30 00000000 */ nop +/* A4D650 80240C30 00000000 */ nop /* A4D654 80240C34 E6000054 */ swc1 $f0, 0x54($s0) .L80240C38: /* A4D658 80240C38 C6000054 */ lwc1 $f0, 0x54($s0) @@ -79,7 +79,7 @@ glabel func_80240B64_A4D584 .L80240C7C: /* A4D69C 80240C7C 8E22006C */ lw $v0, 0x6c($s1) /* A4D6A0 80240C80 1440000E */ bnez $v0, .L80240CBC -/* A4D6A4 80240C84 00000000 */ nop +/* A4D6A4 80240C84 00000000 */ nop /* A4D6A8 80240C88 8602008E */ lh $v0, 0x8e($s0) /* A4D6AC 80240C8C 28420014 */ slti $v0, $v0, 0x14 /* A4D6B0 80240C90 14400017 */ bnez $v0, .L80240CF0 @@ -92,12 +92,12 @@ glabel func_80240B64_A4D584 /* A4D6CC 80240CAC 0C0B7A25 */ jal func_802DE894 /* A4D6D0 80240CB0 00A0382D */ daddu $a3, $a1, $zero /* A4D6D4 80240CB4 08090333 */ j .L80240CCC -/* A4D6D8 80240CB8 00000000 */ nop +/* A4D6D8 80240CB8 00000000 */ nop .L80240CBC: /* A4D6DC 80240CBC 8602008E */ lh $v0, 0x8e($s0) /* A4D6E0 80240CC0 2842000A */ slti $v0, $v0, 0xa /* A4D6E4 80240CC4 1440000A */ bnez $v0, .L80240CF0 -/* A4D6E8 80240CC8 00000000 */ nop +/* A4D6E8 80240CC8 00000000 */ nop .L80240CCC: /* A4D6EC 80240CCC 3C013F80 */ lui $at, 0x3f80 /* A4D6F0 80240CD0 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240D44_A4D764.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240D44_A4D764.s index 57d5680799..e7abf62b9d 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240D44_A4D764.s +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240D44_A4D764.s @@ -36,7 +36,7 @@ glabel func_80240D44_A4D764 /* A4D7E0 80240DC0 3C01C1A0 */ lui $at, 0xc1a0 /* A4D7E4 80240DC4 44812000 */ mtc1 $at, $f4 /* A4D7E8 80240DC8 44824000 */ mtc1 $v0, $f8 -/* A4D7EC 80240DCC 00000000 */ nop +/* A4D7EC 80240DCC 00000000 */ nop /* A4D7F0 80240DD0 46804220 */ cvt.s.w $f8, $f8 /* A4D7F4 80240DD4 44074000 */ mfc1 $a3, $f8 /* A4D7F8 80240DD8 2402000C */ addiu $v0, $zero, 0xc diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F04_A4D924.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F04_A4D924.s index 78e271a218..1348046e86 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F04_A4D924.s +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F04_A4D924.s @@ -16,7 +16,7 @@ glabel func_80240F04_A4D924 /* A4D950 80240F30 A482008E */ sh $v0, 0x8e($a0) /* A4D954 80240F34 00021400 */ sll $v0, $v0, 0x10 /* A4D958 80240F38 1C400008 */ bgtz $v0, .L80240F5C -/* A4D95C 80240F3C 00000000 */ nop +/* A4D95C 80240F3C 00000000 */ nop /* A4D960 80240F40 8E0200CC */ lw $v0, 0xcc($s0) /* A4D964 80240F44 8C430024 */ lw $v1, 0x24($v0) /* A4D968 80240F48 24020009 */ addiu $v0, $zero, 9 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F70_A4D990.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F70_A4D990.s index 6bf43db6bc..a8415592ac 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F70_A4D990.s +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F70_A4D990.s @@ -21,7 +21,7 @@ glabel func_80240F70_A4D990 /* A4D9D0 80240FB0 A602008E */ sh $v0, 0x8e($s0) /* A4D9D4 80240FB4 00021400 */ sll $v0, $v0, 0x10 /* A4D9D8 80240FB8 1C400032 */ bgtz $v0, .L80241084 -/* A4D9DC 80240FBC 00000000 */ nop +/* A4D9DC 80240FBC 00000000 */ nop /* A4D9E0 80240FC0 0260202D */ daddu $a0, $s3, $zero /* A4D9E4 80240FC4 8E250024 */ lw $a1, 0x24($s1) /* A4D9E8 80240FC8 8E260028 */ lw $a2, 0x28($s1) @@ -43,7 +43,7 @@ glabel func_80240F70_A4D990 /* A4DA28 80241008 2402000C */ addiu $v0, $zero, 0xc /* A4DA2C 8024100C AFA2001C */ sw $v0, 0x1c($sp) /* A4DA30 80241010 44833000 */ mtc1 $v1, $f6 -/* A4DA34 80241014 00000000 */ nop +/* A4DA34 80241014 00000000 */ nop /* A4DA38 80241018 468031A0 */ cvt.s.w $f6, $f6 /* A4DA3C 8024101C 44073000 */ mfc1 $a3, $f6 /* A4DA40 80241020 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802410A4_A4DAC4.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802410A4_A4DAC4.s index f4b08fe0df..f0d511d1d5 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802410A4_A4DAC4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802410A4_A4DAC4.s @@ -16,7 +16,7 @@ glabel func_802410A4_A4DAC4 /* A4DAF0 802410D0 A482008E */ sh $v0, 0x8e($a0) /* A4DAF4 802410D4 00021400 */ sll $v0, $v0, 0x10 /* A4DAF8 802410D8 1C400007 */ bgtz $v0, .L802410F8 -/* A4DAFC 802410DC 00000000 */ nop +/* A4DAFC 802410DC 00000000 */ nop /* A4DB00 802410E0 8E0200CC */ lw $v0, 0xcc($s0) /* A4DB04 802410E4 8C430000 */ lw $v1, ($v0) /* A4DB08 802410E8 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C_A4DB2C.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C_A4DB2C.s index 9811df3c5f..dda3566a9d 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C_A4DB2C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C_A4DB2C.s @@ -46,7 +46,7 @@ glabel func_8024110C_A4DB2C /* A4DBD0 802411B0 8E2200B0 */ lw $v0, 0xb0($s1) /* A4DBD4 802411B4 30420004 */ andi $v0, $v0, 4 /* A4DBD8 802411B8 1040001E */ beqz $v0, .L80241234 -/* A4DBDC 802411BC 00000000 */ nop +/* A4DBDC 802411BC 00000000 */ nop .L802411C0: /* A4DBE0 802411C0 8E430000 */ lw $v1, ($s2) /* A4DBE4 802411C4 2402F7FF */ addiu $v0, $zero, -0x801 @@ -83,11 +83,12 @@ glabel func_8024110C_A4DB2C /* A4DC58 80241238 2C620019 */ sltiu $v0, $v1, 0x19 /* A4DC5C 8024123C 10400044 */ beqz $v0, .L80241350 /* A4DC60 80241240 00031080 */ sll $v0, $v1, 2 -/* A4DC64 80241244 3C018024 */ lui $at, %hi(func_80242570_7ED280) +/* A4DC64 80241244 3C018024 */ lui $at, %hi(jtbl_80242570_A4EF90) /* A4DC68 80241248 00220821 */ addu $at, $at, $v0 -/* A4DC6C 8024124C 8C222570 */ lw $v0, %lo(func_80242570_7ED280)($at) +/* A4DC6C 8024124C 8C222570 */ lw $v0, %lo(jtbl_80242570_A4EF90)($at) /* A4DC70 80241250 00400008 */ jr $v0 -/* A4DC74 80241254 00000000 */ nop +/* A4DC74 80241254 00000000 */ nop +glabel L80241258_A4DC78 /* A4DC78 80241258 02A0202D */ daddu $a0, $s5, $zero /* A4DC7C 8024125C 0260282D */ daddu $a1, $s3, $zero /* A4DC80 80241260 0C0901E0 */ jal func_80240780_A4D1A0 @@ -95,62 +96,73 @@ glabel func_8024110C_A4DB2C /* A4DC88 80241268 8EA30070 */ lw $v1, 0x70($s5) /* A4DC8C 8024126C 24020001 */ addiu $v0, $zero, 1 /* A4DC90 80241270 14620037 */ bne $v1, $v0, .L80241350 -/* A4DC94 80241274 00000000 */ nop +/* A4DC94 80241274 00000000 */ nop +glabel L80241278_A4DC98 /* A4DC98 80241278 02A0202D */ daddu $a0, $s5, $zero /* A4DC9C 8024127C 0260282D */ daddu $a1, $s3, $zero /* A4DCA0 80241280 0C0901FD */ jal func_802407F4_A4D214 /* A4DCA4 80241284 0280302D */ daddu $a2, $s4, $zero /* A4DCA8 80241288 080904D4 */ j .L80241350 -/* A4DCAC 8024128C 00000000 */ nop +/* A4DCAC 8024128C 00000000 */ nop +glabel L80241290_A4DCB0 /* A4DCB0 80241290 02A0202D */ daddu $a0, $s5, $zero /* A4DCB4 80241294 0260282D */ daddu $a1, $s3, $zero /* A4DCB8 80241298 0C090248 */ jal func_80240920_A4D340 /* A4DCBC 8024129C 0280302D */ daddu $a2, $s4, $zero +glabel L802412A0_A4DCC0 /* A4DCC0 802412A0 02A0202D */ daddu $a0, $s5, $zero /* A4DCC4 802412A4 0260282D */ daddu $a1, $s3, $zero /* A4DCC8 802412A8 0C090270 */ jal func_802409C0_A4D3E0 /* A4DCCC 802412AC 0280302D */ daddu $a2, $s4, $zero /* A4DCD0 802412B0 080904D4 */ j .L80241350 -/* A4DCD4 802412B4 00000000 */ nop +/* A4DCD4 802412B4 00000000 */ nop +glabel L802412B8_A4DCD8 /* A4DCD8 802412B8 02A0202D */ daddu $a0, $s5, $zero /* A4DCDC 802412BC 0260282D */ daddu $a1, $s3, $zero /* A4DCE0 802412C0 0C090289 */ jal func_80240A24_A4D444 /* A4DCE4 802412C4 0280302D */ daddu $a2, $s4, $zero +glabel L802412C8_A4DCE8 /* A4DCE8 802412C8 02A0202D */ daddu $a0, $s5, $zero /* A4DCEC 802412CC 0260282D */ daddu $a1, $s3, $zero /* A4DCF0 802412D0 0C0902D9 */ jal func_80240B64_A4D584 /* A4DCF4 802412D4 0280302D */ daddu $a2, $s4, $zero /* A4DCF8 802412D8 080904D4 */ j .L80241350 -/* A4DCFC 802412DC 00000000 */ nop +/* A4DCFC 802412DC 00000000 */ nop +glabel L802412E0_A4DD00 /* A4DD00 802412E0 02A0202D */ daddu $a0, $s5, $zero /* A4DD04 802412E4 0260282D */ daddu $a1, $s3, $zero /* A4DD08 802412E8 0C090342 */ jal func_80240D08_A4D728 /* A4DD0C 802412EC 0280302D */ daddu $a2, $s4, $zero /* A4DD10 802412F0 080904D4 */ j .L80241350 -/* A4DD14 802412F4 00000000 */ nop +/* A4DD14 802412F4 00000000 */ nop +glabel L802412F8_A4DD18 /* A4DD18 802412F8 02A0202D */ daddu $a0, $s5, $zero /* A4DD1C 802412FC 0260282D */ daddu $a1, $s3, $zero /* A4DD20 80241300 0C090351 */ jal func_80240D44_A4D764 /* A4DD24 80241304 0280302D */ daddu $a2, $s4, $zero /* A4DD28 80241308 080904D4 */ j .L80241350 -/* A4DD2C 8024130C 00000000 */ nop +/* A4DD2C 8024130C 00000000 */ nop +glabel L80241310_A4DD30 /* A4DD30 80241310 02A0202D */ daddu $a0, $s5, $zero /* A4DD34 80241314 0260282D */ daddu $a1, $s3, $zero /* A4DD38 80241318 0C0903C1 */ jal func_80240F04_A4D924 /* A4DD3C 8024131C 0280302D */ daddu $a2, $s4, $zero /* A4DD40 80241320 080904D4 */ j .L80241350 -/* A4DD44 80241324 00000000 */ nop +/* A4DD44 80241324 00000000 */ nop +glabel L80241328_A4DD48 /* A4DD48 80241328 02A0202D */ daddu $a0, $s5, $zero /* A4DD4C 8024132C 0260282D */ daddu $a1, $s3, $zero /* A4DD50 80241330 0C0903DC */ jal func_80240F70_A4D990 /* A4DD54 80241334 0280302D */ daddu $a2, $s4, $zero /* A4DD58 80241338 080904D4 */ j .L80241350 -/* A4DD5C 8024133C 00000000 */ nop +/* A4DD5C 8024133C 00000000 */ nop +glabel L80241340_A4DD60 /* A4DD60 80241340 02A0202D */ daddu $a0, $s5, $zero /* A4DD64 80241344 0260282D */ daddu $a1, $s3, $zero /* A4DD68 80241348 0C090429 */ jal func_802410A4_A4DAC4 /* A4DD6C 8024134C 0280302D */ daddu $a2, $s4, $zero .L80241350: +glabel L80241350_A4DD70 /* A4DD70 80241350 8FBF0048 */ lw $ra, 0x48($sp) /* A4DD74 80241354 8FB50044 */ lw $s5, 0x44($sp) /* A4DD78 80241358 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80241454_A4DE74.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80241454_A4DE74.s index 17f25ae5fc..113314619d 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80241454_A4DE74.s +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80241454_A4DE74.s @@ -12,7 +12,7 @@ glabel func_80241454_A4DE74 /* A4DE90 80241470 8E03006C */ lw $v1, 0x6c($s0) /* A4DE94 80241474 24020002 */ addiu $v0, $zero, 2 /* A4DE98 80241478 14620003 */ bne $v1, $v0, .L80241488 -/* A4DE9C 8024147C 00000000 */ nop +/* A4DE9C 8024147C 00000000 */ nop /* A4DEA0 80241480 AC80001C */ sw $zero, 0x1c($a0) /* A4DEA4 80241484 AC800018 */ sw $zero, 0x18($a0) .L80241488: @@ -21,4 +21,4 @@ glabel func_80241454_A4DE74 /* A4DEB0 80241490 24020002 */ addiu $v0, $zero, 2 /* A4DEB4 80241494 03E00008 */ jr $ra /* A4DEB8 80241498 27BD0018 */ addiu $sp, $sp, 0x18 -/* A4DEBC 8024149C 00000000 */ nop +/* A4DEBC 8024149C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F000/func_8024001C_A4F01C.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F000/func_8024001C_A4F01C.s index a618426e0b..ac92a17820 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F000/func_8024001C_A4F01C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F000/func_8024001C_A4F01C.s @@ -19,11 +19,11 @@ glabel func_8024001C_A4F01C /* A4F054 80240054 3C028016 */ lui $v0, %hi(gCollisionStatus+0x2) /* A4F058 80240058 8442A552 */ lh $v0, %lo(gCollisionStatus+0x2)($v0) /* A4F05C 8024005C 16020009 */ bne $s0, $v0, .L80240084 -/* A4F060 80240060 00000000 */ nop +/* A4F060 80240060 00000000 */ nop /* A4F064 80240064 8E220084 */ lw $v0, 0x84($s1) /* A4F068 80240068 00431021 */ addu $v0, $v0, $v1 /* A4F06C 8024006C 44820000 */ mtc1 $v0, $f0 -/* A4F070 80240070 00000000 */ nop +/* A4F070 80240070 00000000 */ nop /* A4F074 80240074 46800020 */ cvt.s.w $f0, $f0 /* A4F078 80240078 3C028011 */ lui $v0, %hi(gPlayerStatus) /* A4F07C 8024007C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) @@ -35,4 +35,4 @@ glabel func_8024001C_A4F01C /* A4F090 80240090 24020002 */ addiu $v0, $zero, 2 /* A4F094 80240094 03E00008 */ jr $ra /* A4F098 80240098 27BD0020 */ addiu $sp, $sp, 0x20 -/* A4F09C 8024009C 00000000 */ nop +/* A4F09C 8024009C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802400A0_A4F0A0.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802400A0_A4F0A0.s index 75c958264a..716cd278b1 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802400A0_A4F0A0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802400A0_A4F0A0.s @@ -42,16 +42,16 @@ glabel func_802400A0_A4F0A0 /* A4F134 80240134 3C014387 */ lui $at, 0x4387 /* A4F138 80240138 4481A000 */ mtc1 $at, $f20 /* A4F13C 8024013C 0C00A70A */ jal get_clamped_angle_diff -/* A4F140 80240140 00000000 */ nop +/* A4F140 80240140 00000000 */ nop /* A4F144 80240144 0C00A6C9 */ jal clamp_angle /* A4F148 80240148 46000306 */ mov.s $f12, $f0 /* A4F14C 8024014C 3C018024 */ lui $at, %hi(func_802427C0_9C7BA0) /* A4F150 80240150 D42227C0 */ ldc1 $f2, %lo(func_802427C0_9C7BA0)($at) /* A4F154 80240154 46000021 */ cvt.d.s $f0, $f0 /* A4F158 80240158 4622003C */ c.lt.d $f0, $f2 -/* A4F15C 8024015C 00000000 */ nop +/* A4F15C 8024015C 00000000 */ nop /* A4F160 80240160 45000003 */ bc1f .L80240170 -/* A4F164 80240164 00000000 */ nop +/* A4F164 80240164 00000000 */ nop /* A4F168 80240168 3C0142B4 */ lui $at, 0x42b4 /* A4F16C 8024016C 4481A000 */ mtc1 $at, $f20 .L80240170: @@ -71,7 +71,7 @@ glabel func_802400A0_A4F0A0 /* A4F1A4 802401A4 D42227C8 */ ldc1 $f2, %lo(D_802427C8)($at) /* A4F1A8 802401A8 46000021 */ cvt.d.s $f0, $f0 /* A4F1AC 802401AC 4620103C */ c.lt.d $f2, $f0 -/* A4F1B0 802401B0 00000000 */ nop +/* A4F1B0 802401B0 00000000 */ nop /* A4F1B4 802401B4 4501002E */ bc1t .L80240270 /* A4F1B8 802401B8 2402FFFF */ addiu $v0, $zero, -1 /* A4F1BC 802401BC 8E220000 */ lw $v0, ($s1) @@ -80,13 +80,13 @@ glabel func_802400A0_A4F0A0 /* A4F1C8 802401C8 860200A8 */ lh $v0, 0xa8($s0) /* A4F1CC 802401CC 46020001 */ sub.s $f0, $f0, $f2 /* A4F1D0 802401D0 44821000 */ mtc1 $v0, $f2 -/* A4F1D4 802401D4 00000000 */ nop +/* A4F1D4 802401D4 00000000 */ nop /* A4F1D8 802401D8 468010A1 */ cvt.d.w $f2, $f2 /* A4F1DC 802401DC 46221080 */ add.d $f2, $f2, $f2 /* A4F1E0 802401E0 46000005 */ abs.s $f0, $f0 /* A4F1E4 802401E4 46000021 */ cvt.d.s $f0, $f0 /* A4F1E8 802401E8 4620103E */ c.le.d $f2, $f0 -/* A4F1EC 802401EC 00000000 */ nop +/* A4F1EC 802401EC 00000000 */ nop /* A4F1F0 802401F0 4501001F */ bc1t .L80240270 /* A4F1F4 802401F4 2402FFFF */ addiu $v0, $zero, -1 /* A4F1F8 802401F8 3C038011 */ lui $v1, %hi(D_8010EBB3) @@ -97,7 +97,7 @@ glabel func_802400A0_A4F0A0 /* A4F20C 8024020C 14620005 */ bne $v1, $v0, .L80240224 /* A4F210 80240210 2402FFFF */ addiu $v0, $zero, -1 /* A4F214 80240214 0809009C */ j .L80240270 -/* A4F218 80240218 00000000 */ nop +/* A4F218 80240218 00000000 */ nop .L8024021C: /* A4F21C 8024021C 0809009C */ j .L80240270 /* A4F220 80240220 0240102D */ daddu $v0, $s2, $zero @@ -120,7 +120,7 @@ glabel func_802400A0_A4F0A0 /* A4F25C 8024025C 8E620078 */ lw $v0, 0x78($s3) /* A4F260 80240260 0222102A */ slt $v0, $s1, $v0 /* A4F264 80240264 1440FFF2 */ bnez $v0, .L80240230 -/* A4F268 80240268 00000000 */ nop +/* A4F268 80240268 00000000 */ nop .L8024026C: /* A4F26C 8024026C 2402FFFF */ addiu $v0, $zero, -1 .L80240270: diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240290_A4F290.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240290_A4F290.s index aace66edef..dfae319ef8 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240290_A4F290.s +++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240290_A4F290.s @@ -38,7 +38,7 @@ glabel func_80240290_A4F290 /* A4F314 80240314 2402000F */ addiu $v0, $zero, 0xf /* A4F318 80240318 AFA2001C */ sw $v0, 0x1c($sp) /* A4F31C 8024031C 44833000 */ mtc1 $v1, $f6 -/* A4F320 80240320 00000000 */ nop +/* A4F320 80240320 00000000 */ nop /* A4F324 80240324 468031A0 */ cvt.s.w $f6, $f6 /* A4F328 80240328 44073000 */ mfc1 $a3, $f6 /* A4F32C 8024032C 27A20028 */ addiu $v0, $sp, 0x28 @@ -60,15 +60,15 @@ glabel func_80240290_A4F290 /* A4F368 80240368 0040202D */ daddu $a0, $v0, $zero /* A4F36C 8024036C 2402FFFF */ addiu $v0, $zero, -1 /* A4F370 80240370 10820010 */ beq $a0, $v0, .L802403B4 -/* A4F374 80240374 00000000 */ nop +/* A4F374 80240374 00000000 */ nop /* A4F378 80240378 0C00FB3A */ jal get_enemy -/* A4F37C 8024037C 00000000 */ nop +/* A4F37C 8024037C 00000000 */ nop /* A4F380 80240380 8C42006C */ lw $v0, 0x6c($v0) /* A4F384 80240384 1440000B */ bnez $v0, .L802403B4 -/* A4F388 80240388 00000000 */ nop +/* A4F388 80240388 00000000 */ nop /* A4F38C 8024038C 8602008C */ lh $v0, 0x8c($s0) /* A4F390 80240390 14400008 */ bnez $v0, .L802403B4 -/* A4F394 80240394 00000000 */ nop +/* A4F394 80240394 00000000 */ nop /* A4F398 80240398 8E2200CC */ lw $v0, 0xcc($s1) /* A4F39C 8024039C 8C420020 */ lw $v0, 0x20($v0) /* A4F3A0 802403A0 AE020028 */ sw $v0, 0x28($s0) diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802403D4_A4F3D4.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802403D4_A4F3D4.s index eaf164d7e9..90dfeaf01c 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802403D4_A4F3D4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802403D4_A4F3D4.s @@ -17,7 +17,7 @@ glabel func_802403D4_A4F3D4 /* A4F404 80240404 A602008E */ sh $v0, 0x8e($s0) /* A4F408 80240408 00021400 */ sll $v0, $v0, 0x10 /* A4F40C 8024040C 1C40002B */ bgtz $v0, .L802404BC -/* A4F410 80240410 00000000 */ nop +/* A4F410 80240410 00000000 */ nop /* A4F414 80240414 0C090028 */ jal func_802400A0_A4F0A0 /* A4F418 80240418 0240202D */ daddu $a0, $s2, $zero /* A4F41C 8024041C 0040202D */ daddu $a0, $v0, $zero @@ -35,7 +35,7 @@ glabel func_802403D4_A4F3D4 /* A4F44C 8024044C 3C01C1A0 */ lui $at, 0xc1a0 /* A4F450 80240450 44812000 */ mtc1 $at, $f4 /* A4F454 80240454 44833000 */ mtc1 $v1, $f6 -/* A4F458 80240458 00000000 */ nop +/* A4F458 80240458 00000000 */ nop /* A4F45C 8024045C 468031A0 */ cvt.s.w $f6, $f6 /* A4F460 80240460 44073000 */ mfc1 $a3, $f6 /* A4F464 80240464 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802405FC_A4F5FC.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802405FC_A4F5FC.s index 28a383930b..d3367fdc03 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802405FC_A4F5FC.s +++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802405FC_A4F5FC.s @@ -47,7 +47,7 @@ glabel func_802405FC_A4F5FC /* A4F6A0 802406A0 8E6200B0 */ lw $v0, 0xb0($s3) /* A4F6A4 802406A4 30420004 */ andi $v0, $v0, 4 /* A4F6A8 802406A8 10400019 */ beqz $v0, .L80240710 -/* A4F6AC 802406AC 00000000 */ nop +/* A4F6AC 802406AC 00000000 */ nop .L802406B0: /* A4F6B0 802406B0 34630102 */ ori $v1, $v1, 0x102 /* A4F6B4 802406B4 AEE00070 */ sw $zero, 0x70($s7) @@ -83,12 +83,12 @@ glabel func_802405FC_A4F5FC /* A4F728 80240728 10600007 */ beqz $v1, .L80240748 /* A4F72C 8024072C 0000102D */ daddu $v0, $zero, $zero /* A4F730 80240730 080902C3 */ j .L80240B0C -/* A4F734 80240734 00000000 */ nop +/* A4F734 80240734 00000000 */ nop .L80240738: /* A4F738 80240738 1062005B */ beq $v1, $v0, .L802408A8 /* A4F73C 8024073C 0000102D */ daddu $v0, $zero, $zero /* A4F740 80240740 080902C3 */ j .L80240B0C -/* A4F744 80240744 00000000 */ nop +/* A4F744 80240744 00000000 */ nop .L80240748: /* A4F748 80240748 8E420000 */ lw $v0, ($s2) /* A4F74C 8024074C 0240202D */ daddu $a0, $s2, $zero @@ -131,17 +131,17 @@ glabel func_802405FC_A4F5FC /* A4F7DC 802407DC C6400038 */ lwc1 $f0, 0x38($s2) /* A4F7E0 802407E0 4600020D */ trunc.w.s $f8, $f0 /* A4F7E4 802407E4 44024000 */ mfc1 $v0, $f8 -/* A4F7E8 802407E8 00000000 */ nop +/* A4F7E8 802407E8 00000000 */ nop /* A4F7EC 802407EC A6620010 */ sh $v0, 0x10($s3) /* A4F7F0 802407F0 C640003C */ lwc1 $f0, 0x3c($s2) /* A4F7F4 802407F4 4600020D */ trunc.w.s $f8, $f0 /* A4F7F8 802407F8 44024000 */ mfc1 $v0, $f8 -/* A4F7FC 802407FC 00000000 */ nop +/* A4F7FC 802407FC 00000000 */ nop /* A4F800 80240800 A6620012 */ sh $v0, 0x12($s3) /* A4F804 80240804 C6400040 */ lwc1 $f0, 0x40($s2) /* A4F808 80240808 4600020D */ trunc.w.s $f8, $f0 /* A4F80C 8024080C 44024000 */ mfc1 $v0, $f8 -/* A4F810 80240810 00000000 */ nop +/* A4F810 80240810 00000000 */ nop /* A4F814 80240814 A6620014 */ sh $v0, 0x14($s3) /* A4F818 80240818 AE400044 */ sw $zero, 0x44($s2) /* A4F81C 8024081C AE400048 */ sw $zero, 0x48($s2) @@ -187,10 +187,10 @@ glabel func_802405FC_A4F5FC /* A4F8B8 802408B8 44810800 */ mtc1 $at, $f1 /* A4F8BC 802408BC 44800000 */ mtc1 $zero, $f0 /* A4F8C0 802408C0 44821000 */ mtc1 $v0, $f2 -/* A4F8C4 802408C4 00000000 */ nop +/* A4F8C4 802408C4 00000000 */ nop /* A4F8C8 802408C8 468010A1 */ cvt.d.w $f2, $f2 /* A4F8CC 802408CC 46201082 */ mul.d $f2, $f2, $f0 -/* A4F8D0 802408D0 00000000 */ nop +/* A4F8D0 802408D0 00000000 */ nop /* A4F8D4 802408D4 0200282D */ daddu $a1, $s0, $zero /* A4F8D8 802408D8 C6440038 */ lwc1 $f4, 0x38($s2) /* A4F8DC 802408DC C640003C */ lwc1 $f0, 0x3c($s2) @@ -210,13 +210,13 @@ glabel func_802405FC_A4F5FC /* A4F914 80240914 864200A6 */ lh $v0, 0xa6($s2) /* A4F918 80240918 27B40028 */ addiu $s4, $sp, 0x28 /* A4F91C 8024091C 44820000 */ mtc1 $v0, $f0 -/* A4F920 80240920 00000000 */ nop +/* A4F920 80240920 00000000 */ nop /* A4F924 80240924 46800020 */ cvt.s.w $f0, $f0 /* A4F928 80240928 E7A00018 */ swc1 $f0, 0x18($sp) /* A4F92C 8024092C 864200A8 */ lh $v0, 0xa8($s2) /* A4F930 80240930 0280382D */ daddu $a3, $s4, $zero /* A4F934 80240934 44820000 */ mtc1 $v0, $f0 -/* A4F938 80240938 00000000 */ nop +/* A4F938 80240938 00000000 */ nop /* A4F93C 8024093C 46800020 */ cvt.s.w $f0, $f0 /* A4F940 80240940 0C0376B9 */ jal func_800DDAE4 /* A4F944 80240944 E7A0001C */ swc1 $f0, 0x1c($sp) @@ -240,14 +240,14 @@ glabel func_802405FC_A4F5FC /* A4F988 80240988 0C0372DF */ jal func_800DCB7C /* A4F98C 8024098C 0280382D */ daddu $a3, $s4, $zero /* A4F990 80240990 10400019 */ beqz $v0, .L802409F8 -/* A4F994 80240994 00000000 */ nop +/* A4F994 80240994 00000000 */ nop /* A4F998 80240998 C640001C */ lwc1 $f0, 0x1c($s2) /* A4F99C 8024099C C7A2002C */ lwc1 $f2, 0x2c($sp) /* A4F9A0 802409A0 46000005 */ abs.s $f0, $f0 /* A4F9A4 802409A4 4600103C */ c.lt.s $f2, $f0 -/* A4F9A8 802409A8 00000000 */ nop +/* A4F9A8 802409A8 00000000 */ nop /* A4F9AC 802409AC 45000012 */ bc1f .L802409F8 -/* A4F9B0 802409B0 00000000 */ nop +/* A4F9B0 802409B0 00000000 */ nop /* A4F9B4 802409B4 C7A40024 */ lwc1 $f4, 0x24($sp) /* A4F9B8 802409B8 C6400064 */ lwc1 $f0, 0x64($s2) /* A4F9BC 802409BC 46002001 */ sub.s $f0, $f4, $f0 @@ -257,7 +257,7 @@ glabel func_802405FC_A4F5FC /* A4F9CC 802409CC 46000005 */ abs.s $f0, $f0 /* A4F9D0 802409D0 46000021 */ cvt.d.s $f0, $f0 /* A4F9D4 802409D4 4622003C */ c.lt.d $f0, $f2 -/* A4F9D8 802409D8 00000000 */ nop +/* A4F9D8 802409D8 00000000 */ nop /* A4F9DC 802409DC 45000006 */ bc1f .L802409F8 /* A4F9E0 802409E0 0240202D */ daddu $a0, $s2, $zero /* A4F9E4 802409E4 8E450018 */ lw $a1, 0x18($s2) @@ -272,7 +272,7 @@ glabel func_802405FC_A4F5FC /* A4FA04 80240A04 44801000 */ mtc1 $zero, $f2 /* A4FA08 80240A08 46000021 */ cvt.d.s $f0, $f0 /* A4FA0C 80240A0C 4622003C */ c.lt.d $f0, $f2 -/* A4FA10 80240A10 00000000 */ nop +/* A4FA10 80240A10 00000000 */ nop /* A4FA14 80240A14 45030001 */ bc1tl .L80240A1C /* A4FA18 80240A18 2416000B */ addiu $s6, $zero, 0xb .L80240A1C: @@ -288,7 +288,7 @@ glabel func_802405FC_A4F5FC /* A4FA3C 80240A3C 8E620070 */ lw $v0, 0x70($s3) /* A4FA40 80240A40 30420001 */ andi $v0, $v0, 1 /* A4FA44 80240A44 10400009 */ beqz $v0, .L80240A6C -/* A4FA48 80240A48 00000000 */ nop +/* A4FA48 80240A48 00000000 */ nop /* A4FA4C 80240A4C C640004C */ lwc1 $f0, 0x4c($s2) /* A4FA50 80240A50 3C014044 */ lui $at, 0x4044 /* A4FA54 80240A54 44811800 */ mtc1 $at, $f3 diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240B38_A4FB38.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240B38_A4FB38.s index 9e5f4be74f..fc7d78a9bc 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240B38_A4FB38.s +++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240B38_A4FB38.s @@ -50,7 +50,7 @@ glabel func_80240B38_A4FB38 .L80240BE4: /* A4FBE4 80240BE4 86240008 */ lh $a0, 8($s1) /* A4FBE8 80240BE8 0C00FB5A */ jal get_enemy_safe -/* A4FBEC 80240BEC 00000000 */ nop +/* A4FBEC 80240BEC 00000000 */ nop /* A4FBF0 80240BF0 14400005 */ bnez $v0, .L80240C08 /* A4FBF4 80240BF4 0260202D */ daddu $a0, $s3, $zero /* A4FBF8 80240BF8 3C05FE36 */ lui $a1, 0xfe36 @@ -60,7 +60,7 @@ glabel func_80240B38_A4FB38 .L80240C08: /* A4FC08 80240C08 86240008 */ lh $a0, 8($s1) /* A4FC0C 80240C0C 0C00EABB */ jal get_npc_unsafe -/* A4FC10 80240C10 00000000 */ nop +/* A4FC10 80240C10 00000000 */ nop /* A4FC14 80240C14 8E630070 */ lw $v1, 0x70($s3) /* A4FC18 80240C18 10600006 */ beqz $v1, .L80240C34 /* A4FC1C 80240C1C 0040802D */ daddu $s0, $v0, $zero @@ -68,7 +68,7 @@ glabel func_80240B38_A4FB38 /* A4FC24 80240C24 1062003F */ beq $v1, $v0, .L80240D24 /* A4FC28 80240C28 0000102D */ daddu $v0, $zero, $zero /* A4FC2C 80240C2C 080903DA */ j .L80240F68 -/* A4FC30 80240C30 00000000 */ nop +/* A4FC30 80240C30 00000000 */ nop .L80240C34: /* A4FC34 80240C34 AFA00010 */ sw $zero, 0x10($sp) /* A4FC38 80240C38 AFA00014 */ sw $zero, 0x14($sp) @@ -79,7 +79,7 @@ glabel func_80240B38_A4FB38 /* A4FC4C 80240C4C 24040002 */ addiu $a0, $zero, 2 /* A4FC50 80240C50 C64C006C */ lwc1 $f12, 0x6c($s2) /* A4FC54 80240C54 0C00A6C9 */ jal clamp_angle -/* A4FC58 80240C58 00000000 */ nop +/* A4FC58 80240C58 00000000 */ nop /* A4FC5C 80240C5C 3C018024 */ lui $at, %hi(func_802427D0_833FD0) /* A4FC60 80240C60 D43827D0 */ ldc1 $f24, %lo(func_802427D0_833FD0)($at) /* A4FC64 80240C64 46000521 */ cvt.d.s $f20, $f0 @@ -107,7 +107,7 @@ glabel func_80240B38_A4FB38 /* A4FCBC 80240CBC 46000306 */ mov.s $f12, $f0 /* A4FCC0 80240CC0 46000021 */ cvt.d.s $f0, $f0 /* A4FCC4 80240CC4 4638003C */ c.lt.d $f0, $f24 -/* A4FCC8 80240CC8 00000000 */ nop +/* A4FCC8 80240CC8 00000000 */ nop /* A4FCCC 80240CCC 45020002 */ bc1fl .L80240CD8 /* A4FCD0 80240CD0 E614000C */ swc1 $f20, 0xc($s0) /* A4FCD4 80240CD4 E616000C */ swc1 $f22, 0xc($s0) @@ -117,7 +117,7 @@ glabel func_80240B38_A4FB38 /* A4FCE0 80240CE0 D42227E0 */ ldc1 $f2, %lo(D_802427E0)($at) /* A4FCE4 80240CE4 46000021 */ cvt.d.s $f0, $f0 /* A4FCE8 80240CE8 46220002 */ mul.d $f0, $f0, $f2 -/* A4FCEC 80240CEC 00000000 */ nop +/* A4FCEC 80240CEC 00000000 */ nop /* A4FCF0 80240CF0 3C013F66 */ lui $at, 0x3f66 /* A4FCF4 80240CF4 34216666 */ ori $at, $at, 0x6666 /* A4FCF8 80240CF8 44812000 */ mtc1 $at, $f4 @@ -147,13 +147,13 @@ glabel func_80240B38_A4FB38 /* A4FD54 80240D54 860200A6 */ lh $v0, 0xa6($s0) /* A4FD58 80240D58 27A60024 */ addiu $a2, $sp, 0x24 /* A4FD5C 80240D5C 44820000 */ mtc1 $v0, $f0 -/* A4FD60 80240D60 00000000 */ nop +/* A4FD60 80240D60 00000000 */ nop /* A4FD64 80240D64 46800020 */ cvt.s.w $f0, $f0 /* A4FD68 80240D68 E7A00018 */ swc1 $f0, 0x18($sp) /* A4FD6C 80240D6C 860200A8 */ lh $v0, 0xa8($s0) /* A4FD70 80240D70 27A70028 */ addiu $a3, $sp, 0x28 /* A4FD74 80240D74 44820000 */ mtc1 $v0, $f0 -/* A4FD78 80240D78 00000000 */ nop +/* A4FD78 80240D78 00000000 */ nop /* A4FD7C 80240D7C 46800020 */ cvt.s.w $f0, $f0 /* A4FD80 80240D80 0C037711 */ jal func_800DDC44 /* A4FD84 80240D84 E7A0001C */ swc1 $f0, 0x1c($sp) @@ -173,7 +173,7 @@ glabel func_80240B38_A4FB38 /* A4FDB4 80240DB4 44801800 */ mtc1 $zero, $f3 /* A4FDB8 80240DB8 46000021 */ cvt.d.s $f0, $f0 /* A4FDBC 80240DBC 4622003C */ c.lt.d $f0, $f2 -/* A4FDC0 80240DC0 00000000 */ nop +/* A4FDC0 80240DC0 00000000 */ nop /* A4FDC4 80240DC4 45000028 */ bc1f .L80240E68 /* A4FDC8 80240DC8 27A50020 */ addiu $a1, $sp, 0x20 /* A4FDCC 80240DCC 27A60024 */ addiu $a2, $sp, 0x24 @@ -204,7 +204,7 @@ glabel func_80240B38_A4FB38 /* A4FE30 80240E30 0C0372DF */ jal func_800DCB7C /* A4FE34 80240E34 27A70028 */ addiu $a3, $sp, 0x28 /* A4FE38 80240E38 1040000B */ beqz $v0, .L80240E68 -/* A4FE3C 80240E3C 00000000 */ nop +/* A4FE3C 80240E3C 00000000 */ nop /* A4FE40 80240E40 C600001C */ lwc1 $f0, 0x1c($s0) /* A4FE44 80240E44 C7A2002C */ lwc1 $f2, 0x2c($sp) /* A4FE48 80240E48 46000005 */ abs.s $f0, $f0 @@ -212,7 +212,7 @@ glabel func_80240B38_A4FB38 /* A4FE50 80240E50 46340000 */ add.d $f0, $f0, $f20 /* A4FE54 80240E54 460010A1 */ cvt.d.s $f2, $f2 /* A4FE58 80240E58 4620103E */ c.le.d $f2, $f0 -/* A4FE5C 80240E5C 00000000 */ nop +/* A4FE5C 80240E5C 00000000 */ nop /* A4FE60 80240E60 45030001 */ bc1tl .L80240E68 /* A4FE64 80240E64 24120001 */ addiu $s2, $zero, 1 .L80240E68: @@ -234,7 +234,7 @@ glabel func_80240B38_A4FB38 /* A4FEA0 80240EA0 2414000B */ addiu $s4, $zero, 0xb .L80240EA4: /* A4FEA4 80240EA4 12800024 */ beqz $s4, .L80240F38 -/* A4FEA8 80240EA8 00000000 */ nop +/* A4FEA8 80240EA8 00000000 */ nop /* A4FEAC 80240EAC AFA00010 */ sw $zero, 0x10($sp) /* A4FEB0 80240EB0 AFA00014 */ sw $zero, 0x14($sp) /* A4FEB4 80240EB4 8E050038 */ lw $a1, 0x38($s0) @@ -268,7 +268,7 @@ glabel func_80240B38_A4FB38 /* A4FF24 80240F24 AC800070 */ sw $zero, 0x70($a0) .L80240F28: /* A4FF28 80240F28 0C0B2026 */ jal set_variable -/* A4FF2C 80240F2C 00000000 */ nop +/* A4FF2C 80240F2C 00000000 */ nop /* A4FF30 80240F30 080903DA */ j .L80240F68 /* A4FF34 80240F34 24020002 */ addiu $v0, $zero, 2 .L80240F38: diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s index 03774026e1..f4d144c381 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s +++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s @@ -103,41 +103,48 @@ glabel func_80240F94_A4FF94 /* A50104 80241104 2C620064 */ sltiu $v0, $v1, 0x64 /* A50108 80241108 10400060 */ beqz $v0, .L8024128C /* A5010C 8024110C 00031080 */ sll $v0, $v1, 2 -/* A50110 80241110 3C018024 */ lui $at, %hi(D_802427E8) +/* A50110 80241110 3C018024 */ lui $at, %hi(jtbl_802427E8_A517E8) /* A50114 80241114 00220821 */ addu $at, $at, $v0 -/* A50118 80241118 8C2227E8 */ lw $v0, %lo(D_802427E8)($at) +/* A50118 80241118 8C2227E8 */ lw $v0, %lo(jtbl_802427E8_A517E8)($at) /* A5011C 8024111C 00400008 */ jr $v0 /* A50120 80241120 00000000 */ nop +glabel L80241124_A50124 /* A50124 80241124 0260202D */ daddu $a0, $s3, $zero /* A50128 80241128 0200282D */ daddu $a1, $s0, $zero /* A5012C 8024112C 0C012568 */ jal func_800495A0 /* A50130 80241130 02A0302D */ daddu $a2, $s5, $zero +glabel L80241134_A50134 /* A50134 80241134 0260202D */ daddu $a0, $s3, $zero /* A50138 80241138 0200282D */ daddu $a1, $s0, $zero /* A5013C 8024113C 0C0125AE */ jal func_800496B8 /* A50140 80241140 02A0302D */ daddu $a2, $s5, $zero /* A50144 80241144 080904A3 */ j .L8024128C /* A50148 80241148 00000000 */ nop +glabel L8024114C_A5014C /* A5014C 8024114C 0260202D */ daddu $a0, $s3, $zero /* A50150 80241150 0200282D */ daddu $a1, $s0, $zero /* A50154 80241154 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A50158 80241158 02A0302D */ daddu $a2, $s5, $zero +glabel L8024115C_A5015C /* A5015C 8024115C 0260202D */ daddu $a0, $s3, $zero /* A50160 80241160 0200282D */ daddu $a1, $s0, $zero /* A50164 80241164 0C012701 */ jal func_80049C04 /* A50168 80241168 02A0302D */ daddu $a2, $s5, $zero /* A5016C 8024116C 080904A3 */ j .L8024128C /* A50170 80241170 00000000 */ nop +glabel L80241174_A50174 /* A50174 80241174 0260202D */ daddu $a0, $s3, $zero /* A50178 80241178 0200282D */ daddu $a1, $s0, $zero /* A5017C 8024117C 0C01278F */ jal func_80049E3C /* A50180 80241180 02A0302D */ daddu $a2, $s5, $zero +glabel L80241184_A50184 /* A50184 80241184 0260202D */ daddu $a0, $s3, $zero /* A50188 80241188 0200282D */ daddu $a1, $s0, $zero /* A5018C 8024118C 0C0127B3 */ jal func_80049ECC /* A50190 80241190 02A0302D */ daddu $a2, $s5, $zero /* A50194 80241194 080904A3 */ j .L8024128C /* A50198 80241198 00000000 */ nop +glabel L8024119C_A5019C /* A5019C 8024119C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A501A0 802411A0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A501A4 802411A4 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -170,37 +177,45 @@ glabel func_80240F94_A4FF94 /* A50208 80241208 0200282D */ daddu $a1, $s0, $zero /* A5020C 8024120C 0C0127DF */ jal func_80049F7C /* A50210 80241210 02A0302D */ daddu $a2, $s5, $zero +glabel L80241214_A50214 /* A50214 80241214 0260202D */ daddu $a0, $s3, $zero /* A50218 80241218 0200282D */ daddu $a1, $s0, $zero /* A5021C 8024121C 0C012849 */ jal func_8004A124 /* A50220 80241220 02A0302D */ daddu $a2, $s5, $zero /* A50224 80241224 080904A3 */ j .L8024128C /* A50228 80241228 00000000 */ nop +glabel L8024122C_A5022C /* A5022C 8024122C 0260202D */ daddu $a0, $s3, $zero /* A50230 80241230 0200282D */ daddu $a1, $s0, $zero /* A50234 80241234 0C0128FA */ jal func_8004A3E8 /* A50238 80241238 02A0302D */ daddu $a2, $s5, $zero /* A5023C 8024123C 080904A3 */ j .L8024128C /* A50240 80241240 00000000 */ nop +glabel L80241244_A50244 /* A50244 80241244 0C0900F5 */ jal func_802403D4_A4F3D4 /* A50248 80241248 0260202D */ daddu $a0, $s3, $zero /* A5024C 8024124C 080904A3 */ j .L8024128C /* A50250 80241250 00000000 */ nop +glabel L80241254_A50254 /* A50254 80241254 0C090135 */ jal kpa_09_UnkSetDurationFunc /* A50258 80241258 0260202D */ daddu $a0, $s3, $zero /* A5025C 8024125C 080904A3 */ j .L8024128C /* A50260 80241260 00000000 */ nop +glabel L80241264_A50264 /* A50264 80241264 0C090146 */ jal kpa_09_UnkNpcAIFunc9 /* A50268 80241268 0260202D */ daddu $a0, $s3, $zero /* A5026C 8024126C 080904A3 */ j .L8024128C /* A50270 80241270 00000000 */ nop +glabel L80241274_A50274 /* A50274 80241274 0C09016E */ jal kpa_09_UnkDurationCheck /* A50278 80241278 0260202D */ daddu $a0, $s3, $zero /* A5027C 8024127C 080904A3 */ j .L8024128C /* A50280 80241280 00000000 */ nop +glabel L80241284_A50284 /* A50284 80241284 0C0129CF */ jal func_8004A73C /* A50288 80241288 0260202D */ daddu $a0, $s3, $zero .L8024128C: +glabel L8024128C_A5028C /* A5028C 8024128C 8FBF0048 */ lw $ra, 0x48($sp) /* A50290 80241290 8FB50044 */ lw $s5, 0x44($sp) /* A50294 80241294 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_100/A93160/func_80240000_A93160.s b/asm/nonmatchings/world/area_kpa/kpa_100/A93160/func_80240000_A93160.s index 1258b6349b..5d4d073e78 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_100/A93160/func_80240000_A93160.s +++ b/asm/nonmatchings/world/area_kpa/kpa_100/A93160/func_80240000_A93160.s @@ -9,7 +9,7 @@ glabel func_80240000_A93160 /* A93170 80240010 24A502B0 */ addiu $a1, $a1, %lo(func_802402B0_90CEF0) /* A93174 80240014 AFBF0010 */ sw $ra, 0x10($sp) /* A93178 80240018 0C01953C */ jal sprintf -/* A9317C 8024001C 00000000 */ nop +/* A9317C 8024001C 00000000 */ nop /* A93180 80240020 3C04800E */ lui $a0, %hi(D_800D91E0) /* A93184 80240024 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) /* A93188 80240028 3C058024 */ lui $a1, %hi(D_802402C0) @@ -19,6 +19,6 @@ glabel func_80240000_A93160 /* A93198 80240038 0000102D */ daddu $v0, $zero, $zero /* A9319C 8024003C 03E00008 */ jr $ra /* A931A0 80240040 27BD0018 */ addiu $sp, $sp, 0x18 -/* A931A4 80240044 00000000 */ nop -/* A931A8 80240048 00000000 */ nop -/* A931AC 8024004C 00000000 */ nop +/* A931A4 80240044 00000000 */ nop +/* A931A8 80240048 00000000 */ nop +/* A931AC 8024004C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_101/A93440/func_80240000_A93440.s b/asm/nonmatchings/world/area_kpa/kpa_101/A93440/func_80240000_A93440.s index b3cf3044b5..d6e1718aff 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_101/A93440/func_80240000_A93440.s +++ b/asm/nonmatchings/world/area_kpa/kpa_101/A93440/func_80240000_A93440.s @@ -9,7 +9,7 @@ glabel func_80240000_A93440 /* A93450 80240010 24A502D0 */ addiu $a1, $a1, %lo(func_802402D0_A7A7D0) /* A93454 80240014 AFBF0010 */ sw $ra, 0x10($sp) /* A93458 80240018 0C01953C */ jal sprintf -/* A9345C 8024001C 00000000 */ nop +/* A9345C 8024001C 00000000 */ nop /* A93460 80240020 3C04800E */ lui $a0, %hi(D_800D91E0) /* A93464 80240024 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) /* A93468 80240028 3C058024 */ lui $a1, %hi(func_802402E0_A071E0) @@ -19,6 +19,6 @@ glabel func_80240000_A93440 /* A93478 80240038 0000102D */ daddu $v0, $zero, $zero /* A9347C 8024003C 03E00008 */ jr $ra /* A93480 80240040 27BD0018 */ addiu $sp, $sp, 0x18 -/* A93484 80240044 00000000 */ nop -/* A93488 80240048 00000000 */ nop -/* A9348C 8024004C 00000000 */ nop +/* A93484 80240044 00000000 */ nop +/* A93488 80240048 00000000 */ nop +/* A9348C 8024004C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240310_A93A50.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240310_A93A50.s index 7228d8e948..b055b45e43 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240310_A93A50.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240310_A93A50.s @@ -42,16 +42,16 @@ glabel func_80240310_A93A50 /* A93AE4 802403A4 3C014387 */ lui $at, 0x4387 /* A93AE8 802403A8 4481A000 */ mtc1 $at, $f20 /* A93AEC 802403AC 0C00A70A */ jal get_clamped_angle_diff -/* A93AF0 802403B0 00000000 */ nop +/* A93AF0 802403B0 00000000 */ nop /* A93AF4 802403B4 0C00A6C9 */ jal clamp_angle /* A93AF8 802403B8 46000306 */ mov.s $f12, $f0 /* A93AFC 802403BC 3C018024 */ lui $at, %hi(D_80245B20) /* A93B00 802403C0 D4225B20 */ ldc1 $f2, %lo(D_80245B20)($at) /* A93B04 802403C4 46000021 */ cvt.d.s $f0, $f0 /* A93B08 802403C8 4622003C */ c.lt.d $f0, $f2 -/* A93B0C 802403CC 00000000 */ nop +/* A93B0C 802403CC 00000000 */ nop /* A93B10 802403D0 45000003 */ bc1f .L802403E0 -/* A93B14 802403D4 00000000 */ nop +/* A93B14 802403D4 00000000 */ nop /* A93B18 802403D8 3C0142B4 */ lui $at, 0x42b4 /* A93B1C 802403DC 4481A000 */ mtc1 $at, $f20 .L802403E0: @@ -71,7 +71,7 @@ glabel func_80240310_A93A50 /* A93B54 80240414 D4225B28 */ ldc1 $f2, %lo(D_80245B28)($at) /* A93B58 80240418 46000021 */ cvt.d.s $f0, $f0 /* A93B5C 8024041C 4620103C */ c.lt.d $f2, $f0 -/* A93B60 80240420 00000000 */ nop +/* A93B60 80240420 00000000 */ nop /* A93B64 80240424 4501002E */ bc1t .L802404E0 /* A93B68 80240428 2402FFFF */ addiu $v0, $zero, -1 /* A93B6C 8024042C 8E220000 */ lw $v0, ($s1) @@ -80,13 +80,13 @@ glabel func_80240310_A93A50 /* A93B78 80240438 860200A8 */ lh $v0, 0xa8($s0) /* A93B7C 8024043C 46020001 */ sub.s $f0, $f0, $f2 /* A93B80 80240440 44821000 */ mtc1 $v0, $f2 -/* A93B84 80240444 00000000 */ nop +/* A93B84 80240444 00000000 */ nop /* A93B88 80240448 468010A1 */ cvt.d.w $f2, $f2 /* A93B8C 8024044C 46221080 */ add.d $f2, $f2, $f2 /* A93B90 80240450 46000005 */ abs.s $f0, $f0 /* A93B94 80240454 46000021 */ cvt.d.s $f0, $f0 /* A93B98 80240458 4620103E */ c.le.d $f2, $f0 -/* A93B9C 8024045C 00000000 */ nop +/* A93B9C 8024045C 00000000 */ nop /* A93BA0 80240460 4501001F */ bc1t .L802404E0 /* A93BA4 80240464 2402FFFF */ addiu $v0, $zero, -1 /* A93BA8 80240468 3C038011 */ lui $v1, %hi(D_8010EBB3) @@ -97,7 +97,7 @@ glabel func_80240310_A93A50 /* A93BBC 8024047C 14620005 */ bne $v1, $v0, .L80240494 /* A93BC0 80240480 2402FFFF */ addiu $v0, $zero, -1 /* A93BC4 80240484 08090138 */ j .L802404E0 -/* A93BC8 80240488 00000000 */ nop +/* A93BC8 80240488 00000000 */ nop .L8024048C: /* A93BCC 8024048C 08090138 */ j .L802404E0 /* A93BD0 80240490 0240102D */ daddu $v0, $s2, $zero @@ -120,7 +120,7 @@ glabel func_80240310_A93A50 /* A93C0C 802404CC 8E620078 */ lw $v0, 0x78($s3) /* A93C10 802404D0 0222102A */ slt $v0, $s1, $v0 /* A93C14 802404D4 1440FFF2 */ bnez $v0, .L802404A0 -/* A93C18 802404D8 00000000 */ nop +/* A93C18 802404D8 00000000 */ nop .L802404DC: /* A93C1C 802404DC 2402FFFF */ addiu $v0, $zero, -1 .L802404E0: diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240500_A93C40.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240500_A93C40.s index 1874be1ca2..a76396ff48 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240500_A93C40.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240500_A93C40.s @@ -38,7 +38,7 @@ glabel func_80240500_A93C40 /* A93CC4 80240584 2402000F */ addiu $v0, $zero, 0xf /* A93CC8 80240588 AFA2001C */ sw $v0, 0x1c($sp) /* A93CCC 8024058C 44833000 */ mtc1 $v1, $f6 -/* A93CD0 80240590 00000000 */ nop +/* A93CD0 80240590 00000000 */ nop /* A93CD4 80240594 468031A0 */ cvt.s.w $f6, $f6 /* A93CD8 80240598 44073000 */ mfc1 $a3, $f6 /* A93CDC 8024059C 27A20028 */ addiu $v0, $sp, 0x28 @@ -60,15 +60,15 @@ glabel func_80240500_A93C40 /* A93D18 802405D8 0040202D */ daddu $a0, $v0, $zero /* A93D1C 802405DC 2402FFFF */ addiu $v0, $zero, -1 /* A93D20 802405E0 10820010 */ beq $a0, $v0, .L80240624 -/* A93D24 802405E4 00000000 */ nop +/* A93D24 802405E4 00000000 */ nop /* A93D28 802405E8 0C00FB3A */ jal get_enemy -/* A93D2C 802405EC 00000000 */ nop +/* A93D2C 802405EC 00000000 */ nop /* A93D30 802405F0 8C42006C */ lw $v0, 0x6c($v0) /* A93D34 802405F4 1440000B */ bnez $v0, .L80240624 -/* A93D38 802405F8 00000000 */ nop +/* A93D38 802405F8 00000000 */ nop /* A93D3C 802405FC 8602008C */ lh $v0, 0x8c($s0) /* A93D40 80240600 14400008 */ bnez $v0, .L80240624 -/* A93D44 80240604 00000000 */ nop +/* A93D44 80240604 00000000 */ nop /* A93D48 80240608 8E2200CC */ lw $v0, 0xcc($s1) /* A93D4C 8024060C 8C420020 */ lw $v0, 0x20($v0) /* A93D50 80240610 AE020028 */ sw $v0, 0x28($s0) diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240644_A93D84.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240644_A93D84.s index ce02d972a7..eeabd35002 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240644_A93D84.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240644_A93D84.s @@ -17,7 +17,7 @@ glabel func_80240644_A93D84 /* A93DB4 80240674 A602008E */ sh $v0, 0x8e($s0) /* A93DB8 80240678 00021400 */ sll $v0, $v0, 0x10 /* A93DBC 8024067C 1C40002B */ bgtz $v0, .L8024072C -/* A93DC0 80240680 00000000 */ nop +/* A93DC0 80240680 00000000 */ nop /* A93DC4 80240684 0C0900C4 */ jal func_80240310_A93A50 /* A93DC8 80240688 0240202D */ daddu $a0, $s2, $zero /* A93DCC 8024068C 0040202D */ daddu $a0, $v0, $zero @@ -35,7 +35,7 @@ glabel func_80240644_A93D84 /* A93DFC 802406BC 3C01C1A0 */ lui $at, 0xc1a0 /* A93E00 802406C0 44812000 */ mtc1 $at, $f4 /* A93E04 802406C4 44833000 */ mtc1 $v1, $f6 -/* A93E08 802406C8 00000000 */ nop +/* A93E08 802406C8 00000000 */ nop /* A93E0C 802406CC 468031A0 */ cvt.s.w $f6, $f6 /* A93E10 802406D0 44073000 */ mfc1 $a3, $f6 /* A93E14 802406D4 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024086C_A93FAC.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024086C_A93FAC.s index a355f9eb00..ab8a9db368 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024086C_A93FAC.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024086C_A93FAC.s @@ -47,7 +47,7 @@ glabel func_8024086C_A93FAC /* A94050 80240910 8E6200B0 */ lw $v0, 0xb0($s3) /* A94054 80240914 30420004 */ andi $v0, $v0, 4 /* A94058 80240918 10400019 */ beqz $v0, .L80240980 -/* A9405C 8024091C 00000000 */ nop +/* A9405C 8024091C 00000000 */ nop .L80240920: /* A94060 80240920 34630102 */ ori $v1, $v1, 0x102 /* A94064 80240924 AEE00070 */ sw $zero, 0x70($s7) @@ -83,12 +83,12 @@ glabel func_8024086C_A93FAC /* A940D8 80240998 10600007 */ beqz $v1, .L802409B8 /* A940DC 8024099C 0000102D */ daddu $v0, $zero, $zero /* A940E0 802409A0 0809035F */ j .L80240D7C -/* A940E4 802409A4 00000000 */ nop +/* A940E4 802409A4 00000000 */ nop .L802409A8: /* A940E8 802409A8 1062005B */ beq $v1, $v0, .L80240B18 /* A940EC 802409AC 0000102D */ daddu $v0, $zero, $zero /* A940F0 802409B0 0809035F */ j .L80240D7C -/* A940F4 802409B4 00000000 */ nop +/* A940F4 802409B4 00000000 */ nop .L802409B8: /* A940F8 802409B8 8E420000 */ lw $v0, ($s2) /* A940FC 802409BC 0240202D */ daddu $a0, $s2, $zero @@ -131,17 +131,17 @@ glabel func_8024086C_A93FAC /* A9418C 80240A4C C6400038 */ lwc1 $f0, 0x38($s2) /* A94190 80240A50 4600020D */ trunc.w.s $f8, $f0 /* A94194 80240A54 44024000 */ mfc1 $v0, $f8 -/* A94198 80240A58 00000000 */ nop +/* A94198 80240A58 00000000 */ nop /* A9419C 80240A5C A6620010 */ sh $v0, 0x10($s3) /* A941A0 80240A60 C640003C */ lwc1 $f0, 0x3c($s2) /* A941A4 80240A64 4600020D */ trunc.w.s $f8, $f0 /* A941A8 80240A68 44024000 */ mfc1 $v0, $f8 -/* A941AC 80240A6C 00000000 */ nop +/* A941AC 80240A6C 00000000 */ nop /* A941B0 80240A70 A6620012 */ sh $v0, 0x12($s3) /* A941B4 80240A74 C6400040 */ lwc1 $f0, 0x40($s2) /* A941B8 80240A78 4600020D */ trunc.w.s $f8, $f0 /* A941BC 80240A7C 44024000 */ mfc1 $v0, $f8 -/* A941C0 80240A80 00000000 */ nop +/* A941C0 80240A80 00000000 */ nop /* A941C4 80240A84 A6620014 */ sh $v0, 0x14($s3) /* A941C8 80240A88 AE400044 */ sw $zero, 0x44($s2) /* A941CC 80240A8C AE400048 */ sw $zero, 0x48($s2) @@ -187,10 +187,10 @@ glabel func_8024086C_A93FAC /* A94268 80240B28 44810800 */ mtc1 $at, $f1 /* A9426C 80240B2C 44800000 */ mtc1 $zero, $f0 /* A94270 80240B30 44821000 */ mtc1 $v0, $f2 -/* A94274 80240B34 00000000 */ nop +/* A94274 80240B34 00000000 */ nop /* A94278 80240B38 468010A1 */ cvt.d.w $f2, $f2 /* A9427C 80240B3C 46201082 */ mul.d $f2, $f2, $f0 -/* A94280 80240B40 00000000 */ nop +/* A94280 80240B40 00000000 */ nop /* A94284 80240B44 0200282D */ daddu $a1, $s0, $zero /* A94288 80240B48 C6440038 */ lwc1 $f4, 0x38($s2) /* A9428C 80240B4C C640003C */ lwc1 $f0, 0x3c($s2) @@ -210,13 +210,13 @@ glabel func_8024086C_A93FAC /* A942C4 80240B84 864200A6 */ lh $v0, 0xa6($s2) /* A942C8 80240B88 27B40028 */ addiu $s4, $sp, 0x28 /* A942CC 80240B8C 44820000 */ mtc1 $v0, $f0 -/* A942D0 80240B90 00000000 */ nop +/* A942D0 80240B90 00000000 */ nop /* A942D4 80240B94 46800020 */ cvt.s.w $f0, $f0 /* A942D8 80240B98 E7A00018 */ swc1 $f0, 0x18($sp) /* A942DC 80240B9C 864200A8 */ lh $v0, 0xa8($s2) /* A942E0 80240BA0 0280382D */ daddu $a3, $s4, $zero /* A942E4 80240BA4 44820000 */ mtc1 $v0, $f0 -/* A942E8 80240BA8 00000000 */ nop +/* A942E8 80240BA8 00000000 */ nop /* A942EC 80240BAC 46800020 */ cvt.s.w $f0, $f0 /* A942F0 80240BB0 0C0376B9 */ jal func_800DDAE4 /* A942F4 80240BB4 E7A0001C */ swc1 $f0, 0x1c($sp) @@ -240,14 +240,14 @@ glabel func_8024086C_A93FAC /* A94338 80240BF8 0C0372DF */ jal func_800DCB7C /* A9433C 80240BFC 0280382D */ daddu $a3, $s4, $zero /* A94340 80240C00 10400019 */ beqz $v0, .L80240C68 -/* A94344 80240C04 00000000 */ nop +/* A94344 80240C04 00000000 */ nop /* A94348 80240C08 C640001C */ lwc1 $f0, 0x1c($s2) /* A9434C 80240C0C C7A2002C */ lwc1 $f2, 0x2c($sp) /* A94350 80240C10 46000005 */ abs.s $f0, $f0 /* A94354 80240C14 4600103C */ c.lt.s $f2, $f0 -/* A94358 80240C18 00000000 */ nop +/* A94358 80240C18 00000000 */ nop /* A9435C 80240C1C 45000012 */ bc1f .L80240C68 -/* A94360 80240C20 00000000 */ nop +/* A94360 80240C20 00000000 */ nop /* A94364 80240C24 C7A40024 */ lwc1 $f4, 0x24($sp) /* A94368 80240C28 C6400064 */ lwc1 $f0, 0x64($s2) /* A9436C 80240C2C 46002001 */ sub.s $f0, $f4, $f0 @@ -257,7 +257,7 @@ glabel func_8024086C_A93FAC /* A9437C 80240C3C 46000005 */ abs.s $f0, $f0 /* A94380 80240C40 46000021 */ cvt.d.s $f0, $f0 /* A94384 80240C44 4622003C */ c.lt.d $f0, $f2 -/* A94388 80240C48 00000000 */ nop +/* A94388 80240C48 00000000 */ nop /* A9438C 80240C4C 45000006 */ bc1f .L80240C68 /* A94390 80240C50 0240202D */ daddu $a0, $s2, $zero /* A94394 80240C54 8E450018 */ lw $a1, 0x18($s2) @@ -272,7 +272,7 @@ glabel func_8024086C_A93FAC /* A943B4 80240C74 44801000 */ mtc1 $zero, $f2 /* A943B8 80240C78 46000021 */ cvt.d.s $f0, $f0 /* A943BC 80240C7C 4622003C */ c.lt.d $f0, $f2 -/* A943C0 80240C80 00000000 */ nop +/* A943C0 80240C80 00000000 */ nop /* A943C4 80240C84 45030001 */ bc1tl .L80240C8C /* A943C8 80240C88 2416000B */ addiu $s6, $zero, 0xb .L80240C8C: @@ -288,7 +288,7 @@ glabel func_8024086C_A93FAC /* A943EC 80240CAC 8E620070 */ lw $v0, 0x70($s3) /* A943F0 80240CB0 30420001 */ andi $v0, $v0, 1 /* A943F4 80240CB4 10400009 */ beqz $v0, .L80240CDC -/* A943F8 80240CB8 00000000 */ nop +/* A943F8 80240CB8 00000000 */ nop /* A943FC 80240CBC C640004C */ lwc1 $f0, 0x4c($s2) /* A94400 80240CC0 3C014044 */ lui $at, 0x4044 /* A94404 80240CC4 44811800 */ mtc1 $at, $f3 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240DA8_A944E8.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240DA8_A944E8.s index 3cf223cba3..dea866efcb 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240DA8_A944E8.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240DA8_A944E8.s @@ -50,7 +50,7 @@ glabel func_80240DA8_A944E8 .L80240E54: /* A94594 80240E54 86240008 */ lh $a0, 8($s1) /* A94598 80240E58 0C00FB5A */ jal get_enemy_safe -/* A9459C 80240E5C 00000000 */ nop +/* A9459C 80240E5C 00000000 */ nop /* A945A0 80240E60 14400005 */ bnez $v0, .L80240E78 /* A945A4 80240E64 0260202D */ daddu $a0, $s3, $zero /* A945A8 80240E68 3C05FE36 */ lui $a1, 0xfe36 @@ -60,7 +60,7 @@ glabel func_80240DA8_A944E8 .L80240E78: /* A945B8 80240E78 86240008 */ lh $a0, 8($s1) /* A945BC 80240E7C 0C00EABB */ jal get_npc_unsafe -/* A945C0 80240E80 00000000 */ nop +/* A945C0 80240E80 00000000 */ nop /* A945C4 80240E84 8E630070 */ lw $v1, 0x70($s3) /* A945C8 80240E88 10600006 */ beqz $v1, .L80240EA4 /* A945CC 80240E8C 0040802D */ daddu $s0, $v0, $zero @@ -68,7 +68,7 @@ glabel func_80240DA8_A944E8 /* A945D4 80240E94 1062003F */ beq $v1, $v0, .L80240F94 /* A945D8 80240E98 0000102D */ daddu $v0, $zero, $zero /* A945DC 80240E9C 08090476 */ j .L802411D8 -/* A945E0 80240EA0 00000000 */ nop +/* A945E0 80240EA0 00000000 */ nop .L80240EA4: /* A945E4 80240EA4 AFA00010 */ sw $zero, 0x10($sp) /* A945E8 80240EA8 AFA00014 */ sw $zero, 0x14($sp) @@ -79,7 +79,7 @@ glabel func_80240DA8_A944E8 /* A945FC 80240EBC 24040002 */ addiu $a0, $zero, 2 /* A94600 80240EC0 C64C006C */ lwc1 $f12, 0x6c($s2) /* A94604 80240EC4 0C00A6C9 */ jal clamp_angle -/* A94608 80240EC8 00000000 */ nop +/* A94608 80240EC8 00000000 */ nop /* A9460C 80240ECC 3C018024 */ lui $at, %hi(D_80245B30) /* A94610 80240ED0 D4385B30 */ ldc1 $f24, %lo(D_80245B30)($at) /* A94614 80240ED4 46000521 */ cvt.d.s $f20, $f0 @@ -107,7 +107,7 @@ glabel func_80240DA8_A944E8 /* A9466C 80240F2C 46000306 */ mov.s $f12, $f0 /* A94670 80240F30 46000021 */ cvt.d.s $f0, $f0 /* A94674 80240F34 4638003C */ c.lt.d $f0, $f24 -/* A94678 80240F38 00000000 */ nop +/* A94678 80240F38 00000000 */ nop /* A9467C 80240F3C 45020002 */ bc1fl .L80240F48 /* A94680 80240F40 E614000C */ swc1 $f20, 0xc($s0) /* A94684 80240F44 E616000C */ swc1 $f22, 0xc($s0) @@ -117,7 +117,7 @@ glabel func_80240DA8_A944E8 /* A94690 80240F50 D4225B40 */ ldc1 $f2, %lo(D_80245B40)($at) /* A94694 80240F54 46000021 */ cvt.d.s $f0, $f0 /* A94698 80240F58 46220002 */ mul.d $f0, $f0, $f2 -/* A9469C 80240F5C 00000000 */ nop +/* A9469C 80240F5C 00000000 */ nop /* A946A0 80240F60 3C013F66 */ lui $at, 0x3f66 /* A946A4 80240F64 34216666 */ ori $at, $at, 0x6666 /* A946A8 80240F68 44812000 */ mtc1 $at, $f4 @@ -147,13 +147,13 @@ glabel func_80240DA8_A944E8 /* A94704 80240FC4 860200A6 */ lh $v0, 0xa6($s0) /* A94708 80240FC8 27A60024 */ addiu $a2, $sp, 0x24 /* A9470C 80240FCC 44820000 */ mtc1 $v0, $f0 -/* A94710 80240FD0 00000000 */ nop +/* A94710 80240FD0 00000000 */ nop /* A94714 80240FD4 46800020 */ cvt.s.w $f0, $f0 /* A94718 80240FD8 E7A00018 */ swc1 $f0, 0x18($sp) /* A9471C 80240FDC 860200A8 */ lh $v0, 0xa8($s0) /* A94720 80240FE0 27A70028 */ addiu $a3, $sp, 0x28 /* A94724 80240FE4 44820000 */ mtc1 $v0, $f0 -/* A94728 80240FE8 00000000 */ nop +/* A94728 80240FE8 00000000 */ nop /* A9472C 80240FEC 46800020 */ cvt.s.w $f0, $f0 /* A94730 80240FF0 0C037711 */ jal func_800DDC44 /* A94734 80240FF4 E7A0001C */ swc1 $f0, 0x1c($sp) @@ -173,7 +173,7 @@ glabel func_80240DA8_A944E8 /* A94764 80241024 44801800 */ mtc1 $zero, $f3 /* A94768 80241028 46000021 */ cvt.d.s $f0, $f0 /* A9476C 8024102C 4622003C */ c.lt.d $f0, $f2 -/* A94770 80241030 00000000 */ nop +/* A94770 80241030 00000000 */ nop /* A94774 80241034 45000028 */ bc1f .L802410D8 /* A94778 80241038 27A50020 */ addiu $a1, $sp, 0x20 /* A9477C 8024103C 27A60024 */ addiu $a2, $sp, 0x24 @@ -204,7 +204,7 @@ glabel func_80240DA8_A944E8 /* A947E0 802410A0 0C0372DF */ jal func_800DCB7C /* A947E4 802410A4 27A70028 */ addiu $a3, $sp, 0x28 /* A947E8 802410A8 1040000B */ beqz $v0, .L802410D8 -/* A947EC 802410AC 00000000 */ nop +/* A947EC 802410AC 00000000 */ nop /* A947F0 802410B0 C600001C */ lwc1 $f0, 0x1c($s0) /* A947F4 802410B4 C7A2002C */ lwc1 $f2, 0x2c($sp) /* A947F8 802410B8 46000005 */ abs.s $f0, $f0 @@ -212,7 +212,7 @@ glabel func_80240DA8_A944E8 /* A94800 802410C0 46340000 */ add.d $f0, $f0, $f20 /* A94804 802410C4 460010A1 */ cvt.d.s $f2, $f2 /* A94808 802410C8 4620103E */ c.le.d $f2, $f0 -/* A9480C 802410CC 00000000 */ nop +/* A9480C 802410CC 00000000 */ nop /* A94810 802410D0 45030001 */ bc1tl .L802410D8 /* A94814 802410D4 24120001 */ addiu $s2, $zero, 1 .L802410D8: @@ -234,7 +234,7 @@ glabel func_80240DA8_A944E8 /* A94850 80241110 2414000B */ addiu $s4, $zero, 0xb .L80241114: /* A94854 80241114 12800024 */ beqz $s4, .L802411A8 -/* A94858 80241118 00000000 */ nop +/* A94858 80241118 00000000 */ nop /* A9485C 8024111C AFA00010 */ sw $zero, 0x10($sp) /* A94860 80241120 AFA00014 */ sw $zero, 0x14($sp) /* A94864 80241124 8E050038 */ lw $a1, 0x38($s0) @@ -268,7 +268,7 @@ glabel func_80240DA8_A944E8 /* A948D4 80241194 AC800070 */ sw $zero, 0x70($a0) .L80241198: /* A948D8 80241198 0C0B2026 */ jal set_variable -/* A948DC 8024119C 00000000 */ nop +/* A948DC 8024119C 00000000 */ nop /* A948E0 802411A0 08090476 */ j .L802411D8 /* A948E4 802411A4 24020002 */ addiu $v0, $zero, 2 .L802411A8: diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s index bc82614b1b..8106971d6b 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s @@ -103,41 +103,48 @@ glabel func_80241204_A94944 /* A94AB4 80241374 2C620064 */ sltiu $v0, $v1, 0x64 /* A94AB8 80241378 10400060 */ beqz $v0, .L802414FC /* A94ABC 8024137C 00031080 */ sll $v0, $v1, 2 -/* A94AC0 80241380 3C018024 */ lui $at, %hi(D_80245B48) +/* A94AC0 80241380 3C018024 */ lui $at, %hi(jtbl_80245B48_A99288) /* A94AC4 80241384 00220821 */ addu $at, $at, $v0 -/* A94AC8 80241388 8C225B48 */ lw $v0, %lo(D_80245B48)($at) +/* A94AC8 80241388 8C225B48 */ lw $v0, %lo(jtbl_80245B48_A99288)($at) /* A94ACC 8024138C 00400008 */ jr $v0 /* A94AD0 80241390 00000000 */ nop +glabel L80241394_A94AD4 /* A94AD4 80241394 0260202D */ daddu $a0, $s3, $zero /* A94AD8 80241398 0200282D */ daddu $a1, $s0, $zero /* A94ADC 8024139C 0C012568 */ jal func_800495A0 /* A94AE0 802413A0 02A0302D */ daddu $a2, $s5, $zero +glabel L802413A4_A94AE4 /* A94AE4 802413A4 0260202D */ daddu $a0, $s3, $zero /* A94AE8 802413A8 0200282D */ daddu $a1, $s0, $zero /* A94AEC 802413AC 0C0125AE */ jal func_800496B8 /* A94AF0 802413B0 02A0302D */ daddu $a2, $s5, $zero /* A94AF4 802413B4 0809053F */ j .L802414FC /* A94AF8 802413B8 00000000 */ nop +glabel L802413BC_A94AFC /* A94AFC 802413BC 0260202D */ daddu $a0, $s3, $zero /* A94B00 802413C0 0200282D */ daddu $a1, $s0, $zero /* A94B04 802413C4 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A94B08 802413C8 02A0302D */ daddu $a2, $s5, $zero +glabel L802413CC_A94B0C /* A94B0C 802413CC 0260202D */ daddu $a0, $s3, $zero /* A94B10 802413D0 0200282D */ daddu $a1, $s0, $zero /* A94B14 802413D4 0C012701 */ jal func_80049C04 /* A94B18 802413D8 02A0302D */ daddu $a2, $s5, $zero /* A94B1C 802413DC 0809053F */ j .L802414FC /* A94B20 802413E0 00000000 */ nop +glabel L802413E4_A94B24 /* A94B24 802413E4 0260202D */ daddu $a0, $s3, $zero /* A94B28 802413E8 0200282D */ daddu $a1, $s0, $zero /* A94B2C 802413EC 0C01278F */ jal func_80049E3C /* A94B30 802413F0 02A0302D */ daddu $a2, $s5, $zero +glabel L802413F4_A94B34 /* A94B34 802413F4 0260202D */ daddu $a0, $s3, $zero /* A94B38 802413F8 0200282D */ daddu $a1, $s0, $zero /* A94B3C 802413FC 0C0127B3 */ jal func_80049ECC /* A94B40 80241400 02A0302D */ daddu $a2, $s5, $zero /* A94B44 80241404 0809053F */ j .L802414FC /* A94B48 80241408 00000000 */ nop +glabel L8024140C_A94B4C /* A94B4C 8024140C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A94B50 80241410 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A94B54 80241414 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -170,37 +177,45 @@ glabel func_80241204_A94944 /* A94BB8 80241478 0200282D */ daddu $a1, $s0, $zero /* A94BBC 8024147C 0C0127DF */ jal func_80049F7C /* A94BC0 80241480 02A0302D */ daddu $a2, $s5, $zero +glabel L80241484_A94BC4 /* A94BC4 80241484 0260202D */ daddu $a0, $s3, $zero /* A94BC8 80241488 0200282D */ daddu $a1, $s0, $zero /* A94BCC 8024148C 0C012849 */ jal func_8004A124 /* A94BD0 80241490 02A0302D */ daddu $a2, $s5, $zero /* A94BD4 80241494 0809053F */ j .L802414FC /* A94BD8 80241498 00000000 */ nop +glabel L8024149C_A94BDC /* A94BDC 8024149C 0260202D */ daddu $a0, $s3, $zero /* A94BE0 802414A0 0200282D */ daddu $a1, $s0, $zero /* A94BE4 802414A4 0C0128FA */ jal func_8004A3E8 /* A94BE8 802414A8 02A0302D */ daddu $a2, $s5, $zero /* A94BEC 802414AC 0809053F */ j .L802414FC /* A94BF0 802414B0 00000000 */ nop +glabel L802414B4_A94BF4 /* A94BF4 802414B4 0C090191 */ jal func_80240644_A93D84 /* A94BF8 802414B8 0260202D */ daddu $a0, $s3, $zero /* A94BFC 802414BC 0809053F */ j .L802414FC /* A94C00 802414C0 00000000 */ nop +glabel L802414C4_A94C04 /* A94C04 802414C4 0C0901D1 */ jal kpa_102_UnkSetDurationFunc /* A94C08 802414C8 0260202D */ daddu $a0, $s3, $zero /* A94C0C 802414CC 0809053F */ j .L802414FC /* A94C10 802414D0 00000000 */ nop +glabel L802414D4_A94C14 /* A94C14 802414D4 0C0901E2 */ jal kpa_102_UnkNpcAIFunc9 /* A94C18 802414D8 0260202D */ daddu $a0, $s3, $zero /* A94C1C 802414DC 0809053F */ j .L802414FC /* A94C20 802414E0 00000000 */ nop +glabel L802414E4_A94C24 /* A94C24 802414E4 0C09020A */ jal kpa_102_UnkDurationCheck /* A94C28 802414E8 0260202D */ daddu $a0, $s3, $zero /* A94C2C 802414EC 0809053F */ j .L802414FC /* A94C30 802414F0 00000000 */ nop +glabel L802414F4_A94C34 /* A94C34 802414F4 0C0129CF */ jal func_8004A73C /* A94C38 802414F8 0260202D */ daddu $a0, $s3, $zero .L802414FC: +glabel L802414FC_A94C3C /* A94C3C 802414FC 8FBF0048 */ lw $ra, 0x48($sp) /* A94C40 80241500 8FB50044 */ lw $s5, 0x44($sp) /* A94C44 80241504 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802415D8_A94D18.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802415D8_A94D18.s index 399f365bee..e42d8ce227 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802415D8_A94D18.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802415D8_A94D18.s @@ -21,11 +21,11 @@ glabel func_802415D8_A94D18 /* A94D58 80241618 A602008E */ sh $v0, 0x8e($s0) /* A94D5C 8024161C 00021400 */ sll $v0, $v0, 0x10 /* A94D60 80241620 1C400033 */ bgtz $v0, .L802416F0 -/* A94D64 80241624 00000000 */ nop +/* A94D64 80241624 00000000 */ nop .L80241628: /* A94D68 80241628 8602008C */ lh $v0, 0x8c($s0) /* A94D6C 8024162C 14400030 */ bnez $v0, .L802416F0 -/* A94D70 80241630 00000000 */ nop +/* A94D70 80241630 00000000 */ nop /* A94D74 80241634 8E2200CC */ lw $v0, 0xcc($s1) /* A94D78 80241638 8C420024 */ lw $v0, 0x24($v0) /* A94D7C 8024163C AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_802415D8_A94D18 /* A94D88 80241648 8E230088 */ lw $v1, 0x88($s1) /* A94D8C 8024164C 24020005 */ addiu $v0, $zero, 5 /* A94D90 80241650 10620005 */ beq $v1, $v0, .L80241668 -/* A94D94 80241654 00000000 */ nop +/* A94D94 80241654 00000000 */ nop /* A94D98 80241658 10600003 */ beqz $v1, .L80241668 /* A94D9C 8024165C 24020001 */ addiu $v0, $zero, 1 /* A94DA0 80241660 14620006 */ bne $v1, $v0, .L8024167C -/* A94DA4 80241664 00000000 */ nop +/* A94DA4 80241664 00000000 */ nop .L80241668: /* A94DA8 80241668 8E220084 */ lw $v0, 0x84($s1) /* A94DAC 8024166C 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_802415D8_A94D18 /* A94DEC 802416AC 46220000 */ add.d $f0, $f0, $f2 /* A94DF0 802416B0 4620010D */ trunc.w.d $f4, $f0 /* A94DF4 802416B4 44022000 */ mfc1 $v0, $f4 -/* A94DF8 802416B8 00000000 */ nop +/* A94DF8 802416B8 00000000 */ nop /* A94DFC 802416BC A602008E */ sh $v0, 0x8e($s0) /* A94E00 802416C0 00021400 */ sll $v0, $v0, 0x10 /* A94E04 802416C4 8E230078 */ lw $v1, 0x78($s1) /* A94E08 802416C8 00021403 */ sra $v0, $v0, 0x10 /* A94E0C 802416CC 0043102A */ slt $v0, $v0, $v1 /* A94E10 802416D0 10400003 */ beqz $v0, .L802416E0 -/* A94E14 802416D4 00000000 */ nop +/* A94E14 802416D4 00000000 */ nop /* A94E18 802416D8 9622007A */ lhu $v0, 0x7a($s1) /* A94E1C 802416DC A602008E */ sh $v0, 0x8e($s0) .L802416E0: diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s index e469a23cd1..922fc74a0a 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s @@ -279,15 +279,17 @@ glabel func_802418F0_A95030 /* A9541C 80241CDC 2C620015 */ sltiu $v0, $v1, 0x15 /* A95420 80241CE0 10400009 */ beqz $v0, .L80241D08 /* A95424 80241CE4 00031080 */ sll $v0, $v1, 2 -/* A95428 80241CE8 3C018024 */ lui $at, %hi(D_80245CE0) +/* A95428 80241CE8 3C018024 */ lui $at, %hi(jtbl_80245CE0_A99420) /* A9542C 80241CEC 00220821 */ addu $at, $at, $v0 -/* A95430 80241CF0 8C225CE0 */ lw $v0, %lo(D_80245CE0)($at) +/* A95430 80241CF0 8C225CE0 */ lw $v0, %lo(jtbl_80245CE0_A99420)($at) /* A95434 80241CF4 00400008 */ jr $v0 /* A95438 80241CF8 00000000 */ nop +glabel L80241CFC_A9543C /* A9543C 80241CFC 8E420028 */ lw $v0, 0x28($s2) /* A95440 80241D00 24420001 */ addiu $v0, $v0, 1 /* A95444 80241D04 AE420028 */ sw $v0, 0x28($s2) .L80241D08: +glabel L80241D08_A95448 /* A95448 80241D08 0000102D */ daddu $v0, $zero, $zero .L80241D0C: /* A9544C 80241D0C 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241D30_A95470.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241D30_A95470.s index a4ecfec3e7..804a3e209e 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241D30_A95470.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241D30_A95470.s @@ -41,16 +41,16 @@ glabel func_80241D30_A95470 /* A95500 80241DC0 3C014387 */ lui $at, 0x4387 /* A95504 80241DC4 4481A000 */ mtc1 $at, $f20 /* A95508 80241DC8 0C00A70A */ jal get_clamped_angle_diff -/* A9550C 80241DCC 00000000 */ nop +/* A9550C 80241DCC 00000000 */ nop /* A95510 80241DD0 0C00A6C9 */ jal clamp_angle /* A95514 80241DD4 46000306 */ mov.s $f12, $f0 /* A95518 80241DD8 3C018024 */ lui $at, %hi(D_80245D38) /* A9551C 80241DDC D4225D38 */ ldc1 $f2, %lo(D_80245D38)($at) /* A95520 80241DE0 46000021 */ cvt.d.s $f0, $f0 /* A95524 80241DE4 4622003C */ c.lt.d $f0, $f2 -/* A95528 80241DE8 00000000 */ nop +/* A95528 80241DE8 00000000 */ nop /* A9552C 80241DEC 45000003 */ bc1f .L80241DFC -/* A95530 80241DF0 00000000 */ nop +/* A95530 80241DF0 00000000 */ nop /* A95534 80241DF4 3C0142B4 */ lui $at, 0x42b4 /* A95538 80241DF8 4481A000 */ mtc1 $at, $f20 .L80241DFC: @@ -70,7 +70,7 @@ glabel func_80241D30_A95470 /* A95570 80241E30 D4225D40 */ ldc1 $f2, %lo(D_80245D40)($at) /* A95574 80241E34 46000021 */ cvt.d.s $f0, $f0 /* A95578 80241E38 4620103C */ c.lt.d $f2, $f0 -/* A9557C 80241E3C 00000000 */ nop +/* A9557C 80241E3C 00000000 */ nop /* A95580 80241E40 45010027 */ bc1t .L80241EE0 /* A95584 80241E44 2402FFFF */ addiu $v0, $zero, -1 /* A95588 80241E48 8E020000 */ lw $v0, ($s0) @@ -83,7 +83,7 @@ glabel func_80241D30_A95470 /* A955A4 80241E64 46000005 */ abs.s $f0, $f0 /* A955A8 80241E68 44060000 */ mfc1 $a2, $f0 /* A955AC 80241E6C 0C00A720 */ jal atan2 -/* A955B0 80241E70 00000000 */ nop +/* A955B0 80241E70 00000000 */ nop /* A955B4 80241E74 3C018024 */ lui $at, %hi(D_80245D48) /* A955B8 80241E78 D4225D48 */ ldc1 $f2, %lo(D_80245D48)($at) /* A955BC 80241E7C 46000021 */ cvt.d.s $f0, $f0 @@ -94,7 +94,7 @@ glabel func_80241D30_A95470 /* A955D0 80241E90 46000005 */ abs.s $f0, $f0 /* A955D4 80241E94 46000021 */ cvt.d.s $f0, $f0 /* A955D8 80241E98 4620103C */ c.lt.d $f2, $f0 -/* A955DC 80241E9C 00000000 */ nop +/* A955DC 80241E9C 00000000 */ nop /* A955E0 80241EA0 4501000F */ bc1t .L80241EE0 /* A955E4 80241EA4 2402FFFF */ addiu $v0, $zero, -1 /* A955E8 80241EA8 3C038011 */ lui $v1, %hi(D_8010EBB3) diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241F00_A95640.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241F00_A95640.s index 6128ff5dfe..4609ef344b 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241F00_A95640.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241F00_A95640.s @@ -30,7 +30,7 @@ glabel func_80241F00_A95640 /* A956A4 80241F64 8E4200B0 */ lw $v0, 0xb0($s2) /* A956A8 80241F68 30420004 */ andi $v0, $v0, 4 /* A956AC 80241F6C 10400018 */ beqz $v0, .L80241FD0 -/* A956B0 80241F70 00000000 */ nop +/* A956B0 80241F70 00000000 */ nop .L80241F74: /* A956B4 80241F74 3C030024 */ lui $v1, 0x24 /* A956B8 80241F78 34630102 */ ori $v1, $v1, 0x102 @@ -60,11 +60,12 @@ glabel func_80241F00_A95640 /* A95714 80241FD4 2C620005 */ sltiu $v0, $v1, 5 /* A95718 80241FD8 10400101 */ beqz $v0, .L802423E0 /* A9571C 80241FDC 00031080 */ sll $v0, $v1, 2 -/* A95720 80241FE0 3C018024 */ lui $at, %hi(D_80245D58) +/* A95720 80241FE0 3C018024 */ lui $at, %hi(jtbl_80245D58_A99498) /* A95724 80241FE4 00220821 */ addu $at, $at, $v0 -/* A95728 80241FE8 8C225D58 */ lw $v0, %lo(D_80245D58)($at) +/* A95728 80241FE8 8C225D58 */ lw $v0, %lo(jtbl_80245D58_A99498)($at) /* A9572C 80241FEC 00400008 */ jr $v0 -/* A95730 80241FF0 00000000 */ nop +/* A95730 80241FF0 00000000 */ nop +glabel L80241FF4_A95734 /* A95734 80241FF4 3C01C47A */ lui $at, 0xc47a /* A95738 80241FF8 44810000 */ mtc1 $at, $f0 /* A9573C 80241FFC 24020014 */ addiu $v0, $zero, 0x14 @@ -77,6 +78,7 @@ glabel func_80241F00_A95640 /* A95758 80242018 E620003C */ swc1 $f0, 0x3c($s1) /* A9575C 8024201C AE40006C */ sw $zero, 0x6c($s2) /* A95760 80242020 AEC20070 */ sw $v0, 0x70($s6) +glabel L80242024_A95764 /* A95764 80242024 8E50006C */ lw $s0, 0x6c($s2) /* A95768 80242028 24020001 */ addiu $v0, $zero, 1 /* A9576C 8024202C 160200EC */ bne $s0, $v0, .L802423E0 @@ -91,7 +93,7 @@ glabel func_80241F00_A95640 /* A95790 80242050 C6820034 */ lwc1 $f2, 0x34($s4) /* A95794 80242054 3C014387 */ lui $at, 0x4387 /* A95798 80242058 44810000 */ mtc1 $at, $f0 -/* A9579C 8024205C 00000000 */ nop +/* A9579C 8024205C 00000000 */ nop /* A957A0 80242060 46020001 */ sub.s $f0, $f0, $f2 /* A957A4 80242064 C6480074 */ lwc1 $f8, 0x74($s2) /* A957A8 80242068 46804220 */ cvt.s.w $f8, $f8 @@ -118,20 +120,20 @@ glabel func_80241F00_A95640 /* A957FC 802420BC 44811000 */ mtc1 $at, $f2 /* A95800 802420C0 4600020D */ trunc.w.s $f8, $f0 /* A95804 802420C4 44024000 */ mfc1 $v0, $f8 -/* A95808 802420C8 00000000 */ nop +/* A95808 802420C8 00000000 */ nop /* A9580C 802420CC A6420010 */ sh $v0, 0x10($s2) /* A95810 802420D0 C620003C */ lwc1 $f0, 0x3c($s1) /* A95814 802420D4 3C13800F */ lui $s3, %hi(gPlayerStatusPtr) /* A95818 802420D8 26737B30 */ addiu $s3, $s3, %lo(gPlayerStatusPtr) /* A9581C 802420DC 4600020D */ trunc.w.s $f8, $f0 /* A95820 802420E0 44024000 */ mfc1 $v0, $f8 -/* A95824 802420E4 00000000 */ nop +/* A95824 802420E4 00000000 */ nop /* A95828 802420E8 A6420012 */ sh $v0, 0x12($s2) /* A9582C 802420EC C6200040 */ lwc1 $f0, 0x40($s1) /* A95830 802420F0 8E630000 */ lw $v1, ($s3) /* A95834 802420F4 4600020D */ trunc.w.s $f8, $f0 /* A95838 802420F8 44024000 */ mfc1 $v0, $f8 -/* A9583C 802420FC 00000000 */ nop +/* A9583C 802420FC 00000000 */ nop /* A95840 80242100 A6420014 */ sh $v0, 0x14($s2) /* A95844 80242104 E6220018 */ swc1 $f2, 0x18($s1) /* A95848 80242108 C460002C */ lwc1 $f0, 0x2c($v1) @@ -147,7 +149,7 @@ glabel func_80241F00_A95640 /* A95870 80242130 44070000 */ mfc1 $a3, $f0 /* A95874 80242134 44061000 */ mfc1 $a2, $f2 /* A95878 80242138 0C00A720 */ jal atan2 -/* A9587C 8024213C 00000000 */ nop +/* A9587C 8024213C 00000000 */ nop /* A95880 80242140 3C018024 */ lui $at, %hi(D_80245D70) /* A95884 80242144 D4225D70 */ ldc1 $f2, %lo(D_80245D70)($at) /* A95888 80242148 46000021 */ cvt.d.s $f0, $f0 @@ -155,13 +157,13 @@ glabel func_80241F00_A95640 /* A95890 80242150 46200020 */ cvt.s.d $f0, $f0 /* A95894 80242154 4600020D */ trunc.w.s $f8, $f0 /* A95898 80242158 44044000 */ mfc1 $a0, $f8 -/* A9589C 8024215C 00000000 */ nop +/* A9589C 8024215C 00000000 */ nop /* A958A0 80242160 00042400 */ sll $a0, $a0, 0x10 /* A958A4 80242164 0C00A4F5 */ jal cosine /* A958A8 80242168 00042403 */ sra $a0, $a0, 0x10 /* A958AC 8024216C C6220018 */ lwc1 $f2, 0x18($s1) /* A958B0 80242170 46020002 */ mul.s $f0, $f0, $f2 -/* A958B4 80242174 00000000 */ nop +/* A958B4 80242174 00000000 */ nop /* A958B8 80242178 C62C0038 */ lwc1 $f12, 0x38($s1) /* A958BC 8024217C C62E0040 */ lwc1 $f14, 0x40($s1) /* A958C0 80242180 8E620000 */ lw $v0, ($s3) @@ -187,7 +189,7 @@ glabel func_80241F00_A95640 /* A95910 802421D0 46020003 */ div.s $f0, $f0, $f2 /* A95914 802421D4 4600020D */ trunc.w.s $f8, $f0 /* A95918 802421D8 44104000 */ mfc1 $s0, $f8 -/* A9591C 802421DC 00000000 */ nop +/* A9591C 802421DC 00000000 */ nop /* A95920 802421E0 5A000001 */ blezl $s0, .L802421E8 /* A95924 802421E4 24100001 */ addiu $s0, $zero, 1 .L802421E8: @@ -201,7 +203,7 @@ glabel func_80241F00_A95640 /* A95944 80242204 46020000 */ add.s $f0, $f0, $f2 /* A95948 80242208 3C014160 */ lui $at, 0x4160 /* A9594C 8024220C 44811000 */ mtc1 $at, $f2 -/* A95950 80242210 00000000 */ nop +/* A95950 80242210 00000000 */ nop /* A95954 80242214 46022100 */ add.s $f4, $f4, $f2 /* A95958 80242218 46020000 */ add.s $f0, $f0, $f2 /* A9595C 8024221C 44062000 */ mfc1 $a2, $f4 @@ -217,6 +219,7 @@ glabel func_80241F00_A95640 /* A95984 80242244 A630008E */ sh $s0, 0x8e($s1) /* A95988 80242248 080908F8 */ j .L802423E0 /* A9598C 8024224C AED50070 */ sw $s5, 0x70($s6) +glabel L80242250_A95990 /* A95990 80242250 9622008E */ lhu $v0, 0x8e($s1) /* A95994 80242254 2442FFFF */ addiu $v0, $v0, -1 /* A95998 80242258 A622008E */ sh $v0, 0x8e($s1) @@ -225,7 +228,7 @@ glabel func_80241F00_A95640 /* A959A4 80242264 24150014 */ addiu $s5, $zero, 0x14 .L80242268: /* A959A8 80242268 16A0000A */ bnez $s5, .L80242294 -/* A959AC 8024226C 00000000 */ nop +/* A959AC 8024226C 00000000 */ nop /* A959B0 80242270 8E250018 */ lw $a1, 0x18($s1) /* A959B4 80242274 8E26000C */ lw $a2, 0xc($s1) /* A959B8 80242278 0C00EA95 */ jal npc_move_heading @@ -236,15 +239,16 @@ glabel func_80241F00_A95640 /* A959CC 8024228C 080908F8 */ j .L802423E0 /* A959D0 80242290 E620003C */ swc1 $f0, 0x3c($s1) .L80242294: +glabel L80242294_A959D4 /* A959D4 80242294 862200A8 */ lh $v0, 0xa8($s1) /* A959D8 80242298 3C013FE0 */ lui $at, 0x3fe0 /* A959DC 8024229C 44810800 */ mtc1 $at, $f1 /* A959E0 802422A0 44800000 */ mtc1 $zero, $f0 /* A959E4 802422A4 44821000 */ mtc1 $v0, $f2 -/* A959E8 802422A8 00000000 */ nop +/* A959E8 802422A8 00000000 */ nop /* A959EC 802422AC 468010A1 */ cvt.d.w $f2, $f2 /* A959F0 802422B0 46201082 */ mul.d $f2, $f2, $f0 -/* A959F4 802422B4 00000000 */ nop +/* A959F4 802422B4 00000000 */ nop /* A959F8 802422B8 C620003C */ lwc1 $f0, 0x3c($s1) /* A959FC 802422BC AE20001C */ sw $zero, 0x1c($s1) /* A95A00 802422C0 46000021 */ cvt.d.s $f0, $f0 @@ -258,6 +262,7 @@ glabel func_80241F00_A95640 /* A95A20 802422E0 A620008E */ sh $zero, 0x8e($s1) /* A95A24 802422E4 080908F8 */ j .L802423E0 /* A95A28 802422E8 AEC20070 */ sw $v0, 0x70($s6) +glabel L802422EC_A95A2C /* A95A2C 802422EC 9622008E */ lhu $v0, 0x8e($s1) /* A95A30 802422F0 24420001 */ addiu $v0, $v0, 1 /* A95A34 802422F4 A622008E */ sh $v0, 0x8e($s1) @@ -271,17 +276,17 @@ glabel func_80241F00_A95640 /* A95A54 80242314 44810800 */ mtc1 $at, $f1 /* A95A58 80242318 44800000 */ mtc1 $zero, $f0 /* A95A5C 8024231C 44822000 */ mtc1 $v0, $f4 -/* A95A60 80242320 00000000 */ nop +/* A95A60 80242320 00000000 */ nop /* A95A64 80242324 46802120 */ cvt.s.w $f4, $f4 /* A95A68 80242328 46002121 */ cvt.d.s $f4, $f4 /* A95A6C 8024232C 46202102 */ mul.d $f4, $f4, $f0 -/* A95A70 80242330 00000000 */ nop +/* A95A70 80242330 00000000 */ nop /* A95A74 80242334 44821000 */ mtc1 $v0, $f2 -/* A95A78 80242338 00000000 */ nop +/* A95A78 80242338 00000000 */ nop /* A95A7C 8024233C 468010A0 */ cvt.s.w $f2, $f2 /* A95A80 80242340 460010A1 */ cvt.d.s $f2, $f2 /* A95A84 80242344 46201082 */ mul.d $f2, $f2, $f0 -/* A95A88 80242348 00000000 */ nop +/* A95A88 80242348 00000000 */ nop /* A95A8C 8024234C C620003C */ lwc1 $f0, 0x3c($s1) /* A95A90 80242350 3C01400C */ lui $at, 0x400c /* A95A94 80242354 44813800 */ mtc1 $at, $f7 @@ -291,14 +296,14 @@ glabel func_80241F00_A95640 /* A95AA4 80242364 3C014034 */ lui $at, 0x4034 /* A95AA8 80242368 44813800 */ mtc1 $at, $f7 /* A95AAC 8024236C 44803000 */ mtc1 $zero, $f6 -/* A95AB0 80242370 00000000 */ nop +/* A95AB0 80242370 00000000 */ nop /* A95AB4 80242374 46262100 */ add.d $f4, $f4, $f6 /* A95AB8 80242378 46200020 */ cvt.s.d $f0, $f0 /* A95ABC 8024237C E620003C */ swc1 $f0, 0x3c($s1) /* A95AC0 80242380 46261080 */ add.d $f2, $f2, $f6 /* A95AC4 80242384 4620220D */ trunc.w.d $f8, $f4 /* A95AC8 80242388 44024000 */ mfc1 $v0, $f8 -/* A95ACC 8024238C 00000000 */ nop +/* A95ACC 8024238C 00000000 */ nop /* A95AD0 80242390 A62200A6 */ sh $v0, 0xa6($s1) /* A95AD4 80242394 4620120D */ trunc.w.d $f8, $f2 /* A95AD8 80242398 44024000 */ mfc1 $v0, $f8 @@ -318,7 +323,7 @@ glabel func_80241F00_A95640 /* A95B0C 802423CC E620003C */ swc1 $f0, 0x3c($s1) .L802423D0: /* A95B10 802423D0 14400003 */ bnez $v0, .L802423E0 -/* A95B14 802423D4 00000000 */ nop +/* A95B14 802423D4 00000000 */ nop /* A95B18 802423D8 AE40006C */ sw $zero, 0x6c($s2) /* A95B1C 802423DC AEC00070 */ sw $zero, 0x70($s6) .L802423E0: diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024244C_A95B8C.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024244C_A95B8C.s index 21b5f41c47..f95492f270 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024244C_A95B8C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024244C_A95B8C.s @@ -33,7 +33,7 @@ glabel func_8024244C_A95B8C /* A95BFC 802424BC 44801000 */ mtc1 $zero, $f2 /* A95C00 802424C0 46000021 */ cvt.d.s $f0, $f0 /* A95C04 802424C4 46220002 */ mul.d $f0, $f0, $f2 -/* A95C08 802424C8 00000000 */ nop +/* A95C08 802424C8 00000000 */ nop /* A95C0C 802424CC 4600A0A1 */ cvt.d.s $f2, $f20 /* A95C10 802424D0 46201080 */ add.d $f2, $f2, $f0 /* A95C14 802424D4 462010A0 */ cvt.s.d $f2, $f2 @@ -41,7 +41,7 @@ glabel func_8024244C_A95B8C /* A95C1C 802424DC 8E02006C */ lw $v0, 0x6c($s0) /* A95C20 802424E0 2442000A */ addiu $v0, $v0, 0xa /* A95C24 802424E4 44826000 */ mtc1 $v0, $f12 -/* A95C28 802424E8 00000000 */ nop +/* A95C28 802424E8 00000000 */ nop /* A95C2C 802424EC 0C00A6C9 */ jal clamp_angle /* A95C30 802424F0 46806320 */ cvt.s.w $f12, $f12 /* A95C34 802424F4 4600018D */ trunc.w.s $f6, $f0 @@ -66,7 +66,7 @@ glabel func_8024244C_A95B8C /* A95C80 80242540 2402000F */ addiu $v0, $zero, 0xf /* A95C84 80242544 AFA2001C */ sw $v0, 0x1c($sp) /* A95C88 80242548 44833000 */ mtc1 $v1, $f6 -/* A95C8C 8024254C 00000000 */ nop +/* A95C8C 8024254C 00000000 */ nop /* A95C90 80242550 468031A0 */ cvt.s.w $f6, $f6 /* A95C94 80242554 44073000 */ mfc1 $a3, $f6 /* A95C98 80242558 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802425D8_A95D18.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802425D8_A95D18.s index 4a48aaa9ac..b7a4a7a70b 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802425D8_A95D18.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802425D8_A95D18.s @@ -48,7 +48,7 @@ glabel func_802425D8_A95D18 /* A95DC4 80242684 46800020 */ cvt.s.w $f0, $f0 /* A95DC8 80242688 E7A00018 */ swc1 $f0, 0x18($sp) /* A95DCC 8024268C 44820000 */ mtc1 $v0, $f0 -/* A95DD0 80242690 00000000 */ nop +/* A95DD0 80242690 00000000 */ nop /* A95DD4 80242694 46800021 */ cvt.d.w $f0, $f0 /* A95DD8 80242698 46360000 */ add.d $f0, $f0, $f22 /* A95DDC 8024269C 8C840018 */ lw $a0, 0x18($a0) @@ -56,7 +56,7 @@ glabel func_802425D8_A95D18 /* A95DE4 802426A4 0C0123F5 */ jal is_point_within_region /* A95DE8 802426A8 46200520 */ cvt.s.d $f20, $f0 /* A95DEC 802426AC 10400023 */ beqz $v0, .L8024273C -/* A95DF0 802426B0 00000000 */ nop +/* A95DF0 802426B0 00000000 */ nop /* A95DF4 802426B4 C60C0038 */ lwc1 $f12, 0x38($s0) /* A95DF8 802426B8 8EA200D0 */ lw $v0, 0xd0($s5) /* A95DFC 802426BC C60E0040 */ lwc1 $f14, 0x40($s0) @@ -67,9 +67,9 @@ glabel func_802425D8_A95D18 /* A95E10 802426D0 468052A0 */ cvt.s.w $f10, $f10 /* A95E14 802426D4 44075000 */ mfc1 $a3, $f10 /* A95E18 802426D8 0C00A720 */ jal atan2 -/* A95E1C 802426DC 00000000 */ nop +/* A95E1C 802426DC 00000000 */ nop /* A95E20 802426E0 44931000 */ mtc1 $s3, $f2 -/* A95E24 802426E4 00000000 */ nop +/* A95E24 802426E4 00000000 */ nop /* A95E28 802426E8 468010A0 */ cvt.s.w $f2, $f2 /* A95E2C 802426EC 46020001 */ sub.s $f0, $f0, $f2 /* A95E30 802426F0 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -83,10 +83,10 @@ glabel func_802425D8_A95D18 /* A95E50 80242710 468052A0 */ cvt.s.w $f10, $f10 /* A95E54 80242714 44075000 */ mfc1 $a3, $f10 /* A95E58 80242718 0C00A7B5 */ jal dist2D -/* A95E5C 8024271C 00000000 */ nop +/* A95E5C 8024271C 00000000 */ nop /* A95E60 80242720 46000106 */ mov.s $f4, $f0 /* A95E64 80242724 4614003C */ c.lt.s $f0, $f20 -/* A95E68 80242728 00000000 */ nop +/* A95E68 80242728 00000000 */ nop /* A95E6C 8024272C 4503006A */ bc1tl .L802428D8 /* A95E70 80242730 46002506 */ mov.s $f20, $f4 /* A95E74 80242734 08090A37 */ j .L802428DC @@ -101,7 +101,7 @@ glabel func_802425D8_A95D18 /* A95E94 80242754 8C470030 */ lw $a3, 0x30($v0) /* A95E98 80242758 460000A1 */ cvt.d.s $f2, $f0 /* A95E9C 8024275C 4636103C */ c.lt.d $f2, $f22 -/* A95EA0 80242760 00000000 */ nop +/* A95EA0 80242760 00000000 */ nop /* A95EA4 80242764 45000006 */ bc1f .L80242780 /* A95EA8 80242768 E600000C */ swc1 $f0, 0xc($s0) /* A95EAC 8024276C 0C00A67F */ jal rand_int @@ -116,28 +116,28 @@ glabel func_802425D8_A95D18 /* A95ECC 8024278C D4205D88 */ ldc1 $f0, %lo(D_80245D88)($at) .L80242790: /* A95ED0 80242790 44821000 */ mtc1 $v0, $f2 -/* A95ED4 80242794 00000000 */ nop +/* A95ED4 80242794 00000000 */ nop /* A95ED8 80242798 468010A1 */ cvt.d.w $f2, $f2 /* A95EDC 8024279C 46201080 */ add.d $f2, $f2, $f0 /* A95EE0 802427A0 3C014014 */ lui $at, 0x4014 /* A95EE4 802427A4 44810800 */ mtc1 $at, $f1 /* A95EE8 802427A8 44800000 */ mtc1 $zero, $f0 -/* A95EEC 802427AC 00000000 */ nop +/* A95EEC 802427AC 00000000 */ nop /* A95EF0 802427B0 46201081 */ sub.d $f2, $f2, $f0 /* A95EF4 802427B4 462015A0 */ cvt.s.d $f22, $f2 /* A95EF8 802427B8 00141080 */ sll $v0, $s4, 2 /* A95EFC 802427BC 00548821 */ addu $s1, $v0, $s4 .L802427C0: /* A95F00 802427C0 12400006 */ beqz $s2, .L802427DC -/* A95F04 802427C4 00000000 */ nop +/* A95F04 802427C4 00000000 */ nop /* A95F08 802427C8 44910000 */ mtc1 $s1, $f0 -/* A95F0C 802427CC 00000000 */ nop +/* A95F0C 802427CC 00000000 */ nop /* A95F10 802427D0 46800020 */ cvt.s.w $f0, $f0 /* A95F14 802427D4 080909FB */ j .L802427EC /* A95F18 802427D8 4600B000 */ add.s $f0, $f22, $f0 .L802427DC: /* A95F1C 802427DC 44910000 */ mtc1 $s1, $f0 -/* A95F20 802427E0 00000000 */ nop +/* A95F20 802427E0 00000000 */ nop /* A95F24 802427E4 46800020 */ cvt.s.w $f0, $f0 /* A95F28 802427E8 4600B001 */ sub.s $f0, $f22, $f0 .L802427EC: @@ -156,13 +156,13 @@ glabel func_802425D8_A95D18 /* A95F5C 8024281C 860200A8 */ lh $v0, 0xa8($s0) /* A95F60 80242820 27A60024 */ addiu $a2, $sp, 0x24 /* A95F64 80242824 44820000 */ mtc1 $v0, $f0 -/* A95F68 80242828 00000000 */ nop +/* A95F68 80242828 00000000 */ nop /* A95F6C 8024282C 46800020 */ cvt.s.w $f0, $f0 /* A95F70 80242830 E7A00018 */ swc1 $f0, 0x18($sp) /* A95F74 80242834 860200A6 */ lh $v0, 0xa6($s0) /* A95F78 80242838 27A70028 */ addiu $a3, $sp, 0x28 /* A95F7C 8024283C 44820000 */ mtc1 $v0, $f0 -/* A95F80 80242840 00000000 */ nop +/* A95F80 80242840 00000000 */ nop /* A95F84 80242844 46800020 */ cvt.s.w $f0, $f0 /* A95F88 80242848 0C0376B9 */ jal func_800DDAE4 /* A95F8C 8024284C E7A0001C */ swc1 $f0, 0x1c($sp) @@ -179,11 +179,11 @@ glabel func_802425D8_A95D18 /* A95FB8 80242878 44801000 */ mtc1 $zero, $f2 /* A95FBC 8024287C 46002021 */ cvt.d.s $f0, $f4 /* A95FC0 80242880 4620103C */ c.lt.d $f2, $f0 -/* A95FC4 80242884 00000000 */ nop +/* A95FC4 80242884 00000000 */ nop /* A95FC8 80242888 45000006 */ bc1f .L802428A4 -/* A95FCC 8024288C 00000000 */ nop +/* A95FCC 8024288C 00000000 */ nop /* A95FD0 80242890 4614203C */ c.lt.s $f4, $f20 -/* A95FD4 80242894 00000000 */ nop +/* A95FD4 80242894 00000000 */ nop /* A95FD8 80242898 45030001 */ bc1tl .L802428A0 /* A95FDC 8024289C 46002506 */ mov.s $f20, $f4 .L802428A0: @@ -203,7 +203,7 @@ glabel func_802425D8_A95D18 /* A96008 802428C8 5040FFBD */ beql $v0, $zero, .L802427C0 /* A9600C 802428CC 24130003 */ addiu $s3, $zero, 3 /* A96010 802428D0 080909F0 */ j .L802427C0 -/* A96014 802428D4 00000000 */ nop +/* A96014 802428D4 00000000 */ nop .L802428D8: /* A96018 802428D8 27A40020 */ addiu $a0, $sp, 0x20 .L802428DC: @@ -221,7 +221,7 @@ glabel func_802425D8_A95D18 /* A96048 80242908 44804000 */ mtc1 $zero, $f8 /* A9604C 8024290C 46000021 */ cvt.d.s $f0, $f0 /* A96050 80242910 46280002 */ mul.d $f0, $f0, $f8 -/* A96054 80242914 00000000 */ nop +/* A96054 80242914 00000000 */ nop /* A96058 80242918 C7A20020 */ lwc1 $f2, 0x20($sp) /* A9605C 8024291C C604003C */ lwc1 $f4, 0x3c($s0) /* A96060 80242920 C7A60028 */ lwc1 $f6, 0x28($sp) @@ -233,7 +233,7 @@ glabel func_802425D8_A95D18 /* A96078 80242938 C6000040 */ lwc1 $f0, 0x40($s0) /* A9607C 8024293C 46000021 */ cvt.d.s $f0, $f0 /* A96080 80242940 46280002 */ mul.d $f0, $f0, $f8 -/* A96084 80242944 00000000 */ nop +/* A96084 80242944 00000000 */ nop /* A96088 80242948 4620028D */ trunc.w.d $f10, $f0 /* A9608C 8024294C E6AA0084 */ swc1 $f10, 0x84($s5) /* A96090 80242950 0C00A67F */ jal rand_int diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802429C8_A96108.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802429C8_A96108.s index 381c6c5d2f..36939a73f6 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802429C8_A96108.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802429C8_A96108.s @@ -23,16 +23,16 @@ glabel func_802429C8_A96108 /* A96150 80242A10 4480B000 */ mtc1 $zero, $f22 /* A96154 80242A14 2463000A */ addiu $v1, $v1, 0xa /* A96158 80242A18 44836000 */ mtc1 $v1, $f12 -/* A9615C 80242A1C 00000000 */ nop +/* A9615C 80242A1C 00000000 */ nop /* A96160 80242A20 46806320 */ cvt.s.w $f12, $f12 /* A96164 80242A24 4636A503 */ div.d $f20, $f20, $f22 /* A96168 80242A28 0C00A6C9 */ jal clamp_angle /* A9616C 80242A2C 4620A520 */ cvt.s.d $f20, $f20 /* A96170 80242A30 4600010D */ trunc.w.s $f4, $f0 /* A96174 80242A34 44022000 */ mfc1 $v0, $f4 -/* A96178 80242A38 00000000 */ nop +/* A96178 80242A38 00000000 */ nop /* A9617C 80242A3C 44826000 */ mtc1 $v0, $f12 -/* A96180 80242A40 00000000 */ nop +/* A96180 80242A40 00000000 */ nop /* A96184 80242A44 46806320 */ cvt.s.w $f12, $f12 /* A96188 80242A48 0C00A8BB */ jal sin_deg /* A9618C 80242A4C AE22006C */ sw $v0, 0x6c($s1) @@ -41,7 +41,7 @@ glabel func_802429C8_A96108 /* A96198 80242A58 44801000 */ mtc1 $zero, $f2 /* A9619C 80242A5C 46000021 */ cvt.d.s $f0, $f0 /* A961A0 80242A60 46220002 */ mul.d $f0, $f0, $f2 -/* A961A4 80242A64 00000000 */ nop +/* A961A4 80242A64 00000000 */ nop /* A961A8 80242A68 4600A0A1 */ cvt.d.s $f2, $f20 /* A961AC 80242A6C 46201080 */ add.d $f2, $f2, $f0 /* A961B0 80242A70 8602008C */ lh $v0, 0x8c($s0) @@ -50,7 +50,7 @@ glabel func_802429C8_A96108 /* A961BC 80242A7C E600003C */ swc1 $f0, 0x3c($s0) /* A961C0 80242A80 46000021 */ cvt.d.s $f0, $f0 /* A961C4 80242A84 46360002 */ mul.d $f0, $f0, $f22 -/* A961C8 80242A88 00000000 */ nop +/* A961C8 80242A88 00000000 */ nop /* A961CC 80242A8C 24020011 */ addiu $v0, $zero, 0x11 /* A961D0 80242A90 4620010D */ trunc.w.d $f4, $f0 /* A961D4 80242A94 E6240080 */ swc1 $f4, 0x80($s1) diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242ABC_A961FC.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242ABC_A961FC.s index bb3ad38cbb..2e49d12cb0 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242ABC_A961FC.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242ABC_A961FC.s @@ -62,17 +62,17 @@ glabel func_80242ABC_A961FC /* A962E0 80242BA0 3C018024 */ lui $at, %hi(D_80245D90) /* A962E4 80242BA4 D4345D90 */ ldc1 $f20, %lo(D_80245D90)($at) /* A962E8 80242BA8 44821000 */ mtc1 $v0, $f2 -/* A962EC 80242BAC 00000000 */ nop +/* A962EC 80242BAC 00000000 */ nop /* A962F0 80242BB0 468010A1 */ cvt.d.w $f2, $f2 /* A962F4 80242BB4 4620A003 */ div.d $f0, $f20, $f0 /* A962F8 80242BB8 46201082 */ mul.d $f2, $f2, $f0 -/* A962FC 80242BBC 00000000 */ nop +/* A962FC 80242BBC 00000000 */ nop /* A96300 80242BC0 4620110D */ trunc.w.d $f4, $f2 /* A96304 80242BC4 44022000 */ mfc1 $v0, $f4 -/* A96308 80242BC8 00000000 */ nop +/* A96308 80242BC8 00000000 */ nop /* A9630C 80242BCC 244200B4 */ addiu $v0, $v0, 0xb4 /* A96310 80242BD0 44826000 */ mtc1 $v0, $f12 -/* A96314 80242BD4 00000000 */ nop +/* A96314 80242BD4 00000000 */ nop /* A96318 80242BD8 0C00A8BB */ jal sin_deg /* A9631C 80242BDC 46806320 */ cvt.s.w $f12, $f12 /* A96320 80242BE0 3C014039 */ lui $at, 0x4039 @@ -80,7 +80,7 @@ glabel func_80242ABC_A961FC /* A96328 80242BE8 44801000 */ mtc1 $zero, $f2 /* A9632C 80242BEC 46000021 */ cvt.d.s $f0, $f0 /* A96330 80242BF0 46220002 */ mul.d $f0, $f0, $f2 -/* A96334 80242BF4 00000000 */ nop +/* A96334 80242BF4 00000000 */ nop /* A96338 80242BF8 9602008E */ lhu $v0, 0x8e($s0) /* A9633C 80242BFC 4600B0A1 */ cvt.d.s $f2, $f22 /* A96340 80242C00 24420001 */ addiu $v0, $v0, 1 @@ -93,7 +93,7 @@ glabel func_80242ABC_A961FC /* A9635C 80242C1C 00021403 */ sra $v0, $v0, 0x10 /* A96360 80242C20 2463FFF8 */ addiu $v1, $v1, -8 /* A96364 80242C24 14430009 */ bne $v0, $v1, .L80242C4C -/* A96368 80242C28 00000000 */ nop +/* A96368 80242C28 00000000 */ nop /* A9636C 80242C2C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A96370 80242C30 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A96374 80242C34 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -105,7 +105,7 @@ glabel func_80242ABC_A961FC .L80242C4C: /* A9638C 80242C4C C600003C */ lwc1 $f0, 0x3c($s0) /* A96390 80242C50 4600C03E */ c.le.s $f24, $f0 -/* A96394 80242C54 00000000 */ nop +/* A96394 80242C54 00000000 */ nop /* A96398 80242C58 45000004 */ bc1f .L80242C6C /* A9639C 80242C5C 2402000A */ addiu $v0, $zero, 0xa /* A963A0 80242C60 E618003C */ swc1 $f24, 0x3c($s0) @@ -116,24 +116,24 @@ glabel func_80242ABC_A961FC /* A963B0 80242C70 8E230078 */ lw $v1, 0x78($s1) /* A963B4 80242C74 0043102A */ slt $v0, $v0, $v1 /* A963B8 80242C78 14400018 */ bnez $v0, .L80242CDC -/* A963BC 80242C7C 00000000 */ nop +/* A963BC 80242C7C 00000000 */ nop /* A963C0 80242C80 8E23006C */ lw $v1, 0x6c($s1) /* A963C4 80242C84 44831000 */ mtc1 $v1, $f2 -/* A963C8 80242C88 00000000 */ nop +/* A963C8 80242C88 00000000 */ nop /* A963CC 80242C8C 468010A1 */ cvt.d.w $f2, $f2 /* A963D0 80242C90 4622A03E */ c.le.d $f20, $f2 -/* A963D4 80242C94 00000000 */ nop +/* A963D4 80242C94 00000000 */ nop /* A963D8 80242C98 4500000F */ bc1f .L80242CD8 /* A963DC 80242C9C 2402000A */ addiu $v0, $zero, 0xa /* A963E0 80242CA0 3C018024 */ lui $at, %hi(D_80245D98) /* A963E4 80242CA4 D4205D98 */ ldc1 $f0, %lo(D_80245D98)($at) /* A963E8 80242CA8 4620103C */ c.lt.d $f2, $f0 -/* A963EC 80242CAC 00000000 */ nop +/* A963EC 80242CAC 00000000 */ nop /* A963F0 80242CB0 45000008 */ bc1f .L80242CD4 /* A963F4 80242CB4 2402021C */ addiu $v0, $zero, 0x21c /* A963F8 80242CB8 00431023 */ subu $v0, $v0, $v1 /* A963FC 80242CBC 44826000 */ mtc1 $v0, $f12 -/* A96400 80242CC0 00000000 */ nop +/* A96400 80242CC0 00000000 */ nop /* A96404 80242CC4 0C00A6C9 */ jal clamp_angle /* A96408 80242CC8 46806320 */ cvt.s.w $f12, $f12 /* A9640C 80242CCC 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D3C_A9647C.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D3C_A9647C.s index 670280bc70..d99c16bd02 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D3C_A9647C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D3C_A9647C.s @@ -36,7 +36,7 @@ glabel func_80242D3C_A9647C /* A964F8 80242DB8 3C01C1A0 */ lui $at, 0xc1a0 /* A964FC 80242DBC 44812000 */ mtc1 $at, $f4 /* A96500 80242DC0 44824000 */ mtc1 $v0, $f8 -/* A96504 80242DC4 00000000 */ nop +/* A96504 80242DC4 00000000 */ nop /* A96508 80242DC8 46804220 */ cvt.s.w $f8, $f8 /* A9650C 80242DCC 44074000 */ mfc1 $a3, $f8 /* A96510 80242DD0 2402000C */ addiu $v0, $zero, 0xc @@ -62,7 +62,7 @@ glabel func_80242D3C_A9647C /* A9655C 80242E1C 0260382D */ daddu $a3, $s3, $zero /* A96560 80242E20 24030001 */ addiu $v1, $zero, 1 /* A96564 80242E24 1443002F */ bne $v0, $v1, .L80242EE4 -/* A96568 80242E28 00000000 */ nop +/* A96568 80242E28 00000000 */ nop /* A9656C 80242E2C 8602008C */ lh $v0, 0x8c($s0) /* A96570 80242E30 1440002C */ bnez $v0, .L80242EE4 /* A96574 80242E34 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242F08_A96648.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242F08_A96648.s index 858a68d325..ad83e9c609 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242F08_A96648.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242F08_A96648.s @@ -16,7 +16,7 @@ glabel func_80242F08_A96648 /* A96674 80242F34 A482008E */ sh $v0, 0x8e($a0) /* A96678 80242F38 00021400 */ sll $v0, $v0, 0x10 /* A9667C 80242F3C 1C400008 */ bgtz $v0, .L80242F60 -/* A96680 80242F40 00000000 */ nop +/* A96680 80242F40 00000000 */ nop /* A96684 80242F44 8E0200CC */ lw $v0, 0xcc($s0) /* A96688 80242F48 8C430024 */ lw $v1, 0x24($v0) /* A9668C 80242F4C 24020007 */ addiu $v0, $zero, 7 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242F74_A966B4.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242F74_A966B4.s index 7e79c80029..c14852a760 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242F74_A966B4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242F74_A966B4.s @@ -21,7 +21,7 @@ glabel func_80242F74_A966B4 /* A966F4 80242FB4 A602008E */ sh $v0, 0x8e($s0) /* A966F8 80242FB8 00021400 */ sll $v0, $v0, 0x10 /* A966FC 80242FBC 1C400032 */ bgtz $v0, .L80243088 -/* A96700 80242FC0 00000000 */ nop +/* A96700 80242FC0 00000000 */ nop /* A96704 80242FC4 0260202D */ daddu $a0, $s3, $zero /* A96708 80242FC8 8E250024 */ lw $a1, 0x24($s1) /* A9670C 80242FCC 8E260028 */ lw $a2, 0x28($s1) @@ -43,7 +43,7 @@ glabel func_80242F74_A966B4 /* A9674C 8024300C 2402000C */ addiu $v0, $zero, 0xc /* A96750 80243010 AFA2001C */ sw $v0, 0x1c($sp) /* A96754 80243014 44833000 */ mtc1 $v1, $f6 -/* A96758 80243018 00000000 */ nop +/* A96758 80243018 00000000 */ nop /* A9675C 8024301C 468031A0 */ cvt.s.w $f6, $f6 /* A96760 80243020 44073000 */ mfc1 $a3, $f6 /* A96764 80243024 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802430A8_A967E8.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802430A8_A967E8.s index 02b61c6ca2..e68d16ea19 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802430A8_A967E8.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802430A8_A967E8.s @@ -29,7 +29,7 @@ glabel func_802430A8_A967E8 /* A96848 80243108 44801000 */ mtc1 $zero, $f2 /* A9684C 8024310C 46000021 */ cvt.d.s $f0, $f0 /* A96850 80243110 46220002 */ mul.d $f0, $f0, $f2 -/* A96854 80243114 00000000 */ nop +/* A96854 80243114 00000000 */ nop /* A96858 80243118 4600A0A1 */ cvt.d.s $f2, $f20 /* A9685C 8024311C 46201080 */ add.d $f2, $f2, $f0 /* A96860 80243120 462010A0 */ cvt.s.d $f2, $f2 @@ -37,7 +37,7 @@ glabel func_802430A8_A967E8 /* A96868 80243128 8E02006C */ lw $v0, 0x6c($s0) /* A9686C 8024312C 2442000A */ addiu $v0, $v0, 0xa /* A96870 80243130 44826000 */ mtc1 $v0, $f12 -/* A96874 80243134 00000000 */ nop +/* A96874 80243134 00000000 */ nop /* A96878 80243138 0C00A6C9 */ jal clamp_angle /* A9687C 8024313C 46806320 */ cvt.s.w $f12, $f12 /* A96880 80243140 4600010D */ trunc.w.s $f4, $f0 @@ -47,7 +47,7 @@ glabel func_802430A8_A967E8 /* A96890 80243150 A622008E */ sh $v0, 0x8e($s1) /* A96894 80243154 00021400 */ sll $v0, $v0, 0x10 /* A96898 80243158 1C400008 */ bgtz $v0, .L8024317C -/* A9689C 8024315C 00000000 */ nop +/* A9689C 8024315C 00000000 */ nop /* A968A0 80243160 8E0200CC */ lw $v0, 0xcc($s0) /* A968A4 80243164 8C430000 */ lw $v1, ($v0) /* A968A8 80243168 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243198_A968D8.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243198_A968D8.s index 114d51b2f4..d585a5e6bb 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243198_A968D8.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243198_A968D8.s @@ -29,7 +29,7 @@ glabel func_80243198_A968D8 /* A96938 802431F8 44801000 */ mtc1 $zero, $f2 /* A9693C 802431FC 46000021 */ cvt.d.s $f0, $f0 /* A96940 80243200 46220002 */ mul.d $f0, $f0, $f2 -/* A96944 80243204 00000000 */ nop +/* A96944 80243204 00000000 */ nop /* A96948 80243208 4600A0A1 */ cvt.d.s $f2, $f20 /* A9694C 8024320C 46201080 */ add.d $f2, $f2, $f0 /* A96950 80243210 462010A0 */ cvt.s.d $f2, $f2 @@ -37,7 +37,7 @@ glabel func_80243198_A968D8 /* A96958 80243218 8E02006C */ lw $v0, 0x6c($s0) /* A9695C 8024321C 2442000A */ addiu $v0, $v0, 0xa /* A96960 80243220 44826000 */ mtc1 $v0, $f12 -/* A96964 80243224 00000000 */ nop +/* A96964 80243224 00000000 */ nop /* A96968 80243228 0C00A6C9 */ jal clamp_angle /* A9696C 8024322C 46806320 */ cvt.s.w $f12, $f12 /* A96970 80243230 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270_A969B0.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270_A969B0.s index b513812277..5f4804c5bf 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270_A969B0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270_A969B0.s @@ -59,7 +59,7 @@ glabel func_80243270_A969B0 /* A96A88 80243348 44801000 */ mtc1 $zero, $f2 /* A96A8C 8024334C 46000021 */ cvt.d.s $f0, $f0 /* A96A90 80243350 46220002 */ mul.d $f0, $f0, $f2 -/* A96A94 80243354 00000000 */ nop +/* A96A94 80243354 00000000 */ nop /* A96A98 80243358 2402000A */ addiu $v0, $zero, 0xa /* A96A9C 8024335C AE40006C */ sw $zero, 0x6c($s2) /* A96AA0 80243360 AE400074 */ sw $zero, 0x74($s2) @@ -73,7 +73,7 @@ glabel func_80243270_A969B0 /* A96ABC 8024337C 8E4300B0 */ lw $v1, 0xb0($s2) /* A96AC0 80243380 30620004 */ andi $v0, $v1, 4 /* A96AC4 80243384 10400007 */ beqz $v0, .L802433A4 -/* A96AC8 80243388 00000000 */ nop +/* A96AC8 80243388 00000000 */ nop /* A96ACC 8024338C 824200B4 */ lb $v0, 0xb4($s2) /* A96AD0 80243390 14400053 */ bnez $v0, .L802434E0 /* A96AD4 80243394 0000102D */ daddu $v0, $zero, $zero @@ -86,21 +86,24 @@ glabel func_80243270_A969B0 /* A96AEC 802433AC 2C620029 */ sltiu $v0, $v1, 0x29 /* A96AF0 802433B0 1040004A */ beqz $v0, .L802434DC /* A96AF4 802433B4 00031080 */ sll $v0, $v1, 2 -/* A96AF8 802433B8 3C018024 */ lui $at, %hi(D_80245DA0) +/* A96AF8 802433B8 3C018024 */ lui $at, %hi(jtbl_80245DA0_A994E0) /* A96AFC 802433BC 00220821 */ addu $at, $at, $v0 -/* A96B00 802433C0 8C225DA0 */ lw $v0, %lo(D_80245DA0)($at) +/* A96B00 802433C0 8C225DA0 */ lw $v0, %lo(jtbl_80245DA0_A994E0)($at) /* A96B04 802433C4 00400008 */ jr $v0 -/* A96B08 802433C8 00000000 */ nop +/* A96B08 802433C8 00000000 */ nop +glabel L802433CC_A96B0C /* A96B0C 802433CC 0280202D */ daddu $a0, $s4, $zero /* A96B10 802433D0 0200282D */ daddu $a1, $s0, $zero /* A96B14 802433D4 0C090904 */ jal func_80242410_A95B50 /* A96B18 802433D8 0260302D */ daddu $a2, $s3, $zero +glabel L802433DC_A96B1C /* A96B1C 802433DC 0280202D */ daddu $a0, $s4, $zero /* A96B20 802433E0 0200282D */ daddu $a1, $s0, $zero /* A96B24 802433E4 0C090913 */ jal func_8024244C_A95B8C /* A96B28 802433E8 0260302D */ daddu $a2, $s3, $zero /* A96B2C 802433EC 08090D38 */ j .L802434E0 /* A96B30 802433F0 0000102D */ daddu $v0, $zero, $zero +glabel L802433F4_A96B34 /* A96B34 802433F4 0280202D */ daddu $a0, $s4, $zero /* A96B38 802433F8 0200282D */ daddu $a1, $s0, $zero /* A96B3C 802433FC 0C090976 */ jal func_802425D8_A95D18 @@ -109,6 +112,7 @@ glabel func_80243270_A969B0 /* A96B48 80243408 24020010 */ addiu $v0, $zero, 0x10 /* A96B4C 8024340C 14620034 */ bne $v1, $v0, .L802434E0 /* A96B50 80243410 0000102D */ daddu $v0, $zero, $zero +glabel L80243414_A96B54 /* A96B54 80243414 0280202D */ daddu $a0, $s4, $zero /* A96B58 80243418 0200282D */ daddu $a1, $s0, $zero /* A96B5C 8024341C 0C090A72 */ jal func_802429C8_A96108 @@ -117,30 +121,35 @@ glabel func_80243270_A969B0 /* A96B68 80243428 24020011 */ addiu $v0, $zero, 0x11 /* A96B6C 8024342C 1462002C */ bne $v1, $v0, .L802434E0 /* A96B70 80243430 0000102D */ daddu $v0, $zero, $zero +glabel L80243434_A96B74 /* A96B74 80243434 0280202D */ daddu $a0, $s4, $zero /* A96B78 80243438 0200282D */ daddu $a1, $s0, $zero /* A96B7C 8024343C 0C090AAF */ jal func_80242ABC_A961FC /* A96B80 80243440 0260302D */ daddu $a2, $s3, $zero /* A96B84 80243444 08090D38 */ j .L802434E0 /* A96B88 80243448 0000102D */ daddu $v0, $zero, $zero +glabel L8024344C_A96B8C /* A96B8C 8024344C 0280202D */ daddu $a0, $s4, $zero /* A96B90 80243450 0200282D */ daddu $a1, $s0, $zero /* A96B94 80243454 0C090B40 */ jal func_80242D00_A96440 /* A96B98 80243458 0260302D */ daddu $a2, $s3, $zero /* A96B9C 8024345C 08090D38 */ j .L802434E0 /* A96BA0 80243460 0000102D */ daddu $v0, $zero, $zero +glabel L80243464_A96BA4 /* A96BA4 80243464 0280202D */ daddu $a0, $s4, $zero /* A96BA8 80243468 0200282D */ daddu $a1, $s0, $zero /* A96BAC 8024346C 0C090B4F */ jal func_80242D3C_A9647C /* A96BB0 80243470 0260302D */ daddu $a2, $s3, $zero /* A96BB4 80243474 08090D38 */ j .L802434E0 /* A96BB8 80243478 0000102D */ daddu $v0, $zero, $zero +glabel L8024347C_A96BBC /* A96BBC 8024347C 0280202D */ daddu $a0, $s4, $zero /* A96BC0 80243480 0200282D */ daddu $a1, $s0, $zero /* A96BC4 80243484 0C090BC2 */ jal func_80242F08_A96648 /* A96BC8 80243488 0260302D */ daddu $a2, $s3, $zero /* A96BCC 8024348C 08090D38 */ j .L802434E0 /* A96BD0 80243490 0000102D */ daddu $v0, $zero, $zero +glabel L80243494_A96BD4 /* A96BD4 80243494 0280202D */ daddu $a0, $s4, $zero /* A96BD8 80243498 0200282D */ daddu $a1, $s0, $zero /* A96BDC 8024349C 0C090BDD */ jal func_80242F74_A966B4 @@ -149,17 +158,20 @@ glabel func_80243270_A969B0 /* A96BE8 802434A8 24020018 */ addiu $v0, $zero, 0x18 /* A96BEC 802434AC 1462000C */ bne $v1, $v0, .L802434E0 /* A96BF0 802434B0 0000102D */ daddu $v0, $zero, $zero +glabel L802434B4_A96BF4 /* A96BF4 802434B4 0280202D */ daddu $a0, $s4, $zero /* A96BF8 802434B8 0200282D */ daddu $a1, $s0, $zero /* A96BFC 802434BC 0C090C2A */ jal func_802430A8_A967E8 /* A96C00 802434C0 0260302D */ daddu $a2, $s3, $zero /* A96C04 802434C4 08090D38 */ j .L802434E0 /* A96C08 802434C8 0000102D */ daddu $v0, $zero, $zero +glabel L802434CC_A96C0C /* A96C0C 802434CC 0280202D */ daddu $a0, $s4, $zero /* A96C10 802434D0 0200282D */ daddu $a1, $s0, $zero /* A96C14 802434D4 0C090C66 */ jal func_80243198_A968D8 /* A96C18 802434D8 0260302D */ daddu $a2, $s3, $zero .L802434DC: +glabel L802434DC_A96C1C /* A96C1C 802434DC 0000102D */ daddu $v0, $zero, $zero .L802434E0: /* A96C20 802434E0 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024353C_A96C7C.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024353C_A96C7C.s index 5fc487c5a7..354a07ea91 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024353C_A96C7C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024353C_A96C7C.s @@ -12,7 +12,7 @@ glabel func_8024353C_A96C7C /* A96C98 80243558 8E03006C */ lw $v1, 0x6c($s0) /* A96C9C 8024355C 24020002 */ addiu $v0, $zero, 2 /* A96CA0 80243560 14620003 */ bne $v1, $v0, .L80243570 -/* A96CA4 80243564 00000000 */ nop +/* A96CA4 80243564 00000000 */ nop /* A96CA8 80243568 AC80001C */ sw $zero, 0x1c($a0) /* A96CAC 8024356C AC800018 */ sw $zero, 0x18($a0) .L80243570: @@ -21,6 +21,6 @@ glabel func_8024353C_A96C7C /* A96CB8 80243578 24020002 */ addiu $v0, $zero, 2 /* A96CBC 8024357C 03E00008 */ jr $ra /* A96CC0 80243580 27BD0018 */ addiu $sp, $sp, 0x18 -/* A96CC4 80243584 00000000 */ nop -/* A96CC8 80243588 00000000 */ nop -/* A96CCC 8024358C 00000000 */ nop +/* A96CC4 80243584 00000000 */ nop +/* A96CC8 80243588 00000000 */ nop +/* A96CCC 8024358C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_8024038C_A52C4C.s b/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_8024038C_A52C4C.s index 7ae5041210..8610799fe4 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_8024038C_A52C4C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_8024038C_A52C4C.s @@ -21,11 +21,11 @@ glabel func_8024038C_A52C4C /* A52C8C 802403CC A602008E */ sh $v0, 0x8e($s0) /* A52C90 802403D0 00021400 */ sll $v0, $v0, 0x10 /* A52C94 802403D4 1C400033 */ bgtz $v0, .L802404A4 -/* A52C98 802403D8 00000000 */ nop +/* A52C98 802403D8 00000000 */ nop .L802403DC: /* A52C9C 802403DC 8602008C */ lh $v0, 0x8c($s0) /* A52CA0 802403E0 14400030 */ bnez $v0, .L802404A4 -/* A52CA4 802403E4 00000000 */ nop +/* A52CA4 802403E4 00000000 */ nop /* A52CA8 802403E8 8E2200CC */ lw $v0, 0xcc($s1) /* A52CAC 802403EC 8C420024 */ lw $v0, 0x24($v0) /* A52CB0 802403F0 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_8024038C_A52C4C /* A52CBC 802403FC 8E230088 */ lw $v1, 0x88($s1) /* A52CC0 80240400 24020005 */ addiu $v0, $zero, 5 /* A52CC4 80240404 10620005 */ beq $v1, $v0, .L8024041C -/* A52CC8 80240408 00000000 */ nop +/* A52CC8 80240408 00000000 */ nop /* A52CCC 8024040C 10600003 */ beqz $v1, .L8024041C /* A52CD0 80240410 24020001 */ addiu $v0, $zero, 1 /* A52CD4 80240414 14620006 */ bne $v1, $v0, .L80240430 -/* A52CD8 80240418 00000000 */ nop +/* A52CD8 80240418 00000000 */ nop .L8024041C: /* A52CDC 8024041C 8E220084 */ lw $v0, 0x84($s1) /* A52CE0 80240420 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_8024038C_A52C4C /* A52D20 80240460 46220000 */ add.d $f0, $f0, $f2 /* A52D24 80240464 4620010D */ trunc.w.d $f4, $f0 /* A52D28 80240468 44022000 */ mfc1 $v0, $f4 -/* A52D2C 8024046C 00000000 */ nop +/* A52D2C 8024046C 00000000 */ nop /* A52D30 80240470 A602008E */ sh $v0, 0x8e($s0) /* A52D34 80240474 00021400 */ sll $v0, $v0, 0x10 /* A52D38 80240478 8E230078 */ lw $v1, 0x78($s1) /* A52D3C 8024047C 00021403 */ sra $v0, $v0, 0x10 /* A52D40 80240480 0043102A */ slt $v0, $v0, $v1 /* A52D44 80240484 10400003 */ beqz $v0, .L80240494 -/* A52D48 80240488 00000000 */ nop +/* A52D48 80240488 00000000 */ nop /* A52D4C 8024048C 9622007A */ lhu $v0, 0x7a($s1) /* A52D50 80240490 A602008E */ sh $v0, 0x8e($s0) .L80240494: diff --git a/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s b/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s index 6fd0b68aae..5f72d00c0e 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s +++ b/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s @@ -279,15 +279,17 @@ glabel func_802406A4_A52F64 /* A53350 80240A90 2C620015 */ sltiu $v0, $v1, 0x15 /* A53354 80240A94 10400009 */ beqz $v0, .L80240ABC /* A53358 80240A98 00031080 */ sll $v0, $v1, 2 -/* A5335C 80240A9C 3C018024 */ lui $at, %hi(D_80242038) +/* A5335C 80240A9C 3C018024 */ lui $at, %hi(jtbl_80242038_A548F8) /* A53360 80240AA0 00220821 */ addu $at, $at, $v0 -/* A53364 80240AA4 8C222038 */ lw $v0, %lo(D_80242038)($at) +/* A53364 80240AA4 8C222038 */ lw $v0, %lo(jtbl_80242038_A548F8)($at) /* A53368 80240AA8 00400008 */ jr $v0 /* A5336C 80240AAC 00000000 */ nop +glabel L80240AB0_A53370 /* A53370 80240AB0 8E420028 */ lw $v0, 0x28($s2) /* A53374 80240AB4 24420001 */ addiu $v0, $v0, 1 /* A53378 80240AB8 AE420028 */ sw $v0, 0x28($s2) .L80240ABC: +glabel L80240ABC_A5337C /* A5337C 80240ABC 0000102D */ daddu $v0, $zero, $zero .L80240AC0: /* A53380 80240AC0 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240000_A99590.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240000_A99590.s index 75aa9096e3..c14ddb43a6 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240000_A99590.s +++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240000_A99590.s @@ -18,13 +18,13 @@ glabel func_80240000_A99590 /* A995C4 80240034 24020014 */ addiu $v0, $zero, 0x14 /* A995C8 80240038 808300B4 */ lb $v1, 0xb4($a0) /* A995CC 8024003C 10620006 */ beq $v1, $v0, .L80240058 -/* A995D0 80240040 00000000 */ nop +/* A995D0 80240040 00000000 */ nop .L80240044: /* A995D4 80240044 8C820014 */ lw $v0, 0x14($a0) /* A995D8 80240048 3C03FFFF */ lui $v1, 0xffff /* A995DC 8024004C 00431024 */ and $v0, $v0, $v1 /* A995E0 80240050 10400005 */ beqz $v0, .L80240068 -/* A995E4 80240054 00000000 */ nop +/* A995E4 80240054 00000000 */ nop .L80240058: /* A995E8 80240058 0C039769 */ jal set_action_state /* A995EC 8024005C 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802400BC_A9964C.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802400BC_A9964C.s index 8a22f788e6..97851e8a90 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802400BC_A9964C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802400BC_A9964C.s @@ -9,7 +9,7 @@ glabel func_802400BC_A9964C /* A9965C 802400CC 3C108011 */ lui $s0, %hi(gPlayerStatus) /* A99660 802400D0 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* A99664 802400D4 14400005 */ bnez $v0, .L802400EC -/* A99668 802400D8 00000000 */ nop +/* A99668 802400D8 00000000 */ nop /* A9966C 802400DC C4800084 */ lwc1 $f0, 0x84($a0) /* A99670 802400E0 46800020 */ cvt.s.w $f0, $f0 /* A99674 802400E4 0809003E */ j .L802400F8 diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240170_A99700.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240170_A99700.s index 526a854dd4..bffaf984e9 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240170_A99700.s +++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240170_A99700.s @@ -42,16 +42,16 @@ glabel func_80240170_A99700 /* A99794 80240204 3C014387 */ lui $at, 0x4387 /* A99798 80240208 4481A000 */ mtc1 $at, $f20 /* A9979C 8024020C 0C00A70A */ jal get_clamped_angle_diff -/* A997A0 80240210 00000000 */ nop +/* A997A0 80240210 00000000 */ nop /* A997A4 80240214 0C00A6C9 */ jal clamp_angle /* A997A8 80240218 46000306 */ mov.s $f12, $f0 /* A997AC 8024021C 3C018024 */ lui $at, %hi(D_80243240) /* A997B0 80240220 D4223240 */ ldc1 $f2, %lo(D_80243240)($at) /* A997B4 80240224 46000021 */ cvt.d.s $f0, $f0 /* A997B8 80240228 4622003C */ c.lt.d $f0, $f2 -/* A997BC 8024022C 00000000 */ nop +/* A997BC 8024022C 00000000 */ nop /* A997C0 80240230 45000003 */ bc1f .L80240240 -/* A997C4 80240234 00000000 */ nop +/* A997C4 80240234 00000000 */ nop /* A997C8 80240238 3C0142B4 */ lui $at, 0x42b4 /* A997CC 8024023C 4481A000 */ mtc1 $at, $f20 .L80240240: @@ -71,7 +71,7 @@ glabel func_80240170_A99700 /* A99804 80240274 D4223248 */ ldc1 $f2, %lo(D_80243248)($at) /* A99808 80240278 46000021 */ cvt.d.s $f0, $f0 /* A9980C 8024027C 4620103C */ c.lt.d $f2, $f0 -/* A99810 80240280 00000000 */ nop +/* A99810 80240280 00000000 */ nop /* A99814 80240284 4501002E */ bc1t .L80240340 /* A99818 80240288 2402FFFF */ addiu $v0, $zero, -1 /* A9981C 8024028C 8E220000 */ lw $v0, ($s1) @@ -80,13 +80,13 @@ glabel func_80240170_A99700 /* A99828 80240298 860200A8 */ lh $v0, 0xa8($s0) /* A9982C 8024029C 46020001 */ sub.s $f0, $f0, $f2 /* A99830 802402A0 44821000 */ mtc1 $v0, $f2 -/* A99834 802402A4 00000000 */ nop +/* A99834 802402A4 00000000 */ nop /* A99838 802402A8 468010A1 */ cvt.d.w $f2, $f2 /* A9983C 802402AC 46221080 */ add.d $f2, $f2, $f2 /* A99840 802402B0 46000005 */ abs.s $f0, $f0 /* A99844 802402B4 46000021 */ cvt.d.s $f0, $f0 /* A99848 802402B8 4620103E */ c.le.d $f2, $f0 -/* A9984C 802402BC 00000000 */ nop +/* A9984C 802402BC 00000000 */ nop /* A99850 802402C0 4501001F */ bc1t .L80240340 /* A99854 802402C4 2402FFFF */ addiu $v0, $zero, -1 /* A99858 802402C8 3C038011 */ lui $v1, %hi(D_8010EBB3) @@ -97,7 +97,7 @@ glabel func_80240170_A99700 /* A9986C 802402DC 14620005 */ bne $v1, $v0, .L802402F4 /* A99870 802402E0 2402FFFF */ addiu $v0, $zero, -1 /* A99874 802402E4 080900D0 */ j .L80240340 -/* A99878 802402E8 00000000 */ nop +/* A99878 802402E8 00000000 */ nop .L802402EC: /* A9987C 802402EC 080900D0 */ j .L80240340 /* A99880 802402F0 0240102D */ daddu $v0, $s2, $zero @@ -120,7 +120,7 @@ glabel func_80240170_A99700 /* A998BC 8024032C 8E620078 */ lw $v0, 0x78($s3) /* A998C0 80240330 0222102A */ slt $v0, $s1, $v0 /* A998C4 80240334 1440FFF2 */ bnez $v0, .L80240300 -/* A998C8 80240338 00000000 */ nop +/* A998C8 80240338 00000000 */ nop .L8024033C: /* A998CC 8024033C 2402FFFF */ addiu $v0, $zero, -1 .L80240340: diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240360_A998F0.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240360_A998F0.s index ac305aa1f1..3f839d1204 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240360_A998F0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240360_A998F0.s @@ -38,7 +38,7 @@ glabel func_80240360_A998F0 /* A99974 802403E4 2402000F */ addiu $v0, $zero, 0xf /* A99978 802403E8 AFA2001C */ sw $v0, 0x1c($sp) /* A9997C 802403EC 44833000 */ mtc1 $v1, $f6 -/* A99980 802403F0 00000000 */ nop +/* A99980 802403F0 00000000 */ nop /* A99984 802403F4 468031A0 */ cvt.s.w $f6, $f6 /* A99988 802403F8 44073000 */ mfc1 $a3, $f6 /* A9998C 802403FC 27A20028 */ addiu $v0, $sp, 0x28 @@ -60,15 +60,15 @@ glabel func_80240360_A998F0 /* A999C8 80240438 0040202D */ daddu $a0, $v0, $zero /* A999CC 8024043C 2402FFFF */ addiu $v0, $zero, -1 /* A999D0 80240440 10820010 */ beq $a0, $v0, .L80240484 -/* A999D4 80240444 00000000 */ nop +/* A999D4 80240444 00000000 */ nop /* A999D8 80240448 0C00FB3A */ jal get_enemy -/* A999DC 8024044C 00000000 */ nop +/* A999DC 8024044C 00000000 */ nop /* A999E0 80240450 8C42006C */ lw $v0, 0x6c($v0) /* A999E4 80240454 1440000B */ bnez $v0, .L80240484 -/* A999E8 80240458 00000000 */ nop +/* A999E8 80240458 00000000 */ nop /* A999EC 8024045C 8602008C */ lh $v0, 0x8c($s0) /* A999F0 80240460 14400008 */ bnez $v0, .L80240484 -/* A999F4 80240464 00000000 */ nop +/* A999F4 80240464 00000000 */ nop /* A999F8 80240468 8E2200CC */ lw $v0, 0xcc($s1) /* A999FC 8024046C 8C420020 */ lw $v0, 0x20($v0) /* A99A00 80240470 AE020028 */ sw $v0, 0x28($s0) diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802404A4_A99A34.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802404A4_A99A34.s index 42dc300970..f220cb75c9 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802404A4_A99A34.s +++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802404A4_A99A34.s @@ -17,7 +17,7 @@ glabel func_802404A4_A99A34 /* A99A64 802404D4 A602008E */ sh $v0, 0x8e($s0) /* A99A68 802404D8 00021400 */ sll $v0, $v0, 0x10 /* A99A6C 802404DC 1C40002B */ bgtz $v0, .L8024058C -/* A99A70 802404E0 00000000 */ nop +/* A99A70 802404E0 00000000 */ nop /* A99A74 802404E4 0C09005C */ jal func_80240170_A99700 /* A99A78 802404E8 0240202D */ daddu $a0, $s2, $zero /* A99A7C 802404EC 0040202D */ daddu $a0, $v0, $zero @@ -35,7 +35,7 @@ glabel func_802404A4_A99A34 /* A99AAC 8024051C 3C01C1A0 */ lui $at, 0xc1a0 /* A99AB0 80240520 44812000 */ mtc1 $at, $f4 /* A99AB4 80240524 44833000 */ mtc1 $v1, $f6 -/* A99AB8 80240528 00000000 */ nop +/* A99AB8 80240528 00000000 */ nop /* A99ABC 8024052C 468031A0 */ cvt.s.w $f6, $f6 /* A99AC0 80240530 44073000 */ mfc1 $a3, $f6 /* A99AC4 80240534 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802406CC_A99C5C.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802406CC_A99C5C.s index 958c1c4ac4..b592fc277b 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802406CC_A99C5C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802406CC_A99C5C.s @@ -47,7 +47,7 @@ glabel func_802406CC_A99C5C /* A99D00 80240770 8E6200B0 */ lw $v0, 0xb0($s3) /* A99D04 80240774 30420004 */ andi $v0, $v0, 4 /* A99D08 80240778 10400019 */ beqz $v0, .L802407E0 -/* A99D0C 8024077C 00000000 */ nop +/* A99D0C 8024077C 00000000 */ nop .L80240780: /* A99D10 80240780 34630102 */ ori $v1, $v1, 0x102 /* A99D14 80240784 AEE00070 */ sw $zero, 0x70($s7) @@ -83,12 +83,12 @@ glabel func_802406CC_A99C5C /* A99D88 802407F8 10600007 */ beqz $v1, .L80240818 /* A99D8C 802407FC 0000102D */ daddu $v0, $zero, $zero /* A99D90 80240800 080902F7 */ j .L80240BDC -/* A99D94 80240804 00000000 */ nop +/* A99D94 80240804 00000000 */ nop .L80240808: /* A99D98 80240808 1062005B */ beq $v1, $v0, .L80240978 /* A99D9C 8024080C 0000102D */ daddu $v0, $zero, $zero /* A99DA0 80240810 080902F7 */ j .L80240BDC -/* A99DA4 80240814 00000000 */ nop +/* A99DA4 80240814 00000000 */ nop .L80240818: /* A99DA8 80240818 8E420000 */ lw $v0, ($s2) /* A99DAC 8024081C 0240202D */ daddu $a0, $s2, $zero @@ -131,17 +131,17 @@ glabel func_802406CC_A99C5C /* A99E3C 802408AC C6400038 */ lwc1 $f0, 0x38($s2) /* A99E40 802408B0 4600020D */ trunc.w.s $f8, $f0 /* A99E44 802408B4 44024000 */ mfc1 $v0, $f8 -/* A99E48 802408B8 00000000 */ nop +/* A99E48 802408B8 00000000 */ nop /* A99E4C 802408BC A6620010 */ sh $v0, 0x10($s3) /* A99E50 802408C0 C640003C */ lwc1 $f0, 0x3c($s2) /* A99E54 802408C4 4600020D */ trunc.w.s $f8, $f0 /* A99E58 802408C8 44024000 */ mfc1 $v0, $f8 -/* A99E5C 802408CC 00000000 */ nop +/* A99E5C 802408CC 00000000 */ nop /* A99E60 802408D0 A6620012 */ sh $v0, 0x12($s3) /* A99E64 802408D4 C6400040 */ lwc1 $f0, 0x40($s2) /* A99E68 802408D8 4600020D */ trunc.w.s $f8, $f0 /* A99E6C 802408DC 44024000 */ mfc1 $v0, $f8 -/* A99E70 802408E0 00000000 */ nop +/* A99E70 802408E0 00000000 */ nop /* A99E74 802408E4 A6620014 */ sh $v0, 0x14($s3) /* A99E78 802408E8 AE400044 */ sw $zero, 0x44($s2) /* A99E7C 802408EC AE400048 */ sw $zero, 0x48($s2) @@ -187,10 +187,10 @@ glabel func_802406CC_A99C5C /* A99F18 80240988 44810800 */ mtc1 $at, $f1 /* A99F1C 8024098C 44800000 */ mtc1 $zero, $f0 /* A99F20 80240990 44821000 */ mtc1 $v0, $f2 -/* A99F24 80240994 00000000 */ nop +/* A99F24 80240994 00000000 */ nop /* A99F28 80240998 468010A1 */ cvt.d.w $f2, $f2 /* A99F2C 8024099C 46201082 */ mul.d $f2, $f2, $f0 -/* A99F30 802409A0 00000000 */ nop +/* A99F30 802409A0 00000000 */ nop /* A99F34 802409A4 0200282D */ daddu $a1, $s0, $zero /* A99F38 802409A8 C6440038 */ lwc1 $f4, 0x38($s2) /* A99F3C 802409AC C640003C */ lwc1 $f0, 0x3c($s2) @@ -210,13 +210,13 @@ glabel func_802406CC_A99C5C /* A99F74 802409E4 864200A6 */ lh $v0, 0xa6($s2) /* A99F78 802409E8 27B40028 */ addiu $s4, $sp, 0x28 /* A99F7C 802409EC 44820000 */ mtc1 $v0, $f0 -/* A99F80 802409F0 00000000 */ nop +/* A99F80 802409F0 00000000 */ nop /* A99F84 802409F4 46800020 */ cvt.s.w $f0, $f0 /* A99F88 802409F8 E7A00018 */ swc1 $f0, 0x18($sp) /* A99F8C 802409FC 864200A8 */ lh $v0, 0xa8($s2) /* A99F90 80240A00 0280382D */ daddu $a3, $s4, $zero /* A99F94 80240A04 44820000 */ mtc1 $v0, $f0 -/* A99F98 80240A08 00000000 */ nop +/* A99F98 80240A08 00000000 */ nop /* A99F9C 80240A0C 46800020 */ cvt.s.w $f0, $f0 /* A99FA0 80240A10 0C0376B9 */ jal func_800DDAE4 /* A99FA4 80240A14 E7A0001C */ swc1 $f0, 0x1c($sp) @@ -240,14 +240,14 @@ glabel func_802406CC_A99C5C /* A99FE8 80240A58 0C0372DF */ jal func_800DCB7C /* A99FEC 80240A5C 0280382D */ daddu $a3, $s4, $zero /* A99FF0 80240A60 10400019 */ beqz $v0, .L80240AC8 -/* A99FF4 80240A64 00000000 */ nop +/* A99FF4 80240A64 00000000 */ nop /* A99FF8 80240A68 C640001C */ lwc1 $f0, 0x1c($s2) /* A99FFC 80240A6C C7A2002C */ lwc1 $f2, 0x2c($sp) /* A9A000 80240A70 46000005 */ abs.s $f0, $f0 /* A9A004 80240A74 4600103C */ c.lt.s $f2, $f0 -/* A9A008 80240A78 00000000 */ nop +/* A9A008 80240A78 00000000 */ nop /* A9A00C 80240A7C 45000012 */ bc1f .L80240AC8 -/* A9A010 80240A80 00000000 */ nop +/* A9A010 80240A80 00000000 */ nop /* A9A014 80240A84 C7A40024 */ lwc1 $f4, 0x24($sp) /* A9A018 80240A88 C6400064 */ lwc1 $f0, 0x64($s2) /* A9A01C 80240A8C 46002001 */ sub.s $f0, $f4, $f0 @@ -257,7 +257,7 @@ glabel func_802406CC_A99C5C /* A9A02C 80240A9C 46000005 */ abs.s $f0, $f0 /* A9A030 80240AA0 46000021 */ cvt.d.s $f0, $f0 /* A9A034 80240AA4 4622003C */ c.lt.d $f0, $f2 -/* A9A038 80240AA8 00000000 */ nop +/* A9A038 80240AA8 00000000 */ nop /* A9A03C 80240AAC 45000006 */ bc1f .L80240AC8 /* A9A040 80240AB0 0240202D */ daddu $a0, $s2, $zero /* A9A044 80240AB4 8E450018 */ lw $a1, 0x18($s2) @@ -272,7 +272,7 @@ glabel func_802406CC_A99C5C /* A9A064 80240AD4 44801000 */ mtc1 $zero, $f2 /* A9A068 80240AD8 46000021 */ cvt.d.s $f0, $f0 /* A9A06C 80240ADC 4622003C */ c.lt.d $f0, $f2 -/* A9A070 80240AE0 00000000 */ nop +/* A9A070 80240AE0 00000000 */ nop /* A9A074 80240AE4 45030001 */ bc1tl .L80240AEC /* A9A078 80240AE8 2416000B */ addiu $s6, $zero, 0xb .L80240AEC: @@ -288,7 +288,7 @@ glabel func_802406CC_A99C5C /* A9A09C 80240B0C 8E620070 */ lw $v0, 0x70($s3) /* A9A0A0 80240B10 30420001 */ andi $v0, $v0, 1 /* A9A0A4 80240B14 10400009 */ beqz $v0, .L80240B3C -/* A9A0A8 80240B18 00000000 */ nop +/* A9A0A8 80240B18 00000000 */ nop /* A9A0AC 80240B1C C640004C */ lwc1 $f0, 0x4c($s2) /* A9A0B0 80240B20 3C014044 */ lui $at, 0x4044 /* A9A0B4 80240B24 44811800 */ mtc1 $at, $f3 diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240C08_A9A198.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240C08_A9A198.s index 211e400f6f..eb8c9b5421 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240C08_A9A198.s +++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240C08_A9A198.s @@ -50,7 +50,7 @@ glabel func_80240C08_A9A198 .L80240CB4: /* A9A244 80240CB4 86240008 */ lh $a0, 8($s1) /* A9A248 80240CB8 0C00FB5A */ jal get_enemy_safe -/* A9A24C 80240CBC 00000000 */ nop +/* A9A24C 80240CBC 00000000 */ nop /* A9A250 80240CC0 14400005 */ bnez $v0, .L80240CD8 /* A9A254 80240CC4 0260202D */ daddu $a0, $s3, $zero /* A9A258 80240CC8 3C05FE36 */ lui $a1, 0xfe36 @@ -60,7 +60,7 @@ glabel func_80240C08_A9A198 .L80240CD8: /* A9A268 80240CD8 86240008 */ lh $a0, 8($s1) /* A9A26C 80240CDC 0C00EABB */ jal get_npc_unsafe -/* A9A270 80240CE0 00000000 */ nop +/* A9A270 80240CE0 00000000 */ nop /* A9A274 80240CE4 8E630070 */ lw $v1, 0x70($s3) /* A9A278 80240CE8 10600006 */ beqz $v1, .L80240D04 /* A9A27C 80240CEC 0040802D */ daddu $s0, $v0, $zero @@ -68,7 +68,7 @@ glabel func_80240C08_A9A198 /* A9A284 80240CF4 1062003F */ beq $v1, $v0, .L80240DF4 /* A9A288 80240CF8 0000102D */ daddu $v0, $zero, $zero /* A9A28C 80240CFC 0809040E */ j .L80241038 -/* A9A290 80240D00 00000000 */ nop +/* A9A290 80240D00 00000000 */ nop .L80240D04: /* A9A294 80240D04 AFA00010 */ sw $zero, 0x10($sp) /* A9A298 80240D08 AFA00014 */ sw $zero, 0x14($sp) @@ -79,7 +79,7 @@ glabel func_80240C08_A9A198 /* A9A2AC 80240D1C 24040002 */ addiu $a0, $zero, 2 /* A9A2B0 80240D20 C64C006C */ lwc1 $f12, 0x6c($s2) /* A9A2B4 80240D24 0C00A6C9 */ jal clamp_angle -/* A9A2B8 80240D28 00000000 */ nop +/* A9A2B8 80240D28 00000000 */ nop /* A9A2BC 80240D2C 3C018024 */ lui $at, %hi(D_80243250) /* A9A2C0 80240D30 D4383250 */ ldc1 $f24, %lo(D_80243250)($at) /* A9A2C4 80240D34 46000521 */ cvt.d.s $f20, $f0 @@ -107,7 +107,7 @@ glabel func_80240C08_A9A198 /* A9A31C 80240D8C 46000306 */ mov.s $f12, $f0 /* A9A320 80240D90 46000021 */ cvt.d.s $f0, $f0 /* A9A324 80240D94 4638003C */ c.lt.d $f0, $f24 -/* A9A328 80240D98 00000000 */ nop +/* A9A328 80240D98 00000000 */ nop /* A9A32C 80240D9C 45020002 */ bc1fl .L80240DA8 /* A9A330 80240DA0 E614000C */ swc1 $f20, 0xc($s0) /* A9A334 80240DA4 E616000C */ swc1 $f22, 0xc($s0) @@ -117,7 +117,7 @@ glabel func_80240C08_A9A198 /* A9A340 80240DB0 D4223260 */ ldc1 $f2, %lo(D_80243260)($at) /* A9A344 80240DB4 46000021 */ cvt.d.s $f0, $f0 /* A9A348 80240DB8 46220002 */ mul.d $f0, $f0, $f2 -/* A9A34C 80240DBC 00000000 */ nop +/* A9A34C 80240DBC 00000000 */ nop /* A9A350 80240DC0 3C013F66 */ lui $at, 0x3f66 /* A9A354 80240DC4 34216666 */ ori $at, $at, 0x6666 /* A9A358 80240DC8 44812000 */ mtc1 $at, $f4 @@ -147,13 +147,13 @@ glabel func_80240C08_A9A198 /* A9A3B4 80240E24 860200A6 */ lh $v0, 0xa6($s0) /* A9A3B8 80240E28 27A60024 */ addiu $a2, $sp, 0x24 /* A9A3BC 80240E2C 44820000 */ mtc1 $v0, $f0 -/* A9A3C0 80240E30 00000000 */ nop +/* A9A3C0 80240E30 00000000 */ nop /* A9A3C4 80240E34 46800020 */ cvt.s.w $f0, $f0 /* A9A3C8 80240E38 E7A00018 */ swc1 $f0, 0x18($sp) /* A9A3CC 80240E3C 860200A8 */ lh $v0, 0xa8($s0) /* A9A3D0 80240E40 27A70028 */ addiu $a3, $sp, 0x28 /* A9A3D4 80240E44 44820000 */ mtc1 $v0, $f0 -/* A9A3D8 80240E48 00000000 */ nop +/* A9A3D8 80240E48 00000000 */ nop /* A9A3DC 80240E4C 46800020 */ cvt.s.w $f0, $f0 /* A9A3E0 80240E50 0C037711 */ jal func_800DDC44 /* A9A3E4 80240E54 E7A0001C */ swc1 $f0, 0x1c($sp) @@ -173,7 +173,7 @@ glabel func_80240C08_A9A198 /* A9A414 80240E84 44801800 */ mtc1 $zero, $f3 /* A9A418 80240E88 46000021 */ cvt.d.s $f0, $f0 /* A9A41C 80240E8C 4622003C */ c.lt.d $f0, $f2 -/* A9A420 80240E90 00000000 */ nop +/* A9A420 80240E90 00000000 */ nop /* A9A424 80240E94 45000028 */ bc1f .L80240F38 /* A9A428 80240E98 27A50020 */ addiu $a1, $sp, 0x20 /* A9A42C 80240E9C 27A60024 */ addiu $a2, $sp, 0x24 @@ -204,7 +204,7 @@ glabel func_80240C08_A9A198 /* A9A490 80240F00 0C0372DF */ jal func_800DCB7C /* A9A494 80240F04 27A70028 */ addiu $a3, $sp, 0x28 /* A9A498 80240F08 1040000B */ beqz $v0, .L80240F38 -/* A9A49C 80240F0C 00000000 */ nop +/* A9A49C 80240F0C 00000000 */ nop /* A9A4A0 80240F10 C600001C */ lwc1 $f0, 0x1c($s0) /* A9A4A4 80240F14 C7A2002C */ lwc1 $f2, 0x2c($sp) /* A9A4A8 80240F18 46000005 */ abs.s $f0, $f0 @@ -212,7 +212,7 @@ glabel func_80240C08_A9A198 /* A9A4B0 80240F20 46340000 */ add.d $f0, $f0, $f20 /* A9A4B4 80240F24 460010A1 */ cvt.d.s $f2, $f2 /* A9A4B8 80240F28 4620103E */ c.le.d $f2, $f0 -/* A9A4BC 80240F2C 00000000 */ nop +/* A9A4BC 80240F2C 00000000 */ nop /* A9A4C0 80240F30 45030001 */ bc1tl .L80240F38 /* A9A4C4 80240F34 24120001 */ addiu $s2, $zero, 1 .L80240F38: @@ -234,7 +234,7 @@ glabel func_80240C08_A9A198 /* A9A500 80240F70 2414000B */ addiu $s4, $zero, 0xb .L80240F74: /* A9A504 80240F74 12800024 */ beqz $s4, .L80241008 -/* A9A508 80240F78 00000000 */ nop +/* A9A508 80240F78 00000000 */ nop /* A9A50C 80240F7C AFA00010 */ sw $zero, 0x10($sp) /* A9A510 80240F80 AFA00014 */ sw $zero, 0x14($sp) /* A9A514 80240F84 8E050038 */ lw $a1, 0x38($s0) @@ -268,7 +268,7 @@ glabel func_80240C08_A9A198 /* A9A584 80240FF4 AC800070 */ sw $zero, 0x70($a0) .L80240FF8: /* A9A588 80240FF8 0C0B2026 */ jal set_variable -/* A9A58C 80240FFC 00000000 */ nop +/* A9A58C 80240FFC 00000000 */ nop /* A9A590 80241000 0809040E */ j .L80241038 /* A9A594 80241004 24020002 */ addiu $v0, $zero, 2 .L80241008: diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s index 9dcc178b9f..cd4127fefc 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s @@ -103,41 +103,48 @@ glabel func_80241064_A9A5F4 /* A9A764 802411D4 2C620064 */ sltiu $v0, $v1, 0x64 /* A9A768 802411D8 10400060 */ beqz $v0, .L8024135C /* A9A76C 802411DC 00031080 */ sll $v0, $v1, 2 -/* A9A770 802411E0 3C018024 */ lui $at, %hi(D_80243268) +/* A9A770 802411E0 3C018024 */ lui $at, %hi(jtbl_80243268_A9C7F8) /* A9A774 802411E4 00220821 */ addu $at, $at, $v0 -/* A9A778 802411E8 8C223268 */ lw $v0, %lo(D_80243268)($at) +/* A9A778 802411E8 8C223268 */ lw $v0, %lo(jtbl_80243268_A9C7F8)($at) /* A9A77C 802411EC 00400008 */ jr $v0 /* A9A780 802411F0 00000000 */ nop +glabel L802411F4_A9A784 /* A9A784 802411F4 0260202D */ daddu $a0, $s3, $zero /* A9A788 802411F8 0200282D */ daddu $a1, $s0, $zero /* A9A78C 802411FC 0C012568 */ jal func_800495A0 /* A9A790 80241200 02A0302D */ daddu $a2, $s5, $zero +glabel L80241204_A9A794 /* A9A794 80241204 0260202D */ daddu $a0, $s3, $zero /* A9A798 80241208 0200282D */ daddu $a1, $s0, $zero /* A9A79C 8024120C 0C0125AE */ jal func_800496B8 /* A9A7A0 80241210 02A0302D */ daddu $a2, $s5, $zero /* A9A7A4 80241214 080904D7 */ j .L8024135C /* A9A7A8 80241218 00000000 */ nop +glabel L8024121C_A9A7AC /* A9A7AC 8024121C 0260202D */ daddu $a0, $s3, $zero /* A9A7B0 80241220 0200282D */ daddu $a1, $s0, $zero /* A9A7B4 80241224 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A9A7B8 80241228 02A0302D */ daddu $a2, $s5, $zero +glabel L8024122C_A9A7BC /* A9A7BC 8024122C 0260202D */ daddu $a0, $s3, $zero /* A9A7C0 80241230 0200282D */ daddu $a1, $s0, $zero /* A9A7C4 80241234 0C012701 */ jal func_80049C04 /* A9A7C8 80241238 02A0302D */ daddu $a2, $s5, $zero /* A9A7CC 8024123C 080904D7 */ j .L8024135C /* A9A7D0 80241240 00000000 */ nop +glabel L80241244_A9A7D4 /* A9A7D4 80241244 0260202D */ daddu $a0, $s3, $zero /* A9A7D8 80241248 0200282D */ daddu $a1, $s0, $zero /* A9A7DC 8024124C 0C01278F */ jal func_80049E3C /* A9A7E0 80241250 02A0302D */ daddu $a2, $s5, $zero +glabel L80241254_A9A7E4 /* A9A7E4 80241254 0260202D */ daddu $a0, $s3, $zero /* A9A7E8 80241258 0200282D */ daddu $a1, $s0, $zero /* A9A7EC 8024125C 0C0127B3 */ jal func_80049ECC /* A9A7F0 80241260 02A0302D */ daddu $a2, $s5, $zero /* A9A7F4 80241264 080904D7 */ j .L8024135C /* A9A7F8 80241268 00000000 */ nop +glabel L8024126C_A9A7FC /* A9A7FC 8024126C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A9A800 80241270 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A9A804 80241274 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -170,37 +177,45 @@ glabel func_80241064_A9A5F4 /* A9A868 802412D8 0200282D */ daddu $a1, $s0, $zero /* A9A86C 802412DC 0C0127DF */ jal func_80049F7C /* A9A870 802412E0 02A0302D */ daddu $a2, $s5, $zero +glabel L802412E4_A9A874 /* A9A874 802412E4 0260202D */ daddu $a0, $s3, $zero /* A9A878 802412E8 0200282D */ daddu $a1, $s0, $zero /* A9A87C 802412EC 0C012849 */ jal func_8004A124 /* A9A880 802412F0 02A0302D */ daddu $a2, $s5, $zero /* A9A884 802412F4 080904D7 */ j .L8024135C /* A9A888 802412F8 00000000 */ nop +glabel L802412FC_A9A88C /* A9A88C 802412FC 0260202D */ daddu $a0, $s3, $zero /* A9A890 80241300 0200282D */ daddu $a1, $s0, $zero /* A9A894 80241304 0C0128FA */ jal func_8004A3E8 /* A9A898 80241308 02A0302D */ daddu $a2, $s5, $zero /* A9A89C 8024130C 080904D7 */ j .L8024135C /* A9A8A0 80241310 00000000 */ nop +glabel L80241314_A9A8A4 /* A9A8A4 80241314 0C090129 */ jal func_802404A4_A99A34 /* A9A8A8 80241318 0260202D */ daddu $a0, $s3, $zero /* A9A8AC 8024131C 080904D7 */ j .L8024135C /* A9A8B0 80241320 00000000 */ nop +glabel L80241324_A9A8B4 /* A9A8B4 80241324 0C090169 */ jal kpa_111_UnkSetDurationFunc /* A9A8B8 80241328 0260202D */ daddu $a0, $s3, $zero /* A9A8BC 8024132C 080904D7 */ j .L8024135C /* A9A8C0 80241330 00000000 */ nop +glabel L80241334_A9A8C4 /* A9A8C4 80241334 0C09017A */ jal kpa_111_UnkNpcAIFunc9 /* A9A8C8 80241338 0260202D */ daddu $a0, $s3, $zero /* A9A8CC 8024133C 080904D7 */ j .L8024135C /* A9A8D0 80241340 00000000 */ nop +glabel L80241344_A9A8D4 /* A9A8D4 80241344 0C0901A2 */ jal kpa_111_UnkDurationCheck /* A9A8D8 80241348 0260202D */ daddu $a0, $s3, $zero /* A9A8DC 8024134C 080904D7 */ j .L8024135C /* A9A8E0 80241350 00000000 */ nop +glabel L80241354_A9A8E4 /* A9A8E4 80241354 0C0129CF */ jal func_8004A73C /* A9A8E8 80241358 0260202D */ daddu $a0, $s3, $zero .L8024135C: +glabel L8024135C_A9A8EC /* A9A8EC 8024135C 8FBF0048 */ lw $ra, 0x48($sp) /* A9A8F0 80241360 8FB50044 */ lw $s5, 0x44($sp) /* A9A8F4 80241364 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240040_A9CC70.s b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240040_A9CC70.s index 3b5f5c478f..10943f472b 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240040_A9CC70.s +++ b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240040_A9CC70.s @@ -18,13 +18,13 @@ glabel func_80240040_A9CC70 /* A9CCA4 80240074 24020014 */ addiu $v0, $zero, 0x14 /* A9CCA8 80240078 808300B4 */ lb $v1, 0xb4($a0) /* A9CCAC 8024007C 10620006 */ beq $v1, $v0, .L80240098 -/* A9CCB0 80240080 00000000 */ nop +/* A9CCB0 80240080 00000000 */ nop .L80240084: /* A9CCB4 80240084 8C820014 */ lw $v0, 0x14($a0) /* A9CCB8 80240088 3C03FFFF */ lui $v1, 0xffff /* A9CCBC 8024008C 00431024 */ and $v0, $v0, $v1 /* A9CCC0 80240090 10400005 */ beqz $v0, .L802400A8 -/* A9CCC4 80240094 00000000 */ nop +/* A9CCC4 80240094 00000000 */ nop .L80240098: /* A9CCC8 80240098 0C039769 */ jal set_action_state /* A9CCCC 8024009C 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_802400FC_A9CD2C.s b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_802400FC_A9CD2C.s index 60fd33e2ab..fdd3c176aa 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_802400FC_A9CD2C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_802400FC_A9CD2C.s @@ -9,7 +9,7 @@ glabel func_802400FC_A9CD2C /* A9CD3C 8024010C 3C108011 */ lui $s0, %hi(gPlayerStatus) /* A9CD40 80240110 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* A9CD44 80240114 14400005 */ bnez $v0, .L8024012C -/* A9CD48 80240118 00000000 */ nop +/* A9CD48 80240118 00000000 */ nop /* A9CD4C 8024011C C4800084 */ lwc1 $f0, 0x84($a0) /* A9CD50 80240120 46800020 */ cvt.s.w $f0, $f0 /* A9CD54 80240124 0809004E */ j .L80240138 diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_8024022C_A9CE5C.s b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_8024022C_A9CE5C.s index a90856ae50..58f89763b1 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_8024022C_A9CE5C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_8024022C_A9CE5C.s @@ -21,11 +21,11 @@ glabel func_8024022C_A9CE5C /* A9CE9C 8024026C A602008E */ sh $v0, 0x8e($s0) /* A9CEA0 80240270 00021400 */ sll $v0, $v0, 0x10 /* A9CEA4 80240274 1C400033 */ bgtz $v0, .L80240344 -/* A9CEA8 80240278 00000000 */ nop +/* A9CEA8 80240278 00000000 */ nop .L8024027C: /* A9CEAC 8024027C 8602008C */ lh $v0, 0x8c($s0) /* A9CEB0 80240280 14400030 */ bnez $v0, .L80240344 -/* A9CEB4 80240284 00000000 */ nop +/* A9CEB4 80240284 00000000 */ nop /* A9CEB8 80240288 8E2200CC */ lw $v0, 0xcc($s1) /* A9CEBC 8024028C 8C420024 */ lw $v0, 0x24($v0) /* A9CEC0 80240290 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_8024022C_A9CE5C /* A9CECC 8024029C 8E230088 */ lw $v1, 0x88($s1) /* A9CED0 802402A0 24020005 */ addiu $v0, $zero, 5 /* A9CED4 802402A4 10620005 */ beq $v1, $v0, .L802402BC -/* A9CED8 802402A8 00000000 */ nop +/* A9CED8 802402A8 00000000 */ nop /* A9CEDC 802402AC 10600003 */ beqz $v1, .L802402BC /* A9CEE0 802402B0 24020001 */ addiu $v0, $zero, 1 /* A9CEE4 802402B4 14620006 */ bne $v1, $v0, .L802402D0 -/* A9CEE8 802402B8 00000000 */ nop +/* A9CEE8 802402B8 00000000 */ nop .L802402BC: /* A9CEEC 802402BC 8E220084 */ lw $v0, 0x84($s1) /* A9CEF0 802402C0 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_8024022C_A9CE5C /* A9CF30 80240300 46220000 */ add.d $f0, $f0, $f2 /* A9CF34 80240304 4620010D */ trunc.w.d $f4, $f0 /* A9CF38 80240308 44022000 */ mfc1 $v0, $f4 -/* A9CF3C 8024030C 00000000 */ nop +/* A9CF3C 8024030C 00000000 */ nop /* A9CF40 80240310 A602008E */ sh $v0, 0x8e($s0) /* A9CF44 80240314 00021400 */ sll $v0, $v0, 0x10 /* A9CF48 80240318 8E230078 */ lw $v1, 0x78($s1) /* A9CF4C 8024031C 00021403 */ sra $v0, $v0, 0x10 /* A9CF50 80240320 0043102A */ slt $v0, $v0, $v1 /* A9CF54 80240324 10400003 */ beqz $v0, .L80240334 -/* A9CF58 80240328 00000000 */ nop +/* A9CF58 80240328 00000000 */ nop /* A9CF5C 8024032C 9622007A */ lhu $v0, 0x7a($s1) /* A9CF60 80240330 A602008E */ sh $v0, 0x8e($s0) .L80240334: diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s index 1a466e6492..8e34e2b217 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s +++ b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s @@ -279,15 +279,17 @@ glabel func_80240544_A9D174 /* A9D560 80240930 2C620015 */ sltiu $v0, $v1, 0x15 /* A9D564 80240934 10400009 */ beqz $v0, .L8024095C /* A9D568 80240938 00031080 */ sll $v0, $v1, 2 -/* A9D56C 8024093C 3C018024 */ lui $at, %hi(D_80241CF8) +/* A9D56C 8024093C 3C018024 */ lui $at, %hi(jtbl_80241CF8_A9E928) /* A9D570 80240940 00220821 */ addu $at, $at, $v0 -/* A9D574 80240944 8C221CF8 */ lw $v0, %lo(D_80241CF8)($at) +/* A9D574 80240944 8C221CF8 */ lw $v0, %lo(jtbl_80241CF8_A9E928)($at) /* A9D578 80240948 00400008 */ jr $v0 /* A9D57C 8024094C 00000000 */ nop +glabel L80240950_A9D580 /* A9D580 80240950 8E420028 */ lw $v0, 0x28($s2) /* A9D584 80240954 24420001 */ addiu $v0, $v0, 1 /* A9D588 80240958 AE420028 */ sw $v0, 0x28($s2) .L8024095C: +glabel L8024095C_A9D58C /* A9D58C 8024095C 0000102D */ daddu $v0, $zero, $zero .L80240960: /* A9D590 80240960 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_114/A9E980/func_80240000_A9E980.s b/asm/nonmatchings/world/area_kpa/kpa_114/A9E980/func_80240000_A9E980.s index 584247e48b..8070db8539 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_114/A9E980/func_80240000_A9E980.s +++ b/asm/nonmatchings/world/area_kpa/kpa_114/A9E980/func_80240000_A9E980.s @@ -9,7 +9,7 @@ glabel func_80240000_A9E980 /* A9E990 80240010 24A50390 */ addiu $a1, $a1, %lo(func_80240390_8B0400) /* A9E994 80240014 AFBF0010 */ sw $ra, 0x10($sp) /* A9E998 80240018 0C01953C */ jal sprintf -/* A9E99C 8024001C 00000000 */ nop +/* A9E99C 8024001C 00000000 */ nop /* A9E9A0 80240020 3C04800E */ lui $a0, %hi(D_800D91E0) /* A9E9A4 80240024 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) /* A9E9A8 80240028 3C058024 */ lui $a1, %hi(func_802403A0_9FAB90) @@ -19,6 +19,6 @@ glabel func_80240000_A9E980 /* A9E9B8 80240038 0000102D */ daddu $v0, $zero, $zero /* A9E9BC 8024003C 03E00008 */ jr $ra /* A9E9C0 80240040 27BD0018 */ addiu $sp, $sp, 0x18 -/* A9E9C4 80240044 00000000 */ nop -/* A9E9C8 80240048 00000000 */ nop -/* A9E9CC 8024004C 00000000 */ nop +/* A9E9C4 80240044 00000000 */ nop +/* A9E9C8 80240048 00000000 */ nop +/* A9E9CC 8024004C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240000_A9ED40.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240000_A9ED40.s index 9e2a118cbe..1c5e31efa6 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240000_A9ED40.s +++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240000_A9ED40.s @@ -18,13 +18,13 @@ glabel func_80240000_A9ED40 /* A9ED74 80240034 24020014 */ addiu $v0, $zero, 0x14 /* A9ED78 80240038 808300B4 */ lb $v1, 0xb4($a0) /* A9ED7C 8024003C 10620006 */ beq $v1, $v0, .L80240058 -/* A9ED80 80240040 00000000 */ nop +/* A9ED80 80240040 00000000 */ nop .L80240044: /* A9ED84 80240044 8C820014 */ lw $v0, 0x14($a0) /* A9ED88 80240048 3C03FFFF */ lui $v1, 0xffff /* A9ED8C 8024004C 00431024 */ and $v0, $v0, $v1 /* A9ED90 80240050 10400005 */ beqz $v0, .L80240068 -/* A9ED94 80240054 00000000 */ nop +/* A9ED94 80240054 00000000 */ nop .L80240058: /* A9ED98 80240058 0C039769 */ jal set_action_state /* A9ED9C 8024005C 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802400BC_A9EDFC.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802400BC_A9EDFC.s index a984b207f9..d0be199355 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802400BC_A9EDFC.s +++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802400BC_A9EDFC.s @@ -9,7 +9,7 @@ glabel func_802400BC_A9EDFC /* A9EE0C 802400CC 3C108011 */ lui $s0, %hi(gPlayerStatus) /* A9EE10 802400D0 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* A9EE14 802400D4 14400005 */ bnez $v0, .L802400EC -/* A9EE18 802400D8 00000000 */ nop +/* A9EE18 802400D8 00000000 */ nop /* A9EE1C 802400DC C4800084 */ lwc1 $f0, 0x84($a0) /* A9EE20 802400E0 46800020 */ cvt.s.w $f0, $f0 /* A9EE24 802400E4 0809003E */ j .L802400F8 diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240170_A9EEB0.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240170_A9EEB0.s index 81083cd0f1..bf2f4f778a 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240170_A9EEB0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240170_A9EEB0.s @@ -42,16 +42,16 @@ glabel func_80240170_A9EEB0 /* A9EF44 80240204 3C014387 */ lui $at, 0x4387 /* A9EF48 80240208 4481A000 */ mtc1 $at, $f20 /* A9EF4C 8024020C 0C00A70A */ jal get_clamped_angle_diff -/* A9EF50 80240210 00000000 */ nop +/* A9EF50 80240210 00000000 */ nop /* A9EF54 80240214 0C00A6C9 */ jal clamp_angle /* A9EF58 80240218 46000306 */ mov.s $f12, $f0 /* A9EF5C 8024021C 3C018024 */ lui $at, %hi(func_80242FE0_A1E0E0) /* A9EF60 80240220 D4222FE0 */ ldc1 $f2, %lo(func_80242FE0_A1E0E0)($at) /* A9EF64 80240224 46000021 */ cvt.d.s $f0, $f0 /* A9EF68 80240228 4622003C */ c.lt.d $f0, $f2 -/* A9EF6C 8024022C 00000000 */ nop +/* A9EF6C 8024022C 00000000 */ nop /* A9EF70 80240230 45000003 */ bc1f .L80240240 -/* A9EF74 80240234 00000000 */ nop +/* A9EF74 80240234 00000000 */ nop /* A9EF78 80240238 3C0142B4 */ lui $at, 0x42b4 /* A9EF7C 8024023C 4481A000 */ mtc1 $at, $f20 .L80240240: @@ -71,7 +71,7 @@ glabel func_80240170_A9EEB0 /* A9EFB4 80240274 D4222FE8 */ ldc1 $f2, %lo(D_80242FE8)($at) /* A9EFB8 80240278 46000021 */ cvt.d.s $f0, $f0 /* A9EFBC 8024027C 4620103C */ c.lt.d $f2, $f0 -/* A9EFC0 80240280 00000000 */ nop +/* A9EFC0 80240280 00000000 */ nop /* A9EFC4 80240284 4501002E */ bc1t .L80240340 /* A9EFC8 80240288 2402FFFF */ addiu $v0, $zero, -1 /* A9EFCC 8024028C 8E220000 */ lw $v0, ($s1) @@ -80,13 +80,13 @@ glabel func_80240170_A9EEB0 /* A9EFD8 80240298 860200A8 */ lh $v0, 0xa8($s0) /* A9EFDC 8024029C 46020001 */ sub.s $f0, $f0, $f2 /* A9EFE0 802402A0 44821000 */ mtc1 $v0, $f2 -/* A9EFE4 802402A4 00000000 */ nop +/* A9EFE4 802402A4 00000000 */ nop /* A9EFE8 802402A8 468010A1 */ cvt.d.w $f2, $f2 /* A9EFEC 802402AC 46221080 */ add.d $f2, $f2, $f2 /* A9EFF0 802402B0 46000005 */ abs.s $f0, $f0 /* A9EFF4 802402B4 46000021 */ cvt.d.s $f0, $f0 /* A9EFF8 802402B8 4620103E */ c.le.d $f2, $f0 -/* A9EFFC 802402BC 00000000 */ nop +/* A9EFFC 802402BC 00000000 */ nop /* A9F000 802402C0 4501001F */ bc1t .L80240340 /* A9F004 802402C4 2402FFFF */ addiu $v0, $zero, -1 /* A9F008 802402C8 3C038011 */ lui $v1, %hi(D_8010EBB3) @@ -97,7 +97,7 @@ glabel func_80240170_A9EEB0 /* A9F01C 802402DC 14620005 */ bne $v1, $v0, .L802402F4 /* A9F020 802402E0 2402FFFF */ addiu $v0, $zero, -1 /* A9F024 802402E4 080900D0 */ j .L80240340 -/* A9F028 802402E8 00000000 */ nop +/* A9F028 802402E8 00000000 */ nop .L802402EC: /* A9F02C 802402EC 080900D0 */ j .L80240340 /* A9F030 802402F0 0240102D */ daddu $v0, $s2, $zero @@ -120,7 +120,7 @@ glabel func_80240170_A9EEB0 /* A9F06C 8024032C 8E620078 */ lw $v0, 0x78($s3) /* A9F070 80240330 0222102A */ slt $v0, $s1, $v0 /* A9F074 80240334 1440FFF2 */ bnez $v0, .L80240300 -/* A9F078 80240338 00000000 */ nop +/* A9F078 80240338 00000000 */ nop .L8024033C: /* A9F07C 8024033C 2402FFFF */ addiu $v0, $zero, -1 .L80240340: diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240360_A9F0A0.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240360_A9F0A0.s index bb469b1de6..5183d204b3 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240360_A9F0A0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240360_A9F0A0.s @@ -38,7 +38,7 @@ glabel func_80240360_A9F0A0 /* A9F124 802403E4 2402000F */ addiu $v0, $zero, 0xf /* A9F128 802403E8 AFA2001C */ sw $v0, 0x1c($sp) /* A9F12C 802403EC 44833000 */ mtc1 $v1, $f6 -/* A9F130 802403F0 00000000 */ nop +/* A9F130 802403F0 00000000 */ nop /* A9F134 802403F4 468031A0 */ cvt.s.w $f6, $f6 /* A9F138 802403F8 44073000 */ mfc1 $a3, $f6 /* A9F13C 802403FC 27A20028 */ addiu $v0, $sp, 0x28 @@ -60,15 +60,15 @@ glabel func_80240360_A9F0A0 /* A9F178 80240438 0040202D */ daddu $a0, $v0, $zero /* A9F17C 8024043C 2402FFFF */ addiu $v0, $zero, -1 /* A9F180 80240440 10820010 */ beq $a0, $v0, .L80240484 -/* A9F184 80240444 00000000 */ nop +/* A9F184 80240444 00000000 */ nop /* A9F188 80240448 0C00FB3A */ jal get_enemy -/* A9F18C 8024044C 00000000 */ nop +/* A9F18C 8024044C 00000000 */ nop /* A9F190 80240450 8C42006C */ lw $v0, 0x6c($v0) /* A9F194 80240454 1440000B */ bnez $v0, .L80240484 -/* A9F198 80240458 00000000 */ nop +/* A9F198 80240458 00000000 */ nop /* A9F19C 8024045C 8602008C */ lh $v0, 0x8c($s0) /* A9F1A0 80240460 14400008 */ bnez $v0, .L80240484 -/* A9F1A4 80240464 00000000 */ nop +/* A9F1A4 80240464 00000000 */ nop /* A9F1A8 80240468 8E2200CC */ lw $v0, 0xcc($s1) /* A9F1AC 8024046C 8C420020 */ lw $v0, 0x20($v0) /* A9F1B0 80240470 AE020028 */ sw $v0, 0x28($s0) diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802404A4_A9F1E4.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802404A4_A9F1E4.s index 3218b95b3e..31c6bf7629 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802404A4_A9F1E4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802404A4_A9F1E4.s @@ -17,7 +17,7 @@ glabel func_802404A4_A9F1E4 /* A9F214 802404D4 A602008E */ sh $v0, 0x8e($s0) /* A9F218 802404D8 00021400 */ sll $v0, $v0, 0x10 /* A9F21C 802404DC 1C40002B */ bgtz $v0, .L8024058C -/* A9F220 802404E0 00000000 */ nop +/* A9F220 802404E0 00000000 */ nop /* A9F224 802404E4 0C09005C */ jal func_80240170_A9EEB0 /* A9F228 802404E8 0240202D */ daddu $a0, $s2, $zero /* A9F22C 802404EC 0040202D */ daddu $a0, $v0, $zero @@ -35,7 +35,7 @@ glabel func_802404A4_A9F1E4 /* A9F25C 8024051C 3C01C1A0 */ lui $at, 0xc1a0 /* A9F260 80240520 44812000 */ mtc1 $at, $f4 /* A9F264 80240524 44833000 */ mtc1 $v1, $f6 -/* A9F268 80240528 00000000 */ nop +/* A9F268 80240528 00000000 */ nop /* A9F26C 8024052C 468031A0 */ cvt.s.w $f6, $f6 /* A9F270 80240530 44073000 */ mfc1 $a3, $f6 /* A9F274 80240534 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802406CC_A9F40C.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802406CC_A9F40C.s index 19c1fc2f26..6de0647bca 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802406CC_A9F40C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802406CC_A9F40C.s @@ -47,7 +47,7 @@ glabel func_802406CC_A9F40C /* A9F4B0 80240770 8E6200B0 */ lw $v0, 0xb0($s3) /* A9F4B4 80240774 30420004 */ andi $v0, $v0, 4 /* A9F4B8 80240778 10400019 */ beqz $v0, .L802407E0 -/* A9F4BC 8024077C 00000000 */ nop +/* A9F4BC 8024077C 00000000 */ nop .L80240780: /* A9F4C0 80240780 34630102 */ ori $v1, $v1, 0x102 /* A9F4C4 80240784 AEE00070 */ sw $zero, 0x70($s7) @@ -83,12 +83,12 @@ glabel func_802406CC_A9F40C /* A9F538 802407F8 10600007 */ beqz $v1, .L80240818 /* A9F53C 802407FC 0000102D */ daddu $v0, $zero, $zero /* A9F540 80240800 080902F7 */ j .L80240BDC -/* A9F544 80240804 00000000 */ nop +/* A9F544 80240804 00000000 */ nop .L80240808: /* A9F548 80240808 1062005B */ beq $v1, $v0, .L80240978 /* A9F54C 8024080C 0000102D */ daddu $v0, $zero, $zero /* A9F550 80240810 080902F7 */ j .L80240BDC -/* A9F554 80240814 00000000 */ nop +/* A9F554 80240814 00000000 */ nop .L80240818: /* A9F558 80240818 8E420000 */ lw $v0, ($s2) /* A9F55C 8024081C 0240202D */ daddu $a0, $s2, $zero @@ -131,17 +131,17 @@ glabel func_802406CC_A9F40C /* A9F5EC 802408AC C6400038 */ lwc1 $f0, 0x38($s2) /* A9F5F0 802408B0 4600020D */ trunc.w.s $f8, $f0 /* A9F5F4 802408B4 44024000 */ mfc1 $v0, $f8 -/* A9F5F8 802408B8 00000000 */ nop +/* A9F5F8 802408B8 00000000 */ nop /* A9F5FC 802408BC A6620010 */ sh $v0, 0x10($s3) /* A9F600 802408C0 C640003C */ lwc1 $f0, 0x3c($s2) /* A9F604 802408C4 4600020D */ trunc.w.s $f8, $f0 /* A9F608 802408C8 44024000 */ mfc1 $v0, $f8 -/* A9F60C 802408CC 00000000 */ nop +/* A9F60C 802408CC 00000000 */ nop /* A9F610 802408D0 A6620012 */ sh $v0, 0x12($s3) /* A9F614 802408D4 C6400040 */ lwc1 $f0, 0x40($s2) /* A9F618 802408D8 4600020D */ trunc.w.s $f8, $f0 /* A9F61C 802408DC 44024000 */ mfc1 $v0, $f8 -/* A9F620 802408E0 00000000 */ nop +/* A9F620 802408E0 00000000 */ nop /* A9F624 802408E4 A6620014 */ sh $v0, 0x14($s3) /* A9F628 802408E8 AE400044 */ sw $zero, 0x44($s2) /* A9F62C 802408EC AE400048 */ sw $zero, 0x48($s2) @@ -187,10 +187,10 @@ glabel func_802406CC_A9F40C /* A9F6C8 80240988 44810800 */ mtc1 $at, $f1 /* A9F6CC 8024098C 44800000 */ mtc1 $zero, $f0 /* A9F6D0 80240990 44821000 */ mtc1 $v0, $f2 -/* A9F6D4 80240994 00000000 */ nop +/* A9F6D4 80240994 00000000 */ nop /* A9F6D8 80240998 468010A1 */ cvt.d.w $f2, $f2 /* A9F6DC 8024099C 46201082 */ mul.d $f2, $f2, $f0 -/* A9F6E0 802409A0 00000000 */ nop +/* A9F6E0 802409A0 00000000 */ nop /* A9F6E4 802409A4 0200282D */ daddu $a1, $s0, $zero /* A9F6E8 802409A8 C6440038 */ lwc1 $f4, 0x38($s2) /* A9F6EC 802409AC C640003C */ lwc1 $f0, 0x3c($s2) @@ -210,13 +210,13 @@ glabel func_802406CC_A9F40C /* A9F724 802409E4 864200A6 */ lh $v0, 0xa6($s2) /* A9F728 802409E8 27B40028 */ addiu $s4, $sp, 0x28 /* A9F72C 802409EC 44820000 */ mtc1 $v0, $f0 -/* A9F730 802409F0 00000000 */ nop +/* A9F730 802409F0 00000000 */ nop /* A9F734 802409F4 46800020 */ cvt.s.w $f0, $f0 /* A9F738 802409F8 E7A00018 */ swc1 $f0, 0x18($sp) /* A9F73C 802409FC 864200A8 */ lh $v0, 0xa8($s2) /* A9F740 80240A00 0280382D */ daddu $a3, $s4, $zero /* A9F744 80240A04 44820000 */ mtc1 $v0, $f0 -/* A9F748 80240A08 00000000 */ nop +/* A9F748 80240A08 00000000 */ nop /* A9F74C 80240A0C 46800020 */ cvt.s.w $f0, $f0 /* A9F750 80240A10 0C0376B9 */ jal func_800DDAE4 /* A9F754 80240A14 E7A0001C */ swc1 $f0, 0x1c($sp) @@ -240,14 +240,14 @@ glabel func_802406CC_A9F40C /* A9F798 80240A58 0C0372DF */ jal func_800DCB7C /* A9F79C 80240A5C 0280382D */ daddu $a3, $s4, $zero /* A9F7A0 80240A60 10400019 */ beqz $v0, .L80240AC8 -/* A9F7A4 80240A64 00000000 */ nop +/* A9F7A4 80240A64 00000000 */ nop /* A9F7A8 80240A68 C640001C */ lwc1 $f0, 0x1c($s2) /* A9F7AC 80240A6C C7A2002C */ lwc1 $f2, 0x2c($sp) /* A9F7B0 80240A70 46000005 */ abs.s $f0, $f0 /* A9F7B4 80240A74 4600103C */ c.lt.s $f2, $f0 -/* A9F7B8 80240A78 00000000 */ nop +/* A9F7B8 80240A78 00000000 */ nop /* A9F7BC 80240A7C 45000012 */ bc1f .L80240AC8 -/* A9F7C0 80240A80 00000000 */ nop +/* A9F7C0 80240A80 00000000 */ nop /* A9F7C4 80240A84 C7A40024 */ lwc1 $f4, 0x24($sp) /* A9F7C8 80240A88 C6400064 */ lwc1 $f0, 0x64($s2) /* A9F7CC 80240A8C 46002001 */ sub.s $f0, $f4, $f0 @@ -257,7 +257,7 @@ glabel func_802406CC_A9F40C /* A9F7DC 80240A9C 46000005 */ abs.s $f0, $f0 /* A9F7E0 80240AA0 46000021 */ cvt.d.s $f0, $f0 /* A9F7E4 80240AA4 4622003C */ c.lt.d $f0, $f2 -/* A9F7E8 80240AA8 00000000 */ nop +/* A9F7E8 80240AA8 00000000 */ nop /* A9F7EC 80240AAC 45000006 */ bc1f .L80240AC8 /* A9F7F0 80240AB0 0240202D */ daddu $a0, $s2, $zero /* A9F7F4 80240AB4 8E450018 */ lw $a1, 0x18($s2) @@ -272,7 +272,7 @@ glabel func_802406CC_A9F40C /* A9F814 80240AD4 44801000 */ mtc1 $zero, $f2 /* A9F818 80240AD8 46000021 */ cvt.d.s $f0, $f0 /* A9F81C 80240ADC 4622003C */ c.lt.d $f0, $f2 -/* A9F820 80240AE0 00000000 */ nop +/* A9F820 80240AE0 00000000 */ nop /* A9F824 80240AE4 45030001 */ bc1tl .L80240AEC /* A9F828 80240AE8 2416000B */ addiu $s6, $zero, 0xb .L80240AEC: @@ -288,7 +288,7 @@ glabel func_802406CC_A9F40C /* A9F84C 80240B0C 8E620070 */ lw $v0, 0x70($s3) /* A9F850 80240B10 30420001 */ andi $v0, $v0, 1 /* A9F854 80240B14 10400009 */ beqz $v0, .L80240B3C -/* A9F858 80240B18 00000000 */ nop +/* A9F858 80240B18 00000000 */ nop /* A9F85C 80240B1C C640004C */ lwc1 $f0, 0x4c($s2) /* A9F860 80240B20 3C014044 */ lui $at, 0x4044 /* A9F864 80240B24 44811800 */ mtc1 $at, $f3 diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240C08_A9F948.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240C08_A9F948.s index 30a2b8ff1e..638653cfcd 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240C08_A9F948.s +++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240C08_A9F948.s @@ -50,7 +50,7 @@ glabel func_80240C08_A9F948 .L80240CB4: /* A9F9F4 80240CB4 86240008 */ lh $a0, 8($s1) /* A9F9F8 80240CB8 0C00FB5A */ jal get_enemy_safe -/* A9F9FC 80240CBC 00000000 */ nop +/* A9F9FC 80240CBC 00000000 */ nop /* A9FA00 80240CC0 14400005 */ bnez $v0, .L80240CD8 /* A9FA04 80240CC4 0260202D */ daddu $a0, $s3, $zero /* A9FA08 80240CC8 3C05FE36 */ lui $a1, 0xfe36 @@ -60,7 +60,7 @@ glabel func_80240C08_A9F948 .L80240CD8: /* A9FA18 80240CD8 86240008 */ lh $a0, 8($s1) /* A9FA1C 80240CDC 0C00EABB */ jal get_npc_unsafe -/* A9FA20 80240CE0 00000000 */ nop +/* A9FA20 80240CE0 00000000 */ nop /* A9FA24 80240CE4 8E630070 */ lw $v1, 0x70($s3) /* A9FA28 80240CE8 10600006 */ beqz $v1, .L80240D04 /* A9FA2C 80240CEC 0040802D */ daddu $s0, $v0, $zero @@ -68,7 +68,7 @@ glabel func_80240C08_A9F948 /* A9FA34 80240CF4 1062003F */ beq $v1, $v0, .L80240DF4 /* A9FA38 80240CF8 0000102D */ daddu $v0, $zero, $zero /* A9FA3C 80240CFC 0809040E */ j .L80241038 -/* A9FA40 80240D00 00000000 */ nop +/* A9FA40 80240D00 00000000 */ nop .L80240D04: /* A9FA44 80240D04 AFA00010 */ sw $zero, 0x10($sp) /* A9FA48 80240D08 AFA00014 */ sw $zero, 0x14($sp) @@ -79,7 +79,7 @@ glabel func_80240C08_A9F948 /* A9FA5C 80240D1C 24040002 */ addiu $a0, $zero, 2 /* A9FA60 80240D20 C64C006C */ lwc1 $f12, 0x6c($s2) /* A9FA64 80240D24 0C00A6C9 */ jal clamp_angle -/* A9FA68 80240D28 00000000 */ nop +/* A9FA68 80240D28 00000000 */ nop /* A9FA6C 80240D2C 3C018024 */ lui $at, %hi(D_80242FF0) /* A9FA70 80240D30 D4382FF0 */ ldc1 $f24, %lo(D_80242FF0)($at) /* A9FA74 80240D34 46000521 */ cvt.d.s $f20, $f0 @@ -107,7 +107,7 @@ glabel func_80240C08_A9F948 /* A9FACC 80240D8C 46000306 */ mov.s $f12, $f0 /* A9FAD0 80240D90 46000021 */ cvt.d.s $f0, $f0 /* A9FAD4 80240D94 4638003C */ c.lt.d $f0, $f24 -/* A9FAD8 80240D98 00000000 */ nop +/* A9FAD8 80240D98 00000000 */ nop /* A9FADC 80240D9C 45020002 */ bc1fl .L80240DA8 /* A9FAE0 80240DA0 E614000C */ swc1 $f20, 0xc($s0) /* A9FAE4 80240DA4 E616000C */ swc1 $f22, 0xc($s0) @@ -117,7 +117,7 @@ glabel func_80240C08_A9F948 /* A9FAF0 80240DB0 D4223000 */ ldc1 $f2, %lo(func_80243000_9AB3F0)($at) /* A9FAF4 80240DB4 46000021 */ cvt.d.s $f0, $f0 /* A9FAF8 80240DB8 46220002 */ mul.d $f0, $f0, $f2 -/* A9FAFC 80240DBC 00000000 */ nop +/* A9FAFC 80240DBC 00000000 */ nop /* A9FB00 80240DC0 3C013F66 */ lui $at, 0x3f66 /* A9FB04 80240DC4 34216666 */ ori $at, $at, 0x6666 /* A9FB08 80240DC8 44812000 */ mtc1 $at, $f4 @@ -147,13 +147,13 @@ glabel func_80240C08_A9F948 /* A9FB64 80240E24 860200A6 */ lh $v0, 0xa6($s0) /* A9FB68 80240E28 27A60024 */ addiu $a2, $sp, 0x24 /* A9FB6C 80240E2C 44820000 */ mtc1 $v0, $f0 -/* A9FB70 80240E30 00000000 */ nop +/* A9FB70 80240E30 00000000 */ nop /* A9FB74 80240E34 46800020 */ cvt.s.w $f0, $f0 /* A9FB78 80240E38 E7A00018 */ swc1 $f0, 0x18($sp) /* A9FB7C 80240E3C 860200A8 */ lh $v0, 0xa8($s0) /* A9FB80 80240E40 27A70028 */ addiu $a3, $sp, 0x28 /* A9FB84 80240E44 44820000 */ mtc1 $v0, $f0 -/* A9FB88 80240E48 00000000 */ nop +/* A9FB88 80240E48 00000000 */ nop /* A9FB8C 80240E4C 46800020 */ cvt.s.w $f0, $f0 /* A9FB90 80240E50 0C037711 */ jal func_800DDC44 /* A9FB94 80240E54 E7A0001C */ swc1 $f0, 0x1c($sp) @@ -173,7 +173,7 @@ glabel func_80240C08_A9F948 /* A9FBC4 80240E84 44801800 */ mtc1 $zero, $f3 /* A9FBC8 80240E88 46000021 */ cvt.d.s $f0, $f0 /* A9FBCC 80240E8C 4622003C */ c.lt.d $f0, $f2 -/* A9FBD0 80240E90 00000000 */ nop +/* A9FBD0 80240E90 00000000 */ nop /* A9FBD4 80240E94 45000028 */ bc1f .L80240F38 /* A9FBD8 80240E98 27A50020 */ addiu $a1, $sp, 0x20 /* A9FBDC 80240E9C 27A60024 */ addiu $a2, $sp, 0x24 @@ -204,7 +204,7 @@ glabel func_80240C08_A9F948 /* A9FC40 80240F00 0C0372DF */ jal func_800DCB7C /* A9FC44 80240F04 27A70028 */ addiu $a3, $sp, 0x28 /* A9FC48 80240F08 1040000B */ beqz $v0, .L80240F38 -/* A9FC4C 80240F0C 00000000 */ nop +/* A9FC4C 80240F0C 00000000 */ nop /* A9FC50 80240F10 C600001C */ lwc1 $f0, 0x1c($s0) /* A9FC54 80240F14 C7A2002C */ lwc1 $f2, 0x2c($sp) /* A9FC58 80240F18 46000005 */ abs.s $f0, $f0 @@ -212,7 +212,7 @@ glabel func_80240C08_A9F948 /* A9FC60 80240F20 46340000 */ add.d $f0, $f0, $f20 /* A9FC64 80240F24 460010A1 */ cvt.d.s $f2, $f2 /* A9FC68 80240F28 4620103E */ c.le.d $f2, $f0 -/* A9FC6C 80240F2C 00000000 */ nop +/* A9FC6C 80240F2C 00000000 */ nop /* A9FC70 80240F30 45030001 */ bc1tl .L80240F38 /* A9FC74 80240F34 24120001 */ addiu $s2, $zero, 1 .L80240F38: @@ -234,7 +234,7 @@ glabel func_80240C08_A9F948 /* A9FCB0 80240F70 2414000B */ addiu $s4, $zero, 0xb .L80240F74: /* A9FCB4 80240F74 12800024 */ beqz $s4, .L80241008 -/* A9FCB8 80240F78 00000000 */ nop +/* A9FCB8 80240F78 00000000 */ nop /* A9FCBC 80240F7C AFA00010 */ sw $zero, 0x10($sp) /* A9FCC0 80240F80 AFA00014 */ sw $zero, 0x14($sp) /* A9FCC4 80240F84 8E050038 */ lw $a1, 0x38($s0) @@ -268,7 +268,7 @@ glabel func_80240C08_A9F948 /* A9FD34 80240FF4 AC800070 */ sw $zero, 0x70($a0) .L80240FF8: /* A9FD38 80240FF8 0C0B2026 */ jal set_variable -/* A9FD3C 80240FFC 00000000 */ nop +/* A9FD3C 80240FFC 00000000 */ nop /* A9FD40 80241000 0809040E */ j .L80241038 /* A9FD44 80241004 24020002 */ addiu $v0, $zero, 2 .L80241008: diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s index 7863bc3697..8b987323f7 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s @@ -103,41 +103,48 @@ glabel func_80241064_A9FDA4 /* A9FF14 802411D4 2C620064 */ sltiu $v0, $v1, 0x64 /* A9FF18 802411D8 10400060 */ beqz $v0, .L8024135C /* A9FF1C 802411DC 00031080 */ sll $v0, $v1, 2 -/* A9FF20 802411E0 3C018024 */ lui $at, %hi(D_80243008) +/* A9FF20 802411E0 3C018024 */ lui $at, %hi(jtbl_80243008_AA1D48) /* A9FF24 802411E4 00220821 */ addu $at, $at, $v0 -/* A9FF28 802411E8 8C223008 */ lw $v0, %lo(D_80243008)($at) +/* A9FF28 802411E8 8C223008 */ lw $v0, %lo(jtbl_80243008_AA1D48)($at) /* A9FF2C 802411EC 00400008 */ jr $v0 /* A9FF30 802411F0 00000000 */ nop +glabel L802411F4_A9FF34 /* A9FF34 802411F4 0260202D */ daddu $a0, $s3, $zero /* A9FF38 802411F8 0200282D */ daddu $a1, $s0, $zero /* A9FF3C 802411FC 0C012568 */ jal func_800495A0 /* A9FF40 80241200 02A0302D */ daddu $a2, $s5, $zero +glabel L80241204_A9FF44 /* A9FF44 80241204 0260202D */ daddu $a0, $s3, $zero /* A9FF48 80241208 0200282D */ daddu $a1, $s0, $zero /* A9FF4C 8024120C 0C0125AE */ jal func_800496B8 /* A9FF50 80241210 02A0302D */ daddu $a2, $s5, $zero /* A9FF54 80241214 080904D7 */ j .L8024135C /* A9FF58 80241218 00000000 */ nop +glabel L8024121C_A9FF5C /* A9FF5C 8024121C 0260202D */ daddu $a0, $s3, $zero /* A9FF60 80241220 0200282D */ daddu $a1, $s0, $zero /* A9FF64 80241224 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A9FF68 80241228 02A0302D */ daddu $a2, $s5, $zero +glabel L8024122C_A9FF6C /* A9FF6C 8024122C 0260202D */ daddu $a0, $s3, $zero /* A9FF70 80241230 0200282D */ daddu $a1, $s0, $zero /* A9FF74 80241234 0C012701 */ jal func_80049C04 /* A9FF78 80241238 02A0302D */ daddu $a2, $s5, $zero /* A9FF7C 8024123C 080904D7 */ j .L8024135C /* A9FF80 80241240 00000000 */ nop +glabel L80241244_A9FF84 /* A9FF84 80241244 0260202D */ daddu $a0, $s3, $zero /* A9FF88 80241248 0200282D */ daddu $a1, $s0, $zero /* A9FF8C 8024124C 0C01278F */ jal func_80049E3C /* A9FF90 80241250 02A0302D */ daddu $a2, $s5, $zero +glabel L80241254_A9FF94 /* A9FF94 80241254 0260202D */ daddu $a0, $s3, $zero /* A9FF98 80241258 0200282D */ daddu $a1, $s0, $zero /* A9FF9C 8024125C 0C0127B3 */ jal func_80049ECC /* A9FFA0 80241260 02A0302D */ daddu $a2, $s5, $zero /* A9FFA4 80241264 080904D7 */ j .L8024135C /* A9FFA8 80241268 00000000 */ nop +glabel L8024126C_A9FFAC /* A9FFAC 8024126C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A9FFB0 80241270 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A9FFB4 80241274 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -170,37 +177,45 @@ glabel func_80241064_A9FDA4 /* AA0018 802412D8 0200282D */ daddu $a1, $s0, $zero /* AA001C 802412DC 0C0127DF */ jal func_80049F7C /* AA0020 802412E0 02A0302D */ daddu $a2, $s5, $zero +glabel L802412E4_AA0024 /* AA0024 802412E4 0260202D */ daddu $a0, $s3, $zero /* AA0028 802412E8 0200282D */ daddu $a1, $s0, $zero /* AA002C 802412EC 0C012849 */ jal func_8004A124 /* AA0030 802412F0 02A0302D */ daddu $a2, $s5, $zero /* AA0034 802412F4 080904D7 */ j .L8024135C /* AA0038 802412F8 00000000 */ nop +glabel L802412FC_AA003C /* AA003C 802412FC 0260202D */ daddu $a0, $s3, $zero /* AA0040 80241300 0200282D */ daddu $a1, $s0, $zero /* AA0044 80241304 0C0128FA */ jal func_8004A3E8 /* AA0048 80241308 02A0302D */ daddu $a2, $s5, $zero /* AA004C 8024130C 080904D7 */ j .L8024135C /* AA0050 80241310 00000000 */ nop +glabel L80241314_AA0054 /* AA0054 80241314 0C090129 */ jal func_802404A4_A9F1E4 /* AA0058 80241318 0260202D */ daddu $a0, $s3, $zero /* AA005C 8024131C 080904D7 */ j .L8024135C /* AA0060 80241320 00000000 */ nop +glabel L80241324_AA0064 /* AA0064 80241324 0C090169 */ jal kpa_115_UnkSetDurationFunc /* AA0068 80241328 0260202D */ daddu $a0, $s3, $zero /* AA006C 8024132C 080904D7 */ j .L8024135C /* AA0070 80241330 00000000 */ nop +glabel L80241334_AA0074 /* AA0074 80241334 0C09017A */ jal kpa_115_UnkNpcAIFunc9 /* AA0078 80241338 0260202D */ daddu $a0, $s3, $zero /* AA007C 8024133C 080904D7 */ j .L8024135C /* AA0080 80241340 00000000 */ nop +glabel L80241344_AA0084 /* AA0084 80241344 0C0901A2 */ jal kpa_115_UnkDurationCheck /* AA0088 80241348 0260202D */ daddu $a0, $s3, $zero /* AA008C 8024134C 080904D7 */ j .L8024135C /* AA0090 80241350 00000000 */ nop +glabel L80241354_AA0094 /* AA0094 80241354 0C0129CF */ jal func_8004A73C /* AA0098 80241358 0260202D */ daddu $a0, $s3, $zero .L8024135C: +glabel L8024135C_AA009C /* AA009C 8024135C 8FBF0048 */ lw $ra, 0x48($sp) /* AA00A0 80241360 8FB50044 */ lw $s5, 0x44($sp) /* AA00A4 80241364 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_12/A54950/func_80240000_A54950.s b/asm/nonmatchings/world/area_kpa/kpa_12/A54950/func_80240000_A54950.s index 81b8d36117..9ba75dc484 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_12/A54950/func_80240000_A54950.s +++ b/asm/nonmatchings/world/area_kpa/kpa_12/A54950/func_80240000_A54950.s @@ -18,4 +18,4 @@ glabel func_80240000_A54950 /* A54980 80240030 8FBF0010 */ lw $ra, 0x10($sp) /* A54984 80240034 03E00008 */ jr $ra /* A54988 80240038 27BD0018 */ addiu $sp, $sp, 0x18 -/* A5498C 8024003C 00000000 */ nop +/* A5498C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_8024037C_A54CCC.s b/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_8024037C_A54CCC.s index 6a65e7a67c..18206fda79 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_8024037C_A54CCC.s +++ b/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_8024037C_A54CCC.s @@ -20,13 +20,13 @@ glabel func_8024037C_A54CCC /* A54D08 802403B8 2463A550 */ addiu $v1, $v1, %lo(gCollisionStatus) /* A54D0C 802403BC 84620002 */ lh $v0, 2($v1) /* A54D10 802403C0 10500004 */ beq $v0, $s0, .L802403D4 -/* A54D14 802403C4 00000000 */ nop +/* A54D14 802403C4 00000000 */ nop /* A54D18 802403C8 84620004 */ lh $v0, 4($v1) /* A54D1C 802403CC 14500007 */ bne $v0, $s0, .L802403EC -/* A54D20 802403D0 00000000 */ nop +/* A54D20 802403D0 00000000 */ nop .L802403D4: /* A54D24 802403D4 44910000 */ mtc1 $s1, $f0 -/* A54D28 802403D8 00000000 */ nop +/* A54D28 802403D8 00000000 */ nop /* A54D2C 802403DC 46800020 */ cvt.s.w $f0, $f0 /* A54D30 802403E0 3C028011 */ lui $v0, %hi(gPlayerStatus) /* A54D34 802403E4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) @@ -35,16 +35,16 @@ glabel func_8024037C_A54CCC /* A54D3C 802403EC 3C028011 */ lui $v0, %hi(gPlayerData+0x12) /* A54D40 802403F0 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* A54D44 802403F4 1040000D */ beqz $v0, .L8024042C -/* A54D48 802403F8 00000000 */ nop +/* A54D48 802403F8 00000000 */ nop /* A54D4C 802403FC 0C00EABB */ jal get_npc_unsafe /* A54D50 80240400 2404FFFC */ addiu $a0, $zero, -4 /* A54D54 80240404 0040182D */ daddu $v1, $v0, $zero /* A54D58 80240408 84620084 */ lh $v0, 0x84($v1) /* A54D5C 8024040C 14500007 */ bne $v0, $s0, .L8024042C -/* A54D60 80240410 00000000 */ nop +/* A54D60 80240410 00000000 */ nop /* A54D64 80240414 C4600038 */ lwc1 $f0, 0x38($v1) /* A54D68 80240418 44911000 */ mtc1 $s1, $f2 -/* A54D6C 8024041C 00000000 */ nop +/* A54D6C 8024041C 00000000 */ nop /* A54D70 80240420 468010A0 */ cvt.s.w $f2, $f2 /* A54D74 80240424 46020000 */ add.s $f0, $f0, $f2 /* A54D78 80240428 E4600038 */ swc1 $f0, 0x38($v1) diff --git a/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_80240444_A54D94.s b/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_80240444_A54D94.s index 54bb16154f..54613b69d7 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_80240444_A54D94.s +++ b/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_80240444_A54D94.s @@ -12,5 +12,5 @@ glabel func_80240444_A54D94 .L80240460: /* A54DB0 80240460 03E00008 */ jr $ra /* A54DB4 80240464 24020002 */ addiu $v0, $zero, 2 -/* A54DB8 80240468 00000000 */ nop -/* A54DBC 8024046C 00000000 */ nop +/* A54DB8 80240468 00000000 */ nop +/* A54DBC 8024046C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_13/A55F20/func_80240000_A55F20.s b/asm/nonmatchings/world/area_kpa/kpa_13/A55F20/func_80240000_A55F20.s index 0f78dda522..24e4dfb622 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_13/A55F20/func_80240000_A55F20.s +++ b/asm/nonmatchings/world/area_kpa/kpa_13/A55F20/func_80240000_A55F20.s @@ -18,4 +18,4 @@ glabel func_80240000_A55F20 /* A55F50 80240030 8FBF0010 */ lw $ra, 0x10($sp) /* A55F54 80240034 03E00008 */ jr $ra /* A55F58 80240038 27BD0018 */ addiu $sp, $sp, 0x18 -/* A55F5C 8024003C 00000000 */ nop +/* A55F5C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_8024037C_A5629C.s b/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_8024037C_A5629C.s index 286ddccde5..f35c58c345 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_8024037C_A5629C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_8024037C_A5629C.s @@ -20,13 +20,13 @@ glabel func_8024037C_A5629C /* A562D8 802403B8 2463A550 */ addiu $v1, $v1, %lo(gCollisionStatus) /* A562DC 802403BC 84620002 */ lh $v0, 2($v1) /* A562E0 802403C0 10500004 */ beq $v0, $s0, .L802403D4 -/* A562E4 802403C4 00000000 */ nop +/* A562E4 802403C4 00000000 */ nop /* A562E8 802403C8 84620004 */ lh $v0, 4($v1) /* A562EC 802403CC 14500007 */ bne $v0, $s0, .L802403EC -/* A562F0 802403D0 00000000 */ nop +/* A562F0 802403D0 00000000 */ nop .L802403D4: /* A562F4 802403D4 44910000 */ mtc1 $s1, $f0 -/* A562F8 802403D8 00000000 */ nop +/* A562F8 802403D8 00000000 */ nop /* A562FC 802403DC 46800020 */ cvt.s.w $f0, $f0 /* A56300 802403E0 3C028011 */ lui $v0, %hi(gPlayerStatus) /* A56304 802403E4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) @@ -35,16 +35,16 @@ glabel func_8024037C_A5629C /* A5630C 802403EC 3C028011 */ lui $v0, %hi(gPlayerData+0x12) /* A56310 802403F0 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* A56314 802403F4 1040000D */ beqz $v0, .L8024042C -/* A56318 802403F8 00000000 */ nop +/* A56318 802403F8 00000000 */ nop /* A5631C 802403FC 0C00EABB */ jal get_npc_unsafe /* A56320 80240400 2404FFFC */ addiu $a0, $zero, -4 /* A56324 80240404 0040182D */ daddu $v1, $v0, $zero /* A56328 80240408 84620084 */ lh $v0, 0x84($v1) /* A5632C 8024040C 14500007 */ bne $v0, $s0, .L8024042C -/* A56330 80240410 00000000 */ nop +/* A56330 80240410 00000000 */ nop /* A56334 80240414 C4600038 */ lwc1 $f0, 0x38($v1) /* A56338 80240418 44911000 */ mtc1 $s1, $f2 -/* A5633C 8024041C 00000000 */ nop +/* A5633C 8024041C 00000000 */ nop /* A56340 80240420 468010A0 */ cvt.s.w $f2, $f2 /* A56344 80240424 46020000 */ add.s $f0, $f0, $f2 /* A56348 80240428 E4600038 */ swc1 $f0, 0x38($v1) diff --git a/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_80240444_A56364.s b/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_80240444_A56364.s index 16dcb9dead..232793a4f4 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_80240444_A56364.s +++ b/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_80240444_A56364.s @@ -12,5 +12,5 @@ glabel func_80240444_A56364 .L80240460: /* A56380 80240460 03E00008 */ jr $ra /* A56384 80240464 24020002 */ addiu $v0, $zero, 2 -/* A56388 80240468 00000000 */ nop -/* A5638C 8024046C 00000000 */ nop +/* A56388 80240468 00000000 */ nop +/* A5638C 8024046C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_80240048_AA2D68.s b/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_80240048_AA2D68.s index b78594047d..c627e3ad6a 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_80240048_AA2D68.s +++ b/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_80240048_AA2D68.s @@ -29,7 +29,7 @@ glabel func_80240048_AA2D68 /* AA2DC8 802400A8 8E43006C */ lw $v1, 0x6c($s2) /* AA2DCC 802400AC 24020064 */ addiu $v0, $zero, 0x64 /* AA2DD0 802400B0 14620011 */ bne $v1, $v0, .L802400F8 -/* AA2DD4 802400B4 00000000 */ nop +/* AA2DD4 802400B4 00000000 */ nop .L802400B8: /* AA2DD8 802400B8 AE600070 */ sw $zero, 0x70($s3) /* AA2DDC 802400BC A620008E */ sh $zero, 0x8e($s1) @@ -51,7 +51,7 @@ glabel func_80240048_AA2D68 /* AA2E18 802400F8 8E4300B0 */ lw $v1, 0xb0($s2) /* AA2E1C 802400FC 30620004 */ andi $v0, $v1, 4 /* AA2E20 80240100 10400007 */ beqz $v0, .L80240120 -/* AA2E24 80240104 00000000 */ nop +/* AA2E24 80240104 00000000 */ nop /* AA2E28 80240108 824200B4 */ lb $v0, 0xb4($s2) /* AA2E2C 8024010C 144000DC */ bnez $v0, .L80240480 /* AA2E30 80240110 0000102D */ daddu $v0, $zero, $zero @@ -68,14 +68,14 @@ glabel func_80240048_AA2D68 /* AA2E58 80240138 10600009 */ beqz $v1, .L80240160 /* AA2E5C 8024013C 0220202D */ daddu $a0, $s1, $zero /* AA2E60 80240140 0809011C */ j .L80240470 -/* AA2E64 80240144 00000000 */ nop +/* AA2E64 80240144 00000000 */ nop .L80240148: /* AA2E68 80240148 10620057 */ beq $v1, $v0, .L802402A8 /* AA2E6C 8024014C 24020003 */ addiu $v0, $zero, 3 /* AA2E70 80240150 106200C1 */ beq $v1, $v0, .L80240458 -/* AA2E74 80240154 00000000 */ nop +/* AA2E74 80240154 00000000 */ nop /* AA2E78 80240158 0809011C */ j .L80240470 -/* AA2E7C 8024015C 00000000 */ nop +/* AA2E7C 8024015C 00000000 */ nop .L80240160: /* AA2E80 80240160 3C01C47A */ lui $at, 0xc47a /* AA2E84 80240164 44810000 */ mtc1 $at, $f0 @@ -102,7 +102,7 @@ glabel func_80240048_AA2D68 /* AA2ED4 802401B4 AE42006C */ sw $v0, 0x6c($s2) /* AA2ED8 802401B8 84440008 */ lh $a0, 8($v0) /* AA2EDC 802401BC 0C00EABB */ jal get_npc_unsafe -/* AA2EE0 802401C0 00000000 */ nop +/* AA2EE0 802401C0 00000000 */ nop /* AA2EE4 802401C4 8E230000 */ lw $v1, ($s1) /* AA2EE8 802401C8 2404FFFD */ addiu $a0, $zero, -3 /* AA2EEC 802401CC 00641824 */ and $v1, $v1, $a0 @@ -140,9 +140,9 @@ glabel func_80240048_AA2D68 /* AA2F6C 8024024C C620000C */ lwc1 $f0, 0xc($s1) /* AA2F70 80240250 3C014334 */ lui $at, 0x4334 /* AA2F74 80240254 44811000 */ mtc1 $at, $f2 -/* AA2F78 80240258 00000000 */ nop +/* AA2F78 80240258 00000000 */ nop /* AA2F7C 8024025C 4602003C */ c.lt.s $f0, $f2 -/* AA2F80 80240260 00000000 */ nop +/* AA2F80 80240260 00000000 */ nop /* AA2F84 80240264 45020002 */ bc1fl .L80240270 /* AA2F88 80240268 AE200034 */ sw $zero, 0x34($s1) /* AA2F8C 8024026C E6220034 */ swc1 $f2, 0x34($s1) @@ -171,15 +171,15 @@ glabel func_80240048_AA2D68 /* AA2FE0 802402C0 D4224750 */ ldc1 $f2, %lo(D_80244750)($at) /* AA2FE4 802402C4 46000121 */ cvt.d.s $f4, $f0 /* AA2FE8 802402C8 4624103C */ c.lt.d $f2, $f4 -/* AA2FEC 802402CC 00000000 */ nop +/* AA2FEC 802402CC 00000000 */ nop /* AA2FF0 802402D0 45030067 */ bc1tl .L80240470 /* AA2FF4 802402D4 24150001 */ addiu $s5, $zero, 1 /* AA2FF8 802402D8 3C01C05E */ lui $at, 0xc05e /* AA2FFC 802402DC 44810800 */ mtc1 $at, $f1 /* AA3000 802402E0 44800000 */ mtc1 $zero, $f0 -/* AA3004 802402E4 00000000 */ nop +/* AA3004 802402E4 00000000 */ nop /* AA3008 802402E8 4620203C */ c.lt.d $f4, $f0 -/* AA300C 802402EC 00000000 */ nop +/* AA300C 802402EC 00000000 */ nop /* AA3010 802402F0 4503005F */ bc1tl .L80240470 /* AA3014 802402F4 24150001 */ addiu $s5, $zero, 1 /* AA3018 802402F8 27A40018 */ addiu $a0, $sp, 0x18 @@ -194,23 +194,23 @@ glabel func_80240048_AA2D68 /* AA303C 8024031C C622000C */ lwc1 $f2, 0xc($s1) /* AA3040 80240320 3C014334 */ lui $at, 0x4334 /* AA3044 80240324 44810000 */ mtc1 $at, $f0 -/* AA3048 80240328 00000000 */ nop +/* AA3048 80240328 00000000 */ nop /* AA304C 8024032C 4600103C */ c.lt.s $f2, $f0 -/* AA3050 80240330 00000000 */ nop +/* AA3050 80240330 00000000 */ nop /* AA3054 80240334 45000007 */ bc1f .L80240354 -/* AA3058 80240338 00000000 */ nop +/* AA3058 80240338 00000000 */ nop /* AA305C 8024033C C7A20018 */ lwc1 $f2, 0x18($sp) /* AA3060 80240340 C6400074 */ lwc1 $f0, 0x74($s2) /* AA3064 80240344 46800020 */ cvt.s.w $f0, $f0 /* AA3068 80240348 4602003E */ c.le.s $f0, $f2 /* AA306C 8024034C 080900DA */ j .L80240368 -/* AA3070 80240350 00000000 */ nop +/* AA3070 80240350 00000000 */ nop .L80240354: /* AA3074 80240354 C7A20018 */ lwc1 $f2, 0x18($sp) /* AA3078 80240358 C6400074 */ lwc1 $f0, 0x74($s2) /* AA307C 8024035C 46800020 */ cvt.s.w $f0, $f0 /* AA3080 80240360 4600103E */ c.le.s $f2, $f0 -/* AA3084 80240364 00000000 */ nop +/* AA3084 80240364 00000000 */ nop .L80240368: /* AA3088 80240368 45030001 */ bc1tl .L80240370 /* AA308C 8024036C 24140001 */ addiu $s4, $zero, 1 @@ -227,7 +227,7 @@ glabel func_80240048_AA2D68 /* AA30B4 80240394 C620003C */ lwc1 $f0, 0x3c($s1) /* AA30B8 80240398 3C0140A0 */ lui $at, 0x40a0 /* AA30BC 8024039C 4481A000 */ mtc1 $at, $f20 -/* AA30C0 802403A0 00000000 */ nop +/* AA30C0 802403A0 00000000 */ nop /* AA30C4 802403A4 46140000 */ add.s $f0, $f0, $f20 /* AA30C8 802403A8 C6240040 */ lwc1 $f4, 0x40($s1) /* AA30CC 802403AC 3C013D4C */ lui $at, 0x3d4c @@ -274,7 +274,7 @@ glabel func_80240048_AA2D68 /* AA3168 80240448 8E630070 */ lw $v1, 0x70($s3) /* AA316C 8024044C 24020003 */ addiu $v0, $zero, 3 /* AA3170 80240450 14620007 */ bne $v1, $v0, .L80240470 -/* AA3174 80240454 00000000 */ nop +/* AA3174 80240454 00000000 */ nop .L80240458: /* AA3178 80240458 9622008E */ lhu $v0, 0x8e($s1) /* AA317C 8024045C 2442FFFF */ addiu $v0, $v0, -1 diff --git a/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_802404AC_AA31CC.s b/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_802404AC_AA31CC.s index b5d46b205f..77ac5590eb 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_802404AC_AA31CC.s +++ b/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_802404AC_AA31CC.s @@ -42,21 +42,21 @@ glabel func_802404AC_AA31CC /* AA325C 8024053C D4224758 */ ldc1 $f2, %lo(D_80244758)($at) /* AA3260 80240540 46000121 */ cvt.d.s $f4, $f0 /* AA3264 80240544 4624103C */ c.lt.d $f2, $f4 -/* AA3268 80240548 00000000 */ nop +/* AA3268 80240548 00000000 */ nop /* AA326C 8024054C 45010071 */ bc1t .L80240714 /* AA3270 80240550 0000102D */ daddu $v0, $zero, $zero /* AA3274 80240554 3C01C054 */ lui $at, 0xc054 /* AA3278 80240558 44810800 */ mtc1 $at, $f1 /* AA327C 8024055C 44800000 */ mtc1 $zero, $f0 -/* AA3280 80240560 00000000 */ nop +/* AA3280 80240560 00000000 */ nop /* AA3284 80240564 4620203C */ c.lt.d $f4, $f0 -/* AA3288 80240568 00000000 */ nop +/* AA3288 80240568 00000000 */ nop /* AA328C 8024056C 45010069 */ bc1t .L80240714 -/* AA3290 80240570 00000000 */ nop +/* AA3290 80240570 00000000 */ nop /* AA3294 80240574 8E4200B0 */ lw $v0, 0xb0($s2) /* AA3298 80240578 30420004 */ andi $v0, $v0, 4 /* AA329C 8024057C 1040000B */ beqz $v0, .L802405AC -/* AA32A0 80240580 00000000 */ nop +/* AA32A0 80240580 00000000 */ nop /* AA32A4 80240584 8E4200CC */ lw $v0, 0xcc($s2) /* AA32A8 80240588 8C420000 */ lw $v0, ($v0) /* AA32AC 8024058C AE620028 */ sw $v0, 0x28($s3) @@ -70,7 +70,7 @@ glabel func_802404AC_AA31CC .L802405AC: /* AA32CC 802405AC 8E900070 */ lw $s0, 0x70($s4) /* AA32D0 802405B0 1200000E */ beqz $s0, .L802405EC -/* AA32D4 802405B4 00000000 */ nop +/* AA32D4 802405B4 00000000 */ nop /* AA32D8 802405B8 06000055 */ bltz $s0, .L80240710 /* AA32DC 802405BC 2402000A */ addiu $v0, $zero, 0xa /* AA32E0 802405C0 12020013 */ beq $s0, $v0, .L80240610 @@ -83,7 +83,7 @@ glabel func_802404AC_AA31CC /* AA32FC 802405DC 12020035 */ beq $s0, $v0, .L802406B4 /* AA3300 802405E0 0000102D */ daddu $v0, $zero, $zero /* AA3304 802405E4 080901C5 */ j .L80240714 -/* AA3308 802405E8 00000000 */ nop +/* AA3308 802405E8 00000000 */ nop .L802405EC: /* AA330C 802405EC 9662008E */ lhu $v0, 0x8e($s3) /* AA3310 802405F0 2442FFFF */ addiu $v0, $v0, -1 @@ -96,7 +96,7 @@ glabel func_802404AC_AA31CC /* AA332C 8024060C AE820070 */ sw $v0, 0x70($s4) .L80240610: /* AA3330 80240610 0C090000 */ jal func_80240000_AA2D20 -/* AA3334 80240614 00000000 */ nop +/* AA3334 80240614 00000000 */ nop /* AA3338 80240618 1840002C */ blez $v0, .L802406CC /* AA333C 8024061C AE42006C */ sw $v0, 0x6c($s2) /* AA3340 80240620 0C00FB3A */ jal get_enemy @@ -173,6 +173,6 @@ glabel func_802404AC_AA31CC /* AA3448 80240728 8FB00010 */ lw $s0, 0x10($sp) /* AA344C 8024072C 03E00008 */ jr $ra /* AA3450 80240730 27BD0028 */ addiu $sp, $sp, 0x28 -/* AA3454 80240734 00000000 */ nop -/* AA3458 80240738 00000000 */ nop -/* AA345C 8024073C 00000000 */ nop +/* AA3454 80240734 00000000 */ nop +/* AA3458 80240738 00000000 */ nop +/* AA345C 8024073C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_133/AA7790/func_80240310_AA7790.s b/asm/nonmatchings/world/area_kpa/kpa_133/AA7790/func_80240310_AA7790.s index 3e3fe37cd4..be80d53cf9 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_133/AA7790/func_80240310_AA7790.s +++ b/asm/nonmatchings/world/area_kpa/kpa_133/AA7790/func_80240310_AA7790.s @@ -21,7 +21,7 @@ glabel func_80240310_AA7790 /* AA77D0 80240350 0C0B1EAF */ jal get_variable /* AA77D4 80240354 26100004 */ addiu $s0, $s0, 4 /* AA77D8 80240358 44820000 */ mtc1 $v0, $f0 -/* AA77DC 8024035C 00000000 */ nop +/* AA77DC 8024035C 00000000 */ nop /* AA77E0 80240360 46800020 */ cvt.s.w $f0, $f0 /* AA77E4 80240364 E6200060 */ swc1 $f0, 0x60($s1) /* AA77E8 80240368 8E050000 */ lw $a1, ($s0) @@ -29,14 +29,14 @@ glabel func_80240310_AA7790 /* AA77F0 80240370 0C0B1EAF */ jal get_variable /* AA77F4 80240374 0240202D */ daddu $a0, $s2, $zero /* AA77F8 80240378 44820000 */ mtc1 $v0, $f0 -/* AA77FC 8024037C 00000000 */ nop +/* AA77FC 8024037C 00000000 */ nop /* AA7800 80240380 46800020 */ cvt.s.w $f0, $f0 /* AA7804 80240384 E6200064 */ swc1 $f0, 0x64($s1) /* AA7808 80240388 8E050000 */ lw $a1, ($s0) /* AA780C 8024038C 0C0B1EAF */ jal get_variable /* AA7810 80240390 0240202D */ daddu $a0, $s2, $zero /* AA7814 80240394 44820000 */ mtc1 $v0, $f0 -/* AA7818 80240398 00000000 */ nop +/* AA7818 80240398 00000000 */ nop /* AA781C 8024039C 46800020 */ cvt.s.w $f0, $f0 /* AA7820 802403A0 E6200068 */ swc1 $f0, 0x68($s1) /* AA7824 802403A4 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_133/AA7790/func_802403C0_AA7840.s b/asm/nonmatchings/world/area_kpa/kpa_133/AA7790/func_802403C0_AA7840.s index 97567e5780..e015b77a89 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_133/AA7790/func_802403C0_AA7840.s +++ b/asm/nonmatchings/world/area_kpa/kpa_133/AA7790/func_802403C0_AA7840.s @@ -21,7 +21,7 @@ glabel func_802403C0_AA7840 /* AA7880 80240400 0C0B1EAF */ jal get_variable /* AA7884 80240404 26100004 */ addiu $s0, $s0, 4 /* AA7888 80240408 44820000 */ mtc1 $v0, $f0 -/* AA788C 8024040C 00000000 */ nop +/* AA788C 8024040C 00000000 */ nop /* AA7890 80240410 46800020 */ cvt.s.w $f0, $f0 /* AA7894 80240414 E6200048 */ swc1 $f0, 0x48($s1) /* AA7898 80240418 8E050000 */ lw $a1, ($s0) @@ -29,14 +29,14 @@ glabel func_802403C0_AA7840 /* AA78A0 80240420 0C0B1EAF */ jal get_variable /* AA78A4 80240424 0240202D */ daddu $a0, $s2, $zero /* AA78A8 80240428 44820000 */ mtc1 $v0, $f0 -/* AA78AC 8024042C 00000000 */ nop +/* AA78AC 8024042C 00000000 */ nop /* AA78B0 80240430 46800020 */ cvt.s.w $f0, $f0 /* AA78B4 80240434 E620004C */ swc1 $f0, 0x4c($s1) /* AA78B8 80240438 8E050000 */ lw $a1, ($s0) /* AA78BC 8024043C 0C0B1EAF */ jal get_variable /* AA78C0 80240440 0240202D */ daddu $a0, $s2, $zero /* AA78C4 80240444 44820000 */ mtc1 $v0, $f0 -/* AA78C8 80240448 00000000 */ nop +/* AA78C8 80240448 00000000 */ nop /* AA78CC 8024044C 46800020 */ cvt.s.w $f0, $f0 /* AA78D0 80240450 E6200050 */ swc1 $f0, 0x50($s1) /* AA78D4 80240454 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_134/AA92B0/func_8024033C_AA92DC.s b/asm/nonmatchings/world/area_kpa/kpa_134/AA92B0/func_8024033C_AA92DC.s index 624e776e3f..67068f8d98 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_134/AA92B0/func_8024033C_AA92DC.s +++ b/asm/nonmatchings/world/area_kpa/kpa_134/AA92B0/func_8024033C_AA92DC.s @@ -15,7 +15,7 @@ glabel func_8024033C_AA92DC /* AA92FC 8024035C C4800028 */ lwc1 $f0, 0x28($a0) /* AA9300 80240360 3C014248 */ lui $at, 0x4248 /* AA9304 80240364 44814000 */ mtc1 $at, $f8 -/* AA9308 80240368 00000000 */ nop +/* AA9308 80240368 00000000 */ nop /* AA930C 8024036C 46080001 */ sub.s $f0, $f0, $f8 /* AA9310 80240370 3C01402C */ lui $at, 0x402c /* AA9314 80240374 44811800 */ mtc1 $at, $f3 @@ -23,29 +23,29 @@ glabel func_8024033C_AA92DC /* AA931C 8024037C 46000021 */ cvt.d.s $f0, $f0 /* AA9320 80240380 46200005 */ abs.d $f0, $f0 /* AA9324 80240384 4620103C */ c.lt.d $f2, $f0 -/* AA9328 80240388 00000000 */ nop +/* AA9328 80240388 00000000 */ nop /* AA932C 8024038C 4501FFF1 */ bc1t .L80240354 -/* AA9330 80240390 00000000 */ nop +/* AA9330 80240390 00000000 */ nop /* AA9334 80240394 C480002C */ lwc1 $f0, 0x2c($a0) /* AA9338 80240398 3C014316 */ lui $at, 0x4316 /* AA933C 8024039C 44813000 */ mtc1 $at, $f6 -/* AA9340 802403A0 00000000 */ nop +/* AA9340 802403A0 00000000 */ nop /* AA9344 802403A4 46060001 */ sub.s $f0, $f0, $f6 /* AA9348 802403A8 46000021 */ cvt.d.s $f0, $f0 /* AA934C 802403AC 46200005 */ abs.d $f0, $f0 /* AA9350 802403B0 4620103C */ c.lt.d $f2, $f0 -/* AA9354 802403B4 00000000 */ nop +/* AA9354 802403B4 00000000 */ nop /* AA9358 802403B8 4501FFE6 */ bc1t .L80240354 -/* AA935C 802403BC 00000000 */ nop +/* AA935C 802403BC 00000000 */ nop /* AA9360 802403C0 C4A00030 */ lwc1 $f0, 0x30($a1) /* AA9364 802403C4 3C01C208 */ lui $at, 0xc208 /* AA9368 802403C8 44812000 */ mtc1 $at, $f4 -/* AA936C 802403CC 00000000 */ nop +/* AA936C 802403CC 00000000 */ nop /* AA9370 802403D0 46040001 */ sub.s $f0, $f0, $f4 /* AA9374 802403D4 46000021 */ cvt.d.s $f0, $f0 /* AA9378 802403D8 46200005 */ abs.d $f0, $f0 /* AA937C 802403DC 4620103C */ c.lt.d $f2, $f0 -/* AA9380 802403E0 00000000 */ nop +/* AA9380 802403E0 00000000 */ nop /* AA9384 802403E4 45010006 */ bc1t .L80240400 /* AA9388 802403E8 24020002 */ addiu $v0, $zero, 2 /* AA938C 802403EC E4A80028 */ swc1 $f8, 0x28($a1) diff --git a/asm/nonmatchings/world/area_kpa/kpa_134/AA92B0/func_80240434_AA93D4.s b/asm/nonmatchings/world/area_kpa/kpa_134/AA92B0/func_80240434_AA93D4.s index 9cdb8a24d6..348053efa5 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_134/AA92B0/func_80240434_AA93D4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_134/AA92B0/func_80240434_AA93D4.s @@ -15,7 +15,7 @@ glabel func_80240434_AA93D4 /* AA93F4 80240454 C4800028 */ lwc1 $f0, 0x28($a0) /* AA93F8 80240458 3C01442A */ lui $at, 0x442a /* AA93FC 8024045C 44814000 */ mtc1 $at, $f8 -/* AA9400 80240460 00000000 */ nop +/* AA9400 80240460 00000000 */ nop /* AA9404 80240464 46080001 */ sub.s $f0, $f0, $f8 /* AA9408 80240468 3C01402C */ lui $at, 0x402c /* AA940C 8024046C 44811800 */ mtc1 $at, $f3 @@ -23,30 +23,30 @@ glabel func_80240434_AA93D4 /* AA9414 80240474 46000021 */ cvt.d.s $f0, $f0 /* AA9418 80240478 46200005 */ abs.d $f0, $f0 /* AA941C 8024047C 4620103C */ c.lt.d $f2, $f0 -/* AA9420 80240480 00000000 */ nop +/* AA9420 80240480 00000000 */ nop /* AA9424 80240484 4501FFF1 */ bc1t .L8024044C -/* AA9428 80240488 00000000 */ nop +/* AA9428 80240488 00000000 */ nop /* AA942C 8024048C C480002C */ lwc1 $f0, 0x2c($a0) /* AA9430 80240490 3C014389 */ lui $at, 0x4389 /* AA9434 80240494 34218000 */ ori $at, $at, 0x8000 /* AA9438 80240498 44813000 */ mtc1 $at, $f6 -/* AA943C 8024049C 00000000 */ nop +/* AA943C 8024049C 00000000 */ nop /* AA9440 802404A0 46060001 */ sub.s $f0, $f0, $f6 /* AA9444 802404A4 46000021 */ cvt.d.s $f0, $f0 /* AA9448 802404A8 46200005 */ abs.d $f0, $f0 /* AA944C 802404AC 4620103C */ c.lt.d $f2, $f0 -/* AA9450 802404B0 00000000 */ nop +/* AA9450 802404B0 00000000 */ nop /* AA9454 802404B4 4501FFE5 */ bc1t .L8024044C -/* AA9458 802404B8 00000000 */ nop +/* AA9458 802404B8 00000000 */ nop /* AA945C 802404BC C4A00030 */ lwc1 $f0, 0x30($a1) /* AA9460 802404C0 3C01C20C */ lui $at, 0xc20c /* AA9464 802404C4 44812000 */ mtc1 $at, $f4 -/* AA9468 802404C8 00000000 */ nop +/* AA9468 802404C8 00000000 */ nop /* AA946C 802404CC 46040001 */ sub.s $f0, $f0, $f4 /* AA9470 802404D0 46000021 */ cvt.d.s $f0, $f0 /* AA9474 802404D4 46200005 */ abs.d $f0, $f0 /* AA9478 802404D8 4620103C */ c.lt.d $f2, $f0 -/* AA947C 802404DC 00000000 */ nop +/* AA947C 802404DC 00000000 */ nop /* AA9480 802404E0 45010006 */ bc1t .L802404FC /* AA9484 802404E4 24020002 */ addiu $v0, $zero, 2 /* AA9488 802404E8 E4A80028 */ swc1 $f8, 0x28($a1) @@ -57,6 +57,6 @@ glabel func_80240434_AA93D4 .L802404FC: /* AA949C 802404FC 03E00008 */ jr $ra /* AA94A0 80240500 0000102D */ daddu $v0, $zero, $zero -/* AA94A4 80240504 00000000 */ nop -/* AA94A8 80240508 00000000 */ nop -/* AA94AC 8024050C 00000000 */ nop +/* AA94A4 80240504 00000000 */ nop +/* AA94A8 80240508 00000000 */ nop +/* AA94AC 8024050C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_80240564_AA9504.s b/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_80240564_AA9504.s index 2ec447abf1..9b1f2abd84 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_80240564_AA9504.s +++ b/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_80240564_AA9504.s @@ -32,15 +32,15 @@ glabel func_80240564_AA9504 /* AA9570 802405D0 0040802D */ daddu $s0, $v0, $zero /* AA9574 802405D4 0040182D */ daddu $v1, $v0, $zero /* AA9578 802405D8 44920000 */ mtc1 $s2, $f0 -/* AA957C 802405DC 00000000 */ nop +/* AA957C 802405DC 00000000 */ nop /* AA9580 802405E0 46800020 */ cvt.s.w $f0, $f0 /* AA9584 802405E4 E4600048 */ swc1 $f0, 0x48($v1) /* AA9588 802405E8 44910000 */ mtc1 $s1, $f0 -/* AA958C 802405EC 00000000 */ nop +/* AA958C 802405EC 00000000 */ nop /* AA9590 802405F0 46800020 */ cvt.s.w $f0, $f0 /* AA9594 802405F4 E460004C */ swc1 $f0, 0x4c($v1) /* AA9598 802405F8 44900000 */ mtc1 $s0, $f0 -/* AA959C 802405FC 00000000 */ nop +/* AA959C 802405FC 00000000 */ nop /* AA95A0 80240600 46800020 */ cvt.s.w $f0, $f0 /* AA95A4 80240604 E4600050 */ swc1 $f0, 0x50($v1) /* AA95A8 80240608 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A574B0/func_80240000_A574B0.s b/asm/nonmatchings/world/area_kpa/kpa_14/A574B0/func_80240000_A574B0.s index a154fe385b..0fc0309d38 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_14/A574B0/func_80240000_A574B0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_14/A574B0/func_80240000_A574B0.s @@ -18,4 +18,4 @@ glabel func_80240000_A574B0 /* A574E0 80240030 8FBF0010 */ lw $ra, 0x10($sp) /* A574E4 80240034 03E00008 */ jr $ra /* A574E8 80240038 27BD0018 */ addiu $sp, $sp, 0x18 -/* A574EC 8024003C 00000000 */ nop +/* A574EC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A574F0/func_8024034C_A577FC.s b/asm/nonmatchings/world/area_kpa/kpa_14/A574F0/func_8024034C_A577FC.s index 90ecc2bb63..6d039b2f5f 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_14/A574F0/func_8024034C_A577FC.s +++ b/asm/nonmatchings/world/area_kpa/kpa_14/A574F0/func_8024034C_A577FC.s @@ -15,5 +15,5 @@ glabel func_8024034C_A577FC .L80240370: /* A57820 80240370 03E00008 */ jr $ra /* A57824 80240374 24020002 */ addiu $v0, $zero, 2 -/* A57828 80240378 00000000 */ nop -/* A5782C 8024037C 00000000 */ nop +/* A57828 80240378 00000000 */ nop +/* A5782C 8024037C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240380_A57830.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240380_A57830.s index 5c9c8b475a..c0f585f93e 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240380_A57830.s +++ b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240380_A57830.s @@ -26,7 +26,7 @@ glabel func_80240380_A57830 /* A57880 802403D0 1440FFFA */ bnez $v0, .L802403BC /* A57884 802403D4 24A50004 */ addiu $a1, $a1, 4 /* A57888 802403D8 08090107 */ j .L8024041C -/* A5788C 802403DC 00000000 */ nop +/* A5788C 802403DC 00000000 */ nop .L802403E0: /* A57890 802403E0 0000182D */ daddu $v1, $zero, $zero /* A57894 802403E4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024073C_A57BEC.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024073C_A57BEC.s index 4060728c1e..716d53446d 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024073C_A57BEC.s +++ b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024073C_A57BEC.s @@ -28,37 +28,37 @@ glabel func_8024073C_A57BEC /* A57C48 80240798 3C058011 */ lui $a1, %hi(gPlayerStatus) /* A57C4C 8024079C 24A5EFC8 */ addiu $a1, $a1, %lo(gPlayerStatus) /* A57C50 802407A0 10500004 */ beq $v0, $s0, .L802407B4 -/* A57C54 802407A4 00000000 */ nop +/* A57C54 802407A4 00000000 */ nop /* A57C58 802407A8 84620004 */ lh $v0, 4($v1) /* A57C5C 802407AC 1450000D */ bne $v0, $s0, .L802407E4 -/* A57C60 802407B0 00000000 */ nop +/* A57C60 802407B0 00000000 */ nop .L802407B4: /* A57C64 802407B4 80A300B4 */ lb $v1, 0xb4($a1) /* A57C68 802407B8 2402000F */ addiu $v0, $zero, 0xf /* A57C6C 802407BC 10620009 */ beq $v1, $v0, .L802407E4 /* A57C70 802407C0 2402000D */ addiu $v0, $zero, 0xd /* A57C74 802407C4 10620007 */ beq $v1, $v0, .L802407E4 -/* A57C78 802407C8 00000000 */ nop +/* A57C78 802407C8 00000000 */ nop /* A57C7C 802407CC 14800005 */ bnez $a0, .L802407E4 -/* A57C80 802407D0 00000000 */ nop +/* A57C80 802407D0 00000000 */ nop /* A57C84 802407D4 44920000 */ mtc1 $s2, $f0 -/* A57C88 802407D8 00000000 */ nop +/* A57C88 802407D8 00000000 */ nop /* A57C8C 802407DC 46800020 */ cvt.s.w $f0, $f0 /* A57C90 802407E0 E4A0001C */ swc1 $f0, 0x1c($a1) .L802407E4: /* A57C94 802407E4 3C028011 */ lui $v0, %hi(gPlayerData+0x12) /* A57C98 802407E8 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* A57C9C 802407EC 1040000D */ beqz $v0, .L80240824 -/* A57CA0 802407F0 00000000 */ nop +/* A57CA0 802407F0 00000000 */ nop /* A57CA4 802407F4 0C00EABB */ jal get_npc_unsafe /* A57CA8 802407F8 2404FFFC */ addiu $a0, $zero, -4 /* A57CAC 802407FC 0040182D */ daddu $v1, $v0, $zero /* A57CB0 80240800 84620084 */ lh $v0, 0x84($v1) /* A57CB4 80240804 14500007 */ bne $v0, $s0, .L80240824 -/* A57CB8 80240808 00000000 */ nop +/* A57CB8 80240808 00000000 */ nop /* A57CBC 8024080C C4600038 */ lwc1 $f0, 0x38($v1) /* A57CC0 80240810 44921000 */ mtc1 $s2, $f2 -/* A57CC4 80240814 00000000 */ nop +/* A57CC4 80240814 00000000 */ nop /* A57CC8 80240818 468010A0 */ cvt.s.w $f2, $f2 /* A57CCC 8024081C 46020000 */ add.s $f0, $f0, $f2 /* A57CD0 80240820 E4600038 */ swc1 $f0, 0x38($v1) diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240840_A57CF0.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240840_A57CF0.s index afca307481..9790f98216 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240840_A57CF0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240840_A57CF0.s @@ -12,6 +12,6 @@ glabel func_80240840_A57CF0 .L8024085C: /* A57D0C 8024085C 03E00008 */ jr $ra /* A57D10 80240860 24020002 */ addiu $v0, $zero, 2 -/* A57D14 80240864 00000000 */ nop -/* A57D18 80240868 00000000 */ nop -/* A57D1C 8024086C 00000000 */ nop +/* A57D14 80240864 00000000 */ nop +/* A57D18 80240868 00000000 */ nop +/* A57D1C 8024086C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240310_A596A0.s b/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240310_A596A0.s index 702fc27b7d..2d25780222 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240310_A596A0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240310_A596A0.s @@ -26,7 +26,7 @@ glabel func_80240310_A596A0 /* A596F0 80240360 1440FFFA */ bnez $v0, .L8024034C /* A596F4 80240364 24A50004 */ addiu $a1, $a1, 4 /* A596F8 80240368 080900EB */ j .L802403AC -/* A596FC 8024036C 00000000 */ nop +/* A596FC 8024036C 00000000 */ nop .L80240370: /* A59700 80240370 0000182D */ daddu $v1, $zero, $zero /* A59704 80240374 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_16/A5A340/func_80240310_A5A340.s b/asm/nonmatchings/world/area_kpa/kpa_16/A5A340/func_80240310_A5A340.s index ce22406ecd..51ea48a564 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_16/A5A340/func_80240310_A5A340.s +++ b/asm/nonmatchings/world/area_kpa/kpa_16/A5A340/func_80240310_A5A340.s @@ -8,7 +8,7 @@ glabel func_80240310_A5A340 /* A5A34C 8024031C 0C0B1EAF */ jal get_variable /* A5A350 80240320 8C450000 */ lw $a1, ($v0) /* A5A354 80240324 44820000 */ mtc1 $v0, $f0 -/* A5A358 80240328 00000000 */ nop +/* A5A358 80240328 00000000 */ nop /* A5A35C 8024032C 46800020 */ cvt.s.w $f0, $f0 /* A5A360 80240330 44050000 */ mfc1 $a1, $f0 /* A5A364 80240334 0C04DF62 */ jal func_80137D88 diff --git a/asm/nonmatchings/world/area_kpa/kpa_16/A5A340/func_80240370_A5A3A0.s b/asm/nonmatchings/world/area_kpa/kpa_16/A5A340/func_80240370_A5A3A0.s index e2ab1d6e07..fbb9a5e693 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_16/A5A340/func_80240370_A5A3A0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_16/A5A340/func_80240370_A5A3A0.s @@ -13,4 +13,4 @@ glabel func_80240370_A5A3A0 /* A5A3C0 80240390 24020002 */ addiu $v0, $zero, 2 /* A5A3C4 80240394 03E00008 */ jr $ra /* A5A3C8 80240398 27BD0018 */ addiu $sp, $sp, 0x18 -/* A5A3CC 8024039C 00000000 */ nop +/* A5A3CC 8024039C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240000_A609D0.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240000_A609D0.s index 5a5eaa19a5..79672e97bd 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240000_A609D0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240000_A609D0.s @@ -42,16 +42,16 @@ glabel func_80240000_A609D0 /* A60A64 80240094 3C014387 */ lui $at, 0x4387 /* A60A68 80240098 4481A000 */ mtc1 $at, $f20 /* A60A6C 8024009C 0C00A70A */ jal get_clamped_angle_diff -/* A60A70 802400A0 00000000 */ nop +/* A60A70 802400A0 00000000 */ nop /* A60A74 802400A4 0C00A6C9 */ jal clamp_angle /* A60A78 802400A8 46000306 */ mov.s $f12, $f0 /* A60A7C 802400AC 3C018024 */ lui $at, %hi(D_802434A0) /* A60A80 802400B0 D42234A0 */ ldc1 $f2, %lo(D_802434A0)($at) /* A60A84 802400B4 46000021 */ cvt.d.s $f0, $f0 /* A60A88 802400B8 4622003C */ c.lt.d $f0, $f2 -/* A60A8C 802400BC 00000000 */ nop +/* A60A8C 802400BC 00000000 */ nop /* A60A90 802400C0 45000003 */ bc1f .L802400D0 -/* A60A94 802400C4 00000000 */ nop +/* A60A94 802400C4 00000000 */ nop /* A60A98 802400C8 3C0142B4 */ lui $at, 0x42b4 /* A60A9C 802400CC 4481A000 */ mtc1 $at, $f20 .L802400D0: @@ -71,7 +71,7 @@ glabel func_80240000_A609D0 /* A60AD4 80240104 D42234A8 */ ldc1 $f2, %lo(D_802434A8)($at) /* A60AD8 80240108 46000021 */ cvt.d.s $f0, $f0 /* A60ADC 8024010C 4620103C */ c.lt.d $f2, $f0 -/* A60AE0 80240110 00000000 */ nop +/* A60AE0 80240110 00000000 */ nop /* A60AE4 80240114 4501002E */ bc1t .L802401D0 /* A60AE8 80240118 2402FFFF */ addiu $v0, $zero, -1 /* A60AEC 8024011C 8E220000 */ lw $v0, ($s1) @@ -80,13 +80,13 @@ glabel func_80240000_A609D0 /* A60AF8 80240128 860200A8 */ lh $v0, 0xa8($s0) /* A60AFC 8024012C 46020001 */ sub.s $f0, $f0, $f2 /* A60B00 80240130 44821000 */ mtc1 $v0, $f2 -/* A60B04 80240134 00000000 */ nop +/* A60B04 80240134 00000000 */ nop /* A60B08 80240138 468010A1 */ cvt.d.w $f2, $f2 /* A60B0C 8024013C 46221080 */ add.d $f2, $f2, $f2 /* A60B10 80240140 46000005 */ abs.s $f0, $f0 /* A60B14 80240144 46000021 */ cvt.d.s $f0, $f0 /* A60B18 80240148 4620103E */ c.le.d $f2, $f0 -/* A60B1C 8024014C 00000000 */ nop +/* A60B1C 8024014C 00000000 */ nop /* A60B20 80240150 4501001F */ bc1t .L802401D0 /* A60B24 80240154 2402FFFF */ addiu $v0, $zero, -1 /* A60B28 80240158 3C038011 */ lui $v1, %hi(D_8010EBB3) @@ -97,7 +97,7 @@ glabel func_80240000_A609D0 /* A60B3C 8024016C 14620005 */ bne $v1, $v0, .L80240184 /* A60B40 80240170 2402FFFF */ addiu $v0, $zero, -1 /* A60B44 80240174 08090074 */ j .L802401D0 -/* A60B48 80240178 00000000 */ nop +/* A60B48 80240178 00000000 */ nop .L8024017C: /* A60B4C 8024017C 08090074 */ j .L802401D0 /* A60B50 80240180 0240102D */ daddu $v0, $s2, $zero @@ -120,7 +120,7 @@ glabel func_80240000_A609D0 /* A60B8C 802401BC 8E620078 */ lw $v0, 0x78($s3) /* A60B90 802401C0 0222102A */ slt $v0, $s1, $v0 /* A60B94 802401C4 1440FFF2 */ bnez $v0, .L80240190 -/* A60B98 802401C8 00000000 */ nop +/* A60B98 802401C8 00000000 */ nop .L802401CC: /* A60B9C 802401CC 2402FFFF */ addiu $v0, $zero, -1 .L802401D0: diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802401F0_A60BC0.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802401F0_A60BC0.s index c21fc22058..4ec7a67233 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802401F0_A60BC0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802401F0_A60BC0.s @@ -38,7 +38,7 @@ glabel func_802401F0_A60BC0 /* A60C44 80240274 2402000F */ addiu $v0, $zero, 0xf /* A60C48 80240278 AFA2001C */ sw $v0, 0x1c($sp) /* A60C4C 8024027C 44833000 */ mtc1 $v1, $f6 -/* A60C50 80240280 00000000 */ nop +/* A60C50 80240280 00000000 */ nop /* A60C54 80240284 468031A0 */ cvt.s.w $f6, $f6 /* A60C58 80240288 44073000 */ mfc1 $a3, $f6 /* A60C5C 8024028C 27A20028 */ addiu $v0, $sp, 0x28 @@ -60,15 +60,15 @@ glabel func_802401F0_A60BC0 /* A60C98 802402C8 0040202D */ daddu $a0, $v0, $zero /* A60C9C 802402CC 2402FFFF */ addiu $v0, $zero, -1 /* A60CA0 802402D0 10820010 */ beq $a0, $v0, .L80240314 -/* A60CA4 802402D4 00000000 */ nop +/* A60CA4 802402D4 00000000 */ nop /* A60CA8 802402D8 0C00FB3A */ jal get_enemy -/* A60CAC 802402DC 00000000 */ nop +/* A60CAC 802402DC 00000000 */ nop /* A60CB0 802402E0 8C42006C */ lw $v0, 0x6c($v0) /* A60CB4 802402E4 1440000B */ bnez $v0, .L80240314 -/* A60CB8 802402E8 00000000 */ nop +/* A60CB8 802402E8 00000000 */ nop /* A60CBC 802402EC 8602008C */ lh $v0, 0x8c($s0) /* A60CC0 802402F0 14400008 */ bnez $v0, .L80240314 -/* A60CC4 802402F4 00000000 */ nop +/* A60CC4 802402F4 00000000 */ nop /* A60CC8 802402F8 8E2200CC */ lw $v0, 0xcc($s1) /* A60CCC 802402FC 8C420020 */ lw $v0, 0x20($v0) /* A60CD0 80240300 AE020028 */ sw $v0, 0x28($s0) diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240334_A60D04.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240334_A60D04.s index acd4a42b6b..1b41a4fe68 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240334_A60D04.s +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240334_A60D04.s @@ -17,7 +17,7 @@ glabel func_80240334_A60D04 /* A60D34 80240364 A602008E */ sh $v0, 0x8e($s0) /* A60D38 80240368 00021400 */ sll $v0, $v0, 0x10 /* A60D3C 8024036C 1C40002B */ bgtz $v0, .L8024041C -/* A60D40 80240370 00000000 */ nop +/* A60D40 80240370 00000000 */ nop /* A60D44 80240374 0C090000 */ jal func_80240000_A609D0 /* A60D48 80240378 0240202D */ daddu $a0, $s2, $zero /* A60D4C 8024037C 0040202D */ daddu $a0, $v0, $zero @@ -35,7 +35,7 @@ glabel func_80240334_A60D04 /* A60D7C 802403AC 3C01C1A0 */ lui $at, 0xc1a0 /* A60D80 802403B0 44812000 */ mtc1 $at, $f4 /* A60D84 802403B4 44833000 */ mtc1 $v1, $f6 -/* A60D88 802403B8 00000000 */ nop +/* A60D88 802403B8 00000000 */ nop /* A60D8C 802403BC 468031A0 */ cvt.s.w $f6, $f6 /* A60D90 802403C0 44073000 */ mfc1 $a3, $f6 /* A60D94 802403C4 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_8024055C_A60F2C.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_8024055C_A60F2C.s index cda422e535..7f4aace794 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_8024055C_A60F2C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_8024055C_A60F2C.s @@ -47,7 +47,7 @@ glabel func_8024055C_A60F2C /* A60FD0 80240600 8E6200B0 */ lw $v0, 0xb0($s3) /* A60FD4 80240604 30420004 */ andi $v0, $v0, 4 /* A60FD8 80240608 10400019 */ beqz $v0, .L80240670 -/* A60FDC 8024060C 00000000 */ nop +/* A60FDC 8024060C 00000000 */ nop .L80240610: /* A60FE0 80240610 34630102 */ ori $v1, $v1, 0x102 /* A60FE4 80240614 AEE00070 */ sw $zero, 0x70($s7) @@ -83,12 +83,12 @@ glabel func_8024055C_A60F2C /* A61058 80240688 10600007 */ beqz $v1, .L802406A8 /* A6105C 8024068C 0000102D */ daddu $v0, $zero, $zero /* A61060 80240690 0809029B */ j .L80240A6C -/* A61064 80240694 00000000 */ nop +/* A61064 80240694 00000000 */ nop .L80240698: /* A61068 80240698 1062005B */ beq $v1, $v0, .L80240808 /* A6106C 8024069C 0000102D */ daddu $v0, $zero, $zero /* A61070 802406A0 0809029B */ j .L80240A6C -/* A61074 802406A4 00000000 */ nop +/* A61074 802406A4 00000000 */ nop .L802406A8: /* A61078 802406A8 8E420000 */ lw $v0, ($s2) /* A6107C 802406AC 0240202D */ daddu $a0, $s2, $zero @@ -131,17 +131,17 @@ glabel func_8024055C_A60F2C /* A6110C 8024073C C6400038 */ lwc1 $f0, 0x38($s2) /* A61110 80240740 4600020D */ trunc.w.s $f8, $f0 /* A61114 80240744 44024000 */ mfc1 $v0, $f8 -/* A61118 80240748 00000000 */ nop +/* A61118 80240748 00000000 */ nop /* A6111C 8024074C A6620010 */ sh $v0, 0x10($s3) /* A61120 80240750 C640003C */ lwc1 $f0, 0x3c($s2) /* A61124 80240754 4600020D */ trunc.w.s $f8, $f0 /* A61128 80240758 44024000 */ mfc1 $v0, $f8 -/* A6112C 8024075C 00000000 */ nop +/* A6112C 8024075C 00000000 */ nop /* A61130 80240760 A6620012 */ sh $v0, 0x12($s3) /* A61134 80240764 C6400040 */ lwc1 $f0, 0x40($s2) /* A61138 80240768 4600020D */ trunc.w.s $f8, $f0 /* A6113C 8024076C 44024000 */ mfc1 $v0, $f8 -/* A61140 80240770 00000000 */ nop +/* A61140 80240770 00000000 */ nop /* A61144 80240774 A6620014 */ sh $v0, 0x14($s3) /* A61148 80240778 AE400044 */ sw $zero, 0x44($s2) /* A6114C 8024077C AE400048 */ sw $zero, 0x48($s2) @@ -187,10 +187,10 @@ glabel func_8024055C_A60F2C /* A611E8 80240818 44810800 */ mtc1 $at, $f1 /* A611EC 8024081C 44800000 */ mtc1 $zero, $f0 /* A611F0 80240820 44821000 */ mtc1 $v0, $f2 -/* A611F4 80240824 00000000 */ nop +/* A611F4 80240824 00000000 */ nop /* A611F8 80240828 468010A1 */ cvt.d.w $f2, $f2 /* A611FC 8024082C 46201082 */ mul.d $f2, $f2, $f0 -/* A61200 80240830 00000000 */ nop +/* A61200 80240830 00000000 */ nop /* A61204 80240834 0200282D */ daddu $a1, $s0, $zero /* A61208 80240838 C6440038 */ lwc1 $f4, 0x38($s2) /* A6120C 8024083C C640003C */ lwc1 $f0, 0x3c($s2) @@ -210,13 +210,13 @@ glabel func_8024055C_A60F2C /* A61244 80240874 864200A6 */ lh $v0, 0xa6($s2) /* A61248 80240878 27B40028 */ addiu $s4, $sp, 0x28 /* A6124C 8024087C 44820000 */ mtc1 $v0, $f0 -/* A61250 80240880 00000000 */ nop +/* A61250 80240880 00000000 */ nop /* A61254 80240884 46800020 */ cvt.s.w $f0, $f0 /* A61258 80240888 E7A00018 */ swc1 $f0, 0x18($sp) /* A6125C 8024088C 864200A8 */ lh $v0, 0xa8($s2) /* A61260 80240890 0280382D */ daddu $a3, $s4, $zero /* A61264 80240894 44820000 */ mtc1 $v0, $f0 -/* A61268 80240898 00000000 */ nop +/* A61268 80240898 00000000 */ nop /* A6126C 8024089C 46800020 */ cvt.s.w $f0, $f0 /* A61270 802408A0 0C0376B9 */ jal func_800DDAE4 /* A61274 802408A4 E7A0001C */ swc1 $f0, 0x1c($sp) @@ -240,14 +240,14 @@ glabel func_8024055C_A60F2C /* A612B8 802408E8 0C0372DF */ jal func_800DCB7C /* A612BC 802408EC 0280382D */ daddu $a3, $s4, $zero /* A612C0 802408F0 10400019 */ beqz $v0, .L80240958 -/* A612C4 802408F4 00000000 */ nop +/* A612C4 802408F4 00000000 */ nop /* A612C8 802408F8 C640001C */ lwc1 $f0, 0x1c($s2) /* A612CC 802408FC C7A2002C */ lwc1 $f2, 0x2c($sp) /* A612D0 80240900 46000005 */ abs.s $f0, $f0 /* A612D4 80240904 4600103C */ c.lt.s $f2, $f0 -/* A612D8 80240908 00000000 */ nop +/* A612D8 80240908 00000000 */ nop /* A612DC 8024090C 45000012 */ bc1f .L80240958 -/* A612E0 80240910 00000000 */ nop +/* A612E0 80240910 00000000 */ nop /* A612E4 80240914 C7A40024 */ lwc1 $f4, 0x24($sp) /* A612E8 80240918 C6400064 */ lwc1 $f0, 0x64($s2) /* A612EC 8024091C 46002001 */ sub.s $f0, $f4, $f0 @@ -257,7 +257,7 @@ glabel func_8024055C_A60F2C /* A612FC 8024092C 46000005 */ abs.s $f0, $f0 /* A61300 80240930 46000021 */ cvt.d.s $f0, $f0 /* A61304 80240934 4622003C */ c.lt.d $f0, $f2 -/* A61308 80240938 00000000 */ nop +/* A61308 80240938 00000000 */ nop /* A6130C 8024093C 45000006 */ bc1f .L80240958 /* A61310 80240940 0240202D */ daddu $a0, $s2, $zero /* A61314 80240944 8E450018 */ lw $a1, 0x18($s2) @@ -272,7 +272,7 @@ glabel func_8024055C_A60F2C /* A61334 80240964 44801000 */ mtc1 $zero, $f2 /* A61338 80240968 46000021 */ cvt.d.s $f0, $f0 /* A6133C 8024096C 4622003C */ c.lt.d $f0, $f2 -/* A61340 80240970 00000000 */ nop +/* A61340 80240970 00000000 */ nop /* A61344 80240974 45030001 */ bc1tl .L8024097C /* A61348 80240978 2416000B */ addiu $s6, $zero, 0xb .L8024097C: @@ -288,7 +288,7 @@ glabel func_8024055C_A60F2C /* A6136C 8024099C 8E620070 */ lw $v0, 0x70($s3) /* A61370 802409A0 30420001 */ andi $v0, $v0, 1 /* A61374 802409A4 10400009 */ beqz $v0, .L802409CC -/* A61378 802409A8 00000000 */ nop +/* A61378 802409A8 00000000 */ nop /* A6137C 802409AC C640004C */ lwc1 $f0, 0x4c($s2) /* A61380 802409B0 3C014044 */ lui $at, 0x4044 /* A61384 802409B4 44811800 */ mtc1 $at, $f3 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240A98_A61468.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240A98_A61468.s index 5fad03a78f..e50d2c0729 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240A98_A61468.s +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240A98_A61468.s @@ -50,7 +50,7 @@ glabel func_80240A98_A61468 .L80240B44: /* A61514 80240B44 86240008 */ lh $a0, 8($s1) /* A61518 80240B48 0C00FB5A */ jal get_enemy_safe -/* A6151C 80240B4C 00000000 */ nop +/* A6151C 80240B4C 00000000 */ nop /* A61520 80240B50 14400005 */ bnez $v0, .L80240B68 /* A61524 80240B54 0260202D */ daddu $a0, $s3, $zero /* A61528 80240B58 3C05FE36 */ lui $a1, 0xfe36 @@ -60,7 +60,7 @@ glabel func_80240A98_A61468 .L80240B68: /* A61538 80240B68 86240008 */ lh $a0, 8($s1) /* A6153C 80240B6C 0C00EABB */ jal get_npc_unsafe -/* A61540 80240B70 00000000 */ nop +/* A61540 80240B70 00000000 */ nop /* A61544 80240B74 8E630070 */ lw $v1, 0x70($s3) /* A61548 80240B78 10600006 */ beqz $v1, .L80240B94 /* A6154C 80240B7C 0040802D */ daddu $s0, $v0, $zero @@ -68,7 +68,7 @@ glabel func_80240A98_A61468 /* A61554 80240B84 1062003F */ beq $v1, $v0, .L80240C84 /* A61558 80240B88 0000102D */ daddu $v0, $zero, $zero /* A6155C 80240B8C 080903B2 */ j .L80240EC8 -/* A61560 80240B90 00000000 */ nop +/* A61560 80240B90 00000000 */ nop .L80240B94: /* A61564 80240B94 AFA00010 */ sw $zero, 0x10($sp) /* A61568 80240B98 AFA00014 */ sw $zero, 0x14($sp) @@ -79,7 +79,7 @@ glabel func_80240A98_A61468 /* A6157C 80240BAC 24040002 */ addiu $a0, $zero, 2 /* A61580 80240BB0 C64C006C */ lwc1 $f12, 0x6c($s2) /* A61584 80240BB4 0C00A6C9 */ jal clamp_angle -/* A61588 80240BB8 00000000 */ nop +/* A61588 80240BB8 00000000 */ nop /* A6158C 80240BBC 3C018024 */ lui $at, %hi(D_802434B0) /* A61590 80240BC0 D43834B0 */ ldc1 $f24, %lo(D_802434B0)($at) /* A61594 80240BC4 46000521 */ cvt.d.s $f20, $f0 @@ -107,7 +107,7 @@ glabel func_80240A98_A61468 /* A615EC 80240C1C 46000306 */ mov.s $f12, $f0 /* A615F0 80240C20 46000021 */ cvt.d.s $f0, $f0 /* A615F4 80240C24 4638003C */ c.lt.d $f0, $f24 -/* A615F8 80240C28 00000000 */ nop +/* A615F8 80240C28 00000000 */ nop /* A615FC 80240C2C 45020002 */ bc1fl .L80240C38 /* A61600 80240C30 E614000C */ swc1 $f20, 0xc($s0) /* A61604 80240C34 E616000C */ swc1 $f22, 0xc($s0) @@ -117,7 +117,7 @@ glabel func_80240A98_A61468 /* A61610 80240C40 D42234C0 */ ldc1 $f2, %lo(D_802434C0)($at) /* A61614 80240C44 46000021 */ cvt.d.s $f0, $f0 /* A61618 80240C48 46220002 */ mul.d $f0, $f0, $f2 -/* A6161C 80240C4C 00000000 */ nop +/* A6161C 80240C4C 00000000 */ nop /* A61620 80240C50 3C013F66 */ lui $at, 0x3f66 /* A61624 80240C54 34216666 */ ori $at, $at, 0x6666 /* A61628 80240C58 44812000 */ mtc1 $at, $f4 @@ -147,13 +147,13 @@ glabel func_80240A98_A61468 /* A61684 80240CB4 860200A6 */ lh $v0, 0xa6($s0) /* A61688 80240CB8 27A60024 */ addiu $a2, $sp, 0x24 /* A6168C 80240CBC 44820000 */ mtc1 $v0, $f0 -/* A61690 80240CC0 00000000 */ nop +/* A61690 80240CC0 00000000 */ nop /* A61694 80240CC4 46800020 */ cvt.s.w $f0, $f0 /* A61698 80240CC8 E7A00018 */ swc1 $f0, 0x18($sp) /* A6169C 80240CCC 860200A8 */ lh $v0, 0xa8($s0) /* A616A0 80240CD0 27A70028 */ addiu $a3, $sp, 0x28 /* A616A4 80240CD4 44820000 */ mtc1 $v0, $f0 -/* A616A8 80240CD8 00000000 */ nop +/* A616A8 80240CD8 00000000 */ nop /* A616AC 80240CDC 46800020 */ cvt.s.w $f0, $f0 /* A616B0 80240CE0 0C037711 */ jal func_800DDC44 /* A616B4 80240CE4 E7A0001C */ swc1 $f0, 0x1c($sp) @@ -173,7 +173,7 @@ glabel func_80240A98_A61468 /* A616E4 80240D14 44801800 */ mtc1 $zero, $f3 /* A616E8 80240D18 46000021 */ cvt.d.s $f0, $f0 /* A616EC 80240D1C 4622003C */ c.lt.d $f0, $f2 -/* A616F0 80240D20 00000000 */ nop +/* A616F0 80240D20 00000000 */ nop /* A616F4 80240D24 45000028 */ bc1f .L80240DC8 /* A616F8 80240D28 27A50020 */ addiu $a1, $sp, 0x20 /* A616FC 80240D2C 27A60024 */ addiu $a2, $sp, 0x24 @@ -204,7 +204,7 @@ glabel func_80240A98_A61468 /* A61760 80240D90 0C0372DF */ jal func_800DCB7C /* A61764 80240D94 27A70028 */ addiu $a3, $sp, 0x28 /* A61768 80240D98 1040000B */ beqz $v0, .L80240DC8 -/* A6176C 80240D9C 00000000 */ nop +/* A6176C 80240D9C 00000000 */ nop /* A61770 80240DA0 C600001C */ lwc1 $f0, 0x1c($s0) /* A61774 80240DA4 C7A2002C */ lwc1 $f2, 0x2c($sp) /* A61778 80240DA8 46000005 */ abs.s $f0, $f0 @@ -212,7 +212,7 @@ glabel func_80240A98_A61468 /* A61780 80240DB0 46340000 */ add.d $f0, $f0, $f20 /* A61784 80240DB4 460010A1 */ cvt.d.s $f2, $f2 /* A61788 80240DB8 4620103E */ c.le.d $f2, $f0 -/* A6178C 80240DBC 00000000 */ nop +/* A6178C 80240DBC 00000000 */ nop /* A61790 80240DC0 45030001 */ bc1tl .L80240DC8 /* A61794 80240DC4 24120001 */ addiu $s2, $zero, 1 .L80240DC8: @@ -234,7 +234,7 @@ glabel func_80240A98_A61468 /* A617D0 80240E00 2414000B */ addiu $s4, $zero, 0xb .L80240E04: /* A617D4 80240E04 12800024 */ beqz $s4, .L80240E98 -/* A617D8 80240E08 00000000 */ nop +/* A617D8 80240E08 00000000 */ nop /* A617DC 80240E0C AFA00010 */ sw $zero, 0x10($sp) /* A617E0 80240E10 AFA00014 */ sw $zero, 0x14($sp) /* A617E4 80240E14 8E050038 */ lw $a1, 0x38($s0) @@ -268,7 +268,7 @@ glabel func_80240A98_A61468 /* A61854 80240E84 AC800070 */ sw $zero, 0x70($a0) .L80240E88: /* A61858 80240E88 0C0B2026 */ jal set_variable -/* A6185C 80240E8C 00000000 */ nop +/* A6185C 80240E8C 00000000 */ nop /* A61860 80240E90 080903B2 */ j .L80240EC8 /* A61864 80240E94 24020002 */ addiu $v0, $zero, 2 .L80240E98: diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s index 1fdb6c0389..0871a736e2 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s @@ -103,41 +103,48 @@ glabel func_80240EF4_A618C4 /* A61A34 80241064 2C620064 */ sltiu $v0, $v1, 0x64 /* A61A38 80241068 10400060 */ beqz $v0, .L802411EC /* A61A3C 8024106C 00031080 */ sll $v0, $v1, 2 -/* A61A40 80241070 3C018024 */ lui $at, %hi(D_802434C8) +/* A61A40 80241070 3C018024 */ lui $at, %hi(jtbl_802434C8_A63E98) /* A61A44 80241074 00220821 */ addu $at, $at, $v0 -/* A61A48 80241078 8C2234C8 */ lw $v0, %lo(D_802434C8)($at) +/* A61A48 80241078 8C2234C8 */ lw $v0, %lo(jtbl_802434C8_A63E98)($at) /* A61A4C 8024107C 00400008 */ jr $v0 /* A61A50 80241080 00000000 */ nop +glabel L80241084_A61A54 /* A61A54 80241084 0260202D */ daddu $a0, $s3, $zero /* A61A58 80241088 0200282D */ daddu $a1, $s0, $zero /* A61A5C 8024108C 0C012568 */ jal func_800495A0 /* A61A60 80241090 02A0302D */ daddu $a2, $s5, $zero +glabel L80241094_A61A64 /* A61A64 80241094 0260202D */ daddu $a0, $s3, $zero /* A61A68 80241098 0200282D */ daddu $a1, $s0, $zero /* A61A6C 8024109C 0C0125AE */ jal func_800496B8 /* A61A70 802410A0 02A0302D */ daddu $a2, $s5, $zero /* A61A74 802410A4 0809047B */ j .L802411EC /* A61A78 802410A8 00000000 */ nop +glabel L802410AC_A61A7C /* A61A7C 802410AC 0260202D */ daddu $a0, $s3, $zero /* A61A80 802410B0 0200282D */ daddu $a1, $s0, $zero /* A61A84 802410B4 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A61A88 802410B8 02A0302D */ daddu $a2, $s5, $zero +glabel L802410BC_A61A8C /* A61A8C 802410BC 0260202D */ daddu $a0, $s3, $zero /* A61A90 802410C0 0200282D */ daddu $a1, $s0, $zero /* A61A94 802410C4 0C012701 */ jal func_80049C04 /* A61A98 802410C8 02A0302D */ daddu $a2, $s5, $zero /* A61A9C 802410CC 0809047B */ j .L802411EC /* A61AA0 802410D0 00000000 */ nop +glabel L802410D4_A61AA4 /* A61AA4 802410D4 0260202D */ daddu $a0, $s3, $zero /* A61AA8 802410D8 0200282D */ daddu $a1, $s0, $zero /* A61AAC 802410DC 0C01278F */ jal func_80049E3C /* A61AB0 802410E0 02A0302D */ daddu $a2, $s5, $zero +glabel L802410E4_A61AB4 /* A61AB4 802410E4 0260202D */ daddu $a0, $s3, $zero /* A61AB8 802410E8 0200282D */ daddu $a1, $s0, $zero /* A61ABC 802410EC 0C0127B3 */ jal func_80049ECC /* A61AC0 802410F0 02A0302D */ daddu $a2, $s5, $zero /* A61AC4 802410F4 0809047B */ j .L802411EC /* A61AC8 802410F8 00000000 */ nop +glabel L802410FC_A61ACC /* A61ACC 802410FC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A61AD0 80241100 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A61AD4 80241104 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -170,37 +177,45 @@ glabel func_80240EF4_A618C4 /* A61B38 80241168 0200282D */ daddu $a1, $s0, $zero /* A61B3C 8024116C 0C0127DF */ jal func_80049F7C /* A61B40 80241170 02A0302D */ daddu $a2, $s5, $zero +glabel L80241174_A61B44 /* A61B44 80241174 0260202D */ daddu $a0, $s3, $zero /* A61B48 80241178 0200282D */ daddu $a1, $s0, $zero /* A61B4C 8024117C 0C012849 */ jal func_8004A124 /* A61B50 80241180 02A0302D */ daddu $a2, $s5, $zero /* A61B54 80241184 0809047B */ j .L802411EC /* A61B58 80241188 00000000 */ nop +glabel L8024118C_A61B5C /* A61B5C 8024118C 0260202D */ daddu $a0, $s3, $zero /* A61B60 80241190 0200282D */ daddu $a1, $s0, $zero /* A61B64 80241194 0C0128FA */ jal func_8004A3E8 /* A61B68 80241198 02A0302D */ daddu $a2, $s5, $zero /* A61B6C 8024119C 0809047B */ j .L802411EC /* A61B70 802411A0 00000000 */ nop +glabel L802411A4_A61B74 /* A61B74 802411A4 0C0900CD */ jal func_80240334_A60D04 /* A61B78 802411A8 0260202D */ daddu $a0, $s3, $zero /* A61B7C 802411AC 0809047B */ j .L802411EC /* A61B80 802411B0 00000000 */ nop +glabel L802411B4_A61B84 /* A61B84 802411B4 0C09010D */ jal kpa_50_UnkSetDurationFunc /* A61B88 802411B8 0260202D */ daddu $a0, $s3, $zero /* A61B8C 802411BC 0809047B */ j .L802411EC /* A61B90 802411C0 00000000 */ nop +glabel L802411C4_A61B94 /* A61B94 802411C4 0C09011E */ jal kpa_50_UnkNpcAIFunc9 /* A61B98 802411C8 0260202D */ daddu $a0, $s3, $zero /* A61B9C 802411CC 0809047B */ j .L802411EC /* A61BA0 802411D0 00000000 */ nop +glabel L802411D4_A61BA4 /* A61BA4 802411D4 0C090146 */ jal kpa_50_UnkDurationCheck /* A61BA8 802411D8 0260202D */ daddu $a0, $s3, $zero /* A61BAC 802411DC 0809047B */ j .L802411EC /* A61BB0 802411E0 00000000 */ nop +glabel L802411E4_A61BB4 /* A61BB4 802411E4 0C0129CF */ jal func_8004A73C /* A61BB8 802411E8 0260202D */ daddu $a0, $s3, $zero .L802411EC: +glabel L802411EC_A61BBC /* A61BBC 802411EC 8FBF0048 */ lw $ra, 0x48($sp) /* A61BC0 802411F0 8FB50044 */ lw $s5, 0x44($sp) /* A61BC4 802411F4 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802412C8_A61C98.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802412C8_A61C98.s index 56173ba446..f37eca1535 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802412C8_A61C98.s +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802412C8_A61C98.s @@ -21,11 +21,11 @@ glabel func_802412C8_A61C98 /* A61CD8 80241308 A602008E */ sh $v0, 0x8e($s0) /* A61CDC 8024130C 00021400 */ sll $v0, $v0, 0x10 /* A61CE0 80241310 1C400033 */ bgtz $v0, .L802413E0 -/* A61CE4 80241314 00000000 */ nop +/* A61CE4 80241314 00000000 */ nop .L80241318: /* A61CE8 80241318 8602008C */ lh $v0, 0x8c($s0) /* A61CEC 8024131C 14400030 */ bnez $v0, .L802413E0 -/* A61CF0 80241320 00000000 */ nop +/* A61CF0 80241320 00000000 */ nop /* A61CF4 80241324 8E2200CC */ lw $v0, 0xcc($s1) /* A61CF8 80241328 8C420024 */ lw $v0, 0x24($v0) /* A61CFC 8024132C AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_802412C8_A61C98 /* A61D08 80241338 8E230088 */ lw $v1, 0x88($s1) /* A61D0C 8024133C 24020005 */ addiu $v0, $zero, 5 /* A61D10 80241340 10620005 */ beq $v1, $v0, .L80241358 -/* A61D14 80241344 00000000 */ nop +/* A61D14 80241344 00000000 */ nop /* A61D18 80241348 10600003 */ beqz $v1, .L80241358 /* A61D1C 8024134C 24020001 */ addiu $v0, $zero, 1 /* A61D20 80241350 14620006 */ bne $v1, $v0, .L8024136C -/* A61D24 80241354 00000000 */ nop +/* A61D24 80241354 00000000 */ nop .L80241358: /* A61D28 80241358 8E220084 */ lw $v0, 0x84($s1) /* A61D2C 8024135C 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_802412C8_A61C98 /* A61D6C 8024139C 46220000 */ add.d $f0, $f0, $f2 /* A61D70 802413A0 4620010D */ trunc.w.d $f4, $f0 /* A61D74 802413A4 44022000 */ mfc1 $v0, $f4 -/* A61D78 802413A8 00000000 */ nop +/* A61D78 802413A8 00000000 */ nop /* A61D7C 802413AC A602008E */ sh $v0, 0x8e($s0) /* A61D80 802413B0 00021400 */ sll $v0, $v0, 0x10 /* A61D84 802413B4 8E230078 */ lw $v1, 0x78($s1) /* A61D88 802413B8 00021403 */ sra $v0, $v0, 0x10 /* A61D8C 802413BC 0043102A */ slt $v0, $v0, $v1 /* A61D90 802413C0 10400003 */ beqz $v0, .L802413D0 -/* A61D94 802413C4 00000000 */ nop +/* A61D94 802413C4 00000000 */ nop /* A61D98 802413C8 9622007A */ lhu $v0, 0x7a($s1) /* A61D9C 802413CC A602008E */ sh $v0, 0x8e($s0) .L802413D0: diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s index 3c6688e6cf..3c7bafed26 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s @@ -279,15 +279,17 @@ glabel func_802415E0_A61FB0 /* A6239C 802419CC 2C620015 */ sltiu $v0, $v1, 0x15 /* A623A0 802419D0 10400009 */ beqz $v0, .L802419F8 /* A623A4 802419D4 00031080 */ sll $v0, $v1, 2 -/* A623A8 802419D8 3C018024 */ lui $at, %hi(D_80243660) +/* A623A8 802419D8 3C018024 */ lui $at, %hi(jtbl_80243660_A64030) /* A623AC 802419DC 00220821 */ addu $at, $at, $v0 -/* A623B0 802419E0 8C223660 */ lw $v0, %lo(D_80243660)($at) +/* A623B0 802419E0 8C223660 */ lw $v0, %lo(jtbl_80243660_A64030)($at) /* A623B4 802419E4 00400008 */ jr $v0 /* A623B8 802419E8 00000000 */ nop +glabel L802419EC_A623BC /* A623BC 802419EC 8E420028 */ lw $v0, 0x28($s2) /* A623C0 802419F0 24420001 */ addiu $v0, $v0, 1 /* A623C4 802419F4 AE420028 */ sw $v0, 0x28($s2) .L802419F8: +glabel L802419F8_A623C8 /* A623C8 802419F8 0000102D */ daddu $v0, $zero, $zero .L802419FC: /* A623CC 802419FC 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A64090/func_80240000_A64090.s b/asm/nonmatchings/world/area_kpa/kpa_51/A64090/func_80240000_A64090.s index 8f5b9860a5..1a53651e36 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A64090/func_80240000_A64090.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A64090/func_80240000_A64090.s @@ -9,7 +9,7 @@ glabel func_80240000_A64090 /* A640A0 80240010 24A52F20 */ addiu $a1, $a1, %lo(D_80242F20) /* A640A4 80240014 AFBF0010 */ sw $ra, 0x10($sp) /* A640A8 80240018 0C01953C */ jal sprintf -/* A640AC 8024001C 00000000 */ nop +/* A640AC 8024001C 00000000 */ nop /* A640B0 80240020 3C04800E */ lui $a0, %hi(D_800D91E0) /* A640B4 80240024 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) /* A640B8 80240028 3C058024 */ lui $a1, %hi(D_80242F30) @@ -19,6 +19,6 @@ glabel func_80240000_A64090 /* A640C8 80240038 0000102D */ daddu $v0, $zero, $zero /* A640CC 8024003C 03E00008 */ jr $ra /* A640D0 80240040 27BD0018 */ addiu $sp, $sp, 0x18 -/* A640D4 80240044 00000000 */ nop -/* A640D8 80240048 00000000 */ nop -/* A640DC 8024004C 00000000 */ nop +/* A640D4 80240044 00000000 */ nop +/* A640D8 80240048 00000000 */ nop +/* A640DC 8024004C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240050_A640E0.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240050_A640E0.s index 52557f896e..dd2e7b5971 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240050_A640E0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240050_A640E0.s @@ -41,16 +41,16 @@ glabel func_80240050_A640E0 /* A64170 802400E0 3C014387 */ lui $at, 0x4387 /* A64174 802400E4 4481A000 */ mtc1 $at, $f20 /* A64178 802400E8 0C00A70A */ jal get_clamped_angle_diff -/* A6417C 802400EC 00000000 */ nop +/* A6417C 802400EC 00000000 */ nop /* A64180 802400F0 0C00A6C9 */ jal clamp_angle /* A64184 802400F4 46000306 */ mov.s $f12, $f0 /* A64188 802400F8 3C018024 */ lui $at, %hi(D_80242F50) /* A6418C 802400FC D4222F50 */ ldc1 $f2, %lo(D_80242F50)($at) /* A64190 80240100 46000021 */ cvt.d.s $f0, $f0 /* A64194 80240104 4622003C */ c.lt.d $f0, $f2 -/* A64198 80240108 00000000 */ nop +/* A64198 80240108 00000000 */ nop /* A6419C 8024010C 45000003 */ bc1f .L8024011C -/* A641A0 80240110 00000000 */ nop +/* A641A0 80240110 00000000 */ nop /* A641A4 80240114 3C0142B4 */ lui $at, 0x42b4 /* A641A8 80240118 4481A000 */ mtc1 $at, $f20 .L8024011C: @@ -70,7 +70,7 @@ glabel func_80240050_A640E0 /* A641E0 80240150 D4222F58 */ ldc1 $f2, %lo(D_80242F58)($at) /* A641E4 80240154 46000021 */ cvt.d.s $f0, $f0 /* A641E8 80240158 4620103C */ c.lt.d $f2, $f0 -/* A641EC 8024015C 00000000 */ nop +/* A641EC 8024015C 00000000 */ nop /* A641F0 80240160 45010027 */ bc1t .L80240200 /* A641F4 80240164 2402FFFF */ addiu $v0, $zero, -1 /* A641F8 80240168 8E020000 */ lw $v0, ($s0) @@ -83,7 +83,7 @@ glabel func_80240050_A640E0 /* A64214 80240184 46000005 */ abs.s $f0, $f0 /* A64218 80240188 44060000 */ mfc1 $a2, $f0 /* A6421C 8024018C 0C00A720 */ jal atan2 -/* A64220 80240190 00000000 */ nop +/* A64220 80240190 00000000 */ nop /* A64224 80240194 3C018024 */ lui $at, %hi(func_80242F60_826220) /* A64228 80240198 D4222F60 */ ldc1 $f2, %lo(func_80242F60_826220)($at) /* A6422C 8024019C 46000021 */ cvt.d.s $f0, $f0 @@ -94,7 +94,7 @@ glabel func_80240050_A640E0 /* A64240 802401B0 46000005 */ abs.s $f0, $f0 /* A64244 802401B4 46000021 */ cvt.d.s $f0, $f0 /* A64248 802401B8 4620103C */ c.lt.d $f2, $f0 -/* A6424C 802401BC 00000000 */ nop +/* A6424C 802401BC 00000000 */ nop /* A64250 802401C0 4501000F */ bc1t .L80240200 /* A64254 802401C4 2402FFFF */ addiu $v0, $zero, -1 /* A64258 802401C8 3C038011 */ lui $v1, %hi(D_8010EBB3) diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240220_A642B0.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240220_A642B0.s index 9d53da7ce8..1fbad17757 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240220_A642B0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240220_A642B0.s @@ -30,7 +30,7 @@ glabel func_80240220_A642B0 /* A64314 80240284 8E4200B0 */ lw $v0, 0xb0($s2) /* A64318 80240288 30420004 */ andi $v0, $v0, 4 /* A6431C 8024028C 10400018 */ beqz $v0, .L802402F0 -/* A64320 80240290 00000000 */ nop +/* A64320 80240290 00000000 */ nop .L80240294: /* A64324 80240294 3C030024 */ lui $v1, 0x24 /* A64328 80240298 34630102 */ ori $v1, $v1, 0x102 @@ -60,11 +60,12 @@ glabel func_80240220_A642B0 /* A64384 802402F4 2C620005 */ sltiu $v0, $v1, 5 /* A64388 802402F8 10400101 */ beqz $v0, .L80240700 /* A6438C 802402FC 00031080 */ sll $v0, $v1, 2 -/* A64390 80240300 3C018024 */ lui $at, %hi(D_80242F70) +/* A64390 80240300 3C018024 */ lui $at, %hi(jtbl_80242F70_A67000) /* A64394 80240304 00220821 */ addu $at, $at, $v0 -/* A64398 80240308 8C222F70 */ lw $v0, %lo(D_80242F70)($at) +/* A64398 80240308 8C222F70 */ lw $v0, %lo(jtbl_80242F70_A67000)($at) /* A6439C 8024030C 00400008 */ jr $v0 -/* A643A0 80240310 00000000 */ nop +/* A643A0 80240310 00000000 */ nop +glabel L80240314_A643A4 /* A643A4 80240314 3C01C47A */ lui $at, 0xc47a /* A643A8 80240318 44810000 */ mtc1 $at, $f0 /* A643AC 8024031C 24020014 */ addiu $v0, $zero, 0x14 @@ -77,6 +78,7 @@ glabel func_80240220_A642B0 /* A643C8 80240338 E620003C */ swc1 $f0, 0x3c($s1) /* A643CC 8024033C AE40006C */ sw $zero, 0x6c($s2) /* A643D0 80240340 AEC20070 */ sw $v0, 0x70($s6) +glabel L80240344_A643D4 /* A643D4 80240344 8E50006C */ lw $s0, 0x6c($s2) /* A643D8 80240348 24020001 */ addiu $v0, $zero, 1 /* A643DC 8024034C 160200EC */ bne $s0, $v0, .L80240700 @@ -91,7 +93,7 @@ glabel func_80240220_A642B0 /* A64400 80240370 C6820034 */ lwc1 $f2, 0x34($s4) /* A64404 80240374 3C014387 */ lui $at, 0x4387 /* A64408 80240378 44810000 */ mtc1 $at, $f0 -/* A6440C 8024037C 00000000 */ nop +/* A6440C 8024037C 00000000 */ nop /* A64410 80240380 46020001 */ sub.s $f0, $f0, $f2 /* A64414 80240384 C6480074 */ lwc1 $f8, 0x74($s2) /* A64418 80240388 46804220 */ cvt.s.w $f8, $f8 @@ -118,20 +120,20 @@ glabel func_80240220_A642B0 /* A6446C 802403DC 44811000 */ mtc1 $at, $f2 /* A64470 802403E0 4600020D */ trunc.w.s $f8, $f0 /* A64474 802403E4 44024000 */ mfc1 $v0, $f8 -/* A64478 802403E8 00000000 */ nop +/* A64478 802403E8 00000000 */ nop /* A6447C 802403EC A6420010 */ sh $v0, 0x10($s2) /* A64480 802403F0 C620003C */ lwc1 $f0, 0x3c($s1) /* A64484 802403F4 3C13800F */ lui $s3, %hi(gPlayerStatusPtr) /* A64488 802403F8 26737B30 */ addiu $s3, $s3, %lo(gPlayerStatusPtr) /* A6448C 802403FC 4600020D */ trunc.w.s $f8, $f0 /* A64490 80240400 44024000 */ mfc1 $v0, $f8 -/* A64494 80240404 00000000 */ nop +/* A64494 80240404 00000000 */ nop /* A64498 80240408 A6420012 */ sh $v0, 0x12($s2) /* A6449C 8024040C C6200040 */ lwc1 $f0, 0x40($s1) /* A644A0 80240410 8E630000 */ lw $v1, ($s3) /* A644A4 80240414 4600020D */ trunc.w.s $f8, $f0 /* A644A8 80240418 44024000 */ mfc1 $v0, $f8 -/* A644AC 8024041C 00000000 */ nop +/* A644AC 8024041C 00000000 */ nop /* A644B0 80240420 A6420014 */ sh $v0, 0x14($s2) /* A644B4 80240424 E6220018 */ swc1 $f2, 0x18($s1) /* A644B8 80240428 C460002C */ lwc1 $f0, 0x2c($v1) @@ -147,7 +149,7 @@ glabel func_80240220_A642B0 /* A644E0 80240450 44070000 */ mfc1 $a3, $f0 /* A644E4 80240454 44061000 */ mfc1 $a2, $f2 /* A644E8 80240458 0C00A720 */ jal atan2 -/* A644EC 8024045C 00000000 */ nop +/* A644EC 8024045C 00000000 */ nop /* A644F0 80240460 3C018024 */ lui $at, %hi(D_80242F88) /* A644F4 80240464 D4222F88 */ ldc1 $f2, %lo(D_80242F88)($at) /* A644F8 80240468 46000021 */ cvt.d.s $f0, $f0 @@ -155,13 +157,13 @@ glabel func_80240220_A642B0 /* A64500 80240470 46200020 */ cvt.s.d $f0, $f0 /* A64504 80240474 4600020D */ trunc.w.s $f8, $f0 /* A64508 80240478 44044000 */ mfc1 $a0, $f8 -/* A6450C 8024047C 00000000 */ nop +/* A6450C 8024047C 00000000 */ nop /* A64510 80240480 00042400 */ sll $a0, $a0, 0x10 /* A64514 80240484 0C00A4F5 */ jal cosine /* A64518 80240488 00042403 */ sra $a0, $a0, 0x10 /* A6451C 8024048C C6220018 */ lwc1 $f2, 0x18($s1) /* A64520 80240490 46020002 */ mul.s $f0, $f0, $f2 -/* A64524 80240494 00000000 */ nop +/* A64524 80240494 00000000 */ nop /* A64528 80240498 C62C0038 */ lwc1 $f12, 0x38($s1) /* A6452C 8024049C C62E0040 */ lwc1 $f14, 0x40($s1) /* A64530 802404A0 8E620000 */ lw $v0, ($s3) @@ -187,7 +189,7 @@ glabel func_80240220_A642B0 /* A64580 802404F0 46020003 */ div.s $f0, $f0, $f2 /* A64584 802404F4 4600020D */ trunc.w.s $f8, $f0 /* A64588 802404F8 44104000 */ mfc1 $s0, $f8 -/* A6458C 802404FC 00000000 */ nop +/* A6458C 802404FC 00000000 */ nop /* A64590 80240500 5A000001 */ blezl $s0, .L80240508 /* A64594 80240504 24100001 */ addiu $s0, $zero, 1 .L80240508: @@ -201,7 +203,7 @@ glabel func_80240220_A642B0 /* A645B4 80240524 46020000 */ add.s $f0, $f0, $f2 /* A645B8 80240528 3C014160 */ lui $at, 0x4160 /* A645BC 8024052C 44811000 */ mtc1 $at, $f2 -/* A645C0 80240530 00000000 */ nop +/* A645C0 80240530 00000000 */ nop /* A645C4 80240534 46022100 */ add.s $f4, $f4, $f2 /* A645C8 80240538 46020000 */ add.s $f0, $f0, $f2 /* A645CC 8024053C 44062000 */ mfc1 $a2, $f4 @@ -217,6 +219,7 @@ glabel func_80240220_A642B0 /* A645F4 80240564 A630008E */ sh $s0, 0x8e($s1) /* A645F8 80240568 080901C0 */ j .L80240700 /* A645FC 8024056C AED50070 */ sw $s5, 0x70($s6) +glabel L80240570_A64600 /* A64600 80240570 9622008E */ lhu $v0, 0x8e($s1) /* A64604 80240574 2442FFFF */ addiu $v0, $v0, -1 /* A64608 80240578 A622008E */ sh $v0, 0x8e($s1) @@ -225,7 +228,7 @@ glabel func_80240220_A642B0 /* A64614 80240584 24150014 */ addiu $s5, $zero, 0x14 .L80240588: /* A64618 80240588 16A0000A */ bnez $s5, .L802405B4 -/* A6461C 8024058C 00000000 */ nop +/* A6461C 8024058C 00000000 */ nop /* A64620 80240590 8E250018 */ lw $a1, 0x18($s1) /* A64624 80240594 8E26000C */ lw $a2, 0xc($s1) /* A64628 80240598 0C00EA95 */ jal npc_move_heading @@ -236,15 +239,16 @@ glabel func_80240220_A642B0 /* A6463C 802405AC 080901C0 */ j .L80240700 /* A64640 802405B0 E620003C */ swc1 $f0, 0x3c($s1) .L802405B4: +glabel L802405B4_A64644 /* A64644 802405B4 862200A8 */ lh $v0, 0xa8($s1) /* A64648 802405B8 3C013FE0 */ lui $at, 0x3fe0 /* A6464C 802405BC 44810800 */ mtc1 $at, $f1 /* A64650 802405C0 44800000 */ mtc1 $zero, $f0 /* A64654 802405C4 44821000 */ mtc1 $v0, $f2 -/* A64658 802405C8 00000000 */ nop +/* A64658 802405C8 00000000 */ nop /* A6465C 802405CC 468010A1 */ cvt.d.w $f2, $f2 /* A64660 802405D0 46201082 */ mul.d $f2, $f2, $f0 -/* A64664 802405D4 00000000 */ nop +/* A64664 802405D4 00000000 */ nop /* A64668 802405D8 C620003C */ lwc1 $f0, 0x3c($s1) /* A6466C 802405DC AE20001C */ sw $zero, 0x1c($s1) /* A64670 802405E0 46000021 */ cvt.d.s $f0, $f0 @@ -258,6 +262,7 @@ glabel func_80240220_A642B0 /* A64690 80240600 A620008E */ sh $zero, 0x8e($s1) /* A64694 80240604 080901C0 */ j .L80240700 /* A64698 80240608 AEC20070 */ sw $v0, 0x70($s6) +glabel L8024060C_A6469C /* A6469C 8024060C 9622008E */ lhu $v0, 0x8e($s1) /* A646A0 80240610 24420001 */ addiu $v0, $v0, 1 /* A646A4 80240614 A622008E */ sh $v0, 0x8e($s1) @@ -271,17 +276,17 @@ glabel func_80240220_A642B0 /* A646C4 80240634 44810800 */ mtc1 $at, $f1 /* A646C8 80240638 44800000 */ mtc1 $zero, $f0 /* A646CC 8024063C 44822000 */ mtc1 $v0, $f4 -/* A646D0 80240640 00000000 */ nop +/* A646D0 80240640 00000000 */ nop /* A646D4 80240644 46802120 */ cvt.s.w $f4, $f4 /* A646D8 80240648 46002121 */ cvt.d.s $f4, $f4 /* A646DC 8024064C 46202102 */ mul.d $f4, $f4, $f0 -/* A646E0 80240650 00000000 */ nop +/* A646E0 80240650 00000000 */ nop /* A646E4 80240654 44821000 */ mtc1 $v0, $f2 -/* A646E8 80240658 00000000 */ nop +/* A646E8 80240658 00000000 */ nop /* A646EC 8024065C 468010A0 */ cvt.s.w $f2, $f2 /* A646F0 80240660 460010A1 */ cvt.d.s $f2, $f2 /* A646F4 80240664 46201082 */ mul.d $f2, $f2, $f0 -/* A646F8 80240668 00000000 */ nop +/* A646F8 80240668 00000000 */ nop /* A646FC 8024066C C620003C */ lwc1 $f0, 0x3c($s1) /* A64700 80240670 3C01400C */ lui $at, 0x400c /* A64704 80240674 44813800 */ mtc1 $at, $f7 @@ -291,14 +296,14 @@ glabel func_80240220_A642B0 /* A64714 80240684 3C014034 */ lui $at, 0x4034 /* A64718 80240688 44813800 */ mtc1 $at, $f7 /* A6471C 8024068C 44803000 */ mtc1 $zero, $f6 -/* A64720 80240690 00000000 */ nop +/* A64720 80240690 00000000 */ nop /* A64724 80240694 46262100 */ add.d $f4, $f4, $f6 /* A64728 80240698 46200020 */ cvt.s.d $f0, $f0 /* A6472C 8024069C E620003C */ swc1 $f0, 0x3c($s1) /* A64730 802406A0 46261080 */ add.d $f2, $f2, $f6 /* A64734 802406A4 4620220D */ trunc.w.d $f8, $f4 /* A64738 802406A8 44024000 */ mfc1 $v0, $f8 -/* A6473C 802406AC 00000000 */ nop +/* A6473C 802406AC 00000000 */ nop /* A64740 802406B0 A62200A6 */ sh $v0, 0xa6($s1) /* A64744 802406B4 4620120D */ trunc.w.d $f8, $f2 /* A64748 802406B8 44024000 */ mfc1 $v0, $f8 @@ -318,7 +323,7 @@ glabel func_80240220_A642B0 /* A6477C 802406EC E620003C */ swc1 $f0, 0x3c($s1) .L802406F0: /* A64780 802406F0 14400003 */ bnez $v0, .L80240700 -/* A64784 802406F4 00000000 */ nop +/* A64784 802406F4 00000000 */ nop /* A64788 802406F8 AE40006C */ sw $zero, 0x6c($s2) /* A6478C 802406FC AEC00070 */ sw $zero, 0x70($s6) .L80240700: diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802407A4_A64834.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802407A4_A64834.s index 76fab76fce..4ed894420a 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802407A4_A64834.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802407A4_A64834.s @@ -44,7 +44,7 @@ glabel func_802407A4_A64834 /* A648D0 80240840 A20200AC */ sb $v0, 0xac($s0) /* A648D4 80240844 24020004 */ addiu $v0, $zero, 4 /* A648D8 80240848 14620007 */ bne $v1, $v0, .L80240868 -/* A648DC 8024084C 00000000 */ nop +/* A648DC 8024084C 00000000 */ nop /* A648E0 80240850 0C00EAFF */ jal disable_npc_shadow /* A648E4 80240854 0200202D */ daddu $a0, $s0, $zero /* A648E8 80240858 8E420000 */ lw $v0, ($s2) diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802408D0_A64960.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802408D0_A64960.s index b24fc0615c..104edd6c19 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802408D0_A64960.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802408D0_A64960.s @@ -21,10 +21,10 @@ glabel func_802408D0_A64960 /* A649A0 80240910 3C014334 */ lui $at, 0x4334 /* A649A4 80240914 44811000 */ mtc1 $at, $f2 /* A649A8 80240918 44820000 */ mtc1 $v0, $f0 -/* A649AC 8024091C 00000000 */ nop +/* A649AC 8024091C 00000000 */ nop /* A649B0 80240920 46800020 */ cvt.s.w $f0, $f0 /* A649B4 80240924 46020002 */ mul.s $f0, $f0, $f2 -/* A649B8 80240928 00000000 */ nop +/* A649B8 80240928 00000000 */ nop /* A649BC 8024092C 3C013F4C */ lui $at, 0x3f4c /* A649C0 80240930 3421CCCD */ ori $at, $at, 0xcccd /* A649C4 80240934 44812000 */ mtc1 $at, $f4 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240B14_A64BA4.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240B14_A64BA4.s index 140b0d1879..fadfc184de 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240B14_A64BA4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240B14_A64BA4.s @@ -35,11 +35,11 @@ glabel func_80240B14_A64BA4 /* A64C10 80240B80 3C018024 */ lui $at, %hi(func_80242F90) /* A64C14 80240B84 D4222F90 */ ldc1 $f2, %lo(func_80242F90)($at) /* A64C18 80240B88 44820000 */ mtc1 $v0, $f0 -/* A64C1C 80240B8C 00000000 */ nop +/* A64C1C 80240B8C 00000000 */ nop /* A64C20 80240B90 46800020 */ cvt.s.w $f0, $f0 /* A64C24 80240B94 46000021 */ cvt.d.s $f0, $f0 /* A64C28 80240B98 46220002 */ mul.d $f0, $f0, $f2 -/* A64C2C 80240B9C 00000000 */ nop +/* A64C2C 80240B9C 00000000 */ nop /* A64C30 80240BA0 3C018024 */ lui $at, %hi(D_80242F98) /* A64C34 80240BA4 D4222F98 */ ldc1 $f2, %lo(D_80242F98)($at) /* A64C38 80240BA8 46220000 */ add.d $f0, $f0, $f2 @@ -51,12 +51,12 @@ glabel func_80240B14_A64BA4 /* A64C50 80240BC0 E6000054 */ swc1 $f0, 0x54($s0) /* A64C54 80240BC4 46000021 */ cvt.d.s $f0, $f0 /* A64C58 80240BC8 4620103C */ c.lt.d $f2, $f0 -/* A64C5C 80240BCC 00000000 */ nop +/* A64C5C 80240BCC 00000000 */ nop /* A64C60 80240BD0 45000005 */ bc1f .L80240BE8 /* A64C64 80240BD4 24030005 */ addiu $v1, $zero, 5 /* A64C68 80240BD8 3C013F80 */ lui $at, 0x3f80 /* A64C6C 80240BDC 44810000 */ mtc1 $at, $f0 -/* A64C70 80240BE0 00000000 */ nop +/* A64C70 80240BE0 00000000 */ nop /* A64C74 80240BE4 E6000054 */ swc1 $f0, 0x54($s0) .L80240BE8: /* A64C78 80240BE8 C6000054 */ lwc1 $f0, 0x54($s0) @@ -79,7 +79,7 @@ glabel func_80240B14_A64BA4 .L80240C2C: /* A64CBC 80240C2C 8E22006C */ lw $v0, 0x6c($s1) /* A64CC0 80240C30 1440000E */ bnez $v0, .L80240C6C -/* A64CC4 80240C34 00000000 */ nop +/* A64CC4 80240C34 00000000 */ nop /* A64CC8 80240C38 8602008E */ lh $v0, 0x8e($s0) /* A64CCC 80240C3C 28420014 */ slti $v0, $v0, 0x14 /* A64CD0 80240C40 14400017 */ bnez $v0, .L80240CA0 @@ -92,12 +92,12 @@ glabel func_80240B14_A64BA4 /* A64CEC 80240C5C 0C0B7A25 */ jal func_802DE894 /* A64CF0 80240C60 00A0382D */ daddu $a3, $a1, $zero /* A64CF4 80240C64 0809031F */ j .L80240C7C -/* A64CF8 80240C68 00000000 */ nop +/* A64CF8 80240C68 00000000 */ nop .L80240C6C: /* A64CFC 80240C6C 8602008E */ lh $v0, 0x8e($s0) /* A64D00 80240C70 2842000A */ slti $v0, $v0, 0xa /* A64D04 80240C74 1440000A */ bnez $v0, .L80240CA0 -/* A64D08 80240C78 00000000 */ nop +/* A64D08 80240C78 00000000 */ nop .L80240C7C: /* A64D0C 80240C7C 3C013F80 */ lui $at, 0x3f80 /* A64D10 80240C80 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CF4_A64D84.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CF4_A64D84.s index 788e1fbaf2..f1cd09506f 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CF4_A64D84.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CF4_A64D84.s @@ -36,7 +36,7 @@ glabel func_80240CF4_A64D84 /* A64E00 80240D70 3C01C1A0 */ lui $at, 0xc1a0 /* A64E04 80240D74 44812000 */ mtc1 $at, $f4 /* A64E08 80240D78 44824000 */ mtc1 $v0, $f8 -/* A64E0C 80240D7C 00000000 */ nop +/* A64E0C 80240D7C 00000000 */ nop /* A64E10 80240D80 46804220 */ cvt.s.w $f8, $f8 /* A64E14 80240D84 44074000 */ mfc1 $a3, $f8 /* A64E18 80240D88 2402000C */ addiu $v0, $zero, 0xc diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240EB4_A64F44.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240EB4_A64F44.s index b008a1173b..5f670d59a5 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240EB4_A64F44.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240EB4_A64F44.s @@ -16,7 +16,7 @@ glabel func_80240EB4_A64F44 /* A64F70 80240EE0 A482008E */ sh $v0, 0x8e($a0) /* A64F74 80240EE4 00021400 */ sll $v0, $v0, 0x10 /* A64F78 80240EE8 1C400008 */ bgtz $v0, .L80240F0C -/* A64F7C 80240EEC 00000000 */ nop +/* A64F7C 80240EEC 00000000 */ nop /* A64F80 80240EF0 8E0200CC */ lw $v0, 0xcc($s0) /* A64F84 80240EF4 8C430024 */ lw $v1, 0x24($v0) /* A64F88 80240EF8 24020009 */ addiu $v0, $zero, 9 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240F20_A64FB0.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240F20_A64FB0.s index bb71e40c2c..35e9eafaea 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240F20_A64FB0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240F20_A64FB0.s @@ -21,7 +21,7 @@ glabel func_80240F20_A64FB0 /* A64FF0 80240F60 A602008E */ sh $v0, 0x8e($s0) /* A64FF4 80240F64 00021400 */ sll $v0, $v0, 0x10 /* A64FF8 80240F68 1C400032 */ bgtz $v0, .L80241034 -/* A64FFC 80240F6C 00000000 */ nop +/* A64FFC 80240F6C 00000000 */ nop /* A65000 80240F70 0260202D */ daddu $a0, $s3, $zero /* A65004 80240F74 8E250024 */ lw $a1, 0x24($s1) /* A65008 80240F78 8E260028 */ lw $a2, 0x28($s1) @@ -43,7 +43,7 @@ glabel func_80240F20_A64FB0 /* A65048 80240FB8 2402000C */ addiu $v0, $zero, 0xc /* A6504C 80240FBC AFA2001C */ sw $v0, 0x1c($sp) /* A65050 80240FC0 44833000 */ mtc1 $v1, $f6 -/* A65054 80240FC4 00000000 */ nop +/* A65054 80240FC4 00000000 */ nop /* A65058 80240FC8 468031A0 */ cvt.s.w $f6, $f6 /* A6505C 80240FCC 44073000 */ mfc1 $a3, $f6 /* A65060 80240FD0 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241054_A650E4.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241054_A650E4.s index 2fc040f9c5..2d74803ad8 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241054_A650E4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241054_A650E4.s @@ -16,7 +16,7 @@ glabel func_80241054_A650E4 /* A65110 80241080 A482008E */ sh $v0, 0x8e($a0) /* A65114 80241084 00021400 */ sll $v0, $v0, 0x10 /* A65118 80241088 1C400007 */ bgtz $v0, .L802410A8 -/* A6511C 8024108C 00000000 */ nop +/* A6511C 8024108C 00000000 */ nop /* A65120 80241090 8E0200CC */ lw $v0, 0xcc($s0) /* A65124 80241094 8C430000 */ lw $v1, ($v0) /* A65128 80241098 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802410BC_A6514C.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802410BC_A6514C.s index 6e5c6374b7..ecc9f66b2a 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802410BC_A6514C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802410BC_A6514C.s @@ -46,7 +46,7 @@ glabel func_802410BC_A6514C /* A651F0 80241160 8E2200B0 */ lw $v0, 0xb0($s1) /* A651F4 80241164 30420004 */ andi $v0, $v0, 4 /* A651F8 80241168 1040001E */ beqz $v0, .L802411E4 -/* A651FC 8024116C 00000000 */ nop +/* A651FC 8024116C 00000000 */ nop .L80241170: /* A65200 80241170 8E430000 */ lw $v1, ($s2) /* A65204 80241174 2402F7FF */ addiu $v0, $zero, -0x801 @@ -83,11 +83,12 @@ glabel func_802410BC_A6514C /* A65278 802411E8 2C620019 */ sltiu $v0, $v1, 0x19 /* A6527C 802411EC 10400044 */ beqz $v0, .L80241300 /* A65280 802411F0 00031080 */ sll $v0, $v1, 2 -/* A65284 802411F4 3C018024 */ lui $at, %hi(D_80242FA0) +/* A65284 802411F4 3C018024 */ lui $at, %hi(jtbl_80242FA0_A67030) /* A65288 802411F8 00220821 */ addu $at, $at, $v0 -/* A6528C 802411FC 8C222FA0 */ lw $v0, %lo(D_80242FA0)($at) +/* A6528C 802411FC 8C222FA0 */ lw $v0, %lo(jtbl_80242FA0_A67030)($at) /* A65290 80241200 00400008 */ jr $v0 -/* A65294 80241204 00000000 */ nop +/* A65294 80241204 00000000 */ nop +glabel L80241208_A65298 /* A65298 80241208 02A0202D */ daddu $a0, $s5, $zero /* A6529C 8024120C 0260282D */ daddu $a1, $s3, $zero /* A652A0 80241210 0C0901CC */ jal func_80240730_A647C0 @@ -95,62 +96,73 @@ glabel func_802410BC_A6514C /* A652A8 80241218 8EA30070 */ lw $v1, 0x70($s5) /* A652AC 8024121C 24020001 */ addiu $v0, $zero, 1 /* A652B0 80241220 14620037 */ bne $v1, $v0, .L80241300 -/* A652B4 80241224 00000000 */ nop +/* A652B4 80241224 00000000 */ nop +glabel L80241228_A652B8 /* A652B8 80241228 02A0202D */ daddu $a0, $s5, $zero /* A652BC 8024122C 0260282D */ daddu $a1, $s3, $zero /* A652C0 80241230 0C0901E9 */ jal func_802407A4_A64834 /* A652C4 80241234 0280302D */ daddu $a2, $s4, $zero /* A652C8 80241238 080904C0 */ j .L80241300 -/* A652CC 8024123C 00000000 */ nop +/* A652CC 8024123C 00000000 */ nop +glabel L80241240_A652D0 /* A652D0 80241240 02A0202D */ daddu $a0, $s5, $zero /* A652D4 80241244 0260282D */ daddu $a1, $s3, $zero /* A652D8 80241248 0C090234 */ jal func_802408D0_A64960 /* A652DC 8024124C 0280302D */ daddu $a2, $s4, $zero +glabel L80241250_A652E0 /* A652E0 80241250 02A0202D */ daddu $a0, $s5, $zero /* A652E4 80241254 0260282D */ daddu $a1, $s3, $zero /* A652E8 80241258 0C09025C */ jal func_80240970_A64A00 /* A652EC 8024125C 0280302D */ daddu $a2, $s4, $zero /* A652F0 80241260 080904C0 */ j .L80241300 -/* A652F4 80241264 00000000 */ nop +/* A652F4 80241264 00000000 */ nop +glabel L80241268_A652F8 /* A652F8 80241268 02A0202D */ daddu $a0, $s5, $zero /* A652FC 8024126C 0260282D */ daddu $a1, $s3, $zero /* A65300 80241270 0C090275 */ jal func_802409D4_A64A64 /* A65304 80241274 0280302D */ daddu $a2, $s4, $zero +glabel L80241278_A65308 /* A65308 80241278 02A0202D */ daddu $a0, $s5, $zero /* A6530C 8024127C 0260282D */ daddu $a1, $s3, $zero /* A65310 80241280 0C0902C5 */ jal func_80240B14_A64BA4 /* A65314 80241284 0280302D */ daddu $a2, $s4, $zero /* A65318 80241288 080904C0 */ j .L80241300 -/* A6531C 8024128C 00000000 */ nop +/* A6531C 8024128C 00000000 */ nop +glabel L80241290_A65320 /* A65320 80241290 02A0202D */ daddu $a0, $s5, $zero /* A65324 80241294 0260282D */ daddu $a1, $s3, $zero /* A65328 80241298 0C09032E */ jal func_80240CB8_A64D48 /* A6532C 8024129C 0280302D */ daddu $a2, $s4, $zero /* A65330 802412A0 080904C0 */ j .L80241300 -/* A65334 802412A4 00000000 */ nop +/* A65334 802412A4 00000000 */ nop +glabel L802412A8_A65338 /* A65338 802412A8 02A0202D */ daddu $a0, $s5, $zero /* A6533C 802412AC 0260282D */ daddu $a1, $s3, $zero /* A65340 802412B0 0C09033D */ jal func_80240CF4_A64D84 /* A65344 802412B4 0280302D */ daddu $a2, $s4, $zero /* A65348 802412B8 080904C0 */ j .L80241300 -/* A6534C 802412BC 00000000 */ nop +/* A6534C 802412BC 00000000 */ nop +glabel L802412C0_A65350 /* A65350 802412C0 02A0202D */ daddu $a0, $s5, $zero /* A65354 802412C4 0260282D */ daddu $a1, $s3, $zero /* A65358 802412C8 0C0903AD */ jal func_80240EB4_A64F44 /* A6535C 802412CC 0280302D */ daddu $a2, $s4, $zero /* A65360 802412D0 080904C0 */ j .L80241300 -/* A65364 802412D4 00000000 */ nop +/* A65364 802412D4 00000000 */ nop +glabel L802412D8_A65368 /* A65368 802412D8 02A0202D */ daddu $a0, $s5, $zero /* A6536C 802412DC 0260282D */ daddu $a1, $s3, $zero /* A65370 802412E0 0C0903C8 */ jal func_80240F20_A64FB0 /* A65374 802412E4 0280302D */ daddu $a2, $s4, $zero /* A65378 802412E8 080904C0 */ j .L80241300 -/* A6537C 802412EC 00000000 */ nop +/* A6537C 802412EC 00000000 */ nop +glabel L802412F0_A65380 /* A65380 802412F0 02A0202D */ daddu $a0, $s5, $zero /* A65384 802412F4 0260282D */ daddu $a1, $s3, $zero /* A65388 802412F8 0C090415 */ jal func_80241054_A650E4 /* A6538C 802412FC 0280302D */ daddu $a2, $s4, $zero .L80241300: +glabel L80241300_A65390 /* A65390 80241300 8FBF0048 */ lw $ra, 0x48($sp) /* A65394 80241304 8FB50044 */ lw $s5, 0x44($sp) /* A65398 80241308 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241404_A65494.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241404_A65494.s index 26f9e4c7c6..ecc9894768 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241404_A65494.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241404_A65494.s @@ -12,7 +12,7 @@ glabel func_80241404_A65494 /* A654B0 80241420 8E03006C */ lw $v1, 0x6c($s0) /* A654B4 80241424 24020002 */ addiu $v0, $zero, 2 /* A654B8 80241428 14620003 */ bne $v1, $v0, .L80241438 -/* A654BC 8024142C 00000000 */ nop +/* A654BC 8024142C 00000000 */ nop /* A654C0 80241430 AC80001C */ sw $zero, 0x1c($a0) /* A654C4 80241434 AC800018 */ sw $zero, 0x18($a0) .L80241438: diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802414C8_A65558.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802414C8_A65558.s index 6805ad769e..09cca3a41f 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802414C8_A65558.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802414C8_A65558.s @@ -21,11 +21,11 @@ glabel func_802414C8_A65558 /* A65598 80241508 A602008E */ sh $v0, 0x8e($s0) /* A6559C 8024150C 00021400 */ sll $v0, $v0, 0x10 /* A655A0 80241510 1C400033 */ bgtz $v0, .L802415E0 -/* A655A4 80241514 00000000 */ nop +/* A655A4 80241514 00000000 */ nop .L80241518: /* A655A8 80241518 8602008C */ lh $v0, 0x8c($s0) /* A655AC 8024151C 14400030 */ bnez $v0, .L802415E0 -/* A655B0 80241520 00000000 */ nop +/* A655B0 80241520 00000000 */ nop /* A655B4 80241524 8E2200CC */ lw $v0, 0xcc($s1) /* A655B8 80241528 8C420024 */ lw $v0, 0x24($v0) /* A655BC 8024152C AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_802414C8_A65558 /* A655C8 80241538 8E230088 */ lw $v1, 0x88($s1) /* A655CC 8024153C 24020005 */ addiu $v0, $zero, 5 /* A655D0 80241540 10620005 */ beq $v1, $v0, .L80241558 -/* A655D4 80241544 00000000 */ nop +/* A655D4 80241544 00000000 */ nop /* A655D8 80241548 10600003 */ beqz $v1, .L80241558 /* A655DC 8024154C 24020001 */ addiu $v0, $zero, 1 /* A655E0 80241550 14620006 */ bne $v1, $v0, .L8024156C -/* A655E4 80241554 00000000 */ nop +/* A655E4 80241554 00000000 */ nop .L80241558: /* A655E8 80241558 8E220084 */ lw $v0, 0x84($s1) /* A655EC 8024155C 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_802414C8_A65558 /* A6562C 8024159C 46220000 */ add.d $f0, $f0, $f2 /* A65630 802415A0 4620010D */ trunc.w.d $f4, $f0 /* A65634 802415A4 44022000 */ mfc1 $v0, $f4 -/* A65638 802415A8 00000000 */ nop +/* A65638 802415A8 00000000 */ nop /* A6563C 802415AC A602008E */ sh $v0, 0x8e($s0) /* A65640 802415B0 00021400 */ sll $v0, $v0, 0x10 /* A65644 802415B4 8E230078 */ lw $v1, 0x78($s1) /* A65648 802415B8 00021403 */ sra $v0, $v0, 0x10 /* A6564C 802415BC 0043102A */ slt $v0, $v0, $v1 /* A65650 802415C0 10400003 */ beqz $v0, .L802415D0 -/* A65654 802415C4 00000000 */ nop +/* A65654 802415C4 00000000 */ nop /* A65658 802415C8 9622007A */ lhu $v0, 0x7a($s1) /* A6565C 802415CC A602008E */ sh $v0, 0x8e($s0) .L802415D0: diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s index bccfb9677e..4bf32270ec 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s @@ -279,15 +279,17 @@ glabel func_802417E0_A65870 /* A65C5C 80241BCC 2C620015 */ sltiu $v0, $v1, 0x15 /* A65C60 80241BD0 10400009 */ beqz $v0, .L80241BF8 /* A65C64 80241BD4 00031080 */ sll $v0, $v1, 2 -/* A65C68 80241BD8 3C018024 */ lui $at, %hi(func_80243010_A1E110) +/* A65C68 80241BD8 3C018024 */ lui $at, %hi(jtbl_80243010_A670A0) /* A65C6C 80241BDC 00220821 */ addu $at, $at, $v0 -/* A65C70 80241BE0 8C223010 */ lw $v0, %lo(func_80243010_A1E110)($at) +/* A65C70 80241BE0 8C223010 */ lw $v0, %lo(jtbl_80243010_A670A0)($at) /* A65C74 80241BE4 00400008 */ jr $v0 /* A65C78 80241BE8 00000000 */ nop +glabel L80241BEC_A65C7C /* A65C7C 80241BEC 8E420028 */ lw $v0, 0x28($s2) /* A65C80 80241BF0 24420001 */ addiu $v0, $v0, 1 /* A65C84 80241BF4 AE420028 */ sw $v0, 0x28($s2) .L80241BF8: +glabel L80241BF8_A65C88 /* A65C88 80241BF8 0000102D */ daddu $v0, $zero, $zero .L80241BFC: /* A65C8C 80241BFC 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802400E0_A671E0.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802400E0_A671E0.s index 4b3987785d..db3a778850 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802400E0_A671E0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802400E0_A671E0.s @@ -42,16 +42,16 @@ glabel func_802400E0_A671E0 /* A67274 80240174 3C014387 */ lui $at, 0x4387 /* A67278 80240178 4481A000 */ mtc1 $at, $f20 /* A6727C 8024017C 0C00A70A */ jal get_clamped_angle_diff -/* A67280 80240180 00000000 */ nop +/* A67280 80240180 00000000 */ nop /* A67284 80240184 0C00A6C9 */ jal clamp_angle /* A67288 80240188 46000306 */ mov.s $f12, $f0 /* A6728C 8024018C 3C018024 */ lui $at, %hi(D_802439E0) /* A67290 80240190 D42239E0 */ ldc1 $f2, %lo(D_802439E0)($at) /* A67294 80240194 46000021 */ cvt.d.s $f0, $f0 /* A67298 80240198 4622003C */ c.lt.d $f0, $f2 -/* A6729C 8024019C 00000000 */ nop +/* A6729C 8024019C 00000000 */ nop /* A672A0 802401A0 45000003 */ bc1f .L802401B0 -/* A672A4 802401A4 00000000 */ nop +/* A672A4 802401A4 00000000 */ nop /* A672A8 802401A8 3C0142B4 */ lui $at, 0x42b4 /* A672AC 802401AC 4481A000 */ mtc1 $at, $f20 .L802401B0: @@ -71,7 +71,7 @@ glabel func_802400E0_A671E0 /* A672E4 802401E4 D42239E8 */ ldc1 $f2, %lo(D_802439E8)($at) /* A672E8 802401E8 46000021 */ cvt.d.s $f0, $f0 /* A672EC 802401EC 4620103C */ c.lt.d $f2, $f0 -/* A672F0 802401F0 00000000 */ nop +/* A672F0 802401F0 00000000 */ nop /* A672F4 802401F4 4501002E */ bc1t .L802402B0 /* A672F8 802401F8 2402FFFF */ addiu $v0, $zero, -1 /* A672FC 802401FC 8E220000 */ lw $v0, ($s1) @@ -80,13 +80,13 @@ glabel func_802400E0_A671E0 /* A67308 80240208 860200A8 */ lh $v0, 0xa8($s0) /* A6730C 8024020C 46020001 */ sub.s $f0, $f0, $f2 /* A67310 80240210 44821000 */ mtc1 $v0, $f2 -/* A67314 80240214 00000000 */ nop +/* A67314 80240214 00000000 */ nop /* A67318 80240218 468010A1 */ cvt.d.w $f2, $f2 /* A6731C 8024021C 46221080 */ add.d $f2, $f2, $f2 /* A67320 80240220 46000005 */ abs.s $f0, $f0 /* A67324 80240224 46000021 */ cvt.d.s $f0, $f0 /* A67328 80240228 4620103E */ c.le.d $f2, $f0 -/* A6732C 8024022C 00000000 */ nop +/* A6732C 8024022C 00000000 */ nop /* A67330 80240230 4501001F */ bc1t .L802402B0 /* A67334 80240234 2402FFFF */ addiu $v0, $zero, -1 /* A67338 80240238 3C038011 */ lui $v1, %hi(D_8010EBB3) @@ -97,7 +97,7 @@ glabel func_802400E0_A671E0 /* A6734C 8024024C 14620005 */ bne $v1, $v0, .L80240264 /* A67350 80240250 2402FFFF */ addiu $v0, $zero, -1 /* A67354 80240254 080900AC */ j .L802402B0 -/* A67358 80240258 00000000 */ nop +/* A67358 80240258 00000000 */ nop .L8024025C: /* A6735C 8024025C 080900AC */ j .L802402B0 /* A67360 80240260 0240102D */ daddu $v0, $s2, $zero @@ -120,7 +120,7 @@ glabel func_802400E0_A671E0 /* A6739C 8024029C 8E620078 */ lw $v0, 0x78($s3) /* A673A0 802402A0 0222102A */ slt $v0, $s1, $v0 /* A673A4 802402A4 1440FFF2 */ bnez $v0, .L80240270 -/* A673A8 802402A8 00000000 */ nop +/* A673A8 802402A8 00000000 */ nop .L802402AC: /* A673AC 802402AC 2402FFFF */ addiu $v0, $zero, -1 .L802402B0: diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802402D0_A673D0.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802402D0_A673D0.s index 89ad113f81..de15369156 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802402D0_A673D0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802402D0_A673D0.s @@ -38,7 +38,7 @@ glabel func_802402D0_A673D0 /* A67454 80240354 2402000F */ addiu $v0, $zero, 0xf /* A67458 80240358 AFA2001C */ sw $v0, 0x1c($sp) /* A6745C 8024035C 44833000 */ mtc1 $v1, $f6 -/* A67460 80240360 00000000 */ nop +/* A67460 80240360 00000000 */ nop /* A67464 80240364 468031A0 */ cvt.s.w $f6, $f6 /* A67468 80240368 44073000 */ mfc1 $a3, $f6 /* A6746C 8024036C 27A20028 */ addiu $v0, $sp, 0x28 @@ -60,15 +60,15 @@ glabel func_802402D0_A673D0 /* A674A8 802403A8 0040202D */ daddu $a0, $v0, $zero /* A674AC 802403AC 2402FFFF */ addiu $v0, $zero, -1 /* A674B0 802403B0 10820010 */ beq $a0, $v0, .L802403F4 -/* A674B4 802403B4 00000000 */ nop +/* A674B4 802403B4 00000000 */ nop /* A674B8 802403B8 0C00FB3A */ jal get_enemy -/* A674BC 802403BC 00000000 */ nop +/* A674BC 802403BC 00000000 */ nop /* A674C0 802403C0 8C42006C */ lw $v0, 0x6c($v0) /* A674C4 802403C4 1440000B */ bnez $v0, .L802403F4 -/* A674C8 802403C8 00000000 */ nop +/* A674C8 802403C8 00000000 */ nop /* A674CC 802403CC 8602008C */ lh $v0, 0x8c($s0) /* A674D0 802403D0 14400008 */ bnez $v0, .L802403F4 -/* A674D4 802403D4 00000000 */ nop +/* A674D4 802403D4 00000000 */ nop /* A674D8 802403D8 8E2200CC */ lw $v0, 0xcc($s1) /* A674DC 802403DC 8C420020 */ lw $v0, 0x20($v0) /* A674E0 802403E0 AE020028 */ sw $v0, 0x28($s0) diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240414_A67514.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240414_A67514.s index 5abf48e89f..e927a0d1d6 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240414_A67514.s +++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240414_A67514.s @@ -17,7 +17,7 @@ glabel func_80240414_A67514 /* A67544 80240444 A602008E */ sh $v0, 0x8e($s0) /* A67548 80240448 00021400 */ sll $v0, $v0, 0x10 /* A6754C 8024044C 1C40002B */ bgtz $v0, .L802404FC -/* A67550 80240450 00000000 */ nop +/* A67550 80240450 00000000 */ nop /* A67554 80240454 0C090038 */ jal func_802400E0_A671E0 /* A67558 80240458 0240202D */ daddu $a0, $s2, $zero /* A6755C 8024045C 0040202D */ daddu $a0, $v0, $zero @@ -35,7 +35,7 @@ glabel func_80240414_A67514 /* A6758C 8024048C 3C01C1A0 */ lui $at, 0xc1a0 /* A67590 80240490 44812000 */ mtc1 $at, $f4 /* A67594 80240494 44833000 */ mtc1 $v1, $f6 -/* A67598 80240498 00000000 */ nop +/* A67598 80240498 00000000 */ nop /* A6759C 8024049C 468031A0 */ cvt.s.w $f6, $f6 /* A675A0 802404A0 44073000 */ mfc1 $a3, $f6 /* A675A4 802404A4 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_8024063C_A6773C.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_8024063C_A6773C.s index ef55705f30..7bd01ce918 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_8024063C_A6773C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_8024063C_A6773C.s @@ -47,7 +47,7 @@ glabel func_8024063C_A6773C /* A677E0 802406E0 8E6200B0 */ lw $v0, 0xb0($s3) /* A677E4 802406E4 30420004 */ andi $v0, $v0, 4 /* A677E8 802406E8 10400019 */ beqz $v0, .L80240750 -/* A677EC 802406EC 00000000 */ nop +/* A677EC 802406EC 00000000 */ nop .L802406F0: /* A677F0 802406F0 34630102 */ ori $v1, $v1, 0x102 /* A677F4 802406F4 AEE00070 */ sw $zero, 0x70($s7) @@ -83,12 +83,12 @@ glabel func_8024063C_A6773C /* A67868 80240768 10600007 */ beqz $v1, .L80240788 /* A6786C 8024076C 0000102D */ daddu $v0, $zero, $zero /* A67870 80240770 080902D3 */ j .L80240B4C -/* A67874 80240774 00000000 */ nop +/* A67874 80240774 00000000 */ nop .L80240778: /* A67878 80240778 1062005B */ beq $v1, $v0, .L802408E8 /* A6787C 8024077C 0000102D */ daddu $v0, $zero, $zero /* A67880 80240780 080902D3 */ j .L80240B4C -/* A67884 80240784 00000000 */ nop +/* A67884 80240784 00000000 */ nop .L80240788: /* A67888 80240788 8E420000 */ lw $v0, ($s2) /* A6788C 8024078C 0240202D */ daddu $a0, $s2, $zero @@ -131,17 +131,17 @@ glabel func_8024063C_A6773C /* A6791C 8024081C C6400038 */ lwc1 $f0, 0x38($s2) /* A67920 80240820 4600020D */ trunc.w.s $f8, $f0 /* A67924 80240824 44024000 */ mfc1 $v0, $f8 -/* A67928 80240828 00000000 */ nop +/* A67928 80240828 00000000 */ nop /* A6792C 8024082C A6620010 */ sh $v0, 0x10($s3) /* A67930 80240830 C640003C */ lwc1 $f0, 0x3c($s2) /* A67934 80240834 4600020D */ trunc.w.s $f8, $f0 /* A67938 80240838 44024000 */ mfc1 $v0, $f8 -/* A6793C 8024083C 00000000 */ nop +/* A6793C 8024083C 00000000 */ nop /* A67940 80240840 A6620012 */ sh $v0, 0x12($s3) /* A67944 80240844 C6400040 */ lwc1 $f0, 0x40($s2) /* A67948 80240848 4600020D */ trunc.w.s $f8, $f0 /* A6794C 8024084C 44024000 */ mfc1 $v0, $f8 -/* A67950 80240850 00000000 */ nop +/* A67950 80240850 00000000 */ nop /* A67954 80240854 A6620014 */ sh $v0, 0x14($s3) /* A67958 80240858 AE400044 */ sw $zero, 0x44($s2) /* A6795C 8024085C AE400048 */ sw $zero, 0x48($s2) @@ -187,10 +187,10 @@ glabel func_8024063C_A6773C /* A679F8 802408F8 44810800 */ mtc1 $at, $f1 /* A679FC 802408FC 44800000 */ mtc1 $zero, $f0 /* A67A00 80240900 44821000 */ mtc1 $v0, $f2 -/* A67A04 80240904 00000000 */ nop +/* A67A04 80240904 00000000 */ nop /* A67A08 80240908 468010A1 */ cvt.d.w $f2, $f2 /* A67A0C 8024090C 46201082 */ mul.d $f2, $f2, $f0 -/* A67A10 80240910 00000000 */ nop +/* A67A10 80240910 00000000 */ nop /* A67A14 80240914 0200282D */ daddu $a1, $s0, $zero /* A67A18 80240918 C6440038 */ lwc1 $f4, 0x38($s2) /* A67A1C 8024091C C640003C */ lwc1 $f0, 0x3c($s2) @@ -210,13 +210,13 @@ glabel func_8024063C_A6773C /* A67A54 80240954 864200A6 */ lh $v0, 0xa6($s2) /* A67A58 80240958 27B40028 */ addiu $s4, $sp, 0x28 /* A67A5C 8024095C 44820000 */ mtc1 $v0, $f0 -/* A67A60 80240960 00000000 */ nop +/* A67A60 80240960 00000000 */ nop /* A67A64 80240964 46800020 */ cvt.s.w $f0, $f0 /* A67A68 80240968 E7A00018 */ swc1 $f0, 0x18($sp) /* A67A6C 8024096C 864200A8 */ lh $v0, 0xa8($s2) /* A67A70 80240970 0280382D */ daddu $a3, $s4, $zero /* A67A74 80240974 44820000 */ mtc1 $v0, $f0 -/* A67A78 80240978 00000000 */ nop +/* A67A78 80240978 00000000 */ nop /* A67A7C 8024097C 46800020 */ cvt.s.w $f0, $f0 /* A67A80 80240980 0C0376B9 */ jal func_800DDAE4 /* A67A84 80240984 E7A0001C */ swc1 $f0, 0x1c($sp) @@ -240,14 +240,14 @@ glabel func_8024063C_A6773C /* A67AC8 802409C8 0C0372DF */ jal func_800DCB7C /* A67ACC 802409CC 0280382D */ daddu $a3, $s4, $zero /* A67AD0 802409D0 10400019 */ beqz $v0, .L80240A38 -/* A67AD4 802409D4 00000000 */ nop +/* A67AD4 802409D4 00000000 */ nop /* A67AD8 802409D8 C640001C */ lwc1 $f0, 0x1c($s2) /* A67ADC 802409DC C7A2002C */ lwc1 $f2, 0x2c($sp) /* A67AE0 802409E0 46000005 */ abs.s $f0, $f0 /* A67AE4 802409E4 4600103C */ c.lt.s $f2, $f0 -/* A67AE8 802409E8 00000000 */ nop +/* A67AE8 802409E8 00000000 */ nop /* A67AEC 802409EC 45000012 */ bc1f .L80240A38 -/* A67AF0 802409F0 00000000 */ nop +/* A67AF0 802409F0 00000000 */ nop /* A67AF4 802409F4 C7A40024 */ lwc1 $f4, 0x24($sp) /* A67AF8 802409F8 C6400064 */ lwc1 $f0, 0x64($s2) /* A67AFC 802409FC 46002001 */ sub.s $f0, $f4, $f0 @@ -257,7 +257,7 @@ glabel func_8024063C_A6773C /* A67B0C 80240A0C 46000005 */ abs.s $f0, $f0 /* A67B10 80240A10 46000021 */ cvt.d.s $f0, $f0 /* A67B14 80240A14 4622003C */ c.lt.d $f0, $f2 -/* A67B18 80240A18 00000000 */ nop +/* A67B18 80240A18 00000000 */ nop /* A67B1C 80240A1C 45000006 */ bc1f .L80240A38 /* A67B20 80240A20 0240202D */ daddu $a0, $s2, $zero /* A67B24 80240A24 8E450018 */ lw $a1, 0x18($s2) @@ -272,7 +272,7 @@ glabel func_8024063C_A6773C /* A67B44 80240A44 44801000 */ mtc1 $zero, $f2 /* A67B48 80240A48 46000021 */ cvt.d.s $f0, $f0 /* A67B4C 80240A4C 4622003C */ c.lt.d $f0, $f2 -/* A67B50 80240A50 00000000 */ nop +/* A67B50 80240A50 00000000 */ nop /* A67B54 80240A54 45030001 */ bc1tl .L80240A5C /* A67B58 80240A58 2416000B */ addiu $s6, $zero, 0xb .L80240A5C: @@ -288,7 +288,7 @@ glabel func_8024063C_A6773C /* A67B7C 80240A7C 8E620070 */ lw $v0, 0x70($s3) /* A67B80 80240A80 30420001 */ andi $v0, $v0, 1 /* A67B84 80240A84 10400009 */ beqz $v0, .L80240AAC -/* A67B88 80240A88 00000000 */ nop +/* A67B88 80240A88 00000000 */ nop /* A67B8C 80240A8C C640004C */ lwc1 $f0, 0x4c($s2) /* A67B90 80240A90 3C014044 */ lui $at, 0x4044 /* A67B94 80240A94 44811800 */ mtc1 $at, $f3 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240B78_A67C78.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240B78_A67C78.s index ba126b448d..8e73b913bc 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240B78_A67C78.s +++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240B78_A67C78.s @@ -50,7 +50,7 @@ glabel func_80240B78_A67C78 .L80240C24: /* A67D24 80240C24 86240008 */ lh $a0, 8($s1) /* A67D28 80240C28 0C00FB5A */ jal get_enemy_safe -/* A67D2C 80240C2C 00000000 */ nop +/* A67D2C 80240C2C 00000000 */ nop /* A67D30 80240C30 14400005 */ bnez $v0, .L80240C48 /* A67D34 80240C34 0260202D */ daddu $a0, $s3, $zero /* A67D38 80240C38 3C05FE36 */ lui $a1, 0xfe36 @@ -60,7 +60,7 @@ glabel func_80240B78_A67C78 .L80240C48: /* A67D48 80240C48 86240008 */ lh $a0, 8($s1) /* A67D4C 80240C4C 0C00EABB */ jal get_npc_unsafe -/* A67D50 80240C50 00000000 */ nop +/* A67D50 80240C50 00000000 */ nop /* A67D54 80240C54 8E630070 */ lw $v1, 0x70($s3) /* A67D58 80240C58 10600006 */ beqz $v1, .L80240C74 /* A67D5C 80240C5C 0040802D */ daddu $s0, $v0, $zero @@ -68,7 +68,7 @@ glabel func_80240B78_A67C78 /* A67D64 80240C64 1062003F */ beq $v1, $v0, .L80240D64 /* A67D68 80240C68 0000102D */ daddu $v0, $zero, $zero /* A67D6C 80240C6C 080903EA */ j .L80240FA8 -/* A67D70 80240C70 00000000 */ nop +/* A67D70 80240C70 00000000 */ nop .L80240C74: /* A67D74 80240C74 AFA00010 */ sw $zero, 0x10($sp) /* A67D78 80240C78 AFA00014 */ sw $zero, 0x14($sp) @@ -79,7 +79,7 @@ glabel func_80240B78_A67C78 /* A67D8C 80240C8C 24040002 */ addiu $a0, $zero, 2 /* A67D90 80240C90 C64C006C */ lwc1 $f12, 0x6c($s2) /* A67D94 80240C94 0C00A6C9 */ jal clamp_angle -/* A67D98 80240C98 00000000 */ nop +/* A67D98 80240C98 00000000 */ nop /* A67D9C 80240C9C 3C018024 */ lui $at, %hi(D_802439F0) /* A67DA0 80240CA0 D43839F0 */ ldc1 $f24, %lo(D_802439F0)($at) /* A67DA4 80240CA4 46000521 */ cvt.d.s $f20, $f0 @@ -107,7 +107,7 @@ glabel func_80240B78_A67C78 /* A67DFC 80240CFC 46000306 */ mov.s $f12, $f0 /* A67E00 80240D00 46000021 */ cvt.d.s $f0, $f0 /* A67E04 80240D04 4638003C */ c.lt.d $f0, $f24 -/* A67E08 80240D08 00000000 */ nop +/* A67E08 80240D08 00000000 */ nop /* A67E0C 80240D0C 45020002 */ bc1fl .L80240D18 /* A67E10 80240D10 E614000C */ swc1 $f20, 0xc($s0) /* A67E14 80240D14 E616000C */ swc1 $f22, 0xc($s0) @@ -117,7 +117,7 @@ glabel func_80240B78_A67C78 /* A67E20 80240D20 D4223A00 */ ldc1 $f2, %lo(D_80243A00)($at) /* A67E24 80240D24 46000021 */ cvt.d.s $f0, $f0 /* A67E28 80240D28 46220002 */ mul.d $f0, $f0, $f2 -/* A67E2C 80240D2C 00000000 */ nop +/* A67E2C 80240D2C 00000000 */ nop /* A67E30 80240D30 3C013F66 */ lui $at, 0x3f66 /* A67E34 80240D34 34216666 */ ori $at, $at, 0x6666 /* A67E38 80240D38 44812000 */ mtc1 $at, $f4 @@ -147,13 +147,13 @@ glabel func_80240B78_A67C78 /* A67E94 80240D94 860200A6 */ lh $v0, 0xa6($s0) /* A67E98 80240D98 27A60024 */ addiu $a2, $sp, 0x24 /* A67E9C 80240D9C 44820000 */ mtc1 $v0, $f0 -/* A67EA0 80240DA0 00000000 */ nop +/* A67EA0 80240DA0 00000000 */ nop /* A67EA4 80240DA4 46800020 */ cvt.s.w $f0, $f0 /* A67EA8 80240DA8 E7A00018 */ swc1 $f0, 0x18($sp) /* A67EAC 80240DAC 860200A8 */ lh $v0, 0xa8($s0) /* A67EB0 80240DB0 27A70028 */ addiu $a3, $sp, 0x28 /* A67EB4 80240DB4 44820000 */ mtc1 $v0, $f0 -/* A67EB8 80240DB8 00000000 */ nop +/* A67EB8 80240DB8 00000000 */ nop /* A67EBC 80240DBC 46800020 */ cvt.s.w $f0, $f0 /* A67EC0 80240DC0 0C037711 */ jal func_800DDC44 /* A67EC4 80240DC4 E7A0001C */ swc1 $f0, 0x1c($sp) @@ -173,7 +173,7 @@ glabel func_80240B78_A67C78 /* A67EF4 80240DF4 44801800 */ mtc1 $zero, $f3 /* A67EF8 80240DF8 46000021 */ cvt.d.s $f0, $f0 /* A67EFC 80240DFC 4622003C */ c.lt.d $f0, $f2 -/* A67F00 80240E00 00000000 */ nop +/* A67F00 80240E00 00000000 */ nop /* A67F04 80240E04 45000028 */ bc1f .L80240EA8 /* A67F08 80240E08 27A50020 */ addiu $a1, $sp, 0x20 /* A67F0C 80240E0C 27A60024 */ addiu $a2, $sp, 0x24 @@ -204,7 +204,7 @@ glabel func_80240B78_A67C78 /* A67F70 80240E70 0C0372DF */ jal func_800DCB7C /* A67F74 80240E74 27A70028 */ addiu $a3, $sp, 0x28 /* A67F78 80240E78 1040000B */ beqz $v0, .L80240EA8 -/* A67F7C 80240E7C 00000000 */ nop +/* A67F7C 80240E7C 00000000 */ nop /* A67F80 80240E80 C600001C */ lwc1 $f0, 0x1c($s0) /* A67F84 80240E84 C7A2002C */ lwc1 $f2, 0x2c($sp) /* A67F88 80240E88 46000005 */ abs.s $f0, $f0 @@ -212,7 +212,7 @@ glabel func_80240B78_A67C78 /* A67F90 80240E90 46340000 */ add.d $f0, $f0, $f20 /* A67F94 80240E94 460010A1 */ cvt.d.s $f2, $f2 /* A67F98 80240E98 4620103E */ c.le.d $f2, $f0 -/* A67F9C 80240E9C 00000000 */ nop +/* A67F9C 80240E9C 00000000 */ nop /* A67FA0 80240EA0 45030001 */ bc1tl .L80240EA8 /* A67FA4 80240EA4 24120001 */ addiu $s2, $zero, 1 .L80240EA8: @@ -234,7 +234,7 @@ glabel func_80240B78_A67C78 /* A67FE0 80240EE0 2414000B */ addiu $s4, $zero, 0xb .L80240EE4: /* A67FE4 80240EE4 12800024 */ beqz $s4, .L80240F78 -/* A67FE8 80240EE8 00000000 */ nop +/* A67FE8 80240EE8 00000000 */ nop /* A67FEC 80240EEC AFA00010 */ sw $zero, 0x10($sp) /* A67FF0 80240EF0 AFA00014 */ sw $zero, 0x14($sp) /* A67FF4 80240EF4 8E050038 */ lw $a1, 0x38($s0) @@ -268,7 +268,7 @@ glabel func_80240B78_A67C78 /* A68064 80240F64 AC800070 */ sw $zero, 0x70($a0) .L80240F68: /* A68068 80240F68 0C0B2026 */ jal set_variable -/* A6806C 80240F6C 00000000 */ nop +/* A6806C 80240F6C 00000000 */ nop /* A68070 80240F70 080903EA */ j .L80240FA8 /* A68074 80240F74 24020002 */ addiu $v0, $zero, 2 .L80240F78: diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s index 5349ae3aba..a04b4398ad 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s @@ -103,41 +103,48 @@ glabel func_80240FD4_A680D4 /* A68244 80241144 2C620064 */ sltiu $v0, $v1, 0x64 /* A68248 80241148 10400060 */ beqz $v0, .L802412CC /* A6824C 8024114C 00031080 */ sll $v0, $v1, 2 -/* A68250 80241150 3C018024 */ lui $at, %hi(D_80243A08) +/* A68250 80241150 3C018024 */ lui $at, %hi(jtbl_80243A08_A6AB08) /* A68254 80241154 00220821 */ addu $at, $at, $v0 -/* A68258 80241158 8C223A08 */ lw $v0, %lo(D_80243A08)($at) +/* A68258 80241158 8C223A08 */ lw $v0, %lo(jtbl_80243A08_A6AB08)($at) /* A6825C 8024115C 00400008 */ jr $v0 /* A68260 80241160 00000000 */ nop +glabel L80241164_A68264 /* A68264 80241164 0260202D */ daddu $a0, $s3, $zero /* A68268 80241168 0200282D */ daddu $a1, $s0, $zero /* A6826C 8024116C 0C012568 */ jal func_800495A0 /* A68270 80241170 02A0302D */ daddu $a2, $s5, $zero +glabel L80241174_A68274 /* A68274 80241174 0260202D */ daddu $a0, $s3, $zero /* A68278 80241178 0200282D */ daddu $a1, $s0, $zero /* A6827C 8024117C 0C0125AE */ jal func_800496B8 /* A68280 80241180 02A0302D */ daddu $a2, $s5, $zero /* A68284 80241184 080904B3 */ j .L802412CC /* A68288 80241188 00000000 */ nop +glabel L8024118C_A6828C /* A6828C 8024118C 0260202D */ daddu $a0, $s3, $zero /* A68290 80241190 0200282D */ daddu $a1, $s0, $zero /* A68294 80241194 0C0126D1 */ jal base_UnkNpcAIFunc1 /* A68298 80241198 02A0302D */ daddu $a2, $s5, $zero +glabel L8024119C_A6829C /* A6829C 8024119C 0260202D */ daddu $a0, $s3, $zero /* A682A0 802411A0 0200282D */ daddu $a1, $s0, $zero /* A682A4 802411A4 0C012701 */ jal func_80049C04 /* A682A8 802411A8 02A0302D */ daddu $a2, $s5, $zero /* A682AC 802411AC 080904B3 */ j .L802412CC /* A682B0 802411B0 00000000 */ nop +glabel L802411B4_A682B4 /* A682B4 802411B4 0260202D */ daddu $a0, $s3, $zero /* A682B8 802411B8 0200282D */ daddu $a1, $s0, $zero /* A682BC 802411BC 0C01278F */ jal func_80049E3C /* A682C0 802411C0 02A0302D */ daddu $a2, $s5, $zero +glabel L802411C4_A682C4 /* A682C4 802411C4 0260202D */ daddu $a0, $s3, $zero /* A682C8 802411C8 0200282D */ daddu $a1, $s0, $zero /* A682CC 802411CC 0C0127B3 */ jal func_80049ECC /* A682D0 802411D0 02A0302D */ daddu $a2, $s5, $zero /* A682D4 802411D4 080904B3 */ j .L802412CC /* A682D8 802411D8 00000000 */ nop +glabel L802411DC_A682DC /* A682DC 802411DC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A682E0 802411E0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A682E4 802411E4 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -170,37 +177,45 @@ glabel func_80240FD4_A680D4 /* A68348 80241248 0200282D */ daddu $a1, $s0, $zero /* A6834C 8024124C 0C0127DF */ jal func_80049F7C /* A68350 80241250 02A0302D */ daddu $a2, $s5, $zero +glabel L80241254_A68354 /* A68354 80241254 0260202D */ daddu $a0, $s3, $zero /* A68358 80241258 0200282D */ daddu $a1, $s0, $zero /* A6835C 8024125C 0C012849 */ jal func_8004A124 /* A68360 80241260 02A0302D */ daddu $a2, $s5, $zero /* A68364 80241264 080904B3 */ j .L802412CC /* A68368 80241268 00000000 */ nop +glabel L8024126C_A6836C /* A6836C 8024126C 0260202D */ daddu $a0, $s3, $zero /* A68370 80241270 0200282D */ daddu $a1, $s0, $zero /* A68374 80241274 0C0128FA */ jal func_8004A3E8 /* A68378 80241278 02A0302D */ daddu $a2, $s5, $zero /* A6837C 8024127C 080904B3 */ j .L802412CC /* A68380 80241280 00000000 */ nop +glabel L80241284_A68384 /* A68384 80241284 0C090105 */ jal func_80240414_A67514 /* A68388 80241288 0260202D */ daddu $a0, $s3, $zero /* A6838C 8024128C 080904B3 */ j .L802412CC /* A68390 80241290 00000000 */ nop +glabel L80241294_A68394 /* A68394 80241294 0C090145 */ jal kpa_52_UnkSetDurationFunc /* A68398 80241298 0260202D */ daddu $a0, $s3, $zero /* A6839C 8024129C 080904B3 */ j .L802412CC /* A683A0 802412A0 00000000 */ nop +glabel L802412A4_A683A4 /* A683A4 802412A4 0C090156 */ jal kpa_52_UnkNpcAIFunc9 /* A683A8 802412A8 0260202D */ daddu $a0, $s3, $zero /* A683AC 802412AC 080904B3 */ j .L802412CC /* A683B0 802412B0 00000000 */ nop +glabel L802412B4_A683B4 /* A683B4 802412B4 0C09017E */ jal kpa_52_UnkDurationCheck /* A683B8 802412B8 0260202D */ daddu $a0, $s3, $zero /* A683BC 802412BC 080904B3 */ j .L802412CC /* A683C0 802412C0 00000000 */ nop +glabel L802412C4_A683C4 /* A683C4 802412C4 0C0129CF */ jal func_8004A73C /* A683C8 802412C8 0260202D */ daddu $a0, $s3, $zero .L802412CC: +glabel L802412CC_A683CC /* A683CC 802412CC 8FBF0048 */ lw $ra, 0x48($sp) /* A683D0 802412D0 8FB50044 */ lw $s5, 0x44($sp) /* A683D4 802412D4 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_53/A6ACA0/func_80240050_A6ACF0.s b/asm/nonmatchings/world/area_kpa/kpa_53/A6ACA0/func_80240050_A6ACF0.s index 72c865d449..5c1b529ce2 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_53/A6ACA0/func_80240050_A6ACF0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_53/A6ACA0/func_80240050_A6ACF0.s @@ -26,26 +26,26 @@ glabel func_80240050_A6ACF0 /* A6AD44 802400A4 D4221E50 */ ldc1 $f2, %lo(func_80241E50_A4A410)($at) /* A6AD48 802400A8 4600010D */ trunc.w.s $f4, $f0 /* A6AD4C 802400AC 44022000 */ mfc1 $v0, $f4 -/* A6AD50 802400B0 00000000 */ nop +/* A6AD50 802400B0 00000000 */ nop /* A6AD54 802400B4 2442FD44 */ addiu $v0, $v0, -0x2bc /* A6AD58 802400B8 44820000 */ mtc1 $v0, $f0 -/* A6AD5C 802400BC 00000000 */ nop +/* A6AD5C 802400BC 00000000 */ nop /* A6AD60 802400C0 46800021 */ cvt.d.w $f0, $f0 /* A6AD64 802400C4 46220002 */ mul.d $f0, $f0, $f2 -/* A6AD68 802400C8 00000000 */ nop +/* A6AD68 802400C8 00000000 */ nop /* A6AD6C 802400CC 4620010D */ trunc.w.d $f4, $f0 /* A6AD70 802400D0 44022000 */ mfc1 $v0, $f4 -/* A6AD74 802400D4 00000000 */ nop +/* A6AD74 802400D4 00000000 */ nop /* A6AD78 802400D8 244202FD */ addiu $v0, $v0, 0x2fd /* A6AD7C 802400DC 44820000 */ mtc1 $v0, $f0 -/* A6AD80 802400E0 00000000 */ nop +/* A6AD80 802400E0 00000000 */ nop /* A6AD84 802400E4 46800020 */ cvt.s.w $f0, $f0 /* A6AD88 802400E8 E4600038 */ swc1 $f0, 0x38($v1) /* A6AD8C 802400EC C6020054 */ lwc1 $f2, 0x54($s0) /* A6AD90 802400F0 44800000 */ mtc1 $zero, $f0 -/* A6AD94 802400F4 00000000 */ nop +/* A6AD94 802400F4 00000000 */ nop /* A6AD98 802400F8 46001032 */ c.eq.s $f2, $f0 -/* A6AD9C 802400FC 00000000 */ nop +/* A6AD9C 802400FC 00000000 */ nop /* A6ADA0 80240100 45000003 */ bc1f .L80240110 /* A6ADA4 80240104 3C02000A */ lui $v0, 0xa /* A6ADA8 80240108 0809004D */ j .L80240134 @@ -53,9 +53,9 @@ glabel func_80240050_A6ACF0 .L80240110: /* A6ADB0 80240110 3C014000 */ lui $at, 0x4000 /* A6ADB4 80240114 44810000 */ mtc1 $at, $f0 -/* A6ADB8 80240118 00000000 */ nop +/* A6ADB8 80240118 00000000 */ nop /* A6ADBC 8024011C 4600103C */ c.lt.s $f2, $f0 -/* A6ADC0 80240120 00000000 */ nop +/* A6ADC0 80240120 00000000 */ nop /* A6ADC4 80240124 45000003 */ bc1f .L80240134 /* A6ADC8 80240128 34420003 */ ori $v0, $v0, 3 /* A6ADCC 8024012C 3C02000A */ lui $v0, 0xa @@ -76,4 +76,4 @@ glabel func_80240050_A6ACF0 /* A6AE00 80240160 8FB00010 */ lw $s0, 0x10($sp) /* A6AE04 80240164 03E00008 */ jr $ra /* A6AE08 80240168 27BD0020 */ addiu $sp, $sp, 0x20 -/* A6AE0C 8024016C 00000000 */ nop +/* A6AE0C 8024016C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024038C_A6E76C.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024038C_A6E76C.s index 91ea1a1789..56621a023f 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024038C_A6E76C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024038C_A6E76C.s @@ -21,11 +21,11 @@ glabel func_8024038C_A6E76C /* A6E7AC 802403CC A602008E */ sh $v0, 0x8e($s0) /* A6E7B0 802403D0 00021400 */ sll $v0, $v0, 0x10 /* A6E7B4 802403D4 1C400033 */ bgtz $v0, .L802404A4 -/* A6E7B8 802403D8 00000000 */ nop +/* A6E7B8 802403D8 00000000 */ nop .L802403DC: /* A6E7BC 802403DC 8602008C */ lh $v0, 0x8c($s0) /* A6E7C0 802403E0 14400030 */ bnez $v0, .L802404A4 -/* A6E7C4 802403E4 00000000 */ nop +/* A6E7C4 802403E4 00000000 */ nop /* A6E7C8 802403E8 8E2200CC */ lw $v0, 0xcc($s1) /* A6E7CC 802403EC 8C420024 */ lw $v0, 0x24($v0) /* A6E7D0 802403F0 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_8024038C_A6E76C /* A6E7DC 802403FC 8E230088 */ lw $v1, 0x88($s1) /* A6E7E0 80240400 24020005 */ addiu $v0, $zero, 5 /* A6E7E4 80240404 10620005 */ beq $v1, $v0, .L8024041C -/* A6E7E8 80240408 00000000 */ nop +/* A6E7E8 80240408 00000000 */ nop /* A6E7EC 8024040C 10600003 */ beqz $v1, .L8024041C /* A6E7F0 80240410 24020001 */ addiu $v0, $zero, 1 /* A6E7F4 80240414 14620006 */ bne $v1, $v0, .L80240430 -/* A6E7F8 80240418 00000000 */ nop +/* A6E7F8 80240418 00000000 */ nop .L8024041C: /* A6E7FC 8024041C 8E220084 */ lw $v0, 0x84($s1) /* A6E800 80240420 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_8024038C_A6E76C /* A6E840 80240460 46220000 */ add.d $f0, $f0, $f2 /* A6E844 80240464 4620010D */ trunc.w.d $f4, $f0 /* A6E848 80240468 44022000 */ mfc1 $v0, $f4 -/* A6E84C 8024046C 00000000 */ nop +/* A6E84C 8024046C 00000000 */ nop /* A6E850 80240470 A602008E */ sh $v0, 0x8e($s0) /* A6E854 80240474 00021400 */ sll $v0, $v0, 0x10 /* A6E858 80240478 8E230078 */ lw $v1, 0x78($s1) /* A6E85C 8024047C 00021403 */ sra $v0, $v0, 0x10 /* A6E860 80240480 0043102A */ slt $v0, $v0, $v1 /* A6E864 80240484 10400003 */ beqz $v0, .L80240494 -/* A6E868 80240488 00000000 */ nop +/* A6E868 80240488 00000000 */ nop /* A6E86C 8024048C 9622007A */ lhu $v0, 0x7a($s1) /* A6E870 80240490 A602008E */ sh $v0, 0x8e($s0) .L80240494: diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s index 200425ef5f..97c076ee83 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s @@ -279,15 +279,17 @@ glabel func_802406A4_A6EA84 /* A6EE70 80240A90 2C620015 */ sltiu $v0, $v1, 0x15 /* A6EE74 80240A94 10400009 */ beqz $v0, .L80240ABC /* A6EE78 80240A98 00031080 */ sll $v0, $v1, 2 -/* A6EE7C 80240A9C 3C018024 */ lui $at, %hi(D_80243CD8) +/* A6EE7C 80240A9C 3C018024 */ lui $at, %hi(jtbl_80243CD8_A720B8) /* A6EE80 80240AA0 00220821 */ addu $at, $at, $v0 -/* A6EE84 80240AA4 8C223CD8 */ lw $v0, %lo(D_80243CD8)($at) +/* A6EE84 80240AA4 8C223CD8 */ lw $v0, %lo(jtbl_80243CD8_A720B8)($at) /* A6EE88 80240AA8 00400008 */ jr $v0 /* A6EE8C 80240AAC 00000000 */ nop +glabel L80240AB0_A6EE90 /* A6EE90 80240AB0 8E420028 */ lw $v0, 0x28($s2) /* A6EE94 80240AB4 24420001 */ addiu $v0, $v0, 1 /* A6EE98 80240AB8 AE420028 */ sw $v0, 0x28($s2) .L80240ABC: +glabel L80240ABC_A6EE9C /* A6EE9C 80240ABC 0000102D */ daddu $v0, $zero, $zero .L80240AC0: /* A6EEA0 80240AC0 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240AE4_A6EEC4.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240AE4_A6EEC4.s index 10f116da0d..9c1615b3ec 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240AE4_A6EEC4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240AE4_A6EEC4.s @@ -41,16 +41,16 @@ glabel func_80240AE4_A6EEC4 /* A6EF54 80240B74 3C014387 */ lui $at, 0x4387 /* A6EF58 80240B78 4481A000 */ mtc1 $at, $f20 /* A6EF5C 80240B7C 0C00A70A */ jal get_clamped_angle_diff -/* A6EF60 80240B80 00000000 */ nop +/* A6EF60 80240B80 00000000 */ nop /* A6EF64 80240B84 0C00A6C9 */ jal clamp_angle /* A6EF68 80240B88 46000306 */ mov.s $f12, $f0 /* A6EF6C 80240B8C 3C018024 */ lui $at, %hi(D_80243D30) /* A6EF70 80240B90 D4223D30 */ ldc1 $f2, %lo(D_80243D30)($at) /* A6EF74 80240B94 46000021 */ cvt.d.s $f0, $f0 /* A6EF78 80240B98 4622003C */ c.lt.d $f0, $f2 -/* A6EF7C 80240B9C 00000000 */ nop +/* A6EF7C 80240B9C 00000000 */ nop /* A6EF80 80240BA0 45000003 */ bc1f .L80240BB0 -/* A6EF84 80240BA4 00000000 */ nop +/* A6EF84 80240BA4 00000000 */ nop /* A6EF88 80240BA8 3C0142B4 */ lui $at, 0x42b4 /* A6EF8C 80240BAC 4481A000 */ mtc1 $at, $f20 .L80240BB0: @@ -70,7 +70,7 @@ glabel func_80240AE4_A6EEC4 /* A6EFC4 80240BE4 D4223D38 */ ldc1 $f2, %lo(D_80243D38)($at) /* A6EFC8 80240BE8 46000021 */ cvt.d.s $f0, $f0 /* A6EFCC 80240BEC 4620103C */ c.lt.d $f2, $f0 -/* A6EFD0 80240BF0 00000000 */ nop +/* A6EFD0 80240BF0 00000000 */ nop /* A6EFD4 80240BF4 45010027 */ bc1t .L80240C94 /* A6EFD8 80240BF8 2402FFFF */ addiu $v0, $zero, -1 /* A6EFDC 80240BFC 8E020000 */ lw $v0, ($s0) @@ -83,7 +83,7 @@ glabel func_80240AE4_A6EEC4 /* A6EFF8 80240C18 46000005 */ abs.s $f0, $f0 /* A6EFFC 80240C1C 44060000 */ mfc1 $a2, $f0 /* A6F000 80240C20 0C00A720 */ jal atan2 -/* A6F004 80240C24 00000000 */ nop +/* A6F004 80240C24 00000000 */ nop /* A6F008 80240C28 3C018024 */ lui $at, %hi(D_80243D40) /* A6F00C 80240C2C D4223D40 */ ldc1 $f2, %lo(D_80243D40)($at) /* A6F010 80240C30 46000021 */ cvt.d.s $f0, $f0 @@ -94,7 +94,7 @@ glabel func_80240AE4_A6EEC4 /* A6F024 80240C44 46000005 */ abs.s $f0, $f0 /* A6F028 80240C48 46000021 */ cvt.d.s $f0, $f0 /* A6F02C 80240C4C 4620103C */ c.lt.d $f2, $f0 -/* A6F030 80240C50 00000000 */ nop +/* A6F030 80240C50 00000000 */ nop /* A6F034 80240C54 4501000F */ bc1t .L80240C94 /* A6F038 80240C58 2402FFFF */ addiu $v0, $zero, -1 /* A6F03C 80240C5C 3C038011 */ lui $v1, %hi(D_8010EBB3) diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240CB4_A6F094.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240CB4_A6F094.s index ecc90629a3..3e5d3209bd 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240CB4_A6F094.s +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240CB4_A6F094.s @@ -30,7 +30,7 @@ glabel func_80240CB4_A6F094 /* A6F0F8 80240D18 8E4200B0 */ lw $v0, 0xb0($s2) /* A6F0FC 80240D1C 30420004 */ andi $v0, $v0, 4 /* A6F100 80240D20 10400018 */ beqz $v0, .L80240D84 -/* A6F104 80240D24 00000000 */ nop +/* A6F104 80240D24 00000000 */ nop .L80240D28: /* A6F108 80240D28 3C030024 */ lui $v1, 0x24 /* A6F10C 80240D2C 34630102 */ ori $v1, $v1, 0x102 @@ -60,11 +60,12 @@ glabel func_80240CB4_A6F094 /* A6F168 80240D88 2C620005 */ sltiu $v0, $v1, 5 /* A6F16C 80240D8C 10400101 */ beqz $v0, .L80241194 /* A6F170 80240D90 00031080 */ sll $v0, $v1, 2 -/* A6F174 80240D94 3C018024 */ lui $at, %hi(D_80243D50) +/* A6F174 80240D94 3C018024 */ lui $at, %hi(jtbl_80243D50_A72130) /* A6F178 80240D98 00220821 */ addu $at, $at, $v0 -/* A6F17C 80240D9C 8C223D50 */ lw $v0, %lo(D_80243D50)($at) +/* A6F17C 80240D9C 8C223D50 */ lw $v0, %lo(jtbl_80243D50_A72130)($at) /* A6F180 80240DA0 00400008 */ jr $v0 -/* A6F184 80240DA4 00000000 */ nop +/* A6F184 80240DA4 00000000 */ nop +glabel L80240DA8_A6F188 /* A6F188 80240DA8 3C01C47A */ lui $at, 0xc47a /* A6F18C 80240DAC 44810000 */ mtc1 $at, $f0 /* A6F190 80240DB0 24020014 */ addiu $v0, $zero, 0x14 @@ -77,6 +78,7 @@ glabel func_80240CB4_A6F094 /* A6F1AC 80240DCC E620003C */ swc1 $f0, 0x3c($s1) /* A6F1B0 80240DD0 AE40006C */ sw $zero, 0x6c($s2) /* A6F1B4 80240DD4 AEC20070 */ sw $v0, 0x70($s6) +glabel L80240DD8_A6F1B8 /* A6F1B8 80240DD8 8E50006C */ lw $s0, 0x6c($s2) /* A6F1BC 80240DDC 24020001 */ addiu $v0, $zero, 1 /* A6F1C0 80240DE0 160200EC */ bne $s0, $v0, .L80241194 @@ -91,7 +93,7 @@ glabel func_80240CB4_A6F094 /* A6F1E4 80240E04 C6820034 */ lwc1 $f2, 0x34($s4) /* A6F1E8 80240E08 3C014387 */ lui $at, 0x4387 /* A6F1EC 80240E0C 44810000 */ mtc1 $at, $f0 -/* A6F1F0 80240E10 00000000 */ nop +/* A6F1F0 80240E10 00000000 */ nop /* A6F1F4 80240E14 46020001 */ sub.s $f0, $f0, $f2 /* A6F1F8 80240E18 C6480074 */ lwc1 $f8, 0x74($s2) /* A6F1FC 80240E1C 46804220 */ cvt.s.w $f8, $f8 @@ -118,20 +120,20 @@ glabel func_80240CB4_A6F094 /* A6F250 80240E70 44811000 */ mtc1 $at, $f2 /* A6F254 80240E74 4600020D */ trunc.w.s $f8, $f0 /* A6F258 80240E78 44024000 */ mfc1 $v0, $f8 -/* A6F25C 80240E7C 00000000 */ nop +/* A6F25C 80240E7C 00000000 */ nop /* A6F260 80240E80 A6420010 */ sh $v0, 0x10($s2) /* A6F264 80240E84 C620003C */ lwc1 $f0, 0x3c($s1) /* A6F268 80240E88 3C13800F */ lui $s3, %hi(gPlayerStatusPtr) /* A6F26C 80240E8C 26737B30 */ addiu $s3, $s3, %lo(gPlayerStatusPtr) /* A6F270 80240E90 4600020D */ trunc.w.s $f8, $f0 /* A6F274 80240E94 44024000 */ mfc1 $v0, $f8 -/* A6F278 80240E98 00000000 */ nop +/* A6F278 80240E98 00000000 */ nop /* A6F27C 80240E9C A6420012 */ sh $v0, 0x12($s2) /* A6F280 80240EA0 C6200040 */ lwc1 $f0, 0x40($s1) /* A6F284 80240EA4 8E630000 */ lw $v1, ($s3) /* A6F288 80240EA8 4600020D */ trunc.w.s $f8, $f0 /* A6F28C 80240EAC 44024000 */ mfc1 $v0, $f8 -/* A6F290 80240EB0 00000000 */ nop +/* A6F290 80240EB0 00000000 */ nop /* A6F294 80240EB4 A6420014 */ sh $v0, 0x14($s2) /* A6F298 80240EB8 E6220018 */ swc1 $f2, 0x18($s1) /* A6F29C 80240EBC C460002C */ lwc1 $f0, 0x2c($v1) @@ -147,7 +149,7 @@ glabel func_80240CB4_A6F094 /* A6F2C4 80240EE4 44070000 */ mfc1 $a3, $f0 /* A6F2C8 80240EE8 44061000 */ mfc1 $a2, $f2 /* A6F2CC 80240EEC 0C00A720 */ jal atan2 -/* A6F2D0 80240EF0 00000000 */ nop +/* A6F2D0 80240EF0 00000000 */ nop /* A6F2D4 80240EF4 3C018024 */ lui $at, %hi(D_80243D68) /* A6F2D8 80240EF8 D4223D68 */ ldc1 $f2, %lo(D_80243D68)($at) /* A6F2DC 80240EFC 46000021 */ cvt.d.s $f0, $f0 @@ -155,13 +157,13 @@ glabel func_80240CB4_A6F094 /* A6F2E4 80240F04 46200020 */ cvt.s.d $f0, $f0 /* A6F2E8 80240F08 4600020D */ trunc.w.s $f8, $f0 /* A6F2EC 80240F0C 44044000 */ mfc1 $a0, $f8 -/* A6F2F0 80240F10 00000000 */ nop +/* A6F2F0 80240F10 00000000 */ nop /* A6F2F4 80240F14 00042400 */ sll $a0, $a0, 0x10 /* A6F2F8 80240F18 0C00A4F5 */ jal cosine /* A6F2FC 80240F1C 00042403 */ sra $a0, $a0, 0x10 /* A6F300 80240F20 C6220018 */ lwc1 $f2, 0x18($s1) /* A6F304 80240F24 46020002 */ mul.s $f0, $f0, $f2 -/* A6F308 80240F28 00000000 */ nop +/* A6F308 80240F28 00000000 */ nop /* A6F30C 80240F2C C62C0038 */ lwc1 $f12, 0x38($s1) /* A6F310 80240F30 C62E0040 */ lwc1 $f14, 0x40($s1) /* A6F314 80240F34 8E620000 */ lw $v0, ($s3) @@ -187,7 +189,7 @@ glabel func_80240CB4_A6F094 /* A6F364 80240F84 46020003 */ div.s $f0, $f0, $f2 /* A6F368 80240F88 4600020D */ trunc.w.s $f8, $f0 /* A6F36C 80240F8C 44104000 */ mfc1 $s0, $f8 -/* A6F370 80240F90 00000000 */ nop +/* A6F370 80240F90 00000000 */ nop /* A6F374 80240F94 5A000001 */ blezl $s0, .L80240F9C /* A6F378 80240F98 24100001 */ addiu $s0, $zero, 1 .L80240F9C: @@ -201,7 +203,7 @@ glabel func_80240CB4_A6F094 /* A6F398 80240FB8 46020000 */ add.s $f0, $f0, $f2 /* A6F39C 80240FBC 3C014160 */ lui $at, 0x4160 /* A6F3A0 80240FC0 44811000 */ mtc1 $at, $f2 -/* A6F3A4 80240FC4 00000000 */ nop +/* A6F3A4 80240FC4 00000000 */ nop /* A6F3A8 80240FC8 46022100 */ add.s $f4, $f4, $f2 /* A6F3AC 80240FCC 46020000 */ add.s $f0, $f0, $f2 /* A6F3B0 80240FD0 44062000 */ mfc1 $a2, $f4 @@ -217,6 +219,7 @@ glabel func_80240CB4_A6F094 /* A6F3D8 80240FF8 A630008E */ sh $s0, 0x8e($s1) /* A6F3DC 80240FFC 08090465 */ j .L80241194 /* A6F3E0 80241000 AED50070 */ sw $s5, 0x70($s6) +glabel L80241004_A6F3E4 /* A6F3E4 80241004 9622008E */ lhu $v0, 0x8e($s1) /* A6F3E8 80241008 2442FFFF */ addiu $v0, $v0, -1 /* A6F3EC 8024100C A622008E */ sh $v0, 0x8e($s1) @@ -225,7 +228,7 @@ glabel func_80240CB4_A6F094 /* A6F3F8 80241018 24150014 */ addiu $s5, $zero, 0x14 .L8024101C: /* A6F3FC 8024101C 16A0000A */ bnez $s5, .L80241048 -/* A6F400 80241020 00000000 */ nop +/* A6F400 80241020 00000000 */ nop /* A6F404 80241024 8E250018 */ lw $a1, 0x18($s1) /* A6F408 80241028 8E26000C */ lw $a2, 0xc($s1) /* A6F40C 8024102C 0C00EA95 */ jal npc_move_heading @@ -236,15 +239,16 @@ glabel func_80240CB4_A6F094 /* A6F420 80241040 08090465 */ j .L80241194 /* A6F424 80241044 E620003C */ swc1 $f0, 0x3c($s1) .L80241048: +glabel L80241048_A6F428 /* A6F428 80241048 862200A8 */ lh $v0, 0xa8($s1) /* A6F42C 8024104C 3C013FE0 */ lui $at, 0x3fe0 /* A6F430 80241050 44810800 */ mtc1 $at, $f1 /* A6F434 80241054 44800000 */ mtc1 $zero, $f0 /* A6F438 80241058 44821000 */ mtc1 $v0, $f2 -/* A6F43C 8024105C 00000000 */ nop +/* A6F43C 8024105C 00000000 */ nop /* A6F440 80241060 468010A1 */ cvt.d.w $f2, $f2 /* A6F444 80241064 46201082 */ mul.d $f2, $f2, $f0 -/* A6F448 80241068 00000000 */ nop +/* A6F448 80241068 00000000 */ nop /* A6F44C 8024106C C620003C */ lwc1 $f0, 0x3c($s1) /* A6F450 80241070 AE20001C */ sw $zero, 0x1c($s1) /* A6F454 80241074 46000021 */ cvt.d.s $f0, $f0 @@ -258,6 +262,7 @@ glabel func_80240CB4_A6F094 /* A6F474 80241094 A620008E */ sh $zero, 0x8e($s1) /* A6F478 80241098 08090465 */ j .L80241194 /* A6F47C 8024109C AEC20070 */ sw $v0, 0x70($s6) +glabel L802410A0_A6F480 /* A6F480 802410A0 9622008E */ lhu $v0, 0x8e($s1) /* A6F484 802410A4 24420001 */ addiu $v0, $v0, 1 /* A6F488 802410A8 A622008E */ sh $v0, 0x8e($s1) @@ -271,17 +276,17 @@ glabel func_80240CB4_A6F094 /* A6F4A8 802410C8 44810800 */ mtc1 $at, $f1 /* A6F4AC 802410CC 44800000 */ mtc1 $zero, $f0 /* A6F4B0 802410D0 44822000 */ mtc1 $v0, $f4 -/* A6F4B4 802410D4 00000000 */ nop +/* A6F4B4 802410D4 00000000 */ nop /* A6F4B8 802410D8 46802120 */ cvt.s.w $f4, $f4 /* A6F4BC 802410DC 46002121 */ cvt.d.s $f4, $f4 /* A6F4C0 802410E0 46202102 */ mul.d $f4, $f4, $f0 -/* A6F4C4 802410E4 00000000 */ nop +/* A6F4C4 802410E4 00000000 */ nop /* A6F4C8 802410E8 44821000 */ mtc1 $v0, $f2 -/* A6F4CC 802410EC 00000000 */ nop +/* A6F4CC 802410EC 00000000 */ nop /* A6F4D0 802410F0 468010A0 */ cvt.s.w $f2, $f2 /* A6F4D4 802410F4 460010A1 */ cvt.d.s $f2, $f2 /* A6F4D8 802410F8 46201082 */ mul.d $f2, $f2, $f0 -/* A6F4DC 802410FC 00000000 */ nop +/* A6F4DC 802410FC 00000000 */ nop /* A6F4E0 80241100 C620003C */ lwc1 $f0, 0x3c($s1) /* A6F4E4 80241104 3C01400C */ lui $at, 0x400c /* A6F4E8 80241108 44813800 */ mtc1 $at, $f7 @@ -291,14 +296,14 @@ glabel func_80240CB4_A6F094 /* A6F4F8 80241118 3C014034 */ lui $at, 0x4034 /* A6F4FC 8024111C 44813800 */ mtc1 $at, $f7 /* A6F500 80241120 44803000 */ mtc1 $zero, $f6 -/* A6F504 80241124 00000000 */ nop +/* A6F504 80241124 00000000 */ nop /* A6F508 80241128 46262100 */ add.d $f4, $f4, $f6 /* A6F50C 8024112C 46200020 */ cvt.s.d $f0, $f0 /* A6F510 80241130 E620003C */ swc1 $f0, 0x3c($s1) /* A6F514 80241134 46261080 */ add.d $f2, $f2, $f6 /* A6F518 80241138 4620220D */ trunc.w.d $f8, $f4 /* A6F51C 8024113C 44024000 */ mfc1 $v0, $f8 -/* A6F520 80241140 00000000 */ nop +/* A6F520 80241140 00000000 */ nop /* A6F524 80241144 A62200A6 */ sh $v0, 0xa6($s1) /* A6F528 80241148 4620120D */ trunc.w.d $f8, $f2 /* A6F52C 8024114C 44024000 */ mfc1 $v0, $f8 @@ -318,7 +323,7 @@ glabel func_80240CB4_A6F094 /* A6F560 80241180 E620003C */ swc1 $f0, 0x3c($s1) .L80241184: /* A6F564 80241184 14400003 */ bnez $v0, .L80241194 -/* A6F568 80241188 00000000 */ nop +/* A6F568 80241188 00000000 */ nop /* A6F56C 8024118C AE40006C */ sw $zero, 0x6c($s2) /* A6F570 80241190 AEC00070 */ sw $zero, 0x70($s6) .L80241194: diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241200_A6F5E0.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241200_A6F5E0.s index 781060ade8..7a7ca6872e 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241200_A6F5E0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241200_A6F5E0.s @@ -33,7 +33,7 @@ glabel func_80241200_A6F5E0 /* A6F650 80241270 44801000 */ mtc1 $zero, $f2 /* A6F654 80241274 46000021 */ cvt.d.s $f0, $f0 /* A6F658 80241278 46220002 */ mul.d $f0, $f0, $f2 -/* A6F65C 8024127C 00000000 */ nop +/* A6F65C 8024127C 00000000 */ nop /* A6F660 80241280 4600A0A1 */ cvt.d.s $f2, $f20 /* A6F664 80241284 46201080 */ add.d $f2, $f2, $f0 /* A6F668 80241288 462010A0 */ cvt.s.d $f2, $f2 @@ -41,7 +41,7 @@ glabel func_80241200_A6F5E0 /* A6F670 80241290 8E02006C */ lw $v0, 0x6c($s0) /* A6F674 80241294 2442000A */ addiu $v0, $v0, 0xa /* A6F678 80241298 44826000 */ mtc1 $v0, $f12 -/* A6F67C 8024129C 00000000 */ nop +/* A6F67C 8024129C 00000000 */ nop /* A6F680 802412A0 0C00A6C9 */ jal clamp_angle /* A6F684 802412A4 46806320 */ cvt.s.w $f12, $f12 /* A6F688 802412A8 4600018D */ trunc.w.s $f6, $f0 @@ -66,7 +66,7 @@ glabel func_80241200_A6F5E0 /* A6F6D4 802412F4 2402000F */ addiu $v0, $zero, 0xf /* A6F6D8 802412F8 AFA2001C */ sw $v0, 0x1c($sp) /* A6F6DC 802412FC 44833000 */ mtc1 $v1, $f6 -/* A6F6E0 80241300 00000000 */ nop +/* A6F6E0 80241300 00000000 */ nop /* A6F6E4 80241304 468031A0 */ cvt.s.w $f6, $f6 /* A6F6E8 80241308 44073000 */ mfc1 $a3, $f6 /* A6F6EC 8024130C 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024138C_A6F76C.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024138C_A6F76C.s index 436b1c01a5..8c5b55cd88 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024138C_A6F76C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024138C_A6F76C.s @@ -48,7 +48,7 @@ glabel func_8024138C_A6F76C /* A6F818 80241438 46800020 */ cvt.s.w $f0, $f0 /* A6F81C 8024143C E7A00018 */ swc1 $f0, 0x18($sp) /* A6F820 80241440 44820000 */ mtc1 $v0, $f0 -/* A6F824 80241444 00000000 */ nop +/* A6F824 80241444 00000000 */ nop /* A6F828 80241448 46800021 */ cvt.d.w $f0, $f0 /* A6F82C 8024144C 46360000 */ add.d $f0, $f0, $f22 /* A6F830 80241450 8C840018 */ lw $a0, 0x18($a0) @@ -56,7 +56,7 @@ glabel func_8024138C_A6F76C /* A6F838 80241458 0C0123F5 */ jal is_point_within_region /* A6F83C 8024145C 46200520 */ cvt.s.d $f20, $f0 /* A6F840 80241460 10400023 */ beqz $v0, .L802414F0 -/* A6F844 80241464 00000000 */ nop +/* A6F844 80241464 00000000 */ nop /* A6F848 80241468 C60C0038 */ lwc1 $f12, 0x38($s0) /* A6F84C 8024146C 8EA200D0 */ lw $v0, 0xd0($s5) /* A6F850 80241470 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -67,9 +67,9 @@ glabel func_8024138C_A6F76C /* A6F864 80241484 468052A0 */ cvt.s.w $f10, $f10 /* A6F868 80241488 44075000 */ mfc1 $a3, $f10 /* A6F86C 8024148C 0C00A720 */ jal atan2 -/* A6F870 80241490 00000000 */ nop +/* A6F870 80241490 00000000 */ nop /* A6F874 80241494 44931000 */ mtc1 $s3, $f2 -/* A6F878 80241498 00000000 */ nop +/* A6F878 80241498 00000000 */ nop /* A6F87C 8024149C 468010A0 */ cvt.s.w $f2, $f2 /* A6F880 802414A0 46020001 */ sub.s $f0, $f0, $f2 /* A6F884 802414A4 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -83,10 +83,10 @@ glabel func_8024138C_A6F76C /* A6F8A4 802414C4 468052A0 */ cvt.s.w $f10, $f10 /* A6F8A8 802414C8 44075000 */ mfc1 $a3, $f10 /* A6F8AC 802414CC 0C00A7B5 */ jal dist2D -/* A6F8B0 802414D0 00000000 */ nop +/* A6F8B0 802414D0 00000000 */ nop /* A6F8B4 802414D4 46000106 */ mov.s $f4, $f0 /* A6F8B8 802414D8 4614003C */ c.lt.s $f0, $f20 -/* A6F8BC 802414DC 00000000 */ nop +/* A6F8BC 802414DC 00000000 */ nop /* A6F8C0 802414E0 4503006A */ bc1tl .L8024168C /* A6F8C4 802414E4 46002506 */ mov.s $f20, $f4 /* A6F8C8 802414E8 080905A4 */ j .L80241690 @@ -101,7 +101,7 @@ glabel func_8024138C_A6F76C /* A6F8E8 80241508 8C470030 */ lw $a3, 0x30($v0) /* A6F8EC 8024150C 460000A1 */ cvt.d.s $f2, $f0 /* A6F8F0 80241510 4636103C */ c.lt.d $f2, $f22 -/* A6F8F4 80241514 00000000 */ nop +/* A6F8F4 80241514 00000000 */ nop /* A6F8F8 80241518 45000006 */ bc1f .L80241534 /* A6F8FC 8024151C E600000C */ swc1 $f0, 0xc($s0) /* A6F900 80241520 0C00A67F */ jal rand_int @@ -116,28 +116,28 @@ glabel func_8024138C_A6F76C /* A6F920 80241540 D4203D80 */ ldc1 $f0, %lo(D_80243D80)($at) .L80241544: /* A6F924 80241544 44821000 */ mtc1 $v0, $f2 -/* A6F928 80241548 00000000 */ nop +/* A6F928 80241548 00000000 */ nop /* A6F92C 8024154C 468010A1 */ cvt.d.w $f2, $f2 /* A6F930 80241550 46201080 */ add.d $f2, $f2, $f0 /* A6F934 80241554 3C014014 */ lui $at, 0x4014 /* A6F938 80241558 44810800 */ mtc1 $at, $f1 /* A6F93C 8024155C 44800000 */ mtc1 $zero, $f0 -/* A6F940 80241560 00000000 */ nop +/* A6F940 80241560 00000000 */ nop /* A6F944 80241564 46201081 */ sub.d $f2, $f2, $f0 /* A6F948 80241568 462015A0 */ cvt.s.d $f22, $f2 /* A6F94C 8024156C 00141080 */ sll $v0, $s4, 2 /* A6F950 80241570 00548821 */ addu $s1, $v0, $s4 .L80241574: /* A6F954 80241574 12400006 */ beqz $s2, .L80241590 -/* A6F958 80241578 00000000 */ nop +/* A6F958 80241578 00000000 */ nop /* A6F95C 8024157C 44910000 */ mtc1 $s1, $f0 -/* A6F960 80241580 00000000 */ nop +/* A6F960 80241580 00000000 */ nop /* A6F964 80241584 46800020 */ cvt.s.w $f0, $f0 /* A6F968 80241588 08090568 */ j .L802415A0 /* A6F96C 8024158C 4600B000 */ add.s $f0, $f22, $f0 .L80241590: /* A6F970 80241590 44910000 */ mtc1 $s1, $f0 -/* A6F974 80241594 00000000 */ nop +/* A6F974 80241594 00000000 */ nop /* A6F978 80241598 46800020 */ cvt.s.w $f0, $f0 /* A6F97C 8024159C 4600B001 */ sub.s $f0, $f22, $f0 .L802415A0: @@ -156,13 +156,13 @@ glabel func_8024138C_A6F76C /* A6F9B0 802415D0 860200A8 */ lh $v0, 0xa8($s0) /* A6F9B4 802415D4 27A60024 */ addiu $a2, $sp, 0x24 /* A6F9B8 802415D8 44820000 */ mtc1 $v0, $f0 -/* A6F9BC 802415DC 00000000 */ nop +/* A6F9BC 802415DC 00000000 */ nop /* A6F9C0 802415E0 46800020 */ cvt.s.w $f0, $f0 /* A6F9C4 802415E4 E7A00018 */ swc1 $f0, 0x18($sp) /* A6F9C8 802415E8 860200A6 */ lh $v0, 0xa6($s0) /* A6F9CC 802415EC 27A70028 */ addiu $a3, $sp, 0x28 /* A6F9D0 802415F0 44820000 */ mtc1 $v0, $f0 -/* A6F9D4 802415F4 00000000 */ nop +/* A6F9D4 802415F4 00000000 */ nop /* A6F9D8 802415F8 46800020 */ cvt.s.w $f0, $f0 /* A6F9DC 802415FC 0C0376B9 */ jal func_800DDAE4 /* A6F9E0 80241600 E7A0001C */ swc1 $f0, 0x1c($sp) @@ -179,11 +179,11 @@ glabel func_8024138C_A6F76C /* A6FA0C 8024162C 44801000 */ mtc1 $zero, $f2 /* A6FA10 80241630 46002021 */ cvt.d.s $f0, $f4 /* A6FA14 80241634 4620103C */ c.lt.d $f2, $f0 -/* A6FA18 80241638 00000000 */ nop +/* A6FA18 80241638 00000000 */ nop /* A6FA1C 8024163C 45000006 */ bc1f .L80241658 -/* A6FA20 80241640 00000000 */ nop +/* A6FA20 80241640 00000000 */ nop /* A6FA24 80241644 4614203C */ c.lt.s $f4, $f20 -/* A6FA28 80241648 00000000 */ nop +/* A6FA28 80241648 00000000 */ nop /* A6FA2C 8024164C 45030001 */ bc1tl .L80241654 /* A6FA30 80241650 46002506 */ mov.s $f20, $f4 .L80241654: @@ -203,7 +203,7 @@ glabel func_8024138C_A6F76C /* A6FA5C 8024167C 5040FFBD */ beql $v0, $zero, .L80241574 /* A6FA60 80241680 24130003 */ addiu $s3, $zero, 3 /* A6FA64 80241684 0809055D */ j .L80241574 -/* A6FA68 80241688 00000000 */ nop +/* A6FA68 80241688 00000000 */ nop .L8024168C: /* A6FA6C 8024168C 27A40020 */ addiu $a0, $sp, 0x20 .L80241690: @@ -221,7 +221,7 @@ glabel func_8024138C_A6F76C /* A6FA9C 802416BC 44804000 */ mtc1 $zero, $f8 /* A6FAA0 802416C0 46000021 */ cvt.d.s $f0, $f0 /* A6FAA4 802416C4 46280002 */ mul.d $f0, $f0, $f8 -/* A6FAA8 802416C8 00000000 */ nop +/* A6FAA8 802416C8 00000000 */ nop /* A6FAAC 802416CC C7A20020 */ lwc1 $f2, 0x20($sp) /* A6FAB0 802416D0 C604003C */ lwc1 $f4, 0x3c($s0) /* A6FAB4 802416D4 C7A60028 */ lwc1 $f6, 0x28($sp) @@ -233,7 +233,7 @@ glabel func_8024138C_A6F76C /* A6FACC 802416EC C6000040 */ lwc1 $f0, 0x40($s0) /* A6FAD0 802416F0 46000021 */ cvt.d.s $f0, $f0 /* A6FAD4 802416F4 46280002 */ mul.d $f0, $f0, $f8 -/* A6FAD8 802416F8 00000000 */ nop +/* A6FAD8 802416F8 00000000 */ nop /* A6FADC 802416FC 4620028D */ trunc.w.d $f10, $f0 /* A6FAE0 80241700 E6AA0084 */ swc1 $f10, 0x84($s5) /* A6FAE4 80241704 0C00A67F */ jal rand_int diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024177C_A6FB5C.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024177C_A6FB5C.s index 35d1437fa6..161031b1ae 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024177C_A6FB5C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024177C_A6FB5C.s @@ -23,16 +23,16 @@ glabel func_8024177C_A6FB5C /* A6FBA4 802417C4 4480B000 */ mtc1 $zero, $f22 /* A6FBA8 802417C8 2463000A */ addiu $v1, $v1, 0xa /* A6FBAC 802417CC 44836000 */ mtc1 $v1, $f12 -/* A6FBB0 802417D0 00000000 */ nop +/* A6FBB0 802417D0 00000000 */ nop /* A6FBB4 802417D4 46806320 */ cvt.s.w $f12, $f12 /* A6FBB8 802417D8 4636A503 */ div.d $f20, $f20, $f22 /* A6FBBC 802417DC 0C00A6C9 */ jal clamp_angle /* A6FBC0 802417E0 4620A520 */ cvt.s.d $f20, $f20 /* A6FBC4 802417E4 4600010D */ trunc.w.s $f4, $f0 /* A6FBC8 802417E8 44022000 */ mfc1 $v0, $f4 -/* A6FBCC 802417EC 00000000 */ nop +/* A6FBCC 802417EC 00000000 */ nop /* A6FBD0 802417F0 44826000 */ mtc1 $v0, $f12 -/* A6FBD4 802417F4 00000000 */ nop +/* A6FBD4 802417F4 00000000 */ nop /* A6FBD8 802417F8 46806320 */ cvt.s.w $f12, $f12 /* A6FBDC 802417FC 0C00A8BB */ jal sin_deg /* A6FBE0 80241800 AE22006C */ sw $v0, 0x6c($s1) @@ -41,7 +41,7 @@ glabel func_8024177C_A6FB5C /* A6FBEC 8024180C 44801000 */ mtc1 $zero, $f2 /* A6FBF0 80241810 46000021 */ cvt.d.s $f0, $f0 /* A6FBF4 80241814 46220002 */ mul.d $f0, $f0, $f2 -/* A6FBF8 80241818 00000000 */ nop +/* A6FBF8 80241818 00000000 */ nop /* A6FBFC 8024181C 4600A0A1 */ cvt.d.s $f2, $f20 /* A6FC00 80241820 46201080 */ add.d $f2, $f2, $f0 /* A6FC04 80241824 8602008C */ lh $v0, 0x8c($s0) @@ -50,7 +50,7 @@ glabel func_8024177C_A6FB5C /* A6FC10 80241830 E600003C */ swc1 $f0, 0x3c($s0) /* A6FC14 80241834 46000021 */ cvt.d.s $f0, $f0 /* A6FC18 80241838 46360002 */ mul.d $f0, $f0, $f22 -/* A6FC1C 8024183C 00000000 */ nop +/* A6FC1C 8024183C 00000000 */ nop /* A6FC20 80241840 24020011 */ addiu $v0, $zero, 0x11 /* A6FC24 80241844 4620010D */ trunc.w.d $f4, $f0 /* A6FC28 80241848 E6240080 */ swc1 $f4, 0x80($s1) diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241870_A6FC50.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241870_A6FC50.s index 1fa5c8f37c..d45d61ccb3 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241870_A6FC50.s +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241870_A6FC50.s @@ -62,17 +62,17 @@ glabel func_80241870_A6FC50 /* A6FD34 80241954 3C018024 */ lui $at, %hi(D_80243D88) /* A6FD38 80241958 D4343D88 */ ldc1 $f20, %lo(D_80243D88)($at) /* A6FD3C 8024195C 44821000 */ mtc1 $v0, $f2 -/* A6FD40 80241960 00000000 */ nop +/* A6FD40 80241960 00000000 */ nop /* A6FD44 80241964 468010A1 */ cvt.d.w $f2, $f2 /* A6FD48 80241968 4620A003 */ div.d $f0, $f20, $f0 /* A6FD4C 8024196C 46201082 */ mul.d $f2, $f2, $f0 -/* A6FD50 80241970 00000000 */ nop +/* A6FD50 80241970 00000000 */ nop /* A6FD54 80241974 4620110D */ trunc.w.d $f4, $f2 /* A6FD58 80241978 44022000 */ mfc1 $v0, $f4 -/* A6FD5C 8024197C 00000000 */ nop +/* A6FD5C 8024197C 00000000 */ nop /* A6FD60 80241980 244200B4 */ addiu $v0, $v0, 0xb4 /* A6FD64 80241984 44826000 */ mtc1 $v0, $f12 -/* A6FD68 80241988 00000000 */ nop +/* A6FD68 80241988 00000000 */ nop /* A6FD6C 8024198C 0C00A8BB */ jal sin_deg /* A6FD70 80241990 46806320 */ cvt.s.w $f12, $f12 /* A6FD74 80241994 3C014039 */ lui $at, 0x4039 @@ -80,7 +80,7 @@ glabel func_80241870_A6FC50 /* A6FD7C 8024199C 44801000 */ mtc1 $zero, $f2 /* A6FD80 802419A0 46000021 */ cvt.d.s $f0, $f0 /* A6FD84 802419A4 46220002 */ mul.d $f0, $f0, $f2 -/* A6FD88 802419A8 00000000 */ nop +/* A6FD88 802419A8 00000000 */ nop /* A6FD8C 802419AC 9602008E */ lhu $v0, 0x8e($s0) /* A6FD90 802419B0 4600B0A1 */ cvt.d.s $f2, $f22 /* A6FD94 802419B4 24420001 */ addiu $v0, $v0, 1 @@ -93,7 +93,7 @@ glabel func_80241870_A6FC50 /* A6FDB0 802419D0 00021403 */ sra $v0, $v0, 0x10 /* A6FDB4 802419D4 2463FFF8 */ addiu $v1, $v1, -8 /* A6FDB8 802419D8 14430009 */ bne $v0, $v1, .L80241A00 -/* A6FDBC 802419DC 00000000 */ nop +/* A6FDBC 802419DC 00000000 */ nop /* A6FDC0 802419E0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A6FDC4 802419E4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A6FDC8 802419E8 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -105,7 +105,7 @@ glabel func_80241870_A6FC50 .L80241A00: /* A6FDE0 80241A00 C600003C */ lwc1 $f0, 0x3c($s0) /* A6FDE4 80241A04 4600C03E */ c.le.s $f24, $f0 -/* A6FDE8 80241A08 00000000 */ nop +/* A6FDE8 80241A08 00000000 */ nop /* A6FDEC 80241A0C 45000004 */ bc1f .L80241A20 /* A6FDF0 80241A10 2402000A */ addiu $v0, $zero, 0xa /* A6FDF4 80241A14 E618003C */ swc1 $f24, 0x3c($s0) @@ -116,24 +116,24 @@ glabel func_80241870_A6FC50 /* A6FE04 80241A24 8E230078 */ lw $v1, 0x78($s1) /* A6FE08 80241A28 0043102A */ slt $v0, $v0, $v1 /* A6FE0C 80241A2C 14400018 */ bnez $v0, .L80241A90 -/* A6FE10 80241A30 00000000 */ nop +/* A6FE10 80241A30 00000000 */ nop /* A6FE14 80241A34 8E23006C */ lw $v1, 0x6c($s1) /* A6FE18 80241A38 44831000 */ mtc1 $v1, $f2 -/* A6FE1C 80241A3C 00000000 */ nop +/* A6FE1C 80241A3C 00000000 */ nop /* A6FE20 80241A40 468010A1 */ cvt.d.w $f2, $f2 /* A6FE24 80241A44 4622A03E */ c.le.d $f20, $f2 -/* A6FE28 80241A48 00000000 */ nop +/* A6FE28 80241A48 00000000 */ nop /* A6FE2C 80241A4C 4500000F */ bc1f .L80241A8C /* A6FE30 80241A50 2402000A */ addiu $v0, $zero, 0xa /* A6FE34 80241A54 3C018024 */ lui $at, %hi(D_80243D90) /* A6FE38 80241A58 D4203D90 */ ldc1 $f0, %lo(D_80243D90)($at) /* A6FE3C 80241A5C 4620103C */ c.lt.d $f2, $f0 -/* A6FE40 80241A60 00000000 */ nop +/* A6FE40 80241A60 00000000 */ nop /* A6FE44 80241A64 45000008 */ bc1f .L80241A88 /* A6FE48 80241A68 2402021C */ addiu $v0, $zero, 0x21c /* A6FE4C 80241A6C 00431023 */ subu $v0, $v0, $v1 /* A6FE50 80241A70 44826000 */ mtc1 $v0, $f12 -/* A6FE54 80241A74 00000000 */ nop +/* A6FE54 80241A74 00000000 */ nop /* A6FE58 80241A78 0C00A6C9 */ jal clamp_angle /* A6FE5C 80241A7C 46806320 */ cvt.s.w $f12, $f12 /* A6FE60 80241A80 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241AF0_A6FED0.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241AF0_A6FED0.s index 931c98fc50..11beba746e 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241AF0_A6FED0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241AF0_A6FED0.s @@ -36,7 +36,7 @@ glabel func_80241AF0_A6FED0 /* A6FF4C 80241B6C 3C01C1A0 */ lui $at, 0xc1a0 /* A6FF50 80241B70 44812000 */ mtc1 $at, $f4 /* A6FF54 80241B74 44824000 */ mtc1 $v0, $f8 -/* A6FF58 80241B78 00000000 */ nop +/* A6FF58 80241B78 00000000 */ nop /* A6FF5C 80241B7C 46804220 */ cvt.s.w $f8, $f8 /* A6FF60 80241B80 44074000 */ mfc1 $a3, $f8 /* A6FF64 80241B84 2402000C */ addiu $v0, $zero, 0xc @@ -62,7 +62,7 @@ glabel func_80241AF0_A6FED0 /* A6FFB0 80241BD0 0260382D */ daddu $a3, $s3, $zero /* A6FFB4 80241BD4 24030001 */ addiu $v1, $zero, 1 /* A6FFB8 80241BD8 1443002F */ bne $v0, $v1, .L80241C98 -/* A6FFBC 80241BDC 00000000 */ nop +/* A6FFBC 80241BDC 00000000 */ nop /* A6FFC0 80241BE0 8602008C */ lh $v0, 0x8c($s0) /* A6FFC4 80241BE4 1440002C */ bnez $v0, .L80241C98 /* A6FFC8 80241BE8 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241CBC_A7009C.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241CBC_A7009C.s index d156b7c39d..089dc08608 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241CBC_A7009C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241CBC_A7009C.s @@ -16,7 +16,7 @@ glabel func_80241CBC_A7009C /* A700C8 80241CE8 A482008E */ sh $v0, 0x8e($a0) /* A700CC 80241CEC 00021400 */ sll $v0, $v0, 0x10 /* A700D0 80241CF0 1C400008 */ bgtz $v0, .L80241D14 -/* A700D4 80241CF4 00000000 */ nop +/* A700D4 80241CF4 00000000 */ nop /* A700D8 80241CF8 8E0200CC */ lw $v0, 0xcc($s0) /* A700DC 80241CFC 8C430024 */ lw $v1, 0x24($v0) /* A700E0 80241D00 24020007 */ addiu $v0, $zero, 7 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241D28_A70108.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241D28_A70108.s index 7b54def682..0bca3ef9dd 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241D28_A70108.s +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241D28_A70108.s @@ -21,7 +21,7 @@ glabel func_80241D28_A70108 /* A70148 80241D68 A602008E */ sh $v0, 0x8e($s0) /* A7014C 80241D6C 00021400 */ sll $v0, $v0, 0x10 /* A70150 80241D70 1C400032 */ bgtz $v0, .L80241E3C -/* A70154 80241D74 00000000 */ nop +/* A70154 80241D74 00000000 */ nop /* A70158 80241D78 0260202D */ daddu $a0, $s3, $zero /* A7015C 80241D7C 8E250024 */ lw $a1, 0x24($s1) /* A70160 80241D80 8E260028 */ lw $a2, 0x28($s1) @@ -43,7 +43,7 @@ glabel func_80241D28_A70108 /* A701A0 80241DC0 2402000C */ addiu $v0, $zero, 0xc /* A701A4 80241DC4 AFA2001C */ sw $v0, 0x1c($sp) /* A701A8 80241DC8 44833000 */ mtc1 $v1, $f6 -/* A701AC 80241DCC 00000000 */ nop +/* A701AC 80241DCC 00000000 */ nop /* A701B0 80241DD0 468031A0 */ cvt.s.w $f6, $f6 /* A701B4 80241DD4 44073000 */ mfc1 $a3, $f6 /* A701B8 80241DD8 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241E5C_A7023C.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241E5C_A7023C.s index c694f0ef3d..6fda56daa2 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241E5C_A7023C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241E5C_A7023C.s @@ -29,7 +29,7 @@ glabel func_80241E5C_A7023C /* A7029C 80241EBC 44801000 */ mtc1 $zero, $f2 /* A702A0 80241EC0 46000021 */ cvt.d.s $f0, $f0 /* A702A4 80241EC4 46220002 */ mul.d $f0, $f0, $f2 -/* A702A8 80241EC8 00000000 */ nop +/* A702A8 80241EC8 00000000 */ nop /* A702AC 80241ECC 4600A0A1 */ cvt.d.s $f2, $f20 /* A702B0 80241ED0 46201080 */ add.d $f2, $f2, $f0 /* A702B4 80241ED4 462010A0 */ cvt.s.d $f2, $f2 @@ -37,7 +37,7 @@ glabel func_80241E5C_A7023C /* A702BC 80241EDC 8E02006C */ lw $v0, 0x6c($s0) /* A702C0 80241EE0 2442000A */ addiu $v0, $v0, 0xa /* A702C4 80241EE4 44826000 */ mtc1 $v0, $f12 -/* A702C8 80241EE8 00000000 */ nop +/* A702C8 80241EE8 00000000 */ nop /* A702CC 80241EEC 0C00A6C9 */ jal clamp_angle /* A702D0 80241EF0 46806320 */ cvt.s.w $f12, $f12 /* A702D4 80241EF4 4600010D */ trunc.w.s $f4, $f0 @@ -47,7 +47,7 @@ glabel func_80241E5C_A7023C /* A702E4 80241F04 A622008E */ sh $v0, 0x8e($s1) /* A702E8 80241F08 00021400 */ sll $v0, $v0, 0x10 /* A702EC 80241F0C 1C400008 */ bgtz $v0, .L80241F30 -/* A702F0 80241F10 00000000 */ nop +/* A702F0 80241F10 00000000 */ nop /* A702F4 80241F14 8E0200CC */ lw $v0, 0xcc($s0) /* A702F8 80241F18 8C430000 */ lw $v1, ($v0) /* A702FC 80241F1C 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241F4C_A7032C.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241F4C_A7032C.s index 38520c22ec..ac43caa286 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241F4C_A7032C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241F4C_A7032C.s @@ -29,7 +29,7 @@ glabel func_80241F4C_A7032C /* A7038C 80241FAC 44801000 */ mtc1 $zero, $f2 /* A70390 80241FB0 46000021 */ cvt.d.s $f0, $f0 /* A70394 80241FB4 46220002 */ mul.d $f0, $f0, $f2 -/* A70398 80241FB8 00000000 */ nop +/* A70398 80241FB8 00000000 */ nop /* A7039C 80241FBC 4600A0A1 */ cvt.d.s $f2, $f20 /* A703A0 80241FC0 46201080 */ add.d $f2, $f2, $f0 /* A703A4 80241FC4 462010A0 */ cvt.s.d $f2, $f2 @@ -37,7 +37,7 @@ glabel func_80241F4C_A7032C /* A703AC 80241FCC 8E02006C */ lw $v0, 0x6c($s0) /* A703B0 80241FD0 2442000A */ addiu $v0, $v0, 0xa /* A703B4 80241FD4 44826000 */ mtc1 $v0, $f12 -/* A703B8 80241FD8 00000000 */ nop +/* A703B8 80241FD8 00000000 */ nop /* A703BC 80241FDC 0C00A6C9 */ jal clamp_angle /* A703C0 80241FE0 46806320 */ cvt.s.w $f12, $f12 /* A703C4 80241FE4 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422F0_A706D0.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422F0_A706D0.s index cb376faa52..efe5c7be29 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422F0_A706D0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422F0_A706D0.s @@ -12,7 +12,7 @@ glabel func_802422F0_A706D0 /* A706EC 8024230C 8E03006C */ lw $v1, 0x6c($s0) /* A706F0 80242310 24020002 */ addiu $v0, $zero, 2 /* A706F4 80242314 14620003 */ bne $v1, $v0, .L80242324 -/* A706F8 80242318 00000000 */ nop +/* A706F8 80242318 00000000 */ nop /* A706FC 8024231C AC80001C */ sw $zero, 0x1c($a0) /* A70700 80242320 AC800018 */ sw $zero, 0x18($a0) .L80242324: @@ -21,5 +21,5 @@ glabel func_802422F0_A706D0 /* A7070C 8024232C 24020002 */ addiu $v0, $zero, 2 /* A70710 80242330 03E00008 */ jr $ra /* A70714 80242334 27BD0018 */ addiu $sp, $sp, 0x18 -/* A70718 80242338 00000000 */ nop -/* A7071C 8024233C 00000000 */ nop +/* A70718 80242338 00000000 */ nop +/* A7071C 8024233C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/update_heroes_start_turn_A70404.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/update_heroes_start_turn_A70404.s index 61fff01fd8..7e46fd12af 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/update_heroes_start_turn_A70404.s +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/update_heroes_start_turn_A70404.s @@ -59,7 +59,7 @@ glabel update_heroes_start_turn_A70404 /* A704DC 802420FC 44801000 */ mtc1 $zero, $f2 /* A704E0 80242100 46000021 */ cvt.d.s $f0, $f0 /* A704E4 80242104 46220002 */ mul.d $f0, $f0, $f2 -/* A704E8 80242108 00000000 */ nop +/* A704E8 80242108 00000000 */ nop /* A704EC 8024210C 2402000A */ addiu $v0, $zero, 0xa /* A704F0 80242110 AE40006C */ sw $zero, 0x6c($s2) /* A704F4 80242114 AE400074 */ sw $zero, 0x74($s2) @@ -73,7 +73,7 @@ glabel update_heroes_start_turn_A70404 /* A70510 80242130 8E4300B0 */ lw $v1, 0xb0($s2) /* A70514 80242134 30620004 */ andi $v0, $v1, 4 /* A70518 80242138 10400007 */ beqz $v0, .L80242158 -/* A7051C 8024213C 00000000 */ nop +/* A7051C 8024213C 00000000 */ nop /* A70520 80242140 824200B4 */ lb $v0, 0xb4($s2) /* A70524 80242144 14400053 */ bnez $v0, .L80242294 /* A70528 80242148 0000102D */ daddu $v0, $zero, $zero @@ -86,21 +86,24 @@ glabel update_heroes_start_turn_A70404 /* A70540 80242160 2C620029 */ sltiu $v0, $v1, 0x29 /* A70544 80242164 1040004A */ beqz $v0, .L80242290 /* A70548 80242168 00031080 */ sll $v0, $v1, 2 -/* A7054C 8024216C 3C018024 */ lui $at, %hi(D_80243D98) +/* A7054C 8024216C 3C018024 */ lui $at, %hi(jtbl_80243D98_A72178) /* A70550 80242170 00220821 */ addu $at, $at, $v0 -/* A70554 80242174 8C223D98 */ lw $v0, %lo(D_80243D98)($at) +/* A70554 80242174 8C223D98 */ lw $v0, %lo(jtbl_80243D98_A72178)($at) /* A70558 80242178 00400008 */ jr $v0 -/* A7055C 8024217C 00000000 */ nop +/* A7055C 8024217C 00000000 */ nop +glabel L80242180_A70560 /* A70560 80242180 0280202D */ daddu $a0, $s4, $zero /* A70564 80242184 0200282D */ daddu $a1, $s0, $zero /* A70568 80242188 0C090471 */ jal func_802411C4_A6F5A4 /* A7056C 8024218C 0260302D */ daddu $a2, $s3, $zero +glabel L80242190_A70570 /* A70570 80242190 0280202D */ daddu $a0, $s4, $zero /* A70574 80242194 0200282D */ daddu $a1, $s0, $zero /* A70578 80242198 0C090480 */ jal func_80241200_A6F5E0 /* A7057C 8024219C 0260302D */ daddu $a2, $s3, $zero /* A70580 802421A0 080908A5 */ j .L80242294 /* A70584 802421A4 0000102D */ daddu $v0, $zero, $zero +glabel L802421A8_A70588 /* A70588 802421A8 0280202D */ daddu $a0, $s4, $zero /* A7058C 802421AC 0200282D */ daddu $a1, $s0, $zero /* A70590 802421B0 0C0904E3 */ jal func_8024138C_A6F76C @@ -109,6 +112,7 @@ glabel update_heroes_start_turn_A70404 /* A7059C 802421BC 24020010 */ addiu $v0, $zero, 0x10 /* A705A0 802421C0 14620034 */ bne $v1, $v0, .L80242294 /* A705A4 802421C4 0000102D */ daddu $v0, $zero, $zero +glabel L802421C8_A705A8 /* A705A8 802421C8 0280202D */ daddu $a0, $s4, $zero /* A705AC 802421CC 0200282D */ daddu $a1, $s0, $zero /* A705B0 802421D0 0C0905DF */ jal func_8024177C_A6FB5C @@ -117,30 +121,35 @@ glabel update_heroes_start_turn_A70404 /* A705BC 802421DC 24020011 */ addiu $v0, $zero, 0x11 /* A705C0 802421E0 1462002C */ bne $v1, $v0, .L80242294 /* A705C4 802421E4 0000102D */ daddu $v0, $zero, $zero +glabel L802421E8_A705C8 /* A705C8 802421E8 0280202D */ daddu $a0, $s4, $zero /* A705CC 802421EC 0200282D */ daddu $a1, $s0, $zero /* A705D0 802421F0 0C09061C */ jal func_80241870_A6FC50 /* A705D4 802421F4 0260302D */ daddu $a2, $s3, $zero /* A705D8 802421F8 080908A5 */ j .L80242294 /* A705DC 802421FC 0000102D */ daddu $v0, $zero, $zero +glabel L80242200_A705E0 /* A705E0 80242200 0280202D */ daddu $a0, $s4, $zero /* A705E4 80242204 0200282D */ daddu $a1, $s0, $zero /* A705E8 80242208 0C0906AD */ jal func_80241AB4_A6FE94 /* A705EC 8024220C 0260302D */ daddu $a2, $s3, $zero /* A705F0 80242210 080908A5 */ j .L80242294 /* A705F4 80242214 0000102D */ daddu $v0, $zero, $zero +glabel L80242218_A705F8 /* A705F8 80242218 0280202D */ daddu $a0, $s4, $zero /* A705FC 8024221C 0200282D */ daddu $a1, $s0, $zero /* A70600 80242220 0C0906BC */ jal func_80241AF0_A6FED0 /* A70604 80242224 0260302D */ daddu $a2, $s3, $zero /* A70608 80242228 080908A5 */ j .L80242294 /* A7060C 8024222C 0000102D */ daddu $v0, $zero, $zero +glabel L80242230_A70610 /* A70610 80242230 0280202D */ daddu $a0, $s4, $zero /* A70614 80242234 0200282D */ daddu $a1, $s0, $zero /* A70618 80242238 0C09072F */ jal func_80241CBC_A7009C /* A7061C 8024223C 0260302D */ daddu $a2, $s3, $zero /* A70620 80242240 080908A5 */ j .L80242294 /* A70624 80242244 0000102D */ daddu $v0, $zero, $zero +glabel L80242248_A70628 /* A70628 80242248 0280202D */ daddu $a0, $s4, $zero /* A7062C 8024224C 0200282D */ daddu $a1, $s0, $zero /* A70630 80242250 0C09074A */ jal func_80241D28_A70108 @@ -149,17 +158,20 @@ glabel update_heroes_start_turn_A70404 /* A7063C 8024225C 24020018 */ addiu $v0, $zero, 0x18 /* A70640 80242260 1462000C */ bne $v1, $v0, .L80242294 /* A70644 80242264 0000102D */ daddu $v0, $zero, $zero +glabel L80242268_A70648 /* A70648 80242268 0280202D */ daddu $a0, $s4, $zero /* A7064C 8024226C 0200282D */ daddu $a1, $s0, $zero /* A70650 80242270 0C090797 */ jal func_80241E5C_A7023C /* A70654 80242274 0260302D */ daddu $a2, $s3, $zero /* A70658 80242278 080908A5 */ j .L80242294 /* A7065C 8024227C 0000102D */ daddu $v0, $zero, $zero +glabel L80242280_A70660 /* A70660 80242280 0280202D */ daddu $a0, $s4, $zero /* A70664 80242284 0200282D */ daddu $a1, $s0, $zero /* A70668 80242288 0C0907D3 */ jal func_80241F4C_A7032C /* A7066C 8024228C 0260302D */ daddu $a2, $s3, $zero .L80242290: +glabel L80242290_A70670 /* A70670 80242290 0000102D */ daddu $v0, $zero, $zero .L80242294: /* A70674 80242294 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_63/A735B0/func_80240000_A735B0.s b/asm/nonmatchings/world/area_kpa/kpa_63/A735B0/func_80240000_A735B0.s index 55eee1647d..22ac26bcd2 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_63/A735B0/func_80240000_A735B0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_63/A735B0/func_80240000_A735B0.s @@ -23,24 +23,24 @@ glabel func_80240000_A735B0 /* A735F8 80240048 0220202D */ daddu $a0, $s1, $zero /* A735FC 8024004C 8E050000 */ lw $a1, ($s0) /* A73600 80240050 4482D000 */ mtc1 $v0, $f26 -/* A73604 80240054 00000000 */ nop +/* A73604 80240054 00000000 */ nop /* A73608 80240058 4680D6A0 */ cvt.s.w $f26, $f26 /* A7360C 8024005C 0C0B1EAF */ jal get_variable /* A73610 80240060 0220202D */ daddu $a0, $s1, $zero /* A73614 80240064 8E230070 */ lw $v1, 0x70($s1) /* A73618 80240068 4482B000 */ mtc1 $v0, $f22 -/* A7361C 8024006C 00000000 */ nop +/* A7361C 8024006C 00000000 */ nop /* A73620 80240070 4680B5A0 */ cvt.s.w $f22, $f22 /* A73624 80240074 10600005 */ beqz $v1, .L8024008C /* A73628 80240078 24020001 */ addiu $v0, $zero, 1 /* A7362C 8024007C 10620006 */ beq $v1, $v0, .L80240098 -/* A73630 80240080 00000000 */ nop +/* A73630 80240080 00000000 */ nop /* A73634 80240084 08090028 */ j .L802400A0 -/* A73638 80240088 00000000 */ nop +/* A73638 80240088 00000000 */ nop .L8024008C: /* A7363C 8024008C 4480A000 */ mtc1 $zero, $f20 /* A73640 80240090 08090028 */ j .L802400A0 -/* A73644 80240094 00000000 */ nop +/* A73644 80240094 00000000 */ nop .L80240098: /* A73648 80240098 3C0140A0 */ lui $at, 0x40a0 /* A7364C 8024009C 4481A000 */ mtc1 $at, $f20 @@ -48,19 +48,19 @@ glabel func_80240000_A735B0 /* A73650 802400A0 0C00A8BB */ jal sin_deg /* A73654 802400A4 4600B306 */ mov.s $f12, $f22 /* A73658 802400A8 46140002 */ mul.s $f0, $f0, $f20 -/* A7365C 802400AC 00000000 */ nop +/* A7365C 802400AC 00000000 */ nop /* A73660 802400B0 3C01C2F0 */ lui $at, 0xc2f0 /* A73664 802400B4 44811000 */ mtc1 $at, $f2 -/* A73668 802400B8 00000000 */ nop +/* A73668 802400B8 00000000 */ nop /* A7366C 802400BC 46020600 */ add.s $f24, $f0, $f2 /* A73670 802400C0 3C014130 */ lui $at, 0x4130 /* A73674 802400C4 44810000 */ mtc1 $at, $f0 -/* A73678 802400C8 00000000 */ nop +/* A73678 802400C8 00000000 */ nop /* A7367C 802400CC 4600D681 */ sub.s $f26, $f26, $f0 /* A73680 802400D0 0C00A8D4 */ jal cos_deg /* A73684 802400D4 4600B306 */ mov.s $f12, $f22 /* A73688 802400D8 46140002 */ mul.s $f0, $f0, $f20 -/* A7368C 802400DC 00000000 */ nop +/* A7368C 802400DC 00000000 */ nop /* A73690 802400E0 3C014361 */ lui $at, 0x4361 /* A73694 802400E4 44811000 */ mtc1 $at, $f2 /* A73698 802400E8 8E240070 */ lw $a0, 0x70($s1) @@ -70,7 +70,7 @@ glabel func_80240000_A735B0 /* A736A8 802400F8 10820009 */ beq $a0, $v0, .L80240120 /* A736AC 802400FC 24020002 */ addiu $v0, $zero, 2 /* A736B0 80240100 0809005A */ j .L80240168 -/* A736B4 80240104 00000000 */ nop +/* A736B4 80240104 00000000 */ nop .L80240108: /* A736B8 80240108 3C028011 */ lui $v0, %hi(gPlayerStatus) /* A736BC 8024010C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) @@ -108,4 +108,4 @@ glabel func_80240000_A735B0 /* A73730 80240180 D7B40020 */ ldc1 $f20, 0x20($sp) /* A73734 80240184 03E00008 */ jr $ra /* A73738 80240188 27BD0040 */ addiu $sp, $sp, 0x40 -/* A7373C 8024018C 00000000 */ nop +/* A7373C 8024018C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_8024038C_A74BFC.s b/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_8024038C_A74BFC.s index d5e2f66a84..a65dbe4a3a 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_8024038C_A74BFC.s +++ b/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_8024038C_A74BFC.s @@ -21,11 +21,11 @@ glabel func_8024038C_A74BFC /* A74C3C 802403CC A602008E */ sh $v0, 0x8e($s0) /* A74C40 802403D0 00021400 */ sll $v0, $v0, 0x10 /* A74C44 802403D4 1C400033 */ bgtz $v0, .L802404A4 -/* A74C48 802403D8 00000000 */ nop +/* A74C48 802403D8 00000000 */ nop .L802403DC: /* A74C4C 802403DC 8602008C */ lh $v0, 0x8c($s0) /* A74C50 802403E0 14400030 */ bnez $v0, .L802404A4 -/* A74C54 802403E4 00000000 */ nop +/* A74C54 802403E4 00000000 */ nop /* A74C58 802403E8 8E2200CC */ lw $v0, 0xcc($s1) /* A74C5C 802403EC 8C420024 */ lw $v0, 0x24($v0) /* A74C60 802403F0 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_8024038C_A74BFC /* A74C6C 802403FC 8E230088 */ lw $v1, 0x88($s1) /* A74C70 80240400 24020005 */ addiu $v0, $zero, 5 /* A74C74 80240404 10620005 */ beq $v1, $v0, .L8024041C -/* A74C78 80240408 00000000 */ nop +/* A74C78 80240408 00000000 */ nop /* A74C7C 8024040C 10600003 */ beqz $v1, .L8024041C /* A74C80 80240410 24020001 */ addiu $v0, $zero, 1 /* A74C84 80240414 14620006 */ bne $v1, $v0, .L80240430 -/* A74C88 80240418 00000000 */ nop +/* A74C88 80240418 00000000 */ nop .L8024041C: /* A74C8C 8024041C 8E220084 */ lw $v0, 0x84($s1) /* A74C90 80240420 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_8024038C_A74BFC /* A74CD0 80240460 46220000 */ add.d $f0, $f0, $f2 /* A74CD4 80240464 4620010D */ trunc.w.d $f4, $f0 /* A74CD8 80240468 44022000 */ mfc1 $v0, $f4 -/* A74CDC 8024046C 00000000 */ nop +/* A74CDC 8024046C 00000000 */ nop /* A74CE0 80240470 A602008E */ sh $v0, 0x8e($s0) /* A74CE4 80240474 00021400 */ sll $v0, $v0, 0x10 /* A74CE8 80240478 8E230078 */ lw $v1, 0x78($s1) /* A74CEC 8024047C 00021403 */ sra $v0, $v0, 0x10 /* A74CF0 80240480 0043102A */ slt $v0, $v0, $v1 /* A74CF4 80240484 10400003 */ beqz $v0, .L80240494 -/* A74CF8 80240488 00000000 */ nop +/* A74CF8 80240488 00000000 */ nop /* A74CFC 8024048C 9622007A */ lhu $v0, 0x7a($s1) /* A74D00 80240490 A602008E */ sh $v0, 0x8e($s0) .L80240494: diff --git a/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s b/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s index 97a2726d6b..5c9cf765aa 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s +++ b/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s @@ -279,15 +279,17 @@ glabel func_802406A4_A74F14 /* A75300 80240A90 2C620015 */ sltiu $v0, $v1, 0x15 /* A75304 80240A94 10400009 */ beqz $v0, .L80240ABC /* A75308 80240A98 00031080 */ sll $v0, $v1, 2 -/* A7530C 80240A9C 3C018024 */ lui $at, %hi(D_80243BF8) +/* A7530C 80240A9C 3C018024 */ lui $at, %hi(jtbl_80243BF8_A78468) /* A75310 80240AA0 00220821 */ addu $at, $at, $v0 -/* A75314 80240AA4 8C223BF8 */ lw $v0, %lo(D_80243BF8)($at) +/* A75314 80240AA4 8C223BF8 */ lw $v0, %lo(jtbl_80243BF8_A78468)($at) /* A75318 80240AA8 00400008 */ jr $v0 /* A7531C 80240AAC 00000000 */ nop +glabel L80240AB0_A75320 /* A75320 80240AB0 8E420028 */ lw $v0, 0x28($s2) /* A75324 80240AB4 24420001 */ addiu $v0, $v0, 1 /* A75328 80240AB8 AE420028 */ sw $v0, 0x28($s2) .L80240ABC: +glabel L80240ABC_A7532C /* A7532C 80240ABC 0000102D */ daddu $v0, $zero, $zero .L80240AC0: /* A75330 80240AC0 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_81/A784C0/func_80240000_A784C0.s b/asm/nonmatchings/world/area_kpa/kpa_81/A784C0/func_80240000_A784C0.s index e624c69f06..cca8e0ee49 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_81/A784C0/func_80240000_A784C0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_81/A784C0/func_80240000_A784C0.s @@ -9,7 +9,7 @@ glabel func_80240000_A784C0 /* A784D0 80240010 24A52000 */ addiu $a1, $a1, %lo(D_80242000) /* A784D4 80240014 AFBF0010 */ sw $ra, 0x10($sp) /* A784D8 80240018 0C01953C */ jal sprintf -/* A784DC 8024001C 00000000 */ nop +/* A784DC 8024001C 00000000 */ nop /* A784E0 80240020 3C04800E */ lui $a0, %hi(D_800D91E0) /* A784E4 80240024 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) /* A784E8 80240028 3C058024 */ lui $a1, %hi(D_80242010) @@ -19,6 +19,6 @@ glabel func_80240000_A784C0 /* A784F8 80240038 0000102D */ daddu $v0, $zero, $zero /* A784FC 8024003C 03E00008 */ jr $ra /* A78500 80240040 27BD0018 */ addiu $sp, $sp, 0x18 -/* A78504 80240044 00000000 */ nop -/* A78508 80240048 00000000 */ nop -/* A7850C 8024004C 00000000 */ nop +/* A78504 80240044 00000000 */ nop +/* A78508 80240048 00000000 */ nop +/* A7850C 8024004C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_80240308_A787C8.s b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_80240308_A787C8.s index 810c4a27be..2c09c6a9b3 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_80240308_A787C8.s +++ b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_80240308_A787C8.s @@ -28,7 +28,7 @@ glabel func_80240308_A787C8 /* A7881C 8024035C 00220821 */ addu $at, $at, $v0 /* A78820 80240360 AC202040 */ sw $zero, %lo(func_80242040_8B20B0)($at) /* A78824 80240364 080900E5 */ j .L80240394 -/* A78828 80240368 00000000 */ nop +/* A78828 80240368 00000000 */ nop .L8024036C: /* A7882C 8024036C 3C038024 */ lui $v1, %hi(func_80242040_8B20B0) /* A78830 80240370 24632040 */ addiu $v1, $v1, %lo(func_80242040_8B20B0) diff --git a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802403A4_A78864.s b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802403A4_A78864.s index db2a46d200..67fcff09dd 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802403A4_A78864.s +++ b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802403A4_A78864.s @@ -28,7 +28,7 @@ glabel func_802403A4_A78864 /* A788B8 802403F8 00220821 */ addu $at, $at, $v0 /* A788BC 802403FC AC202208 */ sw $zero, %lo(D_80242208)($at) /* A788C0 80240400 0809010C */ j .L80240430 -/* A788C4 80240404 00000000 */ nop +/* A788C4 80240404 00000000 */ nop .L80240408: /* A788C8 80240408 3C038024 */ lui $v1, %hi(D_80242208) /* A788CC 8024040C 24632208 */ addiu $v1, $v1, %lo(D_80242208) diff --git a/asm/nonmatchings/world/area_kpa/kpa_82/A7A500/func_80240000_A7A500.s b/asm/nonmatchings/world/area_kpa/kpa_82/A7A500/func_80240000_A7A500.s index 44fcb1ab95..d702993109 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_82/A7A500/func_80240000_A7A500.s +++ b/asm/nonmatchings/world/area_kpa/kpa_82/A7A500/func_80240000_A7A500.s @@ -9,7 +9,7 @@ glabel func_80240000_A7A500 /* A7A510 80240010 24A58F60 */ addiu $a1, $a1, %lo(D_80248F60) /* A7A514 80240014 AFBF0010 */ sw $ra, 0x10($sp) /* A7A518 80240018 0C01953C */ jal sprintf -/* A7A51C 8024001C 00000000 */ nop +/* A7A51C 8024001C 00000000 */ nop /* A7A520 80240020 3C04800E */ lui $a0, %hi(D_800D91E0) /* A7A524 80240024 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) /* A7A528 80240028 3C058025 */ lui $a1, %hi(D_80248F70) @@ -19,6 +19,6 @@ glabel func_80240000_A7A500 /* A7A538 80240038 0000102D */ daddu $v0, $zero, $zero /* A7A53C 8024003C 03E00008 */ jr $ra /* A7A540 80240040 27BD0018 */ addiu $sp, $sp, 0x18 -/* A7A544 80240044 00000000 */ nop -/* A7A548 80240048 00000000 */ nop -/* A7A54C 8024004C 00000000 */ nop +/* A7A544 80240044 00000000 */ nop +/* A7A548 80240048 00000000 */ nop +/* A7A54C 8024004C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_80240308_A7A808.s b/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_80240308_A7A808.s index 8f0a134ec7..5047edba0e 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_80240308_A7A808.s +++ b/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_80240308_A7A808.s @@ -28,7 +28,7 @@ glabel func_80240308_A7A808 /* A7A85C 8024035C 00220821 */ addu $at, $at, $v0 /* A7A860 80240360 AC208F90 */ sw $zero, %lo(D_80248F90)($at) /* A7A864 80240364 080900E5 */ j .L80240394 -/* A7A868 80240368 00000000 */ nop +/* A7A868 80240368 00000000 */ nop .L8024036C: /* A7A86C 8024036C 3C038025 */ lui $v1, %hi(D_80248F90) /* A7A870 80240370 24638F90 */ addiu $v1, $v1, %lo(D_80248F90) diff --git a/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802403A4_A7A8A4.s b/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802403A4_A7A8A4.s index 3f067fbcc5..7b5b328c83 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802403A4_A7A8A4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802403A4_A7A8A4.s @@ -28,7 +28,7 @@ glabel func_802403A4_A7A8A4 /* A7A8F8 802403F8 00220821 */ addu $at, $at, $v0 /* A7A8FC 802403FC AC209158 */ sw $zero, %lo(D_80249158)($at) /* A7A900 80240400 0809010C */ j .L80240430 -/* A7A904 80240404 00000000 */ nop +/* A7A904 80240404 00000000 */ nop .L80240408: /* A7A908 80240408 3C038025 */ lui $v1, %hi(D_80249158) /* A7A90C 8024040C 24639158 */ addiu $v1, $v1, %lo(D_80249158) diff --git a/asm/nonmatchings/world/area_kpa/kpa_83/A83490/func_80240000_A83490.s b/asm/nonmatchings/world/area_kpa/kpa_83/A83490/func_80240000_A83490.s index 87ae8d7ce5..5001d7beea 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_83/A83490/func_80240000_A83490.s +++ b/asm/nonmatchings/world/area_kpa/kpa_83/A83490/func_80240000_A83490.s @@ -9,7 +9,7 @@ glabel func_80240000_A83490 /* A834A0 80240010 24A532F0 */ addiu $a1, $a1, %lo(D_802432F0) /* A834A4 80240014 AFBF0010 */ sw $ra, 0x10($sp) /* A834A8 80240018 0C01953C */ jal sprintf -/* A834AC 8024001C 00000000 */ nop +/* A834AC 8024001C 00000000 */ nop /* A834B0 80240020 3C04800E */ lui $a0, %hi(D_800D91E0) /* A834B4 80240024 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) /* A834B8 80240028 3C058024 */ lui $a1, %hi(func_80243300_8B3370) @@ -19,6 +19,6 @@ glabel func_80240000_A83490 /* A834C8 80240038 0000102D */ daddu $v0, $zero, $zero /* A834CC 8024003C 03E00008 */ jr $ra /* A834D0 80240040 27BD0018 */ addiu $sp, $sp, 0x18 -/* A834D4 80240044 00000000 */ nop -/* A834D8 80240048 00000000 */ nop -/* A834DC 8024004C 00000000 */ nop +/* A834D4 80240044 00000000 */ nop +/* A834D8 80240048 00000000 */ nop +/* A834DC 8024004C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_83/A834E0/func_80240050_A834E0.s b/asm/nonmatchings/world/area_kpa/kpa_83/A834E0/func_80240050_A834E0.s index 7fa85d3a79..4f6db0ef25 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_83/A834E0/func_80240050_A834E0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_83/A834E0/func_80240050_A834E0.s @@ -8,5 +8,5 @@ glabel func_80240050_A834E0 /* A834EC 8024005C E420F070 */ swc1 $f0, %lo(gPlayerStatus+0xA8)($at) /* A834F0 80240060 03E00008 */ jr $ra /* A834F4 80240064 24020002 */ addiu $v0, $zero, 2 -/* A834F8 80240068 00000000 */ nop -/* A834FC 8024006C 00000000 */ nop +/* A834F8 80240068 00000000 */ nop +/* A834FC 8024006C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240000_A86A50.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240000_A86A50.s index 248901a1bc..3b20e6d526 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240000_A86A50.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240000_A86A50.s @@ -45,7 +45,7 @@ glabel func_80240000_A86A50 /* A86AEC 8024009C 0C00A7B5 */ jal dist2D /* A86AF0 802400A0 4600B386 */ mov.s $f14, $f22 /* A86AF4 802400A4 4614003C */ c.lt.s $f0, $f20 -/* A86AF8 802400A8 00000000 */ nop +/* A86AF8 802400A8 00000000 */ nop /* A86AFC 802400AC 45000003 */ bc1f .L802400BC /* A86B00 802400B0 2631000C */ addiu $s1, $s1, 0xc /* A86B04 802400B4 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_80240000_A86A50 /* A86B30 802400E0 8E6200D0 */ lw $v0, 0xd0($s3) /* A86B34 802400E4 8C42007C */ lw $v0, 0x7c($v0) /* A86B38 802400E8 04410004 */ bgez $v0, .L802400FC -/* A86B3C 802400EC 00000000 */ nop +/* A86B3C 802400EC 00000000 */ nop /* A86B40 802400F0 C6C00000 */ lwc1 $f0, ($s6) /* A86B44 802400F4 08090047 */ j .L8024011C /* A86B48 802400F8 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_80240000_A86A50 /* A86B4C 802400FC 3C018024 */ lui $at, %hi(D_80245A30) /* A86B50 80240100 D4225A30 */ ldc1 $f2, %lo(D_80245A30)($at) /* A86B54 80240104 44820000 */ mtc1 $v0, $f0 -/* A86B58 80240108 00000000 */ nop +/* A86B58 80240108 00000000 */ nop /* A86B5C 8024010C 46800021 */ cvt.d.w $f0, $f0 /* A86B60 80240110 46220003 */ div.d $f0, $f0, $f2 /* A86B64 80240114 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240158_A86BA8.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240158_A86BA8.s index 171d20e62d..2d86a79b2d 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240158_A86BA8.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240158_A86BA8.s @@ -44,7 +44,7 @@ glabel func_80240158_A86BA8 /* A86C44 802401F4 2402000F */ addiu $v0, $zero, 0xf /* A86C48 802401F8 AFA2001C */ sw $v0, 0x1c($sp) /* A86C4C 802401FC 44833000 */ mtc1 $v1, $f6 -/* A86C50 80240200 00000000 */ nop +/* A86C50 80240200 00000000 */ nop /* A86C54 80240204 468031A0 */ cvt.s.w $f6, $f6 /* A86C58 80240208 44073000 */ mfc1 $a3, $f6 /* A86C5C 8024020C 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_80240158_A86BA8 .L8024025C: /* A86CAC 8024025C 8602008C */ lh $v0, 0x8c($s0) /* A86CB0 80240260 1440005D */ bnez $v0, .L802403D8 -/* A86CB4 80240264 00000000 */ nop +/* A86CB4 80240264 00000000 */ nop /* A86CB8 80240268 C6000018 */ lwc1 $f0, 0x18($s0) /* A86CBC 8024026C 3C014010 */ lui $at, 0x4010 /* A86CC0 80240270 44811800 */ mtc1 $at, $f3 /* A86CC4 80240274 44801000 */ mtc1 $zero, $f2 /* A86CC8 80240278 46000021 */ cvt.d.s $f0, $f0 /* A86CCC 8024027C 4622003C */ c.lt.d $f0, $f2 -/* A86CD0 80240280 00000000 */ nop +/* A86CD0 80240280 00000000 */ nop /* A86CD4 80240284 45000003 */ bc1f .L80240294 /* A86CD8 80240288 0200202D */ daddu $a0, $s0, $zero /* A86CDC 8024028C 080900A6 */ j .L80240298 @@ -88,7 +88,7 @@ glabel func_80240158_A86BA8 /* A86CE4 80240294 24050001 */ addiu $a1, $zero, 1 .L80240298: /* A86CE8 80240298 0C00F598 */ jal func_8003D660 -/* A86CEC 8024029C 00000000 */ nop +/* A86CEC 8024029C 00000000 */ nop /* A86CF0 802402A0 C60C0038 */ lwc1 $f12, 0x38($s0) /* A86CF4 802402A4 8E430078 */ lw $v1, 0x78($s2) /* A86CF8 802402A8 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_80240158_A86BA8 /* A86D20 802402D0 4406B000 */ mfc1 $a2, $f22 /* A86D24 802402D4 4407A000 */ mfc1 $a3, $f20 /* A86D28 802402D8 0C00A720 */ jal atan2 -/* A86D2C 802402DC 00000000 */ nop +/* A86D2C 802402DC 00000000 */ nop /* A86D30 802402E0 8E050018 */ lw $a1, 0x18($s0) /* A86D34 802402E4 44060000 */ mfc1 $a2, $f0 /* A86D38 802402E8 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_80240158_A86BA8 /* A86D4C 802402FC 4406B000 */ mfc1 $a2, $f22 /* A86D50 80240300 4407A000 */ mfc1 $a3, $f20 /* A86D54 80240304 0C00A7B5 */ jal dist2D -/* A86D58 80240308 00000000 */ nop +/* A86D58 80240308 00000000 */ nop /* A86D5C 8024030C C6020018 */ lwc1 $f2, 0x18($s0) /* A86D60 80240310 4602003E */ c.le.s $f0, $f2 -/* A86D64 80240314 00000000 */ nop +/* A86D64 80240314 00000000 */ nop /* A86D68 80240318 4500002F */ bc1f .L802403D8 /* A86D6C 8024031C 240403E8 */ addiu $a0, $zero, 0x3e8 /* A86D70 80240320 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_80240158_A86BA8 /* A86DC4 80240374 18400003 */ blez $v0, .L80240384 /* A86DC8 80240378 24020004 */ addiu $v0, $zero, 4 /* A86DCC 8024037C 14600002 */ bnez $v1, .L80240388 -/* A86DD0 80240380 00000000 */ nop +/* A86DD0 80240380 00000000 */ nop .L80240384: /* A86DD4 80240384 AE420070 */ sw $v0, 0x70($s2) .L80240388: diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802404C0_A86F10.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802404C0_A86F10.s index 269378869d..caea2e2b82 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802404C0_A86F10.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802404C0_A86F10.s @@ -38,7 +38,7 @@ glabel func_802404C0_A86F10 /* A86F94 80240544 2402000F */ addiu $v0, $zero, 0xf /* A86F98 80240548 AFA2001C */ sw $v0, 0x1c($sp) /* A86F9C 8024054C 44833000 */ mtc1 $v1, $f6 -/* A86FA0 80240550 00000000 */ nop +/* A86FA0 80240550 00000000 */ nop /* A86FA4 80240554 468031A0 */ cvt.s.w $f6, $f6 /* A86FA8 80240558 44073000 */ mfc1 $a3, $f6 /* A86FAC 8024055C 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_802404C0_A86F10 .L802405C0: /* A87010 802405C0 8602008C */ lh $v0, 0x8c($s0) /* A87014 802405C4 14400025 */ bnez $v0, .L8024065C -/* A87018 802405C8 00000000 */ nop +/* A87018 802405C8 00000000 */ nop /* A8701C 802405CC 9602008E */ lhu $v0, 0x8e($s0) /* A87020 802405D0 2442FFFF */ addiu $v0, $v0, -1 /* A87024 802405D4 A602008E */ sh $v0, 0x8e($s0) /* A87028 802405D8 00021400 */ sll $v0, $v0, 0x10 /* A8702C 802405DC 1440001F */ bnez $v0, .L8024065C -/* A87030 802405E0 00000000 */ nop +/* A87030 802405E0 00000000 */ nop /* A87034 802405E4 8E820074 */ lw $v0, 0x74($s4) /* A87038 802405E8 2442FFFF */ addiu $v0, $v0, -1 /* A8703C 802405EC 10400019 */ beqz $v0, .L80240654 @@ -84,7 +84,7 @@ glabel func_802404C0_A86F10 /* A87048 802405F8 9442002A */ lhu $v0, 0x2a($v0) /* A8704C 802405FC 30420010 */ andi $v0, $v0, 0x10 /* A87050 80240600 14400007 */ bnez $v0, .L80240620 -/* A87054 80240604 00000000 */ nop +/* A87054 80240604 00000000 */ nop /* A87058 80240608 C600000C */ lwc1 $f0, 0xc($s0) /* A8705C 8024060C 3C014334 */ lui $at, 0x4334 /* A87060 80240610 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024067C_A870CC.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024067C_A870CC.s index e4dc3c950f..221bbc0f0c 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024067C_A870CC.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024067C_A870CC.s @@ -28,7 +28,7 @@ glabel func_8024067C_A870CC /* A87124 802406D4 8E0200D0 */ lw $v0, 0xd0($s0) /* A87128 802406D8 8C42007C */ lw $v0, 0x7c($v0) /* A8712C 802406DC 04410004 */ bgez $v0, .L802406F0 -/* A87130 802406E0 00000000 */ nop +/* A87130 802406E0 00000000 */ nop /* A87134 802406E4 C6400000 */ lwc1 $f0, ($s2) /* A87138 802406E8 080901C4 */ j .L80240710 /* A8713C 802406EC E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_8024067C_A870CC /* A87140 802406F0 3C018024 */ lui $at, %hi(D_80245A38) /* A87144 802406F4 D4225A38 */ ldc1 $f2, %lo(D_80245A38)($at) /* A87148 802406F8 44820000 */ mtc1 $v0, $f0 -/* A8714C 802406FC 00000000 */ nop +/* A8714C 802406FC 00000000 */ nop /* A87150 80240700 46800021 */ cvt.d.w $f0, $f0 /* A87154 80240704 46220003 */ div.d $f0, $f0, $f2 /* A87158 80240708 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024081C_A8726C.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024081C_A8726C.s index ebb6f31187..fa74d8da67 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024081C_A8726C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024081C_A8726C.s @@ -47,20 +47,20 @@ glabel func_8024081C_A8726C /* A87314 802408C4 8E02001C */ lw $v0, 0x1c($s0) /* A87318 802408C8 46001005 */ abs.s $f0, $f2 /* A8731C 802408CC 44822000 */ mtc1 $v0, $f4 -/* A87320 802408D0 00000000 */ nop +/* A87320 802408D0 00000000 */ nop /* A87324 802408D4 46802120 */ cvt.s.w $f4, $f4 /* A87328 802408D8 4600203C */ c.lt.s $f4, $f0 -/* A8732C 802408DC 00000000 */ nop +/* A8732C 802408DC 00000000 */ nop /* A87330 802408E0 4500000D */ bc1f .L80240918 -/* A87334 802408E4 00000000 */ nop +/* A87334 802408E4 00000000 */ nop /* A87338 802408E8 44800000 */ mtc1 $zero, $f0 /* A8733C 802408EC C654000C */ lwc1 $f20, 0xc($s2) /* A87340 802408F0 4600103C */ c.lt.s $f2, $f0 -/* A87344 802408F4 00000000 */ nop +/* A87344 802408F4 00000000 */ nop /* A87348 802408F8 45000006 */ bc1f .L80240914 /* A8734C 802408FC 00021023 */ negu $v0, $v0 /* A87350 80240900 44820000 */ mtc1 $v0, $f0 -/* A87354 80240904 00000000 */ nop +/* A87354 80240904 00000000 */ nop /* A87358 80240908 46800020 */ cvt.s.w $f0, $f0 /* A8735C 8024090C 08090246 */ j .L80240918 /* A87360 80240910 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024094C_A8739C.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024094C_A8739C.s index 63b8d993cb..b7894b54a6 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024094C_A8739C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024094C_A8739C.s @@ -37,7 +37,7 @@ glabel func_8024094C_A8739C /* A8741C 802409CC 2402000F */ addiu $v0, $zero, 0xf /* A87420 802409D0 AFA2001C */ sw $v0, 0x1c($sp) /* A87424 802409D4 44833000 */ mtc1 $v1, $f6 -/* A87428 802409D8 00000000 */ nop +/* A87428 802409D8 00000000 */ nop /* A8742C 802409DC 468031A0 */ cvt.s.w $f6, $f6 /* A87430 802409E0 44073000 */ mfc1 $a3, $f6 /* A87434 802409E4 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240AD4_A87524.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240AD4_A87524.s index 5b0910c64f..884b363061 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240AD4_A87524.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240AD4_A87524.s @@ -28,7 +28,7 @@ glabel func_80240AD4_A87524 /* A8757C 80240B2C C4400008 */ lwc1 $f0, 8($v0) /* A87580 80240B30 46800020 */ cvt.s.w $f0, $f0 /* A87584 80240B34 4602003E */ c.le.s $f0, $f2 -/* A87588 80240B38 00000000 */ nop +/* A87588 80240B38 00000000 */ nop /* A8758C 80240B3C 45020003 */ bc1fl .L80240B4C /* A87590 80240B40 24840001 */ addiu $a0, $a0, 1 /* A87594 80240B44 080902D7 */ j .L80240B5C diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s index 93ff770f4f..d0b596730f 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s @@ -46,7 +46,7 @@ glabel func_80240B94_A875E4 /* A87688 80240C38 8E2200B0 */ lw $v0, 0xb0($s1) /* A8768C 80240C3C 30420004 */ andi $v0, $v0, 4 /* A87690 80240C40 10400044 */ beqz $v0, .L80240D54 -/* A87694 80240C44 00000000 */ nop +/* A87694 80240C44 00000000 */ nop .L80240C48: /* A87698 80240C48 2404F7FF */ addiu $a0, $zero, -0x801 /* A8769C 80240C4C AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80240B94_A875E4 /* A87750 80240D00 3C0142C8 */ lui $at, 0x42c8 /* A87754 80240D04 44812000 */ mtc1 $at, $f4 /* A87758 80240D08 44823000 */ mtc1 $v0, $f6 -/* A8775C 80240D0C 00000000 */ nop +/* A8775C 80240D0C 00000000 */ nop /* A87760 80240D10 468031A0 */ cvt.s.w $f6, $f6 /* A87764 80240D14 27A20044 */ addiu $v0, $sp, 0x44 /* A87768 80240D18 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80240B94_A875E4 /* A8778C 80240D3C 0C0372DF */ jal func_800DCB7C /* A87790 80240D40 27A70040 */ addiu $a3, $sp, 0x40 /* A87794 80240D44 10400003 */ beqz $v0, .L80240D54 -/* A87798 80240D48 00000000 */ nop +/* A87798 80240D48 00000000 */ nop /* A8779C 80240D4C C7A0003C */ lwc1 $f0, 0x3c($sp) /* A877A0 80240D50 E640003C */ swc1 $f0, 0x3c($s2) .L80240D54: @@ -124,72 +124,85 @@ glabel func_80240B94_A875E4 /* A877A8 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 /* A877AC 80240D5C 10400042 */ beqz $v0, .L80240E68 /* A877B0 80240D60 00031080 */ sll $v0, $v1, 2 -/* A877B4 80240D64 3C018024 */ lui $at, %hi(func_80245A40) +/* A877B4 80240D64 3C018024 */ lui $at, %hi(jtbl_80245A40_A8C490) /* A877B8 80240D68 00220821 */ addu $at, $at, $v0 -/* A877BC 80240D6C 8C225A40 */ lw $v0, %lo(func_80245A40)($at) +/* A877BC 80240D6C 8C225A40 */ lw $v0, %lo(jtbl_80245A40_A8C490)($at) /* A877C0 80240D70 00400008 */ jr $v0 -/* A877C4 80240D74 00000000 */ nop +/* A877C4 80240D74 00000000 */ nop +glabel L80240D78_A877C8 /* A877C8 80240D78 0280202D */ daddu $a0, $s4, $zero /* A877CC 80240D7C 0260282D */ daddu $a1, $s3, $zero /* A877D0 80240D80 0C090000 */ jal func_80240000_A86A50 /* A877D4 80240D84 02A0302D */ daddu $a2, $s5, $zero +glabel L80240D88_A877D8 /* A877D8 80240D88 0280202D */ daddu $a0, $s4, $zero /* A877DC 80240D8C 0260282D */ daddu $a1, $s3, $zero /* A877E0 80240D90 0C090056 */ jal func_80240158_A86BA8 /* A877E4 80240D94 02A0302D */ daddu $a2, $s5, $zero /* A877E8 80240D98 0809039A */ j .L80240E68 -/* A877EC 80240D9C 00000000 */ nop +/* A877EC 80240D9C 00000000 */ nop +glabel L80240DA0_A877F0 /* A877F0 80240DA0 0280202D */ daddu $a0, $s4, $zero /* A877F4 80240DA4 0260282D */ daddu $a1, $s3, $zero /* A877F8 80240DA8 0C090100 */ jal kpa_91_UnkNpcAIFunc1 /* A877FC 80240DAC 02A0302D */ daddu $a2, $s5, $zero +glabel L80240DB0_A87800 /* A87800 80240DB0 0280202D */ daddu $a0, $s4, $zero /* A87804 80240DB4 0260282D */ daddu $a1, $s3, $zero /* A87808 80240DB8 0C090130 */ jal func_802404C0_A86F10 /* A8780C 80240DBC 02A0302D */ daddu $a2, $s5, $zero /* A87810 80240DC0 0809039A */ j .L80240E68 -/* A87814 80240DC4 00000000 */ nop +/* A87814 80240DC4 00000000 */ nop +glabel L80240DC8_A87818 /* A87818 80240DC8 0280202D */ daddu $a0, $s4, $zero /* A8781C 80240DCC 0260282D */ daddu $a1, $s3, $zero /* A87820 80240DD0 0C09019F */ jal func_8024067C_A870CC /* A87824 80240DD4 02A0302D */ daddu $a2, $s5, $zero /* A87828 80240DD8 0809039A */ j .L80240E68 -/* A8782C 80240DDC 00000000 */ nop +/* A8782C 80240DDC 00000000 */ nop +glabel L80240DE0_A87830 /* A87830 80240DE0 0280202D */ daddu $a0, $s4, $zero /* A87834 80240DE4 0260282D */ daddu $a1, $s3, $zero /* A87838 80240DE8 0C0901CC */ jal kpa_91_NpcJumpFunc2 /* A8783C 80240DEC 02A0302D */ daddu $a2, $s5, $zero +glabel L80240DF0_A87840 /* A87840 80240DF0 0280202D */ daddu $a0, $s4, $zero /* A87844 80240DF4 0260282D */ daddu $a1, $s3, $zero /* A87848 80240DF8 0C0901E9 */ jal kpa_91_NpcJumpFunc /* A8784C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* A87850 80240E00 0809039A */ j .L80240E68 -/* A87854 80240E04 00000000 */ nop +/* A87854 80240E04 00000000 */ nop +glabel L80240E08_A87858 /* A87858 80240E08 0280202D */ daddu $a0, $s4, $zero /* A8785C 80240E0C 0260282D */ daddu $a1, $s3, $zero /* A87860 80240E10 0C090207 */ jal func_8024081C_A8726C /* A87864 80240E14 02A0302D */ daddu $a2, $s5, $zero +glabel L80240E18_A87868 /* A87868 80240E18 0280202D */ daddu $a0, $s4, $zero /* A8786C 80240E1C 0260282D */ daddu $a1, $s3, $zero /* A87870 80240E20 0C090253 */ jal func_8024094C_A8739C /* A87874 80240E24 02A0302D */ daddu $a2, $s5, $zero /* A87878 80240E28 0809039A */ j .L80240E68 -/* A8787C 80240E2C 00000000 */ nop +/* A8787C 80240E2C 00000000 */ nop +glabel L80240E30_A87880 /* A87880 80240E30 0280202D */ daddu $a0, $s4, $zero /* A87884 80240E34 0260282D */ daddu $a1, $s3, $zero /* A87888 80240E38 0C09029B */ jal kpa_91_UnkNpcDurationFlagFunc /* A8788C 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* A87890 80240E40 0809039A */ j .L80240E68 -/* A87894 80240E44 00000000 */ nop +/* A87894 80240E44 00000000 */ nop +glabel L80240E48_A87898 /* A87898 80240E48 0280202D */ daddu $a0, $s4, $zero /* A8789C 80240E4C 0260282D */ daddu $a1, $s3, $zero /* A878A0 80240E50 0C0902B5 */ jal func_80240AD4_A87524 /* A878A4 80240E54 02A0302D */ daddu $a2, $s5, $zero /* A878A8 80240E58 0809039A */ j .L80240E68 -/* A878AC 80240E5C 00000000 */ nop +/* A878AC 80240E5C 00000000 */ nop +glabel L80240E60_A878B0 /* A878B0 80240E60 0C0129CF */ jal func_8004A73C /* A878B4 80240E64 0280202D */ daddu $a0, $s4, $zero .L80240E68: +glabel L80240E68_A878B8 /* A878B8 80240E68 8FBF0060 */ lw $ra, 0x60($sp) /* A878BC 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) /* A878C0 80240E70 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240F0C_A8795C.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240F0C_A8795C.s index a11cc0e32f..14bac9dc00 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240F0C_A8795C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240F0C_A8795C.s @@ -21,11 +21,11 @@ glabel func_80240F0C_A8795C /* A8799C 80240F4C A602008E */ sh $v0, 0x8e($s0) /* A879A0 80240F50 00021400 */ sll $v0, $v0, 0x10 /* A879A4 80240F54 1C400033 */ bgtz $v0, .L80241024 -/* A879A8 80240F58 00000000 */ nop +/* A879A8 80240F58 00000000 */ nop .L80240F5C: /* A879AC 80240F5C 8602008C */ lh $v0, 0x8c($s0) /* A879B0 80240F60 14400030 */ bnez $v0, .L80241024 -/* A879B4 80240F64 00000000 */ nop +/* A879B4 80240F64 00000000 */ nop /* A879B8 80240F68 8E2200CC */ lw $v0, 0xcc($s1) /* A879BC 80240F6C 8C420024 */ lw $v0, 0x24($v0) /* A879C0 80240F70 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_80240F0C_A8795C /* A879CC 80240F7C 8E230088 */ lw $v1, 0x88($s1) /* A879D0 80240F80 24020005 */ addiu $v0, $zero, 5 /* A879D4 80240F84 10620005 */ beq $v1, $v0, .L80240F9C -/* A879D8 80240F88 00000000 */ nop +/* A879D8 80240F88 00000000 */ nop /* A879DC 80240F8C 10600003 */ beqz $v1, .L80240F9C /* A879E0 80240F90 24020001 */ addiu $v0, $zero, 1 /* A879E4 80240F94 14620006 */ bne $v1, $v0, .L80240FB0 -/* A879E8 80240F98 00000000 */ nop +/* A879E8 80240F98 00000000 */ nop .L80240F9C: /* A879EC 80240F9C 8E220084 */ lw $v0, 0x84($s1) /* A879F0 80240FA0 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_80240F0C_A8795C /* A87A30 80240FE0 46220000 */ add.d $f0, $f0, $f2 /* A87A34 80240FE4 4620010D */ trunc.w.d $f4, $f0 /* A87A38 80240FE8 44022000 */ mfc1 $v0, $f4 -/* A87A3C 80240FEC 00000000 */ nop +/* A87A3C 80240FEC 00000000 */ nop /* A87A40 80240FF0 A602008E */ sh $v0, 0x8e($s0) /* A87A44 80240FF4 00021400 */ sll $v0, $v0, 0x10 /* A87A48 80240FF8 8E230078 */ lw $v1, 0x78($s1) /* A87A4C 80240FFC 00021403 */ sra $v0, $v0, 0x10 /* A87A50 80241000 0043102A */ slt $v0, $v0, $v1 /* A87A54 80241004 10400003 */ beqz $v0, .L80241014 -/* A87A58 80241008 00000000 */ nop +/* A87A58 80241008 00000000 */ nop /* A87A5C 8024100C 9622007A */ lhu $v0, 0x7a($s1) /* A87A60 80241010 A602008E */ sh $v0, 0x8e($s0) .L80241014: diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s index 13b8df97f3..111a437a89 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s @@ -53,7 +53,7 @@ glabel func_80241224_A87C74 /* A87D30 802412E0 8E2200B0 */ lw $v0, 0xb0($s1) /* A87D34 802412E4 30420004 */ andi $v0, $v0, 4 /* A87D38 802412E8 10400048 */ beqz $v0, .L8024140C -/* A87D3C 802412EC 00000000 */ nop +/* A87D3C 802412EC 00000000 */ nop .L802412F0: /* A87D40 802412F0 A640008E */ sh $zero, 0x8e($s2) /* A87D44 802412F4 AE600070 */ sw $zero, 0x70($s3) @@ -103,7 +103,7 @@ glabel func_80241224_A87C74 /* A87DEC 8024139C 24020028 */ addiu $v0, $zero, 0x28 /* A87DF0 802413A0 AFA2001C */ sw $v0, 0x1c($sp) /* A87DF4 802413A4 44833000 */ mtc1 $v1, $f6 -/* A87DF8 802413A8 00000000 */ nop +/* A87DF8 802413A8 00000000 */ nop /* A87DFC 802413AC 468031A0 */ cvt.s.w $f6, $f6 /* A87E00 802413B0 44073000 */ mfc1 $a3, $f6 /* A87E04 802413B4 27A20048 */ addiu $v0, $sp, 0x48 @@ -134,64 +134,75 @@ glabel func_80241224_A87C74 /* A87E60 80241410 2C620064 */ sltiu $v0, $v1, 0x64 /* A87E64 80241414 1040003A */ beqz $v0, .L80241500 /* A87E68 80241418 00031080 */ sll $v0, $v1, 2 -/* A87E6C 8024141C 3C018024 */ lui $at, %hi(D_80245BD8) +/* A87E6C 8024141C 3C018024 */ lui $at, %hi(jtbl_80245BD8_A8C628) /* A87E70 80241420 00220821 */ addu $at, $at, $v0 -/* A87E74 80241424 8C225BD8 */ lw $v0, %lo(D_80245BD8)($at) +/* A87E74 80241424 8C225BD8 */ lw $v0, %lo(jtbl_80245BD8_A8C628)($at) /* A87E78 80241428 00400008 */ jr $v0 -/* A87E7C 8024142C 00000000 */ nop +/* A87E7C 8024142C 00000000 */ nop +glabel L80241430_A87E80 /* A87E80 80241430 0260202D */ daddu $a0, $s3, $zero /* A87E84 80241434 0280282D */ daddu $a1, $s4, $zero /* A87E88 80241438 0C090000 */ jal func_80240000_A86A50 /* A87E8C 8024143C 02A0302D */ daddu $a2, $s5, $zero /* A87E90 80241440 96220086 */ lhu $v0, 0x86($s1) /* A87E94 80241444 A64200A8 */ sh $v0, 0xa8($s2) +glabel L80241448_A87E98 /* A87E98 80241448 0260202D */ daddu $a0, $s3, $zero /* A87E9C 8024144C 0280282D */ daddu $a1, $s4, $zero /* A87EA0 80241450 0C090056 */ jal func_80240158_A86BA8 /* A87EA4 80241454 02A0302D */ daddu $a2, $s5, $zero /* A87EA8 80241458 08090540 */ j .L80241500 -/* A87EAC 8024145C 00000000 */ nop +/* A87EAC 8024145C 00000000 */ nop +glabel L80241460_A87EB0 /* A87EB0 80241460 0260202D */ daddu $a0, $s3, $zero /* A87EB4 80241464 0280282D */ daddu $a1, $s4, $zero /* A87EB8 80241468 0C090100 */ jal kpa_91_UnkNpcAIFunc1 /* A87EBC 8024146C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241470_A87EC0 /* A87EC0 80241470 0260202D */ daddu $a0, $s3, $zero /* A87EC4 80241474 0280282D */ daddu $a1, $s4, $zero /* A87EC8 80241478 0C090130 */ jal func_802404C0_A86F10 /* A87ECC 8024147C 02A0302D */ daddu $a2, $s5, $zero /* A87ED0 80241480 08090540 */ j .L80241500 -/* A87ED4 80241484 00000000 */ nop +/* A87ED4 80241484 00000000 */ nop +glabel L80241488_A87ED8 /* A87ED8 80241488 0260202D */ daddu $a0, $s3, $zero /* A87EDC 8024148C 0280282D */ daddu $a1, $s4, $zero /* A87EE0 80241490 0C09019F */ jal func_8024067C_A870CC /* A87EE4 80241494 02A0302D */ daddu $a2, $s5, $zero /* A87EE8 80241498 08090540 */ j .L80241500 -/* A87EEC 8024149C 00000000 */ nop +/* A87EEC 8024149C 00000000 */ nop +glabel L802414A0_A87EF0 /* A87EF0 802414A0 0260202D */ daddu $a0, $s3, $zero /* A87EF4 802414A4 0280282D */ daddu $a1, $s4, $zero /* A87EF8 802414A8 0C0903A4 */ jal func_80240E90_A878E0 /* A87EFC 802414AC 02A0302D */ daddu $a2, $s5, $zero +glabel L802414B0_A87F00 /* A87F00 802414B0 0260202D */ daddu $a0, $s3, $zero /* A87F04 802414B4 0280282D */ daddu $a1, $s4, $zero /* A87F08 802414B8 0C0903C3 */ jal func_80240F0C_A8795C /* A87F0C 802414BC 02A0302D */ daddu $a2, $s5, $zero /* A87F10 802414C0 08090540 */ j .L80241500 -/* A87F14 802414C4 00000000 */ nop +/* A87F14 802414C4 00000000 */ nop +glabel L802414C8_A87F18 /* A87F18 802414C8 0260202D */ daddu $a0, $s3, $zero /* A87F1C 802414CC 0280282D */ daddu $a1, $s4, $zero /* A87F20 802414D0 0C090410 */ jal kpa_91_UnkNpcAIFunc12 /* A87F24 802414D4 02A0302D */ daddu $a2, $s5, $zero /* A87F28 802414D8 08090540 */ j .L80241500 -/* A87F2C 802414DC 00000000 */ nop +/* A87F2C 802414DC 00000000 */ nop +glabel L802414E0_A87F30 /* A87F30 802414E0 0260202D */ daddu $a0, $s3, $zero /* A87F34 802414E4 0280282D */ daddu $a1, $s4, $zero /* A87F38 802414E8 0C090469 */ jal kpa_91_set_script_owner_npc_col_height /* A87F3C 802414EC 02A0302D */ daddu $a2, $s5, $zero /* A87F40 802414F0 08090540 */ j .L80241500 -/* A87F44 802414F4 00000000 */ nop +/* A87F44 802414F4 00000000 */ nop +glabel L802414F8_A87F48 /* A87F48 802414F8 0C0129CF */ jal func_8004A73C /* A87F4C 802414FC 0260202D */ daddu $a0, $s3, $zero .L80241500: +glabel L80241500_A87F50 /* A87F50 80241500 8FBF0068 */ lw $ra, 0x68($sp) /* A87F54 80241504 8FB50064 */ lw $s5, 0x64($sp) /* A87F58 80241508 8FB40060 */ lw $s4, 0x60($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241570_A87FC0.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241570_A87FC0.s index 9ceb1c46b4..f9481040ad 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241570_A87FC0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241570_A87FC0.s @@ -22,7 +22,7 @@ glabel func_80241570_A87FC0 /* A88004 802415B4 0C04DF93 */ jal func_80137E4C /* A88008 802415B8 24070091 */ addiu $a3, $zero, 0x91 /* A8800C 802415BC 44900000 */ mtc1 $s0, $f0 -/* A88010 802415C0 00000000 */ nop +/* A88010 802415C0 00000000 */ nop /* A88014 802415C4 46800020 */ cvt.s.w $f0, $f0 /* A88018 802415C8 44050000 */ mfc1 $a1, $f0 /* A8801C 802415CC 0C04DF62 */ jal func_80137D88 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802415EC_A8803C.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802415EC_A8803C.s index 4d60a1ad57..26c0a024ec 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802415EC_A8803C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802415EC_A8803C.s @@ -16,7 +16,7 @@ glabel func_802415EC_A8803C /* A88068 80241618 0C0B1EAF */ jal get_variable /* A8806C 8024161C 0040802D */ daddu $s0, $v0, $zero /* A88070 80241620 44820000 */ mtc1 $v0, $f0 -/* A88074 80241624 00000000 */ nop +/* A88074 80241624 00000000 */ nop /* A88078 80241628 46800020 */ cvt.s.w $f0, $f0 /* A8807C 8024162C 24020002 */ addiu $v0, $zero, 2 /* A88080 80241630 00501804 */ sllv $v1, $s0, $v0 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416E8_A88138.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416E8_A88138.s index 765a502002..be55592e93 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416E8_A88138.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416E8_A88138.s @@ -12,7 +12,7 @@ glabel func_802416E8_A88138 /* A88154 80241704 80A30006 */ lb $v1, 6($a1) /* A88158 80241708 80A20005 */ lb $v0, 5($a1) /* A8815C 8024170C 14620007 */ bne $v1, $v0, .L8024172C -/* A88160 80241710 00000000 */ nop +/* A88160 80241710 00000000 */ nop /* A88164 80241714 80C2028E */ lb $v0, 0x28e($a2) /* A88168 80241718 84C30290 */ lh $v1, 0x290($a2) /* A8816C 8024171C 00021200 */ sll $v0, $v0, 8 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024181C_A8826C.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024181C_A8826C.s index e4bb364fb9..26a499d3db 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024181C_A8826C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024181C_A8826C.s @@ -4,6 +4,6 @@ glabel func_8024181C_A8826C /* A8826C 8024181C 03E00008 */ jr $ra /* A88270 80241820 24020002 */ addiu $v0, $zero, 2 -/* A88274 80241824 00000000 */ nop -/* A88278 80241828 00000000 */ nop -/* A8827C 8024182C 00000000 */ nop +/* A88274 80241824 00000000 */ nop +/* A88278 80241828 00000000 */ nop +/* A8827C 8024182C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802400E0_A8CB60.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802400E0_A8CB60.s index f6076ed4ee..2094497e50 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802400E0_A8CB60.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802400E0_A8CB60.s @@ -45,7 +45,7 @@ glabel func_802400E0_A8CB60 /* A8CBFC 8024017C 0C00A7B5 */ jal dist2D /* A8CC00 80240180 4600B386 */ mov.s $f14, $f22 /* A8CC04 80240184 4614003C */ c.lt.s $f0, $f20 -/* A8CC08 80240188 00000000 */ nop +/* A8CC08 80240188 00000000 */ nop /* A8CC0C 8024018C 45000003 */ bc1f .L8024019C /* A8CC10 80240190 2631000C */ addiu $s1, $s1, 0xc /* A8CC14 80240194 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_802400E0_A8CB60 /* A8CC40 802401C0 8E6200D0 */ lw $v0, 0xd0($s3) /* A8CC44 802401C4 8C42007C */ lw $v0, 0x7c($v0) /* A8CC48 802401C8 04410004 */ bgez $v0, .L802401DC -/* A8CC4C 802401CC 00000000 */ nop +/* A8CC4C 802401CC 00000000 */ nop /* A8CC50 802401D0 C6C00000 */ lwc1 $f0, ($s6) /* A8CC54 802401D4 0809007F */ j .L802401FC /* A8CC58 802401D8 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_802400E0_A8CB60 /* A8CC5C 802401DC 3C018024 */ lui $at, %hi(D_80245A00) /* A8CC60 802401E0 D4225A00 */ ldc1 $f2, %lo(D_80245A00)($at) /* A8CC64 802401E4 44820000 */ mtc1 $v0, $f0 -/* A8CC68 802401E8 00000000 */ nop +/* A8CC68 802401E8 00000000 */ nop /* A8CC6C 802401EC 46800021 */ cvt.d.w $f0, $f0 /* A8CC70 802401F0 46220003 */ div.d $f0, $f0, $f2 /* A8CC74 802401F4 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240238_A8CCB8.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240238_A8CCB8.s index 9775fe8ecf..e91c9bcfe6 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240238_A8CCB8.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240238_A8CCB8.s @@ -44,7 +44,7 @@ glabel func_80240238_A8CCB8 /* A8CD54 802402D4 2402000F */ addiu $v0, $zero, 0xf /* A8CD58 802402D8 AFA2001C */ sw $v0, 0x1c($sp) /* A8CD5C 802402DC 44833000 */ mtc1 $v1, $f6 -/* A8CD60 802402E0 00000000 */ nop +/* A8CD60 802402E0 00000000 */ nop /* A8CD64 802402E4 468031A0 */ cvt.s.w $f6, $f6 /* A8CD68 802402E8 44073000 */ mfc1 $a3, $f6 /* A8CD6C 802402EC 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_80240238_A8CCB8 .L8024033C: /* A8CDBC 8024033C 8602008C */ lh $v0, 0x8c($s0) /* A8CDC0 80240340 1440005D */ bnez $v0, .L802404B8 -/* A8CDC4 80240344 00000000 */ nop +/* A8CDC4 80240344 00000000 */ nop /* A8CDC8 80240348 C6000018 */ lwc1 $f0, 0x18($s0) /* A8CDCC 8024034C 3C014010 */ lui $at, 0x4010 /* A8CDD0 80240350 44811800 */ mtc1 $at, $f3 /* A8CDD4 80240354 44801000 */ mtc1 $zero, $f2 /* A8CDD8 80240358 46000021 */ cvt.d.s $f0, $f0 /* A8CDDC 8024035C 4622003C */ c.lt.d $f0, $f2 -/* A8CDE0 80240360 00000000 */ nop +/* A8CDE0 80240360 00000000 */ nop /* A8CDE4 80240364 45000003 */ bc1f .L80240374 /* A8CDE8 80240368 0200202D */ daddu $a0, $s0, $zero /* A8CDEC 8024036C 080900DE */ j .L80240378 @@ -88,7 +88,7 @@ glabel func_80240238_A8CCB8 /* A8CDF4 80240374 24050001 */ addiu $a1, $zero, 1 .L80240378: /* A8CDF8 80240378 0C00F598 */ jal func_8003D660 -/* A8CDFC 8024037C 00000000 */ nop +/* A8CDFC 8024037C 00000000 */ nop /* A8CE00 80240380 C60C0038 */ lwc1 $f12, 0x38($s0) /* A8CE04 80240384 8E430078 */ lw $v1, 0x78($s2) /* A8CE08 80240388 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_80240238_A8CCB8 /* A8CE30 802403B0 4406B000 */ mfc1 $a2, $f22 /* A8CE34 802403B4 4407A000 */ mfc1 $a3, $f20 /* A8CE38 802403B8 0C00A720 */ jal atan2 -/* A8CE3C 802403BC 00000000 */ nop +/* A8CE3C 802403BC 00000000 */ nop /* A8CE40 802403C0 8E050018 */ lw $a1, 0x18($s0) /* A8CE44 802403C4 44060000 */ mfc1 $a2, $f0 /* A8CE48 802403C8 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_80240238_A8CCB8 /* A8CE5C 802403DC 4406B000 */ mfc1 $a2, $f22 /* A8CE60 802403E0 4407A000 */ mfc1 $a3, $f20 /* A8CE64 802403E4 0C00A7B5 */ jal dist2D -/* A8CE68 802403E8 00000000 */ nop +/* A8CE68 802403E8 00000000 */ nop /* A8CE6C 802403EC C6020018 */ lwc1 $f2, 0x18($s0) /* A8CE70 802403F0 4602003E */ c.le.s $f0, $f2 -/* A8CE74 802403F4 00000000 */ nop +/* A8CE74 802403F4 00000000 */ nop /* A8CE78 802403F8 4500002F */ bc1f .L802404B8 /* A8CE7C 802403FC 240403E8 */ addiu $a0, $zero, 0x3e8 /* A8CE80 80240400 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_80240238_A8CCB8 /* A8CED4 80240454 18400003 */ blez $v0, .L80240464 /* A8CED8 80240458 24020004 */ addiu $v0, $zero, 4 /* A8CEDC 8024045C 14600002 */ bnez $v1, .L80240468 -/* A8CEE0 80240460 00000000 */ nop +/* A8CEE0 80240460 00000000 */ nop .L80240464: /* A8CEE4 80240464 AE420070 */ sw $v0, 0x70($s2) .L80240468: diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802405A0_A8D020.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802405A0_A8D020.s index 8c34132323..559f603a73 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802405A0_A8D020.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802405A0_A8D020.s @@ -38,7 +38,7 @@ glabel func_802405A0_A8D020 /* A8D0A4 80240624 2402000F */ addiu $v0, $zero, 0xf /* A8D0A8 80240628 AFA2001C */ sw $v0, 0x1c($sp) /* A8D0AC 8024062C 44833000 */ mtc1 $v1, $f6 -/* A8D0B0 80240630 00000000 */ nop +/* A8D0B0 80240630 00000000 */ nop /* A8D0B4 80240634 468031A0 */ cvt.s.w $f6, $f6 /* A8D0B8 80240638 44073000 */ mfc1 $a3, $f6 /* A8D0BC 8024063C 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_802405A0_A8D020 .L802406A0: /* A8D120 802406A0 8602008C */ lh $v0, 0x8c($s0) /* A8D124 802406A4 14400025 */ bnez $v0, .L8024073C -/* A8D128 802406A8 00000000 */ nop +/* A8D128 802406A8 00000000 */ nop /* A8D12C 802406AC 9602008E */ lhu $v0, 0x8e($s0) /* A8D130 802406B0 2442FFFF */ addiu $v0, $v0, -1 /* A8D134 802406B4 A602008E */ sh $v0, 0x8e($s0) /* A8D138 802406B8 00021400 */ sll $v0, $v0, 0x10 /* A8D13C 802406BC 1440001F */ bnez $v0, .L8024073C -/* A8D140 802406C0 00000000 */ nop +/* A8D140 802406C0 00000000 */ nop /* A8D144 802406C4 8E820074 */ lw $v0, 0x74($s4) /* A8D148 802406C8 2442FFFF */ addiu $v0, $v0, -1 /* A8D14C 802406CC 10400019 */ beqz $v0, .L80240734 @@ -84,7 +84,7 @@ glabel func_802405A0_A8D020 /* A8D158 802406D8 9442002A */ lhu $v0, 0x2a($v0) /* A8D15C 802406DC 30420010 */ andi $v0, $v0, 0x10 /* A8D160 802406E0 14400007 */ bnez $v0, .L80240700 -/* A8D164 802406E4 00000000 */ nop +/* A8D164 802406E4 00000000 */ nop /* A8D168 802406E8 C600000C */ lwc1 $f0, 0xc($s0) /* A8D16C 802406EC 3C014334 */ lui $at, 0x4334 /* A8D170 802406F0 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024075C_A8D1DC.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024075C_A8D1DC.s index fb440bb1b1..57b5ed1bb1 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024075C_A8D1DC.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024075C_A8D1DC.s @@ -28,7 +28,7 @@ glabel func_8024075C_A8D1DC /* A8D234 802407B4 8E0200D0 */ lw $v0, 0xd0($s0) /* A8D238 802407B8 8C42007C */ lw $v0, 0x7c($v0) /* A8D23C 802407BC 04410004 */ bgez $v0, .L802407D0 -/* A8D240 802407C0 00000000 */ nop +/* A8D240 802407C0 00000000 */ nop /* A8D244 802407C4 C6400000 */ lwc1 $f0, ($s2) /* A8D248 802407C8 080901FC */ j .L802407F0 /* A8D24C 802407CC E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_8024075C_A8D1DC /* A8D250 802407D0 3C018024 */ lui $at, %hi(D_80245A08) /* A8D254 802407D4 D4225A08 */ ldc1 $f2, %lo(D_80245A08)($at) /* A8D258 802407D8 44820000 */ mtc1 $v0, $f0 -/* A8D25C 802407DC 00000000 */ nop +/* A8D25C 802407DC 00000000 */ nop /* A8D260 802407E0 46800021 */ cvt.d.w $f0, $f0 /* A8D264 802407E4 46220003 */ div.d $f0, $f0, $f2 /* A8D268 802407E8 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802408FC_A8D37C.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802408FC_A8D37C.s index 2fbb458fa6..abccd3eb78 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802408FC_A8D37C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802408FC_A8D37C.s @@ -47,20 +47,20 @@ glabel func_802408FC_A8D37C /* A8D424 802409A4 8E02001C */ lw $v0, 0x1c($s0) /* A8D428 802409A8 46001005 */ abs.s $f0, $f2 /* A8D42C 802409AC 44822000 */ mtc1 $v0, $f4 -/* A8D430 802409B0 00000000 */ nop +/* A8D430 802409B0 00000000 */ nop /* A8D434 802409B4 46802120 */ cvt.s.w $f4, $f4 /* A8D438 802409B8 4600203C */ c.lt.s $f4, $f0 -/* A8D43C 802409BC 00000000 */ nop +/* A8D43C 802409BC 00000000 */ nop /* A8D440 802409C0 4500000D */ bc1f .L802409F8 -/* A8D444 802409C4 00000000 */ nop +/* A8D444 802409C4 00000000 */ nop /* A8D448 802409C8 44800000 */ mtc1 $zero, $f0 /* A8D44C 802409CC C654000C */ lwc1 $f20, 0xc($s2) /* A8D450 802409D0 4600103C */ c.lt.s $f2, $f0 -/* A8D454 802409D4 00000000 */ nop +/* A8D454 802409D4 00000000 */ nop /* A8D458 802409D8 45000006 */ bc1f .L802409F4 /* A8D45C 802409DC 00021023 */ negu $v0, $v0 /* A8D460 802409E0 44820000 */ mtc1 $v0, $f0 -/* A8D464 802409E4 00000000 */ nop +/* A8D464 802409E4 00000000 */ nop /* A8D468 802409E8 46800020 */ cvt.s.w $f0, $f0 /* A8D46C 802409EC 0809027E */ j .L802409F8 /* A8D470 802409F0 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240A2C_A8D4AC.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240A2C_A8D4AC.s index 8ce82d253f..9d2539fde8 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240A2C_A8D4AC.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240A2C_A8D4AC.s @@ -37,7 +37,7 @@ glabel func_80240A2C_A8D4AC /* A8D52C 80240AAC 2402000F */ addiu $v0, $zero, 0xf /* A8D530 80240AB0 AFA2001C */ sw $v0, 0x1c($sp) /* A8D534 80240AB4 44833000 */ mtc1 $v1, $f6 -/* A8D538 80240AB8 00000000 */ nop +/* A8D538 80240AB8 00000000 */ nop /* A8D53C 80240ABC 468031A0 */ cvt.s.w $f6, $f6 /* A8D540 80240AC0 44073000 */ mfc1 $a3, $f6 /* A8D544 80240AC4 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240BB4_A8D634.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240BB4_A8D634.s index 00c2326927..d740886ec2 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240BB4_A8D634.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240BB4_A8D634.s @@ -28,7 +28,7 @@ glabel func_80240BB4_A8D634 /* A8D68C 80240C0C C4400008 */ lwc1 $f0, 8($v0) /* A8D690 80240C10 46800020 */ cvt.s.w $f0, $f0 /* A8D694 80240C14 4602003E */ c.le.s $f0, $f2 -/* A8D698 80240C18 00000000 */ nop +/* A8D698 80240C18 00000000 */ nop /* A8D69C 80240C1C 45020003 */ bc1fl .L80240C2C /* A8D6A0 80240C20 24840001 */ addiu $a0, $a0, 1 /* A8D6A4 80240C24 0809030F */ j .L80240C3C diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s index 91d6957350..ce63b095e6 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s @@ -46,7 +46,7 @@ glabel func_80240C74_A8D6F4 /* A8D798 80240D18 8E2200B0 */ lw $v0, 0xb0($s1) /* A8D79C 80240D1C 30420004 */ andi $v0, $v0, 4 /* A8D7A0 80240D20 10400044 */ beqz $v0, .L80240E34 -/* A8D7A4 80240D24 00000000 */ nop +/* A8D7A4 80240D24 00000000 */ nop .L80240D28: /* A8D7A8 80240D28 2404F7FF */ addiu $a0, $zero, -0x801 /* A8D7AC 80240D2C AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80240C74_A8D6F4 /* A8D860 80240DE0 3C0142C8 */ lui $at, 0x42c8 /* A8D864 80240DE4 44812000 */ mtc1 $at, $f4 /* A8D868 80240DE8 44823000 */ mtc1 $v0, $f6 -/* A8D86C 80240DEC 00000000 */ nop +/* A8D86C 80240DEC 00000000 */ nop /* A8D870 80240DF0 468031A0 */ cvt.s.w $f6, $f6 /* A8D874 80240DF4 27A20044 */ addiu $v0, $sp, 0x44 /* A8D878 80240DF8 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80240C74_A8D6F4 /* A8D89C 80240E1C 0C0372DF */ jal func_800DCB7C /* A8D8A0 80240E20 27A70040 */ addiu $a3, $sp, 0x40 /* A8D8A4 80240E24 10400003 */ beqz $v0, .L80240E34 -/* A8D8A8 80240E28 00000000 */ nop +/* A8D8A8 80240E28 00000000 */ nop /* A8D8AC 80240E2C C7A0003C */ lwc1 $f0, 0x3c($sp) /* A8D8B0 80240E30 E640003C */ swc1 $f0, 0x3c($s2) .L80240E34: @@ -124,72 +124,85 @@ glabel func_80240C74_A8D6F4 /* A8D8B8 80240E38 2C620064 */ sltiu $v0, $v1, 0x64 /* A8D8BC 80240E3C 10400042 */ beqz $v0, .L80240F48 /* A8D8C0 80240E40 00031080 */ sll $v0, $v1, 2 -/* A8D8C4 80240E44 3C018024 */ lui $at, %hi(func_80245A10_806290) +/* A8D8C4 80240E44 3C018024 */ lui $at, %hi(jtbl_80245A10_A92490) /* A8D8C8 80240E48 00220821 */ addu $at, $at, $v0 -/* A8D8CC 80240E4C 8C225A10 */ lw $v0, %lo(func_80245A10_806290)($at) +/* A8D8CC 80240E4C 8C225A10 */ lw $v0, %lo(jtbl_80245A10_A92490)($at) /* A8D8D0 80240E50 00400008 */ jr $v0 -/* A8D8D4 80240E54 00000000 */ nop +/* A8D8D4 80240E54 00000000 */ nop +glabel L80240E58_A8D8D8 /* A8D8D8 80240E58 0280202D */ daddu $a0, $s4, $zero /* A8D8DC 80240E5C 0260282D */ daddu $a1, $s3, $zero /* A8D8E0 80240E60 0C090038 */ jal func_802400E0_A8CB60 /* A8D8E4 80240E64 02A0302D */ daddu $a2, $s5, $zero +glabel L80240E68_A8D8E8 /* A8D8E8 80240E68 0280202D */ daddu $a0, $s4, $zero /* A8D8EC 80240E6C 0260282D */ daddu $a1, $s3, $zero /* A8D8F0 80240E70 0C09008E */ jal func_80240238_A8CCB8 /* A8D8F4 80240E74 02A0302D */ daddu $a2, $s5, $zero /* A8D8F8 80240E78 080903D2 */ j .L80240F48 -/* A8D8FC 80240E7C 00000000 */ nop +/* A8D8FC 80240E7C 00000000 */ nop +glabel L80240E80_A8D900 /* A8D900 80240E80 0280202D */ daddu $a0, $s4, $zero /* A8D904 80240E84 0260282D */ daddu $a1, $s3, $zero /* A8D908 80240E88 0C090138 */ jal kpa_95_UnkNpcAIFunc1 /* A8D90C 80240E8C 02A0302D */ daddu $a2, $s5, $zero +glabel L80240E90_A8D910 /* A8D910 80240E90 0280202D */ daddu $a0, $s4, $zero /* A8D914 80240E94 0260282D */ daddu $a1, $s3, $zero /* A8D918 80240E98 0C090168 */ jal func_802405A0_A8D020 /* A8D91C 80240E9C 02A0302D */ daddu $a2, $s5, $zero /* A8D920 80240EA0 080903D2 */ j .L80240F48 -/* A8D924 80240EA4 00000000 */ nop +/* A8D924 80240EA4 00000000 */ nop +glabel L80240EA8_A8D928 /* A8D928 80240EA8 0280202D */ daddu $a0, $s4, $zero /* A8D92C 80240EAC 0260282D */ daddu $a1, $s3, $zero /* A8D930 80240EB0 0C0901D7 */ jal func_8024075C_A8D1DC /* A8D934 80240EB4 02A0302D */ daddu $a2, $s5, $zero /* A8D938 80240EB8 080903D2 */ j .L80240F48 -/* A8D93C 80240EBC 00000000 */ nop +/* A8D93C 80240EBC 00000000 */ nop +glabel L80240EC0_A8D940 /* A8D940 80240EC0 0280202D */ daddu $a0, $s4, $zero /* A8D944 80240EC4 0260282D */ daddu $a1, $s3, $zero /* A8D948 80240EC8 0C090204 */ jal kpa_95_NpcJumpFunc2 /* A8D94C 80240ECC 02A0302D */ daddu $a2, $s5, $zero +glabel L80240ED0_A8D950 /* A8D950 80240ED0 0280202D */ daddu $a0, $s4, $zero /* A8D954 80240ED4 0260282D */ daddu $a1, $s3, $zero /* A8D958 80240ED8 0C090221 */ jal kpa_95_NpcJumpFunc /* A8D95C 80240EDC 02A0302D */ daddu $a2, $s5, $zero /* A8D960 80240EE0 080903D2 */ j .L80240F48 -/* A8D964 80240EE4 00000000 */ nop +/* A8D964 80240EE4 00000000 */ nop +glabel L80240EE8_A8D968 /* A8D968 80240EE8 0280202D */ daddu $a0, $s4, $zero /* A8D96C 80240EEC 0260282D */ daddu $a1, $s3, $zero /* A8D970 80240EF0 0C09023F */ jal func_802408FC_A8D37C /* A8D974 80240EF4 02A0302D */ daddu $a2, $s5, $zero +glabel L80240EF8_A8D978 /* A8D978 80240EF8 0280202D */ daddu $a0, $s4, $zero /* A8D97C 80240EFC 0260282D */ daddu $a1, $s3, $zero /* A8D980 80240F00 0C09028B */ jal func_80240A2C_A8D4AC /* A8D984 80240F04 02A0302D */ daddu $a2, $s5, $zero /* A8D988 80240F08 080903D2 */ j .L80240F48 -/* A8D98C 80240F0C 00000000 */ nop +/* A8D98C 80240F0C 00000000 */ nop +glabel L80240F10_A8D990 /* A8D990 80240F10 0280202D */ daddu $a0, $s4, $zero /* A8D994 80240F14 0260282D */ daddu $a1, $s3, $zero /* A8D998 80240F18 0C0902D3 */ jal kpa_95_UnkNpcDurationFlagFunc /* A8D99C 80240F1C 02A0302D */ daddu $a2, $s5, $zero /* A8D9A0 80240F20 080903D2 */ j .L80240F48 -/* A8D9A4 80240F24 00000000 */ nop +/* A8D9A4 80240F24 00000000 */ nop +glabel L80240F28_A8D9A8 /* A8D9A8 80240F28 0280202D */ daddu $a0, $s4, $zero /* A8D9AC 80240F2C 0260282D */ daddu $a1, $s3, $zero /* A8D9B0 80240F30 0C0902ED */ jal func_80240BB4_A8D634 /* A8D9B4 80240F34 02A0302D */ daddu $a2, $s5, $zero /* A8D9B8 80240F38 080903D2 */ j .L80240F48 -/* A8D9BC 80240F3C 00000000 */ nop +/* A8D9BC 80240F3C 00000000 */ nop +glabel L80240F40_A8D9C0 /* A8D9C0 80240F40 0C0129CF */ jal func_8004A73C /* A8D9C4 80240F44 0280202D */ daddu $a0, $s4, $zero .L80240F48: +glabel L80240F48_A8D9C8 /* A8D9C8 80240F48 8FBF0060 */ lw $ra, 0x60($sp) /* A8D9CC 80240F4C 8FB5005C */ lw $s5, 0x5c($sp) /* A8D9D0 80240F50 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240FEC_A8DA6C.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240FEC_A8DA6C.s index 72c8497433..8dd623b517 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240FEC_A8DA6C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240FEC_A8DA6C.s @@ -21,11 +21,11 @@ glabel func_80240FEC_A8DA6C /* A8DAAC 8024102C A602008E */ sh $v0, 0x8e($s0) /* A8DAB0 80241030 00021400 */ sll $v0, $v0, 0x10 /* A8DAB4 80241034 1C400033 */ bgtz $v0, .L80241104 -/* A8DAB8 80241038 00000000 */ nop +/* A8DAB8 80241038 00000000 */ nop .L8024103C: /* A8DABC 8024103C 8602008C */ lh $v0, 0x8c($s0) /* A8DAC0 80241040 14400030 */ bnez $v0, .L80241104 -/* A8DAC4 80241044 00000000 */ nop +/* A8DAC4 80241044 00000000 */ nop /* A8DAC8 80241048 8E2200CC */ lw $v0, 0xcc($s1) /* A8DACC 8024104C 8C420024 */ lw $v0, 0x24($v0) /* A8DAD0 80241050 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_80240FEC_A8DA6C /* A8DADC 8024105C 8E230088 */ lw $v1, 0x88($s1) /* A8DAE0 80241060 24020005 */ addiu $v0, $zero, 5 /* A8DAE4 80241064 10620005 */ beq $v1, $v0, .L8024107C -/* A8DAE8 80241068 00000000 */ nop +/* A8DAE8 80241068 00000000 */ nop /* A8DAEC 8024106C 10600003 */ beqz $v1, .L8024107C /* A8DAF0 80241070 24020001 */ addiu $v0, $zero, 1 /* A8DAF4 80241074 14620006 */ bne $v1, $v0, .L80241090 -/* A8DAF8 80241078 00000000 */ nop +/* A8DAF8 80241078 00000000 */ nop .L8024107C: /* A8DAFC 8024107C 8E220084 */ lw $v0, 0x84($s1) /* A8DB00 80241080 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_80240FEC_A8DA6C /* A8DB40 802410C0 46220000 */ add.d $f0, $f0, $f2 /* A8DB44 802410C4 4620010D */ trunc.w.d $f4, $f0 /* A8DB48 802410C8 44022000 */ mfc1 $v0, $f4 -/* A8DB4C 802410CC 00000000 */ nop +/* A8DB4C 802410CC 00000000 */ nop /* A8DB50 802410D0 A602008E */ sh $v0, 0x8e($s0) /* A8DB54 802410D4 00021400 */ sll $v0, $v0, 0x10 /* A8DB58 802410D8 8E230078 */ lw $v1, 0x78($s1) /* A8DB5C 802410DC 00021403 */ sra $v0, $v0, 0x10 /* A8DB60 802410E0 0043102A */ slt $v0, $v0, $v1 /* A8DB64 802410E4 10400003 */ beqz $v0, .L802410F4 -/* A8DB68 802410E8 00000000 */ nop +/* A8DB68 802410E8 00000000 */ nop /* A8DB6C 802410EC 9622007A */ lhu $v0, 0x7a($s1) /* A8DB70 802410F0 A602008E */ sh $v0, 0x8e($s0) .L802410F4: diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s index 0f7b4af5f3..dce8c7388a 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s @@ -53,7 +53,7 @@ glabel func_80241304_A8DD84 /* A8DE40 802413C0 8E2200B0 */ lw $v0, 0xb0($s1) /* A8DE44 802413C4 30420004 */ andi $v0, $v0, 4 /* A8DE48 802413C8 10400048 */ beqz $v0, .L802414EC -/* A8DE4C 802413CC 00000000 */ nop +/* A8DE4C 802413CC 00000000 */ nop .L802413D0: /* A8DE50 802413D0 A640008E */ sh $zero, 0x8e($s2) /* A8DE54 802413D4 AE600070 */ sw $zero, 0x70($s3) @@ -103,7 +103,7 @@ glabel func_80241304_A8DD84 /* A8DEFC 8024147C 24020028 */ addiu $v0, $zero, 0x28 /* A8DF00 80241480 AFA2001C */ sw $v0, 0x1c($sp) /* A8DF04 80241484 44833000 */ mtc1 $v1, $f6 -/* A8DF08 80241488 00000000 */ nop +/* A8DF08 80241488 00000000 */ nop /* A8DF0C 8024148C 468031A0 */ cvt.s.w $f6, $f6 /* A8DF10 80241490 44073000 */ mfc1 $a3, $f6 /* A8DF14 80241494 27A20048 */ addiu $v0, $sp, 0x48 @@ -134,64 +134,75 @@ glabel func_80241304_A8DD84 /* A8DF70 802414F0 2C620064 */ sltiu $v0, $v1, 0x64 /* A8DF74 802414F4 1040003A */ beqz $v0, .L802415E0 /* A8DF78 802414F8 00031080 */ sll $v0, $v1, 2 -/* A8DF7C 802414FC 3C018024 */ lui $at, %hi(D_80245BA8) +/* A8DF7C 802414FC 3C018024 */ lui $at, %hi(jtbl_80245BA8_A92628) /* A8DF80 80241500 00220821 */ addu $at, $at, $v0 -/* A8DF84 80241504 8C225BA8 */ lw $v0, %lo(D_80245BA8)($at) +/* A8DF84 80241504 8C225BA8 */ lw $v0, %lo(jtbl_80245BA8_A92628)($at) /* A8DF88 80241508 00400008 */ jr $v0 -/* A8DF8C 8024150C 00000000 */ nop +/* A8DF8C 8024150C 00000000 */ nop +glabel L80241510_A8DF90 /* A8DF90 80241510 0260202D */ daddu $a0, $s3, $zero /* A8DF94 80241514 0280282D */ daddu $a1, $s4, $zero /* A8DF98 80241518 0C090038 */ jal func_802400E0_A8CB60 /* A8DF9C 8024151C 02A0302D */ daddu $a2, $s5, $zero /* A8DFA0 80241520 96220086 */ lhu $v0, 0x86($s1) /* A8DFA4 80241524 A64200A8 */ sh $v0, 0xa8($s2) +glabel L80241528_A8DFA8 /* A8DFA8 80241528 0260202D */ daddu $a0, $s3, $zero /* A8DFAC 8024152C 0280282D */ daddu $a1, $s4, $zero /* A8DFB0 80241530 0C09008E */ jal func_80240238_A8CCB8 /* A8DFB4 80241534 02A0302D */ daddu $a2, $s5, $zero /* A8DFB8 80241538 08090578 */ j .L802415E0 -/* A8DFBC 8024153C 00000000 */ nop +/* A8DFBC 8024153C 00000000 */ nop +glabel L80241540_A8DFC0 /* A8DFC0 80241540 0260202D */ daddu $a0, $s3, $zero /* A8DFC4 80241544 0280282D */ daddu $a1, $s4, $zero /* A8DFC8 80241548 0C090138 */ jal kpa_95_UnkNpcAIFunc1 /* A8DFCC 8024154C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241550_A8DFD0 /* A8DFD0 80241550 0260202D */ daddu $a0, $s3, $zero /* A8DFD4 80241554 0280282D */ daddu $a1, $s4, $zero /* A8DFD8 80241558 0C090168 */ jal func_802405A0_A8D020 /* A8DFDC 8024155C 02A0302D */ daddu $a2, $s5, $zero /* A8DFE0 80241560 08090578 */ j .L802415E0 -/* A8DFE4 80241564 00000000 */ nop +/* A8DFE4 80241564 00000000 */ nop +glabel L80241568_A8DFE8 /* A8DFE8 80241568 0260202D */ daddu $a0, $s3, $zero /* A8DFEC 8024156C 0280282D */ daddu $a1, $s4, $zero /* A8DFF0 80241570 0C0901D7 */ jal func_8024075C_A8D1DC /* A8DFF4 80241574 02A0302D */ daddu $a2, $s5, $zero /* A8DFF8 80241578 08090578 */ j .L802415E0 -/* A8DFFC 8024157C 00000000 */ nop +/* A8DFFC 8024157C 00000000 */ nop +glabel L80241580_A8E000 /* A8E000 80241580 0260202D */ daddu $a0, $s3, $zero /* A8E004 80241584 0280282D */ daddu $a1, $s4, $zero /* A8E008 80241588 0C0903DC */ jal kpa_95_set_script_owner_npc_anim /* A8E00C 8024158C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241590_A8E010 /* A8E010 80241590 0260202D */ daddu $a0, $s3, $zero /* A8E014 80241594 0280282D */ daddu $a1, $s4, $zero /* A8E018 80241598 0C0903FB */ jal func_80240FEC_A8DA6C /* A8E01C 8024159C 02A0302D */ daddu $a2, $s5, $zero /* A8E020 802415A0 08090578 */ j .L802415E0 -/* A8E024 802415A4 00000000 */ nop +/* A8E024 802415A4 00000000 */ nop +glabel L802415A8_A8E028 /* A8E028 802415A8 0260202D */ daddu $a0, $s3, $zero /* A8E02C 802415AC 0280282D */ daddu $a1, $s4, $zero /* A8E030 802415B0 0C090448 */ jal func_80241120_A8DBA0 /* A8E034 802415B4 02A0302D */ daddu $a2, $s5, $zero /* A8E038 802415B8 08090578 */ j .L802415E0 -/* A8E03C 802415BC 00000000 */ nop +/* A8E03C 802415BC 00000000 */ nop +glabel L802415C0_A8E040 /* A8E040 802415C0 0260202D */ daddu $a0, $s3, $zero /* A8E044 802415C4 0280282D */ daddu $a1, $s4, $zero /* A8E048 802415C8 0C0904A1 */ jal kpa_95_set_script_owner_npc_col_height /* A8E04C 802415CC 02A0302D */ daddu $a2, $s5, $zero /* A8E050 802415D0 08090578 */ j .L802415E0 -/* A8E054 802415D4 00000000 */ nop +/* A8E054 802415D4 00000000 */ nop +glabel L802415D8_A8E058 /* A8E058 802415D8 0C0129CF */ jal func_8004A73C /* A8E05C 802415DC 0260202D */ daddu $a0, $s3, $zero .L802415E0: +glabel L802415E0_A8E060 /* A8E060 802415E0 8FBF0068 */ lw $ra, 0x68($sp) /* A8E064 802415E4 8FB50064 */ lw $s5, 0x64($sp) /* A8E068 802415E8 8FB40060 */ lw $s4, 0x60($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241650_A8E0D0.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241650_A8E0D0.s index e0bbd99356..c12542e138 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241650_A8E0D0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241650_A8E0D0.s @@ -22,7 +22,7 @@ glabel func_80241650_A8E0D0 /* A8E114 80241694 0C04DF93 */ jal func_80137E4C /* A8E118 80241698 24070091 */ addiu $a3, $zero, 0x91 /* A8E11C 8024169C 44900000 */ mtc1 $s0, $f0 -/* A8E120 802416A0 00000000 */ nop +/* A8E120 802416A0 00000000 */ nop /* A8E124 802416A4 46800020 */ cvt.s.w $f0, $f0 /* A8E128 802416A8 44050000 */ mfc1 $a1, $f0 /* A8E12C 802416AC 0C04DF62 */ jal func_80137D88 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802416CC_A8E14C.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802416CC_A8E14C.s index dd2bc3c826..98df38dd6a 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802416CC_A8E14C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802416CC_A8E14C.s @@ -16,7 +16,7 @@ glabel func_802416CC_A8E14C /* A8E178 802416F8 0C0B1EAF */ jal get_variable /* A8E17C 802416FC 0040802D */ daddu $s0, $v0, $zero /* A8E180 80241700 44820000 */ mtc1 $v0, $f0 -/* A8E184 80241704 00000000 */ nop +/* A8E184 80241704 00000000 */ nop /* A8E188 80241708 46800020 */ cvt.s.w $f0, $f0 /* A8E18C 8024170C 24020002 */ addiu $v0, $zero, 2 /* A8E190 80241710 00501804 */ sllv $v1, $s0, $v0 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802417C8_A8E248.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802417C8_A8E248.s index cf4cd5dfd2..ed0c0d55d9 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802417C8_A8E248.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802417C8_A8E248.s @@ -12,7 +12,7 @@ glabel func_802417C8_A8E248 /* A8E264 802417E4 80A30006 */ lb $v1, 6($a1) /* A8E268 802417E8 80A20005 */ lb $v0, 5($a1) /* A8E26C 802417EC 14620007 */ bne $v1, $v0, .L8024180C -/* A8E270 802417F0 00000000 */ nop +/* A8E270 802417F0 00000000 */ nop /* A8E274 802417F4 80C2028E */ lb $v0, 0x28e($a2) /* A8E278 802417F8 84C30290 */ lh $v1, 0x290($a2) /* A8E27C 802417FC 00021200 */ sll $v0, $v0, 8 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802418FC_A8E37C.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802418FC_A8E37C.s index cfe9f8f7f8..edd495d882 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802418FC_A8E37C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802418FC_A8E37C.s @@ -4,6 +4,6 @@ glabel func_802418FC_A8E37C /* A8E37C 802418FC 03E00008 */ jr $ra /* A8E380 80241900 24020002 */ addiu $v0, $zero, 2 -/* A8E384 80241904 00000000 */ nop -/* A8E388 80241908 00000000 */ nop -/* A8E38C 8024190C 00000000 */ nop +/* A8E384 80241904 00000000 */ nop +/* A8E388 80241908 00000000 */ nop +/* A8E38C 8024190C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_96/A927C0/func_80240000_A927C0.s b/asm/nonmatchings/world/area_kpa/kpa_96/A927C0/func_80240000_A927C0.s index 5648433c0f..d23c59e69d 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_96/A927C0/func_80240000_A927C0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_96/A927C0/func_80240000_A927C0.s @@ -13,6 +13,6 @@ glabel func_80240000_A927C0 .L8024001C: /* A927DC 8024001C 03E00008 */ jr $ra /* A927E0 80240020 24020002 */ addiu $v0, $zero, 2 -/* A927E4 80240024 00000000 */ nop -/* A927E8 80240028 00000000 */ nop -/* A927EC 8024002C 00000000 */ nop +/* A927E4 80240024 00000000 */ nop +/* A927E8 80240028 00000000 */ nop +/* A927EC 8024002C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403DC_C5AB1C.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403DC_C5AB1C.s index 22b6850ea0..4ceaf33ae3 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403DC_C5AB1C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403DC_C5AB1C.s @@ -26,17 +26,17 @@ glabel func_802403DC_C5AB1C /* C5AB70 80240430 2442A550 */ addiu $v0, $v0, %lo(gCollisionStatus) /* C5AB74 80240434 84430002 */ lh $v1, 2($v0) /* C5AB78 80240438 10710008 */ beq $v1, $s1, .L8024045C -/* C5AB7C 8024043C 00000000 */ nop +/* C5AB7C 8024043C 00000000 */ nop /* C5AB80 80240440 84420004 */ lh $v0, 4($v0) /* C5AB84 80240444 10510005 */ beq $v0, $s1, .L8024045C -/* C5AB88 80240448 00000000 */ nop +/* C5AB88 80240448 00000000 */ nop /* C5AB8C 8024044C 10700003 */ beq $v1, $s0, .L8024045C -/* C5AB90 80240450 00000000 */ nop +/* C5AB90 80240450 00000000 */ nop /* C5AB94 80240454 14500007 */ bne $v0, $s0, .L80240474 -/* C5AB98 80240458 00000000 */ nop +/* C5AB98 80240458 00000000 */ nop .L8024045C: /* C5AB9C 8024045C 44920000 */ mtc1 $s2, $f0 -/* C5ABA0 80240460 00000000 */ nop +/* C5ABA0 80240460 00000000 */ nop /* C5ABA4 80240464 46800020 */ cvt.s.w $f0, $f0 /* C5ABA8 80240468 3C028011 */ lui $v0, %hi(gPlayerStatus) /* C5ABAC 8024046C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) @@ -45,18 +45,18 @@ glabel func_802403DC_C5AB1C /* C5ABB4 80240474 3C028011 */ lui $v0, %hi(gPlayerData+0x12) /* C5ABB8 80240478 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* C5ABBC 8024047C 1040000E */ beqz $v0, .L802404B8 -/* C5ABC0 80240480 00000000 */ nop +/* C5ABC0 80240480 00000000 */ nop /* C5ABC4 80240484 0C00EABB */ jal get_npc_unsafe /* C5ABC8 80240488 2404FFFC */ addiu $a0, $zero, -4 /* C5ABCC 8024048C 84430084 */ lh $v1, 0x84($v0) /* C5ABD0 80240490 10710003 */ beq $v1, $s1, .L802404A0 -/* C5ABD4 80240494 00000000 */ nop +/* C5ABD4 80240494 00000000 */ nop /* C5ABD8 80240498 14700007 */ bne $v1, $s0, .L802404B8 -/* C5ABDC 8024049C 00000000 */ nop +/* C5ABDC 8024049C 00000000 */ nop .L802404A0: /* C5ABE0 802404A0 C4400038 */ lwc1 $f0, 0x38($v0) /* C5ABE4 802404A4 44921000 */ mtc1 $s2, $f2 -/* C5ABE8 802404A8 00000000 */ nop +/* C5ABE8 802404A8 00000000 */ nop /* C5ABEC 802404AC 468010A0 */ cvt.s.w $f2, $f2 /* C5ABF0 802404B0 46020000 */ add.s $f0, $f0, $f2 /* C5ABF4 802404B4 E4400038 */ swc1 $f0, 0x38($v0) @@ -68,6 +68,6 @@ glabel func_802403DC_C5AB1C /* C5AC08 802404C8 24020002 */ addiu $v0, $zero, 2 /* C5AC0C 802404CC 03E00008 */ jr $ra /* C5AC10 802404D0 27BD0020 */ addiu $sp, $sp, 0x20 -/* C5AC14 802404D4 00000000 */ nop -/* C5AC18 802404D8 00000000 */ nop -/* C5AC1C 802404DC 00000000 */ nop +/* C5AC14 802404D4 00000000 */ nop +/* C5AC18 802404D8 00000000 */ nop +/* C5AC1C 802404DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802404E0_C5AC20.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802404E0_C5AC20.s index d84dd320fc..dfd80f9a4c 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802404E0_C5AC20.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802404E0_C5AC20.s @@ -47,7 +47,7 @@ glabel func_802404E0_C5AC20 /* C5ACC8 80240588 0C0123F5 */ jal is_point_within_region /* C5ACCC 8024058C 8E070038 */ lw $a3, 0x38($s0) /* C5ACD0 80240590 1040000E */ beqz $v0, .L802405CC -/* C5ACD4 80240594 00000000 */ nop +/* C5ACD4 80240594 00000000 */ nop /* C5ACD8 80240598 8E2200D0 */ lw $v0, 0xd0($s1) /* C5ACDC 8024059C C60C0038 */ lwc1 $f12, 0x38($s0) /* C5ACE0 802405A0 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_802404E0_C5AC20 /* C5ACF4 802405B4 468031A0 */ cvt.s.w $f6, $f6 /* C5ACF8 802405B8 44073000 */ mfc1 $a3, $f6 /* C5ACFC 802405BC 0C00A720 */ jal atan2 -/* C5AD00 802405C0 00000000 */ nop +/* C5AD00 802405C0 00000000 */ nop /* C5AD04 802405C4 0809017F */ j .L802405FC /* C5AD08 802405C8 E600000C */ swc1 $f0, 0xc($s0) .L802405CC: @@ -66,7 +66,7 @@ glabel func_802404E0_C5AC20 /* C5AD10 802405D0 2404003C */ addiu $a0, $zero, 0x3c /* C5AD14 802405D4 C60C000C */ lwc1 $f12, 0xc($s0) /* C5AD18 802405D8 44820000 */ mtc1 $v0, $f0 -/* C5AD1C 802405DC 00000000 */ nop +/* C5AD1C 802405DC 00000000 */ nop /* C5AD20 802405E0 46800020 */ cvt.s.w $f0, $f0 /* C5AD24 802405E4 46006300 */ add.s $f12, $f12, $f0 /* C5AD28 802405E8 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_802404E0_C5AC20 /* C5AD4C 8024060C 8E2200D0 */ lw $v0, 0xd0($s1) /* C5AD50 80240610 8C420014 */ lw $v0, 0x14($v0) /* C5AD54 80240614 04410004 */ bgez $v0, .L80240628 -/* C5AD58 80240618 00000000 */ nop +/* C5AD58 80240618 00000000 */ nop /* C5AD5C 8024061C C6400000 */ lwc1 $f0, ($s2) /* C5AD60 80240620 08090192 */ j .L80240648 /* C5AD64 80240624 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_802404E0_C5AC20 /* C5AD68 80240628 3C018024 */ lui $at, %hi(func_80246500_806D80) /* C5AD6C 8024062C D4226500 */ ldc1 $f2, %lo(func_80246500_806D80)($at) /* C5AD70 80240630 44820000 */ mtc1 $v0, $f0 -/* C5AD74 80240634 00000000 */ nop +/* C5AD74 80240634 00000000 */ nop /* C5AD78 80240638 46800021 */ cvt.d.w $f0, $f0 /* C5AD7C 8024063C 46220003 */ div.d $f0, $f0, $f2 /* C5AD80 80240640 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_802404E0_C5AC20 /* C5AD94 80240654 44801000 */ mtc1 $zero, $f2 /* C5AD98 80240658 46000021 */ cvt.d.s $f0, $f0 /* C5AD9C 8024065C 46220002 */ mul.d $f0, $f0, $f2 -/* C5ADA0 80240660 00000000 */ nop +/* C5ADA0 80240660 00000000 */ nop /* C5ADA4 80240664 24020001 */ addiu $v0, $zero, 1 /* C5ADA8 80240668 4620018D */ trunc.w.d $f6, $f0 /* C5ADAC 8024066C E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240690_C5ADD0.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240690_C5ADD0.s index 46ece87a98..b33ad16f07 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240690_C5ADD0.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240690_C5ADD0.s @@ -34,7 +34,7 @@ glabel func_80240690_C5ADD0 /* C5AE44 80240704 44803000 */ mtc1 $zero, $f6 /* C5AE48 80240708 46000021 */ cvt.d.s $f0, $f0 /* C5AE4C 8024070C 46260002 */ mul.d $f0, $f0, $f6 -/* C5AE50 80240710 00000000 */ nop +/* C5AE50 80240710 00000000 */ nop /* C5AE54 80240714 24020001 */ addiu $v0, $zero, 1 /* C5AE58 80240718 8E24006C */ lw $a0, 0x6c($s1) /* C5AE5C 8024071C 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80240690_C5ADD0 /* C5AEB8 80240778 C600003C */ lwc1 $f0, 0x3c($s0) /* C5AEBC 8024077C 4600C001 */ sub.s $f0, $f24, $f0 /* C5AEC0 80240780 4600B03C */ c.lt.s $f22, $f0 -/* C5AEC4 80240784 00000000 */ nop +/* C5AEC4 80240784 00000000 */ nop /* C5AEC8 80240788 4500001B */ bc1f .L802407F8 /* C5AECC 8024078C 34820010 */ ori $v0, $a0, 0x10 /* C5AED0 80240790 080901FE */ j .L802407F8 @@ -87,9 +87,9 @@ glabel func_80240690_C5ADD0 /* C5AF14 802407D4 C7A00034 */ lwc1 $f0, 0x34($sp) /* C5AF18 802407D8 4600D001 */ sub.s $f0, $f26, $f0 /* C5AF1C 802407DC 4600B03C */ c.lt.s $f22, $f0 -/* C5AF20 802407E0 00000000 */ nop +/* C5AF20 802407E0 00000000 */ nop /* C5AF24 802407E4 45000004 */ bc1f .L802407F8 -/* C5AF28 802407E8 00000000 */ nop +/* C5AF28 802407E8 00000000 */ nop /* C5AF2C 802407EC 8E22006C */ lw $v0, 0x6c($s1) /* C5AF30 802407F0 34420010 */ ori $v0, $v0, 0x10 /* C5AF34 802407F4 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80240690_C5ADD0 /* C5AF3C 802407FC 24030011 */ addiu $v1, $zero, 0x11 /* C5AF40 80240800 30420011 */ andi $v0, $v0, 0x11 /* C5AF44 80240804 14430039 */ bne $v0, $v1, .L802408EC -/* C5AF48 80240808 00000000 */ nop +/* C5AF48 80240808 00000000 */ nop /* C5AF4C 8024080C 8E020000 */ lw $v0, ($s0) /* C5AF50 80240810 30420008 */ andi $v0, $v0, 8 /* C5AF54 80240814 1040000A */ beqz $v0, .L80240840 @@ -108,7 +108,7 @@ glabel func_80240690_C5ADD0 /* C5AF64 80240824 D4206508 */ ldc1 $f0, %lo(D_80246508)($at) /* C5AF68 80240828 460010A1 */ cvt.d.s $f2, $f2 /* C5AF6C 8024082C 46201082 */ mul.d $f2, $f2, $f0 -/* C5AF70 80240830 00000000 */ nop +/* C5AF70 80240830 00000000 */ nop /* C5AF74 80240834 4600A021 */ cvt.d.s $f0, $f20 /* C5AF78 80240838 08090229 */ j .L802408A4 /* C5AF7C 8024083C 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80240690_C5ADD0 /* C5AFCC 8024088C D4206510 */ ldc1 $f0, %lo(D_80246510)($at) /* C5AFD0 80240890 460010A1 */ cvt.d.s $f2, $f2 /* C5AFD4 80240894 46201082 */ mul.d $f2, $f2, $f0 -/* C5AFD8 80240898 00000000 */ nop +/* C5AFD8 80240898 00000000 */ nop /* C5AFDC 8024089C 4600A021 */ cvt.d.s $f0, $f20 /* C5AFE0 802408A0 46220000 */ add.d $f0, $f0, $f2 .L802408A4: @@ -149,7 +149,7 @@ glabel func_80240690_C5ADD0 /* C5B000 802408C0 46000005 */ abs.s $f0, $f0 /* C5B004 802408C4 46000021 */ cvt.d.s $f0, $f0 /* C5B008 802408C8 4622003C */ c.lt.d $f0, $f2 -/* C5B00C 802408CC 00000000 */ nop +/* C5B00C 802408CC 00000000 */ nop /* C5B010 802408D0 45000036 */ bc1f .L802409AC /* C5B014 802408D4 2403FFEF */ addiu $v1, $zero, -0x11 /* C5B018 802408D8 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80240690_C5ADD0 .L802408EC: /* C5B02C 802408EC 8E220070 */ lw $v0, 0x70($s1) /* C5B030 802408F0 1840002E */ blez $v0, .L802409AC -/* C5B034 802408F4 00000000 */ nop +/* C5B034 802408F4 00000000 */ nop /* C5B038 802408F8 C62C0074 */ lwc1 $f12, 0x74($s1) /* C5B03C 802408FC 0C00A8BB */ jal sin_deg /* C5B040 80240900 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80240690_C5ADD0 /* C5B098 80240958 27A70030 */ addiu $a3, $sp, 0x30 .L8024095C: /* C5B09C 8024095C 10400007 */ beqz $v0, .L8024097C -/* C5B0A0 80240960 00000000 */ nop +/* C5B0A0 80240960 00000000 */ nop /* C5B0A4 80240964 4616A082 */ mul.s $f2, $f20, $f22 -/* C5B0A8 80240968 00000000 */ nop +/* C5B0A8 80240968 00000000 */ nop /* C5B0AC 8024096C C7A0002C */ lwc1 $f0, 0x2c($sp) /* C5B0B0 80240970 461A0000 */ add.s $f0, $f0, $f26 /* C5B0B4 80240974 08090262 */ j .L80240988 /* C5B0B8 80240978 46020000 */ add.s $f0, $f0, $f2 .L8024097C: /* C5B0BC 8024097C 4616A002 */ mul.s $f0, $f20, $f22 -/* C5B0C0 80240980 00000000 */ nop +/* C5B0C0 80240980 00000000 */ nop /* C5B0C4 80240984 4600C000 */ add.s $f0, $f24, $f0 .L80240988: /* C5B0C8 80240988 E600003C */ swc1 $f0, 0x3c($s0) /* C5B0CC 8024098C 8E220074 */ lw $v0, 0x74($s1) /* C5B0D0 80240990 2442000A */ addiu $v0, $v0, 0xa /* C5B0D4 80240994 44826000 */ mtc1 $v0, $f12 -/* C5B0D8 80240998 00000000 */ nop +/* C5B0D8 80240998 00000000 */ nop /* C5B0DC 8024099C 0C00A6C9 */ jal clamp_angle /* C5B0E0 802409A0 46806320 */ cvt.s.w $f12, $f12 /* C5B0E4 802409A4 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80240690_C5ADD0 /* C5B0F4 802409B4 2442FFFF */ addiu $v0, $v0, -1 /* C5B0F8 802409B8 8E430014 */ lw $v1, 0x14($s2) /* C5B0FC 802409BC 04600048 */ bltz $v1, .L80240AE0 -/* C5B100 802409C0 00000000 */ nop +/* C5B100 802409C0 00000000 */ nop /* C5B104 802409C4 8E620074 */ lw $v0, 0x74($s3) /* C5B108 802409C8 1C400042 */ bgtz $v0, .L80240AD4 /* C5B10C 802409CC 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80240690_C5ADD0 /* C5B114 802409D4 860200A8 */ lh $v0, 0xa8($s0) /* C5B118 802409D8 C602003C */ lwc1 $f2, 0x3c($s0) /* C5B11C 802409DC 44820000 */ mtc1 $v0, $f0 -/* C5B120 802409E0 00000000 */ nop +/* C5B120 802409E0 00000000 */ nop /* C5B124 802409E4 46800020 */ cvt.s.w $f0, $f0 /* C5B128 802409E8 46001080 */ add.s $f2, $f2, $f0 /* C5B12C 802409EC 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80240690_C5ADD0 /* C5B148 80240A08 C440002C */ lwc1 $f0, 0x2c($v0) /* C5B14C 80240A0C 46000021 */ cvt.d.s $f0, $f0 /* C5B150 80240A10 4622003C */ c.lt.d $f0, $f2 -/* C5B154 80240A14 00000000 */ nop +/* C5B154 80240A14 00000000 */ nop /* C5B158 80240A18 4500002C */ bc1f .L80240ACC /* C5B15C 80240A1C 02A0202D */ daddu $a0, $s5, $zero /* C5B160 80240A20 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80240690_C5ADD0 /* C5B19C 80240A5C 3C01C1A0 */ lui $at, 0xc1a0 /* C5B1A0 80240A60 44812000 */ mtc1 $at, $f4 /* C5B1A4 80240A64 44834000 */ mtc1 $v1, $f8 -/* C5B1A8 80240A68 00000000 */ nop +/* C5B1A8 80240A68 00000000 */ nop /* C5B1AC 80240A6C 46804220 */ cvt.s.w $f8, $f8 /* C5B1B0 80240A70 44074000 */ mfc1 $a3, $f8 /* C5B1B4 80240A74 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80240690_C5ADD0 /* C5B268 80240B28 0C0123F5 */ jal is_point_within_region /* C5B26C 80240B2C 8E070038 */ lw $a3, 0x38($s0) /* C5B270 80240B30 1040001A */ beqz $v0, .L80240B9C -/* C5B274 80240B34 00000000 */ nop +/* C5B274 80240B34 00000000 */ nop /* C5B278 80240B38 8E060038 */ lw $a2, 0x38($s0) /* C5B27C 80240B3C 8E2200D0 */ lw $v0, 0xd0($s1) /* C5B280 80240B40 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80240690_C5ADD0 /* C5B294 80240B54 468073A0 */ cvt.s.w $f14, $f14 /* C5B298 80240B58 C6020018 */ lwc1 $f2, 0x18($s0) /* C5B29C 80240B5C 4600103C */ c.lt.s $f2, $f0 -/* C5B2A0 80240B60 00000000 */ nop +/* C5B2A0 80240B60 00000000 */ nop /* C5B2A4 80240B64 4500000D */ bc1f .L80240B9C /* C5B2A8 80240B68 E7A00034 */ swc1 $f0, 0x34($sp) /* C5B2AC 80240B6C C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80240690_C5ADD0 /* C5B2E8 80240BA8 00621825 */ or $v1, $v1, $v0 /* C5B2EC 80240BAC 00741825 */ or $v1, $v1, $s4 /* C5B2F0 80240BB0 10600008 */ beqz $v1, .L80240BD4 -/* C5B2F4 80240BB4 00000000 */ nop +/* C5B2F4 80240BB4 00000000 */ nop /* C5B2F8 80240BB8 8602008C */ lh $v0, 0x8c($s0) /* C5B2FC 80240BBC 14400031 */ bnez $v0, .L80240C84 -/* C5B300 80240BC0 00000000 */ nop +/* C5B300 80240BC0 00000000 */ nop /* C5B304 80240BC4 8E050018 */ lw $a1, 0x18($s0) /* C5B308 80240BC8 8E06000C */ lw $a2, 0xc($s0) /* C5B30C 80240BCC 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_80240690_C5ADD0 /* C5B320 80240BE0 44801000 */ mtc1 $zero, $f2 /* C5B324 80240BE4 46000021 */ cvt.d.s $f0, $f0 /* C5B328 80240BE8 46220002 */ mul.d $f0, $f0, $f2 -/* C5B32C 80240BEC 00000000 */ nop +/* C5B32C 80240BEC 00000000 */ nop /* C5B330 80240BF0 4620020D */ trunc.w.d $f8, $f0 /* C5B334 80240BF4 E628007C */ swc1 $f8, 0x7c($s1) /* C5B338 80240BF8 8E420004 */ lw $v0, 4($s2) /* C5B33C 80240BFC 18400021 */ blez $v0, .L80240C84 -/* C5B340 80240C00 00000000 */ nop +/* C5B340 80240C00 00000000 */ nop /* C5B344 80240C04 8602008E */ lh $v0, 0x8e($s0) /* C5B348 80240C08 9603008E */ lhu $v1, 0x8e($s0) /* C5B34C 80240C0C 18400005 */ blez $v0, .L80240C24 @@ -375,7 +375,7 @@ glabel func_80240690_C5ADD0 /* C5B354 80240C14 A602008E */ sh $v0, 0x8e($s0) /* C5B358 80240C18 00021400 */ sll $v0, $v0, 0x10 /* C5B35C 80240C1C 1C400019 */ bgtz $v0, .L80240C84 -/* C5B360 80240C20 00000000 */ nop +/* C5B360 80240C20 00000000 */ nop .L80240C24: /* C5B364 80240C24 240403E8 */ addiu $a0, $zero, 0x3e8 /* C5B368 80240C28 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80240690_C5ADD0 /* C5B3B0 80240C70 18400003 */ blez $v0, .L80240C80 /* C5B3B4 80240C74 28620003 */ slti $v0, $v1, 3 /* C5B3B8 80240C78 10400002 */ beqz $v0, .L80240C84 -/* C5B3BC 80240C7C 00000000 */ nop +/* C5B3BC 80240C7C 00000000 */ nop .L80240C80: /* C5B3C0 80240C80 AE600070 */ sw $zero, 0x70($s3) .L80240C84: diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240D78_C5B4B8.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240D78_C5B4B8.s index a54573c721..3a96141db0 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240D78_C5B4B8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240D78_C5B4B8.s @@ -42,11 +42,11 @@ glabel func_80240D78_C5B4B8 .L80240E0C: /* C5B54C 80240E0C 8E220070 */ lw $v0, 0x70($s1) /* C5B550 80240E10 18400034 */ blez $v0, .L80240EE4 -/* C5B554 80240E14 00000000 */ nop +/* C5B554 80240E14 00000000 */ nop /* C5B558 80240E18 C62C0074 */ lwc1 $f12, 0x74($s1) /* C5B55C 80240E1C 46806320 */ cvt.s.w $f12, $f12 /* C5B560 80240E20 44820000 */ mtc1 $v0, $f0 -/* C5B564 80240E24 00000000 */ nop +/* C5B564 80240E24 00000000 */ nop /* C5B568 80240E28 46800020 */ cvt.s.w $f0, $f0 /* C5B56C 80240E2C 46000021 */ cvt.d.s $f0, $f0 /* C5B570 80240E30 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_80240D78_C5B4B8 /* C5B5D0 80240E90 27A70030 */ addiu $a3, $sp, 0x30 .L80240E94: /* C5B5D4 80240E94 10400007 */ beqz $v0, .L80240EB4 -/* C5B5D8 80240E98 00000000 */ nop +/* C5B5D8 80240E98 00000000 */ nop /* C5B5DC 80240E9C 4616A082 */ mul.s $f2, $f20, $f22 -/* C5B5E0 80240EA0 00000000 */ nop +/* C5B5E0 80240EA0 00000000 */ nop /* C5B5E4 80240EA4 C7A0002C */ lwc1 $f0, 0x2c($sp) /* C5B5E8 80240EA8 46180000 */ add.s $f0, $f0, $f24 /* C5B5EC 80240EAC 080903B0 */ j .L80240EC0 /* C5B5F0 80240EB0 46020000 */ add.s $f0, $f0, $f2 .L80240EB4: /* C5B5F4 80240EB4 4616A002 */ mul.s $f0, $f20, $f22 -/* C5B5F8 80240EB8 00000000 */ nop +/* C5B5F8 80240EB8 00000000 */ nop /* C5B5FC 80240EBC 4600D000 */ add.s $f0, $f26, $f0 .L80240EC0: /* C5B600 80240EC0 E600003C */ swc1 $f0, 0x3c($s0) /* C5B604 80240EC4 8E220074 */ lw $v0, 0x74($s1) /* C5B608 80240EC8 2442000A */ addiu $v0, $v0, 0xa /* C5B60C 80240ECC 44826000 */ mtc1 $v0, $f12 -/* C5B610 80240ED0 00000000 */ nop +/* C5B610 80240ED0 00000000 */ nop /* C5B614 80240ED4 0C00A6C9 */ jal clamp_angle /* C5B618 80240ED8 46806320 */ cvt.s.w $f12, $f12 /* C5B61C 80240EDC 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_80240D78_C5B4B8 /* C5B630 80240EF0 860200A8 */ lh $v0, 0xa8($s0) /* C5B634 80240EF4 C600003C */ lwc1 $f0, 0x3c($s0) /* C5B638 80240EF8 44821000 */ mtc1 $v0, $f2 -/* C5B63C 80240EFC 00000000 */ nop +/* C5B63C 80240EFC 00000000 */ nop /* C5B640 80240F00 468010A0 */ cvt.s.w $f2, $f2 /* C5B644 80240F04 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C5B648 80240F08 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_80240D78_C5B4B8 /* C5B664 80240F24 46240000 */ add.d $f0, $f0, $f4 /* C5B668 80240F28 460010A1 */ cvt.d.s $f2, $f2 /* C5B66C 80240F2C 4620103C */ c.lt.d $f2, $f0 -/* C5B670 80240F30 00000000 */ nop +/* C5B670 80240F30 00000000 */ nop /* C5B674 80240F34 4500002E */ bc1f .L80240FF0 /* C5B678 80240F38 0280202D */ daddu $a0, $s4, $zero /* C5B67C 80240F3C 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_80240D78_C5B4B8 /* C5B6BC 80240F7C 3C01C1A0 */ lui $at, 0xc1a0 /* C5B6C0 80240F80 44812000 */ mtc1 $at, $f4 /* C5B6C4 80240F84 44834000 */ mtc1 $v1, $f8 -/* C5B6C8 80240F88 00000000 */ nop +/* C5B6C8 80240F88 00000000 */ nop /* C5B6CC 80240F8C 46804220 */ cvt.s.w $f8, $f8 /* C5B6D0 80240F90 44074000 */ mfc1 $a3, $f8 /* C5B6D4 80240F94 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_80240D78_C5B4B8 .L80240FF0: /* C5B730 80240FF0 8602008C */ lh $v0, 0x8c($s0) /* C5B734 80240FF4 14400025 */ bnez $v0, .L8024108C -/* C5B738 80240FF8 00000000 */ nop +/* C5B738 80240FF8 00000000 */ nop /* C5B73C 80240FFC 8602008E */ lh $v0, 0x8e($s0) /* C5B740 80241000 1C400022 */ bgtz $v0, .L8024108C -/* C5B744 80241004 00000000 */ nop +/* C5B744 80241004 00000000 */ nop /* C5B748 80241008 8E620074 */ lw $v0, 0x74($s3) /* C5B74C 8024100C 2442FFFF */ addiu $v0, $v0, -1 /* C5B750 80241010 1840001D */ blez $v0, .L80241088 @@ -183,7 +183,7 @@ glabel func_80240D78_C5B4B8 /* C5B75C 8024101C 9442002A */ lhu $v0, 0x2a($v0) /* C5B760 80241020 30420010 */ andi $v0, $v0, 0x10 /* C5B764 80241024 14400007 */ bnez $v0, .L80241044 -/* C5B768 80241028 00000000 */ nop +/* C5B768 80241028 00000000 */ nop /* C5B76C 8024102C C600000C */ lwc1 $f0, 0xc($s0) /* C5B770 80241030 3C014334 */ lui $at, 0x4334 /* C5B774 80241034 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802411A0_C5B8E0.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802411A0_C5B8E0.s index 37227f45e4..f19ca0c6a3 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802411A0_C5B8E0.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802411A0_C5B8E0.s @@ -60,18 +60,18 @@ glabel func_802411A0_C5B8E0 /* C5B9B8 80241278 C6200038 */ lwc1 $f0, 0x38($s1) /* C5B9BC 8024127C 4600018D */ trunc.w.s $f6, $f0 /* C5B9C0 80241280 44023000 */ mfc1 $v0, $f6 -/* C5B9C4 80241284 00000000 */ nop +/* C5B9C4 80241284 00000000 */ nop /* C5B9C8 80241288 A6420010 */ sh $v0, 0x10($s2) /* C5B9CC 8024128C C620003C */ lwc1 $f0, 0x3c($s1) /* C5B9D0 80241290 4600018D */ trunc.w.s $f6, $f0 /* C5B9D4 80241294 44023000 */ mfc1 $v0, $f6 -/* C5B9D8 80241298 00000000 */ nop +/* C5B9D8 80241298 00000000 */ nop /* C5B9DC 8024129C A6420012 */ sh $v0, 0x12($s2) /* C5B9E0 802412A0 C6200040 */ lwc1 $f0, 0x40($s1) /* C5B9E4 802412A4 A2430007 */ sb $v1, 7($s2) /* C5B9E8 802412A8 4600018D */ trunc.w.s $f6, $f0 /* C5B9EC 802412AC 44023000 */ mfc1 $v0, $f6 -/* C5B9F0 802412B0 00000000 */ nop +/* C5B9F0 802412B0 00000000 */ nop /* C5B9F4 802412B4 A6420014 */ sh $v0, 0x14($s2) .L802412B8: /* C5B9F8 802412B8 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241338_C5BA78.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241338_C5BA78.s index e9a4a224d3..5988561a98 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241338_C5BA78.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241338_C5BA78.s @@ -42,9 +42,9 @@ glabel func_80241338_C5BA78 /* C5BB0C 802413CC 44801800 */ mtc1 $zero, $f3 /* C5BB10 802413D0 46002021 */ cvt.d.s $f0, $f4 /* C5BB14 802413D4 4620103E */ c.le.d $f2, $f0 -/* C5BB18 802413D8 00000000 */ nop +/* C5BB18 802413D8 00000000 */ nop /* C5BB1C 802413DC 45000030 */ bc1f .L802414A0 -/* C5BB20 802413E0 00000000 */ nop +/* C5BB20 802413E0 00000000 */ nop /* C5BB24 802413E4 C600003C */ lwc1 $f0, 0x3c($s0) /* C5BB28 802413E8 46040000 */ add.s $f0, $f0, $f4 /* C5BB2C 802413EC E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_80241338_C5BA78 /* C5BB8C 8024144C 27A70020 */ addiu $a3, $sp, 0x20 .L80241450: /* C5BB90 80241450 1040000B */ beqz $v0, .L80241480 -/* C5BB94 80241454 00000000 */ nop +/* C5BB94 80241454 00000000 */ nop /* C5BB98 80241458 C7A0001C */ lwc1 $f0, 0x1c($sp) /* C5BB9C 8024145C 46140080 */ add.s $f2, $f0, $f20 /* C5BBA0 80241460 C600003C */ lwc1 $f0, 0x3c($s0) /* C5BBA4 80241464 4600103E */ c.le.s $f2, $f0 -/* C5BBA8 80241468 00000000 */ nop +/* C5BBA8 80241468 00000000 */ nop /* C5BBAC 8024146C 4500008D */ bc1f .L802416A4 -/* C5BBB0 80241470 00000000 */ nop +/* C5BBB0 80241470 00000000 */ nop /* C5BBB4 80241474 E602003C */ swc1 $f2, 0x3c($s0) /* C5BBB8 80241478 080905A9 */ j .L802416A4 /* C5BBBC 8024147C AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_80241338_C5BA78 /* C5BBC0 80241480 C602003C */ lwc1 $f2, 0x3c($s0) /* C5BBC4 80241484 C6000064 */ lwc1 $f0, 0x64($s0) /* C5BBC8 80241488 4602003E */ c.le.s $f0, $f2 -/* C5BBCC 8024148C 00000000 */ nop +/* C5BBCC 8024148C 00000000 */ nop /* C5BBD0 80241490 45030084 */ bc1tl .L802416A4 /* C5BBD4 80241494 AE400070 */ sw $zero, 0x70($s2) /* C5BBD8 80241498 080905A9 */ j .L802416A4 -/* C5BBDC 8024149C 00000000 */ nop +/* C5BBDC 8024149C 00000000 */ nop .L802414A0: /* C5BBE0 802414A0 4622003C */ c.lt.d $f0, $f2 -/* C5BBE4 802414A4 00000000 */ nop +/* C5BBE4 802414A4 00000000 */ nop /* C5BBE8 802414A8 4500007E */ bc1f .L802416A4 -/* C5BBEC 802414AC 00000000 */ nop +/* C5BBEC 802414AC 00000000 */ nop /* C5BBF0 802414B0 9602008E */ lhu $v0, 0x8e($s0) /* C5BBF4 802414B4 24420001 */ addiu $v0, $v0, 1 /* C5BBF8 802414B8 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_80241338_C5BA78 /* C5BC04 802414C4 00021403 */ sra $v0, $v0, 0x10 /* C5BC08 802414C8 0043102A */ slt $v0, $v0, $v1 /* C5BC0C 802414CC 14400026 */ bnez $v0, .L80241568 -/* C5BC10 802414D0 00000000 */ nop +/* C5BC10 802414D0 00000000 */ nop /* C5BC14 802414D4 C60C0038 */ lwc1 $f12, 0x38($s0) /* C5BC18 802414D8 C60E0040 */ lwc1 $f14, 0x40($s0) /* C5BC1C 802414DC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_80241338_C5BA78 /* C5BC48 80241508 8E62001C */ lw $v0, 0x1c($s3) /* C5BC4C 8024150C 46001005 */ abs.s $f0, $f2 /* C5BC50 80241510 44822000 */ mtc1 $v0, $f4 -/* C5BC54 80241514 00000000 */ nop +/* C5BC54 80241514 00000000 */ nop /* C5BC58 80241518 46802120 */ cvt.s.w $f4, $f4 /* C5BC5C 8024151C 4600203C */ c.lt.s $f4, $f0 -/* C5BC60 80241520 00000000 */ nop +/* C5BC60 80241520 00000000 */ nop /* C5BC64 80241524 4500000D */ bc1f .L8024155C -/* C5BC68 80241528 00000000 */ nop +/* C5BC68 80241528 00000000 */ nop /* C5BC6C 8024152C 44800000 */ mtc1 $zero, $f0 /* C5BC70 80241530 C614000C */ lwc1 $f20, 0xc($s0) /* C5BC74 80241534 4600103C */ c.lt.s $f2, $f0 -/* C5BC78 80241538 00000000 */ nop +/* C5BC78 80241538 00000000 */ nop /* C5BC7C 8024153C 45000006 */ bc1f .L80241558 /* C5BC80 80241540 00021023 */ negu $v0, $v0 /* C5BC84 80241544 44820000 */ mtc1 $v0, $f0 -/* C5BC88 80241548 00000000 */ nop +/* C5BC88 80241548 00000000 */ nop /* C5BC8C 8024154C 46800020 */ cvt.s.w $f0, $f0 /* C5BC90 80241550 08090557 */ j .L8024155C /* C5BC94 80241554 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_80241338_C5BA78 /* C5BCBC 8024157C C600001C */ lwc1 $f0, 0x1c($s0) /* C5BCC0 80241580 46001080 */ add.s $f2, $f2, $f0 /* C5BCC4 80241584 4616103C */ c.lt.s $f2, $f22 -/* C5BCC8 80241588 00000000 */ nop +/* C5BCC8 80241588 00000000 */ nop /* C5BCCC 8024158C 45020045 */ bc1fl .L802416A4 /* C5BCD0 80241590 E602003C */ swc1 $f2, 0x3c($s0) /* C5BCD4 80241594 080905A8 */ j .L802416A0 @@ -169,7 +169,7 @@ glabel func_80241338_C5BA78 /* C5BCEC 802415AC C600001C */ lwc1 $f0, 0x1c($s0) /* C5BCF0 802415B0 C604003C */ lwc1 $f4, 0x3c($s0) /* C5BCF4 802415B4 44821000 */ mtc1 $v0, $f2 -/* C5BCF8 802415B8 00000000 */ nop +/* C5BCF8 802415B8 00000000 */ nop /* C5BCFC 802415BC 468010A0 */ cvt.s.w $f2, $f2 /* C5BD00 802415C0 46000005 */ abs.s $f0, $f0 /* C5BD04 802415C4 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_80241338_C5BA78 /* C5BD40 80241600 0C0372DF */ jal func_800DCB7C /* C5BD44 80241604 27A70020 */ addiu $a3, $sp, 0x20 /* C5BD48 80241608 10400015 */ beqz $v0, .L80241660 -/* C5BD4C 8024160C 00000000 */ nop +/* C5BD4C 8024160C 00000000 */ nop /* C5BD50 80241610 860200A8 */ lh $v0, 0xa8($s0) /* C5BD54 80241614 C604001C */ lwc1 $f4, 0x1c($s0) /* C5BD58 80241618 44820000 */ mtc1 $v0, $f0 -/* C5BD5C 8024161C 00000000 */ nop +/* C5BD5C 8024161C 00000000 */ nop /* C5BD60 80241620 46800020 */ cvt.s.w $f0, $f0 /* C5BD64 80241624 46002085 */ abs.s $f2, $f4 /* C5BD68 80241628 46020000 */ add.s $f0, $f0, $f2 /* C5BD6C 8024162C C7A20024 */ lwc1 $f2, 0x24($sp) /* C5BD70 80241630 4600103E */ c.le.s $f2, $f0 -/* C5BD74 80241634 00000000 */ nop +/* C5BD74 80241634 00000000 */ nop /* C5BD78 80241638 45000005 */ bc1f .L80241650 -/* C5BD7C 8024163C 00000000 */ nop +/* C5BD7C 8024163C 00000000 */ nop /* C5BD80 80241640 C7A0001C */ lwc1 $f0, 0x1c($sp) /* C5BD84 80241644 AE00001C */ sw $zero, 0x1c($s0) /* C5BD88 80241648 080905A9 */ j .L802416A4 @@ -217,13 +217,13 @@ glabel func_80241338_C5BA78 /* C5BDA4 80241664 860200A8 */ lh $v0, 0xa8($s0) /* C5BDA8 80241668 46163081 */ sub.s $f2, $f6, $f22 /* C5BDAC 8024166C 44820000 */ mtc1 $v0, $f0 -/* C5BDB0 80241670 00000000 */ nop +/* C5BDB0 80241670 00000000 */ nop /* C5BDB4 80241674 46800020 */ cvt.s.w $f0, $f0 /* C5BDB8 80241678 46001080 */ add.s $f2, $f2, $f0 /* C5BDBC 8024167C C604001C */ lwc1 $f4, 0x1c($s0) /* C5BDC0 80241680 46002005 */ abs.s $f0, $f4 /* C5BDC4 80241684 4602003C */ c.lt.s $f0, $f2 -/* C5BDC8 80241688 00000000 */ nop +/* C5BDC8 80241688 00000000 */ nop /* C5BDCC 8024168C 45020005 */ bc1fl .L802416A4 /* C5BDD0 80241690 AE00001C */ sw $zero, 0x1c($s0) /* C5BDD4 80241694 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802416C8_C5BE08.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802416C8_C5BE08.s index 419cdb8543..47dc683ed7 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802416C8_C5BE08.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802416C8_C5BE08.s @@ -49,15 +49,15 @@ glabel func_802416C8_C5BE08 /* C5BEB0 80241770 44802000 */ mtc1 $zero, $f4 /* C5BEB4 80241774 460010A1 */ cvt.d.s $f2, $f2 /* C5BEB8 80241778 46241082 */ mul.d $f2, $f2, $f4 -/* C5BEBC 8024177C 00000000 */ nop +/* C5BEBC 8024177C 00000000 */ nop /* C5BEC0 80241780 C7A0001C */ lwc1 $f0, 0x1c($sp) /* C5BEC4 80241784 46000021 */ cvt.d.s $f0, $f0 /* C5BEC8 80241788 46240002 */ mul.d $f0, $f0, $f4 -/* C5BECC 8024178C 00000000 */ nop +/* C5BECC 8024178C 00000000 */ nop /* C5BED0 80241790 3C013FE0 */ lui $at, 0x3fe0 /* C5BED4 80241794 44812800 */ mtc1 $at, $f5 /* C5BED8 80241798 44802000 */ mtc1 $zero, $f4 -/* C5BEDC 8024179C 00000000 */ nop +/* C5BEDC 8024179C 00000000 */ nop /* C5BEE0 802417A0 46241080 */ add.d $f2, $f2, $f4 /* C5BEE4 802417A4 AE000074 */ sw $zero, 0x74($s0) /* C5BEE8 802417A8 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s index 3952c85804..802c914f1a 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s @@ -54,7 +54,7 @@ glabel func_802417EC_C5BF2C /* C5BFEC 802418AC 8E4300B0 */ lw $v1, 0xb0($s2) /* C5BFF0 802418B0 30620004 */ andi $v0, $v1, 4 /* C5BFF4 802418B4 10400007 */ beqz $v0, .L802418D4 -/* C5BFF8 802418B8 00000000 */ nop +/* C5BFF8 802418B8 00000000 */ nop /* C5BFFC 802418BC 824200B4 */ lb $v0, 0xb4($s2) /* C5C000 802418C0 1440003C */ bnez $v0, .L802419B4 /* C5C004 802418C4 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_802417EC_C5BF2C /* C5C018 802418D8 2C62000F */ sltiu $v0, $v1, 0xf /* C5C01C 802418DC 10400034 */ beqz $v0, .L802419B0 /* C5C020 802418E0 00031080 */ sll $v0, $v1, 2 -/* C5C024 802418E4 3C018024 */ lui $at, %hi(D_80246518) +/* C5C024 802418E4 3C018024 */ lui $at, %hi(jtbl_80246518_C60C58) /* C5C028 802418E8 00220821 */ addu $at, $at, $v0 -/* C5C02C 802418EC 8C226518 */ lw $v0, %lo(D_80246518)($at) +/* C5C02C 802418EC 8C226518 */ lw $v0, %lo(jtbl_80246518_C60C58)($at) /* C5C030 802418F0 00400008 */ jr $v0 -/* C5C034 802418F4 00000000 */ nop +/* C5C034 802418F4 00000000 */ nop +glabel L802418F8_C5C038 /* C5C038 802418F8 0280202D */ daddu $a0, $s4, $zero /* C5C03C 802418FC 0200282D */ daddu $a1, $s0, $zero /* C5C040 80241900 0C090138 */ jal func_802404E0_C5AC20 /* C5C044 80241904 0260302D */ daddu $a2, $s3, $zero +glabel L80241908_C5C048 /* C5C048 80241908 0280202D */ daddu $a0, $s4, $zero /* C5C04C 8024190C 0200282D */ daddu $a1, $s0, $zero /* C5C050 80241910 0C0901A4 */ jal func_80240690_C5ADD0 /* C5C054 80241914 0260302D */ daddu $a2, $s3, $zero /* C5C058 80241918 0809066D */ j .L802419B4 /* C5C05C 8024191C 0000102D */ daddu $v0, $zero, $zero +glabel L80241920_C5C060 /* C5C060 80241920 0280202D */ daddu $a0, $s4, $zero /* C5C064 80241924 0200282D */ daddu $a1, $s0, $zero /* C5C068 80241928 0C09032E */ jal kzn_02_UnkNpcAIFunc1 /* C5C06C 8024192C 0260302D */ daddu $a2, $s3, $zero +glabel L80241930_C5C070 /* C5C070 80241930 0280202D */ daddu $a0, $s4, $zero /* C5C074 80241934 0200282D */ daddu $a1, $s0, $zero /* C5C078 80241938 0C09035E */ jal func_80240D78_C5B4B8 /* C5C07C 8024193C 0260302D */ daddu $a2, $s3, $zero /* C5C080 80241940 0809066D */ j .L802419B4 /* C5C084 80241944 0000102D */ daddu $v0, $zero, $zero +glabel L80241948_C5C088 /* C5C088 80241948 0280202D */ daddu $a0, $s4, $zero /* C5C08C 8024194C 0200282D */ daddu $a1, $s0, $zero /* C5C090 80241950 0C09042F */ jal kzn_02_UnkNpcAIFunc2 /* C5C094 80241954 0260302D */ daddu $a2, $s3, $zero +glabel L80241958_C5C098 /* C5C098 80241958 0280202D */ daddu $a0, $s4, $zero /* C5C09C 8024195C 0200282D */ daddu $a1, $s0, $zero /* C5C0A0 80241960 0C09044D */ jal func_80241134_C5B874 /* C5C0A4 80241964 0260302D */ daddu $a2, $s3, $zero /* C5C0A8 80241968 0809066D */ j .L802419B4 /* C5C0AC 8024196C 0000102D */ daddu $v0, $zero, $zero +glabel L80241970_C5C0B0 /* C5C0B0 80241970 0280202D */ daddu $a0, $s4, $zero /* C5C0B4 80241974 0200282D */ daddu $a1, $s0, $zero /* C5C0B8 80241978 0C090468 */ jal func_802411A0_C5B8E0 /* C5C0BC 8024197C 0260302D */ daddu $a2, $s3, $zero /* C5C0C0 80241980 0809066D */ j .L802419B4 /* C5C0C4 80241984 0000102D */ daddu $v0, $zero, $zero +glabel L80241988_C5C0C8 /* C5C0C8 80241988 0280202D */ daddu $a0, $s4, $zero /* C5C0CC 8024198C 0200282D */ daddu $a1, $s0, $zero /* C5C0D0 80241990 0C0904B5 */ jal kzn_02_UnkNpcAIFunc3 /* C5C0D4 80241994 0260302D */ daddu $a2, $s3, $zero /* C5C0D8 80241998 0809066D */ j .L802419B4 /* C5C0DC 8024199C 0000102D */ daddu $v0, $zero, $zero +glabel L802419A0_C5C0E0 /* C5C0E0 802419A0 0280202D */ daddu $a0, $s4, $zero /* C5C0E4 802419A4 0200282D */ daddu $a1, $s0, $zero /* C5C0E8 802419A8 0C0904CE */ jal func_80241338_C5BA78 /* C5C0EC 802419AC 0260302D */ daddu $a2, $s3, $zero .L802419B0: +glabel L802419B0_C5C0F0 /* C5C0F0 802419B0 0000102D */ daddu $v0, $zero, $zero .L802419B4: /* C5C0F4 802419B4 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802419D8_C5C118.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802419D8_C5C118.s index 549ea3075a..8cd3beaa02 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802419D8_C5C118.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802419D8_C5C118.s @@ -47,20 +47,20 @@ glabel func_802419D8_C5C118 /* C5C1C0 80241A80 8E02001C */ lw $v0, 0x1c($s0) /* C5C1C4 80241A84 46001005 */ abs.s $f0, $f2 /* C5C1C8 80241A88 44822000 */ mtc1 $v0, $f4 -/* C5C1CC 80241A8C 00000000 */ nop +/* C5C1CC 80241A8C 00000000 */ nop /* C5C1D0 80241A90 46802120 */ cvt.s.w $f4, $f4 /* C5C1D4 80241A94 4600203C */ c.lt.s $f4, $f0 -/* C5C1D8 80241A98 00000000 */ nop +/* C5C1D8 80241A98 00000000 */ nop /* C5C1DC 80241A9C 4500000D */ bc1f .L80241AD4 -/* C5C1E0 80241AA0 00000000 */ nop +/* C5C1E0 80241AA0 00000000 */ nop /* C5C1E4 80241AA4 44800000 */ mtc1 $zero, $f0 /* C5C1E8 80241AA8 C654000C */ lwc1 $f20, 0xc($s2) /* C5C1EC 80241AAC 4600103C */ c.lt.s $f2, $f0 -/* C5C1F0 80241AB0 00000000 */ nop +/* C5C1F0 80241AB0 00000000 */ nop /* C5C1F4 80241AB4 45000006 */ bc1f .L80241AD0 /* C5C1F8 80241AB8 00021023 */ negu $v0, $v0 /* C5C1FC 80241ABC 44820000 */ mtc1 $v0, $f0 -/* C5C200 80241AC0 00000000 */ nop +/* C5C200 80241AC0 00000000 */ nop /* C5C204 80241AC4 46800020 */ cvt.s.w $f0, $f0 /* C5C208 80241AC8 080906B5 */ j .L80241AD4 /* C5C20C 80241ACC 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241B08_C5C248.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241B08_C5C248.s index a11a12ac1d..a537b08bf0 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241B08_C5C248.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241B08_C5C248.s @@ -36,7 +36,7 @@ glabel func_80241B08_C5C248 /* C5C2C4 80241B84 2402000F */ addiu $v0, $zero, 0xf /* C5C2C8 80241B88 AFA2001C */ sw $v0, 0x1c($sp) /* C5C2CC 80241B8C 44834000 */ mtc1 $v1, $f8 -/* C5C2D0 80241B90 00000000 */ nop +/* C5C2D0 80241B90 00000000 */ nop /* C5C2D4 80241B94 46804220 */ cvt.s.w $f8, $f8 /* C5C2D8 80241B98 44074000 */ mfc1 $a3, $f8 /* C5C2DC 80241B9C 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,14 +69,14 @@ glabel func_80241B08_C5C248 /* C5C344 80241C04 860200A8 */ lh $v0, 0xa8($s0) /* C5C348 80241C08 C6000038 */ lwc1 $f0, 0x38($s0) /* C5C34C 80241C0C 44821000 */ mtc1 $v0, $f2 -/* C5C350 80241C10 00000000 */ nop +/* C5C350 80241C10 00000000 */ nop /* C5C354 80241C14 468010A0 */ cvt.s.w $f2, $f2 /* C5C358 80241C18 E7A0002C */ swc1 $f0, 0x2c($sp) /* C5C35C 80241C1C 860200A8 */ lh $v0, 0xa8($s0) /* C5C360 80241C20 C604003C */ lwc1 $f4, 0x3c($s0) /* C5C364 80241C24 C6060040 */ lwc1 $f6, 0x40($s0) /* C5C368 80241C28 44820000 */ mtc1 $v0, $f0 -/* C5C36C 80241C2C 00000000 */ nop +/* C5C36C 80241C2C 00000000 */ nop /* C5C370 80241C30 46800021 */ cvt.d.w $f0, $f0 /* C5C374 80241C34 46022100 */ add.s $f4, $f4, $f2 /* C5C378 80241C38 3C014008 */ lui $at, 0x4008 @@ -93,19 +93,19 @@ glabel func_80241B08_C5C248 /* C5C3A4 80241C64 0C0372DF */ jal func_800DCB7C /* C5C3A8 80241C68 27A70034 */ addiu $a3, $sp, 0x34 /* C5C3AC 80241C6C 1040000A */ beqz $v0, .L80241C98 -/* C5C3B0 80241C70 00000000 */ nop +/* C5C3B0 80241C70 00000000 */ nop /* C5C3B4 80241C74 860200A8 */ lh $v0, 0xa8($s0) /* C5C3B8 80241C78 C7A20038 */ lwc1 $f2, 0x38($sp) /* C5C3BC 80241C7C 44820000 */ mtc1 $v0, $f0 -/* C5C3C0 80241C80 00000000 */ nop +/* C5C3C0 80241C80 00000000 */ nop /* C5C3C4 80241C84 46800020 */ cvt.s.w $f0, $f0 /* C5C3C8 80241C88 4600103C */ c.lt.s $f2, $f0 -/* C5C3CC 80241C8C 00000000 */ nop +/* C5C3CC 80241C8C 00000000 */ nop /* C5C3D0 80241C90 45030001 */ bc1tl .L80241C98 /* C5C3D4 80241C94 24110001 */ addiu $s1, $zero, 1 .L80241C98: /* C5C3D8 80241C98 12200008 */ beqz $s1, .L80241CBC -/* C5C3DC 80241C9C 00000000 */ nop +/* C5C3DC 80241C9C 00000000 */ nop /* C5C3E0 80241CA0 C7A00030 */ lwc1 $f0, 0x30($sp) /* C5C3E4 80241CA4 3C013FF0 */ lui $at, 0x3ff0 /* C5C3E8 80241CA8 44811800 */ mtc1 $at, $f3 @@ -130,24 +130,24 @@ glabel func_80241B08_C5C248 /* C5C430 80241CF0 44800800 */ mtc1 $zero, $f1 /* C5C434 80241CF4 460030A1 */ cvt.d.s $f2, $f6 /* C5C438 80241CF8 4620103C */ c.lt.d $f2, $f0 -/* C5C43C 80241CFC 00000000 */ nop +/* C5C43C 80241CFC 00000000 */ nop /* C5C440 80241D00 45010009 */ bc1t .L80241D28 -/* C5C444 80241D04 00000000 */ nop +/* C5C444 80241D04 00000000 */ nop /* C5C448 80241D08 3C014010 */ lui $at, 0x4010 /* C5C44C 80241D0C 44810800 */ mtc1 $at, $f1 /* C5C450 80241D10 44800000 */ mtc1 $zero, $f0 -/* C5C454 80241D14 00000000 */ nop +/* C5C454 80241D14 00000000 */ nop /* C5C458 80241D18 4622003C */ c.lt.d $f0, $f2 -/* C5C45C 80241D1C 00000000 */ nop +/* C5C45C 80241D1C 00000000 */ nop /* C5C460 80241D20 4500000A */ bc1f .L80241D4C -/* C5C464 80241D24 00000000 */ nop +/* C5C464 80241D24 00000000 */ nop .L80241D28: /* C5C468 80241D28 3C018024 */ lui $at, %hi(D_80246558) /* C5C46C 80241D2C D4226558 */ ldc1 $f2, %lo(D_80246558)($at) /* C5C470 80241D30 46003187 */ neg.s $f6, $f6 /* C5C474 80241D34 46003021 */ cvt.d.s $f0, $f6 /* C5C478 80241D38 46220002 */ mul.d $f0, $f0, $f2 -/* C5C47C 80241D3C 00000000 */ nop +/* C5C47C 80241D3C 00000000 */ nop /* C5C480 80241D40 46202000 */ add.d $f0, $f4, $f0 .L80241D44: /* C5C484 80241D44 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241D88_C5C4C8.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241D88_C5C4C8.s index e02a661fd9..cb04afde37 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241D88_C5C4C8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241D88_C5C4C8.s @@ -16,7 +16,7 @@ glabel func_80241D88_C5C4C8 /* C5C4F4 80241DB4 A462008E */ sh $v0, 0x8e($v1) /* C5C4F8 80241DB8 00021400 */ sll $v0, $v0, 0x10 /* C5C4FC 80241DBC 1C400004 */ bgtz $v0, .L80241DD0 -/* C5C500 80241DC0 00000000 */ nop +/* C5C500 80241DC0 00000000 */ nop /* C5C504 80241DC4 AE000074 */ sw $zero, 0x74($s0) /* C5C508 80241DC8 A460008E */ sh $zero, 0x8e($v1) /* C5C50C 80241DCC AE200070 */ sw $zero, 0x70($s1) diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s index 3463cc4bf9..d2628b3d7d 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s @@ -55,7 +55,7 @@ glabel func_80241DE4_C5C524 /* C5C5E8 80241EA8 8E4300B0 */ lw $v1, 0xb0($s2) /* C5C5EC 80241EAC 30620004 */ andi $v0, $v1, 4 /* C5C5F0 80241EB0 10400007 */ beqz $v0, .L80241ED0 -/* C5C5F4 80241EB4 00000000 */ nop +/* C5C5F4 80241EB4 00000000 */ nop /* C5C5F8 80241EB8 824200B4 */ lb $v0, 0xb4($s2) /* C5C5FC 80241EBC 1440003A */ bnez $v0, .L80241FA8 /* C5C600 80241EC0 0000102D */ daddu $v0, $zero, $zero @@ -67,56 +67,66 @@ glabel func_80241DE4_C5C524 /* C5C614 80241ED4 2C620015 */ sltiu $v0, $v1, 0x15 /* C5C618 80241ED8 10400032 */ beqz $v0, .L80241FA4 /* C5C61C 80241EDC 00031080 */ sll $v0, $v1, 2 -/* C5C620 80241EE0 3C018024 */ lui $at, %hi(D_80246560) +/* C5C620 80241EE0 3C018024 */ lui $at, %hi(jtbl_80246560_C60CA0) /* C5C624 80241EE4 00220821 */ addu $at, $at, $v0 -/* C5C628 80241EE8 8C226560 */ lw $v0, %lo(D_80246560)($at) +/* C5C628 80241EE8 8C226560 */ lw $v0, %lo(jtbl_80246560_C60CA0)($at) /* C5C62C 80241EEC 00400008 */ jr $v0 -/* C5C630 80241EF0 00000000 */ nop +/* C5C630 80241EF0 00000000 */ nop +glabel L80241EF4_C5C634 /* C5C634 80241EF4 0280202D */ daddu $a0, $s4, $zero /* C5C638 80241EF8 0200282D */ daddu $a1, $s0, $zero /* C5C63C 80241EFC 0C090138 */ jal func_802404E0_C5AC20 /* C5C640 80241F00 0260302D */ daddu $a2, $s3, $zero +glabel L80241F04_C5C644 /* C5C644 80241F04 0280202D */ daddu $a0, $s4, $zero /* C5C648 80241F08 0200282D */ daddu $a1, $s0, $zero /* C5C64C 80241F0C 0C0901A4 */ jal func_80240690_C5ADD0 /* C5C650 80241F10 0260302D */ daddu $a2, $s3, $zero /* C5C654 80241F14 080907EA */ j .L80241FA8 /* C5C658 80241F18 0000102D */ daddu $v0, $zero, $zero +glabel L80241F1C_C5C65C /* C5C65C 80241F1C 0280202D */ daddu $a0, $s4, $zero /* C5C660 80241F20 0200282D */ daddu $a1, $s0, $zero /* C5C664 80241F24 0C09032E */ jal kzn_02_UnkNpcAIFunc1 /* C5C668 80241F28 0260302D */ daddu $a2, $s3, $zero +glabel L80241F2C_C5C66C /* C5C66C 80241F2C 0280202D */ daddu $a0, $s4, $zero /* C5C670 80241F30 0200282D */ daddu $a1, $s0, $zero /* C5C674 80241F34 0C09035E */ jal func_80240D78_C5B4B8 /* C5C678 80241F38 0260302D */ daddu $a2, $s3, $zero /* C5C67C 80241F3C 080907EA */ j .L80241FA8 /* C5C680 80241F40 0000102D */ daddu $v0, $zero, $zero +glabel L80241F44_C5C684 /* C5C684 80241F44 0280202D */ daddu $a0, $s4, $zero /* C5C688 80241F48 0200282D */ daddu $a1, $s0, $zero /* C5C68C 80241F4C 0C09042F */ jal kzn_02_UnkNpcAIFunc2 /* C5C690 80241F50 0260302D */ daddu $a2, $s3, $zero +glabel L80241F54_C5C694 /* C5C694 80241F54 0280202D */ daddu $a0, $s4, $zero /* C5C698 80241F58 0200282D */ daddu $a1, $s0, $zero /* C5C69C 80241F5C 0C09044D */ jal func_80241134_C5B874 /* C5C6A0 80241F60 0260302D */ daddu $a2, $s3, $zero /* C5C6A4 80241F64 080907EA */ j .L80241FA8 /* C5C6A8 80241F68 0000102D */ daddu $v0, $zero, $zero +glabel L80241F6C_C5C6AC /* C5C6AC 80241F6C 0280202D */ daddu $a0, $s4, $zero /* C5C6B0 80241F70 0200282D */ daddu $a1, $s0, $zero /* C5C6B4 80241F74 0C090676 */ jal func_802419D8_C5C118 /* C5C6B8 80241F78 0260302D */ daddu $a2, $s3, $zero +glabel L80241F7C_C5C6BC /* C5C6BC 80241F7C 0280202D */ daddu $a0, $s4, $zero /* C5C6C0 80241F80 0200282D */ daddu $a1, $s0, $zero /* C5C6C4 80241F84 0C0906C2 */ jal func_80241B08_C5C248 /* C5C6C8 80241F88 0260302D */ daddu $a2, $s3, $zero /* C5C6CC 80241F8C 080907EA */ j .L80241FA8 /* C5C6D0 80241F90 0000102D */ daddu $v0, $zero, $zero +glabel L80241F94_C5C6D4 /* C5C6D4 80241F94 0280202D */ daddu $a0, $s4, $zero /* C5C6D8 80241F98 0200282D */ daddu $a1, $s0, $zero /* C5C6DC 80241F9C 0C090762 */ jal func_80241D88_C5C4C8 /* C5C6E0 80241FA0 0260302D */ daddu $a2, $s3, $zero .L80241FA4: +glabel L80241FA4_C5C6E4 /* C5C6E4 80241FA4 0000102D */ daddu $v0, $zero, $zero .L80241FA8: /* C5C6E8 80241FA8 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241FCC_C5C70C.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241FCC_C5C70C.s index fa94f9ca4f..81ae6aa6a4 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241FCC_C5C70C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241FCC_C5C70C.s @@ -26,7 +26,7 @@ glabel func_80241FCC_C5C70C /* C5C75C 8024201C 1440FFFA */ bnez $v0, .L80242008 /* C5C760 80242020 24A50004 */ addiu $a1, $a1, 4 /* C5C764 80242024 0809081A */ j .L80242068 -/* C5C768 80242028 00000000 */ nop +/* C5C768 80242028 00000000 */ nop .L8024202C: /* C5C76C 8024202C 0000182D */ daddu $v1, $zero, $zero /* C5C770 80242030 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_8024239C_C5CADC.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_8024239C_C5CADC.s index 7991591d22..be47afad5d 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_8024239C_C5CADC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_8024239C_C5CADC.s @@ -28,7 +28,7 @@ glabel func_8024239C_C5CADC /* C5CB30 802423F0 00220821 */ addu $at, $at, $v0 /* C5CB34 802423F4 AC2065D0 */ sw $zero, %lo(D_802465D0)($at) /* C5CB38 802423F8 0809090A */ j .L80242428 -/* C5CB3C 802423FC 00000000 */ nop +/* C5CB3C 802423FC 00000000 */ nop .L80242400: /* C5CB40 80242400 3C038024 */ lui $v1, %hi(D_802465D0) /* C5CB44 80242404 246365D0 */ addiu $v1, $v1, %lo(D_802465D0) diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426F8_C5CE38.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426F8_C5CE38.s index 967031be99..c01e5f0d5c 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426F8_C5CE38.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426F8_C5CE38.s @@ -13,6 +13,6 @@ glabel func_802426F8_C5CE38 /* C5CE58 80242718 24020002 */ addiu $v0, $zero, 2 /* C5CE5C 8024271C 03E00008 */ jr $ra /* C5CE60 80242720 27BD0018 */ addiu $sp, $sp, 0x18 -/* C5CE64 80242724 00000000 */ nop -/* C5CE68 80242728 00000000 */ nop -/* C5CE6C 8024272C 00000000 */ nop +/* C5CE64 80242724 00000000 */ nop +/* C5CE68 80242728 00000000 */ nop +/* C5CE6C 8024272C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5CE70/func_80242730_C5CE70.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5CE70/func_80242730_C5CE70.s index 6920e6fb4d..ccd9482243 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5CE70/func_80242730_C5CE70.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5CE70/func_80242730_C5CE70.s @@ -20,12 +20,12 @@ glabel func_80242730_C5CE70 /* C5CEAC 8024276C 10600007 */ beqz $v1, .L8024278C /* C5CEB0 80242770 0000102D */ daddu $v0, $zero, $zero /* C5CEB4 80242774 08090A02 */ j .L80242808 -/* C5CEB8 80242778 00000000 */ nop +/* C5CEB8 80242778 00000000 */ nop .L8024277C: /* C5CEBC 8024277C 10620008 */ beq $v1, $v0, .L802427A0 /* C5CEC0 80242780 0000102D */ daddu $v0, $zero, $zero /* C5CEC4 80242784 08090A02 */ j .L80242808 -/* C5CEC8 80242788 00000000 */ nop +/* C5CEC8 80242788 00000000 */ nop .L8024278C: /* C5CECC 8024278C 24020001 */ addiu $v0, $zero, 1 /* C5CED0 80242790 08090A01 */ j .L80242804 @@ -45,7 +45,7 @@ glabel func_80242730_C5CE70 /* C5CF00 802427C0 4600110D */ trunc.w.s $f4, $f2 /* C5CF04 802427C4 44052000 */ mfc1 $a1, $f4 /* C5CF08 802427C8 0C03BCF0 */ jal func_800EF3C0 -/* C5CF0C 802427CC 00000000 */ nop +/* C5CF0C 802427CC 00000000 */ nop /* C5CF10 802427D0 0C03BCF5 */ jal func_800EF3D4 /* C5CF14 802427D4 0000202D */ daddu $a0, $zero, $zero /* C5CF18 802427D8 3C0142B4 */ lui $at, 0x42b4 @@ -53,7 +53,7 @@ glabel func_80242730_C5CE70 /* C5CF20 802427E0 8E040000 */ lw $a0, ($s0) /* C5CF24 802427E4 4405A000 */ mfc1 $a1, $f20 /* C5CF28 802427E8 0C00ECD0 */ jal set_npc_yaw -/* C5CF2C 802427EC 00000000 */ nop +/* C5CF2C 802427EC 00000000 */ nop /* C5CF30 802427F0 24020002 */ addiu $v0, $zero, 2 /* C5CF34 802427F4 E6340080 */ swc1 $f20, 0x80($s1) /* C5CF38 802427F8 E6340084 */ swc1 $f20, 0x84($s1) diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024038C_C6109C.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024038C_C6109C.s index 9780eaf910..ad6f1e46cf 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024038C_C6109C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024038C_C6109C.s @@ -21,11 +21,11 @@ glabel func_8024038C_C6109C /* C610DC 802403CC A602008E */ sh $v0, 0x8e($s0) /* C610E0 802403D0 00021400 */ sll $v0, $v0, 0x10 /* C610E4 802403D4 1C400033 */ bgtz $v0, .L802404A4 -/* C610E8 802403D8 00000000 */ nop +/* C610E8 802403D8 00000000 */ nop .L802403DC: /* C610EC 802403DC 8602008C */ lh $v0, 0x8c($s0) /* C610F0 802403E0 14400030 */ bnez $v0, .L802404A4 -/* C610F4 802403E4 00000000 */ nop +/* C610F4 802403E4 00000000 */ nop /* C610F8 802403E8 8E2200CC */ lw $v0, 0xcc($s1) /* C610FC 802403EC 8C420024 */ lw $v0, 0x24($v0) /* C61100 802403F0 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_8024038C_C6109C /* C6110C 802403FC 8E230088 */ lw $v1, 0x88($s1) /* C61110 80240400 24020005 */ addiu $v0, $zero, 5 /* C61114 80240404 10620005 */ beq $v1, $v0, .L8024041C -/* C61118 80240408 00000000 */ nop +/* C61118 80240408 00000000 */ nop /* C6111C 8024040C 10600003 */ beqz $v1, .L8024041C /* C61120 80240410 24020001 */ addiu $v0, $zero, 1 /* C61124 80240414 14620006 */ bne $v1, $v0, .L80240430 -/* C61128 80240418 00000000 */ nop +/* C61128 80240418 00000000 */ nop .L8024041C: /* C6112C 8024041C 8E220084 */ lw $v0, 0x84($s1) /* C61130 80240420 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_8024038C_C6109C /* C61170 80240460 46220000 */ add.d $f0, $f0, $f2 /* C61174 80240464 4620010D */ trunc.w.d $f4, $f0 /* C61178 80240468 44022000 */ mfc1 $v0, $f4 -/* C6117C 8024046C 00000000 */ nop +/* C6117C 8024046C 00000000 */ nop /* C61180 80240470 A602008E */ sh $v0, 0x8e($s0) /* C61184 80240474 00021400 */ sll $v0, $v0, 0x10 /* C61188 80240478 8E230078 */ lw $v1, 0x78($s1) /* C6118C 8024047C 00021403 */ sra $v0, $v0, 0x10 /* C61190 80240480 0043102A */ slt $v0, $v0, $v1 /* C61194 80240484 10400003 */ beqz $v0, .L80240494 -/* C61198 80240488 00000000 */ nop +/* C61198 80240488 00000000 */ nop /* C6119C 8024048C 9622007A */ lhu $v0, 0x7a($s1) /* C611A0 80240490 A602008E */ sh $v0, 0x8e($s0) .L80240494: diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s index e6d902d04f..75b3ef706a 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s @@ -279,15 +279,17 @@ glabel func_802406A4_C613B4 /* C617A0 80240A90 2C620015 */ sltiu $v0, $v1, 0x15 /* C617A4 80240A94 10400009 */ beqz $v0, .L80240ABC /* C617A8 80240A98 00031080 */ sll $v0, $v1, 2 -/* C617AC 80240A9C 3C018024 */ lui $at, %hi(D_802471E8) +/* C617AC 80240A9C 3C018024 */ lui $at, %hi(jtbl_802471E8_C67EF8) /* C617B0 80240AA0 00220821 */ addu $at, $at, $v0 -/* C617B4 80240AA4 8C2271E8 */ lw $v0, %lo(D_802471E8)($at) +/* C617B4 80240AA4 8C2271E8 */ lw $v0, %lo(jtbl_802471E8_C67EF8)($at) /* C617B8 80240AA8 00400008 */ jr $v0 /* C617BC 80240AAC 00000000 */ nop +glabel L80240AB0_C617C0 /* C617C0 80240AB0 8E420028 */ lw $v0, 0x28($s2) /* C617C4 80240AB4 24420001 */ addiu $v0, $v0, 1 /* C617C8 80240AB8 AE420028 */ sw $v0, 0x28($s2) .L80240ABC: +glabel L80240ABC_C617CC /* C617CC 80240ABC 0000102D */ daddu $v0, $zero, $zero .L80240AC0: /* C617D0 80240AC0 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240E00_C61B10.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240E00_C61B10.s index 6f1e46141b..e98f24e13c 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240E00_C61B10.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240E00_C61B10.s @@ -42,7 +42,7 @@ glabel func_80240E00_C61B10 /* C61BA4 80240E94 C6620074 */ lwc1 $f2, 0x74($s3) /* C61BA8 80240E98 468010A0 */ cvt.s.w $f2, $f2 /* C61BAC 80240E9C 4600103C */ c.lt.s $f2, $f0 -/* C61BB0 80240EA0 00000000 */ nop +/* C61BB0 80240EA0 00000000 */ nop /* C61BB4 80240EA4 45030001 */ bc1tl .L80240EAC /* C61BB8 80240EA8 0000882D */ daddu $s1, $zero, $zero .L80240EAC: @@ -51,16 +51,16 @@ glabel func_80240E00_C61B10 /* C61BC4 80240EB4 3C014387 */ lui $at, 0x4387 /* C61BC8 80240EB8 4481A000 */ mtc1 $at, $f20 /* C61BCC 80240EBC 0C00A70A */ jal get_clamped_angle_diff -/* C61BD0 80240EC0 00000000 */ nop +/* C61BD0 80240EC0 00000000 */ nop /* C61BD4 80240EC4 0C00A6C9 */ jal clamp_angle /* C61BD8 80240EC8 46000306 */ mov.s $f12, $f0 /* C61BDC 80240ECC 3C018024 */ lui $at, %hi(D_80247240) /* C61BE0 80240ED0 D4227240 */ ldc1 $f2, %lo(D_80247240)($at) /* C61BE4 80240ED4 46000021 */ cvt.d.s $f0, $f0 /* C61BE8 80240ED8 4622003C */ c.lt.d $f0, $f2 -/* C61BEC 80240EDC 00000000 */ nop +/* C61BEC 80240EDC 00000000 */ nop /* C61BF0 80240EE0 45000003 */ bc1f .L80240EF0 -/* C61BF4 80240EE4 00000000 */ nop +/* C61BF4 80240EE4 00000000 */ nop /* C61BF8 80240EE8 3C0142B4 */ lui $at, 0x42b4 /* C61BFC 80240EEC 4481A000 */ mtc1 $at, $f20 .L80240EF0: @@ -77,7 +77,7 @@ glabel func_80240E00_C61B10 /* C61C28 80240F18 468010A0 */ cvt.s.w $f2, $f2 /* C61C2C 80240F1C 46000005 */ abs.s $f0, $f0 /* C61C30 80240F20 4600103C */ c.lt.s $f2, $f0 -/* C61C34 80240F24 00000000 */ nop +/* C61C34 80240F24 00000000 */ nop /* C61C38 80240F28 45030001 */ bc1tl .L80240F30 /* C61C3C 80240F2C 0000882D */ daddu $s1, $zero, $zero .L80240F30: @@ -87,13 +87,13 @@ glabel func_80240E00_C61B10 /* C61C4C 80240F3C 860200A8 */ lh $v0, 0xa8($s0) /* C61C50 80240F40 46020001 */ sub.s $f0, $f0, $f2 /* C61C54 80240F44 44821000 */ mtc1 $v0, $f2 -/* C61C58 80240F48 00000000 */ nop +/* C61C58 80240F48 00000000 */ nop /* C61C5C 80240F4C 468010A1 */ cvt.d.w $f2, $f2 /* C61C60 80240F50 46221080 */ add.d $f2, $f2, $f2 /* C61C64 80240F54 46000005 */ abs.s $f0, $f0 /* C61C68 80240F58 46000021 */ cvt.d.s $f0, $f0 /* C61C6C 80240F5C 4620103E */ c.le.d $f2, $f0 -/* C61C70 80240F60 00000000 */ nop +/* C61C70 80240F60 00000000 */ nop /* C61C74 80240F64 45030001 */ bc1tl .L80240F6C /* C61C78 80240F68 0000882D */ daddu $s1, $zero, $zero .L80240F6C: diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240FB4_C61CC4.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240FB4_C61CC4.s index f951b1cfb9..42d3c7d141 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240FB4_C61CC4.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240FB4_C61CC4.s @@ -19,7 +19,7 @@ glabel func_80240FB4_C61CC4 /* C61CFC 80240FEC 8E2200B0 */ lw $v0, 0xb0($s1) /* C61D00 80240FF0 30420004 */ andi $v0, $v0, 4 /* C61D04 80240FF4 10400015 */ beqz $v0, .L8024104C -/* C61D08 80240FF8 00000000 */ nop +/* C61D08 80240FF8 00000000 */ nop .L80240FFC: /* C61D0C 80240FFC AE800070 */ sw $zero, 0x70($s4) /* C61D10 80241000 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel func_80240FB4_C61CC4 /* C61D60 80241050 12600005 */ beqz $s3, .L80241068 /* C61D64 80241054 24020001 */ addiu $v0, $zero, 1 /* C61D68 80241058 12620048 */ beq $s3, $v0, .L8024117C -/* C61D6C 8024105C 00000000 */ nop +/* C61D6C 8024105C 00000000 */ nop /* C61D70 80241060 0809047C */ j .L802411F0 -/* C61D74 80241064 00000000 */ nop +/* C61D74 80241064 00000000 */ nop .L80241068: /* C61D78 80241068 86240008 */ lh $a0, 8($s1) /* C61D7C 8024106C 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel func_80240FB4_C61CC4 /* C61D9C 8024108C 8E03006C */ lw $v1, 0x6c($s0) /* C61DA0 80241090 24020003 */ addiu $v0, $zero, 3 /* C61DA4 80241094 14620056 */ bne $v1, $v0, .L802411F0 -/* C61DA8 80241098 00000000 */ nop +/* C61DA8 80241098 00000000 */ nop /* C61DAC 8024109C 8E2500A8 */ lw $a1, 0xa8($s1) /* C61DB0 802410A0 10A00003 */ beqz $a1, .L802410B0 /* C61DB4 802410A4 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel func_80240FB4_C61CC4 /* C61E2C 8024111C C7A20014 */ lwc1 $f2, 0x14($sp) /* C61E30 80241120 4600020D */ trunc.w.s $f8, $f0 /* C61E34 80241124 44024000 */ mfc1 $v0, $f8 -/* C61E38 80241128 00000000 */ nop +/* C61E38 80241128 00000000 */ nop /* C61E3C 8024112C A6220012 */ sh $v0, 0x12($s1) /* C61E40 80241130 4600120D */ trunc.w.s $f8, $f2 /* C61E44 80241134 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s index 5adcf8f414..9ea9ea80c9 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s @@ -100,78 +100,93 @@ glabel func_80241214_C61F24 /* C62088 80241378 2C620064 */ sltiu $v0, $v1, 0x64 /* C6208C 8024137C 10400048 */ beqz $v0, .L802414A0 /* C62090 80241380 00031080 */ sll $v0, $v1, 2 -/* C62094 80241384 3C018024 */ lui $at, %hi(D_80247248) +/* C62094 80241384 3C018024 */ lui $at, %hi(jtbl_80247248_C67F58) /* C62098 80241388 00220821 */ addu $at, $at, $v0 -/* C6209C 8024138C 8C227248 */ lw $v0, %lo(D_80247248)($at) +/* C6209C 8024138C 8C227248 */ lw $v0, %lo(jtbl_80247248_C67F58)($at) /* C620A0 80241390 00400008 */ jr $v0 /* C620A4 80241394 00000000 */ nop +glabel L80241398_C620A8 /* C620A8 80241398 0240202D */ daddu $a0, $s2, $zero /* C620AC 8024139C 0260282D */ daddu $a1, $s3, $zero /* C620B0 802413A0 0C012568 */ jal func_800495A0 /* C620B4 802413A4 0280302D */ daddu $a2, $s4, $zero +glabel L802413A8_C620B8 /* C620B8 802413A8 0240202D */ daddu $a0, $s2, $zero /* C620BC 802413AC 0260282D */ daddu $a1, $s3, $zero /* C620C0 802413B0 0C0125AE */ jal func_800496B8 /* C620C4 802413B4 0280302D */ daddu $a2, $s4, $zero /* C620C8 802413B8 08090528 */ j .L802414A0 /* C620CC 802413BC 00000000 */ nop +glabel L802413C0_C620D0 /* C620D0 802413C0 0240202D */ daddu $a0, $s2, $zero /* C620D4 802413C4 0260282D */ daddu $a1, $s3, $zero /* C620D8 802413C8 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C620DC 802413CC 0280302D */ daddu $a2, $s4, $zero +glabel L802413D0_C620E0 /* C620E0 802413D0 0240202D */ daddu $a0, $s2, $zero /* C620E4 802413D4 0260282D */ daddu $a1, $s3, $zero /* C620E8 802413D8 0C012701 */ jal func_80049C04 /* C620EC 802413DC 0280302D */ daddu $a2, $s4, $zero /* C620F0 802413E0 08090528 */ j .L802414A0 /* C620F4 802413E4 00000000 */ nop +glabel L802413E8_C620F8 /* C620F8 802413E8 0240202D */ daddu $a0, $s2, $zero /* C620FC 802413EC 0260282D */ daddu $a1, $s3, $zero /* C62100 802413F0 0C01278F */ jal func_80049E3C /* C62104 802413F4 0280302D */ daddu $a2, $s4, $zero +glabel L802413F8_C62108 /* C62108 802413F8 0240202D */ daddu $a0, $s2, $zero /* C6210C 802413FC 0260282D */ daddu $a1, $s3, $zero /* C62110 80241400 0C0127B3 */ jal func_80049ECC /* C62114 80241404 0280302D */ daddu $a2, $s4, $zero /* C62118 80241408 08090528 */ j .L802414A0 /* C6211C 8024140C 00000000 */ nop +glabel L80241410_C62120 /* C62120 80241410 0240202D */ daddu $a0, $s2, $zero /* C62124 80241414 0260282D */ daddu $a1, $s3, $zero /* C62128 80241418 0C0127DF */ jal func_80049F7C /* C6212C 8024141C 0280302D */ daddu $a2, $s4, $zero +glabel L80241420_C62130 /* C62130 80241420 0240202D */ daddu $a0, $s2, $zero /* C62134 80241424 0260282D */ daddu $a1, $s3, $zero /* C62138 80241428 0C012849 */ jal func_8004A124 /* C6213C 8024142C 0280302D */ daddu $a2, $s4, $zero /* C62140 80241430 08090528 */ j .L802414A0 /* C62144 80241434 00000000 */ nop +glabel L80241438_C62148 /* C62148 80241438 0240202D */ daddu $a0, $s2, $zero /* C6214C 8024143C 0260282D */ daddu $a1, $s3, $zero /* C62150 80241440 0C0128FA */ jal func_8004A3E8 /* C62154 80241444 0280302D */ daddu $a2, $s4, $zero /* C62158 80241448 08090528 */ j .L802414A0 /* C6215C 8024144C 00000000 */ nop +glabel L80241450_C62160 /* C62160 80241450 0C0902FE */ jal kzn_03_UnkNpcAIFunc6 /* C62164 80241454 0240202D */ daddu $a0, $s2, $zero +glabel L80241458_C62168 /* C62168 80241458 0C090319 */ jal kzn_03_UnkNpcAIFunc7 /* C6216C 8024145C 0240202D */ daddu $a0, $s2, $zero /* C62170 80241460 8E430070 */ lw $v1, 0x70($s2) /* C62174 80241464 24020020 */ addiu $v0, $zero, 0x20 /* C62178 80241468 1462000D */ bne $v1, $v0, .L802414A0 /* C6217C 8024146C 00000000 */ nop +glabel L80241470_C62180 /* C62180 80241470 0C090335 */ jal kzn_03_UnkNpcAIFunc8 /* C62184 80241474 0240202D */ daddu $a0, $s2, $zero /* C62188 80241478 8E430070 */ lw $v1, 0x70($s2) /* C6218C 8024147C 24020021 */ addiu $v0, $zero, 0x21 /* C62190 80241480 14620007 */ bne $v1, $v0, .L802414A0 /* C62194 80241484 00000000 */ nop +glabel L80241488_C62198 /* C62198 80241488 0C09036B */ jal kzn_03_UnkNpcAIFunc5 /* C6219C 8024148C 0240202D */ daddu $a0, $s2, $zero /* C621A0 80241490 08090528 */ j .L802414A0 /* C621A4 80241494 00000000 */ nop +glabel L80241498_C621A8 /* C621A8 80241498 0C0129CF */ jal func_8004A73C /* C621AC 8024149C 0240202D */ daddu $a0, $s2, $zero .L802414A0: +glabel L802414A0_C621B0 /* C621B0 802414A0 8FBF0048 */ lw $ra, 0x48($sp) /* C621B4 802414A4 8FB50044 */ lw $s5, 0x44($sp) /* C621B8 802414A8 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241534_C62244.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241534_C62244.s index 25fee5fc94..1848e837b0 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241534_C62244.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241534_C62244.s @@ -38,7 +38,7 @@ glabel func_80241534_C62244 /* C622C8 802415B8 3C01C1A0 */ lui $at, 0xc1a0 /* C622CC 802415BC 44812000 */ mtc1 $at, $f4 /* C622D0 802415C0 44833000 */ mtc1 $v1, $f6 -/* C622D4 802415C4 00000000 */ nop +/* C622D4 802415C4 00000000 */ nop /* C622D8 802415C8 468031A0 */ cvt.s.w $f6, $f6 /* C622DC 802415CC 44073000 */ mfc1 $a3, $f6 /* C622E0 802415D0 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241630_C62340.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241630_C62340.s index 765eb87c28..451a5198f2 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241630_C62340.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241630_C62340.s @@ -39,18 +39,18 @@ glabel func_80241630_C62340 .L802416B8: /* C623C8 802416B8 8622008E */ lh $v0, 0x8e($s1) /* C623CC 802416BC 1440025D */ bnez $v0, .L80242034 -/* C623D0 802416C0 00000000 */ nop +/* C623D0 802416C0 00000000 */ nop /* C623D4 802416C4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C623D8 802416C8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* C623DC 802416CC 0C00A6C9 */ jal clamp_angle /* C623E0 802416D0 C44C00A8 */ lwc1 $f12, 0xa8($v0) /* C623E4 802416D4 3C014334 */ lui $at, 0x4334 /* C623E8 802416D8 44811000 */ mtc1 $at, $f2 -/* C623EC 802416DC 00000000 */ nop +/* C623EC 802416DC 00000000 */ nop /* C623F0 802416E0 4602003C */ c.lt.s $f0, $f2 -/* C623F4 802416E4 00000000 */ nop +/* C623F4 802416E4 00000000 */ nop /* C623F8 802416E8 45000011 */ bc1f .L80241730 -/* C623FC 802416EC 00000000 */ nop +/* C623FC 802416EC 00000000 */ nop /* C62400 802416F0 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* C62404 802416F4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* C62408 802416F8 3C0142B4 */ lui $at, 0x42b4 @@ -85,7 +85,7 @@ glabel func_80241630_C62340 /* C62478 80241768 460C0300 */ add.s $f12, $f0, $f12 .L8024176C: /* C6247C 8024176C 0C00A6C9 */ jal clamp_angle -/* C62480 80241770 00000000 */ nop +/* C62480 80241770 00000000 */ nop /* C62484 80241774 46000586 */ mov.s $f22, $f0 /* C62488 80241778 3C014334 */ lui $at, 0x4334 /* C6248C 8024177C 44816000 */ mtc1 $at, $f12 @@ -134,7 +134,7 @@ glabel func_80241630_C62340 /* C62528 80241818 862200A6 */ lh $v0, 0xa6($s1) /* C6252C 8024181C 8EA30000 */ lw $v1, ($s5) /* C62530 80241820 44824000 */ mtc1 $v0, $f8 -/* C62534 80241824 00000000 */ nop +/* C62534 80241824 00000000 */ nop /* C62538 80241828 46804220 */ cvt.s.w $f8, $f8 /* C6253C 8024182C C4600028 */ lwc1 $f0, 0x28($v1) /* C62540 80241830 44064000 */ mfc1 $a2, $f8 @@ -146,7 +146,7 @@ glabel func_80241630_C62340 /* C62558 80241848 E6200040 */ swc1 $f0, 0x40($s1) /* C6255C 8024184C 862200A6 */ lh $v0, 0xa6($s1) /* C62560 80241850 44820000 */ mtc1 $v0, $f0 -/* C62564 80241854 00000000 */ nop +/* C62564 80241854 00000000 */ nop /* C62568 80241858 46800020 */ cvt.s.w $f0, $f0 /* C6256C 8024185C 4600A000 */ add.s $f0, $f20, $f0 /* C62570 80241860 4406B000 */ mfc1 $a2, $f22 @@ -155,18 +155,18 @@ glabel func_80241630_C62340 /* C6257C 8024186C 0220202D */ daddu $a0, $s1, $zero /* C62580 80241870 8EC20088 */ lw $v0, 0x88($s6) /* C62584 80241874 1440005D */ bnez $v0, .L802419EC -/* C62588 80241878 00000000 */ nop +/* C62588 80241878 00000000 */ nop /* C6258C 8024187C C6200038 */ lwc1 $f0, 0x38($s1) /* C62590 80241880 3C018024 */ lui $at, %hi(D_802473D8) /* C62594 80241884 D42473D8 */ ldc1 $f4, %lo(D_802473D8)($at) /* C62598 80241888 46000021 */ cvt.d.s $f0, $f0 /* C6259C 8024188C 4620203C */ c.lt.d $f4, $f0 -/* C625A0 80241890 00000000 */ nop +/* C625A0 80241890 00000000 */ nop /* C625A4 80241894 45000005 */ bc1f .L802418AC -/* C625A8 80241898 00000000 */ nop +/* C625A8 80241898 00000000 */ nop /* C625AC 8024189C 3C0143BE */ lui $at, 0x43be /* C625B0 802418A0 44810000 */ mtc1 $at, $f0 -/* C625B4 802418A4 00000000 */ nop +/* C625B4 802418A4 00000000 */ nop /* C625B8 802418A8 E6200038 */ swc1 $f0, 0x38($s1) .L802418AC: /* C625BC 802418AC C6200038 */ lwc1 $f0, 0x38($s1) @@ -174,50 +174,50 @@ glabel func_80241630_C62340 /* C625C4 802418B4 D42273E0 */ ldc1 $f2, %lo(D_802473E0)($at) /* C625C8 802418B8 46000021 */ cvt.d.s $f0, $f0 /* C625CC 802418BC 4622003C */ c.lt.d $f0, $f2 -/* C625D0 802418C0 00000000 */ nop +/* C625D0 802418C0 00000000 */ nop /* C625D4 802418C4 45000005 */ bc1f .L802418DC -/* C625D8 802418C8 00000000 */ nop +/* C625D8 802418C8 00000000 */ nop /* C625DC 802418CC 3C01C3BE */ lui $at, 0xc3be /* C625E0 802418D0 44810000 */ mtc1 $at, $f0 -/* C625E4 802418D4 00000000 */ nop +/* C625E4 802418D4 00000000 */ nop /* C625E8 802418D8 E6200038 */ swc1 $f0, 0x38($s1) .L802418DC: /* C625EC 802418DC C6200040 */ lwc1 $f0, 0x40($s1) /* C625F0 802418E0 46000021 */ cvt.d.s $f0, $f0 /* C625F4 802418E4 4620203C */ c.lt.d $f4, $f0 -/* C625F8 802418E8 00000000 */ nop +/* C625F8 802418E8 00000000 */ nop /* C625FC 802418EC 45000005 */ bc1f .L80241904 -/* C62600 802418F0 00000000 */ nop +/* C62600 802418F0 00000000 */ nop /* C62604 802418F4 3C0143BE */ lui $at, 0x43be /* C62608 802418F8 44810000 */ mtc1 $at, $f0 -/* C6260C 802418FC 00000000 */ nop +/* C6260C 802418FC 00000000 */ nop /* C62610 80241900 E6200040 */ swc1 $f0, 0x40($s1) .L80241904: /* C62614 80241904 C6200040 */ lwc1 $f0, 0x40($s1) /* C62618 80241908 46000021 */ cvt.d.s $f0, $f0 /* C6261C 8024190C 4622003C */ c.lt.d $f0, $f2 -/* C62620 80241910 00000000 */ nop +/* C62620 80241910 00000000 */ nop /* C62624 80241914 45000005 */ bc1f .L8024192C -/* C62628 80241918 00000000 */ nop +/* C62628 80241918 00000000 */ nop /* C6262C 8024191C 3C01C3BE */ lui $at, 0xc3be /* C62630 80241920 44810000 */ mtc1 $at, $f0 -/* C62634 80241924 00000000 */ nop +/* C62634 80241924 00000000 */ nop /* C62638 80241928 E6200040 */ swc1 $f0, 0x40($s1) .L8024192C: /* C6263C 8024192C C6220038 */ lwc1 $f2, 0x38($s1) /* C62640 80241930 46021082 */ mul.s $f2, $f2, $f2 -/* C62644 80241934 00000000 */ nop +/* C62644 80241934 00000000 */ nop /* C62648 80241938 C6200040 */ lwc1 $f0, 0x40($s1) /* C6264C 8024193C 46000002 */ mul.s $f0, $f0, $f0 -/* C62650 80241940 00000000 */ nop +/* C62650 80241940 00000000 */ nop /* C62654 80241944 46001300 */ add.s $f12, $f2, $f0 /* C62658 80241948 46006004 */ sqrt.s $f0, $f12 /* C6265C 8024194C 46000032 */ c.eq.s $f0, $f0 -/* C62660 80241950 00000000 */ nop +/* C62660 80241950 00000000 */ nop /* C62664 80241954 45010003 */ bc1t .L80241964 -/* C62668 80241958 00000000 */ nop +/* C62668 80241958 00000000 */ nop /* C6266C 8024195C 0C0187BC */ jal sqrtf -/* C62670 80241960 00000000 */ nop +/* C62670 80241960 00000000 */ nop .L80241964: /* C62674 80241964 8E260038 */ lw $a2, 0x38($s1) /* C62678 80241968 8E270040 */ lw $a3, 0x40($s1) @@ -232,7 +232,7 @@ glabel func_80241630_C62340 /* C6269C 8024198C D42073E8 */ ldc1 $f0, %lo(D_802473E8)($at) /* C626A0 80241990 460010A1 */ cvt.d.s $f2, $f2 /* C626A4 80241994 4620103C */ c.lt.d $f2, $f0 -/* C626A8 80241998 00000000 */ nop +/* C626A8 80241998 00000000 */ nop /* C626AC 8024199C 45000004 */ bc1f .L802419B0 /* C626B0 802419A0 0200202D */ daddu $a0, $s0, $zero /* C626B4 802419A4 3C064398 */ lui $a2, 0x4398 @@ -242,9 +242,9 @@ glabel func_80241630_C62340 /* C626C0 802419B0 3C018024 */ lui $at, %hi(D_802473F0) /* C626C4 802419B4 D42073F0 */ ldc1 $f0, %lo(D_802473F0)($at) /* C626C8 802419B8 4622003C */ c.lt.d $f0, $f2 -/* C626CC 802419BC 00000000 */ nop +/* C626CC 802419BC 00000000 */ nop /* C626D0 802419C0 450000FA */ bc1f .L80241DAC -/* C626D4 802419C4 00000000 */ nop +/* C626D4 802419C4 00000000 */ nop /* C626D8 802419C8 3C0643BB */ lui $a2, 0x43bb /* C626DC 802419CC 34C68000 */ ori $a2, $a2, 0x8000 .L802419D0: @@ -254,7 +254,7 @@ glabel func_80241630_C62340 /* C626EC 802419DC 0C00A7E7 */ jal add_vec2D_polar /* C626F0 802419E0 E6340040 */ swc1 $f20, 0x40($s1) /* C626F4 802419E4 0809076B */ j .L80241DAC -/* C626F8 802419E8 00000000 */ nop +/* C626F8 802419E8 00000000 */ nop .L802419EC: /* C626FC 802419EC 8E220000 */ lw $v0, ($s1) /* C62700 802419F0 30420040 */ andi $v0, $v0, 0x40 @@ -281,13 +281,13 @@ glabel func_80241630_C62340 /* C62754 80241A44 862200A8 */ lh $v0, 0xa8($s1) /* C62758 80241A48 0260302D */ daddu $a2, $s3, $zero /* C6275C 80241A4C 44820000 */ mtc1 $v0, $f0 -/* C62760 80241A50 00000000 */ nop +/* C62760 80241A50 00000000 */ nop /* C62764 80241A54 46800020 */ cvt.s.w $f0, $f0 /* C62768 80241A58 E7A00018 */ swc1 $f0, 0x18($sp) /* C6276C 80241A5C 862200A6 */ lh $v0, 0xa6($s1) /* C62770 80241A60 27B00028 */ addiu $s0, $sp, 0x28 /* C62774 80241A64 44820000 */ mtc1 $v0, $f0 -/* C62778 80241A68 00000000 */ nop +/* C62778 80241A68 00000000 */ nop /* C6277C 80241A6C 46800020 */ cvt.s.w $f0, $f0 /* C62780 80241A70 E7A0001C */ swc1 $f0, 0x1c($sp) /* C62784 80241A74 8E240080 */ lw $a0, 0x80($s1) @@ -311,13 +311,13 @@ glabel func_80241630_C62340 /* C627CC 80241ABC E7B60014 */ swc1 $f22, 0x14($sp) /* C627D0 80241AC0 862200A8 */ lh $v0, 0xa8($s1) /* C627D4 80241AC4 44820000 */ mtc1 $v0, $f0 -/* C627D8 80241AC8 00000000 */ nop +/* C627D8 80241AC8 00000000 */ nop /* C627DC 80241ACC 46800020 */ cvt.s.w $f0, $f0 /* C627E0 80241AD0 E7A00018 */ swc1 $f0, 0x18($sp) /* C627E4 80241AD4 862200A6 */ lh $v0, 0xa6($s1) /* C627E8 80241AD8 0260302D */ daddu $a2, $s3, $zero /* C627EC 80241ADC 44820000 */ mtc1 $v0, $f0 -/* C627F0 80241AE0 00000000 */ nop +/* C627F0 80241AE0 00000000 */ nop /* C627F4 80241AE4 46800020 */ cvt.s.w $f0, $f0 /* C627F8 80241AE8 E7A0001C */ swc1 $f0, 0x1c($sp) /* C627FC 80241AEC 8E240080 */ lw $a0, 0x80($s1) @@ -347,32 +347,32 @@ glabel func_80241630_C62340 /* C6285C 80241B4C 0C0372DF */ jal func_800DCB7C /* C62860 80241B50 0040802D */ daddu $s0, $v0, $zero /* C62864 80241B54 1600001C */ bnez $s0, .L80241BC8 -/* C62868 80241B58 00000000 */ nop +/* C62868 80241B58 00000000 */ nop /* C6286C 80241B5C 1040001A */ beqz $v0, .L80241BC8 -/* C62870 80241B60 00000000 */ nop +/* C62870 80241B60 00000000 */ nop /* C62874 80241B64 C7A20038 */ lwc1 $f2, 0x38($sp) /* C62878 80241B68 3C014054 */ lui $at, 0x4054 /* C6287C 80241B6C 44810800 */ mtc1 $at, $f1 /* C62880 80241B70 44800000 */ mtc1 $zero, $f0 /* C62884 80241B74 460010A1 */ cvt.d.s $f2, $f2 /* C62888 80241B78 4622003C */ c.lt.d $f0, $f2 -/* C6288C 80241B7C 00000000 */ nop +/* C6288C 80241B7C 00000000 */ nop /* C62890 80241B80 45000011 */ bc1f .L80241BC8 -/* C62894 80241B84 00000000 */ nop +/* C62894 80241B84 00000000 */ nop /* C62898 80241B88 3C01405E */ lui $at, 0x405e /* C6289C 80241B8C 44810800 */ mtc1 $at, $f1 /* C628A0 80241B90 44800000 */ mtc1 $zero, $f0 -/* C628A4 80241B94 00000000 */ nop +/* C628A4 80241B94 00000000 */ nop /* C628A8 80241B98 4620103C */ c.lt.d $f2, $f0 -/* C628AC 80241B9C 00000000 */ nop +/* C628AC 80241B9C 00000000 */ nop /* C628B0 80241BA0 45000009 */ bc1f .L80241BC8 -/* C628B4 80241BA4 00000000 */ nop +/* C628B4 80241BA4 00000000 */ nop /* C628B8 80241BA8 C622003C */ lwc1 $f2, 0x3c($s1) /* C628BC 80241BAC C7A00030 */ lwc1 $f0, 0x30($sp) /* C628C0 80241BB0 46001032 */ c.eq.s $f2, $f0 -/* C628C4 80241BB4 00000000 */ nop +/* C628C4 80241BB4 00000000 */ nop /* C628C8 80241BB8 45010003 */ bc1t .L80241BC8 -/* C628CC 80241BBC 00000000 */ nop +/* C628CC 80241BBC 00000000 */ nop /* C628D0 80241BC0 0809076B */ j .L80241DAC /* C628D4 80241BC4 241E0001 */ addiu $fp, $zero, 1 .L80241BC8: @@ -396,13 +396,13 @@ glabel func_80241630_C62340 /* C6291C 80241C0C 862200A8 */ lh $v0, 0xa8($s1) /* C62920 80241C10 27A50020 */ addiu $a1, $sp, 0x20 /* C62924 80241C14 44820000 */ mtc1 $v0, $f0 -/* C62928 80241C18 00000000 */ nop +/* C62928 80241C18 00000000 */ nop /* C6292C 80241C1C 46800020 */ cvt.s.w $f0, $f0 /* C62930 80241C20 E7A00018 */ swc1 $f0, 0x18($sp) /* C62934 80241C24 862200A6 */ lh $v0, 0xa6($s1) /* C62938 80241C28 27A60024 */ addiu $a2, $sp, 0x24 /* C6293C 80241C2C 44820000 */ mtc1 $v0, $f0 -/* C62940 80241C30 00000000 */ nop +/* C62940 80241C30 00000000 */ nop /* C62944 80241C34 46800020 */ cvt.s.w $f0, $f0 /* C62948 80241C38 E7A0001C */ swc1 $f0, 0x1c($sp) /* C6294C 80241C3C 8E240080 */ lw $a0, 0x80($s1) @@ -420,7 +420,7 @@ glabel func_80241630_C62340 /* C6297C 80241C6C 862200A6 */ lh $v0, 0xa6($s1) /* C62980 80241C70 4407C000 */ mfc1 $a3, $f24 /* C62984 80241C74 44824000 */ mtc1 $v0, $f8 -/* C62988 80241C78 00000000 */ nop +/* C62988 80241C78 00000000 */ nop /* C6298C 80241C7C 46804220 */ cvt.s.w $f8, $f8 /* C62990 80241C80 C4600028 */ lwc1 $f0, 0x28($v1) /* C62994 80241C84 44064000 */ mfc1 $a2, $f8 @@ -432,7 +432,7 @@ glabel func_80241630_C62340 /* C629AC 80241C9C E6200040 */ swc1 $f0, 0x40($s1) /* C629B0 80241CA0 862200A6 */ lh $v0, 0xa6($s1) /* C629B4 80241CA4 44820000 */ mtc1 $v0, $f0 -/* C629B8 80241CA8 00000000 */ nop +/* C629B8 80241CA8 00000000 */ nop /* C629BC 80241CAC 46800020 */ cvt.s.w $f0, $f0 /* C629C0 80241CB0 08090767 */ j .L80241D9C /* C629C4 80241CB4 4600A500 */ add.s $f20, $f20, $f0 @@ -454,20 +454,20 @@ glabel func_80241630_C62340 /* C62A00 80241CF0 E7B60014 */ swc1 $f22, 0x14($sp) /* C62A04 80241CF4 862200A8 */ lh $v0, 0xa8($s1) /* C62A08 80241CF8 44820000 */ mtc1 $v0, $f0 -/* C62A0C 80241CFC 00000000 */ nop +/* C62A0C 80241CFC 00000000 */ nop /* C62A10 80241D00 46800020 */ cvt.s.w $f0, $f0 /* C62A14 80241D04 E7A00018 */ swc1 $f0, 0x18($sp) /* C62A18 80241D08 862200A6 */ lh $v0, 0xa6($s1) /* C62A1C 80241D0C 27A60024 */ addiu $a2, $sp, 0x24 /* C62A20 80241D10 44820000 */ mtc1 $v0, $f0 -/* C62A24 80241D14 00000000 */ nop +/* C62A24 80241D14 00000000 */ nop /* C62A28 80241D18 46800020 */ cvt.s.w $f0, $f0 /* C62A2C 80241D1C E7A0001C */ swc1 $f0, 0x1c($sp) /* C62A30 80241D20 8E240080 */ lw $a0, 0x80($s1) /* C62A34 80241D24 0C037711 */ jal func_800DDC44 /* C62A38 80241D28 27A70028 */ addiu $a3, $sp, 0x28 /* C62A3C 80241D2C 1040001F */ beqz $v0, .L80241DAC -/* C62A40 80241D30 00000000 */ nop +/* C62A40 80241D30 00000000 */ nop /* C62A44 80241D34 8FA60020 */ lw $a2, 0x20($sp) /* C62A48 80241D38 8EA20000 */ lw $v0, ($s5) /* C62A4C 80241D3C 8FA70028 */ lw $a3, 0x28($sp) @@ -479,7 +479,7 @@ glabel func_80241630_C62340 /* C62A64 80241D54 862200A6 */ lh $v0, 0xa6($s1) /* C62A68 80241D58 4407C000 */ mfc1 $a3, $f24 /* C62A6C 80241D5C 44824000 */ mtc1 $v0, $f8 -/* C62A70 80241D60 00000000 */ nop +/* C62A70 80241D60 00000000 */ nop /* C62A74 80241D64 46804220 */ cvt.s.w $f8, $f8 /* C62A78 80241D68 C4600028 */ lwc1 $f0, 0x28($v1) /* C62A7C 80241D6C 44064000 */ mfc1 $a2, $f8 @@ -491,7 +491,7 @@ glabel func_80241630_C62340 /* C62A94 80241D84 E6200040 */ swc1 $f0, 0x40($s1) /* C62A98 80241D88 862200A6 */ lh $v0, 0xa6($s1) /* C62A9C 80241D8C 44820000 */ mtc1 $v0, $f0 -/* C62AA0 80241D90 00000000 */ nop +/* C62AA0 80241D90 00000000 */ nop /* C62AA4 80241D94 46800020 */ cvt.s.w $f0, $f0 /* C62AA8 80241D98 4600A500 */ add.s $f20, $f20, $f0 .L80241D9C: @@ -520,14 +520,14 @@ glabel func_80241630_C62340 /* C62B00 80241DF0 0C0123F5 */ jal is_point_within_region /* C62B04 80241DF4 26330040 */ addiu $s3, $s1, 0x40 /* C62B08 80241DF8 1040005A */ beqz $v0, .L80241F64 -/* C62B0C 80241DFC 00000000 */ nop +/* C62B0C 80241DFC 00000000 */ nop /* C62B10 80241E00 8E430004 */ lw $v1, 4($s2) /* C62B14 80241E04 10600005 */ beqz $v1, .L80241E1C /* C62B18 80241E08 24020001 */ addiu $v0, $zero, 1 /* C62B1C 80241E0C 10620029 */ beq $v1, $v0, .L80241EB4 -/* C62B20 80241E10 00000000 */ nop +/* C62B20 80241E10 00000000 */ nop /* C62B24 80241E14 080907D9 */ j .L80241F64 -/* C62B28 80241E18 00000000 */ nop +/* C62B28 80241E18 00000000 */ nop .L80241E1C: /* C62B2C 80241E1C C6480008 */ lwc1 $f8, 8($s2) /* C62B30 80241E20 46804220 */ cvt.s.w $f8, $f8 @@ -538,11 +538,11 @@ glabel func_80241630_C62340 /* C62B44 80241E34 C62E0040 */ lwc1 $f14, 0x40($s1) /* C62B48 80241E38 44074000 */ mfc1 $a3, $f8 /* C62B4C 80241E3C 0C00A7B5 */ jal dist2D -/* C62B50 80241E40 00000000 */ nop +/* C62B50 80241E40 00000000 */ nop /* C62B54 80241E44 C6420010 */ lwc1 $f2, 0x10($s2) /* C62B58 80241E48 468010A0 */ cvt.s.w $f2, $f2 /* C62B5C 80241E4C 4600103C */ c.lt.s $f2, $f0 -/* C62B60 80241E50 00000000 */ nop +/* C62B60 80241E50 00000000 */ nop /* C62B64 80241E54 45000043 */ bc1f .L80241F64 /* C62B68 80241E58 E7A00038 */ swc1 $f0, 0x38($sp) /* C62B6C 80241E5C C64C0008 */ lwc1 $f12, 8($s2) @@ -566,17 +566,17 @@ glabel func_80241630_C62340 /* C62BB4 80241EA4 0C00A7E7 */ jal add_vec2D_polar /* C62BB8 80241EA8 0260282D */ daddu $a1, $s3, $zero /* C62BBC 80241EAC 080907D9 */ j .L80241F64 -/* C62BC0 80241EB0 00000000 */ nop +/* C62BC0 80241EB0 00000000 */ nop .L80241EB4: /* C62BC4 80241EB4 8E420008 */ lw $v0, 8($s2) /* C62BC8 80241EB8 8E430010 */ lw $v1, 0x10($s2) /* C62BCC 80241EBC C6200038 */ lwc1 $f0, 0x38($s1) /* C62BD0 80241EC0 00431021 */ addu $v0, $v0, $v1 /* C62BD4 80241EC4 44821000 */ mtc1 $v0, $f2 -/* C62BD8 80241EC8 00000000 */ nop +/* C62BD8 80241EC8 00000000 */ nop /* C62BDC 80241ECC 468010A0 */ cvt.s.w $f2, $f2 /* C62BE0 80241ED0 4600103C */ c.lt.s $f2, $f0 -/* C62BE4 80241ED4 00000000 */ nop +/* C62BE4 80241ED4 00000000 */ nop /* C62BE8 80241ED8 45030001 */ bc1tl .L80241EE0 /* C62BEC 80241EDC E6220038 */ swc1 $f2, 0x38($s1) .L80241EE0: @@ -585,10 +585,10 @@ glabel func_80241630_C62340 /* C62BF8 80241EE8 C6200038 */ lwc1 $f0, 0x38($s1) /* C62BFC 80241EEC 00431023 */ subu $v0, $v0, $v1 /* C62C00 80241EF0 44821000 */ mtc1 $v0, $f2 -/* C62C04 80241EF4 00000000 */ nop +/* C62C04 80241EF4 00000000 */ nop /* C62C08 80241EF8 468010A0 */ cvt.s.w $f2, $f2 /* C62C0C 80241EFC 4602003C */ c.lt.s $f0, $f2 -/* C62C10 80241F00 00000000 */ nop +/* C62C10 80241F00 00000000 */ nop /* C62C14 80241F04 45030001 */ bc1tl .L80241F0C /* C62C18 80241F08 E6220038 */ swc1 $f2, 0x38($s1) .L80241F0C: @@ -597,10 +597,10 @@ glabel func_80241630_C62340 /* C62C24 80241F14 C6200040 */ lwc1 $f0, 0x40($s1) /* C62C28 80241F18 00431021 */ addu $v0, $v0, $v1 /* C62C2C 80241F1C 44821000 */ mtc1 $v0, $f2 -/* C62C30 80241F20 00000000 */ nop +/* C62C30 80241F20 00000000 */ nop /* C62C34 80241F24 468010A0 */ cvt.s.w $f2, $f2 /* C62C38 80241F28 4600103C */ c.lt.s $f2, $f0 -/* C62C3C 80241F2C 00000000 */ nop +/* C62C3C 80241F2C 00000000 */ nop /* C62C40 80241F30 45030001 */ bc1tl .L80241F38 /* C62C44 80241F34 E6220040 */ swc1 $f2, 0x40($s1) .L80241F38: @@ -609,21 +609,21 @@ glabel func_80241630_C62340 /* C62C50 80241F40 C6200040 */ lwc1 $f0, 0x40($s1) /* C62C54 80241F44 00431023 */ subu $v0, $v0, $v1 /* C62C58 80241F48 44821000 */ mtc1 $v0, $f2 -/* C62C5C 80241F4C 00000000 */ nop +/* C62C5C 80241F4C 00000000 */ nop /* C62C60 80241F50 468010A0 */ cvt.s.w $f2, $f2 /* C62C64 80241F54 4602003C */ c.lt.s $f0, $f2 -/* C62C68 80241F58 00000000 */ nop +/* C62C68 80241F58 00000000 */ nop /* C62C6C 80241F5C 45030001 */ bc1tl .L80241F64 /* C62C70 80241F60 E6220040 */ swc1 $f2, 0x40($s1) .L80241F64: /* C62C74 80241F64 16E0001F */ bnez $s7, .L80241FE4 -/* C62C78 80241F68 00000000 */ nop +/* C62C78 80241F68 00000000 */ nop /* C62C7C 80241F6C 8E220000 */ lw $v0, ($s1) /* C62C80 80241F70 30420008 */ andi $v0, $v0, 8 /* C62C84 80241F74 10400003 */ beqz $v0, .L80241F84 /* C62C88 80241F78 27A50020 */ addiu $a1, $sp, 0x20 /* C62C8C 80241F7C 13C00019 */ beqz $fp, .L80241FE4 -/* C62C90 80241F80 00000000 */ nop +/* C62C90 80241F80 00000000 */ nop .L80241F84: /* C62C94 80241F84 27A60024 */ addiu $a2, $sp, 0x24 /* C62C98 80241F88 27A20038 */ addiu $v0, $sp, 0x38 @@ -646,7 +646,7 @@ glabel func_80241630_C62340 /* C62CDC 80241FCC 0C0372DF */ jal func_800DCB7C /* C62CE0 80241FD0 27A70028 */ addiu $a3, $sp, 0x28 /* C62CE4 80241FD4 10400003 */ beqz $v0, .L80241FE4 -/* C62CE8 80241FD8 00000000 */ nop +/* C62CE8 80241FD8 00000000 */ nop /* C62CEC 80241FDC C7A00024 */ lwc1 $f0, 0x24($sp) /* C62CF0 80241FE0 E620003C */ swc1 $f0, 0x3c($s1) .L80241FE4: diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242070_C62D80.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242070_C62D80.s index b534dad607..886037d91b 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242070_C62D80.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242070_C62D80.s @@ -27,7 +27,7 @@ glabel func_80242070_C62D80 .L802420C8: /* C62DD8 802420C8 8482008E */ lh $v0, 0x8e($a0) /* C62DDC 802420CC 14400007 */ bnez $v0, .L802420EC -/* C62DE0 802420D0 00000000 */ nop +/* C62DE0 802420D0 00000000 */ nop /* C62DE4 802420D4 8E0200CC */ lw $v0, 0xcc($s0) /* C62DE8 802420D8 8C420028 */ lw $v0, 0x28($v0) /* C62DEC 802420DC A480008E */ sh $zero, 0x8e($a0) diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242100_C62E10.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242100_C62E10.s index 307d2cead7..1c9d714797 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242100_C62E10.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242100_C62E10.s @@ -18,7 +18,7 @@ glabel func_80242100_C62E10 /* C62E44 80242134 8E0300A0 */ lw $v1, 0xa0($s0) /* C62E48 80242138 00021403 */ sra $v0, $v0, 0x10 /* C62E4C 8024213C 14430004 */ bne $v0, $v1, .L80242150 -/* C62E50 80242140 00000000 */ nop +/* C62E50 80242140 00000000 */ nop /* C62E54 80242144 8E0200CC */ lw $v0, 0xcc($s0) /* C62E58 80242148 8C42002C */ lw $v0, 0x2c($v0) /* C62E5C 8024214C ACA20028 */ sw $v0, 0x28($a1) @@ -47,7 +47,7 @@ glabel func_80242100_C62E10 /* C62EB0 802421A0 3C01C1A0 */ lui $at, 0xc1a0 /* C62EB4 802421A4 44812000 */ mtc1 $at, $f4 /* C62EB8 802421A8 44833000 */ mtc1 $v1, $f6 -/* C62EBC 802421AC 00000000 */ nop +/* C62EBC 802421AC 00000000 */ nop /* C62EC0 802421B0 468031A0 */ cvt.s.w $f6, $f6 /* C62EC4 802421B4 8C420000 */ lw $v0, ($v0) /* C62EC8 802421B8 44073000 */ mfc1 $a3, $f6 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242200_C62F10.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242200_C62F10.s index 38cdfa03b4..80bf8b84be 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242200_C62F10.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242200_C62F10.s @@ -16,7 +16,7 @@ glabel func_80242200_C62F10 /* C62F3C 8024222C A462008E */ sh $v0, 0x8e($v1) /* C62F40 80242230 00021400 */ sll $v0, $v0, 0x10 /* C62F44 80242234 14400005 */ bnez $v0, .L8024224C -/* C62F48 80242238 00000000 */ nop +/* C62F48 80242238 00000000 */ nop /* C62F4C 8024223C 960200AA */ lhu $v0, 0xaa($s0) /* C62F50 80242240 A462008E */ sh $v0, 0x8e($v1) /* C62F54 80242244 2402000E */ addiu $v0, $zero, 0xe diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242260_C62F70.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242260_C62F70.s index a6c585bc00..c7c6a4d3e3 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242260_C62F70.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242260_C62F70.s @@ -42,7 +42,7 @@ glabel func_80242260_C62F70 /* C63004 802422F4 2402000F */ addiu $v0, $zero, 0xf /* C63008 802422F8 AFA2001C */ sw $v0, 0x1c($sp) /* C6300C 802422FC 44833000 */ mtc1 $v1, $f6 -/* C63010 80242300 00000000 */ nop +/* C63010 80242300 00000000 */ nop /* C63014 80242304 468031A0 */ cvt.s.w $f6, $f6 /* C63018 80242308 44073000 */ mfc1 $a3, $f6 /* C6301C 8024230C 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024234C_C6305C.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024234C_C6305C.s index 8a74214873..5292c58738 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024234C_C6305C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024234C_C6305C.s @@ -46,7 +46,7 @@ glabel func_8024234C_C6305C /* C63100 802423F0 8E2200B0 */ lw $v0, 0xb0($s1) /* C63104 802423F4 30420004 */ andi $v0, $v0, 4 /* C63108 802423F8 10400011 */ beqz $v0, .L80242440 -/* C6310C 802423FC 00000000 */ nop +/* C6310C 802423FC 00000000 */ nop .L80242400: /* C63110 80242400 AE400070 */ sw $zero, 0x70($s2) /* C63114 80242404 A6A0008E */ sh $zero, 0x8e($s5) @@ -78,12 +78,12 @@ glabel func_8024234C_C6305C /* C63178 80242468 10600013 */ beqz $v1, .L802424B8 /* C6317C 8024246C 0240202D */ daddu $a0, $s2, $zero /* C63180 80242470 0809095D */ j .L80242574 -/* C63184 80242474 00000000 */ nop +/* C63184 80242474 00000000 */ nop .L80242478: /* C63188 80242478 10620018 */ beq $v1, $v0, .L802424DC /* C6318C 8024247C 0240202D */ daddu $a0, $s2, $zero /* C63190 80242480 0809095D */ j .L80242574 -/* C63194 80242484 00000000 */ nop +/* C63194 80242484 00000000 */ nop .L80242488: /* C63198 80242488 2402000D */ addiu $v0, $zero, 0xd /* C6319C 8024248C 10620029 */ beq $v1, $v0, .L80242534 @@ -94,9 +94,9 @@ glabel func_8024234C_C6305C /* C631B0 802424A0 1062002D */ beq $v1, $v0, .L80242558 /* C631B4 802424A4 24020063 */ addiu $v0, $zero, 0x63 /* C631B8 802424A8 10620030 */ beq $v1, $v0, .L8024256C -/* C631BC 802424AC 00000000 */ nop +/* C631BC 802424AC 00000000 */ nop /* C631C0 802424B0 0809095D */ j .L80242574 -/* C631C4 802424B4 00000000 */ nop +/* C631C4 802424B4 00000000 */ nop .L802424B8: /* C631C8 802424B8 0260282D */ daddu $a1, $s3, $zero /* C631CC 802424BC 0C090532 */ jal func_802414C8_C621D8 @@ -107,14 +107,14 @@ glabel func_8024234C_C6305C /* C631DC 802424CC 0C09054D */ jal func_80241534_C62244 /* C631E0 802424D0 0280302D */ daddu $a2, $s4, $zero /* C631E4 802424D4 0809095D */ j .L80242574 -/* C631E8 802424D8 00000000 */ nop +/* C631E8 802424D8 00000000 */ nop .L802424DC: /* C631EC 802424DC 0260282D */ daddu $a1, $s3, $zero /* C631F0 802424E0 0C09058C */ jal func_80241630_C62340 /* C631F4 802424E4 0280302D */ daddu $a2, $s4, $zero /* C631F8 802424E8 8E420070 */ lw $v0, 0x70($s2) /* C631FC 802424EC 14500021 */ bne $v0, $s0, .L80242574 -/* C63200 802424F0 00000000 */ nop +/* C63200 802424F0 00000000 */ nop .L802424F4: /* C63204 802424F4 0240202D */ daddu $a0, $s2, $zero /* C63208 802424F8 0260282D */ daddu $a1, $s3, $zero @@ -123,7 +123,7 @@ glabel func_8024234C_C6305C /* C63214 80242504 8E430070 */ lw $v1, 0x70($s2) /* C63218 80242508 2402000C */ addiu $v0, $zero, 0xc /* C6321C 8024250C 14620019 */ bne $v1, $v0, .L80242574 -/* C63220 80242510 00000000 */ nop +/* C63220 80242510 00000000 */ nop /* C63224 80242514 0240202D */ daddu $a0, $s2, $zero .L80242518: /* C63228 80242518 0260282D */ daddu $a1, $s3, $zero @@ -132,7 +132,7 @@ glabel func_8024234C_C6305C /* C63234 80242524 8E430070 */ lw $v1, 0x70($s2) /* C63238 80242528 2402000D */ addiu $v0, $zero, 0xd /* C6323C 8024252C 14620011 */ bne $v1, $v0, .L80242574 -/* C63240 80242530 00000000 */ nop +/* C63240 80242530 00000000 */ nop .L80242534: /* C63244 80242534 0240202D */ daddu $a0, $s2, $zero /* C63248 80242538 0260282D */ daddu $a1, $s3, $zero @@ -141,14 +141,14 @@ glabel func_8024234C_C6305C /* C63254 80242544 8E430070 */ lw $v1, 0x70($s2) /* C63258 80242548 2402000E */ addiu $v0, $zero, 0xe /* C6325C 8024254C 14620009 */ bne $v1, $v0, .L80242574 -/* C63260 80242550 00000000 */ nop +/* C63260 80242550 00000000 */ nop /* C63264 80242554 0240202D */ daddu $a0, $s2, $zero .L80242558: /* C63268 80242558 0260282D */ daddu $a1, $s3, $zero /* C6326C 8024255C 0C090898 */ jal func_80242260_C62F70 /* C63270 80242560 0280302D */ daddu $a2, $s4, $zero /* C63274 80242564 0809095D */ j .L80242574 -/* C63278 80242568 00000000 */ nop +/* C63278 80242568 00000000 */ nop .L8024256C: /* C6327C 8024256C 0C0129CF */ jal func_8004A73C /* C63280 80242570 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024259C_C632AC.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024259C_C632AC.s index e439092d1a..69c49964ee 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024259C_C632AC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024259C_C632AC.s @@ -26,7 +26,7 @@ glabel func_8024259C_C632AC /* C632FC 802425EC 1440FFFA */ bnez $v0, .L802425D8 /* C63300 802425F0 24A50004 */ addiu $a1, $a1, 4 /* C63304 802425F4 0809098E */ j .L80242638 -/* C63308 802425F8 00000000 */ nop +/* C63308 802425F8 00000000 */ nop .L802425FC: /* C6330C 802425FC 0000182D */ daddu $v1, $zero, $zero /* C63310 80242600 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242CC8_C639D8.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242CC8_C639D8.s index 20e6fc28bf..1400c50727 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242CC8_C639D8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242CC8_C639D8.s @@ -13,6 +13,6 @@ glabel func_80242CC8_C639D8 /* C639F8 80242CE8 24020002 */ addiu $v0, $zero, 2 /* C639FC 80242CEC 03E00008 */ jr $ra /* C63A00 80242CF0 27BD0018 */ addiu $sp, $sp, 0x18 -/* C63A04 80242CF4 00000000 */ nop -/* C63A08 80242CF8 00000000 */ nop -/* C63A0C 80242CFC 00000000 */ nop +/* C63A04 80242CF4 00000000 */ nop +/* C63A08 80242CF8 00000000 */ nop +/* C63A0C 80242CFC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s index d7e0ec8d57..fe40f3cdbc 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s @@ -10,10 +10,10 @@ glabel func_80242D38_C63A48 /* C63A5C 80242D4C 44800000 */ mtc1 $zero, $f0 /* C63A60 80242D50 2406FFFF */ addiu $a2, $zero, -1 /* C63A64 80242D54 44821000 */ mtc1 $v0, $f2 -/* C63A68 80242D58 00000000 */ nop +/* C63A68 80242D58 00000000 */ nop /* C63A6C 80242D5C 468010A1 */ cvt.d.w $f2, $f2 /* C63A70 80242D60 4622003C */ c.lt.d $f0, $f2 -/* C63A74 80242D64 00000000 */ nop +/* C63A74 80242D64 00000000 */ nop /* C63A78 80242D68 45000002 */ bc1f .L80242D74 /* C63A7C 80242D6C AFBF0010 */ sw $ra, 0x10($sp) /* C63A80 80242D70 0000302D */ daddu $a2, $zero, $zero @@ -21,12 +21,12 @@ glabel func_80242D38_C63A48 /* C63A84 80242D74 3C018024 */ lui $at, %hi(D_80247410) /* C63A88 80242D78 D4207410 */ ldc1 $f0, %lo(D_80247410)($at) /* C63A8C 80242D7C 4620103C */ c.lt.d $f2, $f0 -/* C63A90 80242D80 00000000 */ nop +/* C63A90 80242D80 00000000 */ nop /* C63A94 80242D84 45030001 */ bc1tl .L80242D8C /* C63A98 80242D88 24060001 */ addiu $a2, $zero, 1 .L80242D8C: /* C63A9C 80242D8C 04C00004 */ bltz $a2, .L80242DA0 -/* C63AA0 80242D90 00000000 */ nop +/* C63AA0 80242D90 00000000 */ nop /* C63AA4 80242D94 3C05FD05 */ lui $a1, 0xfd05 /* C63AA8 80242D98 0C0B2026 */ jal set_variable /* C63AAC 80242D9C 34A50F89 */ ori $a1, $a1, 0xf89 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242DB0_C63AC0.s b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242DB0_C63AC0.s index 41f01d91c8..1fb6608eef 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242DB0_C63AC0.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242DB0_C63AC0.s @@ -32,7 +32,7 @@ glabel func_80242DB0_C63AC0 /* C63B2C 80242E1C 44060000 */ mfc1 $a2, $f0 /* C63B30 80242E20 44071000 */ mfc1 $a3, $f2 /* C63B34 80242E24 44820000 */ mtc1 $v0, $f0 -/* C63B38 80242E28 00000000 */ nop +/* C63B38 80242E28 00000000 */ nop /* C63B3C 80242E2C 46800020 */ cvt.s.w $f0, $f0 /* C63B40 80242E30 AE220078 */ sw $v0, 0x78($s1) /* C63B44 80242E34 0C05267B */ jal func_801499EC diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242E54_C63B64.s b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242E54_C63B64.s index 16f3a30b8f..206e3a17f5 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242E54_C63B64.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242E54_C63B64.s @@ -32,7 +32,7 @@ glabel func_80242E54_C63B64 /* C63BD0 80242EC0 44060000 */ mfc1 $a2, $f0 /* C63BD4 80242EC4 44071000 */ mfc1 $a3, $f2 /* C63BD8 80242EC8 44820000 */ mtc1 $v0, $f0 -/* C63BDC 80242ECC 00000000 */ nop +/* C63BDC 80242ECC 00000000 */ nop /* C63BE0 80242ED0 46800020 */ cvt.s.w $f0, $f0 /* C63BE4 80242ED4 AE220078 */ sw $v0, 0x78($s1) /* C63BE8 80242ED8 0C05267B */ jal func_801499EC diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242EF8_C63C08.s b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242EF8_C63C08.s index 8efba89304..d22aec318f 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242EF8_C63C08.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242EF8_C63C08.s @@ -22,7 +22,7 @@ glabel func_80242EF8_C63C08 /* C63C4C 80242F3C 46800020 */ cvt.s.w $f0, $f0 /* C63C50 80242F40 46083183 */ div.s $f6, $f6, $f8 /* C63C54 80242F44 46003182 */ mul.s $f6, $f6, $f0 -/* C63C58 80242F48 00000000 */ nop +/* C63C58 80242F48 00000000 */ nop /* C63C5C 80242F4C C6440010 */ lwc1 $f4, 0x10($s2) /* C63C60 80242F50 C6420004 */ lwc1 $f2, 4($s2) /* C63C64 80242F54 46022101 */ sub.s $f4, $f4, $f2 @@ -33,10 +33,10 @@ glabel func_80242EF8_C63C08 /* C63C78 80242F68 C6220084 */ lwc1 $f2, 0x84($s1) /* C63C7C 80242F6C 468010A0 */ cvt.s.w $f2, $f2 /* C63C80 80242F70 46022102 */ mul.s $f4, $f4, $f2 -/* C63C84 80242F74 00000000 */ nop +/* C63C84 80242F74 00000000 */ nop /* C63C88 80242F78 46080003 */ div.s $f0, $f0, $f8 /* C63C8C 80242F7C 46020002 */ mul.s $f0, $f0, $f2 -/* C63C90 80242F80 00000000 */ nop +/* C63C90 80242F80 00000000 */ nop /* C63C94 80242F84 4600328D */ trunc.w.s $f10, $f6 /* C63C98 80242F88 E62A0098 */ swc1 $f10, 0x98($s1) /* C63C9C 80242F8C 4600228D */ trunc.w.s $f10, $f4 @@ -52,21 +52,21 @@ glabel func_80242EF8_C63C08 /* C63CC4 80242FB4 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* C63CC8 80242FB8 00641821 */ addu $v1, $v1, $a0 /* C63CCC 80242FBC 44830000 */ mtc1 $v1, $f0 -/* C63CD0 80242FC0 00000000 */ nop +/* C63CD0 80242FC0 00000000 */ nop /* C63CD4 80242FC4 46800020 */ cvt.s.w $f0, $f0 /* C63CD8 80242FC8 E6000028 */ swc1 $f0, 0x28($s0) /* C63CDC 80242FCC 8E230090 */ lw $v1, 0x90($s1) /* C63CE0 80242FD0 8E24009C */ lw $a0, 0x9c($s1) /* C63CE4 80242FD4 00641821 */ addu $v1, $v1, $a0 /* C63CE8 80242FD8 44830000 */ mtc1 $v1, $f0 -/* C63CEC 80242FDC 00000000 */ nop +/* C63CEC 80242FDC 00000000 */ nop /* C63CF0 80242FE0 46800020 */ cvt.s.w $f0, $f0 /* C63CF4 80242FE4 E600002C */ swc1 $f0, 0x2c($s0) /* C63CF8 80242FE8 8E230094 */ lw $v1, 0x94($s1) /* C63CFC 80242FEC 8E2400A0 */ lw $a0, 0xa0($s1) /* C63D00 80242FF0 00641821 */ addu $v1, $v1, $a0 /* C63D04 80242FF4 44830000 */ mtc1 $v1, $f0 -/* C63D08 80242FF8 00000000 */ nop +/* C63D08 80242FF8 00000000 */ nop /* C63D0C 80242FFC 46800020 */ cvt.s.w $f0, $f0 /* C63D10 80243000 E6000030 */ swc1 $f0, 0x30($s0) /* C63D14 80243004 C64C0000 */ lwc1 $f12, ($s2) @@ -81,7 +81,7 @@ glabel func_80242EF8_C63C08 /* C63D38 80243028 C600002C */ lwc1 $f0, 0x2c($s0) /* C63D3C 8024302C 3C014120 */ lui $at, 0x4120 /* C63D40 80243030 44811000 */ mtc1 $at, $f2 -/* C63D44 80243034 00000000 */ nop +/* C63D44 80243034 00000000 */ nop /* C63D48 80243038 46020001 */ sub.s $f0, $f0, $f2 /* C63D4C 8024303C 3C0140A0 */ lui $at, 0x40a0 /* C63D50 80243040 44811000 */ mtc1 $at, $f2 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80243070_C63D80.s b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80243070_C63D80.s index a3d787634b..0b25eb68ca 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80243070_C63D80.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80243070_C63D80.s @@ -9,4 +9,4 @@ glabel func_80243070_C63D80 /* C63D90 80243080 AC8200A4 */ sw $v0, 0xa4($a0) /* C63D94 80243084 03E00008 */ jr $ra /* C63D98 80243088 24020002 */ addiu $v0, $zero, 2 -/* C63D9C 8024308C 00000000 */ nop +/* C63D9C 8024308C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802403E4_C68514.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802403E4_C68514.s index 4047f4d657..834f62719f 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802403E4_C68514.s +++ b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802403E4_C68514.s @@ -8,7 +8,7 @@ glabel func_802403E4_C68514 /* C68520 802403F0 00822021 */ addu $a0, $a0, $v0 /* C68524 802403F4 90820014 */ lbu $v0, 0x14($a0) /* C68528 802403F8 10400009 */ beqz $v0, .L80240420 -/* C6852C 802403FC 00000000 */ nop +/* C6852C 802403FC 00000000 */ nop /* C68530 80240400 90820015 */ lbu $v0, 0x15($a0) /* C68534 80240404 00022600 */ sll $a0, $v0, 0x18 /* C68538 80240408 00041E03 */ sra $v1, $a0, 0x18 @@ -16,7 +16,7 @@ glabel func_802403E4_C68514 /* C68540 80240410 00021403 */ sra $v0, $v0, 0x10 /* C68544 80240414 0043102A */ slt $v0, $v0, $v1 /* C68548 80240418 10400003 */ beqz $v0, .L80240428 -/* C6854C 8024041C 00000000 */ nop +/* C6854C 8024041C 00000000 */ nop .L80240420: /* C68550 80240420 03E00008 */ jr $ra /* C68554 80240424 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s index 6655b3d100..190cfdf0f1 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s @@ -108,20 +108,20 @@ glabel func_802404DC_C6860C /* C68794 80240664 10400009 */ beqz $v0, .L8024068C /* C68798 80240668 AEA20074 */ sw $v0, 0x74($s5) /* C6879C 8024066C 0C03C4EC */ jal func_800F13B0 -/* C687A0 80240670 00000000 */ nop +/* C687A0 80240670 00000000 */ nop /* C687A4 80240674 8EA20070 */ lw $v0, 0x70($s5) /* C687A8 80240678 24420001 */ addiu $v0, $v0, 1 .L8024067C: /* C687AC 8024067C AEA20070 */ sw $v0, 0x70($s5) /* C687B0 80240680 2842000F */ slti $v0, $v0, 0xf /* C687B4 80240684 10400003 */ beqz $v0, .L80240694 -/* C687B8 80240688 00000000 */ nop +/* C687B8 80240688 00000000 */ nop .L8024068C: /* C687BC 8024068C 080901BF */ j .L802406FC /* C687C0 80240690 0000102D */ daddu $v0, $zero, $zero .L80240694: /* C687C4 80240694 0C03C54E */ jal func_800F1538 -/* C687C8 80240698 00000000 */ nop +/* C687C8 80240698 00000000 */ nop /* C687CC 8024069C 8EA30074 */ lw $v1, 0x74($s5) /* C687D0 802406A0 240200FF */ addiu $v0, $zero, 0xff /* C687D4 802406A4 10620010 */ beq $v1, $v0, .L802406E8 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240910_C68A40.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240910_C68A40.s index 218a9cc708..94bfe2299e 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240910_C68A40.s +++ b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240910_C68A40.s @@ -36,7 +36,7 @@ glabel func_80240910_C68A40 /* C68ABC 8024098C 0C00A88D */ jal sin_cos_deg /* C68AC0 80240990 0040A82D */ daddu $s5, $v0, $zero /* C68AC4 80240994 1200005D */ beqz $s0, .L80240B0C -/* C68AC8 80240998 00000000 */ nop +/* C68AC8 80240998 00000000 */ nop /* C68ACC 8024099C 0C00AB0A */ jal general_heap_malloc /* C68AD0 802409A0 24040068 */ addiu $a0, $zero, 0x68 /* C68AD4 802409A4 0040902D */ daddu $s2, $v0, $zero @@ -98,10 +98,10 @@ glabel func_80240910_C68A40 /* C68BAC 80240A7C C7A2001C */ lwc1 $f2, 0x1c($sp) /* C68BB0 80240A80 C7A40020 */ lwc1 $f4, 0x20($sp) /* C68BB4 80240A84 46041082 */ mul.s $f2, $f2, $f4 -/* C68BB8 80240A88 00000000 */ nop +/* C68BB8 80240A88 00000000 */ nop /* C68BBC 80240A8C C7A00018 */ lwc1 $f0, 0x18($sp) /* C68BC0 80240A90 46040002 */ mul.s $f0, $f0, $f4 -/* C68BC4 80240A94 00000000 */ nop +/* C68BC4 80240A94 00000000 */ nop /* C68BC8 80240A98 E6020038 */ swc1 $f2, 0x38($s0) /* C68BCC 80240A9C E6000050 */ swc1 $f0, 0x50($s0) /* C68BD0 80240AA0 8E42005C */ lw $v0, 0x5c($s2) @@ -142,12 +142,12 @@ glabel func_80240910_C68A40 /* C68C58 80240B28 10600007 */ beqz $v1, .L80240B48 /* C68C5C 80240B2C 24040005 */ addiu $a0, $zero, 5 /* C68C60 80240B30 08090338 */ j .L80240CE0 -/* C68C64 80240B34 00000000 */ nop +/* C68C64 80240B34 00000000 */ nop .L80240B38: /* C68C68 80240B38 10620058 */ beq $v1, $v0, .L80240C9C -/* C68C6C 80240B3C 00000000 */ nop +/* C68C6C 80240B3C 00000000 */ nop /* C68C70 80240B40 08090338 */ j .L80240CE0 -/* C68C74 80240B44 00000000 */ nop +/* C68C74 80240B44 00000000 */ nop .L80240B48: /* C68C78 80240B48 0000882D */ daddu $s1, $zero, $zero /* C68C7C 80240B4C 3C148024 */ lui $s4, %hi(D_80241C98) @@ -174,11 +174,11 @@ glabel func_80240910_C68A40 /* C68CCC 80240B9C C7A4001C */ lwc1 $f4, 0x1c($sp) /* C68CD0 80240BA0 C7A00020 */ lwc1 $f0, 0x20($sp) /* C68CD4 80240BA4 46002102 */ mul.s $f4, $f4, $f0 -/* C68CD8 80240BA8 00000000 */ nop +/* C68CD8 80240BA8 00000000 */ nop /* C68CDC 80240BAC C7A20018 */ lwc1 $f2, 0x18($sp) /* C68CE0 80240BB0 26940004 */ addiu $s4, $s4, 4 /* C68CE4 80240BB4 46001082 */ mul.s $f2, $f2, $f0 -/* C68CE8 80240BB8 00000000 */ nop +/* C68CE8 80240BB8 00000000 */ nop /* C68CEC 80240BBC 26730004 */ addiu $s3, $s3, 4 /* C68CF0 80240BC0 26310001 */ addiu $s1, $s1, 1 /* C68CF4 80240BC4 2A220003 */ slti $v0, $s1, 3 @@ -215,11 +215,11 @@ glabel func_80240910_C68A40 /* C68D68 80240C38 C7A4001C */ lwc1 $f4, 0x1c($sp) /* C68D6C 80240C3C C7A00020 */ lwc1 $f0, 0x20($sp) /* C68D70 80240C40 46002102 */ mul.s $f4, $f4, $f0 -/* C68D74 80240C44 00000000 */ nop +/* C68D74 80240C44 00000000 */ nop /* C68D78 80240C48 C7A20018 */ lwc1 $f2, 0x18($sp) /* C68D7C 80240C4C 26940004 */ addiu $s4, $s4, 4 /* C68D80 80240C50 46001082 */ mul.s $f2, $f2, $f0 -/* C68D84 80240C54 00000000 */ nop +/* C68D84 80240C54 00000000 */ nop /* C68D88 80240C58 26730004 */ addiu $s3, $s3, 4 /* C68D8C 80240C5C 26310001 */ addiu $s1, $s1, 1 /* C68D90 80240C60 2A220003 */ slti $v0, $s1, 3 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240E48_C68F78.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240E48_C68F78.s index 32f93b730c..dd916127bd 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240E48_C68F78.s +++ b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240E48_C68F78.s @@ -36,16 +36,16 @@ glabel func_80240E48_C68F78 /* C68FF0 80240EC0 10600007 */ beqz $v1, .L80240EE0 /* C68FF4 80240EC4 240500FF */ addiu $a1, $zero, 0xff /* C68FF8 80240EC8 080903D6 */ j .L80240F58 -/* C68FFC 80240ECC 00000000 */ nop +/* C68FFC 80240ECC 00000000 */ nop .L80240ED0: /* C69000 80240ED0 10620019 */ beq $v1, $v0, .L80240F38 -/* C69004 80240ED4 00000000 */ nop +/* C69004 80240ED4 00000000 */ nop /* C69008 80240ED8 080903D6 */ j .L80240F58 -/* C6900C 80240EDC 00000000 */ nop +/* C6900C 80240EDC 00000000 */ nop .L80240EE0: /* C69010 80240EE0 8E220074 */ lw $v0, 0x74($s1) /* C69014 80240EE4 14450004 */ bne $v0, $a1, .L80240EF8 -/* C69018 80240EE8 00000000 */ nop +/* C69018 80240EE8 00000000 */ nop /* C6901C 80240EEC AE240070 */ sw $a0, 0x70($s1) /* C69020 80240EF0 AE200078 */ sw $zero, 0x78($s1) /* C69024 80240EF4 8E220074 */ lw $v0, 0x74($s1) @@ -57,7 +57,7 @@ glabel func_80240E48_C68F78 /* C69038 80240F08 50400013 */ beql $v0, $zero, .L80240F58 /* C6903C 80240F0C AE250074 */ sw $a1, 0x74($s1) /* C69040 80240F10 080903D6 */ j .L80240F58 -/* C69044 80240F14 00000000 */ nop +/* C69044 80240F14 00000000 */ nop .L80240F18: /* C69048 80240F18 8E220078 */ lw $v0, 0x78($s1) /* C6904C 80240F1C 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80241018_C69148.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80241018_C69148.s index 89ce6df7b4..7c4c1f996c 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80241018_C69148.s +++ b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80241018_C69148.s @@ -15,5 +15,5 @@ glabel func_80241018_C69148 .L80241040: /* C69170 80241040 03E00008 */ jr $ra /* C69174 80241044 24020002 */ addiu $v0, $zero, 2 -/* C69178 80241048 00000000 */ nop -/* C6917C 8024104C 00000000 */ nop +/* C69178 80241048 00000000 */ nop +/* C6917C 8024104C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s b/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s index 3d465d46de..e7d363179e 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s +++ b/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s @@ -63,7 +63,7 @@ glabel func_80241050_C69180 /* C69268 80241138 AE02001C */ sw $v0, 0x1c($s0) .L8024113C: /* C6926C 8024113C 0C009C64 */ jal func_80027190 -/* C69270 80241140 00000000 */ nop +/* C69270 80241140 00000000 */ nop /* C69274 80241144 14400131 */ bnez $v0, .L8024160C /* C69278 80241148 0000102D */ daddu $v0, $zero, $zero /* C6927C 8024114C 8E900074 */ lw $s0, 0x74($s4) @@ -86,21 +86,21 @@ glabel func_80241050_C69180 /* C692BC 8024118C 00004012 */ mflo $t0 /* C692C0 80241190 C6200054 */ lwc1 $f0, 0x54($s1) /* C692C4 80241194 4488A000 */ mtc1 $t0, $f20 -/* C692C8 80241198 00000000 */ nop +/* C692C8 80241198 00000000 */ nop /* C692CC 8024119C 4680A520 */ cvt.s.w $f20, $f20 /* C692D0 802411A0 4600A502 */ mul.s $f20, $f20, $f0 -/* C692D4 802411A4 00000000 */ nop +/* C692D4 802411A4 00000000 */ nop /* C692D8 802411A8 0C00A8BB */ jal sin_deg /* C692DC 802411AC C60C0028 */ lwc1 $f12, 0x28($s0) /* C692E0 802411B0 C60C0028 */ lwc1 $f12, 0x28($s0) /* C692E4 802411B4 4600A582 */ mul.s $f22, $f20, $f0 /* C692E8 802411B8 0C00A8D4 */ jal cos_deg -/* C692EC 802411BC 00000000 */ nop +/* C692EC 802411BC 00000000 */ nop /* C692F0 802411C0 C6020004 */ lwc1 $f2, 4($s0) /* C692F4 802411C4 46161080 */ add.s $f2, $f2, $f22 /* C692F8 802411C8 4600A507 */ neg.s $f20, $f20 /* C692FC 802411CC 4600A502 */ mul.s $f20, $f20, $f0 -/* C69300 802411D0 00000000 */ nop +/* C69300 802411D0 00000000 */ nop /* C69304 802411D4 E6220038 */ swc1 $f2, 0x38($s1) /* C69308 802411D8 C6000008 */ lwc1 $f0, 8($s0) /* C6930C 802411DC E620003C */ swc1 $f0, 0x3c($s1) @@ -116,7 +116,7 @@ glabel func_80241050_C69180 /* C69330 80241200 8E020000 */ lw $v0, ($s0) /* C69334 80241204 30420002 */ andi $v0, $v0, 2 /* C69338 80241208 14400051 */ bnez $v0, .L80241350 -/* C6933C 8024120C 00000000 */ nop +/* C6933C 8024120C 00000000 */ nop /* C69340 80241210 8E620000 */ lw $v0, ($s3) /* C69344 80241214 30428000 */ andi $v0, $v0, 0x8000 /* C69348 80241218 1440004D */ bnez $v0, .L80241350 @@ -135,10 +135,10 @@ glabel func_80241050_C69180 /* C6937C 8024124C 46020181 */ sub.s $f6, $f0, $f2 .L80241250: /* C69380 80241250 14620006 */ bne $v1, $v0, .L8024126C -/* C69384 80241254 00000000 */ nop +/* C69384 80241254 00000000 */ nop /* C69388 80241258 3C014120 */ lui $at, 0x4120 /* C6938C 8024125C 44810000 */ mtc1 $at, $f0 -/* C69390 80241260 00000000 */ nop +/* C69390 80241260 00000000 */ nop /* C69394 80241264 46002001 */ sub.s $f0, $f4, $f0 /* C69398 80241268 46020181 */ sub.s $f6, $f0, $f2 .L8024126C: @@ -147,10 +147,10 @@ glabel func_80241050_C69180 /* C693A4 80241274 3421CCCD */ ori $at, $at, 0xcccd /* C693A8 80241278 44810000 */ mtc1 $at, $f0 /* C693AC 8024127C 44822000 */ mtc1 $v0, $f4 -/* C693B0 80241280 00000000 */ nop +/* C693B0 80241280 00000000 */ nop /* C693B4 80241284 46802120 */ cvt.s.w $f4, $f4 /* C693B8 80241288 46002102 */ mul.s $f4, $f4, $f0 -/* C693BC 8024128C 00000000 */ nop +/* C693BC 8024128C 00000000 */ nop /* C693C0 80241290 C6620028 */ lwc1 $f2, 0x28($s3) /* C693C4 80241294 C6200038 */ lwc1 $f0, 0x38($s1) /* C693C8 80241298 46001581 */ sub.s $f22, $f2, $f0 @@ -159,45 +159,45 @@ glabel func_80241050_C69180 /* C693D4 802412A4 46001501 */ sub.s $f20, $f2, $f0 /* C693D8 802412A8 46003005 */ abs.s $f0, $f6 /* C693DC 802412AC 4604003C */ c.lt.s $f0, $f4 -/* C693E0 802412B0 00000000 */ nop +/* C693E0 802412B0 00000000 */ nop /* C693E4 802412B4 45000026 */ bc1f .L80241350 -/* C693E8 802412B8 00000000 */ nop +/* C693E8 802412B8 00000000 */ nop /* C693EC 802412BC 4616B082 */ mul.s $f2, $f22, $f22 -/* C693F0 802412C0 00000000 */ nop +/* C693F0 802412C0 00000000 */ nop /* C693F4 802412C4 4614A002 */ mul.s $f0, $f20, $f20 -/* C693F8 802412C8 00000000 */ nop +/* C693F8 802412C8 00000000 */ nop /* C693FC 802412CC 46001300 */ add.s $f12, $f2, $f0 /* C69400 802412D0 46006104 */ sqrt.s $f4, $f12 /* C69404 802412D4 46042032 */ c.eq.s $f4, $f4 -/* C69408 802412D8 00000000 */ nop +/* C69408 802412D8 00000000 */ nop /* C6940C 802412DC 45010004 */ bc1t .L802412F0 -/* C69410 802412E0 00000000 */ nop +/* C69410 802412E0 00000000 */ nop /* C69414 802412E4 0C0187BC */ jal sqrtf -/* C69418 802412E8 00000000 */ nop +/* C69418 802412E8 00000000 */ nop /* C6941C 802412EC 46000106 */ mov.s $f4, $f0 .L802412F0: /* C69420 802412F0 862200A6 */ lh $v0, 0xa6($s1) /* C69424 802412F4 44821000 */ mtc1 $v0, $f2 -/* C69428 802412F8 00000000 */ nop +/* C69428 802412F8 00000000 */ nop /* C6942C 802412FC 468010A0 */ cvt.s.w $f2, $f2 /* C69430 80241300 46181082 */ mul.s $f2, $f2, $f24 -/* C69434 80241304 00000000 */ nop +/* C69434 80241304 00000000 */ nop /* C69438 80241308 C6200054 */ lwc1 $f0, 0x54($s1) /* C6943C 8024130C 46001082 */ mul.s $f2, $f2, $f0 -/* C69440 80241310 00000000 */ nop +/* C69440 80241310 00000000 */ nop /* C69444 80241314 866200B2 */ lh $v0, 0xb2($s3) /* C69448 80241318 44820000 */ mtc1 $v0, $f0 -/* C6944C 8024131C 00000000 */ nop +/* C6944C 8024131C 00000000 */ nop /* C69450 80241320 46800020 */ cvt.s.w $f0, $f0 /* C69454 80241324 46180002 */ mul.s $f0, $f0, $f24 -/* C69458 80241328 00000000 */ nop +/* C69458 80241328 00000000 */ nop /* C6945C 8024132C 46181082 */ mul.s $f2, $f2, $f24 -/* C69460 80241330 00000000 */ nop +/* C69460 80241330 00000000 */ nop /* C69464 80241334 46180002 */ mul.s $f0, $f0, $f24 -/* C69468 80241338 00000000 */ nop +/* C69468 80241338 00000000 */ nop /* C6946C 8024133C 46001080 */ add.s $f2, $f2, $f0 /* C69470 80241340 4602203E */ c.le.s $f4, $f2 -/* C69474 80241344 00000000 */ nop +/* C69474 80241344 00000000 */ nop /* C69478 80241348 45030001 */ bc1tl .L80241350 /* C6947C 8024134C 24150001 */ addiu $s5, $zero, 1 .L80241350: @@ -205,7 +205,7 @@ glabel func_80241050_C69180 /* C69484 80241354 26520001 */ addiu $s2, $s2, 1 /* C69488 80241358 0242102A */ slt $v0, $s2, $v0 /* C6948C 8024135C 1440FF82 */ bnez $v0, .L80241168 -/* C69490 80241360 00000000 */ nop +/* C69490 80241360 00000000 */ nop .L80241364: /* C69494 80241364 8E620000 */ lw $v0, ($s3) /* C69498 80241368 30428000 */ andi $v0, $v0, 0x8000 @@ -220,9 +220,9 @@ glabel func_80241050_C69180 /* C694B8 80241388 C6020028 */ lwc1 $f2, 0x28($s0) /* C694BC 8024138C 46000106 */ mov.s $f4, $f0 /* C694C0 80241390 46022032 */ c.eq.s $f4, $f2 -/* C694C4 80241394 00000000 */ nop +/* C694C4 80241394 00000000 */ nop /* C694C8 80241398 4501000D */ bc1t .L802413D0 -/* C694CC 8024139C 00000000 */ nop +/* C694CC 8024139C 00000000 */ nop /* C694D0 802413A0 8E020020 */ lw $v0, 0x20($s0) /* C694D4 802413A4 C600000C */ lwc1 $f0, 0xc($s0) /* C694D8 802413A8 E6040028 */ swc1 $f4, 0x28($s0) @@ -251,23 +251,23 @@ glabel func_80241050_C69180 /* C69530 80241400 3C013F00 */ lui $at, 0x3f00 /* C69534 80241404 44813000 */ mtc1 $at, $f6 /* C69538 80241408 44821000 */ mtc1 $v0, $f2 -/* C6953C 8024140C 00000000 */ nop +/* C6953C 8024140C 00000000 */ nop /* C69540 80241410 468010A0 */ cvt.s.w $f2, $f2 /* C69544 80241414 46061082 */ mul.s $f2, $f2, $f6 -/* C69548 80241418 00000000 */ nop +/* C69548 80241418 00000000 */ nop /* C6954C 8024141C C6240054 */ lwc1 $f4, 0x54($s1) /* C69550 80241420 46041082 */ mul.s $f2, $f2, $f4 -/* C69554 80241424 00000000 */ nop +/* C69554 80241424 00000000 */ nop /* C69558 80241428 866200B2 */ lh $v0, 0xb2($s3) /* C6955C 8024142C 44822000 */ mtc1 $v0, $f4 -/* C69560 80241430 00000000 */ nop +/* C69560 80241430 00000000 */ nop /* C69564 80241434 46802120 */ cvt.s.w $f4, $f4 /* C69568 80241438 46062102 */ mul.s $f4, $f4, $f6 -/* C6956C 8024143C 00000000 */ nop +/* C6956C 8024143C 00000000 */ nop /* C69570 80241440 46061082 */ mul.s $f2, $f2, $f6 -/* C69574 80241444 00000000 */ nop +/* C69574 80241444 00000000 */ nop /* C69578 80241448 46062102 */ mul.s $f4, $f4, $f6 -/* C6957C 8024144C 00000000 */ nop +/* C6957C 8024144C 00000000 */ nop /* C69580 80241450 C60C0004 */ lwc1 $f12, 4($s0) /* C69584 80241454 C60E000C */ lwc1 $f14, 0xc($s0) /* C69588 80241458 46020000 */ add.s $f0, $f0, $f2 @@ -313,11 +313,11 @@ glabel func_80241050_C69180 /* C69628 802414F8 A6620016 */ sh $v0, 0x16($s3) /* C6962C 802414FC 4600020D */ trunc.w.s $f8, $f0 /* C69630 80241500 44024000 */ mfc1 $v0, $f8 -/* C69634 80241504 00000000 */ nop +/* C69634 80241504 00000000 */ nop /* C69638 80241508 A6620018 */ sh $v0, 0x18($s3) /* C6963C 8024150C 4600120D */ trunc.w.s $f8, $f2 /* C69640 80241510 44024000 */ mfc1 $v0, $f8 -/* C69644 80241514 00000000 */ nop +/* C69644 80241514 00000000 */ nop /* C69648 80241518 A662001A */ sh $v0, 0x1a($s3) /* C6964C 8024151C 8E02001C */ lw $v0, 0x1c($s0) /* C69650 80241520 10400033 */ beqz $v0, .L802415F0 @@ -326,47 +326,47 @@ glabel func_80241050_C69180 /* C6965C 8024152C 0040F809 */ jalr $v0 /* C69660 80241530 24050002 */ addiu $a1, $zero, 2 /* C69664 80241534 0809057C */ j .L802415F0 -/* C69668 80241538 00000000 */ nop +/* C69668 80241538 00000000 */ nop .L8024153C: /* C6966C 8024153C 4618B03C */ c.lt.s $f22, $f24 -/* C69670 80241540 00000000 */ nop +/* C69670 80241540 00000000 */ nop /* C69674 80241544 4500002A */ bc1f .L802415F0 -/* C69678 80241548 00000000 */ nop +/* C69678 80241548 00000000 */ nop /* C6967C 8024154C 8E020000 */ lw $v0, ($s0) /* C69680 80241550 30420002 */ andi $v0, $v0, 2 /* C69684 80241554 14400026 */ bnez $v0, .L802415F0 -/* C69688 80241558 00000000 */ nop +/* C69688 80241558 00000000 */ nop /* C6968C 8024155C 16A00024 */ bnez $s5, .L802415F0 /* C69690 80241560 24020015 */ addiu $v0, $zero, 0x15 /* C69694 80241564 826300B4 */ lb $v1, 0xb4($s3) /* C69698 80241568 10620021 */ beq $v1, $v0, .L802415F0 -/* C6969C 8024156C 00000000 */ nop +/* C6969C 8024156C 00000000 */ nop /* C696A0 80241570 C6000010 */ lwc1 $f0, 0x10($s0) /* C696A4 80241574 44801000 */ mtc1 $zero, $f2 -/* C696A8 80241578 00000000 */ nop +/* C696A8 80241578 00000000 */ nop /* C696AC 8024157C 4600103C */ c.lt.s $f2, $f0 -/* C696B0 80241580 00000000 */ nop +/* C696B0 80241580 00000000 */ nop /* C696B4 80241584 45000009 */ bc1f .L802415AC -/* C696B8 80241588 00000000 */ nop +/* C696B8 80241588 00000000 */ nop /* C696BC 8024158C C6000024 */ lwc1 $f0, 0x24($s0) /* C696C0 80241590 4602003C */ c.lt.s $f0, $f2 -/* C696C4 80241594 00000000 */ nop +/* C696C4 80241594 00000000 */ nop /* C696C8 80241598 45000015 */ bc1f .L802415F0 -/* C696CC 8024159C 00000000 */ nop +/* C696CC 8024159C 00000000 */ nop /* C696D0 802415A0 4614103C */ c.lt.s $f2, $f20 /* C696D4 802415A4 08090572 */ j .L802415C8 -/* C696D8 802415A8 00000000 */ nop +/* C696D8 802415A8 00000000 */ nop .L802415AC: /* C696DC 802415AC C6000024 */ lwc1 $f0, 0x24($s0) /* C696E0 802415B0 4600103C */ c.lt.s $f2, $f0 -/* C696E4 802415B4 00000000 */ nop +/* C696E4 802415B4 00000000 */ nop /* C696E8 802415B8 4500000D */ bc1f .L802415F0 -/* C696EC 802415BC 00000000 */ nop +/* C696EC 802415BC 00000000 */ nop /* C696F0 802415C0 4602A03C */ c.lt.s $f20, $f2 -/* C696F4 802415C4 00000000 */ nop +/* C696F4 802415C4 00000000 */ nop .L802415C8: /* C696F8 802415C8 45000009 */ bc1f .L802415F0 -/* C696FC 802415CC 00000000 */ nop +/* C696FC 802415CC 00000000 */ nop /* C69700 802415D0 8E020020 */ lw $v0, 0x20($s0) /* C69704 802415D4 8E03001C */ lw $v1, 0x1c($s0) /* C69708 802415D8 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241644_C69774.s b/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241644_C69774.s index 277ad55991..64b72cfe8c 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241644_C69774.s +++ b/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241644_C69774.s @@ -12,26 +12,26 @@ glabel func_80241644_C69774 /* C69790 80241660 50400005 */ beql $v0, $zero, .L80241678 /* C69794 80241664 24020002 */ addiu $v0, $zero, 2 /* C69798 80241668 10A00007 */ beqz $a1, .L80241688 -/* C6979C 8024166C 00000000 */ nop +/* C6979C 8024166C 00000000 */ nop /* C697A0 80241670 080905D4 */ j .L80241750 -/* C697A4 80241674 00000000 */ nop +/* C697A4 80241674 00000000 */ nop .L80241678: /* C697A8 80241678 10A20028 */ beq $a1, $v0, .L8024171C -/* C697AC 8024167C 00000000 */ nop +/* C697AC 8024167C 00000000 */ nop /* C697B0 80241680 080905D4 */ j .L80241750 -/* C697B4 80241684 00000000 */ nop +/* C697B4 80241684 00000000 */ nop .L80241688: /* C697B8 80241688 8E020000 */ lw $v0, ($s0) /* C697BC 8024168C 30420002 */ andi $v0, $v0, 2 /* C697C0 80241690 1040002F */ beqz $v0, .L80241750 -/* C697C4 80241694 00000000 */ nop +/* C697C4 80241694 00000000 */ nop /* C697C8 80241698 C6000010 */ lwc1 $f0, 0x10($s0) /* C697CC 8024169C 3C013F73 */ lui $at, 0x3f73 /* C697D0 802416A0 34213333 */ ori $at, $at, 0x3333 /* C697D4 802416A4 44811000 */ mtc1 $at, $f2 -/* C697D8 802416A8 00000000 */ nop +/* C697D8 802416A8 00000000 */ nop /* C697DC 802416AC 46020002 */ mul.s $f0, $f0, $f2 -/* C697E0 802416B0 00000000 */ nop +/* C697E0 802416B0 00000000 */ nop /* C697E4 802416B4 080905D4 */ j .L80241750 /* C697E8 802416B8 E6000010 */ swc1 $f0, 0x10($s0) .L802416BC: @@ -39,9 +39,9 @@ glabel func_80241644_C69774 /* C697F0 802416C0 3C013F8F */ lui $at, 0x3f8f /* C697F4 802416C4 34215C29 */ ori $at, $at, 0x5c29 /* C697F8 802416C8 44811000 */ mtc1 $at, $f2 -/* C697FC 802416CC 00000000 */ nop +/* C697FC 802416CC 00000000 */ nop /* C69800 802416D0 46020002 */ mul.s $f0, $f0, $f2 -/* C69804 802416D4 00000000 */ nop +/* C69804 802416D4 00000000 */ nop /* C69808 802416D8 8E030020 */ lw $v1, 0x20($s0) /* C6980C 802416DC 2402000A */ addiu $v0, $zero, 0xa /* C69810 802416E0 1462001B */ bne $v1, $v0, .L80241750 @@ -69,10 +69,10 @@ glabel func_80241644_C69774 /* C69864 80241734 00021023 */ negu $v0, $v0 .L80241738: /* C69868 80241738 44821000 */ mtc1 $v0, $f2 -/* C6986C 8024173C 00000000 */ nop +/* C6986C 8024173C 00000000 */ nop /* C69870 80241740 468010A0 */ cvt.s.w $f2, $f2 /* C69874 80241744 46001082 */ mul.s $f2, $f2, $f0 -/* C69878 80241748 00000000 */ nop +/* C69878 80241748 00000000 */ nop /* C6987C 8024174C E6020010 */ swc1 $f2, 0x10($s0) .L80241750: /* C69880 80241750 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_06/C6CC30/func_80240310_C6CC30.s b/asm/nonmatchings/world/area_kzn/kzn_06/C6CC30/func_80240310_C6CC30.s index d87939ce40..0d12f42497 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_06/C6CC30/func_80240310_C6CC30.s +++ b/asm/nonmatchings/world/area_kzn/kzn_06/C6CC30/func_80240310_C6CC30.s @@ -15,7 +15,7 @@ glabel func_80240310_C6CC30 /* C6CC58 80240338 00220821 */ addu $at, $at, $v0 /* C6CC5C 8024033C C4221120 */ lwc1 $f2, %lo(func_80241120_A8DBA0)($at) /* C6CC60 80240340 46001082 */ mul.s $f2, $f2, $f0 -/* C6CC64 80240344 00000000 */ nop +/* C6CC64 80240344 00000000 */ nop /* C6CC68 80240348 C6200084 */ lwc1 $f0, 0x84($s1) /* C6CC6C 8024034C 46800020 */ cvt.s.w $f0, $f0 /* C6CC70 80240350 46020001 */ sub.s $f0, $f0, $f2 @@ -57,6 +57,6 @@ glabel func_80240310_C6CC30 /* C6CCF8 802403D8 2C420001 */ sltiu $v0, $v0, 1 /* C6CCFC 802403DC 03E00008 */ jr $ra /* C6CD00 802403E0 27BD0028 */ addiu $sp, $sp, 0x28 -/* C6CD04 802403E4 00000000 */ nop -/* C6CD08 802403E8 00000000 */ nop -/* C6CD0C 802403EC 00000000 */ nop +/* C6CD04 802403E4 00000000 */ nop +/* C6CD08 802403E8 00000000 */ nop +/* C6CD0C 802403EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802403F0_C6CD10.s b/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802403F0_C6CD10.s index eb42cdf885..9018ae637d 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802403F0_C6CD10.s +++ b/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802403F0_C6CD10.s @@ -43,7 +43,7 @@ glabel func_802403F0_C6CD10 /* C6CDA4 80240484 1440FFF4 */ bnez $v0, .L80240458 /* C6CDA8 80240488 26310002 */ addiu $s1, $s1, 2 /* C6CDAC 8024048C 08090132 */ j .L802404C8 -/* C6CDB0 80240490 00000000 */ nop +/* C6CDB0 80240490 00000000 */ nop .L80240494: /* C6CDB4 80240494 3C118015 */ lui $s1, %hi(gCurrentModelListPtr) /* C6CDB8 80240498 8E3112CC */ lw $s1, %lo(gCurrentModelListPtr)($s1) @@ -66,13 +66,13 @@ glabel func_802403F0_C6CD10 /* C6CDF0 802404D0 C4420000 */ lwc1 $f2, ($v0) /* C6CDF4 802404D4 3C013F80 */ lui $at, 0x3f80 /* C6CDF8 802404D8 44810000 */ mtc1 $at, $f0 -/* C6CDFC 802404DC 00000000 */ nop +/* C6CDFC 802404DC 00000000 */ nop /* C6CE00 802404E0 46001000 */ add.s $f0, $f2, $f0 /* C6CE04 802404E4 3C0143B4 */ lui $at, 0x43b4 /* C6CE08 802404E8 44811000 */ mtc1 $at, $f2 -/* C6CE0C 802404EC 00000000 */ nop +/* C6CE0C 802404EC 00000000 */ nop /* C6CE10 802404F0 4600103C */ c.lt.s $f2, $f0 -/* C6CE14 802404F4 00000000 */ nop +/* C6CE14 802404F4 00000000 */ nop /* C6CE18 802404F8 45000003 */ bc1f .L80240508 /* C6CE1C 802404FC E4400000 */ swc1 $f0, ($v0) /* C6CE20 80240500 46020001 */ sub.s $f0, $f0, $f2 @@ -86,21 +86,21 @@ glabel func_802403F0_C6CD10 /* C6CE3C 8024051C 12820008 */ beq $s4, $v0, .L80240540 /* C6CE40 80240520 0000202D */ daddu $a0, $zero, $zero /* C6CE44 80240524 08090184 */ j .L80240610 -/* C6CE48 80240528 00000000 */ nop +/* C6CE48 80240528 00000000 */ nop .L8024052C: /* C6CE4C 8024052C 2402000A */ addiu $v0, $zero, 0xa /* C6CE50 80240530 12820077 */ beq $s4, $v0, .L80240710 /* C6CE54 80240534 0000102D */ daddu $v0, $zero, $zero /* C6CE58 80240538 08090184 */ j .L80240610 -/* C6CE5C 8024053C 00000000 */ nop +/* C6CE5C 8024053C 00000000 */ nop .L80240540: /* C6CE60 80240540 3C05FD05 */ lui $a1, 0xfd05 /* C6CE64 80240544 0C0B210B */ jal get_float_variable /* C6CE68 80240548 34A50F80 */ ori $a1, $a1, 0xf80 /* C6CE6C 8024054C 44802000 */ mtc1 $zero, $f4 -/* C6CE70 80240550 00000000 */ nop +/* C6CE70 80240550 00000000 */ nop /* C6CE74 80240554 4604003E */ c.le.s $f0, $f4 -/* C6CE78 80240558 00000000 */ nop +/* C6CE78 80240558 00000000 */ nop /* C6CE7C 8024055C 4501006C */ bc1t .L80240710 /* C6CE80 80240560 24020002 */ addiu $v0, $zero, 2 /* C6CE84 80240564 3C028011 */ lui $v0, %hi(gPlayerStatus) @@ -108,19 +108,19 @@ glabel func_802403F0_C6CD10 /* C6CE8C 8024056C C4420028 */ lwc1 $f2, 0x28($v0) /* C6CE90 80240570 3C01C296 */ lui $at, 0xc296 /* C6CE94 80240574 44810000 */ mtc1 $at, $f0 -/* C6CE98 80240578 00000000 */ nop +/* C6CE98 80240578 00000000 */ nop /* C6CE9C 8024057C 46020081 */ sub.s $f2, $f0, $f2 /* C6CEA0 80240580 4604103C */ c.lt.s $f2, $f4 -/* C6CEA4 80240584 00000000 */ nop +/* C6CEA4 80240584 00000000 */ nop /* C6CEA8 80240588 45030001 */ bc1tl .L80240590 /* C6CEAC 8024058C 46001087 */ neg.s $f2, $f2 .L80240590: /* C6CEB0 80240590 3C014400 */ lui $at, 0x4400 /* C6CEB4 80240594 44810000 */ mtc1 $at, $f0 -/* C6CEB8 80240598 00000000 */ nop +/* C6CEB8 80240598 00000000 */ nop /* C6CEBC 8024059C 46020581 */ sub.s $f22, $f0, $f2 /* C6CEC0 802405A0 4604B03C */ c.lt.s $f22, $f4 -/* C6CEC4 802405A4 00000000 */ nop +/* C6CEC4 802405A4 00000000 */ nop /* C6CEC8 802405A8 45030001 */ bc1tl .L802405B0 /* C6CECC 802405AC 46002586 */ mov.s $f22, $f4 .L802405B0: @@ -132,10 +132,10 @@ glabel func_802403F0_C6CD10 /* C6CEE4 802405C4 D4221A00 */ ldc1 $f2, %lo(D_80241A00)($at) /* C6CEE8 802405C8 46000021 */ cvt.d.s $f0, $f0 /* C6CEEC 802405CC 46220002 */ mul.d $f0, $f0, $f2 -/* C6CEF0 802405D0 00000000 */ nop +/* C6CEF0 802405D0 00000000 */ nop /* C6CEF4 802405D4 4600B0A1 */ cvt.d.s $f2, $f22 /* C6CEF8 802405D8 46201082 */ mul.d $f2, $f2, $f0 -/* C6CEFC 802405DC 00000000 */ nop +/* C6CEFC 802405DC 00000000 */ nop /* C6CF00 802405E0 241103CA */ addiu $s1, $zero, 0x3ca /* C6CF04 802405E4 08090187 */ j .L8024061C /* C6CF08 802405E8 462015A0 */ cvt.s.d $f22, $f2 @@ -159,16 +159,16 @@ glabel func_802403F0_C6CD10 /* C6CF44 80240624 C6000000 */ lwc1 $f0, ($s0) /* C6CF48 80240628 3C014040 */ lui $at, 0x4040 /* C6CF4C 8024062C 44816000 */ mtc1 $at, $f12 -/* C6CF50 80240630 00000000 */ nop +/* C6CF50 80240630 00000000 */ nop /* C6CF54 80240634 460C0302 */ mul.s $f12, $f0, $f12 /* C6CF58 80240638 0C00A8BB */ jal sin_deg -/* C6CF5C 8024063C 00000000 */ nop +/* C6CF5C 8024063C 00000000 */ nop /* C6CF60 80240640 C6020000 */ lwc1 $f2, ($s0) /* C6CF64 80240644 3C014100 */ lui $at, 0x4100 /* C6CF68 80240648 44816000 */ mtc1 $at, $f12 -/* C6CF6C 8024064C 00000000 */ nop +/* C6CF6C 8024064C 00000000 */ nop /* C6CF70 80240650 460C1302 */ mul.s $f12, $f2, $f12 -/* C6CF74 80240654 00000000 */ nop +/* C6CF74 80240654 00000000 */ nop /* C6CF78 80240658 0C00A8BB */ jal sin_deg /* C6CF7C 8024065C 46000506 */ mov.s $f20, $f0 /* C6CF80 80240660 3C013FE0 */ lui $at, 0x3fe0 @@ -176,21 +176,21 @@ glabel func_802403F0_C6CD10 /* C6CF88 80240668 44801000 */ mtc1 $zero, $f2 /* C6CF8C 8024066C 4600A521 */ cvt.d.s $f20, $f20 /* C6CF90 80240670 4622A502 */ mul.d $f20, $f20, $f2 -/* C6CF94 80240674 00000000 */ nop +/* C6CF94 80240674 00000000 */ nop /* C6CF98 80240678 46000021 */ cvt.d.s $f0, $f0 /* C6CF9C 8024067C 46220002 */ mul.d $f0, $f0, $f2 -/* C6CFA0 80240680 00000000 */ nop +/* C6CFA0 80240680 00000000 */ nop /* C6CFA4 80240684 4620A500 */ add.d $f20, $f20, $f0 /* C6CFA8 80240688 4600B021 */ cvt.d.s $f0, $f22 /* C6CFAC 8024068C 46340502 */ mul.d $f20, $f0, $f20 -/* C6CFB0 80240690 00000000 */ nop +/* C6CFB0 80240690 00000000 */ nop /* C6CFB4 80240694 46340000 */ add.d $f0, $f0, $f20 /* C6CFB8 80240698 3C0141E0 */ lui $at, 0x41e0 /* C6CFBC 8024069C 44811800 */ mtc1 $at, $f3 /* C6CFC0 802406A0 44801000 */ mtc1 $zero, $f2 -/* C6CFC4 802406A4 00000000 */ nop +/* C6CFC4 802406A4 00000000 */ nop /* C6CFC8 802406A8 4620103E */ c.le.d $f2, $f0 -/* C6CFCC 802406AC 00000000 */ nop +/* C6CFCC 802406AC 00000000 */ nop /* C6CFD0 802406B0 45030005 */ bc1tl .L802406C8 /* C6CFD4 802406B4 46220001 */ sub.d $f0, $f0, $f2 /* C6CFD8 802406B8 4620018D */ trunc.w.d $f6, $f0 @@ -201,7 +201,7 @@ glabel func_802403F0_C6CD10 /* C6CFE8 802406C8 3C028000 */ lui $v0, 0x8000 /* C6CFEC 802406CC 4620018D */ trunc.w.d $f6, $f0 /* C6CFF0 802406D0 44073000 */ mfc1 $a3, $f6 -/* C6CFF4 802406D4 00000000 */ nop +/* C6CFF4 802406D4 00000000 */ nop /* C6CFF8 802406D8 00E23825 */ or $a3, $a3, $v0 /* C6CFFC 802406DC 2404003C */ addiu $a0, $zero, 0x3c .L802406E0: diff --git a/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_80240738_C6D058.s b/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_80240738_C6D058.s index ce297c5a3a..329921eb95 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_80240738_C6D058.s +++ b/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_80240738_C6D058.s @@ -31,7 +31,7 @@ glabel func_80240738_C6D058 /* C6D0BC 8024079C 1440FFF4 */ bnez $v0, .L80240770 /* C6D0C0 802407A0 26310002 */ addiu $s1, $s1, 2 /* C6D0C4 802407A4 080901F8 */ j .L802407E0 -/* C6D0C8 802407A8 00000000 */ nop +/* C6D0C8 802407A8 00000000 */ nop .L802407AC: /* C6D0CC 802407AC 3C118015 */ lui $s1, %hi(gCurrentModelListPtr) /* C6D0D0 802407B0 8E3112CC */ lw $s1, %lo(gCurrentModelListPtr)($s1) diff --git a/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802407FC_C6D11C.s b/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802407FC_C6D11C.s index 6cd7d8933a..aa3ccf5667 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802407FC_C6D11C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802407FC_C6D11C.s @@ -52,7 +52,7 @@ glabel func_802407FC_C6D11C .L802408B8: /* C6D1D8 802408B8 96240002 */ lhu $a0, 2($s1) /* C6D1DC 802408BC 0C046C04 */ jal get_model_list_index_from_tree_index -/* C6D1E0 802408C0 00000000 */ nop +/* C6D1E0 802408C0 00000000 */ nop /* C6D1E4 802408C4 0C046B4C */ jal get_model_from_list_index /* C6D1E8 802408C8 0040202D */ daddu $a0, $v0, $zero /* C6D1EC 802408CC 0040802D */ daddu $s0, $v0, $zero @@ -61,7 +61,7 @@ glabel func_802407FC_C6D11C /* C6D1F8 802408D8 0C046F1F */ jal func_8011BC7C /* C6D1FC 802408DC 24060003 */ addiu $a2, $zero, 3 /* C6D200 802408E0 12C00004 */ beqz $s6, .L802408F4 -/* C6D204 802408E4 00000000 */ nop +/* C6D204 802408E4 00000000 */ nop /* C6D208 802408E8 96020000 */ lhu $v0, ($s0) /* C6D20C 802408EC 3042FFFD */ andi $v0, $v0, 0xfffd /* C6D210 802408F0 A6020000 */ sh $v0, ($s0) @@ -87,7 +87,7 @@ glabel func_802407FC_C6D11C /* C6D250 80240930 16810004 */ bne $s4, $at, .L80240944 /* C6D254 80240934 3C018000 */ lui $at, 0x8000 /* C6D258 80240938 14E10002 */ bne $a3, $at, .L80240944 -/* C6D25C 8024093C 00000000 */ nop +/* C6D25C 8024093C 00000000 */ nop /* C6D260 80240940 0006000D */ break 6 .L80240944: /* C6D264 80240944 00003812 */ mflo $a3 @@ -106,7 +106,7 @@ glabel func_802407FC_C6D11C /* C6D290 80240970 16810004 */ bne $s4, $at, .L80240984 /* C6D294 80240974 3C018000 */ lui $at, 0x8000 /* C6D298 80240978 14E10002 */ bne $a3, $at, .L80240984 -/* C6D29C 8024097C 00000000 */ nop +/* C6D29C 8024097C 00000000 */ nop /* C6D2A0 80240980 0006000D */ break 6 .L80240984: /* C6D2A4 80240984 00003812 */ mflo $a3 @@ -135,7 +135,7 @@ glabel func_802407FC_C6D11C /* C6D2F8 802409D8 0C046F1F */ jal func_8011BC7C /* C6D2FC 802409DC 0000302D */ daddu $a2, $zero, $zero /* C6D300 802409E0 16C00004 */ bnez $s6, .L802409F4 -/* C6D304 802409E4 00000000 */ nop +/* C6D304 802409E4 00000000 */ nop /* C6D308 802409E8 96020000 */ lhu $v0, ($s0) /* C6D30C 802409EC 34420002 */ ori $v0, $v0, 2 /* C6D310 802409F0 A6020000 */ sh $v0, ($s0) diff --git a/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_80240A44_C6D364.s b/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_80240A44_C6D364.s index 14f136df83..377f1c0e39 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_80240A44_C6D364.s +++ b/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_80240A44_C6D364.s @@ -11,5 +11,5 @@ glabel func_80240A44_C6D364 /* C6D37C 80240A5C 24020002 */ addiu $v0, $zero, 2 /* C6D380 80240A60 03E00008 */ jr $ra /* C6D384 80240A64 27BD0018 */ addiu $sp, $sp, 0x18 -/* C6D388 80240A68 00000000 */ nop -/* C6D38C 80240A6C 00000000 */ nop +/* C6D388 80240A68 00000000 */ nop +/* C6D38C 80240A6C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240000_C6E330.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240000_C6E330.s index 91fbaa7ec6..1322a210b9 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240000_C6E330.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240000_C6E330.s @@ -43,7 +43,7 @@ glabel func_80240000_C6E330 /* C6E3C4 80240094 1440FFF4 */ bnez $v0, .L80240068 /* C6E3C8 80240098 26310002 */ addiu $s1, $s1, 2 /* C6E3CC 8024009C 08090036 */ j .L802400D8 -/* C6E3D0 802400A0 00000000 */ nop +/* C6E3D0 802400A0 00000000 */ nop .L802400A4: /* C6E3D4 802400A4 3C118015 */ lui $s1, %hi(gCurrentModelListPtr) /* C6E3D8 802400A8 8E3112CC */ lw $s1, %lo(gCurrentModelListPtr)($s1) @@ -66,13 +66,13 @@ glabel func_80240000_C6E330 /* C6E410 802400E0 C4420000 */ lwc1 $f2, ($v0) /* C6E414 802400E4 3C013F80 */ lui $at, 0x3f80 /* C6E418 802400E8 44810000 */ mtc1 $at, $f0 -/* C6E41C 802400EC 00000000 */ nop +/* C6E41C 802400EC 00000000 */ nop /* C6E420 802400F0 46001000 */ add.s $f0, $f2, $f0 /* C6E424 802400F4 3C0143B4 */ lui $at, 0x43b4 /* C6E428 802400F8 44811000 */ mtc1 $at, $f2 -/* C6E42C 802400FC 00000000 */ nop +/* C6E42C 802400FC 00000000 */ nop /* C6E430 80240100 4600103C */ c.lt.s $f2, $f0 -/* C6E434 80240104 00000000 */ nop +/* C6E434 80240104 00000000 */ nop /* C6E438 80240108 45000003 */ bc1f .L80240118 /* C6E43C 8024010C E4400000 */ swc1 $f0, ($v0) /* C6E440 80240110 46020001 */ sub.s $f0, $f0, $f2 @@ -86,21 +86,21 @@ glabel func_80240000_C6E330 /* C6E45C 8024012C 12820008 */ beq $s4, $v0, .L80240150 /* C6E460 80240130 0000202D */ daddu $a0, $zero, $zero /* C6E464 80240134 08090088 */ j .L80240220 -/* C6E468 80240138 00000000 */ nop +/* C6E468 80240138 00000000 */ nop .L8024013C: /* C6E46C 8024013C 2402000A */ addiu $v0, $zero, 0xa /* C6E470 80240140 12820077 */ beq $s4, $v0, .L80240320 /* C6E474 80240144 0000102D */ daddu $v0, $zero, $zero /* C6E478 80240148 08090088 */ j .L80240220 -/* C6E47C 8024014C 00000000 */ nop +/* C6E47C 8024014C 00000000 */ nop .L80240150: /* C6E480 80240150 3C05FD05 */ lui $a1, 0xfd05 /* C6E484 80240154 0C0B210B */ jal get_float_variable /* C6E488 80240158 34A50F80 */ ori $a1, $a1, 0xf80 /* C6E48C 8024015C 44802000 */ mtc1 $zero, $f4 -/* C6E490 80240160 00000000 */ nop +/* C6E490 80240160 00000000 */ nop /* C6E494 80240164 4604003E */ c.le.s $f0, $f4 -/* C6E498 80240168 00000000 */ nop +/* C6E498 80240168 00000000 */ nop /* C6E49C 8024016C 4501006C */ bc1t .L80240320 /* C6E4A0 80240170 24020002 */ addiu $v0, $zero, 2 /* C6E4A4 80240174 3C028011 */ lui $v0, %hi(gPlayerStatus) @@ -108,19 +108,19 @@ glabel func_80240000_C6E330 /* C6E4AC 8024017C C4420028 */ lwc1 $f2, 0x28($v0) /* C6E4B0 80240180 3C01C296 */ lui $at, 0xc296 /* C6E4B4 80240184 44810000 */ mtc1 $at, $f0 -/* C6E4B8 80240188 00000000 */ nop +/* C6E4B8 80240188 00000000 */ nop /* C6E4BC 8024018C 46020081 */ sub.s $f2, $f0, $f2 /* C6E4C0 80240190 4604103C */ c.lt.s $f2, $f4 -/* C6E4C4 80240194 00000000 */ nop +/* C6E4C4 80240194 00000000 */ nop /* C6E4C8 80240198 45030001 */ bc1tl .L802401A0 /* C6E4CC 8024019C 46001087 */ neg.s $f2, $f2 .L802401A0: /* C6E4D0 802401A0 3C014400 */ lui $at, 0x4400 /* C6E4D4 802401A4 44810000 */ mtc1 $at, $f0 -/* C6E4D8 802401A8 00000000 */ nop +/* C6E4D8 802401A8 00000000 */ nop /* C6E4DC 802401AC 46020581 */ sub.s $f22, $f0, $f2 /* C6E4E0 802401B0 4604B03C */ c.lt.s $f22, $f4 -/* C6E4E4 802401B4 00000000 */ nop +/* C6E4E4 802401B4 00000000 */ nop /* C6E4E8 802401B8 45030001 */ bc1tl .L802401C0 /* C6E4EC 802401BC 46002586 */ mov.s $f22, $f4 .L802401C0: @@ -132,10 +132,10 @@ glabel func_80240000_C6E330 /* C6E504 802401D4 D4223080 */ ldc1 $f2, %lo(D_80243080)($at) /* C6E508 802401D8 46000021 */ cvt.d.s $f0, $f0 /* C6E50C 802401DC 46220002 */ mul.d $f0, $f0, $f2 -/* C6E510 802401E0 00000000 */ nop +/* C6E510 802401E0 00000000 */ nop /* C6E514 802401E4 4600B0A1 */ cvt.d.s $f2, $f22 /* C6E518 802401E8 46201082 */ mul.d $f2, $f2, $f0 -/* C6E51C 802401EC 00000000 */ nop +/* C6E51C 802401EC 00000000 */ nop /* C6E520 802401F0 241103CA */ addiu $s1, $zero, 0x3ca /* C6E524 802401F4 0809008B */ j .L8024022C /* C6E528 802401F8 462015A0 */ cvt.s.d $f22, $f2 @@ -159,16 +159,16 @@ glabel func_80240000_C6E330 /* C6E564 80240234 C6000000 */ lwc1 $f0, ($s0) /* C6E568 80240238 3C014040 */ lui $at, 0x4040 /* C6E56C 8024023C 44816000 */ mtc1 $at, $f12 -/* C6E570 80240240 00000000 */ nop +/* C6E570 80240240 00000000 */ nop /* C6E574 80240244 460C0302 */ mul.s $f12, $f0, $f12 /* C6E578 80240248 0C00A8BB */ jal sin_deg -/* C6E57C 8024024C 00000000 */ nop +/* C6E57C 8024024C 00000000 */ nop /* C6E580 80240250 C6020000 */ lwc1 $f2, ($s0) /* C6E584 80240254 3C014100 */ lui $at, 0x4100 /* C6E588 80240258 44816000 */ mtc1 $at, $f12 -/* C6E58C 8024025C 00000000 */ nop +/* C6E58C 8024025C 00000000 */ nop /* C6E590 80240260 460C1302 */ mul.s $f12, $f2, $f12 -/* C6E594 80240264 00000000 */ nop +/* C6E594 80240264 00000000 */ nop /* C6E598 80240268 0C00A8BB */ jal sin_deg /* C6E59C 8024026C 46000506 */ mov.s $f20, $f0 /* C6E5A0 80240270 3C013FE0 */ lui $at, 0x3fe0 @@ -176,21 +176,21 @@ glabel func_80240000_C6E330 /* C6E5A8 80240278 44801000 */ mtc1 $zero, $f2 /* C6E5AC 8024027C 4600A521 */ cvt.d.s $f20, $f20 /* C6E5B0 80240280 4622A502 */ mul.d $f20, $f20, $f2 -/* C6E5B4 80240284 00000000 */ nop +/* C6E5B4 80240284 00000000 */ nop /* C6E5B8 80240288 46000021 */ cvt.d.s $f0, $f0 /* C6E5BC 8024028C 46220002 */ mul.d $f0, $f0, $f2 -/* C6E5C0 80240290 00000000 */ nop +/* C6E5C0 80240290 00000000 */ nop /* C6E5C4 80240294 4620A500 */ add.d $f20, $f20, $f0 /* C6E5C8 80240298 4600B021 */ cvt.d.s $f0, $f22 /* C6E5CC 8024029C 46340502 */ mul.d $f20, $f0, $f20 -/* C6E5D0 802402A0 00000000 */ nop +/* C6E5D0 802402A0 00000000 */ nop /* C6E5D4 802402A4 46340000 */ add.d $f0, $f0, $f20 /* C6E5D8 802402A8 3C0141E0 */ lui $at, 0x41e0 /* C6E5DC 802402AC 44811800 */ mtc1 $at, $f3 /* C6E5E0 802402B0 44801000 */ mtc1 $zero, $f2 -/* C6E5E4 802402B4 00000000 */ nop +/* C6E5E4 802402B4 00000000 */ nop /* C6E5E8 802402B8 4620103E */ c.le.d $f2, $f0 -/* C6E5EC 802402BC 00000000 */ nop +/* C6E5EC 802402BC 00000000 */ nop /* C6E5F0 802402C0 45030005 */ bc1tl .L802402D8 /* C6E5F4 802402C4 46220001 */ sub.d $f0, $f0, $f2 /* C6E5F8 802402C8 4620018D */ trunc.w.d $f6, $f0 @@ -201,7 +201,7 @@ glabel func_80240000_C6E330 /* C6E608 802402D8 3C028000 */ lui $v0, 0x8000 /* C6E60C 802402DC 4620018D */ trunc.w.d $f6, $f0 /* C6E610 802402E0 44073000 */ mfc1 $a3, $f6 -/* C6E614 802402E4 00000000 */ nop +/* C6E614 802402E4 00000000 */ nop /* C6E618 802402E8 00E23825 */ or $a3, $a3, $v0 /* C6E61C 802402EC 2404003C */ addiu $a0, $zero, 0x3c .L802402F0: diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240348_C6E678.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240348_C6E678.s index a55e956816..7cced8ce6b 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240348_C6E678.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240348_C6E678.s @@ -31,7 +31,7 @@ glabel func_80240348_C6E678 /* C6E6DC 802403AC 1440FFF4 */ bnez $v0, .L80240380 /* C6E6E0 802403B0 26310002 */ addiu $s1, $s1, 2 /* C6E6E4 802403B4 080900FC */ j .L802403F0 -/* C6E6E8 802403B8 00000000 */ nop +/* C6E6E8 802403B8 00000000 */ nop .L802403BC: /* C6E6EC 802403BC 3C118015 */ lui $s1, %hi(gCurrentModelListPtr) /* C6E6F0 802403C0 8E3112CC */ lw $s1, %lo(gCurrentModelListPtr)($s1) diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240720_C6EA50.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240720_C6EA50.s index 5d79142e40..8f842c6618 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240720_C6EA50.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240720_C6EA50.s @@ -15,7 +15,7 @@ glabel func_80240720_C6EA50 /* C6EA78 80240748 00220821 */ addu $at, $at, $v0 /* C6EA7C 8024074C C4222930 */ lwc1 $f2, %lo(func_80242930_9C7D10)($at) /* C6EA80 80240750 46001082 */ mul.s $f2, $f2, $f0 -/* C6EA84 80240754 00000000 */ nop +/* C6EA84 80240754 00000000 */ nop /* C6EA88 80240758 C6200084 */ lwc1 $f0, 0x84($s1) /* C6EA8C 8024075C 46800020 */ cvt.s.w $f0, $f0 /* C6EA90 80240760 46020001 */ sub.s $f0, $f0, $f2 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240820_C6EB50.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240820_C6EB50.s index e4efe2f146..3b031e9ef8 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240820_C6EB50.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240820_C6EB50.s @@ -47,7 +47,7 @@ glabel func_80240820_C6EB50 /* C6EBF8 802408C8 0C0123F5 */ jal is_point_within_region /* C6EBFC 802408CC 8E070038 */ lw $a3, 0x38($s0) /* C6EC00 802408D0 1040000E */ beqz $v0, .L8024090C -/* C6EC04 802408D4 00000000 */ nop +/* C6EC04 802408D4 00000000 */ nop /* C6EC08 802408D8 8E2200D0 */ lw $v0, 0xd0($s1) /* C6EC0C 802408DC C60C0038 */ lwc1 $f12, 0x38($s0) /* C6EC10 802408E0 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240820_C6EB50 /* C6EC24 802408F4 468031A0 */ cvt.s.w $f6, $f6 /* C6EC28 802408F8 44073000 */ mfc1 $a3, $f6 /* C6EC2C 802408FC 0C00A720 */ jal atan2 -/* C6EC30 80240900 00000000 */ nop +/* C6EC30 80240900 00000000 */ nop /* C6EC34 80240904 0809024F */ j .L8024093C /* C6EC38 80240908 E600000C */ swc1 $f0, 0xc($s0) .L8024090C: @@ -66,7 +66,7 @@ glabel func_80240820_C6EB50 /* C6EC40 80240910 2404003C */ addiu $a0, $zero, 0x3c /* C6EC44 80240914 C60C000C */ lwc1 $f12, 0xc($s0) /* C6EC48 80240918 44820000 */ mtc1 $v0, $f0 -/* C6EC4C 8024091C 00000000 */ nop +/* C6EC4C 8024091C 00000000 */ nop /* C6EC50 80240920 46800020 */ cvt.s.w $f0, $f0 /* C6EC54 80240924 46006300 */ add.s $f12, $f12, $f0 /* C6EC58 80240928 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240820_C6EB50 /* C6EC7C 8024094C 8E2200D0 */ lw $v0, 0xd0($s1) /* C6EC80 80240950 8C420014 */ lw $v0, 0x14($v0) /* C6EC84 80240954 04410004 */ bgez $v0, .L80240968 -/* C6EC88 80240958 00000000 */ nop +/* C6EC88 80240958 00000000 */ nop /* C6EC8C 8024095C C6400000 */ lwc1 $f0, ($s2) /* C6EC90 80240960 08090262 */ j .L80240988 /* C6EC94 80240964 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240820_C6EB50 /* C6EC98 80240968 3C018024 */ lui $at, %hi(func_80243090_C395C0) /* C6EC9C 8024096C D4223090 */ ldc1 $f2, %lo(func_80243090_C395C0)($at) /* C6ECA0 80240970 44820000 */ mtc1 $v0, $f0 -/* C6ECA4 80240974 00000000 */ nop +/* C6ECA4 80240974 00000000 */ nop /* C6ECA8 80240978 46800021 */ cvt.d.w $f0, $f0 /* C6ECAC 8024097C 46220003 */ div.d $f0, $f0, $f2 /* C6ECB0 80240980 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240820_C6EB50 /* C6ECC4 80240994 44801000 */ mtc1 $zero, $f2 /* C6ECC8 80240998 46000021 */ cvt.d.s $f0, $f0 /* C6ECCC 8024099C 46220002 */ mul.d $f0, $f0, $f2 -/* C6ECD0 802409A0 00000000 */ nop +/* C6ECD0 802409A0 00000000 */ nop /* C6ECD4 802409A4 24020001 */ addiu $v0, $zero, 1 /* C6ECD8 802409A8 4620018D */ trunc.w.d $f6, $f0 /* C6ECDC 802409AC E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802409D0_C6ED00.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802409D0_C6ED00.s index af429fe090..d6266d664a 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802409D0_C6ED00.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802409D0_C6ED00.s @@ -34,7 +34,7 @@ glabel func_802409D0_C6ED00 /* C6ED74 80240A44 44803000 */ mtc1 $zero, $f6 /* C6ED78 80240A48 46000021 */ cvt.d.s $f0, $f0 /* C6ED7C 80240A4C 46260002 */ mul.d $f0, $f0, $f6 -/* C6ED80 80240A50 00000000 */ nop +/* C6ED80 80240A50 00000000 */ nop /* C6ED84 80240A54 24020001 */ addiu $v0, $zero, 1 /* C6ED88 80240A58 8E24006C */ lw $a0, 0x6c($s1) /* C6ED8C 80240A5C 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_802409D0_C6ED00 /* C6EDE8 80240AB8 C600003C */ lwc1 $f0, 0x3c($s0) /* C6EDEC 80240ABC 4600C001 */ sub.s $f0, $f24, $f0 /* C6EDF0 80240AC0 4600B03C */ c.lt.s $f22, $f0 -/* C6EDF4 80240AC4 00000000 */ nop +/* C6EDF4 80240AC4 00000000 */ nop /* C6EDF8 80240AC8 4500001B */ bc1f .L80240B38 /* C6EDFC 80240ACC 34820010 */ ori $v0, $a0, 0x10 /* C6EE00 80240AD0 080902CE */ j .L80240B38 @@ -87,9 +87,9 @@ glabel func_802409D0_C6ED00 /* C6EE44 80240B14 C7A00034 */ lwc1 $f0, 0x34($sp) /* C6EE48 80240B18 4600D001 */ sub.s $f0, $f26, $f0 /* C6EE4C 80240B1C 4600B03C */ c.lt.s $f22, $f0 -/* C6EE50 80240B20 00000000 */ nop +/* C6EE50 80240B20 00000000 */ nop /* C6EE54 80240B24 45000004 */ bc1f .L80240B38 -/* C6EE58 80240B28 00000000 */ nop +/* C6EE58 80240B28 00000000 */ nop /* C6EE5C 80240B2C 8E22006C */ lw $v0, 0x6c($s1) /* C6EE60 80240B30 34420010 */ ori $v0, $v0, 0x10 /* C6EE64 80240B34 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_802409D0_C6ED00 /* C6EE6C 80240B3C 24030011 */ addiu $v1, $zero, 0x11 /* C6EE70 80240B40 30420011 */ andi $v0, $v0, 0x11 /* C6EE74 80240B44 14430039 */ bne $v0, $v1, .L80240C2C -/* C6EE78 80240B48 00000000 */ nop +/* C6EE78 80240B48 00000000 */ nop /* C6EE7C 80240B4C 8E020000 */ lw $v0, ($s0) /* C6EE80 80240B50 30420008 */ andi $v0, $v0, 8 /* C6EE84 80240B54 1040000A */ beqz $v0, .L80240B80 @@ -108,7 +108,7 @@ glabel func_802409D0_C6ED00 /* C6EE94 80240B64 D4203098 */ ldc1 $f0, %lo(D_80243098)($at) /* C6EE98 80240B68 460010A1 */ cvt.d.s $f2, $f2 /* C6EE9C 80240B6C 46201082 */ mul.d $f2, $f2, $f0 -/* C6EEA0 80240B70 00000000 */ nop +/* C6EEA0 80240B70 00000000 */ nop /* C6EEA4 80240B74 4600A021 */ cvt.d.s $f0, $f20 /* C6EEA8 80240B78 080902F9 */ j .L80240BE4 /* C6EEAC 80240B7C 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_802409D0_C6ED00 /* C6EEFC 80240BCC D42030A0 */ ldc1 $f0, %lo(D_802430A0)($at) /* C6EF00 80240BD0 460010A1 */ cvt.d.s $f2, $f2 /* C6EF04 80240BD4 46201082 */ mul.d $f2, $f2, $f0 -/* C6EF08 80240BD8 00000000 */ nop +/* C6EF08 80240BD8 00000000 */ nop /* C6EF0C 80240BDC 4600A021 */ cvt.d.s $f0, $f20 /* C6EF10 80240BE0 46220000 */ add.d $f0, $f0, $f2 .L80240BE4: @@ -149,7 +149,7 @@ glabel func_802409D0_C6ED00 /* C6EF30 80240C00 46000005 */ abs.s $f0, $f0 /* C6EF34 80240C04 46000021 */ cvt.d.s $f0, $f0 /* C6EF38 80240C08 4622003C */ c.lt.d $f0, $f2 -/* C6EF3C 80240C0C 00000000 */ nop +/* C6EF3C 80240C0C 00000000 */ nop /* C6EF40 80240C10 45000036 */ bc1f .L80240CEC /* C6EF44 80240C14 2403FFEF */ addiu $v1, $zero, -0x11 /* C6EF48 80240C18 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_802409D0_C6ED00 .L80240C2C: /* C6EF5C 80240C2C 8E220070 */ lw $v0, 0x70($s1) /* C6EF60 80240C30 1840002E */ blez $v0, .L80240CEC -/* C6EF64 80240C34 00000000 */ nop +/* C6EF64 80240C34 00000000 */ nop /* C6EF68 80240C38 C62C0074 */ lwc1 $f12, 0x74($s1) /* C6EF6C 80240C3C 0C00A8BB */ jal sin_deg /* C6EF70 80240C40 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_802409D0_C6ED00 /* C6EFC8 80240C98 27A70030 */ addiu $a3, $sp, 0x30 .L80240C9C: /* C6EFCC 80240C9C 10400007 */ beqz $v0, .L80240CBC -/* C6EFD0 80240CA0 00000000 */ nop +/* C6EFD0 80240CA0 00000000 */ nop /* C6EFD4 80240CA4 4616A082 */ mul.s $f2, $f20, $f22 -/* C6EFD8 80240CA8 00000000 */ nop +/* C6EFD8 80240CA8 00000000 */ nop /* C6EFDC 80240CAC C7A0002C */ lwc1 $f0, 0x2c($sp) /* C6EFE0 80240CB0 461A0000 */ add.s $f0, $f0, $f26 /* C6EFE4 80240CB4 08090332 */ j .L80240CC8 /* C6EFE8 80240CB8 46020000 */ add.s $f0, $f0, $f2 .L80240CBC: /* C6EFEC 80240CBC 4616A002 */ mul.s $f0, $f20, $f22 -/* C6EFF0 80240CC0 00000000 */ nop +/* C6EFF0 80240CC0 00000000 */ nop /* C6EFF4 80240CC4 4600C000 */ add.s $f0, $f24, $f0 .L80240CC8: /* C6EFF8 80240CC8 E600003C */ swc1 $f0, 0x3c($s0) /* C6EFFC 80240CCC 8E220074 */ lw $v0, 0x74($s1) /* C6F000 80240CD0 2442000A */ addiu $v0, $v0, 0xa /* C6F004 80240CD4 44826000 */ mtc1 $v0, $f12 -/* C6F008 80240CD8 00000000 */ nop +/* C6F008 80240CD8 00000000 */ nop /* C6F00C 80240CDC 0C00A6C9 */ jal clamp_angle /* C6F010 80240CE0 46806320 */ cvt.s.w $f12, $f12 /* C6F014 80240CE4 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_802409D0_C6ED00 /* C6F024 80240CF4 2442FFFF */ addiu $v0, $v0, -1 /* C6F028 80240CF8 8E430014 */ lw $v1, 0x14($s2) /* C6F02C 80240CFC 04600048 */ bltz $v1, .L80240E20 -/* C6F030 80240D00 00000000 */ nop +/* C6F030 80240D00 00000000 */ nop /* C6F034 80240D04 8E620074 */ lw $v0, 0x74($s3) /* C6F038 80240D08 1C400042 */ bgtz $v0, .L80240E14 /* C6F03C 80240D0C 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_802409D0_C6ED00 /* C6F044 80240D14 860200A8 */ lh $v0, 0xa8($s0) /* C6F048 80240D18 C602003C */ lwc1 $f2, 0x3c($s0) /* C6F04C 80240D1C 44820000 */ mtc1 $v0, $f0 -/* C6F050 80240D20 00000000 */ nop +/* C6F050 80240D20 00000000 */ nop /* C6F054 80240D24 46800020 */ cvt.s.w $f0, $f0 /* C6F058 80240D28 46001080 */ add.s $f2, $f2, $f0 /* C6F05C 80240D2C 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_802409D0_C6ED00 /* C6F078 80240D48 C440002C */ lwc1 $f0, 0x2c($v0) /* C6F07C 80240D4C 46000021 */ cvt.d.s $f0, $f0 /* C6F080 80240D50 4622003C */ c.lt.d $f0, $f2 -/* C6F084 80240D54 00000000 */ nop +/* C6F084 80240D54 00000000 */ nop /* C6F088 80240D58 4500002C */ bc1f .L80240E0C /* C6F08C 80240D5C 02A0202D */ daddu $a0, $s5, $zero /* C6F090 80240D60 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_802409D0_C6ED00 /* C6F0CC 80240D9C 3C01C1A0 */ lui $at, 0xc1a0 /* C6F0D0 80240DA0 44812000 */ mtc1 $at, $f4 /* C6F0D4 80240DA4 44834000 */ mtc1 $v1, $f8 -/* C6F0D8 80240DA8 00000000 */ nop +/* C6F0D8 80240DA8 00000000 */ nop /* C6F0DC 80240DAC 46804220 */ cvt.s.w $f8, $f8 /* C6F0E0 80240DB0 44074000 */ mfc1 $a3, $f8 /* C6F0E4 80240DB4 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_802409D0_C6ED00 /* C6F198 80240E68 0C0123F5 */ jal is_point_within_region /* C6F19C 80240E6C 8E070038 */ lw $a3, 0x38($s0) /* C6F1A0 80240E70 1040001A */ beqz $v0, .L80240EDC -/* C6F1A4 80240E74 00000000 */ nop +/* C6F1A4 80240E74 00000000 */ nop /* C6F1A8 80240E78 8E060038 */ lw $a2, 0x38($s0) /* C6F1AC 80240E7C 8E2200D0 */ lw $v0, 0xd0($s1) /* C6F1B0 80240E80 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_802409D0_C6ED00 /* C6F1C4 80240E94 468073A0 */ cvt.s.w $f14, $f14 /* C6F1C8 80240E98 C6020018 */ lwc1 $f2, 0x18($s0) /* C6F1CC 80240E9C 4600103C */ c.lt.s $f2, $f0 -/* C6F1D0 80240EA0 00000000 */ nop +/* C6F1D0 80240EA0 00000000 */ nop /* C6F1D4 80240EA4 4500000D */ bc1f .L80240EDC /* C6F1D8 80240EA8 E7A00034 */ swc1 $f0, 0x34($sp) /* C6F1DC 80240EAC C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_802409D0_C6ED00 /* C6F218 80240EE8 00621825 */ or $v1, $v1, $v0 /* C6F21C 80240EEC 00741825 */ or $v1, $v1, $s4 /* C6F220 80240EF0 10600008 */ beqz $v1, .L80240F14 -/* C6F224 80240EF4 00000000 */ nop +/* C6F224 80240EF4 00000000 */ nop /* C6F228 80240EF8 8602008C */ lh $v0, 0x8c($s0) /* C6F22C 80240EFC 14400031 */ bnez $v0, .L80240FC4 -/* C6F230 80240F00 00000000 */ nop +/* C6F230 80240F00 00000000 */ nop /* C6F234 80240F04 8E050018 */ lw $a1, 0x18($s0) /* C6F238 80240F08 8E06000C */ lw $a2, 0xc($s0) /* C6F23C 80240F0C 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_802409D0_C6ED00 /* C6F250 80240F20 44801000 */ mtc1 $zero, $f2 /* C6F254 80240F24 46000021 */ cvt.d.s $f0, $f0 /* C6F258 80240F28 46220002 */ mul.d $f0, $f0, $f2 -/* C6F25C 80240F2C 00000000 */ nop +/* C6F25C 80240F2C 00000000 */ nop /* C6F260 80240F30 4620020D */ trunc.w.d $f8, $f0 /* C6F264 80240F34 E628007C */ swc1 $f8, 0x7c($s1) /* C6F268 80240F38 8E420004 */ lw $v0, 4($s2) /* C6F26C 80240F3C 18400021 */ blez $v0, .L80240FC4 -/* C6F270 80240F40 00000000 */ nop +/* C6F270 80240F40 00000000 */ nop /* C6F274 80240F44 8602008E */ lh $v0, 0x8e($s0) /* C6F278 80240F48 9603008E */ lhu $v1, 0x8e($s0) /* C6F27C 80240F4C 18400005 */ blez $v0, .L80240F64 @@ -375,7 +375,7 @@ glabel func_802409D0_C6ED00 /* C6F284 80240F54 A602008E */ sh $v0, 0x8e($s0) /* C6F288 80240F58 00021400 */ sll $v0, $v0, 0x10 /* C6F28C 80240F5C 1C400019 */ bgtz $v0, .L80240FC4 -/* C6F290 80240F60 00000000 */ nop +/* C6F290 80240F60 00000000 */ nop .L80240F64: /* C6F294 80240F64 240403E8 */ addiu $a0, $zero, 0x3e8 /* C6F298 80240F68 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_802409D0_C6ED00 /* C6F2E0 80240FB0 18400003 */ blez $v0, .L80240FC0 /* C6F2E4 80240FB4 28620003 */ slti $v0, $v1, 3 /* C6F2E8 80240FB8 10400002 */ beqz $v0, .L80240FC4 -/* C6F2EC 80240FBC 00000000 */ nop +/* C6F2EC 80240FBC 00000000 */ nop .L80240FC0: /* C6F2F0 80240FC0 AE600070 */ sw $zero, 0x70($s3) .L80240FC4: diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802410B8_C6F3E8.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802410B8_C6F3E8.s index 445ec4406f..67e9faec9d 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802410B8_C6F3E8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802410B8_C6F3E8.s @@ -42,11 +42,11 @@ glabel func_802410B8_C6F3E8 .L8024114C: /* C6F47C 8024114C 8E220070 */ lw $v0, 0x70($s1) /* C6F480 80241150 18400034 */ blez $v0, .L80241224 -/* C6F484 80241154 00000000 */ nop +/* C6F484 80241154 00000000 */ nop /* C6F488 80241158 C62C0074 */ lwc1 $f12, 0x74($s1) /* C6F48C 8024115C 46806320 */ cvt.s.w $f12, $f12 /* C6F490 80241160 44820000 */ mtc1 $v0, $f0 -/* C6F494 80241164 00000000 */ nop +/* C6F494 80241164 00000000 */ nop /* C6F498 80241168 46800020 */ cvt.s.w $f0, $f0 /* C6F49C 8024116C 46000021 */ cvt.d.s $f0, $f0 /* C6F4A0 80241170 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_802410B8_C6F3E8 /* C6F500 802411D0 27A70030 */ addiu $a3, $sp, 0x30 .L802411D4: /* C6F504 802411D4 10400007 */ beqz $v0, .L802411F4 -/* C6F508 802411D8 00000000 */ nop +/* C6F508 802411D8 00000000 */ nop /* C6F50C 802411DC 4616A082 */ mul.s $f2, $f20, $f22 -/* C6F510 802411E0 00000000 */ nop +/* C6F510 802411E0 00000000 */ nop /* C6F514 802411E4 C7A0002C */ lwc1 $f0, 0x2c($sp) /* C6F518 802411E8 46180000 */ add.s $f0, $f0, $f24 /* C6F51C 802411EC 08090480 */ j .L80241200 /* C6F520 802411F0 46020000 */ add.s $f0, $f0, $f2 .L802411F4: /* C6F524 802411F4 4616A002 */ mul.s $f0, $f20, $f22 -/* C6F528 802411F8 00000000 */ nop +/* C6F528 802411F8 00000000 */ nop /* C6F52C 802411FC 4600D000 */ add.s $f0, $f26, $f0 .L80241200: /* C6F530 80241200 E600003C */ swc1 $f0, 0x3c($s0) /* C6F534 80241204 8E220074 */ lw $v0, 0x74($s1) /* C6F538 80241208 2442000A */ addiu $v0, $v0, 0xa /* C6F53C 8024120C 44826000 */ mtc1 $v0, $f12 -/* C6F540 80241210 00000000 */ nop +/* C6F540 80241210 00000000 */ nop /* C6F544 80241214 0C00A6C9 */ jal clamp_angle /* C6F548 80241218 46806320 */ cvt.s.w $f12, $f12 /* C6F54C 8024121C 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_802410B8_C6F3E8 /* C6F560 80241230 860200A8 */ lh $v0, 0xa8($s0) /* C6F564 80241234 C600003C */ lwc1 $f0, 0x3c($s0) /* C6F568 80241238 44821000 */ mtc1 $v0, $f2 -/* C6F56C 8024123C 00000000 */ nop +/* C6F56C 8024123C 00000000 */ nop /* C6F570 80241240 468010A0 */ cvt.s.w $f2, $f2 /* C6F574 80241244 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C6F578 80241248 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_802410B8_C6F3E8 /* C6F594 80241264 46240000 */ add.d $f0, $f0, $f4 /* C6F598 80241268 460010A1 */ cvt.d.s $f2, $f2 /* C6F59C 8024126C 4620103C */ c.lt.d $f2, $f0 -/* C6F5A0 80241270 00000000 */ nop +/* C6F5A0 80241270 00000000 */ nop /* C6F5A4 80241274 4500002E */ bc1f .L80241330 /* C6F5A8 80241278 0280202D */ daddu $a0, $s4, $zero /* C6F5AC 8024127C 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_802410B8_C6F3E8 /* C6F5EC 802412BC 3C01C1A0 */ lui $at, 0xc1a0 /* C6F5F0 802412C0 44812000 */ mtc1 $at, $f4 /* C6F5F4 802412C4 44834000 */ mtc1 $v1, $f8 -/* C6F5F8 802412C8 00000000 */ nop +/* C6F5F8 802412C8 00000000 */ nop /* C6F5FC 802412CC 46804220 */ cvt.s.w $f8, $f8 /* C6F600 802412D0 44074000 */ mfc1 $a3, $f8 /* C6F604 802412D4 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_802410B8_C6F3E8 .L80241330: /* C6F660 80241330 8602008C */ lh $v0, 0x8c($s0) /* C6F664 80241334 14400025 */ bnez $v0, .L802413CC -/* C6F668 80241338 00000000 */ nop +/* C6F668 80241338 00000000 */ nop /* C6F66C 8024133C 8602008E */ lh $v0, 0x8e($s0) /* C6F670 80241340 1C400022 */ bgtz $v0, .L802413CC -/* C6F674 80241344 00000000 */ nop +/* C6F674 80241344 00000000 */ nop /* C6F678 80241348 8E620074 */ lw $v0, 0x74($s3) /* C6F67C 8024134C 2442FFFF */ addiu $v0, $v0, -1 /* C6F680 80241350 1840001D */ blez $v0, .L802413C8 @@ -183,7 +183,7 @@ glabel func_802410B8_C6F3E8 /* C6F68C 8024135C 9442002A */ lhu $v0, 0x2a($v0) /* C6F690 80241360 30420010 */ andi $v0, $v0, 0x10 /* C6F694 80241364 14400007 */ bnez $v0, .L80241384 -/* C6F698 80241368 00000000 */ nop +/* C6F698 80241368 00000000 */ nop /* C6F69C 8024136C C600000C */ lwc1 $f0, 0xc($s0) /* C6F6A0 80241370 3C014334 */ lui $at, 0x4334 /* C6F6A4 80241374 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802414E0_C6F810.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802414E0_C6F810.s index 4c5f53fa12..efba374a97 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802414E0_C6F810.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802414E0_C6F810.s @@ -60,18 +60,18 @@ glabel func_802414E0_C6F810 /* C6F8E8 802415B8 C6200038 */ lwc1 $f0, 0x38($s1) /* C6F8EC 802415BC 4600018D */ trunc.w.s $f6, $f0 /* C6F8F0 802415C0 44023000 */ mfc1 $v0, $f6 -/* C6F8F4 802415C4 00000000 */ nop +/* C6F8F4 802415C4 00000000 */ nop /* C6F8F8 802415C8 A6420010 */ sh $v0, 0x10($s2) /* C6F8FC 802415CC C620003C */ lwc1 $f0, 0x3c($s1) /* C6F900 802415D0 4600018D */ trunc.w.s $f6, $f0 /* C6F904 802415D4 44023000 */ mfc1 $v0, $f6 -/* C6F908 802415D8 00000000 */ nop +/* C6F908 802415D8 00000000 */ nop /* C6F90C 802415DC A6420012 */ sh $v0, 0x12($s2) /* C6F910 802415E0 C6200040 */ lwc1 $f0, 0x40($s1) /* C6F914 802415E4 A2430007 */ sb $v1, 7($s2) /* C6F918 802415E8 4600018D */ trunc.w.s $f6, $f0 /* C6F91C 802415EC 44023000 */ mfc1 $v0, $f6 -/* C6F920 802415F0 00000000 */ nop +/* C6F920 802415F0 00000000 */ nop /* C6F924 802415F4 A6420014 */ sh $v0, 0x14($s2) .L802415F8: /* C6F928 802415F8 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241678_C6F9A8.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241678_C6F9A8.s index a07423abc6..778c51c864 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241678_C6F9A8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241678_C6F9A8.s @@ -42,9 +42,9 @@ glabel func_80241678_C6F9A8 /* C6FA3C 8024170C 44801800 */ mtc1 $zero, $f3 /* C6FA40 80241710 46002021 */ cvt.d.s $f0, $f4 /* C6FA44 80241714 4620103E */ c.le.d $f2, $f0 -/* C6FA48 80241718 00000000 */ nop +/* C6FA48 80241718 00000000 */ nop /* C6FA4C 8024171C 45000030 */ bc1f .L802417E0 -/* C6FA50 80241720 00000000 */ nop +/* C6FA50 80241720 00000000 */ nop /* C6FA54 80241724 C600003C */ lwc1 $f0, 0x3c($s0) /* C6FA58 80241728 46040000 */ add.s $f0, $f0, $f4 /* C6FA5C 8024172C E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_80241678_C6F9A8 /* C6FABC 8024178C 27A70020 */ addiu $a3, $sp, 0x20 .L80241790: /* C6FAC0 80241790 1040000B */ beqz $v0, .L802417C0 -/* C6FAC4 80241794 00000000 */ nop +/* C6FAC4 80241794 00000000 */ nop /* C6FAC8 80241798 C7A0001C */ lwc1 $f0, 0x1c($sp) /* C6FACC 8024179C 46140080 */ add.s $f2, $f0, $f20 /* C6FAD0 802417A0 C600003C */ lwc1 $f0, 0x3c($s0) /* C6FAD4 802417A4 4600103E */ c.le.s $f2, $f0 -/* C6FAD8 802417A8 00000000 */ nop +/* C6FAD8 802417A8 00000000 */ nop /* C6FADC 802417AC 4500008D */ bc1f .L802419E4 -/* C6FAE0 802417B0 00000000 */ nop +/* C6FAE0 802417B0 00000000 */ nop /* C6FAE4 802417B4 E602003C */ swc1 $f2, 0x3c($s0) /* C6FAE8 802417B8 08090679 */ j .L802419E4 /* C6FAEC 802417BC AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_80241678_C6F9A8 /* C6FAF0 802417C0 C602003C */ lwc1 $f2, 0x3c($s0) /* C6FAF4 802417C4 C6000064 */ lwc1 $f0, 0x64($s0) /* C6FAF8 802417C8 4602003E */ c.le.s $f0, $f2 -/* C6FAFC 802417CC 00000000 */ nop +/* C6FAFC 802417CC 00000000 */ nop /* C6FB00 802417D0 45030084 */ bc1tl .L802419E4 /* C6FB04 802417D4 AE400070 */ sw $zero, 0x70($s2) /* C6FB08 802417D8 08090679 */ j .L802419E4 -/* C6FB0C 802417DC 00000000 */ nop +/* C6FB0C 802417DC 00000000 */ nop .L802417E0: /* C6FB10 802417E0 4622003C */ c.lt.d $f0, $f2 -/* C6FB14 802417E4 00000000 */ nop +/* C6FB14 802417E4 00000000 */ nop /* C6FB18 802417E8 4500007E */ bc1f .L802419E4 -/* C6FB1C 802417EC 00000000 */ nop +/* C6FB1C 802417EC 00000000 */ nop /* C6FB20 802417F0 9602008E */ lhu $v0, 0x8e($s0) /* C6FB24 802417F4 24420001 */ addiu $v0, $v0, 1 /* C6FB28 802417F8 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_80241678_C6F9A8 /* C6FB34 80241804 00021403 */ sra $v0, $v0, 0x10 /* C6FB38 80241808 0043102A */ slt $v0, $v0, $v1 /* C6FB3C 8024180C 14400026 */ bnez $v0, .L802418A8 -/* C6FB40 80241810 00000000 */ nop +/* C6FB40 80241810 00000000 */ nop /* C6FB44 80241814 C60C0038 */ lwc1 $f12, 0x38($s0) /* C6FB48 80241818 C60E0040 */ lwc1 $f14, 0x40($s0) /* C6FB4C 8024181C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_80241678_C6F9A8 /* C6FB78 80241848 8E62001C */ lw $v0, 0x1c($s3) /* C6FB7C 8024184C 46001005 */ abs.s $f0, $f2 /* C6FB80 80241850 44822000 */ mtc1 $v0, $f4 -/* C6FB84 80241854 00000000 */ nop +/* C6FB84 80241854 00000000 */ nop /* C6FB88 80241858 46802120 */ cvt.s.w $f4, $f4 /* C6FB8C 8024185C 4600203C */ c.lt.s $f4, $f0 -/* C6FB90 80241860 00000000 */ nop +/* C6FB90 80241860 00000000 */ nop /* C6FB94 80241864 4500000D */ bc1f .L8024189C -/* C6FB98 80241868 00000000 */ nop +/* C6FB98 80241868 00000000 */ nop /* C6FB9C 8024186C 44800000 */ mtc1 $zero, $f0 /* C6FBA0 80241870 C614000C */ lwc1 $f20, 0xc($s0) /* C6FBA4 80241874 4600103C */ c.lt.s $f2, $f0 -/* C6FBA8 80241878 00000000 */ nop +/* C6FBA8 80241878 00000000 */ nop /* C6FBAC 8024187C 45000006 */ bc1f .L80241898 /* C6FBB0 80241880 00021023 */ negu $v0, $v0 /* C6FBB4 80241884 44820000 */ mtc1 $v0, $f0 -/* C6FBB8 80241888 00000000 */ nop +/* C6FBB8 80241888 00000000 */ nop /* C6FBBC 8024188C 46800020 */ cvt.s.w $f0, $f0 /* C6FBC0 80241890 08090627 */ j .L8024189C /* C6FBC4 80241894 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_80241678_C6F9A8 /* C6FBEC 802418BC C600001C */ lwc1 $f0, 0x1c($s0) /* C6FBF0 802418C0 46001080 */ add.s $f2, $f2, $f0 /* C6FBF4 802418C4 4616103C */ c.lt.s $f2, $f22 -/* C6FBF8 802418C8 00000000 */ nop +/* C6FBF8 802418C8 00000000 */ nop /* C6FBFC 802418CC 45020045 */ bc1fl .L802419E4 /* C6FC00 802418D0 E602003C */ swc1 $f2, 0x3c($s0) /* C6FC04 802418D4 08090678 */ j .L802419E0 @@ -169,7 +169,7 @@ glabel func_80241678_C6F9A8 /* C6FC1C 802418EC C600001C */ lwc1 $f0, 0x1c($s0) /* C6FC20 802418F0 C604003C */ lwc1 $f4, 0x3c($s0) /* C6FC24 802418F4 44821000 */ mtc1 $v0, $f2 -/* C6FC28 802418F8 00000000 */ nop +/* C6FC28 802418F8 00000000 */ nop /* C6FC2C 802418FC 468010A0 */ cvt.s.w $f2, $f2 /* C6FC30 80241900 46000005 */ abs.s $f0, $f0 /* C6FC34 80241904 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_80241678_C6F9A8 /* C6FC70 80241940 0C0372DF */ jal func_800DCB7C /* C6FC74 80241944 27A70020 */ addiu $a3, $sp, 0x20 /* C6FC78 80241948 10400015 */ beqz $v0, .L802419A0 -/* C6FC7C 8024194C 00000000 */ nop +/* C6FC7C 8024194C 00000000 */ nop /* C6FC80 80241950 860200A8 */ lh $v0, 0xa8($s0) /* C6FC84 80241954 C604001C */ lwc1 $f4, 0x1c($s0) /* C6FC88 80241958 44820000 */ mtc1 $v0, $f0 -/* C6FC8C 8024195C 00000000 */ nop +/* C6FC8C 8024195C 00000000 */ nop /* C6FC90 80241960 46800020 */ cvt.s.w $f0, $f0 /* C6FC94 80241964 46002085 */ abs.s $f2, $f4 /* C6FC98 80241968 46020000 */ add.s $f0, $f0, $f2 /* C6FC9C 8024196C C7A20024 */ lwc1 $f2, 0x24($sp) /* C6FCA0 80241970 4600103E */ c.le.s $f2, $f0 -/* C6FCA4 80241974 00000000 */ nop +/* C6FCA4 80241974 00000000 */ nop /* C6FCA8 80241978 45000005 */ bc1f .L80241990 -/* C6FCAC 8024197C 00000000 */ nop +/* C6FCAC 8024197C 00000000 */ nop /* C6FCB0 80241980 C7A0001C */ lwc1 $f0, 0x1c($sp) /* C6FCB4 80241984 AE00001C */ sw $zero, 0x1c($s0) /* C6FCB8 80241988 08090679 */ j .L802419E4 @@ -217,13 +217,13 @@ glabel func_80241678_C6F9A8 /* C6FCD4 802419A4 860200A8 */ lh $v0, 0xa8($s0) /* C6FCD8 802419A8 46163081 */ sub.s $f2, $f6, $f22 /* C6FCDC 802419AC 44820000 */ mtc1 $v0, $f0 -/* C6FCE0 802419B0 00000000 */ nop +/* C6FCE0 802419B0 00000000 */ nop /* C6FCE4 802419B4 46800020 */ cvt.s.w $f0, $f0 /* C6FCE8 802419B8 46001080 */ add.s $f2, $f2, $f0 /* C6FCEC 802419BC C604001C */ lwc1 $f4, 0x1c($s0) /* C6FCF0 802419C0 46002005 */ abs.s $f0, $f4 /* C6FCF4 802419C4 4602003C */ c.lt.s $f0, $f2 -/* C6FCF8 802419C8 00000000 */ nop +/* C6FCF8 802419C8 00000000 */ nop /* C6FCFC 802419CC 45020005 */ bc1fl .L802419E4 /* C6FD00 802419D0 AE00001C */ sw $zero, 0x1c($s0) /* C6FD04 802419D4 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241A08_C6FD38.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241A08_C6FD38.s index f334a27ce2..2a285b7bad 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241A08_C6FD38.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241A08_C6FD38.s @@ -49,15 +49,15 @@ glabel func_80241A08_C6FD38 /* C6FDE0 80241AB0 44802000 */ mtc1 $zero, $f4 /* C6FDE4 80241AB4 460010A1 */ cvt.d.s $f2, $f2 /* C6FDE8 80241AB8 46241082 */ mul.d $f2, $f2, $f4 -/* C6FDEC 80241ABC 00000000 */ nop +/* C6FDEC 80241ABC 00000000 */ nop /* C6FDF0 80241AC0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* C6FDF4 80241AC4 46000021 */ cvt.d.s $f0, $f0 /* C6FDF8 80241AC8 46240002 */ mul.d $f0, $f0, $f4 -/* C6FDFC 80241ACC 00000000 */ nop +/* C6FDFC 80241ACC 00000000 */ nop /* C6FE00 80241AD0 3C013FE0 */ lui $at, 0x3fe0 /* C6FE04 80241AD4 44812800 */ mtc1 $at, $f5 /* C6FE08 80241AD8 44802000 */ mtc1 $zero, $f4 -/* C6FE0C 80241ADC 00000000 */ nop +/* C6FE0C 80241ADC 00000000 */ nop /* C6FE10 80241AE0 46241080 */ add.d $f2, $f2, $f4 /* C6FE14 80241AE4 AE000074 */ sw $zero, 0x74($s0) /* C6FE18 80241AE8 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s index 4c7b829557..9447e8f546 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s @@ -54,7 +54,7 @@ glabel func_80241B2C_C6FE5C /* C6FF1C 80241BEC 8E4300B0 */ lw $v1, 0xb0($s2) /* C6FF20 80241BF0 30620004 */ andi $v0, $v1, 4 /* C6FF24 80241BF4 10400007 */ beqz $v0, .L80241C14 -/* C6FF28 80241BF8 00000000 */ nop +/* C6FF28 80241BF8 00000000 */ nop /* C6FF2C 80241BFC 824200B4 */ lb $v0, 0xb4($s2) /* C6FF30 80241C00 1440003C */ bnez $v0, .L80241CF4 /* C6FF34 80241C04 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_80241B2C_C6FE5C /* C6FF48 80241C18 2C62000F */ sltiu $v0, $v1, 0xf /* C6FF4C 80241C1C 10400034 */ beqz $v0, .L80241CF0 /* C6FF50 80241C20 00031080 */ sll $v0, $v1, 2 -/* C6FF54 80241C24 3C018024 */ lui $at, %hi(func_802430A8_A967E8) +/* C6FF54 80241C24 3C018024 */ lui $at, %hi(jtbl_802430A8_C713D8) /* C6FF58 80241C28 00220821 */ addu $at, $at, $v0 -/* C6FF5C 80241C2C 8C2230A8 */ lw $v0, %lo(func_802430A8_A967E8)($at) +/* C6FF5C 80241C2C 8C2230A8 */ lw $v0, %lo(jtbl_802430A8_C713D8)($at) /* C6FF60 80241C30 00400008 */ jr $v0 -/* C6FF64 80241C34 00000000 */ nop +/* C6FF64 80241C34 00000000 */ nop +glabel L80241C38_C6FF68 /* C6FF68 80241C38 0280202D */ daddu $a0, $s4, $zero /* C6FF6C 80241C3C 0200282D */ daddu $a1, $s0, $zero /* C6FF70 80241C40 0C090208 */ jal func_80240820_C6EB50 /* C6FF74 80241C44 0260302D */ daddu $a2, $s3, $zero +glabel L80241C48_C6FF78 /* C6FF78 80241C48 0280202D */ daddu $a0, $s4, $zero /* C6FF7C 80241C4C 0200282D */ daddu $a1, $s0, $zero /* C6FF80 80241C50 0C090274 */ jal func_802409D0_C6ED00 /* C6FF84 80241C54 0260302D */ daddu $a2, $s3, $zero /* C6FF88 80241C58 0809073D */ j .L80241CF4 /* C6FF8C 80241C5C 0000102D */ daddu $v0, $zero, $zero +glabel L80241C60_C6FF90 /* C6FF90 80241C60 0280202D */ daddu $a0, $s4, $zero /* C6FF94 80241C64 0200282D */ daddu $a1, $s0, $zero /* C6FF98 80241C68 0C0903FE */ jal kzn_07_UnkNpcAIFunc1 /* C6FF9C 80241C6C 0260302D */ daddu $a2, $s3, $zero +glabel L80241C70_C6FFA0 /* C6FFA0 80241C70 0280202D */ daddu $a0, $s4, $zero /* C6FFA4 80241C74 0200282D */ daddu $a1, $s0, $zero /* C6FFA8 80241C78 0C09042E */ jal func_802410B8_C6F3E8 /* C6FFAC 80241C7C 0260302D */ daddu $a2, $s3, $zero /* C6FFB0 80241C80 0809073D */ j .L80241CF4 /* C6FFB4 80241C84 0000102D */ daddu $v0, $zero, $zero +glabel L80241C88_C6FFB8 /* C6FFB8 80241C88 0280202D */ daddu $a0, $s4, $zero /* C6FFBC 80241C8C 0200282D */ daddu $a1, $s0, $zero /* C6FFC0 80241C90 0C0904FF */ jal kzn_07_UnkNpcAIFunc2 /* C6FFC4 80241C94 0260302D */ daddu $a2, $s3, $zero +glabel L80241C98_C6FFC8 /* C6FFC8 80241C98 0280202D */ daddu $a0, $s4, $zero /* C6FFCC 80241C9C 0200282D */ daddu $a1, $s0, $zero /* C6FFD0 80241CA0 0C09051D */ jal func_80241474_C6F7A4 /* C6FFD4 80241CA4 0260302D */ daddu $a2, $s3, $zero /* C6FFD8 80241CA8 0809073D */ j .L80241CF4 /* C6FFDC 80241CAC 0000102D */ daddu $v0, $zero, $zero +glabel L80241CB0_C6FFE0 /* C6FFE0 80241CB0 0280202D */ daddu $a0, $s4, $zero /* C6FFE4 80241CB4 0200282D */ daddu $a1, $s0, $zero /* C6FFE8 80241CB8 0C090538 */ jal func_802414E0_C6F810 /* C6FFEC 80241CBC 0260302D */ daddu $a2, $s3, $zero /* C6FFF0 80241CC0 0809073D */ j .L80241CF4 /* C6FFF4 80241CC4 0000102D */ daddu $v0, $zero, $zero +glabel L80241CC8_C6FFF8 /* C6FFF8 80241CC8 0280202D */ daddu $a0, $s4, $zero /* C6FFFC 80241CCC 0200282D */ daddu $a1, $s0, $zero /* C70000 80241CD0 0C090585 */ jal kzn_07_UnkNpcAIFunc3 /* C70004 80241CD4 0260302D */ daddu $a2, $s3, $zero /* C70008 80241CD8 0809073D */ j .L80241CF4 /* C7000C 80241CDC 0000102D */ daddu $v0, $zero, $zero +glabel L80241CE0_C70010 /* C70010 80241CE0 0280202D */ daddu $a0, $s4, $zero /* C70014 80241CE4 0200282D */ daddu $a1, $s0, $zero /* C70018 80241CE8 0C09059E */ jal func_80241678_C6F9A8 /* C7001C 80241CEC 0260302D */ daddu $a2, $s3, $zero .L80241CF0: +glabel L80241CF0_C70020 /* C70020 80241CF0 0000102D */ daddu $v0, $zero, $zero .L80241CF4: /* C70024 80241CF4 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241D18_C70048.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241D18_C70048.s index 0a390b9d27..a3eb2829ae 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241D18_C70048.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241D18_C70048.s @@ -47,20 +47,20 @@ glabel func_80241D18_C70048 /* C700F0 80241DC0 8E02001C */ lw $v0, 0x1c($s0) /* C700F4 80241DC4 46001005 */ abs.s $f0, $f2 /* C700F8 80241DC8 44822000 */ mtc1 $v0, $f4 -/* C700FC 80241DCC 00000000 */ nop +/* C700FC 80241DCC 00000000 */ nop /* C70100 80241DD0 46802120 */ cvt.s.w $f4, $f4 /* C70104 80241DD4 4600203C */ c.lt.s $f4, $f0 -/* C70108 80241DD8 00000000 */ nop +/* C70108 80241DD8 00000000 */ nop /* C7010C 80241DDC 4500000D */ bc1f .L80241E14 -/* C70110 80241DE0 00000000 */ nop +/* C70110 80241DE0 00000000 */ nop /* C70114 80241DE4 44800000 */ mtc1 $zero, $f0 /* C70118 80241DE8 C654000C */ lwc1 $f20, 0xc($s2) /* C7011C 80241DEC 4600103C */ c.lt.s $f2, $f0 -/* C70120 80241DF0 00000000 */ nop +/* C70120 80241DF0 00000000 */ nop /* C70124 80241DF4 45000006 */ bc1f .L80241E10 /* C70128 80241DF8 00021023 */ negu $v0, $v0 /* C7012C 80241DFC 44820000 */ mtc1 $v0, $f0 -/* C70130 80241E00 00000000 */ nop +/* C70130 80241E00 00000000 */ nop /* C70134 80241E04 46800020 */ cvt.s.w $f0, $f0 /* C70138 80241E08 08090785 */ j .L80241E14 /* C7013C 80241E0C 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241E48_C70178.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241E48_C70178.s index 706c616ba0..deb42a4213 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241E48_C70178.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241E48_C70178.s @@ -36,7 +36,7 @@ glabel func_80241E48_C70178 /* C701F4 80241EC4 2402000F */ addiu $v0, $zero, 0xf /* C701F8 80241EC8 AFA2001C */ sw $v0, 0x1c($sp) /* C701FC 80241ECC 44834000 */ mtc1 $v1, $f8 -/* C70200 80241ED0 00000000 */ nop +/* C70200 80241ED0 00000000 */ nop /* C70204 80241ED4 46804220 */ cvt.s.w $f8, $f8 /* C70208 80241ED8 44074000 */ mfc1 $a3, $f8 /* C7020C 80241EDC 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,14 +69,14 @@ glabel func_80241E48_C70178 /* C70274 80241F44 860200A8 */ lh $v0, 0xa8($s0) /* C70278 80241F48 C6000038 */ lwc1 $f0, 0x38($s0) /* C7027C 80241F4C 44821000 */ mtc1 $v0, $f2 -/* C70280 80241F50 00000000 */ nop +/* C70280 80241F50 00000000 */ nop /* C70284 80241F54 468010A0 */ cvt.s.w $f2, $f2 /* C70288 80241F58 E7A0002C */ swc1 $f0, 0x2c($sp) /* C7028C 80241F5C 860200A8 */ lh $v0, 0xa8($s0) /* C70290 80241F60 C604003C */ lwc1 $f4, 0x3c($s0) /* C70294 80241F64 C6060040 */ lwc1 $f6, 0x40($s0) /* C70298 80241F68 44820000 */ mtc1 $v0, $f0 -/* C7029C 80241F6C 00000000 */ nop +/* C7029C 80241F6C 00000000 */ nop /* C702A0 80241F70 46800021 */ cvt.d.w $f0, $f0 /* C702A4 80241F74 46022100 */ add.s $f4, $f4, $f2 /* C702A8 80241F78 3C014008 */ lui $at, 0x4008 @@ -93,19 +93,19 @@ glabel func_80241E48_C70178 /* C702D4 80241FA4 0C0372DF */ jal func_800DCB7C /* C702D8 80241FA8 27A70034 */ addiu $a3, $sp, 0x34 /* C702DC 80241FAC 1040000A */ beqz $v0, .L80241FD8 -/* C702E0 80241FB0 00000000 */ nop +/* C702E0 80241FB0 00000000 */ nop /* C702E4 80241FB4 860200A8 */ lh $v0, 0xa8($s0) /* C702E8 80241FB8 C7A20038 */ lwc1 $f2, 0x38($sp) /* C702EC 80241FBC 44820000 */ mtc1 $v0, $f0 -/* C702F0 80241FC0 00000000 */ nop +/* C702F0 80241FC0 00000000 */ nop /* C702F4 80241FC4 46800020 */ cvt.s.w $f0, $f0 /* C702F8 80241FC8 4600103C */ c.lt.s $f2, $f0 -/* C702FC 80241FCC 00000000 */ nop +/* C702FC 80241FCC 00000000 */ nop /* C70300 80241FD0 45030001 */ bc1tl .L80241FD8 /* C70304 80241FD4 24110001 */ addiu $s1, $zero, 1 .L80241FD8: /* C70308 80241FD8 12200008 */ beqz $s1, .L80241FFC -/* C7030C 80241FDC 00000000 */ nop +/* C7030C 80241FDC 00000000 */ nop /* C70310 80241FE0 C7A00030 */ lwc1 $f0, 0x30($sp) /* C70314 80241FE4 3C013FF0 */ lui $at, 0x3ff0 /* C70318 80241FE8 44811800 */ mtc1 $at, $f3 @@ -130,24 +130,24 @@ glabel func_80241E48_C70178 /* C70360 80242030 44800800 */ mtc1 $zero, $f1 /* C70364 80242034 460030A1 */ cvt.d.s $f2, $f6 /* C70368 80242038 4620103C */ c.lt.d $f2, $f0 -/* C7036C 8024203C 00000000 */ nop +/* C7036C 8024203C 00000000 */ nop /* C70370 80242040 45010009 */ bc1t .L80242068 -/* C70374 80242044 00000000 */ nop +/* C70374 80242044 00000000 */ nop /* C70378 80242048 3C014010 */ lui $at, 0x4010 /* C7037C 8024204C 44810800 */ mtc1 $at, $f1 /* C70380 80242050 44800000 */ mtc1 $zero, $f0 -/* C70384 80242054 00000000 */ nop +/* C70384 80242054 00000000 */ nop /* C70388 80242058 4622003C */ c.lt.d $f0, $f2 -/* C7038C 8024205C 00000000 */ nop +/* C7038C 8024205C 00000000 */ nop /* C70390 80242060 4500000A */ bc1f .L8024208C -/* C70394 80242064 00000000 */ nop +/* C70394 80242064 00000000 */ nop .L80242068: /* C70398 80242068 3C018024 */ lui $at, %hi(D_802430E8) /* C7039C 8024206C D42230E8 */ ldc1 $f2, %lo(D_802430E8)($at) /* C703A0 80242070 46003187 */ neg.s $f6, $f6 /* C703A4 80242074 46003021 */ cvt.d.s $f0, $f6 /* C703A8 80242078 46220002 */ mul.d $f0, $f0, $f2 -/* C703AC 8024207C 00000000 */ nop +/* C703AC 8024207C 00000000 */ nop /* C703B0 80242080 46202000 */ add.d $f0, $f4, $f0 .L80242084: /* C703B4 80242084 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802420C8_C703F8.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802420C8_C703F8.s index f3c834bb19..a70bacb5bb 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802420C8_C703F8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802420C8_C703F8.s @@ -16,7 +16,7 @@ glabel func_802420C8_C703F8 /* C70424 802420F4 A462008E */ sh $v0, 0x8e($v1) /* C70428 802420F8 00021400 */ sll $v0, $v0, 0x10 /* C7042C 802420FC 1C400004 */ bgtz $v0, .L80242110 -/* C70430 80242100 00000000 */ nop +/* C70430 80242100 00000000 */ nop /* C70434 80242104 AE000074 */ sw $zero, 0x74($s0) /* C70438 80242108 A460008E */ sh $zero, 0x8e($v1) /* C7043C 8024210C AE200070 */ sw $zero, 0x70($s1) diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s index 4c934dc8a6..692843f7dc 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s @@ -55,7 +55,7 @@ glabel func_80242124_C70454 /* C70518 802421E8 8E4300B0 */ lw $v1, 0xb0($s2) /* C7051C 802421EC 30620004 */ andi $v0, $v1, 4 /* C70520 802421F0 10400007 */ beqz $v0, .L80242210 -/* C70524 802421F4 00000000 */ nop +/* C70524 802421F4 00000000 */ nop /* C70528 802421F8 824200B4 */ lb $v0, 0xb4($s2) /* C7052C 802421FC 1440003A */ bnez $v0, .L802422E8 /* C70530 80242200 0000102D */ daddu $v0, $zero, $zero @@ -67,56 +67,66 @@ glabel func_80242124_C70454 /* C70544 80242214 2C620015 */ sltiu $v0, $v1, 0x15 /* C70548 80242218 10400032 */ beqz $v0, .L802422E4 /* C7054C 8024221C 00031080 */ sll $v0, $v1, 2 -/* C70550 80242220 3C018024 */ lui $at, %hi(func_802430F0_C49CD0) +/* C70550 80242220 3C018024 */ lui $at, %hi(jtbl_802430F0_C71420) /* C70554 80242224 00220821 */ addu $at, $at, $v0 -/* C70558 80242228 8C2230F0 */ lw $v0, %lo(func_802430F0_C49CD0)($at) +/* C70558 80242228 8C2230F0 */ lw $v0, %lo(jtbl_802430F0_C71420)($at) /* C7055C 8024222C 00400008 */ jr $v0 -/* C70560 80242230 00000000 */ nop +/* C70560 80242230 00000000 */ nop +glabel L80242234_C70564 /* C70564 80242234 0280202D */ daddu $a0, $s4, $zero /* C70568 80242238 0200282D */ daddu $a1, $s0, $zero /* C7056C 8024223C 0C090208 */ jal func_80240820_C6EB50 /* C70570 80242240 0260302D */ daddu $a2, $s3, $zero +glabel L80242244_C70574 /* C70574 80242244 0280202D */ daddu $a0, $s4, $zero /* C70578 80242248 0200282D */ daddu $a1, $s0, $zero /* C7057C 8024224C 0C090274 */ jal func_802409D0_C6ED00 /* C70580 80242250 0260302D */ daddu $a2, $s3, $zero /* C70584 80242254 080908BA */ j .L802422E8 /* C70588 80242258 0000102D */ daddu $v0, $zero, $zero +glabel L8024225C_C7058C /* C7058C 8024225C 0280202D */ daddu $a0, $s4, $zero /* C70590 80242260 0200282D */ daddu $a1, $s0, $zero /* C70594 80242264 0C0903FE */ jal kzn_07_UnkNpcAIFunc1 /* C70598 80242268 0260302D */ daddu $a2, $s3, $zero +glabel L8024226C_C7059C /* C7059C 8024226C 0280202D */ daddu $a0, $s4, $zero /* C705A0 80242270 0200282D */ daddu $a1, $s0, $zero /* C705A4 80242274 0C09042E */ jal func_802410B8_C6F3E8 /* C705A8 80242278 0260302D */ daddu $a2, $s3, $zero /* C705AC 8024227C 080908BA */ j .L802422E8 /* C705B0 80242280 0000102D */ daddu $v0, $zero, $zero +glabel L80242284_C705B4 /* C705B4 80242284 0280202D */ daddu $a0, $s4, $zero /* C705B8 80242288 0200282D */ daddu $a1, $s0, $zero /* C705BC 8024228C 0C0904FF */ jal kzn_07_UnkNpcAIFunc2 /* C705C0 80242290 0260302D */ daddu $a2, $s3, $zero +glabel L80242294_C705C4 /* C705C4 80242294 0280202D */ daddu $a0, $s4, $zero /* C705C8 80242298 0200282D */ daddu $a1, $s0, $zero /* C705CC 8024229C 0C09051D */ jal func_80241474_C6F7A4 /* C705D0 802422A0 0260302D */ daddu $a2, $s3, $zero /* C705D4 802422A4 080908BA */ j .L802422E8 /* C705D8 802422A8 0000102D */ daddu $v0, $zero, $zero +glabel L802422AC_C705DC /* C705DC 802422AC 0280202D */ daddu $a0, $s4, $zero /* C705E0 802422B0 0200282D */ daddu $a1, $s0, $zero /* C705E4 802422B4 0C090746 */ jal func_80241D18_C70048 /* C705E8 802422B8 0260302D */ daddu $a2, $s3, $zero +glabel L802422BC_C705EC /* C705EC 802422BC 0280202D */ daddu $a0, $s4, $zero /* C705F0 802422C0 0200282D */ daddu $a1, $s0, $zero /* C705F4 802422C4 0C090792 */ jal func_80241E48_C70178 /* C705F8 802422C8 0260302D */ daddu $a2, $s3, $zero /* C705FC 802422CC 080908BA */ j .L802422E8 /* C70600 802422D0 0000102D */ daddu $v0, $zero, $zero +glabel L802422D4_C70604 /* C70604 802422D4 0280202D */ daddu $a0, $s4, $zero /* C70608 802422D8 0200282D */ daddu $a1, $s0, $zero /* C7060C 802422DC 0C090832 */ jal func_802420C8_C703F8 /* C70610 802422E0 0260302D */ daddu $a2, $s3, $zero .L802422E4: +glabel L802422E4_C70614 /* C70614 802422E4 0000102D */ daddu $v0, $zero, $zero .L802422E8: /* C70618 802422E8 8FBF0048 */ lw $ra, 0x48($sp) @@ -128,4 +138,4 @@ glabel func_80242124_C70454 /* C70630 80242300 8FB00030 */ lw $s0, 0x30($sp) /* C70634 80242304 03E00008 */ jr $ra /* C70638 80242308 27BD0050 */ addiu $sp, $sp, 0x50 -/* C7063C 8024230C 00000000 */ nop +/* C7063C 8024230C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240000_C71480.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240000_C71480.s index c774a80133..5bb4b32a43 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240000_C71480.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240000_C71480.s @@ -43,7 +43,7 @@ glabel func_80240000_C71480 /* C71514 80240094 1440FFF4 */ bnez $v0, .L80240068 /* C71518 80240098 26310002 */ addiu $s1, $s1, 2 /* C7151C 8024009C 08090036 */ j .L802400D8 -/* C71520 802400A0 00000000 */ nop +/* C71520 802400A0 00000000 */ nop .L802400A4: /* C71524 802400A4 3C118015 */ lui $s1, %hi(gCurrentModelListPtr) /* C71528 802400A8 8E3112CC */ lw $s1, %lo(gCurrentModelListPtr)($s1) @@ -66,13 +66,13 @@ glabel func_80240000_C71480 /* C71560 802400E0 C4420000 */ lwc1 $f2, ($v0) /* C71564 802400E4 3C013F80 */ lui $at, 0x3f80 /* C71568 802400E8 44810000 */ mtc1 $at, $f0 -/* C7156C 802400EC 00000000 */ nop +/* C7156C 802400EC 00000000 */ nop /* C71570 802400F0 46001000 */ add.s $f0, $f2, $f0 /* C71574 802400F4 3C0143B4 */ lui $at, 0x43b4 /* C71578 802400F8 44811000 */ mtc1 $at, $f2 -/* C7157C 802400FC 00000000 */ nop +/* C7157C 802400FC 00000000 */ nop /* C71580 80240100 4600103C */ c.lt.s $f2, $f0 -/* C71584 80240104 00000000 */ nop +/* C71584 80240104 00000000 */ nop /* C71588 80240108 45000003 */ bc1f .L80240118 /* C7158C 8024010C E4400000 */ swc1 $f0, ($v0) /* C71590 80240110 46020001 */ sub.s $f0, $f0, $f2 @@ -86,21 +86,21 @@ glabel func_80240000_C71480 /* C715AC 8024012C 12820008 */ beq $s4, $v0, .L80240150 /* C715B0 80240130 0000202D */ daddu $a0, $zero, $zero /* C715B4 80240134 08090088 */ j .L80240220 -/* C715B8 80240138 00000000 */ nop +/* C715B8 80240138 00000000 */ nop .L8024013C: /* C715BC 8024013C 2402000A */ addiu $v0, $zero, 0xa /* C715C0 80240140 12820077 */ beq $s4, $v0, .L80240320 /* C715C4 80240144 0000102D */ daddu $v0, $zero, $zero /* C715C8 80240148 08090088 */ j .L80240220 -/* C715CC 8024014C 00000000 */ nop +/* C715CC 8024014C 00000000 */ nop .L80240150: /* C715D0 80240150 3C05FD05 */ lui $a1, 0xfd05 /* C715D4 80240154 0C0B210B */ jal get_float_variable /* C715D8 80240158 34A50F80 */ ori $a1, $a1, 0xf80 /* C715DC 8024015C 44802000 */ mtc1 $zero, $f4 -/* C715E0 80240160 00000000 */ nop +/* C715E0 80240160 00000000 */ nop /* C715E4 80240164 4604003E */ c.le.s $f0, $f4 -/* C715E8 80240168 00000000 */ nop +/* C715E8 80240168 00000000 */ nop /* C715EC 8024016C 4501006C */ bc1t .L80240320 /* C715F0 80240170 24020002 */ addiu $v0, $zero, 2 /* C715F4 80240174 3C028011 */ lui $v0, %hi(gPlayerStatus) @@ -108,19 +108,19 @@ glabel func_80240000_C71480 /* C715FC 8024017C C4420028 */ lwc1 $f2, 0x28($v0) /* C71600 80240180 3C01C296 */ lui $at, 0xc296 /* C71604 80240184 44810000 */ mtc1 $at, $f0 -/* C71608 80240188 00000000 */ nop +/* C71608 80240188 00000000 */ nop /* C7160C 8024018C 46020081 */ sub.s $f2, $f0, $f2 /* C71610 80240190 4604103C */ c.lt.s $f2, $f4 -/* C71614 80240194 00000000 */ nop +/* C71614 80240194 00000000 */ nop /* C71618 80240198 45030001 */ bc1tl .L802401A0 /* C7161C 8024019C 46001087 */ neg.s $f2, $f2 .L802401A0: /* C71620 802401A0 3C014400 */ lui $at, 0x4400 /* C71624 802401A4 44810000 */ mtc1 $at, $f0 -/* C71628 802401A8 00000000 */ nop +/* C71628 802401A8 00000000 */ nop /* C7162C 802401AC 46020581 */ sub.s $f22, $f0, $f2 /* C71630 802401B0 4604B03C */ c.lt.s $f22, $f4 -/* C71634 802401B4 00000000 */ nop +/* C71634 802401B4 00000000 */ nop /* C71638 802401B8 45030001 */ bc1tl .L802401C0 /* C7163C 802401BC 46002586 */ mov.s $f22, $f4 .L802401C0: @@ -132,10 +132,10 @@ glabel func_80240000_C71480 /* C71654 802401D4 D42255D0 */ ldc1 $f2, %lo(D_802455D0)($at) /* C71658 802401D8 46000021 */ cvt.d.s $f0, $f0 /* C7165C 802401DC 46220002 */ mul.d $f0, $f0, $f2 -/* C71660 802401E0 00000000 */ nop +/* C71660 802401E0 00000000 */ nop /* C71664 802401E4 4600B0A1 */ cvt.d.s $f2, $f22 /* C71668 802401E8 46201082 */ mul.d $f2, $f2, $f0 -/* C7166C 802401EC 00000000 */ nop +/* C7166C 802401EC 00000000 */ nop /* C71670 802401F0 241103CA */ addiu $s1, $zero, 0x3ca /* C71674 802401F4 0809008B */ j .L8024022C /* C71678 802401F8 462015A0 */ cvt.s.d $f22, $f2 @@ -159,16 +159,16 @@ glabel func_80240000_C71480 /* C716B4 80240234 C6000000 */ lwc1 $f0, ($s0) /* C716B8 80240238 3C014040 */ lui $at, 0x4040 /* C716BC 8024023C 44816000 */ mtc1 $at, $f12 -/* C716C0 80240240 00000000 */ nop +/* C716C0 80240240 00000000 */ nop /* C716C4 80240244 460C0302 */ mul.s $f12, $f0, $f12 /* C716C8 80240248 0C00A8BB */ jal sin_deg -/* C716CC 8024024C 00000000 */ nop +/* C716CC 8024024C 00000000 */ nop /* C716D0 80240250 C6020000 */ lwc1 $f2, ($s0) /* C716D4 80240254 3C014100 */ lui $at, 0x4100 /* C716D8 80240258 44816000 */ mtc1 $at, $f12 -/* C716DC 8024025C 00000000 */ nop +/* C716DC 8024025C 00000000 */ nop /* C716E0 80240260 460C1302 */ mul.s $f12, $f2, $f12 -/* C716E4 80240264 00000000 */ nop +/* C716E4 80240264 00000000 */ nop /* C716E8 80240268 0C00A8BB */ jal sin_deg /* C716EC 8024026C 46000506 */ mov.s $f20, $f0 /* C716F0 80240270 3C013FE0 */ lui $at, 0x3fe0 @@ -176,21 +176,21 @@ glabel func_80240000_C71480 /* C716F8 80240278 44801000 */ mtc1 $zero, $f2 /* C716FC 8024027C 4600A521 */ cvt.d.s $f20, $f20 /* C71700 80240280 4622A502 */ mul.d $f20, $f20, $f2 -/* C71704 80240284 00000000 */ nop +/* C71704 80240284 00000000 */ nop /* C71708 80240288 46000021 */ cvt.d.s $f0, $f0 /* C7170C 8024028C 46220002 */ mul.d $f0, $f0, $f2 -/* C71710 80240290 00000000 */ nop +/* C71710 80240290 00000000 */ nop /* C71714 80240294 4620A500 */ add.d $f20, $f20, $f0 /* C71718 80240298 4600B021 */ cvt.d.s $f0, $f22 /* C7171C 8024029C 46340502 */ mul.d $f20, $f0, $f20 -/* C71720 802402A0 00000000 */ nop +/* C71720 802402A0 00000000 */ nop /* C71724 802402A4 46340000 */ add.d $f0, $f0, $f20 /* C71728 802402A8 3C0141E0 */ lui $at, 0x41e0 /* C7172C 802402AC 44811800 */ mtc1 $at, $f3 /* C71730 802402B0 44801000 */ mtc1 $zero, $f2 -/* C71734 802402B4 00000000 */ nop +/* C71734 802402B4 00000000 */ nop /* C71738 802402B8 4620103E */ c.le.d $f2, $f0 -/* C7173C 802402BC 00000000 */ nop +/* C7173C 802402BC 00000000 */ nop /* C71740 802402C0 45030005 */ bc1tl .L802402D8 /* C71744 802402C4 46220001 */ sub.d $f0, $f0, $f2 /* C71748 802402C8 4620018D */ trunc.w.d $f6, $f0 @@ -201,7 +201,7 @@ glabel func_80240000_C71480 /* C71758 802402D8 3C028000 */ lui $v0, 0x8000 /* C7175C 802402DC 4620018D */ trunc.w.d $f6, $f0 /* C71760 802402E0 44073000 */ mfc1 $a3, $f6 -/* C71764 802402E4 00000000 */ nop +/* C71764 802402E4 00000000 */ nop /* C71768 802402E8 00E23825 */ or $a3, $a3, $v0 /* C7176C 802402EC 2404003C */ addiu $a0, $zero, 0x3c .L802402F0: diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240348_C717C8.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240348_C717C8.s index e6968986eb..6af8214a0f 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240348_C717C8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240348_C717C8.s @@ -31,7 +31,7 @@ glabel func_80240348_C717C8 /* C7182C 802403AC 1440FFF4 */ bnez $v0, .L80240380 /* C71830 802403B0 26310002 */ addiu $s1, $s1, 2 /* C71834 802403B4 080900FC */ j .L802403F0 -/* C71838 802403B8 00000000 */ nop +/* C71838 802403B8 00000000 */ nop .L802403BC: /* C7183C 802403BC 3C118015 */ lui $s1, %hi(gCurrentModelListPtr) /* C71840 802403C0 8E3112CC */ lw $s1, %lo(gCurrentModelListPtr)($s1) diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240718_C71B98.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240718_C71B98.s index 11205600f6..9a3a009b23 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240718_C71B98.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240718_C71B98.s @@ -10,15 +10,15 @@ glabel func_80240718_C71B98 /* C71BAC 8024072C 8C450000 */ lw $a1, ($v0) /* C71BB0 80240730 0040802D */ daddu $s0, $v0, $zero /* C71BB4 80240734 12000006 */ beqz $s0, .L80240750 -/* C71BB8 80240738 00000000 */ nop +/* C71BB8 80240738 00000000 */ nop /* C71BBC 8024073C 0C046ED4 */ jal enable_world_fog -/* C71BC0 80240740 00000000 */ nop +/* C71BC0 80240740 00000000 */ nop /* C71BC4 80240744 240403E3 */ addiu $a0, $zero, 0x3e3 /* C71BC8 80240748 080901D7 */ j .L8024075C /* C71BCC 8024074C 00902023 */ subu $a0, $a0, $s0 .L80240750: /* C71BD0 80240750 0C046ED9 */ jal disable_world_fog -/* C71BD4 80240754 00000000 */ nop +/* C71BD4 80240754 00000000 */ nop /* C71BD8 80240758 240403E3 */ addiu $a0, $zero, 0x3e3 .L8024075C: /* C71BDC 8024075C 0C046EDD */ jal set_world_fog_dist @@ -33,4 +33,4 @@ glabel func_80240718_C71B98 /* C71C00 80240780 24020002 */ addiu $v0, $zero, 2 /* C71C04 80240784 03E00008 */ jr $ra /* C71C08 80240788 27BD0018 */ addiu $sp, $sp, 0x18 -/* C71C0C 8024078C 00000000 */ nop +/* C71C0C 8024078C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_80240790_C71C10.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_80240790_C71C10.s index ed1b24818e..623a7166c7 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_80240790_C71C10.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_80240790_C71C10.s @@ -26,7 +26,7 @@ glabel func_80240790_C71C10 /* C71C60 802407E0 1440FFFA */ bnez $v0, .L802407CC /* C71C64 802407E4 24A50004 */ addiu $a1, $a1, 4 /* C71C68 802407E8 0809020B */ j .L8024082C -/* C71C6C 802407EC 00000000 */ nop +/* C71C6C 802407EC 00000000 */ nop .L802407F0: /* C71C70 802407F0 0000182D */ daddu $v1, $zero, $zero /* C71C74 802407F4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80240A50_C71ED0.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80240A50_C71ED0.s index 3d1e50c263..bc2306bd63 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80240A50_C71ED0.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80240A50_C71ED0.s @@ -47,7 +47,7 @@ glabel func_80240A50_C71ED0 /* C71F78 80240AF8 0C0123F5 */ jal is_point_within_region /* C71F7C 80240AFC 8E070038 */ lw $a3, 0x38($s0) /* C71F80 80240B00 1040000E */ beqz $v0, .L80240B3C -/* C71F84 80240B04 00000000 */ nop +/* C71F84 80240B04 00000000 */ nop /* C71F88 80240B08 8E2200D0 */ lw $v0, 0xd0($s1) /* C71F8C 80240B0C C60C0038 */ lwc1 $f12, 0x38($s0) /* C71F90 80240B10 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240A50_C71ED0 /* C71FA4 80240B24 468031A0 */ cvt.s.w $f6, $f6 /* C71FA8 80240B28 44073000 */ mfc1 $a3, $f6 /* C71FAC 80240B2C 0C00A720 */ jal atan2 -/* C71FB0 80240B30 00000000 */ nop +/* C71FB0 80240B30 00000000 */ nop /* C71FB4 80240B34 080902DB */ j .L80240B6C /* C71FB8 80240B38 E600000C */ swc1 $f0, 0xc($s0) .L80240B3C: @@ -66,7 +66,7 @@ glabel func_80240A50_C71ED0 /* C71FC0 80240B40 2404003C */ addiu $a0, $zero, 0x3c /* C71FC4 80240B44 C60C000C */ lwc1 $f12, 0xc($s0) /* C71FC8 80240B48 44820000 */ mtc1 $v0, $f0 -/* C71FCC 80240B4C 00000000 */ nop +/* C71FCC 80240B4C 00000000 */ nop /* C71FD0 80240B50 46800020 */ cvt.s.w $f0, $f0 /* C71FD4 80240B54 46006300 */ add.s $f12, $f12, $f0 /* C71FD8 80240B58 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240A50_C71ED0 /* C71FFC 80240B7C 8E2200D0 */ lw $v0, 0xd0($s1) /* C72000 80240B80 8C420014 */ lw $v0, 0x14($v0) /* C72004 80240B84 04410004 */ bgez $v0, .L80240B98 -/* C72008 80240B88 00000000 */ nop +/* C72008 80240B88 00000000 */ nop /* C7200C 80240B8C C6400000 */ lwc1 $f0, ($s2) /* C72010 80240B90 080902EE */ j .L80240BB8 /* C72014 80240B94 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240A50_C71ED0 /* C72018 80240B98 3C018024 */ lui $at, %hi(D_802455E0) /* C7201C 80240B9C D42255E0 */ ldc1 $f2, %lo(D_802455E0)($at) /* C72020 80240BA0 44820000 */ mtc1 $v0, $f0 -/* C72024 80240BA4 00000000 */ nop +/* C72024 80240BA4 00000000 */ nop /* C72028 80240BA8 46800021 */ cvt.d.w $f0, $f0 /* C7202C 80240BAC 46220003 */ div.d $f0, $f0, $f2 /* C72030 80240BB0 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240A50_C71ED0 /* C72044 80240BC4 44801000 */ mtc1 $zero, $f2 /* C72048 80240BC8 46000021 */ cvt.d.s $f0, $f0 /* C7204C 80240BCC 46220002 */ mul.d $f0, $f0, $f2 -/* C72050 80240BD0 00000000 */ nop +/* C72050 80240BD0 00000000 */ nop /* C72054 80240BD4 24020001 */ addiu $v0, $zero, 1 /* C72058 80240BD8 4620018D */ trunc.w.d $f6, $f0 /* C7205C 80240BDC E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80240C00_C72080.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80240C00_C72080.s index 6cfdbfef16..9517327ef8 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80240C00_C72080.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80240C00_C72080.s @@ -34,7 +34,7 @@ glabel func_80240C00_C72080 /* C720F4 80240C74 44803000 */ mtc1 $zero, $f6 /* C720F8 80240C78 46000021 */ cvt.d.s $f0, $f0 /* C720FC 80240C7C 46260002 */ mul.d $f0, $f0, $f6 -/* C72100 80240C80 00000000 */ nop +/* C72100 80240C80 00000000 */ nop /* C72104 80240C84 24020001 */ addiu $v0, $zero, 1 /* C72108 80240C88 8E24006C */ lw $a0, 0x6c($s1) /* C7210C 80240C8C 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80240C00_C72080 /* C72168 80240CE8 C600003C */ lwc1 $f0, 0x3c($s0) /* C7216C 80240CEC 4600C001 */ sub.s $f0, $f24, $f0 /* C72170 80240CF0 4600B03C */ c.lt.s $f22, $f0 -/* C72174 80240CF4 00000000 */ nop +/* C72174 80240CF4 00000000 */ nop /* C72178 80240CF8 4500001B */ bc1f .L80240D68 /* C7217C 80240CFC 34820010 */ ori $v0, $a0, 0x10 /* C72180 80240D00 0809035A */ j .L80240D68 @@ -87,9 +87,9 @@ glabel func_80240C00_C72080 /* C721C4 80240D44 C7A00034 */ lwc1 $f0, 0x34($sp) /* C721C8 80240D48 4600D001 */ sub.s $f0, $f26, $f0 /* C721CC 80240D4C 4600B03C */ c.lt.s $f22, $f0 -/* C721D0 80240D50 00000000 */ nop +/* C721D0 80240D50 00000000 */ nop /* C721D4 80240D54 45000004 */ bc1f .L80240D68 -/* C721D8 80240D58 00000000 */ nop +/* C721D8 80240D58 00000000 */ nop /* C721DC 80240D5C 8E22006C */ lw $v0, 0x6c($s1) /* C721E0 80240D60 34420010 */ ori $v0, $v0, 0x10 /* C721E4 80240D64 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80240C00_C72080 /* C721EC 80240D6C 24030011 */ addiu $v1, $zero, 0x11 /* C721F0 80240D70 30420011 */ andi $v0, $v0, 0x11 /* C721F4 80240D74 14430039 */ bne $v0, $v1, .L80240E5C -/* C721F8 80240D78 00000000 */ nop +/* C721F8 80240D78 00000000 */ nop /* C721FC 80240D7C 8E020000 */ lw $v0, ($s0) /* C72200 80240D80 30420008 */ andi $v0, $v0, 8 /* C72204 80240D84 1040000A */ beqz $v0, .L80240DB0 @@ -108,7 +108,7 @@ glabel func_80240C00_C72080 /* C72214 80240D94 D42055E8 */ ldc1 $f0, %lo(D_802455E8)($at) /* C72218 80240D98 460010A1 */ cvt.d.s $f2, $f2 /* C7221C 80240D9C 46201082 */ mul.d $f2, $f2, $f0 -/* C72220 80240DA0 00000000 */ nop +/* C72220 80240DA0 00000000 */ nop /* C72224 80240DA4 4600A021 */ cvt.d.s $f0, $f20 /* C72228 80240DA8 08090385 */ j .L80240E14 /* C7222C 80240DAC 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80240C00_C72080 /* C7227C 80240DFC D42055F0 */ ldc1 $f0, %lo(D_802455F0)($at) /* C72280 80240E00 460010A1 */ cvt.d.s $f2, $f2 /* C72284 80240E04 46201082 */ mul.d $f2, $f2, $f0 -/* C72288 80240E08 00000000 */ nop +/* C72288 80240E08 00000000 */ nop /* C7228C 80240E0C 4600A021 */ cvt.d.s $f0, $f20 /* C72290 80240E10 46220000 */ add.d $f0, $f0, $f2 .L80240E14: @@ -149,7 +149,7 @@ glabel func_80240C00_C72080 /* C722B0 80240E30 46000005 */ abs.s $f0, $f0 /* C722B4 80240E34 46000021 */ cvt.d.s $f0, $f0 /* C722B8 80240E38 4622003C */ c.lt.d $f0, $f2 -/* C722BC 80240E3C 00000000 */ nop +/* C722BC 80240E3C 00000000 */ nop /* C722C0 80240E40 45000036 */ bc1f .L80240F1C /* C722C4 80240E44 2403FFEF */ addiu $v1, $zero, -0x11 /* C722C8 80240E48 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80240C00_C72080 .L80240E5C: /* C722DC 80240E5C 8E220070 */ lw $v0, 0x70($s1) /* C722E0 80240E60 1840002E */ blez $v0, .L80240F1C -/* C722E4 80240E64 00000000 */ nop +/* C722E4 80240E64 00000000 */ nop /* C722E8 80240E68 C62C0074 */ lwc1 $f12, 0x74($s1) /* C722EC 80240E6C 0C00A8BB */ jal sin_deg /* C722F0 80240E70 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80240C00_C72080 /* C72348 80240EC8 27A70030 */ addiu $a3, $sp, 0x30 .L80240ECC: /* C7234C 80240ECC 10400007 */ beqz $v0, .L80240EEC -/* C72350 80240ED0 00000000 */ nop +/* C72350 80240ED0 00000000 */ nop /* C72354 80240ED4 4616A082 */ mul.s $f2, $f20, $f22 -/* C72358 80240ED8 00000000 */ nop +/* C72358 80240ED8 00000000 */ nop /* C7235C 80240EDC C7A0002C */ lwc1 $f0, 0x2c($sp) /* C72360 80240EE0 461A0000 */ add.s $f0, $f0, $f26 /* C72364 80240EE4 080903BE */ j .L80240EF8 /* C72368 80240EE8 46020000 */ add.s $f0, $f0, $f2 .L80240EEC: /* C7236C 80240EEC 4616A002 */ mul.s $f0, $f20, $f22 -/* C72370 80240EF0 00000000 */ nop +/* C72370 80240EF0 00000000 */ nop /* C72374 80240EF4 4600C000 */ add.s $f0, $f24, $f0 .L80240EF8: /* C72378 80240EF8 E600003C */ swc1 $f0, 0x3c($s0) /* C7237C 80240EFC 8E220074 */ lw $v0, 0x74($s1) /* C72380 80240F00 2442000A */ addiu $v0, $v0, 0xa /* C72384 80240F04 44826000 */ mtc1 $v0, $f12 -/* C72388 80240F08 00000000 */ nop +/* C72388 80240F08 00000000 */ nop /* C7238C 80240F0C 0C00A6C9 */ jal clamp_angle /* C72390 80240F10 46806320 */ cvt.s.w $f12, $f12 /* C72394 80240F14 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80240C00_C72080 /* C723A4 80240F24 2442FFFF */ addiu $v0, $v0, -1 /* C723A8 80240F28 8E430014 */ lw $v1, 0x14($s2) /* C723AC 80240F2C 04600048 */ bltz $v1, .L80241050 -/* C723B0 80240F30 00000000 */ nop +/* C723B0 80240F30 00000000 */ nop /* C723B4 80240F34 8E620074 */ lw $v0, 0x74($s3) /* C723B8 80240F38 1C400042 */ bgtz $v0, .L80241044 /* C723BC 80240F3C 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80240C00_C72080 /* C723C4 80240F44 860200A8 */ lh $v0, 0xa8($s0) /* C723C8 80240F48 C602003C */ lwc1 $f2, 0x3c($s0) /* C723CC 80240F4C 44820000 */ mtc1 $v0, $f0 -/* C723D0 80240F50 00000000 */ nop +/* C723D0 80240F50 00000000 */ nop /* C723D4 80240F54 46800020 */ cvt.s.w $f0, $f0 /* C723D8 80240F58 46001080 */ add.s $f2, $f2, $f0 /* C723DC 80240F5C 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80240C00_C72080 /* C723F8 80240F78 C440002C */ lwc1 $f0, 0x2c($v0) /* C723FC 80240F7C 46000021 */ cvt.d.s $f0, $f0 /* C72400 80240F80 4622003C */ c.lt.d $f0, $f2 -/* C72404 80240F84 00000000 */ nop +/* C72404 80240F84 00000000 */ nop /* C72408 80240F88 4500002C */ bc1f .L8024103C /* C7240C 80240F8C 02A0202D */ daddu $a0, $s5, $zero /* C72410 80240F90 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80240C00_C72080 /* C7244C 80240FCC 3C01C1A0 */ lui $at, 0xc1a0 /* C72450 80240FD0 44812000 */ mtc1 $at, $f4 /* C72454 80240FD4 44834000 */ mtc1 $v1, $f8 -/* C72458 80240FD8 00000000 */ nop +/* C72458 80240FD8 00000000 */ nop /* C7245C 80240FDC 46804220 */ cvt.s.w $f8, $f8 /* C72460 80240FE0 44074000 */ mfc1 $a3, $f8 /* C72464 80240FE4 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80240C00_C72080 /* C72518 80241098 0C0123F5 */ jal is_point_within_region /* C7251C 8024109C 8E070038 */ lw $a3, 0x38($s0) /* C72520 802410A0 1040001A */ beqz $v0, .L8024110C -/* C72524 802410A4 00000000 */ nop +/* C72524 802410A4 00000000 */ nop /* C72528 802410A8 8E060038 */ lw $a2, 0x38($s0) /* C7252C 802410AC 8E2200D0 */ lw $v0, 0xd0($s1) /* C72530 802410B0 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80240C00_C72080 /* C72544 802410C4 468073A0 */ cvt.s.w $f14, $f14 /* C72548 802410C8 C6020018 */ lwc1 $f2, 0x18($s0) /* C7254C 802410CC 4600103C */ c.lt.s $f2, $f0 -/* C72550 802410D0 00000000 */ nop +/* C72550 802410D0 00000000 */ nop /* C72554 802410D4 4500000D */ bc1f .L8024110C /* C72558 802410D8 E7A00034 */ swc1 $f0, 0x34($sp) /* C7255C 802410DC C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80240C00_C72080 /* C72598 80241118 00621825 */ or $v1, $v1, $v0 /* C7259C 8024111C 00741825 */ or $v1, $v1, $s4 /* C725A0 80241120 10600008 */ beqz $v1, .L80241144 -/* C725A4 80241124 00000000 */ nop +/* C725A4 80241124 00000000 */ nop /* C725A8 80241128 8602008C */ lh $v0, 0x8c($s0) /* C725AC 8024112C 14400031 */ bnez $v0, .L802411F4 -/* C725B0 80241130 00000000 */ nop +/* C725B0 80241130 00000000 */ nop /* C725B4 80241134 8E050018 */ lw $a1, 0x18($s0) /* C725B8 80241138 8E06000C */ lw $a2, 0xc($s0) /* C725BC 8024113C 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_80240C00_C72080 /* C725D0 80241150 44801000 */ mtc1 $zero, $f2 /* C725D4 80241154 46000021 */ cvt.d.s $f0, $f0 /* C725D8 80241158 46220002 */ mul.d $f0, $f0, $f2 -/* C725DC 8024115C 00000000 */ nop +/* C725DC 8024115C 00000000 */ nop /* C725E0 80241160 4620020D */ trunc.w.d $f8, $f0 /* C725E4 80241164 E628007C */ swc1 $f8, 0x7c($s1) /* C725E8 80241168 8E420004 */ lw $v0, 4($s2) /* C725EC 8024116C 18400021 */ blez $v0, .L802411F4 -/* C725F0 80241170 00000000 */ nop +/* C725F0 80241170 00000000 */ nop /* C725F4 80241174 8602008E */ lh $v0, 0x8e($s0) /* C725F8 80241178 9603008E */ lhu $v1, 0x8e($s0) /* C725FC 8024117C 18400005 */ blez $v0, .L80241194 @@ -375,7 +375,7 @@ glabel func_80240C00_C72080 /* C72604 80241184 A602008E */ sh $v0, 0x8e($s0) /* C72608 80241188 00021400 */ sll $v0, $v0, 0x10 /* C7260C 8024118C 1C400019 */ bgtz $v0, .L802411F4 -/* C72610 80241190 00000000 */ nop +/* C72610 80241190 00000000 */ nop .L80241194: /* C72614 80241194 240403E8 */ addiu $a0, $zero, 0x3e8 /* C72618 80241198 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80240C00_C72080 /* C72660 802411E0 18400003 */ blez $v0, .L802411F0 /* C72664 802411E4 28620003 */ slti $v0, $v1, 3 /* C72668 802411E8 10400002 */ beqz $v0, .L802411F4 -/* C7266C 802411EC 00000000 */ nop +/* C7266C 802411EC 00000000 */ nop .L802411F0: /* C72670 802411F0 AE600070 */ sw $zero, 0x70($s3) .L802411F4: diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802412E8_C72768.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802412E8_C72768.s index 9a84799a88..4bec60bdd0 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802412E8_C72768.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802412E8_C72768.s @@ -42,11 +42,11 @@ glabel func_802412E8_C72768 .L8024137C: /* C727FC 8024137C 8E220070 */ lw $v0, 0x70($s1) /* C72800 80241380 18400034 */ blez $v0, .L80241454 -/* C72804 80241384 00000000 */ nop +/* C72804 80241384 00000000 */ nop /* C72808 80241388 C62C0074 */ lwc1 $f12, 0x74($s1) /* C7280C 8024138C 46806320 */ cvt.s.w $f12, $f12 /* C72810 80241390 44820000 */ mtc1 $v0, $f0 -/* C72814 80241394 00000000 */ nop +/* C72814 80241394 00000000 */ nop /* C72818 80241398 46800020 */ cvt.s.w $f0, $f0 /* C7281C 8024139C 46000021 */ cvt.d.s $f0, $f0 /* C72820 802413A0 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_802412E8_C72768 /* C72880 80241400 27A70030 */ addiu $a3, $sp, 0x30 .L80241404: /* C72884 80241404 10400007 */ beqz $v0, .L80241424 -/* C72888 80241408 00000000 */ nop +/* C72888 80241408 00000000 */ nop /* C7288C 8024140C 4616A082 */ mul.s $f2, $f20, $f22 -/* C72890 80241410 00000000 */ nop +/* C72890 80241410 00000000 */ nop /* C72894 80241414 C7A0002C */ lwc1 $f0, 0x2c($sp) /* C72898 80241418 46180000 */ add.s $f0, $f0, $f24 /* C7289C 8024141C 0809050C */ j .L80241430 /* C728A0 80241420 46020000 */ add.s $f0, $f0, $f2 .L80241424: /* C728A4 80241424 4616A002 */ mul.s $f0, $f20, $f22 -/* C728A8 80241428 00000000 */ nop +/* C728A8 80241428 00000000 */ nop /* C728AC 8024142C 4600D000 */ add.s $f0, $f26, $f0 .L80241430: /* C728B0 80241430 E600003C */ swc1 $f0, 0x3c($s0) /* C728B4 80241434 8E220074 */ lw $v0, 0x74($s1) /* C728B8 80241438 2442000A */ addiu $v0, $v0, 0xa /* C728BC 8024143C 44826000 */ mtc1 $v0, $f12 -/* C728C0 80241440 00000000 */ nop +/* C728C0 80241440 00000000 */ nop /* C728C4 80241444 0C00A6C9 */ jal clamp_angle /* C728C8 80241448 46806320 */ cvt.s.w $f12, $f12 /* C728CC 8024144C 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_802412E8_C72768 /* C728E0 80241460 860200A8 */ lh $v0, 0xa8($s0) /* C728E4 80241464 C600003C */ lwc1 $f0, 0x3c($s0) /* C728E8 80241468 44821000 */ mtc1 $v0, $f2 -/* C728EC 8024146C 00000000 */ nop +/* C728EC 8024146C 00000000 */ nop /* C728F0 80241470 468010A0 */ cvt.s.w $f2, $f2 /* C728F4 80241474 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C728F8 80241478 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_802412E8_C72768 /* C72914 80241494 46240000 */ add.d $f0, $f0, $f4 /* C72918 80241498 460010A1 */ cvt.d.s $f2, $f2 /* C7291C 8024149C 4620103C */ c.lt.d $f2, $f0 -/* C72920 802414A0 00000000 */ nop +/* C72920 802414A0 00000000 */ nop /* C72924 802414A4 4500002E */ bc1f .L80241560 /* C72928 802414A8 0280202D */ daddu $a0, $s4, $zero /* C7292C 802414AC 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_802412E8_C72768 /* C7296C 802414EC 3C01C1A0 */ lui $at, 0xc1a0 /* C72970 802414F0 44812000 */ mtc1 $at, $f4 /* C72974 802414F4 44834000 */ mtc1 $v1, $f8 -/* C72978 802414F8 00000000 */ nop +/* C72978 802414F8 00000000 */ nop /* C7297C 802414FC 46804220 */ cvt.s.w $f8, $f8 /* C72980 80241500 44074000 */ mfc1 $a3, $f8 /* C72984 80241504 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_802412E8_C72768 .L80241560: /* C729E0 80241560 8602008C */ lh $v0, 0x8c($s0) /* C729E4 80241564 14400025 */ bnez $v0, .L802415FC -/* C729E8 80241568 00000000 */ nop +/* C729E8 80241568 00000000 */ nop /* C729EC 8024156C 8602008E */ lh $v0, 0x8e($s0) /* C729F0 80241570 1C400022 */ bgtz $v0, .L802415FC -/* C729F4 80241574 00000000 */ nop +/* C729F4 80241574 00000000 */ nop /* C729F8 80241578 8E620074 */ lw $v0, 0x74($s3) /* C729FC 8024157C 2442FFFF */ addiu $v0, $v0, -1 /* C72A00 80241580 1840001D */ blez $v0, .L802415F8 @@ -183,7 +183,7 @@ glabel func_802412E8_C72768 /* C72A0C 8024158C 9442002A */ lhu $v0, 0x2a($v0) /* C72A10 80241590 30420010 */ andi $v0, $v0, 0x10 /* C72A14 80241594 14400007 */ bnez $v0, .L802415B4 -/* C72A18 80241598 00000000 */ nop +/* C72A18 80241598 00000000 */ nop /* C72A1C 8024159C C600000C */ lwc1 $f0, 0xc($s0) /* C72A20 802415A0 3C014334 */ lui $at, 0x4334 /* C72A24 802415A4 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241710_C72B90.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241710_C72B90.s index 5cf597ad1f..6be38b51ec 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241710_C72B90.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241710_C72B90.s @@ -60,18 +60,18 @@ glabel func_80241710_C72B90 /* C72C68 802417E8 C6200038 */ lwc1 $f0, 0x38($s1) /* C72C6C 802417EC 4600018D */ trunc.w.s $f6, $f0 /* C72C70 802417F0 44023000 */ mfc1 $v0, $f6 -/* C72C74 802417F4 00000000 */ nop +/* C72C74 802417F4 00000000 */ nop /* C72C78 802417F8 A6420010 */ sh $v0, 0x10($s2) /* C72C7C 802417FC C620003C */ lwc1 $f0, 0x3c($s1) /* C72C80 80241800 4600018D */ trunc.w.s $f6, $f0 /* C72C84 80241804 44023000 */ mfc1 $v0, $f6 -/* C72C88 80241808 00000000 */ nop +/* C72C88 80241808 00000000 */ nop /* C72C8C 8024180C A6420012 */ sh $v0, 0x12($s2) /* C72C90 80241810 C6200040 */ lwc1 $f0, 0x40($s1) /* C72C94 80241814 A2430007 */ sb $v1, 7($s2) /* C72C98 80241818 4600018D */ trunc.w.s $f6, $f0 /* C72C9C 8024181C 44023000 */ mfc1 $v0, $f6 -/* C72CA0 80241820 00000000 */ nop +/* C72CA0 80241820 00000000 */ nop /* C72CA4 80241824 A6420014 */ sh $v0, 0x14($s2) .L80241828: /* C72CA8 80241828 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802418A8_C72D28.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802418A8_C72D28.s index c810e22290..ff3f06e2d5 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802418A8_C72D28.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802418A8_C72D28.s @@ -42,9 +42,9 @@ glabel func_802418A8_C72D28 /* C72DBC 8024193C 44801800 */ mtc1 $zero, $f3 /* C72DC0 80241940 46002021 */ cvt.d.s $f0, $f4 /* C72DC4 80241944 4620103E */ c.le.d $f2, $f0 -/* C72DC8 80241948 00000000 */ nop +/* C72DC8 80241948 00000000 */ nop /* C72DCC 8024194C 45000030 */ bc1f .L80241A10 -/* C72DD0 80241950 00000000 */ nop +/* C72DD0 80241950 00000000 */ nop /* C72DD4 80241954 C600003C */ lwc1 $f0, 0x3c($s0) /* C72DD8 80241958 46040000 */ add.s $f0, $f0, $f4 /* C72DDC 8024195C E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_802418A8_C72D28 /* C72E3C 802419BC 27A70020 */ addiu $a3, $sp, 0x20 .L802419C0: /* C72E40 802419C0 1040000B */ beqz $v0, .L802419F0 -/* C72E44 802419C4 00000000 */ nop +/* C72E44 802419C4 00000000 */ nop /* C72E48 802419C8 C7A0001C */ lwc1 $f0, 0x1c($sp) /* C72E4C 802419CC 46140080 */ add.s $f2, $f0, $f20 /* C72E50 802419D0 C600003C */ lwc1 $f0, 0x3c($s0) /* C72E54 802419D4 4600103E */ c.le.s $f2, $f0 -/* C72E58 802419D8 00000000 */ nop +/* C72E58 802419D8 00000000 */ nop /* C72E5C 802419DC 4500008D */ bc1f .L80241C14 -/* C72E60 802419E0 00000000 */ nop +/* C72E60 802419E0 00000000 */ nop /* C72E64 802419E4 E602003C */ swc1 $f2, 0x3c($s0) /* C72E68 802419E8 08090705 */ j .L80241C14 /* C72E6C 802419EC AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_802418A8_C72D28 /* C72E70 802419F0 C602003C */ lwc1 $f2, 0x3c($s0) /* C72E74 802419F4 C6000064 */ lwc1 $f0, 0x64($s0) /* C72E78 802419F8 4602003E */ c.le.s $f0, $f2 -/* C72E7C 802419FC 00000000 */ nop +/* C72E7C 802419FC 00000000 */ nop /* C72E80 80241A00 45030084 */ bc1tl .L80241C14 /* C72E84 80241A04 AE400070 */ sw $zero, 0x70($s2) /* C72E88 80241A08 08090705 */ j .L80241C14 -/* C72E8C 80241A0C 00000000 */ nop +/* C72E8C 80241A0C 00000000 */ nop .L80241A10: /* C72E90 80241A10 4622003C */ c.lt.d $f0, $f2 -/* C72E94 80241A14 00000000 */ nop +/* C72E94 80241A14 00000000 */ nop /* C72E98 80241A18 4500007E */ bc1f .L80241C14 -/* C72E9C 80241A1C 00000000 */ nop +/* C72E9C 80241A1C 00000000 */ nop /* C72EA0 80241A20 9602008E */ lhu $v0, 0x8e($s0) /* C72EA4 80241A24 24420001 */ addiu $v0, $v0, 1 /* C72EA8 80241A28 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_802418A8_C72D28 /* C72EB4 80241A34 00021403 */ sra $v0, $v0, 0x10 /* C72EB8 80241A38 0043102A */ slt $v0, $v0, $v1 /* C72EBC 80241A3C 14400026 */ bnez $v0, .L80241AD8 -/* C72EC0 80241A40 00000000 */ nop +/* C72EC0 80241A40 00000000 */ nop /* C72EC4 80241A44 C60C0038 */ lwc1 $f12, 0x38($s0) /* C72EC8 80241A48 C60E0040 */ lwc1 $f14, 0x40($s0) /* C72ECC 80241A4C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_802418A8_C72D28 /* C72EF8 80241A78 8E62001C */ lw $v0, 0x1c($s3) /* C72EFC 80241A7C 46001005 */ abs.s $f0, $f2 /* C72F00 80241A80 44822000 */ mtc1 $v0, $f4 -/* C72F04 80241A84 00000000 */ nop +/* C72F04 80241A84 00000000 */ nop /* C72F08 80241A88 46802120 */ cvt.s.w $f4, $f4 /* C72F0C 80241A8C 4600203C */ c.lt.s $f4, $f0 -/* C72F10 80241A90 00000000 */ nop +/* C72F10 80241A90 00000000 */ nop /* C72F14 80241A94 4500000D */ bc1f .L80241ACC -/* C72F18 80241A98 00000000 */ nop +/* C72F18 80241A98 00000000 */ nop /* C72F1C 80241A9C 44800000 */ mtc1 $zero, $f0 /* C72F20 80241AA0 C614000C */ lwc1 $f20, 0xc($s0) /* C72F24 80241AA4 4600103C */ c.lt.s $f2, $f0 -/* C72F28 80241AA8 00000000 */ nop +/* C72F28 80241AA8 00000000 */ nop /* C72F2C 80241AAC 45000006 */ bc1f .L80241AC8 /* C72F30 80241AB0 00021023 */ negu $v0, $v0 /* C72F34 80241AB4 44820000 */ mtc1 $v0, $f0 -/* C72F38 80241AB8 00000000 */ nop +/* C72F38 80241AB8 00000000 */ nop /* C72F3C 80241ABC 46800020 */ cvt.s.w $f0, $f0 /* C72F40 80241AC0 080906B3 */ j .L80241ACC /* C72F44 80241AC4 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_802418A8_C72D28 /* C72F6C 80241AEC C600001C */ lwc1 $f0, 0x1c($s0) /* C72F70 80241AF0 46001080 */ add.s $f2, $f2, $f0 /* C72F74 80241AF4 4616103C */ c.lt.s $f2, $f22 -/* C72F78 80241AF8 00000000 */ nop +/* C72F78 80241AF8 00000000 */ nop /* C72F7C 80241AFC 45020045 */ bc1fl .L80241C14 /* C72F80 80241B00 E602003C */ swc1 $f2, 0x3c($s0) /* C72F84 80241B04 08090704 */ j .L80241C10 @@ -169,7 +169,7 @@ glabel func_802418A8_C72D28 /* C72F9C 80241B1C C600001C */ lwc1 $f0, 0x1c($s0) /* C72FA0 80241B20 C604003C */ lwc1 $f4, 0x3c($s0) /* C72FA4 80241B24 44821000 */ mtc1 $v0, $f2 -/* C72FA8 80241B28 00000000 */ nop +/* C72FA8 80241B28 00000000 */ nop /* C72FAC 80241B2C 468010A0 */ cvt.s.w $f2, $f2 /* C72FB0 80241B30 46000005 */ abs.s $f0, $f0 /* C72FB4 80241B34 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_802418A8_C72D28 /* C72FF0 80241B70 0C0372DF */ jal func_800DCB7C /* C72FF4 80241B74 27A70020 */ addiu $a3, $sp, 0x20 /* C72FF8 80241B78 10400015 */ beqz $v0, .L80241BD0 -/* C72FFC 80241B7C 00000000 */ nop +/* C72FFC 80241B7C 00000000 */ nop /* C73000 80241B80 860200A8 */ lh $v0, 0xa8($s0) /* C73004 80241B84 C604001C */ lwc1 $f4, 0x1c($s0) /* C73008 80241B88 44820000 */ mtc1 $v0, $f0 -/* C7300C 80241B8C 00000000 */ nop +/* C7300C 80241B8C 00000000 */ nop /* C73010 80241B90 46800020 */ cvt.s.w $f0, $f0 /* C73014 80241B94 46002085 */ abs.s $f2, $f4 /* C73018 80241B98 46020000 */ add.s $f0, $f0, $f2 /* C7301C 80241B9C C7A20024 */ lwc1 $f2, 0x24($sp) /* C73020 80241BA0 4600103E */ c.le.s $f2, $f0 -/* C73024 80241BA4 00000000 */ nop +/* C73024 80241BA4 00000000 */ nop /* C73028 80241BA8 45000005 */ bc1f .L80241BC0 -/* C7302C 80241BAC 00000000 */ nop +/* C7302C 80241BAC 00000000 */ nop /* C73030 80241BB0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* C73034 80241BB4 AE00001C */ sw $zero, 0x1c($s0) /* C73038 80241BB8 08090705 */ j .L80241C14 @@ -217,13 +217,13 @@ glabel func_802418A8_C72D28 /* C73054 80241BD4 860200A8 */ lh $v0, 0xa8($s0) /* C73058 80241BD8 46163081 */ sub.s $f2, $f6, $f22 /* C7305C 80241BDC 44820000 */ mtc1 $v0, $f0 -/* C73060 80241BE0 00000000 */ nop +/* C73060 80241BE0 00000000 */ nop /* C73064 80241BE4 46800020 */ cvt.s.w $f0, $f0 /* C73068 80241BE8 46001080 */ add.s $f2, $f2, $f0 /* C7306C 80241BEC C604001C */ lwc1 $f4, 0x1c($s0) /* C73070 80241BF0 46002005 */ abs.s $f0, $f4 /* C73074 80241BF4 4602003C */ c.lt.s $f0, $f2 -/* C73078 80241BF8 00000000 */ nop +/* C73078 80241BF8 00000000 */ nop /* C7307C 80241BFC 45020005 */ bc1fl .L80241C14 /* C73080 80241C00 AE00001C */ sw $zero, 0x1c($s0) /* C73084 80241C04 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241C38_C730B8.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241C38_C730B8.s index 1edc54be21..dac6202b0c 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241C38_C730B8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241C38_C730B8.s @@ -49,15 +49,15 @@ glabel func_80241C38_C730B8 /* C73160 80241CE0 44802000 */ mtc1 $zero, $f4 /* C73164 80241CE4 460010A1 */ cvt.d.s $f2, $f2 /* C73168 80241CE8 46241082 */ mul.d $f2, $f2, $f4 -/* C7316C 80241CEC 00000000 */ nop +/* C7316C 80241CEC 00000000 */ nop /* C73170 80241CF0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* C73174 80241CF4 46000021 */ cvt.d.s $f0, $f0 /* C73178 80241CF8 46240002 */ mul.d $f0, $f0, $f4 -/* C7317C 80241CFC 00000000 */ nop +/* C7317C 80241CFC 00000000 */ nop /* C73180 80241D00 3C013FE0 */ lui $at, 0x3fe0 /* C73184 80241D04 44812800 */ mtc1 $at, $f5 /* C73188 80241D08 44802000 */ mtc1 $zero, $f4 -/* C7318C 80241D0C 00000000 */ nop +/* C7318C 80241D0C 00000000 */ nop /* C73190 80241D10 46241080 */ add.d $f2, $f2, $f4 /* C73194 80241D14 AE000074 */ sw $zero, 0x74($s0) /* C73198 80241D18 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s index ce3d782e5b..7ca1d6ab05 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s @@ -54,7 +54,7 @@ glabel func_80241D5C_C731DC /* C7329C 80241E1C 8E4300B0 */ lw $v1, 0xb0($s2) /* C732A0 80241E20 30620004 */ andi $v0, $v1, 4 /* C732A4 80241E24 10400007 */ beqz $v0, .L80241E44 -/* C732A8 80241E28 00000000 */ nop +/* C732A8 80241E28 00000000 */ nop /* C732AC 80241E2C 824200B4 */ lb $v0, 0xb4($s2) /* C732B0 80241E30 1440003C */ bnez $v0, .L80241F24 /* C732B4 80241E34 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_80241D5C_C731DC /* C732C8 80241E48 2C62000F */ sltiu $v0, $v1, 0xf /* C732CC 80241E4C 10400034 */ beqz $v0, .L80241F20 /* C732D0 80241E50 00031080 */ sll $v0, $v1, 2 -/* C732D4 80241E54 3C018024 */ lui $at, %hi(D_802455F8) +/* C732D4 80241E54 3C018024 */ lui $at, %hi(jtbl_802455F8_C76A78) /* C732D8 80241E58 00220821 */ addu $at, $at, $v0 -/* C732DC 80241E5C 8C2255F8 */ lw $v0, %lo(D_802455F8)($at) +/* C732DC 80241E5C 8C2255F8 */ lw $v0, %lo(jtbl_802455F8_C76A78)($at) /* C732E0 80241E60 00400008 */ jr $v0 -/* C732E4 80241E64 00000000 */ nop +/* C732E4 80241E64 00000000 */ nop +glabel L80241E68_C732E8 /* C732E8 80241E68 0280202D */ daddu $a0, $s4, $zero /* C732EC 80241E6C 0200282D */ daddu $a1, $s0, $zero /* C732F0 80241E70 0C090294 */ jal func_80240A50_C71ED0 /* C732F4 80241E74 0260302D */ daddu $a2, $s3, $zero +glabel L80241E78_C732F8 /* C732F8 80241E78 0280202D */ daddu $a0, $s4, $zero /* C732FC 80241E7C 0200282D */ daddu $a1, $s0, $zero /* C73300 80241E80 0C090300 */ jal func_80240C00_C72080 /* C73304 80241E84 0260302D */ daddu $a2, $s3, $zero /* C73308 80241E88 080907C9 */ j .L80241F24 /* C7330C 80241E8C 0000102D */ daddu $v0, $zero, $zero +glabel L80241E90_C73310 /* C73310 80241E90 0280202D */ daddu $a0, $s4, $zero /* C73314 80241E94 0200282D */ daddu $a1, $s0, $zero /* C73318 80241E98 0C09048A */ jal kzn_08_UnkNpcAIFunc1 /* C7331C 80241E9C 0260302D */ daddu $a2, $s3, $zero +glabel L80241EA0_C73320 /* C73320 80241EA0 0280202D */ daddu $a0, $s4, $zero /* C73324 80241EA4 0200282D */ daddu $a1, $s0, $zero /* C73328 80241EA8 0C0904BA */ jal func_802412E8_C72768 /* C7332C 80241EAC 0260302D */ daddu $a2, $s3, $zero /* C73330 80241EB0 080907C9 */ j .L80241F24 /* C73334 80241EB4 0000102D */ daddu $v0, $zero, $zero +glabel L80241EB8_C73338 /* C73338 80241EB8 0280202D */ daddu $a0, $s4, $zero /* C7333C 80241EBC 0200282D */ daddu $a1, $s0, $zero /* C73340 80241EC0 0C09058B */ jal kzn_08_UnkNpcAIFunc2 /* C73344 80241EC4 0260302D */ daddu $a2, $s3, $zero +glabel L80241EC8_C73348 /* C73348 80241EC8 0280202D */ daddu $a0, $s4, $zero /* C7334C 80241ECC 0200282D */ daddu $a1, $s0, $zero /* C73350 80241ED0 0C0905A9 */ jal func_802416A4_C72B24 /* C73354 80241ED4 0260302D */ daddu $a2, $s3, $zero /* C73358 80241ED8 080907C9 */ j .L80241F24 /* C7335C 80241EDC 0000102D */ daddu $v0, $zero, $zero +glabel L80241EE0_C73360 /* C73360 80241EE0 0280202D */ daddu $a0, $s4, $zero /* C73364 80241EE4 0200282D */ daddu $a1, $s0, $zero /* C73368 80241EE8 0C0905C4 */ jal func_80241710_C72B90 /* C7336C 80241EEC 0260302D */ daddu $a2, $s3, $zero /* C73370 80241EF0 080907C9 */ j .L80241F24 /* C73374 80241EF4 0000102D */ daddu $v0, $zero, $zero +glabel L80241EF8_C73378 /* C73378 80241EF8 0280202D */ daddu $a0, $s4, $zero /* C7337C 80241EFC 0200282D */ daddu $a1, $s0, $zero /* C73380 80241F00 0C090611 */ jal kzn_08_UnkNpcAIFunc3 /* C73384 80241F04 0260302D */ daddu $a2, $s3, $zero /* C73388 80241F08 080907C9 */ j .L80241F24 /* C7338C 80241F0C 0000102D */ daddu $v0, $zero, $zero +glabel L80241F10_C73390 /* C73390 80241F10 0280202D */ daddu $a0, $s4, $zero /* C73394 80241F14 0200282D */ daddu $a1, $s0, $zero /* C73398 80241F18 0C09062A */ jal func_802418A8_C72D28 /* C7339C 80241F1C 0260302D */ daddu $a2, $s3, $zero .L80241F20: +glabel L80241F20_C733A0 /* C733A0 80241F20 0000102D */ daddu $v0, $zero, $zero .L80241F24: /* C733A4 80241F24 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241F48_C733C8.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241F48_C733C8.s index 9e641c5a1b..11c09ef73a 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241F48_C733C8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241F48_C733C8.s @@ -47,20 +47,20 @@ glabel func_80241F48_C733C8 /* C73470 80241FF0 8E02001C */ lw $v0, 0x1c($s0) /* C73474 80241FF4 46001005 */ abs.s $f0, $f2 /* C73478 80241FF8 44822000 */ mtc1 $v0, $f4 -/* C7347C 80241FFC 00000000 */ nop +/* C7347C 80241FFC 00000000 */ nop /* C73480 80242000 46802120 */ cvt.s.w $f4, $f4 /* C73484 80242004 4600203C */ c.lt.s $f4, $f0 -/* C73488 80242008 00000000 */ nop +/* C73488 80242008 00000000 */ nop /* C7348C 8024200C 4500000D */ bc1f .L80242044 -/* C73490 80242010 00000000 */ nop +/* C73490 80242010 00000000 */ nop /* C73494 80242014 44800000 */ mtc1 $zero, $f0 /* C73498 80242018 C654000C */ lwc1 $f20, 0xc($s2) /* C7349C 8024201C 4600103C */ c.lt.s $f2, $f0 -/* C734A0 80242020 00000000 */ nop +/* C734A0 80242020 00000000 */ nop /* C734A4 80242024 45000006 */ bc1f .L80242040 /* C734A8 80242028 00021023 */ negu $v0, $v0 /* C734AC 8024202C 44820000 */ mtc1 $v0, $f0 -/* C734B0 80242030 00000000 */ nop +/* C734B0 80242030 00000000 */ nop /* C734B4 80242034 46800020 */ cvt.s.w $f0, $f0 /* C734B8 80242038 08090811 */ j .L80242044 /* C734BC 8024203C 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242078_C734F8.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242078_C734F8.s index 4635c65b02..05efa7b548 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242078_C734F8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242078_C734F8.s @@ -36,7 +36,7 @@ glabel func_80242078_C734F8 /* C73574 802420F4 2402000F */ addiu $v0, $zero, 0xf /* C73578 802420F8 AFA2001C */ sw $v0, 0x1c($sp) /* C7357C 802420FC 44834000 */ mtc1 $v1, $f8 -/* C73580 80242100 00000000 */ nop +/* C73580 80242100 00000000 */ nop /* C73584 80242104 46804220 */ cvt.s.w $f8, $f8 /* C73588 80242108 44074000 */ mfc1 $a3, $f8 /* C7358C 8024210C 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,14 +69,14 @@ glabel func_80242078_C734F8 /* C735F4 80242174 860200A8 */ lh $v0, 0xa8($s0) /* C735F8 80242178 C6000038 */ lwc1 $f0, 0x38($s0) /* C735FC 8024217C 44821000 */ mtc1 $v0, $f2 -/* C73600 80242180 00000000 */ nop +/* C73600 80242180 00000000 */ nop /* C73604 80242184 468010A0 */ cvt.s.w $f2, $f2 /* C73608 80242188 E7A0002C */ swc1 $f0, 0x2c($sp) /* C7360C 8024218C 860200A8 */ lh $v0, 0xa8($s0) /* C73610 80242190 C604003C */ lwc1 $f4, 0x3c($s0) /* C73614 80242194 C6060040 */ lwc1 $f6, 0x40($s0) /* C73618 80242198 44820000 */ mtc1 $v0, $f0 -/* C7361C 8024219C 00000000 */ nop +/* C7361C 8024219C 00000000 */ nop /* C73620 802421A0 46800021 */ cvt.d.w $f0, $f0 /* C73624 802421A4 46022100 */ add.s $f4, $f4, $f2 /* C73628 802421A8 3C014008 */ lui $at, 0x4008 @@ -93,19 +93,19 @@ glabel func_80242078_C734F8 /* C73654 802421D4 0C0372DF */ jal func_800DCB7C /* C73658 802421D8 27A70034 */ addiu $a3, $sp, 0x34 /* C7365C 802421DC 1040000A */ beqz $v0, .L80242208 -/* C73660 802421E0 00000000 */ nop +/* C73660 802421E0 00000000 */ nop /* C73664 802421E4 860200A8 */ lh $v0, 0xa8($s0) /* C73668 802421E8 C7A20038 */ lwc1 $f2, 0x38($sp) /* C7366C 802421EC 44820000 */ mtc1 $v0, $f0 -/* C73670 802421F0 00000000 */ nop +/* C73670 802421F0 00000000 */ nop /* C73674 802421F4 46800020 */ cvt.s.w $f0, $f0 /* C73678 802421F8 4600103C */ c.lt.s $f2, $f0 -/* C7367C 802421FC 00000000 */ nop +/* C7367C 802421FC 00000000 */ nop /* C73680 80242200 45030001 */ bc1tl .L80242208 /* C73684 80242204 24110001 */ addiu $s1, $zero, 1 .L80242208: /* C73688 80242208 12200008 */ beqz $s1, .L8024222C -/* C7368C 8024220C 00000000 */ nop +/* C7368C 8024220C 00000000 */ nop /* C73690 80242210 C7A00030 */ lwc1 $f0, 0x30($sp) /* C73694 80242214 3C013FF0 */ lui $at, 0x3ff0 /* C73698 80242218 44811800 */ mtc1 $at, $f3 @@ -130,24 +130,24 @@ glabel func_80242078_C734F8 /* C736E0 80242260 44800800 */ mtc1 $zero, $f1 /* C736E4 80242264 460030A1 */ cvt.d.s $f2, $f6 /* C736E8 80242268 4620103C */ c.lt.d $f2, $f0 -/* C736EC 8024226C 00000000 */ nop +/* C736EC 8024226C 00000000 */ nop /* C736F0 80242270 45010009 */ bc1t .L80242298 -/* C736F4 80242274 00000000 */ nop +/* C736F4 80242274 00000000 */ nop /* C736F8 80242278 3C014010 */ lui $at, 0x4010 /* C736FC 8024227C 44810800 */ mtc1 $at, $f1 /* C73700 80242280 44800000 */ mtc1 $zero, $f0 -/* C73704 80242284 00000000 */ nop +/* C73704 80242284 00000000 */ nop /* C73708 80242288 4622003C */ c.lt.d $f0, $f2 -/* C7370C 8024228C 00000000 */ nop +/* C7370C 8024228C 00000000 */ nop /* C73710 80242290 4500000A */ bc1f .L802422BC -/* C73714 80242294 00000000 */ nop +/* C73714 80242294 00000000 */ nop .L80242298: /* C73718 80242298 3C018024 */ lui $at, %hi(D_80245638) /* C7371C 8024229C D4225638 */ ldc1 $f2, %lo(D_80245638)($at) /* C73720 802422A0 46003187 */ neg.s $f6, $f6 /* C73724 802422A4 46003021 */ cvt.d.s $f0, $f6 /* C73728 802422A8 46220002 */ mul.d $f0, $f0, $f2 -/* C7372C 802422AC 00000000 */ nop +/* C7372C 802422AC 00000000 */ nop /* C73730 802422B0 46202000 */ add.d $f0, $f4, $f0 .L802422B4: /* C73734 802422B4 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802422F8_C73778.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802422F8_C73778.s index 3956df9a6c..e8341cd2aa 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802422F8_C73778.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802422F8_C73778.s @@ -16,7 +16,7 @@ glabel func_802422F8_C73778 /* C737A4 80242324 A462008E */ sh $v0, 0x8e($v1) /* C737A8 80242328 00021400 */ sll $v0, $v0, 0x10 /* C737AC 8024232C 1C400004 */ bgtz $v0, .L80242340 -/* C737B0 80242330 00000000 */ nop +/* C737B0 80242330 00000000 */ nop /* C737B4 80242334 AE000074 */ sw $zero, 0x74($s0) /* C737B8 80242338 A460008E */ sh $zero, 0x8e($v1) /* C737BC 8024233C AE200070 */ sw $zero, 0x70($s1) diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s index b664349a5e..0dc5abbb5e 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s @@ -55,7 +55,7 @@ glabel func_80242354_C737D4 /* C73898 80242418 8E4300B0 */ lw $v1, 0xb0($s2) /* C7389C 8024241C 30620004 */ andi $v0, $v1, 4 /* C738A0 80242420 10400007 */ beqz $v0, .L80242440 -/* C738A4 80242424 00000000 */ nop +/* C738A4 80242424 00000000 */ nop /* C738A8 80242428 824200B4 */ lb $v0, 0xb4($s2) /* C738AC 8024242C 1440003A */ bnez $v0, .L80242518 /* C738B0 80242430 0000102D */ daddu $v0, $zero, $zero @@ -67,56 +67,66 @@ glabel func_80242354_C737D4 /* C738C4 80242444 2C620015 */ sltiu $v0, $v1, 0x15 /* C738C8 80242448 10400032 */ beqz $v0, .L80242514 /* C738CC 8024244C 00031080 */ sll $v0, $v1, 2 -/* C738D0 80242450 3C018024 */ lui $at, %hi(D_80245640) +/* C738D0 80242450 3C018024 */ lui $at, %hi(jtbl_80245640_C76AC0) /* C738D4 80242454 00220821 */ addu $at, $at, $v0 -/* C738D8 80242458 8C225640 */ lw $v0, %lo(D_80245640)($at) +/* C738D8 80242458 8C225640 */ lw $v0, %lo(jtbl_80245640_C76AC0)($at) /* C738DC 8024245C 00400008 */ jr $v0 -/* C738E0 80242460 00000000 */ nop +/* C738E0 80242460 00000000 */ nop +glabel L80242464_C738E4 /* C738E4 80242464 0280202D */ daddu $a0, $s4, $zero /* C738E8 80242468 0200282D */ daddu $a1, $s0, $zero /* C738EC 8024246C 0C090294 */ jal func_80240A50_C71ED0 /* C738F0 80242470 0260302D */ daddu $a2, $s3, $zero +glabel L80242474_C738F4 /* C738F4 80242474 0280202D */ daddu $a0, $s4, $zero /* C738F8 80242478 0200282D */ daddu $a1, $s0, $zero /* C738FC 8024247C 0C090300 */ jal func_80240C00_C72080 /* C73900 80242480 0260302D */ daddu $a2, $s3, $zero /* C73904 80242484 08090946 */ j .L80242518 /* C73908 80242488 0000102D */ daddu $v0, $zero, $zero +glabel L8024248C_C7390C /* C7390C 8024248C 0280202D */ daddu $a0, $s4, $zero /* C73910 80242490 0200282D */ daddu $a1, $s0, $zero /* C73914 80242494 0C09048A */ jal kzn_08_UnkNpcAIFunc1 /* C73918 80242498 0260302D */ daddu $a2, $s3, $zero +glabel L8024249C_C7391C /* C7391C 8024249C 0280202D */ daddu $a0, $s4, $zero /* C73920 802424A0 0200282D */ daddu $a1, $s0, $zero /* C73924 802424A4 0C0904BA */ jal func_802412E8_C72768 /* C73928 802424A8 0260302D */ daddu $a2, $s3, $zero /* C7392C 802424AC 08090946 */ j .L80242518 /* C73930 802424B0 0000102D */ daddu $v0, $zero, $zero +glabel L802424B4_C73934 /* C73934 802424B4 0280202D */ daddu $a0, $s4, $zero /* C73938 802424B8 0200282D */ daddu $a1, $s0, $zero /* C7393C 802424BC 0C09058B */ jal kzn_08_UnkNpcAIFunc2 /* C73940 802424C0 0260302D */ daddu $a2, $s3, $zero +glabel L802424C4_C73944 /* C73944 802424C4 0280202D */ daddu $a0, $s4, $zero /* C73948 802424C8 0200282D */ daddu $a1, $s0, $zero /* C7394C 802424CC 0C0905A9 */ jal func_802416A4_C72B24 /* C73950 802424D0 0260302D */ daddu $a2, $s3, $zero /* C73954 802424D4 08090946 */ j .L80242518 /* C73958 802424D8 0000102D */ daddu $v0, $zero, $zero +glabel L802424DC_C7395C /* C7395C 802424DC 0280202D */ daddu $a0, $s4, $zero /* C73960 802424E0 0200282D */ daddu $a1, $s0, $zero /* C73964 802424E4 0C0907D2 */ jal func_80241F48_C733C8 /* C73968 802424E8 0260302D */ daddu $a2, $s3, $zero +glabel L802424EC_C7396C /* C7396C 802424EC 0280202D */ daddu $a0, $s4, $zero /* C73970 802424F0 0200282D */ daddu $a1, $s0, $zero /* C73974 802424F4 0C09081E */ jal func_80242078_C734F8 /* C73978 802424F8 0260302D */ daddu $a2, $s3, $zero /* C7397C 802424FC 08090946 */ j .L80242518 /* C73980 80242500 0000102D */ daddu $v0, $zero, $zero +glabel L80242504_C73984 /* C73984 80242504 0280202D */ daddu $a0, $s4, $zero /* C73988 80242508 0200282D */ daddu $a1, $s0, $zero /* C7398C 8024250C 0C0908BE */ jal func_802422F8_C73778 /* C73990 80242510 0260302D */ daddu $a2, $s3, $zero .L80242514: +glabel L80242514_C73994 /* C73994 80242514 0000102D */ daddu $v0, $zero, $zero .L80242518: /* C73998 80242518 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242744_C73BC4.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242744_C73BC4.s index 0ed7125a2d..b782f5e5fe 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242744_C73BC4.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242744_C73BC4.s @@ -42,7 +42,7 @@ glabel func_80242744_C73BC4 /* C73C58 802427D8 C6620074 */ lwc1 $f2, 0x74($s3) /* C73C5C 802427DC 468010A0 */ cvt.s.w $f2, $f2 /* C73C60 802427E0 4600103C */ c.lt.s $f2, $f0 -/* C73C64 802427E4 00000000 */ nop +/* C73C64 802427E4 00000000 */ nop /* C73C68 802427E8 45030001 */ bc1tl .L802427F0 /* C73C6C 802427EC 0000882D */ daddu $s1, $zero, $zero .L802427F0: @@ -51,16 +51,16 @@ glabel func_80242744_C73BC4 /* C73C78 802427F8 3C014387 */ lui $at, 0x4387 /* C73C7C 802427FC 4481A000 */ mtc1 $at, $f20 /* C73C80 80242800 0C00A70A */ jal get_clamped_angle_diff -/* C73C84 80242804 00000000 */ nop +/* C73C84 80242804 00000000 */ nop /* C73C88 80242808 0C00A6C9 */ jal clamp_angle /* C73C8C 8024280C 46000306 */ mov.s $f12, $f0 /* C73C90 80242810 3C018024 */ lui $at, %hi(D_80245698) /* C73C94 80242814 D4225698 */ ldc1 $f2, %lo(D_80245698)($at) /* C73C98 80242818 46000021 */ cvt.d.s $f0, $f0 /* C73C9C 8024281C 4622003C */ c.lt.d $f0, $f2 -/* C73CA0 80242820 00000000 */ nop +/* C73CA0 80242820 00000000 */ nop /* C73CA4 80242824 45000003 */ bc1f .L80242834 -/* C73CA8 80242828 00000000 */ nop +/* C73CA8 80242828 00000000 */ nop /* C73CAC 8024282C 3C0142B4 */ lui $at, 0x42b4 /* C73CB0 80242830 4481A000 */ mtc1 $at, $f20 .L80242834: @@ -77,7 +77,7 @@ glabel func_80242744_C73BC4 /* C73CDC 8024285C 468010A0 */ cvt.s.w $f2, $f2 /* C73CE0 80242860 46000005 */ abs.s $f0, $f0 /* C73CE4 80242864 4600103C */ c.lt.s $f2, $f0 -/* C73CE8 80242868 00000000 */ nop +/* C73CE8 80242868 00000000 */ nop /* C73CEC 8024286C 45030001 */ bc1tl .L80242874 /* C73CF0 80242870 0000882D */ daddu $s1, $zero, $zero .L80242874: @@ -87,13 +87,13 @@ glabel func_80242744_C73BC4 /* C73D00 80242880 860200A8 */ lh $v0, 0xa8($s0) /* C73D04 80242884 46020001 */ sub.s $f0, $f0, $f2 /* C73D08 80242888 44821000 */ mtc1 $v0, $f2 -/* C73D0C 8024288C 00000000 */ nop +/* C73D0C 8024288C 00000000 */ nop /* C73D10 80242890 468010A1 */ cvt.d.w $f2, $f2 /* C73D14 80242894 46221080 */ add.d $f2, $f2, $f2 /* C73D18 80242898 46000005 */ abs.s $f0, $f0 /* C73D1C 8024289C 46000021 */ cvt.d.s $f0, $f0 /* C73D20 802428A0 4620103E */ c.le.d $f2, $f0 -/* C73D24 802428A4 00000000 */ nop +/* C73D24 802428A4 00000000 */ nop /* C73D28 802428A8 45030001 */ bc1tl .L802428B0 /* C73D2C 802428AC 0000882D */ daddu $s1, $zero, $zero .L802428B0: diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802428F8_C73D78.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802428F8_C73D78.s index 343291d368..b602ad41d7 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802428F8_C73D78.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802428F8_C73D78.s @@ -19,7 +19,7 @@ glabel func_802428F8_C73D78 /* C73DB0 80242930 8E2200B0 */ lw $v0, 0xb0($s1) /* C73DB4 80242934 30420004 */ andi $v0, $v0, 4 /* C73DB8 80242938 10400015 */ beqz $v0, .L80242990 -/* C73DBC 8024293C 00000000 */ nop +/* C73DBC 8024293C 00000000 */ nop .L80242940: /* C73DC0 80242940 AE800070 */ sw $zero, 0x70($s4) /* C73DC4 80242944 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel func_802428F8_C73D78 /* C73E14 80242994 12600005 */ beqz $s3, .L802429AC /* C73E18 80242998 24020001 */ addiu $v0, $zero, 1 /* C73E1C 8024299C 12620048 */ beq $s3, $v0, .L80242AC0 -/* C73E20 802429A0 00000000 */ nop +/* C73E20 802429A0 00000000 */ nop /* C73E24 802429A4 08090ACD */ j .L80242B34 -/* C73E28 802429A8 00000000 */ nop +/* C73E28 802429A8 00000000 */ nop .L802429AC: /* C73E2C 802429AC 86240008 */ lh $a0, 8($s1) /* C73E30 802429B0 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel func_802428F8_C73D78 /* C73E50 802429D0 8E03006C */ lw $v1, 0x6c($s0) /* C73E54 802429D4 24020003 */ addiu $v0, $zero, 3 /* C73E58 802429D8 14620056 */ bne $v1, $v0, .L80242B34 -/* C73E5C 802429DC 00000000 */ nop +/* C73E5C 802429DC 00000000 */ nop /* C73E60 802429E0 8E2500A8 */ lw $a1, 0xa8($s1) /* C73E64 802429E4 10A00003 */ beqz $a1, .L802429F4 /* C73E68 802429E8 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel func_802428F8_C73D78 /* C73EE0 80242A60 C7A20014 */ lwc1 $f2, 0x14($sp) /* C73EE4 80242A64 4600020D */ trunc.w.s $f8, $f0 /* C73EE8 80242A68 44024000 */ mfc1 $v0, $f8 -/* C73EEC 80242A6C 00000000 */ nop +/* C73EEC 80242A6C 00000000 */ nop /* C73EF0 80242A70 A6220012 */ sh $v0, 0x12($s1) /* C73EF4 80242A74 4600120D */ trunc.w.s $f8, $f2 /* C73EF8 80242A78 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s index e93ff16833..2c7909f5f4 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s @@ -100,78 +100,93 @@ glabel func_80242B58_C73FD8 /* C7413C 80242CBC 2C620064 */ sltiu $v0, $v1, 0x64 /* C74140 80242CC0 10400048 */ beqz $v0, .L80242DE4 /* C74144 80242CC4 00031080 */ sll $v0, $v1, 2 -/* C74148 80242CC8 3C018024 */ lui $at, %hi(D_802456A0) +/* C74148 80242CC8 3C018024 */ lui $at, %hi(jtbl_802456A0_C76B20) /* C7414C 80242CCC 00220821 */ addu $at, $at, $v0 -/* C74150 80242CD0 8C2256A0 */ lw $v0, %lo(D_802456A0)($at) +/* C74150 80242CD0 8C2256A0 */ lw $v0, %lo(jtbl_802456A0_C76B20)($at) /* C74154 80242CD4 00400008 */ jr $v0 /* C74158 80242CD8 00000000 */ nop +glabel L80242CDC_C7415C /* C7415C 80242CDC 0240202D */ daddu $a0, $s2, $zero /* C74160 80242CE0 0260282D */ daddu $a1, $s3, $zero /* C74164 80242CE4 0C012568 */ jal func_800495A0 /* C74168 80242CE8 0280302D */ daddu $a2, $s4, $zero +glabel L80242CEC_C7416C /* C7416C 80242CEC 0240202D */ daddu $a0, $s2, $zero /* C74170 80242CF0 0260282D */ daddu $a1, $s3, $zero /* C74174 80242CF4 0C0125AE */ jal func_800496B8 /* C74178 80242CF8 0280302D */ daddu $a2, $s4, $zero /* C7417C 80242CFC 08090B79 */ j .L80242DE4 /* C74180 80242D00 00000000 */ nop +glabel L80242D04_C74184 /* C74184 80242D04 0240202D */ daddu $a0, $s2, $zero /* C74188 80242D08 0260282D */ daddu $a1, $s3, $zero /* C7418C 80242D0C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C74190 80242D10 0280302D */ daddu $a2, $s4, $zero +glabel L80242D14_C74194 /* C74194 80242D14 0240202D */ daddu $a0, $s2, $zero /* C74198 80242D18 0260282D */ daddu $a1, $s3, $zero /* C7419C 80242D1C 0C012701 */ jal func_80049C04 /* C741A0 80242D20 0280302D */ daddu $a2, $s4, $zero /* C741A4 80242D24 08090B79 */ j .L80242DE4 /* C741A8 80242D28 00000000 */ nop +glabel L80242D2C_C741AC /* C741AC 80242D2C 0240202D */ daddu $a0, $s2, $zero /* C741B0 80242D30 0260282D */ daddu $a1, $s3, $zero /* C741B4 80242D34 0C01278F */ jal func_80049E3C /* C741B8 80242D38 0280302D */ daddu $a2, $s4, $zero +glabel L80242D3C_C741BC /* C741BC 80242D3C 0240202D */ daddu $a0, $s2, $zero /* C741C0 80242D40 0260282D */ daddu $a1, $s3, $zero /* C741C4 80242D44 0C0127B3 */ jal func_80049ECC /* C741C8 80242D48 0280302D */ daddu $a2, $s4, $zero /* C741CC 80242D4C 08090B79 */ j .L80242DE4 /* C741D0 80242D50 00000000 */ nop +glabel L80242D54_C741D4 /* C741D4 80242D54 0240202D */ daddu $a0, $s2, $zero /* C741D8 80242D58 0260282D */ daddu $a1, $s3, $zero /* C741DC 80242D5C 0C0127DF */ jal func_80049F7C /* C741E0 80242D60 0280302D */ daddu $a2, $s4, $zero +glabel L80242D64_C741E4 /* C741E4 80242D64 0240202D */ daddu $a0, $s2, $zero /* C741E8 80242D68 0260282D */ daddu $a1, $s3, $zero /* C741EC 80242D6C 0C012849 */ jal func_8004A124 /* C741F0 80242D70 0280302D */ daddu $a2, $s4, $zero /* C741F4 80242D74 08090B79 */ j .L80242DE4 /* C741F8 80242D78 00000000 */ nop +glabel L80242D7C_C741FC /* C741FC 80242D7C 0240202D */ daddu $a0, $s2, $zero /* C74200 80242D80 0260282D */ daddu $a1, $s3, $zero /* C74204 80242D84 0C0128FA */ jal func_8004A3E8 /* C74208 80242D88 0280302D */ daddu $a2, $s4, $zero /* C7420C 80242D8C 08090B79 */ j .L80242DE4 /* C74210 80242D90 00000000 */ nop +glabel L80242D94_C74214 /* C74214 80242D94 0C09094F */ jal kzn_08_UnkNpcAIFunc6 /* C74218 80242D98 0240202D */ daddu $a0, $s2, $zero +glabel L80242D9C_C7421C /* C7421C 80242D9C 0C09096A */ jal kzn_08_UnkNpcAIFunc7 /* C74220 80242DA0 0240202D */ daddu $a0, $s2, $zero /* C74224 80242DA4 8E430070 */ lw $v1, 0x70($s2) /* C74228 80242DA8 24020020 */ addiu $v0, $zero, 0x20 /* C7422C 80242DAC 1462000D */ bne $v1, $v0, .L80242DE4 /* C74230 80242DB0 00000000 */ nop +glabel L80242DB4_C74234 /* C74234 80242DB4 0C090986 */ jal kzn_08_UnkNpcAIFunc8 /* C74238 80242DB8 0240202D */ daddu $a0, $s2, $zero /* C7423C 80242DBC 8E430070 */ lw $v1, 0x70($s2) /* C74240 80242DC0 24020021 */ addiu $v0, $zero, 0x21 /* C74244 80242DC4 14620007 */ bne $v1, $v0, .L80242DE4 /* C74248 80242DC8 00000000 */ nop +glabel L80242DCC_C7424C /* C7424C 80242DCC 0C0909BC */ jal kzn_08_UnkNpcAIFunc5 /* C74250 80242DD0 0240202D */ daddu $a0, $s2, $zero /* C74254 80242DD4 08090B79 */ j .L80242DE4 /* C74258 80242DD8 00000000 */ nop +glabel L80242DDC_C7425C /* C7425C 80242DDC 0C0129CF */ jal func_8004A73C /* C74260 80242DE0 0240202D */ daddu $a0, $s2, $zero .L80242DE4: +glabel L80242DE4_C74264 /* C74264 80242DE4 8FBF0048 */ lw $ra, 0x48($sp) /* C74268 80242DE8 8FB50044 */ lw $s5, 0x44($sp) /* C7426C 80242DEC 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242E78_C742F8.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242E78_C742F8.s index 5abbd7af75..251e4780d9 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242E78_C742F8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242E78_C742F8.s @@ -38,7 +38,7 @@ glabel func_80242E78_C742F8 /* C7437C 80242EFC 3C01C1A0 */ lui $at, 0xc1a0 /* C74380 80242F00 44812000 */ mtc1 $at, $f4 /* C74384 80242F04 44833000 */ mtc1 $v1, $f6 -/* C74388 80242F08 00000000 */ nop +/* C74388 80242F08 00000000 */ nop /* C7438C 80242F0C 468031A0 */ cvt.s.w $f6, $f6 /* C74390 80242F10 44073000 */ mfc1 $a3, $f6 /* C74394 80242F14 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242F74_C743F4.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242F74_C743F4.s index 797489a619..b21657d408 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242F74_C743F4.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242F74_C743F4.s @@ -39,18 +39,18 @@ glabel func_80242F74_C743F4 .L80242FFC: /* C7447C 80242FFC 8622008E */ lh $v0, 0x8e($s1) /* C74480 80243000 1440025D */ bnez $v0, .L80243978 -/* C74484 80243004 00000000 */ nop +/* C74484 80243004 00000000 */ nop /* C74488 80243008 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C7448C 8024300C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* C74490 80243010 0C00A6C9 */ jal clamp_angle /* C74494 80243014 C44C00A8 */ lwc1 $f12, 0xa8($v0) /* C74498 80243018 3C014334 */ lui $at, 0x4334 /* C7449C 8024301C 44811000 */ mtc1 $at, $f2 -/* C744A0 80243020 00000000 */ nop +/* C744A0 80243020 00000000 */ nop /* C744A4 80243024 4602003C */ c.lt.s $f0, $f2 -/* C744A8 80243028 00000000 */ nop +/* C744A8 80243028 00000000 */ nop /* C744AC 8024302C 45000011 */ bc1f .L80243074 -/* C744B0 80243030 00000000 */ nop +/* C744B0 80243030 00000000 */ nop /* C744B4 80243034 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* C744B8 80243038 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* C744BC 8024303C 3C0142B4 */ lui $at, 0x42b4 @@ -85,7 +85,7 @@ glabel func_80242F74_C743F4 /* C7452C 802430AC 460C0300 */ add.s $f12, $f0, $f12 .L802430B0: /* C74530 802430B0 0C00A6C9 */ jal clamp_angle -/* C74534 802430B4 00000000 */ nop +/* C74534 802430B4 00000000 */ nop /* C74538 802430B8 46000586 */ mov.s $f22, $f0 /* C7453C 802430BC 3C014334 */ lui $at, 0x4334 /* C74540 802430C0 44816000 */ mtc1 $at, $f12 @@ -134,7 +134,7 @@ glabel func_80242F74_C743F4 /* C745DC 8024315C 862200A6 */ lh $v0, 0xa6($s1) /* C745E0 80243160 8EA30000 */ lw $v1, ($s5) /* C745E4 80243164 44824000 */ mtc1 $v0, $f8 -/* C745E8 80243168 00000000 */ nop +/* C745E8 80243168 00000000 */ nop /* C745EC 8024316C 46804220 */ cvt.s.w $f8, $f8 /* C745F0 80243170 C4600028 */ lwc1 $f0, 0x28($v1) /* C745F4 80243174 44064000 */ mfc1 $a2, $f8 @@ -146,7 +146,7 @@ glabel func_80242F74_C743F4 /* C7460C 8024318C E6200040 */ swc1 $f0, 0x40($s1) /* C74610 80243190 862200A6 */ lh $v0, 0xa6($s1) /* C74614 80243194 44820000 */ mtc1 $v0, $f0 -/* C74618 80243198 00000000 */ nop +/* C74618 80243198 00000000 */ nop /* C7461C 8024319C 46800020 */ cvt.s.w $f0, $f0 /* C74620 802431A0 4600A000 */ add.s $f0, $f20, $f0 /* C74624 802431A4 4406B000 */ mfc1 $a2, $f22 @@ -155,18 +155,18 @@ glabel func_80242F74_C743F4 /* C74630 802431B0 0220202D */ daddu $a0, $s1, $zero /* C74634 802431B4 8EC20088 */ lw $v0, 0x88($s6) /* C74638 802431B8 1440005D */ bnez $v0, .L80243330 -/* C7463C 802431BC 00000000 */ nop +/* C7463C 802431BC 00000000 */ nop /* C74640 802431C0 C6200038 */ lwc1 $f0, 0x38($s1) /* C74644 802431C4 3C018024 */ lui $at, %hi(D_80245830) /* C74648 802431C8 D4245830 */ ldc1 $f4, %lo(D_80245830)($at) /* C7464C 802431CC 46000021 */ cvt.d.s $f0, $f0 /* C74650 802431D0 4620203C */ c.lt.d $f4, $f0 -/* C74654 802431D4 00000000 */ nop +/* C74654 802431D4 00000000 */ nop /* C74658 802431D8 45000005 */ bc1f .L802431F0 -/* C7465C 802431DC 00000000 */ nop +/* C7465C 802431DC 00000000 */ nop /* C74660 802431E0 3C0143BE */ lui $at, 0x43be /* C74664 802431E4 44810000 */ mtc1 $at, $f0 -/* C74668 802431E8 00000000 */ nop +/* C74668 802431E8 00000000 */ nop /* C7466C 802431EC E6200038 */ swc1 $f0, 0x38($s1) .L802431F0: /* C74670 802431F0 C6200038 */ lwc1 $f0, 0x38($s1) @@ -174,50 +174,50 @@ glabel func_80242F74_C743F4 /* C74678 802431F8 D4225838 */ ldc1 $f2, %lo(D_80245838)($at) /* C7467C 802431FC 46000021 */ cvt.d.s $f0, $f0 /* C74680 80243200 4622003C */ c.lt.d $f0, $f2 -/* C74684 80243204 00000000 */ nop +/* C74684 80243204 00000000 */ nop /* C74688 80243208 45000005 */ bc1f .L80243220 -/* C7468C 8024320C 00000000 */ nop +/* C7468C 8024320C 00000000 */ nop /* C74690 80243210 3C01C3BE */ lui $at, 0xc3be /* C74694 80243214 44810000 */ mtc1 $at, $f0 -/* C74698 80243218 00000000 */ nop +/* C74698 80243218 00000000 */ nop /* C7469C 8024321C E6200038 */ swc1 $f0, 0x38($s1) .L80243220: /* C746A0 80243220 C6200040 */ lwc1 $f0, 0x40($s1) /* C746A4 80243224 46000021 */ cvt.d.s $f0, $f0 /* C746A8 80243228 4620203C */ c.lt.d $f4, $f0 -/* C746AC 8024322C 00000000 */ nop +/* C746AC 8024322C 00000000 */ nop /* C746B0 80243230 45000005 */ bc1f .L80243248 -/* C746B4 80243234 00000000 */ nop +/* C746B4 80243234 00000000 */ nop /* C746B8 80243238 3C0143BE */ lui $at, 0x43be /* C746BC 8024323C 44810000 */ mtc1 $at, $f0 -/* C746C0 80243240 00000000 */ nop +/* C746C0 80243240 00000000 */ nop /* C746C4 80243244 E6200040 */ swc1 $f0, 0x40($s1) .L80243248: /* C746C8 80243248 C6200040 */ lwc1 $f0, 0x40($s1) /* C746CC 8024324C 46000021 */ cvt.d.s $f0, $f0 /* C746D0 80243250 4622003C */ c.lt.d $f0, $f2 -/* C746D4 80243254 00000000 */ nop +/* C746D4 80243254 00000000 */ nop /* C746D8 80243258 45000005 */ bc1f .L80243270 -/* C746DC 8024325C 00000000 */ nop +/* C746DC 8024325C 00000000 */ nop /* C746E0 80243260 3C01C3BE */ lui $at, 0xc3be /* C746E4 80243264 44810000 */ mtc1 $at, $f0 -/* C746E8 80243268 00000000 */ nop +/* C746E8 80243268 00000000 */ nop /* C746EC 8024326C E6200040 */ swc1 $f0, 0x40($s1) .L80243270: /* C746F0 80243270 C6220038 */ lwc1 $f2, 0x38($s1) /* C746F4 80243274 46021082 */ mul.s $f2, $f2, $f2 -/* C746F8 80243278 00000000 */ nop +/* C746F8 80243278 00000000 */ nop /* C746FC 8024327C C6200040 */ lwc1 $f0, 0x40($s1) /* C74700 80243280 46000002 */ mul.s $f0, $f0, $f0 -/* C74704 80243284 00000000 */ nop +/* C74704 80243284 00000000 */ nop /* C74708 80243288 46001300 */ add.s $f12, $f2, $f0 /* C7470C 8024328C 46006004 */ sqrt.s $f0, $f12 /* C74710 80243290 46000032 */ c.eq.s $f0, $f0 -/* C74714 80243294 00000000 */ nop +/* C74714 80243294 00000000 */ nop /* C74718 80243298 45010003 */ bc1t .L802432A8 -/* C7471C 8024329C 00000000 */ nop +/* C7471C 8024329C 00000000 */ nop /* C74720 802432A0 0C0187BC */ jal sqrtf -/* C74724 802432A4 00000000 */ nop +/* C74724 802432A4 00000000 */ nop .L802432A8: /* C74728 802432A8 8E260038 */ lw $a2, 0x38($s1) /* C7472C 802432AC 8E270040 */ lw $a3, 0x40($s1) @@ -232,7 +232,7 @@ glabel func_80242F74_C743F4 /* C74750 802432D0 D4205840 */ ldc1 $f0, %lo(D_80245840)($at) /* C74754 802432D4 460010A1 */ cvt.d.s $f2, $f2 /* C74758 802432D8 4620103C */ c.lt.d $f2, $f0 -/* C7475C 802432DC 00000000 */ nop +/* C7475C 802432DC 00000000 */ nop /* C74760 802432E0 45000004 */ bc1f .L802432F4 /* C74764 802432E4 0200202D */ daddu $a0, $s0, $zero /* C74768 802432E8 3C064398 */ lui $a2, 0x4398 @@ -242,9 +242,9 @@ glabel func_80242F74_C743F4 /* C74774 802432F4 3C018024 */ lui $at, %hi(D_80245848) /* C74778 802432F8 D4205848 */ ldc1 $f0, %lo(D_80245848)($at) /* C7477C 802432FC 4622003C */ c.lt.d $f0, $f2 -/* C74780 80243300 00000000 */ nop +/* C74780 80243300 00000000 */ nop /* C74784 80243304 450000FA */ bc1f .L802436F0 -/* C74788 80243308 00000000 */ nop +/* C74788 80243308 00000000 */ nop /* C7478C 8024330C 3C0643BB */ lui $a2, 0x43bb /* C74790 80243310 34C68000 */ ori $a2, $a2, 0x8000 .L80243314: @@ -254,7 +254,7 @@ glabel func_80242F74_C743F4 /* C747A0 80243320 0C00A7E7 */ jal add_vec2D_polar /* C747A4 80243324 E6340040 */ swc1 $f20, 0x40($s1) /* C747A8 80243328 08090DBC */ j .L802436F0 -/* C747AC 8024332C 00000000 */ nop +/* C747AC 8024332C 00000000 */ nop .L80243330: /* C747B0 80243330 8E220000 */ lw $v0, ($s1) /* C747B4 80243334 30420040 */ andi $v0, $v0, 0x40 @@ -281,13 +281,13 @@ glabel func_80242F74_C743F4 /* C74808 80243388 862200A8 */ lh $v0, 0xa8($s1) /* C7480C 8024338C 0260302D */ daddu $a2, $s3, $zero /* C74810 80243390 44820000 */ mtc1 $v0, $f0 -/* C74814 80243394 00000000 */ nop +/* C74814 80243394 00000000 */ nop /* C74818 80243398 46800020 */ cvt.s.w $f0, $f0 /* C7481C 8024339C E7A00018 */ swc1 $f0, 0x18($sp) /* C74820 802433A0 862200A6 */ lh $v0, 0xa6($s1) /* C74824 802433A4 27B00028 */ addiu $s0, $sp, 0x28 /* C74828 802433A8 44820000 */ mtc1 $v0, $f0 -/* C7482C 802433AC 00000000 */ nop +/* C7482C 802433AC 00000000 */ nop /* C74830 802433B0 46800020 */ cvt.s.w $f0, $f0 /* C74834 802433B4 E7A0001C */ swc1 $f0, 0x1c($sp) /* C74838 802433B8 8E240080 */ lw $a0, 0x80($s1) @@ -311,13 +311,13 @@ glabel func_80242F74_C743F4 /* C74880 80243400 E7B60014 */ swc1 $f22, 0x14($sp) /* C74884 80243404 862200A8 */ lh $v0, 0xa8($s1) /* C74888 80243408 44820000 */ mtc1 $v0, $f0 -/* C7488C 8024340C 00000000 */ nop +/* C7488C 8024340C 00000000 */ nop /* C74890 80243410 46800020 */ cvt.s.w $f0, $f0 /* C74894 80243414 E7A00018 */ swc1 $f0, 0x18($sp) /* C74898 80243418 862200A6 */ lh $v0, 0xa6($s1) /* C7489C 8024341C 0260302D */ daddu $a2, $s3, $zero /* C748A0 80243420 44820000 */ mtc1 $v0, $f0 -/* C748A4 80243424 00000000 */ nop +/* C748A4 80243424 00000000 */ nop /* C748A8 80243428 46800020 */ cvt.s.w $f0, $f0 /* C748AC 8024342C E7A0001C */ swc1 $f0, 0x1c($sp) /* C748B0 80243430 8E240080 */ lw $a0, 0x80($s1) @@ -347,32 +347,32 @@ glabel func_80242F74_C743F4 /* C74910 80243490 0C0372DF */ jal func_800DCB7C /* C74914 80243494 0040802D */ daddu $s0, $v0, $zero /* C74918 80243498 1600001C */ bnez $s0, .L8024350C -/* C7491C 8024349C 00000000 */ nop +/* C7491C 8024349C 00000000 */ nop /* C74920 802434A0 1040001A */ beqz $v0, .L8024350C -/* C74924 802434A4 00000000 */ nop +/* C74924 802434A4 00000000 */ nop /* C74928 802434A8 C7A20038 */ lwc1 $f2, 0x38($sp) /* C7492C 802434AC 3C014054 */ lui $at, 0x4054 /* C74930 802434B0 44810800 */ mtc1 $at, $f1 /* C74934 802434B4 44800000 */ mtc1 $zero, $f0 /* C74938 802434B8 460010A1 */ cvt.d.s $f2, $f2 /* C7493C 802434BC 4622003C */ c.lt.d $f0, $f2 -/* C74940 802434C0 00000000 */ nop +/* C74940 802434C0 00000000 */ nop /* C74944 802434C4 45000011 */ bc1f .L8024350C -/* C74948 802434C8 00000000 */ nop +/* C74948 802434C8 00000000 */ nop /* C7494C 802434CC 3C01405E */ lui $at, 0x405e /* C74950 802434D0 44810800 */ mtc1 $at, $f1 /* C74954 802434D4 44800000 */ mtc1 $zero, $f0 -/* C74958 802434D8 00000000 */ nop +/* C74958 802434D8 00000000 */ nop /* C7495C 802434DC 4620103C */ c.lt.d $f2, $f0 -/* C74960 802434E0 00000000 */ nop +/* C74960 802434E0 00000000 */ nop /* C74964 802434E4 45000009 */ bc1f .L8024350C -/* C74968 802434E8 00000000 */ nop +/* C74968 802434E8 00000000 */ nop /* C7496C 802434EC C622003C */ lwc1 $f2, 0x3c($s1) /* C74970 802434F0 C7A00030 */ lwc1 $f0, 0x30($sp) /* C74974 802434F4 46001032 */ c.eq.s $f2, $f0 -/* C74978 802434F8 00000000 */ nop +/* C74978 802434F8 00000000 */ nop /* C7497C 802434FC 45010003 */ bc1t .L8024350C -/* C74980 80243500 00000000 */ nop +/* C74980 80243500 00000000 */ nop /* C74984 80243504 08090DBC */ j .L802436F0 /* C74988 80243508 241E0001 */ addiu $fp, $zero, 1 .L8024350C: @@ -396,13 +396,13 @@ glabel func_80242F74_C743F4 /* C749D0 80243550 862200A8 */ lh $v0, 0xa8($s1) /* C749D4 80243554 27A50020 */ addiu $a1, $sp, 0x20 /* C749D8 80243558 44820000 */ mtc1 $v0, $f0 -/* C749DC 8024355C 00000000 */ nop +/* C749DC 8024355C 00000000 */ nop /* C749E0 80243560 46800020 */ cvt.s.w $f0, $f0 /* C749E4 80243564 E7A00018 */ swc1 $f0, 0x18($sp) /* C749E8 80243568 862200A6 */ lh $v0, 0xa6($s1) /* C749EC 8024356C 27A60024 */ addiu $a2, $sp, 0x24 /* C749F0 80243570 44820000 */ mtc1 $v0, $f0 -/* C749F4 80243574 00000000 */ nop +/* C749F4 80243574 00000000 */ nop /* C749F8 80243578 46800020 */ cvt.s.w $f0, $f0 /* C749FC 8024357C E7A0001C */ swc1 $f0, 0x1c($sp) /* C74A00 80243580 8E240080 */ lw $a0, 0x80($s1) @@ -420,7 +420,7 @@ glabel func_80242F74_C743F4 /* C74A30 802435B0 862200A6 */ lh $v0, 0xa6($s1) /* C74A34 802435B4 4407C000 */ mfc1 $a3, $f24 /* C74A38 802435B8 44824000 */ mtc1 $v0, $f8 -/* C74A3C 802435BC 00000000 */ nop +/* C74A3C 802435BC 00000000 */ nop /* C74A40 802435C0 46804220 */ cvt.s.w $f8, $f8 /* C74A44 802435C4 C4600028 */ lwc1 $f0, 0x28($v1) /* C74A48 802435C8 44064000 */ mfc1 $a2, $f8 @@ -432,7 +432,7 @@ glabel func_80242F74_C743F4 /* C74A60 802435E0 E6200040 */ swc1 $f0, 0x40($s1) /* C74A64 802435E4 862200A6 */ lh $v0, 0xa6($s1) /* C74A68 802435E8 44820000 */ mtc1 $v0, $f0 -/* C74A6C 802435EC 00000000 */ nop +/* C74A6C 802435EC 00000000 */ nop /* C74A70 802435F0 46800020 */ cvt.s.w $f0, $f0 /* C74A74 802435F4 08090DB8 */ j .L802436E0 /* C74A78 802435F8 4600A500 */ add.s $f20, $f20, $f0 @@ -454,20 +454,20 @@ glabel func_80242F74_C743F4 /* C74AB4 80243634 E7B60014 */ swc1 $f22, 0x14($sp) /* C74AB8 80243638 862200A8 */ lh $v0, 0xa8($s1) /* C74ABC 8024363C 44820000 */ mtc1 $v0, $f0 -/* C74AC0 80243640 00000000 */ nop +/* C74AC0 80243640 00000000 */ nop /* C74AC4 80243644 46800020 */ cvt.s.w $f0, $f0 /* C74AC8 80243648 E7A00018 */ swc1 $f0, 0x18($sp) /* C74ACC 8024364C 862200A6 */ lh $v0, 0xa6($s1) /* C74AD0 80243650 27A60024 */ addiu $a2, $sp, 0x24 /* C74AD4 80243654 44820000 */ mtc1 $v0, $f0 -/* C74AD8 80243658 00000000 */ nop +/* C74AD8 80243658 00000000 */ nop /* C74ADC 8024365C 46800020 */ cvt.s.w $f0, $f0 /* C74AE0 80243660 E7A0001C */ swc1 $f0, 0x1c($sp) /* C74AE4 80243664 8E240080 */ lw $a0, 0x80($s1) /* C74AE8 80243668 0C037711 */ jal func_800DDC44 /* C74AEC 8024366C 27A70028 */ addiu $a3, $sp, 0x28 /* C74AF0 80243670 1040001F */ beqz $v0, .L802436F0 -/* C74AF4 80243674 00000000 */ nop +/* C74AF4 80243674 00000000 */ nop /* C74AF8 80243678 8FA60020 */ lw $a2, 0x20($sp) /* C74AFC 8024367C 8EA20000 */ lw $v0, ($s5) /* C74B00 80243680 8FA70028 */ lw $a3, 0x28($sp) @@ -479,7 +479,7 @@ glabel func_80242F74_C743F4 /* C74B18 80243698 862200A6 */ lh $v0, 0xa6($s1) /* C74B1C 8024369C 4407C000 */ mfc1 $a3, $f24 /* C74B20 802436A0 44824000 */ mtc1 $v0, $f8 -/* C74B24 802436A4 00000000 */ nop +/* C74B24 802436A4 00000000 */ nop /* C74B28 802436A8 46804220 */ cvt.s.w $f8, $f8 /* C74B2C 802436AC C4600028 */ lwc1 $f0, 0x28($v1) /* C74B30 802436B0 44064000 */ mfc1 $a2, $f8 @@ -491,7 +491,7 @@ glabel func_80242F74_C743F4 /* C74B48 802436C8 E6200040 */ swc1 $f0, 0x40($s1) /* C74B4C 802436CC 862200A6 */ lh $v0, 0xa6($s1) /* C74B50 802436D0 44820000 */ mtc1 $v0, $f0 -/* C74B54 802436D4 00000000 */ nop +/* C74B54 802436D4 00000000 */ nop /* C74B58 802436D8 46800020 */ cvt.s.w $f0, $f0 /* C74B5C 802436DC 4600A500 */ add.s $f20, $f20, $f0 .L802436E0: @@ -520,14 +520,14 @@ glabel func_80242F74_C743F4 /* C74BB4 80243734 0C0123F5 */ jal is_point_within_region /* C74BB8 80243738 26330040 */ addiu $s3, $s1, 0x40 /* C74BBC 8024373C 1040005A */ beqz $v0, .L802438A8 -/* C74BC0 80243740 00000000 */ nop +/* C74BC0 80243740 00000000 */ nop /* C74BC4 80243744 8E430004 */ lw $v1, 4($s2) /* C74BC8 80243748 10600005 */ beqz $v1, .L80243760 /* C74BCC 8024374C 24020001 */ addiu $v0, $zero, 1 /* C74BD0 80243750 10620029 */ beq $v1, $v0, .L802437F8 -/* C74BD4 80243754 00000000 */ nop +/* C74BD4 80243754 00000000 */ nop /* C74BD8 80243758 08090E2A */ j .L802438A8 -/* C74BDC 8024375C 00000000 */ nop +/* C74BDC 8024375C 00000000 */ nop .L80243760: /* C74BE0 80243760 C6480008 */ lwc1 $f8, 8($s2) /* C74BE4 80243764 46804220 */ cvt.s.w $f8, $f8 @@ -538,11 +538,11 @@ glabel func_80242F74_C743F4 /* C74BF8 80243778 C62E0040 */ lwc1 $f14, 0x40($s1) /* C74BFC 8024377C 44074000 */ mfc1 $a3, $f8 /* C74C00 80243780 0C00A7B5 */ jal dist2D -/* C74C04 80243784 00000000 */ nop +/* C74C04 80243784 00000000 */ nop /* C74C08 80243788 C6420010 */ lwc1 $f2, 0x10($s2) /* C74C0C 8024378C 468010A0 */ cvt.s.w $f2, $f2 /* C74C10 80243790 4600103C */ c.lt.s $f2, $f0 -/* C74C14 80243794 00000000 */ nop +/* C74C14 80243794 00000000 */ nop /* C74C18 80243798 45000043 */ bc1f .L802438A8 /* C74C1C 8024379C E7A00038 */ swc1 $f0, 0x38($sp) /* C74C20 802437A0 C64C0008 */ lwc1 $f12, 8($s2) @@ -566,17 +566,17 @@ glabel func_80242F74_C743F4 /* C74C68 802437E8 0C00A7E7 */ jal add_vec2D_polar /* C74C6C 802437EC 0260282D */ daddu $a1, $s3, $zero /* C74C70 802437F0 08090E2A */ j .L802438A8 -/* C74C74 802437F4 00000000 */ nop +/* C74C74 802437F4 00000000 */ nop .L802437F8: /* C74C78 802437F8 8E420008 */ lw $v0, 8($s2) /* C74C7C 802437FC 8E430010 */ lw $v1, 0x10($s2) /* C74C80 80243800 C6200038 */ lwc1 $f0, 0x38($s1) /* C74C84 80243804 00431021 */ addu $v0, $v0, $v1 /* C74C88 80243808 44821000 */ mtc1 $v0, $f2 -/* C74C8C 8024380C 00000000 */ nop +/* C74C8C 8024380C 00000000 */ nop /* C74C90 80243810 468010A0 */ cvt.s.w $f2, $f2 /* C74C94 80243814 4600103C */ c.lt.s $f2, $f0 -/* C74C98 80243818 00000000 */ nop +/* C74C98 80243818 00000000 */ nop /* C74C9C 8024381C 45030001 */ bc1tl .L80243824 /* C74CA0 80243820 E6220038 */ swc1 $f2, 0x38($s1) .L80243824: @@ -585,10 +585,10 @@ glabel func_80242F74_C743F4 /* C74CAC 8024382C C6200038 */ lwc1 $f0, 0x38($s1) /* C74CB0 80243830 00431023 */ subu $v0, $v0, $v1 /* C74CB4 80243834 44821000 */ mtc1 $v0, $f2 -/* C74CB8 80243838 00000000 */ nop +/* C74CB8 80243838 00000000 */ nop /* C74CBC 8024383C 468010A0 */ cvt.s.w $f2, $f2 /* C74CC0 80243840 4602003C */ c.lt.s $f0, $f2 -/* C74CC4 80243844 00000000 */ nop +/* C74CC4 80243844 00000000 */ nop /* C74CC8 80243848 45030001 */ bc1tl .L80243850 /* C74CCC 8024384C E6220038 */ swc1 $f2, 0x38($s1) .L80243850: @@ -597,10 +597,10 @@ glabel func_80242F74_C743F4 /* C74CD8 80243858 C6200040 */ lwc1 $f0, 0x40($s1) /* C74CDC 8024385C 00431021 */ addu $v0, $v0, $v1 /* C74CE0 80243860 44821000 */ mtc1 $v0, $f2 -/* C74CE4 80243864 00000000 */ nop +/* C74CE4 80243864 00000000 */ nop /* C74CE8 80243868 468010A0 */ cvt.s.w $f2, $f2 /* C74CEC 8024386C 4600103C */ c.lt.s $f2, $f0 -/* C74CF0 80243870 00000000 */ nop +/* C74CF0 80243870 00000000 */ nop /* C74CF4 80243874 45030001 */ bc1tl .L8024387C /* C74CF8 80243878 E6220040 */ swc1 $f2, 0x40($s1) .L8024387C: @@ -609,21 +609,21 @@ glabel func_80242F74_C743F4 /* C74D04 80243884 C6200040 */ lwc1 $f0, 0x40($s1) /* C74D08 80243888 00431023 */ subu $v0, $v0, $v1 /* C74D0C 8024388C 44821000 */ mtc1 $v0, $f2 -/* C74D10 80243890 00000000 */ nop +/* C74D10 80243890 00000000 */ nop /* C74D14 80243894 468010A0 */ cvt.s.w $f2, $f2 /* C74D18 80243898 4602003C */ c.lt.s $f0, $f2 -/* C74D1C 8024389C 00000000 */ nop +/* C74D1C 8024389C 00000000 */ nop /* C74D20 802438A0 45030001 */ bc1tl .L802438A8 /* C74D24 802438A4 E6220040 */ swc1 $f2, 0x40($s1) .L802438A8: /* C74D28 802438A8 16E0001F */ bnez $s7, .L80243928 -/* C74D2C 802438AC 00000000 */ nop +/* C74D2C 802438AC 00000000 */ nop /* C74D30 802438B0 8E220000 */ lw $v0, ($s1) /* C74D34 802438B4 30420008 */ andi $v0, $v0, 8 /* C74D38 802438B8 10400003 */ beqz $v0, .L802438C8 /* C74D3C 802438BC 27A50020 */ addiu $a1, $sp, 0x20 /* C74D40 802438C0 13C00019 */ beqz $fp, .L80243928 -/* C74D44 802438C4 00000000 */ nop +/* C74D44 802438C4 00000000 */ nop .L802438C8: /* C74D48 802438C8 27A60024 */ addiu $a2, $sp, 0x24 /* C74D4C 802438CC 27A20038 */ addiu $v0, $sp, 0x38 @@ -646,7 +646,7 @@ glabel func_80242F74_C743F4 /* C74D90 80243910 0C0372DF */ jal func_800DCB7C /* C74D94 80243914 27A70028 */ addiu $a3, $sp, 0x28 /* C74D98 80243918 10400003 */ beqz $v0, .L80243928 -/* C74D9C 8024391C 00000000 */ nop +/* C74D9C 8024391C 00000000 */ nop /* C74DA0 80243920 C7A00024 */ lwc1 $f0, 0x24($sp) /* C74DA4 80243924 E620003C */ swc1 $f0, 0x3c($s1) .L80243928: diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802439B4_C74E34.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802439B4_C74E34.s index 23dacd313e..2b543aab69 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802439B4_C74E34.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802439B4_C74E34.s @@ -27,7 +27,7 @@ glabel func_802439B4_C74E34 .L80243A0C: /* C74E8C 80243A0C 8482008E */ lh $v0, 0x8e($a0) /* C74E90 80243A10 14400007 */ bnez $v0, .L80243A30 -/* C74E94 80243A14 00000000 */ nop +/* C74E94 80243A14 00000000 */ nop /* C74E98 80243A18 8E0200CC */ lw $v0, 0xcc($s0) /* C74E9C 80243A1C 8C420028 */ lw $v0, 0x28($v0) /* C74EA0 80243A20 A480008E */ sh $zero, 0x8e($a0) diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243A44_C74EC4.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243A44_C74EC4.s index 3fbda8c828..bf74ee6c71 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243A44_C74EC4.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243A44_C74EC4.s @@ -18,7 +18,7 @@ glabel func_80243A44_C74EC4 /* C74EF8 80243A78 8E0300A0 */ lw $v1, 0xa0($s0) /* C74EFC 80243A7C 00021403 */ sra $v0, $v0, 0x10 /* C74F00 80243A80 14430004 */ bne $v0, $v1, .L80243A94 -/* C74F04 80243A84 00000000 */ nop +/* C74F04 80243A84 00000000 */ nop /* C74F08 80243A88 8E0200CC */ lw $v0, 0xcc($s0) /* C74F0C 80243A8C 8C42002C */ lw $v0, 0x2c($v0) /* C74F10 80243A90 ACA20028 */ sw $v0, 0x28($a1) @@ -47,7 +47,7 @@ glabel func_80243A44_C74EC4 /* C74F64 80243AE4 3C01C1A0 */ lui $at, 0xc1a0 /* C74F68 80243AE8 44812000 */ mtc1 $at, $f4 /* C74F6C 80243AEC 44833000 */ mtc1 $v1, $f6 -/* C74F70 80243AF0 00000000 */ nop +/* C74F70 80243AF0 00000000 */ nop /* C74F74 80243AF4 468031A0 */ cvt.s.w $f6, $f6 /* C74F78 80243AF8 8C420000 */ lw $v0, ($v0) /* C74F7C 80243AFC 44073000 */ mfc1 $a3, $f6 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243B44_C74FC4.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243B44_C74FC4.s index 479209c8a6..4d90ae7363 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243B44_C74FC4.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243B44_C74FC4.s @@ -16,7 +16,7 @@ glabel func_80243B44_C74FC4 /* C74FF0 80243B70 A462008E */ sh $v0, 0x8e($v1) /* C74FF4 80243B74 00021400 */ sll $v0, $v0, 0x10 /* C74FF8 80243B78 14400005 */ bnez $v0, .L80243B90 -/* C74FFC 80243B7C 00000000 */ nop +/* C74FFC 80243B7C 00000000 */ nop /* C75000 80243B80 960200AA */ lhu $v0, 0xaa($s0) /* C75004 80243B84 A462008E */ sh $v0, 0x8e($v1) /* C75008 80243B88 2402000E */ addiu $v0, $zero, 0xe diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243BA4_C75024.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243BA4_C75024.s index 0d3c01bb01..71935e89b4 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243BA4_C75024.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243BA4_C75024.s @@ -42,7 +42,7 @@ glabel func_80243BA4_C75024 /* C750B8 80243C38 2402000F */ addiu $v0, $zero, 0xf /* C750BC 80243C3C AFA2001C */ sw $v0, 0x1c($sp) /* C750C0 80243C40 44833000 */ mtc1 $v1, $f6 -/* C750C4 80243C44 00000000 */ nop +/* C750C4 80243C44 00000000 */ nop /* C750C8 80243C48 468031A0 */ cvt.s.w $f6, $f6 /* C750CC 80243C4C 44073000 */ mfc1 $a3, $f6 /* C750D0 80243C50 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243C90_C75110.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243C90_C75110.s index 17a97fc750..fdd7573e07 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243C90_C75110.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243C90_C75110.s @@ -46,7 +46,7 @@ glabel func_80243C90_C75110 /* C751B4 80243D34 8E2200B0 */ lw $v0, 0xb0($s1) /* C751B8 80243D38 30420004 */ andi $v0, $v0, 4 /* C751BC 80243D3C 10400011 */ beqz $v0, .L80243D84 -/* C751C0 80243D40 00000000 */ nop +/* C751C0 80243D40 00000000 */ nop .L80243D44: /* C751C4 80243D44 AE400070 */ sw $zero, 0x70($s2) /* C751C8 80243D48 A6A0008E */ sh $zero, 0x8e($s5) @@ -78,12 +78,12 @@ glabel func_80243C90_C75110 /* C7522C 80243DAC 10600013 */ beqz $v1, .L80243DFC /* C75230 80243DB0 0240202D */ daddu $a0, $s2, $zero /* C75234 80243DB4 08090FAE */ j .L80243EB8 -/* C75238 80243DB8 00000000 */ nop +/* C75238 80243DB8 00000000 */ nop .L80243DBC: /* C7523C 80243DBC 10620018 */ beq $v1, $v0, .L80243E20 /* C75240 80243DC0 0240202D */ daddu $a0, $s2, $zero /* C75244 80243DC4 08090FAE */ j .L80243EB8 -/* C75248 80243DC8 00000000 */ nop +/* C75248 80243DC8 00000000 */ nop .L80243DCC: /* C7524C 80243DCC 2402000D */ addiu $v0, $zero, 0xd /* C75250 80243DD0 10620029 */ beq $v1, $v0, .L80243E78 @@ -94,9 +94,9 @@ glabel func_80243C90_C75110 /* C75264 80243DE4 1062002D */ beq $v1, $v0, .L80243E9C /* C75268 80243DE8 24020063 */ addiu $v0, $zero, 0x63 /* C7526C 80243DEC 10620030 */ beq $v1, $v0, .L80243EB0 -/* C75270 80243DF0 00000000 */ nop +/* C75270 80243DF0 00000000 */ nop /* C75274 80243DF4 08090FAE */ j .L80243EB8 -/* C75278 80243DF8 00000000 */ nop +/* C75278 80243DF8 00000000 */ nop .L80243DFC: /* C7527C 80243DFC 0260282D */ daddu $a1, $s3, $zero /* C75280 80243E00 0C090B83 */ jal func_80242E0C_C7428C @@ -107,14 +107,14 @@ glabel func_80243C90_C75110 /* C75290 80243E10 0C090B9E */ jal func_80242E78_C742F8 /* C75294 80243E14 0280302D */ daddu $a2, $s4, $zero /* C75298 80243E18 08090FAE */ j .L80243EB8 -/* C7529C 80243E1C 00000000 */ nop +/* C7529C 80243E1C 00000000 */ nop .L80243E20: /* C752A0 80243E20 0260282D */ daddu $a1, $s3, $zero /* C752A4 80243E24 0C090BDD */ jal func_80242F74_C743F4 /* C752A8 80243E28 0280302D */ daddu $a2, $s4, $zero /* C752AC 80243E2C 8E420070 */ lw $v0, 0x70($s2) /* C752B0 80243E30 14500021 */ bne $v0, $s0, .L80243EB8 -/* C752B4 80243E34 00000000 */ nop +/* C752B4 80243E34 00000000 */ nop .L80243E38: /* C752B8 80243E38 0240202D */ daddu $a0, $s2, $zero /* C752BC 80243E3C 0260282D */ daddu $a1, $s3, $zero @@ -123,7 +123,7 @@ glabel func_80243C90_C75110 /* C752C8 80243E48 8E430070 */ lw $v1, 0x70($s2) /* C752CC 80243E4C 2402000C */ addiu $v0, $zero, 0xc /* C752D0 80243E50 14620019 */ bne $v1, $v0, .L80243EB8 -/* C752D4 80243E54 00000000 */ nop +/* C752D4 80243E54 00000000 */ nop /* C752D8 80243E58 0240202D */ daddu $a0, $s2, $zero .L80243E5C: /* C752DC 80243E5C 0260282D */ daddu $a1, $s3, $zero @@ -132,7 +132,7 @@ glabel func_80243C90_C75110 /* C752E8 80243E68 8E430070 */ lw $v1, 0x70($s2) /* C752EC 80243E6C 2402000D */ addiu $v0, $zero, 0xd /* C752F0 80243E70 14620011 */ bne $v1, $v0, .L80243EB8 -/* C752F4 80243E74 00000000 */ nop +/* C752F4 80243E74 00000000 */ nop .L80243E78: /* C752F8 80243E78 0240202D */ daddu $a0, $s2, $zero /* C752FC 80243E7C 0260282D */ daddu $a1, $s3, $zero @@ -141,14 +141,14 @@ glabel func_80243C90_C75110 /* C75308 80243E88 8E430070 */ lw $v1, 0x70($s2) /* C7530C 80243E8C 2402000E */ addiu $v0, $zero, 0xe /* C75310 80243E90 14620009 */ bne $v1, $v0, .L80243EB8 -/* C75314 80243E94 00000000 */ nop +/* C75314 80243E94 00000000 */ nop /* C75318 80243E98 0240202D */ daddu $a0, $s2, $zero .L80243E9C: /* C7531C 80243E9C 0260282D */ daddu $a1, $s3, $zero /* C75320 80243EA0 0C090EE9 */ jal func_80243BA4_C75024 /* C75324 80243EA4 0280302D */ daddu $a2, $s4, $zero /* C75328 80243EA8 08090FAE */ j .L80243EB8 -/* C7532C 80243EAC 00000000 */ nop +/* C7532C 80243EAC 00000000 */ nop .L80243EB0: /* C75330 80243EB0 0C0129CF */ jal func_8004A73C /* C75334 80243EB4 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243EE0_C75360.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243EE0_C75360.s index 323f7654e8..ef421dd8f7 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243EE0_C75360.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243EE0_C75360.s @@ -24,7 +24,7 @@ glabel func_80243EE0_C75360 /* C753A8 80243F28 C460002C */ lwc1 $f0, 0x2c($v1) /* C753AC 80243F2C 3C014100 */ lui $at, 0x4100 /* C753B0 80243F30 44811000 */ mtc1 $at, $f2 -/* C753B4 80243F34 00000000 */ nop +/* C753B4 80243F34 00000000 */ nop /* C753B8 80243F38 46020000 */ add.s $f0, $f0, $f2 /* C753BC 80243F3C C4620030 */ lwc1 $f2, 0x30($v1) /* C753C0 80243F40 C4640028 */ lwc1 $f4, 0x28($v1) @@ -57,40 +57,40 @@ glabel func_80243EE0_C75360 /* C7542C 80243FAC 44811000 */ mtc1 $at, $f2 /* C75430 80243FB0 00431023 */ subu $v0, $v0, $v1 /* C75434 80243FB4 44820000 */ mtc1 $v0, $f0 -/* C75438 80243FB8 00000000 */ nop +/* C75438 80243FB8 00000000 */ nop /* C7543C 80243FBC 46800020 */ cvt.s.w $f0, $f0 /* C75440 80243FC0 46020001 */ sub.s $f0, $f0, $f2 /* C75444 80243FC4 3C01437F */ lui $at, 0x437f /* C75448 80243FC8 44812000 */ mtc1 $at, $f4 -/* C7544C 80243FCC 00000000 */ nop +/* C7544C 80243FCC 00000000 */ nop /* C75450 80243FD0 46040002 */ mul.s $f0, $f0, $f4 -/* C75454 80243FD4 00000000 */ nop +/* C75454 80243FD4 00000000 */ nop /* C75458 80243FD8 3C0141F0 */ lui $at, 0x41f0 /* C7545C 80243FDC 44811000 */ mtc1 $at, $f2 -/* C75460 80243FE0 00000000 */ nop +/* C75460 80243FE0 00000000 */ nop /* C75464 80243FE4 46020583 */ div.s $f22, $f0, $f2 /* C75468 80243FE8 4616203C */ c.lt.s $f4, $f22 -/* C7546C 80243FEC 00000000 */ nop +/* C7546C 80243FEC 00000000 */ nop /* C75470 80243FF0 45030001 */ bc1tl .L80243FF8 /* C75474 80243FF4 46002586 */ mov.s $f22, $f4 .L80243FF8: /* C75478 80243FF8 4480A000 */ mtc1 $zero, $f20 -/* C7547C 80243FFC 00000000 */ nop +/* C7547C 80243FFC 00000000 */ nop /* C75480 80244000 4614B03C */ c.lt.s $f22, $f20 -/* C75484 80244004 00000000 */ nop +/* C75484 80244004 00000000 */ nop /* C75488 80244008 45030001 */ bc1tl .L80244010 /* C7548C 8024400C 4600A586 */ mov.s $f22, $f20 .L80244010: /* C75490 80244010 4614B032 */ c.eq.s $f22, $f20 -/* C75494 80244014 00000000 */ nop +/* C75494 80244014 00000000 */ nop /* C75498 80244018 45000007 */ bc1f .L80244038 -/* C7549C 8024401C 00000000 */ nop +/* C7549C 8024401C 00000000 */ nop /* C754A0 80244020 4405A000 */ mfc1 $a1, $f20 /* C754A4 80244024 0C04E035 */ jal func_801380D4 /* C754A8 80244028 24040001 */ addiu $a0, $zero, 1 /* C754AC 8024402C 4405A000 */ mfc1 $a1, $f20 /* C754B0 80244030 0809103C */ j .L802440F0 -/* C754B4 80244034 00000000 */ nop +/* C754B4 80244034 00000000 */ nop .L80244038: /* C754B8 80244038 3C028011 */ lui $v0, %hi(D_8010EBB0) /* C754BC 8024403C 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) @@ -98,7 +98,7 @@ glabel func_80243EE0_C75360 /* C754C4 80244044 24020006 */ addiu $v0, $zero, 6 /* C754C8 80244048 82230012 */ lb $v1, 0x12($s1) /* C754CC 8024404C 14620022 */ bne $v1, $v0, .L802440D8 -/* C754D0 80244050 00000000 */ nop +/* C754D0 80244050 00000000 */ nop /* C754D4 80244054 8E020074 */ lw $v0, 0x74($s0) /* C754D8 80244058 14400004 */ bnez $v0, .L8024406C /* C754DC 8024405C 24020001 */ addiu $v0, $zero, 1 @@ -120,7 +120,7 @@ glabel func_80243EE0_C75360 /* C75514 80244094 240200FF */ addiu $v0, $zero, 0xff /* C75518 80244098 8E020074 */ lw $v0, 0x74($s0) /* C7551C 8024409C 10400007 */ beqz $v0, .L802440BC -/* C75520 802440A0 00000000 */ nop +/* C75520 802440A0 00000000 */ nop /* C75524 802440A4 8E020070 */ lw $v0, 0x70($s0) /* C75528 802440A8 284200FF */ slti $v0, $v0, 0xff /* C7552C 802440AC 10400003 */ beqz $v0, .L802440BC @@ -155,4 +155,4 @@ glabel func_80243EE0_C75360 /* C75590 80244110 D7B40048 */ ldc1 $f20, 0x48($sp) /* C75594 80244114 03E00008 */ jr $ra /* C75598 80244118 27BD0058 */ addiu $sp, $sp, 0x58 -/* C7559C 8024411C 00000000 */ nop +/* C7559C 8024411C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802400D4_C76DB4.s b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802400D4_C76DB4.s index cef1925356..9254b54971 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802400D4_C76DB4.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802400D4_C76DB4.s @@ -8,7 +8,7 @@ glabel func_802400D4_C76DB4 /* C76DC0 802400E0 00822021 */ addu $a0, $a0, $v0 /* C76DC4 802400E4 90820014 */ lbu $v0, 0x14($a0) /* C76DC8 802400E8 10400009 */ beqz $v0, .L80240110 -/* C76DCC 802400EC 00000000 */ nop +/* C76DCC 802400EC 00000000 */ nop /* C76DD0 802400F0 90820015 */ lbu $v0, 0x15($a0) /* C76DD4 802400F4 00022600 */ sll $a0, $v0, 0x18 /* C76DD8 802400F8 00041E03 */ sra $v1, $a0, 0x18 @@ -16,7 +16,7 @@ glabel func_802400D4_C76DB4 /* C76DE0 80240100 00021403 */ sra $v0, $v0, 0x10 /* C76DE4 80240104 0043102A */ slt $v0, $v0, $v1 /* C76DE8 80240108 10400003 */ beqz $v0, .L80240118 -/* C76DEC 8024010C 00000000 */ nop +/* C76DEC 8024010C 00000000 */ nop .L80240110: /* C76DF0 80240110 03E00008 */ jr $ra /* C76DF4 80240114 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802401CC_C76EAC.s b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802401CC_C76EAC.s index ef6d60b1b3..8d3d82a84c 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802401CC_C76EAC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802401CC_C76EAC.s @@ -108,20 +108,20 @@ glabel func_802401CC_C76EAC /* C77034 80240354 10400009 */ beqz $v0, .L8024037C /* C77038 80240358 AEA20074 */ sw $v0, 0x74($s5) /* C7703C 8024035C 0C03C4EC */ jal func_800F13B0 -/* C77040 80240360 00000000 */ nop +/* C77040 80240360 00000000 */ nop /* C77044 80240364 8EA20070 */ lw $v0, 0x70($s5) /* C77048 80240368 24420001 */ addiu $v0, $v0, 1 .L8024036C: /* C7704C 8024036C AEA20070 */ sw $v0, 0x70($s5) /* C77050 80240370 2842000F */ slti $v0, $v0, 0xf /* C77054 80240374 10400003 */ beqz $v0, .L80240384 -/* C77058 80240378 00000000 */ nop +/* C77058 80240378 00000000 */ nop .L8024037C: /* C7705C 8024037C 080900FB */ j .L802403EC /* C77060 80240380 0000102D */ daddu $v0, $zero, $zero .L80240384: /* C77064 80240384 0C03C54E */ jal func_800F1538 -/* C77068 80240388 00000000 */ nop +/* C77068 80240388 00000000 */ nop /* C7706C 8024038C 8EA30074 */ lw $v1, 0x74($s5) /* C77070 80240390 240200FF */ addiu $v0, $zero, 0xff /* C77074 80240394 10620010 */ beq $v1, $v0, .L802403D8 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240600_C772E0.s b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240600_C772E0.s index 1daa6c6089..50e97e73e7 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240600_C772E0.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240600_C772E0.s @@ -36,7 +36,7 @@ glabel func_80240600_C772E0 /* C7735C 8024067C 0C00A88D */ jal sin_cos_deg /* C77360 80240680 0040A82D */ daddu $s5, $v0, $zero /* C77364 80240684 1200005D */ beqz $s0, .L802407FC -/* C77368 80240688 00000000 */ nop +/* C77368 80240688 00000000 */ nop /* C7736C 8024068C 0C00AB0A */ jal general_heap_malloc /* C77370 80240690 24040068 */ addiu $a0, $zero, 0x68 /* C77374 80240694 0040902D */ daddu $s2, $v0, $zero @@ -98,10 +98,10 @@ glabel func_80240600_C772E0 /* C7744C 8024076C C7A2001C */ lwc1 $f2, 0x1c($sp) /* C77450 80240770 C7A40020 */ lwc1 $f4, 0x20($sp) /* C77454 80240774 46041082 */ mul.s $f2, $f2, $f4 -/* C77458 80240778 00000000 */ nop +/* C77458 80240778 00000000 */ nop /* C7745C 8024077C C7A00018 */ lwc1 $f0, 0x18($sp) /* C77460 80240780 46040002 */ mul.s $f0, $f0, $f4 -/* C77464 80240784 00000000 */ nop +/* C77464 80240784 00000000 */ nop /* C77468 80240788 E6020038 */ swc1 $f2, 0x38($s0) /* C7746C 8024078C E6000050 */ swc1 $f0, 0x50($s0) /* C77470 80240790 8E42005C */ lw $v0, 0x5c($s2) @@ -142,12 +142,12 @@ glabel func_80240600_C772E0 /* C774F8 80240818 10600007 */ beqz $v1, .L80240838 /* C774FC 8024081C 24040005 */ addiu $a0, $zero, 5 /* C77500 80240820 08090274 */ j .L802409D0 -/* C77504 80240824 00000000 */ nop +/* C77504 80240824 00000000 */ nop .L80240828: /* C77508 80240828 10620058 */ beq $v1, $v0, .L8024098C -/* C7750C 8024082C 00000000 */ nop +/* C7750C 8024082C 00000000 */ nop /* C77510 80240830 08090274 */ j .L802409D0 -/* C77514 80240834 00000000 */ nop +/* C77514 80240834 00000000 */ nop .L80240838: /* C77518 80240838 0000882D */ daddu $s1, $zero, $zero /* C7751C 8024083C 3C148024 */ lui $s4, %hi(D_80243D58) @@ -174,11 +174,11 @@ glabel func_80240600_C772E0 /* C7756C 8024088C C7A4001C */ lwc1 $f4, 0x1c($sp) /* C77570 80240890 C7A00020 */ lwc1 $f0, 0x20($sp) /* C77574 80240894 46002102 */ mul.s $f4, $f4, $f0 -/* C77578 80240898 00000000 */ nop +/* C77578 80240898 00000000 */ nop /* C7757C 8024089C C7A20018 */ lwc1 $f2, 0x18($sp) /* C77580 802408A0 26940004 */ addiu $s4, $s4, 4 /* C77584 802408A4 46001082 */ mul.s $f2, $f2, $f0 -/* C77588 802408A8 00000000 */ nop +/* C77588 802408A8 00000000 */ nop /* C7758C 802408AC 26730004 */ addiu $s3, $s3, 4 /* C77590 802408B0 26310001 */ addiu $s1, $s1, 1 /* C77594 802408B4 2A220003 */ slti $v0, $s1, 3 @@ -215,11 +215,11 @@ glabel func_80240600_C772E0 /* C77608 80240928 C7A4001C */ lwc1 $f4, 0x1c($sp) /* C7760C 8024092C C7A00020 */ lwc1 $f0, 0x20($sp) /* C77610 80240930 46002102 */ mul.s $f4, $f4, $f0 -/* C77614 80240934 00000000 */ nop +/* C77614 80240934 00000000 */ nop /* C77618 80240938 C7A20018 */ lwc1 $f2, 0x18($sp) /* C7761C 8024093C 26940004 */ addiu $s4, $s4, 4 /* C77620 80240940 46001082 */ mul.s $f2, $f2, $f0 -/* C77624 80240944 00000000 */ nop +/* C77624 80240944 00000000 */ nop /* C77628 80240948 26730004 */ addiu $s3, $s3, 4 /* C7762C 8024094C 26310001 */ addiu $s1, $s1, 1 /* C77630 80240950 2A220003 */ slti $v0, $s1, 3 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240B38_C77818.s b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240B38_C77818.s index 23f2305850..ff5bcc44ec 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240B38_C77818.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240B38_C77818.s @@ -36,16 +36,16 @@ glabel func_80240B38_C77818 /* C77890 80240BB0 10600007 */ beqz $v1, .L80240BD0 /* C77894 80240BB4 240500FF */ addiu $a1, $zero, 0xff /* C77898 80240BB8 08090312 */ j .L80240C48 -/* C7789C 80240BBC 00000000 */ nop +/* C7789C 80240BBC 00000000 */ nop .L80240BC0: /* C778A0 80240BC0 10620019 */ beq $v1, $v0, .L80240C28 -/* C778A4 80240BC4 00000000 */ nop +/* C778A4 80240BC4 00000000 */ nop /* C778A8 80240BC8 08090312 */ j .L80240C48 -/* C778AC 80240BCC 00000000 */ nop +/* C778AC 80240BCC 00000000 */ nop .L80240BD0: /* C778B0 80240BD0 8E220074 */ lw $v0, 0x74($s1) /* C778B4 80240BD4 14450004 */ bne $v0, $a1, .L80240BE8 -/* C778B8 80240BD8 00000000 */ nop +/* C778B8 80240BD8 00000000 */ nop /* C778BC 80240BDC AE240070 */ sw $a0, 0x70($s1) /* C778C0 80240BE0 AE200078 */ sw $zero, 0x78($s1) /* C778C4 80240BE4 8E220074 */ lw $v0, 0x74($s1) @@ -57,7 +57,7 @@ glabel func_80240B38_C77818 /* C778D8 80240BF8 50400013 */ beql $v0, $zero, .L80240C48 /* C778DC 80240BFC AE250074 */ sw $a1, 0x74($s1) /* C778E0 80240C00 08090312 */ j .L80240C48 -/* C778E4 80240C04 00000000 */ nop +/* C778E4 80240C04 00000000 */ nop .L80240C08: /* C778E8 80240C08 8E220078 */ lw $v0, 0x78($s1) /* C778EC 80240C0C 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240D08_C779E8.s b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240D08_C779E8.s index 7b4a44fbc1..75d67d234d 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240D08_C779E8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240D08_C779E8.s @@ -15,5 +15,5 @@ glabel func_80240D08_C779E8 .L80240D30: /* C77A10 80240D30 03E00008 */ jr $ra /* C77A14 80240D34 24020002 */ addiu $v0, $zero, 2 -/* C77A18 80240D38 00000000 */ nop -/* C77A1C 80240D3C 00000000 */ nop +/* C77A18 80240D38 00000000 */ nop +/* C77A1C 80240D3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240D40_C77A20.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240D40_C77A20.s index 7056b6b4bd..655f17a77a 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240D40_C77A20.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240D40_C77A20.s @@ -32,7 +32,7 @@ glabel func_80240D40_C77A20 /* C77A8C 80240DAC 44060000 */ mfc1 $a2, $f0 /* C77A90 80240DB0 44071000 */ mfc1 $a3, $f2 /* C77A94 80240DB4 44820000 */ mtc1 $v0, $f0 -/* C77A98 80240DB8 00000000 */ nop +/* C77A98 80240DB8 00000000 */ nop /* C77A9C 80240DBC 46800020 */ cvt.s.w $f0, $f0 /* C77AA0 80240DC0 AE220078 */ sw $v0, 0x78($s1) /* C77AA4 80240DC4 0C05267B */ jal func_801499EC diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240DE4_C77AC4.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240DE4_C77AC4.s index 38d799d0d8..f1124f7544 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240DE4_C77AC4.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240DE4_C77AC4.s @@ -32,7 +32,7 @@ glabel func_80240DE4_C77AC4 /* C77B30 80240E50 44060000 */ mfc1 $a2, $f0 /* C77B34 80240E54 44071000 */ mfc1 $a3, $f2 /* C77B38 80240E58 44820000 */ mtc1 $v0, $f0 -/* C77B3C 80240E5C 00000000 */ nop +/* C77B3C 80240E5C 00000000 */ nop /* C77B40 80240E60 46800020 */ cvt.s.w $f0, $f0 /* C77B44 80240E64 AE220078 */ sw $v0, 0x78($s1) /* C77B48 80240E68 0C05267B */ jal func_801499EC diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240E88_C77B68.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240E88_C77B68.s index 8ac330d065..f56c71f458 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240E88_C77B68.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240E88_C77B68.s @@ -22,7 +22,7 @@ glabel func_80240E88_C77B68 /* C77BAC 80240ECC 46800020 */ cvt.s.w $f0, $f0 /* C77BB0 80240ED0 46083183 */ div.s $f6, $f6, $f8 /* C77BB4 80240ED4 46003182 */ mul.s $f6, $f6, $f0 -/* C77BB8 80240ED8 00000000 */ nop +/* C77BB8 80240ED8 00000000 */ nop /* C77BBC 80240EDC C6440010 */ lwc1 $f4, 0x10($s2) /* C77BC0 80240EE0 C6420004 */ lwc1 $f2, 4($s2) /* C77BC4 80240EE4 46022101 */ sub.s $f4, $f4, $f2 @@ -33,10 +33,10 @@ glabel func_80240E88_C77B68 /* C77BD8 80240EF8 C6220084 */ lwc1 $f2, 0x84($s1) /* C77BDC 80240EFC 468010A0 */ cvt.s.w $f2, $f2 /* C77BE0 80240F00 46022102 */ mul.s $f4, $f4, $f2 -/* C77BE4 80240F04 00000000 */ nop +/* C77BE4 80240F04 00000000 */ nop /* C77BE8 80240F08 46080003 */ div.s $f0, $f0, $f8 /* C77BEC 80240F0C 46020002 */ mul.s $f0, $f0, $f2 -/* C77BF0 80240F10 00000000 */ nop +/* C77BF0 80240F10 00000000 */ nop /* C77BF4 80240F14 4600328D */ trunc.w.s $f10, $f6 /* C77BF8 80240F18 E62A0098 */ swc1 $f10, 0x98($s1) /* C77BFC 80240F1C 4600228D */ trunc.w.s $f10, $f4 @@ -52,21 +52,21 @@ glabel func_80240E88_C77B68 /* C77C24 80240F44 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* C77C28 80240F48 00641821 */ addu $v1, $v1, $a0 /* C77C2C 80240F4C 44830000 */ mtc1 $v1, $f0 -/* C77C30 80240F50 00000000 */ nop +/* C77C30 80240F50 00000000 */ nop /* C77C34 80240F54 46800020 */ cvt.s.w $f0, $f0 /* C77C38 80240F58 E6000028 */ swc1 $f0, 0x28($s0) /* C77C3C 80240F5C 8E230090 */ lw $v1, 0x90($s1) /* C77C40 80240F60 8E24009C */ lw $a0, 0x9c($s1) /* C77C44 80240F64 00641821 */ addu $v1, $v1, $a0 /* C77C48 80240F68 44830000 */ mtc1 $v1, $f0 -/* C77C4C 80240F6C 00000000 */ nop +/* C77C4C 80240F6C 00000000 */ nop /* C77C50 80240F70 46800020 */ cvt.s.w $f0, $f0 /* C77C54 80240F74 E600002C */ swc1 $f0, 0x2c($s0) /* C77C58 80240F78 8E230094 */ lw $v1, 0x94($s1) /* C77C5C 80240F7C 8E2400A0 */ lw $a0, 0xa0($s1) /* C77C60 80240F80 00641821 */ addu $v1, $v1, $a0 /* C77C64 80240F84 44830000 */ mtc1 $v1, $f0 -/* C77C68 80240F88 00000000 */ nop +/* C77C68 80240F88 00000000 */ nop /* C77C6C 80240F8C 46800020 */ cvt.s.w $f0, $f0 /* C77C70 80240F90 E6000030 */ swc1 $f0, 0x30($s0) /* C77C74 80240F94 C64C0000 */ lwc1 $f12, ($s2) @@ -81,7 +81,7 @@ glabel func_80240E88_C77B68 /* C77C98 80240FB8 C600002C */ lwc1 $f0, 0x2c($s0) /* C77C9C 80240FBC 3C014120 */ lui $at, 0x4120 /* C77CA0 80240FC0 44811000 */ mtc1 $at, $f2 -/* C77CA4 80240FC4 00000000 */ nop +/* C77CA4 80240FC4 00000000 */ nop /* C77CA8 80240FC8 46020001 */ sub.s $f0, $f0, $f2 /* C77CAC 80240FCC 3C0140A0 */ lui $at, 0x40a0 /* C77CB0 80240FD0 44811000 */ mtc1 $at, $f2 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80241000_C77CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80241000_C77CE0.s index fee8db6afe..2f7154a27d 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80241000_C77CE0.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80241000_C77CE0.s @@ -9,4 +9,4 @@ glabel func_80241000_C77CE0 /* C77CF0 80241010 AC8200A4 */ sw $v0, 0xa4($a0) /* C77CF4 80241014 03E00008 */ jr $ra /* C77CF8 80241018 24020002 */ addiu $v0, $zero, 2 -/* C77CFC 8024101C 00000000 */ nop +/* C77CFC 8024101C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241228_C77F08.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241228_C77F08.s index 25bfe6d0b1..0d8299c5ff 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241228_C77F08.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241228_C77F08.s @@ -42,7 +42,7 @@ glabel func_80241228_C77F08 /* C77F9C 802412BC C6620074 */ lwc1 $f2, 0x74($s3) /* C77FA0 802412C0 468010A0 */ cvt.s.w $f2, $f2 /* C77FA4 802412C4 4600103C */ c.lt.s $f2, $f0 -/* C77FA8 802412C8 00000000 */ nop +/* C77FA8 802412C8 00000000 */ nop /* C77FAC 802412CC 45030001 */ bc1tl .L802412D4 /* C77FB0 802412D0 0000882D */ daddu $s1, $zero, $zero .L802412D4: @@ -51,16 +51,16 @@ glabel func_80241228_C77F08 /* C77FBC 802412DC 3C014387 */ lui $at, 0x4387 /* C77FC0 802412E0 4481A000 */ mtc1 $at, $f20 /* C77FC4 802412E4 0C00A70A */ jal get_clamped_angle_diff -/* C77FC8 802412E8 00000000 */ nop +/* C77FC8 802412E8 00000000 */ nop /* C77FCC 802412EC 0C00A6C9 */ jal clamp_angle /* C77FD0 802412F0 46000306 */ mov.s $f12, $f0 /* C77FD4 802412F4 3C018024 */ lui $at, %hi(pause_badges_is_visible) /* C77FD8 802412F8 D4227270 */ ldc1 $f2, %lo(pause_badges_is_visible)($at) /* C77FDC 802412FC 46000021 */ cvt.d.s $f0, $f0 /* C77FE0 80241300 4622003C */ c.lt.d $f0, $f2 -/* C77FE4 80241304 00000000 */ nop +/* C77FE4 80241304 00000000 */ nop /* C77FE8 80241308 45000003 */ bc1f .L80241318 -/* C77FEC 8024130C 00000000 */ nop +/* C77FEC 8024130C 00000000 */ nop /* C77FF0 80241310 3C0142B4 */ lui $at, 0x42b4 /* C77FF4 80241314 4481A000 */ mtc1 $at, $f20 .L80241318: @@ -77,7 +77,7 @@ glabel func_80241228_C77F08 /* C78020 80241340 468010A0 */ cvt.s.w $f2, $f2 /* C78024 80241344 46000005 */ abs.s $f0, $f0 /* C78028 80241348 4600103C */ c.lt.s $f2, $f0 -/* C7802C 8024134C 00000000 */ nop +/* C7802C 8024134C 00000000 */ nop /* C78030 80241350 45030001 */ bc1tl .L80241358 /* C78034 80241354 0000882D */ daddu $s1, $zero, $zero .L80241358: @@ -87,13 +87,13 @@ glabel func_80241228_C77F08 /* C78044 80241364 860200A8 */ lh $v0, 0xa8($s0) /* C78048 80241368 46020001 */ sub.s $f0, $f0, $f2 /* C7804C 8024136C 44821000 */ mtc1 $v0, $f2 -/* C78050 80241370 00000000 */ nop +/* C78050 80241370 00000000 */ nop /* C78054 80241374 468010A1 */ cvt.d.w $f2, $f2 /* C78058 80241378 46221080 */ add.d $f2, $f2, $f2 /* C7805C 8024137C 46000005 */ abs.s $f0, $f0 /* C78060 80241380 46000021 */ cvt.d.s $f0, $f0 /* C78064 80241384 4620103E */ c.le.d $f2, $f0 -/* C78068 80241388 00000000 */ nop +/* C78068 80241388 00000000 */ nop /* C7806C 8024138C 45030001 */ bc1tl .L80241394 /* C78070 80241390 0000882D */ daddu $s1, $zero, $zero .L80241394: diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802413DC_C780BC.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802413DC_C780BC.s index b9d22366f5..b807c7201a 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802413DC_C780BC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802413DC_C780BC.s @@ -19,7 +19,7 @@ glabel func_802413DC_C780BC /* C780F4 80241414 8E2200B0 */ lw $v0, 0xb0($s1) /* C780F8 80241418 30420004 */ andi $v0, $v0, 4 /* C780FC 8024141C 10400015 */ beqz $v0, .L80241474 -/* C78100 80241420 00000000 */ nop +/* C78100 80241420 00000000 */ nop .L80241424: /* C78104 80241424 AE800070 */ sw $zero, 0x70($s4) /* C78108 80241428 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel func_802413DC_C780BC /* C78158 80241478 12600005 */ beqz $s3, .L80241490 /* C7815C 8024147C 24020001 */ addiu $v0, $zero, 1 /* C78160 80241480 12620048 */ beq $s3, $v0, .L802415A4 -/* C78164 80241484 00000000 */ nop +/* C78164 80241484 00000000 */ nop /* C78168 80241488 08090586 */ j .L80241618 -/* C7816C 8024148C 00000000 */ nop +/* C7816C 8024148C 00000000 */ nop .L80241490: /* C78170 80241490 86240008 */ lh $a0, 8($s1) /* C78174 80241494 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel func_802413DC_C780BC /* C78194 802414B4 8E03006C */ lw $v1, 0x6c($s0) /* C78198 802414B8 24020003 */ addiu $v0, $zero, 3 /* C7819C 802414BC 14620056 */ bne $v1, $v0, .L80241618 -/* C781A0 802414C0 00000000 */ nop +/* C781A0 802414C0 00000000 */ nop /* C781A4 802414C4 8E2500A8 */ lw $a1, 0xa8($s1) /* C781A8 802414C8 10A00003 */ beqz $a1, .L802414D8 /* C781AC 802414CC 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel func_802413DC_C780BC /* C78224 80241544 C7A20014 */ lwc1 $f2, 0x14($sp) /* C78228 80241548 4600020D */ trunc.w.s $f8, $f0 /* C7822C 8024154C 44024000 */ mfc1 $v0, $f8 -/* C78230 80241550 00000000 */ nop +/* C78230 80241550 00000000 */ nop /* C78234 80241554 A6220012 */ sh $v0, 0x12($s1) /* C78238 80241558 4600120D */ trunc.w.s $f8, $f2 /* C7823C 8024155C 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s index 546079b9c8..32c819c210 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s @@ -100,78 +100,93 @@ glabel func_8024163C_C7831C /* C78480 802417A0 2C620064 */ sltiu $v0, $v1, 0x64 /* C78484 802417A4 10400048 */ beqz $v0, .L802418C8 /* C78488 802417A8 00031080 */ sll $v0, $v1, 2 -/* C7848C 802417AC 3C018024 */ lui $at, %hi(D_80247278) +/* C7848C 802417AC 3C018024 */ lui $at, %hi(jtbl_80247278_C7DF58) /* C78490 802417B0 00220821 */ addu $at, $at, $v0 -/* C78494 802417B4 8C227278 */ lw $v0, %lo(D_80247278)($at) +/* C78494 802417B4 8C227278 */ lw $v0, %lo(jtbl_80247278_C7DF58)($at) /* C78498 802417B8 00400008 */ jr $v0 /* C7849C 802417BC 00000000 */ nop +glabel L802417C0_C784A0 /* C784A0 802417C0 0240202D */ daddu $a0, $s2, $zero /* C784A4 802417C4 0260282D */ daddu $a1, $s3, $zero /* C784A8 802417C8 0C012568 */ jal func_800495A0 /* C784AC 802417CC 0280302D */ daddu $a2, $s4, $zero +glabel L802417D0_C784B0 /* C784B0 802417D0 0240202D */ daddu $a0, $s2, $zero /* C784B4 802417D4 0260282D */ daddu $a1, $s3, $zero /* C784B8 802417D8 0C0125AE */ jal func_800496B8 /* C784BC 802417DC 0280302D */ daddu $a2, $s4, $zero /* C784C0 802417E0 08090632 */ j .L802418C8 /* C784C4 802417E4 00000000 */ nop +glabel L802417E8_C784C8 /* C784C8 802417E8 0240202D */ daddu $a0, $s2, $zero /* C784CC 802417EC 0260282D */ daddu $a1, $s3, $zero /* C784D0 802417F0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C784D4 802417F4 0280302D */ daddu $a2, $s4, $zero +glabel L802417F8_C784D8 /* C784D8 802417F8 0240202D */ daddu $a0, $s2, $zero /* C784DC 802417FC 0260282D */ daddu $a1, $s3, $zero /* C784E0 80241800 0C012701 */ jal func_80049C04 /* C784E4 80241804 0280302D */ daddu $a2, $s4, $zero /* C784E8 80241808 08090632 */ j .L802418C8 /* C784EC 8024180C 00000000 */ nop +glabel L80241810_C784F0 /* C784F0 80241810 0240202D */ daddu $a0, $s2, $zero /* C784F4 80241814 0260282D */ daddu $a1, $s3, $zero /* C784F8 80241818 0C01278F */ jal func_80049E3C /* C784FC 8024181C 0280302D */ daddu $a2, $s4, $zero +glabel L80241820_C78500 /* C78500 80241820 0240202D */ daddu $a0, $s2, $zero /* C78504 80241824 0260282D */ daddu $a1, $s3, $zero /* C78508 80241828 0C0127B3 */ jal func_80049ECC /* C7850C 8024182C 0280302D */ daddu $a2, $s4, $zero /* C78510 80241830 08090632 */ j .L802418C8 /* C78514 80241834 00000000 */ nop +glabel L80241838_C78518 /* C78518 80241838 0240202D */ daddu $a0, $s2, $zero /* C7851C 8024183C 0260282D */ daddu $a1, $s3, $zero /* C78520 80241840 0C0127DF */ jal func_80049F7C /* C78524 80241844 0280302D */ daddu $a2, $s4, $zero +glabel L80241848_C78528 /* C78528 80241848 0240202D */ daddu $a0, $s2, $zero /* C7852C 8024184C 0260282D */ daddu $a1, $s3, $zero /* C78530 80241850 0C012849 */ jal func_8004A124 /* C78534 80241854 0280302D */ daddu $a2, $s4, $zero /* C78538 80241858 08090632 */ j .L802418C8 /* C7853C 8024185C 00000000 */ nop +glabel L80241860_C78540 /* C78540 80241860 0240202D */ daddu $a0, $s2, $zero /* C78544 80241864 0260282D */ daddu $a1, $s3, $zero /* C78548 80241868 0C0128FA */ jal func_8004A3E8 /* C7854C 8024186C 0280302D */ daddu $a2, $s4, $zero /* C78550 80241870 08090632 */ j .L802418C8 /* C78554 80241874 00000000 */ nop +glabel L80241878_C78558 /* C78558 80241878 0C090408 */ jal kzn_09_UnkNpcAIFunc6 /* C7855C 8024187C 0240202D */ daddu $a0, $s2, $zero +glabel L80241880_C78560 /* C78560 80241880 0C090423 */ jal kzn_09_UnkNpcAIFunc7 /* C78564 80241884 0240202D */ daddu $a0, $s2, $zero /* C78568 80241888 8E430070 */ lw $v1, 0x70($s2) /* C7856C 8024188C 24020020 */ addiu $v0, $zero, 0x20 /* C78570 80241890 1462000D */ bne $v1, $v0, .L802418C8 /* C78574 80241894 00000000 */ nop +glabel L80241898_C78578 /* C78578 80241898 0C09043F */ jal kzn_09_UnkNpcAIFunc8 /* C7857C 8024189C 0240202D */ daddu $a0, $s2, $zero /* C78580 802418A0 8E430070 */ lw $v1, 0x70($s2) /* C78584 802418A4 24020021 */ addiu $v0, $zero, 0x21 /* C78588 802418A8 14620007 */ bne $v1, $v0, .L802418C8 /* C7858C 802418AC 00000000 */ nop +glabel L802418B0_C78590 /* C78590 802418B0 0C090475 */ jal kzn_09_UnkNpcAIFunc5 /* C78594 802418B4 0240202D */ daddu $a0, $s2, $zero /* C78598 802418B8 08090632 */ j .L802418C8 /* C7859C 802418BC 00000000 */ nop +glabel L802418C0_C785A0 /* C785A0 802418C0 0C0129CF */ jal func_8004A73C /* C785A4 802418C4 0240202D */ daddu $a0, $s2, $zero .L802418C8: +glabel L802418C8_C785A8 /* C785A8 802418C8 8FBF0048 */ lw $ra, 0x48($sp) /* C785AC 802418CC 8FB50044 */ lw $s5, 0x44($sp) /* C785B0 802418D0 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024195C_C7863C.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024195C_C7863C.s index 7da236c512..0e859a82aa 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024195C_C7863C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024195C_C7863C.s @@ -38,7 +38,7 @@ glabel func_8024195C_C7863C /* C786C0 802419E0 3C01C1A0 */ lui $at, 0xc1a0 /* C786C4 802419E4 44812000 */ mtc1 $at, $f4 /* C786C8 802419E8 44833000 */ mtc1 $v1, $f6 -/* C786CC 802419EC 00000000 */ nop +/* C786CC 802419EC 00000000 */ nop /* C786D0 802419F0 468031A0 */ cvt.s.w $f6, $f6 /* C786D4 802419F4 44073000 */ mfc1 $a3, $f6 /* C786D8 802419F8 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241A58_C78738.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241A58_C78738.s index 37db2e4e56..55d84223b3 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241A58_C78738.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241A58_C78738.s @@ -39,18 +39,18 @@ glabel func_80241A58_C78738 .L80241AE0: /* C787C0 80241AE0 8622008E */ lh $v0, 0x8e($s1) /* C787C4 80241AE4 1440025D */ bnez $v0, .L8024245C -/* C787C8 80241AE8 00000000 */ nop +/* C787C8 80241AE8 00000000 */ nop /* C787CC 80241AEC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C787D0 80241AF0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* C787D4 80241AF4 0C00A6C9 */ jal clamp_angle /* C787D8 80241AF8 C44C00A8 */ lwc1 $f12, 0xa8($v0) /* C787DC 80241AFC 3C014334 */ lui $at, 0x4334 /* C787E0 80241B00 44811000 */ mtc1 $at, $f2 -/* C787E4 80241B04 00000000 */ nop +/* C787E4 80241B04 00000000 */ nop /* C787E8 80241B08 4602003C */ c.lt.s $f0, $f2 -/* C787EC 80241B0C 00000000 */ nop +/* C787EC 80241B0C 00000000 */ nop /* C787F0 80241B10 45000011 */ bc1f .L80241B58 -/* C787F4 80241B14 00000000 */ nop +/* C787F4 80241B14 00000000 */ nop /* C787F8 80241B18 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* C787FC 80241B1C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* C78800 80241B20 3C0142B4 */ lui $at, 0x42b4 @@ -85,7 +85,7 @@ glabel func_80241A58_C78738 /* C78870 80241B90 460C0300 */ add.s $f12, $f0, $f12 .L80241B94: /* C78874 80241B94 0C00A6C9 */ jal clamp_angle -/* C78878 80241B98 00000000 */ nop +/* C78878 80241B98 00000000 */ nop /* C7887C 80241B9C 46000586 */ mov.s $f22, $f0 /* C78880 80241BA0 3C014334 */ lui $at, 0x4334 /* C78884 80241BA4 44816000 */ mtc1 $at, $f12 @@ -134,7 +134,7 @@ glabel func_80241A58_C78738 /* C78920 80241C40 862200A6 */ lh $v0, 0xa6($s1) /* C78924 80241C44 8EA30000 */ lw $v1, ($s5) /* C78928 80241C48 44824000 */ mtc1 $v0, $f8 -/* C7892C 80241C4C 00000000 */ nop +/* C7892C 80241C4C 00000000 */ nop /* C78930 80241C50 46804220 */ cvt.s.w $f8, $f8 /* C78934 80241C54 C4600028 */ lwc1 $f0, 0x28($v1) /* C78938 80241C58 44064000 */ mfc1 $a2, $f8 @@ -146,7 +146,7 @@ glabel func_80241A58_C78738 /* C78950 80241C70 E6200040 */ swc1 $f0, 0x40($s1) /* C78954 80241C74 862200A6 */ lh $v0, 0xa6($s1) /* C78958 80241C78 44820000 */ mtc1 $v0, $f0 -/* C7895C 80241C7C 00000000 */ nop +/* C7895C 80241C7C 00000000 */ nop /* C78960 80241C80 46800020 */ cvt.s.w $f0, $f0 /* C78964 80241C84 4600A000 */ add.s $f0, $f20, $f0 /* C78968 80241C88 4406B000 */ mfc1 $a2, $f22 @@ -155,18 +155,18 @@ glabel func_80241A58_C78738 /* C78974 80241C94 0220202D */ daddu $a0, $s1, $zero /* C78978 80241C98 8EC20088 */ lw $v0, 0x88($s6) /* C7897C 80241C9C 1440005D */ bnez $v0, .L80241E14 -/* C78980 80241CA0 00000000 */ nop +/* C78980 80241CA0 00000000 */ nop /* C78984 80241CA4 C6200038 */ lwc1 $f0, 0x38($s1) /* C78988 80241CA8 3C018024 */ lui $at, %hi(D_80247408) /* C7898C 80241CAC D4247408 */ ldc1 $f4, %lo(D_80247408)($at) /* C78990 80241CB0 46000021 */ cvt.d.s $f0, $f0 /* C78994 80241CB4 4620203C */ c.lt.d $f4, $f0 -/* C78998 80241CB8 00000000 */ nop +/* C78998 80241CB8 00000000 */ nop /* C7899C 80241CBC 45000005 */ bc1f .L80241CD4 -/* C789A0 80241CC0 00000000 */ nop +/* C789A0 80241CC0 00000000 */ nop /* C789A4 80241CC4 3C0143BE */ lui $at, 0x43be /* C789A8 80241CC8 44810000 */ mtc1 $at, $f0 -/* C789AC 80241CCC 00000000 */ nop +/* C789AC 80241CCC 00000000 */ nop /* C789B0 80241CD0 E6200038 */ swc1 $f0, 0x38($s1) .L80241CD4: /* C789B4 80241CD4 C6200038 */ lwc1 $f0, 0x38($s1) @@ -174,50 +174,50 @@ glabel func_80241A58_C78738 /* C789BC 80241CDC D4227410 */ ldc1 $f2, %lo(D_80247410)($at) /* C789C0 80241CE0 46000021 */ cvt.d.s $f0, $f0 /* C789C4 80241CE4 4622003C */ c.lt.d $f0, $f2 -/* C789C8 80241CE8 00000000 */ nop +/* C789C8 80241CE8 00000000 */ nop /* C789CC 80241CEC 45000005 */ bc1f .L80241D04 -/* C789D0 80241CF0 00000000 */ nop +/* C789D0 80241CF0 00000000 */ nop /* C789D4 80241CF4 3C01C3BE */ lui $at, 0xc3be /* C789D8 80241CF8 44810000 */ mtc1 $at, $f0 -/* C789DC 80241CFC 00000000 */ nop +/* C789DC 80241CFC 00000000 */ nop /* C789E0 80241D00 E6200038 */ swc1 $f0, 0x38($s1) .L80241D04: /* C789E4 80241D04 C6200040 */ lwc1 $f0, 0x40($s1) /* C789E8 80241D08 46000021 */ cvt.d.s $f0, $f0 /* C789EC 80241D0C 4620203C */ c.lt.d $f4, $f0 -/* C789F0 80241D10 00000000 */ nop +/* C789F0 80241D10 00000000 */ nop /* C789F4 80241D14 45000005 */ bc1f .L80241D2C -/* C789F8 80241D18 00000000 */ nop +/* C789F8 80241D18 00000000 */ nop /* C789FC 80241D1C 3C0143BE */ lui $at, 0x43be /* C78A00 80241D20 44810000 */ mtc1 $at, $f0 -/* C78A04 80241D24 00000000 */ nop +/* C78A04 80241D24 00000000 */ nop /* C78A08 80241D28 E6200040 */ swc1 $f0, 0x40($s1) .L80241D2C: /* C78A0C 80241D2C C6200040 */ lwc1 $f0, 0x40($s1) /* C78A10 80241D30 46000021 */ cvt.d.s $f0, $f0 /* C78A14 80241D34 4622003C */ c.lt.d $f0, $f2 -/* C78A18 80241D38 00000000 */ nop +/* C78A18 80241D38 00000000 */ nop /* C78A1C 80241D3C 45000005 */ bc1f .L80241D54 -/* C78A20 80241D40 00000000 */ nop +/* C78A20 80241D40 00000000 */ nop /* C78A24 80241D44 3C01C3BE */ lui $at, 0xc3be /* C78A28 80241D48 44810000 */ mtc1 $at, $f0 -/* C78A2C 80241D4C 00000000 */ nop +/* C78A2C 80241D4C 00000000 */ nop /* C78A30 80241D50 E6200040 */ swc1 $f0, 0x40($s1) .L80241D54: /* C78A34 80241D54 C6220038 */ lwc1 $f2, 0x38($s1) /* C78A38 80241D58 46021082 */ mul.s $f2, $f2, $f2 -/* C78A3C 80241D5C 00000000 */ nop +/* C78A3C 80241D5C 00000000 */ nop /* C78A40 80241D60 C6200040 */ lwc1 $f0, 0x40($s1) /* C78A44 80241D64 46000002 */ mul.s $f0, $f0, $f0 -/* C78A48 80241D68 00000000 */ nop +/* C78A48 80241D68 00000000 */ nop /* C78A4C 80241D6C 46001300 */ add.s $f12, $f2, $f0 /* C78A50 80241D70 46006004 */ sqrt.s $f0, $f12 /* C78A54 80241D74 46000032 */ c.eq.s $f0, $f0 -/* C78A58 80241D78 00000000 */ nop +/* C78A58 80241D78 00000000 */ nop /* C78A5C 80241D7C 45010003 */ bc1t .L80241D8C -/* C78A60 80241D80 00000000 */ nop +/* C78A60 80241D80 00000000 */ nop /* C78A64 80241D84 0C0187BC */ jal sqrtf -/* C78A68 80241D88 00000000 */ nop +/* C78A68 80241D88 00000000 */ nop .L80241D8C: /* C78A6C 80241D8C 8E260038 */ lw $a2, 0x38($s1) /* C78A70 80241D90 8E270040 */ lw $a3, 0x40($s1) @@ -232,7 +232,7 @@ glabel func_80241A58_C78738 /* C78A94 80241DB4 D4207418 */ ldc1 $f0, %lo(D_80247418)($at) /* C78A98 80241DB8 460010A1 */ cvt.d.s $f2, $f2 /* C78A9C 80241DBC 4620103C */ c.lt.d $f2, $f0 -/* C78AA0 80241DC0 00000000 */ nop +/* C78AA0 80241DC0 00000000 */ nop /* C78AA4 80241DC4 45000004 */ bc1f .L80241DD8 /* C78AA8 80241DC8 0200202D */ daddu $a0, $s0, $zero /* C78AAC 80241DCC 3C064398 */ lui $a2, 0x4398 @@ -242,9 +242,9 @@ glabel func_80241A58_C78738 /* C78AB8 80241DD8 3C018024 */ lui $at, %hi(D_80247420) /* C78ABC 80241DDC D4207420 */ ldc1 $f0, %lo(D_80247420)($at) /* C78AC0 80241DE0 4622003C */ c.lt.d $f0, $f2 -/* C78AC4 80241DE4 00000000 */ nop +/* C78AC4 80241DE4 00000000 */ nop /* C78AC8 80241DE8 450000FA */ bc1f .L802421D4 -/* C78ACC 80241DEC 00000000 */ nop +/* C78ACC 80241DEC 00000000 */ nop /* C78AD0 80241DF0 3C0643BB */ lui $a2, 0x43bb /* C78AD4 80241DF4 34C68000 */ ori $a2, $a2, 0x8000 .L80241DF8: @@ -254,7 +254,7 @@ glabel func_80241A58_C78738 /* C78AE4 80241E04 0C00A7E7 */ jal add_vec2D_polar /* C78AE8 80241E08 E6340040 */ swc1 $f20, 0x40($s1) /* C78AEC 80241E0C 08090875 */ j .L802421D4 -/* C78AF0 80241E10 00000000 */ nop +/* C78AF0 80241E10 00000000 */ nop .L80241E14: /* C78AF4 80241E14 8E220000 */ lw $v0, ($s1) /* C78AF8 80241E18 30420040 */ andi $v0, $v0, 0x40 @@ -281,13 +281,13 @@ glabel func_80241A58_C78738 /* C78B4C 80241E6C 862200A8 */ lh $v0, 0xa8($s1) /* C78B50 80241E70 0260302D */ daddu $a2, $s3, $zero /* C78B54 80241E74 44820000 */ mtc1 $v0, $f0 -/* C78B58 80241E78 00000000 */ nop +/* C78B58 80241E78 00000000 */ nop /* C78B5C 80241E7C 46800020 */ cvt.s.w $f0, $f0 /* C78B60 80241E80 E7A00018 */ swc1 $f0, 0x18($sp) /* C78B64 80241E84 862200A6 */ lh $v0, 0xa6($s1) /* C78B68 80241E88 27B00028 */ addiu $s0, $sp, 0x28 /* C78B6C 80241E8C 44820000 */ mtc1 $v0, $f0 -/* C78B70 80241E90 00000000 */ nop +/* C78B70 80241E90 00000000 */ nop /* C78B74 80241E94 46800020 */ cvt.s.w $f0, $f0 /* C78B78 80241E98 E7A0001C */ swc1 $f0, 0x1c($sp) /* C78B7C 80241E9C 8E240080 */ lw $a0, 0x80($s1) @@ -311,13 +311,13 @@ glabel func_80241A58_C78738 /* C78BC4 80241EE4 E7B60014 */ swc1 $f22, 0x14($sp) /* C78BC8 80241EE8 862200A8 */ lh $v0, 0xa8($s1) /* C78BCC 80241EEC 44820000 */ mtc1 $v0, $f0 -/* C78BD0 80241EF0 00000000 */ nop +/* C78BD0 80241EF0 00000000 */ nop /* C78BD4 80241EF4 46800020 */ cvt.s.w $f0, $f0 /* C78BD8 80241EF8 E7A00018 */ swc1 $f0, 0x18($sp) /* C78BDC 80241EFC 862200A6 */ lh $v0, 0xa6($s1) /* C78BE0 80241F00 0260302D */ daddu $a2, $s3, $zero /* C78BE4 80241F04 44820000 */ mtc1 $v0, $f0 -/* C78BE8 80241F08 00000000 */ nop +/* C78BE8 80241F08 00000000 */ nop /* C78BEC 80241F0C 46800020 */ cvt.s.w $f0, $f0 /* C78BF0 80241F10 E7A0001C */ swc1 $f0, 0x1c($sp) /* C78BF4 80241F14 8E240080 */ lw $a0, 0x80($s1) @@ -347,32 +347,32 @@ glabel func_80241A58_C78738 /* C78C54 80241F74 0C0372DF */ jal func_800DCB7C /* C78C58 80241F78 0040802D */ daddu $s0, $v0, $zero /* C78C5C 80241F7C 1600001C */ bnez $s0, .L80241FF0 -/* C78C60 80241F80 00000000 */ nop +/* C78C60 80241F80 00000000 */ nop /* C78C64 80241F84 1040001A */ beqz $v0, .L80241FF0 -/* C78C68 80241F88 00000000 */ nop +/* C78C68 80241F88 00000000 */ nop /* C78C6C 80241F8C C7A20038 */ lwc1 $f2, 0x38($sp) /* C78C70 80241F90 3C014054 */ lui $at, 0x4054 /* C78C74 80241F94 44810800 */ mtc1 $at, $f1 /* C78C78 80241F98 44800000 */ mtc1 $zero, $f0 /* C78C7C 80241F9C 460010A1 */ cvt.d.s $f2, $f2 /* C78C80 80241FA0 4622003C */ c.lt.d $f0, $f2 -/* C78C84 80241FA4 00000000 */ nop +/* C78C84 80241FA4 00000000 */ nop /* C78C88 80241FA8 45000011 */ bc1f .L80241FF0 -/* C78C8C 80241FAC 00000000 */ nop +/* C78C8C 80241FAC 00000000 */ nop /* C78C90 80241FB0 3C01405E */ lui $at, 0x405e /* C78C94 80241FB4 44810800 */ mtc1 $at, $f1 /* C78C98 80241FB8 44800000 */ mtc1 $zero, $f0 -/* C78C9C 80241FBC 00000000 */ nop +/* C78C9C 80241FBC 00000000 */ nop /* C78CA0 80241FC0 4620103C */ c.lt.d $f2, $f0 -/* C78CA4 80241FC4 00000000 */ nop +/* C78CA4 80241FC4 00000000 */ nop /* C78CA8 80241FC8 45000009 */ bc1f .L80241FF0 -/* C78CAC 80241FCC 00000000 */ nop +/* C78CAC 80241FCC 00000000 */ nop /* C78CB0 80241FD0 C622003C */ lwc1 $f2, 0x3c($s1) /* C78CB4 80241FD4 C7A00030 */ lwc1 $f0, 0x30($sp) /* C78CB8 80241FD8 46001032 */ c.eq.s $f2, $f0 -/* C78CBC 80241FDC 00000000 */ nop +/* C78CBC 80241FDC 00000000 */ nop /* C78CC0 80241FE0 45010003 */ bc1t .L80241FF0 -/* C78CC4 80241FE4 00000000 */ nop +/* C78CC4 80241FE4 00000000 */ nop /* C78CC8 80241FE8 08090875 */ j .L802421D4 /* C78CCC 80241FEC 241E0001 */ addiu $fp, $zero, 1 .L80241FF0: @@ -396,13 +396,13 @@ glabel func_80241A58_C78738 /* C78D14 80242034 862200A8 */ lh $v0, 0xa8($s1) /* C78D18 80242038 27A50020 */ addiu $a1, $sp, 0x20 /* C78D1C 8024203C 44820000 */ mtc1 $v0, $f0 -/* C78D20 80242040 00000000 */ nop +/* C78D20 80242040 00000000 */ nop /* C78D24 80242044 46800020 */ cvt.s.w $f0, $f0 /* C78D28 80242048 E7A00018 */ swc1 $f0, 0x18($sp) /* C78D2C 8024204C 862200A6 */ lh $v0, 0xa6($s1) /* C78D30 80242050 27A60024 */ addiu $a2, $sp, 0x24 /* C78D34 80242054 44820000 */ mtc1 $v0, $f0 -/* C78D38 80242058 00000000 */ nop +/* C78D38 80242058 00000000 */ nop /* C78D3C 8024205C 46800020 */ cvt.s.w $f0, $f0 /* C78D40 80242060 E7A0001C */ swc1 $f0, 0x1c($sp) /* C78D44 80242064 8E240080 */ lw $a0, 0x80($s1) @@ -420,7 +420,7 @@ glabel func_80241A58_C78738 /* C78D74 80242094 862200A6 */ lh $v0, 0xa6($s1) /* C78D78 80242098 4407C000 */ mfc1 $a3, $f24 /* C78D7C 8024209C 44824000 */ mtc1 $v0, $f8 -/* C78D80 802420A0 00000000 */ nop +/* C78D80 802420A0 00000000 */ nop /* C78D84 802420A4 46804220 */ cvt.s.w $f8, $f8 /* C78D88 802420A8 C4600028 */ lwc1 $f0, 0x28($v1) /* C78D8C 802420AC 44064000 */ mfc1 $a2, $f8 @@ -432,7 +432,7 @@ glabel func_80241A58_C78738 /* C78DA4 802420C4 E6200040 */ swc1 $f0, 0x40($s1) /* C78DA8 802420C8 862200A6 */ lh $v0, 0xa6($s1) /* C78DAC 802420CC 44820000 */ mtc1 $v0, $f0 -/* C78DB0 802420D0 00000000 */ nop +/* C78DB0 802420D0 00000000 */ nop /* C78DB4 802420D4 46800020 */ cvt.s.w $f0, $f0 /* C78DB8 802420D8 08090871 */ j .L802421C4 /* C78DBC 802420DC 4600A500 */ add.s $f20, $f20, $f0 @@ -454,20 +454,20 @@ glabel func_80241A58_C78738 /* C78DF8 80242118 E7B60014 */ swc1 $f22, 0x14($sp) /* C78DFC 8024211C 862200A8 */ lh $v0, 0xa8($s1) /* C78E00 80242120 44820000 */ mtc1 $v0, $f0 -/* C78E04 80242124 00000000 */ nop +/* C78E04 80242124 00000000 */ nop /* C78E08 80242128 46800020 */ cvt.s.w $f0, $f0 /* C78E0C 8024212C E7A00018 */ swc1 $f0, 0x18($sp) /* C78E10 80242130 862200A6 */ lh $v0, 0xa6($s1) /* C78E14 80242134 27A60024 */ addiu $a2, $sp, 0x24 /* C78E18 80242138 44820000 */ mtc1 $v0, $f0 -/* C78E1C 8024213C 00000000 */ nop +/* C78E1C 8024213C 00000000 */ nop /* C78E20 80242140 46800020 */ cvt.s.w $f0, $f0 /* C78E24 80242144 E7A0001C */ swc1 $f0, 0x1c($sp) /* C78E28 80242148 8E240080 */ lw $a0, 0x80($s1) /* C78E2C 8024214C 0C037711 */ jal func_800DDC44 /* C78E30 80242150 27A70028 */ addiu $a3, $sp, 0x28 /* C78E34 80242154 1040001F */ beqz $v0, .L802421D4 -/* C78E38 80242158 00000000 */ nop +/* C78E38 80242158 00000000 */ nop /* C78E3C 8024215C 8FA60020 */ lw $a2, 0x20($sp) /* C78E40 80242160 8EA20000 */ lw $v0, ($s5) /* C78E44 80242164 8FA70028 */ lw $a3, 0x28($sp) @@ -479,7 +479,7 @@ glabel func_80241A58_C78738 /* C78E5C 8024217C 862200A6 */ lh $v0, 0xa6($s1) /* C78E60 80242180 4407C000 */ mfc1 $a3, $f24 /* C78E64 80242184 44824000 */ mtc1 $v0, $f8 -/* C78E68 80242188 00000000 */ nop +/* C78E68 80242188 00000000 */ nop /* C78E6C 8024218C 46804220 */ cvt.s.w $f8, $f8 /* C78E70 80242190 C4600028 */ lwc1 $f0, 0x28($v1) /* C78E74 80242194 44064000 */ mfc1 $a2, $f8 @@ -491,7 +491,7 @@ glabel func_80241A58_C78738 /* C78E8C 802421AC E6200040 */ swc1 $f0, 0x40($s1) /* C78E90 802421B0 862200A6 */ lh $v0, 0xa6($s1) /* C78E94 802421B4 44820000 */ mtc1 $v0, $f0 -/* C78E98 802421B8 00000000 */ nop +/* C78E98 802421B8 00000000 */ nop /* C78E9C 802421BC 46800020 */ cvt.s.w $f0, $f0 /* C78EA0 802421C0 4600A500 */ add.s $f20, $f20, $f0 .L802421C4: @@ -520,14 +520,14 @@ glabel func_80241A58_C78738 /* C78EF8 80242218 0C0123F5 */ jal is_point_within_region /* C78EFC 8024221C 26330040 */ addiu $s3, $s1, 0x40 /* C78F00 80242220 1040005A */ beqz $v0, .L8024238C -/* C78F04 80242224 00000000 */ nop +/* C78F04 80242224 00000000 */ nop /* C78F08 80242228 8E430004 */ lw $v1, 4($s2) /* C78F0C 8024222C 10600005 */ beqz $v1, .L80242244 /* C78F10 80242230 24020001 */ addiu $v0, $zero, 1 /* C78F14 80242234 10620029 */ beq $v1, $v0, .L802422DC -/* C78F18 80242238 00000000 */ nop +/* C78F18 80242238 00000000 */ nop /* C78F1C 8024223C 080908E3 */ j .L8024238C -/* C78F20 80242240 00000000 */ nop +/* C78F20 80242240 00000000 */ nop .L80242244: /* C78F24 80242244 C6480008 */ lwc1 $f8, 8($s2) /* C78F28 80242248 46804220 */ cvt.s.w $f8, $f8 @@ -538,11 +538,11 @@ glabel func_80241A58_C78738 /* C78F3C 8024225C C62E0040 */ lwc1 $f14, 0x40($s1) /* C78F40 80242260 44074000 */ mfc1 $a3, $f8 /* C78F44 80242264 0C00A7B5 */ jal dist2D -/* C78F48 80242268 00000000 */ nop +/* C78F48 80242268 00000000 */ nop /* C78F4C 8024226C C6420010 */ lwc1 $f2, 0x10($s2) /* C78F50 80242270 468010A0 */ cvt.s.w $f2, $f2 /* C78F54 80242274 4600103C */ c.lt.s $f2, $f0 -/* C78F58 80242278 00000000 */ nop +/* C78F58 80242278 00000000 */ nop /* C78F5C 8024227C 45000043 */ bc1f .L8024238C /* C78F60 80242280 E7A00038 */ swc1 $f0, 0x38($sp) /* C78F64 80242284 C64C0008 */ lwc1 $f12, 8($s2) @@ -566,17 +566,17 @@ glabel func_80241A58_C78738 /* C78FAC 802422CC 0C00A7E7 */ jal add_vec2D_polar /* C78FB0 802422D0 0260282D */ daddu $a1, $s3, $zero /* C78FB4 802422D4 080908E3 */ j .L8024238C -/* C78FB8 802422D8 00000000 */ nop +/* C78FB8 802422D8 00000000 */ nop .L802422DC: /* C78FBC 802422DC 8E420008 */ lw $v0, 8($s2) /* C78FC0 802422E0 8E430010 */ lw $v1, 0x10($s2) /* C78FC4 802422E4 C6200038 */ lwc1 $f0, 0x38($s1) /* C78FC8 802422E8 00431021 */ addu $v0, $v0, $v1 /* C78FCC 802422EC 44821000 */ mtc1 $v0, $f2 -/* C78FD0 802422F0 00000000 */ nop +/* C78FD0 802422F0 00000000 */ nop /* C78FD4 802422F4 468010A0 */ cvt.s.w $f2, $f2 /* C78FD8 802422F8 4600103C */ c.lt.s $f2, $f0 -/* C78FDC 802422FC 00000000 */ nop +/* C78FDC 802422FC 00000000 */ nop /* C78FE0 80242300 45030001 */ bc1tl .L80242308 /* C78FE4 80242304 E6220038 */ swc1 $f2, 0x38($s1) .L80242308: @@ -585,10 +585,10 @@ glabel func_80241A58_C78738 /* C78FF0 80242310 C6200038 */ lwc1 $f0, 0x38($s1) /* C78FF4 80242314 00431023 */ subu $v0, $v0, $v1 /* C78FF8 80242318 44821000 */ mtc1 $v0, $f2 -/* C78FFC 8024231C 00000000 */ nop +/* C78FFC 8024231C 00000000 */ nop /* C79000 80242320 468010A0 */ cvt.s.w $f2, $f2 /* C79004 80242324 4602003C */ c.lt.s $f0, $f2 -/* C79008 80242328 00000000 */ nop +/* C79008 80242328 00000000 */ nop /* C7900C 8024232C 45030001 */ bc1tl .L80242334 /* C79010 80242330 E6220038 */ swc1 $f2, 0x38($s1) .L80242334: @@ -597,10 +597,10 @@ glabel func_80241A58_C78738 /* C7901C 8024233C C6200040 */ lwc1 $f0, 0x40($s1) /* C79020 80242340 00431021 */ addu $v0, $v0, $v1 /* C79024 80242344 44821000 */ mtc1 $v0, $f2 -/* C79028 80242348 00000000 */ nop +/* C79028 80242348 00000000 */ nop /* C7902C 8024234C 468010A0 */ cvt.s.w $f2, $f2 /* C79030 80242350 4600103C */ c.lt.s $f2, $f0 -/* C79034 80242354 00000000 */ nop +/* C79034 80242354 00000000 */ nop /* C79038 80242358 45030001 */ bc1tl .L80242360 /* C7903C 8024235C E6220040 */ swc1 $f2, 0x40($s1) .L80242360: @@ -609,21 +609,21 @@ glabel func_80241A58_C78738 /* C79048 80242368 C6200040 */ lwc1 $f0, 0x40($s1) /* C7904C 8024236C 00431023 */ subu $v0, $v0, $v1 /* C79050 80242370 44821000 */ mtc1 $v0, $f2 -/* C79054 80242374 00000000 */ nop +/* C79054 80242374 00000000 */ nop /* C79058 80242378 468010A0 */ cvt.s.w $f2, $f2 /* C7905C 8024237C 4602003C */ c.lt.s $f0, $f2 -/* C79060 80242380 00000000 */ nop +/* C79060 80242380 00000000 */ nop /* C79064 80242384 45030001 */ bc1tl .L8024238C /* C79068 80242388 E6220040 */ swc1 $f2, 0x40($s1) .L8024238C: /* C7906C 8024238C 16E0001F */ bnez $s7, .L8024240C -/* C79070 80242390 00000000 */ nop +/* C79070 80242390 00000000 */ nop /* C79074 80242394 8E220000 */ lw $v0, ($s1) /* C79078 80242398 30420008 */ andi $v0, $v0, 8 /* C7907C 8024239C 10400003 */ beqz $v0, .L802423AC /* C79080 802423A0 27A50020 */ addiu $a1, $sp, 0x20 /* C79084 802423A4 13C00019 */ beqz $fp, .L8024240C -/* C79088 802423A8 00000000 */ nop +/* C79088 802423A8 00000000 */ nop .L802423AC: /* C7908C 802423AC 27A60024 */ addiu $a2, $sp, 0x24 /* C79090 802423B0 27A20038 */ addiu $v0, $sp, 0x38 @@ -646,7 +646,7 @@ glabel func_80241A58_C78738 /* C790D4 802423F4 0C0372DF */ jal func_800DCB7C /* C790D8 802423F8 27A70028 */ addiu $a3, $sp, 0x28 /* C790DC 802423FC 10400003 */ beqz $v0, .L8024240C -/* C790E0 80242400 00000000 */ nop +/* C790E0 80242400 00000000 */ nop /* C790E4 80242404 C7A00024 */ lwc1 $f0, 0x24($sp) /* C790E8 80242408 E620003C */ swc1 $f0, 0x3c($s1) .L8024240C: diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242498_C79178.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242498_C79178.s index 6ae01c2c8c..8b58e30e83 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242498_C79178.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242498_C79178.s @@ -27,7 +27,7 @@ glabel func_80242498_C79178 .L802424F0: /* C791D0 802424F0 8482008E */ lh $v0, 0x8e($a0) /* C791D4 802424F4 14400007 */ bnez $v0, .L80242514 -/* C791D8 802424F8 00000000 */ nop +/* C791D8 802424F8 00000000 */ nop /* C791DC 802424FC 8E0200CC */ lw $v0, 0xcc($s0) /* C791E0 80242500 8C420028 */ lw $v0, 0x28($v0) /* C791E4 80242504 A480008E */ sh $zero, 0x8e($a0) diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242528_C79208.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242528_C79208.s index edfe000fe6..0cd6c0f268 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242528_C79208.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242528_C79208.s @@ -18,7 +18,7 @@ glabel func_80242528_C79208 /* C7923C 8024255C 8E0300A0 */ lw $v1, 0xa0($s0) /* C79240 80242560 00021403 */ sra $v0, $v0, 0x10 /* C79244 80242564 14430004 */ bne $v0, $v1, .L80242578 -/* C79248 80242568 00000000 */ nop +/* C79248 80242568 00000000 */ nop /* C7924C 8024256C 8E0200CC */ lw $v0, 0xcc($s0) /* C79250 80242570 8C42002C */ lw $v0, 0x2c($v0) /* C79254 80242574 ACA20028 */ sw $v0, 0x28($a1) @@ -47,7 +47,7 @@ glabel func_80242528_C79208 /* C792A8 802425C8 3C01C1A0 */ lui $at, 0xc1a0 /* C792AC 802425CC 44812000 */ mtc1 $at, $f4 /* C792B0 802425D0 44833000 */ mtc1 $v1, $f6 -/* C792B4 802425D4 00000000 */ nop +/* C792B4 802425D4 00000000 */ nop /* C792B8 802425D8 468031A0 */ cvt.s.w $f6, $f6 /* C792BC 802425DC 8C420000 */ lw $v0, ($v0) /* C792C0 802425E0 44073000 */ mfc1 $a3, $f6 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242628_C79308.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242628_C79308.s index 3835919564..9e8ae74dd5 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242628_C79308.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242628_C79308.s @@ -16,7 +16,7 @@ glabel func_80242628_C79308 /* C79334 80242654 A462008E */ sh $v0, 0x8e($v1) /* C79338 80242658 00021400 */ sll $v0, $v0, 0x10 /* C7933C 8024265C 14400005 */ bnez $v0, .L80242674 -/* C79340 80242660 00000000 */ nop +/* C79340 80242660 00000000 */ nop /* C79344 80242664 960200AA */ lhu $v0, 0xaa($s0) /* C79348 80242668 A462008E */ sh $v0, 0x8e($v1) /* C7934C 8024266C 2402000E */ addiu $v0, $zero, 0xe diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242688_C79368.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242688_C79368.s index 1340c41863..96c2553c08 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242688_C79368.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242688_C79368.s @@ -42,7 +42,7 @@ glabel func_80242688_C79368 /* C793FC 8024271C 2402000F */ addiu $v0, $zero, 0xf /* C79400 80242720 AFA2001C */ sw $v0, 0x1c($sp) /* C79404 80242724 44833000 */ mtc1 $v1, $f6 -/* C79408 80242728 00000000 */ nop +/* C79408 80242728 00000000 */ nop /* C7940C 8024272C 468031A0 */ cvt.s.w $f6, $f6 /* C79410 80242730 44073000 */ mfc1 $a3, $f6 /* C79414 80242734 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242774_C79454.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242774_C79454.s index 0a2261c5c8..825f1d166b 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242774_C79454.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242774_C79454.s @@ -46,7 +46,7 @@ glabel func_80242774_C79454 /* C794F8 80242818 8E2200B0 */ lw $v0, 0xb0($s1) /* C794FC 8024281C 30420004 */ andi $v0, $v0, 4 /* C79500 80242820 10400011 */ beqz $v0, .L80242868 -/* C79504 80242824 00000000 */ nop +/* C79504 80242824 00000000 */ nop .L80242828: /* C79508 80242828 AE400070 */ sw $zero, 0x70($s2) /* C7950C 8024282C A6A0008E */ sh $zero, 0x8e($s5) @@ -78,12 +78,12 @@ glabel func_80242774_C79454 /* C79570 80242890 10600013 */ beqz $v1, .L802428E0 /* C79574 80242894 0240202D */ daddu $a0, $s2, $zero /* C79578 80242898 08090A67 */ j .L8024299C -/* C7957C 8024289C 00000000 */ nop +/* C7957C 8024289C 00000000 */ nop .L802428A0: /* C79580 802428A0 10620018 */ beq $v1, $v0, .L80242904 /* C79584 802428A4 0240202D */ daddu $a0, $s2, $zero /* C79588 802428A8 08090A67 */ j .L8024299C -/* C7958C 802428AC 00000000 */ nop +/* C7958C 802428AC 00000000 */ nop .L802428B0: /* C79590 802428B0 2402000D */ addiu $v0, $zero, 0xd /* C79594 802428B4 10620029 */ beq $v1, $v0, .L8024295C @@ -94,9 +94,9 @@ glabel func_80242774_C79454 /* C795A8 802428C8 1062002D */ beq $v1, $v0, .L80242980 /* C795AC 802428CC 24020063 */ addiu $v0, $zero, 0x63 /* C795B0 802428D0 10620030 */ beq $v1, $v0, .L80242994 -/* C795B4 802428D4 00000000 */ nop +/* C795B4 802428D4 00000000 */ nop /* C795B8 802428D8 08090A67 */ j .L8024299C -/* C795BC 802428DC 00000000 */ nop +/* C795BC 802428DC 00000000 */ nop .L802428E0: /* C795C0 802428E0 0260282D */ daddu $a1, $s3, $zero /* C795C4 802428E4 0C09063C */ jal func_802418F0_C785D0 @@ -107,14 +107,14 @@ glabel func_80242774_C79454 /* C795D4 802428F4 0C090657 */ jal func_8024195C_C7863C /* C795D8 802428F8 0280302D */ daddu $a2, $s4, $zero /* C795DC 802428FC 08090A67 */ j .L8024299C -/* C795E0 80242900 00000000 */ nop +/* C795E0 80242900 00000000 */ nop .L80242904: /* C795E4 80242904 0260282D */ daddu $a1, $s3, $zero /* C795E8 80242908 0C090696 */ jal func_80241A58_C78738 /* C795EC 8024290C 0280302D */ daddu $a2, $s4, $zero /* C795F0 80242910 8E420070 */ lw $v0, 0x70($s2) /* C795F4 80242914 14500021 */ bne $v0, $s0, .L8024299C -/* C795F8 80242918 00000000 */ nop +/* C795F8 80242918 00000000 */ nop .L8024291C: /* C795FC 8024291C 0240202D */ daddu $a0, $s2, $zero /* C79600 80242920 0260282D */ daddu $a1, $s3, $zero @@ -123,7 +123,7 @@ glabel func_80242774_C79454 /* C7960C 8024292C 8E430070 */ lw $v1, 0x70($s2) /* C79610 80242930 2402000C */ addiu $v0, $zero, 0xc /* C79614 80242934 14620019 */ bne $v1, $v0, .L8024299C -/* C79618 80242938 00000000 */ nop +/* C79618 80242938 00000000 */ nop /* C7961C 8024293C 0240202D */ daddu $a0, $s2, $zero .L80242940: /* C79620 80242940 0260282D */ daddu $a1, $s3, $zero @@ -132,7 +132,7 @@ glabel func_80242774_C79454 /* C7962C 8024294C 8E430070 */ lw $v1, 0x70($s2) /* C79630 80242950 2402000D */ addiu $v0, $zero, 0xd /* C79634 80242954 14620011 */ bne $v1, $v0, .L8024299C -/* C79638 80242958 00000000 */ nop +/* C79638 80242958 00000000 */ nop .L8024295C: /* C7963C 8024295C 0240202D */ daddu $a0, $s2, $zero /* C79640 80242960 0260282D */ daddu $a1, $s3, $zero @@ -141,14 +141,14 @@ glabel func_80242774_C79454 /* C7964C 8024296C 8E430070 */ lw $v1, 0x70($s2) /* C79650 80242970 2402000E */ addiu $v0, $zero, 0xe /* C79654 80242974 14620009 */ bne $v1, $v0, .L8024299C -/* C79658 80242978 00000000 */ nop +/* C79658 80242978 00000000 */ nop /* C7965C 8024297C 0240202D */ daddu $a0, $s2, $zero .L80242980: /* C79660 80242980 0260282D */ daddu $a1, $s3, $zero /* C79664 80242984 0C0909A2 */ jal func_80242688_C79368 /* C79668 80242988 0280302D */ daddu $a2, $s4, $zero /* C7966C 8024298C 08090A67 */ j .L8024299C -/* C79670 80242990 00000000 */ nop +/* C79670 80242990 00000000 */ nop .L80242994: /* C79674 80242994 0C0129CF */ jal func_8004A73C /* C79678 80242998 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242A40_C79720.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242A40_C79720.s index b349f12a8c..4703179f4b 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242A40_C79720.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242A40_C79720.s @@ -21,11 +21,11 @@ glabel func_80242A40_C79720 /* C79760 80242A80 A602008E */ sh $v0, 0x8e($s0) /* C79764 80242A84 00021400 */ sll $v0, $v0, 0x10 /* C79768 80242A88 1C400033 */ bgtz $v0, .L80242B58 -/* C7976C 80242A8C 00000000 */ nop +/* C7976C 80242A8C 00000000 */ nop .L80242A90: /* C79770 80242A90 8602008C */ lh $v0, 0x8c($s0) /* C79774 80242A94 14400030 */ bnez $v0, .L80242B58 -/* C79778 80242A98 00000000 */ nop +/* C79778 80242A98 00000000 */ nop /* C7977C 80242A9C 8E2200CC */ lw $v0, 0xcc($s1) /* C79780 80242AA0 8C420024 */ lw $v0, 0x24($v0) /* C79784 80242AA4 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_80242A40_C79720 /* C79790 80242AB0 8E230088 */ lw $v1, 0x88($s1) /* C79794 80242AB4 24020005 */ addiu $v0, $zero, 5 /* C79798 80242AB8 10620005 */ beq $v1, $v0, .L80242AD0 -/* C7979C 80242ABC 00000000 */ nop +/* C7979C 80242ABC 00000000 */ nop /* C797A0 80242AC0 10600003 */ beqz $v1, .L80242AD0 /* C797A4 80242AC4 24020001 */ addiu $v0, $zero, 1 /* C797A8 80242AC8 14620006 */ bne $v1, $v0, .L80242AE4 -/* C797AC 80242ACC 00000000 */ nop +/* C797AC 80242ACC 00000000 */ nop .L80242AD0: /* C797B0 80242AD0 8E220084 */ lw $v0, 0x84($s1) /* C797B4 80242AD4 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_80242A40_C79720 /* C797F4 80242B14 46220000 */ add.d $f0, $f0, $f2 /* C797F8 80242B18 4620010D */ trunc.w.d $f4, $f0 /* C797FC 80242B1C 44022000 */ mfc1 $v0, $f4 -/* C79800 80242B20 00000000 */ nop +/* C79800 80242B20 00000000 */ nop /* C79804 80242B24 A602008E */ sh $v0, 0x8e($s0) /* C79808 80242B28 00021400 */ sll $v0, $v0, 0x10 /* C7980C 80242B2C 8E230078 */ lw $v1, 0x78($s1) /* C79810 80242B30 00021403 */ sra $v0, $v0, 0x10 /* C79814 80242B34 0043102A */ slt $v0, $v0, $v1 /* C79818 80242B38 10400003 */ beqz $v0, .L80242B48 -/* C7981C 80242B3C 00000000 */ nop +/* C7981C 80242B3C 00000000 */ nop /* C79820 80242B40 9622007A */ lhu $v0, 0x7a($s1) /* C79824 80242B44 A602008E */ sh $v0, 0x8e($s0) .L80242B48: diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s index 62bd75ba58..56d5e9cf64 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s @@ -279,15 +279,17 @@ glabel func_80242D58_C79A38 /* C79E24 80243144 2C620015 */ sltiu $v0, $v1, 0x15 /* C79E28 80243148 10400009 */ beqz $v0, .L80243170 /* C79E2C 8024314C 00031080 */ sll $v0, $v1, 2 -/* C79E30 80243150 3C018024 */ lui $at, %hi(D_80247440) +/* C79E30 80243150 3C018024 */ lui $at, %hi(jtbl_80247440_C7E120) /* C79E34 80243154 00220821 */ addu $at, $at, $v0 -/* C79E38 80243158 8C227440 */ lw $v0, %lo(D_80247440)($at) +/* C79E38 80243158 8C227440 */ lw $v0, %lo(jtbl_80247440_C7E120)($at) /* C79E3C 8024315C 00400008 */ jr $v0 /* C79E40 80243160 00000000 */ nop +glabel L80243164_C79E44 /* C79E44 80243164 8E420028 */ lw $v0, 0x28($s2) /* C79E48 80243168 24420001 */ addiu $v0, $v0, 1 /* C79E4C 8024316C AE420028 */ sw $v0, 0x28($s2) .L80243170: +glabel L80243170_C79E50 /* C79E50 80243170 0000102D */ daddu $v0, $zero, $zero .L80243174: /* C79E54 80243174 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802432AC_C79F8C.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802432AC_C79F8C.s index d569372ab5..6ff824e4d8 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802432AC_C79F8C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802432AC_C79F8C.s @@ -26,7 +26,7 @@ glabel func_802432AC_C79F8C /* C79FDC 802432FC 1440FFFA */ bnez $v0, .L802432E8 /* C79FE0 80243300 24A50004 */ addiu $a1, $a1, 4 /* C79FE4 80243304 08090CD2 */ j .L80243348 -/* C79FE8 80243308 00000000 */ nop +/* C79FE8 80243308 00000000 */ nop .L8024330C: /* C79FEC 8024330C 0000182D */ daddu $v1, $zero, $zero /* C79FF0 80243310 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024367C_C7A35C.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024367C_C7A35C.s index 33e2f3cfaa..919ba3f0bc 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024367C_C7A35C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024367C_C7A35C.s @@ -28,7 +28,7 @@ glabel func_8024367C_C7A35C /* C7A3B0 802436D0 00220821 */ addu $at, $at, $v0 /* C7A3B4 802436D4 AC2074A0 */ sw $zero, %lo(D_802474A0)($at) /* C7A3B8 802436D8 08090DC2 */ j .L80243708 -/* C7A3BC 802436DC 00000000 */ nop +/* C7A3BC 802436DC 00000000 */ nop .L802436E0: /* C7A3C0 802436E0 3C038024 */ lui $v1, %hi(D_802474A0) /* C7A3C4 802436E4 246374A0 */ addiu $v1, $v1, %lo(D_802474A0) diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802439D8_C7A6B8.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802439D8_C7A6B8.s index 4b2bcaf025..535ce839a3 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802439D8_C7A6B8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802439D8_C7A6B8.s @@ -13,6 +13,6 @@ glabel func_802439D8_C7A6B8 /* C7A6D8 802439F8 24020002 */ addiu $v0, $zero, 2 /* C7A6DC 802439FC 03E00008 */ jr $ra /* C7A6E0 80243A00 27BD0018 */ addiu $sp, $sp, 0x18 -/* C7A6E4 80243A04 00000000 */ nop -/* C7A6E8 80243A08 00000000 */ nop -/* C7A6EC 80243A0C 00000000 */ nop +/* C7A6E4 80243A04 00000000 */ nop +/* C7A6E8 80243A08 00000000 */ nop +/* C7A6EC 80243A0C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_10/C7E180/func_8024030C_C7E48C.s b/asm/nonmatchings/world/area_kzn/kzn_10/C7E180/func_8024030C_C7E48C.s index 622a90ec75..53d774b9a1 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_10/C7E180/func_8024030C_C7E48C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_10/C7E180/func_8024030C_C7E48C.s @@ -9,5 +9,5 @@ glabel func_8024030C_C7E48C /* C7E49C 8024031C 2C420001 */ sltiu $v0, $v0, 1 /* C7E4A0 80240320 03E00008 */ jr $ra /* C7E4A4 80240324 00021040 */ sll $v0, $v0, 1 -/* C7E4A8 80240328 00000000 */ nop -/* C7E4AC 8024032C 00000000 */ nop +/* C7E4A8 80240328 00000000 */ nop +/* C7E4AC 8024032C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_8024037C_C7E4FC.s b/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_8024037C_C7E4FC.s index 72cbfa03c8..ec50a55776 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_8024037C_C7E4FC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_8024037C_C7E4FC.s @@ -24,11 +24,11 @@ glabel func_8024037C_C7E4FC /* C7E548 802403C8 0C0372DF */ jal func_800DCB7C /* C7E54C 802403CC AFA20010 */ sw $v0, 0x10($sp) /* C7E550 802403D0 1040000B */ beqz $v0, .L80240400 -/* C7E554 802403D4 00000000 */ nop +/* C7E554 802403D4 00000000 */ nop /* C7E558 802403D8 C7A2001C */ lwc1 $f2, 0x1c($sp) /* C7E55C 802403DC 3C01425C */ lui $at, 0x425c /* C7E560 802403E0 44810000 */ mtc1 $at, $f0 -/* C7E564 802403E4 00000000 */ nop +/* C7E564 802403E4 00000000 */ nop /* C7E568 802403E8 46001080 */ add.s $f2, $f2, $f0 /* C7E56C 802403EC C7A00018 */ lwc1 $f0, 0x18($sp) /* C7E570 802403F0 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240414_C7E594.s b/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240414_C7E594.s index bd4fd184f9..6a549a9712 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240414_C7E594.s +++ b/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240414_C7E594.s @@ -13,28 +13,28 @@ glabel func_80240414_C7E594 /* C7E5B4 80240434 468010A0 */ cvt.s.w $f2, $f2 /* C7E5B8 80240438 46001081 */ sub.s $f2, $f2, $f0 /* C7E5BC 8024043C 46021082 */ mul.s $f2, $f2, $f2 -/* C7E5C0 80240440 00000000 */ nop +/* C7E5C0 80240440 00000000 */ nop /* C7E5C4 80240444 C440002C */ lwc1 $f0, 0x2c($v0) /* C7E5C8 80240448 C604008C */ lwc1 $f4, 0x8c($s0) /* C7E5CC 8024044C 46802120 */ cvt.s.w $f4, $f4 /* C7E5D0 80240450 46002101 */ sub.s $f4, $f4, $f0 /* C7E5D4 80240454 46042102 */ mul.s $f4, $f4, $f4 -/* C7E5D8 80240458 00000000 */ nop +/* C7E5D8 80240458 00000000 */ nop /* C7E5DC 8024045C C4460030 */ lwc1 $f6, 0x30($v0) /* C7E5E0 80240460 44800000 */ mtc1 $zero, $f0 -/* C7E5E4 80240464 00000000 */ nop +/* C7E5E4 80240464 00000000 */ nop /* C7E5E8 80240468 46060001 */ sub.s $f0, $f0, $f6 /* C7E5EC 8024046C 46000002 */ mul.s $f0, $f0, $f0 -/* C7E5F0 80240470 00000000 */ nop +/* C7E5F0 80240470 00000000 */ nop /* C7E5F4 80240474 46041080 */ add.s $f2, $f2, $f4 /* C7E5F8 80240478 46001300 */ add.s $f12, $f2, $f0 /* C7E5FC 8024047C 46006004 */ sqrt.s $f0, $f12 /* C7E600 80240480 46000032 */ c.eq.s $f0, $f0 -/* C7E604 80240484 00000000 */ nop +/* C7E604 80240484 00000000 */ nop /* C7E608 80240488 45010003 */ bc1t .L80240498 -/* C7E60C 8024048C 00000000 */ nop +/* C7E60C 8024048C 00000000 */ nop /* C7E610 80240490 0C0187BC */ jal sqrtf -/* C7E614 80240494 00000000 */ nop +/* C7E614 80240494 00000000 */ nop .L80240498: /* C7E618 80240498 4600020D */ trunc.w.s $f8, $f0 /* C7E61C 8024049C E6080094 */ swc1 $f8, 0x94($s0) diff --git a/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404B4_C7E634.s b/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404B4_C7E634.s index 8b613c9570..5c9d544589 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404B4_C7E634.s +++ b/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404B4_C7E634.s @@ -8,7 +8,7 @@ glabel func_802404B4_C7E634 /* C7E640 802404C0 0C0B1EAF */ jal get_variable /* C7E644 802404C4 8C450000 */ lw $a1, ($v0) /* C7E648 802404C8 44820000 */ mtc1 $v0, $f0 -/* C7E64C 802404CC 00000000 */ nop +/* C7E64C 802404CC 00000000 */ nop /* C7E650 802404D0 46800020 */ cvt.s.w $f0, $f0 /* C7E654 802404D4 8FBF0010 */ lw $ra, 0x10($sp) /* C7E658 802404D8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404EC_C7E66C.s b/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404EC_C7E66C.s index 4bd6fb2bba..b25ae428fa 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404EC_C7E66C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404EC_C7E66C.s @@ -21,7 +21,7 @@ glabel func_802404EC_C7E66C /* C7E6AC 8024052C 44801000 */ mtc1 $zero, $f2 /* C7E6B0 80240530 46000021 */ cvt.d.s $f0, $f0 /* C7E6B4 80240534 46220002 */ mul.d $f0, $f0, $f2 -/* C7E6B8 80240538 00000000 */ nop +/* C7E6B8 80240538 00000000 */ nop /* C7E6BC 8024053C C60C0090 */ lwc1 $f12, 0x90($s0) /* C7E6C0 80240540 46806320 */ cvt.s.w $f12, $f12 /* C7E6C4 80240544 46006307 */ neg.s $f12, $f12 @@ -39,7 +39,7 @@ glabel func_802404EC_C7E66C /* C7E6F4 80240574 44801000 */ mtc1 $zero, $f2 /* C7E6F8 80240578 46000021 */ cvt.d.s $f0, $f0 /* C7E6FC 8024057C 46220002 */ mul.d $f0, $f0, $f2 -/* C7E700 80240580 00000000 */ nop +/* C7E700 80240580 00000000 */ nop /* C7E704 80240584 4620010D */ trunc.w.d $f4, $f0 /* C7E708 80240588 E604009C */ swc1 $f4, 0x9c($s0) /* C7E70C 8024058C 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802405A4_C7E724.s b/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802405A4_C7E724.s index c496cd3c1f..54626acfcc 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802405A4_C7E724.s +++ b/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802405A4_C7E724.s @@ -13,7 +13,7 @@ glabel func_802405A4_C7E724 /* C7E744 802405C4 46201081 */ sub.d $f2, $f2, $f0 /* C7E748 802405C8 462010A0 */ cvt.s.d $f2, $f2 /* C7E74C 802405CC 46021082 */ mul.s $f2, $f2, $f2 -/* C7E750 802405D0 00000000 */ nop +/* C7E750 802405D0 00000000 */ nop /* C7E754 802405D4 3C014047 */ lui $at, 0x4047 /* C7E758 802405D8 44810800 */ mtc1 $at, $f1 /* C7E75C 802405DC 44800000 */ mtc1 $zero, $f0 @@ -22,15 +22,15 @@ glabel func_802405A4_C7E724 /* C7E768 802405E8 46240001 */ sub.d $f0, $f0, $f4 /* C7E76C 802405EC 46200020 */ cvt.s.d $f0, $f0 /* C7E770 802405F0 46000002 */ mul.s $f0, $f0, $f0 -/* C7E774 802405F4 00000000 */ nop +/* C7E774 802405F4 00000000 */ nop /* C7E778 802405F8 46001300 */ add.s $f12, $f2, $f0 /* C7E77C 802405FC 46006004 */ sqrt.s $f0, $f12 /* C7E780 80240600 46000032 */ c.eq.s $f0, $f0 -/* C7E784 80240604 00000000 */ nop +/* C7E784 80240604 00000000 */ nop /* C7E788 80240608 45030004 */ bc1tl .L8024061C /* C7E78C 8024060C 46000007 */ neg.s $f0, $f0 /* C7E790 80240610 0C0187BC */ jal sqrtf -/* C7E794 80240614 00000000 */ nop +/* C7E794 80240614 00000000 */ nop /* C7E798 80240618 46000007 */ neg.s $f0, $f0 .L8024061C: /* C7E79C 8024061C 4600018D */ trunc.w.s $f6, $f0 diff --git a/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240638_C7E7B8.s b/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240638_C7E7B8.s index 2a9f254061..0de619f849 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240638_C7E7B8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240638_C7E7B8.s @@ -29,7 +29,7 @@ glabel func_80240638_C7E7B8 /* C7E818 80240698 44060000 */ mfc1 $a2, $f0 /* C7E81C 8024069C 44071000 */ mfc1 $a3, $f2 /* C7E820 802406A0 44820000 */ mtc1 $v0, $f0 -/* C7E824 802406A4 00000000 */ nop +/* C7E824 802406A4 00000000 */ nop /* C7E828 802406A8 46800020 */ cvt.s.w $f0, $f0 /* C7E82C 802406AC AE220078 */ sw $v0, 0x78($s1) /* C7E830 802406B0 0C05267B */ jal func_801499EC diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240310_C804B0.s b/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240310_C804B0.s index 83315e428b..277d69a9c7 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240310_C804B0.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240310_C804B0.s @@ -26,17 +26,17 @@ glabel func_80240310_C804B0 /* C80504 80240364 2442A550 */ addiu $v0, $v0, %lo(gCollisionStatus) /* C80508 80240368 84430002 */ lh $v1, 2($v0) /* C8050C 8024036C 10710008 */ beq $v1, $s1, .L80240390 -/* C80510 80240370 00000000 */ nop +/* C80510 80240370 00000000 */ nop /* C80514 80240374 84420004 */ lh $v0, 4($v0) /* C80518 80240378 10510005 */ beq $v0, $s1, .L80240390 -/* C8051C 8024037C 00000000 */ nop +/* C8051C 8024037C 00000000 */ nop /* C80520 80240380 10700003 */ beq $v1, $s0, .L80240390 -/* C80524 80240384 00000000 */ nop +/* C80524 80240384 00000000 */ nop /* C80528 80240388 14500007 */ bne $v0, $s0, .L802403A8 -/* C8052C 8024038C 00000000 */ nop +/* C8052C 8024038C 00000000 */ nop .L80240390: /* C80530 80240390 44920000 */ mtc1 $s2, $f0 -/* C80534 80240394 00000000 */ nop +/* C80534 80240394 00000000 */ nop /* C80538 80240398 46800020 */ cvt.s.w $f0, $f0 /* C8053C 8024039C 3C028011 */ lui $v0, %hi(gPlayerStatus) /* C80540 802403A0 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) @@ -45,18 +45,18 @@ glabel func_80240310_C804B0 /* C80548 802403A8 3C028011 */ lui $v0, %hi(gPlayerData+0x12) /* C8054C 802403AC 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* C80550 802403B0 1040000E */ beqz $v0, .L802403EC -/* C80554 802403B4 00000000 */ nop +/* C80554 802403B4 00000000 */ nop /* C80558 802403B8 0C00EABB */ jal get_npc_unsafe /* C8055C 802403BC 2404FFFC */ addiu $a0, $zero, -4 /* C80560 802403C0 84430084 */ lh $v1, 0x84($v0) /* C80564 802403C4 10710003 */ beq $v1, $s1, .L802403D4 -/* C80568 802403C8 00000000 */ nop +/* C80568 802403C8 00000000 */ nop /* C8056C 802403CC 14700007 */ bne $v1, $s0, .L802403EC -/* C80570 802403D0 00000000 */ nop +/* C80570 802403D0 00000000 */ nop .L802403D4: /* C80574 802403D4 C4400038 */ lwc1 $f0, 0x38($v0) /* C80578 802403D8 44921000 */ mtc1 $s2, $f2 -/* C8057C 802403DC 00000000 */ nop +/* C8057C 802403DC 00000000 */ nop /* C80580 802403E0 468010A0 */ cvt.s.w $f2, $f2 /* C80584 802403E4 46020000 */ add.s $f0, $f0, $f2 /* C80588 802403E8 E4400038 */ swc1 $f0, 0x38($v0) diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240434_C805D4.s b/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240434_C805D4.s index 6c184d03ff..b015c53977 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240434_C805D4.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240434_C805D4.s @@ -12,5 +12,5 @@ glabel func_80240434_C805D4 .L80240450: /* C805F0 80240450 03E00008 */ jr $ra /* C805F4 80240454 24020002 */ addiu $v0, $zero, 2 -/* C805F8 80240458 00000000 */ nop -/* C805FC 8024045C 00000000 */ nop +/* C805F8 80240458 00000000 */ nop +/* C805FC 8024045C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240460_C80600.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240460_C80600.s index 44f907fd4d..a329cdff21 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240460_C80600.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240460_C80600.s @@ -47,7 +47,7 @@ glabel func_80240460_C80600 /* C806A8 80240508 0C0123F5 */ jal is_point_within_region /* C806AC 8024050C 8E070038 */ lw $a3, 0x38($s0) /* C806B0 80240510 1040000E */ beqz $v0, .L8024054C -/* C806B4 80240514 00000000 */ nop +/* C806B4 80240514 00000000 */ nop /* C806B8 80240518 8E2200D0 */ lw $v0, 0xd0($s1) /* C806BC 8024051C C60C0038 */ lwc1 $f12, 0x38($s0) /* C806C0 80240520 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240460_C80600 /* C806D4 80240534 468031A0 */ cvt.s.w $f6, $f6 /* C806D8 80240538 44073000 */ mfc1 $a3, $f6 /* C806DC 8024053C 0C00A720 */ jal atan2 -/* C806E0 80240540 00000000 */ nop +/* C806E0 80240540 00000000 */ nop /* C806E4 80240544 0809015F */ j .L8024057C /* C806E8 80240548 E600000C */ swc1 $f0, 0xc($s0) .L8024054C: @@ -66,7 +66,7 @@ glabel func_80240460_C80600 /* C806F0 80240550 2404003C */ addiu $a0, $zero, 0x3c /* C806F4 80240554 C60C000C */ lwc1 $f12, 0xc($s0) /* C806F8 80240558 44820000 */ mtc1 $v0, $f0 -/* C806FC 8024055C 00000000 */ nop +/* C806FC 8024055C 00000000 */ nop /* C80700 80240560 46800020 */ cvt.s.w $f0, $f0 /* C80704 80240564 46006300 */ add.s $f12, $f12, $f0 /* C80708 80240568 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240460_C80600 /* C8072C 8024058C 8E2200D0 */ lw $v0, 0xd0($s1) /* C80730 80240590 8C420014 */ lw $v0, 0x14($v0) /* C80734 80240594 04410004 */ bgez $v0, .L802405A8 -/* C80738 80240598 00000000 */ nop +/* C80738 80240598 00000000 */ nop /* C8073C 8024059C C6400000 */ lwc1 $f0, ($s2) /* C80740 802405A0 08090172 */ j .L802405C8 /* C80744 802405A4 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240460_C80600 /* C80748 802405A8 3C018024 */ lui $at, %hi(D_80245850) /* C8074C 802405AC D4225850 */ ldc1 $f2, %lo(D_80245850)($at) /* C80750 802405B0 44820000 */ mtc1 $v0, $f0 -/* C80754 802405B4 00000000 */ nop +/* C80754 802405B4 00000000 */ nop /* C80758 802405B8 46800021 */ cvt.d.w $f0, $f0 /* C8075C 802405BC 46220003 */ div.d $f0, $f0, $f2 /* C80760 802405C0 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240460_C80600 /* C80774 802405D4 44801000 */ mtc1 $zero, $f2 /* C80778 802405D8 46000021 */ cvt.d.s $f0, $f0 /* C8077C 802405DC 46220002 */ mul.d $f0, $f0, $f2 -/* C80780 802405E0 00000000 */ nop +/* C80780 802405E0 00000000 */ nop /* C80784 802405E4 24020001 */ addiu $v0, $zero, 1 /* C80788 802405E8 4620018D */ trunc.w.d $f6, $f0 /* C8078C 802405EC E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240610_C807B0.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240610_C807B0.s index 46d9d18964..1bdafa52be 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240610_C807B0.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240610_C807B0.s @@ -34,7 +34,7 @@ glabel func_80240610_C807B0 /* C80824 80240684 44803000 */ mtc1 $zero, $f6 /* C80828 80240688 46000021 */ cvt.d.s $f0, $f0 /* C8082C 8024068C 46260002 */ mul.d $f0, $f0, $f6 -/* C80830 80240690 00000000 */ nop +/* C80830 80240690 00000000 */ nop /* C80834 80240694 24020001 */ addiu $v0, $zero, 1 /* C80838 80240698 8E24006C */ lw $a0, 0x6c($s1) /* C8083C 8024069C 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80240610_C807B0 /* C80898 802406F8 C600003C */ lwc1 $f0, 0x3c($s0) /* C8089C 802406FC 4600C001 */ sub.s $f0, $f24, $f0 /* C808A0 80240700 4600B03C */ c.lt.s $f22, $f0 -/* C808A4 80240704 00000000 */ nop +/* C808A4 80240704 00000000 */ nop /* C808A8 80240708 4500001B */ bc1f .L80240778 /* C808AC 8024070C 34820010 */ ori $v0, $a0, 0x10 /* C808B0 80240710 080901DE */ j .L80240778 @@ -87,9 +87,9 @@ glabel func_80240610_C807B0 /* C808F4 80240754 C7A00034 */ lwc1 $f0, 0x34($sp) /* C808F8 80240758 4600D001 */ sub.s $f0, $f26, $f0 /* C808FC 8024075C 4600B03C */ c.lt.s $f22, $f0 -/* C80900 80240760 00000000 */ nop +/* C80900 80240760 00000000 */ nop /* C80904 80240764 45000004 */ bc1f .L80240778 -/* C80908 80240768 00000000 */ nop +/* C80908 80240768 00000000 */ nop /* C8090C 8024076C 8E22006C */ lw $v0, 0x6c($s1) /* C80910 80240770 34420010 */ ori $v0, $v0, 0x10 /* C80914 80240774 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80240610_C807B0 /* C8091C 8024077C 24030011 */ addiu $v1, $zero, 0x11 /* C80920 80240780 30420011 */ andi $v0, $v0, 0x11 /* C80924 80240784 14430039 */ bne $v0, $v1, .L8024086C -/* C80928 80240788 00000000 */ nop +/* C80928 80240788 00000000 */ nop /* C8092C 8024078C 8E020000 */ lw $v0, ($s0) /* C80930 80240790 30420008 */ andi $v0, $v0, 8 /* C80934 80240794 1040000A */ beqz $v0, .L802407C0 @@ -108,7 +108,7 @@ glabel func_80240610_C807B0 /* C80944 802407A4 D4205858 */ ldc1 $f0, %lo(D_80245858)($at) /* C80948 802407A8 460010A1 */ cvt.d.s $f2, $f2 /* C8094C 802407AC 46201082 */ mul.d $f2, $f2, $f0 -/* C80950 802407B0 00000000 */ nop +/* C80950 802407B0 00000000 */ nop /* C80954 802407B4 4600A021 */ cvt.d.s $f0, $f20 /* C80958 802407B8 08090209 */ j .L80240824 /* C8095C 802407BC 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80240610_C807B0 /* C809AC 8024080C D4205860 */ ldc1 $f0, %lo(D_80245860)($at) /* C809B0 80240810 460010A1 */ cvt.d.s $f2, $f2 /* C809B4 80240814 46201082 */ mul.d $f2, $f2, $f0 -/* C809B8 80240818 00000000 */ nop +/* C809B8 80240818 00000000 */ nop /* C809BC 8024081C 4600A021 */ cvt.d.s $f0, $f20 /* C809C0 80240820 46220000 */ add.d $f0, $f0, $f2 .L80240824: @@ -149,7 +149,7 @@ glabel func_80240610_C807B0 /* C809E0 80240840 46000005 */ abs.s $f0, $f0 /* C809E4 80240844 46000021 */ cvt.d.s $f0, $f0 /* C809E8 80240848 4622003C */ c.lt.d $f0, $f2 -/* C809EC 8024084C 00000000 */ nop +/* C809EC 8024084C 00000000 */ nop /* C809F0 80240850 45000036 */ bc1f .L8024092C /* C809F4 80240854 2403FFEF */ addiu $v1, $zero, -0x11 /* C809F8 80240858 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80240610_C807B0 .L8024086C: /* C80A0C 8024086C 8E220070 */ lw $v0, 0x70($s1) /* C80A10 80240870 1840002E */ blez $v0, .L8024092C -/* C80A14 80240874 00000000 */ nop +/* C80A14 80240874 00000000 */ nop /* C80A18 80240878 C62C0074 */ lwc1 $f12, 0x74($s1) /* C80A1C 8024087C 0C00A8BB */ jal sin_deg /* C80A20 80240880 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80240610_C807B0 /* C80A78 802408D8 27A70030 */ addiu $a3, $sp, 0x30 .L802408DC: /* C80A7C 802408DC 10400007 */ beqz $v0, .L802408FC -/* C80A80 802408E0 00000000 */ nop +/* C80A80 802408E0 00000000 */ nop /* C80A84 802408E4 4616A082 */ mul.s $f2, $f20, $f22 -/* C80A88 802408E8 00000000 */ nop +/* C80A88 802408E8 00000000 */ nop /* C80A8C 802408EC C7A0002C */ lwc1 $f0, 0x2c($sp) /* C80A90 802408F0 461A0000 */ add.s $f0, $f0, $f26 /* C80A94 802408F4 08090242 */ j .L80240908 /* C80A98 802408F8 46020000 */ add.s $f0, $f0, $f2 .L802408FC: /* C80A9C 802408FC 4616A002 */ mul.s $f0, $f20, $f22 -/* C80AA0 80240900 00000000 */ nop +/* C80AA0 80240900 00000000 */ nop /* C80AA4 80240904 4600C000 */ add.s $f0, $f24, $f0 .L80240908: /* C80AA8 80240908 E600003C */ swc1 $f0, 0x3c($s0) /* C80AAC 8024090C 8E220074 */ lw $v0, 0x74($s1) /* C80AB0 80240910 2442000A */ addiu $v0, $v0, 0xa /* C80AB4 80240914 44826000 */ mtc1 $v0, $f12 -/* C80AB8 80240918 00000000 */ nop +/* C80AB8 80240918 00000000 */ nop /* C80ABC 8024091C 0C00A6C9 */ jal clamp_angle /* C80AC0 80240920 46806320 */ cvt.s.w $f12, $f12 /* C80AC4 80240924 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80240610_C807B0 /* C80AD4 80240934 2442FFFF */ addiu $v0, $v0, -1 /* C80AD8 80240938 8E430014 */ lw $v1, 0x14($s2) /* C80ADC 8024093C 04600048 */ bltz $v1, .L80240A60 -/* C80AE0 80240940 00000000 */ nop +/* C80AE0 80240940 00000000 */ nop /* C80AE4 80240944 8E620074 */ lw $v0, 0x74($s3) /* C80AE8 80240948 1C400042 */ bgtz $v0, .L80240A54 /* C80AEC 8024094C 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80240610_C807B0 /* C80AF4 80240954 860200A8 */ lh $v0, 0xa8($s0) /* C80AF8 80240958 C602003C */ lwc1 $f2, 0x3c($s0) /* C80AFC 8024095C 44820000 */ mtc1 $v0, $f0 -/* C80B00 80240960 00000000 */ nop +/* C80B00 80240960 00000000 */ nop /* C80B04 80240964 46800020 */ cvt.s.w $f0, $f0 /* C80B08 80240968 46001080 */ add.s $f2, $f2, $f0 /* C80B0C 8024096C 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80240610_C807B0 /* C80B28 80240988 C440002C */ lwc1 $f0, 0x2c($v0) /* C80B2C 8024098C 46000021 */ cvt.d.s $f0, $f0 /* C80B30 80240990 4622003C */ c.lt.d $f0, $f2 -/* C80B34 80240994 00000000 */ nop +/* C80B34 80240994 00000000 */ nop /* C80B38 80240998 4500002C */ bc1f .L80240A4C /* C80B3C 8024099C 02A0202D */ daddu $a0, $s5, $zero /* C80B40 802409A0 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80240610_C807B0 /* C80B7C 802409DC 3C01C1A0 */ lui $at, 0xc1a0 /* C80B80 802409E0 44812000 */ mtc1 $at, $f4 /* C80B84 802409E4 44834000 */ mtc1 $v1, $f8 -/* C80B88 802409E8 00000000 */ nop +/* C80B88 802409E8 00000000 */ nop /* C80B8C 802409EC 46804220 */ cvt.s.w $f8, $f8 /* C80B90 802409F0 44074000 */ mfc1 $a3, $f8 /* C80B94 802409F4 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80240610_C807B0 /* C80C48 80240AA8 0C0123F5 */ jal is_point_within_region /* C80C4C 80240AAC 8E070038 */ lw $a3, 0x38($s0) /* C80C50 80240AB0 1040001A */ beqz $v0, .L80240B1C -/* C80C54 80240AB4 00000000 */ nop +/* C80C54 80240AB4 00000000 */ nop /* C80C58 80240AB8 8E060038 */ lw $a2, 0x38($s0) /* C80C5C 80240ABC 8E2200D0 */ lw $v0, 0xd0($s1) /* C80C60 80240AC0 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80240610_C807B0 /* C80C74 80240AD4 468073A0 */ cvt.s.w $f14, $f14 /* C80C78 80240AD8 C6020018 */ lwc1 $f2, 0x18($s0) /* C80C7C 80240ADC 4600103C */ c.lt.s $f2, $f0 -/* C80C80 80240AE0 00000000 */ nop +/* C80C80 80240AE0 00000000 */ nop /* C80C84 80240AE4 4500000D */ bc1f .L80240B1C /* C80C88 80240AE8 E7A00034 */ swc1 $f0, 0x34($sp) /* C80C8C 80240AEC C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80240610_C807B0 /* C80CC8 80240B28 00621825 */ or $v1, $v1, $v0 /* C80CCC 80240B2C 00741825 */ or $v1, $v1, $s4 /* C80CD0 80240B30 10600008 */ beqz $v1, .L80240B54 -/* C80CD4 80240B34 00000000 */ nop +/* C80CD4 80240B34 00000000 */ nop /* C80CD8 80240B38 8602008C */ lh $v0, 0x8c($s0) /* C80CDC 80240B3C 14400031 */ bnez $v0, .L80240C04 -/* C80CE0 80240B40 00000000 */ nop +/* C80CE0 80240B40 00000000 */ nop /* C80CE4 80240B44 8E050018 */ lw $a1, 0x18($s0) /* C80CE8 80240B48 8E06000C */ lw $a2, 0xc($s0) /* C80CEC 80240B4C 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_80240610_C807B0 /* C80D00 80240B60 44801000 */ mtc1 $zero, $f2 /* C80D04 80240B64 46000021 */ cvt.d.s $f0, $f0 /* C80D08 80240B68 46220002 */ mul.d $f0, $f0, $f2 -/* C80D0C 80240B6C 00000000 */ nop +/* C80D0C 80240B6C 00000000 */ nop /* C80D10 80240B70 4620020D */ trunc.w.d $f8, $f0 /* C80D14 80240B74 E628007C */ swc1 $f8, 0x7c($s1) /* C80D18 80240B78 8E420004 */ lw $v0, 4($s2) /* C80D1C 80240B7C 18400021 */ blez $v0, .L80240C04 -/* C80D20 80240B80 00000000 */ nop +/* C80D20 80240B80 00000000 */ nop /* C80D24 80240B84 8602008E */ lh $v0, 0x8e($s0) /* C80D28 80240B88 9603008E */ lhu $v1, 0x8e($s0) /* C80D2C 80240B8C 18400005 */ blez $v0, .L80240BA4 @@ -375,7 +375,7 @@ glabel func_80240610_C807B0 /* C80D34 80240B94 A602008E */ sh $v0, 0x8e($s0) /* C80D38 80240B98 00021400 */ sll $v0, $v0, 0x10 /* C80D3C 80240B9C 1C400019 */ bgtz $v0, .L80240C04 -/* C80D40 80240BA0 00000000 */ nop +/* C80D40 80240BA0 00000000 */ nop .L80240BA4: /* C80D44 80240BA4 240403E8 */ addiu $a0, $zero, 0x3e8 /* C80D48 80240BA8 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80240610_C807B0 /* C80D90 80240BF0 18400003 */ blez $v0, .L80240C00 /* C80D94 80240BF4 28620003 */ slti $v0, $v1, 3 /* C80D98 80240BF8 10400002 */ beqz $v0, .L80240C04 -/* C80D9C 80240BFC 00000000 */ nop +/* C80D9C 80240BFC 00000000 */ nop .L80240C00: /* C80DA0 80240C00 AE600070 */ sw $zero, 0x70($s3) .L80240C04: diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240CF8_C80E98.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240CF8_C80E98.s index 42e744974d..308464a4a1 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240CF8_C80E98.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240CF8_C80E98.s @@ -42,11 +42,11 @@ glabel func_80240CF8_C80E98 .L80240D8C: /* C80F2C 80240D8C 8E220070 */ lw $v0, 0x70($s1) /* C80F30 80240D90 18400034 */ blez $v0, .L80240E64 -/* C80F34 80240D94 00000000 */ nop +/* C80F34 80240D94 00000000 */ nop /* C80F38 80240D98 C62C0074 */ lwc1 $f12, 0x74($s1) /* C80F3C 80240D9C 46806320 */ cvt.s.w $f12, $f12 /* C80F40 80240DA0 44820000 */ mtc1 $v0, $f0 -/* C80F44 80240DA4 00000000 */ nop +/* C80F44 80240DA4 00000000 */ nop /* C80F48 80240DA8 46800020 */ cvt.s.w $f0, $f0 /* C80F4C 80240DAC 46000021 */ cvt.d.s $f0, $f0 /* C80F50 80240DB0 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_80240CF8_C80E98 /* C80FB0 80240E10 27A70030 */ addiu $a3, $sp, 0x30 .L80240E14: /* C80FB4 80240E14 10400007 */ beqz $v0, .L80240E34 -/* C80FB8 80240E18 00000000 */ nop +/* C80FB8 80240E18 00000000 */ nop /* C80FBC 80240E1C 4616A082 */ mul.s $f2, $f20, $f22 -/* C80FC0 80240E20 00000000 */ nop +/* C80FC0 80240E20 00000000 */ nop /* C80FC4 80240E24 C7A0002C */ lwc1 $f0, 0x2c($sp) /* C80FC8 80240E28 46180000 */ add.s $f0, $f0, $f24 /* C80FCC 80240E2C 08090390 */ j .L80240E40 /* C80FD0 80240E30 46020000 */ add.s $f0, $f0, $f2 .L80240E34: /* C80FD4 80240E34 4616A002 */ mul.s $f0, $f20, $f22 -/* C80FD8 80240E38 00000000 */ nop +/* C80FD8 80240E38 00000000 */ nop /* C80FDC 80240E3C 4600D000 */ add.s $f0, $f26, $f0 .L80240E40: /* C80FE0 80240E40 E600003C */ swc1 $f0, 0x3c($s0) /* C80FE4 80240E44 8E220074 */ lw $v0, 0x74($s1) /* C80FE8 80240E48 2442000A */ addiu $v0, $v0, 0xa /* C80FEC 80240E4C 44826000 */ mtc1 $v0, $f12 -/* C80FF0 80240E50 00000000 */ nop +/* C80FF0 80240E50 00000000 */ nop /* C80FF4 80240E54 0C00A6C9 */ jal clamp_angle /* C80FF8 80240E58 46806320 */ cvt.s.w $f12, $f12 /* C80FFC 80240E5C 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_80240CF8_C80E98 /* C81010 80240E70 860200A8 */ lh $v0, 0xa8($s0) /* C81014 80240E74 C600003C */ lwc1 $f0, 0x3c($s0) /* C81018 80240E78 44821000 */ mtc1 $v0, $f2 -/* C8101C 80240E7C 00000000 */ nop +/* C8101C 80240E7C 00000000 */ nop /* C81020 80240E80 468010A0 */ cvt.s.w $f2, $f2 /* C81024 80240E84 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C81028 80240E88 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_80240CF8_C80E98 /* C81044 80240EA4 46240000 */ add.d $f0, $f0, $f4 /* C81048 80240EA8 460010A1 */ cvt.d.s $f2, $f2 /* C8104C 80240EAC 4620103C */ c.lt.d $f2, $f0 -/* C81050 80240EB0 00000000 */ nop +/* C81050 80240EB0 00000000 */ nop /* C81054 80240EB4 4500002E */ bc1f .L80240F70 /* C81058 80240EB8 0280202D */ daddu $a0, $s4, $zero /* C8105C 80240EBC 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_80240CF8_C80E98 /* C8109C 80240EFC 3C01C1A0 */ lui $at, 0xc1a0 /* C810A0 80240F00 44812000 */ mtc1 $at, $f4 /* C810A4 80240F04 44834000 */ mtc1 $v1, $f8 -/* C810A8 80240F08 00000000 */ nop +/* C810A8 80240F08 00000000 */ nop /* C810AC 80240F0C 46804220 */ cvt.s.w $f8, $f8 /* C810B0 80240F10 44074000 */ mfc1 $a3, $f8 /* C810B4 80240F14 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_80240CF8_C80E98 .L80240F70: /* C81110 80240F70 8602008C */ lh $v0, 0x8c($s0) /* C81114 80240F74 14400025 */ bnez $v0, .L8024100C -/* C81118 80240F78 00000000 */ nop +/* C81118 80240F78 00000000 */ nop /* C8111C 80240F7C 8602008E */ lh $v0, 0x8e($s0) /* C81120 80240F80 1C400022 */ bgtz $v0, .L8024100C -/* C81124 80240F84 00000000 */ nop +/* C81124 80240F84 00000000 */ nop /* C81128 80240F88 8E620074 */ lw $v0, 0x74($s3) /* C8112C 80240F8C 2442FFFF */ addiu $v0, $v0, -1 /* C81130 80240F90 1840001D */ blez $v0, .L80241008 @@ -183,7 +183,7 @@ glabel func_80240CF8_C80E98 /* C8113C 80240F9C 9442002A */ lhu $v0, 0x2a($v0) /* C81140 80240FA0 30420010 */ andi $v0, $v0, 0x10 /* C81144 80240FA4 14400007 */ bnez $v0, .L80240FC4 -/* C81148 80240FA8 00000000 */ nop +/* C81148 80240FA8 00000000 */ nop /* C8114C 80240FAC C600000C */ lwc1 $f0, 0xc($s0) /* C81150 80240FB0 3C014334 */ lui $at, 0x4334 /* C81154 80240FB4 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241120_C812C0.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241120_C812C0.s index 14f79cc455..58c38c60a0 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241120_C812C0.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241120_C812C0.s @@ -60,18 +60,18 @@ glabel func_80241120_C812C0 /* C81398 802411F8 C6200038 */ lwc1 $f0, 0x38($s1) /* C8139C 802411FC 4600018D */ trunc.w.s $f6, $f0 /* C813A0 80241200 44023000 */ mfc1 $v0, $f6 -/* C813A4 80241204 00000000 */ nop +/* C813A4 80241204 00000000 */ nop /* C813A8 80241208 A6420010 */ sh $v0, 0x10($s2) /* C813AC 8024120C C620003C */ lwc1 $f0, 0x3c($s1) /* C813B0 80241210 4600018D */ trunc.w.s $f6, $f0 /* C813B4 80241214 44023000 */ mfc1 $v0, $f6 -/* C813B8 80241218 00000000 */ nop +/* C813B8 80241218 00000000 */ nop /* C813BC 8024121C A6420012 */ sh $v0, 0x12($s2) /* C813C0 80241220 C6200040 */ lwc1 $f0, 0x40($s1) /* C813C4 80241224 A2430007 */ sb $v1, 7($s2) /* C813C8 80241228 4600018D */ trunc.w.s $f6, $f0 /* C813CC 8024122C 44023000 */ mfc1 $v0, $f6 -/* C813D0 80241230 00000000 */ nop +/* C813D0 80241230 00000000 */ nop /* C813D4 80241234 A6420014 */ sh $v0, 0x14($s2) .L80241238: /* C813D8 80241238 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_802412B8_C81458.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_802412B8_C81458.s index 6ac701e4a0..0c7cfb7566 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_802412B8_C81458.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_802412B8_C81458.s @@ -42,9 +42,9 @@ glabel func_802412B8_C81458 /* C814EC 8024134C 44801800 */ mtc1 $zero, $f3 /* C814F0 80241350 46002021 */ cvt.d.s $f0, $f4 /* C814F4 80241354 4620103E */ c.le.d $f2, $f0 -/* C814F8 80241358 00000000 */ nop +/* C814F8 80241358 00000000 */ nop /* C814FC 8024135C 45000030 */ bc1f .L80241420 -/* C81500 80241360 00000000 */ nop +/* C81500 80241360 00000000 */ nop /* C81504 80241364 C600003C */ lwc1 $f0, 0x3c($s0) /* C81508 80241368 46040000 */ add.s $f0, $f0, $f4 /* C8150C 8024136C E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_802412B8_C81458 /* C8156C 802413CC 27A70020 */ addiu $a3, $sp, 0x20 .L802413D0: /* C81570 802413D0 1040000B */ beqz $v0, .L80241400 -/* C81574 802413D4 00000000 */ nop +/* C81574 802413D4 00000000 */ nop /* C81578 802413D8 C7A0001C */ lwc1 $f0, 0x1c($sp) /* C8157C 802413DC 46140080 */ add.s $f2, $f0, $f20 /* C81580 802413E0 C600003C */ lwc1 $f0, 0x3c($s0) /* C81584 802413E4 4600103E */ c.le.s $f2, $f0 -/* C81588 802413E8 00000000 */ nop +/* C81588 802413E8 00000000 */ nop /* C8158C 802413EC 4500008D */ bc1f .L80241624 -/* C81590 802413F0 00000000 */ nop +/* C81590 802413F0 00000000 */ nop /* C81594 802413F4 E602003C */ swc1 $f2, 0x3c($s0) /* C81598 802413F8 08090589 */ j .L80241624 /* C8159C 802413FC AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_802412B8_C81458 /* C815A0 80241400 C602003C */ lwc1 $f2, 0x3c($s0) /* C815A4 80241404 C6000064 */ lwc1 $f0, 0x64($s0) /* C815A8 80241408 4602003E */ c.le.s $f0, $f2 -/* C815AC 8024140C 00000000 */ nop +/* C815AC 8024140C 00000000 */ nop /* C815B0 80241410 45030084 */ bc1tl .L80241624 /* C815B4 80241414 AE400070 */ sw $zero, 0x70($s2) /* C815B8 80241418 08090589 */ j .L80241624 -/* C815BC 8024141C 00000000 */ nop +/* C815BC 8024141C 00000000 */ nop .L80241420: /* C815C0 80241420 4622003C */ c.lt.d $f0, $f2 -/* C815C4 80241424 00000000 */ nop +/* C815C4 80241424 00000000 */ nop /* C815C8 80241428 4500007E */ bc1f .L80241624 -/* C815CC 8024142C 00000000 */ nop +/* C815CC 8024142C 00000000 */ nop /* C815D0 80241430 9602008E */ lhu $v0, 0x8e($s0) /* C815D4 80241434 24420001 */ addiu $v0, $v0, 1 /* C815D8 80241438 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_802412B8_C81458 /* C815E4 80241444 00021403 */ sra $v0, $v0, 0x10 /* C815E8 80241448 0043102A */ slt $v0, $v0, $v1 /* C815EC 8024144C 14400026 */ bnez $v0, .L802414E8 -/* C815F0 80241450 00000000 */ nop +/* C815F0 80241450 00000000 */ nop /* C815F4 80241454 C60C0038 */ lwc1 $f12, 0x38($s0) /* C815F8 80241458 C60E0040 */ lwc1 $f14, 0x40($s0) /* C815FC 8024145C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_802412B8_C81458 /* C81628 80241488 8E62001C */ lw $v0, 0x1c($s3) /* C8162C 8024148C 46001005 */ abs.s $f0, $f2 /* C81630 80241490 44822000 */ mtc1 $v0, $f4 -/* C81634 80241494 00000000 */ nop +/* C81634 80241494 00000000 */ nop /* C81638 80241498 46802120 */ cvt.s.w $f4, $f4 /* C8163C 8024149C 4600203C */ c.lt.s $f4, $f0 -/* C81640 802414A0 00000000 */ nop +/* C81640 802414A0 00000000 */ nop /* C81644 802414A4 4500000D */ bc1f .L802414DC -/* C81648 802414A8 00000000 */ nop +/* C81648 802414A8 00000000 */ nop /* C8164C 802414AC 44800000 */ mtc1 $zero, $f0 /* C81650 802414B0 C614000C */ lwc1 $f20, 0xc($s0) /* C81654 802414B4 4600103C */ c.lt.s $f2, $f0 -/* C81658 802414B8 00000000 */ nop +/* C81658 802414B8 00000000 */ nop /* C8165C 802414BC 45000006 */ bc1f .L802414D8 /* C81660 802414C0 00021023 */ negu $v0, $v0 /* C81664 802414C4 44820000 */ mtc1 $v0, $f0 -/* C81668 802414C8 00000000 */ nop +/* C81668 802414C8 00000000 */ nop /* C8166C 802414CC 46800020 */ cvt.s.w $f0, $f0 /* C81670 802414D0 08090537 */ j .L802414DC /* C81674 802414D4 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_802412B8_C81458 /* C8169C 802414FC C600001C */ lwc1 $f0, 0x1c($s0) /* C816A0 80241500 46001080 */ add.s $f2, $f2, $f0 /* C816A4 80241504 4616103C */ c.lt.s $f2, $f22 -/* C816A8 80241508 00000000 */ nop +/* C816A8 80241508 00000000 */ nop /* C816AC 8024150C 45020045 */ bc1fl .L80241624 /* C816B0 80241510 E602003C */ swc1 $f2, 0x3c($s0) /* C816B4 80241514 08090588 */ j .L80241620 @@ -169,7 +169,7 @@ glabel func_802412B8_C81458 /* C816CC 8024152C C600001C */ lwc1 $f0, 0x1c($s0) /* C816D0 80241530 C604003C */ lwc1 $f4, 0x3c($s0) /* C816D4 80241534 44821000 */ mtc1 $v0, $f2 -/* C816D8 80241538 00000000 */ nop +/* C816D8 80241538 00000000 */ nop /* C816DC 8024153C 468010A0 */ cvt.s.w $f2, $f2 /* C816E0 80241540 46000005 */ abs.s $f0, $f0 /* C816E4 80241544 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_802412B8_C81458 /* C81720 80241580 0C0372DF */ jal func_800DCB7C /* C81724 80241584 27A70020 */ addiu $a3, $sp, 0x20 /* C81728 80241588 10400015 */ beqz $v0, .L802415E0 -/* C8172C 8024158C 00000000 */ nop +/* C8172C 8024158C 00000000 */ nop /* C81730 80241590 860200A8 */ lh $v0, 0xa8($s0) /* C81734 80241594 C604001C */ lwc1 $f4, 0x1c($s0) /* C81738 80241598 44820000 */ mtc1 $v0, $f0 -/* C8173C 8024159C 00000000 */ nop +/* C8173C 8024159C 00000000 */ nop /* C81740 802415A0 46800020 */ cvt.s.w $f0, $f0 /* C81744 802415A4 46002085 */ abs.s $f2, $f4 /* C81748 802415A8 46020000 */ add.s $f0, $f0, $f2 /* C8174C 802415AC C7A20024 */ lwc1 $f2, 0x24($sp) /* C81750 802415B0 4600103E */ c.le.s $f2, $f0 -/* C81754 802415B4 00000000 */ nop +/* C81754 802415B4 00000000 */ nop /* C81758 802415B8 45000005 */ bc1f .L802415D0 -/* C8175C 802415BC 00000000 */ nop +/* C8175C 802415BC 00000000 */ nop /* C81760 802415C0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* C81764 802415C4 AE00001C */ sw $zero, 0x1c($s0) /* C81768 802415C8 08090589 */ j .L80241624 @@ -217,13 +217,13 @@ glabel func_802412B8_C81458 /* C81784 802415E4 860200A8 */ lh $v0, 0xa8($s0) /* C81788 802415E8 46163081 */ sub.s $f2, $f6, $f22 /* C8178C 802415EC 44820000 */ mtc1 $v0, $f0 -/* C81790 802415F0 00000000 */ nop +/* C81790 802415F0 00000000 */ nop /* C81794 802415F4 46800020 */ cvt.s.w $f0, $f0 /* C81798 802415F8 46001080 */ add.s $f2, $f2, $f0 /* C8179C 802415FC C604001C */ lwc1 $f4, 0x1c($s0) /* C817A0 80241600 46002005 */ abs.s $f0, $f4 /* C817A4 80241604 4602003C */ c.lt.s $f0, $f2 -/* C817A8 80241608 00000000 */ nop +/* C817A8 80241608 00000000 */ nop /* C817AC 8024160C 45020005 */ bc1fl .L80241624 /* C817B0 80241610 AE00001C */ sw $zero, 0x1c($s0) /* C817B4 80241614 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241648_C817E8.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241648_C817E8.s index 6e586fb985..294ad2f79b 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241648_C817E8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241648_C817E8.s @@ -49,15 +49,15 @@ glabel func_80241648_C817E8 /* C81890 802416F0 44802000 */ mtc1 $zero, $f4 /* C81894 802416F4 460010A1 */ cvt.d.s $f2, $f2 /* C81898 802416F8 46241082 */ mul.d $f2, $f2, $f4 -/* C8189C 802416FC 00000000 */ nop +/* C8189C 802416FC 00000000 */ nop /* C818A0 80241700 C7A0001C */ lwc1 $f0, 0x1c($sp) /* C818A4 80241704 46000021 */ cvt.d.s $f0, $f0 /* C818A8 80241708 46240002 */ mul.d $f0, $f0, $f4 -/* C818AC 8024170C 00000000 */ nop +/* C818AC 8024170C 00000000 */ nop /* C818B0 80241710 3C013FE0 */ lui $at, 0x3fe0 /* C818B4 80241714 44812800 */ mtc1 $at, $f5 /* C818B8 80241718 44802000 */ mtc1 $zero, $f4 -/* C818BC 8024171C 00000000 */ nop +/* C818BC 8024171C 00000000 */ nop /* C818C0 80241720 46241080 */ add.d $f2, $f2, $f4 /* C818C4 80241724 AE000074 */ sw $zero, 0x74($s0) /* C818C8 80241728 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s index 6d5c22eb2e..56f79c1120 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s @@ -54,7 +54,7 @@ glabel func_8024176C_C8190C /* C819CC 8024182C 8E4300B0 */ lw $v1, 0xb0($s2) /* C819D0 80241830 30620004 */ andi $v0, $v1, 4 /* C819D4 80241834 10400007 */ beqz $v0, .L80241854 -/* C819D8 80241838 00000000 */ nop +/* C819D8 80241838 00000000 */ nop /* C819DC 8024183C 824200B4 */ lb $v0, 0xb4($s2) /* C819E0 80241840 1440003C */ bnez $v0, .L80241934 /* C819E4 80241844 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_8024176C_C8190C /* C819F8 80241858 2C62000F */ sltiu $v0, $v1, 0xf /* C819FC 8024185C 10400034 */ beqz $v0, .L80241930 /* C81A00 80241860 00031080 */ sll $v0, $v1, 2 -/* C81A04 80241864 3C018024 */ lui $at, %hi(D_80245868) +/* C81A04 80241864 3C018024 */ lui $at, %hi(jtbl_80245868_C85A08) /* C81A08 80241868 00220821 */ addu $at, $at, $v0 -/* C81A0C 8024186C 8C225868 */ lw $v0, %lo(D_80245868)($at) +/* C81A0C 8024186C 8C225868 */ lw $v0, %lo(jtbl_80245868_C85A08)($at) /* C81A10 80241870 00400008 */ jr $v0 -/* C81A14 80241874 00000000 */ nop +/* C81A14 80241874 00000000 */ nop +glabel L80241878_C81A18 /* C81A18 80241878 0280202D */ daddu $a0, $s4, $zero /* C81A1C 8024187C 0200282D */ daddu $a1, $s0, $zero /* C81A20 80241880 0C090118 */ jal func_80240460_C80600 /* C81A24 80241884 0260302D */ daddu $a2, $s3, $zero +glabel L80241888_C81A28 /* C81A28 80241888 0280202D */ daddu $a0, $s4, $zero /* C81A2C 8024188C 0200282D */ daddu $a1, $s0, $zero /* C81A30 80241890 0C090184 */ jal func_80240610_C807B0 /* C81A34 80241894 0260302D */ daddu $a2, $s3, $zero /* C81A38 80241898 0809064D */ j .L80241934 /* C81A3C 8024189C 0000102D */ daddu $v0, $zero, $zero +glabel L802418A0_C81A40 /* C81A40 802418A0 0280202D */ daddu $a0, $s4, $zero /* C81A44 802418A4 0200282D */ daddu $a1, $s0, $zero /* C81A48 802418A8 0C09030E */ jal kzn_11_UnkNpcAIFunc1 /* C81A4C 802418AC 0260302D */ daddu $a2, $s3, $zero +glabel L802418B0_C81A50 /* C81A50 802418B0 0280202D */ daddu $a0, $s4, $zero /* C81A54 802418B4 0200282D */ daddu $a1, $s0, $zero /* C81A58 802418B8 0C09033E */ jal func_80240CF8_C80E98 /* C81A5C 802418BC 0260302D */ daddu $a2, $s3, $zero /* C81A60 802418C0 0809064D */ j .L80241934 /* C81A64 802418C4 0000102D */ daddu $v0, $zero, $zero +glabel L802418C8_C81A68 /* C81A68 802418C8 0280202D */ daddu $a0, $s4, $zero /* C81A6C 802418CC 0200282D */ daddu $a1, $s0, $zero /* C81A70 802418D0 0C09040F */ jal kzn_11_UnkNpcAIFunc2 /* C81A74 802418D4 0260302D */ daddu $a2, $s3, $zero +glabel L802418D8_C81A78 /* C81A78 802418D8 0280202D */ daddu $a0, $s4, $zero /* C81A7C 802418DC 0200282D */ daddu $a1, $s0, $zero /* C81A80 802418E0 0C09042D */ jal func_802410B4_C81254 /* C81A84 802418E4 0260302D */ daddu $a2, $s3, $zero /* C81A88 802418E8 0809064D */ j .L80241934 /* C81A8C 802418EC 0000102D */ daddu $v0, $zero, $zero +glabel L802418F0_C81A90 /* C81A90 802418F0 0280202D */ daddu $a0, $s4, $zero /* C81A94 802418F4 0200282D */ daddu $a1, $s0, $zero /* C81A98 802418F8 0C090448 */ jal func_80241120_C812C0 /* C81A9C 802418FC 0260302D */ daddu $a2, $s3, $zero /* C81AA0 80241900 0809064D */ j .L80241934 /* C81AA4 80241904 0000102D */ daddu $v0, $zero, $zero +glabel L80241908_C81AA8 /* C81AA8 80241908 0280202D */ daddu $a0, $s4, $zero /* C81AAC 8024190C 0200282D */ daddu $a1, $s0, $zero /* C81AB0 80241910 0C090495 */ jal kzn_11_UnkNpcAIFunc3 /* C81AB4 80241914 0260302D */ daddu $a2, $s3, $zero /* C81AB8 80241918 0809064D */ j .L80241934 /* C81ABC 8024191C 0000102D */ daddu $v0, $zero, $zero +glabel L80241920_C81AC0 /* C81AC0 80241920 0280202D */ daddu $a0, $s4, $zero /* C81AC4 80241924 0200282D */ daddu $a1, $s0, $zero /* C81AC8 80241928 0C0904AE */ jal func_802412B8_C81458 /* C81ACC 8024192C 0260302D */ daddu $a2, $s3, $zero .L80241930: +glabel L80241930_C81AD0 /* C81AD0 80241930 0000102D */ daddu $v0, $zero, $zero .L80241934: /* C81AD4 80241934 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241958_C81AF8.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241958_C81AF8.s index 56382a959d..5c5794d4af 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241958_C81AF8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241958_C81AF8.s @@ -47,20 +47,20 @@ glabel func_80241958_C81AF8 /* C81BA0 80241A00 8E02001C */ lw $v0, 0x1c($s0) /* C81BA4 80241A04 46001005 */ abs.s $f0, $f2 /* C81BA8 80241A08 44822000 */ mtc1 $v0, $f4 -/* C81BAC 80241A0C 00000000 */ nop +/* C81BAC 80241A0C 00000000 */ nop /* C81BB0 80241A10 46802120 */ cvt.s.w $f4, $f4 /* C81BB4 80241A14 4600203C */ c.lt.s $f4, $f0 -/* C81BB8 80241A18 00000000 */ nop +/* C81BB8 80241A18 00000000 */ nop /* C81BBC 80241A1C 4500000D */ bc1f .L80241A54 -/* C81BC0 80241A20 00000000 */ nop +/* C81BC0 80241A20 00000000 */ nop /* C81BC4 80241A24 44800000 */ mtc1 $zero, $f0 /* C81BC8 80241A28 C654000C */ lwc1 $f20, 0xc($s2) /* C81BCC 80241A2C 4600103C */ c.lt.s $f2, $f0 -/* C81BD0 80241A30 00000000 */ nop +/* C81BD0 80241A30 00000000 */ nop /* C81BD4 80241A34 45000006 */ bc1f .L80241A50 /* C81BD8 80241A38 00021023 */ negu $v0, $v0 /* C81BDC 80241A3C 44820000 */ mtc1 $v0, $f0 -/* C81BE0 80241A40 00000000 */ nop +/* C81BE0 80241A40 00000000 */ nop /* C81BE4 80241A44 46800020 */ cvt.s.w $f0, $f0 /* C81BE8 80241A48 08090695 */ j .L80241A54 /* C81BEC 80241A4C 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241A88_C81C28.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241A88_C81C28.s index 9455679ba0..31aee03542 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241A88_C81C28.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241A88_C81C28.s @@ -36,7 +36,7 @@ glabel func_80241A88_C81C28 /* C81CA4 80241B04 2402000F */ addiu $v0, $zero, 0xf /* C81CA8 80241B08 AFA2001C */ sw $v0, 0x1c($sp) /* C81CAC 80241B0C 44834000 */ mtc1 $v1, $f8 -/* C81CB0 80241B10 00000000 */ nop +/* C81CB0 80241B10 00000000 */ nop /* C81CB4 80241B14 46804220 */ cvt.s.w $f8, $f8 /* C81CB8 80241B18 44074000 */ mfc1 $a3, $f8 /* C81CBC 80241B1C 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,14 +69,14 @@ glabel func_80241A88_C81C28 /* C81D24 80241B84 860200A8 */ lh $v0, 0xa8($s0) /* C81D28 80241B88 C6000038 */ lwc1 $f0, 0x38($s0) /* C81D2C 80241B8C 44821000 */ mtc1 $v0, $f2 -/* C81D30 80241B90 00000000 */ nop +/* C81D30 80241B90 00000000 */ nop /* C81D34 80241B94 468010A0 */ cvt.s.w $f2, $f2 /* C81D38 80241B98 E7A0002C */ swc1 $f0, 0x2c($sp) /* C81D3C 80241B9C 860200A8 */ lh $v0, 0xa8($s0) /* C81D40 80241BA0 C604003C */ lwc1 $f4, 0x3c($s0) /* C81D44 80241BA4 C6060040 */ lwc1 $f6, 0x40($s0) /* C81D48 80241BA8 44820000 */ mtc1 $v0, $f0 -/* C81D4C 80241BAC 00000000 */ nop +/* C81D4C 80241BAC 00000000 */ nop /* C81D50 80241BB0 46800021 */ cvt.d.w $f0, $f0 /* C81D54 80241BB4 46022100 */ add.s $f4, $f4, $f2 /* C81D58 80241BB8 3C014008 */ lui $at, 0x4008 @@ -93,19 +93,19 @@ glabel func_80241A88_C81C28 /* C81D84 80241BE4 0C0372DF */ jal func_800DCB7C /* C81D88 80241BE8 27A70034 */ addiu $a3, $sp, 0x34 /* C81D8C 80241BEC 1040000A */ beqz $v0, .L80241C18 -/* C81D90 80241BF0 00000000 */ nop +/* C81D90 80241BF0 00000000 */ nop /* C81D94 80241BF4 860200A8 */ lh $v0, 0xa8($s0) /* C81D98 80241BF8 C7A20038 */ lwc1 $f2, 0x38($sp) /* C81D9C 80241BFC 44820000 */ mtc1 $v0, $f0 -/* C81DA0 80241C00 00000000 */ nop +/* C81DA0 80241C00 00000000 */ nop /* C81DA4 80241C04 46800020 */ cvt.s.w $f0, $f0 /* C81DA8 80241C08 4600103C */ c.lt.s $f2, $f0 -/* C81DAC 80241C0C 00000000 */ nop +/* C81DAC 80241C0C 00000000 */ nop /* C81DB0 80241C10 45030001 */ bc1tl .L80241C18 /* C81DB4 80241C14 24110001 */ addiu $s1, $zero, 1 .L80241C18: /* C81DB8 80241C18 12200008 */ beqz $s1, .L80241C3C -/* C81DBC 80241C1C 00000000 */ nop +/* C81DBC 80241C1C 00000000 */ nop /* C81DC0 80241C20 C7A00030 */ lwc1 $f0, 0x30($sp) /* C81DC4 80241C24 3C013FF0 */ lui $at, 0x3ff0 /* C81DC8 80241C28 44811800 */ mtc1 $at, $f3 @@ -130,24 +130,24 @@ glabel func_80241A88_C81C28 /* C81E10 80241C70 44800800 */ mtc1 $zero, $f1 /* C81E14 80241C74 460030A1 */ cvt.d.s $f2, $f6 /* C81E18 80241C78 4620103C */ c.lt.d $f2, $f0 -/* C81E1C 80241C7C 00000000 */ nop +/* C81E1C 80241C7C 00000000 */ nop /* C81E20 80241C80 45010009 */ bc1t .L80241CA8 -/* C81E24 80241C84 00000000 */ nop +/* C81E24 80241C84 00000000 */ nop /* C81E28 80241C88 3C014010 */ lui $at, 0x4010 /* C81E2C 80241C8C 44810800 */ mtc1 $at, $f1 /* C81E30 80241C90 44800000 */ mtc1 $zero, $f0 -/* C81E34 80241C94 00000000 */ nop +/* C81E34 80241C94 00000000 */ nop /* C81E38 80241C98 4622003C */ c.lt.d $f0, $f2 -/* C81E3C 80241C9C 00000000 */ nop +/* C81E3C 80241C9C 00000000 */ nop /* C81E40 80241CA0 4500000A */ bc1f .L80241CCC -/* C81E44 80241CA4 00000000 */ nop +/* C81E44 80241CA4 00000000 */ nop .L80241CA8: /* C81E48 80241CA8 3C018024 */ lui $at, %hi(D_802458A8) /* C81E4C 80241CAC D42258A8 */ ldc1 $f2, %lo(D_802458A8)($at) /* C81E50 80241CB0 46003187 */ neg.s $f6, $f6 /* C81E54 80241CB4 46003021 */ cvt.d.s $f0, $f6 /* C81E58 80241CB8 46220002 */ mul.d $f0, $f0, $f2 -/* C81E5C 80241CBC 00000000 */ nop +/* C81E5C 80241CBC 00000000 */ nop /* C81E60 80241CC0 46202000 */ add.d $f0, $f4, $f0 .L80241CC4: /* C81E64 80241CC4 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D08_C81EA8.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D08_C81EA8.s index 5bd4132314..9dd5fd54b5 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D08_C81EA8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D08_C81EA8.s @@ -16,7 +16,7 @@ glabel func_80241D08_C81EA8 /* C81ED4 80241D34 A462008E */ sh $v0, 0x8e($v1) /* C81ED8 80241D38 00021400 */ sll $v0, $v0, 0x10 /* C81EDC 80241D3C 1C400004 */ bgtz $v0, .L80241D50 -/* C81EE0 80241D40 00000000 */ nop +/* C81EE0 80241D40 00000000 */ nop /* C81EE4 80241D44 AE000074 */ sw $zero, 0x74($s0) /* C81EE8 80241D48 A460008E */ sh $zero, 0x8e($v1) /* C81EEC 80241D4C AE200070 */ sw $zero, 0x70($s1) diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s index 6468cd9b29..3f8503bcf0 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s @@ -55,7 +55,7 @@ glabel func_80241D64_C81F04 /* C81FC8 80241E28 8E4300B0 */ lw $v1, 0xb0($s2) /* C81FCC 80241E2C 30620004 */ andi $v0, $v1, 4 /* C81FD0 80241E30 10400007 */ beqz $v0, .L80241E50 -/* C81FD4 80241E34 00000000 */ nop +/* C81FD4 80241E34 00000000 */ nop /* C81FD8 80241E38 824200B4 */ lb $v0, 0xb4($s2) /* C81FDC 80241E3C 1440003A */ bnez $v0, .L80241F28 /* C81FE0 80241E40 0000102D */ daddu $v0, $zero, $zero @@ -67,56 +67,66 @@ glabel func_80241D64_C81F04 /* C81FF4 80241E54 2C620015 */ sltiu $v0, $v1, 0x15 /* C81FF8 80241E58 10400032 */ beqz $v0, .L80241F24 /* C81FFC 80241E5C 00031080 */ sll $v0, $v1, 2 -/* C82000 80241E60 3C018024 */ lui $at, %hi(D_802458B0) +/* C82000 80241E60 3C018024 */ lui $at, %hi(jtbl_802458B0_C85A50) /* C82004 80241E64 00220821 */ addu $at, $at, $v0 -/* C82008 80241E68 8C2258B0 */ lw $v0, %lo(D_802458B0)($at) +/* C82008 80241E68 8C2258B0 */ lw $v0, %lo(jtbl_802458B0_C85A50)($at) /* C8200C 80241E6C 00400008 */ jr $v0 -/* C82010 80241E70 00000000 */ nop +/* C82010 80241E70 00000000 */ nop +glabel L80241E74_C82014 /* C82014 80241E74 0280202D */ daddu $a0, $s4, $zero /* C82018 80241E78 0200282D */ daddu $a1, $s0, $zero /* C8201C 80241E7C 0C090118 */ jal func_80240460_C80600 /* C82020 80241E80 0260302D */ daddu $a2, $s3, $zero +glabel L80241E84_C82024 /* C82024 80241E84 0280202D */ daddu $a0, $s4, $zero /* C82028 80241E88 0200282D */ daddu $a1, $s0, $zero /* C8202C 80241E8C 0C090184 */ jal func_80240610_C807B0 /* C82030 80241E90 0260302D */ daddu $a2, $s3, $zero /* C82034 80241E94 080907CA */ j .L80241F28 /* C82038 80241E98 0000102D */ daddu $v0, $zero, $zero +glabel L80241E9C_C8203C /* C8203C 80241E9C 0280202D */ daddu $a0, $s4, $zero /* C82040 80241EA0 0200282D */ daddu $a1, $s0, $zero /* C82044 80241EA4 0C09030E */ jal kzn_11_UnkNpcAIFunc1 /* C82048 80241EA8 0260302D */ daddu $a2, $s3, $zero +glabel L80241EAC_C8204C /* C8204C 80241EAC 0280202D */ daddu $a0, $s4, $zero /* C82050 80241EB0 0200282D */ daddu $a1, $s0, $zero /* C82054 80241EB4 0C09033E */ jal func_80240CF8_C80E98 /* C82058 80241EB8 0260302D */ daddu $a2, $s3, $zero /* C8205C 80241EBC 080907CA */ j .L80241F28 /* C82060 80241EC0 0000102D */ daddu $v0, $zero, $zero +glabel L80241EC4_C82064 /* C82064 80241EC4 0280202D */ daddu $a0, $s4, $zero /* C82068 80241EC8 0200282D */ daddu $a1, $s0, $zero /* C8206C 80241ECC 0C09040F */ jal kzn_11_UnkNpcAIFunc2 /* C82070 80241ED0 0260302D */ daddu $a2, $s3, $zero +glabel L80241ED4_C82074 /* C82074 80241ED4 0280202D */ daddu $a0, $s4, $zero /* C82078 80241ED8 0200282D */ daddu $a1, $s0, $zero /* C8207C 80241EDC 0C09042D */ jal func_802410B4_C81254 /* C82080 80241EE0 0260302D */ daddu $a2, $s3, $zero /* C82084 80241EE4 080907CA */ j .L80241F28 /* C82088 80241EE8 0000102D */ daddu $v0, $zero, $zero +glabel L80241EEC_C8208C /* C8208C 80241EEC 0280202D */ daddu $a0, $s4, $zero /* C82090 80241EF0 0200282D */ daddu $a1, $s0, $zero /* C82094 80241EF4 0C090656 */ jal func_80241958_C81AF8 /* C82098 80241EF8 0260302D */ daddu $a2, $s3, $zero +glabel L80241EFC_C8209C /* C8209C 80241EFC 0280202D */ daddu $a0, $s4, $zero /* C820A0 80241F00 0200282D */ daddu $a1, $s0, $zero /* C820A4 80241F04 0C0906A2 */ jal func_80241A88_C81C28 /* C820A8 80241F08 0260302D */ daddu $a2, $s3, $zero /* C820AC 80241F0C 080907CA */ j .L80241F28 /* C820B0 80241F10 0000102D */ daddu $v0, $zero, $zero +glabel L80241F14_C820B4 /* C820B4 80241F14 0280202D */ daddu $a0, $s4, $zero /* C820B8 80241F18 0200282D */ daddu $a1, $s0, $zero /* C820BC 80241F1C 0C090742 */ jal func_80241D08_C81EA8 /* C820C0 80241F20 0260302D */ daddu $a2, $s3, $zero .L80241F24: +glabel L80241F24_C820C4 /* C820C4 80241F24 0000102D */ daddu $v0, $zero, $zero .L80241F28: /* C820C8 80241F28 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241F4C_C820EC.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241F4C_C820EC.s index 9351912233..327d1584e5 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241F4C_C820EC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241F4C_C820EC.s @@ -63,7 +63,7 @@ glabel func_80241F4C_C820EC /* C821D4 80242034 AE02001C */ sw $v0, 0x1c($s0) .L80242038: /* C821D8 80242038 0C009C64 */ jal func_80027190 -/* C821DC 8024203C 00000000 */ nop +/* C821DC 8024203C 00000000 */ nop /* C821E0 80242040 14400131 */ bnez $v0, .L80242508 /* C821E4 80242044 0000102D */ daddu $v0, $zero, $zero /* C821E8 80242048 8E900074 */ lw $s0, 0x74($s4) @@ -86,21 +86,21 @@ glabel func_80241F4C_C820EC /* C82228 80242088 00004012 */ mflo $t0 /* C8222C 8024208C C6200054 */ lwc1 $f0, 0x54($s1) /* C82230 80242090 4488A000 */ mtc1 $t0, $f20 -/* C82234 80242094 00000000 */ nop +/* C82234 80242094 00000000 */ nop /* C82238 80242098 4680A520 */ cvt.s.w $f20, $f20 /* C8223C 8024209C 4600A502 */ mul.s $f20, $f20, $f0 -/* C82240 802420A0 00000000 */ nop +/* C82240 802420A0 00000000 */ nop /* C82244 802420A4 0C00A8BB */ jal sin_deg /* C82248 802420A8 C60C0028 */ lwc1 $f12, 0x28($s0) /* C8224C 802420AC C60C0028 */ lwc1 $f12, 0x28($s0) /* C82250 802420B0 4600A582 */ mul.s $f22, $f20, $f0 /* C82254 802420B4 0C00A8D4 */ jal cos_deg -/* C82258 802420B8 00000000 */ nop +/* C82258 802420B8 00000000 */ nop /* C8225C 802420BC C6020004 */ lwc1 $f2, 4($s0) /* C82260 802420C0 46161080 */ add.s $f2, $f2, $f22 /* C82264 802420C4 4600A507 */ neg.s $f20, $f20 /* C82268 802420C8 4600A502 */ mul.s $f20, $f20, $f0 -/* C8226C 802420CC 00000000 */ nop +/* C8226C 802420CC 00000000 */ nop /* C82270 802420D0 E6220038 */ swc1 $f2, 0x38($s1) /* C82274 802420D4 C6000008 */ lwc1 $f0, 8($s0) /* C82278 802420D8 E620003C */ swc1 $f0, 0x3c($s1) @@ -116,7 +116,7 @@ glabel func_80241F4C_C820EC /* C8229C 802420FC 8E020000 */ lw $v0, ($s0) /* C822A0 80242100 30420002 */ andi $v0, $v0, 2 /* C822A4 80242104 14400051 */ bnez $v0, .L8024224C -/* C822A8 80242108 00000000 */ nop +/* C822A8 80242108 00000000 */ nop /* C822AC 8024210C 8E620000 */ lw $v0, ($s3) /* C822B0 80242110 30428000 */ andi $v0, $v0, 0x8000 /* C822B4 80242114 1440004D */ bnez $v0, .L8024224C @@ -135,10 +135,10 @@ glabel func_80241F4C_C820EC /* C822E8 80242148 46020181 */ sub.s $f6, $f0, $f2 .L8024214C: /* C822EC 8024214C 14620006 */ bne $v1, $v0, .L80242168 -/* C822F0 80242150 00000000 */ nop +/* C822F0 80242150 00000000 */ nop /* C822F4 80242154 3C014120 */ lui $at, 0x4120 /* C822F8 80242158 44810000 */ mtc1 $at, $f0 -/* C822FC 8024215C 00000000 */ nop +/* C822FC 8024215C 00000000 */ nop /* C82300 80242160 46002001 */ sub.s $f0, $f4, $f0 /* C82304 80242164 46020181 */ sub.s $f6, $f0, $f2 .L80242168: @@ -147,10 +147,10 @@ glabel func_80241F4C_C820EC /* C82310 80242170 3421CCCD */ ori $at, $at, 0xcccd /* C82314 80242174 44810000 */ mtc1 $at, $f0 /* C82318 80242178 44822000 */ mtc1 $v0, $f4 -/* C8231C 8024217C 00000000 */ nop +/* C8231C 8024217C 00000000 */ nop /* C82320 80242180 46802120 */ cvt.s.w $f4, $f4 /* C82324 80242184 46002102 */ mul.s $f4, $f4, $f0 -/* C82328 80242188 00000000 */ nop +/* C82328 80242188 00000000 */ nop /* C8232C 8024218C C6620028 */ lwc1 $f2, 0x28($s3) /* C82330 80242190 C6200038 */ lwc1 $f0, 0x38($s1) /* C82334 80242194 46001581 */ sub.s $f22, $f2, $f0 @@ -159,45 +159,45 @@ glabel func_80241F4C_C820EC /* C82340 802421A0 46001501 */ sub.s $f20, $f2, $f0 /* C82344 802421A4 46003005 */ abs.s $f0, $f6 /* C82348 802421A8 4604003C */ c.lt.s $f0, $f4 -/* C8234C 802421AC 00000000 */ nop +/* C8234C 802421AC 00000000 */ nop /* C82350 802421B0 45000026 */ bc1f .L8024224C -/* C82354 802421B4 00000000 */ nop +/* C82354 802421B4 00000000 */ nop /* C82358 802421B8 4616B082 */ mul.s $f2, $f22, $f22 -/* C8235C 802421BC 00000000 */ nop +/* C8235C 802421BC 00000000 */ nop /* C82360 802421C0 4614A002 */ mul.s $f0, $f20, $f20 -/* C82364 802421C4 00000000 */ nop +/* C82364 802421C4 00000000 */ nop /* C82368 802421C8 46001300 */ add.s $f12, $f2, $f0 /* C8236C 802421CC 46006104 */ sqrt.s $f4, $f12 /* C82370 802421D0 46042032 */ c.eq.s $f4, $f4 -/* C82374 802421D4 00000000 */ nop +/* C82374 802421D4 00000000 */ nop /* C82378 802421D8 45010004 */ bc1t .L802421EC -/* C8237C 802421DC 00000000 */ nop +/* C8237C 802421DC 00000000 */ nop /* C82380 802421E0 0C0187BC */ jal sqrtf -/* C82384 802421E4 00000000 */ nop +/* C82384 802421E4 00000000 */ nop /* C82388 802421E8 46000106 */ mov.s $f4, $f0 .L802421EC: /* C8238C 802421EC 862200A6 */ lh $v0, 0xa6($s1) /* C82390 802421F0 44821000 */ mtc1 $v0, $f2 -/* C82394 802421F4 00000000 */ nop +/* C82394 802421F4 00000000 */ nop /* C82398 802421F8 468010A0 */ cvt.s.w $f2, $f2 /* C8239C 802421FC 46181082 */ mul.s $f2, $f2, $f24 -/* C823A0 80242200 00000000 */ nop +/* C823A0 80242200 00000000 */ nop /* C823A4 80242204 C6200054 */ lwc1 $f0, 0x54($s1) /* C823A8 80242208 46001082 */ mul.s $f2, $f2, $f0 -/* C823AC 8024220C 00000000 */ nop +/* C823AC 8024220C 00000000 */ nop /* C823B0 80242210 866200B2 */ lh $v0, 0xb2($s3) /* C823B4 80242214 44820000 */ mtc1 $v0, $f0 -/* C823B8 80242218 00000000 */ nop +/* C823B8 80242218 00000000 */ nop /* C823BC 8024221C 46800020 */ cvt.s.w $f0, $f0 /* C823C0 80242220 46180002 */ mul.s $f0, $f0, $f24 -/* C823C4 80242224 00000000 */ nop +/* C823C4 80242224 00000000 */ nop /* C823C8 80242228 46181082 */ mul.s $f2, $f2, $f24 -/* C823CC 8024222C 00000000 */ nop +/* C823CC 8024222C 00000000 */ nop /* C823D0 80242230 46180002 */ mul.s $f0, $f0, $f24 -/* C823D4 80242234 00000000 */ nop +/* C823D4 80242234 00000000 */ nop /* C823D8 80242238 46001080 */ add.s $f2, $f2, $f0 /* C823DC 8024223C 4602203E */ c.le.s $f4, $f2 -/* C823E0 80242240 00000000 */ nop +/* C823E0 80242240 00000000 */ nop /* C823E4 80242244 45030001 */ bc1tl .L8024224C /* C823E8 80242248 24150001 */ addiu $s5, $zero, 1 .L8024224C: @@ -205,7 +205,7 @@ glabel func_80241F4C_C820EC /* C823F0 80242250 26520001 */ addiu $s2, $s2, 1 /* C823F4 80242254 0242102A */ slt $v0, $s2, $v0 /* C823F8 80242258 1440FF82 */ bnez $v0, .L80242064 -/* C823FC 8024225C 00000000 */ nop +/* C823FC 8024225C 00000000 */ nop .L80242260: /* C82400 80242260 8E620000 */ lw $v0, ($s3) /* C82404 80242264 30428000 */ andi $v0, $v0, 0x8000 @@ -220,9 +220,9 @@ glabel func_80241F4C_C820EC /* C82424 80242284 C6020028 */ lwc1 $f2, 0x28($s0) /* C82428 80242288 46000106 */ mov.s $f4, $f0 /* C8242C 8024228C 46022032 */ c.eq.s $f4, $f2 -/* C82430 80242290 00000000 */ nop +/* C82430 80242290 00000000 */ nop /* C82434 80242294 4501000D */ bc1t .L802422CC -/* C82438 80242298 00000000 */ nop +/* C82438 80242298 00000000 */ nop /* C8243C 8024229C 8E020020 */ lw $v0, 0x20($s0) /* C82440 802422A0 C600000C */ lwc1 $f0, 0xc($s0) /* C82444 802422A4 E6040028 */ swc1 $f4, 0x28($s0) @@ -251,23 +251,23 @@ glabel func_80241F4C_C820EC /* C8249C 802422FC 3C013F00 */ lui $at, 0x3f00 /* C824A0 80242300 44813000 */ mtc1 $at, $f6 /* C824A4 80242304 44821000 */ mtc1 $v0, $f2 -/* C824A8 80242308 00000000 */ nop +/* C824A8 80242308 00000000 */ nop /* C824AC 8024230C 468010A0 */ cvt.s.w $f2, $f2 /* C824B0 80242310 46061082 */ mul.s $f2, $f2, $f6 -/* C824B4 80242314 00000000 */ nop +/* C824B4 80242314 00000000 */ nop /* C824B8 80242318 C6240054 */ lwc1 $f4, 0x54($s1) /* C824BC 8024231C 46041082 */ mul.s $f2, $f2, $f4 -/* C824C0 80242320 00000000 */ nop +/* C824C0 80242320 00000000 */ nop /* C824C4 80242324 866200B2 */ lh $v0, 0xb2($s3) /* C824C8 80242328 44822000 */ mtc1 $v0, $f4 -/* C824CC 8024232C 00000000 */ nop +/* C824CC 8024232C 00000000 */ nop /* C824D0 80242330 46802120 */ cvt.s.w $f4, $f4 /* C824D4 80242334 46062102 */ mul.s $f4, $f4, $f6 -/* C824D8 80242338 00000000 */ nop +/* C824D8 80242338 00000000 */ nop /* C824DC 8024233C 46061082 */ mul.s $f2, $f2, $f6 -/* C824E0 80242340 00000000 */ nop +/* C824E0 80242340 00000000 */ nop /* C824E4 80242344 46062102 */ mul.s $f4, $f4, $f6 -/* C824E8 80242348 00000000 */ nop +/* C824E8 80242348 00000000 */ nop /* C824EC 8024234C C60C0004 */ lwc1 $f12, 4($s0) /* C824F0 80242350 C60E000C */ lwc1 $f14, 0xc($s0) /* C824F4 80242354 46020000 */ add.s $f0, $f0, $f2 @@ -313,11 +313,11 @@ glabel func_80241F4C_C820EC /* C82594 802423F4 A6620016 */ sh $v0, 0x16($s3) /* C82598 802423F8 4600020D */ trunc.w.s $f8, $f0 /* C8259C 802423FC 44024000 */ mfc1 $v0, $f8 -/* C825A0 80242400 00000000 */ nop +/* C825A0 80242400 00000000 */ nop /* C825A4 80242404 A6620018 */ sh $v0, 0x18($s3) /* C825A8 80242408 4600120D */ trunc.w.s $f8, $f2 /* C825AC 8024240C 44024000 */ mfc1 $v0, $f8 -/* C825B0 80242410 00000000 */ nop +/* C825B0 80242410 00000000 */ nop /* C825B4 80242414 A662001A */ sh $v0, 0x1a($s3) /* C825B8 80242418 8E02001C */ lw $v0, 0x1c($s0) /* C825BC 8024241C 10400033 */ beqz $v0, .L802424EC @@ -326,47 +326,47 @@ glabel func_80241F4C_C820EC /* C825C8 80242428 0040F809 */ jalr $v0 /* C825CC 8024242C 24050002 */ addiu $a1, $zero, 2 /* C825D0 80242430 0809093B */ j .L802424EC -/* C825D4 80242434 00000000 */ nop +/* C825D4 80242434 00000000 */ nop .L80242438: /* C825D8 80242438 4618B03C */ c.lt.s $f22, $f24 -/* C825DC 8024243C 00000000 */ nop +/* C825DC 8024243C 00000000 */ nop /* C825E0 80242440 4500002A */ bc1f .L802424EC -/* C825E4 80242444 00000000 */ nop +/* C825E4 80242444 00000000 */ nop /* C825E8 80242448 8E020000 */ lw $v0, ($s0) /* C825EC 8024244C 30420002 */ andi $v0, $v0, 2 /* C825F0 80242450 14400026 */ bnez $v0, .L802424EC -/* C825F4 80242454 00000000 */ nop +/* C825F4 80242454 00000000 */ nop /* C825F8 80242458 16A00024 */ bnez $s5, .L802424EC /* C825FC 8024245C 24020015 */ addiu $v0, $zero, 0x15 /* C82600 80242460 826300B4 */ lb $v1, 0xb4($s3) /* C82604 80242464 10620021 */ beq $v1, $v0, .L802424EC -/* C82608 80242468 00000000 */ nop +/* C82608 80242468 00000000 */ nop /* C8260C 8024246C C6000010 */ lwc1 $f0, 0x10($s0) /* C82610 80242470 44801000 */ mtc1 $zero, $f2 -/* C82614 80242474 00000000 */ nop +/* C82614 80242474 00000000 */ nop /* C82618 80242478 4600103C */ c.lt.s $f2, $f0 -/* C8261C 8024247C 00000000 */ nop +/* C8261C 8024247C 00000000 */ nop /* C82620 80242480 45000009 */ bc1f .L802424A8 -/* C82624 80242484 00000000 */ nop +/* C82624 80242484 00000000 */ nop /* C82628 80242488 C6000024 */ lwc1 $f0, 0x24($s0) /* C8262C 8024248C 4602003C */ c.lt.s $f0, $f2 -/* C82630 80242490 00000000 */ nop +/* C82630 80242490 00000000 */ nop /* C82634 80242494 45000015 */ bc1f .L802424EC -/* C82638 80242498 00000000 */ nop +/* C82638 80242498 00000000 */ nop /* C8263C 8024249C 4614103C */ c.lt.s $f2, $f20 /* C82640 802424A0 08090931 */ j .L802424C4 -/* C82644 802424A4 00000000 */ nop +/* C82644 802424A4 00000000 */ nop .L802424A8: /* C82648 802424A8 C6000024 */ lwc1 $f0, 0x24($s0) /* C8264C 802424AC 4600103C */ c.lt.s $f2, $f0 -/* C82650 802424B0 00000000 */ nop +/* C82650 802424B0 00000000 */ nop /* C82654 802424B4 4500000D */ bc1f .L802424EC -/* C82658 802424B8 00000000 */ nop +/* C82658 802424B8 00000000 */ nop /* C8265C 802424BC 4602A03C */ c.lt.s $f20, $f2 -/* C82660 802424C0 00000000 */ nop +/* C82660 802424C0 00000000 */ nop .L802424C4: /* C82664 802424C4 45000009 */ bc1f .L802424EC -/* C82668 802424C8 00000000 */ nop +/* C82668 802424C8 00000000 */ nop /* C8266C 802424CC 8E020020 */ lw $v0, 0x20($s0) /* C82670 802424D0 8E03001C */ lw $v1, 0x1c($s0) /* C82674 802424D4 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80242540_C826E0.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80242540_C826E0.s index 38ff1643d8..2f8a3751f2 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80242540_C826E0.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80242540_C826E0.s @@ -12,26 +12,26 @@ glabel func_80242540_C826E0 /* C826FC 8024255C 50400005 */ beql $v0, $zero, .L80242574 /* C82700 80242560 24020002 */ addiu $v0, $zero, 2 /* C82704 80242564 10A00007 */ beqz $a1, .L80242584 -/* C82708 80242568 00000000 */ nop +/* C82708 80242568 00000000 */ nop /* C8270C 8024256C 08090993 */ j .L8024264C -/* C82710 80242570 00000000 */ nop +/* C82710 80242570 00000000 */ nop .L80242574: /* C82714 80242574 10A20028 */ beq $a1, $v0, .L80242618 -/* C82718 80242578 00000000 */ nop +/* C82718 80242578 00000000 */ nop /* C8271C 8024257C 08090993 */ j .L8024264C -/* C82720 80242580 00000000 */ nop +/* C82720 80242580 00000000 */ nop .L80242584: /* C82724 80242584 8E020000 */ lw $v0, ($s0) /* C82728 80242588 30420002 */ andi $v0, $v0, 2 /* C8272C 8024258C 1040002F */ beqz $v0, .L8024264C -/* C82730 80242590 00000000 */ nop +/* C82730 80242590 00000000 */ nop /* C82734 80242594 C6000010 */ lwc1 $f0, 0x10($s0) /* C82738 80242598 3C013F73 */ lui $at, 0x3f73 /* C8273C 8024259C 34213333 */ ori $at, $at, 0x3333 /* C82740 802425A0 44811000 */ mtc1 $at, $f2 -/* C82744 802425A4 00000000 */ nop +/* C82744 802425A4 00000000 */ nop /* C82748 802425A8 46020002 */ mul.s $f0, $f0, $f2 -/* C8274C 802425AC 00000000 */ nop +/* C8274C 802425AC 00000000 */ nop /* C82750 802425B0 08090993 */ j .L8024264C /* C82754 802425B4 E6000010 */ swc1 $f0, 0x10($s0) .L802425B8: @@ -39,9 +39,9 @@ glabel func_80242540_C826E0 /* C8275C 802425BC 3C013F8F */ lui $at, 0x3f8f /* C82760 802425C0 34215C29 */ ori $at, $at, 0x5c29 /* C82764 802425C4 44811000 */ mtc1 $at, $f2 -/* C82768 802425C8 00000000 */ nop +/* C82768 802425C8 00000000 */ nop /* C8276C 802425CC 46020002 */ mul.s $f0, $f0, $f2 -/* C82770 802425D0 00000000 */ nop +/* C82770 802425D0 00000000 */ nop /* C82774 802425D4 8E030020 */ lw $v1, 0x20($s0) /* C82778 802425D8 2402000A */ addiu $v0, $zero, 0xa /* C8277C 802425DC 1462001B */ bne $v1, $v0, .L8024264C @@ -69,14 +69,14 @@ glabel func_80242540_C826E0 /* C827D0 80242630 00021023 */ negu $v0, $v0 .L80242634: /* C827D4 80242634 44821000 */ mtc1 $v0, $f2 -/* C827D8 80242638 00000000 */ nop +/* C827D8 80242638 00000000 */ nop /* C827DC 8024263C 468010A0 */ cvt.s.w $f2, $f2 /* C827E0 80242640 46001082 */ mul.s $f2, $f2, $f0 -/* C827E4 80242644 00000000 */ nop +/* C827E4 80242644 00000000 */ nop /* C827E8 80242648 E6020010 */ swc1 $f2, 0x10($s0) .L8024264C: /* C827EC 8024264C 8FBF0014 */ lw $ra, 0x14($sp) /* C827F0 80242650 8FB00010 */ lw $s0, 0x10($sp) /* C827F4 80242654 03E00008 */ jr $ra /* C827F8 80242658 27BD0018 */ addiu $sp, $sp, 0x18 -/* C827FC 8024265C 00000000 */ nop +/* C827FC 8024265C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240518_C85FC8.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240518_C85FC8.s index 1b66b0aa87..d8d6a21823 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240518_C85FC8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240518_C85FC8.s @@ -42,7 +42,7 @@ glabel func_80240518_C85FC8 /* C8605C 802405AC C6620074 */ lwc1 $f2, 0x74($s3) /* C86060 802405B0 468010A0 */ cvt.s.w $f2, $f2 /* C86064 802405B4 4600103C */ c.lt.s $f2, $f0 -/* C86068 802405B8 00000000 */ nop +/* C86068 802405B8 00000000 */ nop /* C8606C 802405BC 45030001 */ bc1tl .L802405C4 /* C86070 802405C0 0000882D */ daddu $s1, $zero, $zero .L802405C4: @@ -51,16 +51,16 @@ glabel func_80240518_C85FC8 /* C8607C 802405CC 3C014387 */ lui $at, 0x4387 /* C86080 802405D0 4481A000 */ mtc1 $at, $f20 /* C86084 802405D4 0C00A70A */ jal get_clamped_angle_diff -/* C86088 802405D8 00000000 */ nop +/* C86088 802405D8 00000000 */ nop /* C8608C 802405DC 0C00A6C9 */ jal clamp_angle /* C86090 802405E0 46000306 */ mov.s $f12, $f0 /* C86094 802405E4 3C018024 */ lui $at, %hi(D_802463A0) /* C86098 802405E8 D42263A0 */ ldc1 $f2, %lo(D_802463A0)($at) /* C8609C 802405EC 46000021 */ cvt.d.s $f0, $f0 /* C860A0 802405F0 4622003C */ c.lt.d $f0, $f2 -/* C860A4 802405F4 00000000 */ nop +/* C860A4 802405F4 00000000 */ nop /* C860A8 802405F8 45000003 */ bc1f .L80240608 -/* C860AC 802405FC 00000000 */ nop +/* C860AC 802405FC 00000000 */ nop /* C860B0 80240600 3C0142B4 */ lui $at, 0x42b4 /* C860B4 80240604 4481A000 */ mtc1 $at, $f20 .L80240608: @@ -77,7 +77,7 @@ glabel func_80240518_C85FC8 /* C860E0 80240630 468010A0 */ cvt.s.w $f2, $f2 /* C860E4 80240634 46000005 */ abs.s $f0, $f0 /* C860E8 80240638 4600103C */ c.lt.s $f2, $f0 -/* C860EC 8024063C 00000000 */ nop +/* C860EC 8024063C 00000000 */ nop /* C860F0 80240640 45030001 */ bc1tl .L80240648 /* C860F4 80240644 0000882D */ daddu $s1, $zero, $zero .L80240648: @@ -87,13 +87,13 @@ glabel func_80240518_C85FC8 /* C86104 80240654 860200A8 */ lh $v0, 0xa8($s0) /* C86108 80240658 46020001 */ sub.s $f0, $f0, $f2 /* C8610C 8024065C 44821000 */ mtc1 $v0, $f2 -/* C86110 80240660 00000000 */ nop +/* C86110 80240660 00000000 */ nop /* C86114 80240664 468010A1 */ cvt.d.w $f2, $f2 /* C86118 80240668 46221080 */ add.d $f2, $f2, $f2 /* C8611C 8024066C 46000005 */ abs.s $f0, $f0 /* C86120 80240670 46000021 */ cvt.d.s $f0, $f0 /* C86124 80240674 4620103E */ c.le.d $f2, $f0 -/* C86128 80240678 00000000 */ nop +/* C86128 80240678 00000000 */ nop /* C8612C 8024067C 45030001 */ bc1tl .L80240684 /* C86130 80240680 0000882D */ daddu $s1, $zero, $zero .L80240684: diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802406CC_C8617C.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802406CC_C8617C.s index ba2c57210e..b4a54f8209 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802406CC_C8617C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802406CC_C8617C.s @@ -19,7 +19,7 @@ glabel func_802406CC_C8617C /* C861B4 80240704 8E2200B0 */ lw $v0, 0xb0($s1) /* C861B8 80240708 30420004 */ andi $v0, $v0, 4 /* C861BC 8024070C 10400015 */ beqz $v0, .L80240764 -/* C861C0 80240710 00000000 */ nop +/* C861C0 80240710 00000000 */ nop .L80240714: /* C861C4 80240714 AE800070 */ sw $zero, 0x70($s4) /* C861C8 80240718 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel func_802406CC_C8617C /* C86218 80240768 12600005 */ beqz $s3, .L80240780 /* C8621C 8024076C 24020001 */ addiu $v0, $zero, 1 /* C86220 80240770 12620048 */ beq $s3, $v0, .L80240894 -/* C86224 80240774 00000000 */ nop +/* C86224 80240774 00000000 */ nop /* C86228 80240778 08090242 */ j .L80240908 -/* C8622C 8024077C 00000000 */ nop +/* C8622C 8024077C 00000000 */ nop .L80240780: /* C86230 80240780 86240008 */ lh $a0, 8($s1) /* C86234 80240784 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel func_802406CC_C8617C /* C86254 802407A4 8E03006C */ lw $v1, 0x6c($s0) /* C86258 802407A8 24020003 */ addiu $v0, $zero, 3 /* C8625C 802407AC 14620056 */ bne $v1, $v0, .L80240908 -/* C86260 802407B0 00000000 */ nop +/* C86260 802407B0 00000000 */ nop /* C86264 802407B4 8E2500A8 */ lw $a1, 0xa8($s1) /* C86268 802407B8 10A00003 */ beqz $a1, .L802407C8 /* C8626C 802407BC 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel func_802406CC_C8617C /* C862E4 80240834 C7A20014 */ lwc1 $f2, 0x14($sp) /* C862E8 80240838 4600020D */ trunc.w.s $f8, $f0 /* C862EC 8024083C 44024000 */ mfc1 $v0, $f8 -/* C862F0 80240840 00000000 */ nop +/* C862F0 80240840 00000000 */ nop /* C862F4 80240844 A6220012 */ sh $v0, 0x12($s1) /* C862F8 80240848 4600120D */ trunc.w.s $f8, $f2 /* C862FC 8024084C 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s index b74f6a2dad..b56e0f62cb 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s @@ -100,78 +100,93 @@ glabel func_8024092C_C863DC /* C86540 80240A90 2C620064 */ sltiu $v0, $v1, 0x64 /* C86544 80240A94 10400048 */ beqz $v0, .L80240BB8 /* C86548 80240A98 00031080 */ sll $v0, $v1, 2 -/* C8654C 80240A9C 3C018024 */ lui $at, %hi(D_802463A8) +/* C8654C 80240A9C 3C018024 */ lui $at, %hi(jtbl_802463A8_C8BE58) /* C86550 80240AA0 00220821 */ addu $at, $at, $v0 -/* C86554 80240AA4 8C2263A8 */ lw $v0, %lo(D_802463A8)($at) +/* C86554 80240AA4 8C2263A8 */ lw $v0, %lo(jtbl_802463A8_C8BE58)($at) /* C86558 80240AA8 00400008 */ jr $v0 /* C8655C 80240AAC 00000000 */ nop +glabel L80240AB0_C86560 /* C86560 80240AB0 0240202D */ daddu $a0, $s2, $zero /* C86564 80240AB4 0260282D */ daddu $a1, $s3, $zero /* C86568 80240AB8 0C012568 */ jal func_800495A0 /* C8656C 80240ABC 0280302D */ daddu $a2, $s4, $zero +glabel L80240AC0_C86570 /* C86570 80240AC0 0240202D */ daddu $a0, $s2, $zero /* C86574 80240AC4 0260282D */ daddu $a1, $s3, $zero /* C86578 80240AC8 0C0125AE */ jal func_800496B8 /* C8657C 80240ACC 0280302D */ daddu $a2, $s4, $zero /* C86580 80240AD0 080902EE */ j .L80240BB8 /* C86584 80240AD4 00000000 */ nop +glabel L80240AD8_C86588 /* C86588 80240AD8 0240202D */ daddu $a0, $s2, $zero /* C8658C 80240ADC 0260282D */ daddu $a1, $s3, $zero /* C86590 80240AE0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* C86594 80240AE4 0280302D */ daddu $a2, $s4, $zero +glabel L80240AE8_C86598 /* C86598 80240AE8 0240202D */ daddu $a0, $s2, $zero /* C8659C 80240AEC 0260282D */ daddu $a1, $s3, $zero /* C865A0 80240AF0 0C012701 */ jal func_80049C04 /* C865A4 80240AF4 0280302D */ daddu $a2, $s4, $zero /* C865A8 80240AF8 080902EE */ j .L80240BB8 /* C865AC 80240AFC 00000000 */ nop +glabel L80240B00_C865B0 /* C865B0 80240B00 0240202D */ daddu $a0, $s2, $zero /* C865B4 80240B04 0260282D */ daddu $a1, $s3, $zero /* C865B8 80240B08 0C01278F */ jal func_80049E3C /* C865BC 80240B0C 0280302D */ daddu $a2, $s4, $zero +glabel L80240B10_C865C0 /* C865C0 80240B10 0240202D */ daddu $a0, $s2, $zero /* C865C4 80240B14 0260282D */ daddu $a1, $s3, $zero /* C865C8 80240B18 0C0127B3 */ jal func_80049ECC /* C865CC 80240B1C 0280302D */ daddu $a2, $s4, $zero /* C865D0 80240B20 080902EE */ j .L80240BB8 /* C865D4 80240B24 00000000 */ nop +glabel L80240B28_C865D8 /* C865D8 80240B28 0240202D */ daddu $a0, $s2, $zero /* C865DC 80240B2C 0260282D */ daddu $a1, $s3, $zero /* C865E0 80240B30 0C0127DF */ jal func_80049F7C /* C865E4 80240B34 0280302D */ daddu $a2, $s4, $zero +glabel L80240B38_C865E8 /* C865E8 80240B38 0240202D */ daddu $a0, $s2, $zero /* C865EC 80240B3C 0260282D */ daddu $a1, $s3, $zero /* C865F0 80240B40 0C012849 */ jal func_8004A124 /* C865F4 80240B44 0280302D */ daddu $a2, $s4, $zero /* C865F8 80240B48 080902EE */ j .L80240BB8 /* C865FC 80240B4C 00000000 */ nop +glabel L80240B50_C86600 /* C86600 80240B50 0240202D */ daddu $a0, $s2, $zero /* C86604 80240B54 0260282D */ daddu $a1, $s3, $zero /* C86608 80240B58 0C0128FA */ jal func_8004A3E8 /* C8660C 80240B5C 0280302D */ daddu $a2, $s4, $zero /* C86610 80240B60 080902EE */ j .L80240BB8 /* C86614 80240B64 00000000 */ nop +glabel L80240B68_C86618 /* C86618 80240B68 0C0900C4 */ jal kzn_17_UnkNpcAIFunc6 /* C8661C 80240B6C 0240202D */ daddu $a0, $s2, $zero +glabel L80240B70_C86620 /* C86620 80240B70 0C0900DF */ jal kzn_17_UnkNpcAIFunc7 /* C86624 80240B74 0240202D */ daddu $a0, $s2, $zero /* C86628 80240B78 8E430070 */ lw $v1, 0x70($s2) /* C8662C 80240B7C 24020020 */ addiu $v0, $zero, 0x20 /* C86630 80240B80 1462000D */ bne $v1, $v0, .L80240BB8 /* C86634 80240B84 00000000 */ nop +glabel L80240B88_C86638 /* C86638 80240B88 0C0900FB */ jal kzn_17_UnkNpcAIFunc8 /* C8663C 80240B8C 0240202D */ daddu $a0, $s2, $zero /* C86640 80240B90 8E430070 */ lw $v1, 0x70($s2) /* C86644 80240B94 24020021 */ addiu $v0, $zero, 0x21 /* C86648 80240B98 14620007 */ bne $v1, $v0, .L80240BB8 /* C8664C 80240B9C 00000000 */ nop +glabel L80240BA0_C86650 /* C86650 80240BA0 0C090131 */ jal kzn_17_UnkNpcAIFunc5 /* C86654 80240BA4 0240202D */ daddu $a0, $s2, $zero /* C86658 80240BA8 080902EE */ j .L80240BB8 /* C8665C 80240BAC 00000000 */ nop +glabel L80240BB0_C86660 /* C86660 80240BB0 0C0129CF */ jal func_8004A73C /* C86664 80240BB4 0240202D */ daddu $a0, $s2, $zero .L80240BB8: +glabel L80240BB8_C86668 /* C86668 80240BB8 8FBF0048 */ lw $ra, 0x48($sp) /* C8666C 80240BBC 8FB50044 */ lw $s5, 0x44($sp) /* C86670 80240BC0 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240C4C_C866FC.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240C4C_C866FC.s index 0bf2cd612d..d4b8533895 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240C4C_C866FC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240C4C_C866FC.s @@ -38,7 +38,7 @@ glabel func_80240C4C_C866FC /* C86780 80240CD0 3C01C1A0 */ lui $at, 0xc1a0 /* C86784 80240CD4 44812000 */ mtc1 $at, $f4 /* C86788 80240CD8 44833000 */ mtc1 $v1, $f6 -/* C8678C 80240CDC 00000000 */ nop +/* C8678C 80240CDC 00000000 */ nop /* C86790 80240CE0 468031A0 */ cvt.s.w $f6, $f6 /* C86794 80240CE4 44073000 */ mfc1 $a3, $f6 /* C86798 80240CE8 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240D48_C867F8.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240D48_C867F8.s index 8877377804..effb43006a 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240D48_C867F8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240D48_C867F8.s @@ -39,18 +39,18 @@ glabel func_80240D48_C867F8 .L80240DD0: /* C86880 80240DD0 8622008E */ lh $v0, 0x8e($s1) /* C86884 80240DD4 1440025D */ bnez $v0, .L8024174C -/* C86888 80240DD8 00000000 */ nop +/* C86888 80240DD8 00000000 */ nop /* C8688C 80240DDC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* C86890 80240DE0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* C86894 80240DE4 0C00A6C9 */ jal clamp_angle /* C86898 80240DE8 C44C00A8 */ lwc1 $f12, 0xa8($v0) /* C8689C 80240DEC 3C014334 */ lui $at, 0x4334 /* C868A0 80240DF0 44811000 */ mtc1 $at, $f2 -/* C868A4 80240DF4 00000000 */ nop +/* C868A4 80240DF4 00000000 */ nop /* C868A8 80240DF8 4602003C */ c.lt.s $f0, $f2 -/* C868AC 80240DFC 00000000 */ nop +/* C868AC 80240DFC 00000000 */ nop /* C868B0 80240E00 45000011 */ bc1f .L80240E48 -/* C868B4 80240E04 00000000 */ nop +/* C868B4 80240E04 00000000 */ nop /* C868B8 80240E08 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* C868BC 80240E0C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* C868C0 80240E10 3C0142B4 */ lui $at, 0x42b4 @@ -85,7 +85,7 @@ glabel func_80240D48_C867F8 /* C86930 80240E80 460C0300 */ add.s $f12, $f0, $f12 .L80240E84: /* C86934 80240E84 0C00A6C9 */ jal clamp_angle -/* C86938 80240E88 00000000 */ nop +/* C86938 80240E88 00000000 */ nop /* C8693C 80240E8C 46000586 */ mov.s $f22, $f0 /* C86940 80240E90 3C014334 */ lui $at, 0x4334 /* C86944 80240E94 44816000 */ mtc1 $at, $f12 @@ -134,7 +134,7 @@ glabel func_80240D48_C867F8 /* C869E0 80240F30 862200A6 */ lh $v0, 0xa6($s1) /* C869E4 80240F34 8EA30000 */ lw $v1, ($s5) /* C869E8 80240F38 44824000 */ mtc1 $v0, $f8 -/* C869EC 80240F3C 00000000 */ nop +/* C869EC 80240F3C 00000000 */ nop /* C869F0 80240F40 46804220 */ cvt.s.w $f8, $f8 /* C869F4 80240F44 C4600028 */ lwc1 $f0, 0x28($v1) /* C869F8 80240F48 44064000 */ mfc1 $a2, $f8 @@ -146,7 +146,7 @@ glabel func_80240D48_C867F8 /* C86A10 80240F60 E6200040 */ swc1 $f0, 0x40($s1) /* C86A14 80240F64 862200A6 */ lh $v0, 0xa6($s1) /* C86A18 80240F68 44820000 */ mtc1 $v0, $f0 -/* C86A1C 80240F6C 00000000 */ nop +/* C86A1C 80240F6C 00000000 */ nop /* C86A20 80240F70 46800020 */ cvt.s.w $f0, $f0 /* C86A24 80240F74 4600A000 */ add.s $f0, $f20, $f0 /* C86A28 80240F78 4406B000 */ mfc1 $a2, $f22 @@ -155,18 +155,18 @@ glabel func_80240D48_C867F8 /* C86A34 80240F84 0220202D */ daddu $a0, $s1, $zero /* C86A38 80240F88 8EC20088 */ lw $v0, 0x88($s6) /* C86A3C 80240F8C 1440005D */ bnez $v0, .L80241104 -/* C86A40 80240F90 00000000 */ nop +/* C86A40 80240F90 00000000 */ nop /* C86A44 80240F94 C6200038 */ lwc1 $f0, 0x38($s1) /* C86A48 80240F98 3C018024 */ lui $at, %hi(D_80246538) /* C86A4C 80240F9C D4246538 */ ldc1 $f4, %lo(D_80246538)($at) /* C86A50 80240FA0 46000021 */ cvt.d.s $f0, $f0 /* C86A54 80240FA4 4620203C */ c.lt.d $f4, $f0 -/* C86A58 80240FA8 00000000 */ nop +/* C86A58 80240FA8 00000000 */ nop /* C86A5C 80240FAC 45000005 */ bc1f .L80240FC4 -/* C86A60 80240FB0 00000000 */ nop +/* C86A60 80240FB0 00000000 */ nop /* C86A64 80240FB4 3C0143BE */ lui $at, 0x43be /* C86A68 80240FB8 44810000 */ mtc1 $at, $f0 -/* C86A6C 80240FBC 00000000 */ nop +/* C86A6C 80240FBC 00000000 */ nop /* C86A70 80240FC0 E6200038 */ swc1 $f0, 0x38($s1) .L80240FC4: /* C86A74 80240FC4 C6200038 */ lwc1 $f0, 0x38($s1) @@ -174,50 +174,50 @@ glabel func_80240D48_C867F8 /* C86A7C 80240FCC D4226540 */ ldc1 $f2, %lo(D_80246540)($at) /* C86A80 80240FD0 46000021 */ cvt.d.s $f0, $f0 /* C86A84 80240FD4 4622003C */ c.lt.d $f0, $f2 -/* C86A88 80240FD8 00000000 */ nop +/* C86A88 80240FD8 00000000 */ nop /* C86A8C 80240FDC 45000005 */ bc1f .L80240FF4 -/* C86A90 80240FE0 00000000 */ nop +/* C86A90 80240FE0 00000000 */ nop /* C86A94 80240FE4 3C01C3BE */ lui $at, 0xc3be /* C86A98 80240FE8 44810000 */ mtc1 $at, $f0 -/* C86A9C 80240FEC 00000000 */ nop +/* C86A9C 80240FEC 00000000 */ nop /* C86AA0 80240FF0 E6200038 */ swc1 $f0, 0x38($s1) .L80240FF4: /* C86AA4 80240FF4 C6200040 */ lwc1 $f0, 0x40($s1) /* C86AA8 80240FF8 46000021 */ cvt.d.s $f0, $f0 /* C86AAC 80240FFC 4620203C */ c.lt.d $f4, $f0 -/* C86AB0 80241000 00000000 */ nop +/* C86AB0 80241000 00000000 */ nop /* C86AB4 80241004 45000005 */ bc1f .L8024101C -/* C86AB8 80241008 00000000 */ nop +/* C86AB8 80241008 00000000 */ nop /* C86ABC 8024100C 3C0143BE */ lui $at, 0x43be /* C86AC0 80241010 44810000 */ mtc1 $at, $f0 -/* C86AC4 80241014 00000000 */ nop +/* C86AC4 80241014 00000000 */ nop /* C86AC8 80241018 E6200040 */ swc1 $f0, 0x40($s1) .L8024101C: /* C86ACC 8024101C C6200040 */ lwc1 $f0, 0x40($s1) /* C86AD0 80241020 46000021 */ cvt.d.s $f0, $f0 /* C86AD4 80241024 4622003C */ c.lt.d $f0, $f2 -/* C86AD8 80241028 00000000 */ nop +/* C86AD8 80241028 00000000 */ nop /* C86ADC 8024102C 45000005 */ bc1f .L80241044 -/* C86AE0 80241030 00000000 */ nop +/* C86AE0 80241030 00000000 */ nop /* C86AE4 80241034 3C01C3BE */ lui $at, 0xc3be /* C86AE8 80241038 44810000 */ mtc1 $at, $f0 -/* C86AEC 8024103C 00000000 */ nop +/* C86AEC 8024103C 00000000 */ nop /* C86AF0 80241040 E6200040 */ swc1 $f0, 0x40($s1) .L80241044: /* C86AF4 80241044 C6220038 */ lwc1 $f2, 0x38($s1) /* C86AF8 80241048 46021082 */ mul.s $f2, $f2, $f2 -/* C86AFC 8024104C 00000000 */ nop +/* C86AFC 8024104C 00000000 */ nop /* C86B00 80241050 C6200040 */ lwc1 $f0, 0x40($s1) /* C86B04 80241054 46000002 */ mul.s $f0, $f0, $f0 -/* C86B08 80241058 00000000 */ nop +/* C86B08 80241058 00000000 */ nop /* C86B0C 8024105C 46001300 */ add.s $f12, $f2, $f0 /* C86B10 80241060 46006004 */ sqrt.s $f0, $f12 /* C86B14 80241064 46000032 */ c.eq.s $f0, $f0 -/* C86B18 80241068 00000000 */ nop +/* C86B18 80241068 00000000 */ nop /* C86B1C 8024106C 45010003 */ bc1t .L8024107C -/* C86B20 80241070 00000000 */ nop +/* C86B20 80241070 00000000 */ nop /* C86B24 80241074 0C0187BC */ jal sqrtf -/* C86B28 80241078 00000000 */ nop +/* C86B28 80241078 00000000 */ nop .L8024107C: /* C86B2C 8024107C 8E260038 */ lw $a2, 0x38($s1) /* C86B30 80241080 8E270040 */ lw $a3, 0x40($s1) @@ -232,7 +232,7 @@ glabel func_80240D48_C867F8 /* C86B54 802410A4 D4206548 */ ldc1 $f0, %lo(D_80246548)($at) /* C86B58 802410A8 460010A1 */ cvt.d.s $f2, $f2 /* C86B5C 802410AC 4620103C */ c.lt.d $f2, $f0 -/* C86B60 802410B0 00000000 */ nop +/* C86B60 802410B0 00000000 */ nop /* C86B64 802410B4 45000004 */ bc1f .L802410C8 /* C86B68 802410B8 0200202D */ daddu $a0, $s0, $zero /* C86B6C 802410BC 3C064398 */ lui $a2, 0x4398 @@ -242,9 +242,9 @@ glabel func_80240D48_C867F8 /* C86B78 802410C8 3C018024 */ lui $at, %hi(D_80246550) /* C86B7C 802410CC D4206550 */ ldc1 $f0, %lo(D_80246550)($at) /* C86B80 802410D0 4622003C */ c.lt.d $f0, $f2 -/* C86B84 802410D4 00000000 */ nop +/* C86B84 802410D4 00000000 */ nop /* C86B88 802410D8 450000FA */ bc1f .L802414C4 -/* C86B8C 802410DC 00000000 */ nop +/* C86B8C 802410DC 00000000 */ nop /* C86B90 802410E0 3C0643BB */ lui $a2, 0x43bb /* C86B94 802410E4 34C68000 */ ori $a2, $a2, 0x8000 .L802410E8: @@ -254,7 +254,7 @@ glabel func_80240D48_C867F8 /* C86BA4 802410F4 0C00A7E7 */ jal add_vec2D_polar /* C86BA8 802410F8 E6340040 */ swc1 $f20, 0x40($s1) /* C86BAC 802410FC 08090531 */ j .L802414C4 -/* C86BB0 80241100 00000000 */ nop +/* C86BB0 80241100 00000000 */ nop .L80241104: /* C86BB4 80241104 8E220000 */ lw $v0, ($s1) /* C86BB8 80241108 30420040 */ andi $v0, $v0, 0x40 @@ -281,13 +281,13 @@ glabel func_80240D48_C867F8 /* C86C0C 8024115C 862200A8 */ lh $v0, 0xa8($s1) /* C86C10 80241160 0260302D */ daddu $a2, $s3, $zero /* C86C14 80241164 44820000 */ mtc1 $v0, $f0 -/* C86C18 80241168 00000000 */ nop +/* C86C18 80241168 00000000 */ nop /* C86C1C 8024116C 46800020 */ cvt.s.w $f0, $f0 /* C86C20 80241170 E7A00018 */ swc1 $f0, 0x18($sp) /* C86C24 80241174 862200A6 */ lh $v0, 0xa6($s1) /* C86C28 80241178 27B00028 */ addiu $s0, $sp, 0x28 /* C86C2C 8024117C 44820000 */ mtc1 $v0, $f0 -/* C86C30 80241180 00000000 */ nop +/* C86C30 80241180 00000000 */ nop /* C86C34 80241184 46800020 */ cvt.s.w $f0, $f0 /* C86C38 80241188 E7A0001C */ swc1 $f0, 0x1c($sp) /* C86C3C 8024118C 8E240080 */ lw $a0, 0x80($s1) @@ -311,13 +311,13 @@ glabel func_80240D48_C867F8 /* C86C84 802411D4 E7B60014 */ swc1 $f22, 0x14($sp) /* C86C88 802411D8 862200A8 */ lh $v0, 0xa8($s1) /* C86C8C 802411DC 44820000 */ mtc1 $v0, $f0 -/* C86C90 802411E0 00000000 */ nop +/* C86C90 802411E0 00000000 */ nop /* C86C94 802411E4 46800020 */ cvt.s.w $f0, $f0 /* C86C98 802411E8 E7A00018 */ swc1 $f0, 0x18($sp) /* C86C9C 802411EC 862200A6 */ lh $v0, 0xa6($s1) /* C86CA0 802411F0 0260302D */ daddu $a2, $s3, $zero /* C86CA4 802411F4 44820000 */ mtc1 $v0, $f0 -/* C86CA8 802411F8 00000000 */ nop +/* C86CA8 802411F8 00000000 */ nop /* C86CAC 802411FC 46800020 */ cvt.s.w $f0, $f0 /* C86CB0 80241200 E7A0001C */ swc1 $f0, 0x1c($sp) /* C86CB4 80241204 8E240080 */ lw $a0, 0x80($s1) @@ -347,32 +347,32 @@ glabel func_80240D48_C867F8 /* C86D14 80241264 0C0372DF */ jal func_800DCB7C /* C86D18 80241268 0040802D */ daddu $s0, $v0, $zero /* C86D1C 8024126C 1600001C */ bnez $s0, .L802412E0 -/* C86D20 80241270 00000000 */ nop +/* C86D20 80241270 00000000 */ nop /* C86D24 80241274 1040001A */ beqz $v0, .L802412E0 -/* C86D28 80241278 00000000 */ nop +/* C86D28 80241278 00000000 */ nop /* C86D2C 8024127C C7A20038 */ lwc1 $f2, 0x38($sp) /* C86D30 80241280 3C014054 */ lui $at, 0x4054 /* C86D34 80241284 44810800 */ mtc1 $at, $f1 /* C86D38 80241288 44800000 */ mtc1 $zero, $f0 /* C86D3C 8024128C 460010A1 */ cvt.d.s $f2, $f2 /* C86D40 80241290 4622003C */ c.lt.d $f0, $f2 -/* C86D44 80241294 00000000 */ nop +/* C86D44 80241294 00000000 */ nop /* C86D48 80241298 45000011 */ bc1f .L802412E0 -/* C86D4C 8024129C 00000000 */ nop +/* C86D4C 8024129C 00000000 */ nop /* C86D50 802412A0 3C01405E */ lui $at, 0x405e /* C86D54 802412A4 44810800 */ mtc1 $at, $f1 /* C86D58 802412A8 44800000 */ mtc1 $zero, $f0 -/* C86D5C 802412AC 00000000 */ nop +/* C86D5C 802412AC 00000000 */ nop /* C86D60 802412B0 4620103C */ c.lt.d $f2, $f0 -/* C86D64 802412B4 00000000 */ nop +/* C86D64 802412B4 00000000 */ nop /* C86D68 802412B8 45000009 */ bc1f .L802412E0 -/* C86D6C 802412BC 00000000 */ nop +/* C86D6C 802412BC 00000000 */ nop /* C86D70 802412C0 C622003C */ lwc1 $f2, 0x3c($s1) /* C86D74 802412C4 C7A00030 */ lwc1 $f0, 0x30($sp) /* C86D78 802412C8 46001032 */ c.eq.s $f2, $f0 -/* C86D7C 802412CC 00000000 */ nop +/* C86D7C 802412CC 00000000 */ nop /* C86D80 802412D0 45010003 */ bc1t .L802412E0 -/* C86D84 802412D4 00000000 */ nop +/* C86D84 802412D4 00000000 */ nop /* C86D88 802412D8 08090531 */ j .L802414C4 /* C86D8C 802412DC 241E0001 */ addiu $fp, $zero, 1 .L802412E0: @@ -396,13 +396,13 @@ glabel func_80240D48_C867F8 /* C86DD4 80241324 862200A8 */ lh $v0, 0xa8($s1) /* C86DD8 80241328 27A50020 */ addiu $a1, $sp, 0x20 /* C86DDC 8024132C 44820000 */ mtc1 $v0, $f0 -/* C86DE0 80241330 00000000 */ nop +/* C86DE0 80241330 00000000 */ nop /* C86DE4 80241334 46800020 */ cvt.s.w $f0, $f0 /* C86DE8 80241338 E7A00018 */ swc1 $f0, 0x18($sp) /* C86DEC 8024133C 862200A6 */ lh $v0, 0xa6($s1) /* C86DF0 80241340 27A60024 */ addiu $a2, $sp, 0x24 /* C86DF4 80241344 44820000 */ mtc1 $v0, $f0 -/* C86DF8 80241348 00000000 */ nop +/* C86DF8 80241348 00000000 */ nop /* C86DFC 8024134C 46800020 */ cvt.s.w $f0, $f0 /* C86E00 80241350 E7A0001C */ swc1 $f0, 0x1c($sp) /* C86E04 80241354 8E240080 */ lw $a0, 0x80($s1) @@ -420,7 +420,7 @@ glabel func_80240D48_C867F8 /* C86E34 80241384 862200A6 */ lh $v0, 0xa6($s1) /* C86E38 80241388 4407C000 */ mfc1 $a3, $f24 /* C86E3C 8024138C 44824000 */ mtc1 $v0, $f8 -/* C86E40 80241390 00000000 */ nop +/* C86E40 80241390 00000000 */ nop /* C86E44 80241394 46804220 */ cvt.s.w $f8, $f8 /* C86E48 80241398 C4600028 */ lwc1 $f0, 0x28($v1) /* C86E4C 8024139C 44064000 */ mfc1 $a2, $f8 @@ -432,7 +432,7 @@ glabel func_80240D48_C867F8 /* C86E64 802413B4 E6200040 */ swc1 $f0, 0x40($s1) /* C86E68 802413B8 862200A6 */ lh $v0, 0xa6($s1) /* C86E6C 802413BC 44820000 */ mtc1 $v0, $f0 -/* C86E70 802413C0 00000000 */ nop +/* C86E70 802413C0 00000000 */ nop /* C86E74 802413C4 46800020 */ cvt.s.w $f0, $f0 /* C86E78 802413C8 0809052D */ j .L802414B4 /* C86E7C 802413CC 4600A500 */ add.s $f20, $f20, $f0 @@ -454,20 +454,20 @@ glabel func_80240D48_C867F8 /* C86EB8 80241408 E7B60014 */ swc1 $f22, 0x14($sp) /* C86EBC 8024140C 862200A8 */ lh $v0, 0xa8($s1) /* C86EC0 80241410 44820000 */ mtc1 $v0, $f0 -/* C86EC4 80241414 00000000 */ nop +/* C86EC4 80241414 00000000 */ nop /* C86EC8 80241418 46800020 */ cvt.s.w $f0, $f0 /* C86ECC 8024141C E7A00018 */ swc1 $f0, 0x18($sp) /* C86ED0 80241420 862200A6 */ lh $v0, 0xa6($s1) /* C86ED4 80241424 27A60024 */ addiu $a2, $sp, 0x24 /* C86ED8 80241428 44820000 */ mtc1 $v0, $f0 -/* C86EDC 8024142C 00000000 */ nop +/* C86EDC 8024142C 00000000 */ nop /* C86EE0 80241430 46800020 */ cvt.s.w $f0, $f0 /* C86EE4 80241434 E7A0001C */ swc1 $f0, 0x1c($sp) /* C86EE8 80241438 8E240080 */ lw $a0, 0x80($s1) /* C86EEC 8024143C 0C037711 */ jal func_800DDC44 /* C86EF0 80241440 27A70028 */ addiu $a3, $sp, 0x28 /* C86EF4 80241444 1040001F */ beqz $v0, .L802414C4 -/* C86EF8 80241448 00000000 */ nop +/* C86EF8 80241448 00000000 */ nop /* C86EFC 8024144C 8FA60020 */ lw $a2, 0x20($sp) /* C86F00 80241450 8EA20000 */ lw $v0, ($s5) /* C86F04 80241454 8FA70028 */ lw $a3, 0x28($sp) @@ -479,7 +479,7 @@ glabel func_80240D48_C867F8 /* C86F1C 8024146C 862200A6 */ lh $v0, 0xa6($s1) /* C86F20 80241470 4407C000 */ mfc1 $a3, $f24 /* C86F24 80241474 44824000 */ mtc1 $v0, $f8 -/* C86F28 80241478 00000000 */ nop +/* C86F28 80241478 00000000 */ nop /* C86F2C 8024147C 46804220 */ cvt.s.w $f8, $f8 /* C86F30 80241480 C4600028 */ lwc1 $f0, 0x28($v1) /* C86F34 80241484 44064000 */ mfc1 $a2, $f8 @@ -491,7 +491,7 @@ glabel func_80240D48_C867F8 /* C86F4C 8024149C E6200040 */ swc1 $f0, 0x40($s1) /* C86F50 802414A0 862200A6 */ lh $v0, 0xa6($s1) /* C86F54 802414A4 44820000 */ mtc1 $v0, $f0 -/* C86F58 802414A8 00000000 */ nop +/* C86F58 802414A8 00000000 */ nop /* C86F5C 802414AC 46800020 */ cvt.s.w $f0, $f0 /* C86F60 802414B0 4600A500 */ add.s $f20, $f20, $f0 .L802414B4: @@ -520,14 +520,14 @@ glabel func_80240D48_C867F8 /* C86FB8 80241508 0C0123F5 */ jal is_point_within_region /* C86FBC 8024150C 26330040 */ addiu $s3, $s1, 0x40 /* C86FC0 80241510 1040005A */ beqz $v0, .L8024167C -/* C86FC4 80241514 00000000 */ nop +/* C86FC4 80241514 00000000 */ nop /* C86FC8 80241518 8E430004 */ lw $v1, 4($s2) /* C86FCC 8024151C 10600005 */ beqz $v1, .L80241534 /* C86FD0 80241520 24020001 */ addiu $v0, $zero, 1 /* C86FD4 80241524 10620029 */ beq $v1, $v0, .L802415CC -/* C86FD8 80241528 00000000 */ nop +/* C86FD8 80241528 00000000 */ nop /* C86FDC 8024152C 0809059F */ j .L8024167C -/* C86FE0 80241530 00000000 */ nop +/* C86FE0 80241530 00000000 */ nop .L80241534: /* C86FE4 80241534 C6480008 */ lwc1 $f8, 8($s2) /* C86FE8 80241538 46804220 */ cvt.s.w $f8, $f8 @@ -538,11 +538,11 @@ glabel func_80240D48_C867F8 /* C86FFC 8024154C C62E0040 */ lwc1 $f14, 0x40($s1) /* C87000 80241550 44074000 */ mfc1 $a3, $f8 /* C87004 80241554 0C00A7B5 */ jal dist2D -/* C87008 80241558 00000000 */ nop +/* C87008 80241558 00000000 */ nop /* C8700C 8024155C C6420010 */ lwc1 $f2, 0x10($s2) /* C87010 80241560 468010A0 */ cvt.s.w $f2, $f2 /* C87014 80241564 4600103C */ c.lt.s $f2, $f0 -/* C87018 80241568 00000000 */ nop +/* C87018 80241568 00000000 */ nop /* C8701C 8024156C 45000043 */ bc1f .L8024167C /* C87020 80241570 E7A00038 */ swc1 $f0, 0x38($sp) /* C87024 80241574 C64C0008 */ lwc1 $f12, 8($s2) @@ -566,17 +566,17 @@ glabel func_80240D48_C867F8 /* C8706C 802415BC 0C00A7E7 */ jal add_vec2D_polar /* C87070 802415C0 0260282D */ daddu $a1, $s3, $zero /* C87074 802415C4 0809059F */ j .L8024167C -/* C87078 802415C8 00000000 */ nop +/* C87078 802415C8 00000000 */ nop .L802415CC: /* C8707C 802415CC 8E420008 */ lw $v0, 8($s2) /* C87080 802415D0 8E430010 */ lw $v1, 0x10($s2) /* C87084 802415D4 C6200038 */ lwc1 $f0, 0x38($s1) /* C87088 802415D8 00431021 */ addu $v0, $v0, $v1 /* C8708C 802415DC 44821000 */ mtc1 $v0, $f2 -/* C87090 802415E0 00000000 */ nop +/* C87090 802415E0 00000000 */ nop /* C87094 802415E4 468010A0 */ cvt.s.w $f2, $f2 /* C87098 802415E8 4600103C */ c.lt.s $f2, $f0 -/* C8709C 802415EC 00000000 */ nop +/* C8709C 802415EC 00000000 */ nop /* C870A0 802415F0 45030001 */ bc1tl .L802415F8 /* C870A4 802415F4 E6220038 */ swc1 $f2, 0x38($s1) .L802415F8: @@ -585,10 +585,10 @@ glabel func_80240D48_C867F8 /* C870B0 80241600 C6200038 */ lwc1 $f0, 0x38($s1) /* C870B4 80241604 00431023 */ subu $v0, $v0, $v1 /* C870B8 80241608 44821000 */ mtc1 $v0, $f2 -/* C870BC 8024160C 00000000 */ nop +/* C870BC 8024160C 00000000 */ nop /* C870C0 80241610 468010A0 */ cvt.s.w $f2, $f2 /* C870C4 80241614 4602003C */ c.lt.s $f0, $f2 -/* C870C8 80241618 00000000 */ nop +/* C870C8 80241618 00000000 */ nop /* C870CC 8024161C 45030001 */ bc1tl .L80241624 /* C870D0 80241620 E6220038 */ swc1 $f2, 0x38($s1) .L80241624: @@ -597,10 +597,10 @@ glabel func_80240D48_C867F8 /* C870DC 8024162C C6200040 */ lwc1 $f0, 0x40($s1) /* C870E0 80241630 00431021 */ addu $v0, $v0, $v1 /* C870E4 80241634 44821000 */ mtc1 $v0, $f2 -/* C870E8 80241638 00000000 */ nop +/* C870E8 80241638 00000000 */ nop /* C870EC 8024163C 468010A0 */ cvt.s.w $f2, $f2 /* C870F0 80241640 4600103C */ c.lt.s $f2, $f0 -/* C870F4 80241644 00000000 */ nop +/* C870F4 80241644 00000000 */ nop /* C870F8 80241648 45030001 */ bc1tl .L80241650 /* C870FC 8024164C E6220040 */ swc1 $f2, 0x40($s1) .L80241650: @@ -609,21 +609,21 @@ glabel func_80240D48_C867F8 /* C87108 80241658 C6200040 */ lwc1 $f0, 0x40($s1) /* C8710C 8024165C 00431023 */ subu $v0, $v0, $v1 /* C87110 80241660 44821000 */ mtc1 $v0, $f2 -/* C87114 80241664 00000000 */ nop +/* C87114 80241664 00000000 */ nop /* C87118 80241668 468010A0 */ cvt.s.w $f2, $f2 /* C8711C 8024166C 4602003C */ c.lt.s $f0, $f2 -/* C87120 80241670 00000000 */ nop +/* C87120 80241670 00000000 */ nop /* C87124 80241674 45030001 */ bc1tl .L8024167C /* C87128 80241678 E6220040 */ swc1 $f2, 0x40($s1) .L8024167C: /* C8712C 8024167C 16E0001F */ bnez $s7, .L802416FC -/* C87130 80241680 00000000 */ nop +/* C87130 80241680 00000000 */ nop /* C87134 80241684 8E220000 */ lw $v0, ($s1) /* C87138 80241688 30420008 */ andi $v0, $v0, 8 /* C8713C 8024168C 10400003 */ beqz $v0, .L8024169C /* C87140 80241690 27A50020 */ addiu $a1, $sp, 0x20 /* C87144 80241694 13C00019 */ beqz $fp, .L802416FC -/* C87148 80241698 00000000 */ nop +/* C87148 80241698 00000000 */ nop .L8024169C: /* C8714C 8024169C 27A60024 */ addiu $a2, $sp, 0x24 /* C87150 802416A0 27A20038 */ addiu $v0, $sp, 0x38 @@ -646,7 +646,7 @@ glabel func_80240D48_C867F8 /* C87194 802416E4 0C0372DF */ jal func_800DCB7C /* C87198 802416E8 27A70028 */ addiu $a3, $sp, 0x28 /* C8719C 802416EC 10400003 */ beqz $v0, .L802416FC -/* C871A0 802416F0 00000000 */ nop +/* C871A0 802416F0 00000000 */ nop /* C871A4 802416F4 C7A00024 */ lwc1 $f0, 0x24($sp) /* C871A8 802416F8 E620003C */ swc1 $f0, 0x3c($s1) .L802416FC: diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241788_C87238.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241788_C87238.s index 5636bcef6e..d61a67522e 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241788_C87238.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241788_C87238.s @@ -27,7 +27,7 @@ glabel func_80241788_C87238 .L802417E0: /* C87290 802417E0 8482008E */ lh $v0, 0x8e($a0) /* C87294 802417E4 14400007 */ bnez $v0, .L80241804 -/* C87298 802417E8 00000000 */ nop +/* C87298 802417E8 00000000 */ nop /* C8729C 802417EC 8E0200CC */ lw $v0, 0xcc($s0) /* C872A0 802417F0 8C420028 */ lw $v0, 0x28($v0) /* C872A4 802417F4 A480008E */ sh $zero, 0x8e($a0) diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241818_C872C8.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241818_C872C8.s index d9b8a84897..5c207ef66b 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241818_C872C8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241818_C872C8.s @@ -18,7 +18,7 @@ glabel func_80241818_C872C8 /* C872FC 8024184C 8E0300A0 */ lw $v1, 0xa0($s0) /* C87300 80241850 00021403 */ sra $v0, $v0, 0x10 /* C87304 80241854 14430004 */ bne $v0, $v1, .L80241868 -/* C87308 80241858 00000000 */ nop +/* C87308 80241858 00000000 */ nop /* C8730C 8024185C 8E0200CC */ lw $v0, 0xcc($s0) /* C87310 80241860 8C42002C */ lw $v0, 0x2c($v0) /* C87314 80241864 ACA20028 */ sw $v0, 0x28($a1) @@ -47,7 +47,7 @@ glabel func_80241818_C872C8 /* C87368 802418B8 3C01C1A0 */ lui $at, 0xc1a0 /* C8736C 802418BC 44812000 */ mtc1 $at, $f4 /* C87370 802418C0 44833000 */ mtc1 $v1, $f6 -/* C87374 802418C4 00000000 */ nop +/* C87374 802418C4 00000000 */ nop /* C87378 802418C8 468031A0 */ cvt.s.w $f6, $f6 /* C8737C 802418CC 8C420000 */ lw $v0, ($v0) /* C87380 802418D0 44073000 */ mfc1 $a3, $f6 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241918_C873C8.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241918_C873C8.s index dae24c4e5f..77f2c413dc 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241918_C873C8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241918_C873C8.s @@ -16,7 +16,7 @@ glabel func_80241918_C873C8 /* C873F4 80241944 A462008E */ sh $v0, 0x8e($v1) /* C873F8 80241948 00021400 */ sll $v0, $v0, 0x10 /* C873FC 8024194C 14400005 */ bnez $v0, .L80241964 -/* C87400 80241950 00000000 */ nop +/* C87400 80241950 00000000 */ nop /* C87404 80241954 960200AA */ lhu $v0, 0xaa($s0) /* C87408 80241958 A462008E */ sh $v0, 0x8e($v1) /* C8740C 8024195C 2402000E */ addiu $v0, $zero, 0xe diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241978_C87428.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241978_C87428.s index 864cd4e624..efc20f5939 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241978_C87428.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241978_C87428.s @@ -42,7 +42,7 @@ glabel func_80241978_C87428 /* C874BC 80241A0C 2402000F */ addiu $v0, $zero, 0xf /* C874C0 80241A10 AFA2001C */ sw $v0, 0x1c($sp) /* C874C4 80241A14 44833000 */ mtc1 $v1, $f6 -/* C874C8 80241A18 00000000 */ nop +/* C874C8 80241A18 00000000 */ nop /* C874CC 80241A1C 468031A0 */ cvt.s.w $f6, $f6 /* C874D0 80241A20 44073000 */ mfc1 $a3, $f6 /* C874D4 80241A24 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241A64_C87514.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241A64_C87514.s index a911be0931..950c793c01 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241A64_C87514.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241A64_C87514.s @@ -46,7 +46,7 @@ glabel func_80241A64_C87514 /* C875B8 80241B08 8E2200B0 */ lw $v0, 0xb0($s1) /* C875BC 80241B0C 30420004 */ andi $v0, $v0, 4 /* C875C0 80241B10 10400011 */ beqz $v0, .L80241B58 -/* C875C4 80241B14 00000000 */ nop +/* C875C4 80241B14 00000000 */ nop .L80241B18: /* C875C8 80241B18 AE400070 */ sw $zero, 0x70($s2) /* C875CC 80241B1C A6A0008E */ sh $zero, 0x8e($s5) @@ -78,12 +78,12 @@ glabel func_80241A64_C87514 /* C87630 80241B80 10600013 */ beqz $v1, .L80241BD0 /* C87634 80241B84 0240202D */ daddu $a0, $s2, $zero /* C87638 80241B88 08090723 */ j .L80241C8C -/* C8763C 80241B8C 00000000 */ nop +/* C8763C 80241B8C 00000000 */ nop .L80241B90: /* C87640 80241B90 10620018 */ beq $v1, $v0, .L80241BF4 /* C87644 80241B94 0240202D */ daddu $a0, $s2, $zero /* C87648 80241B98 08090723 */ j .L80241C8C -/* C8764C 80241B9C 00000000 */ nop +/* C8764C 80241B9C 00000000 */ nop .L80241BA0: /* C87650 80241BA0 2402000D */ addiu $v0, $zero, 0xd /* C87654 80241BA4 10620029 */ beq $v1, $v0, .L80241C4C @@ -94,9 +94,9 @@ glabel func_80241A64_C87514 /* C87668 80241BB8 1062002D */ beq $v1, $v0, .L80241C70 /* C8766C 80241BBC 24020063 */ addiu $v0, $zero, 0x63 /* C87670 80241BC0 10620030 */ beq $v1, $v0, .L80241C84 -/* C87674 80241BC4 00000000 */ nop +/* C87674 80241BC4 00000000 */ nop /* C87678 80241BC8 08090723 */ j .L80241C8C -/* C8767C 80241BCC 00000000 */ nop +/* C8767C 80241BCC 00000000 */ nop .L80241BD0: /* C87680 80241BD0 0260282D */ daddu $a1, $s3, $zero /* C87684 80241BD4 0C0902F8 */ jal func_80240BE0_C86690 @@ -107,14 +107,14 @@ glabel func_80241A64_C87514 /* C87694 80241BE4 0C090313 */ jal func_80240C4C_C866FC /* C87698 80241BE8 0280302D */ daddu $a2, $s4, $zero /* C8769C 80241BEC 08090723 */ j .L80241C8C -/* C876A0 80241BF0 00000000 */ nop +/* C876A0 80241BF0 00000000 */ nop .L80241BF4: /* C876A4 80241BF4 0260282D */ daddu $a1, $s3, $zero /* C876A8 80241BF8 0C090352 */ jal func_80240D48_C867F8 /* C876AC 80241BFC 0280302D */ daddu $a2, $s4, $zero /* C876B0 80241C00 8E420070 */ lw $v0, 0x70($s2) /* C876B4 80241C04 14500021 */ bne $v0, $s0, .L80241C8C -/* C876B8 80241C08 00000000 */ nop +/* C876B8 80241C08 00000000 */ nop .L80241C0C: /* C876BC 80241C0C 0240202D */ daddu $a0, $s2, $zero /* C876C0 80241C10 0260282D */ daddu $a1, $s3, $zero @@ -123,7 +123,7 @@ glabel func_80241A64_C87514 /* C876CC 80241C1C 8E430070 */ lw $v1, 0x70($s2) /* C876D0 80241C20 2402000C */ addiu $v0, $zero, 0xc /* C876D4 80241C24 14620019 */ bne $v1, $v0, .L80241C8C -/* C876D8 80241C28 00000000 */ nop +/* C876D8 80241C28 00000000 */ nop /* C876DC 80241C2C 0240202D */ daddu $a0, $s2, $zero .L80241C30: /* C876E0 80241C30 0260282D */ daddu $a1, $s3, $zero @@ -132,7 +132,7 @@ glabel func_80241A64_C87514 /* C876EC 80241C3C 8E430070 */ lw $v1, 0x70($s2) /* C876F0 80241C40 2402000D */ addiu $v0, $zero, 0xd /* C876F4 80241C44 14620011 */ bne $v1, $v0, .L80241C8C -/* C876F8 80241C48 00000000 */ nop +/* C876F8 80241C48 00000000 */ nop .L80241C4C: /* C876FC 80241C4C 0240202D */ daddu $a0, $s2, $zero /* C87700 80241C50 0260282D */ daddu $a1, $s3, $zero @@ -141,14 +141,14 @@ glabel func_80241A64_C87514 /* C8770C 80241C5C 8E430070 */ lw $v1, 0x70($s2) /* C87710 80241C60 2402000E */ addiu $v0, $zero, 0xe /* C87714 80241C64 14620009 */ bne $v1, $v0, .L80241C8C -/* C87718 80241C68 00000000 */ nop +/* C87718 80241C68 00000000 */ nop /* C8771C 80241C6C 0240202D */ daddu $a0, $s2, $zero .L80241C70: /* C87720 80241C70 0260282D */ daddu $a1, $s3, $zero /* C87724 80241C74 0C09065E */ jal func_80241978_C87428 /* C87728 80241C78 0280302D */ daddu $a2, $s4, $zero /* C8772C 80241C7C 08090723 */ j .L80241C8C -/* C87730 80241C80 00000000 */ nop +/* C87730 80241C80 00000000 */ nop .L80241C84: /* C87734 80241C84 0C0129CF */ jal func_8004A73C /* C87738 80241C88 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241D30_C877E0.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241D30_C877E0.s index 9701f864a1..805c686226 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241D30_C877E0.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241D30_C877E0.s @@ -21,11 +21,11 @@ glabel func_80241D30_C877E0 /* C87820 80241D70 A602008E */ sh $v0, 0x8e($s0) /* C87824 80241D74 00021400 */ sll $v0, $v0, 0x10 /* C87828 80241D78 1C400033 */ bgtz $v0, .L80241E48 -/* C8782C 80241D7C 00000000 */ nop +/* C8782C 80241D7C 00000000 */ nop .L80241D80: /* C87830 80241D80 8602008C */ lh $v0, 0x8c($s0) /* C87834 80241D84 14400030 */ bnez $v0, .L80241E48 -/* C87838 80241D88 00000000 */ nop +/* C87838 80241D88 00000000 */ nop /* C8783C 80241D8C 8E2200CC */ lw $v0, 0xcc($s1) /* C87840 80241D90 8C420024 */ lw $v0, 0x24($v0) /* C87844 80241D94 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_80241D30_C877E0 /* C87850 80241DA0 8E230088 */ lw $v1, 0x88($s1) /* C87854 80241DA4 24020005 */ addiu $v0, $zero, 5 /* C87858 80241DA8 10620005 */ beq $v1, $v0, .L80241DC0 -/* C8785C 80241DAC 00000000 */ nop +/* C8785C 80241DAC 00000000 */ nop /* C87860 80241DB0 10600003 */ beqz $v1, .L80241DC0 /* C87864 80241DB4 24020001 */ addiu $v0, $zero, 1 /* C87868 80241DB8 14620006 */ bne $v1, $v0, .L80241DD4 -/* C8786C 80241DBC 00000000 */ nop +/* C8786C 80241DBC 00000000 */ nop .L80241DC0: /* C87870 80241DC0 8E220084 */ lw $v0, 0x84($s1) /* C87874 80241DC4 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_80241D30_C877E0 /* C878B4 80241E04 46220000 */ add.d $f0, $f0, $f2 /* C878B8 80241E08 4620010D */ trunc.w.d $f4, $f0 /* C878BC 80241E0C 44022000 */ mfc1 $v0, $f4 -/* C878C0 80241E10 00000000 */ nop +/* C878C0 80241E10 00000000 */ nop /* C878C4 80241E14 A602008E */ sh $v0, 0x8e($s0) /* C878C8 80241E18 00021400 */ sll $v0, $v0, 0x10 /* C878CC 80241E1C 8E230078 */ lw $v1, 0x78($s1) /* C878D0 80241E20 00021403 */ sra $v0, $v0, 0x10 /* C878D4 80241E24 0043102A */ slt $v0, $v0, $v1 /* C878D8 80241E28 10400003 */ beqz $v0, .L80241E38 -/* C878DC 80241E2C 00000000 */ nop +/* C878DC 80241E2C 00000000 */ nop /* C878E0 80241E30 9622007A */ lhu $v0, 0x7a($s1) /* C878E4 80241E34 A602008E */ sh $v0, 0x8e($s0) .L80241E38: diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s index b04ab84b43..c1cb9921c4 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s @@ -279,15 +279,17 @@ glabel func_80242048_C87AF8 /* C87EE4 80242434 2C620015 */ sltiu $v0, $v1, 0x15 /* C87EE8 80242438 10400009 */ beqz $v0, .L80242460 /* C87EEC 8024243C 00031080 */ sll $v0, $v1, 2 -/* C87EF0 80242440 3C018024 */ lui $at, %hi(D_80246570) +/* C87EF0 80242440 3C018024 */ lui $at, %hi(jtbl_80246570_C8C020) /* C87EF4 80242444 00220821 */ addu $at, $at, $v0 -/* C87EF8 80242448 8C226570 */ lw $v0, %lo(D_80246570)($at) +/* C87EF8 80242448 8C226570 */ lw $v0, %lo(jtbl_80246570_C8C020)($at) /* C87EFC 8024244C 00400008 */ jr $v0 /* C87F00 80242450 00000000 */ nop +glabel L80242454_C87F04 /* C87F04 80242454 8E420028 */ lw $v0, 0x28($s2) /* C87F08 80242458 24420001 */ addiu $v0, $v0, 1 /* C87F0C 8024245C AE420028 */ sw $v0, 0x28($s2) .L80242460: +glabel L80242460_C87F10 /* C87F10 80242460 0000102D */ daddu $v0, $zero, $zero .L80242464: /* C87F14 80242464 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024259C_C8804C.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024259C_C8804C.s index 5df75d1810..140c3de909 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024259C_C8804C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024259C_C8804C.s @@ -26,7 +26,7 @@ glabel func_8024259C_C8804C /* C8809C 802425EC 1440FFFA */ bnez $v0, .L802425D8 /* C880A0 802425F0 24A50004 */ addiu $a1, $a1, 4 /* C880A4 802425F4 0809098E */ j .L80242638 -/* C880A8 802425F8 00000000 */ nop +/* C880A8 802425F8 00000000 */ nop .L802425FC: /* C880AC 802425FC 0000182D */ daddu $v1, $zero, $zero /* C880B0 80242600 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242CC8_C88778.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242CC8_C88778.s index ad05053bcd..4d5abb1b9e 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242CC8_C88778.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242CC8_C88778.s @@ -13,6 +13,6 @@ glabel func_80242CC8_C88778 /* C88798 80242CE8 24020002 */ addiu $v0, $zero, 2 /* C8879C 80242CEC 03E00008 */ jr $ra /* C887A0 80242CF0 27BD0018 */ addiu $sp, $sp, 0x18 -/* C887A4 80242CF4 00000000 */ nop -/* C887A8 80242CF8 00000000 */ nop -/* C887AC 80242CFC 00000000 */ nop +/* C887A4 80242CF4 00000000 */ nop +/* C887A8 80242CF8 00000000 */ nop +/* C887AC 80242CFC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242D4C_C887FC.s b/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242D4C_C887FC.s index 271ef72118..17bb38ebe2 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242D4C_C887FC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242D4C_C887FC.s @@ -24,11 +24,11 @@ glabel func_80242D4C_C887FC /* C88848 80242D98 0C0372DF */ jal func_800DCB7C /* C8884C 80242D9C AFA20010 */ sw $v0, 0x10($sp) /* C88850 80242DA0 1040000B */ beqz $v0, .L80242DD0 -/* C88854 80242DA4 00000000 */ nop +/* C88854 80242DA4 00000000 */ nop /* C88858 80242DA8 C7A2001C */ lwc1 $f2, 0x1c($sp) /* C8885C 80242DAC 3C01425C */ lui $at, 0x425c /* C88860 80242DB0 44810000 */ mtc1 $at, $f0 -/* C88864 80242DB4 00000000 */ nop +/* C88864 80242DB4 00000000 */ nop /* C88868 80242DB8 46001080 */ add.s $f2, $f2, $f0 /* C8886C 80242DBC C7A00018 */ lwc1 $f0, 0x18($sp) /* C88870 80242DC0 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242DE4_C88894.s b/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242DE4_C88894.s index 136cc4f560..ebd04f4aed 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242DE4_C88894.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242DE4_C88894.s @@ -13,28 +13,28 @@ glabel func_80242DE4_C88894 /* C888B4 80242E04 468010A0 */ cvt.s.w $f2, $f2 /* C888B8 80242E08 46001081 */ sub.s $f2, $f2, $f0 /* C888BC 80242E0C 46021082 */ mul.s $f2, $f2, $f2 -/* C888C0 80242E10 00000000 */ nop +/* C888C0 80242E10 00000000 */ nop /* C888C4 80242E14 C440002C */ lwc1 $f0, 0x2c($v0) /* C888C8 80242E18 C604008C */ lwc1 $f4, 0x8c($s0) /* C888CC 80242E1C 46802120 */ cvt.s.w $f4, $f4 /* C888D0 80242E20 46002101 */ sub.s $f4, $f4, $f0 /* C888D4 80242E24 46042102 */ mul.s $f4, $f4, $f4 -/* C888D8 80242E28 00000000 */ nop +/* C888D8 80242E28 00000000 */ nop /* C888DC 80242E2C C4460030 */ lwc1 $f6, 0x30($v0) /* C888E0 80242E30 44800000 */ mtc1 $zero, $f0 -/* C888E4 80242E34 00000000 */ nop +/* C888E4 80242E34 00000000 */ nop /* C888E8 80242E38 46060001 */ sub.s $f0, $f0, $f6 /* C888EC 80242E3C 46000002 */ mul.s $f0, $f0, $f0 -/* C888F0 80242E40 00000000 */ nop +/* C888F0 80242E40 00000000 */ nop /* C888F4 80242E44 46041080 */ add.s $f2, $f2, $f4 /* C888F8 80242E48 46001300 */ add.s $f12, $f2, $f0 /* C888FC 80242E4C 46006004 */ sqrt.s $f0, $f12 /* C88900 80242E50 46000032 */ c.eq.s $f0, $f0 -/* C88904 80242E54 00000000 */ nop +/* C88904 80242E54 00000000 */ nop /* C88908 80242E58 45010003 */ bc1t .L80242E68 -/* C8890C 80242E5C 00000000 */ nop +/* C8890C 80242E5C 00000000 */ nop /* C88910 80242E60 0C0187BC */ jal sqrtf -/* C88914 80242E64 00000000 */ nop +/* C88914 80242E64 00000000 */ nop .L80242E68: /* C88918 80242E68 4600020D */ trunc.w.s $f8, $f0 /* C8891C 80242E6C E6080094 */ swc1 $f8, 0x94($s0) diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242E84_C88934.s b/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242E84_C88934.s index a059c2e6b4..bc4184307b 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242E84_C88934.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242E84_C88934.s @@ -8,7 +8,7 @@ glabel func_80242E84_C88934 /* C88940 80242E90 0C0B1EAF */ jal get_variable /* C88944 80242E94 8C450000 */ lw $a1, ($v0) /* C88948 80242E98 44820000 */ mtc1 $v0, $f0 -/* C8894C 80242E9C 00000000 */ nop +/* C8894C 80242E9C 00000000 */ nop /* C88950 80242EA0 46800020 */ cvt.s.w $f0, $f0 /* C88954 80242EA4 8FBF0010 */ lw $ra, 0x10($sp) /* C88958 80242EA8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242EBC_C8896C.s b/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242EBC_C8896C.s index d52907cc0a..bc0ed69bb3 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242EBC_C8896C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242EBC_C8896C.s @@ -21,7 +21,7 @@ glabel func_80242EBC_C8896C /* C889AC 80242EFC 44801000 */ mtc1 $zero, $f2 /* C889B0 80242F00 46000021 */ cvt.d.s $f0, $f0 /* C889B4 80242F04 46220002 */ mul.d $f0, $f0, $f2 -/* C889B8 80242F08 00000000 */ nop +/* C889B8 80242F08 00000000 */ nop /* C889BC 80242F0C C60C0090 */ lwc1 $f12, 0x90($s0) /* C889C0 80242F10 46806320 */ cvt.s.w $f12, $f12 /* C889C4 80242F14 46006307 */ neg.s $f12, $f12 @@ -39,7 +39,7 @@ glabel func_80242EBC_C8896C /* C889F4 80242F44 44801000 */ mtc1 $zero, $f2 /* C889F8 80242F48 46000021 */ cvt.d.s $f0, $f0 /* C889FC 80242F4C 46220002 */ mul.d $f0, $f0, $f2 -/* C88A00 80242F50 00000000 */ nop +/* C88A00 80242F50 00000000 */ nop /* C88A04 80242F54 4620010D */ trunc.w.d $f4, $f0 /* C88A08 80242F58 E604009C */ swc1 $f4, 0x9c($s0) /* C88A0C 80242F5C 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242F74_C88A24.s b/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242F74_C88A24.s index d7e2584ed7..5910f77910 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242F74_C88A24.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242F74_C88A24.s @@ -13,7 +13,7 @@ glabel func_80242F74_C88A24 /* C88A44 80242F94 46201081 */ sub.d $f2, $f2, $f0 /* C88A48 80242F98 462010A0 */ cvt.s.d $f2, $f2 /* C88A4C 80242F9C 46021082 */ mul.s $f2, $f2, $f2 -/* C88A50 80242FA0 00000000 */ nop +/* C88A50 80242FA0 00000000 */ nop /* C88A54 80242FA4 3C018024 */ lui $at, %hi(D_802465E8) /* C88A58 80242FA8 D42065E8 */ ldc1 $f0, %lo(D_802465E8)($at) /* C88A5C 80242FAC C604008C */ lwc1 $f4, 0x8c($s0) @@ -21,15 +21,15 @@ glabel func_80242F74_C88A24 /* C88A64 80242FB4 46240001 */ sub.d $f0, $f0, $f4 /* C88A68 80242FB8 46200020 */ cvt.s.d $f0, $f0 /* C88A6C 80242FBC 46000002 */ mul.s $f0, $f0, $f0 -/* C88A70 80242FC0 00000000 */ nop +/* C88A70 80242FC0 00000000 */ nop /* C88A74 80242FC4 46001300 */ add.s $f12, $f2, $f0 /* C88A78 80242FC8 46006004 */ sqrt.s $f0, $f12 /* C88A7C 80242FCC 46000032 */ c.eq.s $f0, $f0 -/* C88A80 80242FD0 00000000 */ nop +/* C88A80 80242FD0 00000000 */ nop /* C88A84 80242FD4 45030004 */ bc1tl .L80242FE8 /* C88A88 80242FD8 46000007 */ neg.s $f0, $f0 /* C88A8C 80242FDC 0C0187BC */ jal sqrtf -/* C88A90 80242FE0 00000000 */ nop +/* C88A90 80242FE0 00000000 */ nop /* C88A94 80242FE4 46000007 */ neg.s $f0, $f0 .L80242FE8: /* C88A98 80242FE8 4600018D */ trunc.w.s $f6, $f0 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80243004_C88AB4.s b/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80243004_C88AB4.s index 1d78acf359..5bbcfd6519 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80243004_C88AB4.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80243004_C88AB4.s @@ -29,7 +29,7 @@ glabel func_80243004_C88AB4 /* C88B14 80243064 44060000 */ mfc1 $a2, $f0 /* C88B18 80243068 44071000 */ mfc1 $a3, $f2 /* C88B1C 8024306C 44820000 */ mtc1 $v0, $f0 -/* C88B20 80243070 00000000 */ nop +/* C88B20 80243070 00000000 */ nop /* C88B24 80243074 46800020 */ cvt.s.w $f0, $f0 /* C88B28 80243078 AE220078 */ sw $v0, 0x78($s1) /* C88B2C 8024307C 0C05267B */ jal func_801499EC @@ -40,4 +40,4 @@ glabel func_80243004_C88AB4 /* C88B40 80243090 24020002 */ addiu $v0, $zero, 2 /* C88B44 80243094 03E00008 */ jr $ra /* C88B48 80243098 27BD0028 */ addiu $sp, $sp, 0x28 -/* C88B4C 8024309C 00000000 */ nop +/* C88B4C 8024309C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_18/C8C0A0/func_80240000_C8C0A0.s b/asm/nonmatchings/world/area_kzn/kzn_18/C8C0A0/func_80240000_C8C0A0.s index 02a1b8dfdc..a7704d6cea 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_18/C8C0A0/func_80240000_C8C0A0.s +++ b/asm/nonmatchings/world/area_kzn/kzn_18/C8C0A0/func_80240000_C8C0A0.s @@ -18,4 +18,4 @@ glabel func_80240000_C8C0A0 /* C8C0D0 80240030 8FBF0010 */ lw $ra, 0x10($sp) /* C8C0D4 80240034 03E00008 */ jr $ra /* C8C0D8 80240038 27BD0018 */ addiu $sp, $sp, 0x18 -/* C8C0DC 8024003C 00000000 */ nop +/* C8C0DC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_18/C8C3F0/func_80240388_C8C428.s b/asm/nonmatchings/world/area_kzn/kzn_18/C8C3F0/func_80240388_C8C428.s index 13bbf8765f..fad75f8712 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_18/C8C3F0/func_80240388_C8C428.s +++ b/asm/nonmatchings/world/area_kzn/kzn_18/C8C3F0/func_80240388_C8C428.s @@ -13,6 +13,6 @@ glabel func_80240388_C8C428 /* C8C448 802403A8 24020002 */ addiu $v0, $zero, 2 /* C8C44C 802403AC 03E00008 */ jr $ra /* C8C450 802403B0 27BD0018 */ addiu $sp, $sp, 0x18 -/* C8C454 802403B4 00000000 */ nop -/* C8C458 802403B8 00000000 */ nop -/* C8C45C 802403BC 00000000 */ nop +/* C8C454 802403B4 00000000 */ nop +/* C8C458 802403B8 00000000 */ nop +/* C8C45C 802403BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802404B8_C8E068.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802404B8_C8E068.s index a3063b4eed..e3ecab1226 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802404B8_C8E068.s +++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802404B8_C8E068.s @@ -13,11 +13,12 @@ glabel func_802404B8_C8E068 /* C8E088 802404D8 2C620005 */ sltiu $v0, $v1, 5 /* C8E08C 802404DC 1040008A */ beqz $v0, .L80240708 /* C8E090 802404E0 00031080 */ sll $v0, $v1, 2 -/* C8E094 802404E4 3C018025 */ lui $at, %hi(D_80248340) +/* C8E094 802404E4 3C018025 */ lui $at, %hi(jtbl_80248340_C95EF0) /* C8E098 802404E8 00220821 */ addu $at, $at, $v0 -/* C8E09C 802404EC 8C228340 */ lw $v0, %lo(D_80248340)($at) +/* C8E09C 802404EC 8C228340 */ lw $v0, %lo(jtbl_80248340_C95EF0)($at) /* C8E0A0 802404F0 00400008 */ jr $v0 -/* C8E0A4 802404F4 00000000 */ nop +/* C8E0A4 802404F4 00000000 */ nop +glabel L802404F8_C8E0A8 /* C8E0A8 802404F8 8E22003C */ lw $v0, 0x3c($s1) /* C8E0AC 802404FC 86270046 */ lh $a3, 0x46($s1) /* C8E0B0 80240500 AFA20010 */ sw $v0, 0x10($sp) @@ -66,6 +67,7 @@ glabel func_802404B8_C8E068 /* C8E15C 802405AC A6220044 */ sh $v0, 0x44($s1) /* C8E160 802405B0 080901C2 */ j .L80240708 /* C8E164 802405B4 A6200046 */ sh $zero, 0x46($s1) +glabel L802405B8_C8E168 /* C8E168 802405B8 96220046 */ lhu $v0, 0x46($s1) /* C8E16C 802405BC 24420001 */ addiu $v0, $v0, 1 /* C8E170 802405C0 A6220046 */ sh $v0, 0x46($s1) @@ -84,6 +86,7 @@ glabel func_802404B8_C8E068 /* C8E1A4 802405F4 8C42000C */ lw $v0, 0xc($v0) /* C8E1A8 802405F8 080901C2 */ j .L80240708 /* C8E1AC 802405FC AC400074 */ sw $zero, 0x74($v0) +glabel L80240600_C8E1B0 /* C8E1B0 80240600 96220046 */ lhu $v0, 0x46($s1) /* C8E1B4 80240604 24420001 */ addiu $v0, $v0, 1 /* C8E1B8 80240608 A6220046 */ sh $v0, 0x46($s1) @@ -91,7 +94,7 @@ glabel func_802404B8_C8E068 /* C8E1C0 80240610 00021403 */ sra $v0, $v0, 0x10 /* C8E1C4 80240614 2842003C */ slti $v0, $v0, 0x3c /* C8E1C8 80240618 1440003B */ bnez $v0, .L80240708 -/* C8E1CC 8024061C 00000000 */ nop +/* C8E1CC 8024061C 00000000 */ nop /* C8E1D0 80240620 3C013F80 */ lui $at, 0x3f80 /* C8E1D4 80240624 44810000 */ mtc1 $at, $f0 /* C8E1D8 80240628 AFA00014 */ sw $zero, 0x14($sp) @@ -124,6 +127,7 @@ glabel func_802404B8_C8E068 /* C8E244 80240694 A6220048 */ sh $v0, 0x48($s1) /* C8E248 80240698 080901C2 */ j .L80240708 /* C8E24C 8024069C E6200030 */ swc1 $f0, 0x30($s1) +glabel L802406A0_C8E250 /* C8E250 802406A0 0000202D */ daddu $a0, $zero, $zero /* C8E254 802406A4 3C054210 */ lui $a1, 0x4210 /* C8E258 802406A8 3C064198 */ lui $a2, 0x4198 @@ -151,14 +155,15 @@ glabel func_802404B8_C8E068 /* C8E2B0 80240700 A6200046 */ sh $zero, 0x46($s1) /* C8E2B4 80240704 E6200034 */ swc1 $f0, 0x34($s1) .L80240708: +glabel L80240708_C8E2B8 /* C8E2B8 80240708 8623004A */ lh $v1, 0x4a($s1) /* C8E2BC 8024070C 24020001 */ addiu $v0, $zero, 1 /* C8E2C0 80240710 10620005 */ beq $v1, $v0, .L80240728 /* C8E2C4 80240714 24020002 */ addiu $v0, $zero, 2 /* C8E2C8 80240718 1062001E */ beq $v1, $v0, .L80240794 -/* C8E2CC 8024071C 00000000 */ nop +/* C8E2CC 8024071C 00000000 */ nop /* C8E2D0 80240720 0809020F */ j .L8024083C -/* C8E2D4 80240724 00000000 */ nop +/* C8E2D4 80240724 00000000 */ nop .L80240728: /* C8E2D8 80240728 8627004C */ lh $a3, 0x4c($s1) /* C8E2DC 8024072C 24100078 */ addiu $s0, $zero, 0x78 @@ -190,12 +195,12 @@ glabel func_802404B8_C8E068 .L80240794: /* C8E344 80240794 8622004C */ lh $v0, 0x4c($s1) /* C8E348 80240798 44826000 */ mtc1 $v0, $f12 -/* C8E34C 8024079C 00000000 */ nop +/* C8E34C 8024079C 00000000 */ nop /* C8E350 802407A0 0C00A8BB */ jal sin_deg /* C8E354 802407A4 46806320 */ cvt.s.w $f12, $f12 /* C8E358 802407A8 3C013F80 */ lui $at, 0x3f80 /* C8E35C 802407AC 44811000 */ mtc1 $at, $f2 -/* C8E360 802407B0 00000000 */ nop +/* C8E360 802407B0 00000000 */ nop /* C8E364 802407B4 46020000 */ add.s $f0, $f0, $f2 /* C8E368 802407B8 46000000 */ add.s $f0, $f0, $f0 /* C8E36C 802407BC C6220024 */ lwc1 $f2, 0x24($s1) @@ -203,7 +208,7 @@ glabel func_802404B8_C8E068 /* C8E374 802407C4 46001080 */ add.s $f2, $f2, $f0 /* C8E378 802407C8 24420008 */ addiu $v0, $v0, 8 /* C8E37C 802407CC 44826000 */ mtc1 $v0, $f12 -/* C8E380 802407D0 00000000 */ nop +/* C8E380 802407D0 00000000 */ nop /* C8E384 802407D4 46806320 */ cvt.s.w $f12, $f12 /* C8E388 802407D8 0C00A6C9 */ jal clamp_angle /* C8E38C 802407DC E6220004 */ swc1 $f2, 4($s1) @@ -224,9 +229,9 @@ glabel func_802404B8_C8E068 /* C8E3C8 80240818 460E1380 */ add.s $f14, $f2, $f14 /* C8E3CC 8024081C 3C0141F0 */ lui $at, 0x41f0 /* C8E3D0 80240820 44811000 */ mtc1 $at, $f2 -/* C8E3D4 80240824 00000000 */ nop +/* C8E3D4 80240824 00000000 */ nop /* C8E3D8 80240828 4600103C */ c.lt.s $f2, $f0 -/* C8E3DC 8024082C 00000000 */ nop +/* C8E3DC 8024082C 00000000 */ nop /* C8E3E0 80240830 45010002 */ bc1t .L8024083C /* C8E3E4 80240834 24020003 */ addiu $v0, $zero, 3 .L80240838: @@ -237,9 +242,9 @@ glabel func_802404B8_C8E068 /* C8E3F4 80240844 10620005 */ beq $v1, $v0, .L8024085C /* C8E3F8 80240848 24020002 */ addiu $v0, $zero, 2 /* C8E3FC 8024084C 10620008 */ beq $v1, $v0, .L80240870 -/* C8E400 80240850 00000000 */ nop +/* C8E400 80240850 00000000 */ nop /* C8E404 80240854 0809022C */ j .L802408B0 -/* C8E408 80240858 00000000 */ nop +/* C8E408 80240858 00000000 */ nop .L8024085C: /* C8E40C 8024085C C620002C */ lwc1 $f0, 0x2c($s1) /* C8E410 80240860 C62C0030 */ lwc1 $f12, 0x30($s1) diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240A14_C8E5C4.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240A14_C8E5C4.s index d6a8fb82a0..6ce7ccf3db 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240A14_C8E5C4.s +++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240A14_C8E5C4.s @@ -8,12 +8,12 @@ glabel func_80240A14_C8E5C4 /* C8E5D0 80240A20 8C900084 */ lw $s0, 0x84($a0) /* C8E5D4 80240A24 8602004C */ lh $v0, 0x4c($s0) /* C8E5D8 80240A28 44826000 */ mtc1 $v0, $f12 -/* C8E5DC 80240A2C 00000000 */ nop +/* C8E5DC 80240A2C 00000000 */ nop /* C8E5E0 80240A30 0C00A8BB */ jal sin_deg /* C8E5E4 80240A34 46806320 */ cvt.s.w $f12, $f12 /* C8E5E8 80240A38 3C013F80 */ lui $at, 0x3f80 /* C8E5EC 80240A3C 44811000 */ mtc1 $at, $f2 -/* C8E5F0 80240A40 00000000 */ nop +/* C8E5F0 80240A40 00000000 */ nop /* C8E5F4 80240A44 46020000 */ add.s $f0, $f0, $f2 /* C8E5F8 80240A48 46000000 */ add.s $f0, $f0, $f0 /* C8E5FC 80240A4C C6020024 */ lwc1 $f2, 0x24($s0) @@ -21,13 +21,13 @@ glabel func_80240A14_C8E5C4 /* C8E604 80240A54 46001080 */ add.s $f2, $f2, $f0 /* C8E608 80240A58 24420008 */ addiu $v0, $v0, 8 /* C8E60C 80240A5C 44826000 */ mtc1 $v0, $f12 -/* C8E610 80240A60 00000000 */ nop +/* C8E610 80240A60 00000000 */ nop /* C8E614 80240A64 46806320 */ cvt.s.w $f12, $f12 /* C8E618 80240A68 0C00A6C9 */ jal clamp_angle /* C8E61C 80240A6C E6020004 */ swc1 $f2, 4($s0) /* C8E620 80240A70 4600010D */ trunc.w.s $f4, $f0 /* C8E624 80240A74 44022000 */ mfc1 $v0, $f4 -/* C8E628 80240A78 00000000 */ nop +/* C8E628 80240A78 00000000 */ nop /* C8E62C 80240A7C A602004C */ sh $v0, 0x4c($s0) /* C8E630 80240A80 3C028011 */ lui $v0, %hi(gPlayerStatus) /* C8E634 80240A84 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) @@ -38,9 +38,9 @@ glabel func_80240A14_C8E5C4 /* C8E648 80240A98 8E070020 */ lw $a3, 0x20($s0) /* C8E64C 80240A9C 3C0141F0 */ lui $at, 0x41f0 /* C8E650 80240AA0 44811000 */ mtc1 $at, $f2 -/* C8E654 80240AA4 00000000 */ nop +/* C8E654 80240AA4 00000000 */ nop /* C8E658 80240AA8 4602003E */ c.le.s $f0, $f2 -/* C8E65C 80240AAC 00000000 */ nop +/* C8E65C 80240AAC 00000000 */ nop /* C8E660 80240AB0 45000002 */ bc1f .L80240ABC /* C8E664 80240AB4 24020003 */ addiu $v0, $zero, 3 /* C8E668 80240AB8 A602004E */ sh $v0, 0x4e($s0) diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240BD4_C8E784.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240BD4_C8E784.s index 4adfcaced5..5901da3b1c 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240BD4_C8E784.s +++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240BD4_C8E784.s @@ -48,15 +48,15 @@ glabel func_80240BD4_C8E784 /* C8E830 80240C80 00431804 */ sllv $v1, $v1, $v0 /* C8E834 80240C84 00832021 */ addu $a0, $a0, $v1 /* C8E838 80240C88 44940000 */ mtc1 $s4, $f0 -/* C8E83C 80240C8C 00000000 */ nop +/* C8E83C 80240C8C 00000000 */ nop /* C8E840 80240C90 46800020 */ cvt.s.w $f0, $f0 /* C8E844 80240C94 E4800000 */ swc1 $f0, ($a0) /* C8E848 80240C98 44910000 */ mtc1 $s1, $f0 -/* C8E84C 80240C9C 00000000 */ nop +/* C8E84C 80240C9C 00000000 */ nop /* C8E850 80240CA0 46800020 */ cvt.s.w $f0, $f0 /* C8E854 80240CA4 E4800004 */ swc1 $f0, 4($a0) /* C8E858 80240CA8 44900000 */ mtc1 $s0, $f0 -/* C8E85C 80240CAC 00000000 */ nop +/* C8E85C 80240CAC 00000000 */ nop /* C8E860 80240CB0 46800020 */ cvt.s.w $f0, $f0 /* C8E864 80240CB4 E4800008 */ swc1 $f0, 8($a0) /* C8E868 80240CB8 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240CD8_C8E888.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240CD8_C8E888.s index fedab255fd..6a57f7a436 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240CD8_C8E888.s +++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240CD8_C8E888.s @@ -43,7 +43,7 @@ glabel func_80240CD8_C8E888 /* C8E920 80240D70 00529004 */ sllv $s2, $s2, $v0 /* C8E924 80240D74 00721821 */ addu $v1, $v1, $s2 /* C8E928 80240D78 44900000 */ mtc1 $s0, $f0 -/* C8E92C 80240D7C 00000000 */ nop +/* C8E92C 80240D7C 00000000 */ nop /* C8E930 80240D80 46800020 */ cvt.s.w $f0, $f0 /* C8E934 80240D84 E460006C */ swc1 $f0, 0x6c($v1) /* C8E938 80240D88 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241468_C8F018.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241468_C8F018.s index c352e00697..93a079b0e6 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241468_C8F018.s +++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241468_C8F018.s @@ -26,7 +26,7 @@ glabel func_80241468_C8F018 /* C8F068 802414B8 1440FFFA */ bnez $v0, .L802414A4 /* C8F06C 802414BC 24A50004 */ addiu $a1, $a1, 4 /* C8F070 802414C0 08090541 */ j .L80241504 -/* C8F074 802414C4 00000000 */ nop +/* C8F074 802414C4 00000000 */ nop .L802414C8: /* C8F078 802414C8 0000182D */ daddu $v1, $zero, $zero /* C8F07C 802414CC 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241838_C8F3E8.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241838_C8F3E8.s index 74ec027416..bf7a3fd7c4 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241838_C8F3E8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241838_C8F3E8.s @@ -28,7 +28,7 @@ glabel func_80241838_C8F3E8 /* C8F43C 8024188C 00220821 */ addu $at, $at, $v0 /* C8F440 80241890 AC208388 */ sw $zero, %lo(D_80248388)($at) /* C8F444 80241894 08090631 */ j .L802418C4 -/* C8F448 80241898 00000000 */ nop +/* C8F448 80241898 00000000 */ nop .L8024189C: /* C8F44C 8024189C 3C038025 */ lui $v1, %hi(D_80248388) /* C8F450 802418A0 24638388 */ addiu $v1, $v1, %lo(D_80248388) diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241BC0_C8F770.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241BC0_C8F770.s index a7fd5ee8d6..d7ce875135 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241BC0_C8F770.s +++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241BC0_C8F770.s @@ -24,14 +24,14 @@ glabel func_80241BC0_C8F770 /* C8F7BC 80241C0C 12000009 */ beqz $s0, .L80241C34 /* C8F7C0 80241C10 00041840 */ sll $v1, $a0, 1 /* C8F7C4 80241C14 08090743 */ j .L80241D0C -/* C8F7C8 80241C18 00000000 */ nop +/* C8F7C8 80241C18 00000000 */ nop .L80241C1C: /* C8F7CC 80241C1C 1202001F */ beq $s0, $v0, .L80241C9C /* C8F7D0 80241C20 24020003 */ addiu $v0, $zero, 3 /* C8F7D4 80241C24 1202002B */ beq $s0, $v0, .L80241CD4 /* C8F7D8 80241C28 3C068020 */ lui $a2, 0x8020 /* C8F7DC 80241C2C 08090743 */ j .L80241D0C -/* C8F7E0 80241C30 00000000 */ nop +/* C8F7E0 80241C30 00000000 */ nop .L80241C34: /* C8F7E4 80241C34 3C028024 */ lui $v0, %hi(D_80243BB8) /* C8F7E8 80241C38 24423BB8 */ addiu $v0, $v0, %lo(D_80243BB8) @@ -90,7 +90,7 @@ glabel func_80241BC0_C8F770 /* C8F8B0 80241D00 34C6A000 */ ori $a2, $a2, 0xa000 .L80241D04: /* C8F8B4 80241D04 0C00A5CF */ jal dma_copy -/* C8F8B8 80241D08 00000000 */ nop +/* C8F8B8 80241D08 00000000 */ nop .L80241D0C: /* C8F8BC 80241D0C 8FBF0018 */ lw $ra, 0x18($sp) /* C8F8C0 80241D10 8FB10014 */ lw $s1, 0x14($sp) @@ -98,6 +98,6 @@ glabel func_80241BC0_C8F770 /* C8F8C8 80241D18 24020002 */ addiu $v0, $zero, 2 /* C8F8CC 80241D1C 03E00008 */ jr $ra /* C8F8D0 80241D20 27BD0020 */ addiu $sp, $sp, 0x20 -/* C8F8D4 80241D24 00000000 */ nop -/* C8F8D8 80241D28 00000000 */ nop -/* C8F8DC 80241D2C 00000000 */ nop +/* C8F8D4 80241D24 00000000 */ nop +/* C8F8D8 80241D28 00000000 */ nop +/* C8F8DC 80241D2C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240310_C96240.s b/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240310_C96240.s index b9dcc26013..0bbf095b82 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240310_C96240.s +++ b/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240310_C96240.s @@ -26,7 +26,7 @@ glabel func_80240310_C96240 /* C96290 80240360 1440FFFA */ bnez $v0, .L8024034C /* C96294 80240364 24A50004 */ addiu $a1, $a1, 4 /* C96298 80240368 080900EB */ j .L802403AC -/* C9629C 8024036C 00000000 */ nop +/* C9629C 8024036C 00000000 */ nop .L80240370: /* C962A0 80240370 0000182D */ daddu $v1, $zero, $zero /* C962A4 80240374 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_802406E0_C96610.s b/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_802406E0_C96610.s index a1c6b6d57c..7ee77f0091 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_802406E0_C96610.s +++ b/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_802406E0_C96610.s @@ -28,7 +28,7 @@ glabel func_802406E0_C96610 /* C96664 80240734 00220821 */ addu $at, $at, $v0 /* C96668 80240738 AC2042D0 */ sw $zero, %lo(D_802442D0)($at) /* C9666C 8024073C 080901DB */ j .L8024076C -/* C96670 80240740 00000000 */ nop +/* C96670 80240740 00000000 */ nop .L80240744: /* C96674 80240744 3C038024 */ lui $v1, %hi(D_802442D0) /* C96678 80240748 246342D0 */ addiu $v1, $v1, %lo(D_802442D0) diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240A8C_C969BC.s b/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240A8C_C969BC.s index b0d3e5ebf8..cd7eb104bf 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240A8C_C969BC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240A8C_C969BC.s @@ -13,5 +13,5 @@ glabel func_80240A8C_C969BC /* C969DC 80240AAC 24020002 */ addiu $v0, $zero, 2 /* C969E0 80240AB0 03E00008 */ jr $ra /* C969E4 80240AB4 27BD0018 */ addiu $sp, $sp, 0x18 -/* C969E8 80240AB8 00000000 */ nop -/* C969EC 80240ABC 00000000 */ nop +/* C969E8 80240AB8 00000000 */ nop +/* C969EC 80240ABC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_22/C9A200/func_8024030C_C9A50C.s b/asm/nonmatchings/world/area_kzn/kzn_22/C9A200/func_8024030C_C9A50C.s index ecec9db605..af8f7233d1 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_22/C9A200/func_8024030C_C9A50C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_22/C9A200/func_8024030C_C9A50C.s @@ -13,5 +13,5 @@ glabel func_8024030C_C9A50C /* C9A52C 8024032C 24020002 */ addiu $v0, $zero, 2 /* C9A530 80240330 03E00008 */ jr $ra /* C9A534 80240334 27BD0018 */ addiu $sp, $sp, 0x18 -/* C9A538 80240338 00000000 */ nop -/* C9A53C 8024033C 00000000 */ nop +/* C9A538 80240338 00000000 */ nop +/* C9A53C 8024033C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240310_C9C610.s b/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240310_C9C610.s index 7009a18a0b..e71d059b3b 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240310_C9C610.s +++ b/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240310_C9C610.s @@ -23,18 +23,18 @@ glabel func_80240310_C9C610 /* C9C658 80240358 8E050000 */ lw $a1, ($s0) /* C9C65C 8024035C 26100004 */ addiu $s0, $s0, 4 /* C9C660 80240360 4482C000 */ mtc1 $v0, $f24 -/* C9C664 80240364 00000000 */ nop +/* C9C664 80240364 00000000 */ nop /* C9C668 80240368 4680C620 */ cvt.s.w $f24, $f24 /* C9C66C 8024036C 0C0B1EAF */ jal get_variable /* C9C670 80240370 0220202D */ daddu $a0, $s1, $zero /* C9C674 80240374 8E050000 */ lw $a1, ($s0) /* C9C678 80240378 4482B000 */ mtc1 $v0, $f22 -/* C9C67C 8024037C 00000000 */ nop +/* C9C67C 8024037C 00000000 */ nop /* C9C680 80240380 4680B5A0 */ cvt.s.w $f22, $f22 /* C9C684 80240384 0C0B1EAF */ jal get_variable /* C9C688 80240388 0220202D */ daddu $a0, $s1, $zero /* C9C68C 8024038C 4482A000 */ mtc1 $v0, $f20 -/* C9C690 80240390 00000000 */ nop +/* C9C690 80240390 00000000 */ nop /* C9C694 80240394 4680A520 */ cvt.s.w $f20, $f20 /* C9C698 80240398 0C04417A */ jal get_entity_by_index /* C9C69C 8024039C 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240520_C9C820.s b/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240520_C9C820.s index 61c52c89e1..abc455f40a 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240520_C9C820.s +++ b/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240520_C9C820.s @@ -30,7 +30,7 @@ glabel func_80240520_C9C820 /* C9C880 80240580 46800020 */ cvt.s.w $f0, $f0 /* C9C884 80240584 46020003 */ div.s $f0, $f0, $f2 /* C9C888 80240588 460C0302 */ mul.s $f12, $f0, $f12 -/* C9C88C 8024058C 00000000 */ nop +/* C9C88C 8024058C 00000000 */ nop /* C9C890 80240590 E6200058 */ swc1 $f0, 0x58($s1) /* C9C894 80240594 C6400074 */ lwc1 $f0, 0x74($s2) /* C9C898 80240598 46800020 */ cvt.s.w $f0, $f0 @@ -39,19 +39,19 @@ glabel func_80240520_C9C820 /* C9C8A4 802405A4 E620005C */ swc1 $f0, 0x5c($s1) /* C9C8A8 802405A8 3C013F80 */ lui $at, 0x3f80 /* C9C8AC 802405AC 44811000 */ mtc1 $at, $f2 -/* C9C8B0 802405B0 00000000 */ nop +/* C9C8B0 802405B0 00000000 */ nop /* C9C8B4 802405B4 46001081 */ sub.s $f2, $f2, $f0 /* C9C8B8 802405B8 3C018024 */ lui $at, %hi(D_80241C10) /* C9C8BC 802405BC D4201C10 */ ldc1 $f0, %lo(D_80241C10)($at) /* C9C8C0 802405C0 460010A1 */ cvt.d.s $f2, $f2 /* C9C8C4 802405C4 46201082 */ mul.d $f2, $f2, $f0 -/* C9C8C8 802405C8 00000000 */ nop +/* C9C8C8 802405C8 00000000 */ nop /* C9C8CC 802405CC 3C013FE0 */ lui $at, 0x3fe0 /* C9C8D0 802405D0 44810800 */ mtc1 $at, $f1 /* C9C8D4 802405D4 44800000 */ mtc1 $zero, $f0 -/* C9C8D8 802405D8 00000000 */ nop +/* C9C8D8 802405D8 00000000 */ nop /* C9C8DC 802405DC 46201082 */ mul.d $f2, $f2, $f0 -/* C9C8E0 802405E0 00000000 */ nop +/* C9C8E0 802405E0 00000000 */ nop /* C9C8E4 802405E4 462010A0 */ cvt.s.d $f2, $f2 /* C9C8E8 802405E8 E6220064 */ swc1 $f2, 0x64($s1) /* C9C8EC 802405EC 8E430074 */ lw $v1, 0x74($s2) @@ -66,4 +66,4 @@ glabel func_80240520_C9C820 /* C9C910 80240610 00021040 */ sll $v0, $v0, 1 /* C9C914 80240614 03E00008 */ jr $ra /* C9C918 80240618 27BD0020 */ addiu $sp, $sp, 0x20 -/* C9C91C 8024061C 00000000 */ nop +/* C9C91C 8024061C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240630_7EB340.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240630_7EB340.s index 1513ca9882..606900575c 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240630_7EB340.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240630_7EB340.s @@ -26,7 +26,7 @@ glabel func_80240630_7EB340 /* 7EB390 80240680 1440FFFA */ bnez $v0, .L8024066C /* 7EB394 80240684 24A50004 */ addiu $a1, $a1, 4 /* 7EB398 80240688 080901B3 */ j .L802406CC -/* 7EB39C 8024068C 00000000 */ nop +/* 7EB39C 8024068C 00000000 */ nop .L80240690: /* 7EB3A0 80240690 0000182D */ daddu $v1, $zero, $zero /* 7EB3A4 80240694 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024076C_7EB47C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024076C_7EB47C.s index 0da3ba35df..e59231d4f3 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024076C_7EB47C.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024076C_7EB47C.s @@ -115,7 +115,7 @@ glabel func_8024076C_7EB47C /* 7EB624 80240914 14E20005 */ bne $a3, $v0, .L8024092C /* 7EB628 80240918 32E2FFFF */ andi $v0, $s7, 0xffff /* 7EB62C 8024091C 14400003 */ bnez $v0, .L8024092C -/* 7EB630 80240920 00000000 */ nop +/* 7EB630 80240920 00000000 */ nop /* 7EB634 80240924 14800008 */ bnez $a0, .L80240948 /* 7EB638 80240928 24020001 */ addiu $v0, $zero, 1 .L8024092C: @@ -123,7 +123,7 @@ glabel func_8024076C_7EB47C /* 7EB640 80240930 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 7EB644 80240934 80420075 */ lb $v0, 0x75($v0) /* 7EB648 80240938 10400005 */ beqz $v0, .L80240950 -/* 7EB64C 8024093C 00000000 */ nop +/* 7EB64C 8024093C 00000000 */ nop /* 7EB650 80240940 10800003 */ beqz $a0, .L80240950 /* 7EB654 80240944 24020001 */ addiu $v0, $zero, 1 .L80240948: diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240A5C_7EB76C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240A5C_7EB76C.s index 57767bb714..c0b5b18e9a 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240A5C_7EB76C.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240A5C_7EB76C.s @@ -39,13 +39,13 @@ glabel func_80240A5C_7EB76C /* 7EB7F0 80240AE0 10740005 */ beq $v1, $s4, .L80240AF8 /* 7EB7F4 80240AE4 26100001 */ addiu $s0, $s0, 1 /* 7EB7F8 80240AE8 10730003 */ beq $v1, $s3, .L80240AF8 -/* 7EB7FC 80240AEC 00000000 */ nop +/* 7EB7FC 80240AEC 00000000 */ nop /* 7EB800 80240AF0 00521025 */ or $v0, $v0, $s2 /* 7EB804 80240AF4 AC820000 */ sw $v0, ($a0) .L80240AF8: /* 7EB808 80240AF8 2A020040 */ slti $v0, $s0, 0x40 /* 7EB80C 80240AFC 1440FFEF */ bnez $v0, .L80240ABC -/* 7EB810 80240B00 00000000 */ nop +/* 7EB810 80240B00 00000000 */ nop /* 7EB814 80240B04 0000802D */ daddu $s0, $zero, $zero /* 7EB818 80240B08 3C120800 */ lui $s2, 0x800 .L80240B0C: @@ -57,13 +57,13 @@ glabel func_80240A5C_7EB76C /* 7EB830 80240B20 8C640000 */ lw $a0, ($v1) /* 7EB834 80240B24 30820010 */ andi $v0, $a0, 0x10 /* 7EB838 80240B28 10400003 */ beqz $v0, .L80240B38 -/* 7EB83C 80240B2C 00000000 */ nop +/* 7EB83C 80240B2C 00000000 */ nop /* 7EB840 80240B30 00921025 */ or $v0, $a0, $s2 /* 7EB844 80240B34 AC620000 */ sw $v0, ($v1) .L80240B38: /* 7EB848 80240B38 2A020100 */ slti $v0, $s0, 0x100 /* 7EB84C 80240B3C 1440FFF3 */ bnez $v0, .L80240B0C -/* 7EB850 80240B40 00000000 */ nop +/* 7EB850 80240B40 00000000 */ nop /* 7EB854 80240B44 AE200070 */ sw $zero, 0x70($s1) .L80240B48: /* 7EB858 80240B48 8E220070 */ lw $v0, 0x70($s1) diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240BA8_7EB8B8.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240BA8_7EB8B8.s index 02f3e77bea..9635405bec 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240BA8_7EB8B8.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240BA8_7EB8B8.s @@ -32,7 +32,7 @@ glabel func_80240BA8_7EB8B8 /* 7EB91C 80240C0C 0080302D */ daddu $a2, $a0, $zero /* 7EB920 80240C10 8E020070 */ lw $v0, 0x70($s0) /* 7EB924 80240C14 14400006 */ bnez $v0, .L80240C30 -/* 7EB928 80240C18 00000000 */ nop +/* 7EB928 80240C18 00000000 */ nop /* 7EB92C 80240C1C 8E020074 */ lw $v0, 0x74($s0) /* 7EB930 80240C20 14400003 */ bnez $v0, .L80240C30 /* 7EB934 80240C24 24020001 */ addiu $v0, $zero, 1 @@ -66,13 +66,13 @@ glabel func_80240BA8_7EB8B8 /* 7EB99C 80240C8C 10730005 */ beq $v1, $s3, .L80240CA4 /* 7EB9A0 80240C90 26100001 */ addiu $s0, $s0, 1 /* 7EB9A4 80240C94 10720003 */ beq $v1, $s2, .L80240CA4 -/* 7EB9A8 80240C98 00000000 */ nop +/* 7EB9A8 80240C98 00000000 */ nop /* 7EB9AC 80240C9C 00511024 */ and $v0, $v0, $s1 /* 7EB9B0 80240CA0 AC820000 */ sw $v0, ($a0) .L80240CA4: /* 7EB9B4 80240CA4 2A020040 */ slti $v0, $s0, 0x40 /* 7EB9B8 80240CA8 1440FFEF */ bnez $v0, .L80240C68 -/* 7EB9BC 80240CAC 00000000 */ nop +/* 7EB9BC 80240CAC 00000000 */ nop /* 7EB9C0 80240CB0 0000802D */ daddu $s0, $zero, $zero /* 7EB9C4 80240CB4 3C11F7FF */ lui $s1, 0xf7ff /* 7EB9C8 80240CB8 3631FFFF */ ori $s1, $s1, 0xffff @@ -85,7 +85,7 @@ glabel func_80240BA8_7EB8B8 /* 7EB9E0 80240CD0 8C640000 */ lw $a0, ($v1) /* 7EB9E4 80240CD4 30820010 */ andi $v0, $a0, 0x10 /* 7EB9E8 80240CD8 10400003 */ beqz $v0, .L80240CE8 -/* 7EB9EC 80240CDC 00000000 */ nop +/* 7EB9EC 80240CDC 00000000 */ nop /* 7EB9F0 80240CE0 00911024 */ and $v0, $a0, $s1 /* 7EB9F4 80240CE4 AC620000 */ sw $v0, ($v1) .L80240CE8: @@ -93,7 +93,7 @@ glabel func_80240BA8_7EB8B8 /* 7EB9FC 80240CEC 1440FFF3 */ bnez $v0, .L80240CBC /* 7EBA00 80240CF0 24020002 */ addiu $v0, $zero, 2 /* 7EBA04 80240CF4 08090340 */ j .L80240D00 -/* 7EBA08 80240CF8 00000000 */ nop +/* 7EBA08 80240CF8 00000000 */ nop .L80240CFC: /* 7EBA0C 80240CFC 0000102D */ daddu $v0, $zero, $zero .L80240D00: diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240DA0_7EBAB0.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240DA0_7EBAB0.s index 2214f2ce63..a949459b8a 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240DA0_7EBAB0.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240DA0_7EBAB0.s @@ -16,19 +16,19 @@ glabel func_80240DA0_7EBAB0 /* 7EBADC 80240DCC 0220202D */ daddu $a0, $s1, $zero /* 7EBAE0 80240DD0 3C05F4AC */ lui $a1, 0xf4ac /* 7EBAE4 80240DD4 4482B000 */ mtc1 $v0, $f22 -/* 7EBAE8 80240DD8 00000000 */ nop +/* 7EBAE8 80240DD8 00000000 */ nop /* 7EBAEC 80240DDC 4680B5A0 */ cvt.s.w $f22, $f22 /* 7EBAF0 80240DE0 0C0B1EAF */ jal get_variable /* 7EBAF4 80240DE4 34A5D482 */ ori $a1, $a1, 0xd482 /* 7EBAF8 80240DE8 0220202D */ daddu $a0, $s1, $zero /* 7EBAFC 80240DEC 3C05F4AC */ lui $a1, 0xf4ac /* 7EBB00 80240DF0 4482A000 */ mtc1 $v0, $f20 -/* 7EBB04 80240DF4 00000000 */ nop +/* 7EBB04 80240DF4 00000000 */ nop /* 7EBB08 80240DF8 4680A520 */ cvt.s.w $f20, $f20 /* 7EBB0C 80240DFC 0C0B1EAF */ jal get_variable /* 7EBB10 80240E00 34A5D483 */ ori $a1, $a1, 0xd483 /* 7EBB14 80240E04 44821000 */ mtc1 $v0, $f2 -/* 7EBB18 80240E08 00000000 */ nop +/* 7EBB18 80240E08 00000000 */ nop /* 7EBB1C 80240E0C 468010A0 */ cvt.s.w $f2, $f2 /* 7EBB20 80240E10 4405B000 */ mfc1 $a1, $f22 /* 7EBB24 80240E14 4406A000 */ mfc1 $a2, $f20 @@ -45,19 +45,19 @@ glabel func_80240DA0_7EBAB0 /* 7EBB50 80240E40 0220202D */ daddu $a0, $s1, $zero /* 7EBB54 80240E44 3C05F4AC */ lui $a1, 0xf4ac /* 7EBB58 80240E48 4482B000 */ mtc1 $v0, $f22 -/* 7EBB5C 80240E4C 00000000 */ nop +/* 7EBB5C 80240E4C 00000000 */ nop /* 7EBB60 80240E50 4680B5A0 */ cvt.s.w $f22, $f22 /* 7EBB64 80240E54 0C0B1EAF */ jal get_variable /* 7EBB68 80240E58 34A5D482 */ ori $a1, $a1, 0xd482 /* 7EBB6C 80240E5C 0220202D */ daddu $a0, $s1, $zero /* 7EBB70 80240E60 3C05F4AC */ lui $a1, 0xf4ac /* 7EBB74 80240E64 4482A000 */ mtc1 $v0, $f20 -/* 7EBB78 80240E68 00000000 */ nop +/* 7EBB78 80240E68 00000000 */ nop /* 7EBB7C 80240E6C 4680A520 */ cvt.s.w $f20, $f20 /* 7EBB80 80240E70 0C0B1EAF */ jal get_variable /* 7EBB84 80240E74 34A5D483 */ ori $a1, $a1, 0xd483 /* 7EBB88 80240E78 44821000 */ mtc1 $v0, $f2 -/* 7EBB8C 80240E7C 00000000 */ nop +/* 7EBB8C 80240E7C 00000000 */ nop /* 7EBB90 80240E80 468010A0 */ cvt.s.w $f2, $f2 /* 7EBB94 80240E84 4405B000 */ mfc1 $a1, $f22 /* 7EBB98 80240E88 4406A000 */ mfc1 $a2, $f20 @@ -73,19 +73,19 @@ glabel func_80240DA0_7EBAB0 /* 7EBBC0 80240EB0 0220202D */ daddu $a0, $s1, $zero /* 7EBBC4 80240EB4 3C05F4AC */ lui $a1, 0xf4ac /* 7EBBC8 80240EB8 4482B000 */ mtc1 $v0, $f22 -/* 7EBBCC 80240EBC 00000000 */ nop +/* 7EBBCC 80240EBC 00000000 */ nop /* 7EBBD0 80240EC0 4680B5A0 */ cvt.s.w $f22, $f22 /* 7EBBD4 80240EC4 0C0B1EAF */ jal get_variable /* 7EBBD8 80240EC8 34A5D482 */ ori $a1, $a1, 0xd482 /* 7EBBDC 80240ECC 0220202D */ daddu $a0, $s1, $zero /* 7EBBE0 80240ED0 3C05F4AC */ lui $a1, 0xf4ac /* 7EBBE4 80240ED4 4482A000 */ mtc1 $v0, $f20 -/* 7EBBE8 80240ED8 00000000 */ nop +/* 7EBBE8 80240ED8 00000000 */ nop /* 7EBBEC 80240EDC 4680A520 */ cvt.s.w $f20, $f20 /* 7EBBF0 80240EE0 0C0B1EAF */ jal get_variable /* 7EBBF4 80240EE4 34A5D483 */ ori $a1, $a1, 0xd483 /* 7EBBF8 80240EE8 44821000 */ mtc1 $v0, $f2 -/* 7EBBFC 80240EEC 00000000 */ nop +/* 7EBBFC 80240EEC 00000000 */ nop /* 7EBC00 80240EF0 468010A0 */ cvt.s.w $f2, $f2 /* 7EBC04 80240EF4 4405B000 */ mfc1 $a1, $f22 /* 7EBC08 80240EF8 4406A000 */ mfc1 $a2, $f20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240FB8_7EBCC8.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240FB8_7EBCC8.s index 8a995f4a35..b49336cb9b 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240FB8_7EBCC8.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240FB8_7EBCC8.s @@ -44,7 +44,7 @@ glabel func_80240FB8_7EBCC8 /* 7EBD5C 8024104C 3C048025 */ lui $a0, %hi(D_80255B70) /* 7EBD60 80241050 8C845B70 */ lw $a0, %lo(D_80255B70)($a0) /* 7EBD64 80241054 0C048D70 */ jal func_801235C0 -/* 7EBD68 80241058 00000000 */ nop +/* 7EBD68 80241058 00000000 */ nop /* 7EBD6C 8024105C 24020002 */ addiu $v0, $zero, 2 .L80241060: /* 7EBD70 80241060 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241628_7EC338.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241628_7EC338.s index 8eaf88051b..3df6cb607c 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241628_7EC338.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241628_7EC338.s @@ -13,7 +13,7 @@ glabel func_80241628_7EC338 /* 7EC358 80241648 14620006 */ bne $v1, $v0, .L80241664 /* 7EC35C 8024164C 24020002 */ addiu $v0, $zero, 2 /* 7EC360 80241650 44800000 */ mtc1 $zero, $f0 -/* 7EC364 80241654 00000000 */ nop +/* 7EC364 80241654 00000000 */ nop /* 7EC368 80241658 44050000 */ mfc1 $a1, $f0 /* 7EC36C 8024165C 0809059F */ j .L8024167C /* 7EC370 80241660 0000202D */ daddu $a0, $zero, $zero @@ -21,9 +21,9 @@ glabel func_80241628_7EC338 /* 7EC374 80241664 14620008 */ bne $v1, $v0, .L80241688 /* 7EC378 80241668 24040001 */ addiu $a0, $zero, 1 /* 7EC37C 8024166C 44800000 */ mtc1 $zero, $f0 -/* 7EC380 80241670 00000000 */ nop +/* 7EC380 80241670 00000000 */ nop /* 7EC384 80241674 44050000 */ mfc1 $a1, $f0 -/* 7EC388 80241678 00000000 */ nop +/* 7EC388 80241678 00000000 */ nop .L8024167C: /* 7EC38C 8024167C 00A0302D */ daddu $a2, $a1, $zero /* 7EC390 80241680 0C01C5A4 */ jal func_80071690 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024197C_7EC68C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024197C_7EC68C.s index 17d5227e3b..696d02ca47 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024197C_7EC68C.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024197C_7EC68C.s @@ -28,7 +28,7 @@ glabel func_8024197C_7EC68C /* 7EC6E0 802419D0 00220821 */ addu $at, $at, $v0 /* 7EC6E4 802419D4 AC205BA0 */ sw $zero, %lo(D_80255BA0)($at) /* 7EC6E8 802419D8 08090682 */ j .L80241A08 -/* 7EC6EC 802419DC 00000000 */ nop +/* 7EC6EC 802419DC 00000000 */ nop .L802419E0: /* 7EC6F0 802419E0 3C038025 */ lui $v1, %hi(D_80255BA0) /* 7EC6F4 802419E4 24635BA0 */ addiu $v1, $v1, %lo(D_80255BA0) diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241A18_7EC728.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241A18_7EC728.s index 6c76ff1ded..7f149297be 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241A18_7EC728.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241A18_7EC728.s @@ -28,7 +28,7 @@ glabel func_80241A18_7EC728 /* 7EC77C 80241A6C 00220821 */ addu $at, $at, $v0 /* 7EC780 80241A70 AC205D68 */ sw $zero, %lo(D_80255D68)($at) /* 7EC784 80241A74 080906A9 */ j .L80241AA4 -/* 7EC788 80241A78 00000000 */ nop +/* 7EC788 80241A78 00000000 */ nop .L80241A7C: /* 7EC78C 80241A7C 3C038025 */ lui $v1, %hi(D_80255D68) /* 7EC790 80241A80 24635D68 */ addiu $v1, $v1, %lo(D_80255D68) diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E80_7ECB90.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E80_7ECB90.s index 500f424a56..12ac403ebb 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E80_7ECB90.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E80_7ECB90.s @@ -28,7 +28,7 @@ glabel func_80241E80_7ECB90 /* 7ECBE8 80241ED8 0C0B1EAF */ jal get_variable /* 7ECBEC 80241EDC 0280202D */ daddu $a0, $s4, $zero /* 7ECBF0 80241EE0 14400003 */ bnez $v0, .L80241EF0 -/* 7ECBF4 80241EE4 00000000 */ nop +/* 7ECBF4 80241EE4 00000000 */ nop /* 7ECBF8 80241EE8 080907C6 */ j .L80241F18 /* 7ECBFC 80241EEC 24150001 */ addiu $s5, $zero, 1 .L80241EF0: diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024228C_7ECF9C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024228C_7ECF9C.s index e74e2ad263..b801819cb9 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024228C_7ECF9C.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024228C_7ECF9C.s @@ -13,5 +13,5 @@ glabel func_8024228C_7ECF9C /* 7ECFBC 802422AC 24020002 */ addiu $v0, $zero, 2 /* 7ECFC0 802422B0 03E00008 */ jr $ra /* 7ECFC4 802422B4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 7ECFC8 802422B8 00000000 */ nop -/* 7ECFCC 802422BC 00000000 */ nop +/* 7ECFC8 802422B8 00000000 */ nop +/* 7ECFCC 802422BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242570_7ED280.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242570_7ED280.s index 8d56b510e6..af97357897 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242570_7ED280.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242570_7ED280.s @@ -45,7 +45,7 @@ glabel func_80242570_7ED280 /* 7ED31C 8024260C 0C00A7B5 */ jal dist2D /* 7ED320 80242610 4600B386 */ mov.s $f14, $f22 /* 7ED324 80242614 4614003C */ c.lt.s $f0, $f20 -/* 7ED328 80242618 00000000 */ nop +/* 7ED328 80242618 00000000 */ nop /* 7ED32C 8024261C 45000003 */ bc1f .L8024262C /* 7ED330 80242620 2631000C */ addiu $s1, $s1, 0xc /* 7ED334 80242624 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_80242570_7ED280 /* 7ED360 80242650 8E6200D0 */ lw $v0, 0xd0($s3) /* 7ED364 80242654 8C42007C */ lw $v0, 0x7c($v0) /* 7ED368 80242658 04410004 */ bgez $v0, .L8024266C -/* 7ED36C 8024265C 00000000 */ nop +/* 7ED36C 8024265C 00000000 */ nop /* 7ED370 80242660 C6C00000 */ lwc1 $f0, ($s6) /* 7ED374 80242664 080909A3 */ j .L8024268C /* 7ED378 80242668 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_80242570_7ED280 /* 7ED37C 8024266C 3C018025 */ lui $at, %hi(D_802559C0) /* 7ED380 80242670 D42259C0 */ ldc1 $f2, %lo(D_802559C0)($at) /* 7ED384 80242674 44820000 */ mtc1 $v0, $f0 -/* 7ED388 80242678 00000000 */ nop +/* 7ED388 80242678 00000000 */ nop /* 7ED38C 8024267C 46800021 */ cvt.d.w $f0, $f0 /* 7ED390 80242680 46220003 */ div.d $f0, $f0, $f2 /* 7ED394 80242684 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802426C8_7ED3D8.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802426C8_7ED3D8.s index cde133a0c5..348f8be597 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802426C8_7ED3D8.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802426C8_7ED3D8.s @@ -44,7 +44,7 @@ glabel func_802426C8_7ED3D8 /* 7ED474 80242764 2402000F */ addiu $v0, $zero, 0xf /* 7ED478 80242768 AFA2001C */ sw $v0, 0x1c($sp) /* 7ED47C 8024276C 44833000 */ mtc1 $v1, $f6 -/* 7ED480 80242770 00000000 */ nop +/* 7ED480 80242770 00000000 */ nop /* 7ED484 80242774 468031A0 */ cvt.s.w $f6, $f6 /* 7ED488 80242778 44073000 */ mfc1 $a3, $f6 /* 7ED48C 8024277C 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_802426C8_7ED3D8 .L802427CC: /* 7ED4DC 802427CC 8602008C */ lh $v0, 0x8c($s0) /* 7ED4E0 802427D0 1440005D */ bnez $v0, .L80242948 -/* 7ED4E4 802427D4 00000000 */ nop +/* 7ED4E4 802427D4 00000000 */ nop /* 7ED4E8 802427D8 C6000018 */ lwc1 $f0, 0x18($s0) /* 7ED4EC 802427DC 3C014010 */ lui $at, 0x4010 /* 7ED4F0 802427E0 44811800 */ mtc1 $at, $f3 /* 7ED4F4 802427E4 44801000 */ mtc1 $zero, $f2 /* 7ED4F8 802427E8 46000021 */ cvt.d.s $f0, $f0 /* 7ED4FC 802427EC 4622003C */ c.lt.d $f0, $f2 -/* 7ED500 802427F0 00000000 */ nop +/* 7ED500 802427F0 00000000 */ nop /* 7ED504 802427F4 45000003 */ bc1f .L80242804 /* 7ED508 802427F8 0200202D */ daddu $a0, $s0, $zero /* 7ED50C 802427FC 08090A02 */ j .L80242808 @@ -88,7 +88,7 @@ glabel func_802426C8_7ED3D8 /* 7ED514 80242804 24050001 */ addiu $a1, $zero, 1 .L80242808: /* 7ED518 80242808 0C00F598 */ jal func_8003D660 -/* 7ED51C 8024280C 00000000 */ nop +/* 7ED51C 8024280C 00000000 */ nop /* 7ED520 80242810 C60C0038 */ lwc1 $f12, 0x38($s0) /* 7ED524 80242814 8E430078 */ lw $v1, 0x78($s2) /* 7ED528 80242818 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_802426C8_7ED3D8 /* 7ED550 80242840 4406B000 */ mfc1 $a2, $f22 /* 7ED554 80242844 4407A000 */ mfc1 $a3, $f20 /* 7ED558 80242848 0C00A720 */ jal atan2 -/* 7ED55C 8024284C 00000000 */ nop +/* 7ED55C 8024284C 00000000 */ nop /* 7ED560 80242850 8E050018 */ lw $a1, 0x18($s0) /* 7ED564 80242854 44060000 */ mfc1 $a2, $f0 /* 7ED568 80242858 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_802426C8_7ED3D8 /* 7ED57C 8024286C 4406B000 */ mfc1 $a2, $f22 /* 7ED580 80242870 4407A000 */ mfc1 $a3, $f20 /* 7ED584 80242874 0C00A7B5 */ jal dist2D -/* 7ED588 80242878 00000000 */ nop +/* 7ED588 80242878 00000000 */ nop /* 7ED58C 8024287C C6020018 */ lwc1 $f2, 0x18($s0) /* 7ED590 80242880 4602003E */ c.le.s $f0, $f2 -/* 7ED594 80242884 00000000 */ nop +/* 7ED594 80242884 00000000 */ nop /* 7ED598 80242888 4500002F */ bc1f .L80242948 /* 7ED59C 8024288C 240403E8 */ addiu $a0, $zero, 0x3e8 /* 7ED5A0 80242890 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_802426C8_7ED3D8 /* 7ED5F4 802428E4 18400003 */ blez $v0, .L802428F4 /* 7ED5F8 802428E8 24020004 */ addiu $v0, $zero, 4 /* 7ED5FC 802428EC 14600002 */ bnez $v1, .L802428F8 -/* 7ED600 802428F0 00000000 */ nop +/* 7ED600 802428F0 00000000 */ nop .L802428F4: /* 7ED604 802428F4 AE420070 */ sw $v0, 0x70($s2) .L802428F8: diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242A30_7ED740.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242A30_7ED740.s index 93fca594e1..199f5ef360 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242A30_7ED740.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242A30_7ED740.s @@ -38,7 +38,7 @@ glabel func_80242A30_7ED740 /* 7ED7C4 80242AB4 2402000F */ addiu $v0, $zero, 0xf /* 7ED7C8 80242AB8 AFA2001C */ sw $v0, 0x1c($sp) /* 7ED7CC 80242ABC 44833000 */ mtc1 $v1, $f6 -/* 7ED7D0 80242AC0 00000000 */ nop +/* 7ED7D0 80242AC0 00000000 */ nop /* 7ED7D4 80242AC4 468031A0 */ cvt.s.w $f6, $f6 /* 7ED7D8 80242AC8 44073000 */ mfc1 $a3, $f6 /* 7ED7DC 80242ACC 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_80242A30_7ED740 .L80242B30: /* 7ED840 80242B30 8602008C */ lh $v0, 0x8c($s0) /* 7ED844 80242B34 14400025 */ bnez $v0, .L80242BCC -/* 7ED848 80242B38 00000000 */ nop +/* 7ED848 80242B38 00000000 */ nop /* 7ED84C 80242B3C 9602008E */ lhu $v0, 0x8e($s0) /* 7ED850 80242B40 2442FFFF */ addiu $v0, $v0, -1 /* 7ED854 80242B44 A602008E */ sh $v0, 0x8e($s0) /* 7ED858 80242B48 00021400 */ sll $v0, $v0, 0x10 /* 7ED85C 80242B4C 1440001F */ bnez $v0, .L80242BCC -/* 7ED860 80242B50 00000000 */ nop +/* 7ED860 80242B50 00000000 */ nop /* 7ED864 80242B54 8E820074 */ lw $v0, 0x74($s4) /* 7ED868 80242B58 2442FFFF */ addiu $v0, $v0, -1 /* 7ED86C 80242B5C 10400019 */ beqz $v0, .L80242BC4 @@ -84,7 +84,7 @@ glabel func_80242A30_7ED740 /* 7ED878 80242B68 9442002A */ lhu $v0, 0x2a($v0) /* 7ED87C 80242B6C 30420010 */ andi $v0, $v0, 0x10 /* 7ED880 80242B70 14400007 */ bnez $v0, .L80242B90 -/* 7ED884 80242B74 00000000 */ nop +/* 7ED884 80242B74 00000000 */ nop /* 7ED888 80242B78 C600000C */ lwc1 $f0, 0xc($s0) /* 7ED88C 80242B7C 3C014334 */ lui $at, 0x4334 /* 7ED890 80242B80 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242BEC_7ED8FC.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242BEC_7ED8FC.s index 96a6d1ad19..e012c61404 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242BEC_7ED8FC.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242BEC_7ED8FC.s @@ -28,7 +28,7 @@ glabel func_80242BEC_7ED8FC /* 7ED954 80242C44 8E0200D0 */ lw $v0, 0xd0($s0) /* 7ED958 80242C48 8C42007C */ lw $v0, 0x7c($v0) /* 7ED95C 80242C4C 04410004 */ bgez $v0, .L80242C60 -/* 7ED960 80242C50 00000000 */ nop +/* 7ED960 80242C50 00000000 */ nop /* 7ED964 80242C54 C6400000 */ lwc1 $f0, ($s2) /* 7ED968 80242C58 08090B20 */ j .L80242C80 /* 7ED96C 80242C5C E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_80242BEC_7ED8FC /* 7ED970 80242C60 3C018025 */ lui $at, %hi(D_802559C8) /* 7ED974 80242C64 D42259C8 */ ldc1 $f2, %lo(D_802559C8)($at) /* 7ED978 80242C68 44820000 */ mtc1 $v0, $f0 -/* 7ED97C 80242C6C 00000000 */ nop +/* 7ED97C 80242C6C 00000000 */ nop /* 7ED980 80242C70 46800021 */ cvt.d.w $f0, $f0 /* 7ED984 80242C74 46220003 */ div.d $f0, $f0, $f2 /* 7ED988 80242C78 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242D8C_7EDA9C.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242D8C_7EDA9C.s index 922e0bb3e3..f621c49a22 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242D8C_7EDA9C.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242D8C_7EDA9C.s @@ -47,20 +47,20 @@ glabel func_80242D8C_7EDA9C /* 7EDB44 80242E34 8E02001C */ lw $v0, 0x1c($s0) /* 7EDB48 80242E38 46001005 */ abs.s $f0, $f2 /* 7EDB4C 80242E3C 44822000 */ mtc1 $v0, $f4 -/* 7EDB50 80242E40 00000000 */ nop +/* 7EDB50 80242E40 00000000 */ nop /* 7EDB54 80242E44 46802120 */ cvt.s.w $f4, $f4 /* 7EDB58 80242E48 4600203C */ c.lt.s $f4, $f0 -/* 7EDB5C 80242E4C 00000000 */ nop +/* 7EDB5C 80242E4C 00000000 */ nop /* 7EDB60 80242E50 4500000D */ bc1f .L80242E88 -/* 7EDB64 80242E54 00000000 */ nop +/* 7EDB64 80242E54 00000000 */ nop /* 7EDB68 80242E58 44800000 */ mtc1 $zero, $f0 /* 7EDB6C 80242E5C C654000C */ lwc1 $f20, 0xc($s2) /* 7EDB70 80242E60 4600103C */ c.lt.s $f2, $f0 -/* 7EDB74 80242E64 00000000 */ nop +/* 7EDB74 80242E64 00000000 */ nop /* 7EDB78 80242E68 45000006 */ bc1f .L80242E84 /* 7EDB7C 80242E6C 00021023 */ negu $v0, $v0 /* 7EDB80 80242E70 44820000 */ mtc1 $v0, $f0 -/* 7EDB84 80242E74 00000000 */ nop +/* 7EDB84 80242E74 00000000 */ nop /* 7EDB88 80242E78 46800020 */ cvt.s.w $f0, $f0 /* 7EDB8C 80242E7C 08090BA2 */ j .L80242E88 /* 7EDB90 80242E80 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242EBC_7EDBCC.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242EBC_7EDBCC.s index c0676f7e6b..00dd9969ed 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242EBC_7EDBCC.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242EBC_7EDBCC.s @@ -37,7 +37,7 @@ glabel func_80242EBC_7EDBCC /* 7EDC4C 80242F3C 2402000F */ addiu $v0, $zero, 0xf /* 7EDC50 80242F40 AFA2001C */ sw $v0, 0x1c($sp) /* 7EDC54 80242F44 44833000 */ mtc1 $v1, $f6 -/* 7EDC58 80242F48 00000000 */ nop +/* 7EDC58 80242F48 00000000 */ nop /* 7EDC5C 80242F4C 468031A0 */ cvt.s.w $f6, $f6 /* 7EDC60 80242F50 44073000 */ mfc1 $a3, $f6 /* 7EDC64 80242F54 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243044_7EDD54.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243044_7EDD54.s index 093a055d7d..dd29d4dbf8 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243044_7EDD54.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243044_7EDD54.s @@ -28,7 +28,7 @@ glabel func_80243044_7EDD54 /* 7EDDAC 8024309C C4400008 */ lwc1 $f0, 8($v0) /* 7EDDB0 802430A0 46800020 */ cvt.s.w $f0, $f0 /* 7EDDB4 802430A4 4602003E */ c.le.s $f0, $f2 -/* 7EDDB8 802430A8 00000000 */ nop +/* 7EDDB8 802430A8 00000000 */ nop /* 7EDDBC 802430AC 45020003 */ bc1fl .L802430BC /* 7EDDC0 802430B0 24840001 */ addiu $a0, $a0, 1 /* 7EDDC4 802430B4 08090C33 */ j .L802430CC diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s index d1bb7c2a4b..be68dcbc61 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s @@ -46,7 +46,7 @@ glabel func_80243104_7EDE14 /* 7EDEB8 802431A8 8E2200B0 */ lw $v0, 0xb0($s1) /* 7EDEBC 802431AC 30420004 */ andi $v0, $v0, 4 /* 7EDEC0 802431B0 10400044 */ beqz $v0, .L802432C4 -/* 7EDEC4 802431B4 00000000 */ nop +/* 7EDEC4 802431B4 00000000 */ nop .L802431B8: /* 7EDEC8 802431B8 2404F7FF */ addiu $a0, $zero, -0x801 /* 7EDECC 802431BC AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80243104_7EDE14 /* 7EDF80 80243270 3C0142C8 */ lui $at, 0x42c8 /* 7EDF84 80243274 44812000 */ mtc1 $at, $f4 /* 7EDF88 80243278 44823000 */ mtc1 $v0, $f6 -/* 7EDF8C 8024327C 00000000 */ nop +/* 7EDF8C 8024327C 00000000 */ nop /* 7EDF90 80243280 468031A0 */ cvt.s.w $f6, $f6 /* 7EDF94 80243284 27A20044 */ addiu $v0, $sp, 0x44 /* 7EDF98 80243288 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80243104_7EDE14 /* 7EDFBC 802432AC 0C0372DF */ jal func_800DCB7C /* 7EDFC0 802432B0 27A70040 */ addiu $a3, $sp, 0x40 /* 7EDFC4 802432B4 10400003 */ beqz $v0, .L802432C4 -/* 7EDFC8 802432B8 00000000 */ nop +/* 7EDFC8 802432B8 00000000 */ nop /* 7EDFCC 802432BC C7A0003C */ lwc1 $f0, 0x3c($sp) /* 7EDFD0 802432C0 E640003C */ swc1 $f0, 0x3c($s2) .L802432C4: @@ -124,72 +124,85 @@ glabel func_80243104_7EDE14 /* 7EDFD8 802432C8 2C620064 */ sltiu $v0, $v1, 0x64 /* 7EDFDC 802432CC 10400042 */ beqz $v0, .L802433D8 /* 7EDFE0 802432D0 00031080 */ sll $v0, $v1, 2 -/* 7EDFE4 802432D4 3C018025 */ lui $at, %hi(D_802559D0) +/* 7EDFE4 802432D4 3C018025 */ lui $at, %hi(jtbl_802559D0_8006E0) /* 7EDFE8 802432D8 00220821 */ addu $at, $at, $v0 -/* 7EDFEC 802432DC 8C2259D0 */ lw $v0, %lo(D_802559D0)($at) +/* 7EDFEC 802432DC 8C2259D0 */ lw $v0, %lo(jtbl_802559D0_8006E0)($at) /* 7EDFF0 802432E0 00400008 */ jr $v0 -/* 7EDFF4 802432E4 00000000 */ nop +/* 7EDFF4 802432E4 00000000 */ nop +glabel L802432E8_7EDFF8 /* 7EDFF8 802432E8 0280202D */ daddu $a0, $s4, $zero /* 7EDFFC 802432EC 0260282D */ daddu $a1, $s3, $zero /* 7EE000 802432F0 0C09095C */ jal func_80242570_7ED280 /* 7EE004 802432F4 02A0302D */ daddu $a2, $s5, $zero +glabel L802432F8_7EE008 /* 7EE008 802432F8 0280202D */ daddu $a0, $s4, $zero /* 7EE00C 802432FC 0260282D */ daddu $a1, $s3, $zero /* 7EE010 80243300 0C0909B2 */ jal func_802426C8_7ED3D8 /* 7EE014 80243304 02A0302D */ daddu $a2, $s5, $zero /* 7EE018 80243308 08090CF6 */ j .L802433D8 -/* 7EE01C 8024330C 00000000 */ nop +/* 7EE01C 8024330C 00000000 */ nop +glabel L80243310_7EE020 /* 7EE020 80243310 0280202D */ daddu $a0, $s4, $zero /* 7EE024 80243314 0260282D */ daddu $a1, $s3, $zero /* 7EE028 80243318 0C090A5C */ jal func_80242970_7ED680 /* 7EE02C 8024331C 02A0302D */ daddu $a2, $s5, $zero +glabel L80243320_7EE030 /* 7EE030 80243320 0280202D */ daddu $a0, $s4, $zero /* 7EE034 80243324 0260282D */ daddu $a1, $s3, $zero /* 7EE038 80243328 0C090A8C */ jal func_80242A30_7ED740 /* 7EE03C 8024332C 02A0302D */ daddu $a2, $s5, $zero /* 7EE040 80243330 08090CF6 */ j .L802433D8 -/* 7EE044 80243334 00000000 */ nop +/* 7EE044 80243334 00000000 */ nop +glabel L80243338_7EE048 /* 7EE048 80243338 0280202D */ daddu $a0, $s4, $zero /* 7EE04C 8024333C 0260282D */ daddu $a1, $s3, $zero /* 7EE050 80243340 0C090AFB */ jal func_80242BEC_7ED8FC /* 7EE054 80243344 02A0302D */ daddu $a2, $s5, $zero /* 7EE058 80243348 08090CF6 */ j .L802433D8 -/* 7EE05C 8024334C 00000000 */ nop +/* 7EE05C 8024334C 00000000 */ nop +glabel L80243350_7EE060 /* 7EE060 80243350 0280202D */ daddu $a0, $s4, $zero /* 7EE064 80243354 0260282D */ daddu $a1, $s3, $zero /* 7EE068 80243358 0C090B28 */ jal mac_00_NpcJumpFunc2 /* 7EE06C 8024335C 02A0302D */ daddu $a2, $s5, $zero +glabel L80243360_7EE070 /* 7EE070 80243360 0280202D */ daddu $a0, $s4, $zero /* 7EE074 80243364 0260282D */ daddu $a1, $s3, $zero /* 7EE078 80243368 0C090B45 */ jal mac_00_NpcJumpFunc /* 7EE07C 8024336C 02A0302D */ daddu $a2, $s5, $zero /* 7EE080 80243370 08090CF6 */ j .L802433D8 -/* 7EE084 80243374 00000000 */ nop +/* 7EE084 80243374 00000000 */ nop +glabel L80243378_7EE088 /* 7EE088 80243378 0280202D */ daddu $a0, $s4, $zero /* 7EE08C 8024337C 0260282D */ daddu $a1, $s3, $zero /* 7EE090 80243380 0C090B63 */ jal func_80242D8C_7EDA9C /* 7EE094 80243384 02A0302D */ daddu $a2, $s5, $zero +glabel L80243388_7EE098 /* 7EE098 80243388 0280202D */ daddu $a0, $s4, $zero /* 7EE09C 8024338C 0260282D */ daddu $a1, $s3, $zero /* 7EE0A0 80243390 0C090BAF */ jal func_80242EBC_7EDBCC /* 7EE0A4 80243394 02A0302D */ daddu $a2, $s5, $zero /* 7EE0A8 80243398 08090CF6 */ j .L802433D8 -/* 7EE0AC 8024339C 00000000 */ nop +/* 7EE0AC 8024339C 00000000 */ nop +glabel L802433A0_7EE0B0 /* 7EE0B0 802433A0 0280202D */ daddu $a0, $s4, $zero /* 7EE0B4 802433A4 0260282D */ daddu $a1, $s3, $zero /* 7EE0B8 802433A8 0C090BF7 */ jal mac_00_UnkNpcDurationFlagFunc /* 7EE0BC 802433AC 02A0302D */ daddu $a2, $s5, $zero /* 7EE0C0 802433B0 08090CF6 */ j .L802433D8 -/* 7EE0C4 802433B4 00000000 */ nop +/* 7EE0C4 802433B4 00000000 */ nop +glabel L802433B8_7EE0C8 /* 7EE0C8 802433B8 0280202D */ daddu $a0, $s4, $zero /* 7EE0CC 802433BC 0260282D */ daddu $a1, $s3, $zero /* 7EE0D0 802433C0 0C090C11 */ jal func_80243044_7EDD54 /* 7EE0D4 802433C4 02A0302D */ daddu $a2, $s5, $zero /* 7EE0D8 802433C8 08090CF6 */ j .L802433D8 -/* 7EE0DC 802433CC 00000000 */ nop +/* 7EE0DC 802433CC 00000000 */ nop +glabel L802433D0_7EE0E0 /* 7EE0E0 802433D0 0C0129CF */ jal func_8004A73C /* 7EE0E4 802433D4 0280202D */ daddu $a0, $s4, $zero .L802433D8: +glabel L802433D8_7EE0E8 /* 7EE0E8 802433D8 8FBF0060 */ lw $ra, 0x60($sp) /* 7EE0EC 802433DC 8FB5005C */ lw $s5, 0x5c($sp) /* 7EE0F0 802433E0 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243400_7EE110.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243400_7EE110.s index f62fa27f59..8612db8db0 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243400_7EE110.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243400_7EE110.s @@ -26,7 +26,7 @@ glabel func_80243400_7EE110 /* 7EE160 80243450 1440FFFA */ bnez $v0, .L8024343C /* 7EE164 80243454 24A50004 */ addiu $a1, $a1, 4 /* 7EE168 80243458 08090D27 */ j .L8024349C -/* 7EE16C 8024345C 00000000 */ nop +/* 7EE16C 8024345C 00000000 */ nop .L80243460: /* 7EE170 80243460 0000182D */ daddu $v1, $zero, $zero /* 7EE174 80243464 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802437D0_7EE4E0.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802437D0_7EE4E0.s index 6450f30910..78bb9e715c 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802437D0_7EE4E0.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802437D0_7EE4E0.s @@ -28,7 +28,7 @@ glabel func_802437D0_7EE4E0 /* 7EE534 80243824 00220821 */ addu $at, $at, $v0 /* 7EE538 80243828 AC205EE0 */ sw $zero, %lo(D_80255EE0)($at) /* 7EE53C 8024382C 08090E17 */ j .L8024385C -/* 7EE540 80243830 00000000 */ nop +/* 7EE540 80243830 00000000 */ nop .L80243834: /* 7EE544 80243834 3C038025 */ lui $v1, %hi(D_80255EE0) /* 7EE548 80243838 24635EE0 */ addiu $v1, $v1, %lo(D_80255EE0) diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243B2C_7EE83C.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243B2C_7EE83C.s index 33de34eda9..e9e13698ab 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243B2C_7EE83C.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243B2C_7EE83C.s @@ -13,5 +13,5 @@ glabel func_80243B2C_7EE83C /* 7EE85C 80243B4C 24020002 */ addiu $v0, $zero, 2 /* 7EE860 80243B50 03E00008 */ jr $ra /* 7EE864 80243B54 27BD0018 */ addiu $sp, $sp, 0x18 -/* 7EE868 80243B58 00000000 */ nop -/* 7EE86C 80243B5C 00000000 */ nop +/* 7EE868 80243B58 00000000 */ nop +/* 7EE86C 80243B5C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_01/800880/func_802400C8_800948.s b/asm/nonmatchings/world/area_mac/mac_01/800880/func_802400C8_800948.s index ee6874da10..c4b0e637b0 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/800880/func_802400C8_800948.s +++ b/asm/nonmatchings/world/area_mac/mac_01/800880/func_802400C8_800948.s @@ -199,6 +199,6 @@ glabel func_802400C8_800948 /* 800C28 802403A8 24020002 */ addiu $v0, $zero, 2 /* 800C2C 802403AC 03E00008 */ jr $ra /* 800C30 802403B0 27BD0080 */ addiu $sp, $sp, 0x80 -/* 800C34 802403B4 00000000 */ nop -/* 800C38 802403B8 00000000 */ nop -/* 800C3C 802403BC 00000000 */ nop +/* 800C34 802403B4 00000000 */ nop +/* 800C38 802403B8 00000000 */ nop +/* 800C3C 802403BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240ED8_801758.s b/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240ED8_801758.s index fed4b1215b..55c35023f0 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240ED8_801758.s +++ b/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240ED8_801758.s @@ -31,6 +31,6 @@ glabel func_80240ED8_801758 /* 8017B8 80240F38 24020002 */ addiu $v0, $zero, 2 /* 8017BC 80240F3C 03E00008 */ jr $ra /* 8017C0 80240F40 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8017C4 80240F44 00000000 */ nop -/* 8017C8 80240F48 00000000 */ nop -/* 8017CC 80240F4C 00000000 */ nop +/* 8017C4 80240F44 00000000 */ nop +/* 8017C8 80240F48 00000000 */ nop +/* 8017CC 80240F4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241080_801900.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241080_801900.s index f511657a95..f3811d1e57 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241080_801900.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241080_801900.s @@ -45,7 +45,7 @@ glabel func_80241080_801900 /* 80199C 8024111C 0C00A7B5 */ jal dist2D /* 8019A0 80241120 4600B386 */ mov.s $f14, $f22 /* 8019A4 80241124 4614003C */ c.lt.s $f0, $f20 -/* 8019A8 80241128 00000000 */ nop +/* 8019A8 80241128 00000000 */ nop /* 8019AC 8024112C 45000003 */ bc1f .L8024113C /* 8019B0 80241130 2631000C */ addiu $s1, $s1, 0xc /* 8019B4 80241134 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_80241080_801900 /* 8019E0 80241160 8E6200D0 */ lw $v0, 0xd0($s3) /* 8019E4 80241164 8C42007C */ lw $v0, 0x7c($v0) /* 8019E8 80241168 04410004 */ bgez $v0, .L8024117C -/* 8019EC 8024116C 00000000 */ nop +/* 8019EC 8024116C 00000000 */ nop /* 8019F0 80241170 C6C00000 */ lwc1 $f0, ($s6) /* 8019F4 80241174 08090467 */ j .L8024119C /* 8019F8 80241178 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_80241080_801900 /* 8019FC 8024117C 3C018026 */ lui $at, %hi(D_802626E0) /* 801A00 80241180 D42226E0 */ ldc1 $f2, %lo(D_802626E0)($at) /* 801A04 80241184 44820000 */ mtc1 $v0, $f0 -/* 801A08 80241188 00000000 */ nop +/* 801A08 80241188 00000000 */ nop /* 801A0C 8024118C 46800021 */ cvt.d.w $f0, $f0 /* 801A10 80241190 46220003 */ div.d $f0, $f0, $f2 /* 801A14 80241194 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802411D8_801A58.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802411D8_801A58.s index 03f25c840d..665b0f342b 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802411D8_801A58.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802411D8_801A58.s @@ -44,7 +44,7 @@ glabel func_802411D8_801A58 /* 801AF4 80241274 2402000F */ addiu $v0, $zero, 0xf /* 801AF8 80241278 AFA2001C */ sw $v0, 0x1c($sp) /* 801AFC 8024127C 44833000 */ mtc1 $v1, $f6 -/* 801B00 80241280 00000000 */ nop +/* 801B00 80241280 00000000 */ nop /* 801B04 80241284 468031A0 */ cvt.s.w $f6, $f6 /* 801B08 80241288 44073000 */ mfc1 $a3, $f6 /* 801B0C 8024128C 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_802411D8_801A58 .L802412DC: /* 801B5C 802412DC 8602008C */ lh $v0, 0x8c($s0) /* 801B60 802412E0 1440005D */ bnez $v0, .L80241458 -/* 801B64 802412E4 00000000 */ nop +/* 801B64 802412E4 00000000 */ nop /* 801B68 802412E8 C6000018 */ lwc1 $f0, 0x18($s0) /* 801B6C 802412EC 3C014010 */ lui $at, 0x4010 /* 801B70 802412F0 44811800 */ mtc1 $at, $f3 /* 801B74 802412F4 44801000 */ mtc1 $zero, $f2 /* 801B78 802412F8 46000021 */ cvt.d.s $f0, $f0 /* 801B7C 802412FC 4622003C */ c.lt.d $f0, $f2 -/* 801B80 80241300 00000000 */ nop +/* 801B80 80241300 00000000 */ nop /* 801B84 80241304 45000003 */ bc1f .L80241314 /* 801B88 80241308 0200202D */ daddu $a0, $s0, $zero /* 801B8C 8024130C 080904C6 */ j .L80241318 @@ -88,7 +88,7 @@ glabel func_802411D8_801A58 /* 801B94 80241314 24050001 */ addiu $a1, $zero, 1 .L80241318: /* 801B98 80241318 0C00F598 */ jal func_8003D660 -/* 801B9C 8024131C 00000000 */ nop +/* 801B9C 8024131C 00000000 */ nop /* 801BA0 80241320 C60C0038 */ lwc1 $f12, 0x38($s0) /* 801BA4 80241324 8E430078 */ lw $v1, 0x78($s2) /* 801BA8 80241328 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_802411D8_801A58 /* 801BD0 80241350 4406B000 */ mfc1 $a2, $f22 /* 801BD4 80241354 4407A000 */ mfc1 $a3, $f20 /* 801BD8 80241358 0C00A720 */ jal atan2 -/* 801BDC 8024135C 00000000 */ nop +/* 801BDC 8024135C 00000000 */ nop /* 801BE0 80241360 8E050018 */ lw $a1, 0x18($s0) /* 801BE4 80241364 44060000 */ mfc1 $a2, $f0 /* 801BE8 80241368 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_802411D8_801A58 /* 801BFC 8024137C 4406B000 */ mfc1 $a2, $f22 /* 801C00 80241380 4407A000 */ mfc1 $a3, $f20 /* 801C04 80241384 0C00A7B5 */ jal dist2D -/* 801C08 80241388 00000000 */ nop +/* 801C08 80241388 00000000 */ nop /* 801C0C 8024138C C6020018 */ lwc1 $f2, 0x18($s0) /* 801C10 80241390 4602003E */ c.le.s $f0, $f2 -/* 801C14 80241394 00000000 */ nop +/* 801C14 80241394 00000000 */ nop /* 801C18 80241398 4500002F */ bc1f .L80241458 /* 801C1C 8024139C 240403E8 */ addiu $a0, $zero, 0x3e8 /* 801C20 802413A0 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_802411D8_801A58 /* 801C74 802413F4 18400003 */ blez $v0, .L80241404 /* 801C78 802413F8 24020004 */ addiu $v0, $zero, 4 /* 801C7C 802413FC 14600002 */ bnez $v1, .L80241408 -/* 801C80 80241400 00000000 */ nop +/* 801C80 80241400 00000000 */ nop .L80241404: /* 801C84 80241404 AE420070 */ sw $v0, 0x70($s2) .L80241408: diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241540_801DC0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241540_801DC0.s index 7d4c910b32..c5272e0a05 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241540_801DC0.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241540_801DC0.s @@ -38,7 +38,7 @@ glabel func_80241540_801DC0 /* 801E44 802415C4 2402000F */ addiu $v0, $zero, 0xf /* 801E48 802415C8 AFA2001C */ sw $v0, 0x1c($sp) /* 801E4C 802415CC 44833000 */ mtc1 $v1, $f6 -/* 801E50 802415D0 00000000 */ nop +/* 801E50 802415D0 00000000 */ nop /* 801E54 802415D4 468031A0 */ cvt.s.w $f6, $f6 /* 801E58 802415D8 44073000 */ mfc1 $a3, $f6 /* 801E5C 802415DC 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_80241540_801DC0 .L80241640: /* 801EC0 80241640 8602008C */ lh $v0, 0x8c($s0) /* 801EC4 80241644 14400025 */ bnez $v0, .L802416DC -/* 801EC8 80241648 00000000 */ nop +/* 801EC8 80241648 00000000 */ nop /* 801ECC 8024164C 9602008E */ lhu $v0, 0x8e($s0) /* 801ED0 80241650 2442FFFF */ addiu $v0, $v0, -1 /* 801ED4 80241654 A602008E */ sh $v0, 0x8e($s0) /* 801ED8 80241658 00021400 */ sll $v0, $v0, 0x10 /* 801EDC 8024165C 1440001F */ bnez $v0, .L802416DC -/* 801EE0 80241660 00000000 */ nop +/* 801EE0 80241660 00000000 */ nop /* 801EE4 80241664 8E820074 */ lw $v0, 0x74($s4) /* 801EE8 80241668 2442FFFF */ addiu $v0, $v0, -1 /* 801EEC 8024166C 10400019 */ beqz $v0, .L802416D4 @@ -84,7 +84,7 @@ glabel func_80241540_801DC0 /* 801EF8 80241678 9442002A */ lhu $v0, 0x2a($v0) /* 801EFC 8024167C 30420010 */ andi $v0, $v0, 0x10 /* 801F00 80241680 14400007 */ bnez $v0, .L802416A0 -/* 801F04 80241684 00000000 */ nop +/* 801F04 80241684 00000000 */ nop /* 801F08 80241688 C600000C */ lwc1 $f0, 0xc($s0) /* 801F0C 8024168C 3C014334 */ lui $at, 0x4334 /* 801F10 80241690 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802416FC_801F7C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802416FC_801F7C.s index eb8e06e948..e05f20e06c 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802416FC_801F7C.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802416FC_801F7C.s @@ -28,7 +28,7 @@ glabel func_802416FC_801F7C /* 801FD4 80241754 8E0200D0 */ lw $v0, 0xd0($s0) /* 801FD8 80241758 8C42007C */ lw $v0, 0x7c($v0) /* 801FDC 8024175C 04410004 */ bgez $v0, .L80241770 -/* 801FE0 80241760 00000000 */ nop +/* 801FE0 80241760 00000000 */ nop /* 801FE4 80241764 C6400000 */ lwc1 $f0, ($s2) /* 801FE8 80241768 080905E4 */ j .L80241790 /* 801FEC 8024176C E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_802416FC_801F7C /* 801FF0 80241770 3C018026 */ lui $at, %hi(D_802626E8) /* 801FF4 80241774 D42226E8 */ ldc1 $f2, %lo(D_802626E8)($at) /* 801FF8 80241778 44820000 */ mtc1 $v0, $f0 -/* 801FFC 8024177C 00000000 */ nop +/* 801FFC 8024177C 00000000 */ nop /* 802000 80241780 46800021 */ cvt.d.w $f0, $f0 /* 802004 80241784 46220003 */ div.d $f0, $f0, $f2 /* 802008 80241788 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024189C_80211C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024189C_80211C.s index af53535c9f..1f436eaaf4 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024189C_80211C.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024189C_80211C.s @@ -47,20 +47,20 @@ glabel func_8024189C_80211C /* 8021C4 80241944 8E02001C */ lw $v0, 0x1c($s0) /* 8021C8 80241948 46001005 */ abs.s $f0, $f2 /* 8021CC 8024194C 44822000 */ mtc1 $v0, $f4 -/* 8021D0 80241950 00000000 */ nop +/* 8021D0 80241950 00000000 */ nop /* 8021D4 80241954 46802120 */ cvt.s.w $f4, $f4 /* 8021D8 80241958 4600203C */ c.lt.s $f4, $f0 -/* 8021DC 8024195C 00000000 */ nop +/* 8021DC 8024195C 00000000 */ nop /* 8021E0 80241960 4500000D */ bc1f .L80241998 -/* 8021E4 80241964 00000000 */ nop +/* 8021E4 80241964 00000000 */ nop /* 8021E8 80241968 44800000 */ mtc1 $zero, $f0 /* 8021EC 8024196C C654000C */ lwc1 $f20, 0xc($s2) /* 8021F0 80241970 4600103C */ c.lt.s $f2, $f0 -/* 8021F4 80241974 00000000 */ nop +/* 8021F4 80241974 00000000 */ nop /* 8021F8 80241978 45000006 */ bc1f .L80241994 /* 8021FC 8024197C 00021023 */ negu $v0, $v0 /* 802200 80241980 44820000 */ mtc1 $v0, $f0 -/* 802204 80241984 00000000 */ nop +/* 802204 80241984 00000000 */ nop /* 802208 80241988 46800020 */ cvt.s.w $f0, $f0 /* 80220C 8024198C 08090666 */ j .L80241998 /* 802210 80241990 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802419CC_80224C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802419CC_80224C.s index 869667f3cb..703ab504da 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802419CC_80224C.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802419CC_80224C.s @@ -37,7 +37,7 @@ glabel func_802419CC_80224C /* 8022CC 80241A4C 2402000F */ addiu $v0, $zero, 0xf /* 8022D0 80241A50 AFA2001C */ sw $v0, 0x1c($sp) /* 8022D4 80241A54 44833000 */ mtc1 $v1, $f6 -/* 8022D8 80241A58 00000000 */ nop +/* 8022D8 80241A58 00000000 */ nop /* 8022DC 80241A5C 468031A0 */ cvt.s.w $f6, $f6 /* 8022E0 80241A60 44073000 */ mfc1 $a3, $f6 /* 8022E4 80241A64 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241B54_8023D4.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241B54_8023D4.s index de6f326f56..bea435239b 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241B54_8023D4.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241B54_8023D4.s @@ -28,7 +28,7 @@ glabel func_80241B54_8023D4 /* 80242C 80241BAC C4400008 */ lwc1 $f0, 8($v0) /* 802430 80241BB0 46800020 */ cvt.s.w $f0, $f0 /* 802434 80241BB4 4602003E */ c.le.s $f0, $f2 -/* 802438 80241BB8 00000000 */ nop +/* 802438 80241BB8 00000000 */ nop /* 80243C 80241BBC 45020003 */ bc1fl .L80241BCC /* 802440 80241BC0 24840001 */ addiu $a0, $a0, 1 /* 802444 80241BC4 080906F7 */ j .L80241BDC diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s index 309f6c7519..98b8101fc2 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s @@ -46,7 +46,7 @@ glabel func_80241C14_802494 /* 802538 80241CB8 8E2200B0 */ lw $v0, 0xb0($s1) /* 80253C 80241CBC 30420004 */ andi $v0, $v0, 4 /* 802540 80241CC0 10400044 */ beqz $v0, .L80241DD4 -/* 802544 80241CC4 00000000 */ nop +/* 802544 80241CC4 00000000 */ nop .L80241CC8: /* 802548 80241CC8 2404F7FF */ addiu $a0, $zero, -0x801 /* 80254C 80241CCC AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80241C14_802494 /* 802600 80241D80 3C0142C8 */ lui $at, 0x42c8 /* 802604 80241D84 44812000 */ mtc1 $at, $f4 /* 802608 80241D88 44823000 */ mtc1 $v0, $f6 -/* 80260C 80241D8C 00000000 */ nop +/* 80260C 80241D8C 00000000 */ nop /* 802610 80241D90 468031A0 */ cvt.s.w $f6, $f6 /* 802614 80241D94 27A20044 */ addiu $v0, $sp, 0x44 /* 802618 80241D98 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80241C14_802494 /* 80263C 80241DBC 0C0372DF */ jal func_800DCB7C /* 802640 80241DC0 27A70040 */ addiu $a3, $sp, 0x40 /* 802644 80241DC4 10400003 */ beqz $v0, .L80241DD4 -/* 802648 80241DC8 00000000 */ nop +/* 802648 80241DC8 00000000 */ nop /* 80264C 80241DCC C7A0003C */ lwc1 $f0, 0x3c($sp) /* 802650 80241DD0 E640003C */ swc1 $f0, 0x3c($s2) .L80241DD4: @@ -124,72 +124,85 @@ glabel func_80241C14_802494 /* 802658 80241DD8 2C620064 */ sltiu $v0, $v1, 0x64 /* 80265C 80241DDC 10400042 */ beqz $v0, .L80241EE8 /* 802660 80241DE0 00031080 */ sll $v0, $v1, 2 -/* 802664 80241DE4 3C018026 */ lui $at, %hi(D_802626F0) +/* 802664 80241DE4 3C018026 */ lui $at, %hi(jtbl_802626F0_822F70) /* 802668 80241DE8 00220821 */ addu $at, $at, $v0 -/* 80266C 80241DEC 8C2226F0 */ lw $v0, %lo(D_802626F0)($at) +/* 80266C 80241DEC 8C2226F0 */ lw $v0, %lo(jtbl_802626F0_822F70)($at) /* 802670 80241DF0 00400008 */ jr $v0 -/* 802674 80241DF4 00000000 */ nop +/* 802674 80241DF4 00000000 */ nop +glabel L80241DF8_802678 /* 802678 80241DF8 0280202D */ daddu $a0, $s4, $zero /* 80267C 80241DFC 0260282D */ daddu $a1, $s3, $zero /* 802680 80241E00 0C090420 */ jal func_80241080_801900 /* 802684 80241E04 02A0302D */ daddu $a2, $s5, $zero +glabel L80241E08_802688 /* 802688 80241E08 0280202D */ daddu $a0, $s4, $zero /* 80268C 80241E0C 0260282D */ daddu $a1, $s3, $zero /* 802690 80241E10 0C090476 */ jal func_802411D8_801A58 /* 802694 80241E14 02A0302D */ daddu $a2, $s5, $zero /* 802698 80241E18 080907BA */ j .L80241EE8 -/* 80269C 80241E1C 00000000 */ nop +/* 80269C 80241E1C 00000000 */ nop +glabel L80241E20_8026A0 /* 8026A0 80241E20 0280202D */ daddu $a0, $s4, $zero /* 8026A4 80241E24 0260282D */ daddu $a1, $s3, $zero /* 8026A8 80241E28 0C090520 */ jal dup_mac_01_UnkNpcAIFunc1 /* 8026AC 80241E2C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241E30_8026B0 /* 8026B0 80241E30 0280202D */ daddu $a0, $s4, $zero /* 8026B4 80241E34 0260282D */ daddu $a1, $s3, $zero /* 8026B8 80241E38 0C090550 */ jal func_80241540_801DC0 /* 8026BC 80241E3C 02A0302D */ daddu $a2, $s5, $zero /* 8026C0 80241E40 080907BA */ j .L80241EE8 -/* 8026C4 80241E44 00000000 */ nop +/* 8026C4 80241E44 00000000 */ nop +glabel L80241E48_8026C8 /* 8026C8 80241E48 0280202D */ daddu $a0, $s4, $zero /* 8026CC 80241E4C 0260282D */ daddu $a1, $s3, $zero /* 8026D0 80241E50 0C0905BF */ jal func_802416FC_801F7C /* 8026D4 80241E54 02A0302D */ daddu $a2, $s5, $zero /* 8026D8 80241E58 080907BA */ j .L80241EE8 -/* 8026DC 80241E5C 00000000 */ nop +/* 8026DC 80241E5C 00000000 */ nop +glabel L80241E60_8026E0 /* 8026E0 80241E60 0280202D */ daddu $a0, $s4, $zero /* 8026E4 80241E64 0260282D */ daddu $a1, $s3, $zero /* 8026E8 80241E68 0C0905EC */ jal dup_mac_01_NpcJumpFunc2 /* 8026EC 80241E6C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241E70_8026F0 /* 8026F0 80241E70 0280202D */ daddu $a0, $s4, $zero /* 8026F4 80241E74 0260282D */ daddu $a1, $s3, $zero /* 8026F8 80241E78 0C090609 */ jal dup_mac_01_NpcJumpFunc /* 8026FC 80241E7C 02A0302D */ daddu $a2, $s5, $zero /* 802700 80241E80 080907BA */ j .L80241EE8 -/* 802704 80241E84 00000000 */ nop +/* 802704 80241E84 00000000 */ nop +glabel L80241E88_802708 /* 802708 80241E88 0280202D */ daddu $a0, $s4, $zero /* 80270C 80241E8C 0260282D */ daddu $a1, $s3, $zero /* 802710 80241E90 0C090627 */ jal func_8024189C_80211C /* 802714 80241E94 02A0302D */ daddu $a2, $s5, $zero +glabel L80241E98_802718 /* 802718 80241E98 0280202D */ daddu $a0, $s4, $zero /* 80271C 80241E9C 0260282D */ daddu $a1, $s3, $zero /* 802720 80241EA0 0C090673 */ jal func_802419CC_80224C /* 802724 80241EA4 02A0302D */ daddu $a2, $s5, $zero /* 802728 80241EA8 080907BA */ j .L80241EE8 -/* 80272C 80241EAC 00000000 */ nop +/* 80272C 80241EAC 00000000 */ nop +glabel L80241EB0_802730 /* 802730 80241EB0 0280202D */ daddu $a0, $s4, $zero /* 802734 80241EB4 0260282D */ daddu $a1, $s3, $zero /* 802738 80241EB8 0C0906BB */ jal func_80241AEC_80236C /* 80273C 80241EBC 02A0302D */ daddu $a2, $s5, $zero /* 802740 80241EC0 080907BA */ j .L80241EE8 -/* 802744 80241EC4 00000000 */ nop +/* 802744 80241EC4 00000000 */ nop +glabel L80241EC8_802748 /* 802748 80241EC8 0280202D */ daddu $a0, $s4, $zero /* 80274C 80241ECC 0260282D */ daddu $a1, $s3, $zero /* 802750 80241ED0 0C0906D5 */ jal func_80241B54_8023D4 /* 802754 80241ED4 02A0302D */ daddu $a2, $s5, $zero /* 802758 80241ED8 080907BA */ j .L80241EE8 -/* 80275C 80241EDC 00000000 */ nop +/* 80275C 80241EDC 00000000 */ nop +glabel L80241EE0_802760 /* 802760 80241EE0 0C0129CF */ jal func_8004A73C /* 802764 80241EE4 0280202D */ daddu $a0, $s4, $zero .L80241EE8: +glabel L80241EE8_802768 /* 802768 80241EE8 8FBF0060 */ lw $ra, 0x60($sp) /* 80276C 80241EEC 8FB5005C */ lw $s5, 0x5c($sp) /* 802770 80241EF0 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241F10_802790.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241F10_802790.s index 79eb1ca31b..d36c881124 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241F10_802790.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241F10_802790.s @@ -26,7 +26,7 @@ glabel func_80241F10_802790 /* 8027E0 80241F60 1440FFFA */ bnez $v0, .L80241F4C /* 8027E4 80241F64 24A50004 */ addiu $a1, $a1, 4 /* 8027E8 80241F68 080907EB */ j .L80241FAC -/* 8027EC 80241F6C 00000000 */ nop +/* 8027EC 80241F6C 00000000 */ nop .L80241F70: /* 8027F0 80241F70 0000182D */ daddu $v1, $zero, $zero /* 8027F4 80241F74 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024204C_8028CC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024204C_8028CC.s index f9a0adbc0e..9f6ec6a49c 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024204C_8028CC.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024204C_8028CC.s @@ -115,7 +115,7 @@ glabel func_8024204C_8028CC /* 802A74 802421F4 14E20005 */ bne $a3, $v0, .L8024220C /* 802A78 802421F8 32E2FFFF */ andi $v0, $s7, 0xffff /* 802A7C 802421FC 14400003 */ bnez $v0, .L8024220C -/* 802A80 80242200 00000000 */ nop +/* 802A80 80242200 00000000 */ nop /* 802A84 80242204 14800008 */ bnez $a0, .L80242228 /* 802A88 80242208 24020001 */ addiu $v0, $zero, 1 .L8024220C: @@ -123,7 +123,7 @@ glabel func_8024204C_8028CC /* 802A90 80242210 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 802A94 80242214 80420075 */ lb $v0, 0x75($v0) /* 802A98 80242218 10400005 */ beqz $v0, .L80242230 -/* 802A9C 8024221C 00000000 */ nop +/* 802A9C 8024221C 00000000 */ nop /* 802AA0 80242220 10800003 */ beqz $a0, .L80242230 /* 802AA4 80242224 24020001 */ addiu $v0, $zero, 1 .L80242228: diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024233C_802BBC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024233C_802BBC.s index b0999b8cdd..961ffe6f28 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024233C_802BBC.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024233C_802BBC.s @@ -39,13 +39,13 @@ glabel func_8024233C_802BBC /* 802C40 802423C0 10740005 */ beq $v1, $s4, .L802423D8 /* 802C44 802423C4 26100001 */ addiu $s0, $s0, 1 /* 802C48 802423C8 10730003 */ beq $v1, $s3, .L802423D8 -/* 802C4C 802423CC 00000000 */ nop +/* 802C4C 802423CC 00000000 */ nop /* 802C50 802423D0 00521025 */ or $v0, $v0, $s2 /* 802C54 802423D4 AC820000 */ sw $v0, ($a0) .L802423D8: /* 802C58 802423D8 2A020040 */ slti $v0, $s0, 0x40 /* 802C5C 802423DC 1440FFEF */ bnez $v0, .L8024239C -/* 802C60 802423E0 00000000 */ nop +/* 802C60 802423E0 00000000 */ nop /* 802C64 802423E4 0000802D */ daddu $s0, $zero, $zero /* 802C68 802423E8 3C120800 */ lui $s2, 0x800 .L802423EC: @@ -57,13 +57,13 @@ glabel func_8024233C_802BBC /* 802C80 80242400 8C640000 */ lw $a0, ($v1) /* 802C84 80242404 30820010 */ andi $v0, $a0, 0x10 /* 802C88 80242408 10400003 */ beqz $v0, .L80242418 -/* 802C8C 8024240C 00000000 */ nop +/* 802C8C 8024240C 00000000 */ nop /* 802C90 80242410 00921025 */ or $v0, $a0, $s2 /* 802C94 80242414 AC620000 */ sw $v0, ($v1) .L80242418: /* 802C98 80242418 2A020100 */ slti $v0, $s0, 0x100 /* 802C9C 8024241C 1440FFF3 */ bnez $v0, .L802423EC -/* 802CA0 80242420 00000000 */ nop +/* 802CA0 80242420 00000000 */ nop /* 802CA4 80242424 AE200070 */ sw $zero, 0x70($s1) .L80242428: /* 802CA8 80242428 8E220070 */ lw $v0, 0x70($s1) diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242488_802D08.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242488_802D08.s index 1dc9576d23..3c8be3c3e8 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242488_802D08.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242488_802D08.s @@ -32,7 +32,7 @@ glabel func_80242488_802D08 /* 802D6C 802424EC 0080302D */ daddu $a2, $a0, $zero /* 802D70 802424F0 8E020070 */ lw $v0, 0x70($s0) /* 802D74 802424F4 14400006 */ bnez $v0, .L80242510 -/* 802D78 802424F8 00000000 */ nop +/* 802D78 802424F8 00000000 */ nop /* 802D7C 802424FC 8E020074 */ lw $v0, 0x74($s0) /* 802D80 80242500 14400003 */ bnez $v0, .L80242510 /* 802D84 80242504 24020001 */ addiu $v0, $zero, 1 @@ -66,13 +66,13 @@ glabel func_80242488_802D08 /* 802DEC 8024256C 10730005 */ beq $v1, $s3, .L80242584 /* 802DF0 80242570 26100001 */ addiu $s0, $s0, 1 /* 802DF4 80242574 10720003 */ beq $v1, $s2, .L80242584 -/* 802DF8 80242578 00000000 */ nop +/* 802DF8 80242578 00000000 */ nop /* 802DFC 8024257C 00511024 */ and $v0, $v0, $s1 /* 802E00 80242580 AC820000 */ sw $v0, ($a0) .L80242584: /* 802E04 80242584 2A020040 */ slti $v0, $s0, 0x40 /* 802E08 80242588 1440FFEF */ bnez $v0, .L80242548 -/* 802E0C 8024258C 00000000 */ nop +/* 802E0C 8024258C 00000000 */ nop /* 802E10 80242590 0000802D */ daddu $s0, $zero, $zero /* 802E14 80242594 3C11F7FF */ lui $s1, 0xf7ff /* 802E18 80242598 3631FFFF */ ori $s1, $s1, 0xffff @@ -85,7 +85,7 @@ glabel func_80242488_802D08 /* 802E30 802425B0 8C640000 */ lw $a0, ($v1) /* 802E34 802425B4 30820010 */ andi $v0, $a0, 0x10 /* 802E38 802425B8 10400003 */ beqz $v0, .L802425C8 -/* 802E3C 802425BC 00000000 */ nop +/* 802E3C 802425BC 00000000 */ nop /* 802E40 802425C0 00911024 */ and $v0, $a0, $s1 /* 802E44 802425C4 AC620000 */ sw $v0, ($v1) .L802425C8: @@ -93,7 +93,7 @@ glabel func_80242488_802D08 /* 802E4C 802425CC 1440FFF3 */ bnez $v0, .L8024259C /* 802E50 802425D0 24020002 */ addiu $v0, $zero, 2 /* 802E54 802425D4 08090978 */ j .L802425E0 -/* 802E58 802425D8 00000000 */ nop +/* 802E58 802425D8 00000000 */ nop .L802425DC: /* 802E5C 802425DC 0000102D */ daddu $v0, $zero, $zero .L802425E0: diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242680_802F00.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242680_802F00.s index a2573d3054..432ef26a5b 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242680_802F00.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242680_802F00.s @@ -16,19 +16,19 @@ glabel func_80242680_802F00 /* 802F2C 802426AC 0220202D */ daddu $a0, $s1, $zero /* 802F30 802426B0 3C05F4AC */ lui $a1, 0xf4ac /* 802F34 802426B4 4482B000 */ mtc1 $v0, $f22 -/* 802F38 802426B8 00000000 */ nop +/* 802F38 802426B8 00000000 */ nop /* 802F3C 802426BC 4680B5A0 */ cvt.s.w $f22, $f22 /* 802F40 802426C0 0C0B1EAF */ jal get_variable /* 802F44 802426C4 34A5D482 */ ori $a1, $a1, 0xd482 /* 802F48 802426C8 0220202D */ daddu $a0, $s1, $zero /* 802F4C 802426CC 3C05F4AC */ lui $a1, 0xf4ac /* 802F50 802426D0 4482A000 */ mtc1 $v0, $f20 -/* 802F54 802426D4 00000000 */ nop +/* 802F54 802426D4 00000000 */ nop /* 802F58 802426D8 4680A520 */ cvt.s.w $f20, $f20 /* 802F5C 802426DC 0C0B1EAF */ jal get_variable /* 802F60 802426E0 34A5D483 */ ori $a1, $a1, 0xd483 /* 802F64 802426E4 44821000 */ mtc1 $v0, $f2 -/* 802F68 802426E8 00000000 */ nop +/* 802F68 802426E8 00000000 */ nop /* 802F6C 802426EC 468010A0 */ cvt.s.w $f2, $f2 /* 802F70 802426F0 4405B000 */ mfc1 $a1, $f22 /* 802F74 802426F4 4406A000 */ mfc1 $a2, $f20 @@ -45,19 +45,19 @@ glabel func_80242680_802F00 /* 802FA0 80242720 0220202D */ daddu $a0, $s1, $zero /* 802FA4 80242724 3C05F4AC */ lui $a1, 0xf4ac /* 802FA8 80242728 4482B000 */ mtc1 $v0, $f22 -/* 802FAC 8024272C 00000000 */ nop +/* 802FAC 8024272C 00000000 */ nop /* 802FB0 80242730 4680B5A0 */ cvt.s.w $f22, $f22 /* 802FB4 80242734 0C0B1EAF */ jal get_variable /* 802FB8 80242738 34A5D482 */ ori $a1, $a1, 0xd482 /* 802FBC 8024273C 0220202D */ daddu $a0, $s1, $zero /* 802FC0 80242740 3C05F4AC */ lui $a1, 0xf4ac /* 802FC4 80242744 4482A000 */ mtc1 $v0, $f20 -/* 802FC8 80242748 00000000 */ nop +/* 802FC8 80242748 00000000 */ nop /* 802FCC 8024274C 4680A520 */ cvt.s.w $f20, $f20 /* 802FD0 80242750 0C0B1EAF */ jal get_variable /* 802FD4 80242754 34A5D483 */ ori $a1, $a1, 0xd483 /* 802FD8 80242758 44821000 */ mtc1 $v0, $f2 -/* 802FDC 8024275C 00000000 */ nop +/* 802FDC 8024275C 00000000 */ nop /* 802FE0 80242760 468010A0 */ cvt.s.w $f2, $f2 /* 802FE4 80242764 4405B000 */ mfc1 $a1, $f22 /* 802FE8 80242768 4406A000 */ mfc1 $a2, $f20 @@ -73,19 +73,19 @@ glabel func_80242680_802F00 /* 803010 80242790 0220202D */ daddu $a0, $s1, $zero /* 803014 80242794 3C05F4AC */ lui $a1, 0xf4ac /* 803018 80242798 4482B000 */ mtc1 $v0, $f22 -/* 80301C 8024279C 00000000 */ nop +/* 80301C 8024279C 00000000 */ nop /* 803020 802427A0 4680B5A0 */ cvt.s.w $f22, $f22 /* 803024 802427A4 0C0B1EAF */ jal get_variable /* 803028 802427A8 34A5D482 */ ori $a1, $a1, 0xd482 /* 80302C 802427AC 0220202D */ daddu $a0, $s1, $zero /* 803030 802427B0 3C05F4AC */ lui $a1, 0xf4ac /* 803034 802427B4 4482A000 */ mtc1 $v0, $f20 -/* 803038 802427B8 00000000 */ nop +/* 803038 802427B8 00000000 */ nop /* 80303C 802427BC 4680A520 */ cvt.s.w $f20, $f20 /* 803040 802427C0 0C0B1EAF */ jal get_variable /* 803044 802427C4 34A5D483 */ ori $a1, $a1, 0xd483 /* 803048 802427C8 44821000 */ mtc1 $v0, $f2 -/* 80304C 802427CC 00000000 */ nop +/* 80304C 802427CC 00000000 */ nop /* 803050 802427D0 468010A0 */ cvt.s.w $f2, $f2 /* 803054 802427D4 4405B000 */ mfc1 $a1, $f22 /* 803058 802427D8 4406A000 */ mfc1 $a2, $f20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242898_803118.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242898_803118.s index 0215420c7b..7e8a7f485a 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242898_803118.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242898_803118.s @@ -44,7 +44,7 @@ glabel func_80242898_803118 /* 8031AC 8024292C 3C048026 */ lui $a0, %hi(D_80262A40) /* 8031B0 80242930 8C842A40 */ lw $a0, %lo(D_80262A40)($a0) /* 8031B4 80242934 0C048D70 */ jal func_801235C0 -/* 8031B8 80242938 00000000 */ nop +/* 8031B8 80242938 00000000 */ nop /* 8031BC 8024293C 24020002 */ addiu $v0, $zero, 2 .L80242940: /* 8031C0 80242940 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F08_803788.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F08_803788.s index 5520dea49d..66e62098d4 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F08_803788.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F08_803788.s @@ -13,7 +13,7 @@ glabel func_80242F08_803788 /* 8037A8 80242F28 14620006 */ bne $v1, $v0, .L80242F44 /* 8037AC 80242F2C 24020002 */ addiu $v0, $zero, 2 /* 8037B0 80242F30 44800000 */ mtc1 $zero, $f0 -/* 8037B4 80242F34 00000000 */ nop +/* 8037B4 80242F34 00000000 */ nop /* 8037B8 80242F38 44050000 */ mfc1 $a1, $f0 /* 8037BC 80242F3C 08090BD7 */ j .L80242F5C /* 8037C0 80242F40 0000202D */ daddu $a0, $zero, $zero @@ -21,9 +21,9 @@ glabel func_80242F08_803788 /* 8037C4 80242F44 14620008 */ bne $v1, $v0, .L80242F68 /* 8037C8 80242F48 24040001 */ addiu $a0, $zero, 1 /* 8037CC 80242F4C 44800000 */ mtc1 $zero, $f0 -/* 8037D0 80242F50 00000000 */ nop +/* 8037D0 80242F50 00000000 */ nop /* 8037D4 80242F54 44050000 */ mfc1 $a1, $f0 -/* 8037D8 80242F58 00000000 */ nop +/* 8037D8 80242F58 00000000 */ nop .L80242F5C: /* 8037DC 80242F5C 00A0302D */ daddu $a2, $a1, $zero /* 8037E0 80242F60 0C01C5A4 */ jal func_80071690 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243380_803C00.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243380_803C00.s index d31cbfe6cc..fb71759b43 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243380_803C00.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243380_803C00.s @@ -27,12 +27,12 @@ glabel func_80243380_803C00 /* 803C58 802433D8 AE11000C */ sw $s1, 0xc($s0) /* 803C5C 802433DC 846200B0 */ lh $v0, 0xb0($v1) /* 803C60 802433E0 44820000 */ mtc1 $v0, $f0 -/* 803C64 802433E4 00000000 */ nop +/* 803C64 802433E4 00000000 */ nop /* 803C68 802433E8 46800020 */ cvt.s.w $f0, $f0 /* 803C6C 802433EC E6000034 */ swc1 $f0, 0x34($s0) /* 803C70 802433F0 846200B2 */ lh $v0, 0xb2($v1) /* 803C74 802433F4 44820000 */ mtc1 $v0, $f0 -/* 803C78 802433F8 00000000 */ nop +/* 803C78 802433F8 00000000 */ nop /* 803C7C 802433FC 46800020 */ cvt.s.w $f0, $f0 /* 803C80 80243400 E6000038 */ swc1 $f0, 0x38($s0) /* 803C84 80243404 C4600028 */ lwc1 $f0, 0x28($v1) diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243500_803D80.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243500_803D80.s index 077403361a..a4f9480094 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243500_803D80.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243500_803D80.s @@ -23,7 +23,7 @@ glabel func_80243500_803D80 /* 803DC8 80243548 4600008D */ trunc.w.s $f2, $f0 /* 803DCC 8024354C 44111000 */ mfc1 $s1, $f2 /* 803DD0 80243550 0C0B210B */ jal get_float_variable -/* 803DD4 80243554 00000000 */ nop +/* 803DD4 80243554 00000000 */ nop /* 803DD8 80243558 0000202D */ daddu $a0, $zero, $zero /* 803DDC 8024355C 3C05FD05 */ lui $a1, 0xfd05 /* 803DE0 80243560 4600008D */ trunc.w.s $f2, $f0 @@ -32,15 +32,15 @@ glabel func_80243500_803D80 /* 803DEC 8024356C 34A50F8A */ ori $a1, $a1, 0xf8a /* 803DF0 80243570 0040182D */ daddu $v1, $v0, $zero /* 803DF4 80243574 44920000 */ mtc1 $s2, $f0 -/* 803DF8 80243578 00000000 */ nop +/* 803DF8 80243578 00000000 */ nop /* 803DFC 8024357C 46800020 */ cvt.s.w $f0, $f0 /* 803E00 80243580 E4600010 */ swc1 $f0, 0x10($v1) /* 803E04 80243584 44910000 */ mtc1 $s1, $f0 -/* 803E08 80243588 00000000 */ nop +/* 803E08 80243588 00000000 */ nop /* 803E0C 8024358C 46800020 */ cvt.s.w $f0, $f0 /* 803E10 80243590 E4600014 */ swc1 $f0, 0x14($v1) /* 803E14 80243594 44900000 */ mtc1 $s0, $f0 -/* 803E18 80243598 00000000 */ nop +/* 803E18 80243598 00000000 */ nop /* 803E1C 8024359C 46800020 */ cvt.s.w $f0, $f0 /* 803E20 802435A0 E4600018 */ swc1 $f0, 0x18($v1) /* 803E24 802435A4 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802435C0_803E40.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802435C0_803E40.s index bcddbfa4bd..3babf36366 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802435C0_803E40.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802435C0_803E40.s @@ -23,7 +23,7 @@ glabel func_802435C0_803E40 /* 803E88 80243608 4600008D */ trunc.w.s $f2, $f0 /* 803E8C 8024360C 44111000 */ mfc1 $s1, $f2 /* 803E90 80243610 0C0B210B */ jal get_float_variable -/* 803E94 80243614 00000000 */ nop +/* 803E94 80243614 00000000 */ nop /* 803E98 80243618 0000202D */ daddu $a0, $zero, $zero /* 803E9C 8024361C 3C05FD05 */ lui $a1, 0xfd05 /* 803EA0 80243620 4600008D */ trunc.w.s $f2, $f0 @@ -32,15 +32,15 @@ glabel func_802435C0_803E40 /* 803EAC 8024362C 34A50F8A */ ori $a1, $a1, 0xf8a /* 803EB0 80243630 0040182D */ daddu $v1, $v0, $zero /* 803EB4 80243634 44920000 */ mtc1 $s2, $f0 -/* 803EB8 80243638 00000000 */ nop +/* 803EB8 80243638 00000000 */ nop /* 803EBC 8024363C 46800020 */ cvt.s.w $f0, $f0 /* 803EC0 80243640 E460001C */ swc1 $f0, 0x1c($v1) /* 803EC4 80243644 44910000 */ mtc1 $s1, $f0 -/* 803EC8 80243648 00000000 */ nop +/* 803EC8 80243648 00000000 */ nop /* 803ECC 8024364C 46800020 */ cvt.s.w $f0, $f0 /* 803ED0 80243650 E4600020 */ swc1 $f0, 0x20($v1) /* 803ED4 80243654 44900000 */ mtc1 $s0, $f0 -/* 803ED8 80243658 00000000 */ nop +/* 803ED8 80243658 00000000 */ nop /* 803EDC 8024365C 46800020 */ cvt.s.w $f0, $f0 /* 803EE0 80243660 E4600024 */ swc1 $f0, 0x24($v1) /* 803EE4 80243664 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243680_803F00.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243680_803F00.s index dce928a3dd..cd36674032 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243680_803F00.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243680_803F00.s @@ -23,7 +23,7 @@ glabel func_80243680_803F00 /* 803F48 802436C8 4600008D */ trunc.w.s $f2, $f0 /* 803F4C 802436CC 44111000 */ mfc1 $s1, $f2 /* 803F50 802436D0 0C0B210B */ jal get_float_variable -/* 803F54 802436D4 00000000 */ nop +/* 803F54 802436D4 00000000 */ nop /* 803F58 802436D8 0000202D */ daddu $a0, $zero, $zero /* 803F5C 802436DC 3C05FD05 */ lui $a1, 0xfd05 /* 803F60 802436E0 4600008D */ trunc.w.s $f2, $f0 @@ -32,15 +32,15 @@ glabel func_80243680_803F00 /* 803F6C 802436EC 34A50F8A */ ori $a1, $a1, 0xf8a /* 803F70 802436F0 0040182D */ daddu $v1, $v0, $zero /* 803F74 802436F4 44920000 */ mtc1 $s2, $f0 -/* 803F78 802436F8 00000000 */ nop +/* 803F78 802436F8 00000000 */ nop /* 803F7C 802436FC 46800020 */ cvt.s.w $f0, $f0 /* 803F80 80243700 E4600028 */ swc1 $f0, 0x28($v1) /* 803F84 80243704 44910000 */ mtc1 $s1, $f0 -/* 803F88 80243708 00000000 */ nop +/* 803F88 80243708 00000000 */ nop /* 803F8C 8024370C 46800020 */ cvt.s.w $f0, $f0 /* 803F90 80243710 E460002C */ swc1 $f0, 0x2c($v1) /* 803F94 80243714 44900000 */ mtc1 $s0, $f0 -/* 803F98 80243718 00000000 */ nop +/* 803F98 80243718 00000000 */ nop /* 803F9C 8024371C 46800020 */ cvt.s.w $f0, $f0 /* 803FA0 80243720 E4600030 */ swc1 $f0, 0x30($v1) /* 803FA4 80243724 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243870_8040F0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243870_8040F0.s index a016faafb2..f5a7974ec0 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243870_8040F0.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243870_8040F0.s @@ -16,7 +16,7 @@ glabel func_80243870_8040F0 /* 80411C 8024389C 0C0B1EAF */ jal get_variable /* 804120 802438A0 0040802D */ daddu $s0, $v0, $zero /* 804124 802438A4 44820000 */ mtc1 $v0, $f0 -/* 804128 802438A8 00000000 */ nop +/* 804128 802438A8 00000000 */ nop /* 80412C 802438AC 46800020 */ cvt.s.w $f0, $f0 /* 804130 802438B0 24020002 */ addiu $v0, $zero, 2 /* 804134 802438B4 00501804 */ sllv $v1, $s0, $v0 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024396C_8041EC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024396C_8041EC.s index ba0c455a83..9a60461fac 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024396C_8041EC.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024396C_8041EC.s @@ -12,7 +12,7 @@ glabel func_8024396C_8041EC /* 804208 80243988 80A30006 */ lb $v1, 6($a1) /* 80420C 8024398C 80A20005 */ lb $v0, 5($a1) /* 804210 80243990 14620007 */ bne $v1, $v0, .L802439B0 -/* 804214 80243994 00000000 */ nop +/* 804214 80243994 00000000 */ nop /* 804218 80243998 80C2028E */ lb $v0, 0x28e($a2) /* 80421C 8024399C 84C30290 */ lh $v1, 0x290($a2) /* 804220 802439A0 00021200 */ sll $v0, $v0, 8 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D60_8045E0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D60_8045E0.s index 99dccabec8..492b5e57ad 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D60_8045E0.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D60_8045E0.s @@ -28,7 +28,7 @@ glabel func_80243D60_8045E0 /* 804634 80243DB4 00220821 */ addu $at, $at, $v0 /* 804638 80243DB8 AC202A70 */ sw $zero, %lo(D_80262A70)($at) /* 80463C 80243DBC 08090F7B */ j .L80243DEC -/* 804640 80243DC0 00000000 */ nop +/* 804640 80243DC0 00000000 */ nop .L80243DC4: /* 804644 80243DC4 3C038026 */ lui $v1, %hi(D_80262A70) /* 804648 80243DC8 24632A70 */ addiu $v1, $v1, %lo(D_80262A70) diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802441EC_804A6C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802441EC_804A6C.s index 0268adbf29..a1bdaf1717 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802441EC_804A6C.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802441EC_804A6C.s @@ -14,7 +14,7 @@ glabel func_802441EC_804A6C .L80244210: /* 804A90 80244210 8E020074 */ lw $v0, 0x74($s0) /* 804A94 80244214 1440001A */ bnez $v0, .L80244280 -/* 804A98 80244218 00000000 */ nop +/* 804A98 80244218 00000000 */ nop /* 804A9C 8024421C 8E020070 */ lw $v0, 0x70($s0) /* 804AA0 80244220 24420004 */ addiu $v0, $v0, 4 /* 804AA4 80244224 AE020070 */ sw $v0, 0x70($s0) @@ -36,7 +36,7 @@ glabel func_802441EC_804A6C /* 804ADC 8024425C 8E030070 */ lw $v1, 0x70($s0) /* 804AE0 80244260 2402007F */ addiu $v0, $zero, 0x7f /* 804AE4 80244264 14620014 */ bne $v1, $v0, .L802442B8 -/* 804AE8 80244268 00000000 */ nop +/* 804AE8 80244268 00000000 */ nop /* 804AEC 8024426C 8E020078 */ lw $v0, 0x78($s0) /* 804AF0 80244270 14430011 */ bne $v0, $v1, .L802442B8 /* 804AF4 80244274 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802443E0_804C60.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802443E0_804C60.s index 2649ea7cd5..5910c5a4d3 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802443E0_804C60.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802443E0_804C60.s @@ -52,7 +52,7 @@ glabel func_802443E0_804C60 /* 804D18 80244498 0C00A8BB */ jal sin_deg /* 804D1C 8024449C 27B20068 */ addiu $s2, $sp, 0x68 /* 804D20 802444A0 46140002 */ mul.s $f0, $f0, $f20 -/* 804D24 802444A4 00000000 */ nop +/* 804D24 802444A4 00000000 */ nop /* 804D28 802444A8 0220A02D */ daddu $s4, $s1, $zero /* 804D2C 802444AC C66C0070 */ lwc1 $f12, 0x70($s3) /* 804D30 802444B0 46806320 */ cvt.s.w $f12, $f12 @@ -65,12 +65,12 @@ glabel func_802443E0_804C60 /* 804D4C 802444CC 44811000 */ mtc1 $at, $f2 /* 804D50 802444D0 8E630070 */ lw $v1, 0x70($s3) /* 804D54 802444D4 46020002 */ mul.s $f0, $f0, $f2 -/* 804D58 802444D8 00000000 */ nop +/* 804D58 802444D8 00000000 */ nop /* 804D5C 802444DC 00031080 */ sll $v0, $v1, 2 /* 804D60 802444E0 00431021 */ addu $v0, $v0, $v1 /* 804D64 802444E4 00021040 */ sll $v0, $v0, 1 /* 804D68 802444E8 4482C000 */ mtc1 $v0, $f24 -/* 804D6C 802444EC 00000000 */ nop +/* 804D6C 802444EC 00000000 */ nop /* 804D70 802444F0 4680C620 */ cvt.s.w $f24, $f24 /* 804D74 802444F4 46140700 */ add.s $f28, $f0, $f20 .L802444F8: @@ -93,7 +93,7 @@ glabel func_802443E0_804C60 /* 804DB8 80244538 0C019EC8 */ jal guRotateF /* 804DBC 8024453C E7B60010 */ swc1 $f22, 0x10($sp) /* 804DC0 80244540 44942000 */ mtc1 $s4, $f4 -/* 804DC4 80244544 00000000 */ nop +/* 804DC4 80244544 00000000 */ nop /* 804DC8 80244548 46802120 */ cvt.s.w $f4, $f4 /* 804DCC 8024454C 4406B000 */ mfc1 $a2, $f22 /* 804DD0 80244550 4407B000 */ mfc1 $a3, $f22 @@ -108,11 +108,11 @@ glabel func_802443E0_804C60 /* 804DF4 80244574 0C00A8BB */ jal sin_deg /* 804DF8 80244578 4600C306 */ mov.s $f12, $f24 /* 804DFC 8024457C 4600F502 */ mul.s $f20, $f30, $f0 -/* 804E00 80244580 00000000 */ nop +/* 804E00 80244580 00000000 */ nop /* 804E04 80244584 0C00A8D4 */ jal cos_deg /* 804E08 80244588 4600C306 */ mov.s $f12, $f24 /* 804E0C 8024458C 4600E002 */ mul.s $f0, $f28, $f0 -/* 804E10 80244590 00000000 */ nop +/* 804E10 80244590 00000000 */ nop /* 804E14 80244594 4407B000 */ mfc1 $a3, $f22 /* 804E18 80244598 44060000 */ mfc1 $a2, $f0 /* 804E1C 8024459C 4405A000 */ mfc1 $a1, $f20 @@ -146,7 +146,7 @@ glabel func_802443E0_804C60 /* 804E8C 8024460C AE620070 */ sw $v0, 0x70($s3) /* 804E90 80244610 28420010 */ slti $v0, $v0, 0x10 /* 804E94 80244614 1040000A */ beqz $v0, .L80244640 -/* 804E98 80244618 00000000 */ nop +/* 804E98 80244618 00000000 */ nop /* 804E9C 8024461C 0000882D */ daddu $s1, $zero, $zero .L80244620: /* 804EA0 80244620 8C820000 */ lw $v0, ($a0) diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244848_8050C8.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244848_8050C8.s index 5a7f51c694..977218992f 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244848_8050C8.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244848_8050C8.s @@ -13,7 +13,7 @@ glabel func_80244848_8050C8 /* 8050E4 80244864 18400009 */ blez $v0, .L8024488C /* 8050E8 80244868 AC820074 */ sw $v0, 0x74($a0) /* 8050EC 8024486C 44820000 */ mtc1 $v0, $f0 -/* 8050F0 80244870 00000000 */ nop +/* 8050F0 80244870 00000000 */ nop /* 8050F4 80244874 46800020 */ cvt.s.w $f0, $f0 /* 8050F8 80244878 44050000 */ mfc1 $a1, $f0 /* 8050FC 8024487C 0C04DF62 */ jal func_80137D88 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802449F8_805278.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802449F8_805278.s index b61a403d3a..3166545bde 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802449F8_805278.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802449F8_805278.s @@ -25,7 +25,7 @@ glabel func_802449F8_805278 /* 8052C8 80244A48 0C00FB3A */ jal get_enemy /* 8052CC 80244A4C 0040A02D */ daddu $s4, $v0, $zero /* 8052D0 80244A50 4493A000 */ mtc1 $s3, $f20 -/* 8052D4 80244A54 00000000 */ nop +/* 8052D4 80244A54 00000000 */ nop /* 8052D8 80244A58 4680A520 */ cvt.s.w $f20, $f20 /* 8052DC 80244A5C 3C014334 */ lui $at, 0x4334 /* 8052E0 80244A60 44810000 */ mtc1 $at, $f0 @@ -34,7 +34,7 @@ glabel func_802449F8_805278 /* 8052EC 80244A6C 44811000 */ mtc1 $at, $f2 /* 8052F0 80244A70 4600A503 */ div.s $f20, $f20, $f0 /* 8052F4 80244A74 4602A502 */ mul.s $f20, $f20, $f2 -/* 8052F8 80244A78 00000000 */ nop +/* 8052F8 80244A78 00000000 */ nop /* 8052FC 80244A7C 0040902D */ daddu $s2, $v0, $zero /* 805300 80244A80 0C00A85B */ jal sin_rad /* 805304 80244A84 4600A306 */ mov.s $f12, $f20 @@ -44,27 +44,27 @@ glabel func_802449F8_805278 /* 805314 80244A94 C6060084 */ lwc1 $f6, 0x84($s0) /* 805318 80244A98 468031A0 */ cvt.s.w $f6, $f6 /* 80531C 80244A9C 46003102 */ mul.s $f4, $f6, $f0 -/* 805320 80244AA0 00000000 */ nop +/* 805320 80244AA0 00000000 */ nop /* 805324 80244AA4 C6020088 */ lwc1 $f2, 0x88($s0) /* 805328 80244AA8 468010A0 */ cvt.s.w $f2, $f2 /* 80532C 80244AAC 46141202 */ mul.s $f8, $f2, $f20 -/* 805330 80244AB0 00000000 */ nop +/* 805330 80244AB0 00000000 */ nop /* 805334 80244AB4 46143182 */ mul.s $f6, $f6, $f20 -/* 805338 80244AB8 00000000 */ nop +/* 805338 80244AB8 00000000 */ nop /* 80533C 80244ABC 46001082 */ mul.s $f2, $f2, $f0 -/* 805340 80244AC0 00000000 */ nop +/* 805340 80244AC0 00000000 */ nop /* 805344 80244AC4 46082101 */ sub.s $f4, $f4, $f8 /* 805348 80244AC8 8E02008C */ lw $v0, 0x8c($s0) /* 80534C 80244ACC 46023180 */ add.s $f6, $f6, $f2 /* 805350 80244AD0 4600228D */ trunc.w.s $f10, $f4 /* 805354 80244AD4 44035000 */ mfc1 $v1, $f10 -/* 805358 80244AD8 00000000 */ nop +/* 805358 80244AD8 00000000 */ nop /* 80535C 80244ADC 00431021 */ addu $v0, $v0, $v1 /* 805360 80244AE0 AE020094 */ sw $v0, 0x94($s0) /* 805364 80244AE4 8E020090 */ lw $v0, 0x90($s0) /* 805368 80244AE8 4600328D */ trunc.w.s $f10, $f6 /* 80536C 80244AEC 44035000 */ mfc1 $v1, $f10 -/* 805370 80244AF0 00000000 */ nop +/* 805370 80244AF0 00000000 */ nop /* 805374 80244AF4 00431021 */ addu $v0, $v0, $v1 /* 805378 80244AF8 16600009 */ bnez $s3, .L80244B20 /* 80537C 80244AFC AE020098 */ sw $v0, 0x98($s0) diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244D68_8055E8.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244D68_8055E8.s index 4d0fd467f6..d4b50bc4fa 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244D68_8055E8.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244D68_8055E8.s @@ -35,7 +35,7 @@ glabel func_80244D68_8055E8 /* 805658 80244DD8 0C0B1EAF */ jal get_variable /* 80565C 80244DDC 34A55C86 */ ori $a1, $a1, 0x5c86 /* 805660 80244DE0 14400007 */ bnez $v0, .L80244E00 -/* 805664 80244DE4 00000000 */ nop +/* 805664 80244DE4 00000000 */ nop /* 805668 80244DE8 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 80566C 80244DEC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 805670 80244DF0 8C420140 */ lw $v0, 0x140($v0) diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E10_805690.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E10_805690.s index c86e9ccc3c..74efefd77f 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E10_805690.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E10_805690.s @@ -24,11 +24,11 @@ glabel func_80244E10_805690 /* 8056DC 80244E5C 8C440000 */ lw $a0, ($v0) /* 8056E0 80244E60 24630006 */ addiu $v1, $v1, 6 /* 8056E4 80244E64 44830000 */ mtc1 $v1, $f0 -/* 8056E8 80244E68 00000000 */ nop +/* 8056E8 80244E68 00000000 */ nop /* 8056EC 80244E6C 46800020 */ cvt.s.w $f0, $f0 /* 8056F0 80244E70 44070000 */ mfc1 $a3, $f0 /* 8056F4 80244E74 0C04D083 */ jal set_item_entity_position -/* 8056F8 80244E78 00000000 */ nop +/* 8056F8 80244E78 00000000 */ nop /* 8056FC 80244E7C 8FBF0014 */ lw $ra, 0x14($sp) /* 805700 80244E80 8FB00010 */ lw $s0, 0x10($sp) /* 805704 80244E84 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245028_8058A8.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245028_8058A8.s index f6e15555c0..68989096ec 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245028_8058A8.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245028_8058A8.s @@ -84,9 +84,9 @@ glabel func_80245028_8058A8 /* 8059D8 80245158 0C03D390 */ jal func_800F4E40 /* 8059DC 8024515C AFC30328 */ sw $v1, 0x328($fp) /* 8059E0 80245160 0C03A631 */ jal func_800E98C4 -/* 8059E4 80245164 00000000 */ nop +/* 8059E4 80245164 00000000 */ nop /* 8059E8 80245168 0C03A5EE */ jal func_800E97B8 -/* 8059EC 8024516C 00000000 */ nop +/* 8059EC 8024516C 00000000 */ nop /* 8059F0 80245170 AEE00070 */ sw $zero, 0x70($s7) .L80245174: /* 8059F4 80245174 8EE20070 */ lw $v0, 0x70($s7) @@ -96,20 +96,20 @@ glabel func_80245028_8058A8 /* 805A04 80245184 10400009 */ beqz $v0, .L802451AC /* 805A08 80245188 AEE20074 */ sw $v0, 0x74($s7) /* 805A0C 8024518C 0C03C4EC */ jal func_800F13B0 -/* 805A10 80245190 00000000 */ nop +/* 805A10 80245190 00000000 */ nop /* 805A14 80245194 8EE20070 */ lw $v0, 0x70($s7) /* 805A18 80245198 24420001 */ addiu $v0, $v0, 1 .L8024519C: /* 805A1C 8024519C AEE20070 */ sw $v0, 0x70($s7) /* 805A20 802451A0 28420014 */ slti $v0, $v0, 0x14 /* 805A24 802451A4 10400003 */ beqz $v0, .L802451B4 -/* 805A28 802451A8 00000000 */ nop +/* 805A28 802451A8 00000000 */ nop .L802451AC: /* 805A2C 802451AC 0809147F */ j .L802451FC /* 805A30 802451B0 0000102D */ daddu $v0, $zero, $zero .L802451B4: /* 805A34 802451B4 0C03C54E */ jal func_800F1538 -/* 805A38 802451B8 00000000 */ nop +/* 805A38 802451B8 00000000 */ nop /* 805A3C 802451BC 8EE30074 */ lw $v1, 0x74($s7) /* 805A40 802451C0 240200FF */ addiu $v0, $zero, 0xff /* 805A44 802451C4 1062000A */ beq $v1, $v0, .L802451F0 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s index d53e2af3bf..f5f54962d3 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s @@ -80,9 +80,9 @@ glabel func_8024522C_805AAC /* 805BC4 80245344 0C03D390 */ jal func_800F4E40 /* 805BC8 80245348 AEC00328 */ sw $zero, 0x328($s6) /* 805BCC 8024534C 0C03A631 */ jal func_800E98C4 -/* 805BD0 80245350 00000000 */ nop +/* 805BD0 80245350 00000000 */ nop /* 805BD4 80245354 0C03A5EE */ jal func_800E97B8 -/* 805BD8 80245358 00000000 */ nop +/* 805BD8 80245358 00000000 */ nop /* 805BDC 8024535C AEA00070 */ sw $zero, 0x70($s5) .L80245360: /* 805BE0 80245360 8EA20070 */ lw $v0, 0x70($s5) @@ -92,20 +92,20 @@ glabel func_8024522C_805AAC /* 805BF0 80245370 10400009 */ beqz $v0, .L80245398 /* 805BF4 80245374 AEA20074 */ sw $v0, 0x74($s5) /* 805BF8 80245378 0C03C4EC */ jal func_800F13B0 -/* 805BFC 8024537C 00000000 */ nop +/* 805BFC 8024537C 00000000 */ nop /* 805C00 80245380 8EA20070 */ lw $v0, 0x70($s5) /* 805C04 80245384 24420001 */ addiu $v0, $v0, 1 .L80245388: /* 805C08 80245388 AEA20070 */ sw $v0, 0x70($s5) /* 805C0C 8024538C 28420014 */ slti $v0, $v0, 0x14 /* 805C10 80245390 10400003 */ beqz $v0, .L802453A0 -/* 805C14 80245394 00000000 */ nop +/* 805C14 80245394 00000000 */ nop .L80245398: /* 805C18 80245398 08091504 */ j .L80245410 /* 805C1C 8024539C 0000102D */ daddu $v0, $zero, $zero .L802453A0: /* 805C20 802453A0 0C03C54E */ jal func_800F1538 -/* 805C24 802453A4 00000000 */ nop +/* 805C24 802453A4 00000000 */ nop /* 805C28 802453A8 8EA40074 */ lw $a0, 0x74($s5) /* 805C2C 802453AC 240200FF */ addiu $v0, $zero, 0xff /* 805C30 802453B0 10820014 */ beq $a0, $v0, .L80245404 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tabs_draw_badges_805540.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tabs_draw_badges_805540.s index e3372695d1..f2e584e534 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tabs_draw_badges_805540.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tabs_draw_badges_805540.s @@ -35,7 +35,7 @@ glabel pause_tabs_draw_badges_805540 /* 8055B0 80244D30 0C0B1EAF */ jal get_variable /* 8055B4 80244D34 34A55C86 */ ori $a1, $a1, 0x5c86 /* 8055B8 80244D38 14400007 */ bnez $v0, .L80244D58 -/* 8055BC 80244D3C 00000000 */ nop +/* 8055BC 80244D3C 00000000 */ nop /* 8055C0 80244D40 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 8055C4 80244D44 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 8055C8 80244D48 8C420140 */ lw $v0, 0x140($v0) diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tutorial_draw_contents_804074.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tutorial_draw_contents_804074.s index 3506f1ead3..24e1c44b5b 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tutorial_draw_contents_804074.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tutorial_draw_contents_804074.s @@ -22,7 +22,7 @@ glabel pause_tutorial_draw_contents_804074 /* 8040B8 80243838 0C04DF93 */ jal func_80137E4C /* 8040BC 8024383C 24070091 */ addiu $a3, $zero, 0x91 /* 8040C0 80243840 44900000 */ mtc1 $s0, $f0 -/* 8040C4 80243844 00000000 */ nop +/* 8040C4 80243844 00000000 */ nop /* 8040C8 80243848 46800020 */ cvt.s.w $f0, $f0 /* 8040CC 8024384C 44050000 */ mfc1 $a1, $f0 /* 8040D0 80243850 0C04DF62 */ jal func_80137D88 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245550_805DD0.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245550_805DD0.s index a7e2297723..8e40f12906 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245550_805DD0.s +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245550_805DD0.s @@ -45,7 +45,7 @@ glabel func_80245550_805DD0 /* 805E6C 802455EC 0C00A7B5 */ jal dist2D /* 805E70 802455F0 4600B386 */ mov.s $f14, $f22 /* 805E74 802455F4 4614003C */ c.lt.s $f0, $f20 -/* 805E78 802455F8 00000000 */ nop +/* 805E78 802455F8 00000000 */ nop /* 805E7C 802455FC 45000003 */ bc1f .L8024560C /* 805E80 80245600 2631000C */ addiu $s1, $s1, 0xc /* 805E84 80245604 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_80245550_805DD0 /* 805EB0 80245630 8E6200D0 */ lw $v0, 0xd0($s3) /* 805EB4 80245634 8C42007C */ lw $v0, 0x7c($v0) /* 805EB8 80245638 04410004 */ bgez $v0, .L8024564C -/* 805EBC 8024563C 00000000 */ nop +/* 805EBC 8024563C 00000000 */ nop /* 805EC0 80245640 C6C00000 */ lwc1 $f0, ($s6) /* 805EC4 80245644 0809159B */ j .L8024566C /* 805EC8 80245648 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_80245550_805DD0 /* 805ECC 8024564C 3C018026 */ lui $at, %hi(D_80262890) /* 805ED0 80245650 D4222890 */ ldc1 $f2, %lo(D_80262890)($at) /* 805ED4 80245654 44820000 */ mtc1 $v0, $f0 -/* 805ED8 80245658 00000000 */ nop +/* 805ED8 80245658 00000000 */ nop /* 805EDC 8024565C 46800021 */ cvt.d.w $f0, $f0 /* 805EE0 80245660 46220003 */ div.d $f0, $f0, $f2 /* 805EE4 80245664 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802456A8_805F28.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802456A8_805F28.s index 77c4bb7801..da65a398a6 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802456A8_805F28.s +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802456A8_805F28.s @@ -44,7 +44,7 @@ glabel func_802456A8_805F28 /* 805FC4 80245744 2402000F */ addiu $v0, $zero, 0xf /* 805FC8 80245748 AFA2001C */ sw $v0, 0x1c($sp) /* 805FCC 8024574C 44833000 */ mtc1 $v1, $f6 -/* 805FD0 80245750 00000000 */ nop +/* 805FD0 80245750 00000000 */ nop /* 805FD4 80245754 468031A0 */ cvt.s.w $f6, $f6 /* 805FD8 80245758 44073000 */ mfc1 $a3, $f6 /* 805FDC 8024575C 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_802456A8_805F28 .L802457AC: /* 80602C 802457AC 8602008C */ lh $v0, 0x8c($s0) /* 806030 802457B0 1440005D */ bnez $v0, .L80245928 -/* 806034 802457B4 00000000 */ nop +/* 806034 802457B4 00000000 */ nop /* 806038 802457B8 C6000018 */ lwc1 $f0, 0x18($s0) /* 80603C 802457BC 3C014010 */ lui $at, 0x4010 /* 806040 802457C0 44811800 */ mtc1 $at, $f3 /* 806044 802457C4 44801000 */ mtc1 $zero, $f2 /* 806048 802457C8 46000021 */ cvt.d.s $f0, $f0 /* 80604C 802457CC 4622003C */ c.lt.d $f0, $f2 -/* 806050 802457D0 00000000 */ nop +/* 806050 802457D0 00000000 */ nop /* 806054 802457D4 45000003 */ bc1f .L802457E4 /* 806058 802457D8 0200202D */ daddu $a0, $s0, $zero /* 80605C 802457DC 080915FA */ j .L802457E8 @@ -88,7 +88,7 @@ glabel func_802456A8_805F28 /* 806064 802457E4 24050001 */ addiu $a1, $zero, 1 .L802457E8: /* 806068 802457E8 0C00F598 */ jal func_8003D660 -/* 80606C 802457EC 00000000 */ nop +/* 80606C 802457EC 00000000 */ nop /* 806070 802457F0 C60C0038 */ lwc1 $f12, 0x38($s0) /* 806074 802457F4 8E430078 */ lw $v1, 0x78($s2) /* 806078 802457F8 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_802456A8_805F28 /* 8060A0 80245820 4406B000 */ mfc1 $a2, $f22 /* 8060A4 80245824 4407A000 */ mfc1 $a3, $f20 /* 8060A8 80245828 0C00A720 */ jal atan2 -/* 8060AC 8024582C 00000000 */ nop +/* 8060AC 8024582C 00000000 */ nop /* 8060B0 80245830 8E050018 */ lw $a1, 0x18($s0) /* 8060B4 80245834 44060000 */ mfc1 $a2, $f0 /* 8060B8 80245838 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_802456A8_805F28 /* 8060CC 8024584C 4406B000 */ mfc1 $a2, $f22 /* 8060D0 80245850 4407A000 */ mfc1 $a3, $f20 /* 8060D4 80245854 0C00A7B5 */ jal dist2D -/* 8060D8 80245858 00000000 */ nop +/* 8060D8 80245858 00000000 */ nop /* 8060DC 8024585C C6020018 */ lwc1 $f2, 0x18($s0) /* 8060E0 80245860 4602003E */ c.le.s $f0, $f2 -/* 8060E4 80245864 00000000 */ nop +/* 8060E4 80245864 00000000 */ nop /* 8060E8 80245868 4500002F */ bc1f .L80245928 /* 8060EC 8024586C 240403E8 */ addiu $a0, $zero, 0x3e8 /* 8060F0 80245870 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_802456A8_805F28 /* 806144 802458C4 18400003 */ blez $v0, .L802458D4 /* 806148 802458C8 24020004 */ addiu $v0, $zero, 4 /* 80614C 802458CC 14600002 */ bnez $v1, .L802458D8 -/* 806150 802458D0 00000000 */ nop +/* 806150 802458D0 00000000 */ nop .L802458D4: /* 806154 802458D4 AE420070 */ sw $v0, 0x70($s2) .L802458D8: diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245A10_806290.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245A10_806290.s index f0a9d1de10..186b423e5c 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245A10_806290.s +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245A10_806290.s @@ -38,7 +38,7 @@ glabel func_80245A10_806290 /* 806314 80245A94 2402000F */ addiu $v0, $zero, 0xf /* 806318 80245A98 AFA2001C */ sw $v0, 0x1c($sp) /* 80631C 80245A9C 44833000 */ mtc1 $v1, $f6 -/* 806320 80245AA0 00000000 */ nop +/* 806320 80245AA0 00000000 */ nop /* 806324 80245AA4 468031A0 */ cvt.s.w $f6, $f6 /* 806328 80245AA8 44073000 */ mfc1 $a3, $f6 /* 80632C 80245AAC 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_80245A10_806290 .L80245B10: /* 806390 80245B10 8602008C */ lh $v0, 0x8c($s0) /* 806394 80245B14 14400025 */ bnez $v0, .L80245BAC -/* 806398 80245B18 00000000 */ nop +/* 806398 80245B18 00000000 */ nop /* 80639C 80245B1C 9602008E */ lhu $v0, 0x8e($s0) /* 8063A0 80245B20 2442FFFF */ addiu $v0, $v0, -1 /* 8063A4 80245B24 A602008E */ sh $v0, 0x8e($s0) /* 8063A8 80245B28 00021400 */ sll $v0, $v0, 0x10 /* 8063AC 80245B2C 1440001F */ bnez $v0, .L80245BAC -/* 8063B0 80245B30 00000000 */ nop +/* 8063B0 80245B30 00000000 */ nop /* 8063B4 80245B34 8E820074 */ lw $v0, 0x74($s4) /* 8063B8 80245B38 2442FFFF */ addiu $v0, $v0, -1 /* 8063BC 80245B3C 10400019 */ beqz $v0, .L80245BA4 @@ -84,7 +84,7 @@ glabel func_80245A10_806290 /* 8063C8 80245B48 9442002A */ lhu $v0, 0x2a($v0) /* 8063CC 80245B4C 30420010 */ andi $v0, $v0, 0x10 /* 8063D0 80245B50 14400007 */ bnez $v0, .L80245B70 -/* 8063D4 80245B54 00000000 */ nop +/* 8063D4 80245B54 00000000 */ nop /* 8063D8 80245B58 C600000C */ lwc1 $f0, 0xc($s0) /* 8063DC 80245B5C 3C014334 */ lui $at, 0x4334 /* 8063E0 80245B60 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245BCC_80644C.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245BCC_80644C.s index 20afdfa69e..5ec765808a 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245BCC_80644C.s +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245BCC_80644C.s @@ -28,7 +28,7 @@ glabel func_80245BCC_80644C /* 8064A4 80245C24 8E0200D0 */ lw $v0, 0xd0($s0) /* 8064A8 80245C28 8C42007C */ lw $v0, 0x7c($v0) /* 8064AC 80245C2C 04410004 */ bgez $v0, .L80245C40 -/* 8064B0 80245C30 00000000 */ nop +/* 8064B0 80245C30 00000000 */ nop /* 8064B4 80245C34 C6400000 */ lwc1 $f0, ($s2) /* 8064B8 80245C38 08091718 */ j .L80245C60 /* 8064BC 80245C3C E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_80245BCC_80644C /* 8064C0 80245C40 3C018026 */ lui $at, %hi(D_80262898) /* 8064C4 80245C44 D4222898 */ ldc1 $f2, %lo(D_80262898)($at) /* 8064C8 80245C48 44820000 */ mtc1 $v0, $f0 -/* 8064CC 80245C4C 00000000 */ nop +/* 8064CC 80245C4C 00000000 */ nop /* 8064D0 80245C50 46800021 */ cvt.d.w $f0, $f0 /* 8064D4 80245C54 46220003 */ div.d $f0, $f0, $f2 /* 8064D8 80245C58 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245D6C_8065EC.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245D6C_8065EC.s index 332014a703..7fd658eaaa 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245D6C_8065EC.s +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245D6C_8065EC.s @@ -47,20 +47,20 @@ glabel func_80245D6C_8065EC /* 806694 80245E14 8E02001C */ lw $v0, 0x1c($s0) /* 806698 80245E18 46001005 */ abs.s $f0, $f2 /* 80669C 80245E1C 44822000 */ mtc1 $v0, $f4 -/* 8066A0 80245E20 00000000 */ nop +/* 8066A0 80245E20 00000000 */ nop /* 8066A4 80245E24 46802120 */ cvt.s.w $f4, $f4 /* 8066A8 80245E28 4600203C */ c.lt.s $f4, $f0 -/* 8066AC 80245E2C 00000000 */ nop +/* 8066AC 80245E2C 00000000 */ nop /* 8066B0 80245E30 4500000D */ bc1f .L80245E68 -/* 8066B4 80245E34 00000000 */ nop +/* 8066B4 80245E34 00000000 */ nop /* 8066B8 80245E38 44800000 */ mtc1 $zero, $f0 /* 8066BC 80245E3C C654000C */ lwc1 $f20, 0xc($s2) /* 8066C0 80245E40 4600103C */ c.lt.s $f2, $f0 -/* 8066C4 80245E44 00000000 */ nop +/* 8066C4 80245E44 00000000 */ nop /* 8066C8 80245E48 45000006 */ bc1f .L80245E64 /* 8066CC 80245E4C 00021023 */ negu $v0, $v0 /* 8066D0 80245E50 44820000 */ mtc1 $v0, $f0 -/* 8066D4 80245E54 00000000 */ nop +/* 8066D4 80245E54 00000000 */ nop /* 8066D8 80245E58 46800020 */ cvt.s.w $f0, $f0 /* 8066DC 80245E5C 0809179A */ j .L80245E68 /* 8066E0 80245E60 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245E9C_80671C.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245E9C_80671C.s index d5d36758cb..8939da1fa2 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245E9C_80671C.s +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245E9C_80671C.s @@ -37,7 +37,7 @@ glabel func_80245E9C_80671C /* 80679C 80245F1C 2402000F */ addiu $v0, $zero, 0xf /* 8067A0 80245F20 AFA2001C */ sw $v0, 0x1c($sp) /* 8067A4 80245F24 44833000 */ mtc1 $v1, $f6 -/* 8067A8 80245F28 00000000 */ nop +/* 8067A8 80245F28 00000000 */ nop /* 8067AC 80245F2C 468031A0 */ cvt.s.w $f6, $f6 /* 8067B0 80245F30 44073000 */ mfc1 $a3, $f6 /* 8067B4 80245F34 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80246024_8068A4.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80246024_8068A4.s index db7fe2872a..ff693c8838 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80246024_8068A4.s +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80246024_8068A4.s @@ -28,7 +28,7 @@ glabel func_80246024_8068A4 /* 8068FC 8024607C C4400008 */ lwc1 $f0, 8($v0) /* 806900 80246080 46800020 */ cvt.s.w $f0, $f0 /* 806904 80246084 4602003E */ c.le.s $f0, $f2 -/* 806908 80246088 00000000 */ nop +/* 806908 80246088 00000000 */ nop /* 80690C 8024608C 45020003 */ bc1fl .L8024609C /* 806910 80246090 24840001 */ addiu $a0, $a0, 1 /* 806914 80246094 0809182B */ j .L802460AC diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s index a3f1490a35..10238a7625 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s @@ -46,7 +46,7 @@ glabel func_802460E4_806964 /* 806A08 80246188 8E2200B0 */ lw $v0, 0xb0($s1) /* 806A0C 8024618C 30420004 */ andi $v0, $v0, 4 /* 806A10 80246190 10400044 */ beqz $v0, .L802462A4 -/* 806A14 80246194 00000000 */ nop +/* 806A14 80246194 00000000 */ nop .L80246198: /* 806A18 80246198 2404F7FF */ addiu $a0, $zero, -0x801 /* 806A1C 8024619C AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_802460E4_806964 /* 806AD0 80246250 3C0142C8 */ lui $at, 0x42c8 /* 806AD4 80246254 44812000 */ mtc1 $at, $f4 /* 806AD8 80246258 44823000 */ mtc1 $v0, $f6 -/* 806ADC 8024625C 00000000 */ nop +/* 806ADC 8024625C 00000000 */ nop /* 806AE0 80246260 468031A0 */ cvt.s.w $f6, $f6 /* 806AE4 80246264 27A20044 */ addiu $v0, $sp, 0x44 /* 806AE8 80246268 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_802460E4_806964 /* 806B0C 8024628C 0C0372DF */ jal func_800DCB7C /* 806B10 80246290 27A70040 */ addiu $a3, $sp, 0x40 /* 806B14 80246294 10400003 */ beqz $v0, .L802462A4 -/* 806B18 80246298 00000000 */ nop +/* 806B18 80246298 00000000 */ nop /* 806B1C 8024629C C7A0003C */ lwc1 $f0, 0x3c($sp) /* 806B20 802462A0 E640003C */ swc1 $f0, 0x3c($s2) .L802462A4: @@ -124,72 +124,85 @@ glabel func_802460E4_806964 /* 806B28 802462A8 2C620064 */ sltiu $v0, $v1, 0x64 /* 806B2C 802462AC 10400042 */ beqz $v0, .L802463B8 /* 806B30 802462B0 00031080 */ sll $v0, $v1, 2 -/* 806B34 802462B4 3C018026 */ lui $at, %hi(D_802628A0) +/* 806B34 802462B4 3C018026 */ lui $at, %hi(jtbl_802628A0_823120) /* 806B38 802462B8 00220821 */ addu $at, $at, $v0 -/* 806B3C 802462BC 8C2228A0 */ lw $v0, %lo(D_802628A0)($at) +/* 806B3C 802462BC 8C2228A0 */ lw $v0, %lo(jtbl_802628A0_823120)($at) /* 806B40 802462C0 00400008 */ jr $v0 -/* 806B44 802462C4 00000000 */ nop +/* 806B44 802462C4 00000000 */ nop +glabel L802462C8_806B48 /* 806B48 802462C8 0280202D */ daddu $a0, $s4, $zero /* 806B4C 802462CC 0260282D */ daddu $a1, $s3, $zero /* 806B50 802462D0 0C091554 */ jal func_80245550_805DD0 /* 806B54 802462D4 02A0302D */ daddu $a2, $s5, $zero +glabel L802462D8_806B58 /* 806B58 802462D8 0280202D */ daddu $a0, $s4, $zero /* 806B5C 802462DC 0260282D */ daddu $a1, $s3, $zero /* 806B60 802462E0 0C0915AA */ jal func_802456A8_805F28 /* 806B64 802462E4 02A0302D */ daddu $a2, $s5, $zero /* 806B68 802462E8 080918EE */ j .L802463B8 -/* 806B6C 802462EC 00000000 */ nop +/* 806B6C 802462EC 00000000 */ nop +glabel L802462F0_806B70 /* 806B70 802462F0 0280202D */ daddu $a0, $s4, $zero /* 806B74 802462F4 0260282D */ daddu $a1, $s3, $zero /* 806B78 802462F8 0C091654 */ jal func_80245950_8061D0 /* 806B7C 802462FC 02A0302D */ daddu $a2, $s5, $zero +glabel L80246300_806B80 /* 806B80 80246300 0280202D */ daddu $a0, $s4, $zero /* 806B84 80246304 0260282D */ daddu $a1, $s3, $zero /* 806B88 80246308 0C091684 */ jal func_80245A10_806290 /* 806B8C 8024630C 02A0302D */ daddu $a2, $s5, $zero /* 806B90 80246310 080918EE */ j .L802463B8 -/* 806B94 80246314 00000000 */ nop +/* 806B94 80246314 00000000 */ nop +glabel L80246318_806B98 /* 806B98 80246318 0280202D */ daddu $a0, $s4, $zero /* 806B9C 8024631C 0260282D */ daddu $a1, $s3, $zero /* 806BA0 80246320 0C0916F3 */ jal func_80245BCC_80644C /* 806BA4 80246324 02A0302D */ daddu $a2, $s5, $zero /* 806BA8 80246328 080918EE */ j .L802463B8 -/* 806BAC 8024632C 00000000 */ nop +/* 806BAC 8024632C 00000000 */ nop +glabel L80246330_806BB0 /* 806BB0 80246330 0280202D */ daddu $a0, $s4, $zero /* 806BB4 80246334 0260282D */ daddu $a1, $s3, $zero /* 806BB8 80246338 0C091720 */ jal mac_01_NpcJumpFunc2 /* 806BBC 8024633C 02A0302D */ daddu $a2, $s5, $zero +glabel L80246340_806BC0 /* 806BC0 80246340 0280202D */ daddu $a0, $s4, $zero /* 806BC4 80246344 0260282D */ daddu $a1, $s3, $zero /* 806BC8 80246348 0C09173D */ jal mac_01_NpcJumpFunc /* 806BCC 8024634C 02A0302D */ daddu $a2, $s5, $zero /* 806BD0 80246350 080918EE */ j .L802463B8 -/* 806BD4 80246354 00000000 */ nop +/* 806BD4 80246354 00000000 */ nop +glabel L80246358_806BD8 /* 806BD8 80246358 0280202D */ daddu $a0, $s4, $zero /* 806BDC 8024635C 0260282D */ daddu $a1, $s3, $zero /* 806BE0 80246360 0C09175B */ jal func_80245D6C_8065EC /* 806BE4 80246364 02A0302D */ daddu $a2, $s5, $zero +glabel L80246368_806BE8 /* 806BE8 80246368 0280202D */ daddu $a0, $s4, $zero /* 806BEC 8024636C 0260282D */ daddu $a1, $s3, $zero /* 806BF0 80246370 0C0917A7 */ jal func_80245E9C_80671C /* 806BF4 80246374 02A0302D */ daddu $a2, $s5, $zero /* 806BF8 80246378 080918EE */ j .L802463B8 -/* 806BFC 8024637C 00000000 */ nop +/* 806BFC 8024637C 00000000 */ nop +glabel L80246380_806C00 /* 806C00 80246380 0280202D */ daddu $a0, $s4, $zero /* 806C04 80246384 0260282D */ daddu $a1, $s3, $zero /* 806C08 80246388 0C0917EF */ jal mac_01_UnkNpcDurationFlagFunc /* 806C0C 8024638C 02A0302D */ daddu $a2, $s5, $zero /* 806C10 80246390 080918EE */ j .L802463B8 -/* 806C14 80246394 00000000 */ nop +/* 806C14 80246394 00000000 */ nop +glabel L80246398_806C18 /* 806C18 80246398 0280202D */ daddu $a0, $s4, $zero /* 806C1C 8024639C 0260282D */ daddu $a1, $s3, $zero /* 806C20 802463A0 0C091809 */ jal func_80246024_8068A4 /* 806C24 802463A4 02A0302D */ daddu $a2, $s5, $zero /* 806C28 802463A8 080918EE */ j .L802463B8 -/* 806C2C 802463AC 00000000 */ nop +/* 806C2C 802463AC 00000000 */ nop +glabel L802463B0_806C30 /* 806C30 802463B0 0C0129CF */ jal func_8004A73C /* 806C34 802463B4 0280202D */ daddu $a0, $s4, $zero .L802463B8: +glabel L802463B8_806C38 /* 806C38 802463B8 8FBF0060 */ lw $ra, 0x60($sp) /* 806C3C 802463BC 8FB5005C */ lw $s5, 0x5c($sp) /* 806C40 802463C0 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802463E0_806C60.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802463E0_806C60.s index f525810206..aa11782814 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802463E0_806C60.s +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802463E0_806C60.s @@ -35,7 +35,7 @@ glabel func_802463E0_806C60 /* 806CD0 80246450 0C0B1EAF */ jal get_variable /* 806CD4 80246454 34A55C86 */ ori $a1, $a1, 0x5c86 /* 806CD8 80246458 14400007 */ bnez $v0, .L80246478 -/* 806CDC 8024645C 00000000 */ nop +/* 806CDC 8024645C 00000000 */ nop /* 806CE0 80246460 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 806CE4 80246464 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 806CE8 80246468 8C420140 */ lw $v0, 0x140($v0) @@ -47,5 +47,5 @@ glabel func_802463E0_806C60 /* 806CFC 8024647C 24020002 */ addiu $v0, $zero, 2 /* 806D00 80246480 03E00008 */ jr $ra /* 806D04 80246484 27BD0018 */ addiu $sp, $sp, 0x18 -/* 806D08 80246488 00000000 */ nop -/* 806D0C 8024648C 00000000 */ nop +/* 806D08 80246488 00000000 */ nop +/* 806D0C 8024648C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_80240034_8232F4.s b/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_80240034_8232F4.s index cb37d6b0fc..3784af4539 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_80240034_8232F4.s +++ b/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_80240034_8232F4.s @@ -22,16 +22,16 @@ glabel func_80240034_8232F4 /* 823334 80240074 00021023 */ negu $v0, $v0 .L80240078: /* 823338 80240078 14400003 */ bnez $v0, .L80240088 -/* 82333C 8024007C 00000000 */ nop +/* 82333C 8024007C 00000000 */ nop /* 823340 80240080 50E00017 */ beql $a3, $zero, .L802400E0 /* 823344 80240084 0000102D */ daddu $v0, $zero, $zero .L80240088: /* 823348 80240088 44822000 */ mtc1 $v0, $f4 -/* 82334C 8024008C 00000000 */ nop +/* 82334C 8024008C 00000000 */ nop /* 823350 80240090 46802120 */ cvt.s.w $f4, $f4 /* 823354 80240094 44062000 */ mfc1 $a2, $f4 /* 823358 80240098 44872000 */ mtc1 $a3, $f4 -/* 82335C 8024009C 00000000 */ nop +/* 82335C 8024009C 00000000 */ nop /* 823360 802400A0 46802120 */ cvt.s.w $f4, $f4 /* 823364 802400A4 44806000 */ mtc1 $zero, $f12 /* 823368 802400A8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240034_8232F4 /* 823370 802400B0 46006386 */ mov.s $f14, $f12 /* 823374 802400B4 3C014270 */ lui $at, 0x4270 /* 823378 802400B8 44811000 */ mtc1 $at, $f2 -/* 82337C 802400BC 00000000 */ nop +/* 82337C 802400BC 00000000 */ nop /* 823380 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 823384 802400C4 00000000 */ nop +/* 823384 802400C4 00000000 */ nop /* 823388 802400C8 45000004 */ bc1f .L802400DC /* 82338C 802400CC 24020001 */ addiu $v0, $zero, 1 /* 823390 802400D0 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_mac/mac_02/8238B0/func_802405F0_8238B0.s b/asm/nonmatchings/world/area_mac/mac_02/8238B0/func_802405F0_8238B0.s index 0d2e401a3a..405607cfc9 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/8238B0/func_802405F0_8238B0.s +++ b/asm/nonmatchings/world/area_mac/mac_02/8238B0/func_802405F0_8238B0.s @@ -36,7 +36,7 @@ glabel func_802405F0_8238B0 /* 823928 80240668 26100001 */ addiu $s0, $s0, 1 /* 82392C 8024066C 806200A4 */ lb $v0, 0xa4($v1) /* 823930 80240670 10520003 */ beq $v0, $s2, .L80240680 -/* 823934 80240674 00000000 */ nop +/* 823934 80240674 00000000 */ nop /* 823938 80240678 00911025 */ or $v0, $a0, $s1 /* 82393C 8024067C AC620000 */ sw $v0, ($v1) .L80240680: @@ -49,6 +49,6 @@ glabel func_802405F0_8238B0 /* 823958 80240698 8FB00010 */ lw $s0, 0x10($sp) /* 82395C 8024069C 03E00008 */ jr $ra /* 823960 802406A0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 823964 802406A4 00000000 */ nop -/* 823968 802406A8 00000000 */ nop -/* 82396C 802406AC 00000000 */ nop +/* 823964 802406A4 00000000 */ nop +/* 823968 802406A8 00000000 */ nop +/* 82396C 802406AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240930_823BF0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240930_823BF0.s index fd576b385b..170452daff 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240930_823BF0.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240930_823BF0.s @@ -45,7 +45,7 @@ glabel func_80240930_823BF0 /* 823C8C 802409CC 0C00A7B5 */ jal dist2D /* 823C90 802409D0 4600B386 */ mov.s $f14, $f22 /* 823C94 802409D4 4614003C */ c.lt.s $f0, $f20 -/* 823C98 802409D8 00000000 */ nop +/* 823C98 802409D8 00000000 */ nop /* 823C9C 802409DC 45000003 */ bc1f .L802409EC /* 823CA0 802409E0 2631000C */ addiu $s1, $s1, 0xc /* 823CA4 802409E4 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_80240930_823BF0 /* 823CD0 80240A10 8E6200D0 */ lw $v0, 0xd0($s3) /* 823CD4 80240A14 8C42007C */ lw $v0, 0x7c($v0) /* 823CD8 80240A18 04410004 */ bgez $v0, .L80240A2C -/* 823CDC 80240A1C 00000000 */ nop +/* 823CDC 80240A1C 00000000 */ nop /* 823CE0 80240A20 C6C00000 */ lwc1 $f0, ($s6) /* 823CE4 80240A24 08090293 */ j .L80240A4C /* 823CE8 80240A28 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_80240930_823BF0 /* 823CEC 80240A2C 3C018025 */ lui $at, %hi(D_8024E200) /* 823CF0 80240A30 D422E200 */ ldc1 $f2, %lo(D_8024E200)($at) /* 823CF4 80240A34 44820000 */ mtc1 $v0, $f0 -/* 823CF8 80240A38 00000000 */ nop +/* 823CF8 80240A38 00000000 */ nop /* 823CFC 80240A3C 46800021 */ cvt.d.w $f0, $f0 /* 823D00 80240A40 46220003 */ div.d $f0, $f0, $f2 /* 823D04 80240A44 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240A88_823D48.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240A88_823D48.s index c214f1dbe3..c38b57b642 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240A88_823D48.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240A88_823D48.s @@ -44,7 +44,7 @@ glabel func_80240A88_823D48 /* 823DE4 80240B24 2402000F */ addiu $v0, $zero, 0xf /* 823DE8 80240B28 AFA2001C */ sw $v0, 0x1c($sp) /* 823DEC 80240B2C 44833000 */ mtc1 $v1, $f6 -/* 823DF0 80240B30 00000000 */ nop +/* 823DF0 80240B30 00000000 */ nop /* 823DF4 80240B34 468031A0 */ cvt.s.w $f6, $f6 /* 823DF8 80240B38 44073000 */ mfc1 $a3, $f6 /* 823DFC 80240B3C 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_80240A88_823D48 .L80240B8C: /* 823E4C 80240B8C 8602008C */ lh $v0, 0x8c($s0) /* 823E50 80240B90 1440005D */ bnez $v0, .L80240D08 -/* 823E54 80240B94 00000000 */ nop +/* 823E54 80240B94 00000000 */ nop /* 823E58 80240B98 C6000018 */ lwc1 $f0, 0x18($s0) /* 823E5C 80240B9C 3C014010 */ lui $at, 0x4010 /* 823E60 80240BA0 44811800 */ mtc1 $at, $f3 /* 823E64 80240BA4 44801000 */ mtc1 $zero, $f2 /* 823E68 80240BA8 46000021 */ cvt.d.s $f0, $f0 /* 823E6C 80240BAC 4622003C */ c.lt.d $f0, $f2 -/* 823E70 80240BB0 00000000 */ nop +/* 823E70 80240BB0 00000000 */ nop /* 823E74 80240BB4 45000003 */ bc1f .L80240BC4 /* 823E78 80240BB8 0200202D */ daddu $a0, $s0, $zero /* 823E7C 80240BBC 080902F2 */ j .L80240BC8 @@ -88,7 +88,7 @@ glabel func_80240A88_823D48 /* 823E84 80240BC4 24050001 */ addiu $a1, $zero, 1 .L80240BC8: /* 823E88 80240BC8 0C00F598 */ jal func_8003D660 -/* 823E8C 80240BCC 00000000 */ nop +/* 823E8C 80240BCC 00000000 */ nop /* 823E90 80240BD0 C60C0038 */ lwc1 $f12, 0x38($s0) /* 823E94 80240BD4 8E430078 */ lw $v1, 0x78($s2) /* 823E98 80240BD8 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_80240A88_823D48 /* 823EC0 80240C00 4406B000 */ mfc1 $a2, $f22 /* 823EC4 80240C04 4407A000 */ mfc1 $a3, $f20 /* 823EC8 80240C08 0C00A720 */ jal atan2 -/* 823ECC 80240C0C 00000000 */ nop +/* 823ECC 80240C0C 00000000 */ nop /* 823ED0 80240C10 8E050018 */ lw $a1, 0x18($s0) /* 823ED4 80240C14 44060000 */ mfc1 $a2, $f0 /* 823ED8 80240C18 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_80240A88_823D48 /* 823EEC 80240C2C 4406B000 */ mfc1 $a2, $f22 /* 823EF0 80240C30 4407A000 */ mfc1 $a3, $f20 /* 823EF4 80240C34 0C00A7B5 */ jal dist2D -/* 823EF8 80240C38 00000000 */ nop +/* 823EF8 80240C38 00000000 */ nop /* 823EFC 80240C3C C6020018 */ lwc1 $f2, 0x18($s0) /* 823F00 80240C40 4602003E */ c.le.s $f0, $f2 -/* 823F04 80240C44 00000000 */ nop +/* 823F04 80240C44 00000000 */ nop /* 823F08 80240C48 4500002F */ bc1f .L80240D08 /* 823F0C 80240C4C 240403E8 */ addiu $a0, $zero, 0x3e8 /* 823F10 80240C50 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_80240A88_823D48 /* 823F64 80240CA4 18400003 */ blez $v0, .L80240CB4 /* 823F68 80240CA8 24020004 */ addiu $v0, $zero, 4 /* 823F6C 80240CAC 14600002 */ bnez $v1, .L80240CB8 -/* 823F70 80240CB0 00000000 */ nop +/* 823F70 80240CB0 00000000 */ nop .L80240CB4: /* 823F74 80240CB4 AE420070 */ sw $v0, 0x70($s2) .L80240CB8: diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240DF0_8240B0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240DF0_8240B0.s index bee1bf75a7..5675eb7dc4 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240DF0_8240B0.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240DF0_8240B0.s @@ -38,7 +38,7 @@ glabel func_80240DF0_8240B0 /* 824134 80240E74 2402000F */ addiu $v0, $zero, 0xf /* 824138 80240E78 AFA2001C */ sw $v0, 0x1c($sp) /* 82413C 80240E7C 44833000 */ mtc1 $v1, $f6 -/* 824140 80240E80 00000000 */ nop +/* 824140 80240E80 00000000 */ nop /* 824144 80240E84 468031A0 */ cvt.s.w $f6, $f6 /* 824148 80240E88 44073000 */ mfc1 $a3, $f6 /* 82414C 80240E8C 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_80240DF0_8240B0 .L80240EF0: /* 8241B0 80240EF0 8602008C */ lh $v0, 0x8c($s0) /* 8241B4 80240EF4 14400025 */ bnez $v0, .L80240F8C -/* 8241B8 80240EF8 00000000 */ nop +/* 8241B8 80240EF8 00000000 */ nop /* 8241BC 80240EFC 9602008E */ lhu $v0, 0x8e($s0) /* 8241C0 80240F00 2442FFFF */ addiu $v0, $v0, -1 /* 8241C4 80240F04 A602008E */ sh $v0, 0x8e($s0) /* 8241C8 80240F08 00021400 */ sll $v0, $v0, 0x10 /* 8241CC 80240F0C 1440001F */ bnez $v0, .L80240F8C -/* 8241D0 80240F10 00000000 */ nop +/* 8241D0 80240F10 00000000 */ nop /* 8241D4 80240F14 8E820074 */ lw $v0, 0x74($s4) /* 8241D8 80240F18 2442FFFF */ addiu $v0, $v0, -1 /* 8241DC 80240F1C 10400019 */ beqz $v0, .L80240F84 @@ -84,7 +84,7 @@ glabel func_80240DF0_8240B0 /* 8241E8 80240F28 9442002A */ lhu $v0, 0x2a($v0) /* 8241EC 80240F2C 30420010 */ andi $v0, $v0, 0x10 /* 8241F0 80240F30 14400007 */ bnez $v0, .L80240F50 -/* 8241F4 80240F34 00000000 */ nop +/* 8241F4 80240F34 00000000 */ nop /* 8241F8 80240F38 C600000C */ lwc1 $f0, 0xc($s0) /* 8241FC 80240F3C 3C014334 */ lui $at, 0x4334 /* 824200 80240F40 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240FAC_82426C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240FAC_82426C.s index 6b09622bf6..20c6766618 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240FAC_82426C.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240FAC_82426C.s @@ -28,7 +28,7 @@ glabel func_80240FAC_82426C /* 8242C4 80241004 8E0200D0 */ lw $v0, 0xd0($s0) /* 8242C8 80241008 8C42007C */ lw $v0, 0x7c($v0) /* 8242CC 8024100C 04410004 */ bgez $v0, .L80241020 -/* 8242D0 80241010 00000000 */ nop +/* 8242D0 80241010 00000000 */ nop /* 8242D4 80241014 C6400000 */ lwc1 $f0, ($s2) /* 8242D8 80241018 08090410 */ j .L80241040 /* 8242DC 8024101C E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_80240FAC_82426C /* 8242E0 80241020 3C018025 */ lui $at, %hi(D_8024E208) /* 8242E4 80241024 D422E208 */ ldc1 $f2, %lo(D_8024E208)($at) /* 8242E8 80241028 44820000 */ mtc1 $v0, $f0 -/* 8242EC 8024102C 00000000 */ nop +/* 8242EC 8024102C 00000000 */ nop /* 8242F0 80241030 46800021 */ cvt.d.w $f0, $f0 /* 8242F4 80241034 46220003 */ div.d $f0, $f0, $f2 /* 8242F8 80241038 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024114C_82440C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024114C_82440C.s index 780749088d..f5058c22eb 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024114C_82440C.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024114C_82440C.s @@ -47,20 +47,20 @@ glabel func_8024114C_82440C /* 8244B4 802411F4 8E02001C */ lw $v0, 0x1c($s0) /* 8244B8 802411F8 46001005 */ abs.s $f0, $f2 /* 8244BC 802411FC 44822000 */ mtc1 $v0, $f4 -/* 8244C0 80241200 00000000 */ nop +/* 8244C0 80241200 00000000 */ nop /* 8244C4 80241204 46802120 */ cvt.s.w $f4, $f4 /* 8244C8 80241208 4600203C */ c.lt.s $f4, $f0 -/* 8244CC 8024120C 00000000 */ nop +/* 8244CC 8024120C 00000000 */ nop /* 8244D0 80241210 4500000D */ bc1f .L80241248 -/* 8244D4 80241214 00000000 */ nop +/* 8244D4 80241214 00000000 */ nop /* 8244D8 80241218 44800000 */ mtc1 $zero, $f0 /* 8244DC 8024121C C654000C */ lwc1 $f20, 0xc($s2) /* 8244E0 80241220 4600103C */ c.lt.s $f2, $f0 -/* 8244E4 80241224 00000000 */ nop +/* 8244E4 80241224 00000000 */ nop /* 8244E8 80241228 45000006 */ bc1f .L80241244 /* 8244EC 8024122C 00021023 */ negu $v0, $v0 /* 8244F0 80241230 44820000 */ mtc1 $v0, $f0 -/* 8244F4 80241234 00000000 */ nop +/* 8244F4 80241234 00000000 */ nop /* 8244F8 80241238 46800020 */ cvt.s.w $f0, $f0 /* 8244FC 8024123C 08090492 */ j .L80241248 /* 824500 80241240 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024127C_82453C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024127C_82453C.s index 57e6efe435..7c327cc557 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024127C_82453C.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024127C_82453C.s @@ -37,7 +37,7 @@ glabel func_8024127C_82453C /* 8245BC 802412FC 2402000F */ addiu $v0, $zero, 0xf /* 8245C0 80241300 AFA2001C */ sw $v0, 0x1c($sp) /* 8245C4 80241304 44833000 */ mtc1 $v1, $f6 -/* 8245C8 80241308 00000000 */ nop +/* 8245C8 80241308 00000000 */ nop /* 8245CC 8024130C 468031A0 */ cvt.s.w $f6, $f6 /* 8245D0 80241310 44073000 */ mfc1 $a3, $f6 /* 8245D4 80241314 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241404_8246C4.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241404_8246C4.s index 79ff650799..8c2168be25 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241404_8246C4.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241404_8246C4.s @@ -28,7 +28,7 @@ glabel func_80241404_8246C4 /* 82471C 8024145C C4400008 */ lwc1 $f0, 8($v0) /* 824720 80241460 46800020 */ cvt.s.w $f0, $f0 /* 824724 80241464 4602003E */ c.le.s $f0, $f2 -/* 824728 80241468 00000000 */ nop +/* 824728 80241468 00000000 */ nop /* 82472C 8024146C 45020003 */ bc1fl .L8024147C /* 824730 80241470 24840001 */ addiu $a0, $a0, 1 /* 824734 80241474 08090523 */ j .L8024148C diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s index c013e33e15..a8be85273b 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s @@ -46,7 +46,7 @@ glabel func_802414C4_824784 /* 824828 80241568 8E2200B0 */ lw $v0, 0xb0($s1) /* 82482C 8024156C 30420004 */ andi $v0, $v0, 4 /* 824830 80241570 10400044 */ beqz $v0, .L80241684 -/* 824834 80241574 00000000 */ nop +/* 824834 80241574 00000000 */ nop .L80241578: /* 824838 80241578 2404F7FF */ addiu $a0, $zero, -0x801 /* 82483C 8024157C AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_802414C4_824784 /* 8248F0 80241630 3C0142C8 */ lui $at, 0x42c8 /* 8248F4 80241634 44812000 */ mtc1 $at, $f4 /* 8248F8 80241638 44823000 */ mtc1 $v0, $f6 -/* 8248FC 8024163C 00000000 */ nop +/* 8248FC 8024163C 00000000 */ nop /* 824900 80241640 468031A0 */ cvt.s.w $f6, $f6 /* 824904 80241644 27A20044 */ addiu $v0, $sp, 0x44 /* 824908 80241648 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_802414C4_824784 /* 82492C 8024166C 0C0372DF */ jal func_800DCB7C /* 824930 80241670 27A70040 */ addiu $a3, $sp, 0x40 /* 824934 80241674 10400003 */ beqz $v0, .L80241684 -/* 824938 80241678 00000000 */ nop +/* 824938 80241678 00000000 */ nop /* 82493C 8024167C C7A0003C */ lwc1 $f0, 0x3c($sp) /* 824940 80241680 E640003C */ swc1 $f0, 0x3c($s2) .L80241684: @@ -124,72 +124,85 @@ glabel func_802414C4_824784 /* 824948 80241688 2C620064 */ sltiu $v0, $v1, 0x64 /* 82494C 8024168C 10400042 */ beqz $v0, .L80241798 /* 824950 80241690 00031080 */ sll $v0, $v1, 2 -/* 824954 80241694 3C018025 */ lui $at, %hi(D_8024E210) +/* 824954 80241694 3C018025 */ lui $at, %hi(jtbl_8024E210_8314D0) /* 824958 80241698 00220821 */ addu $at, $at, $v0 -/* 82495C 8024169C 8C22E210 */ lw $v0, %lo(D_8024E210)($at) +/* 82495C 8024169C 8C22E210 */ lw $v0, %lo(jtbl_8024E210_8314D0)($at) /* 824960 802416A0 00400008 */ jr $v0 -/* 824964 802416A4 00000000 */ nop +/* 824964 802416A4 00000000 */ nop +glabel L802416A8_824968 /* 824968 802416A8 0280202D */ daddu $a0, $s4, $zero /* 82496C 802416AC 0260282D */ daddu $a1, $s3, $zero /* 824970 802416B0 0C09024C */ jal func_80240930_823BF0 /* 824974 802416B4 02A0302D */ daddu $a2, $s5, $zero +glabel L802416B8_824978 /* 824978 802416B8 0280202D */ daddu $a0, $s4, $zero /* 82497C 802416BC 0260282D */ daddu $a1, $s3, $zero /* 824980 802416C0 0C0902A2 */ jal func_80240A88_823D48 /* 824984 802416C4 02A0302D */ daddu $a2, $s5, $zero /* 824988 802416C8 080905E6 */ j .L80241798 -/* 82498C 802416CC 00000000 */ nop +/* 82498C 802416CC 00000000 */ nop +glabel L802416D0_824990 /* 824990 802416D0 0280202D */ daddu $a0, $s4, $zero /* 824994 802416D4 0260282D */ daddu $a1, $s3, $zero /* 824998 802416D8 0C09034C */ jal mac_02_UnkNpcAIFunc1 /* 82499C 802416DC 02A0302D */ daddu $a2, $s5, $zero +glabel L802416E0_8249A0 /* 8249A0 802416E0 0280202D */ daddu $a0, $s4, $zero /* 8249A4 802416E4 0260282D */ daddu $a1, $s3, $zero /* 8249A8 802416E8 0C09037C */ jal func_80240DF0_8240B0 /* 8249AC 802416EC 02A0302D */ daddu $a2, $s5, $zero /* 8249B0 802416F0 080905E6 */ j .L80241798 -/* 8249B4 802416F4 00000000 */ nop +/* 8249B4 802416F4 00000000 */ nop +glabel L802416F8_8249B8 /* 8249B8 802416F8 0280202D */ daddu $a0, $s4, $zero /* 8249BC 802416FC 0260282D */ daddu $a1, $s3, $zero /* 8249C0 80241700 0C0903EB */ jal func_80240FAC_82426C /* 8249C4 80241704 02A0302D */ daddu $a2, $s5, $zero /* 8249C8 80241708 080905E6 */ j .L80241798 -/* 8249CC 8024170C 00000000 */ nop +/* 8249CC 8024170C 00000000 */ nop +glabel L80241710_8249D0 /* 8249D0 80241710 0280202D */ daddu $a0, $s4, $zero /* 8249D4 80241714 0260282D */ daddu $a1, $s3, $zero /* 8249D8 80241718 0C090418 */ jal mac_02_NpcJumpFunc2 /* 8249DC 8024171C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241720_8249E0 /* 8249E0 80241720 0280202D */ daddu $a0, $s4, $zero /* 8249E4 80241724 0260282D */ daddu $a1, $s3, $zero /* 8249E8 80241728 0C090435 */ jal mac_02_NpcJumpFunc /* 8249EC 8024172C 02A0302D */ daddu $a2, $s5, $zero /* 8249F0 80241730 080905E6 */ j .L80241798 -/* 8249F4 80241734 00000000 */ nop +/* 8249F4 80241734 00000000 */ nop +glabel L80241738_8249F8 /* 8249F8 80241738 0280202D */ daddu $a0, $s4, $zero /* 8249FC 8024173C 0260282D */ daddu $a1, $s3, $zero /* 824A00 80241740 0C090453 */ jal func_8024114C_82440C /* 824A04 80241744 02A0302D */ daddu $a2, $s5, $zero +glabel L80241748_824A08 /* 824A08 80241748 0280202D */ daddu $a0, $s4, $zero /* 824A0C 8024174C 0260282D */ daddu $a1, $s3, $zero /* 824A10 80241750 0C09049F */ jal func_8024127C_82453C /* 824A14 80241754 02A0302D */ daddu $a2, $s5, $zero /* 824A18 80241758 080905E6 */ j .L80241798 -/* 824A1C 8024175C 00000000 */ nop +/* 824A1C 8024175C 00000000 */ nop +glabel L80241760_824A20 /* 824A20 80241760 0280202D */ daddu $a0, $s4, $zero /* 824A24 80241764 0260282D */ daddu $a1, $s3, $zero /* 824A28 80241768 0C0904E7 */ jal mac_02_UnkNpcDurationFlagFunc /* 824A2C 8024176C 02A0302D */ daddu $a2, $s5, $zero /* 824A30 80241770 080905E6 */ j .L80241798 -/* 824A34 80241774 00000000 */ nop +/* 824A34 80241774 00000000 */ nop +glabel L80241778_824A38 /* 824A38 80241778 0280202D */ daddu $a0, $s4, $zero /* 824A3C 8024177C 0260282D */ daddu $a1, $s3, $zero /* 824A40 80241780 0C090501 */ jal func_80241404_8246C4 /* 824A44 80241784 02A0302D */ daddu $a2, $s5, $zero /* 824A48 80241788 080905E6 */ j .L80241798 -/* 824A4C 8024178C 00000000 */ nop +/* 824A4C 8024178C 00000000 */ nop +glabel L80241790_824A50 /* 824A50 80241790 0C0129CF */ jal func_8004A73C /* 824A54 80241794 0280202D */ daddu $a0, $s4, $zero .L80241798: +glabel L80241798_824A58 /* 824A58 80241798 8FBF0060 */ lw $ra, 0x60($sp) /* 824A5C 8024179C 8FB5005C */ lw $s5, 0x5c($sp) /* 824A60 802417A0 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802417C0_824A80.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802417C0_824A80.s index 1a2bdefb06..88cbec0563 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802417C0_824A80.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802417C0_824A80.s @@ -26,7 +26,7 @@ glabel func_802417C0_824A80 /* 824AD0 80241810 1440FFFA */ bnez $v0, .L802417FC /* 824AD4 80241814 24A50004 */ addiu $a1, $a1, 4 /* 824AD8 80241818 08090617 */ j .L8024185C -/* 824ADC 8024181C 00000000 */ nop +/* 824ADC 8024181C 00000000 */ nop .L80241820: /* 824AE0 80241820 0000182D */ daddu $v1, $zero, $zero /* 824AE4 80241824 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418FC_824BBC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418FC_824BBC.s index 056712cefd..d6ef37aa61 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418FC_824BBC.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418FC_824BBC.s @@ -115,7 +115,7 @@ glabel func_802418FC_824BBC /* 824D64 80241AA4 14E20005 */ bne $a3, $v0, .L80241ABC /* 824D68 80241AA8 32E2FFFF */ andi $v0, $s7, 0xffff /* 824D6C 80241AAC 14400003 */ bnez $v0, .L80241ABC -/* 824D70 80241AB0 00000000 */ nop +/* 824D70 80241AB0 00000000 */ nop /* 824D74 80241AB4 14800008 */ bnez $a0, .L80241AD8 /* 824D78 80241AB8 24020001 */ addiu $v0, $zero, 1 .L80241ABC: @@ -123,7 +123,7 @@ glabel func_802418FC_824BBC /* 824D80 80241AC0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 824D84 80241AC4 80420075 */ lb $v0, 0x75($v0) /* 824D88 80241AC8 10400005 */ beqz $v0, .L80241AE0 -/* 824D8C 80241ACC 00000000 */ nop +/* 824D8C 80241ACC 00000000 */ nop /* 824D90 80241AD0 10800003 */ beqz $a0, .L80241AE0 /* 824D94 80241AD4 24020001 */ addiu $v0, $zero, 1 .L80241AD8: diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241BEC_824EAC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241BEC_824EAC.s index a5b69fa012..87a39b44e5 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241BEC_824EAC.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241BEC_824EAC.s @@ -39,13 +39,13 @@ glabel func_80241BEC_824EAC /* 824F30 80241C70 10740005 */ beq $v1, $s4, .L80241C88 /* 824F34 80241C74 26100001 */ addiu $s0, $s0, 1 /* 824F38 80241C78 10730003 */ beq $v1, $s3, .L80241C88 -/* 824F3C 80241C7C 00000000 */ nop +/* 824F3C 80241C7C 00000000 */ nop /* 824F40 80241C80 00521025 */ or $v0, $v0, $s2 /* 824F44 80241C84 AC820000 */ sw $v0, ($a0) .L80241C88: /* 824F48 80241C88 2A020040 */ slti $v0, $s0, 0x40 /* 824F4C 80241C8C 1440FFEF */ bnez $v0, .L80241C4C -/* 824F50 80241C90 00000000 */ nop +/* 824F50 80241C90 00000000 */ nop /* 824F54 80241C94 0000802D */ daddu $s0, $zero, $zero /* 824F58 80241C98 3C120800 */ lui $s2, 0x800 .L80241C9C: @@ -57,13 +57,13 @@ glabel func_80241BEC_824EAC /* 824F70 80241CB0 8C640000 */ lw $a0, ($v1) /* 824F74 80241CB4 30820010 */ andi $v0, $a0, 0x10 /* 824F78 80241CB8 10400003 */ beqz $v0, .L80241CC8 -/* 824F7C 80241CBC 00000000 */ nop +/* 824F7C 80241CBC 00000000 */ nop /* 824F80 80241CC0 00921025 */ or $v0, $a0, $s2 /* 824F84 80241CC4 AC620000 */ sw $v0, ($v1) .L80241CC8: /* 824F88 80241CC8 2A020100 */ slti $v0, $s0, 0x100 /* 824F8C 80241CCC 1440FFF3 */ bnez $v0, .L80241C9C -/* 824F90 80241CD0 00000000 */ nop +/* 824F90 80241CD0 00000000 */ nop /* 824F94 80241CD4 AE200070 */ sw $zero, 0x70($s1) .L80241CD8: /* 824F98 80241CD8 8E220070 */ lw $v0, 0x70($s1) diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241D38_824FF8.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241D38_824FF8.s index c16b674460..b951c7736c 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241D38_824FF8.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241D38_824FF8.s @@ -32,7 +32,7 @@ glabel func_80241D38_824FF8 /* 82505C 80241D9C 0080302D */ daddu $a2, $a0, $zero /* 825060 80241DA0 8E020070 */ lw $v0, 0x70($s0) /* 825064 80241DA4 14400006 */ bnez $v0, .L80241DC0 -/* 825068 80241DA8 00000000 */ nop +/* 825068 80241DA8 00000000 */ nop /* 82506C 80241DAC 8E020074 */ lw $v0, 0x74($s0) /* 825070 80241DB0 14400003 */ bnez $v0, .L80241DC0 /* 825074 80241DB4 24020001 */ addiu $v0, $zero, 1 @@ -66,13 +66,13 @@ glabel func_80241D38_824FF8 /* 8250DC 80241E1C 10730005 */ beq $v1, $s3, .L80241E34 /* 8250E0 80241E20 26100001 */ addiu $s0, $s0, 1 /* 8250E4 80241E24 10720003 */ beq $v1, $s2, .L80241E34 -/* 8250E8 80241E28 00000000 */ nop +/* 8250E8 80241E28 00000000 */ nop /* 8250EC 80241E2C 00511024 */ and $v0, $v0, $s1 /* 8250F0 80241E30 AC820000 */ sw $v0, ($a0) .L80241E34: /* 8250F4 80241E34 2A020040 */ slti $v0, $s0, 0x40 /* 8250F8 80241E38 1440FFEF */ bnez $v0, .L80241DF8 -/* 8250FC 80241E3C 00000000 */ nop +/* 8250FC 80241E3C 00000000 */ nop /* 825100 80241E40 0000802D */ daddu $s0, $zero, $zero /* 825104 80241E44 3C11F7FF */ lui $s1, 0xf7ff /* 825108 80241E48 3631FFFF */ ori $s1, $s1, 0xffff @@ -85,7 +85,7 @@ glabel func_80241D38_824FF8 /* 825120 80241E60 8C640000 */ lw $a0, ($v1) /* 825124 80241E64 30820010 */ andi $v0, $a0, 0x10 /* 825128 80241E68 10400003 */ beqz $v0, .L80241E78 -/* 82512C 80241E6C 00000000 */ nop +/* 82512C 80241E6C 00000000 */ nop /* 825130 80241E70 00911024 */ and $v0, $a0, $s1 /* 825134 80241E74 AC620000 */ sw $v0, ($v1) .L80241E78: @@ -93,7 +93,7 @@ glabel func_80241D38_824FF8 /* 82513C 80241E7C 1440FFF3 */ bnez $v0, .L80241E4C /* 825140 80241E80 24020002 */ addiu $v0, $zero, 2 /* 825144 80241E84 080907A4 */ j .L80241E90 -/* 825148 80241E88 00000000 */ nop +/* 825148 80241E88 00000000 */ nop .L80241E8C: /* 82514C 80241E8C 0000102D */ daddu $v0, $zero, $zero .L80241E90: diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241F30_8251F0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241F30_8251F0.s index 29cc99a902..a94cafe9f6 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241F30_8251F0.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241F30_8251F0.s @@ -16,19 +16,19 @@ glabel func_80241F30_8251F0 /* 82521C 80241F5C 0220202D */ daddu $a0, $s1, $zero /* 825220 80241F60 3C05F4AC */ lui $a1, 0xf4ac /* 825224 80241F64 4482B000 */ mtc1 $v0, $f22 -/* 825228 80241F68 00000000 */ nop +/* 825228 80241F68 00000000 */ nop /* 82522C 80241F6C 4680B5A0 */ cvt.s.w $f22, $f22 /* 825230 80241F70 0C0B1EAF */ jal get_variable /* 825234 80241F74 34A5D482 */ ori $a1, $a1, 0xd482 /* 825238 80241F78 0220202D */ daddu $a0, $s1, $zero /* 82523C 80241F7C 3C05F4AC */ lui $a1, 0xf4ac /* 825240 80241F80 4482A000 */ mtc1 $v0, $f20 -/* 825244 80241F84 00000000 */ nop +/* 825244 80241F84 00000000 */ nop /* 825248 80241F88 4680A520 */ cvt.s.w $f20, $f20 /* 82524C 80241F8C 0C0B1EAF */ jal get_variable /* 825250 80241F90 34A5D483 */ ori $a1, $a1, 0xd483 /* 825254 80241F94 44821000 */ mtc1 $v0, $f2 -/* 825258 80241F98 00000000 */ nop +/* 825258 80241F98 00000000 */ nop /* 82525C 80241F9C 468010A0 */ cvt.s.w $f2, $f2 /* 825260 80241FA0 4405B000 */ mfc1 $a1, $f22 /* 825264 80241FA4 4406A000 */ mfc1 $a2, $f20 @@ -45,19 +45,19 @@ glabel func_80241F30_8251F0 /* 825290 80241FD0 0220202D */ daddu $a0, $s1, $zero /* 825294 80241FD4 3C05F4AC */ lui $a1, 0xf4ac /* 825298 80241FD8 4482B000 */ mtc1 $v0, $f22 -/* 82529C 80241FDC 00000000 */ nop +/* 82529C 80241FDC 00000000 */ nop /* 8252A0 80241FE0 4680B5A0 */ cvt.s.w $f22, $f22 /* 8252A4 80241FE4 0C0B1EAF */ jal get_variable /* 8252A8 80241FE8 34A5D482 */ ori $a1, $a1, 0xd482 /* 8252AC 80241FEC 0220202D */ daddu $a0, $s1, $zero /* 8252B0 80241FF0 3C05F4AC */ lui $a1, 0xf4ac /* 8252B4 80241FF4 4482A000 */ mtc1 $v0, $f20 -/* 8252B8 80241FF8 00000000 */ nop +/* 8252B8 80241FF8 00000000 */ nop /* 8252BC 80241FFC 4680A520 */ cvt.s.w $f20, $f20 /* 8252C0 80242000 0C0B1EAF */ jal get_variable /* 8252C4 80242004 34A5D483 */ ori $a1, $a1, 0xd483 /* 8252C8 80242008 44821000 */ mtc1 $v0, $f2 -/* 8252CC 8024200C 00000000 */ nop +/* 8252CC 8024200C 00000000 */ nop /* 8252D0 80242010 468010A0 */ cvt.s.w $f2, $f2 /* 8252D4 80242014 4405B000 */ mfc1 $a1, $f22 /* 8252D8 80242018 4406A000 */ mfc1 $a2, $f20 @@ -73,19 +73,19 @@ glabel func_80241F30_8251F0 /* 825300 80242040 0220202D */ daddu $a0, $s1, $zero /* 825304 80242044 3C05F4AC */ lui $a1, 0xf4ac /* 825308 80242048 4482B000 */ mtc1 $v0, $f22 -/* 82530C 8024204C 00000000 */ nop +/* 82530C 8024204C 00000000 */ nop /* 825310 80242050 4680B5A0 */ cvt.s.w $f22, $f22 /* 825314 80242054 0C0B1EAF */ jal get_variable /* 825318 80242058 34A5D482 */ ori $a1, $a1, 0xd482 /* 82531C 8024205C 0220202D */ daddu $a0, $s1, $zero /* 825320 80242060 3C05F4AC */ lui $a1, 0xf4ac /* 825324 80242064 4482A000 */ mtc1 $v0, $f20 -/* 825328 80242068 00000000 */ nop +/* 825328 80242068 00000000 */ nop /* 82532C 8024206C 4680A520 */ cvt.s.w $f20, $f20 /* 825330 80242070 0C0B1EAF */ jal get_variable /* 825334 80242074 34A5D483 */ ori $a1, $a1, 0xd483 /* 825338 80242078 44821000 */ mtc1 $v0, $f2 -/* 82533C 8024207C 00000000 */ nop +/* 82533C 8024207C 00000000 */ nop /* 825340 80242080 468010A0 */ cvt.s.w $f2, $f2 /* 825344 80242084 4405B000 */ mfc1 $a1, $f22 /* 825348 80242088 4406A000 */ mfc1 $a2, $f20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242148_825408.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242148_825408.s index 92acebe21b..c14ed6f2ac 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242148_825408.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242148_825408.s @@ -44,7 +44,7 @@ glabel func_80242148_825408 /* 82549C 802421DC 3C048025 */ lui $a0, %hi(D_8024E540) /* 8254A0 802421E0 8C84E540 */ lw $a0, %lo(D_8024E540)($a0) /* 8254A4 802421E4 0C048D70 */ jal func_801235C0 -/* 8254A8 802421E8 00000000 */ nop +/* 8254A8 802421E8 00000000 */ nop /* 8254AC 802421EC 24020002 */ addiu $v0, $zero, 2 .L802421F0: /* 8254B0 802421F0 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802427B8_825A78.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802427B8_825A78.s index 92fde1b38b..33d4a45ba3 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802427B8_825A78.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802427B8_825A78.s @@ -13,7 +13,7 @@ glabel func_802427B8_825A78 /* 825A98 802427D8 14620006 */ bne $v1, $v0, .L802427F4 /* 825A9C 802427DC 24020002 */ addiu $v0, $zero, 2 /* 825AA0 802427E0 44800000 */ mtc1 $zero, $f0 -/* 825AA4 802427E4 00000000 */ nop +/* 825AA4 802427E4 00000000 */ nop /* 825AA8 802427E8 44050000 */ mfc1 $a1, $f0 /* 825AAC 802427EC 08090A03 */ j .L8024280C /* 825AB0 802427F0 0000202D */ daddu $a0, $zero, $zero @@ -21,9 +21,9 @@ glabel func_802427B8_825A78 /* 825AB4 802427F4 14620008 */ bne $v1, $v0, .L80242818 /* 825AB8 802427F8 24040001 */ addiu $a0, $zero, 1 /* 825ABC 802427FC 44800000 */ mtc1 $zero, $f0 -/* 825AC0 80242800 00000000 */ nop +/* 825AC0 80242800 00000000 */ nop /* 825AC4 80242804 44050000 */ mfc1 $a1, $f0 -/* 825AC8 80242808 00000000 */ nop +/* 825AC8 80242808 00000000 */ nop .L8024280C: /* 825ACC 8024280C 00A0302D */ daddu $a2, $a1, $zero /* 825AD0 80242810 0C01C5A4 */ jal func_80071690 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242B0C_825DCC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242B0C_825DCC.s index 91100c0bc4..798273d94e 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242B0C_825DCC.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242B0C_825DCC.s @@ -28,7 +28,7 @@ glabel func_80242B0C_825DCC /* 825E20 80242B60 00220821 */ addu $at, $at, $v0 /* 825E24 80242B64 AC20E570 */ sw $zero, %lo(D_8024E570)($at) /* 825E28 80242B68 08090AE6 */ j .L80242B98 -/* 825E2C 80242B6C 00000000 */ nop +/* 825E2C 80242B6C 00000000 */ nop .L80242B70: /* 825E30 80242B70 3C038025 */ lui $v1, %hi(D_8024E570) /* 825E34 80242B74 2463E570 */ addiu $v1, $v1, %lo(D_8024E570) diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242BA8_825E68.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242BA8_825E68.s index 2ff960fcb4..4ebd5feb5e 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242BA8_825E68.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242BA8_825E68.s @@ -28,7 +28,7 @@ glabel func_80242BA8_825E68 /* 825EBC 80242BFC 00220821 */ addu $at, $at, $v0 /* 825EC0 80242C00 AC20E738 */ sw $zero, %lo(D_8024E738)($at) /* 825EC4 80242C04 08090B0D */ j .L80242C34 -/* 825EC8 80242C08 00000000 */ nop +/* 825EC8 80242C08 00000000 */ nop .L80242C0C: /* 825ECC 80242C0C 3C038025 */ lui $v1, %hi(D_8024E738) /* 825ED0 80242C10 2463E738 */ addiu $v1, $v1, %lo(D_8024E738) diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242C44_825F04.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242C44_825F04.s index 0501174988..c18eb87805 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242C44_825F04.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242C44_825F04.s @@ -71,7 +71,7 @@ glabel func_80242C44_825F04 /* 825FFC 80242D3C 5040000A */ beql $v0, $zero, .L80242D68 /* 826000 80242D40 0000202D */ daddu $a0, $zero, $zero /* 826004 80242D44 10A00005 */ beqz $a1, .L80242D5C -/* 826008 80242D48 00000000 */ nop +/* 826008 80242D48 00000000 */ nop /* 82600C 80242D4C 3C018025 */ lui $at, %hi(D_80248CD0) /* 826010 80242D50 00240821 */ addu $at, $at, $a0 /* 826014 80242D54 08090B5A */ j .L80242D68 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242DBC_82607C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242DBC_82607C.s index 41eb73f0db..45ec15492b 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242DBC_82607C.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242DBC_82607C.s @@ -81,10 +81,10 @@ glabel func_80242DBC_82607C .L80242ECC: /* 82618C 80242ECC 8C850000 */ lw $a1, ($a0) /* 826190 80242ED0 14B00004 */ bne $a1, $s0, .L80242EE4 -/* 826194 80242ED4 00000000 */ nop +/* 826194 80242ED4 00000000 */ nop /* 826198 80242ED8 8C820004 */ lw $v0, 4($a0) /* 82619C 80242EDC 10460006 */ beq $v0, $a2, .L80242EF8 -/* 8261A0 80242EE0 00000000 */ nop +/* 8261A0 80242EE0 00000000 */ nop .L80242EE4: /* 8261A4 80242EE4 54A60006 */ bnel $a1, $a2, .L80242F00 /* 8261A8 80242EE8 2484000C */ addiu $a0, $a0, 0xc @@ -97,7 +97,7 @@ glabel func_80242DBC_82607C .L80242F00: /* 8261C0 80242F00 0087102A */ slt $v0, $a0, $a3 /* 8261C4 80242F04 1440FFF1 */ bnez $v0, .L80242ECC -/* 8261C8 80242F08 00000000 */ nop +/* 8261C8 80242F08 00000000 */ nop /* 8261CC 80242F0C 0220202D */ daddu $a0, $s1, $zero .L80242F10: /* 8261D0 80242F10 3C028025 */ lui $v0, %hi(D_80248B10) diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242F60_826220.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242F60_826220.s index 06cbf7e615..e2f865466b 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242F60_826220.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242F60_826220.s @@ -52,7 +52,7 @@ glabel func_80242F60_826220 /* 8262D0 80243010 0C0B2026 */ jal set_variable /* 8262D4 80243014 24060001 */ addiu $a2, $zero, 1 /* 8262D8 80243018 08090C0C */ j .L80243030 -/* 8262DC 8024301C 00000000 */ nop +/* 8262DC 8024301C 00000000 */ nop .L80243020: /* 8262E0 80243020 24840001 */ addiu $a0, $a0, 1 /* 8262E4 80243024 28820034 */ slti $v0, $a0, 0x34 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831800/func_80240034_831834.s b/asm/nonmatchings/world/area_mac/mac_03/831800/func_80240034_831834.s index ee69ae9608..b8dfa68bdc 100644 --- a/asm/nonmatchings/world/area_mac/mac_03/831800/func_80240034_831834.s +++ b/asm/nonmatchings/world/area_mac/mac_03/831800/func_80240034_831834.s @@ -22,16 +22,16 @@ glabel func_80240034_831834 /* 831874 80240074 00021023 */ negu $v0, $v0 .L80240078: /* 831878 80240078 14400003 */ bnez $v0, .L80240088 -/* 83187C 8024007C 00000000 */ nop +/* 83187C 8024007C 00000000 */ nop /* 831880 80240080 50E00017 */ beql $a3, $zero, .L802400E0 /* 831884 80240084 0000102D */ daddu $v0, $zero, $zero .L80240088: /* 831888 80240088 44822000 */ mtc1 $v0, $f4 -/* 83188C 8024008C 00000000 */ nop +/* 83188C 8024008C 00000000 */ nop /* 831890 80240090 46802120 */ cvt.s.w $f4, $f4 /* 831894 80240094 44062000 */ mfc1 $a2, $f4 /* 831898 80240098 44872000 */ mtc1 $a3, $f4 -/* 83189C 8024009C 00000000 */ nop +/* 83189C 8024009C 00000000 */ nop /* 8318A0 802400A0 46802120 */ cvt.s.w $f4, $f4 /* 8318A4 802400A4 44806000 */ mtc1 $zero, $f12 /* 8318A8 802400A8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240034_831834 /* 8318B0 802400B0 46006386 */ mov.s $f14, $f12 /* 8318B4 802400B4 3C014270 */ lui $at, 0x4270 /* 8318B8 802400B8 44811000 */ mtc1 $at, $f2 -/* 8318BC 802400BC 00000000 */ nop +/* 8318BC 802400BC 00000000 */ nop /* 8318C0 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 8318C4 802400C4 00000000 */ nop +/* 8318C4 802400C4 00000000 */ nop /* 8318C8 802400C8 45000004 */ bc1f .L802400DC /* 8318CC 802400CC 24020001 */ addiu $v0, $zero, 1 /* 8318D0 802400D0 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_mac/mac_03/831800/func_802402E0_831AE0.s b/asm/nonmatchings/world/area_mac/mac_03/831800/func_802402E0_831AE0.s index 5c4cbd99dc..ef3fa9dc2f 100644 --- a/asm/nonmatchings/world/area_mac/mac_03/831800/func_802402E0_831AE0.s +++ b/asm/nonmatchings/world/area_mac/mac_03/831800/func_802402E0_831AE0.s @@ -18,4 +18,4 @@ glabel func_802402E0_831AE0 /* 831B10 80240310 24020002 */ addiu $v0, $zero, 2 /* 831B14 80240314 03E00008 */ jr $ra /* 831B18 80240318 AC830088 */ sw $v1, 0x88($a0) -/* 831B1C 8024031C 00000000 */ nop +/* 831B1C 8024031C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802404B0_831CB0.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802404B0_831CB0.s index 920df6c735..60368a4595 100644 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802404B0_831CB0.s +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802404B0_831CB0.s @@ -26,7 +26,7 @@ glabel func_802404B0_831CB0 /* 831D00 80240500 1440FFFA */ bnez $v0, .L802404EC /* 831D04 80240504 24A50004 */ addiu $a1, $a1, 4 /* 831D08 80240508 08090153 */ j .L8024054C -/* 831D0C 8024050C 00000000 */ nop +/* 831D0C 8024050C 00000000 */ nop .L80240510: /* 831D10 80240510 0000182D */ daddu $v1, $zero, $zero /* 831D14 80240514 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405EC_831DEC.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405EC_831DEC.s index 3cb3d7ab2f..ed3cd83cfc 100644 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405EC_831DEC.s +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405EC_831DEC.s @@ -115,7 +115,7 @@ glabel func_802405EC_831DEC /* 831F94 80240794 14E20005 */ bne $a3, $v0, .L802407AC /* 831F98 80240798 32E2FFFF */ andi $v0, $s7, 0xffff /* 831F9C 8024079C 14400003 */ bnez $v0, .L802407AC -/* 831FA0 802407A0 00000000 */ nop +/* 831FA0 802407A0 00000000 */ nop /* 831FA4 802407A4 14800008 */ bnez $a0, .L802407C8 /* 831FA8 802407A8 24020001 */ addiu $v0, $zero, 1 .L802407AC: @@ -123,7 +123,7 @@ glabel func_802405EC_831DEC /* 831FB0 802407B0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 831FB4 802407B4 80420075 */ lb $v0, 0x75($v0) /* 831FB8 802407B8 10400005 */ beqz $v0, .L802407D0 -/* 831FBC 802407BC 00000000 */ nop +/* 831FBC 802407BC 00000000 */ nop /* 831FC0 802407C0 10800003 */ beqz $a0, .L802407D0 /* 831FC4 802407C4 24020001 */ addiu $v0, $zero, 1 .L802407C8: diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802408DC_8320DC.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802408DC_8320DC.s index 4ed1bcea2a..c8d72868b4 100644 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802408DC_8320DC.s +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802408DC_8320DC.s @@ -39,13 +39,13 @@ glabel func_802408DC_8320DC /* 832160 80240960 10740005 */ beq $v1, $s4, .L80240978 /* 832164 80240964 26100001 */ addiu $s0, $s0, 1 /* 832168 80240968 10730003 */ beq $v1, $s3, .L80240978 -/* 83216C 8024096C 00000000 */ nop +/* 83216C 8024096C 00000000 */ nop /* 832170 80240970 00521025 */ or $v0, $v0, $s2 /* 832174 80240974 AC820000 */ sw $v0, ($a0) .L80240978: /* 832178 80240978 2A020040 */ slti $v0, $s0, 0x40 /* 83217C 8024097C 1440FFEF */ bnez $v0, .L8024093C -/* 832180 80240980 00000000 */ nop +/* 832180 80240980 00000000 */ nop /* 832184 80240984 0000802D */ daddu $s0, $zero, $zero /* 832188 80240988 3C120800 */ lui $s2, 0x800 .L8024098C: @@ -57,13 +57,13 @@ glabel func_802408DC_8320DC /* 8321A0 802409A0 8C640000 */ lw $a0, ($v1) /* 8321A4 802409A4 30820010 */ andi $v0, $a0, 0x10 /* 8321A8 802409A8 10400003 */ beqz $v0, .L802409B8 -/* 8321AC 802409AC 00000000 */ nop +/* 8321AC 802409AC 00000000 */ nop /* 8321B0 802409B0 00921025 */ or $v0, $a0, $s2 /* 8321B4 802409B4 AC620000 */ sw $v0, ($v1) .L802409B8: /* 8321B8 802409B8 2A020100 */ slti $v0, $s0, 0x100 /* 8321BC 802409BC 1440FFF3 */ bnez $v0, .L8024098C -/* 8321C0 802409C0 00000000 */ nop +/* 8321C0 802409C0 00000000 */ nop /* 8321C4 802409C4 AE200070 */ sw $zero, 0x70($s1) .L802409C8: /* 8321C8 802409C8 8E220070 */ lw $v0, 0x70($s1) diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240A28_832228.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240A28_832228.s index 5c7ff78acf..2d7ffbfe80 100644 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240A28_832228.s +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240A28_832228.s @@ -32,7 +32,7 @@ glabel func_80240A28_832228 /* 83228C 80240A8C 0080302D */ daddu $a2, $a0, $zero /* 832290 80240A90 8E020070 */ lw $v0, 0x70($s0) /* 832294 80240A94 14400006 */ bnez $v0, .L80240AB0 -/* 832298 80240A98 00000000 */ nop +/* 832298 80240A98 00000000 */ nop /* 83229C 80240A9C 8E020074 */ lw $v0, 0x74($s0) /* 8322A0 80240AA0 14400003 */ bnez $v0, .L80240AB0 /* 8322A4 80240AA4 24020001 */ addiu $v0, $zero, 1 @@ -66,13 +66,13 @@ glabel func_80240A28_832228 /* 83230C 80240B0C 10730005 */ beq $v1, $s3, .L80240B24 /* 832310 80240B10 26100001 */ addiu $s0, $s0, 1 /* 832314 80240B14 10720003 */ beq $v1, $s2, .L80240B24 -/* 832318 80240B18 00000000 */ nop +/* 832318 80240B18 00000000 */ nop /* 83231C 80240B1C 00511024 */ and $v0, $v0, $s1 /* 832320 80240B20 AC820000 */ sw $v0, ($a0) .L80240B24: /* 832324 80240B24 2A020040 */ slti $v0, $s0, 0x40 /* 832328 80240B28 1440FFEF */ bnez $v0, .L80240AE8 -/* 83232C 80240B2C 00000000 */ nop +/* 83232C 80240B2C 00000000 */ nop /* 832330 80240B30 0000802D */ daddu $s0, $zero, $zero /* 832334 80240B34 3C11F7FF */ lui $s1, 0xf7ff /* 832338 80240B38 3631FFFF */ ori $s1, $s1, 0xffff @@ -85,7 +85,7 @@ glabel func_80240A28_832228 /* 832350 80240B50 8C640000 */ lw $a0, ($v1) /* 832354 80240B54 30820010 */ andi $v0, $a0, 0x10 /* 832358 80240B58 10400003 */ beqz $v0, .L80240B68 -/* 83235C 80240B5C 00000000 */ nop +/* 83235C 80240B5C 00000000 */ nop /* 832360 80240B60 00911024 */ and $v0, $a0, $s1 /* 832364 80240B64 AC620000 */ sw $v0, ($v1) .L80240B68: @@ -93,7 +93,7 @@ glabel func_80240A28_832228 /* 83236C 80240B6C 1440FFF3 */ bnez $v0, .L80240B3C /* 832370 80240B70 24020002 */ addiu $v0, $zero, 2 /* 832374 80240B74 080902E0 */ j .L80240B80 -/* 832378 80240B78 00000000 */ nop +/* 832378 80240B78 00000000 */ nop .L80240B7C: /* 83237C 80240B7C 0000102D */ daddu $v0, $zero, $zero .L80240B80: diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240C20_832420.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240C20_832420.s index d3c1c91d10..068da25226 100644 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240C20_832420.s +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240C20_832420.s @@ -16,19 +16,19 @@ glabel func_80240C20_832420 /* 83244C 80240C4C 0220202D */ daddu $a0, $s1, $zero /* 832450 80240C50 3C05F4AC */ lui $a1, 0xf4ac /* 832454 80240C54 4482B000 */ mtc1 $v0, $f22 -/* 832458 80240C58 00000000 */ nop +/* 832458 80240C58 00000000 */ nop /* 83245C 80240C5C 4680B5A0 */ cvt.s.w $f22, $f22 /* 832460 80240C60 0C0B1EAF */ jal get_variable /* 832464 80240C64 34A5D482 */ ori $a1, $a1, 0xd482 /* 832468 80240C68 0220202D */ daddu $a0, $s1, $zero /* 83246C 80240C6C 3C05F4AC */ lui $a1, 0xf4ac /* 832470 80240C70 4482A000 */ mtc1 $v0, $f20 -/* 832474 80240C74 00000000 */ nop +/* 832474 80240C74 00000000 */ nop /* 832478 80240C78 4680A520 */ cvt.s.w $f20, $f20 /* 83247C 80240C7C 0C0B1EAF */ jal get_variable /* 832480 80240C80 34A5D483 */ ori $a1, $a1, 0xd483 /* 832484 80240C84 44821000 */ mtc1 $v0, $f2 -/* 832488 80240C88 00000000 */ nop +/* 832488 80240C88 00000000 */ nop /* 83248C 80240C8C 468010A0 */ cvt.s.w $f2, $f2 /* 832490 80240C90 4405B000 */ mfc1 $a1, $f22 /* 832494 80240C94 4406A000 */ mfc1 $a2, $f20 @@ -45,19 +45,19 @@ glabel func_80240C20_832420 /* 8324C0 80240CC0 0220202D */ daddu $a0, $s1, $zero /* 8324C4 80240CC4 3C05F4AC */ lui $a1, 0xf4ac /* 8324C8 80240CC8 4482B000 */ mtc1 $v0, $f22 -/* 8324CC 80240CCC 00000000 */ nop +/* 8324CC 80240CCC 00000000 */ nop /* 8324D0 80240CD0 4680B5A0 */ cvt.s.w $f22, $f22 /* 8324D4 80240CD4 0C0B1EAF */ jal get_variable /* 8324D8 80240CD8 34A5D482 */ ori $a1, $a1, 0xd482 /* 8324DC 80240CDC 0220202D */ daddu $a0, $s1, $zero /* 8324E0 80240CE0 3C05F4AC */ lui $a1, 0xf4ac /* 8324E4 80240CE4 4482A000 */ mtc1 $v0, $f20 -/* 8324E8 80240CE8 00000000 */ nop +/* 8324E8 80240CE8 00000000 */ nop /* 8324EC 80240CEC 4680A520 */ cvt.s.w $f20, $f20 /* 8324F0 80240CF0 0C0B1EAF */ jal get_variable /* 8324F4 80240CF4 34A5D483 */ ori $a1, $a1, 0xd483 /* 8324F8 80240CF8 44821000 */ mtc1 $v0, $f2 -/* 8324FC 80240CFC 00000000 */ nop +/* 8324FC 80240CFC 00000000 */ nop /* 832500 80240D00 468010A0 */ cvt.s.w $f2, $f2 /* 832504 80240D04 4405B000 */ mfc1 $a1, $f22 /* 832508 80240D08 4406A000 */ mfc1 $a2, $f20 @@ -73,19 +73,19 @@ glabel func_80240C20_832420 /* 832530 80240D30 0220202D */ daddu $a0, $s1, $zero /* 832534 80240D34 3C05F4AC */ lui $a1, 0xf4ac /* 832538 80240D38 4482B000 */ mtc1 $v0, $f22 -/* 83253C 80240D3C 00000000 */ nop +/* 83253C 80240D3C 00000000 */ nop /* 832540 80240D40 4680B5A0 */ cvt.s.w $f22, $f22 /* 832544 80240D44 0C0B1EAF */ jal get_variable /* 832548 80240D48 34A5D482 */ ori $a1, $a1, 0xd482 /* 83254C 80240D4C 0220202D */ daddu $a0, $s1, $zero /* 832550 80240D50 3C05F4AC */ lui $a1, 0xf4ac /* 832554 80240D54 4482A000 */ mtc1 $v0, $f20 -/* 832558 80240D58 00000000 */ nop +/* 832558 80240D58 00000000 */ nop /* 83255C 80240D5C 4680A520 */ cvt.s.w $f20, $f20 /* 832560 80240D60 0C0B1EAF */ jal get_variable /* 832564 80240D64 34A5D483 */ ori $a1, $a1, 0xd483 /* 832568 80240D68 44821000 */ mtc1 $v0, $f2 -/* 83256C 80240D6C 00000000 */ nop +/* 83256C 80240D6C 00000000 */ nop /* 832570 80240D70 468010A0 */ cvt.s.w $f2, $f2 /* 832574 80240D74 4405B000 */ mfc1 $a1, $f22 /* 832578 80240D78 4406A000 */ mfc1 $a2, $f20 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240E38_832638.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240E38_832638.s index 5d8021041a..bb337f747f 100644 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240E38_832638.s +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240E38_832638.s @@ -44,7 +44,7 @@ glabel func_80240E38_832638 /* 8326CC 80240ECC 3C048025 */ lui $a0, %hi(D_802513D0) /* 8326D0 80240ED0 8C8413D0 */ lw $a0, %lo(D_802513D0)($a0) /* 8326D4 80240ED4 0C048D70 */ jal func_801235C0 -/* 8326D8 80240ED8 00000000 */ nop +/* 8326D8 80240ED8 00000000 */ nop /* 8326DC 80240EDC 24020002 */ addiu $v0, $zero, 2 .L80240EE0: /* 8326E0 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802414A8_832CA8.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802414A8_832CA8.s index 22d8fdc35f..383268cc2a 100644 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802414A8_832CA8.s +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802414A8_832CA8.s @@ -13,7 +13,7 @@ glabel func_802414A8_832CA8 /* 832CC8 802414C8 14620006 */ bne $v1, $v0, .L802414E4 /* 832CCC 802414CC 24020002 */ addiu $v0, $zero, 2 /* 832CD0 802414D0 44800000 */ mtc1 $zero, $f0 -/* 832CD4 802414D4 00000000 */ nop +/* 832CD4 802414D4 00000000 */ nop /* 832CD8 802414D8 44050000 */ mfc1 $a1, $f0 /* 832CDC 802414DC 0809053F */ j .L802414FC /* 832CE0 802414E0 0000202D */ daddu $a0, $zero, $zero @@ -21,9 +21,9 @@ glabel func_802414A8_832CA8 /* 832CE4 802414E4 14620008 */ bne $v1, $v0, .L80241508 /* 832CE8 802414E8 24040001 */ addiu $a0, $zero, 1 /* 832CEC 802414EC 44800000 */ mtc1 $zero, $f0 -/* 832CF0 802414F0 00000000 */ nop +/* 832CF0 802414F0 00000000 */ nop /* 832CF4 802414F4 44050000 */ mfc1 $a1, $f0 -/* 832CF8 802414F8 00000000 */ nop +/* 832CF8 802414F8 00000000 */ nop .L802414FC: /* 832CFC 802414FC 00A0302D */ daddu $a2, $a1, $zero /* 832D00 80241500 0C01C5A4 */ jal func_80071690 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417FC_832FFC.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417FC_832FFC.s index 2ce3a15724..a1c95c09a5 100644 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417FC_832FFC.s +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417FC_832FFC.s @@ -28,7 +28,7 @@ glabel func_802417FC_832FFC /* 833050 80241850 00220821 */ addu $at, $at, $v0 /* 833054 80241854 AC201400 */ sw $zero, %lo(D_80251400)($at) /* 833058 80241858 08090622 */ j .L80241888 -/* 83305C 8024185C 00000000 */ nop +/* 83305C 8024185C 00000000 */ nop .L80241860: /* 833060 80241860 3C038025 */ lui $v1, %hi(D_80251400) /* 833064 80241864 24631400 */ addiu $v1, $v1, %lo(D_80251400) diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241BD8_8333D8.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241BD8_8333D8.s index 0052310d4c..2f6475e67b 100644 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241BD8_8333D8.s +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241BD8_8333D8.s @@ -29,20 +29,20 @@ glabel func_80241BD8_8333D8 /* 833438 80241C38 8E050000 */ lw $a1, ($s0) /* 83343C 80241C3C 26100004 */ addiu $s0, $s0, 4 /* 833440 80241C40 4482C000 */ mtc1 $v0, $f24 -/* 833444 80241C44 00000000 */ nop +/* 833444 80241C44 00000000 */ nop /* 833448 80241C48 4680C620 */ cvt.s.w $f24, $f24 /* 83344C 80241C4C 0C0B1EAF */ jal get_variable /* 833450 80241C50 0220202D */ daddu $a0, $s1, $zero /* 833454 80241C54 8E050000 */ lw $a1, ($s0) /* 833458 80241C58 26100004 */ addiu $s0, $s0, 4 /* 83345C 80241C5C 4482B000 */ mtc1 $v0, $f22 -/* 833460 80241C60 00000000 */ nop +/* 833460 80241C60 00000000 */ nop /* 833464 80241C64 4680B5A0 */ cvt.s.w $f22, $f22 /* 833468 80241C68 0C0B1EAF */ jal get_variable /* 83346C 80241C6C 0220202D */ daddu $a0, $s1, $zero /* 833470 80241C70 8E050000 */ lw $a1, ($s0) /* 833474 80241C74 4482A000 */ mtc1 $v0, $f20 -/* 833478 80241C78 00000000 */ nop +/* 833478 80241C78 00000000 */ nop /* 83347C 80241C7C 4680A520 */ cvt.s.w $f20, $f20 /* 833480 80241C80 0C0B1EAF */ jal get_variable /* 833484 80241C84 0220202D */ daddu $a0, $s1, $zero @@ -58,7 +58,7 @@ glabel func_80241BD8_8333D8 /* 8334AC 80241CAC E474008C */ swc1 $f20, 0x8c($v1) /* 8334B0 80241CB0 8E63000C */ lw $v1, 0xc($s3) /* 8334B4 80241CB4 44820000 */ mtc1 $v0, $f0 -/* 8334B8 80241CB8 00000000 */ nop +/* 8334B8 80241CB8 00000000 */ nop /* 8334BC 80241CBC 46800020 */ cvt.s.w $f0, $f0 /* 8334C0 80241CC0 00721821 */ addu $v1, $v1, $s2 /* 8334C4 80241CC4 E46000B8 */ swc1 $f0, 0xb8($v1) @@ -73,6 +73,6 @@ glabel func_80241BD8_8333D8 /* 8334E8 80241CE8 24020002 */ addiu $v0, $zero, 2 /* 8334EC 80241CEC 03E00008 */ jr $ra /* 8334F0 80241CF0 27BD0040 */ addiu $sp, $sp, 0x40 -/* 8334F4 80241CF4 00000000 */ nop -/* 8334F8 80241CF8 00000000 */ nop -/* 8334FC 80241CFC 00000000 */ nop +/* 8334F4 80241CF4 00000000 */ nop +/* 8334F8 80241CF8 00000000 */ nop +/* 8334FC 80241CFC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F80_833780.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F80_833780.s index 37f5b52f2c..2ca0defb89 100644 --- a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F80_833780.s +++ b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F80_833780.s @@ -5,7 +5,7 @@ glabel func_80241F80_833780 /* 833780 80241F80 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 833784 80241F84 AFBF0010 */ sw $ra, 0x10($sp) /* 833788 80241F88 0C03A5B2 */ jal func_800E96C8 -/* 83378C 80241F8C 00000000 */ nop +/* 83378C 80241F8C 00000000 */ nop /* 833790 80241F90 8FBF0010 */ lw $ra, 0x10($sp) /* 833794 80241F94 24020002 */ addiu $v0, $zero, 2 /* 833798 80241F98 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241FA0_8337A0.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241FA0_8337A0.s index 84a2509855..50822fe1bf 100644 --- a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241FA0_8337A0.s +++ b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241FA0_8337A0.s @@ -15,21 +15,21 @@ glabel func_80241FA0_8337A0 /* 8337C8 80241FC8 44816000 */ mtc1 $at, $f12 /* 8337CC 80241FCC 00431021 */ addu $v0, $v0, $v1 /* 8337D0 80241FD0 4482B000 */ mtc1 $v0, $f22 -/* 8337D4 80241FD4 00000000 */ nop +/* 8337D4 80241FD4 00000000 */ nop /* 8337D8 80241FD8 4680B5A0 */ cvt.s.w $f22, $f22 /* 8337DC 80241FDC 460CB302 */ mul.s $f12, $f22, $f12 /* 8337E0 80241FE0 0C00A6C9 */ jal clamp_angle -/* 8337E4 80241FE4 00000000 */ nop +/* 8337E4 80241FE4 00000000 */ nop /* 8337E8 80241FE8 46000586 */ mov.s $f22, $f0 /* 8337EC 80241FEC 3C0142DC */ lui $at, 0x42dc /* 8337F0 80241FF0 4481A000 */ mtc1 $at, $f20 /* 8337F4 80241FF4 0C00A8BB */ jal sin_deg /* 8337F8 80241FF8 4600B306 */ mov.s $f12, $f22 /* 8337FC 80241FFC 46140002 */ mul.s $f0, $f0, $f20 -/* 833800 80242000 00000000 */ nop +/* 833800 80242000 00000000 */ nop /* 833804 80242004 3C014327 */ lui $at, 0x4327 /* 833808 80242008 44811000 */ mtc1 $at, $f2 -/* 83380C 8024200C 00000000 */ nop +/* 83380C 8024200C 00000000 */ nop /* 833810 80242010 46020000 */ add.s $f0, $f0, $f2 /* 833814 80242014 24020055 */ addiu $v0, $zero, 0x55 /* 833818 80242018 AE020090 */ sw $v0, 0x90($s0) @@ -38,11 +38,11 @@ glabel func_80241FA0_8337A0 /* 833824 80242024 0C00A8D4 */ jal cos_deg /* 833828 80242028 4600B306 */ mov.s $f12, $f22 /* 83382C 8024202C 46140002 */ mul.s $f0, $f0, $f20 -/* 833830 80242030 00000000 */ nop +/* 833830 80242030 00000000 */ nop /* 833834 80242034 3C01C3AB */ lui $at, 0xc3ab /* 833838 80242038 3421E000 */ ori $at, $at, 0xe000 /* 83383C 8024203C 44811000 */ mtc1 $at, $f2 -/* 833840 80242040 00000000 */ nop +/* 833840 80242040 00000000 */ nop /* 833844 80242044 46001081 */ sub.s $f2, $f2, $f0 /* 833848 80242048 4600110D */ trunc.w.s $f4, $f2 /* 83384C 8024204C E6040094 */ swc1 $f4, 0x94($s0) diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_8024206C_83386C.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_8024206C_83386C.s index 13b529499e..32a65dd2d6 100644 --- a/asm/nonmatchings/world/area_mac/mac_03/833740/func_8024206C_83386C.s +++ b/asm/nonmatchings/world/area_mac/mac_03/833740/func_8024206C_83386C.s @@ -55,7 +55,7 @@ glabel func_8024206C_83386C /* 833930 80242130 A06200E4 */ sb $v0, 0xe4($v1) /* 833934 80242134 8E02000C */ lw $v0, 0xc($s0) /* 833938 80242138 44920000 */ mtc1 $s2, $f0 -/* 83393C 8024213C 00000000 */ nop +/* 83393C 8024213C 00000000 */ nop /* 833940 80242140 46800020 */ cvt.s.w $f0, $f0 /* 833944 80242144 00441021 */ addu $v0, $v0, $a0 /* 833948 80242148 E4400034 */ swc1 $f0, 0x34($v0) diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_802421E8_8339E8.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_802421E8_8339E8.s index ac749f43a3..f0ec308c09 100644 --- a/asm/nonmatchings/world/area_mac/mac_03/833740/func_802421E8_8339E8.s +++ b/asm/nonmatchings/world/area_mac/mac_03/833740/func_802421E8_8339E8.s @@ -35,20 +35,20 @@ glabel func_802421E8_8339E8 /* 833A60 80242260 8E050000 */ lw $a1, ($s0) /* 833A64 80242264 26100004 */ addiu $s0, $s0, 4 /* 833A68 80242268 4482C000 */ mtc1 $v0, $f24 -/* 833A6C 8024226C 00000000 */ nop +/* 833A6C 8024226C 00000000 */ nop /* 833A70 80242270 4680C620 */ cvt.s.w $f24, $f24 /* 833A74 80242274 0C0B1EAF */ jal get_variable /* 833A78 80242278 0240202D */ daddu $a0, $s2, $zero /* 833A7C 8024227C 8E050000 */ lw $a1, ($s0) /* 833A80 80242280 26100004 */ addiu $s0, $s0, 4 /* 833A84 80242284 4482B000 */ mtc1 $v0, $f22 -/* 833A88 80242288 00000000 */ nop +/* 833A88 80242288 00000000 */ nop /* 833A8C 8024228C 4680B5A0 */ cvt.s.w $f22, $f22 /* 833A90 80242290 0C0B1EAF */ jal get_variable /* 833A94 80242294 0240202D */ daddu $a0, $s2, $zero /* 833A98 80242298 8E050000 */ lw $a1, ($s0) /* 833A9C 8024229C 4482A000 */ mtc1 $v0, $f20 -/* 833AA0 802422A0 00000000 */ nop +/* 833AA0 802422A0 00000000 */ nop /* 833AA4 802422A4 4680A520 */ cvt.s.w $f20, $f20 /* 833AA8 802422A8 0C0B1EAF */ jal get_variable /* 833AAC 802422AC 0240202D */ daddu $a0, $s2, $zero @@ -67,7 +67,7 @@ glabel func_802421E8_8339E8 /* 833AE0 802422E0 E474008C */ swc1 $f20, 0x8c($v1) /* 833AE4 802422E4 8E23000C */ lw $v1, 0xc($s1) /* 833AE8 802422E8 44820000 */ mtc1 $v0, $f0 -/* 833AEC 802422EC 00000000 */ nop +/* 833AEC 802422EC 00000000 */ nop /* 833AF0 802422F0 46800020 */ cvt.s.w $f0, $f0 /* 833AF4 802422F4 00641821 */ addu $v1, $v1, $a0 /* 833AF8 802422F8 E46000B8 */ swc1 $f0, 0xb8($v1) diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242384_833B84.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242384_833B84.s index e081420189..37d3a196df 100644 --- a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242384_833B84.s +++ b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242384_833B84.s @@ -29,20 +29,20 @@ glabel func_80242384_833B84 /* 833BE4 802423E4 8E050000 */ lw $a1, ($s0) /* 833BE8 802423E8 26100004 */ addiu $s0, $s0, 4 /* 833BEC 802423EC 4482C000 */ mtc1 $v0, $f24 -/* 833BF0 802423F0 00000000 */ nop +/* 833BF0 802423F0 00000000 */ nop /* 833BF4 802423F4 4680C620 */ cvt.s.w $f24, $f24 /* 833BF8 802423F8 0C0B1EAF */ jal get_variable /* 833BFC 802423FC 0220202D */ daddu $a0, $s1, $zero /* 833C00 80242400 8E050000 */ lw $a1, ($s0) /* 833C04 80242404 26100004 */ addiu $s0, $s0, 4 /* 833C08 80242408 4482B000 */ mtc1 $v0, $f22 -/* 833C0C 8024240C 00000000 */ nop +/* 833C0C 8024240C 00000000 */ nop /* 833C10 80242410 4680B5A0 */ cvt.s.w $f22, $f22 /* 833C14 80242414 0C0B1EAF */ jal get_variable /* 833C18 80242418 0220202D */ daddu $a0, $s1, $zero /* 833C1C 8024241C 8E050000 */ lw $a1, ($s0) /* 833C20 80242420 4482A000 */ mtc1 $v0, $f20 -/* 833C24 80242424 00000000 */ nop +/* 833C24 80242424 00000000 */ nop /* 833C28 80242428 4680A520 */ cvt.s.w $f20, $f20 /* 833C2C 8024242C 0C0B1EAF */ jal get_variable /* 833C30 80242430 0220202D */ daddu $a0, $s1, $zero @@ -58,7 +58,7 @@ glabel func_80242384_833B84 /* 833C58 80242458 E474008C */ swc1 $f20, 0x8c($v1) /* 833C5C 8024245C 8E63000C */ lw $v1, 0xc($s3) /* 833C60 80242460 44820000 */ mtc1 $v0, $f0 -/* 833C64 80242464 00000000 */ nop +/* 833C64 80242464 00000000 */ nop /* 833C68 80242468 46800020 */ cvt.s.w $f0, $f0 /* 833C6C 8024246C 00721821 */ addu $v1, $v1, $s2 /* 833C70 80242470 E46000B8 */ swc1 $f0, 0xb8($v1) diff --git a/asm/nonmatchings/world/area_mac/mac_04/842BD0/func_80240000_842BD0.s b/asm/nonmatchings/world/area_mac/mac_04/842BD0/func_80240000_842BD0.s index 6f9cf44312..966997ac1d 100644 --- a/asm/nonmatchings/world/area_mac/mac_04/842BD0/func_80240000_842BD0.s +++ b/asm/nonmatchings/world/area_mac/mac_04/842BD0/func_80240000_842BD0.s @@ -9,7 +9,7 @@ glabel func_80240000_842BD0 /* 842BE0 80240010 8443008E */ lh $v1, 0x8e($v0) /* 842BE4 80240014 24020004 */ addiu $v0, $zero, 4 /* 842BE8 80240018 14620006 */ bne $v1, $v0, .L80240034 -/* 842BEC 8024001C 00000000 */ nop +/* 842BEC 8024001C 00000000 */ nop /* 842BF0 80240020 3C04800E */ lui $a0, %hi(D_800D9668) /* 842BF4 80240024 24849668 */ addiu $a0, $a0, %lo(D_800D9668) /* 842BF8 80240028 3C058025 */ lui $a1, %hi(D_8024F550) @@ -20,6 +20,6 @@ glabel func_80240000_842BD0 /* 842C08 80240038 0000102D */ daddu $v0, $zero, $zero /* 842C0C 8024003C 03E00008 */ jr $ra /* 842C10 80240040 27BD0018 */ addiu $sp, $sp, 0x18 -/* 842C14 80240044 00000000 */ nop -/* 842C18 80240048 00000000 */ nop -/* 842C1C 8024004C 00000000 */ nop +/* 842C14 80240044 00000000 */ nop +/* 842C18 80240048 00000000 */ nop +/* 842C1C 8024004C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_04/842C20/func_80240194_842D64.s b/asm/nonmatchings/world/area_mac/mac_04/842C20/func_80240194_842D64.s index 179ca2faf2..3942a961a5 100644 --- a/asm/nonmatchings/world/area_mac/mac_04/842C20/func_80240194_842D64.s +++ b/asm/nonmatchings/world/area_mac/mac_04/842C20/func_80240194_842D64.s @@ -10,6 +10,6 @@ glabel func_80240194_842D64 /* 842D78 802401A8 24020002 */ addiu $v0, $zero, 2 /* 842D7C 802401AC 03E00008 */ jr $ra /* 842D80 802401B0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 842D84 802401B4 00000000 */ nop -/* 842D88 802401B8 00000000 */ nop -/* 842D8C 802401BC 00000000 */ nop +/* 842D84 802401B4 00000000 */ nop +/* 842D88 802401B8 00000000 */ nop +/* 842D8C 802401BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_04/842D90/func_802401C0_842D90.s b/asm/nonmatchings/world/area_mac/mac_04/842D90/func_802401C0_842D90.s index c0e6e7d51d..3359e2084c 100644 --- a/asm/nonmatchings/world/area_mac/mac_04/842D90/func_802401C0_842D90.s +++ b/asm/nonmatchings/world/area_mac/mac_04/842D90/func_802401C0_842D90.s @@ -23,6 +23,6 @@ glabel func_802401C0_842D90 /* 842DD8 80240208 24020002 */ addiu $v0, $zero, 2 /* 842DDC 8024020C 03E00008 */ jr $ra /* 842DE0 80240210 27BD0018 */ addiu $sp, $sp, 0x18 -/* 842DE4 80240214 00000000 */ nop -/* 842DE8 80240218 00000000 */ nop -/* 842DEC 8024021C 00000000 */ nop +/* 842DE4 80240214 00000000 */ nop +/* 842DE8 80240218 00000000 */ nop +/* 842DEC 8024021C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240460_843030.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240460_843030.s index 1fdcb9bd3a..3db93c3039 100644 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240460_843030.s +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240460_843030.s @@ -26,7 +26,7 @@ glabel func_80240460_843030 /* 843080 802404B0 1440FFFA */ bnez $v0, .L8024049C /* 843084 802404B4 24A50004 */ addiu $a1, $a1, 4 /* 843088 802404B8 0809013F */ j .L802404FC -/* 84308C 802404BC 00000000 */ nop +/* 84308C 802404BC 00000000 */ nop .L802404C0: /* 843090 802404C0 0000182D */ daddu $v1, $zero, $zero /* 843094 802404C4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024059C_84316C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024059C_84316C.s index e1d72c7422..44131d9145 100644 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024059C_84316C.s +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024059C_84316C.s @@ -115,7 +115,7 @@ glabel func_8024059C_84316C /* 843314 80240744 14E20005 */ bne $a3, $v0, .L8024075C /* 843318 80240748 32E2FFFF */ andi $v0, $s7, 0xffff /* 84331C 8024074C 14400003 */ bnez $v0, .L8024075C -/* 843320 80240750 00000000 */ nop +/* 843320 80240750 00000000 */ nop /* 843324 80240754 14800008 */ bnez $a0, .L80240778 /* 843328 80240758 24020001 */ addiu $v0, $zero, 1 .L8024075C: @@ -123,7 +123,7 @@ glabel func_8024059C_84316C /* 843330 80240760 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 843334 80240764 80420075 */ lb $v0, 0x75($v0) /* 843338 80240768 10400005 */ beqz $v0, .L80240780 -/* 84333C 8024076C 00000000 */ nop +/* 84333C 8024076C 00000000 */ nop /* 843340 80240770 10800003 */ beqz $a0, .L80240780 /* 843344 80240774 24020001 */ addiu $v0, $zero, 1 .L80240778: diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024088C_84345C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024088C_84345C.s index f4df084646..80c789b827 100644 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024088C_84345C.s +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024088C_84345C.s @@ -39,13 +39,13 @@ glabel func_8024088C_84345C /* 8434E0 80240910 10740005 */ beq $v1, $s4, .L80240928 /* 8434E4 80240914 26100001 */ addiu $s0, $s0, 1 /* 8434E8 80240918 10730003 */ beq $v1, $s3, .L80240928 -/* 8434EC 8024091C 00000000 */ nop +/* 8434EC 8024091C 00000000 */ nop /* 8434F0 80240920 00521025 */ or $v0, $v0, $s2 /* 8434F4 80240924 AC820000 */ sw $v0, ($a0) .L80240928: /* 8434F8 80240928 2A020040 */ slti $v0, $s0, 0x40 /* 8434FC 8024092C 1440FFEF */ bnez $v0, .L802408EC -/* 843500 80240930 00000000 */ nop +/* 843500 80240930 00000000 */ nop /* 843504 80240934 0000802D */ daddu $s0, $zero, $zero /* 843508 80240938 3C120800 */ lui $s2, 0x800 .L8024093C: @@ -57,13 +57,13 @@ glabel func_8024088C_84345C /* 843520 80240950 8C640000 */ lw $a0, ($v1) /* 843524 80240954 30820010 */ andi $v0, $a0, 0x10 /* 843528 80240958 10400003 */ beqz $v0, .L80240968 -/* 84352C 8024095C 00000000 */ nop +/* 84352C 8024095C 00000000 */ nop /* 843530 80240960 00921025 */ or $v0, $a0, $s2 /* 843534 80240964 AC620000 */ sw $v0, ($v1) .L80240968: /* 843538 80240968 2A020100 */ slti $v0, $s0, 0x100 /* 84353C 8024096C 1440FFF3 */ bnez $v0, .L8024093C -/* 843540 80240970 00000000 */ nop +/* 843540 80240970 00000000 */ nop /* 843544 80240974 AE200070 */ sw $zero, 0x70($s1) .L80240978: /* 843548 80240978 8E220070 */ lw $v0, 0x70($s1) diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802409D8_8435A8.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802409D8_8435A8.s index b620960a83..ab89c1ea2a 100644 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802409D8_8435A8.s +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802409D8_8435A8.s @@ -32,7 +32,7 @@ glabel func_802409D8_8435A8 /* 84360C 80240A3C 0080302D */ daddu $a2, $a0, $zero /* 843610 80240A40 8E020070 */ lw $v0, 0x70($s0) /* 843614 80240A44 14400006 */ bnez $v0, .L80240A60 -/* 843618 80240A48 00000000 */ nop +/* 843618 80240A48 00000000 */ nop /* 84361C 80240A4C 8E020074 */ lw $v0, 0x74($s0) /* 843620 80240A50 14400003 */ bnez $v0, .L80240A60 /* 843624 80240A54 24020001 */ addiu $v0, $zero, 1 @@ -66,13 +66,13 @@ glabel func_802409D8_8435A8 /* 84368C 80240ABC 10730005 */ beq $v1, $s3, .L80240AD4 /* 843690 80240AC0 26100001 */ addiu $s0, $s0, 1 /* 843694 80240AC4 10720003 */ beq $v1, $s2, .L80240AD4 -/* 843698 80240AC8 00000000 */ nop +/* 843698 80240AC8 00000000 */ nop /* 84369C 80240ACC 00511024 */ and $v0, $v0, $s1 /* 8436A0 80240AD0 AC820000 */ sw $v0, ($a0) .L80240AD4: /* 8436A4 80240AD4 2A020040 */ slti $v0, $s0, 0x40 /* 8436A8 80240AD8 1440FFEF */ bnez $v0, .L80240A98 -/* 8436AC 80240ADC 00000000 */ nop +/* 8436AC 80240ADC 00000000 */ nop /* 8436B0 80240AE0 0000802D */ daddu $s0, $zero, $zero /* 8436B4 80240AE4 3C11F7FF */ lui $s1, 0xf7ff /* 8436B8 80240AE8 3631FFFF */ ori $s1, $s1, 0xffff @@ -85,7 +85,7 @@ glabel func_802409D8_8435A8 /* 8436D0 80240B00 8C640000 */ lw $a0, ($v1) /* 8436D4 80240B04 30820010 */ andi $v0, $a0, 0x10 /* 8436D8 80240B08 10400003 */ beqz $v0, .L80240B18 -/* 8436DC 80240B0C 00000000 */ nop +/* 8436DC 80240B0C 00000000 */ nop /* 8436E0 80240B10 00911024 */ and $v0, $a0, $s1 /* 8436E4 80240B14 AC620000 */ sw $v0, ($v1) .L80240B18: @@ -93,7 +93,7 @@ glabel func_802409D8_8435A8 /* 8436EC 80240B1C 1440FFF3 */ bnez $v0, .L80240AEC /* 8436F0 80240B20 24020002 */ addiu $v0, $zero, 2 /* 8436F4 80240B24 080902CC */ j .L80240B30 -/* 8436F8 80240B28 00000000 */ nop +/* 8436F8 80240B28 00000000 */ nop .L80240B2C: /* 8436FC 80240B2C 0000102D */ daddu $v0, $zero, $zero .L80240B30: diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240BD0_8437A0.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240BD0_8437A0.s index b93cac1a9f..9f4fdacafe 100644 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240BD0_8437A0.s +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240BD0_8437A0.s @@ -16,19 +16,19 @@ glabel func_80240BD0_8437A0 /* 8437CC 80240BFC 0220202D */ daddu $a0, $s1, $zero /* 8437D0 80240C00 3C05F4AC */ lui $a1, 0xf4ac /* 8437D4 80240C04 4482B000 */ mtc1 $v0, $f22 -/* 8437D8 80240C08 00000000 */ nop +/* 8437D8 80240C08 00000000 */ nop /* 8437DC 80240C0C 4680B5A0 */ cvt.s.w $f22, $f22 /* 8437E0 80240C10 0C0B1EAF */ jal get_variable /* 8437E4 80240C14 34A5D482 */ ori $a1, $a1, 0xd482 /* 8437E8 80240C18 0220202D */ daddu $a0, $s1, $zero /* 8437EC 80240C1C 3C05F4AC */ lui $a1, 0xf4ac /* 8437F0 80240C20 4482A000 */ mtc1 $v0, $f20 -/* 8437F4 80240C24 00000000 */ nop +/* 8437F4 80240C24 00000000 */ nop /* 8437F8 80240C28 4680A520 */ cvt.s.w $f20, $f20 /* 8437FC 80240C2C 0C0B1EAF */ jal get_variable /* 843800 80240C30 34A5D483 */ ori $a1, $a1, 0xd483 /* 843804 80240C34 44821000 */ mtc1 $v0, $f2 -/* 843808 80240C38 00000000 */ nop +/* 843808 80240C38 00000000 */ nop /* 84380C 80240C3C 468010A0 */ cvt.s.w $f2, $f2 /* 843810 80240C40 4405B000 */ mfc1 $a1, $f22 /* 843814 80240C44 4406A000 */ mfc1 $a2, $f20 @@ -45,19 +45,19 @@ glabel func_80240BD0_8437A0 /* 843840 80240C70 0220202D */ daddu $a0, $s1, $zero /* 843844 80240C74 3C05F4AC */ lui $a1, 0xf4ac /* 843848 80240C78 4482B000 */ mtc1 $v0, $f22 -/* 84384C 80240C7C 00000000 */ nop +/* 84384C 80240C7C 00000000 */ nop /* 843850 80240C80 4680B5A0 */ cvt.s.w $f22, $f22 /* 843854 80240C84 0C0B1EAF */ jal get_variable /* 843858 80240C88 34A5D482 */ ori $a1, $a1, 0xd482 /* 84385C 80240C8C 0220202D */ daddu $a0, $s1, $zero /* 843860 80240C90 3C05F4AC */ lui $a1, 0xf4ac /* 843864 80240C94 4482A000 */ mtc1 $v0, $f20 -/* 843868 80240C98 00000000 */ nop +/* 843868 80240C98 00000000 */ nop /* 84386C 80240C9C 4680A520 */ cvt.s.w $f20, $f20 /* 843870 80240CA0 0C0B1EAF */ jal get_variable /* 843874 80240CA4 34A5D483 */ ori $a1, $a1, 0xd483 /* 843878 80240CA8 44821000 */ mtc1 $v0, $f2 -/* 84387C 80240CAC 00000000 */ nop +/* 84387C 80240CAC 00000000 */ nop /* 843880 80240CB0 468010A0 */ cvt.s.w $f2, $f2 /* 843884 80240CB4 4405B000 */ mfc1 $a1, $f22 /* 843888 80240CB8 4406A000 */ mfc1 $a2, $f20 @@ -73,19 +73,19 @@ glabel func_80240BD0_8437A0 /* 8438B0 80240CE0 0220202D */ daddu $a0, $s1, $zero /* 8438B4 80240CE4 3C05F4AC */ lui $a1, 0xf4ac /* 8438B8 80240CE8 4482B000 */ mtc1 $v0, $f22 -/* 8438BC 80240CEC 00000000 */ nop +/* 8438BC 80240CEC 00000000 */ nop /* 8438C0 80240CF0 4680B5A0 */ cvt.s.w $f22, $f22 /* 8438C4 80240CF4 0C0B1EAF */ jal get_variable /* 8438C8 80240CF8 34A5D482 */ ori $a1, $a1, 0xd482 /* 8438CC 80240CFC 0220202D */ daddu $a0, $s1, $zero /* 8438D0 80240D00 3C05F4AC */ lui $a1, 0xf4ac /* 8438D4 80240D04 4482A000 */ mtc1 $v0, $f20 -/* 8438D8 80240D08 00000000 */ nop +/* 8438D8 80240D08 00000000 */ nop /* 8438DC 80240D0C 4680A520 */ cvt.s.w $f20, $f20 /* 8438E0 80240D10 0C0B1EAF */ jal get_variable /* 8438E4 80240D14 34A5D483 */ ori $a1, $a1, 0xd483 /* 8438E8 80240D18 44821000 */ mtc1 $v0, $f2 -/* 8438EC 80240D1C 00000000 */ nop +/* 8438EC 80240D1C 00000000 */ nop /* 8438F0 80240D20 468010A0 */ cvt.s.w $f2, $f2 /* 8438F4 80240D24 4405B000 */ mfc1 $a1, $f22 /* 8438F8 80240D28 4406A000 */ mfc1 $a2, $f20 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240DE8_8439B8.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240DE8_8439B8.s index 58315417c0..c5fe179c5a 100644 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240DE8_8439B8.s +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240DE8_8439B8.s @@ -44,7 +44,7 @@ glabel func_80240DE8_8439B8 /* 843A4C 80240E7C 3C048025 */ lui $a0, %hi(D_8024F5A0) /* 843A50 80240E80 8C84F5A0 */ lw $a0, %lo(D_8024F5A0)($a0) /* 843A54 80240E84 0C048D70 */ jal func_801235C0 -/* 843A58 80240E88 00000000 */ nop +/* 843A58 80240E88 00000000 */ nop /* 843A5C 80240E8C 24020002 */ addiu $v0, $zero, 2 .L80240E90: /* 843A60 80240E90 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241458_844028.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241458_844028.s index 7f5f212a0b..a807225d95 100644 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241458_844028.s +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241458_844028.s @@ -13,7 +13,7 @@ glabel func_80241458_844028 /* 844048 80241478 14620006 */ bne $v1, $v0, .L80241494 /* 84404C 8024147C 24020002 */ addiu $v0, $zero, 2 /* 844050 80241480 44800000 */ mtc1 $zero, $f0 -/* 844054 80241484 00000000 */ nop +/* 844054 80241484 00000000 */ nop /* 844058 80241488 44050000 */ mfc1 $a1, $f0 /* 84405C 8024148C 0809052B */ j .L802414AC /* 844060 80241490 0000202D */ daddu $a0, $zero, $zero @@ -21,9 +21,9 @@ glabel func_80241458_844028 /* 844064 80241494 14620008 */ bne $v1, $v0, .L802414B8 /* 844068 80241498 24040001 */ addiu $a0, $zero, 1 /* 84406C 8024149C 44800000 */ mtc1 $zero, $f0 -/* 844070 802414A0 00000000 */ nop +/* 844070 802414A0 00000000 */ nop /* 844074 802414A4 44050000 */ mfc1 $a1, $f0 -/* 844078 802414A8 00000000 */ nop +/* 844078 802414A8 00000000 */ nop .L802414AC: /* 84407C 802414AC 00A0302D */ daddu $a2, $a1, $zero /* 844080 802414B0 0C01C5A4 */ jal func_80071690 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802417AC_84437C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802417AC_84437C.s index 8b390c6dcb..eb75e8a613 100644 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802417AC_84437C.s +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802417AC_84437C.s @@ -28,7 +28,7 @@ glabel func_802417AC_84437C /* 8443D0 80241800 00220821 */ addu $at, $at, $v0 /* 8443D4 80241804 AC20F5D0 */ sw $zero, %lo(D_8024F5D0)($at) /* 8443D8 80241808 0809060E */ j .L80241838 -/* 8443DC 8024180C 00000000 */ nop +/* 8443DC 8024180C 00000000 */ nop .L80241810: /* 8443E0 80241810 3C038025 */ lui $v1, %hi(D_8024F5D0) /* 8443E4 80241814 2463F5D0 */ addiu $v1, $v1, %lo(D_8024F5D0) diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802418AC_84447C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802418AC_84447C.s index be25ef331d..139ebd10f7 100644 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802418AC_84447C.s +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802418AC_84447C.s @@ -29,13 +29,13 @@ glabel func_802418AC_84447C /* 8444D4 80241904 0461FFFD */ bgez $v1, .L802418FC /* 8444D8 80241908 2442FFFE */ addiu $v0, $v0, -2 /* 8444DC 8024190C 0C039E1B */ jal enforce_hpfp_limits -/* 8444E0 80241910 00000000 */ nop +/* 8444E0 80241910 00000000 */ nop /* 8444E4 80241914 0200202D */ daddu $a0, $s0, $zero /* 8444E8 80241918 0240282D */ daddu $a1, $s2, $zero /* 8444EC 8024191C 24060001 */ addiu $a2, $zero, 1 .L80241920: /* 8444F0 80241920 0C0B2026 */ jal set_variable -/* 8444F4 80241924 00000000 */ nop +/* 8444F4 80241924 00000000 */ nop /* 8444F8 80241928 24020002 */ addiu $v0, $zero, 2 /* 8444FC 8024192C 8FBF001C */ lw $ra, 0x1c($sp) /* 844500 80241930 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241A64_844634.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241A64_844634.s index 407c6b7e61..d60fda1fb0 100644 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241A64_844634.s +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241A64_844634.s @@ -16,12 +16,12 @@ glabel func_80241A64_844634 /* 844660 80241A90 50600007 */ beql $v1, $zero, .L80241AB0 /* 844664 80241A94 2406000A */ addiu $a2, $zero, 0xa /* 844668 80241A98 080906B5 */ j .L80241AD4 -/* 84466C 80241A9C 00000000 */ nop +/* 84466C 80241A9C 00000000 */ nop .L80241AA0: /* 844670 80241AA0 5062000A */ beql $v1, $v0, .L80241ACC /* 844674 80241AA4 2406FFFB */ addiu $a2, $zero, -5 /* 844678 80241AA8 080906B5 */ j .L80241AD4 -/* 84467C 80241AAC 00000000 */ nop +/* 84467C 80241AAC 00000000 */ nop .L80241AB0: /* 844680 80241AB0 2407FFFB */ addiu $a3, $zero, -5 /* 844684 80241AB4 080906B5 */ j .L80241AD4 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C40_844810.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C40_844810.s index 3348064228..f565f9efe8 100644 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C40_844810.s +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C40_844810.s @@ -5,7 +5,7 @@ glabel func_80241C40_844810 /* 844810 80241C40 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 844814 80241C44 AFBF0010 */ sw $ra, 0x10($sp) /* 844818 80241C48 0C03A631 */ jal func_800E98C4 -/* 84481C 80241C4C 00000000 */ nop +/* 84481C 80241C4C 00000000 */ nop /* 844820 80241C50 8FBF0010 */ lw $ra, 0x10($sp) /* 844824 80241C54 24020002 */ addiu $v0, $zero, 2 /* 844828 80241C58 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C60_844830.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C60_844830.s index c6961a1283..b418889706 100644 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C60_844830.s +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C60_844830.s @@ -5,12 +5,12 @@ glabel func_80241C60_844830 /* 844830 80241C60 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 844834 80241C64 AFBF0010 */ sw $ra, 0x10($sp) /* 844838 80241C68 0C03A631 */ jal func_800E98C4 -/* 84483C 80241C6C 00000000 */ nop +/* 84483C 80241C6C 00000000 */ nop /* 844840 80241C70 0C03A5D8 */ jal open_status_menu_long -/* 844844 80241C74 00000000 */ nop +/* 844844 80241C74 00000000 */ nop /* 844848 80241C78 8FBF0010 */ lw $ra, 0x10($sp) /* 84484C 80241C7C 24020002 */ addiu $v0, $zero, 2 /* 844850 80241C80 03E00008 */ jr $ra /* 844854 80241C84 27BD0018 */ addiu $sp, $sp, 0x18 -/* 844858 80241C88 00000000 */ nop -/* 84485C 80241C8C 00000000 */ nop +/* 844858 80241C88 00000000 */ nop +/* 84485C 80241C8C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241DAC_84497C.s b/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241DAC_84497C.s index 791613127a..7c30cccefc 100644 --- a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241DAC_84497C.s +++ b/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241DAC_84497C.s @@ -27,7 +27,7 @@ glabel func_80241DAC_84497C /* 8449D4 80241E04 D420F580 */ ldc1 $f0, %lo(D_8024F580)($at) /* 8449D8 80241E08 4600A521 */ cvt.d.s $f20, $f20 /* 8449DC 80241E0C 4620A502 */ mul.d $f20, $f20, $f0 -/* 8449E0 80241E10 00000000 */ nop +/* 8449E0 80241E10 00000000 */ nop /* 8449E4 80241E14 27B00058 */ addiu $s0, $sp, 0x58 /* 8449E8 80241E18 4620A520 */ cvt.s.d $f20, $f20 /* 8449EC 80241E1C 4405A000 */ mfc1 $a1, $f20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024030C_85247C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024030C_85247C.s index ba9ddf9ec6..68b7bc77ad 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024030C_85247C.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024030C_85247C.s @@ -48,9 +48,9 @@ glabel func_8024030C_85247C /* 852528 802403B8 4618A501 */ sub.s $f20, $f20, $f24 /* 85252C 802403BC 3C013F00 */ lui $at, 0x3f00 /* 852530 802403C0 44811000 */ mtc1 $at, $f2 -/* 852534 802403C4 00000000 */ nop +/* 852534 802403C4 00000000 */ nop /* 852538 802403C8 4602A502 */ mul.s $f20, $f20, $f2 -/* 85253C 802403CC 00000000 */ nop +/* 85253C 802403CC 00000000 */ nop /* 852540 802403D0 12000008 */ beqz $s0, .L802403F4 /* 852544 802403D4 46000586 */ mov.s $f22, $f0 /* 852548 802403D8 0233102A */ slt $v0, $s1, $s3 @@ -64,18 +64,18 @@ glabel func_8024030C_85247C /* 852564 802403F4 3C014334 */ lui $at, 0x4334 /* 852568 802403F8 44810000 */ mtc1 $at, $f0 /* 85256C 802403FC 44936000 */ mtc1 $s3, $f12 -/* 852570 80240400 00000000 */ nop +/* 852570 80240400 00000000 */ nop /* 852574 80240404 46806320 */ cvt.s.w $f12, $f12 /* 852578 80240408 46006302 */ mul.s $f12, $f12, $f0 -/* 85257C 8024040C 00000000 */ nop +/* 85257C 8024040C 00000000 */ nop /* 852580 80240410 44910000 */ mtc1 $s1, $f0 -/* 852584 80240414 00000000 */ nop +/* 852584 80240414 00000000 */ nop /* 852588 80240418 46800020 */ cvt.s.w $f0, $f0 /* 85258C 8024041C 46006303 */ div.s $f12, $f12, $f0 /* 852590 80240420 0C00A8D4 */ jal cos_deg /* 852594 80240424 46166300 */ add.s $f12, $f12, $f22 /* 852598 80240428 4600A002 */ mul.s $f0, $f20, $f0 -/* 85259C 8024042C 00000000 */ nop +/* 85259C 8024042C 00000000 */ nop /* 8525A0 80240430 4614C080 */ add.s $f2, $f24, $f20 /* 8525A4 80240434 46001081 */ sub.s $f2, $f2, $f0 /* 8525A8 80240438 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240490_852600.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240490_852600.s index 6f69c0633e..e534693b2f 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240490_852600.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240490_852600.s @@ -45,7 +45,7 @@ glabel func_80240490_852600 /* 85269C 8024052C 0C00A7B5 */ jal dist2D /* 8526A0 80240530 4600B386 */ mov.s $f14, $f22 /* 8526A4 80240534 4614003C */ c.lt.s $f0, $f20 -/* 8526A8 80240538 00000000 */ nop +/* 8526A8 80240538 00000000 */ nop /* 8526AC 8024053C 45000003 */ bc1f .L8024054C /* 8526B0 80240540 2631000C */ addiu $s1, $s1, 0xc /* 8526B4 80240544 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_80240490_852600 /* 8526E0 80240570 8E6200D0 */ lw $v0, 0xd0($s3) /* 8526E4 80240574 8C42007C */ lw $v0, 0x7c($v0) /* 8526E8 80240578 04410004 */ bgez $v0, .L8024058C -/* 8526EC 8024057C 00000000 */ nop +/* 8526EC 8024057C 00000000 */ nop /* 8526F0 80240580 C6C00000 */ lwc1 $f0, ($s6) /* 8526F4 80240584 0809016B */ j .L802405AC /* 8526F8 80240588 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_80240490_852600 /* 8526FC 8024058C 3C018025 */ lui $at, %hi(D_802527B0) /* 852700 80240590 D42227B0 */ ldc1 $f2, %lo(D_802527B0)($at) /* 852704 80240594 44820000 */ mtc1 $v0, $f0 -/* 852708 80240598 00000000 */ nop +/* 852708 80240598 00000000 */ nop /* 85270C 8024059C 46800021 */ cvt.d.w $f0, $f0 /* 852710 802405A0 46220003 */ div.d $f0, $f0, $f2 /* 852714 802405A4 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802405E8_852758.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802405E8_852758.s index d498b1573d..97e3d57bc1 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802405E8_852758.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802405E8_852758.s @@ -44,7 +44,7 @@ glabel func_802405E8_852758 /* 8527F4 80240684 2402000F */ addiu $v0, $zero, 0xf /* 8527F8 80240688 AFA2001C */ sw $v0, 0x1c($sp) /* 8527FC 8024068C 44833000 */ mtc1 $v1, $f6 -/* 852800 80240690 00000000 */ nop +/* 852800 80240690 00000000 */ nop /* 852804 80240694 468031A0 */ cvt.s.w $f6, $f6 /* 852808 80240698 44073000 */ mfc1 $a3, $f6 /* 85280C 8024069C 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_802405E8_852758 .L802406EC: /* 85285C 802406EC 8602008C */ lh $v0, 0x8c($s0) /* 852860 802406F0 1440005D */ bnez $v0, .L80240868 -/* 852864 802406F4 00000000 */ nop +/* 852864 802406F4 00000000 */ nop /* 852868 802406F8 C6000018 */ lwc1 $f0, 0x18($s0) /* 85286C 802406FC 3C014010 */ lui $at, 0x4010 /* 852870 80240700 44811800 */ mtc1 $at, $f3 /* 852874 80240704 44801000 */ mtc1 $zero, $f2 /* 852878 80240708 46000021 */ cvt.d.s $f0, $f0 /* 85287C 8024070C 4622003C */ c.lt.d $f0, $f2 -/* 852880 80240710 00000000 */ nop +/* 852880 80240710 00000000 */ nop /* 852884 80240714 45000003 */ bc1f .L80240724 /* 852888 80240718 0200202D */ daddu $a0, $s0, $zero /* 85288C 8024071C 080901CA */ j .L80240728 @@ -88,7 +88,7 @@ glabel func_802405E8_852758 /* 852894 80240724 24050001 */ addiu $a1, $zero, 1 .L80240728: /* 852898 80240728 0C00F598 */ jal func_8003D660 -/* 85289C 8024072C 00000000 */ nop +/* 85289C 8024072C 00000000 */ nop /* 8528A0 80240730 C60C0038 */ lwc1 $f12, 0x38($s0) /* 8528A4 80240734 8E430078 */ lw $v1, 0x78($s2) /* 8528A8 80240738 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_802405E8_852758 /* 8528D0 80240760 4406B000 */ mfc1 $a2, $f22 /* 8528D4 80240764 4407A000 */ mfc1 $a3, $f20 /* 8528D8 80240768 0C00A720 */ jal atan2 -/* 8528DC 8024076C 00000000 */ nop +/* 8528DC 8024076C 00000000 */ nop /* 8528E0 80240770 8E050018 */ lw $a1, 0x18($s0) /* 8528E4 80240774 44060000 */ mfc1 $a2, $f0 /* 8528E8 80240778 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_802405E8_852758 /* 8528FC 8024078C 4406B000 */ mfc1 $a2, $f22 /* 852900 80240790 4407A000 */ mfc1 $a3, $f20 /* 852904 80240794 0C00A7B5 */ jal dist2D -/* 852908 80240798 00000000 */ nop +/* 852908 80240798 00000000 */ nop /* 85290C 8024079C C6020018 */ lwc1 $f2, 0x18($s0) /* 852910 802407A0 4602003E */ c.le.s $f0, $f2 -/* 852914 802407A4 00000000 */ nop +/* 852914 802407A4 00000000 */ nop /* 852918 802407A8 4500002F */ bc1f .L80240868 /* 85291C 802407AC 240403E8 */ addiu $a0, $zero, 0x3e8 /* 852920 802407B0 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_802405E8_852758 /* 852974 80240804 18400003 */ blez $v0, .L80240814 /* 852978 80240808 24020004 */ addiu $v0, $zero, 4 /* 85297C 8024080C 14600002 */ bnez $v1, .L80240818 -/* 852980 80240810 00000000 */ nop +/* 852980 80240810 00000000 */ nop .L80240814: /* 852984 80240814 AE420070 */ sw $v0, 0x70($s2) .L80240818: diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240950_852AC0.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240950_852AC0.s index a40e254d68..6d59accf18 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240950_852AC0.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240950_852AC0.s @@ -38,7 +38,7 @@ glabel func_80240950_852AC0 /* 852B44 802409D4 2402000F */ addiu $v0, $zero, 0xf /* 852B48 802409D8 AFA2001C */ sw $v0, 0x1c($sp) /* 852B4C 802409DC 44833000 */ mtc1 $v1, $f6 -/* 852B50 802409E0 00000000 */ nop +/* 852B50 802409E0 00000000 */ nop /* 852B54 802409E4 468031A0 */ cvt.s.w $f6, $f6 /* 852B58 802409E8 44073000 */ mfc1 $a3, $f6 /* 852B5C 802409EC 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_80240950_852AC0 .L80240A50: /* 852BC0 80240A50 8602008C */ lh $v0, 0x8c($s0) /* 852BC4 80240A54 14400025 */ bnez $v0, .L80240AEC -/* 852BC8 80240A58 00000000 */ nop +/* 852BC8 80240A58 00000000 */ nop /* 852BCC 80240A5C 9602008E */ lhu $v0, 0x8e($s0) /* 852BD0 80240A60 2442FFFF */ addiu $v0, $v0, -1 /* 852BD4 80240A64 A602008E */ sh $v0, 0x8e($s0) /* 852BD8 80240A68 00021400 */ sll $v0, $v0, 0x10 /* 852BDC 80240A6C 1440001F */ bnez $v0, .L80240AEC -/* 852BE0 80240A70 00000000 */ nop +/* 852BE0 80240A70 00000000 */ nop /* 852BE4 80240A74 8E820074 */ lw $v0, 0x74($s4) /* 852BE8 80240A78 2442FFFF */ addiu $v0, $v0, -1 /* 852BEC 80240A7C 10400019 */ beqz $v0, .L80240AE4 @@ -84,7 +84,7 @@ glabel func_80240950_852AC0 /* 852BF8 80240A88 9442002A */ lhu $v0, 0x2a($v0) /* 852BFC 80240A8C 30420010 */ andi $v0, $v0, 0x10 /* 852C00 80240A90 14400007 */ bnez $v0, .L80240AB0 -/* 852C04 80240A94 00000000 */ nop +/* 852C04 80240A94 00000000 */ nop /* 852C08 80240A98 C600000C */ lwc1 $f0, 0xc($s0) /* 852C0C 80240A9C 3C014334 */ lui $at, 0x4334 /* 852C10 80240AA0 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240B0C_852C7C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240B0C_852C7C.s index 295fb54404..cb431ec975 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240B0C_852C7C.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240B0C_852C7C.s @@ -28,7 +28,7 @@ glabel func_80240B0C_852C7C /* 852CD4 80240B64 8E0200D0 */ lw $v0, 0xd0($s0) /* 852CD8 80240B68 8C42007C */ lw $v0, 0x7c($v0) /* 852CDC 80240B6C 04410004 */ bgez $v0, .L80240B80 -/* 852CE0 80240B70 00000000 */ nop +/* 852CE0 80240B70 00000000 */ nop /* 852CE4 80240B74 C6400000 */ lwc1 $f0, ($s2) /* 852CE8 80240B78 080902E8 */ j .L80240BA0 /* 852CEC 80240B7C E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_80240B0C_852C7C /* 852CF0 80240B80 3C018025 */ lui $at, %hi(D_802527B8) /* 852CF4 80240B84 D42227B8 */ ldc1 $f2, %lo(D_802527B8)($at) /* 852CF8 80240B88 44820000 */ mtc1 $v0, $f0 -/* 852CFC 80240B8C 00000000 */ nop +/* 852CFC 80240B8C 00000000 */ nop /* 852D00 80240B90 46800021 */ cvt.d.w $f0, $f0 /* 852D04 80240B94 46220003 */ div.d $f0, $f0, $f2 /* 852D08 80240B98 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240CAC_852E1C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240CAC_852E1C.s index acdea58840..95f87d3037 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240CAC_852E1C.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240CAC_852E1C.s @@ -47,20 +47,20 @@ glabel func_80240CAC_852E1C /* 852EC4 80240D54 8E02001C */ lw $v0, 0x1c($s0) /* 852EC8 80240D58 46001005 */ abs.s $f0, $f2 /* 852ECC 80240D5C 44822000 */ mtc1 $v0, $f4 -/* 852ED0 80240D60 00000000 */ nop +/* 852ED0 80240D60 00000000 */ nop /* 852ED4 80240D64 46802120 */ cvt.s.w $f4, $f4 /* 852ED8 80240D68 4600203C */ c.lt.s $f4, $f0 -/* 852EDC 80240D6C 00000000 */ nop +/* 852EDC 80240D6C 00000000 */ nop /* 852EE0 80240D70 4500000D */ bc1f .L80240DA8 -/* 852EE4 80240D74 00000000 */ nop +/* 852EE4 80240D74 00000000 */ nop /* 852EE8 80240D78 44800000 */ mtc1 $zero, $f0 /* 852EEC 80240D7C C654000C */ lwc1 $f20, 0xc($s2) /* 852EF0 80240D80 4600103C */ c.lt.s $f2, $f0 -/* 852EF4 80240D84 00000000 */ nop +/* 852EF4 80240D84 00000000 */ nop /* 852EF8 80240D88 45000006 */ bc1f .L80240DA4 /* 852EFC 80240D8C 00021023 */ negu $v0, $v0 /* 852F00 80240D90 44820000 */ mtc1 $v0, $f0 -/* 852F04 80240D94 00000000 */ nop +/* 852F04 80240D94 00000000 */ nop /* 852F08 80240D98 46800020 */ cvt.s.w $f0, $f0 /* 852F0C 80240D9C 0809036A */ j .L80240DA8 /* 852F10 80240DA0 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240DDC_852F4C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240DDC_852F4C.s index d21852e473..28061054c2 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240DDC_852F4C.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240DDC_852F4C.s @@ -37,7 +37,7 @@ glabel func_80240DDC_852F4C /* 852FCC 80240E5C 2402000F */ addiu $v0, $zero, 0xf /* 852FD0 80240E60 AFA2001C */ sw $v0, 0x1c($sp) /* 852FD4 80240E64 44833000 */ mtc1 $v1, $f6 -/* 852FD8 80240E68 00000000 */ nop +/* 852FD8 80240E68 00000000 */ nop /* 852FDC 80240E6C 468031A0 */ cvt.s.w $f6, $f6 /* 852FE0 80240E70 44073000 */ mfc1 $a3, $f6 /* 852FE4 80240E74 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240F64_8530D4.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240F64_8530D4.s index dec38886f3..ca17fc179e 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240F64_8530D4.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240F64_8530D4.s @@ -28,7 +28,7 @@ glabel func_80240F64_8530D4 /* 85312C 80240FBC C4400008 */ lwc1 $f0, 8($v0) /* 853130 80240FC0 46800020 */ cvt.s.w $f0, $f0 /* 853134 80240FC4 4602003E */ c.le.s $f0, $f2 -/* 853138 80240FC8 00000000 */ nop +/* 853138 80240FC8 00000000 */ nop /* 85313C 80240FCC 45020003 */ bc1fl .L80240FDC /* 853140 80240FD0 24840001 */ addiu $a0, $a0, 1 /* 853144 80240FD4 080903FB */ j .L80240FEC diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s index cd6c2ee893..940ec9d801 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s @@ -46,7 +46,7 @@ glabel func_80241024_853194 /* 853238 802410C8 8E2200B0 */ lw $v0, 0xb0($s1) /* 85323C 802410CC 30420004 */ andi $v0, $v0, 4 /* 853240 802410D0 10400044 */ beqz $v0, .L802411E4 -/* 853244 802410D4 00000000 */ nop +/* 853244 802410D4 00000000 */ nop .L802410D8: /* 853248 802410D8 2404F7FF */ addiu $a0, $zero, -0x801 /* 85324C 802410DC AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80241024_853194 /* 853300 80241190 3C0142C8 */ lui $at, 0x42c8 /* 853304 80241194 44812000 */ mtc1 $at, $f4 /* 853308 80241198 44823000 */ mtc1 $v0, $f6 -/* 85330C 8024119C 00000000 */ nop +/* 85330C 8024119C 00000000 */ nop /* 853310 802411A0 468031A0 */ cvt.s.w $f6, $f6 /* 853314 802411A4 27A20044 */ addiu $v0, $sp, 0x44 /* 853318 802411A8 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80241024_853194 /* 85333C 802411CC 0C0372DF */ jal func_800DCB7C /* 853340 802411D0 27A70040 */ addiu $a3, $sp, 0x40 /* 853344 802411D4 10400003 */ beqz $v0, .L802411E4 -/* 853348 802411D8 00000000 */ nop +/* 853348 802411D8 00000000 */ nop /* 85334C 802411DC C7A0003C */ lwc1 $f0, 0x3c($sp) /* 853350 802411E0 E640003C */ swc1 $f0, 0x3c($s2) .L802411E4: @@ -124,72 +124,85 @@ glabel func_80241024_853194 /* 853358 802411E8 2C620064 */ sltiu $v0, $v1, 0x64 /* 85335C 802411EC 10400042 */ beqz $v0, .L802412F8 /* 853360 802411F0 00031080 */ sll $v0, $v1, 2 -/* 853364 802411F4 3C018025 */ lui $at, %hi(D_802527C0) +/* 853364 802411F4 3C018025 */ lui $at, %hi(jtbl_802527C0_864930) /* 853368 802411F8 00220821 */ addu $at, $at, $v0 -/* 85336C 802411FC 8C2227C0 */ lw $v0, %lo(D_802527C0)($at) +/* 85336C 802411FC 8C2227C0 */ lw $v0, %lo(jtbl_802527C0_864930)($at) /* 853370 80241200 00400008 */ jr $v0 -/* 853374 80241204 00000000 */ nop +/* 853374 80241204 00000000 */ nop +glabel L80241208_853378 /* 853378 80241208 0280202D */ daddu $a0, $s4, $zero /* 85337C 8024120C 0260282D */ daddu $a1, $s3, $zero /* 853380 80241210 0C090124 */ jal func_80240490_852600 /* 853384 80241214 02A0302D */ daddu $a2, $s5, $zero +glabel L80241218_853388 /* 853388 80241218 0280202D */ daddu $a0, $s4, $zero /* 85338C 8024121C 0260282D */ daddu $a1, $s3, $zero /* 853390 80241220 0C09017A */ jal func_802405E8_852758 /* 853394 80241224 02A0302D */ daddu $a2, $s5, $zero /* 853398 80241228 080904BE */ j .L802412F8 -/* 85339C 8024122C 00000000 */ nop +/* 85339C 8024122C 00000000 */ nop +glabel L80241230_8533A0 /* 8533A0 80241230 0280202D */ daddu $a0, $s4, $zero /* 8533A4 80241234 0260282D */ daddu $a1, $s3, $zero /* 8533A8 80241238 0C090224 */ jal mac_05_UnkNpcAIFunc1 /* 8533AC 8024123C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241240_8533B0 /* 8533B0 80241240 0280202D */ daddu $a0, $s4, $zero /* 8533B4 80241244 0260282D */ daddu $a1, $s3, $zero /* 8533B8 80241248 0C090254 */ jal func_80240950_852AC0 /* 8533BC 8024124C 02A0302D */ daddu $a2, $s5, $zero /* 8533C0 80241250 080904BE */ j .L802412F8 -/* 8533C4 80241254 00000000 */ nop +/* 8533C4 80241254 00000000 */ nop +glabel L80241258_8533C8 /* 8533C8 80241258 0280202D */ daddu $a0, $s4, $zero /* 8533CC 8024125C 0260282D */ daddu $a1, $s3, $zero /* 8533D0 80241260 0C0902C3 */ jal func_80240B0C_852C7C /* 8533D4 80241264 02A0302D */ daddu $a2, $s5, $zero /* 8533D8 80241268 080904BE */ j .L802412F8 -/* 8533DC 8024126C 00000000 */ nop +/* 8533DC 8024126C 00000000 */ nop +glabel L80241270_8533E0 /* 8533E0 80241270 0280202D */ daddu $a0, $s4, $zero /* 8533E4 80241274 0260282D */ daddu $a1, $s3, $zero /* 8533E8 80241278 0C0902F0 */ jal mac_05_NpcJumpFunc2 /* 8533EC 8024127C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241280_8533F0 /* 8533F0 80241280 0280202D */ daddu $a0, $s4, $zero /* 8533F4 80241284 0260282D */ daddu $a1, $s3, $zero /* 8533F8 80241288 0C09030D */ jal mac_05_NpcJumpFunc /* 8533FC 8024128C 02A0302D */ daddu $a2, $s5, $zero /* 853400 80241290 080904BE */ j .L802412F8 -/* 853404 80241294 00000000 */ nop +/* 853404 80241294 00000000 */ nop +glabel L80241298_853408 /* 853408 80241298 0280202D */ daddu $a0, $s4, $zero /* 85340C 8024129C 0260282D */ daddu $a1, $s3, $zero /* 853410 802412A0 0C09032B */ jal func_80240CAC_852E1C /* 853414 802412A4 02A0302D */ daddu $a2, $s5, $zero +glabel L802412A8_853418 /* 853418 802412A8 0280202D */ daddu $a0, $s4, $zero /* 85341C 802412AC 0260282D */ daddu $a1, $s3, $zero /* 853420 802412B0 0C090377 */ jal func_80240DDC_852F4C /* 853424 802412B4 02A0302D */ daddu $a2, $s5, $zero /* 853428 802412B8 080904BE */ j .L802412F8 -/* 85342C 802412BC 00000000 */ nop +/* 85342C 802412BC 00000000 */ nop +glabel L802412C0_853430 /* 853430 802412C0 0280202D */ daddu $a0, $s4, $zero /* 853434 802412C4 0260282D */ daddu $a1, $s3, $zero /* 853438 802412C8 0C0903BF */ jal mac_05_UnkNpcDurationFlagFunc /* 85343C 802412CC 02A0302D */ daddu $a2, $s5, $zero /* 853440 802412D0 080904BE */ j .L802412F8 -/* 853444 802412D4 00000000 */ nop +/* 853444 802412D4 00000000 */ nop +glabel L802412D8_853448 /* 853448 802412D8 0280202D */ daddu $a0, $s4, $zero /* 85344C 802412DC 0260282D */ daddu $a1, $s3, $zero /* 853450 802412E0 0C0903D9 */ jal func_80240F64_8530D4 /* 853454 802412E4 02A0302D */ daddu $a2, $s5, $zero /* 853458 802412E8 080904BE */ j .L802412F8 -/* 85345C 802412EC 00000000 */ nop +/* 85345C 802412EC 00000000 */ nop +glabel L802412F0_853460 /* 853460 802412F0 0C0129CF */ jal func_8004A73C /* 853464 802412F4 0280202D */ daddu $a0, $s4, $zero .L802412F8: +glabel L802412F8_853468 /* 853468 802412F8 8FBF0060 */ lw $ra, 0x60($sp) /* 85346C 802412FC 8FB5005C */ lw $s5, 0x5c($sp) /* 853470 80241300 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241320_853490.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241320_853490.s index 812d35af22..c5d910b61c 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241320_853490.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241320_853490.s @@ -26,7 +26,7 @@ glabel func_80241320_853490 /* 8534E0 80241370 1440FFFA */ bnez $v0, .L8024135C /* 8534E4 80241374 24A50004 */ addiu $a1, $a1, 4 /* 8534E8 80241378 080904EF */ j .L802413BC -/* 8534EC 8024137C 00000000 */ nop +/* 8534EC 8024137C 00000000 */ nop .L80241380: /* 8534F0 80241380 0000182D */ daddu $v1, $zero, $zero /* 8534F4 80241384 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024145C_8535CC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024145C_8535CC.s index e20eb08ce7..37cfd3a088 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024145C_8535CC.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024145C_8535CC.s @@ -115,7 +115,7 @@ glabel func_8024145C_8535CC /* 853774 80241604 14E20005 */ bne $a3, $v0, .L8024161C /* 853778 80241608 32E2FFFF */ andi $v0, $s7, 0xffff /* 85377C 8024160C 14400003 */ bnez $v0, .L8024161C -/* 853780 80241610 00000000 */ nop +/* 853780 80241610 00000000 */ nop /* 853784 80241614 14800008 */ bnez $a0, .L80241638 /* 853788 80241618 24020001 */ addiu $v0, $zero, 1 .L8024161C: @@ -123,7 +123,7 @@ glabel func_8024145C_8535CC /* 853790 80241620 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 853794 80241624 80420075 */ lb $v0, 0x75($v0) /* 853798 80241628 10400005 */ beqz $v0, .L80241640 -/* 85379C 8024162C 00000000 */ nop +/* 85379C 8024162C 00000000 */ nop /* 8537A0 80241630 10800003 */ beqz $a0, .L80241640 /* 8537A4 80241634 24020001 */ addiu $v0, $zero, 1 .L80241638: diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024174C_8538BC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024174C_8538BC.s index 0ddfb6df66..62265356b0 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024174C_8538BC.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024174C_8538BC.s @@ -39,13 +39,13 @@ glabel func_8024174C_8538BC /* 853940 802417D0 10740005 */ beq $v1, $s4, .L802417E8 /* 853944 802417D4 26100001 */ addiu $s0, $s0, 1 /* 853948 802417D8 10730003 */ beq $v1, $s3, .L802417E8 -/* 85394C 802417DC 00000000 */ nop +/* 85394C 802417DC 00000000 */ nop /* 853950 802417E0 00521025 */ or $v0, $v0, $s2 /* 853954 802417E4 AC820000 */ sw $v0, ($a0) .L802417E8: /* 853958 802417E8 2A020040 */ slti $v0, $s0, 0x40 /* 85395C 802417EC 1440FFEF */ bnez $v0, .L802417AC -/* 853960 802417F0 00000000 */ nop +/* 853960 802417F0 00000000 */ nop /* 853964 802417F4 0000802D */ daddu $s0, $zero, $zero /* 853968 802417F8 3C120800 */ lui $s2, 0x800 .L802417FC: @@ -57,13 +57,13 @@ glabel func_8024174C_8538BC /* 853980 80241810 8C640000 */ lw $a0, ($v1) /* 853984 80241814 30820010 */ andi $v0, $a0, 0x10 /* 853988 80241818 10400003 */ beqz $v0, .L80241828 -/* 85398C 8024181C 00000000 */ nop +/* 85398C 8024181C 00000000 */ nop /* 853990 80241820 00921025 */ or $v0, $a0, $s2 /* 853994 80241824 AC620000 */ sw $v0, ($v1) .L80241828: /* 853998 80241828 2A020100 */ slti $v0, $s0, 0x100 /* 85399C 8024182C 1440FFF3 */ bnez $v0, .L802417FC -/* 8539A0 80241830 00000000 */ nop +/* 8539A0 80241830 00000000 */ nop /* 8539A4 80241834 AE200070 */ sw $zero, 0x70($s1) .L80241838: /* 8539A8 80241838 8E220070 */ lw $v0, 0x70($s1) diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241898_853A08.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241898_853A08.s index b04aa09657..6ee87cd003 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241898_853A08.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241898_853A08.s @@ -32,7 +32,7 @@ glabel func_80241898_853A08 /* 853A6C 802418FC 0080302D */ daddu $a2, $a0, $zero /* 853A70 80241900 8E020070 */ lw $v0, 0x70($s0) /* 853A74 80241904 14400006 */ bnez $v0, .L80241920 -/* 853A78 80241908 00000000 */ nop +/* 853A78 80241908 00000000 */ nop /* 853A7C 8024190C 8E020074 */ lw $v0, 0x74($s0) /* 853A80 80241910 14400003 */ bnez $v0, .L80241920 /* 853A84 80241914 24020001 */ addiu $v0, $zero, 1 @@ -66,13 +66,13 @@ glabel func_80241898_853A08 /* 853AEC 8024197C 10730005 */ beq $v1, $s3, .L80241994 /* 853AF0 80241980 26100001 */ addiu $s0, $s0, 1 /* 853AF4 80241984 10720003 */ beq $v1, $s2, .L80241994 -/* 853AF8 80241988 00000000 */ nop +/* 853AF8 80241988 00000000 */ nop /* 853AFC 8024198C 00511024 */ and $v0, $v0, $s1 /* 853B00 80241990 AC820000 */ sw $v0, ($a0) .L80241994: /* 853B04 80241994 2A020040 */ slti $v0, $s0, 0x40 /* 853B08 80241998 1440FFEF */ bnez $v0, .L80241958 -/* 853B0C 8024199C 00000000 */ nop +/* 853B0C 8024199C 00000000 */ nop /* 853B10 802419A0 0000802D */ daddu $s0, $zero, $zero /* 853B14 802419A4 3C11F7FF */ lui $s1, 0xf7ff /* 853B18 802419A8 3631FFFF */ ori $s1, $s1, 0xffff @@ -85,7 +85,7 @@ glabel func_80241898_853A08 /* 853B30 802419C0 8C640000 */ lw $a0, ($v1) /* 853B34 802419C4 30820010 */ andi $v0, $a0, 0x10 /* 853B38 802419C8 10400003 */ beqz $v0, .L802419D8 -/* 853B3C 802419CC 00000000 */ nop +/* 853B3C 802419CC 00000000 */ nop /* 853B40 802419D0 00911024 */ and $v0, $a0, $s1 /* 853B44 802419D4 AC620000 */ sw $v0, ($v1) .L802419D8: @@ -93,7 +93,7 @@ glabel func_80241898_853A08 /* 853B4C 802419DC 1440FFF3 */ bnez $v0, .L802419AC /* 853B50 802419E0 24020002 */ addiu $v0, $zero, 2 /* 853B54 802419E4 0809067C */ j .L802419F0 -/* 853B58 802419E8 00000000 */ nop +/* 853B58 802419E8 00000000 */ nop .L802419EC: /* 853B5C 802419EC 0000102D */ daddu $v0, $zero, $zero .L802419F0: diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A90_853C00.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A90_853C00.s index d719db6cd6..046e0c8820 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A90_853C00.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A90_853C00.s @@ -16,19 +16,19 @@ glabel func_80241A90_853C00 /* 853C2C 80241ABC 0220202D */ daddu $a0, $s1, $zero /* 853C30 80241AC0 3C05F4AC */ lui $a1, 0xf4ac /* 853C34 80241AC4 4482B000 */ mtc1 $v0, $f22 -/* 853C38 80241AC8 00000000 */ nop +/* 853C38 80241AC8 00000000 */ nop /* 853C3C 80241ACC 4680B5A0 */ cvt.s.w $f22, $f22 /* 853C40 80241AD0 0C0B1EAF */ jal get_variable /* 853C44 80241AD4 34A5D482 */ ori $a1, $a1, 0xd482 /* 853C48 80241AD8 0220202D */ daddu $a0, $s1, $zero /* 853C4C 80241ADC 3C05F4AC */ lui $a1, 0xf4ac /* 853C50 80241AE0 4482A000 */ mtc1 $v0, $f20 -/* 853C54 80241AE4 00000000 */ nop +/* 853C54 80241AE4 00000000 */ nop /* 853C58 80241AE8 4680A520 */ cvt.s.w $f20, $f20 /* 853C5C 80241AEC 0C0B1EAF */ jal get_variable /* 853C60 80241AF0 34A5D483 */ ori $a1, $a1, 0xd483 /* 853C64 80241AF4 44821000 */ mtc1 $v0, $f2 -/* 853C68 80241AF8 00000000 */ nop +/* 853C68 80241AF8 00000000 */ nop /* 853C6C 80241AFC 468010A0 */ cvt.s.w $f2, $f2 /* 853C70 80241B00 4405B000 */ mfc1 $a1, $f22 /* 853C74 80241B04 4406A000 */ mfc1 $a2, $f20 @@ -45,19 +45,19 @@ glabel func_80241A90_853C00 /* 853CA0 80241B30 0220202D */ daddu $a0, $s1, $zero /* 853CA4 80241B34 3C05F4AC */ lui $a1, 0xf4ac /* 853CA8 80241B38 4482B000 */ mtc1 $v0, $f22 -/* 853CAC 80241B3C 00000000 */ nop +/* 853CAC 80241B3C 00000000 */ nop /* 853CB0 80241B40 4680B5A0 */ cvt.s.w $f22, $f22 /* 853CB4 80241B44 0C0B1EAF */ jal get_variable /* 853CB8 80241B48 34A5D482 */ ori $a1, $a1, 0xd482 /* 853CBC 80241B4C 0220202D */ daddu $a0, $s1, $zero /* 853CC0 80241B50 3C05F4AC */ lui $a1, 0xf4ac /* 853CC4 80241B54 4482A000 */ mtc1 $v0, $f20 -/* 853CC8 80241B58 00000000 */ nop +/* 853CC8 80241B58 00000000 */ nop /* 853CCC 80241B5C 4680A520 */ cvt.s.w $f20, $f20 /* 853CD0 80241B60 0C0B1EAF */ jal get_variable /* 853CD4 80241B64 34A5D483 */ ori $a1, $a1, 0xd483 /* 853CD8 80241B68 44821000 */ mtc1 $v0, $f2 -/* 853CDC 80241B6C 00000000 */ nop +/* 853CDC 80241B6C 00000000 */ nop /* 853CE0 80241B70 468010A0 */ cvt.s.w $f2, $f2 /* 853CE4 80241B74 4405B000 */ mfc1 $a1, $f22 /* 853CE8 80241B78 4406A000 */ mfc1 $a2, $f20 @@ -73,19 +73,19 @@ glabel func_80241A90_853C00 /* 853D10 80241BA0 0220202D */ daddu $a0, $s1, $zero /* 853D14 80241BA4 3C05F4AC */ lui $a1, 0xf4ac /* 853D18 80241BA8 4482B000 */ mtc1 $v0, $f22 -/* 853D1C 80241BAC 00000000 */ nop +/* 853D1C 80241BAC 00000000 */ nop /* 853D20 80241BB0 4680B5A0 */ cvt.s.w $f22, $f22 /* 853D24 80241BB4 0C0B1EAF */ jal get_variable /* 853D28 80241BB8 34A5D482 */ ori $a1, $a1, 0xd482 /* 853D2C 80241BBC 0220202D */ daddu $a0, $s1, $zero /* 853D30 80241BC0 3C05F4AC */ lui $a1, 0xf4ac /* 853D34 80241BC4 4482A000 */ mtc1 $v0, $f20 -/* 853D38 80241BC8 00000000 */ nop +/* 853D38 80241BC8 00000000 */ nop /* 853D3C 80241BCC 4680A520 */ cvt.s.w $f20, $f20 /* 853D40 80241BD0 0C0B1EAF */ jal get_variable /* 853D44 80241BD4 34A5D483 */ ori $a1, $a1, 0xd483 /* 853D48 80241BD8 44821000 */ mtc1 $v0, $f2 -/* 853D4C 80241BDC 00000000 */ nop +/* 853D4C 80241BDC 00000000 */ nop /* 853D50 80241BE0 468010A0 */ cvt.s.w $f2, $f2 /* 853D54 80241BE4 4405B000 */ mfc1 $a1, $f22 /* 853D58 80241BE8 4406A000 */ mfc1 $a2, $f20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241CA8_853E18.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241CA8_853E18.s index fe3f436510..e2bc3aee3f 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241CA8_853E18.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241CA8_853E18.s @@ -44,7 +44,7 @@ glabel func_80241CA8_853E18 /* 853EAC 80241D3C 3C048025 */ lui $a0, %hi(D_802529D0) /* 853EB0 80241D40 8C8429D0 */ lw $a0, %lo(D_802529D0)($a0) /* 853EB4 80241D44 0C048D70 */ jal func_801235C0 -/* 853EB8 80241D48 00000000 */ nop +/* 853EB8 80241D48 00000000 */ nop /* 853EBC 80241D4C 24020002 */ addiu $v0, $zero, 2 .L80241D50: /* 853EC0 80241D50 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242318_854488.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242318_854488.s index 234a66f377..92ad2c7e55 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242318_854488.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242318_854488.s @@ -13,7 +13,7 @@ glabel func_80242318_854488 /* 8544A8 80242338 14620006 */ bne $v1, $v0, .L80242354 /* 8544AC 8024233C 24020002 */ addiu $v0, $zero, 2 /* 8544B0 80242340 44800000 */ mtc1 $zero, $f0 -/* 8544B4 80242344 00000000 */ nop +/* 8544B4 80242344 00000000 */ nop /* 8544B8 80242348 44050000 */ mfc1 $a1, $f0 /* 8544BC 8024234C 080908DB */ j .L8024236C /* 8544C0 80242350 0000202D */ daddu $a0, $zero, $zero @@ -21,9 +21,9 @@ glabel func_80242318_854488 /* 8544C4 80242354 14620008 */ bne $v1, $v0, .L80242378 /* 8544C8 80242358 24040001 */ addiu $a0, $zero, 1 /* 8544CC 8024235C 44800000 */ mtc1 $zero, $f0 -/* 8544D0 80242360 00000000 */ nop +/* 8544D0 80242360 00000000 */ nop /* 8544D4 80242364 44050000 */ mfc1 $a1, $f0 -/* 8544D8 80242368 00000000 */ nop +/* 8544D8 80242368 00000000 */ nop .L8024236C: /* 8544DC 8024236C 00A0302D */ daddu $a2, $a1, $zero /* 8544E0 80242370 0C01C5A4 */ jal func_80071690 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024266C_8547DC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024266C_8547DC.s index e30d77e883..989fe5ea27 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024266C_8547DC.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024266C_8547DC.s @@ -28,7 +28,7 @@ glabel func_8024266C_8547DC /* 854830 802426C0 00220821 */ addu $at, $at, $v0 /* 854834 802426C4 AC202A00 */ sw $zero, %lo(D_80252A00)($at) /* 854838 802426C8 080909BE */ j .L802426F8 -/* 85483C 802426CC 00000000 */ nop +/* 85483C 802426CC 00000000 */ nop .L802426D0: /* 854840 802426D0 3C038025 */ lui $v1, %hi(D_80252A00) /* 854844 802426D4 24632A00 */ addiu $v1, $v1, %lo(D_80252A00) diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242708_854878.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242708_854878.s index ed10fd71a5..ab1ab67f65 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242708_854878.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242708_854878.s @@ -28,7 +28,7 @@ glabel func_80242708_854878 /* 8548CC 8024275C 00220821 */ addu $at, $at, $v0 /* 8548D0 80242760 AC202BC8 */ sw $zero, %lo(D_80252BC8)($at) /* 8548D4 80242764 080909E5 */ j .L80242794 -/* 8548D8 80242768 00000000 */ nop +/* 8548D8 80242768 00000000 */ nop .L8024276C: /* 8548DC 8024276C 3C038025 */ lui $v1, %hi(D_80252BC8) /* 8548E0 80242770 24632BC8 */ addiu $v1, $v1, %lo(D_80252BC8) diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A90_854C00.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A90_854C00.s index 74e74843a8..a2c234fdcf 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A90_854C00.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A90_854C00.s @@ -30,23 +30,27 @@ glabel func_80242A90_854C00 /* 854C64 80242AF4 2E220005 */ sltiu $v0, $s1, 5 /* 854C68 80242AF8 10400024 */ beqz $v0, .L80242B8C /* 854C6C 80242AFC 00111080 */ sll $v0, $s1, 2 -/* 854C70 80242B00 3C018025 */ lui $at, %hi(D_80252950) +/* 854C70 80242B00 3C018025 */ lui $at, %hi(jtbl_80252950_864AC0) /* 854C74 80242B04 00220821 */ addu $at, $at, $v0 -/* 854C78 80242B08 8C222950 */ lw $v0, %lo(D_80252950)($at) +/* 854C78 80242B08 8C222950 */ lw $v0, %lo(jtbl_80252950_864AC0)($at) /* 854C7C 80242B0C 00400008 */ jr $v0 -/* 854C80 80242B10 00000000 */ nop +/* 854C80 80242B10 00000000 */ nop +glabel L80242B14_854C84 /* 854C84 80242B14 3C01425C */ lui $at, 0x425c /* 854C88 80242B18 4481D000 */ mtc1 $at, $f26 /* 854C8C 80242B1C 08090AEB */ j .L80242BAC /* 854C90 80242B20 2A220003 */ slti $v0, $s1, 3 +glabel L80242B24_854C94 /* 854C94 80242B24 3C0142AA */ lui $at, 0x42aa /* 854C98 80242B28 4481D000 */ mtc1 $at, $f26 /* 854C9C 80242B2C 08090AEB */ j .L80242BAC /* 854CA0 80242B30 2A220003 */ slti $v0, $s1, 3 +glabel L80242B34_854CA4 /* 854CA4 80242B34 3C0141C8 */ lui $at, 0x41c8 /* 854CA8 80242B38 4481D000 */ mtc1 $at, $f26 /* 854CAC 80242B3C 08090AEB */ j .L80242BAC /* 854CB0 80242B40 2A220003 */ slti $v0, $s1, 3 +glabel L80242B44_854CB4 /* 854CB4 80242B44 3C01C393 */ lui $at, 0xc393 /* 854CB8 80242B48 34218000 */ ori $at, $at, 0x8000 /* 854CBC 80242B4C 4481C000 */ mtc1 $at, $f24 @@ -56,6 +60,7 @@ glabel func_80242A90_854C00 /* 854CCC 80242B5C 4481A000 */ mtc1 $at, $f20 /* 854CD0 80242B60 08090AEB */ j .L80242BAC /* 854CD4 80242B64 2A220003 */ slti $v0, $s1, 3 +glabel L80242B68_854CD8 /* 854CD8 80242B68 3C01C38E */ lui $at, 0xc38e /* 854CDC 80242B6C 34218000 */ ori $at, $at, 0x8000 /* 854CE0 80242B70 4481C000 */ mtc1 $at, $f24 @@ -82,21 +87,21 @@ glabel func_80242A90_854C00 /* 854D2C 80242BBC 0C00A8BB */ jal sin_deg /* 854D30 80242BC0 4600A306 */ mov.s $f12, $f20 /* 854D34 80242BC4 461A0002 */ mul.s $f0, $f0, $f26 -/* 854D38 80242BC8 00000000 */ nop +/* 854D38 80242BC8 00000000 */ nop /* 854D3C 80242BCC C6020038 */ lwc1 $f2, 0x38($s0) /* 854D40 80242BD0 3C0141F0 */ lui $at, 0x41f0 /* 854D44 80242BD4 44812000 */ mtc1 $at, $f4 -/* 854D48 80242BD8 00000000 */ nop +/* 854D48 80242BD8 00000000 */ nop /* 854D4C 80242BDC 46041080 */ add.s $f2, $f2, $f4 /* 854D50 80242BE0 46001600 */ add.s $f24, $f2, $f0 /* 854D54 80242BE4 0C00A8D4 */ jal cos_deg /* 854D58 80242BE8 4600A306 */ mov.s $f12, $f20 /* 854D5C 80242BEC 461A0002 */ mul.s $f0, $f0, $f26 -/* 854D60 80242BF0 00000000 */ nop +/* 854D60 80242BF0 00000000 */ nop /* 854D64 80242BF4 C604003C */ lwc1 $f4, 0x3c($s0) /* 854D68 80242BF8 3C014248 */ lui $at, 0x4248 /* 854D6C 80242BFC 44811000 */ mtc1 $at, $f2 -/* 854D70 80242C00 00000000 */ nop +/* 854D70 80242C00 00000000 */ nop /* 854D74 80242C04 46022580 */ add.s $f22, $f4, $f2 /* 854D78 80242C08 C6020040 */ lwc1 $f2, 0x40($s0) /* 854D7C 80242C0C 46001500 */ add.s $f20, $f2, $f0 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242C78_854DE8.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242C78_854DE8.s index 2009fbb72f..9f7cdc710c 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242C78_854DE8.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242C78_854DE8.s @@ -44,17 +44,17 @@ glabel func_80242C78_854DE8 /* 854E74 80242D04 0C00A8BB */ jal sin_deg /* 854E78 80242D08 4600A306 */ mov.s $f12, $f20 /* 854E7C 80242D0C 46160002 */ mul.s $f0, $f0, $f22 -/* 854E80 80242D10 00000000 */ nop +/* 854E80 80242D10 00000000 */ nop /* 854E84 80242D14 C6220038 */ lwc1 $f2, 0x38($s1) /* 854E88 80242D18 3C0141F0 */ lui $at, 0x41f0 /* 854E8C 80242D1C 44812000 */ mtc1 $at, $f4 -/* 854E90 80242D20 00000000 */ nop +/* 854E90 80242D20 00000000 */ nop /* 854E94 80242D24 46041080 */ add.s $f2, $f2, $f4 /* 854E98 80242D28 46001600 */ add.s $f24, $f2, $f0 /* 854E9C 80242D2C 0C00A8D4 */ jal cos_deg /* 854EA0 80242D30 4600A306 */ mov.s $f12, $f20 /* 854EA4 80242D34 46160002 */ mul.s $f0, $f0, $f22 -/* 854EA8 80242D38 00000000 */ nop +/* 854EA8 80242D38 00000000 */ nop /* 854EAC 80242D3C 24020001 */ addiu $v0, $zero, 1 /* 854EB0 80242D40 C6220040 */ lwc1 $f2, 0x40($s1) /* 854EB4 80242D44 C624003C */ lwc1 $f4, 0x3c($s1) @@ -70,12 +70,12 @@ glabel func_80242C78_854DE8 /* 854EDC 80242D6C 10800007 */ beqz $a0, .L80242D8C /* 854EE0 80242D70 0000102D */ daddu $v0, $zero, $zero /* 854EE4 80242D74 08090B97 */ j .L80242E5C -/* 854EE8 80242D78 00000000 */ nop +/* 854EE8 80242D78 00000000 */ nop .L80242D7C: /* 854EEC 80242D7C 10820027 */ beq $a0, $v0, .L80242E1C /* 854EF0 80242D80 0000102D */ daddu $v0, $zero, $zero /* 854EF4 80242D84 08090B97 */ j .L80242E5C -/* 854EF8 80242D88 00000000 */ nop +/* 854EF8 80242D88 00000000 */ nop .L80242D8C: /* 854EFC 80242D8C 3C028011 */ lui $v0, %hi(gPlayerStatus) /* 854F00 80242D90 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242E84_854FF4.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242E84_854FF4.s index 1a830f0efe..6d22a2a7a6 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242E84_854FF4.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242E84_854FF4.s @@ -49,14 +49,14 @@ glabel func_80242E84_854FF4 /* 85509C 80242F2C 10600009 */ beqz $v1, .L80242F54 /* 8550A0 80242F30 0000102D */ daddu $v0, $zero, $zero /* 8550A4 80242F34 08090C1B */ j .L8024306C -/* 8550A8 80242F38 00000000 */ nop +/* 8550A8 80242F38 00000000 */ nop .L80242F3C: /* 8550AC 80242F3C 1062002C */ beq $v1, $v0, .L80242FF0 /* 8550B0 80242F40 2402000B */ addiu $v0, $zero, 0xb /* 8550B4 80242F44 1062003D */ beq $v1, $v0, .L8024303C /* 8550B8 80242F48 0000102D */ daddu $v0, $zero, $zero /* 8550BC 80242F4C 08090C1B */ j .L8024306C -/* 8550C0 80242F50 00000000 */ nop +/* 8550C0 80242F50 00000000 */ nop .L80242F54: /* 8550C4 80242F54 3C0200B6 */ lui $v0, 0xb6 /* 8550C8 80242F58 C624000C */ lwc1 $f4, 0xc($s1) @@ -89,7 +89,7 @@ glabel func_80242E84_854FF4 /* 855130 80242FC0 C6200038 */ lwc1 $f0, 0x38($s1) /* 855134 80242FC4 3C014040 */ lui $at, 0x4040 /* 855138 80242FC8 44811000 */ mtc1 $at, $f2 -/* 85513C 80242FCC 00000000 */ nop +/* 85513C 80242FCC 00000000 */ nop /* 855140 80242FD0 46020000 */ add.s $f0, $f0, $f2 /* 855144 80242FD4 E6200038 */ swc1 $f0, 0x38($s1) /* 855148 80242FD8 8E420074 */ lw $v0, 0x74($s2) @@ -102,11 +102,11 @@ glabel func_80242E84_854FF4 /* 855160 80242FF0 C6220038 */ lwc1 $f2, 0x38($s1) /* 855164 80242FF4 3C014040 */ lui $at, 0x4040 /* 855168 80242FF8 44810000 */ mtc1 $at, $f0 -/* 85516C 80242FFC 00000000 */ nop +/* 85516C 80242FFC 00000000 */ nop /* 855170 80243000 46001081 */ sub.s $f2, $f2, $f0 /* 855174 80243004 3C014387 */ lui $at, 0x4387 /* 855178 80243008 44810000 */ mtc1 $at, $f0 -/* 85517C 8024300C 00000000 */ nop +/* 85517C 8024300C 00000000 */ nop /* 855180 80243010 E620000C */ swc1 $f0, 0xc($s1) /* 855184 80243014 E6220038 */ swc1 $f2, 0x38($s1) /* 855188 80243018 8E420074 */ lw $v0, 0x74($s2) @@ -122,7 +122,7 @@ glabel func_80242E84_854FF4 /* 8551AC 8024303C C620000C */ lwc1 $f0, 0xc($s1) /* 8551B0 80243040 3C013F80 */ lui $at, 0x3f80 /* 8551B4 80243044 44811000 */ mtc1 $at, $f2 -/* 8551B8 80243048 00000000 */ nop +/* 8551B8 80243048 00000000 */ nop /* 8551BC 8024304C 46020001 */ sub.s $f0, $f0, $f2 /* 8551C0 80243050 E620000C */ swc1 $f0, 0xc($s1) /* 8551C4 80243054 8E430074 */ lw $v1, 0x74($s2) diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802430B4_855224.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802430B4_855224.s index 86e6e2435f..683b12c1a2 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802430B4_855224.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802430B4_855224.s @@ -38,7 +38,7 @@ glabel func_802430B4_855224 /* 8552A8 80243138 848200A6 */ lh $v0, 0xa6($a0) /* 8552AC 8024313C 27A60024 */ addiu $a2, $sp, 0x24 /* 8552B0 80243140 44820000 */ mtc1 $v0, $f0 -/* 8552B4 80243144 00000000 */ nop +/* 8552B4 80243144 00000000 */ nop /* 8552B8 80243148 46800020 */ cvt.s.w $f0, $f0 /* 8552BC 8024314C E7A00018 */ swc1 $f0, 0x18($sp) /* 8552C0 80243150 8C840080 */ lw $a0, 0x80($a0) @@ -48,9 +48,9 @@ glabel func_802430B4_855224 /* 8552D0 80243160 0240202D */ daddu $a0, $s2, $zero /* 8552D4 80243164 C7A0002C */ lwc1 $f0, 0x2c($sp) /* 8552D8 80243168 4614003E */ c.le.s $f0, $f20 -/* 8552DC 8024316C 00000000 */ nop +/* 8552DC 8024316C 00000000 */ nop /* 8552E0 80243170 45000004 */ bc1f .L80243184 -/* 8552E4 80243174 00000000 */ nop +/* 8552E4 80243174 00000000 */ nop /* 8552E8 80243178 3C108011 */ lui $s0, %hi(D_8010C978) /* 8552EC 8024317C 8E10C978 */ lw $s0, %lo(D_8010C978)($s0) .L80243180: diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802431B0_855320.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802431B0_855320.s index 14a0ed44f7..6b84468a47 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802431B0_855320.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802431B0_855320.s @@ -12,7 +12,7 @@ glabel func_802431B0_855320 /* 85533C 802431CC C4420038 */ lwc1 $f2, 0x38($v0) /* 855340 802431D0 3C0141A0 */ lui $at, 0x41a0 /* 855344 802431D4 44810000 */ mtc1 $at, $f0 -/* 855348 802431D8 00000000 */ nop +/* 855348 802431D8 00000000 */ nop /* 85534C 802431DC 46001580 */ add.s $f22, $f2, $f0 /* 855350 802431E0 C4420040 */ lwc1 $f2, 0x40($v0) /* 855354 802431E4 3C014170 */ lui $at, 0x4170 @@ -20,9 +20,9 @@ glabel func_802431B0_855320 /* 85535C 802431EC C454003C */ lwc1 $f20, 0x3c($v0) /* 855360 802431F0 46001601 */ sub.s $f24, $f2, $f0 /* 855364 802431F4 44800000 */ mtc1 $zero, $f0 -/* 855368 802431F8 00000000 */ nop +/* 855368 802431F8 00000000 */ nop /* 85536C 802431FC 4600A03C */ c.lt.s $f20, $f0 -/* 855370 80243200 00000000 */ nop +/* 855370 80243200 00000000 */ nop /* 855374 80243204 4500000C */ bc1f .L80243238 /* 855378 80243208 0000202D */ daddu $a0, $zero, $zero /* 85537C 8024320C 4405B000 */ mfc1 $a1, $f22 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80243254_8553C4.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80243254_8553C4.s index 479a2c883d..e11f094cfc 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80243254_8553C4.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80243254_8553C4.s @@ -38,13 +38,13 @@ glabel func_80243254_8553C4 /* 855448 802432D8 0C00A8BB */ jal sin_deg /* 85544C 802432DC 4600A306 */ mov.s $f12, $f20 /* 855450 802432E0 46180002 */ mul.s $f0, $f0, $f24 -/* 855454 802432E4 00000000 */ nop +/* 855454 802432E4 00000000 */ nop /* 855458 802432E8 C6160028 */ lwc1 $f22, 0x28($s0) /* 85545C 802432EC 4600B580 */ add.s $f22, $f22, $f0 /* 855460 802432F0 0C00A8D4 */ jal cos_deg /* 855464 802432F4 4600A306 */ mov.s $f12, $f20 /* 855468 802432F8 46180002 */ mul.s $f0, $f0, $f24 -/* 85546C 802432FC 00000000 */ nop +/* 85546C 802432FC 00000000 */ nop /* 855470 80243300 0220202D */ daddu $a0, $s1, $zero /* 855474 80243304 0240282D */ daddu $a1, $s2, $zero /* 855478 80243308 C6140030 */ lwc1 $f20, 0x30($s0) diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024335C_8554CC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024335C_8554CC.s index 2199c4126c..519cfb73a8 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024335C_8554CC.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024335C_8554CC.s @@ -5,7 +5,7 @@ glabel func_8024335C_8554CC /* 8554CC 8024335C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 8554D0 80243360 AFBF0010 */ sw $ra, 0x10($sp) /* 8554D4 80243364 0C052B50 */ jal func_8014AD40 -/* 8554D8 80243368 00000000 */ nop +/* 8554D8 80243368 00000000 */ nop /* 8554DC 8024336C 2C420001 */ sltiu $v0, $v0, 1 /* 8554E0 80243370 8FBF0010 */ lw $ra, 0x10($sp) /* 8554E4 80243374 00021040 */ sll $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802433BC_85552C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802433BC_85552C.s index 3a1d274bd7..9dbd83b674 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802433BC_85552C.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802433BC_85552C.s @@ -13,5 +13,5 @@ glabel func_802433BC_85552C /* 85554C 802433DC 24020002 */ addiu $v0, $zero, 2 /* 855550 802433E0 03E00008 */ jr $ra /* 855554 802433E4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 855558 802433E8 00000000 */ nop -/* 85555C 802433EC 00000000 */ nop +/* 855558 802433E8 00000000 */ nop +/* 85555C 802433EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_802433F0_855560.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_802433F0_855560.s index c026e134c4..0d53fbfb40 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/855560/func_802433F0_855560.s +++ b/asm/nonmatchings/world/area_mac/mac_05/855560/func_802433F0_855560.s @@ -10,7 +10,7 @@ glabel func_802433F0_855560 /* 855574 80243404 AFBF0010 */ sw $ra, 0x10($sp) /* 855578 80243408 8C64014C */ lw $a0, 0x14c($v1) /* 85557C 8024340C 08090D0A */ j .L80243428 -/* 855580 80243410 00000000 */ nop +/* 855580 80243410 00000000 */ nop .L80243414: /* 855584 80243414 3C02EFE8 */ lui $v0, 0xefe8 /* 855588 80243418 34422080 */ ori $v0, $v0, 0x2080 @@ -19,7 +19,7 @@ glabel func_802433F0_855560 /* 855594 80243424 0080102D */ daddu $v0, $a0, $zero .L80243428: /* 855598 80243428 0C00EAD2 */ jal get_npc_safe -/* 85559C 8024342C 00000000 */ nop +/* 85559C 8024342C 00000000 */ nop .L80243430: /* 8555A0 80243430 8FBF0010 */ lw $ra, 0x10($sp) /* 8555A4 80243434 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_8024343C_8555AC.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_8024343C_8555AC.s index b04a633273..8bcefe2875 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/855560/func_8024343C_8555AC.s +++ b/asm/nonmatchings/world/area_mac/mac_05/855560/func_8024343C_8555AC.s @@ -53,13 +53,13 @@ glabel func_8024343C_8555AC /* 855664 802434F4 3C028025 */ lui $v0, %hi(D_80250A50) /* 855668 802434F8 8C420A50 */ lw $v0, %lo(D_80250A50)($v0) /* 85566C 802434FC 44826000 */ mtc1 $v0, $f12 -/* 855670 80243500 00000000 */ nop +/* 855670 80243500 00000000 */ nop /* 855674 80243504 04410006 */ bgez $v0, .L80243520 /* 855678 80243508 46806321 */ cvt.d.w $f12, $f12 /* 85567C 8024350C 3C0141F0 */ lui $at, 0x41f0 /* 855680 80243510 44810800 */ mtc1 $at, $f1 /* 855684 80243514 44800000 */ mtc1 $zero, $f0 -/* 855688 80243518 00000000 */ nop +/* 855688 80243518 00000000 */ nop /* 85568C 8024351C 46206300 */ add.d $f12, $f12, $f0 .L80243520: /* 855690 80243520 0C00A8BB */ jal sin_deg diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243588_8556F8.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243588_8556F8.s index c34b071353..4086da62be 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243588_8556F8.s +++ b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243588_8556F8.s @@ -31,17 +31,19 @@ glabel func_80243588_8556F8 /* 855760 802435F0 2C62000D */ sltiu $v0, $v1, 0xd /* 855764 802435F4 1040000B */ beqz $v0, .L80243624 /* 855768 802435F8 00031080 */ sll $v0, $v1, 2 -/* 85576C 802435FC 3C018025 */ lui $at, %hi(D_80252970) +/* 85576C 802435FC 3C018025 */ lui $at, %hi(jtbl_80252970_864AE0) /* 855770 80243600 00220821 */ addu $at, $at, $v0 -/* 855774 80243604 8C222970 */ lw $v0, %lo(D_80252970)($at) +/* 855774 80243604 8C222970 */ lw $v0, %lo(jtbl_80252970_864AE0)($at) /* 855778 80243608 00400008 */ jr $v0 -/* 85577C 8024360C 00000000 */ nop +/* 85577C 8024360C 00000000 */ nop +glabel L80243610_855780 /* 855780 80243610 8E020000 */ lw $v0, ($s0) /* 855784 80243614 04410003 */ bgez $v0, .L80243624 -/* 855788 80243618 00000000 */ nop +/* 855788 80243618 00000000 */ nop /* 85578C 8024361C 0000B02D */ daddu $s6, $zero, $zero /* 855790 80243620 AE000000 */ sw $zero, ($s0) .L80243624: +glabel L80243624_855794 /* 855794 80243624 1AE00065 */ blez $s7, .L802437BC /* 855798 80243628 0000A02D */ daddu $s4, $zero, $zero /* 85579C 8024362C 0220982D */ daddu $s3, $s1, $zero @@ -73,74 +75,74 @@ glabel func_80243588_8556F8 /* 855800 80243690 0082A823 */ subu $s5, $a0, $v0 .L80243694: /* 855804 80243694 44966000 */ mtc1 $s6, $f12 -/* 855808 80243698 00000000 */ nop +/* 855808 80243698 00000000 */ nop /* 85580C 8024369C 0C00A8BB */ jal sin_deg /* 855810 802436A0 46806320 */ cvt.s.w $f12, $f12 /* 855814 802436A4 44902000 */ mtc1 $s0, $f4 -/* 855818 802436A8 00000000 */ nop +/* 855818 802436A8 00000000 */ nop /* 85581C 802436AC 46802120 */ cvt.s.w $f4, $f4 /* 855820 802436B0 461E2083 */ div.s $f2, $f4, $f30 /* 855824 802436B4 46001082 */ mul.s $f2, $f2, $f0 -/* 855828 802436B8 00000000 */ nop +/* 855828 802436B8 00000000 */ nop /* 85582C 802436BC 3C014170 */ lui $at, 0x4170 /* 855830 802436C0 44813000 */ mtc1 $at, $f6 -/* 855834 802436C4 00000000 */ nop +/* 855834 802436C4 00000000 */ nop /* 855838 802436C8 46062103 */ div.s $f4, $f4, $f6 /* 85583C 802436CC 46022580 */ add.s $f22, $f4, $f2 /* 855840 802436D0 0C00A874 */ jal cos_rad /* 855844 802436D4 4600B306 */ mov.s $f12, $f22 /* 855848 802436D8 461C0002 */ mul.s $f0, $f0, $f28 -/* 85584C 802436DC 00000000 */ nop +/* 85584C 802436DC 00000000 */ nop /* 855850 802436E0 4600D680 */ add.s $f26, $f26, $f0 /* 855854 802436E4 0C00A85B */ jal sin_rad /* 855858 802436E8 4600B306 */ mov.s $f12, $f22 /* 85585C 802436EC 461C0002 */ mul.s $f0, $f0, $f28 -/* 855860 802436F0 00000000 */ nop +/* 855860 802436F0 00000000 */ nop /* 855864 802436F4 26100001 */ addiu $s0, $s0, 1 /* 855868 802436F8 0211102A */ slt $v0, $s0, $s1 /* 85586C 802436FC 1440FFE5 */ bnez $v0, .L80243694 /* 855870 80243700 4600C600 */ add.s $f24, $f24, $f0 .L80243704: /* 855874 80243704 44966000 */ mtc1 $s6, $f12 -/* 855878 80243708 00000000 */ nop +/* 855878 80243708 00000000 */ nop /* 85587C 8024370C 0C00A8BB */ jal sin_deg /* 855880 80243710 46806320 */ cvt.s.w $f12, $f12 /* 855884 80243714 44902000 */ mtc1 $s0, $f4 -/* 855888 80243718 00000000 */ nop +/* 855888 80243718 00000000 */ nop /* 85588C 8024371C 46802120 */ cvt.s.w $f4, $f4 /* 855890 80243720 461E2083 */ div.s $f2, $f4, $f30 /* 855894 80243724 46001082 */ mul.s $f2, $f2, $f0 -/* 855898 80243728 00000000 */ nop +/* 855898 80243728 00000000 */ nop /* 85589C 8024372C 3C014170 */ lui $at, 0x4170 /* 8558A0 80243730 44813000 */ mtc1 $at, $f6 -/* 8558A4 80243734 00000000 */ nop +/* 8558A4 80243734 00000000 */ nop /* 8558A8 80243738 46062103 */ div.s $f4, $f4, $f6 /* 8558AC 8024373C 46022580 */ add.s $f22, $f4, $f2 /* 8558B0 80243740 0C00A874 */ jal cos_rad /* 8558B4 80243744 4600B306 */ mov.s $f12, $f22 /* 8558B8 80243748 4495A000 */ mtc1 $s5, $f20 -/* 8558BC 8024374C 00000000 */ nop +/* 8558BC 8024374C 00000000 */ nop /* 8558C0 80243750 4680A520 */ cvt.s.w $f20, $f20 /* 8558C4 80243754 4600A002 */ mul.s $f0, $f20, $f0 -/* 8558C8 80243758 00000000 */ nop +/* 8558C8 80243758 00000000 */ nop /* 8558CC 8024375C 4600D680 */ add.s $f26, $f26, $f0 /* 8558D0 80243760 0C00A85B */ jal sin_rad /* 8558D4 80243764 4600B306 */ mov.s $f12, $f22 /* 8558D8 80243768 4600A502 */ mul.s $f20, $f20, $f0 -/* 8558DC 8024376C 00000000 */ nop +/* 8558DC 8024376C 00000000 */ nop /* 8558E0 80243770 4600D18D */ trunc.w.s $f6, $f26 /* 8558E4 80243774 44023000 */ mfc1 $v0, $f6 -/* 8558E8 80243778 00000000 */ nop +/* 8558E8 80243778 00000000 */ nop /* 8558EC 8024377C A6620000 */ sh $v0, ($s3) /* 8558F0 80243780 86420002 */ lh $v0, 2($s2) /* 8558F4 80243784 4614C600 */ add.s $f24, $f24, $f20 /* 8558F8 80243788 44820000 */ mtc1 $v0, $f0 -/* 8558FC 8024378C 00000000 */ nop +/* 8558FC 8024378C 00000000 */ nop /* 855900 80243790 46800020 */ cvt.s.w $f0, $f0 /* 855904 80243794 46180000 */ add.s $f0, $f0, $f24 /* 855908 80243798 4600018D */ trunc.w.s $f6, $f0 /* 85590C 8024379C 44023000 */ mfc1 $v0, $f6 -/* 855910 802437A0 00000000 */ nop +/* 855910 802437A0 00000000 */ nop /* 855914 802437A4 A6620002 */ sh $v0, 2($s3) /* 855918 802437A8 26730010 */ addiu $s3, $s3, 0x10 .L802437AC: diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243948_855AB8.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243948_855AB8.s index 2a01240840..f90def98bd 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243948_855AB8.s +++ b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243948_855AB8.s @@ -48,9 +48,9 @@ glabel func_80243948_855AB8 /* 855B64 802439F4 4618A501 */ sub.s $f20, $f20, $f24 /* 855B68 802439F8 3C013F00 */ lui $at, 0x3f00 /* 855B6C 802439FC 44811000 */ mtc1 $at, $f2 -/* 855B70 80243A00 00000000 */ nop +/* 855B70 80243A00 00000000 */ nop /* 855B74 80243A04 4602A502 */ mul.s $f20, $f20, $f2 -/* 855B78 80243A08 00000000 */ nop +/* 855B78 80243A08 00000000 */ nop /* 855B7C 80243A0C 12000008 */ beqz $s0, .L80243A30 /* 855B80 80243A10 46000586 */ mov.s $f22, $f0 /* 855B84 80243A14 0233102A */ slt $v0, $s1, $s3 @@ -64,18 +64,18 @@ glabel func_80243948_855AB8 /* 855BA0 80243A30 3C014334 */ lui $at, 0x4334 /* 855BA4 80243A34 44810000 */ mtc1 $at, $f0 /* 855BA8 80243A38 44936000 */ mtc1 $s3, $f12 -/* 855BAC 80243A3C 00000000 */ nop +/* 855BAC 80243A3C 00000000 */ nop /* 855BB0 80243A40 46806320 */ cvt.s.w $f12, $f12 /* 855BB4 80243A44 46006302 */ mul.s $f12, $f12, $f0 -/* 855BB8 80243A48 00000000 */ nop +/* 855BB8 80243A48 00000000 */ nop /* 855BBC 80243A4C 44910000 */ mtc1 $s1, $f0 -/* 855BC0 80243A50 00000000 */ nop +/* 855BC0 80243A50 00000000 */ nop /* 855BC4 80243A54 46800020 */ cvt.s.w $f0, $f0 /* 855BC8 80243A58 46006303 */ div.s $f12, $f12, $f0 /* 855BCC 80243A5C 0C00A8D4 */ jal cos_deg /* 855BD0 80243A60 46166300 */ add.s $f12, $f12, $f22 /* 855BD4 80243A64 4600A002 */ mul.s $f0, $f20, $f0 -/* 855BD8 80243A68 00000000 */ nop +/* 855BD8 80243A68 00000000 */ nop /* 855BDC 80243A6C 4614C080 */ add.s $f2, $f24, $f20 /* 855BE0 80243A70 46001081 */ sub.s $f2, $f2, $f0 /* 855BE4 80243A74 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243AB8_855C28.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243AB8_855C28.s index 161d11d3c8..524078e956 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243AB8_855C28.s +++ b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243AB8_855C28.s @@ -20,18 +20,18 @@ glabel func_80243AB8_855C28 /* 855C64 80243AF4 0C00A8BB */ jal sin_deg /* 855C68 80243AF8 4600A306 */ mov.s $f12, $f20 /* 855C6C 80243AFC 46180002 */ mul.s $f0, $f0, $f24 -/* 855C70 80243B00 00000000 */ nop +/* 855C70 80243B00 00000000 */ nop /* 855C74 80243B04 C6160038 */ lwc1 $f22, 0x38($s0) /* 855C78 80243B08 3C0141F0 */ lui $at, 0x41f0 /* 855C7C 80243B0C 44811000 */ mtc1 $at, $f2 -/* 855C80 80243B10 00000000 */ nop +/* 855C80 80243B10 00000000 */ nop /* 855C84 80243B14 4602B580 */ add.s $f22, $f22, $f2 /* 855C88 80243B18 4600A306 */ mov.s $f12, $f20 /* 855C8C 80243B1C 0C00A8D4 */ jal cos_deg /* 855C90 80243B20 4600B580 */ add.s $f22, $f22, $f0 /* 855C94 80243B24 0220202D */ daddu $a0, $s1, $zero /* 855C98 80243B28 46180002 */ mul.s $f0, $f0, $f24 -/* 855C9C 80243B2C 00000000 */ nop +/* 855C9C 80243B2C 00000000 */ nop /* 855CA0 80243B30 3C05FE36 */ lui $a1, 0xfe36 /* 855CA4 80243B34 34A53C80 */ ori $a1, $a1, 0x3c80 /* 855CA8 80243B38 C6180040 */ lwc1 $f24, 0x40($s0) diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243D78_855EE8.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243D78_855EE8.s index 5b99964b54..a193a20148 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243D78_855EE8.s +++ b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243D78_855EE8.s @@ -14,5 +14,5 @@ glabel func_80243D78_855EE8 /* 855F0C 80243D9C 24020002 */ addiu $v0, $zero, 2 /* 855F10 80243DA0 03E00008 */ jr $ra /* 855F14 80243DA4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 855F18 80243DA8 00000000 */ nop -/* 855F1C 80243DAC 00000000 */ nop +/* 855F18 80243DA8 00000000 */ nop +/* 855F1C 80243DAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243DB0_855F20.s b/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243DB0_855F20.s index 6bc9ba8fda..24e8397143 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243DB0_855F20.s +++ b/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243DB0_855F20.s @@ -8,27 +8,27 @@ glabel func_80243DB0_855F20 /* 855F2C 80243DBC 8FA40010 */ lw $a0, 0x10($sp) /* 855F30 80243DC0 8FA50014 */ lw $a1, 0x14($sp) /* 855F34 80243DC4 4600203E */ c.le.s $f4, $f0 -/* 855F38 80243DC8 00000000 */ nop +/* 855F38 80243DC8 00000000 */ nop /* 855F3C 80243DCC 45020008 */ bc1fl .L80243DF0 /* 855F40 80243DD0 460E2000 */ add.s $f0, $f4, $f14 /* 855F44 80243DD4 460020A1 */ cvt.d.s $f2, $f4 /* 855F48 80243DD8 46007021 */ cvt.d.s $f0, $f14 /* 855F4C 80243DDC 46220002 */ mul.d $f0, $f0, $f2 -/* 855F50 80243DE0 00000000 */ nop +/* 855F50 80243DE0 00000000 */ nop /* 855F54 80243DE4 46220000 */ add.d $f0, $f0, $f2 /* 855F58 80243DE8 08090F7F */ j .L80243DFC /* 855F5C 80243DEC 462001A0 */ cvt.s.d $f6, $f0 .L80243DF0: /* 855F60 80243DF0 460E2082 */ mul.s $f2, $f4, $f14 -/* 855F64 80243DF4 00000000 */ nop +/* 855F64 80243DF4 00000000 */ nop /* 855F68 80243DF8 46020181 */ sub.s $f6, $f0, $f2 .L80243DFC: /* 855F6C 80243DFC 44800000 */ mtc1 $zero, $f0 -/* 855F70 80243E00 00000000 */ nop +/* 855F70 80243E00 00000000 */ nop /* 855F74 80243E04 46003032 */ c.eq.s $f6, $f0 -/* 855F78 80243E08 00000000 */ nop +/* 855F78 80243E08 00000000 */ nop /* 855F7C 80243E0C 45000005 */ bc1f .L80243E24 -/* 855F80 80243E10 00000000 */ nop +/* 855F80 80243E10 00000000 */ nop /* 855F84 80243E14 E4A00000 */ swc1 $f0, ($a1) /* 855F88 80243E18 E4800000 */ swc1 $f0, ($a0) /* 855F8C 80243E1C 03E00008 */ jr $ra @@ -36,60 +36,66 @@ glabel func_80243DB0_855F20 .L80243E24: /* 855F94 80243E24 3C0140C0 */ lui $at, 0x40c0 /* 855F98 80243E28 44810000 */ mtc1 $at, $f0 -/* 855F9C 80243E2C 00000000 */ nop +/* 855F9C 80243E2C 00000000 */ nop /* 855FA0 80243E30 46006302 */ mul.s $f12, $f12, $f0 -/* 855FA4 80243E34 00000000 */ nop +/* 855FA4 80243E34 00000000 */ nop /* 855FA8 80243E38 46042000 */ add.s $f0, $f4, $f4 /* 855FAC 80243E3C 46060201 */ sub.s $f8, $f0, $f6 /* 855FB0 80243E40 46083001 */ sub.s $f0, $f6, $f8 /* 855FB4 80243E44 46060003 */ div.s $f0, $f0, $f6 /* 855FB8 80243E48 46003002 */ mul.s $f0, $f6, $f0 -/* 855FBC 80243E4C 00000000 */ nop +/* 855FBC 80243E4C 00000000 */ nop /* 855FC0 80243E50 4600628D */ trunc.w.s $f10, $f12 /* 855FC4 80243E54 44025000 */ mfc1 $v0, $f10 -/* 855FC8 80243E58 00000000 */ nop +/* 855FC8 80243E58 00000000 */ nop /* 855FCC 80243E5C 44822000 */ mtc1 $v0, $f4 -/* 855FD0 80243E60 00000000 */ nop +/* 855FD0 80243E60 00000000 */ nop /* 855FD4 80243E64 46802120 */ cvt.s.w $f4, $f4 /* 855FD8 80243E68 46046081 */ sub.s $f2, $f12, $f4 /* 855FDC 80243E6C 46020002 */ mul.s $f0, $f0, $f2 -/* 855FE0 80243E70 00000000 */ nop +/* 855FE0 80243E70 00000000 */ nop /* 855FE4 80243E74 46004080 */ add.s $f2, $f8, $f0 /* 855FE8 80243E78 4600228D */ trunc.w.s $f10, $f4 /* 855FEC 80243E7C 44035000 */ mfc1 $v1, $f10 -/* 855FF0 80243E80 00000000 */ nop +/* 855FF0 80243E80 00000000 */ nop /* 855FF4 80243E84 2C620006 */ sltiu $v0, $v1, 6 /* 855FF8 80243E88 1040001E */ beqz $v0, .L80243F04 /* 855FFC 80243E8C 46003001 */ sub.s $f0, $f6, $f0 /* 856000 80243E90 00031080 */ sll $v0, $v1, 2 -/* 856004 80243E94 3C018025 */ lui $at, %hi(D_802529B0) +/* 856004 80243E94 3C018025 */ lui $at, %hi(jtbl_802529B0_864B20) /* 856008 80243E98 00220821 */ addu $at, $at, $v0 -/* 85600C 80243E9C 8C2229B0 */ lw $v0, %lo(D_802529B0)($at) +/* 85600C 80243E9C 8C2229B0 */ lw $v0, %lo(jtbl_802529B0_864B20)($at) /* 856010 80243EA0 00400008 */ jr $v0 -/* 856014 80243EA4 00000000 */ nop +/* 856014 80243EA4 00000000 */ nop +glabel L80243EA8_856018 /* 856018 80243EA8 E4E60000 */ swc1 $f6, ($a3) /* 85601C 80243EAC E4820000 */ swc1 $f2, ($a0) /* 856020 80243EB0 03E00008 */ jr $ra /* 856024 80243EB4 E4A80000 */ swc1 $f8, ($a1) +glabel L80243EB8_856028 /* 856028 80243EB8 E4E00000 */ swc1 $f0, ($a3) /* 85602C 80243EBC E4860000 */ swc1 $f6, ($a0) /* 856030 80243EC0 03E00008 */ jr $ra /* 856034 80243EC4 E4A80000 */ swc1 $f8, ($a1) +glabel L80243EC8_856038 /* 856038 80243EC8 E4E80000 */ swc1 $f8, ($a3) /* 85603C 80243ECC E4860000 */ swc1 $f6, ($a0) /* 856040 80243ED0 03E00008 */ jr $ra /* 856044 80243ED4 E4A20000 */ swc1 $f2, ($a1) +glabel L80243ED8_856048 /* 856048 80243ED8 E4E80000 */ swc1 $f8, ($a3) /* 85604C 80243EDC E4800000 */ swc1 $f0, ($a0) /* 856050 80243EE0 03E00008 */ jr $ra /* 856054 80243EE4 E4A60000 */ swc1 $f6, ($a1) +glabel L80243EE8_856058 /* 856058 80243EE8 E4E20000 */ swc1 $f2, ($a3) /* 85605C 80243EEC E4880000 */ swc1 $f8, ($a0) /* 856060 80243EF0 03E00008 */ jr $ra /* 856064 80243EF4 E4A60000 */ swc1 $f6, ($a1) +glabel L80243EF8_856068 /* 856068 80243EF8 E4E60000 */ swc1 $f6, ($a3) /* 85606C 80243EFC E4880000 */ swc1 $f8, ($a0) /* 856070 80243F00 E4A00000 */ swc1 $f0, ($a1) .L80243F04: /* 856074 80243F04 03E00008 */ jr $ra -/* 856078 80243F08 00000000 */ nop +/* 856078 80243F08 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_06/864B40/func_8024030C_864E4C.s b/asm/nonmatchings/world/area_mac/mac_06/864B40/func_8024030C_864E4C.s index 6201c8ff08..565e971114 100644 --- a/asm/nonmatchings/world/area_mac/mac_06/864B40/func_8024030C_864E4C.s +++ b/asm/nonmatchings/world/area_mac/mac_06/864B40/func_8024030C_864E4C.s @@ -48,9 +48,9 @@ glabel func_8024030C_864E4C /* 864EF8 802403B8 4618A501 */ sub.s $f20, $f20, $f24 /* 864EFC 802403BC 3C013F00 */ lui $at, 0x3f00 /* 864F00 802403C0 44811000 */ mtc1 $at, $f2 -/* 864F04 802403C4 00000000 */ nop +/* 864F04 802403C4 00000000 */ nop /* 864F08 802403C8 4602A502 */ mul.s $f20, $f20, $f2 -/* 864F0C 802403CC 00000000 */ nop +/* 864F0C 802403CC 00000000 */ nop /* 864F10 802403D0 12000008 */ beqz $s0, .L802403F4 /* 864F14 802403D4 46000586 */ mov.s $f22, $f0 /* 864F18 802403D8 0233102A */ slt $v0, $s1, $s3 @@ -64,18 +64,18 @@ glabel func_8024030C_864E4C /* 864F34 802403F4 3C014334 */ lui $at, 0x4334 /* 864F38 802403F8 44810000 */ mtc1 $at, $f0 /* 864F3C 802403FC 44936000 */ mtc1 $s3, $f12 -/* 864F40 80240400 00000000 */ nop +/* 864F40 80240400 00000000 */ nop /* 864F44 80240404 46806320 */ cvt.s.w $f12, $f12 /* 864F48 80240408 46006302 */ mul.s $f12, $f12, $f0 -/* 864F4C 8024040C 00000000 */ nop +/* 864F4C 8024040C 00000000 */ nop /* 864F50 80240410 44910000 */ mtc1 $s1, $f0 -/* 864F54 80240414 00000000 */ nop +/* 864F54 80240414 00000000 */ nop /* 864F58 80240418 46800020 */ cvt.s.w $f0, $f0 /* 864F5C 8024041C 46006303 */ div.s $f12, $f12, $f0 /* 864F60 80240420 0C00A8D4 */ jal cos_deg /* 864F64 80240424 46166300 */ add.s $f12, $f12, $f22 /* 864F68 80240428 4600A002 */ mul.s $f0, $f20, $f0 -/* 864F6C 8024042C 00000000 */ nop +/* 864F6C 8024042C 00000000 */ nop /* 864F70 80240430 4614C080 */ add.s $f2, $f24, $f20 /* 864F74 80240434 46001081 */ sub.s $f2, $f2, $f0 /* 864F78 80240438 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_802404C0_865000.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_802404C0_865000.s index 871e7aa77f..db6f3528f1 100644 --- a/asm/nonmatchings/world/area_mac/mac_06/865000/func_802404C0_865000.s +++ b/asm/nonmatchings/world/area_mac/mac_06/865000/func_802404C0_865000.s @@ -10,7 +10,7 @@ glabel func_802404C0_865000 /* 865014 802404D4 AFBF0010 */ sw $ra, 0x10($sp) /* 865018 802404D8 8C64014C */ lw $a0, 0x14c($v1) /* 86501C 802404DC 0809013E */ j .L802404F8 -/* 865020 802404E0 00000000 */ nop +/* 865020 802404E0 00000000 */ nop .L802404E4: /* 865024 802404E4 3C02EFE8 */ lui $v0, 0xefe8 /* 865028 802404E8 34422080 */ ori $v0, $v0, 0x2080 @@ -19,7 +19,7 @@ glabel func_802404C0_865000 /* 865034 802404F4 0080102D */ daddu $v0, $a0, $zero .L802404F8: /* 865038 802404F8 0C00EAD2 */ jal get_npc_safe -/* 86503C 802404FC 00000000 */ nop +/* 86503C 802404FC 00000000 */ nop .L80240500: /* 865040 80240500 8FBF0010 */ lw $ra, 0x10($sp) /* 865044 80240504 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_8024050C_86504C.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_8024050C_86504C.s index ec2edf61c9..3940d4e0c5 100644 --- a/asm/nonmatchings/world/area_mac/mac_06/865000/func_8024050C_86504C.s +++ b/asm/nonmatchings/world/area_mac/mac_06/865000/func_8024050C_86504C.s @@ -53,13 +53,13 @@ glabel func_8024050C_86504C /* 865104 802405C4 3C028024 */ lui $v0, %hi(D_80241B60) /* 865108 802405C8 8C421B60 */ lw $v0, %lo(D_80241B60)($v0) /* 86510C 802405CC 44826000 */ mtc1 $v0, $f12 -/* 865110 802405D0 00000000 */ nop +/* 865110 802405D0 00000000 */ nop /* 865114 802405D4 04410006 */ bgez $v0, .L802405F0 /* 865118 802405D8 46806321 */ cvt.d.w $f12, $f12 /* 86511C 802405DC 3C0141F0 */ lui $at, 0x41f0 /* 865120 802405E0 44810800 */ mtc1 $at, $f1 /* 865124 802405E4 44800000 */ mtc1 $zero, $f0 -/* 865128 802405E8 00000000 */ nop +/* 865128 802405E8 00000000 */ nop /* 86512C 802405EC 46206300 */ add.d $f12, $f12, $f0 .L802405F0: /* 865130 802405F0 0C00A8BB */ jal sin_deg diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240658_865198.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240658_865198.s index 240e54177e..25a43d7827 100644 --- a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240658_865198.s +++ b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240658_865198.s @@ -31,17 +31,19 @@ glabel func_80240658_865198 /* 865200 802406C0 2C62000D */ sltiu $v0, $v1, 0xd /* 865204 802406C4 1040000B */ beqz $v0, .L802406F4 /* 865208 802406C8 00031080 */ sll $v0, $v1, 2 -/* 86520C 802406CC 3C018024 */ lui $at, %hi(D_80244910) +/* 86520C 802406CC 3C018024 */ lui $at, %hi(jtbl_80244910_869450) /* 865210 802406D0 00220821 */ addu $at, $at, $v0 -/* 865214 802406D4 8C224910 */ lw $v0, %lo(D_80244910)($at) +/* 865214 802406D4 8C224910 */ lw $v0, %lo(jtbl_80244910_869450)($at) /* 865218 802406D8 00400008 */ jr $v0 -/* 86521C 802406DC 00000000 */ nop +/* 86521C 802406DC 00000000 */ nop +glabel L802406E0_865220 /* 865220 802406E0 8E020000 */ lw $v0, ($s0) /* 865224 802406E4 04410003 */ bgez $v0, .L802406F4 -/* 865228 802406E8 00000000 */ nop +/* 865228 802406E8 00000000 */ nop /* 86522C 802406EC 0000B02D */ daddu $s6, $zero, $zero /* 865230 802406F0 AE000000 */ sw $zero, ($s0) .L802406F4: +glabel L802406F4_865234 /* 865234 802406F4 1AE00065 */ blez $s7, .L8024088C /* 865238 802406F8 0000A02D */ daddu $s4, $zero, $zero /* 86523C 802406FC 0220982D */ daddu $s3, $s1, $zero @@ -73,74 +75,74 @@ glabel func_80240658_865198 /* 8652A0 80240760 0082A823 */ subu $s5, $a0, $v0 .L80240764: /* 8652A4 80240764 44966000 */ mtc1 $s6, $f12 -/* 8652A8 80240768 00000000 */ nop +/* 8652A8 80240768 00000000 */ nop /* 8652AC 8024076C 0C00A8BB */ jal sin_deg /* 8652B0 80240770 46806320 */ cvt.s.w $f12, $f12 /* 8652B4 80240774 44902000 */ mtc1 $s0, $f4 -/* 8652B8 80240778 00000000 */ nop +/* 8652B8 80240778 00000000 */ nop /* 8652BC 8024077C 46802120 */ cvt.s.w $f4, $f4 /* 8652C0 80240780 461E2083 */ div.s $f2, $f4, $f30 /* 8652C4 80240784 46001082 */ mul.s $f2, $f2, $f0 -/* 8652C8 80240788 00000000 */ nop +/* 8652C8 80240788 00000000 */ nop /* 8652CC 8024078C 3C014170 */ lui $at, 0x4170 /* 8652D0 80240790 44813000 */ mtc1 $at, $f6 -/* 8652D4 80240794 00000000 */ nop +/* 8652D4 80240794 00000000 */ nop /* 8652D8 80240798 46062103 */ div.s $f4, $f4, $f6 /* 8652DC 8024079C 46022580 */ add.s $f22, $f4, $f2 /* 8652E0 802407A0 0C00A874 */ jal cos_rad /* 8652E4 802407A4 4600B306 */ mov.s $f12, $f22 /* 8652E8 802407A8 461C0002 */ mul.s $f0, $f0, $f28 -/* 8652EC 802407AC 00000000 */ nop +/* 8652EC 802407AC 00000000 */ nop /* 8652F0 802407B0 4600D680 */ add.s $f26, $f26, $f0 /* 8652F4 802407B4 0C00A85B */ jal sin_rad /* 8652F8 802407B8 4600B306 */ mov.s $f12, $f22 /* 8652FC 802407BC 461C0002 */ mul.s $f0, $f0, $f28 -/* 865300 802407C0 00000000 */ nop +/* 865300 802407C0 00000000 */ nop /* 865304 802407C4 26100001 */ addiu $s0, $s0, 1 /* 865308 802407C8 0211102A */ slt $v0, $s0, $s1 /* 86530C 802407CC 1440FFE5 */ bnez $v0, .L80240764 /* 865310 802407D0 4600C600 */ add.s $f24, $f24, $f0 .L802407D4: /* 865314 802407D4 44966000 */ mtc1 $s6, $f12 -/* 865318 802407D8 00000000 */ nop +/* 865318 802407D8 00000000 */ nop /* 86531C 802407DC 0C00A8BB */ jal sin_deg /* 865320 802407E0 46806320 */ cvt.s.w $f12, $f12 /* 865324 802407E4 44902000 */ mtc1 $s0, $f4 -/* 865328 802407E8 00000000 */ nop +/* 865328 802407E8 00000000 */ nop /* 86532C 802407EC 46802120 */ cvt.s.w $f4, $f4 /* 865330 802407F0 461E2083 */ div.s $f2, $f4, $f30 /* 865334 802407F4 46001082 */ mul.s $f2, $f2, $f0 -/* 865338 802407F8 00000000 */ nop +/* 865338 802407F8 00000000 */ nop /* 86533C 802407FC 3C014170 */ lui $at, 0x4170 /* 865340 80240800 44813000 */ mtc1 $at, $f6 -/* 865344 80240804 00000000 */ nop +/* 865344 80240804 00000000 */ nop /* 865348 80240808 46062103 */ div.s $f4, $f4, $f6 /* 86534C 8024080C 46022580 */ add.s $f22, $f4, $f2 /* 865350 80240810 0C00A874 */ jal cos_rad /* 865354 80240814 4600B306 */ mov.s $f12, $f22 /* 865358 80240818 4495A000 */ mtc1 $s5, $f20 -/* 86535C 8024081C 00000000 */ nop +/* 86535C 8024081C 00000000 */ nop /* 865360 80240820 4680A520 */ cvt.s.w $f20, $f20 /* 865364 80240824 4600A002 */ mul.s $f0, $f20, $f0 -/* 865368 80240828 00000000 */ nop +/* 865368 80240828 00000000 */ nop /* 86536C 8024082C 4600D680 */ add.s $f26, $f26, $f0 /* 865370 80240830 0C00A85B */ jal sin_rad /* 865374 80240834 4600B306 */ mov.s $f12, $f22 /* 865378 80240838 4600A502 */ mul.s $f20, $f20, $f0 -/* 86537C 8024083C 00000000 */ nop +/* 86537C 8024083C 00000000 */ nop /* 865380 80240840 4600D18D */ trunc.w.s $f6, $f26 /* 865384 80240844 44023000 */ mfc1 $v0, $f6 -/* 865388 80240848 00000000 */ nop +/* 865388 80240848 00000000 */ nop /* 86538C 8024084C A6620000 */ sh $v0, ($s3) /* 865390 80240850 86420002 */ lh $v0, 2($s2) /* 865394 80240854 4614C600 */ add.s $f24, $f24, $f20 /* 865398 80240858 44820000 */ mtc1 $v0, $f0 -/* 86539C 8024085C 00000000 */ nop +/* 86539C 8024085C 00000000 */ nop /* 8653A0 80240860 46800020 */ cvt.s.w $f0, $f0 /* 8653A4 80240864 46180000 */ add.s $f0, $f0, $f24 /* 8653A8 80240868 4600018D */ trunc.w.s $f6, $f0 /* 8653AC 8024086C 44023000 */ mfc1 $v0, $f6 -/* 8653B0 80240870 00000000 */ nop +/* 8653B0 80240870 00000000 */ nop /* 8653B4 80240874 A6620002 */ sh $v0, 2($s3) /* 8653B8 80240878 26730010 */ addiu $s3, $s3, 0x10 .L8024087C: diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240A18_865558.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240A18_865558.s index 1f6f733be9..a55d77dd46 100644 --- a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240A18_865558.s +++ b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240A18_865558.s @@ -48,9 +48,9 @@ glabel func_80240A18_865558 /* 865604 80240AC4 4618A501 */ sub.s $f20, $f20, $f24 /* 865608 80240AC8 3C013F00 */ lui $at, 0x3f00 /* 86560C 80240ACC 44811000 */ mtc1 $at, $f2 -/* 865610 80240AD0 00000000 */ nop +/* 865610 80240AD0 00000000 */ nop /* 865614 80240AD4 4602A502 */ mul.s $f20, $f20, $f2 -/* 865618 80240AD8 00000000 */ nop +/* 865618 80240AD8 00000000 */ nop /* 86561C 80240ADC 12000008 */ beqz $s0, .L80240B00 /* 865620 80240AE0 46000586 */ mov.s $f22, $f0 /* 865624 80240AE4 0233102A */ slt $v0, $s1, $s3 @@ -64,18 +64,18 @@ glabel func_80240A18_865558 /* 865640 80240B00 3C014334 */ lui $at, 0x4334 /* 865644 80240B04 44810000 */ mtc1 $at, $f0 /* 865648 80240B08 44936000 */ mtc1 $s3, $f12 -/* 86564C 80240B0C 00000000 */ nop +/* 86564C 80240B0C 00000000 */ nop /* 865650 80240B10 46806320 */ cvt.s.w $f12, $f12 /* 865654 80240B14 46006302 */ mul.s $f12, $f12, $f0 -/* 865658 80240B18 00000000 */ nop +/* 865658 80240B18 00000000 */ nop /* 86565C 80240B1C 44910000 */ mtc1 $s1, $f0 -/* 865660 80240B20 00000000 */ nop +/* 865660 80240B20 00000000 */ nop /* 865664 80240B24 46800020 */ cvt.s.w $f0, $f0 /* 865668 80240B28 46006303 */ div.s $f12, $f12, $f0 /* 86566C 80240B2C 0C00A8D4 */ jal cos_deg /* 865670 80240B30 46166300 */ add.s $f12, $f12, $f22 /* 865674 80240B34 4600A002 */ mul.s $f0, $f20, $f0 -/* 865678 80240B38 00000000 */ nop +/* 865678 80240B38 00000000 */ nop /* 86567C 80240B3C 4614C080 */ add.s $f2, $f24, $f20 /* 865680 80240B40 46001081 */ sub.s $f2, $f2, $f0 /* 865684 80240B44 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240B88_8656C8.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240B88_8656C8.s index 17e97789db..67722b6bfb 100644 --- a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240B88_8656C8.s +++ b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240B88_8656C8.s @@ -20,18 +20,18 @@ glabel func_80240B88_8656C8 /* 865704 80240BC4 0C00A8BB */ jal sin_deg /* 865708 80240BC8 4600A306 */ mov.s $f12, $f20 /* 86570C 80240BCC 46180002 */ mul.s $f0, $f0, $f24 -/* 865710 80240BD0 00000000 */ nop +/* 865710 80240BD0 00000000 */ nop /* 865714 80240BD4 C6160038 */ lwc1 $f22, 0x38($s0) /* 865718 80240BD8 3C0141F0 */ lui $at, 0x41f0 /* 86571C 80240BDC 44811000 */ mtc1 $at, $f2 -/* 865720 80240BE0 00000000 */ nop +/* 865720 80240BE0 00000000 */ nop /* 865724 80240BE4 4602B580 */ add.s $f22, $f22, $f2 /* 865728 80240BE8 4600A306 */ mov.s $f12, $f20 /* 86572C 80240BEC 0C00A8D4 */ jal cos_deg /* 865730 80240BF0 4600B580 */ add.s $f22, $f22, $f0 /* 865734 80240BF4 0220202D */ daddu $a0, $s1, $zero /* 865738 80240BF8 46180002 */ mul.s $f0, $f0, $f24 -/* 86573C 80240BFC 00000000 */ nop +/* 86573C 80240BFC 00000000 */ nop /* 865740 80240C00 3C05FE36 */ lui $a1, 0xfe36 /* 865744 80240C04 34A53C80 */ ori $a1, $a1, 0x3c80 /* 865748 80240C08 C6180040 */ lwc1 $f24, 0x40($s0) diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240E48_865988.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240E48_865988.s index 866c666f23..8d17281203 100644 --- a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240E48_865988.s +++ b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240E48_865988.s @@ -14,5 +14,5 @@ glabel func_80240E48_865988 /* 8659AC 80240E6C 24020002 */ addiu $v0, $zero, 2 /* 8659B0 80240E70 03E00008 */ jr $ra /* 8659B4 80240E74 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8659B8 80240E78 00000000 */ nop -/* 8659BC 80240E7C 00000000 */ nop +/* 8659B8 80240E78 00000000 */ nop +/* 8659BC 80240E7C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80240E80_8659C0.s b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80240E80_8659C0.s index 6c8ceefa07..e3197da0cc 100644 --- a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80240E80_8659C0.s +++ b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80240E80_8659C0.s @@ -44,17 +44,17 @@ glabel func_80240E80_8659C0 /* 865A4C 80240F0C 0C00A8BB */ jal sin_deg /* 865A50 80240F10 4600A306 */ mov.s $f12, $f20 /* 865A54 80240F14 46160002 */ mul.s $f0, $f0, $f22 -/* 865A58 80240F18 00000000 */ nop +/* 865A58 80240F18 00000000 */ nop /* 865A5C 80240F1C C6220038 */ lwc1 $f2, 0x38($s1) /* 865A60 80240F20 3C0141F0 */ lui $at, 0x41f0 /* 865A64 80240F24 44812000 */ mtc1 $at, $f4 -/* 865A68 80240F28 00000000 */ nop +/* 865A68 80240F28 00000000 */ nop /* 865A6C 80240F2C 46041080 */ add.s $f2, $f2, $f4 /* 865A70 80240F30 46001600 */ add.s $f24, $f2, $f0 /* 865A74 80240F34 0C00A8D4 */ jal cos_deg /* 865A78 80240F38 4600A306 */ mov.s $f12, $f20 /* 865A7C 80240F3C 46160002 */ mul.s $f0, $f0, $f22 -/* 865A80 80240F40 00000000 */ nop +/* 865A80 80240F40 00000000 */ nop /* 865A84 80240F44 24020001 */ addiu $v0, $zero, 1 /* 865A88 80240F48 C6220040 */ lwc1 $f2, 0x40($s1) /* 865A8C 80240F4C C624003C */ lwc1 $f4, 0x3c($s1) @@ -70,12 +70,12 @@ glabel func_80240E80_8659C0 /* 865AB4 80240F74 10800007 */ beqz $a0, .L80240F94 /* 865AB8 80240F78 0000102D */ daddu $v0, $zero, $zero /* 865ABC 80240F7C 0809041C */ j .L80241070 -/* 865AC0 80240F80 00000000 */ nop +/* 865AC0 80240F80 00000000 */ nop .L80240F84: /* 865AC4 80240F84 1082002A */ beq $a0, $v0, .L80241030 /* 865AC8 80240F88 0000102D */ daddu $v0, $zero, $zero /* 865ACC 80240F8C 0809041C */ j .L80241070 -/* 865AD0 80240F90 00000000 */ nop +/* 865AD0 80240F90 00000000 */ nop .L80240F94: /* 865AD4 80240F94 3C028011 */ lui $v0, %hi(gPlayerStatus) /* 865AD8 80240F98 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) diff --git a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241098_865BD8.s b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241098_865BD8.s index 90db9085bb..428a55259e 100644 --- a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241098_865BD8.s +++ b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241098_865BD8.s @@ -27,7 +27,7 @@ glabel func_80241098_865BD8 /* 865C30 802410F0 1062004D */ beq $v1, $v0, .L80241228 /* 865C34 802410F4 0000102D */ daddu $v0, $zero, $zero /* 865C38 802410F8 080904A0 */ j .L80241280 -/* 865C3C 802410FC 00000000 */ nop +/* 865C3C 802410FC 00000000 */ nop .L80241100: /* 865C40 80241100 32028000 */ andi $v0, $s0, 0x8000 /* 865C44 80241104 10400003 */ beqz $v0, .L80241114 @@ -70,16 +70,16 @@ glabel func_80241098_865BD8 /* 865CC8 80241188 46040000 */ add.s $f0, $f0, $f4 /* 865CCC 8024118C 3C01428C */ lui $at, 0x428c /* 865CD0 80241190 44811000 */ mtc1 $at, $f2 -/* 865CD4 80241194 00000000 */ nop +/* 865CD4 80241194 00000000 */ nop /* 865CD8 80241198 4602003C */ c.lt.s $f0, $f2 -/* 865CDC 8024119C 00000000 */ nop +/* 865CDC 8024119C 00000000 */ nop /* 865CE0 802411A0 4500000D */ bc1f .L802411D8 /* 865CE4 802411A4 E4400000 */ swc1 $f0, ($v0) /* 865CE8 802411A8 3C014080 */ lui $at, 0x4080 /* 865CEC 802411AC 44810000 */ mtc1 $at, $f0 -/* 865CF0 802411B0 00000000 */ nop +/* 865CF0 802411B0 00000000 */ nop /* 865CF4 802411B4 4600203C */ c.lt.s $f4, $f0 -/* 865CF8 802411B8 00000000 */ nop +/* 865CF8 802411B8 00000000 */ nop /* 865CFC 802411BC 45030001 */ bc1tl .L802411C4 /* 865D00 802411C0 E4600000 */ swc1 $f0, ($v1) .L802411C4: @@ -91,7 +91,7 @@ glabel func_80241098_865BD8 .L802411D8: /* 865D18 802411D8 3C014000 */ lui $at, 0x4000 /* 865D1C 802411DC 44810000 */ mtc1 $at, $f0 -/* 865D20 802411E0 00000000 */ nop +/* 865D20 802411E0 00000000 */ nop /* 865D24 802411E4 46002001 */ sub.s $f0, $f4, $f0 .L802411E8: /* 865D28 802411E8 E4600000 */ swc1 $f0, ($v1) @@ -119,9 +119,9 @@ glabel func_80241098_865BD8 /* 865D7C 8024123C C4620000 */ lwc1 $f2, ($v1) /* 865D80 80241240 46020001 */ sub.s $f0, $f0, $f2 /* 865D84 80241244 44802000 */ mtc1 $zero, $f4 -/* 865D88 80241248 00000000 */ nop +/* 865D88 80241248 00000000 */ nop /* 865D8C 8024124C 4604003C */ c.lt.s $f0, $f4 -/* 865D90 80241250 00000000 */ nop +/* 865D90 80241250 00000000 */ nop /* 865D94 80241254 45000004 */ bc1f .L80241268 /* 865D98 80241258 E4400000 */ swc1 $f0, ($v0) /* 865D9C 8024125C E4440000 */ swc1 $f4, ($v0) @@ -130,7 +130,7 @@ glabel func_80241098_865BD8 .L80241268: /* 865DA8 80241268 3C013F80 */ lui $at, 0x3f80 /* 865DAC 8024126C 44810000 */ mtc1 $at, $f0 -/* 865DB0 80241270 00000000 */ nop +/* 865DB0 80241270 00000000 */ nop /* 865DB4 80241274 46001000 */ add.s $f0, $f2, $f0 /* 865DB8 80241278 E4600000 */ swc1 $f0, ($v1) .L8024127C: diff --git a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802412AC_865DEC.s b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802412AC_865DEC.s index 270968fce9..579cdadd29 100644 --- a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802412AC_865DEC.s +++ b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802412AC_865DEC.s @@ -34,7 +34,7 @@ glabel func_802412AC_865DEC /* 865E60 80241320 C4D40090 */ lwc1 $f20, 0x90($a2) .L80241324: /* 865E64 80241324 4480A000 */ mtc1 $zero, $f20 -/* 865E68 80241328 00000000 */ nop +/* 865E68 80241328 00000000 */ nop /* 865E6C 8024132C 4600A586 */ mov.s $f22, $f20 /* 865E70 80241330 4600A006 */ mov.s $f0, $f20 .L80241334: diff --git a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241388_865EC8.s b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241388_865EC8.s index 9cd606492d..669e598c50 100644 --- a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241388_865EC8.s +++ b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241388_865EC8.s @@ -65,11 +65,11 @@ glabel func_80241388_865EC8 /* 865FB8 80241478 24020002 */ addiu $v0, $zero, 2 .L8024147C: /* 865FBC 8024147C 461AE032 */ c.eq.s $f28, $f26 -/* 865FC0 80241480 00000000 */ nop +/* 865FC0 80241480 00000000 */ nop /* 865FC4 80241484 45000007 */ bc1f .L802414A4 /* 865FC8 80241488 3C05FBD3 */ lui $a1, 0xfbd3 /* 865FCC 8024148C 4614C032 */ c.eq.s $f24, $f20 -/* 865FD0 80241490 00000000 */ nop +/* 865FD0 80241490 00000000 */ nop /* 865FD4 80241494 45010050 */ bc1t .L802415D8 /* 865FD8 80241498 24020002 */ addiu $v0, $zero, 2 /* 865FDC 8024149C 0200202D */ daddu $a0, $s0, $zero @@ -119,11 +119,11 @@ glabel func_80241388_865EC8 /* 866084 80241544 4614B081 */ sub.s $f2, $f22, $f20 /* 866088 80241548 3C014334 */ lui $at, 0x4334 /* 86608C 8024154C 44810000 */ mtc1 $at, $f0 -/* 866090 80241550 00000000 */ nop +/* 866090 80241550 00000000 */ nop /* 866094 80241554 4602003E */ c.le.s $f0, $f2 -/* 866098 80241558 00000000 */ nop +/* 866098 80241558 00000000 */ nop /* 86609C 8024155C 45000005 */ bc1f .L80241574 -/* 8660A0 80241560 00000000 */ nop +/* 8660A0 80241560 00000000 */ nop /* 8660A4 80241564 3C0143B4 */ lui $at, 0x43b4 /* 8660A8 80241568 44810000 */ mtc1 $at, $f0 /* 8660AC 8024156C 08090568 */ j .L802415A0 @@ -131,14 +131,14 @@ glabel func_80241388_865EC8 .L80241574: /* 8660B4 80241574 3C01C334 */ lui $at, 0xc334 /* 8660B8 80241578 44810000 */ mtc1 $at, $f0 -/* 8660BC 8024157C 00000000 */ nop +/* 8660BC 8024157C 00000000 */ nop /* 8660C0 80241580 4600103E */ c.le.s $f2, $f0 -/* 8660C4 80241584 00000000 */ nop +/* 8660C4 80241584 00000000 */ nop /* 8660C8 80241588 45020006 */ bc1fl .L802415A4 /* 8660CC 8024158C 4616A001 */ sub.s $f0, $f20, $f22 /* 8660D0 80241590 3C0143B4 */ lui $at, 0x43b4 /* 8660D4 80241594 44810000 */ mtc1 $at, $f0 -/* 8660D8 80241598 00000000 */ nop +/* 8660D8 80241598 00000000 */ nop /* 8660DC 8024159C 4600B580 */ add.s $f22, $f22, $f0 .L802415A0: /* 8660E0 802415A0 4616A001 */ sub.s $f0, $f20, $f22 @@ -147,7 +147,7 @@ glabel func_80241388_865EC8 /* 8660E8 802415A8 D4224968 */ ldc1 $f2, %lo(D_80244968)($at) /* 8660EC 802415AC 46000021 */ cvt.d.s $f0, $f0 /* 8660F0 802415B0 46220002 */ mul.d $f0, $f0, $f2 -/* 8660F4 802415B4 00000000 */ nop +/* 8660F4 802415B4 00000000 */ nop /* 8660F8 802415B8 46200020 */ cvt.s.d $f0, $f0 /* 8660FC 802415BC 4600B580 */ add.s $f22, $f22, $f0 /* 866100 802415C0 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802415FC_86613C.s b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802415FC_86613C.s index a74a183cdd..3be1fc8898 100644 --- a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802415FC_86613C.s +++ b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802415FC_86613C.s @@ -17,7 +17,7 @@ glabel func_802415FC_86613C /* 86616C 8024162C 44800000 */ mtc1 $zero, $f0 /* 866170 80241630 C4560040 */ lwc1 $f22, 0x40($v0) /* 866174 80241634 4600A03C */ c.lt.s $f20, $f0 -/* 866178 80241638 00000000 */ nop +/* 866178 80241638 00000000 */ nop /* 86617C 8024163C 4500000C */ bc1f .L80241670 /* 866180 80241640 0000202D */ daddu $a0, $zero, $zero /* 866184 80241644 4405C000 */ mfc1 $a1, $f24 @@ -39,4 +39,4 @@ glabel func_802415FC_86613C /* 8661C0 80241680 24020002 */ addiu $v0, $zero, 2 /* 8661C4 80241684 03E00008 */ jr $ra /* 8661C8 80241688 27BD0038 */ addiu $sp, $sp, 0x38 -/* 8661CC 8024168C 00000000 */ nop +/* 8661CC 8024168C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240114_7E74B4.s b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240114_7E74B4.s index a951aedb48..227bf63c10 100644 --- a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240114_7E74B4.s +++ b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240114_7E74B4.s @@ -43,5 +43,5 @@ glabel func_80240114_7E74B4 /* 7E753C 8024019C 8FB00010 */ lw $s0, 0x10($sp) /* 7E7540 802401A0 03E00008 */ jr $ra /* 7E7544 802401A4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 7E7548 802401A8 00000000 */ nop -/* 7E754C 802401AC 00000000 */ nop +/* 7E7548 802401A8 00000000 */ nop +/* 7E754C 802401AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/machi/7E7550/func_802401B0_7E7550.s b/asm/nonmatchings/world/area_mac/machi/7E7550/func_802401B0_7E7550.s index 00597cfcb1..13802df6a7 100644 --- a/asm/nonmatchings/world/area_mac/machi/7E7550/func_802401B0_7E7550.s +++ b/asm/nonmatchings/world/area_mac/machi/7E7550/func_802401B0_7E7550.s @@ -17,18 +17,18 @@ glabel func_802401B0_7E7550 /* 7E7580 802401E0 0040902D */ daddu $s2, $v0, $zero /* 7E7584 802401E4 284201F4 */ slti $v0, $v0, 0x1f4 /* 7E7588 802401E8 10400019 */ beqz $v0, .L80240250 -/* 7E758C 802401EC 00000000 */ nop +/* 7E758C 802401EC 00000000 */ nop /* 7E7590 802401F0 0C00A67F */ jal rand_int /* 7E7594 802401F4 24040004 */ addiu $a0, $zero, 4 /* 7E7598 802401F8 24420001 */ addiu $v0, $v0, 1 /* 7E759C 802401FC 4482B000 */ mtc1 $v0, $f22 -/* 7E75A0 80240200 00000000 */ nop +/* 7E75A0 80240200 00000000 */ nop /* 7E75A4 80240204 4680B5A0 */ cvt.s.w $f22, $f22 /* 7E75A8 80240208 0C00A67F */ jal rand_int /* 7E75AC 8024020C 24040003 */ addiu $a0, $zero, 3 /* 7E75B0 80240210 24420005 */ addiu $v0, $v0, 5 /* 7E75B4 80240214 4482A000 */ mtc1 $v0, $f20 -/* 7E75B8 80240218 00000000 */ nop +/* 7E75B8 80240218 00000000 */ nop /* 7E75BC 8024021C 4680A520 */ cvt.s.w $f20, $f20 /* 7E75C0 80240220 0C00A67F */ jal rand_int /* 7E75C4 80240224 24040032 */ addiu $a0, $zero, 0x32 @@ -50,13 +50,13 @@ glabel func_802401B0_7E7550 /* 7E7600 80240260 2451000A */ addiu $s1, $v0, 0xa /* 7E7604 80240264 24420001 */ addiu $v0, $v0, 1 /* 7E7608 80240268 4482B000 */ mtc1 $v0, $f22 -/* 7E760C 8024026C 00000000 */ nop +/* 7E760C 8024026C 00000000 */ nop /* 7E7610 80240270 4680B5A0 */ cvt.s.w $f22, $f22 /* 7E7614 80240274 0C00A67F */ jal rand_int /* 7E7618 80240278 24040003 */ addiu $a0, $zero, 3 /* 7E761C 8024027C 24420005 */ addiu $v0, $v0, 5 /* 7E7620 80240280 4482A000 */ mtc1 $v0, $f20 -/* 7E7624 80240284 00000000 */ nop +/* 7E7624 80240284 00000000 */ nop /* 7E7628 80240288 4680A520 */ cvt.s.w $f20, $f20 /* 7E762C 8024028C 0C00A67F */ jal rand_int /* 7E7630 80240290 24040032 */ addiu $a0, $zero, 0x32 diff --git a/asm/nonmatchings/world/area_mac/machi/7E7550/func_8024045C_7E77FC.s b/asm/nonmatchings/world/area_mac/machi/7E7550/func_8024045C_7E77FC.s index 80cd0f2193..04f01e8976 100644 --- a/asm/nonmatchings/world/area_mac/machi/7E7550/func_8024045C_7E77FC.s +++ b/asm/nonmatchings/world/area_mac/machi/7E7550/func_8024045C_7E77FC.s @@ -23,4 +23,4 @@ glabel func_8024045C_7E77FC /* 7E7840 802404A0 A0A2002C */ sb $v0, 0x2c($a1) /* 7E7844 802404A4 03E00008 */ jr $ra /* 7E7848 802404A8 24020002 */ addiu $v0, $zero, 2 -/* 7E784C 802404AC 00000000 */ nop +/* 7E784C 802404AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/machi/7E7850/func_802404B0_7E7850.s b/asm/nonmatchings/world/area_mac/machi/7E7850/func_802404B0_7E7850.s index 78de8def7b..b0232d4e17 100644 --- a/asm/nonmatchings/world/area_mac/machi/7E7850/func_802404B0_7E7850.s +++ b/asm/nonmatchings/world/area_mac/machi/7E7850/func_802404B0_7E7850.s @@ -20,12 +20,12 @@ glabel func_802404B0_7E7850 /* 7E7888 802404E8 1062003C */ beq $v1, $v0, .L802405DC /* 7E788C 802404EC 0000102D */ daddu $v0, $zero, $zero /* 7E7890 802404F0 0809019E */ j .L80240678 -/* 7E7894 802404F4 00000000 */ nop +/* 7E7894 802404F4 00000000 */ nop .L802404F8: /* 7E7898 802404F8 C4800038 */ lwc1 $f0, 0x38($a0) /* 7E789C 802404FC 3C0143FA */ lui $at, 0x43fa /* 7E78A0 80240500 44814000 */ mtc1 $at, $f8 -/* 7E78A4 80240504 00000000 */ nop +/* 7E78A4 80240504 00000000 */ nop /* 7E78A8 80240508 46080000 */ add.s $f0, $f0, $f8 /* 7E78AC 8024050C C482003C */ lwc1 $f2, 0x3c($a0) /* 7E78B0 80240510 E4800060 */ swc1 $f0, 0x60($a0) @@ -48,7 +48,7 @@ glabel func_802404B0_7E7850 /* 7E78F4 80240554 3C0141A0 */ lui $at, 0x41a0 /* 7E78F8 80240558 44813000 */ mtc1 $at, $f6 /* 7E78FC 8024055C 44830000 */ mtc1 $v1, $f0 -/* 7E7900 80240560 00000000 */ nop +/* 7E7900 80240560 00000000 */ nop /* 7E7904 80240564 46800020 */ cvt.s.w $f0, $f0 /* 7E7908 80240568 46001083 */ div.s $f2, $f2, $f0 /* 7E790C 8024056C C4800068 */ lwc1 $f0, 0x68($a0) @@ -63,7 +63,7 @@ glabel func_802404B0_7E7850 /* 7E7930 80240590 3C014120 */ lui $at, 0x4120 /* 7E7934 80240594 44812000 */ mtc1 $at, $f4 /* 7E7938 80240598 44853000 */ mtc1 $a1, $f6 -/* 7E793C 8024059C 00000000 */ nop +/* 7E793C 8024059C 00000000 */ nop /* 7E7940 802405A0 468031A0 */ cvt.s.w $f6, $f6 /* 7E7944 802405A4 46041083 */ div.s $f2, $f2, $f4 /* 7E7948 802405A8 E4820060 */ swc1 $f2, 0x60($a0) @@ -85,11 +85,11 @@ glabel func_802404B0_7E7850 /* 7E7984 802405E4 D42A3960 */ ldc1 $f10, %lo(D_80243960)($at) /* 7E7988 802405E8 46002121 */ cvt.d.s $f4, $f4 /* 7E798C 802405EC 462A2102 */ mul.d $f4, $f4, $f10 -/* 7E7990 802405F0 00000000 */ nop +/* 7E7990 802405F0 00000000 */ nop /* 7E7994 802405F4 C4820064 */ lwc1 $f2, 0x64($a0) /* 7E7998 802405F8 460010A1 */ cvt.d.s $f2, $f2 /* 7E799C 802405FC 462A1082 */ mul.d $f2, $f2, $f10 -/* 7E79A0 80240600 00000000 */ nop +/* 7E79A0 80240600 00000000 */ nop /* 7E79A4 80240604 24020001 */ addiu $v0, $zero, 1 /* 7E79A8 80240608 C48E0038 */ lwc1 $f14, 0x38($a0) /* 7E79AC 8024060C C4800060 */ lwc1 $f0, 0x60($a0) @@ -107,7 +107,7 @@ glabel func_802404B0_7E7850 /* 7E79DC 8024063C 46003006 */ mov.s $f0, $f6 /* 7E79E0 80240640 46000021 */ cvt.d.s $f0, $f0 /* 7E79E4 80240644 462A0002 */ mul.d $f0, $f0, $f10 -/* 7E79E8 80240648 00000000 */ nop +/* 7E79E8 80240648 00000000 */ nop /* 7E79EC 8024064C E48E0038 */ swc1 $f14, 0x38($a0) /* 7E79F0 80240650 E4880040 */ swc1 $f8, 0x40($a0) /* 7E79F4 80240654 E48C003C */ swc1 $f12, 0x3c($a0) @@ -126,4 +126,4 @@ glabel func_802404B0_7E7850 /* 7E7A20 80240680 8FB00010 */ lw $s0, 0x10($sp) /* 7E7A24 80240684 03E00008 */ jr $ra /* 7E7A28 80240688 27BD0020 */ addiu $sp, $sp, 0x20 -/* 7E7A2C 8024068C 00000000 */ nop +/* 7E7A2C 8024068C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240034_E0E7D4.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240034_E0E7D4.s index 08c368877c..51f29ac194 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240034_E0E7D4.s +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240034_E0E7D4.s @@ -22,16 +22,16 @@ glabel func_80240034_E0E7D4 /* E0E814 80240074 00021023 */ negu $v0, $v0 .L80240078: /* E0E818 80240078 14400003 */ bnez $v0, .L80240088 -/* E0E81C 8024007C 00000000 */ nop +/* E0E81C 8024007C 00000000 */ nop /* E0E820 80240080 50E00017 */ beql $a3, $zero, .L802400E0 /* E0E824 80240084 0000102D */ daddu $v0, $zero, $zero .L80240088: /* E0E828 80240088 44822000 */ mtc1 $v0, $f4 -/* E0E82C 8024008C 00000000 */ nop +/* E0E82C 8024008C 00000000 */ nop /* E0E830 80240090 46802120 */ cvt.s.w $f4, $f4 /* E0E834 80240094 44062000 */ mfc1 $a2, $f4 /* E0E838 80240098 44872000 */ mtc1 $a3, $f4 -/* E0E83C 8024009C 00000000 */ nop +/* E0E83C 8024009C 00000000 */ nop /* E0E840 802400A0 46802120 */ cvt.s.w $f4, $f4 /* E0E844 802400A4 44806000 */ mtc1 $zero, $f12 /* E0E848 802400A8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240034_E0E7D4 /* E0E850 802400B0 46006386 */ mov.s $f14, $f12 /* E0E854 802400B4 3C014270 */ lui $at, 0x4270 /* E0E858 802400B8 44811000 */ mtc1 $at, $f2 -/* E0E85C 802400BC 00000000 */ nop +/* E0E85C 802400BC 00000000 */ nop /* E0E860 802400C0 4602003C */ c.lt.s $f0, $f2 -/* E0E864 802400C4 00000000 */ nop +/* E0E864 802400C4 00000000 */ nop /* E0E868 802400C8 45000004 */ bc1f .L802400DC /* E0E86C 802400CC 24020001 */ addiu $v0, $zero, 1 /* E0E870 802400D0 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802402E0_E0EA80.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802402E0_E0EA80.s index d47784a2bc..97b142d2dc 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802402E0_E0EA80.s +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802402E0_E0EA80.s @@ -45,7 +45,7 @@ glabel func_802402E0_E0EA80 /* E0EB1C 8024037C 0C00A7B5 */ jal dist2D /* E0EB20 80240380 4600B386 */ mov.s $f14, $f22 /* E0EB24 80240384 4614003C */ c.lt.s $f0, $f20 -/* E0EB28 80240388 00000000 */ nop +/* E0EB28 80240388 00000000 */ nop /* E0EB2C 8024038C 45000003 */ bc1f .L8024039C /* E0EB30 80240390 2631000C */ addiu $s1, $s1, 0xc /* E0EB34 80240394 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_802402E0_E0EA80 /* E0EB60 802403C0 8E6200D0 */ lw $v0, 0xd0($s3) /* E0EB64 802403C4 8C42007C */ lw $v0, 0x7c($v0) /* E0EB68 802403C8 04410004 */ bgez $v0, .L802403DC -/* E0EB6C 802403CC 00000000 */ nop +/* E0EB6C 802403CC 00000000 */ nop /* E0EB70 802403D0 C6C00000 */ lwc1 $f0, ($s6) /* E0EB74 802403D4 080900FF */ j .L802403FC /* E0EB78 802403D8 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_802402E0_E0EA80 /* E0EB7C 802403DC 3C018024 */ lui $at, %hi(D_80243DF0) /* E0EB80 802403E0 D4223DF0 */ ldc1 $f2, %lo(D_80243DF0)($at) /* E0EB84 802403E4 44820000 */ mtc1 $v0, $f0 -/* E0EB88 802403E8 00000000 */ nop +/* E0EB88 802403E8 00000000 */ nop /* E0EB8C 802403EC 46800021 */ cvt.d.w $f0, $f0 /* E0EB90 802403F0 46220003 */ div.d $f0, $f0, $f2 /* E0EB94 802403F4 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240438_E0EBD8.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240438_E0EBD8.s index 1c3a3a3985..58194bc6f3 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240438_E0EBD8.s +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240438_E0EBD8.s @@ -44,7 +44,7 @@ glabel func_80240438_E0EBD8 /* E0EC74 802404D4 2402000F */ addiu $v0, $zero, 0xf /* E0EC78 802404D8 AFA2001C */ sw $v0, 0x1c($sp) /* E0EC7C 802404DC 44833000 */ mtc1 $v1, $f6 -/* E0EC80 802404E0 00000000 */ nop +/* E0EC80 802404E0 00000000 */ nop /* E0EC84 802404E4 468031A0 */ cvt.s.w $f6, $f6 /* E0EC88 802404E8 44073000 */ mfc1 $a3, $f6 /* E0EC8C 802404EC 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_80240438_E0EBD8 .L8024053C: /* E0ECDC 8024053C 8602008C */ lh $v0, 0x8c($s0) /* E0ECE0 80240540 1440005D */ bnez $v0, .L802406B8 -/* E0ECE4 80240544 00000000 */ nop +/* E0ECE4 80240544 00000000 */ nop /* E0ECE8 80240548 C6000018 */ lwc1 $f0, 0x18($s0) /* E0ECEC 8024054C 3C014010 */ lui $at, 0x4010 /* E0ECF0 80240550 44811800 */ mtc1 $at, $f3 /* E0ECF4 80240554 44801000 */ mtc1 $zero, $f2 /* E0ECF8 80240558 46000021 */ cvt.d.s $f0, $f0 /* E0ECFC 8024055C 4622003C */ c.lt.d $f0, $f2 -/* E0ED00 80240560 00000000 */ nop +/* E0ED00 80240560 00000000 */ nop /* E0ED04 80240564 45000003 */ bc1f .L80240574 /* E0ED08 80240568 0200202D */ daddu $a0, $s0, $zero /* E0ED0C 8024056C 0809015E */ j .L80240578 @@ -88,7 +88,7 @@ glabel func_80240438_E0EBD8 /* E0ED14 80240574 24050001 */ addiu $a1, $zero, 1 .L80240578: /* E0ED18 80240578 0C00F598 */ jal func_8003D660 -/* E0ED1C 8024057C 00000000 */ nop +/* E0ED1C 8024057C 00000000 */ nop /* E0ED20 80240580 C60C0038 */ lwc1 $f12, 0x38($s0) /* E0ED24 80240584 8E430078 */ lw $v1, 0x78($s2) /* E0ED28 80240588 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_80240438_E0EBD8 /* E0ED50 802405B0 4406B000 */ mfc1 $a2, $f22 /* E0ED54 802405B4 4407A000 */ mfc1 $a3, $f20 /* E0ED58 802405B8 0C00A720 */ jal atan2 -/* E0ED5C 802405BC 00000000 */ nop +/* E0ED5C 802405BC 00000000 */ nop /* E0ED60 802405C0 8E050018 */ lw $a1, 0x18($s0) /* E0ED64 802405C4 44060000 */ mfc1 $a2, $f0 /* E0ED68 802405C8 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_80240438_E0EBD8 /* E0ED7C 802405DC 4406B000 */ mfc1 $a2, $f22 /* E0ED80 802405E0 4407A000 */ mfc1 $a3, $f20 /* E0ED84 802405E4 0C00A7B5 */ jal dist2D -/* E0ED88 802405E8 00000000 */ nop +/* E0ED88 802405E8 00000000 */ nop /* E0ED8C 802405EC C6020018 */ lwc1 $f2, 0x18($s0) /* E0ED90 802405F0 4602003E */ c.le.s $f0, $f2 -/* E0ED94 802405F4 00000000 */ nop +/* E0ED94 802405F4 00000000 */ nop /* E0ED98 802405F8 4500002F */ bc1f .L802406B8 /* E0ED9C 802405FC 240403E8 */ addiu $a0, $zero, 0x3e8 /* E0EDA0 80240600 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_80240438_E0EBD8 /* E0EDF4 80240654 18400003 */ blez $v0, .L80240664 /* E0EDF8 80240658 24020004 */ addiu $v0, $zero, 4 /* E0EDFC 8024065C 14600002 */ bnez $v1, .L80240668 -/* E0EE00 80240660 00000000 */ nop +/* E0EE00 80240660 00000000 */ nop .L80240664: /* E0EE04 80240664 AE420070 */ sw $v0, 0x70($s2) .L80240668: diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802407A0_E0EF40.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802407A0_E0EF40.s index e32dd35cd1..9b6b0c519c 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802407A0_E0EF40.s +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802407A0_E0EF40.s @@ -38,7 +38,7 @@ glabel func_802407A0_E0EF40 /* E0EFC4 80240824 2402000F */ addiu $v0, $zero, 0xf /* E0EFC8 80240828 AFA2001C */ sw $v0, 0x1c($sp) /* E0EFCC 8024082C 44833000 */ mtc1 $v1, $f6 -/* E0EFD0 80240830 00000000 */ nop +/* E0EFD0 80240830 00000000 */ nop /* E0EFD4 80240834 468031A0 */ cvt.s.w $f6, $f6 /* E0EFD8 80240838 44073000 */ mfc1 $a3, $f6 /* E0EFDC 8024083C 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_802407A0_E0EF40 .L802408A0: /* E0F040 802408A0 8602008C */ lh $v0, 0x8c($s0) /* E0F044 802408A4 14400025 */ bnez $v0, .L8024093C -/* E0F048 802408A8 00000000 */ nop +/* E0F048 802408A8 00000000 */ nop /* E0F04C 802408AC 9602008E */ lhu $v0, 0x8e($s0) /* E0F050 802408B0 2442FFFF */ addiu $v0, $v0, -1 /* E0F054 802408B4 A602008E */ sh $v0, 0x8e($s0) /* E0F058 802408B8 00021400 */ sll $v0, $v0, 0x10 /* E0F05C 802408BC 1440001F */ bnez $v0, .L8024093C -/* E0F060 802408C0 00000000 */ nop +/* E0F060 802408C0 00000000 */ nop /* E0F064 802408C4 8E820074 */ lw $v0, 0x74($s4) /* E0F068 802408C8 2442FFFF */ addiu $v0, $v0, -1 /* E0F06C 802408CC 10400019 */ beqz $v0, .L80240934 @@ -84,7 +84,7 @@ glabel func_802407A0_E0EF40 /* E0F078 802408D8 9442002A */ lhu $v0, 0x2a($v0) /* E0F07C 802408DC 30420010 */ andi $v0, $v0, 0x10 /* E0F080 802408E0 14400007 */ bnez $v0, .L80240900 -/* E0F084 802408E4 00000000 */ nop +/* E0F084 802408E4 00000000 */ nop /* E0F088 802408E8 C600000C */ lwc1 $f0, 0xc($s0) /* E0F08C 802408EC 3C014334 */ lui $at, 0x4334 /* E0F090 802408F0 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_8024095C_E0F0FC.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_8024095C_E0F0FC.s index f2f1857969..f5ab827273 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_8024095C_E0F0FC.s +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_8024095C_E0F0FC.s @@ -28,7 +28,7 @@ glabel func_8024095C_E0F0FC /* E0F154 802409B4 8E0200D0 */ lw $v0, 0xd0($s0) /* E0F158 802409B8 8C42007C */ lw $v0, 0x7c($v0) /* E0F15C 802409BC 04410004 */ bgez $v0, .L802409D0 -/* E0F160 802409C0 00000000 */ nop +/* E0F160 802409C0 00000000 */ nop /* E0F164 802409C4 C6400000 */ lwc1 $f0, ($s2) /* E0F168 802409C8 0809027C */ j .L802409F0 /* E0F16C 802409CC E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_8024095C_E0F0FC /* E0F170 802409D0 3C018024 */ lui $at, %hi(D_80243DF8) /* E0F174 802409D4 D4223DF8 */ ldc1 $f2, %lo(D_80243DF8)($at) /* E0F178 802409D8 44820000 */ mtc1 $v0, $f0 -/* E0F17C 802409DC 00000000 */ nop +/* E0F17C 802409DC 00000000 */ nop /* E0F180 802409E0 46800021 */ cvt.d.w $f0, $f0 /* E0F184 802409E4 46220003 */ div.d $f0, $f0, $f2 /* E0F188 802409E8 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240AFC_E0F29C.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240AFC_E0F29C.s index 4357967cbb..9e55b7bbf3 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240AFC_E0F29C.s +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240AFC_E0F29C.s @@ -47,20 +47,20 @@ glabel func_80240AFC_E0F29C /* E0F344 80240BA4 8E02001C */ lw $v0, 0x1c($s0) /* E0F348 80240BA8 46001005 */ abs.s $f0, $f2 /* E0F34C 80240BAC 44822000 */ mtc1 $v0, $f4 -/* E0F350 80240BB0 00000000 */ nop +/* E0F350 80240BB0 00000000 */ nop /* E0F354 80240BB4 46802120 */ cvt.s.w $f4, $f4 /* E0F358 80240BB8 4600203C */ c.lt.s $f4, $f0 -/* E0F35C 80240BBC 00000000 */ nop +/* E0F35C 80240BBC 00000000 */ nop /* E0F360 80240BC0 4500000D */ bc1f .L80240BF8 -/* E0F364 80240BC4 00000000 */ nop +/* E0F364 80240BC4 00000000 */ nop /* E0F368 80240BC8 44800000 */ mtc1 $zero, $f0 /* E0F36C 80240BCC C654000C */ lwc1 $f20, 0xc($s2) /* E0F370 80240BD0 4600103C */ c.lt.s $f2, $f0 -/* E0F374 80240BD4 00000000 */ nop +/* E0F374 80240BD4 00000000 */ nop /* E0F378 80240BD8 45000006 */ bc1f .L80240BF4 /* E0F37C 80240BDC 00021023 */ negu $v0, $v0 /* E0F380 80240BE0 44820000 */ mtc1 $v0, $f0 -/* E0F384 80240BE4 00000000 */ nop +/* E0F384 80240BE4 00000000 */ nop /* E0F388 80240BE8 46800020 */ cvt.s.w $f0, $f0 /* E0F38C 80240BEC 080902FE */ j .L80240BF8 /* E0F390 80240BF0 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240C2C_E0F3CC.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240C2C_E0F3CC.s index 7a17d014d0..c6dee59e8c 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240C2C_E0F3CC.s +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240C2C_E0F3CC.s @@ -37,7 +37,7 @@ glabel func_80240C2C_E0F3CC /* E0F44C 80240CAC 2402000F */ addiu $v0, $zero, 0xf /* E0F450 80240CB0 AFA2001C */ sw $v0, 0x1c($sp) /* E0F454 80240CB4 44833000 */ mtc1 $v1, $f6 -/* E0F458 80240CB8 00000000 */ nop +/* E0F458 80240CB8 00000000 */ nop /* E0F45C 80240CBC 468031A0 */ cvt.s.w $f6, $f6 /* E0F460 80240CC0 44073000 */ mfc1 $a3, $f6 /* E0F464 80240CC4 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240DB4_E0F554.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240DB4_E0F554.s index 15343e346b..9f1f4eacd5 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240DB4_E0F554.s +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240DB4_E0F554.s @@ -28,7 +28,7 @@ glabel func_80240DB4_E0F554 /* E0F5AC 80240E0C C4400008 */ lwc1 $f0, 8($v0) /* E0F5B0 80240E10 46800020 */ cvt.s.w $f0, $f0 /* E0F5B4 80240E14 4602003E */ c.le.s $f0, $f2 -/* E0F5B8 80240E18 00000000 */ nop +/* E0F5B8 80240E18 00000000 */ nop /* E0F5BC 80240E1C 45020003 */ bc1fl .L80240E2C /* E0F5C0 80240E20 24840001 */ addiu $a0, $a0, 1 /* E0F5C4 80240E24 0809038F */ j .L80240E3C diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s index 6ca0ae1445..99afc3a1f1 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s @@ -46,7 +46,7 @@ glabel func_80240E74_E0F614 /* E0F6B8 80240F18 8E2200B0 */ lw $v0, 0xb0($s1) /* E0F6BC 80240F1C 30420004 */ andi $v0, $v0, 4 /* E0F6C0 80240F20 10400044 */ beqz $v0, .L80241034 -/* E0F6C4 80240F24 00000000 */ nop +/* E0F6C4 80240F24 00000000 */ nop .L80240F28: /* E0F6C8 80240F28 2404F7FF */ addiu $a0, $zero, -0x801 /* E0F6CC 80240F2C AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80240E74_E0F614 /* E0F780 80240FE0 3C0142C8 */ lui $at, 0x42c8 /* E0F784 80240FE4 44812000 */ mtc1 $at, $f4 /* E0F788 80240FE8 44823000 */ mtc1 $v0, $f6 -/* E0F78C 80240FEC 00000000 */ nop +/* E0F78C 80240FEC 00000000 */ nop /* E0F790 80240FF0 468031A0 */ cvt.s.w $f6, $f6 /* E0F794 80240FF4 27A20044 */ addiu $v0, $sp, 0x44 /* E0F798 80240FF8 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80240E74_E0F614 /* E0F7BC 8024101C 0C0372DF */ jal func_800DCB7C /* E0F7C0 80241020 27A70040 */ addiu $a3, $sp, 0x40 /* E0F7C4 80241024 10400003 */ beqz $v0, .L80241034 -/* E0F7C8 80241028 00000000 */ nop +/* E0F7C8 80241028 00000000 */ nop /* E0F7CC 8024102C C7A0003C */ lwc1 $f0, 0x3c($sp) /* E0F7D0 80241030 E640003C */ swc1 $f0, 0x3c($s2) .L80241034: @@ -124,72 +124,85 @@ glabel func_80240E74_E0F614 /* E0F7D8 80241038 2C620064 */ sltiu $v0, $v1, 0x64 /* E0F7DC 8024103C 10400042 */ beqz $v0, .L80241148 /* E0F7E0 80241040 00031080 */ sll $v0, $v1, 2 -/* E0F7E4 80241044 3C018024 */ lui $at, %hi(D_80243E00) +/* E0F7E4 80241044 3C018024 */ lui $at, %hi(jtbl_80243E00_E125A0) /* E0F7E8 80241048 00220821 */ addu $at, $at, $v0 -/* E0F7EC 8024104C 8C223E00 */ lw $v0, %lo(D_80243E00)($at) +/* E0F7EC 8024104C 8C223E00 */ lw $v0, %lo(jtbl_80243E00_E125A0)($at) /* E0F7F0 80241050 00400008 */ jr $v0 -/* E0F7F4 80241054 00000000 */ nop +/* E0F7F4 80241054 00000000 */ nop +glabel L80241058_E0F7F8 /* E0F7F8 80241058 0280202D */ daddu $a0, $s4, $zero /* E0F7FC 8024105C 0260282D */ daddu $a1, $s3, $zero /* E0F800 80241060 0C0900B8 */ jal func_802402E0_E0EA80 /* E0F804 80241064 02A0302D */ daddu $a2, $s5, $zero +glabel L80241068_E0F808 /* E0F808 80241068 0280202D */ daddu $a0, $s4, $zero /* E0F80C 8024106C 0260282D */ daddu $a1, $s3, $zero /* E0F810 80241070 0C09010E */ jal func_80240438_E0EBD8 /* E0F814 80241074 02A0302D */ daddu $a2, $s5, $zero /* E0F818 80241078 08090452 */ j .L80241148 -/* E0F81C 8024107C 00000000 */ nop +/* E0F81C 8024107C 00000000 */ nop +glabel L80241080_E0F820 /* E0F820 80241080 0280202D */ daddu $a0, $s4, $zero /* E0F824 80241084 0260282D */ daddu $a1, $s3, $zero /* E0F828 80241088 0C0901B8 */ jal mgm_00_UnkNpcAIFunc1 /* E0F82C 8024108C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241090_E0F830 /* E0F830 80241090 0280202D */ daddu $a0, $s4, $zero /* E0F834 80241094 0260282D */ daddu $a1, $s3, $zero /* E0F838 80241098 0C0901E8 */ jal func_802407A0_E0EF40 /* E0F83C 8024109C 02A0302D */ daddu $a2, $s5, $zero /* E0F840 802410A0 08090452 */ j .L80241148 -/* E0F844 802410A4 00000000 */ nop +/* E0F844 802410A4 00000000 */ nop +glabel L802410A8_E0F848 /* E0F848 802410A8 0280202D */ daddu $a0, $s4, $zero /* E0F84C 802410AC 0260282D */ daddu $a1, $s3, $zero /* E0F850 802410B0 0C090257 */ jal func_8024095C_E0F0FC /* E0F854 802410B4 02A0302D */ daddu $a2, $s5, $zero /* E0F858 802410B8 08090452 */ j .L80241148 -/* E0F85C 802410BC 00000000 */ nop +/* E0F85C 802410BC 00000000 */ nop +glabel L802410C0_E0F860 /* E0F860 802410C0 0280202D */ daddu $a0, $s4, $zero /* E0F864 802410C4 0260282D */ daddu $a1, $s3, $zero /* E0F868 802410C8 0C090284 */ jal mgm_00_NpcJumpFunc2 /* E0F86C 802410CC 02A0302D */ daddu $a2, $s5, $zero +glabel L802410D0_E0F870 /* E0F870 802410D0 0280202D */ daddu $a0, $s4, $zero /* E0F874 802410D4 0260282D */ daddu $a1, $s3, $zero /* E0F878 802410D8 0C0902A1 */ jal mgm_00_NpcJumpFunc /* E0F87C 802410DC 02A0302D */ daddu $a2, $s5, $zero /* E0F880 802410E0 08090452 */ j .L80241148 -/* E0F884 802410E4 00000000 */ nop +/* E0F884 802410E4 00000000 */ nop +glabel L802410E8_E0F888 /* E0F888 802410E8 0280202D */ daddu $a0, $s4, $zero /* E0F88C 802410EC 0260282D */ daddu $a1, $s3, $zero /* E0F890 802410F0 0C0902BF */ jal func_80240AFC_E0F29C /* E0F894 802410F4 02A0302D */ daddu $a2, $s5, $zero +glabel L802410F8_E0F898 /* E0F898 802410F8 0280202D */ daddu $a0, $s4, $zero /* E0F89C 802410FC 0260282D */ daddu $a1, $s3, $zero /* E0F8A0 80241100 0C09030B */ jal func_80240C2C_E0F3CC /* E0F8A4 80241104 02A0302D */ daddu $a2, $s5, $zero /* E0F8A8 80241108 08090452 */ j .L80241148 -/* E0F8AC 8024110C 00000000 */ nop +/* E0F8AC 8024110C 00000000 */ nop +glabel L80241110_E0F8B0 /* E0F8B0 80241110 0280202D */ daddu $a0, $s4, $zero /* E0F8B4 80241114 0260282D */ daddu $a1, $s3, $zero /* E0F8B8 80241118 0C090353 */ jal mgm_00_UnkNpcDurationFlagFunc /* E0F8BC 8024111C 02A0302D */ daddu $a2, $s5, $zero /* E0F8C0 80241120 08090452 */ j .L80241148 -/* E0F8C4 80241124 00000000 */ nop +/* E0F8C4 80241124 00000000 */ nop +glabel L80241128_E0F8C8 /* E0F8C8 80241128 0280202D */ daddu $a0, $s4, $zero /* E0F8CC 8024112C 0260282D */ daddu $a1, $s3, $zero /* E0F8D0 80241130 0C09036D */ jal func_80240DB4_E0F554 /* E0F8D4 80241134 02A0302D */ daddu $a2, $s5, $zero /* E0F8D8 80241138 08090452 */ j .L80241148 -/* E0F8DC 8024113C 00000000 */ nop +/* E0F8DC 8024113C 00000000 */ nop +glabel L80241140_E0F8E0 /* E0F8E0 80241140 0C0129CF */ jal func_8004A73C /* E0F8E4 80241144 0280202D */ daddu $a0, $s4, $zero .L80241148: +glabel L80241148_E0F8E8 /* E0F8E8 80241148 8FBF0060 */ lw $ra, 0x60($sp) /* E0F8EC 8024114C 8FB5005C */ lw $s5, 0x5c($sp) /* E0F8F0 80241150 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80241170_E0F910.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80241170_E0F910.s index f2522bb485..eb9e6d8337 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80241170_E0F910.s +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80241170_E0F910.s @@ -11,7 +11,7 @@ glabel func_80241170_E0F910 /* E0F928 80241188 0C039D91 */ jal find_item /* E0F92C 8024118C 2404007C */ addiu $a0, $zero, 0x7c /* E0F930 80241190 04400003 */ bltz $v0, .L802411A0 -/* E0F934 80241194 00000000 */ nop +/* E0F934 80241194 00000000 */ nop /* E0F938 80241198 0809046C */ j .L802411B0 /* E0F93C 8024119C 24100002 */ addiu $s0, $zero, 2 .L802411A0: @@ -31,4 +31,4 @@ glabel func_80241170_E0F910 /* E0F970 802411D0 24020002 */ addiu $v0, $zero, 2 /* E0F974 802411D4 03E00008 */ jr $ra /* E0F978 802411D8 27BD0020 */ addiu $sp, $sp, 0x20 -/* E0F97C 802411DC 00000000 */ nop +/* E0F97C 802411DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_80241540_E0FCE0.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_80241540_E0FCE0.s index 7b6c75f1cc..94b82fffe2 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_80241540_E0FCE0.s +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_80241540_E0FCE0.s @@ -15,11 +15,12 @@ glabel func_80241540_E0FCE0 /* E0FD08 80241568 2C620005 */ sltiu $v0, $v1, 5 /* E0FD0C 8024156C 1040004C */ beqz $v0, .L802416A0 /* E0FD10 80241570 00031080 */ sll $v0, $v1, 2 -/* E0FD14 80241574 3C018024 */ lui $at, %hi(D_80243FA0) +/* E0FD14 80241574 3C018024 */ lui $at, %hi(jtbl_80243FA0_E12740) /* E0FD18 80241578 00220821 */ addu $at, $at, $v0 -/* E0FD1C 8024157C 8C223FA0 */ lw $v0, %lo(D_80243FA0)($at) +/* E0FD1C 8024157C 8C223FA0 */ lw $v0, %lo(jtbl_80243FA0_E12740)($at) /* E0FD20 80241580 00400008 */ jr $v0 -/* E0FD24 80241584 00000000 */ nop +/* E0FD24 80241584 00000000 */ nop +glabel L80241588_E0FD28 /* E0FD28 80241588 2404021C */ addiu $a0, $zero, 0x21c /* E0FD2C 8024158C 0000282D */ daddu $a1, $zero, $zero /* E0FD30 80241590 00A0302D */ daddu $a2, $a1, $zero @@ -27,6 +28,7 @@ glabel func_80241540_E0FCE0 /* E0FD38 80241598 AE000004 */ sw $zero, 4($s0) /* E0FD3C 8024159C 0C015478 */ jal func_800551E0 /* E0FD40 802415A0 AE020000 */ sw $v0, ($s0) +glabel L802415A4_E0FD44 /* E0FD44 802415A4 3C054200 */ lui $a1, 0x4200 /* E0FD48 802415A8 8E020004 */ lw $v0, 4($s0) /* E0FD4C 802415AC 3C06437F */ lui $a2, 0x437f @@ -40,7 +42,7 @@ glabel func_80241540_E0FCE0 /* E0FD6C 802415CC 8E020004 */ lw $v0, 4($s0) /* E0FD70 802415D0 4600008D */ trunc.w.s $f2, $f0 /* E0FD74 802415D4 44031000 */ mfc1 $v1, $f2 -/* E0FD78 802415D8 00000000 */ nop +/* E0FD78 802415D8 00000000 */ nop /* E0FD7C 802415DC AE03000C */ sw $v1, 0xc($s0) /* E0FD80 802415E0 28420005 */ slti $v0, $v0, 5 /* E0FD84 802415E4 1440002E */ bnez $v0, .L802416A0 @@ -51,6 +53,7 @@ glabel func_80241540_E0FCE0 /* E0FD98 802415F8 AE02000C */ sw $v0, 0xc($s0) /* E0FD9C 802415FC 080905A8 */ j .L802416A0 /* E0FDA0 80241600 AE020010 */ sw $v0, 0x10($s0) +glabel L80241604_E0FDA4 /* E0FDA4 80241604 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* E0FDA8 80241608 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) /* E0FDAC 8024160C 240200FF */ addiu $v0, $zero, 0xff @@ -65,7 +68,8 @@ glabel func_80241540_E0FCE0 /* E0FDCC 8024162C 8E030000 */ lw $v1, ($s0) /* E0FDD0 80241630 24020003 */ addiu $v0, $zero, 3 /* E0FDD4 80241634 1462001A */ bne $v1, $v0, .L802416A0 -/* E0FDD8 80241638 00000000 */ nop +/* E0FDD8 80241638 00000000 */ nop +glabel L8024163C_E0FDDC /* E0FDDC 8024163C 240400CA */ addiu $a0, $zero, 0xca /* E0FDE0 80241640 0000282D */ daddu $a1, $zero, $zero /* E0FDE4 80241644 00A0302D */ daddu $a2, $a1, $zero @@ -73,6 +77,7 @@ glabel func_80241540_E0FCE0 /* E0FDEC 8024164C AE000004 */ sw $zero, 4($s0) /* E0FDF0 80241650 0C015478 */ jal func_800551E0 /* E0FDF4 80241654 AE020000 */ sw $v0, ($s0) +glabel L80241658_E0FDF8 /* E0FDF8 80241658 0000202D */ daddu $a0, $zero, $zero /* E0FDFC 8024165C C6000010 */ lwc1 $f0, 0x10($s0) /* E0FE00 80241660 46800020 */ cvt.s.w $f0, $f0 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416F8_E0FE98.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416F8_E0FE98.s index 2e73755b9e..9450d5d87b 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416F8_E0FE98.s +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416F8_E0FE98.s @@ -40,7 +40,7 @@ glabel func_802416F8_E0FE98 /* E0FF20 80241780 0000102D */ daddu $v0, $zero, $zero /* E0FF24 80241784 8E040014 */ lw $a0, 0x14($s0) /* E0FF28 80241788 0C048D70 */ jal func_801235C0 -/* E0FF2C 8024178C 00000000 */ nop +/* E0FF2C 8024178C 00000000 */ nop /* E0FF30 80241790 0C00AB4B */ jal heap_free /* E0FF34 80241794 0200202D */ daddu $a0, $s0, $zero /* E0FF38 80241798 24020001 */ addiu $v0, $zero, 1 @@ -51,6 +51,6 @@ glabel func_802416F8_E0FE98 /* E0FF48 802417A8 8FB00010 */ lw $s0, 0x10($sp) /* E0FF4C 802417AC 03E00008 */ jr $ra /* E0FF50 802417B0 27BD0020 */ addiu $sp, $sp, 0x20 -/* E0FF54 802417B4 00000000 */ nop -/* E0FF58 802417B8 00000000 */ nop -/* E0FF5C 802417BC 00000000 */ nop +/* E0FF54 802417B4 00000000 */ nop +/* E0FF58 802417B8 00000000 */ nop +/* E0FF5C 802417BC 00000000 */ nop 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 b3abb62f26..12c27297e4 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, 0xc2be @@ -27,9 +27,9 @@ glabel func_80240000_E12760 /* E127B4 80240054 D42235B8 */ ldc1 $f2, %lo(func_802435B8_DD0288)($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(func_802435C0_95E7C0)($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(func_802435C8_96C788) /* E12840 802400E0 D42035C8 */ ldc1 $f0, %lo(func_802435C8_96C788)($at) /* E12844 802400E4 4620A502 */ mul.d $f20, $f20, $f0 -/* E12848 802400E8 00000000 */ nop +/* E12848 802400E8 00000000 */ nop /* E1284C 802400EC 3C018024 */ lui $at, %hi(func_802435D0_CC6DE0) /* E12850 802400F0 D42035D0 */ ldc1 $f0, %lo(func_802435D0_CC6DE0)($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(func_802435D8_C43388)($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/area_mgm/mgm_01/E12930/func_802403FC_E12B5C.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802403FC_E12B5C.s index 4dc0143567..f61a02317a 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802403FC_E12B5C.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802403FC_E12B5C.s @@ -12,7 +12,7 @@ glabel func_802403FC_E12B5C /* E12B78 80240418 0C03A625 */ jal func_800E9894 /* E12B7C 8024041C AC430000 */ sw $v1, ($v0) /* E12B80 80240420 0C03A5EE */ jal func_800E97B8 -/* E12B84 80240424 00000000 */ nop +/* E12B84 80240424 00000000 */ nop /* E12B88 80240428 8FBF0010 */ lw $ra, 0x10($sp) /* E12B8C 8024042C 24020002 */ addiu $v0, $zero, 2 /* E12B90 80240430 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024058C_E12CEC.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024058C_E12CEC.s index 12dd2c760a..dac17054c2 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024058C_E12CEC.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024058C_E12CEC.s @@ -27,7 +27,7 @@ glabel func_8024058C_E12CEC /* E12D44 802405E4 00431021 */ addu $v0, $v0, $v1 /* E12D48 802405E8 80421AC8 */ lb $v0, %lo(func_80241AC8_D2D7F8)($v0) /* E12D4C 802405EC 44820000 */ mtc1 $v0, $f0 -/* E12D50 802405F0 00000000 */ nop +/* E12D50 802405F0 00000000 */ nop /* E12D54 802405F4 46800020 */ cvt.s.w $f0, $f0 /* E12D58 802405F8 E6000094 */ swc1 $f0, 0x94($s0) /* E12D5C 802405FC 3C028024 */ lui $v0, %hi(func_80241AD4_B4C544) @@ -37,7 +37,7 @@ glabel func_8024058C_E12CEC /* E12D6C 8024060C 44811800 */ mtc1 $at, $f3 /* E12D70 80240610 44801000 */ mtc1 $zero, $f2 /* E12D74 80240614 44820000 */ mtc1 $v0, $f0 -/* E12D78 80240618 00000000 */ nop +/* E12D78 80240618 00000000 */ nop /* E12D7C 8024061C 46800021 */ cvt.d.w $f0, $f0 /* E12D80 80240620 46220000 */ add.d $f0, $f0, $f2 /* E12D84 80240624 3C014000 */ lui $at, 0x4000 @@ -61,7 +61,7 @@ glabel func_8024058C_E12CEC /* E12DCC 8024066C E60000C8 */ swc1 $f0, 0xc8($s0) /* E12DD0 80240670 46002006 */ mov.s $f0, $f4 /* E12DD4 80240674 44831000 */ mtc1 $v1, $f2 -/* E12DD8 80240678 00000000 */ nop +/* E12DD8 80240678 00000000 */ nop /* E12DDC 8024067C 468010A0 */ cvt.s.w $f2, $f2 /* E12DE0 80240680 E602009C */ swc1 $f2, 0x9c($s0) /* E12DE4 80240684 46001186 */ mov.s $f6, $f2 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802406C4_E12E24.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802406C4_E12E24.s index 2979b8c327..8f3512a34c 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802406C4_E12E24.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802406C4_E12E24.s @@ -69,7 +69,7 @@ glabel func_802406C4_E12E24 /* E12F20 802407C0 0000302D */ daddu $a2, $zero, $zero .L802407C4: /* E12F24 802407C4 0C0B2026 */ jal set_variable -/* E12F28 802407C8 00000000 */ nop +/* E12F28 802407C8 00000000 */ nop /* E12F2C 802407CC 8FBF0020 */ lw $ra, 0x20($sp) /* E12F30 802407D0 8FB1001C */ lw $s1, 0x1c($sp) /* E12F34 802407D4 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024084C_E12FAC.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024084C_E12FAC.s index f90434d41d..95d8b0fefe 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024084C_E12FAC.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024084C_E12FAC.s @@ -37,7 +37,7 @@ glabel func_8024084C_E12FAC /* E13028 802408C8 0000302D */ daddu $a2, $zero, $zero .L802408CC: /* E1302C 802408CC 0C0B2026 */ jal set_variable -/* E13030 802408D0 00000000 */ nop +/* E13030 802408D0 00000000 */ nop /* E13034 802408D4 8FBF0018 */ lw $ra, 0x18($sp) /* E13038 802408D8 8FB10014 */ lw $s1, 0x14($sp) /* E1303C 802408DC 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802408EC_E1304C.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802408EC_E1304C.s index be343765ec..9d8cbed080 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802408EC_E1304C.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802408EC_E1304C.s @@ -93,9 +93,9 @@ glabel func_802408EC_E1304C /* E131A4 80240A44 3C013FC0 */ lui $at, 0x3fc0 /* E131A8 80240A48 44811800 */ mtc1 $at, $f3 /* E131AC 80240A4C 44801000 */ mtc1 $zero, $f2 -/* E131B0 80240A50 00000000 */ nop +/* E131B0 80240A50 00000000 */ nop /* E131B4 80240A54 46220002 */ mul.d $f0, $f0, $f2 -/* E131B8 80240A58 00000000 */ nop +/* E131B8 80240A58 00000000 */ nop /* E131BC 80240A5C 3C013FE0 */ lui $at, 0x3fe0 /* E131C0 80240A60 44811800 */ mtc1 $at, $f3 /* E131C4 80240A64 44801000 */ mtc1 $zero, $f2 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240AAC_E1320C.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240AAC_E1320C.s index 5e92276f86..aba14e3b66 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240AAC_E1320C.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240AAC_E1320C.s @@ -79,7 +79,7 @@ glabel func_80240AAC_E1320C /* E13330 80240BD0 0000302D */ daddu $a2, $zero, $zero .L80240BD4: /* E13334 80240BD4 0C0B2026 */ jal set_variable -/* E13338 80240BD8 00000000 */ nop +/* E13338 80240BD8 00000000 */ nop /* E1333C 80240BDC 8FBF0020 */ lw $ra, 0x20($sp) /* E13340 80240BE0 8FB1001C */ lw $s1, 0x1c($sp) /* E13344 80240BE4 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240C54_E133B4.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240C54_E133B4.s index c394ad9a0c..522094cf4e 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240C54_E133B4.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240C54_E133B4.s @@ -24,7 +24,7 @@ glabel func_80240C54_E133B4 /* E133FC 80240C9C 8C83000C */ lw $v1, 0xc($a0) /* E13400 80240CA0 0043102A */ slt $v0, $v0, $v1 /* E13404 80240CA4 10400003 */ beqz $v0, .L80240CB4 -/* E13408 80240CA8 00000000 */ nop +/* E13408 80240CA8 00000000 */ nop /* E1340C 80240CAC 9482000E */ lhu $v0, 0xe($a0) /* E13410 80240CB0 A4E20334 */ sh $v0, 0x334($a3) .L80240CB4: diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240F90_E136F0.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240F90_E136F0.s index f5b0c944b4..ee9b5c975f 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240F90_E136F0.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240F90_E136F0.s @@ -29,17 +29,17 @@ glabel func_80240F90_E136F0 /* E1374C 80240FEC 80620000 */ lb $v0, ($v1) /* E13750 80240FF0 80830000 */ lb $v1, ($a0) /* E13754 80240FF4 44850000 */ mtc1 $a1, $f0 -/* E13758 80240FF8 00000000 */ nop +/* E13758 80240FF8 00000000 */ nop /* E1375C 80240FFC 46800020 */ cvt.s.w $f0, $f0 /* E13760 80241000 2442000D */ addiu $v0, $v0, 0xd /* E13764 80241004 44050000 */ mfc1 $a1, $f0 /* E13768 80241008 44820000 */ mtc1 $v0, $f0 -/* E1376C 8024100C 00000000 */ nop +/* E1376C 8024100C 00000000 */ nop /* E13770 80241010 46800020 */ cvt.s.w $f0, $f0 /* E13774 80241014 24630005 */ addiu $v1, $v1, 5 /* E13778 80241018 44060000 */ mfc1 $a2, $f0 /* E1377C 8024101C 44830000 */ mtc1 $v1, $f0 -/* E13780 80241020 00000000 */ nop +/* E13780 80241020 00000000 */ nop /* E13784 80241024 46800020 */ cvt.s.w $f0, $f0 /* E13788 80241028 44070000 */ mfc1 $a3, $f0 /* E1378C 8024102C 24040001 */ addiu $a0, $zero, 1 @@ -48,7 +48,7 @@ glabel func_80240F90_E136F0 /* E13798 80241038 AFA00014 */ sw $zero, 0x14($sp) /* E1379C 8024103C 8E240088 */ lw $a0, 0x88($s1) /* E137A0 80241040 0C0441B4 */ jal delete_entity -/* E137A4 80241044 00000000 */ nop +/* E137A4 80241044 00000000 */ nop .L80241048: /* E137A8 80241048 26100001 */ addiu $s0, $s0, 1 /* E137AC 8024104C 2A02000B */ slti $v0, $s0, 0xb diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241090_E137F0.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241090_E137F0.s index 0de47dc5f0..3fc89ab290 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241090_E137F0.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241090_E137F0.s @@ -60,7 +60,7 @@ glabel func_80241090_E137F0 /* E138C4 80241164 10660007 */ beq $v1, $a2, .L80241184 /* E138C8 80241168 00041080 */ sll $v0, $a0, 2 /* E138CC 8024116C 107E0007 */ beq $v1, $fp, .L8024118C -/* E138D0 80241170 00000000 */ nop +/* E138D0 80241170 00000000 */ nop /* E138D4 80241174 08090467 */ j .L8024119C /* E138D8 80241178 26310004 */ addiu $s1, $s1, 4 .L8024117C: @@ -79,7 +79,7 @@ glabel func_80241090_E137F0 /* E138FC 8024119C 26100001 */ addiu $s0, $s0, 1 /* E13900 802411A0 0217102A */ slt $v0, $s0, $s7 /* E13904 802411A4 1440FFE5 */ bnez $v0, .L8024113C -/* E13908 802411A8 00000000 */ nop +/* E13908 802411A8 00000000 */ nop .L802411AC: /* E1390C 802411AC AE440010 */ sw $a0, 0x10($s2) /* E13910 802411B0 0000802D */ daddu $s0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s index 1fdfe27821..0a92da6e0e 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s @@ -106,7 +106,7 @@ glabel func_80241234_E13994 .L802413B8: /* E13B18 802413B8 2A2203E8 */ slti $v0, $s1, 0x3e8 /* E13B1C 802413BC 1440FFDC */ bnez $v0, .L80241330 -/* E13B20 802413C0 00000000 */ nop +/* E13B20 802413C0 00000000 */ nop /* E13B24 802413C4 AEA00070 */ sw $zero, 0x70($s5) /* E13B28 802413C8 AEA00074 */ sw $zero, 0x74($s5) .L802413CC: @@ -155,17 +155,17 @@ glabel func_80241234_E13994 /* E13BD4 80241474 82420000 */ lb $v0, ($s2) /* E13BD8 80241478 82230000 */ lb $v1, ($s1) /* E13BDC 8024147C 44851000 */ mtc1 $a1, $f2 -/* E13BE0 80241480 00000000 */ nop +/* E13BE0 80241480 00000000 */ nop /* E13BE4 80241484 468010A0 */ cvt.s.w $f2, $f2 /* E13BE8 80241488 2442000D */ addiu $v0, $v0, 0xd /* E13BEC 8024148C 44051000 */ mfc1 $a1, $f2 /* E13BF0 80241490 44821000 */ mtc1 $v0, $f2 -/* E13BF4 80241494 00000000 */ nop +/* E13BF4 80241494 00000000 */ nop /* E13BF8 80241498 468010A0 */ cvt.s.w $f2, $f2 /* E13BFC 8024149C 24630005 */ addiu $v1, $v1, 5 /* E13C00 802414A0 44061000 */ mfc1 $a2, $f2 /* E13C04 802414A4 44831000 */ mtc1 $v1, $f2 -/* E13C08 802414A8 00000000 */ nop +/* E13C08 802414A8 00000000 */ nop /* E13C0C 802414AC 468010A0 */ cvt.s.w $f2, $f2 /* E13C10 802414B0 44071000 */ mfc1 $a3, $f2 /* E13C14 802414B4 24040003 */ addiu $a0, $zero, 3 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802415EC_E13D4C.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802415EC_E13D4C.s index 6f40c632fb..41eae4139d 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802415EC_E13D4C.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802415EC_E13D4C.s @@ -36,7 +36,7 @@ glabel func_802415EC_E13D4C /* E13DC8 80241668 0C03A625 */ jal func_800E9894 /* E13DCC 8024166C AE020018 */ sw $v0, 0x18($s0) /* E13DD0 80241670 0C03A5EE */ jal func_800E97B8 -/* E13DD4 80241674 00000000 */ nop +/* E13DD4 80241674 00000000 */ nop /* E13DD8 80241678 8FBF0018 */ lw $ra, 0x18($sp) /* E13DDC 8024167C 8FB10014 */ lw $s1, 0x14($sp) /* E13DE0 80241680 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416F8_E13E58.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416F8_E13E58.s index e02f6ee2e8..e9283567ca 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416F8_E13E58.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416F8_E13E58.s @@ -18,7 +18,7 @@ glabel func_802416F8_E13E58 /* E13E8C 8024172C 2484C290 */ addiu $a0, $a0, %lo(D_8014C290) /* E13E90 80241730 24020001 */ addiu $v0, $zero, 1 /* E13E94 80241734 16020003 */ bne $s0, $v0, .L80241744 -/* E13E98 80241738 00000000 */ nop +/* E13E98 80241738 00000000 */ nop /* E13E9C 8024173C 3C048015 */ lui $a0, %hi(D_8014C294) /* E13EA0 80241740 2484C294 */ addiu $a0, $a0, %lo(D_8014C294) .L80241744: diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241760_E13EC0.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241760_E13EC0.s index 431a5dbe42..4623cc0229 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241760_E13EC0.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241760_E13EC0.s @@ -5,7 +5,7 @@ glabel func_80241760_E13EC0 /* E13EC0 80241760 27BDFFE8 */ addiu $sp, $sp, -0x18 /* E13EC4 80241764 AFBF0010 */ sw $ra, 0x10($sp) /* E13EC8 80241768 0C03A5B2 */ jal func_800E96C8 -/* E13ECC 8024176C 00000000 */ nop +/* E13ECC 8024176C 00000000 */ nop /* E13ED0 80241770 8FBF0010 */ lw $ra, 0x10($sp) /* E13ED4 80241774 24020002 */ addiu $v0, $zero, 2 /* E13ED8 80241778 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241780_E13EE0.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241780_E13EE0.s index e1834ded70..6f056f6563 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241780_E13EE0.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241780_E13EE0.s @@ -7,10 +7,10 @@ glabel func_80241780_E13EE0 /* E13EE8 80241788 24843560 */ addiu $a0, $a0, %lo(D_80243560) /* E13EEC 8024178C AFBF0010 */ sw $ra, 0x10($sp) /* E13EF0 80241790 0C0496CB */ jal set_message_images -/* E13EF4 80241794 00000000 */ nop +/* E13EF4 80241794 00000000 */ nop /* E13EF8 80241798 8FBF0010 */ lw $ra, 0x10($sp) /* E13EFC 8024179C 24020002 */ addiu $v0, $zero, 2 /* E13F00 802417A0 03E00008 */ jr $ra /* E13F04 802417A4 27BD0018 */ addiu $sp, $sp, 0x18 -/* E13F08 802417A8 00000000 */ nop -/* E13F0C 802417AC 00000000 */ nop +/* E13F08 802417A8 00000000 */ nop +/* E13F0C 802417AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240000_E15D80.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240000_E15D80.s index b5bc4bda2f..2a7971b28b 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240000_E15D80.s +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240000_E15D80.s @@ -45,7 +45,7 @@ glabel func_80240000_E15D80 /* E15E20 802400A0 D42484E0 */ ldc1 $f4, %lo(D_802484E0)($at) /* E15E24 802400A4 46220003 */ div.d $f0, $f0, $f2 /* E15E28 802400A8 46240002 */ mul.d $f0, $f0, $f4 -/* E15E2C 802400AC 00000000 */ nop +/* E15E2C 802400AC 00000000 */ nop /* E15E30 802400B0 240200E4 */ addiu $v0, $zero, 0xe4 /* E15E34 802400B4 AFA20014 */ sw $v0, 0x14($sp) /* E15E38 802400B8 24020086 */ addiu $v0, $zero, 0x86 @@ -55,7 +55,7 @@ glabel func_80240000_E15D80 /* E15E48 802400C8 AFA2001C */ sw $v0, 0x1c($sp) /* E15E4C 802400CC 4620018D */ trunc.w.d $f6, $f0 /* E15E50 802400D0 44063000 */ mfc1 $a2, $f6 -/* E15E54 802400D4 00000000 */ nop +/* E15E54 802400D4 00000000 */ nop /* E15E58 802400D8 00C43021 */ addu $a2, $a2, $a0 /* E15E5C 802400DC 00063400 */ sll $a2, $a2, 0x10 /* E15E60 802400E0 0C00AAB1 */ jal func_8002AAC4 @@ -65,7 +65,7 @@ glabel func_80240000_E15D80 /* E15E6C 802400EC 10400003 */ beqz $v0, .L802400FC /* E15E70 802400F0 28420004 */ slti $v0, $v0, 4 /* E15E74 802400F4 1440000B */ bnez $v0, .L80240124 -/* E15E78 802400F8 00000000 */ nop +/* E15E78 802400F8 00000000 */ nop .L802400FC: /* E15E7C 802400FC 8E430014 */ lw $v1, 0x14($s2) /* E15E80 80240100 2862FFB1 */ slti $v0, $v1, -0x4f @@ -90,7 +90,7 @@ glabel func_80240000_E15D80 .L80240148: /* E15EC8 80240148 8E220078 */ lw $v0, 0x78($s1) /* E15ECC 8024014C 1440000B */ bnez $v0, .L8024017C -/* E15ED0 80240150 00000000 */ nop +/* E15ED0 80240150 00000000 */ nop /* E15ED4 80240154 8E430018 */ lw $v1, 0x18($s2) /* E15ED8 80240158 28620140 */ slti $v0, $v1, 0x140 /* E15EDC 8024015C 10400011 */ beqz $v0, .L802401A4 @@ -223,11 +223,11 @@ glabel func_80240000_E15D80 /* E160C4 80240344 00021040 */ sll $v0, $v0, 1 /* E160C8 80240348 00C21023 */ subu $v0, $a2, $v0 /* E160CC 8024034C 44820000 */ mtc1 $v0, $f0 -/* E160D0 80240350 00000000 */ nop +/* E160D0 80240350 00000000 */ nop /* E160D4 80240354 46800020 */ cvt.s.w $f0, $f0 /* E160D8 80240358 46000021 */ cvt.d.s $f0, $f0 /* E160DC 8024035C 46220002 */ mul.d $f0, $f0, $f2 -/* E160E0 80240360 00000000 */ nop +/* E160E0 80240360 00000000 */ nop /* E160E4 80240364 AFA0003C */ sw $zero, 0x3c($sp) /* E160E8 80240368 AFA00040 */ sw $zero, 0x40($sp) /* E160EC 8024036C AFB60044 */ sw $s6, 0x44($sp) diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240468_E161E8.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240468_E161E8.s index 08d11e482d..c839df296c 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240468_E161E8.s +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240468_E161E8.s @@ -12,7 +12,7 @@ glabel func_80240468_E161E8 /* E16204 80240484 AFB10014 */ sw $s1, 0x14($sp) /* E16208 80240488 8C52006C */ lw $s2, 0x6c($v0) /* E1620C 8024048C 12000026 */ beqz $s0, .L80240528 -/* E16210 80240490 00000000 */ nop +/* E16210 80240490 00000000 */ nop /* E16214 80240494 3C058024 */ lui $a1, %hi(func_80240430_E161B0) /* E16218 80240498 24A50430 */ addiu $a1, $a1, %lo(func_80240430_E161B0) /* E1621C 8024049C 0C048C56 */ jal bind_dynamic_entity_3 @@ -41,7 +41,7 @@ glabel func_80240468_E161E8 /* E16278 802404F8 3C048011 */ lui $a0, %hi(D_80108AFC) /* E1627C 802404FC 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) /* E16280 80240500 0C050529 */ jal create_icon -/* E16284 80240504 00000000 */ nop +/* E16284 80240504 00000000 */ nop /* E16288 80240508 0040802D */ daddu $s0, $v0, $zero /* E1628C 8024050C 0200202D */ daddu $a0, $s0, $zero /* E16290 80240510 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240544_E162C4.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240544_E162C4.s index 88d93e4035..b99004c668 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240544_E162C4.s +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240544_E162C4.s @@ -12,7 +12,7 @@ glabel func_80240544_E162C4 /* E162E0 80240560 0C03A625 */ jal func_800E9894 /* E162E4 80240564 AC430000 */ sw $v1, ($v0) /* E162E8 80240568 0C03A5EE */ jal func_800E97B8 -/* E162EC 8024056C 00000000 */ nop +/* E162EC 8024056C 00000000 */ nop /* E162F0 80240570 8FBF0010 */ lw $ra, 0x10($sp) /* E162F4 80240574 24020002 */ addiu $v0, $zero, 2 /* E162F8 80240578 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802405D0_E16350.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802405D0_E16350.s index 2516aef1f1..43d52625da 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802405D0_E16350.s +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802405D0_E16350.s @@ -23,8 +23,8 @@ glabel func_802405D0_E16350 /* E16398 80240618 0040202D */ daddu $a0, $v0, $zero /* E1639C 8024061C 0C04417A */ jal get_entity_by_index /* E163A0 80240620 AE04001C */ sw $a0, 0x1c($s0) -/* E163A4 80240624 3C038024 */ lui $v1, %hi(func_80242A3C_8EE85C) -/* E163A8 80240628 24632A3C */ addiu $v1, $v1, %lo(func_80242A3C_8EE85C) +/* E163A4 80240624 3C038024 */ lui $v1, %hi(D_80242A3C_8EE85C) +/* E163A8 80240628 24632A3C */ addiu $v1, $v1, %lo(D_80242A3C_8EE85C) /* E163AC 8024062C AC430028 */ sw $v1, 0x28($v0) /* E163B0 80240630 8FBF002C */ lw $ra, 0x2c($sp) /* E163B4 80240634 8FB00028 */ lw $s0, 0x28($sp) diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240644_E163C4.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240644_E163C4.s index 2d28fcb059..7a80d669ba 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240644_E163C4.s +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240644_E163C4.s @@ -49,14 +49,14 @@ glabel func_80240644_E163C4 /* E1646C 802406EC 10600009 */ beqz $v1, .L80240714 /* E16470 802406F0 0240202D */ daddu $a0, $s2, $zero /* E16474 802406F4 080901DD */ j .L80240774 -/* E16478 802406F8 00000000 */ nop +/* E16478 802406F8 00000000 */ nop .L802406FC: /* E1647C 802406FC 10620018 */ beq $v1, $v0, .L80240760 /* E16480 80240700 24020003 */ addiu $v0, $zero, 3 /* E16484 80240704 10620010 */ beq $v1, $v0, .L80240748 /* E16488 80240708 0240202D */ daddu $a0, $s2, $zero /* E1648C 8024070C 080901DD */ j .L80240774 -/* E16490 80240710 00000000 */ nop +/* E16490 80240710 00000000 */ nop .L80240714: /* E16494 80240714 3C05FE36 */ lui $a1, 0xfe36 /* E16498 80240718 8E060040 */ lw $a2, 0x40($s0) diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240790_E16510.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240790_E16510.s index cd5f9028b1..e7eede7235 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240790_E16510.s +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240790_E16510.s @@ -95,10 +95,10 @@ glabel func_80240790_E16510 /* E1666C 802408EC 1440FFDA */ bnez $v0, .L80240858 /* E16670 802408F0 2407FFFF */ addiu $a3, $zero, -1 /* E16674 802408F4 0000802D */ daddu $s0, $zero, $zero -/* E16678 802408F8 3C068024 */ lui $a2, %hi(func_8024296C_C8841C) -/* E1667C 802408FC 24C6296C */ addiu $a2, $a2, %lo(func_8024296C_C8841C) -/* E16680 80240900 3C058024 */ lui $a1, %hi(D_802428E0) -/* E16684 80240904 24A528E0 */ addiu $a1, $a1, %lo(D_802428E0) +/* E16678 802408F8 3C068024 */ lui $a2, %hi(D_8024296C_C8841C) +/* E1667C 802408FC 24C6296C */ addiu $a2, $a2, %lo(D_8024296C_C8841C) +/* E16680 80240900 3C058024 */ lui $a1, %hi(D_802428E0_DF1780) +/* E16684 80240904 24A528E0 */ addiu $a1, $a1, %lo(D_802428E0_DF1780) /* E16688 80240908 27A40010 */ addiu $a0, $sp, 0x10 /* E1668C 8024090C 02A0182D */ daddu $v1, $s5, $zero .L80240910: diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s index 41591eaf44..23ad0ecdbb 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s @@ -47,7 +47,7 @@ glabel func_80240BB0_E16930 /* E169D4 80240C54 108203B2 */ beq $a0, $v0, .L80241B20 /* E169D8 80240C58 24020032 */ addiu $v0, $zero, 0x32 /* E169DC 80240C5C 0C00FB3A */ jal get_enemy -/* E169E0 80240C60 00000000 */ nop +/* E169E0 80240C60 00000000 */ nop /* E169E4 80240C64 84440008 */ lh $a0, 8($v0) /* E169E8 80240C68 0C00EABB */ jal get_npc_unsafe /* E169EC 80240C6C 0040802D */ daddu $s0, $v0, $zero @@ -57,11 +57,12 @@ glabel func_80240BB0_E16930 /* E169FC 80240C7C 2C620042 */ sltiu $v0, $v1, 0x42 /* E16A00 80240C80 104003AD */ beqz $v0, .L80241B38 /* E16A04 80240C84 00031080 */ sll $v0, $v1, 2 -/* E16A08 80240C88 3C018025 */ lui $at, %hi(D_802484E8) +/* E16A08 80240C88 3C018025 */ lui $at, %hi(jtbl_802484E8_E1E268) /* E16A0C 80240C8C 00220821 */ addu $at, $at, $v0 -/* E16A10 80240C90 8C2284E8 */ lw $v0, %lo(D_802484E8)($at) +/* E16A10 80240C90 8C2284E8 */ lw $v0, %lo(jtbl_802484E8_E1E268)($at) /* E16A14 80240C94 00400008 */ jr $v0 -/* E16A18 80240C98 00000000 */ nop +/* E16A18 80240C98 00000000 */ nop +glabel L80240C9C_E16A1C /* E16A1C 80240C9C 240400D2 */ addiu $a0, $zero, 0xd2 /* E16A20 80240CA0 2402000B */ addiu $v0, $zero, 0xb /* E16A24 80240CA4 0C00A67F */ jal rand_int @@ -74,6 +75,7 @@ glabel func_80240BB0_E16930 /* E16A40 80240CC0 00431024 */ and $v0, $v0, $v1 /* E16A44 80240CC4 0C00EAFF */ jal disable_npc_shadow /* E16A48 80240CC8 AE620000 */ sw $v0, ($s3) +glabel L80240CCC_E16A4C /* E16A4C 80240CCC 8E820030 */ lw $v0, 0x30($s4) /* E16A50 80240CD0 2442FFFF */ addiu $v0, $v0, -1 /* E16A54 80240CD4 1C400398 */ bgtz $v0, .L80241B38 @@ -121,6 +123,7 @@ glabel func_80240BB0_E16930 /* E16AFC 80240D7C 46200020 */ cvt.s.d $f0, $f0 /* E16B00 80240D80 080906CD */ j .L80241B34 /* E16B04 80240D84 E6600040 */ swc1 $f0, 0x40($s3) +glabel L80240D88_E16B08 /* E16B08 80240D88 8E820030 */ lw $v0, 0x30($s4) /* E16B0C 80240D8C 24420001 */ addiu $v0, $v0, 1 /* E16B10 80240D90 AE820030 */ sw $v0, 0x30($s4) @@ -137,13 +140,13 @@ glabel func_80240BB0_E16930 /* E16B3C 80240DBC E664003C */ swc1 $f4, 0x3c($s3) /* E16B40 80240DC0 46002086 */ mov.s $f2, $f4 /* E16B44 80240DC4 4602003C */ c.lt.s $f0, $f2 -/* E16B48 80240DC8 00000000 */ nop +/* E16B48 80240DC8 00000000 */ nop /* E16B4C 80240DCC 45000005 */ bc1f .L80240DE4 /* E16B50 80240DD0 E666001C */ swc1 $f6, 0x1c($s3) /* E16B54 80240DD4 0C00EAE8 */ jal enable_npc_shadow /* E16B58 80240DD8 0260202D */ daddu $a0, $s3, $zero /* E16B5C 80240DDC 0809037B */ j .L80240DEC -/* E16B60 80240DE0 00000000 */ nop +/* E16B60 80240DE0 00000000 */ nop .L80240DE4: /* E16B64 80240DE4 0C00EAFF */ jal disable_npc_shadow /* E16B68 80240DE8 0260202D */ daddu $a0, $s3, $zero @@ -153,13 +156,13 @@ glabel func_80240BB0_E16930 /* E16B74 80240DF4 44801800 */ mtc1 $zero, $f3 /* E16B78 80240DF8 46000021 */ cvt.d.s $f0, $f0 /* E16B7C 80240DFC 4622003C */ c.lt.d $f0, $f2 -/* E16B80 80240E00 00000000 */ nop +/* E16B80 80240E00 00000000 */ nop /* E16B84 80240E04 4502034D */ bc1fl .L80241B3C /* E16B88 80240E08 2694001C */ addiu $s4, $s4, 0x1c /* E16B8C 80240E0C C662003C */ lwc1 $f2, 0x3c($s3) /* E16B90 80240E10 C6600064 */ lwc1 $f0, 0x64($s3) /* E16B94 80240E14 4600103E */ c.le.s $f2, $f0 -/* E16B98 80240E18 00000000 */ nop +/* E16B98 80240E18 00000000 */ nop /* E16B9C 80240E1C 45000346 */ bc1f .L80241B38 /* E16BA0 80240E20 2404014A */ addiu $a0, $zero, 0x14a /* E16BA4 80240E24 2402000B */ addiu $v0, $zero, 0xb @@ -172,16 +175,17 @@ glabel func_80240BB0_E16930 /* E16BC0 80240E40 E67A003C */ swc1 $f26, 0x3c($s3) /* E16BC4 80240E44 28420032 */ slti $v0, $v0, 0x32 /* E16BC8 80240E48 104001B0 */ beqz $v0, .L8024150C -/* E16BCC 80240E4C 00000000 */ nop +/* E16BCC 80240E4C 00000000 */ nop /* E16BD0 80240E50 3C014387 */ lui $at, 0x4387 /* E16BD4 80240E54 44810000 */ mtc1 $at, $f0 /* E16BD8 80240E58 08090547 */ j .L8024151C /* E16BDC 80240E5C E660000C */ swc1 $f0, 0xc($s3) +glabel L80240E60_E16BE0 /* E16BE0 80240E60 8EA4000C */ lw $a0, 0xc($s5) /* E16BE4 80240E64 3C058011 */ lui $a1, %hi(D_80108B28) /* E16BE8 80240E68 24A58B28 */ addiu $a1, $a1, %lo(D_80108B28) /* E16BEC 80240E6C 0C0511FF */ jal set_menu_icon_script -/* E16BF0 80240E70 00000000 */ nop +/* E16BF0 80240E70 00000000 */ nop /* E16BF4 80240E74 8EA4000C */ lw $a0, 0xc($s5) /* E16BF8 80240E78 0C0513AC */ jal icon_set_opacity /* E16BFC 80240E7C 240500A0 */ addiu $a1, $zero, 0xa0 @@ -251,7 +255,7 @@ glabel func_80240BB0_E16930 /* E16CFC 80240F7C 2402000A */ addiu $v0, $zero, 0xa /* E16D00 80240F80 AFA2001C */ sw $v0, 0x1c($sp) /* E16D04 80240F84 44834000 */ mtc1 $v1, $f8 -/* E16D08 80240F88 00000000 */ nop +/* E16D08 80240F88 00000000 */ nop /* E16D0C 80240F8C 46804220 */ cvt.s.w $f8, $f8 /* E16D10 80240F90 44074000 */ mfc1 $a3, $f8 /* E16D14 80240F94 27A20080 */ addiu $v0, $sp, 0x80 @@ -262,24 +266,24 @@ glabel func_80240BB0_E16930 /* E16D28 80240FA8 E7A00010 */ swc1 $f0, 0x10($sp) /* E16D2C 80240FAC C6600038 */ lwc1 $f0, 0x38($s3) /* E16D30 80240FB0 46160002 */ mul.s $f0, $f0, $f22 -/* E16D34 80240FB4 00000000 */ nop +/* E16D34 80240FB4 00000000 */ nop /* E16D38 80240FB8 4600020D */ trunc.w.s $f8, $f0 /* E16D3C 80240FBC E6080070 */ swc1 $f8, 0x70($s0) /* E16D40 80240FC0 C660003C */ lwc1 $f0, 0x3c($s3) /* E16D44 80240FC4 46160002 */ mul.s $f0, $f0, $f22 -/* E16D48 80240FC8 00000000 */ nop +/* E16D48 80240FC8 00000000 */ nop /* E16D4C 80240FCC 4600020D */ trunc.w.s $f8, $f0 /* E16D50 80240FD0 E6080074 */ swc1 $f8, 0x74($s0) /* E16D54 80240FD4 C6600040 */ lwc1 $f0, 0x40($s3) /* E16D58 80240FD8 46160002 */ mul.s $f0, $f0, $f22 -/* E16D5C 80240FDC 00000000 */ nop +/* E16D5C 80240FDC 00000000 */ nop /* E16D60 80240FE0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* E16D64 80240FE4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* E16D68 80240FE8 4600020D */ trunc.w.s $f8, $f0 /* E16D6C 80240FEC E6080078 */ swc1 $f8, 0x78($s0) /* E16D70 80240FF0 C4400028 */ lwc1 $f0, 0x28($v0) /* E16D74 80240FF4 46160002 */ mul.s $f0, $f0, $f22 -/* E16D78 80240FF8 00000000 */ nop +/* E16D78 80240FF8 00000000 */ nop /* E16D7C 80240FFC 3C0141E0 */ lui $at, 0x41e0 /* E16D80 80241000 44811000 */ mtc1 $at, $f2 /* E16D84 80241004 4600020D */ trunc.w.s $f8, $f0 @@ -287,18 +291,19 @@ glabel func_80240BB0_E16930 /* E16D8C 8024100C C440002C */ lwc1 $f0, 0x2c($v0) /* E16D90 80241010 46020000 */ add.s $f0, $f0, $f2 /* E16D94 80241014 46160002 */ mul.s $f0, $f0, $f22 -/* E16D98 80241018 00000000 */ nop +/* E16D98 80241018 00000000 */ nop /* E16D9C 8024101C 4600020D */ trunc.w.s $f8, $f0 /* E16DA0 80241020 E6080080 */ swc1 $f8, 0x80($s0) /* E16DA4 80241024 C4400030 */ lwc1 $f0, 0x30($v0) /* E16DA8 80241028 461E0000 */ add.s $f0, $f0, $f30 /* E16DAC 8024102C 46160002 */ mul.s $f0, $f0, $f22 -/* E16DB0 80241030 00000000 */ nop +/* E16DB0 80241030 00000000 */ nop /* E16DB4 80241034 AE000088 */ sw $zero, 0x88($s0) /* E16DB8 80241038 4600020D */ trunc.w.s $f8, $f0 /* E16DBC 8024103C E6080084 */ swc1 $f8, 0x84($s0) /* E16DC0 80241040 080906CF */ j .L80241B3C /* E16DC4 80241044 2694001C */ addiu $s4, $s4, 0x1c +glabel L80241048_E16DC8 /* E16DC8 80241048 C6000070 */ lwc1 $f0, 0x70($s0) /* E16DCC 8024104C 46800020 */ cvt.s.w $f0, $f0 /* E16DD0 80241050 46000021 */ cvt.d.s $f0, $f0 @@ -393,7 +398,7 @@ glabel func_80240BB0_E16930 /* E16F34 802411B4 3C058011 */ lui $a1, %hi(D_80108B80) /* E16F38 802411B8 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) /* E16F3C 802411BC 0C0511FF */ jal set_menu_icon_script -/* E16F40 802411C0 00000000 */ nop +/* E16F40 802411C0 00000000 */ nop /* E16F44 802411C4 8EA4000C */ lw $a0, 0xc($s5) /* E16F48 802411C8 0C0513AC */ jal icon_set_opacity /* E16F4C 802411CC 240500FF */ addiu $a1, $zero, 0xff @@ -403,6 +408,7 @@ glabel func_80240BB0_E16930 /* E16F5C 802411DC 2402000F */ addiu $v0, $zero, 0xf /* E16F60 802411E0 080906CE */ j .L80241B38 /* E16F64 802411E4 AE82002C */ sw $v0, 0x2c($s4) +glabel L802411E8_E16F68 /* E16F68 802411E8 3C040001 */ lui $a0, 1 /* E16F6C 802411EC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* E16F70 802411F0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -413,7 +419,7 @@ glabel func_80240BB0_E16930 /* E16F84 80241204 8C620010 */ lw $v0, 0x10($v1) /* E16F88 80241208 30428000 */ andi $v0, $v0, 0x8000 /* E16F8C 8024120C 10400004 */ beqz $v0, .L80241220 -/* E16F90 80241210 00000000 */ nop +/* E16F90 80241210 00000000 */ nop /* E16F94 80241214 8EA20024 */ lw $v0, 0x24($s5) /* E16F98 80241218 24420001 */ addiu $v0, $v0, 1 /* E16F9C 8024121C AEA20024 */ sw $v0, 0x24($s5) @@ -459,6 +465,7 @@ glabel func_80240BB0_E16930 /* E17038 802412B8 46200020 */ cvt.s.d $f0, $f0 /* E1703C 802412BC 080906CF */ j .L80241B3C /* E17040 802412C0 E660003C */ swc1 $f0, 0x3c($s3) +glabel L802412C4_E17044 /* E17044 802412C4 9662008E */ lhu $v0, 0x8e($s3) /* E17048 802412C8 24080008 */ addiu $t0, $zero, 8 /* E1704C 802412CC 2442FFFF */ addiu $v0, $v0, -1 @@ -496,6 +503,7 @@ glabel func_80240BB0_E16930 /* E170C8 80241348 24040001 */ addiu $a0, $zero, 1 /* E170CC 8024134C 080906CF */ j .L80241B3C /* E170D0 80241350 2694001C */ addiu $s4, $s4, 0x1c +glabel L80241354_E170D4 /* E170D4 80241354 240400D2 */ addiu $a0, $zero, 0xd2 /* E170D8 80241358 2402001F */ addiu $v0, $zero, 0x1f /* E170DC 8024135C 0C00A67F */ jal rand_int @@ -508,6 +516,7 @@ glabel func_80240BB0_E16930 /* E170F8 80241378 2403FFFD */ addiu $v1, $zero, -3 /* E170FC 8024137C 00431024 */ and $v0, $v0, $v1 /* E17100 80241380 AE620000 */ sw $v0, ($s3) +glabel L80241384_E17104 /* E17104 80241384 8E820030 */ lw $v0, 0x30($s4) /* E17108 80241388 2442FFFF */ addiu $v0, $v0, -1 /* E1710C 8024138C 1C4001EA */ bgtz $v0, .L80241B38 @@ -552,6 +561,7 @@ glabel func_80240BB0_E16930 /* E171A8 80241428 46200020 */ cvt.s.d $f0, $f0 /* E171AC 8024142C 080906CD */ j .L80241B34 /* E171B0 80241430 E6600040 */ swc1 $f0, 0x40($s3) +glabel L80241434_E171B4 /* E171B4 80241434 8E820030 */ lw $v0, 0x30($s4) /* E171B8 80241438 24420001 */ addiu $v0, $v0, 1 /* E171BC 8024143C AE820030 */ sw $v0, 0x30($s4) @@ -568,13 +578,13 @@ glabel func_80240BB0_E16930 /* E171E8 80241468 E664003C */ swc1 $f4, 0x3c($s3) /* E171EC 8024146C 46002086 */ mov.s $f2, $f4 /* E171F0 80241470 4602003C */ c.lt.s $f0, $f2 -/* E171F4 80241474 00000000 */ nop +/* E171F4 80241474 00000000 */ nop /* E171F8 80241478 45000005 */ bc1f .L80241490 /* E171FC 8024147C E666001C */ swc1 $f6, 0x1c($s3) /* E17200 80241480 0C00EAE8 */ jal enable_npc_shadow /* E17204 80241484 0260202D */ daddu $a0, $s3, $zero /* E17208 80241488 08090526 */ j .L80241498 -/* E1720C 8024148C 00000000 */ nop +/* E1720C 8024148C 00000000 */ nop .L80241490: /* E17210 80241490 0C00EAFF */ jal disable_npc_shadow /* E17214 80241494 0260202D */ daddu $a0, $s3, $zero @@ -584,13 +594,13 @@ glabel func_80240BB0_E16930 /* E17220 802414A0 44801800 */ mtc1 $zero, $f3 /* E17224 802414A4 46000021 */ cvt.d.s $f0, $f0 /* E17228 802414A8 4622003C */ c.lt.d $f0, $f2 -/* E1722C 802414AC 00000000 */ nop +/* E1722C 802414AC 00000000 */ nop /* E17230 802414B0 450201A2 */ bc1fl .L80241B3C /* E17234 802414B4 2694001C */ addiu $s4, $s4, 0x1c /* E17238 802414B8 C662003C */ lwc1 $f2, 0x3c($s3) /* E1723C 802414BC C6600064 */ lwc1 $f0, 0x64($s3) /* E17240 802414C0 4600103E */ c.le.s $f2, $f0 -/* E17244 802414C4 00000000 */ nop +/* E17244 802414C4 00000000 */ nop /* E17248 802414C8 4500019B */ bc1f .L80241B38 /* E1724C 802414CC 2404014A */ addiu $a0, $zero, 0x14a /* E17250 802414D0 2402001F */ addiu $v0, $zero, 0x1f @@ -603,7 +613,7 @@ glabel func_80240BB0_E16930 /* E1726C 802414EC E67A003C */ swc1 $f26, 0x3c($s3) /* E17270 802414F0 28420032 */ slti $v0, $v0, 0x32 /* E17274 802414F4 10400005 */ beqz $v0, .L8024150C -/* E17278 802414F8 00000000 */ nop +/* E17278 802414F8 00000000 */ nop /* E1727C 802414FC 3C014387 */ lui $at, 0x4387 /* E17280 80241500 44810000 */ mtc1 $at, $f0 /* E17284 80241504 08090547 */ j .L8024151C @@ -611,13 +621,14 @@ glabel func_80240BB0_E16930 .L8024150C: /* E1728C 8024150C 3C0142B4 */ lui $at, 0x42b4 /* E17290 80241510 44810000 */ mtc1 $at, $f0 -/* E17294 80241514 00000000 */ nop +/* E17294 80241514 00000000 */ nop /* E17298 80241518 E660000C */ swc1 $f0, 0xc($s3) .L8024151C: /* E1729C 8024151C 0C00EAFF */ jal disable_npc_shadow /* E172A0 80241520 0260202D */ daddu $a0, $s3, $zero /* E172A4 80241524 080906CF */ j .L80241B3C /* E172A8 80241528 2694001C */ addiu $s4, $s4, 0x1c +glabel L8024152C_E172AC /* E172AC 8024152C 0C00EAE8 */ jal enable_npc_shadow /* E172B0 80241530 0260202D */ daddu $a0, $s3, $zero /* E172B4 80241534 3C03002C */ lui $v1, 0x2c @@ -648,7 +659,7 @@ glabel func_80240BB0_E16930 /* E17318 80241598 44811800 */ mtc1 $at, $f3 /* E1731C 8024159C 44801000 */ mtc1 $zero, $f2 /* E17320 802415A0 44824000 */ mtc1 $v0, $f8 -/* E17324 802415A4 00000000 */ nop +/* E17324 802415A4 00000000 */ nop /* E17328 802415A8 46804220 */ cvt.s.w $f8, $f8 /* E1732C 802415AC 46162101 */ sub.s $f4, $f4, $f22 /* E17330 802415B0 E6600038 */ swc1 $f0, 0x38($s3) @@ -674,9 +685,9 @@ glabel func_80240BB0_E16930 /* E17380 80241600 C6620038 */ lwc1 $f2, 0x38($s3) /* E17384 80241604 C4400028 */ lwc1 $f0, 0x28($v0) /* E17388 80241608 4602003C */ c.lt.s $f0, $f2 -/* E1738C 8024160C 00000000 */ nop +/* E1738C 8024160C 00000000 */ nop /* E17390 80241610 45000007 */ bc1f .L80241630 -/* E17394 80241614 00000000 */ nop +/* E17394 80241614 00000000 */ nop /* E17398 80241618 3C014387 */ lui $at, 0x4387 /* E1739C 8024161C 44810000 */ mtc1 $at, $f0 /* E173A0 80241620 3C0142BE */ lui $at, 0x42be @@ -692,6 +703,7 @@ glabel func_80240BB0_E16930 /* E173C4 80241644 E660000C */ swc1 $f0, 0xc($s3) .L80241648: /* E173C8 80241648 E4420080 */ swc1 $f2, 0x80($v0) +glabel L8024164C_E173CC /* E173CC 8024164C 3C030001 */ lui $v1, 1 /* E173D0 80241650 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* E173D4 80241654 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -706,7 +718,7 @@ glabel func_80240BB0_E16930 /* E173F8 80241678 C6620040 */ lwc1 $f2, 0x40($s3) /* E173FC 8024167C 3C013F80 */ lui $at, 0x3f80 /* E17400 80241680 44810000 */ mtc1 $at, $f0 -/* E17404 80241684 00000000 */ nop +/* E17404 80241684 00000000 */ nop /* E17408 80241688 46001080 */ add.s $f2, $f2, $f0 /* E1740C 8024168C 8E650038 */ lw $a1, 0x38($s3) /* E17410 80241690 8E66003C */ lw $a2, 0x3c($s3) @@ -722,6 +734,7 @@ glabel func_80240BB0_E16930 /* E17438 802416B8 AE82002C */ sw $v0, 0x2c($s4) /* E1743C 802416BC 080906CF */ j .L80241B3C /* E17440 802416C0 2694001C */ addiu $s4, $s4, 0x1c +glabel L802416C4_E17444 /* E17444 802416C4 9662008E */ lhu $v0, 0x8e($s3) /* E17448 802416C8 24030019 */ addiu $v1, $zero, 0x19 /* E1744C 802416CC 2442FFFF */ addiu $v0, $v0, -1 @@ -756,6 +769,7 @@ glabel func_80240BB0_E16930 /* E174BC 8024173C 34420002 */ ori $v0, $v0, 2 /* E174C0 80241740 080906CE */ j .L80241B38 /* E174C4 80241744 AE620000 */ sw $v0, ($s3) +glabel L80241748_E174C8 /* E174C8 80241748 27A50068 */ addiu $a1, $sp, 0x68 /* E174CC 8024174C 27A6006C */ addiu $a2, $sp, 0x6c /* E174D0 80241750 9684003A */ lhu $a0, 0x3a($s4) @@ -781,6 +795,7 @@ glabel func_80240BB0_E16930 /* E17520 802417A0 46200020 */ cvt.s.d $f0, $f0 /* E17524 802417A4 0C00EAFF */ jal disable_npc_shadow /* E17528 802417A8 E6600040 */ swc1 $f0, 0x40($s3) +glabel L802417AC_E1752C /* E1752C 802417AC 8E820030 */ lw $v0, 0x30($s4) /* E17530 802417B0 2442FFFF */ addiu $v0, $v0, -1 /* E17534 802417B4 1C4000E0 */ bgtz $v0, .L80241B38 @@ -852,6 +867,7 @@ glabel func_80240BB0_E16930 /* E17638 802418B8 00A0302D */ daddu $a2, $a1, $zero /* E1763C 802418BC 080906CF */ j .L80241B3C /* E17640 802418C0 2694001C */ addiu $s4, $s4, 0x1c +glabel L802418C4_E17644 /* E17644 802418C4 8E820030 */ lw $v0, 0x30($s4) /* E17648 802418C8 24420001 */ addiu $v0, $v0, 1 /* E1764C 802418CC AE820030 */ sw $v0, 0x30($s4) @@ -871,7 +887,7 @@ glabel func_80240BB0_E16930 /* E17684 80241904 96020000 */ lhu $v0, ($s0) /* E17688 80241908 30420400 */ andi $v0, $v0, 0x400 /* E1768C 8024190C 1440000A */ bnez $v0, .L80241938 -/* E17690 80241910 00000000 */ nop +/* E17690 80241910 00000000 */ nop /* E17694 80241914 8E650038 */ lw $a1, 0x38($s3) /* E17698 80241918 8E66003C */ lw $a2, 0x3c($s3) /* E1769C 8024191C 8E670040 */ lw $a3, 0x40($s3) @@ -895,17 +911,17 @@ glabel func_80240BB0_E16930 /* E176DC 8024195C C6600064 */ lwc1 $f0, 0x64($s3) /* E176E0 80241960 3C0141A0 */ lui $at, 0x41a0 /* E176E4 80241964 44811000 */ mtc1 $at, $f2 -/* E176E8 80241968 00000000 */ nop +/* E176E8 80241968 00000000 */ nop /* E176EC 8024196C 46020000 */ add.s $f0, $f0, $f2 /* E176F0 80241970 C662003C */ lwc1 $f2, 0x3c($s3) /* E176F4 80241974 4602003C */ c.lt.s $f0, $f2 -/* E176F8 80241978 00000000 */ nop +/* E176F8 80241978 00000000 */ nop /* E176FC 8024197C 45000005 */ bc1f .L80241994 -/* E17700 80241980 00000000 */ nop +/* E17700 80241980 00000000 */ nop /* E17704 80241984 0C00EAE8 */ jal enable_npc_shadow /* E17708 80241988 0260202D */ daddu $a0, $s3, $zero /* E1770C 8024198C 08090667 */ j .L8024199C -/* E17710 80241990 00000000 */ nop +/* E17710 80241990 00000000 */ nop .L80241994: /* E17714 80241994 0C00EAFF */ jal disable_npc_shadow /* E17718 80241998 0260202D */ daddu $a0, $s3, $zero @@ -915,13 +931,13 @@ glabel func_80240BB0_E16930 /* E17724 802419A4 44801800 */ mtc1 $zero, $f3 /* E17728 802419A8 46000021 */ cvt.d.s $f0, $f0 /* E1772C 802419AC 4622003C */ c.lt.d $f0, $f2 -/* E17730 802419B0 00000000 */ nop +/* E17730 802419B0 00000000 */ nop /* E17734 802419B4 45020061 */ bc1fl .L80241B3C /* E17738 802419B8 2694001C */ addiu $s4, $s4, 0x1c /* E1773C 802419BC C662003C */ lwc1 $f2, 0x3c($s3) /* E17740 802419C0 C6600064 */ lwc1 $f0, 0x64($s3) /* E17744 802419C4 4600103E */ c.le.s $f2, $f0 -/* E17748 802419C8 00000000 */ nop +/* E17748 802419C8 00000000 */ nop /* E1774C 802419CC 4500005A */ bc1f .L80241B38 /* E17750 802419D0 2404014A */ addiu $a0, $zero, 0x14a /* E17754 802419D4 24020047 */ addiu $v0, $zero, 0x47 @@ -931,11 +947,12 @@ glabel func_80240BB0_E16930 /* E17764 802419E4 2442005A */ addiu $v0, $v0, 0x5a /* E17768 802419E8 080906C2 */ j .L80241B08 /* E1776C 802419EC AE820030 */ sw $v0, 0x30($s4) +glabel L802419F0_E17770 /* E17770 802419F0 0C05272D */ jal play_sound /* E17774 802419F4 2404021C */ addiu $a0, $zero, 0x21c /* E17778 802419F8 8E840044 */ lw $a0, 0x44($s4) /* E1777C 802419FC 0C046C04 */ jal get_model_list_index_from_tree_index -/* E17780 80241A00 00000000 */ nop +/* E17780 80241A00 00000000 */ nop /* E17784 80241A04 0C046B4C */ jal get_model_from_list_index /* E17788 80241A08 0040202D */ daddu $a0, $v0, $zero /* E1778C 80241A0C 0040802D */ daddu $s0, $v0, $zero @@ -947,6 +964,7 @@ glabel func_80240BB0_E16930 /* E177A4 80241A24 96020000 */ lhu $v0, ($s0) /* E177A8 80241A28 3042FFFD */ andi $v0, $v0, 0xfffd /* E177AC 80241A2C A6020000 */ sh $v0, ($s0) +glabel L80241A30_E177B0 /* E177B0 80241A30 8E840044 */ lw $a0, 0x44($s4) /* E177B4 80241A34 24080001 */ addiu $t0, $zero, 1 /* E177B8 80241A38 0C046C04 */ jal get_model_list_index_from_tree_index @@ -1019,15 +1037,16 @@ glabel func_80240BB0_E16930 .L80241B34: /* E178B4 80241B34 AE800030 */ sw $zero, 0x30($s4) .L80241B38: +glabel L80241B38_E178B8 /* E178B8 80241B38 2694001C */ addiu $s4, $s4, 0x1c .L80241B3C: /* E178BC 80241B3C 26A203D4 */ addiu $v0, $s5, 0x3d4 /* E178C0 80241B40 0282102A */ slt $v0, $s4, $v0 /* E178C4 80241B44 1440FC41 */ bnez $v0, .L80240C4C -/* E178C8 80241B48 00000000 */ nop +/* E178C8 80241B48 00000000 */ nop /* E178CC 80241B4C 8EA30008 */ lw $v1, 8($s5) /* E178D0 80241B50 18600040 */ blez $v1, .L80241C54 -/* E178D4 80241B54 00000000 */ nop +/* E178D4 80241B54 00000000 */ nop /* E178D8 80241B58 8EA20004 */ lw $v0, 4($s5) /* E178DC 80241B5C 2842000A */ slti $v0, $v0, 0xa /* E178E0 80241B60 10400031 */ beqz $v0, .L80241C28 @@ -1084,19 +1103,19 @@ glabel func_80240BB0_E16930 /* E1798C 80241C0C 10620003 */ beq $v1, $v0, .L80241C1C /* E17990 80241C10 2402001E */ addiu $v0, $zero, 0x1e /* E17994 80241C14 14620004 */ bne $v1, $v0, .L80241C28 -/* E17998 80241C18 00000000 */ nop +/* E17998 80241C18 00000000 */ nop .L80241C1C: /* E1799C 80241C1C 240401A7 */ addiu $a0, $zero, 0x1a7 .L80241C20: /* E179A0 80241C20 0C05272D */ jal play_sound -/* E179A4 80241C24 00000000 */ nop +/* E179A4 80241C24 00000000 */ nop .L80241C28: /* E179A8 80241C28 8EA20008 */ lw $v0, 8($s5) /* E179AC 80241C2C 18400009 */ blez $v0, .L80241C54 /* E179B0 80241C30 2402000A */ addiu $v0, $zero, 0xa /* E179B4 80241C34 8EA30004 */ lw $v1, 4($s5) /* E179B8 80241C38 14620006 */ bne $v1, $v0, .L80241C54 -/* E179BC 80241C3C 00000000 */ nop +/* E179BC 80241C3C 00000000 */ nop /* E179C0 80241C40 8EA30028 */ lw $v1, 0x28($s5) /* E179C4 80241C44 30620001 */ andi $v0, $v1, 1 /* E179C8 80241C48 14400002 */ bnez $v0, .L80241C54 @@ -1105,10 +1124,10 @@ glabel func_80240BB0_E16930 .L80241C54: /* E179D4 80241C54 8EA20008 */ lw $v0, 8($s5) /* E179D8 80241C58 1440000A */ bnez $v0, .L80241C84 -/* E179DC 80241C5C 00000000 */ nop +/* E179DC 80241C5C 00000000 */ nop /* E179E0 80241C60 8FA80088 */ lw $t0, 0x88($sp) /* E179E4 80241C64 11000007 */ beqz $t0, .L80241C84 -/* E179E8 80241C68 00000000 */ nop +/* E179E8 80241C68 00000000 */ nop /* E179EC 80241C6C 8EA30028 */ lw $v1, 0x28($s5) /* E179F0 80241C70 30620001 */ andi $v0, $v1, 1 /* E179F4 80241C74 14400005 */ bnez $v0, .L80241C8C @@ -1125,18 +1144,18 @@ glabel func_80240BB0_E16930 /* E17A18 80241C98 AEA20028 */ sw $v0, 0x28($s5) /* E17A1C 80241C9C 30620001 */ andi $v0, $v1, 1 /* E17A20 80241CA0 10400007 */ beqz $v0, .L80241CC0 -/* E17A24 80241CA4 00000000 */ nop +/* E17A24 80241CA4 00000000 */ nop /* E17A28 80241CA8 0C03805E */ jal disable_player_input -/* E17A2C 80241CAC 00000000 */ nop +/* E17A2C 80241CAC 00000000 */ nop /* E17A30 80241CB0 0C03BD8A */ jal func_800EF628 -/* E17A34 80241CB4 00000000 */ nop +/* E17A34 80241CB4 00000000 */ nop /* E17A38 80241CB8 08090734 */ j .L80241CD0 -/* E17A3C 80241CBC 00000000 */ nop +/* E17A3C 80241CBC 00000000 */ nop .L80241CC0: /* E17A40 80241CC0 0C038069 */ jal enable_player_input -/* E17A44 80241CC4 00000000 */ nop +/* E17A44 80241CC4 00000000 */ nop /* E17A48 80241CC8 0C03BD80 */ jal func_800EF600 -/* E17A4C 80241CCC 00000000 */ nop +/* E17A4C 80241CCC 00000000 */ nop .L80241CD0: /* E17A50 80241CD0 8FA80088 */ lw $t0, 0x88($sp) /* E17A54 80241CD4 1500000E */ bnez $t0, .L80241D10 @@ -1146,7 +1165,7 @@ glabel func_80240BB0_E16930 /* E17A64 80241CE4 24080001 */ addiu $t0, $zero, 1 /* E17A68 80241CE8 8EA20008 */ lw $v0, 8($s5) /* E17A6C 80241CEC 14400008 */ bnez $v0, .L80241D10 -/* E17A70 80241CF0 00000000 */ nop +/* E17A70 80241CF0 00000000 */ nop /* E17A74 80241CF4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* E17A78 80241CF8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* E17A7C 80241CFC 804300B4 */ lb $v1, 0xb4($v0) @@ -1162,11 +1181,11 @@ glabel func_80240BB0_E16930 /* E17A9C 80241D1C 8EA20028 */ lw $v0, 0x28($s5) /* E17AA0 80241D20 30420001 */ andi $v0, $v0, 1 /* E17AA4 80241D24 10400005 */ beqz $v0, .L80241D3C -/* E17AA8 80241D28 00000000 */ nop +/* E17AA8 80241D28 00000000 */ nop /* E17AAC 80241D2C 0C038069 */ jal enable_player_input -/* E17AB0 80241D30 00000000 */ nop +/* E17AB0 80241D30 00000000 */ nop /* E17AB4 80241D34 0C03BD80 */ jal func_800EF600 -/* E17AB8 80241D38 00000000 */ nop +/* E17AB8 80241D38 00000000 */ nop .L80241D3C: /* E17ABC 80241D3C 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) /* E17AC0 80241D40 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) @@ -1181,7 +1200,7 @@ glabel func_80240BB0_E16930 /* E17AE4 80241D64 2404021D */ addiu $a0, $zero, 0x21d .L80241D68: /* E17AE8 80241D68 0C05272D */ jal play_sound -/* E17AEC 80241D6C 00000000 */ nop +/* E17AEC 80241D6C 00000000 */ nop /* E17AF0 80241D70 3C030001 */ lui $v1, 1 /* E17AF4 80241D74 8E020000 */ lw $v0, ($s0) /* E17AF8 80241D78 34630002 */ ori $v1, $v1, 2 diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241DCC_E17B4C.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241DCC_E17B4C.s index 70aded07bc..a2d7d94140 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241DCC_E17B4C.s +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241DCC_E17B4C.s @@ -30,11 +30,11 @@ glabel func_80241DCC_E17B4C /* E17BB0 80241E30 00021040 */ sll $v0, $v0, 1 /* E17BB4 80241E34 00822023 */ subu $a0, $a0, $v0 /* E17BB8 80241E38 44840000 */ mtc1 $a0, $f0 -/* E17BBC 80241E3C 00000000 */ nop +/* E17BBC 80241E3C 00000000 */ nop /* E17BC0 80241E40 46800020 */ cvt.s.w $f0, $f0 /* E17BC4 80241E44 46000021 */ cvt.d.s $f0, $f0 /* E17BC8 80241E48 46220002 */ mul.d $f0, $f0, $f2 -/* E17BCC 80241E4C 00000000 */ nop +/* E17BCC 80241E4C 00000000 */ nop /* E17BD0 80241E50 3C108011 */ lui $s0, %hi(gPlayerData) /* E17BD4 80241E54 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) /* E17BD8 80241E58 3C040001 */ lui $a0, 1 @@ -47,7 +47,7 @@ glabel func_80241DCC_E17B4C /* E17BF4 80241E74 46220003 */ div.d $f0, $f0, $f2 /* E17BF8 80241E78 4620010D */ trunc.w.d $f4, $f0 /* E17BFC 80241E7C 44132000 */ mfc1 $s3, $f4 -/* E17C00 80241E80 00000000 */ nop +/* E17C00 80241E80 00000000 */ nop /* E17C04 80241E84 00531021 */ addu $v0, $v0, $s3 /* E17C08 80241E88 AE220020 */ sw $v0, 0x20($s1) /* E17C0C 80241E8C 8E030338 */ lw $v1, 0x338($s0) diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241FE4_E17D64.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241FE4_E17D64.s index 9bb3c5f2a8..7771471daf 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241FE4_E17D64.s +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241FE4_E17D64.s @@ -33,7 +33,7 @@ glabel func_80241FE4_E17D64 /* E17DD0 80242050 50970028 */ beql $a0, $s7, .L802420F4 /* E17DD4 80242054 26520001 */ addiu $s2, $s2, 1 /* E17DD8 80242058 0C00FB3A */ jal get_enemy -/* E17DDC 8024205C 00000000 */ nop +/* E17DDC 8024205C 00000000 */ nop /* E17DE0 80242060 84440008 */ lh $a0, 8($v0) /* E17DE4 80242064 0C00EABB */ jal get_npc_unsafe /* E17DE8 80242068 0040882D */ daddu $s1, $v0, $zero @@ -54,7 +54,7 @@ glabel func_80241FE4_E17D64 /* E17E24 802420A4 2442FFFF */ addiu $v0, $v0, -1 /* E17E28 802420A8 2C42013F */ sltiu $v0, $v0, 0x13f /* E17E2C 802420AC 1040000A */ beqz $v0, .L802420D8 -/* E17E30 802420B0 00000000 */ nop +/* E17E30 802420B0 00000000 */ nop /* E17E34 802420B4 AFA00010 */ sw $zero, 0x10($sp) /* E17E38 802420B8 AFA00014 */ sw $zero, 0x14($sp) /* E17E3C 802420BC 8E050038 */ lw $a1, 0x38($s0) @@ -95,7 +95,7 @@ glabel func_80241FE4_E17D64 /* E17EB8 80242138 5082003C */ beql $a0, $v0, .L8024222C /* E17EBC 8024213C 2631001C */ addiu $s1, $s1, 0x1c /* E17EC0 80242140 0C00FB3A */ jal get_enemy -/* E17EC4 80242144 00000000 */ nop +/* E17EC4 80242144 00000000 */ nop /* E17EC8 80242148 0C00EABB */ jal get_npc_unsafe /* E17ECC 8024214C 84440008 */ lh $a0, 8($v0) /* E17ED0 80242150 0040802D */ daddu $s0, $v0, $zero @@ -107,7 +107,7 @@ glabel func_80241FE4_E17D64 /* E17EE8 80242168 10600005 */ beqz $v1, .L80242180 /* E17EEC 8024216C 24020001 */ addiu $v0, $zero, 1 /* E17EF0 80242170 10620017 */ beq $v1, $v0, .L802421D0 -/* E17EF4 80242174 00000000 */ nop +/* E17EF4 80242174 00000000 */ nop /* E17EF8 80242178 0809088B */ j .L8024222C /* E17EFC 8024217C 2631001C */ addiu $s1, $s1, 0x1c .L80242180: @@ -118,7 +118,7 @@ glabel func_80241FE4_E17D64 /* E17F10 80242190 860200A8 */ lh $v0, 0xa8($s0) /* E17F14 80242194 4406A000 */ mfc1 $a2, $f20 /* E17F18 80242198 44820000 */ mtc1 $v0, $f0 -/* E17F1C 8024219C 00000000 */ nop +/* E17F1C 8024219C 00000000 */ nop /* E17F20 802421A0 46800020 */ cvt.s.w $f0, $f0 /* E17F24 802421A4 44070000 */ mfc1 $a3, $f0 /* E17F28 802421A8 0200282D */ daddu $a1, $s0, $zero @@ -139,7 +139,7 @@ glabel func_80241FE4_E17D64 /* E17F60 802421E0 860200A8 */ lh $v0, 0xa8($s0) /* E17F64 802421E4 4406A000 */ mfc1 $a2, $f20 /* E17F68 802421E8 44820000 */ mtc1 $v0, $f0 -/* E17F6C 802421EC 00000000 */ nop +/* E17F6C 802421EC 00000000 */ nop /* E17F70 802421F0 46800020 */ cvt.s.w $f0, $f0 /* E17F74 802421F4 44070000 */ mfc1 $a3, $f0 /* E17F78 802421F8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242274_E17FF4.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242274_E17FF4.s index 49549a4e01..b6cddbba90 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242274_E17FF4.s +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242274_E17FF4.s @@ -19,7 +19,7 @@ glabel func_80242274_E17FF4 /* E1802C 802422AC 0C03A625 */ jal func_800E9894 /* E18030 802422B0 AC430008 */ sw $v1, 8($v0) /* E18034 802422B4 0C03A5EE */ jal func_800E97B8 -/* E18038 802422B8 00000000 */ nop +/* E18038 802422B8 00000000 */ nop /* E1803C 802422BC 8FBF0014 */ lw $ra, 0x14($sp) /* E18040 802422C0 8FB00010 */ lw $s0, 0x10($sp) /* E18044 802422C4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802423A4_E18124.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802423A4_E18124.s index 1e7fbc4184..e7aa431f34 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802423A4_E18124.s +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802423A4_E18124.s @@ -5,11 +5,11 @@ glabel func_802423A4_E18124 /* E18124 802423A4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* E18128 802423A8 AFBF0010 */ sw $ra, 0x10($sp) /* E1812C 802423AC 0C03A5B2 */ jal func_800E96C8 -/* E18130 802423B0 00000000 */ nop +/* E18130 802423B0 00000000 */ nop /* E18134 802423B4 8FBF0010 */ lw $ra, 0x10($sp) /* E18138 802423B8 24020002 */ addiu $v0, $zero, 2 /* E1813C 802423BC 03E00008 */ jr $ra /* E18140 802423C0 27BD0018 */ addiu $sp, $sp, 0x18 -/* E18144 802423C4 00000000 */ nop -/* E18148 802423C8 00000000 */ nop -/* E1814C 802423CC 00000000 */ nop +/* E18144 802423C4 00000000 */ nop +/* E18148 802423C8 00000000 */ nop +/* E1814C 802423CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E18150/func_802423D0_E18150.s b/asm/nonmatchings/world/area_mgm/mgm_02/E18150/func_802423D0_E18150.s index 00d6ed8a82..09b63f1ffd 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E18150/func_802423D0_E18150.s +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E18150/func_802423D0_E18150.s @@ -7,10 +7,10 @@ glabel func_802423D0_E18150 /* E18158 802423D8 248484C0 */ addiu $a0, $a0, %lo(D_802484C0) /* E1815C 802423DC AFBF0010 */ sw $ra, 0x10($sp) /* E18160 802423E0 0C0496CB */ jal set_message_images -/* E18164 802423E4 00000000 */ nop +/* E18164 802423E4 00000000 */ nop /* E18168 802423E8 8FBF0010 */ lw $ra, 0x10($sp) /* E1816C 802423EC 24020002 */ addiu $v0, $zero, 2 /* E18170 802423F0 03E00008 */ jr $ra /* E18174 802423F4 27BD0018 */ addiu $sp, $sp, 0x18 -/* E18178 802423F8 00000000 */ nop -/* E1817C 802423FC 00000000 */ nop +/* E18178 802423F8 00000000 */ nop +/* E1817C 802423FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93440/func_80240000_B93440.s b/asm/nonmatchings/world/area_mim/mim_01/B93440/func_80240000_B93440.s index 89b81afd91..1d4bba33ad 100644 --- a/asm/nonmatchings/world/area_mim/mim_01/B93440/func_80240000_B93440.s +++ b/asm/nonmatchings/world/area_mim/mim_01/B93440/func_80240000_B93440.s @@ -5,7 +5,7 @@ glabel func_80240000_B93440 /* B93440 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B93444 80240004 AFBF0010 */ sw $ra, 0x10($sp) /* B93448 80240008 0C046ED4 */ jal enable_world_fog -/* B9344C 8024000C 00000000 */ nop +/* B9344C 8024000C 00000000 */ nop /* B93450 80240010 240403DE */ addiu $a0, $zero, 0x3de /* B93454 80240014 0C046EDD */ jal set_world_fog_dist /* B93458 80240018 240503E8 */ addiu $a1, $zero, 0x3e8 @@ -15,7 +15,7 @@ glabel func_80240000_B93440 /* B93468 80240028 0C046EE2 */ jal set_world_fog_color /* B9346C 8024002C 240700FF */ addiu $a3, $zero, 0xff /* B93470 80240030 0C048BFB */ jal enable_entity_fog -/* B93474 80240034 00000000 */ nop +/* B93474 80240034 00000000 */ nop /* B93478 80240038 240403DE */ addiu $a0, $zero, 0x3de /* B9347C 8024003C 0C048C04 */ jal set_entity_fog_dist /* B93480 80240040 240503E8 */ addiu $a1, $zero, 0x3e8 @@ -28,5 +28,5 @@ glabel func_80240000_B93440 /* B9349C 8024005C 24020002 */ addiu $v0, $zero, 2 /* B934A0 80240060 03E00008 */ jr $ra /* B934A4 80240064 27BD0018 */ addiu $sp, $sp, 0x18 -/* B934A8 80240068 00000000 */ nop -/* B934AC 8024006C 00000000 */ nop +/* B934A8 80240068 00000000 */ nop +/* B934AC 8024006C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_80240070_B934B0.s b/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_80240070_B934B0.s index 1bcc6561ab..1b637b9683 100644 --- a/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_80240070_B934B0.s +++ b/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_80240070_B934B0.s @@ -46,7 +46,7 @@ glabel func_80240070_B934B0 /* B93550 80240110 10620029 */ beq $v1, $v0, .L802401B8 /* B93554 80240114 000713C2 */ srl $v0, $a3, 0xf /* B93558 80240118 080900BD */ j .L802402F4 -/* B9355C 8024011C 00000000 */ nop +/* B9355C 8024011C 00000000 */ nop .L80240120: /* B93560 80240120 240200DE */ addiu $v0, $zero, 0xde /* B93564 80240124 10620005 */ beq $v1, $v0, .L8024013C @@ -54,7 +54,7 @@ glabel func_80240070_B934B0 /* B9356C 8024012C 50620071 */ beql $v1, $v0, .L802402F4 /* B93570 80240130 24100001 */ addiu $s0, $zero, 1 /* B93574 80240134 080900BD */ j .L802402F4 -/* B93578 80240138 00000000 */ nop +/* B93578 80240138 00000000 */ nop .L8024013C: /* B9357C 8024013C 00E0202D */ daddu $a0, $a3, $zero /* B93580 80240140 0260282D */ daddu $a1, $s3, $zero @@ -88,7 +88,7 @@ glabel func_80240070_B934B0 /* B935E8 802401A8 1440FFF9 */ bnez $v0, .L80240190 /* B935EC 802401AC 24840010 */ addiu $a0, $a0, 0x10 /* B935F0 802401B0 080900BD */ j .L802402F4 -/* B935F4 802401B4 00000000 */ nop +/* B935F4 802401B4 00000000 */ nop .L802401B8: /* B935F8 802401B8 304201FC */ andi $v0, $v0, 0x1fc /* B935FC 802401BC 00511021 */ addu $v0, $v0, $s1 @@ -97,10 +97,10 @@ glabel func_80240070_B934B0 /* B93608 802401C8 84820000 */ lh $v0, ($a0) /* B9360C 802401CC 84830002 */ lh $v1, 2($a0) /* B93610 802401D0 44828000 */ mtc1 $v0, $f16 -/* B93614 802401D4 00000000 */ nop +/* B93614 802401D4 00000000 */ nop /* B93618 802401D8 46808420 */ cvt.s.w $f16, $f16 /* B9361C 802401DC 44830000 */ mtc1 $v1, $f0 -/* B93620 802401E0 00000000 */ nop +/* B93620 802401E0 00000000 */ nop /* B93624 802401E4 46800020 */ cvt.s.w $f0, $f0 /* B93628 802401E8 000711C2 */ srl $v0, $a3, 7 /* B9362C 802401EC 304201FC */ andi $v0, $v0, 0x1fc @@ -108,15 +108,15 @@ glabel func_80240070_B934B0 /* B93634 802401F4 84830004 */ lh $v1, 4($a0) /* B93638 802401F8 8C440000 */ lw $a0, ($v0) /* B9363C 802401FC 4483B000 */ mtc1 $v1, $f22 -/* B93640 80240200 00000000 */ nop +/* B93640 80240200 00000000 */ nop /* B93644 80240204 4680B5A0 */ cvt.s.w $f22, $f22 /* B93648 80240208 84820000 */ lh $v0, ($a0) /* B9364C 8024020C 84830002 */ lh $v1, 2($a0) /* B93650 80240210 44821000 */ mtc1 $v0, $f2 -/* B93654 80240214 00000000 */ nop +/* B93654 80240214 00000000 */ nop /* B93658 80240218 468010A0 */ cvt.s.w $f2, $f2 /* B9365C 8024021C 4483F000 */ mtc1 $v1, $f30 -/* B93660 80240220 00000000 */ nop +/* B93660 80240220 00000000 */ nop /* B93664 80240224 4680F7A0 */ cvt.s.w $f30, $f30 /* B93668 80240228 080900AA */ j .L802402A8 /* B9366C 8024022C 00071040 */ sll $v0, $a3, 1 @@ -129,10 +129,10 @@ glabel func_80240070_B934B0 /* B93684 80240244 84820000 */ lh $v0, ($a0) /* B93688 80240248 84830002 */ lh $v1, 2($a0) /* B9368C 8024024C 44828000 */ mtc1 $v0, $f16 -/* B93690 80240250 00000000 */ nop +/* B93690 80240250 00000000 */ nop /* B93694 80240254 46808420 */ cvt.s.w $f16, $f16 /* B93698 80240258 44830000 */ mtc1 $v1, $f0 -/* B9369C 8024025C 00000000 */ nop +/* B9369C 8024025C 00000000 */ nop /* B936A0 80240260 46800020 */ cvt.s.w $f0, $f0 /* B936A4 80240264 000611C2 */ srl $v0, $a2, 7 /* B936A8 80240268 304201FC */ andi $v0, $v0, 0x1fc @@ -140,15 +140,15 @@ glabel func_80240070_B934B0 /* B936B0 80240270 84830004 */ lh $v1, 4($a0) /* B936B4 80240274 8C440000 */ lw $a0, ($v0) /* B936B8 80240278 4483B000 */ mtc1 $v1, $f22 -/* B936BC 8024027C 00000000 */ nop +/* B936BC 8024027C 00000000 */ nop /* B936C0 80240280 4680B5A0 */ cvt.s.w $f22, $f22 /* B936C4 80240284 84820000 */ lh $v0, ($a0) /* B936C8 80240288 84830002 */ lh $v1, 2($a0) /* B936CC 8024028C 44821000 */ mtc1 $v0, $f2 -/* B936D0 80240290 00000000 */ nop +/* B936D0 80240290 00000000 */ nop /* B936D4 80240294 468010A0 */ cvt.s.w $f2, $f2 /* B936D8 80240298 4483F000 */ mtc1 $v1, $f30 -/* B936DC 8024029C 00000000 */ nop +/* B936DC 8024029C 00000000 */ nop /* B936E0 802402A0 4680F7A0 */ cvt.s.w $f30, $f30 /* B936E4 802402A4 00061040 */ sll $v0, $a2, 1 .L802402A8: @@ -157,62 +157,62 @@ glabel func_80240070_B934B0 /* B936F0 802402B0 84830004 */ lh $v1, 4($a0) /* B936F4 802402B4 8C420000 */ lw $v0, ($v0) /* B936F8 802402B8 4483A000 */ mtc1 $v1, $f20 -/* B936FC 802402BC 00000000 */ nop +/* B936FC 802402BC 00000000 */ nop /* B93700 802402C0 4680A520 */ cvt.s.w $f20, $f20 /* B93704 802402C4 84440000 */ lh $a0, ($v0) /* B93708 802402C8 84430002 */ lh $v1, 2($v0) /* B9370C 802402CC 84420004 */ lh $v0, 4($v0) /* B93710 802402D0 4484E000 */ mtc1 $a0, $f28 -/* B93714 802402D4 00000000 */ nop +/* B93714 802402D4 00000000 */ nop /* B93718 802402D8 4680E720 */ cvt.s.w $f28, $f28 /* B9371C 802402DC 4483D000 */ mtc1 $v1, $f26 -/* B93720 802402E0 00000000 */ nop +/* B93720 802402E0 00000000 */ nop /* B93724 802402E4 4680D6A0 */ cvt.s.w $f26, $f26 /* B93728 802402E8 4482C000 */ mtc1 $v0, $f24 -/* B9372C 802402EC 00000000 */ nop +/* B9372C 802402EC 00000000 */ nop /* B93730 802402F0 4680C620 */ cvt.s.w $f24, $f24 .L802402F4: /* B93734 802402F4 1200FF7B */ beqz $s0, .L802400E4 /* B93738 802402F8 26520008 */ addiu $s2, $s2, 8 /* B9373C 802402FC 24020002 */ addiu $v0, $zero, 2 /* B93740 80240300 1602002C */ bne $s0, $v0, .L802403B4 -/* B93744 80240304 00000000 */ nop +/* B93744 80240304 00000000 */ nop /* B93748 80240308 461E0201 */ sub.s $f8, $f0, $f30 /* B9374C 8024030C 4614C181 */ sub.s $f6, $f24, $f20 /* B93750 80240310 46064382 */ mul.s $f14, $f8, $f6 -/* B93754 80240314 00000000 */ nop +/* B93754 80240314 00000000 */ nop /* B93758 80240318 4614B101 */ sub.s $f4, $f22, $f20 /* B9375C 8024031C 461ED281 */ sub.s $f10, $f26, $f30 /* B93760 80240320 460A2302 */ mul.s $f12, $f4, $f10 -/* B93764 80240324 00000000 */ nop +/* B93764 80240324 00000000 */ nop /* B93768 80240328 4602E001 */ sub.s $f0, $f28, $f2 /* B9376C 8024032C 46002102 */ mul.s $f4, $f4, $f0 -/* B93770 80240330 00000000 */ nop +/* B93770 80240330 00000000 */ nop /* B93774 80240334 46028081 */ sub.s $f2, $f16, $f2 /* B93778 80240338 46061182 */ mul.s $f6, $f2, $f6 -/* B9377C 8024033C 00000000 */ nop +/* B9377C 8024033C 00000000 */ nop /* B93780 80240340 460A1082 */ mul.s $f2, $f2, $f10 -/* B93784 80240344 00000000 */ nop +/* B93784 80240344 00000000 */ nop /* B93788 80240348 46004202 */ mul.s $f8, $f8, $f0 -/* B9378C 8024034C 00000000 */ nop +/* B9378C 8024034C 00000000 */ nop /* B93790 80240350 460C7501 */ sub.s $f20, $f14, $f12 /* B93794 80240354 4614A002 */ mul.s $f0, $f20, $f20 -/* B93798 80240358 00000000 */ nop +/* B93798 80240358 00000000 */ nop /* B9379C 8024035C 46062581 */ sub.s $f22, $f4, $f6 /* B937A0 80240360 4616B102 */ mul.s $f4, $f22, $f22 -/* B937A4 80240364 00000000 */ nop +/* B937A4 80240364 00000000 */ nop /* B937A8 80240368 46081601 */ sub.s $f24, $f2, $f8 /* B937AC 8024036C 4618C082 */ mul.s $f2, $f24, $f24 -/* B937B0 80240370 00000000 */ nop +/* B937B0 80240370 00000000 */ nop /* B937B4 80240374 46040000 */ add.s $f0, $f0, $f4 /* B937B8 80240378 46020300 */ add.s $f12, $f0, $f2 /* B937BC 8024037C 46006084 */ sqrt.s $f2, $f12 /* B937C0 80240380 46021032 */ c.eq.s $f2, $f2 -/* B937C4 80240384 00000000 */ nop +/* B937C4 80240384 00000000 */ nop /* B937C8 80240388 45030005 */ bc1tl .L802403A0 /* B937CC 8024038C 4602A003 */ div.s $f0, $f20, $f2 /* B937D0 80240390 0C0187BC */ jal sqrtf -/* B937D4 80240394 00000000 */ nop +/* B937D4 80240394 00000000 */ nop /* B937D8 80240398 46000086 */ mov.s $f2, $f0 /* B937DC 8024039C 4602A003 */ div.s $f0, $f20, $f2 .L802403A0: diff --git a/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_802403F0_B93830.s b/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_802403F0_B93830.s index 6029e1022c..9e7f861910 100644 --- a/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_802403F0_B93830.s +++ b/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_802403F0_B93830.s @@ -27,13 +27,13 @@ glabel func_802403F0_B93830 /* B93888 80240448 C7A00010 */ lwc1 $f0, 0x10($sp) /* B9388C 8024044C 3C014480 */ lui $at, 0x4480 /* B93890 80240450 4481A000 */ mtc1 $at, $f20 -/* B93894 80240454 00000000 */ nop +/* B93894 80240454 00000000 */ nop /* B93898 80240458 46140002 */ mul.s $f0, $f0, $f20 -/* B9389C 8024045C 00000000 */ nop +/* B9389C 8024045C 00000000 */ nop /* B938A0 80240460 3C01CD5B */ lui $at, 0xcd5b /* B938A4 80240464 34215858 */ ori $at, $at, 0x5858 /* B938A8 80240468 4481B000 */ mtc1 $at, $f22 -/* B938AC 8024046C 00000000 */ nop +/* B938AC 8024046C 00000000 */ nop /* B938B0 80240470 46160000 */ add.s $f0, $f0, $f22 /* B938B4 80240474 8E050000 */ lw $a1, ($s0) /* B938B8 80240478 4600008D */ trunc.w.s $f2, $f0 @@ -42,7 +42,7 @@ glabel func_802403F0_B93830 /* B938C4 80240484 0220202D */ daddu $a0, $s1, $zero /* B938C8 80240488 C7A00014 */ lwc1 $f0, 0x14($sp) /* B938CC 8024048C 46140002 */ mul.s $f0, $f0, $f20 -/* B938D0 80240490 00000000 */ nop +/* B938D0 80240490 00000000 */ nop /* B938D4 80240494 26100004 */ addiu $s0, $s0, 4 /* B938D8 80240498 46160000 */ add.s $f0, $f0, $f22 /* B938DC 8024049C 8E050000 */ lw $a1, ($s0) @@ -52,7 +52,7 @@ glabel func_802403F0_B93830 /* B938EC 802404AC 0220202D */ daddu $a0, $s1, $zero /* B938F0 802404B0 C7A00018 */ lwc1 $f0, 0x18($sp) /* B938F4 802404B4 46140002 */ mul.s $f0, $f0, $f20 -/* B938F8 802404B8 00000000 */ nop +/* B938F8 802404B8 00000000 */ nop /* B938FC 802404BC 26100004 */ addiu $s0, $s0, 4 /* B93900 802404C0 46160000 */ add.s $f0, $f0, $f22 /* B93904 802404C4 8E050000 */ lw $a1, ($s0) @@ -68,5 +68,5 @@ glabel func_802403F0_B93830 /* B9392C 802404EC 24020002 */ addiu $v0, $zero, 2 /* B93930 802404F0 03E00008 */ jr $ra /* B93934 802404F4 27BD0040 */ addiu $sp, $sp, 0x40 -/* B93938 802404F8 00000000 */ nop -/* B9393C 802404FC 00000000 */ nop +/* B93938 802404F8 00000000 */ nop +/* B9393C 802404FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240708_B93B48.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240708_B93B48.s index 4ad5b0f584..89b8f42c62 100644 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240708_B93B48.s +++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240708_B93B48.s @@ -42,7 +42,7 @@ glabel func_80240708_B93B48 /* B93BDC 8024079C C6620074 */ lwc1 $f2, 0x74($s3) /* B93BE0 802407A0 468010A0 */ cvt.s.w $f2, $f2 /* B93BE4 802407A4 4600103C */ c.lt.s $f2, $f0 -/* B93BE8 802407A8 00000000 */ nop +/* B93BE8 802407A8 00000000 */ nop /* B93BEC 802407AC 45030001 */ bc1tl .L802407B4 /* B93BF0 802407B0 0000882D */ daddu $s1, $zero, $zero .L802407B4: @@ -51,16 +51,16 @@ glabel func_80240708_B93B48 /* B93BFC 802407BC 3C014387 */ lui $at, 0x4387 /* B93C00 802407C0 4481A000 */ mtc1 $at, $f20 /* B93C04 802407C4 0C00A70A */ jal get_clamped_angle_diff -/* B93C08 802407C8 00000000 */ nop +/* B93C08 802407C8 00000000 */ nop /* B93C0C 802407CC 0C00A6C9 */ jal clamp_angle /* B93C10 802407D0 46000306 */ mov.s $f12, $f0 /* B93C14 802407D4 3C018024 */ lui $at, %hi(D_802445F0) /* B93C18 802407D8 D42245F0 */ ldc1 $f2, %lo(D_802445F0)($at) /* B93C1C 802407DC 46000021 */ cvt.d.s $f0, $f0 /* B93C20 802407E0 4622003C */ c.lt.d $f0, $f2 -/* B93C24 802407E4 00000000 */ nop +/* B93C24 802407E4 00000000 */ nop /* B93C28 802407E8 45000003 */ bc1f .L802407F8 -/* B93C2C 802407EC 00000000 */ nop +/* B93C2C 802407EC 00000000 */ nop /* B93C30 802407F0 3C0142B4 */ lui $at, 0x42b4 /* B93C34 802407F4 4481A000 */ mtc1 $at, $f20 .L802407F8: @@ -77,7 +77,7 @@ glabel func_80240708_B93B48 /* B93C60 80240820 468010A0 */ cvt.s.w $f2, $f2 /* B93C64 80240824 46000005 */ abs.s $f0, $f0 /* B93C68 80240828 4600103C */ c.lt.s $f2, $f0 -/* B93C6C 8024082C 00000000 */ nop +/* B93C6C 8024082C 00000000 */ nop /* B93C70 80240830 45030001 */ bc1tl .L80240838 /* B93C74 80240834 0000882D */ daddu $s1, $zero, $zero .L80240838: @@ -87,13 +87,13 @@ glabel func_80240708_B93B48 /* B93C84 80240844 860200A8 */ lh $v0, 0xa8($s0) /* B93C88 80240848 46020001 */ sub.s $f0, $f0, $f2 /* B93C8C 8024084C 44821000 */ mtc1 $v0, $f2 -/* B93C90 80240850 00000000 */ nop +/* B93C90 80240850 00000000 */ nop /* B93C94 80240854 468010A1 */ cvt.d.w $f2, $f2 /* B93C98 80240858 46221080 */ add.d $f2, $f2, $f2 /* B93C9C 8024085C 46000005 */ abs.s $f0, $f0 /* B93CA0 80240860 46000021 */ cvt.d.s $f0, $f0 /* B93CA4 80240864 4620103E */ c.le.d $f2, $f0 -/* B93CA8 80240868 00000000 */ nop +/* B93CA8 80240868 00000000 */ nop /* B93CAC 8024086C 45030001 */ bc1tl .L80240874 /* B93CB0 80240870 0000882D */ daddu $s1, $zero, $zero .L80240874: diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802408BC_B93CFC.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802408BC_B93CFC.s index 03bc251a05..38cbf04a75 100644 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802408BC_B93CFC.s +++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802408BC_B93CFC.s @@ -19,7 +19,7 @@ glabel func_802408BC_B93CFC /* B93D34 802408F4 8E2200B0 */ lw $v0, 0xb0($s1) /* B93D38 802408F8 30420004 */ andi $v0, $v0, 4 /* B93D3C 802408FC 10400015 */ beqz $v0, .L80240954 -/* B93D40 80240900 00000000 */ nop +/* B93D40 80240900 00000000 */ nop .L80240904: /* B93D44 80240904 AE800070 */ sw $zero, 0x70($s4) /* B93D48 80240908 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel func_802408BC_B93CFC /* B93D98 80240958 12600005 */ beqz $s3, .L80240970 /* B93D9C 8024095C 24020001 */ addiu $v0, $zero, 1 /* B93DA0 80240960 12620048 */ beq $s3, $v0, .L80240A84 -/* B93DA4 80240964 00000000 */ nop +/* B93DA4 80240964 00000000 */ nop /* B93DA8 80240968 080902BE */ j .L80240AF8 -/* B93DAC 8024096C 00000000 */ nop +/* B93DAC 8024096C 00000000 */ nop .L80240970: /* B93DB0 80240970 86240008 */ lh $a0, 8($s1) /* B93DB4 80240974 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel func_802408BC_B93CFC /* B93DD4 80240994 8E03006C */ lw $v1, 0x6c($s0) /* B93DD8 80240998 24020003 */ addiu $v0, $zero, 3 /* B93DDC 8024099C 14620056 */ bne $v1, $v0, .L80240AF8 -/* B93DE0 802409A0 00000000 */ nop +/* B93DE0 802409A0 00000000 */ nop /* B93DE4 802409A4 8E2500A8 */ lw $a1, 0xa8($s1) /* B93DE8 802409A8 10A00003 */ beqz $a1, .L802409B8 /* B93DEC 802409AC 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel func_802408BC_B93CFC /* B93E64 80240A24 C7A20014 */ lwc1 $f2, 0x14($sp) /* B93E68 80240A28 4600020D */ trunc.w.s $f8, $f0 /* B93E6C 80240A2C 44024000 */ mfc1 $v0, $f8 -/* B93E70 80240A30 00000000 */ nop +/* B93E70 80240A30 00000000 */ nop /* B93E74 80240A34 A6220012 */ sh $v0, 0x12($s1) /* B93E78 80240A38 4600120D */ trunc.w.s $f8, $f2 /* B93E7C 80240A3C 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s index adf31b25a4..337d674c7e 100644 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s +++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s @@ -100,78 +100,93 @@ glabel func_80240B1C_B93F5C /* B940C0 80240C80 2C620064 */ sltiu $v0, $v1, 0x64 /* B940C4 80240C84 10400048 */ beqz $v0, .L80240DA8 /* B940C8 80240C88 00031080 */ sll $v0, $v1, 2 -/* B940CC 80240C8C 3C018024 */ lui $at, %hi(D_802445F8) +/* B940CC 80240C8C 3C018024 */ lui $at, %hi(jtbl_802445F8_B97A38) /* B940D0 80240C90 00220821 */ addu $at, $at, $v0 -/* B940D4 80240C94 8C2245F8 */ lw $v0, %lo(D_802445F8)($at) +/* B940D4 80240C94 8C2245F8 */ lw $v0, %lo(jtbl_802445F8_B97A38)($at) /* B940D8 80240C98 00400008 */ jr $v0 /* B940DC 80240C9C 00000000 */ nop +glabel L80240CA0_B940E0 /* B940E0 80240CA0 0240202D */ daddu $a0, $s2, $zero /* B940E4 80240CA4 0260282D */ daddu $a1, $s3, $zero /* B940E8 80240CA8 0C012568 */ jal func_800495A0 /* B940EC 80240CAC 0280302D */ daddu $a2, $s4, $zero +glabel L80240CB0_B940F0 /* B940F0 80240CB0 0240202D */ daddu $a0, $s2, $zero /* B940F4 80240CB4 0260282D */ daddu $a1, $s3, $zero /* B940F8 80240CB8 0C0125AE */ jal func_800496B8 /* B940FC 80240CBC 0280302D */ daddu $a2, $s4, $zero /* B94100 80240CC0 0809036A */ j .L80240DA8 /* B94104 80240CC4 00000000 */ nop +glabel L80240CC8_B94108 /* B94108 80240CC8 0240202D */ daddu $a0, $s2, $zero /* B9410C 80240CCC 0260282D */ daddu $a1, $s3, $zero /* B94110 80240CD0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* B94114 80240CD4 0280302D */ daddu $a2, $s4, $zero +glabel L80240CD8_B94118 /* B94118 80240CD8 0240202D */ daddu $a0, $s2, $zero /* B9411C 80240CDC 0260282D */ daddu $a1, $s3, $zero /* B94120 80240CE0 0C012701 */ jal func_80049C04 /* B94124 80240CE4 0280302D */ daddu $a2, $s4, $zero /* B94128 80240CE8 0809036A */ j .L80240DA8 /* B9412C 80240CEC 00000000 */ nop +glabel L80240CF0_B94130 /* B94130 80240CF0 0240202D */ daddu $a0, $s2, $zero /* B94134 80240CF4 0260282D */ daddu $a1, $s3, $zero /* B94138 80240CF8 0C01278F */ jal func_80049E3C /* B9413C 80240CFC 0280302D */ daddu $a2, $s4, $zero +glabel L80240D00_B94140 /* B94140 80240D00 0240202D */ daddu $a0, $s2, $zero /* B94144 80240D04 0260282D */ daddu $a1, $s3, $zero /* B94148 80240D08 0C0127B3 */ jal func_80049ECC /* B9414C 80240D0C 0280302D */ daddu $a2, $s4, $zero /* B94150 80240D10 0809036A */ j .L80240DA8 /* B94154 80240D14 00000000 */ nop +glabel L80240D18_B94158 /* B94158 80240D18 0240202D */ daddu $a0, $s2, $zero /* B9415C 80240D1C 0260282D */ daddu $a1, $s3, $zero /* B94160 80240D20 0C0127DF */ jal func_80049F7C /* B94164 80240D24 0280302D */ daddu $a2, $s4, $zero +glabel L80240D28_B94168 /* B94168 80240D28 0240202D */ daddu $a0, $s2, $zero /* B9416C 80240D2C 0260282D */ daddu $a1, $s3, $zero /* B94170 80240D30 0C012849 */ jal func_8004A124 /* B94174 80240D34 0280302D */ daddu $a2, $s4, $zero /* B94178 80240D38 0809036A */ j .L80240DA8 /* B9417C 80240D3C 00000000 */ nop +glabel L80240D40_B94180 /* B94180 80240D40 0240202D */ daddu $a0, $s2, $zero /* B94184 80240D44 0260282D */ daddu $a1, $s3, $zero /* B94188 80240D48 0C0128FA */ jal func_8004A3E8 /* B9418C 80240D4C 0280302D */ daddu $a2, $s4, $zero /* B94190 80240D50 0809036A */ j .L80240DA8 /* B94194 80240D54 00000000 */ nop +glabel L80240D58_B94198 /* B94198 80240D58 0C090140 */ jal mim_01_UnkNpcAIFunc6 /* B9419C 80240D5C 0240202D */ daddu $a0, $s2, $zero +glabel L80240D60_B941A0 /* B941A0 80240D60 0C09015B */ jal mim_01_UnkNpcAIFunc7 /* B941A4 80240D64 0240202D */ daddu $a0, $s2, $zero /* B941A8 80240D68 8E430070 */ lw $v1, 0x70($s2) /* B941AC 80240D6C 24020020 */ addiu $v0, $zero, 0x20 /* B941B0 80240D70 1462000D */ bne $v1, $v0, .L80240DA8 /* B941B4 80240D74 00000000 */ nop +glabel L80240D78_B941B8 /* B941B8 80240D78 0C090177 */ jal mim_01_UnkNpcAIFunc8 /* B941BC 80240D7C 0240202D */ daddu $a0, $s2, $zero /* B941C0 80240D80 8E430070 */ lw $v1, 0x70($s2) /* B941C4 80240D84 24020021 */ addiu $v0, $zero, 0x21 /* B941C8 80240D88 14620007 */ bne $v1, $v0, .L80240DA8 /* B941CC 80240D8C 00000000 */ nop +glabel L80240D90_B941D0 /* B941D0 80240D90 0C0901AD */ jal mim_01_UnkNpcAIFunc5 /* B941D4 80240D94 0240202D */ daddu $a0, $s2, $zero /* B941D8 80240D98 0809036A */ j .L80240DA8 /* B941DC 80240D9C 00000000 */ nop +glabel L80240DA0_B941E0 /* B941E0 80240DA0 0C0129CF */ jal func_8004A73C /* B941E4 80240DA4 0240202D */ daddu $a0, $s2, $zero .L80240DA8: +glabel L80240DA8_B941E8 /* B941E8 80240DA8 8FBF0048 */ lw $ra, 0x48($sp) /* B941EC 80240DAC 8FB50044 */ lw $s5, 0x44($sp) /* B941F0 80240DB0 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240E3C_B9427C.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240E3C_B9427C.s index 38c8e05cab..53a6d8c487 100644 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240E3C_B9427C.s +++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240E3C_B9427C.s @@ -38,7 +38,7 @@ glabel func_80240E3C_B9427C /* B94300 80240EC0 3C01C1A0 */ lui $at, 0xc1a0 /* B94304 80240EC4 44812000 */ mtc1 $at, $f4 /* B94308 80240EC8 44833000 */ mtc1 $v1, $f6 -/* B9430C 80240ECC 00000000 */ nop +/* B9430C 80240ECC 00000000 */ nop /* B94310 80240ED0 468031A0 */ cvt.s.w $f6, $f6 /* B94314 80240ED4 44073000 */ mfc1 $a3, $f6 /* B94318 80240ED8 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240F38_B94378.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240F38_B94378.s index ff44fc56a3..9c7ea769b7 100644 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240F38_B94378.s +++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240F38_B94378.s @@ -39,18 +39,18 @@ glabel func_80240F38_B94378 .L80240FC0: /* B94400 80240FC0 8622008E */ lh $v0, 0x8e($s1) /* B94404 80240FC4 1440025D */ bnez $v0, .L8024193C -/* B94408 80240FC8 00000000 */ nop +/* B94408 80240FC8 00000000 */ nop /* B9440C 80240FCC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* B94410 80240FD0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* B94414 80240FD4 0C00A6C9 */ jal clamp_angle /* B94418 80240FD8 C44C00A8 */ lwc1 $f12, 0xa8($v0) /* B9441C 80240FDC 3C014334 */ lui $at, 0x4334 /* B94420 80240FE0 44811000 */ mtc1 $at, $f2 -/* B94424 80240FE4 00000000 */ nop +/* B94424 80240FE4 00000000 */ nop /* B94428 80240FE8 4602003C */ c.lt.s $f0, $f2 -/* B9442C 80240FEC 00000000 */ nop +/* B9442C 80240FEC 00000000 */ nop /* B94430 80240FF0 45000011 */ bc1f .L80241038 -/* B94434 80240FF4 00000000 */ nop +/* B94434 80240FF4 00000000 */ nop /* B94438 80240FF8 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* B9443C 80240FFC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* B94440 80241000 3C0142B4 */ lui $at, 0x42b4 @@ -85,7 +85,7 @@ glabel func_80240F38_B94378 /* B944B0 80241070 460C0300 */ add.s $f12, $f0, $f12 .L80241074: /* B944B4 80241074 0C00A6C9 */ jal clamp_angle -/* B944B8 80241078 00000000 */ nop +/* B944B8 80241078 00000000 */ nop /* B944BC 8024107C 46000586 */ mov.s $f22, $f0 /* B944C0 80241080 3C014334 */ lui $at, 0x4334 /* B944C4 80241084 44816000 */ mtc1 $at, $f12 @@ -134,7 +134,7 @@ glabel func_80240F38_B94378 /* B94560 80241120 862200A6 */ lh $v0, 0xa6($s1) /* B94564 80241124 8EA30000 */ lw $v1, ($s5) /* B94568 80241128 44824000 */ mtc1 $v0, $f8 -/* B9456C 8024112C 00000000 */ nop +/* B9456C 8024112C 00000000 */ nop /* B94570 80241130 46804220 */ cvt.s.w $f8, $f8 /* B94574 80241134 C4600028 */ lwc1 $f0, 0x28($v1) /* B94578 80241138 44064000 */ mfc1 $a2, $f8 @@ -146,7 +146,7 @@ glabel func_80240F38_B94378 /* B94590 80241150 E6200040 */ swc1 $f0, 0x40($s1) /* B94594 80241154 862200A6 */ lh $v0, 0xa6($s1) /* B94598 80241158 44820000 */ mtc1 $v0, $f0 -/* B9459C 8024115C 00000000 */ nop +/* B9459C 8024115C 00000000 */ nop /* B945A0 80241160 46800020 */ cvt.s.w $f0, $f0 /* B945A4 80241164 4600A000 */ add.s $f0, $f20, $f0 /* B945A8 80241168 4406B000 */ mfc1 $a2, $f22 @@ -155,18 +155,18 @@ glabel func_80240F38_B94378 /* B945B4 80241174 0220202D */ daddu $a0, $s1, $zero /* B945B8 80241178 8EC20088 */ lw $v0, 0x88($s6) /* B945BC 8024117C 1440005D */ bnez $v0, .L802412F4 -/* B945C0 80241180 00000000 */ nop +/* B945C0 80241180 00000000 */ nop /* B945C4 80241184 C6200038 */ lwc1 $f0, 0x38($s1) /* B945C8 80241188 3C018024 */ lui $at, %hi(D_80244788) /* B945CC 8024118C D4244788 */ ldc1 $f4, %lo(D_80244788)($at) /* B945D0 80241190 46000021 */ cvt.d.s $f0, $f0 /* B945D4 80241194 4620203C */ c.lt.d $f4, $f0 -/* B945D8 80241198 00000000 */ nop +/* B945D8 80241198 00000000 */ nop /* B945DC 8024119C 45000005 */ bc1f .L802411B4 -/* B945E0 802411A0 00000000 */ nop +/* B945E0 802411A0 00000000 */ nop /* B945E4 802411A4 3C0143BE */ lui $at, 0x43be /* B945E8 802411A8 44810000 */ mtc1 $at, $f0 -/* B945EC 802411AC 00000000 */ nop +/* B945EC 802411AC 00000000 */ nop /* B945F0 802411B0 E6200038 */ swc1 $f0, 0x38($s1) .L802411B4: /* B945F4 802411B4 C6200038 */ lwc1 $f0, 0x38($s1) @@ -174,50 +174,50 @@ glabel func_80240F38_B94378 /* B945FC 802411BC D4224790 */ ldc1 $f2, %lo(D_80244790)($at) /* B94600 802411C0 46000021 */ cvt.d.s $f0, $f0 /* B94604 802411C4 4622003C */ c.lt.d $f0, $f2 -/* B94608 802411C8 00000000 */ nop +/* B94608 802411C8 00000000 */ nop /* B9460C 802411CC 45000005 */ bc1f .L802411E4 -/* B94610 802411D0 00000000 */ nop +/* B94610 802411D0 00000000 */ nop /* B94614 802411D4 3C01C3BE */ lui $at, 0xc3be /* B94618 802411D8 44810000 */ mtc1 $at, $f0 -/* B9461C 802411DC 00000000 */ nop +/* B9461C 802411DC 00000000 */ nop /* B94620 802411E0 E6200038 */ swc1 $f0, 0x38($s1) .L802411E4: /* B94624 802411E4 C6200040 */ lwc1 $f0, 0x40($s1) /* B94628 802411E8 46000021 */ cvt.d.s $f0, $f0 /* B9462C 802411EC 4620203C */ c.lt.d $f4, $f0 -/* B94630 802411F0 00000000 */ nop +/* B94630 802411F0 00000000 */ nop /* B94634 802411F4 45000005 */ bc1f .L8024120C -/* B94638 802411F8 00000000 */ nop +/* B94638 802411F8 00000000 */ nop /* B9463C 802411FC 3C0143BE */ lui $at, 0x43be /* B94640 80241200 44810000 */ mtc1 $at, $f0 -/* B94644 80241204 00000000 */ nop +/* B94644 80241204 00000000 */ nop /* B94648 80241208 E6200040 */ swc1 $f0, 0x40($s1) .L8024120C: /* B9464C 8024120C C6200040 */ lwc1 $f0, 0x40($s1) /* B94650 80241210 46000021 */ cvt.d.s $f0, $f0 /* B94654 80241214 4622003C */ c.lt.d $f0, $f2 -/* B94658 80241218 00000000 */ nop +/* B94658 80241218 00000000 */ nop /* B9465C 8024121C 45000005 */ bc1f .L80241234 -/* B94660 80241220 00000000 */ nop +/* B94660 80241220 00000000 */ nop /* B94664 80241224 3C01C3BE */ lui $at, 0xc3be /* B94668 80241228 44810000 */ mtc1 $at, $f0 -/* B9466C 8024122C 00000000 */ nop +/* B9466C 8024122C 00000000 */ nop /* B94670 80241230 E6200040 */ swc1 $f0, 0x40($s1) .L80241234: /* B94674 80241234 C6220038 */ lwc1 $f2, 0x38($s1) /* B94678 80241238 46021082 */ mul.s $f2, $f2, $f2 -/* B9467C 8024123C 00000000 */ nop +/* B9467C 8024123C 00000000 */ nop /* B94680 80241240 C6200040 */ lwc1 $f0, 0x40($s1) /* B94684 80241244 46000002 */ mul.s $f0, $f0, $f0 -/* B94688 80241248 00000000 */ nop +/* B94688 80241248 00000000 */ nop /* B9468C 8024124C 46001300 */ add.s $f12, $f2, $f0 /* B94690 80241250 46006004 */ sqrt.s $f0, $f12 /* B94694 80241254 46000032 */ c.eq.s $f0, $f0 -/* B94698 80241258 00000000 */ nop +/* B94698 80241258 00000000 */ nop /* B9469C 8024125C 45010003 */ bc1t .L8024126C -/* B946A0 80241260 00000000 */ nop +/* B946A0 80241260 00000000 */ nop /* B946A4 80241264 0C0187BC */ jal sqrtf -/* B946A8 80241268 00000000 */ nop +/* B946A8 80241268 00000000 */ nop .L8024126C: /* B946AC 8024126C 8E260038 */ lw $a2, 0x38($s1) /* B946B0 80241270 8E270040 */ lw $a3, 0x40($s1) @@ -232,7 +232,7 @@ glabel func_80240F38_B94378 /* B946D4 80241294 D4204798 */ ldc1 $f0, %lo(D_80244798)($at) /* B946D8 80241298 460010A1 */ cvt.d.s $f2, $f2 /* B946DC 8024129C 4620103C */ c.lt.d $f2, $f0 -/* B946E0 802412A0 00000000 */ nop +/* B946E0 802412A0 00000000 */ nop /* B946E4 802412A4 45000004 */ bc1f .L802412B8 /* B946E8 802412A8 0200202D */ daddu $a0, $s0, $zero /* B946EC 802412AC 3C064398 */ lui $a2, 0x4398 @@ -242,9 +242,9 @@ glabel func_80240F38_B94378 /* B946F8 802412B8 3C018024 */ lui $at, %hi(D_802447A0) /* B946FC 802412BC D42047A0 */ ldc1 $f0, %lo(D_802447A0)($at) /* B94700 802412C0 4622003C */ c.lt.d $f0, $f2 -/* B94704 802412C4 00000000 */ nop +/* B94704 802412C4 00000000 */ nop /* B94708 802412C8 450000FA */ bc1f .L802416B4 -/* B9470C 802412CC 00000000 */ nop +/* B9470C 802412CC 00000000 */ nop /* B94710 802412D0 3C0643BB */ lui $a2, 0x43bb /* B94714 802412D4 34C68000 */ ori $a2, $a2, 0x8000 .L802412D8: @@ -254,7 +254,7 @@ glabel func_80240F38_B94378 /* B94724 802412E4 0C00A7E7 */ jal add_vec2D_polar /* B94728 802412E8 E6340040 */ swc1 $f20, 0x40($s1) /* B9472C 802412EC 080905AD */ j .L802416B4 -/* B94730 802412F0 00000000 */ nop +/* B94730 802412F0 00000000 */ nop .L802412F4: /* B94734 802412F4 8E220000 */ lw $v0, ($s1) /* B94738 802412F8 30420040 */ andi $v0, $v0, 0x40 @@ -281,13 +281,13 @@ glabel func_80240F38_B94378 /* B9478C 8024134C 862200A8 */ lh $v0, 0xa8($s1) /* B94790 80241350 0260302D */ daddu $a2, $s3, $zero /* B94794 80241354 44820000 */ mtc1 $v0, $f0 -/* B94798 80241358 00000000 */ nop +/* B94798 80241358 00000000 */ nop /* B9479C 8024135C 46800020 */ cvt.s.w $f0, $f0 /* B947A0 80241360 E7A00018 */ swc1 $f0, 0x18($sp) /* B947A4 80241364 862200A6 */ lh $v0, 0xa6($s1) /* B947A8 80241368 27B00028 */ addiu $s0, $sp, 0x28 /* B947AC 8024136C 44820000 */ mtc1 $v0, $f0 -/* B947B0 80241370 00000000 */ nop +/* B947B0 80241370 00000000 */ nop /* B947B4 80241374 46800020 */ cvt.s.w $f0, $f0 /* B947B8 80241378 E7A0001C */ swc1 $f0, 0x1c($sp) /* B947BC 8024137C 8E240080 */ lw $a0, 0x80($s1) @@ -311,13 +311,13 @@ glabel func_80240F38_B94378 /* B94804 802413C4 E7B60014 */ swc1 $f22, 0x14($sp) /* B94808 802413C8 862200A8 */ lh $v0, 0xa8($s1) /* B9480C 802413CC 44820000 */ mtc1 $v0, $f0 -/* B94810 802413D0 00000000 */ nop +/* B94810 802413D0 00000000 */ nop /* B94814 802413D4 46800020 */ cvt.s.w $f0, $f0 /* B94818 802413D8 E7A00018 */ swc1 $f0, 0x18($sp) /* B9481C 802413DC 862200A6 */ lh $v0, 0xa6($s1) /* B94820 802413E0 0260302D */ daddu $a2, $s3, $zero /* B94824 802413E4 44820000 */ mtc1 $v0, $f0 -/* B94828 802413E8 00000000 */ nop +/* B94828 802413E8 00000000 */ nop /* B9482C 802413EC 46800020 */ cvt.s.w $f0, $f0 /* B94830 802413F0 E7A0001C */ swc1 $f0, 0x1c($sp) /* B94834 802413F4 8E240080 */ lw $a0, 0x80($s1) @@ -347,32 +347,32 @@ glabel func_80240F38_B94378 /* B94894 80241454 0C0372DF */ jal func_800DCB7C /* B94898 80241458 0040802D */ daddu $s0, $v0, $zero /* B9489C 8024145C 1600001C */ bnez $s0, .L802414D0 -/* B948A0 80241460 00000000 */ nop +/* B948A0 80241460 00000000 */ nop /* B948A4 80241464 1040001A */ beqz $v0, .L802414D0 -/* B948A8 80241468 00000000 */ nop +/* B948A8 80241468 00000000 */ nop /* B948AC 8024146C C7A20038 */ lwc1 $f2, 0x38($sp) /* B948B0 80241470 3C014054 */ lui $at, 0x4054 /* B948B4 80241474 44810800 */ mtc1 $at, $f1 /* B948B8 80241478 44800000 */ mtc1 $zero, $f0 /* B948BC 8024147C 460010A1 */ cvt.d.s $f2, $f2 /* B948C0 80241480 4622003C */ c.lt.d $f0, $f2 -/* B948C4 80241484 00000000 */ nop +/* B948C4 80241484 00000000 */ nop /* B948C8 80241488 45000011 */ bc1f .L802414D0 -/* B948CC 8024148C 00000000 */ nop +/* B948CC 8024148C 00000000 */ nop /* B948D0 80241490 3C01405E */ lui $at, 0x405e /* B948D4 80241494 44810800 */ mtc1 $at, $f1 /* B948D8 80241498 44800000 */ mtc1 $zero, $f0 -/* B948DC 8024149C 00000000 */ nop +/* B948DC 8024149C 00000000 */ nop /* B948E0 802414A0 4620103C */ c.lt.d $f2, $f0 -/* B948E4 802414A4 00000000 */ nop +/* B948E4 802414A4 00000000 */ nop /* B948E8 802414A8 45000009 */ bc1f .L802414D0 -/* B948EC 802414AC 00000000 */ nop +/* B948EC 802414AC 00000000 */ nop /* B948F0 802414B0 C622003C */ lwc1 $f2, 0x3c($s1) /* B948F4 802414B4 C7A00030 */ lwc1 $f0, 0x30($sp) /* B948F8 802414B8 46001032 */ c.eq.s $f2, $f0 -/* B948FC 802414BC 00000000 */ nop +/* B948FC 802414BC 00000000 */ nop /* B94900 802414C0 45010003 */ bc1t .L802414D0 -/* B94904 802414C4 00000000 */ nop +/* B94904 802414C4 00000000 */ nop /* B94908 802414C8 080905AD */ j .L802416B4 /* B9490C 802414CC 241E0001 */ addiu $fp, $zero, 1 .L802414D0: @@ -396,13 +396,13 @@ glabel func_80240F38_B94378 /* B94954 80241514 862200A8 */ lh $v0, 0xa8($s1) /* B94958 80241518 27A50020 */ addiu $a1, $sp, 0x20 /* B9495C 8024151C 44820000 */ mtc1 $v0, $f0 -/* B94960 80241520 00000000 */ nop +/* B94960 80241520 00000000 */ nop /* B94964 80241524 46800020 */ cvt.s.w $f0, $f0 /* B94968 80241528 E7A00018 */ swc1 $f0, 0x18($sp) /* B9496C 8024152C 862200A6 */ lh $v0, 0xa6($s1) /* B94970 80241530 27A60024 */ addiu $a2, $sp, 0x24 /* B94974 80241534 44820000 */ mtc1 $v0, $f0 -/* B94978 80241538 00000000 */ nop +/* B94978 80241538 00000000 */ nop /* B9497C 8024153C 46800020 */ cvt.s.w $f0, $f0 /* B94980 80241540 E7A0001C */ swc1 $f0, 0x1c($sp) /* B94984 80241544 8E240080 */ lw $a0, 0x80($s1) @@ -420,7 +420,7 @@ glabel func_80240F38_B94378 /* B949B4 80241574 862200A6 */ lh $v0, 0xa6($s1) /* B949B8 80241578 4407C000 */ mfc1 $a3, $f24 /* B949BC 8024157C 44824000 */ mtc1 $v0, $f8 -/* B949C0 80241580 00000000 */ nop +/* B949C0 80241580 00000000 */ nop /* B949C4 80241584 46804220 */ cvt.s.w $f8, $f8 /* B949C8 80241588 C4600028 */ lwc1 $f0, 0x28($v1) /* B949CC 8024158C 44064000 */ mfc1 $a2, $f8 @@ -432,7 +432,7 @@ glabel func_80240F38_B94378 /* B949E4 802415A4 E6200040 */ swc1 $f0, 0x40($s1) /* B949E8 802415A8 862200A6 */ lh $v0, 0xa6($s1) /* B949EC 802415AC 44820000 */ mtc1 $v0, $f0 -/* B949F0 802415B0 00000000 */ nop +/* B949F0 802415B0 00000000 */ nop /* B949F4 802415B4 46800020 */ cvt.s.w $f0, $f0 /* B949F8 802415B8 080905A9 */ j .L802416A4 /* B949FC 802415BC 4600A500 */ add.s $f20, $f20, $f0 @@ -454,20 +454,20 @@ glabel func_80240F38_B94378 /* B94A38 802415F8 E7B60014 */ swc1 $f22, 0x14($sp) /* B94A3C 802415FC 862200A8 */ lh $v0, 0xa8($s1) /* B94A40 80241600 44820000 */ mtc1 $v0, $f0 -/* B94A44 80241604 00000000 */ nop +/* B94A44 80241604 00000000 */ nop /* B94A48 80241608 46800020 */ cvt.s.w $f0, $f0 /* B94A4C 8024160C E7A00018 */ swc1 $f0, 0x18($sp) /* B94A50 80241610 862200A6 */ lh $v0, 0xa6($s1) /* B94A54 80241614 27A60024 */ addiu $a2, $sp, 0x24 /* B94A58 80241618 44820000 */ mtc1 $v0, $f0 -/* B94A5C 8024161C 00000000 */ nop +/* B94A5C 8024161C 00000000 */ nop /* B94A60 80241620 46800020 */ cvt.s.w $f0, $f0 /* B94A64 80241624 E7A0001C */ swc1 $f0, 0x1c($sp) /* B94A68 80241628 8E240080 */ lw $a0, 0x80($s1) /* B94A6C 8024162C 0C037711 */ jal func_800DDC44 /* B94A70 80241630 27A70028 */ addiu $a3, $sp, 0x28 /* B94A74 80241634 1040001F */ beqz $v0, .L802416B4 -/* B94A78 80241638 00000000 */ nop +/* B94A78 80241638 00000000 */ nop /* B94A7C 8024163C 8FA60020 */ lw $a2, 0x20($sp) /* B94A80 80241640 8EA20000 */ lw $v0, ($s5) /* B94A84 80241644 8FA70028 */ lw $a3, 0x28($sp) @@ -479,7 +479,7 @@ glabel func_80240F38_B94378 /* B94A9C 8024165C 862200A6 */ lh $v0, 0xa6($s1) /* B94AA0 80241660 4407C000 */ mfc1 $a3, $f24 /* B94AA4 80241664 44824000 */ mtc1 $v0, $f8 -/* B94AA8 80241668 00000000 */ nop +/* B94AA8 80241668 00000000 */ nop /* B94AAC 8024166C 46804220 */ cvt.s.w $f8, $f8 /* B94AB0 80241670 C4600028 */ lwc1 $f0, 0x28($v1) /* B94AB4 80241674 44064000 */ mfc1 $a2, $f8 @@ -491,7 +491,7 @@ glabel func_80240F38_B94378 /* B94ACC 8024168C E6200040 */ swc1 $f0, 0x40($s1) /* B94AD0 80241690 862200A6 */ lh $v0, 0xa6($s1) /* B94AD4 80241694 44820000 */ mtc1 $v0, $f0 -/* B94AD8 80241698 00000000 */ nop +/* B94AD8 80241698 00000000 */ nop /* B94ADC 8024169C 46800020 */ cvt.s.w $f0, $f0 /* B94AE0 802416A0 4600A500 */ add.s $f20, $f20, $f0 .L802416A4: @@ -520,14 +520,14 @@ glabel func_80240F38_B94378 /* B94B38 802416F8 0C0123F5 */ jal is_point_within_region /* B94B3C 802416FC 26330040 */ addiu $s3, $s1, 0x40 /* B94B40 80241700 1040005A */ beqz $v0, .L8024186C -/* B94B44 80241704 00000000 */ nop +/* B94B44 80241704 00000000 */ nop /* B94B48 80241708 8E430004 */ lw $v1, 4($s2) /* B94B4C 8024170C 10600005 */ beqz $v1, .L80241724 /* B94B50 80241710 24020001 */ addiu $v0, $zero, 1 /* B94B54 80241714 10620029 */ beq $v1, $v0, .L802417BC -/* B94B58 80241718 00000000 */ nop +/* B94B58 80241718 00000000 */ nop /* B94B5C 8024171C 0809061B */ j .L8024186C -/* B94B60 80241720 00000000 */ nop +/* B94B60 80241720 00000000 */ nop .L80241724: /* B94B64 80241724 C6480008 */ lwc1 $f8, 8($s2) /* B94B68 80241728 46804220 */ cvt.s.w $f8, $f8 @@ -538,11 +538,11 @@ glabel func_80240F38_B94378 /* B94B7C 8024173C C62E0040 */ lwc1 $f14, 0x40($s1) /* B94B80 80241740 44074000 */ mfc1 $a3, $f8 /* B94B84 80241744 0C00A7B5 */ jal dist2D -/* B94B88 80241748 00000000 */ nop +/* B94B88 80241748 00000000 */ nop /* B94B8C 8024174C C6420010 */ lwc1 $f2, 0x10($s2) /* B94B90 80241750 468010A0 */ cvt.s.w $f2, $f2 /* B94B94 80241754 4600103C */ c.lt.s $f2, $f0 -/* B94B98 80241758 00000000 */ nop +/* B94B98 80241758 00000000 */ nop /* B94B9C 8024175C 45000043 */ bc1f .L8024186C /* B94BA0 80241760 E7A00038 */ swc1 $f0, 0x38($sp) /* B94BA4 80241764 C64C0008 */ lwc1 $f12, 8($s2) @@ -566,17 +566,17 @@ glabel func_80240F38_B94378 /* B94BEC 802417AC 0C00A7E7 */ jal add_vec2D_polar /* B94BF0 802417B0 0260282D */ daddu $a1, $s3, $zero /* B94BF4 802417B4 0809061B */ j .L8024186C -/* B94BF8 802417B8 00000000 */ nop +/* B94BF8 802417B8 00000000 */ nop .L802417BC: /* B94BFC 802417BC 8E420008 */ lw $v0, 8($s2) /* B94C00 802417C0 8E430010 */ lw $v1, 0x10($s2) /* B94C04 802417C4 C6200038 */ lwc1 $f0, 0x38($s1) /* B94C08 802417C8 00431021 */ addu $v0, $v0, $v1 /* B94C0C 802417CC 44821000 */ mtc1 $v0, $f2 -/* B94C10 802417D0 00000000 */ nop +/* B94C10 802417D0 00000000 */ nop /* B94C14 802417D4 468010A0 */ cvt.s.w $f2, $f2 /* B94C18 802417D8 4600103C */ c.lt.s $f2, $f0 -/* B94C1C 802417DC 00000000 */ nop +/* B94C1C 802417DC 00000000 */ nop /* B94C20 802417E0 45030001 */ bc1tl .L802417E8 /* B94C24 802417E4 E6220038 */ swc1 $f2, 0x38($s1) .L802417E8: @@ -585,10 +585,10 @@ glabel func_80240F38_B94378 /* B94C30 802417F0 C6200038 */ lwc1 $f0, 0x38($s1) /* B94C34 802417F4 00431023 */ subu $v0, $v0, $v1 /* B94C38 802417F8 44821000 */ mtc1 $v0, $f2 -/* B94C3C 802417FC 00000000 */ nop +/* B94C3C 802417FC 00000000 */ nop /* B94C40 80241800 468010A0 */ cvt.s.w $f2, $f2 /* B94C44 80241804 4602003C */ c.lt.s $f0, $f2 -/* B94C48 80241808 00000000 */ nop +/* B94C48 80241808 00000000 */ nop /* B94C4C 8024180C 45030001 */ bc1tl .L80241814 /* B94C50 80241810 E6220038 */ swc1 $f2, 0x38($s1) .L80241814: @@ -597,10 +597,10 @@ glabel func_80240F38_B94378 /* B94C5C 8024181C C6200040 */ lwc1 $f0, 0x40($s1) /* B94C60 80241820 00431021 */ addu $v0, $v0, $v1 /* B94C64 80241824 44821000 */ mtc1 $v0, $f2 -/* B94C68 80241828 00000000 */ nop +/* B94C68 80241828 00000000 */ nop /* B94C6C 8024182C 468010A0 */ cvt.s.w $f2, $f2 /* B94C70 80241830 4600103C */ c.lt.s $f2, $f0 -/* B94C74 80241834 00000000 */ nop +/* B94C74 80241834 00000000 */ nop /* B94C78 80241838 45030001 */ bc1tl .L80241840 /* B94C7C 8024183C E6220040 */ swc1 $f2, 0x40($s1) .L80241840: @@ -609,21 +609,21 @@ glabel func_80240F38_B94378 /* B94C88 80241848 C6200040 */ lwc1 $f0, 0x40($s1) /* B94C8C 8024184C 00431023 */ subu $v0, $v0, $v1 /* B94C90 80241850 44821000 */ mtc1 $v0, $f2 -/* B94C94 80241854 00000000 */ nop +/* B94C94 80241854 00000000 */ nop /* B94C98 80241858 468010A0 */ cvt.s.w $f2, $f2 /* B94C9C 8024185C 4602003C */ c.lt.s $f0, $f2 -/* B94CA0 80241860 00000000 */ nop +/* B94CA0 80241860 00000000 */ nop /* B94CA4 80241864 45030001 */ bc1tl .L8024186C /* B94CA8 80241868 E6220040 */ swc1 $f2, 0x40($s1) .L8024186C: /* B94CAC 8024186C 16E0001F */ bnez $s7, .L802418EC -/* B94CB0 80241870 00000000 */ nop +/* B94CB0 80241870 00000000 */ nop /* B94CB4 80241874 8E220000 */ lw $v0, ($s1) /* B94CB8 80241878 30420008 */ andi $v0, $v0, 8 /* B94CBC 8024187C 10400003 */ beqz $v0, .L8024188C /* B94CC0 80241880 27A50020 */ addiu $a1, $sp, 0x20 /* B94CC4 80241884 13C00019 */ beqz $fp, .L802418EC -/* B94CC8 80241888 00000000 */ nop +/* B94CC8 80241888 00000000 */ nop .L8024188C: /* B94CCC 8024188C 27A60024 */ addiu $a2, $sp, 0x24 /* B94CD0 80241890 27A20038 */ addiu $v0, $sp, 0x38 @@ -646,7 +646,7 @@ glabel func_80240F38_B94378 /* B94D14 802418D4 0C0372DF */ jal func_800DCB7C /* B94D18 802418D8 27A70028 */ addiu $a3, $sp, 0x28 /* B94D1C 802418DC 10400003 */ beqz $v0, .L802418EC -/* B94D20 802418E0 00000000 */ nop +/* B94D20 802418E0 00000000 */ nop /* B94D24 802418E4 C7A00024 */ lwc1 $f0, 0x24($sp) /* B94D28 802418E8 E620003C */ swc1 $f0, 0x3c($s1) .L802418EC: diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241978_B94DB8.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241978_B94DB8.s index f156699de3..02fe1985da 100644 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241978_B94DB8.s +++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241978_B94DB8.s @@ -27,7 +27,7 @@ glabel func_80241978_B94DB8 .L802419D0: /* B94E10 802419D0 8482008E */ lh $v0, 0x8e($a0) /* B94E14 802419D4 14400007 */ bnez $v0, .L802419F4 -/* B94E18 802419D8 00000000 */ nop +/* B94E18 802419D8 00000000 */ nop /* B94E1C 802419DC 8E0200CC */ lw $v0, 0xcc($s0) /* B94E20 802419E0 8C420028 */ lw $v0, 0x28($v0) /* B94E24 802419E4 A480008E */ sh $zero, 0x8e($a0) diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241A08_B94E48.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241A08_B94E48.s index 0088b66417..61c92b8a4a 100644 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241A08_B94E48.s +++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241A08_B94E48.s @@ -18,7 +18,7 @@ glabel func_80241A08_B94E48 /* B94E7C 80241A3C 8E0300A0 */ lw $v1, 0xa0($s0) /* B94E80 80241A40 00021403 */ sra $v0, $v0, 0x10 /* B94E84 80241A44 14430004 */ bne $v0, $v1, .L80241A58 -/* B94E88 80241A48 00000000 */ nop +/* B94E88 80241A48 00000000 */ nop /* B94E8C 80241A4C 8E0200CC */ lw $v0, 0xcc($s0) /* B94E90 80241A50 8C42002C */ lw $v0, 0x2c($v0) /* B94E94 80241A54 ACA20028 */ sw $v0, 0x28($a1) @@ -47,7 +47,7 @@ glabel func_80241A08_B94E48 /* B94EE8 80241AA8 3C01C1A0 */ lui $at, 0xc1a0 /* B94EEC 80241AAC 44812000 */ mtc1 $at, $f4 /* B94EF0 80241AB0 44833000 */ mtc1 $v1, $f6 -/* B94EF4 80241AB4 00000000 */ nop +/* B94EF4 80241AB4 00000000 */ nop /* B94EF8 80241AB8 468031A0 */ cvt.s.w $f6, $f6 /* B94EFC 80241ABC 8C420000 */ lw $v0, ($v0) /* B94F00 80241AC0 44073000 */ mfc1 $a3, $f6 diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241B08_B94F48.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241B08_B94F48.s index 6bf2e96587..6de02ba560 100644 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241B08_B94F48.s +++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241B08_B94F48.s @@ -16,7 +16,7 @@ glabel func_80241B08_B94F48 /* B94F74 80241B34 A462008E */ sh $v0, 0x8e($v1) /* B94F78 80241B38 00021400 */ sll $v0, $v0, 0x10 /* B94F7C 80241B3C 14400005 */ bnez $v0, .L80241B54 -/* B94F80 80241B40 00000000 */ nop +/* B94F80 80241B40 00000000 */ nop /* B94F84 80241B44 960200AA */ lhu $v0, 0xaa($s0) /* B94F88 80241B48 A462008E */ sh $v0, 0x8e($v1) /* B94F8C 80241B4C 2402000E */ addiu $v0, $zero, 0xe diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241B68_B94FA8.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241B68_B94FA8.s index 460b777e07..6341d56de5 100644 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241B68_B94FA8.s +++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241B68_B94FA8.s @@ -42,7 +42,7 @@ glabel func_80241B68_B94FA8 /* B9503C 80241BFC 2402000F */ addiu $v0, $zero, 0xf /* B95040 80241C00 AFA2001C */ sw $v0, 0x1c($sp) /* B95044 80241C04 44833000 */ mtc1 $v1, $f6 -/* B95048 80241C08 00000000 */ nop +/* B95048 80241C08 00000000 */ nop /* B9504C 80241C0C 468031A0 */ cvt.s.w $f6, $f6 /* B95050 80241C10 44073000 */ mfc1 $a3, $f6 /* B95054 80241C14 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241C54_B95094.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241C54_B95094.s index e13e8d78d4..7baa383cf3 100644 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241C54_B95094.s +++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241C54_B95094.s @@ -46,7 +46,7 @@ glabel func_80241C54_B95094 /* B95138 80241CF8 8E2200B0 */ lw $v0, 0xb0($s1) /* B9513C 80241CFC 30420004 */ andi $v0, $v0, 4 /* B95140 80241D00 10400011 */ beqz $v0, .L80241D48 -/* B95144 80241D04 00000000 */ nop +/* B95144 80241D04 00000000 */ nop .L80241D08: /* B95148 80241D08 AE400070 */ sw $zero, 0x70($s2) /* B9514C 80241D0C A6A0008E */ sh $zero, 0x8e($s5) @@ -78,12 +78,12 @@ glabel func_80241C54_B95094 /* B951B0 80241D70 10600013 */ beqz $v1, .L80241DC0 /* B951B4 80241D74 0240202D */ daddu $a0, $s2, $zero /* B951B8 80241D78 0809079F */ j .L80241E7C -/* B951BC 80241D7C 00000000 */ nop +/* B951BC 80241D7C 00000000 */ nop .L80241D80: /* B951C0 80241D80 10620018 */ beq $v1, $v0, .L80241DE4 /* B951C4 80241D84 0240202D */ daddu $a0, $s2, $zero /* B951C8 80241D88 0809079F */ j .L80241E7C -/* B951CC 80241D8C 00000000 */ nop +/* B951CC 80241D8C 00000000 */ nop .L80241D90: /* B951D0 80241D90 2402000D */ addiu $v0, $zero, 0xd /* B951D4 80241D94 10620029 */ beq $v1, $v0, .L80241E3C @@ -94,9 +94,9 @@ glabel func_80241C54_B95094 /* B951E8 80241DA8 1062002D */ beq $v1, $v0, .L80241E60 /* B951EC 80241DAC 24020063 */ addiu $v0, $zero, 0x63 /* B951F0 80241DB0 10620030 */ beq $v1, $v0, .L80241E74 -/* B951F4 80241DB4 00000000 */ nop +/* B951F4 80241DB4 00000000 */ nop /* B951F8 80241DB8 0809079F */ j .L80241E7C -/* B951FC 80241DBC 00000000 */ nop +/* B951FC 80241DBC 00000000 */ nop .L80241DC0: /* B95200 80241DC0 0260282D */ daddu $a1, $s3, $zero /* B95204 80241DC4 0C090374 */ jal func_80240DD0_B94210 @@ -107,14 +107,14 @@ glabel func_80241C54_B95094 /* B95214 80241DD4 0C09038F */ jal func_80240E3C_B9427C /* B95218 80241DD8 0280302D */ daddu $a2, $s4, $zero /* B9521C 80241DDC 0809079F */ j .L80241E7C -/* B95220 80241DE0 00000000 */ nop +/* B95220 80241DE0 00000000 */ nop .L80241DE4: /* B95224 80241DE4 0260282D */ daddu $a1, $s3, $zero /* B95228 80241DE8 0C0903CE */ jal func_80240F38_B94378 /* B9522C 80241DEC 0280302D */ daddu $a2, $s4, $zero /* B95230 80241DF0 8E420070 */ lw $v0, 0x70($s2) /* B95234 80241DF4 14500021 */ bne $v0, $s0, .L80241E7C -/* B95238 80241DF8 00000000 */ nop +/* B95238 80241DF8 00000000 */ nop .L80241DFC: /* B9523C 80241DFC 0240202D */ daddu $a0, $s2, $zero /* B95240 80241E00 0260282D */ daddu $a1, $s3, $zero @@ -123,7 +123,7 @@ glabel func_80241C54_B95094 /* B9524C 80241E0C 8E430070 */ lw $v1, 0x70($s2) /* B95250 80241E10 2402000C */ addiu $v0, $zero, 0xc /* B95254 80241E14 14620019 */ bne $v1, $v0, .L80241E7C -/* B95258 80241E18 00000000 */ nop +/* B95258 80241E18 00000000 */ nop /* B9525C 80241E1C 0240202D */ daddu $a0, $s2, $zero .L80241E20: /* B95260 80241E20 0260282D */ daddu $a1, $s3, $zero @@ -132,7 +132,7 @@ glabel func_80241C54_B95094 /* B9526C 80241E2C 8E430070 */ lw $v1, 0x70($s2) /* B95270 80241E30 2402000D */ addiu $v0, $zero, 0xd /* B95274 80241E34 14620011 */ bne $v1, $v0, .L80241E7C -/* B95278 80241E38 00000000 */ nop +/* B95278 80241E38 00000000 */ nop .L80241E3C: /* B9527C 80241E3C 0240202D */ daddu $a0, $s2, $zero /* B95280 80241E40 0260282D */ daddu $a1, $s3, $zero @@ -141,14 +141,14 @@ glabel func_80241C54_B95094 /* B9528C 80241E4C 8E430070 */ lw $v1, 0x70($s2) /* B95290 80241E50 2402000E */ addiu $v0, $zero, 0xe /* B95294 80241E54 14620009 */ bne $v1, $v0, .L80241E7C -/* B95298 80241E58 00000000 */ nop +/* B95298 80241E58 00000000 */ nop /* B9529C 80241E5C 0240202D */ daddu $a0, $s2, $zero .L80241E60: /* B952A0 80241E60 0260282D */ daddu $a1, $s3, $zero /* B952A4 80241E64 0C0906DA */ jal func_80241B68_B94FA8 /* B952A8 80241E68 0280302D */ daddu $a2, $s4, $zero /* B952AC 80241E6C 0809079F */ j .L80241E7C -/* B952B0 80241E70 00000000 */ nop +/* B952B0 80241E70 00000000 */ nop .L80241E74: /* B952B4 80241E74 0C0129CF */ jal func_8004A73C /* B952B8 80241E78 0240202D */ daddu $a0, $s2, $zero @@ -163,6 +163,6 @@ glabel func_80241C54_B95094 /* B952D8 80241E98 0000102D */ daddu $v0, $zero, $zero /* B952DC 80241E9C 03E00008 */ jr $ra /* B952E0 80241EA0 27BD0050 */ addiu $sp, $sp, 0x50 -/* B952E4 80241EA4 00000000 */ nop -/* B952E8 80241EA8 00000000 */ nop -/* B952EC 80241EAC 00000000 */ nop +/* B952E4 80241EA4 00000000 */ nop +/* B952E8 80241EA8 00000000 */ nop +/* B952EC 80241EAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C00/func_80240000_B97C00.s b/asm/nonmatchings/world/area_mim/mim_02/B97C00/func_80240000_B97C00.s index 257e3ecc23..b3d380caf8 100644 --- a/asm/nonmatchings/world/area_mim/mim_02/B97C00/func_80240000_B97C00.s +++ b/asm/nonmatchings/world/area_mim/mim_02/B97C00/func_80240000_B97C00.s @@ -5,7 +5,7 @@ glabel func_80240000_B97C00 /* B97C00 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B97C04 80240004 AFBF0010 */ sw $ra, 0x10($sp) /* B97C08 80240008 0C046ED4 */ jal enable_world_fog -/* B97C0C 8024000C 00000000 */ nop +/* B97C0C 8024000C 00000000 */ nop /* B97C10 80240010 240403DE */ addiu $a0, $zero, 0x3de /* B97C14 80240014 0C046EDD */ jal set_world_fog_dist /* B97C18 80240018 240503E8 */ addiu $a1, $zero, 0x3e8 @@ -15,7 +15,7 @@ glabel func_80240000_B97C00 /* B97C28 80240028 0C046EE2 */ jal set_world_fog_color /* B97C2C 8024002C 240700FF */ addiu $a3, $zero, 0xff /* B97C30 80240030 0C048BFB */ jal enable_entity_fog -/* B97C34 80240034 00000000 */ nop +/* B97C34 80240034 00000000 */ nop /* B97C38 80240038 240403DE */ addiu $a0, $zero, 0x3de /* B97C3C 8024003C 0C048C04 */ jal set_entity_fog_dist /* B97C40 80240040 240503E8 */ addiu $a1, $zero, 0x3e8 @@ -28,5 +28,5 @@ glabel func_80240000_B97C00 /* B97C5C 8024005C 24020002 */ addiu $v0, $zero, 2 /* B97C60 80240060 03E00008 */ jr $ra /* B97C64 80240064 27BD0018 */ addiu $sp, $sp, 0x18 -/* B97C68 80240068 00000000 */ nop -/* B97C6C 8024006C 00000000 */ nop +/* B97C68 80240068 00000000 */ nop +/* B97C6C 8024006C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240070_B97C70.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240070_B97C70.s index ef574944bc..20839cd1b7 100644 --- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240070_B97C70.s +++ b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240070_B97C70.s @@ -30,7 +30,7 @@ glabel func_80240070_B97C70 /* B97CD4 802400D4 3C05B000 */ lui $a1, 0xb000 /* B97CD8 802400D8 34A50017 */ ori $a1, $a1, 0x17 /* B97CDC 802400DC 44820000 */ mtc1 $v0, $f0 -/* B97CE0 802400E0 00000000 */ nop +/* B97CE0 802400E0 00000000 */ nop /* B97CE4 802400E4 46800021 */ cvt.d.w $f0, $f0 /* B97CE8 802400E8 3C014024 */ lui $at, 0x4024 /* B97CEC 802400EC 44811800 */ mtc1 $at, $f3 @@ -68,7 +68,7 @@ glabel func_80240070_B97C70 /* B97D6C 8024016C 0C0123F5 */ jal is_point_within_region /* B97D70 80240170 8E070038 */ lw $a3, 0x38($s0) /* B97D74 80240174 10400035 */ beqz $v0, .L8024024C -/* B97D78 80240178 00000000 */ nop +/* B97D78 80240178 00000000 */ nop /* B97D7C 8024017C C60C0038 */ lwc1 $f12, 0x38($s0) /* B97D80 80240180 3C0141C8 */ lui $at, 0x41c8 /* B97D84 80240184 4481B000 */ mtc1 $at, $f22 @@ -99,13 +99,13 @@ glabel func_80240070_B97C70 /* B97DE4 802401E4 860200A8 */ lh $v0, 0xa8($s0) /* B97DE8 802401E8 27A50020 */ addiu $a1, $sp, 0x20 /* B97DEC 802401EC 44820000 */ mtc1 $v0, $f0 -/* B97DF0 802401F0 00000000 */ nop +/* B97DF0 802401F0 00000000 */ nop /* B97DF4 802401F4 46800020 */ cvt.s.w $f0, $f0 /* B97DF8 802401F8 E7A00018 */ swc1 $f0, 0x18($sp) /* B97DFC 802401FC 860200A6 */ lh $v0, 0xa6($s0) /* B97E00 80240200 27A60024 */ addiu $a2, $sp, 0x24 /* B97E04 80240204 44820000 */ mtc1 $v0, $f0 -/* B97E08 80240208 00000000 */ nop +/* B97E08 80240208 00000000 */ nop /* B97E0C 8024020C 46800020 */ cvt.s.w $f0, $f0 /* B97E10 80240210 E7A0001C */ swc1 $f0, 0x1c($sp) /* B97E14 80240214 8E040080 */ lw $a0, 0x80($s0) @@ -121,13 +121,13 @@ glabel func_80240070_B97C70 /* B97E3C 8024023C 1440FFE6 */ bnez $v0, .L802401D8 /* B97E40 80240240 E600000C */ swc1 $f0, 0xc($s0) /* B97E44 80240244 0809009F */ j .L8024027C -/* B97E48 80240248 00000000 */ nop +/* B97E48 80240248 00000000 */ nop .L8024024C: /* B97E4C 8024024C 0C00A67F */ jal rand_int /* B97E50 80240250 2404003C */ addiu $a0, $zero, 0x3c /* B97E54 80240254 C60C000C */ lwc1 $f12, 0xc($s0) /* B97E58 80240258 44820000 */ mtc1 $v0, $f0 -/* B97E5C 8024025C 00000000 */ nop +/* B97E5C 8024025C 00000000 */ nop /* B97E60 80240260 46800020 */ cvt.s.w $f0, $f0 /* B97E64 80240264 46006300 */ add.s $f12, $f12, $f0 /* B97E68 80240268 3C0141F0 */ lui $at, 0x41f0 diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802402A0_B97EA0.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802402A0_B97EA0.s index ed023e9940..2d64925d4e 100644 --- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802402A0_B97EA0.s +++ b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802402A0_B97EA0.s @@ -43,7 +43,7 @@ glabel func_802402A0_B97EA0 /* B97F38 80240338 2402000F */ addiu $v0, $zero, 0xf /* B97F3C 8024033C AFA2001C */ sw $v0, 0x1c($sp) /* B97F40 80240340 44835000 */ mtc1 $v1, $f10 -/* B97F44 80240344 00000000 */ nop +/* B97F44 80240344 00000000 */ nop /* B97F48 80240348 468052A0 */ cvt.s.w $f10, $f10 /* B97F4C 8024034C 44075000 */ mfc1 $a3, $f10 /* B97F50 80240350 27A20028 */ addiu $v0, $sp, 0x28 @@ -78,7 +78,7 @@ glabel func_802402A0_B97EA0 /* B97FB8 802403B8 44801800 */ mtc1 $zero, $f3 /* B97FBC 802403BC 46000021 */ cvt.d.s $f0, $f0 /* B97FC0 802403C0 4620103C */ c.lt.d $f2, $f0 -/* B97FC4 802403C4 00000000 */ nop +/* B97FC4 802403C4 00000000 */ nop /* B97FC8 802403C8 45000025 */ bc1f .L80240460 /* B97FCC 802403CC 27A5002C */ addiu $a1, $sp, 0x2c /* B97FD0 802403D0 C6000038 */ lwc1 $f0, 0x38($s0) @@ -88,7 +88,7 @@ glabel func_802402A0_B97EA0 /* B97FE0 802403E0 27A60030 */ addiu $a2, $sp, 0x30 /* B97FE4 802403E4 E7A0002C */ swc1 $f0, 0x2c($sp) /* B97FE8 802403E8 44820000 */ mtc1 $v0, $f0 -/* B97FEC 802403EC 00000000 */ nop +/* B97FEC 802403EC 00000000 */ nop /* B97FF0 802403F0 46800020 */ cvt.s.w $f0, $f0 /* B97FF4 802403F4 46000021 */ cvt.d.s $f0, $f0 /* B97FF8 802403F8 C604003C */ lwc1 $f4, 0x3c($s0) @@ -96,13 +96,13 @@ glabel func_802402A0_B97EA0 /* B98000 80240400 C6080018 */ lwc1 $f8, 0x18($s0) /* B98004 80240404 860200A8 */ lh $v0, 0xa8($s0) /* B98008 80240408 46220002 */ mul.d $f0, $f0, $f2 -/* B9800C 8024040C 00000000 */ nop +/* B9800C 8024040C 00000000 */ nop /* B98010 80240410 E7A40030 */ swc1 $f4, 0x30($sp) /* B98014 80240414 E7A60034 */ swc1 $f6, 0x34($sp) /* B98018 80240418 E7A80010 */ swc1 $f8, 0x10($sp) /* B9801C 8024041C C604000C */ lwc1 $f4, 0xc($s0) /* B98020 80240420 44821000 */ mtc1 $v0, $f2 -/* B98024 80240424 00000000 */ nop +/* B98024 80240424 00000000 */ nop /* B98028 80240428 468010A0 */ cvt.s.w $f2, $f2 /* B9802C 8024042C E7A20018 */ swc1 $f2, 0x18($sp) /* B98030 80240430 E7A40014 */ swc1 $f4, 0x14($sp) @@ -123,7 +123,7 @@ glabel func_802402A0_B97EA0 /* B98068 80240468 44801800 */ mtc1 $zero, $f3 /* B9806C 8024046C 46000021 */ cvt.d.s $f0, $f0 /* B98070 80240470 4622003C */ c.lt.d $f0, $f2 -/* B98074 80240474 00000000 */ nop +/* B98074 80240474 00000000 */ nop /* B98078 80240478 45000047 */ bc1f .L80240598 /* B9807C 8024047C 27A5002C */ addiu $a1, $sp, 0x2c /* B98080 80240480 27A60030 */ addiu $a2, $sp, 0x30 @@ -154,7 +154,7 @@ glabel func_802402A0_B97EA0 /* B980E4 802404E4 0C0372DF */ jal func_800DCB7C /* B980E8 802404E8 27A70034 */ addiu $a3, $sp, 0x34 /* B980EC 802404EC 1040002A */ beqz $v0, .L80240598 -/* B980F0 802404F0 00000000 */ nop +/* B980F0 802404F0 00000000 */ nop /* B980F4 802404F4 C600001C */ lwc1 $f0, 0x1c($s0) /* B980F8 802404F8 C7A20038 */ lwc1 $f2, 0x38($sp) /* B980FC 802404FC 46000005 */ abs.s $f0, $f0 @@ -162,7 +162,7 @@ glabel func_802402A0_B97EA0 /* B98104 80240504 46340000 */ add.d $f0, $f0, $f20 /* B98108 80240508 460010A1 */ cvt.d.s $f2, $f2 /* B9810C 8024050C 4620103E */ c.le.d $f2, $f0 -/* B98110 80240510 00000000 */ nop +/* B98110 80240510 00000000 */ nop /* B98114 80240514 45000020 */ bc1f .L80240598 /* B98118 80240518 240403E8 */ addiu $a0, $zero, 0x3e8 /* B9811C 8024051C C7A00030 */ lwc1 $f0, 0x30($sp) @@ -193,7 +193,7 @@ glabel func_802402A0_B97EA0 /* B98180 80240580 5840000C */ blezl $v0, .L802405B4 /* B98184 80240584 AE600070 */ sw $zero, 0x70($s3) /* B98188 80240588 1460000A */ bnez $v1, .L802405B4 -/* B9818C 8024058C 00000000 */ nop +/* B9818C 8024058C 00000000 */ nop /* B98190 80240590 0809016D */ j .L802405B4 /* B98194 80240594 AE600070 */ sw $zero, 0x70($s3) .L80240598: diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240698_B98298.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240698_B98298.s index 7904a84dc0..e975131428 100644 --- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240698_B98298.s +++ b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240698_B98298.s @@ -38,7 +38,7 @@ glabel func_80240698_B98298 /* B9831C 8024071C 2402000F */ addiu $v0, $zero, 0xf /* B98320 80240720 AFA2001C */ sw $v0, 0x1c($sp) /* B98324 80240724 44833000 */ mtc1 $v1, $f6 -/* B98328 80240728 00000000 */ nop +/* B98328 80240728 00000000 */ nop /* B9832C 8024072C 468031A0 */ cvt.s.w $f6, $f6 /* B98330 80240730 44073000 */ mfc1 $a3, $f6 /* B98334 80240734 27A20028 */ addiu $v0, $sp, 0x28 @@ -65,13 +65,13 @@ glabel func_80240698_B98298 .L80240788: /* B98388 80240788 8602008C */ lh $v0, 0x8c($s0) /* B9838C 8024078C 14400023 */ bnez $v0, .L8024081C -/* B98390 80240790 00000000 */ nop +/* B98390 80240790 00000000 */ nop /* B98394 80240794 9602008E */ lhu $v0, 0x8e($s0) /* B98398 80240798 2442FFFF */ addiu $v0, $v0, -1 /* B9839C 8024079C A602008E */ sh $v0, 0x8e($s0) /* B983A0 802407A0 00021400 */ sll $v0, $v0, 0x10 /* B983A4 802407A4 1C40001D */ bgtz $v0, .L8024081C -/* B983A8 802407A8 00000000 */ nop +/* B983A8 802407A8 00000000 */ nop /* B983AC 802407AC 8E820074 */ lw $v0, 0x74($s4) /* B983B0 802407B0 2442FFFF */ addiu $v0, $v0, -1 /* B983B4 802407B4 18400018 */ blez $v0, .L80240818 diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024083C_B9843C.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024083C_B9843C.s index 08d648e0e7..7bb4d84aef 100644 --- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024083C_B9843C.s +++ b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024083C_B9843C.s @@ -24,7 +24,7 @@ glabel func_8024083C_B9843C /* B98488 80240888 0C00A67F */ jal rand_int /* B9848C 8024088C AE020000 */ sw $v0, ($s0) /* B98490 80240890 44820000 */ mtc1 $v0, $f0 -/* B98494 80240894 00000000 */ nop +/* B98494 80240894 00000000 */ nop /* B98498 80240898 46800021 */ cvt.d.w $f0, $f0 /* B9849C 8024089C 3C014024 */ lui $at, 0x4024 /* B984A0 802408A0 44811800 */ mtc1 $at, $f3 diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024091C_B9851C.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024091C_B9851C.s index 82f1c80412..0cfa5b4add 100644 --- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024091C_B9851C.s +++ b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024091C_B9851C.s @@ -25,7 +25,7 @@ glabel func_8024091C_B9851C /* B9856C 8024096C 44801800 */ mtc1 $zero, $f3 /* B98570 80240970 46000021 */ cvt.d.s $f0, $f0 /* B98574 80240974 4620103C */ c.lt.d $f2, $f0 -/* B98578 80240978 00000000 */ nop +/* B98578 80240978 00000000 */ nop /* B9857C 8024097C 45000021 */ bc1f .L80240A04 /* B98580 80240980 27A50028 */ addiu $a1, $sp, 0x28 /* B98584 80240984 C6600038 */ lwc1 $f0, 0x38($s3) @@ -40,20 +40,20 @@ glabel func_8024091C_B9851C /* B985A8 802409A8 E7A00014 */ swc1 $f0, 0x14($sp) /* B985AC 802409AC 866200A8 */ lh $v0, 0xa8($s3) /* B985B0 802409B0 44820000 */ mtc1 $v0, $f0 -/* B985B4 802409B4 00000000 */ nop +/* B985B4 802409B4 00000000 */ nop /* B985B8 802409B8 46800020 */ cvt.s.w $f0, $f0 /* B985BC 802409BC E7A00018 */ swc1 $f0, 0x18($sp) /* B985C0 802409C0 866200A6 */ lh $v0, 0xa6($s3) /* B985C4 802409C4 27A6002C */ addiu $a2, $sp, 0x2c /* B985C8 802409C8 44820000 */ mtc1 $v0, $f0 -/* B985CC 802409CC 00000000 */ nop +/* B985CC 802409CC 00000000 */ nop /* B985D0 802409D0 46800020 */ cvt.s.w $f0, $f0 /* B985D4 802409D4 E7A0001C */ swc1 $f0, 0x1c($sp) /* B985D8 802409D8 8E640080 */ lw $a0, 0x80($s3) /* B985DC 802409DC 0C037711 */ jal func_800DDC44 /* B985E0 802409E0 27A70030 */ addiu $a3, $sp, 0x30 /* B985E4 802409E4 10400003 */ beqz $v0, .L802409F4 -/* B985E8 802409E8 00000000 */ nop +/* B985E8 802409E8 00000000 */ nop /* B985EC 802409EC 08090281 */ j .L80240A04 /* B985F0 802409F0 AE600018 */ sw $zero, 0x18($s3) .L802409F4: @@ -67,7 +67,7 @@ glabel func_8024091C_B9851C /* B9860C 80240A0C 44801800 */ mtc1 $zero, $f3 /* B98610 80240A10 46000021 */ cvt.d.s $f0, $f0 /* B98614 80240A14 4622003C */ c.lt.d $f0, $f2 -/* B98618 80240A18 00000000 */ nop +/* B98618 80240A18 00000000 */ nop /* B9861C 80240A1C 4500006C */ bc1f .L80240BD0 /* B98620 80240A20 27B00028 */ addiu $s0, $sp, 0x28 /* B98624 80240A24 0200282D */ daddu $a1, $s0, $zero @@ -116,7 +116,7 @@ glabel func_8024091C_B9851C /* B986D0 80240AD0 0C0372DF */ jal func_800DCB7C /* B986D4 80240AD4 0220382D */ daddu $a3, $s1, $zero /* B986D8 80240AD8 1040003D */ beqz $v0, .L80240BD0 -/* B986DC 80240ADC 00000000 */ nop +/* B986DC 80240ADC 00000000 */ nop /* B986E0 80240AE0 C660001C */ lwc1 $f0, 0x1c($s3) /* B986E4 80240AE4 C7A20038 */ lwc1 $f2, 0x38($sp) /* B986E8 80240AE8 46000005 */ abs.s $f0, $f0 @@ -124,7 +124,7 @@ glabel func_8024091C_B9851C /* B986F0 80240AF0 46340000 */ add.d $f0, $f0, $f20 /* B986F4 80240AF4 460010A1 */ cvt.d.s $f2, $f2 /* B986F8 80240AF8 4620103E */ c.le.d $f2, $f0 -/* B986FC 80240AFC 00000000 */ nop +/* B986FC 80240AFC 00000000 */ nop /* B98700 80240B00 45000033 */ bc1f .L80240BD0 /* B98704 80240B04 2403F7FF */ addiu $v1, $zero, -0x801 /* B98708 80240B08 C7A0002C */ lwc1 $f0, 0x2c($sp) @@ -163,7 +163,7 @@ glabel func_8024091C_B9851C /* B9878C 80240B8C 2402000F */ addiu $v0, $zero, 0xf /* B98790 80240B90 AFA2001C */ sw $v0, 0x1c($sp) /* B98794 80240B94 44834000 */ mtc1 $v1, $f8 -/* B98798 80240B98 00000000 */ nop +/* B98798 80240B98 00000000 */ nop /* B9879C 80240B9C 46804220 */ cvt.s.w $f8, $f8 /* B987A0 80240BA0 44074000 */ mfc1 $a3, $f8 /* B987A4 80240BA4 27A2003C */ addiu $v0, $sp, 0x3c diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s index 33a29ae316..50a7353ca9 100644 --- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s +++ b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s @@ -76,7 +76,7 @@ glabel func_80240C60_B98860 /* B98978 80240D78 8E4300B0 */ lw $v1, 0xb0($s2) /* B9897C 80240D7C 30620004 */ andi $v0, $v1, 4 /* B98980 80240D80 10400007 */ beqz $v0, .L80240DA0 -/* B98984 80240D84 00000000 */ nop +/* B98984 80240D84 00000000 */ nop /* B98988 80240D88 824200B4 */ lb $v0, 0xb4($s2) /* B9898C 80240D8C 14400034 */ bnez $v0, .L80240E60 /* B98990 80240D90 0000102D */ daddu $v0, $zero, $zero @@ -88,21 +88,24 @@ glabel func_80240C60_B98860 /* B989A4 80240DA4 2C62000F */ sltiu $v0, $v1, 0xf /* B989A8 80240DA8 1040002C */ beqz $v0, .L80240E5C /* B989AC 80240DAC 00031080 */ sll $v0, $v1, 2 -/* B989B0 80240DB0 3C018024 */ lui $at, %hi(D_80243838) +/* B989B0 80240DB0 3C018024 */ lui $at, %hi(jtbl_80243838_B9B438) /* B989B4 80240DB4 00220821 */ addu $at, $at, $v0 -/* B989B8 80240DB8 8C223838 */ lw $v0, %lo(D_80243838)($at) +/* B989B8 80240DB8 8C223838 */ lw $v0, %lo(jtbl_80243838_B9B438)($at) /* B989BC 80240DBC 00400008 */ jr $v0 -/* B989C0 80240DC0 00000000 */ nop +/* B989C0 80240DC0 00000000 */ nop +glabel L80240DC4_B989C4 /* B989C4 80240DC4 0260202D */ daddu $a0, $s3, $zero /* B989C8 80240DC8 0280282D */ daddu $a1, $s4, $zero /* B989CC 80240DCC 0C09001C */ jal func_80240070_B97C70 /* B989D0 80240DD0 0200302D */ daddu $a2, $s0, $zero +glabel L80240DD4_B989D4 /* B989D4 80240DD4 0260202D */ daddu $a0, $s3, $zero /* B989D8 80240DD8 0280282D */ daddu $a1, $s4, $zero /* B989DC 80240DDC 0C0900A8 */ jal func_802402A0_B97EA0 /* B989E0 80240DE0 0200302D */ daddu $a2, $s0, $zero /* B989E4 80240DE4 08090398 */ j .L80240E60 /* B989E8 80240DE8 0000102D */ daddu $v0, $zero, $zero +glabel L80240DEC_B989EC /* B989EC 80240DEC 0260202D */ daddu $a0, $s3, $zero /* B989F0 80240DF0 0280282D */ daddu $a1, $s4, $zero /* B989F4 80240DF4 0C090176 */ jal mim_02_UnkNpcAIFunc1 @@ -111,27 +114,32 @@ glabel func_80240C60_B98860 /* B98A00 80240E00 24020003 */ addiu $v0, $zero, 3 /* B98A04 80240E04 14620016 */ bne $v1, $v0, .L80240E60 /* B98A08 80240E08 0000102D */ daddu $v0, $zero, $zero +glabel L80240E0C_B98A0C /* B98A0C 80240E0C 0260202D */ daddu $a0, $s3, $zero /* B98A10 80240E10 0280282D */ daddu $a1, $s4, $zero /* B98A14 80240E14 0C0901A6 */ jal func_80240698_B98298 /* B98A18 80240E18 0200302D */ daddu $a2, $s0, $zero /* B98A1C 80240E1C 08090398 */ j .L80240E60 /* B98A20 80240E20 0000102D */ daddu $v0, $zero, $zero +glabel L80240E24_B98A24 /* B98A24 80240E24 0260202D */ daddu $a0, $s3, $zero /* B98A28 80240E28 0280282D */ daddu $a1, $s4, $zero /* B98A2C 80240E2C 0C09020F */ jal func_8024083C_B9843C /* B98A30 80240E30 0200302D */ daddu $a2, $s0, $zero +glabel L80240E34_B98A34 /* B98A34 80240E34 0260202D */ daddu $a0, $s3, $zero /* B98A38 80240E38 0280282D */ daddu $a1, $s4, $zero /* B98A3C 80240E3C 0C090247 */ jal func_8024091C_B9851C /* B98A40 80240E40 0200302D */ daddu $a2, $s0, $zero /* B98A44 80240E44 08090398 */ j .L80240E60 /* B98A48 80240E48 0000102D */ daddu $v0, $zero, $zero +glabel L80240E4C_B98A4C /* B98A4C 80240E4C 0260202D */ daddu $a0, $s3, $zero /* B98A50 80240E50 0280282D */ daddu $a1, $s4, $zero /* B98A54 80240E54 0C090307 */ jal mim_02_UnkDurationCheck /* B98A58 80240E58 0200302D */ daddu $a2, $s0, $zero .L80240E5C: +glabel L80240E5C_B98A5C /* B98A5C 80240E5C 0000102D */ daddu $v0, $zero, $zero .L80240E60: /* B98A60 80240E60 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C_B98D3C.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C_B98D3C.s index 1152784682..1aa1ac4456 100644 --- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C_B98D3C.s +++ b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C_B98D3C.s @@ -28,7 +28,7 @@ glabel func_8024113C_B98D3C /* B98D90 80241190 00220821 */ addu $at, $at, $v0 /* B98D94 80241194 AC203880 */ sw $zero, %lo(func_80243880_95EA80)($at) /* B98D98 80241198 08090472 */ j .L802411C8 -/* B98D9C 8024119C 00000000 */ nop +/* B98D9C 8024119C 00000000 */ nop .L802411A0: /* B98DA0 802411A0 3C038024 */ lui $v1, %hi(func_80243880_95EA80) /* B98DA4 802411A4 24633880 */ addiu $v1, $v1, %lo(func_80243880_95EA80) @@ -46,5 +46,5 @@ glabel func_8024113C_B98D3C /* B98DCC 802411CC 24020002 */ addiu $v0, $zero, 2 /* B98DD0 802411D0 03E00008 */ jr $ra /* B98DD4 802411D4 27BD0018 */ addiu $sp, $sp, 0x18 -/* B98DD8 802411D8 00000000 */ nop -/* B98DDC 802411DC 00000000 */ nop +/* B98DD8 802411D8 00000000 */ nop +/* B98DDC 802411DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240000_B9B480.s b/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240000_B9B480.s index 73181ac418..fd7bb17939 100644 --- a/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240000_B9B480.s +++ b/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240000_B9B480.s @@ -5,7 +5,7 @@ glabel func_80240000_B9B480 /* B9B480 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B9B484 80240004 AFBF0010 */ sw $ra, 0x10($sp) /* B9B488 80240008 0C046ED4 */ jal enable_world_fog -/* B9B48C 8024000C 00000000 */ nop +/* B9B48C 8024000C 00000000 */ nop /* B9B490 80240010 240403DE */ addiu $a0, $zero, 0x3de /* B9B494 80240014 0C046EDD */ jal set_world_fog_dist /* B9B498 80240018 240503E8 */ addiu $a1, $zero, 0x3e8 @@ -15,7 +15,7 @@ glabel func_80240000_B9B480 /* B9B4A8 80240028 0C046EE2 */ jal set_world_fog_color /* B9B4AC 8024002C 240700FF */ addiu $a3, $zero, 0xff /* B9B4B0 80240030 0C048BFB */ jal enable_entity_fog -/* B9B4B4 80240034 00000000 */ nop +/* B9B4B4 80240034 00000000 */ nop /* B9B4B8 80240038 240403DE */ addiu $a0, $zero, 0x3de /* B9B4BC 8024003C 0C048C04 */ jal set_entity_fog_dist /* B9B4C0 80240040 240503E8 */ addiu $a1, $zero, 0x3e8 diff --git a/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_802400A0_B9B520.s b/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_802400A0_B9B520.s index 913b406d0f..f69014de98 100644 --- a/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_802400A0_B9B520.s +++ b/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_802400A0_B9B520.s @@ -46,7 +46,7 @@ glabel func_802400A0_B9B520 /* B9B5C0 80240140 10620029 */ beq $v1, $v0, .L802401E8 /* B9B5C4 80240144 000713C2 */ srl $v0, $a3, 0xf /* B9B5C8 80240148 080900C9 */ j .L80240324 -/* B9B5CC 8024014C 00000000 */ nop +/* B9B5CC 8024014C 00000000 */ nop .L80240150: /* B9B5D0 80240150 240200DE */ addiu $v0, $zero, 0xde /* B9B5D4 80240154 10620005 */ beq $v1, $v0, .L8024016C @@ -54,7 +54,7 @@ glabel func_802400A0_B9B520 /* B9B5DC 8024015C 50620071 */ beql $v1, $v0, .L80240324 /* B9B5E0 80240160 24100001 */ addiu $s0, $zero, 1 /* B9B5E4 80240164 080900C9 */ j .L80240324 -/* B9B5E8 80240168 00000000 */ nop +/* B9B5E8 80240168 00000000 */ nop .L8024016C: /* B9B5EC 8024016C 00E0202D */ daddu $a0, $a3, $zero /* B9B5F0 80240170 0260282D */ daddu $a1, $s3, $zero @@ -88,7 +88,7 @@ glabel func_802400A0_B9B520 /* B9B658 802401D8 1440FFF9 */ bnez $v0, .L802401C0 /* B9B65C 802401DC 24840010 */ addiu $a0, $a0, 0x10 /* B9B660 802401E0 080900C9 */ j .L80240324 -/* B9B664 802401E4 00000000 */ nop +/* B9B664 802401E4 00000000 */ nop .L802401E8: /* B9B668 802401E8 304201FC */ andi $v0, $v0, 0x1fc /* B9B66C 802401EC 00511021 */ addu $v0, $v0, $s1 @@ -97,10 +97,10 @@ glabel func_802400A0_B9B520 /* B9B678 802401F8 84820000 */ lh $v0, ($a0) /* B9B67C 802401FC 84830002 */ lh $v1, 2($a0) /* B9B680 80240200 44828000 */ mtc1 $v0, $f16 -/* B9B684 80240204 00000000 */ nop +/* B9B684 80240204 00000000 */ nop /* B9B688 80240208 46808420 */ cvt.s.w $f16, $f16 /* B9B68C 8024020C 44830000 */ mtc1 $v1, $f0 -/* B9B690 80240210 00000000 */ nop +/* B9B690 80240210 00000000 */ nop /* B9B694 80240214 46800020 */ cvt.s.w $f0, $f0 /* B9B698 80240218 000711C2 */ srl $v0, $a3, 7 /* B9B69C 8024021C 304201FC */ andi $v0, $v0, 0x1fc @@ -108,15 +108,15 @@ glabel func_802400A0_B9B520 /* B9B6A4 80240224 84830004 */ lh $v1, 4($a0) /* B9B6A8 80240228 8C440000 */ lw $a0, ($v0) /* B9B6AC 8024022C 4483B000 */ mtc1 $v1, $f22 -/* B9B6B0 80240230 00000000 */ nop +/* B9B6B0 80240230 00000000 */ nop /* B9B6B4 80240234 4680B5A0 */ cvt.s.w $f22, $f22 /* B9B6B8 80240238 84820000 */ lh $v0, ($a0) /* B9B6BC 8024023C 84830002 */ lh $v1, 2($a0) /* B9B6C0 80240240 44821000 */ mtc1 $v0, $f2 -/* B9B6C4 80240244 00000000 */ nop +/* B9B6C4 80240244 00000000 */ nop /* B9B6C8 80240248 468010A0 */ cvt.s.w $f2, $f2 /* B9B6CC 8024024C 4483F000 */ mtc1 $v1, $f30 -/* B9B6D0 80240250 00000000 */ nop +/* B9B6D0 80240250 00000000 */ nop /* B9B6D4 80240254 4680F7A0 */ cvt.s.w $f30, $f30 /* B9B6D8 80240258 080900B6 */ j .L802402D8 /* B9B6DC 8024025C 00071040 */ sll $v0, $a3, 1 @@ -129,10 +129,10 @@ glabel func_802400A0_B9B520 /* B9B6F4 80240274 84820000 */ lh $v0, ($a0) /* B9B6F8 80240278 84830002 */ lh $v1, 2($a0) /* B9B6FC 8024027C 44828000 */ mtc1 $v0, $f16 -/* B9B700 80240280 00000000 */ nop +/* B9B700 80240280 00000000 */ nop /* B9B704 80240284 46808420 */ cvt.s.w $f16, $f16 /* B9B708 80240288 44830000 */ mtc1 $v1, $f0 -/* B9B70C 8024028C 00000000 */ nop +/* B9B70C 8024028C 00000000 */ nop /* B9B710 80240290 46800020 */ cvt.s.w $f0, $f0 /* B9B714 80240294 000611C2 */ srl $v0, $a2, 7 /* B9B718 80240298 304201FC */ andi $v0, $v0, 0x1fc @@ -140,15 +140,15 @@ glabel func_802400A0_B9B520 /* B9B720 802402A0 84830004 */ lh $v1, 4($a0) /* B9B724 802402A4 8C440000 */ lw $a0, ($v0) /* B9B728 802402A8 4483B000 */ mtc1 $v1, $f22 -/* B9B72C 802402AC 00000000 */ nop +/* B9B72C 802402AC 00000000 */ nop /* B9B730 802402B0 4680B5A0 */ cvt.s.w $f22, $f22 /* B9B734 802402B4 84820000 */ lh $v0, ($a0) /* B9B738 802402B8 84830002 */ lh $v1, 2($a0) /* B9B73C 802402BC 44821000 */ mtc1 $v0, $f2 -/* B9B740 802402C0 00000000 */ nop +/* B9B740 802402C0 00000000 */ nop /* B9B744 802402C4 468010A0 */ cvt.s.w $f2, $f2 /* B9B748 802402C8 4483F000 */ mtc1 $v1, $f30 -/* B9B74C 802402CC 00000000 */ nop +/* B9B74C 802402CC 00000000 */ nop /* B9B750 802402D0 4680F7A0 */ cvt.s.w $f30, $f30 /* B9B754 802402D4 00061040 */ sll $v0, $a2, 1 .L802402D8: @@ -157,62 +157,62 @@ glabel func_802400A0_B9B520 /* B9B760 802402E0 84830004 */ lh $v1, 4($a0) /* B9B764 802402E4 8C420000 */ lw $v0, ($v0) /* B9B768 802402E8 4483A000 */ mtc1 $v1, $f20 -/* B9B76C 802402EC 00000000 */ nop +/* B9B76C 802402EC 00000000 */ nop /* B9B770 802402F0 4680A520 */ cvt.s.w $f20, $f20 /* B9B774 802402F4 84440000 */ lh $a0, ($v0) /* B9B778 802402F8 84430002 */ lh $v1, 2($v0) /* B9B77C 802402FC 84420004 */ lh $v0, 4($v0) /* B9B780 80240300 4484E000 */ mtc1 $a0, $f28 -/* B9B784 80240304 00000000 */ nop +/* B9B784 80240304 00000000 */ nop /* B9B788 80240308 4680E720 */ cvt.s.w $f28, $f28 /* B9B78C 8024030C 4483D000 */ mtc1 $v1, $f26 -/* B9B790 80240310 00000000 */ nop +/* B9B790 80240310 00000000 */ nop /* B9B794 80240314 4680D6A0 */ cvt.s.w $f26, $f26 /* B9B798 80240318 4482C000 */ mtc1 $v0, $f24 -/* B9B79C 8024031C 00000000 */ nop +/* B9B79C 8024031C 00000000 */ nop /* B9B7A0 80240320 4680C620 */ cvt.s.w $f24, $f24 .L80240324: /* B9B7A4 80240324 1200FF7B */ beqz $s0, .L80240114 /* B9B7A8 80240328 26520008 */ addiu $s2, $s2, 8 /* B9B7AC 8024032C 24020002 */ addiu $v0, $zero, 2 /* B9B7B0 80240330 1602002C */ bne $s0, $v0, .L802403E4 -/* B9B7B4 80240334 00000000 */ nop +/* B9B7B4 80240334 00000000 */ nop /* B9B7B8 80240338 461E0201 */ sub.s $f8, $f0, $f30 /* B9B7BC 8024033C 4614C181 */ sub.s $f6, $f24, $f20 /* B9B7C0 80240340 46064382 */ mul.s $f14, $f8, $f6 -/* B9B7C4 80240344 00000000 */ nop +/* B9B7C4 80240344 00000000 */ nop /* B9B7C8 80240348 4614B101 */ sub.s $f4, $f22, $f20 /* B9B7CC 8024034C 461ED281 */ sub.s $f10, $f26, $f30 /* B9B7D0 80240350 460A2302 */ mul.s $f12, $f4, $f10 -/* B9B7D4 80240354 00000000 */ nop +/* B9B7D4 80240354 00000000 */ nop /* B9B7D8 80240358 4602E001 */ sub.s $f0, $f28, $f2 /* B9B7DC 8024035C 46002102 */ mul.s $f4, $f4, $f0 -/* B9B7E0 80240360 00000000 */ nop +/* B9B7E0 80240360 00000000 */ nop /* B9B7E4 80240364 46028081 */ sub.s $f2, $f16, $f2 /* B9B7E8 80240368 46061182 */ mul.s $f6, $f2, $f6 -/* B9B7EC 8024036C 00000000 */ nop +/* B9B7EC 8024036C 00000000 */ nop /* B9B7F0 80240370 460A1082 */ mul.s $f2, $f2, $f10 -/* B9B7F4 80240374 00000000 */ nop +/* B9B7F4 80240374 00000000 */ nop /* B9B7F8 80240378 46004202 */ mul.s $f8, $f8, $f0 -/* B9B7FC 8024037C 00000000 */ nop +/* B9B7FC 8024037C 00000000 */ nop /* B9B800 80240380 460C7501 */ sub.s $f20, $f14, $f12 /* B9B804 80240384 4614A002 */ mul.s $f0, $f20, $f20 -/* B9B808 80240388 00000000 */ nop +/* B9B808 80240388 00000000 */ nop /* B9B80C 8024038C 46062581 */ sub.s $f22, $f4, $f6 /* B9B810 80240390 4616B102 */ mul.s $f4, $f22, $f22 -/* B9B814 80240394 00000000 */ nop +/* B9B814 80240394 00000000 */ nop /* B9B818 80240398 46081601 */ sub.s $f24, $f2, $f8 /* B9B81C 8024039C 4618C082 */ mul.s $f2, $f24, $f24 -/* B9B820 802403A0 00000000 */ nop +/* B9B820 802403A0 00000000 */ nop /* B9B824 802403A4 46040000 */ add.s $f0, $f0, $f4 /* B9B828 802403A8 46020300 */ add.s $f12, $f0, $f2 /* B9B82C 802403AC 46006084 */ sqrt.s $f2, $f12 /* B9B830 802403B0 46021032 */ c.eq.s $f2, $f2 -/* B9B834 802403B4 00000000 */ nop +/* B9B834 802403B4 00000000 */ nop /* B9B838 802403B8 45030005 */ bc1tl .L802403D0 /* B9B83C 802403BC 4602A003 */ div.s $f0, $f20, $f2 /* B9B840 802403C0 0C0187BC */ jal sqrtf -/* B9B844 802403C4 00000000 */ nop +/* B9B844 802403C4 00000000 */ nop /* B9B848 802403C8 46000086 */ mov.s $f2, $f0 /* B9B84C 802403CC 4602A003 */ div.s $f0, $f20, $f2 .L802403D0: diff --git a/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240420_B9B8A0.s b/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240420_B9B8A0.s index c1b2e0967f..15ec229cb4 100644 --- a/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240420_B9B8A0.s +++ b/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240420_B9B8A0.s @@ -27,13 +27,13 @@ glabel func_80240420_B9B8A0 /* B9B8F8 80240478 C7A00010 */ lwc1 $f0, 0x10($sp) /* B9B8FC 8024047C 3C014480 */ lui $at, 0x4480 /* B9B900 80240480 4481A000 */ mtc1 $at, $f20 -/* B9B904 80240484 00000000 */ nop +/* B9B904 80240484 00000000 */ nop /* B9B908 80240488 46140002 */ mul.s $f0, $f0, $f20 -/* B9B90C 8024048C 00000000 */ nop +/* B9B90C 8024048C 00000000 */ nop /* B9B910 80240490 3C01CD5B */ lui $at, 0xcd5b /* B9B914 80240494 34215858 */ ori $at, $at, 0x5858 /* B9B918 80240498 4481B000 */ mtc1 $at, $f22 -/* B9B91C 8024049C 00000000 */ nop +/* B9B91C 8024049C 00000000 */ nop /* B9B920 802404A0 46160000 */ add.s $f0, $f0, $f22 /* B9B924 802404A4 8E050000 */ lw $a1, ($s0) /* B9B928 802404A8 4600008D */ trunc.w.s $f2, $f0 @@ -42,7 +42,7 @@ glabel func_80240420_B9B8A0 /* B9B934 802404B4 0220202D */ daddu $a0, $s1, $zero /* B9B938 802404B8 C7A00014 */ lwc1 $f0, 0x14($sp) /* B9B93C 802404BC 46140002 */ mul.s $f0, $f0, $f20 -/* B9B940 802404C0 00000000 */ nop +/* B9B940 802404C0 00000000 */ nop /* B9B944 802404C4 26100004 */ addiu $s0, $s0, 4 /* B9B948 802404C8 46160000 */ add.s $f0, $f0, $f22 /* B9B94C 802404CC 8E050000 */ lw $a1, ($s0) @@ -52,7 +52,7 @@ glabel func_80240420_B9B8A0 /* B9B95C 802404DC 0220202D */ daddu $a0, $s1, $zero /* B9B960 802404E0 C7A00018 */ lwc1 $f0, 0x18($sp) /* B9B964 802404E4 46140002 */ mul.s $f0, $f0, $f20 -/* B9B968 802404E8 00000000 */ nop +/* B9B968 802404E8 00000000 */ nop /* B9B96C 802404EC 26100004 */ addiu $s0, $s0, 4 /* B9B970 802404F0 46160000 */ add.s $f0, $f0, $f22 /* B9B974 802404F4 8E050000 */ lw $a1, ($s0) @@ -68,5 +68,5 @@ glabel func_80240420_B9B8A0 /* B9B99C 8024051C 24020002 */ addiu $v0, $zero, 2 /* B9B9A0 80240520 03E00008 */ jr $ra /* B9B9A4 80240524 27BD0040 */ addiu $sp, $sp, 0x40 -/* B9B9A8 80240528 00000000 */ nop -/* B9B9AC 8024052C 00000000 */ nop +/* B9B9A8 80240528 00000000 */ nop +/* B9B9AC 8024052C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9D960/func_80240000_B9D960.s b/asm/nonmatchings/world/area_mim/mim_04/B9D960/func_80240000_B9D960.s index 4bffa7fe8e..e78a3815e0 100644 --- a/asm/nonmatchings/world/area_mim/mim_04/B9D960/func_80240000_B9D960.s +++ b/asm/nonmatchings/world/area_mim/mim_04/B9D960/func_80240000_B9D960.s @@ -5,7 +5,7 @@ glabel func_80240000_B9D960 /* B9D960 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B9D964 80240004 AFBF0010 */ sw $ra, 0x10($sp) /* B9D968 80240008 0C046ED4 */ jal enable_world_fog -/* B9D96C 8024000C 00000000 */ nop +/* B9D96C 8024000C 00000000 */ nop /* B9D970 80240010 240403DE */ addiu $a0, $zero, 0x3de /* B9D974 80240014 0C046EDD */ jal set_world_fog_dist /* B9D978 80240018 240503E8 */ addiu $a1, $zero, 0x3e8 @@ -15,7 +15,7 @@ glabel func_80240000_B9D960 /* B9D988 80240028 0C046EE2 */ jal set_world_fog_color /* B9D98C 8024002C 240700FF */ addiu $a3, $zero, 0xff /* B9D990 80240030 0C048BFB */ jal enable_entity_fog -/* B9D994 80240034 00000000 */ nop +/* B9D994 80240034 00000000 */ nop /* B9D998 80240038 240403DE */ addiu $a0, $zero, 0x3de /* B9D99C 8024003C 0C048C04 */ jal set_entity_fog_dist /* B9D9A0 80240040 240503E8 */ addiu $a1, $zero, 0x3e8 @@ -28,5 +28,5 @@ glabel func_80240000_B9D960 /* B9D9BC 8024005C 24020002 */ addiu $v0, $zero, 2 /* B9D9C0 80240060 03E00008 */ jr $ra /* B9D9C4 80240064 27BD0018 */ addiu $sp, $sp, 0x18 -/* B9D9C8 80240068 00000000 */ nop -/* B9D9CC 8024006C 00000000 */ nop +/* B9D9C8 80240068 00000000 */ nop +/* B9D9CC 8024006C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_802401DC_B9DB3C.s b/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_802401DC_B9DB3C.s index cb6ebe4c9c..b0516bfdcb 100644 --- a/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_802401DC_B9DB3C.s +++ b/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_802401DC_B9DB3C.s @@ -11,4 +11,4 @@ glabel func_802401DC_B9DB3C .L802401F4: /* B9DB54 802401F4 03E00008 */ jr $ra /* B9DB58 802401F8 24020002 */ addiu $v0, $zero, 2 -/* B9DB5C 802401FC 00000000 */ nop +/* B9DB5C 802401FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240200_B9DB60.s b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240200_B9DB60.s index 7c50beab29..770cced281 100644 --- a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240200_B9DB60.s +++ b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240200_B9DB60.s @@ -30,7 +30,7 @@ glabel func_80240200_B9DB60 /* B9DBC4 80240264 3C05B000 */ lui $a1, 0xb000 /* B9DBC8 80240268 34A50017 */ ori $a1, $a1, 0x17 /* B9DBCC 8024026C 44820000 */ mtc1 $v0, $f0 -/* B9DBD0 80240270 00000000 */ nop +/* B9DBD0 80240270 00000000 */ nop /* B9DBD4 80240274 46800021 */ cvt.d.w $f0, $f0 /* B9DBD8 80240278 3C014024 */ lui $at, 0x4024 /* B9DBDC 8024027C 44811800 */ mtc1 $at, $f3 @@ -68,7 +68,7 @@ glabel func_80240200_B9DB60 /* B9DC5C 802402FC 0C0123F5 */ jal is_point_within_region /* B9DC60 80240300 8E070038 */ lw $a3, 0x38($s0) /* B9DC64 80240304 10400035 */ beqz $v0, .L802403DC -/* B9DC68 80240308 00000000 */ nop +/* B9DC68 80240308 00000000 */ nop /* B9DC6C 8024030C C60C0038 */ lwc1 $f12, 0x38($s0) /* B9DC70 80240310 3C0141C8 */ lui $at, 0x41c8 /* B9DC74 80240314 4481B000 */ mtc1 $at, $f22 @@ -99,13 +99,13 @@ glabel func_80240200_B9DB60 /* B9DCD4 80240374 860200A8 */ lh $v0, 0xa8($s0) /* B9DCD8 80240378 27A50020 */ addiu $a1, $sp, 0x20 /* B9DCDC 8024037C 44820000 */ mtc1 $v0, $f0 -/* B9DCE0 80240380 00000000 */ nop +/* B9DCE0 80240380 00000000 */ nop /* B9DCE4 80240384 46800020 */ cvt.s.w $f0, $f0 /* B9DCE8 80240388 E7A00018 */ swc1 $f0, 0x18($sp) /* B9DCEC 8024038C 860200A6 */ lh $v0, 0xa6($s0) /* B9DCF0 80240390 27A60024 */ addiu $a2, $sp, 0x24 /* B9DCF4 80240394 44820000 */ mtc1 $v0, $f0 -/* B9DCF8 80240398 00000000 */ nop +/* B9DCF8 80240398 00000000 */ nop /* B9DCFC 8024039C 46800020 */ cvt.s.w $f0, $f0 /* B9DD00 802403A0 E7A0001C */ swc1 $f0, 0x1c($sp) /* B9DD04 802403A4 8E040080 */ lw $a0, 0x80($s0) @@ -121,13 +121,13 @@ glabel func_80240200_B9DB60 /* B9DD2C 802403CC 1440FFE6 */ bnez $v0, .L80240368 /* B9DD30 802403D0 E600000C */ swc1 $f0, 0xc($s0) /* B9DD34 802403D4 08090103 */ j .L8024040C -/* B9DD38 802403D8 00000000 */ nop +/* B9DD38 802403D8 00000000 */ nop .L802403DC: /* B9DD3C 802403DC 0C00A67F */ jal rand_int /* B9DD40 802403E0 2404003C */ addiu $a0, $zero, 0x3c /* B9DD44 802403E4 C60C000C */ lwc1 $f12, 0xc($s0) /* B9DD48 802403E8 44820000 */ mtc1 $v0, $f0 -/* B9DD4C 802403EC 00000000 */ nop +/* B9DD4C 802403EC 00000000 */ nop /* B9DD50 802403F0 46800020 */ cvt.s.w $f0, $f0 /* B9DD54 802403F4 46006300 */ add.s $f12, $f12, $f0 /* B9DD58 802403F8 3C0141F0 */ lui $at, 0x41f0 diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240430_B9DD90.s b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240430_B9DD90.s index 58d33b579d..ac0358df19 100644 --- a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240430_B9DD90.s +++ b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240430_B9DD90.s @@ -43,7 +43,7 @@ glabel func_80240430_B9DD90 /* B9DE28 802404C8 2402000F */ addiu $v0, $zero, 0xf /* B9DE2C 802404CC AFA2001C */ sw $v0, 0x1c($sp) /* B9DE30 802404D0 44835000 */ mtc1 $v1, $f10 -/* B9DE34 802404D4 00000000 */ nop +/* B9DE34 802404D4 00000000 */ nop /* B9DE38 802404D8 468052A0 */ cvt.s.w $f10, $f10 /* B9DE3C 802404DC 44075000 */ mfc1 $a3, $f10 /* B9DE40 802404E0 27A20028 */ addiu $v0, $sp, 0x28 @@ -78,7 +78,7 @@ glabel func_80240430_B9DD90 /* B9DEA8 80240548 44801800 */ mtc1 $zero, $f3 /* B9DEAC 8024054C 46000021 */ cvt.d.s $f0, $f0 /* B9DEB0 80240550 4620103C */ c.lt.d $f2, $f0 -/* B9DEB4 80240554 00000000 */ nop +/* B9DEB4 80240554 00000000 */ nop /* B9DEB8 80240558 45000025 */ bc1f .L802405F0 /* B9DEBC 8024055C 27A5002C */ addiu $a1, $sp, 0x2c /* B9DEC0 80240560 C6000038 */ lwc1 $f0, 0x38($s0) @@ -88,7 +88,7 @@ glabel func_80240430_B9DD90 /* B9DED0 80240570 27A60030 */ addiu $a2, $sp, 0x30 /* B9DED4 80240574 E7A0002C */ swc1 $f0, 0x2c($sp) /* B9DED8 80240578 44820000 */ mtc1 $v0, $f0 -/* B9DEDC 8024057C 00000000 */ nop +/* B9DEDC 8024057C 00000000 */ nop /* B9DEE0 80240580 46800020 */ cvt.s.w $f0, $f0 /* B9DEE4 80240584 46000021 */ cvt.d.s $f0, $f0 /* B9DEE8 80240588 C604003C */ lwc1 $f4, 0x3c($s0) @@ -96,13 +96,13 @@ glabel func_80240430_B9DD90 /* B9DEF0 80240590 C6080018 */ lwc1 $f8, 0x18($s0) /* B9DEF4 80240594 860200A8 */ lh $v0, 0xa8($s0) /* B9DEF8 80240598 46220002 */ mul.d $f0, $f0, $f2 -/* B9DEFC 8024059C 00000000 */ nop +/* B9DEFC 8024059C 00000000 */ nop /* B9DF00 802405A0 E7A40030 */ swc1 $f4, 0x30($sp) /* B9DF04 802405A4 E7A60034 */ swc1 $f6, 0x34($sp) /* B9DF08 802405A8 E7A80010 */ swc1 $f8, 0x10($sp) /* B9DF0C 802405AC C604000C */ lwc1 $f4, 0xc($s0) /* B9DF10 802405B0 44821000 */ mtc1 $v0, $f2 -/* B9DF14 802405B4 00000000 */ nop +/* B9DF14 802405B4 00000000 */ nop /* B9DF18 802405B8 468010A0 */ cvt.s.w $f2, $f2 /* B9DF1C 802405BC E7A20018 */ swc1 $f2, 0x18($sp) /* B9DF20 802405C0 E7A40014 */ swc1 $f4, 0x14($sp) @@ -123,7 +123,7 @@ glabel func_80240430_B9DD90 /* B9DF58 802405F8 44801800 */ mtc1 $zero, $f3 /* B9DF5C 802405FC 46000021 */ cvt.d.s $f0, $f0 /* B9DF60 80240600 4622003C */ c.lt.d $f0, $f2 -/* B9DF64 80240604 00000000 */ nop +/* B9DF64 80240604 00000000 */ nop /* B9DF68 80240608 45000047 */ bc1f .L80240728 /* B9DF6C 8024060C 27A5002C */ addiu $a1, $sp, 0x2c /* B9DF70 80240610 27A60030 */ addiu $a2, $sp, 0x30 @@ -154,7 +154,7 @@ glabel func_80240430_B9DD90 /* B9DFD4 80240674 0C0372DF */ jal func_800DCB7C /* B9DFD8 80240678 27A70034 */ addiu $a3, $sp, 0x34 /* B9DFDC 8024067C 1040002A */ beqz $v0, .L80240728 -/* B9DFE0 80240680 00000000 */ nop +/* B9DFE0 80240680 00000000 */ nop /* B9DFE4 80240684 C600001C */ lwc1 $f0, 0x1c($s0) /* B9DFE8 80240688 C7A20038 */ lwc1 $f2, 0x38($sp) /* B9DFEC 8024068C 46000005 */ abs.s $f0, $f0 @@ -162,7 +162,7 @@ glabel func_80240430_B9DD90 /* B9DFF4 80240694 46340000 */ add.d $f0, $f0, $f20 /* B9DFF8 80240698 460010A1 */ cvt.d.s $f2, $f2 /* B9DFFC 8024069C 4620103E */ c.le.d $f2, $f0 -/* B9E000 802406A0 00000000 */ nop +/* B9E000 802406A0 00000000 */ nop /* B9E004 802406A4 45000020 */ bc1f .L80240728 /* B9E008 802406A8 240403E8 */ addiu $a0, $zero, 0x3e8 /* B9E00C 802406AC C7A00030 */ lwc1 $f0, 0x30($sp) @@ -193,7 +193,7 @@ glabel func_80240430_B9DD90 /* B9E070 80240710 5840000C */ blezl $v0, .L80240744 /* B9E074 80240714 AE600070 */ sw $zero, 0x70($s3) /* B9E078 80240718 1460000A */ bnez $v1, .L80240744 -/* B9E07C 8024071C 00000000 */ nop +/* B9E07C 8024071C 00000000 */ nop /* B9E080 80240720 080901D1 */ j .L80240744 /* B9E084 80240724 AE600070 */ sw $zero, 0x70($s3) .L80240728: diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240828_B9E188.s b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240828_B9E188.s index d0f950c2a4..9f42278396 100644 --- a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240828_B9E188.s +++ b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240828_B9E188.s @@ -38,7 +38,7 @@ glabel func_80240828_B9E188 /* B9E20C 802408AC 2402000F */ addiu $v0, $zero, 0xf /* B9E210 802408B0 AFA2001C */ sw $v0, 0x1c($sp) /* B9E214 802408B4 44833000 */ mtc1 $v1, $f6 -/* B9E218 802408B8 00000000 */ nop +/* B9E218 802408B8 00000000 */ nop /* B9E21C 802408BC 468031A0 */ cvt.s.w $f6, $f6 /* B9E220 802408C0 44073000 */ mfc1 $a3, $f6 /* B9E224 802408C4 27A20028 */ addiu $v0, $sp, 0x28 @@ -65,13 +65,13 @@ glabel func_80240828_B9E188 .L80240918: /* B9E278 80240918 8602008C */ lh $v0, 0x8c($s0) /* B9E27C 8024091C 14400023 */ bnez $v0, .L802409AC -/* B9E280 80240920 00000000 */ nop +/* B9E280 80240920 00000000 */ nop /* B9E284 80240924 9602008E */ lhu $v0, 0x8e($s0) /* B9E288 80240928 2442FFFF */ addiu $v0, $v0, -1 /* B9E28C 8024092C A602008E */ sh $v0, 0x8e($s0) /* B9E290 80240930 00021400 */ sll $v0, $v0, 0x10 /* B9E294 80240934 1C40001D */ bgtz $v0, .L802409AC -/* B9E298 80240938 00000000 */ nop +/* B9E298 80240938 00000000 */ nop /* B9E29C 8024093C 8E820074 */ lw $v0, 0x74($s4) /* B9E2A0 80240940 2442FFFF */ addiu $v0, $v0, -1 /* B9E2A4 80240944 18400018 */ blez $v0, .L802409A8 diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_802409CC_B9E32C.s b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_802409CC_B9E32C.s index 7e4a483609..4e78502c1c 100644 --- a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_802409CC_B9E32C.s +++ b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_802409CC_B9E32C.s @@ -24,7 +24,7 @@ glabel func_802409CC_B9E32C /* B9E378 80240A18 0C00A67F */ jal rand_int /* B9E37C 80240A1C AE020000 */ sw $v0, ($s0) /* B9E380 80240A20 44820000 */ mtc1 $v0, $f0 -/* B9E384 80240A24 00000000 */ nop +/* B9E384 80240A24 00000000 */ nop /* B9E388 80240A28 46800021 */ cvt.d.w $f0, $f0 /* B9E38C 80240A2C 3C014024 */ lui $at, 0x4024 /* B9E390 80240A30 44811800 */ mtc1 $at, $f3 diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240AAC_B9E40C.s b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240AAC_B9E40C.s index 2560cdee53..7b8570a7b8 100644 --- a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240AAC_B9E40C.s +++ b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240AAC_B9E40C.s @@ -25,7 +25,7 @@ glabel func_80240AAC_B9E40C /* B9E45C 80240AFC 44801800 */ mtc1 $zero, $f3 /* B9E460 80240B00 46000021 */ cvt.d.s $f0, $f0 /* B9E464 80240B04 4620103C */ c.lt.d $f2, $f0 -/* B9E468 80240B08 00000000 */ nop +/* B9E468 80240B08 00000000 */ nop /* B9E46C 80240B0C 45000021 */ bc1f .L80240B94 /* B9E470 80240B10 27A50028 */ addiu $a1, $sp, 0x28 /* B9E474 80240B14 C6600038 */ lwc1 $f0, 0x38($s3) @@ -40,20 +40,20 @@ glabel func_80240AAC_B9E40C /* B9E498 80240B38 E7A00014 */ swc1 $f0, 0x14($sp) /* B9E49C 80240B3C 866200A8 */ lh $v0, 0xa8($s3) /* B9E4A0 80240B40 44820000 */ mtc1 $v0, $f0 -/* B9E4A4 80240B44 00000000 */ nop +/* B9E4A4 80240B44 00000000 */ nop /* B9E4A8 80240B48 46800020 */ cvt.s.w $f0, $f0 /* B9E4AC 80240B4C E7A00018 */ swc1 $f0, 0x18($sp) /* B9E4B0 80240B50 866200A6 */ lh $v0, 0xa6($s3) /* B9E4B4 80240B54 27A6002C */ addiu $a2, $sp, 0x2c /* B9E4B8 80240B58 44820000 */ mtc1 $v0, $f0 -/* B9E4BC 80240B5C 00000000 */ nop +/* B9E4BC 80240B5C 00000000 */ nop /* B9E4C0 80240B60 46800020 */ cvt.s.w $f0, $f0 /* B9E4C4 80240B64 E7A0001C */ swc1 $f0, 0x1c($sp) /* B9E4C8 80240B68 8E640080 */ lw $a0, 0x80($s3) /* B9E4CC 80240B6C 0C037711 */ jal func_800DDC44 /* B9E4D0 80240B70 27A70030 */ addiu $a3, $sp, 0x30 /* B9E4D4 80240B74 10400003 */ beqz $v0, .L80240B84 -/* B9E4D8 80240B78 00000000 */ nop +/* B9E4D8 80240B78 00000000 */ nop /* B9E4DC 80240B7C 080902E5 */ j .L80240B94 /* B9E4E0 80240B80 AE600018 */ sw $zero, 0x18($s3) .L80240B84: @@ -67,7 +67,7 @@ glabel func_80240AAC_B9E40C /* B9E4FC 80240B9C 44801800 */ mtc1 $zero, $f3 /* B9E500 80240BA0 46000021 */ cvt.d.s $f0, $f0 /* B9E504 80240BA4 4622003C */ c.lt.d $f0, $f2 -/* B9E508 80240BA8 00000000 */ nop +/* B9E508 80240BA8 00000000 */ nop /* B9E50C 80240BAC 4500006C */ bc1f .L80240D60 /* B9E510 80240BB0 27B00028 */ addiu $s0, $sp, 0x28 /* B9E514 80240BB4 0200282D */ daddu $a1, $s0, $zero @@ -116,7 +116,7 @@ glabel func_80240AAC_B9E40C /* B9E5C0 80240C60 0C0372DF */ jal func_800DCB7C /* B9E5C4 80240C64 0220382D */ daddu $a3, $s1, $zero /* B9E5C8 80240C68 1040003D */ beqz $v0, .L80240D60 -/* B9E5CC 80240C6C 00000000 */ nop +/* B9E5CC 80240C6C 00000000 */ nop /* B9E5D0 80240C70 C660001C */ lwc1 $f0, 0x1c($s3) /* B9E5D4 80240C74 C7A20038 */ lwc1 $f2, 0x38($sp) /* B9E5D8 80240C78 46000005 */ abs.s $f0, $f0 @@ -124,7 +124,7 @@ glabel func_80240AAC_B9E40C /* B9E5E0 80240C80 46340000 */ add.d $f0, $f0, $f20 /* B9E5E4 80240C84 460010A1 */ cvt.d.s $f2, $f2 /* B9E5E8 80240C88 4620103E */ c.le.d $f2, $f0 -/* B9E5EC 80240C8C 00000000 */ nop +/* B9E5EC 80240C8C 00000000 */ nop /* B9E5F0 80240C90 45000033 */ bc1f .L80240D60 /* B9E5F4 80240C94 2403F7FF */ addiu $v1, $zero, -0x801 /* B9E5F8 80240C98 C7A0002C */ lwc1 $f0, 0x2c($sp) @@ -163,7 +163,7 @@ glabel func_80240AAC_B9E40C /* B9E67C 80240D1C 2402000F */ addiu $v0, $zero, 0xf /* B9E680 80240D20 AFA2001C */ sw $v0, 0x1c($sp) /* B9E684 80240D24 44834000 */ mtc1 $v1, $f8 -/* B9E688 80240D28 00000000 */ nop +/* B9E688 80240D28 00000000 */ nop /* B9E68C 80240D2C 46804220 */ cvt.s.w $f8, $f8 /* B9E690 80240D30 44074000 */ mfc1 $a3, $f8 /* B9E694 80240D34 27A2003C */ addiu $v0, $sp, 0x3c diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s index 481d374cec..6317d735de 100644 --- a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s +++ b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s @@ -76,7 +76,7 @@ glabel func_80240DF0_B9E750 /* B9E868 80240F08 8E4300B0 */ lw $v1, 0xb0($s2) /* B9E86C 80240F0C 30620004 */ andi $v0, $v1, 4 /* B9E870 80240F10 10400007 */ beqz $v0, .L80240F30 -/* B9E874 80240F14 00000000 */ nop +/* B9E874 80240F14 00000000 */ nop /* B9E878 80240F18 824200B4 */ lb $v0, 0xb4($s2) /* B9E87C 80240F1C 14400034 */ bnez $v0, .L80240FF0 /* B9E880 80240F20 0000102D */ daddu $v0, $zero, $zero @@ -88,21 +88,24 @@ glabel func_80240DF0_B9E750 /* B9E894 80240F34 2C62000F */ sltiu $v0, $v1, 0xf /* B9E898 80240F38 1040002C */ beqz $v0, .L80240FEC /* B9E89C 80240F3C 00031080 */ sll $v0, $v1, 2 -/* B9E8A0 80240F40 3C018024 */ lui $at, %hi(D_80242D88) +/* B9E8A0 80240F40 3C018024 */ lui $at, %hi(jtbl_80242D88_BA06E8) /* B9E8A4 80240F44 00220821 */ addu $at, $at, $v0 -/* B9E8A8 80240F48 8C222D88 */ lw $v0, %lo(D_80242D88)($at) +/* B9E8A8 80240F48 8C222D88 */ lw $v0, %lo(jtbl_80242D88_BA06E8)($at) /* B9E8AC 80240F4C 00400008 */ jr $v0 -/* B9E8B0 80240F50 00000000 */ nop +/* B9E8B0 80240F50 00000000 */ nop +glabel L80240F54_B9E8B4 /* B9E8B4 80240F54 0260202D */ daddu $a0, $s3, $zero /* B9E8B8 80240F58 0280282D */ daddu $a1, $s4, $zero /* B9E8BC 80240F5C 0C090080 */ jal func_80240200_B9DB60 /* B9E8C0 80240F60 0200302D */ daddu $a2, $s0, $zero +glabel L80240F64_B9E8C4 /* B9E8C4 80240F64 0260202D */ daddu $a0, $s3, $zero /* B9E8C8 80240F68 0280282D */ daddu $a1, $s4, $zero /* B9E8CC 80240F6C 0C09010C */ jal func_80240430_B9DD90 /* B9E8D0 80240F70 0200302D */ daddu $a2, $s0, $zero /* B9E8D4 80240F74 080903FC */ j .L80240FF0 /* B9E8D8 80240F78 0000102D */ daddu $v0, $zero, $zero +glabel L80240F7C_B9E8DC /* B9E8DC 80240F7C 0260202D */ daddu $a0, $s3, $zero /* B9E8E0 80240F80 0280282D */ daddu $a1, $s4, $zero /* B9E8E4 80240F84 0C0901DA */ jal mim_04_UnkNpcAIFunc1 @@ -111,27 +114,32 @@ glabel func_80240DF0_B9E750 /* B9E8F0 80240F90 24020003 */ addiu $v0, $zero, 3 /* B9E8F4 80240F94 14620016 */ bne $v1, $v0, .L80240FF0 /* B9E8F8 80240F98 0000102D */ daddu $v0, $zero, $zero +glabel L80240F9C_B9E8FC /* B9E8FC 80240F9C 0260202D */ daddu $a0, $s3, $zero /* B9E900 80240FA0 0280282D */ daddu $a1, $s4, $zero /* B9E904 80240FA4 0C09020A */ jal func_80240828_B9E188 /* B9E908 80240FA8 0200302D */ daddu $a2, $s0, $zero /* B9E90C 80240FAC 080903FC */ j .L80240FF0 /* B9E910 80240FB0 0000102D */ daddu $v0, $zero, $zero +glabel L80240FB4_B9E914 /* B9E914 80240FB4 0260202D */ daddu $a0, $s3, $zero /* B9E918 80240FB8 0280282D */ daddu $a1, $s4, $zero /* B9E91C 80240FBC 0C090273 */ jal func_802409CC_B9E32C /* B9E920 80240FC0 0200302D */ daddu $a2, $s0, $zero +glabel L80240FC4_B9E924 /* B9E924 80240FC4 0260202D */ daddu $a0, $s3, $zero /* B9E928 80240FC8 0280282D */ daddu $a1, $s4, $zero /* B9E92C 80240FCC 0C0902AB */ jal func_80240AAC_B9E40C /* B9E930 80240FD0 0200302D */ daddu $a2, $s0, $zero /* B9E934 80240FD4 080903FC */ j .L80240FF0 /* B9E938 80240FD8 0000102D */ daddu $v0, $zero, $zero +glabel L80240FDC_B9E93C /* B9E93C 80240FDC 0260202D */ daddu $a0, $s3, $zero /* B9E940 80240FE0 0280282D */ daddu $a1, $s4, $zero /* B9E944 80240FE4 0C09036B */ jal mim_04_UnkDurationCheck /* B9E948 80240FE8 0200302D */ daddu $a2, $s0, $zero .L80240FEC: +glabel L80240FEC_B9E94C /* B9E94C 80240FEC 0000102D */ daddu $v0, $zero, $zero .L80240FF0: /* B9E950 80240FF0 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80241014_B9E974.s b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80241014_B9E974.s index 23c6b358f7..6210804338 100644 --- a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80241014_B9E974.s +++ b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80241014_B9E974.s @@ -26,7 +26,7 @@ glabel func_80241014_B9E974 /* B9E9C4 80241064 1440FFFA */ bnez $v0, .L80241050 /* B9E9C8 80241068 24A50004 */ addiu $a1, $a1, 4 /* B9E9CC 8024106C 0809042C */ j .L802410B0 -/* B9E9D0 80241070 00000000 */ nop +/* B9E9D0 80241070 00000000 */ nop .L80241074: /* B9E9D4 80241074 0000182D */ daddu $v1, $zero, $zero /* B9E9D8 80241078 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA0730/func_80240000_BA0730.s b/asm/nonmatchings/world/area_mim/mim_05/BA0730/func_80240000_BA0730.s index e041a3de90..8ca24fa74c 100644 --- a/asm/nonmatchings/world/area_mim/mim_05/BA0730/func_80240000_BA0730.s +++ b/asm/nonmatchings/world/area_mim/mim_05/BA0730/func_80240000_BA0730.s @@ -5,7 +5,7 @@ glabel func_80240000_BA0730 /* BA0730 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 /* BA0734 80240004 AFBF0010 */ sw $ra, 0x10($sp) /* BA0738 80240008 0C046ED4 */ jal enable_world_fog -/* BA073C 8024000C 00000000 */ nop +/* BA073C 8024000C 00000000 */ nop /* BA0740 80240010 240403DE */ addiu $a0, $zero, 0x3de /* BA0744 80240014 0C046EDD */ jal set_world_fog_dist /* BA0748 80240018 240503E8 */ addiu $a1, $zero, 0x3e8 @@ -15,7 +15,7 @@ glabel func_80240000_BA0730 /* BA0758 80240028 0C046EE2 */ jal set_world_fog_color /* BA075C 8024002C 240700FF */ addiu $a3, $zero, 0xff /* BA0760 80240030 0C048BFB */ jal enable_entity_fog -/* BA0764 80240034 00000000 */ nop +/* BA0764 80240034 00000000 */ nop /* BA0768 80240038 240403DE */ addiu $a0, $zero, 0x3de /* BA076C 8024003C 0C048C04 */ jal set_entity_fog_dist /* BA0770 80240040 240503E8 */ addiu $a1, $zero, 0x3e8 @@ -28,5 +28,5 @@ glabel func_80240000_BA0730 /* BA078C 8024005C 24020002 */ addiu $v0, $zero, 2 /* BA0790 80240060 03E00008 */ jr $ra /* BA0794 80240064 27BD0018 */ addiu $sp, $sp, 0x18 -/* BA0798 80240068 00000000 */ nop -/* BA079C 8024006C 00000000 */ nop +/* BA0798 80240068 00000000 */ nop +/* BA079C 8024006C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240278_BA09A8.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240278_BA09A8.s index 6f7a92a4d7..08669abb0a 100644 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240278_BA09A8.s +++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240278_BA09A8.s @@ -42,7 +42,7 @@ glabel func_80240278_BA09A8 /* BA0A3C 8024030C C6620074 */ lwc1 $f2, 0x74($s3) /* BA0A40 80240310 468010A0 */ cvt.s.w $f2, $f2 /* BA0A44 80240314 4600103C */ c.lt.s $f2, $f0 -/* BA0A48 80240318 00000000 */ nop +/* BA0A48 80240318 00000000 */ nop /* BA0A4C 8024031C 45030001 */ bc1tl .L80240324 /* BA0A50 80240320 0000882D */ daddu $s1, $zero, $zero .L80240324: @@ -51,16 +51,16 @@ glabel func_80240278_BA09A8 /* BA0A5C 8024032C 3C014387 */ lui $at, 0x4387 /* BA0A60 80240330 4481A000 */ mtc1 $at, $f20 /* BA0A64 80240334 0C00A70A */ jal get_clamped_angle_diff -/* BA0A68 80240338 00000000 */ nop +/* BA0A68 80240338 00000000 */ nop /* BA0A6C 8024033C 0C00A6C9 */ jal clamp_angle /* BA0A70 80240340 46000306 */ mov.s $f12, $f0 /* BA0A74 80240344 3C018024 */ lui $at, %hi(D_80243E80) /* BA0A78 80240348 D4223E80 */ ldc1 $f2, %lo(D_80243E80)($at) /* BA0A7C 8024034C 46000021 */ cvt.d.s $f0, $f0 /* BA0A80 80240350 4622003C */ c.lt.d $f0, $f2 -/* BA0A84 80240354 00000000 */ nop +/* BA0A84 80240354 00000000 */ nop /* BA0A88 80240358 45000003 */ bc1f .L80240368 -/* BA0A8C 8024035C 00000000 */ nop +/* BA0A8C 8024035C 00000000 */ nop /* BA0A90 80240360 3C0142B4 */ lui $at, 0x42b4 /* BA0A94 80240364 4481A000 */ mtc1 $at, $f20 .L80240368: @@ -77,7 +77,7 @@ glabel func_80240278_BA09A8 /* BA0AC0 80240390 468010A0 */ cvt.s.w $f2, $f2 /* BA0AC4 80240394 46000005 */ abs.s $f0, $f0 /* BA0AC8 80240398 4600103C */ c.lt.s $f2, $f0 -/* BA0ACC 8024039C 00000000 */ nop +/* BA0ACC 8024039C 00000000 */ nop /* BA0AD0 802403A0 45030001 */ bc1tl .L802403A8 /* BA0AD4 802403A4 0000882D */ daddu $s1, $zero, $zero .L802403A8: @@ -87,13 +87,13 @@ glabel func_80240278_BA09A8 /* BA0AE4 802403B4 860200A8 */ lh $v0, 0xa8($s0) /* BA0AE8 802403B8 46020001 */ sub.s $f0, $f0, $f2 /* BA0AEC 802403BC 44821000 */ mtc1 $v0, $f2 -/* BA0AF0 802403C0 00000000 */ nop +/* BA0AF0 802403C0 00000000 */ nop /* BA0AF4 802403C4 468010A1 */ cvt.d.w $f2, $f2 /* BA0AF8 802403C8 46221080 */ add.d $f2, $f2, $f2 /* BA0AFC 802403CC 46000005 */ abs.s $f0, $f0 /* BA0B00 802403D0 46000021 */ cvt.d.s $f0, $f0 /* BA0B04 802403D4 4620103E */ c.le.d $f2, $f0 -/* BA0B08 802403D8 00000000 */ nop +/* BA0B08 802403D8 00000000 */ nop /* BA0B0C 802403DC 45030001 */ bc1tl .L802403E4 /* BA0B10 802403E0 0000882D */ daddu $s1, $zero, $zero .L802403E4: diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024042C_BA0B5C.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024042C_BA0B5C.s index c3b1e030f3..34d0713702 100644 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024042C_BA0B5C.s +++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024042C_BA0B5C.s @@ -19,7 +19,7 @@ glabel func_8024042C_BA0B5C /* BA0B94 80240464 8E2200B0 */ lw $v0, 0xb0($s1) /* BA0B98 80240468 30420004 */ andi $v0, $v0, 4 /* BA0B9C 8024046C 10400015 */ beqz $v0, .L802404C4 -/* BA0BA0 80240470 00000000 */ nop +/* BA0BA0 80240470 00000000 */ nop .L80240474: /* BA0BA4 80240474 AE800070 */ sw $zero, 0x70($s4) /* BA0BA8 80240478 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel func_8024042C_BA0B5C /* BA0BF8 802404C8 12600005 */ beqz $s3, .L802404E0 /* BA0BFC 802404CC 24020001 */ addiu $v0, $zero, 1 /* BA0C00 802404D0 12620048 */ beq $s3, $v0, .L802405F4 -/* BA0C04 802404D4 00000000 */ nop +/* BA0C04 802404D4 00000000 */ nop /* BA0C08 802404D8 0809019A */ j .L80240668 -/* BA0C0C 802404DC 00000000 */ nop +/* BA0C0C 802404DC 00000000 */ nop .L802404E0: /* BA0C10 802404E0 86240008 */ lh $a0, 8($s1) /* BA0C14 802404E4 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel func_8024042C_BA0B5C /* BA0C34 80240504 8E03006C */ lw $v1, 0x6c($s0) /* BA0C38 80240508 24020003 */ addiu $v0, $zero, 3 /* BA0C3C 8024050C 14620056 */ bne $v1, $v0, .L80240668 -/* BA0C40 80240510 00000000 */ nop +/* BA0C40 80240510 00000000 */ nop /* BA0C44 80240514 8E2500A8 */ lw $a1, 0xa8($s1) /* BA0C48 80240518 10A00003 */ beqz $a1, .L80240528 /* BA0C4C 8024051C 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel func_8024042C_BA0B5C /* BA0CC4 80240594 C7A20014 */ lwc1 $f2, 0x14($sp) /* BA0CC8 80240598 4600020D */ trunc.w.s $f8, $f0 /* BA0CCC 8024059C 44024000 */ mfc1 $v0, $f8 -/* BA0CD0 802405A0 00000000 */ nop +/* BA0CD0 802405A0 00000000 */ nop /* BA0CD4 802405A4 A6220012 */ sh $v0, 0x12($s1) /* BA0CD8 802405A8 4600120D */ trunc.w.s $f8, $f2 /* BA0CDC 802405AC 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s index cba9a0a814..be24124b5e 100644 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s +++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s @@ -100,78 +100,93 @@ glabel func_8024068C_BA0DBC /* BA0F20 802407F0 2C620064 */ sltiu $v0, $v1, 0x64 /* BA0F24 802407F4 10400048 */ beqz $v0, .L80240918 /* BA0F28 802407F8 00031080 */ sll $v0, $v1, 2 -/* BA0F2C 802407FC 3C018024 */ lui $at, %hi(D_80243E88) +/* BA0F2C 802407FC 3C018024 */ lui $at, %hi(jtbl_80243E88_BA45B8) /* BA0F30 80240800 00220821 */ addu $at, $at, $v0 -/* BA0F34 80240804 8C223E88 */ lw $v0, %lo(D_80243E88)($at) +/* BA0F34 80240804 8C223E88 */ lw $v0, %lo(jtbl_80243E88_BA45B8)($at) /* BA0F38 80240808 00400008 */ jr $v0 /* BA0F3C 8024080C 00000000 */ nop +glabel L80240810_BA0F40 /* BA0F40 80240810 0240202D */ daddu $a0, $s2, $zero /* BA0F44 80240814 0260282D */ daddu $a1, $s3, $zero /* BA0F48 80240818 0C012568 */ jal func_800495A0 /* BA0F4C 8024081C 0280302D */ daddu $a2, $s4, $zero +glabel L80240820_BA0F50 /* BA0F50 80240820 0240202D */ daddu $a0, $s2, $zero /* BA0F54 80240824 0260282D */ daddu $a1, $s3, $zero /* BA0F58 80240828 0C0125AE */ jal func_800496B8 /* BA0F5C 8024082C 0280302D */ daddu $a2, $s4, $zero /* BA0F60 80240830 08090246 */ j .L80240918 /* BA0F64 80240834 00000000 */ nop +glabel L80240838_BA0F68 /* BA0F68 80240838 0240202D */ daddu $a0, $s2, $zero /* BA0F6C 8024083C 0260282D */ daddu $a1, $s3, $zero /* BA0F70 80240840 0C0126D1 */ jal base_UnkNpcAIFunc1 /* BA0F74 80240844 0280302D */ daddu $a2, $s4, $zero +glabel L80240848_BA0F78 /* BA0F78 80240848 0240202D */ daddu $a0, $s2, $zero /* BA0F7C 8024084C 0260282D */ daddu $a1, $s3, $zero /* BA0F80 80240850 0C012701 */ jal func_80049C04 /* BA0F84 80240854 0280302D */ daddu $a2, $s4, $zero /* BA0F88 80240858 08090246 */ j .L80240918 /* BA0F8C 8024085C 00000000 */ nop +glabel L80240860_BA0F90 /* BA0F90 80240860 0240202D */ daddu $a0, $s2, $zero /* BA0F94 80240864 0260282D */ daddu $a1, $s3, $zero /* BA0F98 80240868 0C01278F */ jal func_80049E3C /* BA0F9C 8024086C 0280302D */ daddu $a2, $s4, $zero +glabel L80240870_BA0FA0 /* BA0FA0 80240870 0240202D */ daddu $a0, $s2, $zero /* BA0FA4 80240874 0260282D */ daddu $a1, $s3, $zero /* BA0FA8 80240878 0C0127B3 */ jal func_80049ECC /* BA0FAC 8024087C 0280302D */ daddu $a2, $s4, $zero /* BA0FB0 80240880 08090246 */ j .L80240918 /* BA0FB4 80240884 00000000 */ nop +glabel L80240888_BA0FB8 /* BA0FB8 80240888 0240202D */ daddu $a0, $s2, $zero /* BA0FBC 8024088C 0260282D */ daddu $a1, $s3, $zero /* BA0FC0 80240890 0C0127DF */ jal func_80049F7C /* BA0FC4 80240894 0280302D */ daddu $a2, $s4, $zero +glabel L80240898_BA0FC8 /* BA0FC8 80240898 0240202D */ daddu $a0, $s2, $zero /* BA0FCC 8024089C 0260282D */ daddu $a1, $s3, $zero /* BA0FD0 802408A0 0C012849 */ jal func_8004A124 /* BA0FD4 802408A4 0280302D */ daddu $a2, $s4, $zero /* BA0FD8 802408A8 08090246 */ j .L80240918 /* BA0FDC 802408AC 00000000 */ nop +glabel L802408B0_BA0FE0 /* BA0FE0 802408B0 0240202D */ daddu $a0, $s2, $zero /* BA0FE4 802408B4 0260282D */ daddu $a1, $s3, $zero /* BA0FE8 802408B8 0C0128FA */ jal func_8004A3E8 /* BA0FEC 802408BC 0280302D */ daddu $a2, $s4, $zero /* BA0FF0 802408C0 08090246 */ j .L80240918 /* BA0FF4 802408C4 00000000 */ nop +glabel L802408C8_BA0FF8 /* BA0FF8 802408C8 0C09001C */ jal mim_05_UnkNpcAIFunc6 /* BA0FFC 802408CC 0240202D */ daddu $a0, $s2, $zero +glabel L802408D0_BA1000 /* BA1000 802408D0 0C090037 */ jal mim_05_UnkNpcAIFunc7 /* BA1004 802408D4 0240202D */ daddu $a0, $s2, $zero /* BA1008 802408D8 8E430070 */ lw $v1, 0x70($s2) /* BA100C 802408DC 24020020 */ addiu $v0, $zero, 0x20 /* BA1010 802408E0 1462000D */ bne $v1, $v0, .L80240918 /* BA1014 802408E4 00000000 */ nop +glabel L802408E8_BA1018 /* BA1018 802408E8 0C090053 */ jal mim_05_UnkNpcAIFunc8 /* BA101C 802408EC 0240202D */ daddu $a0, $s2, $zero /* BA1020 802408F0 8E430070 */ lw $v1, 0x70($s2) /* BA1024 802408F4 24020021 */ addiu $v0, $zero, 0x21 /* BA1028 802408F8 14620007 */ bne $v1, $v0, .L80240918 /* BA102C 802408FC 00000000 */ nop +glabel L80240900_BA1030 /* BA1030 80240900 0C090089 */ jal mim_05_UnkNpcAIFunc5 /* BA1034 80240904 0240202D */ daddu $a0, $s2, $zero /* BA1038 80240908 08090246 */ j .L80240918 /* BA103C 8024090C 00000000 */ nop +glabel L80240910_BA1040 /* BA1040 80240910 0C0129CF */ jal func_8004A73C /* BA1044 80240914 0240202D */ daddu $a0, $s2, $zero .L80240918: +glabel L80240918_BA1048 /* BA1048 80240918 8FBF0048 */ lw $ra, 0x48($sp) /* BA104C 8024091C 8FB50044 */ lw $s5, 0x44($sp) /* BA1050 80240920 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802409AC_BA10DC.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802409AC_BA10DC.s index 71b35efcde..88d499e840 100644 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802409AC_BA10DC.s +++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802409AC_BA10DC.s @@ -38,7 +38,7 @@ glabel func_802409AC_BA10DC /* BA1160 80240A30 3C01C1A0 */ lui $at, 0xc1a0 /* BA1164 80240A34 44812000 */ mtc1 $at, $f4 /* BA1168 80240A38 44833000 */ mtc1 $v1, $f6 -/* BA116C 80240A3C 00000000 */ nop +/* BA116C 80240A3C 00000000 */ nop /* BA1170 80240A40 468031A0 */ cvt.s.w $f6, $f6 /* BA1174 80240A44 44073000 */ mfc1 $a3, $f6 /* BA1178 80240A48 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240AA8_BA11D8.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240AA8_BA11D8.s index 42df0843aa..9d416de206 100644 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240AA8_BA11D8.s +++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240AA8_BA11D8.s @@ -39,18 +39,18 @@ glabel func_80240AA8_BA11D8 .L80240B30: /* BA1260 80240B30 8622008E */ lh $v0, 0x8e($s1) /* BA1264 80240B34 1440025D */ bnez $v0, .L802414AC -/* BA1268 80240B38 00000000 */ nop +/* BA1268 80240B38 00000000 */ nop /* BA126C 80240B3C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* BA1270 80240B40 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* BA1274 80240B44 0C00A6C9 */ jal clamp_angle /* BA1278 80240B48 C44C00A8 */ lwc1 $f12, 0xa8($v0) /* BA127C 80240B4C 3C014334 */ lui $at, 0x4334 /* BA1280 80240B50 44811000 */ mtc1 $at, $f2 -/* BA1284 80240B54 00000000 */ nop +/* BA1284 80240B54 00000000 */ nop /* BA1288 80240B58 4602003C */ c.lt.s $f0, $f2 -/* BA128C 80240B5C 00000000 */ nop +/* BA128C 80240B5C 00000000 */ nop /* BA1290 80240B60 45000011 */ bc1f .L80240BA8 -/* BA1294 80240B64 00000000 */ nop +/* BA1294 80240B64 00000000 */ nop /* BA1298 80240B68 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* BA129C 80240B6C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* BA12A0 80240B70 3C0142B4 */ lui $at, 0x42b4 @@ -85,7 +85,7 @@ glabel func_80240AA8_BA11D8 /* BA1310 80240BE0 460C0300 */ add.s $f12, $f0, $f12 .L80240BE4: /* BA1314 80240BE4 0C00A6C9 */ jal clamp_angle -/* BA1318 80240BE8 00000000 */ nop +/* BA1318 80240BE8 00000000 */ nop /* BA131C 80240BEC 46000586 */ mov.s $f22, $f0 /* BA1320 80240BF0 3C014334 */ lui $at, 0x4334 /* BA1324 80240BF4 44816000 */ mtc1 $at, $f12 @@ -134,7 +134,7 @@ glabel func_80240AA8_BA11D8 /* BA13C0 80240C90 862200A6 */ lh $v0, 0xa6($s1) /* BA13C4 80240C94 8EA30000 */ lw $v1, ($s5) /* BA13C8 80240C98 44824000 */ mtc1 $v0, $f8 -/* BA13CC 80240C9C 00000000 */ nop +/* BA13CC 80240C9C 00000000 */ nop /* BA13D0 80240CA0 46804220 */ cvt.s.w $f8, $f8 /* BA13D4 80240CA4 C4600028 */ lwc1 $f0, 0x28($v1) /* BA13D8 80240CA8 44064000 */ mfc1 $a2, $f8 @@ -146,7 +146,7 @@ glabel func_80240AA8_BA11D8 /* BA13F0 80240CC0 E6200040 */ swc1 $f0, 0x40($s1) /* BA13F4 80240CC4 862200A6 */ lh $v0, 0xa6($s1) /* BA13F8 80240CC8 44820000 */ mtc1 $v0, $f0 -/* BA13FC 80240CCC 00000000 */ nop +/* BA13FC 80240CCC 00000000 */ nop /* BA1400 80240CD0 46800020 */ cvt.s.w $f0, $f0 /* BA1404 80240CD4 4600A000 */ add.s $f0, $f20, $f0 /* BA1408 80240CD8 4406B000 */ mfc1 $a2, $f22 @@ -155,18 +155,18 @@ glabel func_80240AA8_BA11D8 /* BA1414 80240CE4 0220202D */ daddu $a0, $s1, $zero /* BA1418 80240CE8 8EC20088 */ lw $v0, 0x88($s6) /* BA141C 80240CEC 1440005D */ bnez $v0, .L80240E64 -/* BA1420 80240CF0 00000000 */ nop +/* BA1420 80240CF0 00000000 */ nop /* BA1424 80240CF4 C6200038 */ lwc1 $f0, 0x38($s1) /* BA1428 80240CF8 3C018024 */ lui $at, %hi(D_80244018) /* BA142C 80240CFC D4244018 */ ldc1 $f4, %lo(D_80244018)($at) /* BA1430 80240D00 46000021 */ cvt.d.s $f0, $f0 /* BA1434 80240D04 4620203C */ c.lt.d $f4, $f0 -/* BA1438 80240D08 00000000 */ nop +/* BA1438 80240D08 00000000 */ nop /* BA143C 80240D0C 45000005 */ bc1f .L80240D24 -/* BA1440 80240D10 00000000 */ nop +/* BA1440 80240D10 00000000 */ nop /* BA1444 80240D14 3C0143BE */ lui $at, 0x43be /* BA1448 80240D18 44810000 */ mtc1 $at, $f0 -/* BA144C 80240D1C 00000000 */ nop +/* BA144C 80240D1C 00000000 */ nop /* BA1450 80240D20 E6200038 */ swc1 $f0, 0x38($s1) .L80240D24: /* BA1454 80240D24 C6200038 */ lwc1 $f0, 0x38($s1) @@ -174,50 +174,50 @@ glabel func_80240AA8_BA11D8 /* BA145C 80240D2C D4224020 */ ldc1 $f2, %lo(D_80244020)($at) /* BA1460 80240D30 46000021 */ cvt.d.s $f0, $f0 /* BA1464 80240D34 4622003C */ c.lt.d $f0, $f2 -/* BA1468 80240D38 00000000 */ nop +/* BA1468 80240D38 00000000 */ nop /* BA146C 80240D3C 45000005 */ bc1f .L80240D54 -/* BA1470 80240D40 00000000 */ nop +/* BA1470 80240D40 00000000 */ nop /* BA1474 80240D44 3C01C3BE */ lui $at, 0xc3be /* BA1478 80240D48 44810000 */ mtc1 $at, $f0 -/* BA147C 80240D4C 00000000 */ nop +/* BA147C 80240D4C 00000000 */ nop /* BA1480 80240D50 E6200038 */ swc1 $f0, 0x38($s1) .L80240D54: /* BA1484 80240D54 C6200040 */ lwc1 $f0, 0x40($s1) /* BA1488 80240D58 46000021 */ cvt.d.s $f0, $f0 /* BA148C 80240D5C 4620203C */ c.lt.d $f4, $f0 -/* BA1490 80240D60 00000000 */ nop +/* BA1490 80240D60 00000000 */ nop /* BA1494 80240D64 45000005 */ bc1f .L80240D7C -/* BA1498 80240D68 00000000 */ nop +/* BA1498 80240D68 00000000 */ nop /* BA149C 80240D6C 3C0143BE */ lui $at, 0x43be /* BA14A0 80240D70 44810000 */ mtc1 $at, $f0 -/* BA14A4 80240D74 00000000 */ nop +/* BA14A4 80240D74 00000000 */ nop /* BA14A8 80240D78 E6200040 */ swc1 $f0, 0x40($s1) .L80240D7C: /* BA14AC 80240D7C C6200040 */ lwc1 $f0, 0x40($s1) /* BA14B0 80240D80 46000021 */ cvt.d.s $f0, $f0 /* BA14B4 80240D84 4622003C */ c.lt.d $f0, $f2 -/* BA14B8 80240D88 00000000 */ nop +/* BA14B8 80240D88 00000000 */ nop /* BA14BC 80240D8C 45000005 */ bc1f .L80240DA4 -/* BA14C0 80240D90 00000000 */ nop +/* BA14C0 80240D90 00000000 */ nop /* BA14C4 80240D94 3C01C3BE */ lui $at, 0xc3be /* BA14C8 80240D98 44810000 */ mtc1 $at, $f0 -/* BA14CC 80240D9C 00000000 */ nop +/* BA14CC 80240D9C 00000000 */ nop /* BA14D0 80240DA0 E6200040 */ swc1 $f0, 0x40($s1) .L80240DA4: /* BA14D4 80240DA4 C6220038 */ lwc1 $f2, 0x38($s1) /* BA14D8 80240DA8 46021082 */ mul.s $f2, $f2, $f2 -/* BA14DC 80240DAC 00000000 */ nop +/* BA14DC 80240DAC 00000000 */ nop /* BA14E0 80240DB0 C6200040 */ lwc1 $f0, 0x40($s1) /* BA14E4 80240DB4 46000002 */ mul.s $f0, $f0, $f0 -/* BA14E8 80240DB8 00000000 */ nop +/* BA14E8 80240DB8 00000000 */ nop /* BA14EC 80240DBC 46001300 */ add.s $f12, $f2, $f0 /* BA14F0 80240DC0 46006004 */ sqrt.s $f0, $f12 /* BA14F4 80240DC4 46000032 */ c.eq.s $f0, $f0 -/* BA14F8 80240DC8 00000000 */ nop +/* BA14F8 80240DC8 00000000 */ nop /* BA14FC 80240DCC 45010003 */ bc1t .L80240DDC -/* BA1500 80240DD0 00000000 */ nop +/* BA1500 80240DD0 00000000 */ nop /* BA1504 80240DD4 0C0187BC */ jal sqrtf -/* BA1508 80240DD8 00000000 */ nop +/* BA1508 80240DD8 00000000 */ nop .L80240DDC: /* BA150C 80240DDC 8E260038 */ lw $a2, 0x38($s1) /* BA1510 80240DE0 8E270040 */ lw $a3, 0x40($s1) @@ -232,7 +232,7 @@ glabel func_80240AA8_BA11D8 /* BA1534 80240E04 D4204028 */ ldc1 $f0, %lo(D_80244028)($at) /* BA1538 80240E08 460010A1 */ cvt.d.s $f2, $f2 /* BA153C 80240E0C 4620103C */ c.lt.d $f2, $f0 -/* BA1540 80240E10 00000000 */ nop +/* BA1540 80240E10 00000000 */ nop /* BA1544 80240E14 45000004 */ bc1f .L80240E28 /* BA1548 80240E18 0200202D */ daddu $a0, $s0, $zero /* BA154C 80240E1C 3C064398 */ lui $a2, 0x4398 @@ -242,9 +242,9 @@ glabel func_80240AA8_BA11D8 /* BA1558 80240E28 3C018024 */ lui $at, %hi(func_80244030) /* BA155C 80240E2C D4204030 */ ldc1 $f0, %lo(func_80244030)($at) /* BA1560 80240E30 4622003C */ c.lt.d $f0, $f2 -/* BA1564 80240E34 00000000 */ nop +/* BA1564 80240E34 00000000 */ nop /* BA1568 80240E38 450000FA */ bc1f .L80241224 -/* BA156C 80240E3C 00000000 */ nop +/* BA156C 80240E3C 00000000 */ nop /* BA1570 80240E40 3C0643BB */ lui $a2, 0x43bb /* BA1574 80240E44 34C68000 */ ori $a2, $a2, 0x8000 .L80240E48: @@ -254,7 +254,7 @@ glabel func_80240AA8_BA11D8 /* BA1584 80240E54 0C00A7E7 */ jal add_vec2D_polar /* BA1588 80240E58 E6340040 */ swc1 $f20, 0x40($s1) /* BA158C 80240E5C 08090489 */ j .L80241224 -/* BA1590 80240E60 00000000 */ nop +/* BA1590 80240E60 00000000 */ nop .L80240E64: /* BA1594 80240E64 8E220000 */ lw $v0, ($s1) /* BA1598 80240E68 30420040 */ andi $v0, $v0, 0x40 @@ -281,13 +281,13 @@ glabel func_80240AA8_BA11D8 /* BA15EC 80240EBC 862200A8 */ lh $v0, 0xa8($s1) /* BA15F0 80240EC0 0260302D */ daddu $a2, $s3, $zero /* BA15F4 80240EC4 44820000 */ mtc1 $v0, $f0 -/* BA15F8 80240EC8 00000000 */ nop +/* BA15F8 80240EC8 00000000 */ nop /* BA15FC 80240ECC 46800020 */ cvt.s.w $f0, $f0 /* BA1600 80240ED0 E7A00018 */ swc1 $f0, 0x18($sp) /* BA1604 80240ED4 862200A6 */ lh $v0, 0xa6($s1) /* BA1608 80240ED8 27B00028 */ addiu $s0, $sp, 0x28 /* BA160C 80240EDC 44820000 */ mtc1 $v0, $f0 -/* BA1610 80240EE0 00000000 */ nop +/* BA1610 80240EE0 00000000 */ nop /* BA1614 80240EE4 46800020 */ cvt.s.w $f0, $f0 /* BA1618 80240EE8 E7A0001C */ swc1 $f0, 0x1c($sp) /* BA161C 80240EEC 8E240080 */ lw $a0, 0x80($s1) @@ -311,13 +311,13 @@ glabel func_80240AA8_BA11D8 /* BA1664 80240F34 E7B60014 */ swc1 $f22, 0x14($sp) /* BA1668 80240F38 862200A8 */ lh $v0, 0xa8($s1) /* BA166C 80240F3C 44820000 */ mtc1 $v0, $f0 -/* BA1670 80240F40 00000000 */ nop +/* BA1670 80240F40 00000000 */ nop /* BA1674 80240F44 46800020 */ cvt.s.w $f0, $f0 /* BA1678 80240F48 E7A00018 */ swc1 $f0, 0x18($sp) /* BA167C 80240F4C 862200A6 */ lh $v0, 0xa6($s1) /* BA1680 80240F50 0260302D */ daddu $a2, $s3, $zero /* BA1684 80240F54 44820000 */ mtc1 $v0, $f0 -/* BA1688 80240F58 00000000 */ nop +/* BA1688 80240F58 00000000 */ nop /* BA168C 80240F5C 46800020 */ cvt.s.w $f0, $f0 /* BA1690 80240F60 E7A0001C */ swc1 $f0, 0x1c($sp) /* BA1694 80240F64 8E240080 */ lw $a0, 0x80($s1) @@ -347,32 +347,32 @@ glabel func_80240AA8_BA11D8 /* BA16F4 80240FC4 0C0372DF */ jal func_800DCB7C /* BA16F8 80240FC8 0040802D */ daddu $s0, $v0, $zero /* BA16FC 80240FCC 1600001C */ bnez $s0, .L80241040 -/* BA1700 80240FD0 00000000 */ nop +/* BA1700 80240FD0 00000000 */ nop /* BA1704 80240FD4 1040001A */ beqz $v0, .L80241040 -/* BA1708 80240FD8 00000000 */ nop +/* BA1708 80240FD8 00000000 */ nop /* BA170C 80240FDC C7A20038 */ lwc1 $f2, 0x38($sp) /* BA1710 80240FE0 3C014054 */ lui $at, 0x4054 /* BA1714 80240FE4 44810800 */ mtc1 $at, $f1 /* BA1718 80240FE8 44800000 */ mtc1 $zero, $f0 /* BA171C 80240FEC 460010A1 */ cvt.d.s $f2, $f2 /* BA1720 80240FF0 4622003C */ c.lt.d $f0, $f2 -/* BA1724 80240FF4 00000000 */ nop +/* BA1724 80240FF4 00000000 */ nop /* BA1728 80240FF8 45000011 */ bc1f .L80241040 -/* BA172C 80240FFC 00000000 */ nop +/* BA172C 80240FFC 00000000 */ nop /* BA1730 80241000 3C01405E */ lui $at, 0x405e /* BA1734 80241004 44810800 */ mtc1 $at, $f1 /* BA1738 80241008 44800000 */ mtc1 $zero, $f0 -/* BA173C 8024100C 00000000 */ nop +/* BA173C 8024100C 00000000 */ nop /* BA1740 80241010 4620103C */ c.lt.d $f2, $f0 -/* BA1744 80241014 00000000 */ nop +/* BA1744 80241014 00000000 */ nop /* BA1748 80241018 45000009 */ bc1f .L80241040 -/* BA174C 8024101C 00000000 */ nop +/* BA174C 8024101C 00000000 */ nop /* BA1750 80241020 C622003C */ lwc1 $f2, 0x3c($s1) /* BA1754 80241024 C7A00030 */ lwc1 $f0, 0x30($sp) /* BA1758 80241028 46001032 */ c.eq.s $f2, $f0 -/* BA175C 8024102C 00000000 */ nop +/* BA175C 8024102C 00000000 */ nop /* BA1760 80241030 45010003 */ bc1t .L80241040 -/* BA1764 80241034 00000000 */ nop +/* BA1764 80241034 00000000 */ nop /* BA1768 80241038 08090489 */ j .L80241224 /* BA176C 8024103C 241E0001 */ addiu $fp, $zero, 1 .L80241040: @@ -396,13 +396,13 @@ glabel func_80240AA8_BA11D8 /* BA17B4 80241084 862200A8 */ lh $v0, 0xa8($s1) /* BA17B8 80241088 27A50020 */ addiu $a1, $sp, 0x20 /* BA17BC 8024108C 44820000 */ mtc1 $v0, $f0 -/* BA17C0 80241090 00000000 */ nop +/* BA17C0 80241090 00000000 */ nop /* BA17C4 80241094 46800020 */ cvt.s.w $f0, $f0 /* BA17C8 80241098 E7A00018 */ swc1 $f0, 0x18($sp) /* BA17CC 8024109C 862200A6 */ lh $v0, 0xa6($s1) /* BA17D0 802410A0 27A60024 */ addiu $a2, $sp, 0x24 /* BA17D4 802410A4 44820000 */ mtc1 $v0, $f0 -/* BA17D8 802410A8 00000000 */ nop +/* BA17D8 802410A8 00000000 */ nop /* BA17DC 802410AC 46800020 */ cvt.s.w $f0, $f0 /* BA17E0 802410B0 E7A0001C */ swc1 $f0, 0x1c($sp) /* BA17E4 802410B4 8E240080 */ lw $a0, 0x80($s1) @@ -420,7 +420,7 @@ glabel func_80240AA8_BA11D8 /* BA1814 802410E4 862200A6 */ lh $v0, 0xa6($s1) /* BA1818 802410E8 4407C000 */ mfc1 $a3, $f24 /* BA181C 802410EC 44824000 */ mtc1 $v0, $f8 -/* BA1820 802410F0 00000000 */ nop +/* BA1820 802410F0 00000000 */ nop /* BA1824 802410F4 46804220 */ cvt.s.w $f8, $f8 /* BA1828 802410F8 C4600028 */ lwc1 $f0, 0x28($v1) /* BA182C 802410FC 44064000 */ mfc1 $a2, $f8 @@ -432,7 +432,7 @@ glabel func_80240AA8_BA11D8 /* BA1844 80241114 E6200040 */ swc1 $f0, 0x40($s1) /* BA1848 80241118 862200A6 */ lh $v0, 0xa6($s1) /* BA184C 8024111C 44820000 */ mtc1 $v0, $f0 -/* BA1850 80241120 00000000 */ nop +/* BA1850 80241120 00000000 */ nop /* BA1854 80241124 46800020 */ cvt.s.w $f0, $f0 /* BA1858 80241128 08090485 */ j .L80241214 /* BA185C 8024112C 4600A500 */ add.s $f20, $f20, $f0 @@ -454,20 +454,20 @@ glabel func_80240AA8_BA11D8 /* BA1898 80241168 E7B60014 */ swc1 $f22, 0x14($sp) /* BA189C 8024116C 862200A8 */ lh $v0, 0xa8($s1) /* BA18A0 80241170 44820000 */ mtc1 $v0, $f0 -/* BA18A4 80241174 00000000 */ nop +/* BA18A4 80241174 00000000 */ nop /* BA18A8 80241178 46800020 */ cvt.s.w $f0, $f0 /* BA18AC 8024117C E7A00018 */ swc1 $f0, 0x18($sp) /* BA18B0 80241180 862200A6 */ lh $v0, 0xa6($s1) /* BA18B4 80241184 27A60024 */ addiu $a2, $sp, 0x24 /* BA18B8 80241188 44820000 */ mtc1 $v0, $f0 -/* BA18BC 8024118C 00000000 */ nop +/* BA18BC 8024118C 00000000 */ nop /* BA18C0 80241190 46800020 */ cvt.s.w $f0, $f0 /* BA18C4 80241194 E7A0001C */ swc1 $f0, 0x1c($sp) /* BA18C8 80241198 8E240080 */ lw $a0, 0x80($s1) /* BA18CC 8024119C 0C037711 */ jal func_800DDC44 /* BA18D0 802411A0 27A70028 */ addiu $a3, $sp, 0x28 /* BA18D4 802411A4 1040001F */ beqz $v0, .L80241224 -/* BA18D8 802411A8 00000000 */ nop +/* BA18D8 802411A8 00000000 */ nop /* BA18DC 802411AC 8FA60020 */ lw $a2, 0x20($sp) /* BA18E0 802411B0 8EA20000 */ lw $v0, ($s5) /* BA18E4 802411B4 8FA70028 */ lw $a3, 0x28($sp) @@ -479,7 +479,7 @@ glabel func_80240AA8_BA11D8 /* BA18FC 802411CC 862200A6 */ lh $v0, 0xa6($s1) /* BA1900 802411D0 4407C000 */ mfc1 $a3, $f24 /* BA1904 802411D4 44824000 */ mtc1 $v0, $f8 -/* BA1908 802411D8 00000000 */ nop +/* BA1908 802411D8 00000000 */ nop /* BA190C 802411DC 46804220 */ cvt.s.w $f8, $f8 /* BA1910 802411E0 C4600028 */ lwc1 $f0, 0x28($v1) /* BA1914 802411E4 44064000 */ mfc1 $a2, $f8 @@ -491,7 +491,7 @@ glabel func_80240AA8_BA11D8 /* BA192C 802411FC E6200040 */ swc1 $f0, 0x40($s1) /* BA1930 80241200 862200A6 */ lh $v0, 0xa6($s1) /* BA1934 80241204 44820000 */ mtc1 $v0, $f0 -/* BA1938 80241208 00000000 */ nop +/* BA1938 80241208 00000000 */ nop /* BA193C 8024120C 46800020 */ cvt.s.w $f0, $f0 /* BA1940 80241210 4600A500 */ add.s $f20, $f20, $f0 .L80241214: @@ -520,14 +520,14 @@ glabel func_80240AA8_BA11D8 /* BA1998 80241268 0C0123F5 */ jal is_point_within_region /* BA199C 8024126C 26330040 */ addiu $s3, $s1, 0x40 /* BA19A0 80241270 1040005A */ beqz $v0, .L802413DC -/* BA19A4 80241274 00000000 */ nop +/* BA19A4 80241274 00000000 */ nop /* BA19A8 80241278 8E430004 */ lw $v1, 4($s2) /* BA19AC 8024127C 10600005 */ beqz $v1, .L80241294 /* BA19B0 80241280 24020001 */ addiu $v0, $zero, 1 /* BA19B4 80241284 10620029 */ beq $v1, $v0, .L8024132C -/* BA19B8 80241288 00000000 */ nop +/* BA19B8 80241288 00000000 */ nop /* BA19BC 8024128C 080904F7 */ j .L802413DC -/* BA19C0 80241290 00000000 */ nop +/* BA19C0 80241290 00000000 */ nop .L80241294: /* BA19C4 80241294 C6480008 */ lwc1 $f8, 8($s2) /* BA19C8 80241298 46804220 */ cvt.s.w $f8, $f8 @@ -538,11 +538,11 @@ glabel func_80240AA8_BA11D8 /* BA19DC 802412AC C62E0040 */ lwc1 $f14, 0x40($s1) /* BA19E0 802412B0 44074000 */ mfc1 $a3, $f8 /* BA19E4 802412B4 0C00A7B5 */ jal dist2D -/* BA19E8 802412B8 00000000 */ nop +/* BA19E8 802412B8 00000000 */ nop /* BA19EC 802412BC C6420010 */ lwc1 $f2, 0x10($s2) /* BA19F0 802412C0 468010A0 */ cvt.s.w $f2, $f2 /* BA19F4 802412C4 4600103C */ c.lt.s $f2, $f0 -/* BA19F8 802412C8 00000000 */ nop +/* BA19F8 802412C8 00000000 */ nop /* BA19FC 802412CC 45000043 */ bc1f .L802413DC /* BA1A00 802412D0 E7A00038 */ swc1 $f0, 0x38($sp) /* BA1A04 802412D4 C64C0008 */ lwc1 $f12, 8($s2) @@ -566,17 +566,17 @@ glabel func_80240AA8_BA11D8 /* BA1A4C 8024131C 0C00A7E7 */ jal add_vec2D_polar /* BA1A50 80241320 0260282D */ daddu $a1, $s3, $zero /* BA1A54 80241324 080904F7 */ j .L802413DC -/* BA1A58 80241328 00000000 */ nop +/* BA1A58 80241328 00000000 */ nop .L8024132C: /* BA1A5C 8024132C 8E420008 */ lw $v0, 8($s2) /* BA1A60 80241330 8E430010 */ lw $v1, 0x10($s2) /* BA1A64 80241334 C6200038 */ lwc1 $f0, 0x38($s1) /* BA1A68 80241338 00431021 */ addu $v0, $v0, $v1 /* BA1A6C 8024133C 44821000 */ mtc1 $v0, $f2 -/* BA1A70 80241340 00000000 */ nop +/* BA1A70 80241340 00000000 */ nop /* BA1A74 80241344 468010A0 */ cvt.s.w $f2, $f2 /* BA1A78 80241348 4600103C */ c.lt.s $f2, $f0 -/* BA1A7C 8024134C 00000000 */ nop +/* BA1A7C 8024134C 00000000 */ nop /* BA1A80 80241350 45030001 */ bc1tl .L80241358 /* BA1A84 80241354 E6220038 */ swc1 $f2, 0x38($s1) .L80241358: @@ -585,10 +585,10 @@ glabel func_80240AA8_BA11D8 /* BA1A90 80241360 C6200038 */ lwc1 $f0, 0x38($s1) /* BA1A94 80241364 00431023 */ subu $v0, $v0, $v1 /* BA1A98 80241368 44821000 */ mtc1 $v0, $f2 -/* BA1A9C 8024136C 00000000 */ nop +/* BA1A9C 8024136C 00000000 */ nop /* BA1AA0 80241370 468010A0 */ cvt.s.w $f2, $f2 /* BA1AA4 80241374 4602003C */ c.lt.s $f0, $f2 -/* BA1AA8 80241378 00000000 */ nop +/* BA1AA8 80241378 00000000 */ nop /* BA1AAC 8024137C 45030001 */ bc1tl .L80241384 /* BA1AB0 80241380 E6220038 */ swc1 $f2, 0x38($s1) .L80241384: @@ -597,10 +597,10 @@ glabel func_80240AA8_BA11D8 /* BA1ABC 8024138C C6200040 */ lwc1 $f0, 0x40($s1) /* BA1AC0 80241390 00431021 */ addu $v0, $v0, $v1 /* BA1AC4 80241394 44821000 */ mtc1 $v0, $f2 -/* BA1AC8 80241398 00000000 */ nop +/* BA1AC8 80241398 00000000 */ nop /* BA1ACC 8024139C 468010A0 */ cvt.s.w $f2, $f2 /* BA1AD0 802413A0 4600103C */ c.lt.s $f2, $f0 -/* BA1AD4 802413A4 00000000 */ nop +/* BA1AD4 802413A4 00000000 */ nop /* BA1AD8 802413A8 45030001 */ bc1tl .L802413B0 /* BA1ADC 802413AC E6220040 */ swc1 $f2, 0x40($s1) .L802413B0: @@ -609,21 +609,21 @@ glabel func_80240AA8_BA11D8 /* BA1AE8 802413B8 C6200040 */ lwc1 $f0, 0x40($s1) /* BA1AEC 802413BC 00431023 */ subu $v0, $v0, $v1 /* BA1AF0 802413C0 44821000 */ mtc1 $v0, $f2 -/* BA1AF4 802413C4 00000000 */ nop +/* BA1AF4 802413C4 00000000 */ nop /* BA1AF8 802413C8 468010A0 */ cvt.s.w $f2, $f2 /* BA1AFC 802413CC 4602003C */ c.lt.s $f0, $f2 -/* BA1B00 802413D0 00000000 */ nop +/* BA1B00 802413D0 00000000 */ nop /* BA1B04 802413D4 45030001 */ bc1tl .L802413DC /* BA1B08 802413D8 E6220040 */ swc1 $f2, 0x40($s1) .L802413DC: /* BA1B0C 802413DC 16E0001F */ bnez $s7, .L8024145C -/* BA1B10 802413E0 00000000 */ nop +/* BA1B10 802413E0 00000000 */ nop /* BA1B14 802413E4 8E220000 */ lw $v0, ($s1) /* BA1B18 802413E8 30420008 */ andi $v0, $v0, 8 /* BA1B1C 802413EC 10400003 */ beqz $v0, .L802413FC /* BA1B20 802413F0 27A50020 */ addiu $a1, $sp, 0x20 /* BA1B24 802413F4 13C00019 */ beqz $fp, .L8024145C -/* BA1B28 802413F8 00000000 */ nop +/* BA1B28 802413F8 00000000 */ nop .L802413FC: /* BA1B2C 802413FC 27A60024 */ addiu $a2, $sp, 0x24 /* BA1B30 80241400 27A20038 */ addiu $v0, $sp, 0x38 @@ -646,7 +646,7 @@ glabel func_80240AA8_BA11D8 /* BA1B74 80241444 0C0372DF */ jal func_800DCB7C /* BA1B78 80241448 27A70028 */ addiu $a3, $sp, 0x28 /* BA1B7C 8024144C 10400003 */ beqz $v0, .L8024145C -/* BA1B80 80241450 00000000 */ nop +/* BA1B80 80241450 00000000 */ nop /* BA1B84 80241454 C7A00024 */ lwc1 $f0, 0x24($sp) /* BA1B88 80241458 E620003C */ swc1 $f0, 0x3c($s1) .L8024145C: diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802414E8_BA1C18.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802414E8_BA1C18.s index 554b407434..10a5d7366d 100644 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802414E8_BA1C18.s +++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802414E8_BA1C18.s @@ -27,7 +27,7 @@ glabel func_802414E8_BA1C18 .L80241540: /* BA1C70 80241540 8482008E */ lh $v0, 0x8e($a0) /* BA1C74 80241544 14400007 */ bnez $v0, .L80241564 -/* BA1C78 80241548 00000000 */ nop +/* BA1C78 80241548 00000000 */ nop /* BA1C7C 8024154C 8E0200CC */ lw $v0, 0xcc($s0) /* BA1C80 80241550 8C420028 */ lw $v0, 0x28($v0) /* BA1C84 80241554 A480008E */ sh $zero, 0x8e($a0) diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80241578_BA1CA8.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80241578_BA1CA8.s index a7ddca3f2d..4369aca284 100644 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80241578_BA1CA8.s +++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80241578_BA1CA8.s @@ -18,7 +18,7 @@ glabel func_80241578_BA1CA8 /* BA1CDC 802415AC 8E0300A0 */ lw $v1, 0xa0($s0) /* BA1CE0 802415B0 00021403 */ sra $v0, $v0, 0x10 /* BA1CE4 802415B4 14430004 */ bne $v0, $v1, .L802415C8 -/* BA1CE8 802415B8 00000000 */ nop +/* BA1CE8 802415B8 00000000 */ nop /* BA1CEC 802415BC 8E0200CC */ lw $v0, 0xcc($s0) /* BA1CF0 802415C0 8C42002C */ lw $v0, 0x2c($v0) /* BA1CF4 802415C4 ACA20028 */ sw $v0, 0x28($a1) @@ -47,7 +47,7 @@ glabel func_80241578_BA1CA8 /* BA1D48 80241618 3C01C1A0 */ lui $at, 0xc1a0 /* BA1D4C 8024161C 44812000 */ mtc1 $at, $f4 /* BA1D50 80241620 44833000 */ mtc1 $v1, $f6 -/* BA1D54 80241624 00000000 */ nop +/* BA1D54 80241624 00000000 */ nop /* BA1D58 80241628 468031A0 */ cvt.s.w $f6, $f6 /* BA1D5C 8024162C 8C420000 */ lw $v0, ($v0) /* BA1D60 80241630 44073000 */ mfc1 $a3, $f6 diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80241678_BA1DA8.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80241678_BA1DA8.s index a73252a14e..04910c095b 100644 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80241678_BA1DA8.s +++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80241678_BA1DA8.s @@ -16,7 +16,7 @@ glabel func_80241678_BA1DA8 /* BA1DD4 802416A4 A462008E */ sh $v0, 0x8e($v1) /* BA1DD8 802416A8 00021400 */ sll $v0, $v0, 0x10 /* BA1DDC 802416AC 14400005 */ bnez $v0, .L802416C4 -/* BA1DE0 802416B0 00000000 */ nop +/* BA1DE0 802416B0 00000000 */ nop /* BA1DE4 802416B4 960200AA */ lhu $v0, 0xaa($s0) /* BA1DE8 802416B8 A462008E */ sh $v0, 0x8e($v1) /* BA1DEC 802416BC 2402000E */ addiu $v0, $zero, 0xe diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802416D8_BA1E08.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802416D8_BA1E08.s index 76eb672b4c..4194b9c88b 100644 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802416D8_BA1E08.s +++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802416D8_BA1E08.s @@ -42,7 +42,7 @@ glabel func_802416D8_BA1E08 /* BA1E9C 8024176C 2402000F */ addiu $v0, $zero, 0xf /* BA1EA0 80241770 AFA2001C */ sw $v0, 0x1c($sp) /* BA1EA4 80241774 44833000 */ mtc1 $v1, $f6 -/* BA1EA8 80241778 00000000 */ nop +/* BA1EA8 80241778 00000000 */ nop /* BA1EAC 8024177C 468031A0 */ cvt.s.w $f6, $f6 /* BA1EB0 80241780 44073000 */ mfc1 $a3, $f6 /* BA1EB4 80241784 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802417C4_BA1EF4.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802417C4_BA1EF4.s index 1dd6a1851b..ede2a3ff96 100644 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802417C4_BA1EF4.s +++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802417C4_BA1EF4.s @@ -46,7 +46,7 @@ glabel func_802417C4_BA1EF4 /* BA1F98 80241868 8E2200B0 */ lw $v0, 0xb0($s1) /* BA1F9C 8024186C 30420004 */ andi $v0, $v0, 4 /* BA1FA0 80241870 10400011 */ beqz $v0, .L802418B8 -/* BA1FA4 80241874 00000000 */ nop +/* BA1FA4 80241874 00000000 */ nop .L80241878: /* BA1FA8 80241878 AE400070 */ sw $zero, 0x70($s2) /* BA1FAC 8024187C A6A0008E */ sh $zero, 0x8e($s5) @@ -78,12 +78,12 @@ glabel func_802417C4_BA1EF4 /* BA2010 802418E0 10600013 */ beqz $v1, .L80241930 /* BA2014 802418E4 0240202D */ daddu $a0, $s2, $zero /* BA2018 802418E8 0809067B */ j .L802419EC -/* BA201C 802418EC 00000000 */ nop +/* BA201C 802418EC 00000000 */ nop .L802418F0: /* BA2020 802418F0 10620018 */ beq $v1, $v0, .L80241954 /* BA2024 802418F4 0240202D */ daddu $a0, $s2, $zero /* BA2028 802418F8 0809067B */ j .L802419EC -/* BA202C 802418FC 00000000 */ nop +/* BA202C 802418FC 00000000 */ nop .L80241900: /* BA2030 80241900 2402000D */ addiu $v0, $zero, 0xd /* BA2034 80241904 10620029 */ beq $v1, $v0, .L802419AC @@ -94,9 +94,9 @@ glabel func_802417C4_BA1EF4 /* BA2048 80241918 1062002D */ beq $v1, $v0, .L802419D0 /* BA204C 8024191C 24020063 */ addiu $v0, $zero, 0x63 /* BA2050 80241920 10620030 */ beq $v1, $v0, .L802419E4 -/* BA2054 80241924 00000000 */ nop +/* BA2054 80241924 00000000 */ nop /* BA2058 80241928 0809067B */ j .L802419EC -/* BA205C 8024192C 00000000 */ nop +/* BA205C 8024192C 00000000 */ nop .L80241930: /* BA2060 80241930 0260282D */ daddu $a1, $s3, $zero /* BA2064 80241934 0C090250 */ jal func_80240940_BA1070 @@ -107,14 +107,14 @@ glabel func_802417C4_BA1EF4 /* BA2074 80241944 0C09026B */ jal func_802409AC_BA10DC /* BA2078 80241948 0280302D */ daddu $a2, $s4, $zero /* BA207C 8024194C 0809067B */ j .L802419EC -/* BA2080 80241950 00000000 */ nop +/* BA2080 80241950 00000000 */ nop .L80241954: /* BA2084 80241954 0260282D */ daddu $a1, $s3, $zero /* BA2088 80241958 0C0902AA */ jal func_80240AA8_BA11D8 /* BA208C 8024195C 0280302D */ daddu $a2, $s4, $zero /* BA2090 80241960 8E420070 */ lw $v0, 0x70($s2) /* BA2094 80241964 14500021 */ bne $v0, $s0, .L802419EC -/* BA2098 80241968 00000000 */ nop +/* BA2098 80241968 00000000 */ nop .L8024196C: /* BA209C 8024196C 0240202D */ daddu $a0, $s2, $zero /* BA20A0 80241970 0260282D */ daddu $a1, $s3, $zero @@ -123,7 +123,7 @@ glabel func_802417C4_BA1EF4 /* BA20AC 8024197C 8E430070 */ lw $v1, 0x70($s2) /* BA20B0 80241980 2402000C */ addiu $v0, $zero, 0xc /* BA20B4 80241984 14620019 */ bne $v1, $v0, .L802419EC -/* BA20B8 80241988 00000000 */ nop +/* BA20B8 80241988 00000000 */ nop /* BA20BC 8024198C 0240202D */ daddu $a0, $s2, $zero .L80241990: /* BA20C0 80241990 0260282D */ daddu $a1, $s3, $zero @@ -132,7 +132,7 @@ glabel func_802417C4_BA1EF4 /* BA20CC 8024199C 8E430070 */ lw $v1, 0x70($s2) /* BA20D0 802419A0 2402000D */ addiu $v0, $zero, 0xd /* BA20D4 802419A4 14620011 */ bne $v1, $v0, .L802419EC -/* BA20D8 802419A8 00000000 */ nop +/* BA20D8 802419A8 00000000 */ nop .L802419AC: /* BA20DC 802419AC 0240202D */ daddu $a0, $s2, $zero /* BA20E0 802419B0 0260282D */ daddu $a1, $s3, $zero @@ -141,14 +141,14 @@ glabel func_802417C4_BA1EF4 /* BA20EC 802419BC 8E430070 */ lw $v1, 0x70($s2) /* BA20F0 802419C0 2402000E */ addiu $v0, $zero, 0xe /* BA20F4 802419C4 14620009 */ bne $v1, $v0, .L802419EC -/* BA20F8 802419C8 00000000 */ nop +/* BA20F8 802419C8 00000000 */ nop /* BA20FC 802419CC 0240202D */ daddu $a0, $s2, $zero .L802419D0: /* BA2100 802419D0 0260282D */ daddu $a1, $s3, $zero /* BA2104 802419D4 0C0905B6 */ jal func_802416D8_BA1E08 /* BA2108 802419D8 0280302D */ daddu $a2, $s4, $zero /* BA210C 802419DC 0809067B */ j .L802419EC -/* BA2110 802419E0 00000000 */ nop +/* BA2110 802419E0 00000000 */ nop .L802419E4: /* BA2114 802419E4 0C0129CF */ jal func_8004A73C /* BA2118 802419E8 0240202D */ daddu $a0, $s2, $zero @@ -163,6 +163,6 @@ glabel func_802417C4_BA1EF4 /* BA2138 80241A08 0000102D */ daddu $v0, $zero, $zero /* BA213C 80241A0C 03E00008 */ jr $ra /* BA2140 80241A10 27BD0050 */ addiu $sp, $sp, 0x50 -/* BA2144 80241A14 00000000 */ nop -/* BA2148 80241A18 00000000 */ nop -/* BA214C 80241A1C 00000000 */ nop +/* BA2144 80241A14 00000000 */ nop +/* BA2148 80241A18 00000000 */ nop +/* BA214C 80241A1C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4780/func_80240000_BA4780.s b/asm/nonmatchings/world/area_mim/mim_06/BA4780/func_80240000_BA4780.s index c13a321ee4..92d7c3447c 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4780/func_80240000_BA4780.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4780/func_80240000_BA4780.s @@ -5,7 +5,7 @@ glabel func_80240000_BA4780 /* BA4780 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 /* BA4784 80240004 AFBF0010 */ sw $ra, 0x10($sp) /* BA4788 80240008 0C046ED4 */ jal enable_world_fog -/* BA478C 8024000C 00000000 */ nop +/* BA478C 8024000C 00000000 */ nop /* BA4790 80240010 240403DE */ addiu $a0, $zero, 0x3de /* BA4794 80240014 0C046EDD */ jal set_world_fog_dist /* BA4798 80240018 240503E8 */ addiu $a1, $zero, 0x3e8 @@ -15,7 +15,7 @@ glabel func_80240000_BA4780 /* BA47A8 80240028 0C046EE2 */ jal set_world_fog_color /* BA47AC 8024002C 240700FF */ addiu $a3, $zero, 0xff /* BA47B0 80240030 0C048BFB */ jal enable_entity_fog -/* BA47B4 80240034 00000000 */ nop +/* BA47B4 80240034 00000000 */ nop /* BA47B8 80240038 240403DE */ addiu $a0, $zero, 0x3de /* BA47BC 8024003C 0C048C04 */ jal set_entity_fog_dist /* BA47C0 80240040 240503E8 */ addiu $a1, $zero, 0x3e8 @@ -28,5 +28,5 @@ glabel func_80240000_BA4780 /* BA47DC 8024005C 24020002 */ addiu $v0, $zero, 2 /* BA47E0 80240060 03E00008 */ jr $ra /* BA47E4 80240064 27BD0018 */ addiu $sp, $sp, 0x18 -/* BA47E8 80240068 00000000 */ nop -/* BA47EC 8024006C 00000000 */ nop +/* BA47E8 80240068 00000000 */ nop +/* BA47EC 8024006C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_80240070_BA47F0.s b/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_80240070_BA47F0.s index 35b1e8f564..27e9c5f60d 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_80240070_BA47F0.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_80240070_BA47F0.s @@ -46,7 +46,7 @@ glabel func_80240070_BA47F0 /* BA4890 80240110 10620029 */ beq $v1, $v0, .L802401B8 /* BA4894 80240114 000713C2 */ srl $v0, $a3, 0xf /* BA4898 80240118 080900BD */ j .L802402F4 -/* BA489C 8024011C 00000000 */ nop +/* BA489C 8024011C 00000000 */ nop .L80240120: /* BA48A0 80240120 240200DE */ addiu $v0, $zero, 0xde /* BA48A4 80240124 10620005 */ beq $v1, $v0, .L8024013C @@ -54,7 +54,7 @@ glabel func_80240070_BA47F0 /* BA48AC 8024012C 50620071 */ beql $v1, $v0, .L802402F4 /* BA48B0 80240130 24100001 */ addiu $s0, $zero, 1 /* BA48B4 80240134 080900BD */ j .L802402F4 -/* BA48B8 80240138 00000000 */ nop +/* BA48B8 80240138 00000000 */ nop .L8024013C: /* BA48BC 8024013C 00E0202D */ daddu $a0, $a3, $zero /* BA48C0 80240140 0260282D */ daddu $a1, $s3, $zero @@ -88,7 +88,7 @@ glabel func_80240070_BA47F0 /* BA4928 802401A8 1440FFF9 */ bnez $v0, .L80240190 /* BA492C 802401AC 24840010 */ addiu $a0, $a0, 0x10 /* BA4930 802401B0 080900BD */ j .L802402F4 -/* BA4934 802401B4 00000000 */ nop +/* BA4934 802401B4 00000000 */ nop .L802401B8: /* BA4938 802401B8 304201FC */ andi $v0, $v0, 0x1fc /* BA493C 802401BC 00511021 */ addu $v0, $v0, $s1 @@ -97,10 +97,10 @@ glabel func_80240070_BA47F0 /* BA4948 802401C8 84820000 */ lh $v0, ($a0) /* BA494C 802401CC 84830002 */ lh $v1, 2($a0) /* BA4950 802401D0 44828000 */ mtc1 $v0, $f16 -/* BA4954 802401D4 00000000 */ nop +/* BA4954 802401D4 00000000 */ nop /* BA4958 802401D8 46808420 */ cvt.s.w $f16, $f16 /* BA495C 802401DC 44830000 */ mtc1 $v1, $f0 -/* BA4960 802401E0 00000000 */ nop +/* BA4960 802401E0 00000000 */ nop /* BA4964 802401E4 46800020 */ cvt.s.w $f0, $f0 /* BA4968 802401E8 000711C2 */ srl $v0, $a3, 7 /* BA496C 802401EC 304201FC */ andi $v0, $v0, 0x1fc @@ -108,15 +108,15 @@ glabel func_80240070_BA47F0 /* BA4974 802401F4 84830004 */ lh $v1, 4($a0) /* BA4978 802401F8 8C440000 */ lw $a0, ($v0) /* BA497C 802401FC 4483B000 */ mtc1 $v1, $f22 -/* BA4980 80240200 00000000 */ nop +/* BA4980 80240200 00000000 */ nop /* BA4984 80240204 4680B5A0 */ cvt.s.w $f22, $f22 /* BA4988 80240208 84820000 */ lh $v0, ($a0) /* BA498C 8024020C 84830002 */ lh $v1, 2($a0) /* BA4990 80240210 44821000 */ mtc1 $v0, $f2 -/* BA4994 80240214 00000000 */ nop +/* BA4994 80240214 00000000 */ nop /* BA4998 80240218 468010A0 */ cvt.s.w $f2, $f2 /* BA499C 8024021C 4483F000 */ mtc1 $v1, $f30 -/* BA49A0 80240220 00000000 */ nop +/* BA49A0 80240220 00000000 */ nop /* BA49A4 80240224 4680F7A0 */ cvt.s.w $f30, $f30 /* BA49A8 80240228 080900AA */ j .L802402A8 /* BA49AC 8024022C 00071040 */ sll $v0, $a3, 1 @@ -129,10 +129,10 @@ glabel func_80240070_BA47F0 /* BA49C4 80240244 84820000 */ lh $v0, ($a0) /* BA49C8 80240248 84830002 */ lh $v1, 2($a0) /* BA49CC 8024024C 44828000 */ mtc1 $v0, $f16 -/* BA49D0 80240250 00000000 */ nop +/* BA49D0 80240250 00000000 */ nop /* BA49D4 80240254 46808420 */ cvt.s.w $f16, $f16 /* BA49D8 80240258 44830000 */ mtc1 $v1, $f0 -/* BA49DC 8024025C 00000000 */ nop +/* BA49DC 8024025C 00000000 */ nop /* BA49E0 80240260 46800020 */ cvt.s.w $f0, $f0 /* BA49E4 80240264 000611C2 */ srl $v0, $a2, 7 /* BA49E8 80240268 304201FC */ andi $v0, $v0, 0x1fc @@ -140,15 +140,15 @@ glabel func_80240070_BA47F0 /* BA49F0 80240270 84830004 */ lh $v1, 4($a0) /* BA49F4 80240274 8C440000 */ lw $a0, ($v0) /* BA49F8 80240278 4483B000 */ mtc1 $v1, $f22 -/* BA49FC 8024027C 00000000 */ nop +/* BA49FC 8024027C 00000000 */ nop /* BA4A00 80240280 4680B5A0 */ cvt.s.w $f22, $f22 /* BA4A04 80240284 84820000 */ lh $v0, ($a0) /* BA4A08 80240288 84830002 */ lh $v1, 2($a0) /* BA4A0C 8024028C 44821000 */ mtc1 $v0, $f2 -/* BA4A10 80240290 00000000 */ nop +/* BA4A10 80240290 00000000 */ nop /* BA4A14 80240294 468010A0 */ cvt.s.w $f2, $f2 /* BA4A18 80240298 4483F000 */ mtc1 $v1, $f30 -/* BA4A1C 8024029C 00000000 */ nop +/* BA4A1C 8024029C 00000000 */ nop /* BA4A20 802402A0 4680F7A0 */ cvt.s.w $f30, $f30 /* BA4A24 802402A4 00061040 */ sll $v0, $a2, 1 .L802402A8: @@ -157,62 +157,62 @@ glabel func_80240070_BA47F0 /* BA4A30 802402B0 84830004 */ lh $v1, 4($a0) /* BA4A34 802402B4 8C420000 */ lw $v0, ($v0) /* BA4A38 802402B8 4483A000 */ mtc1 $v1, $f20 -/* BA4A3C 802402BC 00000000 */ nop +/* BA4A3C 802402BC 00000000 */ nop /* BA4A40 802402C0 4680A520 */ cvt.s.w $f20, $f20 /* BA4A44 802402C4 84440000 */ lh $a0, ($v0) /* BA4A48 802402C8 84430002 */ lh $v1, 2($v0) /* BA4A4C 802402CC 84420004 */ lh $v0, 4($v0) /* BA4A50 802402D0 4484E000 */ mtc1 $a0, $f28 -/* BA4A54 802402D4 00000000 */ nop +/* BA4A54 802402D4 00000000 */ nop /* BA4A58 802402D8 4680E720 */ cvt.s.w $f28, $f28 /* BA4A5C 802402DC 4483D000 */ mtc1 $v1, $f26 -/* BA4A60 802402E0 00000000 */ nop +/* BA4A60 802402E0 00000000 */ nop /* BA4A64 802402E4 4680D6A0 */ cvt.s.w $f26, $f26 /* BA4A68 802402E8 4482C000 */ mtc1 $v0, $f24 -/* BA4A6C 802402EC 00000000 */ nop +/* BA4A6C 802402EC 00000000 */ nop /* BA4A70 802402F0 4680C620 */ cvt.s.w $f24, $f24 .L802402F4: /* BA4A74 802402F4 1200FF7B */ beqz $s0, .L802400E4 /* BA4A78 802402F8 26520008 */ addiu $s2, $s2, 8 /* BA4A7C 802402FC 24020002 */ addiu $v0, $zero, 2 /* BA4A80 80240300 1602002C */ bne $s0, $v0, .L802403B4 -/* BA4A84 80240304 00000000 */ nop +/* BA4A84 80240304 00000000 */ nop /* BA4A88 80240308 461E0201 */ sub.s $f8, $f0, $f30 /* BA4A8C 8024030C 4614C181 */ sub.s $f6, $f24, $f20 /* BA4A90 80240310 46064382 */ mul.s $f14, $f8, $f6 -/* BA4A94 80240314 00000000 */ nop +/* BA4A94 80240314 00000000 */ nop /* BA4A98 80240318 4614B101 */ sub.s $f4, $f22, $f20 /* BA4A9C 8024031C 461ED281 */ sub.s $f10, $f26, $f30 /* BA4AA0 80240320 460A2302 */ mul.s $f12, $f4, $f10 -/* BA4AA4 80240324 00000000 */ nop +/* BA4AA4 80240324 00000000 */ nop /* BA4AA8 80240328 4602E001 */ sub.s $f0, $f28, $f2 /* BA4AAC 8024032C 46002102 */ mul.s $f4, $f4, $f0 -/* BA4AB0 80240330 00000000 */ nop +/* BA4AB0 80240330 00000000 */ nop /* BA4AB4 80240334 46028081 */ sub.s $f2, $f16, $f2 /* BA4AB8 80240338 46061182 */ mul.s $f6, $f2, $f6 -/* BA4ABC 8024033C 00000000 */ nop +/* BA4ABC 8024033C 00000000 */ nop /* BA4AC0 80240340 460A1082 */ mul.s $f2, $f2, $f10 -/* BA4AC4 80240344 00000000 */ nop +/* BA4AC4 80240344 00000000 */ nop /* BA4AC8 80240348 46004202 */ mul.s $f8, $f8, $f0 -/* BA4ACC 8024034C 00000000 */ nop +/* BA4ACC 8024034C 00000000 */ nop /* BA4AD0 80240350 460C7501 */ sub.s $f20, $f14, $f12 /* BA4AD4 80240354 4614A002 */ mul.s $f0, $f20, $f20 -/* BA4AD8 80240358 00000000 */ nop +/* BA4AD8 80240358 00000000 */ nop /* BA4ADC 8024035C 46062581 */ sub.s $f22, $f4, $f6 /* BA4AE0 80240360 4616B102 */ mul.s $f4, $f22, $f22 -/* BA4AE4 80240364 00000000 */ nop +/* BA4AE4 80240364 00000000 */ nop /* BA4AE8 80240368 46081601 */ sub.s $f24, $f2, $f8 /* BA4AEC 8024036C 4618C082 */ mul.s $f2, $f24, $f24 -/* BA4AF0 80240370 00000000 */ nop +/* BA4AF0 80240370 00000000 */ nop /* BA4AF4 80240374 46040000 */ add.s $f0, $f0, $f4 /* BA4AF8 80240378 46020300 */ add.s $f12, $f0, $f2 /* BA4AFC 8024037C 46006084 */ sqrt.s $f2, $f12 /* BA4B00 80240380 46021032 */ c.eq.s $f2, $f2 -/* BA4B04 80240384 00000000 */ nop +/* BA4B04 80240384 00000000 */ nop /* BA4B08 80240388 45030005 */ bc1tl .L802403A0 /* BA4B0C 8024038C 4602A003 */ div.s $f0, $f20, $f2 /* BA4B10 80240390 0C0187BC */ jal sqrtf -/* BA4B14 80240394 00000000 */ nop +/* BA4B14 80240394 00000000 */ nop /* BA4B18 80240398 46000086 */ mov.s $f2, $f0 /* BA4B1C 8024039C 4602A003 */ div.s $f0, $f20, $f2 .L802403A0: diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802403F0_BA4B70.s b/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802403F0_BA4B70.s index c1892a6bbe..a40e330a73 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802403F0_BA4B70.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802403F0_BA4B70.s @@ -27,13 +27,13 @@ glabel func_802403F0_BA4B70 /* BA4BC8 80240448 C7A00010 */ lwc1 $f0, 0x10($sp) /* BA4BCC 8024044C 3C014480 */ lui $at, 0x4480 /* BA4BD0 80240450 4481A000 */ mtc1 $at, $f20 -/* BA4BD4 80240454 00000000 */ nop +/* BA4BD4 80240454 00000000 */ nop /* BA4BD8 80240458 46140002 */ mul.s $f0, $f0, $f20 -/* BA4BDC 8024045C 00000000 */ nop +/* BA4BDC 8024045C 00000000 */ nop /* BA4BE0 80240460 3C01CD5B */ lui $at, 0xcd5b /* BA4BE4 80240464 34215858 */ ori $at, $at, 0x5858 /* BA4BE8 80240468 4481B000 */ mtc1 $at, $f22 -/* BA4BEC 8024046C 00000000 */ nop +/* BA4BEC 8024046C 00000000 */ nop /* BA4BF0 80240470 46160000 */ add.s $f0, $f0, $f22 /* BA4BF4 80240474 8E050000 */ lw $a1, ($s0) /* BA4BF8 80240478 4600008D */ trunc.w.s $f2, $f0 @@ -42,7 +42,7 @@ glabel func_802403F0_BA4B70 /* BA4C04 80240484 0220202D */ daddu $a0, $s1, $zero /* BA4C08 80240488 C7A00014 */ lwc1 $f0, 0x14($sp) /* BA4C0C 8024048C 46140002 */ mul.s $f0, $f0, $f20 -/* BA4C10 80240490 00000000 */ nop +/* BA4C10 80240490 00000000 */ nop /* BA4C14 80240494 26100004 */ addiu $s0, $s0, 4 /* BA4C18 80240498 46160000 */ add.s $f0, $f0, $f22 /* BA4C1C 8024049C 8E050000 */ lw $a1, ($s0) @@ -52,7 +52,7 @@ glabel func_802403F0_BA4B70 /* BA4C2C 802404AC 0220202D */ daddu $a0, $s1, $zero /* BA4C30 802404B0 C7A00018 */ lwc1 $f0, 0x18($sp) /* BA4C34 802404B4 46140002 */ mul.s $f0, $f0, $f20 -/* BA4C38 802404B8 00000000 */ nop +/* BA4C38 802404B8 00000000 */ nop /* BA4C3C 802404BC 26100004 */ addiu $s0, $s0, 4 /* BA4C40 802404C0 46160000 */ add.s $f0, $f0, $f22 /* BA4C44 802404C4 8E050000 */ lw $a1, ($s0) diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802404F8_BA4C78.s b/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802404F8_BA4C78.s index 74f63caa25..23515e301d 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802404F8_BA4C78.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802404F8_BA4C78.s @@ -12,14 +12,14 @@ glabel func_802404F8_BA4C78 /* BA4C94 80240514 0C0B1EAF */ jal get_variable /* BA4C98 80240518 26100004 */ addiu $s0, $s0, 4 /* BA4C9C 8024051C 44826000 */ mtc1 $v0, $f12 -/* BA4CA0 80240520 00000000 */ nop +/* BA4CA0 80240520 00000000 */ nop /* BA4CA4 80240524 0C00A8BB */ jal sin_deg /* BA4CA8 80240528 46806320 */ cvt.s.w $f12, $f12 /* BA4CAC 8024052C 3C014120 */ lui $at, 0x4120 /* BA4CB0 80240530 44811000 */ mtc1 $at, $f2 -/* BA4CB4 80240534 00000000 */ nop +/* BA4CB4 80240534 00000000 */ nop /* BA4CB8 80240538 46020002 */ mul.s $f0, $f0, $f2 -/* BA4CBC 8024053C 00000000 */ nop +/* BA4CBC 8024053C 00000000 */ nop /* BA4CC0 80240540 8E050000 */ lw $a1, ($s0) /* BA4CC4 80240544 4600010D */ trunc.w.s $f4, $f0 /* BA4CC8 80240548 44062000 */ mfc1 $a2, $f4 @@ -31,4 +31,4 @@ glabel func_802404F8_BA4C78 /* BA4CE0 80240560 24020002 */ addiu $v0, $zero, 2 /* BA4CE4 80240564 03E00008 */ jr $ra /* BA4CE8 80240568 27BD0020 */ addiu $sp, $sp, 0x20 -/* BA4CEC 8024056C 00000000 */ nop +/* BA4CEC 8024056C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240778_BA4EF8.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240778_BA4EF8.s index fa9373fbb5..7c233c4cd2 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240778_BA4EF8.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240778_BA4EF8.s @@ -42,7 +42,7 @@ glabel func_80240778_BA4EF8 /* BA4F8C 8024080C C6620074 */ lwc1 $f2, 0x74($s3) /* BA4F90 80240810 468010A0 */ cvt.s.w $f2, $f2 /* BA4F94 80240814 4600103C */ c.lt.s $f2, $f0 -/* BA4F98 80240818 00000000 */ nop +/* BA4F98 80240818 00000000 */ nop /* BA4F9C 8024081C 45030001 */ bc1tl .L80240824 /* BA4FA0 80240820 0000882D */ daddu $s1, $zero, $zero .L80240824: @@ -51,16 +51,16 @@ glabel func_80240778_BA4EF8 /* BA4FAC 8024082C 3C014387 */ lui $at, 0x4387 /* BA4FB0 80240830 4481A000 */ mtc1 $at, $f20 /* BA4FB4 80240834 0C00A70A */ jal get_clamped_angle_diff -/* BA4FB8 80240838 00000000 */ nop +/* BA4FB8 80240838 00000000 */ nop /* BA4FBC 8024083C 0C00A6C9 */ jal clamp_angle /* BA4FC0 80240840 46000306 */ mov.s $f12, $f0 /* BA4FC4 80240844 3C018024 */ lui $at, %hi(D_802457B0) /* BA4FC8 80240848 D42257B0 */ ldc1 $f2, %lo(D_802457B0)($at) /* BA4FCC 8024084C 46000021 */ cvt.d.s $f0, $f0 /* BA4FD0 80240850 4622003C */ c.lt.d $f0, $f2 -/* BA4FD4 80240854 00000000 */ nop +/* BA4FD4 80240854 00000000 */ nop /* BA4FD8 80240858 45000003 */ bc1f .L80240868 -/* BA4FDC 8024085C 00000000 */ nop +/* BA4FDC 8024085C 00000000 */ nop /* BA4FE0 80240860 3C0142B4 */ lui $at, 0x42b4 /* BA4FE4 80240864 4481A000 */ mtc1 $at, $f20 .L80240868: @@ -77,7 +77,7 @@ glabel func_80240778_BA4EF8 /* BA5010 80240890 468010A0 */ cvt.s.w $f2, $f2 /* BA5014 80240894 46000005 */ abs.s $f0, $f0 /* BA5018 80240898 4600103C */ c.lt.s $f2, $f0 -/* BA501C 8024089C 00000000 */ nop +/* BA501C 8024089C 00000000 */ nop /* BA5020 802408A0 45030001 */ bc1tl .L802408A8 /* BA5024 802408A4 0000882D */ daddu $s1, $zero, $zero .L802408A8: @@ -87,13 +87,13 @@ glabel func_80240778_BA4EF8 /* BA5034 802408B4 860200A8 */ lh $v0, 0xa8($s0) /* BA5038 802408B8 46020001 */ sub.s $f0, $f0, $f2 /* BA503C 802408BC 44821000 */ mtc1 $v0, $f2 -/* BA5040 802408C0 00000000 */ nop +/* BA5040 802408C0 00000000 */ nop /* BA5044 802408C4 468010A1 */ cvt.d.w $f2, $f2 /* BA5048 802408C8 46221080 */ add.d $f2, $f2, $f2 /* BA504C 802408CC 46000005 */ abs.s $f0, $f0 /* BA5050 802408D0 46000021 */ cvt.d.s $f0, $f0 /* BA5054 802408D4 4620103E */ c.le.d $f2, $f0 -/* BA5058 802408D8 00000000 */ nop +/* BA5058 802408D8 00000000 */ nop /* BA505C 802408DC 45030001 */ bc1tl .L802408E4 /* BA5060 802408E0 0000882D */ daddu $s1, $zero, $zero .L802408E4: diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024092C_BA50AC.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024092C_BA50AC.s index 31e48330f4..0ecdfe9db3 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024092C_BA50AC.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024092C_BA50AC.s @@ -19,7 +19,7 @@ glabel func_8024092C_BA50AC /* BA50E4 80240964 8E2200B0 */ lw $v0, 0xb0($s1) /* BA50E8 80240968 30420004 */ andi $v0, $v0, 4 /* BA50EC 8024096C 10400015 */ beqz $v0, .L802409C4 -/* BA50F0 80240970 00000000 */ nop +/* BA50F0 80240970 00000000 */ nop .L80240974: /* BA50F4 80240974 AE800070 */ sw $zero, 0x70($s4) /* BA50F8 80240978 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel func_8024092C_BA50AC /* BA5148 802409C8 12600005 */ beqz $s3, .L802409E0 /* BA514C 802409CC 24020001 */ addiu $v0, $zero, 1 /* BA5150 802409D0 12620048 */ beq $s3, $v0, .L80240AF4 -/* BA5154 802409D4 00000000 */ nop +/* BA5154 802409D4 00000000 */ nop /* BA5158 802409D8 080902DA */ j .L80240B68 -/* BA515C 802409DC 00000000 */ nop +/* BA515C 802409DC 00000000 */ nop .L802409E0: /* BA5160 802409E0 86240008 */ lh $a0, 8($s1) /* BA5164 802409E4 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel func_8024092C_BA50AC /* BA5184 80240A04 8E03006C */ lw $v1, 0x6c($s0) /* BA5188 80240A08 24020003 */ addiu $v0, $zero, 3 /* BA518C 80240A0C 14620056 */ bne $v1, $v0, .L80240B68 -/* BA5190 80240A10 00000000 */ nop +/* BA5190 80240A10 00000000 */ nop /* BA5194 80240A14 8E2500A8 */ lw $a1, 0xa8($s1) /* BA5198 80240A18 10A00003 */ beqz $a1, .L80240A28 /* BA519C 80240A1C 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel func_8024092C_BA50AC /* BA5214 80240A94 C7A20014 */ lwc1 $f2, 0x14($sp) /* BA5218 80240A98 4600020D */ trunc.w.s $f8, $f0 /* BA521C 80240A9C 44024000 */ mfc1 $v0, $f8 -/* BA5220 80240AA0 00000000 */ nop +/* BA5220 80240AA0 00000000 */ nop /* BA5224 80240AA4 A6220012 */ sh $v0, 0x12($s1) /* BA5228 80240AA8 4600120D */ trunc.w.s $f8, $f2 /* BA522C 80240AAC 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s index f74939a506..5ef55597cf 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s @@ -100,78 +100,93 @@ glabel func_80240B8C_BA530C /* BA5470 80240CF0 2C620064 */ sltiu $v0, $v1, 0x64 /* BA5474 80240CF4 10400048 */ beqz $v0, .L80240E18 /* BA5478 80240CF8 00031080 */ sll $v0, $v1, 2 -/* BA547C 80240CFC 3C018024 */ lui $at, %hi(func_802457B8) +/* BA547C 80240CFC 3C018024 */ lui $at, %hi(jtbl_802457B8_BA9F38) /* BA5480 80240D00 00220821 */ addu $at, $at, $v0 -/* BA5484 80240D04 8C2257B8 */ lw $v0, %lo(func_802457B8)($at) +/* BA5484 80240D04 8C2257B8 */ lw $v0, %lo(jtbl_802457B8_BA9F38)($at) /* BA5488 80240D08 00400008 */ jr $v0 /* BA548C 80240D0C 00000000 */ nop +glabel L80240D10_BA5490 /* BA5490 80240D10 0240202D */ daddu $a0, $s2, $zero /* BA5494 80240D14 0260282D */ daddu $a1, $s3, $zero /* BA5498 80240D18 0C012568 */ jal func_800495A0 /* BA549C 80240D1C 0280302D */ daddu $a2, $s4, $zero +glabel L80240D20_BA54A0 /* BA54A0 80240D20 0240202D */ daddu $a0, $s2, $zero /* BA54A4 80240D24 0260282D */ daddu $a1, $s3, $zero /* BA54A8 80240D28 0C0125AE */ jal func_800496B8 /* BA54AC 80240D2C 0280302D */ daddu $a2, $s4, $zero /* BA54B0 80240D30 08090386 */ j .L80240E18 /* BA54B4 80240D34 00000000 */ nop +glabel L80240D38_BA54B8 /* BA54B8 80240D38 0240202D */ daddu $a0, $s2, $zero /* BA54BC 80240D3C 0260282D */ daddu $a1, $s3, $zero /* BA54C0 80240D40 0C0126D1 */ jal base_UnkNpcAIFunc1 /* BA54C4 80240D44 0280302D */ daddu $a2, $s4, $zero +glabel L80240D48_BA54C8 /* BA54C8 80240D48 0240202D */ daddu $a0, $s2, $zero /* BA54CC 80240D4C 0260282D */ daddu $a1, $s3, $zero /* BA54D0 80240D50 0C012701 */ jal func_80049C04 /* BA54D4 80240D54 0280302D */ daddu $a2, $s4, $zero /* BA54D8 80240D58 08090386 */ j .L80240E18 /* BA54DC 80240D5C 00000000 */ nop +glabel L80240D60_BA54E0 /* BA54E0 80240D60 0240202D */ daddu $a0, $s2, $zero /* BA54E4 80240D64 0260282D */ daddu $a1, $s3, $zero /* BA54E8 80240D68 0C01278F */ jal func_80049E3C /* BA54EC 80240D6C 0280302D */ daddu $a2, $s4, $zero +glabel L80240D70_BA54F0 /* BA54F0 80240D70 0240202D */ daddu $a0, $s2, $zero /* BA54F4 80240D74 0260282D */ daddu $a1, $s3, $zero /* BA54F8 80240D78 0C0127B3 */ jal func_80049ECC /* BA54FC 80240D7C 0280302D */ daddu $a2, $s4, $zero /* BA5500 80240D80 08090386 */ j .L80240E18 /* BA5504 80240D84 00000000 */ nop +glabel L80240D88_BA5508 /* BA5508 80240D88 0240202D */ daddu $a0, $s2, $zero /* BA550C 80240D8C 0260282D */ daddu $a1, $s3, $zero /* BA5510 80240D90 0C0127DF */ jal func_80049F7C /* BA5514 80240D94 0280302D */ daddu $a2, $s4, $zero +glabel L80240D98_BA5518 /* BA5518 80240D98 0240202D */ daddu $a0, $s2, $zero /* BA551C 80240D9C 0260282D */ daddu $a1, $s3, $zero /* BA5520 80240DA0 0C012849 */ jal func_8004A124 /* BA5524 80240DA4 0280302D */ daddu $a2, $s4, $zero /* BA5528 80240DA8 08090386 */ j .L80240E18 /* BA552C 80240DAC 00000000 */ nop +glabel L80240DB0_BA5530 /* BA5530 80240DB0 0240202D */ daddu $a0, $s2, $zero /* BA5534 80240DB4 0260282D */ daddu $a1, $s3, $zero /* BA5538 80240DB8 0C0128FA */ jal func_8004A3E8 /* BA553C 80240DBC 0280302D */ daddu $a2, $s4, $zero /* BA5540 80240DC0 08090386 */ j .L80240E18 /* BA5544 80240DC4 00000000 */ nop +glabel L80240DC8_BA5548 /* BA5548 80240DC8 0C09015C */ jal mim_06_UnkNpcAIFunc6 /* BA554C 80240DCC 0240202D */ daddu $a0, $s2, $zero +glabel L80240DD0_BA5550 /* BA5550 80240DD0 0C090177 */ jal mim_06_UnkNpcAIFunc7 /* BA5554 80240DD4 0240202D */ daddu $a0, $s2, $zero /* BA5558 80240DD8 8E430070 */ lw $v1, 0x70($s2) /* BA555C 80240DDC 24020020 */ addiu $v0, $zero, 0x20 /* BA5560 80240DE0 1462000D */ bne $v1, $v0, .L80240E18 /* BA5564 80240DE4 00000000 */ nop +glabel L80240DE8_BA5568 /* BA5568 80240DE8 0C090193 */ jal mim_06_UnkNpcAIFunc8 /* BA556C 80240DEC 0240202D */ daddu $a0, $s2, $zero /* BA5570 80240DF0 8E430070 */ lw $v1, 0x70($s2) /* BA5574 80240DF4 24020021 */ addiu $v0, $zero, 0x21 /* BA5578 80240DF8 14620007 */ bne $v1, $v0, .L80240E18 /* BA557C 80240DFC 00000000 */ nop +glabel L80240E00_BA5580 /* BA5580 80240E00 0C0901C9 */ jal mim_06_UnkNpcAIFunc5 /* BA5584 80240E04 0240202D */ daddu $a0, $s2, $zero /* BA5588 80240E08 08090386 */ j .L80240E18 /* BA558C 80240E0C 00000000 */ nop +glabel L80240E10_BA5590 /* BA5590 80240E10 0C0129CF */ jal func_8004A73C /* BA5594 80240E14 0240202D */ daddu $a0, $s2, $zero .L80240E18: +glabel L80240E18_BA5598 /* BA5598 80240E18 8FBF0048 */ lw $ra, 0x48($sp) /* BA559C 80240E1C 8FB50044 */ lw $s5, 0x44($sp) /* BA55A0 80240E20 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240EAC_BA562C.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240EAC_BA562C.s index e628e71cf9..7da336e5c2 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240EAC_BA562C.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240EAC_BA562C.s @@ -38,7 +38,7 @@ glabel func_80240EAC_BA562C /* BA56B0 80240F30 3C01C1A0 */ lui $at, 0xc1a0 /* BA56B4 80240F34 44812000 */ mtc1 $at, $f4 /* BA56B8 80240F38 44833000 */ mtc1 $v1, $f6 -/* BA56BC 80240F3C 00000000 */ nop +/* BA56BC 80240F3C 00000000 */ nop /* BA56C0 80240F40 468031A0 */ cvt.s.w $f6, $f6 /* BA56C4 80240F44 44073000 */ mfc1 $a3, $f6 /* BA56C8 80240F48 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240FA8_BA5728.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240FA8_BA5728.s index d75e84f5a8..b79489665d 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240FA8_BA5728.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240FA8_BA5728.s @@ -39,18 +39,18 @@ glabel func_80240FA8_BA5728 .L80241030: /* BA57B0 80241030 8622008E */ lh $v0, 0x8e($s1) /* BA57B4 80241034 1440025D */ bnez $v0, .L802419AC -/* BA57B8 80241038 00000000 */ nop +/* BA57B8 80241038 00000000 */ nop /* BA57BC 8024103C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* BA57C0 80241040 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* BA57C4 80241044 0C00A6C9 */ jal clamp_angle /* BA57C8 80241048 C44C00A8 */ lwc1 $f12, 0xa8($v0) /* BA57CC 8024104C 3C014334 */ lui $at, 0x4334 /* BA57D0 80241050 44811000 */ mtc1 $at, $f2 -/* BA57D4 80241054 00000000 */ nop +/* BA57D4 80241054 00000000 */ nop /* BA57D8 80241058 4602003C */ c.lt.s $f0, $f2 -/* BA57DC 8024105C 00000000 */ nop +/* BA57DC 8024105C 00000000 */ nop /* BA57E0 80241060 45000011 */ bc1f .L802410A8 -/* BA57E4 80241064 00000000 */ nop +/* BA57E4 80241064 00000000 */ nop /* BA57E8 80241068 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* BA57EC 8024106C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* BA57F0 80241070 3C0142B4 */ lui $at, 0x42b4 @@ -85,7 +85,7 @@ glabel func_80240FA8_BA5728 /* BA5860 802410E0 460C0300 */ add.s $f12, $f0, $f12 .L802410E4: /* BA5864 802410E4 0C00A6C9 */ jal clamp_angle -/* BA5868 802410E8 00000000 */ nop +/* BA5868 802410E8 00000000 */ nop /* BA586C 802410EC 46000586 */ mov.s $f22, $f0 /* BA5870 802410F0 3C014334 */ lui $at, 0x4334 /* BA5874 802410F4 44816000 */ mtc1 $at, $f12 @@ -134,7 +134,7 @@ glabel func_80240FA8_BA5728 /* BA5910 80241190 862200A6 */ lh $v0, 0xa6($s1) /* BA5914 80241194 8EA30000 */ lw $v1, ($s5) /* BA5918 80241198 44824000 */ mtc1 $v0, $f8 -/* BA591C 8024119C 00000000 */ nop +/* BA591C 8024119C 00000000 */ nop /* BA5920 802411A0 46804220 */ cvt.s.w $f8, $f8 /* BA5924 802411A4 C4600028 */ lwc1 $f0, 0x28($v1) /* BA5928 802411A8 44064000 */ mfc1 $a2, $f8 @@ -146,7 +146,7 @@ glabel func_80240FA8_BA5728 /* BA5940 802411C0 E6200040 */ swc1 $f0, 0x40($s1) /* BA5944 802411C4 862200A6 */ lh $v0, 0xa6($s1) /* BA5948 802411C8 44820000 */ mtc1 $v0, $f0 -/* BA594C 802411CC 00000000 */ nop +/* BA594C 802411CC 00000000 */ nop /* BA5950 802411D0 46800020 */ cvt.s.w $f0, $f0 /* BA5954 802411D4 4600A000 */ add.s $f0, $f20, $f0 /* BA5958 802411D8 4406B000 */ mfc1 $a2, $f22 @@ -155,18 +155,18 @@ glabel func_80240FA8_BA5728 /* BA5964 802411E4 0220202D */ daddu $a0, $s1, $zero /* BA5968 802411E8 8EC20088 */ lw $v0, 0x88($s6) /* BA596C 802411EC 1440005D */ bnez $v0, .L80241364 -/* BA5970 802411F0 00000000 */ nop +/* BA5970 802411F0 00000000 */ nop /* BA5974 802411F4 C6200038 */ lwc1 $f0, 0x38($s1) /* BA5978 802411F8 3C018024 */ lui $at, %hi(D_80245948) /* BA597C 802411FC D4245948 */ ldc1 $f4, %lo(D_80245948)($at) /* BA5980 80241200 46000021 */ cvt.d.s $f0, $f0 /* BA5984 80241204 4620203C */ c.lt.d $f4, $f0 -/* BA5988 80241208 00000000 */ nop +/* BA5988 80241208 00000000 */ nop /* BA598C 8024120C 45000005 */ bc1f .L80241224 -/* BA5990 80241210 00000000 */ nop +/* BA5990 80241210 00000000 */ nop /* BA5994 80241214 3C0143BE */ lui $at, 0x43be /* BA5998 80241218 44810000 */ mtc1 $at, $f0 -/* BA599C 8024121C 00000000 */ nop +/* BA599C 8024121C 00000000 */ nop /* BA59A0 80241220 E6200038 */ swc1 $f0, 0x38($s1) .L80241224: /* BA59A4 80241224 C6200038 */ lwc1 $f0, 0x38($s1) @@ -174,50 +174,50 @@ glabel func_80240FA8_BA5728 /* BA59AC 8024122C D4225950 */ ldc1 $f2, %lo(func_80245950_8061D0)($at) /* BA59B0 80241230 46000021 */ cvt.d.s $f0, $f0 /* BA59B4 80241234 4622003C */ c.lt.d $f0, $f2 -/* BA59B8 80241238 00000000 */ nop +/* BA59B8 80241238 00000000 */ nop /* BA59BC 8024123C 45000005 */ bc1f .L80241254 -/* BA59C0 80241240 00000000 */ nop +/* BA59C0 80241240 00000000 */ nop /* BA59C4 80241244 3C01C3BE */ lui $at, 0xc3be /* BA59C8 80241248 44810000 */ mtc1 $at, $f0 -/* BA59CC 8024124C 00000000 */ nop +/* BA59CC 8024124C 00000000 */ nop /* BA59D0 80241250 E6200038 */ swc1 $f0, 0x38($s1) .L80241254: /* BA59D4 80241254 C6200040 */ lwc1 $f0, 0x40($s1) /* BA59D8 80241258 46000021 */ cvt.d.s $f0, $f0 /* BA59DC 8024125C 4620203C */ c.lt.d $f4, $f0 -/* BA59E0 80241260 00000000 */ nop +/* BA59E0 80241260 00000000 */ nop /* BA59E4 80241264 45000005 */ bc1f .L8024127C -/* BA59E8 80241268 00000000 */ nop +/* BA59E8 80241268 00000000 */ nop /* BA59EC 8024126C 3C0143BE */ lui $at, 0x43be /* BA59F0 80241270 44810000 */ mtc1 $at, $f0 -/* BA59F4 80241274 00000000 */ nop +/* BA59F4 80241274 00000000 */ nop /* BA59F8 80241278 E6200040 */ swc1 $f0, 0x40($s1) .L8024127C: /* BA59FC 8024127C C6200040 */ lwc1 $f0, 0x40($s1) /* BA5A00 80241280 46000021 */ cvt.d.s $f0, $f0 /* BA5A04 80241284 4622003C */ c.lt.d $f0, $f2 -/* BA5A08 80241288 00000000 */ nop +/* BA5A08 80241288 00000000 */ nop /* BA5A0C 8024128C 45000005 */ bc1f .L802412A4 -/* BA5A10 80241290 00000000 */ nop +/* BA5A10 80241290 00000000 */ nop /* BA5A14 80241294 3C01C3BE */ lui $at, 0xc3be /* BA5A18 80241298 44810000 */ mtc1 $at, $f0 -/* BA5A1C 8024129C 00000000 */ nop +/* BA5A1C 8024129C 00000000 */ nop /* BA5A20 802412A0 E6200040 */ swc1 $f0, 0x40($s1) .L802412A4: /* BA5A24 802412A4 C6220038 */ lwc1 $f2, 0x38($s1) /* BA5A28 802412A8 46021082 */ mul.s $f2, $f2, $f2 -/* BA5A2C 802412AC 00000000 */ nop +/* BA5A2C 802412AC 00000000 */ nop /* BA5A30 802412B0 C6200040 */ lwc1 $f0, 0x40($s1) /* BA5A34 802412B4 46000002 */ mul.s $f0, $f0, $f0 -/* BA5A38 802412B8 00000000 */ nop +/* BA5A38 802412B8 00000000 */ nop /* BA5A3C 802412BC 46001300 */ add.s $f12, $f2, $f0 /* BA5A40 802412C0 46006004 */ sqrt.s $f0, $f12 /* BA5A44 802412C4 46000032 */ c.eq.s $f0, $f0 -/* BA5A48 802412C8 00000000 */ nop +/* BA5A48 802412C8 00000000 */ nop /* BA5A4C 802412CC 45010003 */ bc1t .L802412DC -/* BA5A50 802412D0 00000000 */ nop +/* BA5A50 802412D0 00000000 */ nop /* BA5A54 802412D4 0C0187BC */ jal sqrtf -/* BA5A58 802412D8 00000000 */ nop +/* BA5A58 802412D8 00000000 */ nop .L802412DC: /* BA5A5C 802412DC 8E260038 */ lw $a2, 0x38($s1) /* BA5A60 802412E0 8E270040 */ lw $a3, 0x40($s1) @@ -232,7 +232,7 @@ glabel func_80240FA8_BA5728 /* BA5A84 80241304 D4205958 */ ldc1 $f0, %lo(D_80245958)($at) /* BA5A88 80241308 460010A1 */ cvt.d.s $f2, $f2 /* BA5A8C 8024130C 4620103C */ c.lt.d $f2, $f0 -/* BA5A90 80241310 00000000 */ nop +/* BA5A90 80241310 00000000 */ nop /* BA5A94 80241314 45000004 */ bc1f .L80241328 /* BA5A98 80241318 0200202D */ daddu $a0, $s0, $zero /* BA5A9C 8024131C 3C064398 */ lui $a2, 0x4398 @@ -242,9 +242,9 @@ glabel func_80240FA8_BA5728 /* BA5AA8 80241328 3C018024 */ lui $at, %hi(D_80245960) /* BA5AAC 8024132C D4205960 */ ldc1 $f0, %lo(D_80245960)($at) /* BA5AB0 80241330 4622003C */ c.lt.d $f0, $f2 -/* BA5AB4 80241334 00000000 */ nop +/* BA5AB4 80241334 00000000 */ nop /* BA5AB8 80241338 450000FA */ bc1f .L80241724 -/* BA5ABC 8024133C 00000000 */ nop +/* BA5ABC 8024133C 00000000 */ nop /* BA5AC0 80241340 3C0643BB */ lui $a2, 0x43bb /* BA5AC4 80241344 34C68000 */ ori $a2, $a2, 0x8000 .L80241348: @@ -254,7 +254,7 @@ glabel func_80240FA8_BA5728 /* BA5AD4 80241354 0C00A7E7 */ jal add_vec2D_polar /* BA5AD8 80241358 E6340040 */ swc1 $f20, 0x40($s1) /* BA5ADC 8024135C 080905C9 */ j .L80241724 -/* BA5AE0 80241360 00000000 */ nop +/* BA5AE0 80241360 00000000 */ nop .L80241364: /* BA5AE4 80241364 8E220000 */ lw $v0, ($s1) /* BA5AE8 80241368 30420040 */ andi $v0, $v0, 0x40 @@ -281,13 +281,13 @@ glabel func_80240FA8_BA5728 /* BA5B3C 802413BC 862200A8 */ lh $v0, 0xa8($s1) /* BA5B40 802413C0 0260302D */ daddu $a2, $s3, $zero /* BA5B44 802413C4 44820000 */ mtc1 $v0, $f0 -/* BA5B48 802413C8 00000000 */ nop +/* BA5B48 802413C8 00000000 */ nop /* BA5B4C 802413CC 46800020 */ cvt.s.w $f0, $f0 /* BA5B50 802413D0 E7A00018 */ swc1 $f0, 0x18($sp) /* BA5B54 802413D4 862200A6 */ lh $v0, 0xa6($s1) /* BA5B58 802413D8 27B00028 */ addiu $s0, $sp, 0x28 /* BA5B5C 802413DC 44820000 */ mtc1 $v0, $f0 -/* BA5B60 802413E0 00000000 */ nop +/* BA5B60 802413E0 00000000 */ nop /* BA5B64 802413E4 46800020 */ cvt.s.w $f0, $f0 /* BA5B68 802413E8 E7A0001C */ swc1 $f0, 0x1c($sp) /* BA5B6C 802413EC 8E240080 */ lw $a0, 0x80($s1) @@ -311,13 +311,13 @@ glabel func_80240FA8_BA5728 /* BA5BB4 80241434 E7B60014 */ swc1 $f22, 0x14($sp) /* BA5BB8 80241438 862200A8 */ lh $v0, 0xa8($s1) /* BA5BBC 8024143C 44820000 */ mtc1 $v0, $f0 -/* BA5BC0 80241440 00000000 */ nop +/* BA5BC0 80241440 00000000 */ nop /* BA5BC4 80241444 46800020 */ cvt.s.w $f0, $f0 /* BA5BC8 80241448 E7A00018 */ swc1 $f0, 0x18($sp) /* BA5BCC 8024144C 862200A6 */ lh $v0, 0xa6($s1) /* BA5BD0 80241450 0260302D */ daddu $a2, $s3, $zero /* BA5BD4 80241454 44820000 */ mtc1 $v0, $f0 -/* BA5BD8 80241458 00000000 */ nop +/* BA5BD8 80241458 00000000 */ nop /* BA5BDC 8024145C 46800020 */ cvt.s.w $f0, $f0 /* BA5BE0 80241460 E7A0001C */ swc1 $f0, 0x1c($sp) /* BA5BE4 80241464 8E240080 */ lw $a0, 0x80($s1) @@ -347,32 +347,32 @@ glabel func_80240FA8_BA5728 /* BA5C44 802414C4 0C0372DF */ jal func_800DCB7C /* BA5C48 802414C8 0040802D */ daddu $s0, $v0, $zero /* BA5C4C 802414CC 1600001C */ bnez $s0, .L80241540 -/* BA5C50 802414D0 00000000 */ nop +/* BA5C50 802414D0 00000000 */ nop /* BA5C54 802414D4 1040001A */ beqz $v0, .L80241540 -/* BA5C58 802414D8 00000000 */ nop +/* BA5C58 802414D8 00000000 */ nop /* BA5C5C 802414DC C7A20038 */ lwc1 $f2, 0x38($sp) /* BA5C60 802414E0 3C014054 */ lui $at, 0x4054 /* BA5C64 802414E4 44810800 */ mtc1 $at, $f1 /* BA5C68 802414E8 44800000 */ mtc1 $zero, $f0 /* BA5C6C 802414EC 460010A1 */ cvt.d.s $f2, $f2 /* BA5C70 802414F0 4622003C */ c.lt.d $f0, $f2 -/* BA5C74 802414F4 00000000 */ nop +/* BA5C74 802414F4 00000000 */ nop /* BA5C78 802414F8 45000011 */ bc1f .L80241540 -/* BA5C7C 802414FC 00000000 */ nop +/* BA5C7C 802414FC 00000000 */ nop /* BA5C80 80241500 3C01405E */ lui $at, 0x405e /* BA5C84 80241504 44810800 */ mtc1 $at, $f1 /* BA5C88 80241508 44800000 */ mtc1 $zero, $f0 -/* BA5C8C 8024150C 00000000 */ nop +/* BA5C8C 8024150C 00000000 */ nop /* BA5C90 80241510 4620103C */ c.lt.d $f2, $f0 -/* BA5C94 80241514 00000000 */ nop +/* BA5C94 80241514 00000000 */ nop /* BA5C98 80241518 45000009 */ bc1f .L80241540 -/* BA5C9C 8024151C 00000000 */ nop +/* BA5C9C 8024151C 00000000 */ nop /* BA5CA0 80241520 C622003C */ lwc1 $f2, 0x3c($s1) /* BA5CA4 80241524 C7A00030 */ lwc1 $f0, 0x30($sp) /* BA5CA8 80241528 46001032 */ c.eq.s $f2, $f0 -/* BA5CAC 8024152C 00000000 */ nop +/* BA5CAC 8024152C 00000000 */ nop /* BA5CB0 80241530 45010003 */ bc1t .L80241540 -/* BA5CB4 80241534 00000000 */ nop +/* BA5CB4 80241534 00000000 */ nop /* BA5CB8 80241538 080905C9 */ j .L80241724 /* BA5CBC 8024153C 241E0001 */ addiu $fp, $zero, 1 .L80241540: @@ -396,13 +396,13 @@ glabel func_80240FA8_BA5728 /* BA5D04 80241584 862200A8 */ lh $v0, 0xa8($s1) /* BA5D08 80241588 27A50020 */ addiu $a1, $sp, 0x20 /* BA5D0C 8024158C 44820000 */ mtc1 $v0, $f0 -/* BA5D10 80241590 00000000 */ nop +/* BA5D10 80241590 00000000 */ nop /* BA5D14 80241594 46800020 */ cvt.s.w $f0, $f0 /* BA5D18 80241598 E7A00018 */ swc1 $f0, 0x18($sp) /* BA5D1C 8024159C 862200A6 */ lh $v0, 0xa6($s1) /* BA5D20 802415A0 27A60024 */ addiu $a2, $sp, 0x24 /* BA5D24 802415A4 44820000 */ mtc1 $v0, $f0 -/* BA5D28 802415A8 00000000 */ nop +/* BA5D28 802415A8 00000000 */ nop /* BA5D2C 802415AC 46800020 */ cvt.s.w $f0, $f0 /* BA5D30 802415B0 E7A0001C */ swc1 $f0, 0x1c($sp) /* BA5D34 802415B4 8E240080 */ lw $a0, 0x80($s1) @@ -420,7 +420,7 @@ glabel func_80240FA8_BA5728 /* BA5D64 802415E4 862200A6 */ lh $v0, 0xa6($s1) /* BA5D68 802415E8 4407C000 */ mfc1 $a3, $f24 /* BA5D6C 802415EC 44824000 */ mtc1 $v0, $f8 -/* BA5D70 802415F0 00000000 */ nop +/* BA5D70 802415F0 00000000 */ nop /* BA5D74 802415F4 46804220 */ cvt.s.w $f8, $f8 /* BA5D78 802415F8 C4600028 */ lwc1 $f0, 0x28($v1) /* BA5D7C 802415FC 44064000 */ mfc1 $a2, $f8 @@ -432,7 +432,7 @@ glabel func_80240FA8_BA5728 /* BA5D94 80241614 E6200040 */ swc1 $f0, 0x40($s1) /* BA5D98 80241618 862200A6 */ lh $v0, 0xa6($s1) /* BA5D9C 8024161C 44820000 */ mtc1 $v0, $f0 -/* BA5DA0 80241620 00000000 */ nop +/* BA5DA0 80241620 00000000 */ nop /* BA5DA4 80241624 46800020 */ cvt.s.w $f0, $f0 /* BA5DA8 80241628 080905C5 */ j .L80241714 /* BA5DAC 8024162C 4600A500 */ add.s $f20, $f20, $f0 @@ -454,20 +454,20 @@ glabel func_80240FA8_BA5728 /* BA5DE8 80241668 E7B60014 */ swc1 $f22, 0x14($sp) /* BA5DEC 8024166C 862200A8 */ lh $v0, 0xa8($s1) /* BA5DF0 80241670 44820000 */ mtc1 $v0, $f0 -/* BA5DF4 80241674 00000000 */ nop +/* BA5DF4 80241674 00000000 */ nop /* BA5DF8 80241678 46800020 */ cvt.s.w $f0, $f0 /* BA5DFC 8024167C E7A00018 */ swc1 $f0, 0x18($sp) /* BA5E00 80241680 862200A6 */ lh $v0, 0xa6($s1) /* BA5E04 80241684 27A60024 */ addiu $a2, $sp, 0x24 /* BA5E08 80241688 44820000 */ mtc1 $v0, $f0 -/* BA5E0C 8024168C 00000000 */ nop +/* BA5E0C 8024168C 00000000 */ nop /* BA5E10 80241690 46800020 */ cvt.s.w $f0, $f0 /* BA5E14 80241694 E7A0001C */ swc1 $f0, 0x1c($sp) /* BA5E18 80241698 8E240080 */ lw $a0, 0x80($s1) /* BA5E1C 8024169C 0C037711 */ jal func_800DDC44 /* BA5E20 802416A0 27A70028 */ addiu $a3, $sp, 0x28 /* BA5E24 802416A4 1040001F */ beqz $v0, .L80241724 -/* BA5E28 802416A8 00000000 */ nop +/* BA5E28 802416A8 00000000 */ nop /* BA5E2C 802416AC 8FA60020 */ lw $a2, 0x20($sp) /* BA5E30 802416B0 8EA20000 */ lw $v0, ($s5) /* BA5E34 802416B4 8FA70028 */ lw $a3, 0x28($sp) @@ -479,7 +479,7 @@ glabel func_80240FA8_BA5728 /* BA5E4C 802416CC 862200A6 */ lh $v0, 0xa6($s1) /* BA5E50 802416D0 4407C000 */ mfc1 $a3, $f24 /* BA5E54 802416D4 44824000 */ mtc1 $v0, $f8 -/* BA5E58 802416D8 00000000 */ nop +/* BA5E58 802416D8 00000000 */ nop /* BA5E5C 802416DC 46804220 */ cvt.s.w $f8, $f8 /* BA5E60 802416E0 C4600028 */ lwc1 $f0, 0x28($v1) /* BA5E64 802416E4 44064000 */ mfc1 $a2, $f8 @@ -491,7 +491,7 @@ glabel func_80240FA8_BA5728 /* BA5E7C 802416FC E6200040 */ swc1 $f0, 0x40($s1) /* BA5E80 80241700 862200A6 */ lh $v0, 0xa6($s1) /* BA5E84 80241704 44820000 */ mtc1 $v0, $f0 -/* BA5E88 80241708 00000000 */ nop +/* BA5E88 80241708 00000000 */ nop /* BA5E8C 8024170C 46800020 */ cvt.s.w $f0, $f0 /* BA5E90 80241710 4600A500 */ add.s $f20, $f20, $f0 .L80241714: @@ -520,14 +520,14 @@ glabel func_80240FA8_BA5728 /* BA5EE8 80241768 0C0123F5 */ jal is_point_within_region /* BA5EEC 8024176C 26330040 */ addiu $s3, $s1, 0x40 /* BA5EF0 80241770 1040005A */ beqz $v0, .L802418DC -/* BA5EF4 80241774 00000000 */ nop +/* BA5EF4 80241774 00000000 */ nop /* BA5EF8 80241778 8E430004 */ lw $v1, 4($s2) /* BA5EFC 8024177C 10600005 */ beqz $v1, .L80241794 /* BA5F00 80241780 24020001 */ addiu $v0, $zero, 1 /* BA5F04 80241784 10620029 */ beq $v1, $v0, .L8024182C -/* BA5F08 80241788 00000000 */ nop +/* BA5F08 80241788 00000000 */ nop /* BA5F0C 8024178C 08090637 */ j .L802418DC -/* BA5F10 80241790 00000000 */ nop +/* BA5F10 80241790 00000000 */ nop .L80241794: /* BA5F14 80241794 C6480008 */ lwc1 $f8, 8($s2) /* BA5F18 80241798 46804220 */ cvt.s.w $f8, $f8 @@ -538,11 +538,11 @@ glabel func_80240FA8_BA5728 /* BA5F2C 802417AC C62E0040 */ lwc1 $f14, 0x40($s1) /* BA5F30 802417B0 44074000 */ mfc1 $a3, $f8 /* BA5F34 802417B4 0C00A7B5 */ jal dist2D -/* BA5F38 802417B8 00000000 */ nop +/* BA5F38 802417B8 00000000 */ nop /* BA5F3C 802417BC C6420010 */ lwc1 $f2, 0x10($s2) /* BA5F40 802417C0 468010A0 */ cvt.s.w $f2, $f2 /* BA5F44 802417C4 4600103C */ c.lt.s $f2, $f0 -/* BA5F48 802417C8 00000000 */ nop +/* BA5F48 802417C8 00000000 */ nop /* BA5F4C 802417CC 45000043 */ bc1f .L802418DC /* BA5F50 802417D0 E7A00038 */ swc1 $f0, 0x38($sp) /* BA5F54 802417D4 C64C0008 */ lwc1 $f12, 8($s2) @@ -566,17 +566,17 @@ glabel func_80240FA8_BA5728 /* BA5F9C 8024181C 0C00A7E7 */ jal add_vec2D_polar /* BA5FA0 80241820 0260282D */ daddu $a1, $s3, $zero /* BA5FA4 80241824 08090637 */ j .L802418DC -/* BA5FA8 80241828 00000000 */ nop +/* BA5FA8 80241828 00000000 */ nop .L8024182C: /* BA5FAC 8024182C 8E420008 */ lw $v0, 8($s2) /* BA5FB0 80241830 8E430010 */ lw $v1, 0x10($s2) /* BA5FB4 80241834 C6200038 */ lwc1 $f0, 0x38($s1) /* BA5FB8 80241838 00431021 */ addu $v0, $v0, $v1 /* BA5FBC 8024183C 44821000 */ mtc1 $v0, $f2 -/* BA5FC0 80241840 00000000 */ nop +/* BA5FC0 80241840 00000000 */ nop /* BA5FC4 80241844 468010A0 */ cvt.s.w $f2, $f2 /* BA5FC8 80241848 4600103C */ c.lt.s $f2, $f0 -/* BA5FCC 8024184C 00000000 */ nop +/* BA5FCC 8024184C 00000000 */ nop /* BA5FD0 80241850 45030001 */ bc1tl .L80241858 /* BA5FD4 80241854 E6220038 */ swc1 $f2, 0x38($s1) .L80241858: @@ -585,10 +585,10 @@ glabel func_80240FA8_BA5728 /* BA5FE0 80241860 C6200038 */ lwc1 $f0, 0x38($s1) /* BA5FE4 80241864 00431023 */ subu $v0, $v0, $v1 /* BA5FE8 80241868 44821000 */ mtc1 $v0, $f2 -/* BA5FEC 8024186C 00000000 */ nop +/* BA5FEC 8024186C 00000000 */ nop /* BA5FF0 80241870 468010A0 */ cvt.s.w $f2, $f2 /* BA5FF4 80241874 4602003C */ c.lt.s $f0, $f2 -/* BA5FF8 80241878 00000000 */ nop +/* BA5FF8 80241878 00000000 */ nop /* BA5FFC 8024187C 45030001 */ bc1tl .L80241884 /* BA6000 80241880 E6220038 */ swc1 $f2, 0x38($s1) .L80241884: @@ -597,10 +597,10 @@ glabel func_80240FA8_BA5728 /* BA600C 8024188C C6200040 */ lwc1 $f0, 0x40($s1) /* BA6010 80241890 00431021 */ addu $v0, $v0, $v1 /* BA6014 80241894 44821000 */ mtc1 $v0, $f2 -/* BA6018 80241898 00000000 */ nop +/* BA6018 80241898 00000000 */ nop /* BA601C 8024189C 468010A0 */ cvt.s.w $f2, $f2 /* BA6020 802418A0 4600103C */ c.lt.s $f2, $f0 -/* BA6024 802418A4 00000000 */ nop +/* BA6024 802418A4 00000000 */ nop /* BA6028 802418A8 45030001 */ bc1tl .L802418B0 /* BA602C 802418AC E6220040 */ swc1 $f2, 0x40($s1) .L802418B0: @@ -609,21 +609,21 @@ glabel func_80240FA8_BA5728 /* BA6038 802418B8 C6200040 */ lwc1 $f0, 0x40($s1) /* BA603C 802418BC 00431023 */ subu $v0, $v0, $v1 /* BA6040 802418C0 44821000 */ mtc1 $v0, $f2 -/* BA6044 802418C4 00000000 */ nop +/* BA6044 802418C4 00000000 */ nop /* BA6048 802418C8 468010A0 */ cvt.s.w $f2, $f2 /* BA604C 802418CC 4602003C */ c.lt.s $f0, $f2 -/* BA6050 802418D0 00000000 */ nop +/* BA6050 802418D0 00000000 */ nop /* BA6054 802418D4 45030001 */ bc1tl .L802418DC /* BA6058 802418D8 E6220040 */ swc1 $f2, 0x40($s1) .L802418DC: /* BA605C 802418DC 16E0001F */ bnez $s7, .L8024195C -/* BA6060 802418E0 00000000 */ nop +/* BA6060 802418E0 00000000 */ nop /* BA6064 802418E4 8E220000 */ lw $v0, ($s1) /* BA6068 802418E8 30420008 */ andi $v0, $v0, 8 /* BA606C 802418EC 10400003 */ beqz $v0, .L802418FC /* BA6070 802418F0 27A50020 */ addiu $a1, $sp, 0x20 /* BA6074 802418F4 13C00019 */ beqz $fp, .L8024195C -/* BA6078 802418F8 00000000 */ nop +/* BA6078 802418F8 00000000 */ nop .L802418FC: /* BA607C 802418FC 27A60024 */ addiu $a2, $sp, 0x24 /* BA6080 80241900 27A20038 */ addiu $v0, $sp, 0x38 @@ -646,7 +646,7 @@ glabel func_80240FA8_BA5728 /* BA60C4 80241944 0C0372DF */ jal func_800DCB7C /* BA60C8 80241948 27A70028 */ addiu $a3, $sp, 0x28 /* BA60CC 8024194C 10400003 */ beqz $v0, .L8024195C -/* BA60D0 80241950 00000000 */ nop +/* BA60D0 80241950 00000000 */ nop /* BA60D4 80241954 C7A00024 */ lwc1 $f0, 0x24($sp) /* BA60D8 80241958 E620003C */ swc1 $f0, 0x3c($s1) .L8024195C: diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802419E8_BA6168.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802419E8_BA6168.s index fe0640254c..f28c99c2df 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802419E8_BA6168.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802419E8_BA6168.s @@ -27,7 +27,7 @@ glabel func_802419E8_BA6168 .L80241A40: /* BA61C0 80241A40 8482008E */ lh $v0, 0x8e($a0) /* BA61C4 80241A44 14400007 */ bnez $v0, .L80241A64 -/* BA61C8 80241A48 00000000 */ nop +/* BA61C8 80241A48 00000000 */ nop /* BA61CC 80241A4C 8E0200CC */ lw $v0, 0xcc($s0) /* BA61D0 80241A50 8C420028 */ lw $v0, 0x28($v0) /* BA61D4 80241A54 A480008E */ sh $zero, 0x8e($a0) diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241A78_BA61F8.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241A78_BA61F8.s index 87e5040739..1201af0949 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241A78_BA61F8.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241A78_BA61F8.s @@ -18,7 +18,7 @@ glabel func_80241A78_BA61F8 /* BA622C 80241AAC 8E0300A0 */ lw $v1, 0xa0($s0) /* BA6230 80241AB0 00021403 */ sra $v0, $v0, 0x10 /* BA6234 80241AB4 14430004 */ bne $v0, $v1, .L80241AC8 -/* BA6238 80241AB8 00000000 */ nop +/* BA6238 80241AB8 00000000 */ nop /* BA623C 80241ABC 8E0200CC */ lw $v0, 0xcc($s0) /* BA6240 80241AC0 8C42002C */ lw $v0, 0x2c($v0) /* BA6244 80241AC4 ACA20028 */ sw $v0, 0x28($a1) @@ -47,7 +47,7 @@ glabel func_80241A78_BA61F8 /* BA6298 80241B18 3C01C1A0 */ lui $at, 0xc1a0 /* BA629C 80241B1C 44812000 */ mtc1 $at, $f4 /* BA62A0 80241B20 44833000 */ mtc1 $v1, $f6 -/* BA62A4 80241B24 00000000 */ nop +/* BA62A4 80241B24 00000000 */ nop /* BA62A8 80241B28 468031A0 */ cvt.s.w $f6, $f6 /* BA62AC 80241B2C 8C420000 */ lw $v0, ($v0) /* BA62B0 80241B30 44073000 */ mfc1 $a3, $f6 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241B78_BA62F8.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241B78_BA62F8.s index 00a2c19ec7..240edaf770 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241B78_BA62F8.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241B78_BA62F8.s @@ -16,7 +16,7 @@ glabel func_80241B78_BA62F8 /* BA6324 80241BA4 A462008E */ sh $v0, 0x8e($v1) /* BA6328 80241BA8 00021400 */ sll $v0, $v0, 0x10 /* BA632C 80241BAC 14400005 */ bnez $v0, .L80241BC4 -/* BA6330 80241BB0 00000000 */ nop +/* BA6330 80241BB0 00000000 */ nop /* BA6334 80241BB4 960200AA */ lhu $v0, 0xaa($s0) /* BA6338 80241BB8 A462008E */ sh $v0, 0x8e($v1) /* BA633C 80241BBC 2402000E */ addiu $v0, $zero, 0xe diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241BD8_BA6358.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241BD8_BA6358.s index 2f5af832ba..e83c403771 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241BD8_BA6358.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241BD8_BA6358.s @@ -42,7 +42,7 @@ glabel func_80241BD8_BA6358 /* BA63EC 80241C6C 2402000F */ addiu $v0, $zero, 0xf /* BA63F0 80241C70 AFA2001C */ sw $v0, 0x1c($sp) /* BA63F4 80241C74 44833000 */ mtc1 $v1, $f6 -/* BA63F8 80241C78 00000000 */ nop +/* BA63F8 80241C78 00000000 */ nop /* BA63FC 80241C7C 468031A0 */ cvt.s.w $f6, $f6 /* BA6400 80241C80 44073000 */ mfc1 $a3, $f6 /* BA6404 80241C84 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241CC4_BA6444.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241CC4_BA6444.s index 0b2c037674..4848535215 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241CC4_BA6444.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241CC4_BA6444.s @@ -46,7 +46,7 @@ glabel func_80241CC4_BA6444 /* BA64E8 80241D68 8E2200B0 */ lw $v0, 0xb0($s1) /* BA64EC 80241D6C 30420004 */ andi $v0, $v0, 4 /* BA64F0 80241D70 10400011 */ beqz $v0, .L80241DB8 -/* BA64F4 80241D74 00000000 */ nop +/* BA64F4 80241D74 00000000 */ nop .L80241D78: /* BA64F8 80241D78 AE400070 */ sw $zero, 0x70($s2) /* BA64FC 80241D7C A6A0008E */ sh $zero, 0x8e($s5) @@ -78,12 +78,12 @@ glabel func_80241CC4_BA6444 /* BA6560 80241DE0 10600013 */ beqz $v1, .L80241E30 /* BA6564 80241DE4 0240202D */ daddu $a0, $s2, $zero /* BA6568 80241DE8 080907BB */ j .L80241EEC -/* BA656C 80241DEC 00000000 */ nop +/* BA656C 80241DEC 00000000 */ nop .L80241DF0: /* BA6570 80241DF0 10620018 */ beq $v1, $v0, .L80241E54 /* BA6574 80241DF4 0240202D */ daddu $a0, $s2, $zero /* BA6578 80241DF8 080907BB */ j .L80241EEC -/* BA657C 80241DFC 00000000 */ nop +/* BA657C 80241DFC 00000000 */ nop .L80241E00: /* BA6580 80241E00 2402000D */ addiu $v0, $zero, 0xd /* BA6584 80241E04 10620029 */ beq $v1, $v0, .L80241EAC @@ -94,9 +94,9 @@ glabel func_80241CC4_BA6444 /* BA6598 80241E18 1062002D */ beq $v1, $v0, .L80241ED0 /* BA659C 80241E1C 24020063 */ addiu $v0, $zero, 0x63 /* BA65A0 80241E20 10620030 */ beq $v1, $v0, .L80241EE4 -/* BA65A4 80241E24 00000000 */ nop +/* BA65A4 80241E24 00000000 */ nop /* BA65A8 80241E28 080907BB */ j .L80241EEC -/* BA65AC 80241E2C 00000000 */ nop +/* BA65AC 80241E2C 00000000 */ nop .L80241E30: /* BA65B0 80241E30 0260282D */ daddu $a1, $s3, $zero /* BA65B4 80241E34 0C090390 */ jal func_80240E40_BA55C0 @@ -107,14 +107,14 @@ glabel func_80241CC4_BA6444 /* BA65C4 80241E44 0C0903AB */ jal func_80240EAC_BA562C /* BA65C8 80241E48 0280302D */ daddu $a2, $s4, $zero /* BA65CC 80241E4C 080907BB */ j .L80241EEC -/* BA65D0 80241E50 00000000 */ nop +/* BA65D0 80241E50 00000000 */ nop .L80241E54: /* BA65D4 80241E54 0260282D */ daddu $a1, $s3, $zero /* BA65D8 80241E58 0C0903EA */ jal func_80240FA8_BA5728 /* BA65DC 80241E5C 0280302D */ daddu $a2, $s4, $zero /* BA65E0 80241E60 8E420070 */ lw $v0, 0x70($s2) /* BA65E4 80241E64 14500021 */ bne $v0, $s0, .L80241EEC -/* BA65E8 80241E68 00000000 */ nop +/* BA65E8 80241E68 00000000 */ nop .L80241E6C: /* BA65EC 80241E6C 0240202D */ daddu $a0, $s2, $zero /* BA65F0 80241E70 0260282D */ daddu $a1, $s3, $zero @@ -123,7 +123,7 @@ glabel func_80241CC4_BA6444 /* BA65FC 80241E7C 8E430070 */ lw $v1, 0x70($s2) /* BA6600 80241E80 2402000C */ addiu $v0, $zero, 0xc /* BA6604 80241E84 14620019 */ bne $v1, $v0, .L80241EEC -/* BA6608 80241E88 00000000 */ nop +/* BA6608 80241E88 00000000 */ nop /* BA660C 80241E8C 0240202D */ daddu $a0, $s2, $zero .L80241E90: /* BA6610 80241E90 0260282D */ daddu $a1, $s3, $zero @@ -132,7 +132,7 @@ glabel func_80241CC4_BA6444 /* BA661C 80241E9C 8E430070 */ lw $v1, 0x70($s2) /* BA6620 80241EA0 2402000D */ addiu $v0, $zero, 0xd /* BA6624 80241EA4 14620011 */ bne $v1, $v0, .L80241EEC -/* BA6628 80241EA8 00000000 */ nop +/* BA6628 80241EA8 00000000 */ nop .L80241EAC: /* BA662C 80241EAC 0240202D */ daddu $a0, $s2, $zero /* BA6630 80241EB0 0260282D */ daddu $a1, $s3, $zero @@ -141,14 +141,14 @@ glabel func_80241CC4_BA6444 /* BA663C 80241EBC 8E430070 */ lw $v1, 0x70($s2) /* BA6640 80241EC0 2402000E */ addiu $v0, $zero, 0xe /* BA6644 80241EC4 14620009 */ bne $v1, $v0, .L80241EEC -/* BA6648 80241EC8 00000000 */ nop +/* BA6648 80241EC8 00000000 */ nop /* BA664C 80241ECC 0240202D */ daddu $a0, $s2, $zero .L80241ED0: /* BA6650 80241ED0 0260282D */ daddu $a1, $s3, $zero /* BA6654 80241ED4 0C0906F6 */ jal func_80241BD8_BA6358 /* BA6658 80241ED8 0280302D */ daddu $a2, $s4, $zero /* BA665C 80241EDC 080907BB */ j .L80241EEC -/* BA6660 80241EE0 00000000 */ nop +/* BA6660 80241EE0 00000000 */ nop .L80241EE4: /* BA6664 80241EE4 0C0129CF */ jal func_8004A73C /* BA6668 80241EE8 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241F14_BA6694.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241F14_BA6694.s index fa59fa9bb9..812292c566 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241F14_BA6694.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241F14_BA6694.s @@ -30,7 +30,7 @@ glabel func_80241F14_BA6694 /* BA66F8 80241F78 3C05B000 */ lui $a1, 0xb000 /* BA66FC 80241F7C 34A50017 */ ori $a1, $a1, 0x17 /* BA6700 80241F80 44820000 */ mtc1 $v0, $f0 -/* BA6704 80241F84 00000000 */ nop +/* BA6704 80241F84 00000000 */ nop /* BA6708 80241F88 46800021 */ cvt.d.w $f0, $f0 /* BA670C 80241F8C 3C014024 */ lui $at, 0x4024 /* BA6710 80241F90 44811800 */ mtc1 $at, $f3 @@ -68,7 +68,7 @@ glabel func_80241F14_BA6694 /* BA6790 80242010 0C0123F5 */ jal is_point_within_region /* BA6794 80242014 8E070038 */ lw $a3, 0x38($s0) /* BA6798 80242018 10400035 */ beqz $v0, .L802420F0 -/* BA679C 8024201C 00000000 */ nop +/* BA679C 8024201C 00000000 */ nop /* BA67A0 80242020 C60C0038 */ lwc1 $f12, 0x38($s0) /* BA67A4 80242024 3C0141C8 */ lui $at, 0x41c8 /* BA67A8 80242028 4481B000 */ mtc1 $at, $f22 @@ -99,13 +99,13 @@ glabel func_80241F14_BA6694 /* BA6808 80242088 860200A8 */ lh $v0, 0xa8($s0) /* BA680C 8024208C 27A50020 */ addiu $a1, $sp, 0x20 /* BA6810 80242090 44820000 */ mtc1 $v0, $f0 -/* BA6814 80242094 00000000 */ nop +/* BA6814 80242094 00000000 */ nop /* BA6818 80242098 46800020 */ cvt.s.w $f0, $f0 /* BA681C 8024209C E7A00018 */ swc1 $f0, 0x18($sp) /* BA6820 802420A0 860200A6 */ lh $v0, 0xa6($s0) /* BA6824 802420A4 27A60024 */ addiu $a2, $sp, 0x24 /* BA6828 802420A8 44820000 */ mtc1 $v0, $f0 -/* BA682C 802420AC 00000000 */ nop +/* BA682C 802420AC 00000000 */ nop /* BA6830 802420B0 46800020 */ cvt.s.w $f0, $f0 /* BA6834 802420B4 E7A0001C */ swc1 $f0, 0x1c($sp) /* BA6838 802420B8 8E040080 */ lw $a0, 0x80($s0) @@ -121,13 +121,13 @@ glabel func_80241F14_BA6694 /* BA6860 802420E0 1440FFE6 */ bnez $v0, .L8024207C /* BA6864 802420E4 E600000C */ swc1 $f0, 0xc($s0) /* BA6868 802420E8 08090848 */ j .L80242120 -/* BA686C 802420EC 00000000 */ nop +/* BA686C 802420EC 00000000 */ nop .L802420F0: /* BA6870 802420F0 0C00A67F */ jal rand_int /* BA6874 802420F4 2404003C */ addiu $a0, $zero, 0x3c /* BA6878 802420F8 C60C000C */ lwc1 $f12, 0xc($s0) /* BA687C 802420FC 44820000 */ mtc1 $v0, $f0 -/* BA6880 80242100 00000000 */ nop +/* BA6880 80242100 00000000 */ nop /* BA6884 80242104 46800020 */ cvt.s.w $f0, $f0 /* BA6888 80242108 46006300 */ add.s $f12, $f12, $f0 /* BA688C 8024210C 3C0141F0 */ lui $at, 0x41f0 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242144_BA68C4.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242144_BA68C4.s index 2b1b658db7..1a186c9758 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242144_BA68C4.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242144_BA68C4.s @@ -43,7 +43,7 @@ glabel func_80242144_BA68C4 /* BA695C 802421DC 2402000F */ addiu $v0, $zero, 0xf /* BA6960 802421E0 AFA2001C */ sw $v0, 0x1c($sp) /* BA6964 802421E4 44835000 */ mtc1 $v1, $f10 -/* BA6968 802421E8 00000000 */ nop +/* BA6968 802421E8 00000000 */ nop /* BA696C 802421EC 468052A0 */ cvt.s.w $f10, $f10 /* BA6970 802421F0 44075000 */ mfc1 $a3, $f10 /* BA6974 802421F4 27A20028 */ addiu $v0, $sp, 0x28 @@ -78,7 +78,7 @@ glabel func_80242144_BA68C4 /* BA69DC 8024225C 44801800 */ mtc1 $zero, $f3 /* BA69E0 80242260 46000021 */ cvt.d.s $f0, $f0 /* BA69E4 80242264 4620103C */ c.lt.d $f2, $f0 -/* BA69E8 80242268 00000000 */ nop +/* BA69E8 80242268 00000000 */ nop /* BA69EC 8024226C 45000025 */ bc1f .L80242304 /* BA69F0 80242270 27A5002C */ addiu $a1, $sp, 0x2c /* BA69F4 80242274 C6000038 */ lwc1 $f0, 0x38($s0) @@ -88,7 +88,7 @@ glabel func_80242144_BA68C4 /* BA6A04 80242284 27A60030 */ addiu $a2, $sp, 0x30 /* BA6A08 80242288 E7A0002C */ swc1 $f0, 0x2c($sp) /* BA6A0C 8024228C 44820000 */ mtc1 $v0, $f0 -/* BA6A10 80242290 00000000 */ nop +/* BA6A10 80242290 00000000 */ nop /* BA6A14 80242294 46800020 */ cvt.s.w $f0, $f0 /* BA6A18 80242298 46000021 */ cvt.d.s $f0, $f0 /* BA6A1C 8024229C C604003C */ lwc1 $f4, 0x3c($s0) @@ -96,13 +96,13 @@ glabel func_80242144_BA68C4 /* BA6A24 802422A4 C6080018 */ lwc1 $f8, 0x18($s0) /* BA6A28 802422A8 860200A8 */ lh $v0, 0xa8($s0) /* BA6A2C 802422AC 46220002 */ mul.d $f0, $f0, $f2 -/* BA6A30 802422B0 00000000 */ nop +/* BA6A30 802422B0 00000000 */ nop /* BA6A34 802422B4 E7A40030 */ swc1 $f4, 0x30($sp) /* BA6A38 802422B8 E7A60034 */ swc1 $f6, 0x34($sp) /* BA6A3C 802422BC E7A80010 */ swc1 $f8, 0x10($sp) /* BA6A40 802422C0 C604000C */ lwc1 $f4, 0xc($s0) /* BA6A44 802422C4 44821000 */ mtc1 $v0, $f2 -/* BA6A48 802422C8 00000000 */ nop +/* BA6A48 802422C8 00000000 */ nop /* BA6A4C 802422CC 468010A0 */ cvt.s.w $f2, $f2 /* BA6A50 802422D0 E7A20018 */ swc1 $f2, 0x18($sp) /* BA6A54 802422D4 E7A40014 */ swc1 $f4, 0x14($sp) @@ -123,7 +123,7 @@ glabel func_80242144_BA68C4 /* BA6A8C 8024230C 44801800 */ mtc1 $zero, $f3 /* BA6A90 80242310 46000021 */ cvt.d.s $f0, $f0 /* BA6A94 80242314 4622003C */ c.lt.d $f0, $f2 -/* BA6A98 80242318 00000000 */ nop +/* BA6A98 80242318 00000000 */ nop /* BA6A9C 8024231C 45000047 */ bc1f .L8024243C /* BA6AA0 80242320 27A5002C */ addiu $a1, $sp, 0x2c /* BA6AA4 80242324 27A60030 */ addiu $a2, $sp, 0x30 @@ -154,7 +154,7 @@ glabel func_80242144_BA68C4 /* BA6B08 80242388 0C0372DF */ jal func_800DCB7C /* BA6B0C 8024238C 27A70034 */ addiu $a3, $sp, 0x34 /* BA6B10 80242390 1040002A */ beqz $v0, .L8024243C -/* BA6B14 80242394 00000000 */ nop +/* BA6B14 80242394 00000000 */ nop /* BA6B18 80242398 C600001C */ lwc1 $f0, 0x1c($s0) /* BA6B1C 8024239C C7A20038 */ lwc1 $f2, 0x38($sp) /* BA6B20 802423A0 46000005 */ abs.s $f0, $f0 @@ -162,7 +162,7 @@ glabel func_80242144_BA68C4 /* BA6B28 802423A8 46340000 */ add.d $f0, $f0, $f20 /* BA6B2C 802423AC 460010A1 */ cvt.d.s $f2, $f2 /* BA6B30 802423B0 4620103E */ c.le.d $f2, $f0 -/* BA6B34 802423B4 00000000 */ nop +/* BA6B34 802423B4 00000000 */ nop /* BA6B38 802423B8 45000020 */ bc1f .L8024243C /* BA6B3C 802423BC 240403E8 */ addiu $a0, $zero, 0x3e8 /* BA6B40 802423C0 C7A00030 */ lwc1 $f0, 0x30($sp) @@ -193,7 +193,7 @@ glabel func_80242144_BA68C4 /* BA6BA4 80242424 5840000C */ blezl $v0, .L80242458 /* BA6BA8 80242428 AE600070 */ sw $zero, 0x70($s3) /* BA6BAC 8024242C 1460000A */ bnez $v1, .L80242458 -/* BA6BB0 80242430 00000000 */ nop +/* BA6BB0 80242430 00000000 */ nop /* BA6BB4 80242434 08090916 */ j .L80242458 /* BA6BB8 80242438 AE600070 */ sw $zero, 0x70($s3) .L8024243C: diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024253C_BA6CBC.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024253C_BA6CBC.s index cc740fe6bc..e82acdcde7 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024253C_BA6CBC.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024253C_BA6CBC.s @@ -38,7 +38,7 @@ glabel func_8024253C_BA6CBC /* BA6D40 802425C0 2402000F */ addiu $v0, $zero, 0xf /* BA6D44 802425C4 AFA2001C */ sw $v0, 0x1c($sp) /* BA6D48 802425C8 44833000 */ mtc1 $v1, $f6 -/* BA6D4C 802425CC 00000000 */ nop +/* BA6D4C 802425CC 00000000 */ nop /* BA6D50 802425D0 468031A0 */ cvt.s.w $f6, $f6 /* BA6D54 802425D4 44073000 */ mfc1 $a3, $f6 /* BA6D58 802425D8 27A20028 */ addiu $v0, $sp, 0x28 @@ -65,13 +65,13 @@ glabel func_8024253C_BA6CBC .L8024262C: /* BA6DAC 8024262C 8602008C */ lh $v0, 0x8c($s0) /* BA6DB0 80242630 14400023 */ bnez $v0, .L802426C0 -/* BA6DB4 80242634 00000000 */ nop +/* BA6DB4 80242634 00000000 */ nop /* BA6DB8 80242638 9602008E */ lhu $v0, 0x8e($s0) /* BA6DBC 8024263C 2442FFFF */ addiu $v0, $v0, -1 /* BA6DC0 80242640 A602008E */ sh $v0, 0x8e($s0) /* BA6DC4 80242644 00021400 */ sll $v0, $v0, 0x10 /* BA6DC8 80242648 1C40001D */ bgtz $v0, .L802426C0 -/* BA6DCC 8024264C 00000000 */ nop +/* BA6DCC 8024264C 00000000 */ nop /* BA6DD0 80242650 8E820074 */ lw $v0, 0x74($s4) /* BA6DD4 80242654 2442FFFF */ addiu $v0, $v0, -1 /* BA6DD8 80242658 18400018 */ blez $v0, .L802426BC diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802426E0_BA6E60.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802426E0_BA6E60.s index c9bda87fda..253b28d2c0 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802426E0_BA6E60.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802426E0_BA6E60.s @@ -24,7 +24,7 @@ glabel func_802426E0_BA6E60 /* BA6EAC 8024272C 0C00A67F */ jal rand_int /* BA6EB0 80242730 AE020000 */ sw $v0, ($s0) /* BA6EB4 80242734 44820000 */ mtc1 $v0, $f0 -/* BA6EB8 80242738 00000000 */ nop +/* BA6EB8 80242738 00000000 */ nop /* BA6EBC 8024273C 46800021 */ cvt.d.w $f0, $f0 /* BA6EC0 80242740 3C014024 */ lui $at, 0x4024 /* BA6EC4 80242744 44811800 */ mtc1 $at, $f3 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802427C0_BA6F40.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802427C0_BA6F40.s index 28c744b88b..3414c44220 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802427C0_BA6F40.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802427C0_BA6F40.s @@ -25,7 +25,7 @@ glabel func_802427C0_BA6F40 /* BA6F90 80242810 44801800 */ mtc1 $zero, $f3 /* BA6F94 80242814 46000021 */ cvt.d.s $f0, $f0 /* BA6F98 80242818 4620103C */ c.lt.d $f2, $f0 -/* BA6F9C 8024281C 00000000 */ nop +/* BA6F9C 8024281C 00000000 */ nop /* BA6FA0 80242820 45000021 */ bc1f .L802428A8 /* BA6FA4 80242824 27A50028 */ addiu $a1, $sp, 0x28 /* BA6FA8 80242828 C6600038 */ lwc1 $f0, 0x38($s3) @@ -40,20 +40,20 @@ glabel func_802427C0_BA6F40 /* BA6FCC 8024284C E7A00014 */ swc1 $f0, 0x14($sp) /* BA6FD0 80242850 866200A8 */ lh $v0, 0xa8($s3) /* BA6FD4 80242854 44820000 */ mtc1 $v0, $f0 -/* BA6FD8 80242858 00000000 */ nop +/* BA6FD8 80242858 00000000 */ nop /* BA6FDC 8024285C 46800020 */ cvt.s.w $f0, $f0 /* BA6FE0 80242860 E7A00018 */ swc1 $f0, 0x18($sp) /* BA6FE4 80242864 866200A6 */ lh $v0, 0xa6($s3) /* BA6FE8 80242868 27A6002C */ addiu $a2, $sp, 0x2c /* BA6FEC 8024286C 44820000 */ mtc1 $v0, $f0 -/* BA6FF0 80242870 00000000 */ nop +/* BA6FF0 80242870 00000000 */ nop /* BA6FF4 80242874 46800020 */ cvt.s.w $f0, $f0 /* BA6FF8 80242878 E7A0001C */ swc1 $f0, 0x1c($sp) /* BA6FFC 8024287C 8E640080 */ lw $a0, 0x80($s3) /* BA7000 80242880 0C037711 */ jal func_800DDC44 /* BA7004 80242884 27A70030 */ addiu $a3, $sp, 0x30 /* BA7008 80242888 10400003 */ beqz $v0, .L80242898 -/* BA700C 8024288C 00000000 */ nop +/* BA700C 8024288C 00000000 */ nop /* BA7010 80242890 08090A2A */ j .L802428A8 /* BA7014 80242894 AE600018 */ sw $zero, 0x18($s3) .L80242898: @@ -67,7 +67,7 @@ glabel func_802427C0_BA6F40 /* BA7030 802428B0 44801800 */ mtc1 $zero, $f3 /* BA7034 802428B4 46000021 */ cvt.d.s $f0, $f0 /* BA7038 802428B8 4622003C */ c.lt.d $f0, $f2 -/* BA703C 802428BC 00000000 */ nop +/* BA703C 802428BC 00000000 */ nop /* BA7040 802428C0 4500006C */ bc1f .L80242A74 /* BA7044 802428C4 27B00028 */ addiu $s0, $sp, 0x28 /* BA7048 802428C8 0200282D */ daddu $a1, $s0, $zero @@ -116,7 +116,7 @@ glabel func_802427C0_BA6F40 /* BA70F4 80242974 0C0372DF */ jal func_800DCB7C /* BA70F8 80242978 0220382D */ daddu $a3, $s1, $zero /* BA70FC 8024297C 1040003D */ beqz $v0, .L80242A74 -/* BA7100 80242980 00000000 */ nop +/* BA7100 80242980 00000000 */ nop /* BA7104 80242984 C660001C */ lwc1 $f0, 0x1c($s3) /* BA7108 80242988 C7A20038 */ lwc1 $f2, 0x38($sp) /* BA710C 8024298C 46000005 */ abs.s $f0, $f0 @@ -124,7 +124,7 @@ glabel func_802427C0_BA6F40 /* BA7114 80242994 46340000 */ add.d $f0, $f0, $f20 /* BA7118 80242998 460010A1 */ cvt.d.s $f2, $f2 /* BA711C 8024299C 4620103E */ c.le.d $f2, $f0 -/* BA7120 802429A0 00000000 */ nop +/* BA7120 802429A0 00000000 */ nop /* BA7124 802429A4 45000033 */ bc1f .L80242A74 /* BA7128 802429A8 2403F7FF */ addiu $v1, $zero, -0x801 /* BA712C 802429AC C7A0002C */ lwc1 $f0, 0x2c($sp) @@ -163,7 +163,7 @@ glabel func_802427C0_BA6F40 /* BA71B0 80242A30 2402000F */ addiu $v0, $zero, 0xf /* BA71B4 80242A34 AFA2001C */ sw $v0, 0x1c($sp) /* BA71B8 80242A38 44834000 */ mtc1 $v1, $f8 -/* BA71BC 80242A3C 00000000 */ nop +/* BA71BC 80242A3C 00000000 */ nop /* BA71C0 80242A40 46804220 */ cvt.s.w $f8, $f8 /* BA71C4 80242A44 44074000 */ mfc1 $a3, $f8 /* BA71C8 80242A48 27A2003C */ addiu $v0, $sp, 0x3c diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s index 4f8a941805..56880cbe8b 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s @@ -76,7 +76,7 @@ glabel func_80242B04_BA7284 /* BA739C 80242C1C 8E4300B0 */ lw $v1, 0xb0($s2) /* BA73A0 80242C20 30620004 */ andi $v0, $v1, 4 /* BA73A4 80242C24 10400007 */ beqz $v0, .L80242C44 -/* BA73A8 80242C28 00000000 */ nop +/* BA73A8 80242C28 00000000 */ nop /* BA73AC 80242C2C 824200B4 */ lb $v0, 0xb4($s2) /* BA73B0 80242C30 14400034 */ bnez $v0, .L80242D04 /* BA73B4 80242C34 0000102D */ daddu $v0, $zero, $zero @@ -88,21 +88,24 @@ glabel func_80242B04_BA7284 /* BA73C8 80242C48 2C62000F */ sltiu $v0, $v1, 0xf /* BA73CC 80242C4C 1040002C */ beqz $v0, .L80242D00 /* BA73D0 80242C50 00031080 */ sll $v0, $v1, 2 -/* BA73D4 80242C54 3C018024 */ lui $at, %hi(pause_stats_draw_contents) +/* BA73D4 80242C54 3C018024 */ lui $at, %hi(jtbl_80245980_BAA100) /* BA73D8 80242C58 00220821 */ addu $at, $at, $v0 -/* BA73DC 80242C5C 8C225980 */ lw $v0, %lo(pause_stats_draw_contents)($at) +/* BA73DC 80242C5C 8C225980 */ lw $v0, %lo(jtbl_80245980_BAA100)($at) /* BA73E0 80242C60 00400008 */ jr $v0 -/* BA73E4 80242C64 00000000 */ nop +/* BA73E4 80242C64 00000000 */ nop +glabel L80242C68_BA73E8 /* BA73E8 80242C68 0260202D */ daddu $a0, $s3, $zero /* BA73EC 80242C6C 0280282D */ daddu $a1, $s4, $zero /* BA73F0 80242C70 0C0907C5 */ jal func_80241F14_BA6694 /* BA73F4 80242C74 0200302D */ daddu $a2, $s0, $zero +glabel L80242C78_BA73F8 /* BA73F8 80242C78 0260202D */ daddu $a0, $s3, $zero /* BA73FC 80242C7C 0280282D */ daddu $a1, $s4, $zero /* BA7400 80242C80 0C090851 */ jal func_80242144_BA68C4 /* BA7404 80242C84 0200302D */ daddu $a2, $s0, $zero /* BA7408 80242C88 08090B41 */ j .L80242D04 /* BA740C 80242C8C 0000102D */ daddu $v0, $zero, $zero +glabel L80242C90_BA7410 /* BA7410 80242C90 0260202D */ daddu $a0, $s3, $zero /* BA7414 80242C94 0280282D */ daddu $a1, $s4, $zero /* BA7418 80242C98 0C09091F */ jal mim_06_UnkNpcAIFunc1 @@ -111,27 +114,32 @@ glabel func_80242B04_BA7284 /* BA7424 80242CA4 24020003 */ addiu $v0, $zero, 3 /* BA7428 80242CA8 14620016 */ bne $v1, $v0, .L80242D04 /* BA742C 80242CAC 0000102D */ daddu $v0, $zero, $zero +glabel L80242CB0_BA7430 /* BA7430 80242CB0 0260202D */ daddu $a0, $s3, $zero /* BA7434 80242CB4 0280282D */ daddu $a1, $s4, $zero /* BA7438 80242CB8 0C09094F */ jal func_8024253C_BA6CBC /* BA743C 80242CBC 0200302D */ daddu $a2, $s0, $zero /* BA7440 80242CC0 08090B41 */ j .L80242D04 /* BA7444 80242CC4 0000102D */ daddu $v0, $zero, $zero +glabel L80242CC8_BA7448 /* BA7448 80242CC8 0260202D */ daddu $a0, $s3, $zero /* BA744C 80242CCC 0280282D */ daddu $a1, $s4, $zero /* BA7450 80242CD0 0C0909B8 */ jal func_802426E0_BA6E60 /* BA7454 80242CD4 0200302D */ daddu $a2, $s0, $zero +glabel L80242CD8_BA7458 /* BA7458 80242CD8 0260202D */ daddu $a0, $s3, $zero /* BA745C 80242CDC 0280282D */ daddu $a1, $s4, $zero /* BA7460 80242CE0 0C0909F0 */ jal func_802427C0_BA6F40 /* BA7464 80242CE4 0200302D */ daddu $a2, $s0, $zero /* BA7468 80242CE8 08090B41 */ j .L80242D04 /* BA746C 80242CEC 0000102D */ daddu $v0, $zero, $zero +glabel L80242CF0_BA7470 /* BA7470 80242CF0 0260202D */ daddu $a0, $s3, $zero /* BA7474 80242CF4 0280282D */ daddu $a1, $s4, $zero /* BA7478 80242CF8 0C090AB0 */ jal mim_06_UnkDurationCheck /* BA747C 80242CFC 0200302D */ daddu $a2, $s0, $zero .L80242D00: +glabel L80242D00_BA7480 /* BA7480 80242D00 0000102D */ daddu $v0, $zero, $zero .L80242D04: /* BA7484 80242D04 8FBF0048 */ lw $ra, 0x48($sp) @@ -143,5 +151,5 @@ glabel func_80242B04_BA7284 /* BA749C 80242D1C 8FB00030 */ lw $s0, 0x30($sp) /* BA74A0 80242D20 03E00008 */ jr $ra /* BA74A4 80242D24 27BD0050 */ addiu $sp, $sp, 0x50 -/* BA74A8 80242D28 00000000 */ nop -/* BA74AC 80242D2C 00000000 */ nop +/* BA74A8 80242D28 00000000 */ nop +/* BA74AC 80242D2C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA140/func_80240000_BAA140.s b/asm/nonmatchings/world/area_mim/mim_07/BAA140/func_80240000_BAA140.s index 943da7cad4..899ada72c9 100644 --- a/asm/nonmatchings/world/area_mim/mim_07/BAA140/func_80240000_BAA140.s +++ b/asm/nonmatchings/world/area_mim/mim_07/BAA140/func_80240000_BAA140.s @@ -5,7 +5,7 @@ glabel func_80240000_BAA140 /* BAA140 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 /* BAA144 80240004 AFBF0010 */ sw $ra, 0x10($sp) /* BAA148 80240008 0C046ED4 */ jal enable_world_fog -/* BAA14C 8024000C 00000000 */ nop +/* BAA14C 8024000C 00000000 */ nop /* BAA150 80240010 240403DE */ addiu $a0, $zero, 0x3de /* BAA154 80240014 0C046EDD */ jal set_world_fog_dist /* BAA158 80240018 240503E8 */ addiu $a1, $zero, 0x3e8 @@ -15,7 +15,7 @@ glabel func_80240000_BAA140 /* BAA168 80240028 0C046EE2 */ jal set_world_fog_color /* BAA16C 8024002C 240700FF */ addiu $a3, $zero, 0xff /* BAA170 80240030 0C048BFB */ jal enable_entity_fog -/* BAA174 80240034 00000000 */ nop +/* BAA174 80240034 00000000 */ nop /* BAA178 80240038 240403DE */ addiu $a0, $zero, 0x3de /* BAA17C 8024003C 0C048C04 */ jal set_entity_fog_dist /* BAA180 80240040 240503E8 */ addiu $a1, $zero, 0x3e8 @@ -28,5 +28,5 @@ glabel func_80240000_BAA140 /* BAA19C 8024005C 24020002 */ addiu $v0, $zero, 2 /* BAA1A0 80240060 03E00008 */ jr $ra /* BAA1A4 80240064 27BD0018 */ addiu $sp, $sp, 0x18 -/* BAA1A8 80240068 00000000 */ nop -/* BAA1AC 8024006C 00000000 */ nop +/* BAA1A8 80240068 00000000 */ nop +/* BAA1AC 8024006C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240070_BAA1B0.s b/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240070_BAA1B0.s index f604274df0..3ab3da209a 100644 --- a/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240070_BAA1B0.s +++ b/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240070_BAA1B0.s @@ -5,7 +5,7 @@ glabel func_80240070_BAA1B0 /* BAA1B0 80240070 27BDFFE8 */ addiu $sp, $sp, -0x18 /* BAA1B4 80240074 AFBF0010 */ sw $ra, 0x10($sp) /* BAA1B8 80240078 0C046ED4 */ jal enable_world_fog -/* BAA1BC 8024007C 00000000 */ nop +/* BAA1BC 8024007C 00000000 */ nop /* BAA1C0 80240080 240403DE */ addiu $a0, $zero, 0x3de /* BAA1C4 80240084 0C046EDD */ jal set_world_fog_dist /* BAA1C8 80240088 240503E8 */ addiu $a1, $zero, 0x3e8 @@ -15,7 +15,7 @@ glabel func_80240070_BAA1B0 /* BAA1D8 80240098 0C046EE2 */ jal set_world_fog_color /* BAA1DC 8024009C 240700FF */ addiu $a3, $zero, 0xff /* BAA1E0 802400A0 0C048BFB */ jal enable_entity_fog -/* BAA1E4 802400A4 00000000 */ nop +/* BAA1E4 802400A4 00000000 */ nop /* BAA1E8 802400A8 240403DE */ addiu $a0, $zero, 0x3de /* BAA1EC 802400AC 0C048C04 */ jal set_entity_fog_dist /* BAA1F0 802400B0 240503E8 */ addiu $a1, $zero, 0x3e8 diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240244_BAA384.s b/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240244_BAA384.s index 4e567eae2d..e9646b6e77 100644 --- a/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240244_BAA384.s +++ b/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240244_BAA384.s @@ -12,5 +12,5 @@ glabel func_80240244_BAA384 .L80240260: /* BAA3A0 80240260 03E00008 */ jr $ra /* BAA3A4 80240264 24020002 */ addiu $v0, $zero, 2 -/* BAA3A8 80240268 00000000 */ nop -/* BAA3AC 8024026C 00000000 */ nop +/* BAA3A8 80240268 00000000 */ nop +/* BAA3AC 8024026C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240270_BAA3B0.s b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240270_BAA3B0.s index 11969e2a5b..703358b499 100644 --- a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240270_BAA3B0.s +++ b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240270_BAA3B0.s @@ -30,7 +30,7 @@ glabel func_80240270_BAA3B0 /* BAA414 802402D4 3C05B000 */ lui $a1, 0xb000 /* BAA418 802402D8 34A50017 */ ori $a1, $a1, 0x17 /* BAA41C 802402DC 44820000 */ mtc1 $v0, $f0 -/* BAA420 802402E0 00000000 */ nop +/* BAA420 802402E0 00000000 */ nop /* BAA424 802402E4 46800021 */ cvt.d.w $f0, $f0 /* BAA428 802402E8 3C014024 */ lui $at, 0x4024 /* BAA42C 802402EC 44811800 */ mtc1 $at, $f3 @@ -68,7 +68,7 @@ glabel func_80240270_BAA3B0 /* BAA4AC 8024036C 0C0123F5 */ jal is_point_within_region /* BAA4B0 80240370 8E070038 */ lw $a3, 0x38($s0) /* BAA4B4 80240374 10400035 */ beqz $v0, .L8024044C -/* BAA4B8 80240378 00000000 */ nop +/* BAA4B8 80240378 00000000 */ nop /* BAA4BC 8024037C C60C0038 */ lwc1 $f12, 0x38($s0) /* BAA4C0 80240380 3C0141C8 */ lui $at, 0x41c8 /* BAA4C4 80240384 4481B000 */ mtc1 $at, $f22 @@ -99,13 +99,13 @@ glabel func_80240270_BAA3B0 /* BAA524 802403E4 860200A8 */ lh $v0, 0xa8($s0) /* BAA528 802403E8 27A50020 */ addiu $a1, $sp, 0x20 /* BAA52C 802403EC 44820000 */ mtc1 $v0, $f0 -/* BAA530 802403F0 00000000 */ nop +/* BAA530 802403F0 00000000 */ nop /* BAA534 802403F4 46800020 */ cvt.s.w $f0, $f0 /* BAA538 802403F8 E7A00018 */ swc1 $f0, 0x18($sp) /* BAA53C 802403FC 860200A6 */ lh $v0, 0xa6($s0) /* BAA540 80240400 27A60024 */ addiu $a2, $sp, 0x24 /* BAA544 80240404 44820000 */ mtc1 $v0, $f0 -/* BAA548 80240408 00000000 */ nop +/* BAA548 80240408 00000000 */ nop /* BAA54C 8024040C 46800020 */ cvt.s.w $f0, $f0 /* BAA550 80240410 E7A0001C */ swc1 $f0, 0x1c($sp) /* BAA554 80240414 8E040080 */ lw $a0, 0x80($s0) @@ -121,13 +121,13 @@ glabel func_80240270_BAA3B0 /* BAA57C 8024043C 1440FFE6 */ bnez $v0, .L802403D8 /* BAA580 80240440 E600000C */ swc1 $f0, 0xc($s0) /* BAA584 80240444 0809011F */ j .L8024047C -/* BAA588 80240448 00000000 */ nop +/* BAA588 80240448 00000000 */ nop .L8024044C: /* BAA58C 8024044C 0C00A67F */ jal rand_int /* BAA590 80240450 2404003C */ addiu $a0, $zero, 0x3c /* BAA594 80240454 C60C000C */ lwc1 $f12, 0xc($s0) /* BAA598 80240458 44820000 */ mtc1 $v0, $f0 -/* BAA59C 8024045C 00000000 */ nop +/* BAA59C 8024045C 00000000 */ nop /* BAA5A0 80240460 46800020 */ cvt.s.w $f0, $f0 /* BAA5A4 80240464 46006300 */ add.s $f12, $f12, $f0 /* BAA5A8 80240468 3C0141F0 */ lui $at, 0x41f0 diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_802404A0_BAA5E0.s b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_802404A0_BAA5E0.s index 6a7b222f65..36d01f73ae 100644 --- a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_802404A0_BAA5E0.s +++ b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_802404A0_BAA5E0.s @@ -43,7 +43,7 @@ glabel func_802404A0_BAA5E0 /* BAA678 80240538 2402000F */ addiu $v0, $zero, 0xf /* BAA67C 8024053C AFA2001C */ sw $v0, 0x1c($sp) /* BAA680 80240540 44835000 */ mtc1 $v1, $f10 -/* BAA684 80240544 00000000 */ nop +/* BAA684 80240544 00000000 */ nop /* BAA688 80240548 468052A0 */ cvt.s.w $f10, $f10 /* BAA68C 8024054C 44075000 */ mfc1 $a3, $f10 /* BAA690 80240550 27A20028 */ addiu $v0, $sp, 0x28 @@ -78,7 +78,7 @@ glabel func_802404A0_BAA5E0 /* BAA6F8 802405B8 44801800 */ mtc1 $zero, $f3 /* BAA6FC 802405BC 46000021 */ cvt.d.s $f0, $f0 /* BAA700 802405C0 4620103C */ c.lt.d $f2, $f0 -/* BAA704 802405C4 00000000 */ nop +/* BAA704 802405C4 00000000 */ nop /* BAA708 802405C8 45000025 */ bc1f .L80240660 /* BAA70C 802405CC 27A5002C */ addiu $a1, $sp, 0x2c /* BAA710 802405D0 C6000038 */ lwc1 $f0, 0x38($s0) @@ -88,7 +88,7 @@ glabel func_802404A0_BAA5E0 /* BAA720 802405E0 27A60030 */ addiu $a2, $sp, 0x30 /* BAA724 802405E4 E7A0002C */ swc1 $f0, 0x2c($sp) /* BAA728 802405E8 44820000 */ mtc1 $v0, $f0 -/* BAA72C 802405EC 00000000 */ nop +/* BAA72C 802405EC 00000000 */ nop /* BAA730 802405F0 46800020 */ cvt.s.w $f0, $f0 /* BAA734 802405F4 46000021 */ cvt.d.s $f0, $f0 /* BAA738 802405F8 C604003C */ lwc1 $f4, 0x3c($s0) @@ -96,13 +96,13 @@ glabel func_802404A0_BAA5E0 /* BAA740 80240600 C6080018 */ lwc1 $f8, 0x18($s0) /* BAA744 80240604 860200A8 */ lh $v0, 0xa8($s0) /* BAA748 80240608 46220002 */ mul.d $f0, $f0, $f2 -/* BAA74C 8024060C 00000000 */ nop +/* BAA74C 8024060C 00000000 */ nop /* BAA750 80240610 E7A40030 */ swc1 $f4, 0x30($sp) /* BAA754 80240614 E7A60034 */ swc1 $f6, 0x34($sp) /* BAA758 80240618 E7A80010 */ swc1 $f8, 0x10($sp) /* BAA75C 8024061C C604000C */ lwc1 $f4, 0xc($s0) /* BAA760 80240620 44821000 */ mtc1 $v0, $f2 -/* BAA764 80240624 00000000 */ nop +/* BAA764 80240624 00000000 */ nop /* BAA768 80240628 468010A0 */ cvt.s.w $f2, $f2 /* BAA76C 8024062C E7A20018 */ swc1 $f2, 0x18($sp) /* BAA770 80240630 E7A40014 */ swc1 $f4, 0x14($sp) @@ -123,7 +123,7 @@ glabel func_802404A0_BAA5E0 /* BAA7A8 80240668 44801800 */ mtc1 $zero, $f3 /* BAA7AC 8024066C 46000021 */ cvt.d.s $f0, $f0 /* BAA7B0 80240670 4622003C */ c.lt.d $f0, $f2 -/* BAA7B4 80240674 00000000 */ nop +/* BAA7B4 80240674 00000000 */ nop /* BAA7B8 80240678 45000047 */ bc1f .L80240798 /* BAA7BC 8024067C 27A5002C */ addiu $a1, $sp, 0x2c /* BAA7C0 80240680 27A60030 */ addiu $a2, $sp, 0x30 @@ -154,7 +154,7 @@ glabel func_802404A0_BAA5E0 /* BAA824 802406E4 0C0372DF */ jal func_800DCB7C /* BAA828 802406E8 27A70034 */ addiu $a3, $sp, 0x34 /* BAA82C 802406EC 1040002A */ beqz $v0, .L80240798 -/* BAA830 802406F0 00000000 */ nop +/* BAA830 802406F0 00000000 */ nop /* BAA834 802406F4 C600001C */ lwc1 $f0, 0x1c($s0) /* BAA838 802406F8 C7A20038 */ lwc1 $f2, 0x38($sp) /* BAA83C 802406FC 46000005 */ abs.s $f0, $f0 @@ -162,7 +162,7 @@ glabel func_802404A0_BAA5E0 /* BAA844 80240704 46340000 */ add.d $f0, $f0, $f20 /* BAA848 80240708 460010A1 */ cvt.d.s $f2, $f2 /* BAA84C 8024070C 4620103E */ c.le.d $f2, $f0 -/* BAA850 80240710 00000000 */ nop +/* BAA850 80240710 00000000 */ nop /* BAA854 80240714 45000020 */ bc1f .L80240798 /* BAA858 80240718 240403E8 */ addiu $a0, $zero, 0x3e8 /* BAA85C 8024071C C7A00030 */ lwc1 $f0, 0x30($sp) @@ -193,7 +193,7 @@ glabel func_802404A0_BAA5E0 /* BAA8C0 80240780 5840000C */ blezl $v0, .L802407B4 /* BAA8C4 80240784 AE600070 */ sw $zero, 0x70($s3) /* BAA8C8 80240788 1460000A */ bnez $v1, .L802407B4 -/* BAA8CC 8024078C 00000000 */ nop +/* BAA8CC 8024078C 00000000 */ nop /* BAA8D0 80240790 080901ED */ j .L802407B4 /* BAA8D4 80240794 AE600070 */ sw $zero, 0x70($s3) .L80240798: diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240898_BAA9D8.s b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240898_BAA9D8.s index 27db327493..73547d324d 100644 --- a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240898_BAA9D8.s +++ b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240898_BAA9D8.s @@ -38,7 +38,7 @@ glabel func_80240898_BAA9D8 /* BAAA5C 8024091C 2402000F */ addiu $v0, $zero, 0xf /* BAAA60 80240920 AFA2001C */ sw $v0, 0x1c($sp) /* BAAA64 80240924 44833000 */ mtc1 $v1, $f6 -/* BAAA68 80240928 00000000 */ nop +/* BAAA68 80240928 00000000 */ nop /* BAAA6C 8024092C 468031A0 */ cvt.s.w $f6, $f6 /* BAAA70 80240930 44073000 */ mfc1 $a3, $f6 /* BAAA74 80240934 27A20028 */ addiu $v0, $sp, 0x28 @@ -65,13 +65,13 @@ glabel func_80240898_BAA9D8 .L80240988: /* BAAAC8 80240988 8602008C */ lh $v0, 0x8c($s0) /* BAAACC 8024098C 14400023 */ bnez $v0, .L80240A1C -/* BAAAD0 80240990 00000000 */ nop +/* BAAAD0 80240990 00000000 */ nop /* BAAAD4 80240994 9602008E */ lhu $v0, 0x8e($s0) /* BAAAD8 80240998 2442FFFF */ addiu $v0, $v0, -1 /* BAAADC 8024099C A602008E */ sh $v0, 0x8e($s0) /* BAAAE0 802409A0 00021400 */ sll $v0, $v0, 0x10 /* BAAAE4 802409A4 1C40001D */ bgtz $v0, .L80240A1C -/* BAAAE8 802409A8 00000000 */ nop +/* BAAAE8 802409A8 00000000 */ nop /* BAAAEC 802409AC 8E820074 */ lw $v0, 0x74($s4) /* BAAAF0 802409B0 2442FFFF */ addiu $v0, $v0, -1 /* BAAAF4 802409B4 18400018 */ blez $v0, .L80240A18 diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240A3C_BAAB7C.s b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240A3C_BAAB7C.s index aaf3df213d..6c6d62d9a6 100644 --- a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240A3C_BAAB7C.s +++ b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240A3C_BAAB7C.s @@ -24,7 +24,7 @@ glabel func_80240A3C_BAAB7C /* BAABC8 80240A88 0C00A67F */ jal rand_int /* BAABCC 80240A8C AE020000 */ sw $v0, ($s0) /* BAABD0 80240A90 44820000 */ mtc1 $v0, $f0 -/* BAABD4 80240A94 00000000 */ nop +/* BAABD4 80240A94 00000000 */ nop /* BAABD8 80240A98 46800021 */ cvt.d.w $f0, $f0 /* BAABDC 80240A9C 3C014024 */ lui $at, 0x4024 /* BAABE0 80240AA0 44811800 */ mtc1 $at, $f3 diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240B1C_BAAC5C.s b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240B1C_BAAC5C.s index bcc4c4fd9a..bbc2186559 100644 --- a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240B1C_BAAC5C.s +++ b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240B1C_BAAC5C.s @@ -25,7 +25,7 @@ glabel func_80240B1C_BAAC5C /* BAACAC 80240B6C 44801800 */ mtc1 $zero, $f3 /* BAACB0 80240B70 46000021 */ cvt.d.s $f0, $f0 /* BAACB4 80240B74 4620103C */ c.lt.d $f2, $f0 -/* BAACB8 80240B78 00000000 */ nop +/* BAACB8 80240B78 00000000 */ nop /* BAACBC 80240B7C 45000021 */ bc1f .L80240C04 /* BAACC0 80240B80 27A50028 */ addiu $a1, $sp, 0x28 /* BAACC4 80240B84 C6600038 */ lwc1 $f0, 0x38($s3) @@ -40,20 +40,20 @@ glabel func_80240B1C_BAAC5C /* BAACE8 80240BA8 E7A00014 */ swc1 $f0, 0x14($sp) /* BAACEC 80240BAC 866200A8 */ lh $v0, 0xa8($s3) /* BAACF0 80240BB0 44820000 */ mtc1 $v0, $f0 -/* BAACF4 80240BB4 00000000 */ nop +/* BAACF4 80240BB4 00000000 */ nop /* BAACF8 80240BB8 46800020 */ cvt.s.w $f0, $f0 /* BAACFC 80240BBC E7A00018 */ swc1 $f0, 0x18($sp) /* BAAD00 80240BC0 866200A6 */ lh $v0, 0xa6($s3) /* BAAD04 80240BC4 27A6002C */ addiu $a2, $sp, 0x2c /* BAAD08 80240BC8 44820000 */ mtc1 $v0, $f0 -/* BAAD0C 80240BCC 00000000 */ nop +/* BAAD0C 80240BCC 00000000 */ nop /* BAAD10 80240BD0 46800020 */ cvt.s.w $f0, $f0 /* BAAD14 80240BD4 E7A0001C */ swc1 $f0, 0x1c($sp) /* BAAD18 80240BD8 8E640080 */ lw $a0, 0x80($s3) /* BAAD1C 80240BDC 0C037711 */ jal func_800DDC44 /* BAAD20 80240BE0 27A70030 */ addiu $a3, $sp, 0x30 /* BAAD24 80240BE4 10400003 */ beqz $v0, .L80240BF4 -/* BAAD28 80240BE8 00000000 */ nop +/* BAAD28 80240BE8 00000000 */ nop /* BAAD2C 80240BEC 08090301 */ j .L80240C04 /* BAAD30 80240BF0 AE600018 */ sw $zero, 0x18($s3) .L80240BF4: @@ -67,7 +67,7 @@ glabel func_80240B1C_BAAC5C /* BAAD4C 80240C0C 44801800 */ mtc1 $zero, $f3 /* BAAD50 80240C10 46000021 */ cvt.d.s $f0, $f0 /* BAAD54 80240C14 4622003C */ c.lt.d $f0, $f2 -/* BAAD58 80240C18 00000000 */ nop +/* BAAD58 80240C18 00000000 */ nop /* BAAD5C 80240C1C 4500006C */ bc1f .L80240DD0 /* BAAD60 80240C20 27B00028 */ addiu $s0, $sp, 0x28 /* BAAD64 80240C24 0200282D */ daddu $a1, $s0, $zero @@ -116,7 +116,7 @@ glabel func_80240B1C_BAAC5C /* BAAE10 80240CD0 0C0372DF */ jal func_800DCB7C /* BAAE14 80240CD4 0220382D */ daddu $a3, $s1, $zero /* BAAE18 80240CD8 1040003D */ beqz $v0, .L80240DD0 -/* BAAE1C 80240CDC 00000000 */ nop +/* BAAE1C 80240CDC 00000000 */ nop /* BAAE20 80240CE0 C660001C */ lwc1 $f0, 0x1c($s3) /* BAAE24 80240CE4 C7A20038 */ lwc1 $f2, 0x38($sp) /* BAAE28 80240CE8 46000005 */ abs.s $f0, $f0 @@ -124,7 +124,7 @@ glabel func_80240B1C_BAAC5C /* BAAE30 80240CF0 46340000 */ add.d $f0, $f0, $f20 /* BAAE34 80240CF4 460010A1 */ cvt.d.s $f2, $f2 /* BAAE38 80240CF8 4620103E */ c.le.d $f2, $f0 -/* BAAE3C 80240CFC 00000000 */ nop +/* BAAE3C 80240CFC 00000000 */ nop /* BAAE40 80240D00 45000033 */ bc1f .L80240DD0 /* BAAE44 80240D04 2403F7FF */ addiu $v1, $zero, -0x801 /* BAAE48 80240D08 C7A0002C */ lwc1 $f0, 0x2c($sp) @@ -163,7 +163,7 @@ glabel func_80240B1C_BAAC5C /* BAAECC 80240D8C 2402000F */ addiu $v0, $zero, 0xf /* BAAED0 80240D90 AFA2001C */ sw $v0, 0x1c($sp) /* BAAED4 80240D94 44834000 */ mtc1 $v1, $f8 -/* BAAED8 80240D98 00000000 */ nop +/* BAAED8 80240D98 00000000 */ nop /* BAAEDC 80240D9C 46804220 */ cvt.s.w $f8, $f8 /* BAAEE0 80240DA0 44074000 */ mfc1 $a3, $f8 /* BAAEE4 80240DA4 27A2003C */ addiu $v0, $sp, 0x3c diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s index d83d19ac53..6a122323a2 100644 --- a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s +++ b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s @@ -76,7 +76,7 @@ glabel func_80240E60_BAAFA0 /* BAB0B8 80240F78 8E4300B0 */ lw $v1, 0xb0($s2) /* BAB0BC 80240F7C 30620004 */ andi $v0, $v1, 4 /* BAB0C0 80240F80 10400007 */ beqz $v0, .L80240FA0 -/* BAB0C4 80240F84 00000000 */ nop +/* BAB0C4 80240F84 00000000 */ nop /* BAB0C8 80240F88 824200B4 */ lb $v0, 0xb4($s2) /* BAB0CC 80240F8C 14400034 */ bnez $v0, .L80241060 /* BAB0D0 80240F90 0000102D */ daddu $v0, $zero, $zero @@ -88,21 +88,24 @@ glabel func_80240E60_BAAFA0 /* BAB0E4 80240FA4 2C62000F */ sltiu $v0, $v1, 0xf /* BAB0E8 80240FA8 1040002C */ beqz $v0, .L8024105C /* BAB0EC 80240FAC 00031080 */ sll $v0, $v1, 2 -/* BAB0F0 80240FB0 3C018024 */ lui $at, %hi(func_802437B8) +/* BAB0F0 80240FB0 3C018024 */ lui $at, %hi(jtbl_802437B8_BAD8F8) /* BAB0F4 80240FB4 00220821 */ addu $at, $at, $v0 -/* BAB0F8 80240FB8 8C2237B8 */ lw $v0, %lo(func_802437B8)($at) +/* BAB0F8 80240FB8 8C2237B8 */ lw $v0, %lo(jtbl_802437B8_BAD8F8)($at) /* BAB0FC 80240FBC 00400008 */ jr $v0 -/* BAB100 80240FC0 00000000 */ nop +/* BAB100 80240FC0 00000000 */ nop +glabel L80240FC4_BAB104 /* BAB104 80240FC4 0260202D */ daddu $a0, $s3, $zero /* BAB108 80240FC8 0280282D */ daddu $a1, $s4, $zero /* BAB10C 80240FCC 0C09009C */ jal func_80240270_BAA3B0 /* BAB110 80240FD0 0200302D */ daddu $a2, $s0, $zero +glabel L80240FD4_BAB114 /* BAB114 80240FD4 0260202D */ daddu $a0, $s3, $zero /* BAB118 80240FD8 0280282D */ daddu $a1, $s4, $zero /* BAB11C 80240FDC 0C090128 */ jal func_802404A0_BAA5E0 /* BAB120 80240FE0 0200302D */ daddu $a2, $s0, $zero /* BAB124 80240FE4 08090418 */ j .L80241060 /* BAB128 80240FE8 0000102D */ daddu $v0, $zero, $zero +glabel L80240FEC_BAB12C /* BAB12C 80240FEC 0260202D */ daddu $a0, $s3, $zero /* BAB130 80240FF0 0280282D */ daddu $a1, $s4, $zero /* BAB134 80240FF4 0C0901F6 */ jal mim_07_UnkNpcAIFunc1 @@ -111,27 +114,32 @@ glabel func_80240E60_BAAFA0 /* BAB140 80241000 24020003 */ addiu $v0, $zero, 3 /* BAB144 80241004 14620016 */ bne $v1, $v0, .L80241060 /* BAB148 80241008 0000102D */ daddu $v0, $zero, $zero +glabel L8024100C_BAB14C /* BAB14C 8024100C 0260202D */ daddu $a0, $s3, $zero /* BAB150 80241010 0280282D */ daddu $a1, $s4, $zero /* BAB154 80241014 0C090226 */ jal func_80240898_BAA9D8 /* BAB158 80241018 0200302D */ daddu $a2, $s0, $zero /* BAB15C 8024101C 08090418 */ j .L80241060 /* BAB160 80241020 0000102D */ daddu $v0, $zero, $zero +glabel L80241024_BAB164 /* BAB164 80241024 0260202D */ daddu $a0, $s3, $zero /* BAB168 80241028 0280282D */ daddu $a1, $s4, $zero /* BAB16C 8024102C 0C09028F */ jal func_80240A3C_BAAB7C /* BAB170 80241030 0200302D */ daddu $a2, $s0, $zero +glabel L80241034_BAB174 /* BAB174 80241034 0260202D */ daddu $a0, $s3, $zero /* BAB178 80241038 0280282D */ daddu $a1, $s4, $zero /* BAB17C 8024103C 0C0902C7 */ jal func_80240B1C_BAAC5C /* BAB180 80241040 0200302D */ daddu $a2, $s0, $zero /* BAB184 80241044 08090418 */ j .L80241060 /* BAB188 80241048 0000102D */ daddu $v0, $zero, $zero +glabel L8024104C_BAB18C /* BAB18C 8024104C 0260202D */ daddu $a0, $s3, $zero /* BAB190 80241050 0280282D */ daddu $a1, $s4, $zero /* BAB194 80241054 0C090387 */ jal mim_07_UnkDurationCheck /* BAB198 80241058 0200302D */ daddu $a2, $s0, $zero .L8024105C: +glabel L8024105C_BAB19C /* BAB19C 8024105C 0000102D */ daddu $v0, $zero, $zero .L80241060: /* BAB1A0 80241060 8FBF0048 */ lw $ra, 0x48($sp) @@ -143,6 +151,6 @@ glabel func_80240E60_BAAFA0 /* BAB1B8 80241078 8FB00030 */ lw $s0, 0x30($sp) /* BAB1BC 8024107C 03E00008 */ jr $ra /* BAB1C0 80241080 27BD0050 */ addiu $sp, $sp, 0x50 -/* BAB1C4 80241084 00000000 */ nop -/* BAB1C8 80241088 00000000 */ nop -/* BAB1CC 8024108C 00000000 */ nop +/* BAB1C4 80241084 00000000 */ nop +/* BAB1C8 80241088 00000000 */ nop +/* BAB1CC 8024108C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240000_BAD940.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240000_BAD940.s index 80a56bd4fb..d5b2be416d 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240000_BAD940.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240000_BAD940.s @@ -5,7 +5,7 @@ glabel func_80240000_BAD940 /* BAD940 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 /* BAD944 80240004 AFBF0010 */ sw $ra, 0x10($sp) /* BAD948 80240008 0C046ED4 */ jal enable_world_fog -/* BAD94C 8024000C 00000000 */ nop +/* BAD94C 8024000C 00000000 */ nop /* BAD950 80240010 240403DE */ addiu $a0, $zero, 0x3de /* BAD954 80240014 0C046EDD */ jal set_world_fog_dist /* BAD958 80240018 240503E8 */ addiu $a1, $zero, 0x3e8 @@ -15,7 +15,7 @@ glabel func_80240000_BAD940 /* BAD968 80240028 0C046EE2 */ jal set_world_fog_color /* BAD96C 8024002C 240700FF */ addiu $a3, $zero, 0xff /* BAD970 80240030 0C048BFB */ jal enable_entity_fog -/* BAD974 80240034 00000000 */ nop +/* BAD974 80240034 00000000 */ nop /* BAD978 80240038 240403DE */ addiu $a0, $zero, 0x3de /* BAD97C 8024003C 0C048C04 */ jal set_entity_fog_dist /* BAD980 80240040 240503E8 */ addiu $a1, $zero, 0x3e8 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802400A0_BAD9E0.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802400A0_BAD9E0.s index 76d3d4a99d..0a0747f07b 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802400A0_BAD9E0.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802400A0_BAD9E0.s @@ -47,7 +47,7 @@ glabel func_802400A0_BAD9E0 /* BADA88 80240148 0C0123F5 */ jal is_point_within_region /* BADA8C 8024014C 8E070038 */ lw $a3, 0x38($s0) /* BADA90 80240150 1040000E */ beqz $v0, .L8024018C -/* BADA94 80240154 00000000 */ nop +/* BADA94 80240154 00000000 */ nop /* BADA98 80240158 8E2200D0 */ lw $v0, 0xd0($s1) /* BADA9C 8024015C C60C0038 */ lwc1 $f12, 0x38($s0) /* BADAA0 80240160 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_802400A0_BAD9E0 /* BADAB4 80240174 468031A0 */ cvt.s.w $f6, $f6 /* BADAB8 80240178 44073000 */ mfc1 $a3, $f6 /* BADABC 8024017C 0C00A720 */ jal atan2 -/* BADAC0 80240180 00000000 */ nop +/* BADAC0 80240180 00000000 */ nop /* BADAC4 80240184 0809006F */ j .L802401BC /* BADAC8 80240188 E600000C */ swc1 $f0, 0xc($s0) .L8024018C: @@ -66,7 +66,7 @@ glabel func_802400A0_BAD9E0 /* BADAD0 80240190 2404003C */ addiu $a0, $zero, 0x3c /* BADAD4 80240194 C60C000C */ lwc1 $f12, 0xc($s0) /* BADAD8 80240198 44820000 */ mtc1 $v0, $f0 -/* BADADC 8024019C 00000000 */ nop +/* BADADC 8024019C 00000000 */ nop /* BADAE0 802401A0 46800020 */ cvt.s.w $f0, $f0 /* BADAE4 802401A4 46006300 */ add.s $f12, $f12, $f0 /* BADAE8 802401A8 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_802400A0_BAD9E0 /* BADB0C 802401CC 8E2200D0 */ lw $v0, 0xd0($s1) /* BADB10 802401D0 8C420014 */ lw $v0, 0x14($v0) /* BADB14 802401D4 04410004 */ bgez $v0, .L802401E8 -/* BADB18 802401D8 00000000 */ nop +/* BADB18 802401D8 00000000 */ nop /* BADB1C 802401DC C6400000 */ lwc1 $f0, ($s2) /* BADB20 802401E0 08090082 */ j .L80240208 /* BADB24 802401E4 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_802400A0_BAD9E0 /* BADB28 802401E8 3C018024 */ lui $at, %hi(D_802452A0) /* BADB2C 802401EC D42252A0 */ ldc1 $f2, %lo(D_802452A0)($at) /* BADB30 802401F0 44820000 */ mtc1 $v0, $f0 -/* BADB34 802401F4 00000000 */ nop +/* BADB34 802401F4 00000000 */ nop /* BADB38 802401F8 46800021 */ cvt.d.w $f0, $f0 /* BADB3C 802401FC 46220003 */ div.d $f0, $f0, $f2 /* BADB40 80240200 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_802400A0_BAD9E0 /* BADB54 80240214 44801000 */ mtc1 $zero, $f2 /* BADB58 80240218 46000021 */ cvt.d.s $f0, $f0 /* BADB5C 8024021C 46220002 */ mul.d $f0, $f0, $f2 -/* BADB60 80240220 00000000 */ nop +/* BADB60 80240220 00000000 */ nop /* BADB64 80240224 24020001 */ addiu $v0, $zero, 1 /* BADB68 80240228 4620018D */ trunc.w.d $f6, $f0 /* BADB6C 8024022C E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240250_BADB90.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240250_BADB90.s index 9a9694a5c5..afaa95b7d2 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240250_BADB90.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240250_BADB90.s @@ -34,7 +34,7 @@ glabel func_80240250_BADB90 /* BADC04 802402C4 44803000 */ mtc1 $zero, $f6 /* BADC08 802402C8 46000021 */ cvt.d.s $f0, $f0 /* BADC0C 802402CC 46260002 */ mul.d $f0, $f0, $f6 -/* BADC10 802402D0 00000000 */ nop +/* BADC10 802402D0 00000000 */ nop /* BADC14 802402D4 24020001 */ addiu $v0, $zero, 1 /* BADC18 802402D8 8E24006C */ lw $a0, 0x6c($s1) /* BADC1C 802402DC 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80240250_BADB90 /* BADC78 80240338 C600003C */ lwc1 $f0, 0x3c($s0) /* BADC7C 8024033C 4600C001 */ sub.s $f0, $f24, $f0 /* BADC80 80240340 4600B03C */ c.lt.s $f22, $f0 -/* BADC84 80240344 00000000 */ nop +/* BADC84 80240344 00000000 */ nop /* BADC88 80240348 4500001B */ bc1f .L802403B8 /* BADC8C 8024034C 34820010 */ ori $v0, $a0, 0x10 /* BADC90 80240350 080900EE */ j .L802403B8 @@ -87,9 +87,9 @@ glabel func_80240250_BADB90 /* BADCD4 80240394 C7A00034 */ lwc1 $f0, 0x34($sp) /* BADCD8 80240398 4600D001 */ sub.s $f0, $f26, $f0 /* BADCDC 8024039C 4600B03C */ c.lt.s $f22, $f0 -/* BADCE0 802403A0 00000000 */ nop +/* BADCE0 802403A0 00000000 */ nop /* BADCE4 802403A4 45000004 */ bc1f .L802403B8 -/* BADCE8 802403A8 00000000 */ nop +/* BADCE8 802403A8 00000000 */ nop /* BADCEC 802403AC 8E22006C */ lw $v0, 0x6c($s1) /* BADCF0 802403B0 34420010 */ ori $v0, $v0, 0x10 /* BADCF4 802403B4 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80240250_BADB90 /* BADCFC 802403BC 24030011 */ addiu $v1, $zero, 0x11 /* BADD00 802403C0 30420011 */ andi $v0, $v0, 0x11 /* BADD04 802403C4 14430039 */ bne $v0, $v1, .L802404AC -/* BADD08 802403C8 00000000 */ nop +/* BADD08 802403C8 00000000 */ nop /* BADD0C 802403CC 8E020000 */ lw $v0, ($s0) /* BADD10 802403D0 30420008 */ andi $v0, $v0, 8 /* BADD14 802403D4 1040000A */ beqz $v0, .L80240400 @@ -108,7 +108,7 @@ glabel func_80240250_BADB90 /* BADD24 802403E4 D42052A8 */ ldc1 $f0, %lo(D_802452A8)($at) /* BADD28 802403E8 460010A1 */ cvt.d.s $f2, $f2 /* BADD2C 802403EC 46201082 */ mul.d $f2, $f2, $f0 -/* BADD30 802403F0 00000000 */ nop +/* BADD30 802403F0 00000000 */ nop /* BADD34 802403F4 4600A021 */ cvt.d.s $f0, $f20 /* BADD38 802403F8 08090119 */ j .L80240464 /* BADD3C 802403FC 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80240250_BADB90 /* BADD8C 8024044C D42052B0 */ ldc1 $f0, %lo(D_802452B0)($at) /* BADD90 80240450 460010A1 */ cvt.d.s $f2, $f2 /* BADD94 80240454 46201082 */ mul.d $f2, $f2, $f0 -/* BADD98 80240458 00000000 */ nop +/* BADD98 80240458 00000000 */ nop /* BADD9C 8024045C 4600A021 */ cvt.d.s $f0, $f20 /* BADDA0 80240460 46220000 */ add.d $f0, $f0, $f2 .L80240464: @@ -149,7 +149,7 @@ glabel func_80240250_BADB90 /* BADDC0 80240480 46000005 */ abs.s $f0, $f0 /* BADDC4 80240484 46000021 */ cvt.d.s $f0, $f0 /* BADDC8 80240488 4622003C */ c.lt.d $f0, $f2 -/* BADDCC 8024048C 00000000 */ nop +/* BADDCC 8024048C 00000000 */ nop /* BADDD0 80240490 45000036 */ bc1f .L8024056C /* BADDD4 80240494 2403FFEF */ addiu $v1, $zero, -0x11 /* BADDD8 80240498 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80240250_BADB90 .L802404AC: /* BADDEC 802404AC 8E220070 */ lw $v0, 0x70($s1) /* BADDF0 802404B0 1840002E */ blez $v0, .L8024056C -/* BADDF4 802404B4 00000000 */ nop +/* BADDF4 802404B4 00000000 */ nop /* BADDF8 802404B8 C62C0074 */ lwc1 $f12, 0x74($s1) /* BADDFC 802404BC 0C00A8BB */ jal sin_deg /* BADE00 802404C0 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80240250_BADB90 /* BADE58 80240518 27A70030 */ addiu $a3, $sp, 0x30 .L8024051C: /* BADE5C 8024051C 10400007 */ beqz $v0, .L8024053C -/* BADE60 80240520 00000000 */ nop +/* BADE60 80240520 00000000 */ nop /* BADE64 80240524 4616A082 */ mul.s $f2, $f20, $f22 -/* BADE68 80240528 00000000 */ nop +/* BADE68 80240528 00000000 */ nop /* BADE6C 8024052C C7A0002C */ lwc1 $f0, 0x2c($sp) /* BADE70 80240530 461A0000 */ add.s $f0, $f0, $f26 /* BADE74 80240534 08090152 */ j .L80240548 /* BADE78 80240538 46020000 */ add.s $f0, $f0, $f2 .L8024053C: /* BADE7C 8024053C 4616A002 */ mul.s $f0, $f20, $f22 -/* BADE80 80240540 00000000 */ nop +/* BADE80 80240540 00000000 */ nop /* BADE84 80240544 4600C000 */ add.s $f0, $f24, $f0 .L80240548: /* BADE88 80240548 E600003C */ swc1 $f0, 0x3c($s0) /* BADE8C 8024054C 8E220074 */ lw $v0, 0x74($s1) /* BADE90 80240550 2442000A */ addiu $v0, $v0, 0xa /* BADE94 80240554 44826000 */ mtc1 $v0, $f12 -/* BADE98 80240558 00000000 */ nop +/* BADE98 80240558 00000000 */ nop /* BADE9C 8024055C 0C00A6C9 */ jal clamp_angle /* BADEA0 80240560 46806320 */ cvt.s.w $f12, $f12 /* BADEA4 80240564 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80240250_BADB90 /* BADEB4 80240574 2442FFFF */ addiu $v0, $v0, -1 /* BADEB8 80240578 8E430014 */ lw $v1, 0x14($s2) /* BADEBC 8024057C 04600048 */ bltz $v1, .L802406A0 -/* BADEC0 80240580 00000000 */ nop +/* BADEC0 80240580 00000000 */ nop /* BADEC4 80240584 8E620074 */ lw $v0, 0x74($s3) /* BADEC8 80240588 1C400042 */ bgtz $v0, .L80240694 /* BADECC 8024058C 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80240250_BADB90 /* BADED4 80240594 860200A8 */ lh $v0, 0xa8($s0) /* BADED8 80240598 C602003C */ lwc1 $f2, 0x3c($s0) /* BADEDC 8024059C 44820000 */ mtc1 $v0, $f0 -/* BADEE0 802405A0 00000000 */ nop +/* BADEE0 802405A0 00000000 */ nop /* BADEE4 802405A4 46800020 */ cvt.s.w $f0, $f0 /* BADEE8 802405A8 46001080 */ add.s $f2, $f2, $f0 /* BADEEC 802405AC 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80240250_BADB90 /* BADF08 802405C8 C440002C */ lwc1 $f0, 0x2c($v0) /* BADF0C 802405CC 46000021 */ cvt.d.s $f0, $f0 /* BADF10 802405D0 4622003C */ c.lt.d $f0, $f2 -/* BADF14 802405D4 00000000 */ nop +/* BADF14 802405D4 00000000 */ nop /* BADF18 802405D8 4500002C */ bc1f .L8024068C /* BADF1C 802405DC 02A0202D */ daddu $a0, $s5, $zero /* BADF20 802405E0 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80240250_BADB90 /* BADF5C 8024061C 3C01C1A0 */ lui $at, 0xc1a0 /* BADF60 80240620 44812000 */ mtc1 $at, $f4 /* BADF64 80240624 44834000 */ mtc1 $v1, $f8 -/* BADF68 80240628 00000000 */ nop +/* BADF68 80240628 00000000 */ nop /* BADF6C 8024062C 46804220 */ cvt.s.w $f8, $f8 /* BADF70 80240630 44074000 */ mfc1 $a3, $f8 /* BADF74 80240634 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80240250_BADB90 /* BAE028 802406E8 0C0123F5 */ jal is_point_within_region /* BAE02C 802406EC 8E070038 */ lw $a3, 0x38($s0) /* BAE030 802406F0 1040001A */ beqz $v0, .L8024075C -/* BAE034 802406F4 00000000 */ nop +/* BAE034 802406F4 00000000 */ nop /* BAE038 802406F8 8E060038 */ lw $a2, 0x38($s0) /* BAE03C 802406FC 8E2200D0 */ lw $v0, 0xd0($s1) /* BAE040 80240700 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80240250_BADB90 /* BAE054 80240714 468073A0 */ cvt.s.w $f14, $f14 /* BAE058 80240718 C6020018 */ lwc1 $f2, 0x18($s0) /* BAE05C 8024071C 4600103C */ c.lt.s $f2, $f0 -/* BAE060 80240720 00000000 */ nop +/* BAE060 80240720 00000000 */ nop /* BAE064 80240724 4500000D */ bc1f .L8024075C /* BAE068 80240728 E7A00034 */ swc1 $f0, 0x34($sp) /* BAE06C 8024072C C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80240250_BADB90 /* BAE0A8 80240768 00621825 */ or $v1, $v1, $v0 /* BAE0AC 8024076C 00741825 */ or $v1, $v1, $s4 /* BAE0B0 80240770 10600008 */ beqz $v1, .L80240794 -/* BAE0B4 80240774 00000000 */ nop +/* BAE0B4 80240774 00000000 */ nop /* BAE0B8 80240778 8602008C */ lh $v0, 0x8c($s0) /* BAE0BC 8024077C 14400031 */ bnez $v0, .L80240844 -/* BAE0C0 80240780 00000000 */ nop +/* BAE0C0 80240780 00000000 */ nop /* BAE0C4 80240784 8E050018 */ lw $a1, 0x18($s0) /* BAE0C8 80240788 8E06000C */ lw $a2, 0xc($s0) /* BAE0CC 8024078C 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_80240250_BADB90 /* BAE0E0 802407A0 44801000 */ mtc1 $zero, $f2 /* BAE0E4 802407A4 46000021 */ cvt.d.s $f0, $f0 /* BAE0E8 802407A8 46220002 */ mul.d $f0, $f0, $f2 -/* BAE0EC 802407AC 00000000 */ nop +/* BAE0EC 802407AC 00000000 */ nop /* BAE0F0 802407B0 4620020D */ trunc.w.d $f8, $f0 /* BAE0F4 802407B4 E628007C */ swc1 $f8, 0x7c($s1) /* BAE0F8 802407B8 8E420004 */ lw $v0, 4($s2) /* BAE0FC 802407BC 18400021 */ blez $v0, .L80240844 -/* BAE100 802407C0 00000000 */ nop +/* BAE100 802407C0 00000000 */ nop /* BAE104 802407C4 8602008E */ lh $v0, 0x8e($s0) /* BAE108 802407C8 9603008E */ lhu $v1, 0x8e($s0) /* BAE10C 802407CC 18400005 */ blez $v0, .L802407E4 @@ -375,7 +375,7 @@ glabel func_80240250_BADB90 /* BAE114 802407D4 A602008E */ sh $v0, 0x8e($s0) /* BAE118 802407D8 00021400 */ sll $v0, $v0, 0x10 /* BAE11C 802407DC 1C400019 */ bgtz $v0, .L80240844 -/* BAE120 802407E0 00000000 */ nop +/* BAE120 802407E0 00000000 */ nop .L802407E4: /* BAE124 802407E4 240403E8 */ addiu $a0, $zero, 0x3e8 /* BAE128 802407E8 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80240250_BADB90 /* BAE170 80240830 18400003 */ blez $v0, .L80240840 /* BAE174 80240834 28620003 */ slti $v0, $v1, 3 /* BAE178 80240838 10400002 */ beqz $v0, .L80240844 -/* BAE17C 8024083C 00000000 */ nop +/* BAE17C 8024083C 00000000 */ nop .L80240840: /* BAE180 80240840 AE600070 */ sw $zero, 0x70($s3) .L80240844: diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240938_BAE278.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240938_BAE278.s index f9eedeb8c0..c4daf142da 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240938_BAE278.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240938_BAE278.s @@ -42,11 +42,11 @@ glabel func_80240938_BAE278 .L802409CC: /* BAE30C 802409CC 8E220070 */ lw $v0, 0x70($s1) /* BAE310 802409D0 18400034 */ blez $v0, .L80240AA4 -/* BAE314 802409D4 00000000 */ nop +/* BAE314 802409D4 00000000 */ nop /* BAE318 802409D8 C62C0074 */ lwc1 $f12, 0x74($s1) /* BAE31C 802409DC 46806320 */ cvt.s.w $f12, $f12 /* BAE320 802409E0 44820000 */ mtc1 $v0, $f0 -/* BAE324 802409E4 00000000 */ nop +/* BAE324 802409E4 00000000 */ nop /* BAE328 802409E8 46800020 */ cvt.s.w $f0, $f0 /* BAE32C 802409EC 46000021 */ cvt.d.s $f0, $f0 /* BAE330 802409F0 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_80240938_BAE278 /* BAE390 80240A50 27A70030 */ addiu $a3, $sp, 0x30 .L80240A54: /* BAE394 80240A54 10400007 */ beqz $v0, .L80240A74 -/* BAE398 80240A58 00000000 */ nop +/* BAE398 80240A58 00000000 */ nop /* BAE39C 80240A5C 4616A082 */ mul.s $f2, $f20, $f22 -/* BAE3A0 80240A60 00000000 */ nop +/* BAE3A0 80240A60 00000000 */ nop /* BAE3A4 80240A64 C7A0002C */ lwc1 $f0, 0x2c($sp) /* BAE3A8 80240A68 46180000 */ add.s $f0, $f0, $f24 /* BAE3AC 80240A6C 080902A0 */ j .L80240A80 /* BAE3B0 80240A70 46020000 */ add.s $f0, $f0, $f2 .L80240A74: /* BAE3B4 80240A74 4616A002 */ mul.s $f0, $f20, $f22 -/* BAE3B8 80240A78 00000000 */ nop +/* BAE3B8 80240A78 00000000 */ nop /* BAE3BC 80240A7C 4600D000 */ add.s $f0, $f26, $f0 .L80240A80: /* BAE3C0 80240A80 E600003C */ swc1 $f0, 0x3c($s0) /* BAE3C4 80240A84 8E220074 */ lw $v0, 0x74($s1) /* BAE3C8 80240A88 2442000A */ addiu $v0, $v0, 0xa /* BAE3CC 80240A8C 44826000 */ mtc1 $v0, $f12 -/* BAE3D0 80240A90 00000000 */ nop +/* BAE3D0 80240A90 00000000 */ nop /* BAE3D4 80240A94 0C00A6C9 */ jal clamp_angle /* BAE3D8 80240A98 46806320 */ cvt.s.w $f12, $f12 /* BAE3DC 80240A9C 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_80240938_BAE278 /* BAE3F0 80240AB0 860200A8 */ lh $v0, 0xa8($s0) /* BAE3F4 80240AB4 C600003C */ lwc1 $f0, 0x3c($s0) /* BAE3F8 80240AB8 44821000 */ mtc1 $v0, $f2 -/* BAE3FC 80240ABC 00000000 */ nop +/* BAE3FC 80240ABC 00000000 */ nop /* BAE400 80240AC0 468010A0 */ cvt.s.w $f2, $f2 /* BAE404 80240AC4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* BAE408 80240AC8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_80240938_BAE278 /* BAE424 80240AE4 46240000 */ add.d $f0, $f0, $f4 /* BAE428 80240AE8 460010A1 */ cvt.d.s $f2, $f2 /* BAE42C 80240AEC 4620103C */ c.lt.d $f2, $f0 -/* BAE430 80240AF0 00000000 */ nop +/* BAE430 80240AF0 00000000 */ nop /* BAE434 80240AF4 4500002E */ bc1f .L80240BB0 /* BAE438 80240AF8 0280202D */ daddu $a0, $s4, $zero /* BAE43C 80240AFC 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_80240938_BAE278 /* BAE47C 80240B3C 3C01C1A0 */ lui $at, 0xc1a0 /* BAE480 80240B40 44812000 */ mtc1 $at, $f4 /* BAE484 80240B44 44834000 */ mtc1 $v1, $f8 -/* BAE488 80240B48 00000000 */ nop +/* BAE488 80240B48 00000000 */ nop /* BAE48C 80240B4C 46804220 */ cvt.s.w $f8, $f8 /* BAE490 80240B50 44074000 */ mfc1 $a3, $f8 /* BAE494 80240B54 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_80240938_BAE278 .L80240BB0: /* BAE4F0 80240BB0 8602008C */ lh $v0, 0x8c($s0) /* BAE4F4 80240BB4 14400025 */ bnez $v0, .L80240C4C -/* BAE4F8 80240BB8 00000000 */ nop +/* BAE4F8 80240BB8 00000000 */ nop /* BAE4FC 80240BBC 8602008E */ lh $v0, 0x8e($s0) /* BAE500 80240BC0 1C400022 */ bgtz $v0, .L80240C4C -/* BAE504 80240BC4 00000000 */ nop +/* BAE504 80240BC4 00000000 */ nop /* BAE508 80240BC8 8E620074 */ lw $v0, 0x74($s3) /* BAE50C 80240BCC 2442FFFF */ addiu $v0, $v0, -1 /* BAE510 80240BD0 1840001D */ blez $v0, .L80240C48 @@ -183,7 +183,7 @@ glabel func_80240938_BAE278 /* BAE51C 80240BDC 9442002A */ lhu $v0, 0x2a($v0) /* BAE520 80240BE0 30420010 */ andi $v0, $v0, 0x10 /* BAE524 80240BE4 14400007 */ bnez $v0, .L80240C04 -/* BAE528 80240BE8 00000000 */ nop +/* BAE528 80240BE8 00000000 */ nop /* BAE52C 80240BEC C600000C */ lwc1 $f0, 0xc($s0) /* BAE530 80240BF0 3C014334 */ lui $at, 0x4334 /* BAE534 80240BF4 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240D60_BAE6A0.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240D60_BAE6A0.s index c7ba2b6760..d675ca92e4 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240D60_BAE6A0.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240D60_BAE6A0.s @@ -60,18 +60,18 @@ glabel func_80240D60_BAE6A0 /* BAE778 80240E38 C6200038 */ lwc1 $f0, 0x38($s1) /* BAE77C 80240E3C 4600018D */ trunc.w.s $f6, $f0 /* BAE780 80240E40 44023000 */ mfc1 $v0, $f6 -/* BAE784 80240E44 00000000 */ nop +/* BAE784 80240E44 00000000 */ nop /* BAE788 80240E48 A6420010 */ sh $v0, 0x10($s2) /* BAE78C 80240E4C C620003C */ lwc1 $f0, 0x3c($s1) /* BAE790 80240E50 4600018D */ trunc.w.s $f6, $f0 /* BAE794 80240E54 44023000 */ mfc1 $v0, $f6 -/* BAE798 80240E58 00000000 */ nop +/* BAE798 80240E58 00000000 */ nop /* BAE79C 80240E5C A6420012 */ sh $v0, 0x12($s2) /* BAE7A0 80240E60 C6200040 */ lwc1 $f0, 0x40($s1) /* BAE7A4 80240E64 A2430007 */ sb $v1, 7($s2) /* BAE7A8 80240E68 4600018D */ trunc.w.s $f6, $f0 /* BAE7AC 80240E6C 44023000 */ mfc1 $v0, $f6 -/* BAE7B0 80240E70 00000000 */ nop +/* BAE7B0 80240E70 00000000 */ nop /* BAE7B4 80240E74 A6420014 */ sh $v0, 0x14($s2) .L80240E78: /* BAE7B8 80240E78 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240EF8_BAE838.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240EF8_BAE838.s index 4fd0119992..2d64bda823 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240EF8_BAE838.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240EF8_BAE838.s @@ -42,9 +42,9 @@ glabel func_80240EF8_BAE838 /* BAE8CC 80240F8C 44801800 */ mtc1 $zero, $f3 /* BAE8D0 80240F90 46002021 */ cvt.d.s $f0, $f4 /* BAE8D4 80240F94 4620103E */ c.le.d $f2, $f0 -/* BAE8D8 80240F98 00000000 */ nop +/* BAE8D8 80240F98 00000000 */ nop /* BAE8DC 80240F9C 45000030 */ bc1f .L80241060 -/* BAE8E0 80240FA0 00000000 */ nop +/* BAE8E0 80240FA0 00000000 */ nop /* BAE8E4 80240FA4 C600003C */ lwc1 $f0, 0x3c($s0) /* BAE8E8 80240FA8 46040000 */ add.s $f0, $f0, $f4 /* BAE8EC 80240FAC E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_80240EF8_BAE838 /* BAE94C 8024100C 27A70020 */ addiu $a3, $sp, 0x20 .L80241010: /* BAE950 80241010 1040000B */ beqz $v0, .L80241040 -/* BAE954 80241014 00000000 */ nop +/* BAE954 80241014 00000000 */ nop /* BAE958 80241018 C7A0001C */ lwc1 $f0, 0x1c($sp) /* BAE95C 8024101C 46140080 */ add.s $f2, $f0, $f20 /* BAE960 80241020 C600003C */ lwc1 $f0, 0x3c($s0) /* BAE964 80241024 4600103E */ c.le.s $f2, $f0 -/* BAE968 80241028 00000000 */ nop +/* BAE968 80241028 00000000 */ nop /* BAE96C 8024102C 4500008D */ bc1f .L80241264 -/* BAE970 80241030 00000000 */ nop +/* BAE970 80241030 00000000 */ nop /* BAE974 80241034 E602003C */ swc1 $f2, 0x3c($s0) /* BAE978 80241038 08090499 */ j .L80241264 /* BAE97C 8024103C AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_80240EF8_BAE838 /* BAE980 80241040 C602003C */ lwc1 $f2, 0x3c($s0) /* BAE984 80241044 C6000064 */ lwc1 $f0, 0x64($s0) /* BAE988 80241048 4602003E */ c.le.s $f0, $f2 -/* BAE98C 8024104C 00000000 */ nop +/* BAE98C 8024104C 00000000 */ nop /* BAE990 80241050 45030084 */ bc1tl .L80241264 /* BAE994 80241054 AE400070 */ sw $zero, 0x70($s2) /* BAE998 80241058 08090499 */ j .L80241264 -/* BAE99C 8024105C 00000000 */ nop +/* BAE99C 8024105C 00000000 */ nop .L80241060: /* BAE9A0 80241060 4622003C */ c.lt.d $f0, $f2 -/* BAE9A4 80241064 00000000 */ nop +/* BAE9A4 80241064 00000000 */ nop /* BAE9A8 80241068 4500007E */ bc1f .L80241264 -/* BAE9AC 8024106C 00000000 */ nop +/* BAE9AC 8024106C 00000000 */ nop /* BAE9B0 80241070 9602008E */ lhu $v0, 0x8e($s0) /* BAE9B4 80241074 24420001 */ addiu $v0, $v0, 1 /* BAE9B8 80241078 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_80240EF8_BAE838 /* BAE9C4 80241084 00021403 */ sra $v0, $v0, 0x10 /* BAE9C8 80241088 0043102A */ slt $v0, $v0, $v1 /* BAE9CC 8024108C 14400026 */ bnez $v0, .L80241128 -/* BAE9D0 80241090 00000000 */ nop +/* BAE9D0 80241090 00000000 */ nop /* BAE9D4 80241094 C60C0038 */ lwc1 $f12, 0x38($s0) /* BAE9D8 80241098 C60E0040 */ lwc1 $f14, 0x40($s0) /* BAE9DC 8024109C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_80240EF8_BAE838 /* BAEA08 802410C8 8E62001C */ lw $v0, 0x1c($s3) /* BAEA0C 802410CC 46001005 */ abs.s $f0, $f2 /* BAEA10 802410D0 44822000 */ mtc1 $v0, $f4 -/* BAEA14 802410D4 00000000 */ nop +/* BAEA14 802410D4 00000000 */ nop /* BAEA18 802410D8 46802120 */ cvt.s.w $f4, $f4 /* BAEA1C 802410DC 4600203C */ c.lt.s $f4, $f0 -/* BAEA20 802410E0 00000000 */ nop +/* BAEA20 802410E0 00000000 */ nop /* BAEA24 802410E4 4500000D */ bc1f .L8024111C -/* BAEA28 802410E8 00000000 */ nop +/* BAEA28 802410E8 00000000 */ nop /* BAEA2C 802410EC 44800000 */ mtc1 $zero, $f0 /* BAEA30 802410F0 C614000C */ lwc1 $f20, 0xc($s0) /* BAEA34 802410F4 4600103C */ c.lt.s $f2, $f0 -/* BAEA38 802410F8 00000000 */ nop +/* BAEA38 802410F8 00000000 */ nop /* BAEA3C 802410FC 45000006 */ bc1f .L80241118 /* BAEA40 80241100 00021023 */ negu $v0, $v0 /* BAEA44 80241104 44820000 */ mtc1 $v0, $f0 -/* BAEA48 80241108 00000000 */ nop +/* BAEA48 80241108 00000000 */ nop /* BAEA4C 8024110C 46800020 */ cvt.s.w $f0, $f0 /* BAEA50 80241110 08090447 */ j .L8024111C /* BAEA54 80241114 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_80240EF8_BAE838 /* BAEA7C 8024113C C600001C */ lwc1 $f0, 0x1c($s0) /* BAEA80 80241140 46001080 */ add.s $f2, $f2, $f0 /* BAEA84 80241144 4616103C */ c.lt.s $f2, $f22 -/* BAEA88 80241148 00000000 */ nop +/* BAEA88 80241148 00000000 */ nop /* BAEA8C 8024114C 45020045 */ bc1fl .L80241264 /* BAEA90 80241150 E602003C */ swc1 $f2, 0x3c($s0) /* BAEA94 80241154 08090498 */ j .L80241260 @@ -169,7 +169,7 @@ glabel func_80240EF8_BAE838 /* BAEAAC 8024116C C600001C */ lwc1 $f0, 0x1c($s0) /* BAEAB0 80241170 C604003C */ lwc1 $f4, 0x3c($s0) /* BAEAB4 80241174 44821000 */ mtc1 $v0, $f2 -/* BAEAB8 80241178 00000000 */ nop +/* BAEAB8 80241178 00000000 */ nop /* BAEABC 8024117C 468010A0 */ cvt.s.w $f2, $f2 /* BAEAC0 80241180 46000005 */ abs.s $f0, $f0 /* BAEAC4 80241184 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_80240EF8_BAE838 /* BAEB00 802411C0 0C0372DF */ jal func_800DCB7C /* BAEB04 802411C4 27A70020 */ addiu $a3, $sp, 0x20 /* BAEB08 802411C8 10400015 */ beqz $v0, .L80241220 -/* BAEB0C 802411CC 00000000 */ nop +/* BAEB0C 802411CC 00000000 */ nop /* BAEB10 802411D0 860200A8 */ lh $v0, 0xa8($s0) /* BAEB14 802411D4 C604001C */ lwc1 $f4, 0x1c($s0) /* BAEB18 802411D8 44820000 */ mtc1 $v0, $f0 -/* BAEB1C 802411DC 00000000 */ nop +/* BAEB1C 802411DC 00000000 */ nop /* BAEB20 802411E0 46800020 */ cvt.s.w $f0, $f0 /* BAEB24 802411E4 46002085 */ abs.s $f2, $f4 /* BAEB28 802411E8 46020000 */ add.s $f0, $f0, $f2 /* BAEB2C 802411EC C7A20024 */ lwc1 $f2, 0x24($sp) /* BAEB30 802411F0 4600103E */ c.le.s $f2, $f0 -/* BAEB34 802411F4 00000000 */ nop +/* BAEB34 802411F4 00000000 */ nop /* BAEB38 802411F8 45000005 */ bc1f .L80241210 -/* BAEB3C 802411FC 00000000 */ nop +/* BAEB3C 802411FC 00000000 */ nop /* BAEB40 80241200 C7A0001C */ lwc1 $f0, 0x1c($sp) /* BAEB44 80241204 AE00001C */ sw $zero, 0x1c($s0) /* BAEB48 80241208 08090499 */ j .L80241264 @@ -217,13 +217,13 @@ glabel func_80240EF8_BAE838 /* BAEB64 80241224 860200A8 */ lh $v0, 0xa8($s0) /* BAEB68 80241228 46163081 */ sub.s $f2, $f6, $f22 /* BAEB6C 8024122C 44820000 */ mtc1 $v0, $f0 -/* BAEB70 80241230 00000000 */ nop +/* BAEB70 80241230 00000000 */ nop /* BAEB74 80241234 46800020 */ cvt.s.w $f0, $f0 /* BAEB78 80241238 46001080 */ add.s $f2, $f2, $f0 /* BAEB7C 8024123C C604001C */ lwc1 $f4, 0x1c($s0) /* BAEB80 80241240 46002005 */ abs.s $f0, $f4 /* BAEB84 80241244 4602003C */ c.lt.s $f0, $f2 -/* BAEB88 80241248 00000000 */ nop +/* BAEB88 80241248 00000000 */ nop /* BAEB8C 8024124C 45020005 */ bc1fl .L80241264 /* BAEB90 80241250 AE00001C */ sw $zero, 0x1c($s0) /* BAEB94 80241254 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241288_BAEBC8.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241288_BAEBC8.s index c4a73dbfbf..cf0524bbab 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241288_BAEBC8.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241288_BAEBC8.s @@ -49,15 +49,15 @@ glabel func_80241288_BAEBC8 /* BAEC70 80241330 44802000 */ mtc1 $zero, $f4 /* BAEC74 80241334 460010A1 */ cvt.d.s $f2, $f2 /* BAEC78 80241338 46241082 */ mul.d $f2, $f2, $f4 -/* BAEC7C 8024133C 00000000 */ nop +/* BAEC7C 8024133C 00000000 */ nop /* BAEC80 80241340 C7A0001C */ lwc1 $f0, 0x1c($sp) /* BAEC84 80241344 46000021 */ cvt.d.s $f0, $f0 /* BAEC88 80241348 46240002 */ mul.d $f0, $f0, $f4 -/* BAEC8C 8024134C 00000000 */ nop +/* BAEC8C 8024134C 00000000 */ nop /* BAEC90 80241350 3C013FE0 */ lui $at, 0x3fe0 /* BAEC94 80241354 44812800 */ mtc1 $at, $f5 /* BAEC98 80241358 44802000 */ mtc1 $zero, $f4 -/* BAEC9C 8024135C 00000000 */ nop +/* BAEC9C 8024135C 00000000 */ nop /* BAECA0 80241360 46241080 */ add.d $f2, $f2, $f4 /* BAECA4 80241364 AE000074 */ sw $zero, 0x74($s0) /* BAECA8 80241368 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s index 36dfa55f54..52f3081310 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s @@ -54,7 +54,7 @@ glabel func_802413AC_BAECEC /* BAEDAC 8024146C 8E4300B0 */ lw $v1, 0xb0($s2) /* BAEDB0 80241470 30620004 */ andi $v0, $v1, 4 /* BAEDB4 80241474 10400007 */ beqz $v0, .L80241494 -/* BAEDB8 80241478 00000000 */ nop +/* BAEDB8 80241478 00000000 */ nop /* BAEDBC 8024147C 824200B4 */ lb $v0, 0xb4($s2) /* BAEDC0 80241480 1440003C */ bnez $v0, .L80241574 /* BAEDC4 80241484 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_802413AC_BAECEC /* BAEDD8 80241498 2C62000F */ sltiu $v0, $v1, 0xf /* BAEDDC 8024149C 10400034 */ beqz $v0, .L80241570 /* BAEDE0 802414A0 00031080 */ sll $v0, $v1, 2 -/* BAEDE4 802414A4 3C018024 */ lui $at, %hi(D_802452B8) +/* BAEDE4 802414A4 3C018024 */ lui $at, %hi(jtbl_802452B8_BB2BF8) /* BAEDE8 802414A8 00220821 */ addu $at, $at, $v0 -/* BAEDEC 802414AC 8C2252B8 */ lw $v0, %lo(D_802452B8)($at) +/* BAEDEC 802414AC 8C2252B8 */ lw $v0, %lo(jtbl_802452B8_BB2BF8)($at) /* BAEDF0 802414B0 00400008 */ jr $v0 -/* BAEDF4 802414B4 00000000 */ nop +/* BAEDF4 802414B4 00000000 */ nop +glabel L802414B8_BAEDF8 /* BAEDF8 802414B8 0280202D */ daddu $a0, $s4, $zero /* BAEDFC 802414BC 0200282D */ daddu $a1, $s0, $zero /* BAEE00 802414C0 0C090028 */ jal func_802400A0_BAD9E0 /* BAEE04 802414C4 0260302D */ daddu $a2, $s3, $zero +glabel L802414C8_BAEE08 /* BAEE08 802414C8 0280202D */ daddu $a0, $s4, $zero /* BAEE0C 802414CC 0200282D */ daddu $a1, $s0, $zero /* BAEE10 802414D0 0C090094 */ jal func_80240250_BADB90 /* BAEE14 802414D4 0260302D */ daddu $a2, $s3, $zero /* BAEE18 802414D8 0809055D */ j .L80241574 /* BAEE1C 802414DC 0000102D */ daddu $v0, $zero, $zero +glabel L802414E0_BAEE20 /* BAEE20 802414E0 0280202D */ daddu $a0, $s4, $zero /* BAEE24 802414E4 0200282D */ daddu $a1, $s0, $zero /* BAEE28 802414E8 0C09021E */ jal mim_08_UnkNpcAIFunc1 /* BAEE2C 802414EC 0260302D */ daddu $a2, $s3, $zero +glabel L802414F0_BAEE30 /* BAEE30 802414F0 0280202D */ daddu $a0, $s4, $zero /* BAEE34 802414F4 0200282D */ daddu $a1, $s0, $zero /* BAEE38 802414F8 0C09024E */ jal func_80240938_BAE278 /* BAEE3C 802414FC 0260302D */ daddu $a2, $s3, $zero /* BAEE40 80241500 0809055D */ j .L80241574 /* BAEE44 80241504 0000102D */ daddu $v0, $zero, $zero +glabel L80241508_BAEE48 /* BAEE48 80241508 0280202D */ daddu $a0, $s4, $zero /* BAEE4C 8024150C 0200282D */ daddu $a1, $s0, $zero /* BAEE50 80241510 0C09031F */ jal mim_08_UnkNpcAIFunc2 /* BAEE54 80241514 0260302D */ daddu $a2, $s3, $zero +glabel L80241518_BAEE58 /* BAEE58 80241518 0280202D */ daddu $a0, $s4, $zero /* BAEE5C 8024151C 0200282D */ daddu $a1, $s0, $zero /* BAEE60 80241520 0C09033D */ jal func_80240CF4_BAE634 /* BAEE64 80241524 0260302D */ daddu $a2, $s3, $zero /* BAEE68 80241528 0809055D */ j .L80241574 /* BAEE6C 8024152C 0000102D */ daddu $v0, $zero, $zero +glabel L80241530_BAEE70 /* BAEE70 80241530 0280202D */ daddu $a0, $s4, $zero /* BAEE74 80241534 0200282D */ daddu $a1, $s0, $zero /* BAEE78 80241538 0C090358 */ jal func_80240D60_BAE6A0 /* BAEE7C 8024153C 0260302D */ daddu $a2, $s3, $zero /* BAEE80 80241540 0809055D */ j .L80241574 /* BAEE84 80241544 0000102D */ daddu $v0, $zero, $zero +glabel L80241548_BAEE88 /* BAEE88 80241548 0280202D */ daddu $a0, $s4, $zero /* BAEE8C 8024154C 0200282D */ daddu $a1, $s0, $zero /* BAEE90 80241550 0C0903A5 */ jal mim_08_UnkNpcAIFunc3 /* BAEE94 80241554 0260302D */ daddu $a2, $s3, $zero /* BAEE98 80241558 0809055D */ j .L80241574 /* BAEE9C 8024155C 0000102D */ daddu $v0, $zero, $zero +glabel L80241560_BAEEA0 /* BAEEA0 80241560 0280202D */ daddu $a0, $s4, $zero /* BAEEA4 80241564 0200282D */ daddu $a1, $s0, $zero /* BAEEA8 80241568 0C0903BE */ jal func_80240EF8_BAE838 /* BAEEAC 8024156C 0260302D */ daddu $a2, $s3, $zero .L80241570: +glabel L80241570_BAEEB0 /* BAEEB0 80241570 0000102D */ daddu $v0, $zero, $zero .L80241574: /* BAEEB4 80241574 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802417A0_BAF0E0.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802417A0_BAF0E0.s index f216dd650e..8d767428ba 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802417A0_BAF0E0.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802417A0_BAF0E0.s @@ -42,7 +42,7 @@ glabel func_802417A0_BAF0E0 /* BAF174 80241834 C6620074 */ lwc1 $f2, 0x74($s3) /* BAF178 80241838 468010A0 */ cvt.s.w $f2, $f2 /* BAF17C 8024183C 4600103C */ c.lt.s $f2, $f0 -/* BAF180 80241840 00000000 */ nop +/* BAF180 80241840 00000000 */ nop /* BAF184 80241844 45030001 */ bc1tl .L8024184C /* BAF188 80241848 0000882D */ daddu $s1, $zero, $zero .L8024184C: @@ -51,16 +51,16 @@ glabel func_802417A0_BAF0E0 /* BAF194 80241854 3C014387 */ lui $at, 0x4387 /* BAF198 80241858 4481A000 */ mtc1 $at, $f20 /* BAF19C 8024185C 0C00A70A */ jal get_clamped_angle_diff -/* BAF1A0 80241860 00000000 */ nop +/* BAF1A0 80241860 00000000 */ nop /* BAF1A4 80241864 0C00A6C9 */ jal clamp_angle /* BAF1A8 80241868 46000306 */ mov.s $f12, $f0 /* BAF1AC 8024186C 3C018024 */ lui $at, %hi(D_802452F8) /* BAF1B0 80241870 D42252F8 */ ldc1 $f2, %lo(D_802452F8)($at) /* BAF1B4 80241874 46000021 */ cvt.d.s $f0, $f0 /* BAF1B8 80241878 4622003C */ c.lt.d $f0, $f2 -/* BAF1BC 8024187C 00000000 */ nop +/* BAF1BC 8024187C 00000000 */ nop /* BAF1C0 80241880 45000003 */ bc1f .L80241890 -/* BAF1C4 80241884 00000000 */ nop +/* BAF1C4 80241884 00000000 */ nop /* BAF1C8 80241888 3C0142B4 */ lui $at, 0x42b4 /* BAF1CC 8024188C 4481A000 */ mtc1 $at, $f20 .L80241890: @@ -77,7 +77,7 @@ glabel func_802417A0_BAF0E0 /* BAF1F8 802418B8 468010A0 */ cvt.s.w $f2, $f2 /* BAF1FC 802418BC 46000005 */ abs.s $f0, $f0 /* BAF200 802418C0 4600103C */ c.lt.s $f2, $f0 -/* BAF204 802418C4 00000000 */ nop +/* BAF204 802418C4 00000000 */ nop /* BAF208 802418C8 45030001 */ bc1tl .L802418D0 /* BAF20C 802418CC 0000882D */ daddu $s1, $zero, $zero .L802418D0: @@ -87,13 +87,13 @@ glabel func_802417A0_BAF0E0 /* BAF21C 802418DC 860200A8 */ lh $v0, 0xa8($s0) /* BAF220 802418E0 46020001 */ sub.s $f0, $f0, $f2 /* BAF224 802418E4 44821000 */ mtc1 $v0, $f2 -/* BAF228 802418E8 00000000 */ nop +/* BAF228 802418E8 00000000 */ nop /* BAF22C 802418EC 468010A1 */ cvt.d.w $f2, $f2 /* BAF230 802418F0 46221080 */ add.d $f2, $f2, $f2 /* BAF234 802418F4 46000005 */ abs.s $f0, $f0 /* BAF238 802418F8 46000021 */ cvt.d.s $f0, $f0 /* BAF23C 802418FC 4620103E */ c.le.d $f2, $f0 -/* BAF240 80241900 00000000 */ nop +/* BAF240 80241900 00000000 */ nop /* BAF244 80241904 45030001 */ bc1tl .L8024190C /* BAF248 80241908 0000882D */ daddu $s1, $zero, $zero .L8024190C: diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241954_BAF294.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241954_BAF294.s index 7c84c8c3ad..50cfb08a1c 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241954_BAF294.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241954_BAF294.s @@ -19,7 +19,7 @@ glabel func_80241954_BAF294 /* BAF2CC 8024198C 8E2200B0 */ lw $v0, 0xb0($s1) /* BAF2D0 80241990 30420004 */ andi $v0, $v0, 4 /* BAF2D4 80241994 10400015 */ beqz $v0, .L802419EC -/* BAF2D8 80241998 00000000 */ nop +/* BAF2D8 80241998 00000000 */ nop .L8024199C: /* BAF2DC 8024199C AE800070 */ sw $zero, 0x70($s4) /* BAF2E0 802419A0 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel func_80241954_BAF294 /* BAF330 802419F0 12600005 */ beqz $s3, .L80241A08 /* BAF334 802419F4 24020001 */ addiu $v0, $zero, 1 /* BAF338 802419F8 12620048 */ beq $s3, $v0, .L80241B1C -/* BAF33C 802419FC 00000000 */ nop +/* BAF33C 802419FC 00000000 */ nop /* BAF340 80241A00 080906E4 */ j .L80241B90 -/* BAF344 80241A04 00000000 */ nop +/* BAF344 80241A04 00000000 */ nop .L80241A08: /* BAF348 80241A08 86240008 */ lh $a0, 8($s1) /* BAF34C 80241A0C 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel func_80241954_BAF294 /* BAF36C 80241A2C 8E03006C */ lw $v1, 0x6c($s0) /* BAF370 80241A30 24020003 */ addiu $v0, $zero, 3 /* BAF374 80241A34 14620056 */ bne $v1, $v0, .L80241B90 -/* BAF378 80241A38 00000000 */ nop +/* BAF378 80241A38 00000000 */ nop /* BAF37C 80241A3C 8E2500A8 */ lw $a1, 0xa8($s1) /* BAF380 80241A40 10A00003 */ beqz $a1, .L80241A50 /* BAF384 80241A44 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel func_80241954_BAF294 /* BAF3FC 80241ABC C7A20014 */ lwc1 $f2, 0x14($sp) /* BAF400 80241AC0 4600020D */ trunc.w.s $f8, $f0 /* BAF404 80241AC4 44024000 */ mfc1 $v0, $f8 -/* BAF408 80241AC8 00000000 */ nop +/* BAF408 80241AC8 00000000 */ nop /* BAF40C 80241ACC A6220012 */ sh $v0, 0x12($s1) /* BAF410 80241AD0 4600120D */ trunc.w.s $f8, $f2 /* BAF414 80241AD4 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s index 46a1c55cd3..891e3e7a2a 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s @@ -100,78 +100,93 @@ glabel func_80241BB4_BAF4F4 /* BAF658 80241D18 2C620064 */ sltiu $v0, $v1, 0x64 /* BAF65C 80241D1C 10400048 */ beqz $v0, .L80241E40 /* BAF660 80241D20 00031080 */ sll $v0, $v1, 2 -/* BAF664 80241D24 3C018024 */ lui $at, %hi(D_80245300) +/* BAF664 80241D24 3C018024 */ lui $at, %hi(jtbl_80245300_BB2C40) /* BAF668 80241D28 00220821 */ addu $at, $at, $v0 -/* BAF66C 80241D2C 8C225300 */ lw $v0, %lo(D_80245300)($at) +/* BAF66C 80241D2C 8C225300 */ lw $v0, %lo(jtbl_80245300_BB2C40)($at) /* BAF670 80241D30 00400008 */ jr $v0 /* BAF674 80241D34 00000000 */ nop +glabel L80241D38_BAF678 /* BAF678 80241D38 0240202D */ daddu $a0, $s2, $zero /* BAF67C 80241D3C 0260282D */ daddu $a1, $s3, $zero /* BAF680 80241D40 0C012568 */ jal func_800495A0 /* BAF684 80241D44 0280302D */ daddu $a2, $s4, $zero +glabel L80241D48_BAF688 /* BAF688 80241D48 0240202D */ daddu $a0, $s2, $zero /* BAF68C 80241D4C 0260282D */ daddu $a1, $s3, $zero /* BAF690 80241D50 0C0125AE */ jal func_800496B8 /* BAF694 80241D54 0280302D */ daddu $a2, $s4, $zero /* BAF698 80241D58 08090790 */ j .L80241E40 /* BAF69C 80241D5C 00000000 */ nop +glabel L80241D60_BAF6A0 /* BAF6A0 80241D60 0240202D */ daddu $a0, $s2, $zero /* BAF6A4 80241D64 0260282D */ daddu $a1, $s3, $zero /* BAF6A8 80241D68 0C0126D1 */ jal base_UnkNpcAIFunc1 /* BAF6AC 80241D6C 0280302D */ daddu $a2, $s4, $zero +glabel L80241D70_BAF6B0 /* BAF6B0 80241D70 0240202D */ daddu $a0, $s2, $zero /* BAF6B4 80241D74 0260282D */ daddu $a1, $s3, $zero /* BAF6B8 80241D78 0C012701 */ jal func_80049C04 /* BAF6BC 80241D7C 0280302D */ daddu $a2, $s4, $zero /* BAF6C0 80241D80 08090790 */ j .L80241E40 /* BAF6C4 80241D84 00000000 */ nop +glabel L80241D88_BAF6C8 /* BAF6C8 80241D88 0240202D */ daddu $a0, $s2, $zero /* BAF6CC 80241D8C 0260282D */ daddu $a1, $s3, $zero /* BAF6D0 80241D90 0C01278F */ jal func_80049E3C /* BAF6D4 80241D94 0280302D */ daddu $a2, $s4, $zero +glabel L80241D98_BAF6D8 /* BAF6D8 80241D98 0240202D */ daddu $a0, $s2, $zero /* BAF6DC 80241D9C 0260282D */ daddu $a1, $s3, $zero /* BAF6E0 80241DA0 0C0127B3 */ jal func_80049ECC /* BAF6E4 80241DA4 0280302D */ daddu $a2, $s4, $zero /* BAF6E8 80241DA8 08090790 */ j .L80241E40 /* BAF6EC 80241DAC 00000000 */ nop +glabel L80241DB0_BAF6F0 /* BAF6F0 80241DB0 0240202D */ daddu $a0, $s2, $zero /* BAF6F4 80241DB4 0260282D */ daddu $a1, $s3, $zero /* BAF6F8 80241DB8 0C0127DF */ jal func_80049F7C /* BAF6FC 80241DBC 0280302D */ daddu $a2, $s4, $zero +glabel L80241DC0_BAF700 /* BAF700 80241DC0 0240202D */ daddu $a0, $s2, $zero /* BAF704 80241DC4 0260282D */ daddu $a1, $s3, $zero /* BAF708 80241DC8 0C012849 */ jal func_8004A124 /* BAF70C 80241DCC 0280302D */ daddu $a2, $s4, $zero /* BAF710 80241DD0 08090790 */ j .L80241E40 /* BAF714 80241DD4 00000000 */ nop +glabel L80241DD8_BAF718 /* BAF718 80241DD8 0240202D */ daddu $a0, $s2, $zero /* BAF71C 80241DDC 0260282D */ daddu $a1, $s3, $zero /* BAF720 80241DE0 0C0128FA */ jal func_8004A3E8 /* BAF724 80241DE4 0280302D */ daddu $a2, $s4, $zero /* BAF728 80241DE8 08090790 */ j .L80241E40 /* BAF72C 80241DEC 00000000 */ nop +glabel L80241DF0_BAF730 /* BAF730 80241DF0 0C090566 */ jal mim_08_UnkNpcAIFunc6 /* BAF734 80241DF4 0240202D */ daddu $a0, $s2, $zero +glabel L80241DF8_BAF738 /* BAF738 80241DF8 0C090581 */ jal mim_08_UnkNpcAIFunc7 /* BAF73C 80241DFC 0240202D */ daddu $a0, $s2, $zero /* BAF740 80241E00 8E430070 */ lw $v1, 0x70($s2) /* BAF744 80241E04 24020020 */ addiu $v0, $zero, 0x20 /* BAF748 80241E08 1462000D */ bne $v1, $v0, .L80241E40 /* BAF74C 80241E0C 00000000 */ nop +glabel L80241E10_BAF750 /* BAF750 80241E10 0C09059D */ jal mim_08_UnkNpcAIFunc8 /* BAF754 80241E14 0240202D */ daddu $a0, $s2, $zero /* BAF758 80241E18 8E430070 */ lw $v1, 0x70($s2) /* BAF75C 80241E1C 24020021 */ addiu $v0, $zero, 0x21 /* BAF760 80241E20 14620007 */ bne $v1, $v0, .L80241E40 /* BAF764 80241E24 00000000 */ nop +glabel L80241E28_BAF768 /* BAF768 80241E28 0C0905D3 */ jal mim_08_UnkNpcAIFunc5 /* BAF76C 80241E2C 0240202D */ daddu $a0, $s2, $zero /* BAF770 80241E30 08090790 */ j .L80241E40 /* BAF774 80241E34 00000000 */ nop +glabel L80241E38_BAF778 /* BAF778 80241E38 0C0129CF */ jal func_8004A73C /* BAF77C 80241E3C 0240202D */ daddu $a0, $s2, $zero .L80241E40: +glabel L80241E40_BAF780 /* BAF780 80241E40 8FBF0048 */ lw $ra, 0x48($sp) /* BAF784 80241E44 8FB50044 */ lw $s5, 0x44($sp) /* BAF788 80241E48 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241ED4_BAF814.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241ED4_BAF814.s index daec32e7c4..00032e9c7e 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241ED4_BAF814.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241ED4_BAF814.s @@ -38,7 +38,7 @@ glabel func_80241ED4_BAF814 /* BAF898 80241F58 3C01C1A0 */ lui $at, 0xc1a0 /* BAF89C 80241F5C 44812000 */ mtc1 $at, $f4 /* BAF8A0 80241F60 44833000 */ mtc1 $v1, $f6 -/* BAF8A4 80241F64 00000000 */ nop +/* BAF8A4 80241F64 00000000 */ nop /* BAF8A8 80241F68 468031A0 */ cvt.s.w $f6, $f6 /* BAF8AC 80241F6C 44073000 */ mfc1 $a3, $f6 /* BAF8B0 80241F70 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241FD0_BAF910.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241FD0_BAF910.s index d9dee7aaeb..e8f70d0064 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241FD0_BAF910.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241FD0_BAF910.s @@ -39,18 +39,18 @@ glabel func_80241FD0_BAF910 .L80242058: /* BAF998 80242058 8622008E */ lh $v0, 0x8e($s1) /* BAF99C 8024205C 1440025D */ bnez $v0, .L802429D4 -/* BAF9A0 80242060 00000000 */ nop +/* BAF9A0 80242060 00000000 */ nop /* BAF9A4 80242064 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* BAF9A8 80242068 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* BAF9AC 8024206C 0C00A6C9 */ jal clamp_angle /* BAF9B0 80242070 C44C00A8 */ lwc1 $f12, 0xa8($v0) /* BAF9B4 80242074 3C014334 */ lui $at, 0x4334 /* BAF9B8 80242078 44811000 */ mtc1 $at, $f2 -/* BAF9BC 8024207C 00000000 */ nop +/* BAF9BC 8024207C 00000000 */ nop /* BAF9C0 80242080 4602003C */ c.lt.s $f0, $f2 -/* BAF9C4 80242084 00000000 */ nop +/* BAF9C4 80242084 00000000 */ nop /* BAF9C8 80242088 45000011 */ bc1f .L802420D0 -/* BAF9CC 8024208C 00000000 */ nop +/* BAF9CC 8024208C 00000000 */ nop /* BAF9D0 80242090 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* BAF9D4 80242094 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* BAF9D8 80242098 3C0142B4 */ lui $at, 0x42b4 @@ -85,7 +85,7 @@ glabel func_80241FD0_BAF910 /* BAFA48 80242108 460C0300 */ add.s $f12, $f0, $f12 .L8024210C: /* BAFA4C 8024210C 0C00A6C9 */ jal clamp_angle -/* BAFA50 80242110 00000000 */ nop +/* BAFA50 80242110 00000000 */ nop /* BAFA54 80242114 46000586 */ mov.s $f22, $f0 /* BAFA58 80242118 3C014334 */ lui $at, 0x4334 /* BAFA5C 8024211C 44816000 */ mtc1 $at, $f12 @@ -134,7 +134,7 @@ glabel func_80241FD0_BAF910 /* BAFAF8 802421B8 862200A6 */ lh $v0, 0xa6($s1) /* BAFAFC 802421BC 8EA30000 */ lw $v1, ($s5) /* BAFB00 802421C0 44824000 */ mtc1 $v0, $f8 -/* BAFB04 802421C4 00000000 */ nop +/* BAFB04 802421C4 00000000 */ nop /* BAFB08 802421C8 46804220 */ cvt.s.w $f8, $f8 /* BAFB0C 802421CC C4600028 */ lwc1 $f0, 0x28($v1) /* BAFB10 802421D0 44064000 */ mfc1 $a2, $f8 @@ -146,7 +146,7 @@ glabel func_80241FD0_BAF910 /* BAFB28 802421E8 E6200040 */ swc1 $f0, 0x40($s1) /* BAFB2C 802421EC 862200A6 */ lh $v0, 0xa6($s1) /* BAFB30 802421F0 44820000 */ mtc1 $v0, $f0 -/* BAFB34 802421F4 00000000 */ nop +/* BAFB34 802421F4 00000000 */ nop /* BAFB38 802421F8 46800020 */ cvt.s.w $f0, $f0 /* BAFB3C 802421FC 4600A000 */ add.s $f0, $f20, $f0 /* BAFB40 80242200 4406B000 */ mfc1 $a2, $f22 @@ -155,18 +155,18 @@ glabel func_80241FD0_BAF910 /* BAFB4C 8024220C 0220202D */ daddu $a0, $s1, $zero /* BAFB50 80242210 8EC20088 */ lw $v0, 0x88($s6) /* BAFB54 80242214 1440005D */ bnez $v0, .L8024238C -/* BAFB58 80242218 00000000 */ nop +/* BAFB58 80242218 00000000 */ nop /* BAFB5C 8024221C C6200038 */ lwc1 $f0, 0x38($s1) /* BAFB60 80242220 3C018024 */ lui $at, %hi(D_80245490) /* BAFB64 80242224 D4245490 */ ldc1 $f4, %lo(D_80245490)($at) /* BAFB68 80242228 46000021 */ cvt.d.s $f0, $f0 /* BAFB6C 8024222C 4620203C */ c.lt.d $f4, $f0 -/* BAFB70 80242230 00000000 */ nop +/* BAFB70 80242230 00000000 */ nop /* BAFB74 80242234 45000005 */ bc1f .L8024224C -/* BAFB78 80242238 00000000 */ nop +/* BAFB78 80242238 00000000 */ nop /* BAFB7C 8024223C 3C0143BE */ lui $at, 0x43be /* BAFB80 80242240 44810000 */ mtc1 $at, $f0 -/* BAFB84 80242244 00000000 */ nop +/* BAFB84 80242244 00000000 */ nop /* BAFB88 80242248 E6200038 */ swc1 $f0, 0x38($s1) .L8024224C: /* BAFB8C 8024224C C6200038 */ lwc1 $f0, 0x38($s1) @@ -174,50 +174,50 @@ glabel func_80241FD0_BAF910 /* BAFB94 80242254 D4225498 */ ldc1 $f2, %lo(D_80245498)($at) /* BAFB98 80242258 46000021 */ cvt.d.s $f0, $f0 /* BAFB9C 8024225C 4622003C */ c.lt.d $f0, $f2 -/* BAFBA0 80242260 00000000 */ nop +/* BAFBA0 80242260 00000000 */ nop /* BAFBA4 80242264 45000005 */ bc1f .L8024227C -/* BAFBA8 80242268 00000000 */ nop +/* BAFBA8 80242268 00000000 */ nop /* BAFBAC 8024226C 3C01C3BE */ lui $at, 0xc3be /* BAFBB0 80242270 44810000 */ mtc1 $at, $f0 -/* BAFBB4 80242274 00000000 */ nop +/* BAFBB4 80242274 00000000 */ nop /* BAFBB8 80242278 E6200038 */ swc1 $f0, 0x38($s1) .L8024227C: /* BAFBBC 8024227C C6200040 */ lwc1 $f0, 0x40($s1) /* BAFBC0 80242280 46000021 */ cvt.d.s $f0, $f0 /* BAFBC4 80242284 4620203C */ c.lt.d $f4, $f0 -/* BAFBC8 80242288 00000000 */ nop +/* BAFBC8 80242288 00000000 */ nop /* BAFBCC 8024228C 45000005 */ bc1f .L802422A4 -/* BAFBD0 80242290 00000000 */ nop +/* BAFBD0 80242290 00000000 */ nop /* BAFBD4 80242294 3C0143BE */ lui $at, 0x43be /* BAFBD8 80242298 44810000 */ mtc1 $at, $f0 -/* BAFBDC 8024229C 00000000 */ nop +/* BAFBDC 8024229C 00000000 */ nop /* BAFBE0 802422A0 E6200040 */ swc1 $f0, 0x40($s1) .L802422A4: /* BAFBE4 802422A4 C6200040 */ lwc1 $f0, 0x40($s1) /* BAFBE8 802422A8 46000021 */ cvt.d.s $f0, $f0 /* BAFBEC 802422AC 4622003C */ c.lt.d $f0, $f2 -/* BAFBF0 802422B0 00000000 */ nop +/* BAFBF0 802422B0 00000000 */ nop /* BAFBF4 802422B4 45000005 */ bc1f .L802422CC -/* BAFBF8 802422B8 00000000 */ nop +/* BAFBF8 802422B8 00000000 */ nop /* BAFBFC 802422BC 3C01C3BE */ lui $at, 0xc3be /* BAFC00 802422C0 44810000 */ mtc1 $at, $f0 -/* BAFC04 802422C4 00000000 */ nop +/* BAFC04 802422C4 00000000 */ nop /* BAFC08 802422C8 E6200040 */ swc1 $f0, 0x40($s1) .L802422CC: /* BAFC0C 802422CC C6220038 */ lwc1 $f2, 0x38($s1) /* BAFC10 802422D0 46021082 */ mul.s $f2, $f2, $f2 -/* BAFC14 802422D4 00000000 */ nop +/* BAFC14 802422D4 00000000 */ nop /* BAFC18 802422D8 C6200040 */ lwc1 $f0, 0x40($s1) /* BAFC1C 802422DC 46000002 */ mul.s $f0, $f0, $f0 -/* BAFC20 802422E0 00000000 */ nop +/* BAFC20 802422E0 00000000 */ nop /* BAFC24 802422E4 46001300 */ add.s $f12, $f2, $f0 /* BAFC28 802422E8 46006004 */ sqrt.s $f0, $f12 /* BAFC2C 802422EC 46000032 */ c.eq.s $f0, $f0 -/* BAFC30 802422F0 00000000 */ nop +/* BAFC30 802422F0 00000000 */ nop /* BAFC34 802422F4 45010003 */ bc1t .L80242304 -/* BAFC38 802422F8 00000000 */ nop +/* BAFC38 802422F8 00000000 */ nop /* BAFC3C 802422FC 0C0187BC */ jal sqrtf -/* BAFC40 80242300 00000000 */ nop +/* BAFC40 80242300 00000000 */ nop .L80242304: /* BAFC44 80242304 8E260038 */ lw $a2, 0x38($s1) /* BAFC48 80242308 8E270040 */ lw $a3, 0x40($s1) @@ -232,7 +232,7 @@ glabel func_80241FD0_BAF910 /* BAFC6C 8024232C D42054A0 */ ldc1 $f0, %lo(D_802454A0)($at) /* BAFC70 80242330 460010A1 */ cvt.d.s $f2, $f2 /* BAFC74 80242334 4620103C */ c.lt.d $f2, $f0 -/* BAFC78 80242338 00000000 */ nop +/* BAFC78 80242338 00000000 */ nop /* BAFC7C 8024233C 45000004 */ bc1f .L80242350 /* BAFC80 80242340 0200202D */ daddu $a0, $s0, $zero /* BAFC84 80242344 3C064398 */ lui $a2, 0x4398 @@ -242,9 +242,9 @@ glabel func_80241FD0_BAF910 /* BAFC90 80242350 3C018024 */ lui $at, %hi(D_802454A8) /* BAFC94 80242354 D42054A8 */ ldc1 $f0, %lo(D_802454A8)($at) /* BAFC98 80242358 4622003C */ c.lt.d $f0, $f2 -/* BAFC9C 8024235C 00000000 */ nop +/* BAFC9C 8024235C 00000000 */ nop /* BAFCA0 80242360 450000FA */ bc1f .L8024274C -/* BAFCA4 80242364 00000000 */ nop +/* BAFCA4 80242364 00000000 */ nop /* BAFCA8 80242368 3C0643BB */ lui $a2, 0x43bb /* BAFCAC 8024236C 34C68000 */ ori $a2, $a2, 0x8000 .L80242370: @@ -254,7 +254,7 @@ glabel func_80241FD0_BAF910 /* BAFCBC 8024237C 0C00A7E7 */ jal add_vec2D_polar /* BAFCC0 80242380 E6340040 */ swc1 $f20, 0x40($s1) /* BAFCC4 80242384 080909D3 */ j .L8024274C -/* BAFCC8 80242388 00000000 */ nop +/* BAFCC8 80242388 00000000 */ nop .L8024238C: /* BAFCCC 8024238C 8E220000 */ lw $v0, ($s1) /* BAFCD0 80242390 30420040 */ andi $v0, $v0, 0x40 @@ -281,13 +281,13 @@ glabel func_80241FD0_BAF910 /* BAFD24 802423E4 862200A8 */ lh $v0, 0xa8($s1) /* BAFD28 802423E8 0260302D */ daddu $a2, $s3, $zero /* BAFD2C 802423EC 44820000 */ mtc1 $v0, $f0 -/* BAFD30 802423F0 00000000 */ nop +/* BAFD30 802423F0 00000000 */ nop /* BAFD34 802423F4 46800020 */ cvt.s.w $f0, $f0 /* BAFD38 802423F8 E7A00018 */ swc1 $f0, 0x18($sp) /* BAFD3C 802423FC 862200A6 */ lh $v0, 0xa6($s1) /* BAFD40 80242400 27B00028 */ addiu $s0, $sp, 0x28 /* BAFD44 80242404 44820000 */ mtc1 $v0, $f0 -/* BAFD48 80242408 00000000 */ nop +/* BAFD48 80242408 00000000 */ nop /* BAFD4C 8024240C 46800020 */ cvt.s.w $f0, $f0 /* BAFD50 80242410 E7A0001C */ swc1 $f0, 0x1c($sp) /* BAFD54 80242414 8E240080 */ lw $a0, 0x80($s1) @@ -311,13 +311,13 @@ glabel func_80241FD0_BAF910 /* BAFD9C 8024245C E7B60014 */ swc1 $f22, 0x14($sp) /* BAFDA0 80242460 862200A8 */ lh $v0, 0xa8($s1) /* BAFDA4 80242464 44820000 */ mtc1 $v0, $f0 -/* BAFDA8 80242468 00000000 */ nop +/* BAFDA8 80242468 00000000 */ nop /* BAFDAC 8024246C 46800020 */ cvt.s.w $f0, $f0 /* BAFDB0 80242470 E7A00018 */ swc1 $f0, 0x18($sp) /* BAFDB4 80242474 862200A6 */ lh $v0, 0xa6($s1) /* BAFDB8 80242478 0260302D */ daddu $a2, $s3, $zero /* BAFDBC 8024247C 44820000 */ mtc1 $v0, $f0 -/* BAFDC0 80242480 00000000 */ nop +/* BAFDC0 80242480 00000000 */ nop /* BAFDC4 80242484 46800020 */ cvt.s.w $f0, $f0 /* BAFDC8 80242488 E7A0001C */ swc1 $f0, 0x1c($sp) /* BAFDCC 8024248C 8E240080 */ lw $a0, 0x80($s1) @@ -347,32 +347,32 @@ glabel func_80241FD0_BAF910 /* BAFE2C 802424EC 0C0372DF */ jal func_800DCB7C /* BAFE30 802424F0 0040802D */ daddu $s0, $v0, $zero /* BAFE34 802424F4 1600001C */ bnez $s0, .L80242568 -/* BAFE38 802424F8 00000000 */ nop +/* BAFE38 802424F8 00000000 */ nop /* BAFE3C 802424FC 1040001A */ beqz $v0, .L80242568 -/* BAFE40 80242500 00000000 */ nop +/* BAFE40 80242500 00000000 */ nop /* BAFE44 80242504 C7A20038 */ lwc1 $f2, 0x38($sp) /* BAFE48 80242508 3C014054 */ lui $at, 0x4054 /* BAFE4C 8024250C 44810800 */ mtc1 $at, $f1 /* BAFE50 80242510 44800000 */ mtc1 $zero, $f0 /* BAFE54 80242514 460010A1 */ cvt.d.s $f2, $f2 /* BAFE58 80242518 4622003C */ c.lt.d $f0, $f2 -/* BAFE5C 8024251C 00000000 */ nop +/* BAFE5C 8024251C 00000000 */ nop /* BAFE60 80242520 45000011 */ bc1f .L80242568 -/* BAFE64 80242524 00000000 */ nop +/* BAFE64 80242524 00000000 */ nop /* BAFE68 80242528 3C01405E */ lui $at, 0x405e /* BAFE6C 8024252C 44810800 */ mtc1 $at, $f1 /* BAFE70 80242530 44800000 */ mtc1 $zero, $f0 -/* BAFE74 80242534 00000000 */ nop +/* BAFE74 80242534 00000000 */ nop /* BAFE78 80242538 4620103C */ c.lt.d $f2, $f0 -/* BAFE7C 8024253C 00000000 */ nop +/* BAFE7C 8024253C 00000000 */ nop /* BAFE80 80242540 45000009 */ bc1f .L80242568 -/* BAFE84 80242544 00000000 */ nop +/* BAFE84 80242544 00000000 */ nop /* BAFE88 80242548 C622003C */ lwc1 $f2, 0x3c($s1) /* BAFE8C 8024254C C7A00030 */ lwc1 $f0, 0x30($sp) /* BAFE90 80242550 46001032 */ c.eq.s $f2, $f0 -/* BAFE94 80242554 00000000 */ nop +/* BAFE94 80242554 00000000 */ nop /* BAFE98 80242558 45010003 */ bc1t .L80242568 -/* BAFE9C 8024255C 00000000 */ nop +/* BAFE9C 8024255C 00000000 */ nop /* BAFEA0 80242560 080909D3 */ j .L8024274C /* BAFEA4 80242564 241E0001 */ addiu $fp, $zero, 1 .L80242568: @@ -396,13 +396,13 @@ glabel func_80241FD0_BAF910 /* BAFEEC 802425AC 862200A8 */ lh $v0, 0xa8($s1) /* BAFEF0 802425B0 27A50020 */ addiu $a1, $sp, 0x20 /* BAFEF4 802425B4 44820000 */ mtc1 $v0, $f0 -/* BAFEF8 802425B8 00000000 */ nop +/* BAFEF8 802425B8 00000000 */ nop /* BAFEFC 802425BC 46800020 */ cvt.s.w $f0, $f0 /* BAFF00 802425C0 E7A00018 */ swc1 $f0, 0x18($sp) /* BAFF04 802425C4 862200A6 */ lh $v0, 0xa6($s1) /* BAFF08 802425C8 27A60024 */ addiu $a2, $sp, 0x24 /* BAFF0C 802425CC 44820000 */ mtc1 $v0, $f0 -/* BAFF10 802425D0 00000000 */ nop +/* BAFF10 802425D0 00000000 */ nop /* BAFF14 802425D4 46800020 */ cvt.s.w $f0, $f0 /* BAFF18 802425D8 E7A0001C */ swc1 $f0, 0x1c($sp) /* BAFF1C 802425DC 8E240080 */ lw $a0, 0x80($s1) @@ -420,7 +420,7 @@ glabel func_80241FD0_BAF910 /* BAFF4C 8024260C 862200A6 */ lh $v0, 0xa6($s1) /* BAFF50 80242610 4407C000 */ mfc1 $a3, $f24 /* BAFF54 80242614 44824000 */ mtc1 $v0, $f8 -/* BAFF58 80242618 00000000 */ nop +/* BAFF58 80242618 00000000 */ nop /* BAFF5C 8024261C 46804220 */ cvt.s.w $f8, $f8 /* BAFF60 80242620 C4600028 */ lwc1 $f0, 0x28($v1) /* BAFF64 80242624 44064000 */ mfc1 $a2, $f8 @@ -432,7 +432,7 @@ glabel func_80241FD0_BAF910 /* BAFF7C 8024263C E6200040 */ swc1 $f0, 0x40($s1) /* BAFF80 80242640 862200A6 */ lh $v0, 0xa6($s1) /* BAFF84 80242644 44820000 */ mtc1 $v0, $f0 -/* BAFF88 80242648 00000000 */ nop +/* BAFF88 80242648 00000000 */ nop /* BAFF8C 8024264C 46800020 */ cvt.s.w $f0, $f0 /* BAFF90 80242650 080909CF */ j .L8024273C /* BAFF94 80242654 4600A500 */ add.s $f20, $f20, $f0 @@ -454,20 +454,20 @@ glabel func_80241FD0_BAF910 /* BAFFD0 80242690 E7B60014 */ swc1 $f22, 0x14($sp) /* BAFFD4 80242694 862200A8 */ lh $v0, 0xa8($s1) /* BAFFD8 80242698 44820000 */ mtc1 $v0, $f0 -/* BAFFDC 8024269C 00000000 */ nop +/* BAFFDC 8024269C 00000000 */ nop /* BAFFE0 802426A0 46800020 */ cvt.s.w $f0, $f0 /* BAFFE4 802426A4 E7A00018 */ swc1 $f0, 0x18($sp) /* BAFFE8 802426A8 862200A6 */ lh $v0, 0xa6($s1) /* BAFFEC 802426AC 27A60024 */ addiu $a2, $sp, 0x24 /* BAFFF0 802426B0 44820000 */ mtc1 $v0, $f0 -/* BAFFF4 802426B4 00000000 */ nop +/* BAFFF4 802426B4 00000000 */ nop /* BAFFF8 802426B8 46800020 */ cvt.s.w $f0, $f0 /* BAFFFC 802426BC E7A0001C */ swc1 $f0, 0x1c($sp) /* BB0000 802426C0 8E240080 */ lw $a0, 0x80($s1) /* BB0004 802426C4 0C037711 */ jal func_800DDC44 /* BB0008 802426C8 27A70028 */ addiu $a3, $sp, 0x28 /* BB000C 802426CC 1040001F */ beqz $v0, .L8024274C -/* BB0010 802426D0 00000000 */ nop +/* BB0010 802426D0 00000000 */ nop /* BB0014 802426D4 8FA60020 */ lw $a2, 0x20($sp) /* BB0018 802426D8 8EA20000 */ lw $v0, ($s5) /* BB001C 802426DC 8FA70028 */ lw $a3, 0x28($sp) @@ -479,7 +479,7 @@ glabel func_80241FD0_BAF910 /* BB0034 802426F4 862200A6 */ lh $v0, 0xa6($s1) /* BB0038 802426F8 4407C000 */ mfc1 $a3, $f24 /* BB003C 802426FC 44824000 */ mtc1 $v0, $f8 -/* BB0040 80242700 00000000 */ nop +/* BB0040 80242700 00000000 */ nop /* BB0044 80242704 46804220 */ cvt.s.w $f8, $f8 /* BB0048 80242708 C4600028 */ lwc1 $f0, 0x28($v1) /* BB004C 8024270C 44064000 */ mfc1 $a2, $f8 @@ -491,7 +491,7 @@ glabel func_80241FD0_BAF910 /* BB0064 80242724 E6200040 */ swc1 $f0, 0x40($s1) /* BB0068 80242728 862200A6 */ lh $v0, 0xa6($s1) /* BB006C 8024272C 44820000 */ mtc1 $v0, $f0 -/* BB0070 80242730 00000000 */ nop +/* BB0070 80242730 00000000 */ nop /* BB0074 80242734 46800020 */ cvt.s.w $f0, $f0 /* BB0078 80242738 4600A500 */ add.s $f20, $f20, $f0 .L8024273C: @@ -520,14 +520,14 @@ glabel func_80241FD0_BAF910 /* BB00D0 80242790 0C0123F5 */ jal is_point_within_region /* BB00D4 80242794 26330040 */ addiu $s3, $s1, 0x40 /* BB00D8 80242798 1040005A */ beqz $v0, .L80242904 -/* BB00DC 8024279C 00000000 */ nop +/* BB00DC 8024279C 00000000 */ nop /* BB00E0 802427A0 8E430004 */ lw $v1, 4($s2) /* BB00E4 802427A4 10600005 */ beqz $v1, .L802427BC /* BB00E8 802427A8 24020001 */ addiu $v0, $zero, 1 /* BB00EC 802427AC 10620029 */ beq $v1, $v0, .L80242854 -/* BB00F0 802427B0 00000000 */ nop +/* BB00F0 802427B0 00000000 */ nop /* BB00F4 802427B4 08090A41 */ j .L80242904 -/* BB00F8 802427B8 00000000 */ nop +/* BB00F8 802427B8 00000000 */ nop .L802427BC: /* BB00FC 802427BC C6480008 */ lwc1 $f8, 8($s2) /* BB0100 802427C0 46804220 */ cvt.s.w $f8, $f8 @@ -538,11 +538,11 @@ glabel func_80241FD0_BAF910 /* BB0114 802427D4 C62E0040 */ lwc1 $f14, 0x40($s1) /* BB0118 802427D8 44074000 */ mfc1 $a3, $f8 /* BB011C 802427DC 0C00A7B5 */ jal dist2D -/* BB0120 802427E0 00000000 */ nop +/* BB0120 802427E0 00000000 */ nop /* BB0124 802427E4 C6420010 */ lwc1 $f2, 0x10($s2) /* BB0128 802427E8 468010A0 */ cvt.s.w $f2, $f2 /* BB012C 802427EC 4600103C */ c.lt.s $f2, $f0 -/* BB0130 802427F0 00000000 */ nop +/* BB0130 802427F0 00000000 */ nop /* BB0134 802427F4 45000043 */ bc1f .L80242904 /* BB0138 802427F8 E7A00038 */ swc1 $f0, 0x38($sp) /* BB013C 802427FC C64C0008 */ lwc1 $f12, 8($s2) @@ -566,17 +566,17 @@ glabel func_80241FD0_BAF910 /* BB0184 80242844 0C00A7E7 */ jal add_vec2D_polar /* BB0188 80242848 0260282D */ daddu $a1, $s3, $zero /* BB018C 8024284C 08090A41 */ j .L80242904 -/* BB0190 80242850 00000000 */ nop +/* BB0190 80242850 00000000 */ nop .L80242854: /* BB0194 80242854 8E420008 */ lw $v0, 8($s2) /* BB0198 80242858 8E430010 */ lw $v1, 0x10($s2) /* BB019C 8024285C C6200038 */ lwc1 $f0, 0x38($s1) /* BB01A0 80242860 00431021 */ addu $v0, $v0, $v1 /* BB01A4 80242864 44821000 */ mtc1 $v0, $f2 -/* BB01A8 80242868 00000000 */ nop +/* BB01A8 80242868 00000000 */ nop /* BB01AC 8024286C 468010A0 */ cvt.s.w $f2, $f2 /* BB01B0 80242870 4600103C */ c.lt.s $f2, $f0 -/* BB01B4 80242874 00000000 */ nop +/* BB01B4 80242874 00000000 */ nop /* BB01B8 80242878 45030001 */ bc1tl .L80242880 /* BB01BC 8024287C E6220038 */ swc1 $f2, 0x38($s1) .L80242880: @@ -585,10 +585,10 @@ glabel func_80241FD0_BAF910 /* BB01C8 80242888 C6200038 */ lwc1 $f0, 0x38($s1) /* BB01CC 8024288C 00431023 */ subu $v0, $v0, $v1 /* BB01D0 80242890 44821000 */ mtc1 $v0, $f2 -/* BB01D4 80242894 00000000 */ nop +/* BB01D4 80242894 00000000 */ nop /* BB01D8 80242898 468010A0 */ cvt.s.w $f2, $f2 /* BB01DC 8024289C 4602003C */ c.lt.s $f0, $f2 -/* BB01E0 802428A0 00000000 */ nop +/* BB01E0 802428A0 00000000 */ nop /* BB01E4 802428A4 45030001 */ bc1tl .L802428AC /* BB01E8 802428A8 E6220038 */ swc1 $f2, 0x38($s1) .L802428AC: @@ -597,10 +597,10 @@ glabel func_80241FD0_BAF910 /* BB01F4 802428B4 C6200040 */ lwc1 $f0, 0x40($s1) /* BB01F8 802428B8 00431021 */ addu $v0, $v0, $v1 /* BB01FC 802428BC 44821000 */ mtc1 $v0, $f2 -/* BB0200 802428C0 00000000 */ nop +/* BB0200 802428C0 00000000 */ nop /* BB0204 802428C4 468010A0 */ cvt.s.w $f2, $f2 /* BB0208 802428C8 4600103C */ c.lt.s $f2, $f0 -/* BB020C 802428CC 00000000 */ nop +/* BB020C 802428CC 00000000 */ nop /* BB0210 802428D0 45030001 */ bc1tl .L802428D8 /* BB0214 802428D4 E6220040 */ swc1 $f2, 0x40($s1) .L802428D8: @@ -609,21 +609,21 @@ glabel func_80241FD0_BAF910 /* BB0220 802428E0 C6200040 */ lwc1 $f0, 0x40($s1) /* BB0224 802428E4 00431023 */ subu $v0, $v0, $v1 /* BB0228 802428E8 44821000 */ mtc1 $v0, $f2 -/* BB022C 802428EC 00000000 */ nop +/* BB022C 802428EC 00000000 */ nop /* BB0230 802428F0 468010A0 */ cvt.s.w $f2, $f2 /* BB0234 802428F4 4602003C */ c.lt.s $f0, $f2 -/* BB0238 802428F8 00000000 */ nop +/* BB0238 802428F8 00000000 */ nop /* BB023C 802428FC 45030001 */ bc1tl .L80242904 /* BB0240 80242900 E6220040 */ swc1 $f2, 0x40($s1) .L80242904: /* BB0244 80242904 16E0001F */ bnez $s7, .L80242984 -/* BB0248 80242908 00000000 */ nop +/* BB0248 80242908 00000000 */ nop /* BB024C 8024290C 8E220000 */ lw $v0, ($s1) /* BB0250 80242910 30420008 */ andi $v0, $v0, 8 /* BB0254 80242914 10400003 */ beqz $v0, .L80242924 /* BB0258 80242918 27A50020 */ addiu $a1, $sp, 0x20 /* BB025C 8024291C 13C00019 */ beqz $fp, .L80242984 -/* BB0260 80242920 00000000 */ nop +/* BB0260 80242920 00000000 */ nop .L80242924: /* BB0264 80242924 27A60024 */ addiu $a2, $sp, 0x24 /* BB0268 80242928 27A20038 */ addiu $v0, $sp, 0x38 @@ -646,7 +646,7 @@ glabel func_80241FD0_BAF910 /* BB02AC 8024296C 0C0372DF */ jal func_800DCB7C /* BB02B0 80242970 27A70028 */ addiu $a3, $sp, 0x28 /* BB02B4 80242974 10400003 */ beqz $v0, .L80242984 -/* BB02B8 80242978 00000000 */ nop +/* BB02B8 80242978 00000000 */ nop /* BB02BC 8024297C C7A00024 */ lwc1 $f0, 0x24($sp) /* BB02C0 80242980 E620003C */ swc1 $f0, 0x3c($s1) .L80242984: diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242A10_BB0350.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242A10_BB0350.s index 197b7789db..39a66d3de1 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242A10_BB0350.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242A10_BB0350.s @@ -27,7 +27,7 @@ glabel func_80242A10_BB0350 .L80242A68: /* BB03A8 80242A68 8482008E */ lh $v0, 0x8e($a0) /* BB03AC 80242A6C 14400007 */ bnez $v0, .L80242A8C -/* BB03B0 80242A70 00000000 */ nop +/* BB03B0 80242A70 00000000 */ nop /* BB03B4 80242A74 8E0200CC */ lw $v0, 0xcc($s0) /* BB03B8 80242A78 8C420028 */ lw $v0, 0x28($v0) /* BB03BC 80242A7C A480008E */ sh $zero, 0x8e($a0) diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242AA0_BB03E0.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242AA0_BB03E0.s index 966a837106..222a7fc58e 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242AA0_BB03E0.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242AA0_BB03E0.s @@ -18,7 +18,7 @@ glabel func_80242AA0_BB03E0 /* BB0414 80242AD4 8E0300A0 */ lw $v1, 0xa0($s0) /* BB0418 80242AD8 00021403 */ sra $v0, $v0, 0x10 /* BB041C 80242ADC 14430004 */ bne $v0, $v1, .L80242AF0 -/* BB0420 80242AE0 00000000 */ nop +/* BB0420 80242AE0 00000000 */ nop /* BB0424 80242AE4 8E0200CC */ lw $v0, 0xcc($s0) /* BB0428 80242AE8 8C42002C */ lw $v0, 0x2c($v0) /* BB042C 80242AEC ACA20028 */ sw $v0, 0x28($a1) @@ -47,7 +47,7 @@ glabel func_80242AA0_BB03E0 /* BB0480 80242B40 3C01C1A0 */ lui $at, 0xc1a0 /* BB0484 80242B44 44812000 */ mtc1 $at, $f4 /* BB0488 80242B48 44833000 */ mtc1 $v1, $f6 -/* BB048C 80242B4C 00000000 */ nop +/* BB048C 80242B4C 00000000 */ nop /* BB0490 80242B50 468031A0 */ cvt.s.w $f6, $f6 /* BB0494 80242B54 8C420000 */ lw $v0, ($v0) /* BB0498 80242B58 44073000 */ mfc1 $a3, $f6 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242C00_BB0540.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242C00_BB0540.s index 1bf8c9bfc4..498919f840 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242C00_BB0540.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242C00_BB0540.s @@ -42,7 +42,7 @@ glabel func_80242C00_BB0540 /* BB05D4 80242C94 2402000F */ addiu $v0, $zero, 0xf /* BB05D8 80242C98 AFA2001C */ sw $v0, 0x1c($sp) /* BB05DC 80242C9C 44833000 */ mtc1 $v1, $f6 -/* BB05E0 80242CA0 00000000 */ nop +/* BB05E0 80242CA0 00000000 */ nop /* BB05E4 80242CA4 468031A0 */ cvt.s.w $f6, $f6 /* BB05E8 80242CA8 44073000 */ mfc1 $a3, $f6 /* BB05EC 80242CAC 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242CEC_BB062C.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242CEC_BB062C.s index fde3889e83..b0a4b53e06 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242CEC_BB062C.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242CEC_BB062C.s @@ -46,7 +46,7 @@ glabel func_80242CEC_BB062C /* BB06D0 80242D90 8E2200B0 */ lw $v0, 0xb0($s1) /* BB06D4 80242D94 30420004 */ andi $v0, $v0, 4 /* BB06D8 80242D98 10400011 */ beqz $v0, .L80242DE0 -/* BB06DC 80242D9C 00000000 */ nop +/* BB06DC 80242D9C 00000000 */ nop .L80242DA0: /* BB06E0 80242DA0 AE400070 */ sw $zero, 0x70($s2) /* BB06E4 80242DA4 A6A0008E */ sh $zero, 0x8e($s5) @@ -78,12 +78,12 @@ glabel func_80242CEC_BB062C /* BB0748 80242E08 10600013 */ beqz $v1, .L80242E58 /* BB074C 80242E0C 0240202D */ daddu $a0, $s2, $zero /* BB0750 80242E10 08090BC5 */ j .L80242F14 -/* BB0754 80242E14 00000000 */ nop +/* BB0754 80242E14 00000000 */ nop .L80242E18: /* BB0758 80242E18 10620018 */ beq $v1, $v0, .L80242E7C /* BB075C 80242E1C 0240202D */ daddu $a0, $s2, $zero /* BB0760 80242E20 08090BC5 */ j .L80242F14 -/* BB0764 80242E24 00000000 */ nop +/* BB0764 80242E24 00000000 */ nop .L80242E28: /* BB0768 80242E28 2402000D */ addiu $v0, $zero, 0xd /* BB076C 80242E2C 10620029 */ beq $v1, $v0, .L80242ED4 @@ -94,9 +94,9 @@ glabel func_80242CEC_BB062C /* BB0780 80242E40 1062002D */ beq $v1, $v0, .L80242EF8 /* BB0784 80242E44 24020063 */ addiu $v0, $zero, 0x63 /* BB0788 80242E48 10620030 */ beq $v1, $v0, .L80242F0C -/* BB078C 80242E4C 00000000 */ nop +/* BB078C 80242E4C 00000000 */ nop /* BB0790 80242E50 08090BC5 */ j .L80242F14 -/* BB0794 80242E54 00000000 */ nop +/* BB0794 80242E54 00000000 */ nop .L80242E58: /* BB0798 80242E58 0260282D */ daddu $a1, $s3, $zero /* BB079C 80242E5C 0C09079A */ jal func_80241E68_BAF7A8 @@ -107,14 +107,14 @@ glabel func_80242CEC_BB062C /* BB07AC 80242E6C 0C0907B5 */ jal func_80241ED4_BAF814 /* BB07B0 80242E70 0280302D */ daddu $a2, $s4, $zero /* BB07B4 80242E74 08090BC5 */ j .L80242F14 -/* BB07B8 80242E78 00000000 */ nop +/* BB07B8 80242E78 00000000 */ nop .L80242E7C: /* BB07BC 80242E7C 0260282D */ daddu $a1, $s3, $zero /* BB07C0 80242E80 0C0907F4 */ jal func_80241FD0_BAF910 /* BB07C4 80242E84 0280302D */ daddu $a2, $s4, $zero /* BB07C8 80242E88 8E420070 */ lw $v0, 0x70($s2) /* BB07CC 80242E8C 14500021 */ bne $v0, $s0, .L80242F14 -/* BB07D0 80242E90 00000000 */ nop +/* BB07D0 80242E90 00000000 */ nop .L80242E94: /* BB07D4 80242E94 0240202D */ daddu $a0, $s2, $zero /* BB07D8 80242E98 0260282D */ daddu $a1, $s3, $zero @@ -123,7 +123,7 @@ glabel func_80242CEC_BB062C /* BB07E4 80242EA4 8E430070 */ lw $v1, 0x70($s2) /* BB07E8 80242EA8 2402000C */ addiu $v0, $zero, 0xc /* BB07EC 80242EAC 14620019 */ bne $v1, $v0, .L80242F14 -/* BB07F0 80242EB0 00000000 */ nop +/* BB07F0 80242EB0 00000000 */ nop /* BB07F4 80242EB4 0240202D */ daddu $a0, $s2, $zero .L80242EB8: /* BB07F8 80242EB8 0260282D */ daddu $a1, $s3, $zero @@ -132,7 +132,7 @@ glabel func_80242CEC_BB062C /* BB0804 80242EC4 8E430070 */ lw $v1, 0x70($s2) /* BB0808 80242EC8 2402000D */ addiu $v0, $zero, 0xd /* BB080C 80242ECC 14620011 */ bne $v1, $v0, .L80242F14 -/* BB0810 80242ED0 00000000 */ nop +/* BB0810 80242ED0 00000000 */ nop .L80242ED4: /* BB0814 80242ED4 0240202D */ daddu $a0, $s2, $zero /* BB0818 80242ED8 0260282D */ daddu $a1, $s3, $zero @@ -141,14 +141,14 @@ glabel func_80242CEC_BB062C /* BB0824 80242EE4 8E430070 */ lw $v1, 0x70($s2) /* BB0828 80242EE8 2402000E */ addiu $v0, $zero, 0xe /* BB082C 80242EEC 14620009 */ bne $v1, $v0, .L80242F14 -/* BB0830 80242EF0 00000000 */ nop +/* BB0830 80242EF0 00000000 */ nop /* BB0834 80242EF4 0240202D */ daddu $a0, $s2, $zero .L80242EF8: /* BB0838 80242EF8 0260282D */ daddu $a1, $s3, $zero /* BB083C 80242EFC 0C090B00 */ jal func_80242C00_BB0540 /* BB0840 80242F00 0280302D */ daddu $a2, $s4, $zero /* BB0844 80242F04 08090BC5 */ j .L80242F14 -/* BB0848 80242F08 00000000 */ nop +/* BB0848 80242F08 00000000 */ nop .L80242F0C: /* BB084C 80242F0C 0C0129CF */ jal func_8004A73C /* BB0850 80242F10 0240202D */ daddu $a0, $s2, $zero @@ -163,4 +163,4 @@ glabel func_80242CEC_BB062C /* BB0870 80242F30 0000102D */ daddu $v0, $zero, $zero /* BB0874 80242F34 03E00008 */ jr $ra /* BB0878 80242F38 27BD0050 */ addiu $sp, $sp, 0x50 -/* BB087C 80242F3C 00000000 */ nop +/* BB087C 80242F3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/pause_set_cursor_opacity_BB04E0.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/pause_set_cursor_opacity_BB04E0.s index 9e24c75af3..624de072f0 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/pause_set_cursor_opacity_BB04E0.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/pause_set_cursor_opacity_BB04E0.s @@ -16,7 +16,7 @@ glabel pause_set_cursor_opacity_BB04E0 /* BB050C 80242BCC A462008E */ sh $v0, 0x8e($v1) /* BB0510 80242BD0 00021400 */ sll $v0, $v0, 0x10 /* BB0514 80242BD4 14400005 */ bnez $v0, .L80242BEC -/* BB0518 80242BD8 00000000 */ nop +/* BB0518 80242BD8 00000000 */ nop /* BB051C 80242BDC 960200AA */ lhu $v0, 0xaa($s0) /* BB0520 80242BE0 A462008E */ sh $v0, 0x8e($v1) /* BB0524 80242BE4 2402000E */ addiu $v0, $zero, 0xe diff --git a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240000_BB2E00.s b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240000_BB2E00.s index e8b48d8d5e..f39f0ada8a 100644 --- a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240000_BB2E00.s +++ b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240000_BB2E00.s @@ -5,7 +5,7 @@ glabel func_80240000_BB2E00 /* BB2E00 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 /* BB2E04 80240004 AFBF0010 */ sw $ra, 0x10($sp) /* BB2E08 80240008 0C046ED4 */ jal enable_world_fog -/* BB2E0C 8024000C 00000000 */ nop +/* BB2E0C 8024000C 00000000 */ nop /* BB2E10 80240010 240403DE */ addiu $a0, $zero, 0x3de /* BB2E14 80240014 0C046EDD */ jal set_world_fog_dist /* BB2E18 80240018 240503E8 */ addiu $a1, $zero, 0x3e8 @@ -15,7 +15,7 @@ glabel func_80240000_BB2E00 /* BB2E28 80240028 0C046EE2 */ jal set_world_fog_color /* BB2E2C 8024002C 240700FF */ addiu $a3, $zero, 0xff /* BB2E30 80240030 0C048BFB */ jal enable_entity_fog -/* BB2E34 80240034 00000000 */ nop +/* BB2E34 80240034 00000000 */ nop /* BB2E38 80240038 240403DE */ addiu $a0, $zero, 0x3de /* BB2E3C 8024003C 0C048C04 */ jal set_entity_fog_dist /* BB2E40 80240040 240503E8 */ addiu $a1, $zero, 0x3e8 diff --git a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_802400A0_BB2EA0.s b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_802400A0_BB2EA0.s index 4ec0106909..b60890a409 100644 --- a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_802400A0_BB2EA0.s +++ b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_802400A0_BB2EA0.s @@ -30,7 +30,7 @@ glabel func_802400A0_BB2EA0 /* BB2F04 80240104 3C05B000 */ lui $a1, 0xb000 /* BB2F08 80240108 34A50017 */ ori $a1, $a1, 0x17 /* BB2F0C 8024010C 44820000 */ mtc1 $v0, $f0 -/* BB2F10 80240110 00000000 */ nop +/* BB2F10 80240110 00000000 */ nop /* BB2F14 80240114 46800021 */ cvt.d.w $f0, $f0 /* BB2F18 80240118 3C014024 */ lui $at, 0x4024 /* BB2F1C 8024011C 44811800 */ mtc1 $at, $f3 @@ -68,7 +68,7 @@ glabel func_802400A0_BB2EA0 /* BB2F9C 8024019C 0C0123F5 */ jal is_point_within_region /* BB2FA0 802401A0 8E070038 */ lw $a3, 0x38($s0) /* BB2FA4 802401A4 10400035 */ beqz $v0, .L8024027C -/* BB2FA8 802401A8 00000000 */ nop +/* BB2FA8 802401A8 00000000 */ nop /* BB2FAC 802401AC C60C0038 */ lwc1 $f12, 0x38($s0) /* BB2FB0 802401B0 3C0141C8 */ lui $at, 0x41c8 /* BB2FB4 802401B4 4481B000 */ mtc1 $at, $f22 @@ -99,13 +99,13 @@ glabel func_802400A0_BB2EA0 /* BB3014 80240214 860200A8 */ lh $v0, 0xa8($s0) /* BB3018 80240218 27A50020 */ addiu $a1, $sp, 0x20 /* BB301C 8024021C 44820000 */ mtc1 $v0, $f0 -/* BB3020 80240220 00000000 */ nop +/* BB3020 80240220 00000000 */ nop /* BB3024 80240224 46800020 */ cvt.s.w $f0, $f0 /* BB3028 80240228 E7A00018 */ swc1 $f0, 0x18($sp) /* BB302C 8024022C 860200A6 */ lh $v0, 0xa6($s0) /* BB3030 80240230 27A60024 */ addiu $a2, $sp, 0x24 /* BB3034 80240234 44820000 */ mtc1 $v0, $f0 -/* BB3038 80240238 00000000 */ nop +/* BB3038 80240238 00000000 */ nop /* BB303C 8024023C 46800020 */ cvt.s.w $f0, $f0 /* BB3040 80240240 E7A0001C */ swc1 $f0, 0x1c($sp) /* BB3044 80240244 8E040080 */ lw $a0, 0x80($s0) @@ -121,13 +121,13 @@ glabel func_802400A0_BB2EA0 /* BB306C 8024026C 1440FFE6 */ bnez $v0, .L80240208 /* BB3070 80240270 E600000C */ swc1 $f0, 0xc($s0) /* BB3074 80240274 080900AB */ j .L802402AC -/* BB3078 80240278 00000000 */ nop +/* BB3078 80240278 00000000 */ nop .L8024027C: /* BB307C 8024027C 0C00A67F */ jal rand_int /* BB3080 80240280 2404003C */ addiu $a0, $zero, 0x3c /* BB3084 80240284 C60C000C */ lwc1 $f12, 0xc($s0) /* BB3088 80240288 44820000 */ mtc1 $v0, $f0 -/* BB308C 8024028C 00000000 */ nop +/* BB308C 8024028C 00000000 */ nop /* BB3090 80240290 46800020 */ cvt.s.w $f0, $f0 /* BB3094 80240294 46006300 */ add.s $f12, $f12, $f0 /* BB3098 80240298 3C0141F0 */ lui $at, 0x41f0 diff --git a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_802402D0_BB30D0.s b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_802402D0_BB30D0.s index d7ca5c7896..9b253f5816 100644 --- a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_802402D0_BB30D0.s +++ b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_802402D0_BB30D0.s @@ -43,7 +43,7 @@ glabel func_802402D0_BB30D0 /* BB3168 80240368 2402000F */ addiu $v0, $zero, 0xf /* BB316C 8024036C AFA2001C */ sw $v0, 0x1c($sp) /* BB3170 80240370 44835000 */ mtc1 $v1, $f10 -/* BB3174 80240374 00000000 */ nop +/* BB3174 80240374 00000000 */ nop /* BB3178 80240378 468052A0 */ cvt.s.w $f10, $f10 /* BB317C 8024037C 44075000 */ mfc1 $a3, $f10 /* BB3180 80240380 27A20028 */ addiu $v0, $sp, 0x28 @@ -78,7 +78,7 @@ glabel func_802402D0_BB30D0 /* BB31E8 802403E8 44801800 */ mtc1 $zero, $f3 /* BB31EC 802403EC 46000021 */ cvt.d.s $f0, $f0 /* BB31F0 802403F0 4620103C */ c.lt.d $f2, $f0 -/* BB31F4 802403F4 00000000 */ nop +/* BB31F4 802403F4 00000000 */ nop /* BB31F8 802403F8 45000025 */ bc1f .L80240490 /* BB31FC 802403FC 27A5002C */ addiu $a1, $sp, 0x2c /* BB3200 80240400 C6000038 */ lwc1 $f0, 0x38($s0) @@ -88,7 +88,7 @@ glabel func_802402D0_BB30D0 /* BB3210 80240410 27A60030 */ addiu $a2, $sp, 0x30 /* BB3214 80240414 E7A0002C */ swc1 $f0, 0x2c($sp) /* BB3218 80240418 44820000 */ mtc1 $v0, $f0 -/* BB321C 8024041C 00000000 */ nop +/* BB321C 8024041C 00000000 */ nop /* BB3220 80240420 46800020 */ cvt.s.w $f0, $f0 /* BB3224 80240424 46000021 */ cvt.d.s $f0, $f0 /* BB3228 80240428 C604003C */ lwc1 $f4, 0x3c($s0) @@ -96,13 +96,13 @@ glabel func_802402D0_BB30D0 /* BB3230 80240430 C6080018 */ lwc1 $f8, 0x18($s0) /* BB3234 80240434 860200A8 */ lh $v0, 0xa8($s0) /* BB3238 80240438 46220002 */ mul.d $f0, $f0, $f2 -/* BB323C 8024043C 00000000 */ nop +/* BB323C 8024043C 00000000 */ nop /* BB3240 80240440 E7A40030 */ swc1 $f4, 0x30($sp) /* BB3244 80240444 E7A60034 */ swc1 $f6, 0x34($sp) /* BB3248 80240448 E7A80010 */ swc1 $f8, 0x10($sp) /* BB324C 8024044C C604000C */ lwc1 $f4, 0xc($s0) /* BB3250 80240450 44821000 */ mtc1 $v0, $f2 -/* BB3254 80240454 00000000 */ nop +/* BB3254 80240454 00000000 */ nop /* BB3258 80240458 468010A0 */ cvt.s.w $f2, $f2 /* BB325C 8024045C E7A20018 */ swc1 $f2, 0x18($sp) /* BB3260 80240460 E7A40014 */ swc1 $f4, 0x14($sp) @@ -123,7 +123,7 @@ glabel func_802402D0_BB30D0 /* BB3298 80240498 44801800 */ mtc1 $zero, $f3 /* BB329C 8024049C 46000021 */ cvt.d.s $f0, $f0 /* BB32A0 802404A0 4622003C */ c.lt.d $f0, $f2 -/* BB32A4 802404A4 00000000 */ nop +/* BB32A4 802404A4 00000000 */ nop /* BB32A8 802404A8 45000047 */ bc1f .L802405C8 /* BB32AC 802404AC 27A5002C */ addiu $a1, $sp, 0x2c /* BB32B0 802404B0 27A60030 */ addiu $a2, $sp, 0x30 @@ -154,7 +154,7 @@ glabel func_802402D0_BB30D0 /* BB3314 80240514 0C0372DF */ jal func_800DCB7C /* BB3318 80240518 27A70034 */ addiu $a3, $sp, 0x34 /* BB331C 8024051C 1040002A */ beqz $v0, .L802405C8 -/* BB3320 80240520 00000000 */ nop +/* BB3320 80240520 00000000 */ nop /* BB3324 80240524 C600001C */ lwc1 $f0, 0x1c($s0) /* BB3328 80240528 C7A20038 */ lwc1 $f2, 0x38($sp) /* BB332C 8024052C 46000005 */ abs.s $f0, $f0 @@ -162,7 +162,7 @@ glabel func_802402D0_BB30D0 /* BB3334 80240534 46340000 */ add.d $f0, $f0, $f20 /* BB3338 80240538 460010A1 */ cvt.d.s $f2, $f2 /* BB333C 8024053C 4620103E */ c.le.d $f2, $f0 -/* BB3340 80240540 00000000 */ nop +/* BB3340 80240540 00000000 */ nop /* BB3344 80240544 45000020 */ bc1f .L802405C8 /* BB3348 80240548 240403E8 */ addiu $a0, $zero, 0x3e8 /* BB334C 8024054C C7A00030 */ lwc1 $f0, 0x30($sp) @@ -193,7 +193,7 @@ glabel func_802402D0_BB30D0 /* BB33B0 802405B0 5840000C */ blezl $v0, .L802405E4 /* BB33B4 802405B4 AE600070 */ sw $zero, 0x70($s3) /* BB33B8 802405B8 1460000A */ bnez $v1, .L802405E4 -/* BB33BC 802405BC 00000000 */ nop +/* BB33BC 802405BC 00000000 */ nop /* BB33C0 802405C0 08090179 */ j .L802405E4 /* BB33C4 802405C4 AE600070 */ sw $zero, 0x70($s3) .L802405C8: diff --git a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_802406C8_BB34C8.s b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_802406C8_BB34C8.s index c16362cc0d..de3e53c3b0 100644 --- a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_802406C8_BB34C8.s +++ b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_802406C8_BB34C8.s @@ -38,7 +38,7 @@ glabel func_802406C8_BB34C8 /* BB354C 8024074C 2402000F */ addiu $v0, $zero, 0xf /* BB3550 80240750 AFA2001C */ sw $v0, 0x1c($sp) /* BB3554 80240754 44833000 */ mtc1 $v1, $f6 -/* BB3558 80240758 00000000 */ nop +/* BB3558 80240758 00000000 */ nop /* BB355C 8024075C 468031A0 */ cvt.s.w $f6, $f6 /* BB3560 80240760 44073000 */ mfc1 $a3, $f6 /* BB3564 80240764 27A20028 */ addiu $v0, $sp, 0x28 @@ -65,13 +65,13 @@ glabel func_802406C8_BB34C8 .L802407B8: /* BB35B8 802407B8 8602008C */ lh $v0, 0x8c($s0) /* BB35BC 802407BC 14400023 */ bnez $v0, .L8024084C -/* BB35C0 802407C0 00000000 */ nop +/* BB35C0 802407C0 00000000 */ nop /* BB35C4 802407C4 9602008E */ lhu $v0, 0x8e($s0) /* BB35C8 802407C8 2442FFFF */ addiu $v0, $v0, -1 /* BB35CC 802407CC A602008E */ sh $v0, 0x8e($s0) /* BB35D0 802407D0 00021400 */ sll $v0, $v0, 0x10 /* BB35D4 802407D4 1C40001D */ bgtz $v0, .L8024084C -/* BB35D8 802407D8 00000000 */ nop +/* BB35D8 802407D8 00000000 */ nop /* BB35DC 802407DC 8E820074 */ lw $v0, 0x74($s4) /* BB35E0 802407E0 2442FFFF */ addiu $v0, $v0, -1 /* BB35E4 802407E4 18400018 */ blez $v0, .L80240848 diff --git a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_8024086C_BB366C.s b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_8024086C_BB366C.s index f9c966c5a7..f6587f014d 100644 --- a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_8024086C_BB366C.s +++ b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_8024086C_BB366C.s @@ -24,7 +24,7 @@ glabel func_8024086C_BB366C /* BB36B8 802408B8 0C00A67F */ jal rand_int /* BB36BC 802408BC AE020000 */ sw $v0, ($s0) /* BB36C0 802408C0 44820000 */ mtc1 $v0, $f0 -/* BB36C4 802408C4 00000000 */ nop +/* BB36C4 802408C4 00000000 */ nop /* BB36C8 802408C8 46800021 */ cvt.d.w $f0, $f0 /* BB36CC 802408CC 3C014024 */ lui $at, 0x4024 /* BB36D0 802408D0 44811800 */ mtc1 $at, $f3 diff --git a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_8024094C_BB374C.s b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_8024094C_BB374C.s index 3412692157..496a8a7fca 100644 --- a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_8024094C_BB374C.s +++ b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_8024094C_BB374C.s @@ -25,7 +25,7 @@ glabel func_8024094C_BB374C /* BB379C 8024099C 44801800 */ mtc1 $zero, $f3 /* BB37A0 802409A0 46000021 */ cvt.d.s $f0, $f0 /* BB37A4 802409A4 4620103C */ c.lt.d $f2, $f0 -/* BB37A8 802409A8 00000000 */ nop +/* BB37A8 802409A8 00000000 */ nop /* BB37AC 802409AC 45000021 */ bc1f .L80240A34 /* BB37B0 802409B0 27A50028 */ addiu $a1, $sp, 0x28 /* BB37B4 802409B4 C6600038 */ lwc1 $f0, 0x38($s3) @@ -40,20 +40,20 @@ glabel func_8024094C_BB374C /* BB37D8 802409D8 E7A00014 */ swc1 $f0, 0x14($sp) /* BB37DC 802409DC 866200A8 */ lh $v0, 0xa8($s3) /* BB37E0 802409E0 44820000 */ mtc1 $v0, $f0 -/* BB37E4 802409E4 00000000 */ nop +/* BB37E4 802409E4 00000000 */ nop /* BB37E8 802409E8 46800020 */ cvt.s.w $f0, $f0 /* BB37EC 802409EC E7A00018 */ swc1 $f0, 0x18($sp) /* BB37F0 802409F0 866200A6 */ lh $v0, 0xa6($s3) /* BB37F4 802409F4 27A6002C */ addiu $a2, $sp, 0x2c /* BB37F8 802409F8 44820000 */ mtc1 $v0, $f0 -/* BB37FC 802409FC 00000000 */ nop +/* BB37FC 802409FC 00000000 */ nop /* BB3800 80240A00 46800020 */ cvt.s.w $f0, $f0 /* BB3804 80240A04 E7A0001C */ swc1 $f0, 0x1c($sp) /* BB3808 80240A08 8E640080 */ lw $a0, 0x80($s3) /* BB380C 80240A0C 0C037711 */ jal func_800DDC44 /* BB3810 80240A10 27A70030 */ addiu $a3, $sp, 0x30 /* BB3814 80240A14 10400003 */ beqz $v0, .L80240A24 -/* BB3818 80240A18 00000000 */ nop +/* BB3818 80240A18 00000000 */ nop /* BB381C 80240A1C 0809028D */ j .L80240A34 /* BB3820 80240A20 AE600018 */ sw $zero, 0x18($s3) .L80240A24: @@ -67,7 +67,7 @@ glabel func_8024094C_BB374C /* BB383C 80240A3C 44801800 */ mtc1 $zero, $f3 /* BB3840 80240A40 46000021 */ cvt.d.s $f0, $f0 /* BB3844 80240A44 4622003C */ c.lt.d $f0, $f2 -/* BB3848 80240A48 00000000 */ nop +/* BB3848 80240A48 00000000 */ nop /* BB384C 80240A4C 4500006C */ bc1f .L80240C00 /* BB3850 80240A50 27B00028 */ addiu $s0, $sp, 0x28 /* BB3854 80240A54 0200282D */ daddu $a1, $s0, $zero @@ -116,7 +116,7 @@ glabel func_8024094C_BB374C /* BB3900 80240B00 0C0372DF */ jal func_800DCB7C /* BB3904 80240B04 0220382D */ daddu $a3, $s1, $zero /* BB3908 80240B08 1040003D */ beqz $v0, .L80240C00 -/* BB390C 80240B0C 00000000 */ nop +/* BB390C 80240B0C 00000000 */ nop /* BB3910 80240B10 C660001C */ lwc1 $f0, 0x1c($s3) /* BB3914 80240B14 C7A20038 */ lwc1 $f2, 0x38($sp) /* BB3918 80240B18 46000005 */ abs.s $f0, $f0 @@ -124,7 +124,7 @@ glabel func_8024094C_BB374C /* BB3920 80240B20 46340000 */ add.d $f0, $f0, $f20 /* BB3924 80240B24 460010A1 */ cvt.d.s $f2, $f2 /* BB3928 80240B28 4620103E */ c.le.d $f2, $f0 -/* BB392C 80240B2C 00000000 */ nop +/* BB392C 80240B2C 00000000 */ nop /* BB3930 80240B30 45000033 */ bc1f .L80240C00 /* BB3934 80240B34 2403F7FF */ addiu $v1, $zero, -0x801 /* BB3938 80240B38 C7A0002C */ lwc1 $f0, 0x2c($sp) @@ -163,7 +163,7 @@ glabel func_8024094C_BB374C /* BB39BC 80240BBC 2402000F */ addiu $v0, $zero, 0xf /* BB39C0 80240BC0 AFA2001C */ sw $v0, 0x1c($sp) /* BB39C4 80240BC4 44834000 */ mtc1 $v1, $f8 -/* BB39C8 80240BC8 00000000 */ nop +/* BB39C8 80240BC8 00000000 */ nop /* BB39CC 80240BCC 46804220 */ cvt.s.w $f8, $f8 /* BB39D0 80240BD0 44074000 */ mfc1 $a3, $f8 /* BB39D4 80240BD4 27A2003C */ addiu $v0, $sp, 0x3c diff --git a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s index 920abea87f..bf5cfc3f4f 100644 --- a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s +++ b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s @@ -76,7 +76,7 @@ glabel func_80240C90_BB3A90 /* BB3BA8 80240DA8 8E4300B0 */ lw $v1, 0xb0($s2) /* BB3BAC 80240DAC 30620004 */ andi $v0, $v1, 4 /* BB3BB0 80240DB0 10400007 */ beqz $v0, .L80240DD0 -/* BB3BB4 80240DB4 00000000 */ nop +/* BB3BB4 80240DB4 00000000 */ nop /* BB3BB8 80240DB8 824200B4 */ lb $v0, 0xb4($s2) /* BB3BBC 80240DBC 14400034 */ bnez $v0, .L80240E90 /* BB3BC0 80240DC0 0000102D */ daddu $v0, $zero, $zero @@ -88,21 +88,24 @@ glabel func_80240C90_BB3A90 /* BB3BD4 80240DD4 2C62000F */ sltiu $v0, $v1, 0xf /* BB3BD8 80240DD8 1040002C */ beqz $v0, .L80240E8C /* BB3BDC 80240DDC 00031080 */ sll $v0, $v1, 2 -/* BB3BE0 80240DE0 3C018024 */ lui $at, %hi(D_80242B98) +/* BB3BE0 80240DE0 3C018024 */ lui $at, %hi(jtbl_80242B98_BB5998) /* BB3BE4 80240DE4 00220821 */ addu $at, $at, $v0 -/* BB3BE8 80240DE8 8C222B98 */ lw $v0, %lo(D_80242B98)($at) +/* BB3BE8 80240DE8 8C222B98 */ lw $v0, %lo(jtbl_80242B98_BB5998)($at) /* BB3BEC 80240DEC 00400008 */ jr $v0 -/* BB3BF0 80240DF0 00000000 */ nop +/* BB3BF0 80240DF0 00000000 */ nop +glabel L80240DF4_BB3BF4 /* BB3BF4 80240DF4 0260202D */ daddu $a0, $s3, $zero /* BB3BF8 80240DF8 0280282D */ daddu $a1, $s4, $zero /* BB3BFC 80240DFC 0C090028 */ jal func_802400A0_BB2EA0 /* BB3C00 80240E00 0200302D */ daddu $a2, $s0, $zero +glabel L80240E04_BB3C04 /* BB3C04 80240E04 0260202D */ daddu $a0, $s3, $zero /* BB3C08 80240E08 0280282D */ daddu $a1, $s4, $zero /* BB3C0C 80240E0C 0C0900B4 */ jal func_802402D0_BB30D0 /* BB3C10 80240E10 0200302D */ daddu $a2, $s0, $zero /* BB3C14 80240E14 080903A4 */ j .L80240E90 /* BB3C18 80240E18 0000102D */ daddu $v0, $zero, $zero +glabel L80240E1C_BB3C1C /* BB3C1C 80240E1C 0260202D */ daddu $a0, $s3, $zero /* BB3C20 80240E20 0280282D */ daddu $a1, $s4, $zero /* BB3C24 80240E24 0C090182 */ jal mim_09_UnkNpcAIFunc1 @@ -111,27 +114,32 @@ glabel func_80240C90_BB3A90 /* BB3C30 80240E30 24020003 */ addiu $v0, $zero, 3 /* BB3C34 80240E34 14620016 */ bne $v1, $v0, .L80240E90 /* BB3C38 80240E38 0000102D */ daddu $v0, $zero, $zero +glabel L80240E3C_BB3C3C /* BB3C3C 80240E3C 0260202D */ daddu $a0, $s3, $zero /* BB3C40 80240E40 0280282D */ daddu $a1, $s4, $zero /* BB3C44 80240E44 0C0901B2 */ jal func_802406C8_BB34C8 /* BB3C48 80240E48 0200302D */ daddu $a2, $s0, $zero /* BB3C4C 80240E4C 080903A4 */ j .L80240E90 /* BB3C50 80240E50 0000102D */ daddu $v0, $zero, $zero +glabel L80240E54_BB3C54 /* BB3C54 80240E54 0260202D */ daddu $a0, $s3, $zero /* BB3C58 80240E58 0280282D */ daddu $a1, $s4, $zero /* BB3C5C 80240E5C 0C09021B */ jal func_8024086C_BB366C /* BB3C60 80240E60 0200302D */ daddu $a2, $s0, $zero +glabel L80240E64_BB3C64 /* BB3C64 80240E64 0260202D */ daddu $a0, $s3, $zero /* BB3C68 80240E68 0280282D */ daddu $a1, $s4, $zero /* BB3C6C 80240E6C 0C090253 */ jal func_8024094C_BB374C /* BB3C70 80240E70 0200302D */ daddu $a2, $s0, $zero /* BB3C74 80240E74 080903A4 */ j .L80240E90 /* BB3C78 80240E78 0000102D */ daddu $v0, $zero, $zero +glabel L80240E7C_BB3C7C /* BB3C7C 80240E7C 0260202D */ daddu $a0, $s3, $zero /* BB3C80 80240E80 0280282D */ daddu $a1, $s4, $zero /* BB3C84 80240E84 0C090313 */ jal mim_09_UnkDurationCheck /* BB3C88 80240E88 0200302D */ daddu $a2, $s0, $zero .L80240E8C: +glabel L80240E8C_BB3C8C /* BB3C8C 80240E8C 0000102D */ daddu $v0, $zero, $zero .L80240E90: /* BB3C90 80240E90 8FBF0048 */ lw $ra, 0x48($sp) @@ -143,6 +151,6 @@ glabel func_80240C90_BB3A90 /* BB3CA8 80240EA8 8FB00030 */ lw $s0, 0x30($sp) /* BB3CAC 80240EAC 03E00008 */ jr $ra /* BB3CB0 80240EB0 27BD0050 */ addiu $sp, $sp, 0x50 -/* BB3CB4 80240EB4 00000000 */ nop -/* BB3CB8 80240EB8 00000000 */ nop -/* BB3CBC 80240EBC 00000000 */ nop +/* BB3CB4 80240EB4 00000000 */ nop +/* BB3CB8 80240EB8 00000000 */ nop +/* BB3CBC 80240EBC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240000_BB59E0.s b/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240000_BB59E0.s index 7b2ec932d9..ebef8d814c 100644 --- a/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240000_BB59E0.s +++ b/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240000_BB59E0.s @@ -6,12 +6,12 @@ glabel func_80240000_BB59E0 /* BB59E4 80240004 C422EFF0 */ lwc1 $f2, %lo(gPlayerStatus+0x28)($at) /* BB59E8 80240008 3C0142C8 */ lui $at, 0x42c8 /* BB59EC 8024000C 44810000 */ mtc1 $at, $f0 -/* BB59F0 80240010 00000000 */ nop +/* BB59F0 80240010 00000000 */ nop /* BB59F4 80240014 4600103C */ c.lt.s $f2, $f0 -/* BB59F8 80240018 00000000 */ nop +/* BB59F8 80240018 00000000 */ nop /* BB59FC 8024001C 45010002 */ bc1t .L80240028 /* BB5A00 80240020 0000102D */ daddu $v0, $zero, $zero /* BB5A04 80240024 24020002 */ addiu $v0, $zero, 2 .L80240028: /* BB5A08 80240028 03E00008 */ jr $ra -/* BB5A0C 8024002C 00000000 */ nop +/* BB5A0C 8024002C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240030_BB5A10.s b/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240030_BB5A10.s index e9b359fc9b..436c60fbb3 100644 --- a/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240030_BB5A10.s +++ b/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240030_BB5A10.s @@ -5,7 +5,7 @@ glabel func_80240030_BB5A10 /* BB5A10 80240030 27BDFFE8 */ addiu $sp, $sp, -0x18 /* BB5A14 80240034 AFBF0010 */ sw $ra, 0x10($sp) /* BB5A18 80240038 0C046ED4 */ jal enable_world_fog -/* BB5A1C 8024003C 00000000 */ nop +/* BB5A1C 8024003C 00000000 */ nop /* BB5A20 80240040 24040010 */ addiu $a0, $zero, 0x10 /* BB5A24 80240044 0080282D */ daddu $a1, $a0, $zero /* BB5A28 80240048 0080302D */ daddu $a2, $a0, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240080_BB5A60.s b/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240080_BB5A60.s index 414b0ebfdd..fdc8d9024b 100644 --- a/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240080_BB5A60.s +++ b/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240080_BB5A60.s @@ -5,7 +5,7 @@ glabel func_80240080_BB5A60 /* BB5A60 80240080 27BDFFE8 */ addiu $sp, $sp, -0x18 /* BB5A64 80240084 AFBF0010 */ sw $ra, 0x10($sp) /* BB5A68 80240088 0C046ED4 */ jal enable_world_fog -/* BB5A6C 8024008C 00000000 */ nop +/* BB5A6C 8024008C 00000000 */ nop /* BB5A70 80240090 240403DE */ addiu $a0, $zero, 0x3de /* BB5A74 80240094 0C046EDD */ jal set_world_fog_dist /* BB5A78 80240098 240503E8 */ addiu $a1, $zero, 0x3e8 diff --git a/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240148_BB5B28.s b/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240148_BB5B28.s index f0c5f47e25..d6b714392c 100644 --- a/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240148_BB5B28.s +++ b/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240148_BB5B28.s @@ -11,7 +11,7 @@ glabel func_80240148_BB5B28 /* BB5B3C 8024015C AC820074 */ sw $v0, 0x74($a0) /* BB5B40 80240160 284200F0 */ slti $v0, $v0, 0xf0 /* BB5B44 80240164 14400004 */ bnez $v0, .L80240178 -/* BB5B48 80240168 00000000 */ nop +/* BB5B48 80240168 00000000 */ nop /* BB5B4C 8024016C 240200F0 */ addiu $v0, $zero, 0xf0 /* BB5B50 80240170 AC820074 */ sw $v0, 0x74($a0) /* BB5B54 80240174 24060002 */ addiu $a2, $zero, 2 diff --git a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240034_BB70A4.s b/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240034_BB70A4.s index 07aaa69106..5ce99c2ead 100644 --- a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240034_BB70A4.s +++ b/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240034_BB70A4.s @@ -22,16 +22,16 @@ glabel func_80240034_BB70A4 /* BB70E4 80240074 00021023 */ negu $v0, $v0 .L80240078: /* BB70E8 80240078 14400003 */ bnez $v0, .L80240088 -/* BB70EC 8024007C 00000000 */ nop +/* BB70EC 8024007C 00000000 */ nop /* BB70F0 80240080 50E00017 */ beql $a3, $zero, .L802400E0 /* BB70F4 80240084 0000102D */ daddu $v0, $zero, $zero .L80240088: /* BB70F8 80240088 44822000 */ mtc1 $v0, $f4 -/* BB70FC 8024008C 00000000 */ nop +/* BB70FC 8024008C 00000000 */ nop /* BB7100 80240090 46802120 */ cvt.s.w $f4, $f4 /* BB7104 80240094 44062000 */ mfc1 $a2, $f4 /* BB7108 80240098 44872000 */ mtc1 $a3, $f4 -/* BB710C 8024009C 00000000 */ nop +/* BB710C 8024009C 00000000 */ nop /* BB7110 802400A0 46802120 */ cvt.s.w $f4, $f4 /* BB7114 802400A4 44806000 */ mtc1 $zero, $f12 /* BB7118 802400A8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240034_BB70A4 /* BB7120 802400B0 46006386 */ mov.s $f14, $f12 /* BB7124 802400B4 3C014270 */ lui $at, 0x4270 /* BB7128 802400B8 44811000 */ mtc1 $at, $f2 -/* BB712C 802400BC 00000000 */ nop +/* BB712C 802400BC 00000000 */ nop /* BB7130 802400C0 4602003C */ c.lt.s $f0, $f2 -/* BB7134 802400C4 00000000 */ nop +/* BB7134 802400C4 00000000 */ nop /* BB7138 802400C8 45000004 */ bc1f .L802400DC /* BB713C 802400CC 24020001 */ addiu $v0, $zero, 1 /* BB7140 802400D0 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_802405EC_BB765C.s b/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_802405EC_BB765C.s index 101fcb9892..03b0e76475 100644 --- a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_802405EC_BB765C.s +++ b/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_802405EC_BB765C.s @@ -5,7 +5,7 @@ glabel func_802405EC_BB765C /* BB765C 802405EC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* BB7660 802405F0 AFBF0010 */ sw $ra, 0x10($sp) /* BB7664 802405F4 0C046ED4 */ jal enable_world_fog -/* BB7668 802405F8 00000000 */ nop +/* BB7668 802405F8 00000000 */ nop /* BB766C 802405FC 240403C0 */ addiu $a0, $zero, 0x3c0 /* BB7670 80240600 0C046EDD */ jal set_world_fog_dist /* BB7674 80240604 240503E8 */ addiu $a1, $zero, 0x3e8 @@ -15,7 +15,7 @@ glabel func_802405EC_BB765C /* BB7684 80240614 0C046EE2 */ jal set_world_fog_color /* BB7688 80240618 240700FF */ addiu $a3, $zero, 0xff /* BB768C 8024061C 0C048BFB */ jal enable_entity_fog -/* BB7690 80240620 00000000 */ nop +/* BB7690 80240620 00000000 */ nop /* BB7694 80240624 240403DE */ addiu $a0, $zero, 0x3de /* BB7698 80240628 0C048C04 */ jal set_entity_fog_dist /* BB769C 8024062C 240503E8 */ addiu $a1, $zero, 0x3e8 diff --git a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_8024066C_BB76DC.s b/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_8024066C_BB76DC.s index 99639e6290..e6dd94739b 100644 --- a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_8024066C_BB76DC.s +++ b/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_8024066C_BB76DC.s @@ -26,9 +26,9 @@ glabel func_8024066C_BB76DC /* BB772C 802406BC 10600005 */ beqz $v1, .L802406D4 /* BB7730 802406C0 24020001 */ addiu $v0, $zero, 1 /* BB7734 802406C4 1062000C */ beq $v1, $v0, .L802406F8 -/* BB7738 802406C8 00000000 */ nop +/* BB7738 802406C8 00000000 */ nop /* BB773C 802406CC 080901C9 */ j .L80240724 -/* BB7740 802406D0 00000000 */ nop +/* BB7740 802406D0 00000000 */ nop .L802406D4: /* BB7744 802406D4 8CC20078 */ lw $v0, 0x78($a2) /* BB7748 802406D8 8CC3007C */ lw $v1, 0x7c($a2) @@ -58,10 +58,10 @@ glabel func_8024066C_BB76DC /* BB77A0 80240730 C4C00078 */ lwc1 $f0, 0x78($a2) /* BB77A4 80240734 46800020 */ cvt.s.w $f0, $f0 /* BB77A8 80240738 46020002 */ mul.s $f0, $f0, $f2 -/* BB77AC 8024073C 00000000 */ nop +/* BB77AC 8024073C 00000000 */ nop /* BB77B0 80240740 3C014220 */ lui $at, 0x4220 /* BB77B4 80240744 44811000 */ mtc1 $at, $f2 -/* BB77B8 80240748 00000000 */ nop +/* BB77B8 80240748 00000000 */ nop /* BB77BC 8024074C 46020000 */ add.s $f0, $f0, $f2 /* BB77C0 80240750 3C013B29 */ lui $at, 0x3b29 /* BB77C4 80240754 34214D24 */ ori $at, $at, 0x4d24 @@ -70,11 +70,11 @@ glabel func_8024066C_BB76DC /* BB77D0 80240760 C4C00078 */ lwc1 $f0, 0x78($a2) /* BB77D4 80240764 46800020 */ cvt.s.w $f0, $f0 /* BB77D8 80240768 46020002 */ mul.s $f0, $f0, $f2 -/* BB77DC 8024076C 00000000 */ nop +/* BB77DC 8024076C 00000000 */ nop /* BB77E0 80240770 3C01C27E */ lui $at, 0xc27e /* BB77E4 80240774 34216666 */ ori $at, $at, 0x6666 /* BB77E8 80240778 44811000 */ mtc1 $at, $f2 -/* BB77EC 8024077C 00000000 */ nop +/* BB77EC 8024077C 00000000 */ nop /* BB77F0 80240780 46020000 */ add.s $f0, $f0, $f2 /* BB77F4 80240784 00E0102D */ daddu $v0, $a3, $zero /* BB77F8 80240788 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240790_BB7800.s b/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240790_BB7800.s index f2df7a421a..2e02259ea3 100644 --- a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240790_BB7800.s +++ b/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240790_BB7800.s @@ -33,40 +33,40 @@ glabel func_80240790_BB7800 /* BB786C 802407FC 46160501 */ sub.s $f20, $f0, $f22 /* BB7870 80240800 3C014220 */ lui $at, 0x4220 /* BB7874 80240804 44810000 */ mtc1 $at, $f0 -/* BB7878 80240808 00000000 */ nop +/* BB7878 80240808 00000000 */ nop /* BB787C 8024080C 4600A503 */ div.s $f20, $f20, $f0 /* BB7880 80240810 C6000074 */ lwc1 $f0, 0x74($s0) /* BB7884 80240814 46800020 */ cvt.s.w $f0, $f0 /* BB7888 80240818 4600A502 */ mul.s $f20, $f20, $f0 -/* BB788C 8024081C 00000000 */ nop +/* BB788C 8024081C 00000000 */ nop /* BB7890 80240820 4616A500 */ add.s $f20, $f20, $f22 /* BB7894 80240824 3C0142C8 */ lui $at, 0x42c8 /* BB7898 80240828 4481B000 */ mtc1 $at, $f22 /* BB789C 8024082C 0C00A8BB */ jal sin_deg /* BB78A0 80240830 4600A306 */ mov.s $f12, $f20 /* BB78A4 80240834 46160002 */ mul.s $f0, $f0, $f22 -/* BB78A8 80240838 00000000 */ nop +/* BB78A8 80240838 00000000 */ nop /* BB78AC 8024083C 4600A306 */ mov.s $f12, $f20 /* BB78B0 80240840 4600008D */ trunc.w.s $f2, $f0 /* BB78B4 80240844 44021000 */ mfc1 $v0, $f2 -/* BB78B8 80240848 00000000 */ nop +/* BB78B8 80240848 00000000 */ nop /* BB78BC 8024084C 24420059 */ addiu $v0, $v0, 0x59 /* BB78C0 80240850 44820000 */ mtc1 $v0, $f0 -/* BB78C4 80240854 00000000 */ nop +/* BB78C4 80240854 00000000 */ nop /* BB78C8 80240858 46800020 */ cvt.s.w $f0, $f0 /* BB78CC 8024085C 0C00A8D4 */ jal cos_deg /* BB78D0 80240860 E62004B0 */ swc1 $f0, 0x4b0($s1) /* BB78D4 80240864 46000007 */ neg.s $f0, $f0 /* BB78D8 80240868 46160002 */ mul.s $f0, $f0, $f22 -/* BB78DC 8024086C 00000000 */ nop +/* BB78DC 8024086C 00000000 */ nop /* BB78E0 80240870 24020001 */ addiu $v0, $zero, 1 /* BB78E4 80240874 A6220506 */ sh $v0, 0x506($s1) /* BB78E8 80240878 4600008D */ trunc.w.s $f2, $f0 /* BB78EC 8024087C 44021000 */ mfc1 $v0, $f2 -/* BB78F0 80240880 00000000 */ nop +/* BB78F0 80240880 00000000 */ nop /* BB78F4 80240884 24420054 */ addiu $v0, $v0, 0x54 /* BB78F8 80240888 44820000 */ mtc1 $v0, $f0 -/* BB78FC 8024088C 00000000 */ nop +/* BB78FC 8024088C 00000000 */ nop /* BB7900 80240890 46800020 */ cvt.s.w $f0, $f0 /* BB7904 80240894 E62004B8 */ swc1 $f0, 0x4b8($s1) /* BB7908 80240898 8E020074 */ lw $v0, 0x74($s0) @@ -82,4 +82,4 @@ glabel func_80240790_BB7800 /* BB7930 802408C0 00021040 */ sll $v0, $v0, 1 /* BB7934 802408C4 03E00008 */ jr $ra /* BB7938 802408C8 27BD0030 */ addiu $sp, $sp, 0x30 -/* BB793C 802408CC 00000000 */ nop +/* BB793C 802408CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_11/BB7940/func_802408D0_BB7940.s b/asm/nonmatchings/world/area_mim/mim_11/BB7940/func_802408D0_BB7940.s index c09b334cf2..8ae3d8401e 100644 --- a/asm/nonmatchings/world/area_mim/mim_11/BB7940/func_802408D0_BB7940.s +++ b/asm/nonmatchings/world/area_mim/mim_11/BB7940/func_802408D0_BB7940.s @@ -5,7 +5,7 @@ glabel func_802408D0_BB7940 /* BB7940 802408D0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* BB7944 802408D4 AFBF0010 */ sw $ra, 0x10($sp) /* BB7948 802408D8 0C03A86D */ jal increment_max_SP -/* BB794C 802408DC 00000000 */ nop +/* BB794C 802408DC 00000000 */ nop /* BB7950 802408E0 8FBF0010 */ lw $ra, 0x10($sp) /* BB7954 802408E4 24020002 */ addiu $v0, $zero, 2 /* BB7958 802408E8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_mim/mim_11/BB7940/func_802408F0_BB7960.s b/asm/nonmatchings/world/area_mim/mim_11/BB7940/func_802408F0_BB7960.s index c8c429a451..c8e3e2ca03 100644 --- a/asm/nonmatchings/world/area_mim/mim_11/BB7940/func_802408F0_BB7960.s +++ b/asm/nonmatchings/world/area_mim/mim_11/BB7940/func_802408F0_BB7960.s @@ -18,14 +18,14 @@ glabel func_802408F0_BB7960 /* BB7990 80240920 8E300078 */ lw $s0, 0x78($s1) /* BB7994 80240924 3C0140C0 */ lui $at, 0x40c0 /* BB7998 80240928 44811000 */ mtc1 $at, $f2 -/* BB799C 8024092C 00000000 */ nop +/* BB799C 8024092C 00000000 */ nop /* BB79A0 80240930 46020002 */ mul.s $f0, $f0, $f2 -/* BB79A4 80240934 00000000 */ nop +/* BB79A4 80240934 00000000 */ nop /* BB79A8 80240938 3C014190 */ lui $at, 0x4190 /* BB79AC 8024093C 44816000 */ mtc1 $at, $f12 /* BB79B0 80240940 4600010D */ trunc.w.s $f4, $f0 /* BB79B4 80240944 44022000 */ mfc1 $v0, $f4 -/* BB79B8 80240948 00000000 */ nop +/* BB79B8 80240948 00000000 */ nop /* BB79BC 8024094C A20200AB */ sb $v0, 0xab($s0) /* BB79C0 80240950 C6200074 */ lwc1 $f0, 0x74($s1) /* BB79C4 80240954 0C00A6C9 */ jal clamp_angle @@ -37,5 +37,5 @@ glabel func_802408F0_BB7960 /* BB79DC 8024096C 0000102D */ daddu $v0, $zero, $zero /* BB79E0 80240970 03E00008 */ jr $ra /* BB79E4 80240974 27BD0020 */ addiu $sp, $sp, 0x20 -/* BB79E8 80240978 00000000 */ nop -/* BB79EC 8024097C 00000000 */ nop +/* BB79E8 80240978 00000000 */ nop +/* BB79EC 8024097C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_80240000_BBB380.s b/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_80240000_BBB380.s index c396d17857..e34af444ed 100644 --- a/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_80240000_BBB380.s +++ b/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_80240000_BBB380.s @@ -5,7 +5,7 @@ glabel func_80240000_BBB380 /* BBB380 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 /* BBB384 80240004 AFBF0010 */ sw $ra, 0x10($sp) /* BBB388 80240008 0C046ED4 */ jal enable_world_fog -/* BBB38C 8024000C 00000000 */ nop +/* BBB38C 8024000C 00000000 */ nop /* BBB390 80240010 240403DE */ addiu $a0, $zero, 0x3de /* BBB394 80240014 0C046EDD */ jal set_world_fog_dist /* BBB398 80240018 240503E8 */ addiu $a1, $zero, 0x3e8 diff --git a/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_80240064_BBB3E4.s b/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_80240064_BBB3E4.s index 759a639dcd..0f4c5f1a30 100644 --- a/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_80240064_BBB3E4.s +++ b/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_80240064_BBB3E4.s @@ -5,7 +5,7 @@ glabel func_80240064_BBB3E4 /* BBB3E4 80240064 27BDFFE8 */ addiu $sp, $sp, -0x18 /* BBB3E8 80240068 AFBF0010 */ sw $ra, 0x10($sp) /* BBB3EC 8024006C 0C046ED4 */ jal enable_world_fog -/* BBB3F0 80240070 00000000 */ nop +/* BBB3F0 80240070 00000000 */ nop /* BBB3F4 80240074 240403D4 */ addiu $a0, $zero, 0x3d4 /* BBB3F8 80240078 0C046EDD */ jal set_world_fog_dist /* BBB3FC 8024007C 240503E8 */ addiu $a1, $zero, 0x3e8 diff --git a/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_802400CC_BBB44C.s b/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_802400CC_BBB44C.s index d6b5d3aa5a..b12fc1f9c5 100644 --- a/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_802400CC_BBB44C.s +++ b/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_802400CC_BBB44C.s @@ -44,7 +44,7 @@ glabel func_802400CC_BBB44C /* BBB4E0 80240160 0062102A */ slt $v0, $v1, $v0 .L80240164: /* BBB4E4 80240164 14400003 */ bnez $v0, .L80240174 -/* BBB4E8 80240168 00000000 */ nop +/* BBB4E8 80240168 00000000 */ nop /* BBB4EC 8024016C AE230074 */ sw $v1, 0x74($s1) /* BBB4F0 80240170 24120002 */ addiu $s2, $zero, 2 .L80240174: diff --git a/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_8024019C_BBB51C.s b/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_8024019C_BBB51C.s index 815208b69c..dfb86f0166 100644 --- a/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_8024019C_BBB51C.s +++ b/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_8024019C_BBB51C.s @@ -39,7 +39,7 @@ glabel func_8024019C_BBB51C /* BBB59C 8024021C 0062102A */ slt $v0, $v1, $v0 .L80240220: /* BBB5A0 80240220 14400003 */ bnez $v0, .L80240230 -/* BBB5A4 80240224 00000000 */ nop +/* BBB5A4 80240224 00000000 */ nop /* BBB5A8 80240228 AE230074 */ sw $v1, 0x74($s1) /* BBB5AC 8024022C 24120002 */ addiu $s2, $zero, 2 .L80240230: diff --git a/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_8024025C_BBB5DC.s b/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_8024025C_BBB5DC.s index 9cc3417110..cddfcf9499 100644 --- a/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_8024025C_BBB5DC.s +++ b/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_8024025C_BBB5DC.s @@ -55,9 +55,9 @@ glabel func_8024025C_BBB5DC /* BBB6A0 80240320 0000202D */ daddu $a0, $zero, $zero /* BBB6A4 80240324 3C014F00 */ lui $at, 0x4f00 /* BBB6A8 80240328 44811000 */ mtc1 $at, $f2 -/* BBB6AC 8024032C 00000000 */ nop +/* BBB6AC 8024032C 00000000 */ nop /* BBB6B0 80240330 4600103E */ c.le.s $f2, $f0 -/* BBB6B4 80240334 00000000 */ nop +/* BBB6B4 80240334 00000000 */ nop /* BBB6B8 80240338 45010005 */ bc1t .L80240350 /* BBB6BC 8024033C 264400AC */ addiu $a0, $s2, 0xac /* BBB6C0 80240340 4600010D */ trunc.w.s $f4, $f0 @@ -69,7 +69,7 @@ glabel func_8024025C_BBB5DC /* BBB6D4 80240354 3C028000 */ lui $v0, 0x8000 /* BBB6D8 80240358 4600010D */ trunc.w.s $f4, $f0 /* BBB6DC 8024035C 44032000 */ mfc1 $v1, $f4 -/* BBB6E0 80240360 00000000 */ nop +/* BBB6E0 80240360 00000000 */ nop /* BBB6E4 80240364 00621825 */ or $v1, $v1, $v0 /* BBB6E8 80240368 A0830000 */ sb $v1, ($a0) .L8024036C: @@ -86,9 +86,9 @@ glabel func_8024025C_BBB5DC /* BBB714 80240394 0000202D */ daddu $a0, $zero, $zero /* BBB718 80240398 3C014F00 */ lui $at, 0x4f00 /* BBB71C 8024039C 44811000 */ mtc1 $at, $f2 -/* BBB720 802403A0 00000000 */ nop +/* BBB720 802403A0 00000000 */ nop /* BBB724 802403A4 4600103E */ c.le.s $f2, $f0 -/* BBB728 802403A8 00000000 */ nop +/* BBB728 802403A8 00000000 */ nop /* BBB72C 802403AC 45010005 */ bc1t .L802403C4 /* BBB730 802403B0 264400AD */ addiu $a0, $s2, 0xad /* BBB734 802403B4 4600010D */ trunc.w.s $f4, $f0 @@ -100,7 +100,7 @@ glabel func_8024025C_BBB5DC /* BBB748 802403C8 3C028000 */ lui $v0, 0x8000 /* BBB74C 802403CC 4600010D */ trunc.w.s $f4, $f0 /* BBB750 802403D0 44032000 */ mfc1 $v1, $f4 -/* BBB754 802403D4 00000000 */ nop +/* BBB754 802403D4 00000000 */ nop /* BBB758 802403D8 00621825 */ or $v1, $v1, $v0 /* BBB75C 802403DC A0830000 */ sb $v1, ($a0) .L802403E0: @@ -117,9 +117,9 @@ glabel func_8024025C_BBB5DC /* BBB788 80240408 0000202D */ daddu $a0, $zero, $zero /* BBB78C 8024040C 3C014F00 */ lui $at, 0x4f00 /* BBB790 80240410 44811000 */ mtc1 $at, $f2 -/* BBB794 80240414 00000000 */ nop +/* BBB794 80240414 00000000 */ nop /* BBB798 80240418 4600103E */ c.le.s $f2, $f0 -/* BBB79C 8024041C 00000000 */ nop +/* BBB79C 8024041C 00000000 */ nop /* BBB7A0 80240420 45010005 */ bc1t .L80240438 /* BBB7A4 80240424 264400AE */ addiu $a0, $s2, 0xae /* BBB7A8 80240428 4600010D */ trunc.w.s $f4, $f0 @@ -131,7 +131,7 @@ glabel func_8024025C_BBB5DC /* BBB7BC 8024043C 3C028000 */ lui $v0, 0x8000 /* BBB7C0 80240440 4600010D */ trunc.w.s $f4, $f0 /* BBB7C4 80240444 44032000 */ mfc1 $v1, $f4 -/* BBB7C8 80240448 00000000 */ nop +/* BBB7C8 80240448 00000000 */ nop /* BBB7CC 8024044C 00621825 */ or $v1, $v1, $v0 /* BBB7D0 80240450 A0830000 */ sb $v1, ($a0) .L80240454: diff --git a/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_802404A8_BBB828.s b/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_802404A8_BBB828.s index 576eacda73..ae8aac9d37 100644 --- a/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_802404A8_BBB828.s +++ b/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_802404A8_BBB828.s @@ -29,7 +29,7 @@ glabel func_802404A8_BBB828 .L80240508: /* BBB888 80240508 8E22009C */ lw $v0, 0x9c($s1) /* BBB88C 8024050C 1C400003 */ bgtz $v0, .L8024051C -/* BBB890 80240510 00000000 */ nop +/* BBB890 80240510 00000000 */ nop /* BBB894 80240514 08090172 */ j .L802405C8 /* BBB898 80240518 24020002 */ addiu $v0, $zero, 2 .L8024051C: @@ -42,7 +42,7 @@ glabel func_802404A8_BBB828 /* BBB8B4 80240534 4600018D */ trunc.w.s $f6, $f0 /* BBB8B8 80240538 E7A60010 */ swc1 $f6, 0x10($sp) /* BBB8BC 8024053C 44820000 */ mtc1 $v0, $f0 -/* BBB8C0 80240540 00000000 */ nop +/* BBB8C0 80240540 00000000 */ nop /* BBB8C4 80240544 46800020 */ cvt.s.w $f0, $f0 /* BBB8C8 80240548 44051000 */ mfc1 $a1, $f2 /* BBB8CC 8024054C 44062000 */ mfc1 $a2, $f4 @@ -58,7 +58,7 @@ glabel func_802404A8_BBB828 /* BBB8F4 80240574 C62200A0 */ lwc1 $f2, 0xa0($s1) /* BBB8F8 80240578 468010A0 */ cvt.s.w $f2, $f2 /* BBB8FC 8024057C 46001082 */ mul.s $f2, $f2, $f0 -/* BBB900 80240580 00000000 */ nop +/* BBB900 80240580 00000000 */ nop /* BBB904 80240584 C6200088 */ lwc1 $f0, 0x88($s1) /* BBB908 80240588 46800020 */ cvt.s.w $f0, $f0 /* BBB90C 8024058C 46020000 */ add.s $f0, $f0, $f2 @@ -67,7 +67,7 @@ glabel func_802404A8_BBB828 /* BBB918 80240598 C62200A0 */ lwc1 $f2, 0xa0($s1) /* BBB91C 8024059C 468010A0 */ cvt.s.w $f2, $f2 /* BBB920 802405A0 46001082 */ mul.s $f2, $f2, $f0 -/* BBB924 802405A4 00000000 */ nop +/* BBB924 802405A4 00000000 */ nop /* BBB928 802405A8 C620008C */ lwc1 $f0, 0x8c($s1) /* BBB92C 802405AC 46800020 */ cvt.s.w $f0, $f0 /* BBB930 802405B0 46020000 */ add.s $f0, $f0, $f2 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/delete_player_actor_9C6148.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/delete_player_actor_9C6148.s index 6a9e9f47f6..442cde8241 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/delete_player_actor_9C6148.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/delete_player_actor_9C6148.s @@ -26,7 +26,7 @@ glabel delete_player_actor_9C6148 /* 9C6198 80240DB8 1440FFFA */ bnez $v0, .L80240DA4 /* 9C619C 80240DBC 24A50004 */ addiu $a1, $a1, 4 /* 9C61A0 80240DC0 08090381 */ j .L80240E04 -/* 9C61A4 80240DC4 00000000 */ nop +/* 9C61A4 80240DC4 00000000 */ nop .L80240DC8: /* 9C61A8 80240DC8 0000182D */ daddu $v1, $zero, $zero /* 9C61AC 80240DCC 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240000_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240000_9C53E0.s index fccf16234d..cc74550197 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240000_9C53E0.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240000_9C53E0.s @@ -22,7 +22,7 @@ glabel func_80240000_9C53E0 /* 9C5424 80240044 3C030010 */ lui $v1, 0x10 /* 9C5428 80240048 00431024 */ and $v0, $v0, $v1 /* 9C542C 8024004C 10400004 */ beqz $v0, .L80240060 -/* 9C5430 80240050 00000000 */ nop +/* 9C5430 80240050 00000000 */ nop /* 9C5434 80240054 C620006C */ lwc1 $f0, 0x6c($s1) /* 9C5438 80240058 46800020 */ cvt.s.w $f0, $f0 /* 9C543C 8024005C E480000C */ swc1 $f0, 0xc($a0) @@ -30,7 +30,7 @@ glabel func_80240000_9C53E0 /* 9C5440 80240060 8E2200D0 */ lw $v0, 0xd0($s1) /* 9C5444 80240064 8C420014 */ lw $v0, 0x14($v0) /* 9C5448 80240068 1C400004 */ bgtz $v0, .L8024007C -/* 9C544C 8024006C 00000000 */ nop +/* 9C544C 8024006C 00000000 */ nop /* 9C5450 80240070 C640000C */ lwc1 $f0, 0xc($s2) /* 9C5454 80240074 08090027 */ j .L8024009C /* 9C5458 80240078 E4800018 */ swc1 $f0, 0x18($a0) @@ -38,7 +38,7 @@ glabel func_80240000_9C53E0 /* 9C545C 8024007C 3C018025 */ lui $at, %hi(D_80251A90) /* 9C5460 80240080 D4221A90 */ ldc1 $f2, %lo(D_80251A90)($at) /* 9C5464 80240084 44820000 */ mtc1 $v0, $f0 -/* 9C5468 80240088 00000000 */ nop +/* 9C5468 80240088 00000000 */ nop /* 9C546C 8024008C 46800021 */ cvt.d.w $f0, $f0 /* 9C5470 80240090 46220003 */ div.d $f0, $f0, $f2 /* 9C5474 80240094 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802400B4_9C5494.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802400B4_9C5494.s index c2eaa3dec9..b59d95e5b4 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802400B4_9C5494.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802400B4_9C5494.s @@ -38,7 +38,7 @@ glabel func_802400B4_9C5494 /* 9C5518 80240138 2402000F */ addiu $v0, $zero, 0xf /* 9C551C 8024013C AFA2001C */ sw $v0, 0x1c($sp) /* 9C5520 80240140 44833000 */ mtc1 $v1, $f6 -/* 9C5524 80240144 00000000 */ nop +/* 9C5524 80240144 00000000 */ nop /* 9C5528 80240148 468031A0 */ cvt.s.w $f6, $f6 /* 9C552C 8024014C 44073000 */ mfc1 $a3, $f6 /* 9C5530 80240150 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802402AC_9C568C.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802402AC_9C568C.s index be4e23694a..3401368565 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802402AC_9C568C.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802402AC_9C568C.s @@ -47,20 +47,20 @@ glabel func_802402AC_9C568C /* 9C5734 80240354 8E020010 */ lw $v0, 0x10($s0) /* 9C5738 80240358 46001005 */ abs.s $f0, $f2 /* 9C573C 8024035C 44822000 */ mtc1 $v0, $f4 -/* 9C5740 80240360 00000000 */ nop +/* 9C5740 80240360 00000000 */ nop /* 9C5744 80240364 46802120 */ cvt.s.w $f4, $f4 /* 9C5748 80240368 4600203C */ c.lt.s $f4, $f0 -/* 9C574C 8024036C 00000000 */ nop +/* 9C574C 8024036C 00000000 */ nop /* 9C5750 80240370 4500000D */ bc1f .L802403A8 -/* 9C5754 80240374 00000000 */ nop +/* 9C5754 80240374 00000000 */ nop /* 9C5758 80240378 44800000 */ mtc1 $zero, $f0 /* 9C575C 8024037C C654000C */ lwc1 $f20, 0xc($s2) /* 9C5760 80240380 4600103C */ c.lt.s $f2, $f0 -/* 9C5764 80240384 00000000 */ nop +/* 9C5764 80240384 00000000 */ nop /* 9C5768 80240388 45000006 */ bc1f .L802403A4 /* 9C576C 8024038C 00021023 */ negu $v0, $v0 /* 9C5770 80240390 44820000 */ mtc1 $v0, $f0 -/* 9C5774 80240394 00000000 */ nop +/* 9C5774 80240394 00000000 */ nop /* 9C5778 80240398 46800020 */ cvt.s.w $f0, $f0 /* 9C577C 8024039C 080900EA */ j .L802403A8 /* 9C5780 802403A0 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240540_9C5920.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240540_9C5920.s index cfd066fce4..e9149ba009 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240540_9C5920.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240540_9C5920.s @@ -19,20 +19,20 @@ glabel func_80240540_9C5920 /* 9C5958 80240578 8E0200D0 */ lw $v0, 0xd0($s0) /* 9C595C 8024057C 8C420014 */ lw $v0, 0x14($v0) /* 9C5960 80240580 04410009 */ bgez $v0, .L802405A8 -/* 9C5964 80240584 00000000 */ nop +/* 9C5964 80240584 00000000 */ nop /* 9C5968 80240588 C640000C */ lwc1 $f0, 0xc($s2) /* 9C596C 8024058C 3C018025 */ lui $at, %hi(D_80251A98) /* 9C5970 80240590 D4221A98 */ ldc1 $f2, %lo(D_80251A98)($at) /* 9C5974 80240594 46000021 */ cvt.d.s $f0, $f0 /* 9C5978 80240598 46220002 */ mul.d $f0, $f0, $f2 -/* 9C597C 8024059C 00000000 */ nop +/* 9C597C 8024059C 00000000 */ nop /* 9C5980 802405A0 08090171 */ j .L802405C4 /* 9C5984 802405A4 46200020 */ cvt.s.d $f0, $f0 .L802405A8: /* 9C5988 802405A8 3C018025 */ lui $at, %hi(D_80251AA0) /* 9C598C 802405AC D4221AA0 */ ldc1 $f2, %lo(D_80251AA0)($at) /* 9C5990 802405B0 44820000 */ mtc1 $v0, $f0 -/* 9C5994 802405B4 00000000 */ nop +/* 9C5994 802405B4 00000000 */ nop /* 9C5998 802405B8 46800021 */ cvt.d.w $f0, $f0 /* 9C599C 802405BC 46220003 */ div.d $f0, $f0, $f2 /* 9C59A0 802405C0 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802405EC_9C59CC.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802405EC_9C59CC.s index 764b3cd255..b9ac8ad1ab 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802405EC_9C59CC.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802405EC_9C59CC.s @@ -42,7 +42,7 @@ glabel func_802405EC_9C59CC /* 9C5A60 80240680 2402000F */ addiu $v0, $zero, 0xf /* 9C5A64 80240684 AFA2001C */ sw $v0, 0x1c($sp) /* 9C5A68 80240688 44833000 */ mtc1 $v1, $f6 -/* 9C5A6C 8024068C 00000000 */ nop +/* 9C5A6C 8024068C 00000000 */ nop /* 9C5A70 80240690 468031A0 */ cvt.s.w $f6, $f6 /* 9C5A74 80240694 44073000 */ mfc1 $a3, $f6 /* 9C5A78 80240698 27A20028 */ addiu $v0, $sp, 0x28 @@ -90,12 +90,12 @@ glabel func_802405EC_9C59CC /* 9C5B10 80240730 468031A0 */ cvt.s.w $f6, $f6 /* 9C5B14 80240734 44073000 */ mfc1 $a3, $f6 /* 9C5B18 80240738 0C00A7B5 */ jal dist2D -/* 9C5B1C 8024073C 00000000 */ nop +/* 9C5B1C 8024073C 00000000 */ nop /* 9C5B20 80240740 C6020018 */ lwc1 $f2, 0x18($s0) /* 9C5B24 80240744 4602003C */ c.lt.s $f0, $f2 -/* 9C5B28 80240748 00000000 */ nop +/* 9C5B28 80240748 00000000 */ nop /* 9C5B2C 8024074C 4500000E */ bc1f .L80240788 -/* 9C5B30 80240750 00000000 */ nop +/* 9C5B30 80240750 00000000 */ nop /* 9C5B34 80240754 8E2200D0 */ lw $v0, 0xd0($s1) /* 9C5B38 80240758 C4400000 */ lwc1 $f0, ($v0) /* 9C5B3C 8024075C 46800020 */ cvt.s.w $f0, $f0 @@ -112,7 +112,7 @@ glabel func_802405EC_9C59CC .L80240788: /* 9C5B68 80240788 8602008C */ lh $v0, 0x8c($s0) /* 9C5B6C 8024078C 14400011 */ bnez $v0, .L802407D4 -/* 9C5B70 80240790 00000000 */ nop +/* 9C5B70 80240790 00000000 */ nop /* 9C5B74 80240794 C60C0038 */ lwc1 $f12, 0x38($s0) /* 9C5B78 80240798 8E2200D0 */ lw $v0, 0xd0($s1) /* 9C5B7C 8024079C C60E0040 */ lwc1 $f14, 0x40($s0) @@ -123,7 +123,7 @@ glabel func_802405EC_9C59CC /* 9C5B90 802407B0 468031A0 */ cvt.s.w $f6, $f6 /* 9C5B94 802407B4 44073000 */ mfc1 $a3, $f6 /* 9C5B98 802407B8 0C00A720 */ jal atan2 -/* 9C5B9C 802407BC 00000000 */ nop +/* 9C5B9C 802407BC 00000000 */ nop /* 9C5BA0 802407C0 8E050018 */ lw $a1, 0x18($s0) /* 9C5BA4 802407C4 44060000 */ mfc1 $a2, $f0 /* 9C5BA8 802407C8 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s index 12b30a4aea..86cb02ecb7 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s @@ -46,7 +46,7 @@ glabel func_802407F4_9C5BD4 /* 9C5C78 80240898 8E4200B0 */ lw $v0, 0xb0($s2) /* 9C5C7C 8024089C 30420004 */ andi $v0, $v0, 4 /* 9C5C80 802408A0 1040002F */ beqz $v0, .L80240960 -/* 9C5C84 802408A4 00000000 */ nop +/* 9C5C84 802408A4 00000000 */ nop .L802408A8: /* 9C5C88 802408A8 AE800070 */ sw $zero, 0x70($s4) /* 9C5C8C 802408AC C600000C */ lwc1 $f0, 0xc($s0) @@ -102,60 +102,71 @@ glabel func_802407F4_9C5BD4 /* 9C5D44 80240964 2C620064 */ sltiu $v0, $v1, 0x64 /* 9C5D48 80240968 10400036 */ beqz $v0, .L80240A44 /* 9C5D4C 8024096C 00031080 */ sll $v0, $v1, 2 -/* 9C5D50 80240970 3C018025 */ lui $at, %hi(D_80251AA8) +/* 9C5D50 80240970 3C018025 */ lui $at, %hi(jtbl_80251AA8_9D6E88) /* 9C5D54 80240974 00220821 */ addu $at, $at, $v0 -/* 9C5D58 80240978 8C221AA8 */ lw $v0, %lo(D_80251AA8)($at) +/* 9C5D58 80240978 8C221AA8 */ lw $v0, %lo(jtbl_80251AA8_9D6E88)($at) /* 9C5D5C 8024097C 00400008 */ jr $v0 -/* 9C5D60 80240980 00000000 */ nop +/* 9C5D60 80240980 00000000 */ nop +glabel L80240984_9C5D64 /* 9C5D64 80240984 0280202D */ daddu $a0, $s4, $zero /* 9C5D68 80240988 0260282D */ daddu $a1, $s3, $zero /* 9C5D6C 8024098C 0C090000 */ jal func_80240000_9C53E0 /* 9C5D70 80240990 02A0302D */ daddu $a2, $s5, $zero +glabel L80240994_9C5D74 /* 9C5D74 80240994 0280202D */ daddu $a0, $s4, $zero /* 9C5D78 80240998 0260282D */ daddu $a1, $s3, $zero /* 9C5D7C 8024099C 0C09002D */ jal func_802400B4_9C5494 /* 9C5D80 802409A0 02A0302D */ daddu $a2, $s5, $zero /* 9C5D84 802409A4 08090291 */ j .L80240A44 -/* 9C5D88 802409A8 00000000 */ nop +/* 9C5D88 802409A8 00000000 */ nop +glabel L802409AC_9C5D8C /* 9C5D8C 802409AC 0280202D */ daddu $a0, $s4, $zero /* 9C5D90 802409B0 0260282D */ daddu $a1, $s3, $zero /* 9C5D94 802409B4 0C090075 */ jal nok_01_NpcJumpFunc3 /* 9C5D98 802409B8 02A0302D */ daddu $a2, $s5, $zero +glabel L802409BC_9C5D9C /* 9C5D9C 802409BC 0280202D */ daddu $a0, $s4, $zero /* 9C5DA0 802409C0 0260282D */ daddu $a1, $s3, $zero /* 9C5DA4 802409C4 0C09008D */ jal nok_01_NpcJumpFunc /* 9C5DA8 802409C8 02A0302D */ daddu $a2, $s5, $zero /* 9C5DAC 802409CC 08090291 */ j .L80240A44 -/* 9C5DB0 802409D0 00000000 */ nop +/* 9C5DB0 802409D0 00000000 */ nop +glabel L802409D4_9C5DB4 /* 9C5DB4 802409D4 0280202D */ daddu $a0, $s4, $zero /* 9C5DB8 802409D8 0260282D */ daddu $a1, $s3, $zero /* 9C5DBC 802409DC 0C0900AB */ jal func_802402AC_9C568C /* 9C5DC0 802409E0 02A0302D */ daddu $a2, $s5, $zero +glabel L802409E4_9C5DC4 /* 9C5DC4 802409E4 0280202D */ daddu $a0, $s4, $zero /* 9C5DC8 802409E8 0260282D */ daddu $a1, $s3, $zero /* 9C5DCC 802409EC 0C0900F7 */ jal nok_01_UnkNpcAIFunc11 /* 9C5DD0 802409F0 02A0302D */ daddu $a2, $s5, $zero /* 9C5DD4 802409F4 08090291 */ j .L80240A44 -/* 9C5DD8 802409F8 00000000 */ nop +/* 9C5DD8 802409F8 00000000 */ nop +glabel L802409FC_9C5DDC /* 9C5DDC 802409FC 0280202D */ daddu $a0, $s4, $zero /* 9C5DE0 80240A00 0260282D */ daddu $a1, $s3, $zero /* 9C5DE4 80240A04 0C09013E */ jal nok_01_UnkNpcAIFunc10 /* 9C5DE8 80240A08 02A0302D */ daddu $a2, $s5, $zero /* 9C5DEC 80240A0C 08090291 */ j .L80240A44 -/* 9C5DF0 80240A10 00000000 */ nop +/* 9C5DF0 80240A10 00000000 */ nop +glabel L80240A14_9C5DF4 /* 9C5DF4 80240A14 0280202D */ daddu $a0, $s4, $zero /* 9C5DF8 80240A18 0260282D */ daddu $a1, $s3, $zero /* 9C5DFC 80240A1C 0C090150 */ jal func_80240540_9C5920 /* 9C5E00 80240A20 02A0302D */ daddu $a2, $s5, $zero +glabel L80240A24_9C5E04 /* 9C5E04 80240A24 0280202D */ daddu $a0, $s4, $zero /* 9C5E08 80240A28 0260282D */ daddu $a1, $s3, $zero /* 9C5E0C 80240A2C 0C09017B */ jal func_802405EC_9C59CC /* 9C5E10 80240A30 02A0302D */ daddu $a2, $s5, $zero /* 9C5E14 80240A34 08090291 */ j .L80240A44 -/* 9C5E18 80240A38 00000000 */ nop +/* 9C5E18 80240A38 00000000 */ nop +glabel L80240A3C_9C5E1C /* 9C5E1C 80240A3C 0C0129CF */ jal func_8004A73C /* 9C5E20 80240A40 0280202D */ daddu $a0, $s4, $zero .L80240A44: +glabel L80240A44_9C5E24 /* 9C5E24 80240A44 8FBF0048 */ lw $ra, 0x48($sp) /* 9C5E28 80240A48 8FB50044 */ lw $s5, 0x44($sp) /* 9C5E2C 80240A4C 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240AB4_9C5E94.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240AB4_9C5E94.s index 6eeab34db0..7c69c9690f 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240AB4_9C5E94.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240AB4_9C5E94.s @@ -22,7 +22,7 @@ glabel func_80240AB4_9C5E94 /* 9C5ED8 80240AF8 0C04DF93 */ jal func_80137E4C /* 9C5EDC 80240AFC 24070091 */ addiu $a3, $zero, 0x91 /* 9C5EE0 80240B00 44900000 */ mtc1 $s0, $f0 -/* 9C5EE4 80240B04 00000000 */ nop +/* 9C5EE4 80240B04 00000000 */ nop /* 9C5EE8 80240B08 46800020 */ cvt.s.w $f0, $f0 /* 9C5EEC 80240B0C 44050000 */ mfc1 $a1, $f0 /* 9C5EF0 80240B10 0C04DF62 */ jal func_80137D88 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240B30_9C5F10.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240B30_9C5F10.s index 76557dc278..7e8344be28 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240B30_9C5F10.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240B30_9C5F10.s @@ -16,7 +16,7 @@ glabel func_80240B30_9C5F10 /* 9C5F3C 80240B5C 0C0B1EAF */ jal get_variable /* 9C5F40 80240B60 0040802D */ daddu $s0, $v0, $zero /* 9C5F44 80240B64 44820000 */ mtc1 $v0, $f0 -/* 9C5F48 80240B68 00000000 */ nop +/* 9C5F48 80240B68 00000000 */ nop /* 9C5F4C 80240B6C 46800020 */ cvt.s.w $f0, $f0 /* 9C5F50 80240B70 24020002 */ addiu $v0, $zero, 2 /* 9C5F54 80240B74 00501804 */ sllv $v1, $s0, $v0 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C2C_9C600C.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C2C_9C600C.s index fb42181779..a2fd83eeda 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C2C_9C600C.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C2C_9C600C.s @@ -12,7 +12,7 @@ glabel func_80240C2C_9C600C /* 9C6028 80240C48 80A30006 */ lb $v1, 6($a1) /* 9C602C 80240C4C 80A20005 */ lb $v0, 5($a1) /* 9C6030 80240C50 14620007 */ bne $v1, $v0, .L80240C70 -/* 9C6034 80240C54 00000000 */ nop +/* 9C6034 80240C54 00000000 */ nop /* 9C6038 80240C58 80C2028E */ lb $v0, 0x28e($a2) /* 9C603C 80240C5C 84C30290 */ lh $v1, 0x290($a2) /* 9C6040 80240C60 00021200 */ sll $v0, $v0, 8 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240EA4_9C6284.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240EA4_9C6284.s index 96c6b3b275..179c3e67ce 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240EA4_9C6284.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240EA4_9C6284.s @@ -115,7 +115,7 @@ glabel func_80240EA4_9C6284 /* 9C642C 8024104C 14E20005 */ bne $a3, $v0, .L80241064 /* 9C6430 80241050 32E2FFFF */ andi $v0, $s7, 0xffff /* 9C6434 80241054 14400003 */ bnez $v0, .L80241064 -/* 9C6438 80241058 00000000 */ nop +/* 9C6438 80241058 00000000 */ nop /* 9C643C 8024105C 14800008 */ bnez $a0, .L80241080 /* 9C6440 80241060 24020001 */ addiu $v0, $zero, 1 .L80241064: @@ -123,7 +123,7 @@ glabel func_80240EA4_9C6284 /* 9C6448 80241068 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 9C644C 8024106C 80420075 */ lb $v0, 0x75($v0) /* 9C6450 80241070 10400005 */ beqz $v0, .L80241088 -/* 9C6454 80241074 00000000 */ nop +/* 9C6454 80241074 00000000 */ nop /* 9C6458 80241078 10800003 */ beqz $a0, .L80241088 /* 9C645C 8024107C 24020001 */ addiu $v0, $zero, 1 .L80241080: diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241194_9C6574.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241194_9C6574.s index 86e28d039e..d8dfa1d0dd 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241194_9C6574.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241194_9C6574.s @@ -39,13 +39,13 @@ glabel func_80241194_9C6574 /* 9C65F8 80241218 10740005 */ beq $v1, $s4, .L80241230 /* 9C65FC 8024121C 26100001 */ addiu $s0, $s0, 1 /* 9C6600 80241220 10730003 */ beq $v1, $s3, .L80241230 -/* 9C6604 80241224 00000000 */ nop +/* 9C6604 80241224 00000000 */ nop /* 9C6608 80241228 00521025 */ or $v0, $v0, $s2 /* 9C660C 8024122C AC820000 */ sw $v0, ($a0) .L80241230: /* 9C6610 80241230 2A020040 */ slti $v0, $s0, 0x40 /* 9C6614 80241234 1440FFEF */ bnez $v0, .L802411F4 -/* 9C6618 80241238 00000000 */ nop +/* 9C6618 80241238 00000000 */ nop /* 9C661C 8024123C 0000802D */ daddu $s0, $zero, $zero /* 9C6620 80241240 3C120800 */ lui $s2, 0x800 .L80241244: @@ -57,13 +57,13 @@ glabel func_80241194_9C6574 /* 9C6638 80241258 8C640000 */ lw $a0, ($v1) /* 9C663C 8024125C 30820010 */ andi $v0, $a0, 0x10 /* 9C6640 80241260 10400003 */ beqz $v0, .L80241270 -/* 9C6644 80241264 00000000 */ nop +/* 9C6644 80241264 00000000 */ nop /* 9C6648 80241268 00921025 */ or $v0, $a0, $s2 /* 9C664C 8024126C AC620000 */ sw $v0, ($v1) .L80241270: /* 9C6650 80241270 2A020100 */ slti $v0, $s0, 0x100 /* 9C6654 80241274 1440FFF3 */ bnez $v0, .L80241244 -/* 9C6658 80241278 00000000 */ nop +/* 9C6658 80241278 00000000 */ nop /* 9C665C 8024127C AE200070 */ sw $zero, 0x70($s1) .L80241280: /* 9C6660 80241280 8E220070 */ lw $v0, 0x70($s1) diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802412E0_9C66C0.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802412E0_9C66C0.s index 2f7f1efaf9..85e1ddbe1e 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802412E0_9C66C0.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802412E0_9C66C0.s @@ -32,7 +32,7 @@ glabel func_802412E0_9C66C0 /* 9C6724 80241344 0080302D */ daddu $a2, $a0, $zero /* 9C6728 80241348 8E020070 */ lw $v0, 0x70($s0) /* 9C672C 8024134C 14400006 */ bnez $v0, .L80241368 -/* 9C6730 80241350 00000000 */ nop +/* 9C6730 80241350 00000000 */ nop /* 9C6734 80241354 8E020074 */ lw $v0, 0x74($s0) /* 9C6738 80241358 14400003 */ bnez $v0, .L80241368 /* 9C673C 8024135C 24020001 */ addiu $v0, $zero, 1 @@ -66,13 +66,13 @@ glabel func_802412E0_9C66C0 /* 9C67A4 802413C4 10730005 */ beq $v1, $s3, .L802413DC /* 9C67A8 802413C8 26100001 */ addiu $s0, $s0, 1 /* 9C67AC 802413CC 10720003 */ beq $v1, $s2, .L802413DC -/* 9C67B0 802413D0 00000000 */ nop +/* 9C67B0 802413D0 00000000 */ nop /* 9C67B4 802413D4 00511024 */ and $v0, $v0, $s1 /* 9C67B8 802413D8 AC820000 */ sw $v0, ($a0) .L802413DC: /* 9C67BC 802413DC 2A020040 */ slti $v0, $s0, 0x40 /* 9C67C0 802413E0 1440FFEF */ bnez $v0, .L802413A0 -/* 9C67C4 802413E4 00000000 */ nop +/* 9C67C4 802413E4 00000000 */ nop /* 9C67C8 802413E8 0000802D */ daddu $s0, $zero, $zero /* 9C67CC 802413EC 3C11F7FF */ lui $s1, 0xf7ff /* 9C67D0 802413F0 3631FFFF */ ori $s1, $s1, 0xffff @@ -85,7 +85,7 @@ glabel func_802412E0_9C66C0 /* 9C67E8 80241408 8C640000 */ lw $a0, ($v1) /* 9C67EC 8024140C 30820010 */ andi $v0, $a0, 0x10 /* 9C67F0 80241410 10400003 */ beqz $v0, .L80241420 -/* 9C67F4 80241414 00000000 */ nop +/* 9C67F4 80241414 00000000 */ nop /* 9C67F8 80241418 00911024 */ and $v0, $a0, $s1 /* 9C67FC 8024141C AC620000 */ sw $v0, ($v1) .L80241420: @@ -93,7 +93,7 @@ glabel func_802412E0_9C66C0 /* 9C6804 80241424 1440FFF3 */ bnez $v0, .L802413F4 /* 9C6808 80241428 24020002 */ addiu $v0, $zero, 2 /* 9C680C 8024142C 0809050E */ j .L80241438 -/* 9C6810 80241430 00000000 */ nop +/* 9C6810 80241430 00000000 */ nop .L80241434: /* 9C6814 80241434 0000102D */ daddu $v0, $zero, $zero .L80241438: diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802414D8_9C68B8.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802414D8_9C68B8.s index 4e481c5d72..ed36fd278e 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802414D8_9C68B8.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802414D8_9C68B8.s @@ -16,19 +16,19 @@ glabel func_802414D8_9C68B8 /* 9C68E4 80241504 0220202D */ daddu $a0, $s1, $zero /* 9C68E8 80241508 3C05F4AC */ lui $a1, 0xf4ac /* 9C68EC 8024150C 4482B000 */ mtc1 $v0, $f22 -/* 9C68F0 80241510 00000000 */ nop +/* 9C68F0 80241510 00000000 */ nop /* 9C68F4 80241514 4680B5A0 */ cvt.s.w $f22, $f22 /* 9C68F8 80241518 0C0B1EAF */ jal get_variable /* 9C68FC 8024151C 34A5D482 */ ori $a1, $a1, 0xd482 /* 9C6900 80241520 0220202D */ daddu $a0, $s1, $zero /* 9C6904 80241524 3C05F4AC */ lui $a1, 0xf4ac /* 9C6908 80241528 4482A000 */ mtc1 $v0, $f20 -/* 9C690C 8024152C 00000000 */ nop +/* 9C690C 8024152C 00000000 */ nop /* 9C6910 80241530 4680A520 */ cvt.s.w $f20, $f20 /* 9C6914 80241534 0C0B1EAF */ jal get_variable /* 9C6918 80241538 34A5D483 */ ori $a1, $a1, 0xd483 /* 9C691C 8024153C 44821000 */ mtc1 $v0, $f2 -/* 9C6920 80241540 00000000 */ nop +/* 9C6920 80241540 00000000 */ nop /* 9C6924 80241544 468010A0 */ cvt.s.w $f2, $f2 /* 9C6928 80241548 4405B000 */ mfc1 $a1, $f22 /* 9C692C 8024154C 4406A000 */ mfc1 $a2, $f20 @@ -45,19 +45,19 @@ glabel func_802414D8_9C68B8 /* 9C6958 80241578 0220202D */ daddu $a0, $s1, $zero /* 9C695C 8024157C 3C05F4AC */ lui $a1, 0xf4ac /* 9C6960 80241580 4482B000 */ mtc1 $v0, $f22 -/* 9C6964 80241584 00000000 */ nop +/* 9C6964 80241584 00000000 */ nop /* 9C6968 80241588 4680B5A0 */ cvt.s.w $f22, $f22 /* 9C696C 8024158C 0C0B1EAF */ jal get_variable /* 9C6970 80241590 34A5D482 */ ori $a1, $a1, 0xd482 /* 9C6974 80241594 0220202D */ daddu $a0, $s1, $zero /* 9C6978 80241598 3C05F4AC */ lui $a1, 0xf4ac /* 9C697C 8024159C 4482A000 */ mtc1 $v0, $f20 -/* 9C6980 802415A0 00000000 */ nop +/* 9C6980 802415A0 00000000 */ nop /* 9C6984 802415A4 4680A520 */ cvt.s.w $f20, $f20 /* 9C6988 802415A8 0C0B1EAF */ jal get_variable /* 9C698C 802415AC 34A5D483 */ ori $a1, $a1, 0xd483 /* 9C6990 802415B0 44821000 */ mtc1 $v0, $f2 -/* 9C6994 802415B4 00000000 */ nop +/* 9C6994 802415B4 00000000 */ nop /* 9C6998 802415B8 468010A0 */ cvt.s.w $f2, $f2 /* 9C699C 802415BC 4405B000 */ mfc1 $a1, $f22 /* 9C69A0 802415C0 4406A000 */ mfc1 $a2, $f20 @@ -73,19 +73,19 @@ glabel func_802414D8_9C68B8 /* 9C69C8 802415E8 0220202D */ daddu $a0, $s1, $zero /* 9C69CC 802415EC 3C05F4AC */ lui $a1, 0xf4ac /* 9C69D0 802415F0 4482B000 */ mtc1 $v0, $f22 -/* 9C69D4 802415F4 00000000 */ nop +/* 9C69D4 802415F4 00000000 */ nop /* 9C69D8 802415F8 4680B5A0 */ cvt.s.w $f22, $f22 /* 9C69DC 802415FC 0C0B1EAF */ jal get_variable /* 9C69E0 80241600 34A5D482 */ ori $a1, $a1, 0xd482 /* 9C69E4 80241604 0220202D */ daddu $a0, $s1, $zero /* 9C69E8 80241608 3C05F4AC */ lui $a1, 0xf4ac /* 9C69EC 8024160C 4482A000 */ mtc1 $v0, $f20 -/* 9C69F0 80241610 00000000 */ nop +/* 9C69F0 80241610 00000000 */ nop /* 9C69F4 80241614 4680A520 */ cvt.s.w $f20, $f20 /* 9C69F8 80241618 0C0B1EAF */ jal get_variable /* 9C69FC 8024161C 34A5D483 */ ori $a1, $a1, 0xd483 /* 9C6A00 80241620 44821000 */ mtc1 $v0, $f2 -/* 9C6A04 80241624 00000000 */ nop +/* 9C6A04 80241624 00000000 */ nop /* 9C6A08 80241628 468010A0 */ cvt.s.w $f2, $f2 /* 9C6A0C 8024162C 4405B000 */ mfc1 $a1, $f22 /* 9C6A10 80241630 4406A000 */ mfc1 $a2, $f20 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802416F0_9C6AD0.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802416F0_9C6AD0.s index 3743ad5a6b..27936ffbba 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802416F0_9C6AD0.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802416F0_9C6AD0.s @@ -44,7 +44,7 @@ glabel func_802416F0_9C6AD0 /* 9C6B64 80241784 3C048025 */ lui $a0, %hi(D_80251C40) /* 9C6B68 80241788 8C841C40 */ lw $a0, %lo(D_80251C40)($a0) /* 9C6B6C 8024178C 0C048D70 */ jal func_801235C0 -/* 9C6B70 80241790 00000000 */ nop +/* 9C6B70 80241790 00000000 */ nop /* 9C6B74 80241794 24020002 */ addiu $v0, $zero, 2 .L80241798: /* 9C6B78 80241798 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241D60_9C7140.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241D60_9C7140.s index 739a7c0d75..9c96686bde 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241D60_9C7140.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241D60_9C7140.s @@ -13,7 +13,7 @@ glabel func_80241D60_9C7140 /* 9C7160 80241D80 14620006 */ bne $v1, $v0, .L80241D9C /* 9C7164 80241D84 24020002 */ addiu $v0, $zero, 2 /* 9C7168 80241D88 44800000 */ mtc1 $zero, $f0 -/* 9C716C 80241D8C 00000000 */ nop +/* 9C716C 80241D8C 00000000 */ nop /* 9C7170 80241D90 44050000 */ mfc1 $a1, $f0 /* 9C7174 80241D94 0809076D */ j .L80241DB4 /* 9C7178 80241D98 0000202D */ daddu $a0, $zero, $zero @@ -21,9 +21,9 @@ glabel func_80241D60_9C7140 /* 9C717C 80241D9C 14620008 */ bne $v1, $v0, .L80241DC0 /* 9C7180 80241DA0 24040001 */ addiu $a0, $zero, 1 /* 9C7184 80241DA4 44800000 */ mtc1 $zero, $f0 -/* 9C7188 80241DA8 00000000 */ nop +/* 9C7188 80241DA8 00000000 */ nop /* 9C718C 80241DAC 44050000 */ mfc1 $a1, $f0 -/* 9C7190 80241DB0 00000000 */ nop +/* 9C7190 80241DB0 00000000 */ nop .L80241DB4: /* 9C7194 80241DB4 00A0302D */ daddu $a2, $a1, $zero /* 9C7198 80241DB8 0C01C5A4 */ jal func_80071690 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802420B4_9C7494.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802420B4_9C7494.s index 738bdb1681..0af09b70ee 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802420B4_9C7494.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802420B4_9C7494.s @@ -28,7 +28,7 @@ glabel func_802420B4_9C7494 /* 9C74E8 80242108 00220821 */ addu $at, $at, $v0 /* 9C74EC 8024210C AC201C70 */ sw $zero, %lo(D_80251C70)($at) /* 9C74F0 80242110 08090850 */ j .L80242140 -/* 9C74F4 80242114 00000000 */ nop +/* 9C74F4 80242114 00000000 */ nop .L80242118: /* 9C74F8 80242118 3C038025 */ lui $v1, %hi(D_80251C70) /* 9C74FC 8024211C 24631C70 */ addiu $v1, $v1, %lo(D_80251C70) diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024243C_9C781C.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024243C_9C781C.s index a37d719acd..db6c7c16a0 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024243C_9C781C.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024243C_9C781C.s @@ -36,14 +36,14 @@ glabel func_8024243C_9C781C /* 9C7898 802424B8 44811000 */ mtc1 $at, $f2 /* 9C789C 802424BC 46000106 */ mov.s $f4, $f0 /* 9C78A0 802424C0 4604103C */ c.lt.s $f2, $f4 -/* 9C78A4 802424C4 00000000 */ nop +/* 9C78A4 802424C4 00000000 */ nop /* 9C78A8 802424C8 45010008 */ bc1t .L802424EC /* 9C78AC 802424CC 0000302D */ daddu $a2, $zero, $zero /* 9C78B0 802424D0 3C0142B4 */ lui $at, 0x42b4 /* 9C78B4 802424D4 44810000 */ mtc1 $at, $f0 -/* 9C78B8 802424D8 00000000 */ nop +/* 9C78B8 802424D8 00000000 */ nop /* 9C78BC 802424DC 4600203C */ c.lt.s $f4, $f0 -/* 9C78C0 802424E0 00000000 */ nop +/* 9C78C0 802424E0 00000000 */ nop /* 9C78C4 802424E4 45000003 */ bc1f .L802424F4 /* 9C78C8 802424E8 0220202D */ daddu $a0, $s1, $zero .L802424EC: diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802426A4_9C7A84.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802426A4_9C7A84.s index 880660521c..25a08dad68 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802426A4_9C7A84.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802426A4_9C7A84.s @@ -16,20 +16,20 @@ glabel func_802426A4_9C7A84 /* 9C7AB0 802426D0 8E050000 */ lw $a1, ($s0) /* 9C7AB4 802426D4 26100004 */ addiu $s0, $s0, 4 /* 9C7AB8 802426D8 4482B000 */ mtc1 $v0, $f22 -/* 9C7ABC 802426DC 00000000 */ nop +/* 9C7ABC 802426DC 00000000 */ nop /* 9C7AC0 802426E0 4680B5A0 */ cvt.s.w $f22, $f22 /* 9C7AC4 802426E4 0C0B1EAF */ jal get_variable /* 9C7AC8 802426E8 0220202D */ daddu $a0, $s1, $zero /* 9C7ACC 802426EC 8E050000 */ lw $a1, ($s0) /* 9C7AD0 802426F0 4482A000 */ mtc1 $v0, $f20 -/* 9C7AD4 802426F4 00000000 */ nop +/* 9C7AD4 802426F4 00000000 */ nop /* 9C7AD8 802426F8 4680A520 */ cvt.s.w $f20, $f20 /* 9C7ADC 802426FC 0C0B1EAF */ jal get_variable /* 9C7AE0 80242700 0220202D */ daddu $a0, $s1, $zero /* 9C7AE4 80242704 3C014170 */ lui $at, 0x4170 /* 9C7AE8 80242708 44810000 */ mtc1 $at, $f0 /* 9C7AEC 8024270C 44821000 */ mtc1 $v0, $f2 -/* 9C7AF0 80242710 00000000 */ nop +/* 9C7AF0 80242710 00000000 */ nop /* 9C7AF4 80242714 468010A0 */ cvt.s.w $f2, $f2 /* 9C7AF8 80242718 4600A500 */ add.s $f20, $f20, $f0 /* 9C7AFC 8024271C 4405B000 */ mfc1 $a1, $f22 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242760_9C7B40.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242760_9C7B40.s index f18d75e334..f2693acbe1 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242760_9C7B40.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242760_9C7B40.s @@ -5,11 +5,11 @@ glabel func_80242760_9C7B40 /* 9C7B40 80242760 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 9C7B44 80242764 AFBF0010 */ sw $ra, 0x10($sp) /* 9C7B48 80242768 0C03A63B */ jal func_800E98EC -/* 9C7B4C 8024276C 00000000 */ nop +/* 9C7B4C 8024276C 00000000 */ nop /* 9C7B50 80242770 0C03A625 */ jal func_800E9894 -/* 9C7B54 80242774 00000000 */ nop +/* 9C7B54 80242774 00000000 */ nop /* 9C7B58 80242778 0C03A5D8 */ jal open_status_menu_long -/* 9C7B5C 8024277C 00000000 */ nop +/* 9C7B5C 8024277C 00000000 */ nop /* 9C7B60 80242780 8FBF0010 */ lw $ra, 0x10($sp) /* 9C7B64 80242784 24020002 */ addiu $v0, $zero, 2 /* 9C7B68 80242788 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242790_9C7B70.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242790_9C7B70.s index 0f2de5425f..e9d562db7f 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242790_9C7B70.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242790_9C7B70.s @@ -5,11 +5,11 @@ glabel func_80242790_9C7B70 /* 9C7B70 80242790 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 9C7B74 80242794 AFBF0010 */ sw $ra, 0x10($sp) /* 9C7B78 80242798 0C03A640 */ jal func_800E9900 -/* 9C7B7C 8024279C 00000000 */ nop +/* 9C7B7C 8024279C 00000000 */ nop /* 9C7B80 802427A0 0C03A631 */ jal func_800E98C4 -/* 9C7B84 802427A4 00000000 */ nop +/* 9C7B84 802427A4 00000000 */ nop /* 9C7B88 802427A8 0C03A5EE */ jal func_800E97B8 -/* 9C7B8C 802427AC 00000000 */ nop +/* 9C7B8C 802427AC 00000000 */ nop /* 9C7B90 802427B0 8FBF0010 */ lw $ra, 0x10($sp) /* 9C7B94 802427B4 24020002 */ addiu $v0, $zero, 2 /* 9C7B98 802427B8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242910_9C7CF0.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242910_9C7CF0.s index 359392fc29..ed81dc440d 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242910_9C7CF0.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242910_9C7CF0.s @@ -8,5 +8,5 @@ glabel func_80242910_9C7CF0 /* 9C7CFC 8024291C AC620324 */ sw $v0, 0x324($v1) /* 9C7D00 80242920 03E00008 */ jr $ra /* 9C7D04 80242924 24020002 */ addiu $v0, $zero, 2 -/* 9C7D08 80242928 00000000 */ nop -/* 9C7D0C 8024292C 00000000 */ nop +/* 9C7D08 80242928 00000000 */ nop +/* 9C7D0C 8024292C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240034_9D7054.s b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240034_9D7054.s index 80722ecd87..396f81d347 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240034_9D7054.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240034_9D7054.s @@ -22,16 +22,16 @@ glabel func_80240034_9D7054 /* 9D7094 80240074 00021023 */ negu $v0, $v0 .L80240078: /* 9D7098 80240078 14400003 */ bnez $v0, .L80240088 -/* 9D709C 8024007C 00000000 */ nop +/* 9D709C 8024007C 00000000 */ nop /* 9D70A0 80240080 50E00017 */ beql $a3, $zero, .L802400E0 /* 9D70A4 80240084 0000102D */ daddu $v0, $zero, $zero .L80240088: /* 9D70A8 80240088 44822000 */ mtc1 $v0, $f4 -/* 9D70AC 8024008C 00000000 */ nop +/* 9D70AC 8024008C 00000000 */ nop /* 9D70B0 80240090 46802120 */ cvt.s.w $f4, $f4 /* 9D70B4 80240094 44062000 */ mfc1 $a2, $f4 /* 9D70B8 80240098 44872000 */ mtc1 $a3, $f4 -/* 9D70BC 8024009C 00000000 */ nop +/* 9D70BC 8024009C 00000000 */ nop /* 9D70C0 802400A0 46802120 */ cvt.s.w $f4, $f4 /* 9D70C4 802400A4 44806000 */ mtc1 $zero, $f12 /* 9D70C8 802400A8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240034_9D7054 /* 9D70D0 802400B0 46006386 */ mov.s $f14, $f12 /* 9D70D4 802400B4 3C014270 */ lui $at, 0x4270 /* 9D70D8 802400B8 44811000 */ mtc1 $at, $f2 -/* 9D70DC 802400BC 00000000 */ nop +/* 9D70DC 802400BC 00000000 */ nop /* 9D70E0 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 9D70E4 802400C4 00000000 */ nop +/* 9D70E4 802400C4 00000000 */ nop /* 9D70E8 802400C8 45000004 */ bc1f .L802400DC /* 9D70EC 802400CC 24020001 */ addiu $v0, $zero, 1 /* 9D70F0 802400D0 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802402E0_9D7300.s b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802402E0_9D7300.s index 75c567ca02..86cb28483c 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802402E0_9D7300.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802402E0_9D7300.s @@ -26,7 +26,7 @@ glabel func_802402E0_9D7300 /* 9D7350 80240330 1440FFFA */ bnez $v0, .L8024031C /* 9D7354 80240334 24A50004 */ addiu $a1, $a1, 4 /* 9D7358 80240338 080900DF */ j .L8024037C -/* 9D735C 8024033C 00000000 */ nop +/* 9D735C 8024033C 00000000 */ nop .L80240340: /* 9D7360 80240340 0000182D */ daddu $v1, $zero, $zero /* 9D7364 80240344 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802406B0_9D76D0.s b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802406B0_9D76D0.s index 51b298a1a0..98ee74fcee 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802406B0_9D76D0.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802406B0_9D76D0.s @@ -28,7 +28,7 @@ glabel func_802406B0_9D76D0 /* 9D7724 80240704 00220821 */ addu $at, $at, $v0 /* 9D7728 80240708 AC2047D0 */ sw $zero, %lo(D_802547D0)($at) /* 9D772C 8024070C 080901CF */ j .L8024073C -/* 9D7730 80240710 00000000 */ nop +/* 9D7730 80240710 00000000 */ nop .L80240714: /* 9D7734 80240714 3C038025 */ lui $v1, %hi(D_802547D0) /* 9D7738 80240718 246347D0 */ addiu $v1, $v1, %lo(D_802547D0) @@ -46,4 +46,4 @@ glabel func_802406B0_9D76D0 /* 9D7760 80240740 24020002 */ addiu $v0, $zero, 2 /* 9D7764 80240744 03E00008 */ jr $ra /* 9D7768 80240748 27BD0018 */ addiu $sp, $sp, 0x18 -/* 9D776C 8024074C 00000000 */ nop +/* 9D776C 8024074C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7770/func_80240750_9D7770.s b/asm/nonmatchings/world/area_nok/nok_02/9D7770/func_80240750_9D7770.s index 14c2a817b9..286a85434d 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7770/func_80240750_9D7770.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7770/func_80240750_9D7770.s @@ -62,12 +62,12 @@ glabel func_80240750_9D7770 /* 9D7854 80240834 C626001C */ lwc1 $f6, 0x1c($s1) /* 9D7858 80240838 468031A0 */ cvt.s.w $f6, $f6 /* 9D785C 8024083C 46062102 */ mul.s $f4, $f4, $f6 -/* 9D7860 80240840 00000000 */ nop +/* 9D7860 80240840 00000000 */ nop /* 9D7864 80240844 3C013F00 */ lui $at, 0x3f00 /* 9D7868 80240848 44811000 */ mtc1 $at, $f2 -/* 9D786C 8024084C 00000000 */ nop +/* 9D786C 8024084C 00000000 */ nop /* 9D7870 80240850 46022102 */ mul.s $f4, $f4, $f2 -/* 9D7874 80240854 00000000 */ nop +/* 9D7874 80240854 00000000 */ nop /* 9D7878 80240858 E620000C */ swc1 $f0, 0xc($s1) /* 9D787C 8024085C C6200004 */ lwc1 $f0, 4($s1) /* 9D7880 80240860 C602000C */ lwc1 $f2, 0xc($s0) @@ -84,7 +84,7 @@ glabel func_80240750_9D7770 /* 9D78A8 80240888 8E240020 */ lw $a0, 0x20($s1) /* 9D78AC 8024088C 0040802D */ daddu $s0, $v0, $zero /* 9D78B0 80240890 16000005 */ bnez $s0, .L802408A8 -/* 9D78B4 80240894 00000000 */ nop +/* 9D78B4 80240894 00000000 */ nop /* 9D78B8 80240898 0C00AB4B */ jal heap_free /* 9D78BC 8024089C 8E440070 */ lw $a0, 0x70($s2) /* 9D78C0 802408A0 08090253 */ j .L8024094C @@ -92,10 +92,10 @@ glabel func_80240750_9D7770 .L802408A8: /* 9D78C8 802408A8 C62C000C */ lwc1 $f12, 0xc($s1) /* 9D78CC 802408AC 0C00A8BB */ jal sin_deg -/* 9D78D0 802408B0 00000000 */ nop +/* 9D78D0 802408B0 00000000 */ nop /* 9D78D4 802408B4 C6220014 */ lwc1 $f2, 0x14($s1) /* 9D78D8 802408B8 46001082 */ mul.s $f2, $f2, $f0 -/* 9D78DC 802408BC 00000000 */ nop +/* 9D78DC 802408BC 00000000 */ nop /* 9D78E0 802408C0 C6000008 */ lwc1 $f0, 8($s0) /* 9D78E4 802408C4 46020000 */ add.s $f0, $f0, $f2 /* 9D78E8 802408C8 E6000008 */ swc1 $f0, 8($s0) @@ -103,7 +103,7 @@ glabel func_80240750_9D7770 /* 9D78F0 802408D0 C62C000C */ lwc1 $f12, 0xc($s1) /* 9D78F4 802408D4 C6220014 */ lwc1 $f2, 0x14($s1) /* 9D78F8 802408D8 46001082 */ mul.s $f2, $f2, $f0 -/* 9D78FC 802408DC 00000000 */ nop +/* 9D78FC 802408DC 00000000 */ nop /* 9D7900 802408E0 C6000010 */ lwc1 $f0, 0x10($s0) /* 9D7904 802408E4 46020001 */ sub.s $f0, $f0, $f2 /* 9D7908 802408E8 E6000010 */ swc1 $f0, 0x10($s0) @@ -140,5 +140,5 @@ glabel func_80240750_9D7770 /* 9D797C 8024095C D7B40020 */ ldc1 $f20, 0x20($sp) /* 9D7980 80240960 03E00008 */ jr $ra /* 9D7984 80240964 27BD0028 */ addiu $sp, $sp, 0x28 -/* 9D7988 80240968 00000000 */ nop -/* 9D798C 8024096C 00000000 */ nop +/* 9D7988 80240968 00000000 */ nop +/* 9D798C 8024096C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7990/func_80240970_9D7990.s b/asm/nonmatchings/world/area_nok/nok_02/9D7990/func_80240970_9D7990.s index f8d1934df7..b8e3c4fbfe 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7990/func_80240970_9D7990.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7990/func_80240970_9D7990.s @@ -10,12 +10,12 @@ glabel func_80240970_9D7990 /* 9D79A4 80240984 240400C8 */ addiu $a0, $zero, 0xc8 /* 9D79A8 80240988 2442FF9C */ addiu $v0, $v0, -0x64 /* 9D79AC 8024098C 4482A000 */ mtc1 $v0, $f20 -/* 9D79B0 80240990 00000000 */ nop +/* 9D79B0 80240990 00000000 */ nop /* 9D79B4 80240994 4680A520 */ cvt.s.w $f20, $f20 /* 9D79B8 80240998 0C00A67F */ jal rand_int /* 9D79BC 8024099C 24040096 */ addiu $a0, $zero, 0x96 /* 9D79C0 802409A0 44820000 */ mtc1 $v0, $f0 -/* 9D79C4 802409A4 00000000 */ nop +/* 9D79C4 802409A4 00000000 */ nop /* 9D79C8 802409A8 46800020 */ cvt.s.w $f0, $f0 /* 9D79CC 802409AC 3C01C334 */ lui $at, 0xc334 /* 9D79D0 802409B0 4481B000 */ mtc1 $at, $f22 @@ -30,12 +30,12 @@ glabel func_80240970_9D7990 /* 9D79F4 802409D4 240400C8 */ addiu $a0, $zero, 0xc8 /* 9D79F8 802409D8 2442FF9C */ addiu $v0, $v0, -0x64 /* 9D79FC 802409DC 4482A000 */ mtc1 $v0, $f20 -/* 9D7A00 802409E0 00000000 */ nop +/* 9D7A00 802409E0 00000000 */ nop /* 9D7A04 802409E4 4680A520 */ cvt.s.w $f20, $f20 /* 9D7A08 802409E8 0C00A67F */ jal rand_int /* 9D7A0C 802409EC 24040096 */ addiu $a0, $zero, 0x96 /* 9D7A10 802409F0 44820000 */ mtc1 $v0, $f0 -/* 9D7A14 802409F4 00000000 */ nop +/* 9D7A14 802409F4 00000000 */ nop /* 9D7A18 802409F8 46800020 */ cvt.s.w $f0, $f0 /* 9D7A1C 802409FC 4405A000 */ mfc1 $a1, $f20 /* 9D7A20 80240A00 4407B000 */ mfc1 $a3, $f22 @@ -48,12 +48,12 @@ glabel func_80240970_9D7990 /* 9D7A3C 80240A1C 240400C8 */ addiu $a0, $zero, 0xc8 /* 9D7A40 80240A20 2442FF9C */ addiu $v0, $v0, -0x64 /* 9D7A44 80240A24 4482A000 */ mtc1 $v0, $f20 -/* 9D7A48 80240A28 00000000 */ nop +/* 9D7A48 80240A28 00000000 */ nop /* 9D7A4C 80240A2C 4680A520 */ cvt.s.w $f20, $f20 /* 9D7A50 80240A30 0C00A67F */ jal rand_int /* 9D7A54 80240A34 24040096 */ addiu $a0, $zero, 0x96 /* 9D7A58 80240A38 44820000 */ mtc1 $v0, $f0 -/* 9D7A5C 80240A3C 00000000 */ nop +/* 9D7A5C 80240A3C 00000000 */ nop /* 9D7A60 80240A40 46800020 */ cvt.s.w $f0, $f0 /* 9D7A64 80240A44 4405A000 */ mfc1 $a1, $f20 /* 9D7A68 80240A48 4407B000 */ mfc1 $a3, $f22 @@ -68,5 +68,5 @@ glabel func_80240970_9D7990 /* 9D7A8C 80240A6C 24020002 */ addiu $v0, $zero, 2 /* 9D7A90 80240A70 03E00008 */ jr $ra /* 9D7A94 80240A74 27BD0030 */ addiu $sp, $sp, 0x30 -/* 9D7A98 80240A78 00000000 */ nop -/* 9D7A9C 80240A7C 00000000 */ nop +/* 9D7A98 80240A78 00000000 */ nop +/* 9D7A9C 80240A7C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240A80_9D7AA0.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240A80_9D7AA0.s index 73d732bd6a..2f8085e594 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240A80_9D7AA0.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240A80_9D7AA0.s @@ -45,7 +45,7 @@ glabel func_80240A80_9D7AA0 /* 9D7B3C 80240B1C 0C00A7B5 */ jal dist2D /* 9D7B40 80240B20 4600B386 */ mov.s $f14, $f22 /* 9D7B44 80240B24 4614003C */ c.lt.s $f0, $f20 -/* 9D7B48 80240B28 00000000 */ nop +/* 9D7B48 80240B28 00000000 */ nop /* 9D7B4C 80240B2C 45000003 */ bc1f .L80240B3C /* 9D7B50 80240B30 2631000C */ addiu $s1, $s1, 0xc /* 9D7B54 80240B34 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_80240A80_9D7AA0 /* 9D7B80 80240B60 8E6200D0 */ lw $v0, 0xd0($s3) /* 9D7B84 80240B64 8C42007C */ lw $v0, 0x7c($v0) /* 9D7B88 80240B68 04410004 */ bgez $v0, .L80240B7C -/* 9D7B8C 80240B6C 00000000 */ nop +/* 9D7B8C 80240B6C 00000000 */ nop /* 9D7B90 80240B70 C6C00000 */ lwc1 $f0, ($s6) /* 9D7B94 80240B74 080902E7 */ j .L80240B9C /* 9D7B98 80240B78 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_80240A80_9D7AA0 /* 9D7B9C 80240B7C 3C018025 */ lui $at, %hi(D_80254620) /* 9D7BA0 80240B80 D4224620 */ ldc1 $f2, %lo(D_80254620)($at) /* 9D7BA4 80240B84 44820000 */ mtc1 $v0, $f0 -/* 9D7BA8 80240B88 00000000 */ nop +/* 9D7BA8 80240B88 00000000 */ nop /* 9D7BAC 80240B8C 46800021 */ cvt.d.w $f0, $f0 /* 9D7BB0 80240B90 46220003 */ div.d $f0, $f0, $f2 /* 9D7BB4 80240B94 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240BD8_9D7BF8.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240BD8_9D7BF8.s index 00cb0b3d51..c9f535465e 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240BD8_9D7BF8.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240BD8_9D7BF8.s @@ -44,7 +44,7 @@ glabel func_80240BD8_9D7BF8 /* 9D7C94 80240C74 2402000F */ addiu $v0, $zero, 0xf /* 9D7C98 80240C78 AFA2001C */ sw $v0, 0x1c($sp) /* 9D7C9C 80240C7C 44833000 */ mtc1 $v1, $f6 -/* 9D7CA0 80240C80 00000000 */ nop +/* 9D7CA0 80240C80 00000000 */ nop /* 9D7CA4 80240C84 468031A0 */ cvt.s.w $f6, $f6 /* 9D7CA8 80240C88 44073000 */ mfc1 $a3, $f6 /* 9D7CAC 80240C8C 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_80240BD8_9D7BF8 .L80240CDC: /* 9D7CFC 80240CDC 8602008C */ lh $v0, 0x8c($s0) /* 9D7D00 80240CE0 1440005D */ bnez $v0, .L80240E58 -/* 9D7D04 80240CE4 00000000 */ nop +/* 9D7D04 80240CE4 00000000 */ nop /* 9D7D08 80240CE8 C6000018 */ lwc1 $f0, 0x18($s0) /* 9D7D0C 80240CEC 3C014010 */ lui $at, 0x4010 /* 9D7D10 80240CF0 44811800 */ mtc1 $at, $f3 /* 9D7D14 80240CF4 44801000 */ mtc1 $zero, $f2 /* 9D7D18 80240CF8 46000021 */ cvt.d.s $f0, $f0 /* 9D7D1C 80240CFC 4622003C */ c.lt.d $f0, $f2 -/* 9D7D20 80240D00 00000000 */ nop +/* 9D7D20 80240D00 00000000 */ nop /* 9D7D24 80240D04 45000003 */ bc1f .L80240D14 /* 9D7D28 80240D08 0200202D */ daddu $a0, $s0, $zero /* 9D7D2C 80240D0C 08090346 */ j .L80240D18 @@ -88,7 +88,7 @@ glabel func_80240BD8_9D7BF8 /* 9D7D34 80240D14 24050001 */ addiu $a1, $zero, 1 .L80240D18: /* 9D7D38 80240D18 0C00F598 */ jal func_8003D660 -/* 9D7D3C 80240D1C 00000000 */ nop +/* 9D7D3C 80240D1C 00000000 */ nop /* 9D7D40 80240D20 C60C0038 */ lwc1 $f12, 0x38($s0) /* 9D7D44 80240D24 8E430078 */ lw $v1, 0x78($s2) /* 9D7D48 80240D28 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_80240BD8_9D7BF8 /* 9D7D70 80240D50 4406B000 */ mfc1 $a2, $f22 /* 9D7D74 80240D54 4407A000 */ mfc1 $a3, $f20 /* 9D7D78 80240D58 0C00A720 */ jal atan2 -/* 9D7D7C 80240D5C 00000000 */ nop +/* 9D7D7C 80240D5C 00000000 */ nop /* 9D7D80 80240D60 8E050018 */ lw $a1, 0x18($s0) /* 9D7D84 80240D64 44060000 */ mfc1 $a2, $f0 /* 9D7D88 80240D68 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_80240BD8_9D7BF8 /* 9D7D9C 80240D7C 4406B000 */ mfc1 $a2, $f22 /* 9D7DA0 80240D80 4407A000 */ mfc1 $a3, $f20 /* 9D7DA4 80240D84 0C00A7B5 */ jal dist2D -/* 9D7DA8 80240D88 00000000 */ nop +/* 9D7DA8 80240D88 00000000 */ nop /* 9D7DAC 80240D8C C6020018 */ lwc1 $f2, 0x18($s0) /* 9D7DB0 80240D90 4602003E */ c.le.s $f0, $f2 -/* 9D7DB4 80240D94 00000000 */ nop +/* 9D7DB4 80240D94 00000000 */ nop /* 9D7DB8 80240D98 4500002F */ bc1f .L80240E58 /* 9D7DBC 80240D9C 240403E8 */ addiu $a0, $zero, 0x3e8 /* 9D7DC0 80240DA0 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_80240BD8_9D7BF8 /* 9D7E14 80240DF4 18400003 */ blez $v0, .L80240E04 /* 9D7E18 80240DF8 24020004 */ addiu $v0, $zero, 4 /* 9D7E1C 80240DFC 14600002 */ bnez $v1, .L80240E08 -/* 9D7E20 80240E00 00000000 */ nop +/* 9D7E20 80240E00 00000000 */ nop .L80240E04: /* 9D7E24 80240E04 AE420070 */ sw $v0, 0x70($s2) .L80240E08: diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240F40_9D7F60.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240F40_9D7F60.s index 3d52ea02ad..1e206386df 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240F40_9D7F60.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240F40_9D7F60.s @@ -38,7 +38,7 @@ glabel func_80240F40_9D7F60 /* 9D7FE4 80240FC4 2402000F */ addiu $v0, $zero, 0xf /* 9D7FE8 80240FC8 AFA2001C */ sw $v0, 0x1c($sp) /* 9D7FEC 80240FCC 44833000 */ mtc1 $v1, $f6 -/* 9D7FF0 80240FD0 00000000 */ nop +/* 9D7FF0 80240FD0 00000000 */ nop /* 9D7FF4 80240FD4 468031A0 */ cvt.s.w $f6, $f6 /* 9D7FF8 80240FD8 44073000 */ mfc1 $a3, $f6 /* 9D7FFC 80240FDC 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_80240F40_9D7F60 .L80241040: /* 9D8060 80241040 8602008C */ lh $v0, 0x8c($s0) /* 9D8064 80241044 14400025 */ bnez $v0, .L802410DC -/* 9D8068 80241048 00000000 */ nop +/* 9D8068 80241048 00000000 */ nop /* 9D806C 8024104C 9602008E */ lhu $v0, 0x8e($s0) /* 9D8070 80241050 2442FFFF */ addiu $v0, $v0, -1 /* 9D8074 80241054 A602008E */ sh $v0, 0x8e($s0) /* 9D8078 80241058 00021400 */ sll $v0, $v0, 0x10 /* 9D807C 8024105C 1440001F */ bnez $v0, .L802410DC -/* 9D8080 80241060 00000000 */ nop +/* 9D8080 80241060 00000000 */ nop /* 9D8084 80241064 8E820074 */ lw $v0, 0x74($s4) /* 9D8088 80241068 2442FFFF */ addiu $v0, $v0, -1 /* 9D808C 8024106C 10400019 */ beqz $v0, .L802410D4 @@ -84,7 +84,7 @@ glabel func_80240F40_9D7F60 /* 9D8098 80241078 9442002A */ lhu $v0, 0x2a($v0) /* 9D809C 8024107C 30420010 */ andi $v0, $v0, 0x10 /* 9D80A0 80241080 14400007 */ bnez $v0, .L802410A0 -/* 9D80A4 80241084 00000000 */ nop +/* 9D80A4 80241084 00000000 */ nop /* 9D80A8 80241088 C600000C */ lwc1 $f0, 0xc($s0) /* 9D80AC 8024108C 3C014334 */ lui $at, 0x4334 /* 9D80B0 80241090 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802410FC_9D811C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802410FC_9D811C.s index af9b0b671b..0429809bb5 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802410FC_9D811C.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802410FC_9D811C.s @@ -28,7 +28,7 @@ glabel func_802410FC_9D811C /* 9D8174 80241154 8E0200D0 */ lw $v0, 0xd0($s0) /* 9D8178 80241158 8C42007C */ lw $v0, 0x7c($v0) /* 9D817C 8024115C 04410004 */ bgez $v0, .L80241170 -/* 9D8180 80241160 00000000 */ nop +/* 9D8180 80241160 00000000 */ nop /* 9D8184 80241164 C6400000 */ lwc1 $f0, ($s2) /* 9D8188 80241168 08090464 */ j .L80241190 /* 9D818C 8024116C E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_802410FC_9D811C /* 9D8190 80241170 3C018025 */ lui $at, %hi(D_80254628) /* 9D8194 80241174 D4224628 */ ldc1 $f2, %lo(D_80254628)($at) /* 9D8198 80241178 44820000 */ mtc1 $v0, $f0 -/* 9D819C 8024117C 00000000 */ nop +/* 9D819C 8024117C 00000000 */ nop /* 9D81A0 80241180 46800021 */ cvt.d.w $f0, $f0 /* 9D81A4 80241184 46220003 */ div.d $f0, $f0, $f2 /* 9D81A8 80241188 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024129C_9D82BC.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024129C_9D82BC.s index ddc3e8bad5..d7bd0922b2 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024129C_9D82BC.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024129C_9D82BC.s @@ -47,20 +47,20 @@ glabel func_8024129C_9D82BC /* 9D8364 80241344 8E02001C */ lw $v0, 0x1c($s0) /* 9D8368 80241348 46001005 */ abs.s $f0, $f2 /* 9D836C 8024134C 44822000 */ mtc1 $v0, $f4 -/* 9D8370 80241350 00000000 */ nop +/* 9D8370 80241350 00000000 */ nop /* 9D8374 80241354 46802120 */ cvt.s.w $f4, $f4 /* 9D8378 80241358 4600203C */ c.lt.s $f4, $f0 -/* 9D837C 8024135C 00000000 */ nop +/* 9D837C 8024135C 00000000 */ nop /* 9D8380 80241360 4500000D */ bc1f .L80241398 -/* 9D8384 80241364 00000000 */ nop +/* 9D8384 80241364 00000000 */ nop /* 9D8388 80241368 44800000 */ mtc1 $zero, $f0 /* 9D838C 8024136C C654000C */ lwc1 $f20, 0xc($s2) /* 9D8390 80241370 4600103C */ c.lt.s $f2, $f0 -/* 9D8394 80241374 00000000 */ nop +/* 9D8394 80241374 00000000 */ nop /* 9D8398 80241378 45000006 */ bc1f .L80241394 /* 9D839C 8024137C 00021023 */ negu $v0, $v0 /* 9D83A0 80241380 44820000 */ mtc1 $v0, $f0 -/* 9D83A4 80241384 00000000 */ nop +/* 9D83A4 80241384 00000000 */ nop /* 9D83A8 80241388 46800020 */ cvt.s.w $f0, $f0 /* 9D83AC 8024138C 080904E6 */ j .L80241398 /* 9D83B0 80241390 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802413CC_9D83EC.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802413CC_9D83EC.s index 81240c5690..543e314c75 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802413CC_9D83EC.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802413CC_9D83EC.s @@ -37,7 +37,7 @@ glabel func_802413CC_9D83EC /* 9D846C 8024144C 2402000F */ addiu $v0, $zero, 0xf /* 9D8470 80241450 AFA2001C */ sw $v0, 0x1c($sp) /* 9D8474 80241454 44833000 */ mtc1 $v1, $f6 -/* 9D8478 80241458 00000000 */ nop +/* 9D8478 80241458 00000000 */ nop /* 9D847C 8024145C 468031A0 */ cvt.s.w $f6, $f6 /* 9D8480 80241460 44073000 */ mfc1 $a3, $f6 /* 9D8484 80241464 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241554_9D8574.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241554_9D8574.s index 9d544cc6c0..5f7c592875 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241554_9D8574.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241554_9D8574.s @@ -28,7 +28,7 @@ glabel func_80241554_9D8574 /* 9D85CC 802415AC C4400008 */ lwc1 $f0, 8($v0) /* 9D85D0 802415B0 46800020 */ cvt.s.w $f0, $f0 /* 9D85D4 802415B4 4602003E */ c.le.s $f0, $f2 -/* 9D85D8 802415B8 00000000 */ nop +/* 9D85D8 802415B8 00000000 */ nop /* 9D85DC 802415BC 45020003 */ bc1fl .L802415CC /* 9D85E0 802415C0 24840001 */ addiu $a0, $a0, 1 /* 9D85E4 802415C4 08090577 */ j .L802415DC diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s index cadb95c592..e8ddc1ceca 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s @@ -46,7 +46,7 @@ glabel func_80241614_9D8634 /* 9D86D8 802416B8 8E2200B0 */ lw $v0, 0xb0($s1) /* 9D86DC 802416BC 30420004 */ andi $v0, $v0, 4 /* 9D86E0 802416C0 10400044 */ beqz $v0, .L802417D4 -/* 9D86E4 802416C4 00000000 */ nop +/* 9D86E4 802416C4 00000000 */ nop .L802416C8: /* 9D86E8 802416C8 2404F7FF */ addiu $a0, $zero, -0x801 /* 9D86EC 802416CC AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80241614_9D8634 /* 9D87A0 80241780 3C0142C8 */ lui $at, 0x42c8 /* 9D87A4 80241784 44812000 */ mtc1 $at, $f4 /* 9D87A8 80241788 44823000 */ mtc1 $v0, $f6 -/* 9D87AC 8024178C 00000000 */ nop +/* 9D87AC 8024178C 00000000 */ nop /* 9D87B0 80241790 468031A0 */ cvt.s.w $f6, $f6 /* 9D87B4 80241794 27A20044 */ addiu $v0, $sp, 0x44 /* 9D87B8 80241798 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80241614_9D8634 /* 9D87DC 802417BC 0C0372DF */ jal func_800DCB7C /* 9D87E0 802417C0 27A70040 */ addiu $a3, $sp, 0x40 /* 9D87E4 802417C4 10400003 */ beqz $v0, .L802417D4 -/* 9D87E8 802417C8 00000000 */ nop +/* 9D87E8 802417C8 00000000 */ nop /* 9D87EC 802417CC C7A0003C */ lwc1 $f0, 0x3c($sp) /* 9D87F0 802417D0 E640003C */ swc1 $f0, 0x3c($s2) .L802417D4: @@ -124,72 +124,85 @@ glabel func_80241614_9D8634 /* 9D87F8 802417D8 2C620064 */ sltiu $v0, $v1, 0x64 /* 9D87FC 802417DC 10400042 */ beqz $v0, .L802418E8 /* 9D8800 802417E0 00031080 */ sll $v0, $v1, 2 -/* 9D8804 802417E4 3C018025 */ lui $at, %hi(D_80254630) +/* 9D8804 802417E4 3C018025 */ lui $at, %hi(jtbl_80254630_9EB650) /* 9D8808 802417E8 00220821 */ addu $at, $at, $v0 -/* 9D880C 802417EC 8C224630 */ lw $v0, %lo(D_80254630)($at) +/* 9D880C 802417EC 8C224630 */ lw $v0, %lo(jtbl_80254630_9EB650)($at) /* 9D8810 802417F0 00400008 */ jr $v0 -/* 9D8814 802417F4 00000000 */ nop +/* 9D8814 802417F4 00000000 */ nop +glabel L802417F8_9D8818 /* 9D8818 802417F8 0280202D */ daddu $a0, $s4, $zero /* 9D881C 802417FC 0260282D */ daddu $a1, $s3, $zero /* 9D8820 80241800 0C0902A0 */ jal func_80240A80_9D7AA0 /* 9D8824 80241804 02A0302D */ daddu $a2, $s5, $zero +glabel L80241808_9D8828 /* 9D8828 80241808 0280202D */ daddu $a0, $s4, $zero /* 9D882C 8024180C 0260282D */ daddu $a1, $s3, $zero /* 9D8830 80241810 0C0902F6 */ jal func_80240BD8_9D7BF8 /* 9D8834 80241814 02A0302D */ daddu $a2, $s5, $zero /* 9D8838 80241818 0809063A */ j .L802418E8 -/* 9D883C 8024181C 00000000 */ nop +/* 9D883C 8024181C 00000000 */ nop +glabel L80241820_9D8840 /* 9D8840 80241820 0280202D */ daddu $a0, $s4, $zero /* 9D8844 80241824 0260282D */ daddu $a1, $s3, $zero /* 9D8848 80241828 0C0903A0 */ jal nok_02_UnkNpcAIFunc1 /* 9D884C 8024182C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241830_9D8850 /* 9D8850 80241830 0280202D */ daddu $a0, $s4, $zero /* 9D8854 80241834 0260282D */ daddu $a1, $s3, $zero /* 9D8858 80241838 0C0903D0 */ jal func_80240F40_9D7F60 /* 9D885C 8024183C 02A0302D */ daddu $a2, $s5, $zero /* 9D8860 80241840 0809063A */ j .L802418E8 -/* 9D8864 80241844 00000000 */ nop +/* 9D8864 80241844 00000000 */ nop +glabel L80241848_9D8868 /* 9D8868 80241848 0280202D */ daddu $a0, $s4, $zero /* 9D886C 8024184C 0260282D */ daddu $a1, $s3, $zero /* 9D8870 80241850 0C09043F */ jal func_802410FC_9D811C /* 9D8874 80241854 02A0302D */ daddu $a2, $s5, $zero /* 9D8878 80241858 0809063A */ j .L802418E8 -/* 9D887C 8024185C 00000000 */ nop +/* 9D887C 8024185C 00000000 */ nop +glabel L80241860_9D8880 /* 9D8880 80241860 0280202D */ daddu $a0, $s4, $zero /* 9D8884 80241864 0260282D */ daddu $a1, $s3, $zero /* 9D8888 80241868 0C09046C */ jal nok_02_NpcJumpFunc2 /* 9D888C 8024186C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241870_9D8890 /* 9D8890 80241870 0280202D */ daddu $a0, $s4, $zero /* 9D8894 80241874 0260282D */ daddu $a1, $s3, $zero /* 9D8898 80241878 0C090489 */ jal nok_02_NpcJumpFunc /* 9D889C 8024187C 02A0302D */ daddu $a2, $s5, $zero /* 9D88A0 80241880 0809063A */ j .L802418E8 -/* 9D88A4 80241884 00000000 */ nop +/* 9D88A4 80241884 00000000 */ nop +glabel L80241888_9D88A8 /* 9D88A8 80241888 0280202D */ daddu $a0, $s4, $zero /* 9D88AC 8024188C 0260282D */ daddu $a1, $s3, $zero /* 9D88B0 80241890 0C0904A7 */ jal func_8024129C_9D82BC /* 9D88B4 80241894 02A0302D */ daddu $a2, $s5, $zero +glabel L80241898_9D88B8 /* 9D88B8 80241898 0280202D */ daddu $a0, $s4, $zero /* 9D88BC 8024189C 0260282D */ daddu $a1, $s3, $zero /* 9D88C0 802418A0 0C0904F3 */ jal func_802413CC_9D83EC /* 9D88C4 802418A4 02A0302D */ daddu $a2, $s5, $zero /* 9D88C8 802418A8 0809063A */ j .L802418E8 -/* 9D88CC 802418AC 00000000 */ nop +/* 9D88CC 802418AC 00000000 */ nop +glabel L802418B0_9D88D0 /* 9D88D0 802418B0 0280202D */ daddu $a0, $s4, $zero /* 9D88D4 802418B4 0260282D */ daddu $a1, $s3, $zero /* 9D88D8 802418B8 0C09053B */ jal nok_02_UnkNpcDurationFlagFunc /* 9D88DC 802418BC 02A0302D */ daddu $a2, $s5, $zero /* 9D88E0 802418C0 0809063A */ j .L802418E8 -/* 9D88E4 802418C4 00000000 */ nop +/* 9D88E4 802418C4 00000000 */ nop +glabel L802418C8_9D88E8 /* 9D88E8 802418C8 0280202D */ daddu $a0, $s4, $zero /* 9D88EC 802418CC 0260282D */ daddu $a1, $s3, $zero /* 9D88F0 802418D0 0C090555 */ jal func_80241554_9D8574 /* 9D88F4 802418D4 02A0302D */ daddu $a2, $s5, $zero /* 9D88F8 802418D8 0809063A */ j .L802418E8 -/* 9D88FC 802418DC 00000000 */ nop +/* 9D88FC 802418DC 00000000 */ nop +glabel L802418E0_9D8900 /* 9D8900 802418E0 0C0129CF */ jal func_8004A73C /* 9D8904 802418E4 0280202D */ daddu $a0, $s4, $zero .L802418E8: +glabel L802418E8_9D8908 /* 9D8908 802418E8 8FBF0060 */ lw $ra, 0x60($sp) /* 9D890C 802418EC 8FB5005C */ lw $s5, 0x5c($sp) /* 9D8910 802418F0 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241910_9D8930.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241910_9D8930.s index 7d216e6d28..b712c082dd 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241910_9D8930.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241910_9D8930.s @@ -26,7 +26,7 @@ glabel func_80241910_9D8930 /* 9D8980 80241960 1440FFFA */ bnez $v0, .L8024194C /* 9D8984 80241964 24A50004 */ addiu $a1, $a1, 4 /* 9D8988 80241968 0809066B */ j .L802419AC -/* 9D898C 8024196C 00000000 */ nop +/* 9D898C 8024196C 00000000 */ nop .L80241970: /* 9D8990 80241970 0000182D */ daddu $v1, $zero, $zero /* 9D8994 80241974 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A4C_9D8A6C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A4C_9D8A6C.s index 9206132f83..ee2607e43a 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A4C_9D8A6C.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A4C_9D8A6C.s @@ -115,7 +115,7 @@ glabel func_80241A4C_9D8A6C /* 9D8C14 80241BF4 14E20005 */ bne $a3, $v0, .L80241C0C /* 9D8C18 80241BF8 32E2FFFF */ andi $v0, $s7, 0xffff /* 9D8C1C 80241BFC 14400003 */ bnez $v0, .L80241C0C -/* 9D8C20 80241C00 00000000 */ nop +/* 9D8C20 80241C00 00000000 */ nop /* 9D8C24 80241C04 14800008 */ bnez $a0, .L80241C28 /* 9D8C28 80241C08 24020001 */ addiu $v0, $zero, 1 .L80241C0C: @@ -123,7 +123,7 @@ glabel func_80241A4C_9D8A6C /* 9D8C30 80241C10 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 9D8C34 80241C14 80420075 */ lb $v0, 0x75($v0) /* 9D8C38 80241C18 10400005 */ beqz $v0, .L80241C30 -/* 9D8C3C 80241C1C 00000000 */ nop +/* 9D8C3C 80241C1C 00000000 */ nop /* 9D8C40 80241C20 10800003 */ beqz $a0, .L80241C30 /* 9D8C44 80241C24 24020001 */ addiu $v0, $zero, 1 .L80241C28: diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241D3C_9D8D5C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241D3C_9D8D5C.s index 084a17775b..53e6bf78c6 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241D3C_9D8D5C.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241D3C_9D8D5C.s @@ -39,13 +39,13 @@ glabel func_80241D3C_9D8D5C /* 9D8DE0 80241DC0 10740005 */ beq $v1, $s4, .L80241DD8 /* 9D8DE4 80241DC4 26100001 */ addiu $s0, $s0, 1 /* 9D8DE8 80241DC8 10730003 */ beq $v1, $s3, .L80241DD8 -/* 9D8DEC 80241DCC 00000000 */ nop +/* 9D8DEC 80241DCC 00000000 */ nop /* 9D8DF0 80241DD0 00521025 */ or $v0, $v0, $s2 /* 9D8DF4 80241DD4 AC820000 */ sw $v0, ($a0) .L80241DD8: /* 9D8DF8 80241DD8 2A020040 */ slti $v0, $s0, 0x40 /* 9D8DFC 80241DDC 1440FFEF */ bnez $v0, .L80241D9C -/* 9D8E00 80241DE0 00000000 */ nop +/* 9D8E00 80241DE0 00000000 */ nop /* 9D8E04 80241DE4 0000802D */ daddu $s0, $zero, $zero /* 9D8E08 80241DE8 3C120800 */ lui $s2, 0x800 .L80241DEC: @@ -57,13 +57,13 @@ glabel func_80241D3C_9D8D5C /* 9D8E20 80241E00 8C640000 */ lw $a0, ($v1) /* 9D8E24 80241E04 30820010 */ andi $v0, $a0, 0x10 /* 9D8E28 80241E08 10400003 */ beqz $v0, .L80241E18 -/* 9D8E2C 80241E0C 00000000 */ nop +/* 9D8E2C 80241E0C 00000000 */ nop /* 9D8E30 80241E10 00921025 */ or $v0, $a0, $s2 /* 9D8E34 80241E14 AC620000 */ sw $v0, ($v1) .L80241E18: /* 9D8E38 80241E18 2A020100 */ slti $v0, $s0, 0x100 /* 9D8E3C 80241E1C 1440FFF3 */ bnez $v0, .L80241DEC -/* 9D8E40 80241E20 00000000 */ nop +/* 9D8E40 80241E20 00000000 */ nop /* 9D8E44 80241E24 AE200070 */ sw $zero, 0x70($s1) .L80241E28: /* 9D8E48 80241E28 8E220070 */ lw $v0, 0x70($s1) diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241E88_9D8EA8.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241E88_9D8EA8.s index 6b24cbe719..36469c3b29 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241E88_9D8EA8.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241E88_9D8EA8.s @@ -32,7 +32,7 @@ glabel func_80241E88_9D8EA8 /* 9D8F0C 80241EEC 0080302D */ daddu $a2, $a0, $zero /* 9D8F10 80241EF0 8E020070 */ lw $v0, 0x70($s0) /* 9D8F14 80241EF4 14400006 */ bnez $v0, .L80241F10 -/* 9D8F18 80241EF8 00000000 */ nop +/* 9D8F18 80241EF8 00000000 */ nop /* 9D8F1C 80241EFC 8E020074 */ lw $v0, 0x74($s0) /* 9D8F20 80241F00 14400003 */ bnez $v0, .L80241F10 /* 9D8F24 80241F04 24020001 */ addiu $v0, $zero, 1 @@ -66,13 +66,13 @@ glabel func_80241E88_9D8EA8 /* 9D8F8C 80241F6C 10730005 */ beq $v1, $s3, .L80241F84 /* 9D8F90 80241F70 26100001 */ addiu $s0, $s0, 1 /* 9D8F94 80241F74 10720003 */ beq $v1, $s2, .L80241F84 -/* 9D8F98 80241F78 00000000 */ nop +/* 9D8F98 80241F78 00000000 */ nop /* 9D8F9C 80241F7C 00511024 */ and $v0, $v0, $s1 /* 9D8FA0 80241F80 AC820000 */ sw $v0, ($a0) .L80241F84: /* 9D8FA4 80241F84 2A020040 */ slti $v0, $s0, 0x40 /* 9D8FA8 80241F88 1440FFEF */ bnez $v0, .L80241F48 -/* 9D8FAC 80241F8C 00000000 */ nop +/* 9D8FAC 80241F8C 00000000 */ nop /* 9D8FB0 80241F90 0000802D */ daddu $s0, $zero, $zero /* 9D8FB4 80241F94 3C11F7FF */ lui $s1, 0xf7ff /* 9D8FB8 80241F98 3631FFFF */ ori $s1, $s1, 0xffff @@ -85,7 +85,7 @@ glabel func_80241E88_9D8EA8 /* 9D8FD0 80241FB0 8C640000 */ lw $a0, ($v1) /* 9D8FD4 80241FB4 30820010 */ andi $v0, $a0, 0x10 /* 9D8FD8 80241FB8 10400003 */ beqz $v0, .L80241FC8 -/* 9D8FDC 80241FBC 00000000 */ nop +/* 9D8FDC 80241FBC 00000000 */ nop /* 9D8FE0 80241FC0 00911024 */ and $v0, $a0, $s1 /* 9D8FE4 80241FC4 AC620000 */ sw $v0, ($v1) .L80241FC8: @@ -93,7 +93,7 @@ glabel func_80241E88_9D8EA8 /* 9D8FEC 80241FCC 1440FFF3 */ bnez $v0, .L80241F9C /* 9D8FF0 80241FD0 24020002 */ addiu $v0, $zero, 2 /* 9D8FF4 80241FD4 080907F8 */ j .L80241FE0 -/* 9D8FF8 80241FD8 00000000 */ nop +/* 9D8FF8 80241FD8 00000000 */ nop .L80241FDC: /* 9D8FFC 80241FDC 0000102D */ daddu $v0, $zero, $zero .L80241FE0: diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242080_9D90A0.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242080_9D90A0.s index a3662a8f85..4f2485b62b 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242080_9D90A0.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242080_9D90A0.s @@ -16,19 +16,19 @@ glabel func_80242080_9D90A0 /* 9D90CC 802420AC 0220202D */ daddu $a0, $s1, $zero /* 9D90D0 802420B0 3C05F4AC */ lui $a1, 0xf4ac /* 9D90D4 802420B4 4482B000 */ mtc1 $v0, $f22 -/* 9D90D8 802420B8 00000000 */ nop +/* 9D90D8 802420B8 00000000 */ nop /* 9D90DC 802420BC 4680B5A0 */ cvt.s.w $f22, $f22 /* 9D90E0 802420C0 0C0B1EAF */ jal get_variable /* 9D90E4 802420C4 34A5D482 */ ori $a1, $a1, 0xd482 /* 9D90E8 802420C8 0220202D */ daddu $a0, $s1, $zero /* 9D90EC 802420CC 3C05F4AC */ lui $a1, 0xf4ac /* 9D90F0 802420D0 4482A000 */ mtc1 $v0, $f20 -/* 9D90F4 802420D4 00000000 */ nop +/* 9D90F4 802420D4 00000000 */ nop /* 9D90F8 802420D8 4680A520 */ cvt.s.w $f20, $f20 /* 9D90FC 802420DC 0C0B1EAF */ jal get_variable /* 9D9100 802420E0 34A5D483 */ ori $a1, $a1, 0xd483 /* 9D9104 802420E4 44821000 */ mtc1 $v0, $f2 -/* 9D9108 802420E8 00000000 */ nop +/* 9D9108 802420E8 00000000 */ nop /* 9D910C 802420EC 468010A0 */ cvt.s.w $f2, $f2 /* 9D9110 802420F0 4405B000 */ mfc1 $a1, $f22 /* 9D9114 802420F4 4406A000 */ mfc1 $a2, $f20 @@ -45,19 +45,19 @@ glabel func_80242080_9D90A0 /* 9D9140 80242120 0220202D */ daddu $a0, $s1, $zero /* 9D9144 80242124 3C05F4AC */ lui $a1, 0xf4ac /* 9D9148 80242128 4482B000 */ mtc1 $v0, $f22 -/* 9D914C 8024212C 00000000 */ nop +/* 9D914C 8024212C 00000000 */ nop /* 9D9150 80242130 4680B5A0 */ cvt.s.w $f22, $f22 /* 9D9154 80242134 0C0B1EAF */ jal get_variable /* 9D9158 80242138 34A5D482 */ ori $a1, $a1, 0xd482 /* 9D915C 8024213C 0220202D */ daddu $a0, $s1, $zero /* 9D9160 80242140 3C05F4AC */ lui $a1, 0xf4ac /* 9D9164 80242144 4482A000 */ mtc1 $v0, $f20 -/* 9D9168 80242148 00000000 */ nop +/* 9D9168 80242148 00000000 */ nop /* 9D916C 8024214C 4680A520 */ cvt.s.w $f20, $f20 /* 9D9170 80242150 0C0B1EAF */ jal get_variable /* 9D9174 80242154 34A5D483 */ ori $a1, $a1, 0xd483 /* 9D9178 80242158 44821000 */ mtc1 $v0, $f2 -/* 9D917C 8024215C 00000000 */ nop +/* 9D917C 8024215C 00000000 */ nop /* 9D9180 80242160 468010A0 */ cvt.s.w $f2, $f2 /* 9D9184 80242164 4405B000 */ mfc1 $a1, $f22 /* 9D9188 80242168 4406A000 */ mfc1 $a2, $f20 @@ -73,19 +73,19 @@ glabel func_80242080_9D90A0 /* 9D91B0 80242190 0220202D */ daddu $a0, $s1, $zero /* 9D91B4 80242194 3C05F4AC */ lui $a1, 0xf4ac /* 9D91B8 80242198 4482B000 */ mtc1 $v0, $f22 -/* 9D91BC 8024219C 00000000 */ nop +/* 9D91BC 8024219C 00000000 */ nop /* 9D91C0 802421A0 4680B5A0 */ cvt.s.w $f22, $f22 /* 9D91C4 802421A4 0C0B1EAF */ jal get_variable /* 9D91C8 802421A8 34A5D482 */ ori $a1, $a1, 0xd482 /* 9D91CC 802421AC 0220202D */ daddu $a0, $s1, $zero /* 9D91D0 802421B0 3C05F4AC */ lui $a1, 0xf4ac /* 9D91D4 802421B4 4482A000 */ mtc1 $v0, $f20 -/* 9D91D8 802421B8 00000000 */ nop +/* 9D91D8 802421B8 00000000 */ nop /* 9D91DC 802421BC 4680A520 */ cvt.s.w $f20, $f20 /* 9D91E0 802421C0 0C0B1EAF */ jal get_variable /* 9D91E4 802421C4 34A5D483 */ ori $a1, $a1, 0xd483 /* 9D91E8 802421C8 44821000 */ mtc1 $v0, $f2 -/* 9D91EC 802421CC 00000000 */ nop +/* 9D91EC 802421CC 00000000 */ nop /* 9D91F0 802421D0 468010A0 */ cvt.s.w $f2, $f2 /* 9D91F4 802421D4 4405B000 */ mfc1 $a1, $f22 /* 9D91F8 802421D8 4406A000 */ mfc1 $a2, $f20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242298_9D92B8.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242298_9D92B8.s index ef80ec6e97..a339619f6e 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242298_9D92B8.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242298_9D92B8.s @@ -44,7 +44,7 @@ glabel func_80242298_9D92B8 /* 9D934C 8024232C 3C048025 */ lui $a0, %hi(func_802549A0) /* 9D9350 80242330 8C8449A0 */ lw $a0, %lo(func_802549A0)($a0) /* 9D9354 80242334 0C048D70 */ jal func_801235C0 -/* 9D9358 80242338 00000000 */ nop +/* 9D9358 80242338 00000000 */ nop /* 9D935C 8024233C 24020002 */ addiu $v0, $zero, 2 .L80242340: /* 9D9360 80242340 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242908_9D9928.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242908_9D9928.s index 958d65710a..2e4275f405 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242908_9D9928.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242908_9D9928.s @@ -13,7 +13,7 @@ glabel func_80242908_9D9928 /* 9D9948 80242928 14620006 */ bne $v1, $v0, .L80242944 /* 9D994C 8024292C 24020002 */ addiu $v0, $zero, 2 /* 9D9950 80242930 44800000 */ mtc1 $zero, $f0 -/* 9D9954 80242934 00000000 */ nop +/* 9D9954 80242934 00000000 */ nop /* 9D9958 80242938 44050000 */ mfc1 $a1, $f0 /* 9D995C 8024293C 08090A57 */ j .L8024295C /* 9D9960 80242940 0000202D */ daddu $a0, $zero, $zero @@ -21,9 +21,9 @@ glabel func_80242908_9D9928 /* 9D9964 80242944 14620008 */ bne $v1, $v0, .L80242968 /* 9D9968 80242948 24040001 */ addiu $a0, $zero, 1 /* 9D996C 8024294C 44800000 */ mtc1 $zero, $f0 -/* 9D9970 80242950 00000000 */ nop +/* 9D9970 80242950 00000000 */ nop /* 9D9974 80242954 44050000 */ mfc1 $a1, $f0 -/* 9D9978 80242958 00000000 */ nop +/* 9D9978 80242958 00000000 */ nop .L8024295C: /* 9D997C 8024295C 00A0302D */ daddu $a2, $a1, $zero /* 9D9980 80242960 0C01C5A4 */ jal func_80071690 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C5C_9D9C7C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C5C_9D9C7C.s index 63afd41c64..2ba6d5f281 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C5C_9D9C7C.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C5C_9D9C7C.s @@ -28,7 +28,7 @@ glabel func_80242C5C_9D9C7C /* 9D9CD0 80242CB0 00220821 */ addu $at, $at, $v0 /* 9D9CD4 80242CB4 AC2049D0 */ sw $zero, %lo(D_802549D0)($at) /* 9D9CD8 80242CB8 08090B3A */ j .L80242CE8 -/* 9D9CDC 80242CBC 00000000 */ nop +/* 9D9CDC 80242CBC 00000000 */ nop .L80242CC0: /* 9D9CE0 80242CC0 3C038025 */ lui $v1, %hi(D_802549D0) /* 9D9CE4 80242CC4 246349D0 */ addiu $v1, $v1, %lo(D_802549D0) diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243010_9DA030.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243010_9DA030.s index c2d64c0783..b6b40f67b0 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243010_9DA030.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243010_9DA030.s @@ -16,20 +16,20 @@ glabel func_80243010_9DA030 /* 9DA05C 8024303C 8E050000 */ lw $a1, ($s0) /* 9DA060 80243040 26100004 */ addiu $s0, $s0, 4 /* 9DA064 80243044 4482B000 */ mtc1 $v0, $f22 -/* 9DA068 80243048 00000000 */ nop +/* 9DA068 80243048 00000000 */ nop /* 9DA06C 8024304C 4680B5A0 */ cvt.s.w $f22, $f22 /* 9DA070 80243050 0C0B1EAF */ jal get_variable /* 9DA074 80243054 0220202D */ daddu $a0, $s1, $zero /* 9DA078 80243058 8E050000 */ lw $a1, ($s0) /* 9DA07C 8024305C 4482A000 */ mtc1 $v0, $f20 -/* 9DA080 80243060 00000000 */ nop +/* 9DA080 80243060 00000000 */ nop /* 9DA084 80243064 4680A520 */ cvt.s.w $f20, $f20 /* 9DA088 80243068 0C0B1EAF */ jal get_variable /* 9DA08C 8024306C 0220202D */ daddu $a0, $s1, $zero /* 9DA090 80243070 3C014170 */ lui $at, 0x4170 /* 9DA094 80243074 44810000 */ mtc1 $at, $f0 /* 9DA098 80243078 44821000 */ mtc1 $v0, $f2 -/* 9DA09C 8024307C 00000000 */ nop +/* 9DA09C 8024307C 00000000 */ nop /* 9DA0A0 80243080 468010A0 */ cvt.s.w $f2, $f2 /* 9DA0A4 80243084 4600A500 */ add.s $f20, $f20, $f0 /* 9DA0A8 80243088 4405B000 */ mfc1 $a1, $f22 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802430CC_9DA0EC.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802430CC_9DA0EC.s index 8256d4e4d0..4d80391af1 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802430CC_9DA0EC.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802430CC_9DA0EC.s @@ -22,9 +22,9 @@ glabel func_802430CC_9DA0EC /* 9DA130 80243110 C6420054 */ lwc1 $f2, 0x54($s2) /* 9DA134 80243114 3C014080 */ lui $at, 0x4080 /* 9DA138 80243118 44810000 */ mtc1 $at, $f0 -/* 9DA13C 8024311C 00000000 */ nop +/* 9DA13C 8024311C 00000000 */ nop /* 9DA140 80243120 4602003E */ c.le.s $f0, $f2 -/* 9DA144 80243124 00000000 */ nop +/* 9DA144 80243124 00000000 */ nop /* 9DA148 80243128 45000009 */ bc1f .L80243150 /* 9DA14C 8024312C 0040202D */ daddu $a0, $v0, $zero /* 9DA150 80243130 8E22008C */ lw $v0, 0x8c($s1) @@ -42,20 +42,20 @@ glabel func_802430CC_9DA0EC /* 9DA178 80243158 C6400028 */ lwc1 $f0, 0x28($s2) /* 9DA17C 8024315C 46001081 */ sub.s $f2, $f2, $f0 /* 9DA180 80243160 46021102 */ mul.s $f4, $f2, $f2 -/* 9DA184 80243164 00000000 */ nop +/* 9DA184 80243164 00000000 */ nop /* 9DA188 80243168 C6400030 */ lwc1 $f0, 0x30($s2) /* 9DA18C 8024316C C6020040 */ lwc1 $f2, 0x40($s0) /* 9DA190 80243170 46001001 */ sub.s $f0, $f2, $f0 /* 9DA194 80243174 46000002 */ mul.s $f0, $f0, $f0 -/* 9DA198 80243178 00000000 */ nop +/* 9DA198 80243178 00000000 */ nop /* 9DA19C 8024317C 46002100 */ add.s $f4, $f4, $f0 /* 9DA1A0 80243180 3C0145C8 */ lui $at, 0x45c8 /* 9DA1A4 80243184 44810000 */ mtc1 $at, $f0 -/* 9DA1A8 80243188 00000000 */ nop +/* 9DA1A8 80243188 00000000 */ nop /* 9DA1AC 8024318C 4600203C */ c.lt.s $f4, $f0 -/* 9DA1B0 80243190 00000000 */ nop +/* 9DA1B0 80243190 00000000 */ nop /* 9DA1B4 80243194 45000005 */ bc1f .L802431AC -/* 9DA1B8 80243198 00000000 */ nop +/* 9DA1B8 80243198 00000000 */ nop /* 9DA1BC 8024319C 8E22008C */ lw $v0, 0x8c($s1) /* 9DA1C0 802431A0 28420002 */ slti $v0, $v0, 2 /* 9DA1C4 802431A4 50400001 */ beql $v0, $zero, .L802431AC @@ -65,18 +65,18 @@ glabel func_802430CC_9DA0EC /* 9DA1D0 802431B0 C4800038 */ lwc1 $f0, 0x38($a0) /* 9DA1D4 802431B4 46001081 */ sub.s $f2, $f2, $f0 /* 9DA1D8 802431B8 46021102 */ mul.s $f4, $f2, $f2 -/* 9DA1DC 802431BC 00000000 */ nop +/* 9DA1DC 802431BC 00000000 */ nop /* 9DA1E0 802431C0 C4800040 */ lwc1 $f0, 0x40($a0) /* 9DA1E4 802431C4 C6020040 */ lwc1 $f2, 0x40($s0) /* 9DA1E8 802431C8 46001001 */ sub.s $f0, $f2, $f0 /* 9DA1EC 802431CC 46000002 */ mul.s $f0, $f0, $f0 -/* 9DA1F0 802431D0 00000000 */ nop +/* 9DA1F0 802431D0 00000000 */ nop /* 9DA1F4 802431D4 46002100 */ add.s $f4, $f4, $f0 /* 9DA1F8 802431D8 3C0144C8 */ lui $at, 0x44c8 /* 9DA1FC 802431DC 44810000 */ mtc1 $at, $f0 -/* 9DA200 802431E0 00000000 */ nop +/* 9DA200 802431E0 00000000 */ nop /* 9DA204 802431E4 4600203C */ c.lt.s $f4, $f0 -/* 9DA208 802431E8 00000000 */ nop +/* 9DA208 802431E8 00000000 */ nop /* 9DA20C 802431EC 45030001 */ bc1tl .L802431F4 /* 9DA210 802431F0 24030001 */ addiu $v1, $zero, 1 .L802431F4: diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243214_9DA234.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243214_9DA234.s index c20f2fe5d2..db803ea209 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243214_9DA234.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243214_9DA234.s @@ -7,9 +7,9 @@ glabel func_80243214_9DA234 /* 9DA23C 8024321C C4A20054 */ lwc1 $f2, 0x54($a1) /* 9DA240 80243220 3C014080 */ lui $at, 0x4080 /* 9DA244 80243224 44810000 */ mtc1 $at, $f0 -/* 9DA248 80243228 00000000 */ nop +/* 9DA248 80243228 00000000 */ nop /* 9DA24C 8024322C 4602003E */ c.le.s $f0, $f2 -/* 9DA250 80243230 00000000 */ nop +/* 9DA250 80243230 00000000 */ nop /* 9DA254 80243234 45020008 */ bc1fl .L80243258 /* 9DA258 80243238 AC80008C */ sw $zero, 0x8c($a0) /* 9DA25C 8024323C 8C82008C */ lw $v0, 0x8c($a0) @@ -29,9 +29,9 @@ glabel func_80243214_9DA234 .L80243270: /* 9DA290 80243270 C4A20054 */ lwc1 $f2, 0x54($a1) /* 9DA294 80243274 44800000 */ mtc1 $zero, $f0 -/* 9DA298 80243278 00000000 */ nop +/* 9DA298 80243278 00000000 */ nop /* 9DA29C 8024327C 46001032 */ c.eq.s $f2, $f0 -/* 9DA2A0 80243280 00000000 */ nop +/* 9DA2A0 80243280 00000000 */ nop /* 9DA2A4 80243284 45030001 */ bc1tl .L8024328C /* 9DA2A8 80243288 AC800084 */ sw $zero, 0x84($a0) .L8024328C: diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243294_9DA2B4.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243294_9DA2B4.s index 25b2abd51e..1004899abc 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243294_9DA2B4.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243294_9DA2B4.s @@ -43,7 +43,7 @@ glabel func_80243294_9DA2B4 /* 9DA348 80243328 00061943 */ sra $v1, $a2, 5 /* 9DA34C 8024332C 00621823 */ subu $v1, $v1, $v0 /* 9DA350 80243330 44830000 */ mtc1 $v1, $f0 -/* 9DA354 80243334 00000000 */ nop +/* 9DA354 80243334 00000000 */ nop /* 9DA358 80243338 46800020 */ cvt.s.w $f0, $f0 /* 9DA35C 8024333C 0C00A67F */ jal rand_int /* 9DA360 80243340 46020580 */ add.s $f22, $f0, $f2 @@ -51,100 +51,100 @@ glabel func_80243294_9DA2B4 /* 9DA368 80243348 00540018 */ mult $v0, $s4 /* 9DA36C 8024334C 3C01C316 */ lui $at, 0xc316 /* 9DA370 80243350 44810000 */ mtc1 $at, $f0 -/* 9DA374 80243354 00000000 */ nop +/* 9DA374 80243354 00000000 */ nop /* 9DA378 80243358 4600B081 */ sub.s $f2, $f22, $f0 /* 9DA37C 8024335C 00003010 */ mfhi $a2 /* 9DA380 80243360 000217C3 */ sra $v0, $v0, 0x1f /* 9DA384 80243364 46021102 */ mul.s $f4, $f2, $f2 -/* 9DA388 80243368 00000000 */ nop +/* 9DA388 80243368 00000000 */ nop /* 9DA38C 8024336C 00061943 */ sra $v1, $a2, 5 /* 9DA390 80243370 00621823 */ subu $v1, $v1, $v0 /* 9DA394 80243374 C6420040 */ lwc1 $f2, 0x40($s2) /* 9DA398 80243378 44830000 */ mtc1 $v1, $f0 -/* 9DA39C 8024337C 00000000 */ nop +/* 9DA39C 8024337C 00000000 */ nop /* 9DA3A0 80243380 46800020 */ cvt.s.w $f0, $f0 /* 9DA3A4 80243384 46020500 */ add.s $f20, $f0, $f2 /* 9DA3A8 80243388 3C01437A */ lui $at, 0x437a /* 9DA3AC 8024338C 44810000 */ mtc1 $at, $f0 -/* 9DA3B0 80243390 00000000 */ nop +/* 9DA3B0 80243390 00000000 */ nop /* 9DA3B4 80243394 4600A001 */ sub.s $f0, $f20, $f0 /* 9DA3B8 80243398 46000002 */ mul.s $f0, $f0, $f0 -/* 9DA3BC 8024339C 00000000 */ nop +/* 9DA3BC 8024339C 00000000 */ nop /* 9DA3C0 802433A0 46002100 */ add.s $f4, $f4, $f0 /* 9DA3C4 802433A4 3C0146AF */ lui $at, 0x46af /* 9DA3C8 802433A8 3421C800 */ ori $at, $at, 0xc800 /* 9DA3CC 802433AC 44810000 */ mtc1 $at, $f0 -/* 9DA3D0 802433B0 00000000 */ nop +/* 9DA3D0 802433B0 00000000 */ nop /* 9DA3D4 802433B4 4600203C */ c.lt.s $f4, $f0 -/* 9DA3D8 802433B8 00000000 */ nop +/* 9DA3D8 802433B8 00000000 */ nop /* 9DA3DC 802433BC 45000021 */ bc1f .L80243444 /* 9DA3E0 802433C0 26311388 */ addiu $s1, $s1, 0x1388 /* 9DA3E4 802433C4 C6C00028 */ lwc1 $f0, 0x28($s6) /* 9DA3E8 802433C8 4600B081 */ sub.s $f2, $f22, $f0 /* 9DA3EC 802433CC 46021082 */ mul.s $f2, $f2, $f2 -/* 9DA3F0 802433D0 00000000 */ nop +/* 9DA3F0 802433D0 00000000 */ nop /* 9DA3F4 802433D4 C6C00030 */ lwc1 $f0, 0x30($s6) /* 9DA3F8 802433D8 4600A001 */ sub.s $f0, $f20, $f0 /* 9DA3FC 802433DC 46000002 */ mul.s $f0, $f0, $f0 -/* 9DA400 802433E0 00000000 */ nop +/* 9DA400 802433E0 00000000 */ nop /* 9DA404 802433E4 46001080 */ add.s $f2, $f2, $f0 /* 9DA408 802433E8 3C0145C8 */ lui $at, 0x45c8 /* 9DA40C 802433EC 44810000 */ mtc1 $at, $f0 -/* 9DA410 802433F0 00000000 */ nop +/* 9DA410 802433F0 00000000 */ nop /* 9DA414 802433F4 4602003C */ c.lt.s $f0, $f2 -/* 9DA418 802433F8 00000000 */ nop +/* 9DA418 802433F8 00000000 */ nop /* 9DA41C 802433FC 45000011 */ bc1f .L80243444 -/* 9DA420 80243400 00000000 */ nop +/* 9DA420 80243400 00000000 */ nop /* 9DA424 80243404 C6600038 */ lwc1 $f0, 0x38($s3) /* 9DA428 80243408 4600B081 */ sub.s $f2, $f22, $f0 /* 9DA42C 8024340C 46021082 */ mul.s $f2, $f2, $f2 -/* 9DA430 80243410 00000000 */ nop +/* 9DA430 80243410 00000000 */ nop /* 9DA434 80243414 C6600040 */ lwc1 $f0, 0x40($s3) /* 9DA438 80243418 4600A001 */ sub.s $f0, $f20, $f0 /* 9DA43C 8024341C 46000002 */ mul.s $f0, $f0, $f0 -/* 9DA440 80243420 00000000 */ nop +/* 9DA440 80243420 00000000 */ nop /* 9DA444 80243424 46001080 */ add.s $f2, $f2, $f0 /* 9DA448 80243428 3C0144C8 */ lui $at, 0x44c8 /* 9DA44C 8024342C 44810000 */ mtc1 $at, $f0 -/* 9DA450 80243430 00000000 */ nop +/* 9DA450 80243430 00000000 */ nop /* 9DA454 80243434 4602003C */ c.lt.s $f0, $f2 -/* 9DA458 80243438 00000000 */ nop +/* 9DA458 80243438 00000000 */ nop /* 9DA45C 8024343C 45010006 */ bc1t .L80243458 -/* 9DA460 80243440 00000000 */ nop +/* 9DA460 80243440 00000000 */ nop .L80243444: /* 9DA464 80243444 2A227531 */ slti $v0, $s1, 0x7531 /* 9DA468 80243448 5040FFAC */ beql $v0, $zero, .L802432FC /* 9DA46C 8024344C 24117530 */ addiu $s1, $zero, 0x7530 /* 9DA470 80243450 08090CBF */ j .L802432FC -/* 9DA474 80243454 00000000 */ nop +/* 9DA474 80243454 00000000 */ nop .L80243458: /* 9DA478 80243458 C6400038 */ lwc1 $f0, 0x38($s2) /* 9DA47C 8024345C 4600B081 */ sub.s $f2, $f22, $f0 /* 9DA480 80243460 46021082 */ mul.s $f2, $f2, $f2 -/* 9DA484 80243464 00000000 */ nop +/* 9DA484 80243464 00000000 */ nop /* 9DA488 80243468 C6400040 */ lwc1 $f0, 0x40($s2) /* 9DA48C 8024346C 4600A001 */ sub.s $f0, $f20, $f0 /* 9DA490 80243470 46000002 */ mul.s $f0, $f0, $f0 -/* 9DA494 80243474 00000000 */ nop +/* 9DA494 80243474 00000000 */ nop /* 9DA498 80243478 46001300 */ add.s $f12, $f2, $f0 /* 9DA49C 8024347C 44800000 */ mtc1 $zero, $f0 -/* 9DA4A0 80243480 00000000 */ nop +/* 9DA4A0 80243480 00000000 */ nop /* 9DA4A4 80243484 46006032 */ c.eq.s $f12, $f0 -/* 9DA4A8 80243488 00000000 */ nop +/* 9DA4A8 80243488 00000000 */ nop /* 9DA4AC 8024348C 4501000D */ bc1t .L802434C4 -/* 9DA4B0 80243490 00000000 */ nop +/* 9DA4B0 80243490 00000000 */ nop /* 9DA4B4 80243494 46006104 */ sqrt.s $f4, $f12 /* 9DA4B8 80243498 46042032 */ c.eq.s $f4, $f4 -/* 9DA4BC 8024349C 00000000 */ nop +/* 9DA4BC 8024349C 00000000 */ nop /* 9DA4C0 802434A0 45010004 */ bc1t .L802434B4 -/* 9DA4C4 802434A4 00000000 */ nop +/* 9DA4C4 802434A4 00000000 */ nop /* 9DA4C8 802434A8 0C0187BC */ jal sqrtf -/* 9DA4CC 802434AC 00000000 */ nop +/* 9DA4CC 802434AC 00000000 */ nop /* 9DA4D0 802434B0 46000106 */ mov.s $f4, $f0 .L802434B4: /* 9DA4D4 802434B4 3C014120 */ lui $at, 0x4120 /* 9DA4D8 802434B8 44810000 */ mtc1 $at, $f0 -/* 9DA4DC 802434BC 00000000 */ nop +/* 9DA4DC 802434BC 00000000 */ nop /* 9DA4E0 802434C0 46002303 */ div.s $f12, $f4, $f0 .L802434C4: /* 9DA4E4 802434C4 4600B18D */ trunc.w.s $f6, $f22 @@ -153,7 +153,7 @@ glabel func_80243294_9DA2B4 /* 9DA4F0 802434D0 E6A600B0 */ swc1 $f6, 0xb0($s5) /* 9DA4F4 802434D4 4600618D */ trunc.w.s $f6, $f12 /* 9DA4F8 802434D8 44023000 */ mfc1 $v0, $f6 -/* 9DA4FC 802434DC 00000000 */ nop +/* 9DA4FC 802434DC 00000000 */ nop /* 9DA500 802434E0 24420001 */ addiu $v0, $v0, 1 /* 9DA504 802434E4 AEA200B4 */ sw $v0, 0xb4($s5) /* 9DA508 802434E8 8FBF002C */ lw $ra, 0x2c($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024351C_9DA53C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024351C_9DA53C.s index 63a442a8b0..da02f069c0 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024351C_9DA53C.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024351C_9DA53C.s @@ -47,7 +47,7 @@ glabel func_8024351C_9DA53C /* 9DA5E0 802435C0 00061943 */ sra $v1, $a2, 5 /* 9DA5E4 802435C4 00621823 */ subu $v1, $v1, $v0 /* 9DA5E8 802435C8 44830000 */ mtc1 $v1, $f0 -/* 9DA5EC 802435CC 00000000 */ nop +/* 9DA5EC 802435CC 00000000 */ nop /* 9DA5F0 802435D0 46800020 */ cvt.s.w $f0, $f0 /* 9DA5F4 802435D4 0C00A67F */ jal rand_int /* 9DA5F8 802435D8 46020580 */ add.s $f22, $f0, $f2 @@ -57,72 +57,72 @@ glabel func_8024351C_9DA53C /* 9DA608 802435E8 00003010 */ mfhi $a2 /* 9DA60C 802435EC 000217C3 */ sra $v0, $v0, 0x1f /* 9DA610 802435F0 46021102 */ mul.s $f4, $f2, $f2 -/* 9DA614 802435F4 00000000 */ nop +/* 9DA614 802435F4 00000000 */ nop /* 9DA618 802435F8 00061943 */ sra $v1, $a2, 5 /* 9DA61C 802435FC 00621823 */ subu $v1, $v1, $v0 /* 9DA620 80243600 C6420040 */ lwc1 $f2, 0x40($s2) /* 9DA624 80243604 44830000 */ mtc1 $v1, $f0 -/* 9DA628 80243608 00000000 */ nop +/* 9DA628 80243608 00000000 */ nop /* 9DA62C 8024360C 46800020 */ cvt.s.w $f0, $f0 /* 9DA630 80243610 46020500 */ add.s $f20, $f0, $f2 /* 9DA634 80243614 461AA001 */ sub.s $f0, $f20, $f26 /* 9DA638 80243618 46000002 */ mul.s $f0, $f0, $f0 -/* 9DA63C 8024361C 00000000 */ nop +/* 9DA63C 8024361C 00000000 */ nop /* 9DA640 80243620 46002100 */ add.s $f4, $f4, $f0 /* 9DA644 80243624 4618203C */ c.lt.s $f4, $f24 -/* 9DA648 80243628 00000000 */ nop +/* 9DA648 80243628 00000000 */ nop /* 9DA64C 8024362C 45000011 */ bc1f .L80243674 /* 9DA650 80243630 26311388 */ addiu $s1, $s1, 0x1388 /* 9DA654 80243634 C6800028 */ lwc1 $f0, 0x28($s4) /* 9DA658 80243638 4600B081 */ sub.s $f2, $f22, $f0 /* 9DA65C 8024363C 46021082 */ mul.s $f2, $f2, $f2 -/* 9DA660 80243640 00000000 */ nop +/* 9DA660 80243640 00000000 */ nop /* 9DA664 80243644 C6800030 */ lwc1 $f0, 0x30($s4) /* 9DA668 80243648 4600A001 */ sub.s $f0, $f20, $f0 /* 9DA66C 8024364C 46000002 */ mul.s $f0, $f0, $f0 -/* 9DA670 80243650 00000000 */ nop +/* 9DA670 80243650 00000000 */ nop /* 9DA674 80243654 46001080 */ add.s $f2, $f2, $f0 /* 9DA678 80243658 3C0145C8 */ lui $at, 0x45c8 /* 9DA67C 8024365C 44810000 */ mtc1 $at, $f0 -/* 9DA680 80243660 00000000 */ nop +/* 9DA680 80243660 00000000 */ nop /* 9DA684 80243664 4602003C */ c.lt.s $f0, $f2 -/* 9DA688 80243668 00000000 */ nop +/* 9DA688 80243668 00000000 */ nop /* 9DA68C 8024366C 45010006 */ bc1t .L80243688 -/* 9DA690 80243670 00000000 */ nop +/* 9DA690 80243670 00000000 */ nop .L80243674: /* 9DA694 80243674 2A227531 */ slti $v0, $s1, 0x7531 /* 9DA698 80243678 5040FFC6 */ beql $v0, $zero, .L80243594 /* 9DA69C 8024367C 24117530 */ addiu $s1, $zero, 0x7530 /* 9DA6A0 80243680 08090D65 */ j .L80243594 -/* 9DA6A4 80243684 00000000 */ nop +/* 9DA6A4 80243684 00000000 */ nop .L80243688: /* 9DA6A8 80243688 C6400038 */ lwc1 $f0, 0x38($s2) /* 9DA6AC 8024368C 4600B081 */ sub.s $f2, $f22, $f0 /* 9DA6B0 80243690 46021082 */ mul.s $f2, $f2, $f2 -/* 9DA6B4 80243694 00000000 */ nop +/* 9DA6B4 80243694 00000000 */ nop /* 9DA6B8 80243698 C6400040 */ lwc1 $f0, 0x40($s2) /* 9DA6BC 8024369C 4600A001 */ sub.s $f0, $f20, $f0 /* 9DA6C0 802436A0 46000002 */ mul.s $f0, $f0, $f0 -/* 9DA6C4 802436A4 00000000 */ nop +/* 9DA6C4 802436A4 00000000 */ nop /* 9DA6C8 802436A8 46001300 */ add.s $f12, $f2, $f0 /* 9DA6CC 802436AC 44800000 */ mtc1 $zero, $f0 -/* 9DA6D0 802436B0 00000000 */ nop +/* 9DA6D0 802436B0 00000000 */ nop /* 9DA6D4 802436B4 46006032 */ c.eq.s $f12, $f0 -/* 9DA6D8 802436B8 00000000 */ nop +/* 9DA6D8 802436B8 00000000 */ nop /* 9DA6DC 802436BC 4501000D */ bc1t .L802436F4 -/* 9DA6E0 802436C0 00000000 */ nop +/* 9DA6E0 802436C0 00000000 */ nop /* 9DA6E4 802436C4 46006104 */ sqrt.s $f4, $f12 /* 9DA6E8 802436C8 46042032 */ c.eq.s $f4, $f4 -/* 9DA6EC 802436CC 00000000 */ nop +/* 9DA6EC 802436CC 00000000 */ nop /* 9DA6F0 802436D0 45010004 */ bc1t .L802436E4 -/* 9DA6F4 802436D4 00000000 */ nop +/* 9DA6F4 802436D4 00000000 */ nop /* 9DA6F8 802436D8 0C0187BC */ jal sqrtf -/* 9DA6FC 802436DC 00000000 */ nop +/* 9DA6FC 802436DC 00000000 */ nop /* 9DA700 802436E0 46000106 */ mov.s $f4, $f0 .L802436E4: /* 9DA704 802436E4 3C014120 */ lui $at, 0x4120 /* 9DA708 802436E8 44810000 */ mtc1 $at, $f0 -/* 9DA70C 802436EC 00000000 */ nop +/* 9DA70C 802436EC 00000000 */ nop /* 9DA710 802436F0 46002303 */ div.s $f12, $f4, $f0 .L802436F4: /* 9DA714 802436F4 4600B18D */ trunc.w.s $f6, $f22 @@ -131,7 +131,7 @@ glabel func_8024351C_9DA53C /* 9DA720 80243700 E6A600B0 */ swc1 $f6, 0xb0($s5) /* 9DA724 80243704 4600618D */ trunc.w.s $f6, $f12 /* 9DA728 80243708 44023000 */ mfc1 $v0, $f6 -/* 9DA72C 8024370C 00000000 */ nop +/* 9DA72C 8024370C 00000000 */ nop /* 9DA730 80243710 24420001 */ addiu $v0, $v0, 1 /* 9DA734 80243714 AEA200B4 */ sw $v0, 0xb4($s5) /* 9DA738 80243718 8FBF0028 */ lw $ra, 0x28($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243754_9DA774.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243754_9DA774.s index 40a1bf4d78..171cf8764c 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243754_9DA774.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243754_9DA774.s @@ -21,14 +21,14 @@ glabel func_80243754_9DA774 /* 9DA7B4 80243794 0240202D */ daddu $a0, $s2, $zero /* 9DA7B8 80243798 C6020038 */ lwc1 $f2, 0x38($s0) /* 9DA7BC 8024379C 44820000 */ mtc1 $v0, $f0 -/* 9DA7C0 802437A0 00000000 */ nop +/* 9DA7C0 802437A0 00000000 */ nop /* 9DA7C4 802437A4 46800020 */ cvt.s.w $f0, $f0 /* 9DA7C8 802437A8 46020000 */ add.s $f0, $f0, $f2 /* 9DA7CC 802437AC 3C013F00 */ lui $at, 0x3f00 /* 9DA7D0 802437B0 4481A000 */ mtc1 $at, $f20 -/* 9DA7D4 802437B4 00000000 */ nop +/* 9DA7D4 802437B4 00000000 */ nop /* 9DA7D8 802437B8 46140002 */ mul.s $f0, $f0, $f20 -/* 9DA7DC 802437BC 00000000 */ nop +/* 9DA7DC 802437BC 00000000 */ nop /* 9DA7E0 802437C0 26310004 */ addiu $s1, $s1, 4 /* 9DA7E4 802437C4 E6000060 */ swc1 $f0, 0x60($s0) /* 9DA7E8 802437C8 8E250000 */ lw $a1, ($s1) @@ -36,11 +36,11 @@ glabel func_80243754_9DA774 /* 9DA7F0 802437D0 0240202D */ daddu $a0, $s2, $zero /* 9DA7F4 802437D4 C6000040 */ lwc1 $f0, 0x40($s0) /* 9DA7F8 802437D8 44827000 */ mtc1 $v0, $f14 -/* 9DA7FC 802437DC 00000000 */ nop +/* 9DA7FC 802437DC 00000000 */ nop /* 9DA800 802437E0 468073A0 */ cvt.s.w $f14, $f14 /* 9DA804 802437E4 46007380 */ add.s $f14, $f14, $f0 /* 9DA808 802437E8 46147382 */ mul.s $f14, $f14, $f20 -/* 9DA80C 802437EC 00000000 */ nop +/* 9DA80C 802437EC 00000000 */ nop /* 9DA810 802437F0 C60C0060 */ lwc1 $f12, 0x60($s0) /* 9DA814 802437F4 8E060038 */ lw $a2, 0x38($s0) /* 9DA818 802437F8 44070000 */ mfc1 $a3, $f0 @@ -77,7 +77,7 @@ glabel func_80243754_9DA774 /* 9DA88C 8024386C 44816000 */ mtc1 $at, $f12 /* 9DA890 80243870 00431021 */ addu $v0, $v0, $v1 /* 9DA894 80243874 4482A000 */ mtc1 $v0, $f20 -/* 9DA898 80243878 00000000 */ nop +/* 9DA898 80243878 00000000 */ nop /* 9DA89C 8024387C 4680A520 */ cvt.s.w $f20, $f20 /* 9DA8A0 80243880 0C00A6C9 */ jal clamp_angle /* 9DA8A4 80243884 460CA300 */ add.s $f12, $f20, $f12 @@ -97,5 +97,5 @@ glabel func_80243754_9DA774 /* 9DA8DC 802438BC 00021040 */ sll $v0, $v0, 1 /* 9DA8E0 802438C0 03E00008 */ jr $ra /* 9DA8E4 802438C4 27BD0028 */ addiu $sp, $sp, 0x28 -/* 9DA8E8 802438C8 00000000 */ nop -/* 9DA8EC 802438CC 00000000 */ nop +/* 9DA8E8 802438C8 00000000 */ nop +/* 9DA8EC 802438CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802438D0_9DA8F0.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802438D0_9DA8F0.s index 9874e2bbb3..7f3f80de1c 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802438D0_9DA8F0.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802438D0_9DA8F0.s @@ -20,12 +20,12 @@ glabel func_802438D0_9DA8F0 /* 9DA92C 8024390C 10600007 */ beqz $v1, .L8024392C /* 9DA930 80243910 0000102D */ daddu $v0, $zero, $zero /* 9DA934 80243914 08090E6A */ j .L802439A8 -/* 9DA938 80243918 00000000 */ nop +/* 9DA938 80243918 00000000 */ nop .L8024391C: /* 9DA93C 8024391C 10620008 */ beq $v1, $v0, .L80243940 /* 9DA940 80243920 0000102D */ daddu $v0, $zero, $zero /* 9DA944 80243924 08090E6A */ j .L802439A8 -/* 9DA948 80243928 00000000 */ nop +/* 9DA948 80243928 00000000 */ nop .L8024392C: /* 9DA94C 8024392C 24020001 */ addiu $v0, $zero, 1 /* 9DA950 80243930 08090E69 */ j .L802439A4 @@ -45,7 +45,7 @@ glabel func_802438D0_9DA8F0 /* 9DA980 80243960 4600110D */ trunc.w.s $f4, $f2 /* 9DA984 80243964 44052000 */ mfc1 $a1, $f4 /* 9DA988 80243968 0C03BCF0 */ jal func_800EF3C0 -/* 9DA98C 8024396C 00000000 */ nop +/* 9DA98C 8024396C 00000000 */ nop /* 9DA990 80243970 0C03BCF5 */ jal func_800EF3D4 /* 9DA994 80243974 0000202D */ daddu $a0, $zero, $zero /* 9DA998 80243978 3C0142B4 */ lui $at, 0x42b4 @@ -53,7 +53,7 @@ glabel func_802438D0_9DA8F0 /* 9DA9A0 80243980 8E040000 */ lw $a0, ($s0) /* 9DA9A4 80243984 4405A000 */ mfc1 $a1, $f20 /* 9DA9A8 80243988 0C00ECD0 */ jal set_npc_yaw -/* 9DA9AC 8024398C 00000000 */ nop +/* 9DA9AC 8024398C 00000000 */ nop /* 9DA9B0 80243990 24020002 */ addiu $v0, $zero, 2 /* 9DA9B4 80243994 E6340080 */ swc1 $f20, 0x80($s1) /* 9DA9B8 80243998 E6340084 */ swc1 $f20, 0x84($s1) diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C78_9DAC98.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C78_9DAC98.s index dad4e97797..9f46b2f4a4 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C78_9DAC98.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C78_9DAC98.s @@ -28,7 +28,7 @@ glabel func_80243C78_9DAC98 /* 9DACEC 80243CCC 00220821 */ addu $at, $at, $v0 /* 9DACF0 80243CD0 AC204BA0 */ sw $zero, %lo(D_80254BA0)($at) /* 9DACF4 80243CD4 08090F41 */ j .L80243D04 -/* 9DACF8 80243CD8 00000000 */ nop +/* 9DACF8 80243CD8 00000000 */ nop .L80243CDC: /* 9DACFC 80243CDC 3C038025 */ lui $v1, %hi(D_80254BA0) /* 9DAD00 80243CE0 24634BA0 */ addiu $v1, $v1, %lo(D_80254BA0) diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243D14_9DAD34.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243D14_9DAD34.s index 6a9530ee5c..4c5aa6004f 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243D14_9DAD34.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243D14_9DAD34.s @@ -28,7 +28,7 @@ glabel func_80243D14_9DAD34 /* 9DAD88 80243D68 00220821 */ addu $at, $at, $v0 /* 9DAD8C 80243D6C AC204D68 */ sw $zero, %lo(D_80254D68)($at) /* 9DAD90 80243D70 08090F68 */ j .L80243DA0 -/* 9DAD94 80243D74 00000000 */ nop +/* 9DAD94 80243D74 00000000 */ nop .L80243D78: /* 9DAD98 80243D78 3C038025 */ lui $v1, %hi(D_80254D68) /* 9DAD9C 80243D7C 24634D68 */ addiu $v1, $v1, %lo(D_80254D68) diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243DB0_9DADD0.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243DB0_9DADD0.s index dabfc94e86..429a25d58b 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243DB0_9DADD0.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243DB0_9DADD0.s @@ -26,7 +26,7 @@ glabel func_80243DB0_9DADD0 /* 9DAE20 80243E00 1440FFFA */ bnez $v0, .L80243DEC /* 9DAE24 80243E04 24A50004 */ addiu $a1, $a1, 4 /* 9DAE28 80243E08 08090F93 */ j .L80243E4C -/* 9DAE2C 80243E0C 00000000 */ nop +/* 9DAE2C 80243E0C 00000000 */ nop .L80243E10: /* 9DAE30 80243E10 0000182D */ daddu $v1, $zero, $zero /* 9DAE34 80243E14 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243F10_9DAF30.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243F10_9DAF30.s index 63bf282f21..8bb900a9f9 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243F10_9DAF30.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243F10_9DAF30.s @@ -89,7 +89,7 @@ glabel func_80243F10_9DAF30 /* 9DB060 80244040 AC820084 */ sw $v0, 0x84($a0) .L80244044: /* 9DB064 80244044 0C0B2026 */ jal set_variable -/* 9DB068 80244048 00000000 */ nop +/* 9DB068 80244048 00000000 */ nop /* 9DB06C 8024404C 24020002 */ addiu $v0, $zero, 2 /* 9DB070 80244050 8FBF002C */ lw $ra, 0x2c($sp) /* 9DB074 80244054 8FB60028 */ lw $s6, 0x28($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244078_9DB098.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244078_9DB098.s index 46df665faf..8d8fc753eb 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244078_9DB098.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244078_9DB098.s @@ -105,7 +105,7 @@ glabel func_80244078_9DB098 /* 9DB208 802441E8 AC820084 */ sw $v0, 0x84($a0) .L802441EC: /* 9DB20C 802441EC 0C0B2026 */ jal set_variable -/* 9DB210 802441F0 00000000 */ nop +/* 9DB210 802441F0 00000000 */ nop /* 9DB214 802441F4 24020002 */ addiu $v0, $zero, 2 /* 9DB218 802441F8 8FBF0030 */ lw $ra, 0x30($sp) /* 9DB21C 802441FC 8FB7002C */ lw $s7, 0x2c($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802442E0_9DB300.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802442E0_9DB300.s index 337fd40fde..a5e0fc4603 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802442E0_9DB300.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802442E0_9DB300.s @@ -31,6 +31,6 @@ glabel func_802442E0_9DB300 /* 9DB368 80244348 24020002 */ addiu $v0, $zero, 2 /* 9DB36C 8024434C 03E00008 */ jr $ra /* 9DB370 80244350 27BD0018 */ addiu $sp, $sp, 0x18 -/* 9DB374 80244354 00000000 */ nop -/* 9DB378 80244358 00000000 */ nop -/* 9DB37C 8024435C 00000000 */ nop +/* 9DB374 80244354 00000000 */ nop +/* 9DB378 80244358 00000000 */ nop +/* 9DB37C 8024435C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240000_9EB7F0.s b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240000_9EB7F0.s index 9f88bb5604..1afd00f6d2 100644 --- a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240000_9EB7F0.s +++ b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240000_9EB7F0.s @@ -30,7 +30,7 @@ glabel func_80240000_9EB7F0 /* 9EB854 80240064 3C05B000 */ lui $a1, 0xb000 /* 9EB858 80240068 34A50017 */ ori $a1, $a1, 0x17 /* 9EB85C 8024006C 44820000 */ mtc1 $v0, $f0 -/* 9EB860 80240070 00000000 */ nop +/* 9EB860 80240070 00000000 */ nop /* 9EB864 80240074 46800021 */ cvt.d.w $f0, $f0 /* 9EB868 80240078 3C014024 */ lui $at, 0x4024 /* 9EB86C 8024007C 44811800 */ mtc1 $at, $f3 @@ -68,7 +68,7 @@ glabel func_80240000_9EB7F0 /* 9EB8EC 802400FC 0C0123F5 */ jal is_point_within_region /* 9EB8F0 80240100 8E070038 */ lw $a3, 0x38($s0) /* 9EB8F4 80240104 10400035 */ beqz $v0, .L802401DC -/* 9EB8F8 80240108 00000000 */ nop +/* 9EB8F8 80240108 00000000 */ nop /* 9EB8FC 8024010C C60C0038 */ lwc1 $f12, 0x38($s0) /* 9EB900 80240110 3C0141C8 */ lui $at, 0x41c8 /* 9EB904 80240114 4481B000 */ mtc1 $at, $f22 @@ -99,13 +99,13 @@ glabel func_80240000_9EB7F0 /* 9EB964 80240174 860200A8 */ lh $v0, 0xa8($s0) /* 9EB968 80240178 27A50020 */ addiu $a1, $sp, 0x20 /* 9EB96C 8024017C 44820000 */ mtc1 $v0, $f0 -/* 9EB970 80240180 00000000 */ nop +/* 9EB970 80240180 00000000 */ nop /* 9EB974 80240184 46800020 */ cvt.s.w $f0, $f0 /* 9EB978 80240188 E7A00018 */ swc1 $f0, 0x18($sp) /* 9EB97C 8024018C 860200A6 */ lh $v0, 0xa6($s0) /* 9EB980 80240190 27A60024 */ addiu $a2, $sp, 0x24 /* 9EB984 80240194 44820000 */ mtc1 $v0, $f0 -/* 9EB988 80240198 00000000 */ nop +/* 9EB988 80240198 00000000 */ nop /* 9EB98C 8024019C 46800020 */ cvt.s.w $f0, $f0 /* 9EB990 802401A0 E7A0001C */ swc1 $f0, 0x1c($sp) /* 9EB994 802401A4 8E040080 */ lw $a0, 0x80($s0) @@ -121,13 +121,13 @@ glabel func_80240000_9EB7F0 /* 9EB9BC 802401CC 1440FFE6 */ bnez $v0, .L80240168 /* 9EB9C0 802401D0 E600000C */ swc1 $f0, 0xc($s0) /* 9EB9C4 802401D4 08090083 */ j .L8024020C -/* 9EB9C8 802401D8 00000000 */ nop +/* 9EB9C8 802401D8 00000000 */ nop .L802401DC: /* 9EB9CC 802401DC 0C00A67F */ jal rand_int /* 9EB9D0 802401E0 2404003C */ addiu $a0, $zero, 0x3c /* 9EB9D4 802401E4 C60C000C */ lwc1 $f12, 0xc($s0) /* 9EB9D8 802401E8 44820000 */ mtc1 $v0, $f0 -/* 9EB9DC 802401EC 00000000 */ nop +/* 9EB9DC 802401EC 00000000 */ nop /* 9EB9E0 802401F0 46800020 */ cvt.s.w $f0, $f0 /* 9EB9E4 802401F4 46006300 */ add.s $f12, $f12, $f0 /* 9EB9E8 802401F8 3C0141F0 */ lui $at, 0x41f0 diff --git a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240230_9EBA20.s b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240230_9EBA20.s index 6937a646c7..7e7009dc40 100644 --- a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240230_9EBA20.s +++ b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240230_9EBA20.s @@ -43,7 +43,7 @@ glabel func_80240230_9EBA20 /* 9EBAB8 802402C8 2402000F */ addiu $v0, $zero, 0xf /* 9EBABC 802402CC AFA2001C */ sw $v0, 0x1c($sp) /* 9EBAC0 802402D0 44835000 */ mtc1 $v1, $f10 -/* 9EBAC4 802402D4 00000000 */ nop +/* 9EBAC4 802402D4 00000000 */ nop /* 9EBAC8 802402D8 468052A0 */ cvt.s.w $f10, $f10 /* 9EBACC 802402DC 44075000 */ mfc1 $a3, $f10 /* 9EBAD0 802402E0 27A20028 */ addiu $v0, $sp, 0x28 @@ -78,7 +78,7 @@ glabel func_80240230_9EBA20 /* 9EBB38 80240348 44801800 */ mtc1 $zero, $f3 /* 9EBB3C 8024034C 46000021 */ cvt.d.s $f0, $f0 /* 9EBB40 80240350 4620103C */ c.lt.d $f2, $f0 -/* 9EBB44 80240354 00000000 */ nop +/* 9EBB44 80240354 00000000 */ nop /* 9EBB48 80240358 45000025 */ bc1f .L802403F0 /* 9EBB4C 8024035C 27A5002C */ addiu $a1, $sp, 0x2c /* 9EBB50 80240360 C6000038 */ lwc1 $f0, 0x38($s0) @@ -88,7 +88,7 @@ glabel func_80240230_9EBA20 /* 9EBB60 80240370 27A60030 */ addiu $a2, $sp, 0x30 /* 9EBB64 80240374 E7A0002C */ swc1 $f0, 0x2c($sp) /* 9EBB68 80240378 44820000 */ mtc1 $v0, $f0 -/* 9EBB6C 8024037C 00000000 */ nop +/* 9EBB6C 8024037C 00000000 */ nop /* 9EBB70 80240380 46800020 */ cvt.s.w $f0, $f0 /* 9EBB74 80240384 46000021 */ cvt.d.s $f0, $f0 /* 9EBB78 80240388 C604003C */ lwc1 $f4, 0x3c($s0) @@ -96,13 +96,13 @@ glabel func_80240230_9EBA20 /* 9EBB80 80240390 C6080018 */ lwc1 $f8, 0x18($s0) /* 9EBB84 80240394 860200A8 */ lh $v0, 0xa8($s0) /* 9EBB88 80240398 46220002 */ mul.d $f0, $f0, $f2 -/* 9EBB8C 8024039C 00000000 */ nop +/* 9EBB8C 8024039C 00000000 */ nop /* 9EBB90 802403A0 E7A40030 */ swc1 $f4, 0x30($sp) /* 9EBB94 802403A4 E7A60034 */ swc1 $f6, 0x34($sp) /* 9EBB98 802403A8 E7A80010 */ swc1 $f8, 0x10($sp) /* 9EBB9C 802403AC C604000C */ lwc1 $f4, 0xc($s0) /* 9EBBA0 802403B0 44821000 */ mtc1 $v0, $f2 -/* 9EBBA4 802403B4 00000000 */ nop +/* 9EBBA4 802403B4 00000000 */ nop /* 9EBBA8 802403B8 468010A0 */ cvt.s.w $f2, $f2 /* 9EBBAC 802403BC E7A20018 */ swc1 $f2, 0x18($sp) /* 9EBBB0 802403C0 E7A40014 */ swc1 $f4, 0x14($sp) @@ -123,7 +123,7 @@ glabel func_80240230_9EBA20 /* 9EBBE8 802403F8 44801800 */ mtc1 $zero, $f3 /* 9EBBEC 802403FC 46000021 */ cvt.d.s $f0, $f0 /* 9EBBF0 80240400 4622003C */ c.lt.d $f0, $f2 -/* 9EBBF4 80240404 00000000 */ nop +/* 9EBBF4 80240404 00000000 */ nop /* 9EBBF8 80240408 45000047 */ bc1f .L80240528 /* 9EBBFC 8024040C 27A5002C */ addiu $a1, $sp, 0x2c /* 9EBC00 80240410 27A60030 */ addiu $a2, $sp, 0x30 @@ -154,7 +154,7 @@ glabel func_80240230_9EBA20 /* 9EBC64 80240474 0C0372DF */ jal func_800DCB7C /* 9EBC68 80240478 27A70034 */ addiu $a3, $sp, 0x34 /* 9EBC6C 8024047C 1040002A */ beqz $v0, .L80240528 -/* 9EBC70 80240480 00000000 */ nop +/* 9EBC70 80240480 00000000 */ nop /* 9EBC74 80240484 C600001C */ lwc1 $f0, 0x1c($s0) /* 9EBC78 80240488 C7A20038 */ lwc1 $f2, 0x38($sp) /* 9EBC7C 8024048C 46000005 */ abs.s $f0, $f0 @@ -162,7 +162,7 @@ glabel func_80240230_9EBA20 /* 9EBC84 80240494 46340000 */ add.d $f0, $f0, $f20 /* 9EBC88 80240498 460010A1 */ cvt.d.s $f2, $f2 /* 9EBC8C 8024049C 4620103E */ c.le.d $f2, $f0 -/* 9EBC90 802404A0 00000000 */ nop +/* 9EBC90 802404A0 00000000 */ nop /* 9EBC94 802404A4 45000020 */ bc1f .L80240528 /* 9EBC98 802404A8 240403E8 */ addiu $a0, $zero, 0x3e8 /* 9EBC9C 802404AC C7A00030 */ lwc1 $f0, 0x30($sp) @@ -193,7 +193,7 @@ glabel func_80240230_9EBA20 /* 9EBD00 80240510 5840000C */ blezl $v0, .L80240544 /* 9EBD04 80240514 AE600070 */ sw $zero, 0x70($s3) /* 9EBD08 80240518 1460000A */ bnez $v1, .L80240544 -/* 9EBD0C 8024051C 00000000 */ nop +/* 9EBD0C 8024051C 00000000 */ nop /* 9EBD10 80240520 08090151 */ j .L80240544 /* 9EBD14 80240524 AE600070 */ sw $zero, 0x70($s3) .L80240528: diff --git a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240628_9EBE18.s b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240628_9EBE18.s index da71df6535..b74cdf1105 100644 --- a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240628_9EBE18.s +++ b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240628_9EBE18.s @@ -38,7 +38,7 @@ glabel func_80240628_9EBE18 /* 9EBE9C 802406AC 2402000F */ addiu $v0, $zero, 0xf /* 9EBEA0 802406B0 AFA2001C */ sw $v0, 0x1c($sp) /* 9EBEA4 802406B4 44833000 */ mtc1 $v1, $f6 -/* 9EBEA8 802406B8 00000000 */ nop +/* 9EBEA8 802406B8 00000000 */ nop /* 9EBEAC 802406BC 468031A0 */ cvt.s.w $f6, $f6 /* 9EBEB0 802406C0 44073000 */ mfc1 $a3, $f6 /* 9EBEB4 802406C4 27A20028 */ addiu $v0, $sp, 0x28 @@ -65,13 +65,13 @@ glabel func_80240628_9EBE18 .L80240718: /* 9EBF08 80240718 8602008C */ lh $v0, 0x8c($s0) /* 9EBF0C 8024071C 14400023 */ bnez $v0, .L802407AC -/* 9EBF10 80240720 00000000 */ nop +/* 9EBF10 80240720 00000000 */ nop /* 9EBF14 80240724 9602008E */ lhu $v0, 0x8e($s0) /* 9EBF18 80240728 2442FFFF */ addiu $v0, $v0, -1 /* 9EBF1C 8024072C A602008E */ sh $v0, 0x8e($s0) /* 9EBF20 80240730 00021400 */ sll $v0, $v0, 0x10 /* 9EBF24 80240734 1C40001D */ bgtz $v0, .L802407AC -/* 9EBF28 80240738 00000000 */ nop +/* 9EBF28 80240738 00000000 */ nop /* 9EBF2C 8024073C 8E820074 */ lw $v0, 0x74($s4) /* 9EBF30 80240740 2442FFFF */ addiu $v0, $v0, -1 /* 9EBF34 80240744 18400018 */ blez $v0, .L802407A8 diff --git a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_802407CC_9EBFBC.s b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_802407CC_9EBFBC.s index 076ba773e1..81751fe796 100644 --- a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_802407CC_9EBFBC.s +++ b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_802407CC_9EBFBC.s @@ -24,7 +24,7 @@ glabel func_802407CC_9EBFBC /* 9EC008 80240818 0C00A67F */ jal rand_int /* 9EC00C 8024081C AE020000 */ sw $v0, ($s0) /* 9EC010 80240820 44820000 */ mtc1 $v0, $f0 -/* 9EC014 80240824 00000000 */ nop +/* 9EC014 80240824 00000000 */ nop /* 9EC018 80240828 46800021 */ cvt.d.w $f0, $f0 /* 9EC01C 8024082C 3C014024 */ lui $at, 0x4024 /* 9EC020 80240830 44811800 */ mtc1 $at, $f3 diff --git a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_802408AC_9EC09C.s b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_802408AC_9EC09C.s index e8261fdded..d6657534b3 100644 --- a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_802408AC_9EC09C.s +++ b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_802408AC_9EC09C.s @@ -25,7 +25,7 @@ glabel func_802408AC_9EC09C /* 9EC0EC 802408FC 44801800 */ mtc1 $zero, $f3 /* 9EC0F0 80240900 46000021 */ cvt.d.s $f0, $f0 /* 9EC0F4 80240904 4620103C */ c.lt.d $f2, $f0 -/* 9EC0F8 80240908 00000000 */ nop +/* 9EC0F8 80240908 00000000 */ nop /* 9EC0FC 8024090C 45000021 */ bc1f .L80240994 /* 9EC100 80240910 27A50028 */ addiu $a1, $sp, 0x28 /* 9EC104 80240914 C6600038 */ lwc1 $f0, 0x38($s3) @@ -40,20 +40,20 @@ glabel func_802408AC_9EC09C /* 9EC128 80240938 E7A00014 */ swc1 $f0, 0x14($sp) /* 9EC12C 8024093C 866200A8 */ lh $v0, 0xa8($s3) /* 9EC130 80240940 44820000 */ mtc1 $v0, $f0 -/* 9EC134 80240944 00000000 */ nop +/* 9EC134 80240944 00000000 */ nop /* 9EC138 80240948 46800020 */ cvt.s.w $f0, $f0 /* 9EC13C 8024094C E7A00018 */ swc1 $f0, 0x18($sp) /* 9EC140 80240950 866200A6 */ lh $v0, 0xa6($s3) /* 9EC144 80240954 27A6002C */ addiu $a2, $sp, 0x2c /* 9EC148 80240958 44820000 */ mtc1 $v0, $f0 -/* 9EC14C 8024095C 00000000 */ nop +/* 9EC14C 8024095C 00000000 */ nop /* 9EC150 80240960 46800020 */ cvt.s.w $f0, $f0 /* 9EC154 80240964 E7A0001C */ swc1 $f0, 0x1c($sp) /* 9EC158 80240968 8E640080 */ lw $a0, 0x80($s3) /* 9EC15C 8024096C 0C037711 */ jal func_800DDC44 /* 9EC160 80240970 27A70030 */ addiu $a3, $sp, 0x30 /* 9EC164 80240974 10400003 */ beqz $v0, .L80240984 -/* 9EC168 80240978 00000000 */ nop +/* 9EC168 80240978 00000000 */ nop /* 9EC16C 8024097C 08090265 */ j .L80240994 /* 9EC170 80240980 AE600018 */ sw $zero, 0x18($s3) .L80240984: @@ -67,7 +67,7 @@ glabel func_802408AC_9EC09C /* 9EC18C 8024099C 44801800 */ mtc1 $zero, $f3 /* 9EC190 802409A0 46000021 */ cvt.d.s $f0, $f0 /* 9EC194 802409A4 4622003C */ c.lt.d $f0, $f2 -/* 9EC198 802409A8 00000000 */ nop +/* 9EC198 802409A8 00000000 */ nop /* 9EC19C 802409AC 4500006C */ bc1f .L80240B60 /* 9EC1A0 802409B0 27B00028 */ addiu $s0, $sp, 0x28 /* 9EC1A4 802409B4 0200282D */ daddu $a1, $s0, $zero @@ -116,7 +116,7 @@ glabel func_802408AC_9EC09C /* 9EC250 80240A60 0C0372DF */ jal func_800DCB7C /* 9EC254 80240A64 0220382D */ daddu $a3, $s1, $zero /* 9EC258 80240A68 1040003D */ beqz $v0, .L80240B60 -/* 9EC25C 80240A6C 00000000 */ nop +/* 9EC25C 80240A6C 00000000 */ nop /* 9EC260 80240A70 C660001C */ lwc1 $f0, 0x1c($s3) /* 9EC264 80240A74 C7A20038 */ lwc1 $f2, 0x38($sp) /* 9EC268 80240A78 46000005 */ abs.s $f0, $f0 @@ -124,7 +124,7 @@ glabel func_802408AC_9EC09C /* 9EC270 80240A80 46340000 */ add.d $f0, $f0, $f20 /* 9EC274 80240A84 460010A1 */ cvt.d.s $f2, $f2 /* 9EC278 80240A88 4620103E */ c.le.d $f2, $f0 -/* 9EC27C 80240A8C 00000000 */ nop +/* 9EC27C 80240A8C 00000000 */ nop /* 9EC280 80240A90 45000033 */ bc1f .L80240B60 /* 9EC284 80240A94 2403F7FF */ addiu $v1, $zero, -0x801 /* 9EC288 80240A98 C7A0002C */ lwc1 $f0, 0x2c($sp) @@ -163,7 +163,7 @@ glabel func_802408AC_9EC09C /* 9EC30C 80240B1C 2402000F */ addiu $v0, $zero, 0xf /* 9EC310 80240B20 AFA2001C */ sw $v0, 0x1c($sp) /* 9EC314 80240B24 44834000 */ mtc1 $v1, $f8 -/* 9EC318 80240B28 00000000 */ nop +/* 9EC318 80240B28 00000000 */ nop /* 9EC31C 80240B2C 46804220 */ cvt.s.w $f8, $f8 /* 9EC320 80240B30 44074000 */ mfc1 $a3, $f8 /* 9EC324 80240B34 27A2003C */ addiu $v0, $sp, 0x3c diff --git a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s index b2860dadb0..651623a3fc 100644 --- a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s +++ b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s @@ -76,7 +76,7 @@ glabel func_80240BF0_9EC3E0 /* 9EC4F8 80240D08 8E4300B0 */ lw $v1, 0xb0($s2) /* 9EC4FC 80240D0C 30620004 */ andi $v0, $v1, 4 /* 9EC500 80240D10 10400007 */ beqz $v0, .L80240D30 -/* 9EC504 80240D14 00000000 */ nop +/* 9EC504 80240D14 00000000 */ nop /* 9EC508 80240D18 824200B4 */ lb $v0, 0xb4($s2) /* 9EC50C 80240D1C 14400034 */ bnez $v0, .L80240DF0 /* 9EC510 80240D20 0000102D */ daddu $v0, $zero, $zero @@ -88,21 +88,24 @@ glabel func_80240BF0_9EC3E0 /* 9EC524 80240D34 2C62000F */ sltiu $v0, $v1, 0xf /* 9EC528 80240D38 1040002C */ beqz $v0, .L80240DEC /* 9EC52C 80240D3C 00031080 */ sll $v0, $v1, 2 -/* 9EC530 80240D40 3C018024 */ lui $at, %hi(D_802423B8) +/* 9EC530 80240D40 3C018024 */ lui $at, %hi(jtbl_802423B8_9EDBA8) /* 9EC534 80240D44 00220821 */ addu $at, $at, $v0 -/* 9EC538 80240D48 8C2223B8 */ lw $v0, %lo(D_802423B8)($at) +/* 9EC538 80240D48 8C2223B8 */ lw $v0, %lo(jtbl_802423B8_9EDBA8)($at) /* 9EC53C 80240D4C 00400008 */ jr $v0 -/* 9EC540 80240D50 00000000 */ nop +/* 9EC540 80240D50 00000000 */ nop +glabel L80240D54_9EC544 /* 9EC544 80240D54 0260202D */ daddu $a0, $s3, $zero /* 9EC548 80240D58 0280282D */ daddu $a1, $s4, $zero /* 9EC54C 80240D5C 0C090000 */ jal func_80240000_9EB7F0 /* 9EC550 80240D60 0200302D */ daddu $a2, $s0, $zero +glabel L80240D64_9EC554 /* 9EC554 80240D64 0260202D */ daddu $a0, $s3, $zero /* 9EC558 80240D68 0280282D */ daddu $a1, $s4, $zero /* 9EC55C 80240D6C 0C09008C */ jal func_80240230_9EBA20 /* 9EC560 80240D70 0200302D */ daddu $a2, $s0, $zero /* 9EC564 80240D74 0809037C */ j .L80240DF0 /* 9EC568 80240D78 0000102D */ daddu $v0, $zero, $zero +glabel L80240D7C_9EC56C /* 9EC56C 80240D7C 0260202D */ daddu $a0, $s3, $zero /* 9EC570 80240D80 0280282D */ daddu $a1, $s4, $zero /* 9EC574 80240D84 0C09015A */ jal nok_03_UnkNpcAIFunc1 @@ -111,27 +114,32 @@ glabel func_80240BF0_9EC3E0 /* 9EC580 80240D90 24020003 */ addiu $v0, $zero, 3 /* 9EC584 80240D94 14620016 */ bne $v1, $v0, .L80240DF0 /* 9EC588 80240D98 0000102D */ daddu $v0, $zero, $zero +glabel L80240D9C_9EC58C /* 9EC58C 80240D9C 0260202D */ daddu $a0, $s3, $zero /* 9EC590 80240DA0 0280282D */ daddu $a1, $s4, $zero /* 9EC594 80240DA4 0C09018A */ jal func_80240628_9EBE18 /* 9EC598 80240DA8 0200302D */ daddu $a2, $s0, $zero /* 9EC59C 80240DAC 0809037C */ j .L80240DF0 /* 9EC5A0 80240DB0 0000102D */ daddu $v0, $zero, $zero +glabel L80240DB4_9EC5A4 /* 9EC5A4 80240DB4 0260202D */ daddu $a0, $s3, $zero /* 9EC5A8 80240DB8 0280282D */ daddu $a1, $s4, $zero /* 9EC5AC 80240DBC 0C0901F3 */ jal func_802407CC_9EBFBC /* 9EC5B0 80240DC0 0200302D */ daddu $a2, $s0, $zero +glabel L80240DC4_9EC5B4 /* 9EC5B4 80240DC4 0260202D */ daddu $a0, $s3, $zero /* 9EC5B8 80240DC8 0280282D */ daddu $a1, $s4, $zero /* 9EC5BC 80240DCC 0C09022B */ jal func_802408AC_9EC09C /* 9EC5C0 80240DD0 0200302D */ daddu $a2, $s0, $zero /* 9EC5C4 80240DD4 0809037C */ j .L80240DF0 /* 9EC5C8 80240DD8 0000102D */ daddu $v0, $zero, $zero +glabel L80240DDC_9EC5CC /* 9EC5CC 80240DDC 0260202D */ daddu $a0, $s3, $zero /* 9EC5D0 80240DE0 0280282D */ daddu $a1, $s4, $zero /* 9EC5D4 80240DE4 0C0902EB */ jal nok_03_UnkDurationCheck /* 9EC5D8 80240DE8 0200302D */ daddu $a2, $s0, $zero .L80240DEC: +glabel L80240DEC_9EC5DC /* 9EC5DC 80240DEC 0000102D */ daddu $v0, $zero, $zero .L80240DF0: /* 9EC5E0 80240DF0 8FBF0048 */ lw $ra, 0x48($sp) @@ -143,6 +151,6 @@ glabel func_80240BF0_9EC3E0 /* 9EC5F8 80240E08 8FB00030 */ lw $s0, 0x30($sp) /* 9EC5FC 80240E0C 03E00008 */ jr $ra /* 9EC600 80240E10 27BD0050 */ addiu $sp, $sp, 0x50 -/* 9EC604 80240E14 00000000 */ nop -/* 9EC608 80240E18 00000000 */ nop -/* 9EC60C 80240E1C 00000000 */ nop +/* 9EC604 80240E14 00000000 */ nop +/* 9EC608 80240E18 00000000 */ nop +/* 9EC60C 80240E1C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240000_9EDBF0.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240000_9EDBF0.s index 7d5eae881b..1d95fabab1 100644 --- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240000_9EDBF0.s +++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240000_9EDBF0.s @@ -41,14 +41,14 @@ glabel func_80240000_9EDBF0 /* 9EDC7C 8024008C 10600009 */ beqz $v1, .L802400B4 /* 9EDC80 80240090 0000102D */ daddu $v0, $zero, $zero /* 9EDC84 80240094 08090059 */ j .L80240164 -/* 9EDC88 80240098 00000000 */ nop +/* 9EDC88 80240098 00000000 */ nop .L8024009C: /* 9EDC8C 8024009C 10620013 */ beq $v1, $v0, .L802400EC /* 9EDC90 802400A0 24020003 */ addiu $v0, $zero, 3 /* 9EDC94 802400A4 1062001E */ beq $v1, $v0, .L80240120 /* 9EDC98 802400A8 0000102D */ daddu $v0, $zero, $zero /* 9EDC9C 802400AC 08090059 */ j .L80240164 -/* 9EDCA0 802400B0 00000000 */ nop +/* 9EDCA0 802400B0 00000000 */ nop .L802400B4: /* 9EDCA4 802400B4 0C03AC5A */ jal func_800EB168 /* 9EDCA8 802400B8 0000202D */ daddu $a0, $zero, $zero @@ -75,7 +75,7 @@ glabel func_80240000_9EDBF0 /* 9EDCF4 80240104 A0510014 */ sb $s1, 0x14($v0) /* 9EDCF8 80240108 82640012 */ lb $a0, 0x12($s3) /* 9EDCFC 8024010C 0C03ACA9 */ jal func_800EB2A4 -/* 9EDD00 80240110 00000000 */ nop +/* 9EDD00 80240110 00000000 */ nop /* 9EDD04 80240114 24020003 */ addiu $v0, $zero, 3 /* 9EDD08 80240118 08090058 */ j .L80240160 /* 9EDD0C 8024011C AE420070 */ sw $v0, 0x70($s2) diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240314_9EDF04.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240314_9EDF04.s index 73906df298..c6b6c63dab 100644 --- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240314_9EDF04.s +++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240314_9EDF04.s @@ -22,17 +22,17 @@ glabel func_80240314_9EDF04 /* 9EDF48 80240358 0C0B1EAF */ jal get_variable /* 9EDF4C 8024035C 0040802D */ daddu $s0, $v0, $zero /* 9EDF50 80240360 44823000 */ mtc1 $v0, $f6 -/* 9EDF54 80240364 00000000 */ nop +/* 9EDF54 80240364 00000000 */ nop /* 9EDF58 80240368 468031A0 */ cvt.s.w $f6, $f6 /* 9EDF5C 8024036C 3C038024 */ lui $v1, %hi(D_802413F8) /* 9EDF60 80240370 246313F8 */ addiu $v1, $v1, %lo(D_802413F8) /* 9EDF64 80240374 44922000 */ mtc1 $s2, $f4 -/* 9EDF68 80240378 00000000 */ nop +/* 9EDF68 80240378 00000000 */ nop /* 9EDF6C 8024037C 46802120 */ cvt.s.w $f4, $f4 /* 9EDF70 80240380 3C014080 */ lui $at, 0x4080 /* 9EDF74 80240384 44811000 */ mtc1 $at, $f2 /* 9EDF78 80240388 44900000 */ mtc1 $s0, $f0 -/* 9EDF7C 8024038C 00000000 */ nop +/* 9EDF7C 8024038C 00000000 */ nop /* 9EDF80 80240390 46800020 */ cvt.s.w $f0, $f0 /* 9EDF84 80240394 46020000 */ add.s $f0, $f0, $f2 /* 9EDF88 80240398 E4640000 */ swc1 $f4, ($v1) diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_802403C0_9EDFB0.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_802403C0_9EDFB0.s index 046d848ef7..c2b8dc493d 100644 --- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_802403C0_9EDFB0.s +++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_802403C0_9EDFB0.s @@ -29,24 +29,24 @@ glabel func_802403C0_9EDFB0 .L80240420: /* 9EE010 80240420 00101103 */ sra $v0, $s0, 4 /* 9EE014 80240424 44824000 */ mtc1 $v0, $f8 -/* 9EE018 80240428 00000000 */ nop +/* 9EE018 80240428 00000000 */ nop /* 9EE01C 8024042C 46804220 */ cvt.s.w $f8, $f8 /* 9EE020 80240430 3C013D80 */ lui $at, 0x3d80 /* 9EE024 80240434 44811000 */ mtc1 $at, $f2 /* 9EE028 80240438 44920000 */ mtc1 $s2, $f0 -/* 9EE02C 8024043C 00000000 */ nop +/* 9EE02C 8024043C 00000000 */ nop /* 9EE030 80240440 46800020 */ cvt.s.w $f0, $f0 /* 9EE034 80240444 AC600034 */ sw $zero, 0x34($v1) /* 9EE038 80240448 46020182 */ mul.s $f6, $f0, $f2 -/* 9EE03C 8024044C 00000000 */ nop +/* 9EE03C 8024044C 00000000 */ nop /* 9EE040 80240450 C46A0034 */ lwc1 $f10, 0x34($v1) /* 9EE044 80240454 44842000 */ mtc1 $a0, $f4 -/* 9EE048 80240458 00000000 */ nop +/* 9EE048 80240458 00000000 */ nop /* 9EE04C 8024045C 46802120 */ cvt.s.w $f4, $f4 /* 9EE050 80240460 E4680018 */ swc1 $f8, 0x18($v1) /* 9EE054 80240464 E4640030 */ swc1 $f4, 0x30($v1) /* 9EE058 80240468 4604503C */ c.lt.s $f10, $f4 -/* 9EE05C 8024046C 00000000 */ nop +/* 9EE05C 8024046C 00000000 */ nop /* 9EE060 80240470 45000009 */ bc1f .L80240498 /* 9EE064 80240474 E466000C */ swc1 $f6, 0xc($v1) /* 9EE068 80240478 C4600010 */ lwc1 $f0, 0x10($v1) @@ -59,9 +59,9 @@ glabel func_802403C0_9EDFB0 /* 9EE084 80240494 E462003C */ swc1 $f2, 0x3c($v1) .L80240498: /* 9EE088 80240498 460A203C */ c.lt.s $f4, $f10 -/* 9EE08C 8024049C 00000000 */ nop +/* 9EE08C 8024049C 00000000 */ nop /* 9EE090 802404A0 45000004 */ bc1f .L802404B4 -/* 9EE094 802404A4 00000000 */ nop +/* 9EE094 802404A4 00000000 */ nop /* 9EE098 802404A8 E4660010 */ swc1 $f6, 0x10($v1) /* 9EE09C 802404AC E4680020 */ swc1 $f8, 0x20($v1) /* 9EE0A0 802404B0 E46A0030 */ swc1 $f10, 0x30($v1) diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240630_9EE220.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240630_9EE220.s index 47fc720da9..97ad518ded 100644 --- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240630_9EE220.s +++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240630_9EE220.s @@ -34,7 +34,7 @@ glabel func_80240630_9EE220 /* 9EE290 802406A0 00C73023 */ subu $a2, $a2, $a3 .L802406A4: /* 9EE294 802406A4 0C0B2026 */ jal set_variable -/* 9EE298 802406A8 00000000 */ nop +/* 9EE298 802406A8 00000000 */ nop /* 9EE29C 802406AC 8FBF0018 */ lw $ra, 0x18($sp) /* 9EE2A0 802406B0 8FB10014 */ lw $s1, 0x14($sp) /* 9EE2A4 802406B4 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_802406C4_9EE2B4.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_802406C4_9EE2B4.s index 7b91b4b47d..cbaa794922 100644 --- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_802406C4_9EE2B4.s +++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_802406C4_9EE2B4.s @@ -40,7 +40,7 @@ glabel func_802406C4_9EE2B4 /* 9EE33C 8024074C 0C0B1059 */ jal does_script_exist /* 9EE340 80240750 8E040084 */ lw $a0, 0x84($s0) /* 9EE344 80240754 10400003 */ beqz $v0, .L80240764 -/* 9EE348 80240758 00000000 */ nop +/* 9EE348 80240758 00000000 */ nop /* 9EE34C 8024075C 0C0B102B */ jal kill_script_by_ID /* 9EE350 80240760 8E040084 */ lw $a0, 0x84($s0) .L80240764: @@ -71,14 +71,14 @@ glabel func_802406C4_9EE2B4 /* 9EE3AC 802407BC 1220000C */ beqz $s1, .L802407F0 /* 9EE3B0 802407C0 2402004C */ addiu $v0, $zero, 0x4c /* 9EE3B4 802407C4 080901FD */ j .L802407F4 -/* 9EE3B8 802407C8 00000000 */ nop +/* 9EE3B8 802407C8 00000000 */ nop .L802407CC: /* 9EE3BC 802407CC 12220007 */ beq $s1, $v0, .L802407EC /* 9EE3C0 802407D0 24020003 */ addiu $v0, $zero, 3 /* 9EE3C4 802407D4 12220006 */ beq $s1, $v0, .L802407F0 /* 9EE3C8 802407D8 2402004F */ addiu $v0, $zero, 0x4f /* 9EE3CC 802407DC 080901FD */ j .L802407F4 -/* 9EE3D0 802407E0 00000000 */ nop +/* 9EE3D0 802407E0 00000000 */ nop .L802407E4: /* 9EE3D4 802407E4 080901FC */ j .L802407F0 /* 9EE3D8 802407E8 2402004D */ addiu $v0, $zero, 0x4d diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E4C_9EEA3C.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E4C_9EEA3C.s index 6f4ac9b19e..a0461082c0 100644 --- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E4C_9EEA3C.s +++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E4C_9EEA3C.s @@ -3,7 +3,7 @@ glabel func_80240E4C_9EEA3C /* 9EEA3C 80240E4C 10A00003 */ beqz $a1, .L80240E5C -/* 9EEA40 80240E50 00000000 */ nop +/* 9EEA40 80240E50 00000000 */ nop /* 9EEA44 80240E54 3C018024 */ lui $at, %hi(func_80243254_8553C4) /* 9EEA48 80240E58 AC203254 */ sw $zero, %lo(func_80243254_8553C4)($at) .L80240E5C: diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E70_9EEA60.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E70_9EEA60.s index a80fdd7606..0f30ead9e8 100644 --- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E70_9EEA60.s +++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E70_9EEA60.s @@ -7,6 +7,6 @@ glabel func_80240E70_9EEA60 /* 9EEA68 80240E78 AC223254 */ sw $v0, %lo(func_80243254_8553C4)($at) /* 9EEA6C 80240E7C 03E00008 */ jr $ra /* 9EEA70 80240E80 24020002 */ addiu $v0, $zero, 2 -/* 9EEA74 80240E84 00000000 */ nop -/* 9EEA78 80240E88 00000000 */ nop -/* 9EEA7C 80240E8C 00000000 */ nop +/* 9EEA74 80240E84 00000000 */ nop +/* 9EEA78 80240E88 00000000 */ nop +/* 9EEA7C 80240E8C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EEA80/func_80240E90_9EEA80.s b/asm/nonmatchings/world/area_nok/nok_04/9EEA80/func_80240E90_9EEA80.s index dca1ecca31..aa24794a7a 100644 --- a/asm/nonmatchings/world/area_nok/nok_04/9EEA80/func_80240E90_9EEA80.s +++ b/asm/nonmatchings/world/area_nok/nok_04/9EEA80/func_80240E90_9EEA80.s @@ -39,6 +39,6 @@ glabel func_80240E90_9EEA80 /* 9EEB08 80240F18 24020002 */ addiu $v0, $zero, 2 /* 9EEB0C 80240F1C 03E00008 */ jr $ra /* 9EEB10 80240F20 27BD0028 */ addiu $sp, $sp, 0x28 -/* 9EEB14 80240F24 00000000 */ nop -/* 9EEB18 80240F28 00000000 */ nop -/* 9EEB1C 80240F2C 00000000 */ nop +/* 9EEB14 80240F24 00000000 */ nop +/* 9EEB18 80240F28 00000000 */ nop +/* 9EEB1C 80240F2C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024007C_9F4ABC.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024007C_9F4ABC.s index 0e7abbfbb4..34a88dfa32 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024007C_9F4ABC.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024007C_9F4ABC.s @@ -21,11 +21,11 @@ glabel func_8024007C_9F4ABC /* 9F4AFC 802400BC A602008E */ sh $v0, 0x8e($s0) /* 9F4B00 802400C0 00021400 */ sll $v0, $v0, 0x10 /* 9F4B04 802400C4 1C400033 */ bgtz $v0, .L80240194 -/* 9F4B08 802400C8 00000000 */ nop +/* 9F4B08 802400C8 00000000 */ nop .L802400CC: /* 9F4B0C 802400CC 8602008C */ lh $v0, 0x8c($s0) /* 9F4B10 802400D0 14400030 */ bnez $v0, .L80240194 -/* 9F4B14 802400D4 00000000 */ nop +/* 9F4B14 802400D4 00000000 */ nop /* 9F4B18 802400D8 8E2200CC */ lw $v0, 0xcc($s1) /* 9F4B1C 802400DC 8C420024 */ lw $v0, 0x24($v0) /* 9F4B20 802400E0 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_8024007C_9F4ABC /* 9F4B2C 802400EC 8E230088 */ lw $v1, 0x88($s1) /* 9F4B30 802400F0 24020005 */ addiu $v0, $zero, 5 /* 9F4B34 802400F4 10620005 */ beq $v1, $v0, .L8024010C -/* 9F4B38 802400F8 00000000 */ nop +/* 9F4B38 802400F8 00000000 */ nop /* 9F4B3C 802400FC 10600003 */ beqz $v1, .L8024010C /* 9F4B40 80240100 24020001 */ addiu $v0, $zero, 1 /* 9F4B44 80240104 14620006 */ bne $v1, $v0, .L80240120 -/* 9F4B48 80240108 00000000 */ nop +/* 9F4B48 80240108 00000000 */ nop .L8024010C: /* 9F4B4C 8024010C 8E220084 */ lw $v0, 0x84($s1) /* 9F4B50 80240110 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_8024007C_9F4ABC /* 9F4B90 80240150 46220000 */ add.d $f0, $f0, $f2 /* 9F4B94 80240154 4620010D */ trunc.w.d $f4, $f0 /* 9F4B98 80240158 44022000 */ mfc1 $v0, $f4 -/* 9F4B9C 8024015C 00000000 */ nop +/* 9F4B9C 8024015C 00000000 */ nop /* 9F4BA0 80240160 A602008E */ sh $v0, 0x8e($s0) /* 9F4BA4 80240164 00021400 */ sll $v0, $v0, 0x10 /* 9F4BA8 80240168 8E230078 */ lw $v1, 0x78($s1) /* 9F4BAC 8024016C 00021403 */ sra $v0, $v0, 0x10 /* 9F4BB0 80240170 0043102A */ slt $v0, $v0, $v1 /* 9F4BB4 80240174 10400003 */ beqz $v0, .L80240184 -/* 9F4BB8 80240178 00000000 */ nop +/* 9F4BB8 80240178 00000000 */ nop /* 9F4BBC 8024017C 9622007A */ lhu $v0, 0x7a($s1) /* 9F4BC0 80240180 A602008E */ sh $v0, 0x8e($s0) .L80240184: diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s index ffd8e84d0d..3a2718cdb4 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s @@ -279,15 +279,17 @@ glabel func_80240394_9F4DD4 /* 9F51C0 80240780 2C620015 */ sltiu $v0, $v1, 0x15 /* 9F51C4 80240784 10400009 */ beqz $v0, .L802407AC /* 9F51C8 80240788 00031080 */ sll $v0, $v1, 2 -/* 9F51CC 8024078C 3C018024 */ lui $at, %hi(D_80245CF8) +/* 9F51CC 8024078C 3C018024 */ lui $at, %hi(jtbl_80245CF8_9FA738) /* 9F51D0 80240790 00220821 */ addu $at, $at, $v0 -/* 9F51D4 80240794 8C225CF8 */ lw $v0, %lo(D_80245CF8)($at) +/* 9F51D4 80240794 8C225CF8 */ lw $v0, %lo(jtbl_80245CF8_9FA738)($at) /* 9F51D8 80240798 00400008 */ jr $v0 /* 9F51DC 8024079C 00000000 */ nop +glabel L802407A0_9F51E0 /* 9F51E0 802407A0 8E420028 */ lw $v0, 0x28($s2) /* 9F51E4 802407A4 24420001 */ addiu $v0, $v0, 1 /* 9F51E8 802407A8 AE420028 */ sw $v0, 0x28($s2) .L802407AC: +glabel L802407AC_9F51EC /* 9F51EC 802407AC 0000102D */ daddu $v0, $zero, $zero .L802407B0: /* 9F51F0 802407B0 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802407D4_9F5214.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802407D4_9F5214.s index dbb7961fa0..cd57402df7 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802407D4_9F5214.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802407D4_9F5214.s @@ -47,7 +47,7 @@ glabel func_802407D4_9F5214 /* 9F52BC 8024087C 0C0123F5 */ jal is_point_within_region /* 9F52C0 80240880 8E070038 */ lw $a3, 0x38($s0) /* 9F52C4 80240884 1040000E */ beqz $v0, .L802408C0 -/* 9F52C8 80240888 00000000 */ nop +/* 9F52C8 80240888 00000000 */ nop /* 9F52CC 8024088C 8E2200D0 */ lw $v0, 0xd0($s1) /* 9F52D0 80240890 C60C0038 */ lwc1 $f12, 0x38($s0) /* 9F52D4 80240894 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_802407D4_9F5214 /* 9F52E8 802408A8 468031A0 */ cvt.s.w $f6, $f6 /* 9F52EC 802408AC 44073000 */ mfc1 $a3, $f6 /* 9F52F0 802408B0 0C00A720 */ jal atan2 -/* 9F52F4 802408B4 00000000 */ nop +/* 9F52F4 802408B4 00000000 */ nop /* 9F52F8 802408B8 0809023C */ j .L802408F0 /* 9F52FC 802408BC E600000C */ swc1 $f0, 0xc($s0) .L802408C0: @@ -66,7 +66,7 @@ glabel func_802407D4_9F5214 /* 9F5304 802408C4 2404003C */ addiu $a0, $zero, 0x3c /* 9F5308 802408C8 C60C000C */ lwc1 $f12, 0xc($s0) /* 9F530C 802408CC 44820000 */ mtc1 $v0, $f0 -/* 9F5310 802408D0 00000000 */ nop +/* 9F5310 802408D0 00000000 */ nop /* 9F5314 802408D4 46800020 */ cvt.s.w $f0, $f0 /* 9F5318 802408D8 46006300 */ add.s $f12, $f12, $f0 /* 9F531C 802408DC 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_802407D4_9F5214 /* 9F5340 80240900 8E2200D0 */ lw $v0, 0xd0($s1) /* 9F5344 80240904 8C420014 */ lw $v0, 0x14($v0) /* 9F5348 80240908 04410004 */ bgez $v0, .L8024091C -/* 9F534C 8024090C 00000000 */ nop +/* 9F534C 8024090C 00000000 */ nop /* 9F5350 80240910 C6400000 */ lwc1 $f0, ($s2) /* 9F5354 80240914 0809024F */ j .L8024093C /* 9F5358 80240918 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_802407D4_9F5214 /* 9F535C 8024091C 3C018024 */ lui $at, %hi(D_80245D50) /* 9F5360 80240920 D4225D50 */ ldc1 $f2, %lo(D_80245D50)($at) /* 9F5364 80240924 44820000 */ mtc1 $v0, $f0 -/* 9F5368 80240928 00000000 */ nop +/* 9F5368 80240928 00000000 */ nop /* 9F536C 8024092C 46800021 */ cvt.d.w $f0, $f0 /* 9F5370 80240930 46220003 */ div.d $f0, $f0, $f2 /* 9F5374 80240934 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_802407D4_9F5214 /* 9F5388 80240948 44801000 */ mtc1 $zero, $f2 /* 9F538C 8024094C 46000021 */ cvt.d.s $f0, $f0 /* 9F5390 80240950 46220002 */ mul.d $f0, $f0, $f2 -/* 9F5394 80240954 00000000 */ nop +/* 9F5394 80240954 00000000 */ nop /* 9F5398 80240958 24020001 */ addiu $v0, $zero, 1 /* 9F539C 8024095C 4620018D */ trunc.w.d $f6, $f0 /* 9F53A0 80240960 E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240984_9F53C4.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240984_9F53C4.s index 1711ccc0c0..63a9c2452d 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240984_9F53C4.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240984_9F53C4.s @@ -34,7 +34,7 @@ glabel func_80240984_9F53C4 /* 9F5438 802409F8 44803000 */ mtc1 $zero, $f6 /* 9F543C 802409FC 46000021 */ cvt.d.s $f0, $f0 /* 9F5440 80240A00 46260002 */ mul.d $f0, $f0, $f6 -/* 9F5444 80240A04 00000000 */ nop +/* 9F5444 80240A04 00000000 */ nop /* 9F5448 80240A08 24020001 */ addiu $v0, $zero, 1 /* 9F544C 80240A0C 8E24006C */ lw $a0, 0x6c($s1) /* 9F5450 80240A10 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80240984_9F53C4 /* 9F54AC 80240A6C C600003C */ lwc1 $f0, 0x3c($s0) /* 9F54B0 80240A70 4600C001 */ sub.s $f0, $f24, $f0 /* 9F54B4 80240A74 4600B03C */ c.lt.s $f22, $f0 -/* 9F54B8 80240A78 00000000 */ nop +/* 9F54B8 80240A78 00000000 */ nop /* 9F54BC 80240A7C 4500001B */ bc1f .L80240AEC /* 9F54C0 80240A80 34820010 */ ori $v0, $a0, 0x10 /* 9F54C4 80240A84 080902BB */ j .L80240AEC @@ -87,9 +87,9 @@ glabel func_80240984_9F53C4 /* 9F5508 80240AC8 C7A00034 */ lwc1 $f0, 0x34($sp) /* 9F550C 80240ACC 4600D001 */ sub.s $f0, $f26, $f0 /* 9F5510 80240AD0 4600B03C */ c.lt.s $f22, $f0 -/* 9F5514 80240AD4 00000000 */ nop +/* 9F5514 80240AD4 00000000 */ nop /* 9F5518 80240AD8 45000004 */ bc1f .L80240AEC -/* 9F551C 80240ADC 00000000 */ nop +/* 9F551C 80240ADC 00000000 */ nop /* 9F5520 80240AE0 8E22006C */ lw $v0, 0x6c($s1) /* 9F5524 80240AE4 34420010 */ ori $v0, $v0, 0x10 /* 9F5528 80240AE8 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80240984_9F53C4 /* 9F5530 80240AF0 24030011 */ addiu $v1, $zero, 0x11 /* 9F5534 80240AF4 30420011 */ andi $v0, $v0, 0x11 /* 9F5538 80240AF8 14430039 */ bne $v0, $v1, .L80240BE0 -/* 9F553C 80240AFC 00000000 */ nop +/* 9F553C 80240AFC 00000000 */ nop /* 9F5540 80240B00 8E020000 */ lw $v0, ($s0) /* 9F5544 80240B04 30420008 */ andi $v0, $v0, 8 /* 9F5548 80240B08 1040000A */ beqz $v0, .L80240B34 @@ -108,7 +108,7 @@ glabel func_80240984_9F53C4 /* 9F5558 80240B18 D4205D58 */ ldc1 $f0, %lo(D_80245D58)($at) /* 9F555C 80240B1C 460010A1 */ cvt.d.s $f2, $f2 /* 9F5560 80240B20 46201082 */ mul.d $f2, $f2, $f0 -/* 9F5564 80240B24 00000000 */ nop +/* 9F5564 80240B24 00000000 */ nop /* 9F5568 80240B28 4600A021 */ cvt.d.s $f0, $f20 /* 9F556C 80240B2C 080902E6 */ j .L80240B98 /* 9F5570 80240B30 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80240984_9F53C4 /* 9F55C0 80240B80 D4205D60 */ ldc1 $f0, %lo(D_80245D60)($at) /* 9F55C4 80240B84 460010A1 */ cvt.d.s $f2, $f2 /* 9F55C8 80240B88 46201082 */ mul.d $f2, $f2, $f0 -/* 9F55CC 80240B8C 00000000 */ nop +/* 9F55CC 80240B8C 00000000 */ nop /* 9F55D0 80240B90 4600A021 */ cvt.d.s $f0, $f20 /* 9F55D4 80240B94 46220000 */ add.d $f0, $f0, $f2 .L80240B98: @@ -149,7 +149,7 @@ glabel func_80240984_9F53C4 /* 9F55F4 80240BB4 46000005 */ abs.s $f0, $f0 /* 9F55F8 80240BB8 46000021 */ cvt.d.s $f0, $f0 /* 9F55FC 80240BBC 4622003C */ c.lt.d $f0, $f2 -/* 9F5600 80240BC0 00000000 */ nop +/* 9F5600 80240BC0 00000000 */ nop /* 9F5604 80240BC4 45000036 */ bc1f .L80240CA0 /* 9F5608 80240BC8 2403FFEF */ addiu $v1, $zero, -0x11 /* 9F560C 80240BCC E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80240984_9F53C4 .L80240BE0: /* 9F5620 80240BE0 8E220070 */ lw $v0, 0x70($s1) /* 9F5624 80240BE4 1840002E */ blez $v0, .L80240CA0 -/* 9F5628 80240BE8 00000000 */ nop +/* 9F5628 80240BE8 00000000 */ nop /* 9F562C 80240BEC C62C0074 */ lwc1 $f12, 0x74($s1) /* 9F5630 80240BF0 0C00A8BB */ jal sin_deg /* 9F5634 80240BF4 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80240984_9F53C4 /* 9F568C 80240C4C 27A70030 */ addiu $a3, $sp, 0x30 .L80240C50: /* 9F5690 80240C50 10400007 */ beqz $v0, .L80240C70 -/* 9F5694 80240C54 00000000 */ nop +/* 9F5694 80240C54 00000000 */ nop /* 9F5698 80240C58 4616A082 */ mul.s $f2, $f20, $f22 -/* 9F569C 80240C5C 00000000 */ nop +/* 9F569C 80240C5C 00000000 */ nop /* 9F56A0 80240C60 C7A0002C */ lwc1 $f0, 0x2c($sp) /* 9F56A4 80240C64 461A0000 */ add.s $f0, $f0, $f26 /* 9F56A8 80240C68 0809031F */ j .L80240C7C /* 9F56AC 80240C6C 46020000 */ add.s $f0, $f0, $f2 .L80240C70: /* 9F56B0 80240C70 4616A002 */ mul.s $f0, $f20, $f22 -/* 9F56B4 80240C74 00000000 */ nop +/* 9F56B4 80240C74 00000000 */ nop /* 9F56B8 80240C78 4600C000 */ add.s $f0, $f24, $f0 .L80240C7C: /* 9F56BC 80240C7C E600003C */ swc1 $f0, 0x3c($s0) /* 9F56C0 80240C80 8E220074 */ lw $v0, 0x74($s1) /* 9F56C4 80240C84 2442000A */ addiu $v0, $v0, 0xa /* 9F56C8 80240C88 44826000 */ mtc1 $v0, $f12 -/* 9F56CC 80240C8C 00000000 */ nop +/* 9F56CC 80240C8C 00000000 */ nop /* 9F56D0 80240C90 0C00A6C9 */ jal clamp_angle /* 9F56D4 80240C94 46806320 */ cvt.s.w $f12, $f12 /* 9F56D8 80240C98 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80240984_9F53C4 /* 9F56E8 80240CA8 2442FFFF */ addiu $v0, $v0, -1 /* 9F56EC 80240CAC 8E430014 */ lw $v1, 0x14($s2) /* 9F56F0 80240CB0 04600048 */ bltz $v1, .L80240DD4 -/* 9F56F4 80240CB4 00000000 */ nop +/* 9F56F4 80240CB4 00000000 */ nop /* 9F56F8 80240CB8 8E620074 */ lw $v0, 0x74($s3) /* 9F56FC 80240CBC 1C400042 */ bgtz $v0, .L80240DC8 /* 9F5700 80240CC0 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80240984_9F53C4 /* 9F5708 80240CC8 860200A8 */ lh $v0, 0xa8($s0) /* 9F570C 80240CCC C602003C */ lwc1 $f2, 0x3c($s0) /* 9F5710 80240CD0 44820000 */ mtc1 $v0, $f0 -/* 9F5714 80240CD4 00000000 */ nop +/* 9F5714 80240CD4 00000000 */ nop /* 9F5718 80240CD8 46800020 */ cvt.s.w $f0, $f0 /* 9F571C 80240CDC 46001080 */ add.s $f2, $f2, $f0 /* 9F5720 80240CE0 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80240984_9F53C4 /* 9F573C 80240CFC C440002C */ lwc1 $f0, 0x2c($v0) /* 9F5740 80240D00 46000021 */ cvt.d.s $f0, $f0 /* 9F5744 80240D04 4622003C */ c.lt.d $f0, $f2 -/* 9F5748 80240D08 00000000 */ nop +/* 9F5748 80240D08 00000000 */ nop /* 9F574C 80240D0C 4500002C */ bc1f .L80240DC0 /* 9F5750 80240D10 02A0202D */ daddu $a0, $s5, $zero /* 9F5754 80240D14 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80240984_9F53C4 /* 9F5790 80240D50 3C01C1A0 */ lui $at, 0xc1a0 /* 9F5794 80240D54 44812000 */ mtc1 $at, $f4 /* 9F5798 80240D58 44834000 */ mtc1 $v1, $f8 -/* 9F579C 80240D5C 00000000 */ nop +/* 9F579C 80240D5C 00000000 */ nop /* 9F57A0 80240D60 46804220 */ cvt.s.w $f8, $f8 /* 9F57A4 80240D64 44074000 */ mfc1 $a3, $f8 /* 9F57A8 80240D68 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80240984_9F53C4 /* 9F585C 80240E1C 0C0123F5 */ jal is_point_within_region /* 9F5860 80240E20 8E070038 */ lw $a3, 0x38($s0) /* 9F5864 80240E24 1040001A */ beqz $v0, .L80240E90 -/* 9F5868 80240E28 00000000 */ nop +/* 9F5868 80240E28 00000000 */ nop /* 9F586C 80240E2C 8E060038 */ lw $a2, 0x38($s0) /* 9F5870 80240E30 8E2200D0 */ lw $v0, 0xd0($s1) /* 9F5874 80240E34 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80240984_9F53C4 /* 9F5888 80240E48 468073A0 */ cvt.s.w $f14, $f14 /* 9F588C 80240E4C C6020018 */ lwc1 $f2, 0x18($s0) /* 9F5890 80240E50 4600103C */ c.lt.s $f2, $f0 -/* 9F5894 80240E54 00000000 */ nop +/* 9F5894 80240E54 00000000 */ nop /* 9F5898 80240E58 4500000D */ bc1f .L80240E90 /* 9F589C 80240E5C E7A00034 */ swc1 $f0, 0x34($sp) /* 9F58A0 80240E60 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80240984_9F53C4 /* 9F58DC 80240E9C 00621825 */ or $v1, $v1, $v0 /* 9F58E0 80240EA0 00741825 */ or $v1, $v1, $s4 /* 9F58E4 80240EA4 10600008 */ beqz $v1, .L80240EC8 -/* 9F58E8 80240EA8 00000000 */ nop +/* 9F58E8 80240EA8 00000000 */ nop /* 9F58EC 80240EAC 8602008C */ lh $v0, 0x8c($s0) /* 9F58F0 80240EB0 14400031 */ bnez $v0, .L80240F78 -/* 9F58F4 80240EB4 00000000 */ nop +/* 9F58F4 80240EB4 00000000 */ nop /* 9F58F8 80240EB8 8E050018 */ lw $a1, 0x18($s0) /* 9F58FC 80240EBC 8E06000C */ lw $a2, 0xc($s0) /* 9F5900 80240EC0 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_80240984_9F53C4 /* 9F5914 80240ED4 44801000 */ mtc1 $zero, $f2 /* 9F5918 80240ED8 46000021 */ cvt.d.s $f0, $f0 /* 9F591C 80240EDC 46220002 */ mul.d $f0, $f0, $f2 -/* 9F5920 80240EE0 00000000 */ nop +/* 9F5920 80240EE0 00000000 */ nop /* 9F5924 80240EE4 4620020D */ trunc.w.d $f8, $f0 /* 9F5928 80240EE8 E628007C */ swc1 $f8, 0x7c($s1) /* 9F592C 80240EEC 8E420004 */ lw $v0, 4($s2) /* 9F5930 80240EF0 18400021 */ blez $v0, .L80240F78 -/* 9F5934 80240EF4 00000000 */ nop +/* 9F5934 80240EF4 00000000 */ nop /* 9F5938 80240EF8 8602008E */ lh $v0, 0x8e($s0) /* 9F593C 80240EFC 9603008E */ lhu $v1, 0x8e($s0) /* 9F5940 80240F00 18400005 */ blez $v0, .L80240F18 @@ -375,7 +375,7 @@ glabel func_80240984_9F53C4 /* 9F5948 80240F08 A602008E */ sh $v0, 0x8e($s0) /* 9F594C 80240F0C 00021400 */ sll $v0, $v0, 0x10 /* 9F5950 80240F10 1C400019 */ bgtz $v0, .L80240F78 -/* 9F5954 80240F14 00000000 */ nop +/* 9F5954 80240F14 00000000 */ nop .L80240F18: /* 9F5958 80240F18 240403E8 */ addiu $a0, $zero, 0x3e8 /* 9F595C 80240F1C 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80240984_9F53C4 /* 9F59A4 80240F64 18400003 */ blez $v0, .L80240F74 /* 9F59A8 80240F68 28620003 */ slti $v0, $v1, 3 /* 9F59AC 80240F6C 10400002 */ beqz $v0, .L80240F78 -/* 9F59B0 80240F70 00000000 */ nop +/* 9F59B0 80240F70 00000000 */ nop .L80240F74: /* 9F59B4 80240F74 AE600070 */ sw $zero, 0x70($s3) .L80240F78: diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024106C_9F5AAC.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024106C_9F5AAC.s index cc15ed9f49..a15572a8a3 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024106C_9F5AAC.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024106C_9F5AAC.s @@ -42,11 +42,11 @@ glabel func_8024106C_9F5AAC .L80241100: /* 9F5B40 80241100 8E220070 */ lw $v0, 0x70($s1) /* 9F5B44 80241104 18400034 */ blez $v0, .L802411D8 -/* 9F5B48 80241108 00000000 */ nop +/* 9F5B48 80241108 00000000 */ nop /* 9F5B4C 8024110C C62C0074 */ lwc1 $f12, 0x74($s1) /* 9F5B50 80241110 46806320 */ cvt.s.w $f12, $f12 /* 9F5B54 80241114 44820000 */ mtc1 $v0, $f0 -/* 9F5B58 80241118 00000000 */ nop +/* 9F5B58 80241118 00000000 */ nop /* 9F5B5C 8024111C 46800020 */ cvt.s.w $f0, $f0 /* 9F5B60 80241120 46000021 */ cvt.d.s $f0, $f0 /* 9F5B64 80241124 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_8024106C_9F5AAC /* 9F5BC4 80241184 27A70030 */ addiu $a3, $sp, 0x30 .L80241188: /* 9F5BC8 80241188 10400007 */ beqz $v0, .L802411A8 -/* 9F5BCC 8024118C 00000000 */ nop +/* 9F5BCC 8024118C 00000000 */ nop /* 9F5BD0 80241190 4616A082 */ mul.s $f2, $f20, $f22 -/* 9F5BD4 80241194 00000000 */ nop +/* 9F5BD4 80241194 00000000 */ nop /* 9F5BD8 80241198 C7A0002C */ lwc1 $f0, 0x2c($sp) /* 9F5BDC 8024119C 46180000 */ add.s $f0, $f0, $f24 /* 9F5BE0 802411A0 0809046D */ j .L802411B4 /* 9F5BE4 802411A4 46020000 */ add.s $f0, $f0, $f2 .L802411A8: /* 9F5BE8 802411A8 4616A002 */ mul.s $f0, $f20, $f22 -/* 9F5BEC 802411AC 00000000 */ nop +/* 9F5BEC 802411AC 00000000 */ nop /* 9F5BF0 802411B0 4600D000 */ add.s $f0, $f26, $f0 .L802411B4: /* 9F5BF4 802411B4 E600003C */ swc1 $f0, 0x3c($s0) /* 9F5BF8 802411B8 8E220074 */ lw $v0, 0x74($s1) /* 9F5BFC 802411BC 2442000A */ addiu $v0, $v0, 0xa /* 9F5C00 802411C0 44826000 */ mtc1 $v0, $f12 -/* 9F5C04 802411C4 00000000 */ nop +/* 9F5C04 802411C4 00000000 */ nop /* 9F5C08 802411C8 0C00A6C9 */ jal clamp_angle /* 9F5C0C 802411CC 46806320 */ cvt.s.w $f12, $f12 /* 9F5C10 802411D0 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_8024106C_9F5AAC /* 9F5C24 802411E4 860200A8 */ lh $v0, 0xa8($s0) /* 9F5C28 802411E8 C600003C */ lwc1 $f0, 0x3c($s0) /* 9F5C2C 802411EC 44821000 */ mtc1 $v0, $f2 -/* 9F5C30 802411F0 00000000 */ nop +/* 9F5C30 802411F0 00000000 */ nop /* 9F5C34 802411F4 468010A0 */ cvt.s.w $f2, $f2 /* 9F5C38 802411F8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 9F5C3C 802411FC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_8024106C_9F5AAC /* 9F5C58 80241218 46240000 */ add.d $f0, $f0, $f4 /* 9F5C5C 8024121C 460010A1 */ cvt.d.s $f2, $f2 /* 9F5C60 80241220 4620103C */ c.lt.d $f2, $f0 -/* 9F5C64 80241224 00000000 */ nop +/* 9F5C64 80241224 00000000 */ nop /* 9F5C68 80241228 4500002E */ bc1f .L802412E4 /* 9F5C6C 8024122C 0280202D */ daddu $a0, $s4, $zero /* 9F5C70 80241230 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_8024106C_9F5AAC /* 9F5CB0 80241270 3C01C1A0 */ lui $at, 0xc1a0 /* 9F5CB4 80241274 44812000 */ mtc1 $at, $f4 /* 9F5CB8 80241278 44834000 */ mtc1 $v1, $f8 -/* 9F5CBC 8024127C 00000000 */ nop +/* 9F5CBC 8024127C 00000000 */ nop /* 9F5CC0 80241280 46804220 */ cvt.s.w $f8, $f8 /* 9F5CC4 80241284 44074000 */ mfc1 $a3, $f8 /* 9F5CC8 80241288 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_8024106C_9F5AAC .L802412E4: /* 9F5D24 802412E4 8602008C */ lh $v0, 0x8c($s0) /* 9F5D28 802412E8 14400025 */ bnez $v0, .L80241380 -/* 9F5D2C 802412EC 00000000 */ nop +/* 9F5D2C 802412EC 00000000 */ nop /* 9F5D30 802412F0 8602008E */ lh $v0, 0x8e($s0) /* 9F5D34 802412F4 1C400022 */ bgtz $v0, .L80241380 -/* 9F5D38 802412F8 00000000 */ nop +/* 9F5D38 802412F8 00000000 */ nop /* 9F5D3C 802412FC 8E620074 */ lw $v0, 0x74($s3) /* 9F5D40 80241300 2442FFFF */ addiu $v0, $v0, -1 /* 9F5D44 80241304 1840001D */ blez $v0, .L8024137C @@ -183,7 +183,7 @@ glabel func_8024106C_9F5AAC /* 9F5D50 80241310 9442002A */ lhu $v0, 0x2a($v0) /* 9F5D54 80241314 30420010 */ andi $v0, $v0, 0x10 /* 9F5D58 80241318 14400007 */ bnez $v0, .L80241338 -/* 9F5D5C 8024131C 00000000 */ nop +/* 9F5D5C 8024131C 00000000 */ nop /* 9F5D60 80241320 C600000C */ lwc1 $f0, 0xc($s0) /* 9F5D64 80241324 3C014334 */ lui $at, 0x4334 /* 9F5D68 80241328 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241494_9F5ED4.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241494_9F5ED4.s index 6e408524ad..95f7bb08ac 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241494_9F5ED4.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241494_9F5ED4.s @@ -60,18 +60,18 @@ glabel func_80241494_9F5ED4 /* 9F5FAC 8024156C C6200038 */ lwc1 $f0, 0x38($s1) /* 9F5FB0 80241570 4600018D */ trunc.w.s $f6, $f0 /* 9F5FB4 80241574 44023000 */ mfc1 $v0, $f6 -/* 9F5FB8 80241578 00000000 */ nop +/* 9F5FB8 80241578 00000000 */ nop /* 9F5FBC 8024157C A6420010 */ sh $v0, 0x10($s2) /* 9F5FC0 80241580 C620003C */ lwc1 $f0, 0x3c($s1) /* 9F5FC4 80241584 4600018D */ trunc.w.s $f6, $f0 /* 9F5FC8 80241588 44023000 */ mfc1 $v0, $f6 -/* 9F5FCC 8024158C 00000000 */ nop +/* 9F5FCC 8024158C 00000000 */ nop /* 9F5FD0 80241590 A6420012 */ sh $v0, 0x12($s2) /* 9F5FD4 80241594 C6200040 */ lwc1 $f0, 0x40($s1) /* 9F5FD8 80241598 A2430007 */ sb $v1, 7($s2) /* 9F5FDC 8024159C 4600018D */ trunc.w.s $f6, $f0 /* 9F5FE0 802415A0 44023000 */ mfc1 $v0, $f6 -/* 9F5FE4 802415A4 00000000 */ nop +/* 9F5FE4 802415A4 00000000 */ nop /* 9F5FE8 802415A8 A6420014 */ sh $v0, 0x14($s2) .L802415AC: /* 9F5FEC 802415AC 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024162C_9F606C.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024162C_9F606C.s index c26b008332..303017dd55 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024162C_9F606C.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024162C_9F606C.s @@ -42,9 +42,9 @@ glabel func_8024162C_9F606C /* 9F6100 802416C0 44801800 */ mtc1 $zero, $f3 /* 9F6104 802416C4 46002021 */ cvt.d.s $f0, $f4 /* 9F6108 802416C8 4620103E */ c.le.d $f2, $f0 -/* 9F610C 802416CC 00000000 */ nop +/* 9F610C 802416CC 00000000 */ nop /* 9F6110 802416D0 45000030 */ bc1f .L80241794 -/* 9F6114 802416D4 00000000 */ nop +/* 9F6114 802416D4 00000000 */ nop /* 9F6118 802416D8 C600003C */ lwc1 $f0, 0x3c($s0) /* 9F611C 802416DC 46040000 */ add.s $f0, $f0, $f4 /* 9F6120 802416E0 E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_8024162C_9F606C /* 9F6180 80241740 27A70020 */ addiu $a3, $sp, 0x20 .L80241744: /* 9F6184 80241744 1040000B */ beqz $v0, .L80241774 -/* 9F6188 80241748 00000000 */ nop +/* 9F6188 80241748 00000000 */ nop /* 9F618C 8024174C C7A0001C */ lwc1 $f0, 0x1c($sp) /* 9F6190 80241750 46140080 */ add.s $f2, $f0, $f20 /* 9F6194 80241754 C600003C */ lwc1 $f0, 0x3c($s0) /* 9F6198 80241758 4600103E */ c.le.s $f2, $f0 -/* 9F619C 8024175C 00000000 */ nop +/* 9F619C 8024175C 00000000 */ nop /* 9F61A0 80241760 4500008D */ bc1f .L80241998 -/* 9F61A4 80241764 00000000 */ nop +/* 9F61A4 80241764 00000000 */ nop /* 9F61A8 80241768 E602003C */ swc1 $f2, 0x3c($s0) /* 9F61AC 8024176C 08090666 */ j .L80241998 /* 9F61B0 80241770 AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_8024162C_9F606C /* 9F61B4 80241774 C602003C */ lwc1 $f2, 0x3c($s0) /* 9F61B8 80241778 C6000064 */ lwc1 $f0, 0x64($s0) /* 9F61BC 8024177C 4602003E */ c.le.s $f0, $f2 -/* 9F61C0 80241780 00000000 */ nop +/* 9F61C0 80241780 00000000 */ nop /* 9F61C4 80241784 45030084 */ bc1tl .L80241998 /* 9F61C8 80241788 AE400070 */ sw $zero, 0x70($s2) /* 9F61CC 8024178C 08090666 */ j .L80241998 -/* 9F61D0 80241790 00000000 */ nop +/* 9F61D0 80241790 00000000 */ nop .L80241794: /* 9F61D4 80241794 4622003C */ c.lt.d $f0, $f2 -/* 9F61D8 80241798 00000000 */ nop +/* 9F61D8 80241798 00000000 */ nop /* 9F61DC 8024179C 4500007E */ bc1f .L80241998 -/* 9F61E0 802417A0 00000000 */ nop +/* 9F61E0 802417A0 00000000 */ nop /* 9F61E4 802417A4 9602008E */ lhu $v0, 0x8e($s0) /* 9F61E8 802417A8 24420001 */ addiu $v0, $v0, 1 /* 9F61EC 802417AC A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_8024162C_9F606C /* 9F61F8 802417B8 00021403 */ sra $v0, $v0, 0x10 /* 9F61FC 802417BC 0043102A */ slt $v0, $v0, $v1 /* 9F6200 802417C0 14400026 */ bnez $v0, .L8024185C -/* 9F6204 802417C4 00000000 */ nop +/* 9F6204 802417C4 00000000 */ nop /* 9F6208 802417C8 C60C0038 */ lwc1 $f12, 0x38($s0) /* 9F620C 802417CC C60E0040 */ lwc1 $f14, 0x40($s0) /* 9F6210 802417D0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_8024162C_9F606C /* 9F623C 802417FC 8E62001C */ lw $v0, 0x1c($s3) /* 9F6240 80241800 46001005 */ abs.s $f0, $f2 /* 9F6244 80241804 44822000 */ mtc1 $v0, $f4 -/* 9F6248 80241808 00000000 */ nop +/* 9F6248 80241808 00000000 */ nop /* 9F624C 8024180C 46802120 */ cvt.s.w $f4, $f4 /* 9F6250 80241810 4600203C */ c.lt.s $f4, $f0 -/* 9F6254 80241814 00000000 */ nop +/* 9F6254 80241814 00000000 */ nop /* 9F6258 80241818 4500000D */ bc1f .L80241850 -/* 9F625C 8024181C 00000000 */ nop +/* 9F625C 8024181C 00000000 */ nop /* 9F6260 80241820 44800000 */ mtc1 $zero, $f0 /* 9F6264 80241824 C614000C */ lwc1 $f20, 0xc($s0) /* 9F6268 80241828 4600103C */ c.lt.s $f2, $f0 -/* 9F626C 8024182C 00000000 */ nop +/* 9F626C 8024182C 00000000 */ nop /* 9F6270 80241830 45000006 */ bc1f .L8024184C /* 9F6274 80241834 00021023 */ negu $v0, $v0 /* 9F6278 80241838 44820000 */ mtc1 $v0, $f0 -/* 9F627C 8024183C 00000000 */ nop +/* 9F627C 8024183C 00000000 */ nop /* 9F6280 80241840 46800020 */ cvt.s.w $f0, $f0 /* 9F6284 80241844 08090614 */ j .L80241850 /* 9F6288 80241848 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_8024162C_9F606C /* 9F62B0 80241870 C600001C */ lwc1 $f0, 0x1c($s0) /* 9F62B4 80241874 46001080 */ add.s $f2, $f2, $f0 /* 9F62B8 80241878 4616103C */ c.lt.s $f2, $f22 -/* 9F62BC 8024187C 00000000 */ nop +/* 9F62BC 8024187C 00000000 */ nop /* 9F62C0 80241880 45020045 */ bc1fl .L80241998 /* 9F62C4 80241884 E602003C */ swc1 $f2, 0x3c($s0) /* 9F62C8 80241888 08090665 */ j .L80241994 @@ -169,7 +169,7 @@ glabel func_8024162C_9F606C /* 9F62E0 802418A0 C600001C */ lwc1 $f0, 0x1c($s0) /* 9F62E4 802418A4 C604003C */ lwc1 $f4, 0x3c($s0) /* 9F62E8 802418A8 44821000 */ mtc1 $v0, $f2 -/* 9F62EC 802418AC 00000000 */ nop +/* 9F62EC 802418AC 00000000 */ nop /* 9F62F0 802418B0 468010A0 */ cvt.s.w $f2, $f2 /* 9F62F4 802418B4 46000005 */ abs.s $f0, $f0 /* 9F62F8 802418B8 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_8024162C_9F606C /* 9F6334 802418F4 0C0372DF */ jal func_800DCB7C /* 9F6338 802418F8 27A70020 */ addiu $a3, $sp, 0x20 /* 9F633C 802418FC 10400015 */ beqz $v0, .L80241954 -/* 9F6340 80241900 00000000 */ nop +/* 9F6340 80241900 00000000 */ nop /* 9F6344 80241904 860200A8 */ lh $v0, 0xa8($s0) /* 9F6348 80241908 C604001C */ lwc1 $f4, 0x1c($s0) /* 9F634C 8024190C 44820000 */ mtc1 $v0, $f0 -/* 9F6350 80241910 00000000 */ nop +/* 9F6350 80241910 00000000 */ nop /* 9F6354 80241914 46800020 */ cvt.s.w $f0, $f0 /* 9F6358 80241918 46002085 */ abs.s $f2, $f4 /* 9F635C 8024191C 46020000 */ add.s $f0, $f0, $f2 /* 9F6360 80241920 C7A20024 */ lwc1 $f2, 0x24($sp) /* 9F6364 80241924 4600103E */ c.le.s $f2, $f0 -/* 9F6368 80241928 00000000 */ nop +/* 9F6368 80241928 00000000 */ nop /* 9F636C 8024192C 45000005 */ bc1f .L80241944 -/* 9F6370 80241930 00000000 */ nop +/* 9F6370 80241930 00000000 */ nop /* 9F6374 80241934 C7A0001C */ lwc1 $f0, 0x1c($sp) /* 9F6378 80241938 AE00001C */ sw $zero, 0x1c($s0) /* 9F637C 8024193C 08090666 */ j .L80241998 @@ -217,13 +217,13 @@ glabel func_8024162C_9F606C /* 9F6398 80241958 860200A8 */ lh $v0, 0xa8($s0) /* 9F639C 8024195C 46163081 */ sub.s $f2, $f6, $f22 /* 9F63A0 80241960 44820000 */ mtc1 $v0, $f0 -/* 9F63A4 80241964 00000000 */ nop +/* 9F63A4 80241964 00000000 */ nop /* 9F63A8 80241968 46800020 */ cvt.s.w $f0, $f0 /* 9F63AC 8024196C 46001080 */ add.s $f2, $f2, $f0 /* 9F63B0 80241970 C604001C */ lwc1 $f4, 0x1c($s0) /* 9F63B4 80241974 46002005 */ abs.s $f0, $f4 /* 9F63B8 80241978 4602003C */ c.lt.s $f0, $f2 -/* 9F63BC 8024197C 00000000 */ nop +/* 9F63BC 8024197C 00000000 */ nop /* 9F63C0 80241980 45020005 */ bc1fl .L80241998 /* 9F63C4 80241984 AE00001C */ sw $zero, 0x1c($s0) /* 9F63C8 80241988 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802419BC_9F63FC.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802419BC_9F63FC.s index e33ddd7130..055ea195f0 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802419BC_9F63FC.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802419BC_9F63FC.s @@ -49,15 +49,15 @@ glabel func_802419BC_9F63FC /* 9F64A4 80241A64 44802000 */ mtc1 $zero, $f4 /* 9F64A8 80241A68 460010A1 */ cvt.d.s $f2, $f2 /* 9F64AC 80241A6C 46241082 */ mul.d $f2, $f2, $f4 -/* 9F64B0 80241A70 00000000 */ nop +/* 9F64B0 80241A70 00000000 */ nop /* 9F64B4 80241A74 C7A0001C */ lwc1 $f0, 0x1c($sp) /* 9F64B8 80241A78 46000021 */ cvt.d.s $f0, $f0 /* 9F64BC 80241A7C 46240002 */ mul.d $f0, $f0, $f4 -/* 9F64C0 80241A80 00000000 */ nop +/* 9F64C0 80241A80 00000000 */ nop /* 9F64C4 80241A84 3C013FE0 */ lui $at, 0x3fe0 /* 9F64C8 80241A88 44812800 */ mtc1 $at, $f5 /* 9F64CC 80241A8C 44802000 */ mtc1 $zero, $f4 -/* 9F64D0 80241A90 00000000 */ nop +/* 9F64D0 80241A90 00000000 */ nop /* 9F64D4 80241A94 46241080 */ add.d $f2, $f2, $f4 /* 9F64D8 80241A98 AE000074 */ sw $zero, 0x74($s0) /* 9F64DC 80241A9C 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s index 90635b292a..1a8b99191c 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s @@ -54,7 +54,7 @@ glabel func_80241AE0_9F6520 /* 9F65E0 80241BA0 8E4300B0 */ lw $v1, 0xb0($s2) /* 9F65E4 80241BA4 30620004 */ andi $v0, $v1, 4 /* 9F65E8 80241BA8 10400007 */ beqz $v0, .L80241BC8 -/* 9F65EC 80241BAC 00000000 */ nop +/* 9F65EC 80241BAC 00000000 */ nop /* 9F65F0 80241BB0 824200B4 */ lb $v0, 0xb4($s2) /* 9F65F4 80241BB4 1440003C */ bnez $v0, .L80241CA8 /* 9F65F8 80241BB8 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_80241AE0_9F6520 /* 9F660C 80241BCC 2C62000F */ sltiu $v0, $v1, 0xf /* 9F6610 80241BD0 10400034 */ beqz $v0, .L80241CA4 /* 9F6614 80241BD4 00031080 */ sll $v0, $v1, 2 -/* 9F6618 80241BD8 3C018024 */ lui $at, %hi(D_80245D68) +/* 9F6618 80241BD8 3C018024 */ lui $at, %hi(jtbl_80245D68_9FA7A8) /* 9F661C 80241BDC 00220821 */ addu $at, $at, $v0 -/* 9F6620 80241BE0 8C225D68 */ lw $v0, %lo(D_80245D68)($at) +/* 9F6620 80241BE0 8C225D68 */ lw $v0, %lo(jtbl_80245D68_9FA7A8)($at) /* 9F6624 80241BE4 00400008 */ jr $v0 -/* 9F6628 80241BE8 00000000 */ nop +/* 9F6628 80241BE8 00000000 */ nop +glabel L80241BEC_9F662C /* 9F662C 80241BEC 0280202D */ daddu $a0, $s4, $zero /* 9F6630 80241BF0 0200282D */ daddu $a1, $s0, $zero /* 9F6634 80241BF4 0C0901F5 */ jal func_802407D4_9F5214 /* 9F6638 80241BF8 0260302D */ daddu $a2, $s3, $zero +glabel L80241BFC_9F663C /* 9F663C 80241BFC 0280202D */ daddu $a0, $s4, $zero /* 9F6640 80241C00 0200282D */ daddu $a1, $s0, $zero /* 9F6644 80241C04 0C090261 */ jal func_80240984_9F53C4 /* 9F6648 80241C08 0260302D */ daddu $a2, $s3, $zero /* 9F664C 80241C0C 0809072A */ j .L80241CA8 /* 9F6650 80241C10 0000102D */ daddu $v0, $zero, $zero +glabel L80241C14_9F6654 /* 9F6654 80241C14 0280202D */ daddu $a0, $s4, $zero /* 9F6658 80241C18 0200282D */ daddu $a1, $s0, $zero /* 9F665C 80241C1C 0C0903EB */ jal nok_11_UnkNpcAIFunc1 /* 9F6660 80241C20 0260302D */ daddu $a2, $s3, $zero +glabel L80241C24_9F6664 /* 9F6664 80241C24 0280202D */ daddu $a0, $s4, $zero /* 9F6668 80241C28 0200282D */ daddu $a1, $s0, $zero /* 9F666C 80241C2C 0C09041B */ jal func_8024106C_9F5AAC /* 9F6670 80241C30 0260302D */ daddu $a2, $s3, $zero /* 9F6674 80241C34 0809072A */ j .L80241CA8 /* 9F6678 80241C38 0000102D */ daddu $v0, $zero, $zero +glabel L80241C3C_9F667C /* 9F667C 80241C3C 0280202D */ daddu $a0, $s4, $zero /* 9F6680 80241C40 0200282D */ daddu $a1, $s0, $zero /* 9F6684 80241C44 0C0904EC */ jal nok_11_UnkNpcAIFunc2 /* 9F6688 80241C48 0260302D */ daddu $a2, $s3, $zero +glabel L80241C4C_9F668C /* 9F668C 80241C4C 0280202D */ daddu $a0, $s4, $zero /* 9F6690 80241C50 0200282D */ daddu $a1, $s0, $zero /* 9F6694 80241C54 0C09050A */ jal func_80241428_9F5E68 /* 9F6698 80241C58 0260302D */ daddu $a2, $s3, $zero /* 9F669C 80241C5C 0809072A */ j .L80241CA8 /* 9F66A0 80241C60 0000102D */ daddu $v0, $zero, $zero +glabel L80241C64_9F66A4 /* 9F66A4 80241C64 0280202D */ daddu $a0, $s4, $zero /* 9F66A8 80241C68 0200282D */ daddu $a1, $s0, $zero /* 9F66AC 80241C6C 0C090525 */ jal func_80241494_9F5ED4 /* 9F66B0 80241C70 0260302D */ daddu $a2, $s3, $zero /* 9F66B4 80241C74 0809072A */ j .L80241CA8 /* 9F66B8 80241C78 0000102D */ daddu $v0, $zero, $zero +glabel L80241C7C_9F66BC /* 9F66BC 80241C7C 0280202D */ daddu $a0, $s4, $zero /* 9F66C0 80241C80 0200282D */ daddu $a1, $s0, $zero /* 9F66C4 80241C84 0C090572 */ jal nok_11_UnkNpcAIFunc3 /* 9F66C8 80241C88 0260302D */ daddu $a2, $s3, $zero /* 9F66CC 80241C8C 0809072A */ j .L80241CA8 /* 9F66D0 80241C90 0000102D */ daddu $v0, $zero, $zero +glabel L80241C94_9F66D4 /* 9F66D4 80241C94 0280202D */ daddu $a0, $s4, $zero /* 9F66D8 80241C98 0200282D */ daddu $a1, $s0, $zero /* 9F66DC 80241C9C 0C09058B */ jal func_8024162C_9F606C /* 9F66E0 80241CA0 0260302D */ daddu $a2, $s3, $zero .L80241CA4: +glabel L80241CA4_9F66E4 /* 9F66E4 80241CA4 0000102D */ daddu $v0, $zero, $zero .L80241CA8: /* 9F66E8 80241CA8 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F30_9F6970.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F30_9F6970.s index bf4d2f99d2..1d37e96610 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F30_9F6970.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F30_9F6970.s @@ -9,4 +9,4 @@ glabel func_80241F30_9F6970 /* 9F6980 80241F40 A462000C */ sh $v0, 0xc($v1) /* 9F6984 80241F44 03E00008 */ jr $ra /* 9F6988 80241F48 24020002 */ addiu $v0, $zero, 2 -/* 9F698C 80241F4C 00000000 */ nop +/* 9F698C 80241F4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FA7F0/func_80240000_9FA7F0.s b/asm/nonmatchings/world/area_nok/nok_12/9FA7F0/func_80240000_9FA7F0.s index 2638051324..295a306f3b 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FA7F0/func_80240000_9FA7F0.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FA7F0/func_80240000_9FA7F0.s @@ -43,35 +43,35 @@ glabel func_80240000_9FA7F0 /* 9FA888 80240098 3C138011 */ lui $s3, %hi(gPlayerStatus) /* 9FA88C 8024009C 2673EFC8 */ addiu $s3, $s3, %lo(gPlayerStatus) /* 9FA890 802400A0 44920000 */ mtc1 $s2, $f0 -/* 9FA894 802400A4 00000000 */ nop +/* 9FA894 802400A4 00000000 */ nop /* 9FA898 802400A8 46800020 */ cvt.s.w $f0, $f0 /* 9FA89C 802400AC C6620028 */ lwc1 $f2, 0x28($s3) /* 9FA8A0 802400B0 3C11800B */ lui $s1, %hi(gCurrentEncounter) /* 9FA8A4 802400B4 26310F10 */ addiu $s1, $s1, %lo(gCurrentEncounter) /* 9FA8A8 802400B8 4602003E */ c.le.s $f0, $f2 -/* 9FA8AC 802400BC 00000000 */ nop +/* 9FA8AC 802400BC 00000000 */ nop /* 9FA8B0 802400C0 45000017 */ bc1f .L80240120 -/* 9FA8B4 802400C4 00000000 */ nop +/* 9FA8B4 802400C4 00000000 */ nop /* 9FA8B8 802400C8 44960000 */ mtc1 $s6, $f0 -/* 9FA8BC 802400CC 00000000 */ nop +/* 9FA8BC 802400CC 00000000 */ nop /* 9FA8C0 802400D0 46800020 */ cvt.s.w $f0, $f0 /* 9FA8C4 802400D4 4600103E */ c.le.s $f2, $f0 -/* 9FA8C8 802400D8 00000000 */ nop +/* 9FA8C8 802400D8 00000000 */ nop /* 9FA8CC 802400DC 45000010 */ bc1f .L80240120 -/* 9FA8D0 802400E0 00000000 */ nop +/* 9FA8D0 802400E0 00000000 */ nop /* 9FA8D4 802400E4 C6620030 */ lwc1 $f2, 0x30($s3) /* 9FA8D8 802400E8 44950000 */ mtc1 $s5, $f0 -/* 9FA8DC 802400EC 00000000 */ nop +/* 9FA8DC 802400EC 00000000 */ nop /* 9FA8E0 802400F0 46800020 */ cvt.s.w $f0, $f0 /* 9FA8E4 802400F4 4602003E */ c.le.s $f0, $f2 -/* 9FA8E8 802400F8 00000000 */ nop +/* 9FA8E8 802400F8 00000000 */ nop /* 9FA8EC 802400FC 45000008 */ bc1f .L80240120 -/* 9FA8F0 80240100 00000000 */ nop +/* 9FA8F0 80240100 00000000 */ nop /* 9FA8F4 80240104 44940000 */ mtc1 $s4, $f0 -/* 9FA8F8 80240108 00000000 */ nop +/* 9FA8F8 80240108 00000000 */ nop /* 9FA8FC 8024010C 46800020 */ cvt.s.w $f0, $f0 /* 9FA900 80240110 4600103E */ c.le.s $f2, $f0 -/* 9FA904 80240114 00000000 */ nop +/* 9FA904 80240114 00000000 */ nop /* 9FA908 80240118 45030001 */ bc1tl .L80240120 /* 9FA90C 8024011C 0040802D */ daddu $s0, $v0, $zero .L80240120: @@ -99,5 +99,5 @@ glabel func_80240000_9FA7F0 /* 9FA95C 8024016C 24020002 */ addiu $v0, $zero, 2 /* 9FA960 80240170 03E00008 */ jr $ra /* 9FA964 80240174 27BD0030 */ addiu $sp, $sp, 0x30 -/* 9FA968 80240178 00000000 */ nop -/* 9FA96C 8024017C 00000000 */ nop +/* 9FA968 80240178 00000000 */ nop +/* 9FA96C 8024017C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240180_9FA970.s b/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240180_9FA970.s index 1d46664948..07bd0ca71f 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240180_9FA970.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240180_9FA970.s @@ -26,7 +26,7 @@ glabel func_80240180_9FA970 /* 9FA9C4 802401D4 0040882D */ daddu $s1, $v0, $zero /* 9FA9C8 802401D8 2402FFFF */ addiu $v0, $zero, -1 /* 9FA9CC 802401DC 16420002 */ bne $s2, $v0, .L802401E8 -/* 9FA9D0 802401E0 00000000 */ nop +/* 9FA9D0 802401E0 00000000 */ nop /* 9FA9D4 802401E4 86720008 */ lh $s2, 8($s3) .L802401E8: /* 9FA9D8 802401E8 0C00FB5A */ jal get_enemy_safe diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240224_9FAA14.s b/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240224_9FAA14.s index c025a0ebb0..f967c24ca5 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240224_9FAA14.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240224_9FAA14.s @@ -32,15 +32,15 @@ glabel func_80240224_9FAA14 /* 9FAA80 80240290 0040802D */ daddu $s0, $v0, $zero /* 9FAA84 80240294 0040182D */ daddu $v1, $v0, $zero /* 9FAA88 80240298 44920000 */ mtc1 $s2, $f0 -/* 9FAA8C 8024029C 00000000 */ nop +/* 9FAA8C 8024029C 00000000 */ nop /* 9FAA90 802402A0 46800020 */ cvt.s.w $f0, $f0 /* 9FAA94 802402A4 E4600048 */ swc1 $f0, 0x48($v1) /* 9FAA98 802402A8 44910000 */ mtc1 $s1, $f0 -/* 9FAA9C 802402AC 00000000 */ nop +/* 9FAA9C 802402AC 00000000 */ nop /* 9FAAA0 802402B0 46800020 */ cvt.s.w $f0, $f0 /* 9FAAA4 802402B4 E460004C */ swc1 $f0, 0x4c($v1) /* 9FAAA8 802402B8 44900000 */ mtc1 $s0, $f0 -/* 9FAAAC 802402BC 00000000 */ nop +/* 9FAAAC 802402BC 00000000 */ nop /* 9FAAB0 802402C0 46800020 */ cvt.s.w $f0, $f0 /* 9FAAB4 802402C4 E4600050 */ swc1 $f0, 0x50($v1) /* 9FAAB8 802402C8 8FBF0020 */ lw $ra, 0x20($sp) @@ -51,5 +51,5 @@ glabel func_80240224_9FAA14 /* 9FAACC 802402DC 24020002 */ addiu $v0, $zero, 2 /* 9FAAD0 802402E0 03E00008 */ jr $ra /* 9FAAD4 802402E4 27BD0028 */ addiu $sp, $sp, 0x28 -/* 9FAAD8 802402E8 00000000 */ nop -/* 9FAADC 802402EC 00000000 */ nop +/* 9FAAD8 802402E8 00000000 */ nop +/* 9FAADC 802402EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAAE0/func_8024030C_9FAAFC.s b/asm/nonmatchings/world/area_nok/nok_12/9FAAE0/func_8024030C_9FAAFC.s index 2d70d142dc..80a6134648 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAAE0/func_8024030C_9FAAFC.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAAE0/func_8024030C_9FAAFC.s @@ -9,5 +9,5 @@ glabel func_8024030C_9FAAFC /* 9FAB0C 8024031C A4620000 */ sh $v0, ($v1) /* 9FAB10 80240320 03E00008 */ jr $ra /* 9FAB14 80240324 24020002 */ addiu $v0, $zero, 2 -/* 9FAB18 80240328 00000000 */ nop -/* 9FAB1C 8024032C 00000000 */ nop +/* 9FAB18 80240328 00000000 */ nop +/* 9FAB1C 8024032C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802405EC_9FADDC.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802405EC_9FADDC.s index 69a68314c4..72766ad5b5 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802405EC_9FADDC.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802405EC_9FADDC.s @@ -21,11 +21,11 @@ glabel func_802405EC_9FADDC /* 9FAE1C 8024062C A602008E */ sh $v0, 0x8e($s0) /* 9FAE20 80240630 00021400 */ sll $v0, $v0, 0x10 /* 9FAE24 80240634 1C400033 */ bgtz $v0, .L80240704 -/* 9FAE28 80240638 00000000 */ nop +/* 9FAE28 80240638 00000000 */ nop .L8024063C: /* 9FAE2C 8024063C 8602008C */ lh $v0, 0x8c($s0) /* 9FAE30 80240640 14400030 */ bnez $v0, .L80240704 -/* 9FAE34 80240644 00000000 */ nop +/* 9FAE34 80240644 00000000 */ nop /* 9FAE38 80240648 8E2200CC */ lw $v0, 0xcc($s1) /* 9FAE3C 8024064C 8C420024 */ lw $v0, 0x24($v0) /* 9FAE40 80240650 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_802405EC_9FADDC /* 9FAE4C 8024065C 8E230088 */ lw $v1, 0x88($s1) /* 9FAE50 80240660 24020005 */ addiu $v0, $zero, 5 /* 9FAE54 80240664 10620005 */ beq $v1, $v0, .L8024067C -/* 9FAE58 80240668 00000000 */ nop +/* 9FAE58 80240668 00000000 */ nop /* 9FAE5C 8024066C 10600003 */ beqz $v1, .L8024067C /* 9FAE60 80240670 24020001 */ addiu $v0, $zero, 1 /* 9FAE64 80240674 14620006 */ bne $v1, $v0, .L80240690 -/* 9FAE68 80240678 00000000 */ nop +/* 9FAE68 80240678 00000000 */ nop .L8024067C: /* 9FAE6C 8024067C 8E220084 */ lw $v0, 0x84($s1) /* 9FAE70 80240680 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_802405EC_9FADDC /* 9FAEB0 802406C0 46220000 */ add.d $f0, $f0, $f2 /* 9FAEB4 802406C4 4620010D */ trunc.w.d $f4, $f0 /* 9FAEB8 802406C8 44022000 */ mfc1 $v0, $f4 -/* 9FAEBC 802406CC 00000000 */ nop +/* 9FAEBC 802406CC 00000000 */ nop /* 9FAEC0 802406D0 A602008E */ sh $v0, 0x8e($s0) /* 9FAEC4 802406D4 00021400 */ sll $v0, $v0, 0x10 /* 9FAEC8 802406D8 8E230078 */ lw $v1, 0x78($s1) /* 9FAECC 802406DC 00021403 */ sra $v0, $v0, 0x10 /* 9FAED0 802406E0 0043102A */ slt $v0, $v0, $v1 /* 9FAED4 802406E4 10400003 */ beqz $v0, .L802406F4 -/* 9FAED8 802406E8 00000000 */ nop +/* 9FAED8 802406E8 00000000 */ nop /* 9FAEDC 802406EC 9622007A */ lhu $v0, 0x7a($s1) /* 9FAEE0 802406F0 A602008E */ sh $v0, 0x8e($s0) .L802406F4: diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s index 233efc8070..5a66219b4a 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s @@ -279,15 +279,17 @@ glabel func_80240904_9FB0F4 /* 9FB4E0 80240CF0 2C620015 */ sltiu $v0, $v1, 0x15 /* 9FB4E4 80240CF4 10400009 */ beqz $v0, .L80240D1C /* 9FB4E8 80240CF8 00031080 */ sll $v0, $v1, 2 -/* 9FB4EC 80240CFC 3C018024 */ lui $at, %hi(D_80245A78) +/* 9FB4EC 80240CFC 3C018024 */ lui $at, %hi(jtbl_80245A78_A00268) /* 9FB4F0 80240D00 00220821 */ addu $at, $at, $v0 -/* 9FB4F4 80240D04 8C225A78 */ lw $v0, %lo(D_80245A78)($at) +/* 9FB4F4 80240D04 8C225A78 */ lw $v0, %lo(jtbl_80245A78_A00268)($at) /* 9FB4F8 80240D08 00400008 */ jr $v0 /* 9FB4FC 80240D0C 00000000 */ nop +glabel L80240D10_9FB500 /* 9FB500 80240D10 8E420028 */ lw $v0, 0x28($s2) /* 9FB504 80240D14 24420001 */ addiu $v0, $v0, 1 /* 9FB508 80240D18 AE420028 */ sw $v0, 0x28($s2) .L80240D1C: +glabel L80240D1C_9FB50C /* 9FB50C 80240D1C 0000102D */ daddu $v0, $zero, $zero .L80240D20: /* 9FB510 80240D20 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240D44_9FB534.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240D44_9FB534.s index 69520d01c8..df49c796af 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240D44_9FB534.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240D44_9FB534.s @@ -45,7 +45,7 @@ glabel func_80240D44_9FB534 /* 9FB5D0 80240DE0 0C00A7B5 */ jal dist2D /* 9FB5D4 80240DE4 4600B386 */ mov.s $f14, $f22 /* 9FB5D8 80240DE8 4614003C */ c.lt.s $f0, $f20 -/* 9FB5DC 80240DEC 00000000 */ nop +/* 9FB5DC 80240DEC 00000000 */ nop /* 9FB5E0 80240DF0 45000003 */ bc1f .L80240E00 /* 9FB5E4 80240DF4 2631000C */ addiu $s1, $s1, 0xc /* 9FB5E8 80240DF8 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_80240D44_9FB534 /* 9FB614 80240E24 8E6200D0 */ lw $v0, 0xd0($s3) /* 9FB618 80240E28 8C42007C */ lw $v0, 0x7c($v0) /* 9FB61C 80240E2C 04410004 */ bgez $v0, .L80240E40 -/* 9FB620 80240E30 00000000 */ nop +/* 9FB620 80240E30 00000000 */ nop /* 9FB624 80240E34 C6C00000 */ lwc1 $f0, ($s6) /* 9FB628 80240E38 08090398 */ j .L80240E60 /* 9FB62C 80240E3C E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_80240D44_9FB534 /* 9FB630 80240E40 3C018024 */ lui $at, %hi(update_player_action) /* 9FB634 80240E44 D4225AD0 */ ldc1 $f2, %lo(update_player_action)($at) /* 9FB638 80240E48 44820000 */ mtc1 $v0, $f0 -/* 9FB63C 80240E4C 00000000 */ nop +/* 9FB63C 80240E4C 00000000 */ nop /* 9FB640 80240E50 46800021 */ cvt.d.w $f0, $f0 /* 9FB644 80240E54 46220003 */ div.d $f0, $f0, $f2 /* 9FB648 80240E58 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240E9C_9FB68C.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240E9C_9FB68C.s index d0e0eb9ded..aabd32b135 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240E9C_9FB68C.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240E9C_9FB68C.s @@ -44,7 +44,7 @@ glabel func_80240E9C_9FB68C /* 9FB728 80240F38 2402000F */ addiu $v0, $zero, 0xf /* 9FB72C 80240F3C AFA2001C */ sw $v0, 0x1c($sp) /* 9FB730 80240F40 44833000 */ mtc1 $v1, $f6 -/* 9FB734 80240F44 00000000 */ nop +/* 9FB734 80240F44 00000000 */ nop /* 9FB738 80240F48 468031A0 */ cvt.s.w $f6, $f6 /* 9FB73C 80240F4C 44073000 */ mfc1 $a3, $f6 /* 9FB740 80240F50 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_80240E9C_9FB68C .L80240FA0: /* 9FB790 80240FA0 8602008C */ lh $v0, 0x8c($s0) /* 9FB794 80240FA4 1440005D */ bnez $v0, .L8024111C -/* 9FB798 80240FA8 00000000 */ nop +/* 9FB798 80240FA8 00000000 */ nop /* 9FB79C 80240FAC C6000018 */ lwc1 $f0, 0x18($s0) /* 9FB7A0 80240FB0 3C014010 */ lui $at, 0x4010 /* 9FB7A4 80240FB4 44811800 */ mtc1 $at, $f3 /* 9FB7A8 80240FB8 44801000 */ mtc1 $zero, $f2 /* 9FB7AC 80240FBC 46000021 */ cvt.d.s $f0, $f0 /* 9FB7B0 80240FC0 4622003C */ c.lt.d $f0, $f2 -/* 9FB7B4 80240FC4 00000000 */ nop +/* 9FB7B4 80240FC4 00000000 */ nop /* 9FB7B8 80240FC8 45000003 */ bc1f .L80240FD8 /* 9FB7BC 80240FCC 0200202D */ daddu $a0, $s0, $zero /* 9FB7C0 80240FD0 080903F7 */ j .L80240FDC @@ -88,7 +88,7 @@ glabel func_80240E9C_9FB68C /* 9FB7C8 80240FD8 24050001 */ addiu $a1, $zero, 1 .L80240FDC: /* 9FB7CC 80240FDC 0C00F598 */ jal func_8003D660 -/* 9FB7D0 80240FE0 00000000 */ nop +/* 9FB7D0 80240FE0 00000000 */ nop /* 9FB7D4 80240FE4 C60C0038 */ lwc1 $f12, 0x38($s0) /* 9FB7D8 80240FE8 8E430078 */ lw $v1, 0x78($s2) /* 9FB7DC 80240FEC C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_80240E9C_9FB68C /* 9FB804 80241014 4406B000 */ mfc1 $a2, $f22 /* 9FB808 80241018 4407A000 */ mfc1 $a3, $f20 /* 9FB80C 8024101C 0C00A720 */ jal atan2 -/* 9FB810 80241020 00000000 */ nop +/* 9FB810 80241020 00000000 */ nop /* 9FB814 80241024 8E050018 */ lw $a1, 0x18($s0) /* 9FB818 80241028 44060000 */ mfc1 $a2, $f0 /* 9FB81C 8024102C 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_80240E9C_9FB68C /* 9FB830 80241040 4406B000 */ mfc1 $a2, $f22 /* 9FB834 80241044 4407A000 */ mfc1 $a3, $f20 /* 9FB838 80241048 0C00A7B5 */ jal dist2D -/* 9FB83C 8024104C 00000000 */ nop +/* 9FB83C 8024104C 00000000 */ nop /* 9FB840 80241050 C6020018 */ lwc1 $f2, 0x18($s0) /* 9FB844 80241054 4602003E */ c.le.s $f0, $f2 -/* 9FB848 80241058 00000000 */ nop +/* 9FB848 80241058 00000000 */ nop /* 9FB84C 8024105C 4500002F */ bc1f .L8024111C /* 9FB850 80241060 240403E8 */ addiu $a0, $zero, 0x3e8 /* 9FB854 80241064 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_80240E9C_9FB68C /* 9FB8A8 802410B8 18400003 */ blez $v0, .L802410C8 /* 9FB8AC 802410BC 24020004 */ addiu $v0, $zero, 4 /* 9FB8B0 802410C0 14600002 */ bnez $v1, .L802410CC -/* 9FB8B4 802410C4 00000000 */ nop +/* 9FB8B4 802410C4 00000000 */ nop .L802410C8: /* 9FB8B8 802410C8 AE420070 */ sw $v0, 0x70($s2) .L802410CC: diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241204_9FB9F4.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241204_9FB9F4.s index 4885a368f0..08626d9bc9 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241204_9FB9F4.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241204_9FB9F4.s @@ -38,7 +38,7 @@ glabel func_80241204_9FB9F4 /* 9FBA78 80241288 2402000F */ addiu $v0, $zero, 0xf /* 9FBA7C 8024128C AFA2001C */ sw $v0, 0x1c($sp) /* 9FBA80 80241290 44833000 */ mtc1 $v1, $f6 -/* 9FBA84 80241294 00000000 */ nop +/* 9FBA84 80241294 00000000 */ nop /* 9FBA88 80241298 468031A0 */ cvt.s.w $f6, $f6 /* 9FBA8C 8024129C 44073000 */ mfc1 $a3, $f6 /* 9FBA90 802412A0 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_80241204_9FB9F4 .L80241304: /* 9FBAF4 80241304 8602008C */ lh $v0, 0x8c($s0) /* 9FBAF8 80241308 14400025 */ bnez $v0, .L802413A0 -/* 9FBAFC 8024130C 00000000 */ nop +/* 9FBAFC 8024130C 00000000 */ nop /* 9FBB00 80241310 9602008E */ lhu $v0, 0x8e($s0) /* 9FBB04 80241314 2442FFFF */ addiu $v0, $v0, -1 /* 9FBB08 80241318 A602008E */ sh $v0, 0x8e($s0) /* 9FBB0C 8024131C 00021400 */ sll $v0, $v0, 0x10 /* 9FBB10 80241320 1440001F */ bnez $v0, .L802413A0 -/* 9FBB14 80241324 00000000 */ nop +/* 9FBB14 80241324 00000000 */ nop /* 9FBB18 80241328 8E820074 */ lw $v0, 0x74($s4) /* 9FBB1C 8024132C 2442FFFF */ addiu $v0, $v0, -1 /* 9FBB20 80241330 10400019 */ beqz $v0, .L80241398 @@ -84,7 +84,7 @@ glabel func_80241204_9FB9F4 /* 9FBB2C 8024133C 9442002A */ lhu $v0, 0x2a($v0) /* 9FBB30 80241340 30420010 */ andi $v0, $v0, 0x10 /* 9FBB34 80241344 14400007 */ bnez $v0, .L80241364 -/* 9FBB38 80241348 00000000 */ nop +/* 9FBB38 80241348 00000000 */ nop /* 9FBB3C 8024134C C600000C */ lwc1 $f0, 0xc($s0) /* 9FBB40 80241350 3C014334 */ lui $at, 0x4334 /* 9FBB44 80241354 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802413C0_9FBBB0.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802413C0_9FBBB0.s index d96a1b3d2f..2da2a96f2b 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802413C0_9FBBB0.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802413C0_9FBBB0.s @@ -28,7 +28,7 @@ glabel func_802413C0_9FBBB0 /* 9FBC08 80241418 8E0200D0 */ lw $v0, 0xd0($s0) /* 9FBC0C 8024141C 8C42007C */ lw $v0, 0x7c($v0) /* 9FBC10 80241420 04410004 */ bgez $v0, .L80241434 -/* 9FBC14 80241424 00000000 */ nop +/* 9FBC14 80241424 00000000 */ nop /* 9FBC18 80241428 C6400000 */ lwc1 $f0, ($s2) /* 9FBC1C 8024142C 08090515 */ j .L80241454 /* 9FBC20 80241430 E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_802413C0_9FBBB0 /* 9FBC24 80241434 3C018024 */ lui $at, %hi(D_80245AD8) /* 9FBC28 80241438 D4225AD8 */ ldc1 $f2, %lo(D_80245AD8)($at) /* 9FBC2C 8024143C 44820000 */ mtc1 $v0, $f0 -/* 9FBC30 80241440 00000000 */ nop +/* 9FBC30 80241440 00000000 */ nop /* 9FBC34 80241444 46800021 */ cvt.d.w $f0, $f0 /* 9FBC38 80241448 46220003 */ div.d $f0, $f0, $f2 /* 9FBC3C 8024144C 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241560_9FBD50.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241560_9FBD50.s index 40413f66cc..c88c54fb80 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241560_9FBD50.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241560_9FBD50.s @@ -47,20 +47,20 @@ glabel func_80241560_9FBD50 /* 9FBDF8 80241608 8E02001C */ lw $v0, 0x1c($s0) /* 9FBDFC 8024160C 46001005 */ abs.s $f0, $f2 /* 9FBE00 80241610 44822000 */ mtc1 $v0, $f4 -/* 9FBE04 80241614 00000000 */ nop +/* 9FBE04 80241614 00000000 */ nop /* 9FBE08 80241618 46802120 */ cvt.s.w $f4, $f4 /* 9FBE0C 8024161C 4600203C */ c.lt.s $f4, $f0 -/* 9FBE10 80241620 00000000 */ nop +/* 9FBE10 80241620 00000000 */ nop /* 9FBE14 80241624 4500000D */ bc1f .L8024165C -/* 9FBE18 80241628 00000000 */ nop +/* 9FBE18 80241628 00000000 */ nop /* 9FBE1C 8024162C 44800000 */ mtc1 $zero, $f0 /* 9FBE20 80241630 C654000C */ lwc1 $f20, 0xc($s2) /* 9FBE24 80241634 4600103C */ c.lt.s $f2, $f0 -/* 9FBE28 80241638 00000000 */ nop +/* 9FBE28 80241638 00000000 */ nop /* 9FBE2C 8024163C 45000006 */ bc1f .L80241658 /* 9FBE30 80241640 00021023 */ negu $v0, $v0 /* 9FBE34 80241644 44820000 */ mtc1 $v0, $f0 -/* 9FBE38 80241648 00000000 */ nop +/* 9FBE38 80241648 00000000 */ nop /* 9FBE3C 8024164C 46800020 */ cvt.s.w $f0, $f0 /* 9FBE40 80241650 08090597 */ j .L8024165C /* 9FBE44 80241654 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241690_9FBE80.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241690_9FBE80.s index d9f897cf1a..265d8423a2 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241690_9FBE80.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241690_9FBE80.s @@ -37,7 +37,7 @@ glabel func_80241690_9FBE80 /* 9FBF00 80241710 2402000F */ addiu $v0, $zero, 0xf /* 9FBF04 80241714 AFA2001C */ sw $v0, 0x1c($sp) /* 9FBF08 80241718 44833000 */ mtc1 $v1, $f6 -/* 9FBF0C 8024171C 00000000 */ nop +/* 9FBF0C 8024171C 00000000 */ nop /* 9FBF10 80241720 468031A0 */ cvt.s.w $f6, $f6 /* 9FBF14 80241724 44073000 */ mfc1 $a3, $f6 /* 9FBF18 80241728 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241818_9FC008.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241818_9FC008.s index 733468dd74..7883930024 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241818_9FC008.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241818_9FC008.s @@ -28,7 +28,7 @@ glabel func_80241818_9FC008 /* 9FC060 80241870 C4400008 */ lwc1 $f0, 8($v0) /* 9FC064 80241874 46800020 */ cvt.s.w $f0, $f0 /* 9FC068 80241878 4602003E */ c.le.s $f0, $f2 -/* 9FC06C 8024187C 00000000 */ nop +/* 9FC06C 8024187C 00000000 */ nop /* 9FC070 80241880 45020003 */ bc1fl .L80241890 /* 9FC074 80241884 24840001 */ addiu $a0, $a0, 1 /* 9FC078 80241888 08090628 */ j .L802418A0 diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s index 1da85de331..f074cac286 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s @@ -46,7 +46,7 @@ glabel func_802418D8_9FC0C8 /* 9FC16C 8024197C 8E2200B0 */ lw $v0, 0xb0($s1) /* 9FC170 80241980 30420004 */ andi $v0, $v0, 4 /* 9FC174 80241984 10400044 */ beqz $v0, .L80241A98 -/* 9FC178 80241988 00000000 */ nop +/* 9FC178 80241988 00000000 */ nop .L8024198C: /* 9FC17C 8024198C 2404F7FF */ addiu $a0, $zero, -0x801 /* 9FC180 80241990 AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_802418D8_9FC0C8 /* 9FC234 80241A44 3C0142C8 */ lui $at, 0x42c8 /* 9FC238 80241A48 44812000 */ mtc1 $at, $f4 /* 9FC23C 80241A4C 44823000 */ mtc1 $v0, $f6 -/* 9FC240 80241A50 00000000 */ nop +/* 9FC240 80241A50 00000000 */ nop /* 9FC244 80241A54 468031A0 */ cvt.s.w $f6, $f6 /* 9FC248 80241A58 27A20044 */ addiu $v0, $sp, 0x44 /* 9FC24C 80241A5C E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_802418D8_9FC0C8 /* 9FC270 80241A80 0C0372DF */ jal func_800DCB7C /* 9FC274 80241A84 27A70040 */ addiu $a3, $sp, 0x40 /* 9FC278 80241A88 10400003 */ beqz $v0, .L80241A98 -/* 9FC27C 80241A8C 00000000 */ nop +/* 9FC27C 80241A8C 00000000 */ nop /* 9FC280 80241A90 C7A0003C */ lwc1 $f0, 0x3c($sp) /* 9FC284 80241A94 E640003C */ swc1 $f0, 0x3c($s2) .L80241A98: @@ -124,72 +124,85 @@ glabel func_802418D8_9FC0C8 /* 9FC28C 80241A9C 2C620064 */ sltiu $v0, $v1, 0x64 /* 9FC290 80241AA0 10400042 */ beqz $v0, .L80241BAC /* 9FC294 80241AA4 00031080 */ sll $v0, $v1, 2 -/* 9FC298 80241AA8 3C018024 */ lui $at, %hi(D_80245AE0) +/* 9FC298 80241AA8 3C018024 */ lui $at, %hi(jtbl_80245AE0_A002D0) /* 9FC29C 80241AAC 00220821 */ addu $at, $at, $v0 -/* 9FC2A0 80241AB0 8C225AE0 */ lw $v0, %lo(D_80245AE0)($at) +/* 9FC2A0 80241AB0 8C225AE0 */ lw $v0, %lo(jtbl_80245AE0_A002D0)($at) /* 9FC2A4 80241AB4 00400008 */ jr $v0 -/* 9FC2A8 80241AB8 00000000 */ nop +/* 9FC2A8 80241AB8 00000000 */ nop +glabel L80241ABC_9FC2AC /* 9FC2AC 80241ABC 0280202D */ daddu $a0, $s4, $zero /* 9FC2B0 80241AC0 0260282D */ daddu $a1, $s3, $zero /* 9FC2B4 80241AC4 0C090351 */ jal func_80240D44_9FB534 /* 9FC2B8 80241AC8 02A0302D */ daddu $a2, $s5, $zero +glabel L80241ACC_9FC2BC /* 9FC2BC 80241ACC 0280202D */ daddu $a0, $s4, $zero /* 9FC2C0 80241AD0 0260282D */ daddu $a1, $s3, $zero /* 9FC2C4 80241AD4 0C0903A7 */ jal func_80240E9C_9FB68C /* 9FC2C8 80241AD8 02A0302D */ daddu $a2, $s5, $zero /* 9FC2CC 80241ADC 080906EB */ j .L80241BAC -/* 9FC2D0 80241AE0 00000000 */ nop +/* 9FC2D0 80241AE0 00000000 */ nop +glabel L80241AE4_9FC2D4 /* 9FC2D4 80241AE4 0280202D */ daddu $a0, $s4, $zero /* 9FC2D8 80241AE8 0260282D */ daddu $a1, $s3, $zero /* 9FC2DC 80241AEC 0C090451 */ jal nok_12_UnkNpcAIFunc1 /* 9FC2E0 80241AF0 02A0302D */ daddu $a2, $s5, $zero +glabel L80241AF4_9FC2E4 /* 9FC2E4 80241AF4 0280202D */ daddu $a0, $s4, $zero /* 9FC2E8 80241AF8 0260282D */ daddu $a1, $s3, $zero /* 9FC2EC 80241AFC 0C090481 */ jal func_80241204_9FB9F4 /* 9FC2F0 80241B00 02A0302D */ daddu $a2, $s5, $zero /* 9FC2F4 80241B04 080906EB */ j .L80241BAC -/* 9FC2F8 80241B08 00000000 */ nop +/* 9FC2F8 80241B08 00000000 */ nop +glabel L80241B0C_9FC2FC /* 9FC2FC 80241B0C 0280202D */ daddu $a0, $s4, $zero /* 9FC300 80241B10 0260282D */ daddu $a1, $s3, $zero /* 9FC304 80241B14 0C0904F0 */ jal func_802413C0_9FBBB0 /* 9FC308 80241B18 02A0302D */ daddu $a2, $s5, $zero /* 9FC30C 80241B1C 080906EB */ j .L80241BAC -/* 9FC310 80241B20 00000000 */ nop +/* 9FC310 80241B20 00000000 */ nop +glabel L80241B24_9FC314 /* 9FC314 80241B24 0280202D */ daddu $a0, $s4, $zero /* 9FC318 80241B28 0260282D */ daddu $a1, $s3, $zero /* 9FC31C 80241B2C 0C09051D */ jal nok_12_NpcJumpFunc2 /* 9FC320 80241B30 02A0302D */ daddu $a2, $s5, $zero +glabel L80241B34_9FC324 /* 9FC324 80241B34 0280202D */ daddu $a0, $s4, $zero /* 9FC328 80241B38 0260282D */ daddu $a1, $s3, $zero /* 9FC32C 80241B3C 0C09053A */ jal nok_12_NpcJumpFunc /* 9FC330 80241B40 02A0302D */ daddu $a2, $s5, $zero /* 9FC334 80241B44 080906EB */ j .L80241BAC -/* 9FC338 80241B48 00000000 */ nop +/* 9FC338 80241B48 00000000 */ nop +glabel L80241B4C_9FC33C /* 9FC33C 80241B4C 0280202D */ daddu $a0, $s4, $zero /* 9FC340 80241B50 0260282D */ daddu $a1, $s3, $zero /* 9FC344 80241B54 0C090558 */ jal func_80241560_9FBD50 /* 9FC348 80241B58 02A0302D */ daddu $a2, $s5, $zero +glabel L80241B5C_9FC34C /* 9FC34C 80241B5C 0280202D */ daddu $a0, $s4, $zero /* 9FC350 80241B60 0260282D */ daddu $a1, $s3, $zero /* 9FC354 80241B64 0C0905A4 */ jal func_80241690_9FBE80 /* 9FC358 80241B68 02A0302D */ daddu $a2, $s5, $zero /* 9FC35C 80241B6C 080906EB */ j .L80241BAC -/* 9FC360 80241B70 00000000 */ nop +/* 9FC360 80241B70 00000000 */ nop +glabel L80241B74_9FC364 /* 9FC364 80241B74 0280202D */ daddu $a0, $s4, $zero /* 9FC368 80241B78 0260282D */ daddu $a1, $s3, $zero /* 9FC36C 80241B7C 0C0905EC */ jal nok_12_UnkNpcDurationFlagFunc /* 9FC370 80241B80 02A0302D */ daddu $a2, $s5, $zero /* 9FC374 80241B84 080906EB */ j .L80241BAC -/* 9FC378 80241B88 00000000 */ nop +/* 9FC378 80241B88 00000000 */ nop +glabel L80241B8C_9FC37C /* 9FC37C 80241B8C 0280202D */ daddu $a0, $s4, $zero /* 9FC380 80241B90 0260282D */ daddu $a1, $s3, $zero /* 9FC384 80241B94 0C090606 */ jal func_80241818_9FC008 /* 9FC388 80241B98 02A0302D */ daddu $a2, $s5, $zero /* 9FC38C 80241B9C 080906EB */ j .L80241BAC -/* 9FC390 80241BA0 00000000 */ nop +/* 9FC390 80241BA0 00000000 */ nop +glabel L80241BA4_9FC394 /* 9FC394 80241BA4 0C0129CF */ jal func_8004A73C /* 9FC398 80241BA8 0280202D */ daddu $a0, $s4, $zero .L80241BAC: +glabel L80241BAC_9FC39C /* 9FC39C 80241BAC 8FBF0060 */ lw $ra, 0x60($sp) /* 9FC3A0 80241BB0 8FB5005C */ lw $s5, 0x5c($sp) /* 9FC3A4 80241BB4 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s index 52b503a3fa..35a1590b2e 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s @@ -53,7 +53,7 @@ glabel func_80241BD4_9FC3C4 /* 9FC480 80241C90 8E2200B0 */ lw $v0, 0xb0($s1) /* 9FC484 80241C94 30420004 */ andi $v0, $v0, 4 /* 9FC488 80241C98 10400048 */ beqz $v0, .L80241DBC -/* 9FC48C 80241C9C 00000000 */ nop +/* 9FC48C 80241C9C 00000000 */ nop .L80241CA0: /* 9FC490 80241CA0 A640008E */ sh $zero, 0x8e($s2) /* 9FC494 80241CA4 AE600070 */ sw $zero, 0x70($s3) @@ -103,7 +103,7 @@ glabel func_80241BD4_9FC3C4 /* 9FC53C 80241D4C 24020028 */ addiu $v0, $zero, 0x28 /* 9FC540 80241D50 AFA2001C */ sw $v0, 0x1c($sp) /* 9FC544 80241D54 44833000 */ mtc1 $v1, $f6 -/* 9FC548 80241D58 00000000 */ nop +/* 9FC548 80241D58 00000000 */ nop /* 9FC54C 80241D5C 468031A0 */ cvt.s.w $f6, $f6 /* 9FC550 80241D60 44073000 */ mfc1 $a3, $f6 /* 9FC554 80241D64 27A20048 */ addiu $v0, $sp, 0x48 @@ -134,64 +134,75 @@ glabel func_80241BD4_9FC3C4 /* 9FC5B0 80241DC0 2C620064 */ sltiu $v0, $v1, 0x64 /* 9FC5B4 80241DC4 1040003A */ beqz $v0, .L80241EB0 /* 9FC5B8 80241DC8 00031080 */ sll $v0, $v1, 2 -/* 9FC5BC 80241DCC 3C018024 */ lui $at, %hi(D_80245C70) +/* 9FC5BC 80241DCC 3C018024 */ lui $at, %hi(jtbl_80245C70_A00460) /* 9FC5C0 80241DD0 00220821 */ addu $at, $at, $v0 -/* 9FC5C4 80241DD4 8C225C70 */ lw $v0, %lo(D_80245C70)($at) +/* 9FC5C4 80241DD4 8C225C70 */ lw $v0, %lo(jtbl_80245C70_A00460)($at) /* 9FC5C8 80241DD8 00400008 */ jr $v0 -/* 9FC5CC 80241DDC 00000000 */ nop +/* 9FC5CC 80241DDC 00000000 */ nop +glabel L80241DE0_9FC5D0 /* 9FC5D0 80241DE0 0260202D */ daddu $a0, $s3, $zero /* 9FC5D4 80241DE4 0280282D */ daddu $a1, $s4, $zero /* 9FC5D8 80241DE8 0C090351 */ jal func_80240D44_9FB534 /* 9FC5DC 80241DEC 02A0302D */ daddu $a2, $s5, $zero /* 9FC5E0 80241DF0 96220086 */ lhu $v0, 0x86($s1) /* 9FC5E4 80241DF4 A64200A8 */ sh $v0, 0xa8($s2) +glabel L80241DF8_9FC5E8 /* 9FC5E8 80241DF8 0260202D */ daddu $a0, $s3, $zero /* 9FC5EC 80241DFC 0280282D */ daddu $a1, $s4, $zero /* 9FC5F0 80241E00 0C0903A7 */ jal func_80240E9C_9FB68C /* 9FC5F4 80241E04 02A0302D */ daddu $a2, $s5, $zero /* 9FC5F8 80241E08 080907AC */ j .L80241EB0 -/* 9FC5FC 80241E0C 00000000 */ nop +/* 9FC5FC 80241E0C 00000000 */ nop +glabel L80241E10_9FC600 /* 9FC600 80241E10 0260202D */ daddu $a0, $s3, $zero /* 9FC604 80241E14 0280282D */ daddu $a1, $s4, $zero /* 9FC608 80241E18 0C090451 */ jal nok_12_UnkNpcAIFunc1 /* 9FC60C 80241E1C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241E20_9FC610 /* 9FC610 80241E20 0260202D */ daddu $a0, $s3, $zero /* 9FC614 80241E24 0280282D */ daddu $a1, $s4, $zero /* 9FC618 80241E28 0C090481 */ jal func_80241204_9FB9F4 /* 9FC61C 80241E2C 02A0302D */ daddu $a2, $s5, $zero /* 9FC620 80241E30 080907AC */ j .L80241EB0 -/* 9FC624 80241E34 00000000 */ nop +/* 9FC624 80241E34 00000000 */ nop +glabel L80241E38_9FC628 /* 9FC628 80241E38 0260202D */ daddu $a0, $s3, $zero /* 9FC62C 80241E3C 0280282D */ daddu $a1, $s4, $zero /* 9FC630 80241E40 0C0904F0 */ jal func_802413C0_9FBBB0 /* 9FC634 80241E44 02A0302D */ daddu $a2, $s5, $zero /* 9FC638 80241E48 080907AC */ j .L80241EB0 -/* 9FC63C 80241E4C 00000000 */ nop +/* 9FC63C 80241E4C 00000000 */ nop +glabel L80241E50_9FC640 /* 9FC640 80241E50 0260202D */ daddu $a0, $s3, $zero /* 9FC644 80241E54 0280282D */ daddu $a1, $s4, $zero /* 9FC648 80241E58 0C09015C */ jal nok_12_set_script_owner_npc_anim /* 9FC64C 80241E5C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241E60_9FC650 /* 9FC650 80241E60 0260202D */ daddu $a0, $s3, $zero /* 9FC654 80241E64 0280282D */ daddu $a1, $s4, $zero /* 9FC658 80241E68 0C09017B */ jal func_802405EC_9FADDC /* 9FC65C 80241E6C 02A0302D */ daddu $a2, $s5, $zero /* 9FC660 80241E70 080907AC */ j .L80241EB0 -/* 9FC664 80241E74 00000000 */ nop +/* 9FC664 80241E74 00000000 */ nop +glabel L80241E78_9FC668 /* 9FC668 80241E78 0260202D */ daddu $a0, $s3, $zero /* 9FC66C 80241E7C 0280282D */ daddu $a1, $s4, $zero /* 9FC670 80241E80 0C0901C8 */ jal nok_12_UnkNpcAIFunc12 /* 9FC674 80241E84 02A0302D */ daddu $a2, $s5, $zero /* 9FC678 80241E88 080907AC */ j .L80241EB0 -/* 9FC67C 80241E8C 00000000 */ nop +/* 9FC67C 80241E8C 00000000 */ nop +glabel L80241E90_9FC680 /* 9FC680 80241E90 0260202D */ daddu $a0, $s3, $zero /* 9FC684 80241E94 0280282D */ daddu $a1, $s4, $zero /* 9FC688 80241E98 0C090221 */ jal nok_12_set_script_owner_npc_col_height /* 9FC68C 80241E9C 02A0302D */ daddu $a2, $s5, $zero /* 9FC690 80241EA0 080907AC */ j .L80241EB0 -/* 9FC694 80241EA4 00000000 */ nop +/* 9FC694 80241EA4 00000000 */ nop +glabel L80241EA8_9FC698 /* 9FC698 80241EA8 0C0129CF */ jal func_8004A73C /* 9FC69C 80241EAC 0260202D */ daddu $a0, $s3, $zero .L80241EB0: +glabel L80241EB0_9FC6A0 /* 9FC6A0 80241EB0 8FBF0068 */ lw $ra, 0x68($sp) /* 9FC6A4 80241EB4 8FB50064 */ lw $s5, 0x64($sp) /* 9FC6A8 80241EB8 8FB40060 */ lw $s4, 0x60($sp) @@ -202,5 +213,5 @@ glabel func_80241BD4_9FC3C4 /* 9FC6BC 80241ECC 0000102D */ daddu $v0, $zero, $zero /* 9FC6C0 80241ED0 03E00008 */ jr $ra /* 9FC6C4 80241ED4 27BD0070 */ addiu $sp, $sp, 0x70 -/* 9FC6C8 80241ED8 00000000 */ nop -/* 9FC6CC 80241EDC 00000000 */ nop +/* 9FC6C8 80241ED8 00000000 */ nop +/* 9FC6CC 80241EDC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241EE0_9FC6D0.s b/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241EE0_9FC6D0.s index 7a7345d80d..69efbefe7d 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241EE0_9FC6D0.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241EE0_9FC6D0.s @@ -20,12 +20,12 @@ glabel func_80241EE0_9FC6D0 /* 9FC70C 80241F1C 10600007 */ beqz $v1, .L80241F3C /* 9FC710 80241F20 0000102D */ daddu $v0, $zero, $zero /* 9FC714 80241F24 080907EE */ j .L80241FB8 -/* 9FC718 80241F28 00000000 */ nop +/* 9FC718 80241F28 00000000 */ nop .L80241F2C: /* 9FC71C 80241F2C 10620008 */ beq $v1, $v0, .L80241F50 /* 9FC720 80241F30 0000102D */ daddu $v0, $zero, $zero /* 9FC724 80241F34 080907EE */ j .L80241FB8 -/* 9FC728 80241F38 00000000 */ nop +/* 9FC728 80241F38 00000000 */ nop .L80241F3C: /* 9FC72C 80241F3C 24020001 */ addiu $v0, $zero, 1 /* 9FC730 80241F40 080907ED */ j .L80241FB4 @@ -45,7 +45,7 @@ glabel func_80241EE0_9FC6D0 /* 9FC760 80241F70 4600110D */ trunc.w.s $f4, $f2 /* 9FC764 80241F74 44052000 */ mfc1 $a1, $f4 /* 9FC768 80241F78 0C03BCF0 */ jal func_800EF3C0 -/* 9FC76C 80241F7C 00000000 */ nop +/* 9FC76C 80241F7C 00000000 */ nop /* 9FC770 80241F80 0C03BCF5 */ jal func_800EF3D4 /* 9FC774 80241F84 0000202D */ daddu $a0, $zero, $zero /* 9FC778 80241F88 3C0142B4 */ lui $at, 0x42b4 @@ -53,7 +53,7 @@ glabel func_80241EE0_9FC6D0 /* 9FC780 80241F90 8E040000 */ lw $a0, ($s0) /* 9FC784 80241F94 4405A000 */ mfc1 $a1, $f20 /* 9FC788 80241F98 0C00ECD0 */ jal set_npc_yaw -/* 9FC78C 80241F9C 00000000 */ nop +/* 9FC78C 80241F9C 00000000 */ nop /* 9FC790 80241FA0 24020002 */ addiu $v0, $zero, 2 /* 9FC794 80241FA4 E6340080 */ swc1 $f20, 0x80($s1) /* 9FC798 80241FA8 E6340084 */ swc1 $f20, 0x84($s1) diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241FD0_9FC7C0.s b/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241FD0_9FC7C0.s index 5dc478d2c8..8cb4eb8ccf 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241FD0_9FC7C0.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241FD0_9FC7C0.s @@ -20,12 +20,12 @@ glabel func_80241FD0_9FC7C0 /* 9FC7FC 8024200C 10600007 */ beqz $v1, .L8024202C /* 9FC800 80242010 0000102D */ daddu $v0, $zero, $zero /* 9FC804 80242014 0809082A */ j .L802420A8 -/* 9FC808 80242018 00000000 */ nop +/* 9FC808 80242018 00000000 */ nop .L8024201C: /* 9FC80C 8024201C 10620008 */ beq $v1, $v0, .L80242040 /* 9FC810 80242020 0000102D */ daddu $v0, $zero, $zero /* 9FC814 80242024 0809082A */ j .L802420A8 -/* 9FC818 80242028 00000000 */ nop +/* 9FC818 80242028 00000000 */ nop .L8024202C: /* 9FC81C 8024202C 24020001 */ addiu $v0, $zero, 1 /* 9FC820 80242030 08090829 */ j .L802420A4 @@ -45,7 +45,7 @@ glabel func_80241FD0_9FC7C0 /* 9FC850 80242060 4600110D */ trunc.w.s $f4, $f2 /* 9FC854 80242064 44052000 */ mfc1 $a1, $f4 /* 9FC858 80242068 0C03BCF0 */ jal func_800EF3C0 -/* 9FC85C 8024206C 00000000 */ nop +/* 9FC85C 8024206C 00000000 */ nop /* 9FC860 80242070 0C03BCF5 */ jal func_800EF3D4 /* 9FC864 80242074 0000202D */ daddu $a0, $zero, $zero /* 9FC868 80242078 3C0142B4 */ lui $at, 0x42b4 @@ -53,7 +53,7 @@ glabel func_80241FD0_9FC7C0 /* 9FC870 80242080 8E040000 */ lw $a0, ($s0) /* 9FC874 80242084 4405A000 */ mfc1 $a1, $f20 /* 9FC878 80242088 0C00ECD0 */ jal set_npc_yaw -/* 9FC87C 8024208C 00000000 */ nop +/* 9FC87C 8024208C 00000000 */ nop /* 9FC880 80242090 24020002 */ addiu $v0, $zero, 2 /* 9FC884 80242094 E6340080 */ swc1 $f20, 0x80($s1) /* 9FC888 80242098 E6340084 */ swc1 $f20, 0x84($s1) diff --git a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240000_A00600.s b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240000_A00600.s index 8d5d6d70e4..e69eafb599 100644 --- a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240000_A00600.s +++ b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240000_A00600.s @@ -30,7 +30,7 @@ glabel func_80240000_A00600 /* A00664 80240064 3C05B000 */ lui $a1, 0xb000 /* A00668 80240068 34A50017 */ ori $a1, $a1, 0x17 /* A0066C 8024006C 44820000 */ mtc1 $v0, $f0 -/* A00670 80240070 00000000 */ nop +/* A00670 80240070 00000000 */ nop /* A00674 80240074 46800021 */ cvt.d.w $f0, $f0 /* A00678 80240078 3C014024 */ lui $at, 0x4024 /* A0067C 8024007C 44811800 */ mtc1 $at, $f3 @@ -68,7 +68,7 @@ glabel func_80240000_A00600 /* A006FC 802400FC 0C0123F5 */ jal is_point_within_region /* A00700 80240100 8E070038 */ lw $a3, 0x38($s0) /* A00704 80240104 10400035 */ beqz $v0, .L802401DC -/* A00708 80240108 00000000 */ nop +/* A00708 80240108 00000000 */ nop /* A0070C 8024010C C60C0038 */ lwc1 $f12, 0x38($s0) /* A00710 80240110 3C0141C8 */ lui $at, 0x41c8 /* A00714 80240114 4481B000 */ mtc1 $at, $f22 @@ -99,13 +99,13 @@ glabel func_80240000_A00600 /* A00774 80240174 860200A8 */ lh $v0, 0xa8($s0) /* A00778 80240178 27A50020 */ addiu $a1, $sp, 0x20 /* A0077C 8024017C 44820000 */ mtc1 $v0, $f0 -/* A00780 80240180 00000000 */ nop +/* A00780 80240180 00000000 */ nop /* A00784 80240184 46800020 */ cvt.s.w $f0, $f0 /* A00788 80240188 E7A00018 */ swc1 $f0, 0x18($sp) /* A0078C 8024018C 860200A6 */ lh $v0, 0xa6($s0) /* A00790 80240190 27A60024 */ addiu $a2, $sp, 0x24 /* A00794 80240194 44820000 */ mtc1 $v0, $f0 -/* A00798 80240198 00000000 */ nop +/* A00798 80240198 00000000 */ nop /* A0079C 8024019C 46800020 */ cvt.s.w $f0, $f0 /* A007A0 802401A0 E7A0001C */ swc1 $f0, 0x1c($sp) /* A007A4 802401A4 8E040080 */ lw $a0, 0x80($s0) @@ -121,13 +121,13 @@ glabel func_80240000_A00600 /* A007CC 802401CC 1440FFE6 */ bnez $v0, .L80240168 /* A007D0 802401D0 E600000C */ swc1 $f0, 0xc($s0) /* A007D4 802401D4 08090083 */ j .L8024020C -/* A007D8 802401D8 00000000 */ nop +/* A007D8 802401D8 00000000 */ nop .L802401DC: /* A007DC 802401DC 0C00A67F */ jal rand_int /* A007E0 802401E0 2404003C */ addiu $a0, $zero, 0x3c /* A007E4 802401E4 C60C000C */ lwc1 $f12, 0xc($s0) /* A007E8 802401E8 44820000 */ mtc1 $v0, $f0 -/* A007EC 802401EC 00000000 */ nop +/* A007EC 802401EC 00000000 */ nop /* A007F0 802401F0 46800020 */ cvt.s.w $f0, $f0 /* A007F4 802401F4 46006300 */ add.s $f12, $f12, $f0 /* A007F8 802401F8 3C0141F0 */ lui $at, 0x41f0 diff --git a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240230_A00830.s b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240230_A00830.s index b7c43c6017..fc01f02f5e 100644 --- a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240230_A00830.s +++ b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240230_A00830.s @@ -43,7 +43,7 @@ glabel func_80240230_A00830 /* A008C8 802402C8 2402000F */ addiu $v0, $zero, 0xf /* A008CC 802402CC AFA2001C */ sw $v0, 0x1c($sp) /* A008D0 802402D0 44835000 */ mtc1 $v1, $f10 -/* A008D4 802402D4 00000000 */ nop +/* A008D4 802402D4 00000000 */ nop /* A008D8 802402D8 468052A0 */ cvt.s.w $f10, $f10 /* A008DC 802402DC 44075000 */ mfc1 $a3, $f10 /* A008E0 802402E0 27A20028 */ addiu $v0, $sp, 0x28 @@ -78,7 +78,7 @@ glabel func_80240230_A00830 /* A00948 80240348 44801800 */ mtc1 $zero, $f3 /* A0094C 8024034C 46000021 */ cvt.d.s $f0, $f0 /* A00950 80240350 4620103C */ c.lt.d $f2, $f0 -/* A00954 80240354 00000000 */ nop +/* A00954 80240354 00000000 */ nop /* A00958 80240358 45000025 */ bc1f .L802403F0 /* A0095C 8024035C 27A5002C */ addiu $a1, $sp, 0x2c /* A00960 80240360 C6000038 */ lwc1 $f0, 0x38($s0) @@ -88,7 +88,7 @@ glabel func_80240230_A00830 /* A00970 80240370 27A60030 */ addiu $a2, $sp, 0x30 /* A00974 80240374 E7A0002C */ swc1 $f0, 0x2c($sp) /* A00978 80240378 44820000 */ mtc1 $v0, $f0 -/* A0097C 8024037C 00000000 */ nop +/* A0097C 8024037C 00000000 */ nop /* A00980 80240380 46800020 */ cvt.s.w $f0, $f0 /* A00984 80240384 46000021 */ cvt.d.s $f0, $f0 /* A00988 80240388 C604003C */ lwc1 $f4, 0x3c($s0) @@ -96,13 +96,13 @@ glabel func_80240230_A00830 /* A00990 80240390 C6080018 */ lwc1 $f8, 0x18($s0) /* A00994 80240394 860200A8 */ lh $v0, 0xa8($s0) /* A00998 80240398 46220002 */ mul.d $f0, $f0, $f2 -/* A0099C 8024039C 00000000 */ nop +/* A0099C 8024039C 00000000 */ nop /* A009A0 802403A0 E7A40030 */ swc1 $f4, 0x30($sp) /* A009A4 802403A4 E7A60034 */ swc1 $f6, 0x34($sp) /* A009A8 802403A8 E7A80010 */ swc1 $f8, 0x10($sp) /* A009AC 802403AC C604000C */ lwc1 $f4, 0xc($s0) /* A009B0 802403B0 44821000 */ mtc1 $v0, $f2 -/* A009B4 802403B4 00000000 */ nop +/* A009B4 802403B4 00000000 */ nop /* A009B8 802403B8 468010A0 */ cvt.s.w $f2, $f2 /* A009BC 802403BC E7A20018 */ swc1 $f2, 0x18($sp) /* A009C0 802403C0 E7A40014 */ swc1 $f4, 0x14($sp) @@ -123,7 +123,7 @@ glabel func_80240230_A00830 /* A009F8 802403F8 44801800 */ mtc1 $zero, $f3 /* A009FC 802403FC 46000021 */ cvt.d.s $f0, $f0 /* A00A00 80240400 4622003C */ c.lt.d $f0, $f2 -/* A00A04 80240404 00000000 */ nop +/* A00A04 80240404 00000000 */ nop /* A00A08 80240408 45000047 */ bc1f .L80240528 /* A00A0C 8024040C 27A5002C */ addiu $a1, $sp, 0x2c /* A00A10 80240410 27A60030 */ addiu $a2, $sp, 0x30 @@ -154,7 +154,7 @@ glabel func_80240230_A00830 /* A00A74 80240474 0C0372DF */ jal func_800DCB7C /* A00A78 80240478 27A70034 */ addiu $a3, $sp, 0x34 /* A00A7C 8024047C 1040002A */ beqz $v0, .L80240528 -/* A00A80 80240480 00000000 */ nop +/* A00A80 80240480 00000000 */ nop /* A00A84 80240484 C600001C */ lwc1 $f0, 0x1c($s0) /* A00A88 80240488 C7A20038 */ lwc1 $f2, 0x38($sp) /* A00A8C 8024048C 46000005 */ abs.s $f0, $f0 @@ -162,7 +162,7 @@ glabel func_80240230_A00830 /* A00A94 80240494 46340000 */ add.d $f0, $f0, $f20 /* A00A98 80240498 460010A1 */ cvt.d.s $f2, $f2 /* A00A9C 8024049C 4620103E */ c.le.d $f2, $f0 -/* A00AA0 802404A0 00000000 */ nop +/* A00AA0 802404A0 00000000 */ nop /* A00AA4 802404A4 45000020 */ bc1f .L80240528 /* A00AA8 802404A8 240403E8 */ addiu $a0, $zero, 0x3e8 /* A00AAC 802404AC C7A00030 */ lwc1 $f0, 0x30($sp) @@ -193,7 +193,7 @@ glabel func_80240230_A00830 /* A00B10 80240510 5840000C */ blezl $v0, .L80240544 /* A00B14 80240514 AE600070 */ sw $zero, 0x70($s3) /* A00B18 80240518 1460000A */ bnez $v1, .L80240544 -/* A00B1C 8024051C 00000000 */ nop +/* A00B1C 8024051C 00000000 */ nop /* A00B20 80240520 08090151 */ j .L80240544 /* A00B24 80240524 AE600070 */ sw $zero, 0x70($s3) .L80240528: diff --git a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240628_A00C28.s b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240628_A00C28.s index 23ae9da1d3..8017e50b73 100644 --- a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240628_A00C28.s +++ b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240628_A00C28.s @@ -38,7 +38,7 @@ glabel func_80240628_A00C28 /* A00CAC 802406AC 2402000F */ addiu $v0, $zero, 0xf /* A00CB0 802406B0 AFA2001C */ sw $v0, 0x1c($sp) /* A00CB4 802406B4 44833000 */ mtc1 $v1, $f6 -/* A00CB8 802406B8 00000000 */ nop +/* A00CB8 802406B8 00000000 */ nop /* A00CBC 802406BC 468031A0 */ cvt.s.w $f6, $f6 /* A00CC0 802406C0 44073000 */ mfc1 $a3, $f6 /* A00CC4 802406C4 27A20028 */ addiu $v0, $sp, 0x28 @@ -65,13 +65,13 @@ glabel func_80240628_A00C28 .L80240718: /* A00D18 80240718 8602008C */ lh $v0, 0x8c($s0) /* A00D1C 8024071C 14400023 */ bnez $v0, .L802407AC -/* A00D20 80240720 00000000 */ nop +/* A00D20 80240720 00000000 */ nop /* A00D24 80240724 9602008E */ lhu $v0, 0x8e($s0) /* A00D28 80240728 2442FFFF */ addiu $v0, $v0, -1 /* A00D2C 8024072C A602008E */ sh $v0, 0x8e($s0) /* A00D30 80240730 00021400 */ sll $v0, $v0, 0x10 /* A00D34 80240734 1C40001D */ bgtz $v0, .L802407AC -/* A00D38 80240738 00000000 */ nop +/* A00D38 80240738 00000000 */ nop /* A00D3C 8024073C 8E820074 */ lw $v0, 0x74($s4) /* A00D40 80240740 2442FFFF */ addiu $v0, $v0, -1 /* A00D44 80240744 18400018 */ blez $v0, .L802407A8 diff --git a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_802407CC_A00DCC.s b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_802407CC_A00DCC.s index f6c8c9d38c..ca9fac346d 100644 --- a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_802407CC_A00DCC.s +++ b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_802407CC_A00DCC.s @@ -24,7 +24,7 @@ glabel func_802407CC_A00DCC /* A00E18 80240818 0C00A67F */ jal rand_int /* A00E1C 8024081C AE020000 */ sw $v0, ($s0) /* A00E20 80240820 44820000 */ mtc1 $v0, $f0 -/* A00E24 80240824 00000000 */ nop +/* A00E24 80240824 00000000 */ nop /* A00E28 80240828 46800021 */ cvt.d.w $f0, $f0 /* A00E2C 8024082C 3C014024 */ lui $at, 0x4024 /* A00E30 80240830 44811800 */ mtc1 $at, $f3 diff --git a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_802408AC_A00EAC.s b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_802408AC_A00EAC.s index 1a00de3a80..a30c78956d 100644 --- a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_802408AC_A00EAC.s +++ b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_802408AC_A00EAC.s @@ -25,7 +25,7 @@ glabel func_802408AC_A00EAC /* A00EFC 802408FC 44801800 */ mtc1 $zero, $f3 /* A00F00 80240900 46000021 */ cvt.d.s $f0, $f0 /* A00F04 80240904 4620103C */ c.lt.d $f2, $f0 -/* A00F08 80240908 00000000 */ nop +/* A00F08 80240908 00000000 */ nop /* A00F0C 8024090C 45000021 */ bc1f .L80240994 /* A00F10 80240910 27A50028 */ addiu $a1, $sp, 0x28 /* A00F14 80240914 C6600038 */ lwc1 $f0, 0x38($s3) @@ -40,20 +40,20 @@ glabel func_802408AC_A00EAC /* A00F38 80240938 E7A00014 */ swc1 $f0, 0x14($sp) /* A00F3C 8024093C 866200A8 */ lh $v0, 0xa8($s3) /* A00F40 80240940 44820000 */ mtc1 $v0, $f0 -/* A00F44 80240944 00000000 */ nop +/* A00F44 80240944 00000000 */ nop /* A00F48 80240948 46800020 */ cvt.s.w $f0, $f0 /* A00F4C 8024094C E7A00018 */ swc1 $f0, 0x18($sp) /* A00F50 80240950 866200A6 */ lh $v0, 0xa6($s3) /* A00F54 80240954 27A6002C */ addiu $a2, $sp, 0x2c /* A00F58 80240958 44820000 */ mtc1 $v0, $f0 -/* A00F5C 8024095C 00000000 */ nop +/* A00F5C 8024095C 00000000 */ nop /* A00F60 80240960 46800020 */ cvt.s.w $f0, $f0 /* A00F64 80240964 E7A0001C */ swc1 $f0, 0x1c($sp) /* A00F68 80240968 8E640080 */ lw $a0, 0x80($s3) /* A00F6C 8024096C 0C037711 */ jal func_800DDC44 /* A00F70 80240970 27A70030 */ addiu $a3, $sp, 0x30 /* A00F74 80240974 10400003 */ beqz $v0, .L80240984 -/* A00F78 80240978 00000000 */ nop +/* A00F78 80240978 00000000 */ nop /* A00F7C 8024097C 08090265 */ j .L80240994 /* A00F80 80240980 AE600018 */ sw $zero, 0x18($s3) .L80240984: @@ -67,7 +67,7 @@ glabel func_802408AC_A00EAC /* A00F9C 8024099C 44801800 */ mtc1 $zero, $f3 /* A00FA0 802409A0 46000021 */ cvt.d.s $f0, $f0 /* A00FA4 802409A4 4622003C */ c.lt.d $f0, $f2 -/* A00FA8 802409A8 00000000 */ nop +/* A00FA8 802409A8 00000000 */ nop /* A00FAC 802409AC 4500006C */ bc1f .L80240B60 /* A00FB0 802409B0 27B00028 */ addiu $s0, $sp, 0x28 /* A00FB4 802409B4 0200282D */ daddu $a1, $s0, $zero @@ -116,7 +116,7 @@ glabel func_802408AC_A00EAC /* A01060 80240A60 0C0372DF */ jal func_800DCB7C /* A01064 80240A64 0220382D */ daddu $a3, $s1, $zero /* A01068 80240A68 1040003D */ beqz $v0, .L80240B60 -/* A0106C 80240A6C 00000000 */ nop +/* A0106C 80240A6C 00000000 */ nop /* A01070 80240A70 C660001C */ lwc1 $f0, 0x1c($s3) /* A01074 80240A74 C7A20038 */ lwc1 $f2, 0x38($sp) /* A01078 80240A78 46000005 */ abs.s $f0, $f0 @@ -124,7 +124,7 @@ glabel func_802408AC_A00EAC /* A01080 80240A80 46340000 */ add.d $f0, $f0, $f20 /* A01084 80240A84 460010A1 */ cvt.d.s $f2, $f2 /* A01088 80240A88 4620103E */ c.le.d $f2, $f0 -/* A0108C 80240A8C 00000000 */ nop +/* A0108C 80240A8C 00000000 */ nop /* A01090 80240A90 45000033 */ bc1f .L80240B60 /* A01094 80240A94 2403F7FF */ addiu $v1, $zero, -0x801 /* A01098 80240A98 C7A0002C */ lwc1 $f0, 0x2c($sp) @@ -163,7 +163,7 @@ glabel func_802408AC_A00EAC /* A0111C 80240B1C 2402000F */ addiu $v0, $zero, 0xf /* A01120 80240B20 AFA2001C */ sw $v0, 0x1c($sp) /* A01124 80240B24 44834000 */ mtc1 $v1, $f8 -/* A01128 80240B28 00000000 */ nop +/* A01128 80240B28 00000000 */ nop /* A0112C 80240B2C 46804220 */ cvt.s.w $f8, $f8 /* A01130 80240B30 44074000 */ mfc1 $a3, $f8 /* A01134 80240B34 27A2003C */ addiu $v0, $sp, 0x3c diff --git a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s index b9cb4b3e99..1837507fa9 100644 --- a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s +++ b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s @@ -76,7 +76,7 @@ glabel func_80240BF0_A011F0 /* A01308 80240D08 8E4300B0 */ lw $v1, 0xb0($s2) /* A0130C 80240D0C 30620004 */ andi $v0, $v1, 4 /* A01310 80240D10 10400007 */ beqz $v0, .L80240D30 -/* A01314 80240D14 00000000 */ nop +/* A01314 80240D14 00000000 */ nop /* A01318 80240D18 824200B4 */ lb $v0, 0xb4($s2) /* A0131C 80240D1C 14400034 */ bnez $v0, .L80240DF0 /* A01320 80240D20 0000102D */ daddu $v0, $zero, $zero @@ -88,21 +88,24 @@ glabel func_80240BF0_A011F0 /* A01334 80240D34 2C62000F */ sltiu $v0, $v1, 0xf /* A01338 80240D38 1040002C */ beqz $v0, .L80240DEC /* A0133C 80240D3C 00031080 */ sll $v0, $v1, 2 -/* A01340 80240D40 3C018024 */ lui $at, %hi(D_802421D8) +/* A01340 80240D40 3C018024 */ lui $at, %hi(jtbl_802421D8_A027D8) /* A01344 80240D44 00220821 */ addu $at, $at, $v0 -/* A01348 80240D48 8C2221D8 */ lw $v0, %lo(D_802421D8)($at) +/* A01348 80240D48 8C2221D8 */ lw $v0, %lo(jtbl_802421D8_A027D8)($at) /* A0134C 80240D4C 00400008 */ jr $v0 -/* A01350 80240D50 00000000 */ nop +/* A01350 80240D50 00000000 */ nop +glabel L80240D54_A01354 /* A01354 80240D54 0260202D */ daddu $a0, $s3, $zero /* A01358 80240D58 0280282D */ daddu $a1, $s4, $zero /* A0135C 80240D5C 0C090000 */ jal func_80240000_A00600 /* A01360 80240D60 0200302D */ daddu $a2, $s0, $zero +glabel L80240D64_A01364 /* A01364 80240D64 0260202D */ daddu $a0, $s3, $zero /* A01368 80240D68 0280282D */ daddu $a1, $s4, $zero /* A0136C 80240D6C 0C09008C */ jal func_80240230_A00830 /* A01370 80240D70 0200302D */ daddu $a2, $s0, $zero /* A01374 80240D74 0809037C */ j .L80240DF0 /* A01378 80240D78 0000102D */ daddu $v0, $zero, $zero +glabel L80240D7C_A0137C /* A0137C 80240D7C 0260202D */ daddu $a0, $s3, $zero /* A01380 80240D80 0280282D */ daddu $a1, $s4, $zero /* A01384 80240D84 0C09015A */ jal nok_13_UnkNpcAIFunc1 @@ -111,27 +114,32 @@ glabel func_80240BF0_A011F0 /* A01390 80240D90 24020003 */ addiu $v0, $zero, 3 /* A01394 80240D94 14620016 */ bne $v1, $v0, .L80240DF0 /* A01398 80240D98 0000102D */ daddu $v0, $zero, $zero +glabel L80240D9C_A0139C /* A0139C 80240D9C 0260202D */ daddu $a0, $s3, $zero /* A013A0 80240DA0 0280282D */ daddu $a1, $s4, $zero /* A013A4 80240DA4 0C09018A */ jal func_80240628_A00C28 /* A013A8 80240DA8 0200302D */ daddu $a2, $s0, $zero /* A013AC 80240DAC 0809037C */ j .L80240DF0 /* A013B0 80240DB0 0000102D */ daddu $v0, $zero, $zero +glabel L80240DB4_A013B4 /* A013B4 80240DB4 0260202D */ daddu $a0, $s3, $zero /* A013B8 80240DB8 0280282D */ daddu $a1, $s4, $zero /* A013BC 80240DBC 0C0901F3 */ jal func_802407CC_A00DCC /* A013C0 80240DC0 0200302D */ daddu $a2, $s0, $zero +glabel L80240DC4_A013C4 /* A013C4 80240DC4 0260202D */ daddu $a0, $s3, $zero /* A013C8 80240DC8 0280282D */ daddu $a1, $s4, $zero /* A013CC 80240DCC 0C09022B */ jal func_802408AC_A00EAC /* A013D0 80240DD0 0200302D */ daddu $a2, $s0, $zero /* A013D4 80240DD4 0809037C */ j .L80240DF0 /* A013D8 80240DD8 0000102D */ daddu $v0, $zero, $zero +glabel L80240DDC_A013DC /* A013DC 80240DDC 0260202D */ daddu $a0, $s3, $zero /* A013E0 80240DE0 0280282D */ daddu $a1, $s4, $zero /* A013E4 80240DE4 0C0902EB */ jal nok_13_UnkDurationCheck /* A013E8 80240DE8 0200302D */ daddu $a2, $s0, $zero .L80240DEC: +glabel L80240DEC_A013EC /* A013EC 80240DEC 0000102D */ daddu $v0, $zero, $zero .L80240DF0: /* A013F0 80240DF0 8FBF0048 */ lw $ra, 0x48($sp) @@ -143,6 +151,6 @@ glabel func_80240BF0_A011F0 /* A01408 80240E08 8FB00030 */ lw $s0, 0x30($sp) /* A0140C 80240E0C 03E00008 */ jr $ra /* A01410 80240E10 27BD0050 */ addiu $sp, $sp, 0x50 -/* A01414 80240E14 00000000 */ nop -/* A01418 80240E18 00000000 */ nop -/* A0141C 80240E1C 00000000 */ nop +/* A01414 80240E14 00000000 */ nop +/* A01418 80240E18 00000000 */ nop +/* A0141C 80240E1C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_13/A01420/func_80240E20_A01420.s b/asm/nonmatchings/world/area_nok/nok_13/A01420/func_80240E20_A01420.s index 6287254dec..3fd8928da3 100644 --- a/asm/nonmatchings/world/area_nok/nok_13/A01420/func_80240E20_A01420.s +++ b/asm/nonmatchings/world/area_nok/nok_13/A01420/func_80240E20_A01420.s @@ -49,11 +49,12 @@ glabel func_80240E20_A01420 /* A014CC 80240ECC 2C620005 */ sltiu $v0, $v1, 5 /* A014D0 80240ED0 10400116 */ beqz $v0, .L8024132C /* A014D4 80240ED4 00031080 */ sll $v0, $v1, 2 -/* A014D8 80240ED8 3C018024 */ lui $at, %hi(D_80242220) +/* A014D8 80240ED8 3C018024 */ lui $at, %hi(jtbl_80242220_A02820) /* A014DC 80240EDC 00220821 */ addu $at, $at, $v0 -/* A014E0 80240EE0 8C222220 */ lw $v0, %lo(D_80242220)($at) +/* A014E0 80240EE0 8C222220 */ lw $v0, %lo(jtbl_80242220_A02820)($at) /* A014E4 80240EE4 00400008 */ jr $v0 -/* A014E8 80240EE8 00000000 */ nop +/* A014E8 80240EE8 00000000 */ nop +glabel L80240EEC_A014EC /* A014EC 80240EEC C60C0000 */ lwc1 $f12, ($s0) /* A014F0 80240EF0 46806320 */ cvt.s.w $f12, $f12 /* A014F4 80240EF4 C60E0008 */ lwc1 $f14, 8($s0) @@ -62,10 +63,10 @@ glabel func_80240E20_A01420 /* A01500 80240F00 8E02000C */ lw $v0, 0xc($s0) /* A01504 80240F04 4600010D */ trunc.w.s $f4, $f0 /* A01508 80240F08 44032000 */ mfc1 $v1, $f4 -/* A0150C 80240F0C 00000000 */ nop +/* A0150C 80240F0C 00000000 */ nop /* A01510 80240F10 0062102A */ slt $v0, $v1, $v0 /* A01514 80240F14 10400105 */ beqz $v0, .L8024132C -/* A01518 80240F18 00000000 */ nop +/* A01518 80240F18 00000000 */ nop /* A0151C 80240F1C C6600028 */ lwc1 $f0, 0x28($s3) /* A01520 80240F20 8E020020 */ lw $v0, 0x20($s0) /* A01524 80240F24 E6000024 */ swc1 $f0, 0x24($s0) @@ -74,6 +75,7 @@ glabel func_80240E20_A01420 /* A01530 80240F30 AE020020 */ sw $v0, 0x20($s0) /* A01534 80240F34 080904CB */ j .L8024132C /* A01538 80240F38 E6000028 */ swc1 $f0, 0x28($s0) +glabel L80240F3C_A0153C /* A0153C 80240F3C C60C0000 */ lwc1 $f12, ($s0) /* A01540 80240F40 46806320 */ cvt.s.w $f12, $f12 /* A01544 80240F44 C60E0008 */ lwc1 $f14, 8($s0) @@ -82,7 +84,7 @@ glabel func_80240E20_A01420 /* A01550 80240F50 8E02000C */ lw $v0, 0xc($s0) /* A01554 80240F54 4600010D */ trunc.w.s $f4, $f0 /* A01558 80240F58 44032000 */ mfc1 $v1, $f4 -/* A0155C 80240F5C 00000000 */ nop +/* A0155C 80240F5C 00000000 */ nop /* A01560 80240F60 0062102A */ slt $v0, $v1, $v0 /* A01564 80240F64 504000F1 */ beql $v0, $zero, .L8024132C /* A01568 80240F68 AE000020 */ sw $zero, 0x20($s0) @@ -105,22 +107,23 @@ glabel func_80240E20_A01420 /* A015AC 80240FAC 4600010D */ trunc.w.s $f4, $f0 /* A015B0 80240FB0 44022000 */ mfc1 $v0, $f4 /* A015B4 80240FB4 44916000 */ mtc1 $s1, $f12 -/* A015B8 80240FB8 00000000 */ nop +/* A015B8 80240FB8 00000000 */ nop /* A015BC 80240FBC 46806320 */ cvt.s.w $f12, $f12 /* A015C0 80240FC0 44827000 */ mtc1 $v0, $f14 -/* A015C4 80240FC4 00000000 */ nop +/* A015C4 80240FC4 00000000 */ nop /* A015C8 80240FC8 0C00A70A */ jal get_clamped_angle_diff /* A015CC 80240FCC 468073A0 */ cvt.s.w $f14, $f14 /* A015D0 80240FD0 4600010D */ trunc.w.s $f4, $f0 /* A015D4 80240FD4 44022000 */ mfc1 $v0, $f4 -/* A015D8 80240FD8 00000000 */ nop +/* A015D8 80240FD8 00000000 */ nop /* A015DC 80240FDC 44826000 */ mtc1 $v0, $f12 -/* A015E0 80240FE0 00000000 */ nop +/* A015E0 80240FE0 00000000 */ nop /* A015E4 80240FE4 0C00A69F */ jal signF /* A015E8 80240FE8 46806320 */ cvt.s.w $f12, $f12 /* A015EC 80240FEC 8E020020 */ lw $v0, 0x20($s0) /* A015F0 80240FF0 080904C4 */ j .L80241310 /* A015F4 80240FF4 E6000034 */ swc1 $f0, 0x34($s0) +glabel L80240FF8_A015F8 /* A015F8 80240FF8 C60C0000 */ lwc1 $f12, ($s0) /* A015FC 80240FFC 46806320 */ cvt.s.w $f12, $f12 /* A01600 80241000 C60E0008 */ lwc1 $f14, 8($s0) @@ -129,7 +132,7 @@ glabel func_80240E20_A01420 /* A0160C 8024100C 8E02000C */ lw $v0, 0xc($s0) /* A01610 80241010 4600010D */ trunc.w.s $f4, $f0 /* A01614 80241014 44032000 */ mfc1 $v1, $f4 -/* A01618 80241018 00000000 */ nop +/* A01618 80241018 00000000 */ nop /* A0161C 8024101C 0062102A */ slt $v0, $v1, $v0 /* A01620 80241020 504000C2 */ beql $v0, $zero, .L8024132C /* A01624 80241024 AE000020 */ sw $zero, 0x20($s0) @@ -152,22 +155,22 @@ glabel func_80240E20_A01420 /* A01668 80241068 4600010D */ trunc.w.s $f4, $f0 /* A0166C 8024106C 44022000 */ mfc1 $v0, $f4 /* A01670 80241070 44916000 */ mtc1 $s1, $f12 -/* A01674 80241074 00000000 */ nop +/* A01674 80241074 00000000 */ nop /* A01678 80241078 46806320 */ cvt.s.w $f12, $f12 /* A0167C 8024107C 44827000 */ mtc1 $v0, $f14 -/* A01680 80241080 00000000 */ nop +/* A01680 80241080 00000000 */ nop /* A01684 80241084 0C00A70A */ jal get_clamped_angle_diff /* A01688 80241088 468073A0 */ cvt.s.w $f14, $f14 /* A0168C 8024108C 4600010D */ trunc.w.s $f4, $f0 /* A01690 80241090 44022000 */ mfc1 $v0, $f4 -/* A01694 80241094 00000000 */ nop +/* A01694 80241094 00000000 */ nop /* A01698 80241098 44826000 */ mtc1 $v0, $f12 -/* A0169C 8024109C 00000000 */ nop +/* A0169C 8024109C 00000000 */ nop /* A016A0 802410A0 0C00A69F */ jal signF /* A016A4 802410A4 46806320 */ cvt.s.w $f12, $f12 /* A016A8 802410A8 C6020034 */ lwc1 $f2, 0x34($s0) /* A016AC 802410AC 46001032 */ c.eq.s $f2, $f0 -/* A016B0 802410B0 00000000 */ nop +/* A016B0 802410B0 00000000 */ nop /* A016B4 802410B4 4502009D */ bc1fl .L8024132C /* A016B8 802410B8 AE000020 */ sw $zero, 0x20($s0) /* A016BC 802410BC C60C0000 */ lwc1 $f12, ($s0) @@ -189,25 +192,25 @@ glabel func_80240E20_A01420 /* A016FC 802410FC 4600010D */ trunc.w.s $f4, $f0 /* A01700 80241100 44022000 */ mfc1 $v0, $f4 /* A01704 80241104 44916000 */ mtc1 $s1, $f12 -/* A01708 80241108 00000000 */ nop +/* A01708 80241108 00000000 */ nop /* A0170C 8024110C 46806320 */ cvt.s.w $f12, $f12 /* A01710 80241110 44827000 */ mtc1 $v0, $f14 -/* A01714 80241114 00000000 */ nop +/* A01714 80241114 00000000 */ nop /* A01718 80241118 0C00A70A */ jal get_clamped_angle_diff /* A0171C 8024111C 468073A0 */ cvt.s.w $f14, $f14 /* A01720 80241120 4600010D */ trunc.w.s $f4, $f0 /* A01724 80241124 44022000 */ mfc1 $v0, $f4 -/* A01728 80241128 00000000 */ nop +/* A01728 80241128 00000000 */ nop /* A0172C 8024112C 44820000 */ mtc1 $v0, $f0 -/* A01730 80241130 00000000 */ nop +/* A01730 80241130 00000000 */ nop /* A01734 80241134 46800020 */ cvt.s.w $f0, $f0 /* A01738 80241138 3C0142B4 */ lui $at, 0x42b4 /* A0173C 8024113C 44811000 */ mtc1 $at, $f2 /* A01740 80241140 46000505 */ abs.s $f20, $f0 /* A01744 80241144 4614103C */ c.lt.s $f2, $f20 -/* A01748 80241148 00000000 */ nop +/* A01748 80241148 00000000 */ nop /* A0174C 8024114C 45000077 */ bc1f .L8024132C -/* A01750 80241150 00000000 */ nop +/* A01750 80241150 00000000 */ nop /* A01754 80241154 8E020014 */ lw $v0, 0x14($s0) /* A01758 80241158 10400003 */ beqz $v0, .L80241168 /* A0175C 8024115C 0200202D */ daddu $a0, $s0, $zero @@ -223,6 +226,7 @@ glabel func_80240E20_A01420 /* A01780 80241180 4600010D */ trunc.w.s $f4, $f0 /* A01784 80241184 080904CB */ j .L8024132C /* A01788 80241188 E6040018 */ swc1 $f4, 0x18($s0) +glabel L8024118C_A0178C /* A0178C 8024118C C60C0000 */ lwc1 $f12, ($s0) /* A01790 80241190 46806320 */ cvt.s.w $f12, $f12 /* A01794 80241194 C60E0008 */ lwc1 $f14, 8($s0) @@ -231,10 +235,10 @@ glabel func_80240E20_A01420 /* A017A0 802411A0 8E020010 */ lw $v0, 0x10($s0) /* A017A4 802411A4 4600010D */ trunc.w.s $f4, $f0 /* A017A8 802411A8 44032000 */ mfc1 $v1, $f4 -/* A017AC 802411AC 00000000 */ nop +/* A017AC 802411AC 00000000 */ nop /* A017B0 802411B0 0062102A */ slt $v0, $v1, $v0 /* A017B4 802411B4 10400050 */ beqz $v0, .L802412F8 -/* A017B8 802411B8 00000000 */ nop +/* A017B8 802411B8 00000000 */ nop /* A017BC 802411BC C60C0000 */ lwc1 $f12, ($s0) /* A017C0 802411C0 46806320 */ cvt.s.w $f12, $f12 /* A017C4 802411C4 8E06002C */ lw $a2, 0x2c($s0) @@ -254,23 +258,23 @@ glabel func_80240E20_A01420 /* A017FC 802411FC 4600010D */ trunc.w.s $f4, $f0 /* A01800 80241200 44022000 */ mfc1 $v0, $f4 /* A01804 80241204 44916000 */ mtc1 $s1, $f12 -/* A01808 80241208 00000000 */ nop +/* A01808 80241208 00000000 */ nop /* A0180C 8024120C 46806320 */ cvt.s.w $f12, $f12 /* A01810 80241210 44827000 */ mtc1 $v0, $f14 -/* A01814 80241214 00000000 */ nop +/* A01814 80241214 00000000 */ nop /* A01818 80241218 0C00A70A */ jal get_clamped_angle_diff /* A0181C 8024121C 468073A0 */ cvt.s.w $f14, $f14 /* A01820 80241220 4600010D */ trunc.w.s $f4, $f0 /* A01824 80241224 44022000 */ mfc1 $v0, $f4 -/* A01828 80241228 00000000 */ nop +/* A01828 80241228 00000000 */ nop /* A0182C 8024122C 4482A000 */ mtc1 $v0, $f20 -/* A01830 80241230 00000000 */ nop +/* A01830 80241230 00000000 */ nop /* A01834 80241234 4680A520 */ cvt.s.w $f20, $f20 /* A01838 80241238 0C00A69F */ jal signF /* A0183C 8024123C 4600A306 */ mov.s $f12, $f20 /* A01840 80241240 C6020034 */ lwc1 $f2, 0x34($s0) /* A01844 80241244 46001032 */ c.eq.s $f2, $f0 -/* A01848 80241248 00000000 */ nop +/* A01848 80241248 00000000 */ nop /* A0184C 8024124C 4503000A */ bc1tl .L80241278 /* A01850 80241250 4600A005 */ abs.s $f0, $f20 /* A01854 80241254 8E020014 */ lw $v0, 0x14($s0) @@ -291,7 +295,7 @@ glabel func_80240E20_A01420 /* A01888 80241288 344260B7 */ ori $v0, $v0, 0x60b7 /* A0188C 8024128C 4600110D */ trunc.w.s $f4, $f2 /* A01890 80241290 44032000 */ mfc1 $v1, $f4 -/* A01894 80241294 00000000 */ nop +/* A01894 80241294 00000000 */ nop /* A01898 80241298 00620018 */ mult $v1, $v0 /* A0189C 8024129C 8E040038 */ lw $a0, 0x38($s0) /* A018A0 802412A0 AE030018 */ sw $v1, 0x18($s0) @@ -317,7 +321,7 @@ glabel func_80240E20_A01420 /* A018E8 802412E8 0040F809 */ jalr $v0 /* A018EC 802412EC 24050002 */ addiu $a1, $zero, 2 /* A018F0 802412F0 080904CB */ j .L8024132C -/* A018F4 802412F4 00000000 */ nop +/* A018F4 802412F4 00000000 */ nop .L802412F8: /* A018F8 802412F8 8E020014 */ lw $v0, 0x14($s0) /* A018FC 802412FC 10400003 */ beqz $v0, .L8024130C @@ -330,6 +334,7 @@ glabel func_80240E20_A01420 /* A01910 80241310 24420001 */ addiu $v0, $v0, 1 /* A01914 80241314 080904CB */ j .L8024132C /* A01918 80241318 AE020020 */ sw $v0, 0x20($s0) +glabel L8024131C_A0191C /* A0191C 8024131C AE000018 */ sw $zero, 0x18($s0) /* A01920 80241320 AE00001C */ sw $zero, 0x1c($s0) /* A01924 80241324 AE000038 */ sw $zero, 0x38($s0) diff --git a/asm/nonmatchings/world/area_nok/nok_13/A01420/func_802413CC_A019CC.s b/asm/nonmatchings/world/area_nok/nok_13/A01420/func_802413CC_A019CC.s index c3cf7992fa..13444e4c38 100644 --- a/asm/nonmatchings/world/area_nok/nok_13/A01420/func_802413CC_A019CC.s +++ b/asm/nonmatchings/world/area_nok/nok_13/A01420/func_802413CC_A019CC.s @@ -13,14 +13,14 @@ glabel func_802413CC_A019CC /* A019EC 802413EC 10A00009 */ beqz $a1, .L80241414 /* A019F0 802413F0 24050001 */ addiu $a1, $zero, 1 /* A019F4 802413F4 08090521 */ j .L80241484 -/* A019F8 802413F8 00000000 */ nop +/* A019F8 802413F8 00000000 */ nop .L802413FC: /* A019FC 802413FC 10400021 */ beqz $v0, .L80241484 /* A01A00 80241400 28A20003 */ slti $v0, $a1, 3 /* A01A04 80241404 1440001F */ bnez $v0, .L80241484 /* A01A08 80241408 24050001 */ addiu $a1, $zero, 1 /* A01A0C 8024140C 0809051B */ j .L8024146C -/* A01A10 80241410 00000000 */ nop +/* A01A10 80241410 00000000 */ nop .L80241414: /* A01A14 80241414 3C048024 */ lui $a0, %hi(func_80242134_88AD04) /* A01A18 80241418 24842134 */ addiu $a0, $a0, %lo(func_80242134_88AD04) @@ -44,7 +44,7 @@ glabel func_802413CC_A019CC /* A01A5C 8024145C 0C04C6A5 */ jal make_item_entity_nodelay /* A01A60 80241460 AFA00014 */ sw $zero, 0x14($sp) /* A01A64 80241464 08090521 */ j .L80241484 -/* A01A68 80241468 00000000 */ nop +/* A01A68 80241468 00000000 */ nop .L8024146C: /* A01A6C 8024146C 3C048024 */ lui $a0, %hi(func_80242134_88AD04) /* A01A70 80241470 24842134 */ addiu $a0, $a0, %lo(func_80242134_88AD04) diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02840/func_80240000_A02840.s b/asm/nonmatchings/world/area_nok/nok_14/A02840/func_80240000_A02840.s index 19158349fd..b9dbfe098f 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02840/func_80240000_A02840.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02840/func_80240000_A02840.s @@ -43,35 +43,35 @@ glabel func_80240000_A02840 /* A028D8 80240098 3C138011 */ lui $s3, %hi(gPlayerStatus) /* A028DC 8024009C 2673EFC8 */ addiu $s3, $s3, %lo(gPlayerStatus) /* A028E0 802400A0 44920000 */ mtc1 $s2, $f0 -/* A028E4 802400A4 00000000 */ nop +/* A028E4 802400A4 00000000 */ nop /* A028E8 802400A8 46800020 */ cvt.s.w $f0, $f0 /* A028EC 802400AC C6620028 */ lwc1 $f2, 0x28($s3) /* A028F0 802400B0 3C11800B */ lui $s1, %hi(gCurrentEncounter) /* A028F4 802400B4 26310F10 */ addiu $s1, $s1, %lo(gCurrentEncounter) /* A028F8 802400B8 4602003E */ c.le.s $f0, $f2 -/* A028FC 802400BC 00000000 */ nop +/* A028FC 802400BC 00000000 */ nop /* A02900 802400C0 45000017 */ bc1f .L80240120 -/* A02904 802400C4 00000000 */ nop +/* A02904 802400C4 00000000 */ nop /* A02908 802400C8 44960000 */ mtc1 $s6, $f0 -/* A0290C 802400CC 00000000 */ nop +/* A0290C 802400CC 00000000 */ nop /* A02910 802400D0 46800020 */ cvt.s.w $f0, $f0 /* A02914 802400D4 4600103E */ c.le.s $f2, $f0 -/* A02918 802400D8 00000000 */ nop +/* A02918 802400D8 00000000 */ nop /* A0291C 802400DC 45000010 */ bc1f .L80240120 -/* A02920 802400E0 00000000 */ nop +/* A02920 802400E0 00000000 */ nop /* A02924 802400E4 C6620030 */ lwc1 $f2, 0x30($s3) /* A02928 802400E8 44950000 */ mtc1 $s5, $f0 -/* A0292C 802400EC 00000000 */ nop +/* A0292C 802400EC 00000000 */ nop /* A02930 802400F0 46800020 */ cvt.s.w $f0, $f0 /* A02934 802400F4 4602003E */ c.le.s $f0, $f2 -/* A02938 802400F8 00000000 */ nop +/* A02938 802400F8 00000000 */ nop /* A0293C 802400FC 45000008 */ bc1f .L80240120 -/* A02940 80240100 00000000 */ nop +/* A02940 80240100 00000000 */ nop /* A02944 80240104 44940000 */ mtc1 $s4, $f0 -/* A02948 80240108 00000000 */ nop +/* A02948 80240108 00000000 */ nop /* A0294C 8024010C 46800020 */ cvt.s.w $f0, $f0 /* A02950 80240110 4600103E */ c.le.s $f2, $f0 -/* A02954 80240114 00000000 */ nop +/* A02954 80240114 00000000 */ nop /* A02958 80240118 45030001 */ bc1tl .L80240120 /* A0295C 8024011C 0040802D */ daddu $s0, $v0, $zero .L80240120: @@ -99,5 +99,5 @@ glabel func_80240000_A02840 /* A029AC 8024016C 24020002 */ addiu $v0, $zero, 2 /* A029B0 80240170 03E00008 */ jr $ra /* A029B4 80240174 27BD0030 */ addiu $sp, $sp, 0x30 -/* A029B8 80240178 00000000 */ nop -/* A029BC 8024017C 00000000 */ nop +/* A029B8 80240178 00000000 */ nop +/* A029BC 8024017C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_14/A029C0/func_8024019C_A029DC.s b/asm/nonmatchings/world/area_nok/nok_14/A029C0/func_8024019C_A029DC.s index 5baa47e5ef..64c6d5615f 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A029C0/func_8024019C_A029DC.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A029C0/func_8024019C_A029DC.s @@ -9,5 +9,5 @@ glabel func_8024019C_A029DC /* A029EC 802401AC A4620000 */ sh $v0, ($v1) /* A029F0 802401B0 03E00008 */ jr $ra /* A029F4 802401B4 24020002 */ addiu $v0, $zero, 2 -/* A029F8 802401B8 00000000 */ nop -/* A029FC 802401BC 00000000 */ nop +/* A029F8 802401B8 00000000 */ nop +/* A029FC 802401BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024023C_A02A7C.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024023C_A02A7C.s index 0160a1c713..bf91d27541 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024023C_A02A7C.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024023C_A02A7C.s @@ -21,11 +21,11 @@ glabel func_8024023C_A02A7C /* A02ABC 8024027C A602008E */ sh $v0, 0x8e($s0) /* A02AC0 80240280 00021400 */ sll $v0, $v0, 0x10 /* A02AC4 80240284 1C400033 */ bgtz $v0, .L80240354 -/* A02AC8 80240288 00000000 */ nop +/* A02AC8 80240288 00000000 */ nop .L8024028C: /* A02ACC 8024028C 8602008C */ lh $v0, 0x8c($s0) /* A02AD0 80240290 14400030 */ bnez $v0, .L80240354 -/* A02AD4 80240294 00000000 */ nop +/* A02AD4 80240294 00000000 */ nop /* A02AD8 80240298 8E2200CC */ lw $v0, 0xcc($s1) /* A02ADC 8024029C 8C420024 */ lw $v0, 0x24($v0) /* A02AE0 802402A0 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_8024023C_A02A7C /* A02AEC 802402AC 8E230088 */ lw $v1, 0x88($s1) /* A02AF0 802402B0 24020005 */ addiu $v0, $zero, 5 /* A02AF4 802402B4 10620005 */ beq $v1, $v0, .L802402CC -/* A02AF8 802402B8 00000000 */ nop +/* A02AF8 802402B8 00000000 */ nop /* A02AFC 802402BC 10600003 */ beqz $v1, .L802402CC /* A02B00 802402C0 24020001 */ addiu $v0, $zero, 1 /* A02B04 802402C4 14620006 */ bne $v1, $v0, .L802402E0 -/* A02B08 802402C8 00000000 */ nop +/* A02B08 802402C8 00000000 */ nop .L802402CC: /* A02B0C 802402CC 8E220084 */ lw $v0, 0x84($s1) /* A02B10 802402D0 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_8024023C_A02A7C /* A02B50 80240310 46220000 */ add.d $f0, $f0, $f2 /* A02B54 80240314 4620010D */ trunc.w.d $f4, $f0 /* A02B58 80240318 44022000 */ mfc1 $v0, $f4 -/* A02B5C 8024031C 00000000 */ nop +/* A02B5C 8024031C 00000000 */ nop /* A02B60 80240320 A602008E */ sh $v0, 0x8e($s0) /* A02B64 80240324 00021400 */ sll $v0, $v0, 0x10 /* A02B68 80240328 8E230078 */ lw $v1, 0x78($s1) /* A02B6C 8024032C 00021403 */ sra $v0, $v0, 0x10 /* A02B70 80240330 0043102A */ slt $v0, $v0, $v1 /* A02B74 80240334 10400003 */ beqz $v0, .L80240344 -/* A02B78 80240338 00000000 */ nop +/* A02B78 80240338 00000000 */ nop /* A02B7C 8024033C 9622007A */ lhu $v0, 0x7a($s1) /* A02B80 80240340 A602008E */ sh $v0, 0x8e($s0) .L80240344: diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s index e65952094a..a20554c9e2 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s @@ -279,15 +279,17 @@ glabel func_80240554_A02D94 /* A03180 80240940 2C620015 */ sltiu $v0, $v1, 0x15 /* A03184 80240944 10400009 */ beqz $v0, .L8024096C /* A03188 80240948 00031080 */ sll $v0, $v1, 2 -/* A0318C 8024094C 3C018024 */ lui $at, %hi(D_802445C8) +/* A0318C 8024094C 3C018024 */ lui $at, %hi(jtbl_802445C8_A06E08) /* A03190 80240950 00220821 */ addu $at, $at, $v0 -/* A03194 80240954 8C2245C8 */ lw $v0, %lo(D_802445C8)($at) +/* A03194 80240954 8C2245C8 */ lw $v0, %lo(jtbl_802445C8_A06E08)($at) /* A03198 80240958 00400008 */ jr $v0 /* A0319C 8024095C 00000000 */ nop +glabel L80240960_A031A0 /* A031A0 80240960 8E420028 */ lw $v0, 0x28($s2) /* A031A4 80240964 24420001 */ addiu $v0, $v0, 1 /* A031A8 80240968 AE420028 */ sw $v0, 0x28($s2) .L8024096C: +glabel L8024096C_A031AC /* A031AC 8024096C 0000102D */ daddu $v0, $zero, $zero .L80240970: /* A031B0 80240970 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240994_A031D4.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240994_A031D4.s index 6f2b5d880d..77f9aa1525 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240994_A031D4.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240994_A031D4.s @@ -47,7 +47,7 @@ glabel func_80240994_A031D4 /* A0327C 80240A3C 0C0123F5 */ jal is_point_within_region /* A03280 80240A40 8E070038 */ lw $a3, 0x38($s0) /* A03284 80240A44 1040000E */ beqz $v0, .L80240A80 -/* A03288 80240A48 00000000 */ nop +/* A03288 80240A48 00000000 */ nop /* A0328C 80240A4C 8E2200D0 */ lw $v0, 0xd0($s1) /* A03290 80240A50 C60C0038 */ lwc1 $f12, 0x38($s0) /* A03294 80240A54 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240994_A031D4 /* A032A8 80240A68 468031A0 */ cvt.s.w $f6, $f6 /* A032AC 80240A6C 44073000 */ mfc1 $a3, $f6 /* A032B0 80240A70 0C00A720 */ jal atan2 -/* A032B4 80240A74 00000000 */ nop +/* A032B4 80240A74 00000000 */ nop /* A032B8 80240A78 080902AC */ j .L80240AB0 /* A032BC 80240A7C E600000C */ swc1 $f0, 0xc($s0) .L80240A80: @@ -66,7 +66,7 @@ glabel func_80240994_A031D4 /* A032C4 80240A84 2404003C */ addiu $a0, $zero, 0x3c /* A032C8 80240A88 C60C000C */ lwc1 $f12, 0xc($s0) /* A032CC 80240A8C 44820000 */ mtc1 $v0, $f0 -/* A032D0 80240A90 00000000 */ nop +/* A032D0 80240A90 00000000 */ nop /* A032D4 80240A94 46800020 */ cvt.s.w $f0, $f0 /* A032D8 80240A98 46006300 */ add.s $f12, $f12, $f0 /* A032DC 80240A9C 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240994_A031D4 /* A03300 80240AC0 8E2200D0 */ lw $v0, 0xd0($s1) /* A03304 80240AC4 8C420014 */ lw $v0, 0x14($v0) /* A03308 80240AC8 04410004 */ bgez $v0, .L80240ADC -/* A0330C 80240ACC 00000000 */ nop +/* A0330C 80240ACC 00000000 */ nop /* A03310 80240AD0 C6400000 */ lwc1 $f0, ($s2) /* A03314 80240AD4 080902BF */ j .L80240AFC /* A03318 80240AD8 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240994_A031D4 /* A0331C 80240ADC 3C018024 */ lui $at, %hi(D_80244620) /* A03320 80240AE0 D4224620 */ ldc1 $f2, %lo(D_80244620)($at) /* A03324 80240AE4 44820000 */ mtc1 $v0, $f0 -/* A03328 80240AE8 00000000 */ nop +/* A03328 80240AE8 00000000 */ nop /* A0332C 80240AEC 46800021 */ cvt.d.w $f0, $f0 /* A03330 80240AF0 46220003 */ div.d $f0, $f0, $f2 /* A03334 80240AF4 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240994_A031D4 /* A03348 80240B08 44801000 */ mtc1 $zero, $f2 /* A0334C 80240B0C 46000021 */ cvt.d.s $f0, $f0 /* A03350 80240B10 46220002 */ mul.d $f0, $f0, $f2 -/* A03354 80240B14 00000000 */ nop +/* A03354 80240B14 00000000 */ nop /* A03358 80240B18 24020001 */ addiu $v0, $zero, 1 /* A0335C 80240B1C 4620018D */ trunc.w.d $f6, $f0 /* A03360 80240B20 E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240B44_A03384.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240B44_A03384.s index f8ce314f57..cd683f4eab 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240B44_A03384.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240B44_A03384.s @@ -34,7 +34,7 @@ glabel func_80240B44_A03384 /* A033F8 80240BB8 44803000 */ mtc1 $zero, $f6 /* A033FC 80240BBC 46000021 */ cvt.d.s $f0, $f0 /* A03400 80240BC0 46260002 */ mul.d $f0, $f0, $f6 -/* A03404 80240BC4 00000000 */ nop +/* A03404 80240BC4 00000000 */ nop /* A03408 80240BC8 24020001 */ addiu $v0, $zero, 1 /* A0340C 80240BCC 8E24006C */ lw $a0, 0x6c($s1) /* A03410 80240BD0 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80240B44_A03384 /* A0346C 80240C2C C600003C */ lwc1 $f0, 0x3c($s0) /* A03470 80240C30 4600C001 */ sub.s $f0, $f24, $f0 /* A03474 80240C34 4600B03C */ c.lt.s $f22, $f0 -/* A03478 80240C38 00000000 */ nop +/* A03478 80240C38 00000000 */ nop /* A0347C 80240C3C 4500001B */ bc1f .L80240CAC /* A03480 80240C40 34820010 */ ori $v0, $a0, 0x10 /* A03484 80240C44 0809032B */ j .L80240CAC @@ -87,9 +87,9 @@ glabel func_80240B44_A03384 /* A034C8 80240C88 C7A00034 */ lwc1 $f0, 0x34($sp) /* A034CC 80240C8C 4600D001 */ sub.s $f0, $f26, $f0 /* A034D0 80240C90 4600B03C */ c.lt.s $f22, $f0 -/* A034D4 80240C94 00000000 */ nop +/* A034D4 80240C94 00000000 */ nop /* A034D8 80240C98 45000004 */ bc1f .L80240CAC -/* A034DC 80240C9C 00000000 */ nop +/* A034DC 80240C9C 00000000 */ nop /* A034E0 80240CA0 8E22006C */ lw $v0, 0x6c($s1) /* A034E4 80240CA4 34420010 */ ori $v0, $v0, 0x10 /* A034E8 80240CA8 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80240B44_A03384 /* A034F0 80240CB0 24030011 */ addiu $v1, $zero, 0x11 /* A034F4 80240CB4 30420011 */ andi $v0, $v0, 0x11 /* A034F8 80240CB8 14430039 */ bne $v0, $v1, .L80240DA0 -/* A034FC 80240CBC 00000000 */ nop +/* A034FC 80240CBC 00000000 */ nop /* A03500 80240CC0 8E020000 */ lw $v0, ($s0) /* A03504 80240CC4 30420008 */ andi $v0, $v0, 8 /* A03508 80240CC8 1040000A */ beqz $v0, .L80240CF4 @@ -108,7 +108,7 @@ glabel func_80240B44_A03384 /* A03518 80240CD8 D4204628 */ ldc1 $f0, %lo(D_80244628)($at) /* A0351C 80240CDC 460010A1 */ cvt.d.s $f2, $f2 /* A03520 80240CE0 46201082 */ mul.d $f2, $f2, $f0 -/* A03524 80240CE4 00000000 */ nop +/* A03524 80240CE4 00000000 */ nop /* A03528 80240CE8 4600A021 */ cvt.d.s $f0, $f20 /* A0352C 80240CEC 08090356 */ j .L80240D58 /* A03530 80240CF0 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80240B44_A03384 /* A03580 80240D40 D4204630 */ ldc1 $f0, %lo(D_80244630)($at) /* A03584 80240D44 460010A1 */ cvt.d.s $f2, $f2 /* A03588 80240D48 46201082 */ mul.d $f2, $f2, $f0 -/* A0358C 80240D4C 00000000 */ nop +/* A0358C 80240D4C 00000000 */ nop /* A03590 80240D50 4600A021 */ cvt.d.s $f0, $f20 /* A03594 80240D54 46220000 */ add.d $f0, $f0, $f2 .L80240D58: @@ -149,7 +149,7 @@ glabel func_80240B44_A03384 /* A035B4 80240D74 46000005 */ abs.s $f0, $f0 /* A035B8 80240D78 46000021 */ cvt.d.s $f0, $f0 /* A035BC 80240D7C 4622003C */ c.lt.d $f0, $f2 -/* A035C0 80240D80 00000000 */ nop +/* A035C0 80240D80 00000000 */ nop /* A035C4 80240D84 45000036 */ bc1f .L80240E60 /* A035C8 80240D88 2403FFEF */ addiu $v1, $zero, -0x11 /* A035CC 80240D8C E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80240B44_A03384 .L80240DA0: /* A035E0 80240DA0 8E220070 */ lw $v0, 0x70($s1) /* A035E4 80240DA4 1840002E */ blez $v0, .L80240E60 -/* A035E8 80240DA8 00000000 */ nop +/* A035E8 80240DA8 00000000 */ nop /* A035EC 80240DAC C62C0074 */ lwc1 $f12, 0x74($s1) /* A035F0 80240DB0 0C00A8BB */ jal sin_deg /* A035F4 80240DB4 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80240B44_A03384 /* A0364C 80240E0C 27A70030 */ addiu $a3, $sp, 0x30 .L80240E10: /* A03650 80240E10 10400007 */ beqz $v0, .L80240E30 -/* A03654 80240E14 00000000 */ nop +/* A03654 80240E14 00000000 */ nop /* A03658 80240E18 4616A082 */ mul.s $f2, $f20, $f22 -/* A0365C 80240E1C 00000000 */ nop +/* A0365C 80240E1C 00000000 */ nop /* A03660 80240E20 C7A0002C */ lwc1 $f0, 0x2c($sp) /* A03664 80240E24 461A0000 */ add.s $f0, $f0, $f26 /* A03668 80240E28 0809038F */ j .L80240E3C /* A0366C 80240E2C 46020000 */ add.s $f0, $f0, $f2 .L80240E30: /* A03670 80240E30 4616A002 */ mul.s $f0, $f20, $f22 -/* A03674 80240E34 00000000 */ nop +/* A03674 80240E34 00000000 */ nop /* A03678 80240E38 4600C000 */ add.s $f0, $f24, $f0 .L80240E3C: /* A0367C 80240E3C E600003C */ swc1 $f0, 0x3c($s0) /* A03680 80240E40 8E220074 */ lw $v0, 0x74($s1) /* A03684 80240E44 2442000A */ addiu $v0, $v0, 0xa /* A03688 80240E48 44826000 */ mtc1 $v0, $f12 -/* A0368C 80240E4C 00000000 */ nop +/* A0368C 80240E4C 00000000 */ nop /* A03690 80240E50 0C00A6C9 */ jal clamp_angle /* A03694 80240E54 46806320 */ cvt.s.w $f12, $f12 /* A03698 80240E58 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80240B44_A03384 /* A036A8 80240E68 2442FFFF */ addiu $v0, $v0, -1 /* A036AC 80240E6C 8E430014 */ lw $v1, 0x14($s2) /* A036B0 80240E70 04600048 */ bltz $v1, .L80240F94 -/* A036B4 80240E74 00000000 */ nop +/* A036B4 80240E74 00000000 */ nop /* A036B8 80240E78 8E620074 */ lw $v0, 0x74($s3) /* A036BC 80240E7C 1C400042 */ bgtz $v0, .L80240F88 /* A036C0 80240E80 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80240B44_A03384 /* A036C8 80240E88 860200A8 */ lh $v0, 0xa8($s0) /* A036CC 80240E8C C602003C */ lwc1 $f2, 0x3c($s0) /* A036D0 80240E90 44820000 */ mtc1 $v0, $f0 -/* A036D4 80240E94 00000000 */ nop +/* A036D4 80240E94 00000000 */ nop /* A036D8 80240E98 46800020 */ cvt.s.w $f0, $f0 /* A036DC 80240E9C 46001080 */ add.s $f2, $f2, $f0 /* A036E0 80240EA0 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80240B44_A03384 /* A036FC 80240EBC C440002C */ lwc1 $f0, 0x2c($v0) /* A03700 80240EC0 46000021 */ cvt.d.s $f0, $f0 /* A03704 80240EC4 4622003C */ c.lt.d $f0, $f2 -/* A03708 80240EC8 00000000 */ nop +/* A03708 80240EC8 00000000 */ nop /* A0370C 80240ECC 4500002C */ bc1f .L80240F80 /* A03710 80240ED0 02A0202D */ daddu $a0, $s5, $zero /* A03714 80240ED4 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80240B44_A03384 /* A03750 80240F10 3C01C1A0 */ lui $at, 0xc1a0 /* A03754 80240F14 44812000 */ mtc1 $at, $f4 /* A03758 80240F18 44834000 */ mtc1 $v1, $f8 -/* A0375C 80240F1C 00000000 */ nop +/* A0375C 80240F1C 00000000 */ nop /* A03760 80240F20 46804220 */ cvt.s.w $f8, $f8 /* A03764 80240F24 44074000 */ mfc1 $a3, $f8 /* A03768 80240F28 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80240B44_A03384 /* A0381C 80240FDC 0C0123F5 */ jal is_point_within_region /* A03820 80240FE0 8E070038 */ lw $a3, 0x38($s0) /* A03824 80240FE4 1040001A */ beqz $v0, .L80241050 -/* A03828 80240FE8 00000000 */ nop +/* A03828 80240FE8 00000000 */ nop /* A0382C 80240FEC 8E060038 */ lw $a2, 0x38($s0) /* A03830 80240FF0 8E2200D0 */ lw $v0, 0xd0($s1) /* A03834 80240FF4 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80240B44_A03384 /* A03848 80241008 468073A0 */ cvt.s.w $f14, $f14 /* A0384C 8024100C C6020018 */ lwc1 $f2, 0x18($s0) /* A03850 80241010 4600103C */ c.lt.s $f2, $f0 -/* A03854 80241014 00000000 */ nop +/* A03854 80241014 00000000 */ nop /* A03858 80241018 4500000D */ bc1f .L80241050 /* A0385C 8024101C E7A00034 */ swc1 $f0, 0x34($sp) /* A03860 80241020 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80240B44_A03384 /* A0389C 8024105C 00621825 */ or $v1, $v1, $v0 /* A038A0 80241060 00741825 */ or $v1, $v1, $s4 /* A038A4 80241064 10600008 */ beqz $v1, .L80241088 -/* A038A8 80241068 00000000 */ nop +/* A038A8 80241068 00000000 */ nop /* A038AC 8024106C 8602008C */ lh $v0, 0x8c($s0) /* A038B0 80241070 14400031 */ bnez $v0, .L80241138 -/* A038B4 80241074 00000000 */ nop +/* A038B4 80241074 00000000 */ nop /* A038B8 80241078 8E050018 */ lw $a1, 0x18($s0) /* A038BC 8024107C 8E06000C */ lw $a2, 0xc($s0) /* A038C0 80241080 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_80240B44_A03384 /* A038D4 80241094 44801000 */ mtc1 $zero, $f2 /* A038D8 80241098 46000021 */ cvt.d.s $f0, $f0 /* A038DC 8024109C 46220002 */ mul.d $f0, $f0, $f2 -/* A038E0 802410A0 00000000 */ nop +/* A038E0 802410A0 00000000 */ nop /* A038E4 802410A4 4620020D */ trunc.w.d $f8, $f0 /* A038E8 802410A8 E628007C */ swc1 $f8, 0x7c($s1) /* A038EC 802410AC 8E420004 */ lw $v0, 4($s2) /* A038F0 802410B0 18400021 */ blez $v0, .L80241138 -/* A038F4 802410B4 00000000 */ nop +/* A038F4 802410B4 00000000 */ nop /* A038F8 802410B8 8602008E */ lh $v0, 0x8e($s0) /* A038FC 802410BC 9603008E */ lhu $v1, 0x8e($s0) /* A03900 802410C0 18400005 */ blez $v0, .L802410D8 @@ -375,7 +375,7 @@ glabel func_80240B44_A03384 /* A03908 802410C8 A602008E */ sh $v0, 0x8e($s0) /* A0390C 802410CC 00021400 */ sll $v0, $v0, 0x10 /* A03910 802410D0 1C400019 */ bgtz $v0, .L80241138 -/* A03914 802410D4 00000000 */ nop +/* A03914 802410D4 00000000 */ nop .L802410D8: /* A03918 802410D8 240403E8 */ addiu $a0, $zero, 0x3e8 /* A0391C 802410DC 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80240B44_A03384 /* A03964 80241124 18400003 */ blez $v0, .L80241134 /* A03968 80241128 28620003 */ slti $v0, $v1, 3 /* A0396C 8024112C 10400002 */ beqz $v0, .L80241138 -/* A03970 80241130 00000000 */ nop +/* A03970 80241130 00000000 */ nop .L80241134: /* A03974 80241134 AE600070 */ sw $zero, 0x70($s3) .L80241138: diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024122C_A03A6C.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024122C_A03A6C.s index c4985697c8..ede077c629 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024122C_A03A6C.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024122C_A03A6C.s @@ -42,11 +42,11 @@ glabel func_8024122C_A03A6C .L802412C0: /* A03B00 802412C0 8E220070 */ lw $v0, 0x70($s1) /* A03B04 802412C4 18400034 */ blez $v0, .L80241398 -/* A03B08 802412C8 00000000 */ nop +/* A03B08 802412C8 00000000 */ nop /* A03B0C 802412CC C62C0074 */ lwc1 $f12, 0x74($s1) /* A03B10 802412D0 46806320 */ cvt.s.w $f12, $f12 /* A03B14 802412D4 44820000 */ mtc1 $v0, $f0 -/* A03B18 802412D8 00000000 */ nop +/* A03B18 802412D8 00000000 */ nop /* A03B1C 802412DC 46800020 */ cvt.s.w $f0, $f0 /* A03B20 802412E0 46000021 */ cvt.d.s $f0, $f0 /* A03B24 802412E4 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_8024122C_A03A6C /* A03B84 80241344 27A70030 */ addiu $a3, $sp, 0x30 .L80241348: /* A03B88 80241348 10400007 */ beqz $v0, .L80241368 -/* A03B8C 8024134C 00000000 */ nop +/* A03B8C 8024134C 00000000 */ nop /* A03B90 80241350 4616A082 */ mul.s $f2, $f20, $f22 -/* A03B94 80241354 00000000 */ nop +/* A03B94 80241354 00000000 */ nop /* A03B98 80241358 C7A0002C */ lwc1 $f0, 0x2c($sp) /* A03B9C 8024135C 46180000 */ add.s $f0, $f0, $f24 /* A03BA0 80241360 080904DD */ j .L80241374 /* A03BA4 80241364 46020000 */ add.s $f0, $f0, $f2 .L80241368: /* A03BA8 80241368 4616A002 */ mul.s $f0, $f20, $f22 -/* A03BAC 8024136C 00000000 */ nop +/* A03BAC 8024136C 00000000 */ nop /* A03BB0 80241370 4600D000 */ add.s $f0, $f26, $f0 .L80241374: /* A03BB4 80241374 E600003C */ swc1 $f0, 0x3c($s0) /* A03BB8 80241378 8E220074 */ lw $v0, 0x74($s1) /* A03BBC 8024137C 2442000A */ addiu $v0, $v0, 0xa /* A03BC0 80241380 44826000 */ mtc1 $v0, $f12 -/* A03BC4 80241384 00000000 */ nop +/* A03BC4 80241384 00000000 */ nop /* A03BC8 80241388 0C00A6C9 */ jal clamp_angle /* A03BCC 8024138C 46806320 */ cvt.s.w $f12, $f12 /* A03BD0 80241390 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_8024122C_A03A6C /* A03BE4 802413A4 860200A8 */ lh $v0, 0xa8($s0) /* A03BE8 802413A8 C600003C */ lwc1 $f0, 0x3c($s0) /* A03BEC 802413AC 44821000 */ mtc1 $v0, $f2 -/* A03BF0 802413B0 00000000 */ nop +/* A03BF0 802413B0 00000000 */ nop /* A03BF4 802413B4 468010A0 */ cvt.s.w $f2, $f2 /* A03BF8 802413B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A03BFC 802413BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_8024122C_A03A6C /* A03C18 802413D8 46240000 */ add.d $f0, $f0, $f4 /* A03C1C 802413DC 460010A1 */ cvt.d.s $f2, $f2 /* A03C20 802413E0 4620103C */ c.lt.d $f2, $f0 -/* A03C24 802413E4 00000000 */ nop +/* A03C24 802413E4 00000000 */ nop /* A03C28 802413E8 4500002E */ bc1f .L802414A4 /* A03C2C 802413EC 0280202D */ daddu $a0, $s4, $zero /* A03C30 802413F0 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_8024122C_A03A6C /* A03C70 80241430 3C01C1A0 */ lui $at, 0xc1a0 /* A03C74 80241434 44812000 */ mtc1 $at, $f4 /* A03C78 80241438 44834000 */ mtc1 $v1, $f8 -/* A03C7C 8024143C 00000000 */ nop +/* A03C7C 8024143C 00000000 */ nop /* A03C80 80241440 46804220 */ cvt.s.w $f8, $f8 /* A03C84 80241444 44074000 */ mfc1 $a3, $f8 /* A03C88 80241448 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_8024122C_A03A6C .L802414A4: /* A03CE4 802414A4 8602008C */ lh $v0, 0x8c($s0) /* A03CE8 802414A8 14400025 */ bnez $v0, .L80241540 -/* A03CEC 802414AC 00000000 */ nop +/* A03CEC 802414AC 00000000 */ nop /* A03CF0 802414B0 8602008E */ lh $v0, 0x8e($s0) /* A03CF4 802414B4 1C400022 */ bgtz $v0, .L80241540 -/* A03CF8 802414B8 00000000 */ nop +/* A03CF8 802414B8 00000000 */ nop /* A03CFC 802414BC 8E620074 */ lw $v0, 0x74($s3) /* A03D00 802414C0 2442FFFF */ addiu $v0, $v0, -1 /* A03D04 802414C4 1840001D */ blez $v0, .L8024153C @@ -183,7 +183,7 @@ glabel func_8024122C_A03A6C /* A03D10 802414D0 9442002A */ lhu $v0, 0x2a($v0) /* A03D14 802414D4 30420010 */ andi $v0, $v0, 0x10 /* A03D18 802414D8 14400007 */ bnez $v0, .L802414F8 -/* A03D1C 802414DC 00000000 */ nop +/* A03D1C 802414DC 00000000 */ nop /* A03D20 802414E0 C600000C */ lwc1 $f0, 0xc($s0) /* A03D24 802414E4 3C014334 */ lui $at, 0x4334 /* A03D28 802414E8 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241654_A03E94.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241654_A03E94.s index 194fb3d21e..52230a9a4c 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241654_A03E94.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241654_A03E94.s @@ -60,18 +60,18 @@ glabel func_80241654_A03E94 /* A03F6C 8024172C C6200038 */ lwc1 $f0, 0x38($s1) /* A03F70 80241730 4600018D */ trunc.w.s $f6, $f0 /* A03F74 80241734 44023000 */ mfc1 $v0, $f6 -/* A03F78 80241738 00000000 */ nop +/* A03F78 80241738 00000000 */ nop /* A03F7C 8024173C A6420010 */ sh $v0, 0x10($s2) /* A03F80 80241740 C620003C */ lwc1 $f0, 0x3c($s1) /* A03F84 80241744 4600018D */ trunc.w.s $f6, $f0 /* A03F88 80241748 44023000 */ mfc1 $v0, $f6 -/* A03F8C 8024174C 00000000 */ nop +/* A03F8C 8024174C 00000000 */ nop /* A03F90 80241750 A6420012 */ sh $v0, 0x12($s2) /* A03F94 80241754 C6200040 */ lwc1 $f0, 0x40($s1) /* A03F98 80241758 A2430007 */ sb $v1, 7($s2) /* A03F9C 8024175C 4600018D */ trunc.w.s $f6, $f0 /* A03FA0 80241760 44023000 */ mfc1 $v0, $f6 -/* A03FA4 80241764 00000000 */ nop +/* A03FA4 80241764 00000000 */ nop /* A03FA8 80241768 A6420014 */ sh $v0, 0x14($s2) .L8024176C: /* A03FAC 8024176C 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802417EC_A0402C.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802417EC_A0402C.s index 5f1e30524c..ca973f366f 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802417EC_A0402C.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802417EC_A0402C.s @@ -42,9 +42,9 @@ glabel func_802417EC_A0402C /* A040C0 80241880 44801800 */ mtc1 $zero, $f3 /* A040C4 80241884 46002021 */ cvt.d.s $f0, $f4 /* A040C8 80241888 4620103E */ c.le.d $f2, $f0 -/* A040CC 8024188C 00000000 */ nop +/* A040CC 8024188C 00000000 */ nop /* A040D0 80241890 45000030 */ bc1f .L80241954 -/* A040D4 80241894 00000000 */ nop +/* A040D4 80241894 00000000 */ nop /* A040D8 80241898 C600003C */ lwc1 $f0, 0x3c($s0) /* A040DC 8024189C 46040000 */ add.s $f0, $f0, $f4 /* A040E0 802418A0 E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_802417EC_A0402C /* A04140 80241900 27A70020 */ addiu $a3, $sp, 0x20 .L80241904: /* A04144 80241904 1040000B */ beqz $v0, .L80241934 -/* A04148 80241908 00000000 */ nop +/* A04148 80241908 00000000 */ nop /* A0414C 8024190C C7A0001C */ lwc1 $f0, 0x1c($sp) /* A04150 80241910 46140080 */ add.s $f2, $f0, $f20 /* A04154 80241914 C600003C */ lwc1 $f0, 0x3c($s0) /* A04158 80241918 4600103E */ c.le.s $f2, $f0 -/* A0415C 8024191C 00000000 */ nop +/* A0415C 8024191C 00000000 */ nop /* A04160 80241920 4500008D */ bc1f .L80241B58 -/* A04164 80241924 00000000 */ nop +/* A04164 80241924 00000000 */ nop /* A04168 80241928 E602003C */ swc1 $f2, 0x3c($s0) /* A0416C 8024192C 080906D6 */ j .L80241B58 /* A04170 80241930 AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_802417EC_A0402C /* A04174 80241934 C602003C */ lwc1 $f2, 0x3c($s0) /* A04178 80241938 C6000064 */ lwc1 $f0, 0x64($s0) /* A0417C 8024193C 4602003E */ c.le.s $f0, $f2 -/* A04180 80241940 00000000 */ nop +/* A04180 80241940 00000000 */ nop /* A04184 80241944 45030084 */ bc1tl .L80241B58 /* A04188 80241948 AE400070 */ sw $zero, 0x70($s2) /* A0418C 8024194C 080906D6 */ j .L80241B58 -/* A04190 80241950 00000000 */ nop +/* A04190 80241950 00000000 */ nop .L80241954: /* A04194 80241954 4622003C */ c.lt.d $f0, $f2 -/* A04198 80241958 00000000 */ nop +/* A04198 80241958 00000000 */ nop /* A0419C 8024195C 4500007E */ bc1f .L80241B58 -/* A041A0 80241960 00000000 */ nop +/* A041A0 80241960 00000000 */ nop /* A041A4 80241964 9602008E */ lhu $v0, 0x8e($s0) /* A041A8 80241968 24420001 */ addiu $v0, $v0, 1 /* A041AC 8024196C A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_802417EC_A0402C /* A041B8 80241978 00021403 */ sra $v0, $v0, 0x10 /* A041BC 8024197C 0043102A */ slt $v0, $v0, $v1 /* A041C0 80241980 14400026 */ bnez $v0, .L80241A1C -/* A041C4 80241984 00000000 */ nop +/* A041C4 80241984 00000000 */ nop /* A041C8 80241988 C60C0038 */ lwc1 $f12, 0x38($s0) /* A041CC 8024198C C60E0040 */ lwc1 $f14, 0x40($s0) /* A041D0 80241990 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_802417EC_A0402C /* A041FC 802419BC 8E62001C */ lw $v0, 0x1c($s3) /* A04200 802419C0 46001005 */ abs.s $f0, $f2 /* A04204 802419C4 44822000 */ mtc1 $v0, $f4 -/* A04208 802419C8 00000000 */ nop +/* A04208 802419C8 00000000 */ nop /* A0420C 802419CC 46802120 */ cvt.s.w $f4, $f4 /* A04210 802419D0 4600203C */ c.lt.s $f4, $f0 -/* A04214 802419D4 00000000 */ nop +/* A04214 802419D4 00000000 */ nop /* A04218 802419D8 4500000D */ bc1f .L80241A10 -/* A0421C 802419DC 00000000 */ nop +/* A0421C 802419DC 00000000 */ nop /* A04220 802419E0 44800000 */ mtc1 $zero, $f0 /* A04224 802419E4 C614000C */ lwc1 $f20, 0xc($s0) /* A04228 802419E8 4600103C */ c.lt.s $f2, $f0 -/* A0422C 802419EC 00000000 */ nop +/* A0422C 802419EC 00000000 */ nop /* A04230 802419F0 45000006 */ bc1f .L80241A0C /* A04234 802419F4 00021023 */ negu $v0, $v0 /* A04238 802419F8 44820000 */ mtc1 $v0, $f0 -/* A0423C 802419FC 00000000 */ nop +/* A0423C 802419FC 00000000 */ nop /* A04240 80241A00 46800020 */ cvt.s.w $f0, $f0 /* A04244 80241A04 08090684 */ j .L80241A10 /* A04248 80241A08 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_802417EC_A0402C /* A04270 80241A30 C600001C */ lwc1 $f0, 0x1c($s0) /* A04274 80241A34 46001080 */ add.s $f2, $f2, $f0 /* A04278 80241A38 4616103C */ c.lt.s $f2, $f22 -/* A0427C 80241A3C 00000000 */ nop +/* A0427C 80241A3C 00000000 */ nop /* A04280 80241A40 45020045 */ bc1fl .L80241B58 /* A04284 80241A44 E602003C */ swc1 $f2, 0x3c($s0) /* A04288 80241A48 080906D5 */ j .L80241B54 @@ -169,7 +169,7 @@ glabel func_802417EC_A0402C /* A042A0 80241A60 C600001C */ lwc1 $f0, 0x1c($s0) /* A042A4 80241A64 C604003C */ lwc1 $f4, 0x3c($s0) /* A042A8 80241A68 44821000 */ mtc1 $v0, $f2 -/* A042AC 80241A6C 00000000 */ nop +/* A042AC 80241A6C 00000000 */ nop /* A042B0 80241A70 468010A0 */ cvt.s.w $f2, $f2 /* A042B4 80241A74 46000005 */ abs.s $f0, $f0 /* A042B8 80241A78 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_802417EC_A0402C /* A042F4 80241AB4 0C0372DF */ jal func_800DCB7C /* A042F8 80241AB8 27A70020 */ addiu $a3, $sp, 0x20 /* A042FC 80241ABC 10400015 */ beqz $v0, .L80241B14 -/* A04300 80241AC0 00000000 */ nop +/* A04300 80241AC0 00000000 */ nop /* A04304 80241AC4 860200A8 */ lh $v0, 0xa8($s0) /* A04308 80241AC8 C604001C */ lwc1 $f4, 0x1c($s0) /* A0430C 80241ACC 44820000 */ mtc1 $v0, $f0 -/* A04310 80241AD0 00000000 */ nop +/* A04310 80241AD0 00000000 */ nop /* A04314 80241AD4 46800020 */ cvt.s.w $f0, $f0 /* A04318 80241AD8 46002085 */ abs.s $f2, $f4 /* A0431C 80241ADC 46020000 */ add.s $f0, $f0, $f2 /* A04320 80241AE0 C7A20024 */ lwc1 $f2, 0x24($sp) /* A04324 80241AE4 4600103E */ c.le.s $f2, $f0 -/* A04328 80241AE8 00000000 */ nop +/* A04328 80241AE8 00000000 */ nop /* A0432C 80241AEC 45000005 */ bc1f .L80241B04 -/* A04330 80241AF0 00000000 */ nop +/* A04330 80241AF0 00000000 */ nop /* A04334 80241AF4 C7A0001C */ lwc1 $f0, 0x1c($sp) /* A04338 80241AF8 AE00001C */ sw $zero, 0x1c($s0) /* A0433C 80241AFC 080906D6 */ j .L80241B58 @@ -217,13 +217,13 @@ glabel func_802417EC_A0402C /* A04358 80241B18 860200A8 */ lh $v0, 0xa8($s0) /* A0435C 80241B1C 46163081 */ sub.s $f2, $f6, $f22 /* A04360 80241B20 44820000 */ mtc1 $v0, $f0 -/* A04364 80241B24 00000000 */ nop +/* A04364 80241B24 00000000 */ nop /* A04368 80241B28 46800020 */ cvt.s.w $f0, $f0 /* A0436C 80241B2C 46001080 */ add.s $f2, $f2, $f0 /* A04370 80241B30 C604001C */ lwc1 $f4, 0x1c($s0) /* A04374 80241B34 46002005 */ abs.s $f0, $f4 /* A04378 80241B38 4602003C */ c.lt.s $f0, $f2 -/* A0437C 80241B3C 00000000 */ nop +/* A0437C 80241B3C 00000000 */ nop /* A04380 80241B40 45020005 */ bc1fl .L80241B58 /* A04384 80241B44 AE00001C */ sw $zero, 0x1c($s0) /* A04388 80241B48 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241B7C_A043BC.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241B7C_A043BC.s index 4c7f2b1012..bd3e725e91 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241B7C_A043BC.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241B7C_A043BC.s @@ -49,15 +49,15 @@ glabel func_80241B7C_A043BC /* A04464 80241C24 44802000 */ mtc1 $zero, $f4 /* A04468 80241C28 460010A1 */ cvt.d.s $f2, $f2 /* A0446C 80241C2C 46241082 */ mul.d $f2, $f2, $f4 -/* A04470 80241C30 00000000 */ nop +/* A04470 80241C30 00000000 */ nop /* A04474 80241C34 C7A0001C */ lwc1 $f0, 0x1c($sp) /* A04478 80241C38 46000021 */ cvt.d.s $f0, $f0 /* A0447C 80241C3C 46240002 */ mul.d $f0, $f0, $f4 -/* A04480 80241C40 00000000 */ nop +/* A04480 80241C40 00000000 */ nop /* A04484 80241C44 3C013FE0 */ lui $at, 0x3fe0 /* A04488 80241C48 44812800 */ mtc1 $at, $f5 /* A0448C 80241C4C 44802000 */ mtc1 $zero, $f4 -/* A04490 80241C50 00000000 */ nop +/* A04490 80241C50 00000000 */ nop /* A04494 80241C54 46241080 */ add.d $f2, $f2, $f4 /* A04498 80241C58 AE000074 */ sw $zero, 0x74($s0) /* A0449C 80241C5C 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s index 48d7de839b..402435a5bb 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s @@ -54,7 +54,7 @@ glabel func_80241CA0_A044E0 /* A045A0 80241D60 8E4300B0 */ lw $v1, 0xb0($s2) /* A045A4 80241D64 30620004 */ andi $v0, $v1, 4 /* A045A8 80241D68 10400007 */ beqz $v0, .L80241D88 -/* A045AC 80241D6C 00000000 */ nop +/* A045AC 80241D6C 00000000 */ nop /* A045B0 80241D70 824200B4 */ lb $v0, 0xb4($s2) /* A045B4 80241D74 1440003C */ bnez $v0, .L80241E68 /* A045B8 80241D78 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_80241CA0_A044E0 /* A045CC 80241D8C 2C62000F */ sltiu $v0, $v1, 0xf /* A045D0 80241D90 10400034 */ beqz $v0, .L80241E64 /* A045D4 80241D94 00031080 */ sll $v0, $v1, 2 -/* A045D8 80241D98 3C018024 */ lui $at, %hi(D_80244638) +/* A045D8 80241D98 3C018024 */ lui $at, %hi(jtbl_80244638_A06E78) /* A045DC 80241D9C 00220821 */ addu $at, $at, $v0 -/* A045E0 80241DA0 8C224638 */ lw $v0, %lo(D_80244638)($at) +/* A045E0 80241DA0 8C224638 */ lw $v0, %lo(jtbl_80244638_A06E78)($at) /* A045E4 80241DA4 00400008 */ jr $v0 -/* A045E8 80241DA8 00000000 */ nop +/* A045E8 80241DA8 00000000 */ nop +glabel L80241DAC_A045EC /* A045EC 80241DAC 0280202D */ daddu $a0, $s4, $zero /* A045F0 80241DB0 0200282D */ daddu $a1, $s0, $zero /* A045F4 80241DB4 0C090265 */ jal func_80240994_A031D4 /* A045F8 80241DB8 0260302D */ daddu $a2, $s3, $zero +glabel L80241DBC_A045FC /* A045FC 80241DBC 0280202D */ daddu $a0, $s4, $zero /* A04600 80241DC0 0200282D */ daddu $a1, $s0, $zero /* A04604 80241DC4 0C0902D1 */ jal func_80240B44_A03384 /* A04608 80241DC8 0260302D */ daddu $a2, $s3, $zero /* A0460C 80241DCC 0809079A */ j .L80241E68 /* A04610 80241DD0 0000102D */ daddu $v0, $zero, $zero +glabel L80241DD4_A04614 /* A04614 80241DD4 0280202D */ daddu $a0, $s4, $zero /* A04618 80241DD8 0200282D */ daddu $a1, $s0, $zero /* A0461C 80241DDC 0C09045B */ jal nok_14_UnkNpcAIFunc1 /* A04620 80241DE0 0260302D */ daddu $a2, $s3, $zero +glabel L80241DE4_A04624 /* A04624 80241DE4 0280202D */ daddu $a0, $s4, $zero /* A04628 80241DE8 0200282D */ daddu $a1, $s0, $zero /* A0462C 80241DEC 0C09048B */ jal func_8024122C_A03A6C /* A04630 80241DF0 0260302D */ daddu $a2, $s3, $zero /* A04634 80241DF4 0809079A */ j .L80241E68 /* A04638 80241DF8 0000102D */ daddu $v0, $zero, $zero +glabel L80241DFC_A0463C /* A0463C 80241DFC 0280202D */ daddu $a0, $s4, $zero /* A04640 80241E00 0200282D */ daddu $a1, $s0, $zero /* A04644 80241E04 0C09055C */ jal nok_14_UnkNpcAIFunc2 /* A04648 80241E08 0260302D */ daddu $a2, $s3, $zero +glabel L80241E0C_A0464C /* A0464C 80241E0C 0280202D */ daddu $a0, $s4, $zero /* A04650 80241E10 0200282D */ daddu $a1, $s0, $zero /* A04654 80241E14 0C09057A */ jal func_802415E8_A03E28 /* A04658 80241E18 0260302D */ daddu $a2, $s3, $zero /* A0465C 80241E1C 0809079A */ j .L80241E68 /* A04660 80241E20 0000102D */ daddu $v0, $zero, $zero +glabel L80241E24_A04664 /* A04664 80241E24 0280202D */ daddu $a0, $s4, $zero /* A04668 80241E28 0200282D */ daddu $a1, $s0, $zero /* A0466C 80241E2C 0C090595 */ jal func_80241654_A03E94 /* A04670 80241E30 0260302D */ daddu $a2, $s3, $zero /* A04674 80241E34 0809079A */ j .L80241E68 /* A04678 80241E38 0000102D */ daddu $v0, $zero, $zero +glabel L80241E3C_A0467C /* A0467C 80241E3C 0280202D */ daddu $a0, $s4, $zero /* A04680 80241E40 0200282D */ daddu $a1, $s0, $zero /* A04684 80241E44 0C0905E2 */ jal nok_14_UnkNpcAIFunc3 /* A04688 80241E48 0260302D */ daddu $a2, $s3, $zero /* A0468C 80241E4C 0809079A */ j .L80241E68 /* A04690 80241E50 0000102D */ daddu $v0, $zero, $zero +glabel L80241E54_A04694 /* A04694 80241E54 0280202D */ daddu $a0, $s4, $zero /* A04698 80241E58 0200282D */ daddu $a1, $s0, $zero /* A0469C 80241E5C 0C0905FB */ jal func_802417EC_A0402C /* A046A0 80241E60 0260302D */ daddu $a2, $s3, $zero .L80241E64: +glabel L80241E64_A046A4 /* A046A4 80241E64 0000102D */ daddu $v0, $zero, $zero .L80241E68: /* A046A8 80241E68 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241E8C_A046CC.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241E8C_A046CC.s index e4c48bab14..b327a572fe 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241E8C_A046CC.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241E8C_A046CC.s @@ -49,7 +49,7 @@ glabel func_80241E8C_A046CC /* A0477C 80241F3C 240502C1 */ addiu $a1, $zero, 0x2c1 /* A04780 80241F40 4600010D */ trunc.w.s $f4, $f0 /* A04784 80241F44 44022000 */ mfc1 $v0, $f4 -/* A04788 80241F48 00000000 */ nop +/* A04788 80241F48 00000000 */ nop /* A0478C 80241F4C A6220012 */ sh $v0, 0x12($s1) /* A04790 80241F50 C6000040 */ lwc1 $f0, 0x40($s0) /* A04794 80241F54 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241FB4_A047F4.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241FB4_A047F4.s index 820c7dc70f..dd22bd0eb3 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241FB4_A047F4.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241FB4_A047F4.s @@ -28,7 +28,7 @@ glabel func_80241FB4_A047F4 /* A04850 80242010 A602008E */ sh $v0, 0x8e($s0) /* A04854 80242014 00021400 */ sll $v0, $v0, 0x10 /* A04858 80242018 1C40000F */ bgtz $v0, .L80242058 -/* A0485C 8024201C 00000000 */ nop +/* A0485C 8024201C 00000000 */ nop /* A04860 80242020 3C013E99 */ lui $at, 0x3e99 /* A04864 80242024 3421999A */ ori $at, $at, 0x999a /* A04868 80242028 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242070_A048B0.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242070_A048B0.s index f762d6e66a..934640d57a 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242070_A048B0.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242070_A048B0.s @@ -55,7 +55,7 @@ glabel func_80242070_A048B0 .L80242138: /* A04978 80242138 C600003C */ lwc1 $f0, 0x3c($s0) /* A0497C 8024213C 4602003C */ c.lt.s $f0, $f2 -/* A04980 80242140 00000000 */ nop +/* A04980 80242140 00000000 */ nop /* A04984 80242144 45010009 */ bc1t .L8024216C /* A04988 80242148 2402000A */ addiu $v0, $zero, 0xa /* A0498C 8024214C A602008E */ sh $v0, 0x8e($s0) diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s index 5b36f0b92a..2f4d487e60 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s @@ -57,7 +57,7 @@ glabel func_802421CC_A04A0C /* A04AD8 80242298 8E4300B0 */ lw $v1, 0xb0($s2) /* A04ADC 8024229C 30620004 */ andi $v0, $v1, 4 /* A04AE0 802422A0 10400007 */ beqz $v0, .L802422C0 -/* A04AE4 802422A4 00000000 */ nop +/* A04AE4 802422A4 00000000 */ nop /* A04AE8 802422A8 824200B4 */ lb $v0, 0xb4($s2) /* A04AEC 802422AC 14400052 */ bnez $v0, .L802423F8 /* A04AF0 802422B0 0000102D */ daddu $v0, $zero, $zero @@ -69,15 +69,17 @@ glabel func_802421CC_A04A0C /* A04B04 802422C4 2C620010 */ sltiu $v0, $v1, 0x10 /* A04B08 802422C8 1040004A */ beqz $v0, .L802423F4 /* A04B0C 802422CC 00031080 */ sll $v0, $v1, 2 -/* A04B10 802422D0 3C018024 */ lui $at, %hi(D_80244678) +/* A04B10 802422D0 3C018024 */ lui $at, %hi(jtbl_80244678_A06EB8) /* A04B14 802422D4 00220821 */ addu $at, $at, $v0 -/* A04B18 802422D8 8C224678 */ lw $v0, %lo(D_80244678)($at) +/* A04B18 802422D8 8C224678 */ lw $v0, %lo(jtbl_80244678_A06EB8)($at) /* A04B1C 802422DC 00400008 */ jr $v0 -/* A04B20 802422E0 00000000 */ nop +/* A04B20 802422E0 00000000 */ nop +glabel L802422E4_A04B24 /* A04B24 802422E4 0260202D */ daddu $a0, $s3, $zero /* A04B28 802422E8 0200282D */ daddu $a1, $s0, $zero /* A04B2C 802422EC 0C090265 */ jal func_80240994_A031D4 /* A04B30 802422F0 0280302D */ daddu $a2, $s4, $zero +glabel L802422F4_A04B34 /* A04B34 802422F4 0260202D */ daddu $a0, $s3, $zero /* A04B38 802422F8 0200282D */ daddu $a1, $s0, $zero /* A04B3C 802422FC 0C0902D1 */ jal func_80240B44_A03384 @@ -86,10 +88,12 @@ glabel func_802421CC_A04A0C /* A04B48 80242308 24020002 */ addiu $v0, $zero, 2 /* A04B4C 8024230C 1462003A */ bne $v1, $v0, .L802423F8 /* A04B50 80242310 0000102D */ daddu $v0, $zero, $zero +glabel L80242314_A04B54 /* A04B54 80242314 0260202D */ daddu $a0, $s3, $zero /* A04B58 80242318 0200282D */ daddu $a1, $s0, $zero /* A04B5C 8024231C 0C09045B */ jal nok_14_UnkNpcAIFunc1 /* A04B60 80242320 0280302D */ daddu $a2, $s4, $zero +glabel L80242324_A04B64 /* A04B64 80242324 0260202D */ daddu $a0, $s3, $zero /* A04B68 80242328 0200282D */ daddu $a1, $s0, $zero /* A04B6C 8024232C 0C09048B */ jal func_8024122C_A03A6C @@ -98,6 +102,7 @@ glabel func_802421CC_A04A0C /* A04B78 80242338 2402000A */ addiu $v0, $zero, 0xa /* A04B7C 8024233C 1462002E */ bne $v1, $v0, .L802423F8 /* A04B80 80242340 0000102D */ daddu $v0, $zero, $zero +glabel L80242344_A04B84 /* A04B84 80242344 0260202D */ daddu $a0, $s3, $zero /* A04B88 80242348 0200282D */ daddu $a1, $s0, $zero /* A04B8C 8024234C 0C09055C */ jal nok_14_UnkNpcAIFunc2 @@ -106,6 +111,7 @@ glabel func_802421CC_A04A0C /* A04B98 80242358 2402000B */ addiu $v0, $zero, 0xb /* A04B9C 8024235C 14620026 */ bne $v1, $v0, .L802423F8 /* A04BA0 80242360 0000102D */ daddu $v0, $zero, $zero +glabel L80242364_A04BA4 /* A04BA4 80242364 0260202D */ daddu $a0, $s3, $zero /* A04BA8 80242368 0200282D */ daddu $a1, $s0, $zero /* A04BAC 8024236C 0C09057A */ jal func_802415E8_A03E28 @@ -114,6 +120,7 @@ glabel func_802421CC_A04A0C /* A04BB8 80242378 2402000C */ addiu $v0, $zero, 0xc /* A04BBC 8024237C 1462001E */ bne $v1, $v0, .L802423F8 /* A04BC0 80242380 0000102D */ daddu $v0, $zero, $zero +glabel L80242384_A04BC4 /* A04BC4 80242384 0260202D */ daddu $a0, $s3, $zero /* A04BC8 80242388 0200282D */ daddu $a1, $s0, $zero /* A04BCC 8024238C 0C0907A3 */ jal func_80241E8C_A046CC @@ -122,6 +129,7 @@ glabel func_802421CC_A04A0C /* A04BD8 80242398 2402000D */ addiu $v0, $zero, 0xd /* A04BDC 8024239C 14620016 */ bne $v1, $v0, .L802423F8 /* A04BE0 802423A0 0000102D */ daddu $v0, $zero, $zero +glabel L802423A4_A04BE4 /* A04BE4 802423A4 0260202D */ daddu $a0, $s3, $zero /* A04BE8 802423A8 0200282D */ daddu $a1, $s0, $zero /* A04BEC 802423AC 0C0907ED */ jal func_80241FB4_A047F4 @@ -130,6 +138,7 @@ glabel func_802421CC_A04A0C /* A04BF8 802423B8 2402000E */ addiu $v0, $zero, 0xe /* A04BFC 802423BC 1462000E */ bne $v1, $v0, .L802423F8 /* A04C00 802423C0 0000102D */ daddu $v0, $zero, $zero +glabel L802423C4_A04C04 /* A04C04 802423C4 0260202D */ daddu $a0, $s3, $zero /* A04C08 802423C8 0200282D */ daddu $a1, $s0, $zero /* A04C0C 802423CC 0C09081C */ jal func_80242070_A048B0 @@ -138,11 +147,13 @@ glabel func_802421CC_A04A0C /* A04C18 802423D8 2402000F */ addiu $v0, $zero, 0xf /* A04C1C 802423DC 14620006 */ bne $v1, $v0, .L802423F8 /* A04C20 802423E0 0000102D */ daddu $v0, $zero, $zero +glabel L802423E4_A04C24 /* A04C24 802423E4 0260202D */ daddu $a0, $s3, $zero /* A04C28 802423E8 0200282D */ daddu $a1, $s0, $zero /* A04C2C 802423EC 0C090862 */ jal nok_14_UnkDurationCheck /* A04C30 802423F0 0280302D */ daddu $a2, $s4, $zero .L802423F4: +glabel L802423F4_A04C34 /* A04C34 802423F4 0000102D */ daddu $v0, $zero, $zero .L802423F8: /* A04C38 802423F8 8FBF0048 */ lw $ra, 0x48($sp) @@ -154,4 +165,4 @@ glabel func_802421CC_A04A0C /* A04C50 80242410 8FB00030 */ lw $s0, 0x30($sp) /* A04C54 80242414 03E00008 */ jr $ra /* A04C58 80242418 27BD0050 */ addiu $sp, $sp, 0x50 -/* A04C5C 8024241C 00000000 */ nop +/* A04C5C 8024241C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240034_A06F34.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240034_A06F34.s index 56a225d57f..4e042d021d 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240034_A06F34.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240034_A06F34.s @@ -22,16 +22,16 @@ glabel func_80240034_A06F34 /* A06F74 80240074 00021023 */ negu $v0, $v0 .L80240078: /* A06F78 80240078 14400003 */ bnez $v0, .L80240088 -/* A06F7C 8024007C 00000000 */ nop +/* A06F7C 8024007C 00000000 */ nop /* A06F80 80240080 50E00017 */ beql $a3, $zero, .L802400E0 /* A06F84 80240084 0000102D */ daddu $v0, $zero, $zero .L80240088: /* A06F88 80240088 44822000 */ mtc1 $v0, $f4 -/* A06F8C 8024008C 00000000 */ nop +/* A06F8C 8024008C 00000000 */ nop /* A06F90 80240090 46802120 */ cvt.s.w $f4, $f4 /* A06F94 80240094 44062000 */ mfc1 $a2, $f4 /* A06F98 80240098 44872000 */ mtc1 $a3, $f4 -/* A06F9C 8024009C 00000000 */ nop +/* A06F9C 8024009C 00000000 */ nop /* A06FA0 802400A0 46802120 */ cvt.s.w $f4, $f4 /* A06FA4 802400A4 44806000 */ mtc1 $zero, $f12 /* A06FA8 802400A8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240034_A06F34 /* A06FB0 802400B0 46006386 */ mov.s $f14, $f12 /* A06FB4 802400B4 3C014270 */ lui $at, 0x4270 /* A06FB8 802400B8 44811000 */ mtc1 $at, $f2 -/* A06FBC 802400BC 00000000 */ nop +/* A06FBC 802400BC 00000000 */ nop /* A06FC0 802400C0 4602003C */ c.lt.s $f0, $f2 -/* A06FC4 802400C4 00000000 */ nop +/* A06FC4 802400C4 00000000 */ nop /* A06FC8 802400C8 45000004 */ bc1f .L802400DC /* A06FCC 802400CC 24020001 */ addiu $v0, $zero, 1 /* A06FD0 802400D0 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024035C_A0725C.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024035C_A0725C.s index 2ce6e9b07c..1143f1dfec 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024035C_A0725C.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024035C_A0725C.s @@ -21,11 +21,11 @@ glabel func_8024035C_A0725C /* A0729C 8024039C A602008E */ sh $v0, 0x8e($s0) /* A072A0 802403A0 00021400 */ sll $v0, $v0, 0x10 /* A072A4 802403A4 1C400033 */ bgtz $v0, .L80240474 -/* A072A8 802403A8 00000000 */ nop +/* A072A8 802403A8 00000000 */ nop .L802403AC: /* A072AC 802403AC 8602008C */ lh $v0, 0x8c($s0) /* A072B0 802403B0 14400030 */ bnez $v0, .L80240474 -/* A072B4 802403B4 00000000 */ nop +/* A072B4 802403B4 00000000 */ nop /* A072B8 802403B8 8E2200CC */ lw $v0, 0xcc($s1) /* A072BC 802403BC 8C420024 */ lw $v0, 0x24($v0) /* A072C0 802403C0 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_8024035C_A0725C /* A072CC 802403CC 8E230088 */ lw $v1, 0x88($s1) /* A072D0 802403D0 24020005 */ addiu $v0, $zero, 5 /* A072D4 802403D4 10620005 */ beq $v1, $v0, .L802403EC -/* A072D8 802403D8 00000000 */ nop +/* A072D8 802403D8 00000000 */ nop /* A072DC 802403DC 10600003 */ beqz $v1, .L802403EC /* A072E0 802403E0 24020001 */ addiu $v0, $zero, 1 /* A072E4 802403E4 14620006 */ bne $v1, $v0, .L80240400 -/* A072E8 802403E8 00000000 */ nop +/* A072E8 802403E8 00000000 */ nop .L802403EC: /* A072EC 802403EC 8E220084 */ lw $v0, 0x84($s1) /* A072F0 802403F0 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_8024035C_A0725C /* A07330 80240430 46220000 */ add.d $f0, $f0, $f2 /* A07334 80240434 4620010D */ trunc.w.d $f4, $f0 /* A07338 80240438 44022000 */ mfc1 $v0, $f4 -/* A0733C 8024043C 00000000 */ nop +/* A0733C 8024043C 00000000 */ nop /* A07340 80240440 A602008E */ sh $v0, 0x8e($s0) /* A07344 80240444 00021400 */ sll $v0, $v0, 0x10 /* A07348 80240448 8E230078 */ lw $v1, 0x78($s1) /* A0734C 8024044C 00021403 */ sra $v0, $v0, 0x10 /* A07350 80240450 0043102A */ slt $v0, $v0, $v1 /* A07354 80240454 10400003 */ beqz $v0, .L80240464 -/* A07358 80240458 00000000 */ nop +/* A07358 80240458 00000000 */ nop /* A0735C 8024045C 9622007A */ lhu $v0, 0x7a($s1) /* A07360 80240460 A602008E */ sh $v0, 0x8e($s0) .L80240464: diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s index 54f65a7d54..2c4aa1d447 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s @@ -279,15 +279,17 @@ glabel func_80240674_A07574 /* A07960 80240A60 2C620015 */ sltiu $v0, $v1, 0x15 /* A07964 80240A64 10400009 */ beqz $v0, .L80240A8C /* A07968 80240A68 00031080 */ sll $v0, $v1, 2 -/* A0796C 80240A6C 3C018024 */ lui $at, %hi(D_80244CF8) +/* A0796C 80240A6C 3C018024 */ lui $at, %hi(jtbl_80244CF8_A0BBF8) /* A07970 80240A70 00220821 */ addu $at, $at, $v0 -/* A07974 80240A74 8C224CF8 */ lw $v0, %lo(D_80244CF8)($at) +/* A07974 80240A74 8C224CF8 */ lw $v0, %lo(jtbl_80244CF8_A0BBF8)($at) /* A07978 80240A78 00400008 */ jr $v0 /* A0797C 80240A7C 00000000 */ nop +glabel L80240A80_A07980 /* A07980 80240A80 8E420028 */ lw $v0, 0x28($s2) /* A07984 80240A84 24420001 */ addiu $v0, $v0, 1 /* A07988 80240A88 AE420028 */ sw $v0, 0x28($s2) .L80240A8C: +glabel L80240A8C_A0798C /* A0798C 80240A8C 0000102D */ daddu $v0, $zero, $zero .L80240A90: /* A07990 80240A90 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240AB4_A079B4.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240AB4_A079B4.s index b032ea45ca..a48131d882 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240AB4_A079B4.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240AB4_A079B4.s @@ -47,7 +47,7 @@ glabel func_80240AB4_A079B4 /* A07A5C 80240B5C 0C0123F5 */ jal is_point_within_region /* A07A60 80240B60 8E070038 */ lw $a3, 0x38($s0) /* A07A64 80240B64 1040000E */ beqz $v0, .L80240BA0 -/* A07A68 80240B68 00000000 */ nop +/* A07A68 80240B68 00000000 */ nop /* A07A6C 80240B6C 8E2200D0 */ lw $v0, 0xd0($s1) /* A07A70 80240B70 C60C0038 */ lwc1 $f12, 0x38($s0) /* A07A74 80240B74 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240AB4_A079B4 /* A07A88 80240B88 468031A0 */ cvt.s.w $f6, $f6 /* A07A8C 80240B8C 44073000 */ mfc1 $a3, $f6 /* A07A90 80240B90 0C00A720 */ jal atan2 -/* A07A94 80240B94 00000000 */ nop +/* A07A94 80240B94 00000000 */ nop /* A07A98 80240B98 080902F4 */ j .L80240BD0 /* A07A9C 80240B9C E600000C */ swc1 $f0, 0xc($s0) .L80240BA0: @@ -66,7 +66,7 @@ glabel func_80240AB4_A079B4 /* A07AA4 80240BA4 2404003C */ addiu $a0, $zero, 0x3c /* A07AA8 80240BA8 C60C000C */ lwc1 $f12, 0xc($s0) /* A07AAC 80240BAC 44820000 */ mtc1 $v0, $f0 -/* A07AB0 80240BB0 00000000 */ nop +/* A07AB0 80240BB0 00000000 */ nop /* A07AB4 80240BB4 46800020 */ cvt.s.w $f0, $f0 /* A07AB8 80240BB8 46006300 */ add.s $f12, $f12, $f0 /* A07ABC 80240BBC 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240AB4_A079B4 /* A07AE0 80240BE0 8E2200D0 */ lw $v0, 0xd0($s1) /* A07AE4 80240BE4 8C420014 */ lw $v0, 0x14($v0) /* A07AE8 80240BE8 04410004 */ bgez $v0, .L80240BFC -/* A07AEC 80240BEC 00000000 */ nop +/* A07AEC 80240BEC 00000000 */ nop /* A07AF0 80240BF0 C6400000 */ lwc1 $f0, ($s2) /* A07AF4 80240BF4 08090307 */ j .L80240C1C /* A07AF8 80240BF8 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240AB4_A079B4 /* A07AFC 80240BFC 3C018024 */ lui $at, %hi(D_80244D50) /* A07B00 80240C00 D4224D50 */ ldc1 $f2, %lo(D_80244D50)($at) /* A07B04 80240C04 44820000 */ mtc1 $v0, $f0 -/* A07B08 80240C08 00000000 */ nop +/* A07B08 80240C08 00000000 */ nop /* A07B0C 80240C0C 46800021 */ cvt.d.w $f0, $f0 /* A07B10 80240C10 46220003 */ div.d $f0, $f0, $f2 /* A07B14 80240C14 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240AB4_A079B4 /* A07B28 80240C28 44801000 */ mtc1 $zero, $f2 /* A07B2C 80240C2C 46000021 */ cvt.d.s $f0, $f0 /* A07B30 80240C30 46220002 */ mul.d $f0, $f0, $f2 -/* A07B34 80240C34 00000000 */ nop +/* A07B34 80240C34 00000000 */ nop /* A07B38 80240C38 24020001 */ addiu $v0, $zero, 1 /* A07B3C 80240C3C 4620018D */ trunc.w.d $f6, $f0 /* A07B40 80240C40 E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240C64_A07B64.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240C64_A07B64.s index e195743d09..6c19b2557c 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240C64_A07B64.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240C64_A07B64.s @@ -34,7 +34,7 @@ glabel func_80240C64_A07B64 /* A07BD8 80240CD8 44803000 */ mtc1 $zero, $f6 /* A07BDC 80240CDC 46000021 */ cvt.d.s $f0, $f0 /* A07BE0 80240CE0 46260002 */ mul.d $f0, $f0, $f6 -/* A07BE4 80240CE4 00000000 */ nop +/* A07BE4 80240CE4 00000000 */ nop /* A07BE8 80240CE8 24020001 */ addiu $v0, $zero, 1 /* A07BEC 80240CEC 8E24006C */ lw $a0, 0x6c($s1) /* A07BF0 80240CF0 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80240C64_A07B64 /* A07C4C 80240D4C C600003C */ lwc1 $f0, 0x3c($s0) /* A07C50 80240D50 4600C001 */ sub.s $f0, $f24, $f0 /* A07C54 80240D54 4600B03C */ c.lt.s $f22, $f0 -/* A07C58 80240D58 00000000 */ nop +/* A07C58 80240D58 00000000 */ nop /* A07C5C 80240D5C 4500001B */ bc1f .L80240DCC /* A07C60 80240D60 34820010 */ ori $v0, $a0, 0x10 /* A07C64 80240D64 08090373 */ j .L80240DCC @@ -87,9 +87,9 @@ glabel func_80240C64_A07B64 /* A07CA8 80240DA8 C7A00034 */ lwc1 $f0, 0x34($sp) /* A07CAC 80240DAC 4600D001 */ sub.s $f0, $f26, $f0 /* A07CB0 80240DB0 4600B03C */ c.lt.s $f22, $f0 -/* A07CB4 80240DB4 00000000 */ nop +/* A07CB4 80240DB4 00000000 */ nop /* A07CB8 80240DB8 45000004 */ bc1f .L80240DCC -/* A07CBC 80240DBC 00000000 */ nop +/* A07CBC 80240DBC 00000000 */ nop /* A07CC0 80240DC0 8E22006C */ lw $v0, 0x6c($s1) /* A07CC4 80240DC4 34420010 */ ori $v0, $v0, 0x10 /* A07CC8 80240DC8 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80240C64_A07B64 /* A07CD0 80240DD0 24030011 */ addiu $v1, $zero, 0x11 /* A07CD4 80240DD4 30420011 */ andi $v0, $v0, 0x11 /* A07CD8 80240DD8 14430039 */ bne $v0, $v1, .L80240EC0 -/* A07CDC 80240DDC 00000000 */ nop +/* A07CDC 80240DDC 00000000 */ nop /* A07CE0 80240DE0 8E020000 */ lw $v0, ($s0) /* A07CE4 80240DE4 30420008 */ andi $v0, $v0, 8 /* A07CE8 80240DE8 1040000A */ beqz $v0, .L80240E14 @@ -108,7 +108,7 @@ glabel func_80240C64_A07B64 /* A07CF8 80240DF8 D4204D58 */ ldc1 $f0, %lo(D_80244D58)($at) /* A07CFC 80240DFC 460010A1 */ cvt.d.s $f2, $f2 /* A07D00 80240E00 46201082 */ mul.d $f2, $f2, $f0 -/* A07D04 80240E04 00000000 */ nop +/* A07D04 80240E04 00000000 */ nop /* A07D08 80240E08 4600A021 */ cvt.d.s $f0, $f20 /* A07D0C 80240E0C 0809039E */ j .L80240E78 /* A07D10 80240E10 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80240C64_A07B64 /* A07D60 80240E60 D4204D60 */ ldc1 $f0, %lo(func_80244D60)($at) /* A07D64 80240E64 460010A1 */ cvt.d.s $f2, $f2 /* A07D68 80240E68 46201082 */ mul.d $f2, $f2, $f0 -/* A07D6C 80240E6C 00000000 */ nop +/* A07D6C 80240E6C 00000000 */ nop /* A07D70 80240E70 4600A021 */ cvt.d.s $f0, $f20 /* A07D74 80240E74 46220000 */ add.d $f0, $f0, $f2 .L80240E78: @@ -149,7 +149,7 @@ glabel func_80240C64_A07B64 /* A07D94 80240E94 46000005 */ abs.s $f0, $f0 /* A07D98 80240E98 46000021 */ cvt.d.s $f0, $f0 /* A07D9C 80240E9C 4622003C */ c.lt.d $f0, $f2 -/* A07DA0 80240EA0 00000000 */ nop +/* A07DA0 80240EA0 00000000 */ nop /* A07DA4 80240EA4 45000036 */ bc1f .L80240F80 /* A07DA8 80240EA8 2403FFEF */ addiu $v1, $zero, -0x11 /* A07DAC 80240EAC E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80240C64_A07B64 .L80240EC0: /* A07DC0 80240EC0 8E220070 */ lw $v0, 0x70($s1) /* A07DC4 80240EC4 1840002E */ blez $v0, .L80240F80 -/* A07DC8 80240EC8 00000000 */ nop +/* A07DC8 80240EC8 00000000 */ nop /* A07DCC 80240ECC C62C0074 */ lwc1 $f12, 0x74($s1) /* A07DD0 80240ED0 0C00A8BB */ jal sin_deg /* A07DD4 80240ED4 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80240C64_A07B64 /* A07E2C 80240F2C 27A70030 */ addiu $a3, $sp, 0x30 .L80240F30: /* A07E30 80240F30 10400007 */ beqz $v0, .L80240F50 -/* A07E34 80240F34 00000000 */ nop +/* A07E34 80240F34 00000000 */ nop /* A07E38 80240F38 4616A082 */ mul.s $f2, $f20, $f22 -/* A07E3C 80240F3C 00000000 */ nop +/* A07E3C 80240F3C 00000000 */ nop /* A07E40 80240F40 C7A0002C */ lwc1 $f0, 0x2c($sp) /* A07E44 80240F44 461A0000 */ add.s $f0, $f0, $f26 /* A07E48 80240F48 080903D7 */ j .L80240F5C /* A07E4C 80240F4C 46020000 */ add.s $f0, $f0, $f2 .L80240F50: /* A07E50 80240F50 4616A002 */ mul.s $f0, $f20, $f22 -/* A07E54 80240F54 00000000 */ nop +/* A07E54 80240F54 00000000 */ nop /* A07E58 80240F58 4600C000 */ add.s $f0, $f24, $f0 .L80240F5C: /* A07E5C 80240F5C E600003C */ swc1 $f0, 0x3c($s0) /* A07E60 80240F60 8E220074 */ lw $v0, 0x74($s1) /* A07E64 80240F64 2442000A */ addiu $v0, $v0, 0xa /* A07E68 80240F68 44826000 */ mtc1 $v0, $f12 -/* A07E6C 80240F6C 00000000 */ nop +/* A07E6C 80240F6C 00000000 */ nop /* A07E70 80240F70 0C00A6C9 */ jal clamp_angle /* A07E74 80240F74 46806320 */ cvt.s.w $f12, $f12 /* A07E78 80240F78 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80240C64_A07B64 /* A07E88 80240F88 2442FFFF */ addiu $v0, $v0, -1 /* A07E8C 80240F8C 8E430014 */ lw $v1, 0x14($s2) /* A07E90 80240F90 04600048 */ bltz $v1, .L802410B4 -/* A07E94 80240F94 00000000 */ nop +/* A07E94 80240F94 00000000 */ nop /* A07E98 80240F98 8E620074 */ lw $v0, 0x74($s3) /* A07E9C 80240F9C 1C400042 */ bgtz $v0, .L802410A8 /* A07EA0 80240FA0 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80240C64_A07B64 /* A07EA8 80240FA8 860200A8 */ lh $v0, 0xa8($s0) /* A07EAC 80240FAC C602003C */ lwc1 $f2, 0x3c($s0) /* A07EB0 80240FB0 44820000 */ mtc1 $v0, $f0 -/* A07EB4 80240FB4 00000000 */ nop +/* A07EB4 80240FB4 00000000 */ nop /* A07EB8 80240FB8 46800020 */ cvt.s.w $f0, $f0 /* A07EBC 80240FBC 46001080 */ add.s $f2, $f2, $f0 /* A07EC0 80240FC0 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80240C64_A07B64 /* A07EDC 80240FDC C440002C */ lwc1 $f0, 0x2c($v0) /* A07EE0 80240FE0 46000021 */ cvt.d.s $f0, $f0 /* A07EE4 80240FE4 4622003C */ c.lt.d $f0, $f2 -/* A07EE8 80240FE8 00000000 */ nop +/* A07EE8 80240FE8 00000000 */ nop /* A07EEC 80240FEC 4500002C */ bc1f .L802410A0 /* A07EF0 80240FF0 02A0202D */ daddu $a0, $s5, $zero /* A07EF4 80240FF4 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80240C64_A07B64 /* A07F30 80241030 3C01C1A0 */ lui $at, 0xc1a0 /* A07F34 80241034 44812000 */ mtc1 $at, $f4 /* A07F38 80241038 44834000 */ mtc1 $v1, $f8 -/* A07F3C 8024103C 00000000 */ nop +/* A07F3C 8024103C 00000000 */ nop /* A07F40 80241040 46804220 */ cvt.s.w $f8, $f8 /* A07F44 80241044 44074000 */ mfc1 $a3, $f8 /* A07F48 80241048 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80240C64_A07B64 /* A07FFC 802410FC 0C0123F5 */ jal is_point_within_region /* A08000 80241100 8E070038 */ lw $a3, 0x38($s0) /* A08004 80241104 1040001A */ beqz $v0, .L80241170 -/* A08008 80241108 00000000 */ nop +/* A08008 80241108 00000000 */ nop /* A0800C 8024110C 8E060038 */ lw $a2, 0x38($s0) /* A08010 80241110 8E2200D0 */ lw $v0, 0xd0($s1) /* A08014 80241114 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80240C64_A07B64 /* A08028 80241128 468073A0 */ cvt.s.w $f14, $f14 /* A0802C 8024112C C6020018 */ lwc1 $f2, 0x18($s0) /* A08030 80241130 4600103C */ c.lt.s $f2, $f0 -/* A08034 80241134 00000000 */ nop +/* A08034 80241134 00000000 */ nop /* A08038 80241138 4500000D */ bc1f .L80241170 /* A0803C 8024113C E7A00034 */ swc1 $f0, 0x34($sp) /* A08040 80241140 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80240C64_A07B64 /* A0807C 8024117C 00621825 */ or $v1, $v1, $v0 /* A08080 80241180 00741825 */ or $v1, $v1, $s4 /* A08084 80241184 10600008 */ beqz $v1, .L802411A8 -/* A08088 80241188 00000000 */ nop +/* A08088 80241188 00000000 */ nop /* A0808C 8024118C 8602008C */ lh $v0, 0x8c($s0) /* A08090 80241190 14400031 */ bnez $v0, .L80241258 -/* A08094 80241194 00000000 */ nop +/* A08094 80241194 00000000 */ nop /* A08098 80241198 8E050018 */ lw $a1, 0x18($s0) /* A0809C 8024119C 8E06000C */ lw $a2, 0xc($s0) /* A080A0 802411A0 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_80240C64_A07B64 /* A080B4 802411B4 44801000 */ mtc1 $zero, $f2 /* A080B8 802411B8 46000021 */ cvt.d.s $f0, $f0 /* A080BC 802411BC 46220002 */ mul.d $f0, $f0, $f2 -/* A080C0 802411C0 00000000 */ nop +/* A080C0 802411C0 00000000 */ nop /* A080C4 802411C4 4620020D */ trunc.w.d $f8, $f0 /* A080C8 802411C8 E628007C */ swc1 $f8, 0x7c($s1) /* A080CC 802411CC 8E420004 */ lw $v0, 4($s2) /* A080D0 802411D0 18400021 */ blez $v0, .L80241258 -/* A080D4 802411D4 00000000 */ nop +/* A080D4 802411D4 00000000 */ nop /* A080D8 802411D8 8602008E */ lh $v0, 0x8e($s0) /* A080DC 802411DC 9603008E */ lhu $v1, 0x8e($s0) /* A080E0 802411E0 18400005 */ blez $v0, .L802411F8 @@ -375,7 +375,7 @@ glabel func_80240C64_A07B64 /* A080E8 802411E8 A602008E */ sh $v0, 0x8e($s0) /* A080EC 802411EC 00021400 */ sll $v0, $v0, 0x10 /* A080F0 802411F0 1C400019 */ bgtz $v0, .L80241258 -/* A080F4 802411F4 00000000 */ nop +/* A080F4 802411F4 00000000 */ nop .L802411F8: /* A080F8 802411F8 240403E8 */ addiu $a0, $zero, 0x3e8 /* A080FC 802411FC 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80240C64_A07B64 /* A08144 80241244 18400003 */ blez $v0, .L80241254 /* A08148 80241248 28620003 */ slti $v0, $v1, 3 /* A0814C 8024124C 10400002 */ beqz $v0, .L80241258 -/* A08150 80241250 00000000 */ nop +/* A08150 80241250 00000000 */ nop .L80241254: /* A08154 80241254 AE600070 */ sw $zero, 0x70($s3) .L80241258: diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024134C_A0824C.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024134C_A0824C.s index 6a2dd5dc72..376d258e42 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024134C_A0824C.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024134C_A0824C.s @@ -42,11 +42,11 @@ glabel func_8024134C_A0824C .L802413E0: /* A082E0 802413E0 8E220070 */ lw $v0, 0x70($s1) /* A082E4 802413E4 18400034 */ blez $v0, .L802414B8 -/* A082E8 802413E8 00000000 */ nop +/* A082E8 802413E8 00000000 */ nop /* A082EC 802413EC C62C0074 */ lwc1 $f12, 0x74($s1) /* A082F0 802413F0 46806320 */ cvt.s.w $f12, $f12 /* A082F4 802413F4 44820000 */ mtc1 $v0, $f0 -/* A082F8 802413F8 00000000 */ nop +/* A082F8 802413F8 00000000 */ nop /* A082FC 802413FC 46800020 */ cvt.s.w $f0, $f0 /* A08300 80241400 46000021 */ cvt.d.s $f0, $f0 /* A08304 80241404 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_8024134C_A0824C /* A08364 80241464 27A70030 */ addiu $a3, $sp, 0x30 .L80241468: /* A08368 80241468 10400007 */ beqz $v0, .L80241488 -/* A0836C 8024146C 00000000 */ nop +/* A0836C 8024146C 00000000 */ nop /* A08370 80241470 4616A082 */ mul.s $f2, $f20, $f22 -/* A08374 80241474 00000000 */ nop +/* A08374 80241474 00000000 */ nop /* A08378 80241478 C7A0002C */ lwc1 $f0, 0x2c($sp) /* A0837C 8024147C 46180000 */ add.s $f0, $f0, $f24 /* A08380 80241480 08090525 */ j .L80241494 /* A08384 80241484 46020000 */ add.s $f0, $f0, $f2 .L80241488: /* A08388 80241488 4616A002 */ mul.s $f0, $f20, $f22 -/* A0838C 8024148C 00000000 */ nop +/* A0838C 8024148C 00000000 */ nop /* A08390 80241490 4600D000 */ add.s $f0, $f26, $f0 .L80241494: /* A08394 80241494 E600003C */ swc1 $f0, 0x3c($s0) /* A08398 80241498 8E220074 */ lw $v0, 0x74($s1) /* A0839C 8024149C 2442000A */ addiu $v0, $v0, 0xa /* A083A0 802414A0 44826000 */ mtc1 $v0, $f12 -/* A083A4 802414A4 00000000 */ nop +/* A083A4 802414A4 00000000 */ nop /* A083A8 802414A8 0C00A6C9 */ jal clamp_angle /* A083AC 802414AC 46806320 */ cvt.s.w $f12, $f12 /* A083B0 802414B0 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_8024134C_A0824C /* A083C4 802414C4 860200A8 */ lh $v0, 0xa8($s0) /* A083C8 802414C8 C600003C */ lwc1 $f0, 0x3c($s0) /* A083CC 802414CC 44821000 */ mtc1 $v0, $f2 -/* A083D0 802414D0 00000000 */ nop +/* A083D0 802414D0 00000000 */ nop /* A083D4 802414D4 468010A0 */ cvt.s.w $f2, $f2 /* A083D8 802414D8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A083DC 802414DC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_8024134C_A0824C /* A083F8 802414F8 46240000 */ add.d $f0, $f0, $f4 /* A083FC 802414FC 460010A1 */ cvt.d.s $f2, $f2 /* A08400 80241500 4620103C */ c.lt.d $f2, $f0 -/* A08404 80241504 00000000 */ nop +/* A08404 80241504 00000000 */ nop /* A08408 80241508 4500002E */ bc1f .L802415C4 /* A0840C 8024150C 0280202D */ daddu $a0, $s4, $zero /* A08410 80241510 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_8024134C_A0824C /* A08450 80241550 3C01C1A0 */ lui $at, 0xc1a0 /* A08454 80241554 44812000 */ mtc1 $at, $f4 /* A08458 80241558 44834000 */ mtc1 $v1, $f8 -/* A0845C 8024155C 00000000 */ nop +/* A0845C 8024155C 00000000 */ nop /* A08460 80241560 46804220 */ cvt.s.w $f8, $f8 /* A08464 80241564 44074000 */ mfc1 $a3, $f8 /* A08468 80241568 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_8024134C_A0824C .L802415C4: /* A084C4 802415C4 8602008C */ lh $v0, 0x8c($s0) /* A084C8 802415C8 14400025 */ bnez $v0, .L80241660 -/* A084CC 802415CC 00000000 */ nop +/* A084CC 802415CC 00000000 */ nop /* A084D0 802415D0 8602008E */ lh $v0, 0x8e($s0) /* A084D4 802415D4 1C400022 */ bgtz $v0, .L80241660 -/* A084D8 802415D8 00000000 */ nop +/* A084D8 802415D8 00000000 */ nop /* A084DC 802415DC 8E620074 */ lw $v0, 0x74($s3) /* A084E0 802415E0 2442FFFF */ addiu $v0, $v0, -1 /* A084E4 802415E4 1840001D */ blez $v0, .L8024165C @@ -183,7 +183,7 @@ glabel func_8024134C_A0824C /* A084F0 802415F0 9442002A */ lhu $v0, 0x2a($v0) /* A084F4 802415F4 30420010 */ andi $v0, $v0, 0x10 /* A084F8 802415F8 14400007 */ bnez $v0, .L80241618 -/* A084FC 802415FC 00000000 */ nop +/* A084FC 802415FC 00000000 */ nop /* A08500 80241600 C600000C */ lwc1 $f0, 0xc($s0) /* A08504 80241604 3C014334 */ lui $at, 0x4334 /* A08508 80241608 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241774_A08674.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241774_A08674.s index 89767acd60..c0c73dcca2 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241774_A08674.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241774_A08674.s @@ -60,18 +60,18 @@ glabel func_80241774_A08674 /* A0874C 8024184C C6200038 */ lwc1 $f0, 0x38($s1) /* A08750 80241850 4600018D */ trunc.w.s $f6, $f0 /* A08754 80241854 44023000 */ mfc1 $v0, $f6 -/* A08758 80241858 00000000 */ nop +/* A08758 80241858 00000000 */ nop /* A0875C 8024185C A6420010 */ sh $v0, 0x10($s2) /* A08760 80241860 C620003C */ lwc1 $f0, 0x3c($s1) /* A08764 80241864 4600018D */ trunc.w.s $f6, $f0 /* A08768 80241868 44023000 */ mfc1 $v0, $f6 -/* A0876C 8024186C 00000000 */ nop +/* A0876C 8024186C 00000000 */ nop /* A08770 80241870 A6420012 */ sh $v0, 0x12($s2) /* A08774 80241874 C6200040 */ lwc1 $f0, 0x40($s1) /* A08778 80241878 A2430007 */ sb $v1, 7($s2) /* A0877C 8024187C 4600018D */ trunc.w.s $f6, $f0 /* A08780 80241880 44023000 */ mfc1 $v0, $f6 -/* A08784 80241884 00000000 */ nop +/* A08784 80241884 00000000 */ nop /* A08788 80241888 A6420014 */ sh $v0, 0x14($s2) .L8024188C: /* A0878C 8024188C 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024190C_A0880C.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024190C_A0880C.s index 153b9f7d6f..6e0c0c69b4 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024190C_A0880C.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024190C_A0880C.s @@ -42,9 +42,9 @@ glabel func_8024190C_A0880C /* A088A0 802419A0 44801800 */ mtc1 $zero, $f3 /* A088A4 802419A4 46002021 */ cvt.d.s $f0, $f4 /* A088A8 802419A8 4620103E */ c.le.d $f2, $f0 -/* A088AC 802419AC 00000000 */ nop +/* A088AC 802419AC 00000000 */ nop /* A088B0 802419B0 45000030 */ bc1f .L80241A74 -/* A088B4 802419B4 00000000 */ nop +/* A088B4 802419B4 00000000 */ nop /* A088B8 802419B8 C600003C */ lwc1 $f0, 0x3c($s0) /* A088BC 802419BC 46040000 */ add.s $f0, $f0, $f4 /* A088C0 802419C0 E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_8024190C_A0880C /* A08920 80241A20 27A70020 */ addiu $a3, $sp, 0x20 .L80241A24: /* A08924 80241A24 1040000B */ beqz $v0, .L80241A54 -/* A08928 80241A28 00000000 */ nop +/* A08928 80241A28 00000000 */ nop /* A0892C 80241A2C C7A0001C */ lwc1 $f0, 0x1c($sp) /* A08930 80241A30 46140080 */ add.s $f2, $f0, $f20 /* A08934 80241A34 C600003C */ lwc1 $f0, 0x3c($s0) /* A08938 80241A38 4600103E */ c.le.s $f2, $f0 -/* A0893C 80241A3C 00000000 */ nop +/* A0893C 80241A3C 00000000 */ nop /* A08940 80241A40 4500008D */ bc1f .L80241C78 -/* A08944 80241A44 00000000 */ nop +/* A08944 80241A44 00000000 */ nop /* A08948 80241A48 E602003C */ swc1 $f2, 0x3c($s0) /* A0894C 80241A4C 0809071E */ j .L80241C78 /* A08950 80241A50 AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_8024190C_A0880C /* A08954 80241A54 C602003C */ lwc1 $f2, 0x3c($s0) /* A08958 80241A58 C6000064 */ lwc1 $f0, 0x64($s0) /* A0895C 80241A5C 4602003E */ c.le.s $f0, $f2 -/* A08960 80241A60 00000000 */ nop +/* A08960 80241A60 00000000 */ nop /* A08964 80241A64 45030084 */ bc1tl .L80241C78 /* A08968 80241A68 AE400070 */ sw $zero, 0x70($s2) /* A0896C 80241A6C 0809071E */ j .L80241C78 -/* A08970 80241A70 00000000 */ nop +/* A08970 80241A70 00000000 */ nop .L80241A74: /* A08974 80241A74 4622003C */ c.lt.d $f0, $f2 -/* A08978 80241A78 00000000 */ nop +/* A08978 80241A78 00000000 */ nop /* A0897C 80241A7C 4500007E */ bc1f .L80241C78 -/* A08980 80241A80 00000000 */ nop +/* A08980 80241A80 00000000 */ nop /* A08984 80241A84 9602008E */ lhu $v0, 0x8e($s0) /* A08988 80241A88 24420001 */ addiu $v0, $v0, 1 /* A0898C 80241A8C A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_8024190C_A0880C /* A08998 80241A98 00021403 */ sra $v0, $v0, 0x10 /* A0899C 80241A9C 0043102A */ slt $v0, $v0, $v1 /* A089A0 80241AA0 14400026 */ bnez $v0, .L80241B3C -/* A089A4 80241AA4 00000000 */ nop +/* A089A4 80241AA4 00000000 */ nop /* A089A8 80241AA8 C60C0038 */ lwc1 $f12, 0x38($s0) /* A089AC 80241AAC C60E0040 */ lwc1 $f14, 0x40($s0) /* A089B0 80241AB0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_8024190C_A0880C /* A089DC 80241ADC 8E62001C */ lw $v0, 0x1c($s3) /* A089E0 80241AE0 46001005 */ abs.s $f0, $f2 /* A089E4 80241AE4 44822000 */ mtc1 $v0, $f4 -/* A089E8 80241AE8 00000000 */ nop +/* A089E8 80241AE8 00000000 */ nop /* A089EC 80241AEC 46802120 */ cvt.s.w $f4, $f4 /* A089F0 80241AF0 4600203C */ c.lt.s $f4, $f0 -/* A089F4 80241AF4 00000000 */ nop +/* A089F4 80241AF4 00000000 */ nop /* A089F8 80241AF8 4500000D */ bc1f .L80241B30 -/* A089FC 80241AFC 00000000 */ nop +/* A089FC 80241AFC 00000000 */ nop /* A08A00 80241B00 44800000 */ mtc1 $zero, $f0 /* A08A04 80241B04 C614000C */ lwc1 $f20, 0xc($s0) /* A08A08 80241B08 4600103C */ c.lt.s $f2, $f0 -/* A08A0C 80241B0C 00000000 */ nop +/* A08A0C 80241B0C 00000000 */ nop /* A08A10 80241B10 45000006 */ bc1f .L80241B2C /* A08A14 80241B14 00021023 */ negu $v0, $v0 /* A08A18 80241B18 44820000 */ mtc1 $v0, $f0 -/* A08A1C 80241B1C 00000000 */ nop +/* A08A1C 80241B1C 00000000 */ nop /* A08A20 80241B20 46800020 */ cvt.s.w $f0, $f0 /* A08A24 80241B24 080906CC */ j .L80241B30 /* A08A28 80241B28 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_8024190C_A0880C /* A08A50 80241B50 C600001C */ lwc1 $f0, 0x1c($s0) /* A08A54 80241B54 46001080 */ add.s $f2, $f2, $f0 /* A08A58 80241B58 4616103C */ c.lt.s $f2, $f22 -/* A08A5C 80241B5C 00000000 */ nop +/* A08A5C 80241B5C 00000000 */ nop /* A08A60 80241B60 45020045 */ bc1fl .L80241C78 /* A08A64 80241B64 E602003C */ swc1 $f2, 0x3c($s0) /* A08A68 80241B68 0809071D */ j .L80241C74 @@ -169,7 +169,7 @@ glabel func_8024190C_A0880C /* A08A80 80241B80 C600001C */ lwc1 $f0, 0x1c($s0) /* A08A84 80241B84 C604003C */ lwc1 $f4, 0x3c($s0) /* A08A88 80241B88 44821000 */ mtc1 $v0, $f2 -/* A08A8C 80241B8C 00000000 */ nop +/* A08A8C 80241B8C 00000000 */ nop /* A08A90 80241B90 468010A0 */ cvt.s.w $f2, $f2 /* A08A94 80241B94 46000005 */ abs.s $f0, $f0 /* A08A98 80241B98 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_8024190C_A0880C /* A08AD4 80241BD4 0C0372DF */ jal func_800DCB7C /* A08AD8 80241BD8 27A70020 */ addiu $a3, $sp, 0x20 /* A08ADC 80241BDC 10400015 */ beqz $v0, .L80241C34 -/* A08AE0 80241BE0 00000000 */ nop +/* A08AE0 80241BE0 00000000 */ nop /* A08AE4 80241BE4 860200A8 */ lh $v0, 0xa8($s0) /* A08AE8 80241BE8 C604001C */ lwc1 $f4, 0x1c($s0) /* A08AEC 80241BEC 44820000 */ mtc1 $v0, $f0 -/* A08AF0 80241BF0 00000000 */ nop +/* A08AF0 80241BF0 00000000 */ nop /* A08AF4 80241BF4 46800020 */ cvt.s.w $f0, $f0 /* A08AF8 80241BF8 46002085 */ abs.s $f2, $f4 /* A08AFC 80241BFC 46020000 */ add.s $f0, $f0, $f2 /* A08B00 80241C00 C7A20024 */ lwc1 $f2, 0x24($sp) /* A08B04 80241C04 4600103E */ c.le.s $f2, $f0 -/* A08B08 80241C08 00000000 */ nop +/* A08B08 80241C08 00000000 */ nop /* A08B0C 80241C0C 45000005 */ bc1f .L80241C24 -/* A08B10 80241C10 00000000 */ nop +/* A08B10 80241C10 00000000 */ nop /* A08B14 80241C14 C7A0001C */ lwc1 $f0, 0x1c($sp) /* A08B18 80241C18 AE00001C */ sw $zero, 0x1c($s0) /* A08B1C 80241C1C 0809071E */ j .L80241C78 @@ -217,13 +217,13 @@ glabel func_8024190C_A0880C /* A08B38 80241C38 860200A8 */ lh $v0, 0xa8($s0) /* A08B3C 80241C3C 46163081 */ sub.s $f2, $f6, $f22 /* A08B40 80241C40 44820000 */ mtc1 $v0, $f0 -/* A08B44 80241C44 00000000 */ nop +/* A08B44 80241C44 00000000 */ nop /* A08B48 80241C48 46800020 */ cvt.s.w $f0, $f0 /* A08B4C 80241C4C 46001080 */ add.s $f2, $f2, $f0 /* A08B50 80241C50 C604001C */ lwc1 $f4, 0x1c($s0) /* A08B54 80241C54 46002005 */ abs.s $f0, $f4 /* A08B58 80241C58 4602003C */ c.lt.s $f0, $f2 -/* A08B5C 80241C5C 00000000 */ nop +/* A08B5C 80241C5C 00000000 */ nop /* A08B60 80241C60 45020005 */ bc1fl .L80241C78 /* A08B64 80241C64 AE00001C */ sw $zero, 0x1c($s0) /* A08B68 80241C68 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241C9C_A08B9C.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241C9C_A08B9C.s index 54be654c79..76bbcfbd35 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241C9C_A08B9C.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241C9C_A08B9C.s @@ -49,15 +49,15 @@ glabel func_80241C9C_A08B9C /* A08C44 80241D44 44802000 */ mtc1 $zero, $f4 /* A08C48 80241D48 460010A1 */ cvt.d.s $f2, $f2 /* A08C4C 80241D4C 46241082 */ mul.d $f2, $f2, $f4 -/* A08C50 80241D50 00000000 */ nop +/* A08C50 80241D50 00000000 */ nop /* A08C54 80241D54 C7A0001C */ lwc1 $f0, 0x1c($sp) /* A08C58 80241D58 46000021 */ cvt.d.s $f0, $f0 /* A08C5C 80241D5C 46240002 */ mul.d $f0, $f0, $f4 -/* A08C60 80241D60 00000000 */ nop +/* A08C60 80241D60 00000000 */ nop /* A08C64 80241D64 3C013FE0 */ lui $at, 0x3fe0 /* A08C68 80241D68 44812800 */ mtc1 $at, $f5 /* A08C6C 80241D6C 44802000 */ mtc1 $zero, $f4 -/* A08C70 80241D70 00000000 */ nop +/* A08C70 80241D70 00000000 */ nop /* A08C74 80241D74 46241080 */ add.d $f2, $f2, $f4 /* A08C78 80241D78 AE000074 */ sw $zero, 0x74($s0) /* A08C7C 80241D7C 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s index a1be4b8005..810ceaa51d 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s @@ -54,7 +54,7 @@ glabel func_80241DC0_A08CC0 /* A08D80 80241E80 8E4300B0 */ lw $v1, 0xb0($s2) /* A08D84 80241E84 30620004 */ andi $v0, $v1, 4 /* A08D88 80241E88 10400007 */ beqz $v0, .L80241EA8 -/* A08D8C 80241E8C 00000000 */ nop +/* A08D8C 80241E8C 00000000 */ nop /* A08D90 80241E90 824200B4 */ lb $v0, 0xb4($s2) /* A08D94 80241E94 1440003C */ bnez $v0, .L80241F88 /* A08D98 80241E98 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_80241DC0_A08CC0 /* A08DAC 80241EAC 2C62000F */ sltiu $v0, $v1, 0xf /* A08DB0 80241EB0 10400034 */ beqz $v0, .L80241F84 /* A08DB4 80241EB4 00031080 */ sll $v0, $v1, 2 -/* A08DB8 80241EB8 3C018024 */ lui $at, %hi(func_80244D68_8055E8) +/* A08DB8 80241EB8 3C018024 */ lui $at, %hi(jtbl_80244D68_A0BC68) /* A08DBC 80241EBC 00220821 */ addu $at, $at, $v0 -/* A08DC0 80241EC0 8C224D68 */ lw $v0, %lo(func_80244D68_8055E8)($at) +/* A08DC0 80241EC0 8C224D68 */ lw $v0, %lo(jtbl_80244D68_A0BC68)($at) /* A08DC4 80241EC4 00400008 */ jr $v0 -/* A08DC8 80241EC8 00000000 */ nop +/* A08DC8 80241EC8 00000000 */ nop +glabel L80241ECC_A08DCC /* A08DCC 80241ECC 0280202D */ daddu $a0, $s4, $zero /* A08DD0 80241ED0 0200282D */ daddu $a1, $s0, $zero /* A08DD4 80241ED4 0C0902AD */ jal func_80240AB4_A079B4 /* A08DD8 80241ED8 0260302D */ daddu $a2, $s3, $zero +glabel L80241EDC_A08DDC /* A08DDC 80241EDC 0280202D */ daddu $a0, $s4, $zero /* A08DE0 80241EE0 0200282D */ daddu $a1, $s0, $zero /* A08DE4 80241EE4 0C090319 */ jal func_80240C64_A07B64 /* A08DE8 80241EE8 0260302D */ daddu $a2, $s3, $zero /* A08DEC 80241EEC 080907E2 */ j .L80241F88 /* A08DF0 80241EF0 0000102D */ daddu $v0, $zero, $zero +glabel L80241EF4_A08DF4 /* A08DF4 80241EF4 0280202D */ daddu $a0, $s4, $zero /* A08DF8 80241EF8 0200282D */ daddu $a1, $s0, $zero /* A08DFC 80241EFC 0C0904A3 */ jal nok_15_UnkNpcAIFunc1 /* A08E00 80241F00 0260302D */ daddu $a2, $s3, $zero +glabel L80241F04_A08E04 /* A08E04 80241F04 0280202D */ daddu $a0, $s4, $zero /* A08E08 80241F08 0200282D */ daddu $a1, $s0, $zero /* A08E0C 80241F0C 0C0904D3 */ jal func_8024134C_A0824C /* A08E10 80241F10 0260302D */ daddu $a2, $s3, $zero /* A08E14 80241F14 080907E2 */ j .L80241F88 /* A08E18 80241F18 0000102D */ daddu $v0, $zero, $zero +glabel L80241F1C_A08E1C /* A08E1C 80241F1C 0280202D */ daddu $a0, $s4, $zero /* A08E20 80241F20 0200282D */ daddu $a1, $s0, $zero /* A08E24 80241F24 0C0905A4 */ jal func_80241690_A08590 /* A08E28 80241F28 0260302D */ daddu $a2, $s3, $zero +glabel L80241F2C_A08E2C /* A08E2C 80241F2C 0280202D */ daddu $a0, $s4, $zero /* A08E30 80241F30 0200282D */ daddu $a1, $s0, $zero /* A08E34 80241F34 0C0905C2 */ jal func_80241708_A08608 /* A08E38 80241F38 0260302D */ daddu $a2, $s3, $zero /* A08E3C 80241F3C 080907E2 */ j .L80241F88 /* A08E40 80241F40 0000102D */ daddu $v0, $zero, $zero +glabel L80241F44_A08E44 /* A08E44 80241F44 0280202D */ daddu $a0, $s4, $zero /* A08E48 80241F48 0200282D */ daddu $a1, $s0, $zero /* A08E4C 80241F4C 0C0905DD */ jal func_80241774_A08674 /* A08E50 80241F50 0260302D */ daddu $a2, $s3, $zero /* A08E54 80241F54 080907E2 */ j .L80241F88 /* A08E58 80241F58 0000102D */ daddu $v0, $zero, $zero +glabel L80241F5C_A08E5C /* A08E5C 80241F5C 0280202D */ daddu $a0, $s4, $zero /* A08E60 80241F60 0200282D */ daddu $a1, $s0, $zero /* A08E64 80241F64 0C09062A */ jal nok_15_UnkNpcAIFunc3 /* A08E68 80241F68 0260302D */ daddu $a2, $s3, $zero /* A08E6C 80241F6C 080907E2 */ j .L80241F88 /* A08E70 80241F70 0000102D */ daddu $v0, $zero, $zero +glabel L80241F74_A08E74 /* A08E74 80241F74 0280202D */ daddu $a0, $s4, $zero /* A08E78 80241F78 0200282D */ daddu $a1, $s0, $zero /* A08E7C 80241F7C 0C090643 */ jal func_8024190C_A0880C /* A08E80 80241F80 0260302D */ daddu $a2, $s3, $zero .L80241F84: +glabel L80241F84_A08E84 /* A08E84 80241F84 0000102D */ daddu $v0, $zero, $zero .L80241F88: /* A08E88 80241F88 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241FAC_A08EAC.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241FAC_A08EAC.s index 269d5820c9..ee85014025 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241FAC_A08EAC.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241FAC_A08EAC.s @@ -49,7 +49,7 @@ glabel func_80241FAC_A08EAC /* A08F5C 8024205C 240502C1 */ addiu $a1, $zero, 0x2c1 /* A08F60 80242060 4600010D */ trunc.w.s $f4, $f0 /* A08F64 80242064 44022000 */ mfc1 $v0, $f4 -/* A08F68 80242068 00000000 */ nop +/* A08F68 80242068 00000000 */ nop /* A08F6C 8024206C A6220012 */ sh $v0, 0x12($s1) /* A08F70 80242070 C6000040 */ lwc1 $f0, 0x40($s0) /* A08F74 80242074 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802420D4_A08FD4.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802420D4_A08FD4.s index a4bcdbc04f..16234173ea 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802420D4_A08FD4.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802420D4_A08FD4.s @@ -28,7 +28,7 @@ glabel func_802420D4_A08FD4 /* A09030 80242130 A602008E */ sh $v0, 0x8e($s0) /* A09034 80242134 00021400 */ sll $v0, $v0, 0x10 /* A09038 80242138 1C40000F */ bgtz $v0, .L80242178 -/* A0903C 8024213C 00000000 */ nop +/* A0903C 8024213C 00000000 */ nop /* A09040 80242140 3C013E99 */ lui $at, 0x3e99 /* A09044 80242144 3421999A */ ori $at, $at, 0x999a /* A09048 80242148 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80242190_A09090.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80242190_A09090.s index 51e6257b0d..4651907d1c 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80242190_A09090.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80242190_A09090.s @@ -55,7 +55,7 @@ glabel func_80242190_A09090 .L80242258: /* A09158 80242258 C600003C */ lwc1 $f0, 0x3c($s0) /* A0915C 8024225C 4602003C */ c.lt.s $f0, $f2 -/* A09160 80242260 00000000 */ nop +/* A09160 80242260 00000000 */ nop /* A09164 80242264 45010009 */ bc1t .L8024228C /* A09168 80242268 2402000A */ addiu $v0, $zero, 0xa /* A0916C 8024226C A602008E */ sh $v0, 0x8e($s0) diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s index 484fbccdb0..ecab799d59 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s @@ -57,7 +57,7 @@ glabel func_802422EC_A091EC /* A092B8 802423B8 8E4300B0 */ lw $v1, 0xb0($s2) /* A092BC 802423BC 30620004 */ andi $v0, $v1, 4 /* A092C0 802423C0 10400007 */ beqz $v0, .L802423E0 -/* A092C4 802423C4 00000000 */ nop +/* A092C4 802423C4 00000000 */ nop /* A092C8 802423C8 824200B4 */ lb $v0, 0xb4($s2) /* A092CC 802423CC 14400052 */ bnez $v0, .L80242518 /* A092D0 802423D0 0000102D */ daddu $v0, $zero, $zero @@ -69,15 +69,17 @@ glabel func_802422EC_A091EC /* A092E4 802423E4 2C620010 */ sltiu $v0, $v1, 0x10 /* A092E8 802423E8 1040004A */ beqz $v0, .L80242514 /* A092EC 802423EC 00031080 */ sll $v0, $v1, 2 -/* A092F0 802423F0 3C018024 */ lui $at, %hi(D_80244DA8) +/* A092F0 802423F0 3C018024 */ lui $at, %hi(jtbl_80244DA8_A0BCA8) /* A092F4 802423F4 00220821 */ addu $at, $at, $v0 -/* A092F8 802423F8 8C224DA8 */ lw $v0, %lo(D_80244DA8)($at) +/* A092F8 802423F8 8C224DA8 */ lw $v0, %lo(jtbl_80244DA8_A0BCA8)($at) /* A092FC 802423FC 00400008 */ jr $v0 -/* A09300 80242400 00000000 */ nop +/* A09300 80242400 00000000 */ nop +glabel L80242404_A09304 /* A09304 80242404 0260202D */ daddu $a0, $s3, $zero /* A09308 80242408 0200282D */ daddu $a1, $s0, $zero /* A0930C 8024240C 0C0902AD */ jal func_80240AB4_A079B4 /* A09310 80242410 0280302D */ daddu $a2, $s4, $zero +glabel L80242414_A09314 /* A09314 80242414 0260202D */ daddu $a0, $s3, $zero /* A09318 80242418 0200282D */ daddu $a1, $s0, $zero /* A0931C 8024241C 0C090319 */ jal func_80240C64_A07B64 @@ -86,10 +88,12 @@ glabel func_802422EC_A091EC /* A09328 80242428 24020002 */ addiu $v0, $zero, 2 /* A0932C 8024242C 1462003A */ bne $v1, $v0, .L80242518 /* A09330 80242430 0000102D */ daddu $v0, $zero, $zero +glabel L80242434_A09334 /* A09334 80242434 0260202D */ daddu $a0, $s3, $zero /* A09338 80242438 0200282D */ daddu $a1, $s0, $zero /* A0933C 8024243C 0C0904A3 */ jal nok_15_UnkNpcAIFunc1 /* A09340 80242440 0280302D */ daddu $a2, $s4, $zero +glabel L80242444_A09344 /* A09344 80242444 0260202D */ daddu $a0, $s3, $zero /* A09348 80242448 0200282D */ daddu $a1, $s0, $zero /* A0934C 8024244C 0C0904D3 */ jal func_8024134C_A0824C @@ -98,6 +102,7 @@ glabel func_802422EC_A091EC /* A09358 80242458 2402000A */ addiu $v0, $zero, 0xa /* A0935C 8024245C 1462002E */ bne $v1, $v0, .L80242518 /* A09360 80242460 0000102D */ daddu $v0, $zero, $zero +glabel L80242464_A09364 /* A09364 80242464 0260202D */ daddu $a0, $s3, $zero /* A09368 80242468 0200282D */ daddu $a1, $s0, $zero /* A0936C 8024246C 0C0905A4 */ jal func_80241690_A08590 @@ -106,6 +111,7 @@ glabel func_802422EC_A091EC /* A09378 80242478 2402000B */ addiu $v0, $zero, 0xb /* A0937C 8024247C 14620026 */ bne $v1, $v0, .L80242518 /* A09380 80242480 0000102D */ daddu $v0, $zero, $zero +glabel L80242484_A09384 /* A09384 80242484 0260202D */ daddu $a0, $s3, $zero /* A09388 80242488 0200282D */ daddu $a1, $s0, $zero /* A0938C 8024248C 0C0905C2 */ jal func_80241708_A08608 @@ -114,6 +120,7 @@ glabel func_802422EC_A091EC /* A09398 80242498 2402000C */ addiu $v0, $zero, 0xc /* A0939C 8024249C 1462001E */ bne $v1, $v0, .L80242518 /* A093A0 802424A0 0000102D */ daddu $v0, $zero, $zero +glabel L802424A4_A093A4 /* A093A4 802424A4 0260202D */ daddu $a0, $s3, $zero /* A093A8 802424A8 0200282D */ daddu $a1, $s0, $zero /* A093AC 802424AC 0C0907EB */ jal func_80241FAC_A08EAC @@ -122,6 +129,7 @@ glabel func_802422EC_A091EC /* A093B8 802424B8 2402000D */ addiu $v0, $zero, 0xd /* A093BC 802424BC 14620016 */ bne $v1, $v0, .L80242518 /* A093C0 802424C0 0000102D */ daddu $v0, $zero, $zero +glabel L802424C4_A093C4 /* A093C4 802424C4 0260202D */ daddu $a0, $s3, $zero /* A093C8 802424C8 0200282D */ daddu $a1, $s0, $zero /* A093CC 802424CC 0C090835 */ jal func_802420D4_A08FD4 @@ -130,6 +138,7 @@ glabel func_802422EC_A091EC /* A093D8 802424D8 2402000E */ addiu $v0, $zero, 0xe /* A093DC 802424DC 1462000E */ bne $v1, $v0, .L80242518 /* A093E0 802424E0 0000102D */ daddu $v0, $zero, $zero +glabel L802424E4_A093E4 /* A093E4 802424E4 0260202D */ daddu $a0, $s3, $zero /* A093E8 802424E8 0200282D */ daddu $a1, $s0, $zero /* A093EC 802424EC 0C090864 */ jal func_80242190_A09090 @@ -138,11 +147,13 @@ glabel func_802422EC_A091EC /* A093F8 802424F8 2402000F */ addiu $v0, $zero, 0xf /* A093FC 802424FC 14620006 */ bne $v1, $v0, .L80242518 /* A09400 80242500 0000102D */ daddu $v0, $zero, $zero +glabel L80242504_A09404 /* A09404 80242504 0260202D */ daddu $a0, $s3, $zero /* A09408 80242508 0200282D */ daddu $a1, $s0, $zero /* A0940C 8024250C 0C0908AA */ jal nok_15_UnkDurationCheck /* A09410 80242510 0280302D */ daddu $a2, $s4, $zero .L80242514: +glabel L80242514_A09414 /* A09414 80242514 0000102D */ daddu $v0, $zero, $zero .L80242518: /* A09418 80242518 8FBF0048 */ lw $ra, 0x48($sp) @@ -154,4 +165,4 @@ glabel func_802422EC_A091EC /* A09430 80242530 8FB00030 */ lw $s0, 0x30($sp) /* A09434 80242534 03E00008 */ jr $ra /* A09438 80242538 27BD0050 */ addiu $sp, $sp, 0x50 -/* A0943C 8024253C 00000000 */ nop +/* A0943C 8024253C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240038_BBD1D8.s b/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240038_BBD1D8.s index de1cd69492..8d764beed8 100644 --- a/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240038_BBD1D8.s +++ b/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240038_BBD1D8.s @@ -9,9 +9,9 @@ glabel func_80240038_BBD1D8 /* BBD1E8 80240048 8C450000 */ lw $a1, ($v0) /* BBD1EC 8024004C 4600008D */ trunc.w.s $f2, $f0 /* BBD1F0 80240050 44021000 */ mfc1 $v0, $f2 -/* BBD1F4 80240054 00000000 */ nop +/* BBD1F4 80240054 00000000 */ nop /* BBD1F8 80240058 44820000 */ mtc1 $v0, $f0 -/* BBD1FC 8024005C 00000000 */ nop +/* BBD1FC 8024005C 00000000 */ nop /* BBD200 80240060 46800020 */ cvt.s.w $f0, $f0 /* BBD204 80240064 8FBF0010 */ lw $ra, 0x10($sp) /* BBD208 80240068 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240098_BBD238.s b/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240098_BBD238.s index d279883618..1cff12b478 100644 --- a/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240098_BBD238.s +++ b/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240098_BBD238.s @@ -77,11 +77,12 @@ glabel func_80240098_BBD238 /* BBD34C 802401AC 2C62000C */ sltiu $v0, $v1, 0xc /* BBD350 802401B0 10400076 */ beqz $v0, .L8024038C /* BBD354 802401B4 00031080 */ sll $v0, $v1, 2 -/* BBD358 802401B8 3C018024 */ lui $at, %hi(D_802458C0) +/* BBD358 802401B8 3C018024 */ lui $at, %hi(jtbl_802458C0_BC2A60) /* BBD35C 802401BC 00220821 */ addu $at, $at, $v0 -/* BBD360 802401C0 8C2258C0 */ lw $v0, %lo(D_802458C0)($at) +/* BBD360 802401C0 8C2258C0 */ lw $v0, %lo(jtbl_802458C0_BC2A60)($at) /* BBD364 802401C4 00400008 */ jr $v0 -/* BBD368 802401C8 00000000 */ nop +/* BBD368 802401C8 00000000 */ nop +glabel L802401CC_BBD36C /* BBD36C 802401CC 8E220008 */ lw $v0, 8($s1) /* BBD370 802401D0 8C420004 */ lw $v0, 4($v0) /* BBD374 802401D4 1040006D */ beqz $v0, .L8024038C @@ -102,6 +103,7 @@ glabel func_80240098_BBD238 /* BBD3B0 80240210 AE230000 */ sw $v1, ($s1) /* BBD3B4 80240214 080900E3 */ j .L8024038C /* BBD3B8 80240218 AE820070 */ sw $v0, 0x70($s4) +glabel L8024021C_BBD3BC /* BBD3BC 8024021C 8E220004 */ lw $v0, 4($s1) /* BBD3C0 80240220 2403FFFF */ addiu $v1, $zero, -1 /* BBD3C4 80240224 2442FFFF */ addiu $v0, $v0, -1 @@ -110,33 +112,35 @@ glabel func_80240098_BBD238 /* BBD3D0 80240230 24020002 */ addiu $v0, $zero, 2 /* BBD3D4 80240234 080900E3 */ j .L8024038C /* BBD3D8 80240238 AE820070 */ sw $v0, 0x70($s4) +glabel L8024023C_BBD3DC /* BBD3DC 8024023C C6200010 */ lwc1 $f0, 0x10($s1) /* BBD3E0 80240240 3C01BFBB */ lui $at, 0xbfbb /* BBD3E4 80240244 3421BBBC */ ori $at, $at, 0xbbbc /* BBD3E8 80240248 44811000 */ mtc1 $at, $f2 -/* BBD3EC 8024024C 00000000 */ nop +/* BBD3EC 8024024C 00000000 */ nop /* BBD3F0 80240250 46020000 */ add.s $f0, $f0, $f2 /* BBD3F4 80240254 3C01C35C */ lui $at, 0xc35c /* BBD3F8 80240258 44811000 */ mtc1 $at, $f2 -/* BBD3FC 8024025C 00000000 */ nop +/* BBD3FC 8024025C 00000000 */ nop /* BBD400 80240260 4602003C */ c.lt.s $f0, $f2 -/* BBD404 80240264 00000000 */ nop +/* BBD404 80240264 00000000 */ nop /* BBD408 80240268 45000048 */ bc1f .L8024038C /* BBD40C 8024026C E6200010 */ swc1 $f0, 0x10($s1) /* BBD410 80240270 24020003 */ addiu $v0, $zero, 3 /* BBD414 80240274 E6220010 */ swc1 $f2, 0x10($s1) /* BBD418 80240278 080900E3 */ j .L8024038C /* BBD41C 8024027C AE820070 */ sw $v0, 0x70($s4) +glabel L80240280_BBD420 /* BBD420 80240280 C6200018 */ lwc1 $f0, 0x18($s1) /* BBD424 80240284 3C013D88 */ lui $at, 0x3d88 /* BBD428 80240288 34218889 */ ori $at, $at, 0x8889 /* BBD42C 8024028C 44811000 */ mtc1 $at, $f2 -/* BBD430 80240290 00000000 */ nop +/* BBD430 80240290 00000000 */ nop /* BBD434 80240294 46020001 */ sub.s $f0, $f0, $f2 /* BBD438 80240298 44801000 */ mtc1 $zero, $f2 -/* BBD43C 8024029C 00000000 */ nop +/* BBD43C 8024029C 00000000 */ nop /* BBD440 802402A0 4602003C */ c.lt.s $f0, $f2 -/* BBD444 802402A4 00000000 */ nop +/* BBD444 802402A4 00000000 */ nop /* BBD448 802402A8 45000038 */ bc1f .L8024038C /* BBD44C 802402AC E6200018 */ swc1 $f0, 0x18($s1) /* BBD450 802402B0 24020004 */ addiu $v0, $zero, 4 @@ -148,6 +152,7 @@ glabel func_80240098_BBD238 /* BBD468 802402C8 34420004 */ ori $v0, $v0, 4 /* BBD46C 802402CC 080900E3 */ j .L8024038C /* BBD470 802402D0 AE220000 */ sw $v0, ($s1) +glabel L802402D4_BBD474 /* BBD474 802402D4 8E220004 */ lw $v0, 4($s1) /* BBD478 802402D8 2403FFFF */ addiu $v1, $zero, -1 /* BBD47C 802402DC 2442FFFF */ addiu $v0, $v0, -1 @@ -156,6 +161,7 @@ glabel func_80240098_BBD238 /* BBD488 802402E8 2402000B */ addiu $v0, $zero, 0xb /* BBD48C 802402EC 080900E3 */ j .L8024038C /* BBD490 802402F0 AE820070 */ sw $v0, 0x70($s4) +glabel L802402F4_BBD494 /* BBD494 802402F4 0000202D */ daddu $a0, $zero, $zero /* BBD498 802402F8 2403FFFB */ addiu $v1, $zero, -5 /* BBD49C 802402FC C6200010 */ lwc1 $f0, 0x10($s1) @@ -167,7 +173,7 @@ glabel func_80240098_BBD238 /* BBD4B4 80240314 00431024 */ and $v0, $v0, $v1 /* BBD4B8 80240318 AE220000 */ sw $v0, ($s1) /* BBD4BC 8024031C 4600203E */ c.le.s $f4, $f0 -/* BBD4C0 80240320 00000000 */ nop +/* BBD4C0 80240320 00000000 */ nop /* BBD4C4 80240324 45000003 */ bc1f .L80240334 /* BBD4C8 80240328 E6200010 */ swc1 $f0, 0x10($s1) /* BBD4CC 8024032C E6240010 */ swc1 $f4, 0x10($s1) @@ -177,10 +183,10 @@ glabel func_80240098_BBD238 /* BBD4D8 80240338 3C013E4C */ lui $at, 0x3e4c /* BBD4DC 8024033C 3421CCCD */ ori $at, $at, 0xcccd /* BBD4E0 80240340 44811000 */ mtc1 $at, $f2 -/* BBD4E4 80240344 00000000 */ nop +/* BBD4E4 80240344 00000000 */ nop /* BBD4E8 80240348 46020001 */ sub.s $f0, $f0, $f2 /* BBD4EC 8024034C 4604003C */ c.lt.s $f0, $f4 -/* BBD4F0 80240350 00000000 */ nop +/* BBD4F0 80240350 00000000 */ nop /* BBD4F4 80240354 45000007 */ bc1f .L80240374 /* BBD4F8 80240358 E6200018 */ swc1 $f0, 0x18($s1) /* BBD4FC 8024035C 24840001 */ addiu $a0, $a0, 1 @@ -192,15 +198,16 @@ glabel func_80240098_BBD238 .L80240374: /* BBD514 80240374 24020002 */ addiu $v0, $zero, 2 /* BBD518 80240378 14820004 */ bne $a0, $v0, .L8024038C -/* BBD51C 8024037C 00000000 */ nop +/* BBD51C 8024037C 00000000 */ nop /* BBD520 80240380 8E220008 */ lw $v0, 8($s1) /* BBD524 80240384 AC400004 */ sw $zero, 4($v0) /* BBD528 80240388 AE800070 */ sw $zero, 0x70($s4) .L8024038C: +glabel L8024038C_BBD52C /* BBD52C 8024038C 8E220000 */ lw $v0, ($s1) /* BBD530 80240390 30420001 */ andi $v0, $v0, 1 /* BBD534 80240394 10400020 */ beqz $v0, .L80240418 -/* BBD538 80240398 00000000 */ nop +/* BBD538 80240398 00000000 */ nop /* BBD53C 8024039C C620000C */ lwc1 $f0, 0xc($s1) /* BBD540 802403A0 3C014066 */ lui $at, 0x4066 /* BBD544 802403A4 34216666 */ ori $at, $at, 0x6666 @@ -215,19 +222,19 @@ glabel func_80240098_BBD238 /* BBD568 802403C8 C6220018 */ lwc1 $f2, 0x18($s1) /* BBD56C 802403CC 46062032 */ c.eq.s $f4, $f6 /* BBD570 802403D0 46020502 */ mul.s $f20, $f0, $f2 -/* BBD574 802403D4 00000000 */ nop +/* BBD574 802403D4 00000000 */ nop /* BBD578 802403D8 45000005 */ bc1f .L802403F0 -/* BBD57C 802403DC 00000000 */ nop +/* BBD57C 802403DC 00000000 */ nop /* BBD580 802403E0 3C013F80 */ lui $at, 0x3f80 /* BBD584 802403E4 44810000 */ mtc1 $at, $f0 -/* BBD588 802403E8 00000000 */ nop +/* BBD588 802403E8 00000000 */ nop /* BBD58C 802403EC E6200014 */ swc1 $f0, 0x14($s1) .L802403F0: /* BBD590 802403F0 C6200014 */ lwc1 $f0, 0x14($s1) /* BBD594 802403F4 4600A002 */ mul.s $f0, $f20, $f0 -/* BBD598 802403F8 00000000 */ nop +/* BBD598 802403F8 00000000 */ nop /* BBD59C 802403FC 4606003E */ c.le.s $f0, $f6 -/* BBD5A0 80240400 00000000 */ nop +/* BBD5A0 80240400 00000000 */ nop /* BBD5A4 80240404 45000003 */ bc1f .L80240414 /* BBD5A8 80240408 2404009D */ addiu $a0, $zero, 0x9d /* BBD5AC 8024040C 0C052736 */ jal play_sound_at_player @@ -237,10 +244,10 @@ glabel func_80240098_BBD238 .L80240418: /* BBD5B8 80240418 8E820078 */ lw $v0, 0x78($s4) /* BBD5BC 8024041C 14400013 */ bnez $v0, .L8024046C -/* BBD5C0 80240420 00000000 */ nop +/* BBD5C0 80240420 00000000 */ nop /* BBD5C4 80240424 C6200010 */ lwc1 $f0, 0x10($s1) /* BBD5C8 80240428 46160032 */ c.eq.s $f0, $f22 -/* BBD5CC 8024042C 00000000 */ nop +/* BBD5CC 8024042C 00000000 */ nop /* BBD5D0 80240430 45010017 */ bc1t .L80240490 /* BBD5D4 80240434 0280202D */ daddu $a0, $s4, $zero /* BBD5D8 80240438 3C048000 */ lui $a0, 0x8000 @@ -259,7 +266,7 @@ glabel func_80240098_BBD238 .L8024046C: /* BBD60C 8024046C C6200010 */ lwc1 $f0, 0x10($s1) /* BBD610 80240470 46160032 */ c.eq.s $f0, $f22 -/* BBD614 80240474 00000000 */ nop +/* BBD614 80240474 00000000 */ nop /* BBD618 80240478 45000004 */ bc1f .L8024048C /* BBD61C 8024047C 3C048000 */ lui $a0, 0x8000 /* BBD620 80240480 0C05271B */ jal stop_sound @@ -362,21 +369,21 @@ glabel func_80240098_BBD238 /* BBD78C 802405EC 8E220000 */ lw $v0, ($s1) /* BBD790 802405F0 30420002 */ andi $v0, $v0, 2 /* BBD794 802405F4 10400021 */ beqz $v0, .L8024067C -/* BBD798 802405F8 00000000 */ nop +/* BBD798 802405F8 00000000 */ nop /* BBD79C 802405FC 0C00A8BB */ jal sin_deg /* BBD7A0 80240600 C62C0014 */ lwc1 $f12, 0x14($s1) /* BBD7A4 80240604 C6220010 */ lwc1 $f2, 0x10($s1) /* BBD7A8 80240608 3C014396 */ lui $at, 0x4396 /* BBD7AC 8024060C 4481A000 */ mtc1 $at, $f20 -/* BBD7B0 80240610 00000000 */ nop +/* BBD7B0 80240610 00000000 */ nop /* BBD7B4 80240614 46141081 */ sub.s $f2, $f2, $f20 /* BBD7B8 80240618 46000007 */ neg.s $f0, $f0 /* BBD7BC 8024061C 46020002 */ mul.s $f0, $f0, $f2 -/* BBD7C0 80240620 00000000 */ nop +/* BBD7C0 80240620 00000000 */ nop /* BBD7C4 80240624 3C0143DE */ lui $at, 0x43de /* BBD7C8 80240628 34218000 */ ori $at, $at, 0x8000 /* BBD7CC 8024062C 44811000 */ mtc1 $at, $f2 -/* BBD7D0 80240630 00000000 */ nop +/* BBD7D0 80240630 00000000 */ nop /* BBD7D4 80240634 46020000 */ add.s $f0, $f0, $f2 /* BBD7D8 80240638 E6A00028 */ swc1 $f0, 0x28($s5) /* BBD7DC 8024063C 0C00A8D4 */ jal cos_deg @@ -384,10 +391,10 @@ glabel func_80240098_BBD238 /* BBD7E4 80240644 C6220010 */ lwc1 $f2, 0x10($s1) /* BBD7E8 80240648 46141081 */ sub.s $f2, $f2, $f20 /* BBD7EC 8024064C 46020002 */ mul.s $f0, $f0, $f2 -/* BBD7F0 80240650 00000000 */ nop +/* BBD7F0 80240650 00000000 */ nop /* BBD7F4 80240654 3C014307 */ lui $at, 0x4307 /* BBD7F8 80240658 44811000 */ mtc1 $at, $f2 -/* BBD7FC 8024065C 00000000 */ nop +/* BBD7FC 8024065C 00000000 */ nop /* BBD800 80240660 46020001 */ sub.s $f0, $f0, $f2 /* BBD804 80240664 3C01438B */ lui $at, 0x438b /* BBD808 80240668 34218000 */ ori $at, $at, 0x8000 diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240790_BBD930.s b/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240790_BBD930.s index 9599187db8..67caeb85b3 100644 --- a/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240790_BBD930.s +++ b/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240790_BBD930.s @@ -19,6 +19,6 @@ glabel func_80240790_BBD930 /* BBD968 802407C8 24020002 */ addiu $v0, $zero, 2 /* BBD96C 802407CC 03E00008 */ jr $ra /* BBD970 802407D0 27BD0018 */ addiu $sp, $sp, 0x18 -/* BBD974 802407D4 00000000 */ nop -/* BBD978 802407D8 00000000 */ nop -/* BBD97C 802407DC 00000000 */ nop +/* BBD974 802407D4 00000000 */ nop +/* BBD978 802407D8 00000000 */ nop +/* BBD97C 802407DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_802407E0_BBD980.s b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_802407E0_BBD980.s index add37d95ed..531bbd3a22 100644 --- a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_802407E0_BBD980.s +++ b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_802407E0_BBD980.s @@ -26,7 +26,7 @@ glabel func_802407E0_BBD980 /* BBD9D0 80240830 1440FFFA */ bnez $v0, .L8024081C /* BBD9D4 80240834 24A50004 */ addiu $a1, $a1, 4 /* BBD9D8 80240838 0809021F */ j .L8024087C -/* BBD9DC 8024083C 00000000 */ nop +/* BBD9DC 8024083C 00000000 */ nop .L80240840: /* BBD9E0 80240840 0000182D */ daddu $v1, $zero, $zero /* BBD9E4 80240844 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240BB0_BBDD50.s b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240BB0_BBDD50.s index 664bd4576a..a665d4350d 100644 --- a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240BB0_BBDD50.s +++ b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240BB0_BBDD50.s @@ -28,7 +28,7 @@ glabel func_80240BB0_BBDD50 /* BBDDA4 80240C04 00220821 */ addu $at, $at, $v0 /* BBDDA8 80240C08 AC2058F0 */ sw $zero, %lo(D_802458F0)($at) /* BBDDAC 80240C0C 0809030F */ j .L80240C3C -/* BBDDB0 80240C10 00000000 */ nop +/* BBDDB0 80240C10 00000000 */ nop .L80240C14: /* BBDDB4 80240C14 3C038024 */ lui $v1, %hi(D_802458F0) /* BBDDB8 80240C18 246358F0 */ addiu $v1, $v1, %lo(D_802458F0) diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240F38_BBE0D8.s b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240F38_BBE0D8.s index e743dca863..704e50a3e0 100644 --- a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240F38_BBE0D8.s +++ b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240F38_BBE0D8.s @@ -19,36 +19,36 @@ glabel func_80240F38_BBE0D8 /* BBE10C 80240F6C 10600005 */ beqz $v1, .L80240F84 /* BBE110 80240F70 24020001 */ addiu $v0, $zero, 1 /* BBE114 80240F74 1062002C */ beq $v1, $v0, .L80241028 -/* BBE118 80240F78 00000000 */ nop +/* BBE118 80240F78 00000000 */ nop /* BBE11C 80240F7C 0809041E */ j .L80241078 -/* BBE120 80240F80 00000000 */ nop +/* BBE120 80240F80 00000000 */ nop .L80240F84: /* BBE124 80240F84 0C00A67F */ jal rand_int /* BBE128 80240F88 24040064 */ addiu $a0, $zero, 0x64 /* BBE12C 80240F8C 24040064 */ addiu $a0, $zero, 0x64 /* BBE130 80240F90 244200B4 */ addiu $v0, $v0, 0xb4 /* BBE134 80240F94 44820000 */ mtc1 $v0, $f0 -/* BBE138 80240F98 00000000 */ nop +/* BBE138 80240F98 00000000 */ nop /* BBE13C 80240F9C 46800020 */ cvt.s.w $f0, $f0 /* BBE140 80240FA0 0C00A67F */ jal rand_int /* BBE144 80240FA4 E6200040 */ swc1 $f0, 0x40($s1) /* BBE148 80240FA8 2442FF38 */ addiu $v0, $v0, -0xc8 /* BBE14C 80240FAC 44820000 */ mtc1 $v0, $f0 -/* BBE150 80240FB0 00000000 */ nop +/* BBE150 80240FB0 00000000 */ nop /* BBE154 80240FB4 46800020 */ cvt.s.w $f0, $f0 /* BBE158 80240FB8 0C00A64D */ jal func_80029934 /* BBE15C 80240FBC E620003C */ swc1 $f0, 0x3c($s1) /* BBE160 80240FC0 46000000 */ add.s $f0, $f0, $f0 /* BBE164 80240FC4 3C014000 */ lui $at, 0x4000 /* BBE168 80240FC8 44811000 */ mtc1 $at, $f2 -/* BBE16C 80240FCC 00000000 */ nop +/* BBE16C 80240FCC 00000000 */ nop /* BBE170 80240FD0 46020000 */ add.s $f0, $f0, $f2 /* BBE174 80240FD4 24040064 */ addiu $a0, $zero, 0x64 /* BBE178 80240FD8 0C00A67F */ jal rand_int /* BBE17C 80240FDC E6200018 */ swc1 $f0, 0x18($s1) /* BBE180 80240FE0 28420032 */ slti $v0, $v0, 0x32 /* BBE184 80240FE4 10400007 */ beqz $v0, .L80241004 -/* BBE188 80240FE8 00000000 */ nop +/* BBE188 80240FE8 00000000 */ nop /* BBE18C 80240FEC 3C014466 */ lui $at, 0x4466 /* BBE190 80240FF0 44810000 */ mtc1 $at, $f0 /* BBE194 80240FF4 3C014387 */ lui $at, 0x4387 @@ -74,17 +74,17 @@ glabel func_80240F38_BBE0D8 /* BBE1D8 80241038 C6220038 */ lwc1 $f2, 0x38($s1) /* BBE1DC 8024103C 3C01C1F0 */ lui $at, 0xc1f0 /* BBE1E0 80241040 44810000 */ mtc1 $at, $f0 -/* BBE1E4 80241044 00000000 */ nop +/* BBE1E4 80241044 00000000 */ nop /* BBE1E8 80241048 4600103C */ c.lt.s $f2, $f0 -/* BBE1EC 8024104C 00000000 */ nop +/* BBE1EC 8024104C 00000000 */ nop /* BBE1F0 80241050 45030009 */ bc1tl .L80241078 /* BBE1F4 80241054 AE400074 */ sw $zero, 0x74($s2) /* BBE1F8 80241058 3C014468 */ lui $at, 0x4468 /* BBE1FC 8024105C 34218000 */ ori $at, $at, 0x8000 /* BBE200 80241060 44810000 */ mtc1 $at, $f0 -/* BBE204 80241064 00000000 */ nop +/* BBE204 80241064 00000000 */ nop /* BBE208 80241068 4602003C */ c.lt.s $f0, $f2 -/* BBE20C 8024106C 00000000 */ nop +/* BBE20C 8024106C 00000000 */ nop /* BBE210 80241070 45030001 */ bc1tl .L80241078 /* BBE214 80241074 AE400074 */ sw $zero, 0x74($s2) .L80241078: diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80241094_BBE234.s b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80241094_BBE234.s index 9d376fa1f0..a9a711d9e5 100644 --- a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80241094_BBE234.s +++ b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80241094_BBE234.s @@ -48,4 +48,4 @@ glabel func_80241094_BBE234 /* BBE2D0 80241130 24020002 */ addiu $v0, $zero, 2 /* BBE2D4 80241134 03E00008 */ jr $ra /* BBE2D8 80241138 27BD0020 */ addiu $sp, $sp, 0x20 -/* BBE2DC 8024113C 00000000 */ nop +/* BBE2DC 8024113C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_8024000C_BC2A9C.s b/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_8024000C_BC2A9C.s index 93d72098b3..a8e1f56c28 100644 --- a/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_8024000C_BC2A9C.s +++ b/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_8024000C_BC2A9C.s @@ -17,14 +17,14 @@ glabel func_8024000C_BC2A9C /* BC2ACC 8024003C 10400005 */ beqz $v0, .L80240054 /* BC2AD0 80240040 24020002 */ addiu $v0, $zero, 2 /* BC2AD4 80240044 10600007 */ beqz $v1, .L80240064 -/* BC2AD8 80240048 00000000 */ nop +/* BC2AD8 80240048 00000000 */ nop /* BC2ADC 8024004C 0809005F */ j .L8024017C -/* BC2AE0 80240050 00000000 */ nop +/* BC2AE0 80240050 00000000 */ nop .L80240054: /* BC2AE4 80240054 10620036 */ beq $v1, $v0, .L80240130 -/* BC2AE8 80240058 00000000 */ nop +/* BC2AE8 80240058 00000000 */ nop /* BC2AEC 8024005C 0809005F */ j .L8024017C -/* BC2AF0 80240060 00000000 */ nop +/* BC2AF0 80240060 00000000 */ nop .L80240064: /* BC2AF4 80240064 0C00A67F */ jal rand_int /* BC2AF8 80240068 240400B4 */ addiu $a0, $zero, 0xb4 @@ -38,7 +38,7 @@ glabel func_8024000C_BC2A9C /* BC2B18 80240088 3C0142A0 */ lui $at, 0x42a0 /* BC2B1C 8024008C 44811000 */ mtc1 $at, $f2 /* BC2B20 80240090 44820000 */ mtc1 $v0, $f0 -/* BC2B24 80240094 00000000 */ nop +/* BC2B24 80240094 00000000 */ nop /* BC2B28 80240098 46800020 */ cvt.s.w $f0, $f0 /* BC2B2C 8024009C 46020000 */ add.s $f0, $f0, $f2 /* BC2B30 802400A0 0C00A64D */ jal func_80029934 @@ -46,17 +46,17 @@ glabel func_8024000C_BC2A9C /* BC2B38 802400A8 46000000 */ add.s $f0, $f0, $f0 /* BC2B3C 802400AC 3C014000 */ lui $at, 0x4000 /* BC2B40 802400B0 44811000 */ mtc1 $at, $f2 -/* BC2B44 802400B4 00000000 */ nop +/* BC2B44 802400B4 00000000 */ nop /* BC2B48 802400B8 46020000 */ add.s $f0, $f0, $f2 /* BC2B4C 802400BC 24040064 */ addiu $a0, $zero, 0x64 /* BC2B50 802400C0 0C00A67F */ jal rand_int /* BC2B54 802400C4 E6000018 */ swc1 $f0, 0x18($s0) /* BC2B58 802400C8 28420032 */ slti $v0, $v0, 0x32 /* BC2B5C 802400CC 10400007 */ beqz $v0, .L802400EC -/* BC2B60 802400D0 00000000 */ nop +/* BC2B60 802400D0 00000000 */ nop /* BC2B64 802400D4 3C014387 */ lui $at, 0x4387 /* BC2B68 802400D8 44810000 */ mtc1 $at, $f0 -/* BC2B6C 802400DC 00000000 */ nop +/* BC2B6C 802400DC 00000000 */ nop /* BC2B70 802400E0 E6000038 */ swc1 $f0, 0x38($s0) /* BC2B74 802400E4 08090041 */ j .L80240104 /* BC2B78 802400E8 E600000C */ swc1 $f0, 0xc($s0) @@ -88,16 +88,16 @@ glabel func_8024000C_BC2A9C /* BC2BD0 80240140 C6020038 */ lwc1 $f2, 0x38($s0) /* BC2BD4 80240144 3C01C38C */ lui $at, 0xc38c /* BC2BD8 80240148 44810000 */ mtc1 $at, $f0 -/* BC2BDC 8024014C 00000000 */ nop +/* BC2BDC 8024014C 00000000 */ nop /* BC2BE0 80240150 4600103C */ c.lt.s $f2, $f0 -/* BC2BE4 80240154 00000000 */ nop +/* BC2BE4 80240154 00000000 */ nop /* BC2BE8 80240158 45030008 */ bc1tl .L8024017C /* BC2BEC 8024015C AE200074 */ sw $zero, 0x74($s1) /* BC2BF0 80240160 3C01438C */ lui $at, 0x438c /* BC2BF4 80240164 44810000 */ mtc1 $at, $f0 -/* BC2BF8 80240168 00000000 */ nop +/* BC2BF8 80240168 00000000 */ nop /* BC2BFC 8024016C 4602003C */ c.lt.s $f0, $f2 -/* BC2C00 80240170 00000000 */ nop +/* BC2C00 80240170 00000000 */ nop /* BC2C04 80240174 45030001 */ bc1tl .L8024017C /* BC2C08 80240178 AE200074 */ sw $zero, 0x74($s1) .L8024017C: diff --git a/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_80240194_BC2C24.s b/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_80240194_BC2C24.s index 6327f2d536..9971fc656c 100644 --- a/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_80240194_BC2C24.s +++ b/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_80240194_BC2C24.s @@ -48,4 +48,4 @@ glabel func_80240194_BC2C24 /* BC2CC0 80240230 24020002 */ addiu $v0, $zero, 2 /* BC2CC4 80240234 03E00008 */ jr $ra /* BC2CC8 80240238 27BD0020 */ addiu $sp, $sp, 0x20 -/* BC2CCC 8024023C 00000000 */ nop +/* BC2CCC 8024023C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_02/BC2CD0/func_80240240_BC2CD0.s b/asm/nonmatchings/world/area_obk/obk_02/BC2CD0/func_80240240_BC2CD0.s index 25635eafc0..76ce2c9781 100644 --- a/asm/nonmatchings/world/area_obk/obk_02/BC2CD0/func_80240240_BC2CD0.s +++ b/asm/nonmatchings/world/area_obk/obk_02/BC2CD0/func_80240240_BC2CD0.s @@ -11,13 +11,13 @@ glabel func_80240240_BC2CD0 /* BC2CE8 80240258 46806320 */ cvt.s.w $f12, $f12 /* BC2CEC 8024025C 3C014120 */ lui $at, 0x4120 /* BC2CF0 80240260 44811000 */ mtc1 $at, $f2 -/* BC2CF4 80240264 00000000 */ nop +/* BC2CF4 80240264 00000000 */ nop /* BC2CF8 80240268 46020002 */ mul.s $f0, $f0, $f2 -/* BC2CFC 8024026C 00000000 */ nop +/* BC2CFC 8024026C 00000000 */ nop /* BC2D00 80240270 8E020088 */ lw $v0, 0x88($s0) /* BC2D04 80240274 24420006 */ addiu $v0, $v0, 6 /* BC2D08 80240278 44826000 */ mtc1 $v0, $f12 -/* BC2D0C 8024027C 00000000 */ nop +/* BC2D0C 8024027C 00000000 */ nop /* BC2D10 80240280 46806320 */ cvt.s.w $f12, $f12 /* BC2D14 80240284 4600010D */ trunc.w.s $f4, $f0 /* BC2D18 80240288 0C00A6C9 */ jal clamp_angle @@ -29,4 +29,4 @@ glabel func_80240240_BC2CD0 /* BC2D30 802402A0 24020002 */ addiu $v0, $zero, 2 /* BC2D34 802402A4 03E00008 */ jr $ra /* BC2D38 802402A8 27BD0018 */ addiu $sp, $sp, 0x18 -/* BC2D3C 802402AC 00000000 */ nop +/* BC2D3C 802402AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240170_BC43F0.s b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240170_BC43F0.s index a34d0fd3eb..30665665ec 100644 --- a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240170_BC43F0.s +++ b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240170_BC43F0.s @@ -26,7 +26,7 @@ glabel func_80240170_BC43F0 /* BC4440 802401C0 1440FFFA */ bnez $v0, .L802401AC /* BC4444 802401C4 24A50004 */ addiu $a1, $a1, 4 /* BC4448 802401C8 08090083 */ j .L8024020C -/* BC444C 802401CC 00000000 */ nop +/* BC444C 802401CC 00000000 */ nop .L802401D0: /* BC4450 802401D0 0000182D */ daddu $v1, $zero, $zero /* BC4454 802401D4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240540_BC47C0.s b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240540_BC47C0.s index 1d27668d60..383d67aded 100644 --- a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240540_BC47C0.s +++ b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240540_BC47C0.s @@ -28,7 +28,7 @@ glabel func_80240540_BC47C0 /* BC4814 80240594 00220821 */ addu $at, $at, $v0 /* BC4818 80240598 AC203BE0 */ sw $zero, %lo(D_80243BE0)($at) /* BC481C 8024059C 08090173 */ j .L802405CC -/* BC4820 802405A0 00000000 */ nop +/* BC4820 802405A0 00000000 */ nop .L802405A4: /* BC4824 802405A4 3C038024 */ lui $v1, %hi(D_80243BE0) /* BC4828 802405A8 24633BE0 */ addiu $v1, $v1, %lo(D_80243BE0) diff --git a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_8024089C_BC4B1C.s b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_8024089C_BC4B1C.s index f5db21f426..2dc56e3dee 100644 --- a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_8024089C_BC4B1C.s +++ b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_8024089C_BC4B1C.s @@ -13,5 +13,5 @@ glabel func_8024089C_BC4B1C /* BC4B3C 802408BC 24020002 */ addiu $v0, $zero, 2 /* BC4B40 802408C0 03E00008 */ jr $ra /* BC4B44 802408C4 27BD0018 */ addiu $sp, $sp, 0x18 -/* BC4B48 802408C8 00000000 */ nop -/* BC4B4C 802408CC 00000000 */ nop +/* BC4B48 802408C8 00000000 */ nop +/* BC4B4C 802408CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_03/BC4B50/func_802408D0_BC4B50.s b/asm/nonmatchings/world/area_obk/obk_03/BC4B50/func_802408D0_BC4B50.s index cbe7f8fa56..2c981d0841 100644 --- a/asm/nonmatchings/world/area_obk/obk_03/BC4B50/func_802408D0_BC4B50.s +++ b/asm/nonmatchings/world/area_obk/obk_03/BC4B50/func_802408D0_BC4B50.s @@ -46,12 +46,12 @@ glabel func_802408D0_BC4B50 /* BC4BF0 80240970 10600007 */ beqz $v1, .L80240990 /* BC4BF4 80240974 2402003C */ addiu $v0, $zero, 0x3c /* BC4BF8 80240978 0809037C */ j .L80240DF0 -/* BC4BFC 8024097C 00000000 */ nop +/* BC4BFC 8024097C 00000000 */ nop .L80240980: /* BC4C00 80240980 106200BF */ beq $v1, $v0, .L80240C80 /* BC4C04 80240984 2402003C */ addiu $v0, $zero, 0x3c /* BC4C08 80240988 0809037C */ j .L80240DF0 -/* BC4C0C 8024098C 00000000 */ nop +/* BC4C0C 8024098C 00000000 */ nop .L80240990: /* BC4C10 80240990 86030002 */ lh $v1, 2($s0) /* BC4C14 80240994 50620001 */ beql $v1, $v0, .L8024099C @@ -94,9 +94,9 @@ glabel func_802408D0_BC4B50 /* BC4C98 80240A18 44811000 */ mtc1 $at, $f2 /* BC4C9C 80240A1C 46000005 */ abs.s $f0, $f0 /* BC4CA0 80240A20 4602003C */ c.lt.s $f0, $f2 -/* BC4CA4 80240A24 00000000 */ nop +/* BC4CA4 80240A24 00000000 */ nop /* BC4CA8 80240A28 4500000D */ bc1f .L80240A60 -/* BC4CAC 80240A2C 00000000 */ nop +/* BC4CAC 80240A2C 00000000 */ nop /* BC4CB0 80240A30 C6600028 */ lwc1 $f0, 0x28($s3) /* BC4CB4 80240A34 3C018024 */ lui $at, %hi(D_80243BD0) /* BC4CB8 80240A38 D4223BD0 */ ldc1 $f2, %lo(D_80243BD0)($at) @@ -113,7 +113,7 @@ glabel func_802408D0_BC4B50 /* BC4CE0 80240A60 3C013DCC */ lui $at, 0x3dcc /* BC4CE4 80240A64 3421CCCD */ ori $at, $at, 0xcccd /* BC4CE8 80240A68 44810000 */ mtc1 $at, $f0 -/* BC4CEC 80240A6C 00000000 */ nop +/* BC4CEC 80240A6C 00000000 */ nop /* BC4CF0 80240A70 E6200004 */ swc1 $f0, 4($s1) .L80240A74: /* BC4CF4 80240A74 C6600028 */ lwc1 $f0, 0x28($s3) @@ -121,9 +121,9 @@ glabel func_802408D0_BC4B50 /* BC4CFC 80240A7C D4243BD8 */ ldc1 $f4, %lo(D_80243BD8)($at) /* BC4D00 80240A80 46000021 */ cvt.d.s $f0, $f0 /* BC4D04 80240A84 4624003E */ c.le.d $f0, $f4 -/* BC4D08 80240A88 00000000 */ nop +/* BC4D08 80240A88 00000000 */ nop /* BC4D0C 80240A8C 45000024 */ bc1f .L80240B20 -/* BC4D10 80240A90 00000000 */ nop +/* BC4D10 80240A90 00000000 */ nop /* BC4D14 80240A94 C6200010 */ lwc1 $f0, 0x10($s1) /* BC4D18 80240A98 C6220004 */ lwc1 $f2, 4($s1) /* BC4D1C 80240A9C 46020000 */ add.s $f0, $f0, $f2 @@ -134,14 +134,14 @@ glabel func_802408D0_BC4B50 /* BC4D30 80240AB0 46200020 */ cvt.s.d $f0, $f0 /* BC4D34 80240AB4 46000005 */ abs.s $f0, $f0 /* BC4D38 80240AB8 46000002 */ mul.s $f0, $f0, $f0 -/* BC4D3C 80240ABC 00000000 */ nop +/* BC4D3C 80240ABC 00000000 */ nop /* BC4D40 80240AC0 3C014248 */ lui $at, 0x4248 /* BC4D44 80240AC4 44811000 */ mtc1 $at, $f2 /* BC4D48 80240AC8 3C014170 */ lui $at, 0x4170 /* BC4D4C 80240ACC 44812000 */ mtc1 $at, $f4 /* BC4D50 80240AD0 46020003 */ div.s $f0, $f0, $f2 /* BC4D54 80240AD4 4600203C */ c.lt.s $f4, $f0 -/* BC4D58 80240AD8 00000000 */ nop +/* BC4D58 80240AD8 00000000 */ nop /* BC4D5C 80240ADC 45000002 */ bc1f .L80240AE8 /* BC4D60 80240AE0 E620001C */ swc1 $f0, 0x1c($s1) /* BC4D64 80240AE4 E624001C */ swc1 $f4, 0x1c($s1) @@ -149,13 +149,13 @@ glabel func_802408D0_BC4B50 /* BC4D68 80240AE8 C6220008 */ lwc1 $f2, 8($s1) /* BC4D6C 80240AEC C620001C */ lwc1 $f0, 0x1c($s1) /* BC4D70 80240AF0 4602003C */ c.lt.s $f0, $f2 -/* BC4D74 80240AF4 00000000 */ nop +/* BC4D74 80240AF4 00000000 */ nop /* BC4D78 80240AF8 45000031 */ bc1f .L80240BC0 -/* BC4D7C 80240AFC 00000000 */ nop +/* BC4D7C 80240AFC 00000000 */ nop /* BC4D80 80240B00 C6200004 */ lwc1 $f0, 4($s1) /* BC4D84 80240B04 C6220018 */ lwc1 $f2, 0x18($s1) /* BC4D88 80240B08 46020002 */ mul.s $f0, $f0, $f2 -/* BC4D8C 80240B0C 00000000 */ nop +/* BC4D8C 80240B0C 00000000 */ nop /* BC4D90 80240B10 C6220014 */ lwc1 $f2, 0x14($s1) /* BC4D94 80240B14 46001080 */ add.s $f2, $f2, $f0 /* BC4D98 80240B18 080902F0 */ j .L80240BC0 @@ -174,9 +174,9 @@ glabel func_802408D0_BC4B50 /* BC4DC8 80240B48 46000005 */ abs.s $f0, $f0 /* BC4DCC 80240B4C 46000007 */ neg.s $f0, $f0 /* BC4DD0 80240B50 46020002 */ mul.s $f0, $f0, $f2 -/* BC4DD4 80240B54 00000000 */ nop +/* BC4DD4 80240B54 00000000 */ nop /* BC4DD8 80240B58 46000002 */ mul.s $f0, $f0, $f0 -/* BC4DDC 80240B5C 00000000 */ nop +/* BC4DDC 80240B5C 00000000 */ nop /* BC4DE0 80240B60 3C01C0A0 */ lui $at, 0xc0a0 /* BC4DE4 80240B64 44812000 */ mtc1 $at, $f4 /* BC4DE8 80240B68 3C014248 */ lui $at, 0x4248 @@ -184,7 +184,7 @@ glabel func_802408D0_BC4B50 /* BC4DF0 80240B70 46000007 */ neg.s $f0, $f0 /* BC4DF4 80240B74 46020003 */ div.s $f0, $f0, $f2 /* BC4DF8 80240B78 4604003C */ c.lt.s $f0, $f4 -/* BC4DFC 80240B7C 00000000 */ nop +/* BC4DFC 80240B7C 00000000 */ nop /* BC4E00 80240B80 45000002 */ bc1f .L80240B8C /* BC4E04 80240B84 E620001C */ swc1 $f0, 0x1c($s1) /* BC4E08 80240B88 E624001C */ swc1 $f4, 0x1c($s1) @@ -192,13 +192,13 @@ glabel func_802408D0_BC4B50 /* BC4E0C 80240B8C C6220008 */ lwc1 $f2, 8($s1) /* BC4E10 80240B90 C620001C */ lwc1 $f0, 0x1c($s1) /* BC4E14 80240B94 4600103C */ c.lt.s $f2, $f0 -/* BC4E18 80240B98 00000000 */ nop +/* BC4E18 80240B98 00000000 */ nop /* BC4E1C 80240B9C 45000008 */ bc1f .L80240BC0 -/* BC4E20 80240BA0 00000000 */ nop +/* BC4E20 80240BA0 00000000 */ nop /* BC4E24 80240BA4 C6200004 */ lwc1 $f0, 4($s1) /* BC4E28 80240BA8 C6220018 */ lwc1 $f2, 0x18($s1) /* BC4E2C 80240BAC 46020002 */ mul.s $f0, $f0, $f2 -/* BC4E30 80240BB0 00000000 */ nop +/* BC4E30 80240BB0 00000000 */ nop /* BC4E34 80240BB4 C6220010 */ lwc1 $f2, 0x10($s1) /* BC4E38 80240BB8 46001080 */ add.s $f2, $f2, $f0 /* BC4E3C 80240BBC E6220010 */ swc1 $f2, 0x10($s1) @@ -209,15 +209,15 @@ glabel func_802408D0_BC4B50 /* BC4E4C 80240BCC 44802000 */ mtc1 $zero, $f4 /* BC4E50 80240BD0 460000A1 */ cvt.d.s $f2, $f0 /* BC4E54 80240BD4 4622203C */ c.lt.d $f4, $f2 -/* BC4E58 80240BD8 00000000 */ nop +/* BC4E58 80240BD8 00000000 */ nop /* BC4E5C 80240BDC 4500000F */ bc1f .L80240C1C -/* BC4E60 80240BE0 00000000 */ nop +/* BC4E60 80240BE0 00000000 */ nop /* BC4E64 80240BE4 C6200014 */ lwc1 $f0, 0x14($s1) /* BC4E68 80240BE8 46000021 */ cvt.d.s $f0, $f0 /* BC4E6C 80240BEC 4620203C */ c.lt.d $f4, $f0 -/* BC4E70 80240BF0 00000000 */ nop +/* BC4E70 80240BF0 00000000 */ nop /* BC4E74 80240BF4 45000009 */ bc1f .L80240C1C -/* BC4E78 80240BF8 00000000 */ nop +/* BC4E78 80240BF8 00000000 */ nop /* BC4E7C 80240BFC C6200014 */ lwc1 $f0, 0x14($s1) /* BC4E80 80240C00 46241081 */ sub.d $f2, $f2, $f4 /* BC4E84 80240C04 46000021 */ cvt.d.s $f0, $f0 @@ -236,11 +236,11 @@ glabel func_802408D0_BC4B50 /* BC4EB4 80240C34 46000005 */ abs.s $f0, $f0 /* BC4EB8 80240C38 46000021 */ cvt.d.s $f0, $f0 /* BC4EBC 80240C3C 4620303C */ c.lt.d $f6, $f0 -/* BC4EC0 80240C40 00000000 */ nop +/* BC4EC0 80240C40 00000000 */ nop /* BC4EC4 80240C44 45000063 */ bc1f .L80240DD4 -/* BC4EC8 80240C48 00000000 */ nop +/* BC4EC8 80240C48 00000000 */ nop /* BC4ECC 80240C4C 4602203C */ c.lt.s $f4, $f2 -/* BC4ED0 80240C50 00000000 */ nop +/* BC4ED0 80240C50 00000000 */ nop /* BC4ED4 80240C54 45020006 */ bc1fl .L80240C70 /* BC4ED8 80240C58 46001021 */ cvt.d.s $f0, $f2 /* BC4EDC 80240C5C 46002021 */ cvt.d.s $f0, $f4 @@ -273,13 +273,13 @@ glabel func_802408D0_BC4B50 /* BC4F38 80240CB8 E6200004 */ swc1 $f0, 4($s1) /* BC4F3C 80240CBC C620001C */ lwc1 $f0, 0x1c($s1) /* BC4F40 80240CC0 4604003C */ c.lt.s $f0, $f4 -/* BC4F44 80240CC4 00000000 */ nop +/* BC4F44 80240CC4 00000000 */ nop /* BC4F48 80240CC8 45000008 */ bc1f .L80240CEC /* BC4F4C 80240CCC E6220010 */ swc1 $f2, 0x10($s1) /* BC4F50 80240CD0 C6200004 */ lwc1 $f0, 4($s1) /* BC4F54 80240CD4 C6220018 */ lwc1 $f2, 0x18($s1) /* BC4F58 80240CD8 46020002 */ mul.s $f0, $f0, $f2 -/* BC4F5C 80240CDC 00000000 */ nop +/* BC4F5C 80240CDC 00000000 */ nop /* BC4F60 80240CE0 C6220014 */ lwc1 $f2, 0x14($s1) /* BC4F64 80240CE4 46001080 */ add.s $f2, $f2, $f0 /* BC4F68 80240CE8 E6220014 */ swc1 $f2, 0x14($s1) @@ -290,15 +290,15 @@ glabel func_802408D0_BC4B50 /* BC4F78 80240CF8 44802000 */ mtc1 $zero, $f4 /* BC4F7C 80240CFC 460000A1 */ cvt.d.s $f2, $f0 /* BC4F80 80240D00 4622203C */ c.lt.d $f4, $f2 -/* BC4F84 80240D04 00000000 */ nop +/* BC4F84 80240D04 00000000 */ nop /* BC4F88 80240D08 4500000F */ bc1f .L80240D48 -/* BC4F8C 80240D0C 00000000 */ nop +/* BC4F8C 80240D0C 00000000 */ nop /* BC4F90 80240D10 C6200014 */ lwc1 $f0, 0x14($s1) /* BC4F94 80240D14 46000021 */ cvt.d.s $f0, $f0 /* BC4F98 80240D18 4620203C */ c.lt.d $f4, $f0 -/* BC4F9C 80240D1C 00000000 */ nop +/* BC4F9C 80240D1C 00000000 */ nop /* BC4FA0 80240D20 45000009 */ bc1f .L80240D48 -/* BC4FA4 80240D24 00000000 */ nop +/* BC4FA4 80240D24 00000000 */ nop /* BC4FA8 80240D28 C6200014 */ lwc1 $f0, 0x14($s1) /* BC4FAC 80240D2C 46241081 */ sub.d $f2, $f2, $f4 /* BC4FB0 80240D30 46000021 */ cvt.d.s $f0, $f0 @@ -317,11 +317,11 @@ glabel func_802408D0_BC4B50 /* BC4FE0 80240D60 46000005 */ abs.s $f0, $f0 /* BC4FE4 80240D64 46000021 */ cvt.d.s $f0, $f0 /* BC4FE8 80240D68 4620303C */ c.lt.d $f6, $f0 -/* BC4FEC 80240D6C 00000000 */ nop +/* BC4FEC 80240D6C 00000000 */ nop /* BC4FF0 80240D70 4500000D */ bc1f .L80240DA8 -/* BC4FF4 80240D74 00000000 */ nop +/* BC4FF4 80240D74 00000000 */ nop /* BC4FF8 80240D78 4602203C */ c.lt.s $f4, $f2 -/* BC4FFC 80240D7C 00000000 */ nop +/* BC4FFC 80240D7C 00000000 */ nop /* BC5000 80240D80 45020006 */ bc1fl .L80240D9C /* BC5004 80240D84 46001021 */ cvt.d.s $f0, $f2 /* BC5008 80240D88 46002021 */ cvt.d.s $f0, $f4 @@ -338,7 +338,7 @@ glabel func_802408D0_BC4B50 /* BC502C 80240DAC 04410008 */ bgez $v0, .L80240DD0 /* BC5030 80240DB0 2442FFFF */ addiu $v0, $v0, -1 /* BC5034 80240DB4 44800000 */ mtc1 $zero, $f0 -/* BC5038 80240DB8 00000000 */ nop +/* BC5038 80240DB8 00000000 */ nop /* BC503C 80240DBC E6200014 */ swc1 $f0, 0x14($s1) /* BC5040 80240DC0 E6200010 */ swc1 $f0, 0x10($s1) /* BC5044 80240DC4 E6200000 */ swc1 $f0, ($s1) @@ -358,9 +358,9 @@ glabel func_802408D0_BC4B50 /* BC5070 80240DF0 C6220008 */ lwc1 $f2, 8($s1) /* BC5074 80240DF4 3C01C0E0 */ lui $at, 0xc0e0 /* BC5078 80240DF8 44810000 */ mtc1 $at, $f0 -/* BC507C 80240DFC 00000000 */ nop +/* BC507C 80240DFC 00000000 */ nop /* BC5080 80240E00 4600103E */ c.le.s $f2, $f0 -/* BC5084 80240E04 00000000 */ nop +/* BC5084 80240E04 00000000 */ nop /* BC5088 80240E08 45000013 */ bc1f .L80240E58 /* BC508C 80240E0C 2410FFFF */ addiu $s0, $zero, -1 /* BC5090 80240E10 8E420078 */ lw $v0, 0x78($s2) @@ -386,7 +386,7 @@ glabel func_802408D0_BC4B50 .L80240E5C: /* BC50DC 80240E5C C6200008 */ lwc1 $f0, 8($s1) /* BC50E0 80240E60 46000002 */ mul.s $f0, $f0, $f0 -/* BC50E4 80240E64 00000000 */ nop +/* BC50E4 80240E64 00000000 */ nop /* BC50E8 80240E68 3C0142B4 */ lui $at, 0x42b4 /* BC50EC 80240E6C 44811000 */ mtc1 $at, $f2 /* BC50F0 80240E70 24040081 */ addiu $a0, $zero, 0x81 @@ -482,6 +482,6 @@ glabel func_802408D0_BC4B50 /* BC5258 80240FD8 0000102D */ daddu $v0, $zero, $zero /* BC525C 80240FDC 03E00008 */ jr $ra /* BC5260 80240FE0 27BD0090 */ addiu $sp, $sp, 0x90 -/* BC5264 80240FE4 00000000 */ nop -/* BC5268 80240FE8 00000000 */ nop -/* BC526C 80240FEC 00000000 */ nop +/* BC5264 80240FE4 00000000 */ nop +/* BC5268 80240FE8 00000000 */ nop +/* BC526C 80240FEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_04/BC7E60/func_80240000_BC7E60.s b/asm/nonmatchings/world/area_obk/obk_04/BC7E60/func_80240000_BC7E60.s index be2de68a8c..71ce31a4e5 100644 --- a/asm/nonmatchings/world/area_obk/obk_04/BC7E60/func_80240000_BC7E60.s +++ b/asm/nonmatchings/world/area_obk/obk_04/BC7E60/func_80240000_BC7E60.s @@ -19,6 +19,6 @@ glabel func_80240000_BC7E60 /* BC7E98 80240038 24020002 */ addiu $v0, $zero, 2 /* BC7E9C 8024003C 03E00008 */ jr $ra /* BC7EA0 80240040 27BD0018 */ addiu $sp, $sp, 0x18 -/* BC7EA4 80240044 00000000 */ nop -/* BC7EA8 80240048 00000000 */ nop -/* BC7EAC 8024004C 00000000 */ nop +/* BC7EA4 80240044 00000000 */ nop +/* BC7EA8 80240048 00000000 */ nop +/* BC7EAC 8024004C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802400D0_BC7F30.s b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802400D0_BC7F30.s index 1cde28976d..a16bedd9ad 100644 --- a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802400D0_BC7F30.s +++ b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802400D0_BC7F30.s @@ -9,16 +9,16 @@ glabel func_802400D0_BC7F30 /* BC7F40 802400E0 C602000C */ lwc1 $f2, 0xc($s0) /* BC7F44 802400E4 3C0143AA */ lui $at, 0x43aa /* BC7F48 802400E8 44810000 */ mtc1 $at, $f0 -/* BC7F4C 802400EC 00000000 */ nop +/* BC7F4C 802400EC 00000000 */ nop /* BC7F50 802400F0 4602003C */ c.lt.s $f0, $f2 -/* BC7F54 802400F4 00000000 */ nop +/* BC7F54 802400F4 00000000 */ nop /* BC7F58 802400F8 45010008 */ bc1t .L8024011C /* BC7F5C 802400FC 0200202D */ daddu $a0, $s0, $zero /* BC7F60 80240100 3C0141A0 */ lui $at, 0x41a0 /* BC7F64 80240104 44810000 */ mtc1 $at, $f0 -/* BC7F68 80240108 00000000 */ nop +/* BC7F68 80240108 00000000 */ nop /* BC7F6C 8024010C 4600103C */ c.lt.s $f2, $f0 -/* BC7F70 80240110 00000000 */ nop +/* BC7F70 80240110 00000000 */ nop /* BC7F74 80240114 4500000E */ bc1f .L80240150 /* BC7F78 80240118 24020016 */ addiu $v0, $zero, 0x16 .L8024011C: @@ -34,7 +34,7 @@ glabel func_802400D0_BC7F30 /* BC7FA0 80240140 0C00F589 */ jal func_8003D624 /* BC7FA4 80240144 AFA20018 */ sw $v0, 0x18($sp) /* BC7FA8 80240148 08090062 */ j .L80240188 -/* BC7FAC 8024014C 00000000 */ nop +/* BC7FAC 8024014C 00000000 */ nop .L80240150: /* BC7FB0 80240150 A20200AA */ sb $v0, 0xaa($s0) /* BC7FB4 80240154 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) diff --git a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802402A0_BC8100.s b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802402A0_BC8100.s index 20ebb713cd..0b446cc6c1 100644 --- a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802402A0_BC8100.s +++ b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802402A0_BC8100.s @@ -14,7 +14,7 @@ glabel func_802402A0_BC8100 /* BC8124 802402C4 10820007 */ beq $a0, $v0, .L802402E4 /* BC8128 802402C8 0060102D */ daddu $v0, $v1, $zero /* BC812C 802402CC 080900BB */ j .L802402EC -/* BC8130 802402D0 00000000 */ nop +/* BC8130 802402D0 00000000 */ nop .L802402D4: /* BC8134 802402D4 080900BA */ j .L802402E8 /* BC8138 802402D8 24030064 */ addiu $v1, $zero, 0x64 @@ -27,4 +27,4 @@ glabel func_802402A0_BC8100 /* BC8148 802402E8 0060102D */ daddu $v0, $v1, $zero .L802402EC: /* BC814C 802402EC 03E00008 */ jr $ra -/* BC8150 802402F0 00000000 */ nop +/* BC8150 802402F0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802402F4_BC8154.s b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802402F4_BC8154.s index 53e0c0eefb..7bbcf82196 100644 --- a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802402F4_BC8154.s +++ b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802402F4_BC8154.s @@ -27,14 +27,14 @@ glabel func_802402F4_BC8154 /* BC81AC 8024034C 10600015 */ beqz $v1, .L802403A4 /* BC81B0 80240350 0220202D */ daddu $a0, $s1, $zero /* BC81B4 80240354 08090164 */ j .L80240590 -/* BC81B8 80240358 00000000 */ nop +/* BC81B8 80240358 00000000 */ nop .L8024035C: /* BC81BC 8024035C 10620019 */ beq $v1, $v0, .L802403C4 /* BC81C0 80240360 2402000B */ addiu $v0, $zero, 0xb /* BC81C4 80240364 10620025 */ beq $v1, $v0, .L802403FC -/* BC81C8 80240368 00000000 */ nop +/* BC81C8 80240368 00000000 */ nop /* BC81CC 8024036C 08090164 */ j .L80240590 -/* BC81D0 80240370 00000000 */ nop +/* BC81D0 80240370 00000000 */ nop .L80240374: /* BC81D4 80240374 2402000E */ addiu $v0, $zero, 0xe /* BC81D8 80240378 1062005B */ beq $v1, $v0, .L802404E8 @@ -47,13 +47,13 @@ glabel func_802402F4_BC8154 /* BC81F4 80240394 10620079 */ beq $v1, $v0, .L8024057C /* BC81F8 80240398 3C05FD05 */ lui $a1, 0xfd05 /* BC81FC 8024039C 08090164 */ j .L80240590 -/* BC8200 802403A0 00000000 */ nop +/* BC8200 802403A0 00000000 */ nop .L802403A4: /* BC8204 802403A4 3C05FD05 */ lui $a1, 0xfd05 /* BC8208 802403A8 0C0B1EAF */ jal get_variable /* BC820C 802403AC 34A50F81 */ ori $a1, $a1, 0xf81 /* BC8210 802403B0 14520077 */ bne $v0, $s2, .L80240590 -/* BC8214 802403B4 00000000 */ nop +/* BC8214 802403B4 00000000 */ nop /* BC8218 802403B8 AE620000 */ sw $v0, ($s3) /* BC821C 802403BC 08090163 */ j .L8024058C /* BC8220 802403C0 2402000A */ addiu $v0, $zero, 0xa @@ -76,13 +76,13 @@ glabel func_802402F4_BC8154 /* BC825C 802403FC C602003C */ lwc1 $f2, 0x3c($s0) /* BC8260 80240400 3C01C466 */ lui $at, 0xc466 /* BC8264 80240404 44810000 */ mtc1 $at, $f0 -/* BC8268 80240408 00000000 */ nop +/* BC8268 80240408 00000000 */ nop /* BC826C 8024040C 4600103E */ c.le.s $f2, $f0 -/* BC8270 80240410 00000000 */ nop +/* BC8270 80240410 00000000 */ nop /* BC8274 80240414 45000003 */ bc1f .L80240424 -/* BC8278 80240418 00000000 */ nop +/* BC8278 80240418 00000000 */ nop /* BC827C 8024041C 0C090066 */ jal func_80240198_BC7FF8 -/* BC8280 80240420 00000000 */ nop +/* BC8280 80240420 00000000 */ nop .L80240424: /* BC8284 80240424 C600000C */ lwc1 $f0, 0xc($s0) /* BC8288 80240428 3C014000 */ lui $at, 0x4000 @@ -92,13 +92,13 @@ glabel func_802402F4_BC8154 /* BC8298 80240438 C604003C */ lwc1 $f4, 0x3c($s0) /* BC829C 8024043C 3C013F00 */ lui $at, 0x3f00 /* BC82A0 80240440 44811000 */ mtc1 $at, $f2 -/* BC82A4 80240444 00000000 */ nop +/* BC82A4 80240444 00000000 */ nop /* BC82A8 80240448 46022101 */ sub.s $f4, $f4, $f2 /* BC82AC 8024044C 3C01C477 */ lui $at, 0xc477 /* BC82B0 80240450 44811000 */ mtc1 $at, $f2 /* BC82B4 80240454 E600000C */ swc1 $f0, 0xc($s0) /* BC82B8 80240458 4602203E */ c.le.s $f4, $f2 -/* BC82BC 8024045C 00000000 */ nop +/* BC82BC 8024045C 00000000 */ nop /* BC82C0 80240460 4500004B */ bc1f .L80240590 /* BC82C4 80240464 E604003C */ swc1 $f4, 0x3c($s0) /* BC82C8 80240468 0220202D */ daddu $a0, $s1, $zero @@ -107,7 +107,7 @@ glabel func_802402F4_BC8154 /* BC82D4 80240474 0C0B2026 */ jal set_variable /* BC82D8 80240478 24060001 */ addiu $a2, $zero, 1 /* BC82DC 8024047C 0C09008B */ jal func_8024022C_BC808C -/* BC82E0 80240480 00000000 */ nop +/* BC82E0 80240480 00000000 */ nop /* BC82E4 80240484 08090164 */ j .L80240590 /* BC82E8 80240488 AE340074 */ sw $s4, 0x74($s1) .L8024048C: @@ -167,7 +167,7 @@ glabel func_802402F4_BC8154 /* BC83AC 8024054C C6000010 */ lwc1 $f0, 0x10($s0) /* BC83B0 80240550 3C014000 */ lui $at, 0x4000 /* BC83B4 80240554 44811000 */ mtc1 $at, $f2 -/* BC83B8 80240558 00000000 */ nop +/* BC83B8 80240558 00000000 */ nop /* BC83BC 8024055C 46020000 */ add.s $f0, $f0, $f2 .L80240560: /* BC83C0 80240560 C60C000C */ lwc1 $f12, 0xc($s0) @@ -175,7 +175,7 @@ glabel func_802402F4_BC8154 /* BC83C8 80240568 E6000010 */ swc1 $f0, 0x10($s0) .L8024056C: /* BC83CC 8024056C 0C00A6C9 */ jal clamp_angle -/* BC83D0 80240570 00000000 */ nop +/* BC83D0 80240570 00000000 */ nop /* BC83D4 80240574 08090164 */ j .L80240590 /* BC83D8 80240578 E600000C */ swc1 $f0, 0xc($s0) .L8024057C: diff --git a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240624_BC8484.s b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240624_BC8484.s index 9b767bb601..b5b4b338f3 100644 --- a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240624_BC8484.s +++ b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240624_BC8484.s @@ -25,9 +25,9 @@ glabel func_80240624_BC8484 /* BC84D4 80240674 1060000D */ beqz $v1, .L802406AC /* BC84D8 80240678 24020001 */ addiu $v0, $zero, 1 /* BC84DC 8024067C 1062001B */ beq $v1, $v0, .L802406EC -/* BC84E0 80240680 00000000 */ nop +/* BC84E0 80240680 00000000 */ nop /* BC84E4 80240684 0809023A */ j .L802408E8 -/* BC84E8 80240688 00000000 */ nop +/* BC84E8 80240688 00000000 */ nop .L8024068C: /* BC84EC 8024068C 14400096 */ bnez $v0, .L802408E8 /* BC84F0 80240690 2862000F */ slti $v0, $v1, 0xf @@ -36,7 +36,7 @@ glabel func_80240624_BC8484 /* BC84FC 8024069C 1062008C */ beq $v1, $v0, .L802408D0 /* BC8500 802406A0 0260202D */ daddu $a0, $s3, $zero /* BC8504 802406A4 0809023A */ j .L802408E8 -/* BC8508 802406A8 00000000 */ nop +/* BC8508 802406A8 00000000 */ nop .L802406AC: /* BC850C 802406AC C620000C */ lwc1 $f0, 0xc($s1) /* BC8510 802406B0 C66C0078 */ lwc1 $f12, 0x78($s3) @@ -47,7 +47,7 @@ glabel func_80240624_BC8484 /* BC8524 802406C4 8E430000 */ lw $v1, ($s2) /* BC8528 802406C8 24020001 */ addiu $v0, $zero, 1 /* BC852C 802406CC 14620086 */ bne $v1, $v0, .L802408E8 -/* BC8530 802406D0 00000000 */ nop +/* BC8530 802406D0 00000000 */ nop /* BC8534 802406D4 24040014 */ addiu $a0, $zero, 0x14 /* BC8538 802406D8 0C00A67F */ jal rand_int /* BC853C 802406DC AE630074 */ sw $v1, 0x74($s3) @@ -66,7 +66,7 @@ glabel func_80240624_BC8484 /* BC856C 8024070C A602008E */ sh $v0, 0x8e($s0) /* BC8570 80240710 00021400 */ sll $v0, $v0, 0x10 /* BC8574 80240714 14400074 */ bnez $v0, .L802408E8 -/* BC8578 80240718 00000000 */ nop +/* BC8578 80240718 00000000 */ nop /* BC857C 8024071C 3C04B000 */ lui $a0, 0xb000 /* BC8580 80240720 C6000040 */ lwc1 $f0, 0x40($s0) /* BC8584 80240724 3484000F */ ori $a0, $a0, 0xf @@ -92,7 +92,7 @@ glabel func_80240624_BC8484 /* BC85D0 80240770 46006300 */ add.s $f12, $f12, $f0 /* BC85D4 80240774 46000506 */ mov.s $f20, $f0 /* BC85D8 80240778 4406A000 */ mfc1 $a2, $f20 -/* BC85DC 8024077C 00000000 */ nop +/* BC85DC 8024077C 00000000 */ nop /* BC85E0 80240780 AE06000C */ sw $a2, 0xc($s0) /* BC85E4 80240784 C6200038 */ lwc1 $f0, 0x38($s1) /* BC85E8 80240788 E6000038 */ swc1 $f0, 0x38($s0) @@ -105,33 +105,33 @@ glabel func_80240624_BC8484 /* BC8604 802407A4 3C014220 */ lui $at, 0x4220 /* BC8608 802407A8 44810000 */ mtc1 $at, $f0 /* BC860C 802407AC 44822000 */ mtc1 $v0, $f4 -/* BC8610 802407B0 00000000 */ nop +/* BC8610 802407B0 00000000 */ nop /* BC8614 802407B4 46802120 */ cvt.s.w $f4, $f4 /* BC8618 802407B8 46040101 */ sub.s $f4, $f0, $f4 /* BC861C 802407BC 46002103 */ div.s $f4, $f4, $f0 /* BC8620 802407C0 46042282 */ mul.s $f10, $f4, $f4 -/* BC8624 802407C4 00000000 */ nop +/* BC8624 802407C4 00000000 */ nop /* BC8628 802407C8 46045102 */ mul.s $f4, $f10, $f4 -/* BC862C 802407CC 00000000 */ nop +/* BC862C 802407CC 00000000 */ nop /* BC8630 802407D0 C60E0038 */ lwc1 $f14, 0x38($s0) /* BC8634 802407D4 C6080060 */ lwc1 $f8, 0x60($s0) /* BC8638 802407D8 46087201 */ sub.s $f8, $f14, $f8 /* BC863C 802407DC 460A4202 */ mul.s $f8, $f8, $f10 -/* BC8640 802407E0 00000000 */ nop +/* BC8640 802407E0 00000000 */ nop /* BC8644 802407E4 C60C0040 */ lwc1 $f12, 0x40($s0) /* BC8648 802407E8 C6060068 */ lwc1 $f6, 0x68($s0) /* BC864C 802407EC 46066181 */ sub.s $f6, $f12, $f6 /* BC8650 802407F0 460A3182 */ mul.s $f6, $f6, $f10 -/* BC8654 802407F4 00000000 */ nop +/* BC8654 802407F4 00000000 */ nop /* BC8658 802407F8 C622003C */ lwc1 $f2, 0x3c($s1) /* BC865C 802407FC 3C01447A */ lui $at, 0x447a /* BC8660 80240800 44810000 */ mtc1 $at, $f0 -/* BC8664 80240804 00000000 */ nop +/* BC8664 80240804 00000000 */ nop /* BC8668 80240808 46001080 */ add.s $f2, $f2, $f0 /* BC866C 8024080C C6000064 */ lwc1 $f0, 0x64($s0) /* BC8670 80240810 46001001 */ sub.s $f0, $f2, $f0 /* BC8674 80240814 46040002 */ mul.s $f0, $f0, $f4 -/* BC8678 80240818 00000000 */ nop +/* BC8678 80240818 00000000 */ nop /* BC867C 8024081C 9602008E */ lhu $v0, 0x8e($s0) /* BC8680 80240820 24030028 */ addiu $v1, $zero, 0x28 /* BC8684 80240824 24420001 */ addiu $v0, $v0, 1 @@ -174,7 +174,7 @@ glabel func_80240624_BC8484 /* BC8714 802408B4 C620003C */ lwc1 $f0, 0x3c($s1) /* BC8718 802408B8 3C01447A */ lui $at, 0x447a /* BC871C 802408BC 44811000 */ mtc1 $at, $f2 -/* BC8720 802408C0 00000000 */ nop +/* BC8720 802408C0 00000000 */ nop /* BC8724 802408C4 46020000 */ add.s $f0, $f0, $f2 /* BC8728 802408C8 0809023A */ j .L802408E8 /* BC872C 802408CC E600003C */ swc1 $f0, 0x3c($s0) diff --git a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240910_BC8770.s b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240910_BC8770.s index 485926eff4..90b57af81f 100644 --- a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240910_BC8770.s +++ b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240910_BC8770.s @@ -6,12 +6,12 @@ glabel func_80240910_BC8770 /* BC8774 80240914 C422EFF4 */ lwc1 $f2, %lo(gPlayerStatus+0x2C)($at) /* BC8778 80240918 3C01C248 */ lui $at, 0xc248 /* BC877C 8024091C 44810000 */ mtc1 $at, $f0 -/* BC8780 80240920 00000000 */ nop +/* BC8780 80240920 00000000 */ nop /* BC8784 80240924 4600103C */ c.lt.s $f2, $f0 -/* BC8788 80240928 00000000 */ nop +/* BC8788 80240928 00000000 */ nop /* BC878C 8024092C 45010002 */ bc1t .L80240938 /* BC8790 80240930 24020002 */ addiu $v0, $zero, 2 /* BC8794 80240934 0000102D */ daddu $v0, $zero, $zero .L80240938: /* BC8798 80240938 03E00008 */ jr $ra -/* BC879C 8024093C 00000000 */ nop +/* BC879C 8024093C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240940_BC87A0.s b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240940_BC87A0.s index 86581c8ff1..ce4b507cac 100644 --- a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240940_BC87A0.s +++ b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240940_BC87A0.s @@ -26,7 +26,7 @@ glabel func_80240940_BC87A0 /* BC87F0 80240990 1440FFFA */ bnez $v0, .L8024097C /* BC87F4 80240994 24A50004 */ addiu $a1, $a1, 4 /* BC87F8 80240998 08090277 */ j .L802409DC -/* BC87FC 8024099C 00000000 */ nop +/* BC87FC 8024099C 00000000 */ nop .L802409A0: /* BC8800 802409A0 0000182D */ daddu $v1, $zero, $zero /* BC8804 802409A4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240A58_BC88B8.s b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240A58_BC88B8.s index 213063966f..a84e96b5a6 100644 --- a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240A58_BC88B8.s +++ b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240A58_BC88B8.s @@ -41,53 +41,61 @@ glabel func_80240A58_BC88B8 /* BC8948 80240AE8 2C620008 */ sltiu $v0, $v1, 8 /* BC894C 80240AEC 10400039 */ beqz $v0, .L80240BD4 /* BC8950 80240AF0 00031080 */ sll $v0, $v1, 2 -/* BC8954 80240AF4 3C018024 */ lui $at, %hi(D_802451D8) +/* BC8954 80240AF4 3C018024 */ lui $at, %hi(jtbl_802451D8_BCD038) /* BC8958 80240AF8 00220821 */ addu $at, $at, $v0 -/* BC895C 80240AFC 8C2251D8 */ lw $v0, %lo(D_802451D8)($at) +/* BC895C 80240AFC 8C2251D8 */ lw $v0, %lo(jtbl_802451D8_BCD038)($at) /* BC8960 80240B00 00400008 */ jr $v0 -/* BC8964 80240B04 00000000 */ nop +/* BC8964 80240B04 00000000 */ nop +glabel L80240B08_BC8968 /* BC8968 80240B08 0000202D */ daddu $a0, $zero, $zero /* BC896C 80240B0C 3C05FD05 */ lui $a1, 0xfd05 /* BC8970 80240B10 34A50F85 */ ori $a1, $a1, 0xf85 /* BC8974 80240B14 C6E0000C */ lwc1 $f0, 0xc($s7) /* BC8978 80240B18 080902F1 */ j .L80240BC4 /* BC897C 80240B1C 24060001 */ addiu $a2, $zero, 1 +glabel L80240B20_BC8980 /* BC8980 80240B20 0000202D */ daddu $a0, $zero, $zero /* BC8984 80240B24 3C05FD05 */ lui $a1, 0xfd05 /* BC8988 80240B28 34A50F85 */ ori $a1, $a1, 0xf85 /* BC898C 80240B2C C6C0000C */ lwc1 $f0, 0xc($s6) /* BC8990 80240B30 080902F1 */ j .L80240BC4 /* BC8994 80240B34 24060002 */ addiu $a2, $zero, 2 +glabel L80240B38_BC8998 /* BC8998 80240B38 0000202D */ daddu $a0, $zero, $zero /* BC899C 80240B3C 3C05FD05 */ lui $a1, 0xfd05 /* BC89A0 80240B40 34A50F85 */ ori $a1, $a1, 0xf85 /* BC89A4 80240B44 C6A0000C */ lwc1 $f0, 0xc($s5) /* BC89A8 80240B48 080902F1 */ j .L80240BC4 /* BC89AC 80240B4C 24060003 */ addiu $a2, $zero, 3 +glabel L80240B50_BC89B0 /* BC89B0 80240B50 0000202D */ daddu $a0, $zero, $zero /* BC89B4 80240B54 3C05FD05 */ lui $a1, 0xfd05 /* BC89B8 80240B58 34A50F85 */ ori $a1, $a1, 0xf85 /* BC89BC 80240B5C C680000C */ lwc1 $f0, 0xc($s4) /* BC89C0 80240B60 080902F1 */ j .L80240BC4 /* BC89C4 80240B64 24060004 */ addiu $a2, $zero, 4 +glabel L80240B68_BC89C8 /* BC89C8 80240B68 0000202D */ daddu $a0, $zero, $zero /* BC89CC 80240B6C 3C05FD05 */ lui $a1, 0xfd05 /* BC89D0 80240B70 34A50F85 */ ori $a1, $a1, 0xf85 /* BC89D4 80240B74 C660000C */ lwc1 $f0, 0xc($s3) /* BC89D8 80240B78 080902F1 */ j .L80240BC4 /* BC89DC 80240B7C 24060005 */ addiu $a2, $zero, 5 +glabel L80240B80_BC89E0 /* BC89E0 80240B80 0000202D */ daddu $a0, $zero, $zero /* BC89E4 80240B84 3C05FD05 */ lui $a1, 0xfd05 /* BC89E8 80240B88 34A50F85 */ ori $a1, $a1, 0xf85 /* BC89EC 80240B8C C640000C */ lwc1 $f0, 0xc($s2) /* BC89F0 80240B90 080902F1 */ j .L80240BC4 /* BC89F4 80240B94 24060006 */ addiu $a2, $zero, 6 +glabel L80240B98_BC89F8 /* BC89F8 80240B98 0000202D */ daddu $a0, $zero, $zero /* BC89FC 80240B9C 3C05FD05 */ lui $a1, 0xfd05 /* BC8A00 80240BA0 34A50F85 */ ori $a1, $a1, 0xf85 /* BC8A04 80240BA4 C620000C */ lwc1 $f0, 0xc($s1) /* BC8A08 80240BA8 080902F1 */ j .L80240BC4 /* BC8A0C 80240BAC 24060007 */ addiu $a2, $zero, 7 +glabel L80240BB0_BC8A10 /* BC8A10 80240BB0 0000202D */ daddu $a0, $zero, $zero /* BC8A14 80240BB4 3C05FD05 */ lui $a1, 0xfd05 /* BC8A18 80240BB8 34A50F85 */ ori $a1, $a1, 0xf85 diff --git a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240D14_BC8B74.s b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240D14_BC8B74.s index 0af03a642a..8c7f41cece 100644 --- a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240D14_BC8B74.s +++ b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240D14_BC8B74.s @@ -21,34 +21,34 @@ glabel func_80240D14_BC8B74 /* BC8BB4 80240D54 46000106 */ mov.s $f4, $f0 /* BC8BB8 80240D58 3C0142B4 */ lui $at, 0x42b4 /* BC8BBC 80240D5C 44811000 */ mtc1 $at, $f2 -/* BC8BC0 80240D60 00000000 */ nop +/* BC8BC0 80240D60 00000000 */ nop /* BC8BC4 80240D64 4604103C */ c.lt.s $f2, $f4 -/* BC8BC8 80240D68 00000000 */ nop +/* BC8BC8 80240D68 00000000 */ nop /* BC8BCC 80240D6C 45010002 */ bc1t .L80240D78 /* BC8BD0 80240D70 0240882D */ daddu $s1, $s2, $zero /* BC8BD4 80240D74 0000102D */ daddu $v0, $zero, $zero .L80240D78: /* BC8BD8 80240D78 3C014316 */ lui $at, 0x4316 /* BC8BDC 80240D7C 44810000 */ mtc1 $at, $f0 -/* BC8BE0 80240D80 00000000 */ nop +/* BC8BE0 80240D80 00000000 */ nop /* BC8BE4 80240D84 4600203C */ c.lt.s $f4, $f0 -/* BC8BE8 80240D88 00000000 */ nop +/* BC8BE8 80240D88 00000000 */ nop /* BC8BEC 80240D8C 45010002 */ bc1t .L80240D98 /* BC8BF0 80240D90 24030001 */ addiu $v1, $zero, 1 /* BC8BF4 80240D94 0000182D */ daddu $v1, $zero, $zero .L80240D98: /* BC8BF8 80240D98 00431025 */ or $v0, $v0, $v1 /* BC8BFC 80240D9C 1040001C */ beqz $v0, .L80240E10 -/* BC8C00 80240DA0 00000000 */ nop +/* BC8C00 80240DA0 00000000 */ nop /* BC8C04 80240DA4 C64C0028 */ lwc1 $f12, 0x28($s2) /* BC8C08 80240DA8 C64E0030 */ lwc1 $f14, 0x30($s2) /* BC8C0C 80240DAC 4406A000 */ mfc1 $a2, $f20 /* BC8C10 80240DB0 4407A000 */ mfc1 $a3, $f20 /* BC8C14 80240DB4 0C00A720 */ jal atan2 -/* BC8C18 80240DB8 00000000 */ nop +/* BC8C18 80240DB8 00000000 */ nop /* BC8C1C 80240DBC 3C014334 */ lui $at, 0x4334 /* BC8C20 80240DC0 44811000 */ mtc1 $at, $f2 -/* BC8C24 80240DC4 00000000 */ nop +/* BC8C24 80240DC4 00000000 */ nop /* BC8C28 80240DC8 46020000 */ add.s $f0, $f0, $f2 /* BC8C2C 80240DCC 3C0542A0 */ lui $a1, 0x42a0 /* BC8C30 80240DD0 44060000 */ mfc1 $a2, $f0 diff --git a/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_80240050_BCD0B0.s b/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_80240050_BCD0B0.s index 5c06e557f2..dcdf1fdc28 100644 --- a/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_80240050_BCD0B0.s +++ b/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_80240050_BCD0B0.s @@ -46,12 +46,12 @@ glabel func_80240050_BCD0B0 /* BCD150 802400F0 10600007 */ beqz $v1, .L80240110 /* BCD154 802400F4 2402000A */ addiu $v0, $zero, 0xa /* BCD158 802400F8 0809015C */ j .L80240570 -/* BCD15C 802400FC 00000000 */ nop +/* BCD15C 802400FC 00000000 */ nop .L80240100: /* BCD160 80240100 106200BF */ beq $v1, $v0, .L80240400 /* BCD164 80240104 2402000A */ addiu $v0, $zero, 0xa /* BCD168 80240108 0809015C */ j .L80240570 -/* BCD16C 8024010C 00000000 */ nop +/* BCD16C 8024010C 00000000 */ nop .L80240110: /* BCD170 80240110 86030002 */ lh $v1, 2($s0) /* BCD174 80240114 50620001 */ beql $v1, $v0, .L8024011C @@ -94,9 +94,9 @@ glabel func_80240050_BCD0B0 /* BCD1F8 80240198 44811000 */ mtc1 $at, $f2 /* BCD1FC 8024019C 46000005 */ abs.s $f0, $f0 /* BCD200 802401A0 4602003C */ c.lt.s $f0, $f2 -/* BCD204 802401A4 00000000 */ nop +/* BCD204 802401A4 00000000 */ nop /* BCD208 802401A8 4500000D */ bc1f .L802401E0 -/* BCD20C 802401AC 00000000 */ nop +/* BCD20C 802401AC 00000000 */ nop /* BCD210 802401B0 C6600028 */ lwc1 $f0, 0x28($s3) /* BCD214 802401B4 44801000 */ mtc1 $zero, $f2 /* BCD218 802401B8 44801800 */ mtc1 $zero, $f3 @@ -113,7 +113,7 @@ glabel func_80240050_BCD0B0 /* BCD240 802401E0 3C013DCC */ lui $at, 0x3dcc /* BCD244 802401E4 3421CCCD */ ori $at, $at, 0xcccd /* BCD248 802401E8 44810000 */ mtc1 $at, $f0 -/* BCD24C 802401EC 00000000 */ nop +/* BCD24C 802401EC 00000000 */ nop /* BCD250 802401F0 E6200004 */ swc1 $f0, 4($s1) .L802401F4: /* BCD254 802401F4 C6600028 */ lwc1 $f0, 0x28($s3) @@ -121,9 +121,9 @@ glabel func_80240050_BCD0B0 /* BCD25C 802401FC 44802800 */ mtc1 $zero, $f5 /* BCD260 80240200 46000021 */ cvt.d.s $f0, $f0 /* BCD264 80240204 4624003E */ c.le.d $f0, $f4 -/* BCD268 80240208 00000000 */ nop +/* BCD268 80240208 00000000 */ nop /* BCD26C 8024020C 45000024 */ bc1f .L802402A0 -/* BCD270 80240210 00000000 */ nop +/* BCD270 80240210 00000000 */ nop /* BCD274 80240214 C6200010 */ lwc1 $f0, 0x10($s1) /* BCD278 80240218 C6220004 */ lwc1 $f2, 4($s1) /* BCD27C 8024021C 46020000 */ add.s $f0, $f0, $f2 @@ -134,14 +134,14 @@ glabel func_80240050_BCD0B0 /* BCD290 80240230 46200020 */ cvt.s.d $f0, $f0 /* BCD294 80240234 46000005 */ abs.s $f0, $f0 /* BCD298 80240238 46000002 */ mul.s $f0, $f0, $f0 -/* BCD29C 8024023C 00000000 */ nop +/* BCD29C 8024023C 00000000 */ nop /* BCD2A0 80240240 3C014248 */ lui $at, 0x4248 /* BCD2A4 80240244 44811000 */ mtc1 $at, $f2 /* BCD2A8 80240248 3C014170 */ lui $at, 0x4170 /* BCD2AC 8024024C 44812000 */ mtc1 $at, $f4 /* BCD2B0 80240250 46020003 */ div.s $f0, $f0, $f2 /* BCD2B4 80240254 4600203C */ c.lt.s $f4, $f0 -/* BCD2B8 80240258 00000000 */ nop +/* BCD2B8 80240258 00000000 */ nop /* BCD2BC 8024025C 45000002 */ bc1f .L80240268 /* BCD2C0 80240260 E620001C */ swc1 $f0, 0x1c($s1) /* BCD2C4 80240264 E624001C */ swc1 $f4, 0x1c($s1) @@ -149,13 +149,13 @@ glabel func_80240050_BCD0B0 /* BCD2C8 80240268 C6220008 */ lwc1 $f2, 8($s1) /* BCD2CC 8024026C C620001C */ lwc1 $f0, 0x1c($s1) /* BCD2D0 80240270 4602003C */ c.lt.s $f0, $f2 -/* BCD2D4 80240274 00000000 */ nop +/* BCD2D4 80240274 00000000 */ nop /* BCD2D8 80240278 45000031 */ bc1f .L80240340 -/* BCD2DC 8024027C 00000000 */ nop +/* BCD2DC 8024027C 00000000 */ nop /* BCD2E0 80240280 C6200004 */ lwc1 $f0, 4($s1) /* BCD2E4 80240284 C6220018 */ lwc1 $f2, 0x18($s1) /* BCD2E8 80240288 46020002 */ mul.s $f0, $f0, $f2 -/* BCD2EC 8024028C 00000000 */ nop +/* BCD2EC 8024028C 00000000 */ nop /* BCD2F0 80240290 C6220014 */ lwc1 $f2, 0x14($s1) /* BCD2F4 80240294 46001080 */ add.s $f2, $f2, $f0 /* BCD2F8 80240298 080900D0 */ j .L80240340 @@ -174,9 +174,9 @@ glabel func_80240050_BCD0B0 /* BCD328 802402C8 46000005 */ abs.s $f0, $f0 /* BCD32C 802402CC 46000007 */ neg.s $f0, $f0 /* BCD330 802402D0 46020002 */ mul.s $f0, $f0, $f2 -/* BCD334 802402D4 00000000 */ nop +/* BCD334 802402D4 00000000 */ nop /* BCD338 802402D8 46000002 */ mul.s $f0, $f0, $f0 -/* BCD33C 802402DC 00000000 */ nop +/* BCD33C 802402DC 00000000 */ nop /* BCD340 802402E0 3C01C0A0 */ lui $at, 0xc0a0 /* BCD344 802402E4 44812000 */ mtc1 $at, $f4 /* BCD348 802402E8 3C014248 */ lui $at, 0x4248 @@ -184,7 +184,7 @@ glabel func_80240050_BCD0B0 /* BCD350 802402F0 46000007 */ neg.s $f0, $f0 /* BCD354 802402F4 46020003 */ div.s $f0, $f0, $f2 /* BCD358 802402F8 4604003C */ c.lt.s $f0, $f4 -/* BCD35C 802402FC 00000000 */ nop +/* BCD35C 802402FC 00000000 */ nop /* BCD360 80240300 45000002 */ bc1f .L8024030C /* BCD364 80240304 E620001C */ swc1 $f0, 0x1c($s1) /* BCD368 80240308 E624001C */ swc1 $f4, 0x1c($s1) @@ -192,13 +192,13 @@ glabel func_80240050_BCD0B0 /* BCD36C 8024030C C6220008 */ lwc1 $f2, 8($s1) /* BCD370 80240310 C620001C */ lwc1 $f0, 0x1c($s1) /* BCD374 80240314 4600103C */ c.lt.s $f2, $f0 -/* BCD378 80240318 00000000 */ nop +/* BCD378 80240318 00000000 */ nop /* BCD37C 8024031C 45000008 */ bc1f .L80240340 -/* BCD380 80240320 00000000 */ nop +/* BCD380 80240320 00000000 */ nop /* BCD384 80240324 C6200004 */ lwc1 $f0, 4($s1) /* BCD388 80240328 C6220018 */ lwc1 $f2, 0x18($s1) /* BCD38C 8024032C 46020002 */ mul.s $f0, $f0, $f2 -/* BCD390 80240330 00000000 */ nop +/* BCD390 80240330 00000000 */ nop /* BCD394 80240334 C6220010 */ lwc1 $f2, 0x10($s1) /* BCD398 80240338 46001080 */ add.s $f2, $f2, $f0 /* BCD39C 8024033C E6220010 */ swc1 $f2, 0x10($s1) @@ -209,15 +209,15 @@ glabel func_80240050_BCD0B0 /* BCD3AC 8024034C 44802000 */ mtc1 $zero, $f4 /* BCD3B0 80240350 460000A1 */ cvt.d.s $f2, $f0 /* BCD3B4 80240354 4622203C */ c.lt.d $f4, $f2 -/* BCD3B8 80240358 00000000 */ nop +/* BCD3B8 80240358 00000000 */ nop /* BCD3BC 8024035C 4500000F */ bc1f .L8024039C -/* BCD3C0 80240360 00000000 */ nop +/* BCD3C0 80240360 00000000 */ nop /* BCD3C4 80240364 C6200014 */ lwc1 $f0, 0x14($s1) /* BCD3C8 80240368 46000021 */ cvt.d.s $f0, $f0 /* BCD3CC 8024036C 4620203C */ c.lt.d $f4, $f0 -/* BCD3D0 80240370 00000000 */ nop +/* BCD3D0 80240370 00000000 */ nop /* BCD3D4 80240374 45000009 */ bc1f .L8024039C -/* BCD3D8 80240378 00000000 */ nop +/* BCD3D8 80240378 00000000 */ nop /* BCD3DC 8024037C C6200014 */ lwc1 $f0, 0x14($s1) /* BCD3E0 80240380 46241081 */ sub.d $f2, $f2, $f4 /* BCD3E4 80240384 46000021 */ cvt.d.s $f0, $f0 @@ -236,11 +236,11 @@ glabel func_80240050_BCD0B0 /* BCD414 802403B4 46000005 */ abs.s $f0, $f0 /* BCD418 802403B8 46000021 */ cvt.d.s $f0, $f0 /* BCD41C 802403BC 4620303C */ c.lt.d $f6, $f0 -/* BCD420 802403C0 00000000 */ nop +/* BCD420 802403C0 00000000 */ nop /* BCD424 802403C4 45000063 */ bc1f .L80240554 -/* BCD428 802403C8 00000000 */ nop +/* BCD428 802403C8 00000000 */ nop /* BCD42C 802403CC 4602203C */ c.lt.s $f4, $f2 -/* BCD430 802403D0 00000000 */ nop +/* BCD430 802403D0 00000000 */ nop /* BCD434 802403D4 45020006 */ bc1fl .L802403F0 /* BCD438 802403D8 46001021 */ cvt.d.s $f0, $f2 /* BCD43C 802403DC 46002021 */ cvt.d.s $f0, $f4 @@ -273,13 +273,13 @@ glabel func_80240050_BCD0B0 /* BCD498 80240438 E6200004 */ swc1 $f0, 4($s1) /* BCD49C 8024043C C620001C */ lwc1 $f0, 0x1c($s1) /* BCD4A0 80240440 4604003C */ c.lt.s $f0, $f4 -/* BCD4A4 80240444 00000000 */ nop +/* BCD4A4 80240444 00000000 */ nop /* BCD4A8 80240448 45000008 */ bc1f .L8024046C /* BCD4AC 8024044C E6220010 */ swc1 $f2, 0x10($s1) /* BCD4B0 80240450 C6200004 */ lwc1 $f0, 4($s1) /* BCD4B4 80240454 C6220018 */ lwc1 $f2, 0x18($s1) /* BCD4B8 80240458 46020002 */ mul.s $f0, $f0, $f2 -/* BCD4BC 8024045C 00000000 */ nop +/* BCD4BC 8024045C 00000000 */ nop /* BCD4C0 80240460 C6220014 */ lwc1 $f2, 0x14($s1) /* BCD4C4 80240464 46001080 */ add.s $f2, $f2, $f0 /* BCD4C8 80240468 E6220014 */ swc1 $f2, 0x14($s1) @@ -290,15 +290,15 @@ glabel func_80240050_BCD0B0 /* BCD4D8 80240478 44802000 */ mtc1 $zero, $f4 /* BCD4DC 8024047C 460000A1 */ cvt.d.s $f2, $f0 /* BCD4E0 80240480 4622203C */ c.lt.d $f4, $f2 -/* BCD4E4 80240484 00000000 */ nop +/* BCD4E4 80240484 00000000 */ nop /* BCD4E8 80240488 4500000F */ bc1f .L802404C8 -/* BCD4EC 8024048C 00000000 */ nop +/* BCD4EC 8024048C 00000000 */ nop /* BCD4F0 80240490 C6200014 */ lwc1 $f0, 0x14($s1) /* BCD4F4 80240494 46000021 */ cvt.d.s $f0, $f0 /* BCD4F8 80240498 4620203C */ c.lt.d $f4, $f0 -/* BCD4FC 8024049C 00000000 */ nop +/* BCD4FC 8024049C 00000000 */ nop /* BCD500 802404A0 45000009 */ bc1f .L802404C8 -/* BCD504 802404A4 00000000 */ nop +/* BCD504 802404A4 00000000 */ nop /* BCD508 802404A8 C6200014 */ lwc1 $f0, 0x14($s1) /* BCD50C 802404AC 46241081 */ sub.d $f2, $f2, $f4 /* BCD510 802404B0 46000021 */ cvt.d.s $f0, $f0 @@ -317,11 +317,11 @@ glabel func_80240050_BCD0B0 /* BCD540 802404E0 46000005 */ abs.s $f0, $f0 /* BCD544 802404E4 46000021 */ cvt.d.s $f0, $f0 /* BCD548 802404E8 4620303C */ c.lt.d $f6, $f0 -/* BCD54C 802404EC 00000000 */ nop +/* BCD54C 802404EC 00000000 */ nop /* BCD550 802404F0 4500000D */ bc1f .L80240528 -/* BCD554 802404F4 00000000 */ nop +/* BCD554 802404F4 00000000 */ nop /* BCD558 802404F8 4602203C */ c.lt.s $f4, $f2 -/* BCD55C 802404FC 00000000 */ nop +/* BCD55C 802404FC 00000000 */ nop /* BCD560 80240500 45020006 */ bc1fl .L8024051C /* BCD564 80240504 46001021 */ cvt.d.s $f0, $f2 /* BCD568 80240508 46002021 */ cvt.d.s $f0, $f4 @@ -338,7 +338,7 @@ glabel func_80240050_BCD0B0 /* BCD58C 8024052C 04410008 */ bgez $v0, .L80240550 /* BCD590 80240530 2442FFFF */ addiu $v0, $v0, -1 /* BCD594 80240534 44800000 */ mtc1 $zero, $f0 -/* BCD598 80240538 00000000 */ nop +/* BCD598 80240538 00000000 */ nop /* BCD59C 8024053C E6200014 */ swc1 $f0, 0x14($s1) /* BCD5A0 80240540 E6200010 */ swc1 $f0, 0x10($s1) /* BCD5A4 80240544 E6200000 */ swc1 $f0, ($s1) @@ -358,9 +358,9 @@ glabel func_80240050_BCD0B0 /* BCD5D0 80240570 C6220008 */ lwc1 $f2, 8($s1) /* BCD5D4 80240574 3C01C0E0 */ lui $at, 0xc0e0 /* BCD5D8 80240578 44810000 */ mtc1 $at, $f0 -/* BCD5DC 8024057C 00000000 */ nop +/* BCD5DC 8024057C 00000000 */ nop /* BCD5E0 80240580 4600103E */ c.le.s $f2, $f0 -/* BCD5E4 80240584 00000000 */ nop +/* BCD5E4 80240584 00000000 */ nop /* BCD5E8 80240588 45000013 */ bc1f .L802405D8 /* BCD5EC 8024058C 2410FFFF */ addiu $s0, $zero, -1 /* BCD5F0 80240590 8E420078 */ lw $v0, 0x78($s2) @@ -386,7 +386,7 @@ glabel func_80240050_BCD0B0 .L802405DC: /* BCD63C 802405DC C6200008 */ lwc1 $f0, 8($s1) /* BCD640 802405E0 46000002 */ mul.s $f0, $f0, $f0 -/* BCD644 802405E4 00000000 */ nop +/* BCD644 802405E4 00000000 */ nop /* BCD648 802405E8 3C0142B4 */ lui $at, 0x42b4 /* BCD64C 802405EC 44811000 */ mtc1 $at, $f2 /* BCD650 802405F0 2404001B */ addiu $a0, $zero, 0x1b @@ -482,6 +482,6 @@ glabel func_80240050_BCD0B0 /* BCD7B8 80240758 0000102D */ daddu $v0, $zero, $zero /* BCD7BC 8024075C 03E00008 */ jr $ra /* BCD7C0 80240760 27BD0090 */ addiu $sp, $sp, 0x90 -/* BCD7C4 80240764 00000000 */ nop -/* BCD7C8 80240768 00000000 */ nop -/* BCD7CC 8024076C 00000000 */ nop +/* BCD7C4 80240764 00000000 */ nop +/* BCD7C8 80240768 00000000 */ nop +/* BCD7CC 8024076C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_80240770_BCD7D0.s b/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_80240770_BCD7D0.s index 2c44e16a06..e3601e97cb 100644 --- a/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_80240770_BCD7D0.s +++ b/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_80240770_BCD7D0.s @@ -6,12 +6,12 @@ glabel func_80240770_BCD7D0 /* BCD7D4 80240774 C422EFF4 */ lwc1 $f2, %lo(gPlayerStatus+0x2C)($at) /* BCD7D8 80240778 3C01C248 */ lui $at, 0xc248 /* BCD7DC 8024077C 44810000 */ mtc1 $at, $f0 -/* BCD7E0 80240780 00000000 */ nop +/* BCD7E0 80240780 00000000 */ nop /* BCD7E4 80240784 4600103C */ c.lt.s $f2, $f0 -/* BCD7E8 80240788 00000000 */ nop +/* BCD7E8 80240788 00000000 */ nop /* BCD7EC 8024078C 45010002 */ bc1t .L80240798 /* BCD7F0 80240790 24020002 */ addiu $v0, $zero, 2 /* BCD7F4 80240794 0000102D */ daddu $v0, $zero, $zero .L80240798: /* BCD7F8 80240798 03E00008 */ jr $ra -/* BCD7FC 8024079C 00000000 */ nop +/* BCD7FC 8024079C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_802407AC_BCD80C.s b/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_802407AC_BCD80C.s index 4a4ca3f193..356113ceae 100644 --- a/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_802407AC_BCD80C.s +++ b/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_802407AC_BCD80C.s @@ -17,14 +17,14 @@ glabel func_802407AC_BCD80C /* BCD83C 802407DC 10400005 */ beqz $v0, .L802407F4 /* BCD840 802407E0 24020002 */ addiu $v0, $zero, 2 /* BCD844 802407E4 10600007 */ beqz $v1, .L80240804 -/* BCD848 802407E8 00000000 */ nop +/* BCD848 802407E8 00000000 */ nop /* BCD84C 802407EC 08090247 */ j .L8024091C -/* BCD850 802407F0 00000000 */ nop +/* BCD850 802407F0 00000000 */ nop .L802407F4: /* BCD854 802407F4 10620036 */ beq $v1, $v0, .L802408D0 -/* BCD858 802407F8 00000000 */ nop +/* BCD858 802407F8 00000000 */ nop /* BCD85C 802407FC 08090247 */ j .L8024091C -/* BCD860 80240800 00000000 */ nop +/* BCD860 80240800 00000000 */ nop .L80240804: /* BCD864 80240804 0C00A67F */ jal rand_int /* BCD868 80240808 240400B4 */ addiu $a0, $zero, 0xb4 @@ -38,7 +38,7 @@ glabel func_802407AC_BCD80C /* BCD888 80240828 3C014220 */ lui $at, 0x4220 /* BCD88C 8024082C 44811000 */ mtc1 $at, $f2 /* BCD890 80240830 44820000 */ mtc1 $v0, $f0 -/* BCD894 80240834 00000000 */ nop +/* BCD894 80240834 00000000 */ nop /* BCD898 80240838 46800020 */ cvt.s.w $f0, $f0 /* BCD89C 8024083C 46020000 */ add.s $f0, $f0, $f2 /* BCD8A0 80240840 0C00A64D */ jal func_80029934 @@ -46,17 +46,17 @@ glabel func_802407AC_BCD80C /* BCD8A8 80240848 46000000 */ add.s $f0, $f0, $f0 /* BCD8AC 8024084C 3C014000 */ lui $at, 0x4000 /* BCD8B0 80240850 44811000 */ mtc1 $at, $f2 -/* BCD8B4 80240854 00000000 */ nop +/* BCD8B4 80240854 00000000 */ nop /* BCD8B8 80240858 46020000 */ add.s $f0, $f0, $f2 /* BCD8BC 8024085C 24040064 */ addiu $a0, $zero, 0x64 /* BCD8C0 80240860 0C00A67F */ jal rand_int /* BCD8C4 80240864 E6000018 */ swc1 $f0, 0x18($s0) /* BCD8C8 80240868 28420032 */ slti $v0, $v0, 0x32 /* BCD8CC 8024086C 10400007 */ beqz $v0, .L8024088C -/* BCD8D0 80240870 00000000 */ nop +/* BCD8D0 80240870 00000000 */ nop /* BCD8D4 80240874 3C014387 */ lui $at, 0x4387 /* BCD8D8 80240878 44810000 */ mtc1 $at, $f0 -/* BCD8DC 8024087C 00000000 */ nop +/* BCD8DC 8024087C 00000000 */ nop /* BCD8E0 80240880 E6000038 */ swc1 $f0, 0x38($s0) /* BCD8E4 80240884 08090229 */ j .L802408A4 /* BCD8E8 80240888 E600000C */ swc1 $f0, 0xc($s0) @@ -88,16 +88,16 @@ glabel func_802407AC_BCD80C /* BCD940 802408E0 C6020038 */ lwc1 $f2, 0x38($s0) /* BCD944 802408E4 3C01C38C */ lui $at, 0xc38c /* BCD948 802408E8 44810000 */ mtc1 $at, $f0 -/* BCD94C 802408EC 00000000 */ nop +/* BCD94C 802408EC 00000000 */ nop /* BCD950 802408F0 4600103C */ c.lt.s $f2, $f0 -/* BCD954 802408F4 00000000 */ nop +/* BCD954 802408F4 00000000 */ nop /* BCD958 802408F8 45030008 */ bc1tl .L8024091C /* BCD95C 802408FC AE200074 */ sw $zero, 0x74($s1) /* BCD960 80240900 3C01438C */ lui $at, 0x438c /* BCD964 80240904 44810000 */ mtc1 $at, $f0 -/* BCD968 80240908 00000000 */ nop +/* BCD968 80240908 00000000 */ nop /* BCD96C 8024090C 4602003C */ c.lt.s $f0, $f2 -/* BCD970 80240910 00000000 */ nop +/* BCD970 80240910 00000000 */ nop /* BCD974 80240914 45030001 */ bc1tl .L8024091C /* BCD978 80240918 AE200074 */ sw $zero, 0x74($s1) .L8024091C: diff --git a/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_80240934_BCD994.s b/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_80240934_BCD994.s index 06845dccd1..41a03a69b2 100644 --- a/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_80240934_BCD994.s +++ b/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_80240934_BCD994.s @@ -48,4 +48,4 @@ glabel func_80240934_BCD994 /* BCDA30 802409D0 24020002 */ addiu $v0, $zero, 2 /* BCDA34 802409D4 03E00008 */ jr $ra /* BCDA38 802409D8 27BD0020 */ addiu $sp, $sp, 0x20 -/* BCDA3C 802409DC 00000000 */ nop +/* BCDA3C 802409DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240000_BCEBF0.s b/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240000_BCEBF0.s index 466a0dbd36..415cef5889 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240000_BCEBF0.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240000_BCEBF0.s @@ -26,7 +26,7 @@ glabel func_80240000_BCEBF0 /* BCEC40 80240050 1440FFFA */ bnez $v0, .L8024003C /* BCEC44 80240054 24A50004 */ addiu $a1, $a1, 4 /* BCEC48 80240058 08090027 */ j .L8024009C -/* BCEC4C 8024005C 00000000 */ nop +/* BCEC4C 8024005C 00000000 */ nop .L80240060: /* BCEC50 80240060 0000182D */ daddu $v1, $zero, $zero /* BCEC54 80240064 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_802402CC_BCEEBC.s b/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_802402CC_BCEEBC.s index fabf9c35f9..04ae55fb31 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_802402CC_BCEEBC.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_802402CC_BCEEBC.s @@ -17,14 +17,14 @@ glabel func_802402CC_BCEEBC /* BCEEEC 802402FC 10400005 */ beqz $v0, .L80240314 /* BCEEF0 80240300 24020002 */ addiu $v0, $zero, 2 /* BCEEF4 80240304 10600007 */ beqz $v1, .L80240324 -/* BCEEF8 80240308 00000000 */ nop +/* BCEEF8 80240308 00000000 */ nop /* BCEEFC 8024030C 0809010F */ j .L8024043C -/* BCEF00 80240310 00000000 */ nop +/* BCEF00 80240310 00000000 */ nop .L80240314: /* BCEF04 80240314 10620036 */ beq $v1, $v0, .L802403F0 -/* BCEF08 80240318 00000000 */ nop +/* BCEF08 80240318 00000000 */ nop /* BCEF0C 8024031C 0809010F */ j .L8024043C -/* BCEF10 80240320 00000000 */ nop +/* BCEF10 80240320 00000000 */ nop .L80240324: /* BCEF14 80240324 0C00A67F */ jal rand_int /* BCEF18 80240328 240400B4 */ addiu $a0, $zero, 0xb4 @@ -38,7 +38,7 @@ glabel func_802402CC_BCEEBC /* BCEF38 80240348 3C0142A0 */ lui $at, 0x42a0 /* BCEF3C 8024034C 44811000 */ mtc1 $at, $f2 /* BCEF40 80240350 44820000 */ mtc1 $v0, $f0 -/* BCEF44 80240354 00000000 */ nop +/* BCEF44 80240354 00000000 */ nop /* BCEF48 80240358 46800020 */ cvt.s.w $f0, $f0 /* BCEF4C 8024035C 46020000 */ add.s $f0, $f0, $f2 /* BCEF50 80240360 0C00A64D */ jal func_80029934 @@ -46,17 +46,17 @@ glabel func_802402CC_BCEEBC /* BCEF58 80240368 46000000 */ add.s $f0, $f0, $f0 /* BCEF5C 8024036C 3C014000 */ lui $at, 0x4000 /* BCEF60 80240370 44811000 */ mtc1 $at, $f2 -/* BCEF64 80240374 00000000 */ nop +/* BCEF64 80240374 00000000 */ nop /* BCEF68 80240378 46020000 */ add.s $f0, $f0, $f2 /* BCEF6C 8024037C 24040064 */ addiu $a0, $zero, 0x64 /* BCEF70 80240380 0C00A67F */ jal rand_int /* BCEF74 80240384 E6000018 */ swc1 $f0, 0x18($s0) /* BCEF78 80240388 28420032 */ slti $v0, $v0, 0x32 /* BCEF7C 8024038C 10400007 */ beqz $v0, .L802403AC -/* BCEF80 80240390 00000000 */ nop +/* BCEF80 80240390 00000000 */ nop /* BCEF84 80240394 3C014387 */ lui $at, 0x4387 /* BCEF88 80240398 44810000 */ mtc1 $at, $f0 -/* BCEF8C 8024039C 00000000 */ nop +/* BCEF8C 8024039C 00000000 */ nop /* BCEF90 802403A0 E6000038 */ swc1 $f0, 0x38($s0) /* BCEF94 802403A4 080900F1 */ j .L802403C4 /* BCEF98 802403A8 E600000C */ swc1 $f0, 0xc($s0) @@ -88,16 +88,16 @@ glabel func_802402CC_BCEEBC /* BCEFF0 80240400 C6020038 */ lwc1 $f2, 0x38($s0) /* BCEFF4 80240404 3C01C38C */ lui $at, 0xc38c /* BCEFF8 80240408 44810000 */ mtc1 $at, $f0 -/* BCEFFC 8024040C 00000000 */ nop +/* BCEFFC 8024040C 00000000 */ nop /* BCF000 80240410 4600103C */ c.lt.s $f2, $f0 -/* BCF004 80240414 00000000 */ nop +/* BCF004 80240414 00000000 */ nop /* BCF008 80240418 45030008 */ bc1tl .L8024043C /* BCF00C 8024041C AE200074 */ sw $zero, 0x74($s1) /* BCF010 80240420 3C01438C */ lui $at, 0x438c /* BCF014 80240424 44810000 */ mtc1 $at, $f0 -/* BCF018 80240428 00000000 */ nop +/* BCF018 80240428 00000000 */ nop /* BCF01C 8024042C 4602003C */ c.lt.s $f0, $f2 -/* BCF020 80240430 00000000 */ nop +/* BCF020 80240430 00000000 */ nop /* BCF024 80240434 45030001 */ bc1tl .L8024043C /* BCF028 80240438 AE200074 */ sw $zero, 0x74($s1) .L8024043C: diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_80240454_BCF044.s b/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_80240454_BCF044.s index 6c224e3309..7d48cccacd 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_80240454_BCF044.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_80240454_BCF044.s @@ -48,4 +48,4 @@ glabel func_80240454_BCF044 /* BCF0E0 802404F0 24020002 */ addiu $v0, $zero, 2 /* BCF0E4 802404F4 03E00008 */ jr $ra /* BCF0E8 802404F8 27BD0020 */ addiu $sp, $sp, 0x20 -/* BCF0EC 802404FC 00000000 */ nop +/* BCF0EC 802404FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240564_BCF154.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240564_BCF154.s index 6512a29755..785ee99e51 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240564_BCF154.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240564_BCF154.s @@ -57,7 +57,7 @@ glabel func_80240564_BCF154 /* BCF214 80240624 15610004 */ bne $t3, $at, .L80240638 /* BCF218 80240628 3C018000 */ lui $at, 0x8000 /* BCF21C 8024062C 14610002 */ bne $v1, $at, .L80240638 -/* BCF220 80240630 00000000 */ nop +/* BCF220 80240630 00000000 */ nop /* BCF224 80240634 0006000D */ break 6 .L80240638: /* BCF228 80240638 00001812 */ mflo $v1 @@ -83,7 +83,7 @@ glabel func_80240564_BCF154 /* BCF270 80240680 14610004 */ bne $v1, $at, .L80240694 /* BCF274 80240684 3C018000 */ lui $at, 0x8000 /* BCF278 80240688 14410002 */ bne $v0, $at, .L80240694 -/* BCF27C 8024068C 00000000 */ nop +/* BCF27C 8024068C 00000000 */ nop /* BCF280 80240690 0006000D */ break 6 .L80240694: /* BCF284 80240694 00001012 */ mflo $v0 @@ -119,7 +119,7 @@ glabel func_80240564_BCF154 /* BCF2F4 80240704 15610004 */ bne $t3, $at, .L80240718 /* BCF2F8 80240708 3C018000 */ lui $at, 0x8000 /* BCF2FC 8024070C 14610002 */ bne $v1, $at, .L80240718 -/* BCF300 80240710 00000000 */ nop +/* BCF300 80240710 00000000 */ nop /* BCF304 80240714 0006000D */ break 6 .L80240718: /* BCF308 80240718 00001812 */ mflo $v1 @@ -231,7 +231,7 @@ glabel func_80240564_BCF154 /* BCF49C 802408AC 15610004 */ bne $t3, $at, .L802408C0 /* BCF4A0 802408B0 3C018000 */ lui $at, 0x8000 /* BCF4A4 802408B4 14610002 */ bne $v1, $at, .L802408C0 -/* BCF4A8 802408B8 00000000 */ nop +/* BCF4A8 802408B8 00000000 */ nop /* BCF4AC 802408BC 0006000D */ break 6 .L802408C0: /* BCF4B0 802408C0 00001812 */ mflo $v1 @@ -307,7 +307,7 @@ glabel func_80240564_BCF154 /* BCF5C0 802409D0 26520001 */ addiu $s2, $s2, 1 /* BCF5C4 802409D4 0242102A */ slt $v0, $s2, $v0 /* BCF5C8 802409D8 1440FF9D */ bnez $v0, .L80240850 -/* BCF5CC 802409DC 00000000 */ nop +/* BCF5CC 802409DC 00000000 */ nop .L802409E0: /* BCF5D0 802409E0 8FBF0064 */ lw $ra, 0x64($sp) /* BCF5D4 802409E4 8FBE0060 */ lw $fp, 0x60($sp) diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A6C_BCF65C.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A6C_BCF65C.s index 562f6c0b73..966f8f2875 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A6C_BCF65C.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A6C_BCF65C.s @@ -34,14 +34,14 @@ glabel func_80240A6C_BCF65C /* BCF6CC 80240ADC 10600009 */ beqz $v1, .L80240B04 /* BCF6D0 80240AE0 240500FF */ addiu $a1, $zero, 0xff /* BCF6D4 80240AE4 080903B7 */ j .L80240EDC -/* BCF6D8 80240AE8 00000000 */ nop +/* BCF6D8 80240AE8 00000000 */ nop .L80240AEC: /* BCF6DC 80240AEC 10620033 */ beq $v1, $v0, .L80240BBC /* BCF6E0 80240AF0 2402000B */ addiu $v0, $zero, 0xb /* BCF6E4 80240AF4 10620038 */ beq $v1, $v0, .L80240BD8 -/* BCF6E8 80240AF8 00000000 */ nop +/* BCF6E8 80240AF8 00000000 */ nop /* BCF6EC 80240AFC 080903B7 */ j .L80240EDC -/* BCF6F0 80240B00 00000000 */ nop +/* BCF6F0 80240B00 00000000 */ nop .L80240B04: /* BCF6F4 80240B04 8E30003C */ lw $s0, 0x3c($s1) /* BCF6F8 80240B08 0C0513AC */ jal icon_set_opacity @@ -90,13 +90,13 @@ glabel func_80240A6C_BCF65C /* BCF79C 80240BAC 0C051261 */ jal set_icon_render_pos /* BCF7A0 80240BB0 24C6000E */ addiu $a2, $a2, 0xe /* BCF7A4 80240BB4 080903B7 */ j .L80240EDC -/* BCF7A8 80240BB8 00000000 */ nop +/* BCF7A8 80240BB8 00000000 */ nop .L80240BBC: /* BCF7AC 80240BBC 8E24003C */ lw $a0, 0x3c($s1) /* BCF7B0 80240BC0 3C058011 */ lui $a1, %hi(D_80108C34) /* BCF7B4 80240BC4 24A58C34 */ addiu $a1, $a1, %lo(D_80108C34) /* BCF7B8 80240BC8 0C0511FF */ jal set_menu_icon_script -/* BCF7BC 80240BCC 00000000 */ nop +/* BCF7BC 80240BCC 00000000 */ nop /* BCF7C0 80240BD0 2402000B */ addiu $v0, $zero, 0xb /* BCF7C4 80240BD4 AE220030 */ sw $v0, 0x30($s1) .L80240BD8: @@ -183,19 +183,19 @@ glabel func_80240A6C_BCF65C /* BCF8F0 80240D00 00071903 */ sra $v1, $a3, 4 /* BCF8F4 80240D04 00621823 */ subu $v1, $v1, $v0 /* BCF8F8 80240D08 44836000 */ mtc1 $v1, $f12 -/* BCF8FC 80240D0C 00000000 */ nop +/* BCF8FC 80240D0C 00000000 */ nop /* BCF900 80240D10 46806320 */ cvt.s.w $f12, $f12 /* BCF904 80240D14 46006302 */ mul.s $f12, $f12, $f0 -/* BCF908 80240D18 00000000 */ nop +/* BCF908 80240D18 00000000 */ nop /* BCF90C 80240D1C 3C0143B4 */ lui $at, 0x43b4 /* BCF910 80240D20 44810000 */ mtc1 $at, $f0 /* BCF914 80240D24 0C00A85B */ jal sin_rad /* BCF918 80240D28 46006303 */ div.s $f12, $f12, $f0 /* BCF91C 80240D2C 3C014248 */ lui $at, 0x4248 /* BCF920 80240D30 44811000 */ mtc1 $at, $f2 -/* BCF924 80240D34 00000000 */ nop +/* BCF924 80240D34 00000000 */ nop /* BCF928 80240D38 46020002 */ mul.s $f0, $f0, $f2 -/* BCF92C 80240D3C 00000000 */ nop +/* BCF92C 80240D3C 00000000 */ nop /* BCF930 80240D40 4600018D */ trunc.w.s $f6, $f0 /* BCF934 80240D44 44103000 */ mfc1 $s0, $f6 /* BCF938 80240D48 0809037D */ j .L80240DF4 @@ -219,10 +219,10 @@ glabel func_80240A6C_BCF65C /* BCF97C 80240D8C 00621823 */ subu $v1, $v1, $v0 /* BCF980 80240D90 2463005A */ addiu $v1, $v1, 0x5a /* BCF984 80240D94 44836000 */ mtc1 $v1, $f12 -/* BCF988 80240D98 00000000 */ nop +/* BCF988 80240D98 00000000 */ nop /* BCF98C 80240D9C 46806320 */ cvt.s.w $f12, $f12 /* BCF990 80240DA0 46006302 */ mul.s $f12, $f12, $f0 -/* BCF994 80240DA4 00000000 */ nop +/* BCF994 80240DA4 00000000 */ nop /* BCF998 80240DA8 3C0143B4 */ lui $at, 0x43b4 /* BCF99C 80240DAC 44810000 */ mtc1 $at, $f0 /* BCF9A0 80240DB0 0C00A85B */ jal sin_rad @@ -235,9 +235,9 @@ glabel func_80240A6C_BCF65C /* BCF9BC 80240DCC 3C014049 */ lui $at, 0x4049 /* BCF9C0 80240DD0 44810800 */ mtc1 $at, $f1 /* BCF9C4 80240DD4 44800000 */ mtc1 $zero, $f0 -/* BCF9C8 80240DD8 00000000 */ nop +/* BCF9C8 80240DD8 00000000 */ nop /* BCF9CC 80240DDC 46201082 */ mul.d $f2, $f2, $f0 -/* BCF9D0 80240DE0 00000000 */ nop +/* BCF9D0 80240DE0 00000000 */ nop /* BCF9D4 80240DE4 46201080 */ add.d $f2, $f2, $f0 /* BCF9D8 80240DE8 4620118D */ trunc.w.d $f6, $f2 /* BCF9DC 80240DEC 44103000 */ mfc1 $s0, $f6 @@ -248,18 +248,18 @@ glabel func_80240A6C_BCF65C /* BCF9EC 80240DFC 44811800 */ mtc1 $at, $f3 /* BCF9F0 80240E00 44801000 */ mtc1 $zero, $f2 /* BCF9F4 80240E04 44820000 */ mtc1 $v0, $f0 -/* BCF9F8 80240E08 00000000 */ nop +/* BCF9F8 80240E08 00000000 */ nop /* BCF9FC 80240E0C 46800021 */ cvt.d.w $f0, $f0 /* BCFA00 80240E10 46220002 */ mul.d $f0, $f0, $f2 -/* BCFA04 80240E14 00000000 */ nop +/* BCFA04 80240E14 00000000 */ nop /* BCFA08 80240E18 44901000 */ mtc1 $s0, $f2 -/* BCFA0C 80240E1C 00000000 */ nop +/* BCFA0C 80240E1C 00000000 */ nop /* BCFA10 80240E20 468010A1 */ cvt.d.w $f2, $f2 /* BCFA14 80240E24 46221080 */ add.d $f2, $f2, $f2 /* BCFA18 80240E28 3C014059 */ lui $at, 0x4059 /* BCFA1C 80240E2C 44812800 */ mtc1 $at, $f5 /* BCFA20 80240E30 44802000 */ mtc1 $zero, $f4 -/* BCFA24 80240E34 00000000 */ nop +/* BCFA24 80240E34 00000000 */ nop /* BCFA28 80240E38 46241083 */ div.d $f2, $f2, $f4 /* BCFA2C 80240E3C 46240003 */ div.d $f0, $f0, $f4 /* BCFA30 80240E40 46220000 */ add.d $f0, $f0, $f2 @@ -270,34 +270,34 @@ glabel func_80240A6C_BCF65C /* BCFA44 80240E54 AE2501C4 */ sw $a1, 0x1c4($s1) /* BCFA48 80240E58 8E24004C */ lw $a0, 0x4c($s1) /* BCFA4C 80240E5C 0C0B11EA */ jal get_script_by_id -/* BCFA50 80240E60 00000000 */ nop +/* BCFA50 80240E60 00000000 */ nop /* BCFA54 80240E64 C62201C4 */ lwc1 $f2, 0x1c4($s1) /* BCFA58 80240E68 3C014040 */ lui $at, 0x4040 /* BCFA5C 80240E6C 44810000 */ mtc1 $at, $f0 -/* BCFA60 80240E70 00000000 */ nop +/* BCFA60 80240E70 00000000 */ nop /* BCFA64 80240E74 46001082 */ mul.s $f2, $f2, $f0 -/* BCFA68 80240E78 00000000 */ nop +/* BCFA68 80240E78 00000000 */ nop /* BCFA6C 80240E7C 44051000 */ mfc1 $a1, $f2 /* BCFA70 80240E80 0C0B1078 */ jal set_script_timescale /* BCFA74 80240E84 0040202D */ daddu $a0, $v0, $zero /* BCFA78 80240E88 8E240050 */ lw $a0, 0x50($s1) /* BCFA7C 80240E8C 0C0B11EA */ jal get_script_by_id -/* BCFA80 80240E90 00000000 */ nop +/* BCFA80 80240E90 00000000 */ nop /* BCFA84 80240E94 C62001C4 */ lwc1 $f0, 0x1c4($s1) /* BCFA88 80240E98 3C0140A0 */ lui $at, 0x40a0 /* BCFA8C 80240E9C 4481A000 */ mtc1 $at, $f20 -/* BCFA90 80240EA0 00000000 */ nop +/* BCFA90 80240EA0 00000000 */ nop /* BCFA94 80240EA4 46140002 */ mul.s $f0, $f0, $f20 -/* BCFA98 80240EA8 00000000 */ nop +/* BCFA98 80240EA8 00000000 */ nop /* BCFA9C 80240EAC 44050000 */ mfc1 $a1, $f0 /* BCFAA0 80240EB0 0C0B1078 */ jal set_script_timescale /* BCFAA4 80240EB4 0040202D */ daddu $a0, $v0, $zero /* BCFAA8 80240EB8 8E240054 */ lw $a0, 0x54($s1) /* BCFAAC 80240EBC 0C0B11EA */ jal get_script_by_id -/* BCFAB0 80240EC0 00000000 */ nop +/* BCFAB0 80240EC0 00000000 */ nop /* BCFAB4 80240EC4 C62001C4 */ lwc1 $f0, 0x1c4($s1) /* BCFAB8 80240EC8 46140002 */ mul.s $f0, $f0, $f20 -/* BCFABC 80240ECC 00000000 */ nop +/* BCFABC 80240ECC 00000000 */ nop /* BCFAC0 80240ED0 44050000 */ mfc1 $a1, $f0 /* BCFAC4 80240ED4 0C0B1078 */ jal set_script_timescale /* BCFAC8 80240ED8 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240EF8_BCFAE8.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240EF8_BCFAE8.s index 9b8fd1865d..a1546b310d 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240EF8_BCFAE8.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240EF8_BCFAE8.s @@ -33,10 +33,10 @@ glabel func_80240EF8_BCFAE8 /* BCFB58 80240F68 00062103 */ sra $a0, $a2, 4 /* BCFB5C 80240F6C 00832023 */ subu $a0, $a0, $v1 /* BCFB60 80240F70 44846000 */ mtc1 $a0, $f12 -/* BCFB64 80240F74 00000000 */ nop +/* BCFB64 80240F74 00000000 */ nop /* BCFB68 80240F78 46806320 */ cvt.s.w $f12, $f12 /* BCFB6C 80240F7C 46006302 */ mul.s $f12, $f12, $f0 -/* BCFB70 80240F80 00000000 */ nop +/* BCFB70 80240F80 00000000 */ nop /* BCFB74 80240F84 3C0143B4 */ lui $at, 0x43b4 /* BCFB78 80240F88 44810000 */ mtc1 $at, $f0 /* BCFB7C 80240F8C 0040802D */ daddu $s0, $v0, $zero @@ -44,30 +44,30 @@ glabel func_80240EF8_BCFAE8 /* BCFB84 80240F94 46006303 */ div.s $f12, $f12, $f0 /* BCFB88 80240F98 3C014248 */ lui $at, 0x4248 /* BCFB8C 80240F9C 44811000 */ mtc1 $at, $f2 -/* BCFB90 80240FA0 00000000 */ nop +/* BCFB90 80240FA0 00000000 */ nop /* BCFB94 80240FA4 46020002 */ mul.s $f0, $f0, $f2 -/* BCFB98 80240FA8 00000000 */ nop +/* BCFB98 80240FA8 00000000 */ nop /* BCFB9C 80240FAC 24020064 */ addiu $v0, $zero, 0x64 /* BCFBA0 80240FB0 3C013FD0 */ lui $at, 0x3fd0 /* BCFBA4 80240FB4 44811800 */ mtc1 $at, $f3 /* BCFBA8 80240FB8 44801000 */ mtc1 $zero, $f2 /* BCFBAC 80240FBC 4600018D */ trunc.w.s $f6, $f0 /* BCFBB0 80240FC0 44033000 */ mfc1 $v1, $f6 -/* BCFBB4 80240FC4 00000000 */ nop +/* BCFBB4 80240FC4 00000000 */ nop /* BCFBB8 80240FC8 00431023 */ subu $v0, $v0, $v1 /* BCFBBC 80240FCC 44820000 */ mtc1 $v0, $f0 -/* BCFBC0 80240FD0 00000000 */ nop +/* BCFBC0 80240FD0 00000000 */ nop /* BCFBC4 80240FD4 46800021 */ cvt.d.w $f0, $f0 /* BCFBC8 80240FD8 46220002 */ mul.d $f0, $f0, $f2 -/* BCFBCC 80240FDC 00000000 */ nop +/* BCFBCC 80240FDC 00000000 */ nop /* BCFBD0 80240FE0 44831000 */ mtc1 $v1, $f2 -/* BCFBD4 80240FE4 00000000 */ nop +/* BCFBD4 80240FE4 00000000 */ nop /* BCFBD8 80240FE8 468010A1 */ cvt.d.w $f2, $f2 /* BCFBDC 80240FEC 46221080 */ add.d $f2, $f2, $f2 /* BCFBE0 80240FF0 3C014059 */ lui $at, 0x4059 /* BCFBE4 80240FF4 44812800 */ mtc1 $at, $f5 /* BCFBE8 80240FF8 44802000 */ mtc1 $zero, $f4 -/* BCFBEC 80240FFC 00000000 */ nop +/* BCFBEC 80240FFC 00000000 */ nop /* BCFBF0 80241000 46241083 */ div.d $f2, $f2, $f4 /* BCFBF4 80241004 46240003 */ div.d $f0, $f0, $f4 /* BCFBF8 80241008 46220000 */ add.d $f0, $f0, $f2 @@ -78,34 +78,34 @@ glabel func_80240EF8_BCFAE8 /* BCFC0C 8024101C AE0501C4 */ sw $a1, 0x1c4($s0) /* BCFC10 80241020 8E04004C */ lw $a0, 0x4c($s0) /* BCFC14 80241024 0C0B11EA */ jal get_script_by_id -/* BCFC18 80241028 00000000 */ nop +/* BCFC18 80241028 00000000 */ nop /* BCFC1C 8024102C C60201C4 */ lwc1 $f2, 0x1c4($s0) /* BCFC20 80241030 3C014040 */ lui $at, 0x4040 /* BCFC24 80241034 44810000 */ mtc1 $at, $f0 -/* BCFC28 80241038 00000000 */ nop +/* BCFC28 80241038 00000000 */ nop /* BCFC2C 8024103C 46001082 */ mul.s $f2, $f2, $f0 -/* BCFC30 80241040 00000000 */ nop +/* BCFC30 80241040 00000000 */ nop /* BCFC34 80241044 44051000 */ mfc1 $a1, $f2 /* BCFC38 80241048 0C0B1078 */ jal set_script_timescale /* BCFC3C 8024104C 0220202D */ daddu $a0, $s1, $zero /* BCFC40 80241050 8E040050 */ lw $a0, 0x50($s0) /* BCFC44 80241054 0C0B11EA */ jal get_script_by_id -/* BCFC48 80241058 00000000 */ nop +/* BCFC48 80241058 00000000 */ nop /* BCFC4C 8024105C C60001C4 */ lwc1 $f0, 0x1c4($s0) /* BCFC50 80241060 3C0140A0 */ lui $at, 0x40a0 /* BCFC54 80241064 4481A000 */ mtc1 $at, $f20 -/* BCFC58 80241068 00000000 */ nop +/* BCFC58 80241068 00000000 */ nop /* BCFC5C 8024106C 46140002 */ mul.s $f0, $f0, $f20 -/* BCFC60 80241070 00000000 */ nop +/* BCFC60 80241070 00000000 */ nop /* BCFC64 80241074 44050000 */ mfc1 $a1, $f0 /* BCFC68 80241078 0C0B1078 */ jal set_script_timescale /* BCFC6C 8024107C 0220202D */ daddu $a0, $s1, $zero /* BCFC70 80241080 8E040054 */ lw $a0, 0x54($s0) /* BCFC74 80241084 0C0B11EA */ jal get_script_by_id -/* BCFC78 80241088 00000000 */ nop +/* BCFC78 80241088 00000000 */ nop /* BCFC7C 8024108C C60001C4 */ lwc1 $f0, 0x1c4($s0) /* BCFC80 80241090 46140002 */ mul.s $f0, $f0, $f20 -/* BCFC84 80241094 00000000 */ nop +/* BCFC84 80241094 00000000 */ nop /* BCFC88 80241098 44050000 */ mfc1 $a1, $f0 /* BCFC8C 8024109C 0C0B1078 */ jal set_script_timescale /* BCFC90 802410A0 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802410C0_BCFCB0.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802410C0_BCFCB0.s index a882a46234..caa8a2f693 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802410C0_BCFCB0.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802410C0_BCFCB0.s @@ -24,7 +24,7 @@ glabel func_802410C0_BCFCB0 /* BCFCFC 8024110C 24070002 */ addiu $a3, $zero, 2 /* BCFD00 80241110 8E240044 */ lw $a0, 0x44($s1) /* BCFD04 80241114 0C0511EA */ jal draw_icon_0 -/* BCFD08 80241118 00000000 */ nop +/* BCFD08 80241118 00000000 */ nop /* BCFD0C 8024111C 8FBF0020 */ lw $ra, 0x20($sp) /* BCFD10 80241120 8FB1001C */ lw $s1, 0x1c($sp) /* BCFD14 80241124 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241168_BCFD58.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241168_BCFD58.s index fa2146c893..bac270c4a8 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241168_BCFD58.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241168_BCFD58.s @@ -71,7 +71,7 @@ glabel func_80241168_BCFD58 /* BCFE5C 8024126C 3C048011 */ lui $a0, %hi(D_80108AFC) /* BCFE60 80241270 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) /* BCFE64 80241274 0C050529 */ jal create_icon -/* BCFE68 80241278 00000000 */ nop +/* BCFE68 80241278 00000000 */ nop /* BCFE6C 8024127C 0040802D */ daddu $s0, $v0, $zero /* BCFE70 80241280 8E250034 */ lw $a1, 0x34($s1) /* BCFE74 80241284 8E260038 */ lw $a2, 0x38($s1) @@ -88,7 +88,7 @@ glabel func_80241168_BCFD58 /* BCFEA0 802412B0 3C048011 */ lui $a0, %hi(D_80109244) /* BCFEA4 802412B4 24849244 */ addiu $a0, $a0, %lo(D_80109244) /* BCFEA8 802412B8 0C050529 */ jal create_icon -/* BCFEAC 802412BC 00000000 */ nop +/* BCFEAC 802412BC 00000000 */ nop /* BCFEB0 802412C0 0040802D */ daddu $s0, $v0, $zero /* BCFEB4 802412C4 8E250034 */ lw $a1, 0x34($s1) /* BCFEB8 802412C8 8E260038 */ lw $a2, 0x38($s1) diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802413D0_BCFFC0.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802413D0_BCFFC0.s index f7bffc0f22..e02c61ff2b 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802413D0_BCFFC0.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802413D0_BCFFC0.s @@ -19,7 +19,7 @@ glabel func_802413D0_BCFFC0 /* BCFFF8 80241408 ACA20000 */ sw $v0, ($a1) /* BCFFFC 8024140C 8E040040 */ lw $a0, 0x40($s0) /* BD0000 80241410 0C05123D */ jal free_icon -/* BD0004 80241414 00000000 */ nop +/* BD0004 80241414 00000000 */ nop /* BD0008 80241418 0C05123D */ jal free_icon /* BD000C 8024141C 8E040044 */ lw $a0, 0x44($s0) /* BD0010 80241420 0C048D70 */ jal func_801235C0 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241674_BD0264.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241674_BD0264.s index 281b05b3ae..ac1f72832f 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241674_BD0264.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241674_BD0264.s @@ -17,13 +17,13 @@ glabel func_80241674_BD0264 /* BD0294 802416A4 46000506 */ mov.s $f20, $f0 /* BD0298 802416A8 3C013F80 */ lui $at, 0x3f80 /* BD029C 802416AC 44811000 */ mtc1 $at, $f2 -/* BD02A0 802416B0 00000000 */ nop +/* BD02A0 802416B0 00000000 */ nop /* BD02A4 802416B4 4602003E */ c.le.s $f0, $f2 -/* BD02A8 802416B8 00000000 */ nop +/* BD02A8 802416B8 00000000 */ nop /* BD02AC 802416BC 45020008 */ bc1fl .L802416E0 /* BD02B0 802416C0 AE00008C */ sw $zero, 0x8c($s0) /* BD02B4 802416C4 4614103E */ c.le.s $f2, $f20 -/* BD02B8 802416C8 00000000 */ nop +/* BD02B8 802416C8 00000000 */ nop /* BD02BC 802416CC 45000003 */ bc1f .L802416DC /* BD02C0 802416D0 24020001 */ addiu $v0, $zero, 1 /* BD02C4 802416D4 080905B8 */ j .L802416E0 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802416F8_BD02E8.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802416F8_BD02E8.s index 320b0fc815..6c5c128d4e 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802416F8_BD02E8.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802416F8_BD02E8.s @@ -17,16 +17,16 @@ glabel func_802416F8_BD02E8 /* BD0318 80241728 46000506 */ mov.s $f20, $f0 /* BD031C 8024172C 3C0143B4 */ lui $at, 0x43b4 /* BD0320 80241730 44811000 */ mtc1 $at, $f2 -/* BD0324 80241734 00000000 */ nop +/* BD0324 80241734 00000000 */ nop /* BD0328 80241738 4602003E */ c.le.s $f0, $f2 -/* BD032C 8024173C 00000000 */ nop +/* BD032C 8024173C 00000000 */ nop /* BD0330 80241740 4502000B */ bc1fl .L80241770 /* BD0334 80241744 AE00008C */ sw $zero, 0x8c($s0) /* BD0338 80241748 3C0142C8 */ lui $at, 0x42c8 /* BD033C 8024174C 44810000 */ mtc1 $at, $f0 -/* BD0340 80241750 00000000 */ nop +/* BD0340 80241750 00000000 */ nop /* BD0344 80241754 4600A03E */ c.le.s $f20, $f0 -/* BD0348 80241758 00000000 */ nop +/* BD0348 80241758 00000000 */ nop /* BD034C 8024175C 45000003 */ bc1f .L8024176C /* BD0350 80241760 24020001 */ addiu $v0, $zero, 1 /* BD0354 80241764 080905DC */ j .L80241770 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241790_BD0380.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241790_BD0380.s index 6579b6a444..06652576c7 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241790_BD0380.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241790_BD0380.s @@ -32,7 +32,7 @@ glabel func_80241790_BD0380 /* BD03E0 802417F0 80A301DC */ lb $v1, 0x1dc($a1) /* BD03E4 802417F4 24020001 */ addiu $v0, $zero, 1 /* BD03E8 802417F8 1462000E */ bne $v1, $v0, .L80241834 -/* BD03EC 802417FC 00000000 */ nop +/* BD03EC 802417FC 00000000 */ nop /* BD03F0 80241800 8CA20004 */ lw $v0, 4($a1) /* BD03F4 80241804 5C40000B */ bgtzl $v0, .L80241834 /* BD03F8 80241808 ACA001D8 */ sw $zero, 0x1d8($a1) diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802418E0_BD04D0.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802418E0_BD04D0.s index 850a300638..63a1c8e507 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802418E0_BD04D0.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802418E0_BD04D0.s @@ -41,7 +41,7 @@ glabel func_802418E0_BD04D0 /* BD0560 80241970 0C00A7B5 */ jal dist2D /* BD0564 80241974 AE020028 */ sw $v0, 0x28($s0) /* BD0568 80241978 4614003C */ c.lt.s $f0, $f20 -/* BD056C 8024197C 00000000 */ nop +/* BD056C 8024197C 00000000 */ nop /* BD0570 80241980 4500000D */ bc1f .L802419B8 /* BD0574 80241984 4600B306 */ mov.s $f12, $f22 /* BD0578 80241988 4406F000 */ mfc1 $a2, $f30 @@ -82,7 +82,7 @@ glabel func_802418E0_BD04D0 /* BD05FC 80241A0C 0C00A7B5 */ jal dist2D /* BD0600 80241A10 AE4200AC */ sw $v0, 0xac($s2) /* BD0604 80241A14 4614003C */ c.lt.s $f0, $f20 -/* BD0608 80241A18 00000000 */ nop +/* BD0608 80241A18 00000000 */ nop /* BD060C 80241A1C 45000004 */ bc1f .L80241A30 /* BD0610 80241A20 4600B306 */ mov.s $f12, $f22 /* BD0614 80241A24 E61E0038 */ swc1 $f30, 0x38($s0) @@ -111,7 +111,7 @@ glabel func_802418E0_BD04D0 /* BD0668 80241A78 0C00A7B5 */ jal dist2D /* BD066C 80241A7C AE4000AC */ sw $zero, 0xac($s2) /* BD0670 80241A80 4614003C */ c.lt.s $f0, $f20 -/* BD0674 80241A84 00000000 */ nop +/* BD0674 80241A84 00000000 */ nop /* BD0678 80241A88 45000009 */ bc1f .L80241AB0 /* BD067C 80241A8C 4600B306 */ mov.s $f12, $f22 /* BD0680 80241A90 4406F000 */ mfc1 $a2, $f30 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241B50_BD0740.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241B50_BD0740.s index ddddad6de4..8603a89d5f 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241B50_BD0740.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241B50_BD0740.s @@ -15,6 +15,6 @@ glabel func_80241B50_BD0740 /* BD0768 80241B78 24020002 */ addiu $v0, $zero, 2 /* BD076C 80241B7C 03E00008 */ jr $ra /* BD0770 80241B80 27BD0018 */ addiu $sp, $sp, 0x18 -/* BD0774 80241B84 00000000 */ nop -/* BD0778 80241B88 00000000 */ nop -/* BD077C 80241B8C 00000000 */ nop +/* BD0774 80241B84 00000000 */ nop +/* BD0778 80241B88 00000000 */ nop +/* BD077C 80241B8C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802403DC_BD3C4C.s b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802403DC_BD3C4C.s index a2a8d272d0..1ee1f88165 100644 --- a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802403DC_BD3C4C.s +++ b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802403DC_BD3C4C.s @@ -27,12 +27,12 @@ glabel func_802403DC_BD3C4C /* BD3CA4 80240434 AE11000C */ sw $s1, 0xc($s0) /* BD3CA8 80240438 846200B0 */ lh $v0, 0xb0($v1) /* BD3CAC 8024043C 44820000 */ mtc1 $v0, $f0 -/* BD3CB0 80240440 00000000 */ nop +/* BD3CB0 80240440 00000000 */ nop /* BD3CB4 80240444 46800020 */ cvt.s.w $f0, $f0 /* BD3CB8 80240448 E6000034 */ swc1 $f0, 0x34($s0) /* BD3CBC 8024044C 846200B2 */ lh $v0, 0xb2($v1) /* BD3CC0 80240450 44820000 */ mtc1 $v0, $f0 -/* BD3CC4 80240454 00000000 */ nop +/* BD3CC4 80240454 00000000 */ nop /* BD3CC8 80240458 46800020 */ cvt.s.w $f0, $f0 /* BD3CCC 8024045C E6000038 */ swc1 $f0, 0x38($s0) /* BD3CD0 80240460 C4600028 */ lwc1 $f0, 0x28($v1) diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_8024055C_BD3DCC.s b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_8024055C_BD3DCC.s index 0f52d61953..e6e29fc44a 100644 --- a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_8024055C_BD3DCC.s +++ b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_8024055C_BD3DCC.s @@ -23,7 +23,7 @@ glabel func_8024055C_BD3DCC /* BD3E14 802405A4 4600008D */ trunc.w.s $f2, $f0 /* BD3E18 802405A8 44111000 */ mfc1 $s1, $f2 /* BD3E1C 802405AC 0C0B210B */ jal get_float_variable -/* BD3E20 802405B0 00000000 */ nop +/* BD3E20 802405B0 00000000 */ nop /* BD3E24 802405B4 0000202D */ daddu $a0, $zero, $zero /* BD3E28 802405B8 3C05FD05 */ lui $a1, 0xfd05 /* BD3E2C 802405BC 4600008D */ trunc.w.s $f2, $f0 @@ -32,15 +32,15 @@ glabel func_8024055C_BD3DCC /* BD3E38 802405C8 34A50F8A */ ori $a1, $a1, 0xf8a /* BD3E3C 802405CC 0040182D */ daddu $v1, $v0, $zero /* BD3E40 802405D0 44920000 */ mtc1 $s2, $f0 -/* BD3E44 802405D4 00000000 */ nop +/* BD3E44 802405D4 00000000 */ nop /* BD3E48 802405D8 46800020 */ cvt.s.w $f0, $f0 /* BD3E4C 802405DC E4600010 */ swc1 $f0, 0x10($v1) /* BD3E50 802405E0 44910000 */ mtc1 $s1, $f0 -/* BD3E54 802405E4 00000000 */ nop +/* BD3E54 802405E4 00000000 */ nop /* BD3E58 802405E8 46800020 */ cvt.s.w $f0, $f0 /* BD3E5C 802405EC E4600014 */ swc1 $f0, 0x14($v1) /* BD3E60 802405F0 44900000 */ mtc1 $s0, $f0 -/* BD3E64 802405F4 00000000 */ nop +/* BD3E64 802405F4 00000000 */ nop /* BD3E68 802405F8 46800020 */ cvt.s.w $f0, $f0 /* BD3E6C 802405FC E4600018 */ swc1 $f0, 0x18($v1) /* BD3E70 80240600 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_8024061C_BD3E8C.s b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_8024061C_BD3E8C.s index 04b0067644..3677929ea8 100644 --- a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_8024061C_BD3E8C.s +++ b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_8024061C_BD3E8C.s @@ -23,7 +23,7 @@ glabel func_8024061C_BD3E8C /* BD3ED4 80240664 4600008D */ trunc.w.s $f2, $f0 /* BD3ED8 80240668 44111000 */ mfc1 $s1, $f2 /* BD3EDC 8024066C 0C0B210B */ jal get_float_variable -/* BD3EE0 80240670 00000000 */ nop +/* BD3EE0 80240670 00000000 */ nop /* BD3EE4 80240674 0000202D */ daddu $a0, $zero, $zero /* BD3EE8 80240678 3C05FD05 */ lui $a1, 0xfd05 /* BD3EEC 8024067C 4600008D */ trunc.w.s $f2, $f0 @@ -32,15 +32,15 @@ glabel func_8024061C_BD3E8C /* BD3EF8 80240688 34A50F8A */ ori $a1, $a1, 0xf8a /* BD3EFC 8024068C 0040182D */ daddu $v1, $v0, $zero /* BD3F00 80240690 44920000 */ mtc1 $s2, $f0 -/* BD3F04 80240694 00000000 */ nop +/* BD3F04 80240694 00000000 */ nop /* BD3F08 80240698 46800020 */ cvt.s.w $f0, $f0 /* BD3F0C 8024069C E460001C */ swc1 $f0, 0x1c($v1) /* BD3F10 802406A0 44910000 */ mtc1 $s1, $f0 -/* BD3F14 802406A4 00000000 */ nop +/* BD3F14 802406A4 00000000 */ nop /* BD3F18 802406A8 46800020 */ cvt.s.w $f0, $f0 /* BD3F1C 802406AC E4600020 */ swc1 $f0, 0x20($v1) /* BD3F20 802406B0 44900000 */ mtc1 $s0, $f0 -/* BD3F24 802406B4 00000000 */ nop +/* BD3F24 802406B4 00000000 */ nop /* BD3F28 802406B8 46800020 */ cvt.s.w $f0, $f0 /* BD3F2C 802406BC E4600024 */ swc1 $f0, 0x24($v1) /* BD3F30 802406C0 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802406DC_BD3F4C.s b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802406DC_BD3F4C.s index cee953ab69..1343975cee 100644 --- a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802406DC_BD3F4C.s +++ b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802406DC_BD3F4C.s @@ -23,7 +23,7 @@ glabel func_802406DC_BD3F4C /* BD3F94 80240724 4600008D */ trunc.w.s $f2, $f0 /* BD3F98 80240728 44111000 */ mfc1 $s1, $f2 /* BD3F9C 8024072C 0C0B210B */ jal get_float_variable -/* BD3FA0 80240730 00000000 */ nop +/* BD3FA0 80240730 00000000 */ nop /* BD3FA4 80240734 0000202D */ daddu $a0, $zero, $zero /* BD3FA8 80240738 3C05FD05 */ lui $a1, 0xfd05 /* BD3FAC 8024073C 4600008D */ trunc.w.s $f2, $f0 @@ -32,15 +32,15 @@ glabel func_802406DC_BD3F4C /* BD3FB8 80240748 34A50F8A */ ori $a1, $a1, 0xf8a /* BD3FBC 8024074C 0040182D */ daddu $v1, $v0, $zero /* BD3FC0 80240750 44920000 */ mtc1 $s2, $f0 -/* BD3FC4 80240754 00000000 */ nop +/* BD3FC4 80240754 00000000 */ nop /* BD3FC8 80240758 46800020 */ cvt.s.w $f0, $f0 /* BD3FCC 8024075C E4600028 */ swc1 $f0, 0x28($v1) /* BD3FD0 80240760 44910000 */ mtc1 $s1, $f0 -/* BD3FD4 80240764 00000000 */ nop +/* BD3FD4 80240764 00000000 */ nop /* BD3FD8 80240768 46800020 */ cvt.s.w $f0, $f0 /* BD3FDC 8024076C E460002C */ swc1 $f0, 0x2c($v1) /* BD3FE0 80240770 44900000 */ mtc1 $s0, $f0 -/* BD3FE4 80240774 00000000 */ nop +/* BD3FE4 80240774 00000000 */ nop /* BD3FE8 80240778 46800020 */ cvt.s.w $f0, $f0 /* BD3FEC 8024077C E4600030 */ swc1 $f0, 0x30($v1) /* BD3FF0 80240780 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_80240808_BD4078.s b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_80240808_BD4078.s index 52190cad00..8459f31968 100644 --- a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_80240808_BD4078.s +++ b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_80240808_BD4078.s @@ -15,5 +15,5 @@ glabel func_80240808_BD4078 .L80240830: /* BD40A0 80240830 03E00008 */ jr $ra /* BD40A4 80240834 24020002 */ addiu $v0, $zero, 2 -/* BD40A8 80240838 00000000 */ nop -/* BD40AC 8024083C 00000000 */ nop +/* BD40A8 80240838 00000000 */ nop +/* BD40AC 8024083C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD40B0/func_80240870_BD40E0.s b/asm/nonmatchings/world/area_obk/obk_08/BD40B0/func_80240870_BD40E0.s index bc40d2372a..1e0921c5ec 100644 --- a/asm/nonmatchings/world/area_obk/obk_08/BD40B0/func_80240870_BD40E0.s +++ b/asm/nonmatchings/world/area_obk/obk_08/BD40B0/func_80240870_BD40E0.s @@ -11,6 +11,6 @@ glabel func_80240870_BD40E0 /* BD40F8 80240888 24020002 */ addiu $v0, $zero, 2 /* BD40FC 8024088C 03E00008 */ jr $ra /* BD4100 80240890 27BD0018 */ addiu $sp, $sp, 0x18 -/* BD4104 80240894 00000000 */ nop -/* BD4108 80240898 00000000 */ nop -/* BD410C 8024089C 00000000 */ nop +/* BD4104 80240894 00000000 */ nop +/* BD4108 80240898 00000000 */ nop +/* BD410C 8024089C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240920_BD4190.s b/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240920_BD4190.s index 96e5a071f9..815939a653 100644 --- a/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240920_BD4190.s +++ b/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240920_BD4190.s @@ -9,16 +9,16 @@ glabel func_80240920_BD4190 /* BD41A0 80240930 C602000C */ lwc1 $f2, 0xc($s0) /* BD41A4 80240934 3C0143AA */ lui $at, 0x43aa /* BD41A8 80240938 44810000 */ mtc1 $at, $f0 -/* BD41AC 8024093C 00000000 */ nop +/* BD41AC 8024093C 00000000 */ nop /* BD41B0 80240940 4602003C */ c.lt.s $f0, $f2 -/* BD41B4 80240944 00000000 */ nop +/* BD41B4 80240944 00000000 */ nop /* BD41B8 80240948 45010008 */ bc1t .L8024096C /* BD41BC 8024094C 0200202D */ daddu $a0, $s0, $zero /* BD41C0 80240950 3C0141A0 */ lui $at, 0x41a0 /* BD41C4 80240954 44810000 */ mtc1 $at, $f0 -/* BD41C8 80240958 00000000 */ nop +/* BD41C8 80240958 00000000 */ nop /* BD41CC 8024095C 4600103C */ c.lt.s $f2, $f0 -/* BD41D0 80240960 00000000 */ nop +/* BD41D0 80240960 00000000 */ nop /* BD41D4 80240964 4500000E */ bc1f .L802409A0 /* BD41D8 80240968 24020016 */ addiu $v0, $zero, 0x16 .L8024096C: @@ -34,7 +34,7 @@ glabel func_80240920_BD4190 /* BD4200 80240990 0C00F589 */ jal func_8003D624 /* BD4204 80240994 AFA20018 */ sw $v0, 0x18($sp) /* BD4208 80240998 08090276 */ j .L802409D8 -/* BD420C 8024099C 00000000 */ nop +/* BD420C 8024099C 00000000 */ nop .L802409A0: /* BD4210 802409A0 A20200AA */ sb $v0, 0xaa($s0) /* BD4214 802409A4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240AF0_BD4360.s b/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240AF0_BD4360.s index 7d99f915ba..c08ad7f518 100644 --- a/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240AF0_BD4360.s +++ b/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240AF0_BD4360.s @@ -16,11 +16,12 @@ glabel func_80240AF0_BD4360 /* BD438C 80240B1C 2C62000E */ sltiu $v0, $v1, 0xe /* BD4390 80240B20 10400058 */ beqz $v0, .L80240C84 /* BD4394 80240B24 00031080 */ sll $v0, $v1, 2 -/* BD4398 80240B28 3C018024 */ lui $at, %hi(D_80246EC8) +/* BD4398 80240B28 3C018024 */ lui $at, %hi(jtbl_80246EC8_BDA738) /* BD439C 80240B2C 00220821 */ addu $at, $at, $v0 -/* BD43A0 80240B30 8C226EC8 */ lw $v0, %lo(D_80246EC8)($at) +/* BD43A0 80240B30 8C226EC8 */ lw $v0, %lo(jtbl_80246EC8_BDA738)($at) /* BD43A4 80240B34 00400008 */ jr $v0 -/* BD43A8 80240B38 00000000 */ nop +/* BD43A8 80240B38 00000000 */ nop +glabel L80240B3C_BD43AC /* BD43AC 80240B3C 0220202D */ daddu $a0, $s1, $zero /* BD43B0 80240B40 3C05F971 */ lui $a1, 0xf971 /* BD43B4 80240B44 0C0B1EAF */ jal get_variable @@ -31,6 +32,7 @@ glabel func_80240AF0_BD4360 /* BD43C8 80240B58 2402000A */ addiu $v0, $zero, 0xa /* BD43CC 80240B5C 08090320 */ j .L80240C80 /* BD43D0 80240B60 AE430000 */ sw $v1, ($s2) +glabel L80240B64_BD43D4 /* BD43D4 80240B64 C600000C */ lwc1 $f0, 0xc($s0) /* BD43D8 80240B68 3C014000 */ lui $at, 0x4000 /* BD43DC 80240B6C 44816000 */ mtc1 $at, $f12 @@ -45,16 +47,17 @@ glabel func_80240AF0_BD4360 /* BD4400 80240B90 2402000B */ addiu $v0, $zero, 0xb /* BD4404 80240B94 08090321 */ j .L80240C84 /* BD4408 80240B98 AE220074 */ sw $v0, 0x74($s1) +glabel L80240B9C_BD440C /* BD440C 80240B9C C602003C */ lwc1 $f2, 0x3c($s0) /* BD4410 80240BA0 3C01C466 */ lui $at, 0xc466 /* BD4414 80240BA4 44810000 */ mtc1 $at, $f0 -/* BD4418 80240BA8 00000000 */ nop +/* BD4418 80240BA8 00000000 */ nop /* BD441C 80240BAC 4600103E */ c.le.s $f2, $f0 -/* BD4420 80240BB0 00000000 */ nop +/* BD4420 80240BB0 00000000 */ nop /* BD4424 80240BB4 45000003 */ bc1f .L80240BC4 -/* BD4428 80240BB8 00000000 */ nop +/* BD4428 80240BB8 00000000 */ nop /* BD442C 80240BBC 0C09027A */ jal func_802409E8_BD4258 -/* BD4430 80240BC0 00000000 */ nop +/* BD4430 80240BC0 00000000 */ nop .L80240BC4: /* BD4434 80240BC4 C600000C */ lwc1 $f0, 0xc($s0) /* BD4438 80240BC8 3C014000 */ lui $at, 0x4000 @@ -64,13 +67,13 @@ glabel func_80240AF0_BD4360 /* BD4448 80240BD8 C604003C */ lwc1 $f4, 0x3c($s0) /* BD444C 80240BDC 3C013F00 */ lui $at, 0x3f00 /* BD4450 80240BE0 44811000 */ mtc1 $at, $f2 -/* BD4454 80240BE4 00000000 */ nop +/* BD4454 80240BE4 00000000 */ nop /* BD4458 80240BE8 46022101 */ sub.s $f4, $f4, $f2 /* BD445C 80240BEC 3C01C477 */ lui $at, 0xc477 /* BD4460 80240BF0 44811000 */ mtc1 $at, $f2 /* BD4464 80240BF4 E600000C */ swc1 $f0, 0xc($s0) /* BD4468 80240BF8 4602203E */ c.le.s $f4, $f2 -/* BD446C 80240BFC 00000000 */ nop +/* BD446C 80240BFC 00000000 */ nop /* BD4470 80240C00 45000020 */ bc1f .L80240C84 /* BD4474 80240C04 E604003C */ swc1 $f4, 0x3c($s0) /* BD4478 80240C08 0220202D */ daddu $a0, $s1, $zero @@ -79,9 +82,10 @@ glabel func_80240AF0_BD4360 /* BD4484 80240C14 0C0B2026 */ jal set_variable /* BD4488 80240C18 24060001 */ addiu $a2, $zero, 1 /* BD448C 80240C1C 0C09029F */ jal func_80240A7C_BD42EC -/* BD4490 80240C20 00000000 */ nop +/* BD4490 80240C20 00000000 */ nop /* BD4494 80240C24 08090320 */ j .L80240C80 /* BD4498 80240C28 2402000C */ addiu $v0, $zero, 0xc +glabel L80240C2C_BD449C /* BD449C 80240C2C 0220202D */ daddu $a0, $s1, $zero /* BD44A0 80240C30 3C05FD05 */ lui $a1, 0xfd05 /* BD44A4 80240C34 0C0B1EAF */ jal get_variable @@ -98,6 +102,7 @@ glabel func_80240AF0_BD4360 /* BD44CC 80240C5C 460C0300 */ add.s $f12, $f0, $f12 /* BD44D0 80240C60 08090321 */ j .L80240C84 /* BD44D4 80240C64 E600000C */ swc1 $f0, 0xc($s0) +glabel L80240C68_BD44D8 /* BD44D8 80240C68 0220202D */ daddu $a0, $s1, $zero /* BD44DC 80240C6C 3C05FD05 */ lui $a1, 0xfd05 /* BD44E0 80240C70 0C0B1EAF */ jal get_variable @@ -107,6 +112,7 @@ glabel func_80240AF0_BD4360 .L80240C80: /* BD44F0 80240C80 AE220074 */ sw $v0, 0x74($s1) .L80240C84: +glabel L80240C84_BD44F4 /* BD44F4 80240C84 8FBF001C */ lw $ra, 0x1c($sp) /* BD44F8 80240C88 8FB20018 */ lw $s2, 0x18($sp) /* BD44FC 80240C8C 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240D10_BD4580.s b/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240D10_BD4580.s index 1573811c55..b7c78e5fc5 100644 --- a/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240D10_BD4580.s +++ b/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240D10_BD4580.s @@ -19,11 +19,12 @@ glabel func_80240D10_BD4580 /* BD45B8 80240D48 8E330020 */ lw $s3, 0x20($s1) /* BD45BC 80240D4C 10400099 */ beqz $v0, .L80240FB4 /* BD45C0 80240D50 00031080 */ sll $v0, $v1, 2 -/* BD45C4 80240D54 3C018024 */ lui $at, %hi(D_80246F00) +/* BD45C4 80240D54 3C018024 */ lui $at, %hi(jtbl_80246F00_BDA770) /* BD45C8 80240D58 00220821 */ addu $at, $at, $v0 -/* BD45CC 80240D5C 8C226F00 */ lw $v0, %lo(D_80246F00)($at) +/* BD45CC 80240D5C 8C226F00 */ lw $v0, %lo(jtbl_80246F00_BDA770)($at) /* BD45D0 80240D60 00400008 */ jr $v0 -/* BD45D4 80240D64 00000000 */ nop +/* BD45D4 80240D64 00000000 */ nop +glabel L80240D68_BD45D8 /* BD45D8 80240D68 C620000C */ lwc1 $f0, 0xc($s1) /* BD45DC 80240D6C C64C0078 */ lwc1 $f12, 0x78($s2) /* BD45E0 80240D70 46806320 */ cvt.s.w $f12, $f12 @@ -39,6 +40,7 @@ glabel func_80240D10_BD4580 /* BD4608 80240D98 2442000A */ addiu $v0, $v0, 0xa /* BD460C 80240D9C 080903ED */ j .L80240FB4 /* BD4610 80240DA0 A602008E */ sh $v0, 0x8e($s0) +glabel L80240DA4_BD4614 /* BD4614 80240DA4 C620000C */ lwc1 $f0, 0xc($s1) /* BD4618 80240DA8 C64C0078 */ lwc1 $f12, 0x78($s2) /* BD461C 80240DAC 46806320 */ cvt.s.w $f12, $f12 @@ -68,6 +70,7 @@ glabel func_80240D10_BD4580 /* BD467C 80240E0C E6020064 */ swc1 $f2, 0x64($s0) /* BD4680 80240E10 080903ED */ j .L80240FB4 /* BD4684 80240E14 E6040068 */ swc1 $f4, 0x68($s0) +glabel L80240E18_BD4688 /* BD4688 80240E18 C620000C */ lwc1 $f0, 0xc($s1) /* BD468C 80240E1C C64C0078 */ lwc1 $f12, 0x78($s2) /* BD4690 80240E20 46806320 */ cvt.s.w $f12, $f12 @@ -75,7 +78,7 @@ glabel func_80240D10_BD4580 /* BD4698 80240E28 46006300 */ add.s $f12, $f12, $f0 /* BD469C 80240E2C 46000506 */ mov.s $f20, $f0 /* BD46A0 80240E30 4406A000 */ mfc1 $a2, $f20 -/* BD46A4 80240E34 00000000 */ nop +/* BD46A4 80240E34 00000000 */ nop /* BD46A8 80240E38 AE06000C */ sw $a2, 0xc($s0) /* BD46AC 80240E3C C6200038 */ lwc1 $f0, 0x38($s1) /* BD46B0 80240E40 E6000038 */ swc1 $f0, 0x38($s0) @@ -88,36 +91,36 @@ glabel func_80240D10_BD4580 /* BD46CC 80240E5C 3C014220 */ lui $at, 0x4220 /* BD46D0 80240E60 44817000 */ mtc1 $at, $f14 /* BD46D4 80240E64 44820000 */ mtc1 $v0, $f0 -/* BD46D8 80240E68 00000000 */ nop +/* BD46D8 80240E68 00000000 */ nop /* BD46DC 80240E6C 46800020 */ cvt.s.w $f0, $f0 /* BD46E0 80240E70 46007001 */ sub.s $f0, $f14, $f0 /* BD46E4 80240E74 460E0003 */ div.s $f0, $f0, $f14 /* BD46E8 80240E78 46000002 */ mul.s $f0, $f0, $f0 -/* BD46EC 80240E7C 00000000 */ nop +/* BD46EC 80240E7C 00000000 */ nop /* BD46F0 80240E80 C60C0038 */ lwc1 $f12, 0x38($s0) /* BD46F4 80240E84 C6060060 */ lwc1 $f6, 0x60($s0) /* BD46F8 80240E88 46066181 */ sub.s $f6, $f12, $f6 /* BD46FC 80240E8C 46003182 */ mul.s $f6, $f6, $f0 -/* BD4700 80240E90 00000000 */ nop +/* BD4700 80240E90 00000000 */ nop /* BD4704 80240E94 C60A0040 */ lwc1 $f10, 0x40($s0) /* BD4708 80240E98 C6080068 */ lwc1 $f8, 0x68($s0) /* BD470C 80240E9C C624003C */ lwc1 $f4, 0x3c($s1) /* BD4710 80240EA0 46085201 */ sub.s $f8, $f10, $f8 /* BD4714 80240EA4 3C01447A */ lui $at, 0x447a /* BD4718 80240EA8 44811000 */ mtc1 $at, $f2 -/* BD471C 80240EAC 00000000 */ nop +/* BD471C 80240EAC 00000000 */ nop /* BD4720 80240EB0 46022100 */ add.s $f4, $f4, $f2 /* BD4724 80240EB4 46004202 */ mul.s $f8, $f8, $f0 -/* BD4728 80240EB8 00000000 */ nop +/* BD4728 80240EB8 00000000 */ nop /* BD472C 80240EBC E604003C */ swc1 $f4, 0x3c($s0) /* BD4730 80240EC0 46002006 */ mov.s $f0, $f4 /* BD4734 80240EC4 C6040064 */ lwc1 $f4, 0x64($s0) /* BD4738 80240EC8 46040001 */ sub.s $f0, $f0, $f4 /* BD473C 80240ECC 44821000 */ mtc1 $v0, $f2 -/* BD4740 80240ED0 00000000 */ nop +/* BD4740 80240ED0 00000000 */ nop /* BD4744 80240ED4 468010A0 */ cvt.s.w $f2, $f2 /* BD4748 80240ED8 46020002 */ mul.s $f0, $f0, $f2 -/* BD474C 80240EDC 00000000 */ nop +/* BD474C 80240EDC 00000000 */ nop /* BD4750 80240EE0 9602008E */ lhu $v0, 0x8e($s0) /* BD4754 80240EE4 24030028 */ addiu $v1, $zero, 0x28 /* BD4758 80240EE8 24420001 */ addiu $v0, $v0, 1 @@ -134,6 +137,7 @@ glabel func_80240D10_BD4580 /* BD4784 80240F14 E600003C */ swc1 $f0, 0x3c($s0) /* BD4788 80240F18 080903EC */ j .L80240FB0 /* BD478C 80240F1C 2402000A */ addiu $v0, $zero, 0xa +glabel L80240F20_BD4790 /* BD4790 80240F20 C620000C */ lwc1 $f0, 0xc($s1) /* BD4794 80240F24 C64C0078 */ lwc1 $f12, 0x78($s2) /* BD4798 80240F28 46806320 */ cvt.s.w $f12, $f12 @@ -161,10 +165,11 @@ glabel func_80240D10_BD4580 /* BD47EC 80240F7C C620003C */ lwc1 $f0, 0x3c($s1) /* BD47F0 80240F80 3C01447A */ lui $at, 0x447a /* BD47F4 80240F84 44811000 */ mtc1 $at, $f2 -/* BD47F8 80240F88 00000000 */ nop +/* BD47F8 80240F88 00000000 */ nop /* BD47FC 80240F8C 46020000 */ add.s $f0, $f0, $f2 /* BD4800 80240F90 080903ED */ j .L80240FB4 /* BD4804 80240F94 E600003C */ swc1 $f0, 0x3c($s0) +glabel L80240F98_BD4808 /* BD4808 80240F98 0240202D */ daddu $a0, $s2, $zero /* BD480C 80240F9C 3C05FD05 */ lui $a1, 0xfd05 /* BD4810 80240FA0 0C0B1EAF */ jal get_variable @@ -174,6 +179,7 @@ glabel func_80240D10_BD4580 .L80240FB0: /* BD4820 80240FB0 AE420074 */ sw $v0, 0x74($s2) .L80240FB4: +glabel L80240FB4_BD4824 /* BD4824 80240FB4 8FBF0028 */ lw $ra, 0x28($sp) /* BD4828 80240FB8 8FB30024 */ lw $s3, 0x24($sp) /* BD482C 80240FBC 8FB20020 */ lw $s2, 0x20($sp) diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240FE4_BD4854.s b/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240FE4_BD4854.s index 8aa6cc50af..dc840fb15f 100644 --- a/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240FE4_BD4854.s +++ b/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240FE4_BD4854.s @@ -17,14 +17,14 @@ glabel func_80240FE4_BD4854 /* BD4884 80241014 10400005 */ beqz $v0, .L8024102C /* BD4888 80241018 24020002 */ addiu $v0, $zero, 2 /* BD488C 8024101C 10600007 */ beqz $v1, .L8024103C -/* BD4890 80241020 00000000 */ nop +/* BD4890 80241020 00000000 */ nop /* BD4894 80241024 08090455 */ j .L80241154 -/* BD4898 80241028 00000000 */ nop +/* BD4898 80241028 00000000 */ nop .L8024102C: /* BD489C 8024102C 10620036 */ beq $v1, $v0, .L80241108 -/* BD48A0 80241030 00000000 */ nop +/* BD48A0 80241030 00000000 */ nop /* BD48A4 80241034 08090455 */ j .L80241154 -/* BD48A8 80241038 00000000 */ nop +/* BD48A8 80241038 00000000 */ nop .L8024103C: /* BD48AC 8024103C 0C00A67F */ jal rand_int /* BD48B0 80241040 240400B4 */ addiu $a0, $zero, 0xb4 @@ -38,7 +38,7 @@ glabel func_80240FE4_BD4854 /* BD48D0 80241060 3C014220 */ lui $at, 0x4220 /* BD48D4 80241064 44811000 */ mtc1 $at, $f2 /* BD48D8 80241068 44820000 */ mtc1 $v0, $f0 -/* BD48DC 8024106C 00000000 */ nop +/* BD48DC 8024106C 00000000 */ nop /* BD48E0 80241070 46800020 */ cvt.s.w $f0, $f0 /* BD48E4 80241074 46020000 */ add.s $f0, $f0, $f2 /* BD48E8 80241078 0C00A64D */ jal func_80029934 @@ -46,17 +46,17 @@ glabel func_80240FE4_BD4854 /* BD48F0 80241080 46000000 */ add.s $f0, $f0, $f0 /* BD48F4 80241084 3C014000 */ lui $at, 0x4000 /* BD48F8 80241088 44811000 */ mtc1 $at, $f2 -/* BD48FC 8024108C 00000000 */ nop +/* BD48FC 8024108C 00000000 */ nop /* BD4900 80241090 46020000 */ add.s $f0, $f0, $f2 /* BD4904 80241094 24040064 */ addiu $a0, $zero, 0x64 /* BD4908 80241098 0C00A67F */ jal rand_int /* BD490C 8024109C E6000018 */ swc1 $f0, 0x18($s0) /* BD4910 802410A0 28420032 */ slti $v0, $v0, 0x32 /* BD4914 802410A4 10400007 */ beqz $v0, .L802410C4 -/* BD4918 802410A8 00000000 */ nop +/* BD4918 802410A8 00000000 */ nop /* BD491C 802410AC 3C014387 */ lui $at, 0x4387 /* BD4920 802410B0 44810000 */ mtc1 $at, $f0 -/* BD4924 802410B4 00000000 */ nop +/* BD4924 802410B4 00000000 */ nop /* BD4928 802410B8 E6000038 */ swc1 $f0, 0x38($s0) /* BD492C 802410BC 08090437 */ j .L802410DC /* BD4930 802410C0 E600000C */ swc1 $f0, 0xc($s0) @@ -88,16 +88,16 @@ glabel func_80240FE4_BD4854 /* BD4988 80241118 C6020038 */ lwc1 $f2, 0x38($s0) /* BD498C 8024111C 3C01C38C */ lui $at, 0xc38c /* BD4990 80241120 44810000 */ mtc1 $at, $f0 -/* BD4994 80241124 00000000 */ nop +/* BD4994 80241124 00000000 */ nop /* BD4998 80241128 4600103C */ c.lt.s $f2, $f0 -/* BD499C 8024112C 00000000 */ nop +/* BD499C 8024112C 00000000 */ nop /* BD49A0 80241130 45030008 */ bc1tl .L80241154 /* BD49A4 80241134 AE200074 */ sw $zero, 0x74($s1) /* BD49A8 80241138 3C01438C */ lui $at, 0x438c /* BD49AC 8024113C 44810000 */ mtc1 $at, $f0 -/* BD49B0 80241140 00000000 */ nop +/* BD49B0 80241140 00000000 */ nop /* BD49B4 80241144 4602003C */ c.lt.s $f0, $f2 -/* BD49B8 80241148 00000000 */ nop +/* BD49B8 80241148 00000000 */ nop /* BD49BC 8024114C 45030001 */ bc1tl .L80241154 /* BD49C0 80241150 AE200074 */ sw $zero, 0x74($s1) .L80241154: diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_8024116C_BD49DC.s b/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_8024116C_BD49DC.s index dc4a721921..5aa22f68a0 100644 --- a/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_8024116C_BD49DC.s +++ b/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_8024116C_BD49DC.s @@ -48,6 +48,6 @@ glabel func_8024116C_BD49DC /* BD4A78 80241208 24020002 */ addiu $v0, $zero, 2 /* BD4A7C 8024120C 03E00008 */ jr $ra /* BD4A80 80241210 27BD0020 */ addiu $sp, $sp, 0x20 -/* BD4A84 80241214 00000000 */ nop -/* BD4A88 80241218 00000000 */ nop -/* BD4A8C 8024121C 00000000 */ nop +/* BD4A84 80241214 00000000 */ nop +/* BD4A88 80241218 00000000 */ nop +/* BD4A8C 8024121C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241220_BD4A90.s b/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241220_BD4A90.s index 447a301925..dc3d5b6655 100644 --- a/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241220_BD4A90.s +++ b/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241220_BD4A90.s @@ -27,11 +27,11 @@ glabel func_80241220_BD4A90 /* BD4AE8 80241278 C600003C */ lwc1 $f0, 0x3c($s0) /* BD4AEC 8024127C 3C01447A */ lui $at, 0x447a /* BD4AF0 80241280 44811000 */ mtc1 $at, $f2 -/* BD4AF4 80241284 00000000 */ nop +/* BD4AF4 80241284 00000000 */ nop /* BD4AF8 80241288 46020000 */ add.s $f0, $f0, $f2 /* BD4AFC 8024128C 3C0141C8 */ lui $at, 0x41c8 /* BD4B00 80241290 44811000 */ mtc1 $at, $f2 -/* BD4B04 80241294 00000000 */ nop +/* BD4B04 80241294 00000000 */ nop /* BD4B08 80241298 46020000 */ add.s $f0, $f0, $f2 /* BD4B0C 8024129C E620003C */ swc1 $f0, 0x3c($s1) /* BD4B10 802412A0 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_802412BC_BD4B2C.s b/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_802412BC_BD4B2C.s index 912d61d045..64ee80e84f 100644 --- a/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_802412BC_BD4B2C.s +++ b/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_802412BC_BD4B2C.s @@ -9,7 +9,7 @@ glabel func_802412BC_BD4B2C /* BD4B3C 802412CC 8E020084 */ lw $v0, 0x84($s0) /* BD4B40 802412D0 2442FFFE */ addiu $v0, $v0, -2 /* BD4B44 802412D4 44826000 */ mtc1 $v0, $f12 -/* BD4B48 802412D8 00000000 */ nop +/* BD4B48 802412D8 00000000 */ nop /* BD4B4C 802412DC 0C00A6C9 */ jal clamp_angle /* BD4B50 802412E0 46806320 */ cvt.s.w $f12, $f12 /* BD4B54 802412E4 4600008D */ trunc.w.s $f2, $f0 diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241300_BD4B70.s b/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241300_BD4B70.s index cb0a7e7eb9..6eff1a2993 100644 --- a/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241300_BD4B70.s +++ b/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241300_BD4B70.s @@ -48,18 +48,18 @@ glabel func_80241300_BD4B70 /* BD4C1C 802413AC C602000C */ lwc1 $f2, 0xc($s0) /* BD4C20 802413B0 2462FFE9 */ addiu $v0, $v1, -0x17 /* BD4C24 802413B4 44820000 */ mtc1 $v0, $f0 -/* BD4C28 802413B8 00000000 */ nop +/* BD4C28 802413B8 00000000 */ nop /* BD4C2C 802413BC 46800020 */ cvt.s.w $f0, $f0 /* BD4C30 802413C0 4600103E */ c.le.s $f2, $f0 -/* BD4C34 802413C4 00000000 */ nop +/* BD4C34 802413C4 00000000 */ nop /* BD4C38 802413C8 4500000C */ bc1f .L802413FC /* BD4C3C 802413CC 0000882D */ daddu $s1, $zero, $zero /* BD4C40 802413D0 2462FFE5 */ addiu $v0, $v1, -0x1b /* BD4C44 802413D4 44820000 */ mtc1 $v0, $f0 -/* BD4C48 802413D8 00000000 */ nop +/* BD4C48 802413D8 00000000 */ nop /* BD4C4C 802413DC 46800020 */ cvt.s.w $f0, $f0 /* BD4C50 802413E0 4602003E */ c.le.s $f0, $f2 -/* BD4C54 802413E4 00000000 */ nop +/* BD4C54 802413E4 00000000 */ nop /* BD4C58 802413E8 45000004 */ bc1f .L802413FC /* BD4C5C 802413EC 24020001 */ addiu $v0, $zero, 1 /* BD4C60 802413F0 AE420088 */ sw $v0, 0x88($s2) @@ -69,17 +69,17 @@ glabel func_80241300_BD4B70 /* BD4C6C 802413FC C662000C */ lwc1 $f2, 0xc($s3) /* BD4C70 80241400 2462FFE9 */ addiu $v0, $v1, -0x17 /* BD4C74 80241404 44820000 */ mtc1 $v0, $f0 -/* BD4C78 80241408 00000000 */ nop +/* BD4C78 80241408 00000000 */ nop /* BD4C7C 8024140C 46800020 */ cvt.s.w $f0, $f0 /* BD4C80 80241410 4600103E */ c.le.s $f2, $f0 -/* BD4C84 80241414 00000000 */ nop +/* BD4C84 80241414 00000000 */ nop /* BD4C88 80241418 4500000A */ bc1f .L80241444 /* BD4C8C 8024141C 2462FFE5 */ addiu $v0, $v1, -0x1b /* BD4C90 80241420 44820000 */ mtc1 $v0, $f0 -/* BD4C94 80241424 00000000 */ nop +/* BD4C94 80241424 00000000 */ nop /* BD4C98 80241428 46800020 */ cvt.s.w $f0, $f0 /* BD4C9C 8024142C 4602003E */ c.le.s $f0, $f2 -/* BD4CA0 80241430 00000000 */ nop +/* BD4CA0 80241430 00000000 */ nop /* BD4CA4 80241434 45000003 */ bc1f .L80241444 /* BD4CA8 80241438 24020001 */ addiu $v0, $zero, 1 /* BD4CAC 8024143C AE420088 */ sw $v0, 0x88($s2) @@ -89,17 +89,17 @@ glabel func_80241300_BD4B70 /* BD4CB8 80241448 C682000C */ lwc1 $f2, 0xc($s4) /* BD4CBC 8024144C 2462FFE9 */ addiu $v0, $v1, -0x17 /* BD4CC0 80241450 44820000 */ mtc1 $v0, $f0 -/* BD4CC4 80241454 00000000 */ nop +/* BD4CC4 80241454 00000000 */ nop /* BD4CC8 80241458 46800020 */ cvt.s.w $f0, $f0 /* BD4CCC 8024145C 4600103E */ c.le.s $f2, $f0 -/* BD4CD0 80241460 00000000 */ nop +/* BD4CD0 80241460 00000000 */ nop /* BD4CD4 80241464 4500000B */ bc1f .L80241494 /* BD4CD8 80241468 2462FFE5 */ addiu $v0, $v1, -0x1b /* BD4CDC 8024146C 44820000 */ mtc1 $v0, $f0 -/* BD4CE0 80241470 00000000 */ nop +/* BD4CE0 80241470 00000000 */ nop /* BD4CE4 80241474 46800020 */ cvt.s.w $f0, $f0 /* BD4CE8 80241478 4602003E */ c.le.s $f0, $f2 -/* BD4CEC 8024147C 00000000 */ nop +/* BD4CEC 8024147C 00000000 */ nop /* BD4CF0 80241480 45000004 */ bc1f .L80241494 /* BD4CF4 80241484 24020001 */ addiu $v0, $zero, 1 /* BD4CF8 80241488 AE420088 */ sw $v0, 0x88($s2) @@ -109,17 +109,17 @@ glabel func_80241300_BD4B70 /* BD4D04 80241494 C6A2000C */ lwc1 $f2, 0xc($s5) /* BD4D08 80241498 2462FFE9 */ addiu $v0, $v1, -0x17 /* BD4D0C 8024149C 44820000 */ mtc1 $v0, $f0 -/* BD4D10 802414A0 00000000 */ nop +/* BD4D10 802414A0 00000000 */ nop /* BD4D14 802414A4 46800020 */ cvt.s.w $f0, $f0 /* BD4D18 802414A8 4600103E */ c.le.s $f2, $f0 -/* BD4D1C 802414AC 00000000 */ nop +/* BD4D1C 802414AC 00000000 */ nop /* BD4D20 802414B0 4500000A */ bc1f .L802414DC /* BD4D24 802414B4 2462FFE5 */ addiu $v0, $v1, -0x1b /* BD4D28 802414B8 44820000 */ mtc1 $v0, $f0 -/* BD4D2C 802414BC 00000000 */ nop +/* BD4D2C 802414BC 00000000 */ nop /* BD4D30 802414C0 46800020 */ cvt.s.w $f0, $f0 /* BD4D34 802414C4 4602003E */ c.le.s $f0, $f2 -/* BD4D38 802414C8 00000000 */ nop +/* BD4D38 802414C8 00000000 */ nop /* BD4D3C 802414CC 45000003 */ bc1f .L802414DC /* BD4D40 802414D0 24020001 */ addiu $v0, $zero, 1 /* BD4D44 802414D4 AE420088 */ sw $v0, 0x88($s2) @@ -129,17 +129,17 @@ glabel func_80241300_BD4B70 /* BD4D50 802414E0 C6C2000C */ lwc1 $f2, 0xc($s6) /* BD4D54 802414E4 2462FFE9 */ addiu $v0, $v1, -0x17 /* BD4D58 802414E8 44820000 */ mtc1 $v0, $f0 -/* BD4D5C 802414EC 00000000 */ nop +/* BD4D5C 802414EC 00000000 */ nop /* BD4D60 802414F0 46800020 */ cvt.s.w $f0, $f0 /* BD4D64 802414F4 4600103E */ c.le.s $f2, $f0 -/* BD4D68 802414F8 00000000 */ nop +/* BD4D68 802414F8 00000000 */ nop /* BD4D6C 802414FC 4500000B */ bc1f .L8024152C /* BD4D70 80241500 2462FFE5 */ addiu $v0, $v1, -0x1b /* BD4D74 80241504 44820000 */ mtc1 $v0, $f0 -/* BD4D78 80241508 00000000 */ nop +/* BD4D78 80241508 00000000 */ nop /* BD4D7C 8024150C 46800020 */ cvt.s.w $f0, $f0 /* BD4D80 80241510 4602003E */ c.le.s $f0, $f2 -/* BD4D84 80241514 00000000 */ nop +/* BD4D84 80241514 00000000 */ nop /* BD4D88 80241518 45000004 */ bc1f .L8024152C /* BD4D8C 8024151C 24020001 */ addiu $v0, $zero, 1 /* BD4D90 80241520 AE420088 */ sw $v0, 0x88($s2) @@ -149,17 +149,17 @@ glabel func_80241300_BD4B70 /* BD4D9C 8024152C C6E2000C */ lwc1 $f2, 0xc($s7) /* BD4DA0 80241530 2462FFE9 */ addiu $v0, $v1, -0x17 /* BD4DA4 80241534 44820000 */ mtc1 $v0, $f0 -/* BD4DA8 80241538 00000000 */ nop +/* BD4DA8 80241538 00000000 */ nop /* BD4DAC 8024153C 46800020 */ cvt.s.w $f0, $f0 /* BD4DB0 80241540 4600103E */ c.le.s $f2, $f0 -/* BD4DB4 80241544 00000000 */ nop +/* BD4DB4 80241544 00000000 */ nop /* BD4DB8 80241548 4500000A */ bc1f .L80241574 /* BD4DBC 8024154C 2462FFE5 */ addiu $v0, $v1, -0x1b /* BD4DC0 80241550 44820000 */ mtc1 $v0, $f0 -/* BD4DC4 80241554 00000000 */ nop +/* BD4DC4 80241554 00000000 */ nop /* BD4DC8 80241558 46800020 */ cvt.s.w $f0, $f0 /* BD4DCC 8024155C 4602003E */ c.le.s $f0, $f2 -/* BD4DD0 80241560 00000000 */ nop +/* BD4DD0 80241560 00000000 */ nop /* BD4DD4 80241564 45000003 */ bc1f .L80241574 /* BD4DD8 80241568 24020001 */ addiu $v0, $zero, 1 /* BD4DDC 8024156C AE420088 */ sw $v0, 0x88($s2) @@ -169,17 +169,17 @@ glabel func_80241300_BD4B70 /* BD4DE8 80241578 C7C2000C */ lwc1 $f2, 0xc($fp) /* BD4DEC 8024157C 2462FFE9 */ addiu $v0, $v1, -0x17 /* BD4DF0 80241580 44820000 */ mtc1 $v0, $f0 -/* BD4DF4 80241584 00000000 */ nop +/* BD4DF4 80241584 00000000 */ nop /* BD4DF8 80241588 46800020 */ cvt.s.w $f0, $f0 /* BD4DFC 8024158C 4600103E */ c.le.s $f2, $f0 -/* BD4E00 80241590 00000000 */ nop +/* BD4E00 80241590 00000000 */ nop /* BD4E04 80241594 4500000B */ bc1f .L802415C4 /* BD4E08 80241598 2462FFE5 */ addiu $v0, $v1, -0x1b /* BD4E0C 8024159C 44820000 */ mtc1 $v0, $f0 -/* BD4E10 802415A0 00000000 */ nop +/* BD4E10 802415A0 00000000 */ nop /* BD4E14 802415A4 46800020 */ cvt.s.w $f0, $f0 /* BD4E18 802415A8 4602003E */ c.le.s $f0, $f2 -/* BD4E1C 802415AC 00000000 */ nop +/* BD4E1C 802415AC 00000000 */ nop /* BD4E20 802415B0 45000004 */ bc1f .L802415C4 /* BD4E24 802415B4 24020001 */ addiu $v0, $zero, 1 /* BD4E28 802415B8 AE420088 */ sw $v0, 0x88($s2) @@ -190,17 +190,17 @@ glabel func_80241300_BD4B70 /* BD4E38 802415C8 2462FFE9 */ addiu $v0, $v1, -0x17 /* BD4E3C 802415CC C4E2000C */ lwc1 $f2, 0xc($a3) /* BD4E40 802415D0 44820000 */ mtc1 $v0, $f0 -/* BD4E44 802415D4 00000000 */ nop +/* BD4E44 802415D4 00000000 */ nop /* BD4E48 802415D8 46800020 */ cvt.s.w $f0, $f0 /* BD4E4C 802415DC 4600103E */ c.le.s $f2, $f0 -/* BD4E50 802415E0 00000000 */ nop +/* BD4E50 802415E0 00000000 */ nop /* BD4E54 802415E4 4500000A */ bc1f .L80241610 /* BD4E58 802415E8 2462FFE5 */ addiu $v0, $v1, -0x1b /* BD4E5C 802415EC 44820000 */ mtc1 $v0, $f0 -/* BD4E60 802415F0 00000000 */ nop +/* BD4E60 802415F0 00000000 */ nop /* BD4E64 802415F4 46800020 */ cvt.s.w $f0, $f0 /* BD4E68 802415F8 4602003E */ c.le.s $f0, $f2 -/* BD4E6C 802415FC 00000000 */ nop +/* BD4E6C 802415FC 00000000 */ nop /* BD4E70 80241600 45000003 */ bc1f .L80241610 /* BD4E74 80241604 24020001 */ addiu $v0, $zero, 1 /* BD4E78 80241608 AE420088 */ sw $v0, 0x88($s2) diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241658_BD4EC8.s b/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241658_BD4EC8.s index 01cf027d42..80b1a796ed 100644 --- a/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241658_BD4EC8.s +++ b/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241658_BD4EC8.s @@ -21,34 +21,34 @@ glabel func_80241658_BD4EC8 /* BD4F08 80241698 46000106 */ mov.s $f4, $f0 /* BD4F0C 8024169C 3C0142B4 */ lui $at, 0x42b4 /* BD4F10 802416A0 44811000 */ mtc1 $at, $f2 -/* BD4F14 802416A4 00000000 */ nop +/* BD4F14 802416A4 00000000 */ nop /* BD4F18 802416A8 4604103C */ c.lt.s $f2, $f4 -/* BD4F1C 802416AC 00000000 */ nop +/* BD4F1C 802416AC 00000000 */ nop /* BD4F20 802416B0 45010002 */ bc1t .L802416BC /* BD4F24 802416B4 0240882D */ daddu $s1, $s2, $zero /* BD4F28 802416B8 0000102D */ daddu $v0, $zero, $zero .L802416BC: /* BD4F2C 802416BC 3C014316 */ lui $at, 0x4316 /* BD4F30 802416C0 44810000 */ mtc1 $at, $f0 -/* BD4F34 802416C4 00000000 */ nop +/* BD4F34 802416C4 00000000 */ nop /* BD4F38 802416C8 4600203C */ c.lt.s $f4, $f0 -/* BD4F3C 802416CC 00000000 */ nop +/* BD4F3C 802416CC 00000000 */ nop /* BD4F40 802416D0 45010002 */ bc1t .L802416DC /* BD4F44 802416D4 24030001 */ addiu $v1, $zero, 1 /* BD4F48 802416D8 0000182D */ daddu $v1, $zero, $zero .L802416DC: /* BD4F4C 802416DC 00431025 */ or $v0, $v0, $v1 /* BD4F50 802416E0 1040001C */ beqz $v0, .L80241754 -/* BD4F54 802416E4 00000000 */ nop +/* BD4F54 802416E4 00000000 */ nop /* BD4F58 802416E8 C64C0028 */ lwc1 $f12, 0x28($s2) /* BD4F5C 802416EC C64E0030 */ lwc1 $f14, 0x30($s2) /* BD4F60 802416F0 4406A000 */ mfc1 $a2, $f20 /* BD4F64 802416F4 4407A000 */ mfc1 $a3, $f20 /* BD4F68 802416F8 0C00A720 */ jal atan2 -/* BD4F6C 802416FC 00000000 */ nop +/* BD4F6C 802416FC 00000000 */ nop /* BD4F70 80241700 3C014334 */ lui $at, 0x4334 /* BD4F74 80241704 44811000 */ mtc1 $at, $f2 -/* BD4F78 80241708 00000000 */ nop +/* BD4F78 80241708 00000000 */ nop /* BD4F7C 8024170C 46020000 */ add.s $f0, $f0, $f2 /* BD4F80 80241710 3C0542A0 */ lui $a1, 0x42a0 /* BD4F84 80241714 44060000 */ mfc1 $a2, $f0 @@ -87,4 +87,4 @@ glabel func_80241658_BD4EC8 /* BD5000 80241790 24020002 */ addiu $v0, $zero, 2 /* BD5004 80241794 03E00008 */ jr $ra /* BD5008 80241798 27BD0368 */ addiu $sp, $sp, 0x368 -/* BD500C 8024179C 00000000 */ nop +/* BD500C 8024179C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_09/BDA7B0/func_80240000_BDA7B0.s b/asm/nonmatchings/world/area_obk/obk_09/BDA7B0/func_80240000_BDA7B0.s index dcb8e005e1..6c638969e7 100644 --- a/asm/nonmatchings/world/area_obk/obk_09/BDA7B0/func_80240000_BDA7B0.s +++ b/asm/nonmatchings/world/area_obk/obk_09/BDA7B0/func_80240000_BDA7B0.s @@ -41,14 +41,14 @@ glabel func_80240000_BDA7B0 /* BDA83C 8024008C 10600009 */ beqz $v1, .L802400B4 /* BDA840 80240090 0000102D */ daddu $v0, $zero, $zero /* BDA844 80240094 08090059 */ j .L80240164 -/* BDA848 80240098 00000000 */ nop +/* BDA848 80240098 00000000 */ nop .L8024009C: /* BDA84C 8024009C 10620013 */ beq $v1, $v0, .L802400EC /* BDA850 802400A0 24020003 */ addiu $v0, $zero, 3 /* BDA854 802400A4 1062001E */ beq $v1, $v0, .L80240120 /* BDA858 802400A8 0000102D */ daddu $v0, $zero, $zero /* BDA85C 802400AC 08090059 */ j .L80240164 -/* BDA860 802400B0 00000000 */ nop +/* BDA860 802400B0 00000000 */ nop .L802400B4: /* BDA864 802400B4 0C03AC5A */ jal func_800EB168 /* BDA868 802400B8 0000202D */ daddu $a0, $zero, $zero @@ -75,7 +75,7 @@ glabel func_80240000_BDA7B0 /* BDA8B4 80240104 A0510014 */ sb $s1, 0x14($v0) /* BDA8B8 80240108 82640012 */ lb $a0, 0x12($s3) /* BDA8BC 8024010C 0C03ACA9 */ jal func_800EB2A4 -/* BDA8C0 80240110 00000000 */ nop +/* BDA8C0 80240110 00000000 */ nop /* BDA8C4 80240114 24020003 */ addiu $v0, $zero, 3 /* BDA8C8 80240118 08090058 */ j .L80240160 /* BDA8CC 8024011C AE420070 */ sw $v0, 0x70($s2) @@ -107,6 +107,6 @@ glabel func_80240000_BDA7B0 /* BDA928 80240178 8FB00010 */ lw $s0, 0x10($sp) /* BDA92C 8024017C 03E00008 */ jr $ra /* BDA930 80240180 27BD0028 */ addiu $sp, $sp, 0x28 -/* BDA934 80240184 00000000 */ nop -/* BDA938 80240188 00000000 */ nop -/* BDA93C 8024018C 00000000 */ nop +/* BDA934 80240184 00000000 */ nop +/* BDA938 80240188 00000000 */ nop +/* BDA93C 8024018C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_09/BDA940/func_80240248_BDA9F8.s b/asm/nonmatchings/world/area_obk/obk_09/BDA940/func_80240248_BDA9F8.s index dcc2306df1..8d356020ce 100644 --- a/asm/nonmatchings/world/area_obk/obk_09/BDA940/func_80240248_BDA9F8.s +++ b/asm/nonmatchings/world/area_obk/obk_09/BDA940/func_80240248_BDA9F8.s @@ -17,7 +17,7 @@ glabel func_80240248_BDA9F8 /* BDAA28 80240278 C6200038 */ lwc1 $f0, 0x38($s1) /* BDAA2C 8024027C 3C014000 */ lui $at, 0x4000 /* BDAA30 80240280 44811000 */ mtc1 $at, $f2 -/* BDAA34 80240284 00000000 */ nop +/* BDAA34 80240284 00000000 */ nop /* BDAA38 80240288 46020001 */ sub.s $f0, $f0, $f2 /* BDAA3C 8024028C 3C014140 */ lui $at, 0x4140 /* BDAA40 80240290 44811000 */ mtc1 $at, $f2 @@ -66,5 +66,5 @@ glabel func_80240248_BDA9F8 /* BDAAEC 8024033C 0000102D */ daddu $v0, $zero, $zero /* BDAAF0 80240340 03E00008 */ jr $ra /* BDAAF4 80240344 27BD0020 */ addiu $sp, $sp, 0x20 -/* BDAAF8 80240348 00000000 */ nop -/* BDAAFC 8024034C 00000000 */ nop +/* BDAAF8 80240348 00000000 */ nop +/* BDAAFC 8024034C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_09/BDAB00/func_80240350_BDAB00.s b/asm/nonmatchings/world/area_obk/obk_09/BDAB00/func_80240350_BDAB00.s index 462d840711..2a1090428e 100644 --- a/asm/nonmatchings/world/area_obk/obk_09/BDAB00/func_80240350_BDAB00.s +++ b/asm/nonmatchings/world/area_obk/obk_09/BDAB00/func_80240350_BDAB00.s @@ -39,6 +39,6 @@ glabel func_80240350_BDAB00 /* BDAB88 802403D8 24020002 */ addiu $v0, $zero, 2 /* BDAB8C 802403DC 03E00008 */ jr $ra /* BDAB90 802403E0 27BD0028 */ addiu $sp, $sp, 0x28 -/* BDAB94 802403E4 00000000 */ nop -/* BDAB98 802403E8 00000000 */ nop -/* BDAB9C 802403EC 00000000 */ nop +/* BDAB94 802403E4 00000000 */ nop +/* BDAB98 802403E8 00000000 */ nop +/* BDAB9C 802403EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_09/BDABA0/func_802403F0_BDABA0.s b/asm/nonmatchings/world/area_obk/obk_09/BDABA0/func_802403F0_BDABA0.s index 2f8bf55db9..e1374058e2 100644 --- a/asm/nonmatchings/world/area_obk/obk_09/BDABA0/func_802403F0_BDABA0.s +++ b/asm/nonmatchings/world/area_obk/obk_09/BDABA0/func_802403F0_BDABA0.s @@ -9,12 +9,12 @@ glabel func_802403F0_BDABA0 /* BDABB0 80240400 3C013F19 */ lui $at, 0x3f19 /* BDABB4 80240404 3421999A */ ori $at, $at, 0x999a /* BDABB8 80240408 44810000 */ mtc1 $at, $f0 -/* BDABBC 8024040C 00000000 */ nop +/* BDABBC 8024040C 00000000 */ nop /* BDABC0 80240410 E4400030 */ swc1 $f0, 0x30($v0) /* BDABC4 80240414 8FBF0010 */ lw $ra, 0x10($sp) /* BDABC8 80240418 24020002 */ addiu $v0, $zero, 2 /* BDABCC 8024041C 03E00008 */ jr $ra /* BDABD0 80240420 27BD0018 */ addiu $sp, $sp, 0x18 -/* BDABD4 80240424 00000000 */ nop -/* BDABD8 80240428 00000000 */ nop -/* BDABDC 8024042C 00000000 */ nop +/* BDABD4 80240424 00000000 */ nop +/* BDABD8 80240428 00000000 */ nop +/* BDABDC 8024042C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_01/D9AEF0/func_80240000_D9AEF0.s b/asm/nonmatchings/world/area_omo/omo_01/D9AEF0/func_80240000_D9AEF0.s index d64eebff28..06d563d5c7 100644 --- a/asm/nonmatchings/world/area_omo/omo_01/D9AEF0/func_80240000_D9AEF0.s +++ b/asm/nonmatchings/world/area_omo/omo_01/D9AEF0/func_80240000_D9AEF0.s @@ -63,31 +63,31 @@ glabel func_80240000_D9AEF0 /* D9AFCC 802400DC E64C000C */ swc1 $f12, 0xc($s2) /* D9AFD0 802400E0 3C0141A0 */ lui $at, 0x41a0 /* D9AFD4 802400E4 44811000 */ mtc1 $at, $f2 -/* D9AFD8 802400E8 00000000 */ nop +/* D9AFD8 802400E8 00000000 */ nop /* D9AFDC 802400EC 46020502 */ mul.s $f20, $f0, $f2 -/* D9AFE0 802400F0 00000000 */ nop +/* D9AFE0 802400F0 00000000 */ nop /* D9AFE4 802400F4 4614A082 */ mul.s $f2, $f20, $f20 -/* D9AFE8 802400F8 00000000 */ nop +/* D9AFE8 802400F8 00000000 */ nop /* D9AFEC 802400FC 3C0142B4 */ lui $at, 0x42b4 /* D9AFF0 80240100 44810000 */ mtc1 $at, $f0 /* D9AFF4 80240104 1680001B */ bnez $s4, .L80240174 /* D9AFF8 80240108 46001603 */ div.s $f24, $f2, $f0 /* D9AFFC 8024010C C6400004 */ lwc1 $f0, 4($s2) /* D9B000 80240110 4600B03E */ c.le.s $f22, $f0 -/* D9B004 80240114 00000000 */ nop +/* D9B004 80240114 00000000 */ nop /* D9B008 80240118 45000005 */ bc1f .L80240130 -/* D9B00C 8024011C 00000000 */ nop +/* D9B00C 8024011C 00000000 */ nop /* D9B010 80240120 4616A03C */ c.lt.s $f20, $f22 -/* D9B014 80240124 00000000 */ nop +/* D9B014 80240124 00000000 */ nop /* D9B018 80240128 4501000A */ bc1t .L80240154 /* D9B01C 8024012C 240401D6 */ addiu $a0, $zero, 0x1d6 .L80240130: /* D9B020 80240130 4616003C */ c.lt.s $f0, $f22 -/* D9B024 80240134 00000000 */ nop +/* D9B024 80240134 00000000 */ nop /* D9B028 80240138 4502000E */ bc1fl .L80240174 /* D9B02C 8024013C E6540004 */ swc1 $f20, 4($s2) /* D9B030 80240140 4614B03E */ c.le.s $f22, $f20 -/* D9B034 80240144 00000000 */ nop +/* D9B034 80240144 00000000 */ nop /* D9B038 80240148 4502000A */ bc1fl .L80240174 /* D9B03C 8024014C E6540004 */ swc1 $f20, 4($s2) /* D9B040 80240150 240401D6 */ addiu $a0, $zero, 0x1d6 @@ -159,4 +159,4 @@ glabel func_80240000_D9AEF0 /* D9B140 80240250 D7B400B8 */ ldc1 $f20, 0xb8($sp) /* D9B144 80240254 03E00008 */ jr $ra /* D9B148 80240258 27BD00D0 */ addiu $sp, $sp, 0xd0 -/* D9B14C 8024025C 00000000 */ nop +/* D9B14C 8024025C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_80240260_D9B150.s b/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_80240260_D9B150.s index 37cdae4b7b..aee025d9dc 100644 --- a/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_80240260_D9B150.s +++ b/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_80240260_D9B150.s @@ -61,20 +61,20 @@ glabel func_80240260_D9B150 /* D9B230 80240340 8E22001C */ lw $v0, 0x1c($s1) /* D9B234 80240344 46001005 */ abs.s $f0, $f2 /* D9B238 80240348 44822000 */ mtc1 $v0, $f4 -/* D9B23C 8024034C 00000000 */ nop +/* D9B23C 8024034C 00000000 */ nop /* D9B240 80240350 46802120 */ cvt.s.w $f4, $f4 /* D9B244 80240354 4600203C */ c.lt.s $f4, $f0 -/* D9B248 80240358 00000000 */ nop +/* D9B248 80240358 00000000 */ nop /* D9B24C 8024035C 4500000D */ bc1f .L80240394 -/* D9B250 80240360 00000000 */ nop +/* D9B250 80240360 00000000 */ nop /* D9B254 80240364 44800000 */ mtc1 $zero, $f0 /* D9B258 80240368 C614000C */ lwc1 $f20, 0xc($s0) /* D9B25C 8024036C 4600103C */ c.lt.s $f2, $f0 -/* D9B260 80240370 00000000 */ nop +/* D9B260 80240370 00000000 */ nop /* D9B264 80240374 45000006 */ bc1f .L80240390 /* D9B268 80240378 00021023 */ negu $v0, $v0 /* D9B26C 8024037C 44820000 */ mtc1 $v0, $f0 -/* D9B270 80240380 00000000 */ nop +/* D9B270 80240380 00000000 */ nop /* D9B274 80240384 46800020 */ cvt.s.w $f0, $f0 /* D9B278 80240388 080900E5 */ j .L80240394 /* D9B27C 8024038C 4600A500 */ add.s $f20, $f20, $f0 @@ -108,7 +108,7 @@ glabel func_80240260_D9B150 /* D9B2E4 802403F4 4480E000 */ mtc1 $zero, $f28 /* D9B2E8 802403F8 460010A1 */ cvt.d.s $f2, $f2 /* D9B2EC 802403FC 463C1082 */ mul.d $f2, $f2, $f28 -/* D9B2F0 80240400 00000000 */ nop +/* D9B2F0 80240400 00000000 */ nop /* D9B2F4 80240404 46000506 */ mov.s $f20, $f0 /* D9B2F8 80240408 27A50020 */ addiu $a1, $sp, 0x20 /* D9B2FC 8024040C 27A60024 */ addiu $a2, $sp, 0x24 @@ -119,20 +119,20 @@ glabel func_80240260_D9B150 /* D9B310 80240420 860200A8 */ lh $v0, 0xa8($s0) /* D9B314 80240424 4480B000 */ mtc1 $zero, $f22 /* D9B318 80240428 44820000 */ mtc1 $v0, $f0 -/* D9B31C 8024042C 00000000 */ nop +/* D9B31C 8024042C 00000000 */ nop /* D9B320 80240430 46800020 */ cvt.s.w $f0, $f0 /* D9B324 80240434 E7A00018 */ swc1 $f0, 0x18($sp) /* D9B328 80240438 860200A6 */ lh $v0, 0xa6($s0) /* D9B32C 8024043C 4600B606 */ mov.s $f24, $f22 /* D9B330 80240440 44820000 */ mtc1 $v0, $f0 -/* D9B334 80240444 00000000 */ nop +/* D9B334 80240444 00000000 */ nop /* D9B338 80240448 46800020 */ cvt.s.w $f0, $f0 /* D9B33C 8024044C E7A0001C */ swc1 $f0, 0x1c($sp) /* D9B340 80240450 8E040080 */ lw $a0, 0x80($s0) /* D9B344 80240454 0C03773B */ jal func_800DDCEC /* D9B348 80240458 4600C686 */ mov.s $f26, $f24 /* D9B34C 8024045C 104000E1 */ beqz $v0, .L802407E4 -/* D9B350 80240460 00000000 */ nop +/* D9B350 80240460 00000000 */ nop /* D9B354 80240464 C60C0038 */ lwc1 $f12, 0x38($s0) /* D9B358 80240468 C60E0040 */ lwc1 $f14, 0x40($s0) /* D9B35C 8024046C 8FA60020 */ lw $a2, 0x20($sp) @@ -152,27 +152,27 @@ glabel func_80240260_D9B150 /* D9B394 802404A4 C6020018 */ lwc1 $f2, 0x18($s0) /* D9B398 802404A8 460010A1 */ cvt.d.s $f2, $f2 /* D9B39C 802404AC 463C1082 */ mul.d $f2, $f2, $f28 -/* D9B3A0 802404B0 00000000 */ nop +/* D9B3A0 802404B0 00000000 */ nop /* D9B3A4 802404B4 E7A00014 */ swc1 $f0, 0x14($sp) /* D9B3A8 802404B8 462010A0 */ cvt.s.d $f2, $f2 /* D9B3AC 802404BC E7A20010 */ swc1 $f2, 0x10($sp) /* D9B3B0 802404C0 860200A8 */ lh $v0, 0xa8($s0) /* D9B3B4 802404C4 27A5002C */ addiu $a1, $sp, 0x2c /* D9B3B8 802404C8 44820000 */ mtc1 $v0, $f0 -/* D9B3BC 802404CC 00000000 */ nop +/* D9B3BC 802404CC 00000000 */ nop /* D9B3C0 802404D0 46800020 */ cvt.s.w $f0, $f0 /* D9B3C4 802404D4 E7A00018 */ swc1 $f0, 0x18($sp) /* D9B3C8 802404D8 860200A6 */ lh $v0, 0xa6($s0) /* D9B3CC 802404DC 27A60030 */ addiu $a2, $sp, 0x30 /* D9B3D0 802404E0 44820000 */ mtc1 $v0, $f0 -/* D9B3D4 802404E4 00000000 */ nop +/* D9B3D4 802404E4 00000000 */ nop /* D9B3D8 802404E8 46800020 */ cvt.s.w $f0, $f0 /* D9B3DC 802404EC E7A0001C */ swc1 $f0, 0x1c($sp) /* D9B3E0 802404F0 8E040080 */ lw $a0, 0x80($s0) /* D9B3E4 802404F4 0C03773B */ jal func_800DDCEC /* D9B3E8 802404F8 27A70034 */ addiu $a3, $sp, 0x34 /* D9B3EC 802404FC 10400007 */ beqz $v0, .L8024051C -/* D9B3F0 80240500 00000000 */ nop +/* D9B3F0 80240500 00000000 */ nop /* D9B3F4 80240504 C60C0038 */ lwc1 $f12, 0x38($s0) /* D9B3F8 80240508 C60E0040 */ lwc1 $f14, 0x40($s0) /* D9B3FC 8024050C 8FA6002C */ lw $a2, 0x2c($sp) @@ -191,27 +191,27 @@ glabel func_80240260_D9B150 /* D9B42C 8024053C C6020018 */ lwc1 $f2, 0x18($s0) /* D9B430 80240540 460010A1 */ cvt.d.s $f2, $f2 /* D9B434 80240544 463C1082 */ mul.d $f2, $f2, $f28 -/* D9B438 80240548 00000000 */ nop +/* D9B438 80240548 00000000 */ nop /* D9B43C 8024054C E7A00014 */ swc1 $f0, 0x14($sp) /* D9B440 80240550 462010A0 */ cvt.s.d $f2, $f2 /* D9B444 80240554 E7A20010 */ swc1 $f2, 0x10($sp) /* D9B448 80240558 860200A8 */ lh $v0, 0xa8($s0) /* D9B44C 8024055C 27A50038 */ addiu $a1, $sp, 0x38 /* D9B450 80240560 44820000 */ mtc1 $v0, $f0 -/* D9B454 80240564 00000000 */ nop +/* D9B454 80240564 00000000 */ nop /* D9B458 80240568 46800020 */ cvt.s.w $f0, $f0 /* D9B45C 8024056C E7A00018 */ swc1 $f0, 0x18($sp) /* D9B460 80240570 860200A6 */ lh $v0, 0xa6($s0) /* D9B464 80240574 27A6003C */ addiu $a2, $sp, 0x3c /* D9B468 80240578 44820000 */ mtc1 $v0, $f0 -/* D9B46C 8024057C 00000000 */ nop +/* D9B46C 8024057C 00000000 */ nop /* D9B470 80240580 46800020 */ cvt.s.w $f0, $f0 /* D9B474 80240584 E7A0001C */ swc1 $f0, 0x1c($sp) /* D9B478 80240588 8E040080 */ lw $a0, 0x80($s0) /* D9B47C 8024058C 0C03773B */ jal func_800DDCEC /* D9B480 80240590 27A70040 */ addiu $a3, $sp, 0x40 /* D9B484 80240594 10400007 */ beqz $v0, .L802405B4 -/* D9B488 80240598 00000000 */ nop +/* D9B488 80240598 00000000 */ nop /* D9B48C 8024059C C60C0038 */ lwc1 $f12, 0x38($s0) /* D9B490 802405A0 C60E0040 */ lwc1 $f14, 0x40($s0) /* D9B494 802405A4 8FA60038 */ lw $a2, 0x38($sp) @@ -231,20 +231,20 @@ glabel func_80240260_D9B150 /* D9B4C8 802405D8 44801000 */ mtc1 $zero, $f2 /* D9B4CC 802405DC 46000021 */ cvt.d.s $f0, $f0 /* D9B4D0 802405E0 46220082 */ mul.d $f2, $f0, $f2 -/* D9B4D4 802405E4 00000000 */ nop +/* D9B4D4 802405E4 00000000 */ nop /* D9B4D8 802405E8 4600B021 */ cvt.d.s $f0, $f22 /* D9B4DC 802405EC 4622003C */ c.lt.d $f0, $f2 -/* D9B4E0 802405F0 00000000 */ nop +/* D9B4E0 802405F0 00000000 */ nop /* D9B4E4 802405F4 45000012 */ bc1f .L80240640 -/* D9B4E8 802405F8 00000000 */ nop +/* D9B4E8 802405F8 00000000 */ nop /* D9B4EC 802405FC 4600C021 */ cvt.d.s $f0, $f24 /* D9B4F0 80240600 4622003C */ c.lt.d $f0, $f2 -/* D9B4F4 80240604 00000000 */ nop +/* D9B4F4 80240604 00000000 */ nop /* D9B4F8 80240608 4500000D */ bc1f .L80240640 -/* D9B4FC 8024060C 00000000 */ nop +/* D9B4FC 8024060C 00000000 */ nop /* D9B500 80240610 4600D021 */ cvt.d.s $f0, $f26 /* D9B504 80240614 4622003C */ c.lt.d $f0, $f2 -/* D9B508 80240618 00000000 */ nop +/* D9B508 80240618 00000000 */ nop /* D9B50C 8024061C 45000008 */ bc1f .L80240640 /* D9B510 80240620 02A0202D */ daddu $a0, $s5, $zero /* D9B514 80240624 AFA00010 */ sw $zero, 0x10($sp) @@ -258,13 +258,13 @@ glabel func_80240260_D9B150 /* D9B530 80240640 1660006A */ bnez $s3, .L802407EC /* D9B534 80240644 2402000A */ addiu $v0, $zero, 0xa /* D9B538 80240648 4616C03C */ c.lt.s $f24, $f22 -/* D9B53C 8024064C 00000000 */ nop +/* D9B53C 8024064C 00000000 */ nop /* D9B540 80240650 4500000C */ bc1f .L80240684 -/* D9B544 80240654 00000000 */ nop +/* D9B544 80240654 00000000 */ nop /* D9B548 80240658 4618D03C */ c.lt.s $f26, $f24 -/* D9B54C 8024065C 00000000 */ nop +/* D9B54C 8024065C 00000000 */ nop /* D9B550 80240660 45000006 */ bc1f .L8024067C -/* D9B554 80240664 00000000 */ nop +/* D9B554 80240664 00000000 */ nop /* D9B558 80240668 C60C0038 */ lwc1 $f12, 0x38($s0) /* D9B55C 8024066C C60E0040 */ lwc1 $f14, 0x40($s0) /* D9B560 80240670 8FA60020 */ lw $a2, 0x20($sp) @@ -272,14 +272,14 @@ glabel func_80240260_D9B150 /* D9B568 80240678 8FA70028 */ lw $a3, 0x28($sp) .L8024067C: /* D9B56C 8024067C 4616C03C */ c.lt.s $f24, $f22 -/* D9B570 80240680 00000000 */ nop +/* D9B570 80240680 00000000 */ nop .L80240684: /* D9B574 80240684 4500000A */ bc1f .L802406B0 -/* D9B578 80240688 00000000 */ nop +/* D9B578 80240688 00000000 */ nop /* D9B57C 8024068C 461AC03C */ c.lt.s $f24, $f26 -/* D9B580 80240690 00000000 */ nop +/* D9B580 80240690 00000000 */ nop /* D9B584 80240694 45000006 */ bc1f .L802406B0 -/* D9B588 80240698 00000000 */ nop +/* D9B588 80240698 00000000 */ nop /* D9B58C 8024069C C60C0038 */ lwc1 $f12, 0x38($s0) /* D9B590 802406A0 C60E0040 */ lwc1 $f14, 0x40($s0) /* D9B594 802406A4 8FA60020 */ lw $a2, 0x20($sp) @@ -287,13 +287,13 @@ glabel func_80240260_D9B150 /* D9B59C 802406AC 8FA70028 */ lw $a3, 0x28($sp) .L802406B0: /* D9B5A0 802406B0 4618B03C */ c.lt.s $f22, $f24 -/* D9B5A4 802406B4 00000000 */ nop +/* D9B5A4 802406B4 00000000 */ nop /* D9B5A8 802406B8 4500000A */ bc1f .L802406E4 -/* D9B5AC 802406BC 00000000 */ nop +/* D9B5AC 802406BC 00000000 */ nop /* D9B5B0 802406C0 4616D03C */ c.lt.s $f26, $f22 -/* D9B5B4 802406C4 00000000 */ nop +/* D9B5B4 802406C4 00000000 */ nop /* D9B5B8 802406C8 45000006 */ bc1f .L802406E4 -/* D9B5BC 802406CC 00000000 */ nop +/* D9B5BC 802406CC 00000000 */ nop /* D9B5C0 802406D0 C60C0038 */ lwc1 $f12, 0x38($s0) /* D9B5C4 802406D4 C60E0040 */ lwc1 $f14, 0x40($s0) /* D9B5C8 802406D8 8FA6002C */ lw $a2, 0x2c($sp) @@ -301,13 +301,13 @@ glabel func_80240260_D9B150 /* D9B5D0 802406E0 8FA70034 */ lw $a3, 0x34($sp) .L802406E4: /* D9B5D4 802406E4 4618D03C */ c.lt.s $f26, $f24 -/* D9B5D8 802406E8 00000000 */ nop +/* D9B5D8 802406E8 00000000 */ nop /* D9B5DC 802406EC 4500000A */ bc1f .L80240718 -/* D9B5E0 802406F0 00000000 */ nop +/* D9B5E0 802406F0 00000000 */ nop /* D9B5E4 802406F4 461AB03C */ c.lt.s $f22, $f26 -/* D9B5E8 802406F8 00000000 */ nop +/* D9B5E8 802406F8 00000000 */ nop /* D9B5EC 802406FC 45000008 */ bc1f .L80240720 -/* D9B5F0 80240700 00000000 */ nop +/* D9B5F0 80240700 00000000 */ nop /* D9B5F4 80240704 C60C0038 */ lwc1 $f12, 0x38($s0) /* D9B5F8 80240708 C60E0040 */ lwc1 $f14, 0x40($s0) /* D9B5FC 8024070C 8FA6002C */ lw $a2, 0x2c($sp) @@ -315,23 +315,23 @@ glabel func_80240260_D9B150 /* D9B604 80240714 8FA70034 */ lw $a3, 0x34($sp) .L80240718: /* D9B608 80240718 461AB03C */ c.lt.s $f22, $f26 -/* D9B60C 8024071C 00000000 */ nop +/* D9B60C 8024071C 00000000 */ nop .L80240720: /* D9B610 80240720 45000005 */ bc1f .L80240738 -/* D9B614 80240724 00000000 */ nop +/* D9B614 80240724 00000000 */ nop /* D9B618 80240728 4616C03C */ c.lt.s $f24, $f22 -/* D9B61C 8024072C 00000000 */ nop +/* D9B61C 8024072C 00000000 */ nop /* D9B620 80240730 45010009 */ bc1t .L80240758 -/* D9B624 80240734 00000000 */ nop +/* D9B624 80240734 00000000 */ nop .L80240738: /* D9B628 80240738 461AC03C */ c.lt.s $f24, $f26 -/* D9B62C 8024073C 00000000 */ nop +/* D9B62C 8024073C 00000000 */ nop /* D9B630 80240740 4500000C */ bc1f .L80240774 -/* D9B634 80240744 00000000 */ nop +/* D9B634 80240744 00000000 */ nop /* D9B638 80240748 4618B03C */ c.lt.s $f22, $f24 -/* D9B63C 8024074C 00000000 */ nop +/* D9B63C 8024074C 00000000 */ nop /* D9B640 80240750 45000008 */ bc1f .L80240774 -/* D9B644 80240754 00000000 */ nop +/* D9B644 80240754 00000000 */ nop .L80240758: /* D9B648 80240758 C60C0038 */ lwc1 $f12, 0x38($s0) /* D9B64C 8024075C C60E0040 */ lwc1 $f14, 0x40($s0) @@ -339,7 +339,7 @@ glabel func_80240260_D9B150 /* D9B654 80240764 8FA70040 */ lw $a3, 0x40($sp) .L80240768: /* D9B658 80240768 0C00A720 */ jal atan2 -/* D9B65C 8024076C 00000000 */ nop +/* D9B65C 8024076C 00000000 */ nop /* D9B660 80240770 46000506 */ mov.s $f20, $f0 .L80240774: /* D9B664 80240774 C60C000C */ lwc1 $f12, 0xc($s0) @@ -349,20 +349,20 @@ glabel func_80240260_D9B150 /* D9B674 80240784 8E22001C */ lw $v0, 0x1c($s1) /* D9B678 80240788 46001005 */ abs.s $f0, $f2 /* D9B67C 8024078C 44822000 */ mtc1 $v0, $f4 -/* D9B680 80240790 00000000 */ nop +/* D9B680 80240790 00000000 */ nop /* D9B684 80240794 46802120 */ cvt.s.w $f4, $f4 /* D9B688 80240798 4600203C */ c.lt.s $f4, $f0 -/* D9B68C 8024079C 00000000 */ nop +/* D9B68C 8024079C 00000000 */ nop /* D9B690 802407A0 4500000D */ bc1f .L802407D8 -/* D9B694 802407A4 00000000 */ nop +/* D9B694 802407A4 00000000 */ nop /* D9B698 802407A8 44800000 */ mtc1 $zero, $f0 /* D9B69C 802407AC C614000C */ lwc1 $f20, 0xc($s0) /* D9B6A0 802407B0 4600103C */ c.lt.s $f2, $f0 -/* D9B6A4 802407B4 00000000 */ nop +/* D9B6A4 802407B4 00000000 */ nop /* D9B6A8 802407B8 45000006 */ bc1f .L802407D4 /* D9B6AC 802407BC 00021023 */ negu $v0, $v0 /* D9B6B0 802407C0 44820000 */ mtc1 $v0, $f0 -/* D9B6B4 802407C4 00000000 */ nop +/* D9B6B4 802407C4 00000000 */ nop /* D9B6B8 802407C8 46800020 */ cvt.s.w $f0, $f0 /* D9B6BC 802407CC 080901F6 */ j .L802407D8 /* D9B6C0 802407D0 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_80240844_D9B734.s b/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_80240844_D9B734.s index 5fa58c4ab3..137600dd46 100644 --- a/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_80240844_D9B734.s +++ b/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_80240844_D9B734.s @@ -36,7 +36,7 @@ glabel func_80240844_D9B734 /* D9B7B0 802408C0 2402000F */ addiu $v0, $zero, 0xf /* D9B7B4 802408C4 AFA2001C */ sw $v0, 0x1c($sp) /* D9B7B8 802408C8 44833000 */ mtc1 $v1, $f6 -/* D9B7BC 802408CC 00000000 */ nop +/* D9B7BC 802408CC 00000000 */ nop /* D9B7C0 802408D0 468031A0 */ cvt.s.w $f6, $f6 /* D9B7C4 802408D4 44073000 */ mfc1 $a3, $f6 /* D9B7C8 802408D8 27A20028 */ addiu $v0, $sp, 0x28 @@ -57,14 +57,14 @@ glabel func_80240844_D9B734 /* D9B800 80240910 8E030028 */ lw $v1, 0x28($s0) /* D9B804 80240914 8C420020 */ lw $v0, 0x20($v0) /* D9B808 80240918 10620014 */ beq $v1, $v0, .L8024096C -/* D9B80C 8024091C 00000000 */ nop +/* D9B80C 8024091C 00000000 */ nop /* D9B810 80240920 C6000018 */ lwc1 $f0, 0x18($s0) /* D9B814 80240924 3C014010 */ lui $at, 0x4010 /* D9B818 80240928 44811800 */ mtc1 $at, $f3 /* D9B81C 8024092C 44801000 */ mtc1 $zero, $f2 /* D9B820 80240930 46000021 */ cvt.d.s $f0, $f0 /* D9B824 80240934 4622003C */ c.lt.d $f0, $f2 -/* D9B828 80240938 00000000 */ nop +/* D9B828 80240938 00000000 */ nop /* D9B82C 8024093C 45000003 */ bc1f .L8024094C /* D9B830 80240940 0000282D */ daddu $a1, $zero, $zero /* D9B834 80240944 08090255 */ j .L80240954 @@ -74,7 +74,7 @@ glabel func_80240844_D9B734 /* D9B840 80240950 24050001 */ addiu $a1, $zero, 1 .L80240954: /* D9B844 80240954 0C00F598 */ jal func_8003D660 -/* D9B848 80240958 00000000 */ nop +/* D9B848 80240958 00000000 */ nop /* D9B84C 8024095C 8E050018 */ lw $a1, 0x18($s0) /* D9B850 80240960 8E06000C */ lw $a2, 0xc($s0) /* D9B854 80240964 0C00EA95 */ jal npc_move_heading diff --git a/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s b/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s index d888e7ce11..ceee8bd0af 100644 --- a/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s +++ b/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s @@ -85,60 +85,71 @@ glabel func_802409EC_D9B8DC /* D9BA0C 80240B1C 2C620064 */ sltiu $v0, $v1, 0x64 /* D9BA10 80240B20 10400036 */ beqz $v0, .L80240BFC /* D9BA14 80240B24 00031080 */ sll $v0, $v1, 2 -/* D9BA18 80240B28 3C018024 */ lui $at, %hi(func_80242448_CC5C58) +/* D9BA18 80240B28 3C018024 */ lui $at, %hi(jtbl_80242448_D9D338) /* D9BA1C 80240B2C 00220821 */ addu $at, $at, $v0 -/* D9BA20 80240B30 8C222448 */ lw $v0, %lo(func_80242448_CC5C58)($at) +/* D9BA20 80240B30 8C222448 */ lw $v0, %lo(jtbl_80242448_D9D338)($at) /* D9BA24 80240B34 00400008 */ jr $v0 /* D9BA28 80240B38 00000000 */ nop +glabel L80240B3C_D9BA2C /* D9BA2C 80240B3C 0280202D */ daddu $a0, $s4, $zero /* D9BA30 80240B40 0240282D */ daddu $a1, $s2, $zero /* D9BA34 80240B44 0C012568 */ jal func_800495A0 /* D9BA38 80240B48 0260302D */ daddu $a2, $s3, $zero +glabel L80240B4C_D9BA3C /* D9BA3C 80240B4C 0280202D */ daddu $a0, $s4, $zero /* D9BA40 80240B50 0240282D */ daddu $a1, $s2, $zero /* D9BA44 80240B54 0C0125AE */ jal func_800496B8 /* D9BA48 80240B58 0260302D */ daddu $a2, $s3, $zero /* D9BA4C 80240B5C 080902FF */ j .L80240BFC /* D9BA50 80240B60 00000000 */ nop +glabel L80240B64_D9BA54 /* D9BA54 80240B64 0280202D */ daddu $a0, $s4, $zero /* D9BA58 80240B68 0240282D */ daddu $a1, $s2, $zero /* D9BA5C 80240B6C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D9BA60 80240B70 0260302D */ daddu $a2, $s3, $zero +glabel L80240B74_D9BA64 /* D9BA64 80240B74 0280202D */ daddu $a0, $s4, $zero /* D9BA68 80240B78 0240282D */ daddu $a1, $s2, $zero /* D9BA6C 80240B7C 0C012701 */ jal func_80049C04 /* D9BA70 80240B80 0260302D */ daddu $a2, $s3, $zero /* D9BA74 80240B84 080902FF */ j .L80240BFC /* D9BA78 80240B88 00000000 */ nop +glabel L80240B8C_D9BA7C /* D9BA7C 80240B8C 0280202D */ daddu $a0, $s4, $zero /* D9BA80 80240B90 0240282D */ daddu $a1, $s2, $zero /* D9BA84 80240B94 0C01278F */ jal func_80049E3C /* D9BA88 80240B98 0260302D */ daddu $a2, $s3, $zero +glabel L80240B9C_D9BA8C /* D9BA8C 80240B9C 0280202D */ daddu $a0, $s4, $zero /* D9BA90 80240BA0 0240282D */ daddu $a1, $s2, $zero /* D9BA94 80240BA4 0C0127B3 */ jal func_80049ECC /* D9BA98 80240BA8 0260302D */ daddu $a2, $s3, $zero /* D9BA9C 80240BAC 080902FF */ j .L80240BFC /* D9BAA0 80240BB0 00000000 */ nop +glabel L80240BB4_D9BAA4 /* D9BAA4 80240BB4 0280202D */ daddu $a0, $s4, $zero /* D9BAA8 80240BB8 0240282D */ daddu $a1, $s2, $zero /* D9BAAC 80240BBC 0C090098 */ jal func_80240260_D9B150 /* D9BAB0 80240BC0 0260302D */ daddu $a2, $s3, $zero +glabel L80240BC4_D9BAB4 /* D9BAB4 80240BC4 0280202D */ daddu $a0, $s4, $zero /* D9BAB8 80240BC8 0240282D */ daddu $a1, $s2, $zero /* D9BABC 80240BCC 0C090211 */ jal func_80240844_D9B734 /* D9BAC0 80240BD0 0260302D */ daddu $a2, $s3, $zero /* D9BAC4 80240BD4 080902FF */ j .L80240BFC /* D9BAC8 80240BD8 00000000 */ nop +glabel L80240BDC_D9BACC /* D9BACC 80240BDC 0280202D */ daddu $a0, $s4, $zero /* D9BAD0 80240BE0 0240282D */ daddu $a1, $s2, $zero /* D9BAD4 80240BE4 0C09026A */ jal func_802409A8_D9B898 /* D9BAD8 80240BE8 0260302D */ daddu $a2, $s3, $zero /* D9BADC 80240BEC 080902FF */ j .L80240BFC /* D9BAE0 80240BF0 00000000 */ nop +glabel L80240BF4_D9BAE4 /* D9BAE4 80240BF4 0C0129CF */ jal func_8004A73C /* D9BAE8 80240BF8 0280202D */ daddu $a0, $s4, $zero .L80240BFC: +glabel L80240BFC_D9BAEC /* D9BAEC 80240BFC 8FBF0048 */ lw $ra, 0x48($sp) /* D9BAF0 80240C00 8FB50044 */ lw $s5, 0x44($sp) /* D9BAF4 80240C04 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240040_D9D510.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240040_D9D510.s index e64ae84f01..cb5bae22d1 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240040_D9D510.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240040_D9D510.s @@ -61,9 +61,9 @@ glabel func_80240040_D9D510 /* D9D5E4 80240114 3C014048 */ lui $at, 0x4048 /* D9D5E8 80240118 3421F5C3 */ ori $at, $at, 0xf5c3 /* D9D5EC 8024011C 44816000 */ mtc1 $at, $f12 -/* D9D5F0 80240120 00000000 */ nop +/* D9D5F0 80240120 00000000 */ nop /* D9D5F4 80240124 460C0302 */ mul.s $f12, $f0, $f12 -/* D9D5F8 80240128 00000000 */ nop +/* D9D5F8 80240128 00000000 */ nop /* D9D5FC 8024012C 3C014334 */ lui $at, 0x4334 /* D9D600 80240130 44811000 */ mtc1 $at, $f2 /* D9D604 80240134 E640000C */ swc1 $f0, 0xc($s2) @@ -71,31 +71,31 @@ glabel func_80240040_D9D510 /* D9D60C 8024013C 46026303 */ div.s $f12, $f12, $f2 /* D9D610 80240140 3C0141A0 */ lui $at, 0x41a0 /* D9D614 80240144 44811000 */ mtc1 $at, $f2 -/* D9D618 80240148 00000000 */ nop +/* D9D618 80240148 00000000 */ nop /* D9D61C 8024014C 46020502 */ mul.s $f20, $f0, $f2 -/* D9D620 80240150 00000000 */ nop +/* D9D620 80240150 00000000 */ nop /* D9D624 80240154 4614A082 */ mul.s $f2, $f20, $f20 -/* D9D628 80240158 00000000 */ nop +/* D9D628 80240158 00000000 */ nop /* D9D62C 8024015C 3C0142B4 */ lui $at, 0x42b4 /* D9D630 80240160 44810000 */ mtc1 $at, $f0 /* D9D634 80240164 1680001C */ bnez $s4, .L802401D8 /* D9D638 80240168 46001603 */ div.s $f24, $f2, $f0 /* D9D63C 8024016C C6400004 */ lwc1 $f0, 4($s2) /* D9D640 80240170 4600B03E */ c.le.s $f22, $f0 -/* D9D644 80240174 00000000 */ nop +/* D9D644 80240174 00000000 */ nop /* D9D648 80240178 45000005 */ bc1f .L80240190 -/* D9D64C 8024017C 00000000 */ nop +/* D9D64C 8024017C 00000000 */ nop /* D9D650 80240180 4616A03C */ c.lt.s $f20, $f22 -/* D9D654 80240184 00000000 */ nop +/* D9D654 80240184 00000000 */ nop /* D9D658 80240188 4501000A */ bc1t .L802401B4 /* D9D65C 8024018C 240401D6 */ addiu $a0, $zero, 0x1d6 .L80240190: /* D9D660 80240190 4616003C */ c.lt.s $f0, $f22 -/* D9D664 80240194 00000000 */ nop +/* D9D664 80240194 00000000 */ nop /* D9D668 80240198 4502000F */ bc1fl .L802401D8 /* D9D66C 8024019C E6540004 */ swc1 $f20, 4($s2) /* D9D670 802401A0 4614B03E */ c.le.s $f22, $f20 -/* D9D674 802401A4 00000000 */ nop +/* D9D674 802401A4 00000000 */ nop /* D9D678 802401A8 4502000B */ bc1fl .L802401D8 /* D9D67C 802401AC E6540004 */ swc1 $f20, 4($s2) /* D9D680 802401B0 240401D6 */ addiu $a0, $zero, 0x1d6 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802402C0_D9D790.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802402C0_D9D790.s index a08c2a347c..9236de7f34 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802402C0_D9D790.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802402C0_D9D790.s @@ -44,40 +44,40 @@ glabel func_802402C0_D9D790 .L80240354: /* D9D824 80240354 86020000 */ lh $v0, ($s0) /* D9D828 80240358 44822000 */ mtc1 $v0, $f4 -/* D9D82C 8024035C 00000000 */ nop +/* D9D82C 8024035C 00000000 */ nop /* D9D830 80240360 46802120 */ cvt.s.w $f4, $f4 /* D9D834 80240364 46162101 */ sub.s $f4, $f4, $f22 /* D9D838 80240368 46042102 */ mul.s $f4, $f4, $f4 -/* D9D83C 8024036C 00000000 */ nop +/* D9D83C 8024036C 00000000 */ nop /* D9D840 80240370 86020002 */ lh $v0, 2($s0) /* D9D844 80240374 44821000 */ mtc1 $v0, $f2 -/* D9D848 80240378 00000000 */ nop +/* D9D848 80240378 00000000 */ nop /* D9D84C 8024037C 468010A0 */ cvt.s.w $f2, $f2 /* D9D850 80240380 46181081 */ sub.s $f2, $f2, $f24 /* D9D854 80240384 46021082 */ mul.s $f2, $f2, $f2 -/* D9D858 80240388 00000000 */ nop +/* D9D858 80240388 00000000 */ nop /* D9D85C 8024038C 86020004 */ lh $v0, 4($s0) /* D9D860 80240390 44820000 */ mtc1 $v0, $f0 -/* D9D864 80240394 00000000 */ nop +/* D9D864 80240394 00000000 */ nop /* D9D868 80240398 46800020 */ cvt.s.w $f0, $f0 /* D9D86C 8024039C 46140001 */ sub.s $f0, $f0, $f20 /* D9D870 802403A0 46000002 */ mul.s $f0, $f0, $f0 -/* D9D874 802403A4 00000000 */ nop +/* D9D874 802403A4 00000000 */ nop /* D9D878 802403A8 46022100 */ add.s $f4, $f4, $f2 /* D9D87C 802403AC 46002300 */ add.s $f12, $f4, $f0 /* D9D880 802403B0 46006084 */ sqrt.s $f2, $f12 /* D9D884 802403B4 46021032 */ c.eq.s $f2, $f2 -/* D9D888 802403B8 00000000 */ nop +/* D9D888 802403B8 00000000 */ nop /* D9D88C 802403BC 45010004 */ bc1t .L802403D0 -/* D9D890 802403C0 00000000 */ nop +/* D9D890 802403C0 00000000 */ nop /* D9D894 802403C4 0C0187BC */ jal sqrtf -/* D9D898 802403C8 00000000 */ nop +/* D9D898 802403C8 00000000 */ nop /* D9D89C 802403CC 46000086 */ mov.s $f2, $f0 .L802403D0: /* D9D8A0 802403D0 C6A00000 */ lwc1 $f0, ($s5) /* D9D8A4 802403D4 46800020 */ cvt.s.w $f0, $f0 /* D9D8A8 802403D8 4602003C */ c.lt.s $f0, $f2 -/* D9D8AC 802403DC 00000000 */ nop +/* D9D8AC 802403DC 00000000 */ nop /* D9D8B0 802403E0 45000003 */ bc1f .L802403F0 /* D9D8B4 802403E4 26310001 */ addiu $s1, $s1, 1 /* D9D8B8 802403E8 4600118D */ trunc.w.s $f6, $f2 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024043C_D9D90C.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024043C_D9D90C.s index 64605ab746..85505a0416 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024043C_D9D90C.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024043C_D9D90C.s @@ -62,28 +62,28 @@ glabel func_8024043C_D9D90C /* D9D9EC 8024051C 24040014 */ addiu $a0, $zero, 0x14 /* D9D9F0 80240520 2442FFF6 */ addiu $v0, $v0, -0xa /* D9D9F4 80240524 44820000 */ mtc1 $v0, $f0 -/* D9D9F8 80240528 00000000 */ nop +/* D9D9F8 80240528 00000000 */ nop /* D9D9FC 8024052C 46800020 */ cvt.s.w $f0, $f0 /* D9DA00 80240530 0C00A67F */ jal rand_int /* D9DA04 80240534 E600FFA0 */ swc1 $f0, -0x60($s0) /* D9DA08 80240538 24040014 */ addiu $a0, $zero, 0x14 /* D9DA0C 8024053C 2442FFF6 */ addiu $v0, $v0, -0xa /* D9DA10 80240540 44820000 */ mtc1 $v0, $f0 -/* D9DA14 80240544 00000000 */ nop +/* D9DA14 80240544 00000000 */ nop /* D9DA18 80240548 46800020 */ cvt.s.w $f0, $f0 /* D9DA1C 8024054C 0C00A67F */ jal rand_int /* D9DA20 80240550 E600FFA4 */ swc1 $f0, -0x5c($s0) /* D9DA24 80240554 24040028 */ addiu $a0, $zero, 0x28 /* D9DA28 80240558 2442FFF6 */ addiu $v0, $v0, -0xa /* D9DA2C 8024055C 44820000 */ mtc1 $v0, $f0 -/* D9DA30 80240560 00000000 */ nop +/* D9DA30 80240560 00000000 */ nop /* D9DA34 80240564 46800020 */ cvt.s.w $f0, $f0 /* D9DA38 80240568 0C00A67F */ jal rand_int /* D9DA3C 8024056C E600FFA8 */ swc1 $f0, -0x58($s0) /* D9DA40 80240570 3C0142C8 */ lui $at, 0x42c8 /* D9DA44 80240574 44811000 */ mtc1 $at, $f2 /* D9DA48 80240578 44820000 */ mtc1 $v0, $f0 -/* D9DA4C 8024057C 00000000 */ nop +/* D9DA4C 8024057C 00000000 */ nop /* D9DA50 80240580 46800020 */ cvt.s.w $f0, $f0 /* D9DA54 80240584 46020000 */ add.s $f0, $f0, $f2 /* D9DA58 80240588 2404001E */ addiu $a0, $zero, 0x1e @@ -93,7 +93,7 @@ glabel func_8024043C_D9D90C /* D9DA68 80240598 3C014270 */ lui $at, 0x4270 /* D9DA6C 8024059C 44811000 */ mtc1 $at, $f2 /* D9DA70 802405A0 44820000 */ mtc1 $v0, $f0 -/* D9DA74 802405A4 00000000 */ nop +/* D9DA74 802405A4 00000000 */ nop /* D9DA78 802405A8 46800020 */ cvt.s.w $f0, $f0 /* D9DA7C 802405AC 46020000 */ add.s $f0, $f0, $f2 /* D9DA80 802405B0 24040064 */ addiu $a0, $zero, 0x64 @@ -108,13 +108,13 @@ glabel func_8024043C_D9D90C /* D9DAA4 802405D4 3C014334 */ lui $at, 0x4334 /* D9DAA8 802405D8 44811000 */ mtc1 $at, $f2 /* D9DAAC 802405DC 44820000 */ mtc1 $v0, $f0 -/* D9DAB0 802405E0 00000000 */ nop +/* D9DAB0 802405E0 00000000 */ nop /* D9DAB4 802405E4 46800020 */ cvt.s.w $f0, $f0 /* D9DAB8 802405E8 46020002 */ mul.s $f0, $f0, $f2 -/* D9DABC 802405EC 00000000 */ nop +/* D9DABC 802405EC 00000000 */ nop /* D9DAC0 802405F0 3C0142B4 */ lui $at, 0x42b4 /* D9DAC4 802405F4 44811000 */ mtc1 $at, $f2 -/* D9DAC8 802405F8 00000000 */ nop +/* D9DAC8 802405F8 00000000 */ nop /* D9DACC 802405FC 46020000 */ add.s $f0, $f0, $f2 /* D9DAD0 80240600 E600FFB4 */ swc1 $f0, -0x4c($s0) /* D9DAD4 80240604 8E420008 */ lw $v0, 8($s2) @@ -178,31 +178,31 @@ glabel func_8024043C_D9D90C /* D9DBAC 802406DC 3C013F4C */ lui $at, 0x3f4c /* D9DBB0 802406E0 3421CCCD */ ori $at, $at, 0xcccd /* D9DBB4 802406E4 44810000 */ mtc1 $at, $f0 -/* D9DBB8 802406E8 00000000 */ nop +/* D9DBB8 802406E8 00000000 */ nop /* D9DBBC 802406EC 46001081 */ sub.s $f2, $f2, $f0 /* D9DBC0 802406F0 C600FFE4 */ lwc1 $f0, -0x1c($s0) /* D9DBC4 802406F4 E6020010 */ swc1 $f2, 0x10($s0) /* D9DBC8 802406F8 46020080 */ add.s $f2, $f0, $f2 /* D9DBCC 802406FC C6000010 */ lwc1 $f0, 0x10($s0) /* D9DBD0 80240700 4614003E */ c.le.s $f0, $f20 -/* D9DBD4 80240704 00000000 */ nop +/* D9DBD4 80240704 00000000 */ nop /* D9DBD8 80240708 45000026 */ bc1f .L802407A4 /* D9DBDC 8024070C E602FFE4 */ swc1 $f2, -0x1c($s0) /* D9DBE0 80240710 C6040064 */ lwc1 $f4, 0x64($s0) /* D9DBE4 80240714 46802120 */ cvt.s.w $f4, $f4 /* D9DBE8 80240718 4604103C */ c.lt.s $f2, $f4 -/* D9DBEC 8024071C 00000000 */ nop +/* D9DBEC 8024071C 00000000 */ nop /* D9DBF0 80240720 45000020 */ bc1f .L802407A4 /* D9DBF4 80240724 46000086 */ mov.s $f2, $f0 /* D9DBF8 80240728 3C01BF33 */ lui $at, 0xbf33 /* D9DBFC 8024072C 34213333 */ ori $at, $at, 0x3333 /* D9DC00 80240730 44810000 */ mtc1 $at, $f0 -/* D9DC04 80240734 00000000 */ nop +/* D9DC04 80240734 00000000 */ nop /* D9DC08 80240738 46001082 */ mul.s $f2, $f2, $f0 -/* D9DC0C 8024073C 00000000 */ nop +/* D9DC0C 8024073C 00000000 */ nop /* D9DC10 80240740 E604FFE4 */ swc1 $f4, -0x1c($s0) /* D9DC14 80240744 4616103C */ c.lt.s $f2, $f22 -/* D9DC18 80240748 00000000 */ nop +/* D9DC18 80240748 00000000 */ nop /* D9DC1C 8024074C 45000005 */ bc1f .L80240764 /* D9DC20 80240750 E6020010 */ swc1 $f2, 0x10($s0) /* D9DC24 80240754 AE3E0000 */ sw $fp, ($s1) @@ -221,7 +221,7 @@ glabel func_8024043C_D9D90C .L80240784: /* D9DC54 80240784 86040022 */ lh $a0, 0x22($s0) /* D9DC58 80240788 0C016E89 */ jal update_collider_transform -/* D9DC5C 8024078C 00000000 */ nop +/* D9DC5C 8024078C 00000000 */ nop /* D9DC60 80240790 8EE20074 */ lw $v0, 0x74($s7) /* D9DC64 80240794 24420001 */ addiu $v0, $v0, 1 /* D9DC68 80240798 AEE20074 */ sw $v0, 0x74($s7) @@ -323,14 +323,14 @@ glabel func_8024043C_D9D90C /* D9DDD8 80240908 0080302D */ daddu $a2, $a0, $zero /* D9DDDC 8024090C 2E62000C */ sltiu $v0, $s3, 0xc /* D9DDE0 80240910 1440FF60 */ bnez $v0, .L80240694 -/* D9DDE4 80240914 00000000 */ nop +/* D9DDE4 80240914 00000000 */ nop /* D9DDE8 80240918 8EE20074 */ lw $v0, 0x74($s7) /* D9DDEC 8024091C 2C42000C */ sltiu $v0, $v0, 0xc /* D9DDF0 80240920 14400005 */ bnez $v0, .L80240938 /* D9DDF4 80240924 0000102D */ daddu $v0, $zero, $zero /* D9DDF8 80240928 8EE40070 */ lw $a0, 0x70($s7) /* D9DDFC 8024092C 0C00AB4B */ jal heap_free -/* D9DE00 80240930 00000000 */ nop +/* D9DE00 80240930 00000000 */ nop /* D9DE04 80240934 24020002 */ addiu $v0, $zero, 2 .L80240938: /* D9DE08 80240938 8FBF013C */ lw $ra, 0x13c($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240970_D9DE40.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240970_D9DE40.s index ef301647d2..bf78b6e16d 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240970_D9DE40.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240970_D9DE40.s @@ -15,7 +15,7 @@ glabel func_80240970_D9DE40 /* D9DE68 80240998 D4227870 */ ldc1 $f2, %lo(D_80247870)($at) /* D9DE6C 8024099C 46000021 */ cvt.d.s $f0, $f0 /* D9DE70 802409A0 46220002 */ mul.d $f0, $f0, $f2 -/* D9DE74 802409A4 00000000 */ nop +/* D9DE74 802409A4 00000000 */ nop /* D9DE78 802409A8 46200020 */ cvt.s.d $f0, $f0 /* D9DE7C 802409AC E4400018 */ swc1 $f0, 0x18($v0) /* D9DE80 802409B0 8E0300CC */ lw $v1, 0xcc($s0) diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802409E0_D9DEB0.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802409E0_D9DEB0.s index 3bc9b0392b..1a95cd20d9 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802409E0_D9DEB0.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802409E0_D9DEB0.s @@ -22,7 +22,7 @@ glabel func_802409E0_D9DEB0 /* D9DEF4 80240A24 0C0129E1 */ jal func_8004A784 /* D9DEF8 80240A28 0000382D */ daddu $a3, $zero, $zero /* D9DEFC 80240A2C 14400005 */ bnez $v0, .L80240A44 -/* D9DF00 80240A30 00000000 */ nop +/* D9DF00 80240A30 00000000 */ nop /* D9DF04 80240A34 8E050018 */ lw $a1, 0x18($s0) /* D9DF08 80240A38 8E06000C */ lw $a2, 0xc($s0) /* D9DF0C 80240A3C 0C00EA95 */ jal npc_move_heading @@ -33,13 +33,13 @@ glabel func_802409E0_D9DEB0 /* D9DF1C 80240A4C A602008E */ sh $v0, 0x8e($s0) /* D9DF20 80240A50 00021400 */ sll $v0, $v0, 0x10 /* D9DF24 80240A54 14400010 */ bnez $v0, .L80240A98 -/* D9DF28 80240A58 00000000 */ nop +/* D9DF28 80240A58 00000000 */ nop /* D9DF2C 80240A5C C6000018 */ lwc1 $f0, 0x18($s0) /* D9DF30 80240A60 3C018024 */ lui $at, %hi(D_80247878) /* D9DF34 80240A64 D4227878 */ ldc1 $f2, %lo(D_80247878)($at) /* D9DF38 80240A68 46000021 */ cvt.d.s $f0, $f0 /* D9DF3C 80240A6C 46220002 */ mul.d $f0, $f0, $f2 -/* D9DF40 80240A70 00000000 */ nop +/* D9DF40 80240A70 00000000 */ nop /* D9DF44 80240A74 46200020 */ cvt.s.d $f0, $f0 /* D9DF48 80240A78 E6000018 */ swc1 $f0, 0x18($s0) /* D9DF4C 80240A7C 8E2200CC */ lw $v0, 0xcc($s1) diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240AB0_D9DF80.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240AB0_D9DF80.s index f87b308775..ab42994748 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240AB0_D9DF80.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240AB0_D9DF80.s @@ -21,7 +21,7 @@ glabel func_80240AB0_D9DF80 /* D9DFC0 80240AF0 0C0129E1 */ jal func_8004A784 /* D9DFC4 80240AF4 0000382D */ daddu $a3, $zero, $zero /* D9DFC8 80240AF8 14400005 */ bnez $v0, .L80240B10 -/* D9DFCC 80240AFC 00000000 */ nop +/* D9DFCC 80240AFC 00000000 */ nop /* D9DFD0 80240B00 8E050018 */ lw $a1, 0x18($s0) /* D9DFD4 80240B04 8E06000C */ lw $a2, 0xc($s0) /* D9DFD8 80240B08 0C00EA95 */ jal npc_move_heading diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240B48_D9E018.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240B48_D9E018.s index 2d35775d65..f658161387 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240B48_D9E018.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240B48_D9E018.s @@ -16,7 +16,7 @@ glabel func_80240B48_D9E018 /* D9E044 80240B74 A462008E */ sh $v0, 0x8e($v1) /* D9E048 80240B78 00021400 */ sll $v0, $v0, 0x10 /* D9E04C 80240B7C 14400005 */ bnez $v0, .L80240B94 -/* D9E050 80240B80 00000000 */ nop +/* D9E050 80240B80 00000000 */ nop /* D9E054 80240B84 8E0200CC */ lw $v0, 0xcc($s0) /* D9E058 80240B88 8C420000 */ lw $v0, ($v0) /* D9E05C 80240B8C AC620028 */ sw $v0, 0x28($v1) diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s index 2bed2a59ba..0e9d9cd0b9 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s @@ -124,45 +124,53 @@ glabel func_80240BA8_D9E078 /* D9E23C 80240D6C 2C620064 */ sltiu $v0, $v1, 0x64 /* D9E240 80240D70 10400050 */ beqz $v0, .L80240EB4 /* D9E244 80240D74 00031080 */ sll $v0, $v1, 2 -/* D9E248 80240D78 3C018024 */ lui $at, %hi(D_80247880) +/* D9E248 80240D78 3C018024 */ lui $at, %hi(jtbl_80247880_DA4D50) /* D9E24C 80240D7C 00220821 */ addu $at, $at, $v0 -/* D9E250 80240D80 8C227880 */ lw $v0, %lo(D_80247880)($at) +/* D9E250 80240D80 8C227880 */ lw $v0, %lo(jtbl_80247880_DA4D50)($at) /* D9E254 80240D84 00400008 */ jr $v0 /* D9E258 80240D88 00000000 */ nop +glabel L80240D8C_D9E25C /* D9E25C 80240D8C 0260202D */ daddu $a0, $s3, $zero /* D9E260 80240D90 0280282D */ daddu $a1, $s4, $zero /* D9E264 80240D94 0C012568 */ jal func_800495A0 /* D9E268 80240D98 02A0302D */ daddu $a2, $s5, $zero +glabel L80240D9C_D9E26C /* D9E26C 80240D9C 0260202D */ daddu $a0, $s3, $zero /* D9E270 80240DA0 0280282D */ daddu $a1, $s4, $zero /* D9E274 80240DA4 0C0125AE */ jal func_800496B8 /* D9E278 80240DA8 02A0302D */ daddu $a2, $s5, $zero /* D9E27C 80240DAC 080903AD */ j .L80240EB4 /* D9E280 80240DB0 00000000 */ nop +glabel L80240DB4_D9E284 /* D9E284 80240DB4 0260202D */ daddu $a0, $s3, $zero /* D9E288 80240DB8 0280282D */ daddu $a1, $s4, $zero /* D9E28C 80240DBC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D9E290 80240DC0 02A0302D */ daddu $a2, $s5, $zero +glabel L80240DC4_D9E294 /* D9E294 80240DC4 0260202D */ daddu $a0, $s3, $zero /* D9E298 80240DC8 0280282D */ daddu $a1, $s4, $zero /* D9E29C 80240DCC 0C012701 */ jal func_80049C04 /* D9E2A0 80240DD0 02A0302D */ daddu $a2, $s5, $zero /* D9E2A4 80240DD4 080903AD */ j .L80240EB4 /* D9E2A8 80240DD8 00000000 */ nop +glabel L80240DDC_D9E2AC /* D9E2AC 80240DDC 0260202D */ daddu $a0, $s3, $zero /* D9E2B0 80240DE0 0280282D */ daddu $a1, $s4, $zero /* D9E2B4 80240DE4 0C01278F */ jal func_80049E3C /* D9E2B8 80240DE8 02A0302D */ daddu $a2, $s5, $zero +glabel L80240DEC_D9E2BC /* D9E2BC 80240DEC 0260202D */ daddu $a0, $s3, $zero /* D9E2C0 80240DF0 0280282D */ daddu $a1, $s4, $zero /* D9E2C4 80240DF4 0C0127B3 */ jal func_80049ECC /* D9E2C8 80240DF8 02A0302D */ daddu $a2, $s5, $zero /* D9E2CC 80240DFC 080903AD */ j .L80240EB4 /* D9E2D0 80240E00 00000000 */ nop +glabel L80240E04_D9E2D4 /* D9E2D4 80240E04 0260202D */ daddu $a0, $s3, $zero /* D9E2D8 80240E08 0280282D */ daddu $a1, $s4, $zero /* D9E2DC 80240E0C 0C0127DF */ jal func_80049F7C /* D9E2E0 80240E10 02A0302D */ daddu $a2, $s5, $zero +glabel L80240E14_D9E2E4 /* D9E2E4 80240E14 0260202D */ daddu $a0, $s3, $zero /* D9E2E8 80240E18 0280282D */ daddu $a1, $s4, $zero /* D9E2EC 80240E1C 0C012849 */ jal func_8004A124 @@ -171,6 +179,7 @@ glabel func_80240BA8_D9E078 /* D9E2F8 80240E28 2402000E */ addiu $v0, $zero, 0xe /* D9E2FC 80240E2C 14620021 */ bne $v1, $v0, .L80240EB4 /* D9E300 80240E30 00000000 */ nop +glabel L80240E34_D9E304 /* D9E304 80240E34 0260202D */ daddu $a0, $s3, $zero /* D9E308 80240E38 0280282D */ daddu $a1, $s4, $zero /* D9E30C 80240E3C 0C09025C */ jal func_80240970_D9DE40 @@ -179,6 +188,7 @@ glabel func_80240BA8_D9E078 /* D9E318 80240E48 2402000F */ addiu $v0, $zero, 0xf /* D9E31C 80240E4C 14620019 */ bne $v1, $v0, .L80240EB4 /* D9E320 80240E50 00000000 */ nop +glabel L80240E54_D9E324 /* D9E324 80240E54 0260202D */ daddu $a0, $s3, $zero /* D9E328 80240E58 0280282D */ daddu $a1, $s4, $zero /* D9E32C 80240E5C 0C090278 */ jal func_802409E0_D9DEB0 @@ -187,6 +197,7 @@ glabel func_80240BA8_D9E078 /* D9E338 80240E68 24020010 */ addiu $v0, $zero, 0x10 /* D9E33C 80240E6C 14620011 */ bne $v1, $v0, .L80240EB4 /* D9E340 80240E70 00000000 */ nop +glabel L80240E74_D9E344 /* D9E344 80240E74 0260202D */ daddu $a0, $s3, $zero /* D9E348 80240E78 0280282D */ daddu $a1, $s4, $zero /* D9E34C 80240E7C 0C0902AC */ jal func_80240AB0_D9DF80 @@ -195,15 +206,18 @@ glabel func_80240BA8_D9E078 /* D9E358 80240E88 24020011 */ addiu $v0, $zero, 0x11 /* D9E35C 80240E8C 14620009 */ bne $v1, $v0, .L80240EB4 /* D9E360 80240E90 00000000 */ nop +glabel L80240E94_D9E364 /* D9E364 80240E94 0260202D */ daddu $a0, $s3, $zero /* D9E368 80240E98 0280282D */ daddu $a1, $s4, $zero /* D9E36C 80240E9C 0C0902D2 */ jal func_80240B48_D9E018 /* D9E370 80240EA0 02A0302D */ daddu $a2, $s5, $zero /* D9E374 80240EA4 080903AD */ j .L80240EB4 /* D9E378 80240EA8 00000000 */ nop +glabel L80240EAC_D9E37C /* D9E37C 80240EAC 0C0129CF */ jal func_8004A73C /* D9E380 80240EB0 0260202D */ daddu $a0, $s3, $zero .L80240EB4: +glabel L80240EB4_D9E384 /* D9E384 80240EB4 8FBF0060 */ lw $ra, 0x60($sp) /* D9E388 80240EB8 8FB5005C */ lw $s5, 0x5c($sp) /* D9E38C 80240EBC 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240EDC_D9E3AC.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240EDC_D9E3AC.s index 88c2cd73f2..56bdb18329 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240EDC_D9E3AC.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240EDC_D9E3AC.s @@ -22,7 +22,7 @@ glabel func_80240EDC_D9E3AC /* D9E3F0 80240F20 3C030010 */ lui $v1, 0x10 /* D9E3F4 80240F24 00431024 */ and $v0, $v0, $v1 /* D9E3F8 80240F28 10400004 */ beqz $v0, .L80240F3C -/* D9E3FC 80240F2C 00000000 */ nop +/* D9E3FC 80240F2C 00000000 */ nop /* D9E400 80240F30 C620006C */ lwc1 $f0, 0x6c($s1) /* D9E404 80240F34 46800020 */ cvt.s.w $f0, $f0 /* D9E408 80240F38 E480000C */ swc1 $f0, 0xc($a0) @@ -30,7 +30,7 @@ glabel func_80240EDC_D9E3AC /* D9E40C 80240F3C 8E2200D0 */ lw $v0, 0xd0($s1) /* D9E410 80240F40 8C420014 */ lw $v0, 0x14($v0) /* D9E414 80240F44 1C400004 */ bgtz $v0, .L80240F58 -/* D9E418 80240F48 00000000 */ nop +/* D9E418 80240F48 00000000 */ nop /* D9E41C 80240F4C C640000C */ lwc1 $f0, 0xc($s2) /* D9E420 80240F50 080903DE */ j .L80240F78 /* D9E424 80240F54 E4800018 */ swc1 $f0, 0x18($a0) @@ -38,7 +38,7 @@ glabel func_80240EDC_D9E3AC /* D9E428 80240F58 3C018024 */ lui $at, %hi(D_80247A10) /* D9E42C 80240F5C D4227A10 */ ldc1 $f2, %lo(D_80247A10)($at) /* D9E430 80240F60 44820000 */ mtc1 $v0, $f0 -/* D9E434 80240F64 00000000 */ nop +/* D9E434 80240F64 00000000 */ nop /* D9E438 80240F68 46800021 */ cvt.d.w $f0, $f0 /* D9E43C 80240F6C 46220003 */ div.d $f0, $f0, $f2 /* D9E440 80240F70 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240F90_D9E460.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240F90_D9E460.s index 3939df37cd..b3a233c06a 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240F90_D9E460.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240F90_D9E460.s @@ -38,7 +38,7 @@ glabel func_80240F90_D9E460 /* D9E4E4 80241014 2402000F */ addiu $v0, $zero, 0xf /* D9E4E8 80241018 AFA2001C */ sw $v0, 0x1c($sp) /* D9E4EC 8024101C 44833000 */ mtc1 $v1, $f6 -/* D9E4F0 80241020 00000000 */ nop +/* D9E4F0 80241020 00000000 */ nop /* D9E4F4 80241024 468031A0 */ cvt.s.w $f6, $f6 /* D9E4F8 80241028 44073000 */ mfc1 $a3, $f6 /* D9E4FC 8024102C 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241188_D9E658.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241188_D9E658.s index 5ac68e92c7..fc76d3cfaa 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241188_D9E658.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241188_D9E658.s @@ -47,20 +47,20 @@ glabel func_80241188_D9E658 /* D9E700 80241230 8E020010 */ lw $v0, 0x10($s0) /* D9E704 80241234 46001005 */ abs.s $f0, $f2 /* D9E708 80241238 44822000 */ mtc1 $v0, $f4 -/* D9E70C 8024123C 00000000 */ nop +/* D9E70C 8024123C 00000000 */ nop /* D9E710 80241240 46802120 */ cvt.s.w $f4, $f4 /* D9E714 80241244 4600203C */ c.lt.s $f4, $f0 -/* D9E718 80241248 00000000 */ nop +/* D9E718 80241248 00000000 */ nop /* D9E71C 8024124C 4500000D */ bc1f .L80241284 -/* D9E720 80241250 00000000 */ nop +/* D9E720 80241250 00000000 */ nop /* D9E724 80241254 44800000 */ mtc1 $zero, $f0 /* D9E728 80241258 C654000C */ lwc1 $f20, 0xc($s2) /* D9E72C 8024125C 4600103C */ c.lt.s $f2, $f0 -/* D9E730 80241260 00000000 */ nop +/* D9E730 80241260 00000000 */ nop /* D9E734 80241264 45000006 */ bc1f .L80241280 /* D9E738 80241268 00021023 */ negu $v0, $v0 /* D9E73C 8024126C 44820000 */ mtc1 $v0, $f0 -/* D9E740 80241270 00000000 */ nop +/* D9E740 80241270 00000000 */ nop /* D9E744 80241274 46800020 */ cvt.s.w $f0, $f0 /* D9E748 80241278 080904A1 */ j .L80241284 /* D9E74C 8024127C 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024141C_D9E8EC.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024141C_D9E8EC.s index 43fafa8ac7..ecd57659fc 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024141C_D9E8EC.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024141C_D9E8EC.s @@ -19,20 +19,20 @@ glabel func_8024141C_D9E8EC /* D9E924 80241454 8E0200D0 */ lw $v0, 0xd0($s0) /* D9E928 80241458 8C420014 */ lw $v0, 0x14($v0) /* D9E92C 8024145C 04410009 */ bgez $v0, .L80241484 -/* D9E930 80241460 00000000 */ nop +/* D9E930 80241460 00000000 */ nop /* D9E934 80241464 C640000C */ lwc1 $f0, 0xc($s2) /* D9E938 80241468 3C018024 */ lui $at, %hi(D_80247A18) /* D9E93C 8024146C D4227A18 */ ldc1 $f2, %lo(D_80247A18)($at) /* D9E940 80241470 46000021 */ cvt.d.s $f0, $f0 /* D9E944 80241474 46220002 */ mul.d $f0, $f0, $f2 -/* D9E948 80241478 00000000 */ nop +/* D9E948 80241478 00000000 */ nop /* D9E94C 8024147C 08090528 */ j .L802414A0 /* D9E950 80241480 46200020 */ cvt.s.d $f0, $f0 .L80241484: /* D9E954 80241484 3C018024 */ lui $at, %hi(D_80247A20) /* D9E958 80241488 D4227A20 */ ldc1 $f2, %lo(D_80247A20)($at) /* D9E95C 8024148C 44820000 */ mtc1 $v0, $f0 -/* D9E960 80241490 00000000 */ nop +/* D9E960 80241490 00000000 */ nop /* D9E964 80241494 46800021 */ cvt.d.w $f0, $f0 /* D9E968 80241498 46220003 */ div.d $f0, $f0, $f2 /* D9E96C 8024149C 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802414C8_D9E998.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802414C8_D9E998.s index c6f89a1db8..b8d0544c7a 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802414C8_D9E998.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802414C8_D9E998.s @@ -42,7 +42,7 @@ glabel func_802414C8_D9E998 /* D9EA2C 8024155C 2402000F */ addiu $v0, $zero, 0xf /* D9EA30 80241560 AFA2001C */ sw $v0, 0x1c($sp) /* D9EA34 80241564 44833000 */ mtc1 $v1, $f6 -/* D9EA38 80241568 00000000 */ nop +/* D9EA38 80241568 00000000 */ nop /* D9EA3C 8024156C 468031A0 */ cvt.s.w $f6, $f6 /* D9EA40 80241570 44073000 */ mfc1 $a3, $f6 /* D9EA44 80241574 27A20028 */ addiu $v0, $sp, 0x28 @@ -90,12 +90,12 @@ glabel func_802414C8_D9E998 /* D9EADC 8024160C 468031A0 */ cvt.s.w $f6, $f6 /* D9EAE0 80241610 44073000 */ mfc1 $a3, $f6 /* D9EAE4 80241614 0C00A7B5 */ jal dist2D -/* D9EAE8 80241618 00000000 */ nop +/* D9EAE8 80241618 00000000 */ nop /* D9EAEC 8024161C C6020018 */ lwc1 $f2, 0x18($s0) /* D9EAF0 80241620 4602003C */ c.lt.s $f0, $f2 -/* D9EAF4 80241624 00000000 */ nop +/* D9EAF4 80241624 00000000 */ nop /* D9EAF8 80241628 4500000E */ bc1f .L80241664 -/* D9EAFC 8024162C 00000000 */ nop +/* D9EAFC 8024162C 00000000 */ nop /* D9EB00 80241630 8E2200D0 */ lw $v0, 0xd0($s1) /* D9EB04 80241634 C4400000 */ lwc1 $f0, ($v0) /* D9EB08 80241638 46800020 */ cvt.s.w $f0, $f0 @@ -112,7 +112,7 @@ glabel func_802414C8_D9E998 .L80241664: /* D9EB34 80241664 8602008C */ lh $v0, 0x8c($s0) /* D9EB38 80241668 14400011 */ bnez $v0, .L802416B0 -/* D9EB3C 8024166C 00000000 */ nop +/* D9EB3C 8024166C 00000000 */ nop /* D9EB40 80241670 C60C0038 */ lwc1 $f12, 0x38($s0) /* D9EB44 80241674 8E2200D0 */ lw $v0, 0xd0($s1) /* D9EB48 80241678 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -123,7 +123,7 @@ glabel func_802414C8_D9E998 /* D9EB5C 8024168C 468031A0 */ cvt.s.w $f6, $f6 /* D9EB60 80241690 44073000 */ mfc1 $a3, $f6 /* D9EB64 80241694 0C00A720 */ jal atan2 -/* D9EB68 80241698 00000000 */ nop +/* D9EB68 80241698 00000000 */ nop /* D9EB6C 8024169C 8E050018 */ lw $a1, 0x18($s0) /* D9EB70 802416A0 44060000 */ mfc1 $a2, $f0 /* D9EB74 802416A4 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s index 17a0960e10..efa763f834 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s @@ -46,7 +46,7 @@ glabel func_802416D0_D9EBA0 /* D9EC44 80241774 8E4200B0 */ lw $v0, 0xb0($s2) /* D9EC48 80241778 30420004 */ andi $v0, $v0, 4 /* D9EC4C 8024177C 1040002F */ beqz $v0, .L8024183C -/* D9EC50 80241780 00000000 */ nop +/* D9EC50 80241780 00000000 */ nop .L80241784: /* D9EC54 80241784 AE800070 */ sw $zero, 0x70($s4) /* D9EC58 80241788 C600000C */ lwc1 $f0, 0xc($s0) @@ -102,60 +102,71 @@ glabel func_802416D0_D9EBA0 /* D9ED10 80241840 2C620064 */ sltiu $v0, $v1, 0x64 /* D9ED14 80241844 10400036 */ beqz $v0, .L80241920 /* D9ED18 80241848 00031080 */ sll $v0, $v1, 2 -/* D9ED1C 8024184C 3C018024 */ lui $at, %hi(D_80247A28) +/* D9ED1C 8024184C 3C018024 */ lui $at, %hi(jtbl_80247A28_DA4EF8) /* D9ED20 80241850 00220821 */ addu $at, $at, $v0 -/* D9ED24 80241854 8C227A28 */ lw $v0, %lo(D_80247A28)($at) +/* D9ED24 80241854 8C227A28 */ lw $v0, %lo(jtbl_80247A28_DA4EF8)($at) /* D9ED28 80241858 00400008 */ jr $v0 -/* D9ED2C 8024185C 00000000 */ nop +/* D9ED2C 8024185C 00000000 */ nop +glabel L80241860_D9ED30 /* D9ED30 80241860 0280202D */ daddu $a0, $s4, $zero /* D9ED34 80241864 0260282D */ daddu $a1, $s3, $zero /* D9ED38 80241868 0C0903B7 */ jal func_80240EDC_D9E3AC /* D9ED3C 8024186C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241870_D9ED40 /* D9ED40 80241870 0280202D */ daddu $a0, $s4, $zero /* D9ED44 80241874 0260282D */ daddu $a1, $s3, $zero /* D9ED48 80241878 0C0903E4 */ jal func_80240F90_D9E460 /* D9ED4C 8024187C 02A0302D */ daddu $a2, $s5, $zero /* D9ED50 80241880 08090648 */ j .L80241920 -/* D9ED54 80241884 00000000 */ nop +/* D9ED54 80241884 00000000 */ nop +glabel L80241888_D9ED58 /* D9ED58 80241888 0280202D */ daddu $a0, $s4, $zero /* D9ED5C 8024188C 0260282D */ daddu $a1, $s3, $zero /* D9ED60 80241890 0C09042C */ jal omo_02_NpcJumpFunc3 /* D9ED64 80241894 02A0302D */ daddu $a2, $s5, $zero +glabel L80241898_D9ED68 /* D9ED68 80241898 0280202D */ daddu $a0, $s4, $zero /* D9ED6C 8024189C 0260282D */ daddu $a1, $s3, $zero /* D9ED70 802418A0 0C090444 */ jal omo_02_NpcJumpFunc /* D9ED74 802418A4 02A0302D */ daddu $a2, $s5, $zero /* D9ED78 802418A8 08090648 */ j .L80241920 -/* D9ED7C 802418AC 00000000 */ nop +/* D9ED7C 802418AC 00000000 */ nop +glabel L802418B0_D9ED80 /* D9ED80 802418B0 0280202D */ daddu $a0, $s4, $zero /* D9ED84 802418B4 0260282D */ daddu $a1, $s3, $zero /* D9ED88 802418B8 0C090462 */ jal func_80241188_D9E658 /* D9ED8C 802418BC 02A0302D */ daddu $a2, $s5, $zero +glabel L802418C0_D9ED90 /* D9ED90 802418C0 0280202D */ daddu $a0, $s4, $zero /* D9ED94 802418C4 0260282D */ daddu $a1, $s3, $zero /* D9ED98 802418C8 0C0904AE */ jal omo_02_UnkNpcAIFunc11 /* D9ED9C 802418CC 02A0302D */ daddu $a2, $s5, $zero /* D9EDA0 802418D0 08090648 */ j .L80241920 -/* D9EDA4 802418D4 00000000 */ nop +/* D9EDA4 802418D4 00000000 */ nop +glabel L802418D8_D9EDA8 /* D9EDA8 802418D8 0280202D */ daddu $a0, $s4, $zero /* D9EDAC 802418DC 0260282D */ daddu $a1, $s3, $zero /* D9EDB0 802418E0 0C0904F5 */ jal omo_02_UnkNpcAIFunc10 /* D9EDB4 802418E4 02A0302D */ daddu $a2, $s5, $zero /* D9EDB8 802418E8 08090648 */ j .L80241920 -/* D9EDBC 802418EC 00000000 */ nop +/* D9EDBC 802418EC 00000000 */ nop +glabel L802418F0_D9EDC0 /* D9EDC0 802418F0 0280202D */ daddu $a0, $s4, $zero /* D9EDC4 802418F4 0260282D */ daddu $a1, $s3, $zero /* D9EDC8 802418F8 0C090507 */ jal func_8024141C_D9E8EC /* D9EDCC 802418FC 02A0302D */ daddu $a2, $s5, $zero +glabel L80241900_D9EDD0 /* D9EDD0 80241900 0280202D */ daddu $a0, $s4, $zero /* D9EDD4 80241904 0260282D */ daddu $a1, $s3, $zero /* D9EDD8 80241908 0C090532 */ jal func_802414C8_D9E998 /* D9EDDC 8024190C 02A0302D */ daddu $a2, $s5, $zero /* D9EDE0 80241910 08090648 */ j .L80241920 -/* D9EDE4 80241914 00000000 */ nop +/* D9EDE4 80241914 00000000 */ nop +glabel L80241918_D9EDE8 /* D9EDE8 80241918 0C0129CF */ jal func_8004A73C /* D9EDEC 8024191C 0280202D */ daddu $a0, $s4, $zero .L80241920: +glabel L80241920_D9EDF0 /* D9EDF0 80241920 8FBF0048 */ lw $ra, 0x48($sp) /* D9EDF4 80241924 8FB50044 */ lw $s5, 0x44($sp) /* D9EDF8 80241928 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241948_D9EE18.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241948_D9EE18.s index ad8ba1dbbc..1599ff4ef7 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241948_D9EE18.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241948_D9EE18.s @@ -42,16 +42,16 @@ glabel func_80241948_D9EE18 /* D9EEAC 802419DC 3C014387 */ lui $at, 0x4387 /* D9EEB0 802419E0 4481A000 */ mtc1 $at, $f20 /* D9EEB4 802419E4 0C00A70A */ jal get_clamped_angle_diff -/* D9EEB8 802419E8 00000000 */ nop +/* D9EEB8 802419E8 00000000 */ nop /* D9EEBC 802419EC 0C00A6C9 */ jal clamp_angle /* D9EEC0 802419F0 46000306 */ mov.s $f12, $f0 /* D9EEC4 802419F4 3C018024 */ lui $at, %hi(D_80247BB8) /* D9EEC8 802419F8 D4227BB8 */ ldc1 $f2, %lo(D_80247BB8)($at) /* D9EECC 802419FC 46000021 */ cvt.d.s $f0, $f0 /* D9EED0 80241A00 4622003C */ c.lt.d $f0, $f2 -/* D9EED4 80241A04 00000000 */ nop +/* D9EED4 80241A04 00000000 */ nop /* D9EED8 80241A08 45000003 */ bc1f .L80241A18 -/* D9EEDC 80241A0C 00000000 */ nop +/* D9EEDC 80241A0C 00000000 */ nop /* D9EEE0 80241A10 3C0142B4 */ lui $at, 0x42b4 /* D9EEE4 80241A14 4481A000 */ mtc1 $at, $f20 .L80241A18: @@ -71,7 +71,7 @@ glabel func_80241948_D9EE18 /* D9EF1C 80241A4C D4227BC0 */ ldc1 $f2, %lo(D_80247BC0)($at) /* D9EF20 80241A50 46000021 */ cvt.d.s $f0, $f0 /* D9EF24 80241A54 4620103C */ c.lt.d $f2, $f0 -/* D9EF28 80241A58 00000000 */ nop +/* D9EF28 80241A58 00000000 */ nop /* D9EF2C 80241A5C 4501002E */ bc1t .L80241B18 /* D9EF30 80241A60 2402FFFF */ addiu $v0, $zero, -1 /* D9EF34 80241A64 8E220000 */ lw $v0, ($s1) @@ -80,13 +80,13 @@ glabel func_80241948_D9EE18 /* D9EF40 80241A70 860200A8 */ lh $v0, 0xa8($s0) /* D9EF44 80241A74 46020001 */ sub.s $f0, $f0, $f2 /* D9EF48 80241A78 44821000 */ mtc1 $v0, $f2 -/* D9EF4C 80241A7C 00000000 */ nop +/* D9EF4C 80241A7C 00000000 */ nop /* D9EF50 80241A80 468010A1 */ cvt.d.w $f2, $f2 /* D9EF54 80241A84 46221080 */ add.d $f2, $f2, $f2 /* D9EF58 80241A88 46000005 */ abs.s $f0, $f0 /* D9EF5C 80241A8C 46000021 */ cvt.d.s $f0, $f0 /* D9EF60 80241A90 4620103E */ c.le.d $f2, $f0 -/* D9EF64 80241A94 00000000 */ nop +/* D9EF64 80241A94 00000000 */ nop /* D9EF68 80241A98 4501001F */ bc1t .L80241B18 /* D9EF6C 80241A9C 2402FFFF */ addiu $v0, $zero, -1 /* D9EF70 80241AA0 3C038011 */ lui $v1, %hi(D_8010EBB3) @@ -97,7 +97,7 @@ glabel func_80241948_D9EE18 /* D9EF84 80241AB4 14620005 */ bne $v1, $v0, .L80241ACC /* D9EF88 80241AB8 2402FFFF */ addiu $v0, $zero, -1 /* D9EF8C 80241ABC 080906C6 */ j .L80241B18 -/* D9EF90 80241AC0 00000000 */ nop +/* D9EF90 80241AC0 00000000 */ nop .L80241AC4: /* D9EF94 80241AC4 080906C6 */ j .L80241B18 /* D9EF98 80241AC8 0240102D */ daddu $v0, $s2, $zero @@ -120,7 +120,7 @@ glabel func_80241948_D9EE18 /* D9EFD4 80241B04 8E620078 */ lw $v0, 0x78($s3) /* D9EFD8 80241B08 0222102A */ slt $v0, $s1, $v0 /* D9EFDC 80241B0C 1440FFF2 */ bnez $v0, .L80241AD8 -/* D9EFE0 80241B10 00000000 */ nop +/* D9EFE0 80241B10 00000000 */ nop .L80241B14: /* D9EFE4 80241B14 2402FFFF */ addiu $v0, $zero, -1 .L80241B18: diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241B38_D9F008.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241B38_D9F008.s index 0edbcbbcb0..b1587e6caf 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241B38_D9F008.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241B38_D9F008.s @@ -38,7 +38,7 @@ glabel func_80241B38_D9F008 /* D9F08C 80241BBC 2402000F */ addiu $v0, $zero, 0xf /* D9F090 80241BC0 AFA2001C */ sw $v0, 0x1c($sp) /* D9F094 80241BC4 44833000 */ mtc1 $v1, $f6 -/* D9F098 80241BC8 00000000 */ nop +/* D9F098 80241BC8 00000000 */ nop /* D9F09C 80241BCC 468031A0 */ cvt.s.w $f6, $f6 /* D9F0A0 80241BD0 44073000 */ mfc1 $a3, $f6 /* D9F0A4 80241BD4 27A20028 */ addiu $v0, $sp, 0x28 @@ -60,15 +60,15 @@ glabel func_80241B38_D9F008 /* D9F0E0 80241C10 0040202D */ daddu $a0, $v0, $zero /* D9F0E4 80241C14 2402FFFF */ addiu $v0, $zero, -1 /* D9F0E8 80241C18 10820010 */ beq $a0, $v0, .L80241C5C -/* D9F0EC 80241C1C 00000000 */ nop +/* D9F0EC 80241C1C 00000000 */ nop /* D9F0F0 80241C20 0C00FB3A */ jal get_enemy -/* D9F0F4 80241C24 00000000 */ nop +/* D9F0F4 80241C24 00000000 */ nop /* D9F0F8 80241C28 8C42006C */ lw $v0, 0x6c($v0) /* D9F0FC 80241C2C 1440000B */ bnez $v0, .L80241C5C -/* D9F100 80241C30 00000000 */ nop +/* D9F100 80241C30 00000000 */ nop /* D9F104 80241C34 8602008C */ lh $v0, 0x8c($s0) /* D9F108 80241C38 14400008 */ bnez $v0, .L80241C5C -/* D9F10C 80241C3C 00000000 */ nop +/* D9F10C 80241C3C 00000000 */ nop /* D9F110 80241C40 8E2200CC */ lw $v0, 0xcc($s1) /* D9F114 80241C44 8C420020 */ lw $v0, 0x20($v0) /* D9F118 80241C48 AE020028 */ sw $v0, 0x28($s0) diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241C7C_D9F14C.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241C7C_D9F14C.s index 1e934332ea..6e640e6db5 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241C7C_D9F14C.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241C7C_D9F14C.s @@ -17,7 +17,7 @@ glabel func_80241C7C_D9F14C /* D9F17C 80241CAC A602008E */ sh $v0, 0x8e($s0) /* D9F180 80241CB0 00021400 */ sll $v0, $v0, 0x10 /* D9F184 80241CB4 1C40002B */ bgtz $v0, .L80241D64 -/* D9F188 80241CB8 00000000 */ nop +/* D9F188 80241CB8 00000000 */ nop /* D9F18C 80241CBC 0C090652 */ jal func_80241948_D9EE18 /* D9F190 80241CC0 0240202D */ daddu $a0, $s2, $zero /* D9F194 80241CC4 0040202D */ daddu $a0, $v0, $zero @@ -35,7 +35,7 @@ glabel func_80241C7C_D9F14C /* D9F1C4 80241CF4 3C01C1A0 */ lui $at, 0xc1a0 /* D9F1C8 80241CF8 44812000 */ mtc1 $at, $f4 /* D9F1CC 80241CFC 44833000 */ mtc1 $v1, $f6 -/* D9F1D0 80241D00 00000000 */ nop +/* D9F1D0 80241D00 00000000 */ nop /* D9F1D4 80241D04 468031A0 */ cvt.s.w $f6, $f6 /* D9F1D8 80241D08 44073000 */ mfc1 $a3, $f6 /* D9F1DC 80241D0C 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241EA4_D9F374.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241EA4_D9F374.s index 344526e57e..957cb96756 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241EA4_D9F374.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241EA4_D9F374.s @@ -47,7 +47,7 @@ glabel func_80241EA4_D9F374 /* D9F418 80241F48 8E6200B0 */ lw $v0, 0xb0($s3) /* D9F41C 80241F4C 30420004 */ andi $v0, $v0, 4 /* D9F420 80241F50 10400019 */ beqz $v0, .L80241FB8 -/* D9F424 80241F54 00000000 */ nop +/* D9F424 80241F54 00000000 */ nop .L80241F58: /* D9F428 80241F58 34630102 */ ori $v1, $v1, 0x102 /* D9F42C 80241F5C AEE00070 */ sw $zero, 0x70($s7) @@ -83,12 +83,12 @@ glabel func_80241EA4_D9F374 /* D9F4A0 80241FD0 10600007 */ beqz $v1, .L80241FF0 /* D9F4A4 80241FD4 0000102D */ daddu $v0, $zero, $zero /* D9F4A8 80241FD8 080908ED */ j .L802423B4 -/* D9F4AC 80241FDC 00000000 */ nop +/* D9F4AC 80241FDC 00000000 */ nop .L80241FE0: /* D9F4B0 80241FE0 1062005B */ beq $v1, $v0, .L80242150 /* D9F4B4 80241FE4 0000102D */ daddu $v0, $zero, $zero /* D9F4B8 80241FE8 080908ED */ j .L802423B4 -/* D9F4BC 80241FEC 00000000 */ nop +/* D9F4BC 80241FEC 00000000 */ nop .L80241FF0: /* D9F4C0 80241FF0 8E420000 */ lw $v0, ($s2) /* D9F4C4 80241FF4 0240202D */ daddu $a0, $s2, $zero @@ -131,17 +131,17 @@ glabel func_80241EA4_D9F374 /* D9F554 80242084 C6400038 */ lwc1 $f0, 0x38($s2) /* D9F558 80242088 4600020D */ trunc.w.s $f8, $f0 /* D9F55C 8024208C 44024000 */ mfc1 $v0, $f8 -/* D9F560 80242090 00000000 */ nop +/* D9F560 80242090 00000000 */ nop /* D9F564 80242094 A6620010 */ sh $v0, 0x10($s3) /* D9F568 80242098 C640003C */ lwc1 $f0, 0x3c($s2) /* D9F56C 8024209C 4600020D */ trunc.w.s $f8, $f0 /* D9F570 802420A0 44024000 */ mfc1 $v0, $f8 -/* D9F574 802420A4 00000000 */ nop +/* D9F574 802420A4 00000000 */ nop /* D9F578 802420A8 A6620012 */ sh $v0, 0x12($s3) /* D9F57C 802420AC C6400040 */ lwc1 $f0, 0x40($s2) /* D9F580 802420B0 4600020D */ trunc.w.s $f8, $f0 /* D9F584 802420B4 44024000 */ mfc1 $v0, $f8 -/* D9F588 802420B8 00000000 */ nop +/* D9F588 802420B8 00000000 */ nop /* D9F58C 802420BC A6620014 */ sh $v0, 0x14($s3) /* D9F590 802420C0 AE400044 */ sw $zero, 0x44($s2) /* D9F594 802420C4 AE400048 */ sw $zero, 0x48($s2) @@ -187,10 +187,10 @@ glabel func_80241EA4_D9F374 /* D9F630 80242160 44810800 */ mtc1 $at, $f1 /* D9F634 80242164 44800000 */ mtc1 $zero, $f0 /* D9F638 80242168 44821000 */ mtc1 $v0, $f2 -/* D9F63C 8024216C 00000000 */ nop +/* D9F63C 8024216C 00000000 */ nop /* D9F640 80242170 468010A1 */ cvt.d.w $f2, $f2 /* D9F644 80242174 46201082 */ mul.d $f2, $f2, $f0 -/* D9F648 80242178 00000000 */ nop +/* D9F648 80242178 00000000 */ nop /* D9F64C 8024217C 0200282D */ daddu $a1, $s0, $zero /* D9F650 80242180 C6440038 */ lwc1 $f4, 0x38($s2) /* D9F654 80242184 C640003C */ lwc1 $f0, 0x3c($s2) @@ -210,13 +210,13 @@ glabel func_80241EA4_D9F374 /* D9F68C 802421BC 864200A6 */ lh $v0, 0xa6($s2) /* D9F690 802421C0 27B40028 */ addiu $s4, $sp, 0x28 /* D9F694 802421C4 44820000 */ mtc1 $v0, $f0 -/* D9F698 802421C8 00000000 */ nop +/* D9F698 802421C8 00000000 */ nop /* D9F69C 802421CC 46800020 */ cvt.s.w $f0, $f0 /* D9F6A0 802421D0 E7A00018 */ swc1 $f0, 0x18($sp) /* D9F6A4 802421D4 864200A8 */ lh $v0, 0xa8($s2) /* D9F6A8 802421D8 0280382D */ daddu $a3, $s4, $zero /* D9F6AC 802421DC 44820000 */ mtc1 $v0, $f0 -/* D9F6B0 802421E0 00000000 */ nop +/* D9F6B0 802421E0 00000000 */ nop /* D9F6B4 802421E4 46800020 */ cvt.s.w $f0, $f0 /* D9F6B8 802421E8 0C0376B9 */ jal func_800DDAE4 /* D9F6BC 802421EC E7A0001C */ swc1 $f0, 0x1c($sp) @@ -240,14 +240,14 @@ glabel func_80241EA4_D9F374 /* D9F700 80242230 0C0372DF */ jal func_800DCB7C /* D9F704 80242234 0280382D */ daddu $a3, $s4, $zero /* D9F708 80242238 10400019 */ beqz $v0, .L802422A0 -/* D9F70C 8024223C 00000000 */ nop +/* D9F70C 8024223C 00000000 */ nop /* D9F710 80242240 C640001C */ lwc1 $f0, 0x1c($s2) /* D9F714 80242244 C7A2002C */ lwc1 $f2, 0x2c($sp) /* D9F718 80242248 46000005 */ abs.s $f0, $f0 /* D9F71C 8024224C 4600103C */ c.lt.s $f2, $f0 -/* D9F720 80242250 00000000 */ nop +/* D9F720 80242250 00000000 */ nop /* D9F724 80242254 45000012 */ bc1f .L802422A0 -/* D9F728 80242258 00000000 */ nop +/* D9F728 80242258 00000000 */ nop /* D9F72C 8024225C C7A40024 */ lwc1 $f4, 0x24($sp) /* D9F730 80242260 C6400064 */ lwc1 $f0, 0x64($s2) /* D9F734 80242264 46002001 */ sub.s $f0, $f4, $f0 @@ -257,7 +257,7 @@ glabel func_80241EA4_D9F374 /* D9F744 80242274 46000005 */ abs.s $f0, $f0 /* D9F748 80242278 46000021 */ cvt.d.s $f0, $f0 /* D9F74C 8024227C 4622003C */ c.lt.d $f0, $f2 -/* D9F750 80242280 00000000 */ nop +/* D9F750 80242280 00000000 */ nop /* D9F754 80242284 45000006 */ bc1f .L802422A0 /* D9F758 80242288 0240202D */ daddu $a0, $s2, $zero /* D9F75C 8024228C 8E450018 */ lw $a1, 0x18($s2) @@ -272,7 +272,7 @@ glabel func_80241EA4_D9F374 /* D9F77C 802422AC 44801000 */ mtc1 $zero, $f2 /* D9F780 802422B0 46000021 */ cvt.d.s $f0, $f0 /* D9F784 802422B4 4622003C */ c.lt.d $f0, $f2 -/* D9F788 802422B8 00000000 */ nop +/* D9F788 802422B8 00000000 */ nop /* D9F78C 802422BC 45030001 */ bc1tl .L802422C4 /* D9F790 802422C0 2416000B */ addiu $s6, $zero, 0xb .L802422C4: @@ -288,7 +288,7 @@ glabel func_80241EA4_D9F374 /* D9F7B4 802422E4 8E620070 */ lw $v0, 0x70($s3) /* D9F7B8 802422E8 30420001 */ andi $v0, $v0, 1 /* D9F7BC 802422EC 10400009 */ beqz $v0, .L80242314 -/* D9F7C0 802422F0 00000000 */ nop +/* D9F7C0 802422F0 00000000 */ nop /* D9F7C4 802422F4 C640004C */ lwc1 $f0, 0x4c($s2) /* D9F7C8 802422F8 3C014044 */ lui $at, 0x4044 /* D9F7CC 802422FC 44811800 */ mtc1 $at, $f3 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802423E0_D9F8B0.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802423E0_D9F8B0.s index 3565fd99dc..2040776888 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802423E0_D9F8B0.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802423E0_D9F8B0.s @@ -50,7 +50,7 @@ glabel func_802423E0_D9F8B0 .L8024248C: /* D9F95C 8024248C 86240008 */ lh $a0, 8($s1) /* D9F960 80242490 0C00FB5A */ jal get_enemy_safe -/* D9F964 80242494 00000000 */ nop +/* D9F964 80242494 00000000 */ nop /* D9F968 80242498 14400005 */ bnez $v0, .L802424B0 /* D9F96C 8024249C 0260202D */ daddu $a0, $s3, $zero /* D9F970 802424A0 3C05FE36 */ lui $a1, 0xfe36 @@ -60,7 +60,7 @@ glabel func_802423E0_D9F8B0 .L802424B0: /* D9F980 802424B0 86240008 */ lh $a0, 8($s1) /* D9F984 802424B4 0C00EABB */ jal get_npc_unsafe -/* D9F988 802424B8 00000000 */ nop +/* D9F988 802424B8 00000000 */ nop /* D9F98C 802424BC 8E630070 */ lw $v1, 0x70($s3) /* D9F990 802424C0 10600006 */ beqz $v1, .L802424DC /* D9F994 802424C4 0040802D */ daddu $s0, $v0, $zero @@ -68,7 +68,7 @@ glabel func_802423E0_D9F8B0 /* D9F99C 802424CC 1062003F */ beq $v1, $v0, .L802425CC /* D9F9A0 802424D0 0000102D */ daddu $v0, $zero, $zero /* D9F9A4 802424D4 08090A04 */ j .L80242810 -/* D9F9A8 802424D8 00000000 */ nop +/* D9F9A8 802424D8 00000000 */ nop .L802424DC: /* D9F9AC 802424DC AFA00010 */ sw $zero, 0x10($sp) /* D9F9B0 802424E0 AFA00014 */ sw $zero, 0x14($sp) @@ -79,7 +79,7 @@ glabel func_802423E0_D9F8B0 /* D9F9C4 802424F4 24040002 */ addiu $a0, $zero, 2 /* D9F9C8 802424F8 C64C006C */ lwc1 $f12, 0x6c($s2) /* D9F9CC 802424FC 0C00A6C9 */ jal clamp_angle -/* D9F9D0 80242500 00000000 */ nop +/* D9F9D0 80242500 00000000 */ nop /* D9F9D4 80242504 3C018024 */ lui $at, %hi(D_80247BC8) /* D9F9D8 80242508 D4387BC8 */ ldc1 $f24, %lo(D_80247BC8)($at) /* D9F9DC 8024250C 46000521 */ cvt.d.s $f20, $f0 @@ -107,7 +107,7 @@ glabel func_802423E0_D9F8B0 /* D9FA34 80242564 46000306 */ mov.s $f12, $f0 /* D9FA38 80242568 46000021 */ cvt.d.s $f0, $f0 /* D9FA3C 8024256C 4638003C */ c.lt.d $f0, $f24 -/* D9FA40 80242570 00000000 */ nop +/* D9FA40 80242570 00000000 */ nop /* D9FA44 80242574 45020002 */ bc1fl .L80242580 /* D9FA48 80242578 E614000C */ swc1 $f20, 0xc($s0) /* D9FA4C 8024257C E616000C */ swc1 $f22, 0xc($s0) @@ -117,7 +117,7 @@ glabel func_802423E0_D9F8B0 /* D9FA58 80242588 D4227BD8 */ ldc1 $f2, %lo(D_80247BD8)($at) /* D9FA5C 8024258C 46000021 */ cvt.d.s $f0, $f0 /* D9FA60 80242590 46220002 */ mul.d $f0, $f0, $f2 -/* D9FA64 80242594 00000000 */ nop +/* D9FA64 80242594 00000000 */ nop /* D9FA68 80242598 3C013F66 */ lui $at, 0x3f66 /* D9FA6C 8024259C 34216666 */ ori $at, $at, 0x6666 /* D9FA70 802425A0 44812000 */ mtc1 $at, $f4 @@ -147,13 +147,13 @@ glabel func_802423E0_D9F8B0 /* D9FACC 802425FC 860200A6 */ lh $v0, 0xa6($s0) /* D9FAD0 80242600 27A60024 */ addiu $a2, $sp, 0x24 /* D9FAD4 80242604 44820000 */ mtc1 $v0, $f0 -/* D9FAD8 80242608 00000000 */ nop +/* D9FAD8 80242608 00000000 */ nop /* D9FADC 8024260C 46800020 */ cvt.s.w $f0, $f0 /* D9FAE0 80242610 E7A00018 */ swc1 $f0, 0x18($sp) /* D9FAE4 80242614 860200A8 */ lh $v0, 0xa8($s0) /* D9FAE8 80242618 27A70028 */ addiu $a3, $sp, 0x28 /* D9FAEC 8024261C 44820000 */ mtc1 $v0, $f0 -/* D9FAF0 80242620 00000000 */ nop +/* D9FAF0 80242620 00000000 */ nop /* D9FAF4 80242624 46800020 */ cvt.s.w $f0, $f0 /* D9FAF8 80242628 0C037711 */ jal func_800DDC44 /* D9FAFC 8024262C E7A0001C */ swc1 $f0, 0x1c($sp) @@ -173,7 +173,7 @@ glabel func_802423E0_D9F8B0 /* D9FB2C 8024265C 44801800 */ mtc1 $zero, $f3 /* D9FB30 80242660 46000021 */ cvt.d.s $f0, $f0 /* D9FB34 80242664 4622003C */ c.lt.d $f0, $f2 -/* D9FB38 80242668 00000000 */ nop +/* D9FB38 80242668 00000000 */ nop /* D9FB3C 8024266C 45000028 */ bc1f .L80242710 /* D9FB40 80242670 27A50020 */ addiu $a1, $sp, 0x20 /* D9FB44 80242674 27A60024 */ addiu $a2, $sp, 0x24 @@ -204,7 +204,7 @@ glabel func_802423E0_D9F8B0 /* D9FBA8 802426D8 0C0372DF */ jal func_800DCB7C /* D9FBAC 802426DC 27A70028 */ addiu $a3, $sp, 0x28 /* D9FBB0 802426E0 1040000B */ beqz $v0, .L80242710 -/* D9FBB4 802426E4 00000000 */ nop +/* D9FBB4 802426E4 00000000 */ nop /* D9FBB8 802426E8 C600001C */ lwc1 $f0, 0x1c($s0) /* D9FBBC 802426EC C7A2002C */ lwc1 $f2, 0x2c($sp) /* D9FBC0 802426F0 46000005 */ abs.s $f0, $f0 @@ -212,7 +212,7 @@ glabel func_802423E0_D9F8B0 /* D9FBC8 802426F8 46340000 */ add.d $f0, $f0, $f20 /* D9FBCC 802426FC 460010A1 */ cvt.d.s $f2, $f2 /* D9FBD0 80242700 4620103E */ c.le.d $f2, $f0 -/* D9FBD4 80242704 00000000 */ nop +/* D9FBD4 80242704 00000000 */ nop /* D9FBD8 80242708 45030001 */ bc1tl .L80242710 /* D9FBDC 8024270C 24120001 */ addiu $s2, $zero, 1 .L80242710: @@ -234,7 +234,7 @@ glabel func_802423E0_D9F8B0 /* D9FC18 80242748 2414000B */ addiu $s4, $zero, 0xb .L8024274C: /* D9FC1C 8024274C 12800024 */ beqz $s4, .L802427E0 -/* D9FC20 80242750 00000000 */ nop +/* D9FC20 80242750 00000000 */ nop /* D9FC24 80242754 AFA00010 */ sw $zero, 0x10($sp) /* D9FC28 80242758 AFA00014 */ sw $zero, 0x14($sp) /* D9FC2C 8024275C 8E050038 */ lw $a1, 0x38($s0) @@ -268,7 +268,7 @@ glabel func_802423E0_D9F8B0 /* D9FC9C 802427CC AC800070 */ sw $zero, 0x70($a0) .L802427D0: /* D9FCA0 802427D0 0C0B2026 */ jal set_variable -/* D9FCA4 802427D4 00000000 */ nop +/* D9FCA4 802427D4 00000000 */ nop /* D9FCA8 802427D8 08090A04 */ j .L80242810 /* D9FCAC 802427DC 24020002 */ addiu $v0, $zero, 2 .L802427E0: diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s index a5f47f64fb..c30aab6c18 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s @@ -103,41 +103,48 @@ glabel func_8024283C_D9FD0C /* D9FE7C 802429AC 2C620064 */ sltiu $v0, $v1, 0x64 /* D9FE80 802429B0 10400060 */ beqz $v0, .L80242B34 /* D9FE84 802429B4 00031080 */ sll $v0, $v1, 2 -/* D9FE88 802429B8 3C018024 */ lui $at, %hi(D_80247BE0) +/* D9FE88 802429B8 3C018024 */ lui $at, %hi(jtbl_80247BE0_DA50B0) /* D9FE8C 802429BC 00220821 */ addu $at, $at, $v0 -/* D9FE90 802429C0 8C227BE0 */ lw $v0, %lo(D_80247BE0)($at) +/* D9FE90 802429C0 8C227BE0 */ lw $v0, %lo(jtbl_80247BE0_DA50B0)($at) /* D9FE94 802429C4 00400008 */ jr $v0 /* D9FE98 802429C8 00000000 */ nop +glabel L802429CC_D9FE9C /* D9FE9C 802429CC 0260202D */ daddu $a0, $s3, $zero /* D9FEA0 802429D0 0200282D */ daddu $a1, $s0, $zero /* D9FEA4 802429D4 0C012568 */ jal func_800495A0 /* D9FEA8 802429D8 02A0302D */ daddu $a2, $s5, $zero +glabel L802429DC_D9FEAC /* D9FEAC 802429DC 0260202D */ daddu $a0, $s3, $zero /* D9FEB0 802429E0 0200282D */ daddu $a1, $s0, $zero /* D9FEB4 802429E4 0C0125AE */ jal func_800496B8 /* D9FEB8 802429E8 02A0302D */ daddu $a2, $s5, $zero /* D9FEBC 802429EC 08090ACD */ j .L80242B34 /* D9FEC0 802429F0 00000000 */ nop +glabel L802429F4_D9FEC4 /* D9FEC4 802429F4 0260202D */ daddu $a0, $s3, $zero /* D9FEC8 802429F8 0200282D */ daddu $a1, $s0, $zero /* D9FECC 802429FC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D9FED0 80242A00 02A0302D */ daddu $a2, $s5, $zero +glabel L80242A04_D9FED4 /* D9FED4 80242A04 0260202D */ daddu $a0, $s3, $zero /* D9FED8 80242A08 0200282D */ daddu $a1, $s0, $zero /* D9FEDC 80242A0C 0C012701 */ jal func_80049C04 /* D9FEE0 80242A10 02A0302D */ daddu $a2, $s5, $zero /* D9FEE4 80242A14 08090ACD */ j .L80242B34 /* D9FEE8 80242A18 00000000 */ nop +glabel L80242A1C_D9FEEC /* D9FEEC 80242A1C 0260202D */ daddu $a0, $s3, $zero /* D9FEF0 80242A20 0200282D */ daddu $a1, $s0, $zero /* D9FEF4 80242A24 0C01278F */ jal func_80049E3C /* D9FEF8 80242A28 02A0302D */ daddu $a2, $s5, $zero +glabel L80242A2C_D9FEFC /* D9FEFC 80242A2C 0260202D */ daddu $a0, $s3, $zero /* D9FF00 80242A30 0200282D */ daddu $a1, $s0, $zero /* D9FF04 80242A34 0C0127B3 */ jal func_80049ECC /* D9FF08 80242A38 02A0302D */ daddu $a2, $s5, $zero /* D9FF0C 80242A3C 08090ACD */ j .L80242B34 /* D9FF10 80242A40 00000000 */ nop +glabel L80242A44_D9FF14 /* D9FF14 80242A44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* D9FF18 80242A48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* D9FF1C 80242A4C C68C0038 */ lwc1 $f12, 0x38($s4) @@ -170,37 +177,45 @@ glabel func_8024283C_D9FD0C /* D9FF80 80242AB0 0200282D */ daddu $a1, $s0, $zero /* D9FF84 80242AB4 0C0127DF */ jal func_80049F7C /* D9FF88 80242AB8 02A0302D */ daddu $a2, $s5, $zero +glabel L80242ABC_D9FF8C /* D9FF8C 80242ABC 0260202D */ daddu $a0, $s3, $zero /* D9FF90 80242AC0 0200282D */ daddu $a1, $s0, $zero /* D9FF94 80242AC4 0C012849 */ jal func_8004A124 /* D9FF98 80242AC8 02A0302D */ daddu $a2, $s5, $zero /* D9FF9C 80242ACC 08090ACD */ j .L80242B34 /* D9FFA0 80242AD0 00000000 */ nop +glabel L80242AD4_D9FFA4 /* D9FFA4 80242AD4 0260202D */ daddu $a0, $s3, $zero /* D9FFA8 80242AD8 0200282D */ daddu $a1, $s0, $zero /* D9FFAC 80242ADC 0C0128FA */ jal func_8004A3E8 /* D9FFB0 80242AE0 02A0302D */ daddu $a2, $s5, $zero /* D9FFB4 80242AE4 08090ACD */ j .L80242B34 /* D9FFB8 80242AE8 00000000 */ nop +glabel L80242AEC_D9FFBC /* D9FFBC 80242AEC 0C09071F */ jal func_80241C7C_D9F14C /* D9FFC0 80242AF0 0260202D */ daddu $a0, $s3, $zero /* D9FFC4 80242AF4 08090ACD */ j .L80242B34 /* D9FFC8 80242AF8 00000000 */ nop +glabel L80242AFC_D9FFCC /* D9FFCC 80242AFC 0C09075F */ jal omo_02_UnkSetDurationFunc /* D9FFD0 80242B00 0260202D */ daddu $a0, $s3, $zero /* D9FFD4 80242B04 08090ACD */ j .L80242B34 /* D9FFD8 80242B08 00000000 */ nop +glabel L80242B0C_D9FFDC /* D9FFDC 80242B0C 0C090770 */ jal omo_02_UnkNpcAIFunc9 /* D9FFE0 80242B10 0260202D */ daddu $a0, $s3, $zero /* D9FFE4 80242B14 08090ACD */ j .L80242B34 /* D9FFE8 80242B18 00000000 */ nop +glabel L80242B1C_D9FFEC /* D9FFEC 80242B1C 0C090798 */ jal omo_02_UnkDurationCheck /* D9FFF0 80242B20 0260202D */ daddu $a0, $s3, $zero /* D9FFF4 80242B24 08090ACD */ j .L80242B34 /* D9FFF8 80242B28 00000000 */ nop +glabel L80242B2C_D9FFFC /* D9FFFC 80242B2C 0C0129CF */ jal func_8004A73C /* DA0000 80242B30 0260202D */ daddu $a0, $s3, $zero .L80242B34: +glabel L80242B34_DA0004 /* DA0004 80242B34 8FBF0048 */ lw $ra, 0x48($sp) /* DA0008 80242B38 8FB50044 */ lw $s5, 0x44($sp) /* DA000C 80242B3C 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240104_DA5344.s b/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240104_DA5344.s index 933b9094ca..86c5dc71e6 100644 --- a/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240104_DA5344.s +++ b/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240104_DA5344.s @@ -18,7 +18,7 @@ glabel func_80240104_DA5344 /* DA5378 80240138 0C0B210B */ jal get_float_variable /* DA537C 8024013C 46000506 */ mov.s $f20, $f0 /* DA5380 80240140 4614003C */ c.lt.s $f0, $f20 -/* DA5384 80240144 00000000 */ nop +/* DA5384 80240144 00000000 */ nop /* DA5388 80240148 45000004 */ bc1f .L8024015C /* DA538C 8024014C 0220202D */ daddu $a0, $s1, $zero /* DA5390 80240150 8E050000 */ lw $a1, ($s0) @@ -29,7 +29,7 @@ glabel func_80240104_DA5344 /* DA53A0 80240160 0000302D */ daddu $a2, $zero, $zero .L80240164: /* DA53A4 80240164 0C0B2026 */ jal set_variable -/* DA53A8 80240168 00000000 */ nop +/* DA53A8 80240168 00000000 */ nop /* DA53AC 8024016C 8FBF0018 */ lw $ra, 0x18($sp) /* DA53B0 80240170 8FB10014 */ lw $s1, 0x14($sp) /* DA53B4 80240174 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240000_DAD400.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240000_DAD400.s index 0135e7f308..512e7d585b 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240000_DAD400.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240000_DAD400.s @@ -26,7 +26,7 @@ glabel func_80240000_DAD400 /* DAD450 80240050 1440FFFA */ bnez $v0, .L8024003C /* DAD454 80240054 24A50004 */ addiu $a1, $a1, 4 /* DAD458 80240058 08090027 */ j .L8024009C -/* DAD45C 8024005C 00000000 */ nop +/* DAD45C 8024005C 00000000 */ nop .L80240060: /* DAD460 80240060 0000182D */ daddu $v1, $zero, $zero /* DAD464 80240064 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402F4_DAD6F4.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402F4_DAD6F4.s index 87c113b275..6f2734bf56 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402F4_DAD6F4.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402F4_DAD6F4.s @@ -16,21 +16,21 @@ glabel func_802402F4_DAD6F4 /* DAD720 80240320 C6140054 */ lwc1 $f20, 0x54($s0) /* DAD724 80240324 3C0140A0 */ lui $at, 0x40a0 /* DAD728 80240328 4481B000 */ mtc1 $at, $f22 -/* DAD72C 8024032C 00000000 */ nop +/* DAD72C 8024032C 00000000 */ nop /* DAD730 80240330 4616A502 */ mul.s $f20, $f20, $f22 -/* DAD734 80240334 00000000 */ nop +/* DAD734 80240334 00000000 */ nop /* DAD738 80240338 C60C0080 */ lwc1 $f12, 0x80($s0) /* DAD73C 8024033C 4600A502 */ mul.s $f20, $f20, $f0 /* DAD740 80240340 0C00A8D4 */ jal cos_deg -/* DAD744 80240344 00000000 */ nop +/* DAD744 80240344 00000000 */ nop /* DAD748 80240348 C6040054 */ lwc1 $f4, 0x54($s0) /* DAD74C 8024034C 46162102 */ mul.s $f4, $f4, $f22 -/* DAD750 80240350 00000000 */ nop +/* DAD750 80240350 00000000 */ nop /* DAD754 80240354 C6020028 */ lwc1 $f2, 0x28($s0) /* DAD758 80240358 46141080 */ add.s $f2, $f2, $f20 /* DAD75C 8024035C 46000007 */ neg.s $f0, $f0 /* DAD760 80240360 46002102 */ mul.s $f4, $f4, $f0 -/* DAD764 80240364 00000000 */ nop +/* DAD764 80240364 00000000 */ nop /* DAD768 80240368 4600118D */ trunc.w.s $f6, $f2 /* DAD76C 8024036C E6260084 */ swc1 $f6, 0x84($s1) /* DAD770 80240370 C6000030 */ lwc1 $f0, 0x30($s0) diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802403A0_DAD7A0.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802403A0_DAD7A0.s index a2139124f7..491d3cc6c4 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802403A0_DAD7A0.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802403A0_DAD7A0.s @@ -47,7 +47,7 @@ glabel func_802403A0_DAD7A0 /* DAD848 80240448 0C0123F5 */ jal is_point_within_region /* DAD84C 8024044C 8E070038 */ lw $a3, 0x38($s0) /* DAD850 80240450 1040000E */ beqz $v0, .L8024048C -/* DAD854 80240454 00000000 */ nop +/* DAD854 80240454 00000000 */ nop /* DAD858 80240458 8E2200D0 */ lw $v0, 0xd0($s1) /* DAD85C 8024045C C60C0038 */ lwc1 $f12, 0x38($s0) /* DAD860 80240460 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_802403A0_DAD7A0 /* DAD874 80240474 468031A0 */ cvt.s.w $f6, $f6 /* DAD878 80240478 44073000 */ mfc1 $a3, $f6 /* DAD87C 8024047C 0C00A720 */ jal atan2 -/* DAD880 80240480 00000000 */ nop +/* DAD880 80240480 00000000 */ nop /* DAD884 80240484 0809012F */ j .L802404BC /* DAD888 80240488 E600000C */ swc1 $f0, 0xc($s0) .L8024048C: @@ -66,7 +66,7 @@ glabel func_802403A0_DAD7A0 /* DAD890 80240490 2404003C */ addiu $a0, $zero, 0x3c /* DAD894 80240494 C60C000C */ lwc1 $f12, 0xc($s0) /* DAD898 80240498 44820000 */ mtc1 $v0, $f0 -/* DAD89C 8024049C 00000000 */ nop +/* DAD89C 8024049C 00000000 */ nop /* DAD8A0 802404A0 46800020 */ cvt.s.w $f0, $f0 /* DAD8A4 802404A4 46006300 */ add.s $f12, $f12, $f0 /* DAD8A8 802404A8 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_802403A0_DAD7A0 /* DAD8CC 802404CC 8E2200D0 */ lw $v0, 0xd0($s1) /* DAD8D0 802404D0 8C420014 */ lw $v0, 0x14($v0) /* DAD8D4 802404D4 04410004 */ bgez $v0, .L802404E8 -/* DAD8D8 802404D8 00000000 */ nop +/* DAD8D8 802404D8 00000000 */ nop /* DAD8DC 802404DC C6400000 */ lwc1 $f0, ($s2) /* DAD8E0 802404E0 08090142 */ j .L80240508 /* DAD8E4 802404E4 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_802403A0_DAD7A0 /* DAD8E8 802404E8 3C018024 */ lui $at, %hi(D_80244CB0) /* DAD8EC 802404EC D4224CB0 */ ldc1 $f2, %lo(D_80244CB0)($at) /* DAD8F0 802404F0 44820000 */ mtc1 $v0, $f0 -/* DAD8F4 802404F4 00000000 */ nop +/* DAD8F4 802404F4 00000000 */ nop /* DAD8F8 802404F8 46800021 */ cvt.d.w $f0, $f0 /* DAD8FC 802404FC 46220003 */ div.d $f0, $f0, $f2 /* DAD900 80240500 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_802403A0_DAD7A0 /* DAD914 80240514 44801000 */ mtc1 $zero, $f2 /* DAD918 80240518 46000021 */ cvt.d.s $f0, $f0 /* DAD91C 8024051C 46220002 */ mul.d $f0, $f0, $f2 -/* DAD920 80240520 00000000 */ nop +/* DAD920 80240520 00000000 */ nop /* DAD924 80240524 24020001 */ addiu $v0, $zero, 1 /* DAD928 80240528 4620018D */ trunc.w.d $f6, $f0 /* DAD92C 8024052C E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240550_DAD950.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240550_DAD950.s index e8176d5f03..4f38c1b717 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240550_DAD950.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240550_DAD950.s @@ -34,7 +34,7 @@ glabel func_80240550_DAD950 /* DAD9C4 802405C4 44803000 */ mtc1 $zero, $f6 /* DAD9C8 802405C8 46000021 */ cvt.d.s $f0, $f0 /* DAD9CC 802405CC 46260002 */ mul.d $f0, $f0, $f6 -/* DAD9D0 802405D0 00000000 */ nop +/* DAD9D0 802405D0 00000000 */ nop /* DAD9D4 802405D4 24020001 */ addiu $v0, $zero, 1 /* DAD9D8 802405D8 8E24006C */ lw $a0, 0x6c($s1) /* DAD9DC 802405DC 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80240550_DAD950 /* DADA38 80240638 C600003C */ lwc1 $f0, 0x3c($s0) /* DADA3C 8024063C 4600C001 */ sub.s $f0, $f24, $f0 /* DADA40 80240640 4600B03C */ c.lt.s $f22, $f0 -/* DADA44 80240644 00000000 */ nop +/* DADA44 80240644 00000000 */ nop /* DADA48 80240648 4500001B */ bc1f .L802406B8 /* DADA4C 8024064C 34820010 */ ori $v0, $a0, 0x10 /* DADA50 80240650 080901AE */ j .L802406B8 @@ -87,9 +87,9 @@ glabel func_80240550_DAD950 /* DADA94 80240694 C7A00034 */ lwc1 $f0, 0x34($sp) /* DADA98 80240698 4600D001 */ sub.s $f0, $f26, $f0 /* DADA9C 8024069C 4600B03C */ c.lt.s $f22, $f0 -/* DADAA0 802406A0 00000000 */ nop +/* DADAA0 802406A0 00000000 */ nop /* DADAA4 802406A4 45000004 */ bc1f .L802406B8 -/* DADAA8 802406A8 00000000 */ nop +/* DADAA8 802406A8 00000000 */ nop /* DADAAC 802406AC 8E22006C */ lw $v0, 0x6c($s1) /* DADAB0 802406B0 34420010 */ ori $v0, $v0, 0x10 /* DADAB4 802406B4 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80240550_DAD950 /* DADABC 802406BC 24030011 */ addiu $v1, $zero, 0x11 /* DADAC0 802406C0 30420011 */ andi $v0, $v0, 0x11 /* DADAC4 802406C4 14430039 */ bne $v0, $v1, .L802407AC -/* DADAC8 802406C8 00000000 */ nop +/* DADAC8 802406C8 00000000 */ nop /* DADACC 802406CC 8E020000 */ lw $v0, ($s0) /* DADAD0 802406D0 30420008 */ andi $v0, $v0, 8 /* DADAD4 802406D4 1040000A */ beqz $v0, .L80240700 @@ -108,7 +108,7 @@ glabel func_80240550_DAD950 /* DADAE4 802406E4 D4204CB8 */ ldc1 $f0, %lo(D_80244CB8)($at) /* DADAE8 802406E8 460010A1 */ cvt.d.s $f2, $f2 /* DADAEC 802406EC 46201082 */ mul.d $f2, $f2, $f0 -/* DADAF0 802406F0 00000000 */ nop +/* DADAF0 802406F0 00000000 */ nop /* DADAF4 802406F4 4600A021 */ cvt.d.s $f0, $f20 /* DADAF8 802406F8 080901D9 */ j .L80240764 /* DADAFC 802406FC 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80240550_DAD950 /* DADB4C 8024074C D4204CC0 */ ldc1 $f0, %lo(pause_tabs_draw_badges_A2EF00)($at) /* DADB50 80240750 460010A1 */ cvt.d.s $f2, $f2 /* DADB54 80240754 46201082 */ mul.d $f2, $f2, $f0 -/* DADB58 80240758 00000000 */ nop +/* DADB58 80240758 00000000 */ nop /* DADB5C 8024075C 4600A021 */ cvt.d.s $f0, $f20 /* DADB60 80240760 46220000 */ add.d $f0, $f0, $f2 .L80240764: @@ -149,7 +149,7 @@ glabel func_80240550_DAD950 /* DADB80 80240780 46000005 */ abs.s $f0, $f0 /* DADB84 80240784 46000021 */ cvt.d.s $f0, $f0 /* DADB88 80240788 4622003C */ c.lt.d $f0, $f2 -/* DADB8C 8024078C 00000000 */ nop +/* DADB8C 8024078C 00000000 */ nop /* DADB90 80240790 45000036 */ bc1f .L8024086C /* DADB94 80240794 2403FFEF */ addiu $v1, $zero, -0x11 /* DADB98 80240798 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80240550_DAD950 .L802407AC: /* DADBAC 802407AC 8E220070 */ lw $v0, 0x70($s1) /* DADBB0 802407B0 1840002E */ blez $v0, .L8024086C -/* DADBB4 802407B4 00000000 */ nop +/* DADBB4 802407B4 00000000 */ nop /* DADBB8 802407B8 C62C0074 */ lwc1 $f12, 0x74($s1) /* DADBBC 802407BC 0C00A8BB */ jal sin_deg /* DADBC0 802407C0 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80240550_DAD950 /* DADC18 80240818 27A70030 */ addiu $a3, $sp, 0x30 .L8024081C: /* DADC1C 8024081C 10400007 */ beqz $v0, .L8024083C -/* DADC20 80240820 00000000 */ nop +/* DADC20 80240820 00000000 */ nop /* DADC24 80240824 4616A082 */ mul.s $f2, $f20, $f22 -/* DADC28 80240828 00000000 */ nop +/* DADC28 80240828 00000000 */ nop /* DADC2C 8024082C C7A0002C */ lwc1 $f0, 0x2c($sp) /* DADC30 80240830 461A0000 */ add.s $f0, $f0, $f26 /* DADC34 80240834 08090212 */ j .L80240848 /* DADC38 80240838 46020000 */ add.s $f0, $f0, $f2 .L8024083C: /* DADC3C 8024083C 4616A002 */ mul.s $f0, $f20, $f22 -/* DADC40 80240840 00000000 */ nop +/* DADC40 80240840 00000000 */ nop /* DADC44 80240844 4600C000 */ add.s $f0, $f24, $f0 .L80240848: /* DADC48 80240848 E600003C */ swc1 $f0, 0x3c($s0) /* DADC4C 8024084C 8E220074 */ lw $v0, 0x74($s1) /* DADC50 80240850 2442000A */ addiu $v0, $v0, 0xa /* DADC54 80240854 44826000 */ mtc1 $v0, $f12 -/* DADC58 80240858 00000000 */ nop +/* DADC58 80240858 00000000 */ nop /* DADC5C 8024085C 0C00A6C9 */ jal clamp_angle /* DADC60 80240860 46806320 */ cvt.s.w $f12, $f12 /* DADC64 80240864 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80240550_DAD950 /* DADC74 80240874 2442FFFF */ addiu $v0, $v0, -1 /* DADC78 80240878 8E430014 */ lw $v1, 0x14($s2) /* DADC7C 8024087C 04600048 */ bltz $v1, .L802409A0 -/* DADC80 80240880 00000000 */ nop +/* DADC80 80240880 00000000 */ nop /* DADC84 80240884 8E620074 */ lw $v0, 0x74($s3) /* DADC88 80240888 1C400042 */ bgtz $v0, .L80240994 /* DADC8C 8024088C 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80240550_DAD950 /* DADC94 80240894 860200A8 */ lh $v0, 0xa8($s0) /* DADC98 80240898 C602003C */ lwc1 $f2, 0x3c($s0) /* DADC9C 8024089C 44820000 */ mtc1 $v0, $f0 -/* DADCA0 802408A0 00000000 */ nop +/* DADCA0 802408A0 00000000 */ nop /* DADCA4 802408A4 46800020 */ cvt.s.w $f0, $f0 /* DADCA8 802408A8 46001080 */ add.s $f2, $f2, $f0 /* DADCAC 802408AC 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80240550_DAD950 /* DADCC8 802408C8 C440002C */ lwc1 $f0, 0x2c($v0) /* DADCCC 802408CC 46000021 */ cvt.d.s $f0, $f0 /* DADCD0 802408D0 4622003C */ c.lt.d $f0, $f2 -/* DADCD4 802408D4 00000000 */ nop +/* DADCD4 802408D4 00000000 */ nop /* DADCD8 802408D8 4500002C */ bc1f .L8024098C /* DADCDC 802408DC 02A0202D */ daddu $a0, $s5, $zero /* DADCE0 802408E0 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80240550_DAD950 /* DADD1C 8024091C 3C01C1A0 */ lui $at, 0xc1a0 /* DADD20 80240920 44812000 */ mtc1 $at, $f4 /* DADD24 80240924 44834000 */ mtc1 $v1, $f8 -/* DADD28 80240928 00000000 */ nop +/* DADD28 80240928 00000000 */ nop /* DADD2C 8024092C 46804220 */ cvt.s.w $f8, $f8 /* DADD30 80240930 44074000 */ mfc1 $a3, $f8 /* DADD34 80240934 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80240550_DAD950 /* DADDE8 802409E8 0C0123F5 */ jal is_point_within_region /* DADDEC 802409EC 8E070038 */ lw $a3, 0x38($s0) /* DADDF0 802409F0 1040001A */ beqz $v0, .L80240A5C -/* DADDF4 802409F4 00000000 */ nop +/* DADDF4 802409F4 00000000 */ nop /* DADDF8 802409F8 8E060038 */ lw $a2, 0x38($s0) /* DADDFC 802409FC 8E2200D0 */ lw $v0, 0xd0($s1) /* DADE00 80240A00 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80240550_DAD950 /* DADE14 80240A14 468073A0 */ cvt.s.w $f14, $f14 /* DADE18 80240A18 C6020018 */ lwc1 $f2, 0x18($s0) /* DADE1C 80240A1C 4600103C */ c.lt.s $f2, $f0 -/* DADE20 80240A20 00000000 */ nop +/* DADE20 80240A20 00000000 */ nop /* DADE24 80240A24 4500000D */ bc1f .L80240A5C /* DADE28 80240A28 E7A00034 */ swc1 $f0, 0x34($sp) /* DADE2C 80240A2C C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80240550_DAD950 /* DADE68 80240A68 00621825 */ or $v1, $v1, $v0 /* DADE6C 80240A6C 00741825 */ or $v1, $v1, $s4 /* DADE70 80240A70 10600008 */ beqz $v1, .L80240A94 -/* DADE74 80240A74 00000000 */ nop +/* DADE74 80240A74 00000000 */ nop /* DADE78 80240A78 8602008C */ lh $v0, 0x8c($s0) /* DADE7C 80240A7C 14400031 */ bnez $v0, .L80240B44 -/* DADE80 80240A80 00000000 */ nop +/* DADE80 80240A80 00000000 */ nop /* DADE84 80240A84 8E050018 */ lw $a1, 0x18($s0) /* DADE88 80240A88 8E06000C */ lw $a2, 0xc($s0) /* DADE8C 80240A8C 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_80240550_DAD950 /* DADEA0 80240AA0 44801000 */ mtc1 $zero, $f2 /* DADEA4 80240AA4 46000021 */ cvt.d.s $f0, $f0 /* DADEA8 80240AA8 46220002 */ mul.d $f0, $f0, $f2 -/* DADEAC 80240AAC 00000000 */ nop +/* DADEAC 80240AAC 00000000 */ nop /* DADEB0 80240AB0 4620020D */ trunc.w.d $f8, $f0 /* DADEB4 80240AB4 E628007C */ swc1 $f8, 0x7c($s1) /* DADEB8 80240AB8 8E420004 */ lw $v0, 4($s2) /* DADEBC 80240ABC 18400021 */ blez $v0, .L80240B44 -/* DADEC0 80240AC0 00000000 */ nop +/* DADEC0 80240AC0 00000000 */ nop /* DADEC4 80240AC4 8602008E */ lh $v0, 0x8e($s0) /* DADEC8 80240AC8 9603008E */ lhu $v1, 0x8e($s0) /* DADECC 80240ACC 18400005 */ blez $v0, .L80240AE4 @@ -375,7 +375,7 @@ glabel func_80240550_DAD950 /* DADED4 80240AD4 A602008E */ sh $v0, 0x8e($s0) /* DADED8 80240AD8 00021400 */ sll $v0, $v0, 0x10 /* DADEDC 80240ADC 1C400019 */ bgtz $v0, .L80240B44 -/* DADEE0 80240AE0 00000000 */ nop +/* DADEE0 80240AE0 00000000 */ nop .L80240AE4: /* DADEE4 80240AE4 240403E8 */ addiu $a0, $zero, 0x3e8 /* DADEE8 80240AE8 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80240550_DAD950 /* DADF30 80240B30 18400003 */ blez $v0, .L80240B40 /* DADF34 80240B34 28620003 */ slti $v0, $v1, 3 /* DADF38 80240B38 10400002 */ beqz $v0, .L80240B44 -/* DADF3C 80240B3C 00000000 */ nop +/* DADF3C 80240B3C 00000000 */ nop .L80240B40: /* DADF40 80240B40 AE600070 */ sw $zero, 0x70($s3) .L80240B44: diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240C38_DAE038.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240C38_DAE038.s index 1a52fd6338..1577d7a741 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240C38_DAE038.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240C38_DAE038.s @@ -42,11 +42,11 @@ glabel func_80240C38_DAE038 .L80240CCC: /* DAE0CC 80240CCC 8E220070 */ lw $v0, 0x70($s1) /* DAE0D0 80240CD0 18400034 */ blez $v0, .L80240DA4 -/* DAE0D4 80240CD4 00000000 */ nop +/* DAE0D4 80240CD4 00000000 */ nop /* DAE0D8 80240CD8 C62C0074 */ lwc1 $f12, 0x74($s1) /* DAE0DC 80240CDC 46806320 */ cvt.s.w $f12, $f12 /* DAE0E0 80240CE0 44820000 */ mtc1 $v0, $f0 -/* DAE0E4 80240CE4 00000000 */ nop +/* DAE0E4 80240CE4 00000000 */ nop /* DAE0E8 80240CE8 46800020 */ cvt.s.w $f0, $f0 /* DAE0EC 80240CEC 46000021 */ cvt.d.s $f0, $f0 /* DAE0F0 80240CF0 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_80240C38_DAE038 /* DAE150 80240D50 27A70030 */ addiu $a3, $sp, 0x30 .L80240D54: /* DAE154 80240D54 10400007 */ beqz $v0, .L80240D74 -/* DAE158 80240D58 00000000 */ nop +/* DAE158 80240D58 00000000 */ nop /* DAE15C 80240D5C 4616A082 */ mul.s $f2, $f20, $f22 -/* DAE160 80240D60 00000000 */ nop +/* DAE160 80240D60 00000000 */ nop /* DAE164 80240D64 C7A0002C */ lwc1 $f0, 0x2c($sp) /* DAE168 80240D68 46180000 */ add.s $f0, $f0, $f24 /* DAE16C 80240D6C 08090360 */ j .L80240D80 /* DAE170 80240D70 46020000 */ add.s $f0, $f0, $f2 .L80240D74: /* DAE174 80240D74 4616A002 */ mul.s $f0, $f20, $f22 -/* DAE178 80240D78 00000000 */ nop +/* DAE178 80240D78 00000000 */ nop /* DAE17C 80240D7C 4600D000 */ add.s $f0, $f26, $f0 .L80240D80: /* DAE180 80240D80 E600003C */ swc1 $f0, 0x3c($s0) /* DAE184 80240D84 8E220074 */ lw $v0, 0x74($s1) /* DAE188 80240D88 2442000A */ addiu $v0, $v0, 0xa /* DAE18C 80240D8C 44826000 */ mtc1 $v0, $f12 -/* DAE190 80240D90 00000000 */ nop +/* DAE190 80240D90 00000000 */ nop /* DAE194 80240D94 0C00A6C9 */ jal clamp_angle /* DAE198 80240D98 46806320 */ cvt.s.w $f12, $f12 /* DAE19C 80240D9C 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_80240C38_DAE038 /* DAE1B0 80240DB0 860200A8 */ lh $v0, 0xa8($s0) /* DAE1B4 80240DB4 C600003C */ lwc1 $f0, 0x3c($s0) /* DAE1B8 80240DB8 44821000 */ mtc1 $v0, $f2 -/* DAE1BC 80240DBC 00000000 */ nop +/* DAE1BC 80240DBC 00000000 */ nop /* DAE1C0 80240DC0 468010A0 */ cvt.s.w $f2, $f2 /* DAE1C4 80240DC4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* DAE1C8 80240DC8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_80240C38_DAE038 /* DAE1E4 80240DE4 46240000 */ add.d $f0, $f0, $f4 /* DAE1E8 80240DE8 460010A1 */ cvt.d.s $f2, $f2 /* DAE1EC 80240DEC 4620103C */ c.lt.d $f2, $f0 -/* DAE1F0 80240DF0 00000000 */ nop +/* DAE1F0 80240DF0 00000000 */ nop /* DAE1F4 80240DF4 4500002E */ bc1f .L80240EB0 /* DAE1F8 80240DF8 0280202D */ daddu $a0, $s4, $zero /* DAE1FC 80240DFC 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_80240C38_DAE038 /* DAE23C 80240E3C 3C01C1A0 */ lui $at, 0xc1a0 /* DAE240 80240E40 44812000 */ mtc1 $at, $f4 /* DAE244 80240E44 44834000 */ mtc1 $v1, $f8 -/* DAE248 80240E48 00000000 */ nop +/* DAE248 80240E48 00000000 */ nop /* DAE24C 80240E4C 46804220 */ cvt.s.w $f8, $f8 /* DAE250 80240E50 44074000 */ mfc1 $a3, $f8 /* DAE254 80240E54 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_80240C38_DAE038 .L80240EB0: /* DAE2B0 80240EB0 8602008C */ lh $v0, 0x8c($s0) /* DAE2B4 80240EB4 14400025 */ bnez $v0, .L80240F4C -/* DAE2B8 80240EB8 00000000 */ nop +/* DAE2B8 80240EB8 00000000 */ nop /* DAE2BC 80240EBC 8602008E */ lh $v0, 0x8e($s0) /* DAE2C0 80240EC0 1C400022 */ bgtz $v0, .L80240F4C -/* DAE2C4 80240EC4 00000000 */ nop +/* DAE2C4 80240EC4 00000000 */ nop /* DAE2C8 80240EC8 8E620074 */ lw $v0, 0x74($s3) /* DAE2CC 80240ECC 2442FFFF */ addiu $v0, $v0, -1 /* DAE2D0 80240ED0 1840001D */ blez $v0, .L80240F48 @@ -183,7 +183,7 @@ glabel func_80240C38_DAE038 /* DAE2DC 80240EDC 9442002A */ lhu $v0, 0x2a($v0) /* DAE2E0 80240EE0 30420010 */ andi $v0, $v0, 0x10 /* DAE2E4 80240EE4 14400007 */ bnez $v0, .L80240F04 -/* DAE2E8 80240EE8 00000000 */ nop +/* DAE2E8 80240EE8 00000000 */ nop /* DAE2EC 80240EEC C600000C */ lwc1 $f0, 0xc($s0) /* DAE2F0 80240EF0 3C014334 */ lui $at, 0x4334 /* DAE2F4 80240EF4 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241060_DAE460.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241060_DAE460.s index 3b21595d86..0f50247c72 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241060_DAE460.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241060_DAE460.s @@ -60,18 +60,18 @@ glabel func_80241060_DAE460 /* DAE538 80241138 C6200038 */ lwc1 $f0, 0x38($s1) /* DAE53C 8024113C 4600018D */ trunc.w.s $f6, $f0 /* DAE540 80241140 44023000 */ mfc1 $v0, $f6 -/* DAE544 80241144 00000000 */ nop +/* DAE544 80241144 00000000 */ nop /* DAE548 80241148 A6420010 */ sh $v0, 0x10($s2) /* DAE54C 8024114C C620003C */ lwc1 $f0, 0x3c($s1) /* DAE550 80241150 4600018D */ trunc.w.s $f6, $f0 /* DAE554 80241154 44023000 */ mfc1 $v0, $f6 -/* DAE558 80241158 00000000 */ nop +/* DAE558 80241158 00000000 */ nop /* DAE55C 8024115C A6420012 */ sh $v0, 0x12($s2) /* DAE560 80241160 C6200040 */ lwc1 $f0, 0x40($s1) /* DAE564 80241164 A2430007 */ sb $v1, 7($s2) /* DAE568 80241168 4600018D */ trunc.w.s $f6, $f0 /* DAE56C 8024116C 44023000 */ mfc1 $v0, $f6 -/* DAE570 80241170 00000000 */ nop +/* DAE570 80241170 00000000 */ nop /* DAE574 80241174 A6420014 */ sh $v0, 0x14($s2) .L80241178: /* DAE578 80241178 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802411F8_DAE5F8.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802411F8_DAE5F8.s index 9fd9a2dd04..9a8ea044d2 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802411F8_DAE5F8.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802411F8_DAE5F8.s @@ -42,9 +42,9 @@ glabel func_802411F8_DAE5F8 /* DAE68C 8024128C 44801800 */ mtc1 $zero, $f3 /* DAE690 80241290 46002021 */ cvt.d.s $f0, $f4 /* DAE694 80241294 4620103E */ c.le.d $f2, $f0 -/* DAE698 80241298 00000000 */ nop +/* DAE698 80241298 00000000 */ nop /* DAE69C 8024129C 45000030 */ bc1f .L80241360 -/* DAE6A0 802412A0 00000000 */ nop +/* DAE6A0 802412A0 00000000 */ nop /* DAE6A4 802412A4 C600003C */ lwc1 $f0, 0x3c($s0) /* DAE6A8 802412A8 46040000 */ add.s $f0, $f0, $f4 /* DAE6AC 802412AC E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_802411F8_DAE5F8 /* DAE70C 8024130C 27A70020 */ addiu $a3, $sp, 0x20 .L80241310: /* DAE710 80241310 1040000B */ beqz $v0, .L80241340 -/* DAE714 80241314 00000000 */ nop +/* DAE714 80241314 00000000 */ nop /* DAE718 80241318 C7A0001C */ lwc1 $f0, 0x1c($sp) /* DAE71C 8024131C 46140080 */ add.s $f2, $f0, $f20 /* DAE720 80241320 C600003C */ lwc1 $f0, 0x3c($s0) /* DAE724 80241324 4600103E */ c.le.s $f2, $f0 -/* DAE728 80241328 00000000 */ nop +/* DAE728 80241328 00000000 */ nop /* DAE72C 8024132C 4500008D */ bc1f .L80241564 -/* DAE730 80241330 00000000 */ nop +/* DAE730 80241330 00000000 */ nop /* DAE734 80241334 E602003C */ swc1 $f2, 0x3c($s0) /* DAE738 80241338 08090559 */ j .L80241564 /* DAE73C 8024133C AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_802411F8_DAE5F8 /* DAE740 80241340 C602003C */ lwc1 $f2, 0x3c($s0) /* DAE744 80241344 C6000064 */ lwc1 $f0, 0x64($s0) /* DAE748 80241348 4602003E */ c.le.s $f0, $f2 -/* DAE74C 8024134C 00000000 */ nop +/* DAE74C 8024134C 00000000 */ nop /* DAE750 80241350 45030084 */ bc1tl .L80241564 /* DAE754 80241354 AE400070 */ sw $zero, 0x70($s2) /* DAE758 80241358 08090559 */ j .L80241564 -/* DAE75C 8024135C 00000000 */ nop +/* DAE75C 8024135C 00000000 */ nop .L80241360: /* DAE760 80241360 4622003C */ c.lt.d $f0, $f2 -/* DAE764 80241364 00000000 */ nop +/* DAE764 80241364 00000000 */ nop /* DAE768 80241368 4500007E */ bc1f .L80241564 -/* DAE76C 8024136C 00000000 */ nop +/* DAE76C 8024136C 00000000 */ nop /* DAE770 80241370 9602008E */ lhu $v0, 0x8e($s0) /* DAE774 80241374 24420001 */ addiu $v0, $v0, 1 /* DAE778 80241378 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_802411F8_DAE5F8 /* DAE784 80241384 00021403 */ sra $v0, $v0, 0x10 /* DAE788 80241388 0043102A */ slt $v0, $v0, $v1 /* DAE78C 8024138C 14400026 */ bnez $v0, .L80241428 -/* DAE790 80241390 00000000 */ nop +/* DAE790 80241390 00000000 */ nop /* DAE794 80241394 C60C0038 */ lwc1 $f12, 0x38($s0) /* DAE798 80241398 C60E0040 */ lwc1 $f14, 0x40($s0) /* DAE79C 8024139C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_802411F8_DAE5F8 /* DAE7C8 802413C8 8E62001C */ lw $v0, 0x1c($s3) /* DAE7CC 802413CC 46001005 */ abs.s $f0, $f2 /* DAE7D0 802413D0 44822000 */ mtc1 $v0, $f4 -/* DAE7D4 802413D4 00000000 */ nop +/* DAE7D4 802413D4 00000000 */ nop /* DAE7D8 802413D8 46802120 */ cvt.s.w $f4, $f4 /* DAE7DC 802413DC 4600203C */ c.lt.s $f4, $f0 -/* DAE7E0 802413E0 00000000 */ nop +/* DAE7E0 802413E0 00000000 */ nop /* DAE7E4 802413E4 4500000D */ bc1f .L8024141C -/* DAE7E8 802413E8 00000000 */ nop +/* DAE7E8 802413E8 00000000 */ nop /* DAE7EC 802413EC 44800000 */ mtc1 $zero, $f0 /* DAE7F0 802413F0 C614000C */ lwc1 $f20, 0xc($s0) /* DAE7F4 802413F4 4600103C */ c.lt.s $f2, $f0 -/* DAE7F8 802413F8 00000000 */ nop +/* DAE7F8 802413F8 00000000 */ nop /* DAE7FC 802413FC 45000006 */ bc1f .L80241418 /* DAE800 80241400 00021023 */ negu $v0, $v0 /* DAE804 80241404 44820000 */ mtc1 $v0, $f0 -/* DAE808 80241408 00000000 */ nop +/* DAE808 80241408 00000000 */ nop /* DAE80C 8024140C 46800020 */ cvt.s.w $f0, $f0 /* DAE810 80241410 08090507 */ j .L8024141C /* DAE814 80241414 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_802411F8_DAE5F8 /* DAE83C 8024143C C600001C */ lwc1 $f0, 0x1c($s0) /* DAE840 80241440 46001080 */ add.s $f2, $f2, $f0 /* DAE844 80241444 4616103C */ c.lt.s $f2, $f22 -/* DAE848 80241448 00000000 */ nop +/* DAE848 80241448 00000000 */ nop /* DAE84C 8024144C 45020045 */ bc1fl .L80241564 /* DAE850 80241450 E602003C */ swc1 $f2, 0x3c($s0) /* DAE854 80241454 08090558 */ j .L80241560 @@ -169,7 +169,7 @@ glabel func_802411F8_DAE5F8 /* DAE86C 8024146C C600001C */ lwc1 $f0, 0x1c($s0) /* DAE870 80241470 C604003C */ lwc1 $f4, 0x3c($s0) /* DAE874 80241474 44821000 */ mtc1 $v0, $f2 -/* DAE878 80241478 00000000 */ nop +/* DAE878 80241478 00000000 */ nop /* DAE87C 8024147C 468010A0 */ cvt.s.w $f2, $f2 /* DAE880 80241480 46000005 */ abs.s $f0, $f0 /* DAE884 80241484 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_802411F8_DAE5F8 /* DAE8C0 802414C0 0C0372DF */ jal func_800DCB7C /* DAE8C4 802414C4 27A70020 */ addiu $a3, $sp, 0x20 /* DAE8C8 802414C8 10400015 */ beqz $v0, .L80241520 -/* DAE8CC 802414CC 00000000 */ nop +/* DAE8CC 802414CC 00000000 */ nop /* DAE8D0 802414D0 860200A8 */ lh $v0, 0xa8($s0) /* DAE8D4 802414D4 C604001C */ lwc1 $f4, 0x1c($s0) /* DAE8D8 802414D8 44820000 */ mtc1 $v0, $f0 -/* DAE8DC 802414DC 00000000 */ nop +/* DAE8DC 802414DC 00000000 */ nop /* DAE8E0 802414E0 46800020 */ cvt.s.w $f0, $f0 /* DAE8E4 802414E4 46002085 */ abs.s $f2, $f4 /* DAE8E8 802414E8 46020000 */ add.s $f0, $f0, $f2 /* DAE8EC 802414EC C7A20024 */ lwc1 $f2, 0x24($sp) /* DAE8F0 802414F0 4600103E */ c.le.s $f2, $f0 -/* DAE8F4 802414F4 00000000 */ nop +/* DAE8F4 802414F4 00000000 */ nop /* DAE8F8 802414F8 45000005 */ bc1f .L80241510 -/* DAE8FC 802414FC 00000000 */ nop +/* DAE8FC 802414FC 00000000 */ nop /* DAE900 80241500 C7A0001C */ lwc1 $f0, 0x1c($sp) /* DAE904 80241504 AE00001C */ sw $zero, 0x1c($s0) /* DAE908 80241508 08090559 */ j .L80241564 @@ -217,13 +217,13 @@ glabel func_802411F8_DAE5F8 /* DAE924 80241524 860200A8 */ lh $v0, 0xa8($s0) /* DAE928 80241528 46163081 */ sub.s $f2, $f6, $f22 /* DAE92C 8024152C 44820000 */ mtc1 $v0, $f0 -/* DAE930 80241530 00000000 */ nop +/* DAE930 80241530 00000000 */ nop /* DAE934 80241534 46800020 */ cvt.s.w $f0, $f0 /* DAE938 80241538 46001080 */ add.s $f2, $f2, $f0 /* DAE93C 8024153C C604001C */ lwc1 $f4, 0x1c($s0) /* DAE940 80241540 46002005 */ abs.s $f0, $f4 /* DAE944 80241544 4602003C */ c.lt.s $f0, $f2 -/* DAE948 80241548 00000000 */ nop +/* DAE948 80241548 00000000 */ nop /* DAE94C 8024154C 45020005 */ bc1fl .L80241564 /* DAE950 80241550 AE00001C */ sw $zero, 0x1c($s0) /* DAE954 80241554 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241588_DAE988.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241588_DAE988.s index 0c4ff321be..8b6e67f7f9 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241588_DAE988.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241588_DAE988.s @@ -49,15 +49,15 @@ glabel func_80241588_DAE988 /* DAEA30 80241630 44802000 */ mtc1 $zero, $f4 /* DAEA34 80241634 460010A1 */ cvt.d.s $f2, $f2 /* DAEA38 80241638 46241082 */ mul.d $f2, $f2, $f4 -/* DAEA3C 8024163C 00000000 */ nop +/* DAEA3C 8024163C 00000000 */ nop /* DAEA40 80241640 C7A0001C */ lwc1 $f0, 0x1c($sp) /* DAEA44 80241644 46000021 */ cvt.d.s $f0, $f0 /* DAEA48 80241648 46240002 */ mul.d $f0, $f0, $f4 -/* DAEA4C 8024164C 00000000 */ nop +/* DAEA4C 8024164C 00000000 */ nop /* DAEA50 80241650 3C013FE0 */ lui $at, 0x3fe0 /* DAEA54 80241654 44812800 */ mtc1 $at, $f5 /* DAEA58 80241658 44802000 */ mtc1 $zero, $f4 -/* DAEA5C 8024165C 00000000 */ nop +/* DAEA5C 8024165C 00000000 */ nop /* DAEA60 80241660 46241080 */ add.d $f2, $f2, $f4 /* DAEA64 80241664 AE000074 */ sw $zero, 0x74($s0) /* DAEA68 80241668 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s index 1d8d4e7505..fe38842244 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s @@ -54,7 +54,7 @@ glabel func_802416AC_DAEAAC /* DAEB6C 8024176C 8E4300B0 */ lw $v1, 0xb0($s2) /* DAEB70 80241770 30620004 */ andi $v0, $v1, 4 /* DAEB74 80241774 10400007 */ beqz $v0, .L80241794 -/* DAEB78 80241778 00000000 */ nop +/* DAEB78 80241778 00000000 */ nop /* DAEB7C 8024177C 824200B4 */ lb $v0, 0xb4($s2) /* DAEB80 80241780 1440003C */ bnez $v0, .L80241874 /* DAEB84 80241784 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_802416AC_DAEAAC /* DAEB98 80241798 2C62000F */ sltiu $v0, $v1, 0xf /* DAEB9C 8024179C 10400034 */ beqz $v0, .L80241870 /* DAEBA0 802417A0 00031080 */ sll $v0, $v1, 2 -/* DAEBA4 802417A4 3C018024 */ lui $at, %hi(D_80244CC8) +/* DAEBA4 802417A4 3C018024 */ lui $at, %hi(jtbl_80244CC8_DB20C8) /* DAEBA8 802417A8 00220821 */ addu $at, $at, $v0 -/* DAEBAC 802417AC 8C224CC8 */ lw $v0, %lo(D_80244CC8)($at) +/* DAEBAC 802417AC 8C224CC8 */ lw $v0, %lo(jtbl_80244CC8_DB20C8)($at) /* DAEBB0 802417B0 00400008 */ jr $v0 -/* DAEBB4 802417B4 00000000 */ nop +/* DAEBB4 802417B4 00000000 */ nop +glabel L802417B8_DAEBB8 /* DAEBB8 802417B8 0280202D */ daddu $a0, $s4, $zero /* DAEBBC 802417BC 0200282D */ daddu $a1, $s0, $zero /* DAEBC0 802417C0 0C0900E8 */ jal func_802403A0_DAD7A0 /* DAEBC4 802417C4 0260302D */ daddu $a2, $s3, $zero +glabel L802417C8_DAEBC8 /* DAEBC8 802417C8 0280202D */ daddu $a0, $s4, $zero /* DAEBCC 802417CC 0200282D */ daddu $a1, $s0, $zero /* DAEBD0 802417D0 0C090154 */ jal func_80240550_DAD950 /* DAEBD4 802417D4 0260302D */ daddu $a2, $s3, $zero /* DAEBD8 802417D8 0809061D */ j .L80241874 /* DAEBDC 802417DC 0000102D */ daddu $v0, $zero, $zero +glabel L802417E0_DAEBE0 /* DAEBE0 802417E0 0280202D */ daddu $a0, $s4, $zero /* DAEBE4 802417E4 0200282D */ daddu $a1, $s0, $zero /* DAEBE8 802417E8 0C0902DE */ jal omo_04_UnkNpcAIFunc1 /* DAEBEC 802417EC 0260302D */ daddu $a2, $s3, $zero +glabel L802417F0_DAEBF0 /* DAEBF0 802417F0 0280202D */ daddu $a0, $s4, $zero /* DAEBF4 802417F4 0200282D */ daddu $a1, $s0, $zero /* DAEBF8 802417F8 0C09030E */ jal func_80240C38_DAE038 /* DAEBFC 802417FC 0260302D */ daddu $a2, $s3, $zero /* DAEC00 80241800 0809061D */ j .L80241874 /* DAEC04 80241804 0000102D */ daddu $v0, $zero, $zero +glabel L80241808_DAEC08 /* DAEC08 80241808 0280202D */ daddu $a0, $s4, $zero /* DAEC0C 8024180C 0200282D */ daddu $a1, $s0, $zero /* DAEC10 80241810 0C0903DF */ jal omo_04_UnkNpcAIFunc2 /* DAEC14 80241814 0260302D */ daddu $a2, $s3, $zero +glabel L80241818_DAEC18 /* DAEC18 80241818 0280202D */ daddu $a0, $s4, $zero /* DAEC1C 8024181C 0200282D */ daddu $a1, $s0, $zero /* DAEC20 80241820 0C0903FD */ jal func_80240FF4_DAE3F4 /* DAEC24 80241824 0260302D */ daddu $a2, $s3, $zero /* DAEC28 80241828 0809061D */ j .L80241874 /* DAEC2C 8024182C 0000102D */ daddu $v0, $zero, $zero +glabel L80241830_DAEC30 /* DAEC30 80241830 0280202D */ daddu $a0, $s4, $zero /* DAEC34 80241834 0200282D */ daddu $a1, $s0, $zero /* DAEC38 80241838 0C090418 */ jal func_80241060_DAE460 /* DAEC3C 8024183C 0260302D */ daddu $a2, $s3, $zero /* DAEC40 80241840 0809061D */ j .L80241874 /* DAEC44 80241844 0000102D */ daddu $v0, $zero, $zero +glabel L80241848_DAEC48 /* DAEC48 80241848 0280202D */ daddu $a0, $s4, $zero /* DAEC4C 8024184C 0200282D */ daddu $a1, $s0, $zero /* DAEC50 80241850 0C090465 */ jal omo_04_UnkNpcAIFunc3 /* DAEC54 80241854 0260302D */ daddu $a2, $s3, $zero /* DAEC58 80241858 0809061D */ j .L80241874 /* DAEC5C 8024185C 0000102D */ daddu $v0, $zero, $zero +glabel L80241860_DAEC60 /* DAEC60 80241860 0280202D */ daddu $a0, $s4, $zero /* DAEC64 80241864 0200282D */ daddu $a1, $s0, $zero /* DAEC68 80241868 0C09047E */ jal func_802411F8_DAE5F8 /* DAEC6C 8024186C 0260302D */ daddu $a2, $s3, $zero .L80241870: +glabel L80241870_DAEC70 /* DAEC70 80241870 0000102D */ daddu $v0, $zero, $zero .L80241874: /* DAEC74 80241874 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241898_DAEC98.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241898_DAEC98.s index 8024ae1cac..734cdbbf7e 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241898_DAEC98.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241898_DAEC98.s @@ -15,7 +15,7 @@ glabel func_80241898_DAEC98 /* DAECC0 802418C0 D4224D08 */ ldc1 $f2, %lo(D_80244D08)($at) /* DAECC4 802418C4 46000021 */ cvt.d.s $f0, $f0 /* DAECC8 802418C8 46220002 */ mul.d $f0, $f0, $f2 -/* DAECCC 802418CC 00000000 */ nop +/* DAECCC 802418CC 00000000 */ nop /* DAECD0 802418D0 46200020 */ cvt.s.d $f0, $f0 /* DAECD4 802418D4 E4400018 */ swc1 $f0, 0x18($v0) /* DAECD8 802418D8 8E0300CC */ lw $v1, 0xcc($s0) diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241908_DAED08.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241908_DAED08.s index 9be6ac355c..c631d72e99 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241908_DAED08.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241908_DAED08.s @@ -22,7 +22,7 @@ glabel func_80241908_DAED08 /* DAED4C 8024194C 0C0129E1 */ jal func_8004A784 /* DAED50 80241950 0000382D */ daddu $a3, $zero, $zero /* DAED54 80241954 14400005 */ bnez $v0, .L8024196C -/* DAED58 80241958 00000000 */ nop +/* DAED58 80241958 00000000 */ nop /* DAED5C 8024195C 8E050018 */ lw $a1, 0x18($s0) /* DAED60 80241960 8E06000C */ lw $a2, 0xc($s0) /* DAED64 80241964 0C00EA95 */ jal npc_move_heading @@ -33,13 +33,13 @@ glabel func_80241908_DAED08 /* DAED74 80241974 A602008E */ sh $v0, 0x8e($s0) /* DAED78 80241978 00021400 */ sll $v0, $v0, 0x10 /* DAED7C 8024197C 14400010 */ bnez $v0, .L802419C0 -/* DAED80 80241980 00000000 */ nop +/* DAED80 80241980 00000000 */ nop /* DAED84 80241984 C6000018 */ lwc1 $f0, 0x18($s0) /* DAED88 80241988 3C018024 */ lui $at, %hi(D_80244D10) /* DAED8C 8024198C D4224D10 */ ldc1 $f2, %lo(D_80244D10)($at) /* DAED90 80241990 46000021 */ cvt.d.s $f0, $f0 /* DAED94 80241994 46220002 */ mul.d $f0, $f0, $f2 -/* DAED98 80241998 00000000 */ nop +/* DAED98 80241998 00000000 */ nop /* DAED9C 8024199C 46200020 */ cvt.s.d $f0, $f0 /* DAEDA0 802419A0 E6000018 */ swc1 $f0, 0x18($s0) /* DAEDA4 802419A4 8E2200CC */ lw $v0, 0xcc($s1) diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802419D8_DAEDD8.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802419D8_DAEDD8.s index 658eb49c1b..af0f8238a2 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802419D8_DAEDD8.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802419D8_DAEDD8.s @@ -21,7 +21,7 @@ glabel func_802419D8_DAEDD8 /* DAEE18 80241A18 0C0129E1 */ jal func_8004A784 /* DAEE1C 80241A1C 0000382D */ daddu $a3, $zero, $zero /* DAEE20 80241A20 14400005 */ bnez $v0, .L80241A38 -/* DAEE24 80241A24 00000000 */ nop +/* DAEE24 80241A24 00000000 */ nop /* DAEE28 80241A28 8E050018 */ lw $a1, 0x18($s0) /* DAEE2C 80241A2C 8E06000C */ lw $a2, 0xc($s0) /* DAEE30 80241A30 0C00EA95 */ jal npc_move_heading diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241A70_DAEE70.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241A70_DAEE70.s index 232371aea1..902353b5c8 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241A70_DAEE70.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241A70_DAEE70.s @@ -16,7 +16,7 @@ glabel func_80241A70_DAEE70 /* DAEE9C 80241A9C A462008E */ sh $v0, 0x8e($v1) /* DAEEA0 80241AA0 00021400 */ sll $v0, $v0, 0x10 /* DAEEA4 80241AA4 14400005 */ bnez $v0, .L80241ABC -/* DAEEA8 80241AA8 00000000 */ nop +/* DAEEA8 80241AA8 00000000 */ nop /* DAEEAC 80241AAC 8E0200CC */ lw $v0, 0xcc($s0) /* DAEEB0 80241AB0 8C420000 */ lw $v0, ($v0) /* DAEEB4 80241AB4 AC620028 */ sw $v0, 0x28($v1) diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s index 133db90d8d..b9d435c458 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s @@ -124,45 +124,53 @@ glabel func_80241AD0_DAEED0 /* DAF094 80241C94 2C620064 */ sltiu $v0, $v1, 0x64 /* DAF098 80241C98 10400050 */ beqz $v0, .L80241DDC /* DAF09C 80241C9C 00031080 */ sll $v0, $v1, 2 -/* DAF0A0 80241CA0 3C018024 */ lui $at, %hi(D_80244D18) +/* DAF0A0 80241CA0 3C018024 */ lui $at, %hi(jtbl_80244D18_DB2118) /* DAF0A4 80241CA4 00220821 */ addu $at, $at, $v0 -/* DAF0A8 80241CA8 8C224D18 */ lw $v0, %lo(D_80244D18)($at) +/* DAF0A8 80241CA8 8C224D18 */ lw $v0, %lo(jtbl_80244D18_DB2118)($at) /* DAF0AC 80241CAC 00400008 */ jr $v0 /* DAF0B0 80241CB0 00000000 */ nop +glabel L80241CB4_DAF0B4 /* DAF0B4 80241CB4 0260202D */ daddu $a0, $s3, $zero /* DAF0B8 80241CB8 0280282D */ daddu $a1, $s4, $zero /* DAF0BC 80241CBC 0C012568 */ jal func_800495A0 /* DAF0C0 80241CC0 02A0302D */ daddu $a2, $s5, $zero +glabel L80241CC4_DAF0C4 /* DAF0C4 80241CC4 0260202D */ daddu $a0, $s3, $zero /* DAF0C8 80241CC8 0280282D */ daddu $a1, $s4, $zero /* DAF0CC 80241CCC 0C0125AE */ jal func_800496B8 /* DAF0D0 80241CD0 02A0302D */ daddu $a2, $s5, $zero /* DAF0D4 80241CD4 08090777 */ j .L80241DDC /* DAF0D8 80241CD8 00000000 */ nop +glabel L80241CDC_DAF0DC /* DAF0DC 80241CDC 0260202D */ daddu $a0, $s3, $zero /* DAF0E0 80241CE0 0280282D */ daddu $a1, $s4, $zero /* DAF0E4 80241CE4 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DAF0E8 80241CE8 02A0302D */ daddu $a2, $s5, $zero +glabel L80241CEC_DAF0EC /* DAF0EC 80241CEC 0260202D */ daddu $a0, $s3, $zero /* DAF0F0 80241CF0 0280282D */ daddu $a1, $s4, $zero /* DAF0F4 80241CF4 0C012701 */ jal func_80049C04 /* DAF0F8 80241CF8 02A0302D */ daddu $a2, $s5, $zero /* DAF0FC 80241CFC 08090777 */ j .L80241DDC /* DAF100 80241D00 00000000 */ nop +glabel L80241D04_DAF104 /* DAF104 80241D04 0260202D */ daddu $a0, $s3, $zero /* DAF108 80241D08 0280282D */ daddu $a1, $s4, $zero /* DAF10C 80241D0C 0C01278F */ jal func_80049E3C /* DAF110 80241D10 02A0302D */ daddu $a2, $s5, $zero +glabel L80241D14_DAF114 /* DAF114 80241D14 0260202D */ daddu $a0, $s3, $zero /* DAF118 80241D18 0280282D */ daddu $a1, $s4, $zero /* DAF11C 80241D1C 0C0127B3 */ jal func_80049ECC /* DAF120 80241D20 02A0302D */ daddu $a2, $s5, $zero /* DAF124 80241D24 08090777 */ j .L80241DDC /* DAF128 80241D28 00000000 */ nop +glabel L80241D2C_DAF12C /* DAF12C 80241D2C 0260202D */ daddu $a0, $s3, $zero /* DAF130 80241D30 0280282D */ daddu $a1, $s4, $zero /* DAF134 80241D34 0C0127DF */ jal func_80049F7C /* DAF138 80241D38 02A0302D */ daddu $a2, $s5, $zero +glabel L80241D3C_DAF13C /* DAF13C 80241D3C 0260202D */ daddu $a0, $s3, $zero /* DAF140 80241D40 0280282D */ daddu $a1, $s4, $zero /* DAF144 80241D44 0C012849 */ jal func_8004A124 @@ -171,6 +179,7 @@ glabel func_80241AD0_DAEED0 /* DAF150 80241D50 2402000E */ addiu $v0, $zero, 0xe /* DAF154 80241D54 14620021 */ bne $v1, $v0, .L80241DDC /* DAF158 80241D58 00000000 */ nop +glabel L80241D5C_DAF15C /* DAF15C 80241D5C 0260202D */ daddu $a0, $s3, $zero /* DAF160 80241D60 0280282D */ daddu $a1, $s4, $zero /* DAF164 80241D64 0C090626 */ jal func_80241898_DAEC98 @@ -179,6 +188,7 @@ glabel func_80241AD0_DAEED0 /* DAF170 80241D70 2402000F */ addiu $v0, $zero, 0xf /* DAF174 80241D74 14620019 */ bne $v1, $v0, .L80241DDC /* DAF178 80241D78 00000000 */ nop +glabel L80241D7C_DAF17C /* DAF17C 80241D7C 0260202D */ daddu $a0, $s3, $zero /* DAF180 80241D80 0280282D */ daddu $a1, $s4, $zero /* DAF184 80241D84 0C090642 */ jal func_80241908_DAED08 @@ -187,6 +197,7 @@ glabel func_80241AD0_DAEED0 /* DAF190 80241D90 24020010 */ addiu $v0, $zero, 0x10 /* DAF194 80241D94 14620011 */ bne $v1, $v0, .L80241DDC /* DAF198 80241D98 00000000 */ nop +glabel L80241D9C_DAF19C /* DAF19C 80241D9C 0260202D */ daddu $a0, $s3, $zero /* DAF1A0 80241DA0 0280282D */ daddu $a1, $s4, $zero /* DAF1A4 80241DA4 0C090676 */ jal func_802419D8_DAEDD8 @@ -195,15 +206,18 @@ glabel func_80241AD0_DAEED0 /* DAF1B0 80241DB0 24020011 */ addiu $v0, $zero, 0x11 /* DAF1B4 80241DB4 14620009 */ bne $v1, $v0, .L80241DDC /* DAF1B8 80241DB8 00000000 */ nop +glabel L80241DBC_DAF1BC /* DAF1BC 80241DBC 0260202D */ daddu $a0, $s3, $zero /* DAF1C0 80241DC0 0280282D */ daddu $a1, $s4, $zero /* DAF1C4 80241DC4 0C09069C */ jal func_80241A70_DAEE70 /* DAF1C8 80241DC8 02A0302D */ daddu $a2, $s5, $zero /* DAF1CC 80241DCC 08090777 */ j .L80241DDC /* DAF1D0 80241DD0 00000000 */ nop +glabel L80241DD4_DAF1D4 /* DAF1D4 80241DD4 0C0129CF */ jal func_8004A73C /* DAF1D8 80241DD8 0260202D */ daddu $a0, $s3, $zero .L80241DDC: +glabel L80241DDC_DAF1DC /* DAF1DC 80241DDC 8FBF0060 */ lw $ra, 0x60($sp) /* DAF1E0 80241DE0 8FB5005C */ lw $s5, 0x5c($sp) /* DAF1E4 80241DE4 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241E20_DAF220.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241E20_DAF220.s index 99ba62bd53..c4bb768dd3 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241E20_DAF220.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241E20_DAF220.s @@ -9,4 +9,4 @@ glabel func_80241E20_DAF220 /* DAF230 80241E30 A4620000 */ sh $v0, ($v1) /* DAF234 80241E34 03E00008 */ jr $ra /* DAF238 80241E38 24020002 */ addiu $v0, $zero, 2 -/* DAF23C 80241E3C 00000000 */ nop +/* DAF23C 80241E3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAF240/func_80241E40_DAF240.s b/asm/nonmatchings/world/area_omo/omo_04/DAF240/func_80241E40_DAF240.s index 67f6cd186f..26e71217ec 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAF240/func_80241E40_DAF240.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAF240/func_80241E40_DAF240.s @@ -25,7 +25,7 @@ glabel func_80241E40_DAF240 /* DAF290 80241E90 0C00A8BB */ jal sin_deg /* DAF294 80241E94 46146300 */ add.s $f12, $f12, $f20 /* DAF298 80241E98 46160002 */ mul.s $f0, $f0, $f22 -/* DAF29C 80241E9C 00000000 */ nop +/* DAF29C 80241E9C 00000000 */ nop /* DAF2A0 80241EA0 C6020038 */ lwc1 $f2, 0x38($s0) /* DAF2A4 80241EA4 46001080 */ add.s $f2, $f2, $f0 /* DAF2A8 80241EA8 4600110D */ trunc.w.s $f4, $f2 @@ -33,7 +33,7 @@ glabel func_80241E40_DAF240 /* DAF2B0 80241EB0 C600003C */ lwc1 $f0, 0x3c($s0) /* DAF2B4 80241EB4 3C014100 */ lui $at, 0x4100 /* DAF2B8 80241EB8 44811000 */ mtc1 $at, $f2 -/* DAF2BC 80241EBC 00000000 */ nop +/* DAF2BC 80241EBC 00000000 */ nop /* DAF2C0 80241EC0 46020000 */ add.s $f0, $f0, $f2 /* DAF2C4 80241EC4 4600010D */ trunc.w.s $f4, $f0 /* DAF2C8 80241EC8 E6240088 */ swc1 $f4, 0x88($s1) @@ -43,7 +43,7 @@ glabel func_80241E40_DAF240 /* DAF2D8 80241ED8 0C00A8D4 */ jal cos_deg /* DAF2DC 80241EDC 46146300 */ add.s $f12, $f12, $f20 /* DAF2E0 80241EE0 46160002 */ mul.s $f0, $f0, $f22 -/* DAF2E4 80241EE4 00000000 */ nop +/* DAF2E4 80241EE4 00000000 */ nop /* DAF2E8 80241EE8 C6020040 */ lwc1 $f2, 0x40($s0) /* DAF2EC 80241EEC 46001081 */ sub.s $f2, $f2, $f0 /* DAF2F0 80241EF0 4600110D */ trunc.w.s $f4, $f2 @@ -57,4 +57,4 @@ glabel func_80241E40_DAF240 /* DAF310 80241F10 24020002 */ addiu $v0, $zero, 2 /* DAF314 80241F14 03E00008 */ jr $ra /* DAF318 80241F18 27BD0030 */ addiu $sp, $sp, 0x30 -/* DAF31C 80241F1C 00000000 */ nop +/* DAF31C 80241F1C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240000_DB22C0.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240000_DB22C0.s index 455af4e73a..c7f55346e1 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240000_DB22C0.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240000_DB22C0.s @@ -15,7 +15,7 @@ glabel func_80240000_DB22C0 /* DB22E8 80240028 D42252B0 */ ldc1 $f2, %lo(D_802452B0)($at) /* DB22EC 8024002C 46000021 */ cvt.d.s $f0, $f0 /* DB22F0 80240030 46220002 */ mul.d $f0, $f0, $f2 -/* DB22F4 80240034 00000000 */ nop +/* DB22F4 80240034 00000000 */ nop /* DB22F8 80240038 46200020 */ cvt.s.d $f0, $f0 /* DB22FC 8024003C E4400018 */ swc1 $f0, 0x18($v0) /* DB2300 80240040 8E0300CC */ lw $v1, 0xcc($s0) diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240070_DB2330.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240070_DB2330.s index bd5cb83568..462c28740e 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240070_DB2330.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240070_DB2330.s @@ -22,7 +22,7 @@ glabel func_80240070_DB2330 /* DB2374 802400B4 0C0129E1 */ jal func_8004A784 /* DB2378 802400B8 0000382D */ daddu $a3, $zero, $zero /* DB237C 802400BC 14400005 */ bnez $v0, .L802400D4 -/* DB2380 802400C0 00000000 */ nop +/* DB2380 802400C0 00000000 */ nop /* DB2384 802400C4 8E050018 */ lw $a1, 0x18($s0) /* DB2388 802400C8 8E06000C */ lw $a2, 0xc($s0) /* DB238C 802400CC 0C00EA95 */ jal npc_move_heading @@ -33,13 +33,13 @@ glabel func_80240070_DB2330 /* DB239C 802400DC A602008E */ sh $v0, 0x8e($s0) /* DB23A0 802400E0 00021400 */ sll $v0, $v0, 0x10 /* DB23A4 802400E4 14400010 */ bnez $v0, .L80240128 -/* DB23A8 802400E8 00000000 */ nop +/* DB23A8 802400E8 00000000 */ nop /* DB23AC 802400EC C6000018 */ lwc1 $f0, 0x18($s0) /* DB23B0 802400F0 3C018024 */ lui $at, %hi(D_802452B8) /* DB23B4 802400F4 D42252B8 */ ldc1 $f2, %lo(D_802452B8)($at) /* DB23B8 802400F8 46000021 */ cvt.d.s $f0, $f0 /* DB23BC 802400FC 46220002 */ mul.d $f0, $f0, $f2 -/* DB23C0 80240100 00000000 */ nop +/* DB23C0 80240100 00000000 */ nop /* DB23C4 80240104 46200020 */ cvt.s.d $f0, $f0 /* DB23C8 80240108 E6000018 */ swc1 $f0, 0x18($s0) /* DB23CC 8024010C 8E2200CC */ lw $v0, 0xcc($s1) diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240140_DB2400.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240140_DB2400.s index b4c42432c4..143329a1fc 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240140_DB2400.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240140_DB2400.s @@ -21,7 +21,7 @@ glabel func_80240140_DB2400 /* DB2440 80240180 0C0129E1 */ jal func_8004A784 /* DB2444 80240184 0000382D */ daddu $a3, $zero, $zero /* DB2448 80240188 14400005 */ bnez $v0, .L802401A0 -/* DB244C 8024018C 00000000 */ nop +/* DB244C 8024018C 00000000 */ nop /* DB2450 80240190 8E050018 */ lw $a1, 0x18($s0) /* DB2454 80240194 8E06000C */ lw $a2, 0xc($s0) /* DB2458 80240198 0C00EA95 */ jal npc_move_heading diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802401D8_DB2498.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802401D8_DB2498.s index ec58379cc5..60cbfea14e 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802401D8_DB2498.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802401D8_DB2498.s @@ -16,7 +16,7 @@ glabel func_802401D8_DB2498 /* DB24C4 80240204 A462008E */ sh $v0, 0x8e($v1) /* DB24C8 80240208 00021400 */ sll $v0, $v0, 0x10 /* DB24CC 8024020C 14400005 */ bnez $v0, .L80240224 -/* DB24D0 80240210 00000000 */ nop +/* DB24D0 80240210 00000000 */ nop /* DB24D4 80240214 8E0200CC */ lw $v0, 0xcc($s0) /* DB24D8 80240218 8C420000 */ lw $v0, ($v0) /* DB24DC 8024021C AC620028 */ sw $v0, 0x28($v1) diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s index 975358390e..0ed1f5cf6b 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s @@ -124,45 +124,53 @@ glabel func_80240238_DB24F8 /* DB26BC 802403FC 2C620064 */ sltiu $v0, $v1, 0x64 /* DB26C0 80240400 10400050 */ beqz $v0, .L80240544 /* DB26C4 80240404 00031080 */ sll $v0, $v1, 2 -/* DB26C8 80240408 3C018024 */ lui $at, %hi(D_802452C0) +/* DB26C8 80240408 3C018024 */ lui $at, %hi(jtbl_802452C0_DB7580) /* DB26CC 8024040C 00220821 */ addu $at, $at, $v0 -/* DB26D0 80240410 8C2252C0 */ lw $v0, %lo(D_802452C0)($at) +/* DB26D0 80240410 8C2252C0 */ lw $v0, %lo(jtbl_802452C0_DB7580)($at) /* DB26D4 80240414 00400008 */ jr $v0 /* DB26D8 80240418 00000000 */ nop +glabel L8024041C_DB26DC /* DB26DC 8024041C 0260202D */ daddu $a0, $s3, $zero /* DB26E0 80240420 0280282D */ daddu $a1, $s4, $zero /* DB26E4 80240424 0C012568 */ jal func_800495A0 /* DB26E8 80240428 02A0302D */ daddu $a2, $s5, $zero +glabel L8024042C_DB26EC /* DB26EC 8024042C 0260202D */ daddu $a0, $s3, $zero /* DB26F0 80240430 0280282D */ daddu $a1, $s4, $zero /* DB26F4 80240434 0C0125AE */ jal func_800496B8 /* DB26F8 80240438 02A0302D */ daddu $a2, $s5, $zero /* DB26FC 8024043C 08090151 */ j .L80240544 /* DB2700 80240440 00000000 */ nop +glabel L80240444_DB2704 /* DB2704 80240444 0260202D */ daddu $a0, $s3, $zero /* DB2708 80240448 0280282D */ daddu $a1, $s4, $zero /* DB270C 8024044C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DB2710 80240450 02A0302D */ daddu $a2, $s5, $zero +glabel L80240454_DB2714 /* DB2714 80240454 0260202D */ daddu $a0, $s3, $zero /* DB2718 80240458 0280282D */ daddu $a1, $s4, $zero /* DB271C 8024045C 0C012701 */ jal func_80049C04 /* DB2720 80240460 02A0302D */ daddu $a2, $s5, $zero /* DB2724 80240464 08090151 */ j .L80240544 /* DB2728 80240468 00000000 */ nop +glabel L8024046C_DB272C /* DB272C 8024046C 0260202D */ daddu $a0, $s3, $zero /* DB2730 80240470 0280282D */ daddu $a1, $s4, $zero /* DB2734 80240474 0C01278F */ jal func_80049E3C /* DB2738 80240478 02A0302D */ daddu $a2, $s5, $zero +glabel L8024047C_DB273C /* DB273C 8024047C 0260202D */ daddu $a0, $s3, $zero /* DB2740 80240480 0280282D */ daddu $a1, $s4, $zero /* DB2744 80240484 0C0127B3 */ jal func_80049ECC /* DB2748 80240488 02A0302D */ daddu $a2, $s5, $zero /* DB274C 8024048C 08090151 */ j .L80240544 /* DB2750 80240490 00000000 */ nop +glabel L80240494_DB2754 /* DB2754 80240494 0260202D */ daddu $a0, $s3, $zero /* DB2758 80240498 0280282D */ daddu $a1, $s4, $zero /* DB275C 8024049C 0C0127DF */ jal func_80049F7C /* DB2760 802404A0 02A0302D */ daddu $a2, $s5, $zero +glabel L802404A4_DB2764 /* DB2764 802404A4 0260202D */ daddu $a0, $s3, $zero /* DB2768 802404A8 0280282D */ daddu $a1, $s4, $zero /* DB276C 802404AC 0C012849 */ jal func_8004A124 @@ -171,6 +179,7 @@ glabel func_80240238_DB24F8 /* DB2778 802404B8 2402000E */ addiu $v0, $zero, 0xe /* DB277C 802404BC 14620021 */ bne $v1, $v0, .L80240544 /* DB2780 802404C0 00000000 */ nop +glabel L802404C4_DB2784 /* DB2784 802404C4 0260202D */ daddu $a0, $s3, $zero /* DB2788 802404C8 0280282D */ daddu $a1, $s4, $zero /* DB278C 802404CC 0C090000 */ jal func_80240000_DB22C0 @@ -179,6 +188,7 @@ glabel func_80240238_DB24F8 /* DB2798 802404D8 2402000F */ addiu $v0, $zero, 0xf /* DB279C 802404DC 14620019 */ bne $v1, $v0, .L80240544 /* DB27A0 802404E0 00000000 */ nop +glabel L802404E4_DB27A4 /* DB27A4 802404E4 0260202D */ daddu $a0, $s3, $zero /* DB27A8 802404E8 0280282D */ daddu $a1, $s4, $zero /* DB27AC 802404EC 0C09001C */ jal func_80240070_DB2330 @@ -187,6 +197,7 @@ glabel func_80240238_DB24F8 /* DB27B8 802404F8 24020010 */ addiu $v0, $zero, 0x10 /* DB27BC 802404FC 14620011 */ bne $v1, $v0, .L80240544 /* DB27C0 80240500 00000000 */ nop +glabel L80240504_DB27C4 /* DB27C4 80240504 0260202D */ daddu $a0, $s3, $zero /* DB27C8 80240508 0280282D */ daddu $a1, $s4, $zero /* DB27CC 8024050C 0C090050 */ jal func_80240140_DB2400 @@ -195,15 +206,18 @@ glabel func_80240238_DB24F8 /* DB27D8 80240518 24020011 */ addiu $v0, $zero, 0x11 /* DB27DC 8024051C 14620009 */ bne $v1, $v0, .L80240544 /* DB27E0 80240520 00000000 */ nop +glabel L80240524_DB27E4 /* DB27E4 80240524 0260202D */ daddu $a0, $s3, $zero /* DB27E8 80240528 0280282D */ daddu $a1, $s4, $zero /* DB27EC 8024052C 0C090076 */ jal func_802401D8_DB2498 /* DB27F0 80240530 02A0302D */ daddu $a2, $s5, $zero /* DB27F4 80240534 08090151 */ j .L80240544 /* DB27F8 80240538 00000000 */ nop +glabel L8024053C_DB27FC /* DB27FC 8024053C 0C0129CF */ jal func_8004A73C /* DB2800 80240540 0260202D */ daddu $a0, $s3, $zero .L80240544: +glabel L80240544_DB2804 /* DB2804 80240544 8FBF0060 */ lw $ra, 0x60($sp) /* DB2808 80240548 8FB5005C */ lw $s5, 0x5c($sp) /* DB280C 8024054C 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802405BC_DB287C.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802405BC_DB287C.s index 06f94308d6..8cb2ce8023 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802405BC_DB287C.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802405BC_DB287C.s @@ -26,9 +26,9 @@ glabel func_802405BC_DB287C /* DB28CC 8024060C 10620030 */ beq $v1, $v0, .L802406D0 /* DB28D0 80240610 24020003 */ addiu $v0, $zero, 3 /* DB28D4 80240614 10620034 */ beq $v1, $v0, .L802406E8 -/* DB28D8 80240618 00000000 */ nop +/* DB28D8 80240618 00000000 */ nop /* DB28DC 8024061C 080901D2 */ j .L80240748 -/* DB28E0 80240620 00000000 */ nop +/* DB28E0 80240620 00000000 */ nop .L80240624: /* DB28E4 80240624 3442000C */ ori $v0, $v0, 0xc /* DB28E8 80240628 3C054387 */ lui $a1, 0x4387 @@ -99,9 +99,9 @@ glabel func_802405BC_DB287C /* DB29C8 80240708 E6200048 */ swc1 $f0, 0x48($s1) /* DB29CC 8024070C 46000021 */ cvt.d.s $f0, $f0 /* DB29D0 80240710 4620103C */ c.lt.d $f2, $f0 -/* DB29D4 80240714 00000000 */ nop +/* DB29D4 80240714 00000000 */ nop /* DB29D8 80240718 45000004 */ bc1f .L8024072C -/* DB29DC 8024071C 00000000 */ nop +/* DB29DC 8024071C 00000000 */ nop /* DB29E0 80240720 46220001 */ sub.d $f0, $f0, $f2 /* DB29E4 80240724 46200020 */ cvt.s.d $f0, $f0 /* DB29E8 80240728 E6200048 */ swc1 $f0, 0x48($s1) diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s index c75a59a00c..868c0f4511 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s @@ -46,7 +46,7 @@ glabel func_80240780_DB2A40 /* DB2AE4 80240824 8E2200B0 */ lw $v0, 0xb0($s1) /* DB2AE8 80240828 30420004 */ andi $v0, $v0, 4 /* DB2AEC 8024082C 10400044 */ beqz $v0, .L80240940 -/* DB2AF0 80240830 00000000 */ nop +/* DB2AF0 80240830 00000000 */ nop .L80240834: /* DB2AF4 80240834 2404F7FF */ addiu $a0, $zero, -0x801 /* DB2AF8 80240838 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_80240780_DB2A40 /* DB2BB8 802408F8 C640003C */ lwc1 $f0, 0x3c($s2) /* DB2BBC 802408FC C6420040 */ lwc1 $f2, 0x40($s2) /* DB2BC0 80240900 44822000 */ mtc1 $v0, $f4 -/* DB2BC4 80240904 00000000 */ nop +/* DB2BC4 80240904 00000000 */ nop /* DB2BC8 80240908 46802120 */ cvt.s.w $f4, $f4 /* DB2BCC 8024090C 27A20044 */ addiu $v0, $sp, 0x44 /* DB2BD0 80240910 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_80240780_DB2A40 /* DB2BE8 80240928 0C0372DF */ jal func_800DCB7C /* DB2BEC 8024092C 27A6003C */ addiu $a2, $sp, 0x3c /* DB2BF0 80240930 10400003 */ beqz $v0, .L80240940 -/* DB2BF4 80240934 00000000 */ nop +/* DB2BF4 80240934 00000000 */ nop /* DB2BF8 80240938 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DB2BFC 8024093C E640003C */ swc1 $f0, 0x3c($s2) .L80240940: @@ -124,45 +124,53 @@ glabel func_80240780_DB2A40 /* DB2C04 80240944 2C620064 */ sltiu $v0, $v1, 0x64 /* DB2C08 80240948 10400038 */ beqz $v0, .L80240A2C /* DB2C0C 8024094C 00031080 */ sll $v0, $v1, 2 -/* DB2C10 80240950 3C018024 */ lui $at, %hi(D_80245460) +/* DB2C10 80240950 3C018024 */ lui $at, %hi(jtbl_80245460_DB7720) /* DB2C14 80240954 00220821 */ addu $at, $at, $v0 -/* DB2C18 80240958 8C225460 */ lw $v0, %lo(D_80245460)($at) +/* DB2C18 80240958 8C225460 */ lw $v0, %lo(jtbl_80245460_DB7720)($at) /* DB2C1C 8024095C 00400008 */ jr $v0 -/* DB2C20 80240960 00000000 */ nop +/* DB2C20 80240960 00000000 */ nop +glabel L80240964_DB2C24 /* DB2C24 80240964 0260202D */ daddu $a0, $s3, $zero /* DB2C28 80240968 0280282D */ daddu $a1, $s4, $zero /* DB2C2C 8024096C 0C012568 */ jal func_800495A0 /* DB2C30 80240970 02A0302D */ daddu $a2, $s5, $zero +glabel L80240974_DB2C34 /* DB2C34 80240974 0260202D */ daddu $a0, $s3, $zero /* DB2C38 80240978 0280282D */ daddu $a1, $s4, $zero /* DB2C3C 8024097C 0C0125AE */ jal func_800496B8 /* DB2C40 80240980 02A0302D */ daddu $a2, $s5, $zero /* DB2C44 80240984 0809028B */ j .L80240A2C -/* DB2C48 80240988 00000000 */ nop +/* DB2C48 80240988 00000000 */ nop +glabel L8024098C_DB2C4C /* DB2C4C 8024098C 0260202D */ daddu $a0, $s3, $zero /* DB2C50 80240990 0280282D */ daddu $a1, $s4, $zero /* DB2C54 80240994 0C09015B */ jal omo_05_UnkNpcAIFunc4 /* DB2C58 80240998 02A0302D */ daddu $a2, $s5, $zero +glabel L8024099C_DB2C5C /* DB2C5C 8024099C 0260202D */ daddu $a0, $s3, $zero /* DB2C60 802409A0 0280282D */ daddu $a1, $s4, $zero /* DB2C64 802409A4 0C09016F */ jal func_802405BC_DB287C /* DB2C68 802409A8 02A0302D */ daddu $a2, $s5, $zero /* DB2C6C 802409AC 0809028B */ j .L80240A2C -/* DB2C70 802409B0 00000000 */ nop +/* DB2C70 802409B0 00000000 */ nop +glabel L802409B4_DB2C74 /* DB2C74 802409B4 0260202D */ daddu $a0, $s3, $zero /* DB2C78 802409B8 0280282D */ daddu $a1, $s4, $zero /* DB2C7C 802409BC 0C01278F */ jal func_80049E3C /* DB2C80 802409C0 02A0302D */ daddu $a2, $s5, $zero +glabel L802409C4_DB2C84 /* DB2C84 802409C4 0260202D */ daddu $a0, $s3, $zero /* DB2C88 802409C8 0280282D */ daddu $a1, $s4, $zero /* DB2C8C 802409CC 0C0127B3 */ jal func_80049ECC /* DB2C90 802409D0 02A0302D */ daddu $a2, $s5, $zero /* DB2C94 802409D4 0809028B */ j .L80240A2C -/* DB2C98 802409D8 00000000 */ nop +/* DB2C98 802409D8 00000000 */ nop +glabel L802409DC_DB2C9C /* DB2C9C 802409DC 0260202D */ daddu $a0, $s3, $zero /* DB2CA0 802409E0 0280282D */ daddu $a1, $s4, $zero /* DB2CA4 802409E4 0C0127DF */ jal func_80049F7C /* DB2CA8 802409E8 02A0302D */ daddu $a2, $s5, $zero +glabel L802409EC_DB2CAC /* DB2CAC 802409EC 0260202D */ daddu $a0, $s3, $zero /* DB2CB0 802409F0 0280282D */ daddu $a1, $s4, $zero /* DB2CB4 802409F4 0C012849 */ jal func_8004A124 @@ -170,16 +178,19 @@ glabel func_80240780_DB2A40 /* DB2CBC 802409FC 8E630070 */ lw $v1, 0x70($s3) /* DB2CC0 80240A00 2402000E */ addiu $v0, $zero, 0xe /* DB2CC4 80240A04 14620009 */ bne $v1, $v0, .L80240A2C -/* DB2CC8 80240A08 00000000 */ nop +/* DB2CC8 80240A08 00000000 */ nop +glabel L80240A0C_DB2CCC /* DB2CCC 80240A0C 0260202D */ daddu $a0, $s3, $zero /* DB2CD0 80240A10 0280282D */ daddu $a1, $s4, $zero /* DB2CD4 80240A14 0C0128FA */ jal func_8004A3E8 /* DB2CD8 80240A18 02A0302D */ daddu $a2, $s5, $zero /* DB2CDC 80240A1C 0809028B */ j .L80240A2C -/* DB2CE0 80240A20 00000000 */ nop +/* DB2CE0 80240A20 00000000 */ nop +glabel L80240A24_DB2CE4 /* DB2CE4 80240A24 0C0129CF */ jal func_8004A73C /* DB2CE8 80240A28 0260202D */ daddu $a0, $s3, $zero .L80240A2C: +glabel L80240A2C_DB2CEC /* DB2CEC 80240A2C 8FBF0060 */ lw $ra, 0x60($sp) /* DB2CF0 80240A30 8FB5005C */ lw $s5, 0x5c($sp) /* DB2CF4 80240A34 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240A54_DB2D14.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240A54_DB2D14.s index 89c7b48449..d95e3bc17f 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240A54_DB2D14.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240A54_DB2D14.s @@ -47,7 +47,7 @@ glabel func_80240A54_DB2D14 /* DB2DBC 80240AFC 0C0123F5 */ jal is_point_within_region /* DB2DC0 80240B00 8E070038 */ lw $a3, 0x38($s0) /* DB2DC4 80240B04 1040000E */ beqz $v0, .L80240B40 -/* DB2DC8 80240B08 00000000 */ nop +/* DB2DC8 80240B08 00000000 */ nop /* DB2DCC 80240B0C 8E2200D0 */ lw $v0, 0xd0($s1) /* DB2DD0 80240B10 C60C0038 */ lwc1 $f12, 0x38($s0) /* DB2DD4 80240B14 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240A54_DB2D14 /* DB2DE8 80240B28 468031A0 */ cvt.s.w $f6, $f6 /* DB2DEC 80240B2C 44073000 */ mfc1 $a3, $f6 /* DB2DF0 80240B30 0C00A720 */ jal atan2 -/* DB2DF4 80240B34 00000000 */ nop +/* DB2DF4 80240B34 00000000 */ nop /* DB2DF8 80240B38 080902DC */ j .L80240B70 /* DB2DFC 80240B3C E600000C */ swc1 $f0, 0xc($s0) .L80240B40: @@ -66,7 +66,7 @@ glabel func_80240A54_DB2D14 /* DB2E04 80240B44 2404003C */ addiu $a0, $zero, 0x3c /* DB2E08 80240B48 C60C000C */ lwc1 $f12, 0xc($s0) /* DB2E0C 80240B4C 44820000 */ mtc1 $v0, $f0 -/* DB2E10 80240B50 00000000 */ nop +/* DB2E10 80240B50 00000000 */ nop /* DB2E14 80240B54 46800020 */ cvt.s.w $f0, $f0 /* DB2E18 80240B58 46006300 */ add.s $f12, $f12, $f0 /* DB2E1C 80240B5C 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240A54_DB2D14 /* DB2E40 80240B80 8E2200D0 */ lw $v0, 0xd0($s1) /* DB2E44 80240B84 8C420014 */ lw $v0, 0x14($v0) /* DB2E48 80240B88 04410004 */ bgez $v0, .L80240B9C -/* DB2E4C 80240B8C 00000000 */ nop +/* DB2E4C 80240B8C 00000000 */ nop /* DB2E50 80240B90 C6400000 */ lwc1 $f0, ($s2) /* DB2E54 80240B94 080902EF */ j .L80240BBC /* DB2E58 80240B98 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240A54_DB2D14 /* DB2E5C 80240B9C 3C018024 */ lui $at, %hi(D_802455F0) /* DB2E60 80240BA0 D42255F0 */ ldc1 $f2, %lo(D_802455F0)($at) /* DB2E64 80240BA4 44820000 */ mtc1 $v0, $f0 -/* DB2E68 80240BA8 00000000 */ nop +/* DB2E68 80240BA8 00000000 */ nop /* DB2E6C 80240BAC 46800021 */ cvt.d.w $f0, $f0 /* DB2E70 80240BB0 46220003 */ div.d $f0, $f0, $f2 /* DB2E74 80240BB4 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240A54_DB2D14 /* DB2E88 80240BC8 44801000 */ mtc1 $zero, $f2 /* DB2E8C 80240BCC 46000021 */ cvt.d.s $f0, $f0 /* DB2E90 80240BD0 46220002 */ mul.d $f0, $f0, $f2 -/* DB2E94 80240BD4 00000000 */ nop +/* DB2E94 80240BD4 00000000 */ nop /* DB2E98 80240BD8 24020001 */ addiu $v0, $zero, 1 /* DB2E9C 80240BDC 4620018D */ trunc.w.d $f6, $f0 /* DB2EA0 80240BE0 E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240C04_DB2EC4.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240C04_DB2EC4.s index 494344ad78..e75f0cc198 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240C04_DB2EC4.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240C04_DB2EC4.s @@ -34,7 +34,7 @@ glabel func_80240C04_DB2EC4 /* DB2F38 80240C78 44803000 */ mtc1 $zero, $f6 /* DB2F3C 80240C7C 46000021 */ cvt.d.s $f0, $f0 /* DB2F40 80240C80 46260002 */ mul.d $f0, $f0, $f6 -/* DB2F44 80240C84 00000000 */ nop +/* DB2F44 80240C84 00000000 */ nop /* DB2F48 80240C88 24020001 */ addiu $v0, $zero, 1 /* DB2F4C 80240C8C 8E24006C */ lw $a0, 0x6c($s1) /* DB2F50 80240C90 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80240C04_DB2EC4 /* DB2FAC 80240CEC C600003C */ lwc1 $f0, 0x3c($s0) /* DB2FB0 80240CF0 4600C001 */ sub.s $f0, $f24, $f0 /* DB2FB4 80240CF4 4600B03C */ c.lt.s $f22, $f0 -/* DB2FB8 80240CF8 00000000 */ nop +/* DB2FB8 80240CF8 00000000 */ nop /* DB2FBC 80240CFC 4500001B */ bc1f .L80240D6C /* DB2FC0 80240D00 34820010 */ ori $v0, $a0, 0x10 /* DB2FC4 80240D04 0809035B */ j .L80240D6C @@ -87,9 +87,9 @@ glabel func_80240C04_DB2EC4 /* DB3008 80240D48 C7A00034 */ lwc1 $f0, 0x34($sp) /* DB300C 80240D4C 4600D001 */ sub.s $f0, $f26, $f0 /* DB3010 80240D50 4600B03C */ c.lt.s $f22, $f0 -/* DB3014 80240D54 00000000 */ nop +/* DB3014 80240D54 00000000 */ nop /* DB3018 80240D58 45000004 */ bc1f .L80240D6C -/* DB301C 80240D5C 00000000 */ nop +/* DB301C 80240D5C 00000000 */ nop /* DB3020 80240D60 8E22006C */ lw $v0, 0x6c($s1) /* DB3024 80240D64 34420010 */ ori $v0, $v0, 0x10 /* DB3028 80240D68 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80240C04_DB2EC4 /* DB3030 80240D70 24030011 */ addiu $v1, $zero, 0x11 /* DB3034 80240D74 30420011 */ andi $v0, $v0, 0x11 /* DB3038 80240D78 14430039 */ bne $v0, $v1, .L80240E60 -/* DB303C 80240D7C 00000000 */ nop +/* DB303C 80240D7C 00000000 */ nop /* DB3040 80240D80 8E020000 */ lw $v0, ($s0) /* DB3044 80240D84 30420008 */ andi $v0, $v0, 8 /* DB3048 80240D88 1040000A */ beqz $v0, .L80240DB4 @@ -108,7 +108,7 @@ glabel func_80240C04_DB2EC4 /* DB3058 80240D98 D42055F8 */ ldc1 $f0, %lo(D_802455F8)($at) /* DB305C 80240D9C 460010A1 */ cvt.d.s $f2, $f2 /* DB3060 80240DA0 46201082 */ mul.d $f2, $f2, $f0 -/* DB3064 80240DA4 00000000 */ nop +/* DB3064 80240DA4 00000000 */ nop /* DB3068 80240DA8 4600A021 */ cvt.d.s $f0, $f20 /* DB306C 80240DAC 08090386 */ j .L80240E18 /* DB3070 80240DB0 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80240C04_DB2EC4 /* DB30C0 80240E00 D4205600 */ ldc1 $f0, %lo(D_80245600)($at) /* DB30C4 80240E04 460010A1 */ cvt.d.s $f2, $f2 /* DB30C8 80240E08 46201082 */ mul.d $f2, $f2, $f0 -/* DB30CC 80240E0C 00000000 */ nop +/* DB30CC 80240E0C 00000000 */ nop /* DB30D0 80240E10 4600A021 */ cvt.d.s $f0, $f20 /* DB30D4 80240E14 46220000 */ add.d $f0, $f0, $f2 .L80240E18: @@ -149,7 +149,7 @@ glabel func_80240C04_DB2EC4 /* DB30F4 80240E34 46000005 */ abs.s $f0, $f0 /* DB30F8 80240E38 46000021 */ cvt.d.s $f0, $f0 /* DB30FC 80240E3C 4622003C */ c.lt.d $f0, $f2 -/* DB3100 80240E40 00000000 */ nop +/* DB3100 80240E40 00000000 */ nop /* DB3104 80240E44 45000036 */ bc1f .L80240F20 /* DB3108 80240E48 2403FFEF */ addiu $v1, $zero, -0x11 /* DB310C 80240E4C E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80240C04_DB2EC4 .L80240E60: /* DB3120 80240E60 8E220070 */ lw $v0, 0x70($s1) /* DB3124 80240E64 1840002E */ blez $v0, .L80240F20 -/* DB3128 80240E68 00000000 */ nop +/* DB3128 80240E68 00000000 */ nop /* DB312C 80240E6C C62C0074 */ lwc1 $f12, 0x74($s1) /* DB3130 80240E70 0C00A8BB */ jal sin_deg /* DB3134 80240E74 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80240C04_DB2EC4 /* DB318C 80240ECC 27A70030 */ addiu $a3, $sp, 0x30 .L80240ED0: /* DB3190 80240ED0 10400007 */ beqz $v0, .L80240EF0 -/* DB3194 80240ED4 00000000 */ nop +/* DB3194 80240ED4 00000000 */ nop /* DB3198 80240ED8 4616A082 */ mul.s $f2, $f20, $f22 -/* DB319C 80240EDC 00000000 */ nop +/* DB319C 80240EDC 00000000 */ nop /* DB31A0 80240EE0 C7A0002C */ lwc1 $f0, 0x2c($sp) /* DB31A4 80240EE4 461A0000 */ add.s $f0, $f0, $f26 /* DB31A8 80240EE8 080903BF */ j .L80240EFC /* DB31AC 80240EEC 46020000 */ add.s $f0, $f0, $f2 .L80240EF0: /* DB31B0 80240EF0 4616A002 */ mul.s $f0, $f20, $f22 -/* DB31B4 80240EF4 00000000 */ nop +/* DB31B4 80240EF4 00000000 */ nop /* DB31B8 80240EF8 4600C000 */ add.s $f0, $f24, $f0 .L80240EFC: /* DB31BC 80240EFC E600003C */ swc1 $f0, 0x3c($s0) /* DB31C0 80240F00 8E220074 */ lw $v0, 0x74($s1) /* DB31C4 80240F04 2442000A */ addiu $v0, $v0, 0xa /* DB31C8 80240F08 44826000 */ mtc1 $v0, $f12 -/* DB31CC 80240F0C 00000000 */ nop +/* DB31CC 80240F0C 00000000 */ nop /* DB31D0 80240F10 0C00A6C9 */ jal clamp_angle /* DB31D4 80240F14 46806320 */ cvt.s.w $f12, $f12 /* DB31D8 80240F18 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80240C04_DB2EC4 /* DB31E8 80240F28 2442FFFF */ addiu $v0, $v0, -1 /* DB31EC 80240F2C 8E430014 */ lw $v1, 0x14($s2) /* DB31F0 80240F30 04600048 */ bltz $v1, .L80241054 -/* DB31F4 80240F34 00000000 */ nop +/* DB31F4 80240F34 00000000 */ nop /* DB31F8 80240F38 8E620074 */ lw $v0, 0x74($s3) /* DB31FC 80240F3C 1C400042 */ bgtz $v0, .L80241048 /* DB3200 80240F40 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80240C04_DB2EC4 /* DB3208 80240F48 860200A8 */ lh $v0, 0xa8($s0) /* DB320C 80240F4C C602003C */ lwc1 $f2, 0x3c($s0) /* DB3210 80240F50 44820000 */ mtc1 $v0, $f0 -/* DB3214 80240F54 00000000 */ nop +/* DB3214 80240F54 00000000 */ nop /* DB3218 80240F58 46800020 */ cvt.s.w $f0, $f0 /* DB321C 80240F5C 46001080 */ add.s $f2, $f2, $f0 /* DB3220 80240F60 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80240C04_DB2EC4 /* DB323C 80240F7C C440002C */ lwc1 $f0, 0x2c($v0) /* DB3240 80240F80 46000021 */ cvt.d.s $f0, $f0 /* DB3244 80240F84 4622003C */ c.lt.d $f0, $f2 -/* DB3248 80240F88 00000000 */ nop +/* DB3248 80240F88 00000000 */ nop /* DB324C 80240F8C 4500002C */ bc1f .L80241040 /* DB3250 80240F90 02A0202D */ daddu $a0, $s5, $zero /* DB3254 80240F94 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80240C04_DB2EC4 /* DB3290 80240FD0 3C01C1A0 */ lui $at, 0xc1a0 /* DB3294 80240FD4 44812000 */ mtc1 $at, $f4 /* DB3298 80240FD8 44834000 */ mtc1 $v1, $f8 -/* DB329C 80240FDC 00000000 */ nop +/* DB329C 80240FDC 00000000 */ nop /* DB32A0 80240FE0 46804220 */ cvt.s.w $f8, $f8 /* DB32A4 80240FE4 44074000 */ mfc1 $a3, $f8 /* DB32A8 80240FE8 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80240C04_DB2EC4 /* DB335C 8024109C 0C0123F5 */ jal is_point_within_region /* DB3360 802410A0 8E070038 */ lw $a3, 0x38($s0) /* DB3364 802410A4 1040001A */ beqz $v0, .L80241110 -/* DB3368 802410A8 00000000 */ nop +/* DB3368 802410A8 00000000 */ nop /* DB336C 802410AC 8E060038 */ lw $a2, 0x38($s0) /* DB3370 802410B0 8E2200D0 */ lw $v0, 0xd0($s1) /* DB3374 802410B4 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80240C04_DB2EC4 /* DB3388 802410C8 468073A0 */ cvt.s.w $f14, $f14 /* DB338C 802410CC C6020018 */ lwc1 $f2, 0x18($s0) /* DB3390 802410D0 4600103C */ c.lt.s $f2, $f0 -/* DB3394 802410D4 00000000 */ nop +/* DB3394 802410D4 00000000 */ nop /* DB3398 802410D8 4500000D */ bc1f .L80241110 /* DB339C 802410DC E7A00034 */ swc1 $f0, 0x34($sp) /* DB33A0 802410E0 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80240C04_DB2EC4 /* DB33DC 8024111C 00621825 */ or $v1, $v1, $v0 /* DB33E0 80241120 00741825 */ or $v1, $v1, $s4 /* DB33E4 80241124 10600008 */ beqz $v1, .L80241148 -/* DB33E8 80241128 00000000 */ nop +/* DB33E8 80241128 00000000 */ nop /* DB33EC 8024112C 8602008C */ lh $v0, 0x8c($s0) /* DB33F0 80241130 14400031 */ bnez $v0, .L802411F8 -/* DB33F4 80241134 00000000 */ nop +/* DB33F4 80241134 00000000 */ nop /* DB33F8 80241138 8E050018 */ lw $a1, 0x18($s0) /* DB33FC 8024113C 8E06000C */ lw $a2, 0xc($s0) /* DB3400 80241140 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_80240C04_DB2EC4 /* DB3414 80241154 44801000 */ mtc1 $zero, $f2 /* DB3418 80241158 46000021 */ cvt.d.s $f0, $f0 /* DB341C 8024115C 46220002 */ mul.d $f0, $f0, $f2 -/* DB3420 80241160 00000000 */ nop +/* DB3420 80241160 00000000 */ nop /* DB3424 80241164 4620020D */ trunc.w.d $f8, $f0 /* DB3428 80241168 E628007C */ swc1 $f8, 0x7c($s1) /* DB342C 8024116C 8E420004 */ lw $v0, 4($s2) /* DB3430 80241170 18400021 */ blez $v0, .L802411F8 -/* DB3434 80241174 00000000 */ nop +/* DB3434 80241174 00000000 */ nop /* DB3438 80241178 8602008E */ lh $v0, 0x8e($s0) /* DB343C 8024117C 9603008E */ lhu $v1, 0x8e($s0) /* DB3440 80241180 18400005 */ blez $v0, .L80241198 @@ -375,7 +375,7 @@ glabel func_80240C04_DB2EC4 /* DB3448 80241188 A602008E */ sh $v0, 0x8e($s0) /* DB344C 8024118C 00021400 */ sll $v0, $v0, 0x10 /* DB3450 80241190 1C400019 */ bgtz $v0, .L802411F8 -/* DB3454 80241194 00000000 */ nop +/* DB3454 80241194 00000000 */ nop .L80241198: /* DB3458 80241198 240403E8 */ addiu $a0, $zero, 0x3e8 /* DB345C 8024119C 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80240C04_DB2EC4 /* DB34A4 802411E4 18400003 */ blez $v0, .L802411F4 /* DB34A8 802411E8 28620003 */ slti $v0, $v1, 3 /* DB34AC 802411EC 10400002 */ beqz $v0, .L802411F8 -/* DB34B0 802411F0 00000000 */ nop +/* DB34B0 802411F0 00000000 */ nop .L802411F4: /* DB34B4 802411F4 AE600070 */ sw $zero, 0x70($s3) .L802411F8: diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802412EC_DB35AC.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802412EC_DB35AC.s index 2032f85b74..d963a0dcdb 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802412EC_DB35AC.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802412EC_DB35AC.s @@ -42,11 +42,11 @@ glabel func_802412EC_DB35AC .L80241380: /* DB3640 80241380 8E220070 */ lw $v0, 0x70($s1) /* DB3644 80241384 18400034 */ blez $v0, .L80241458 -/* DB3648 80241388 00000000 */ nop +/* DB3648 80241388 00000000 */ nop /* DB364C 8024138C C62C0074 */ lwc1 $f12, 0x74($s1) /* DB3650 80241390 46806320 */ cvt.s.w $f12, $f12 /* DB3654 80241394 44820000 */ mtc1 $v0, $f0 -/* DB3658 80241398 00000000 */ nop +/* DB3658 80241398 00000000 */ nop /* DB365C 8024139C 46800020 */ cvt.s.w $f0, $f0 /* DB3660 802413A0 46000021 */ cvt.d.s $f0, $f0 /* DB3664 802413A4 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_802412EC_DB35AC /* DB36C4 80241404 27A70030 */ addiu $a3, $sp, 0x30 .L80241408: /* DB36C8 80241408 10400007 */ beqz $v0, .L80241428 -/* DB36CC 8024140C 00000000 */ nop +/* DB36CC 8024140C 00000000 */ nop /* DB36D0 80241410 4616A082 */ mul.s $f2, $f20, $f22 -/* DB36D4 80241414 00000000 */ nop +/* DB36D4 80241414 00000000 */ nop /* DB36D8 80241418 C7A0002C */ lwc1 $f0, 0x2c($sp) /* DB36DC 8024141C 46180000 */ add.s $f0, $f0, $f24 /* DB36E0 80241420 0809050D */ j .L80241434 /* DB36E4 80241424 46020000 */ add.s $f0, $f0, $f2 .L80241428: /* DB36E8 80241428 4616A002 */ mul.s $f0, $f20, $f22 -/* DB36EC 8024142C 00000000 */ nop +/* DB36EC 8024142C 00000000 */ nop /* DB36F0 80241430 4600D000 */ add.s $f0, $f26, $f0 .L80241434: /* DB36F4 80241434 E600003C */ swc1 $f0, 0x3c($s0) /* DB36F8 80241438 8E220074 */ lw $v0, 0x74($s1) /* DB36FC 8024143C 2442000A */ addiu $v0, $v0, 0xa /* DB3700 80241440 44826000 */ mtc1 $v0, $f12 -/* DB3704 80241444 00000000 */ nop +/* DB3704 80241444 00000000 */ nop /* DB3708 80241448 0C00A6C9 */ jal clamp_angle /* DB370C 8024144C 46806320 */ cvt.s.w $f12, $f12 /* DB3710 80241450 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_802412EC_DB35AC /* DB3724 80241464 860200A8 */ lh $v0, 0xa8($s0) /* DB3728 80241468 C600003C */ lwc1 $f0, 0x3c($s0) /* DB372C 8024146C 44821000 */ mtc1 $v0, $f2 -/* DB3730 80241470 00000000 */ nop +/* DB3730 80241470 00000000 */ nop /* DB3734 80241474 468010A0 */ cvt.s.w $f2, $f2 /* DB3738 80241478 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* DB373C 8024147C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_802412EC_DB35AC /* DB3758 80241498 46240000 */ add.d $f0, $f0, $f4 /* DB375C 8024149C 460010A1 */ cvt.d.s $f2, $f2 /* DB3760 802414A0 4620103C */ c.lt.d $f2, $f0 -/* DB3764 802414A4 00000000 */ nop +/* DB3764 802414A4 00000000 */ nop /* DB3768 802414A8 4500002E */ bc1f .L80241564 /* DB376C 802414AC 0280202D */ daddu $a0, $s4, $zero /* DB3770 802414B0 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_802412EC_DB35AC /* DB37B0 802414F0 3C01C1A0 */ lui $at, 0xc1a0 /* DB37B4 802414F4 44812000 */ mtc1 $at, $f4 /* DB37B8 802414F8 44834000 */ mtc1 $v1, $f8 -/* DB37BC 802414FC 00000000 */ nop +/* DB37BC 802414FC 00000000 */ nop /* DB37C0 80241500 46804220 */ cvt.s.w $f8, $f8 /* DB37C4 80241504 44074000 */ mfc1 $a3, $f8 /* DB37C8 80241508 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_802412EC_DB35AC .L80241564: /* DB3824 80241564 8602008C */ lh $v0, 0x8c($s0) /* DB3828 80241568 14400025 */ bnez $v0, .L80241600 -/* DB382C 8024156C 00000000 */ nop +/* DB382C 8024156C 00000000 */ nop /* DB3830 80241570 8602008E */ lh $v0, 0x8e($s0) /* DB3834 80241574 1C400022 */ bgtz $v0, .L80241600 -/* DB3838 80241578 00000000 */ nop +/* DB3838 80241578 00000000 */ nop /* DB383C 8024157C 8E620074 */ lw $v0, 0x74($s3) /* DB3840 80241580 2442FFFF */ addiu $v0, $v0, -1 /* DB3844 80241584 1840001D */ blez $v0, .L802415FC @@ -183,7 +183,7 @@ glabel func_802412EC_DB35AC /* DB3850 80241590 9442002A */ lhu $v0, 0x2a($v0) /* DB3854 80241594 30420010 */ andi $v0, $v0, 0x10 /* DB3858 80241598 14400007 */ bnez $v0, .L802415B8 -/* DB385C 8024159C 00000000 */ nop +/* DB385C 8024159C 00000000 */ nop /* DB3860 802415A0 C600000C */ lwc1 $f0, 0xc($s0) /* DB3864 802415A4 3C014334 */ lui $at, 0x4334 /* DB3868 802415A8 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241714_DB39D4.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241714_DB39D4.s index 5faea0435a..2dd5c7e36c 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241714_DB39D4.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241714_DB39D4.s @@ -60,18 +60,18 @@ glabel func_80241714_DB39D4 /* DB3AAC 802417EC C6200038 */ lwc1 $f0, 0x38($s1) /* DB3AB0 802417F0 4600018D */ trunc.w.s $f6, $f0 /* DB3AB4 802417F4 44023000 */ mfc1 $v0, $f6 -/* DB3AB8 802417F8 00000000 */ nop +/* DB3AB8 802417F8 00000000 */ nop /* DB3ABC 802417FC A6420010 */ sh $v0, 0x10($s2) /* DB3AC0 80241800 C620003C */ lwc1 $f0, 0x3c($s1) /* DB3AC4 80241804 4600018D */ trunc.w.s $f6, $f0 /* DB3AC8 80241808 44023000 */ mfc1 $v0, $f6 -/* DB3ACC 8024180C 00000000 */ nop +/* DB3ACC 8024180C 00000000 */ nop /* DB3AD0 80241810 A6420012 */ sh $v0, 0x12($s2) /* DB3AD4 80241814 C6200040 */ lwc1 $f0, 0x40($s1) /* DB3AD8 80241818 A2430007 */ sb $v1, 7($s2) /* DB3ADC 8024181C 4600018D */ trunc.w.s $f6, $f0 /* DB3AE0 80241820 44023000 */ mfc1 $v0, $f6 -/* DB3AE4 80241824 00000000 */ nop +/* DB3AE4 80241824 00000000 */ nop /* DB3AE8 80241828 A6420014 */ sh $v0, 0x14($s2) .L8024182C: /* DB3AEC 8024182C 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802418AC_DB3B6C.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802418AC_DB3B6C.s index 828c9d1eeb..8daed52250 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802418AC_DB3B6C.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802418AC_DB3B6C.s @@ -42,9 +42,9 @@ glabel func_802418AC_DB3B6C /* DB3C00 80241940 44801800 */ mtc1 $zero, $f3 /* DB3C04 80241944 46002021 */ cvt.d.s $f0, $f4 /* DB3C08 80241948 4620103E */ c.le.d $f2, $f0 -/* DB3C0C 8024194C 00000000 */ nop +/* DB3C0C 8024194C 00000000 */ nop /* DB3C10 80241950 45000030 */ bc1f .L80241A14 -/* DB3C14 80241954 00000000 */ nop +/* DB3C14 80241954 00000000 */ nop /* DB3C18 80241958 C600003C */ lwc1 $f0, 0x3c($s0) /* DB3C1C 8024195C 46040000 */ add.s $f0, $f0, $f4 /* DB3C20 80241960 E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_802418AC_DB3B6C /* DB3C80 802419C0 27A70020 */ addiu $a3, $sp, 0x20 .L802419C4: /* DB3C84 802419C4 1040000B */ beqz $v0, .L802419F4 -/* DB3C88 802419C8 00000000 */ nop +/* DB3C88 802419C8 00000000 */ nop /* DB3C8C 802419CC C7A0001C */ lwc1 $f0, 0x1c($sp) /* DB3C90 802419D0 46140080 */ add.s $f2, $f0, $f20 /* DB3C94 802419D4 C600003C */ lwc1 $f0, 0x3c($s0) /* DB3C98 802419D8 4600103E */ c.le.s $f2, $f0 -/* DB3C9C 802419DC 00000000 */ nop +/* DB3C9C 802419DC 00000000 */ nop /* DB3CA0 802419E0 4500008D */ bc1f .L80241C18 -/* DB3CA4 802419E4 00000000 */ nop +/* DB3CA4 802419E4 00000000 */ nop /* DB3CA8 802419E8 E602003C */ swc1 $f2, 0x3c($s0) /* DB3CAC 802419EC 08090706 */ j .L80241C18 /* DB3CB0 802419F0 AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_802418AC_DB3B6C /* DB3CB4 802419F4 C602003C */ lwc1 $f2, 0x3c($s0) /* DB3CB8 802419F8 C6000064 */ lwc1 $f0, 0x64($s0) /* DB3CBC 802419FC 4602003E */ c.le.s $f0, $f2 -/* DB3CC0 80241A00 00000000 */ nop +/* DB3CC0 80241A00 00000000 */ nop /* DB3CC4 80241A04 45030084 */ bc1tl .L80241C18 /* DB3CC8 80241A08 AE400070 */ sw $zero, 0x70($s2) /* DB3CCC 80241A0C 08090706 */ j .L80241C18 -/* DB3CD0 80241A10 00000000 */ nop +/* DB3CD0 80241A10 00000000 */ nop .L80241A14: /* DB3CD4 80241A14 4622003C */ c.lt.d $f0, $f2 -/* DB3CD8 80241A18 00000000 */ nop +/* DB3CD8 80241A18 00000000 */ nop /* DB3CDC 80241A1C 4500007E */ bc1f .L80241C18 -/* DB3CE0 80241A20 00000000 */ nop +/* DB3CE0 80241A20 00000000 */ nop /* DB3CE4 80241A24 9602008E */ lhu $v0, 0x8e($s0) /* DB3CE8 80241A28 24420001 */ addiu $v0, $v0, 1 /* DB3CEC 80241A2C A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_802418AC_DB3B6C /* DB3CF8 80241A38 00021403 */ sra $v0, $v0, 0x10 /* DB3CFC 80241A3C 0043102A */ slt $v0, $v0, $v1 /* DB3D00 80241A40 14400026 */ bnez $v0, .L80241ADC -/* DB3D04 80241A44 00000000 */ nop +/* DB3D04 80241A44 00000000 */ nop /* DB3D08 80241A48 C60C0038 */ lwc1 $f12, 0x38($s0) /* DB3D0C 80241A4C C60E0040 */ lwc1 $f14, 0x40($s0) /* DB3D10 80241A50 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_802418AC_DB3B6C /* DB3D3C 80241A7C 8E62001C */ lw $v0, 0x1c($s3) /* DB3D40 80241A80 46001005 */ abs.s $f0, $f2 /* DB3D44 80241A84 44822000 */ mtc1 $v0, $f4 -/* DB3D48 80241A88 00000000 */ nop +/* DB3D48 80241A88 00000000 */ nop /* DB3D4C 80241A8C 46802120 */ cvt.s.w $f4, $f4 /* DB3D50 80241A90 4600203C */ c.lt.s $f4, $f0 -/* DB3D54 80241A94 00000000 */ nop +/* DB3D54 80241A94 00000000 */ nop /* DB3D58 80241A98 4500000D */ bc1f .L80241AD0 -/* DB3D5C 80241A9C 00000000 */ nop +/* DB3D5C 80241A9C 00000000 */ nop /* DB3D60 80241AA0 44800000 */ mtc1 $zero, $f0 /* DB3D64 80241AA4 C614000C */ lwc1 $f20, 0xc($s0) /* DB3D68 80241AA8 4600103C */ c.lt.s $f2, $f0 -/* DB3D6C 80241AAC 00000000 */ nop +/* DB3D6C 80241AAC 00000000 */ nop /* DB3D70 80241AB0 45000006 */ bc1f .L80241ACC /* DB3D74 80241AB4 00021023 */ negu $v0, $v0 /* DB3D78 80241AB8 44820000 */ mtc1 $v0, $f0 -/* DB3D7C 80241ABC 00000000 */ nop +/* DB3D7C 80241ABC 00000000 */ nop /* DB3D80 80241AC0 46800020 */ cvt.s.w $f0, $f0 /* DB3D84 80241AC4 080906B4 */ j .L80241AD0 /* DB3D88 80241AC8 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_802418AC_DB3B6C /* DB3DB0 80241AF0 C600001C */ lwc1 $f0, 0x1c($s0) /* DB3DB4 80241AF4 46001080 */ add.s $f2, $f2, $f0 /* DB3DB8 80241AF8 4616103C */ c.lt.s $f2, $f22 -/* DB3DBC 80241AFC 00000000 */ nop +/* DB3DBC 80241AFC 00000000 */ nop /* DB3DC0 80241B00 45020045 */ bc1fl .L80241C18 /* DB3DC4 80241B04 E602003C */ swc1 $f2, 0x3c($s0) /* DB3DC8 80241B08 08090705 */ j .L80241C14 @@ -169,7 +169,7 @@ glabel func_802418AC_DB3B6C /* DB3DE0 80241B20 C600001C */ lwc1 $f0, 0x1c($s0) /* DB3DE4 80241B24 C604003C */ lwc1 $f4, 0x3c($s0) /* DB3DE8 80241B28 44821000 */ mtc1 $v0, $f2 -/* DB3DEC 80241B2C 00000000 */ nop +/* DB3DEC 80241B2C 00000000 */ nop /* DB3DF0 80241B30 468010A0 */ cvt.s.w $f2, $f2 /* DB3DF4 80241B34 46000005 */ abs.s $f0, $f0 /* DB3DF8 80241B38 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_802418AC_DB3B6C /* DB3E34 80241B74 0C0372DF */ jal func_800DCB7C /* DB3E38 80241B78 27A70020 */ addiu $a3, $sp, 0x20 /* DB3E3C 80241B7C 10400015 */ beqz $v0, .L80241BD4 -/* DB3E40 80241B80 00000000 */ nop +/* DB3E40 80241B80 00000000 */ nop /* DB3E44 80241B84 860200A8 */ lh $v0, 0xa8($s0) /* DB3E48 80241B88 C604001C */ lwc1 $f4, 0x1c($s0) /* DB3E4C 80241B8C 44820000 */ mtc1 $v0, $f0 -/* DB3E50 80241B90 00000000 */ nop +/* DB3E50 80241B90 00000000 */ nop /* DB3E54 80241B94 46800020 */ cvt.s.w $f0, $f0 /* DB3E58 80241B98 46002085 */ abs.s $f2, $f4 /* DB3E5C 80241B9C 46020000 */ add.s $f0, $f0, $f2 /* DB3E60 80241BA0 C7A20024 */ lwc1 $f2, 0x24($sp) /* DB3E64 80241BA4 4600103E */ c.le.s $f2, $f0 -/* DB3E68 80241BA8 00000000 */ nop +/* DB3E68 80241BA8 00000000 */ nop /* DB3E6C 80241BAC 45000005 */ bc1f .L80241BC4 -/* DB3E70 80241BB0 00000000 */ nop +/* DB3E70 80241BB0 00000000 */ nop /* DB3E74 80241BB4 C7A0001C */ lwc1 $f0, 0x1c($sp) /* DB3E78 80241BB8 AE00001C */ sw $zero, 0x1c($s0) /* DB3E7C 80241BBC 08090706 */ j .L80241C18 @@ -217,13 +217,13 @@ glabel func_802418AC_DB3B6C /* DB3E98 80241BD8 860200A8 */ lh $v0, 0xa8($s0) /* DB3E9C 80241BDC 46163081 */ sub.s $f2, $f6, $f22 /* DB3EA0 80241BE0 44820000 */ mtc1 $v0, $f0 -/* DB3EA4 80241BE4 00000000 */ nop +/* DB3EA4 80241BE4 00000000 */ nop /* DB3EA8 80241BE8 46800020 */ cvt.s.w $f0, $f0 /* DB3EAC 80241BEC 46001080 */ add.s $f2, $f2, $f0 /* DB3EB0 80241BF0 C604001C */ lwc1 $f4, 0x1c($s0) /* DB3EB4 80241BF4 46002005 */ abs.s $f0, $f4 /* DB3EB8 80241BF8 4602003C */ c.lt.s $f0, $f2 -/* DB3EBC 80241BFC 00000000 */ nop +/* DB3EBC 80241BFC 00000000 */ nop /* DB3EC0 80241C00 45020005 */ bc1fl .L80241C18 /* DB3EC4 80241C04 AE00001C */ sw $zero, 0x1c($s0) /* DB3EC8 80241C08 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241C3C_DB3EFC.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241C3C_DB3EFC.s index f50179b618..1476b6263e 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241C3C_DB3EFC.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241C3C_DB3EFC.s @@ -49,15 +49,15 @@ glabel func_80241C3C_DB3EFC /* DB3FA4 80241CE4 44802000 */ mtc1 $zero, $f4 /* DB3FA8 80241CE8 460010A1 */ cvt.d.s $f2, $f2 /* DB3FAC 80241CEC 46241082 */ mul.d $f2, $f2, $f4 -/* DB3FB0 80241CF0 00000000 */ nop +/* DB3FB0 80241CF0 00000000 */ nop /* DB3FB4 80241CF4 C7A0001C */ lwc1 $f0, 0x1c($sp) /* DB3FB8 80241CF8 46000021 */ cvt.d.s $f0, $f0 /* DB3FBC 80241CFC 46240002 */ mul.d $f0, $f0, $f4 -/* DB3FC0 80241D00 00000000 */ nop +/* DB3FC0 80241D00 00000000 */ nop /* DB3FC4 80241D04 3C013FE0 */ lui $at, 0x3fe0 /* DB3FC8 80241D08 44812800 */ mtc1 $at, $f5 /* DB3FCC 80241D0C 44802000 */ mtc1 $zero, $f4 -/* DB3FD0 80241D10 00000000 */ nop +/* DB3FD0 80241D10 00000000 */ nop /* DB3FD4 80241D14 46241080 */ add.d $f2, $f2, $f4 /* DB3FD8 80241D18 AE000074 */ sw $zero, 0x74($s0) /* DB3FDC 80241D1C 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s index e2810645f5..0c0074616d 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s @@ -54,7 +54,7 @@ glabel func_80241D60_DB4020 /* DB40E0 80241E20 8E4300B0 */ lw $v1, 0xb0($s2) /* DB40E4 80241E24 30620004 */ andi $v0, $v1, 4 /* DB40E8 80241E28 10400007 */ beqz $v0, .L80241E48 -/* DB40EC 80241E2C 00000000 */ nop +/* DB40EC 80241E2C 00000000 */ nop /* DB40F0 80241E30 824200B4 */ lb $v0, 0xb4($s2) /* DB40F4 80241E34 1440003C */ bnez $v0, .L80241F28 /* DB40F8 80241E38 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_80241D60_DB4020 /* DB410C 80241E4C 2C62000F */ sltiu $v0, $v1, 0xf /* DB4110 80241E50 10400034 */ beqz $v0, .L80241F24 /* DB4114 80241E54 00031080 */ sll $v0, $v1, 2 -/* DB4118 80241E58 3C018024 */ lui $at, %hi(D_80245608) +/* DB4118 80241E58 3C018024 */ lui $at, %hi(jtbl_80245608_DB78C8) /* DB411C 80241E5C 00220821 */ addu $at, $at, $v0 -/* DB4120 80241E60 8C225608 */ lw $v0, %lo(D_80245608)($at) +/* DB4120 80241E60 8C225608 */ lw $v0, %lo(jtbl_80245608_DB78C8)($at) /* DB4124 80241E64 00400008 */ jr $v0 -/* DB4128 80241E68 00000000 */ nop +/* DB4128 80241E68 00000000 */ nop +glabel L80241E6C_DB412C /* DB412C 80241E6C 0280202D */ daddu $a0, $s4, $zero /* DB4130 80241E70 0200282D */ daddu $a1, $s0, $zero /* DB4134 80241E74 0C090295 */ jal func_80240A54_DB2D14 /* DB4138 80241E78 0260302D */ daddu $a2, $s3, $zero +glabel L80241E7C_DB413C /* DB413C 80241E7C 0280202D */ daddu $a0, $s4, $zero /* DB4140 80241E80 0200282D */ daddu $a1, $s0, $zero /* DB4144 80241E84 0C090301 */ jal func_80240C04_DB2EC4 /* DB4148 80241E88 0260302D */ daddu $a2, $s3, $zero /* DB414C 80241E8C 080907CA */ j .L80241F28 /* DB4150 80241E90 0000102D */ daddu $v0, $zero, $zero +glabel L80241E94_DB4154 /* DB4154 80241E94 0280202D */ daddu $a0, $s4, $zero /* DB4158 80241E98 0200282D */ daddu $a1, $s0, $zero /* DB415C 80241E9C 0C09048B */ jal omo_05_UnkNpcAIFunc1 /* DB4160 80241EA0 0260302D */ daddu $a2, $s3, $zero +glabel L80241EA4_DB4164 /* DB4164 80241EA4 0280202D */ daddu $a0, $s4, $zero /* DB4168 80241EA8 0200282D */ daddu $a1, $s0, $zero /* DB416C 80241EAC 0C0904BB */ jal func_802412EC_DB35AC /* DB4170 80241EB0 0260302D */ daddu $a2, $s3, $zero /* DB4174 80241EB4 080907CA */ j .L80241F28 /* DB4178 80241EB8 0000102D */ daddu $v0, $zero, $zero +glabel L80241EBC_DB417C /* DB417C 80241EBC 0280202D */ daddu $a0, $s4, $zero /* DB4180 80241EC0 0200282D */ daddu $a1, $s0, $zero /* DB4184 80241EC4 0C09058C */ jal omo_05_UnkNpcAIFunc2 /* DB4188 80241EC8 0260302D */ daddu $a2, $s3, $zero +glabel L80241ECC_DB418C /* DB418C 80241ECC 0280202D */ daddu $a0, $s4, $zero /* DB4190 80241ED0 0200282D */ daddu $a1, $s0, $zero /* DB4194 80241ED4 0C0905AA */ jal func_802416A8_DB3968 /* DB4198 80241ED8 0260302D */ daddu $a2, $s3, $zero /* DB419C 80241EDC 080907CA */ j .L80241F28 /* DB41A0 80241EE0 0000102D */ daddu $v0, $zero, $zero +glabel L80241EE4_DB41A4 /* DB41A4 80241EE4 0280202D */ daddu $a0, $s4, $zero /* DB41A8 80241EE8 0200282D */ daddu $a1, $s0, $zero /* DB41AC 80241EEC 0C0905C5 */ jal func_80241714_DB39D4 /* DB41B0 80241EF0 0260302D */ daddu $a2, $s3, $zero /* DB41B4 80241EF4 080907CA */ j .L80241F28 /* DB41B8 80241EF8 0000102D */ daddu $v0, $zero, $zero +glabel L80241EFC_DB41BC /* DB41BC 80241EFC 0280202D */ daddu $a0, $s4, $zero /* DB41C0 80241F00 0200282D */ daddu $a1, $s0, $zero /* DB41C4 80241F04 0C090612 */ jal omo_05_UnkNpcAIFunc3 /* DB41C8 80241F08 0260302D */ daddu $a2, $s3, $zero /* DB41CC 80241F0C 080907CA */ j .L80241F28 /* DB41D0 80241F10 0000102D */ daddu $v0, $zero, $zero +glabel L80241F14_DB41D4 /* DB41D4 80241F14 0280202D */ daddu $a0, $s4, $zero /* DB41D8 80241F18 0200282D */ daddu $a1, $s0, $zero /* DB41DC 80241F1C 0C09062B */ jal func_802418AC_DB3B6C /* DB41E0 80241F20 0260302D */ daddu $a2, $s3, $zero .L80241F24: +glabel L80241F24_DB41E4 /* DB41E4 80241F24 0000102D */ daddu $v0, $zero, $zero .L80241F28: /* DB41E8 80241F28 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242204_DB44C4.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242204_DB44C4.s index 4bafe05b12..24c5fa12cc 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242204_DB44C4.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242204_DB44C4.s @@ -28,7 +28,7 @@ glabel func_80242204_DB44C4 /* DB4518 80242258 00220821 */ addu $at, $at, $v0 /* DB451C 8024225C AC205650 */ sw $zero, %lo(D_80245650)($at) /* DB4520 80242260 080908A4 */ j .L80242290 -/* DB4524 80242264 00000000 */ nop +/* DB4524 80242264 00000000 */ nop .L80242268: /* DB4528 80242268 3C038024 */ lui $v1, %hi(D_80245650) /* DB452C 8024226C 24635650 */ addiu $v1, $v1, %lo(D_80245650) diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802422A0_DB4560.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802422A0_DB4560.s index 44d1324dfb..8669146d31 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802422A0_DB4560.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802422A0_DB4560.s @@ -20,7 +20,7 @@ glabel func_802422A0_DB4560 /* DB459C 802422DC 10820003 */ beq $a0, $v0, .L802422EC /* DB45A0 802422E0 240200B7 */ addiu $v0, $zero, 0xb7 /* DB45A4 802422E4 14820004 */ bne $a0, $v0, .L802422F8 -/* DB45A8 802422E8 00000000 */ nop +/* DB45A8 802422E8 00000000 */ nop .L802422EC: /* DB45AC 802422EC 24020002 */ addiu $v0, $zero, 2 /* DB45B0 802422F0 080908C5 */ j .L80242314 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242328_DB45E8.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242328_DB45E8.s index 52d29d1782..f84ca703ab 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242328_DB45E8.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242328_DB45E8.s @@ -18,7 +18,7 @@ glabel func_80242328_DB45E8 /* DB4618 80242358 C6000070 */ lwc1 $f0, 0x70($s0) /* DB461C 8024235C 3C014120 */ lui $at, 0x4120 /* DB4620 80242360 44811000 */ mtc1 $at, $f2 -/* DB4624 80242364 00000000 */ nop +/* DB4624 80242364 00000000 */ nop /* DB4628 80242368 46020000 */ add.s $f0, $f0, $f2 /* DB462C 8024236C 3C01BF80 */ lui $at, 0xbf80 /* DB4630 80242370 44811000 */ mtc1 $at, $f2 @@ -35,7 +35,7 @@ glabel func_80242328_DB45E8 /* DB465C 8024239C D4225648 */ ldc1 $f2, %lo(D_80245648)($at) /* DB4660 802423A0 46000021 */ cvt.d.s $f0, $f0 /* DB4664 802423A4 4620103E */ c.le.d $f2, $f0 -/* DB4668 802423A8 00000000 */ nop +/* DB4668 802423A8 00000000 */ nop /* DB466C 802423AC 45010002 */ bc1t .L802423B8 /* DB4670 802423B0 24020002 */ addiu $v0, $zero, 2 /* DB4674 802423B4 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802423C8_DB4688.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802423C8_DB4688.s index 123098555c..93c512e5e6 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802423C8_DB4688.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802423C8_DB4688.s @@ -16,4 +16,4 @@ glabel func_802423C8_DB4688 /* DB46B0 802423F0 AC20592C */ sw $zero, %lo(D_8024592C)($at) /* DB46B4 802423F4 03E00008 */ jr $ra /* DB46B8 802423F8 24020002 */ addiu $v0, $zero, 2 -/* DB46BC 802423FC 00000000 */ nop +/* DB46BC 802423FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_802400E4_DB79F4.s b/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_802400E4_DB79F4.s index beafa91894..f546ce1d7c 100644 --- a/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_802400E4_DB79F4.s +++ b/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_802400E4_DB79F4.s @@ -18,7 +18,7 @@ glabel func_802400E4_DB79F4 /* DB7A28 80240118 0C0B210B */ jal get_float_variable /* DB7A2C 8024011C 46000506 */ mov.s $f20, $f0 /* DB7A30 80240120 4614003C */ c.lt.s $f0, $f20 -/* DB7A34 80240124 00000000 */ nop +/* DB7A34 80240124 00000000 */ nop /* DB7A38 80240128 45000004 */ bc1f .L8024013C /* DB7A3C 8024012C 0220202D */ daddu $a0, $s1, $zero /* DB7A40 80240130 8E050000 */ lw $a1, ($s0) @@ -29,7 +29,7 @@ glabel func_802400E4_DB79F4 /* DB7A50 80240140 0000302D */ daddu $a2, $zero, $zero .L80240144: /* DB7A54 80240144 0C0B2026 */ jal set_variable -/* DB7A58 80240148 00000000 */ nop +/* DB7A58 80240148 00000000 */ nop /* DB7A5C 8024014C 8FBF0018 */ lw $ra, 0x18($sp) /* DB7A60 80240150 8FB10014 */ lw $s1, 0x14($sp) /* DB7A64 80240154 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240870_DB8180.s b/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240870_DB8180.s index 0ad5a8b0e9..fa567c3e04 100644 --- a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240870_DB8180.s +++ b/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240870_DB8180.s @@ -26,7 +26,7 @@ glabel func_80240870_DB8180 /* DB81D0 802408C0 1440FFFA */ bnez $v0, .L802408AC /* DB81D4 802408C4 24A50004 */ addiu $a1, $a1, 4 /* DB81D8 802408C8 08090243 */ j .L8024090C -/* DB81DC 802408CC 00000000 */ nop +/* DB81DC 802408CC 00000000 */ nop .L802408D0: /* DB81E0 802408D0 0000182D */ daddu $v1, $zero, $zero /* DB81E4 802408D4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240000_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240000_DBD2B0.s index f2a660f989..211f2ad1bb 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240000_DBD2B0.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240000_DBD2B0.s @@ -15,7 +15,7 @@ glabel func_80240000_DBD2B0 /* DBD2D8 80240028 D4226BD0 */ ldc1 $f2, %lo(D_80246BD0)($at) /* DBD2DC 8024002C 46000021 */ cvt.d.s $f0, $f0 /* DBD2E0 80240030 46220002 */ mul.d $f0, $f0, $f2 -/* DBD2E4 80240034 00000000 */ nop +/* DBD2E4 80240034 00000000 */ nop /* DBD2E8 80240038 46200020 */ cvt.s.d $f0, $f0 /* DBD2EC 8024003C E4400018 */ swc1 $f0, 0x18($v0) /* DBD2F0 80240040 8E0300CC */ lw $v1, 0xcc($s0) diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240070_DBD320.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240070_DBD320.s index 48a890cebf..613d406143 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240070_DBD320.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240070_DBD320.s @@ -22,7 +22,7 @@ glabel func_80240070_DBD320 /* DBD364 802400B4 0C0129E1 */ jal func_8004A784 /* DBD368 802400B8 0000382D */ daddu $a3, $zero, $zero /* DBD36C 802400BC 14400005 */ bnez $v0, .L802400D4 -/* DBD370 802400C0 00000000 */ nop +/* DBD370 802400C0 00000000 */ nop /* DBD374 802400C4 8E050018 */ lw $a1, 0x18($s0) /* DBD378 802400C8 8E06000C */ lw $a2, 0xc($s0) /* DBD37C 802400CC 0C00EA95 */ jal npc_move_heading @@ -33,13 +33,13 @@ glabel func_80240070_DBD320 /* DBD38C 802400DC A602008E */ sh $v0, 0x8e($s0) /* DBD390 802400E0 00021400 */ sll $v0, $v0, 0x10 /* DBD394 802400E4 14400010 */ bnez $v0, .L80240128 -/* DBD398 802400E8 00000000 */ nop +/* DBD398 802400E8 00000000 */ nop /* DBD39C 802400EC C6000018 */ lwc1 $f0, 0x18($s0) /* DBD3A0 802400F0 3C018024 */ lui $at, %hi(D_80246BD8) /* DBD3A4 802400F4 D4226BD8 */ ldc1 $f2, %lo(D_80246BD8)($at) /* DBD3A8 802400F8 46000021 */ cvt.d.s $f0, $f0 /* DBD3AC 802400FC 46220002 */ mul.d $f0, $f0, $f2 -/* DBD3B0 80240100 00000000 */ nop +/* DBD3B0 80240100 00000000 */ nop /* DBD3B4 80240104 46200020 */ cvt.s.d $f0, $f0 /* DBD3B8 80240108 E6000018 */ swc1 $f0, 0x18($s0) /* DBD3BC 8024010C 8E2200CC */ lw $v0, 0xcc($s1) diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240140_DBD3F0.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240140_DBD3F0.s index 3f1ed7e10b..f113f1e8d8 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240140_DBD3F0.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240140_DBD3F0.s @@ -21,7 +21,7 @@ glabel func_80240140_DBD3F0 /* DBD430 80240180 0C0129E1 */ jal func_8004A784 /* DBD434 80240184 0000382D */ daddu $a3, $zero, $zero /* DBD438 80240188 14400005 */ bnez $v0, .L802401A0 -/* DBD43C 8024018C 00000000 */ nop +/* DBD43C 8024018C 00000000 */ nop /* DBD440 80240190 8E050018 */ lw $a1, 0x18($s0) /* DBD444 80240194 8E06000C */ lw $a2, 0xc($s0) /* DBD448 80240198 0C00EA95 */ jal npc_move_heading diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802401D8_DBD488.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802401D8_DBD488.s index 01e7c6a7c9..9896cb0574 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802401D8_DBD488.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802401D8_DBD488.s @@ -16,7 +16,7 @@ glabel func_802401D8_DBD488 /* DBD4B4 80240204 A462008E */ sh $v0, 0x8e($v1) /* DBD4B8 80240208 00021400 */ sll $v0, $v0, 0x10 /* DBD4BC 8024020C 14400005 */ bnez $v0, .L80240224 -/* DBD4C0 80240210 00000000 */ nop +/* DBD4C0 80240210 00000000 */ nop /* DBD4C4 80240214 8E0200CC */ lw $v0, 0xcc($s0) /* DBD4C8 80240218 8C420000 */ lw $v0, ($v0) /* DBD4CC 8024021C AC620028 */ sw $v0, 0x28($v1) diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s index d24da2544d..09a4365539 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s @@ -124,45 +124,53 @@ glabel func_80240238_DBD4E8 /* DBD6AC 802403FC 2C620064 */ sltiu $v0, $v1, 0x64 /* DBD6B0 80240400 10400050 */ beqz $v0, .L80240544 /* DBD6B4 80240404 00031080 */ sll $v0, $v1, 2 -/* DBD6B8 80240408 3C018024 */ lui $at, %hi(D_80246BE0) +/* DBD6B8 80240408 3C018024 */ lui $at, %hi(jtbl_80246BE0_DC3E90) /* DBD6BC 8024040C 00220821 */ addu $at, $at, $v0 -/* DBD6C0 80240410 8C226BE0 */ lw $v0, %lo(D_80246BE0)($at) +/* DBD6C0 80240410 8C226BE0 */ lw $v0, %lo(jtbl_80246BE0_DC3E90)($at) /* DBD6C4 80240414 00400008 */ jr $v0 /* DBD6C8 80240418 00000000 */ nop +glabel L8024041C_DBD6CC /* DBD6CC 8024041C 0260202D */ daddu $a0, $s3, $zero /* DBD6D0 80240420 0280282D */ daddu $a1, $s4, $zero /* DBD6D4 80240424 0C012568 */ jal func_800495A0 /* DBD6D8 80240428 02A0302D */ daddu $a2, $s5, $zero +glabel L8024042C_DBD6DC /* DBD6DC 8024042C 0260202D */ daddu $a0, $s3, $zero /* DBD6E0 80240430 0280282D */ daddu $a1, $s4, $zero /* DBD6E4 80240434 0C0125AE */ jal func_800496B8 /* DBD6E8 80240438 02A0302D */ daddu $a2, $s5, $zero /* DBD6EC 8024043C 08090151 */ j .L80240544 /* DBD6F0 80240440 00000000 */ nop +glabel L80240444_DBD6F4 /* DBD6F4 80240444 0260202D */ daddu $a0, $s3, $zero /* DBD6F8 80240448 0280282D */ daddu $a1, $s4, $zero /* DBD6FC 8024044C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DBD700 80240450 02A0302D */ daddu $a2, $s5, $zero +glabel L80240454_DBD704 /* DBD704 80240454 0260202D */ daddu $a0, $s3, $zero /* DBD708 80240458 0280282D */ daddu $a1, $s4, $zero /* DBD70C 8024045C 0C012701 */ jal func_80049C04 /* DBD710 80240460 02A0302D */ daddu $a2, $s5, $zero /* DBD714 80240464 08090151 */ j .L80240544 /* DBD718 80240468 00000000 */ nop +glabel L8024046C_DBD71C /* DBD71C 8024046C 0260202D */ daddu $a0, $s3, $zero /* DBD720 80240470 0280282D */ daddu $a1, $s4, $zero /* DBD724 80240474 0C01278F */ jal func_80049E3C /* DBD728 80240478 02A0302D */ daddu $a2, $s5, $zero +glabel L8024047C_DBD72C /* DBD72C 8024047C 0260202D */ daddu $a0, $s3, $zero /* DBD730 80240480 0280282D */ daddu $a1, $s4, $zero /* DBD734 80240484 0C0127B3 */ jal func_80049ECC /* DBD738 80240488 02A0302D */ daddu $a2, $s5, $zero /* DBD73C 8024048C 08090151 */ j .L80240544 /* DBD740 80240490 00000000 */ nop +glabel L80240494_DBD744 /* DBD744 80240494 0260202D */ daddu $a0, $s3, $zero /* DBD748 80240498 0280282D */ daddu $a1, $s4, $zero /* DBD74C 8024049C 0C0127DF */ jal func_80049F7C /* DBD750 802404A0 02A0302D */ daddu $a2, $s5, $zero +glabel L802404A4_DBD754 /* DBD754 802404A4 0260202D */ daddu $a0, $s3, $zero /* DBD758 802404A8 0280282D */ daddu $a1, $s4, $zero /* DBD75C 802404AC 0C012849 */ jal func_8004A124 @@ -171,6 +179,7 @@ glabel func_80240238_DBD4E8 /* DBD768 802404B8 2402000E */ addiu $v0, $zero, 0xe /* DBD76C 802404BC 14620021 */ bne $v1, $v0, .L80240544 /* DBD770 802404C0 00000000 */ nop +glabel L802404C4_DBD774 /* DBD774 802404C4 0260202D */ daddu $a0, $s3, $zero /* DBD778 802404C8 0280282D */ daddu $a1, $s4, $zero /* DBD77C 802404CC 0C090000 */ jal func_80240000_DBD2B0 @@ -179,6 +188,7 @@ glabel func_80240238_DBD4E8 /* DBD788 802404D8 2402000F */ addiu $v0, $zero, 0xf /* DBD78C 802404DC 14620019 */ bne $v1, $v0, .L80240544 /* DBD790 802404E0 00000000 */ nop +glabel L802404E4_DBD794 /* DBD794 802404E4 0260202D */ daddu $a0, $s3, $zero /* DBD798 802404E8 0280282D */ daddu $a1, $s4, $zero /* DBD79C 802404EC 0C09001C */ jal func_80240070_DBD320 @@ -187,6 +197,7 @@ glabel func_80240238_DBD4E8 /* DBD7A8 802404F8 24020010 */ addiu $v0, $zero, 0x10 /* DBD7AC 802404FC 14620011 */ bne $v1, $v0, .L80240544 /* DBD7B0 80240500 00000000 */ nop +glabel L80240504_DBD7B4 /* DBD7B4 80240504 0260202D */ daddu $a0, $s3, $zero /* DBD7B8 80240508 0280282D */ daddu $a1, $s4, $zero /* DBD7BC 8024050C 0C090050 */ jal func_80240140_DBD3F0 @@ -195,15 +206,18 @@ glabel func_80240238_DBD4E8 /* DBD7C8 80240518 24020011 */ addiu $v0, $zero, 0x11 /* DBD7CC 8024051C 14620009 */ bne $v1, $v0, .L80240544 /* DBD7D0 80240520 00000000 */ nop +glabel L80240524_DBD7D4 /* DBD7D4 80240524 0260202D */ daddu $a0, $s3, $zero /* DBD7D8 80240528 0280282D */ daddu $a1, $s4, $zero /* DBD7DC 8024052C 0C090076 */ jal func_802401D8_DBD488 /* DBD7E0 80240530 02A0302D */ daddu $a2, $s5, $zero /* DBD7E4 80240534 08090151 */ j .L80240544 /* DBD7E8 80240538 00000000 */ nop +glabel L8024053C_DBD7EC /* DBD7EC 8024053C 0C0129CF */ jal func_8004A73C /* DBD7F0 80240540 0260202D */ daddu $a0, $s3, $zero .L80240544: +glabel L80240544_DBD7F4 /* DBD7F4 80240544 8FBF0060 */ lw $ra, 0x60($sp) /* DBD7F8 80240548 8FB5005C */ lw $s5, 0x5c($sp) /* DBD7FC 8024054C 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024056C_DBD81C.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024056C_DBD81C.s index 1205071b94..2da8d9cfec 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024056C_DBD81C.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024056C_DBD81C.s @@ -45,7 +45,7 @@ glabel func_8024056C_DBD81C /* DBD8B8 80240608 0C00A7B5 */ jal dist2D /* DBD8BC 8024060C 4600B386 */ mov.s $f14, $f22 /* DBD8C0 80240610 4614003C */ c.lt.s $f0, $f20 -/* DBD8C4 80240614 00000000 */ nop +/* DBD8C4 80240614 00000000 */ nop /* DBD8C8 80240618 45000003 */ bc1f .L80240628 /* DBD8CC 8024061C 2631000C */ addiu $s1, $s1, 0xc /* DBD8D0 80240620 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_8024056C_DBD81C /* DBD8FC 8024064C 8E6200D0 */ lw $v0, 0xd0($s3) /* DBD900 80240650 8C42007C */ lw $v0, 0x7c($v0) /* DBD904 80240654 04410004 */ bgez $v0, .L80240668 -/* DBD908 80240658 00000000 */ nop +/* DBD908 80240658 00000000 */ nop /* DBD90C 8024065C C6C00000 */ lwc1 $f0, ($s6) /* DBD910 80240660 080901A2 */ j .L80240688 /* DBD914 80240664 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_8024056C_DBD81C /* DBD918 80240668 3C018024 */ lui $at, %hi(D_80246D70) /* DBD91C 8024066C D4226D70 */ ldc1 $f2, %lo(D_80246D70)($at) /* DBD920 80240670 44820000 */ mtc1 $v0, $f0 -/* DBD924 80240674 00000000 */ nop +/* DBD924 80240674 00000000 */ nop /* DBD928 80240678 46800021 */ cvt.d.w $f0, $f0 /* DBD92C 8024067C 46220003 */ div.d $f0, $f0, $f2 /* DBD930 80240680 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802406C4_DBD974.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802406C4_DBD974.s index e9a963d341..50b6a78f5c 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802406C4_DBD974.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802406C4_DBD974.s @@ -44,7 +44,7 @@ glabel func_802406C4_DBD974 /* DBDA10 80240760 2402000F */ addiu $v0, $zero, 0xf /* DBDA14 80240764 AFA2001C */ sw $v0, 0x1c($sp) /* DBDA18 80240768 44833000 */ mtc1 $v1, $f6 -/* DBDA1C 8024076C 00000000 */ nop +/* DBDA1C 8024076C 00000000 */ nop /* DBDA20 80240770 468031A0 */ cvt.s.w $f6, $f6 /* DBDA24 80240774 44073000 */ mfc1 $a3, $f6 /* DBDA28 80240778 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_802406C4_DBD974 .L802407C8: /* DBDA78 802407C8 8602008C */ lh $v0, 0x8c($s0) /* DBDA7C 802407CC 1440005D */ bnez $v0, .L80240944 -/* DBDA80 802407D0 00000000 */ nop +/* DBDA80 802407D0 00000000 */ nop /* DBDA84 802407D4 C6000018 */ lwc1 $f0, 0x18($s0) /* DBDA88 802407D8 3C014010 */ lui $at, 0x4010 /* DBDA8C 802407DC 44811800 */ mtc1 $at, $f3 /* DBDA90 802407E0 44801000 */ mtc1 $zero, $f2 /* DBDA94 802407E4 46000021 */ cvt.d.s $f0, $f0 /* DBDA98 802407E8 4622003C */ c.lt.d $f0, $f2 -/* DBDA9C 802407EC 00000000 */ nop +/* DBDA9C 802407EC 00000000 */ nop /* DBDAA0 802407F0 45000003 */ bc1f .L80240800 /* DBDAA4 802407F4 0200202D */ daddu $a0, $s0, $zero /* DBDAA8 802407F8 08090201 */ j .L80240804 @@ -88,7 +88,7 @@ glabel func_802406C4_DBD974 /* DBDAB0 80240800 24050001 */ addiu $a1, $zero, 1 .L80240804: /* DBDAB4 80240804 0C00F598 */ jal func_8003D660 -/* DBDAB8 80240808 00000000 */ nop +/* DBDAB8 80240808 00000000 */ nop /* DBDABC 8024080C C60C0038 */ lwc1 $f12, 0x38($s0) /* DBDAC0 80240810 8E430078 */ lw $v1, 0x78($s2) /* DBDAC4 80240814 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_802406C4_DBD974 /* DBDAEC 8024083C 4406B000 */ mfc1 $a2, $f22 /* DBDAF0 80240840 4407A000 */ mfc1 $a3, $f20 /* DBDAF4 80240844 0C00A720 */ jal atan2 -/* DBDAF8 80240848 00000000 */ nop +/* DBDAF8 80240848 00000000 */ nop /* DBDAFC 8024084C 8E050018 */ lw $a1, 0x18($s0) /* DBDB00 80240850 44060000 */ mfc1 $a2, $f0 /* DBDB04 80240854 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_802406C4_DBD974 /* DBDB18 80240868 4406B000 */ mfc1 $a2, $f22 /* DBDB1C 8024086C 4407A000 */ mfc1 $a3, $f20 /* DBDB20 80240870 0C00A7B5 */ jal dist2D -/* DBDB24 80240874 00000000 */ nop +/* DBDB24 80240874 00000000 */ nop /* DBDB28 80240878 C6020018 */ lwc1 $f2, 0x18($s0) /* DBDB2C 8024087C 4602003E */ c.le.s $f0, $f2 -/* DBDB30 80240880 00000000 */ nop +/* DBDB30 80240880 00000000 */ nop /* DBDB34 80240884 4500002F */ bc1f .L80240944 /* DBDB38 80240888 240403E8 */ addiu $a0, $zero, 0x3e8 /* DBDB3C 8024088C 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_802406C4_DBD974 /* DBDB90 802408E0 18400003 */ blez $v0, .L802408F0 /* DBDB94 802408E4 24020004 */ addiu $v0, $zero, 4 /* DBDB98 802408E8 14600002 */ bnez $v1, .L802408F4 -/* DBDB9C 802408EC 00000000 */ nop +/* DBDB9C 802408EC 00000000 */ nop .L802408F0: /* DBDBA0 802408F0 AE420070 */ sw $v0, 0x70($s2) .L802408F4: diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240A2C_DBDCDC.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240A2C_DBDCDC.s index 4bd8d784b1..fd23ce1378 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240A2C_DBDCDC.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240A2C_DBDCDC.s @@ -38,7 +38,7 @@ glabel func_80240A2C_DBDCDC /* DBDD60 80240AB0 2402000F */ addiu $v0, $zero, 0xf /* DBDD64 80240AB4 AFA2001C */ sw $v0, 0x1c($sp) /* DBDD68 80240AB8 44833000 */ mtc1 $v1, $f6 -/* DBDD6C 80240ABC 00000000 */ nop +/* DBDD6C 80240ABC 00000000 */ nop /* DBDD70 80240AC0 468031A0 */ cvt.s.w $f6, $f6 /* DBDD74 80240AC4 44073000 */ mfc1 $a3, $f6 /* DBDD78 80240AC8 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_80240A2C_DBDCDC .L80240B2C: /* DBDDDC 80240B2C 8602008C */ lh $v0, 0x8c($s0) /* DBDDE0 80240B30 14400025 */ bnez $v0, .L80240BC8 -/* DBDDE4 80240B34 00000000 */ nop +/* DBDDE4 80240B34 00000000 */ nop /* DBDDE8 80240B38 9602008E */ lhu $v0, 0x8e($s0) /* DBDDEC 80240B3C 2442FFFF */ addiu $v0, $v0, -1 /* DBDDF0 80240B40 A602008E */ sh $v0, 0x8e($s0) /* DBDDF4 80240B44 00021400 */ sll $v0, $v0, 0x10 /* DBDDF8 80240B48 1440001F */ bnez $v0, .L80240BC8 -/* DBDDFC 80240B4C 00000000 */ nop +/* DBDDFC 80240B4C 00000000 */ nop /* DBDE00 80240B50 8E820074 */ lw $v0, 0x74($s4) /* DBDE04 80240B54 2442FFFF */ addiu $v0, $v0, -1 /* DBDE08 80240B58 10400019 */ beqz $v0, .L80240BC0 @@ -84,7 +84,7 @@ glabel func_80240A2C_DBDCDC /* DBDE14 80240B64 9442002A */ lhu $v0, 0x2a($v0) /* DBDE18 80240B68 30420010 */ andi $v0, $v0, 0x10 /* DBDE1C 80240B6C 14400007 */ bnez $v0, .L80240B8C -/* DBDE20 80240B70 00000000 */ nop +/* DBDE20 80240B70 00000000 */ nop /* DBDE24 80240B74 C600000C */ lwc1 $f0, 0xc($s0) /* DBDE28 80240B78 3C014334 */ lui $at, 0x4334 /* DBDE2C 80240B7C 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240BE8_DBDE98.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240BE8_DBDE98.s index a7c0ce000f..753c68842b 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240BE8_DBDE98.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240BE8_DBDE98.s @@ -28,7 +28,7 @@ glabel func_80240BE8_DBDE98 /* DBDEF0 80240C40 8E0200D0 */ lw $v0, 0xd0($s0) /* DBDEF4 80240C44 8C42007C */ lw $v0, 0x7c($v0) /* DBDEF8 80240C48 04410004 */ bgez $v0, .L80240C5C -/* DBDEFC 80240C4C 00000000 */ nop +/* DBDEFC 80240C4C 00000000 */ nop /* DBDF00 80240C50 C6400000 */ lwc1 $f0, ($s2) /* DBDF04 80240C54 0809031F */ j .L80240C7C /* DBDF08 80240C58 E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_80240BE8_DBDE98 /* DBDF0C 80240C5C 3C018024 */ lui $at, %hi(D_80246D78) /* DBDF10 80240C60 D4226D78 */ ldc1 $f2, %lo(D_80246D78)($at) /* DBDF14 80240C64 44820000 */ mtc1 $v0, $f0 -/* DBDF18 80240C68 00000000 */ nop +/* DBDF18 80240C68 00000000 */ nop /* DBDF1C 80240C6C 46800021 */ cvt.d.w $f0, $f0 /* DBDF20 80240C70 46220003 */ div.d $f0, $f0, $f2 /* DBDF24 80240C74 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240D88_DBE038.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240D88_DBE038.s index 19ff28e3ea..6ad9f29297 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240D88_DBE038.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240D88_DBE038.s @@ -47,20 +47,20 @@ glabel func_80240D88_DBE038 /* DBE0E0 80240E30 8E02001C */ lw $v0, 0x1c($s0) /* DBE0E4 80240E34 46001005 */ abs.s $f0, $f2 /* DBE0E8 80240E38 44822000 */ mtc1 $v0, $f4 -/* DBE0EC 80240E3C 00000000 */ nop +/* DBE0EC 80240E3C 00000000 */ nop /* DBE0F0 80240E40 46802120 */ cvt.s.w $f4, $f4 /* DBE0F4 80240E44 4600203C */ c.lt.s $f4, $f0 -/* DBE0F8 80240E48 00000000 */ nop +/* DBE0F8 80240E48 00000000 */ nop /* DBE0FC 80240E4C 4500000D */ bc1f .L80240E84 -/* DBE100 80240E50 00000000 */ nop +/* DBE100 80240E50 00000000 */ nop /* DBE104 80240E54 44800000 */ mtc1 $zero, $f0 /* DBE108 80240E58 C654000C */ lwc1 $f20, 0xc($s2) /* DBE10C 80240E5C 4600103C */ c.lt.s $f2, $f0 -/* DBE110 80240E60 00000000 */ nop +/* DBE110 80240E60 00000000 */ nop /* DBE114 80240E64 45000006 */ bc1f .L80240E80 /* DBE118 80240E68 00021023 */ negu $v0, $v0 /* DBE11C 80240E6C 44820000 */ mtc1 $v0, $f0 -/* DBE120 80240E70 00000000 */ nop +/* DBE120 80240E70 00000000 */ nop /* DBE124 80240E74 46800020 */ cvt.s.w $f0, $f0 /* DBE128 80240E78 080903A1 */ j .L80240E84 /* DBE12C 80240E7C 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240EB8_DBE168.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240EB8_DBE168.s index c096b0f6af..e0a587f689 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240EB8_DBE168.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240EB8_DBE168.s @@ -37,7 +37,7 @@ glabel func_80240EB8_DBE168 /* DBE1E8 80240F38 2402000F */ addiu $v0, $zero, 0xf /* DBE1EC 80240F3C AFA2001C */ sw $v0, 0x1c($sp) /* DBE1F0 80240F40 44833000 */ mtc1 $v1, $f6 -/* DBE1F4 80240F44 00000000 */ nop +/* DBE1F4 80240F44 00000000 */ nop /* DBE1F8 80240F48 468031A0 */ cvt.s.w $f6, $f6 /* DBE1FC 80240F4C 44073000 */ mfc1 $a3, $f6 /* DBE200 80240F50 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241040_DBE2F0.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241040_DBE2F0.s index 73899a8ed5..92c5499a14 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241040_DBE2F0.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241040_DBE2F0.s @@ -28,7 +28,7 @@ glabel func_80241040_DBE2F0 /* DBE348 80241098 C4400008 */ lwc1 $f0, 8($v0) /* DBE34C 8024109C 46800020 */ cvt.s.w $f0, $f0 /* DBE350 802410A0 4602003E */ c.le.s $f0, $f2 -/* DBE354 802410A4 00000000 */ nop +/* DBE354 802410A4 00000000 */ nop /* DBE358 802410A8 45020003 */ bc1fl .L802410B8 /* DBE35C 802410AC 24840001 */ addiu $a0, $a0, 1 /* DBE360 802410B0 08090432 */ j .L802410C8 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s index bb20c9b94e..dfbfe03a94 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s @@ -46,7 +46,7 @@ glabel func_80241100_DBE3B0 /* DBE454 802411A4 8E2200B0 */ lw $v0, 0xb0($s1) /* DBE458 802411A8 30420004 */ andi $v0, $v0, 4 /* DBE45C 802411AC 10400044 */ beqz $v0, .L802412C0 -/* DBE460 802411B0 00000000 */ nop +/* DBE460 802411B0 00000000 */ nop .L802411B4: /* DBE464 802411B4 2404F7FF */ addiu $a0, $zero, -0x801 /* DBE468 802411B8 AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80241100_DBE3B0 /* DBE51C 8024126C 3C0142C8 */ lui $at, 0x42c8 /* DBE520 80241270 44812000 */ mtc1 $at, $f4 /* DBE524 80241274 44823000 */ mtc1 $v0, $f6 -/* DBE528 80241278 00000000 */ nop +/* DBE528 80241278 00000000 */ nop /* DBE52C 8024127C 468031A0 */ cvt.s.w $f6, $f6 /* DBE530 80241280 27A20044 */ addiu $v0, $sp, 0x44 /* DBE534 80241284 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80241100_DBE3B0 /* DBE558 802412A8 0C0372DF */ jal func_800DCB7C /* DBE55C 802412AC 27A70040 */ addiu $a3, $sp, 0x40 /* DBE560 802412B0 10400003 */ beqz $v0, .L802412C0 -/* DBE564 802412B4 00000000 */ nop +/* DBE564 802412B4 00000000 */ nop /* DBE568 802412B8 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DBE56C 802412BC E640003C */ swc1 $f0, 0x3c($s2) .L802412C0: @@ -124,72 +124,85 @@ glabel func_80241100_DBE3B0 /* DBE574 802412C4 2C620064 */ sltiu $v0, $v1, 0x64 /* DBE578 802412C8 10400042 */ beqz $v0, .L802413D4 /* DBE57C 802412CC 00031080 */ sll $v0, $v1, 2 -/* DBE580 802412D0 3C018024 */ lui $at, %hi(D_80246D80) +/* DBE580 802412D0 3C018024 */ lui $at, %hi(jtbl_80246D80_DC4030) /* DBE584 802412D4 00220821 */ addu $at, $at, $v0 -/* DBE588 802412D8 8C226D80 */ lw $v0, %lo(D_80246D80)($at) +/* DBE588 802412D8 8C226D80 */ lw $v0, %lo(jtbl_80246D80_DC4030)($at) /* DBE58C 802412DC 00400008 */ jr $v0 -/* DBE590 802412E0 00000000 */ nop +/* DBE590 802412E0 00000000 */ nop +glabel L802412E4_DBE594 /* DBE594 802412E4 0280202D */ daddu $a0, $s4, $zero /* DBE598 802412E8 0260282D */ daddu $a1, $s3, $zero /* DBE59C 802412EC 0C09015B */ jal func_8024056C_DBD81C /* DBE5A0 802412F0 02A0302D */ daddu $a2, $s5, $zero +glabel L802412F4_DBE5A4 /* DBE5A4 802412F4 0280202D */ daddu $a0, $s4, $zero /* DBE5A8 802412F8 0260282D */ daddu $a1, $s3, $zero /* DBE5AC 802412FC 0C0901B1 */ jal func_802406C4_DBD974 /* DBE5B0 80241300 02A0302D */ daddu $a2, $s5, $zero /* DBE5B4 80241304 080904F5 */ j .L802413D4 -/* DBE5B8 80241308 00000000 */ nop +/* DBE5B8 80241308 00000000 */ nop +glabel L8024130C_DBE5BC /* DBE5BC 8024130C 0280202D */ daddu $a0, $s4, $zero /* DBE5C0 80241310 0260282D */ daddu $a1, $s3, $zero /* DBE5C4 80241314 0C09025B */ jal omo_07_UnkNpcAIFunc1 /* DBE5C8 80241318 02A0302D */ daddu $a2, $s5, $zero +glabel L8024131C_DBE5CC /* DBE5CC 8024131C 0280202D */ daddu $a0, $s4, $zero /* DBE5D0 80241320 0260282D */ daddu $a1, $s3, $zero /* DBE5D4 80241324 0C09028B */ jal func_80240A2C_DBDCDC /* DBE5D8 80241328 02A0302D */ daddu $a2, $s5, $zero /* DBE5DC 8024132C 080904F5 */ j .L802413D4 -/* DBE5E0 80241330 00000000 */ nop +/* DBE5E0 80241330 00000000 */ nop +glabel L80241334_DBE5E4 /* DBE5E4 80241334 0280202D */ daddu $a0, $s4, $zero /* DBE5E8 80241338 0260282D */ daddu $a1, $s3, $zero /* DBE5EC 8024133C 0C0902FA */ jal func_80240BE8_DBDE98 /* DBE5F0 80241340 02A0302D */ daddu $a2, $s5, $zero /* DBE5F4 80241344 080904F5 */ j .L802413D4 -/* DBE5F8 80241348 00000000 */ nop +/* DBE5F8 80241348 00000000 */ nop +glabel L8024134C_DBE5FC /* DBE5FC 8024134C 0280202D */ daddu $a0, $s4, $zero /* DBE600 80241350 0260282D */ daddu $a1, $s3, $zero /* DBE604 80241354 0C090327 */ jal omo_07_NpcJumpFunc2 /* DBE608 80241358 02A0302D */ daddu $a2, $s5, $zero +glabel L8024135C_DBE60C /* DBE60C 8024135C 0280202D */ daddu $a0, $s4, $zero /* DBE610 80241360 0260282D */ daddu $a1, $s3, $zero /* DBE614 80241364 0C090344 */ jal omo_07_NpcJumpFunc /* DBE618 80241368 02A0302D */ daddu $a2, $s5, $zero /* DBE61C 8024136C 080904F5 */ j .L802413D4 -/* DBE620 80241370 00000000 */ nop +/* DBE620 80241370 00000000 */ nop +glabel L80241374_DBE624 /* DBE624 80241374 0280202D */ daddu $a0, $s4, $zero /* DBE628 80241378 0260282D */ daddu $a1, $s3, $zero /* DBE62C 8024137C 0C090362 */ jal func_80240D88_DBE038 /* DBE630 80241380 02A0302D */ daddu $a2, $s5, $zero +glabel L80241384_DBE634 /* DBE634 80241384 0280202D */ daddu $a0, $s4, $zero /* DBE638 80241388 0260282D */ daddu $a1, $s3, $zero /* DBE63C 8024138C 0C0903AE */ jal func_80240EB8_DBE168 /* DBE640 80241390 02A0302D */ daddu $a2, $s5, $zero /* DBE644 80241394 080904F5 */ j .L802413D4 -/* DBE648 80241398 00000000 */ nop +/* DBE648 80241398 00000000 */ nop +glabel L8024139C_DBE64C /* DBE64C 8024139C 0280202D */ daddu $a0, $s4, $zero /* DBE650 802413A0 0260282D */ daddu $a1, $s3, $zero /* DBE654 802413A4 0C0903F6 */ jal omo_07_UnkNpcDurationFlagFunc /* DBE658 802413A8 02A0302D */ daddu $a2, $s5, $zero /* DBE65C 802413AC 080904F5 */ j .L802413D4 -/* DBE660 802413B0 00000000 */ nop +/* DBE660 802413B0 00000000 */ nop +glabel L802413B4_DBE664 /* DBE664 802413B4 0280202D */ daddu $a0, $s4, $zero /* DBE668 802413B8 0260282D */ daddu $a1, $s3, $zero /* DBE66C 802413BC 0C090410 */ jal func_80241040_DBE2F0 /* DBE670 802413C0 02A0302D */ daddu $a2, $s5, $zero /* DBE674 802413C4 080904F5 */ j .L802413D4 -/* DBE678 802413C8 00000000 */ nop +/* DBE678 802413C8 00000000 */ nop +glabel L802413CC_DBE67C /* DBE67C 802413CC 0C0129CF */ jal func_8004A73C /* DBE680 802413D0 0280202D */ daddu $a0, $s4, $zero .L802413D4: +glabel L802413D4_DBE684 /* DBE684 802413D4 8FBF0060 */ lw $ra, 0x60($sp) /* DBE688 802413D8 8FB5005C */ lw $s5, 0x5c($sp) /* DBE68C 802413DC 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802413FC_DBE6AC.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802413FC_DBE6AC.s index 31149461f1..1dcad0bc8e 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802413FC_DBE6AC.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802413FC_DBE6AC.s @@ -15,7 +15,7 @@ glabel func_802413FC_DBE6AC /* DBE6D4 80241424 D4226F10 */ ldc1 $f2, %lo(D_80246F10)($at) /* DBE6D8 80241428 46000021 */ cvt.d.s $f0, $f0 /* DBE6DC 8024142C 46220002 */ mul.d $f0, $f0, $f2 -/* DBE6E0 80241430 00000000 */ nop +/* DBE6E0 80241430 00000000 */ nop /* DBE6E4 80241434 46200020 */ cvt.s.d $f0, $f0 /* DBE6E8 80241438 E4400018 */ swc1 $f0, 0x18($v0) /* DBE6EC 8024143C 8E0300CC */ lw $v1, 0xcc($s0) diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024146C_DBE71C.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024146C_DBE71C.s index 23bee98ba0..8bd7374c1e 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024146C_DBE71C.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024146C_DBE71C.s @@ -22,7 +22,7 @@ glabel func_8024146C_DBE71C /* DBE760 802414B0 0C0129E1 */ jal func_8004A784 /* DBE764 802414B4 0000382D */ daddu $a3, $zero, $zero /* DBE768 802414B8 14400005 */ bnez $v0, .L802414D0 -/* DBE76C 802414BC 00000000 */ nop +/* DBE76C 802414BC 00000000 */ nop /* DBE770 802414C0 8E050018 */ lw $a1, 0x18($s0) /* DBE774 802414C4 8E06000C */ lw $a2, 0xc($s0) /* DBE778 802414C8 0C00EA95 */ jal npc_move_heading @@ -33,13 +33,13 @@ glabel func_8024146C_DBE71C /* DBE788 802414D8 A602008E */ sh $v0, 0x8e($s0) /* DBE78C 802414DC 00021400 */ sll $v0, $v0, 0x10 /* DBE790 802414E0 14400010 */ bnez $v0, .L80241524 -/* DBE794 802414E4 00000000 */ nop +/* DBE794 802414E4 00000000 */ nop /* DBE798 802414E8 C6000018 */ lwc1 $f0, 0x18($s0) /* DBE79C 802414EC 3C018024 */ lui $at, %hi(D_80246F18) /* DBE7A0 802414F0 D4226F18 */ ldc1 $f2, %lo(D_80246F18)($at) /* DBE7A4 802414F4 46000021 */ cvt.d.s $f0, $f0 /* DBE7A8 802414F8 46220002 */ mul.d $f0, $f0, $f2 -/* DBE7AC 802414FC 00000000 */ nop +/* DBE7AC 802414FC 00000000 */ nop /* DBE7B0 80241500 46200020 */ cvt.s.d $f0, $f0 /* DBE7B4 80241504 E6000018 */ swc1 $f0, 0x18($s0) /* DBE7B8 80241508 8E2200CC */ lw $v0, 0xcc($s1) diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024153C_DBE7EC.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024153C_DBE7EC.s index 401f97ee86..1b9fcfd3ba 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024153C_DBE7EC.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024153C_DBE7EC.s @@ -21,7 +21,7 @@ glabel func_8024153C_DBE7EC /* DBE82C 8024157C 0C0129E1 */ jal func_8004A784 /* DBE830 80241580 0000382D */ daddu $a3, $zero, $zero /* DBE834 80241584 14400005 */ bnez $v0, .L8024159C -/* DBE838 80241588 00000000 */ nop +/* DBE838 80241588 00000000 */ nop /* DBE83C 8024158C 8E050018 */ lw $a1, 0x18($s0) /* DBE840 80241590 8E06000C */ lw $a2, 0xc($s0) /* DBE844 80241594 0C00EA95 */ jal npc_move_heading diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802415D4_DBE884.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802415D4_DBE884.s index 2528bcfcc6..102b24d823 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802415D4_DBE884.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802415D4_DBE884.s @@ -16,7 +16,7 @@ glabel func_802415D4_DBE884 /* DBE8B0 80241600 A462008E */ sh $v0, 0x8e($v1) /* DBE8B4 80241604 00021400 */ sll $v0, $v0, 0x10 /* DBE8B8 80241608 14400005 */ bnez $v0, .L80241620 -/* DBE8BC 8024160C 00000000 */ nop +/* DBE8BC 8024160C 00000000 */ nop /* DBE8C0 80241610 8E0200CC */ lw $v0, 0xcc($s0) /* DBE8C4 80241614 8C420000 */ lw $v0, ($v0) /* DBE8C8 80241618 AC620028 */ sw $v0, 0x28($v1) diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s index 7e9621b20c..1205b5bd8e 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s @@ -46,7 +46,7 @@ glabel func_80241634_DBE8E4 /* DBE988 802416D8 8E2200B0 */ lw $v0, 0xb0($s1) /* DBE98C 802416DC 30420004 */ andi $v0, $v0, 4 /* DBE990 802416E0 10400044 */ beqz $v0, .L802417F4 -/* DBE994 802416E4 00000000 */ nop +/* DBE994 802416E4 00000000 */ nop .L802416E8: /* DBE998 802416E8 2404F7FF */ addiu $a0, $zero, -0x801 /* DBE99C 802416EC AE600070 */ sw $zero, 0x70($s3) @@ -101,7 +101,7 @@ glabel func_80241634_DBE8E4 /* DBEA50 802417A0 3C0142C8 */ lui $at, 0x42c8 /* DBEA54 802417A4 44812000 */ mtc1 $at, $f4 /* DBEA58 802417A8 44823000 */ mtc1 $v0, $f6 -/* DBEA5C 802417AC 00000000 */ nop +/* DBEA5C 802417AC 00000000 */ nop /* DBEA60 802417B0 468031A0 */ cvt.s.w $f6, $f6 /* DBEA64 802417B4 27A20044 */ addiu $v0, $sp, 0x44 /* DBEA68 802417B8 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80241634_DBE8E4 /* DBEA8C 802417DC 0C0372DF */ jal func_800DCB7C /* DBEA90 802417E0 27A70040 */ addiu $a3, $sp, 0x40 /* DBEA94 802417E4 10400003 */ beqz $v0, .L802417F4 -/* DBEA98 802417E8 00000000 */ nop +/* DBEA98 802417E8 00000000 */ nop /* DBEA9C 802417EC C7A0003C */ lwc1 $f0, 0x3c($sp) /* DBEAA0 802417F0 E640003C */ swc1 $f0, 0x3c($s2) .L802417F4: @@ -124,57 +124,67 @@ glabel func_80241634_DBE8E4 /* DBEAA8 802417F8 2C620064 */ sltiu $v0, $v1, 0x64 /* DBEAAC 802417FC 10400054 */ beqz $v0, .L80241950 /* DBEAB0 80241800 00031080 */ sll $v0, $v1, 2 -/* DBEAB4 80241804 3C018024 */ lui $at, %hi(D_80246F20) +/* DBEAB4 80241804 3C018024 */ lui $at, %hi(jtbl_80246F20_DC41D0) /* DBEAB8 80241808 00220821 */ addu $at, $at, $v0 -/* DBEABC 8024180C 8C226F20 */ lw $v0, %lo(D_80246F20)($at) +/* DBEABC 8024180C 8C226F20 */ lw $v0, %lo(jtbl_80246F20_DC41D0)($at) /* DBEAC0 80241810 00400008 */ jr $v0 -/* DBEAC4 80241814 00000000 */ nop +/* DBEAC4 80241814 00000000 */ nop +glabel L80241818_DBEAC8 /* DBEAC8 80241818 0260202D */ daddu $a0, $s3, $zero /* DBEACC 8024181C 0280282D */ daddu $a1, $s4, $zero /* DBEAD0 80241820 0C09015B */ jal func_8024056C_DBD81C /* DBEAD4 80241824 02A0302D */ daddu $a2, $s5, $zero +glabel L80241828_DBEAD8 /* DBEAD8 80241828 0260202D */ daddu $a0, $s3, $zero /* DBEADC 8024182C 0280282D */ daddu $a1, $s4, $zero /* DBEAE0 80241830 0C0901B1 */ jal func_802406C4_DBD974 /* DBEAE4 80241834 02A0302D */ daddu $a2, $s5, $zero /* DBEAE8 80241838 08090654 */ j .L80241950 -/* DBEAEC 8024183C 00000000 */ nop +/* DBEAEC 8024183C 00000000 */ nop +glabel L80241840_DBEAF0 /* DBEAF0 80241840 0260202D */ daddu $a0, $s3, $zero /* DBEAF4 80241844 0280282D */ daddu $a1, $s4, $zero /* DBEAF8 80241848 0C09025B */ jal omo_07_UnkNpcAIFunc1 /* DBEAFC 8024184C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241850_DBEB00 /* DBEB00 80241850 0260202D */ daddu $a0, $s3, $zero /* DBEB04 80241854 0280282D */ daddu $a1, $s4, $zero /* DBEB08 80241858 0C09028B */ jal func_80240A2C_DBDCDC /* DBEB0C 8024185C 02A0302D */ daddu $a2, $s5, $zero /* DBEB10 80241860 08090654 */ j .L80241950 -/* DBEB14 80241864 00000000 */ nop +/* DBEB14 80241864 00000000 */ nop +glabel L80241868_DBEB18 /* DBEB18 80241868 0260202D */ daddu $a0, $s3, $zero /* DBEB1C 8024186C 0280282D */ daddu $a1, $s4, $zero /* DBEB20 80241870 0C0902FA */ jal func_80240BE8_DBDE98 /* DBEB24 80241874 02A0302D */ daddu $a2, $s5, $zero /* DBEB28 80241878 08090654 */ j .L80241950 -/* DBEB2C 8024187C 00000000 */ nop +/* DBEB2C 8024187C 00000000 */ nop +glabel L80241880_DBEB30 /* DBEB30 80241880 0260202D */ daddu $a0, $s3, $zero /* DBEB34 80241884 0280282D */ daddu $a1, $s4, $zero /* DBEB38 80241888 0C090327 */ jal omo_07_NpcJumpFunc2 /* DBEB3C 8024188C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241890_DBEB40 /* DBEB40 80241890 0260202D */ daddu $a0, $s3, $zero /* DBEB44 80241894 0280282D */ daddu $a1, $s4, $zero /* DBEB48 80241898 0C090344 */ jal omo_07_NpcJumpFunc /* DBEB4C 8024189C 02A0302D */ daddu $a2, $s5, $zero /* DBEB50 802418A0 08090654 */ j .L80241950 -/* DBEB54 802418A4 00000000 */ nop +/* DBEB54 802418A4 00000000 */ nop +glabel L802418A8_DBEB58 /* DBEB58 802418A8 0260202D */ daddu $a0, $s3, $zero /* DBEB5C 802418AC 0280282D */ daddu $a1, $s4, $zero /* DBEB60 802418B0 0C090362 */ jal func_80240D88_DBE038 /* DBEB64 802418B4 02A0302D */ daddu $a2, $s5, $zero +glabel L802418B8_DBEB68 /* DBEB68 802418B8 0260202D */ daddu $a0, $s3, $zero /* DBEB6C 802418BC 0280282D */ daddu $a1, $s4, $zero /* DBEB70 802418C0 0C0903AE */ jal func_80240EB8_DBE168 /* DBEB74 802418C4 02A0302D */ daddu $a2, $s5, $zero /* DBEB78 802418C8 08090654 */ j .L80241950 -/* DBEB7C 802418CC 00000000 */ nop +/* DBEB7C 802418CC 00000000 */ nop +glabel L802418D0_DBEB80 /* DBEB80 802418D0 0260202D */ daddu $a0, $s3, $zero /* DBEB84 802418D4 0280282D */ daddu $a1, $s4, $zero /* DBEB88 802418D8 0C0904FF */ jal func_802413FC_DBE6AC @@ -182,7 +192,8 @@ glabel func_80241634_DBE8E4 /* DBEB90 802418E0 8E630070 */ lw $v1, 0x70($s3) /* DBEB94 802418E4 2402000F */ addiu $v0, $zero, 0xf /* DBEB98 802418E8 14620019 */ bne $v1, $v0, .L80241950 -/* DBEB9C 802418EC 00000000 */ nop +/* DBEB9C 802418EC 00000000 */ nop +glabel L802418F0_DBEBA0 /* DBEBA0 802418F0 0260202D */ daddu $a0, $s3, $zero /* DBEBA4 802418F4 0280282D */ daddu $a1, $s4, $zero /* DBEBA8 802418F8 0C09051B */ jal func_8024146C_DBE71C @@ -190,7 +201,8 @@ glabel func_80241634_DBE8E4 /* DBEBB0 80241900 8E630070 */ lw $v1, 0x70($s3) /* DBEBB4 80241904 24020010 */ addiu $v0, $zero, 0x10 /* DBEBB8 80241908 14620011 */ bne $v1, $v0, .L80241950 -/* DBEBBC 8024190C 00000000 */ nop +/* DBEBBC 8024190C 00000000 */ nop +glabel L80241910_DBEBC0 /* DBEBC0 80241910 0260202D */ daddu $a0, $s3, $zero /* DBEBC4 80241914 0280282D */ daddu $a1, $s4, $zero /* DBEBC8 80241918 0C09054F */ jal func_8024153C_DBE7EC @@ -198,16 +210,19 @@ glabel func_80241634_DBE8E4 /* DBEBD0 80241920 8E630070 */ lw $v1, 0x70($s3) /* DBEBD4 80241924 24020011 */ addiu $v0, $zero, 0x11 /* DBEBD8 80241928 14620009 */ bne $v1, $v0, .L80241950 -/* DBEBDC 8024192C 00000000 */ nop +/* DBEBDC 8024192C 00000000 */ nop +glabel L80241930_DBEBE0 /* DBEBE0 80241930 0260202D */ daddu $a0, $s3, $zero /* DBEBE4 80241934 0280282D */ daddu $a1, $s4, $zero /* DBEBE8 80241938 0C090575 */ jal func_802415D4_DBE884 /* DBEBEC 8024193C 02A0302D */ daddu $a2, $s5, $zero /* DBEBF0 80241940 08090654 */ j .L80241950 -/* DBEBF4 80241944 00000000 */ nop +/* DBEBF4 80241944 00000000 */ nop +glabel L80241948_DBEBF8 /* DBEBF8 80241948 0C0129CF */ jal func_8004A73C /* DBEBFC 8024194C 0260202D */ daddu $a0, $s3, $zero .L80241950: +glabel L80241950_DBEC00 /* DBEC00 80241950 8FBF0060 */ lw $ra, 0x60($sp) /* DBEC04 80241954 8FB5005C */ lw $s5, 0x5c($sp) /* DBEC08 80241958 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241978_DBEC28.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241978_DBEC28.s index ad89348d52..3da3919cac 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241978_DBEC28.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241978_DBEC28.s @@ -47,7 +47,7 @@ glabel func_80241978_DBEC28 /* DBECD0 80241A20 0C0123F5 */ jal is_point_within_region /* DBECD4 80241A24 8E070038 */ lw $a3, 0x38($s0) /* DBECD8 80241A28 1040000E */ beqz $v0, .L80241A64 -/* DBECDC 80241A2C 00000000 */ nop +/* DBECDC 80241A2C 00000000 */ nop /* DBECE0 80241A30 8E2200D0 */ lw $v0, 0xd0($s1) /* DBECE4 80241A34 C60C0038 */ lwc1 $f12, 0x38($s0) /* DBECE8 80241A38 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80241978_DBEC28 /* DBECFC 80241A4C 468031A0 */ cvt.s.w $f6, $f6 /* DBED00 80241A50 44073000 */ mfc1 $a3, $f6 /* DBED04 80241A54 0C00A720 */ jal atan2 -/* DBED08 80241A58 00000000 */ nop +/* DBED08 80241A58 00000000 */ nop /* DBED0C 80241A5C 080906A5 */ j .L80241A94 /* DBED10 80241A60 E600000C */ swc1 $f0, 0xc($s0) .L80241A64: @@ -66,7 +66,7 @@ glabel func_80241978_DBEC28 /* DBED18 80241A68 2404003C */ addiu $a0, $zero, 0x3c /* DBED1C 80241A6C C60C000C */ lwc1 $f12, 0xc($s0) /* DBED20 80241A70 44820000 */ mtc1 $v0, $f0 -/* DBED24 80241A74 00000000 */ nop +/* DBED24 80241A74 00000000 */ nop /* DBED28 80241A78 46800020 */ cvt.s.w $f0, $f0 /* DBED2C 80241A7C 46006300 */ add.s $f12, $f12, $f0 /* DBED30 80241A80 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80241978_DBEC28 /* DBED54 80241AA4 8E2200D0 */ lw $v0, 0xd0($s1) /* DBED58 80241AA8 8C420014 */ lw $v0, 0x14($v0) /* DBED5C 80241AAC 04410004 */ bgez $v0, .L80241AC0 -/* DBED60 80241AB0 00000000 */ nop +/* DBED60 80241AB0 00000000 */ nop /* DBED64 80241AB4 C6400000 */ lwc1 $f0, ($s2) /* DBED68 80241AB8 080906B8 */ j .L80241AE0 /* DBED6C 80241ABC E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80241978_DBEC28 /* DBED70 80241AC0 3C018024 */ lui $at, %hi(pause_badges_count_equipped) /* DBED74 80241AC4 D42270B0 */ ldc1 $f2, %lo(pause_badges_count_equipped)($at) /* DBED78 80241AC8 44820000 */ mtc1 $v0, $f0 -/* DBED7C 80241ACC 00000000 */ nop +/* DBED7C 80241ACC 00000000 */ nop /* DBED80 80241AD0 46800021 */ cvt.d.w $f0, $f0 /* DBED84 80241AD4 46220003 */ div.d $f0, $f0, $f2 /* DBED88 80241AD8 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80241978_DBEC28 /* DBED9C 80241AEC 44801000 */ mtc1 $zero, $f2 /* DBEDA0 80241AF0 46000021 */ cvt.d.s $f0, $f0 /* DBEDA4 80241AF4 46220002 */ mul.d $f0, $f0, $f2 -/* DBEDA8 80241AF8 00000000 */ nop +/* DBEDA8 80241AF8 00000000 */ nop /* DBEDAC 80241AFC 24020001 */ addiu $v0, $zero, 1 /* DBEDB0 80241B00 4620018D */ trunc.w.d $f6, $f0 /* DBEDB4 80241B04 E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241B28_DBEDD8.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241B28_DBEDD8.s index 891993ff14..2c09fad4a4 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241B28_DBEDD8.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241B28_DBEDD8.s @@ -34,7 +34,7 @@ glabel func_80241B28_DBEDD8 /* DBEE4C 80241B9C 44803000 */ mtc1 $zero, $f6 /* DBEE50 80241BA0 46000021 */ cvt.d.s $f0, $f0 /* DBEE54 80241BA4 46260002 */ mul.d $f0, $f0, $f6 -/* DBEE58 80241BA8 00000000 */ nop +/* DBEE58 80241BA8 00000000 */ nop /* DBEE5C 80241BAC 24020001 */ addiu $v0, $zero, 1 /* DBEE60 80241BB0 8E24006C */ lw $a0, 0x6c($s1) /* DBEE64 80241BB4 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80241B28_DBEDD8 /* DBEEC0 80241C10 C600003C */ lwc1 $f0, 0x3c($s0) /* DBEEC4 80241C14 4600C001 */ sub.s $f0, $f24, $f0 /* DBEEC8 80241C18 4600B03C */ c.lt.s $f22, $f0 -/* DBEECC 80241C1C 00000000 */ nop +/* DBEECC 80241C1C 00000000 */ nop /* DBEED0 80241C20 4500001B */ bc1f .L80241C90 /* DBEED4 80241C24 34820010 */ ori $v0, $a0, 0x10 /* DBEED8 80241C28 08090724 */ j .L80241C90 @@ -87,9 +87,9 @@ glabel func_80241B28_DBEDD8 /* DBEF1C 80241C6C C7A00034 */ lwc1 $f0, 0x34($sp) /* DBEF20 80241C70 4600D001 */ sub.s $f0, $f26, $f0 /* DBEF24 80241C74 4600B03C */ c.lt.s $f22, $f0 -/* DBEF28 80241C78 00000000 */ nop +/* DBEF28 80241C78 00000000 */ nop /* DBEF2C 80241C7C 45000004 */ bc1f .L80241C90 -/* DBEF30 80241C80 00000000 */ nop +/* DBEF30 80241C80 00000000 */ nop /* DBEF34 80241C84 8E22006C */ lw $v0, 0x6c($s1) /* DBEF38 80241C88 34420010 */ ori $v0, $v0, 0x10 /* DBEF3C 80241C8C AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80241B28_DBEDD8 /* DBEF44 80241C94 24030011 */ addiu $v1, $zero, 0x11 /* DBEF48 80241C98 30420011 */ andi $v0, $v0, 0x11 /* DBEF4C 80241C9C 14430039 */ bne $v0, $v1, .L80241D84 -/* DBEF50 80241CA0 00000000 */ nop +/* DBEF50 80241CA0 00000000 */ nop /* DBEF54 80241CA4 8E020000 */ lw $v0, ($s0) /* DBEF58 80241CA8 30420008 */ andi $v0, $v0, 8 /* DBEF5C 80241CAC 1040000A */ beqz $v0, .L80241CD8 @@ -108,7 +108,7 @@ glabel func_80241B28_DBEDD8 /* DBEF6C 80241CBC D42070B8 */ ldc1 $f0, %lo(D_802470B8)($at) /* DBEF70 80241CC0 460010A1 */ cvt.d.s $f2, $f2 /* DBEF74 80241CC4 46201082 */ mul.d $f2, $f2, $f0 -/* DBEF78 80241CC8 00000000 */ nop +/* DBEF78 80241CC8 00000000 */ nop /* DBEF7C 80241CCC 4600A021 */ cvt.d.s $f0, $f20 /* DBEF80 80241CD0 0809074F */ j .L80241D3C /* DBEF84 80241CD4 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80241B28_DBEDD8 /* DBEFD4 80241D24 D42070C0 */ ldc1 $f0, %lo(D_802470C0)($at) /* DBEFD8 80241D28 460010A1 */ cvt.d.s $f2, $f2 /* DBEFDC 80241D2C 46201082 */ mul.d $f2, $f2, $f0 -/* DBEFE0 80241D30 00000000 */ nop +/* DBEFE0 80241D30 00000000 */ nop /* DBEFE4 80241D34 4600A021 */ cvt.d.s $f0, $f20 /* DBEFE8 80241D38 46220000 */ add.d $f0, $f0, $f2 .L80241D3C: @@ -149,7 +149,7 @@ glabel func_80241B28_DBEDD8 /* DBF008 80241D58 46000005 */ abs.s $f0, $f0 /* DBF00C 80241D5C 46000021 */ cvt.d.s $f0, $f0 /* DBF010 80241D60 4622003C */ c.lt.d $f0, $f2 -/* DBF014 80241D64 00000000 */ nop +/* DBF014 80241D64 00000000 */ nop /* DBF018 80241D68 45000036 */ bc1f .L80241E44 /* DBF01C 80241D6C 2403FFEF */ addiu $v1, $zero, -0x11 /* DBF020 80241D70 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80241B28_DBEDD8 .L80241D84: /* DBF034 80241D84 8E220070 */ lw $v0, 0x70($s1) /* DBF038 80241D88 1840002E */ blez $v0, .L80241E44 -/* DBF03C 80241D8C 00000000 */ nop +/* DBF03C 80241D8C 00000000 */ nop /* DBF040 80241D90 C62C0074 */ lwc1 $f12, 0x74($s1) /* DBF044 80241D94 0C00A8BB */ jal sin_deg /* DBF048 80241D98 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80241B28_DBEDD8 /* DBF0A0 80241DF0 27A70030 */ addiu $a3, $sp, 0x30 .L80241DF4: /* DBF0A4 80241DF4 10400007 */ beqz $v0, .L80241E14 -/* DBF0A8 80241DF8 00000000 */ nop +/* DBF0A8 80241DF8 00000000 */ nop /* DBF0AC 80241DFC 4616A082 */ mul.s $f2, $f20, $f22 -/* DBF0B0 80241E00 00000000 */ nop +/* DBF0B0 80241E00 00000000 */ nop /* DBF0B4 80241E04 C7A0002C */ lwc1 $f0, 0x2c($sp) /* DBF0B8 80241E08 461A0000 */ add.s $f0, $f0, $f26 /* DBF0BC 80241E0C 08090788 */ j .L80241E20 /* DBF0C0 80241E10 46020000 */ add.s $f0, $f0, $f2 .L80241E14: /* DBF0C4 80241E14 4616A002 */ mul.s $f0, $f20, $f22 -/* DBF0C8 80241E18 00000000 */ nop +/* DBF0C8 80241E18 00000000 */ nop /* DBF0CC 80241E1C 4600C000 */ add.s $f0, $f24, $f0 .L80241E20: /* DBF0D0 80241E20 E600003C */ swc1 $f0, 0x3c($s0) /* DBF0D4 80241E24 8E220074 */ lw $v0, 0x74($s1) /* DBF0D8 80241E28 2442000A */ addiu $v0, $v0, 0xa /* DBF0DC 80241E2C 44826000 */ mtc1 $v0, $f12 -/* DBF0E0 80241E30 00000000 */ nop +/* DBF0E0 80241E30 00000000 */ nop /* DBF0E4 80241E34 0C00A6C9 */ jal clamp_angle /* DBF0E8 80241E38 46806320 */ cvt.s.w $f12, $f12 /* DBF0EC 80241E3C 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80241B28_DBEDD8 /* DBF0FC 80241E4C 2442FFFF */ addiu $v0, $v0, -1 /* DBF100 80241E50 8E430014 */ lw $v1, 0x14($s2) /* DBF104 80241E54 04600048 */ bltz $v1, .L80241F78 -/* DBF108 80241E58 00000000 */ nop +/* DBF108 80241E58 00000000 */ nop /* DBF10C 80241E5C 8E620074 */ lw $v0, 0x74($s3) /* DBF110 80241E60 1C400042 */ bgtz $v0, .L80241F6C /* DBF114 80241E64 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80241B28_DBEDD8 /* DBF11C 80241E6C 860200A8 */ lh $v0, 0xa8($s0) /* DBF120 80241E70 C602003C */ lwc1 $f2, 0x3c($s0) /* DBF124 80241E74 44820000 */ mtc1 $v0, $f0 -/* DBF128 80241E78 00000000 */ nop +/* DBF128 80241E78 00000000 */ nop /* DBF12C 80241E7C 46800020 */ cvt.s.w $f0, $f0 /* DBF130 80241E80 46001080 */ add.s $f2, $f2, $f0 /* DBF134 80241E84 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80241B28_DBEDD8 /* DBF150 80241EA0 C440002C */ lwc1 $f0, 0x2c($v0) /* DBF154 80241EA4 46000021 */ cvt.d.s $f0, $f0 /* DBF158 80241EA8 4622003C */ c.lt.d $f0, $f2 -/* DBF15C 80241EAC 00000000 */ nop +/* DBF15C 80241EAC 00000000 */ nop /* DBF160 80241EB0 4500002C */ bc1f .L80241F64 /* DBF164 80241EB4 02A0202D */ daddu $a0, $s5, $zero /* DBF168 80241EB8 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80241B28_DBEDD8 /* DBF1A4 80241EF4 3C01C1A0 */ lui $at, 0xc1a0 /* DBF1A8 80241EF8 44812000 */ mtc1 $at, $f4 /* DBF1AC 80241EFC 44834000 */ mtc1 $v1, $f8 -/* DBF1B0 80241F00 00000000 */ nop +/* DBF1B0 80241F00 00000000 */ nop /* DBF1B4 80241F04 46804220 */ cvt.s.w $f8, $f8 /* DBF1B8 80241F08 44074000 */ mfc1 $a3, $f8 /* DBF1BC 80241F0C 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80241B28_DBEDD8 /* DBF270 80241FC0 0C0123F5 */ jal is_point_within_region /* DBF274 80241FC4 8E070038 */ lw $a3, 0x38($s0) /* DBF278 80241FC8 1040001A */ beqz $v0, .L80242034 -/* DBF27C 80241FCC 00000000 */ nop +/* DBF27C 80241FCC 00000000 */ nop /* DBF280 80241FD0 8E060038 */ lw $a2, 0x38($s0) /* DBF284 80241FD4 8E2200D0 */ lw $v0, 0xd0($s1) /* DBF288 80241FD8 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80241B28_DBEDD8 /* DBF29C 80241FEC 468073A0 */ cvt.s.w $f14, $f14 /* DBF2A0 80241FF0 C6020018 */ lwc1 $f2, 0x18($s0) /* DBF2A4 80241FF4 4600103C */ c.lt.s $f2, $f0 -/* DBF2A8 80241FF8 00000000 */ nop +/* DBF2A8 80241FF8 00000000 */ nop /* DBF2AC 80241FFC 4500000D */ bc1f .L80242034 /* DBF2B0 80242000 E7A00034 */ swc1 $f0, 0x34($sp) /* DBF2B4 80242004 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80241B28_DBEDD8 /* DBF2F0 80242040 00621825 */ or $v1, $v1, $v0 /* DBF2F4 80242044 00741825 */ or $v1, $v1, $s4 /* DBF2F8 80242048 10600008 */ beqz $v1, .L8024206C -/* DBF2FC 8024204C 00000000 */ nop +/* DBF2FC 8024204C 00000000 */ nop /* DBF300 80242050 8602008C */ lh $v0, 0x8c($s0) /* DBF304 80242054 14400031 */ bnez $v0, .L8024211C -/* DBF308 80242058 00000000 */ nop +/* DBF308 80242058 00000000 */ nop /* DBF30C 8024205C 8E050018 */ lw $a1, 0x18($s0) /* DBF310 80242060 8E06000C */ lw $a2, 0xc($s0) /* DBF314 80242064 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_80241B28_DBEDD8 /* DBF328 80242078 44801000 */ mtc1 $zero, $f2 /* DBF32C 8024207C 46000021 */ cvt.d.s $f0, $f0 /* DBF330 80242080 46220002 */ mul.d $f0, $f0, $f2 -/* DBF334 80242084 00000000 */ nop +/* DBF334 80242084 00000000 */ nop /* DBF338 80242088 4620020D */ trunc.w.d $f8, $f0 /* DBF33C 8024208C E628007C */ swc1 $f8, 0x7c($s1) /* DBF340 80242090 8E420004 */ lw $v0, 4($s2) /* DBF344 80242094 18400021 */ blez $v0, .L8024211C -/* DBF348 80242098 00000000 */ nop +/* DBF348 80242098 00000000 */ nop /* DBF34C 8024209C 8602008E */ lh $v0, 0x8e($s0) /* DBF350 802420A0 9603008E */ lhu $v1, 0x8e($s0) /* DBF354 802420A4 18400005 */ blez $v0, .L802420BC @@ -375,7 +375,7 @@ glabel func_80241B28_DBEDD8 /* DBF35C 802420AC A602008E */ sh $v0, 0x8e($s0) /* DBF360 802420B0 00021400 */ sll $v0, $v0, 0x10 /* DBF364 802420B4 1C400019 */ bgtz $v0, .L8024211C -/* DBF368 802420B8 00000000 */ nop +/* DBF368 802420B8 00000000 */ nop .L802420BC: /* DBF36C 802420BC 240403E8 */ addiu $a0, $zero, 0x3e8 /* DBF370 802420C0 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80241B28_DBEDD8 /* DBF3B8 80242108 18400003 */ blez $v0, .L80242118 /* DBF3BC 8024210C 28620003 */ slti $v0, $v1, 3 /* DBF3C0 80242110 10400002 */ beqz $v0, .L8024211C -/* DBF3C4 80242114 00000000 */ nop +/* DBF3C4 80242114 00000000 */ nop .L80242118: /* DBF3C8 80242118 AE600070 */ sw $zero, 0x70($s3) .L8024211C: diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242210_DBF4C0.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242210_DBF4C0.s index 1b658df0a7..715826e6ec 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242210_DBF4C0.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242210_DBF4C0.s @@ -42,11 +42,11 @@ glabel func_80242210_DBF4C0 .L802422A4: /* DBF554 802422A4 8E220070 */ lw $v0, 0x70($s1) /* DBF558 802422A8 18400034 */ blez $v0, .L8024237C -/* DBF55C 802422AC 00000000 */ nop +/* DBF55C 802422AC 00000000 */ nop /* DBF560 802422B0 C62C0074 */ lwc1 $f12, 0x74($s1) /* DBF564 802422B4 46806320 */ cvt.s.w $f12, $f12 /* DBF568 802422B8 44820000 */ mtc1 $v0, $f0 -/* DBF56C 802422BC 00000000 */ nop +/* DBF56C 802422BC 00000000 */ nop /* DBF570 802422C0 46800020 */ cvt.s.w $f0, $f0 /* DBF574 802422C4 46000021 */ cvt.d.s $f0, $f0 /* DBF578 802422C8 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_80242210_DBF4C0 /* DBF5D8 80242328 27A70030 */ addiu $a3, $sp, 0x30 .L8024232C: /* DBF5DC 8024232C 10400007 */ beqz $v0, .L8024234C -/* DBF5E0 80242330 00000000 */ nop +/* DBF5E0 80242330 00000000 */ nop /* DBF5E4 80242334 4616A082 */ mul.s $f2, $f20, $f22 -/* DBF5E8 80242338 00000000 */ nop +/* DBF5E8 80242338 00000000 */ nop /* DBF5EC 8024233C C7A0002C */ lwc1 $f0, 0x2c($sp) /* DBF5F0 80242340 46180000 */ add.s $f0, $f0, $f24 /* DBF5F4 80242344 080908D6 */ j .L80242358 /* DBF5F8 80242348 46020000 */ add.s $f0, $f0, $f2 .L8024234C: /* DBF5FC 8024234C 4616A002 */ mul.s $f0, $f20, $f22 -/* DBF600 80242350 00000000 */ nop +/* DBF600 80242350 00000000 */ nop /* DBF604 80242354 4600D000 */ add.s $f0, $f26, $f0 .L80242358: /* DBF608 80242358 E600003C */ swc1 $f0, 0x3c($s0) /* DBF60C 8024235C 8E220074 */ lw $v0, 0x74($s1) /* DBF610 80242360 2442000A */ addiu $v0, $v0, 0xa /* DBF614 80242364 44826000 */ mtc1 $v0, $f12 -/* DBF618 80242368 00000000 */ nop +/* DBF618 80242368 00000000 */ nop /* DBF61C 8024236C 0C00A6C9 */ jal clamp_angle /* DBF620 80242370 46806320 */ cvt.s.w $f12, $f12 /* DBF624 80242374 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_80242210_DBF4C0 /* DBF638 80242388 860200A8 */ lh $v0, 0xa8($s0) /* DBF63C 8024238C C600003C */ lwc1 $f0, 0x3c($s0) /* DBF640 80242390 44821000 */ mtc1 $v0, $f2 -/* DBF644 80242394 00000000 */ nop +/* DBF644 80242394 00000000 */ nop /* DBF648 80242398 468010A0 */ cvt.s.w $f2, $f2 /* DBF64C 8024239C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* DBF650 802423A0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_80242210_DBF4C0 /* DBF66C 802423BC 46240000 */ add.d $f0, $f0, $f4 /* DBF670 802423C0 460010A1 */ cvt.d.s $f2, $f2 /* DBF674 802423C4 4620103C */ c.lt.d $f2, $f0 -/* DBF678 802423C8 00000000 */ nop +/* DBF678 802423C8 00000000 */ nop /* DBF67C 802423CC 4500002E */ bc1f .L80242488 /* DBF680 802423D0 0280202D */ daddu $a0, $s4, $zero /* DBF684 802423D4 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_80242210_DBF4C0 /* DBF6C4 80242414 3C01C1A0 */ lui $at, 0xc1a0 /* DBF6C8 80242418 44812000 */ mtc1 $at, $f4 /* DBF6CC 8024241C 44834000 */ mtc1 $v1, $f8 -/* DBF6D0 80242420 00000000 */ nop +/* DBF6D0 80242420 00000000 */ nop /* DBF6D4 80242424 46804220 */ cvt.s.w $f8, $f8 /* DBF6D8 80242428 44074000 */ mfc1 $a3, $f8 /* DBF6DC 8024242C 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_80242210_DBF4C0 .L80242488: /* DBF738 80242488 8602008C */ lh $v0, 0x8c($s0) /* DBF73C 8024248C 14400025 */ bnez $v0, .L80242524 -/* DBF740 80242490 00000000 */ nop +/* DBF740 80242490 00000000 */ nop /* DBF744 80242494 8602008E */ lh $v0, 0x8e($s0) /* DBF748 80242498 1C400022 */ bgtz $v0, .L80242524 -/* DBF74C 8024249C 00000000 */ nop +/* DBF74C 8024249C 00000000 */ nop /* DBF750 802424A0 8E620074 */ lw $v0, 0x74($s3) /* DBF754 802424A4 2442FFFF */ addiu $v0, $v0, -1 /* DBF758 802424A8 1840001D */ blez $v0, .L80242520 @@ -183,7 +183,7 @@ glabel func_80242210_DBF4C0 /* DBF764 802424B4 9442002A */ lhu $v0, 0x2a($v0) /* DBF768 802424B8 30420010 */ andi $v0, $v0, 0x10 /* DBF76C 802424BC 14400007 */ bnez $v0, .L802424DC -/* DBF770 802424C0 00000000 */ nop +/* DBF770 802424C0 00000000 */ nop /* DBF774 802424C4 C600000C */ lwc1 $f0, 0xc($s0) /* DBF778 802424C8 3C014334 */ lui $at, 0x4334 /* DBF77C 802424CC 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242638_DBF8E8.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242638_DBF8E8.s index 458de808a6..0759f2b5ed 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242638_DBF8E8.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242638_DBF8E8.s @@ -60,18 +60,18 @@ glabel func_80242638_DBF8E8 /* DBF9C0 80242710 C6200038 */ lwc1 $f0, 0x38($s1) /* DBF9C4 80242714 4600018D */ trunc.w.s $f6, $f0 /* DBF9C8 80242718 44023000 */ mfc1 $v0, $f6 -/* DBF9CC 8024271C 00000000 */ nop +/* DBF9CC 8024271C 00000000 */ nop /* DBF9D0 80242720 A6420010 */ sh $v0, 0x10($s2) /* DBF9D4 80242724 C620003C */ lwc1 $f0, 0x3c($s1) /* DBF9D8 80242728 4600018D */ trunc.w.s $f6, $f0 /* DBF9DC 8024272C 44023000 */ mfc1 $v0, $f6 -/* DBF9E0 80242730 00000000 */ nop +/* DBF9E0 80242730 00000000 */ nop /* DBF9E4 80242734 A6420012 */ sh $v0, 0x12($s2) /* DBF9E8 80242738 C6200040 */ lwc1 $f0, 0x40($s1) /* DBF9EC 8024273C A2430007 */ sb $v1, 7($s2) /* DBF9F0 80242740 4600018D */ trunc.w.s $f6, $f0 /* DBF9F4 80242744 44023000 */ mfc1 $v0, $f6 -/* DBF9F8 80242748 00000000 */ nop +/* DBF9F8 80242748 00000000 */ nop /* DBF9FC 8024274C A6420014 */ sh $v0, 0x14($s2) .L80242750: /* DBFA00 80242750 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802427D0_DBFA80.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802427D0_DBFA80.s index f672b197b8..87f3ff5a91 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802427D0_DBFA80.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802427D0_DBFA80.s @@ -42,9 +42,9 @@ glabel func_802427D0_DBFA80 /* DBFB14 80242864 44801800 */ mtc1 $zero, $f3 /* DBFB18 80242868 46002021 */ cvt.d.s $f0, $f4 /* DBFB1C 8024286C 4620103E */ c.le.d $f2, $f0 -/* DBFB20 80242870 00000000 */ nop +/* DBFB20 80242870 00000000 */ nop /* DBFB24 80242874 45000030 */ bc1f .L80242938 -/* DBFB28 80242878 00000000 */ nop +/* DBFB28 80242878 00000000 */ nop /* DBFB2C 8024287C C600003C */ lwc1 $f0, 0x3c($s0) /* DBFB30 80242880 46040000 */ add.s $f0, $f0, $f4 /* DBFB34 80242884 E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_802427D0_DBFA80 /* DBFB94 802428E4 27A70020 */ addiu $a3, $sp, 0x20 .L802428E8: /* DBFB98 802428E8 1040000B */ beqz $v0, .L80242918 -/* DBFB9C 802428EC 00000000 */ nop +/* DBFB9C 802428EC 00000000 */ nop /* DBFBA0 802428F0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* DBFBA4 802428F4 46140080 */ add.s $f2, $f0, $f20 /* DBFBA8 802428F8 C600003C */ lwc1 $f0, 0x3c($s0) /* DBFBAC 802428FC 4600103E */ c.le.s $f2, $f0 -/* DBFBB0 80242900 00000000 */ nop +/* DBFBB0 80242900 00000000 */ nop /* DBFBB4 80242904 4500008D */ bc1f .L80242B3C -/* DBFBB8 80242908 00000000 */ nop +/* DBFBB8 80242908 00000000 */ nop /* DBFBBC 8024290C E602003C */ swc1 $f2, 0x3c($s0) /* DBFBC0 80242910 08090ACF */ j .L80242B3C /* DBFBC4 80242914 AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_802427D0_DBFA80 /* DBFBC8 80242918 C602003C */ lwc1 $f2, 0x3c($s0) /* DBFBCC 8024291C C6000064 */ lwc1 $f0, 0x64($s0) /* DBFBD0 80242920 4602003E */ c.le.s $f0, $f2 -/* DBFBD4 80242924 00000000 */ nop +/* DBFBD4 80242924 00000000 */ nop /* DBFBD8 80242928 45030084 */ bc1tl .L80242B3C /* DBFBDC 8024292C AE400070 */ sw $zero, 0x70($s2) /* DBFBE0 80242930 08090ACF */ j .L80242B3C -/* DBFBE4 80242934 00000000 */ nop +/* DBFBE4 80242934 00000000 */ nop .L80242938: /* DBFBE8 80242938 4622003C */ c.lt.d $f0, $f2 -/* DBFBEC 8024293C 00000000 */ nop +/* DBFBEC 8024293C 00000000 */ nop /* DBFBF0 80242940 4500007E */ bc1f .L80242B3C -/* DBFBF4 80242944 00000000 */ nop +/* DBFBF4 80242944 00000000 */ nop /* DBFBF8 80242948 9602008E */ lhu $v0, 0x8e($s0) /* DBFBFC 8024294C 24420001 */ addiu $v0, $v0, 1 /* DBFC00 80242950 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_802427D0_DBFA80 /* DBFC0C 8024295C 00021403 */ sra $v0, $v0, 0x10 /* DBFC10 80242960 0043102A */ slt $v0, $v0, $v1 /* DBFC14 80242964 14400026 */ bnez $v0, .L80242A00 -/* DBFC18 80242968 00000000 */ nop +/* DBFC18 80242968 00000000 */ nop /* DBFC1C 8024296C C60C0038 */ lwc1 $f12, 0x38($s0) /* DBFC20 80242970 C60E0040 */ lwc1 $f14, 0x40($s0) /* DBFC24 80242974 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_802427D0_DBFA80 /* DBFC50 802429A0 8E62001C */ lw $v0, 0x1c($s3) /* DBFC54 802429A4 46001005 */ abs.s $f0, $f2 /* DBFC58 802429A8 44822000 */ mtc1 $v0, $f4 -/* DBFC5C 802429AC 00000000 */ nop +/* DBFC5C 802429AC 00000000 */ nop /* DBFC60 802429B0 46802120 */ cvt.s.w $f4, $f4 /* DBFC64 802429B4 4600203C */ c.lt.s $f4, $f0 -/* DBFC68 802429B8 00000000 */ nop +/* DBFC68 802429B8 00000000 */ nop /* DBFC6C 802429BC 4500000D */ bc1f .L802429F4 -/* DBFC70 802429C0 00000000 */ nop +/* DBFC70 802429C0 00000000 */ nop /* DBFC74 802429C4 44800000 */ mtc1 $zero, $f0 /* DBFC78 802429C8 C614000C */ lwc1 $f20, 0xc($s0) /* DBFC7C 802429CC 4600103C */ c.lt.s $f2, $f0 -/* DBFC80 802429D0 00000000 */ nop +/* DBFC80 802429D0 00000000 */ nop /* DBFC84 802429D4 45000006 */ bc1f .L802429F0 /* DBFC88 802429D8 00021023 */ negu $v0, $v0 /* DBFC8C 802429DC 44820000 */ mtc1 $v0, $f0 -/* DBFC90 802429E0 00000000 */ nop +/* DBFC90 802429E0 00000000 */ nop /* DBFC94 802429E4 46800020 */ cvt.s.w $f0, $f0 /* DBFC98 802429E8 08090A7D */ j .L802429F4 /* DBFC9C 802429EC 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_802427D0_DBFA80 /* DBFCC4 80242A14 C600001C */ lwc1 $f0, 0x1c($s0) /* DBFCC8 80242A18 46001080 */ add.s $f2, $f2, $f0 /* DBFCCC 80242A1C 4616103C */ c.lt.s $f2, $f22 -/* DBFCD0 80242A20 00000000 */ nop +/* DBFCD0 80242A20 00000000 */ nop /* DBFCD4 80242A24 45020045 */ bc1fl .L80242B3C /* DBFCD8 80242A28 E602003C */ swc1 $f2, 0x3c($s0) /* DBFCDC 80242A2C 08090ACE */ j .L80242B38 @@ -169,7 +169,7 @@ glabel func_802427D0_DBFA80 /* DBFCF4 80242A44 C600001C */ lwc1 $f0, 0x1c($s0) /* DBFCF8 80242A48 C604003C */ lwc1 $f4, 0x3c($s0) /* DBFCFC 80242A4C 44821000 */ mtc1 $v0, $f2 -/* DBFD00 80242A50 00000000 */ nop +/* DBFD00 80242A50 00000000 */ nop /* DBFD04 80242A54 468010A0 */ cvt.s.w $f2, $f2 /* DBFD08 80242A58 46000005 */ abs.s $f0, $f0 /* DBFD0C 80242A5C 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_802427D0_DBFA80 /* DBFD48 80242A98 0C0372DF */ jal func_800DCB7C /* DBFD4C 80242A9C 27A70020 */ addiu $a3, $sp, 0x20 /* DBFD50 80242AA0 10400015 */ beqz $v0, .L80242AF8 -/* DBFD54 80242AA4 00000000 */ nop +/* DBFD54 80242AA4 00000000 */ nop /* DBFD58 80242AA8 860200A8 */ lh $v0, 0xa8($s0) /* DBFD5C 80242AAC C604001C */ lwc1 $f4, 0x1c($s0) /* DBFD60 80242AB0 44820000 */ mtc1 $v0, $f0 -/* DBFD64 80242AB4 00000000 */ nop +/* DBFD64 80242AB4 00000000 */ nop /* DBFD68 80242AB8 46800020 */ cvt.s.w $f0, $f0 /* DBFD6C 80242ABC 46002085 */ abs.s $f2, $f4 /* DBFD70 80242AC0 46020000 */ add.s $f0, $f0, $f2 /* DBFD74 80242AC4 C7A20024 */ lwc1 $f2, 0x24($sp) /* DBFD78 80242AC8 4600103E */ c.le.s $f2, $f0 -/* DBFD7C 80242ACC 00000000 */ nop +/* DBFD7C 80242ACC 00000000 */ nop /* DBFD80 80242AD0 45000005 */ bc1f .L80242AE8 -/* DBFD84 80242AD4 00000000 */ nop +/* DBFD84 80242AD4 00000000 */ nop /* DBFD88 80242AD8 C7A0001C */ lwc1 $f0, 0x1c($sp) /* DBFD8C 80242ADC AE00001C */ sw $zero, 0x1c($s0) /* DBFD90 80242AE0 08090ACF */ j .L80242B3C @@ -217,13 +217,13 @@ glabel func_802427D0_DBFA80 /* DBFDAC 80242AFC 860200A8 */ lh $v0, 0xa8($s0) /* DBFDB0 80242B00 46163081 */ sub.s $f2, $f6, $f22 /* DBFDB4 80242B04 44820000 */ mtc1 $v0, $f0 -/* DBFDB8 80242B08 00000000 */ nop +/* DBFDB8 80242B08 00000000 */ nop /* DBFDBC 80242B0C 46800020 */ cvt.s.w $f0, $f0 /* DBFDC0 80242B10 46001080 */ add.s $f2, $f2, $f0 /* DBFDC4 80242B14 C604001C */ lwc1 $f4, 0x1c($s0) /* DBFDC8 80242B18 46002005 */ abs.s $f0, $f4 /* DBFDCC 80242B1C 4602003C */ c.lt.s $f0, $f2 -/* DBFDD0 80242B20 00000000 */ nop +/* DBFDD0 80242B20 00000000 */ nop /* DBFDD4 80242B24 45020005 */ bc1fl .L80242B3C /* DBFDD8 80242B28 AE00001C */ sw $zero, 0x1c($s0) /* DBFDDC 80242B2C 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242B60_DBFE10.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242B60_DBFE10.s index d477b75502..89e3db960f 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242B60_DBFE10.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242B60_DBFE10.s @@ -49,15 +49,15 @@ glabel func_80242B60_DBFE10 /* DBFEB8 80242C08 44802000 */ mtc1 $zero, $f4 /* DBFEBC 80242C0C 460010A1 */ cvt.d.s $f2, $f2 /* DBFEC0 80242C10 46241082 */ mul.d $f2, $f2, $f4 -/* DBFEC4 80242C14 00000000 */ nop +/* DBFEC4 80242C14 00000000 */ nop /* DBFEC8 80242C18 C7A0001C */ lwc1 $f0, 0x1c($sp) /* DBFECC 80242C1C 46000021 */ cvt.d.s $f0, $f0 /* DBFED0 80242C20 46240002 */ mul.d $f0, $f0, $f4 -/* DBFED4 80242C24 00000000 */ nop +/* DBFED4 80242C24 00000000 */ nop /* DBFED8 80242C28 3C013FE0 */ lui $at, 0x3fe0 /* DBFEDC 80242C2C 44812800 */ mtc1 $at, $f5 /* DBFEE0 80242C30 44802000 */ mtc1 $zero, $f4 -/* DBFEE4 80242C34 00000000 */ nop +/* DBFEE4 80242C34 00000000 */ nop /* DBFEE8 80242C38 46241080 */ add.d $f2, $f2, $f4 /* DBFEEC 80242C3C AE000074 */ sw $zero, 0x74($s0) /* DBFEF0 80242C40 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s index b67887f242..5010dd0e9d 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s @@ -54,7 +54,7 @@ glabel func_80242C84_DBFF34 /* DBFFF4 80242D44 8E4300B0 */ lw $v1, 0xb0($s2) /* DBFFF8 80242D48 30620004 */ andi $v0, $v1, 4 /* DBFFFC 80242D4C 10400007 */ beqz $v0, .L80242D6C -/* DC0000 80242D50 00000000 */ nop +/* DC0000 80242D50 00000000 */ nop /* DC0004 80242D54 824200B4 */ lb $v0, 0xb4($s2) /* DC0008 80242D58 1440003C */ bnez $v0, .L80242E4C /* DC000C 80242D5C 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_80242C84_DBFF34 /* DC0020 80242D70 2C62000F */ sltiu $v0, $v1, 0xf /* DC0024 80242D74 10400034 */ beqz $v0, .L80242E48 /* DC0028 80242D78 00031080 */ sll $v0, $v1, 2 -/* DC002C 80242D7C 3C018024 */ lui $at, %hi(D_802470C8) +/* DC002C 80242D7C 3C018024 */ lui $at, %hi(jtbl_802470C8_DC4378) /* DC0030 80242D80 00220821 */ addu $at, $at, $v0 -/* DC0034 80242D84 8C2270C8 */ lw $v0, %lo(D_802470C8)($at) +/* DC0034 80242D84 8C2270C8 */ lw $v0, %lo(jtbl_802470C8_DC4378)($at) /* DC0038 80242D88 00400008 */ jr $v0 -/* DC003C 80242D8C 00000000 */ nop +/* DC003C 80242D8C 00000000 */ nop +glabel L80242D90_DC0040 /* DC0040 80242D90 0280202D */ daddu $a0, $s4, $zero /* DC0044 80242D94 0200282D */ daddu $a1, $s0, $zero /* DC0048 80242D98 0C09065E */ jal func_80241978_DBEC28 /* DC004C 80242D9C 0260302D */ daddu $a2, $s3, $zero +glabel L80242DA0_DC0050 /* DC0050 80242DA0 0280202D */ daddu $a0, $s4, $zero /* DC0054 80242DA4 0200282D */ daddu $a1, $s0, $zero /* DC0058 80242DA8 0C0906CA */ jal func_80241B28_DBEDD8 /* DC005C 80242DAC 0260302D */ daddu $a2, $s3, $zero /* DC0060 80242DB0 08090B93 */ j .L80242E4C /* DC0064 80242DB4 0000102D */ daddu $v0, $zero, $zero +glabel L80242DB8_DC0068 /* DC0068 80242DB8 0280202D */ daddu $a0, $s4, $zero /* DC006C 80242DBC 0200282D */ daddu $a1, $s0, $zero /* DC0070 80242DC0 0C090854 */ jal dup_omo_07_UnkNpcAIFunc1 /* DC0074 80242DC4 0260302D */ daddu $a2, $s3, $zero +glabel L80242DC8_DC0078 /* DC0078 80242DC8 0280202D */ daddu $a0, $s4, $zero /* DC007C 80242DCC 0200282D */ daddu $a1, $s0, $zero /* DC0080 80242DD0 0C090884 */ jal func_80242210_DBF4C0 /* DC0084 80242DD4 0260302D */ daddu $a2, $s3, $zero /* DC0088 80242DD8 08090B93 */ j .L80242E4C /* DC008C 80242DDC 0000102D */ daddu $v0, $zero, $zero +glabel L80242DE0_DC0090 /* DC0090 80242DE0 0280202D */ daddu $a0, $s4, $zero /* DC0094 80242DE4 0200282D */ daddu $a1, $s0, $zero /* DC0098 80242DE8 0C090955 */ jal omo_07_UnkNpcAIFunc2 /* DC009C 80242DEC 0260302D */ daddu $a2, $s3, $zero +glabel L80242DF0_DC00A0 /* DC00A0 80242DF0 0280202D */ daddu $a0, $s4, $zero /* DC00A4 80242DF4 0200282D */ daddu $a1, $s0, $zero /* DC00A8 80242DF8 0C090973 */ jal func_802425CC_DBF87C /* DC00AC 80242DFC 0260302D */ daddu $a2, $s3, $zero /* DC00B0 80242E00 08090B93 */ j .L80242E4C /* DC00B4 80242E04 0000102D */ daddu $v0, $zero, $zero +glabel L80242E08_DC00B8 /* DC00B8 80242E08 0280202D */ daddu $a0, $s4, $zero /* DC00BC 80242E0C 0200282D */ daddu $a1, $s0, $zero /* DC00C0 80242E10 0C09098E */ jal func_80242638_DBF8E8 /* DC00C4 80242E14 0260302D */ daddu $a2, $s3, $zero /* DC00C8 80242E18 08090B93 */ j .L80242E4C /* DC00CC 80242E1C 0000102D */ daddu $v0, $zero, $zero +glabel L80242E20_DC00D0 /* DC00D0 80242E20 0280202D */ daddu $a0, $s4, $zero /* DC00D4 80242E24 0200282D */ daddu $a1, $s0, $zero /* DC00D8 80242E28 0C0909DB */ jal omo_07_UnkNpcAIFunc3 /* DC00DC 80242E2C 0260302D */ daddu $a2, $s3, $zero /* DC00E0 80242E30 08090B93 */ j .L80242E4C /* DC00E4 80242E34 0000102D */ daddu $v0, $zero, $zero +glabel L80242E38_DC00E8 /* DC00E8 80242E38 0280202D */ daddu $a0, $s4, $zero /* DC00EC 80242E3C 0200282D */ daddu $a1, $s0, $zero /* DC00F0 80242E40 0C0909F4 */ jal func_802427D0_DBFA80 /* DC00F4 80242E44 0260302D */ daddu $a2, $s3, $zero .L80242E48: +glabel L80242E48_DC00F8 /* DC00F8 80242E48 0000102D */ daddu $v0, $zero, $zero .L80242E4C: /* DC00FC 80242E4C 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242EA8_DC0158.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242EA8_DC0158.s index 83a14db9f0..3d5a8f6b0a 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242EA8_DC0158.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242EA8_DC0158.s @@ -29,6 +29,6 @@ glabel func_80242EA8_DC0158 /* DC01B8 80242F08 24020002 */ addiu $v0, $zero, 2 /* DC01BC 80242F0C 03E00008 */ jr $ra /* DC01C0 80242F10 27BD0020 */ addiu $sp, $sp, 0x20 -/* DC01C4 80242F14 00000000 */ nop -/* DC01C8 80242F18 00000000 */ nop -/* DC01CC 80242F1C 00000000 */ nop +/* DC01C4 80242F14 00000000 */ nop +/* DC01C8 80242F18 00000000 */ nop +/* DC01CC 80242F1C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80242F20_DC01D0.s b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80242F20_DC01D0.s index 0c48beaa61..5d26c6afbc 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80242F20_DC01D0.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80242F20_DC01D0.s @@ -26,7 +26,7 @@ glabel func_80242F20_DC01D0 /* DC0220 80242F70 1440FFFA */ bnez $v0, .L80242F5C /* DC0224 80242F74 24A50004 */ addiu $a1, $a1, 4 /* DC0228 80242F78 08090BEF */ j .L80242FBC -/* DC022C 80242F7C 00000000 */ nop +/* DC022C 80242F7C 00000000 */ nop .L80242F80: /* DC0230 80242F80 0000182D */ daddu $v1, $zero, $zero /* DC0234 80242F84 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_07/DC04D0/func_80243220_DC04D0.s b/asm/nonmatchings/world/area_omo/omo_07/DC04D0/func_80243220_DC04D0.s index cb2d1d0ef6..f3285b1007 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DC04D0/func_80243220_DC04D0.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DC04D0/func_80243220_DC04D0.s @@ -25,7 +25,7 @@ glabel func_80243220_DC04D0 /* DC0520 80243270 0C00A8BB */ jal sin_deg /* DC0524 80243274 46146300 */ add.s $f12, $f12, $f20 /* DC0528 80243278 46160002 */ mul.s $f0, $f0, $f22 -/* DC052C 8024327C 00000000 */ nop +/* DC052C 8024327C 00000000 */ nop /* DC0530 80243280 C6020038 */ lwc1 $f2, 0x38($s0) /* DC0534 80243284 46001080 */ add.s $f2, $f2, $f0 /* DC0538 80243288 4600110D */ trunc.w.s $f4, $f2 @@ -33,7 +33,7 @@ glabel func_80243220_DC04D0 /* DC0540 80243290 C600003C */ lwc1 $f0, 0x3c($s0) /* DC0544 80243294 3C014100 */ lui $at, 0x4100 /* DC0548 80243298 44811000 */ mtc1 $at, $f2 -/* DC054C 8024329C 00000000 */ nop +/* DC054C 8024329C 00000000 */ nop /* DC0550 802432A0 46020000 */ add.s $f0, $f0, $f2 /* DC0554 802432A4 4600010D */ trunc.w.s $f4, $f0 /* DC0558 802432A8 E6240088 */ swc1 $f4, 0x88($s1) @@ -43,7 +43,7 @@ glabel func_80243220_DC04D0 /* DC0568 802432B8 0C00A8D4 */ jal cos_deg /* DC056C 802432BC 46146300 */ add.s $f12, $f12, $f20 /* DC0570 802432C0 46160002 */ mul.s $f0, $f0, $f22 -/* DC0574 802432C4 00000000 */ nop +/* DC0574 802432C4 00000000 */ nop /* DC0578 802432C8 C6020040 */ lwc1 $f2, 0x40($s0) /* DC057C 802432CC 46001081 */ sub.s $f2, $f2, $f0 /* DC0580 802432D0 4600110D */ trunc.w.s $f4, $f2 @@ -57,4 +57,4 @@ glabel func_80243220_DC04D0 /* DC05A0 802432F0 24020002 */ addiu $v0, $zero, 2 /* DC05A4 802432F4 03E00008 */ jr $ra /* DC05A8 802432F8 27BD0030 */ addiu $sp, $sp, 0x30 -/* DC05AC 802432FC 00000000 */ nop +/* DC05AC 802432FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_802400E4_DC44B4.s b/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_802400E4_DC44B4.s index de55606d8a..f948fc77d0 100644 --- a/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_802400E4_DC44B4.s +++ b/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_802400E4_DC44B4.s @@ -18,7 +18,7 @@ glabel func_802400E4_DC44B4 /* DC44E8 80240118 0C0B210B */ jal get_float_variable /* DC44EC 8024011C 46000506 */ mov.s $f20, $f0 /* DC44F0 80240120 4614003C */ c.lt.s $f0, $f20 -/* DC44F4 80240124 00000000 */ nop +/* DC44F4 80240124 00000000 */ nop /* DC44F8 80240128 45000004 */ bc1f .L8024013C /* DC44FC 8024012C 0220202D */ daddu $a0, $s1, $zero /* DC4500 80240130 8E050000 */ lw $a1, ($s0) @@ -29,7 +29,7 @@ glabel func_802400E4_DC44B4 /* DC4510 80240140 0000302D */ daddu $a2, $zero, $zero .L80240144: /* DC4514 80240144 0C0B2026 */ jal set_variable -/* DC4518 80240148 00000000 */ nop +/* DC4518 80240148 00000000 */ nop /* DC451C 8024014C 8FBF0018 */ lw $ra, 0x18($sp) /* DC4520 80240150 8FB10014 */ lw $s1, 0x14($sp) /* DC4524 80240154 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240870_DC4C40.s b/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240870_DC4C40.s index a5fe274633..880948ebab 100644 --- a/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240870_DC4C40.s +++ b/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240870_DC4C40.s @@ -15,7 +15,7 @@ glabel func_80240870_DC4C40 /* DC4C68 80240898 D4228760 */ ldc1 $f2, %lo(D_80248760)($at) /* DC4C6C 8024089C 46000021 */ cvt.d.s $f0, $f0 /* DC4C70 802408A0 46220002 */ mul.d $f0, $f0, $f2 -/* DC4C74 802408A4 00000000 */ nop +/* DC4C74 802408A4 00000000 */ nop /* DC4C78 802408A8 46200020 */ cvt.s.d $f0, $f0 /* DC4C7C 802408AC E4400018 */ swc1 $f0, 0x18($v0) /* DC4C80 802408B0 8E0300CC */ lw $v1, 0xcc($s0) diff --git a/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_802408E0_DC4CB0.s b/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_802408E0_DC4CB0.s index c9fb02595b..5fdc3f96bf 100644 --- a/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_802408E0_DC4CB0.s +++ b/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_802408E0_DC4CB0.s @@ -22,7 +22,7 @@ glabel func_802408E0_DC4CB0 /* DC4CF4 80240924 0C0129E1 */ jal func_8004A784 /* DC4CF8 80240928 0000382D */ daddu $a3, $zero, $zero /* DC4CFC 8024092C 14400005 */ bnez $v0, .L80240944 -/* DC4D00 80240930 00000000 */ nop +/* DC4D00 80240930 00000000 */ nop /* DC4D04 80240934 8E050018 */ lw $a1, 0x18($s0) /* DC4D08 80240938 8E06000C */ lw $a2, 0xc($s0) /* DC4D0C 8024093C 0C00EA95 */ jal npc_move_heading @@ -33,13 +33,13 @@ glabel func_802408E0_DC4CB0 /* DC4D1C 8024094C A602008E */ sh $v0, 0x8e($s0) /* DC4D20 80240950 00021400 */ sll $v0, $v0, 0x10 /* DC4D24 80240954 14400010 */ bnez $v0, .L80240998 -/* DC4D28 80240958 00000000 */ nop +/* DC4D28 80240958 00000000 */ nop /* DC4D2C 8024095C C6000018 */ lwc1 $f0, 0x18($s0) /* DC4D30 80240960 3C018025 */ lui $at, %hi(D_80248768) /* DC4D34 80240964 D4228768 */ ldc1 $f2, %lo(D_80248768)($at) /* DC4D38 80240968 46000021 */ cvt.d.s $f0, $f0 /* DC4D3C 8024096C 46220002 */ mul.d $f0, $f0, $f2 -/* DC4D40 80240970 00000000 */ nop +/* DC4D40 80240970 00000000 */ nop /* DC4D44 80240974 46200020 */ cvt.s.d $f0, $f0 /* DC4D48 80240978 E6000018 */ swc1 $f0, 0x18($s0) /* DC4D4C 8024097C 8E2200CC */ lw $v0, 0xcc($s1) diff --git a/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_802409B0_DC4D80.s b/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_802409B0_DC4D80.s index 63b486d60c..8cdffdcb4c 100644 --- a/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_802409B0_DC4D80.s +++ b/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_802409B0_DC4D80.s @@ -21,7 +21,7 @@ glabel func_802409B0_DC4D80 /* DC4DC0 802409F0 0C0129E1 */ jal func_8004A784 /* DC4DC4 802409F4 0000382D */ daddu $a3, $zero, $zero /* DC4DC8 802409F8 14400005 */ bnez $v0, .L80240A10 -/* DC4DCC 802409FC 00000000 */ nop +/* DC4DCC 802409FC 00000000 */ nop /* DC4DD0 80240A00 8E050018 */ lw $a1, 0x18($s0) /* DC4DD4 80240A04 8E06000C */ lw $a2, 0xc($s0) /* DC4DD8 80240A08 0C00EA95 */ jal npc_move_heading diff --git a/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240A48_DC4E18.s b/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240A48_DC4E18.s index 65f8ee34fc..34d9e8b82e 100644 --- a/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240A48_DC4E18.s +++ b/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240A48_DC4E18.s @@ -16,7 +16,7 @@ glabel func_80240A48_DC4E18 /* DC4E44 80240A74 A462008E */ sh $v0, 0x8e($v1) /* DC4E48 80240A78 00021400 */ sll $v0, $v0, 0x10 /* DC4E4C 80240A7C 14400005 */ bnez $v0, .L80240A94 -/* DC4E50 80240A80 00000000 */ nop +/* DC4E50 80240A80 00000000 */ nop /* DC4E54 80240A84 8E0200CC */ lw $v0, 0xcc($s0) /* DC4E58 80240A88 8C420000 */ lw $v0, ($v0) /* DC4E5C 80240A8C AC620028 */ sw $v0, 0x28($v1) diff --git a/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s b/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s index 69bb1b12c3..837a157ce7 100644 --- a/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s +++ b/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s @@ -124,45 +124,53 @@ glabel func_80240AA8_DC4E78 /* DC503C 80240C6C 2C620064 */ sltiu $v0, $v1, 0x64 /* DC5040 80240C70 10400050 */ beqz $v0, .L80240DB4 /* DC5044 80240C74 00031080 */ sll $v0, $v1, 2 -/* DC5048 80240C78 3C018025 */ lui $at, %hi(D_80248770) +/* DC5048 80240C78 3C018025 */ lui $at, %hi(jtbl_80248770_DCCB40) /* DC504C 80240C7C 00220821 */ addu $at, $at, $v0 -/* DC5050 80240C80 8C228770 */ lw $v0, %lo(D_80248770)($at) +/* DC5050 80240C80 8C228770 */ lw $v0, %lo(jtbl_80248770_DCCB40)($at) /* DC5054 80240C84 00400008 */ jr $v0 /* DC5058 80240C88 00000000 */ nop +glabel L80240C8C_DC505C /* DC505C 80240C8C 0260202D */ daddu $a0, $s3, $zero /* DC5060 80240C90 0280282D */ daddu $a1, $s4, $zero /* DC5064 80240C94 0C012568 */ jal func_800495A0 /* DC5068 80240C98 02A0302D */ daddu $a2, $s5, $zero +glabel L80240C9C_DC506C /* DC506C 80240C9C 0260202D */ daddu $a0, $s3, $zero /* DC5070 80240CA0 0280282D */ daddu $a1, $s4, $zero /* DC5074 80240CA4 0C0125AE */ jal func_800496B8 /* DC5078 80240CA8 02A0302D */ daddu $a2, $s5, $zero /* DC507C 80240CAC 0809036D */ j .L80240DB4 /* DC5080 80240CB0 00000000 */ nop +glabel L80240CB4_DC5084 /* DC5084 80240CB4 0260202D */ daddu $a0, $s3, $zero /* DC5088 80240CB8 0280282D */ daddu $a1, $s4, $zero /* DC508C 80240CBC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DC5090 80240CC0 02A0302D */ daddu $a2, $s5, $zero +glabel L80240CC4_DC5094 /* DC5094 80240CC4 0260202D */ daddu $a0, $s3, $zero /* DC5098 80240CC8 0280282D */ daddu $a1, $s4, $zero /* DC509C 80240CCC 0C012701 */ jal func_80049C04 /* DC50A0 80240CD0 02A0302D */ daddu $a2, $s5, $zero /* DC50A4 80240CD4 0809036D */ j .L80240DB4 /* DC50A8 80240CD8 00000000 */ nop +glabel L80240CDC_DC50AC /* DC50AC 80240CDC 0260202D */ daddu $a0, $s3, $zero /* DC50B0 80240CE0 0280282D */ daddu $a1, $s4, $zero /* DC50B4 80240CE4 0C01278F */ jal func_80049E3C /* DC50B8 80240CE8 02A0302D */ daddu $a2, $s5, $zero +glabel L80240CEC_DC50BC /* DC50BC 80240CEC 0260202D */ daddu $a0, $s3, $zero /* DC50C0 80240CF0 0280282D */ daddu $a1, $s4, $zero /* DC50C4 80240CF4 0C0127B3 */ jal func_80049ECC /* DC50C8 80240CF8 02A0302D */ daddu $a2, $s5, $zero /* DC50CC 80240CFC 0809036D */ j .L80240DB4 /* DC50D0 80240D00 00000000 */ nop +glabel L80240D04_DC50D4 /* DC50D4 80240D04 0260202D */ daddu $a0, $s3, $zero /* DC50D8 80240D08 0280282D */ daddu $a1, $s4, $zero /* DC50DC 80240D0C 0C0127DF */ jal func_80049F7C /* DC50E0 80240D10 02A0302D */ daddu $a2, $s5, $zero +glabel L80240D14_DC50E4 /* DC50E4 80240D14 0260202D */ daddu $a0, $s3, $zero /* DC50E8 80240D18 0280282D */ daddu $a1, $s4, $zero /* DC50EC 80240D1C 0C012849 */ jal func_8004A124 @@ -171,6 +179,7 @@ glabel func_80240AA8_DC4E78 /* DC50F8 80240D28 2402000E */ addiu $v0, $zero, 0xe /* DC50FC 80240D2C 14620021 */ bne $v1, $v0, .L80240DB4 /* DC5100 80240D30 00000000 */ nop +glabel L80240D34_DC5104 /* DC5104 80240D34 0260202D */ daddu $a0, $s3, $zero /* DC5108 80240D38 0280282D */ daddu $a1, $s4, $zero /* DC510C 80240D3C 0C09021C */ jal func_80240870_DC4C40 @@ -179,6 +188,7 @@ glabel func_80240AA8_DC4E78 /* DC5118 80240D48 2402000F */ addiu $v0, $zero, 0xf /* DC511C 80240D4C 14620019 */ bne $v1, $v0, .L80240DB4 /* DC5120 80240D50 00000000 */ nop +glabel L80240D54_DC5124 /* DC5124 80240D54 0260202D */ daddu $a0, $s3, $zero /* DC5128 80240D58 0280282D */ daddu $a1, $s4, $zero /* DC512C 80240D5C 0C090238 */ jal func_802408E0_DC4CB0 @@ -187,6 +197,7 @@ glabel func_80240AA8_DC4E78 /* DC5138 80240D68 24020010 */ addiu $v0, $zero, 0x10 /* DC513C 80240D6C 14620011 */ bne $v1, $v0, .L80240DB4 /* DC5140 80240D70 00000000 */ nop +glabel L80240D74_DC5144 /* DC5144 80240D74 0260202D */ daddu $a0, $s3, $zero /* DC5148 80240D78 0280282D */ daddu $a1, $s4, $zero /* DC514C 80240D7C 0C09026C */ jal func_802409B0_DC4D80 @@ -195,15 +206,18 @@ glabel func_80240AA8_DC4E78 /* DC5158 80240D88 24020011 */ addiu $v0, $zero, 0x11 /* DC515C 80240D8C 14620009 */ bne $v1, $v0, .L80240DB4 /* DC5160 80240D90 00000000 */ nop +glabel L80240D94_DC5164 /* DC5164 80240D94 0260202D */ daddu $a0, $s3, $zero /* DC5168 80240D98 0280282D */ daddu $a1, $s4, $zero /* DC516C 80240D9C 0C090292 */ jal func_80240A48_DC4E18 /* DC5170 80240DA0 02A0302D */ daddu $a2, $s5, $zero /* DC5174 80240DA4 0809036D */ j .L80240DB4 /* DC5178 80240DA8 00000000 */ nop +glabel L80240DAC_DC517C /* DC517C 80240DAC 0C0129CF */ jal func_8004A73C /* DC5180 80240DB0 0260202D */ daddu $a0, $s3, $zero .L80240DB4: +glabel L80240DB4_DC5184 /* DC5184 80240DB4 8FBF0060 */ lw $ra, 0x60($sp) /* DC5188 80240DB8 8FB5005C */ lw $s5, 0x5c($sp) /* DC518C 80240DBC 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240000_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240000_DCCCD0.s index 805a0a88fa..d8257d5aaf 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240000_DCCCD0.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240000_DCCCD0.s @@ -6,7 +6,7 @@ glabel func_80240000_DCCCD0 /* DCCCD4 80240004 8C42EFC8 */ lw $v0, %lo(gPlayerStatus)($v0) /* DCCCD8 80240008 30420020 */ andi $v0, $v0, 0x20 /* DCCCDC 8024000C 10400003 */ beqz $v0, .L8024001C -/* DCCCE0 80240010 00000000 */ nop +/* DCCCE0 80240010 00000000 */ nop .L80240014: /* DCCCE4 80240014 03E00008 */ jr $ra /* DCCCE8 80240018 24020001 */ addiu $v0, $zero, 1 @@ -14,7 +14,7 @@ glabel func_80240000_DCCCD0 /* DCCCEC 8024001C 3C028011 */ lui $v0, %hi(D_8010EBB0) /* DCCCF0 80240020 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) /* DCCCF4 80240024 10400009 */ beqz $v0, .L8024004C -/* DCCCF8 80240028 00000000 */ nop +/* DCCCF8 80240028 00000000 */ nop /* DCCCFC 8024002C 3C028011 */ lui $v0, %hi(gPlayerData) /* DCCD00 80240030 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) /* DCCD04 80240034 80430012 */ lb $v1, 0x12($v0) @@ -22,7 +22,7 @@ glabel func_80240000_DCCCD0 /* DCCD0C 8024003C 1062FFF5 */ beq $v1, $v0, .L80240014 /* DCCD10 80240040 24020007 */ addiu $v0, $zero, 7 /* DCCD14 80240044 1062FFF3 */ beq $v1, $v0, .L80240014 -/* DCCD18 80240048 00000000 */ nop +/* DCCD18 80240048 00000000 */ nop .L8024004C: /* DCCD1C 8024004C 03E00008 */ jr $ra /* DCCD20 80240050 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240054_DCCD24.s b/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240054_DCCD24.s index 8ea990aadd..12ac51eba4 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240054_DCCD24.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240054_DCCD24.s @@ -5,7 +5,7 @@ glabel func_80240054_DCCD24 /* DCCD24 80240054 27BDFFE8 */ addiu $sp, $sp, -0x18 /* DCCD28 80240058 AFBF0010 */ sw $ra, 0x10($sp) /* DCCD2C 8024005C 0C090000 */ jal func_80240000_DCCCD0 -/* DCCD30 80240060 00000000 */ nop +/* DCCD30 80240060 00000000 */ nop /* DCCD34 80240064 2C420001 */ sltiu $v0, $v0, 1 /* DCCD38 80240068 8FBF0010 */ lw $ra, 0x10($sp) /* DCCD3C 8024006C 00021040 */ sll $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240078_DCCD48.s b/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240078_DCCD48.s index c594e1e1f5..4aba741502 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240078_DCCD48.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240078_DCCD48.s @@ -91,7 +91,7 @@ glabel func_80240078_DCCD48 /* DCCE90 802401C0 24020008 */ addiu $v0, $zero, 8 .L802401C4: /* DCCE94 802401C4 14620004 */ bne $v1, $v0, .L802401D8 -/* DCCE98 802401C8 00000000 */ nop +/* DCCE98 802401C8 00000000 */ nop /* DCCE9C 802401CC 82820000 */ lb $v0, ($s4) /* DCCEA0 802401D0 14400032 */ bnez $v0, .L8024029C /* DCCEA4 802401D4 24020002 */ addiu $v0, $zero, 2 @@ -109,10 +109,10 @@ glabel func_80240078_DCCD48 /* DCCECC 802401FC 86E20002 */ lh $v0, 2($s7) /* DCCED0 80240200 8E230000 */ lw $v1, ($s1) /* DCCED4 80240204 10430004 */ beq $v0, $v1, .L80240218 -/* DCCED8 80240208 00000000 */ nop +/* DCCED8 80240208 00000000 */ nop /* DCCEDC 8024020C 86E20004 */ lh $v0, 4($s7) /* DCCEE0 80240210 14430006 */ bne $v0, $v1, .L8024022C -/* DCCEE4 80240214 00000000 */ nop +/* DCCEE4 80240214 00000000 */ nop .L80240218: /* DCCEE8 80240218 C6000000 */ lwc1 $f0, ($s0) /* DCCEEC 8024021C 02561021 */ addu $v0, $s2, $s6 @@ -127,7 +127,7 @@ glabel func_80240078_DCCD48 /* DCCF0C 8024023C 82830003 */ lb $v1, 3($s4) /* DCCF10 80240240 24020002 */ addiu $v0, $zero, 2 /* DCCF14 80240244 14620004 */ bne $v1, $v0, .L80240258 -/* DCCF18 80240248 00000000 */ nop +/* DCCF18 80240248 00000000 */ nop /* DCCF1C 8024024C 82820000 */ lb $v0, ($s4) /* DCCF20 80240250 5440000D */ bnel $v0, $zero, .L80240288 /* DCCF24 80240254 26520008 */ addiu $s2, $s2, 8 @@ -164,4 +164,4 @@ glabel func_80240078_DCCD48 /* DCCF90 802402C0 8FB00048 */ lw $s0, 0x48($sp) /* DCCF94 802402C4 03E00008 */ jr $ra /* DCCF98 802402C8 27BD0070 */ addiu $sp, $sp, 0x70 -/* DCCF9C 802402CC 00000000 */ nop +/* DCCF9C 802402CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCCFA0/func_802402D0_DCCFA0.s b/asm/nonmatchings/world/area_omo/omo_09/DCCFA0/func_802402D0_DCCFA0.s index f565788a9f..8246776561 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCCFA0/func_802402D0_DCCFA0.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCCFA0/func_802402D0_DCCFA0.s @@ -143,7 +143,7 @@ glabel func_802402D0_DCCFA0 /* DCD1A4 802404D4 8FA30014 */ lw $v1, 0x14($sp) /* DCD1A8 802404D8 8FA20010 */ lw $v0, 0x10($sp) /* DCD1AC 802404DC 14620007 */ bne $v1, $v0, .L802404FC -/* DCD1B0 802404E0 00000000 */ nop +/* DCD1B0 802404E0 00000000 */ nop /* DCD1B4 802404E4 8FA20018 */ lw $v0, 0x18($sp) /* DCD1B8 802404E8 14620008 */ bne $v1, $v0, .L8024050C /* DCD1BC 802404EC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCCFA0/func_80240534_DCD204.s b/asm/nonmatchings/world/area_omo/omo_09/DCCFA0/func_80240534_DCD204.s index 4a4d0b2126..02a9040365 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCCFA0/func_80240534_DCD204.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCCFA0/func_80240534_DCD204.s @@ -85,7 +85,7 @@ glabel func_80240534_DCD204 /* DCD338 80240668 2E420004 */ sltiu $v0, $s2, 4 /* DCD33C 8024066C AE00002C */ sw $zero, 0x2c($s0) /* DCD340 80240670 46142102 */ mul.s $f4, $f4, $f20 -/* DCD344 80240674 00000000 */ nop +/* DCD344 80240674 00000000 */ nop /* DCD348 80240678 E6000010 */ swc1 $f0, 0x10($s0) /* DCD34C 8024067C E6020014 */ swc1 $f2, 0x14($s0) /* DCD350 80240680 C7A60020 */ lwc1 $f6, 0x20($sp) @@ -93,7 +93,7 @@ glabel func_80240534_DCD204 /* DCD358 80240688 C6000024 */ lwc1 $f0, 0x24($s0) /* DCD35C 8024068C C7A20028 */ lwc1 $f2, 0x28($sp) /* DCD360 80240690 46140002 */ mul.s $f0, $f0, $f20 -/* DCD364 80240694 00000000 */ nop +/* DCD364 80240694 00000000 */ nop /* DCD368 80240698 E6060018 */ swc1 $f6, 0x18($s0) /* DCD36C 8024069C E6080028 */ swc1 $f8, 0x28($s0) /* DCD370 802406A0 E6020030 */ swc1 $f2, 0x30($s0) @@ -110,5 +110,5 @@ glabel func_80240534_DCD204 /* DCD39C 802406CC 0000102D */ daddu $v0, $zero, $zero /* DCD3A0 802406D0 03E00008 */ jr $ra /* DCD3A4 802406D4 27BD0050 */ addiu $sp, $sp, 0x50 -/* DCD3A8 802406D8 00000000 */ nop -/* DCD3AC 802406DC 00000000 */ nop +/* DCD3A8 802406D8 00000000 */ nop +/* DCD3AC 802406DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD3B0/func_802406E0_DCD3B0.s b/asm/nonmatchings/world/area_omo/omo_09/DCD3B0/func_802406E0_DCD3B0.s index 4286777234..8da0bd033f 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD3B0/func_802406E0_DCD3B0.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD3B0/func_802406E0_DCD3B0.s @@ -7,15 +7,15 @@ glabel func_802406E0_DCD3B0 /* DCD3B8 802406E8 3C014454 */ lui $at, 0x4454 /* DCD3BC 802406EC 34218000 */ ori $at, $at, 0x8000 /* DCD3C0 802406F0 44810000 */ mtc1 $at, $f0 -/* DCD3C4 802406F4 00000000 */ nop +/* DCD3C4 802406F4 00000000 */ nop /* DCD3C8 802406F8 4600103C */ c.lt.s $f2, $f0 -/* DCD3CC 802406FC 00000000 */ nop +/* DCD3CC 802406FC 00000000 */ nop /* DCD3D0 80240700 45010002 */ bc1t .L8024070C /* DCD3D4 80240704 0000102D */ daddu $v0, $zero, $zero /* DCD3D8 80240708 24020002 */ addiu $v0, $zero, 2 .L8024070C: /* DCD3DC 8024070C 03E00008 */ jr $ra -/* DCD3E0 80240710 00000000 */ nop -/* DCD3E4 80240714 00000000 */ nop -/* DCD3E8 80240718 00000000 */ nop -/* DCD3EC 8024071C 00000000 */ nop +/* DCD3E0 80240710 00000000 */ nop +/* DCD3E4 80240714 00000000 */ nop +/* DCD3E8 80240718 00000000 */ nop +/* DCD3EC 8024071C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240720_DCD3F0.s b/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240720_DCD3F0.s index 832f4a0bfd..2a9922b29e 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240720_DCD3F0.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240720_DCD3F0.s @@ -26,7 +26,7 @@ glabel func_80240720_DCD3F0 /* DCD440 80240770 1440FFFA */ bnez $v0, .L8024075C /* DCD444 80240774 24A50004 */ addiu $a1, $a1, 4 /* DCD448 80240778 080901EF */ j .L802407BC -/* DCD44C 8024077C 00000000 */ nop +/* DCD44C 8024077C 00000000 */ nop .L80240780: /* DCD450 80240780 0000182D */ daddu $v1, $zero, $zero /* DCD454 80240784 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802409E0_DCD6B0.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802409E0_DCD6B0.s index 53955b2694..1656e480b5 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802409E0_DCD6B0.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802409E0_DCD6B0.s @@ -15,7 +15,7 @@ glabel func_802409E0_DCD6B0 /* DCD6D8 80240A08 D422A630 */ ldc1 $f2, %lo(D_8024A630)($at) /* DCD6DC 80240A0C 46000021 */ cvt.d.s $f0, $f0 /* DCD6E0 80240A10 46220002 */ mul.d $f0, $f0, $f2 -/* DCD6E4 80240A14 00000000 */ nop +/* DCD6E4 80240A14 00000000 */ nop /* DCD6E8 80240A18 46200020 */ cvt.s.d $f0, $f0 /* DCD6EC 80240A1C E4400018 */ swc1 $f0, 0x18($v0) /* DCD6F0 80240A20 8E0300CC */ lw $v1, 0xcc($s0) diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240A50_DCD720.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240A50_DCD720.s index 21af609798..6217e4aa56 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240A50_DCD720.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240A50_DCD720.s @@ -22,7 +22,7 @@ glabel func_80240A50_DCD720 /* DCD764 80240A94 0C0129E1 */ jal func_8004A784 /* DCD768 80240A98 0000382D */ daddu $a3, $zero, $zero /* DCD76C 80240A9C 14400005 */ bnez $v0, .L80240AB4 -/* DCD770 80240AA0 00000000 */ nop +/* DCD770 80240AA0 00000000 */ nop /* DCD774 80240AA4 8E050018 */ lw $a1, 0x18($s0) /* DCD778 80240AA8 8E06000C */ lw $a2, 0xc($s0) /* DCD77C 80240AAC 0C00EA95 */ jal npc_move_heading @@ -33,13 +33,13 @@ glabel func_80240A50_DCD720 /* DCD78C 80240ABC A602008E */ sh $v0, 0x8e($s0) /* DCD790 80240AC0 00021400 */ sll $v0, $v0, 0x10 /* DCD794 80240AC4 14400010 */ bnez $v0, .L80240B08 -/* DCD798 80240AC8 00000000 */ nop +/* DCD798 80240AC8 00000000 */ nop /* DCD79C 80240ACC C6000018 */ lwc1 $f0, 0x18($s0) /* DCD7A0 80240AD0 3C018025 */ lui $at, %hi(D_8024A638) /* DCD7A4 80240AD4 D422A638 */ ldc1 $f2, %lo(D_8024A638)($at) /* DCD7A8 80240AD8 46000021 */ cvt.d.s $f0, $f0 /* DCD7AC 80240ADC 46220002 */ mul.d $f0, $f0, $f2 -/* DCD7B0 80240AE0 00000000 */ nop +/* DCD7B0 80240AE0 00000000 */ nop /* DCD7B4 80240AE4 46200020 */ cvt.s.d $f0, $f0 /* DCD7B8 80240AE8 E6000018 */ swc1 $f0, 0x18($s0) /* DCD7BC 80240AEC 8E2200CC */ lw $v0, 0xcc($s1) diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240B20_DCD7F0.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240B20_DCD7F0.s index 89beaa3e66..e09f87a355 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240B20_DCD7F0.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240B20_DCD7F0.s @@ -21,7 +21,7 @@ glabel func_80240B20_DCD7F0 /* DCD830 80240B60 0C0129E1 */ jal func_8004A784 /* DCD834 80240B64 0000382D */ daddu $a3, $zero, $zero /* DCD838 80240B68 14400005 */ bnez $v0, .L80240B80 -/* DCD83C 80240B6C 00000000 */ nop +/* DCD83C 80240B6C 00000000 */ nop /* DCD840 80240B70 8E050018 */ lw $a1, 0x18($s0) /* DCD844 80240B74 8E06000C */ lw $a2, 0xc($s0) /* DCD848 80240B78 0C00EA95 */ jal npc_move_heading diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240BB8_DCD888.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240BB8_DCD888.s index 5d6b4f0ad6..6217a52412 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240BB8_DCD888.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240BB8_DCD888.s @@ -16,7 +16,7 @@ glabel func_80240BB8_DCD888 /* DCD8B4 80240BE4 A462008E */ sh $v0, 0x8e($v1) /* DCD8B8 80240BE8 00021400 */ sll $v0, $v0, 0x10 /* DCD8BC 80240BEC 14400005 */ bnez $v0, .L80240C04 -/* DCD8C0 80240BF0 00000000 */ nop +/* DCD8C0 80240BF0 00000000 */ nop /* DCD8C4 80240BF4 8E0200CC */ lw $v0, 0xcc($s0) /* DCD8C8 80240BF8 8C420000 */ lw $v0, ($v0) /* DCD8CC 80240BFC AC620028 */ sw $v0, 0x28($v1) diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s index f9640a304a..aa8713e7fd 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s @@ -124,45 +124,53 @@ glabel func_80240C18_DCD8E8 /* DCDAAC 80240DDC 2C620064 */ sltiu $v0, $v1, 0x64 /* DCDAB0 80240DE0 10400050 */ beqz $v0, .L80240F24 /* DCDAB4 80240DE4 00031080 */ sll $v0, $v1, 2 -/* DCDAB8 80240DE8 3C018025 */ lui $at, %hi(D_8024A640) +/* DCDAB8 80240DE8 3C018025 */ lui $at, %hi(jtbl_8024A640_DD7310) /* DCDABC 80240DEC 00220821 */ addu $at, $at, $v0 -/* DCDAC0 80240DF0 8C22A640 */ lw $v0, %lo(D_8024A640)($at) +/* DCDAC0 80240DF0 8C22A640 */ lw $v0, %lo(jtbl_8024A640_DD7310)($at) /* DCDAC4 80240DF4 00400008 */ jr $v0 /* DCDAC8 80240DF8 00000000 */ nop +glabel L80240DFC_DCDACC /* DCDACC 80240DFC 0260202D */ daddu $a0, $s3, $zero /* DCDAD0 80240E00 0280282D */ daddu $a1, $s4, $zero /* DCDAD4 80240E04 0C012568 */ jal func_800495A0 /* DCDAD8 80240E08 02A0302D */ daddu $a2, $s5, $zero +glabel L80240E0C_DCDADC /* DCDADC 80240E0C 0260202D */ daddu $a0, $s3, $zero /* DCDAE0 80240E10 0280282D */ daddu $a1, $s4, $zero /* DCDAE4 80240E14 0C0125AE */ jal func_800496B8 /* DCDAE8 80240E18 02A0302D */ daddu $a2, $s5, $zero /* DCDAEC 80240E1C 080903C9 */ j .L80240F24 /* DCDAF0 80240E20 00000000 */ nop +glabel L80240E24_DCDAF4 /* DCDAF4 80240E24 0260202D */ daddu $a0, $s3, $zero /* DCDAF8 80240E28 0280282D */ daddu $a1, $s4, $zero /* DCDAFC 80240E2C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DCDB00 80240E30 02A0302D */ daddu $a2, $s5, $zero +glabel L80240E34_DCDB04 /* DCDB04 80240E34 0260202D */ daddu $a0, $s3, $zero /* DCDB08 80240E38 0280282D */ daddu $a1, $s4, $zero /* DCDB0C 80240E3C 0C012701 */ jal func_80049C04 /* DCDB10 80240E40 02A0302D */ daddu $a2, $s5, $zero /* DCDB14 80240E44 080903C9 */ j .L80240F24 /* DCDB18 80240E48 00000000 */ nop +glabel L80240E4C_DCDB1C /* DCDB1C 80240E4C 0260202D */ daddu $a0, $s3, $zero /* DCDB20 80240E50 0280282D */ daddu $a1, $s4, $zero /* DCDB24 80240E54 0C01278F */ jal func_80049E3C /* DCDB28 80240E58 02A0302D */ daddu $a2, $s5, $zero +glabel L80240E5C_DCDB2C /* DCDB2C 80240E5C 0260202D */ daddu $a0, $s3, $zero /* DCDB30 80240E60 0280282D */ daddu $a1, $s4, $zero /* DCDB34 80240E64 0C0127B3 */ jal func_80049ECC /* DCDB38 80240E68 02A0302D */ daddu $a2, $s5, $zero /* DCDB3C 80240E6C 080903C9 */ j .L80240F24 /* DCDB40 80240E70 00000000 */ nop +glabel L80240E74_DCDB44 /* DCDB44 80240E74 0260202D */ daddu $a0, $s3, $zero /* DCDB48 80240E78 0280282D */ daddu $a1, $s4, $zero /* DCDB4C 80240E7C 0C0127DF */ jal func_80049F7C /* DCDB50 80240E80 02A0302D */ daddu $a2, $s5, $zero +glabel L80240E84_DCDB54 /* DCDB54 80240E84 0260202D */ daddu $a0, $s3, $zero /* DCDB58 80240E88 0280282D */ daddu $a1, $s4, $zero /* DCDB5C 80240E8C 0C012849 */ jal func_8004A124 @@ -171,6 +179,7 @@ glabel func_80240C18_DCD8E8 /* DCDB68 80240E98 2402000E */ addiu $v0, $zero, 0xe /* DCDB6C 80240E9C 14620021 */ bne $v1, $v0, .L80240F24 /* DCDB70 80240EA0 00000000 */ nop +glabel L80240EA4_DCDB74 /* DCDB74 80240EA4 0260202D */ daddu $a0, $s3, $zero /* DCDB78 80240EA8 0280282D */ daddu $a1, $s4, $zero /* DCDB7C 80240EAC 0C090278 */ jal func_802409E0_DCD6B0 @@ -179,6 +188,7 @@ glabel func_80240C18_DCD8E8 /* DCDB88 80240EB8 2402000F */ addiu $v0, $zero, 0xf /* DCDB8C 80240EBC 14620019 */ bne $v1, $v0, .L80240F24 /* DCDB90 80240EC0 00000000 */ nop +glabel L80240EC4_DCDB94 /* DCDB94 80240EC4 0260202D */ daddu $a0, $s3, $zero /* DCDB98 80240EC8 0280282D */ daddu $a1, $s4, $zero /* DCDB9C 80240ECC 0C090294 */ jal func_80240A50_DCD720 @@ -187,6 +197,7 @@ glabel func_80240C18_DCD8E8 /* DCDBA8 80240ED8 24020010 */ addiu $v0, $zero, 0x10 /* DCDBAC 80240EDC 14620011 */ bne $v1, $v0, .L80240F24 /* DCDBB0 80240EE0 00000000 */ nop +glabel L80240EE4_DCDBB4 /* DCDBB4 80240EE4 0260202D */ daddu $a0, $s3, $zero /* DCDBB8 80240EE8 0280282D */ daddu $a1, $s4, $zero /* DCDBBC 80240EEC 0C0902C8 */ jal func_80240B20_DCD7F0 @@ -195,15 +206,18 @@ glabel func_80240C18_DCD8E8 /* DCDBC8 80240EF8 24020011 */ addiu $v0, $zero, 0x11 /* DCDBCC 80240EFC 14620009 */ bne $v1, $v0, .L80240F24 /* DCDBD0 80240F00 00000000 */ nop +glabel L80240F04_DCDBD4 /* DCDBD4 80240F04 0260202D */ daddu $a0, $s3, $zero /* DCDBD8 80240F08 0280282D */ daddu $a1, $s4, $zero /* DCDBDC 80240F0C 0C0902EE */ jal func_80240BB8_DCD888 /* DCDBE0 80240F10 02A0302D */ daddu $a2, $s5, $zero /* DCDBE4 80240F14 080903C9 */ j .L80240F24 /* DCDBE8 80240F18 00000000 */ nop +glabel L80240F1C_DCDBEC /* DCDBEC 80240F1C 0C0129CF */ jal func_8004A73C /* DCDBF0 80240F20 0260202D */ daddu $a0, $s3, $zero .L80240F24: +glabel L80240F24_DCDBF4 /* DCDBF4 80240F24 8FBF0060 */ lw $ra, 0x60($sp) /* DCDBF8 80240F28 8FB5005C */ lw $s5, 0x5c($sp) /* DCDBFC 80240F2C 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240F4C_DCDC1C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240F4C_DCDC1C.s index b46c3fd7f4..ada0e4d0bc 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240F4C_DCDC1C.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240F4C_DCDC1C.s @@ -45,7 +45,7 @@ glabel func_80240F4C_DCDC1C /* DCDCB8 80240FE8 0C00A7B5 */ jal dist2D /* DCDCBC 80240FEC 4600B386 */ mov.s $f14, $f22 /* DCDCC0 80240FF0 4614003C */ c.lt.s $f0, $f20 -/* DCDCC4 80240FF4 00000000 */ nop +/* DCDCC4 80240FF4 00000000 */ nop /* DCDCC8 80240FF8 45000003 */ bc1f .L80241008 /* DCDCCC 80240FFC 2631000C */ addiu $s1, $s1, 0xc /* DCDCD0 80241000 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_80240F4C_DCDC1C /* DCDCFC 8024102C 8E6200D0 */ lw $v0, 0xd0($s3) /* DCDD00 80241030 8C42007C */ lw $v0, 0x7c($v0) /* DCDD04 80241034 04410004 */ bgez $v0, .L80241048 -/* DCDD08 80241038 00000000 */ nop +/* DCDD08 80241038 00000000 */ nop /* DCDD0C 8024103C C6C00000 */ lwc1 $f0, ($s6) /* DCDD10 80241040 0809041A */ j .L80241068 /* DCDD14 80241044 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_80240F4C_DCDC1C /* DCDD18 80241048 3C018025 */ lui $at, %hi(D_8024A7D0) /* DCDD1C 8024104C D422A7D0 */ ldc1 $f2, %lo(D_8024A7D0)($at) /* DCDD20 80241050 44820000 */ mtc1 $v0, $f0 -/* DCDD24 80241054 00000000 */ nop +/* DCDD24 80241054 00000000 */ nop /* DCDD28 80241058 46800021 */ cvt.d.w $f0, $f0 /* DCDD2C 8024105C 46220003 */ div.d $f0, $f0, $f2 /* DCDD30 80241060 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802410A4_DCDD74.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802410A4_DCDD74.s index 801922e841..33805e67b8 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802410A4_DCDD74.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802410A4_DCDD74.s @@ -44,7 +44,7 @@ glabel func_802410A4_DCDD74 /* DCDE10 80241140 2402000F */ addiu $v0, $zero, 0xf /* DCDE14 80241144 AFA2001C */ sw $v0, 0x1c($sp) /* DCDE18 80241148 44833000 */ mtc1 $v1, $f6 -/* DCDE1C 8024114C 00000000 */ nop +/* DCDE1C 8024114C 00000000 */ nop /* DCDE20 80241150 468031A0 */ cvt.s.w $f6, $f6 /* DCDE24 80241154 44073000 */ mfc1 $a3, $f6 /* DCDE28 80241158 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_802410A4_DCDD74 .L802411A8: /* DCDE78 802411A8 8602008C */ lh $v0, 0x8c($s0) /* DCDE7C 802411AC 1440005D */ bnez $v0, .L80241324 -/* DCDE80 802411B0 00000000 */ nop +/* DCDE80 802411B0 00000000 */ nop /* DCDE84 802411B4 C6000018 */ lwc1 $f0, 0x18($s0) /* DCDE88 802411B8 3C014010 */ lui $at, 0x4010 /* DCDE8C 802411BC 44811800 */ mtc1 $at, $f3 /* DCDE90 802411C0 44801000 */ mtc1 $zero, $f2 /* DCDE94 802411C4 46000021 */ cvt.d.s $f0, $f0 /* DCDE98 802411C8 4622003C */ c.lt.d $f0, $f2 -/* DCDE9C 802411CC 00000000 */ nop +/* DCDE9C 802411CC 00000000 */ nop /* DCDEA0 802411D0 45000003 */ bc1f .L802411E0 /* DCDEA4 802411D4 0200202D */ daddu $a0, $s0, $zero /* DCDEA8 802411D8 08090479 */ j .L802411E4 @@ -88,7 +88,7 @@ glabel func_802410A4_DCDD74 /* DCDEB0 802411E0 24050001 */ addiu $a1, $zero, 1 .L802411E4: /* DCDEB4 802411E4 0C00F598 */ jal func_8003D660 -/* DCDEB8 802411E8 00000000 */ nop +/* DCDEB8 802411E8 00000000 */ nop /* DCDEBC 802411EC C60C0038 */ lwc1 $f12, 0x38($s0) /* DCDEC0 802411F0 8E430078 */ lw $v1, 0x78($s2) /* DCDEC4 802411F4 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_802410A4_DCDD74 /* DCDEEC 8024121C 4406B000 */ mfc1 $a2, $f22 /* DCDEF0 80241220 4407A000 */ mfc1 $a3, $f20 /* DCDEF4 80241224 0C00A720 */ jal atan2 -/* DCDEF8 80241228 00000000 */ nop +/* DCDEF8 80241228 00000000 */ nop /* DCDEFC 8024122C 8E050018 */ lw $a1, 0x18($s0) /* DCDF00 80241230 44060000 */ mfc1 $a2, $f0 /* DCDF04 80241234 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_802410A4_DCDD74 /* DCDF18 80241248 4406B000 */ mfc1 $a2, $f22 /* DCDF1C 8024124C 4407A000 */ mfc1 $a3, $f20 /* DCDF20 80241250 0C00A7B5 */ jal dist2D -/* DCDF24 80241254 00000000 */ nop +/* DCDF24 80241254 00000000 */ nop /* DCDF28 80241258 C6020018 */ lwc1 $f2, 0x18($s0) /* DCDF2C 8024125C 4602003E */ c.le.s $f0, $f2 -/* DCDF30 80241260 00000000 */ nop +/* DCDF30 80241260 00000000 */ nop /* DCDF34 80241264 4500002F */ bc1f .L80241324 /* DCDF38 80241268 240403E8 */ addiu $a0, $zero, 0x3e8 /* DCDF3C 8024126C 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_802410A4_DCDD74 /* DCDF90 802412C0 18400003 */ blez $v0, .L802412D0 /* DCDF94 802412C4 24020004 */ addiu $v0, $zero, 4 /* DCDF98 802412C8 14600002 */ bnez $v1, .L802412D4 -/* DCDF9C 802412CC 00000000 */ nop +/* DCDF9C 802412CC 00000000 */ nop .L802412D0: /* DCDFA0 802412D0 AE420070 */ sw $v0, 0x70($s2) .L802412D4: diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024140C_DCE0DC.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024140C_DCE0DC.s index 282de444a0..5b4cf74ea4 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024140C_DCE0DC.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024140C_DCE0DC.s @@ -38,7 +38,7 @@ glabel func_8024140C_DCE0DC /* DCE160 80241490 2402000F */ addiu $v0, $zero, 0xf /* DCE164 80241494 AFA2001C */ sw $v0, 0x1c($sp) /* DCE168 80241498 44833000 */ mtc1 $v1, $f6 -/* DCE16C 8024149C 00000000 */ nop +/* DCE16C 8024149C 00000000 */ nop /* DCE170 802414A0 468031A0 */ cvt.s.w $f6, $f6 /* DCE174 802414A4 44073000 */ mfc1 $a3, $f6 /* DCE178 802414A8 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_8024140C_DCE0DC .L8024150C: /* DCE1DC 8024150C 8602008C */ lh $v0, 0x8c($s0) /* DCE1E0 80241510 14400025 */ bnez $v0, .L802415A8 -/* DCE1E4 80241514 00000000 */ nop +/* DCE1E4 80241514 00000000 */ nop /* DCE1E8 80241518 9602008E */ lhu $v0, 0x8e($s0) /* DCE1EC 8024151C 2442FFFF */ addiu $v0, $v0, -1 /* DCE1F0 80241520 A602008E */ sh $v0, 0x8e($s0) /* DCE1F4 80241524 00021400 */ sll $v0, $v0, 0x10 /* DCE1F8 80241528 1440001F */ bnez $v0, .L802415A8 -/* DCE1FC 8024152C 00000000 */ nop +/* DCE1FC 8024152C 00000000 */ nop /* DCE200 80241530 8E820074 */ lw $v0, 0x74($s4) /* DCE204 80241534 2442FFFF */ addiu $v0, $v0, -1 /* DCE208 80241538 10400019 */ beqz $v0, .L802415A0 @@ -84,7 +84,7 @@ glabel func_8024140C_DCE0DC /* DCE214 80241544 9442002A */ lhu $v0, 0x2a($v0) /* DCE218 80241548 30420010 */ andi $v0, $v0, 0x10 /* DCE21C 8024154C 14400007 */ bnez $v0, .L8024156C -/* DCE220 80241550 00000000 */ nop +/* DCE220 80241550 00000000 */ nop /* DCE224 80241554 C600000C */ lwc1 $f0, 0xc($s0) /* DCE228 80241558 3C014334 */ lui $at, 0x4334 /* DCE22C 8024155C 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802415C8_DCE298.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802415C8_DCE298.s index b59b455fcd..ee72665bff 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802415C8_DCE298.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802415C8_DCE298.s @@ -28,7 +28,7 @@ glabel func_802415C8_DCE298 /* DCE2F0 80241620 8E0200D0 */ lw $v0, 0xd0($s0) /* DCE2F4 80241624 8C42007C */ lw $v0, 0x7c($v0) /* DCE2F8 80241628 04410004 */ bgez $v0, .L8024163C -/* DCE2FC 8024162C 00000000 */ nop +/* DCE2FC 8024162C 00000000 */ nop /* DCE300 80241630 C6400000 */ lwc1 $f0, ($s2) /* DCE304 80241634 08090597 */ j .L8024165C /* DCE308 80241638 E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_802415C8_DCE298 /* DCE30C 8024163C 3C018025 */ lui $at, %hi(pause_items_handle_input) /* DCE310 80241640 D422A7D8 */ ldc1 $f2, %lo(pause_items_handle_input)($at) /* DCE314 80241644 44820000 */ mtc1 $v0, $f0 -/* DCE318 80241648 00000000 */ nop +/* DCE318 80241648 00000000 */ nop /* DCE31C 8024164C 46800021 */ cvt.d.w $f0, $f0 /* DCE320 80241650 46220003 */ div.d $f0, $f0, $f2 /* DCE324 80241654 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241768_DCE438.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241768_DCE438.s index 2ffc293aaa..b2622d7179 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241768_DCE438.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241768_DCE438.s @@ -47,20 +47,20 @@ glabel func_80241768_DCE438 /* DCE4E0 80241810 8E02001C */ lw $v0, 0x1c($s0) /* DCE4E4 80241814 46001005 */ abs.s $f0, $f2 /* DCE4E8 80241818 44822000 */ mtc1 $v0, $f4 -/* DCE4EC 8024181C 00000000 */ nop +/* DCE4EC 8024181C 00000000 */ nop /* DCE4F0 80241820 46802120 */ cvt.s.w $f4, $f4 /* DCE4F4 80241824 4600203C */ c.lt.s $f4, $f0 -/* DCE4F8 80241828 00000000 */ nop +/* DCE4F8 80241828 00000000 */ nop /* DCE4FC 8024182C 4500000D */ bc1f .L80241864 -/* DCE500 80241830 00000000 */ nop +/* DCE500 80241830 00000000 */ nop /* DCE504 80241834 44800000 */ mtc1 $zero, $f0 /* DCE508 80241838 C654000C */ lwc1 $f20, 0xc($s2) /* DCE50C 8024183C 4600103C */ c.lt.s $f2, $f0 -/* DCE510 80241840 00000000 */ nop +/* DCE510 80241840 00000000 */ nop /* DCE514 80241844 45000006 */ bc1f .L80241860 /* DCE518 80241848 00021023 */ negu $v0, $v0 /* DCE51C 8024184C 44820000 */ mtc1 $v0, $f0 -/* DCE520 80241850 00000000 */ nop +/* DCE520 80241850 00000000 */ nop /* DCE524 80241854 46800020 */ cvt.s.w $f0, $f0 /* DCE528 80241858 08090619 */ j .L80241864 /* DCE52C 8024185C 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241898_DCE568.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241898_DCE568.s index 0742549116..b4699e10aa 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241898_DCE568.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241898_DCE568.s @@ -37,7 +37,7 @@ glabel func_80241898_DCE568 /* DCE5E8 80241918 2402000F */ addiu $v0, $zero, 0xf /* DCE5EC 8024191C AFA2001C */ sw $v0, 0x1c($sp) /* DCE5F0 80241920 44833000 */ mtc1 $v1, $f6 -/* DCE5F4 80241924 00000000 */ nop +/* DCE5F4 80241924 00000000 */ nop /* DCE5F8 80241928 468031A0 */ cvt.s.w $f6, $f6 /* DCE5FC 8024192C 44073000 */ mfc1 $a3, $f6 /* DCE600 80241930 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241A20_DCE6F0.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241A20_DCE6F0.s index b32f052a2f..28f7ff9e98 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241A20_DCE6F0.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241A20_DCE6F0.s @@ -28,7 +28,7 @@ glabel func_80241A20_DCE6F0 /* DCE748 80241A78 C4400008 */ lwc1 $f0, 8($v0) /* DCE74C 80241A7C 46800020 */ cvt.s.w $f0, $f0 /* DCE750 80241A80 4602003E */ c.le.s $f0, $f2 -/* DCE754 80241A84 00000000 */ nop +/* DCE754 80241A84 00000000 */ nop /* DCE758 80241A88 45020003 */ bc1fl .L80241A98 /* DCE75C 80241A8C 24840001 */ addiu $a0, $a0, 1 /* DCE760 80241A90 080906AA */ j .L80241AA8 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s index 348163d71c..78b23ddbdf 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s @@ -46,7 +46,7 @@ glabel func_80241AE0_DCE7B0 /* DCE854 80241B84 8E2200B0 */ lw $v0, 0xb0($s1) /* DCE858 80241B88 30420004 */ andi $v0, $v0, 4 /* DCE85C 80241B8C 10400044 */ beqz $v0, .L80241CA0 -/* DCE860 80241B90 00000000 */ nop +/* DCE860 80241B90 00000000 */ nop .L80241B94: /* DCE864 80241B94 2404F7FF */ addiu $a0, $zero, -0x801 /* DCE868 80241B98 AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80241AE0_DCE7B0 /* DCE91C 80241C4C 3C0142C8 */ lui $at, 0x42c8 /* DCE920 80241C50 44812000 */ mtc1 $at, $f4 /* DCE924 80241C54 44823000 */ mtc1 $v0, $f6 -/* DCE928 80241C58 00000000 */ nop +/* DCE928 80241C58 00000000 */ nop /* DCE92C 80241C5C 468031A0 */ cvt.s.w $f6, $f6 /* DCE930 80241C60 27A20044 */ addiu $v0, $sp, 0x44 /* DCE934 80241C64 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80241AE0_DCE7B0 /* DCE958 80241C88 0C0372DF */ jal func_800DCB7C /* DCE95C 80241C8C 27A70040 */ addiu $a3, $sp, 0x40 /* DCE960 80241C90 10400003 */ beqz $v0, .L80241CA0 -/* DCE964 80241C94 00000000 */ nop +/* DCE964 80241C94 00000000 */ nop /* DCE968 80241C98 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DCE96C 80241C9C E640003C */ swc1 $f0, 0x3c($s2) .L80241CA0: @@ -124,72 +124,85 @@ glabel func_80241AE0_DCE7B0 /* DCE974 80241CA4 2C620064 */ sltiu $v0, $v1, 0x64 /* DCE978 80241CA8 10400042 */ beqz $v0, .L80241DB4 /* DCE97C 80241CAC 00031080 */ sll $v0, $v1, 2 -/* DCE980 80241CB0 3C018025 */ lui $at, %hi(D_8024A7E0) +/* DCE980 80241CB0 3C018025 */ lui $at, %hi(jtbl_8024A7E0_DD74B0) /* DCE984 80241CB4 00220821 */ addu $at, $at, $v0 -/* DCE988 80241CB8 8C22A7E0 */ lw $v0, %lo(D_8024A7E0)($at) +/* DCE988 80241CB8 8C22A7E0 */ lw $v0, %lo(jtbl_8024A7E0_DD74B0)($at) /* DCE98C 80241CBC 00400008 */ jr $v0 -/* DCE990 80241CC0 00000000 */ nop +/* DCE990 80241CC0 00000000 */ nop +glabel L80241CC4_DCE994 /* DCE994 80241CC4 0280202D */ daddu $a0, $s4, $zero /* DCE998 80241CC8 0260282D */ daddu $a1, $s3, $zero /* DCE99C 80241CCC 0C0903D3 */ jal func_80240F4C_DCDC1C /* DCE9A0 80241CD0 02A0302D */ daddu $a2, $s5, $zero +glabel L80241CD4_DCE9A4 /* DCE9A4 80241CD4 0280202D */ daddu $a0, $s4, $zero /* DCE9A8 80241CD8 0260282D */ daddu $a1, $s3, $zero /* DCE9AC 80241CDC 0C090429 */ jal func_802410A4_DCDD74 /* DCE9B0 80241CE0 02A0302D */ daddu $a2, $s5, $zero /* DCE9B4 80241CE4 0809076D */ j .L80241DB4 -/* DCE9B8 80241CE8 00000000 */ nop +/* DCE9B8 80241CE8 00000000 */ nop +glabel L80241CEC_DCE9BC /* DCE9BC 80241CEC 0280202D */ daddu $a0, $s4, $zero /* DCE9C0 80241CF0 0260282D */ daddu $a1, $s3, $zero /* DCE9C4 80241CF4 0C0904D3 */ jal omo_09_UnkNpcAIFunc1 /* DCE9C8 80241CF8 02A0302D */ daddu $a2, $s5, $zero +glabel L80241CFC_DCE9CC /* DCE9CC 80241CFC 0280202D */ daddu $a0, $s4, $zero /* DCE9D0 80241D00 0260282D */ daddu $a1, $s3, $zero /* DCE9D4 80241D04 0C090503 */ jal func_8024140C_DCE0DC /* DCE9D8 80241D08 02A0302D */ daddu $a2, $s5, $zero /* DCE9DC 80241D0C 0809076D */ j .L80241DB4 -/* DCE9E0 80241D10 00000000 */ nop +/* DCE9E0 80241D10 00000000 */ nop +glabel L80241D14_DCE9E4 /* DCE9E4 80241D14 0280202D */ daddu $a0, $s4, $zero /* DCE9E8 80241D18 0260282D */ daddu $a1, $s3, $zero /* DCE9EC 80241D1C 0C090572 */ jal func_802415C8_DCE298 /* DCE9F0 80241D20 02A0302D */ daddu $a2, $s5, $zero /* DCE9F4 80241D24 0809076D */ j .L80241DB4 -/* DCE9F8 80241D28 00000000 */ nop +/* DCE9F8 80241D28 00000000 */ nop +glabel L80241D2C_DCE9FC /* DCE9FC 80241D2C 0280202D */ daddu $a0, $s4, $zero /* DCEA00 80241D30 0260282D */ daddu $a1, $s3, $zero /* DCEA04 80241D34 0C09059F */ jal omo_09_NpcJumpFunc2 /* DCEA08 80241D38 02A0302D */ daddu $a2, $s5, $zero +glabel L80241D3C_DCEA0C /* DCEA0C 80241D3C 0280202D */ daddu $a0, $s4, $zero /* DCEA10 80241D40 0260282D */ daddu $a1, $s3, $zero /* DCEA14 80241D44 0C0905BC */ jal omo_09_NpcJumpFunc /* DCEA18 80241D48 02A0302D */ daddu $a2, $s5, $zero /* DCEA1C 80241D4C 0809076D */ j .L80241DB4 -/* DCEA20 80241D50 00000000 */ nop +/* DCEA20 80241D50 00000000 */ nop +glabel L80241D54_DCEA24 /* DCEA24 80241D54 0280202D */ daddu $a0, $s4, $zero /* DCEA28 80241D58 0260282D */ daddu $a1, $s3, $zero /* DCEA2C 80241D5C 0C0905DA */ jal func_80241768_DCE438 /* DCEA30 80241D60 02A0302D */ daddu $a2, $s5, $zero +glabel L80241D64_DCEA34 /* DCEA34 80241D64 0280202D */ daddu $a0, $s4, $zero /* DCEA38 80241D68 0260282D */ daddu $a1, $s3, $zero /* DCEA3C 80241D6C 0C090626 */ jal func_80241898_DCE568 /* DCEA40 80241D70 02A0302D */ daddu $a2, $s5, $zero /* DCEA44 80241D74 0809076D */ j .L80241DB4 -/* DCEA48 80241D78 00000000 */ nop +/* DCEA48 80241D78 00000000 */ nop +glabel L80241D7C_DCEA4C /* DCEA4C 80241D7C 0280202D */ daddu $a0, $s4, $zero /* DCEA50 80241D80 0260282D */ daddu $a1, $s3, $zero /* DCEA54 80241D84 0C09066E */ jal omo_09_UnkNpcDurationFlagFunc /* DCEA58 80241D88 02A0302D */ daddu $a2, $s5, $zero /* DCEA5C 80241D8C 0809076D */ j .L80241DB4 -/* DCEA60 80241D90 00000000 */ nop +/* DCEA60 80241D90 00000000 */ nop +glabel L80241D94_DCEA64 /* DCEA64 80241D94 0280202D */ daddu $a0, $s4, $zero /* DCEA68 80241D98 0260282D */ daddu $a1, $s3, $zero /* DCEA6C 80241D9C 0C090688 */ jal func_80241A20_DCE6F0 /* DCEA70 80241DA0 02A0302D */ daddu $a2, $s5, $zero /* DCEA74 80241DA4 0809076D */ j .L80241DB4 -/* DCEA78 80241DA8 00000000 */ nop +/* DCEA78 80241DA8 00000000 */ nop +glabel L80241DAC_DCEA7C /* DCEA7C 80241DAC 0C0129CF */ jal func_8004A73C /* DCEA80 80241DB0 0280202D */ daddu $a0, $s4, $zero .L80241DB4: +glabel L80241DB4_DCEA84 /* DCEA84 80241DB4 8FBF0060 */ lw $ra, 0x60($sp) /* DCEA88 80241DB8 8FB5005C */ lw $s5, 0x5c($sp) /* DCEA8C 80241DBC 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241DDC_DCEAAC.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241DDC_DCEAAC.s index cf297730a4..34fe0c6d82 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241DDC_DCEAAC.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241DDC_DCEAAC.s @@ -15,7 +15,7 @@ glabel func_80241DDC_DCEAAC /* DCEAD4 80241E04 D422A970 */ ldc1 $f2, %lo(D_8024A970)($at) /* DCEAD8 80241E08 46000021 */ cvt.d.s $f0, $f0 /* DCEADC 80241E0C 46220002 */ mul.d $f0, $f0, $f2 -/* DCEAE0 80241E10 00000000 */ nop +/* DCEAE0 80241E10 00000000 */ nop /* DCEAE4 80241E14 46200020 */ cvt.s.d $f0, $f0 /* DCEAE8 80241E18 E4400018 */ swc1 $f0, 0x18($v0) /* DCEAEC 80241E1C 8E0300CC */ lw $v1, 0xcc($s0) diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241E4C_DCEB1C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241E4C_DCEB1C.s index 2fc04f57e2..16accace14 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241E4C_DCEB1C.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241E4C_DCEB1C.s @@ -22,7 +22,7 @@ glabel func_80241E4C_DCEB1C /* DCEB60 80241E90 0C0129E1 */ jal func_8004A784 /* DCEB64 80241E94 0000382D */ daddu $a3, $zero, $zero /* DCEB68 80241E98 14400005 */ bnez $v0, .L80241EB0 -/* DCEB6C 80241E9C 00000000 */ nop +/* DCEB6C 80241E9C 00000000 */ nop /* DCEB70 80241EA0 8E050018 */ lw $a1, 0x18($s0) /* DCEB74 80241EA4 8E06000C */ lw $a2, 0xc($s0) /* DCEB78 80241EA8 0C00EA95 */ jal npc_move_heading @@ -33,13 +33,13 @@ glabel func_80241E4C_DCEB1C /* DCEB88 80241EB8 A602008E */ sh $v0, 0x8e($s0) /* DCEB8C 80241EBC 00021400 */ sll $v0, $v0, 0x10 /* DCEB90 80241EC0 14400010 */ bnez $v0, .L80241F04 -/* DCEB94 80241EC4 00000000 */ nop +/* DCEB94 80241EC4 00000000 */ nop /* DCEB98 80241EC8 C6000018 */ lwc1 $f0, 0x18($s0) /* DCEB9C 80241ECC 3C018025 */ lui $at, %hi(D_8024A978) /* DCEBA0 80241ED0 D422A978 */ ldc1 $f2, %lo(D_8024A978)($at) /* DCEBA4 80241ED4 46000021 */ cvt.d.s $f0, $f0 /* DCEBA8 80241ED8 46220002 */ mul.d $f0, $f0, $f2 -/* DCEBAC 80241EDC 00000000 */ nop +/* DCEBAC 80241EDC 00000000 */ nop /* DCEBB0 80241EE0 46200020 */ cvt.s.d $f0, $f0 /* DCEBB4 80241EE4 E6000018 */ swc1 $f0, 0x18($s0) /* DCEBB8 80241EE8 8E2200CC */ lw $v0, 0xcc($s1) diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241F1C_DCEBEC.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241F1C_DCEBEC.s index d1012edefa..823ed077a1 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241F1C_DCEBEC.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241F1C_DCEBEC.s @@ -21,7 +21,7 @@ glabel func_80241F1C_DCEBEC /* DCEC2C 80241F5C 0C0129E1 */ jal func_8004A784 /* DCEC30 80241F60 0000382D */ daddu $a3, $zero, $zero /* DCEC34 80241F64 14400005 */ bnez $v0, .L80241F7C -/* DCEC38 80241F68 00000000 */ nop +/* DCEC38 80241F68 00000000 */ nop /* DCEC3C 80241F6C 8E050018 */ lw $a1, 0x18($s0) /* DCEC40 80241F70 8E06000C */ lw $a2, 0xc($s0) /* DCEC44 80241F74 0C00EA95 */ jal npc_move_heading diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241FB4_DCEC84.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241FB4_DCEC84.s index fdd8226889..d0c0d61f14 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241FB4_DCEC84.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241FB4_DCEC84.s @@ -16,7 +16,7 @@ glabel func_80241FB4_DCEC84 /* DCECB0 80241FE0 A462008E */ sh $v0, 0x8e($v1) /* DCECB4 80241FE4 00021400 */ sll $v0, $v0, 0x10 /* DCECB8 80241FE8 14400005 */ bnez $v0, .L80242000 -/* DCECBC 80241FEC 00000000 */ nop +/* DCECBC 80241FEC 00000000 */ nop /* DCECC0 80241FF0 8E0200CC */ lw $v0, 0xcc($s0) /* DCECC4 80241FF4 8C420000 */ lw $v0, ($v0) /* DCECC8 80241FF8 AC620028 */ sw $v0, 0x28($v1) diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s index 5a7ae50085..a097dbe88a 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s @@ -46,7 +46,7 @@ glabel func_80242014_DCECE4 /* DCED88 802420B8 8E2200B0 */ lw $v0, 0xb0($s1) /* DCED8C 802420BC 30420004 */ andi $v0, $v0, 4 /* DCED90 802420C0 10400044 */ beqz $v0, .L802421D4 -/* DCED94 802420C4 00000000 */ nop +/* DCED94 802420C4 00000000 */ nop .L802420C8: /* DCED98 802420C8 2404F7FF */ addiu $a0, $zero, -0x801 /* DCED9C 802420CC AE600070 */ sw $zero, 0x70($s3) @@ -101,7 +101,7 @@ glabel func_80242014_DCECE4 /* DCEE50 80242180 3C0142C8 */ lui $at, 0x42c8 /* DCEE54 80242184 44812000 */ mtc1 $at, $f4 /* DCEE58 80242188 44823000 */ mtc1 $v0, $f6 -/* DCEE5C 8024218C 00000000 */ nop +/* DCEE5C 8024218C 00000000 */ nop /* DCEE60 80242190 468031A0 */ cvt.s.w $f6, $f6 /* DCEE64 80242194 27A20044 */ addiu $v0, $sp, 0x44 /* DCEE68 80242198 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80242014_DCECE4 /* DCEE8C 802421BC 0C0372DF */ jal func_800DCB7C /* DCEE90 802421C0 27A70040 */ addiu $a3, $sp, 0x40 /* DCEE94 802421C4 10400003 */ beqz $v0, .L802421D4 -/* DCEE98 802421C8 00000000 */ nop +/* DCEE98 802421C8 00000000 */ nop /* DCEE9C 802421CC C7A0003C */ lwc1 $f0, 0x3c($sp) /* DCEEA0 802421D0 E640003C */ swc1 $f0, 0x3c($s2) .L802421D4: @@ -124,57 +124,67 @@ glabel func_80242014_DCECE4 /* DCEEA8 802421D8 2C620064 */ sltiu $v0, $v1, 0x64 /* DCEEAC 802421DC 10400054 */ beqz $v0, .L80242330 /* DCEEB0 802421E0 00031080 */ sll $v0, $v1, 2 -/* DCEEB4 802421E4 3C018025 */ lui $at, %hi(D_8024A980) +/* DCEEB4 802421E4 3C018025 */ lui $at, %hi(jtbl_8024A980_DD7650) /* DCEEB8 802421E8 00220821 */ addu $at, $at, $v0 -/* DCEEBC 802421EC 8C22A980 */ lw $v0, %lo(D_8024A980)($at) +/* DCEEBC 802421EC 8C22A980 */ lw $v0, %lo(jtbl_8024A980_DD7650)($at) /* DCEEC0 802421F0 00400008 */ jr $v0 -/* DCEEC4 802421F4 00000000 */ nop +/* DCEEC4 802421F4 00000000 */ nop +glabel L802421F8_DCEEC8 /* DCEEC8 802421F8 0260202D */ daddu $a0, $s3, $zero /* DCEECC 802421FC 0280282D */ daddu $a1, $s4, $zero /* DCEED0 80242200 0C0903D3 */ jal func_80240F4C_DCDC1C /* DCEED4 80242204 02A0302D */ daddu $a2, $s5, $zero +glabel L80242208_DCEED8 /* DCEED8 80242208 0260202D */ daddu $a0, $s3, $zero /* DCEEDC 8024220C 0280282D */ daddu $a1, $s4, $zero /* DCEEE0 80242210 0C090429 */ jal func_802410A4_DCDD74 /* DCEEE4 80242214 02A0302D */ daddu $a2, $s5, $zero /* DCEEE8 80242218 080908CC */ j .L80242330 -/* DCEEEC 8024221C 00000000 */ nop +/* DCEEEC 8024221C 00000000 */ nop +glabel L80242220_DCEEF0 /* DCEEF0 80242220 0260202D */ daddu $a0, $s3, $zero /* DCEEF4 80242224 0280282D */ daddu $a1, $s4, $zero /* DCEEF8 80242228 0C0904D3 */ jal omo_09_UnkNpcAIFunc1 /* DCEEFC 8024222C 02A0302D */ daddu $a2, $s5, $zero +glabel L80242230_DCEF00 /* DCEF00 80242230 0260202D */ daddu $a0, $s3, $zero /* DCEF04 80242234 0280282D */ daddu $a1, $s4, $zero /* DCEF08 80242238 0C090503 */ jal func_8024140C_DCE0DC /* DCEF0C 8024223C 02A0302D */ daddu $a2, $s5, $zero /* DCEF10 80242240 080908CC */ j .L80242330 -/* DCEF14 80242244 00000000 */ nop +/* DCEF14 80242244 00000000 */ nop +glabel L80242248_DCEF18 /* DCEF18 80242248 0260202D */ daddu $a0, $s3, $zero /* DCEF1C 8024224C 0280282D */ daddu $a1, $s4, $zero /* DCEF20 80242250 0C090572 */ jal func_802415C8_DCE298 /* DCEF24 80242254 02A0302D */ daddu $a2, $s5, $zero /* DCEF28 80242258 080908CC */ j .L80242330 -/* DCEF2C 8024225C 00000000 */ nop +/* DCEF2C 8024225C 00000000 */ nop +glabel L80242260_DCEF30 /* DCEF30 80242260 0260202D */ daddu $a0, $s3, $zero /* DCEF34 80242264 0280282D */ daddu $a1, $s4, $zero /* DCEF38 80242268 0C09059F */ jal omo_09_NpcJumpFunc2 /* DCEF3C 8024226C 02A0302D */ daddu $a2, $s5, $zero +glabel L80242270_DCEF40 /* DCEF40 80242270 0260202D */ daddu $a0, $s3, $zero /* DCEF44 80242274 0280282D */ daddu $a1, $s4, $zero /* DCEF48 80242278 0C0905BC */ jal omo_09_NpcJumpFunc /* DCEF4C 8024227C 02A0302D */ daddu $a2, $s5, $zero /* DCEF50 80242280 080908CC */ j .L80242330 -/* DCEF54 80242284 00000000 */ nop +/* DCEF54 80242284 00000000 */ nop +glabel L80242288_DCEF58 /* DCEF58 80242288 0260202D */ daddu $a0, $s3, $zero /* DCEF5C 8024228C 0280282D */ daddu $a1, $s4, $zero /* DCEF60 80242290 0C0905DA */ jal func_80241768_DCE438 /* DCEF64 80242294 02A0302D */ daddu $a2, $s5, $zero +glabel L80242298_DCEF68 /* DCEF68 80242298 0260202D */ daddu $a0, $s3, $zero /* DCEF6C 8024229C 0280282D */ daddu $a1, $s4, $zero /* DCEF70 802422A0 0C090626 */ jal func_80241898_DCE568 /* DCEF74 802422A4 02A0302D */ daddu $a2, $s5, $zero /* DCEF78 802422A8 080908CC */ j .L80242330 -/* DCEF7C 802422AC 00000000 */ nop +/* DCEF7C 802422AC 00000000 */ nop +glabel L802422B0_DCEF80 /* DCEF80 802422B0 0260202D */ daddu $a0, $s3, $zero /* DCEF84 802422B4 0280282D */ daddu $a1, $s4, $zero /* DCEF88 802422B8 0C090777 */ jal func_80241DDC_DCEAAC @@ -182,7 +192,8 @@ glabel func_80242014_DCECE4 /* DCEF90 802422C0 8E630070 */ lw $v1, 0x70($s3) /* DCEF94 802422C4 2402000F */ addiu $v0, $zero, 0xf /* DCEF98 802422C8 14620019 */ bne $v1, $v0, .L80242330 -/* DCEF9C 802422CC 00000000 */ nop +/* DCEF9C 802422CC 00000000 */ nop +glabel L802422D0_DCEFA0 /* DCEFA0 802422D0 0260202D */ daddu $a0, $s3, $zero /* DCEFA4 802422D4 0280282D */ daddu $a1, $s4, $zero /* DCEFA8 802422D8 0C090793 */ jal func_80241E4C_DCEB1C @@ -190,7 +201,8 @@ glabel func_80242014_DCECE4 /* DCEFB0 802422E0 8E630070 */ lw $v1, 0x70($s3) /* DCEFB4 802422E4 24020010 */ addiu $v0, $zero, 0x10 /* DCEFB8 802422E8 14620011 */ bne $v1, $v0, .L80242330 -/* DCEFBC 802422EC 00000000 */ nop +/* DCEFBC 802422EC 00000000 */ nop +glabel L802422F0_DCEFC0 /* DCEFC0 802422F0 0260202D */ daddu $a0, $s3, $zero /* DCEFC4 802422F4 0280282D */ daddu $a1, $s4, $zero /* DCEFC8 802422F8 0C0907C7 */ jal func_80241F1C_DCEBEC @@ -198,16 +210,19 @@ glabel func_80242014_DCECE4 /* DCEFD0 80242300 8E630070 */ lw $v1, 0x70($s3) /* DCEFD4 80242304 24020011 */ addiu $v0, $zero, 0x11 /* DCEFD8 80242308 14620009 */ bne $v1, $v0, .L80242330 -/* DCEFDC 8024230C 00000000 */ nop +/* DCEFDC 8024230C 00000000 */ nop +glabel L80242310_DCEFE0 /* DCEFE0 80242310 0260202D */ daddu $a0, $s3, $zero /* DCEFE4 80242314 0280282D */ daddu $a1, $s4, $zero /* DCEFE8 80242318 0C0907ED */ jal func_80241FB4_DCEC84 /* DCEFEC 8024231C 02A0302D */ daddu $a2, $s5, $zero /* DCEFF0 80242320 080908CC */ j .L80242330 -/* DCEFF4 80242324 00000000 */ nop +/* DCEFF4 80242324 00000000 */ nop +glabel L80242328_DCEFF8 /* DCEFF8 80242328 0C0129CF */ jal func_8004A73C /* DCEFFC 8024232C 0260202D */ daddu $a0, $s3, $zero .L80242330: +glabel L80242330_DCF000 /* DCF000 80242330 8FBF0060 */ lw $ra, 0x60($sp) /* DCF004 80242334 8FB5005C */ lw $s5, 0x5c($sp) /* DCF008 80242338 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358_DCF028.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358_DCF028.s index 22ad1713ac..4c3cee928a 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358_DCF028.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358_DCF028.s @@ -42,16 +42,16 @@ glabel func_80242358_DCF028 /* DCF0BC 802423EC 3C014387 */ lui $at, 0x4387 /* DCF0C0 802423F0 4481A000 */ mtc1 $at, $f20 /* DCF0C4 802423F4 0C00A70A */ jal get_clamped_angle_diff -/* DCF0C8 802423F8 00000000 */ nop +/* DCF0C8 802423F8 00000000 */ nop /* DCF0CC 802423FC 0C00A6C9 */ jal clamp_angle /* DCF0D0 80242400 46000306 */ mov.s $f12, $f0 /* DCF0D4 80242404 3C018025 */ lui $at, %hi(D_8024AB10) /* DCF0D8 80242408 D422AB10 */ ldc1 $f2, %lo(D_8024AB10)($at) /* DCF0DC 8024240C 46000021 */ cvt.d.s $f0, $f0 /* DCF0E0 80242410 4622003C */ c.lt.d $f0, $f2 -/* DCF0E4 80242414 00000000 */ nop +/* DCF0E4 80242414 00000000 */ nop /* DCF0E8 80242418 45000003 */ bc1f .L80242428 -/* DCF0EC 8024241C 00000000 */ nop +/* DCF0EC 8024241C 00000000 */ nop /* DCF0F0 80242420 3C0142B4 */ lui $at, 0x42b4 /* DCF0F4 80242424 4481A000 */ mtc1 $at, $f20 .L80242428: @@ -71,7 +71,7 @@ glabel func_80242358_DCF028 /* DCF12C 8024245C D422AB18 */ ldc1 $f2, %lo(D_8024AB18)($at) /* DCF130 80242460 46000021 */ cvt.d.s $f0, $f0 /* DCF134 80242464 4620103C */ c.lt.d $f2, $f0 -/* DCF138 80242468 00000000 */ nop +/* DCF138 80242468 00000000 */ nop /* DCF13C 8024246C 4501002E */ bc1t .L80242528 /* DCF140 80242470 2402FFFF */ addiu $v0, $zero, -1 /* DCF144 80242474 8E220000 */ lw $v0, ($s1) @@ -80,13 +80,13 @@ glabel func_80242358_DCF028 /* DCF150 80242480 860200A8 */ lh $v0, 0xa8($s0) /* DCF154 80242484 46020001 */ sub.s $f0, $f0, $f2 /* DCF158 80242488 44821000 */ mtc1 $v0, $f2 -/* DCF15C 8024248C 00000000 */ nop +/* DCF15C 8024248C 00000000 */ nop /* DCF160 80242490 468010A1 */ cvt.d.w $f2, $f2 /* DCF164 80242494 46221080 */ add.d $f2, $f2, $f2 /* DCF168 80242498 46000005 */ abs.s $f0, $f0 /* DCF16C 8024249C 46000021 */ cvt.d.s $f0, $f0 /* DCF170 802424A0 4620103E */ c.le.d $f2, $f0 -/* DCF174 802424A4 00000000 */ nop +/* DCF174 802424A4 00000000 */ nop /* DCF178 802424A8 4501001F */ bc1t .L80242528 /* DCF17C 802424AC 2402FFFF */ addiu $v0, $zero, -1 /* DCF180 802424B0 3C038011 */ lui $v1, %hi(D_8010EBB3) @@ -97,7 +97,7 @@ glabel func_80242358_DCF028 /* DCF194 802424C4 14620005 */ bne $v1, $v0, .L802424DC /* DCF198 802424C8 2402FFFF */ addiu $v0, $zero, -1 /* DCF19C 802424CC 0809094A */ j .L80242528 -/* DCF1A0 802424D0 00000000 */ nop +/* DCF1A0 802424D0 00000000 */ nop .L802424D4: /* DCF1A4 802424D4 0809094A */ j .L80242528 /* DCF1A8 802424D8 0240102D */ daddu $v0, $s2, $zero @@ -120,7 +120,7 @@ glabel func_80242358_DCF028 /* DCF1E4 80242514 8E620078 */ lw $v0, 0x78($s3) /* DCF1E8 80242518 0222102A */ slt $v0, $s1, $v0 /* DCF1EC 8024251C 1440FFF2 */ bnez $v0, .L802424E8 -/* DCF1F0 80242520 00000000 */ nop +/* DCF1F0 80242520 00000000 */ nop .L80242524: /* DCF1F4 80242524 2402FFFF */ addiu $v0, $zero, -1 .L80242528: diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242548_DCF218.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242548_DCF218.s index ff4d4bb30e..a2dd37526f 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242548_DCF218.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242548_DCF218.s @@ -38,7 +38,7 @@ glabel func_80242548_DCF218 /* DCF29C 802425CC 2402000F */ addiu $v0, $zero, 0xf /* DCF2A0 802425D0 AFA2001C */ sw $v0, 0x1c($sp) /* DCF2A4 802425D4 44833000 */ mtc1 $v1, $f6 -/* DCF2A8 802425D8 00000000 */ nop +/* DCF2A8 802425D8 00000000 */ nop /* DCF2AC 802425DC 468031A0 */ cvt.s.w $f6, $f6 /* DCF2B0 802425E0 44073000 */ mfc1 $a3, $f6 /* DCF2B4 802425E4 27A20028 */ addiu $v0, $sp, 0x28 @@ -60,15 +60,15 @@ glabel func_80242548_DCF218 /* DCF2F0 80242620 0040202D */ daddu $a0, $v0, $zero /* DCF2F4 80242624 2402FFFF */ addiu $v0, $zero, -1 /* DCF2F8 80242628 10820010 */ beq $a0, $v0, .L8024266C -/* DCF2FC 8024262C 00000000 */ nop +/* DCF2FC 8024262C 00000000 */ nop /* DCF300 80242630 0C00FB3A */ jal get_enemy -/* DCF304 80242634 00000000 */ nop +/* DCF304 80242634 00000000 */ nop /* DCF308 80242638 8C42006C */ lw $v0, 0x6c($v0) /* DCF30C 8024263C 1440000B */ bnez $v0, .L8024266C -/* DCF310 80242640 00000000 */ nop +/* DCF310 80242640 00000000 */ nop /* DCF314 80242644 8602008C */ lh $v0, 0x8c($s0) /* DCF318 80242648 14400008 */ bnez $v0, .L8024266C -/* DCF31C 8024264C 00000000 */ nop +/* DCF31C 8024264C 00000000 */ nop /* DCF320 80242650 8E2200CC */ lw $v0, 0xcc($s1) /* DCF324 80242654 8C420020 */ lw $v0, 0x20($v0) /* DCF328 80242658 AE020028 */ sw $v0, 0x28($s0) diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024268C_DCF35C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024268C_DCF35C.s index df3a0e596f..a8162eb654 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024268C_DCF35C.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024268C_DCF35C.s @@ -17,7 +17,7 @@ glabel func_8024268C_DCF35C /* DCF38C 802426BC A602008E */ sh $v0, 0x8e($s0) /* DCF390 802426C0 00021400 */ sll $v0, $v0, 0x10 /* DCF394 802426C4 1C40002B */ bgtz $v0, .L80242774 -/* DCF398 802426C8 00000000 */ nop +/* DCF398 802426C8 00000000 */ nop /* DCF39C 802426CC 0C0908D6 */ jal func_80242358_DCF028 /* DCF3A0 802426D0 0240202D */ daddu $a0, $s2, $zero /* DCF3A4 802426D4 0040202D */ daddu $a0, $v0, $zero @@ -35,7 +35,7 @@ glabel func_8024268C_DCF35C /* DCF3D4 80242704 3C01C1A0 */ lui $at, 0xc1a0 /* DCF3D8 80242708 44812000 */ mtc1 $at, $f4 /* DCF3DC 8024270C 44833000 */ mtc1 $v1, $f6 -/* DCF3E0 80242710 00000000 */ nop +/* DCF3E0 80242710 00000000 */ nop /* DCF3E4 80242714 468031A0 */ cvt.s.w $f6, $f6 /* DCF3E8 80242718 44073000 */ mfc1 $a3, $f6 /* DCF3EC 8024271C 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802428B4_DCF584.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802428B4_DCF584.s index dc062a602f..3692d45cc2 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802428B4_DCF584.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802428B4_DCF584.s @@ -47,7 +47,7 @@ glabel func_802428B4_DCF584 /* DCF628 80242958 8E6200B0 */ lw $v0, 0xb0($s3) /* DCF62C 8024295C 30420004 */ andi $v0, $v0, 4 /* DCF630 80242960 10400019 */ beqz $v0, .L802429C8 -/* DCF634 80242964 00000000 */ nop +/* DCF634 80242964 00000000 */ nop .L80242968: /* DCF638 80242968 34630102 */ ori $v1, $v1, 0x102 /* DCF63C 8024296C AEE00070 */ sw $zero, 0x70($s7) @@ -83,12 +83,12 @@ glabel func_802428B4_DCF584 /* DCF6B0 802429E0 10600007 */ beqz $v1, .L80242A00 /* DCF6B4 802429E4 0000102D */ daddu $v0, $zero, $zero /* DCF6B8 802429E8 08090B71 */ j .L80242DC4 -/* DCF6BC 802429EC 00000000 */ nop +/* DCF6BC 802429EC 00000000 */ nop .L802429F0: /* DCF6C0 802429F0 1062005B */ beq $v1, $v0, .L80242B60 /* DCF6C4 802429F4 0000102D */ daddu $v0, $zero, $zero /* DCF6C8 802429F8 08090B71 */ j .L80242DC4 -/* DCF6CC 802429FC 00000000 */ nop +/* DCF6CC 802429FC 00000000 */ nop .L80242A00: /* DCF6D0 80242A00 8E420000 */ lw $v0, ($s2) /* DCF6D4 80242A04 0240202D */ daddu $a0, $s2, $zero @@ -131,17 +131,17 @@ glabel func_802428B4_DCF584 /* DCF764 80242A94 C6400038 */ lwc1 $f0, 0x38($s2) /* DCF768 80242A98 4600020D */ trunc.w.s $f8, $f0 /* DCF76C 80242A9C 44024000 */ mfc1 $v0, $f8 -/* DCF770 80242AA0 00000000 */ nop +/* DCF770 80242AA0 00000000 */ nop /* DCF774 80242AA4 A6620010 */ sh $v0, 0x10($s3) /* DCF778 80242AA8 C640003C */ lwc1 $f0, 0x3c($s2) /* DCF77C 80242AAC 4600020D */ trunc.w.s $f8, $f0 /* DCF780 80242AB0 44024000 */ mfc1 $v0, $f8 -/* DCF784 80242AB4 00000000 */ nop +/* DCF784 80242AB4 00000000 */ nop /* DCF788 80242AB8 A6620012 */ sh $v0, 0x12($s3) /* DCF78C 80242ABC C6400040 */ lwc1 $f0, 0x40($s2) /* DCF790 80242AC0 4600020D */ trunc.w.s $f8, $f0 /* DCF794 80242AC4 44024000 */ mfc1 $v0, $f8 -/* DCF798 80242AC8 00000000 */ nop +/* DCF798 80242AC8 00000000 */ nop /* DCF79C 80242ACC A6620014 */ sh $v0, 0x14($s3) /* DCF7A0 80242AD0 AE400044 */ sw $zero, 0x44($s2) /* DCF7A4 80242AD4 AE400048 */ sw $zero, 0x48($s2) @@ -187,10 +187,10 @@ glabel func_802428B4_DCF584 /* DCF840 80242B70 44810800 */ mtc1 $at, $f1 /* DCF844 80242B74 44800000 */ mtc1 $zero, $f0 /* DCF848 80242B78 44821000 */ mtc1 $v0, $f2 -/* DCF84C 80242B7C 00000000 */ nop +/* DCF84C 80242B7C 00000000 */ nop /* DCF850 80242B80 468010A1 */ cvt.d.w $f2, $f2 /* DCF854 80242B84 46201082 */ mul.d $f2, $f2, $f0 -/* DCF858 80242B88 00000000 */ nop +/* DCF858 80242B88 00000000 */ nop /* DCF85C 80242B8C 0200282D */ daddu $a1, $s0, $zero /* DCF860 80242B90 C6440038 */ lwc1 $f4, 0x38($s2) /* DCF864 80242B94 C640003C */ lwc1 $f0, 0x3c($s2) @@ -210,13 +210,13 @@ glabel func_802428B4_DCF584 /* DCF89C 80242BCC 864200A6 */ lh $v0, 0xa6($s2) /* DCF8A0 80242BD0 27B40028 */ addiu $s4, $sp, 0x28 /* DCF8A4 80242BD4 44820000 */ mtc1 $v0, $f0 -/* DCF8A8 80242BD8 00000000 */ nop +/* DCF8A8 80242BD8 00000000 */ nop /* DCF8AC 80242BDC 46800020 */ cvt.s.w $f0, $f0 /* DCF8B0 80242BE0 E7A00018 */ swc1 $f0, 0x18($sp) /* DCF8B4 80242BE4 864200A8 */ lh $v0, 0xa8($s2) /* DCF8B8 80242BE8 0280382D */ daddu $a3, $s4, $zero /* DCF8BC 80242BEC 44820000 */ mtc1 $v0, $f0 -/* DCF8C0 80242BF0 00000000 */ nop +/* DCF8C0 80242BF0 00000000 */ nop /* DCF8C4 80242BF4 46800020 */ cvt.s.w $f0, $f0 /* DCF8C8 80242BF8 0C0376B9 */ jal func_800DDAE4 /* DCF8CC 80242BFC E7A0001C */ swc1 $f0, 0x1c($sp) @@ -240,14 +240,14 @@ glabel func_802428B4_DCF584 /* DCF910 80242C40 0C0372DF */ jal func_800DCB7C /* DCF914 80242C44 0280382D */ daddu $a3, $s4, $zero /* DCF918 80242C48 10400019 */ beqz $v0, .L80242CB0 -/* DCF91C 80242C4C 00000000 */ nop +/* DCF91C 80242C4C 00000000 */ nop /* DCF920 80242C50 C640001C */ lwc1 $f0, 0x1c($s2) /* DCF924 80242C54 C7A2002C */ lwc1 $f2, 0x2c($sp) /* DCF928 80242C58 46000005 */ abs.s $f0, $f0 /* DCF92C 80242C5C 4600103C */ c.lt.s $f2, $f0 -/* DCF930 80242C60 00000000 */ nop +/* DCF930 80242C60 00000000 */ nop /* DCF934 80242C64 45000012 */ bc1f .L80242CB0 -/* DCF938 80242C68 00000000 */ nop +/* DCF938 80242C68 00000000 */ nop /* DCF93C 80242C6C C7A40024 */ lwc1 $f4, 0x24($sp) /* DCF940 80242C70 C6400064 */ lwc1 $f0, 0x64($s2) /* DCF944 80242C74 46002001 */ sub.s $f0, $f4, $f0 @@ -257,7 +257,7 @@ glabel func_802428B4_DCF584 /* DCF954 80242C84 46000005 */ abs.s $f0, $f0 /* DCF958 80242C88 46000021 */ cvt.d.s $f0, $f0 /* DCF95C 80242C8C 4622003C */ c.lt.d $f0, $f2 -/* DCF960 80242C90 00000000 */ nop +/* DCF960 80242C90 00000000 */ nop /* DCF964 80242C94 45000006 */ bc1f .L80242CB0 /* DCF968 80242C98 0240202D */ daddu $a0, $s2, $zero /* DCF96C 80242C9C 8E450018 */ lw $a1, 0x18($s2) @@ -272,7 +272,7 @@ glabel func_802428B4_DCF584 /* DCF98C 80242CBC 44801000 */ mtc1 $zero, $f2 /* DCF990 80242CC0 46000021 */ cvt.d.s $f0, $f0 /* DCF994 80242CC4 4622003C */ c.lt.d $f0, $f2 -/* DCF998 80242CC8 00000000 */ nop +/* DCF998 80242CC8 00000000 */ nop /* DCF99C 80242CCC 45030001 */ bc1tl .L80242CD4 /* DCF9A0 80242CD0 2416000B */ addiu $s6, $zero, 0xb .L80242CD4: @@ -288,7 +288,7 @@ glabel func_802428B4_DCF584 /* DCF9C4 80242CF4 8E620070 */ lw $v0, 0x70($s3) /* DCF9C8 80242CF8 30420001 */ andi $v0, $v0, 1 /* DCF9CC 80242CFC 10400009 */ beqz $v0, .L80242D24 -/* DCF9D0 80242D00 00000000 */ nop +/* DCF9D0 80242D00 00000000 */ nop /* DCF9D4 80242D04 C640004C */ lwc1 $f0, 0x4c($s2) /* DCF9D8 80242D08 3C014044 */ lui $at, 0x4044 /* DCF9DC 80242D0C 44811800 */ mtc1 $at, $f3 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242DF0_DCFAC0.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242DF0_DCFAC0.s index 3e6998c1df..e0b49184fa 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242DF0_DCFAC0.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242DF0_DCFAC0.s @@ -50,7 +50,7 @@ glabel func_80242DF0_DCFAC0 .L80242E9C: /* DCFB6C 80242E9C 86240008 */ lh $a0, 8($s1) /* DCFB70 80242EA0 0C00FB5A */ jal get_enemy_safe -/* DCFB74 80242EA4 00000000 */ nop +/* DCFB74 80242EA4 00000000 */ nop /* DCFB78 80242EA8 14400005 */ bnez $v0, .L80242EC0 /* DCFB7C 80242EAC 0260202D */ daddu $a0, $s3, $zero /* DCFB80 80242EB0 3C05FE36 */ lui $a1, 0xfe36 @@ -60,7 +60,7 @@ glabel func_80242DF0_DCFAC0 .L80242EC0: /* DCFB90 80242EC0 86240008 */ lh $a0, 8($s1) /* DCFB94 80242EC4 0C00EABB */ jal get_npc_unsafe -/* DCFB98 80242EC8 00000000 */ nop +/* DCFB98 80242EC8 00000000 */ nop /* DCFB9C 80242ECC 8E630070 */ lw $v1, 0x70($s3) /* DCFBA0 80242ED0 10600006 */ beqz $v1, .L80242EEC /* DCFBA4 80242ED4 0040802D */ daddu $s0, $v0, $zero @@ -68,7 +68,7 @@ glabel func_80242DF0_DCFAC0 /* DCFBAC 80242EDC 1062003F */ beq $v1, $v0, .L80242FDC /* DCFBB0 80242EE0 0000102D */ daddu $v0, $zero, $zero /* DCFBB4 80242EE4 08090C88 */ j .L80243220 -/* DCFBB8 80242EE8 00000000 */ nop +/* DCFBB8 80242EE8 00000000 */ nop .L80242EEC: /* DCFBBC 80242EEC AFA00010 */ sw $zero, 0x10($sp) /* DCFBC0 80242EF0 AFA00014 */ sw $zero, 0x14($sp) @@ -79,7 +79,7 @@ glabel func_80242DF0_DCFAC0 /* DCFBD4 80242F04 24040002 */ addiu $a0, $zero, 2 /* DCFBD8 80242F08 C64C006C */ lwc1 $f12, 0x6c($s2) /* DCFBDC 80242F0C 0C00A6C9 */ jal clamp_angle -/* DCFBE0 80242F10 00000000 */ nop +/* DCFBE0 80242F10 00000000 */ nop /* DCFBE4 80242F14 3C018025 */ lui $at, %hi(D_8024AB20) /* DCFBE8 80242F18 D438AB20 */ ldc1 $f24, %lo(D_8024AB20)($at) /* DCFBEC 80242F1C 46000521 */ cvt.d.s $f20, $f0 @@ -107,7 +107,7 @@ glabel func_80242DF0_DCFAC0 /* DCFC44 80242F74 46000306 */ mov.s $f12, $f0 /* DCFC48 80242F78 46000021 */ cvt.d.s $f0, $f0 /* DCFC4C 80242F7C 4638003C */ c.lt.d $f0, $f24 -/* DCFC50 80242F80 00000000 */ nop +/* DCFC50 80242F80 00000000 */ nop /* DCFC54 80242F84 45020002 */ bc1fl .L80242F90 /* DCFC58 80242F88 E614000C */ swc1 $f20, 0xc($s0) /* DCFC5C 80242F8C E616000C */ swc1 $f22, 0xc($s0) @@ -117,7 +117,7 @@ glabel func_80242DF0_DCFAC0 /* DCFC68 80242F98 D422AB30 */ ldc1 $f2, %lo(D_8024AB30)($at) /* DCFC6C 80242F9C 46000021 */ cvt.d.s $f0, $f0 /* DCFC70 80242FA0 46220002 */ mul.d $f0, $f0, $f2 -/* DCFC74 80242FA4 00000000 */ nop +/* DCFC74 80242FA4 00000000 */ nop /* DCFC78 80242FA8 3C013F66 */ lui $at, 0x3f66 /* DCFC7C 80242FAC 34216666 */ ori $at, $at, 0x6666 /* DCFC80 80242FB0 44812000 */ mtc1 $at, $f4 @@ -147,13 +147,13 @@ glabel func_80242DF0_DCFAC0 /* DCFCDC 8024300C 860200A6 */ lh $v0, 0xa6($s0) /* DCFCE0 80243010 27A60024 */ addiu $a2, $sp, 0x24 /* DCFCE4 80243014 44820000 */ mtc1 $v0, $f0 -/* DCFCE8 80243018 00000000 */ nop +/* DCFCE8 80243018 00000000 */ nop /* DCFCEC 8024301C 46800020 */ cvt.s.w $f0, $f0 /* DCFCF0 80243020 E7A00018 */ swc1 $f0, 0x18($sp) /* DCFCF4 80243024 860200A8 */ lh $v0, 0xa8($s0) /* DCFCF8 80243028 27A70028 */ addiu $a3, $sp, 0x28 /* DCFCFC 8024302C 44820000 */ mtc1 $v0, $f0 -/* DCFD00 80243030 00000000 */ nop +/* DCFD00 80243030 00000000 */ nop /* DCFD04 80243034 46800020 */ cvt.s.w $f0, $f0 /* DCFD08 80243038 0C037711 */ jal func_800DDC44 /* DCFD0C 8024303C E7A0001C */ swc1 $f0, 0x1c($sp) @@ -173,7 +173,7 @@ glabel func_80242DF0_DCFAC0 /* DCFD3C 8024306C 44801800 */ mtc1 $zero, $f3 /* DCFD40 80243070 46000021 */ cvt.d.s $f0, $f0 /* DCFD44 80243074 4622003C */ c.lt.d $f0, $f2 -/* DCFD48 80243078 00000000 */ nop +/* DCFD48 80243078 00000000 */ nop /* DCFD4C 8024307C 45000028 */ bc1f .L80243120 /* DCFD50 80243080 27A50020 */ addiu $a1, $sp, 0x20 /* DCFD54 80243084 27A60024 */ addiu $a2, $sp, 0x24 @@ -204,7 +204,7 @@ glabel func_80242DF0_DCFAC0 /* DCFDB8 802430E8 0C0372DF */ jal func_800DCB7C /* DCFDBC 802430EC 27A70028 */ addiu $a3, $sp, 0x28 /* DCFDC0 802430F0 1040000B */ beqz $v0, .L80243120 -/* DCFDC4 802430F4 00000000 */ nop +/* DCFDC4 802430F4 00000000 */ nop /* DCFDC8 802430F8 C600001C */ lwc1 $f0, 0x1c($s0) /* DCFDCC 802430FC C7A2002C */ lwc1 $f2, 0x2c($sp) /* DCFDD0 80243100 46000005 */ abs.s $f0, $f0 @@ -212,7 +212,7 @@ glabel func_80242DF0_DCFAC0 /* DCFDD8 80243108 46340000 */ add.d $f0, $f0, $f20 /* DCFDDC 8024310C 460010A1 */ cvt.d.s $f2, $f2 /* DCFDE0 80243110 4620103E */ c.le.d $f2, $f0 -/* DCFDE4 80243114 00000000 */ nop +/* DCFDE4 80243114 00000000 */ nop /* DCFDE8 80243118 45030001 */ bc1tl .L80243120 /* DCFDEC 8024311C 24120001 */ addiu $s2, $zero, 1 .L80243120: @@ -234,7 +234,7 @@ glabel func_80242DF0_DCFAC0 /* DCFE28 80243158 2414000B */ addiu $s4, $zero, 0xb .L8024315C: /* DCFE2C 8024315C 12800024 */ beqz $s4, .L802431F0 -/* DCFE30 80243160 00000000 */ nop +/* DCFE30 80243160 00000000 */ nop /* DCFE34 80243164 AFA00010 */ sw $zero, 0x10($sp) /* DCFE38 80243168 AFA00014 */ sw $zero, 0x14($sp) /* DCFE3C 8024316C 8E050038 */ lw $a1, 0x38($s0) @@ -268,7 +268,7 @@ glabel func_80242DF0_DCFAC0 /* DCFEAC 802431DC AC800070 */ sw $zero, 0x70($a0) .L802431E0: /* DCFEB0 802431E0 0C0B2026 */ jal set_variable -/* DCFEB4 802431E4 00000000 */ nop +/* DCFEB4 802431E4 00000000 */ nop /* DCFEB8 802431E8 08090C88 */ j .L80243220 /* DCFEBC 802431EC 24020002 */ addiu $v0, $zero, 2 .L802431F0: diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s index d53d83def5..ebfef1c040 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s @@ -103,41 +103,48 @@ glabel func_8024324C_DCFF1C /* DD008C 802433BC 2C620064 */ sltiu $v0, $v1, 0x64 /* DD0090 802433C0 10400060 */ beqz $v0, .L80243544 /* DD0094 802433C4 00031080 */ sll $v0, $v1, 2 -/* DD0098 802433C8 3C018025 */ lui $at, %hi(D_8024AB38) +/* DD0098 802433C8 3C018025 */ lui $at, %hi(jtbl_8024AB38_DD7808) /* DD009C 802433CC 00220821 */ addu $at, $at, $v0 -/* DD00A0 802433D0 8C22AB38 */ lw $v0, %lo(D_8024AB38)($at) +/* DD00A0 802433D0 8C22AB38 */ lw $v0, %lo(jtbl_8024AB38_DD7808)($at) /* DD00A4 802433D4 00400008 */ jr $v0 /* DD00A8 802433D8 00000000 */ nop +glabel L802433DC_DD00AC /* DD00AC 802433DC 0260202D */ daddu $a0, $s3, $zero /* DD00B0 802433E0 0200282D */ daddu $a1, $s0, $zero /* DD00B4 802433E4 0C012568 */ jal func_800495A0 /* DD00B8 802433E8 02A0302D */ daddu $a2, $s5, $zero +glabel L802433EC_DD00BC /* DD00BC 802433EC 0260202D */ daddu $a0, $s3, $zero /* DD00C0 802433F0 0200282D */ daddu $a1, $s0, $zero /* DD00C4 802433F4 0C0125AE */ jal func_800496B8 /* DD00C8 802433F8 02A0302D */ daddu $a2, $s5, $zero /* DD00CC 802433FC 08090D51 */ j .L80243544 /* DD00D0 80243400 00000000 */ nop +glabel L80243404_DD00D4 /* DD00D4 80243404 0260202D */ daddu $a0, $s3, $zero /* DD00D8 80243408 0200282D */ daddu $a1, $s0, $zero /* DD00DC 8024340C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DD00E0 80243410 02A0302D */ daddu $a2, $s5, $zero +glabel L80243414_DD00E4 /* DD00E4 80243414 0260202D */ daddu $a0, $s3, $zero /* DD00E8 80243418 0200282D */ daddu $a1, $s0, $zero /* DD00EC 8024341C 0C012701 */ jal func_80049C04 /* DD00F0 80243420 02A0302D */ daddu $a2, $s5, $zero /* DD00F4 80243424 08090D51 */ j .L80243544 /* DD00F8 80243428 00000000 */ nop +glabel L8024342C_DD00FC /* DD00FC 8024342C 0260202D */ daddu $a0, $s3, $zero /* DD0100 80243430 0200282D */ daddu $a1, $s0, $zero /* DD0104 80243434 0C01278F */ jal func_80049E3C /* DD0108 80243438 02A0302D */ daddu $a2, $s5, $zero +glabel L8024343C_DD010C /* DD010C 8024343C 0260202D */ daddu $a0, $s3, $zero /* DD0110 80243440 0200282D */ daddu $a1, $s0, $zero /* DD0114 80243444 0C0127B3 */ jal func_80049ECC /* DD0118 80243448 02A0302D */ daddu $a2, $s5, $zero /* DD011C 8024344C 08090D51 */ j .L80243544 /* DD0120 80243450 00000000 */ nop +glabel L80243454_DD0124 /* DD0124 80243454 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* DD0128 80243458 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* DD012C 8024345C C68C0038 */ lwc1 $f12, 0x38($s4) @@ -170,37 +177,45 @@ glabel func_8024324C_DCFF1C /* DD0190 802434C0 0200282D */ daddu $a1, $s0, $zero /* DD0194 802434C4 0C0127DF */ jal func_80049F7C /* DD0198 802434C8 02A0302D */ daddu $a2, $s5, $zero +glabel L802434CC_DD019C /* DD019C 802434CC 0260202D */ daddu $a0, $s3, $zero /* DD01A0 802434D0 0200282D */ daddu $a1, $s0, $zero /* DD01A4 802434D4 0C012849 */ jal func_8004A124 /* DD01A8 802434D8 02A0302D */ daddu $a2, $s5, $zero /* DD01AC 802434DC 08090D51 */ j .L80243544 /* DD01B0 802434E0 00000000 */ nop +glabel L802434E4_DD01B4 /* DD01B4 802434E4 0260202D */ daddu $a0, $s3, $zero /* DD01B8 802434E8 0200282D */ daddu $a1, $s0, $zero /* DD01BC 802434EC 0C0128FA */ jal func_8004A3E8 /* DD01C0 802434F0 02A0302D */ daddu $a2, $s5, $zero /* DD01C4 802434F4 08090D51 */ j .L80243544 /* DD01C8 802434F8 00000000 */ nop +glabel L802434FC_DD01CC /* DD01CC 802434FC 0C0909A3 */ jal func_8024268C_DCF35C /* DD01D0 80243500 0260202D */ daddu $a0, $s3, $zero /* DD01D4 80243504 08090D51 */ j .L80243544 /* DD01D8 80243508 00000000 */ nop +glabel L8024350C_DD01DC /* DD01DC 8024350C 0C0909E3 */ jal omo_09_UnkSetDurationFunc /* DD01E0 80243510 0260202D */ daddu $a0, $s3, $zero /* DD01E4 80243514 08090D51 */ j .L80243544 /* DD01E8 80243518 00000000 */ nop +glabel L8024351C_DD01EC /* DD01EC 8024351C 0C0909F4 */ jal omo_09_UnkNpcAIFunc9 /* DD01F0 80243520 0260202D */ daddu $a0, $s3, $zero /* DD01F4 80243524 08090D51 */ j .L80243544 /* DD01F8 80243528 00000000 */ nop +glabel L8024352C_DD01FC /* DD01FC 8024352C 0C090A1C */ jal omo_09_UnkDurationCheck /* DD0200 80243530 0260202D */ daddu $a0, $s3, $zero /* DD0204 80243534 08090D51 */ j .L80243544 /* DD0208 80243538 00000000 */ nop +glabel L8024353C_DD020C /* DD020C 8024353C 0C0129CF */ jal func_8004A73C /* DD0210 80243540 0260202D */ daddu $a0, $s3, $zero .L80243544: +glabel L80243544_DD0214 /* DD0214 80243544 8FBF0048 */ lw $ra, 0x48($sp) /* DD0218 80243548 8FB50044 */ lw $s5, 0x44($sp) /* DD021C 8024354C 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802435E8_DD02B8.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802435E8_DD02B8.s index fd076dc835..021431578c 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802435E8_DD02B8.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802435E8_DD02B8.s @@ -9,6 +9,6 @@ glabel func_802435E8_DD02B8 /* DD02C8 802435F8 A4620000 */ sh $v0, ($v1) /* DD02CC 802435FC 03E00008 */ jr $ra /* DD02D0 80243600 24020002 */ addiu $v0, $zero, 2 -/* DD02D4 80243604 00000000 */ nop -/* DD02D8 80243608 00000000 */ nop -/* DD02DC 8024360C 00000000 */ nop +/* DD02D4 80243604 00000000 */ nop +/* DD02D8 80243608 00000000 */ nop +/* DD02DC 8024360C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DD02E0/func_80243610_DD02E0.s b/asm/nonmatchings/world/area_omo/omo_09/DD02E0/func_80243610_DD02E0.s index 5fc1fca04f..5ff17c8af6 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DD02E0/func_80243610_DD02E0.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DD02E0/func_80243610_DD02E0.s @@ -25,7 +25,7 @@ glabel func_80243610_DD02E0 /* DD0330 80243660 0C00A8BB */ jal sin_deg /* DD0334 80243664 46146300 */ add.s $f12, $f12, $f20 /* DD0338 80243668 46160002 */ mul.s $f0, $f0, $f22 -/* DD033C 8024366C 00000000 */ nop +/* DD033C 8024366C 00000000 */ nop /* DD0340 80243670 C6020038 */ lwc1 $f2, 0x38($s0) /* DD0344 80243674 46001080 */ add.s $f2, $f2, $f0 /* DD0348 80243678 4600110D */ trunc.w.s $f4, $f2 @@ -33,7 +33,7 @@ glabel func_80243610_DD02E0 /* DD0350 80243680 C600003C */ lwc1 $f0, 0x3c($s0) /* DD0354 80243684 3C014100 */ lui $at, 0x4100 /* DD0358 80243688 44811000 */ mtc1 $at, $f2 -/* DD035C 8024368C 00000000 */ nop +/* DD035C 8024368C 00000000 */ nop /* DD0360 80243690 46020000 */ add.s $f0, $f0, $f2 /* DD0364 80243694 4600010D */ trunc.w.s $f4, $f0 /* DD0368 80243698 E6240088 */ swc1 $f4, 0x88($s1) @@ -43,7 +43,7 @@ glabel func_80243610_DD02E0 /* DD0378 802436A8 0C00A8D4 */ jal cos_deg /* DD037C 802436AC 46146300 */ add.s $f12, $f12, $f20 /* DD0380 802436B0 46160002 */ mul.s $f0, $f0, $f22 -/* DD0384 802436B4 00000000 */ nop +/* DD0384 802436B4 00000000 */ nop /* DD0388 802436B8 C6020040 */ lwc1 $f2, 0x40($s0) /* DD038C 802436BC 46001081 */ sub.s $f2, $f2, $f0 /* DD0390 802436C0 4600110D */ trunc.w.s $f4, $f2 @@ -57,4 +57,4 @@ glabel func_80243610_DD02E0 /* DD03B0 802436E0 24020002 */ addiu $v0, $zero, 2 /* DD03B4 802436E4 03E00008 */ jr $ra /* DD03B8 802436E8 27BD0030 */ addiu $sp, $sp, 0x30 -/* DD03BC 802436EC 00000000 */ nop +/* DD03BC 802436EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_802400E4_DD7A94.s b/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_802400E4_DD7A94.s index 78b68dbe33..e162b8e381 100644 --- a/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_802400E4_DD7A94.s +++ b/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_802400E4_DD7A94.s @@ -18,7 +18,7 @@ glabel func_802400E4_DD7A94 /* DD7AC8 80240118 0C0B210B */ jal get_float_variable /* DD7ACC 8024011C 46000506 */ mov.s $f20, $f0 /* DD7AD0 80240120 4614003C */ c.lt.s $f0, $f20 -/* DD7AD4 80240124 00000000 */ nop +/* DD7AD4 80240124 00000000 */ nop /* DD7AD8 80240128 45000004 */ bc1f .L8024013C /* DD7ADC 8024012C 0220202D */ daddu $a0, $s1, $zero /* DD7AE0 80240130 8E050000 */ lw $a1, ($s0) @@ -29,7 +29,7 @@ glabel func_802400E4_DD7A94 /* DD7AF0 80240140 0000302D */ daddu $a2, $zero, $zero .L80240144: /* DD7AF4 80240144 0C0B2026 */ jal set_variable -/* DD7AF8 80240148 00000000 */ nop +/* DD7AF8 80240148 00000000 */ nop /* DD7AFC 8024014C 8FBF0018 */ lw $ra, 0x18($sp) /* DD7B00 80240150 8FB10014 */ lw $s1, 0x14($sp) /* DD7B04 80240154 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_80240000_DDC830.s b/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_80240000_DDC830.s index f87ea6671f..8ef2bcc1e3 100644 --- a/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_80240000_DDC830.s +++ b/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_80240000_DDC830.s @@ -84,7 +84,7 @@ glabel func_80240000_DDC830 /* DDC960 80240130 2E420008 */ sltiu $v0, $s2, 8 /* DDC964 80240134 AE00002C */ sw $zero, 0x2c($s0) /* DDC968 80240138 46142102 */ mul.s $f4, $f4, $f20 -/* DDC96C 8024013C 00000000 */ nop +/* DDC96C 8024013C 00000000 */ nop /* DDC970 80240140 E6000010 */ swc1 $f0, 0x10($s0) /* DDC974 80240144 E6020014 */ swc1 $f2, 0x14($s0) /* DDC978 80240148 C7A60020 */ lwc1 $f6, 0x20($sp) @@ -92,7 +92,7 @@ glabel func_80240000_DDC830 /* DDC980 80240150 C6000024 */ lwc1 $f0, 0x24($s0) /* DDC984 80240154 C7A20028 */ lwc1 $f2, 0x28($sp) /* DDC988 80240158 46140002 */ mul.s $f0, $f0, $f20 -/* DDC98C 8024015C 00000000 */ nop +/* DDC98C 8024015C 00000000 */ nop /* DDC990 80240160 E6060018 */ swc1 $f6, 0x18($s0) /* DDC994 80240164 E6080028 */ swc1 $f8, 0x28($s0) /* DDC998 80240168 E6020030 */ swc1 $f2, 0x30($s0) diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_802401A0_DDC9D0.s b/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_802401A0_DDC9D0.s index 04e470d19f..f6f6c4d5bf 100644 --- a/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_802401A0_DDC9D0.s +++ b/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_802401A0_DDC9D0.s @@ -207,7 +207,7 @@ glabel func_802401A0_DDC9D0 /* DDCCD4 802404A4 8FA40130 */ lw $a0, 0x130($sp) /* DDCCD8 802404A8 00021023 */ negu $v0, $v0 /* DDCCDC 802404AC 44824000 */ mtc1 $v0, $f8 -/* DDCCE0 802404B0 00000000 */ nop +/* DDCCE0 802404B0 00000000 */ nop /* DDCCE4 802404B4 46804220 */ cvt.s.w $f8, $f8 /* DDCCE8 802404B8 44054000 */ mfc1 $a1, $f8 /* DDCCEC 802404BC 0C019EC8 */ jal guRotateF @@ -231,7 +231,7 @@ glabel func_802401A0_DDC9D0 /* DDCD34 80240504 0200302D */ daddu $a2, $s0, $zero /* DDCD38 80240508 86640002 */ lh $a0, 2($s3) /* DDCD3C 8024050C 0C016E89 */ jal update_collider_transform -/* DDCD40 80240510 00000000 */ nop +/* DDCD40 80240510 00000000 */ nop /* DDCD44 80240514 0200202D */ daddu $a0, $s0, $zero /* DDCD48 80240518 4405A000 */ mfc1 $a1, $f20 /* DDCD4C 8024051C 4406A000 */ mfc1 $a2, $f20 @@ -247,11 +247,11 @@ glabel func_802401A0_DDC9D0 /* DDCD74 80240544 8442A552 */ lh $v0, %lo(gCollisionStatus+0x2)($v0) /* DDCD78 80240548 8E630000 */ lw $v1, ($s3) /* DDCD7C 8024054C 10430005 */ beq $v0, $v1, .L80240564 -/* DDCD80 80240550 00000000 */ nop +/* DDCD80 80240550 00000000 */ nop /* DDCD84 80240554 3C028016 */ lui $v0, %hi(gCollisionStatus+0x4) /* DDCD88 80240558 8442A554 */ lh $v0, %lo(gCollisionStatus+0x4)($v0) /* DDCD8C 8024055C 1443000D */ bne $v0, $v1, .L80240594 -/* DDCD90 80240560 00000000 */ nop +/* DDCD90 80240560 00000000 */ nop .L80240564: /* DDCD94 80240564 C7A00120 */ lwc1 $f0, 0x120($sp) /* DDCD98 80240568 C622FFF8 */ lwc1 $f2, -8($s1) @@ -355,7 +355,7 @@ glabel func_802401A0_DDC9D0 /* DDCF14 802406E4 8FC20000 */ lw $v0, ($fp) /* DDCF18 802406E8 30421000 */ andi $v0, $v0, 0x1000 /* DDCF1C 802406EC 10400007 */ beqz $v0, .L8024070C -/* DDCF20 802406F0 00000000 */ nop +/* DDCF20 802406F0 00000000 */ nop /* DDCF24 802406F4 C7C00028 */ lwc1 $f0, 0x28($fp) /* DDCF28 802406F8 C7C2002C */ lwc1 $f2, 0x2c($fp) /* DDCF2C 802406FC C7C40030 */ lwc1 $f4, 0x30($fp) @@ -376,7 +376,7 @@ glabel func_802401A0_DDC9D0 /* DDCF5C 8024072C 1440FFEA */ bnez $v0, .L802406D8 /* DDCF60 80240730 24630004 */ addiu $v1, $v1, 4 /* DDCF64 80240734 14800005 */ bnez $a0, .L8024074C -/* DDCF68 80240738 00000000 */ nop +/* DDCF68 80240738 00000000 */ nop /* DDCF6C 8024073C 8FA90170 */ lw $t1, 0x170($sp) /* DDCF70 80240740 8D220074 */ lw $v0, 0x74($t1) /* DDCF74 80240744 2442FFFF */ addiu $v0, $v0, -1 @@ -397,5 +397,5 @@ glabel func_802401A0_DDC9D0 /* DDCFAC 8024077C 0000102D */ daddu $v0, $zero, $zero /* DDCFB0 80240780 03E00008 */ jr $ra /* DDCFB4 80240784 27BD0170 */ addiu $sp, $sp, 0x170 -/* DDCFB8 80240788 00000000 */ nop -/* DDCFBC 8024078C 00000000 */ nop +/* DDCFB8 80240788 00000000 */ nop +/* DDCFBC 8024078C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240864_DDD094.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240864_DDD094.s index 498e57d0db..06e525080e 100644 --- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240864_DDD094.s +++ b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240864_DDD094.s @@ -8,7 +8,7 @@ glabel func_80240864_DDD094 /* DDD0A0 80240870 00822021 */ addu $a0, $a0, $v0 /* DDD0A4 80240874 90820014 */ lbu $v0, 0x14($a0) /* DDD0A8 80240878 10400009 */ beqz $v0, .L802408A0 -/* DDD0AC 8024087C 00000000 */ nop +/* DDD0AC 8024087C 00000000 */ nop /* DDD0B0 80240880 90820015 */ lbu $v0, 0x15($a0) /* DDD0B4 80240884 00022600 */ sll $a0, $v0, 0x18 /* DDD0B8 80240888 00041E03 */ sra $v1, $a0, 0x18 @@ -16,7 +16,7 @@ glabel func_80240864_DDD094 /* DDD0C0 80240890 00021403 */ sra $v0, $v0, 0x10 /* DDD0C4 80240894 0043102A */ slt $v0, $v0, $v1 /* DDD0C8 80240898 10400003 */ beqz $v0, .L802408A8 -/* DDD0CC 8024089C 00000000 */ nop +/* DDD0CC 8024089C 00000000 */ nop .L802408A0: /* DDD0D0 802408A0 03E00008 */ jr $ra /* DDD0D4 802408A4 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s index eb9dbfeb28..59d1793377 100644 --- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s +++ b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s @@ -108,20 +108,20 @@ glabel func_8024095C_DDD18C /* DDD314 80240AE4 10400009 */ beqz $v0, .L80240B0C /* DDD318 80240AE8 AEA20074 */ sw $v0, 0x74($s5) /* DDD31C 80240AEC 0C03C4EC */ jal func_800F13B0 -/* DDD320 80240AF0 00000000 */ nop +/* DDD320 80240AF0 00000000 */ nop /* DDD324 80240AF4 8EA20070 */ lw $v0, 0x70($s5) /* DDD328 80240AF8 24420001 */ addiu $v0, $v0, 1 .L80240AFC: /* DDD32C 80240AFC AEA20070 */ sw $v0, 0x70($s5) /* DDD330 80240B00 2842000F */ slti $v0, $v0, 0xf /* DDD334 80240B04 10400003 */ beqz $v0, .L80240B14 -/* DDD338 80240B08 00000000 */ nop +/* DDD338 80240B08 00000000 */ nop .L80240B0C: /* DDD33C 80240B0C 080902DF */ j .L80240B7C /* DDD340 80240B10 0000102D */ daddu $v0, $zero, $zero .L80240B14: /* DDD344 80240B14 0C03C54E */ jal func_800F1538 -/* DDD348 80240B18 00000000 */ nop +/* DDD348 80240B18 00000000 */ nop /* DDD34C 80240B1C 8EA30074 */ lw $v1, 0x74($s5) /* DDD350 80240B20 240200FF */ addiu $v0, $zero, 0xff /* DDD354 80240B24 10620010 */ beq $v1, $v0, .L80240B68 diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240D90_DDD5C0.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240D90_DDD5C0.s index ad674cf46e..79e450ee86 100644 --- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240D90_DDD5C0.s +++ b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240D90_DDD5C0.s @@ -36,7 +36,7 @@ glabel func_80240D90_DDD5C0 /* DDD63C 80240E0C 0C00A88D */ jal sin_cos_deg /* DDD640 80240E10 0040A82D */ daddu $s5, $v0, $zero /* DDD644 80240E14 1200005D */ beqz $s0, .L80240F8C -/* DDD648 80240E18 00000000 */ nop +/* DDD648 80240E18 00000000 */ nop /* DDD64C 80240E1C 0C00AB0A */ jal general_heap_malloc /* DDD650 80240E20 24040068 */ addiu $a0, $zero, 0x68 /* DDD654 80240E24 0040902D */ daddu $s2, $v0, $zero @@ -98,10 +98,10 @@ glabel func_80240D90_DDD5C0 /* DDD72C 80240EFC C7A2001C */ lwc1 $f2, 0x1c($sp) /* DDD730 80240F00 C7A40020 */ lwc1 $f4, 0x20($sp) /* DDD734 80240F04 46041082 */ mul.s $f2, $f2, $f4 -/* DDD738 80240F08 00000000 */ nop +/* DDD738 80240F08 00000000 */ nop /* DDD73C 80240F0C C7A00018 */ lwc1 $f0, 0x18($sp) /* DDD740 80240F10 46040002 */ mul.s $f0, $f0, $f4 -/* DDD744 80240F14 00000000 */ nop +/* DDD744 80240F14 00000000 */ nop /* DDD748 80240F18 E6020038 */ swc1 $f2, 0x38($s0) /* DDD74C 80240F1C E6000050 */ swc1 $f0, 0x50($s0) /* DDD750 80240F20 8E42005C */ lw $v0, 0x5c($s2) @@ -142,12 +142,12 @@ glabel func_80240D90_DDD5C0 /* DDD7D8 80240FA8 10600007 */ beqz $v1, .L80240FC8 /* DDD7DC 80240FAC 24040005 */ addiu $a0, $zero, 5 /* DDD7E0 80240FB0 08090458 */ j .L80241160 -/* DDD7E4 80240FB4 00000000 */ nop +/* DDD7E4 80240FB4 00000000 */ nop .L80240FB8: /* DDD7E8 80240FB8 10620058 */ beq $v1, $v0, .L8024111C -/* DDD7EC 80240FBC 00000000 */ nop +/* DDD7EC 80240FBC 00000000 */ nop /* DDD7F0 80240FC0 08090458 */ j .L80241160 -/* DDD7F4 80240FC4 00000000 */ nop +/* DDD7F4 80240FC4 00000000 */ nop .L80240FC8: /* DDD7F8 80240FC8 0000882D */ daddu $s1, $zero, $zero /* DDD7FC 80240FCC 3C148024 */ lui $s4, %hi(func_80241E98_A1CF98) @@ -174,11 +174,11 @@ glabel func_80240D90_DDD5C0 /* DDD84C 8024101C C7A4001C */ lwc1 $f4, 0x1c($sp) /* DDD850 80241020 C7A00020 */ lwc1 $f0, 0x20($sp) /* DDD854 80241024 46002102 */ mul.s $f4, $f4, $f0 -/* DDD858 80241028 00000000 */ nop +/* DDD858 80241028 00000000 */ nop /* DDD85C 8024102C C7A20018 */ lwc1 $f2, 0x18($sp) /* DDD860 80241030 26940004 */ addiu $s4, $s4, 4 /* DDD864 80241034 46001082 */ mul.s $f2, $f2, $f0 -/* DDD868 80241038 00000000 */ nop +/* DDD868 80241038 00000000 */ nop /* DDD86C 8024103C 26730004 */ addiu $s3, $s3, 4 /* DDD870 80241040 26310001 */ addiu $s1, $s1, 1 /* DDD874 80241044 2A220003 */ slti $v0, $s1, 3 @@ -215,11 +215,11 @@ glabel func_80240D90_DDD5C0 /* DDD8E8 802410B8 C7A4001C */ lwc1 $f4, 0x1c($sp) /* DDD8EC 802410BC C7A00020 */ lwc1 $f0, 0x20($sp) /* DDD8F0 802410C0 46002102 */ mul.s $f4, $f4, $f0 -/* DDD8F4 802410C4 00000000 */ nop +/* DDD8F4 802410C4 00000000 */ nop /* DDD8F8 802410C8 C7A20018 */ lwc1 $f2, 0x18($sp) /* DDD8FC 802410CC 26940004 */ addiu $s4, $s4, 4 /* DDD900 802410D0 46001082 */ mul.s $f2, $f2, $f0 -/* DDD904 802410D4 00000000 */ nop +/* DDD904 802410D4 00000000 */ nop /* DDD908 802410D8 26730004 */ addiu $s3, $s3, 4 /* DDD90C 802410DC 26310001 */ addiu $s1, $s1, 1 /* DDD910 802410E0 2A220003 */ slti $v0, $s1, 3 diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802412C8_DDDAF8.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802412C8_DDDAF8.s index 808a7efbbb..af8f6cbde8 100644 --- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802412C8_DDDAF8.s +++ b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802412C8_DDDAF8.s @@ -36,16 +36,16 @@ glabel func_802412C8_DDDAF8 /* DDDB70 80241340 10600007 */ beqz $v1, .L80241360 /* DDDB74 80241344 240500FF */ addiu $a1, $zero, 0xff /* DDDB78 80241348 080904F6 */ j .L802413D8 -/* DDDB7C 8024134C 00000000 */ nop +/* DDDB7C 8024134C 00000000 */ nop .L80241350: /* DDDB80 80241350 10620019 */ beq $v1, $v0, .L802413B8 -/* DDDB84 80241354 00000000 */ nop +/* DDDB84 80241354 00000000 */ nop /* DDDB88 80241358 080904F6 */ j .L802413D8 -/* DDDB8C 8024135C 00000000 */ nop +/* DDDB8C 8024135C 00000000 */ nop .L80241360: /* DDDB90 80241360 8E220074 */ lw $v0, 0x74($s1) /* DDDB94 80241364 14450004 */ bne $v0, $a1, .L80241378 -/* DDDB98 80241368 00000000 */ nop +/* DDDB98 80241368 00000000 */ nop /* DDDB9C 8024136C AE240070 */ sw $a0, 0x70($s1) /* DDDBA0 80241370 AE200078 */ sw $zero, 0x78($s1) /* DDDBA4 80241374 8E220074 */ lw $v0, 0x74($s1) @@ -57,7 +57,7 @@ glabel func_802412C8_DDDAF8 /* DDDBB8 80241388 50400013 */ beql $v0, $zero, .L802413D8 /* DDDBBC 8024138C AE250074 */ sw $a1, 0x74($s1) /* DDDBC0 80241390 080904F6 */ j .L802413D8 -/* DDDBC4 80241394 00000000 */ nop +/* DDDBC4 80241394 00000000 */ nop .L80241398: /* DDDBC8 80241398 8E220078 */ lw $v0, 0x78($s1) /* DDDBCC 8024139C 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241498_DDDCC8.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241498_DDDCC8.s index d6dd8544e4..b0333aa711 100644 --- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241498_DDDCC8.s +++ b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241498_DDDCC8.s @@ -15,5 +15,5 @@ glabel func_80241498_DDDCC8 .L802414C0: /* DDDCF0 802414C0 03E00008 */ jr $ra /* DDDCF4 802414C4 24020002 */ addiu $v0, $zero, 2 -/* DDDCF8 802414C8 00000000 */ nop -/* DDDCFC 802414CC 00000000 */ nop +/* DDDCF8 802414C8 00000000 */ nop +/* DDDCFC 802414CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240000_DDF310.s b/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240000_DDF310.s index 9ffe0fcf70..8cad23c8f1 100644 --- a/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240000_DDF310.s +++ b/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240000_DDF310.s @@ -41,14 +41,14 @@ glabel func_80240000_DDF310 /* DDF39C 8024008C 10600009 */ beqz $v1, .L802400B4 /* DDF3A0 80240090 0000102D */ daddu $v0, $zero, $zero /* DDF3A4 80240094 08090059 */ j .L80240164 -/* DDF3A8 80240098 00000000 */ nop +/* DDF3A8 80240098 00000000 */ nop .L8024009C: /* DDF3AC 8024009C 10620013 */ beq $v1, $v0, .L802400EC /* DDF3B0 802400A0 24020003 */ addiu $v0, $zero, 3 /* DDF3B4 802400A4 1062001E */ beq $v1, $v0, .L80240120 /* DDF3B8 802400A8 0000102D */ daddu $v0, $zero, $zero /* DDF3BC 802400AC 08090059 */ j .L80240164 -/* DDF3C0 802400B0 00000000 */ nop +/* DDF3C0 802400B0 00000000 */ nop .L802400B4: /* DDF3C4 802400B4 0C03AC5A */ jal func_800EB168 /* DDF3C8 802400B8 0000202D */ daddu $a0, $zero, $zero @@ -75,7 +75,7 @@ glabel func_80240000_DDF310 /* DDF414 80240104 A0510014 */ sb $s1, 0x14($v0) /* DDF418 80240108 82640012 */ lb $a0, 0x12($s3) /* DDF41C 8024010C 0C03ACA9 */ jal func_800EB2A4 -/* DDF420 80240110 00000000 */ nop +/* DDF420 80240110 00000000 */ nop /* DDF424 80240114 24020003 */ addiu $v0, $zero, 3 /* DDF428 80240118 08090058 */ j .L80240160 /* DDF42C 8024011C AE420070 */ sw $v0, 0x70($s2) diff --git a/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240184_DDF494.s b/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240184_DDF494.s index 08fcdd7c9d..978cf42f7a 100644 --- a/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240184_DDF494.s +++ b/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240184_DDF494.s @@ -22,7 +22,7 @@ glabel func_80240184_DDF494 /* DDF4D4 802401C4 C460002C */ lwc1 $f0, 0x2c($v1) /* DDF4D8 802401C8 3C014100 */ lui $at, 0x4100 /* DDF4DC 802401CC 44811000 */ mtc1 $at, $f2 -/* DDF4E0 802401D0 00000000 */ nop +/* DDF4E0 802401D0 00000000 */ nop /* DDF4E4 802401D4 46020000 */ add.s $f0, $f0, $f2 /* DDF4E8 802401D8 C4620030 */ lwc1 $f2, 0x30($v1) /* DDF4EC 802401DC C4640028 */ lwc1 $f4, 0x28($v1) @@ -40,7 +40,7 @@ glabel func_80240184_DDF494 /* DDF51C 8024020C 24020006 */ addiu $v0, $zero, 6 /* DDF520 80240210 82230012 */ lb $v1, 0x12($s1) /* DDF524 80240214 14620022 */ bne $v1, $v0, .L802402A0 -/* DDF528 80240218 00000000 */ nop +/* DDF528 80240218 00000000 */ nop /* DDF52C 8024021C 8E020074 */ lw $v0, 0x74($s0) /* DDF530 80240220 14400004 */ bnez $v0, .L80240234 /* DDF534 80240224 24020001 */ addiu $v0, $zero, 1 @@ -62,7 +62,7 @@ glabel func_80240184_DDF494 /* DDF56C 8024025C 240200FF */ addiu $v0, $zero, 0xff /* DDF570 80240260 8E020074 */ lw $v0, 0x74($s0) /* DDF574 80240264 10400007 */ beqz $v0, .L80240284 -/* DDF578 80240268 00000000 */ nop +/* DDF578 80240268 00000000 */ nop /* DDF57C 8024026C 8E020070 */ lw $v0, 0x70($s0) /* DDF580 80240270 284200FF */ slti $v0, $v0, 0xff /* DDF584 80240274 10400003 */ beqz $v0, .L80240284 diff --git a/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240314_DDF624.s b/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240314_DDF624.s index acd4c48ef5..0a8b4f7257 100644 --- a/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240314_DDF624.s +++ b/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240314_DDF624.s @@ -35,7 +35,7 @@ glabel func_80240314_DDF624 /* DDF69C 8024038C 0C04DFB0 */ jal func_80137EC0 /* DDF6A0 80240390 0240382D */ daddu $a3, $s2, $zero /* DDF6A4 80240394 44900000 */ mtc1 $s0, $f0 -/* DDF6A8 80240398 00000000 */ nop +/* DDF6A8 80240398 00000000 */ nop /* DDF6AC 8024039C 46800020 */ cvt.s.w $f0, $f0 /* DDF6B0 802403A0 44050000 */ mfc1 $a1, $f0 /* DDF6B4 802403A4 0C04E035 */ jal func_801380D4 diff --git a/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_802403D8_DDF6E8.s b/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_802403D8_DDF6E8.s index db0ee250fa..2d253fd08c 100644 --- a/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_802403D8_DDF6E8.s +++ b/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_802403D8_DDF6E8.s @@ -5,7 +5,7 @@ glabel func_802403D8_DDF6E8 /* DDF6E8 802403D8 27BDFFE0 */ addiu $sp, $sp, -0x20 /* DDF6EC 802403DC F7B40018 */ sdc1 $f20, 0x18($sp) /* DDF6F0 802403E0 4480A000 */ mtc1 $zero, $f20 -/* DDF6F4 802403E4 00000000 */ nop +/* DDF6F4 802403E4 00000000 */ nop /* DDF6F8 802403E8 4405A000 */ mfc1 $a1, $f20 /* DDF6FC 802403EC AFBF0010 */ sw $ra, 0x10($sp) /* DDF700 802403F0 0C04E035 */ jal func_801380D4 @@ -18,5 +18,5 @@ glabel func_802403D8_DDF6E8 /* DDF71C 8024040C 24020002 */ addiu $v0, $zero, 2 /* DDF720 80240410 03E00008 */ jr $ra /* DDF724 80240414 27BD0020 */ addiu $sp, $sp, 0x20 -/* DDF728 80240418 00000000 */ nop -/* DDF72C 8024041C 00000000 */ nop +/* DDF728 80240418 00000000 */ nop +/* DDF72C 8024041C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_12/DDF730/func_80240420_DDF730.s b/asm/nonmatchings/world/area_omo/omo_12/DDF730/func_80240420_DDF730.s index 29ea75b4ba..db8f1ebe08 100644 --- a/asm/nonmatchings/world/area_omo/omo_12/DDF730/func_80240420_DDF730.s +++ b/asm/nonmatchings/world/area_omo/omo_12/DDF730/func_80240420_DDF730.s @@ -39,6 +39,6 @@ glabel func_80240420_DDF730 /* DDF7B8 802404A8 24020002 */ addiu $v0, $zero, 2 /* DDF7BC 802404AC 03E00008 */ jr $ra /* DDF7C0 802404B0 27BD0028 */ addiu $sp, $sp, 0x28 -/* DDF7C4 802404B4 00000000 */ nop -/* DDF7C8 802404B8 00000000 */ nop -/* DDF7CC 802404BC 00000000 */ nop +/* DDF7C4 802404B4 00000000 */ nop +/* DDF7C8 802404B8 00000000 */ nop +/* DDF7CC 802404BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2490/func_80240000_DE2490.s b/asm/nonmatchings/world/area_omo/omo_13/DE2490/func_80240000_DE2490.s index 137657a5d2..6f7d5afe23 100644 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2490/func_80240000_DE2490.s +++ b/asm/nonmatchings/world/area_omo/omo_13/DE2490/func_80240000_DE2490.s @@ -60,9 +60,9 @@ glabel func_80240000_DE2490 /* DE2560 802400D0 3C014048 */ lui $at, 0x4048 /* DE2564 802400D4 3421F5C3 */ ori $at, $at, 0xf5c3 /* DE2568 802400D8 44816000 */ mtc1 $at, $f12 -/* DE256C 802400DC 00000000 */ nop +/* DE256C 802400DC 00000000 */ nop /* DE2570 802400E0 460C0302 */ mul.s $f12, $f0, $f12 -/* DE2574 802400E4 00000000 */ nop +/* DE2574 802400E4 00000000 */ nop /* DE2578 802400E8 3C014334 */ lui $at, 0x4334 /* DE257C 802400EC 44811000 */ mtc1 $at, $f2 /* DE2580 802400F0 E640000C */ swc1 $f0, 0xc($s2) @@ -70,31 +70,31 @@ glabel func_80240000_DE2490 /* DE2588 802400F8 46026303 */ div.s $f12, $f12, $f2 /* DE258C 802400FC 3C0141A0 */ lui $at, 0x41a0 /* DE2590 80240100 44811000 */ mtc1 $at, $f2 -/* DE2594 80240104 00000000 */ nop +/* DE2594 80240104 00000000 */ nop /* DE2598 80240108 46020502 */ mul.s $f20, $f0, $f2 -/* DE259C 8024010C 00000000 */ nop +/* DE259C 8024010C 00000000 */ nop /* DE25A0 80240110 4614A082 */ mul.s $f2, $f20, $f20 -/* DE25A4 80240114 00000000 */ nop +/* DE25A4 80240114 00000000 */ nop /* DE25A8 80240118 3C0142B4 */ lui $at, 0x42b4 /* DE25AC 8024011C 44810000 */ mtc1 $at, $f0 /* DE25B0 80240120 1680001B */ bnez $s4, .L80240190 /* DE25B4 80240124 46001603 */ div.s $f24, $f2, $f0 /* DE25B8 80240128 C6400004 */ lwc1 $f0, 4($s2) /* DE25BC 8024012C 4600B03E */ c.le.s $f22, $f0 -/* DE25C0 80240130 00000000 */ nop +/* DE25C0 80240130 00000000 */ nop /* DE25C4 80240134 45000005 */ bc1f .L8024014C -/* DE25C8 80240138 00000000 */ nop +/* DE25C8 80240138 00000000 */ nop /* DE25CC 8024013C 4616A03C */ c.lt.s $f20, $f22 -/* DE25D0 80240140 00000000 */ nop +/* DE25D0 80240140 00000000 */ nop /* DE25D4 80240144 4501000A */ bc1t .L80240170 /* DE25D8 80240148 240401D6 */ addiu $a0, $zero, 0x1d6 .L8024014C: /* DE25DC 8024014C 4616003C */ c.lt.s $f0, $f22 -/* DE25E0 80240150 00000000 */ nop +/* DE25E0 80240150 00000000 */ nop /* DE25E4 80240154 4502000E */ bc1fl .L80240190 /* DE25E8 80240158 E6540004 */ swc1 $f20, 4($s2) /* DE25EC 8024015C 4614B03E */ c.le.s $f22, $f20 -/* DE25F0 80240160 00000000 */ nop +/* DE25F0 80240160 00000000 */ nop /* DE25F4 80240164 4502000A */ bc1fl .L80240190 /* DE25F8 80240168 E6540004 */ swc1 $f20, 4($s2) /* DE25FC 8024016C 240401D6 */ addiu $a0, $zero, 0x1d6 @@ -165,6 +165,6 @@ glabel func_80240000_DE2490 /* DE26F8 80240268 D7B400B8 */ ldc1 $f20, 0xb8($sp) /* DE26FC 8024026C 03E00008 */ jr $ra /* DE2700 80240270 27BD00D0 */ addiu $sp, $sp, 0xd0 -/* DE2704 80240274 00000000 */ nop -/* DE2708 80240278 00000000 */ nop -/* DE270C 8024027C 00000000 */ nop +/* DE2704 80240274 00000000 */ nop +/* DE2708 80240278 00000000 */ nop +/* DE270C 8024027C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240280_DE2710.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240280_DE2710.s index 29d14cef3a..69a00f0bb1 100644 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240280_DE2710.s +++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240280_DE2710.s @@ -15,7 +15,7 @@ glabel func_80240280_DE2710 /* DE2738 802402A8 D4222EE0 */ ldc1 $f2, %lo(func_80242EE0_A1DFE0)($at) /* DE273C 802402AC 46000021 */ cvt.d.s $f0, $f0 /* DE2740 802402B0 46220002 */ mul.d $f0, $f0, $f2 -/* DE2744 802402B4 00000000 */ nop +/* DE2744 802402B4 00000000 */ nop /* DE2748 802402B8 46200020 */ cvt.s.d $f0, $f0 /* DE274C 802402BC E4400018 */ swc1 $f0, 0x18($v0) /* DE2750 802402C0 8E0300CC */ lw $v1, 0xcc($s0) diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802402F0_DE2780.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802402F0_DE2780.s index 00b3a447cd..e6539c8d4e 100644 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802402F0_DE2780.s +++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802402F0_DE2780.s @@ -22,7 +22,7 @@ glabel func_802402F0_DE2780 /* DE27C4 80240334 0C0129E1 */ jal func_8004A784 /* DE27C8 80240338 0000382D */ daddu $a3, $zero, $zero /* DE27CC 8024033C 14400005 */ bnez $v0, .L80240354 -/* DE27D0 80240340 00000000 */ nop +/* DE27D0 80240340 00000000 */ nop /* DE27D4 80240344 8E050018 */ lw $a1, 0x18($s0) /* DE27D8 80240348 8E06000C */ lw $a2, 0xc($s0) /* DE27DC 8024034C 0C00EA95 */ jal npc_move_heading @@ -33,13 +33,13 @@ glabel func_802402F0_DE2780 /* DE27EC 8024035C A602008E */ sh $v0, 0x8e($s0) /* DE27F0 80240360 00021400 */ sll $v0, $v0, 0x10 /* DE27F4 80240364 14400010 */ bnez $v0, .L802403A8 -/* DE27F8 80240368 00000000 */ nop +/* DE27F8 80240368 00000000 */ nop /* DE27FC 8024036C C6000018 */ lwc1 $f0, 0x18($s0) /* DE2800 80240370 3C018024 */ lui $at, %hi(D_80242EE8) /* DE2804 80240374 D4222EE8 */ ldc1 $f2, %lo(D_80242EE8)($at) /* DE2808 80240378 46000021 */ cvt.d.s $f0, $f0 /* DE280C 8024037C 46220002 */ mul.d $f0, $f0, $f2 -/* DE2810 80240380 00000000 */ nop +/* DE2810 80240380 00000000 */ nop /* DE2814 80240384 46200020 */ cvt.s.d $f0, $f0 /* DE2818 80240388 E6000018 */ swc1 $f0, 0x18($s0) /* DE281C 8024038C 8E2200CC */ lw $v0, 0xcc($s1) diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802403C0_DE2850.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802403C0_DE2850.s index c000908942..7b4fff1e63 100644 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802403C0_DE2850.s +++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802403C0_DE2850.s @@ -21,7 +21,7 @@ glabel func_802403C0_DE2850 /* DE2890 80240400 0C0129E1 */ jal func_8004A784 /* DE2894 80240404 0000382D */ daddu $a3, $zero, $zero /* DE2898 80240408 14400005 */ bnez $v0, .L80240420 -/* DE289C 8024040C 00000000 */ nop +/* DE289C 8024040C 00000000 */ nop /* DE28A0 80240410 8E050018 */ lw $a1, 0x18($s0) /* DE28A4 80240414 8E06000C */ lw $a2, 0xc($s0) /* DE28A8 80240418 0C00EA95 */ jal npc_move_heading diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240458_DE28E8.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240458_DE28E8.s index 25f8166c9e..4fac3e8e96 100644 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240458_DE28E8.s +++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240458_DE28E8.s @@ -16,7 +16,7 @@ glabel func_80240458_DE28E8 /* DE2914 80240484 A462008E */ sh $v0, 0x8e($v1) /* DE2918 80240488 00021400 */ sll $v0, $v0, 0x10 /* DE291C 8024048C 14400005 */ bnez $v0, .L802404A4 -/* DE2920 80240490 00000000 */ nop +/* DE2920 80240490 00000000 */ nop /* DE2924 80240494 8E0200CC */ lw $v0, 0xcc($s0) /* DE2928 80240498 8C420000 */ lw $v0, ($v0) /* DE292C 8024049C AC620028 */ sw $v0, 0x28($v1) diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s index d5435e573e..33f2efcc4d 100644 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s +++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s @@ -124,45 +124,53 @@ glabel func_802404B8_DE2948 /* DE2B0C 8024067C 2C620064 */ sltiu $v0, $v1, 0x64 /* DE2B10 80240680 10400050 */ beqz $v0, .L802407C4 /* DE2B14 80240684 00031080 */ sll $v0, $v1, 2 -/* DE2B18 80240688 3C018024 */ lui $at, %hi(func_80242EF0_BE66A0) +/* DE2B18 80240688 3C018024 */ lui $at, %hi(jtbl_80242EF0_DE5380) /* DE2B1C 8024068C 00220821 */ addu $at, $at, $v0 -/* DE2B20 80240690 8C222EF0 */ lw $v0, %lo(func_80242EF0_BE66A0)($at) +/* DE2B20 80240690 8C222EF0 */ lw $v0, %lo(jtbl_80242EF0_DE5380)($at) /* DE2B24 80240694 00400008 */ jr $v0 /* DE2B28 80240698 00000000 */ nop +glabel L8024069C_DE2B2C /* DE2B2C 8024069C 0260202D */ daddu $a0, $s3, $zero /* DE2B30 802406A0 0280282D */ daddu $a1, $s4, $zero /* DE2B34 802406A4 0C012568 */ jal func_800495A0 /* DE2B38 802406A8 02A0302D */ daddu $a2, $s5, $zero +glabel L802406AC_DE2B3C /* DE2B3C 802406AC 0260202D */ daddu $a0, $s3, $zero /* DE2B40 802406B0 0280282D */ daddu $a1, $s4, $zero /* DE2B44 802406B4 0C0125AE */ jal func_800496B8 /* DE2B48 802406B8 02A0302D */ daddu $a2, $s5, $zero /* DE2B4C 802406BC 080901F1 */ j .L802407C4 /* DE2B50 802406C0 00000000 */ nop +glabel L802406C4_DE2B54 /* DE2B54 802406C4 0260202D */ daddu $a0, $s3, $zero /* DE2B58 802406C8 0280282D */ daddu $a1, $s4, $zero /* DE2B5C 802406CC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DE2B60 802406D0 02A0302D */ daddu $a2, $s5, $zero +glabel L802406D4_DE2B64 /* DE2B64 802406D4 0260202D */ daddu $a0, $s3, $zero /* DE2B68 802406D8 0280282D */ daddu $a1, $s4, $zero /* DE2B6C 802406DC 0C012701 */ jal func_80049C04 /* DE2B70 802406E0 02A0302D */ daddu $a2, $s5, $zero /* DE2B74 802406E4 080901F1 */ j .L802407C4 /* DE2B78 802406E8 00000000 */ nop +glabel L802406EC_DE2B7C /* DE2B7C 802406EC 0260202D */ daddu $a0, $s3, $zero /* DE2B80 802406F0 0280282D */ daddu $a1, $s4, $zero /* DE2B84 802406F4 0C01278F */ jal func_80049E3C /* DE2B88 802406F8 02A0302D */ daddu $a2, $s5, $zero +glabel L802406FC_DE2B8C /* DE2B8C 802406FC 0260202D */ daddu $a0, $s3, $zero /* DE2B90 80240700 0280282D */ daddu $a1, $s4, $zero /* DE2B94 80240704 0C0127B3 */ jal func_80049ECC /* DE2B98 80240708 02A0302D */ daddu $a2, $s5, $zero /* DE2B9C 8024070C 080901F1 */ j .L802407C4 /* DE2BA0 80240710 00000000 */ nop +glabel L80240714_DE2BA4 /* DE2BA4 80240714 0260202D */ daddu $a0, $s3, $zero /* DE2BA8 80240718 0280282D */ daddu $a1, $s4, $zero /* DE2BAC 8024071C 0C0127DF */ jal func_80049F7C /* DE2BB0 80240720 02A0302D */ daddu $a2, $s5, $zero +glabel L80240724_DE2BB4 /* DE2BB4 80240724 0260202D */ daddu $a0, $s3, $zero /* DE2BB8 80240728 0280282D */ daddu $a1, $s4, $zero /* DE2BBC 8024072C 0C012849 */ jal func_8004A124 @@ -171,6 +179,7 @@ glabel func_802404B8_DE2948 /* DE2BC8 80240738 2402000E */ addiu $v0, $zero, 0xe /* DE2BCC 8024073C 14620021 */ bne $v1, $v0, .L802407C4 /* DE2BD0 80240740 00000000 */ nop +glabel L80240744_DE2BD4 /* DE2BD4 80240744 0260202D */ daddu $a0, $s3, $zero /* DE2BD8 80240748 0280282D */ daddu $a1, $s4, $zero /* DE2BDC 8024074C 0C0900A0 */ jal func_80240280_DE2710 @@ -179,6 +188,7 @@ glabel func_802404B8_DE2948 /* DE2BE8 80240758 2402000F */ addiu $v0, $zero, 0xf /* DE2BEC 8024075C 14620019 */ bne $v1, $v0, .L802407C4 /* DE2BF0 80240760 00000000 */ nop +glabel L80240764_DE2BF4 /* DE2BF4 80240764 0260202D */ daddu $a0, $s3, $zero /* DE2BF8 80240768 0280282D */ daddu $a1, $s4, $zero /* DE2BFC 8024076C 0C0900BC */ jal func_802402F0_DE2780 @@ -187,6 +197,7 @@ glabel func_802404B8_DE2948 /* DE2C08 80240778 24020010 */ addiu $v0, $zero, 0x10 /* DE2C0C 8024077C 14620011 */ bne $v1, $v0, .L802407C4 /* DE2C10 80240780 00000000 */ nop +glabel L80240784_DE2C14 /* DE2C14 80240784 0260202D */ daddu $a0, $s3, $zero /* DE2C18 80240788 0280282D */ daddu $a1, $s4, $zero /* DE2C1C 8024078C 0C0900F0 */ jal func_802403C0_DE2850 @@ -195,15 +206,18 @@ glabel func_802404B8_DE2948 /* DE2C28 80240798 24020011 */ addiu $v0, $zero, 0x11 /* DE2C2C 8024079C 14620009 */ bne $v1, $v0, .L802407C4 /* DE2C30 802407A0 00000000 */ nop +glabel L802407A4_DE2C34 /* DE2C34 802407A4 0260202D */ daddu $a0, $s3, $zero /* DE2C38 802407A8 0280282D */ daddu $a1, $s4, $zero /* DE2C3C 802407AC 0C090116 */ jal func_80240458_DE28E8 /* DE2C40 802407B0 02A0302D */ daddu $a2, $s5, $zero /* DE2C44 802407B4 080901F1 */ j .L802407C4 /* DE2C48 802407B8 00000000 */ nop +glabel L802407BC_DE2C4C /* DE2C4C 802407BC 0C0129CF */ jal func_8004A73C /* DE2C50 802407C0 0260202D */ daddu $a0, $s3, $zero .L802407C4: +glabel L802407C4_DE2C54 /* DE2C54 802407C4 8FBF0060 */ lw $ra, 0x60($sp) /* DE2C58 802407C8 8FB5005C */ lw $s5, 0x5c($sp) /* DE2C5C 802407CC 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_8024083C_DE2CCC.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_8024083C_DE2CCC.s index f9b03643e1..fbfc423fda 100644 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_8024083C_DE2CCC.s +++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_8024083C_DE2CCC.s @@ -26,9 +26,9 @@ glabel func_8024083C_DE2CCC /* DE2D1C 8024088C 10620030 */ beq $v1, $v0, .L80240950 /* DE2D20 80240890 24020003 */ addiu $v0, $zero, 3 /* DE2D24 80240894 10620034 */ beq $v1, $v0, .L80240968 -/* DE2D28 80240898 00000000 */ nop +/* DE2D28 80240898 00000000 */ nop /* DE2D2C 8024089C 08090272 */ j .L802409C8 -/* DE2D30 802408A0 00000000 */ nop +/* DE2D30 802408A0 00000000 */ nop .L802408A4: /* DE2D34 802408A4 3442000C */ ori $v0, $v0, 0xc /* DE2D38 802408A8 3C054387 */ lui $a1, 0x4387 @@ -99,9 +99,9 @@ glabel func_8024083C_DE2CCC /* DE2E18 80240988 E6200048 */ swc1 $f0, 0x48($s1) /* DE2E1C 8024098C 46000021 */ cvt.d.s $f0, $f0 /* DE2E20 80240990 4620103C */ c.lt.d $f2, $f0 -/* DE2E24 80240994 00000000 */ nop +/* DE2E24 80240994 00000000 */ nop /* DE2E28 80240998 45000004 */ bc1f .L802409AC -/* DE2E2C 8024099C 00000000 */ nop +/* DE2E2C 8024099C 00000000 */ nop /* DE2E30 802409A0 46220001 */ sub.d $f0, $f0, $f2 /* DE2E34 802409A4 46200020 */ cvt.s.d $f0, $f0 /* DE2E38 802409A8 E6200048 */ swc1 $f0, 0x48($s1) diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s index 6f18c0ceba..659bdd43ea 100644 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s +++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s @@ -46,7 +46,7 @@ glabel func_80240A00_DE2E90 /* DE2F34 80240AA4 8E2200B0 */ lw $v0, 0xb0($s1) /* DE2F38 80240AA8 30420004 */ andi $v0, $v0, 4 /* DE2F3C 80240AAC 10400044 */ beqz $v0, .L80240BC0 -/* DE2F40 80240AB0 00000000 */ nop +/* DE2F40 80240AB0 00000000 */ nop .L80240AB4: /* DE2F44 80240AB4 2404F7FF */ addiu $a0, $zero, -0x801 /* DE2F48 80240AB8 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_80240A00_DE2E90 /* DE3008 80240B78 C640003C */ lwc1 $f0, 0x3c($s2) /* DE300C 80240B7C C6420040 */ lwc1 $f2, 0x40($s2) /* DE3010 80240B80 44822000 */ mtc1 $v0, $f4 -/* DE3014 80240B84 00000000 */ nop +/* DE3014 80240B84 00000000 */ nop /* DE3018 80240B88 46802120 */ cvt.s.w $f4, $f4 /* DE301C 80240B8C 27A20044 */ addiu $v0, $sp, 0x44 /* DE3020 80240B90 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_80240A00_DE2E90 /* DE3038 80240BA8 0C0372DF */ jal func_800DCB7C /* DE303C 80240BAC 27A6003C */ addiu $a2, $sp, 0x3c /* DE3040 80240BB0 10400003 */ beqz $v0, .L80240BC0 -/* DE3044 80240BB4 00000000 */ nop +/* DE3044 80240BB4 00000000 */ nop /* DE3048 80240BB8 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DE304C 80240BBC E640003C */ swc1 $f0, 0x3c($s2) .L80240BC0: @@ -124,45 +124,53 @@ glabel func_80240A00_DE2E90 /* DE3054 80240BC4 2C620064 */ sltiu $v0, $v1, 0x64 /* DE3058 80240BC8 10400038 */ beqz $v0, .L80240CAC /* DE305C 80240BCC 00031080 */ sll $v0, $v1, 2 -/* DE3060 80240BD0 3C018024 */ lui $at, %hi(func_80243090_C395C0) +/* DE3060 80240BD0 3C018024 */ lui $at, %hi(jtbl_80243090_DE5520) /* DE3064 80240BD4 00220821 */ addu $at, $at, $v0 -/* DE3068 80240BD8 8C223090 */ lw $v0, %lo(func_80243090_C395C0)($at) +/* DE3068 80240BD8 8C223090 */ lw $v0, %lo(jtbl_80243090_DE5520)($at) /* DE306C 80240BDC 00400008 */ jr $v0 -/* DE3070 80240BE0 00000000 */ nop +/* DE3070 80240BE0 00000000 */ nop +glabel L80240BE4_DE3074 /* DE3074 80240BE4 0260202D */ daddu $a0, $s3, $zero /* DE3078 80240BE8 0280282D */ daddu $a1, $s4, $zero /* DE307C 80240BEC 0C012568 */ jal func_800495A0 /* DE3080 80240BF0 02A0302D */ daddu $a2, $s5, $zero +glabel L80240BF4_DE3084 /* DE3084 80240BF4 0260202D */ daddu $a0, $s3, $zero /* DE3088 80240BF8 0280282D */ daddu $a1, $s4, $zero /* DE308C 80240BFC 0C0125AE */ jal func_800496B8 /* DE3090 80240C00 02A0302D */ daddu $a2, $s5, $zero /* DE3094 80240C04 0809032B */ j .L80240CAC -/* DE3098 80240C08 00000000 */ nop +/* DE3098 80240C08 00000000 */ nop +glabel L80240C0C_DE309C /* DE309C 80240C0C 0260202D */ daddu $a0, $s3, $zero /* DE30A0 80240C10 0280282D */ daddu $a1, $s4, $zero /* DE30A4 80240C14 0C0901FB */ jal omo_13_UnkNpcAIFunc4 /* DE30A8 80240C18 02A0302D */ daddu $a2, $s5, $zero +glabel L80240C1C_DE30AC /* DE30AC 80240C1C 0260202D */ daddu $a0, $s3, $zero /* DE30B0 80240C20 0280282D */ daddu $a1, $s4, $zero /* DE30B4 80240C24 0C09020F */ jal func_8024083C_DE2CCC /* DE30B8 80240C28 02A0302D */ daddu $a2, $s5, $zero /* DE30BC 80240C2C 0809032B */ j .L80240CAC -/* DE30C0 80240C30 00000000 */ nop +/* DE30C0 80240C30 00000000 */ nop +glabel L80240C34_DE30C4 /* DE30C4 80240C34 0260202D */ daddu $a0, $s3, $zero /* DE30C8 80240C38 0280282D */ daddu $a1, $s4, $zero /* DE30CC 80240C3C 0C01278F */ jal func_80049E3C /* DE30D0 80240C40 02A0302D */ daddu $a2, $s5, $zero +glabel L80240C44_DE30D4 /* DE30D4 80240C44 0260202D */ daddu $a0, $s3, $zero /* DE30D8 80240C48 0280282D */ daddu $a1, $s4, $zero /* DE30DC 80240C4C 0C0127B3 */ jal func_80049ECC /* DE30E0 80240C50 02A0302D */ daddu $a2, $s5, $zero /* DE30E4 80240C54 0809032B */ j .L80240CAC -/* DE30E8 80240C58 00000000 */ nop +/* DE30E8 80240C58 00000000 */ nop +glabel L80240C5C_DE30EC /* DE30EC 80240C5C 0260202D */ daddu $a0, $s3, $zero /* DE30F0 80240C60 0280282D */ daddu $a1, $s4, $zero /* DE30F4 80240C64 0C0127DF */ jal func_80049F7C /* DE30F8 80240C68 02A0302D */ daddu $a2, $s5, $zero +glabel L80240C6C_DE30FC /* DE30FC 80240C6C 0260202D */ daddu $a0, $s3, $zero /* DE3100 80240C70 0280282D */ daddu $a1, $s4, $zero /* DE3104 80240C74 0C012849 */ jal func_8004A124 @@ -170,16 +178,19 @@ glabel func_80240A00_DE2E90 /* DE310C 80240C7C 8E630070 */ lw $v1, 0x70($s3) /* DE3110 80240C80 2402000E */ addiu $v0, $zero, 0xe /* DE3114 80240C84 14620009 */ bne $v1, $v0, .L80240CAC -/* DE3118 80240C88 00000000 */ nop +/* DE3118 80240C88 00000000 */ nop +glabel L80240C8C_DE311C /* DE311C 80240C8C 0260202D */ daddu $a0, $s3, $zero /* DE3120 80240C90 0280282D */ daddu $a1, $s4, $zero /* DE3124 80240C94 0C0128FA */ jal func_8004A3E8 /* DE3128 80240C98 02A0302D */ daddu $a2, $s5, $zero /* DE312C 80240C9C 0809032B */ j .L80240CAC -/* DE3130 80240CA0 00000000 */ nop +/* DE3130 80240CA0 00000000 */ nop +glabel L80240CA4_DE3134 /* DE3134 80240CA4 0C0129CF */ jal func_8004A73C /* DE3138 80240CA8 0260202D */ daddu $a0, $s3, $zero .L80240CAC: +glabel L80240CAC_DE313C /* DE313C 80240CAC 8FBF0060 */ lw $ra, 0x60($sp) /* DE3140 80240CB0 8FB5005C */ lw $s5, 0x5c($sp) /* DE3144 80240CB4 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F8C_DE341C.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F8C_DE341C.s index 792f276814..ad5c88db77 100644 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F8C_DE341C.s +++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F8C_DE341C.s @@ -28,7 +28,7 @@ glabel func_80240F8C_DE341C /* DE3470 80240FE0 00220821 */ addu $at, $at, $v0 /* DE3474 80240FE4 AC203220 */ sw $zero, %lo(func_80243220_DC04D0)($at) /* DE3478 80240FE8 08090406 */ j .L80241018 -/* DE347C 80240FEC 00000000 */ nop +/* DE347C 80240FEC 00000000 */ nop .L80240FF0: /* DE3480 80240FF0 3C038024 */ lui $v1, %hi(func_80243220_DC04D0) /* DE3484 80240FF4 24633220 */ addiu $v1, $v1, %lo(func_80243220_DC04D0) diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80241028_DE34B8.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80241028_DE34B8.s index 982015d27d..a82c9f2b7a 100644 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80241028_DE34B8.s +++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80241028_DE34B8.s @@ -37,9 +37,9 @@ glabel func_80241028_DE34B8 /* DE3538 802410A8 4600B306 */ mov.s $f12, $f22 /* DE353C 802410AC 3C0141F0 */ lui $at, 0x41f0 /* DE3540 802410B0 44811000 */ mtc1 $at, $f2 -/* DE3544 802410B4 00000000 */ nop +/* DE3544 802410B4 00000000 */ nop /* DE3548 802410B8 46020002 */ mul.s $f0, $f0, $f2 -/* DE354C 802410BC 00000000 */ nop +/* DE354C 802410BC 00000000 */ nop /* DE3550 802410C0 8E4200B0 */ lw $v0, 0xb0($s2) /* DE3554 802410C4 10400009 */ beqz $v0, .L802410EC /* DE3558 802410C8 46140600 */ add.s $f24, $f0, $f20 @@ -47,10 +47,10 @@ glabel func_80241028_DE34B8 /* DE3560 802410D0 3C013F33 */ lui $at, 0x3f33 /* DE3564 802410D4 34213333 */ ori $at, $at, 0x3333 /* DE3568 802410D8 44810000 */ mtc1 $at, $f0 -/* DE356C 802410DC 00000000 */ nop +/* DE356C 802410DC 00000000 */ nop /* DE3570 802410E0 46001502 */ mul.s $f20, $f2, $f0 /* DE3574 802410E4 0809043C */ j .L802410F0 -/* DE3578 802410E8 00000000 */ nop +/* DE3578 802410E8 00000000 */ nop .L802410EC: /* DE357C 802410EC C614003C */ lwc1 $f20, 0x3c($s0) .L802410F0: @@ -58,9 +58,9 @@ glabel func_80241028_DE34B8 /* DE3584 802410F4 4600B306 */ mov.s $f12, $f22 /* DE3588 802410F8 3C0141F0 */ lui $at, 0x41f0 /* DE358C 802410FC 44811000 */ mtc1 $at, $f2 -/* DE3590 80241100 00000000 */ nop +/* DE3590 80241100 00000000 */ nop /* DE3594 80241104 46020002 */ mul.s $f0, $f0, $f2 -/* DE3598 80241108 00000000 */ nop +/* DE3598 80241108 00000000 */ nop /* DE359C 8024110C 3C01C234 */ lui $at, 0xc234 /* DE35A0 80241110 44811000 */ mtc1 $at, $f2 /* DE35A4 80241114 8E4200B0 */ lw $v0, 0xb0($s2) @@ -68,25 +68,25 @@ glabel func_80241028_DE34B8 /* DE35AC 8024111C 46001101 */ sub.s $f4, $f2, $f0 /* DE35B0 80241120 C602003C */ lwc1 $f2, 0x3c($s0) /* DE35B4 80241124 44800000 */ mtc1 $zero, $f0 -/* DE35B8 80241128 00000000 */ nop +/* DE35B8 80241128 00000000 */ nop /* DE35BC 8024112C 46001032 */ c.eq.s $f2, $f0 -/* DE35C0 80241130 00000000 */ nop +/* DE35C0 80241130 00000000 */ nop /* DE35C4 80241134 45030001 */ bc1tl .L8024113C /* DE35C8 80241138 AE4000B0 */ sw $zero, 0xb0($s2) .L8024113C: /* DE35CC 8024113C C6000038 */ lwc1 $f0, 0x38($s0) /* DE35D0 80241140 46180032 */ c.eq.s $f0, $f24 -/* DE35D4 80241144 00000000 */ nop +/* DE35D4 80241144 00000000 */ nop /* DE35D8 80241148 4500000C */ bc1f .L8024117C /* DE35DC 8024114C 3C04003B */ lui $a0, 0x3b /* DE35E0 80241150 C600003C */ lwc1 $f0, 0x3c($s0) /* DE35E4 80241154 46140032 */ c.eq.s $f0, $f20 -/* DE35E8 80241158 00000000 */ nop +/* DE35E8 80241158 00000000 */ nop /* DE35EC 8024115C 45000007 */ bc1f .L8024117C -/* DE35F0 80241160 00000000 */ nop +/* DE35F0 80241160 00000000 */ nop /* DE35F4 80241164 C6000040 */ lwc1 $f0, 0x40($s0) /* DE35F8 80241168 46040032 */ c.eq.s $f0, $f4 -/* DE35FC 8024116C 00000000 */ nop +/* DE35FC 8024116C 00000000 */ nop /* DE3600 80241170 4501001A */ bc1t .L802411DC /* DE3604 80241174 3C03003B */ lui $v1, 0x3b /* DE3608 80241178 3C04003B */ lui $a0, 0x3b @@ -139,4 +139,4 @@ glabel func_80241028_DE34B8 /* DE36B0 80241220 24020002 */ addiu $v0, $zero, 2 /* DE36B4 80241224 03E00008 */ jr $ra /* DE36B8 80241228 27BD0038 */ addiu $sp, $sp, 0x38 -/* DE36BC 8024122C 00000000 */ nop +/* DE36BC 8024122C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241230_DE36C0.s b/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241230_DE36C0.s index 519bba57f5..49276c3413 100644 --- a/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241230_DE36C0.s +++ b/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241230_DE36C0.s @@ -26,7 +26,7 @@ glabel func_80241230_DE36C0 /* DE3710 80241280 1440FFFA */ bnez $v0, .L8024126C /* DE3714 80241284 24A50004 */ addiu $a1, $a1, 4 /* DE3718 80241288 080904B3 */ j .L802412CC -/* DE371C 8024128C 00000000 */ nop +/* DE371C 8024128C 00000000 */ nop .L80241290: /* DE3720 80241290 0000182D */ daddu $v1, $zero, $zero /* DE3724 80241294 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_14/DE56B0/func_80240000_DE56B0.s b/asm/nonmatchings/world/area_omo/omo_14/DE56B0/func_80240000_DE56B0.s index c9ebc17c3e..e3ab3cd5a5 100644 --- a/asm/nonmatchings/world/area_omo/omo_14/DE56B0/func_80240000_DE56B0.s +++ b/asm/nonmatchings/world/area_omo/omo_14/DE56B0/func_80240000_DE56B0.s @@ -22,7 +22,7 @@ glabel func_80240000_DE56B0 /* DE56F0 80240040 C460002C */ lwc1 $f0, 0x2c($v1) /* DE56F4 80240044 3C014100 */ lui $at, 0x4100 /* DE56F8 80240048 44811000 */ mtc1 $at, $f2 -/* DE56FC 8024004C 00000000 */ nop +/* DE56FC 8024004C 00000000 */ nop /* DE5700 80240050 46020000 */ add.s $f0, $f0, $f2 /* DE5704 80240054 C4620030 */ lwc1 $f2, 0x30($v1) /* DE5708 80240058 C4640028 */ lwc1 $f4, 0x28($v1) @@ -40,7 +40,7 @@ glabel func_80240000_DE56B0 /* DE5738 80240088 24020006 */ addiu $v0, $zero, 6 /* DE573C 8024008C 82230012 */ lb $v1, 0x12($s1) /* DE5740 80240090 14620022 */ bne $v1, $v0, .L8024011C -/* DE5744 80240094 00000000 */ nop +/* DE5744 80240094 00000000 */ nop /* DE5748 80240098 8E020074 */ lw $v0, 0x74($s0) /* DE574C 8024009C 14400004 */ bnez $v0, .L802400B0 /* DE5750 802400A0 24020001 */ addiu $v0, $zero, 1 @@ -62,7 +62,7 @@ glabel func_80240000_DE56B0 /* DE5788 802400D8 240200FF */ addiu $v0, $zero, 0xff /* DE578C 802400DC 8E020074 */ lw $v0, 0x74($s0) /* DE5790 802400E0 10400007 */ beqz $v0, .L80240100 -/* DE5794 802400E4 00000000 */ nop +/* DE5794 802400E4 00000000 */ nop /* DE5798 802400E8 8E020070 */ lw $v0, 0x70($s0) /* DE579C 802400EC 284200FF */ slti $v0, $v0, 0xff /* DE57A0 802400F0 10400003 */ beqz $v0, .L80240100 @@ -94,5 +94,5 @@ glabel func_80240000_DE56B0 /* DE57FC 8024014C 0000102D */ daddu $v0, $zero, $zero /* DE5800 80240150 03E00008 */ jr $ra /* DE5804 80240154 27BD0028 */ addiu $sp, $sp, 0x28 -/* DE5808 80240158 00000000 */ nop -/* DE580C 8024015C 00000000 */ nop +/* DE5808 80240158 00000000 */ nop +/* DE580C 8024015C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240160_DE5810.s b/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240160_DE5810.s index cff77bf79d..69475708eb 100644 --- a/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240160_DE5810.s +++ b/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240160_DE5810.s @@ -19,10 +19,10 @@ glabel func_80240160_DE5810 /* DE5848 80240198 3C0143B4 */ lui $at, 0x43b4 /* DE584C 8024019C 4481A000 */ mtc1 $at, $f20 /* DE5850 802401A0 44826000 */ mtc1 $v0, $f12 -/* DE5854 802401A4 00000000 */ nop +/* DE5854 802401A4 00000000 */ nop /* DE5858 802401A8 46806320 */ cvt.s.w $f12, $f12 /* DE585C 802401AC 46146302 */ mul.s $f12, $f12, $f20 -/* DE5860 802401B0 00000000 */ nop +/* DE5860 802401B0 00000000 */ nop /* DE5864 802401B4 3C014120 */ lui $at, 0x4120 /* DE5868 802401B8 4481B000 */ mtc1 $at, $f22 /* DE586C 802401BC 0C00A8BB */ jal sin_deg @@ -35,18 +35,18 @@ glabel func_80240160_DE5810 /* DE5888 802401D8 4481C000 */ mtc1 $at, $f24 /* DE588C 802401DC 00431021 */ addu $v0, $v0, $v1 /* DE5890 802401E0 44821000 */ mtc1 $v0, $f2 -/* DE5894 802401E4 00000000 */ nop +/* DE5894 802401E4 00000000 */ nop /* DE5898 802401E8 468010A0 */ cvt.s.w $f2, $f2 /* DE589C 802401EC 46181082 */ mul.s $f2, $f2, $f24 -/* DE58A0 802401F0 00000000 */ nop +/* DE58A0 802401F0 00000000 */ nop /* DE58A4 802401F4 820200A4 */ lb $v0, 0xa4($s0) /* DE58A8 802401F8 44826000 */ mtc1 $v0, $f12 -/* DE58AC 802401FC 00000000 */ nop +/* DE58AC 802401FC 00000000 */ nop /* DE58B0 80240200 46806320 */ cvt.s.w $f12, $f12 /* DE58B4 80240204 46146302 */ mul.s $f12, $f12, $f20 -/* DE58B8 80240208 00000000 */ nop +/* DE58B8 80240208 00000000 */ nop /* DE58BC 8024020C 46001082 */ mul.s $f2, $f2, $f0 -/* DE58C0 80240210 00000000 */ nop +/* DE58C0 80240210 00000000 */ nop /* DE58C4 80240214 C6200028 */ lwc1 $f0, 0x28($s1) /* DE58C8 80240218 46166303 */ div.s $f12, $f12, $f22 /* DE58CC 8024021C 0C00A8D4 */ jal cos_deg @@ -55,12 +55,12 @@ glabel func_80240160_DE5810 /* DE58D8 80240228 860300A6 */ lh $v1, 0xa6($s0) /* DE58DC 8024022C 00431021 */ addu $v0, $v0, $v1 /* DE58E0 80240230 44821000 */ mtc1 $v0, $f2 -/* DE58E4 80240234 00000000 */ nop +/* DE58E4 80240234 00000000 */ nop /* DE58E8 80240238 468010A0 */ cvt.s.w $f2, $f2 /* DE58EC 8024023C 46181082 */ mul.s $f2, $f2, $f24 -/* DE58F0 80240240 00000000 */ nop +/* DE58F0 80240240 00000000 */ nop /* DE58F4 80240244 46001082 */ mul.s $f2, $f2, $f0 -/* DE58F8 80240248 00000000 */ nop +/* DE58F8 80240248 00000000 */ nop /* DE58FC 8024024C C6200030 */ lwc1 $f0, 0x30($s1) /* DE5900 80240250 C60C0038 */ lwc1 $f12, 0x38($s0) /* DE5904 80240254 46020501 */ sub.s $f20, $f0, $f2 @@ -68,31 +68,31 @@ glabel func_80240160_DE5810 /* DE590C 8024025C 4406B000 */ mfc1 $a2, $f22 /* DE5910 80240260 4407A000 */ mfc1 $a3, $f20 /* DE5914 80240264 0C00A7B5 */ jal dist2D -/* DE5918 80240268 00000000 */ nop +/* DE5918 80240268 00000000 */ nop /* DE591C 8024026C C6020018 */ lwc1 $f2, 0x18($s0) /* DE5920 80240270 46000606 */ mov.s $f24, $f0 /* DE5924 80240274 4618103C */ c.lt.s $f2, $f24 -/* DE5928 80240278 00000000 */ nop +/* DE5928 80240278 00000000 */ nop /* DE592C 8024027C 45000033 */ bc1f .L8024034C -/* DE5930 80240280 00000000 */ nop +/* DE5930 80240280 00000000 */ nop /* DE5934 80240284 8E020000 */ lw $v0, ($s0) /* DE5938 80240288 30422000 */ andi $v0, $v0, 0x2000 /* DE593C 8024028C 10400022 */ beqz $v0, .L80240318 -/* DE5940 80240290 00000000 */ nop +/* DE5940 80240290 00000000 */ nop /* DE5944 80240294 C602000C */ lwc1 $f2, 0xc($s0) /* DE5948 80240298 3C014334 */ lui $at, 0x4334 /* DE594C 8024029C 44810000 */ mtc1 $at, $f0 -/* DE5950 802402A0 00000000 */ nop +/* DE5950 802402A0 00000000 */ nop /* DE5954 802402A4 4600103C */ c.lt.s $f2, $f0 -/* DE5958 802402A8 00000000 */ nop +/* DE5958 802402A8 00000000 */ nop /* DE595C 802402AC 4500000D */ bc1f .L802402E4 -/* DE5960 802402B0 00000000 */ nop +/* DE5960 802402B0 00000000 */ nop /* DE5964 802402B4 C6020040 */ lwc1 $f2, 0x40($s0) /* DE5968 802402B8 44800000 */ mtc1 $zero, $f0 /* DE596C 802402BC 3C014307 */ lui $at, 0x4307 /* DE5970 802402C0 44812000 */ mtc1 $at, $f4 /* DE5974 802402C4 4602003C */ c.lt.s $f0, $f2 -/* DE5978 802402C8 00000000 */ nop +/* DE5978 802402C8 00000000 */ nop /* DE597C 802402CC 45020019 */ bc1fl .L80240334 /* DE5980 802402D0 E604000C */ swc1 $f4, 0xc($s0) /* DE5984 802402D4 3C014234 */ lui $at, 0x4234 @@ -105,7 +105,7 @@ glabel func_80240160_DE5810 /* DE599C 802402EC 3C014361 */ lui $at, 0x4361 /* DE59A0 802402F0 44812000 */ mtc1 $at, $f4 /* DE59A4 802402F4 4602003C */ c.lt.s $f0, $f2 -/* DE59A8 802402F8 00000000 */ nop +/* DE59A8 802402F8 00000000 */ nop /* DE59AC 802402FC 4502000D */ bc1fl .L80240334 /* DE59B0 80240300 E604000C */ swc1 $f4, 0xc($s0) /* DE59B4 80240304 3C01439D */ lui $at, 0x439d @@ -119,7 +119,7 @@ glabel func_80240160_DE5810 /* DE59D0 80240320 4406B000 */ mfc1 $a2, $f22 /* DE59D4 80240324 4407A000 */ mfc1 $a3, $f20 /* DE59D8 80240328 0C00A720 */ jal atan2 -/* DE59DC 8024032C 00000000 */ nop +/* DE59DC 8024032C 00000000 */ nop /* DE59E0 80240330 E600000C */ swc1 $f0, 0xc($s0) .L80240334: /* DE59E4 80240334 8E06000C */ lw $a2, 0xc($s0) @@ -127,7 +127,7 @@ glabel func_80240160_DE5810 /* DE59EC 8024033C 0C00EA95 */ jal npc_move_heading /* DE59F0 80240340 0200202D */ daddu $a0, $s0, $zero /* DE59F4 80240344 080900D9 */ j .L80240364 -/* DE59F8 80240348 00000000 */ nop +/* DE59F8 80240348 00000000 */ nop .L8024034C: /* DE59FC 8024034C C60C0038 */ lwc1 $f12, 0x38($s0) /* DE5A00 80240350 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -139,20 +139,20 @@ glabel func_80240160_DE5810 /* DE5A14 80240364 C64200B0 */ lwc1 $f2, 0xb0($s2) /* DE5A18 80240368 C6200028 */ lwc1 $f0, 0x28($s1) /* DE5A1C 8024036C 46001032 */ c.eq.s $f2, $f0 -/* DE5A20 80240370 00000000 */ nop +/* DE5A20 80240370 00000000 */ nop /* DE5A24 80240374 45020013 */ bc1fl .L802403C4 /* DE5A28 80240378 E64000B0 */ swc1 $f0, 0xb0($s2) /* DE5A2C 8024037C C64200B8 */ lwc1 $f2, 0xb8($s2) /* DE5A30 80240380 C6200030 */ lwc1 $f0, 0x30($s1) /* DE5A34 80240384 46001032 */ c.eq.s $f2, $f0 -/* DE5A38 80240388 00000000 */ nop +/* DE5A38 80240388 00000000 */ nop /* DE5A3C 8024038C 4500000B */ bc1f .L802403BC -/* DE5A40 80240390 00000000 */ nop +/* DE5A40 80240390 00000000 */ nop /* DE5A44 80240394 3C0141A0 */ lui $at, 0x41a0 /* DE5A48 80240398 44810000 */ mtc1 $at, $f0 -/* DE5A4C 8024039C 00000000 */ nop +/* DE5A4C 8024039C 00000000 */ nop /* DE5A50 802403A0 4600C03C */ c.lt.s $f24, $f0 -/* DE5A54 802403A4 00000000 */ nop +/* DE5A54 802403A4 00000000 */ nop /* DE5A58 802403A8 45020004 */ bc1fl .L802403BC /* DE5A5C 802403AC AE4000BC */ sw $zero, 0xbc($s2) /* DE5A60 802403B0 8E4200BC */ lw $v0, 0xbc($s2) diff --git a/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_802403FC_DE5AAC.s b/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_802403FC_DE5AAC.s index a325417f8a..2cc033ad39 100644 --- a/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_802403FC_DE5AAC.s +++ b/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_802403FC_DE5AAC.s @@ -29,30 +29,30 @@ glabel func_802403FC_DE5AAC /* DE5B0C 8024045C 4406B000 */ mfc1 $a2, $f22 /* DE5B10 80240460 4407A000 */ mfc1 $a3, $f20 /* DE5B14 80240464 0C00A7B5 */ jal dist2D -/* DE5B18 80240468 00000000 */ nop +/* DE5B18 80240468 00000000 */ nop /* DE5B1C 8024046C C6420018 */ lwc1 $f2, 0x18($s2) /* DE5B20 80240470 4600103C */ c.lt.s $f2, $f0 -/* DE5B24 80240474 00000000 */ nop +/* DE5B24 80240474 00000000 */ nop /* DE5B28 80240478 45000031 */ bc1f .L80240540 -/* DE5B2C 8024047C 00000000 */ nop +/* DE5B2C 8024047C 00000000 */ nop /* DE5B30 80240480 8E420000 */ lw $v0, ($s2) /* DE5B34 80240484 30422000 */ andi $v0, $v0, 0x2000 /* DE5B38 80240488 10400022 */ beqz $v0, .L80240514 -/* DE5B3C 8024048C 00000000 */ nop +/* DE5B3C 8024048C 00000000 */ nop /* DE5B40 80240490 C642000C */ lwc1 $f2, 0xc($s2) /* DE5B44 80240494 3C014334 */ lui $at, 0x4334 /* DE5B48 80240498 44810000 */ mtc1 $at, $f0 -/* DE5B4C 8024049C 00000000 */ nop +/* DE5B4C 8024049C 00000000 */ nop /* DE5B50 802404A0 4600103C */ c.lt.s $f2, $f0 -/* DE5B54 802404A4 00000000 */ nop +/* DE5B54 802404A4 00000000 */ nop /* DE5B58 802404A8 4500000D */ bc1f .L802404E0 -/* DE5B5C 802404AC 00000000 */ nop +/* DE5B5C 802404AC 00000000 */ nop /* DE5B60 802404B0 C6420040 */ lwc1 $f2, 0x40($s2) /* DE5B64 802404B4 44800000 */ mtc1 $zero, $f0 /* DE5B68 802404B8 3C014307 */ lui $at, 0x4307 /* DE5B6C 802404BC 44812000 */ mtc1 $at, $f4 /* DE5B70 802404C0 4602003C */ c.lt.s $f0, $f2 -/* DE5B74 802404C4 00000000 */ nop +/* DE5B74 802404C4 00000000 */ nop /* DE5B78 802404C8 45020019 */ bc1fl .L80240530 /* DE5B7C 802404CC E644000C */ swc1 $f4, 0xc($s2) /* DE5B80 802404D0 3C014234 */ lui $at, 0x4234 @@ -65,7 +65,7 @@ glabel func_802403FC_DE5AAC /* DE5B98 802404E8 3C014361 */ lui $at, 0x4361 /* DE5B9C 802404EC 44812000 */ mtc1 $at, $f4 /* DE5BA0 802404F0 4602003C */ c.lt.s $f0, $f2 -/* DE5BA4 802404F4 00000000 */ nop +/* DE5BA4 802404F4 00000000 */ nop /* DE5BA8 802404F8 4502000D */ bc1fl .L80240530 /* DE5BAC 802404FC E644000C */ swc1 $f4, 0xc($s2) /* DE5BB0 80240500 3C01439D */ lui $at, 0x439d @@ -79,7 +79,7 @@ glabel func_802403FC_DE5AAC /* DE5BCC 8024051C 4406B000 */ mfc1 $a2, $f22 /* DE5BD0 80240520 4407A000 */ mfc1 $a3, $f20 /* DE5BD4 80240524 0C00A720 */ jal atan2 -/* DE5BD8 80240528 00000000 */ nop +/* DE5BD8 80240528 00000000 */ nop /* DE5BDC 8024052C E640000C */ swc1 $f0, 0xc($s2) .L80240530: /* DE5BE0 80240530 8E450018 */ lw $a1, 0x18($s2) diff --git a/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240590_DE5C40.s b/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240590_DE5C40.s index 5fa46c4cad..17d8c56d41 100644 --- a/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240590_DE5C40.s +++ b/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240590_DE5C40.s @@ -12,6 +12,6 @@ glabel func_80240590_DE5C40 .L802405AC: /* DE5C5C 802405AC 03E00008 */ jr $ra /* DE5C60 802405B0 24020002 */ addiu $v0, $zero, 2 -/* DE5C64 802405B4 00000000 */ nop -/* DE5C68 802405B8 00000000 */ nop -/* DE5C6C 802405BC 00000000 */ nop +/* DE5C64 802405B4 00000000 */ nop +/* DE5C68 802405B8 00000000 */ nop +/* DE5C6C 802405BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_802401AC_DE891C.s b/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_802401AC_DE891C.s index 9e13c3122d..7709af18f1 100644 --- a/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_802401AC_DE891C.s +++ b/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_802401AC_DE891C.s @@ -13,11 +13,12 @@ glabel func_802401AC_DE891C /* DE893C 802401CC 2C620005 */ sltiu $v0, $v1, 5 /* DE8940 802401D0 1040008A */ beqz $v0, .L802403FC /* DE8944 802401D4 00031080 */ sll $v0, $v1, 2 -/* DE8948 802401D8 3C018024 */ lui $at, %hi(D_80243730) +/* DE8948 802401D8 3C018024 */ lui $at, %hi(jtbl_80243730_DEBEA0) /* DE894C 802401DC 00220821 */ addu $at, $at, $v0 -/* DE8950 802401E0 8C223730 */ lw $v0, %lo(D_80243730)($at) +/* DE8950 802401E0 8C223730 */ lw $v0, %lo(jtbl_80243730_DEBEA0)($at) /* DE8954 802401E4 00400008 */ jr $v0 -/* DE8958 802401E8 00000000 */ nop +/* DE8958 802401E8 00000000 */ nop +glabel L802401EC_DE895C /* DE895C 802401EC 8E22003C */ lw $v0, 0x3c($s1) /* DE8960 802401F0 86270046 */ lh $a3, 0x46($s1) /* DE8964 802401F4 AFA20010 */ sw $v0, 0x10($sp) @@ -66,6 +67,7 @@ glabel func_802401AC_DE891C /* DE8A10 802402A0 A6220044 */ sh $v0, 0x44($s1) /* DE8A14 802402A4 080900FF */ j .L802403FC /* DE8A18 802402A8 A6200046 */ sh $zero, 0x46($s1) +glabel L802402AC_DE8A1C /* DE8A1C 802402AC 96220046 */ lhu $v0, 0x46($s1) /* DE8A20 802402B0 24420001 */ addiu $v0, $v0, 1 /* DE8A24 802402B4 A6220046 */ sh $v0, 0x46($s1) @@ -84,6 +86,7 @@ glabel func_802401AC_DE891C /* DE8A58 802402E8 8C42000C */ lw $v0, 0xc($v0) /* DE8A5C 802402EC 080900FF */ j .L802403FC /* DE8A60 802402F0 AC400074 */ sw $zero, 0x74($v0) +glabel L802402F4_DE8A64 /* DE8A64 802402F4 96220046 */ lhu $v0, 0x46($s1) /* DE8A68 802402F8 24420001 */ addiu $v0, $v0, 1 /* DE8A6C 802402FC A6220046 */ sh $v0, 0x46($s1) @@ -91,7 +94,7 @@ glabel func_802401AC_DE891C /* DE8A74 80240304 00021403 */ sra $v0, $v0, 0x10 /* DE8A78 80240308 2842003C */ slti $v0, $v0, 0x3c /* DE8A7C 8024030C 1440003B */ bnez $v0, .L802403FC -/* DE8A80 80240310 00000000 */ nop +/* DE8A80 80240310 00000000 */ nop /* DE8A84 80240314 3C013F80 */ lui $at, 0x3f80 /* DE8A88 80240318 44810000 */ mtc1 $at, $f0 /* DE8A8C 8024031C AFA00014 */ sw $zero, 0x14($sp) @@ -124,6 +127,7 @@ glabel func_802401AC_DE891C /* DE8AF8 80240388 A6220048 */ sh $v0, 0x48($s1) /* DE8AFC 8024038C 080900FF */ j .L802403FC /* DE8B00 80240390 E6200030 */ swc1 $f0, 0x30($s1) +glabel L80240394_DE8B04 /* DE8B04 80240394 0000202D */ daddu $a0, $zero, $zero /* DE8B08 80240398 3C054210 */ lui $a1, 0x4210 /* DE8B0C 8024039C 3C064198 */ lui $a2, 0x4198 @@ -151,14 +155,15 @@ glabel func_802401AC_DE891C /* DE8B64 802403F4 A6200046 */ sh $zero, 0x46($s1) /* DE8B68 802403F8 E6200034 */ swc1 $f0, 0x34($s1) .L802403FC: +glabel L802403FC_DE8B6C /* DE8B6C 802403FC 8623004A */ lh $v1, 0x4a($s1) /* DE8B70 80240400 24020001 */ addiu $v0, $zero, 1 /* DE8B74 80240404 10620005 */ beq $v1, $v0, .L8024041C /* DE8B78 80240408 24020002 */ addiu $v0, $zero, 2 /* DE8B7C 8024040C 1062001E */ beq $v1, $v0, .L80240488 -/* DE8B80 80240410 00000000 */ nop +/* DE8B80 80240410 00000000 */ nop /* DE8B84 80240414 0809014C */ j .L80240530 -/* DE8B88 80240418 00000000 */ nop +/* DE8B88 80240418 00000000 */ nop .L8024041C: /* DE8B8C 8024041C 8627004C */ lh $a3, 0x4c($s1) /* DE8B90 80240420 24100078 */ addiu $s0, $zero, 0x78 @@ -190,12 +195,12 @@ glabel func_802401AC_DE891C .L80240488: /* DE8BF8 80240488 8622004C */ lh $v0, 0x4c($s1) /* DE8BFC 8024048C 44826000 */ mtc1 $v0, $f12 -/* DE8C00 80240490 00000000 */ nop +/* DE8C00 80240490 00000000 */ nop /* DE8C04 80240494 0C00A8BB */ jal sin_deg /* DE8C08 80240498 46806320 */ cvt.s.w $f12, $f12 /* DE8C0C 8024049C 3C013F80 */ lui $at, 0x3f80 /* DE8C10 802404A0 44811000 */ mtc1 $at, $f2 -/* DE8C14 802404A4 00000000 */ nop +/* DE8C14 802404A4 00000000 */ nop /* DE8C18 802404A8 46020000 */ add.s $f0, $f0, $f2 /* DE8C1C 802404AC 46000000 */ add.s $f0, $f0, $f0 /* DE8C20 802404B0 C6220024 */ lwc1 $f2, 0x24($s1) @@ -203,7 +208,7 @@ glabel func_802401AC_DE891C /* DE8C28 802404B8 46001080 */ add.s $f2, $f2, $f0 /* DE8C2C 802404BC 24420008 */ addiu $v0, $v0, 8 /* DE8C30 802404C0 44826000 */ mtc1 $v0, $f12 -/* DE8C34 802404C4 00000000 */ nop +/* DE8C34 802404C4 00000000 */ nop /* DE8C38 802404C8 46806320 */ cvt.s.w $f12, $f12 /* DE8C3C 802404CC 0C00A6C9 */ jal clamp_angle /* DE8C40 802404D0 E6220004 */ swc1 $f2, 4($s1) @@ -224,9 +229,9 @@ glabel func_802401AC_DE891C /* DE8C7C 8024050C 460E1380 */ add.s $f14, $f2, $f14 /* DE8C80 80240510 3C0141F0 */ lui $at, 0x41f0 /* DE8C84 80240514 44811000 */ mtc1 $at, $f2 -/* DE8C88 80240518 00000000 */ nop +/* DE8C88 80240518 00000000 */ nop /* DE8C8C 8024051C 4600103C */ c.lt.s $f2, $f0 -/* DE8C90 80240520 00000000 */ nop +/* DE8C90 80240520 00000000 */ nop /* DE8C94 80240524 45010002 */ bc1t .L80240530 /* DE8C98 80240528 24020003 */ addiu $v0, $zero, 3 .L8024052C: @@ -237,9 +242,9 @@ glabel func_802401AC_DE891C /* DE8CA8 80240538 10620005 */ beq $v1, $v0, .L80240550 /* DE8CAC 8024053C 24020002 */ addiu $v0, $zero, 2 /* DE8CB0 80240540 10620008 */ beq $v1, $v0, .L80240564 -/* DE8CB4 80240544 00000000 */ nop +/* DE8CB4 80240544 00000000 */ nop /* DE8CB8 80240548 08090169 */ j .L802405A4 -/* DE8CBC 8024054C 00000000 */ nop +/* DE8CBC 8024054C 00000000 */ nop .L80240550: /* DE8CC0 80240550 C620002C */ lwc1 $f0, 0x2c($s1) /* DE8CC4 80240554 C62C0030 */ lwc1 $f12, 0x30($s1) diff --git a/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_80240708_DE8E78.s b/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_80240708_DE8E78.s index cb02d5837a..fa79a8a45b 100644 --- a/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_80240708_DE8E78.s +++ b/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_80240708_DE8E78.s @@ -8,12 +8,12 @@ glabel func_80240708_DE8E78 /* DE8E84 80240714 8C900084 */ lw $s0, 0x84($a0) /* DE8E88 80240718 8602004C */ lh $v0, 0x4c($s0) /* DE8E8C 8024071C 44826000 */ mtc1 $v0, $f12 -/* DE8E90 80240720 00000000 */ nop +/* DE8E90 80240720 00000000 */ nop /* DE8E94 80240724 0C00A8BB */ jal sin_deg /* DE8E98 80240728 46806320 */ cvt.s.w $f12, $f12 /* DE8E9C 8024072C 3C013F80 */ lui $at, 0x3f80 /* DE8EA0 80240730 44811000 */ mtc1 $at, $f2 -/* DE8EA4 80240734 00000000 */ nop +/* DE8EA4 80240734 00000000 */ nop /* DE8EA8 80240738 46020000 */ add.s $f0, $f0, $f2 /* DE8EAC 8024073C 46000000 */ add.s $f0, $f0, $f0 /* DE8EB0 80240740 C6020024 */ lwc1 $f2, 0x24($s0) @@ -21,13 +21,13 @@ glabel func_80240708_DE8E78 /* DE8EB8 80240748 46001080 */ add.s $f2, $f2, $f0 /* DE8EBC 8024074C 24420008 */ addiu $v0, $v0, 8 /* DE8EC0 80240750 44826000 */ mtc1 $v0, $f12 -/* DE8EC4 80240754 00000000 */ nop +/* DE8EC4 80240754 00000000 */ nop /* DE8EC8 80240758 46806320 */ cvt.s.w $f12, $f12 /* DE8ECC 8024075C 0C00A6C9 */ jal clamp_angle /* DE8ED0 80240760 E6020004 */ swc1 $f2, 4($s0) /* DE8ED4 80240764 4600010D */ trunc.w.s $f4, $f0 /* DE8ED8 80240768 44022000 */ mfc1 $v0, $f4 -/* DE8EDC 8024076C 00000000 */ nop +/* DE8EDC 8024076C 00000000 */ nop /* DE8EE0 80240770 A602004C */ sh $v0, 0x4c($s0) /* DE8EE4 80240774 3C028011 */ lui $v0, %hi(gPlayerStatus) /* DE8EE8 80240778 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) @@ -38,9 +38,9 @@ glabel func_80240708_DE8E78 /* DE8EFC 8024078C 8E070020 */ lw $a3, 0x20($s0) /* DE8F00 80240790 3C0141F0 */ lui $at, 0x41f0 /* DE8F04 80240794 44811000 */ mtc1 $at, $f2 -/* DE8F08 80240798 00000000 */ nop +/* DE8F08 80240798 00000000 */ nop /* DE8F0C 8024079C 4602003E */ c.le.s $f0, $f2 -/* DE8F10 802407A0 00000000 */ nop +/* DE8F10 802407A0 00000000 */ nop /* DE8F14 802407A4 45000002 */ bc1f .L802407B0 /* DE8F18 802407A8 24020003 */ addiu $v0, $zero, 3 /* DE8F1C 802407AC A602004E */ sh $v0, 0x4e($s0) @@ -62,6 +62,6 @@ glabel func_80240708_DE8E78 /* DE8F58 802407E8 0000102D */ daddu $v0, $zero, $zero /* DE8F5C 802407EC 03E00008 */ jr $ra /* DE8F60 802407F0 27BD0018 */ addiu $sp, $sp, 0x18 -/* DE8F64 802407F4 00000000 */ nop -/* DE8F68 802407F8 00000000 */ nop -/* DE8F6C 802407FC 00000000 */ nop +/* DE8F64 802407F4 00000000 */ nop +/* DE8F68 802407F8 00000000 */ nop +/* DE8F6C 802407FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_802400E4_DEBFB4.s b/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_802400E4_DEBFB4.s index a82bea874c..07d300e951 100644 --- a/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_802400E4_DEBFB4.s +++ b/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_802400E4_DEBFB4.s @@ -18,7 +18,7 @@ glabel func_802400E4_DEBFB4 /* DEBFE8 80240118 0C0B210B */ jal get_float_variable /* DEBFEC 8024011C 46000506 */ mov.s $f20, $f0 /* DEBFF0 80240120 4614003C */ c.lt.s $f0, $f20 -/* DEBFF4 80240124 00000000 */ nop +/* DEBFF4 80240124 00000000 */ nop /* DEBFF8 80240128 45000004 */ bc1f .L8024013C /* DEBFFC 8024012C 0220202D */ daddu $a0, $s1, $zero /* DEC000 80240130 8E050000 */ lw $a1, ($s0) @@ -29,7 +29,7 @@ glabel func_802400E4_DEBFB4 /* DEC010 80240140 0000302D */ daddu $a2, $zero, $zero .L80240144: /* DEC014 80240144 0C0B2026 */ jal set_variable -/* DEC018 80240148 00000000 */ nop +/* DEC018 80240148 00000000 */ nop /* DEC01C 8024014C 8FBF0018 */ lw $ra, 0x18($sp) /* DEC020 80240150 8FB10014 */ lw $s1, 0x14($sp) /* DEC024 80240154 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_8024055C_DEC42C.s b/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_8024055C_DEC42C.s index cec356480a..7b0e5d0fc6 100644 --- a/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_8024055C_DEC42C.s +++ b/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_8024055C_DEC42C.s @@ -14,7 +14,7 @@ glabel func_8024055C_DEC42C /* DEC450 80240580 44811000 */ mtc1 $at, $f2 /* DEC454 80240584 46002005 */ abs.s $f0, $f4 /* DEC458 80240588 4602003C */ c.lt.s $f0, $f2 -/* DEC45C 8024058C 00000000 */ nop +/* DEC45C 8024058C 00000000 */ nop /* DEC460 80240590 4500000D */ bc1f .L802405C8 /* DEC464 80240594 AE000084 */ sw $zero, 0x84($s0) /* DEC468 80240598 3C028007 */ lui $v0, %hi(gGameStatusPtr) @@ -28,10 +28,10 @@ glabel func_8024055C_DEC42C /* DEC488 802405B8 44811000 */ mtc1 $at, $f2 /* DEC48C 802405BC 46002005 */ abs.s $f0, $f4 /* DEC490 802405C0 4602003C */ c.lt.s $f0, $f2 -/* DEC494 802405C4 00000000 */ nop +/* DEC494 802405C4 00000000 */ nop .L802405C8: /* DEC498 802405C8 45000008 */ bc1f .L802405EC -/* DEC49C 802405CC 00000000 */ nop +/* DEC49C 802405CC 00000000 */ nop /* DEC4A0 802405D0 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* DEC4A4 802405D4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* DEC4A8 802405D8 8C420010 */ lw $v0, 0x10($v0) diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_802400E4_DEEF84.s b/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_802400E4_DEEF84.s index e3285a0b24..695cb3703e 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_802400E4_DEEF84.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_802400E4_DEEF84.s @@ -18,7 +18,7 @@ glabel func_802400E4_DEEF84 /* DEEFB8 80240118 0C0B210B */ jal get_float_variable /* DEEFBC 8024011C 46000506 */ mov.s $f20, $f0 /* DEEFC0 80240120 4614003C */ c.lt.s $f0, $f20 -/* DEEFC4 80240124 00000000 */ nop +/* DEEFC4 80240124 00000000 */ nop /* DEEFC8 80240128 45000004 */ bc1f .L8024013C /* DEEFCC 8024012C 0220202D */ daddu $a0, $s1, $zero /* DEEFD0 80240130 8E050000 */ lw $a1, ($s0) @@ -29,7 +29,7 @@ glabel func_802400E4_DEEF84 /* DEEFE0 80240140 0000302D */ daddu $a2, $zero, $zero .L80240144: /* DEEFE4 80240144 0C0B2026 */ jal set_variable -/* DEEFE8 80240148 00000000 */ nop +/* DEEFE8 80240148 00000000 */ nop /* DEEFEC 8024014C 8FBF0018 */ lw $ra, 0x18($sp) /* DEEFF0 80240150 8FB10014 */ lw $s1, 0x14($sp) /* DEEFF4 80240154 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240518_DEF3B8.s b/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240518_DEF3B8.s index d2f2b60bc7..9b76d3a1b0 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240518_DEF3B8.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240518_DEF3B8.s @@ -21,4 +21,4 @@ glabel func_80240518_DEF3B8 .L80240554: /* DEF3F4 80240554 03E00008 */ jr $ra /* DEF3F8 80240558 24020002 */ addiu $v0, $zero, 2 -/* DEF3FC 8024055C 00000000 */ nop +/* DEF3FC 8024055C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240560_DEF400.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240560_DEF400.s index fb0078bf48..853079b0e7 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240560_DEF400.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240560_DEF400.s @@ -15,7 +15,7 @@ glabel func_80240560_DEF400 /* DEF428 80240588 D4227610 */ ldc1 $f2, %lo(D_80247610)($at) /* DEF42C 8024058C 46000021 */ cvt.d.s $f0, $f0 /* DEF430 80240590 46220002 */ mul.d $f0, $f0, $f2 -/* DEF434 80240594 00000000 */ nop +/* DEF434 80240594 00000000 */ nop /* DEF438 80240598 46200020 */ cvt.s.d $f0, $f0 /* DEF43C 8024059C E4400018 */ swc1 $f0, 0x18($v0) /* DEF440 802405A0 8E0300CC */ lw $v1, 0xcc($s0) diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802405D0_DEF470.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802405D0_DEF470.s index a1fb7dfe8e..e04f14f8c7 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802405D0_DEF470.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802405D0_DEF470.s @@ -22,7 +22,7 @@ glabel func_802405D0_DEF470 /* DEF4B4 80240614 0C0129E1 */ jal func_8004A784 /* DEF4B8 80240618 0000382D */ daddu $a3, $zero, $zero /* DEF4BC 8024061C 14400005 */ bnez $v0, .L80240634 -/* DEF4C0 80240620 00000000 */ nop +/* DEF4C0 80240620 00000000 */ nop /* DEF4C4 80240624 8E050018 */ lw $a1, 0x18($s0) /* DEF4C8 80240628 8E06000C */ lw $a2, 0xc($s0) /* DEF4CC 8024062C 0C00EA95 */ jal npc_move_heading @@ -33,13 +33,13 @@ glabel func_802405D0_DEF470 /* DEF4DC 8024063C A602008E */ sh $v0, 0x8e($s0) /* DEF4E0 80240640 00021400 */ sll $v0, $v0, 0x10 /* DEF4E4 80240644 14400010 */ bnez $v0, .L80240688 -/* DEF4E8 80240648 00000000 */ nop +/* DEF4E8 80240648 00000000 */ nop /* DEF4EC 8024064C C6000018 */ lwc1 $f0, 0x18($s0) /* DEF4F0 80240650 3C018024 */ lui $at, %hi(D_80247618) /* DEF4F4 80240654 D4227618 */ ldc1 $f2, %lo(D_80247618)($at) /* DEF4F8 80240658 46000021 */ cvt.d.s $f0, $f0 /* DEF4FC 8024065C 46220002 */ mul.d $f0, $f0, $f2 -/* DEF500 80240660 00000000 */ nop +/* DEF500 80240660 00000000 */ nop /* DEF504 80240664 46200020 */ cvt.s.d $f0, $f0 /* DEF508 80240668 E6000018 */ swc1 $f0, 0x18($s0) /* DEF50C 8024066C 8E2200CC */ lw $v0, 0xcc($s1) diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802406A0_DEF540.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802406A0_DEF540.s index f58e98c8cc..6487a645ca 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802406A0_DEF540.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802406A0_DEF540.s @@ -21,7 +21,7 @@ glabel func_802406A0_DEF540 /* DEF580 802406E0 0C0129E1 */ jal func_8004A784 /* DEF584 802406E4 0000382D */ daddu $a3, $zero, $zero /* DEF588 802406E8 14400005 */ bnez $v0, .L80240700 -/* DEF58C 802406EC 00000000 */ nop +/* DEF58C 802406EC 00000000 */ nop /* DEF590 802406F0 8E050018 */ lw $a1, 0x18($s0) /* DEF594 802406F4 8E06000C */ lw $a2, 0xc($s0) /* DEF598 802406F8 0C00EA95 */ jal npc_move_heading diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240738_DEF5D8.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240738_DEF5D8.s index 4ced21c61f..b5fa9c8579 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240738_DEF5D8.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240738_DEF5D8.s @@ -16,7 +16,7 @@ glabel func_80240738_DEF5D8 /* DEF604 80240764 A462008E */ sh $v0, 0x8e($v1) /* DEF608 80240768 00021400 */ sll $v0, $v0, 0x10 /* DEF60C 8024076C 14400005 */ bnez $v0, .L80240784 -/* DEF610 80240770 00000000 */ nop +/* DEF610 80240770 00000000 */ nop /* DEF614 80240774 8E0200CC */ lw $v0, 0xcc($s0) /* DEF618 80240778 8C420000 */ lw $v0, ($v0) /* DEF61C 8024077C AC620028 */ sw $v0, 0x28($v1) diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s index 3100e65740..8cd21443b9 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s @@ -124,45 +124,53 @@ glabel func_80240798_DEF638 /* DEF7FC 8024095C 2C620064 */ sltiu $v0, $v1, 0x64 /* DEF800 80240960 10400050 */ beqz $v0, .L80240AA4 /* DEF804 80240964 00031080 */ sll $v0, $v1, 2 -/* DEF808 80240968 3C018024 */ lui $at, %hi(D_80247620) +/* DEF808 80240968 3C018024 */ lui $at, %hi(jtbl_80247620_DF64C0) /* DEF80C 8024096C 00220821 */ addu $at, $at, $v0 -/* DEF810 80240970 8C227620 */ lw $v0, %lo(D_80247620)($at) +/* DEF810 80240970 8C227620 */ lw $v0, %lo(jtbl_80247620_DF64C0)($at) /* DEF814 80240974 00400008 */ jr $v0 /* DEF818 80240978 00000000 */ nop +glabel L8024097C_DEF81C /* DEF81C 8024097C 0260202D */ daddu $a0, $s3, $zero /* DEF820 80240980 0280282D */ daddu $a1, $s4, $zero /* DEF824 80240984 0C012568 */ jal func_800495A0 /* DEF828 80240988 02A0302D */ daddu $a2, $s5, $zero +glabel L8024098C_DEF82C /* DEF82C 8024098C 0260202D */ daddu $a0, $s3, $zero /* DEF830 80240990 0280282D */ daddu $a1, $s4, $zero /* DEF834 80240994 0C0125AE */ jal func_800496B8 /* DEF838 80240998 02A0302D */ daddu $a2, $s5, $zero /* DEF83C 8024099C 080902A9 */ j .L80240AA4 /* DEF840 802409A0 00000000 */ nop +glabel L802409A4_DEF844 /* DEF844 802409A4 0260202D */ daddu $a0, $s3, $zero /* DEF848 802409A8 0280282D */ daddu $a1, $s4, $zero /* DEF84C 802409AC 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DEF850 802409B0 02A0302D */ daddu $a2, $s5, $zero +glabel L802409B4_DEF854 /* DEF854 802409B4 0260202D */ daddu $a0, $s3, $zero /* DEF858 802409B8 0280282D */ daddu $a1, $s4, $zero /* DEF85C 802409BC 0C012701 */ jal func_80049C04 /* DEF860 802409C0 02A0302D */ daddu $a2, $s5, $zero /* DEF864 802409C4 080902A9 */ j .L80240AA4 /* DEF868 802409C8 00000000 */ nop +glabel L802409CC_DEF86C /* DEF86C 802409CC 0260202D */ daddu $a0, $s3, $zero /* DEF870 802409D0 0280282D */ daddu $a1, $s4, $zero /* DEF874 802409D4 0C01278F */ jal func_80049E3C /* DEF878 802409D8 02A0302D */ daddu $a2, $s5, $zero +glabel L802409DC_DEF87C /* DEF87C 802409DC 0260202D */ daddu $a0, $s3, $zero /* DEF880 802409E0 0280282D */ daddu $a1, $s4, $zero /* DEF884 802409E4 0C0127B3 */ jal func_80049ECC /* DEF888 802409E8 02A0302D */ daddu $a2, $s5, $zero /* DEF88C 802409EC 080902A9 */ j .L80240AA4 /* DEF890 802409F0 00000000 */ nop +glabel L802409F4_DEF894 /* DEF894 802409F4 0260202D */ daddu $a0, $s3, $zero /* DEF898 802409F8 0280282D */ daddu $a1, $s4, $zero /* DEF89C 802409FC 0C0127DF */ jal func_80049F7C /* DEF8A0 80240A00 02A0302D */ daddu $a2, $s5, $zero +glabel L80240A04_DEF8A4 /* DEF8A4 80240A04 0260202D */ daddu $a0, $s3, $zero /* DEF8A8 80240A08 0280282D */ daddu $a1, $s4, $zero /* DEF8AC 80240A0C 0C012849 */ jal func_8004A124 @@ -171,6 +179,7 @@ glabel func_80240798_DEF638 /* DEF8B8 80240A18 2402000E */ addiu $v0, $zero, 0xe /* DEF8BC 80240A1C 14620021 */ bne $v1, $v0, .L80240AA4 /* DEF8C0 80240A20 00000000 */ nop +glabel L80240A24_DEF8C4 /* DEF8C4 80240A24 0260202D */ daddu $a0, $s3, $zero /* DEF8C8 80240A28 0280282D */ daddu $a1, $s4, $zero /* DEF8CC 80240A2C 0C090158 */ jal func_80240560_DEF400 @@ -179,6 +188,7 @@ glabel func_80240798_DEF638 /* DEF8D8 80240A38 2402000F */ addiu $v0, $zero, 0xf /* DEF8DC 80240A3C 14620019 */ bne $v1, $v0, .L80240AA4 /* DEF8E0 80240A40 00000000 */ nop +glabel L80240A44_DEF8E4 /* DEF8E4 80240A44 0260202D */ daddu $a0, $s3, $zero /* DEF8E8 80240A48 0280282D */ daddu $a1, $s4, $zero /* DEF8EC 80240A4C 0C090174 */ jal func_802405D0_DEF470 @@ -187,6 +197,7 @@ glabel func_80240798_DEF638 /* DEF8F8 80240A58 24020010 */ addiu $v0, $zero, 0x10 /* DEF8FC 80240A5C 14620011 */ bne $v1, $v0, .L80240AA4 /* DEF900 80240A60 00000000 */ nop +glabel L80240A64_DEF904 /* DEF904 80240A64 0260202D */ daddu $a0, $s3, $zero /* DEF908 80240A68 0280282D */ daddu $a1, $s4, $zero /* DEF90C 80240A6C 0C0901A8 */ jal func_802406A0_DEF540 @@ -195,15 +206,18 @@ glabel func_80240798_DEF638 /* DEF918 80240A78 24020011 */ addiu $v0, $zero, 0x11 /* DEF91C 80240A7C 14620009 */ bne $v1, $v0, .L80240AA4 /* DEF920 80240A80 00000000 */ nop +glabel L80240A84_DEF924 /* DEF924 80240A84 0260202D */ daddu $a0, $s3, $zero /* DEF928 80240A88 0280282D */ daddu $a1, $s4, $zero /* DEF92C 80240A8C 0C0901CE */ jal func_80240738_DEF5D8 /* DEF930 80240A90 02A0302D */ daddu $a2, $s5, $zero /* DEF934 80240A94 080902A9 */ j .L80240AA4 /* DEF938 80240A98 00000000 */ nop +glabel L80240A9C_DEF93C /* DEF93C 80240A9C 0C0129CF */ jal func_8004A73C /* DEF940 80240AA0 0260202D */ daddu $a0, $s3, $zero .L80240AA4: +glabel L80240AA4_DEF944 /* DEF944 80240AA4 8FBF0060 */ lw $ra, 0x60($sp) /* DEF948 80240AA8 8FB5005C */ lw $s5, 0x5c($sp) /* DEF94C 80240AAC 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240B1C_DEF9BC.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240B1C_DEF9BC.s index 3d9e8ca54e..e7cc5427f6 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240B1C_DEF9BC.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240B1C_DEF9BC.s @@ -26,9 +26,9 @@ glabel func_80240B1C_DEF9BC /* DEFA0C 80240B6C 10620030 */ beq $v1, $v0, .L80240C30 /* DEFA10 80240B70 24020003 */ addiu $v0, $zero, 3 /* DEFA14 80240B74 10620034 */ beq $v1, $v0, .L80240C48 -/* DEFA18 80240B78 00000000 */ nop +/* DEFA18 80240B78 00000000 */ nop /* DEFA1C 80240B7C 0809032A */ j .L80240CA8 -/* DEFA20 80240B80 00000000 */ nop +/* DEFA20 80240B80 00000000 */ nop .L80240B84: /* DEFA24 80240B84 3442000C */ ori $v0, $v0, 0xc /* DEFA28 80240B88 3C054387 */ lui $a1, 0x4387 @@ -99,9 +99,9 @@ glabel func_80240B1C_DEF9BC /* DEFB08 80240C68 E6200048 */ swc1 $f0, 0x48($s1) /* DEFB0C 80240C6C 46000021 */ cvt.d.s $f0, $f0 /* DEFB10 80240C70 4620103C */ c.lt.d $f2, $f0 -/* DEFB14 80240C74 00000000 */ nop +/* DEFB14 80240C74 00000000 */ nop /* DEFB18 80240C78 45000004 */ bc1f .L80240C8C -/* DEFB1C 80240C7C 00000000 */ nop +/* DEFB1C 80240C7C 00000000 */ nop /* DEFB20 80240C80 46220001 */ sub.d $f0, $f0, $f2 /* DEFB24 80240C84 46200020 */ cvt.s.d $f0, $f0 /* DEFB28 80240C88 E6200048 */ swc1 $f0, 0x48($s1) diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s index 7d896b3580..91e81b70a8 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s @@ -46,7 +46,7 @@ glabel func_80240CE0_DEFB80 /* DEFC24 80240D84 8E2200B0 */ lw $v0, 0xb0($s1) /* DEFC28 80240D88 30420004 */ andi $v0, $v0, 4 /* DEFC2C 80240D8C 10400044 */ beqz $v0, .L80240EA0 -/* DEFC30 80240D90 00000000 */ nop +/* DEFC30 80240D90 00000000 */ nop .L80240D94: /* DEFC34 80240D94 2404F7FF */ addiu $a0, $zero, -0x801 /* DEFC38 80240D98 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_80240CE0_DEFB80 /* DEFCF8 80240E58 C640003C */ lwc1 $f0, 0x3c($s2) /* DEFCFC 80240E5C C6420040 */ lwc1 $f2, 0x40($s2) /* DEFD00 80240E60 44822000 */ mtc1 $v0, $f4 -/* DEFD04 80240E64 00000000 */ nop +/* DEFD04 80240E64 00000000 */ nop /* DEFD08 80240E68 46802120 */ cvt.s.w $f4, $f4 /* DEFD0C 80240E6C 27A20044 */ addiu $v0, $sp, 0x44 /* DEFD10 80240E70 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_80240CE0_DEFB80 /* DEFD28 80240E88 0C0372DF */ jal func_800DCB7C /* DEFD2C 80240E8C 27A6003C */ addiu $a2, $sp, 0x3c /* DEFD30 80240E90 10400003 */ beqz $v0, .L80240EA0 -/* DEFD34 80240E94 00000000 */ nop +/* DEFD34 80240E94 00000000 */ nop /* DEFD38 80240E98 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DEFD3C 80240E9C E640003C */ swc1 $f0, 0x3c($s2) .L80240EA0: @@ -124,45 +124,53 @@ glabel func_80240CE0_DEFB80 /* DEFD44 80240EA4 2C620064 */ sltiu $v0, $v1, 0x64 /* DEFD48 80240EA8 10400038 */ beqz $v0, .L80240F8C /* DEFD4C 80240EAC 00031080 */ sll $v0, $v1, 2 -/* DEFD50 80240EB0 3C018024 */ lui $at, %hi(D_802477C0) +/* DEFD50 80240EB0 3C018024 */ lui $at, %hi(jtbl_802477C0_DF6660) /* DEFD54 80240EB4 00220821 */ addu $at, $at, $v0 -/* DEFD58 80240EB8 8C2277C0 */ lw $v0, %lo(D_802477C0)($at) +/* DEFD58 80240EB8 8C2277C0 */ lw $v0, %lo(jtbl_802477C0_DF6660)($at) /* DEFD5C 80240EBC 00400008 */ jr $v0 -/* DEFD60 80240EC0 00000000 */ nop +/* DEFD60 80240EC0 00000000 */ nop +glabel L80240EC4_DEFD64 /* DEFD64 80240EC4 0260202D */ daddu $a0, $s3, $zero /* DEFD68 80240EC8 0280282D */ daddu $a1, $s4, $zero /* DEFD6C 80240ECC 0C012568 */ jal func_800495A0 /* DEFD70 80240ED0 02A0302D */ daddu $a2, $s5, $zero +glabel L80240ED4_DEFD74 /* DEFD74 80240ED4 0260202D */ daddu $a0, $s3, $zero /* DEFD78 80240ED8 0280282D */ daddu $a1, $s4, $zero /* DEFD7C 80240EDC 0C0125AE */ jal func_800496B8 /* DEFD80 80240EE0 02A0302D */ daddu $a2, $s5, $zero /* DEFD84 80240EE4 080903E3 */ j .L80240F8C -/* DEFD88 80240EE8 00000000 */ nop +/* DEFD88 80240EE8 00000000 */ nop +glabel L80240EEC_DEFD8C /* DEFD8C 80240EEC 0260202D */ daddu $a0, $s3, $zero /* DEFD90 80240EF0 0280282D */ daddu $a1, $s4, $zero /* DEFD94 80240EF4 0C0902B3 */ jal omo_17_UnkNpcAIFunc4 /* DEFD98 80240EF8 02A0302D */ daddu $a2, $s5, $zero +glabel L80240EFC_DEFD9C /* DEFD9C 80240EFC 0260202D */ daddu $a0, $s3, $zero /* DEFDA0 80240F00 0280282D */ daddu $a1, $s4, $zero /* DEFDA4 80240F04 0C0902C7 */ jal func_80240B1C_DEF9BC /* DEFDA8 80240F08 02A0302D */ daddu $a2, $s5, $zero /* DEFDAC 80240F0C 080903E3 */ j .L80240F8C -/* DEFDB0 80240F10 00000000 */ nop +/* DEFDB0 80240F10 00000000 */ nop +glabel L80240F14_DEFDB4 /* DEFDB4 80240F14 0260202D */ daddu $a0, $s3, $zero /* DEFDB8 80240F18 0280282D */ daddu $a1, $s4, $zero /* DEFDBC 80240F1C 0C01278F */ jal func_80049E3C /* DEFDC0 80240F20 02A0302D */ daddu $a2, $s5, $zero +glabel L80240F24_DEFDC4 /* DEFDC4 80240F24 0260202D */ daddu $a0, $s3, $zero /* DEFDC8 80240F28 0280282D */ daddu $a1, $s4, $zero /* DEFDCC 80240F2C 0C0127B3 */ jal func_80049ECC /* DEFDD0 80240F30 02A0302D */ daddu $a2, $s5, $zero /* DEFDD4 80240F34 080903E3 */ j .L80240F8C -/* DEFDD8 80240F38 00000000 */ nop +/* DEFDD8 80240F38 00000000 */ nop +glabel L80240F3C_DEFDDC /* DEFDDC 80240F3C 0260202D */ daddu $a0, $s3, $zero /* DEFDE0 80240F40 0280282D */ daddu $a1, $s4, $zero /* DEFDE4 80240F44 0C0127DF */ jal func_80049F7C /* DEFDE8 80240F48 02A0302D */ daddu $a2, $s5, $zero +glabel L80240F4C_DEFDEC /* DEFDEC 80240F4C 0260202D */ daddu $a0, $s3, $zero /* DEFDF0 80240F50 0280282D */ daddu $a1, $s4, $zero /* DEFDF4 80240F54 0C012849 */ jal func_8004A124 @@ -170,16 +178,19 @@ glabel func_80240CE0_DEFB80 /* DEFDFC 80240F5C 8E630070 */ lw $v1, 0x70($s3) /* DEFE00 80240F60 2402000E */ addiu $v0, $zero, 0xe /* DEFE04 80240F64 14620009 */ bne $v1, $v0, .L80240F8C -/* DEFE08 80240F68 00000000 */ nop +/* DEFE08 80240F68 00000000 */ nop +glabel L80240F6C_DEFE0C /* DEFE0C 80240F6C 0260202D */ daddu $a0, $s3, $zero /* DEFE10 80240F70 0280282D */ daddu $a1, $s4, $zero /* DEFE14 80240F74 0C0128FA */ jal func_8004A3E8 /* DEFE18 80240F78 02A0302D */ daddu $a2, $s5, $zero /* DEFE1C 80240F7C 080903E3 */ j .L80240F8C -/* DEFE20 80240F80 00000000 */ nop +/* DEFE20 80240F80 00000000 */ nop +glabel L80240F84_DEFE24 /* DEFE24 80240F84 0C0129CF */ jal func_8004A73C /* DEFE28 80240F88 0260202D */ daddu $a0, $s3, $zero .L80240F8C: +glabel L80240F8C_DEFE2C /* DEFE2C 80240F8C 8FBF0060 */ lw $ra, 0x60($sp) /* DEFE30 80240F90 8FB5005C */ lw $s5, 0x5c($sp) /* DEFE34 80240F94 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240FB4_DEFE54.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240FB4_DEFE54.s index 471fdd7763..049decbf4e 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240FB4_DEFE54.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240FB4_DEFE54.s @@ -47,7 +47,7 @@ glabel func_80240FB4_DEFE54 /* DEFEFC 8024105C 0C0123F5 */ jal is_point_within_region /* DEFF00 80241060 8E070038 */ lw $a3, 0x38($s0) /* DEFF04 80241064 1040000E */ beqz $v0, .L802410A0 -/* DEFF08 80241068 00000000 */ nop +/* DEFF08 80241068 00000000 */ nop /* DEFF0C 8024106C 8E2200D0 */ lw $v0, 0xd0($s1) /* DEFF10 80241070 C60C0038 */ lwc1 $f12, 0x38($s0) /* DEFF14 80241074 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240FB4_DEFE54 /* DEFF28 80241088 468031A0 */ cvt.s.w $f6, $f6 /* DEFF2C 8024108C 44073000 */ mfc1 $a3, $f6 /* DEFF30 80241090 0C00A720 */ jal atan2 -/* DEFF34 80241094 00000000 */ nop +/* DEFF34 80241094 00000000 */ nop /* DEFF38 80241098 08090434 */ j .L802410D0 /* DEFF3C 8024109C E600000C */ swc1 $f0, 0xc($s0) .L802410A0: @@ -66,7 +66,7 @@ glabel func_80240FB4_DEFE54 /* DEFF44 802410A4 2404003C */ addiu $a0, $zero, 0x3c /* DEFF48 802410A8 C60C000C */ lwc1 $f12, 0xc($s0) /* DEFF4C 802410AC 44820000 */ mtc1 $v0, $f0 -/* DEFF50 802410B0 00000000 */ nop +/* DEFF50 802410B0 00000000 */ nop /* DEFF54 802410B4 46800020 */ cvt.s.w $f0, $f0 /* DEFF58 802410B8 46006300 */ add.s $f12, $f12, $f0 /* DEFF5C 802410BC 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240FB4_DEFE54 /* DEFF80 802410E0 8E2200D0 */ lw $v0, 0xd0($s1) /* DEFF84 802410E4 8C420014 */ lw $v0, 0x14($v0) /* DEFF88 802410E8 04410004 */ bgez $v0, .L802410FC -/* DEFF8C 802410EC 00000000 */ nop +/* DEFF8C 802410EC 00000000 */ nop /* DEFF90 802410F0 C6400000 */ lwc1 $f0, ($s2) /* DEFF94 802410F4 08090447 */ j .L8024111C /* DEFF98 802410F8 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240FB4_DEFE54 /* DEFF9C 802410FC 3C018024 */ lui $at, %hi(D_80247950) /* DEFFA0 80241100 D4227950 */ ldc1 $f2, %lo(D_80247950)($at) /* DEFFA4 80241104 44820000 */ mtc1 $v0, $f0 -/* DEFFA8 80241108 00000000 */ nop +/* DEFFA8 80241108 00000000 */ nop /* DEFFAC 8024110C 46800021 */ cvt.d.w $f0, $f0 /* DEFFB0 80241110 46220003 */ div.d $f0, $f0, $f2 /* DEFFB4 80241114 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240FB4_DEFE54 /* DEFFC8 80241128 44801000 */ mtc1 $zero, $f2 /* DEFFCC 8024112C 46000021 */ cvt.d.s $f0, $f0 /* DEFFD0 80241130 46220002 */ mul.d $f0, $f0, $f2 -/* DEFFD4 80241134 00000000 */ nop +/* DEFFD4 80241134 00000000 */ nop /* DEFFD8 80241138 24020001 */ addiu $v0, $zero, 1 /* DEFFDC 8024113C 4620018D */ trunc.w.d $f6, $f0 /* DEFFE0 80241140 E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241164_DF0004.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241164_DF0004.s index d4e9063753..f1fdfe112c 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241164_DF0004.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241164_DF0004.s @@ -34,7 +34,7 @@ glabel func_80241164_DF0004 /* DF0078 802411D8 44803000 */ mtc1 $zero, $f6 /* DF007C 802411DC 46000021 */ cvt.d.s $f0, $f0 /* DF0080 802411E0 46260002 */ mul.d $f0, $f0, $f6 -/* DF0084 802411E4 00000000 */ nop +/* DF0084 802411E4 00000000 */ nop /* DF0088 802411E8 24020001 */ addiu $v0, $zero, 1 /* DF008C 802411EC 8E24006C */ lw $a0, 0x6c($s1) /* DF0090 802411F0 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80241164_DF0004 /* DF00EC 8024124C C600003C */ lwc1 $f0, 0x3c($s0) /* DF00F0 80241250 4600C001 */ sub.s $f0, $f24, $f0 /* DF00F4 80241254 4600B03C */ c.lt.s $f22, $f0 -/* DF00F8 80241258 00000000 */ nop +/* DF00F8 80241258 00000000 */ nop /* DF00FC 8024125C 4500001B */ bc1f .L802412CC /* DF0100 80241260 34820010 */ ori $v0, $a0, 0x10 /* DF0104 80241264 080904B3 */ j .L802412CC @@ -87,9 +87,9 @@ glabel func_80241164_DF0004 /* DF0148 802412A8 C7A00034 */ lwc1 $f0, 0x34($sp) /* DF014C 802412AC 4600D001 */ sub.s $f0, $f26, $f0 /* DF0150 802412B0 4600B03C */ c.lt.s $f22, $f0 -/* DF0154 802412B4 00000000 */ nop +/* DF0154 802412B4 00000000 */ nop /* DF0158 802412B8 45000004 */ bc1f .L802412CC -/* DF015C 802412BC 00000000 */ nop +/* DF015C 802412BC 00000000 */ nop /* DF0160 802412C0 8E22006C */ lw $v0, 0x6c($s1) /* DF0164 802412C4 34420010 */ ori $v0, $v0, 0x10 /* DF0168 802412C8 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80241164_DF0004 /* DF0170 802412D0 24030011 */ addiu $v1, $zero, 0x11 /* DF0174 802412D4 30420011 */ andi $v0, $v0, 0x11 /* DF0178 802412D8 14430039 */ bne $v0, $v1, .L802413C0 -/* DF017C 802412DC 00000000 */ nop +/* DF017C 802412DC 00000000 */ nop /* DF0180 802412E0 8E020000 */ lw $v0, ($s0) /* DF0184 802412E4 30420008 */ andi $v0, $v0, 8 /* DF0188 802412E8 1040000A */ beqz $v0, .L80241314 @@ -108,7 +108,7 @@ glabel func_80241164_DF0004 /* DF0198 802412F8 D4207958 */ ldc1 $f0, %lo(D_80247958)($at) /* DF019C 802412FC 460010A1 */ cvt.d.s $f2, $f2 /* DF01A0 80241300 46201082 */ mul.d $f2, $f2, $f0 -/* DF01A4 80241304 00000000 */ nop +/* DF01A4 80241304 00000000 */ nop /* DF01A8 80241308 4600A021 */ cvt.d.s $f0, $f20 /* DF01AC 8024130C 080904DE */ j .L80241378 /* DF01B0 80241310 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80241164_DF0004 /* DF0200 80241360 D4207960 */ ldc1 $f0, %lo(D_80247960)($at) /* DF0204 80241364 460010A1 */ cvt.d.s $f2, $f2 /* DF0208 80241368 46201082 */ mul.d $f2, $f2, $f0 -/* DF020C 8024136C 00000000 */ nop +/* DF020C 8024136C 00000000 */ nop /* DF0210 80241370 4600A021 */ cvt.d.s $f0, $f20 /* DF0214 80241374 46220000 */ add.d $f0, $f0, $f2 .L80241378: @@ -149,7 +149,7 @@ glabel func_80241164_DF0004 /* DF0234 80241394 46000005 */ abs.s $f0, $f0 /* DF0238 80241398 46000021 */ cvt.d.s $f0, $f0 /* DF023C 8024139C 4622003C */ c.lt.d $f0, $f2 -/* DF0240 802413A0 00000000 */ nop +/* DF0240 802413A0 00000000 */ nop /* DF0244 802413A4 45000036 */ bc1f .L80241480 /* DF0248 802413A8 2403FFEF */ addiu $v1, $zero, -0x11 /* DF024C 802413AC E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80241164_DF0004 .L802413C0: /* DF0260 802413C0 8E220070 */ lw $v0, 0x70($s1) /* DF0264 802413C4 1840002E */ blez $v0, .L80241480 -/* DF0268 802413C8 00000000 */ nop +/* DF0268 802413C8 00000000 */ nop /* DF026C 802413CC C62C0074 */ lwc1 $f12, 0x74($s1) /* DF0270 802413D0 0C00A8BB */ jal sin_deg /* DF0274 802413D4 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80241164_DF0004 /* DF02CC 8024142C 27A70030 */ addiu $a3, $sp, 0x30 .L80241430: /* DF02D0 80241430 10400007 */ beqz $v0, .L80241450 -/* DF02D4 80241434 00000000 */ nop +/* DF02D4 80241434 00000000 */ nop /* DF02D8 80241438 4616A082 */ mul.s $f2, $f20, $f22 -/* DF02DC 8024143C 00000000 */ nop +/* DF02DC 8024143C 00000000 */ nop /* DF02E0 80241440 C7A0002C */ lwc1 $f0, 0x2c($sp) /* DF02E4 80241444 461A0000 */ add.s $f0, $f0, $f26 /* DF02E8 80241448 08090517 */ j .L8024145C /* DF02EC 8024144C 46020000 */ add.s $f0, $f0, $f2 .L80241450: /* DF02F0 80241450 4616A002 */ mul.s $f0, $f20, $f22 -/* DF02F4 80241454 00000000 */ nop +/* DF02F4 80241454 00000000 */ nop /* DF02F8 80241458 4600C000 */ add.s $f0, $f24, $f0 .L8024145C: /* DF02FC 8024145C E600003C */ swc1 $f0, 0x3c($s0) /* DF0300 80241460 8E220074 */ lw $v0, 0x74($s1) /* DF0304 80241464 2442000A */ addiu $v0, $v0, 0xa /* DF0308 80241468 44826000 */ mtc1 $v0, $f12 -/* DF030C 8024146C 00000000 */ nop +/* DF030C 8024146C 00000000 */ nop /* DF0310 80241470 0C00A6C9 */ jal clamp_angle /* DF0314 80241474 46806320 */ cvt.s.w $f12, $f12 /* DF0318 80241478 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80241164_DF0004 /* DF0328 80241488 2442FFFF */ addiu $v0, $v0, -1 /* DF032C 8024148C 8E430014 */ lw $v1, 0x14($s2) /* DF0330 80241490 04600048 */ bltz $v1, .L802415B4 -/* DF0334 80241494 00000000 */ nop +/* DF0334 80241494 00000000 */ nop /* DF0338 80241498 8E620074 */ lw $v0, 0x74($s3) /* DF033C 8024149C 1C400042 */ bgtz $v0, .L802415A8 /* DF0340 802414A0 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80241164_DF0004 /* DF0348 802414A8 860200A8 */ lh $v0, 0xa8($s0) /* DF034C 802414AC C602003C */ lwc1 $f2, 0x3c($s0) /* DF0350 802414B0 44820000 */ mtc1 $v0, $f0 -/* DF0354 802414B4 00000000 */ nop +/* DF0354 802414B4 00000000 */ nop /* DF0358 802414B8 46800020 */ cvt.s.w $f0, $f0 /* DF035C 802414BC 46001080 */ add.s $f2, $f2, $f0 /* DF0360 802414C0 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80241164_DF0004 /* DF037C 802414DC C440002C */ lwc1 $f0, 0x2c($v0) /* DF0380 802414E0 46000021 */ cvt.d.s $f0, $f0 /* DF0384 802414E4 4622003C */ c.lt.d $f0, $f2 -/* DF0388 802414E8 00000000 */ nop +/* DF0388 802414E8 00000000 */ nop /* DF038C 802414EC 4500002C */ bc1f .L802415A0 /* DF0390 802414F0 02A0202D */ daddu $a0, $s5, $zero /* DF0394 802414F4 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80241164_DF0004 /* DF03D0 80241530 3C01C1A0 */ lui $at, 0xc1a0 /* DF03D4 80241534 44812000 */ mtc1 $at, $f4 /* DF03D8 80241538 44834000 */ mtc1 $v1, $f8 -/* DF03DC 8024153C 00000000 */ nop +/* DF03DC 8024153C 00000000 */ nop /* DF03E0 80241540 46804220 */ cvt.s.w $f8, $f8 /* DF03E4 80241544 44074000 */ mfc1 $a3, $f8 /* DF03E8 80241548 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80241164_DF0004 /* DF049C 802415FC 0C0123F5 */ jal is_point_within_region /* DF04A0 80241600 8E070038 */ lw $a3, 0x38($s0) /* DF04A4 80241604 1040001A */ beqz $v0, .L80241670 -/* DF04A8 80241608 00000000 */ nop +/* DF04A8 80241608 00000000 */ nop /* DF04AC 8024160C 8E060038 */ lw $a2, 0x38($s0) /* DF04B0 80241610 8E2200D0 */ lw $v0, 0xd0($s1) /* DF04B4 80241614 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80241164_DF0004 /* DF04C8 80241628 468073A0 */ cvt.s.w $f14, $f14 /* DF04CC 8024162C C6020018 */ lwc1 $f2, 0x18($s0) /* DF04D0 80241630 4600103C */ c.lt.s $f2, $f0 -/* DF04D4 80241634 00000000 */ nop +/* DF04D4 80241634 00000000 */ nop /* DF04D8 80241638 4500000D */ bc1f .L80241670 /* DF04DC 8024163C E7A00034 */ swc1 $f0, 0x34($sp) /* DF04E0 80241640 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80241164_DF0004 /* DF051C 8024167C 00621825 */ or $v1, $v1, $v0 /* DF0520 80241680 00741825 */ or $v1, $v1, $s4 /* DF0524 80241684 10600008 */ beqz $v1, .L802416A8 -/* DF0528 80241688 00000000 */ nop +/* DF0528 80241688 00000000 */ nop /* DF052C 8024168C 8602008C */ lh $v0, 0x8c($s0) /* DF0530 80241690 14400031 */ bnez $v0, .L80241758 -/* DF0534 80241694 00000000 */ nop +/* DF0534 80241694 00000000 */ nop /* DF0538 80241698 8E050018 */ lw $a1, 0x18($s0) /* DF053C 8024169C 8E06000C */ lw $a2, 0xc($s0) /* DF0540 802416A0 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_80241164_DF0004 /* DF0554 802416B4 44801000 */ mtc1 $zero, $f2 /* DF0558 802416B8 46000021 */ cvt.d.s $f0, $f0 /* DF055C 802416BC 46220002 */ mul.d $f0, $f0, $f2 -/* DF0560 802416C0 00000000 */ nop +/* DF0560 802416C0 00000000 */ nop /* DF0564 802416C4 4620020D */ trunc.w.d $f8, $f0 /* DF0568 802416C8 E628007C */ swc1 $f8, 0x7c($s1) /* DF056C 802416CC 8E420004 */ lw $v0, 4($s2) /* DF0570 802416D0 18400021 */ blez $v0, .L80241758 -/* DF0574 802416D4 00000000 */ nop +/* DF0574 802416D4 00000000 */ nop /* DF0578 802416D8 8602008E */ lh $v0, 0x8e($s0) /* DF057C 802416DC 9603008E */ lhu $v1, 0x8e($s0) /* DF0580 802416E0 18400005 */ blez $v0, .L802416F8 @@ -375,7 +375,7 @@ glabel func_80241164_DF0004 /* DF0588 802416E8 A602008E */ sh $v0, 0x8e($s0) /* DF058C 802416EC 00021400 */ sll $v0, $v0, 0x10 /* DF0590 802416F0 1C400019 */ bgtz $v0, .L80241758 -/* DF0594 802416F4 00000000 */ nop +/* DF0594 802416F4 00000000 */ nop .L802416F8: /* DF0598 802416F8 240403E8 */ addiu $a0, $zero, 0x3e8 /* DF059C 802416FC 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80241164_DF0004 /* DF05E4 80241744 18400003 */ blez $v0, .L80241754 /* DF05E8 80241748 28620003 */ slti $v0, $v1, 3 /* DF05EC 8024174C 10400002 */ beqz $v0, .L80241758 -/* DF05F0 80241750 00000000 */ nop +/* DF05F0 80241750 00000000 */ nop .L80241754: /* DF05F4 80241754 AE600070 */ sw $zero, 0x70($s3) .L80241758: diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024184C_DF06EC.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024184C_DF06EC.s index 9517ab865e..f92049e052 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024184C_DF06EC.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024184C_DF06EC.s @@ -42,11 +42,11 @@ glabel func_8024184C_DF06EC .L802418E0: /* DF0780 802418E0 8E220070 */ lw $v0, 0x70($s1) /* DF0784 802418E4 18400034 */ blez $v0, .L802419B8 -/* DF0788 802418E8 00000000 */ nop +/* DF0788 802418E8 00000000 */ nop /* DF078C 802418EC C62C0074 */ lwc1 $f12, 0x74($s1) /* DF0790 802418F0 46806320 */ cvt.s.w $f12, $f12 /* DF0794 802418F4 44820000 */ mtc1 $v0, $f0 -/* DF0798 802418F8 00000000 */ nop +/* DF0798 802418F8 00000000 */ nop /* DF079C 802418FC 46800020 */ cvt.s.w $f0, $f0 /* DF07A0 80241900 46000021 */ cvt.d.s $f0, $f0 /* DF07A4 80241904 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_8024184C_DF06EC /* DF0804 80241964 27A70030 */ addiu $a3, $sp, 0x30 .L80241968: /* DF0808 80241968 10400007 */ beqz $v0, .L80241988 -/* DF080C 8024196C 00000000 */ nop +/* DF080C 8024196C 00000000 */ nop /* DF0810 80241970 4616A082 */ mul.s $f2, $f20, $f22 -/* DF0814 80241974 00000000 */ nop +/* DF0814 80241974 00000000 */ nop /* DF0818 80241978 C7A0002C */ lwc1 $f0, 0x2c($sp) /* DF081C 8024197C 46180000 */ add.s $f0, $f0, $f24 /* DF0820 80241980 08090665 */ j .L80241994 /* DF0824 80241984 46020000 */ add.s $f0, $f0, $f2 .L80241988: /* DF0828 80241988 4616A002 */ mul.s $f0, $f20, $f22 -/* DF082C 8024198C 00000000 */ nop +/* DF082C 8024198C 00000000 */ nop /* DF0830 80241990 4600D000 */ add.s $f0, $f26, $f0 .L80241994: /* DF0834 80241994 E600003C */ swc1 $f0, 0x3c($s0) /* DF0838 80241998 8E220074 */ lw $v0, 0x74($s1) /* DF083C 8024199C 2442000A */ addiu $v0, $v0, 0xa /* DF0840 802419A0 44826000 */ mtc1 $v0, $f12 -/* DF0844 802419A4 00000000 */ nop +/* DF0844 802419A4 00000000 */ nop /* DF0848 802419A8 0C00A6C9 */ jal clamp_angle /* DF084C 802419AC 46806320 */ cvt.s.w $f12, $f12 /* DF0850 802419B0 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_8024184C_DF06EC /* DF0864 802419C4 860200A8 */ lh $v0, 0xa8($s0) /* DF0868 802419C8 C600003C */ lwc1 $f0, 0x3c($s0) /* DF086C 802419CC 44821000 */ mtc1 $v0, $f2 -/* DF0870 802419D0 00000000 */ nop +/* DF0870 802419D0 00000000 */ nop /* DF0874 802419D4 468010A0 */ cvt.s.w $f2, $f2 /* DF0878 802419D8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* DF087C 802419DC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_8024184C_DF06EC /* DF0898 802419F8 46240000 */ add.d $f0, $f0, $f4 /* DF089C 802419FC 460010A1 */ cvt.d.s $f2, $f2 /* DF08A0 80241A00 4620103C */ c.lt.d $f2, $f0 -/* DF08A4 80241A04 00000000 */ nop +/* DF08A4 80241A04 00000000 */ nop /* DF08A8 80241A08 4500002E */ bc1f .L80241AC4 /* DF08AC 80241A0C 0280202D */ daddu $a0, $s4, $zero /* DF08B0 80241A10 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_8024184C_DF06EC /* DF08F0 80241A50 3C01C1A0 */ lui $at, 0xc1a0 /* DF08F4 80241A54 44812000 */ mtc1 $at, $f4 /* DF08F8 80241A58 44834000 */ mtc1 $v1, $f8 -/* DF08FC 80241A5C 00000000 */ nop +/* DF08FC 80241A5C 00000000 */ nop /* DF0900 80241A60 46804220 */ cvt.s.w $f8, $f8 /* DF0904 80241A64 44074000 */ mfc1 $a3, $f8 /* DF0908 80241A68 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_8024184C_DF06EC .L80241AC4: /* DF0964 80241AC4 8602008C */ lh $v0, 0x8c($s0) /* DF0968 80241AC8 14400025 */ bnez $v0, .L80241B60 -/* DF096C 80241ACC 00000000 */ nop +/* DF096C 80241ACC 00000000 */ nop /* DF0970 80241AD0 8602008E */ lh $v0, 0x8e($s0) /* DF0974 80241AD4 1C400022 */ bgtz $v0, .L80241B60 -/* DF0978 80241AD8 00000000 */ nop +/* DF0978 80241AD8 00000000 */ nop /* DF097C 80241ADC 8E620074 */ lw $v0, 0x74($s3) /* DF0980 80241AE0 2442FFFF */ addiu $v0, $v0, -1 /* DF0984 80241AE4 1840001D */ blez $v0, .L80241B5C @@ -183,7 +183,7 @@ glabel func_8024184C_DF06EC /* DF0990 80241AF0 9442002A */ lhu $v0, 0x2a($v0) /* DF0994 80241AF4 30420010 */ andi $v0, $v0, 0x10 /* DF0998 80241AF8 14400007 */ bnez $v0, .L80241B18 -/* DF099C 80241AFC 00000000 */ nop +/* DF099C 80241AFC 00000000 */ nop /* DF09A0 80241B00 C600000C */ lwc1 $f0, 0xc($s0) /* DF09A4 80241B04 3C014334 */ lui $at, 0x4334 /* DF09A8 80241B08 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241C74_DF0B14.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241C74_DF0B14.s index 454ddb2bd9..1768e460ae 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241C74_DF0B14.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241C74_DF0B14.s @@ -60,18 +60,18 @@ glabel func_80241C74_DF0B14 /* DF0BEC 80241D4C C6200038 */ lwc1 $f0, 0x38($s1) /* DF0BF0 80241D50 4600018D */ trunc.w.s $f6, $f0 /* DF0BF4 80241D54 44023000 */ mfc1 $v0, $f6 -/* DF0BF8 80241D58 00000000 */ nop +/* DF0BF8 80241D58 00000000 */ nop /* DF0BFC 80241D5C A6420010 */ sh $v0, 0x10($s2) /* DF0C00 80241D60 C620003C */ lwc1 $f0, 0x3c($s1) /* DF0C04 80241D64 4600018D */ trunc.w.s $f6, $f0 /* DF0C08 80241D68 44023000 */ mfc1 $v0, $f6 -/* DF0C0C 80241D6C 00000000 */ nop +/* DF0C0C 80241D6C 00000000 */ nop /* DF0C10 80241D70 A6420012 */ sh $v0, 0x12($s2) /* DF0C14 80241D74 C6200040 */ lwc1 $f0, 0x40($s1) /* DF0C18 80241D78 A2430007 */ sb $v1, 7($s2) /* DF0C1C 80241D7C 4600018D */ trunc.w.s $f6, $f0 /* DF0C20 80241D80 44023000 */ mfc1 $v0, $f6 -/* DF0C24 80241D84 00000000 */ nop +/* DF0C24 80241D84 00000000 */ nop /* DF0C28 80241D88 A6420014 */ sh $v0, 0x14($s2) .L80241D8C: /* DF0C2C 80241D8C 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241E0C_DF0CAC.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241E0C_DF0CAC.s index 48dbe321ba..0eea4a589a 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241E0C_DF0CAC.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241E0C_DF0CAC.s @@ -42,9 +42,9 @@ glabel func_80241E0C_DF0CAC /* DF0D40 80241EA0 44801800 */ mtc1 $zero, $f3 /* DF0D44 80241EA4 46002021 */ cvt.d.s $f0, $f4 /* DF0D48 80241EA8 4620103E */ c.le.d $f2, $f0 -/* DF0D4C 80241EAC 00000000 */ nop +/* DF0D4C 80241EAC 00000000 */ nop /* DF0D50 80241EB0 45000030 */ bc1f .L80241F74 -/* DF0D54 80241EB4 00000000 */ nop +/* DF0D54 80241EB4 00000000 */ nop /* DF0D58 80241EB8 C600003C */ lwc1 $f0, 0x3c($s0) /* DF0D5C 80241EBC 46040000 */ add.s $f0, $f0, $f4 /* DF0D60 80241EC0 E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_80241E0C_DF0CAC /* DF0DC0 80241F20 27A70020 */ addiu $a3, $sp, 0x20 .L80241F24: /* DF0DC4 80241F24 1040000B */ beqz $v0, .L80241F54 -/* DF0DC8 80241F28 00000000 */ nop +/* DF0DC8 80241F28 00000000 */ nop /* DF0DCC 80241F2C C7A0001C */ lwc1 $f0, 0x1c($sp) /* DF0DD0 80241F30 46140080 */ add.s $f2, $f0, $f20 /* DF0DD4 80241F34 C600003C */ lwc1 $f0, 0x3c($s0) /* DF0DD8 80241F38 4600103E */ c.le.s $f2, $f0 -/* DF0DDC 80241F3C 00000000 */ nop +/* DF0DDC 80241F3C 00000000 */ nop /* DF0DE0 80241F40 4500008D */ bc1f .L80242178 -/* DF0DE4 80241F44 00000000 */ nop +/* DF0DE4 80241F44 00000000 */ nop /* DF0DE8 80241F48 E602003C */ swc1 $f2, 0x3c($s0) /* DF0DEC 80241F4C 0809085E */ j .L80242178 /* DF0DF0 80241F50 AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_80241E0C_DF0CAC /* DF0DF4 80241F54 C602003C */ lwc1 $f2, 0x3c($s0) /* DF0DF8 80241F58 C6000064 */ lwc1 $f0, 0x64($s0) /* DF0DFC 80241F5C 4602003E */ c.le.s $f0, $f2 -/* DF0E00 80241F60 00000000 */ nop +/* DF0E00 80241F60 00000000 */ nop /* DF0E04 80241F64 45030084 */ bc1tl .L80242178 /* DF0E08 80241F68 AE400070 */ sw $zero, 0x70($s2) /* DF0E0C 80241F6C 0809085E */ j .L80242178 -/* DF0E10 80241F70 00000000 */ nop +/* DF0E10 80241F70 00000000 */ nop .L80241F74: /* DF0E14 80241F74 4622003C */ c.lt.d $f0, $f2 -/* DF0E18 80241F78 00000000 */ nop +/* DF0E18 80241F78 00000000 */ nop /* DF0E1C 80241F7C 4500007E */ bc1f .L80242178 -/* DF0E20 80241F80 00000000 */ nop +/* DF0E20 80241F80 00000000 */ nop /* DF0E24 80241F84 9602008E */ lhu $v0, 0x8e($s0) /* DF0E28 80241F88 24420001 */ addiu $v0, $v0, 1 /* DF0E2C 80241F8C A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_80241E0C_DF0CAC /* DF0E38 80241F98 00021403 */ sra $v0, $v0, 0x10 /* DF0E3C 80241F9C 0043102A */ slt $v0, $v0, $v1 /* DF0E40 80241FA0 14400026 */ bnez $v0, .L8024203C -/* DF0E44 80241FA4 00000000 */ nop +/* DF0E44 80241FA4 00000000 */ nop /* DF0E48 80241FA8 C60C0038 */ lwc1 $f12, 0x38($s0) /* DF0E4C 80241FAC C60E0040 */ lwc1 $f14, 0x40($s0) /* DF0E50 80241FB0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_80241E0C_DF0CAC /* DF0E7C 80241FDC 8E62001C */ lw $v0, 0x1c($s3) /* DF0E80 80241FE0 46001005 */ abs.s $f0, $f2 /* DF0E84 80241FE4 44822000 */ mtc1 $v0, $f4 -/* DF0E88 80241FE8 00000000 */ nop +/* DF0E88 80241FE8 00000000 */ nop /* DF0E8C 80241FEC 46802120 */ cvt.s.w $f4, $f4 /* DF0E90 80241FF0 4600203C */ c.lt.s $f4, $f0 -/* DF0E94 80241FF4 00000000 */ nop +/* DF0E94 80241FF4 00000000 */ nop /* DF0E98 80241FF8 4500000D */ bc1f .L80242030 -/* DF0E9C 80241FFC 00000000 */ nop +/* DF0E9C 80241FFC 00000000 */ nop /* DF0EA0 80242000 44800000 */ mtc1 $zero, $f0 /* DF0EA4 80242004 C614000C */ lwc1 $f20, 0xc($s0) /* DF0EA8 80242008 4600103C */ c.lt.s $f2, $f0 -/* DF0EAC 8024200C 00000000 */ nop +/* DF0EAC 8024200C 00000000 */ nop /* DF0EB0 80242010 45000006 */ bc1f .L8024202C /* DF0EB4 80242014 00021023 */ negu $v0, $v0 /* DF0EB8 80242018 44820000 */ mtc1 $v0, $f0 -/* DF0EBC 8024201C 00000000 */ nop +/* DF0EBC 8024201C 00000000 */ nop /* DF0EC0 80242020 46800020 */ cvt.s.w $f0, $f0 /* DF0EC4 80242024 0809080C */ j .L80242030 /* DF0EC8 80242028 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_80241E0C_DF0CAC /* DF0EF0 80242050 C600001C */ lwc1 $f0, 0x1c($s0) /* DF0EF4 80242054 46001080 */ add.s $f2, $f2, $f0 /* DF0EF8 80242058 4616103C */ c.lt.s $f2, $f22 -/* DF0EFC 8024205C 00000000 */ nop +/* DF0EFC 8024205C 00000000 */ nop /* DF0F00 80242060 45020045 */ bc1fl .L80242178 /* DF0F04 80242064 E602003C */ swc1 $f2, 0x3c($s0) /* DF0F08 80242068 0809085D */ j .L80242174 @@ -169,7 +169,7 @@ glabel func_80241E0C_DF0CAC /* DF0F20 80242080 C600001C */ lwc1 $f0, 0x1c($s0) /* DF0F24 80242084 C604003C */ lwc1 $f4, 0x3c($s0) /* DF0F28 80242088 44821000 */ mtc1 $v0, $f2 -/* DF0F2C 8024208C 00000000 */ nop +/* DF0F2C 8024208C 00000000 */ nop /* DF0F30 80242090 468010A0 */ cvt.s.w $f2, $f2 /* DF0F34 80242094 46000005 */ abs.s $f0, $f0 /* DF0F38 80242098 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_80241E0C_DF0CAC /* DF0F74 802420D4 0C0372DF */ jal func_800DCB7C /* DF0F78 802420D8 27A70020 */ addiu $a3, $sp, 0x20 /* DF0F7C 802420DC 10400015 */ beqz $v0, .L80242134 -/* DF0F80 802420E0 00000000 */ nop +/* DF0F80 802420E0 00000000 */ nop /* DF0F84 802420E4 860200A8 */ lh $v0, 0xa8($s0) /* DF0F88 802420E8 C604001C */ lwc1 $f4, 0x1c($s0) /* DF0F8C 802420EC 44820000 */ mtc1 $v0, $f0 -/* DF0F90 802420F0 00000000 */ nop +/* DF0F90 802420F0 00000000 */ nop /* DF0F94 802420F4 46800020 */ cvt.s.w $f0, $f0 /* DF0F98 802420F8 46002085 */ abs.s $f2, $f4 /* DF0F9C 802420FC 46020000 */ add.s $f0, $f0, $f2 /* DF0FA0 80242100 C7A20024 */ lwc1 $f2, 0x24($sp) /* DF0FA4 80242104 4600103E */ c.le.s $f2, $f0 -/* DF0FA8 80242108 00000000 */ nop +/* DF0FA8 80242108 00000000 */ nop /* DF0FAC 8024210C 45000005 */ bc1f .L80242124 -/* DF0FB0 80242110 00000000 */ nop +/* DF0FB0 80242110 00000000 */ nop /* DF0FB4 80242114 C7A0001C */ lwc1 $f0, 0x1c($sp) /* DF0FB8 80242118 AE00001C */ sw $zero, 0x1c($s0) /* DF0FBC 8024211C 0809085E */ j .L80242178 @@ -217,13 +217,13 @@ glabel func_80241E0C_DF0CAC /* DF0FD8 80242138 860200A8 */ lh $v0, 0xa8($s0) /* DF0FDC 8024213C 46163081 */ sub.s $f2, $f6, $f22 /* DF0FE0 80242140 44820000 */ mtc1 $v0, $f0 -/* DF0FE4 80242144 00000000 */ nop +/* DF0FE4 80242144 00000000 */ nop /* DF0FE8 80242148 46800020 */ cvt.s.w $f0, $f0 /* DF0FEC 8024214C 46001080 */ add.s $f2, $f2, $f0 /* DF0FF0 80242150 C604001C */ lwc1 $f4, 0x1c($s0) /* DF0FF4 80242154 46002005 */ abs.s $f0, $f4 /* DF0FF8 80242158 4602003C */ c.lt.s $f0, $f2 -/* DF0FFC 8024215C 00000000 */ nop +/* DF0FFC 8024215C 00000000 */ nop /* DF1000 80242160 45020005 */ bc1fl .L80242178 /* DF1004 80242164 AE00001C */ sw $zero, 0x1c($s0) /* DF1008 80242168 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024219C_DF103C.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024219C_DF103C.s index 6164bc46ee..69d900b8e2 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024219C_DF103C.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024219C_DF103C.s @@ -49,15 +49,15 @@ glabel func_8024219C_DF103C /* DF10E4 80242244 44802000 */ mtc1 $zero, $f4 /* DF10E8 80242248 460010A1 */ cvt.d.s $f2, $f2 /* DF10EC 8024224C 46241082 */ mul.d $f2, $f2, $f4 -/* DF10F0 80242250 00000000 */ nop +/* DF10F0 80242250 00000000 */ nop /* DF10F4 80242254 C7A0001C */ lwc1 $f0, 0x1c($sp) /* DF10F8 80242258 46000021 */ cvt.d.s $f0, $f0 /* DF10FC 8024225C 46240002 */ mul.d $f0, $f0, $f4 -/* DF1100 80242260 00000000 */ nop +/* DF1100 80242260 00000000 */ nop /* DF1104 80242264 3C013FE0 */ lui $at, 0x3fe0 /* DF1108 80242268 44812800 */ mtc1 $at, $f5 /* DF110C 8024226C 44802000 */ mtc1 $zero, $f4 -/* DF1110 80242270 00000000 */ nop +/* DF1110 80242270 00000000 */ nop /* DF1114 80242274 46241080 */ add.d $f2, $f2, $f4 /* DF1118 80242278 AE000074 */ sw $zero, 0x74($s0) /* DF111C 8024227C 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s index 3504d0e0ed..2458efc742 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s @@ -54,7 +54,7 @@ glabel func_802422C0_DF1160 /* DF1220 80242380 8E4300B0 */ lw $v1, 0xb0($s2) /* DF1224 80242384 30620004 */ andi $v0, $v1, 4 /* DF1228 80242388 10400007 */ beqz $v0, .L802423A8 -/* DF122C 8024238C 00000000 */ nop +/* DF122C 8024238C 00000000 */ nop /* DF1230 80242390 824200B4 */ lb $v0, 0xb4($s2) /* DF1234 80242394 1440003C */ bnez $v0, .L80242488 /* DF1238 80242398 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_802422C0_DF1160 /* DF124C 802423AC 2C62000F */ sltiu $v0, $v1, 0xf /* DF1250 802423B0 10400034 */ beqz $v0, .L80242484 /* DF1254 802423B4 00031080 */ sll $v0, $v1, 2 -/* DF1258 802423B8 3C018024 */ lui $at, %hi(D_80247968) +/* DF1258 802423B8 3C018024 */ lui $at, %hi(jtbl_80247968_DF6808) /* DF125C 802423BC 00220821 */ addu $at, $at, $v0 -/* DF1260 802423C0 8C227968 */ lw $v0, %lo(D_80247968)($at) +/* DF1260 802423C0 8C227968 */ lw $v0, %lo(jtbl_80247968_DF6808)($at) /* DF1264 802423C4 00400008 */ jr $v0 -/* DF1268 802423C8 00000000 */ nop +/* DF1268 802423C8 00000000 */ nop +glabel L802423CC_DF126C /* DF126C 802423CC 0280202D */ daddu $a0, $s4, $zero /* DF1270 802423D0 0200282D */ daddu $a1, $s0, $zero /* DF1274 802423D4 0C0903ED */ jal func_80240FB4_DEFE54 /* DF1278 802423D8 0260302D */ daddu $a2, $s3, $zero +glabel L802423DC_DF127C /* DF127C 802423DC 0280202D */ daddu $a0, $s4, $zero /* DF1280 802423E0 0200282D */ daddu $a1, $s0, $zero /* DF1284 802423E4 0C090459 */ jal func_80241164_DF0004 /* DF1288 802423E8 0260302D */ daddu $a2, $s3, $zero /* DF128C 802423EC 08090922 */ j .L80242488 /* DF1290 802423F0 0000102D */ daddu $v0, $zero, $zero +glabel L802423F4_DF1294 /* DF1294 802423F4 0280202D */ daddu $a0, $s4, $zero /* DF1298 802423F8 0200282D */ daddu $a1, $s0, $zero /* DF129C 802423FC 0C0905E3 */ jal omo_17_UnkNpcAIFunc1 /* DF12A0 80242400 0260302D */ daddu $a2, $s3, $zero +glabel L80242404_DF12A4 /* DF12A4 80242404 0280202D */ daddu $a0, $s4, $zero /* DF12A8 80242408 0200282D */ daddu $a1, $s0, $zero /* DF12AC 8024240C 0C090613 */ jal func_8024184C_DF06EC /* DF12B0 80242410 0260302D */ daddu $a2, $s3, $zero /* DF12B4 80242414 08090922 */ j .L80242488 /* DF12B8 80242418 0000102D */ daddu $v0, $zero, $zero +glabel L8024241C_DF12BC /* DF12BC 8024241C 0280202D */ daddu $a0, $s4, $zero /* DF12C0 80242420 0200282D */ daddu $a1, $s0, $zero /* DF12C4 80242424 0C0906E4 */ jal omo_17_UnkNpcAIFunc2 /* DF12C8 80242428 0260302D */ daddu $a2, $s3, $zero +glabel L8024242C_DF12CC /* DF12CC 8024242C 0280202D */ daddu $a0, $s4, $zero /* DF12D0 80242430 0200282D */ daddu $a1, $s0, $zero /* DF12D4 80242434 0C090702 */ jal func_80241C08_DF0AA8 /* DF12D8 80242438 0260302D */ daddu $a2, $s3, $zero /* DF12DC 8024243C 08090922 */ j .L80242488 /* DF12E0 80242440 0000102D */ daddu $v0, $zero, $zero +glabel L80242444_DF12E4 /* DF12E4 80242444 0280202D */ daddu $a0, $s4, $zero /* DF12E8 80242448 0200282D */ daddu $a1, $s0, $zero /* DF12EC 8024244C 0C09071D */ jal func_80241C74_DF0B14 /* DF12F0 80242450 0260302D */ daddu $a2, $s3, $zero /* DF12F4 80242454 08090922 */ j .L80242488 /* DF12F8 80242458 0000102D */ daddu $v0, $zero, $zero +glabel L8024245C_DF12FC /* DF12FC 8024245C 0280202D */ daddu $a0, $s4, $zero /* DF1300 80242460 0200282D */ daddu $a1, $s0, $zero /* DF1304 80242464 0C09076A */ jal omo_17_UnkNpcAIFunc3 /* DF1308 80242468 0260302D */ daddu $a2, $s3, $zero /* DF130C 8024246C 08090922 */ j .L80242488 /* DF1310 80242470 0000102D */ daddu $v0, $zero, $zero +glabel L80242474_DF1314 /* DF1314 80242474 0280202D */ daddu $a0, $s4, $zero /* DF1318 80242478 0200282D */ daddu $a1, $s0, $zero /* DF131C 8024247C 0C090783 */ jal func_80241E0C_DF0CAC /* DF1320 80242480 0260302D */ daddu $a2, $s3, $zero .L80242484: +glabel L80242484_DF1324 /* DF1324 80242484 0000102D */ daddu $v0, $zero, $zero .L80242488: /* DF1328 80242488 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC_DF134C.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC_DF134C.s index 7a1a0a0582..249290662a 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC_DF134C.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC_DF134C.s @@ -42,16 +42,16 @@ glabel func_802424AC_DF134C /* DF13E0 80242540 3C014387 */ lui $at, 0x4387 /* DF13E4 80242544 4481A000 */ mtc1 $at, $f20 /* DF13E8 80242548 0C00A70A */ jal get_clamped_angle_diff -/* DF13EC 8024254C 00000000 */ nop +/* DF13EC 8024254C 00000000 */ nop /* DF13F0 80242550 0C00A6C9 */ jal clamp_angle /* DF13F4 80242554 46000306 */ mov.s $f12, $f0 /* DF13F8 80242558 3C018024 */ lui $at, %hi(D_802479A8) /* DF13FC 8024255C D42279A8 */ ldc1 $f2, %lo(D_802479A8)($at) /* DF1400 80242560 46000021 */ cvt.d.s $f0, $f0 /* DF1404 80242564 4622003C */ c.lt.d $f0, $f2 -/* DF1408 80242568 00000000 */ nop +/* DF1408 80242568 00000000 */ nop /* DF140C 8024256C 45000003 */ bc1f .L8024257C -/* DF1410 80242570 00000000 */ nop +/* DF1410 80242570 00000000 */ nop /* DF1414 80242574 3C0142B4 */ lui $at, 0x42b4 /* DF1418 80242578 4481A000 */ mtc1 $at, $f20 .L8024257C: @@ -71,7 +71,7 @@ glabel func_802424AC_DF134C /* DF1450 802425B0 D42279B0 */ ldc1 $f2, %lo(D_802479B0)($at) /* DF1454 802425B4 46000021 */ cvt.d.s $f0, $f0 /* DF1458 802425B8 4620103C */ c.lt.d $f2, $f0 -/* DF145C 802425BC 00000000 */ nop +/* DF145C 802425BC 00000000 */ nop /* DF1460 802425C0 4501002E */ bc1t .L8024267C /* DF1464 802425C4 2402FFFF */ addiu $v0, $zero, -1 /* DF1468 802425C8 8E220000 */ lw $v0, ($s1) @@ -80,13 +80,13 @@ glabel func_802424AC_DF134C /* DF1474 802425D4 860200A8 */ lh $v0, 0xa8($s0) /* DF1478 802425D8 46020001 */ sub.s $f0, $f0, $f2 /* DF147C 802425DC 44821000 */ mtc1 $v0, $f2 -/* DF1480 802425E0 00000000 */ nop +/* DF1480 802425E0 00000000 */ nop /* DF1484 802425E4 468010A1 */ cvt.d.w $f2, $f2 /* DF1488 802425E8 46221080 */ add.d $f2, $f2, $f2 /* DF148C 802425EC 46000005 */ abs.s $f0, $f0 /* DF1490 802425F0 46000021 */ cvt.d.s $f0, $f0 /* DF1494 802425F4 4620103E */ c.le.d $f2, $f0 -/* DF1498 802425F8 00000000 */ nop +/* DF1498 802425F8 00000000 */ nop /* DF149C 802425FC 4501001F */ bc1t .L8024267C /* DF14A0 80242600 2402FFFF */ addiu $v0, $zero, -1 /* DF14A4 80242604 3C038011 */ lui $v1, %hi(D_8010EBB3) @@ -97,7 +97,7 @@ glabel func_802424AC_DF134C /* DF14B8 80242618 14620005 */ bne $v1, $v0, .L80242630 /* DF14BC 8024261C 2402FFFF */ addiu $v0, $zero, -1 /* DF14C0 80242620 0809099F */ j .L8024267C -/* DF14C4 80242624 00000000 */ nop +/* DF14C4 80242624 00000000 */ nop .L80242628: /* DF14C8 80242628 0809099F */ j .L8024267C /* DF14CC 8024262C 0240102D */ daddu $v0, $s2, $zero @@ -120,7 +120,7 @@ glabel func_802424AC_DF134C /* DF1508 80242668 8E620078 */ lw $v0, 0x78($s3) /* DF150C 8024266C 0222102A */ slt $v0, $s1, $v0 /* DF1510 80242670 1440FFF2 */ bnez $v0, .L8024263C -/* DF1514 80242674 00000000 */ nop +/* DF1514 80242674 00000000 */ nop .L80242678: /* DF1518 80242678 2402FFFF */ addiu $v0, $zero, -1 .L8024267C: diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024269C_DF153C.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024269C_DF153C.s index d8dd4f41ad..a8cc31be61 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024269C_DF153C.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024269C_DF153C.s @@ -38,7 +38,7 @@ glabel func_8024269C_DF153C /* DF15C0 80242720 2402000F */ addiu $v0, $zero, 0xf /* DF15C4 80242724 AFA2001C */ sw $v0, 0x1c($sp) /* DF15C8 80242728 44833000 */ mtc1 $v1, $f6 -/* DF15CC 8024272C 00000000 */ nop +/* DF15CC 8024272C 00000000 */ nop /* DF15D0 80242730 468031A0 */ cvt.s.w $f6, $f6 /* DF15D4 80242734 44073000 */ mfc1 $a3, $f6 /* DF15D8 80242738 27A20028 */ addiu $v0, $sp, 0x28 @@ -60,15 +60,15 @@ glabel func_8024269C_DF153C /* DF1614 80242774 0040202D */ daddu $a0, $v0, $zero /* DF1618 80242778 2402FFFF */ addiu $v0, $zero, -1 /* DF161C 8024277C 10820010 */ beq $a0, $v0, .L802427C0 -/* DF1620 80242780 00000000 */ nop +/* DF1620 80242780 00000000 */ nop /* DF1624 80242784 0C00FB3A */ jal get_enemy -/* DF1628 80242788 00000000 */ nop +/* DF1628 80242788 00000000 */ nop /* DF162C 8024278C 8C42006C */ lw $v0, 0x6c($v0) /* DF1630 80242790 1440000B */ bnez $v0, .L802427C0 -/* DF1634 80242794 00000000 */ nop +/* DF1634 80242794 00000000 */ nop /* DF1638 80242798 8602008C */ lh $v0, 0x8c($s0) /* DF163C 8024279C 14400008 */ bnez $v0, .L802427C0 -/* DF1640 802427A0 00000000 */ nop +/* DF1640 802427A0 00000000 */ nop /* DF1644 802427A4 8E2200CC */ lw $v0, 0xcc($s1) /* DF1648 802427A8 8C420020 */ lw $v0, 0x20($v0) /* DF164C 802427AC AE020028 */ sw $v0, 0x28($s0) diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802427E0_DF1680.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802427E0_DF1680.s index 3d7b008e59..e58ea5fc51 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802427E0_DF1680.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802427E0_DF1680.s @@ -17,7 +17,7 @@ glabel func_802427E0_DF1680 /* DF16B0 80242810 A602008E */ sh $v0, 0x8e($s0) /* DF16B4 80242814 00021400 */ sll $v0, $v0, 0x10 /* DF16B8 80242818 1C40002B */ bgtz $v0, .L802428C8 -/* DF16BC 8024281C 00000000 */ nop +/* DF16BC 8024281C 00000000 */ nop /* DF16C0 80242820 0C09092B */ jal func_802424AC_DF134C /* DF16C4 80242824 0240202D */ daddu $a0, $s2, $zero /* DF16C8 80242828 0040202D */ daddu $a0, $v0, $zero @@ -35,7 +35,7 @@ glabel func_802427E0_DF1680 /* DF16F8 80242858 3C01C1A0 */ lui $at, 0xc1a0 /* DF16FC 8024285C 44812000 */ mtc1 $at, $f4 /* DF1700 80242860 44833000 */ mtc1 $v1, $f6 -/* DF1704 80242864 00000000 */ nop +/* DF1704 80242864 00000000 */ nop /* DF1708 80242868 468031A0 */ cvt.s.w $f6, $f6 /* DF170C 8024286C 44073000 */ mfc1 $a3, $f6 /* DF1710 80242870 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242A08_DF18A8.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242A08_DF18A8.s index 836888dd5d..12b0e877b1 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242A08_DF18A8.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242A08_DF18A8.s @@ -47,7 +47,7 @@ glabel func_80242A08_DF18A8 /* DF194C 80242AAC 8E6200B0 */ lw $v0, 0xb0($s3) /* DF1950 80242AB0 30420004 */ andi $v0, $v0, 4 /* DF1954 80242AB4 10400019 */ beqz $v0, .L80242B1C -/* DF1958 80242AB8 00000000 */ nop +/* DF1958 80242AB8 00000000 */ nop .L80242ABC: /* DF195C 80242ABC 34630102 */ ori $v1, $v1, 0x102 /* DF1960 80242AC0 AEE00070 */ sw $zero, 0x70($s7) @@ -83,12 +83,12 @@ glabel func_80242A08_DF18A8 /* DF19D4 80242B34 10600007 */ beqz $v1, .L80242B54 /* DF19D8 80242B38 0000102D */ daddu $v0, $zero, $zero /* DF19DC 80242B3C 08090BC6 */ j .L80242F18 -/* DF19E0 80242B40 00000000 */ nop +/* DF19E0 80242B40 00000000 */ nop .L80242B44: /* DF19E4 80242B44 1062005B */ beq $v1, $v0, .L80242CB4 /* DF19E8 80242B48 0000102D */ daddu $v0, $zero, $zero /* DF19EC 80242B4C 08090BC6 */ j .L80242F18 -/* DF19F0 80242B50 00000000 */ nop +/* DF19F0 80242B50 00000000 */ nop .L80242B54: /* DF19F4 80242B54 8E420000 */ lw $v0, ($s2) /* DF19F8 80242B58 0240202D */ daddu $a0, $s2, $zero @@ -131,17 +131,17 @@ glabel func_80242A08_DF18A8 /* DF1A88 80242BE8 C6400038 */ lwc1 $f0, 0x38($s2) /* DF1A8C 80242BEC 4600020D */ trunc.w.s $f8, $f0 /* DF1A90 80242BF0 44024000 */ mfc1 $v0, $f8 -/* DF1A94 80242BF4 00000000 */ nop +/* DF1A94 80242BF4 00000000 */ nop /* DF1A98 80242BF8 A6620010 */ sh $v0, 0x10($s3) /* DF1A9C 80242BFC C640003C */ lwc1 $f0, 0x3c($s2) /* DF1AA0 80242C00 4600020D */ trunc.w.s $f8, $f0 /* DF1AA4 80242C04 44024000 */ mfc1 $v0, $f8 -/* DF1AA8 80242C08 00000000 */ nop +/* DF1AA8 80242C08 00000000 */ nop /* DF1AAC 80242C0C A6620012 */ sh $v0, 0x12($s3) /* DF1AB0 80242C10 C6400040 */ lwc1 $f0, 0x40($s2) /* DF1AB4 80242C14 4600020D */ trunc.w.s $f8, $f0 /* DF1AB8 80242C18 44024000 */ mfc1 $v0, $f8 -/* DF1ABC 80242C1C 00000000 */ nop +/* DF1ABC 80242C1C 00000000 */ nop /* DF1AC0 80242C20 A6620014 */ sh $v0, 0x14($s3) /* DF1AC4 80242C24 AE400044 */ sw $zero, 0x44($s2) /* DF1AC8 80242C28 AE400048 */ sw $zero, 0x48($s2) @@ -187,10 +187,10 @@ glabel func_80242A08_DF18A8 /* DF1B64 80242CC4 44810800 */ mtc1 $at, $f1 /* DF1B68 80242CC8 44800000 */ mtc1 $zero, $f0 /* DF1B6C 80242CCC 44821000 */ mtc1 $v0, $f2 -/* DF1B70 80242CD0 00000000 */ nop +/* DF1B70 80242CD0 00000000 */ nop /* DF1B74 80242CD4 468010A1 */ cvt.d.w $f2, $f2 /* DF1B78 80242CD8 46201082 */ mul.d $f2, $f2, $f0 -/* DF1B7C 80242CDC 00000000 */ nop +/* DF1B7C 80242CDC 00000000 */ nop /* DF1B80 80242CE0 0200282D */ daddu $a1, $s0, $zero /* DF1B84 80242CE4 C6440038 */ lwc1 $f4, 0x38($s2) /* DF1B88 80242CE8 C640003C */ lwc1 $f0, 0x3c($s2) @@ -210,13 +210,13 @@ glabel func_80242A08_DF18A8 /* DF1BC0 80242D20 864200A6 */ lh $v0, 0xa6($s2) /* DF1BC4 80242D24 27B40028 */ addiu $s4, $sp, 0x28 /* DF1BC8 80242D28 44820000 */ mtc1 $v0, $f0 -/* DF1BCC 80242D2C 00000000 */ nop +/* DF1BCC 80242D2C 00000000 */ nop /* DF1BD0 80242D30 46800020 */ cvt.s.w $f0, $f0 /* DF1BD4 80242D34 E7A00018 */ swc1 $f0, 0x18($sp) /* DF1BD8 80242D38 864200A8 */ lh $v0, 0xa8($s2) /* DF1BDC 80242D3C 0280382D */ daddu $a3, $s4, $zero /* DF1BE0 80242D40 44820000 */ mtc1 $v0, $f0 -/* DF1BE4 80242D44 00000000 */ nop +/* DF1BE4 80242D44 00000000 */ nop /* DF1BE8 80242D48 46800020 */ cvt.s.w $f0, $f0 /* DF1BEC 80242D4C 0C0376B9 */ jal func_800DDAE4 /* DF1BF0 80242D50 E7A0001C */ swc1 $f0, 0x1c($sp) @@ -240,14 +240,14 @@ glabel func_80242A08_DF18A8 /* DF1C34 80242D94 0C0372DF */ jal func_800DCB7C /* DF1C38 80242D98 0280382D */ daddu $a3, $s4, $zero /* DF1C3C 80242D9C 10400019 */ beqz $v0, .L80242E04 -/* DF1C40 80242DA0 00000000 */ nop +/* DF1C40 80242DA0 00000000 */ nop /* DF1C44 80242DA4 C640001C */ lwc1 $f0, 0x1c($s2) /* DF1C48 80242DA8 C7A2002C */ lwc1 $f2, 0x2c($sp) /* DF1C4C 80242DAC 46000005 */ abs.s $f0, $f0 /* DF1C50 80242DB0 4600103C */ c.lt.s $f2, $f0 -/* DF1C54 80242DB4 00000000 */ nop +/* DF1C54 80242DB4 00000000 */ nop /* DF1C58 80242DB8 45000012 */ bc1f .L80242E04 -/* DF1C5C 80242DBC 00000000 */ nop +/* DF1C5C 80242DBC 00000000 */ nop /* DF1C60 80242DC0 C7A40024 */ lwc1 $f4, 0x24($sp) /* DF1C64 80242DC4 C6400064 */ lwc1 $f0, 0x64($s2) /* DF1C68 80242DC8 46002001 */ sub.s $f0, $f4, $f0 @@ -257,7 +257,7 @@ glabel func_80242A08_DF18A8 /* DF1C78 80242DD8 46000005 */ abs.s $f0, $f0 /* DF1C7C 80242DDC 46000021 */ cvt.d.s $f0, $f0 /* DF1C80 80242DE0 4622003C */ c.lt.d $f0, $f2 -/* DF1C84 80242DE4 00000000 */ nop +/* DF1C84 80242DE4 00000000 */ nop /* DF1C88 80242DE8 45000006 */ bc1f .L80242E04 /* DF1C8C 80242DEC 0240202D */ daddu $a0, $s2, $zero /* DF1C90 80242DF0 8E450018 */ lw $a1, 0x18($s2) @@ -272,7 +272,7 @@ glabel func_80242A08_DF18A8 /* DF1CB0 80242E10 44801000 */ mtc1 $zero, $f2 /* DF1CB4 80242E14 46000021 */ cvt.d.s $f0, $f0 /* DF1CB8 80242E18 4622003C */ c.lt.d $f0, $f2 -/* DF1CBC 80242E1C 00000000 */ nop +/* DF1CBC 80242E1C 00000000 */ nop /* DF1CC0 80242E20 45030001 */ bc1tl .L80242E28 /* DF1CC4 80242E24 2416000B */ addiu $s6, $zero, 0xb .L80242E28: @@ -288,7 +288,7 @@ glabel func_80242A08_DF18A8 /* DF1CE8 80242E48 8E620070 */ lw $v0, 0x70($s3) /* DF1CEC 80242E4C 30420001 */ andi $v0, $v0, 1 /* DF1CF0 80242E50 10400009 */ beqz $v0, .L80242E78 -/* DF1CF4 80242E54 00000000 */ nop +/* DF1CF4 80242E54 00000000 */ nop /* DF1CF8 80242E58 C640004C */ lwc1 $f0, 0x4c($s2) /* DF1CFC 80242E5C 3C014044 */ lui $at, 0x4044 /* DF1D00 80242E60 44811800 */ mtc1 $at, $f3 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242F44_DF1DE4.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242F44_DF1DE4.s index 6305221963..a4a37bb7b1 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242F44_DF1DE4.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242F44_DF1DE4.s @@ -50,7 +50,7 @@ glabel func_80242F44_DF1DE4 .L80242FF0: /* DF1E90 80242FF0 86240008 */ lh $a0, 8($s1) /* DF1E94 80242FF4 0C00FB5A */ jal get_enemy_safe -/* DF1E98 80242FF8 00000000 */ nop +/* DF1E98 80242FF8 00000000 */ nop /* DF1E9C 80242FFC 14400005 */ bnez $v0, .L80243014 /* DF1EA0 80243000 0260202D */ daddu $a0, $s3, $zero /* DF1EA4 80243004 3C05FE36 */ lui $a1, 0xfe36 @@ -60,7 +60,7 @@ glabel func_80242F44_DF1DE4 .L80243014: /* DF1EB4 80243014 86240008 */ lh $a0, 8($s1) /* DF1EB8 80243018 0C00EABB */ jal get_npc_unsafe -/* DF1EBC 8024301C 00000000 */ nop +/* DF1EBC 8024301C 00000000 */ nop /* DF1EC0 80243020 8E630070 */ lw $v1, 0x70($s3) /* DF1EC4 80243024 10600006 */ beqz $v1, .L80243040 /* DF1EC8 80243028 0040802D */ daddu $s0, $v0, $zero @@ -68,7 +68,7 @@ glabel func_80242F44_DF1DE4 /* DF1ED0 80243030 1062003F */ beq $v1, $v0, .L80243130 /* DF1ED4 80243034 0000102D */ daddu $v0, $zero, $zero /* DF1ED8 80243038 08090CDD */ j .L80243374 -/* DF1EDC 8024303C 00000000 */ nop +/* DF1EDC 8024303C 00000000 */ nop .L80243040: /* DF1EE0 80243040 AFA00010 */ sw $zero, 0x10($sp) /* DF1EE4 80243044 AFA00014 */ sw $zero, 0x14($sp) @@ -79,7 +79,7 @@ glabel func_80242F44_DF1DE4 /* DF1EF8 80243058 24040002 */ addiu $a0, $zero, 2 /* DF1EFC 8024305C C64C006C */ lwc1 $f12, 0x6c($s2) /* DF1F00 80243060 0C00A6C9 */ jal clamp_angle -/* DF1F04 80243064 00000000 */ nop +/* DF1F04 80243064 00000000 */ nop /* DF1F08 80243068 3C018024 */ lui $at, %hi(D_802479B8) /* DF1F0C 8024306C D43879B8 */ ldc1 $f24, %lo(D_802479B8)($at) /* DF1F10 80243070 46000521 */ cvt.d.s $f20, $f0 @@ -107,7 +107,7 @@ glabel func_80242F44_DF1DE4 /* DF1F68 802430C8 46000306 */ mov.s $f12, $f0 /* DF1F6C 802430CC 46000021 */ cvt.d.s $f0, $f0 /* DF1F70 802430D0 4638003C */ c.lt.d $f0, $f24 -/* DF1F74 802430D4 00000000 */ nop +/* DF1F74 802430D4 00000000 */ nop /* DF1F78 802430D8 45020002 */ bc1fl .L802430E4 /* DF1F7C 802430DC E614000C */ swc1 $f20, 0xc($s0) /* DF1F80 802430E0 E616000C */ swc1 $f22, 0xc($s0) @@ -117,7 +117,7 @@ glabel func_80242F44_DF1DE4 /* DF1F8C 802430EC D42279C8 */ ldc1 $f2, %lo(D_802479C8)($at) /* DF1F90 802430F0 46000021 */ cvt.d.s $f0, $f0 /* DF1F94 802430F4 46220002 */ mul.d $f0, $f0, $f2 -/* DF1F98 802430F8 00000000 */ nop +/* DF1F98 802430F8 00000000 */ nop /* DF1F9C 802430FC 3C013F66 */ lui $at, 0x3f66 /* DF1FA0 80243100 34216666 */ ori $at, $at, 0x6666 /* DF1FA4 80243104 44812000 */ mtc1 $at, $f4 @@ -147,13 +147,13 @@ glabel func_80242F44_DF1DE4 /* DF2000 80243160 860200A6 */ lh $v0, 0xa6($s0) /* DF2004 80243164 27A60024 */ addiu $a2, $sp, 0x24 /* DF2008 80243168 44820000 */ mtc1 $v0, $f0 -/* DF200C 8024316C 00000000 */ nop +/* DF200C 8024316C 00000000 */ nop /* DF2010 80243170 46800020 */ cvt.s.w $f0, $f0 /* DF2014 80243174 E7A00018 */ swc1 $f0, 0x18($sp) /* DF2018 80243178 860200A8 */ lh $v0, 0xa8($s0) /* DF201C 8024317C 27A70028 */ addiu $a3, $sp, 0x28 /* DF2020 80243180 44820000 */ mtc1 $v0, $f0 -/* DF2024 80243184 00000000 */ nop +/* DF2024 80243184 00000000 */ nop /* DF2028 80243188 46800020 */ cvt.s.w $f0, $f0 /* DF202C 8024318C 0C037711 */ jal func_800DDC44 /* DF2030 80243190 E7A0001C */ swc1 $f0, 0x1c($sp) @@ -173,7 +173,7 @@ glabel func_80242F44_DF1DE4 /* DF2060 802431C0 44801800 */ mtc1 $zero, $f3 /* DF2064 802431C4 46000021 */ cvt.d.s $f0, $f0 /* DF2068 802431C8 4622003C */ c.lt.d $f0, $f2 -/* DF206C 802431CC 00000000 */ nop +/* DF206C 802431CC 00000000 */ nop /* DF2070 802431D0 45000028 */ bc1f .L80243274 /* DF2074 802431D4 27A50020 */ addiu $a1, $sp, 0x20 /* DF2078 802431D8 27A60024 */ addiu $a2, $sp, 0x24 @@ -204,7 +204,7 @@ glabel func_80242F44_DF1DE4 /* DF20DC 8024323C 0C0372DF */ jal func_800DCB7C /* DF20E0 80243240 27A70028 */ addiu $a3, $sp, 0x28 /* DF20E4 80243244 1040000B */ beqz $v0, .L80243274 -/* DF20E8 80243248 00000000 */ nop +/* DF20E8 80243248 00000000 */ nop /* DF20EC 8024324C C600001C */ lwc1 $f0, 0x1c($s0) /* DF20F0 80243250 C7A2002C */ lwc1 $f2, 0x2c($sp) /* DF20F4 80243254 46000005 */ abs.s $f0, $f0 @@ -212,7 +212,7 @@ glabel func_80242F44_DF1DE4 /* DF20FC 8024325C 46340000 */ add.d $f0, $f0, $f20 /* DF2100 80243260 460010A1 */ cvt.d.s $f2, $f2 /* DF2104 80243264 4620103E */ c.le.d $f2, $f0 -/* DF2108 80243268 00000000 */ nop +/* DF2108 80243268 00000000 */ nop /* DF210C 8024326C 45030001 */ bc1tl .L80243274 /* DF2110 80243270 24120001 */ addiu $s2, $zero, 1 .L80243274: @@ -234,7 +234,7 @@ glabel func_80242F44_DF1DE4 /* DF214C 802432AC 2414000B */ addiu $s4, $zero, 0xb .L802432B0: /* DF2150 802432B0 12800024 */ beqz $s4, .L80243344 -/* DF2154 802432B4 00000000 */ nop +/* DF2154 802432B4 00000000 */ nop /* DF2158 802432B8 AFA00010 */ sw $zero, 0x10($sp) /* DF215C 802432BC AFA00014 */ sw $zero, 0x14($sp) /* DF2160 802432C0 8E050038 */ lw $a1, 0x38($s0) @@ -268,7 +268,7 @@ glabel func_80242F44_DF1DE4 /* DF21D0 80243330 AC800070 */ sw $zero, 0x70($a0) .L80243334: /* DF21D4 80243334 0C0B2026 */ jal set_variable -/* DF21D8 80243338 00000000 */ nop +/* DF21D8 80243338 00000000 */ nop /* DF21DC 8024333C 08090CDD */ j .L80243374 /* DF21E0 80243340 24020002 */ addiu $v0, $zero, 2 .L80243344: diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s index e056ec8745..b8831b9697 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s @@ -103,41 +103,48 @@ glabel func_802433A0_DF2240 /* DF23B0 80243510 2C620064 */ sltiu $v0, $v1, 0x64 /* DF23B4 80243514 10400060 */ beqz $v0, .L80243698 /* DF23B8 80243518 00031080 */ sll $v0, $v1, 2 -/* DF23BC 8024351C 3C018024 */ lui $at, %hi(D_802479D0) +/* DF23BC 8024351C 3C018024 */ lui $at, %hi(jtbl_802479D0_DF6870) /* DF23C0 80243520 00220821 */ addu $at, $at, $v0 -/* DF23C4 80243524 8C2279D0 */ lw $v0, %lo(D_802479D0)($at) +/* DF23C4 80243524 8C2279D0 */ lw $v0, %lo(jtbl_802479D0_DF6870)($at) /* DF23C8 80243528 00400008 */ jr $v0 /* DF23CC 8024352C 00000000 */ nop +glabel L80243530_DF23D0 /* DF23D0 80243530 0260202D */ daddu $a0, $s3, $zero /* DF23D4 80243534 0200282D */ daddu $a1, $s0, $zero /* DF23D8 80243538 0C012568 */ jal func_800495A0 /* DF23DC 8024353C 02A0302D */ daddu $a2, $s5, $zero +glabel L80243540_DF23E0 /* DF23E0 80243540 0260202D */ daddu $a0, $s3, $zero /* DF23E4 80243544 0200282D */ daddu $a1, $s0, $zero /* DF23E8 80243548 0C0125AE */ jal func_800496B8 /* DF23EC 8024354C 02A0302D */ daddu $a2, $s5, $zero /* DF23F0 80243550 08090DA6 */ j .L80243698 /* DF23F4 80243554 00000000 */ nop +glabel L80243558_DF23F8 /* DF23F8 80243558 0260202D */ daddu $a0, $s3, $zero /* DF23FC 8024355C 0200282D */ daddu $a1, $s0, $zero /* DF2400 80243560 0C0126D1 */ jal base_UnkNpcAIFunc1 /* DF2404 80243564 02A0302D */ daddu $a2, $s5, $zero +glabel L80243568_DF2408 /* DF2408 80243568 0260202D */ daddu $a0, $s3, $zero /* DF240C 8024356C 0200282D */ daddu $a1, $s0, $zero /* DF2410 80243570 0C012701 */ jal func_80049C04 /* DF2414 80243574 02A0302D */ daddu $a2, $s5, $zero /* DF2418 80243578 08090DA6 */ j .L80243698 /* DF241C 8024357C 00000000 */ nop +glabel L80243580_DF2420 /* DF2420 80243580 0260202D */ daddu $a0, $s3, $zero /* DF2424 80243584 0200282D */ daddu $a1, $s0, $zero /* DF2428 80243588 0C01278F */ jal func_80049E3C /* DF242C 8024358C 02A0302D */ daddu $a2, $s5, $zero +glabel L80243590_DF2430 /* DF2430 80243590 0260202D */ daddu $a0, $s3, $zero /* DF2434 80243594 0200282D */ daddu $a1, $s0, $zero /* DF2438 80243598 0C0127B3 */ jal func_80049ECC /* DF243C 8024359C 02A0302D */ daddu $a2, $s5, $zero /* DF2440 802435A0 08090DA6 */ j .L80243698 /* DF2444 802435A4 00000000 */ nop +glabel L802435A8_DF2448 /* DF2448 802435A8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* DF244C 802435AC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* DF2450 802435B0 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -170,37 +177,45 @@ glabel func_802433A0_DF2240 /* DF24B4 80243614 0200282D */ daddu $a1, $s0, $zero /* DF24B8 80243618 0C0127DF */ jal func_80049F7C /* DF24BC 8024361C 02A0302D */ daddu $a2, $s5, $zero +glabel L80243620_DF24C0 /* DF24C0 80243620 0260202D */ daddu $a0, $s3, $zero /* DF24C4 80243624 0200282D */ daddu $a1, $s0, $zero /* DF24C8 80243628 0C012849 */ jal func_8004A124 /* DF24CC 8024362C 02A0302D */ daddu $a2, $s5, $zero /* DF24D0 80243630 08090DA6 */ j .L80243698 /* DF24D4 80243634 00000000 */ nop +glabel L80243638_DF24D8 /* DF24D8 80243638 0260202D */ daddu $a0, $s3, $zero /* DF24DC 8024363C 0200282D */ daddu $a1, $s0, $zero /* DF24E0 80243640 0C0128FA */ jal func_8004A3E8 /* DF24E4 80243644 02A0302D */ daddu $a2, $s5, $zero /* DF24E8 80243648 08090DA6 */ j .L80243698 /* DF24EC 8024364C 00000000 */ nop +glabel L80243650_DF24F0 /* DF24F0 80243650 0C0909F8 */ jal func_802427E0_DF1680 /* DF24F4 80243654 0260202D */ daddu $a0, $s3, $zero /* DF24F8 80243658 08090DA6 */ j .L80243698 /* DF24FC 8024365C 00000000 */ nop -/* DF2500 80243660 0C090A38 */ jal omo_17_UnkSetDurationFunc +glabel L80243660_DF2500 +/* DF2500 80243660 0C090A38 */ jal D_802428E0 /* DF2504 80243664 0260202D */ daddu $a0, $s3, $zero /* DF2508 80243668 08090DA6 */ j .L80243698 /* DF250C 8024366C 00000000 */ nop +glabel L80243670_DF2510 /* DF2510 80243670 0C090A49 */ jal omo_17_UnkNpcAIFunc9 /* DF2514 80243674 0260202D */ daddu $a0, $s3, $zero /* DF2518 80243678 08090DA6 */ j .L80243698 /* DF251C 8024367C 00000000 */ nop +glabel L80243680_DF2520 /* DF2520 80243680 0C090A71 */ jal omo_17_UnkDurationCheck /* DF2524 80243684 0260202D */ daddu $a0, $s3, $zero /* DF2528 80243688 08090DA6 */ j .L80243698 /* DF252C 8024368C 00000000 */ nop +glabel L80243690_DF2530 /* DF2530 80243690 0C0129CF */ jal func_8004A73C /* DF2534 80243694 0260202D */ daddu $a0, $s3, $zero .L80243698: +glabel L80243698_DF2538 /* DF2538 80243698 8FBF0048 */ lw $ra, 0x48($sp) /* DF253C 8024369C 8FB50044 */ lw $s5, 0x44($sp) /* DF2540 802436A0 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_80240380_AACBB0.s b/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_80240380_AACBB0.s index f1b5bf337e..293ff21dec 100644 --- a/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_80240380_AACBB0.s +++ b/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_80240380_AACBB0.s @@ -37,12 +37,12 @@ glabel func_80240380_AACBB0 /* AACC2C 802403FC 12400007 */ beqz $s2, .L8024041C /* AACC30 80240400 3412FFFF */ ori $s2, $zero, 0xffff /* AACC34 80240404 08090123 */ j .L8024048C -/* AACC38 80240408 00000000 */ nop +/* AACC38 80240408 00000000 */ nop .L8024040C: /* AACC3C 8024040C 1242001B */ beq $s2, $v0, .L8024047C /* AACC40 80240410 24020002 */ addiu $v0, $zero, 2 /* AACC44 80240414 08090123 */ j .L8024048C -/* AACC48 80240418 00000000 */ nop +/* AACC48 80240418 00000000 */ nop .L8024041C: /* AACC4C 8024041C 8E040000 */ lw $a0, ($s0) /* AACC50 80240420 1092001A */ beq $a0, $s2, .L8024048C @@ -56,7 +56,7 @@ glabel func_80240380_AACBB0 /* AACC70 80240440 0C046F1F */ jal func_8011BC7C /* AACC74 80240444 0220302D */ daddu $a2, $s1, $zero /* AACC78 80240448 08090107 */ j .L8024041C -/* AACC7C 8024044C 00000000 */ nop +/* AACC7C 8024044C 00000000 */ nop .L80240450: /* AACC80 80240450 3412FFFF */ ori $s2, $zero, 0xffff .L80240454: @@ -69,7 +69,7 @@ glabel func_80240380_AACBB0 /* AACC9C 8024046C 0C046E54 */ jal func_8011B950 /* AACCA0 80240470 0000382D */ daddu $a3, $zero, $zero /* AACCA4 80240474 08090115 */ j .L80240454 -/* AACCA8 80240478 00000000 */ nop +/* AACCA8 80240478 00000000 */ nop .L8024047C: /* AACCAC 8024047C 3C028015 */ lui $v0, %hi(D_801512F0) /* AACCB0 80240480 8C4212F0 */ lw $v0, %lo(D_801512F0)($v0) diff --git a/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_802404A4_AACCD4.s b/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_802404A4_AACCD4.s index 92f361781f..901b5bc7ed 100644 --- a/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_802404A4_AACCD4.s +++ b/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_802404A4_AACCD4.s @@ -71,20 +71,20 @@ glabel func_802404A4_AACCD4 /* AACDDC 802405AC 12620008 */ beq $s3, $v0, .L802405D0 /* AACDE0 802405B0 32C400FF */ andi $a0, $s6, 0xff /* AACDE4 802405B4 08090191 */ j .L80240644 -/* AACDE8 802405B8 00000000 */ nop +/* AACDE8 802405B8 00000000 */ nop .L802405BC: /* AACDEC 802405BC 24020003 */ addiu $v0, $zero, 3 /* AACDF0 802405C0 12620018 */ beq $s3, $v0, .L80240624 /* AACDF4 802405C4 32C400FF */ andi $a0, $s6, 0xff /* AACDF8 802405C8 08090191 */ j .L80240644 -/* AACDFC 802405CC 00000000 */ nop +/* AACDFC 802405CC 00000000 */ nop .L802405D0: /* AACE00 802405D0 32A500FF */ andi $a1, $s5, 0xff /* AACE04 802405D4 328600FF */ andi $a2, $s4, 0xff /* AACE08 802405D8 0C046F97 */ jal set_background_color_blend /* AACE0C 802405DC 324700FF */ andi $a3, $s2, 0xff /* AACE10 802405E0 08090191 */ j .L80240644 -/* AACE14 802405E4 00000000 */ nop +/* AACE14 802405E4 00000000 */ nop .L802405E8: /* AACE18 802405E8 32C400FF */ andi $a0, $s6, 0xff /* AACE1C 802405EC 32A500FF */ andi $a1, $s5, 0xff @@ -100,7 +100,7 @@ glabel func_802404A4_AACCD4 /* AACE44 80240614 0C046FAD */ jal func_8011BEB4 /* AACE48 80240618 AFA20018 */ sw $v0, 0x18($sp) /* AACE4C 8024061C 08090191 */ j .L80240644 -/* AACE50 80240620 00000000 */ nop +/* AACE50 80240620 00000000 */ nop .L80240624: /* AACE54 80240624 32A500FF */ andi $a1, $s5, 0xff /* AACE58 80240628 328600FF */ andi $a2, $s4, 0xff diff --git a/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_802406E0_AACF10.s b/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_802406E0_AACF10.s index 6ad6f57409..59ab9c59e3 100644 --- a/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_802406E0_AACF10.s +++ b/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_802406E0_AACF10.s @@ -44,5 +44,5 @@ glabel func_802406E0_AACF10 /* AACFAC 8024077C 24020002 */ addiu $v0, $zero, 2 /* AACFB0 80240780 03E00008 */ jr $ra /* AACFB4 80240784 27BD0020 */ addiu $sp, $sp, 0x20 -/* AACFB8 80240788 00000000 */ nop -/* AACFBC 8024078C 00000000 */ nop +/* AACFB8 80240788 00000000 */ nop +/* AACFBC 8024078C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_osr/osr_01/AAFFF0/func_80240000_AAFFF0.s b/asm/nonmatchings/world/area_osr/osr_01/AAFFF0/func_80240000_AAFFF0.s index 6fc6b7812f..780919d30c 100644 --- a/asm/nonmatchings/world/area_osr/osr_01/AAFFF0/func_80240000_AAFFF0.s +++ b/asm/nonmatchings/world/area_osr/osr_01/AAFFF0/func_80240000_AAFFF0.s @@ -9,7 +9,7 @@ glabel func_80240000_AAFFF0 /* AB0000 80240010 8443008E */ lh $v1, 0x8e($v0) /* AB0004 80240014 24020003 */ addiu $v0, $zero, 3 /* AB0008 80240018 14620006 */ bne $v1, $v0, .L80240034 -/* AB000C 8024001C 00000000 */ nop +/* AB000C 8024001C 00000000 */ nop /* AB0010 80240020 3C04800E */ lui $a0, %hi(D_800D9668) /* AB0014 80240024 24849668 */ addiu $a0, $a0, %lo(D_800D9668) /* AB0018 80240028 3C058024 */ lui $a1, %hi(D_80242160) @@ -20,6 +20,6 @@ glabel func_80240000_AAFFF0 /* AB0028 80240038 0000102D */ daddu $v0, $zero, $zero /* AB002C 8024003C 03E00008 */ jr $ra /* AB0030 80240040 27BD0018 */ addiu $sp, $sp, 0x18 -/* AB0034 80240044 00000000 */ nop -/* AB0038 80240048 00000000 */ nop -/* AB003C 8024004C 00000000 */ nop +/* AB0034 80240044 00000000 */ nop +/* AB0038 80240048 00000000 */ nop +/* AB003C 8024004C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240360_AB0350.s b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240360_AB0350.s index b74b985084..3ef031e373 100644 --- a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240360_AB0350.s +++ b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240360_AB0350.s @@ -26,7 +26,7 @@ glabel func_80240360_AB0350 /* AB03A0 802403B0 1440FFFA */ bnez $v0, .L8024039C /* AB03A4 802403B4 24A50004 */ addiu $a1, $a1, 4 /* AB03A8 802403B8 080900FF */ j .L802403FC -/* AB03AC 802403BC 00000000 */ nop +/* AB03AC 802403BC 00000000 */ nop .L802403C0: /* AB03B0 802403C0 0000182D */ daddu $v1, $zero, $zero /* AB03B4 802403C4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240730_AB0720.s b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240730_AB0720.s index 29876148de..075e6e167b 100644 --- a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240730_AB0720.s +++ b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240730_AB0720.s @@ -28,7 +28,7 @@ glabel func_80240730_AB0720 /* AB0774 80240784 00220821 */ addu $at, $at, $v0 /* AB0778 80240788 AC202180 */ sw $zero, %lo(D_80242180)($at) /* AB077C 8024078C 080901EF */ j .L802407BC -/* AB0780 80240790 00000000 */ nop +/* AB0780 80240790 00000000 */ nop .L80240794: /* AB0784 80240794 3C038024 */ lui $v1, %hi(D_80242180) /* AB0788 80240798 24632180 */ addiu $v1, $v1, %lo(D_80242180) diff --git a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240A8C_AB0A7C.s b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240A8C_AB0A7C.s index ecd3dabefc..be3baecd3a 100644 --- a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240A8C_AB0A7C.s +++ b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240A8C_AB0A7C.s @@ -13,5 +13,5 @@ glabel func_80240A8C_AB0A7C /* AB0A9C 80240AAC 24020002 */ addiu $v0, $zero, 2 /* AB0AA0 80240AB0 03E00008 */ jr $ra /* AB0AA4 80240AB4 27BD0018 */ addiu $sp, $sp, 0x18 -/* AB0AA8 80240AB8 00000000 */ nop -/* AB0AAC 80240ABC 00000000 */ nop +/* AB0AA8 80240AB8 00000000 */ nop +/* AB0AAC 80240ABC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_osr/osr_02/AB2170/func_80240000_AB2170.s b/asm/nonmatchings/world/area_osr/osr_02/AB2170/func_80240000_AB2170.s index 663a80cdc7..0898ae7dad 100644 --- a/asm/nonmatchings/world/area_osr/osr_02/AB2170/func_80240000_AB2170.s +++ b/asm/nonmatchings/world/area_osr/osr_02/AB2170/func_80240000_AB2170.s @@ -8,5 +8,5 @@ glabel func_80240000_AB2170 /* AB217C 8024000C A0620084 */ sb $v0, 0x84($v1) /* AB2180 80240010 03E00008 */ jr $ra /* AB2184 80240014 0000102D */ daddu $v0, $zero, $zero -/* AB2188 80240018 00000000 */ nop -/* AB218C 8024001C 00000000 */ nop +/* AB2188 80240018 00000000 */ nop +/* AB218C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s b/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s index 661b45cb0c..f1260c4c64 100644 --- a/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s +++ b/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s @@ -10,11 +10,11 @@ glabel func_80240020_AB2190 /* AB21A4 80240034 8FBF0010 */ lw $ra, 0x10($sp) /* AB21A8 80240038 4600008D */ trunc.w.s $f2, $f0 /* AB21AC 8024003C 44021000 */ mfc1 $v0, $f2 -/* AB21B0 80240040 00000000 */ nop +/* AB21B0 80240040 00000000 */ nop /* AB21B4 80240044 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) /* AB21B8 80240048 A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) /* AB21BC 8024004C 24020002 */ addiu $v0, $zero, 2 /* AB21C0 80240050 03E00008 */ jr $ra /* AB21C4 80240054 27BD0018 */ addiu $sp, $sp, 0x18 -/* AB21C8 80240058 00000000 */ nop -/* AB21CC 8024005C 00000000 */ nop +/* AB21C8 80240058 00000000 */ nop +/* AB21CC 8024005C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_osr/osr_02/AB21D0/func_80240060_AB21D0.s b/asm/nonmatchings/world/area_osr/osr_02/AB21D0/func_80240060_AB21D0.s index d28a35dd1f..8e43002c94 100644 --- a/asm/nonmatchings/world/area_osr/osr_02/AB21D0/func_80240060_AB21D0.s +++ b/asm/nonmatchings/world/area_osr/osr_02/AB21D0/func_80240060_AB21D0.s @@ -28,14 +28,14 @@ glabel func_80240060_AB21D0 /* AB2228 802400B8 8E300078 */ lw $s0, 0x78($s1) /* AB222C 802400BC 3C013FC0 */ lui $at, 0x3fc0 /* AB2230 802400C0 44811000 */ mtc1 $at, $f2 -/* AB2234 802400C4 00000000 */ nop +/* AB2234 802400C4 00000000 */ nop /* AB2238 802400C8 46020002 */ mul.s $f0, $f0, $f2 -/* AB223C 802400CC 00000000 */ nop +/* AB223C 802400CC 00000000 */ nop /* AB2240 802400D0 3C014190 */ lui $at, 0x4190 /* AB2244 802400D4 44816000 */ mtc1 $at, $f12 /* AB2248 802400D8 4600010D */ trunc.w.s $f4, $f0 /* AB224C 802400DC 44022000 */ mfc1 $v0, $f4 -/* AB2250 802400E0 00000000 */ nop +/* AB2250 802400E0 00000000 */ nop /* AB2254 802400E4 A20200AB */ sb $v0, 0xab($s0) /* AB2258 802400E8 C6200074 */ lwc1 $f0, 0x74($s1) /* AB225C 802400EC 0C00A6C9 */ jal clamp_angle @@ -52,4 +52,4 @@ glabel func_80240060_AB21D0 /* AB2280 80240110 8FB00010 */ lw $s0, 0x10($sp) /* AB2284 80240114 03E00008 */ jr $ra /* AB2288 80240118 27BD0020 */ addiu $sp, $sp, 0x20 -/* AB228C 8024011C 00000000 */ nop +/* AB228C 8024011C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_osr/osr_02/AB2290/func_80240120_AB2290.s b/asm/nonmatchings/world/area_osr/osr_02/AB2290/func_80240120_AB2290.s index e2a05b2af3..c0636d8db8 100644 --- a/asm/nonmatchings/world/area_osr/osr_02/AB2290/func_80240120_AB2290.s +++ b/asm/nonmatchings/world/area_osr/osr_02/AB2290/func_80240120_AB2290.s @@ -13,4 +13,4 @@ glabel func_80240120_AB2290 /* AB22B0 80240140 24020002 */ addiu $v0, $zero, 2 /* AB22B4 80240144 03E00008 */ jr $ra /* AB22B8 80240148 27BD0018 */ addiu $sp, $sp, 0x18 -/* AB22BC 8024014C 00000000 */ nop +/* AB22BC 8024014C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_osr/osr_03/AB6290/func_80240000_AB6290.s b/asm/nonmatchings/world/area_osr/osr_03/AB6290/func_80240000_AB6290.s index c4d5e0d077..74c658032b 100644 --- a/asm/nonmatchings/world/area_osr/osr_03/AB6290/func_80240000_AB6290.s +++ b/asm/nonmatchings/world/area_osr/osr_03/AB6290/func_80240000_AB6290.s @@ -8,5 +8,5 @@ glabel func_80240000_AB6290 /* AB629C 8024000C A0620084 */ sb $v0, 0x84($v1) /* AB62A0 80240010 03E00008 */ jr $ra /* AB62A4 80240014 0000102D */ daddu $v0, $zero, $zero -/* AB62A8 80240018 00000000 */ nop -/* AB62AC 8024001C 00000000 */ nop +/* AB62A8 80240018 00000000 */ nop +/* AB62AC 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240020_AB62B0.s b/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240020_AB62B0.s index 2364053851..ab2d84a595 100644 --- a/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240020_AB62B0.s +++ b/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240020_AB62B0.s @@ -11,14 +11,14 @@ glabel func_80240020_AB62B0 /* AB62C8 80240038 0C0B1EAF */ jal get_variable /* AB62CC 8024003C 8E250000 */ lw $a1, ($s1) /* AB62D0 80240040 44826000 */ mtc1 $v0, $f12 -/* AB62D4 80240044 00000000 */ nop +/* AB62D4 80240044 00000000 */ nop /* AB62D8 80240048 0C00A8BB */ jal sin_deg /* AB62DC 8024004C 46806320 */ cvt.s.w $f12, $f12 /* AB62E0 80240050 3C0141A0 */ lui $at, 0x41a0 /* AB62E4 80240054 44811000 */ mtc1 $at, $f2 -/* AB62E8 80240058 00000000 */ nop +/* AB62E8 80240058 00000000 */ nop /* AB62EC 8024005C 46020002 */ mul.s $f0, $f0, $f2 -/* AB62F0 80240060 00000000 */ nop +/* AB62F0 80240060 00000000 */ nop /* AB62F4 80240064 8E250000 */ lw $a1, ($s1) /* AB62F8 80240068 4600010D */ trunc.w.s $f4, $f0 /* AB62FC 8024006C 44062000 */ mfc1 $a2, $f4 diff --git a/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_802400C4_AB6354.s b/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_802400C4_AB6354.s index 71a9716676..cd72cf23ed 100644 --- a/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_802400C4_AB6354.s +++ b/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_802400C4_AB6354.s @@ -25,7 +25,7 @@ glabel func_802400C4_AB6354 /* AB63A4 80240114 0C00A8BB */ jal sin_deg /* AB63A8 80240118 46146300 */ add.s $f12, $f12, $f20 /* AB63AC 8024011C 46160002 */ mul.s $f0, $f0, $f22 -/* AB63B0 80240120 00000000 */ nop +/* AB63B0 80240120 00000000 */ nop /* AB63B4 80240124 C6020038 */ lwc1 $f2, 0x38($s0) /* AB63B8 80240128 46001080 */ add.s $f2, $f2, $f0 /* AB63BC 8024012C 4600110D */ trunc.w.s $f4, $f2 @@ -33,7 +33,7 @@ glabel func_802400C4_AB6354 /* AB63C4 80240134 C600003C */ lwc1 $f0, 0x3c($s0) /* AB63C8 80240138 3C014190 */ lui $at, 0x4190 /* AB63CC 8024013C 44811000 */ mtc1 $at, $f2 -/* AB63D0 80240140 00000000 */ nop +/* AB63D0 80240140 00000000 */ nop /* AB63D4 80240144 46020000 */ add.s $f0, $f0, $f2 /* AB63D8 80240148 4600010D */ trunc.w.s $f4, $f0 /* AB63DC 8024014C E6240088 */ swc1 $f4, 0x88($s1) @@ -43,7 +43,7 @@ glabel func_802400C4_AB6354 /* AB63EC 8024015C 0C00A8D4 */ jal cos_deg /* AB63F0 80240160 46146300 */ add.s $f12, $f12, $f20 /* AB63F4 80240164 46160002 */ mul.s $f0, $f0, $f22 -/* AB63F8 80240168 00000000 */ nop +/* AB63F8 80240168 00000000 */ nop /* AB63FC 8024016C C6020040 */ lwc1 $f2, 0x40($s0) /* AB6400 80240170 46001081 */ sub.s $f2, $f2, $f0 /* AB6404 80240174 4600110D */ trunc.w.s $f4, $f2 diff --git a/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_802401A0_AB6430.s b/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_802401A0_AB6430.s index ec3bc058c7..a762eeeb53 100644 --- a/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_802401A0_AB6430.s +++ b/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_802401A0_AB6430.s @@ -16,7 +16,7 @@ glabel func_802401A0_AB6430 /* AB6458 802401C8 1062001A */ beq $v1, $v0, .L80240234 /* AB645C 802401CC 0000102D */ daddu $v0, $zero, $zero /* AB6460 802401D0 080900A0 */ j .L80240280 -/* AB6464 802401D4 00000000 */ nop +/* AB6464 802401D4 00000000 */ nop .L802401D8: /* AB6468 802401D8 0000202D */ daddu $a0, $zero, $zero /* AB646C 802401DC 240500D0 */ addiu $a1, $zero, 0xd0 diff --git a/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240290_AB6520.s b/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240290_AB6520.s index 03bab18d20..6353b7087d 100644 --- a/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240290_AB6520.s +++ b/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240290_AB6520.s @@ -19,9 +19,9 @@ glabel func_80240290_AB6520 /* AB6558 802402C8 46000000 */ add.s $f0, $f0, $f0 /* AB655C 802402CC 3C014120 */ lui $at, 0x4120 /* AB6560 802402D0 44812000 */ mtc1 $at, $f4 -/* AB6564 802402D4 00000000 */ nop +/* AB6564 802402D4 00000000 */ nop /* AB6568 802402D8 4600203C */ c.lt.s $f4, $f0 -/* AB656C 802402DC 00000000 */ nop +/* AB656C 802402DC 00000000 */ nop /* AB6570 802402E0 45000002 */ bc1f .L802402EC /* AB6574 802402E4 AE300070 */ sw $s0, 0x70($s1) /* AB6578 802402E8 46002006 */ mov.s $f0, $f4 @@ -30,12 +30,12 @@ glabel func_80240290_AB6520 /* AB6580 802402F0 44811000 */ mtc1 $at, $f2 /* AB6584 802402F4 46040003 */ div.s $f0, $f0, $f4 /* AB6588 802402F8 46020002 */ mul.s $f0, $f0, $f2 -/* AB658C 802402FC 00000000 */ nop +/* AB658C 802402FC 00000000 */ nop /* AB6590 80240300 3C014F00 */ lui $at, 0x4f00 /* AB6594 80240304 44811000 */ mtc1 $at, $f2 -/* AB6598 80240308 00000000 */ nop +/* AB6598 80240308 00000000 */ nop /* AB659C 8024030C 4600103E */ c.le.s $f2, $f0 -/* AB65A0 80240310 00000000 */ nop +/* AB65A0 80240310 00000000 */ nop /* AB65A4 80240314 45030005 */ bc1tl .L8024032C /* AB65A8 80240318 46020001 */ sub.s $f0, $f0, $f2 /* AB65AC 8024031C 4600018D */ trunc.w.s $f6, $f0 @@ -46,7 +46,7 @@ glabel func_80240290_AB6520 /* AB65BC 8024032C 3C028000 */ lui $v0, 0x8000 /* AB65C0 80240330 4600018D */ trunc.w.s $f6, $f0 /* AB65C4 80240334 44043000 */ mfc1 $a0, $f6 -/* AB65C8 80240338 00000000 */ nop +/* AB65C8 80240338 00000000 */ nop /* AB65CC 8024033C 00822025 */ or $a0, $a0, $v0 /* AB65D0 80240340 308400FF */ andi $a0, $a0, 0xff .L80240344: @@ -63,6 +63,6 @@ glabel func_80240290_AB6520 /* AB65F8 80240368 2C620001 */ sltiu $v0, $v1, 1 /* AB65FC 8024036C 03E00008 */ jr $ra /* AB6600 80240370 27BD0020 */ addiu $sp, $sp, 0x20 -/* AB6604 80240374 00000000 */ nop -/* AB6608 80240378 00000000 */ nop -/* AB660C 8024037C 00000000 */ nop +/* AB6604 80240374 00000000 */ nop +/* AB6608 80240378 00000000 */ nop +/* AB660C 8024037C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_osr/osr_04/AB92B0/func_80240050_AB9300.s b/asm/nonmatchings/world/area_osr/osr_04/AB92B0/func_80240050_AB9300.s index 7248db451f..76c20f7b0d 100644 --- a/asm/nonmatchings/world/area_osr/osr_04/AB92B0/func_80240050_AB9300.s +++ b/asm/nonmatchings/world/area_osr/osr_04/AB92B0/func_80240050_AB9300.s @@ -11,14 +11,14 @@ glabel func_80240050_AB9300 /* AB9318 80240068 0C0B1EAF */ jal get_variable /* AB931C 8024006C 8E250000 */ lw $a1, ($s1) /* AB9320 80240070 44826000 */ mtc1 $v0, $f12 -/* AB9324 80240074 00000000 */ nop +/* AB9324 80240074 00000000 */ nop /* AB9328 80240078 0C00A8BB */ jal sin_deg /* AB932C 8024007C 46806320 */ cvt.s.w $f12, $f12 /* AB9330 80240080 3C0141A0 */ lui $at, 0x41a0 /* AB9334 80240084 44811000 */ mtc1 $at, $f2 -/* AB9338 80240088 00000000 */ nop +/* AB9338 80240088 00000000 */ nop /* AB933C 8024008C 46020002 */ mul.s $f0, $f0, $f2 -/* AB9340 80240090 00000000 */ nop +/* AB9340 80240090 00000000 */ nop /* AB9344 80240094 8E250000 */ lw $a1, ($s1) /* AB9348 80240098 4600010D */ trunc.w.s $f4, $f0 /* AB934C 8024009C 44062000 */ mfc1 $a2, $f4 diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240054_D4D094.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240054_D4D094.s index 6f35538c19..5758d200b1 100644 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240054_D4D094.s +++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240054_D4D094.s @@ -40,7 +40,7 @@ glabel func_80240054_D4D094 /* D4D110 802400D0 1440FFF7 */ bnez $v0, .L802400B0 /* D4D114 802400D4 24820001 */ addiu $v0, $a0, 1 /* D4D118 802400D8 03E00008 */ jr $ra -/* D4D11C 802400DC 00000000 */ nop +/* D4D11C 802400DC 00000000 */ nop .L802400E0: /* D4D120 802400E0 3C020100 */ lui $v0, 0x100 .L802400E4: diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s index 7f2846e7c3..4258e360e0 100644 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s +++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s @@ -16,7 +16,7 @@ glabel func_80240128_D4D168 /* D4D194 80240154 27B20020 */ addiu $s2, $sp, 0x20 /* D4D198 80240158 8E0400CC */ lw $a0, 0xcc($s0) /* D4D19C 8024015C 0C044181 */ jal get_shadow_by_index -/* D4D1A0 80240160 00000000 */ nop +/* D4D1A0 80240160 00000000 */ nop /* D4D1A4 80240164 0C048B77 */ jal func_80122DDC /* D4D1A8 80240168 84440008 */ lh $a0, 8($v0) /* D4D1AC 8024016C 8C430000 */ lw $v1, ($v0) @@ -38,22 +38,22 @@ glabel func_80240128_D4D168 /* D4D1EC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D4D1F0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) /* D4D1F4 802401B4 0C090008 */ jal pra_01_UnkFunc2 -/* D4D1F8 802401B8 00000000 */ nop +/* D4D1F8 802401B8 00000000 */ nop /* D4D1FC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D4D200 802401C0 3C014307 */ lui $at, 0x4307 /* D4D204 802401C4 44810000 */ mtc1 $at, $f0 -/* D4D208 802401C8 00000000 */ nop +/* D4D208 802401C8 00000000 */ nop /* D4D20C 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D4D210 802401D0 00000000 */ nop +/* D4D210 802401D0 00000000 */ nop /* D4D214 802401D4 4500000B */ bc1f .L80240204 /* D4D218 802401D8 24040002 */ addiu $a0, $zero, 2 /* D4D21C 802401DC 3C014361 */ lui $at, 0x4361 /* D4D220 802401E0 44810000 */ mtc1 $at, $f0 -/* D4D224 802401E4 00000000 */ nop +/* D4D224 802401E4 00000000 */ nop /* D4D228 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D4D22C 802401EC 00000000 */ nop +/* D4D22C 802401EC 00000000 */ nop /* D4D230 802401F0 45000004 */ bc1f .L80240204 -/* D4D234 802401F4 00000000 */ nop +/* D4D234 802401F4 00000000 */ nop /* D4D238 802401F8 0C090015 */ jal func_80240054_D4D094 /* D4D23C 802401FC 0040202D */ daddu $a0, $v0, $zero /* D4D240 80240200 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240128_D4D168 /* D4D2C8 80240288 AFA0001C */ sw $zero, 0x1c($sp) .L8024028C: /* D4D2CC 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D4D2D0 80240290 00000000 */ nop +/* D4D2D0 80240290 00000000 */ nop .L80240294: /* D4D2D4 80240294 9202000E */ lbu $v0, 0xe($s0) /* D4D2D8 80240298 3C01802E */ lui $at, %hi(D_802D9D70) diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802402F0_D4D330.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802402F0_D4D330.s index bf0f47449e..67df0828ab 100644 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802402F0_D4D330.s +++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802402F0_D4D330.s @@ -33,7 +33,7 @@ glabel func_802402F0_D4D330 /* D4D3A0 80240360 E7B40010 */ swc1 $f20, 0x10($sp) /* D4D3A4 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) /* D4D3A8 80240368 0C00A6C9 */ jal clamp_angle -/* D4D3AC 8024036C 00000000 */ nop +/* D4D3AC 8024036C 00000000 */ nop /* D4D3B0 80240370 44050000 */ mfc1 $a1, $f0 /* D4D3B4 80240374 4406A000 */ mfc1 $a2, $f20 /* D4D3B8 80240378 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_8024049C_D4D4DC.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_8024049C_D4D4DC.s index fb5132c5b7..8aa8d71569 100644 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_8024049C_D4D4DC.s +++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_8024049C_D4D4DC.s @@ -10,7 +10,7 @@ glabel func_8024049C_D4D4DC /* D4D4F0 802404B0 0440000E */ bltz $v0, .L802404EC /* D4D4F4 802404B4 28420002 */ slti $v0, $v0, 2 /* D4D4F8 802404B8 1040000C */ beqz $v0, .L802404EC -/* D4D4FC 802404BC 00000000 */ nop +/* D4D4FC 802404BC 00000000 */ nop /* D4D500 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D4D540) /* D4D504 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D4D540) /* D4D508 802404C8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240500_D4D540.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240500_D4D540.s index 10e46123bf..44aea0f591 100644 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240500_D4D540.s +++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240500_D4D540.s @@ -16,7 +16,7 @@ glabel func_80240500_D4D540 /* D4D56C 8024052C 27B10020 */ addiu $s1, $sp, 0x20 /* D4D570 80240530 8E0400CC */ lw $a0, 0xcc($s0) /* D4D574 80240534 0C044181 */ jal get_shadow_by_index -/* D4D578 80240538 00000000 */ nop +/* D4D578 80240538 00000000 */ nop /* D4D57C 8024053C 0C048B77 */ jal func_80122DDC /* D4D580 80240540 84440008 */ lh $a0, 8($v0) /* D4D584 80240544 8E050028 */ lw $a1, 0x28($s0) @@ -33,7 +33,7 @@ glabel func_80240500_D4D540 /* D4D5B0 80240570 46000007 */ neg.s $f0, $f0 /* D4D5B4 80240574 44060000 */ mfc1 $a2, $f0 /* D4D5B8 80240578 0C00B94E */ jal get_screen_coords -/* D4D5BC 8024057C 00000000 */ nop +/* D4D5BC 8024057C 00000000 */ nop /* D4D5C0 80240580 8E0500A4 */ lw $a1, 0xa4($s0) /* D4D5C4 80240584 3C063F80 */ lui $a2, 0x3f80 /* D4D5C8 80240588 0C0B76A3 */ jal func_802DDA8C @@ -72,13 +72,13 @@ glabel func_80240500_D4D540 /* D4D648 80240608 AFA0001C */ sw $zero, 0x1c($sp) .L8024060C: /* D4D64C 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D4D650 80240610 00000000 */ nop +/* D4D650 80240610 00000000 */ nop .L80240614: /* D4D654 80240614 9202000E */ lbu $v0, 0xe($s0) /* D4D658 80240618 3C01802E */ lui $at, %hi(D_802D9D71) /* D4D65C 8024061C A0229D71 */ sb $v0, %lo(D_802D9D71)($at) /* D4D660 80240620 0809018C */ j .L80240630 -/* D4D664 80240624 00000000 */ nop +/* D4D664 80240624 00000000 */ nop .L80240628: /* D4D668 80240628 3C01802E */ lui $at, %hi(D_802D9D71) /* D4D66C 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_8024068C_D4D6CC.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_8024068C_D4D6CC.s index 0e8bb8d999..02ff8956ff 100644 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_8024068C_D4D6CC.s +++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_8024068C_D4D6CC.s @@ -33,7 +33,7 @@ glabel func_8024068C_D4D6CC /* D4D73C 802406FC E7B40010 */ swc1 $f20, 0x10($sp) /* D4D740 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) /* D4D744 80240704 0C00A6C9 */ jal clamp_angle -/* D4D748 80240708 00000000 */ nop +/* D4D748 80240708 00000000 */ nop /* D4D74C 8024070C 44050000 */ mfc1 $a1, $f0 /* D4D750 80240710 4406A000 */ mfc1 $a2, $f20 /* D4D754 80240714 4407A000 */ mfc1 $a3, $f20 @@ -95,16 +95,16 @@ glabel func_8024068C_D4D6CC /* D4D834 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D4D838 802407F8 3C0142B4 */ lui $at, 0x42b4 /* D4D83C 802407FC 44810000 */ mtc1 $at, $f0 -/* D4D840 80240800 00000000 */ nop +/* D4D840 80240800 00000000 */ nop /* D4D844 80240804 4602003E */ c.le.s $f0, $f2 -/* D4D848 80240808 00000000 */ nop +/* D4D848 80240808 00000000 */ nop /* D4D84C 8024080C 4500000A */ bc1f .L80240838 /* D4D850 80240810 24040001 */ addiu $a0, $zero, 1 /* D4D854 80240814 3C014387 */ lui $at, 0x4387 /* D4D858 80240818 44810000 */ mtc1 $at, $f0 -/* D4D85C 8024081C 00000000 */ nop +/* D4D85C 8024081C 00000000 */ nop /* D4D860 80240820 4600103C */ c.lt.s $f2, $f0 -/* D4D864 80240824 00000000 */ nop +/* D4D864 80240824 00000000 */ nop /* D4D868 80240828 45000004 */ bc1f .L8024083C /* D4D86C 8024082C 27A20018 */ addiu $v0, $sp, 0x18 /* D4D870 80240830 3C041000 */ lui $a0, 0x1000 diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240870_D4D8B0.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240870_D4D8B0.s index 5da863cc33..bd04e0346b 100644 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240870_D4D8B0.s +++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240870_D4D8B0.s @@ -43,36 +43,36 @@ glabel func_80240870_D4D8B0 /* D4D944 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D4D948 80240908 3C0142B4 */ lui $at, 0x42b4 /* D4D94C 8024090C 44810000 */ mtc1 $at, $f0 -/* D4D950 80240910 00000000 */ nop +/* D4D950 80240910 00000000 */ nop /* D4D954 80240914 4602003C */ c.lt.s $f0, $f2 -/* D4D958 80240918 00000000 */ nop +/* D4D958 80240918 00000000 */ nop /* D4D95C 8024091C 4500000A */ bc1f .L80240948 -/* D4D960 80240920 00000000 */ nop +/* D4D960 80240920 00000000 */ nop /* D4D964 80240924 3C014334 */ lui $at, 0x4334 /* D4D968 80240928 44812000 */ mtc1 $at, $f4 -/* D4D96C 8024092C 00000000 */ nop +/* D4D96C 8024092C 00000000 */ nop /* D4D970 80240930 4604103E */ c.le.s $f2, $f4 -/* D4D974 80240934 00000000 */ nop +/* D4D974 80240934 00000000 */ nop /* D4D978 80240938 45000003 */ bc1f .L80240948 -/* D4D97C 8024093C 00000000 */ nop +/* D4D97C 8024093C 00000000 */ nop /* D4D980 80240940 08090276 */ j .L802409D8 /* D4D984 80240944 46022501 */ sub.s $f20, $f4, $f2 .L80240948: /* D4D988 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) /* D4D98C 8024094C 3C014334 */ lui $at, 0x4334 /* D4D990 80240950 44812000 */ mtc1 $at, $f4 -/* D4D994 80240954 00000000 */ nop +/* D4D994 80240954 00000000 */ nop /* D4D998 80240958 4600203C */ c.lt.s $f4, $f0 -/* D4D99C 8024095C 00000000 */ nop +/* D4D99C 8024095C 00000000 */ nop /* D4D9A0 80240960 4500000C */ bc1f .L80240994 -/* D4D9A4 80240964 00000000 */ nop +/* D4D9A4 80240964 00000000 */ nop /* D4D9A8 80240968 3C014387 */ lui $at, 0x4387 /* D4D9AC 8024096C 44812000 */ mtc1 $at, $f4 -/* D4D9B0 80240970 00000000 */ nop +/* D4D9B0 80240970 00000000 */ nop /* D4D9B4 80240974 4604003E */ c.le.s $f0, $f4 -/* D4D9B8 80240978 00000000 */ nop +/* D4D9B8 80240978 00000000 */ nop /* D4D9BC 8024097C 45000008 */ bc1f .L802409A0 -/* D4D9C0 80240980 00000000 */ nop +/* D4D9C0 80240980 00000000 */ nop /* D4D9C4 80240984 3C014334 */ lui $at, 0x4334 /* D4D9C8 80240988 44812000 */ mtc1 $at, $f4 /* D4D9CC 8024098C 08090276 */ j .L802409D8 @@ -80,19 +80,19 @@ glabel func_80240870_D4D8B0 .L80240994: /* D4D9D4 80240994 3C014387 */ lui $at, 0x4387 /* D4D9D8 80240998 44812000 */ mtc1 $at, $f4 -/* D4D9DC 8024099C 00000000 */ nop +/* D4D9DC 8024099C 00000000 */ nop .L802409A0: /* D4D9E0 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D4D9E4 802409A4 00000000 */ nop +/* D4D9E4 802409A4 00000000 */ nop /* D4D9E8 802409A8 4500000A */ bc1f .L802409D4 -/* D4D9EC 802409AC 00000000 */ nop +/* D4D9EC 802409AC 00000000 */ nop /* D4D9F0 802409B0 3C0143B4 */ lui $at, 0x43b4 /* D4D9F4 802409B4 44811000 */ mtc1 $at, $f2 -/* D4D9F8 802409B8 00000000 */ nop +/* D4D9F8 802409B8 00000000 */ nop /* D4D9FC 802409BC 4602003E */ c.le.s $f0, $f2 -/* D4DA00 802409C0 00000000 */ nop +/* D4DA00 802409C0 00000000 */ nop /* D4DA04 802409C4 45000003 */ bc1f .L802409D4 -/* D4DA08 802409C8 00000000 */ nop +/* D4DA08 802409C8 00000000 */ nop /* D4DA0C 802409CC 08090276 */ j .L802409D8 /* D4DA10 802409D0 46001501 */ sub.s $f20, $f2, $f0 .L802409D4: @@ -100,11 +100,11 @@ glabel func_80240870_D4D8B0 .L802409D8: /* D4DA18 802409D8 3C0141C8 */ lui $at, 0x41c8 /* D4DA1C 802409DC 44810000 */ mtc1 $at, $f0 -/* D4DA20 802409E0 00000000 */ nop +/* D4DA20 802409E0 00000000 */ nop /* D4DA24 802409E4 4600A003 */ div.s $f0, $f20, $f0 /* D4DA28 802409E8 4600010D */ trunc.w.s $f4, $f0 /* D4DA2C 802409EC 44072000 */ mfc1 $a3, $f4 -/* D4DA30 802409F0 00000000 */ nop +/* D4DA30 802409F0 00000000 */ nop /* D4DA34 802409F4 00071100 */ sll $v0, $a3, 4 /* D4DA38 802409F8 00471023 */ subu $v0, $v0, $a3 /* D4DA3C 802409FC 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel func_80240870_D4D8B0 /* D4DA84 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) /* D4DA88 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) /* D4DA8C 80240A4C 0C00A6C9 */ jal clamp_angle -/* D4DA90 80240A50 00000000 */ nop +/* D4DA90 80240A50 00000000 */ nop /* D4DA94 80240A54 44050000 */ mfc1 $a1, $f0 /* D4DA98 80240A58 4406B000 */ mfc1 $a2, $f22 /* D4DA9C 80240A5C 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel func_80240870_D4D8B0 /* D4DB00 80240AC0 24040001 */ addiu $a0, $zero, 1 .L80240AC4: /* D4DB04 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D4DB08 80240AC8 00000000 */ nop +/* D4DB08 80240AC8 00000000 */ nop /* D4DB0C 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 /* D4DB10 80240AD0 24040001 */ addiu $a0, $zero, 1 .L80240AD4: @@ -204,10 +204,10 @@ glabel func_80240870_D4D8B0 /* D4DBA0 80240B60 44812000 */ mtc1 $at, $f4 /* D4DBA4 80240B64 00021023 */ negu $v0, $v0 /* D4DBA8 80240B68 44820000 */ mtc1 $v0, $f0 -/* D4DBAC 80240B6C 00000000 */ nop +/* D4DBAC 80240B6C 00000000 */ nop /* D4DBB0 80240B70 46800020 */ cvt.s.w $f0, $f0 /* D4DBB4 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D4DBB8 80240B78 00000000 */ nop +/* D4DBB8 80240B78 00000000 */ nop /* D4DBBC 80240B7C 4405B000 */ mfc1 $a1, $f22 /* D4DBC0 80240B80 4407B000 */ mfc1 $a3, $f22 /* D4DBC4 80240B84 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel func_80240870_D4D8B0 /* D4DC34 80240BF4 3C013F00 */ lui $at, 0x3f00 /* D4DC38 80240BF8 44812000 */ mtc1 $at, $f4 /* D4DC3C 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D4DC40 80240C00 00000000 */ nop +/* D4DC40 80240C00 00000000 */ nop /* D4DC44 80240C04 46800020 */ cvt.s.w $f0, $f0 /* D4DC48 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D4DC4C 80240C0C 00000000 */ nop +/* D4DC4C 80240C0C 00000000 */ nop /* D4DC50 80240C10 4405B000 */ mfc1 $a1, $f22 /* D4DC54 80240C14 4407B000 */ mfc1 $a3, $f22 /* D4DC58 80240C18 44062000 */ mfc1 $a2, $f4 @@ -280,16 +280,16 @@ glabel func_80240870_D4D8B0 /* D4DCD0 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D4DCD4 80240C94 3C0142B4 */ lui $at, 0x42b4 /* D4DCD8 80240C98 44810000 */ mtc1 $at, $f0 -/* D4DCDC 80240C9C 00000000 */ nop +/* D4DCDC 80240C9C 00000000 */ nop /* D4DCE0 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D4DCE4 80240CA4 00000000 */ nop +/* D4DCE4 80240CA4 00000000 */ nop /* D4DCE8 80240CA8 4500000A */ bc1f .L80240CD4 /* D4DCEC 80240CAC 24040001 */ addiu $a0, $zero, 1 /* D4DCF0 80240CB0 3C014387 */ lui $at, 0x4387 /* D4DCF4 80240CB4 44812000 */ mtc1 $at, $f4 -/* D4DCF8 80240CB8 00000000 */ nop +/* D4DCF8 80240CB8 00000000 */ nop /* D4DCFC 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D4DD00 80240CC0 00000000 */ nop +/* D4DD00 80240CC0 00000000 */ nop /* D4DD04 80240CC4 45000004 */ bc1f .L80240CD8 /* D4DD08 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 /* D4DD0C 80240CCC 3C041000 */ lui $a0, 0x1000 @@ -305,7 +305,7 @@ glabel func_80240870_D4D8B0 /* D4DD2C 80240CEC 26730001 */ addiu $s3, $s3, 1 /* D4DD30 80240CF0 2A620002 */ slti $v0, $s3, 2 /* D4DD34 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D4DD38 80240CF8 00000000 */ nop +/* D4DD38 80240CF8 00000000 */ nop /* D4DD3C 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) /* D4DD40 80240D00 8FB60148 */ lw $s6, 0x148($sp) /* D4DD44 80240D04 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240D3C_D4DD7C.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240D3C_D4DD7C.s index 1aaeefb09f..2932a37337 100644 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240D3C_D4DD7C.s +++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240D3C_D4DD7C.s @@ -11,36 +11,36 @@ glabel func_80240D3C_D4DD7C /* D4DD94 80240D54 24020001 */ addiu $v0, $zero, 1 /* D4DD98 80240D58 8E030084 */ lw $v1, 0x84($s0) /* D4DD9C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D4DDA0 80240D60 00000000 */ nop +/* D4DDA0 80240D60 00000000 */ nop /* D4DDA4 80240D64 28620002 */ slti $v0, $v1, 2 /* D4DDA8 80240D68 50400005 */ beql $v0, $zero, .L80240D80 /* D4DDAC 80240D6C 24020002 */ addiu $v0, $zero, 2 /* D4DDB0 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D4DDB4 80240D74 00000000 */ nop +/* D4DDB4 80240D74 00000000 */ nop /* D4DDB8 80240D78 08090378 */ j .L80240DE0 -/* D4DDBC 80240D7C 00000000 */ nop +/* D4DDBC 80240D7C 00000000 */ nop .L80240D80: /* D4DDC0 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D4DDC4 80240D84 00000000 */ nop +/* D4DDC4 80240D84 00000000 */ nop /* D4DDC8 80240D88 08090378 */ j .L80240DE0 -/* D4DDCC 80240D8C 00000000 */ nop +/* D4DDCC 80240D8C 00000000 */ nop .L80240D90: /* D4DDD0 80240D90 3C048024 */ lui $a0, %hi(pra_01_SetPartnerFlagsA0000) /* D4DDD4 80240D94 24840E84 */ addiu $a0, $a0, %lo(pra_01_SetPartnerFlagsA0000) /* D4DDD8 80240D98 08090374 */ j .L80240DD0 -/* D4DDDC 80240D9C 00000000 */ nop +/* D4DDDC 80240D9C 00000000 */ nop .L80240DA0: /* D4DDE0 80240DA0 3C048024 */ lui $a0, %hi(pra_01_SetPartnerFlags20000) /* D4DDE4 80240DA4 24840EEC */ addiu $a0, $a0, %lo(pra_01_SetPartnerFlags20000) /* D4DDE8 80240DA8 08090374 */ j .L80240DD0 -/* D4DDEC 80240DAC 00000000 */ nop +/* D4DDEC 80240DAC 00000000 */ nop .L80240DB0: /* D4DDF0 80240DB0 8E020084 */ lw $v0, 0x84($s0) /* D4DDF4 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D4DDF8 80240DB8 00000000 */ nop +/* D4DDF8 80240DB8 00000000 */ nop /* D4DDFC 80240DBC 28420002 */ slti $v0, $v0, 2 /* D4DE00 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D4DE04 80240DC4 00000000 */ nop +/* D4DE04 80240DC4 00000000 */ nop .L80240DC8: /* D4DE08 80240DC8 3C048024 */ lui $a0, %hi(pra_01_SetPartnerFlags80000) /* D4DE0C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(pra_01_SetPartnerFlags80000) @@ -64,14 +64,14 @@ glabel func_80240D3C_D4DD7C /* D4DE4C 80240E0C 10400005 */ beqz $v0, .L80240E24 /* D4DE50 80240E10 24020002 */ addiu $v0, $zero, 2 /* D4DE54 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D4DE58 80240E18 00000000 */ nop +/* D4DE58 80240E18 00000000 */ nop /* D4DE5C 80240E1C 0809039D */ j .L80240E74 -/* D4DE60 80240E20 00000000 */ nop +/* D4DE60 80240E20 00000000 */ nop .L80240E24: /* D4DE64 80240E24 10820006 */ beq $a0, $v0, .L80240E40 /* D4DE68 80240E28 24020002 */ addiu $v0, $zero, 2 /* D4DE6C 80240E2C 0809039D */ j .L80240E74 -/* D4DE70 80240E30 00000000 */ nop +/* D4DE70 80240E30 00000000 */ nop .L80240E34: /* D4DE74 80240E34 8CA20000 */ lw $v0, ($a1) /* D4DE78 80240E38 0809039A */ j .L80240E68 diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240F20_D4DF60.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240F20_D4DF60.s index 4f001ffbba..46a6c1498c 100644 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240F20_D4DF60.s +++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240F20_D4DF60.s @@ -13,7 +13,7 @@ glabel func_80240F20_D4DF60 /* D4DF80 80240F40 0C046EE2 */ jal set_world_fog_color /* D4DF84 80240F44 240700FF */ addiu $a3, $zero, 0xff /* D4DF88 80240F48 0C046ED4 */ jal enable_world_fog -/* D4DF8C 80240F4C 00000000 */ nop +/* D4DF8C 80240F4C 00000000 */ nop /* D4DF90 80240F50 8FBF0010 */ lw $ra, 0x10($sp) /* D4DF94 80240F54 24020002 */ addiu $v0, $zero, 2 /* D4DF98 80240F58 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241238_D4E278.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241238_D4E278.s index a5983fe3a4..0db4adb155 100644 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241238_D4E278.s +++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241238_D4E278.s @@ -28,7 +28,7 @@ glabel func_80241238_D4E278 /* D4E2CC 8024128C 00220821 */ addu $at, $at, $v0 /* D4E2D0 80241290 AC202FB0 */ sw $zero, %lo(D_80242FB0)($at) /* D4E2D4 80241294 080904B1 */ j .L802412C4 -/* D4E2D8 80241298 00000000 */ nop +/* D4E2D8 80241298 00000000 */ nop .L8024129C: /* D4E2DC 8024129C 3C038024 */ lui $v1, %hi(D_80242FB0) /* D4E2E0 802412A0 24632FB0 */ addiu $v1, $v1, %lo(D_80242FB0) diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802412D4_D4E314.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802412D4_D4E314.s index ebaf697d03..77857f1d58 100644 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802412D4_D4E314.s +++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802412D4_D4E314.s @@ -28,7 +28,7 @@ glabel func_802412D4_D4E314 /* D4E368 80241328 00220821 */ addu $at, $at, $v0 /* D4E36C 8024132C AC203178 */ sw $zero, %lo(D_80243178)($at) /* D4E370 80241330 080904D8 */ j .L80241360 -/* D4E374 80241334 00000000 */ nop +/* D4E374 80241334 00000000 */ nop .L80241338: /* D4E378 80241338 3C038024 */ lui $v1, %hi(D_80243178) /* D4E37C 8024133C 24633178 */ addiu $v1, $v1, %lo(D_80243178) diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240054_D50044.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240054_D50044.s index de3a5b073d..82f22300a2 100644 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240054_D50044.s +++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240054_D50044.s @@ -40,7 +40,7 @@ glabel func_80240054_D50044 /* D500C0 802400D0 1440FFF7 */ bnez $v0, .L802400B0 /* D500C4 802400D4 24820001 */ addiu $v0, $a0, 1 /* D500C8 802400D8 03E00008 */ jr $ra -/* D500CC 802400DC 00000000 */ nop +/* D500CC 802400DC 00000000 */ nop .L802400E0: /* D500D0 802400E0 3C020100 */ lui $v0, 0x100 .L802400E4: diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s index 6c7d3c5e40..5541a169eb 100644 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s +++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s @@ -16,7 +16,7 @@ glabel func_80240128_D50118 /* D50144 80240154 27B20020 */ addiu $s2, $sp, 0x20 /* D50148 80240158 8E0400CC */ lw $a0, 0xcc($s0) /* D5014C 8024015C 0C044181 */ jal get_shadow_by_index -/* D50150 80240160 00000000 */ nop +/* D50150 80240160 00000000 */ nop /* D50154 80240164 0C048B77 */ jal func_80122DDC /* D50158 80240168 84440008 */ lh $a0, 8($v0) /* D5015C 8024016C 8C430000 */ lw $v1, ($v0) @@ -38,22 +38,22 @@ glabel func_80240128_D50118 /* D5019C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D501A0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) /* D501A4 802401B4 0C090008 */ jal pra_02_UnkFunc2 -/* D501A8 802401B8 00000000 */ nop +/* D501A8 802401B8 00000000 */ nop /* D501AC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D501B0 802401C0 3C014307 */ lui $at, 0x4307 /* D501B4 802401C4 44810000 */ mtc1 $at, $f0 -/* D501B8 802401C8 00000000 */ nop +/* D501B8 802401C8 00000000 */ nop /* D501BC 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D501C0 802401D0 00000000 */ nop +/* D501C0 802401D0 00000000 */ nop /* D501C4 802401D4 4500000B */ bc1f .L80240204 /* D501C8 802401D8 24040002 */ addiu $a0, $zero, 2 /* D501CC 802401DC 3C014361 */ lui $at, 0x4361 /* D501D0 802401E0 44810000 */ mtc1 $at, $f0 -/* D501D4 802401E4 00000000 */ nop +/* D501D4 802401E4 00000000 */ nop /* D501D8 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D501DC 802401EC 00000000 */ nop +/* D501DC 802401EC 00000000 */ nop /* D501E0 802401F0 45000004 */ bc1f .L80240204 -/* D501E4 802401F4 00000000 */ nop +/* D501E4 802401F4 00000000 */ nop /* D501E8 802401F8 0C090015 */ jal func_80240054_D50044 /* D501EC 802401FC 0040202D */ daddu $a0, $v0, $zero /* D501F0 80240200 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240128_D50118 /* D50278 80240288 AFA0001C */ sw $zero, 0x1c($sp) .L8024028C: /* D5027C 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D50280 80240290 00000000 */ nop +/* D50280 80240290 00000000 */ nop .L80240294: /* D50284 80240294 9202000E */ lbu $v0, 0xe($s0) /* D50288 80240298 3C01802E */ lui $at, %hi(D_802D9D70) diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802402F0_D502E0.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802402F0_D502E0.s index b6fc2e5fad..e02e865be0 100644 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802402F0_D502E0.s +++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802402F0_D502E0.s @@ -33,7 +33,7 @@ glabel func_802402F0_D502E0 /* D50350 80240360 E7B40010 */ swc1 $f20, 0x10($sp) /* D50354 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) /* D50358 80240368 0C00A6C9 */ jal clamp_angle -/* D5035C 8024036C 00000000 */ nop +/* D5035C 8024036C 00000000 */ nop /* D50360 80240370 44050000 */ mfc1 $a1, $f0 /* D50364 80240374 4406A000 */ mfc1 $a2, $f20 /* D50368 80240378 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024049C_D5048C.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024049C_D5048C.s index 90a50a26ee..23025dc267 100644 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024049C_D5048C.s +++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024049C_D5048C.s @@ -10,7 +10,7 @@ glabel func_8024049C_D5048C /* D504A0 802404B0 0440000E */ bltz $v0, .L802404EC /* D504A4 802404B4 28420002 */ slti $v0, $v0, 2 /* D504A8 802404B8 1040000C */ beqz $v0, .L802404EC -/* D504AC 802404BC 00000000 */ nop +/* D504AC 802404BC 00000000 */ nop /* D504B0 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D504F0) /* D504B4 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D504F0) /* D504B8 802404C8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240500_D504F0.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240500_D504F0.s index cb4d080043..dedb8a2131 100644 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240500_D504F0.s +++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240500_D504F0.s @@ -16,7 +16,7 @@ glabel func_80240500_D504F0 /* D5051C 8024052C 27B10020 */ addiu $s1, $sp, 0x20 /* D50520 80240530 8E0400CC */ lw $a0, 0xcc($s0) /* D50524 80240534 0C044181 */ jal get_shadow_by_index -/* D50528 80240538 00000000 */ nop +/* D50528 80240538 00000000 */ nop /* D5052C 8024053C 0C048B77 */ jal func_80122DDC /* D50530 80240540 84440008 */ lh $a0, 8($v0) /* D50534 80240544 8E050028 */ lw $a1, 0x28($s0) @@ -33,7 +33,7 @@ glabel func_80240500_D504F0 /* D50560 80240570 46000007 */ neg.s $f0, $f0 /* D50564 80240574 44060000 */ mfc1 $a2, $f0 /* D50568 80240578 0C00B94E */ jal get_screen_coords -/* D5056C 8024057C 00000000 */ nop +/* D5056C 8024057C 00000000 */ nop /* D50570 80240580 8E0500A4 */ lw $a1, 0xa4($s0) /* D50574 80240584 3C063F80 */ lui $a2, 0x3f80 /* D50578 80240588 0C0B76A3 */ jal func_802DDA8C @@ -72,13 +72,13 @@ glabel func_80240500_D504F0 /* D505F8 80240608 AFA0001C */ sw $zero, 0x1c($sp) .L8024060C: /* D505FC 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D50600 80240610 00000000 */ nop +/* D50600 80240610 00000000 */ nop .L80240614: /* D50604 80240614 9202000E */ lbu $v0, 0xe($s0) /* D50608 80240618 3C01802E */ lui $at, %hi(D_802D9D71) /* D5060C 8024061C A0229D71 */ sb $v0, %lo(D_802D9D71)($at) /* D50610 80240620 0809018C */ j .L80240630 -/* D50614 80240624 00000000 */ nop +/* D50614 80240624 00000000 */ nop .L80240628: /* D50618 80240628 3C01802E */ lui $at, %hi(D_802D9D71) /* D5061C 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024068C_D5067C.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024068C_D5067C.s index 5764c5a20b..a1feb21086 100644 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024068C_D5067C.s +++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024068C_D5067C.s @@ -33,7 +33,7 @@ glabel func_8024068C_D5067C /* D506EC 802406FC E7B40010 */ swc1 $f20, 0x10($sp) /* D506F0 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) /* D506F4 80240704 0C00A6C9 */ jal clamp_angle -/* D506F8 80240708 00000000 */ nop +/* D506F8 80240708 00000000 */ nop /* D506FC 8024070C 44050000 */ mfc1 $a1, $f0 /* D50700 80240710 4406A000 */ mfc1 $a2, $f20 /* D50704 80240714 4407A000 */ mfc1 $a3, $f20 @@ -95,16 +95,16 @@ glabel func_8024068C_D5067C /* D507E4 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D507E8 802407F8 3C0142B4 */ lui $at, 0x42b4 /* D507EC 802407FC 44810000 */ mtc1 $at, $f0 -/* D507F0 80240800 00000000 */ nop +/* D507F0 80240800 00000000 */ nop /* D507F4 80240804 4602003E */ c.le.s $f0, $f2 -/* D507F8 80240808 00000000 */ nop +/* D507F8 80240808 00000000 */ nop /* D507FC 8024080C 4500000A */ bc1f .L80240838 /* D50800 80240810 24040001 */ addiu $a0, $zero, 1 /* D50804 80240814 3C014387 */ lui $at, 0x4387 /* D50808 80240818 44810000 */ mtc1 $at, $f0 -/* D5080C 8024081C 00000000 */ nop +/* D5080C 8024081C 00000000 */ nop /* D50810 80240820 4600103C */ c.lt.s $f2, $f0 -/* D50814 80240824 00000000 */ nop +/* D50814 80240824 00000000 */ nop /* D50818 80240828 45000004 */ bc1f .L8024083C /* D5081C 8024082C 27A20018 */ addiu $v0, $sp, 0x18 /* D50820 80240830 3C041000 */ lui $a0, 0x1000 diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240870_D50860.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240870_D50860.s index ad17ad9dcb..c6e10c0f91 100644 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240870_D50860.s +++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240870_D50860.s @@ -43,36 +43,36 @@ glabel func_80240870_D50860 /* D508F4 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D508F8 80240908 3C0142B4 */ lui $at, 0x42b4 /* D508FC 8024090C 44810000 */ mtc1 $at, $f0 -/* D50900 80240910 00000000 */ nop +/* D50900 80240910 00000000 */ nop /* D50904 80240914 4602003C */ c.lt.s $f0, $f2 -/* D50908 80240918 00000000 */ nop +/* D50908 80240918 00000000 */ nop /* D5090C 8024091C 4500000A */ bc1f .L80240948 -/* D50910 80240920 00000000 */ nop +/* D50910 80240920 00000000 */ nop /* D50914 80240924 3C014334 */ lui $at, 0x4334 /* D50918 80240928 44812000 */ mtc1 $at, $f4 -/* D5091C 8024092C 00000000 */ nop +/* D5091C 8024092C 00000000 */ nop /* D50920 80240930 4604103E */ c.le.s $f2, $f4 -/* D50924 80240934 00000000 */ nop +/* D50924 80240934 00000000 */ nop /* D50928 80240938 45000003 */ bc1f .L80240948 -/* D5092C 8024093C 00000000 */ nop +/* D5092C 8024093C 00000000 */ nop /* D50930 80240940 08090276 */ j .L802409D8 /* D50934 80240944 46022501 */ sub.s $f20, $f4, $f2 .L80240948: /* D50938 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) /* D5093C 8024094C 3C014334 */ lui $at, 0x4334 /* D50940 80240950 44812000 */ mtc1 $at, $f4 -/* D50944 80240954 00000000 */ nop +/* D50944 80240954 00000000 */ nop /* D50948 80240958 4600203C */ c.lt.s $f4, $f0 -/* D5094C 8024095C 00000000 */ nop +/* D5094C 8024095C 00000000 */ nop /* D50950 80240960 4500000C */ bc1f .L80240994 -/* D50954 80240964 00000000 */ nop +/* D50954 80240964 00000000 */ nop /* D50958 80240968 3C014387 */ lui $at, 0x4387 /* D5095C 8024096C 44812000 */ mtc1 $at, $f4 -/* D50960 80240970 00000000 */ nop +/* D50960 80240970 00000000 */ nop /* D50964 80240974 4604003E */ c.le.s $f0, $f4 -/* D50968 80240978 00000000 */ nop +/* D50968 80240978 00000000 */ nop /* D5096C 8024097C 45000008 */ bc1f .L802409A0 -/* D50970 80240980 00000000 */ nop +/* D50970 80240980 00000000 */ nop /* D50974 80240984 3C014334 */ lui $at, 0x4334 /* D50978 80240988 44812000 */ mtc1 $at, $f4 /* D5097C 8024098C 08090276 */ j .L802409D8 @@ -80,19 +80,19 @@ glabel func_80240870_D50860 .L80240994: /* D50984 80240994 3C014387 */ lui $at, 0x4387 /* D50988 80240998 44812000 */ mtc1 $at, $f4 -/* D5098C 8024099C 00000000 */ nop +/* D5098C 8024099C 00000000 */ nop .L802409A0: /* D50990 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D50994 802409A4 00000000 */ nop +/* D50994 802409A4 00000000 */ nop /* D50998 802409A8 4500000A */ bc1f .L802409D4 -/* D5099C 802409AC 00000000 */ nop +/* D5099C 802409AC 00000000 */ nop /* D509A0 802409B0 3C0143B4 */ lui $at, 0x43b4 /* D509A4 802409B4 44811000 */ mtc1 $at, $f2 -/* D509A8 802409B8 00000000 */ nop +/* D509A8 802409B8 00000000 */ nop /* D509AC 802409BC 4602003E */ c.le.s $f0, $f2 -/* D509B0 802409C0 00000000 */ nop +/* D509B0 802409C0 00000000 */ nop /* D509B4 802409C4 45000003 */ bc1f .L802409D4 -/* D509B8 802409C8 00000000 */ nop +/* D509B8 802409C8 00000000 */ nop /* D509BC 802409CC 08090276 */ j .L802409D8 /* D509C0 802409D0 46001501 */ sub.s $f20, $f2, $f0 .L802409D4: @@ -100,11 +100,11 @@ glabel func_80240870_D50860 .L802409D8: /* D509C8 802409D8 3C0141C8 */ lui $at, 0x41c8 /* D509CC 802409DC 44810000 */ mtc1 $at, $f0 -/* D509D0 802409E0 00000000 */ nop +/* D509D0 802409E0 00000000 */ nop /* D509D4 802409E4 4600A003 */ div.s $f0, $f20, $f0 /* D509D8 802409E8 4600010D */ trunc.w.s $f4, $f0 /* D509DC 802409EC 44072000 */ mfc1 $a3, $f4 -/* D509E0 802409F0 00000000 */ nop +/* D509E0 802409F0 00000000 */ nop /* D509E4 802409F4 00071100 */ sll $v0, $a3, 4 /* D509E8 802409F8 00471023 */ subu $v0, $v0, $a3 /* D509EC 802409FC 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel func_80240870_D50860 /* D50A34 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) /* D50A38 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) /* D50A3C 80240A4C 0C00A6C9 */ jal clamp_angle -/* D50A40 80240A50 00000000 */ nop +/* D50A40 80240A50 00000000 */ nop /* D50A44 80240A54 44050000 */ mfc1 $a1, $f0 /* D50A48 80240A58 4406B000 */ mfc1 $a2, $f22 /* D50A4C 80240A5C 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel func_80240870_D50860 /* D50AB0 80240AC0 24040001 */ addiu $a0, $zero, 1 .L80240AC4: /* D50AB4 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D50AB8 80240AC8 00000000 */ nop +/* D50AB8 80240AC8 00000000 */ nop /* D50ABC 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 /* D50AC0 80240AD0 24040001 */ addiu $a0, $zero, 1 .L80240AD4: @@ -204,10 +204,10 @@ glabel func_80240870_D50860 /* D50B50 80240B60 44812000 */ mtc1 $at, $f4 /* D50B54 80240B64 00021023 */ negu $v0, $v0 /* D50B58 80240B68 44820000 */ mtc1 $v0, $f0 -/* D50B5C 80240B6C 00000000 */ nop +/* D50B5C 80240B6C 00000000 */ nop /* D50B60 80240B70 46800020 */ cvt.s.w $f0, $f0 /* D50B64 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D50B68 80240B78 00000000 */ nop +/* D50B68 80240B78 00000000 */ nop /* D50B6C 80240B7C 4405B000 */ mfc1 $a1, $f22 /* D50B70 80240B80 4407B000 */ mfc1 $a3, $f22 /* D50B74 80240B84 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel func_80240870_D50860 /* D50BE4 80240BF4 3C013F00 */ lui $at, 0x3f00 /* D50BE8 80240BF8 44812000 */ mtc1 $at, $f4 /* D50BEC 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D50BF0 80240C00 00000000 */ nop +/* D50BF0 80240C00 00000000 */ nop /* D50BF4 80240C04 46800020 */ cvt.s.w $f0, $f0 /* D50BF8 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D50BFC 80240C0C 00000000 */ nop +/* D50BFC 80240C0C 00000000 */ nop /* D50C00 80240C10 4405B000 */ mfc1 $a1, $f22 /* D50C04 80240C14 4407B000 */ mfc1 $a3, $f22 /* D50C08 80240C18 44062000 */ mfc1 $a2, $f4 @@ -280,16 +280,16 @@ glabel func_80240870_D50860 /* D50C80 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D50C84 80240C94 3C0142B4 */ lui $at, 0x42b4 /* D50C88 80240C98 44810000 */ mtc1 $at, $f0 -/* D50C8C 80240C9C 00000000 */ nop +/* D50C8C 80240C9C 00000000 */ nop /* D50C90 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D50C94 80240CA4 00000000 */ nop +/* D50C94 80240CA4 00000000 */ nop /* D50C98 80240CA8 4500000A */ bc1f .L80240CD4 /* D50C9C 80240CAC 24040001 */ addiu $a0, $zero, 1 /* D50CA0 80240CB0 3C014387 */ lui $at, 0x4387 /* D50CA4 80240CB4 44812000 */ mtc1 $at, $f4 -/* D50CA8 80240CB8 00000000 */ nop +/* D50CA8 80240CB8 00000000 */ nop /* D50CAC 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D50CB0 80240CC0 00000000 */ nop +/* D50CB0 80240CC0 00000000 */ nop /* D50CB4 80240CC4 45000004 */ bc1f .L80240CD8 /* D50CB8 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 /* D50CBC 80240CCC 3C041000 */ lui $a0, 0x1000 @@ -305,7 +305,7 @@ glabel func_80240870_D50860 /* D50CDC 80240CEC 26730001 */ addiu $s3, $s3, 1 /* D50CE0 80240CF0 2A620002 */ slti $v0, $s3, 2 /* D50CE4 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D50CE8 80240CF8 00000000 */ nop +/* D50CE8 80240CF8 00000000 */ nop /* D50CEC 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) /* D50CF0 80240D00 8FB60148 */ lw $s6, 0x148($sp) /* D50CF4 80240D04 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240D3C_D50D2C.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240D3C_D50D2C.s index ef8b67ba42..5b66d91d41 100644 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240D3C_D50D2C.s +++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240D3C_D50D2C.s @@ -11,36 +11,36 @@ glabel func_80240D3C_D50D2C /* D50D44 80240D54 24020001 */ addiu $v0, $zero, 1 /* D50D48 80240D58 8E030084 */ lw $v1, 0x84($s0) /* D50D4C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D50D50 80240D60 00000000 */ nop +/* D50D50 80240D60 00000000 */ nop /* D50D54 80240D64 28620002 */ slti $v0, $v1, 2 /* D50D58 80240D68 50400005 */ beql $v0, $zero, .L80240D80 /* D50D5C 80240D6C 24020002 */ addiu $v0, $zero, 2 /* D50D60 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D50D64 80240D74 00000000 */ nop +/* D50D64 80240D74 00000000 */ nop /* D50D68 80240D78 08090378 */ j .L80240DE0 -/* D50D6C 80240D7C 00000000 */ nop +/* D50D6C 80240D7C 00000000 */ nop .L80240D80: /* D50D70 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D50D74 80240D84 00000000 */ nop +/* D50D74 80240D84 00000000 */ nop /* D50D78 80240D88 08090378 */ j .L80240DE0 -/* D50D7C 80240D8C 00000000 */ nop +/* D50D7C 80240D8C 00000000 */ nop .L80240D90: /* D50D80 80240D90 3C048024 */ lui $a0, %hi(pra_02_SetPartnerFlagsA0000) /* D50D84 80240D94 24840E84 */ addiu $a0, $a0, %lo(pra_02_SetPartnerFlagsA0000) /* D50D88 80240D98 08090374 */ j .L80240DD0 -/* D50D8C 80240D9C 00000000 */ nop +/* D50D8C 80240D9C 00000000 */ nop .L80240DA0: /* D50D90 80240DA0 3C048024 */ lui $a0, %hi(pra_02_SetPartnerFlags20000) /* D50D94 80240DA4 24840EEC */ addiu $a0, $a0, %lo(pra_02_SetPartnerFlags20000) /* D50D98 80240DA8 08090374 */ j .L80240DD0 -/* D50D9C 80240DAC 00000000 */ nop +/* D50D9C 80240DAC 00000000 */ nop .L80240DB0: /* D50DA0 80240DB0 8E020084 */ lw $v0, 0x84($s0) /* D50DA4 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D50DA8 80240DB8 00000000 */ nop +/* D50DA8 80240DB8 00000000 */ nop /* D50DAC 80240DBC 28420002 */ slti $v0, $v0, 2 /* D50DB0 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D50DB4 80240DC4 00000000 */ nop +/* D50DB4 80240DC4 00000000 */ nop .L80240DC8: /* D50DB8 80240DC8 3C048024 */ lui $a0, %hi(pra_02_SetPartnerFlags80000) /* D50DBC 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(pra_02_SetPartnerFlags80000) @@ -64,14 +64,14 @@ glabel func_80240D3C_D50D2C /* D50DFC 80240E0C 10400005 */ beqz $v0, .L80240E24 /* D50E00 80240E10 24020002 */ addiu $v0, $zero, 2 /* D50E04 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D50E08 80240E18 00000000 */ nop +/* D50E08 80240E18 00000000 */ nop /* D50E0C 80240E1C 0809039D */ j .L80240E74 -/* D50E10 80240E20 00000000 */ nop +/* D50E10 80240E20 00000000 */ nop .L80240E24: /* D50E14 80240E24 10820006 */ beq $a0, $v0, .L80240E40 /* D50E18 80240E28 24020002 */ addiu $v0, $zero, 2 /* D50E1C 80240E2C 0809039D */ j .L80240E74 -/* D50E20 80240E30 00000000 */ nop +/* D50E20 80240E30 00000000 */ nop .L80240E34: /* D50E24 80240E34 8CA20000 */ lw $v0, ($a1) /* D50E28 80240E38 0809039A */ j .L80240E68 diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802411D8_D511C8.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802411D8_D511C8.s index e5f6b71f15..213029f89d 100644 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802411D8_D511C8.s +++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802411D8_D511C8.s @@ -28,7 +28,7 @@ glabel func_802411D8_D511C8 /* D5121C 8024122C 00220821 */ addu $at, $at, $v0 /* D51220 80241230 AC203CC0 */ sw $zero, %lo(func_80243CC0_A2DF00)($at) /* D51224 80241234 08090499 */ j .L80241264 -/* D51228 80241238 00000000 */ nop +/* D51228 80241238 00000000 */ nop .L8024123C: /* D5122C 8024123C 3C038024 */ lui $v1, %hi(func_80243CC0_A2DF00) /* D51230 80241240 24633CC0 */ addiu $v1, $v1, %lo(func_80243CC0_A2DF00) diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241274_D51264.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241274_D51264.s index f4688b35da..fa731b26be 100644 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241274_D51264.s +++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241274_D51264.s @@ -28,7 +28,7 @@ glabel func_80241274_D51264 /* D512B8 802412C8 00220821 */ addu $at, $at, $v0 /* D512BC 802412CC AC203E88 */ sw $zero, %lo(D_80243E88)($at) /* D512C0 802412D0 080904C0 */ j .L80241300 -/* D512C4 802412D4 00000000 */ nop +/* D512C4 802412D4 00000000 */ nop .L802412D8: /* D512C8 802412D8 3C038024 */ lui $v1, %hi(D_80243E88) /* D512CC 802412DC 24633E88 */ addiu $v1, $v1, %lo(D_80243E88) diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241310_D51300.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241310_D51300.s index 5c4cd1ab93..e5080250e8 100644 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241310_D51300.s +++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241310_D51300.s @@ -23,18 +23,18 @@ glabel func_80241310_D51300 /* D51348 80241358 8E050000 */ lw $a1, ($s0) /* D5134C 8024135C 26100004 */ addiu $s0, $s0, 4 /* D51350 80241360 4482C000 */ mtc1 $v0, $f24 -/* D51354 80241364 00000000 */ nop +/* D51354 80241364 00000000 */ nop /* D51358 80241368 4680C620 */ cvt.s.w $f24, $f24 /* D5135C 8024136C 0C0B1EAF */ jal get_variable /* D51360 80241370 0220202D */ daddu $a0, $s1, $zero /* D51364 80241374 8E050000 */ lw $a1, ($s0) /* D51368 80241378 4482B000 */ mtc1 $v0, $f22 -/* D5136C 8024137C 00000000 */ nop +/* D5136C 8024137C 00000000 */ nop /* D51370 80241380 4680B5A0 */ cvt.s.w $f22, $f22 /* D51374 80241384 0C0B1EAF */ jal get_variable /* D51378 80241388 0220202D */ daddu $a0, $s1, $zero /* D5137C 8024138C 4482A000 */ mtc1 $v0, $f20 -/* D51380 80241390 00000000 */ nop +/* D51380 80241390 00000000 */ nop /* D51384 80241394 4680A520 */ cvt.s.w $f20, $f20 /* D51388 80241398 0C04417A */ jal get_entity_by_index /* D5138C 8024139C 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_80240020_D53CD0.s b/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_80240020_D53CD0.s index 0c78e6470f..d3f4dbf340 100644 --- a/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_80240020_D53CD0.s +++ b/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_80240020_D53CD0.s @@ -6,16 +6,16 @@ glabel func_80240020_D53CD0 /* D53CD4 80240024 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) /* D53CD8 80240028 C4620080 */ lwc1 $f2, 0x80($v1) /* D53CDC 8024002C 44800000 */ mtc1 $zero, $f0 -/* D53CE0 80240030 00000000 */ nop +/* D53CE0 80240030 00000000 */ nop /* D53CE4 80240034 4602003E */ c.le.s $f0, $f2 -/* D53CE8 80240038 00000000 */ nop +/* D53CE8 80240038 00000000 */ nop /* D53CEC 8024003C 4500000A */ bc1f .L80240068 -/* D53CF0 80240040 00000000 */ nop +/* D53CF0 80240040 00000000 */ nop /* D53CF4 80240044 3C014334 */ lui $at, 0x4334 /* D53CF8 80240048 44810000 */ mtc1 $at, $f0 -/* D53CFC 8024004C 00000000 */ nop +/* D53CFC 8024004C 00000000 */ nop /* D53D00 80240050 4600103C */ c.lt.s $f2, $f0 -/* D53D04 80240054 00000000 */ nop +/* D53D04 80240054 00000000 */ nop /* D53D08 80240058 45000006 */ bc1f .L80240074 /* D53D0C 8024005C 24020096 */ addiu $v0, $zero, 0x96 /* D53D10 80240060 AC820084 */ sw $v0, 0x84($a0) @@ -23,17 +23,17 @@ glabel func_80240020_D53CD0 .L80240068: /* D53D18 80240068 3C014334 */ lui $at, 0x4334 /* D53D1C 8024006C 44810000 */ mtc1 $at, $f0 -/* D53D20 80240070 00000000 */ nop +/* D53D20 80240070 00000000 */ nop .L80240074: /* D53D24 80240074 4602003E */ c.le.s $f0, $f2 -/* D53D28 80240078 00000000 */ nop +/* D53D28 80240078 00000000 */ nop /* D53D2C 8024007C 45000009 */ bc1f .L802400A4 -/* D53D30 80240080 00000000 */ nop +/* D53D30 80240080 00000000 */ nop /* D53D34 80240084 3C0143B4 */ lui $at, 0x43b4 /* D53D38 80240088 44810000 */ mtc1 $at, $f0 -/* D53D3C 8024008C 00000000 */ nop +/* D53D3C 8024008C 00000000 */ nop /* D53D40 80240090 4600103C */ c.lt.s $f2, $f0 -/* D53D44 80240094 00000000 */ nop +/* D53D44 80240094 00000000 */ nop /* D53D48 80240098 45000002 */ bc1f .L802400A4 /* D53D4C 8024009C 2402005F */ addiu $v0, $zero, 0x5f /* D53D50 802400A0 AC820084 */ sw $v0, 0x84($a0) diff --git a/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_802400AC_D53D5C.s b/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_802400AC_D53D5C.s index 50c7ab2780..f6b6e1383a 100644 --- a/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_802400AC_D53D5C.s +++ b/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_802400AC_D53D5C.s @@ -6,16 +6,16 @@ glabel func_802400AC_D53D5C /* D53D60 802400B0 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) /* D53D64 802400B4 C4620080 */ lwc1 $f2, 0x80($v1) /* D53D68 802400B8 44800000 */ mtc1 $zero, $f0 -/* D53D6C 802400BC 00000000 */ nop +/* D53D6C 802400BC 00000000 */ nop /* D53D70 802400C0 4602003E */ c.le.s $f0, $f2 -/* D53D74 802400C4 00000000 */ nop +/* D53D74 802400C4 00000000 */ nop /* D53D78 802400C8 4500000A */ bc1f .L802400F4 -/* D53D7C 802400CC 00000000 */ nop +/* D53D7C 802400CC 00000000 */ nop /* D53D80 802400D0 3C014334 */ lui $at, 0x4334 /* D53D84 802400D4 44810000 */ mtc1 $at, $f0 -/* D53D88 802400D8 00000000 */ nop +/* D53D88 802400D8 00000000 */ nop /* D53D8C 802400DC 4600103C */ c.lt.s $f2, $f0 -/* D53D90 802400E0 00000000 */ nop +/* D53D90 802400E0 00000000 */ nop /* D53D94 802400E4 45000006 */ bc1f .L80240100 /* D53D98 802400E8 240200A5 */ addiu $v0, $zero, 0xa5 /* D53D9C 802400EC AC820084 */ sw $v0, 0x84($a0) @@ -23,17 +23,17 @@ glabel func_802400AC_D53D5C .L802400F4: /* D53DA4 802400F4 3C014334 */ lui $at, 0x4334 /* D53DA8 802400F8 44810000 */ mtc1 $at, $f0 -/* D53DAC 802400FC 00000000 */ nop +/* D53DAC 802400FC 00000000 */ nop .L80240100: /* D53DB0 80240100 4602003E */ c.le.s $f0, $f2 -/* D53DB4 80240104 00000000 */ nop +/* D53DB4 80240104 00000000 */ nop /* D53DB8 80240108 45000009 */ bc1f .L80240130 -/* D53DBC 8024010C 00000000 */ nop +/* D53DBC 8024010C 00000000 */ nop /* D53DC0 80240110 3C0143B4 */ lui $at, 0x43b4 /* D53DC4 80240114 44810000 */ mtc1 $at, $f0 -/* D53DC8 80240118 00000000 */ nop +/* D53DC8 80240118 00000000 */ nop /* D53DCC 8024011C 4600103C */ c.lt.s $f2, $f0 -/* D53DD0 80240120 00000000 */ nop +/* D53DD0 80240120 00000000 */ nop /* D53DD4 80240124 45000002 */ bc1f .L80240130 /* D53DD8 80240128 24020046 */ addiu $v0, $zero, 0x46 /* D53DDC 8024012C AC820084 */ sw $v0, 0x84($a0) diff --git a/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_80240138_D53DE8.s b/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_80240138_D53DE8.s index e089704ae1..989001938c 100644 --- a/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_80240138_D53DE8.s +++ b/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_80240138_D53DE8.s @@ -32,5 +32,5 @@ glabel func_80240138_D53DE8 /* D53E4C 8024019C 0000102D */ daddu $v0, $zero, $zero /* D53E50 802401A0 03E00008 */ jr $ra /* D53E54 802401A4 27BD0020 */ addiu $sp, $sp, 0x20 -/* D53E58 802401A8 00000000 */ nop -/* D53E5C 802401AC 00000000 */ nop +/* D53E58 802401A8 00000000 */ nop +/* D53E5C 802401AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_04/D546B0/func_80240020_D546B0.s b/asm/nonmatchings/world/area_pra/pra_04/D546B0/func_80240020_D546B0.s index 1eae79d463..893f611938 100644 --- a/asm/nonmatchings/world/area_pra/pra_04/D546B0/func_80240020_D546B0.s +++ b/asm/nonmatchings/world/area_pra/pra_04/D546B0/func_80240020_D546B0.s @@ -6,16 +6,16 @@ glabel func_80240020_D546B0 /* D546B4 80240024 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) /* D546B8 80240028 C4620080 */ lwc1 $f2, 0x80($v1) /* D546BC 8024002C 44800000 */ mtc1 $zero, $f0 -/* D546C0 80240030 00000000 */ nop +/* D546C0 80240030 00000000 */ nop /* D546C4 80240034 4602003E */ c.le.s $f0, $f2 -/* D546C8 80240038 00000000 */ nop +/* D546C8 80240038 00000000 */ nop /* D546CC 8024003C 4500000A */ bc1f .L80240068 -/* D546D0 80240040 00000000 */ nop +/* D546D0 80240040 00000000 */ nop /* D546D4 80240044 3C014334 */ lui $at, 0x4334 /* D546D8 80240048 44810000 */ mtc1 $at, $f0 -/* D546DC 8024004C 00000000 */ nop +/* D546DC 8024004C 00000000 */ nop /* D546E0 80240050 4600103C */ c.lt.s $f2, $f0 -/* D546E4 80240054 00000000 */ nop +/* D546E4 80240054 00000000 */ nop /* D546E8 80240058 45000006 */ bc1f .L80240074 /* D546EC 8024005C 24020096 */ addiu $v0, $zero, 0x96 /* D546F0 80240060 AC820084 */ sw $v0, 0x84($a0) @@ -23,17 +23,17 @@ glabel func_80240020_D546B0 .L80240068: /* D546F8 80240068 3C014334 */ lui $at, 0x4334 /* D546FC 8024006C 44810000 */ mtc1 $at, $f0 -/* D54700 80240070 00000000 */ nop +/* D54700 80240070 00000000 */ nop .L80240074: /* D54704 80240074 4602003E */ c.le.s $f0, $f2 -/* D54708 80240078 00000000 */ nop +/* D54708 80240078 00000000 */ nop /* D5470C 8024007C 45000009 */ bc1f .L802400A4 -/* D54710 80240080 00000000 */ nop +/* D54710 80240080 00000000 */ nop /* D54714 80240084 3C0143B4 */ lui $at, 0x43b4 /* D54718 80240088 44810000 */ mtc1 $at, $f0 -/* D5471C 8024008C 00000000 */ nop +/* D5471C 8024008C 00000000 */ nop /* D54720 80240090 4600103C */ c.lt.s $f2, $f0 -/* D54724 80240094 00000000 */ nop +/* D54724 80240094 00000000 */ nop /* D54728 80240098 45000002 */ bc1f .L802400A4 /* D5472C 8024009C 2402005F */ addiu $v0, $zero, 0x5f /* D54730 802400A0 AC820084 */ sw $v0, 0x84($a0) diff --git a/asm/nonmatchings/world/area_pra/pra_04/D546B0/func_802400AC_D5473C.s b/asm/nonmatchings/world/area_pra/pra_04/D546B0/func_802400AC_D5473C.s index 178d25acc0..e3c98787c2 100644 --- a/asm/nonmatchings/world/area_pra/pra_04/D546B0/func_802400AC_D5473C.s +++ b/asm/nonmatchings/world/area_pra/pra_04/D546B0/func_802400AC_D5473C.s @@ -6,16 +6,16 @@ glabel func_802400AC_D5473C /* D54740 802400B0 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) /* D54744 802400B4 C4620080 */ lwc1 $f2, 0x80($v1) /* D54748 802400B8 44800000 */ mtc1 $zero, $f0 -/* D5474C 802400BC 00000000 */ nop +/* D5474C 802400BC 00000000 */ nop /* D54750 802400C0 4602003E */ c.le.s $f0, $f2 -/* D54754 802400C4 00000000 */ nop +/* D54754 802400C4 00000000 */ nop /* D54758 802400C8 4500000A */ bc1f .L802400F4 -/* D5475C 802400CC 00000000 */ nop +/* D5475C 802400CC 00000000 */ nop /* D54760 802400D0 3C014334 */ lui $at, 0x4334 /* D54764 802400D4 44810000 */ mtc1 $at, $f0 -/* D54768 802400D8 00000000 */ nop +/* D54768 802400D8 00000000 */ nop /* D5476C 802400DC 4600103C */ c.lt.s $f2, $f0 -/* D54770 802400E0 00000000 */ nop +/* D54770 802400E0 00000000 */ nop /* D54774 802400E4 45000006 */ bc1f .L80240100 /* D54778 802400E8 240200A5 */ addiu $v0, $zero, 0xa5 /* D5477C 802400EC AC820084 */ sw $v0, 0x84($a0) @@ -23,17 +23,17 @@ glabel func_802400AC_D5473C .L802400F4: /* D54784 802400F4 3C014334 */ lui $at, 0x4334 /* D54788 802400F8 44810000 */ mtc1 $at, $f0 -/* D5478C 802400FC 00000000 */ nop +/* D5478C 802400FC 00000000 */ nop .L80240100: /* D54790 80240100 4602003E */ c.le.s $f0, $f2 -/* D54794 80240104 00000000 */ nop +/* D54794 80240104 00000000 */ nop /* D54798 80240108 45000009 */ bc1f .L80240130 -/* D5479C 8024010C 00000000 */ nop +/* D5479C 8024010C 00000000 */ nop /* D547A0 80240110 3C0143B4 */ lui $at, 0x43b4 /* D547A4 80240114 44810000 */ mtc1 $at, $f0 -/* D547A8 80240118 00000000 */ nop +/* D547A8 80240118 00000000 */ nop /* D547AC 8024011C 4600103C */ c.lt.s $f2, $f0 -/* D547B0 80240120 00000000 */ nop +/* D547B0 80240120 00000000 */ nop /* D547B4 80240124 45000002 */ bc1f .L80240130 /* D547B8 80240128 24020046 */ addiu $v0, $zero, 0x46 /* D547BC 8024012C AC820084 */ sw $v0, 0x84($a0) diff --git a/asm/nonmatchings/world/area_pra/pra_04/D546B0/func_80240138_D547C8.s b/asm/nonmatchings/world/area_pra/pra_04/D546B0/func_80240138_D547C8.s index 5c89d76a2e..80f16eb2ca 100644 --- a/asm/nonmatchings/world/area_pra/pra_04/D546B0/func_80240138_D547C8.s +++ b/asm/nonmatchings/world/area_pra/pra_04/D546B0/func_80240138_D547C8.s @@ -32,5 +32,5 @@ glabel func_80240138_D547C8 /* D5482C 8024019C 0000102D */ daddu $v0, $zero, $zero /* D54830 802401A0 03E00008 */ jr $ra /* D54834 802401A4 27BD0020 */ addiu $sp, $sp, 0x20 -/* D54838 802401A8 00000000 */ nop -/* D5483C 802401AC 00000000 */ nop +/* D54838 802401A8 00000000 */ nop +/* D5483C 802401AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_04/D54840/func_802401B0_D54840.s b/asm/nonmatchings/world/area_pra/pra_04/D54840/func_802401B0_D54840.s index a62d3c0a29..145dfd8008 100644 --- a/asm/nonmatchings/world/area_pra/pra_04/D54840/func_802401B0_D54840.s +++ b/asm/nonmatchings/world/area_pra/pra_04/D54840/func_802401B0_D54840.s @@ -75,7 +75,7 @@ glabel func_802401B0_D54840 /* D54954 802402C4 8E4300B0 */ lw $v1, 0xb0($s2) /* D54958 802402C8 30620004 */ andi $v0, $v1, 4 /* D5495C 802402CC 10400007 */ beqz $v0, .L802402EC -/* D54960 802402D0 00000000 */ nop +/* D54960 802402D0 00000000 */ nop /* D54964 802402D4 824200B4 */ lb $v0, 0xb4($s2) /* D54968 802402D8 1440018D */ bnez $v0, .L80240910 /* D5496C 802402DC 0000102D */ daddu $v0, $zero, $zero @@ -87,11 +87,12 @@ glabel func_802401B0_D54840 /* D54980 802402F0 2C620010 */ sltiu $v0, $v1, 0x10 /* D54984 802402F4 10400185 */ beqz $v0, .L8024090C /* D54988 802402F8 00031080 */ sll $v0, $v1, 2 -/* D5498C 802402FC 3C018024 */ lui $at, %hi(func_802414D0_CC4CE0) +/* D5498C 802402FC 3C018024 */ lui $at, %hi(jtbl_802414D0_D55B60) /* D54990 80240300 00220821 */ addu $at, $at, $v0 -/* D54994 80240304 8C2214D0 */ lw $v0, %lo(func_802414D0_CC4CE0)($at) +/* D54994 80240304 8C2214D0 */ lw $v0, %lo(jtbl_802414D0_D55B60)($at) /* D54998 80240308 00400008 */ jr $v0 -/* D5499C 8024030C 00000000 */ nop +/* D5499C 8024030C 00000000 */ nop +glabel L80240310_D549A0 /* D549A0 80240310 8E4200CC */ lw $v0, 0xcc($s2) /* D549A4 80240314 922300A9 */ lbu $v1, 0xa9($s1) /* D549A8 80240318 8C440000 */ lw $a0, ($v0) @@ -103,9 +104,10 @@ glabel func_802401B0_D54840 /* D549C0 80240330 AE240028 */ sw $a0, 0x28($s1) /* D549C4 80240334 AE600074 */ sw $zero, 0x74($s3) /* D549C8 80240338 AE620070 */ sw $v0, 0x70($s3) +glabel L8024033C_D549CC /* D549CC 8024033C 8E830014 */ lw $v1, 0x14($s4) /* D549D0 80240340 04600015 */ bltz $v1, .L80240398 -/* D549D4 80240344 00000000 */ nop +/* D549D4 80240344 00000000 */ nop /* D549D8 80240348 8E620074 */ lw $v0, 0x74($s3) /* D549DC 8024034C 1C400011 */ bgtz $v0, .L80240394 /* D549E0 80240350 2442FFFF */ addiu $v0, $v0, -1 @@ -133,6 +135,7 @@ glabel func_802401B0_D54840 /* D54A2C 8024039C 2402000A */ addiu $v0, $zero, 0xa /* D54A30 802403A0 1462015B */ bne $v1, $v0, .L80240910 /* D54A34 802403A4 0000102D */ daddu $v0, $zero, $zero +glabel L802403A8_D54A38 /* D54A38 802403A8 C62C0038 */ lwc1 $f12, 0x38($s1) /* D54A3C 802403AC 8E4200CC */ lw $v0, 0xcc($s2) /* D54A40 802403B0 C62E0040 */ lwc1 $f14, 0x40($s1) @@ -166,7 +169,7 @@ glabel func_802401B0_D54840 /* D54AB0 80240420 0C0372DF */ jal func_800DCB7C /* D54AB4 80240424 27A70048 */ addiu $a3, $sp, 0x48 /* D54AB8 80240428 10400010 */ beqz $v0, .L8024046C -/* D54ABC 8024042C 00000000 */ nop +/* D54ABC 8024042C 00000000 */ nop /* D54AC0 80240430 C620003C */ lwc1 $f0, 0x3c($s1) /* D54AC4 80240434 C6440070 */ lwc1 $f4, 0x70($s2) /* D54AC8 80240438 46802120 */ cvt.s.w $f4, $f4 @@ -175,7 +178,7 @@ glabel func_802401B0_D54840 /* D54AD4 80240444 D4221510 */ ldc1 $f2, %lo(func_80241510_91FA80)($at) /* D54AD8 80240448 46000021 */ cvt.d.s $f0, $f0 /* D54ADC 8024044C 46220002 */ mul.d $f0, $f0, $f2 -/* D54AE0 80240450 00000000 */ nop +/* D54AE0 80240450 00000000 */ nop /* D54AE4 80240454 460020A1 */ cvt.d.s $f2, $f4 /* D54AE8 80240458 46201080 */ add.d $f2, $f2, $f0 /* D54AEC 8024045C E7A40044 */ swc1 $f4, 0x44($sp) @@ -190,7 +193,7 @@ glabel func_802401B0_D54840 /* D54B0C 8024047C D4241518 */ ldc1 $f4, %lo(func_80241518_BD0108)($at) /* D54B10 80240480 460010A1 */ cvt.d.s $f2, $f2 /* D54B14 80240484 46241082 */ mul.d $f2, $f2, $f4 -/* D54B18 80240488 00000000 */ nop +/* D54B18 80240488 00000000 */ nop /* D54B1C 8024048C 46000021 */ cvt.d.s $f0, $f0 /* D54B20 80240490 46220000 */ add.d $f0, $f0, $f2 /* D54B24 80240494 46200020 */ cvt.s.d $f0, $f0 @@ -200,12 +203,13 @@ glabel func_802401B0_D54840 /* D54B30 802404A0 2402000B */ addiu $v0, $zero, 0xb /* D54B34 802404A4 E6200068 */ swc1 $f0, 0x68($s1) /* D54B38 802404A8 AE620070 */ sw $v0, 0x70($s3) +glabel L802404AC_D54B3C /* D54B3C 802404AC C6200018 */ lwc1 $f0, 0x18($s1) /* D54B40 802404B0 44801000 */ mtc1 $zero, $f2 /* D54B44 802404B4 44801800 */ mtc1 $zero, $f3 /* D54B48 802404B8 46000021 */ cvt.d.s $f0, $f0 /* D54B4C 802404BC 4620103C */ c.lt.d $f2, $f0 -/* D54B50 802404C0 00000000 */ nop +/* D54B50 802404C0 00000000 */ nop /* D54B54 802404C4 45000025 */ bc1f .L8024055C /* D54B58 802404C8 27A50040 */ addiu $a1, $sp, 0x40 /* D54B5C 802404CC C6200038 */ lwc1 $f0, 0x38($s1) @@ -220,13 +224,13 @@ glabel func_802401B0_D54840 /* D54B80 802404F0 E7A00014 */ swc1 $f0, 0x14($sp) /* D54B84 802404F4 862200A8 */ lh $v0, 0xa8($s1) /* D54B88 802404F8 44820000 */ mtc1 $v0, $f0 -/* D54B8C 802404FC 00000000 */ nop +/* D54B8C 802404FC 00000000 */ nop /* D54B90 80240500 46800020 */ cvt.s.w $f0, $f0 /* D54B94 80240504 E7A00018 */ swc1 $f0, 0x18($sp) /* D54B98 80240508 862200A6 */ lh $v0, 0xa6($s1) /* D54B9C 8024050C 27A60044 */ addiu $a2, $sp, 0x44 /* D54BA0 80240510 44820000 */ mtc1 $v0, $f0 -/* D54BA4 80240514 00000000 */ nop +/* D54BA4 80240514 00000000 */ nop /* D54BA8 80240518 46800020 */ cvt.s.w $f0, $f0 /* D54BAC 8024051C E7A0001C */ swc1 $f0, 0x1c($sp) /* D54BB0 80240520 8E240080 */ lw $a0, 0x80($s1) @@ -254,12 +258,13 @@ glabel func_802401B0_D54840 /* D54C00 80240570 46001080 */ add.s $f2, $f2, $f0 /* D54C04 80240574 E620001C */ swc1 $f0, 0x1c($s1) /* D54C08 80240578 4604103C */ c.lt.s $f2, $f4 -/* D54C0C 8024057C 00000000 */ nop +/* D54C0C 8024057C 00000000 */ nop /* D54C10 80240580 450000E2 */ bc1f .L8024090C /* D54C14 80240584 E622003C */ swc1 $f2, 0x3c($s1) /* D54C18 80240588 2402000C */ addiu $v0, $zero, 0xc /* D54C1C 8024058C E624003C */ swc1 $f4, 0x3c($s1) /* D54C20 80240590 AE620070 */ sw $v0, 0x70($s3) +glabel L80240594_D54C24 /* D54C24 80240594 C62C0038 */ lwc1 $f12, 0x38($s1) /* D54C28 80240598 C62E0040 */ lwc1 $f14, 0x40($s1) /* D54C2C 8024059C 8EA60028 */ lw $a2, 0x28($s5) @@ -267,9 +272,9 @@ glabel func_802401B0_D54840 /* D54C34 802405A4 8EA70030 */ lw $a3, 0x30($s5) /* D54C38 802405A8 3C014270 */ lui $at, 0x4270 /* D54C3C 802405AC 44811000 */ mtc1 $at, $f2 -/* D54C40 802405B0 00000000 */ nop +/* D54C40 802405B0 00000000 */ nop /* D54C44 802405B4 4602003C */ c.lt.s $f0, $f2 -/* D54C48 802405B8 00000000 */ nop +/* D54C48 802405B8 00000000 */ nop /* D54C4C 802405BC 45000002 */ bc1f .L802405C8 /* D54C50 802405C0 E6200010 */ swc1 $f0, 0x10($s1) /* D54C54 802405C4 E6220010 */ swc1 $f2, 0x10($s1) @@ -288,7 +293,7 @@ glabel func_802401B0_D54840 /* D54C84 802405F4 C622003C */ lwc1 $f2, 0x3c($s1) /* D54C88 802405F8 4600228D */ trunc.w.s $f10, $f4 /* D54C8C 802405FC 44025000 */ mfc1 $v0, $f10 -/* D54C90 80240600 00000000 */ nop +/* D54C90 80240600 00000000 */ nop /* D54C94 80240604 A622008E */ sh $v0, 0x8e($s1) /* D54C98 80240608 460010A1 */ cvt.d.s $f2, $f2 /* D54C9C 8024060C 46220001 */ sub.d $f0, $f0, $f2 @@ -302,11 +307,11 @@ glabel func_802401B0_D54840 /* D54CB8 80240628 8622008E */ lh $v0, 0x8e($s1) /* D54CBC 8024062C C620001C */ lwc1 $f0, 0x1c($s1) /* D54CC0 80240630 44821000 */ mtc1 $v0, $f2 -/* D54CC4 80240634 00000000 */ nop +/* D54CC4 80240634 00000000 */ nop /* D54CC8 80240638 468010A0 */ cvt.s.w $f2, $f2 /* D54CCC 8024063C 46000007 */ neg.s $f0, $f0 /* D54CD0 80240640 46020002 */ mul.s $f0, $f0, $f2 -/* D54CD4 80240644 00000000 */ nop +/* D54CD4 80240644 00000000 */ nop /* D54CD8 80240648 00420018 */ mult $v0, $v0 /* D54CDC 8024064C 8E230000 */ lw $v1, ($s1) /* D54CE0 80240650 46040000 */ add.s $f0, $f0, $f4 @@ -318,7 +323,7 @@ glabel func_802401B0_D54840 /* D54CF8 80240668 46000000 */ add.s $f0, $f0, $f0 /* D54CFC 8024066C AE230000 */ sw $v1, ($s1) /* D54D00 80240670 44881000 */ mtc1 $t0, $f2 -/* D54D04 80240674 00000000 */ nop +/* D54D04 80240674 00000000 */ nop /* D54D08 80240678 468010A0 */ cvt.s.w $f2, $f2 /* D54D0C 8024067C 46000007 */ neg.s $f0, $f0 /* D54D10 80240680 46020003 */ div.s $f0, $f0, $f2 @@ -329,13 +334,14 @@ glabel func_802401B0_D54840 /* D54D24 80240694 2402000D */ addiu $v0, $zero, 0xd /* D54D28 80240698 A620008E */ sh $zero, 0x8e($s1) /* D54D2C 8024069C AE620070 */ sw $v0, 0x70($s3) +glabel L802406A0_D54D30 /* D54D30 802406A0 C620001C */ lwc1 $f0, 0x1c($s1) /* D54D34 802406A4 C6220014 */ lwc1 $f2, 0x14($s1) /* D54D38 802406A8 46020001 */ sub.s $f0, $f0, $f2 /* D54D3C 802406AC 4480A000 */ mtc1 $zero, $f20 -/* D54D40 802406B0 00000000 */ nop +/* D54D40 802406B0 00000000 */ nop /* D54D44 802406B4 4614003C */ c.lt.s $f0, $f20 -/* D54D48 802406B8 00000000 */ nop +/* D54D48 802406B8 00000000 */ nop /* D54D4C 802406BC 45000012 */ bc1f .L80240708 /* D54D50 802406C0 E620001C */ swc1 $f0, 0x1c($s1) /* D54D54 802406C4 27A50040 */ addiu $a1, $sp, 0x40 @@ -364,7 +370,7 @@ glabel func_802401B0_D54840 /* D54DAC 8024071C 44801800 */ mtc1 $zero, $f3 /* D54DB0 80240720 46000021 */ cvt.d.s $f0, $f0 /* D54DB4 80240724 4620103C */ c.lt.d $f2, $f0 -/* D54DB8 80240728 00000000 */ nop +/* D54DB8 80240728 00000000 */ nop /* D54DBC 8024072C 45000057 */ bc1f .L8024088C /* D54DC0 80240730 E624003C */ swc1 $f4, 0x3c($s1) /* D54DC4 80240734 46002086 */ mov.s $f2, $f4 @@ -380,20 +386,20 @@ glabel func_802401B0_D54840 /* D54DEC 8024075C 862200A8 */ lh $v0, 0xa8($s1) /* D54DF0 80240760 27A50040 */ addiu $a1, $sp, 0x40 /* D54DF4 80240764 44820000 */ mtc1 $v0, $f0 -/* D54DF8 80240768 00000000 */ nop +/* D54DF8 80240768 00000000 */ nop /* D54DFC 8024076C 46800020 */ cvt.s.w $f0, $f0 /* D54E00 80240770 E7A00018 */ swc1 $f0, 0x18($sp) /* D54E04 80240774 862200A6 */ lh $v0, 0xa6($s1) /* D54E08 80240778 27A60044 */ addiu $a2, $sp, 0x44 /* D54E0C 8024077C 44820000 */ mtc1 $v0, $f0 -/* D54E10 80240780 00000000 */ nop +/* D54E10 80240780 00000000 */ nop /* D54E14 80240784 46800020 */ cvt.s.w $f0, $f0 /* D54E18 80240788 E7A0001C */ swc1 $f0, 0x1c($sp) /* D54E1C 8024078C 8E240080 */ lw $a0, 0x80($s1) /* D54E20 80240790 0C037711 */ jal func_800DDC44 /* D54E24 80240794 27A70048 */ addiu $a3, $sp, 0x48 /* D54E28 80240798 10400003 */ beqz $v0, .L802407A8 -/* D54E2C 8024079C 00000000 */ nop +/* D54E2C 8024079C 00000000 */ nop /* D54E30 802407A0 0809021F */ j .L8024087C /* D54E34 802407A4 AE200018 */ sw $zero, 0x18($s1) .L802407A8: @@ -403,9 +409,9 @@ glabel func_802401B0_D54840 /* D54E44 802407B4 44801000 */ mtc1 $zero, $f2 /* D54E48 802407B8 46000021 */ cvt.d.s $f0, $f0 /* D54E4C 802407BC 4622003C */ c.lt.d $f0, $f2 -/* D54E50 802407C0 00000000 */ nop +/* D54E50 802407C0 00000000 */ nop /* D54E54 802407C4 4500002D */ bc1f .L8024087C -/* D54E58 802407C8 00000000 */ nop +/* D54E58 802407C8 00000000 */ nop /* D54E5C 802407CC 9622008E */ lhu $v0, 0x8e($s1) /* D54E60 802407D0 24420001 */ addiu $v0, $v0, 1 /* D54E64 802407D4 A622008E */ sh $v0, 0x8e($s1) @@ -414,7 +420,7 @@ glabel func_802401B0_D54840 /* D54E70 802407E0 00021403 */ sra $v0, $v0, 0x10 /* D54E74 802407E4 0043102A */ slt $v0, $v0, $v1 /* D54E78 802407E8 14400024 */ bnez $v0, .L8024087C -/* D54E7C 802407EC 00000000 */ nop +/* D54E7C 802407EC 00000000 */ nop /* D54E80 802407F0 C62C0038 */ lwc1 $f12, 0x38($s1) /* D54E84 802407F4 C62E0040 */ lwc1 $f14, 0x40($s1) /* D54E88 802407F8 8EA60028 */ lw $a2, 0x28($s5) @@ -428,20 +434,20 @@ glabel func_802401B0_D54840 /* D54EA8 80240818 8E82001C */ lw $v0, 0x1c($s4) /* D54EAC 8024081C 46001005 */ abs.s $f0, $f2 /* D54EB0 80240820 44822000 */ mtc1 $v0, $f4 -/* D54EB4 80240824 00000000 */ nop +/* D54EB4 80240824 00000000 */ nop /* D54EB8 80240828 46802120 */ cvt.s.w $f4, $f4 /* D54EBC 8024082C 4600203C */ c.lt.s $f4, $f0 -/* D54EC0 80240830 00000000 */ nop +/* D54EC0 80240830 00000000 */ nop /* D54EC4 80240834 4500000D */ bc1f .L8024086C -/* D54EC8 80240838 00000000 */ nop +/* D54EC8 80240838 00000000 */ nop /* D54ECC 8024083C 44800000 */ mtc1 $zero, $f0 /* D54ED0 80240840 C634000C */ lwc1 $f20, 0xc($s1) /* D54ED4 80240844 4600103C */ c.lt.s $f2, $f0 -/* D54ED8 80240848 00000000 */ nop +/* D54ED8 80240848 00000000 */ nop /* D54EDC 8024084C 45000006 */ bc1f .L80240868 /* D54EE0 80240850 00021023 */ negu $v0, $v0 /* D54EE4 80240854 44820000 */ mtc1 $v0, $f0 -/* D54EE8 80240858 00000000 */ nop +/* D54EE8 80240858 00000000 */ nop /* D54EEC 8024085C 46800020 */ cvt.s.w $f0, $f0 /* D54EF0 80240860 0809021B */ j .L8024086C /* D54EF4 80240864 4600A500 */ add.s $f20, $f20, $f0 @@ -468,11 +474,12 @@ glabel func_802401B0_D54840 /* D54F34 802408A4 C620003C */ lwc1 $f0, 0x3c($s1) /* D54F38 802408A8 C6220068 */ lwc1 $f2, 0x68($s1) /* D54F3C 802408AC 4600103C */ c.lt.s $f2, $f0 -/* D54F40 802408B0 00000000 */ nop +/* D54F40 802408B0 00000000 */ nop /* D54F44 802408B4 45000015 */ bc1f .L8024090C /* D54F48 802408B8 2402000E */ addiu $v0, $zero, 0xe /* D54F4C 802408BC E622003C */ swc1 $f2, 0x3c($s1) /* D54F50 802408C0 AE620070 */ sw $v0, 0x70($s3) +glabel L802408C4_D54F54 /* D54F54 802408C4 8E4200CC */ lw $v0, 0xcc($s2) /* D54F58 802408C8 922300A9 */ lbu $v1, 0xa9($s1) /* D54F5C 802408CC 8C440020 */ lw $a0, 0x20($v0) @@ -485,6 +492,7 @@ glabel func_802401B0_D54840 /* D54F78 802408E8 2402000F */ addiu $v0, $zero, 0xf /* D54F7C 802408EC AE240028 */ sw $a0, 0x28($s1) /* D54F80 802408F0 AE620070 */ sw $v0, 0x70($s3) +glabel L802408F4_D54F84 /* D54F84 802408F4 9622008E */ lhu $v0, 0x8e($s1) /* D54F88 802408F8 2442FFFF */ addiu $v0, $v0, -1 /* D54F8C 802408FC A622008E */ sh $v0, 0x8e($s1) @@ -492,6 +500,7 @@ glabel func_802401B0_D54840 /* D54F94 80240904 58400001 */ blezl $v0, .L8024090C /* D54F98 80240908 AE600070 */ sw $zero, 0x70($s3) .L8024090C: +glabel L8024090C_D54F9C /* D54F9C 8024090C 0000102D */ daddu $v0, $zero, $zero .L80240910: /* D54FA0 80240910 8FBF006C */ lw $ra, 0x6c($sp) @@ -505,4 +514,4 @@ glabel func_802401B0_D54840 /* D54FC0 80240930 D7B40070 */ ldc1 $f20, 0x70($sp) /* D54FC4 80240934 03E00008 */ jr $ra /* D54FC8 80240938 27BD0078 */ addiu $sp, $sp, 0x78 -/* D54FCC 8024093C 00000000 */ nop +/* D54FCC 8024093C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240054_D55C04.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240054_D55C04.s index ee1423f334..478c837061 100644 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240054_D55C04.s +++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240054_D55C04.s @@ -40,7 +40,7 @@ glabel func_80240054_D55C04 /* D55C80 802400D0 1440FFF7 */ bnez $v0, .L802400B0 /* D55C84 802400D4 24820001 */ addiu $v0, $a0, 1 /* D55C88 802400D8 03E00008 */ jr $ra -/* D55C8C 802400DC 00000000 */ nop +/* D55C8C 802400DC 00000000 */ nop .L802400E0: /* D55C90 802400E0 3C020100 */ lui $v0, 0x100 .L802400E4: diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s index a70e2615a8..22de9b8672 100644 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s +++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s @@ -16,7 +16,7 @@ glabel func_80240128_D55CD8 /* D55D04 80240154 27B20020 */ addiu $s2, $sp, 0x20 /* D55D08 80240158 8E0400CC */ lw $a0, 0xcc($s0) /* D55D0C 8024015C 0C044181 */ jal get_shadow_by_index -/* D55D10 80240160 00000000 */ nop +/* D55D10 80240160 00000000 */ nop /* D55D14 80240164 0C048B77 */ jal func_80122DDC /* D55D18 80240168 84440008 */ lh $a0, 8($v0) /* D55D1C 8024016C 8C430000 */ lw $v1, ($v0) @@ -38,22 +38,22 @@ glabel func_80240128_D55CD8 /* D55D5C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D55D60 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) /* D55D64 802401B4 0C090008 */ jal pra_05_UnkFunc2 -/* D55D68 802401B8 00000000 */ nop +/* D55D68 802401B8 00000000 */ nop /* D55D6C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D55D70 802401C0 3C014307 */ lui $at, 0x4307 /* D55D74 802401C4 44810000 */ mtc1 $at, $f0 -/* D55D78 802401C8 00000000 */ nop +/* D55D78 802401C8 00000000 */ nop /* D55D7C 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D55D80 802401D0 00000000 */ nop +/* D55D80 802401D0 00000000 */ nop /* D55D84 802401D4 4500000B */ bc1f .L80240204 /* D55D88 802401D8 24040002 */ addiu $a0, $zero, 2 /* D55D8C 802401DC 3C014361 */ lui $at, 0x4361 /* D55D90 802401E0 44810000 */ mtc1 $at, $f0 -/* D55D94 802401E4 00000000 */ nop +/* D55D94 802401E4 00000000 */ nop /* D55D98 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D55D9C 802401EC 00000000 */ nop +/* D55D9C 802401EC 00000000 */ nop /* D55DA0 802401F0 45000004 */ bc1f .L80240204 -/* D55DA4 802401F4 00000000 */ nop +/* D55DA4 802401F4 00000000 */ nop /* D55DA8 802401F8 0C090015 */ jal func_80240054_D55C04 /* D55DAC 802401FC 0040202D */ daddu $a0, $v0, $zero /* D55DB0 80240200 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240128_D55CD8 /* D55E38 80240288 AFA0001C */ sw $zero, 0x1c($sp) .L8024028C: /* D55E3C 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D55E40 80240290 00000000 */ nop +/* D55E40 80240290 00000000 */ nop .L80240294: /* D55E44 80240294 9202000E */ lbu $v0, 0xe($s0) /* D55E48 80240298 3C01802E */ lui $at, %hi(D_802D9D70) diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_802402F0_D55EA0.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_802402F0_D55EA0.s index 5e1d4cd79b..77041d55f3 100644 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_802402F0_D55EA0.s +++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_802402F0_D55EA0.s @@ -33,7 +33,7 @@ glabel func_802402F0_D55EA0 /* D55F10 80240360 E7B40010 */ swc1 $f20, 0x10($sp) /* D55F14 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) /* D55F18 80240368 0C00A6C9 */ jal clamp_angle -/* D55F1C 8024036C 00000000 */ nop +/* D55F1C 8024036C 00000000 */ nop /* D55F20 80240370 44050000 */ mfc1 $a1, $f0 /* D55F24 80240374 4406A000 */ mfc1 $a2, $f20 /* D55F28 80240378 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_8024049C_D5604C.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_8024049C_D5604C.s index 3077f9dde3..3f3e5fb6a0 100644 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_8024049C_D5604C.s +++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_8024049C_D5604C.s @@ -10,7 +10,7 @@ glabel func_8024049C_D5604C /* D56060 802404B0 0440000E */ bltz $v0, .L802404EC /* D56064 802404B4 28420002 */ slti $v0, $v0, 2 /* D56068 802404B8 1040000C */ beqz $v0, .L802404EC -/* D5606C 802404BC 00000000 */ nop +/* D5606C 802404BC 00000000 */ nop /* D56070 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D560B0) /* D56074 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D560B0) /* D56078 802404C8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240500_D560B0.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240500_D560B0.s index 58586952a2..cd635a0b28 100644 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240500_D560B0.s +++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240500_D560B0.s @@ -16,7 +16,7 @@ glabel func_80240500_D560B0 /* D560DC 8024052C 27B10020 */ addiu $s1, $sp, 0x20 /* D560E0 80240530 8E0400CC */ lw $a0, 0xcc($s0) /* D560E4 80240534 0C044181 */ jal get_shadow_by_index -/* D560E8 80240538 00000000 */ nop +/* D560E8 80240538 00000000 */ nop /* D560EC 8024053C 0C048B77 */ jal func_80122DDC /* D560F0 80240540 84440008 */ lh $a0, 8($v0) /* D560F4 80240544 8E050028 */ lw $a1, 0x28($s0) @@ -33,7 +33,7 @@ glabel func_80240500_D560B0 /* D56120 80240570 46000007 */ neg.s $f0, $f0 /* D56124 80240574 44060000 */ mfc1 $a2, $f0 /* D56128 80240578 0C00B94E */ jal get_screen_coords -/* D5612C 8024057C 00000000 */ nop +/* D5612C 8024057C 00000000 */ nop /* D56130 80240580 8E0500A4 */ lw $a1, 0xa4($s0) /* D56134 80240584 3C063F80 */ lui $a2, 0x3f80 /* D56138 80240588 0C0B76A3 */ jal func_802DDA8C @@ -72,13 +72,13 @@ glabel func_80240500_D560B0 /* D561B8 80240608 AFA0001C */ sw $zero, 0x1c($sp) .L8024060C: /* D561BC 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D561C0 80240610 00000000 */ nop +/* D561C0 80240610 00000000 */ nop .L80240614: /* D561C4 80240614 9202000E */ lbu $v0, 0xe($s0) /* D561C8 80240618 3C01802E */ lui $at, %hi(D_802D9D71) /* D561CC 8024061C A0229D71 */ sb $v0, %lo(D_802D9D71)($at) /* D561D0 80240620 0809018C */ j .L80240630 -/* D561D4 80240624 00000000 */ nop +/* D561D4 80240624 00000000 */ nop .L80240628: /* D561D8 80240628 3C01802E */ lui $at, %hi(D_802D9D71) /* D561DC 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_8024068C_D5623C.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_8024068C_D5623C.s index 974e0cdb1b..297f2e4c1d 100644 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_8024068C_D5623C.s +++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_8024068C_D5623C.s @@ -33,7 +33,7 @@ glabel func_8024068C_D5623C /* D562AC 802406FC E7B40010 */ swc1 $f20, 0x10($sp) /* D562B0 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) /* D562B4 80240704 0C00A6C9 */ jal clamp_angle -/* D562B8 80240708 00000000 */ nop +/* D562B8 80240708 00000000 */ nop /* D562BC 8024070C 44050000 */ mfc1 $a1, $f0 /* D562C0 80240710 4406A000 */ mfc1 $a2, $f20 /* D562C4 80240714 4407A000 */ mfc1 $a3, $f20 @@ -95,16 +95,16 @@ glabel func_8024068C_D5623C /* D563A4 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D563A8 802407F8 3C0142B4 */ lui $at, 0x42b4 /* D563AC 802407FC 44810000 */ mtc1 $at, $f0 -/* D563B0 80240800 00000000 */ nop +/* D563B0 80240800 00000000 */ nop /* D563B4 80240804 4602003E */ c.le.s $f0, $f2 -/* D563B8 80240808 00000000 */ nop +/* D563B8 80240808 00000000 */ nop /* D563BC 8024080C 4500000A */ bc1f .L80240838 /* D563C0 80240810 24040001 */ addiu $a0, $zero, 1 /* D563C4 80240814 3C014387 */ lui $at, 0x4387 /* D563C8 80240818 44810000 */ mtc1 $at, $f0 -/* D563CC 8024081C 00000000 */ nop +/* D563CC 8024081C 00000000 */ nop /* D563D0 80240820 4600103C */ c.lt.s $f2, $f0 -/* D563D4 80240824 00000000 */ nop +/* D563D4 80240824 00000000 */ nop /* D563D8 80240828 45000004 */ bc1f .L8024083C /* D563DC 8024082C 27A20018 */ addiu $v0, $sp, 0x18 /* D563E0 80240830 3C041000 */ lui $a0, 0x1000 diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240870_D56420.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240870_D56420.s index fe112e4bb0..bacd6b6116 100644 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240870_D56420.s +++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240870_D56420.s @@ -43,36 +43,36 @@ glabel func_80240870_D56420 /* D564B4 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D564B8 80240908 3C0142B4 */ lui $at, 0x42b4 /* D564BC 8024090C 44810000 */ mtc1 $at, $f0 -/* D564C0 80240910 00000000 */ nop +/* D564C0 80240910 00000000 */ nop /* D564C4 80240914 4602003C */ c.lt.s $f0, $f2 -/* D564C8 80240918 00000000 */ nop +/* D564C8 80240918 00000000 */ nop /* D564CC 8024091C 4500000A */ bc1f .L80240948 -/* D564D0 80240920 00000000 */ nop +/* D564D0 80240920 00000000 */ nop /* D564D4 80240924 3C014334 */ lui $at, 0x4334 /* D564D8 80240928 44812000 */ mtc1 $at, $f4 -/* D564DC 8024092C 00000000 */ nop +/* D564DC 8024092C 00000000 */ nop /* D564E0 80240930 4604103E */ c.le.s $f2, $f4 -/* D564E4 80240934 00000000 */ nop +/* D564E4 80240934 00000000 */ nop /* D564E8 80240938 45000003 */ bc1f .L80240948 -/* D564EC 8024093C 00000000 */ nop +/* D564EC 8024093C 00000000 */ nop /* D564F0 80240940 08090276 */ j .L802409D8 /* D564F4 80240944 46022501 */ sub.s $f20, $f4, $f2 .L80240948: /* D564F8 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) /* D564FC 8024094C 3C014334 */ lui $at, 0x4334 /* D56500 80240950 44812000 */ mtc1 $at, $f4 -/* D56504 80240954 00000000 */ nop +/* D56504 80240954 00000000 */ nop /* D56508 80240958 4600203C */ c.lt.s $f4, $f0 -/* D5650C 8024095C 00000000 */ nop +/* D5650C 8024095C 00000000 */ nop /* D56510 80240960 4500000C */ bc1f .L80240994 -/* D56514 80240964 00000000 */ nop +/* D56514 80240964 00000000 */ nop /* D56518 80240968 3C014387 */ lui $at, 0x4387 /* D5651C 8024096C 44812000 */ mtc1 $at, $f4 -/* D56520 80240970 00000000 */ nop +/* D56520 80240970 00000000 */ nop /* D56524 80240974 4604003E */ c.le.s $f0, $f4 -/* D56528 80240978 00000000 */ nop +/* D56528 80240978 00000000 */ nop /* D5652C 8024097C 45000008 */ bc1f .L802409A0 -/* D56530 80240980 00000000 */ nop +/* D56530 80240980 00000000 */ nop /* D56534 80240984 3C014334 */ lui $at, 0x4334 /* D56538 80240988 44812000 */ mtc1 $at, $f4 /* D5653C 8024098C 08090276 */ j .L802409D8 @@ -80,19 +80,19 @@ glabel func_80240870_D56420 .L80240994: /* D56544 80240994 3C014387 */ lui $at, 0x4387 /* D56548 80240998 44812000 */ mtc1 $at, $f4 -/* D5654C 8024099C 00000000 */ nop +/* D5654C 8024099C 00000000 */ nop .L802409A0: /* D56550 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D56554 802409A4 00000000 */ nop +/* D56554 802409A4 00000000 */ nop /* D56558 802409A8 4500000A */ bc1f .L802409D4 -/* D5655C 802409AC 00000000 */ nop +/* D5655C 802409AC 00000000 */ nop /* D56560 802409B0 3C0143B4 */ lui $at, 0x43b4 /* D56564 802409B4 44811000 */ mtc1 $at, $f2 -/* D56568 802409B8 00000000 */ nop +/* D56568 802409B8 00000000 */ nop /* D5656C 802409BC 4602003E */ c.le.s $f0, $f2 -/* D56570 802409C0 00000000 */ nop +/* D56570 802409C0 00000000 */ nop /* D56574 802409C4 45000003 */ bc1f .L802409D4 -/* D56578 802409C8 00000000 */ nop +/* D56578 802409C8 00000000 */ nop /* D5657C 802409CC 08090276 */ j .L802409D8 /* D56580 802409D0 46001501 */ sub.s $f20, $f2, $f0 .L802409D4: @@ -100,11 +100,11 @@ glabel func_80240870_D56420 .L802409D8: /* D56588 802409D8 3C0141C8 */ lui $at, 0x41c8 /* D5658C 802409DC 44810000 */ mtc1 $at, $f0 -/* D56590 802409E0 00000000 */ nop +/* D56590 802409E0 00000000 */ nop /* D56594 802409E4 4600A003 */ div.s $f0, $f20, $f0 /* D56598 802409E8 4600010D */ trunc.w.s $f4, $f0 /* D5659C 802409EC 44072000 */ mfc1 $a3, $f4 -/* D565A0 802409F0 00000000 */ nop +/* D565A0 802409F0 00000000 */ nop /* D565A4 802409F4 00071100 */ sll $v0, $a3, 4 /* D565A8 802409F8 00471023 */ subu $v0, $v0, $a3 /* D565AC 802409FC 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel func_80240870_D56420 /* D565F4 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) /* D565F8 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) /* D565FC 80240A4C 0C00A6C9 */ jal clamp_angle -/* D56600 80240A50 00000000 */ nop +/* D56600 80240A50 00000000 */ nop /* D56604 80240A54 44050000 */ mfc1 $a1, $f0 /* D56608 80240A58 4406B000 */ mfc1 $a2, $f22 /* D5660C 80240A5C 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel func_80240870_D56420 /* D56670 80240AC0 24040001 */ addiu $a0, $zero, 1 .L80240AC4: /* D56674 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D56678 80240AC8 00000000 */ nop +/* D56678 80240AC8 00000000 */ nop /* D5667C 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 /* D56680 80240AD0 24040001 */ addiu $a0, $zero, 1 .L80240AD4: @@ -204,10 +204,10 @@ glabel func_80240870_D56420 /* D56710 80240B60 44812000 */ mtc1 $at, $f4 /* D56714 80240B64 00021023 */ negu $v0, $v0 /* D56718 80240B68 44820000 */ mtc1 $v0, $f0 -/* D5671C 80240B6C 00000000 */ nop +/* D5671C 80240B6C 00000000 */ nop /* D56720 80240B70 46800020 */ cvt.s.w $f0, $f0 /* D56724 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D56728 80240B78 00000000 */ nop +/* D56728 80240B78 00000000 */ nop /* D5672C 80240B7C 4405B000 */ mfc1 $a1, $f22 /* D56730 80240B80 4407B000 */ mfc1 $a3, $f22 /* D56734 80240B84 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel func_80240870_D56420 /* D567A4 80240BF4 3C013F00 */ lui $at, 0x3f00 /* D567A8 80240BF8 44812000 */ mtc1 $at, $f4 /* D567AC 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D567B0 80240C00 00000000 */ nop +/* D567B0 80240C00 00000000 */ nop /* D567B4 80240C04 46800020 */ cvt.s.w $f0, $f0 /* D567B8 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D567BC 80240C0C 00000000 */ nop +/* D567BC 80240C0C 00000000 */ nop /* D567C0 80240C10 4405B000 */ mfc1 $a1, $f22 /* D567C4 80240C14 4407B000 */ mfc1 $a3, $f22 /* D567C8 80240C18 44062000 */ mfc1 $a2, $f4 @@ -280,16 +280,16 @@ glabel func_80240870_D56420 /* D56840 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D56844 80240C94 3C0142B4 */ lui $at, 0x42b4 /* D56848 80240C98 44810000 */ mtc1 $at, $f0 -/* D5684C 80240C9C 00000000 */ nop +/* D5684C 80240C9C 00000000 */ nop /* D56850 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D56854 80240CA4 00000000 */ nop +/* D56854 80240CA4 00000000 */ nop /* D56858 80240CA8 4500000A */ bc1f .L80240CD4 /* D5685C 80240CAC 24040001 */ addiu $a0, $zero, 1 /* D56860 80240CB0 3C014387 */ lui $at, 0x4387 /* D56864 80240CB4 44812000 */ mtc1 $at, $f4 -/* D56868 80240CB8 00000000 */ nop +/* D56868 80240CB8 00000000 */ nop /* D5686C 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D56870 80240CC0 00000000 */ nop +/* D56870 80240CC0 00000000 */ nop /* D56874 80240CC4 45000004 */ bc1f .L80240CD8 /* D56878 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 /* D5687C 80240CCC 3C041000 */ lui $a0, 0x1000 @@ -305,7 +305,7 @@ glabel func_80240870_D56420 /* D5689C 80240CEC 26730001 */ addiu $s3, $s3, 1 /* D568A0 80240CF0 2A620002 */ slti $v0, $s3, 2 /* D568A4 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D568A8 80240CF8 00000000 */ nop +/* D568A8 80240CF8 00000000 */ nop /* D568AC 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) /* D568B0 80240D00 8FB60148 */ lw $s6, 0x148($sp) /* D568B4 80240D04 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240D3C_D568EC.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240D3C_D568EC.s index 451ca1f901..12c5eb32ab 100644 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240D3C_D568EC.s +++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240D3C_D568EC.s @@ -11,36 +11,36 @@ glabel func_80240D3C_D568EC /* D56904 80240D54 24020001 */ addiu $v0, $zero, 1 /* D56908 80240D58 8E030084 */ lw $v1, 0x84($s0) /* D5690C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D56910 80240D60 00000000 */ nop +/* D56910 80240D60 00000000 */ nop /* D56914 80240D64 28620002 */ slti $v0, $v1, 2 /* D56918 80240D68 50400005 */ beql $v0, $zero, .L80240D80 /* D5691C 80240D6C 24020002 */ addiu $v0, $zero, 2 /* D56920 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D56924 80240D74 00000000 */ nop +/* D56924 80240D74 00000000 */ nop /* D56928 80240D78 08090378 */ j .L80240DE0 -/* D5692C 80240D7C 00000000 */ nop +/* D5692C 80240D7C 00000000 */ nop .L80240D80: /* D56930 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D56934 80240D84 00000000 */ nop +/* D56934 80240D84 00000000 */ nop /* D56938 80240D88 08090378 */ j .L80240DE0 -/* D5693C 80240D8C 00000000 */ nop +/* D5693C 80240D8C 00000000 */ nop .L80240D90: /* D56940 80240D90 3C048024 */ lui $a0, %hi(pra_05_SetPartnerFlagsA0000) /* D56944 80240D94 24840E84 */ addiu $a0, $a0, %lo(pra_05_SetPartnerFlagsA0000) /* D56948 80240D98 08090374 */ j .L80240DD0 -/* D5694C 80240D9C 00000000 */ nop +/* D5694C 80240D9C 00000000 */ nop .L80240DA0: /* D56950 80240DA0 3C048024 */ lui $a0, %hi(pra_05_SetPartnerFlags20000) /* D56954 80240DA4 24840EEC */ addiu $a0, $a0, %lo(pra_05_SetPartnerFlags20000) /* D56958 80240DA8 08090374 */ j .L80240DD0 -/* D5695C 80240DAC 00000000 */ nop +/* D5695C 80240DAC 00000000 */ nop .L80240DB0: /* D56960 80240DB0 8E020084 */ lw $v0, 0x84($s0) /* D56964 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D56968 80240DB8 00000000 */ nop +/* D56968 80240DB8 00000000 */ nop /* D5696C 80240DBC 28420002 */ slti $v0, $v0, 2 /* D56970 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D56974 80240DC4 00000000 */ nop +/* D56974 80240DC4 00000000 */ nop .L80240DC8: /* D56978 80240DC8 3C048024 */ lui $a0, %hi(pra_05_SetPartnerFlags80000) /* D5697C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(pra_05_SetPartnerFlags80000) @@ -64,14 +64,14 @@ glabel func_80240D3C_D568EC /* D569BC 80240E0C 10400005 */ beqz $v0, .L80240E24 /* D569C0 80240E10 24020002 */ addiu $v0, $zero, 2 /* D569C4 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D569C8 80240E18 00000000 */ nop +/* D569C8 80240E18 00000000 */ nop /* D569CC 80240E1C 0809039D */ j .L80240E74 -/* D569D0 80240E20 00000000 */ nop +/* D569D0 80240E20 00000000 */ nop .L80240E24: /* D569D4 80240E24 10820006 */ beq $a0, $v0, .L80240E40 /* D569D8 80240E28 24020002 */ addiu $v0, $zero, 2 /* D569DC 80240E2C 0809039D */ j .L80240E74 -/* D569E0 80240E30 00000000 */ nop +/* D569E0 80240E30 00000000 */ nop .L80240E34: /* D569E4 80240E34 8CA20000 */ lw $v0, ($a1) /* D569E8 80240E38 0809039A */ j .L80240E68 diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240F20_D56AD0.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240F20_D56AD0.s index 96e14fbe58..71aa7ee3dc 100644 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240F20_D56AD0.s +++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240F20_D56AD0.s @@ -26,7 +26,7 @@ glabel func_80240F20_D56AD0 /* D56B20 80240F70 1440FFFA */ bnez $v0, .L80240F5C /* D56B24 80240F74 24A50004 */ addiu $a1, $a1, 4 /* D56B28 80240F78 080903EF */ j .L80240FBC -/* D56B2C 80240F7C 00000000 */ nop +/* D56B2C 80240F7C 00000000 */ nop .L80240F80: /* D56B30 80240F80 0000182D */ daddu $v1, $zero, $zero /* D56B34 80240F84 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240084_D574B4.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240084_D574B4.s index 02a3020391..1abd275ff7 100644 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240084_D574B4.s +++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240084_D574B4.s @@ -40,7 +40,7 @@ glabel func_80240084_D574B4 /* D57530 80240100 1440FFF7 */ bnez $v0, .L802400E0 /* D57534 80240104 24820001 */ addiu $v0, $a0, 1 /* D57538 80240108 03E00008 */ jr $ra -/* D5753C 8024010C 00000000 */ nop +/* D5753C 8024010C 00000000 */ nop .L80240110: /* D57540 80240110 3C020100 */ lui $v0, 0x100 .L80240114: diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s index 327a01beda..d7948b7b86 100644 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s +++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s @@ -16,7 +16,7 @@ glabel func_80240158_D57588 /* D575B4 80240184 27B20020 */ addiu $s2, $sp, 0x20 /* D575B8 80240188 8E0400CC */ lw $a0, 0xcc($s0) /* D575BC 8024018C 0C044181 */ jal get_shadow_by_index -/* D575C0 80240190 00000000 */ nop +/* D575C0 80240190 00000000 */ nop /* D575C4 80240194 0C048B77 */ jal func_80122DDC /* D575C8 80240198 84440008 */ lh $a0, 8($v0) /* D575CC 8024019C 8C430000 */ lw $v1, ($v0) @@ -38,22 +38,22 @@ glabel func_80240158_D57588 /* D5760C 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D57610 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) /* D57614 802401E4 0C090014 */ jal pra_06_UnkFunc2 -/* D57618 802401E8 00000000 */ nop +/* D57618 802401E8 00000000 */ nop /* D5761C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D57620 802401F0 3C014307 */ lui $at, 0x4307 /* D57624 802401F4 44810000 */ mtc1 $at, $f0 -/* D57628 802401F8 00000000 */ nop +/* D57628 802401F8 00000000 */ nop /* D5762C 802401FC 4602003C */ c.lt.s $f0, $f2 -/* D57630 80240200 00000000 */ nop +/* D57630 80240200 00000000 */ nop /* D57634 80240204 4500000B */ bc1f .L80240234 /* D57638 80240208 24040002 */ addiu $a0, $zero, 2 /* D5763C 8024020C 3C014361 */ lui $at, 0x4361 /* D57640 80240210 44810000 */ mtc1 $at, $f0 -/* D57644 80240214 00000000 */ nop +/* D57644 80240214 00000000 */ nop /* D57648 80240218 4600103C */ c.lt.s $f2, $f0 -/* D5764C 8024021C 00000000 */ nop +/* D5764C 8024021C 00000000 */ nop /* D57650 80240220 45000004 */ bc1f .L80240234 -/* D57654 80240224 00000000 */ nop +/* D57654 80240224 00000000 */ nop /* D57658 80240228 0C090021 */ jal func_80240084_D574B4 /* D5765C 8024022C 0040202D */ daddu $a0, $v0, $zero /* D57660 80240230 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240158_D57588 /* D576E8 802402B8 AFA0001C */ sw $zero, 0x1c($sp) .L802402BC: /* D576EC 802402BC 0C0B77B9 */ jal func_802DDEE4 -/* D576F0 802402C0 00000000 */ nop +/* D576F0 802402C0 00000000 */ nop .L802402C4: /* D576F4 802402C4 9202000E */ lbu $v0, 0xe($s0) /* D576F8 802402C8 3C01802E */ lui $at, %hi(D_802D9D70) diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240320_D57750.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240320_D57750.s index 8fad80f8e1..4e26713e4b 100644 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240320_D57750.s +++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240320_D57750.s @@ -33,7 +33,7 @@ glabel func_80240320_D57750 /* D577C0 80240390 E7B40010 */ swc1 $f20, 0x10($sp) /* D577C4 80240394 C62C008C */ lwc1 $f12, 0x8c($s1) /* D577C8 80240398 0C00A6C9 */ jal clamp_angle -/* D577CC 8024039C 00000000 */ nop +/* D577CC 8024039C 00000000 */ nop /* D577D0 802403A0 44050000 */ mfc1 $a1, $f0 /* D577D4 802403A4 4406A000 */ mfc1 $a2, $f20 /* D577D8 802403A8 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802404CC_D578FC.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802404CC_D578FC.s index 52c98ae74c..0a034d077b 100644 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802404CC_D578FC.s +++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802404CC_D578FC.s @@ -10,7 +10,7 @@ glabel func_802404CC_D578FC /* D57910 802404E0 0440000E */ bltz $v0, .L8024051C /* D57914 802404E4 28420002 */ slti $v0, $v0, 2 /* D57918 802404E8 1040000C */ beqz $v0, .L8024051C -/* D5791C 802404EC 00000000 */ nop +/* D5791C 802404EC 00000000 */ nop /* D57920 802404F0 3C058024 */ lui $a1, %hi(func_80240530_D57960) /* D57924 802404F4 24A50530 */ addiu $a1, $a1, %lo(func_80240530_D57960) /* D57928 802404F8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240530_D57960.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240530_D57960.s index e454351ba8..e38a4eb293 100644 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240530_D57960.s +++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240530_D57960.s @@ -16,7 +16,7 @@ glabel func_80240530_D57960 /* D5798C 8024055C 27B10020 */ addiu $s1, $sp, 0x20 /* D57990 80240560 8E0400CC */ lw $a0, 0xcc($s0) /* D57994 80240564 0C044181 */ jal get_shadow_by_index -/* D57998 80240568 00000000 */ nop +/* D57998 80240568 00000000 */ nop /* D5799C 8024056C 0C048B77 */ jal func_80122DDC /* D579A0 80240570 84440008 */ lh $a0, 8($v0) /* D579A4 80240574 8E050028 */ lw $a1, 0x28($s0) @@ -33,7 +33,7 @@ glabel func_80240530_D57960 /* D579D0 802405A0 46000007 */ neg.s $f0, $f0 /* D579D4 802405A4 44060000 */ mfc1 $a2, $f0 /* D579D8 802405A8 0C00B94E */ jal get_screen_coords -/* D579DC 802405AC 00000000 */ nop +/* D579DC 802405AC 00000000 */ nop /* D579E0 802405B0 8E0500A4 */ lw $a1, 0xa4($s0) /* D579E4 802405B4 3C063F80 */ lui $a2, 0x3f80 /* D579E8 802405B8 0C0B76A3 */ jal func_802DDA8C @@ -72,13 +72,13 @@ glabel func_80240530_D57960 /* D57A68 80240638 AFA0001C */ sw $zero, 0x1c($sp) .L8024063C: /* D57A6C 8024063C 0C0B77B9 */ jal func_802DDEE4 -/* D57A70 80240640 00000000 */ nop +/* D57A70 80240640 00000000 */ nop .L80240644: /* D57A74 80240644 9202000E */ lbu $v0, 0xe($s0) /* D57A78 80240648 3C01802E */ lui $at, %hi(D_802D9D71) /* D57A7C 8024064C A0229D71 */ sb $v0, %lo(D_802D9D71)($at) /* D57A80 80240650 08090198 */ j .L80240660 -/* D57A84 80240654 00000000 */ nop +/* D57A84 80240654 00000000 */ nop .L80240658: /* D57A88 80240658 3C01802E */ lui $at, %hi(D_802D9D71) /* D57A8C 8024065C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802406BC_D57AEC.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802406BC_D57AEC.s index dbaf01a844..db7975da52 100644 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802406BC_D57AEC.s +++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802406BC_D57AEC.s @@ -33,7 +33,7 @@ glabel func_802406BC_D57AEC /* D57B5C 8024072C E7B40010 */ swc1 $f20, 0x10($sp) /* D57B60 80240730 C62C008C */ lwc1 $f12, 0x8c($s1) /* D57B64 80240734 0C00A6C9 */ jal clamp_angle -/* D57B68 80240738 00000000 */ nop +/* D57B68 80240738 00000000 */ nop /* D57B6C 8024073C 44050000 */ mfc1 $a1, $f0 /* D57B70 80240740 4406A000 */ mfc1 $a2, $f20 /* D57B74 80240744 4407A000 */ mfc1 $a3, $f20 @@ -95,16 +95,16 @@ glabel func_802406BC_D57AEC /* D57C54 80240824 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D57C58 80240828 3C0142B4 */ lui $at, 0x42b4 /* D57C5C 8024082C 44810000 */ mtc1 $at, $f0 -/* D57C60 80240830 00000000 */ nop +/* D57C60 80240830 00000000 */ nop /* D57C64 80240834 4602003E */ c.le.s $f0, $f2 -/* D57C68 80240838 00000000 */ nop +/* D57C68 80240838 00000000 */ nop /* D57C6C 8024083C 4500000A */ bc1f .L80240868 /* D57C70 80240840 24040001 */ addiu $a0, $zero, 1 /* D57C74 80240844 3C014387 */ lui $at, 0x4387 /* D57C78 80240848 44810000 */ mtc1 $at, $f0 -/* D57C7C 8024084C 00000000 */ nop +/* D57C7C 8024084C 00000000 */ nop /* D57C80 80240850 4600103C */ c.lt.s $f2, $f0 -/* D57C84 80240854 00000000 */ nop +/* D57C84 80240854 00000000 */ nop /* D57C88 80240858 45000004 */ bc1f .L8024086C /* D57C8C 8024085C 27A20018 */ addiu $v0, $sp, 0x18 /* D57C90 80240860 3C041000 */ lui $a0, 0x1000 diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802408A0_D57CD0.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802408A0_D57CD0.s index 2417ca0482..13ae2125d2 100644 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802408A0_D57CD0.s +++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802408A0_D57CD0.s @@ -43,36 +43,36 @@ glabel func_802408A0_D57CD0 /* D57D64 80240934 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D57D68 80240938 3C0142B4 */ lui $at, 0x42b4 /* D57D6C 8024093C 44810000 */ mtc1 $at, $f0 -/* D57D70 80240940 00000000 */ nop +/* D57D70 80240940 00000000 */ nop /* D57D74 80240944 4602003C */ c.lt.s $f0, $f2 -/* D57D78 80240948 00000000 */ nop +/* D57D78 80240948 00000000 */ nop /* D57D7C 8024094C 4500000A */ bc1f .L80240978 -/* D57D80 80240950 00000000 */ nop +/* D57D80 80240950 00000000 */ nop /* D57D84 80240954 3C014334 */ lui $at, 0x4334 /* D57D88 80240958 44812000 */ mtc1 $at, $f4 -/* D57D8C 8024095C 00000000 */ nop +/* D57D8C 8024095C 00000000 */ nop /* D57D90 80240960 4604103E */ c.le.s $f2, $f4 -/* D57D94 80240964 00000000 */ nop +/* D57D94 80240964 00000000 */ nop /* D57D98 80240968 45000003 */ bc1f .L80240978 -/* D57D9C 8024096C 00000000 */ nop +/* D57D9C 8024096C 00000000 */ nop /* D57DA0 80240970 08090282 */ j .L80240A08 /* D57DA4 80240974 46022501 */ sub.s $f20, $f4, $f2 .L80240978: /* D57DA8 80240978 C62000A8 */ lwc1 $f0, 0xa8($s1) /* D57DAC 8024097C 3C014334 */ lui $at, 0x4334 /* D57DB0 80240980 44812000 */ mtc1 $at, $f4 -/* D57DB4 80240984 00000000 */ nop +/* D57DB4 80240984 00000000 */ nop /* D57DB8 80240988 4600203C */ c.lt.s $f4, $f0 -/* D57DBC 8024098C 00000000 */ nop +/* D57DBC 8024098C 00000000 */ nop /* D57DC0 80240990 4500000C */ bc1f .L802409C4 -/* D57DC4 80240994 00000000 */ nop +/* D57DC4 80240994 00000000 */ nop /* D57DC8 80240998 3C014387 */ lui $at, 0x4387 /* D57DCC 8024099C 44812000 */ mtc1 $at, $f4 -/* D57DD0 802409A0 00000000 */ nop +/* D57DD0 802409A0 00000000 */ nop /* D57DD4 802409A4 4604003E */ c.le.s $f0, $f4 -/* D57DD8 802409A8 00000000 */ nop +/* D57DD8 802409A8 00000000 */ nop /* D57DDC 802409AC 45000008 */ bc1f .L802409D0 -/* D57DE0 802409B0 00000000 */ nop +/* D57DE0 802409B0 00000000 */ nop /* D57DE4 802409B4 3C014334 */ lui $at, 0x4334 /* D57DE8 802409B8 44812000 */ mtc1 $at, $f4 /* D57DEC 802409BC 08090282 */ j .L80240A08 @@ -80,19 +80,19 @@ glabel func_802408A0_D57CD0 .L802409C4: /* D57DF4 802409C4 3C014387 */ lui $at, 0x4387 /* D57DF8 802409C8 44812000 */ mtc1 $at, $f4 -/* D57DFC 802409CC 00000000 */ nop +/* D57DFC 802409CC 00000000 */ nop .L802409D0: /* D57E00 802409D0 4600203C */ c.lt.s $f4, $f0 -/* D57E04 802409D4 00000000 */ nop +/* D57E04 802409D4 00000000 */ nop /* D57E08 802409D8 4500000A */ bc1f .L80240A04 -/* D57E0C 802409DC 00000000 */ nop +/* D57E0C 802409DC 00000000 */ nop /* D57E10 802409E0 3C0143B4 */ lui $at, 0x43b4 /* D57E14 802409E4 44811000 */ mtc1 $at, $f2 -/* D57E18 802409E8 00000000 */ nop +/* D57E18 802409E8 00000000 */ nop /* D57E1C 802409EC 4602003E */ c.le.s $f0, $f2 -/* D57E20 802409F0 00000000 */ nop +/* D57E20 802409F0 00000000 */ nop /* D57E24 802409F4 45000003 */ bc1f .L80240A04 -/* D57E28 802409F8 00000000 */ nop +/* D57E28 802409F8 00000000 */ nop /* D57E2C 802409FC 08090282 */ j .L80240A08 /* D57E30 80240A00 46001501 */ sub.s $f20, $f2, $f0 .L80240A04: @@ -100,11 +100,11 @@ glabel func_802408A0_D57CD0 .L80240A08: /* D57E38 80240A08 3C0141C8 */ lui $at, 0x41c8 /* D57E3C 80240A0C 44810000 */ mtc1 $at, $f0 -/* D57E40 80240A10 00000000 */ nop +/* D57E40 80240A10 00000000 */ nop /* D57E44 80240A14 4600A003 */ div.s $f0, $f20, $f0 /* D57E48 80240A18 4600010D */ trunc.w.s $f4, $f0 /* D57E4C 80240A1C 44072000 */ mfc1 $a3, $f4 -/* D57E50 80240A20 00000000 */ nop +/* D57E50 80240A20 00000000 */ nop /* D57E54 80240A24 00071100 */ sll $v0, $a3, 4 /* D57E58 80240A28 00471023 */ subu $v0, $v0, $a3 /* D57E5C 80240A2C 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel func_802408A0_D57CD0 /* D57EA4 80240A74 E7B60010 */ swc1 $f22, 0x10($sp) /* D57EA8 80240A78 C62C008C */ lwc1 $f12, 0x8c($s1) /* D57EAC 80240A7C 0C00A6C9 */ jal clamp_angle -/* D57EB0 80240A80 00000000 */ nop +/* D57EB0 80240A80 00000000 */ nop /* D57EB4 80240A84 44050000 */ mfc1 $a1, $f0 /* D57EB8 80240A88 4406B000 */ mfc1 $a2, $f22 /* D57EBC 80240A8C 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel func_802408A0_D57CD0 /* D57F20 80240AF0 24040001 */ addiu $a0, $zero, 1 .L80240AF4: /* D57F24 80240AF4 4486D000 */ mtc1 $a2, $f26 -/* D57F28 80240AF8 00000000 */ nop +/* D57F28 80240AF8 00000000 */ nop /* D57F2C 80240AFC 4680D6A0 */ cvt.s.w $f26, $f26 /* D57F30 80240B00 24040001 */ addiu $a0, $zero, 1 .L80240B04: @@ -204,10 +204,10 @@ glabel func_802408A0_D57CD0 /* D57FC0 80240B90 44812000 */ mtc1 $at, $f4 /* D57FC4 80240B94 00021023 */ negu $v0, $v0 /* D57FC8 80240B98 44820000 */ mtc1 $v0, $f0 -/* D57FCC 80240B9C 00000000 */ nop +/* D57FCC 80240B9C 00000000 */ nop /* D57FD0 80240BA0 46800020 */ cvt.s.w $f0, $f0 /* D57FD4 80240BA4 46040102 */ mul.s $f4, $f0, $f4 -/* D57FD8 80240BA8 00000000 */ nop +/* D57FD8 80240BA8 00000000 */ nop /* D57FDC 80240BAC 4405B000 */ mfc1 $a1, $f22 /* D57FE0 80240BB0 4407B000 */ mfc1 $a3, $f22 /* D57FE4 80240BB4 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel func_802408A0_D57CD0 /* D58054 80240C24 3C013F00 */ lui $at, 0x3f00 /* D58058 80240C28 44812000 */ mtc1 $at, $f4 /* D5805C 80240C2C 44820000 */ mtc1 $v0, $f0 -/* D58060 80240C30 00000000 */ nop +/* D58060 80240C30 00000000 */ nop /* D58064 80240C34 46800020 */ cvt.s.w $f0, $f0 /* D58068 80240C38 46040102 */ mul.s $f4, $f0, $f4 -/* D5806C 80240C3C 00000000 */ nop +/* D5806C 80240C3C 00000000 */ nop /* D58070 80240C40 4405B000 */ mfc1 $a1, $f22 /* D58074 80240C44 4407B000 */ mfc1 $a3, $f22 /* D58078 80240C48 44062000 */ mfc1 $a2, $f4 @@ -280,16 +280,16 @@ glabel func_802408A0_D57CD0 /* D580F0 80240CC0 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D580F4 80240CC4 3C0142B4 */ lui $at, 0x42b4 /* D580F8 80240CC8 44810000 */ mtc1 $at, $f0 -/* D580FC 80240CCC 00000000 */ nop +/* D580FC 80240CCC 00000000 */ nop /* D58100 80240CD0 4602003E */ c.le.s $f0, $f2 -/* D58104 80240CD4 00000000 */ nop +/* D58104 80240CD4 00000000 */ nop /* D58108 80240CD8 4500000A */ bc1f .L80240D04 /* D5810C 80240CDC 24040001 */ addiu $a0, $zero, 1 /* D58110 80240CE0 3C014387 */ lui $at, 0x4387 /* D58114 80240CE4 44812000 */ mtc1 $at, $f4 -/* D58118 80240CE8 00000000 */ nop +/* D58118 80240CE8 00000000 */ nop /* D5811C 80240CEC 4604103C */ c.lt.s $f2, $f4 -/* D58120 80240CF0 00000000 */ nop +/* D58120 80240CF0 00000000 */ nop /* D58124 80240CF4 45000004 */ bc1f .L80240D08 /* D58128 80240CF8 27A20020 */ addiu $v0, $sp, 0x20 /* D5812C 80240CFC 3C041000 */ lui $a0, 0x1000 @@ -305,7 +305,7 @@ glabel func_802408A0_D57CD0 /* D5814C 80240D1C 26730001 */ addiu $s3, $s3, 1 /* D58150 80240D20 2A620002 */ slti $v0, $s3, 2 /* D58154 80240D24 1440FEF6 */ bnez $v0, .L80240900 -/* D58158 80240D28 00000000 */ nop +/* D58158 80240D28 00000000 */ nop /* D5815C 80240D2C 8FBF014C */ lw $ra, 0x14c($sp) /* D58160 80240D30 8FB60148 */ lw $s6, 0x148($sp) /* D58164 80240D34 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240D6C_D5819C.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240D6C_D5819C.s index 7d778c8fab..775d374a9b 100644 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240D6C_D5819C.s +++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240D6C_D5819C.s @@ -11,36 +11,36 @@ glabel func_80240D6C_D5819C /* D581B4 80240D84 24020001 */ addiu $v0, $zero, 1 /* D581B8 80240D88 8E030084 */ lw $v1, 0x84($s0) /* D581BC 80240D8C 1062001A */ beq $v1, $v0, .L80240DF8 -/* D581C0 80240D90 00000000 */ nop +/* D581C0 80240D90 00000000 */ nop /* D581C4 80240D94 28620002 */ slti $v0, $v1, 2 /* D581C8 80240D98 50400005 */ beql $v0, $zero, .L80240DB0 /* D581CC 80240D9C 24020002 */ addiu $v0, $zero, 2 /* D581D0 80240DA0 10600007 */ beqz $v1, .L80240DC0 -/* D581D4 80240DA4 00000000 */ nop +/* D581D4 80240DA4 00000000 */ nop /* D581D8 80240DA8 08090384 */ j .L80240E10 -/* D581DC 80240DAC 00000000 */ nop +/* D581DC 80240DAC 00000000 */ nop .L80240DB0: /* D581E0 80240DB0 10620007 */ beq $v1, $v0, .L80240DD0 -/* D581E4 80240DB4 00000000 */ nop +/* D581E4 80240DB4 00000000 */ nop /* D581E8 80240DB8 08090384 */ j .L80240E10 -/* D581EC 80240DBC 00000000 */ nop +/* D581EC 80240DBC 00000000 */ nop .L80240DC0: /* D581F0 80240DC0 3C048024 */ lui $a0, %hi(pra_06_SetPartnerFlagsA0000) /* D581F4 80240DC4 24840EB4 */ addiu $a0, $a0, %lo(pra_06_SetPartnerFlagsA0000) /* D581F8 80240DC8 08090380 */ j .L80240E00 -/* D581FC 80240DCC 00000000 */ nop +/* D581FC 80240DCC 00000000 */ nop .L80240DD0: /* D58200 80240DD0 3C048024 */ lui $a0, %hi(pra_06_SetPartnerFlags20000) /* D58204 80240DD4 24840F1C */ addiu $a0, $a0, %lo(pra_06_SetPartnerFlags20000) /* D58208 80240DD8 08090380 */ j .L80240E00 -/* D5820C 80240DDC 00000000 */ nop +/* D5820C 80240DDC 00000000 */ nop .L80240DE0: /* D58210 80240DE0 8E020084 */ lw $v0, 0x84($s0) /* D58214 80240DE4 0440000A */ bltz $v0, .L80240E10 -/* D58218 80240DE8 00000000 */ nop +/* D58218 80240DE8 00000000 */ nop /* D5821C 80240DEC 28420002 */ slti $v0, $v0, 2 /* D58220 80240DF0 10400007 */ beqz $v0, .L80240E10 -/* D58224 80240DF4 00000000 */ nop +/* D58224 80240DF4 00000000 */ nop .L80240DF8: /* D58228 80240DF8 3C048024 */ lui $a0, %hi(pra_06_SetPartnerFlags80000) /* D5822C 80240DFC 24840EE8 */ addiu $a0, $a0, %lo(pra_06_SetPartnerFlags80000) @@ -64,14 +64,14 @@ glabel func_80240D6C_D5819C /* D5826C 80240E3C 10400005 */ beqz $v0, .L80240E54 /* D58270 80240E40 24020002 */ addiu $v0, $zero, 2 /* D58274 80240E44 10800007 */ beqz $a0, .L80240E64 -/* D58278 80240E48 00000000 */ nop +/* D58278 80240E48 00000000 */ nop /* D5827C 80240E4C 080903A9 */ j .L80240EA4 -/* D58280 80240E50 00000000 */ nop +/* D58280 80240E50 00000000 */ nop .L80240E54: /* D58284 80240E54 10820006 */ beq $a0, $v0, .L80240E70 /* D58288 80240E58 24020002 */ addiu $v0, $zero, 2 /* D5828C 80240E5C 080903A9 */ j .L80240EA4 -/* D58290 80240E60 00000000 */ nop +/* D58290 80240E60 00000000 */ nop .L80240E64: /* D58294 80240E64 8CA20000 */ lw $v0, ($a1) /* D58298 80240E68 080903A6 */ j .L80240E98 diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240054_D588E4.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240054_D588E4.s index a11dae4324..0f933e0d64 100644 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240054_D588E4.s +++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240054_D588E4.s @@ -40,7 +40,7 @@ glabel func_80240054_D588E4 /* D58960 802400D0 1440FFF7 */ bnez $v0, .L802400B0 /* D58964 802400D4 24820001 */ addiu $v0, $a0, 1 /* D58968 802400D8 03E00008 */ jr $ra -/* D5896C 802400DC 00000000 */ nop +/* D5896C 802400DC 00000000 */ nop .L802400E0: /* D58970 802400E0 3C020100 */ lui $v0, 0x100 .L802400E4: diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s index f1c73a1b23..d03dacbc72 100644 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s +++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s @@ -16,7 +16,7 @@ glabel func_80240128_D589B8 /* D589E4 80240154 27B20020 */ addiu $s2, $sp, 0x20 /* D589E8 80240158 8E0400CC */ lw $a0, 0xcc($s0) /* D589EC 8024015C 0C044181 */ jal get_shadow_by_index -/* D589F0 80240160 00000000 */ nop +/* D589F0 80240160 00000000 */ nop /* D589F4 80240164 0C048B77 */ jal func_80122DDC /* D589F8 80240168 84440008 */ lh $a0, 8($v0) /* D589FC 8024016C 8C430000 */ lw $v1, ($v0) @@ -38,22 +38,22 @@ glabel func_80240128_D589B8 /* D58A3C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D58A40 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) /* D58A44 802401B4 0C090008 */ jal pra_09_UnkFunc2 -/* D58A48 802401B8 00000000 */ nop +/* D58A48 802401B8 00000000 */ nop /* D58A4C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D58A50 802401C0 3C014307 */ lui $at, 0x4307 /* D58A54 802401C4 44810000 */ mtc1 $at, $f0 -/* D58A58 802401C8 00000000 */ nop +/* D58A58 802401C8 00000000 */ nop /* D58A5C 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D58A60 802401D0 00000000 */ nop +/* D58A60 802401D0 00000000 */ nop /* D58A64 802401D4 4500000B */ bc1f .L80240204 /* D58A68 802401D8 24040002 */ addiu $a0, $zero, 2 /* D58A6C 802401DC 3C014361 */ lui $at, 0x4361 /* D58A70 802401E0 44810000 */ mtc1 $at, $f0 -/* D58A74 802401E4 00000000 */ nop +/* D58A74 802401E4 00000000 */ nop /* D58A78 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D58A7C 802401EC 00000000 */ nop +/* D58A7C 802401EC 00000000 */ nop /* D58A80 802401F0 45000004 */ bc1f .L80240204 -/* D58A84 802401F4 00000000 */ nop +/* D58A84 802401F4 00000000 */ nop /* D58A88 802401F8 0C090015 */ jal func_80240054_D588E4 /* D58A8C 802401FC 0040202D */ daddu $a0, $v0, $zero /* D58A90 80240200 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240128_D589B8 /* D58B18 80240288 AFA0001C */ sw $zero, 0x1c($sp) .L8024028C: /* D58B1C 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D58B20 80240290 00000000 */ nop +/* D58B20 80240290 00000000 */ nop .L80240294: /* D58B24 80240294 9202000E */ lbu $v0, 0xe($s0) /* D58B28 80240298 3C01802E */ lui $at, %hi(D_802D9D70) diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802402F0_D58B80.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802402F0_D58B80.s index 65186ff0bc..a63892c9f1 100644 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802402F0_D58B80.s +++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802402F0_D58B80.s @@ -33,7 +33,7 @@ glabel func_802402F0_D58B80 /* D58BF0 80240360 E7B40010 */ swc1 $f20, 0x10($sp) /* D58BF4 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) /* D58BF8 80240368 0C00A6C9 */ jal clamp_angle -/* D58BFC 8024036C 00000000 */ nop +/* D58BFC 8024036C 00000000 */ nop /* D58C00 80240370 44050000 */ mfc1 $a1, $f0 /* D58C04 80240374 4406A000 */ mfc1 $a2, $f20 /* D58C08 80240378 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024049C_D58D2C.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024049C_D58D2C.s index c207ff0983..5dd36386d4 100644 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024049C_D58D2C.s +++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024049C_D58D2C.s @@ -10,7 +10,7 @@ glabel func_8024049C_D58D2C /* D58D40 802404B0 0440000E */ bltz $v0, .L802404EC /* D58D44 802404B4 28420002 */ slti $v0, $v0, 2 /* D58D48 802404B8 1040000C */ beqz $v0, .L802404EC -/* D58D4C 802404BC 00000000 */ nop +/* D58D4C 802404BC 00000000 */ nop /* D58D50 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D58D90) /* D58D54 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D58D90) /* D58D58 802404C8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240500_D58D90.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240500_D58D90.s index 9a115342c1..7eb7cf9d1a 100644 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240500_D58D90.s +++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240500_D58D90.s @@ -16,7 +16,7 @@ glabel func_80240500_D58D90 /* D58DBC 8024052C 27B10020 */ addiu $s1, $sp, 0x20 /* D58DC0 80240530 8E0400CC */ lw $a0, 0xcc($s0) /* D58DC4 80240534 0C044181 */ jal get_shadow_by_index -/* D58DC8 80240538 00000000 */ nop +/* D58DC8 80240538 00000000 */ nop /* D58DCC 8024053C 0C048B77 */ jal func_80122DDC /* D58DD0 80240540 84440008 */ lh $a0, 8($v0) /* D58DD4 80240544 8E050028 */ lw $a1, 0x28($s0) @@ -33,7 +33,7 @@ glabel func_80240500_D58D90 /* D58E00 80240570 46000007 */ neg.s $f0, $f0 /* D58E04 80240574 44060000 */ mfc1 $a2, $f0 /* D58E08 80240578 0C00B94E */ jal get_screen_coords -/* D58E0C 8024057C 00000000 */ nop +/* D58E0C 8024057C 00000000 */ nop /* D58E10 80240580 8E0500A4 */ lw $a1, 0xa4($s0) /* D58E14 80240584 3C063F80 */ lui $a2, 0x3f80 /* D58E18 80240588 0C0B76A3 */ jal func_802DDA8C @@ -72,13 +72,13 @@ glabel func_80240500_D58D90 /* D58E98 80240608 AFA0001C */ sw $zero, 0x1c($sp) .L8024060C: /* D58E9C 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D58EA0 80240610 00000000 */ nop +/* D58EA0 80240610 00000000 */ nop .L80240614: /* D58EA4 80240614 9202000E */ lbu $v0, 0xe($s0) /* D58EA8 80240618 3C01802E */ lui $at, %hi(D_802D9D71) /* D58EAC 8024061C A0229D71 */ sb $v0, %lo(D_802D9D71)($at) /* D58EB0 80240620 0809018C */ j .L80240630 -/* D58EB4 80240624 00000000 */ nop +/* D58EB4 80240624 00000000 */ nop .L80240628: /* D58EB8 80240628 3C01802E */ lui $at, %hi(D_802D9D71) /* D58EBC 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024068C_D58F1C.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024068C_D58F1C.s index 1f2b03f571..4b7523dda4 100644 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024068C_D58F1C.s +++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024068C_D58F1C.s @@ -33,7 +33,7 @@ glabel func_8024068C_D58F1C /* D58F8C 802406FC E7B40010 */ swc1 $f20, 0x10($sp) /* D58F90 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) /* D58F94 80240704 0C00A6C9 */ jal clamp_angle -/* D58F98 80240708 00000000 */ nop +/* D58F98 80240708 00000000 */ nop /* D58F9C 8024070C 44050000 */ mfc1 $a1, $f0 /* D58FA0 80240710 4406A000 */ mfc1 $a2, $f20 /* D58FA4 80240714 4407A000 */ mfc1 $a3, $f20 @@ -95,16 +95,16 @@ glabel func_8024068C_D58F1C /* D59084 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D59088 802407F8 3C0142B4 */ lui $at, 0x42b4 /* D5908C 802407FC 44810000 */ mtc1 $at, $f0 -/* D59090 80240800 00000000 */ nop +/* D59090 80240800 00000000 */ nop /* D59094 80240804 4602003E */ c.le.s $f0, $f2 -/* D59098 80240808 00000000 */ nop +/* D59098 80240808 00000000 */ nop /* D5909C 8024080C 4500000A */ bc1f .L80240838 /* D590A0 80240810 24040001 */ addiu $a0, $zero, 1 /* D590A4 80240814 3C014387 */ lui $at, 0x4387 /* D590A8 80240818 44810000 */ mtc1 $at, $f0 -/* D590AC 8024081C 00000000 */ nop +/* D590AC 8024081C 00000000 */ nop /* D590B0 80240820 4600103C */ c.lt.s $f2, $f0 -/* D590B4 80240824 00000000 */ nop +/* D590B4 80240824 00000000 */ nop /* D590B8 80240828 45000004 */ bc1f .L8024083C /* D590BC 8024082C 27A20018 */ addiu $v0, $sp, 0x18 /* D590C0 80240830 3C041000 */ lui $a0, 0x1000 diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240870_D59100.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240870_D59100.s index ad1bb42592..634d8585c8 100644 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240870_D59100.s +++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240870_D59100.s @@ -43,36 +43,36 @@ glabel func_80240870_D59100 /* D59194 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D59198 80240908 3C0142B4 */ lui $at, 0x42b4 /* D5919C 8024090C 44810000 */ mtc1 $at, $f0 -/* D591A0 80240910 00000000 */ nop +/* D591A0 80240910 00000000 */ nop /* D591A4 80240914 4602003C */ c.lt.s $f0, $f2 -/* D591A8 80240918 00000000 */ nop +/* D591A8 80240918 00000000 */ nop /* D591AC 8024091C 4500000A */ bc1f .L80240948 -/* D591B0 80240920 00000000 */ nop +/* D591B0 80240920 00000000 */ nop /* D591B4 80240924 3C014334 */ lui $at, 0x4334 /* D591B8 80240928 44812000 */ mtc1 $at, $f4 -/* D591BC 8024092C 00000000 */ nop +/* D591BC 8024092C 00000000 */ nop /* D591C0 80240930 4604103E */ c.le.s $f2, $f4 -/* D591C4 80240934 00000000 */ nop +/* D591C4 80240934 00000000 */ nop /* D591C8 80240938 45000003 */ bc1f .L80240948 -/* D591CC 8024093C 00000000 */ nop +/* D591CC 8024093C 00000000 */ nop /* D591D0 80240940 08090276 */ j .L802409D8 /* D591D4 80240944 46022501 */ sub.s $f20, $f4, $f2 .L80240948: /* D591D8 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) /* D591DC 8024094C 3C014334 */ lui $at, 0x4334 /* D591E0 80240950 44812000 */ mtc1 $at, $f4 -/* D591E4 80240954 00000000 */ nop +/* D591E4 80240954 00000000 */ nop /* D591E8 80240958 4600203C */ c.lt.s $f4, $f0 -/* D591EC 8024095C 00000000 */ nop +/* D591EC 8024095C 00000000 */ nop /* D591F0 80240960 4500000C */ bc1f .L80240994 -/* D591F4 80240964 00000000 */ nop +/* D591F4 80240964 00000000 */ nop /* D591F8 80240968 3C014387 */ lui $at, 0x4387 /* D591FC 8024096C 44812000 */ mtc1 $at, $f4 -/* D59200 80240970 00000000 */ nop +/* D59200 80240970 00000000 */ nop /* D59204 80240974 4604003E */ c.le.s $f0, $f4 -/* D59208 80240978 00000000 */ nop +/* D59208 80240978 00000000 */ nop /* D5920C 8024097C 45000008 */ bc1f .L802409A0 -/* D59210 80240980 00000000 */ nop +/* D59210 80240980 00000000 */ nop /* D59214 80240984 3C014334 */ lui $at, 0x4334 /* D59218 80240988 44812000 */ mtc1 $at, $f4 /* D5921C 8024098C 08090276 */ j .L802409D8 @@ -80,19 +80,19 @@ glabel func_80240870_D59100 .L80240994: /* D59224 80240994 3C014387 */ lui $at, 0x4387 /* D59228 80240998 44812000 */ mtc1 $at, $f4 -/* D5922C 8024099C 00000000 */ nop +/* D5922C 8024099C 00000000 */ nop .L802409A0: /* D59230 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D59234 802409A4 00000000 */ nop +/* D59234 802409A4 00000000 */ nop /* D59238 802409A8 4500000A */ bc1f .L802409D4 -/* D5923C 802409AC 00000000 */ nop +/* D5923C 802409AC 00000000 */ nop /* D59240 802409B0 3C0143B4 */ lui $at, 0x43b4 /* D59244 802409B4 44811000 */ mtc1 $at, $f2 -/* D59248 802409B8 00000000 */ nop +/* D59248 802409B8 00000000 */ nop /* D5924C 802409BC 4602003E */ c.le.s $f0, $f2 -/* D59250 802409C0 00000000 */ nop +/* D59250 802409C0 00000000 */ nop /* D59254 802409C4 45000003 */ bc1f .L802409D4 -/* D59258 802409C8 00000000 */ nop +/* D59258 802409C8 00000000 */ nop /* D5925C 802409CC 08090276 */ j .L802409D8 /* D59260 802409D0 46001501 */ sub.s $f20, $f2, $f0 .L802409D4: @@ -100,11 +100,11 @@ glabel func_80240870_D59100 .L802409D8: /* D59268 802409D8 3C0141C8 */ lui $at, 0x41c8 /* D5926C 802409DC 44810000 */ mtc1 $at, $f0 -/* D59270 802409E0 00000000 */ nop +/* D59270 802409E0 00000000 */ nop /* D59274 802409E4 4600A003 */ div.s $f0, $f20, $f0 /* D59278 802409E8 4600010D */ trunc.w.s $f4, $f0 /* D5927C 802409EC 44072000 */ mfc1 $a3, $f4 -/* D59280 802409F0 00000000 */ nop +/* D59280 802409F0 00000000 */ nop /* D59284 802409F4 00071100 */ sll $v0, $a3, 4 /* D59288 802409F8 00471023 */ subu $v0, $v0, $a3 /* D5928C 802409FC 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel func_80240870_D59100 /* D592D4 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) /* D592D8 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) /* D592DC 80240A4C 0C00A6C9 */ jal clamp_angle -/* D592E0 80240A50 00000000 */ nop +/* D592E0 80240A50 00000000 */ nop /* D592E4 80240A54 44050000 */ mfc1 $a1, $f0 /* D592E8 80240A58 4406B000 */ mfc1 $a2, $f22 /* D592EC 80240A5C 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel func_80240870_D59100 /* D59350 80240AC0 24040001 */ addiu $a0, $zero, 1 .L80240AC4: /* D59354 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D59358 80240AC8 00000000 */ nop +/* D59358 80240AC8 00000000 */ nop /* D5935C 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 /* D59360 80240AD0 24040001 */ addiu $a0, $zero, 1 .L80240AD4: @@ -204,10 +204,10 @@ glabel func_80240870_D59100 /* D593F0 80240B60 44812000 */ mtc1 $at, $f4 /* D593F4 80240B64 00021023 */ negu $v0, $v0 /* D593F8 80240B68 44820000 */ mtc1 $v0, $f0 -/* D593FC 80240B6C 00000000 */ nop +/* D593FC 80240B6C 00000000 */ nop /* D59400 80240B70 46800020 */ cvt.s.w $f0, $f0 /* D59404 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D59408 80240B78 00000000 */ nop +/* D59408 80240B78 00000000 */ nop /* D5940C 80240B7C 4405B000 */ mfc1 $a1, $f22 /* D59410 80240B80 4407B000 */ mfc1 $a3, $f22 /* D59414 80240B84 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel func_80240870_D59100 /* D59484 80240BF4 3C013F00 */ lui $at, 0x3f00 /* D59488 80240BF8 44812000 */ mtc1 $at, $f4 /* D5948C 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D59490 80240C00 00000000 */ nop +/* D59490 80240C00 00000000 */ nop /* D59494 80240C04 46800020 */ cvt.s.w $f0, $f0 /* D59498 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D5949C 80240C0C 00000000 */ nop +/* D5949C 80240C0C 00000000 */ nop /* D594A0 80240C10 4405B000 */ mfc1 $a1, $f22 /* D594A4 80240C14 4407B000 */ mfc1 $a3, $f22 /* D594A8 80240C18 44062000 */ mfc1 $a2, $f4 @@ -280,16 +280,16 @@ glabel func_80240870_D59100 /* D59520 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D59524 80240C94 3C0142B4 */ lui $at, 0x42b4 /* D59528 80240C98 44810000 */ mtc1 $at, $f0 -/* D5952C 80240C9C 00000000 */ nop +/* D5952C 80240C9C 00000000 */ nop /* D59530 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D59534 80240CA4 00000000 */ nop +/* D59534 80240CA4 00000000 */ nop /* D59538 80240CA8 4500000A */ bc1f .L80240CD4 /* D5953C 80240CAC 24040001 */ addiu $a0, $zero, 1 /* D59540 80240CB0 3C014387 */ lui $at, 0x4387 /* D59544 80240CB4 44812000 */ mtc1 $at, $f4 -/* D59548 80240CB8 00000000 */ nop +/* D59548 80240CB8 00000000 */ nop /* D5954C 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D59550 80240CC0 00000000 */ nop +/* D59550 80240CC0 00000000 */ nop /* D59554 80240CC4 45000004 */ bc1f .L80240CD8 /* D59558 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 /* D5955C 80240CCC 3C041000 */ lui $a0, 0x1000 @@ -305,7 +305,7 @@ glabel func_80240870_D59100 /* D5957C 80240CEC 26730001 */ addiu $s3, $s3, 1 /* D59580 80240CF0 2A620002 */ slti $v0, $s3, 2 /* D59584 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D59588 80240CF8 00000000 */ nop +/* D59588 80240CF8 00000000 */ nop /* D5958C 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) /* D59590 80240D00 8FB60148 */ lw $s6, 0x148($sp) /* D59594 80240D04 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240D3C_D595CC.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240D3C_D595CC.s index 120d1f66a5..bd85f54104 100644 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240D3C_D595CC.s +++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240D3C_D595CC.s @@ -11,36 +11,36 @@ glabel func_80240D3C_D595CC /* D595E4 80240D54 24020001 */ addiu $v0, $zero, 1 /* D595E8 80240D58 8E030084 */ lw $v1, 0x84($s0) /* D595EC 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D595F0 80240D60 00000000 */ nop +/* D595F0 80240D60 00000000 */ nop /* D595F4 80240D64 28620002 */ slti $v0, $v1, 2 /* D595F8 80240D68 50400005 */ beql $v0, $zero, .L80240D80 /* D595FC 80240D6C 24020002 */ addiu $v0, $zero, 2 /* D59600 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D59604 80240D74 00000000 */ nop +/* D59604 80240D74 00000000 */ nop /* D59608 80240D78 08090378 */ j .L80240DE0 -/* D5960C 80240D7C 00000000 */ nop +/* D5960C 80240D7C 00000000 */ nop .L80240D80: /* D59610 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D59614 80240D84 00000000 */ nop +/* D59614 80240D84 00000000 */ nop /* D59618 80240D88 08090378 */ j .L80240DE0 -/* D5961C 80240D8C 00000000 */ nop +/* D5961C 80240D8C 00000000 */ nop .L80240D90: /* D59620 80240D90 3C048024 */ lui $a0, %hi(pra_09_SetPartnerFlagsA0000) /* D59624 80240D94 24840E84 */ addiu $a0, $a0, %lo(pra_09_SetPartnerFlagsA0000) /* D59628 80240D98 08090374 */ j .L80240DD0 -/* D5962C 80240D9C 00000000 */ nop +/* D5962C 80240D9C 00000000 */ nop .L80240DA0: /* D59630 80240DA0 3C048024 */ lui $a0, %hi(pra_09_SetPartnerFlags20000) /* D59634 80240DA4 24840EEC */ addiu $a0, $a0, %lo(pra_09_SetPartnerFlags20000) /* D59638 80240DA8 08090374 */ j .L80240DD0 -/* D5963C 80240DAC 00000000 */ nop +/* D5963C 80240DAC 00000000 */ nop .L80240DB0: /* D59640 80240DB0 8E020084 */ lw $v0, 0x84($s0) /* D59644 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D59648 80240DB8 00000000 */ nop +/* D59648 80240DB8 00000000 */ nop /* D5964C 80240DBC 28420002 */ slti $v0, $v0, 2 /* D59650 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D59654 80240DC4 00000000 */ nop +/* D59654 80240DC4 00000000 */ nop .L80240DC8: /* D59658 80240DC8 3C048024 */ lui $a0, %hi(pra_09_SetPartnerFlags80000) /* D5965C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(pra_09_SetPartnerFlags80000) @@ -64,14 +64,14 @@ glabel func_80240D3C_D595CC /* D5969C 80240E0C 10400005 */ beqz $v0, .L80240E24 /* D596A0 80240E10 24020002 */ addiu $v0, $zero, 2 /* D596A4 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D596A8 80240E18 00000000 */ nop +/* D596A8 80240E18 00000000 */ nop /* D596AC 80240E1C 0809039D */ j .L80240E74 -/* D596B0 80240E20 00000000 */ nop +/* D596B0 80240E20 00000000 */ nop .L80240E24: /* D596B4 80240E24 10820006 */ beq $a0, $v0, .L80240E40 /* D596B8 80240E28 24020002 */ addiu $v0, $zero, 2 /* D596BC 80240E2C 0809039D */ j .L80240E74 -/* D596C0 80240E30 00000000 */ nop +/* D596C0 80240E30 00000000 */ nop .L80240E34: /* D596C4 80240E34 8CA20000 */ lw $v0, ($a1) /* D596C8 80240E38 0809039A */ j .L80240E68 diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802411D8_D59A68.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802411D8_D59A68.s index 431d8b0722..c1d7d9a5c0 100644 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802411D8_D59A68.s +++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802411D8_D59A68.s @@ -28,7 +28,7 @@ glabel func_802411D8_D59A68 /* D59ABC 8024122C 00220821 */ addu $at, $at, $v0 /* D59AC0 80241230 AC206A20 */ sw $zero, %lo(D_80246A20)($at) /* D59AC4 80241234 08090499 */ j .L80241264 -/* D59AC8 80241238 00000000 */ nop +/* D59AC8 80241238 00000000 */ nop .L8024123C: /* D59ACC 8024123C 3C038024 */ lui $v1, %hi(D_80246A20) /* D59AD0 80241240 24636A20 */ addiu $v1, $v1, %lo(D_80246A20) diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80241274_D59B04.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80241274_D59B04.s index 8d5d71e351..abcf627ded 100644 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80241274_D59B04.s +++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80241274_D59B04.s @@ -28,7 +28,7 @@ glabel func_80241274_D59B04 /* D59B58 802412C8 00220821 */ addu $at, $at, $v0 /* D59B5C 802412CC AC206BE8 */ sw $zero, %lo(D_80246BE8)($at) /* D59B60 802412D0 080904C0 */ j .L80241300 -/* D59B64 802412D4 00000000 */ nop +/* D59B64 802412D4 00000000 */ nop .L802412D8: /* D59B68 802412D8 3C038024 */ lui $v1, %hi(D_80246BE8) /* D59B6C 802412DC 24636BE8 */ addiu $v1, $v1, %lo(D_80246BE8) diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80241310_D59BA0.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80241310_D59BA0.s index c7727aea0a..f6f0a506f2 100644 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80241310_D59BA0.s +++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80241310_D59BA0.s @@ -22,14 +22,14 @@ glabel func_80241310_D59BA0 /* D59BE4 80241354 0C0B1EAF */ jal get_variable /* D59BE8 80241358 0040802D */ daddu $s0, $v0, $zero /* D59BEC 8024135C 44926000 */ mtc1 $s2, $f12 -/* D59BF0 80241360 00000000 */ nop +/* D59BF0 80241360 00000000 */ nop /* D59BF4 80241364 46806320 */ cvt.s.w $f12, $f12 /* D59BF8 80241368 44820000 */ mtc1 $v0, $f0 -/* D59BFC 8024136C 00000000 */ nop +/* D59BFC 8024136C 00000000 */ nop /* D59C00 80241370 46800020 */ cvt.s.w $f0, $f0 /* D59C04 80241374 44060000 */ mfc1 $a2, $f0 /* D59C08 80241378 44907000 */ mtc1 $s0, $f14 -/* D59C0C 8024137C 00000000 */ nop +/* D59C0C 8024137C 00000000 */ nop /* D59C10 80241380 0C01BE3C */ jal func_8006F8F0 /* D59C14 80241384 468073A0 */ cvt.s.w $f14, $f14 /* D59C18 80241388 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802413A4_D59C34.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802413A4_D59C34.s index 756b865802..544c020f11 100644 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802413A4_D59C34.s +++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802413A4_D59C34.s @@ -40,23 +40,23 @@ glabel func_802413A4_D59C34 .L80241428: /* D59CB8 80241428 24020002 */ addiu $v0, $zero, 2 /* D59CBC 8024142C 12220016 */ beq $s1, $v0, .L80241488 -/* D59CC0 80241430 00000000 */ nop +/* D59CC0 80241430 00000000 */ nop /* D59CC4 80241434 2A220003 */ slti $v0, $s1, 3 /* D59CC8 80241438 10400005 */ beqz $v0, .L80241450 /* D59CCC 8024143C 24020001 */ addiu $v0, $zero, 1 /* D59CD0 80241440 1222000B */ beq $s1, $v0, .L80241470 -/* D59CD4 80241444 00000000 */ nop +/* D59CD4 80241444 00000000 */ nop /* D59CD8 80241448 08090534 */ j .L802414D0 -/* D59CDC 8024144C 00000000 */ nop +/* D59CDC 8024144C 00000000 */ nop .L80241450: /* D59CE0 80241450 24020003 */ addiu $v0, $zero, 3 /* D59CE4 80241454 12220012 */ beq $s1, $v0, .L802414A0 -/* D59CE8 80241458 00000000 */ nop +/* D59CE8 80241458 00000000 */ nop /* D59CEC 8024145C 24020004 */ addiu $v0, $zero, 4 /* D59CF0 80241460 12220015 */ beq $s1, $v0, .L802414B8 -/* D59CF4 80241464 00000000 */ nop +/* D59CF4 80241464 00000000 */ nop /* D59CF8 80241468 08090534 */ j .L802414D0 -/* D59CFC 8024146C 00000000 */ nop +/* D59CFC 8024146C 00000000 */ nop .L80241470: /* D59D00 80241470 82620004 */ lb $v0, 4($s3) /* D59D04 80241474 00021080 */ sll $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802415F8_D59E88.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802415F8_D59E88.s index d23039571a..7f75593d2d 100644 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802415F8_D59E88.s +++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802415F8_D59E88.s @@ -21,6 +21,6 @@ glabel func_802415F8_D59E88 /* D59EC8 80241638 24020002 */ addiu $v0, $zero, 2 /* D59ECC 8024163C 03E00008 */ jr $ra /* D59ED0 80241640 27BD0018 */ addiu $sp, $sp, 0x18 -/* D59ED4 80241644 00000000 */ nop -/* D59ED8 80241648 00000000 */ nop -/* D59EDC 8024164C 00000000 */ nop +/* D59ED4 80241644 00000000 */ nop +/* D59ED8 80241648 00000000 */ nop +/* D59EDC 8024164C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240054_D5F304.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240054_D5F304.s index 40236f8130..ea35c812dd 100644 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240054_D5F304.s +++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240054_D5F304.s @@ -40,7 +40,7 @@ glabel func_80240054_D5F304 /* D5F380 802400D0 1440FFF7 */ bnez $v0, .L802400B0 /* D5F384 802400D4 24820001 */ addiu $v0, $a0, 1 /* D5F388 802400D8 03E00008 */ jr $ra -/* D5F38C 802400DC 00000000 */ nop +/* D5F38C 802400DC 00000000 */ nop .L802400E0: /* D5F390 802400E0 3C020100 */ lui $v0, 0x100 .L802400E4: diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s index 5308df72ca..c3634ec32b 100644 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s +++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s @@ -16,7 +16,7 @@ glabel func_80240128_D5F3D8 /* D5F404 80240154 27B20020 */ addiu $s2, $sp, 0x20 /* D5F408 80240158 8E0400CC */ lw $a0, 0xcc($s0) /* D5F40C 8024015C 0C044181 */ jal get_shadow_by_index -/* D5F410 80240160 00000000 */ nop +/* D5F410 80240160 00000000 */ nop /* D5F414 80240164 0C048B77 */ jal func_80122DDC /* D5F418 80240168 84440008 */ lh $a0, 8($v0) /* D5F41C 8024016C 8C430000 */ lw $v1, ($v0) @@ -38,22 +38,22 @@ glabel func_80240128_D5F3D8 /* D5F45C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D5F460 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) /* D5F464 802401B4 0C090008 */ jal pra_10_UnkFunc2 -/* D5F468 802401B8 00000000 */ nop +/* D5F468 802401B8 00000000 */ nop /* D5F46C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D5F470 802401C0 3C014307 */ lui $at, 0x4307 /* D5F474 802401C4 44810000 */ mtc1 $at, $f0 -/* D5F478 802401C8 00000000 */ nop +/* D5F478 802401C8 00000000 */ nop /* D5F47C 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D5F480 802401D0 00000000 */ nop +/* D5F480 802401D0 00000000 */ nop /* D5F484 802401D4 4500000B */ bc1f .L80240204 /* D5F488 802401D8 24040002 */ addiu $a0, $zero, 2 /* D5F48C 802401DC 3C014361 */ lui $at, 0x4361 /* D5F490 802401E0 44810000 */ mtc1 $at, $f0 -/* D5F494 802401E4 00000000 */ nop +/* D5F494 802401E4 00000000 */ nop /* D5F498 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D5F49C 802401EC 00000000 */ nop +/* D5F49C 802401EC 00000000 */ nop /* D5F4A0 802401F0 45000004 */ bc1f .L80240204 -/* D5F4A4 802401F4 00000000 */ nop +/* D5F4A4 802401F4 00000000 */ nop /* D5F4A8 802401F8 0C090015 */ jal func_80240054_D5F304 /* D5F4AC 802401FC 0040202D */ daddu $a0, $v0, $zero /* D5F4B0 80240200 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240128_D5F3D8 /* D5F538 80240288 AFA0001C */ sw $zero, 0x1c($sp) .L8024028C: /* D5F53C 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D5F540 80240290 00000000 */ nop +/* D5F540 80240290 00000000 */ nop .L80240294: /* D5F544 80240294 9202000E */ lbu $v0, 0xe($s0) /* D5F548 80240298 3C01802E */ lui $at, %hi(D_802D9D70) diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_802402F0_D5F5A0.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_802402F0_D5F5A0.s index ef1ef2e1ac..c531228246 100644 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_802402F0_D5F5A0.s +++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_802402F0_D5F5A0.s @@ -33,7 +33,7 @@ glabel func_802402F0_D5F5A0 /* D5F610 80240360 E7B40010 */ swc1 $f20, 0x10($sp) /* D5F614 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) /* D5F618 80240368 0C00A6C9 */ jal clamp_angle -/* D5F61C 8024036C 00000000 */ nop +/* D5F61C 8024036C 00000000 */ nop /* D5F620 80240370 44050000 */ mfc1 $a1, $f0 /* D5F624 80240374 4406A000 */ mfc1 $a2, $f20 /* D5F628 80240378 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_8024049C_D5F74C.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_8024049C_D5F74C.s index d014e4a445..e3b616f2ea 100644 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_8024049C_D5F74C.s +++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_8024049C_D5F74C.s @@ -10,7 +10,7 @@ glabel func_8024049C_D5F74C /* D5F760 802404B0 0440000E */ bltz $v0, .L802404EC /* D5F764 802404B4 28420002 */ slti $v0, $v0, 2 /* D5F768 802404B8 1040000C */ beqz $v0, .L802404EC -/* D5F76C 802404BC 00000000 */ nop +/* D5F76C 802404BC 00000000 */ nop /* D5F770 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D5F7B0) /* D5F774 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D5F7B0) /* D5F778 802404C8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240500_D5F7B0.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240500_D5F7B0.s index ac1dff7e78..83d253ce94 100644 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240500_D5F7B0.s +++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240500_D5F7B0.s @@ -16,7 +16,7 @@ glabel func_80240500_D5F7B0 /* D5F7DC 8024052C 27B10020 */ addiu $s1, $sp, 0x20 /* D5F7E0 80240530 8E0400CC */ lw $a0, 0xcc($s0) /* D5F7E4 80240534 0C044181 */ jal get_shadow_by_index -/* D5F7E8 80240538 00000000 */ nop +/* D5F7E8 80240538 00000000 */ nop /* D5F7EC 8024053C 0C048B77 */ jal func_80122DDC /* D5F7F0 80240540 84440008 */ lh $a0, 8($v0) /* D5F7F4 80240544 8E050028 */ lw $a1, 0x28($s0) @@ -33,7 +33,7 @@ glabel func_80240500_D5F7B0 /* D5F820 80240570 46000007 */ neg.s $f0, $f0 /* D5F824 80240574 44060000 */ mfc1 $a2, $f0 /* D5F828 80240578 0C00B94E */ jal get_screen_coords -/* D5F82C 8024057C 00000000 */ nop +/* D5F82C 8024057C 00000000 */ nop /* D5F830 80240580 8E0500A4 */ lw $a1, 0xa4($s0) /* D5F834 80240584 3C063F80 */ lui $a2, 0x3f80 /* D5F838 80240588 0C0B76A3 */ jal func_802DDA8C @@ -72,13 +72,13 @@ glabel func_80240500_D5F7B0 /* D5F8B8 80240608 AFA0001C */ sw $zero, 0x1c($sp) .L8024060C: /* D5F8BC 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D5F8C0 80240610 00000000 */ nop +/* D5F8C0 80240610 00000000 */ nop .L80240614: /* D5F8C4 80240614 9202000E */ lbu $v0, 0xe($s0) /* D5F8C8 80240618 3C01802E */ lui $at, %hi(D_802D9D71) /* D5F8CC 8024061C A0229D71 */ sb $v0, %lo(D_802D9D71)($at) /* D5F8D0 80240620 0809018C */ j .L80240630 -/* D5F8D4 80240624 00000000 */ nop +/* D5F8D4 80240624 00000000 */ nop .L80240628: /* D5F8D8 80240628 3C01802E */ lui $at, %hi(D_802D9D71) /* D5F8DC 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_8024068C_D5F93C.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_8024068C_D5F93C.s index 608f5b96e8..d565dd076c 100644 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_8024068C_D5F93C.s +++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_8024068C_D5F93C.s @@ -33,7 +33,7 @@ glabel func_8024068C_D5F93C /* D5F9AC 802406FC E7B40010 */ swc1 $f20, 0x10($sp) /* D5F9B0 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) /* D5F9B4 80240704 0C00A6C9 */ jal clamp_angle -/* D5F9B8 80240708 00000000 */ nop +/* D5F9B8 80240708 00000000 */ nop /* D5F9BC 8024070C 44050000 */ mfc1 $a1, $f0 /* D5F9C0 80240710 4406A000 */ mfc1 $a2, $f20 /* D5F9C4 80240714 4407A000 */ mfc1 $a3, $f20 @@ -95,16 +95,16 @@ glabel func_8024068C_D5F93C /* D5FAA4 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D5FAA8 802407F8 3C0142B4 */ lui $at, 0x42b4 /* D5FAAC 802407FC 44810000 */ mtc1 $at, $f0 -/* D5FAB0 80240800 00000000 */ nop +/* D5FAB0 80240800 00000000 */ nop /* D5FAB4 80240804 4602003E */ c.le.s $f0, $f2 -/* D5FAB8 80240808 00000000 */ nop +/* D5FAB8 80240808 00000000 */ nop /* D5FABC 8024080C 4500000A */ bc1f .L80240838 /* D5FAC0 80240810 24040001 */ addiu $a0, $zero, 1 /* D5FAC4 80240814 3C014387 */ lui $at, 0x4387 /* D5FAC8 80240818 44810000 */ mtc1 $at, $f0 -/* D5FACC 8024081C 00000000 */ nop +/* D5FACC 8024081C 00000000 */ nop /* D5FAD0 80240820 4600103C */ c.lt.s $f2, $f0 -/* D5FAD4 80240824 00000000 */ nop +/* D5FAD4 80240824 00000000 */ nop /* D5FAD8 80240828 45000004 */ bc1f .L8024083C /* D5FADC 8024082C 27A20018 */ addiu $v0, $sp, 0x18 /* D5FAE0 80240830 3C041000 */ lui $a0, 0x1000 diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240870_D5FB20.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240870_D5FB20.s index 4978ff842f..f9f94bc9c5 100644 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240870_D5FB20.s +++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240870_D5FB20.s @@ -43,36 +43,36 @@ glabel func_80240870_D5FB20 /* D5FBB4 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D5FBB8 80240908 3C0142B4 */ lui $at, 0x42b4 /* D5FBBC 8024090C 44810000 */ mtc1 $at, $f0 -/* D5FBC0 80240910 00000000 */ nop +/* D5FBC0 80240910 00000000 */ nop /* D5FBC4 80240914 4602003C */ c.lt.s $f0, $f2 -/* D5FBC8 80240918 00000000 */ nop +/* D5FBC8 80240918 00000000 */ nop /* D5FBCC 8024091C 4500000A */ bc1f .L80240948 -/* D5FBD0 80240920 00000000 */ nop +/* D5FBD0 80240920 00000000 */ nop /* D5FBD4 80240924 3C014334 */ lui $at, 0x4334 /* D5FBD8 80240928 44812000 */ mtc1 $at, $f4 -/* D5FBDC 8024092C 00000000 */ nop +/* D5FBDC 8024092C 00000000 */ nop /* D5FBE0 80240930 4604103E */ c.le.s $f2, $f4 -/* D5FBE4 80240934 00000000 */ nop +/* D5FBE4 80240934 00000000 */ nop /* D5FBE8 80240938 45000003 */ bc1f .L80240948 -/* D5FBEC 8024093C 00000000 */ nop +/* D5FBEC 8024093C 00000000 */ nop /* D5FBF0 80240940 08090276 */ j .L802409D8 /* D5FBF4 80240944 46022501 */ sub.s $f20, $f4, $f2 .L80240948: /* D5FBF8 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) /* D5FBFC 8024094C 3C014334 */ lui $at, 0x4334 /* D5FC00 80240950 44812000 */ mtc1 $at, $f4 -/* D5FC04 80240954 00000000 */ nop +/* D5FC04 80240954 00000000 */ nop /* D5FC08 80240958 4600203C */ c.lt.s $f4, $f0 -/* D5FC0C 8024095C 00000000 */ nop +/* D5FC0C 8024095C 00000000 */ nop /* D5FC10 80240960 4500000C */ bc1f .L80240994 -/* D5FC14 80240964 00000000 */ nop +/* D5FC14 80240964 00000000 */ nop /* D5FC18 80240968 3C014387 */ lui $at, 0x4387 /* D5FC1C 8024096C 44812000 */ mtc1 $at, $f4 -/* D5FC20 80240970 00000000 */ nop +/* D5FC20 80240970 00000000 */ nop /* D5FC24 80240974 4604003E */ c.le.s $f0, $f4 -/* D5FC28 80240978 00000000 */ nop +/* D5FC28 80240978 00000000 */ nop /* D5FC2C 8024097C 45000008 */ bc1f .L802409A0 -/* D5FC30 80240980 00000000 */ nop +/* D5FC30 80240980 00000000 */ nop /* D5FC34 80240984 3C014334 */ lui $at, 0x4334 /* D5FC38 80240988 44812000 */ mtc1 $at, $f4 /* D5FC3C 8024098C 08090276 */ j .L802409D8 @@ -80,19 +80,19 @@ glabel func_80240870_D5FB20 .L80240994: /* D5FC44 80240994 3C014387 */ lui $at, 0x4387 /* D5FC48 80240998 44812000 */ mtc1 $at, $f4 -/* D5FC4C 8024099C 00000000 */ nop +/* D5FC4C 8024099C 00000000 */ nop .L802409A0: /* D5FC50 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D5FC54 802409A4 00000000 */ nop +/* D5FC54 802409A4 00000000 */ nop /* D5FC58 802409A8 4500000A */ bc1f .L802409D4 -/* D5FC5C 802409AC 00000000 */ nop +/* D5FC5C 802409AC 00000000 */ nop /* D5FC60 802409B0 3C0143B4 */ lui $at, 0x43b4 /* D5FC64 802409B4 44811000 */ mtc1 $at, $f2 -/* D5FC68 802409B8 00000000 */ nop +/* D5FC68 802409B8 00000000 */ nop /* D5FC6C 802409BC 4602003E */ c.le.s $f0, $f2 -/* D5FC70 802409C0 00000000 */ nop +/* D5FC70 802409C0 00000000 */ nop /* D5FC74 802409C4 45000003 */ bc1f .L802409D4 -/* D5FC78 802409C8 00000000 */ nop +/* D5FC78 802409C8 00000000 */ nop /* D5FC7C 802409CC 08090276 */ j .L802409D8 /* D5FC80 802409D0 46001501 */ sub.s $f20, $f2, $f0 .L802409D4: @@ -100,11 +100,11 @@ glabel func_80240870_D5FB20 .L802409D8: /* D5FC88 802409D8 3C0141C8 */ lui $at, 0x41c8 /* D5FC8C 802409DC 44810000 */ mtc1 $at, $f0 -/* D5FC90 802409E0 00000000 */ nop +/* D5FC90 802409E0 00000000 */ nop /* D5FC94 802409E4 4600A003 */ div.s $f0, $f20, $f0 /* D5FC98 802409E8 4600010D */ trunc.w.s $f4, $f0 /* D5FC9C 802409EC 44072000 */ mfc1 $a3, $f4 -/* D5FCA0 802409F0 00000000 */ nop +/* D5FCA0 802409F0 00000000 */ nop /* D5FCA4 802409F4 00071100 */ sll $v0, $a3, 4 /* D5FCA8 802409F8 00471023 */ subu $v0, $v0, $a3 /* D5FCAC 802409FC 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel func_80240870_D5FB20 /* D5FCF4 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) /* D5FCF8 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) /* D5FCFC 80240A4C 0C00A6C9 */ jal clamp_angle -/* D5FD00 80240A50 00000000 */ nop +/* D5FD00 80240A50 00000000 */ nop /* D5FD04 80240A54 44050000 */ mfc1 $a1, $f0 /* D5FD08 80240A58 4406B000 */ mfc1 $a2, $f22 /* D5FD0C 80240A5C 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel func_80240870_D5FB20 /* D5FD70 80240AC0 24040001 */ addiu $a0, $zero, 1 .L80240AC4: /* D5FD74 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D5FD78 80240AC8 00000000 */ nop +/* D5FD78 80240AC8 00000000 */ nop /* D5FD7C 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 /* D5FD80 80240AD0 24040001 */ addiu $a0, $zero, 1 .L80240AD4: @@ -204,10 +204,10 @@ glabel func_80240870_D5FB20 /* D5FE10 80240B60 44812000 */ mtc1 $at, $f4 /* D5FE14 80240B64 00021023 */ negu $v0, $v0 /* D5FE18 80240B68 44820000 */ mtc1 $v0, $f0 -/* D5FE1C 80240B6C 00000000 */ nop +/* D5FE1C 80240B6C 00000000 */ nop /* D5FE20 80240B70 46800020 */ cvt.s.w $f0, $f0 /* D5FE24 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D5FE28 80240B78 00000000 */ nop +/* D5FE28 80240B78 00000000 */ nop /* D5FE2C 80240B7C 4405B000 */ mfc1 $a1, $f22 /* D5FE30 80240B80 4407B000 */ mfc1 $a3, $f22 /* D5FE34 80240B84 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel func_80240870_D5FB20 /* D5FEA4 80240BF4 3C013F00 */ lui $at, 0x3f00 /* D5FEA8 80240BF8 44812000 */ mtc1 $at, $f4 /* D5FEAC 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D5FEB0 80240C00 00000000 */ nop +/* D5FEB0 80240C00 00000000 */ nop /* D5FEB4 80240C04 46800020 */ cvt.s.w $f0, $f0 /* D5FEB8 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D5FEBC 80240C0C 00000000 */ nop +/* D5FEBC 80240C0C 00000000 */ nop /* D5FEC0 80240C10 4405B000 */ mfc1 $a1, $f22 /* D5FEC4 80240C14 4407B000 */ mfc1 $a3, $f22 /* D5FEC8 80240C18 44062000 */ mfc1 $a2, $f4 @@ -280,16 +280,16 @@ glabel func_80240870_D5FB20 /* D5FF40 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D5FF44 80240C94 3C0142B4 */ lui $at, 0x42b4 /* D5FF48 80240C98 44810000 */ mtc1 $at, $f0 -/* D5FF4C 80240C9C 00000000 */ nop +/* D5FF4C 80240C9C 00000000 */ nop /* D5FF50 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D5FF54 80240CA4 00000000 */ nop +/* D5FF54 80240CA4 00000000 */ nop /* D5FF58 80240CA8 4500000A */ bc1f .L80240CD4 /* D5FF5C 80240CAC 24040001 */ addiu $a0, $zero, 1 /* D5FF60 80240CB0 3C014387 */ lui $at, 0x4387 /* D5FF64 80240CB4 44812000 */ mtc1 $at, $f4 -/* D5FF68 80240CB8 00000000 */ nop +/* D5FF68 80240CB8 00000000 */ nop /* D5FF6C 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D5FF70 80240CC0 00000000 */ nop +/* D5FF70 80240CC0 00000000 */ nop /* D5FF74 80240CC4 45000004 */ bc1f .L80240CD8 /* D5FF78 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 /* D5FF7C 80240CCC 3C041000 */ lui $a0, 0x1000 @@ -305,7 +305,7 @@ glabel func_80240870_D5FB20 /* D5FF9C 80240CEC 26730001 */ addiu $s3, $s3, 1 /* D5FFA0 80240CF0 2A620002 */ slti $v0, $s3, 2 /* D5FFA4 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D5FFA8 80240CF8 00000000 */ nop +/* D5FFA8 80240CF8 00000000 */ nop /* D5FFAC 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) /* D5FFB0 80240D00 8FB60148 */ lw $s6, 0x148($sp) /* D5FFB4 80240D04 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240D3C_D5FFEC.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240D3C_D5FFEC.s index e20be58294..0594288d2e 100644 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240D3C_D5FFEC.s +++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240D3C_D5FFEC.s @@ -11,36 +11,36 @@ glabel func_80240D3C_D5FFEC /* D60004 80240D54 24020001 */ addiu $v0, $zero, 1 /* D60008 80240D58 8E030084 */ lw $v1, 0x84($s0) /* D6000C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D60010 80240D60 00000000 */ nop +/* D60010 80240D60 00000000 */ nop /* D60014 80240D64 28620002 */ slti $v0, $v1, 2 /* D60018 80240D68 50400005 */ beql $v0, $zero, .L80240D80 /* D6001C 80240D6C 24020002 */ addiu $v0, $zero, 2 /* D60020 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D60024 80240D74 00000000 */ nop +/* D60024 80240D74 00000000 */ nop /* D60028 80240D78 08090378 */ j .L80240DE0 -/* D6002C 80240D7C 00000000 */ nop +/* D6002C 80240D7C 00000000 */ nop .L80240D80: /* D60030 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D60034 80240D84 00000000 */ nop +/* D60034 80240D84 00000000 */ nop /* D60038 80240D88 08090378 */ j .L80240DE0 -/* D6003C 80240D8C 00000000 */ nop +/* D6003C 80240D8C 00000000 */ nop .L80240D90: /* D60040 80240D90 3C048024 */ lui $a0, %hi(pra_10_SetPartnerFlagsA0000) /* D60044 80240D94 24840E84 */ addiu $a0, $a0, %lo(pra_10_SetPartnerFlagsA0000) /* D60048 80240D98 08090374 */ j .L80240DD0 -/* D6004C 80240D9C 00000000 */ nop +/* D6004C 80240D9C 00000000 */ nop .L80240DA0: /* D60050 80240DA0 3C048024 */ lui $a0, %hi(pra_10_SetPartnerFlags20000) /* D60054 80240DA4 24840EEC */ addiu $a0, $a0, %lo(pra_10_SetPartnerFlags20000) /* D60058 80240DA8 08090374 */ j .L80240DD0 -/* D6005C 80240DAC 00000000 */ nop +/* D6005C 80240DAC 00000000 */ nop .L80240DB0: /* D60060 80240DB0 8E020084 */ lw $v0, 0x84($s0) /* D60064 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D60068 80240DB8 00000000 */ nop +/* D60068 80240DB8 00000000 */ nop /* D6006C 80240DBC 28420002 */ slti $v0, $v0, 2 /* D60070 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D60074 80240DC4 00000000 */ nop +/* D60074 80240DC4 00000000 */ nop .L80240DC8: /* D60078 80240DC8 3C048024 */ lui $a0, %hi(pra_10_SetPartnerFlags80000) /* D6007C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(pra_10_SetPartnerFlags80000) @@ -64,14 +64,14 @@ glabel func_80240D3C_D5FFEC /* D600BC 80240E0C 10400005 */ beqz $v0, .L80240E24 /* D600C0 80240E10 24020002 */ addiu $v0, $zero, 2 /* D600C4 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D600C8 80240E18 00000000 */ nop +/* D600C8 80240E18 00000000 */ nop /* D600CC 80240E1C 0809039D */ j .L80240E74 -/* D600D0 80240E20 00000000 */ nop +/* D600D0 80240E20 00000000 */ nop .L80240E24: /* D600D4 80240E24 10820006 */ beq $a0, $v0, .L80240E40 /* D600D8 80240E28 24020002 */ addiu $v0, $zero, 2 /* D600DC 80240E2C 0809039D */ j .L80240E74 -/* D600E0 80240E30 00000000 */ nop +/* D600E0 80240E30 00000000 */ nop .L80240E34: /* D600E4 80240E34 8CA20000 */ lw $v0, ($a1) /* D600E8 80240E38 0809039A */ j .L80240E68 diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240F20_D601D0.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240F20_D601D0.s index dbec7e0767..eddd3f22fb 100644 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240F20_D601D0.s +++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240F20_D601D0.s @@ -75,7 +75,7 @@ glabel func_80240F20_D601D0 /* D602E4 80241034 8E4300B0 */ lw $v1, 0xb0($s2) /* D602E8 80241038 30620004 */ andi $v0, $v1, 4 /* D602EC 8024103C 10400007 */ beqz $v0, .L8024105C -/* D602F0 80241040 00000000 */ nop +/* D602F0 80241040 00000000 */ nop /* D602F4 80241044 824200B4 */ lb $v0, 0xb4($s2) /* D602F8 80241048 1440018D */ bnez $v0, .L80241680 /* D602FC 8024104C 0000102D */ daddu $v0, $zero, $zero @@ -87,11 +87,12 @@ glabel func_80240F20_D601D0 /* D60310 80241060 2C620010 */ sltiu $v0, $v1, 0x10 /* D60314 80241064 10400185 */ beqz $v0, .L8024167C /* D60318 80241068 00031080 */ sll $v0, $v1, 2 -/* D6031C 8024106C 3C018024 */ lui $at, %hi(func_80242200_C62F10) +/* D6031C 8024106C 3C018024 */ lui $at, %hi(jtbl_80242200_D614B0) /* D60320 80241070 00220821 */ addu $at, $at, $v0 -/* D60324 80241074 8C222200 */ lw $v0, %lo(func_80242200_C62F10)($at) +/* D60324 80241074 8C222200 */ lw $v0, %lo(jtbl_80242200_D614B0)($at) /* D60328 80241078 00400008 */ jr $v0 -/* D6032C 8024107C 00000000 */ nop +/* D6032C 8024107C 00000000 */ nop +glabel L80241080_D60330 /* D60330 80241080 8E4200CC */ lw $v0, 0xcc($s2) /* D60334 80241084 922300A9 */ lbu $v1, 0xa9($s1) /* D60338 80241088 8C440000 */ lw $a0, ($v0) @@ -103,9 +104,10 @@ glabel func_80240F20_D601D0 /* D60350 802410A0 AE240028 */ sw $a0, 0x28($s1) /* D60354 802410A4 AE600074 */ sw $zero, 0x74($s3) /* D60358 802410A8 AE620070 */ sw $v0, 0x70($s3) +glabel L802410AC_D6035C /* D6035C 802410AC 8E830014 */ lw $v1, 0x14($s4) /* D60360 802410B0 04600015 */ bltz $v1, .L80241108 -/* D60364 802410B4 00000000 */ nop +/* D60364 802410B4 00000000 */ nop /* D60368 802410B8 8E620074 */ lw $v0, 0x74($s3) /* D6036C 802410BC 1C400011 */ bgtz $v0, .L80241104 /* D60370 802410C0 2442FFFF */ addiu $v0, $v0, -1 @@ -133,6 +135,7 @@ glabel func_80240F20_D601D0 /* D603BC 8024110C 2402000A */ addiu $v0, $zero, 0xa /* D603C0 80241110 1462015B */ bne $v1, $v0, .L80241680 /* D603C4 80241114 0000102D */ daddu $v0, $zero, $zero +glabel L80241118_D603C8 /* D603C8 80241118 C62C0038 */ lwc1 $f12, 0x38($s1) /* D603CC 8024111C 8E4200CC */ lw $v0, 0xcc($s2) /* D603D0 80241120 C62E0040 */ lwc1 $f14, 0x40($s1) @@ -166,7 +169,7 @@ glabel func_80240F20_D601D0 /* D60440 80241190 0C0372DF */ jal func_800DCB7C /* D60444 80241194 27A70048 */ addiu $a3, $sp, 0x48 /* D60448 80241198 10400010 */ beqz $v0, .L802411DC -/* D6044C 8024119C 00000000 */ nop +/* D6044C 8024119C 00000000 */ nop /* D60450 802411A0 C620003C */ lwc1 $f0, 0x3c($s1) /* D60454 802411A4 C6440070 */ lwc1 $f4, 0x70($s2) /* D60458 802411A8 46802120 */ cvt.s.w $f4, $f4 @@ -175,7 +178,7 @@ glabel func_80240F20_D601D0 /* D60464 802411B4 D4222240 */ ldc1 $f2, %lo(func_80242240_9C7620)($at) /* D60468 802411B8 46000021 */ cvt.d.s $f0, $f0 /* D6046C 802411BC 46220002 */ mul.d $f0, $f0, $f2 -/* D60470 802411C0 00000000 */ nop +/* D60470 802411C0 00000000 */ nop /* D60474 802411C4 460020A1 */ cvt.d.s $f2, $f4 /* D60478 802411C8 46201080 */ add.d $f2, $f2, $f0 /* D6047C 802411CC E7A40044 */ swc1 $f4, 0x44($sp) @@ -190,7 +193,7 @@ glabel func_80240F20_D601D0 /* D6049C 802411EC D4242248 */ ldc1 $f4, %lo(func_80242248_87BE28)($at) /* D604A0 802411F0 460010A1 */ cvt.d.s $f2, $f2 /* D604A4 802411F4 46241082 */ mul.d $f2, $f2, $f4 -/* D604A8 802411F8 00000000 */ nop +/* D604A8 802411F8 00000000 */ nop /* D604AC 802411FC 46000021 */ cvt.d.s $f0, $f0 /* D604B0 80241200 46220000 */ add.d $f0, $f0, $f2 /* D604B4 80241204 46200020 */ cvt.s.d $f0, $f0 @@ -200,12 +203,13 @@ glabel func_80240F20_D601D0 /* D604C0 80241210 2402000B */ addiu $v0, $zero, 0xb /* D604C4 80241214 E6200068 */ swc1 $f0, 0x68($s1) /* D604C8 80241218 AE620070 */ sw $v0, 0x70($s3) +glabel L8024121C_D604CC /* D604CC 8024121C C6200018 */ lwc1 $f0, 0x18($s1) /* D604D0 80241220 44801000 */ mtc1 $zero, $f2 /* D604D4 80241224 44801800 */ mtc1 $zero, $f3 /* D604D8 80241228 46000021 */ cvt.d.s $f0, $f0 /* D604DC 8024122C 4620103C */ c.lt.d $f2, $f0 -/* D604E0 80241230 00000000 */ nop +/* D604E0 80241230 00000000 */ nop /* D604E4 80241234 45000025 */ bc1f .L802412CC /* D604E8 80241238 27A50040 */ addiu $a1, $sp, 0x40 /* D604EC 8024123C C6200038 */ lwc1 $f0, 0x38($s1) @@ -220,13 +224,13 @@ glabel func_80240F20_D601D0 /* D60510 80241260 E7A00014 */ swc1 $f0, 0x14($sp) /* D60514 80241264 862200A8 */ lh $v0, 0xa8($s1) /* D60518 80241268 44820000 */ mtc1 $v0, $f0 -/* D6051C 8024126C 00000000 */ nop +/* D6051C 8024126C 00000000 */ nop /* D60520 80241270 46800020 */ cvt.s.w $f0, $f0 /* D60524 80241274 E7A00018 */ swc1 $f0, 0x18($sp) /* D60528 80241278 862200A6 */ lh $v0, 0xa6($s1) /* D6052C 8024127C 27A60044 */ addiu $a2, $sp, 0x44 /* D60530 80241280 44820000 */ mtc1 $v0, $f0 -/* D60534 80241284 00000000 */ nop +/* D60534 80241284 00000000 */ nop /* D60538 80241288 46800020 */ cvt.s.w $f0, $f0 /* D6053C 8024128C E7A0001C */ swc1 $f0, 0x1c($sp) /* D60540 80241290 8E240080 */ lw $a0, 0x80($s1) @@ -254,12 +258,13 @@ glabel func_80240F20_D601D0 /* D60590 802412E0 46001080 */ add.s $f2, $f2, $f0 /* D60594 802412E4 E620001C */ swc1 $f0, 0x1c($s1) /* D60598 802412E8 4604103C */ c.lt.s $f2, $f4 -/* D6059C 802412EC 00000000 */ nop +/* D6059C 802412EC 00000000 */ nop /* D605A0 802412F0 450000E2 */ bc1f .L8024167C /* D605A4 802412F4 E622003C */ swc1 $f2, 0x3c($s1) /* D605A8 802412F8 2402000C */ addiu $v0, $zero, 0xc /* D605AC 802412FC E624003C */ swc1 $f4, 0x3c($s1) /* D605B0 80241300 AE620070 */ sw $v0, 0x70($s3) +glabel L80241304_D605B4 /* D605B4 80241304 C62C0038 */ lwc1 $f12, 0x38($s1) /* D605B8 80241308 C62E0040 */ lwc1 $f14, 0x40($s1) /* D605BC 8024130C 8EA60028 */ lw $a2, 0x28($s5) @@ -267,9 +272,9 @@ glabel func_80240F20_D601D0 /* D605C4 80241314 8EA70030 */ lw $a3, 0x30($s5) /* D605C8 80241318 3C014270 */ lui $at, 0x4270 /* D605CC 8024131C 44811000 */ mtc1 $at, $f2 -/* D605D0 80241320 00000000 */ nop +/* D605D0 80241320 00000000 */ nop /* D605D4 80241324 4602003C */ c.lt.s $f0, $f2 -/* D605D8 80241328 00000000 */ nop +/* D605D8 80241328 00000000 */ nop /* D605DC 8024132C 45000002 */ bc1f .L80241338 /* D605E0 80241330 E6200010 */ swc1 $f0, 0x10($s1) /* D605E4 80241334 E6220010 */ swc1 $f2, 0x10($s1) @@ -288,7 +293,7 @@ glabel func_80240F20_D601D0 /* D60614 80241364 C622003C */ lwc1 $f2, 0x3c($s1) /* D60618 80241368 4600228D */ trunc.w.s $f10, $f4 /* D6061C 8024136C 44025000 */ mfc1 $v0, $f10 -/* D60620 80241370 00000000 */ nop +/* D60620 80241370 00000000 */ nop /* D60624 80241374 A622008E */ sh $v0, 0x8e($s1) /* D60628 80241378 460010A1 */ cvt.d.s $f2, $f2 /* D6062C 8024137C 46220001 */ sub.d $f0, $f0, $f2 @@ -302,11 +307,11 @@ glabel func_80240F20_D601D0 /* D60648 80241398 8622008E */ lh $v0, 0x8e($s1) /* D6064C 8024139C C620001C */ lwc1 $f0, 0x1c($s1) /* D60650 802413A0 44821000 */ mtc1 $v0, $f2 -/* D60654 802413A4 00000000 */ nop +/* D60654 802413A4 00000000 */ nop /* D60658 802413A8 468010A0 */ cvt.s.w $f2, $f2 /* D6065C 802413AC 46000007 */ neg.s $f0, $f0 /* D60660 802413B0 46020002 */ mul.s $f0, $f0, $f2 -/* D60664 802413B4 00000000 */ nop +/* D60664 802413B4 00000000 */ nop /* D60668 802413B8 00420018 */ mult $v0, $v0 /* D6066C 802413BC 8E230000 */ lw $v1, ($s1) /* D60670 802413C0 46040000 */ add.s $f0, $f0, $f4 @@ -318,7 +323,7 @@ glabel func_80240F20_D601D0 /* D60688 802413D8 46000000 */ add.s $f0, $f0, $f0 /* D6068C 802413DC AE230000 */ sw $v1, ($s1) /* D60690 802413E0 44881000 */ mtc1 $t0, $f2 -/* D60694 802413E4 00000000 */ nop +/* D60694 802413E4 00000000 */ nop /* D60698 802413E8 468010A0 */ cvt.s.w $f2, $f2 /* D6069C 802413EC 46000007 */ neg.s $f0, $f0 /* D606A0 802413F0 46020003 */ div.s $f0, $f0, $f2 @@ -329,13 +334,14 @@ glabel func_80240F20_D601D0 /* D606B4 80241404 2402000D */ addiu $v0, $zero, 0xd /* D606B8 80241408 A620008E */ sh $zero, 0x8e($s1) /* D606BC 8024140C AE620070 */ sw $v0, 0x70($s3) +glabel L80241410_D606C0 /* D606C0 80241410 C620001C */ lwc1 $f0, 0x1c($s1) /* D606C4 80241414 C6220014 */ lwc1 $f2, 0x14($s1) /* D606C8 80241418 46020001 */ sub.s $f0, $f0, $f2 /* D606CC 8024141C 4480A000 */ mtc1 $zero, $f20 -/* D606D0 80241420 00000000 */ nop +/* D606D0 80241420 00000000 */ nop /* D606D4 80241424 4614003C */ c.lt.s $f0, $f20 -/* D606D8 80241428 00000000 */ nop +/* D606D8 80241428 00000000 */ nop /* D606DC 8024142C 45000012 */ bc1f .L80241478 /* D606E0 80241430 E620001C */ swc1 $f0, 0x1c($s1) /* D606E4 80241434 27A50040 */ addiu $a1, $sp, 0x40 @@ -364,7 +370,7 @@ glabel func_80240F20_D601D0 /* D6073C 8024148C 44801800 */ mtc1 $zero, $f3 /* D60740 80241490 46000021 */ cvt.d.s $f0, $f0 /* D60744 80241494 4620103C */ c.lt.d $f2, $f0 -/* D60748 80241498 00000000 */ nop +/* D60748 80241498 00000000 */ nop /* D6074C 8024149C 45000057 */ bc1f .L802415FC /* D60750 802414A0 E624003C */ swc1 $f4, 0x3c($s1) /* D60754 802414A4 46002086 */ mov.s $f2, $f4 @@ -380,20 +386,20 @@ glabel func_80240F20_D601D0 /* D6077C 802414CC 862200A8 */ lh $v0, 0xa8($s1) /* D60780 802414D0 27A50040 */ addiu $a1, $sp, 0x40 /* D60784 802414D4 44820000 */ mtc1 $v0, $f0 -/* D60788 802414D8 00000000 */ nop +/* D60788 802414D8 00000000 */ nop /* D6078C 802414DC 46800020 */ cvt.s.w $f0, $f0 /* D60790 802414E0 E7A00018 */ swc1 $f0, 0x18($sp) /* D60794 802414E4 862200A6 */ lh $v0, 0xa6($s1) /* D60798 802414E8 27A60044 */ addiu $a2, $sp, 0x44 /* D6079C 802414EC 44820000 */ mtc1 $v0, $f0 -/* D607A0 802414F0 00000000 */ nop +/* D607A0 802414F0 00000000 */ nop /* D607A4 802414F4 46800020 */ cvt.s.w $f0, $f0 /* D607A8 802414F8 E7A0001C */ swc1 $f0, 0x1c($sp) /* D607AC 802414FC 8E240080 */ lw $a0, 0x80($s1) /* D607B0 80241500 0C037711 */ jal func_800DDC44 /* D607B4 80241504 27A70048 */ addiu $a3, $sp, 0x48 /* D607B8 80241508 10400003 */ beqz $v0, .L80241518 -/* D607BC 8024150C 00000000 */ nop +/* D607BC 8024150C 00000000 */ nop /* D607C0 80241510 0809057B */ j .L802415EC /* D607C4 80241514 AE200018 */ sw $zero, 0x18($s1) .L80241518: @@ -403,9 +409,9 @@ glabel func_80240F20_D601D0 /* D607D4 80241524 44801000 */ mtc1 $zero, $f2 /* D607D8 80241528 46000021 */ cvt.d.s $f0, $f0 /* D607DC 8024152C 4622003C */ c.lt.d $f0, $f2 -/* D607E0 80241530 00000000 */ nop +/* D607E0 80241530 00000000 */ nop /* D607E4 80241534 4500002D */ bc1f .L802415EC -/* D607E8 80241538 00000000 */ nop +/* D607E8 80241538 00000000 */ nop /* D607EC 8024153C 9622008E */ lhu $v0, 0x8e($s1) /* D607F0 80241540 24420001 */ addiu $v0, $v0, 1 /* D607F4 80241544 A622008E */ sh $v0, 0x8e($s1) @@ -414,7 +420,7 @@ glabel func_80240F20_D601D0 /* D60800 80241550 00021403 */ sra $v0, $v0, 0x10 /* D60804 80241554 0043102A */ slt $v0, $v0, $v1 /* D60808 80241558 14400024 */ bnez $v0, .L802415EC -/* D6080C 8024155C 00000000 */ nop +/* D6080C 8024155C 00000000 */ nop /* D60810 80241560 C62C0038 */ lwc1 $f12, 0x38($s1) /* D60814 80241564 C62E0040 */ lwc1 $f14, 0x40($s1) /* D60818 80241568 8EA60028 */ lw $a2, 0x28($s5) @@ -428,20 +434,20 @@ glabel func_80240F20_D601D0 /* D60838 80241588 8E82001C */ lw $v0, 0x1c($s4) /* D6083C 8024158C 46001005 */ abs.s $f0, $f2 /* D60840 80241590 44822000 */ mtc1 $v0, $f4 -/* D60844 80241594 00000000 */ nop +/* D60844 80241594 00000000 */ nop /* D60848 80241598 46802120 */ cvt.s.w $f4, $f4 /* D6084C 8024159C 4600203C */ c.lt.s $f4, $f0 -/* D60850 802415A0 00000000 */ nop +/* D60850 802415A0 00000000 */ nop /* D60854 802415A4 4500000D */ bc1f .L802415DC -/* D60858 802415A8 00000000 */ nop +/* D60858 802415A8 00000000 */ nop /* D6085C 802415AC 44800000 */ mtc1 $zero, $f0 /* D60860 802415B0 C634000C */ lwc1 $f20, 0xc($s1) /* D60864 802415B4 4600103C */ c.lt.s $f2, $f0 -/* D60868 802415B8 00000000 */ nop +/* D60868 802415B8 00000000 */ nop /* D6086C 802415BC 45000006 */ bc1f .L802415D8 /* D60870 802415C0 00021023 */ negu $v0, $v0 /* D60874 802415C4 44820000 */ mtc1 $v0, $f0 -/* D60878 802415C8 00000000 */ nop +/* D60878 802415C8 00000000 */ nop /* D6087C 802415CC 46800020 */ cvt.s.w $f0, $f0 /* D60880 802415D0 08090577 */ j .L802415DC /* D60884 802415D4 4600A500 */ add.s $f20, $f20, $f0 @@ -468,11 +474,12 @@ glabel func_80240F20_D601D0 /* D608C4 80241614 C620003C */ lwc1 $f0, 0x3c($s1) /* D608C8 80241618 C6220068 */ lwc1 $f2, 0x68($s1) /* D608CC 8024161C 4600103C */ c.lt.s $f2, $f0 -/* D608D0 80241620 00000000 */ nop +/* D608D0 80241620 00000000 */ nop /* D608D4 80241624 45000015 */ bc1f .L8024167C /* D608D8 80241628 2402000E */ addiu $v0, $zero, 0xe /* D608DC 8024162C E622003C */ swc1 $f2, 0x3c($s1) /* D608E0 80241630 AE620070 */ sw $v0, 0x70($s3) +glabel L80241634_D608E4 /* D608E4 80241634 8E4200CC */ lw $v0, 0xcc($s2) /* D608E8 80241638 922300A9 */ lbu $v1, 0xa9($s1) /* D608EC 8024163C 8C440020 */ lw $a0, 0x20($v0) @@ -485,6 +492,7 @@ glabel func_80240F20_D601D0 /* D60908 80241658 2402000F */ addiu $v0, $zero, 0xf /* D6090C 8024165C AE240028 */ sw $a0, 0x28($s1) /* D60910 80241660 AE620070 */ sw $v0, 0x70($s3) +glabel L80241664_D60914 /* D60914 80241664 9622008E */ lhu $v0, 0x8e($s1) /* D60918 80241668 2442FFFF */ addiu $v0, $v0, -1 /* D6091C 8024166C A622008E */ sh $v0, 0x8e($s1) @@ -492,6 +500,7 @@ glabel func_80240F20_D601D0 /* D60924 80241674 58400001 */ blezl $v0, .L8024167C /* D60928 80241678 AE600070 */ sw $zero, 0x70($s3) .L8024167C: +glabel L8024167C_D6092C /* D6092C 8024167C 0000102D */ daddu $v0, $zero, $zero .L80241680: /* D60930 80241680 8FBF006C */ lw $ra, 0x6c($sp) @@ -505,4 +514,4 @@ glabel func_80240F20_D601D0 /* D60950 802416A0 D7B40070 */ ldc1 $f20, 0x70($sp) /* D60954 802416A4 03E00008 */ jr $ra /* D60958 802416A8 27BD0078 */ addiu $sp, $sp, 0x78 -/* D6095C 802416AC 00000000 */ nop +/* D6095C 802416AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240054_D61554.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240054_D61554.s index c50a43de6e..b14d2c7514 100644 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240054_D61554.s +++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240054_D61554.s @@ -40,7 +40,7 @@ glabel func_80240054_D61554 /* D615D0 802400D0 1440FFF7 */ bnez $v0, .L802400B0 /* D615D4 802400D4 24820001 */ addiu $v0, $a0, 1 /* D615D8 802400D8 03E00008 */ jr $ra -/* D615DC 802400DC 00000000 */ nop +/* D615DC 802400DC 00000000 */ nop .L802400E0: /* D615E0 802400E0 3C020100 */ lui $v0, 0x100 .L802400E4: diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s index 4b347036b9..c5c028b53c 100644 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s +++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s @@ -16,7 +16,7 @@ glabel func_80240128_D61628 /* D61654 80240154 27B20020 */ addiu $s2, $sp, 0x20 /* D61658 80240158 8E0400CC */ lw $a0, 0xcc($s0) /* D6165C 8024015C 0C044181 */ jal get_shadow_by_index -/* D61660 80240160 00000000 */ nop +/* D61660 80240160 00000000 */ nop /* D61664 80240164 0C048B77 */ jal func_80122DDC /* D61668 80240168 84440008 */ lh $a0, 8($v0) /* D6166C 8024016C 8C430000 */ lw $v1, ($v0) @@ -38,22 +38,22 @@ glabel func_80240128_D61628 /* D616AC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D616B0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) /* D616B4 802401B4 0C090008 */ jal pra_11_UnkFunc2 -/* D616B8 802401B8 00000000 */ nop +/* D616B8 802401B8 00000000 */ nop /* D616BC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D616C0 802401C0 3C014307 */ lui $at, 0x4307 /* D616C4 802401C4 44810000 */ mtc1 $at, $f0 -/* D616C8 802401C8 00000000 */ nop +/* D616C8 802401C8 00000000 */ nop /* D616CC 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D616D0 802401D0 00000000 */ nop +/* D616D0 802401D0 00000000 */ nop /* D616D4 802401D4 4500000B */ bc1f .L80240204 /* D616D8 802401D8 24040002 */ addiu $a0, $zero, 2 /* D616DC 802401DC 3C014361 */ lui $at, 0x4361 /* D616E0 802401E0 44810000 */ mtc1 $at, $f0 -/* D616E4 802401E4 00000000 */ nop +/* D616E4 802401E4 00000000 */ nop /* D616E8 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D616EC 802401EC 00000000 */ nop +/* D616EC 802401EC 00000000 */ nop /* D616F0 802401F0 45000004 */ bc1f .L80240204 -/* D616F4 802401F4 00000000 */ nop +/* D616F4 802401F4 00000000 */ nop /* D616F8 802401F8 0C090015 */ jal func_80240054_D61554 /* D616FC 802401FC 0040202D */ daddu $a0, $v0, $zero /* D61700 80240200 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240128_D61628 /* D61788 80240288 AFA0001C */ sw $zero, 0x1c($sp) .L8024028C: /* D6178C 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D61790 80240290 00000000 */ nop +/* D61790 80240290 00000000 */ nop .L80240294: /* D61794 80240294 9202000E */ lbu $v0, 0xe($s0) /* D61798 80240298 3C01802E */ lui $at, %hi(D_802D9D70) diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_802402F0_D617F0.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_802402F0_D617F0.s index 23a38eda65..b5ac808842 100644 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_802402F0_D617F0.s +++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_802402F0_D617F0.s @@ -33,7 +33,7 @@ glabel func_802402F0_D617F0 /* D61860 80240360 E7B40010 */ swc1 $f20, 0x10($sp) /* D61864 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) /* D61868 80240368 0C00A6C9 */ jal clamp_angle -/* D6186C 8024036C 00000000 */ nop +/* D6186C 8024036C 00000000 */ nop /* D61870 80240370 44050000 */ mfc1 $a1, $f0 /* D61874 80240374 4406A000 */ mfc1 $a2, $f20 /* D61878 80240378 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_8024049C_D6199C.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_8024049C_D6199C.s index f521546463..5e7b8cdbdb 100644 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_8024049C_D6199C.s +++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_8024049C_D6199C.s @@ -10,7 +10,7 @@ glabel func_8024049C_D6199C /* D619B0 802404B0 0440000E */ bltz $v0, .L802404EC /* D619B4 802404B4 28420002 */ slti $v0, $v0, 2 /* D619B8 802404B8 1040000C */ beqz $v0, .L802404EC -/* D619BC 802404BC 00000000 */ nop +/* D619BC 802404BC 00000000 */ nop /* D619C0 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D61A00) /* D619C4 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D61A00) /* D619C8 802404C8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240500_D61A00.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240500_D61A00.s index 313ea41195..35224f3ad0 100644 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240500_D61A00.s +++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240500_D61A00.s @@ -16,7 +16,7 @@ glabel func_80240500_D61A00 /* D61A2C 8024052C 27B10020 */ addiu $s1, $sp, 0x20 /* D61A30 80240530 8E0400CC */ lw $a0, 0xcc($s0) /* D61A34 80240534 0C044181 */ jal get_shadow_by_index -/* D61A38 80240538 00000000 */ nop +/* D61A38 80240538 00000000 */ nop /* D61A3C 8024053C 0C048B77 */ jal func_80122DDC /* D61A40 80240540 84440008 */ lh $a0, 8($v0) /* D61A44 80240544 8E050028 */ lw $a1, 0x28($s0) @@ -33,7 +33,7 @@ glabel func_80240500_D61A00 /* D61A70 80240570 46000007 */ neg.s $f0, $f0 /* D61A74 80240574 44060000 */ mfc1 $a2, $f0 /* D61A78 80240578 0C00B94E */ jal get_screen_coords -/* D61A7C 8024057C 00000000 */ nop +/* D61A7C 8024057C 00000000 */ nop /* D61A80 80240580 8E0500A4 */ lw $a1, 0xa4($s0) /* D61A84 80240584 3C063F80 */ lui $a2, 0x3f80 /* D61A88 80240588 0C0B76A3 */ jal func_802DDA8C @@ -72,13 +72,13 @@ glabel func_80240500_D61A00 /* D61B08 80240608 AFA0001C */ sw $zero, 0x1c($sp) .L8024060C: /* D61B0C 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D61B10 80240610 00000000 */ nop +/* D61B10 80240610 00000000 */ nop .L80240614: /* D61B14 80240614 9202000E */ lbu $v0, 0xe($s0) /* D61B18 80240618 3C01802E */ lui $at, %hi(D_802D9D71) /* D61B1C 8024061C A0229D71 */ sb $v0, %lo(D_802D9D71)($at) /* D61B20 80240620 0809018C */ j .L80240630 -/* D61B24 80240624 00000000 */ nop +/* D61B24 80240624 00000000 */ nop .L80240628: /* D61B28 80240628 3C01802E */ lui $at, %hi(D_802D9D71) /* D61B2C 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_8024068C_D61B8C.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_8024068C_D61B8C.s index 0ce7af512e..502786f570 100644 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_8024068C_D61B8C.s +++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_8024068C_D61B8C.s @@ -33,7 +33,7 @@ glabel func_8024068C_D61B8C /* D61BFC 802406FC E7B40010 */ swc1 $f20, 0x10($sp) /* D61C00 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) /* D61C04 80240704 0C00A6C9 */ jal clamp_angle -/* D61C08 80240708 00000000 */ nop +/* D61C08 80240708 00000000 */ nop /* D61C0C 8024070C 44050000 */ mfc1 $a1, $f0 /* D61C10 80240710 4406A000 */ mfc1 $a2, $f20 /* D61C14 80240714 4407A000 */ mfc1 $a3, $f20 @@ -95,16 +95,16 @@ glabel func_8024068C_D61B8C /* D61CF4 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D61CF8 802407F8 3C0142B4 */ lui $at, 0x42b4 /* D61CFC 802407FC 44810000 */ mtc1 $at, $f0 -/* D61D00 80240800 00000000 */ nop +/* D61D00 80240800 00000000 */ nop /* D61D04 80240804 4602003E */ c.le.s $f0, $f2 -/* D61D08 80240808 00000000 */ nop +/* D61D08 80240808 00000000 */ nop /* D61D0C 8024080C 4500000A */ bc1f .L80240838 /* D61D10 80240810 24040001 */ addiu $a0, $zero, 1 /* D61D14 80240814 3C014387 */ lui $at, 0x4387 /* D61D18 80240818 44810000 */ mtc1 $at, $f0 -/* D61D1C 8024081C 00000000 */ nop +/* D61D1C 8024081C 00000000 */ nop /* D61D20 80240820 4600103C */ c.lt.s $f2, $f0 -/* D61D24 80240824 00000000 */ nop +/* D61D24 80240824 00000000 */ nop /* D61D28 80240828 45000004 */ bc1f .L8024083C /* D61D2C 8024082C 27A20018 */ addiu $v0, $sp, 0x18 /* D61D30 80240830 3C041000 */ lui $a0, 0x1000 diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240870_D61D70.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240870_D61D70.s index 66b2c33477..1c82ad39eb 100644 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240870_D61D70.s +++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240870_D61D70.s @@ -43,36 +43,36 @@ glabel func_80240870_D61D70 /* D61E04 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D61E08 80240908 3C0142B4 */ lui $at, 0x42b4 /* D61E0C 8024090C 44810000 */ mtc1 $at, $f0 -/* D61E10 80240910 00000000 */ nop +/* D61E10 80240910 00000000 */ nop /* D61E14 80240914 4602003C */ c.lt.s $f0, $f2 -/* D61E18 80240918 00000000 */ nop +/* D61E18 80240918 00000000 */ nop /* D61E1C 8024091C 4500000A */ bc1f .L80240948 -/* D61E20 80240920 00000000 */ nop +/* D61E20 80240920 00000000 */ nop /* D61E24 80240924 3C014334 */ lui $at, 0x4334 /* D61E28 80240928 44812000 */ mtc1 $at, $f4 -/* D61E2C 8024092C 00000000 */ nop +/* D61E2C 8024092C 00000000 */ nop /* D61E30 80240930 4604103E */ c.le.s $f2, $f4 -/* D61E34 80240934 00000000 */ nop +/* D61E34 80240934 00000000 */ nop /* D61E38 80240938 45000003 */ bc1f .L80240948 -/* D61E3C 8024093C 00000000 */ nop +/* D61E3C 8024093C 00000000 */ nop /* D61E40 80240940 08090276 */ j .L802409D8 /* D61E44 80240944 46022501 */ sub.s $f20, $f4, $f2 .L80240948: /* D61E48 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) /* D61E4C 8024094C 3C014334 */ lui $at, 0x4334 /* D61E50 80240950 44812000 */ mtc1 $at, $f4 -/* D61E54 80240954 00000000 */ nop +/* D61E54 80240954 00000000 */ nop /* D61E58 80240958 4600203C */ c.lt.s $f4, $f0 -/* D61E5C 8024095C 00000000 */ nop +/* D61E5C 8024095C 00000000 */ nop /* D61E60 80240960 4500000C */ bc1f .L80240994 -/* D61E64 80240964 00000000 */ nop +/* D61E64 80240964 00000000 */ nop /* D61E68 80240968 3C014387 */ lui $at, 0x4387 /* D61E6C 8024096C 44812000 */ mtc1 $at, $f4 -/* D61E70 80240970 00000000 */ nop +/* D61E70 80240970 00000000 */ nop /* D61E74 80240974 4604003E */ c.le.s $f0, $f4 -/* D61E78 80240978 00000000 */ nop +/* D61E78 80240978 00000000 */ nop /* D61E7C 8024097C 45000008 */ bc1f .L802409A0 -/* D61E80 80240980 00000000 */ nop +/* D61E80 80240980 00000000 */ nop /* D61E84 80240984 3C014334 */ lui $at, 0x4334 /* D61E88 80240988 44812000 */ mtc1 $at, $f4 /* D61E8C 8024098C 08090276 */ j .L802409D8 @@ -80,19 +80,19 @@ glabel func_80240870_D61D70 .L80240994: /* D61E94 80240994 3C014387 */ lui $at, 0x4387 /* D61E98 80240998 44812000 */ mtc1 $at, $f4 -/* D61E9C 8024099C 00000000 */ nop +/* D61E9C 8024099C 00000000 */ nop .L802409A0: /* D61EA0 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D61EA4 802409A4 00000000 */ nop +/* D61EA4 802409A4 00000000 */ nop /* D61EA8 802409A8 4500000A */ bc1f .L802409D4 -/* D61EAC 802409AC 00000000 */ nop +/* D61EAC 802409AC 00000000 */ nop /* D61EB0 802409B0 3C0143B4 */ lui $at, 0x43b4 /* D61EB4 802409B4 44811000 */ mtc1 $at, $f2 -/* D61EB8 802409B8 00000000 */ nop +/* D61EB8 802409B8 00000000 */ nop /* D61EBC 802409BC 4602003E */ c.le.s $f0, $f2 -/* D61EC0 802409C0 00000000 */ nop +/* D61EC0 802409C0 00000000 */ nop /* D61EC4 802409C4 45000003 */ bc1f .L802409D4 -/* D61EC8 802409C8 00000000 */ nop +/* D61EC8 802409C8 00000000 */ nop /* D61ECC 802409CC 08090276 */ j .L802409D8 /* D61ED0 802409D0 46001501 */ sub.s $f20, $f2, $f0 .L802409D4: @@ -100,11 +100,11 @@ glabel func_80240870_D61D70 .L802409D8: /* D61ED8 802409D8 3C0141C8 */ lui $at, 0x41c8 /* D61EDC 802409DC 44810000 */ mtc1 $at, $f0 -/* D61EE0 802409E0 00000000 */ nop +/* D61EE0 802409E0 00000000 */ nop /* D61EE4 802409E4 4600A003 */ div.s $f0, $f20, $f0 /* D61EE8 802409E8 4600010D */ trunc.w.s $f4, $f0 /* D61EEC 802409EC 44072000 */ mfc1 $a3, $f4 -/* D61EF0 802409F0 00000000 */ nop +/* D61EF0 802409F0 00000000 */ nop /* D61EF4 802409F4 00071100 */ sll $v0, $a3, 4 /* D61EF8 802409F8 00471023 */ subu $v0, $v0, $a3 /* D61EFC 802409FC 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel func_80240870_D61D70 /* D61F44 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) /* D61F48 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) /* D61F4C 80240A4C 0C00A6C9 */ jal clamp_angle -/* D61F50 80240A50 00000000 */ nop +/* D61F50 80240A50 00000000 */ nop /* D61F54 80240A54 44050000 */ mfc1 $a1, $f0 /* D61F58 80240A58 4406B000 */ mfc1 $a2, $f22 /* D61F5C 80240A5C 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel func_80240870_D61D70 /* D61FC0 80240AC0 24040001 */ addiu $a0, $zero, 1 .L80240AC4: /* D61FC4 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D61FC8 80240AC8 00000000 */ nop +/* D61FC8 80240AC8 00000000 */ nop /* D61FCC 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 /* D61FD0 80240AD0 24040001 */ addiu $a0, $zero, 1 .L80240AD4: @@ -204,10 +204,10 @@ glabel func_80240870_D61D70 /* D62060 80240B60 44812000 */ mtc1 $at, $f4 /* D62064 80240B64 00021023 */ negu $v0, $v0 /* D62068 80240B68 44820000 */ mtc1 $v0, $f0 -/* D6206C 80240B6C 00000000 */ nop +/* D6206C 80240B6C 00000000 */ nop /* D62070 80240B70 46800020 */ cvt.s.w $f0, $f0 /* D62074 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D62078 80240B78 00000000 */ nop +/* D62078 80240B78 00000000 */ nop /* D6207C 80240B7C 4405B000 */ mfc1 $a1, $f22 /* D62080 80240B80 4407B000 */ mfc1 $a3, $f22 /* D62084 80240B84 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel func_80240870_D61D70 /* D620F4 80240BF4 3C013F00 */ lui $at, 0x3f00 /* D620F8 80240BF8 44812000 */ mtc1 $at, $f4 /* D620FC 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D62100 80240C00 00000000 */ nop +/* D62100 80240C00 00000000 */ nop /* D62104 80240C04 46800020 */ cvt.s.w $f0, $f0 /* D62108 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D6210C 80240C0C 00000000 */ nop +/* D6210C 80240C0C 00000000 */ nop /* D62110 80240C10 4405B000 */ mfc1 $a1, $f22 /* D62114 80240C14 4407B000 */ mfc1 $a3, $f22 /* D62118 80240C18 44062000 */ mfc1 $a2, $f4 @@ -280,16 +280,16 @@ glabel func_80240870_D61D70 /* D62190 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D62194 80240C94 3C0142B4 */ lui $at, 0x42b4 /* D62198 80240C98 44810000 */ mtc1 $at, $f0 -/* D6219C 80240C9C 00000000 */ nop +/* D6219C 80240C9C 00000000 */ nop /* D621A0 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D621A4 80240CA4 00000000 */ nop +/* D621A4 80240CA4 00000000 */ nop /* D621A8 80240CA8 4500000A */ bc1f .L80240CD4 /* D621AC 80240CAC 24040001 */ addiu $a0, $zero, 1 /* D621B0 80240CB0 3C014387 */ lui $at, 0x4387 /* D621B4 80240CB4 44812000 */ mtc1 $at, $f4 -/* D621B8 80240CB8 00000000 */ nop +/* D621B8 80240CB8 00000000 */ nop /* D621BC 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D621C0 80240CC0 00000000 */ nop +/* D621C0 80240CC0 00000000 */ nop /* D621C4 80240CC4 45000004 */ bc1f .L80240CD8 /* D621C8 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 /* D621CC 80240CCC 3C041000 */ lui $a0, 0x1000 @@ -305,7 +305,7 @@ glabel func_80240870_D61D70 /* D621EC 80240CEC 26730001 */ addiu $s3, $s3, 1 /* D621F0 80240CF0 2A620002 */ slti $v0, $s3, 2 /* D621F4 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D621F8 80240CF8 00000000 */ nop +/* D621F8 80240CF8 00000000 */ nop /* D621FC 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) /* D62200 80240D00 8FB60148 */ lw $s6, 0x148($sp) /* D62204 80240D04 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240D3C_D6223C.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240D3C_D6223C.s index 6173da2e6b..9b18b308a1 100644 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240D3C_D6223C.s +++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240D3C_D6223C.s @@ -11,36 +11,36 @@ glabel func_80240D3C_D6223C /* D62254 80240D54 24020001 */ addiu $v0, $zero, 1 /* D62258 80240D58 8E030084 */ lw $v1, 0x84($s0) /* D6225C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D62260 80240D60 00000000 */ nop +/* D62260 80240D60 00000000 */ nop /* D62264 80240D64 28620002 */ slti $v0, $v1, 2 /* D62268 80240D68 50400005 */ beql $v0, $zero, .L80240D80 /* D6226C 80240D6C 24020002 */ addiu $v0, $zero, 2 /* D62270 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D62274 80240D74 00000000 */ nop +/* D62274 80240D74 00000000 */ nop /* D62278 80240D78 08090378 */ j .L80240DE0 -/* D6227C 80240D7C 00000000 */ nop +/* D6227C 80240D7C 00000000 */ nop .L80240D80: /* D62280 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D62284 80240D84 00000000 */ nop +/* D62284 80240D84 00000000 */ nop /* D62288 80240D88 08090378 */ j .L80240DE0 -/* D6228C 80240D8C 00000000 */ nop +/* D6228C 80240D8C 00000000 */ nop .L80240D90: /* D62290 80240D90 3C048024 */ lui $a0, %hi(pra_11_SetPartnerFlagsA0000) /* D62294 80240D94 24840E84 */ addiu $a0, $a0, %lo(pra_11_SetPartnerFlagsA0000) /* D62298 80240D98 08090374 */ j .L80240DD0 -/* D6229C 80240D9C 00000000 */ nop +/* D6229C 80240D9C 00000000 */ nop .L80240DA0: /* D622A0 80240DA0 3C048024 */ lui $a0, %hi(pra_11_SetPartnerFlags20000) /* D622A4 80240DA4 24840EEC */ addiu $a0, $a0, %lo(pra_11_SetPartnerFlags20000) /* D622A8 80240DA8 08090374 */ j .L80240DD0 -/* D622AC 80240DAC 00000000 */ nop +/* D622AC 80240DAC 00000000 */ nop .L80240DB0: /* D622B0 80240DB0 8E020084 */ lw $v0, 0x84($s0) /* D622B4 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D622B8 80240DB8 00000000 */ nop +/* D622B8 80240DB8 00000000 */ nop /* D622BC 80240DBC 28420002 */ slti $v0, $v0, 2 /* D622C0 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D622C4 80240DC4 00000000 */ nop +/* D622C4 80240DC4 00000000 */ nop .L80240DC8: /* D622C8 80240DC8 3C048024 */ lui $a0, %hi(pra_11_SetPartnerFlags80000) /* D622CC 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(pra_11_SetPartnerFlags80000) @@ -64,14 +64,14 @@ glabel func_80240D3C_D6223C /* D6230C 80240E0C 10400005 */ beqz $v0, .L80240E24 /* D62310 80240E10 24020002 */ addiu $v0, $zero, 2 /* D62314 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D62318 80240E18 00000000 */ nop +/* D62318 80240E18 00000000 */ nop /* D6231C 80240E1C 0809039D */ j .L80240E74 -/* D62320 80240E20 00000000 */ nop +/* D62320 80240E20 00000000 */ nop .L80240E24: /* D62324 80240E24 10820006 */ beq $a0, $v0, .L80240E40 /* D62328 80240E28 24020002 */ addiu $v0, $zero, 2 /* D6232C 80240E2C 0809039D */ j .L80240E74 -/* D62330 80240E30 00000000 */ nop +/* D62330 80240E30 00000000 */ nop .L80240E34: /* D62334 80240E34 8CA20000 */ lw $v0, ($a1) /* D62338 80240E38 0809039A */ j .L80240E68 diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240F20_D62420.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240F20_D62420.s index e630b2d284..c5da23fb5c 100644 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240F20_D62420.s +++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240F20_D62420.s @@ -26,7 +26,7 @@ glabel func_80240F20_D62420 /* D62470 80240F70 1440FFFA */ bnez $v0, .L80240F5C /* D62474 80240F74 24A50004 */ addiu $a1, $a1, 4 /* D62478 80240F78 080903EF */ j .L80240FBC -/* D6247C 80240F7C 00000000 */ nop +/* D6247C 80240F7C 00000000 */ nop .L80240F80: /* D62480 80240F80 0000182D */ daddu $v1, $zero, $zero /* D62484 80240F84 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240084_D62D94.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240084_D62D94.s index b8c94c65e4..381115f300 100644 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240084_D62D94.s +++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240084_D62D94.s @@ -40,7 +40,7 @@ glabel func_80240084_D62D94 /* D62E10 80240100 1440FFF7 */ bnez $v0, .L802400E0 /* D62E14 80240104 24820001 */ addiu $v0, $a0, 1 /* D62E18 80240108 03E00008 */ jr $ra -/* D62E1C 8024010C 00000000 */ nop +/* D62E1C 8024010C 00000000 */ nop .L80240110: /* D62E20 80240110 3C020100 */ lui $v0, 0x100 .L80240114: diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s index 93365055a8..fa55917d6b 100644 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s +++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s @@ -16,7 +16,7 @@ glabel func_80240158_D62E68 /* D62E94 80240184 27B20020 */ addiu $s2, $sp, 0x20 /* D62E98 80240188 8E0400CC */ lw $a0, 0xcc($s0) /* D62E9C 8024018C 0C044181 */ jal get_shadow_by_index -/* D62EA0 80240190 00000000 */ nop +/* D62EA0 80240190 00000000 */ nop /* D62EA4 80240194 0C048B77 */ jal func_80122DDC /* D62EA8 80240198 84440008 */ lh $a0, 8($v0) /* D62EAC 8024019C 8C430000 */ lw $v1, ($v0) @@ -38,22 +38,22 @@ glabel func_80240158_D62E68 /* D62EEC 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D62EF0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) /* D62EF4 802401E4 0C090014 */ jal pra_12_UnkFunc2 -/* D62EF8 802401E8 00000000 */ nop +/* D62EF8 802401E8 00000000 */ nop /* D62EFC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D62F00 802401F0 3C014307 */ lui $at, 0x4307 /* D62F04 802401F4 44810000 */ mtc1 $at, $f0 -/* D62F08 802401F8 00000000 */ nop +/* D62F08 802401F8 00000000 */ nop /* D62F0C 802401FC 4602003C */ c.lt.s $f0, $f2 -/* D62F10 80240200 00000000 */ nop +/* D62F10 80240200 00000000 */ nop /* D62F14 80240204 4500000B */ bc1f .L80240234 /* D62F18 80240208 24040002 */ addiu $a0, $zero, 2 /* D62F1C 8024020C 3C014361 */ lui $at, 0x4361 /* D62F20 80240210 44810000 */ mtc1 $at, $f0 -/* D62F24 80240214 00000000 */ nop +/* D62F24 80240214 00000000 */ nop /* D62F28 80240218 4600103C */ c.lt.s $f2, $f0 -/* D62F2C 8024021C 00000000 */ nop +/* D62F2C 8024021C 00000000 */ nop /* D62F30 80240220 45000004 */ bc1f .L80240234 -/* D62F34 80240224 00000000 */ nop +/* D62F34 80240224 00000000 */ nop /* D62F38 80240228 0C090021 */ jal func_80240084_D62D94 /* D62F3C 8024022C 0040202D */ daddu $a0, $v0, $zero /* D62F40 80240230 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240158_D62E68 /* D62FC8 802402B8 AFA0001C */ sw $zero, 0x1c($sp) .L802402BC: /* D62FCC 802402BC 0C0B77B9 */ jal func_802DDEE4 -/* D62FD0 802402C0 00000000 */ nop +/* D62FD0 802402C0 00000000 */ nop .L802402C4: /* D62FD4 802402C4 9202000E */ lbu $v0, 0xe($s0) /* D62FD8 802402C8 3C01802E */ lui $at, %hi(D_802D9D70) diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240320_D63030.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240320_D63030.s index 6160a8937f..03275d5f06 100644 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240320_D63030.s +++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240320_D63030.s @@ -33,7 +33,7 @@ glabel func_80240320_D63030 /* D630A0 80240390 E7B40010 */ swc1 $f20, 0x10($sp) /* D630A4 80240394 C62C008C */ lwc1 $f12, 0x8c($s1) /* D630A8 80240398 0C00A6C9 */ jal clamp_angle -/* D630AC 8024039C 00000000 */ nop +/* D630AC 8024039C 00000000 */ nop /* D630B0 802403A0 44050000 */ mfc1 $a1, $f0 /* D630B4 802403A4 4406A000 */ mfc1 $a2, $f20 /* D630B8 802403A8 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802404CC_D631DC.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802404CC_D631DC.s index 13a78f3d20..da3d3ee08a 100644 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802404CC_D631DC.s +++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802404CC_D631DC.s @@ -10,7 +10,7 @@ glabel func_802404CC_D631DC /* D631F0 802404E0 0440000E */ bltz $v0, .L8024051C /* D631F4 802404E4 28420002 */ slti $v0, $v0, 2 /* D631F8 802404E8 1040000C */ beqz $v0, .L8024051C -/* D631FC 802404EC 00000000 */ nop +/* D631FC 802404EC 00000000 */ nop /* D63200 802404F0 3C058024 */ lui $a1, %hi(func_80240530_D63240) /* D63204 802404F4 24A50530 */ addiu $a1, $a1, %lo(func_80240530_D63240) /* D63208 802404F8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240530_D63240.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240530_D63240.s index eafbbd564b..d6da0f52de 100644 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240530_D63240.s +++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240530_D63240.s @@ -16,7 +16,7 @@ glabel func_80240530_D63240 /* D6326C 8024055C 27B10020 */ addiu $s1, $sp, 0x20 /* D63270 80240560 8E0400CC */ lw $a0, 0xcc($s0) /* D63274 80240564 0C044181 */ jal get_shadow_by_index -/* D63278 80240568 00000000 */ nop +/* D63278 80240568 00000000 */ nop /* D6327C 8024056C 0C048B77 */ jal func_80122DDC /* D63280 80240570 84440008 */ lh $a0, 8($v0) /* D63284 80240574 8E050028 */ lw $a1, 0x28($s0) @@ -33,7 +33,7 @@ glabel func_80240530_D63240 /* D632B0 802405A0 46000007 */ neg.s $f0, $f0 /* D632B4 802405A4 44060000 */ mfc1 $a2, $f0 /* D632B8 802405A8 0C00B94E */ jal get_screen_coords -/* D632BC 802405AC 00000000 */ nop +/* D632BC 802405AC 00000000 */ nop /* D632C0 802405B0 8E0500A4 */ lw $a1, 0xa4($s0) /* D632C4 802405B4 3C063F80 */ lui $a2, 0x3f80 /* D632C8 802405B8 0C0B76A3 */ jal func_802DDA8C @@ -72,13 +72,13 @@ glabel func_80240530_D63240 /* D63348 80240638 AFA0001C */ sw $zero, 0x1c($sp) .L8024063C: /* D6334C 8024063C 0C0B77B9 */ jal func_802DDEE4 -/* D63350 80240640 00000000 */ nop +/* D63350 80240640 00000000 */ nop .L80240644: /* D63354 80240644 9202000E */ lbu $v0, 0xe($s0) /* D63358 80240648 3C01802E */ lui $at, %hi(D_802D9D71) /* D6335C 8024064C A0229D71 */ sb $v0, %lo(D_802D9D71)($at) /* D63360 80240650 08090198 */ j .L80240660 -/* D63364 80240654 00000000 */ nop +/* D63364 80240654 00000000 */ nop .L80240658: /* D63368 80240658 3C01802E */ lui $at, %hi(D_802D9D71) /* D6336C 8024065C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802406BC_D633CC.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802406BC_D633CC.s index 588015a554..1973c646b7 100644 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802406BC_D633CC.s +++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802406BC_D633CC.s @@ -33,7 +33,7 @@ glabel func_802406BC_D633CC /* D6343C 8024072C E7B40010 */ swc1 $f20, 0x10($sp) /* D63440 80240730 C62C008C */ lwc1 $f12, 0x8c($s1) /* D63444 80240734 0C00A6C9 */ jal clamp_angle -/* D63448 80240738 00000000 */ nop +/* D63448 80240738 00000000 */ nop /* D6344C 8024073C 44050000 */ mfc1 $a1, $f0 /* D63450 80240740 4406A000 */ mfc1 $a2, $f20 /* D63454 80240744 4407A000 */ mfc1 $a3, $f20 @@ -95,16 +95,16 @@ glabel func_802406BC_D633CC /* D63534 80240824 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D63538 80240828 3C0142B4 */ lui $at, 0x42b4 /* D6353C 8024082C 44810000 */ mtc1 $at, $f0 -/* D63540 80240830 00000000 */ nop +/* D63540 80240830 00000000 */ nop /* D63544 80240834 4602003E */ c.le.s $f0, $f2 -/* D63548 80240838 00000000 */ nop +/* D63548 80240838 00000000 */ nop /* D6354C 8024083C 4500000A */ bc1f .L80240868 /* D63550 80240840 24040001 */ addiu $a0, $zero, 1 /* D63554 80240844 3C014387 */ lui $at, 0x4387 /* D63558 80240848 44810000 */ mtc1 $at, $f0 -/* D6355C 8024084C 00000000 */ nop +/* D6355C 8024084C 00000000 */ nop /* D63560 80240850 4600103C */ c.lt.s $f2, $f0 -/* D63564 80240854 00000000 */ nop +/* D63564 80240854 00000000 */ nop /* D63568 80240858 45000004 */ bc1f .L8024086C /* D6356C 8024085C 27A20018 */ addiu $v0, $sp, 0x18 /* D63570 80240860 3C041000 */ lui $a0, 0x1000 diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802408A0_D635B0.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802408A0_D635B0.s index 082d920ec9..577180d3e7 100644 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802408A0_D635B0.s +++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802408A0_D635B0.s @@ -43,36 +43,36 @@ glabel func_802408A0_D635B0 /* D63644 80240934 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D63648 80240938 3C0142B4 */ lui $at, 0x42b4 /* D6364C 8024093C 44810000 */ mtc1 $at, $f0 -/* D63650 80240940 00000000 */ nop +/* D63650 80240940 00000000 */ nop /* D63654 80240944 4602003C */ c.lt.s $f0, $f2 -/* D63658 80240948 00000000 */ nop +/* D63658 80240948 00000000 */ nop /* D6365C 8024094C 4500000A */ bc1f .L80240978 -/* D63660 80240950 00000000 */ nop +/* D63660 80240950 00000000 */ nop /* D63664 80240954 3C014334 */ lui $at, 0x4334 /* D63668 80240958 44812000 */ mtc1 $at, $f4 -/* D6366C 8024095C 00000000 */ nop +/* D6366C 8024095C 00000000 */ nop /* D63670 80240960 4604103E */ c.le.s $f2, $f4 -/* D63674 80240964 00000000 */ nop +/* D63674 80240964 00000000 */ nop /* D63678 80240968 45000003 */ bc1f .L80240978 -/* D6367C 8024096C 00000000 */ nop +/* D6367C 8024096C 00000000 */ nop /* D63680 80240970 08090282 */ j .L80240A08 /* D63684 80240974 46022501 */ sub.s $f20, $f4, $f2 .L80240978: /* D63688 80240978 C62000A8 */ lwc1 $f0, 0xa8($s1) /* D6368C 8024097C 3C014334 */ lui $at, 0x4334 /* D63690 80240980 44812000 */ mtc1 $at, $f4 -/* D63694 80240984 00000000 */ nop +/* D63694 80240984 00000000 */ nop /* D63698 80240988 4600203C */ c.lt.s $f4, $f0 -/* D6369C 8024098C 00000000 */ nop +/* D6369C 8024098C 00000000 */ nop /* D636A0 80240990 4500000C */ bc1f .L802409C4 -/* D636A4 80240994 00000000 */ nop +/* D636A4 80240994 00000000 */ nop /* D636A8 80240998 3C014387 */ lui $at, 0x4387 /* D636AC 8024099C 44812000 */ mtc1 $at, $f4 -/* D636B0 802409A0 00000000 */ nop +/* D636B0 802409A0 00000000 */ nop /* D636B4 802409A4 4604003E */ c.le.s $f0, $f4 -/* D636B8 802409A8 00000000 */ nop +/* D636B8 802409A8 00000000 */ nop /* D636BC 802409AC 45000008 */ bc1f .L802409D0 -/* D636C0 802409B0 00000000 */ nop +/* D636C0 802409B0 00000000 */ nop /* D636C4 802409B4 3C014334 */ lui $at, 0x4334 /* D636C8 802409B8 44812000 */ mtc1 $at, $f4 /* D636CC 802409BC 08090282 */ j .L80240A08 @@ -80,19 +80,19 @@ glabel func_802408A0_D635B0 .L802409C4: /* D636D4 802409C4 3C014387 */ lui $at, 0x4387 /* D636D8 802409C8 44812000 */ mtc1 $at, $f4 -/* D636DC 802409CC 00000000 */ nop +/* D636DC 802409CC 00000000 */ nop .L802409D0: /* D636E0 802409D0 4600203C */ c.lt.s $f4, $f0 -/* D636E4 802409D4 00000000 */ nop +/* D636E4 802409D4 00000000 */ nop /* D636E8 802409D8 4500000A */ bc1f .L80240A04 -/* D636EC 802409DC 00000000 */ nop +/* D636EC 802409DC 00000000 */ nop /* D636F0 802409E0 3C0143B4 */ lui $at, 0x43b4 /* D636F4 802409E4 44811000 */ mtc1 $at, $f2 -/* D636F8 802409E8 00000000 */ nop +/* D636F8 802409E8 00000000 */ nop /* D636FC 802409EC 4602003E */ c.le.s $f0, $f2 -/* D63700 802409F0 00000000 */ nop +/* D63700 802409F0 00000000 */ nop /* D63704 802409F4 45000003 */ bc1f .L80240A04 -/* D63708 802409F8 00000000 */ nop +/* D63708 802409F8 00000000 */ nop /* D6370C 802409FC 08090282 */ j .L80240A08 /* D63710 80240A00 46001501 */ sub.s $f20, $f2, $f0 .L80240A04: @@ -100,11 +100,11 @@ glabel func_802408A0_D635B0 .L80240A08: /* D63718 80240A08 3C0141C8 */ lui $at, 0x41c8 /* D6371C 80240A0C 44810000 */ mtc1 $at, $f0 -/* D63720 80240A10 00000000 */ nop +/* D63720 80240A10 00000000 */ nop /* D63724 80240A14 4600A003 */ div.s $f0, $f20, $f0 /* D63728 80240A18 4600010D */ trunc.w.s $f4, $f0 /* D6372C 80240A1C 44072000 */ mfc1 $a3, $f4 -/* D63730 80240A20 00000000 */ nop +/* D63730 80240A20 00000000 */ nop /* D63734 80240A24 00071100 */ sll $v0, $a3, 4 /* D63738 80240A28 00471023 */ subu $v0, $v0, $a3 /* D6373C 80240A2C 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel func_802408A0_D635B0 /* D63784 80240A74 E7B60010 */ swc1 $f22, 0x10($sp) /* D63788 80240A78 C62C008C */ lwc1 $f12, 0x8c($s1) /* D6378C 80240A7C 0C00A6C9 */ jal clamp_angle -/* D63790 80240A80 00000000 */ nop +/* D63790 80240A80 00000000 */ nop /* D63794 80240A84 44050000 */ mfc1 $a1, $f0 /* D63798 80240A88 4406B000 */ mfc1 $a2, $f22 /* D6379C 80240A8C 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel func_802408A0_D635B0 /* D63800 80240AF0 24040001 */ addiu $a0, $zero, 1 .L80240AF4: /* D63804 80240AF4 4486D000 */ mtc1 $a2, $f26 -/* D63808 80240AF8 00000000 */ nop +/* D63808 80240AF8 00000000 */ nop /* D6380C 80240AFC 4680D6A0 */ cvt.s.w $f26, $f26 /* D63810 80240B00 24040001 */ addiu $a0, $zero, 1 .L80240B04: @@ -204,10 +204,10 @@ glabel func_802408A0_D635B0 /* D638A0 80240B90 44812000 */ mtc1 $at, $f4 /* D638A4 80240B94 00021023 */ negu $v0, $v0 /* D638A8 80240B98 44820000 */ mtc1 $v0, $f0 -/* D638AC 80240B9C 00000000 */ nop +/* D638AC 80240B9C 00000000 */ nop /* D638B0 80240BA0 46800020 */ cvt.s.w $f0, $f0 /* D638B4 80240BA4 46040102 */ mul.s $f4, $f0, $f4 -/* D638B8 80240BA8 00000000 */ nop +/* D638B8 80240BA8 00000000 */ nop /* D638BC 80240BAC 4405B000 */ mfc1 $a1, $f22 /* D638C0 80240BB0 4407B000 */ mfc1 $a3, $f22 /* D638C4 80240BB4 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel func_802408A0_D635B0 /* D63934 80240C24 3C013F00 */ lui $at, 0x3f00 /* D63938 80240C28 44812000 */ mtc1 $at, $f4 /* D6393C 80240C2C 44820000 */ mtc1 $v0, $f0 -/* D63940 80240C30 00000000 */ nop +/* D63940 80240C30 00000000 */ nop /* D63944 80240C34 46800020 */ cvt.s.w $f0, $f0 /* D63948 80240C38 46040102 */ mul.s $f4, $f0, $f4 -/* D6394C 80240C3C 00000000 */ nop +/* D6394C 80240C3C 00000000 */ nop /* D63950 80240C40 4405B000 */ mfc1 $a1, $f22 /* D63954 80240C44 4407B000 */ mfc1 $a3, $f22 /* D63958 80240C48 44062000 */ mfc1 $a2, $f4 @@ -280,16 +280,16 @@ glabel func_802408A0_D635B0 /* D639D0 80240CC0 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D639D4 80240CC4 3C0142B4 */ lui $at, 0x42b4 /* D639D8 80240CC8 44810000 */ mtc1 $at, $f0 -/* D639DC 80240CCC 00000000 */ nop +/* D639DC 80240CCC 00000000 */ nop /* D639E0 80240CD0 4602003E */ c.le.s $f0, $f2 -/* D639E4 80240CD4 00000000 */ nop +/* D639E4 80240CD4 00000000 */ nop /* D639E8 80240CD8 4500000A */ bc1f .L80240D04 /* D639EC 80240CDC 24040001 */ addiu $a0, $zero, 1 /* D639F0 80240CE0 3C014387 */ lui $at, 0x4387 /* D639F4 80240CE4 44812000 */ mtc1 $at, $f4 -/* D639F8 80240CE8 00000000 */ nop +/* D639F8 80240CE8 00000000 */ nop /* D639FC 80240CEC 4604103C */ c.lt.s $f2, $f4 -/* D63A00 80240CF0 00000000 */ nop +/* D63A00 80240CF0 00000000 */ nop /* D63A04 80240CF4 45000004 */ bc1f .L80240D08 /* D63A08 80240CF8 27A20020 */ addiu $v0, $sp, 0x20 /* D63A0C 80240CFC 3C041000 */ lui $a0, 0x1000 @@ -305,7 +305,7 @@ glabel func_802408A0_D635B0 /* D63A2C 80240D1C 26730001 */ addiu $s3, $s3, 1 /* D63A30 80240D20 2A620002 */ slti $v0, $s3, 2 /* D63A34 80240D24 1440FEF6 */ bnez $v0, .L80240900 -/* D63A38 80240D28 00000000 */ nop +/* D63A38 80240D28 00000000 */ nop /* D63A3C 80240D2C 8FBF014C */ lw $ra, 0x14c($sp) /* D63A40 80240D30 8FB60148 */ lw $s6, 0x148($sp) /* D63A44 80240D34 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240D6C_D63A7C.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240D6C_D63A7C.s index dc97693233..c5480f4960 100644 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240D6C_D63A7C.s +++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240D6C_D63A7C.s @@ -11,36 +11,36 @@ glabel func_80240D6C_D63A7C /* D63A94 80240D84 24020001 */ addiu $v0, $zero, 1 /* D63A98 80240D88 8E030084 */ lw $v1, 0x84($s0) /* D63A9C 80240D8C 1062001A */ beq $v1, $v0, .L80240DF8 -/* D63AA0 80240D90 00000000 */ nop +/* D63AA0 80240D90 00000000 */ nop /* D63AA4 80240D94 28620002 */ slti $v0, $v1, 2 /* D63AA8 80240D98 50400005 */ beql $v0, $zero, .L80240DB0 /* D63AAC 80240D9C 24020002 */ addiu $v0, $zero, 2 /* D63AB0 80240DA0 10600007 */ beqz $v1, .L80240DC0 -/* D63AB4 80240DA4 00000000 */ nop +/* D63AB4 80240DA4 00000000 */ nop /* D63AB8 80240DA8 08090384 */ j .L80240E10 -/* D63ABC 80240DAC 00000000 */ nop +/* D63ABC 80240DAC 00000000 */ nop .L80240DB0: /* D63AC0 80240DB0 10620007 */ beq $v1, $v0, .L80240DD0 -/* D63AC4 80240DB4 00000000 */ nop +/* D63AC4 80240DB4 00000000 */ nop /* D63AC8 80240DB8 08090384 */ j .L80240E10 -/* D63ACC 80240DBC 00000000 */ nop +/* D63ACC 80240DBC 00000000 */ nop .L80240DC0: /* D63AD0 80240DC0 3C048024 */ lui $a0, %hi(pra_12_SetPartnerFlagsA0000) /* D63AD4 80240DC4 24840EB4 */ addiu $a0, $a0, %lo(pra_12_SetPartnerFlagsA0000) /* D63AD8 80240DC8 08090380 */ j .L80240E00 -/* D63ADC 80240DCC 00000000 */ nop +/* D63ADC 80240DCC 00000000 */ nop .L80240DD0: /* D63AE0 80240DD0 3C048024 */ lui $a0, %hi(pra_12_SetPartnerFlags20000) /* D63AE4 80240DD4 24840F1C */ addiu $a0, $a0, %lo(pra_12_SetPartnerFlags20000) /* D63AE8 80240DD8 08090380 */ j .L80240E00 -/* D63AEC 80240DDC 00000000 */ nop +/* D63AEC 80240DDC 00000000 */ nop .L80240DE0: /* D63AF0 80240DE0 8E020084 */ lw $v0, 0x84($s0) /* D63AF4 80240DE4 0440000A */ bltz $v0, .L80240E10 -/* D63AF8 80240DE8 00000000 */ nop +/* D63AF8 80240DE8 00000000 */ nop /* D63AFC 80240DEC 28420002 */ slti $v0, $v0, 2 /* D63B00 80240DF0 10400007 */ beqz $v0, .L80240E10 -/* D63B04 80240DF4 00000000 */ nop +/* D63B04 80240DF4 00000000 */ nop .L80240DF8: /* D63B08 80240DF8 3C048024 */ lui $a0, %hi(pra_12_SetPartnerFlags80000) /* D63B0C 80240DFC 24840EE8 */ addiu $a0, $a0, %lo(pra_12_SetPartnerFlags80000) @@ -64,14 +64,14 @@ glabel func_80240D6C_D63A7C /* D63B4C 80240E3C 10400005 */ beqz $v0, .L80240E54 /* D63B50 80240E40 24020002 */ addiu $v0, $zero, 2 /* D63B54 80240E44 10800007 */ beqz $a0, .L80240E64 -/* D63B58 80240E48 00000000 */ nop +/* D63B58 80240E48 00000000 */ nop /* D63B5C 80240E4C 080903A9 */ j .L80240EA4 -/* D63B60 80240E50 00000000 */ nop +/* D63B60 80240E50 00000000 */ nop .L80240E54: /* D63B64 80240E54 10820006 */ beq $a0, $v0, .L80240E70 /* D63B68 80240E58 24020002 */ addiu $v0, $zero, 2 /* D63B6C 80240E5C 080903A9 */ j .L80240EA4 -/* D63B70 80240E60 00000000 */ nop +/* D63B70 80240E60 00000000 */ nop .L80240E64: /* D63B74 80240E64 8CA20000 */ lw $v0, ($a1) /* D63B78 80240E68 080903A6 */ j .L80240E98 diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240F50_D63C60.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240F50_D63C60.s index e106b135a0..0a401a13b3 100644 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240F50_D63C60.s +++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240F50_D63C60.s @@ -26,7 +26,7 @@ glabel func_80240F50_D63C60 /* D63CB0 80240FA0 1440FFFA */ bnez $v0, .L80240F8C /* D63CB4 80240FA4 24A50004 */ addiu $a1, $a1, 4 /* D63CB8 80240FA8 080903FB */ j .L80240FEC -/* D63CBC 80240FAC 00000000 */ nop +/* D63CBC 80240FAC 00000000 */ nop .L80240FB0: /* D63CC0 80240FB0 0000182D */ daddu $v1, $zero, $zero /* D63CC4 80240FB4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240054_D64634.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240054_D64634.s index e382ba846b..9e027d2d3d 100644 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240054_D64634.s +++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240054_D64634.s @@ -40,7 +40,7 @@ glabel func_80240054_D64634 /* D646B0 802400D0 1440FFF7 */ bnez $v0, .L802400B0 /* D646B4 802400D4 24820001 */ addiu $v0, $a0, 1 /* D646B8 802400D8 03E00008 */ jr $ra -/* D646BC 802400DC 00000000 */ nop +/* D646BC 802400DC 00000000 */ nop .L802400E0: /* D646C0 802400E0 3C020100 */ lui $v0, 0x100 .L802400E4: diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s index 459cf03b2e..2fec7903fb 100644 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s +++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s @@ -16,7 +16,7 @@ glabel func_80240128_D64708 /* D64734 80240154 27B20020 */ addiu $s2, $sp, 0x20 /* D64738 80240158 8E0400CC */ lw $a0, 0xcc($s0) /* D6473C 8024015C 0C044181 */ jal get_shadow_by_index -/* D64740 80240160 00000000 */ nop +/* D64740 80240160 00000000 */ nop /* D64744 80240164 0C048B77 */ jal func_80122DDC /* D64748 80240168 84440008 */ lh $a0, 8($v0) /* D6474C 8024016C 8C430000 */ lw $v1, ($v0) @@ -38,22 +38,22 @@ glabel func_80240128_D64708 /* D6478C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D64790 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) /* D64794 802401B4 0C090008 */ jal pra_13_UnkFunc2 -/* D64798 802401B8 00000000 */ nop +/* D64798 802401B8 00000000 */ nop /* D6479C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D647A0 802401C0 3C014307 */ lui $at, 0x4307 /* D647A4 802401C4 44810000 */ mtc1 $at, $f0 -/* D647A8 802401C8 00000000 */ nop +/* D647A8 802401C8 00000000 */ nop /* D647AC 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D647B0 802401D0 00000000 */ nop +/* D647B0 802401D0 00000000 */ nop /* D647B4 802401D4 4500000B */ bc1f .L80240204 /* D647B8 802401D8 24040002 */ addiu $a0, $zero, 2 /* D647BC 802401DC 3C014361 */ lui $at, 0x4361 /* D647C0 802401E0 44810000 */ mtc1 $at, $f0 -/* D647C4 802401E4 00000000 */ nop +/* D647C4 802401E4 00000000 */ nop /* D647C8 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D647CC 802401EC 00000000 */ nop +/* D647CC 802401EC 00000000 */ nop /* D647D0 802401F0 45000004 */ bc1f .L80240204 -/* D647D4 802401F4 00000000 */ nop +/* D647D4 802401F4 00000000 */ nop /* D647D8 802401F8 0C090015 */ jal func_80240054_D64634 /* D647DC 802401FC 0040202D */ daddu $a0, $v0, $zero /* D647E0 80240200 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240128_D64708 /* D64868 80240288 AFA0001C */ sw $zero, 0x1c($sp) .L8024028C: /* D6486C 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D64870 80240290 00000000 */ nop +/* D64870 80240290 00000000 */ nop .L80240294: /* D64874 80240294 9202000E */ lbu $v0, 0xe($s0) /* D64878 80240298 3C01802E */ lui $at, %hi(D_802D9D70) diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802402F0_D648D0.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802402F0_D648D0.s index 1a2c797919..50b29b89a8 100644 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802402F0_D648D0.s +++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802402F0_D648D0.s @@ -33,7 +33,7 @@ glabel func_802402F0_D648D0 /* D64940 80240360 E7B40010 */ swc1 $f20, 0x10($sp) /* D64944 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) /* D64948 80240368 0C00A6C9 */ jal clamp_angle -/* D6494C 8024036C 00000000 */ nop +/* D6494C 8024036C 00000000 */ nop /* D64950 80240370 44050000 */ mfc1 $a1, $f0 /* D64954 80240374 4406A000 */ mfc1 $a2, $f20 /* D64958 80240378 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024049C_D64A7C.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024049C_D64A7C.s index fc0de45940..2e9fae051f 100644 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024049C_D64A7C.s +++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024049C_D64A7C.s @@ -10,7 +10,7 @@ glabel func_8024049C_D64A7C /* D64A90 802404B0 0440000E */ bltz $v0, .L802404EC /* D64A94 802404B4 28420002 */ slti $v0, $v0, 2 /* D64A98 802404B8 1040000C */ beqz $v0, .L802404EC -/* D64A9C 802404BC 00000000 */ nop +/* D64A9C 802404BC 00000000 */ nop /* D64AA0 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D64AE0) /* D64AA4 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D64AE0) /* D64AA8 802404C8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240500_D64AE0.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240500_D64AE0.s index 3fabad0af7..3032b32c2c 100644 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240500_D64AE0.s +++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240500_D64AE0.s @@ -16,7 +16,7 @@ glabel func_80240500_D64AE0 /* D64B0C 8024052C 27B10020 */ addiu $s1, $sp, 0x20 /* D64B10 80240530 8E0400CC */ lw $a0, 0xcc($s0) /* D64B14 80240534 0C044181 */ jal get_shadow_by_index -/* D64B18 80240538 00000000 */ nop +/* D64B18 80240538 00000000 */ nop /* D64B1C 8024053C 0C048B77 */ jal func_80122DDC /* D64B20 80240540 84440008 */ lh $a0, 8($v0) /* D64B24 80240544 8E050028 */ lw $a1, 0x28($s0) @@ -33,7 +33,7 @@ glabel func_80240500_D64AE0 /* D64B50 80240570 46000007 */ neg.s $f0, $f0 /* D64B54 80240574 44060000 */ mfc1 $a2, $f0 /* D64B58 80240578 0C00B94E */ jal get_screen_coords -/* D64B5C 8024057C 00000000 */ nop +/* D64B5C 8024057C 00000000 */ nop /* D64B60 80240580 8E0500A4 */ lw $a1, 0xa4($s0) /* D64B64 80240584 3C063F80 */ lui $a2, 0x3f80 /* D64B68 80240588 0C0B76A3 */ jal func_802DDA8C @@ -72,13 +72,13 @@ glabel func_80240500_D64AE0 /* D64BE8 80240608 AFA0001C */ sw $zero, 0x1c($sp) .L8024060C: /* D64BEC 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D64BF0 80240610 00000000 */ nop +/* D64BF0 80240610 00000000 */ nop .L80240614: /* D64BF4 80240614 9202000E */ lbu $v0, 0xe($s0) /* D64BF8 80240618 3C01802E */ lui $at, %hi(D_802D9D71) /* D64BFC 8024061C A0229D71 */ sb $v0, %lo(D_802D9D71)($at) /* D64C00 80240620 0809018C */ j .L80240630 -/* D64C04 80240624 00000000 */ nop +/* D64C04 80240624 00000000 */ nop .L80240628: /* D64C08 80240628 3C01802E */ lui $at, %hi(D_802D9D71) /* D64C0C 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024068C_D64C6C.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024068C_D64C6C.s index 5b3cce023f..e27ea8903b 100644 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024068C_D64C6C.s +++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024068C_D64C6C.s @@ -33,7 +33,7 @@ glabel func_8024068C_D64C6C /* D64CDC 802406FC E7B40010 */ swc1 $f20, 0x10($sp) /* D64CE0 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) /* D64CE4 80240704 0C00A6C9 */ jal clamp_angle -/* D64CE8 80240708 00000000 */ nop +/* D64CE8 80240708 00000000 */ nop /* D64CEC 8024070C 44050000 */ mfc1 $a1, $f0 /* D64CF0 80240710 4406A000 */ mfc1 $a2, $f20 /* D64CF4 80240714 4407A000 */ mfc1 $a3, $f20 @@ -95,16 +95,16 @@ glabel func_8024068C_D64C6C /* D64DD4 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D64DD8 802407F8 3C0142B4 */ lui $at, 0x42b4 /* D64DDC 802407FC 44810000 */ mtc1 $at, $f0 -/* D64DE0 80240800 00000000 */ nop +/* D64DE0 80240800 00000000 */ nop /* D64DE4 80240804 4602003E */ c.le.s $f0, $f2 -/* D64DE8 80240808 00000000 */ nop +/* D64DE8 80240808 00000000 */ nop /* D64DEC 8024080C 4500000A */ bc1f .L80240838 /* D64DF0 80240810 24040001 */ addiu $a0, $zero, 1 /* D64DF4 80240814 3C014387 */ lui $at, 0x4387 /* D64DF8 80240818 44810000 */ mtc1 $at, $f0 -/* D64DFC 8024081C 00000000 */ nop +/* D64DFC 8024081C 00000000 */ nop /* D64E00 80240820 4600103C */ c.lt.s $f2, $f0 -/* D64E04 80240824 00000000 */ nop +/* D64E04 80240824 00000000 */ nop /* D64E08 80240828 45000004 */ bc1f .L8024083C /* D64E0C 8024082C 27A20018 */ addiu $v0, $sp, 0x18 /* D64E10 80240830 3C041000 */ lui $a0, 0x1000 diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240870_D64E50.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240870_D64E50.s index 3aebe888a6..d7a2beff45 100644 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240870_D64E50.s +++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240870_D64E50.s @@ -43,36 +43,36 @@ glabel func_80240870_D64E50 /* D64EE4 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D64EE8 80240908 3C0142B4 */ lui $at, 0x42b4 /* D64EEC 8024090C 44810000 */ mtc1 $at, $f0 -/* D64EF0 80240910 00000000 */ nop +/* D64EF0 80240910 00000000 */ nop /* D64EF4 80240914 4602003C */ c.lt.s $f0, $f2 -/* D64EF8 80240918 00000000 */ nop +/* D64EF8 80240918 00000000 */ nop /* D64EFC 8024091C 4500000A */ bc1f .L80240948 -/* D64F00 80240920 00000000 */ nop +/* D64F00 80240920 00000000 */ nop /* D64F04 80240924 3C014334 */ lui $at, 0x4334 /* D64F08 80240928 44812000 */ mtc1 $at, $f4 -/* D64F0C 8024092C 00000000 */ nop +/* D64F0C 8024092C 00000000 */ nop /* D64F10 80240930 4604103E */ c.le.s $f2, $f4 -/* D64F14 80240934 00000000 */ nop +/* D64F14 80240934 00000000 */ nop /* D64F18 80240938 45000003 */ bc1f .L80240948 -/* D64F1C 8024093C 00000000 */ nop +/* D64F1C 8024093C 00000000 */ nop /* D64F20 80240940 08090276 */ j .L802409D8 /* D64F24 80240944 46022501 */ sub.s $f20, $f4, $f2 .L80240948: /* D64F28 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) /* D64F2C 8024094C 3C014334 */ lui $at, 0x4334 /* D64F30 80240950 44812000 */ mtc1 $at, $f4 -/* D64F34 80240954 00000000 */ nop +/* D64F34 80240954 00000000 */ nop /* D64F38 80240958 4600203C */ c.lt.s $f4, $f0 -/* D64F3C 8024095C 00000000 */ nop +/* D64F3C 8024095C 00000000 */ nop /* D64F40 80240960 4500000C */ bc1f .L80240994 -/* D64F44 80240964 00000000 */ nop +/* D64F44 80240964 00000000 */ nop /* D64F48 80240968 3C014387 */ lui $at, 0x4387 /* D64F4C 8024096C 44812000 */ mtc1 $at, $f4 -/* D64F50 80240970 00000000 */ nop +/* D64F50 80240970 00000000 */ nop /* D64F54 80240974 4604003E */ c.le.s $f0, $f4 -/* D64F58 80240978 00000000 */ nop +/* D64F58 80240978 00000000 */ nop /* D64F5C 8024097C 45000008 */ bc1f .L802409A0 -/* D64F60 80240980 00000000 */ nop +/* D64F60 80240980 00000000 */ nop /* D64F64 80240984 3C014334 */ lui $at, 0x4334 /* D64F68 80240988 44812000 */ mtc1 $at, $f4 /* D64F6C 8024098C 08090276 */ j .L802409D8 @@ -80,19 +80,19 @@ glabel func_80240870_D64E50 .L80240994: /* D64F74 80240994 3C014387 */ lui $at, 0x4387 /* D64F78 80240998 44812000 */ mtc1 $at, $f4 -/* D64F7C 8024099C 00000000 */ nop +/* D64F7C 8024099C 00000000 */ nop .L802409A0: /* D64F80 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D64F84 802409A4 00000000 */ nop +/* D64F84 802409A4 00000000 */ nop /* D64F88 802409A8 4500000A */ bc1f .L802409D4 -/* D64F8C 802409AC 00000000 */ nop +/* D64F8C 802409AC 00000000 */ nop /* D64F90 802409B0 3C0143B4 */ lui $at, 0x43b4 /* D64F94 802409B4 44811000 */ mtc1 $at, $f2 -/* D64F98 802409B8 00000000 */ nop +/* D64F98 802409B8 00000000 */ nop /* D64F9C 802409BC 4602003E */ c.le.s $f0, $f2 -/* D64FA0 802409C0 00000000 */ nop +/* D64FA0 802409C0 00000000 */ nop /* D64FA4 802409C4 45000003 */ bc1f .L802409D4 -/* D64FA8 802409C8 00000000 */ nop +/* D64FA8 802409C8 00000000 */ nop /* D64FAC 802409CC 08090276 */ j .L802409D8 /* D64FB0 802409D0 46001501 */ sub.s $f20, $f2, $f0 .L802409D4: @@ -100,11 +100,11 @@ glabel func_80240870_D64E50 .L802409D8: /* D64FB8 802409D8 3C0141C8 */ lui $at, 0x41c8 /* D64FBC 802409DC 44810000 */ mtc1 $at, $f0 -/* D64FC0 802409E0 00000000 */ nop +/* D64FC0 802409E0 00000000 */ nop /* D64FC4 802409E4 4600A003 */ div.s $f0, $f20, $f0 /* D64FC8 802409E8 4600010D */ trunc.w.s $f4, $f0 /* D64FCC 802409EC 44072000 */ mfc1 $a3, $f4 -/* D64FD0 802409F0 00000000 */ nop +/* D64FD0 802409F0 00000000 */ nop /* D64FD4 802409F4 00071100 */ sll $v0, $a3, 4 /* D64FD8 802409F8 00471023 */ subu $v0, $v0, $a3 /* D64FDC 802409FC 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel func_80240870_D64E50 /* D65024 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) /* D65028 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) /* D6502C 80240A4C 0C00A6C9 */ jal clamp_angle -/* D65030 80240A50 00000000 */ nop +/* D65030 80240A50 00000000 */ nop /* D65034 80240A54 44050000 */ mfc1 $a1, $f0 /* D65038 80240A58 4406B000 */ mfc1 $a2, $f22 /* D6503C 80240A5C 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel func_80240870_D64E50 /* D650A0 80240AC0 24040001 */ addiu $a0, $zero, 1 .L80240AC4: /* D650A4 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D650A8 80240AC8 00000000 */ nop +/* D650A8 80240AC8 00000000 */ nop /* D650AC 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 /* D650B0 80240AD0 24040001 */ addiu $a0, $zero, 1 .L80240AD4: @@ -204,10 +204,10 @@ glabel func_80240870_D64E50 /* D65140 80240B60 44812000 */ mtc1 $at, $f4 /* D65144 80240B64 00021023 */ negu $v0, $v0 /* D65148 80240B68 44820000 */ mtc1 $v0, $f0 -/* D6514C 80240B6C 00000000 */ nop +/* D6514C 80240B6C 00000000 */ nop /* D65150 80240B70 46800020 */ cvt.s.w $f0, $f0 /* D65154 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D65158 80240B78 00000000 */ nop +/* D65158 80240B78 00000000 */ nop /* D6515C 80240B7C 4405B000 */ mfc1 $a1, $f22 /* D65160 80240B80 4407B000 */ mfc1 $a3, $f22 /* D65164 80240B84 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel func_80240870_D64E50 /* D651D4 80240BF4 3C013F00 */ lui $at, 0x3f00 /* D651D8 80240BF8 44812000 */ mtc1 $at, $f4 /* D651DC 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D651E0 80240C00 00000000 */ nop +/* D651E0 80240C00 00000000 */ nop /* D651E4 80240C04 46800020 */ cvt.s.w $f0, $f0 /* D651E8 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D651EC 80240C0C 00000000 */ nop +/* D651EC 80240C0C 00000000 */ nop /* D651F0 80240C10 4405B000 */ mfc1 $a1, $f22 /* D651F4 80240C14 4407B000 */ mfc1 $a3, $f22 /* D651F8 80240C18 44062000 */ mfc1 $a2, $f4 @@ -280,16 +280,16 @@ glabel func_80240870_D64E50 /* D65270 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D65274 80240C94 3C0142B4 */ lui $at, 0x42b4 /* D65278 80240C98 44810000 */ mtc1 $at, $f0 -/* D6527C 80240C9C 00000000 */ nop +/* D6527C 80240C9C 00000000 */ nop /* D65280 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D65284 80240CA4 00000000 */ nop +/* D65284 80240CA4 00000000 */ nop /* D65288 80240CA8 4500000A */ bc1f .L80240CD4 /* D6528C 80240CAC 24040001 */ addiu $a0, $zero, 1 /* D65290 80240CB0 3C014387 */ lui $at, 0x4387 /* D65294 80240CB4 44812000 */ mtc1 $at, $f4 -/* D65298 80240CB8 00000000 */ nop +/* D65298 80240CB8 00000000 */ nop /* D6529C 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D652A0 80240CC0 00000000 */ nop +/* D652A0 80240CC0 00000000 */ nop /* D652A4 80240CC4 45000004 */ bc1f .L80240CD8 /* D652A8 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 /* D652AC 80240CCC 3C041000 */ lui $a0, 0x1000 @@ -305,7 +305,7 @@ glabel func_80240870_D64E50 /* D652CC 80240CEC 26730001 */ addiu $s3, $s3, 1 /* D652D0 80240CF0 2A620002 */ slti $v0, $s3, 2 /* D652D4 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D652D8 80240CF8 00000000 */ nop +/* D652D8 80240CF8 00000000 */ nop /* D652DC 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) /* D652E0 80240D00 8FB60148 */ lw $s6, 0x148($sp) /* D652E4 80240D04 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240D3C_D6531C.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240D3C_D6531C.s index 4839f5ef3e..aec88b12e6 100644 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240D3C_D6531C.s +++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240D3C_D6531C.s @@ -11,36 +11,36 @@ glabel func_80240D3C_D6531C /* D65334 80240D54 24020001 */ addiu $v0, $zero, 1 /* D65338 80240D58 8E030084 */ lw $v1, 0x84($s0) /* D6533C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D65340 80240D60 00000000 */ nop +/* D65340 80240D60 00000000 */ nop /* D65344 80240D64 28620002 */ slti $v0, $v1, 2 /* D65348 80240D68 50400005 */ beql $v0, $zero, .L80240D80 /* D6534C 80240D6C 24020002 */ addiu $v0, $zero, 2 /* D65350 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D65354 80240D74 00000000 */ nop +/* D65354 80240D74 00000000 */ nop /* D65358 80240D78 08090378 */ j .L80240DE0 -/* D6535C 80240D7C 00000000 */ nop +/* D6535C 80240D7C 00000000 */ nop .L80240D80: /* D65360 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D65364 80240D84 00000000 */ nop +/* D65364 80240D84 00000000 */ nop /* D65368 80240D88 08090378 */ j .L80240DE0 -/* D6536C 80240D8C 00000000 */ nop +/* D6536C 80240D8C 00000000 */ nop .L80240D90: /* D65370 80240D90 3C048024 */ lui $a0, %hi(pra_13_SetPartnerFlagsA0000) /* D65374 80240D94 24840E84 */ addiu $a0, $a0, %lo(pra_13_SetPartnerFlagsA0000) /* D65378 80240D98 08090374 */ j .L80240DD0 -/* D6537C 80240D9C 00000000 */ nop +/* D6537C 80240D9C 00000000 */ nop .L80240DA0: /* D65380 80240DA0 3C048024 */ lui $a0, %hi(pra_13_SetPartnerFlags20000) /* D65384 80240DA4 24840EEC */ addiu $a0, $a0, %lo(pra_13_SetPartnerFlags20000) /* D65388 80240DA8 08090374 */ j .L80240DD0 -/* D6538C 80240DAC 00000000 */ nop +/* D6538C 80240DAC 00000000 */ nop .L80240DB0: /* D65390 80240DB0 8E020084 */ lw $v0, 0x84($s0) /* D65394 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D65398 80240DB8 00000000 */ nop +/* D65398 80240DB8 00000000 */ nop /* D6539C 80240DBC 28420002 */ slti $v0, $v0, 2 /* D653A0 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D653A4 80240DC4 00000000 */ nop +/* D653A4 80240DC4 00000000 */ nop .L80240DC8: /* D653A8 80240DC8 3C048024 */ lui $a0, %hi(pra_13_SetPartnerFlags80000) /* D653AC 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(pra_13_SetPartnerFlags80000) @@ -64,14 +64,14 @@ glabel func_80240D3C_D6531C /* D653EC 80240E0C 10400005 */ beqz $v0, .L80240E24 /* D653F0 80240E10 24020002 */ addiu $v0, $zero, 2 /* D653F4 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D653F8 80240E18 00000000 */ nop +/* D653F8 80240E18 00000000 */ nop /* D653FC 80240E1C 0809039D */ j .L80240E74 -/* D65400 80240E20 00000000 */ nop +/* D65400 80240E20 00000000 */ nop .L80240E24: /* D65404 80240E24 10820006 */ beq $a0, $v0, .L80240E40 /* D65408 80240E28 24020002 */ addiu $v0, $zero, 2 /* D6540C 80240E2C 0809039D */ j .L80240E74 -/* D65410 80240E30 00000000 */ nop +/* D65410 80240E30 00000000 */ nop .L80240E34: /* D65414 80240E34 8CA20000 */ lw $v0, ($a1) /* D65418 80240E38 0809039A */ j .L80240E68 diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802411D8_D657B8.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802411D8_D657B8.s index 76588a93e1..777d2adbdc 100644 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802411D8_D657B8.s +++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802411D8_D657B8.s @@ -28,7 +28,7 @@ glabel func_802411D8_D657B8 /* D6580C 8024122C 00220821 */ addu $at, $at, $v0 /* D65810 80241230 AC203720 */ sw $zero, %lo(D_80243720)($at) /* D65814 80241234 08090499 */ j .L80241264 -/* D65818 80241238 00000000 */ nop +/* D65818 80241238 00000000 */ nop .L8024123C: /* D6581C 8024123C 3C038024 */ lui $v1, %hi(D_80243720) /* D65820 80241240 24633720 */ addiu $v1, $v1, %lo(D_80243720) diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241274_D65854.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241274_D65854.s index 90c5fa68ff..f5d1e0dc30 100644 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241274_D65854.s +++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241274_D65854.s @@ -28,7 +28,7 @@ glabel func_80241274_D65854 /* D658A8 802412C8 00220821 */ addu $at, $at, $v0 /* D658AC 802412CC AC2038E8 */ sw $zero, %lo(D_802438E8)($at) /* D658B0 802412D0 080904C0 */ j .L80241300 -/* D658B4 802412D4 00000000 */ nop +/* D658B4 802412D4 00000000 */ nop .L802412D8: /* D658B8 802412D8 3C038024 */ lui $v1, %hi(D_802438E8) /* D658BC 802412DC 246338E8 */ addiu $v1, $v1, %lo(D_802438E8) diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241310_D658F0.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241310_D658F0.s index 559b25ce3f..bb985fa8f0 100644 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241310_D658F0.s +++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241310_D658F0.s @@ -22,14 +22,14 @@ glabel func_80241310_D658F0 /* D65934 80241354 0C0B1EAF */ jal get_variable /* D65938 80241358 0040802D */ daddu $s0, $v0, $zero /* D6593C 8024135C 44926000 */ mtc1 $s2, $f12 -/* D65940 80241360 00000000 */ nop +/* D65940 80241360 00000000 */ nop /* D65944 80241364 46806320 */ cvt.s.w $f12, $f12 /* D65948 80241368 44820000 */ mtc1 $v0, $f0 -/* D6594C 8024136C 00000000 */ nop +/* D6594C 8024136C 00000000 */ nop /* D65950 80241370 46800020 */ cvt.s.w $f0, $f0 /* D65954 80241374 44060000 */ mfc1 $a2, $f0 /* D65958 80241378 44907000 */ mtc1 $s0, $f14 -/* D6595C 8024137C 00000000 */ nop +/* D6595C 8024137C 00000000 */ nop /* D65960 80241380 0C01BE3C */ jal func_8006F8F0 /* D65964 80241384 468073A0 */ cvt.s.w $f14, $f14 /* D65968 80241388 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024140C_D659EC.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024140C_D659EC.s index a93170c2d0..c32c5834cd 100644 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024140C_D659EC.s +++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024140C_D659EC.s @@ -29,7 +29,7 @@ glabel func_8024140C_D659EC /* D65A4C 8024146C 46000007 */ neg.s $f0, $f0 /* D65A50 80241470 44070000 */ mfc1 $a3, $f0 /* D65A54 80241474 0C00B94E */ jal get_screen_coords -/* D65A58 80241478 00000000 */ nop +/* D65A58 80241478 00000000 */ nop /* D65A5C 8024147C 0220202D */ daddu $a0, $s1, $zero /* D65A60 80241480 820500AA */ lb $a1, 0xaa($s0) /* D65A64 80241484 8FA30038 */ lw $v1, 0x38($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802414BC_D65A9C.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802414BC_D65A9C.s index 12b4de1f53..03d860226f 100644 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802414BC_D65A9C.s +++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802414BC_D65A9C.s @@ -72,6 +72,6 @@ glabel func_802414BC_D65A9C /* D65BA8 802415C8 D7B40128 */ ldc1 $f20, 0x128($sp) /* D65BAC 802415CC 03E00008 */ jr $ra /* D65BB0 802415D0 27BD0130 */ addiu $sp, $sp, 0x130 -/* D65BB4 802415D4 00000000 */ nop -/* D65BB8 802415D8 00000000 */ nop -/* D65BBC 802415DC 00000000 */ nop +/* D65BB4 802415D4 00000000 */ nop +/* D65BB8 802415D8 00000000 */ nop +/* D65BBC 802415DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240054_D67D54.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240054_D67D54.s index dd64475a90..7ad9c50f62 100644 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240054_D67D54.s +++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240054_D67D54.s @@ -40,7 +40,7 @@ glabel func_80240054_D67D54 /* D67DD0 802400D0 1440FFF7 */ bnez $v0, .L802400B0 /* D67DD4 802400D4 24820001 */ addiu $v0, $a0, 1 /* D67DD8 802400D8 03E00008 */ jr $ra -/* D67DDC 802400DC 00000000 */ nop +/* D67DDC 802400DC 00000000 */ nop .L802400E0: /* D67DE0 802400E0 3C020100 */ lui $v0, 0x100 .L802400E4: diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s index 08ba0e9833..ec770bf877 100644 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s +++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s @@ -16,7 +16,7 @@ glabel func_80240128_D67E28 /* D67E54 80240154 27B20020 */ addiu $s2, $sp, 0x20 /* D67E58 80240158 8E0400CC */ lw $a0, 0xcc($s0) /* D67E5C 8024015C 0C044181 */ jal get_shadow_by_index -/* D67E60 80240160 00000000 */ nop +/* D67E60 80240160 00000000 */ nop /* D67E64 80240164 0C048B77 */ jal func_80122DDC /* D67E68 80240168 84440008 */ lh $a0, 8($v0) /* D67E6C 8024016C 8C430000 */ lw $v1, ($v0) @@ -38,22 +38,22 @@ glabel func_80240128_D67E28 /* D67EAC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D67EB0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) /* D67EB4 802401B4 0C090008 */ jal pra_14_UnkFunc2 -/* D67EB8 802401B8 00000000 */ nop +/* D67EB8 802401B8 00000000 */ nop /* D67EBC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D67EC0 802401C0 3C014307 */ lui $at, 0x4307 /* D67EC4 802401C4 44810000 */ mtc1 $at, $f0 -/* D67EC8 802401C8 00000000 */ nop +/* D67EC8 802401C8 00000000 */ nop /* D67ECC 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D67ED0 802401D0 00000000 */ nop +/* D67ED0 802401D0 00000000 */ nop /* D67ED4 802401D4 4500000B */ bc1f .L80240204 /* D67ED8 802401D8 24040002 */ addiu $a0, $zero, 2 /* D67EDC 802401DC 3C014361 */ lui $at, 0x4361 /* D67EE0 802401E0 44810000 */ mtc1 $at, $f0 -/* D67EE4 802401E4 00000000 */ nop +/* D67EE4 802401E4 00000000 */ nop /* D67EE8 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D67EEC 802401EC 00000000 */ nop +/* D67EEC 802401EC 00000000 */ nop /* D67EF0 802401F0 45000004 */ bc1f .L80240204 -/* D67EF4 802401F4 00000000 */ nop +/* D67EF4 802401F4 00000000 */ nop /* D67EF8 802401F8 0C090015 */ jal func_80240054_D67D54 /* D67EFC 802401FC 0040202D */ daddu $a0, $v0, $zero /* D67F00 80240200 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240128_D67E28 /* D67F88 80240288 AFA0001C */ sw $zero, 0x1c($sp) .L8024028C: /* D67F8C 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D67F90 80240290 00000000 */ nop +/* D67F90 80240290 00000000 */ nop .L80240294: /* D67F94 80240294 9202000E */ lbu $v0, 0xe($s0) /* D67F98 80240298 3C01802E */ lui $at, %hi(D_802D9D70) diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_802402F0_D67FF0.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_802402F0_D67FF0.s index 56311a56f5..705eacf6fa 100644 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_802402F0_D67FF0.s +++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_802402F0_D67FF0.s @@ -33,7 +33,7 @@ glabel func_802402F0_D67FF0 /* D68060 80240360 E7B40010 */ swc1 $f20, 0x10($sp) /* D68064 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) /* D68068 80240368 0C00A6C9 */ jal clamp_angle -/* D6806C 8024036C 00000000 */ nop +/* D6806C 8024036C 00000000 */ nop /* D68070 80240370 44050000 */ mfc1 $a1, $f0 /* D68074 80240374 4406A000 */ mfc1 $a2, $f20 /* D68078 80240378 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_8024049C_D6819C.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_8024049C_D6819C.s index ddbce43e5a..d445518003 100644 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_8024049C_D6819C.s +++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_8024049C_D6819C.s @@ -10,7 +10,7 @@ glabel func_8024049C_D6819C /* D681B0 802404B0 0440000E */ bltz $v0, .L802404EC /* D681B4 802404B4 28420002 */ slti $v0, $v0, 2 /* D681B8 802404B8 1040000C */ beqz $v0, .L802404EC -/* D681BC 802404BC 00000000 */ nop +/* D681BC 802404BC 00000000 */ nop /* D681C0 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D68200) /* D681C4 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D68200) /* D681C8 802404C8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240500_D68200.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240500_D68200.s index 49c208a8bb..0d55d7fe72 100644 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240500_D68200.s +++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240500_D68200.s @@ -16,7 +16,7 @@ glabel func_80240500_D68200 /* D6822C 8024052C 27B10020 */ addiu $s1, $sp, 0x20 /* D68230 80240530 8E0400CC */ lw $a0, 0xcc($s0) /* D68234 80240534 0C044181 */ jal get_shadow_by_index -/* D68238 80240538 00000000 */ nop +/* D68238 80240538 00000000 */ nop /* D6823C 8024053C 0C048B77 */ jal func_80122DDC /* D68240 80240540 84440008 */ lh $a0, 8($v0) /* D68244 80240544 8E050028 */ lw $a1, 0x28($s0) @@ -33,7 +33,7 @@ glabel func_80240500_D68200 /* D68270 80240570 46000007 */ neg.s $f0, $f0 /* D68274 80240574 44060000 */ mfc1 $a2, $f0 /* D68278 80240578 0C00B94E */ jal get_screen_coords -/* D6827C 8024057C 00000000 */ nop +/* D6827C 8024057C 00000000 */ nop /* D68280 80240580 8E0500A4 */ lw $a1, 0xa4($s0) /* D68284 80240584 3C063F80 */ lui $a2, 0x3f80 /* D68288 80240588 0C0B76A3 */ jal func_802DDA8C @@ -72,13 +72,13 @@ glabel func_80240500_D68200 /* D68308 80240608 AFA0001C */ sw $zero, 0x1c($sp) .L8024060C: /* D6830C 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D68310 80240610 00000000 */ nop +/* D68310 80240610 00000000 */ nop .L80240614: /* D68314 80240614 9202000E */ lbu $v0, 0xe($s0) /* D68318 80240618 3C01802E */ lui $at, %hi(D_802D9D71) /* D6831C 8024061C A0229D71 */ sb $v0, %lo(D_802D9D71)($at) /* D68320 80240620 0809018C */ j .L80240630 -/* D68324 80240624 00000000 */ nop +/* D68324 80240624 00000000 */ nop .L80240628: /* D68328 80240628 3C01802E */ lui $at, %hi(D_802D9D71) /* D6832C 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_8024068C_D6838C.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_8024068C_D6838C.s index d643bc6b42..6193111c0b 100644 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_8024068C_D6838C.s +++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_8024068C_D6838C.s @@ -33,7 +33,7 @@ glabel func_8024068C_D6838C /* D683FC 802406FC E7B40010 */ swc1 $f20, 0x10($sp) /* D68400 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) /* D68404 80240704 0C00A6C9 */ jal clamp_angle -/* D68408 80240708 00000000 */ nop +/* D68408 80240708 00000000 */ nop /* D6840C 8024070C 44050000 */ mfc1 $a1, $f0 /* D68410 80240710 4406A000 */ mfc1 $a2, $f20 /* D68414 80240714 4407A000 */ mfc1 $a3, $f20 @@ -95,16 +95,16 @@ glabel func_8024068C_D6838C /* D684F4 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D684F8 802407F8 3C0142B4 */ lui $at, 0x42b4 /* D684FC 802407FC 44810000 */ mtc1 $at, $f0 -/* D68500 80240800 00000000 */ nop +/* D68500 80240800 00000000 */ nop /* D68504 80240804 4602003E */ c.le.s $f0, $f2 -/* D68508 80240808 00000000 */ nop +/* D68508 80240808 00000000 */ nop /* D6850C 8024080C 4500000A */ bc1f .L80240838 /* D68510 80240810 24040001 */ addiu $a0, $zero, 1 /* D68514 80240814 3C014387 */ lui $at, 0x4387 /* D68518 80240818 44810000 */ mtc1 $at, $f0 -/* D6851C 8024081C 00000000 */ nop +/* D6851C 8024081C 00000000 */ nop /* D68520 80240820 4600103C */ c.lt.s $f2, $f0 -/* D68524 80240824 00000000 */ nop +/* D68524 80240824 00000000 */ nop /* D68528 80240828 45000004 */ bc1f .L8024083C /* D6852C 8024082C 27A20018 */ addiu $v0, $sp, 0x18 /* D68530 80240830 3C041000 */ lui $a0, 0x1000 diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240870_D68570.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240870_D68570.s index 542d479908..c12f595f48 100644 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240870_D68570.s +++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240870_D68570.s @@ -43,36 +43,36 @@ glabel func_80240870_D68570 /* D68604 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D68608 80240908 3C0142B4 */ lui $at, 0x42b4 /* D6860C 8024090C 44810000 */ mtc1 $at, $f0 -/* D68610 80240910 00000000 */ nop +/* D68610 80240910 00000000 */ nop /* D68614 80240914 4602003C */ c.lt.s $f0, $f2 -/* D68618 80240918 00000000 */ nop +/* D68618 80240918 00000000 */ nop /* D6861C 8024091C 4500000A */ bc1f .L80240948 -/* D68620 80240920 00000000 */ nop +/* D68620 80240920 00000000 */ nop /* D68624 80240924 3C014334 */ lui $at, 0x4334 /* D68628 80240928 44812000 */ mtc1 $at, $f4 -/* D6862C 8024092C 00000000 */ nop +/* D6862C 8024092C 00000000 */ nop /* D68630 80240930 4604103E */ c.le.s $f2, $f4 -/* D68634 80240934 00000000 */ nop +/* D68634 80240934 00000000 */ nop /* D68638 80240938 45000003 */ bc1f .L80240948 -/* D6863C 8024093C 00000000 */ nop +/* D6863C 8024093C 00000000 */ nop /* D68640 80240940 08090276 */ j .L802409D8 /* D68644 80240944 46022501 */ sub.s $f20, $f4, $f2 .L80240948: /* D68648 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) /* D6864C 8024094C 3C014334 */ lui $at, 0x4334 /* D68650 80240950 44812000 */ mtc1 $at, $f4 -/* D68654 80240954 00000000 */ nop +/* D68654 80240954 00000000 */ nop /* D68658 80240958 4600203C */ c.lt.s $f4, $f0 -/* D6865C 8024095C 00000000 */ nop +/* D6865C 8024095C 00000000 */ nop /* D68660 80240960 4500000C */ bc1f .L80240994 -/* D68664 80240964 00000000 */ nop +/* D68664 80240964 00000000 */ nop /* D68668 80240968 3C014387 */ lui $at, 0x4387 /* D6866C 8024096C 44812000 */ mtc1 $at, $f4 -/* D68670 80240970 00000000 */ nop +/* D68670 80240970 00000000 */ nop /* D68674 80240974 4604003E */ c.le.s $f0, $f4 -/* D68678 80240978 00000000 */ nop +/* D68678 80240978 00000000 */ nop /* D6867C 8024097C 45000008 */ bc1f .L802409A0 -/* D68680 80240980 00000000 */ nop +/* D68680 80240980 00000000 */ nop /* D68684 80240984 3C014334 */ lui $at, 0x4334 /* D68688 80240988 44812000 */ mtc1 $at, $f4 /* D6868C 8024098C 08090276 */ j .L802409D8 @@ -80,19 +80,19 @@ glabel func_80240870_D68570 .L80240994: /* D68694 80240994 3C014387 */ lui $at, 0x4387 /* D68698 80240998 44812000 */ mtc1 $at, $f4 -/* D6869C 8024099C 00000000 */ nop +/* D6869C 8024099C 00000000 */ nop .L802409A0: /* D686A0 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D686A4 802409A4 00000000 */ nop +/* D686A4 802409A4 00000000 */ nop /* D686A8 802409A8 4500000A */ bc1f .L802409D4 -/* D686AC 802409AC 00000000 */ nop +/* D686AC 802409AC 00000000 */ nop /* D686B0 802409B0 3C0143B4 */ lui $at, 0x43b4 /* D686B4 802409B4 44811000 */ mtc1 $at, $f2 -/* D686B8 802409B8 00000000 */ nop +/* D686B8 802409B8 00000000 */ nop /* D686BC 802409BC 4602003E */ c.le.s $f0, $f2 -/* D686C0 802409C0 00000000 */ nop +/* D686C0 802409C0 00000000 */ nop /* D686C4 802409C4 45000003 */ bc1f .L802409D4 -/* D686C8 802409C8 00000000 */ nop +/* D686C8 802409C8 00000000 */ nop /* D686CC 802409CC 08090276 */ j .L802409D8 /* D686D0 802409D0 46001501 */ sub.s $f20, $f2, $f0 .L802409D4: @@ -100,11 +100,11 @@ glabel func_80240870_D68570 .L802409D8: /* D686D8 802409D8 3C0141C8 */ lui $at, 0x41c8 /* D686DC 802409DC 44810000 */ mtc1 $at, $f0 -/* D686E0 802409E0 00000000 */ nop +/* D686E0 802409E0 00000000 */ nop /* D686E4 802409E4 4600A003 */ div.s $f0, $f20, $f0 /* D686E8 802409E8 4600010D */ trunc.w.s $f4, $f0 /* D686EC 802409EC 44072000 */ mfc1 $a3, $f4 -/* D686F0 802409F0 00000000 */ nop +/* D686F0 802409F0 00000000 */ nop /* D686F4 802409F4 00071100 */ sll $v0, $a3, 4 /* D686F8 802409F8 00471023 */ subu $v0, $v0, $a3 /* D686FC 802409FC 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel func_80240870_D68570 /* D68744 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) /* D68748 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) /* D6874C 80240A4C 0C00A6C9 */ jal clamp_angle -/* D68750 80240A50 00000000 */ nop +/* D68750 80240A50 00000000 */ nop /* D68754 80240A54 44050000 */ mfc1 $a1, $f0 /* D68758 80240A58 4406B000 */ mfc1 $a2, $f22 /* D6875C 80240A5C 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel func_80240870_D68570 /* D687C0 80240AC0 24040001 */ addiu $a0, $zero, 1 .L80240AC4: /* D687C4 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D687C8 80240AC8 00000000 */ nop +/* D687C8 80240AC8 00000000 */ nop /* D687CC 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 /* D687D0 80240AD0 24040001 */ addiu $a0, $zero, 1 .L80240AD4: @@ -204,10 +204,10 @@ glabel func_80240870_D68570 /* D68860 80240B60 44812000 */ mtc1 $at, $f4 /* D68864 80240B64 00021023 */ negu $v0, $v0 /* D68868 80240B68 44820000 */ mtc1 $v0, $f0 -/* D6886C 80240B6C 00000000 */ nop +/* D6886C 80240B6C 00000000 */ nop /* D68870 80240B70 46800020 */ cvt.s.w $f0, $f0 /* D68874 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D68878 80240B78 00000000 */ nop +/* D68878 80240B78 00000000 */ nop /* D6887C 80240B7C 4405B000 */ mfc1 $a1, $f22 /* D68880 80240B80 4407B000 */ mfc1 $a3, $f22 /* D68884 80240B84 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel func_80240870_D68570 /* D688F4 80240BF4 3C013F00 */ lui $at, 0x3f00 /* D688F8 80240BF8 44812000 */ mtc1 $at, $f4 /* D688FC 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D68900 80240C00 00000000 */ nop +/* D68900 80240C00 00000000 */ nop /* D68904 80240C04 46800020 */ cvt.s.w $f0, $f0 /* D68908 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D6890C 80240C0C 00000000 */ nop +/* D6890C 80240C0C 00000000 */ nop /* D68910 80240C10 4405B000 */ mfc1 $a1, $f22 /* D68914 80240C14 4407B000 */ mfc1 $a3, $f22 /* D68918 80240C18 44062000 */ mfc1 $a2, $f4 @@ -280,16 +280,16 @@ glabel func_80240870_D68570 /* D68990 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D68994 80240C94 3C0142B4 */ lui $at, 0x42b4 /* D68998 80240C98 44810000 */ mtc1 $at, $f0 -/* D6899C 80240C9C 00000000 */ nop +/* D6899C 80240C9C 00000000 */ nop /* D689A0 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D689A4 80240CA4 00000000 */ nop +/* D689A4 80240CA4 00000000 */ nop /* D689A8 80240CA8 4500000A */ bc1f .L80240CD4 /* D689AC 80240CAC 24040001 */ addiu $a0, $zero, 1 /* D689B0 80240CB0 3C014387 */ lui $at, 0x4387 /* D689B4 80240CB4 44812000 */ mtc1 $at, $f4 -/* D689B8 80240CB8 00000000 */ nop +/* D689B8 80240CB8 00000000 */ nop /* D689BC 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D689C0 80240CC0 00000000 */ nop +/* D689C0 80240CC0 00000000 */ nop /* D689C4 80240CC4 45000004 */ bc1f .L80240CD8 /* D689C8 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 /* D689CC 80240CCC 3C041000 */ lui $a0, 0x1000 @@ -305,7 +305,7 @@ glabel func_80240870_D68570 /* D689EC 80240CEC 26730001 */ addiu $s3, $s3, 1 /* D689F0 80240CF0 2A620002 */ slti $v0, $s3, 2 /* D689F4 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D689F8 80240CF8 00000000 */ nop +/* D689F8 80240CF8 00000000 */ nop /* D689FC 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) /* D68A00 80240D00 8FB60148 */ lw $s6, 0x148($sp) /* D68A04 80240D04 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240D3C_D68A3C.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240D3C_D68A3C.s index 367a0e4a24..207db53476 100644 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240D3C_D68A3C.s +++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240D3C_D68A3C.s @@ -11,36 +11,36 @@ glabel func_80240D3C_D68A3C /* D68A54 80240D54 24020001 */ addiu $v0, $zero, 1 /* D68A58 80240D58 8E030084 */ lw $v1, 0x84($s0) /* D68A5C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D68A60 80240D60 00000000 */ nop +/* D68A60 80240D60 00000000 */ nop /* D68A64 80240D64 28620002 */ slti $v0, $v1, 2 /* D68A68 80240D68 50400005 */ beql $v0, $zero, .L80240D80 /* D68A6C 80240D6C 24020002 */ addiu $v0, $zero, 2 /* D68A70 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D68A74 80240D74 00000000 */ nop +/* D68A74 80240D74 00000000 */ nop /* D68A78 80240D78 08090378 */ j .L80240DE0 -/* D68A7C 80240D7C 00000000 */ nop +/* D68A7C 80240D7C 00000000 */ nop .L80240D80: /* D68A80 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D68A84 80240D84 00000000 */ nop +/* D68A84 80240D84 00000000 */ nop /* D68A88 80240D88 08090378 */ j .L80240DE0 -/* D68A8C 80240D8C 00000000 */ nop +/* D68A8C 80240D8C 00000000 */ nop .L80240D90: /* D68A90 80240D90 3C048024 */ lui $a0, %hi(pra_14_SetPartnerFlagsA0000) /* D68A94 80240D94 24840E84 */ addiu $a0, $a0, %lo(pra_14_SetPartnerFlagsA0000) /* D68A98 80240D98 08090374 */ j .L80240DD0 -/* D68A9C 80240D9C 00000000 */ nop +/* D68A9C 80240D9C 00000000 */ nop .L80240DA0: /* D68AA0 80240DA0 3C048024 */ lui $a0, %hi(pra_14_SetPartnerFlags20000) /* D68AA4 80240DA4 24840EEC */ addiu $a0, $a0, %lo(pra_14_SetPartnerFlags20000) /* D68AA8 80240DA8 08090374 */ j .L80240DD0 -/* D68AAC 80240DAC 00000000 */ nop +/* D68AAC 80240DAC 00000000 */ nop .L80240DB0: /* D68AB0 80240DB0 8E020084 */ lw $v0, 0x84($s0) /* D68AB4 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D68AB8 80240DB8 00000000 */ nop +/* D68AB8 80240DB8 00000000 */ nop /* D68ABC 80240DBC 28420002 */ slti $v0, $v0, 2 /* D68AC0 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D68AC4 80240DC4 00000000 */ nop +/* D68AC4 80240DC4 00000000 */ nop .L80240DC8: /* D68AC8 80240DC8 3C048024 */ lui $a0, %hi(pra_14_SetPartnerFlags80000) /* D68ACC 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(pra_14_SetPartnerFlags80000) @@ -64,14 +64,14 @@ glabel func_80240D3C_D68A3C /* D68B0C 80240E0C 10400005 */ beqz $v0, .L80240E24 /* D68B10 80240E10 24020002 */ addiu $v0, $zero, 2 /* D68B14 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D68B18 80240E18 00000000 */ nop +/* D68B18 80240E18 00000000 */ nop /* D68B1C 80240E1C 0809039D */ j .L80240E74 -/* D68B20 80240E20 00000000 */ nop +/* D68B20 80240E20 00000000 */ nop .L80240E24: /* D68B24 80240E24 10820006 */ beq $a0, $v0, .L80240E40 /* D68B28 80240E28 24020002 */ addiu $v0, $zero, 2 /* D68B2C 80240E2C 0809039D */ j .L80240E74 -/* D68B30 80240E30 00000000 */ nop +/* D68B30 80240E30 00000000 */ nop .L80240E34: /* D68B34 80240E34 8CA20000 */ lw $v0, ($a1) /* D68B38 80240E38 0809039A */ j .L80240E68 diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240F20_D68C20.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240F20_D68C20.s index 5e31df5503..e3e6aa053f 100644 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240F20_D68C20.s +++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240F20_D68C20.s @@ -26,7 +26,7 @@ glabel func_80240F20_D68C20 /* D68C70 80240F70 1440FFFA */ bnez $v0, .L80240F5C /* D68C74 80240F74 24A50004 */ addiu $a1, $a1, 4 /* D68C78 80240F78 080903EF */ j .L80240FBC -/* D68C7C 80240F7C 00000000 */ nop +/* D68C7C 80240F7C 00000000 */ nop .L80240F80: /* D68C80 80240F80 0000182D */ daddu $v1, $zero, $zero /* D68C84 80240F84 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240054_D69B74.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240054_D69B74.s index fb96b73ec3..bf1c84de2b 100644 --- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240054_D69B74.s +++ b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240054_D69B74.s @@ -40,7 +40,7 @@ glabel func_80240054_D69B74 /* D69BF0 802400D0 1440FFF7 */ bnez $v0, .L802400B0 /* D69BF4 802400D4 24820001 */ addiu $v0, $a0, 1 /* D69BF8 802400D8 03E00008 */ jr $ra -/* D69BFC 802400DC 00000000 */ nop +/* D69BFC 802400DC 00000000 */ nop .L802400E0: /* D69C00 802400E0 3C020100 */ lui $v0, 0x100 .L802400E4: diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s index 22743d14f1..4418c1083a 100644 --- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s +++ b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s @@ -16,7 +16,7 @@ glabel func_80240128_D69C48 /* D69C74 80240154 27B20020 */ addiu $s2, $sp, 0x20 /* D69C78 80240158 8E0400CC */ lw $a0, 0xcc($s0) /* D69C7C 8024015C 0C044181 */ jal get_shadow_by_index -/* D69C80 80240160 00000000 */ nop +/* D69C80 80240160 00000000 */ nop /* D69C84 80240164 0C048B77 */ jal func_80122DDC /* D69C88 80240168 84440008 */ lh $a0, 8($v0) /* D69C8C 8024016C 8C430000 */ lw $v1, ($v0) @@ -38,22 +38,22 @@ glabel func_80240128_D69C48 /* D69CCC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D69CD0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) /* D69CD4 802401B4 0C090008 */ jal pra_16_UnkFunc2 -/* D69CD8 802401B8 00000000 */ nop +/* D69CD8 802401B8 00000000 */ nop /* D69CDC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D69CE0 802401C0 3C014307 */ lui $at, 0x4307 /* D69CE4 802401C4 44810000 */ mtc1 $at, $f0 -/* D69CE8 802401C8 00000000 */ nop +/* D69CE8 802401C8 00000000 */ nop /* D69CEC 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D69CF0 802401D0 00000000 */ nop +/* D69CF0 802401D0 00000000 */ nop /* D69CF4 802401D4 4500000B */ bc1f .L80240204 /* D69CF8 802401D8 24040002 */ addiu $a0, $zero, 2 /* D69CFC 802401DC 3C014361 */ lui $at, 0x4361 /* D69D00 802401E0 44810000 */ mtc1 $at, $f0 -/* D69D04 802401E4 00000000 */ nop +/* D69D04 802401E4 00000000 */ nop /* D69D08 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D69D0C 802401EC 00000000 */ nop +/* D69D0C 802401EC 00000000 */ nop /* D69D10 802401F0 45000004 */ bc1f .L80240204 -/* D69D14 802401F4 00000000 */ nop +/* D69D14 802401F4 00000000 */ nop /* D69D18 802401F8 0C090015 */ jal func_80240054_D69B74 /* D69D1C 802401FC 0040202D */ daddu $a0, $v0, $zero /* D69D20 80240200 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240128_D69C48 /* D69DA8 80240288 AFA0001C */ sw $zero, 0x1c($sp) .L8024028C: /* D69DAC 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D69DB0 80240290 00000000 */ nop +/* D69DB0 80240290 00000000 */ nop .L80240294: /* D69DB4 80240294 9202000E */ lbu $v0, 0xe($s0) /* D69DB8 80240298 3C01802E */ lui $at, %hi(D_802D9D70) diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_802402F0_D69E10.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_802402F0_D69E10.s index 69af6ffcd3..13d9dac752 100644 --- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_802402F0_D69E10.s +++ b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_802402F0_D69E10.s @@ -33,7 +33,7 @@ glabel func_802402F0_D69E10 /* D69E80 80240360 E7B40010 */ swc1 $f20, 0x10($sp) /* D69E84 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) /* D69E88 80240368 0C00A6C9 */ jal clamp_angle -/* D69E8C 8024036C 00000000 */ nop +/* D69E8C 8024036C 00000000 */ nop /* D69E90 80240370 44050000 */ mfc1 $a1, $f0 /* D69E94 80240374 4406A000 */ mfc1 $a2, $f20 /* D69E98 80240378 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_8024049C_D69FBC.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_8024049C_D69FBC.s index 52efadb770..1c7b5d7038 100644 --- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_8024049C_D69FBC.s +++ b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_8024049C_D69FBC.s @@ -10,7 +10,7 @@ glabel func_8024049C_D69FBC /* D69FD0 802404B0 0440000E */ bltz $v0, .L802404EC /* D69FD4 802404B4 28420002 */ slti $v0, $v0, 2 /* D69FD8 802404B8 1040000C */ beqz $v0, .L802404EC -/* D69FDC 802404BC 00000000 */ nop +/* D69FDC 802404BC 00000000 */ nop /* D69FE0 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D6A020) /* D69FE4 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D6A020) /* D69FE8 802404C8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240500_D6A020.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240500_D6A020.s index 456c1307dd..e0274d76ce 100644 --- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240500_D6A020.s +++ b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240500_D6A020.s @@ -16,7 +16,7 @@ glabel func_80240500_D6A020 /* D6A04C 8024052C 27B10020 */ addiu $s1, $sp, 0x20 /* D6A050 80240530 8E0400CC */ lw $a0, 0xcc($s0) /* D6A054 80240534 0C044181 */ jal get_shadow_by_index -/* D6A058 80240538 00000000 */ nop +/* D6A058 80240538 00000000 */ nop /* D6A05C 8024053C 0C048B77 */ jal func_80122DDC /* D6A060 80240540 84440008 */ lh $a0, 8($v0) /* D6A064 80240544 8E050028 */ lw $a1, 0x28($s0) @@ -33,7 +33,7 @@ glabel func_80240500_D6A020 /* D6A090 80240570 46000007 */ neg.s $f0, $f0 /* D6A094 80240574 44060000 */ mfc1 $a2, $f0 /* D6A098 80240578 0C00B94E */ jal get_screen_coords -/* D6A09C 8024057C 00000000 */ nop +/* D6A09C 8024057C 00000000 */ nop /* D6A0A0 80240580 8E0500A4 */ lw $a1, 0xa4($s0) /* D6A0A4 80240584 3C063F80 */ lui $a2, 0x3f80 /* D6A0A8 80240588 0C0B76A3 */ jal func_802DDA8C @@ -72,13 +72,13 @@ glabel func_80240500_D6A020 /* D6A128 80240608 AFA0001C */ sw $zero, 0x1c($sp) .L8024060C: /* D6A12C 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D6A130 80240610 00000000 */ nop +/* D6A130 80240610 00000000 */ nop .L80240614: /* D6A134 80240614 9202000E */ lbu $v0, 0xe($s0) /* D6A138 80240618 3C01802E */ lui $at, %hi(D_802D9D71) /* D6A13C 8024061C A0229D71 */ sb $v0, %lo(D_802D9D71)($at) /* D6A140 80240620 0809018C */ j .L80240630 -/* D6A144 80240624 00000000 */ nop +/* D6A144 80240624 00000000 */ nop .L80240628: /* D6A148 80240628 3C01802E */ lui $at, %hi(D_802D9D71) /* D6A14C 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_8024068C_D6A1AC.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_8024068C_D6A1AC.s index 99842dfb2b..090006be4d 100644 --- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_8024068C_D6A1AC.s +++ b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_8024068C_D6A1AC.s @@ -33,7 +33,7 @@ glabel func_8024068C_D6A1AC /* D6A21C 802406FC E7B40010 */ swc1 $f20, 0x10($sp) /* D6A220 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) /* D6A224 80240704 0C00A6C9 */ jal clamp_angle -/* D6A228 80240708 00000000 */ nop +/* D6A228 80240708 00000000 */ nop /* D6A22C 8024070C 44050000 */ mfc1 $a1, $f0 /* D6A230 80240710 4406A000 */ mfc1 $a2, $f20 /* D6A234 80240714 4407A000 */ mfc1 $a3, $f20 @@ -95,16 +95,16 @@ glabel func_8024068C_D6A1AC /* D6A314 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D6A318 802407F8 3C0142B4 */ lui $at, 0x42b4 /* D6A31C 802407FC 44810000 */ mtc1 $at, $f0 -/* D6A320 80240800 00000000 */ nop +/* D6A320 80240800 00000000 */ nop /* D6A324 80240804 4602003E */ c.le.s $f0, $f2 -/* D6A328 80240808 00000000 */ nop +/* D6A328 80240808 00000000 */ nop /* D6A32C 8024080C 4500000A */ bc1f .L80240838 /* D6A330 80240810 24040001 */ addiu $a0, $zero, 1 /* D6A334 80240814 3C014387 */ lui $at, 0x4387 /* D6A338 80240818 44810000 */ mtc1 $at, $f0 -/* D6A33C 8024081C 00000000 */ nop +/* D6A33C 8024081C 00000000 */ nop /* D6A340 80240820 4600103C */ c.lt.s $f2, $f0 -/* D6A344 80240824 00000000 */ nop +/* D6A344 80240824 00000000 */ nop /* D6A348 80240828 45000004 */ bc1f .L8024083C /* D6A34C 8024082C 27A20018 */ addiu $v0, $sp, 0x18 /* D6A350 80240830 3C041000 */ lui $a0, 0x1000 diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240870_D6A390.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240870_D6A390.s index 252f1ce80a..c940f83fdc 100644 --- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240870_D6A390.s +++ b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240870_D6A390.s @@ -43,36 +43,36 @@ glabel func_80240870_D6A390 /* D6A424 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D6A428 80240908 3C0142B4 */ lui $at, 0x42b4 /* D6A42C 8024090C 44810000 */ mtc1 $at, $f0 -/* D6A430 80240910 00000000 */ nop +/* D6A430 80240910 00000000 */ nop /* D6A434 80240914 4602003C */ c.lt.s $f0, $f2 -/* D6A438 80240918 00000000 */ nop +/* D6A438 80240918 00000000 */ nop /* D6A43C 8024091C 4500000A */ bc1f .L80240948 -/* D6A440 80240920 00000000 */ nop +/* D6A440 80240920 00000000 */ nop /* D6A444 80240924 3C014334 */ lui $at, 0x4334 /* D6A448 80240928 44812000 */ mtc1 $at, $f4 -/* D6A44C 8024092C 00000000 */ nop +/* D6A44C 8024092C 00000000 */ nop /* D6A450 80240930 4604103E */ c.le.s $f2, $f4 -/* D6A454 80240934 00000000 */ nop +/* D6A454 80240934 00000000 */ nop /* D6A458 80240938 45000003 */ bc1f .L80240948 -/* D6A45C 8024093C 00000000 */ nop +/* D6A45C 8024093C 00000000 */ nop /* D6A460 80240940 08090276 */ j .L802409D8 /* D6A464 80240944 46022501 */ sub.s $f20, $f4, $f2 .L80240948: /* D6A468 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) /* D6A46C 8024094C 3C014334 */ lui $at, 0x4334 /* D6A470 80240950 44812000 */ mtc1 $at, $f4 -/* D6A474 80240954 00000000 */ nop +/* D6A474 80240954 00000000 */ nop /* D6A478 80240958 4600203C */ c.lt.s $f4, $f0 -/* D6A47C 8024095C 00000000 */ nop +/* D6A47C 8024095C 00000000 */ nop /* D6A480 80240960 4500000C */ bc1f .L80240994 -/* D6A484 80240964 00000000 */ nop +/* D6A484 80240964 00000000 */ nop /* D6A488 80240968 3C014387 */ lui $at, 0x4387 /* D6A48C 8024096C 44812000 */ mtc1 $at, $f4 -/* D6A490 80240970 00000000 */ nop +/* D6A490 80240970 00000000 */ nop /* D6A494 80240974 4604003E */ c.le.s $f0, $f4 -/* D6A498 80240978 00000000 */ nop +/* D6A498 80240978 00000000 */ nop /* D6A49C 8024097C 45000008 */ bc1f .L802409A0 -/* D6A4A0 80240980 00000000 */ nop +/* D6A4A0 80240980 00000000 */ nop /* D6A4A4 80240984 3C014334 */ lui $at, 0x4334 /* D6A4A8 80240988 44812000 */ mtc1 $at, $f4 /* D6A4AC 8024098C 08090276 */ j .L802409D8 @@ -80,19 +80,19 @@ glabel func_80240870_D6A390 .L80240994: /* D6A4B4 80240994 3C014387 */ lui $at, 0x4387 /* D6A4B8 80240998 44812000 */ mtc1 $at, $f4 -/* D6A4BC 8024099C 00000000 */ nop +/* D6A4BC 8024099C 00000000 */ nop .L802409A0: /* D6A4C0 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D6A4C4 802409A4 00000000 */ nop +/* D6A4C4 802409A4 00000000 */ nop /* D6A4C8 802409A8 4500000A */ bc1f .L802409D4 -/* D6A4CC 802409AC 00000000 */ nop +/* D6A4CC 802409AC 00000000 */ nop /* D6A4D0 802409B0 3C0143B4 */ lui $at, 0x43b4 /* D6A4D4 802409B4 44811000 */ mtc1 $at, $f2 -/* D6A4D8 802409B8 00000000 */ nop +/* D6A4D8 802409B8 00000000 */ nop /* D6A4DC 802409BC 4602003E */ c.le.s $f0, $f2 -/* D6A4E0 802409C0 00000000 */ nop +/* D6A4E0 802409C0 00000000 */ nop /* D6A4E4 802409C4 45000003 */ bc1f .L802409D4 -/* D6A4E8 802409C8 00000000 */ nop +/* D6A4E8 802409C8 00000000 */ nop /* D6A4EC 802409CC 08090276 */ j .L802409D8 /* D6A4F0 802409D0 46001501 */ sub.s $f20, $f2, $f0 .L802409D4: @@ -100,11 +100,11 @@ glabel func_80240870_D6A390 .L802409D8: /* D6A4F8 802409D8 3C0141C8 */ lui $at, 0x41c8 /* D6A4FC 802409DC 44810000 */ mtc1 $at, $f0 -/* D6A500 802409E0 00000000 */ nop +/* D6A500 802409E0 00000000 */ nop /* D6A504 802409E4 4600A003 */ div.s $f0, $f20, $f0 /* D6A508 802409E8 4600010D */ trunc.w.s $f4, $f0 /* D6A50C 802409EC 44072000 */ mfc1 $a3, $f4 -/* D6A510 802409F0 00000000 */ nop +/* D6A510 802409F0 00000000 */ nop /* D6A514 802409F4 00071100 */ sll $v0, $a3, 4 /* D6A518 802409F8 00471023 */ subu $v0, $v0, $a3 /* D6A51C 802409FC 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel func_80240870_D6A390 /* D6A564 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) /* D6A568 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) /* D6A56C 80240A4C 0C00A6C9 */ jal clamp_angle -/* D6A570 80240A50 00000000 */ nop +/* D6A570 80240A50 00000000 */ nop /* D6A574 80240A54 44050000 */ mfc1 $a1, $f0 /* D6A578 80240A58 4406B000 */ mfc1 $a2, $f22 /* D6A57C 80240A5C 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel func_80240870_D6A390 /* D6A5E0 80240AC0 24040001 */ addiu $a0, $zero, 1 .L80240AC4: /* D6A5E4 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D6A5E8 80240AC8 00000000 */ nop +/* D6A5E8 80240AC8 00000000 */ nop /* D6A5EC 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 /* D6A5F0 80240AD0 24040001 */ addiu $a0, $zero, 1 .L80240AD4: @@ -204,10 +204,10 @@ glabel func_80240870_D6A390 /* D6A680 80240B60 44812000 */ mtc1 $at, $f4 /* D6A684 80240B64 00021023 */ negu $v0, $v0 /* D6A688 80240B68 44820000 */ mtc1 $v0, $f0 -/* D6A68C 80240B6C 00000000 */ nop +/* D6A68C 80240B6C 00000000 */ nop /* D6A690 80240B70 46800020 */ cvt.s.w $f0, $f0 /* D6A694 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D6A698 80240B78 00000000 */ nop +/* D6A698 80240B78 00000000 */ nop /* D6A69C 80240B7C 4405B000 */ mfc1 $a1, $f22 /* D6A6A0 80240B80 4407B000 */ mfc1 $a3, $f22 /* D6A6A4 80240B84 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel func_80240870_D6A390 /* D6A714 80240BF4 3C013F00 */ lui $at, 0x3f00 /* D6A718 80240BF8 44812000 */ mtc1 $at, $f4 /* D6A71C 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D6A720 80240C00 00000000 */ nop +/* D6A720 80240C00 00000000 */ nop /* D6A724 80240C04 46800020 */ cvt.s.w $f0, $f0 /* D6A728 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D6A72C 80240C0C 00000000 */ nop +/* D6A72C 80240C0C 00000000 */ nop /* D6A730 80240C10 4405B000 */ mfc1 $a1, $f22 /* D6A734 80240C14 4407B000 */ mfc1 $a3, $f22 /* D6A738 80240C18 44062000 */ mfc1 $a2, $f4 @@ -280,16 +280,16 @@ glabel func_80240870_D6A390 /* D6A7B0 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D6A7B4 80240C94 3C0142B4 */ lui $at, 0x42b4 /* D6A7B8 80240C98 44810000 */ mtc1 $at, $f0 -/* D6A7BC 80240C9C 00000000 */ nop +/* D6A7BC 80240C9C 00000000 */ nop /* D6A7C0 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D6A7C4 80240CA4 00000000 */ nop +/* D6A7C4 80240CA4 00000000 */ nop /* D6A7C8 80240CA8 4500000A */ bc1f .L80240CD4 /* D6A7CC 80240CAC 24040001 */ addiu $a0, $zero, 1 /* D6A7D0 80240CB0 3C014387 */ lui $at, 0x4387 /* D6A7D4 80240CB4 44812000 */ mtc1 $at, $f4 -/* D6A7D8 80240CB8 00000000 */ nop +/* D6A7D8 80240CB8 00000000 */ nop /* D6A7DC 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D6A7E0 80240CC0 00000000 */ nop +/* D6A7E0 80240CC0 00000000 */ nop /* D6A7E4 80240CC4 45000004 */ bc1f .L80240CD8 /* D6A7E8 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 /* D6A7EC 80240CCC 3C041000 */ lui $a0, 0x1000 @@ -305,7 +305,7 @@ glabel func_80240870_D6A390 /* D6A80C 80240CEC 26730001 */ addiu $s3, $s3, 1 /* D6A810 80240CF0 2A620002 */ slti $v0, $s3, 2 /* D6A814 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D6A818 80240CF8 00000000 */ nop +/* D6A818 80240CF8 00000000 */ nop /* D6A81C 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) /* D6A820 80240D00 8FB60148 */ lw $s6, 0x148($sp) /* D6A824 80240D04 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240D3C_D6A85C.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240D3C_D6A85C.s index 476f523369..3bbfe6b527 100644 --- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240D3C_D6A85C.s +++ b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240D3C_D6A85C.s @@ -11,36 +11,36 @@ glabel func_80240D3C_D6A85C /* D6A874 80240D54 24020001 */ addiu $v0, $zero, 1 /* D6A878 80240D58 8E030084 */ lw $v1, 0x84($s0) /* D6A87C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D6A880 80240D60 00000000 */ nop +/* D6A880 80240D60 00000000 */ nop /* D6A884 80240D64 28620002 */ slti $v0, $v1, 2 /* D6A888 80240D68 50400005 */ beql $v0, $zero, .L80240D80 /* D6A88C 80240D6C 24020002 */ addiu $v0, $zero, 2 /* D6A890 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D6A894 80240D74 00000000 */ nop +/* D6A894 80240D74 00000000 */ nop /* D6A898 80240D78 08090378 */ j .L80240DE0 -/* D6A89C 80240D7C 00000000 */ nop +/* D6A89C 80240D7C 00000000 */ nop .L80240D80: /* D6A8A0 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D6A8A4 80240D84 00000000 */ nop +/* D6A8A4 80240D84 00000000 */ nop /* D6A8A8 80240D88 08090378 */ j .L80240DE0 -/* D6A8AC 80240D8C 00000000 */ nop +/* D6A8AC 80240D8C 00000000 */ nop .L80240D90: /* D6A8B0 80240D90 3C048024 */ lui $a0, %hi(pra_16_SetPartnerFlagsA0000) /* D6A8B4 80240D94 24840E84 */ addiu $a0, $a0, %lo(pra_16_SetPartnerFlagsA0000) /* D6A8B8 80240D98 08090374 */ j .L80240DD0 -/* D6A8BC 80240D9C 00000000 */ nop +/* D6A8BC 80240D9C 00000000 */ nop .L80240DA0: /* D6A8C0 80240DA0 3C048024 */ lui $a0, %hi(pra_16_SetPartnerFlags20000) /* D6A8C4 80240DA4 24840EEC */ addiu $a0, $a0, %lo(pra_16_SetPartnerFlags20000) /* D6A8C8 80240DA8 08090374 */ j .L80240DD0 -/* D6A8CC 80240DAC 00000000 */ nop +/* D6A8CC 80240DAC 00000000 */ nop .L80240DB0: /* D6A8D0 80240DB0 8E020084 */ lw $v0, 0x84($s0) /* D6A8D4 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D6A8D8 80240DB8 00000000 */ nop +/* D6A8D8 80240DB8 00000000 */ nop /* D6A8DC 80240DBC 28420002 */ slti $v0, $v0, 2 /* D6A8E0 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D6A8E4 80240DC4 00000000 */ nop +/* D6A8E4 80240DC4 00000000 */ nop .L80240DC8: /* D6A8E8 80240DC8 3C048024 */ lui $a0, %hi(pra_16_SetPartnerFlags80000) /* D6A8EC 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(pra_16_SetPartnerFlags80000) @@ -64,14 +64,14 @@ glabel func_80240D3C_D6A85C /* D6A92C 80240E0C 10400005 */ beqz $v0, .L80240E24 /* D6A930 80240E10 24020002 */ addiu $v0, $zero, 2 /* D6A934 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D6A938 80240E18 00000000 */ nop +/* D6A938 80240E18 00000000 */ nop /* D6A93C 80240E1C 0809039D */ j .L80240E74 -/* D6A940 80240E20 00000000 */ nop +/* D6A940 80240E20 00000000 */ nop .L80240E24: /* D6A944 80240E24 10820006 */ beq $a0, $v0, .L80240E40 /* D6A948 80240E28 24020002 */ addiu $v0, $zero, 2 /* D6A94C 80240E2C 0809039D */ j .L80240E74 -/* D6A950 80240E30 00000000 */ nop +/* D6A950 80240E30 00000000 */ nop .L80240E34: /* D6A954 80240E34 8CA20000 */ lw $v0, ($a1) /* D6A958 80240E38 0809039A */ j .L80240E68 diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240054_D6B674.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240054_D6B674.s index 2de4466724..97646ba8ce 100644 --- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240054_D6B674.s +++ b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240054_D6B674.s @@ -40,7 +40,7 @@ glabel func_80240054_D6B674 /* D6B6F0 802400D0 1440FFF7 */ bnez $v0, .L802400B0 /* D6B6F4 802400D4 24820001 */ addiu $v0, $a0, 1 /* D6B6F8 802400D8 03E00008 */ jr $ra -/* D6B6FC 802400DC 00000000 */ nop +/* D6B6FC 802400DC 00000000 */ nop .L802400E0: /* D6B700 802400E0 3C020100 */ lui $v0, 0x100 .L802400E4: diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s index 0a82d972c7..31e5848a98 100644 --- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s +++ b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s @@ -16,7 +16,7 @@ glabel func_80240128_D6B748 /* D6B774 80240154 27B20020 */ addiu $s2, $sp, 0x20 /* D6B778 80240158 8E0400CC */ lw $a0, 0xcc($s0) /* D6B77C 8024015C 0C044181 */ jal get_shadow_by_index -/* D6B780 80240160 00000000 */ nop +/* D6B780 80240160 00000000 */ nop /* D6B784 80240164 0C048B77 */ jal func_80122DDC /* D6B788 80240168 84440008 */ lh $a0, 8($v0) /* D6B78C 8024016C 8C430000 */ lw $v1, ($v0) @@ -38,22 +38,22 @@ glabel func_80240128_D6B748 /* D6B7CC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D6B7D0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) /* D6B7D4 802401B4 0C090008 */ jal pra_18_UnkFunc2 -/* D6B7D8 802401B8 00000000 */ nop +/* D6B7D8 802401B8 00000000 */ nop /* D6B7DC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D6B7E0 802401C0 3C014307 */ lui $at, 0x4307 /* D6B7E4 802401C4 44810000 */ mtc1 $at, $f0 -/* D6B7E8 802401C8 00000000 */ nop +/* D6B7E8 802401C8 00000000 */ nop /* D6B7EC 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D6B7F0 802401D0 00000000 */ nop +/* D6B7F0 802401D0 00000000 */ nop /* D6B7F4 802401D4 4500000B */ bc1f .L80240204 /* D6B7F8 802401D8 24040002 */ addiu $a0, $zero, 2 /* D6B7FC 802401DC 3C014361 */ lui $at, 0x4361 /* D6B800 802401E0 44810000 */ mtc1 $at, $f0 -/* D6B804 802401E4 00000000 */ nop +/* D6B804 802401E4 00000000 */ nop /* D6B808 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D6B80C 802401EC 00000000 */ nop +/* D6B80C 802401EC 00000000 */ nop /* D6B810 802401F0 45000004 */ bc1f .L80240204 -/* D6B814 802401F4 00000000 */ nop +/* D6B814 802401F4 00000000 */ nop /* D6B818 802401F8 0C090015 */ jal func_80240054_D6B674 /* D6B81C 802401FC 0040202D */ daddu $a0, $v0, $zero /* D6B820 80240200 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240128_D6B748 /* D6B8A8 80240288 AFA0001C */ sw $zero, 0x1c($sp) .L8024028C: /* D6B8AC 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D6B8B0 80240290 00000000 */ nop +/* D6B8B0 80240290 00000000 */ nop .L80240294: /* D6B8B4 80240294 9202000E */ lbu $v0, 0xe($s0) /* D6B8B8 80240298 3C01802E */ lui $at, %hi(D_802D9D70) diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_802402F0_D6B910.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_802402F0_D6B910.s index 3cd4668407..fe566c5c0a 100644 --- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_802402F0_D6B910.s +++ b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_802402F0_D6B910.s @@ -33,7 +33,7 @@ glabel func_802402F0_D6B910 /* D6B980 80240360 E7B40010 */ swc1 $f20, 0x10($sp) /* D6B984 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) /* D6B988 80240368 0C00A6C9 */ jal clamp_angle -/* D6B98C 8024036C 00000000 */ nop +/* D6B98C 8024036C 00000000 */ nop /* D6B990 80240370 44050000 */ mfc1 $a1, $f0 /* D6B994 80240374 4406A000 */ mfc1 $a2, $f20 /* D6B998 80240378 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_8024049C_D6BABC.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_8024049C_D6BABC.s index f3146ea878..1d4cd6866e 100644 --- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_8024049C_D6BABC.s +++ b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_8024049C_D6BABC.s @@ -10,7 +10,7 @@ glabel func_8024049C_D6BABC /* D6BAD0 802404B0 0440000E */ bltz $v0, .L802404EC /* D6BAD4 802404B4 28420002 */ slti $v0, $v0, 2 /* D6BAD8 802404B8 1040000C */ beqz $v0, .L802404EC -/* D6BADC 802404BC 00000000 */ nop +/* D6BADC 802404BC 00000000 */ nop /* D6BAE0 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D6BB20) /* D6BAE4 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D6BB20) /* D6BAE8 802404C8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240500_D6BB20.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240500_D6BB20.s index fb84e3a8ab..759dd79d93 100644 --- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240500_D6BB20.s +++ b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240500_D6BB20.s @@ -16,7 +16,7 @@ glabel func_80240500_D6BB20 /* D6BB4C 8024052C 27B10020 */ addiu $s1, $sp, 0x20 /* D6BB50 80240530 8E0400CC */ lw $a0, 0xcc($s0) /* D6BB54 80240534 0C044181 */ jal get_shadow_by_index -/* D6BB58 80240538 00000000 */ nop +/* D6BB58 80240538 00000000 */ nop /* D6BB5C 8024053C 0C048B77 */ jal func_80122DDC /* D6BB60 80240540 84440008 */ lh $a0, 8($v0) /* D6BB64 80240544 8E050028 */ lw $a1, 0x28($s0) @@ -33,7 +33,7 @@ glabel func_80240500_D6BB20 /* D6BB90 80240570 46000007 */ neg.s $f0, $f0 /* D6BB94 80240574 44060000 */ mfc1 $a2, $f0 /* D6BB98 80240578 0C00B94E */ jal get_screen_coords -/* D6BB9C 8024057C 00000000 */ nop +/* D6BB9C 8024057C 00000000 */ nop /* D6BBA0 80240580 8E0500A4 */ lw $a1, 0xa4($s0) /* D6BBA4 80240584 3C063F80 */ lui $a2, 0x3f80 /* D6BBA8 80240588 0C0B76A3 */ jal func_802DDA8C @@ -72,13 +72,13 @@ glabel func_80240500_D6BB20 /* D6BC28 80240608 AFA0001C */ sw $zero, 0x1c($sp) .L8024060C: /* D6BC2C 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D6BC30 80240610 00000000 */ nop +/* D6BC30 80240610 00000000 */ nop .L80240614: /* D6BC34 80240614 9202000E */ lbu $v0, 0xe($s0) /* D6BC38 80240618 3C01802E */ lui $at, %hi(D_802D9D71) /* D6BC3C 8024061C A0229D71 */ sb $v0, %lo(D_802D9D71)($at) /* D6BC40 80240620 0809018C */ j .L80240630 -/* D6BC44 80240624 00000000 */ nop +/* D6BC44 80240624 00000000 */ nop .L80240628: /* D6BC48 80240628 3C01802E */ lui $at, %hi(D_802D9D71) /* D6BC4C 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_8024068C_D6BCAC.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_8024068C_D6BCAC.s index f89e3c8433..d2181539b5 100644 --- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_8024068C_D6BCAC.s +++ b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_8024068C_D6BCAC.s @@ -33,7 +33,7 @@ glabel func_8024068C_D6BCAC /* D6BD1C 802406FC E7B40010 */ swc1 $f20, 0x10($sp) /* D6BD20 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) /* D6BD24 80240704 0C00A6C9 */ jal clamp_angle -/* D6BD28 80240708 00000000 */ nop +/* D6BD28 80240708 00000000 */ nop /* D6BD2C 8024070C 44050000 */ mfc1 $a1, $f0 /* D6BD30 80240710 4406A000 */ mfc1 $a2, $f20 /* D6BD34 80240714 4407A000 */ mfc1 $a3, $f20 @@ -95,16 +95,16 @@ glabel func_8024068C_D6BCAC /* D6BE14 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D6BE18 802407F8 3C0142B4 */ lui $at, 0x42b4 /* D6BE1C 802407FC 44810000 */ mtc1 $at, $f0 -/* D6BE20 80240800 00000000 */ nop +/* D6BE20 80240800 00000000 */ nop /* D6BE24 80240804 4602003E */ c.le.s $f0, $f2 -/* D6BE28 80240808 00000000 */ nop +/* D6BE28 80240808 00000000 */ nop /* D6BE2C 8024080C 4500000A */ bc1f .L80240838 /* D6BE30 80240810 24040001 */ addiu $a0, $zero, 1 /* D6BE34 80240814 3C014387 */ lui $at, 0x4387 /* D6BE38 80240818 44810000 */ mtc1 $at, $f0 -/* D6BE3C 8024081C 00000000 */ nop +/* D6BE3C 8024081C 00000000 */ nop /* D6BE40 80240820 4600103C */ c.lt.s $f2, $f0 -/* D6BE44 80240824 00000000 */ nop +/* D6BE44 80240824 00000000 */ nop /* D6BE48 80240828 45000004 */ bc1f .L8024083C /* D6BE4C 8024082C 27A20018 */ addiu $v0, $sp, 0x18 /* D6BE50 80240830 3C041000 */ lui $a0, 0x1000 diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240870_D6BE90.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240870_D6BE90.s index 8c83e6f0a9..c808dc14ea 100644 --- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240870_D6BE90.s +++ b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240870_D6BE90.s @@ -43,36 +43,36 @@ glabel func_80240870_D6BE90 /* D6BF24 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D6BF28 80240908 3C0142B4 */ lui $at, 0x42b4 /* D6BF2C 8024090C 44810000 */ mtc1 $at, $f0 -/* D6BF30 80240910 00000000 */ nop +/* D6BF30 80240910 00000000 */ nop /* D6BF34 80240914 4602003C */ c.lt.s $f0, $f2 -/* D6BF38 80240918 00000000 */ nop +/* D6BF38 80240918 00000000 */ nop /* D6BF3C 8024091C 4500000A */ bc1f .L80240948 -/* D6BF40 80240920 00000000 */ nop +/* D6BF40 80240920 00000000 */ nop /* D6BF44 80240924 3C014334 */ lui $at, 0x4334 /* D6BF48 80240928 44812000 */ mtc1 $at, $f4 -/* D6BF4C 8024092C 00000000 */ nop +/* D6BF4C 8024092C 00000000 */ nop /* D6BF50 80240930 4604103E */ c.le.s $f2, $f4 -/* D6BF54 80240934 00000000 */ nop +/* D6BF54 80240934 00000000 */ nop /* D6BF58 80240938 45000003 */ bc1f .L80240948 -/* D6BF5C 8024093C 00000000 */ nop +/* D6BF5C 8024093C 00000000 */ nop /* D6BF60 80240940 08090276 */ j .L802409D8 /* D6BF64 80240944 46022501 */ sub.s $f20, $f4, $f2 .L80240948: /* D6BF68 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) /* D6BF6C 8024094C 3C014334 */ lui $at, 0x4334 /* D6BF70 80240950 44812000 */ mtc1 $at, $f4 -/* D6BF74 80240954 00000000 */ nop +/* D6BF74 80240954 00000000 */ nop /* D6BF78 80240958 4600203C */ c.lt.s $f4, $f0 -/* D6BF7C 8024095C 00000000 */ nop +/* D6BF7C 8024095C 00000000 */ nop /* D6BF80 80240960 4500000C */ bc1f .L80240994 -/* D6BF84 80240964 00000000 */ nop +/* D6BF84 80240964 00000000 */ nop /* D6BF88 80240968 3C014387 */ lui $at, 0x4387 /* D6BF8C 8024096C 44812000 */ mtc1 $at, $f4 -/* D6BF90 80240970 00000000 */ nop +/* D6BF90 80240970 00000000 */ nop /* D6BF94 80240974 4604003E */ c.le.s $f0, $f4 -/* D6BF98 80240978 00000000 */ nop +/* D6BF98 80240978 00000000 */ nop /* D6BF9C 8024097C 45000008 */ bc1f .L802409A0 -/* D6BFA0 80240980 00000000 */ nop +/* D6BFA0 80240980 00000000 */ nop /* D6BFA4 80240984 3C014334 */ lui $at, 0x4334 /* D6BFA8 80240988 44812000 */ mtc1 $at, $f4 /* D6BFAC 8024098C 08090276 */ j .L802409D8 @@ -80,19 +80,19 @@ glabel func_80240870_D6BE90 .L80240994: /* D6BFB4 80240994 3C014387 */ lui $at, 0x4387 /* D6BFB8 80240998 44812000 */ mtc1 $at, $f4 -/* D6BFBC 8024099C 00000000 */ nop +/* D6BFBC 8024099C 00000000 */ nop .L802409A0: /* D6BFC0 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D6BFC4 802409A4 00000000 */ nop +/* D6BFC4 802409A4 00000000 */ nop /* D6BFC8 802409A8 4500000A */ bc1f .L802409D4 -/* D6BFCC 802409AC 00000000 */ nop +/* D6BFCC 802409AC 00000000 */ nop /* D6BFD0 802409B0 3C0143B4 */ lui $at, 0x43b4 /* D6BFD4 802409B4 44811000 */ mtc1 $at, $f2 -/* D6BFD8 802409B8 00000000 */ nop +/* D6BFD8 802409B8 00000000 */ nop /* D6BFDC 802409BC 4602003E */ c.le.s $f0, $f2 -/* D6BFE0 802409C0 00000000 */ nop +/* D6BFE0 802409C0 00000000 */ nop /* D6BFE4 802409C4 45000003 */ bc1f .L802409D4 -/* D6BFE8 802409C8 00000000 */ nop +/* D6BFE8 802409C8 00000000 */ nop /* D6BFEC 802409CC 08090276 */ j .L802409D8 /* D6BFF0 802409D0 46001501 */ sub.s $f20, $f2, $f0 .L802409D4: @@ -100,11 +100,11 @@ glabel func_80240870_D6BE90 .L802409D8: /* D6BFF8 802409D8 3C0141C8 */ lui $at, 0x41c8 /* D6BFFC 802409DC 44810000 */ mtc1 $at, $f0 -/* D6C000 802409E0 00000000 */ nop +/* D6C000 802409E0 00000000 */ nop /* D6C004 802409E4 4600A003 */ div.s $f0, $f20, $f0 /* D6C008 802409E8 4600010D */ trunc.w.s $f4, $f0 /* D6C00C 802409EC 44072000 */ mfc1 $a3, $f4 -/* D6C010 802409F0 00000000 */ nop +/* D6C010 802409F0 00000000 */ nop /* D6C014 802409F4 00071100 */ sll $v0, $a3, 4 /* D6C018 802409F8 00471023 */ subu $v0, $v0, $a3 /* D6C01C 802409FC 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel func_80240870_D6BE90 /* D6C064 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) /* D6C068 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) /* D6C06C 80240A4C 0C00A6C9 */ jal clamp_angle -/* D6C070 80240A50 00000000 */ nop +/* D6C070 80240A50 00000000 */ nop /* D6C074 80240A54 44050000 */ mfc1 $a1, $f0 /* D6C078 80240A58 4406B000 */ mfc1 $a2, $f22 /* D6C07C 80240A5C 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel func_80240870_D6BE90 /* D6C0E0 80240AC0 24040001 */ addiu $a0, $zero, 1 .L80240AC4: /* D6C0E4 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D6C0E8 80240AC8 00000000 */ nop +/* D6C0E8 80240AC8 00000000 */ nop /* D6C0EC 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 /* D6C0F0 80240AD0 24040001 */ addiu $a0, $zero, 1 .L80240AD4: @@ -204,10 +204,10 @@ glabel func_80240870_D6BE90 /* D6C180 80240B60 44812000 */ mtc1 $at, $f4 /* D6C184 80240B64 00021023 */ negu $v0, $v0 /* D6C188 80240B68 44820000 */ mtc1 $v0, $f0 -/* D6C18C 80240B6C 00000000 */ nop +/* D6C18C 80240B6C 00000000 */ nop /* D6C190 80240B70 46800020 */ cvt.s.w $f0, $f0 /* D6C194 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D6C198 80240B78 00000000 */ nop +/* D6C198 80240B78 00000000 */ nop /* D6C19C 80240B7C 4405B000 */ mfc1 $a1, $f22 /* D6C1A0 80240B80 4407B000 */ mfc1 $a3, $f22 /* D6C1A4 80240B84 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel func_80240870_D6BE90 /* D6C214 80240BF4 3C013F00 */ lui $at, 0x3f00 /* D6C218 80240BF8 44812000 */ mtc1 $at, $f4 /* D6C21C 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D6C220 80240C00 00000000 */ nop +/* D6C220 80240C00 00000000 */ nop /* D6C224 80240C04 46800020 */ cvt.s.w $f0, $f0 /* D6C228 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D6C22C 80240C0C 00000000 */ nop +/* D6C22C 80240C0C 00000000 */ nop /* D6C230 80240C10 4405B000 */ mfc1 $a1, $f22 /* D6C234 80240C14 4407B000 */ mfc1 $a3, $f22 /* D6C238 80240C18 44062000 */ mfc1 $a2, $f4 @@ -280,16 +280,16 @@ glabel func_80240870_D6BE90 /* D6C2B0 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D6C2B4 80240C94 3C0142B4 */ lui $at, 0x42b4 /* D6C2B8 80240C98 44810000 */ mtc1 $at, $f0 -/* D6C2BC 80240C9C 00000000 */ nop +/* D6C2BC 80240C9C 00000000 */ nop /* D6C2C0 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D6C2C4 80240CA4 00000000 */ nop +/* D6C2C4 80240CA4 00000000 */ nop /* D6C2C8 80240CA8 4500000A */ bc1f .L80240CD4 /* D6C2CC 80240CAC 24040001 */ addiu $a0, $zero, 1 /* D6C2D0 80240CB0 3C014387 */ lui $at, 0x4387 /* D6C2D4 80240CB4 44812000 */ mtc1 $at, $f4 -/* D6C2D8 80240CB8 00000000 */ nop +/* D6C2D8 80240CB8 00000000 */ nop /* D6C2DC 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D6C2E0 80240CC0 00000000 */ nop +/* D6C2E0 80240CC0 00000000 */ nop /* D6C2E4 80240CC4 45000004 */ bc1f .L80240CD8 /* D6C2E8 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 /* D6C2EC 80240CCC 3C041000 */ lui $a0, 0x1000 @@ -305,7 +305,7 @@ glabel func_80240870_D6BE90 /* D6C30C 80240CEC 26730001 */ addiu $s3, $s3, 1 /* D6C310 80240CF0 2A620002 */ slti $v0, $s3, 2 /* D6C314 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D6C318 80240CF8 00000000 */ nop +/* D6C318 80240CF8 00000000 */ nop /* D6C31C 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) /* D6C320 80240D00 8FB60148 */ lw $s6, 0x148($sp) /* D6C324 80240D04 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240D3C_D6C35C.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240D3C_D6C35C.s index b4ccd263a1..e8aa27fe33 100644 --- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240D3C_D6C35C.s +++ b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240D3C_D6C35C.s @@ -11,36 +11,36 @@ glabel func_80240D3C_D6C35C /* D6C374 80240D54 24020001 */ addiu $v0, $zero, 1 /* D6C378 80240D58 8E030084 */ lw $v1, 0x84($s0) /* D6C37C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D6C380 80240D60 00000000 */ nop +/* D6C380 80240D60 00000000 */ nop /* D6C384 80240D64 28620002 */ slti $v0, $v1, 2 /* D6C388 80240D68 50400005 */ beql $v0, $zero, .L80240D80 /* D6C38C 80240D6C 24020002 */ addiu $v0, $zero, 2 /* D6C390 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D6C394 80240D74 00000000 */ nop +/* D6C394 80240D74 00000000 */ nop /* D6C398 80240D78 08090378 */ j .L80240DE0 -/* D6C39C 80240D7C 00000000 */ nop +/* D6C39C 80240D7C 00000000 */ nop .L80240D80: /* D6C3A0 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D6C3A4 80240D84 00000000 */ nop +/* D6C3A4 80240D84 00000000 */ nop /* D6C3A8 80240D88 08090378 */ j .L80240DE0 -/* D6C3AC 80240D8C 00000000 */ nop +/* D6C3AC 80240D8C 00000000 */ nop .L80240D90: /* D6C3B0 80240D90 3C048024 */ lui $a0, %hi(pra_18_SetPartnerFlagsA0000) /* D6C3B4 80240D94 24840E84 */ addiu $a0, $a0, %lo(pra_18_SetPartnerFlagsA0000) /* D6C3B8 80240D98 08090374 */ j .L80240DD0 -/* D6C3BC 80240D9C 00000000 */ nop +/* D6C3BC 80240D9C 00000000 */ nop .L80240DA0: /* D6C3C0 80240DA0 3C048024 */ lui $a0, %hi(pra_18_SetPartnerFlags20000) /* D6C3C4 80240DA4 24840EEC */ addiu $a0, $a0, %lo(pra_18_SetPartnerFlags20000) /* D6C3C8 80240DA8 08090374 */ j .L80240DD0 -/* D6C3CC 80240DAC 00000000 */ nop +/* D6C3CC 80240DAC 00000000 */ nop .L80240DB0: /* D6C3D0 80240DB0 8E020084 */ lw $v0, 0x84($s0) /* D6C3D4 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D6C3D8 80240DB8 00000000 */ nop +/* D6C3D8 80240DB8 00000000 */ nop /* D6C3DC 80240DBC 28420002 */ slti $v0, $v0, 2 /* D6C3E0 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D6C3E4 80240DC4 00000000 */ nop +/* D6C3E4 80240DC4 00000000 */ nop .L80240DC8: /* D6C3E8 80240DC8 3C048024 */ lui $a0, %hi(pra_18_SetPartnerFlags80000) /* D6C3EC 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(pra_18_SetPartnerFlags80000) @@ -64,14 +64,14 @@ glabel func_80240D3C_D6C35C /* D6C42C 80240E0C 10400005 */ beqz $v0, .L80240E24 /* D6C430 80240E10 24020002 */ addiu $v0, $zero, 2 /* D6C434 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D6C438 80240E18 00000000 */ nop +/* D6C438 80240E18 00000000 */ nop /* D6C43C 80240E1C 0809039D */ j .L80240E74 -/* D6C440 80240E20 00000000 */ nop +/* D6C440 80240E20 00000000 */ nop .L80240E24: /* D6C444 80240E24 10820006 */ beq $a0, $v0, .L80240E40 /* D6C448 80240E28 24020002 */ addiu $v0, $zero, 2 /* D6C44C 80240E2C 0809039D */ j .L80240E74 -/* D6C450 80240E30 00000000 */ nop +/* D6C450 80240E30 00000000 */ nop .L80240E34: /* D6C454 80240E34 8CA20000 */ lw $v0, ($a1) /* D6C458 80240E38 0809039A */ j .L80240E68 diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240054_D6EA04.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240054_D6EA04.s index fb488222a8..6ba9376684 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240054_D6EA04.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240054_D6EA04.s @@ -40,7 +40,7 @@ glabel func_80240054_D6EA04 /* D6EA80 802400D0 1440FFF7 */ bnez $v0, .L802400B0 /* D6EA84 802400D4 24820001 */ addiu $v0, $a0, 1 /* D6EA88 802400D8 03E00008 */ jr $ra -/* D6EA8C 802400DC 00000000 */ nop +/* D6EA8C 802400DC 00000000 */ nop .L802400E0: /* D6EA90 802400E0 3C020100 */ lui $v0, 0x100 .L802400E4: diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s index 4956634bf2..c7ba1785c8 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s @@ -16,7 +16,7 @@ glabel func_80240128_D6EAD8 /* D6EB04 80240154 27B20020 */ addiu $s2, $sp, 0x20 /* D6EB08 80240158 8E0400CC */ lw $a0, 0xcc($s0) /* D6EB0C 8024015C 0C044181 */ jal get_shadow_by_index -/* D6EB10 80240160 00000000 */ nop +/* D6EB10 80240160 00000000 */ nop /* D6EB14 80240164 0C048B77 */ jal func_80122DDC /* D6EB18 80240168 84440008 */ lh $a0, 8($v0) /* D6EB1C 8024016C 8C430000 */ lw $v1, ($v0) @@ -38,22 +38,22 @@ glabel func_80240128_D6EAD8 /* D6EB5C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D6EB60 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) /* D6EB64 802401B4 0C090008 */ jal pra_19_UnkFunc2 -/* D6EB68 802401B8 00000000 */ nop +/* D6EB68 802401B8 00000000 */ nop /* D6EB6C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D6EB70 802401C0 3C014307 */ lui $at, 0x4307 /* D6EB74 802401C4 44810000 */ mtc1 $at, $f0 -/* D6EB78 802401C8 00000000 */ nop +/* D6EB78 802401C8 00000000 */ nop /* D6EB7C 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D6EB80 802401D0 00000000 */ nop +/* D6EB80 802401D0 00000000 */ nop /* D6EB84 802401D4 4500000B */ bc1f .L80240204 /* D6EB88 802401D8 24040002 */ addiu $a0, $zero, 2 /* D6EB8C 802401DC 3C014361 */ lui $at, 0x4361 /* D6EB90 802401E0 44810000 */ mtc1 $at, $f0 -/* D6EB94 802401E4 00000000 */ nop +/* D6EB94 802401E4 00000000 */ nop /* D6EB98 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D6EB9C 802401EC 00000000 */ nop +/* D6EB9C 802401EC 00000000 */ nop /* D6EBA0 802401F0 45000004 */ bc1f .L80240204 -/* D6EBA4 802401F4 00000000 */ nop +/* D6EBA4 802401F4 00000000 */ nop /* D6EBA8 802401F8 0C090015 */ jal func_80240054_D6EA04 /* D6EBAC 802401FC 0040202D */ daddu $a0, $v0, $zero /* D6EBB0 80240200 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240128_D6EAD8 /* D6EC38 80240288 AFA0001C */ sw $zero, 0x1c($sp) .L8024028C: /* D6EC3C 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D6EC40 80240290 00000000 */ nop +/* D6EC40 80240290 00000000 */ nop .L80240294: /* D6EC44 80240294 9202000E */ lbu $v0, 0xe($s0) /* D6EC48 80240298 3C01802E */ lui $at, %hi(D_802D9D70) diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802402F0_D6ECA0.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802402F0_D6ECA0.s index 7f2ab722e4..3e7c519918 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802402F0_D6ECA0.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802402F0_D6ECA0.s @@ -33,7 +33,7 @@ glabel func_802402F0_D6ECA0 /* D6ED10 80240360 E7B40010 */ swc1 $f20, 0x10($sp) /* D6ED14 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) /* D6ED18 80240368 0C00A6C9 */ jal clamp_angle -/* D6ED1C 8024036C 00000000 */ nop +/* D6ED1C 8024036C 00000000 */ nop /* D6ED20 80240370 44050000 */ mfc1 $a1, $f0 /* D6ED24 80240374 4406A000 */ mfc1 $a2, $f20 /* D6ED28 80240378 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024049C_D6EE4C.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024049C_D6EE4C.s index 8440711adc..f7b46c9fda 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024049C_D6EE4C.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024049C_D6EE4C.s @@ -10,7 +10,7 @@ glabel func_8024049C_D6EE4C /* D6EE60 802404B0 0440000E */ bltz $v0, .L802404EC /* D6EE64 802404B4 28420002 */ slti $v0, $v0, 2 /* D6EE68 802404B8 1040000C */ beqz $v0, .L802404EC -/* D6EE6C 802404BC 00000000 */ nop +/* D6EE6C 802404BC 00000000 */ nop /* D6EE70 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D6EEB0) /* D6EE74 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D6EEB0) /* D6EE78 802404C8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240500_D6EEB0.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240500_D6EEB0.s index 90e34b8010..a8be80e13b 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240500_D6EEB0.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240500_D6EEB0.s @@ -16,7 +16,7 @@ glabel func_80240500_D6EEB0 /* D6EEDC 8024052C 27B10020 */ addiu $s1, $sp, 0x20 /* D6EEE0 80240530 8E0400CC */ lw $a0, 0xcc($s0) /* D6EEE4 80240534 0C044181 */ jal get_shadow_by_index -/* D6EEE8 80240538 00000000 */ nop +/* D6EEE8 80240538 00000000 */ nop /* D6EEEC 8024053C 0C048B77 */ jal func_80122DDC /* D6EEF0 80240540 84440008 */ lh $a0, 8($v0) /* D6EEF4 80240544 8E050028 */ lw $a1, 0x28($s0) @@ -33,7 +33,7 @@ glabel func_80240500_D6EEB0 /* D6EF20 80240570 46000007 */ neg.s $f0, $f0 /* D6EF24 80240574 44060000 */ mfc1 $a2, $f0 /* D6EF28 80240578 0C00B94E */ jal get_screen_coords -/* D6EF2C 8024057C 00000000 */ nop +/* D6EF2C 8024057C 00000000 */ nop /* D6EF30 80240580 8E0500A4 */ lw $a1, 0xa4($s0) /* D6EF34 80240584 3C063F80 */ lui $a2, 0x3f80 /* D6EF38 80240588 0C0B76A3 */ jal func_802DDA8C @@ -72,13 +72,13 @@ glabel func_80240500_D6EEB0 /* D6EFB8 80240608 AFA0001C */ sw $zero, 0x1c($sp) .L8024060C: /* D6EFBC 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D6EFC0 80240610 00000000 */ nop +/* D6EFC0 80240610 00000000 */ nop .L80240614: /* D6EFC4 80240614 9202000E */ lbu $v0, 0xe($s0) /* D6EFC8 80240618 3C01802E */ lui $at, %hi(D_802D9D71) /* D6EFCC 8024061C A0229D71 */ sb $v0, %lo(D_802D9D71)($at) /* D6EFD0 80240620 0809018C */ j .L80240630 -/* D6EFD4 80240624 00000000 */ nop +/* D6EFD4 80240624 00000000 */ nop .L80240628: /* D6EFD8 80240628 3C01802E */ lui $at, %hi(D_802D9D71) /* D6EFDC 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024068C_D6F03C.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024068C_D6F03C.s index 0caf1db00b..9da93f768a 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024068C_D6F03C.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024068C_D6F03C.s @@ -33,7 +33,7 @@ glabel func_8024068C_D6F03C /* D6F0AC 802406FC E7B40010 */ swc1 $f20, 0x10($sp) /* D6F0B0 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) /* D6F0B4 80240704 0C00A6C9 */ jal clamp_angle -/* D6F0B8 80240708 00000000 */ nop +/* D6F0B8 80240708 00000000 */ nop /* D6F0BC 8024070C 44050000 */ mfc1 $a1, $f0 /* D6F0C0 80240710 4406A000 */ mfc1 $a2, $f20 /* D6F0C4 80240714 4407A000 */ mfc1 $a3, $f20 @@ -95,16 +95,16 @@ glabel func_8024068C_D6F03C /* D6F1A4 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D6F1A8 802407F8 3C0142B4 */ lui $at, 0x42b4 /* D6F1AC 802407FC 44810000 */ mtc1 $at, $f0 -/* D6F1B0 80240800 00000000 */ nop +/* D6F1B0 80240800 00000000 */ nop /* D6F1B4 80240804 4602003E */ c.le.s $f0, $f2 -/* D6F1B8 80240808 00000000 */ nop +/* D6F1B8 80240808 00000000 */ nop /* D6F1BC 8024080C 4500000A */ bc1f .L80240838 /* D6F1C0 80240810 24040001 */ addiu $a0, $zero, 1 /* D6F1C4 80240814 3C014387 */ lui $at, 0x4387 /* D6F1C8 80240818 44810000 */ mtc1 $at, $f0 -/* D6F1CC 8024081C 00000000 */ nop +/* D6F1CC 8024081C 00000000 */ nop /* D6F1D0 80240820 4600103C */ c.lt.s $f2, $f0 -/* D6F1D4 80240824 00000000 */ nop +/* D6F1D4 80240824 00000000 */ nop /* D6F1D8 80240828 45000004 */ bc1f .L8024083C /* D6F1DC 8024082C 27A20018 */ addiu $v0, $sp, 0x18 /* D6F1E0 80240830 3C041000 */ lui $a0, 0x1000 diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240870_D6F220.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240870_D6F220.s index 22e899e6ee..b04318721a 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240870_D6F220.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240870_D6F220.s @@ -43,36 +43,36 @@ glabel func_80240870_D6F220 /* D6F2B4 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D6F2B8 80240908 3C0142B4 */ lui $at, 0x42b4 /* D6F2BC 8024090C 44810000 */ mtc1 $at, $f0 -/* D6F2C0 80240910 00000000 */ nop +/* D6F2C0 80240910 00000000 */ nop /* D6F2C4 80240914 4602003C */ c.lt.s $f0, $f2 -/* D6F2C8 80240918 00000000 */ nop +/* D6F2C8 80240918 00000000 */ nop /* D6F2CC 8024091C 4500000A */ bc1f .L80240948 -/* D6F2D0 80240920 00000000 */ nop +/* D6F2D0 80240920 00000000 */ nop /* D6F2D4 80240924 3C014334 */ lui $at, 0x4334 /* D6F2D8 80240928 44812000 */ mtc1 $at, $f4 -/* D6F2DC 8024092C 00000000 */ nop +/* D6F2DC 8024092C 00000000 */ nop /* D6F2E0 80240930 4604103E */ c.le.s $f2, $f4 -/* D6F2E4 80240934 00000000 */ nop +/* D6F2E4 80240934 00000000 */ nop /* D6F2E8 80240938 45000003 */ bc1f .L80240948 -/* D6F2EC 8024093C 00000000 */ nop +/* D6F2EC 8024093C 00000000 */ nop /* D6F2F0 80240940 08090276 */ j .L802409D8 /* D6F2F4 80240944 46022501 */ sub.s $f20, $f4, $f2 .L80240948: /* D6F2F8 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) /* D6F2FC 8024094C 3C014334 */ lui $at, 0x4334 /* D6F300 80240950 44812000 */ mtc1 $at, $f4 -/* D6F304 80240954 00000000 */ nop +/* D6F304 80240954 00000000 */ nop /* D6F308 80240958 4600203C */ c.lt.s $f4, $f0 -/* D6F30C 8024095C 00000000 */ nop +/* D6F30C 8024095C 00000000 */ nop /* D6F310 80240960 4500000C */ bc1f .L80240994 -/* D6F314 80240964 00000000 */ nop +/* D6F314 80240964 00000000 */ nop /* D6F318 80240968 3C014387 */ lui $at, 0x4387 /* D6F31C 8024096C 44812000 */ mtc1 $at, $f4 -/* D6F320 80240970 00000000 */ nop +/* D6F320 80240970 00000000 */ nop /* D6F324 80240974 4604003E */ c.le.s $f0, $f4 -/* D6F328 80240978 00000000 */ nop +/* D6F328 80240978 00000000 */ nop /* D6F32C 8024097C 45000008 */ bc1f .L802409A0 -/* D6F330 80240980 00000000 */ nop +/* D6F330 80240980 00000000 */ nop /* D6F334 80240984 3C014334 */ lui $at, 0x4334 /* D6F338 80240988 44812000 */ mtc1 $at, $f4 /* D6F33C 8024098C 08090276 */ j .L802409D8 @@ -80,19 +80,19 @@ glabel func_80240870_D6F220 .L80240994: /* D6F344 80240994 3C014387 */ lui $at, 0x4387 /* D6F348 80240998 44812000 */ mtc1 $at, $f4 -/* D6F34C 8024099C 00000000 */ nop +/* D6F34C 8024099C 00000000 */ nop .L802409A0: /* D6F350 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D6F354 802409A4 00000000 */ nop +/* D6F354 802409A4 00000000 */ nop /* D6F358 802409A8 4500000A */ bc1f .L802409D4 -/* D6F35C 802409AC 00000000 */ nop +/* D6F35C 802409AC 00000000 */ nop /* D6F360 802409B0 3C0143B4 */ lui $at, 0x43b4 /* D6F364 802409B4 44811000 */ mtc1 $at, $f2 -/* D6F368 802409B8 00000000 */ nop +/* D6F368 802409B8 00000000 */ nop /* D6F36C 802409BC 4602003E */ c.le.s $f0, $f2 -/* D6F370 802409C0 00000000 */ nop +/* D6F370 802409C0 00000000 */ nop /* D6F374 802409C4 45000003 */ bc1f .L802409D4 -/* D6F378 802409C8 00000000 */ nop +/* D6F378 802409C8 00000000 */ nop /* D6F37C 802409CC 08090276 */ j .L802409D8 /* D6F380 802409D0 46001501 */ sub.s $f20, $f2, $f0 .L802409D4: @@ -100,11 +100,11 @@ glabel func_80240870_D6F220 .L802409D8: /* D6F388 802409D8 3C0141C8 */ lui $at, 0x41c8 /* D6F38C 802409DC 44810000 */ mtc1 $at, $f0 -/* D6F390 802409E0 00000000 */ nop +/* D6F390 802409E0 00000000 */ nop /* D6F394 802409E4 4600A003 */ div.s $f0, $f20, $f0 /* D6F398 802409E8 4600010D */ trunc.w.s $f4, $f0 /* D6F39C 802409EC 44072000 */ mfc1 $a3, $f4 -/* D6F3A0 802409F0 00000000 */ nop +/* D6F3A0 802409F0 00000000 */ nop /* D6F3A4 802409F4 00071100 */ sll $v0, $a3, 4 /* D6F3A8 802409F8 00471023 */ subu $v0, $v0, $a3 /* D6F3AC 802409FC 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel func_80240870_D6F220 /* D6F3F4 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) /* D6F3F8 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) /* D6F3FC 80240A4C 0C00A6C9 */ jal clamp_angle -/* D6F400 80240A50 00000000 */ nop +/* D6F400 80240A50 00000000 */ nop /* D6F404 80240A54 44050000 */ mfc1 $a1, $f0 /* D6F408 80240A58 4406B000 */ mfc1 $a2, $f22 /* D6F40C 80240A5C 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel func_80240870_D6F220 /* D6F470 80240AC0 24040001 */ addiu $a0, $zero, 1 .L80240AC4: /* D6F474 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D6F478 80240AC8 00000000 */ nop +/* D6F478 80240AC8 00000000 */ nop /* D6F47C 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 /* D6F480 80240AD0 24040001 */ addiu $a0, $zero, 1 .L80240AD4: @@ -204,10 +204,10 @@ glabel func_80240870_D6F220 /* D6F510 80240B60 44812000 */ mtc1 $at, $f4 /* D6F514 80240B64 00021023 */ negu $v0, $v0 /* D6F518 80240B68 44820000 */ mtc1 $v0, $f0 -/* D6F51C 80240B6C 00000000 */ nop +/* D6F51C 80240B6C 00000000 */ nop /* D6F520 80240B70 46800020 */ cvt.s.w $f0, $f0 /* D6F524 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D6F528 80240B78 00000000 */ nop +/* D6F528 80240B78 00000000 */ nop /* D6F52C 80240B7C 4405B000 */ mfc1 $a1, $f22 /* D6F530 80240B80 4407B000 */ mfc1 $a3, $f22 /* D6F534 80240B84 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel func_80240870_D6F220 /* D6F5A4 80240BF4 3C013F00 */ lui $at, 0x3f00 /* D6F5A8 80240BF8 44812000 */ mtc1 $at, $f4 /* D6F5AC 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D6F5B0 80240C00 00000000 */ nop +/* D6F5B0 80240C00 00000000 */ nop /* D6F5B4 80240C04 46800020 */ cvt.s.w $f0, $f0 /* D6F5B8 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D6F5BC 80240C0C 00000000 */ nop +/* D6F5BC 80240C0C 00000000 */ nop /* D6F5C0 80240C10 4405B000 */ mfc1 $a1, $f22 /* D6F5C4 80240C14 4407B000 */ mfc1 $a3, $f22 /* D6F5C8 80240C18 44062000 */ mfc1 $a2, $f4 @@ -280,16 +280,16 @@ glabel func_80240870_D6F220 /* D6F640 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D6F644 80240C94 3C0142B4 */ lui $at, 0x42b4 /* D6F648 80240C98 44810000 */ mtc1 $at, $f0 -/* D6F64C 80240C9C 00000000 */ nop +/* D6F64C 80240C9C 00000000 */ nop /* D6F650 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D6F654 80240CA4 00000000 */ nop +/* D6F654 80240CA4 00000000 */ nop /* D6F658 80240CA8 4500000A */ bc1f .L80240CD4 /* D6F65C 80240CAC 24040001 */ addiu $a0, $zero, 1 /* D6F660 80240CB0 3C014387 */ lui $at, 0x4387 /* D6F664 80240CB4 44812000 */ mtc1 $at, $f4 -/* D6F668 80240CB8 00000000 */ nop +/* D6F668 80240CB8 00000000 */ nop /* D6F66C 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D6F670 80240CC0 00000000 */ nop +/* D6F670 80240CC0 00000000 */ nop /* D6F674 80240CC4 45000004 */ bc1f .L80240CD8 /* D6F678 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 /* D6F67C 80240CCC 3C041000 */ lui $a0, 0x1000 @@ -305,7 +305,7 @@ glabel func_80240870_D6F220 /* D6F69C 80240CEC 26730001 */ addiu $s3, $s3, 1 /* D6F6A0 80240CF0 2A620002 */ slti $v0, $s3, 2 /* D6F6A4 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D6F6A8 80240CF8 00000000 */ nop +/* D6F6A8 80240CF8 00000000 */ nop /* D6F6AC 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) /* D6F6B0 80240D00 8FB60148 */ lw $s6, 0x148($sp) /* D6F6B4 80240D04 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240D3C_D6F6EC.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240D3C_D6F6EC.s index 438ab003ce..c4a077ed95 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240D3C_D6F6EC.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240D3C_D6F6EC.s @@ -11,36 +11,36 @@ glabel func_80240D3C_D6F6EC /* D6F704 80240D54 24020001 */ addiu $v0, $zero, 1 /* D6F708 80240D58 8E030084 */ lw $v1, 0x84($s0) /* D6F70C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D6F710 80240D60 00000000 */ nop +/* D6F710 80240D60 00000000 */ nop /* D6F714 80240D64 28620002 */ slti $v0, $v1, 2 /* D6F718 80240D68 50400005 */ beql $v0, $zero, .L80240D80 /* D6F71C 80240D6C 24020002 */ addiu $v0, $zero, 2 /* D6F720 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D6F724 80240D74 00000000 */ nop +/* D6F724 80240D74 00000000 */ nop /* D6F728 80240D78 08090378 */ j .L80240DE0 -/* D6F72C 80240D7C 00000000 */ nop +/* D6F72C 80240D7C 00000000 */ nop .L80240D80: /* D6F730 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D6F734 80240D84 00000000 */ nop +/* D6F734 80240D84 00000000 */ nop /* D6F738 80240D88 08090378 */ j .L80240DE0 -/* D6F73C 80240D8C 00000000 */ nop +/* D6F73C 80240D8C 00000000 */ nop .L80240D90: /* D6F740 80240D90 3C048024 */ lui $a0, %hi(pra_19_SetPartnerFlagsA0000) /* D6F744 80240D94 24840E84 */ addiu $a0, $a0, %lo(pra_19_SetPartnerFlagsA0000) /* D6F748 80240D98 08090374 */ j .L80240DD0 -/* D6F74C 80240D9C 00000000 */ nop +/* D6F74C 80240D9C 00000000 */ nop .L80240DA0: /* D6F750 80240DA0 3C048024 */ lui $a0, %hi(pra_19_SetPartnerFlags20000) /* D6F754 80240DA4 24840EEC */ addiu $a0, $a0, %lo(pra_19_SetPartnerFlags20000) /* D6F758 80240DA8 08090374 */ j .L80240DD0 -/* D6F75C 80240DAC 00000000 */ nop +/* D6F75C 80240DAC 00000000 */ nop .L80240DB0: /* D6F760 80240DB0 8E020084 */ lw $v0, 0x84($s0) /* D6F764 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D6F768 80240DB8 00000000 */ nop +/* D6F768 80240DB8 00000000 */ nop /* D6F76C 80240DBC 28420002 */ slti $v0, $v0, 2 /* D6F770 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D6F774 80240DC4 00000000 */ nop +/* D6F774 80240DC4 00000000 */ nop .L80240DC8: /* D6F778 80240DC8 3C048024 */ lui $a0, %hi(pra_19_SetPartnerFlags80000) /* D6F77C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(pra_19_SetPartnerFlags80000) @@ -64,14 +64,14 @@ glabel func_80240D3C_D6F6EC /* D6F7BC 80240E0C 10400005 */ beqz $v0, .L80240E24 /* D6F7C0 80240E10 24020002 */ addiu $v0, $zero, 2 /* D6F7C4 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D6F7C8 80240E18 00000000 */ nop +/* D6F7C8 80240E18 00000000 */ nop /* D6F7CC 80240E1C 0809039D */ j .L80240E74 -/* D6F7D0 80240E20 00000000 */ nop +/* D6F7D0 80240E20 00000000 */ nop .L80240E24: /* D6F7D4 80240E24 10820006 */ beq $a0, $v0, .L80240E40 /* D6F7D8 80240E28 24020002 */ addiu $v0, $zero, 2 /* D6F7DC 80240E2C 0809039D */ j .L80240E74 -/* D6F7E0 80240E30 00000000 */ nop +/* D6F7E0 80240E30 00000000 */ nop .L80240E34: /* D6F7E4 80240E34 8CA20000 */ lw $v0, ($a1) /* D6F7E8 80240E38 0809039A */ j .L80240E68 diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802411D8_D6FB88.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802411D8_D6FB88.s index 9a34e4c573..16e774ca77 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802411D8_D6FB88.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802411D8_D6FB88.s @@ -28,7 +28,7 @@ glabel func_802411D8_D6FB88 /* D6FBDC 8024122C 00220821 */ addu $at, $at, $v0 /* D6FBE0 80241230 AC2079F0 */ sw $zero, %lo(D_802479F0)($at) /* D6FBE4 80241234 08090499 */ j .L80241264 -/* D6FBE8 80241238 00000000 */ nop +/* D6FBE8 80241238 00000000 */ nop .L8024123C: /* D6FBEC 8024123C 3C038024 */ lui $v1, %hi(D_802479F0) /* D6FBF0 80241240 246379F0 */ addiu $v1, $v1, %lo(D_802479F0) diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241274_D6FC24.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241274_D6FC24.s index 699a12c7a7..aef93e52cd 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241274_D6FC24.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241274_D6FC24.s @@ -28,7 +28,7 @@ glabel func_80241274_D6FC24 /* D6FC78 802412C8 00220821 */ addu $at, $at, $v0 /* D6FC7C 802412CC AC207BB8 */ sw $zero, %lo(D_80247BB8)($at) /* D6FC80 802412D0 080904C0 */ j .L80241300 -/* D6FC84 802412D4 00000000 */ nop +/* D6FC84 802412D4 00000000 */ nop .L802412D8: /* D6FC88 802412D8 3C038024 */ lui $v1, %hi(D_80247BB8) /* D6FC8C 802412DC 24637BB8 */ addiu $v1, $v1, %lo(D_80247BB8) diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241310_D6FCC0.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241310_D6FCC0.s index 2d787fe6e8..ccd620566d 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241310_D6FCC0.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241310_D6FCC0.s @@ -22,14 +22,14 @@ glabel func_80241310_D6FCC0 /* D6FD04 80241354 0C0B1EAF */ jal get_variable /* D6FD08 80241358 0040802D */ daddu $s0, $v0, $zero /* D6FD0C 8024135C 44926000 */ mtc1 $s2, $f12 -/* D6FD10 80241360 00000000 */ nop +/* D6FD10 80241360 00000000 */ nop /* D6FD14 80241364 46806320 */ cvt.s.w $f12, $f12 /* D6FD18 80241368 44820000 */ mtc1 $v0, $f0 -/* D6FD1C 8024136C 00000000 */ nop +/* D6FD1C 8024136C 00000000 */ nop /* D6FD20 80241370 46800020 */ cvt.s.w $f0, $f0 /* D6FD24 80241374 44060000 */ mfc1 $a2, $f0 /* D6FD28 80241378 44907000 */ mtc1 $s0, $f14 -/* D6FD2C 8024137C 00000000 */ nop +/* D6FD2C 8024137C 00000000 */ nop /* D6FD30 80241380 0C01BE3C */ jal func_8006F8F0 /* D6FD34 80241384 468073A0 */ cvt.s.w $f14, $f14 /* D6FD38 80241388 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802413A4_D6FD54.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802413A4_D6FD54.s index 813e28f99e..4d90c66fe3 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802413A4_D6FD54.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802413A4_D6FD54.s @@ -40,23 +40,23 @@ glabel func_802413A4_D6FD54 .L80241428: /* D6FDD8 80241428 24020002 */ addiu $v0, $zero, 2 /* D6FDDC 8024142C 12220016 */ beq $s1, $v0, .L80241488 -/* D6FDE0 80241430 00000000 */ nop +/* D6FDE0 80241430 00000000 */ nop /* D6FDE4 80241434 2A220003 */ slti $v0, $s1, 3 /* D6FDE8 80241438 10400005 */ beqz $v0, .L80241450 /* D6FDEC 8024143C 24020001 */ addiu $v0, $zero, 1 /* D6FDF0 80241440 1222000B */ beq $s1, $v0, .L80241470 -/* D6FDF4 80241444 00000000 */ nop +/* D6FDF4 80241444 00000000 */ nop /* D6FDF8 80241448 08090534 */ j .L802414D0 -/* D6FDFC 8024144C 00000000 */ nop +/* D6FDFC 8024144C 00000000 */ nop .L80241450: /* D6FE00 80241450 24020003 */ addiu $v0, $zero, 3 /* D6FE04 80241454 12220012 */ beq $s1, $v0, .L802414A0 -/* D6FE08 80241458 00000000 */ nop +/* D6FE08 80241458 00000000 */ nop /* D6FE0C 8024145C 24020004 */ addiu $v0, $zero, 4 /* D6FE10 80241460 12220015 */ beq $s1, $v0, .L802414B8 -/* D6FE14 80241464 00000000 */ nop +/* D6FE14 80241464 00000000 */ nop /* D6FE18 80241468 08090534 */ j .L802414D0 -/* D6FE1C 8024146C 00000000 */ nop +/* D6FE1C 8024146C 00000000 */ nop .L80241470: /* D6FE20 80241470 82620004 */ lb $v0, 4($s3) /* D6FE24 80241474 00021080 */ sll $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241530_D6FEE0.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241530_D6FEE0.s index 44b7f493ad..6dcc65bf21 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241530_D6FEE0.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241530_D6FEE0.s @@ -29,7 +29,7 @@ glabel func_80241530_D6FEE0 /* D6FF40 80241590 46000007 */ neg.s $f0, $f0 /* D6FF44 80241594 44070000 */ mfc1 $a3, $f0 /* D6FF48 80241598 0C00B94E */ jal get_screen_coords -/* D6FF4C 8024159C 00000000 */ nop +/* D6FF4C 8024159C 00000000 */ nop /* D6FF50 802415A0 0220202D */ daddu $a0, $s1, $zero /* D6FF54 802415A4 820500AA */ lb $a1, 0xaa($s0) /* D6FF58 802415A8 8FA30038 */ lw $v1, 0x38($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024175C_D7010C.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024175C_D7010C.s index b30b9705bf..639d78019d 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024175C_D7010C.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024175C_D7010C.s @@ -26,27 +26,27 @@ glabel func_8024175C_D7010C /* D70160 802417B0 C422EFF0 */ lwc1 $f2, %lo(gPlayerStatus+0x28)($at) /* D70164 802417B4 C6000038 */ lwc1 $f0, 0x38($s0) /* D70168 802417B8 4602003C */ c.lt.s $f0, $f2 -/* D7016C 802417BC 00000000 */ nop +/* D7016C 802417BC 00000000 */ nop /* D70170 802417C0 45030016 */ bc1tl .L8024181C /* D70174 802417C4 24020002 */ addiu $v0, $zero, 2 /* D70178 802417C8 C6200038 */ lwc1 $f0, 0x38($s1) /* D7017C 802417CC 4602003C */ c.lt.s $f0, $f2 -/* D70180 802417D0 00000000 */ nop +/* D70180 802417D0 00000000 */ nop /* D70184 802417D4 45030011 */ bc1tl .L8024181C /* D70188 802417D8 24020002 */ addiu $v0, $zero, 2 /* D7018C 802417DC C6400038 */ lwc1 $f0, 0x38($s2) /* D70190 802417E0 4602003C */ c.lt.s $f0, $f2 -/* D70194 802417E4 00000000 */ nop +/* D70194 802417E4 00000000 */ nop /* D70198 802417E8 4503000C */ bc1tl .L8024181C /* D7019C 802417EC 24020002 */ addiu $v0, $zero, 2 /* D701A0 802417F0 C6600038 */ lwc1 $f0, 0x38($s3) /* D701A4 802417F4 4602003C */ c.lt.s $f0, $f2 -/* D701A8 802417F8 00000000 */ nop +/* D701A8 802417F8 00000000 */ nop /* D701AC 802417FC 45030007 */ bc1tl .L8024181C /* D701B0 80241800 24020002 */ addiu $v0, $zero, 2 /* D701B4 80241804 C4400038 */ lwc1 $f0, 0x38($v0) /* D701B8 80241808 4602003C */ c.lt.s $f0, $f2 -/* D701BC 8024180C 00000000 */ nop +/* D701BC 8024180C 00000000 */ nop /* D701C0 80241810 45010002 */ bc1t .L8024181C /* D701C4 80241814 24020002 */ addiu $v0, $zero, 2 /* D701C8 80241818 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241838_D701E8.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241838_D701E8.s index e1de75258e..cd6e431148 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241838_D701E8.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241838_D701E8.s @@ -33,7 +33,7 @@ glabel func_80241838_D701E8 /* D70258 802418A8 C64000AC */ lwc1 $f0, 0xac($s2) /* D7025C 802418AC 46800020 */ cvt.s.w $f0, $f0 /* D70260 802418B0 4600103C */ c.lt.s $f2, $f0 -/* D70264 802418B4 00000000 */ nop +/* D70264 802418B4 00000000 */ nop /* D70268 802418B8 45000003 */ bc1f .L802418C8 /* D7026C 802418BC 24020001 */ addiu $v0, $zero, 1 /* D70270 802418C0 08090633 */ j .L802418CC @@ -43,12 +43,12 @@ glabel func_80241838_D701E8 .L802418CC: /* D7027C 802418CC 8E4200B8 */ lw $v0, 0xb8($s2) /* D70280 802418D0 1440000C */ bnez $v0, .L80241904 -/* D70284 802418D4 00000000 */ nop +/* D70284 802418D4 00000000 */ nop /* D70288 802418D8 C6620038 */ lwc1 $f2, 0x38($s3) /* D7028C 802418DC C64000AC */ lwc1 $f0, 0xac($s2) /* D70290 802418E0 46800020 */ cvt.s.w $f0, $f0 /* D70294 802418E4 4602003E */ c.le.s $f0, $f2 -/* D70298 802418E8 00000000 */ nop +/* D70298 802418E8 00000000 */ nop /* D7029C 802418EC 4503000D */ bc1tl .L80241924 /* D702A0 802418F0 E6600038 */ swc1 $f0, 0x38($s3) /* D702A4 802418F4 C64000B0 */ lwc1 $f0, 0xb0($s2) @@ -60,9 +60,9 @@ glabel func_80241838_D701E8 /* D702B8 80241908 C64000AC */ lwc1 $f0, 0xac($s2) /* D702BC 8024190C 46800020 */ cvt.s.w $f0, $f0 /* D702C0 80241910 4600103E */ c.le.s $f2, $f0 -/* D702C4 80241914 00000000 */ nop +/* D702C4 80241914 00000000 */ nop /* D702C8 80241918 45000004 */ bc1f .L8024192C -/* D702CC 8024191C 00000000 */ nop +/* D702CC 8024191C 00000000 */ nop /* D702D0 80241920 E6600038 */ swc1 $f0, 0x38($s3) .L80241924: /* D702D4 80241924 08090662 */ j .L80241988 @@ -75,7 +75,7 @@ glabel func_80241838_D701E8 /* D702E8 80241938 E6600038 */ swc1 $f0, 0x38($s3) /* D702EC 8024193C 8E4200B4 */ lw $v0, 0xb4($s2) /* D702F0 80241940 14400009 */ bnez $v0, .L80241968 -/* D702F4 80241944 00000000 */ nop +/* D702F4 80241944 00000000 */ nop /* D702F8 80241948 8E4200B0 */ lw $v0, 0xb0($s2) /* D702FC 8024194C 24420002 */ addiu $v0, $v0, 2 /* D70300 80241950 AE4200B0 */ sw $v0, 0xb0($s2) @@ -103,6 +103,6 @@ glabel func_80241838_D701E8 /* D70348 80241998 8FB00010 */ lw $s0, 0x10($sp) /* D7034C 8024199C 03E00008 */ jr $ra /* D70350 802419A0 27BD0028 */ addiu $sp, $sp, 0x28 -/* D70354 802419A4 00000000 */ nop -/* D70358 802419A8 00000000 */ nop -/* D7035C 802419AC 00000000 */ nop +/* D70354 802419A4 00000000 */ nop +/* D70358 802419A8 00000000 */ nop +/* D7035C 802419AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240054_D763F4.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240054_D763F4.s index e41cc91121..7b28e33572 100644 --- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240054_D763F4.s +++ b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240054_D763F4.s @@ -40,7 +40,7 @@ glabel func_80240054_D763F4 /* D76470 802400D0 1440FFF7 */ bnez $v0, .L802400B0 /* D76474 802400D4 24820001 */ addiu $v0, $a0, 1 /* D76478 802400D8 03E00008 */ jr $ra -/* D7647C 802400DC 00000000 */ nop +/* D7647C 802400DC 00000000 */ nop .L802400E0: /* D76480 802400E0 3C020100 */ lui $v0, 0x100 .L802400E4: diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s index 7db96d6b17..3900a7c655 100644 --- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s +++ b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s @@ -16,7 +16,7 @@ glabel func_80240128_D764C8 /* D764F4 80240154 27B20020 */ addiu $s2, $sp, 0x20 /* D764F8 80240158 8E0400CC */ lw $a0, 0xcc($s0) /* D764FC 8024015C 0C044181 */ jal get_shadow_by_index -/* D76500 80240160 00000000 */ nop +/* D76500 80240160 00000000 */ nop /* D76504 80240164 0C048B77 */ jal func_80122DDC /* D76508 80240168 84440008 */ lh $a0, 8($v0) /* D7650C 8024016C 8C430000 */ lw $v1, ($v0) @@ -38,22 +38,22 @@ glabel func_80240128_D764C8 /* D7654C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D76550 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) /* D76554 802401B4 0C090008 */ jal pra_20_UnkFunc2 -/* D76558 802401B8 00000000 */ nop +/* D76558 802401B8 00000000 */ nop /* D7655C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D76560 802401C0 3C014307 */ lui $at, 0x4307 /* D76564 802401C4 44810000 */ mtc1 $at, $f0 -/* D76568 802401C8 00000000 */ nop +/* D76568 802401C8 00000000 */ nop /* D7656C 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D76570 802401D0 00000000 */ nop +/* D76570 802401D0 00000000 */ nop /* D76574 802401D4 4500000B */ bc1f .L80240204 /* D76578 802401D8 24040002 */ addiu $a0, $zero, 2 /* D7657C 802401DC 3C014361 */ lui $at, 0x4361 /* D76580 802401E0 44810000 */ mtc1 $at, $f0 -/* D76584 802401E4 00000000 */ nop +/* D76584 802401E4 00000000 */ nop /* D76588 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D7658C 802401EC 00000000 */ nop +/* D7658C 802401EC 00000000 */ nop /* D76590 802401F0 45000004 */ bc1f .L80240204 -/* D76594 802401F4 00000000 */ nop +/* D76594 802401F4 00000000 */ nop /* D76598 802401F8 0C090015 */ jal func_80240054_D763F4 /* D7659C 802401FC 0040202D */ daddu $a0, $v0, $zero /* D765A0 80240200 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240128_D764C8 /* D76628 80240288 AFA0001C */ sw $zero, 0x1c($sp) .L8024028C: /* D7662C 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D76630 80240290 00000000 */ nop +/* D76630 80240290 00000000 */ nop .L80240294: /* D76634 80240294 9202000E */ lbu $v0, 0xe($s0) /* D76638 80240298 3C01802E */ lui $at, %hi(D_802D9D70) diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_802402F0_D76690.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_802402F0_D76690.s index ed53d27add..d4d7e1aac0 100644 --- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_802402F0_D76690.s +++ b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_802402F0_D76690.s @@ -33,7 +33,7 @@ glabel func_802402F0_D76690 /* D76700 80240360 E7B40010 */ swc1 $f20, 0x10($sp) /* D76704 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) /* D76708 80240368 0C00A6C9 */ jal clamp_angle -/* D7670C 8024036C 00000000 */ nop +/* D7670C 8024036C 00000000 */ nop /* D76710 80240370 44050000 */ mfc1 $a1, $f0 /* D76714 80240374 4406A000 */ mfc1 $a2, $f20 /* D76718 80240378 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_8024049C_D7683C.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_8024049C_D7683C.s index b4bc5bdf11..2cbb099de7 100644 --- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_8024049C_D7683C.s +++ b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_8024049C_D7683C.s @@ -10,7 +10,7 @@ glabel func_8024049C_D7683C /* D76850 802404B0 0440000E */ bltz $v0, .L802404EC /* D76854 802404B4 28420002 */ slti $v0, $v0, 2 /* D76858 802404B8 1040000C */ beqz $v0, .L802404EC -/* D7685C 802404BC 00000000 */ nop +/* D7685C 802404BC 00000000 */ nop /* D76860 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D768A0) /* D76864 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D768A0) /* D76868 802404C8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240500_D768A0.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240500_D768A0.s index 9e9922f58a..6c7e09013c 100644 --- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240500_D768A0.s +++ b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240500_D768A0.s @@ -16,7 +16,7 @@ glabel func_80240500_D768A0 /* D768CC 8024052C 27B10020 */ addiu $s1, $sp, 0x20 /* D768D0 80240530 8E0400CC */ lw $a0, 0xcc($s0) /* D768D4 80240534 0C044181 */ jal get_shadow_by_index -/* D768D8 80240538 00000000 */ nop +/* D768D8 80240538 00000000 */ nop /* D768DC 8024053C 0C048B77 */ jal func_80122DDC /* D768E0 80240540 84440008 */ lh $a0, 8($v0) /* D768E4 80240544 8E050028 */ lw $a1, 0x28($s0) @@ -33,7 +33,7 @@ glabel func_80240500_D768A0 /* D76910 80240570 46000007 */ neg.s $f0, $f0 /* D76914 80240574 44060000 */ mfc1 $a2, $f0 /* D76918 80240578 0C00B94E */ jal get_screen_coords -/* D7691C 8024057C 00000000 */ nop +/* D7691C 8024057C 00000000 */ nop /* D76920 80240580 8E0500A4 */ lw $a1, 0xa4($s0) /* D76924 80240584 3C063F80 */ lui $a2, 0x3f80 /* D76928 80240588 0C0B76A3 */ jal func_802DDA8C @@ -72,13 +72,13 @@ glabel func_80240500_D768A0 /* D769A8 80240608 AFA0001C */ sw $zero, 0x1c($sp) .L8024060C: /* D769AC 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D769B0 80240610 00000000 */ nop +/* D769B0 80240610 00000000 */ nop .L80240614: /* D769B4 80240614 9202000E */ lbu $v0, 0xe($s0) /* D769B8 80240618 3C01802E */ lui $at, %hi(D_802D9D71) /* D769BC 8024061C A0229D71 */ sb $v0, %lo(D_802D9D71)($at) /* D769C0 80240620 0809018C */ j .L80240630 -/* D769C4 80240624 00000000 */ nop +/* D769C4 80240624 00000000 */ nop .L80240628: /* D769C8 80240628 3C01802E */ lui $at, %hi(D_802D9D71) /* D769CC 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_8024068C_D76A2C.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_8024068C_D76A2C.s index 3294175959..8478c0d48a 100644 --- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_8024068C_D76A2C.s +++ b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_8024068C_D76A2C.s @@ -33,7 +33,7 @@ glabel func_8024068C_D76A2C /* D76A9C 802406FC E7B40010 */ swc1 $f20, 0x10($sp) /* D76AA0 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) /* D76AA4 80240704 0C00A6C9 */ jal clamp_angle -/* D76AA8 80240708 00000000 */ nop +/* D76AA8 80240708 00000000 */ nop /* D76AAC 8024070C 44050000 */ mfc1 $a1, $f0 /* D76AB0 80240710 4406A000 */ mfc1 $a2, $f20 /* D76AB4 80240714 4407A000 */ mfc1 $a3, $f20 @@ -95,16 +95,16 @@ glabel func_8024068C_D76A2C /* D76B94 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D76B98 802407F8 3C0142B4 */ lui $at, 0x42b4 /* D76B9C 802407FC 44810000 */ mtc1 $at, $f0 -/* D76BA0 80240800 00000000 */ nop +/* D76BA0 80240800 00000000 */ nop /* D76BA4 80240804 4602003E */ c.le.s $f0, $f2 -/* D76BA8 80240808 00000000 */ nop +/* D76BA8 80240808 00000000 */ nop /* D76BAC 8024080C 4500000A */ bc1f .L80240838 /* D76BB0 80240810 24040001 */ addiu $a0, $zero, 1 /* D76BB4 80240814 3C014387 */ lui $at, 0x4387 /* D76BB8 80240818 44810000 */ mtc1 $at, $f0 -/* D76BBC 8024081C 00000000 */ nop +/* D76BBC 8024081C 00000000 */ nop /* D76BC0 80240820 4600103C */ c.lt.s $f2, $f0 -/* D76BC4 80240824 00000000 */ nop +/* D76BC4 80240824 00000000 */ nop /* D76BC8 80240828 45000004 */ bc1f .L8024083C /* D76BCC 8024082C 27A20018 */ addiu $v0, $sp, 0x18 /* D76BD0 80240830 3C041000 */ lui $a0, 0x1000 diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240870_D76C10.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240870_D76C10.s index 3636d74b52..e91022a1b4 100644 --- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240870_D76C10.s +++ b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240870_D76C10.s @@ -43,36 +43,36 @@ glabel func_80240870_D76C10 /* D76CA4 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D76CA8 80240908 3C0142B4 */ lui $at, 0x42b4 /* D76CAC 8024090C 44810000 */ mtc1 $at, $f0 -/* D76CB0 80240910 00000000 */ nop +/* D76CB0 80240910 00000000 */ nop /* D76CB4 80240914 4602003C */ c.lt.s $f0, $f2 -/* D76CB8 80240918 00000000 */ nop +/* D76CB8 80240918 00000000 */ nop /* D76CBC 8024091C 4500000A */ bc1f .L80240948 -/* D76CC0 80240920 00000000 */ nop +/* D76CC0 80240920 00000000 */ nop /* D76CC4 80240924 3C014334 */ lui $at, 0x4334 /* D76CC8 80240928 44812000 */ mtc1 $at, $f4 -/* D76CCC 8024092C 00000000 */ nop +/* D76CCC 8024092C 00000000 */ nop /* D76CD0 80240930 4604103E */ c.le.s $f2, $f4 -/* D76CD4 80240934 00000000 */ nop +/* D76CD4 80240934 00000000 */ nop /* D76CD8 80240938 45000003 */ bc1f .L80240948 -/* D76CDC 8024093C 00000000 */ nop +/* D76CDC 8024093C 00000000 */ nop /* D76CE0 80240940 08090276 */ j .L802409D8 /* D76CE4 80240944 46022501 */ sub.s $f20, $f4, $f2 .L80240948: /* D76CE8 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) /* D76CEC 8024094C 3C014334 */ lui $at, 0x4334 /* D76CF0 80240950 44812000 */ mtc1 $at, $f4 -/* D76CF4 80240954 00000000 */ nop +/* D76CF4 80240954 00000000 */ nop /* D76CF8 80240958 4600203C */ c.lt.s $f4, $f0 -/* D76CFC 8024095C 00000000 */ nop +/* D76CFC 8024095C 00000000 */ nop /* D76D00 80240960 4500000C */ bc1f .L80240994 -/* D76D04 80240964 00000000 */ nop +/* D76D04 80240964 00000000 */ nop /* D76D08 80240968 3C014387 */ lui $at, 0x4387 /* D76D0C 8024096C 44812000 */ mtc1 $at, $f4 -/* D76D10 80240970 00000000 */ nop +/* D76D10 80240970 00000000 */ nop /* D76D14 80240974 4604003E */ c.le.s $f0, $f4 -/* D76D18 80240978 00000000 */ nop +/* D76D18 80240978 00000000 */ nop /* D76D1C 8024097C 45000008 */ bc1f .L802409A0 -/* D76D20 80240980 00000000 */ nop +/* D76D20 80240980 00000000 */ nop /* D76D24 80240984 3C014334 */ lui $at, 0x4334 /* D76D28 80240988 44812000 */ mtc1 $at, $f4 /* D76D2C 8024098C 08090276 */ j .L802409D8 @@ -80,19 +80,19 @@ glabel func_80240870_D76C10 .L80240994: /* D76D34 80240994 3C014387 */ lui $at, 0x4387 /* D76D38 80240998 44812000 */ mtc1 $at, $f4 -/* D76D3C 8024099C 00000000 */ nop +/* D76D3C 8024099C 00000000 */ nop .L802409A0: /* D76D40 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D76D44 802409A4 00000000 */ nop +/* D76D44 802409A4 00000000 */ nop /* D76D48 802409A8 4500000A */ bc1f .L802409D4 -/* D76D4C 802409AC 00000000 */ nop +/* D76D4C 802409AC 00000000 */ nop /* D76D50 802409B0 3C0143B4 */ lui $at, 0x43b4 /* D76D54 802409B4 44811000 */ mtc1 $at, $f2 -/* D76D58 802409B8 00000000 */ nop +/* D76D58 802409B8 00000000 */ nop /* D76D5C 802409BC 4602003E */ c.le.s $f0, $f2 -/* D76D60 802409C0 00000000 */ nop +/* D76D60 802409C0 00000000 */ nop /* D76D64 802409C4 45000003 */ bc1f .L802409D4 -/* D76D68 802409C8 00000000 */ nop +/* D76D68 802409C8 00000000 */ nop /* D76D6C 802409CC 08090276 */ j .L802409D8 /* D76D70 802409D0 46001501 */ sub.s $f20, $f2, $f0 .L802409D4: @@ -100,11 +100,11 @@ glabel func_80240870_D76C10 .L802409D8: /* D76D78 802409D8 3C0141C8 */ lui $at, 0x41c8 /* D76D7C 802409DC 44810000 */ mtc1 $at, $f0 -/* D76D80 802409E0 00000000 */ nop +/* D76D80 802409E0 00000000 */ nop /* D76D84 802409E4 4600A003 */ div.s $f0, $f20, $f0 /* D76D88 802409E8 4600010D */ trunc.w.s $f4, $f0 /* D76D8C 802409EC 44072000 */ mfc1 $a3, $f4 -/* D76D90 802409F0 00000000 */ nop +/* D76D90 802409F0 00000000 */ nop /* D76D94 802409F4 00071100 */ sll $v0, $a3, 4 /* D76D98 802409F8 00471023 */ subu $v0, $v0, $a3 /* D76D9C 802409FC 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel func_80240870_D76C10 /* D76DE4 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) /* D76DE8 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) /* D76DEC 80240A4C 0C00A6C9 */ jal clamp_angle -/* D76DF0 80240A50 00000000 */ nop +/* D76DF0 80240A50 00000000 */ nop /* D76DF4 80240A54 44050000 */ mfc1 $a1, $f0 /* D76DF8 80240A58 4406B000 */ mfc1 $a2, $f22 /* D76DFC 80240A5C 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel func_80240870_D76C10 /* D76E60 80240AC0 24040001 */ addiu $a0, $zero, 1 .L80240AC4: /* D76E64 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D76E68 80240AC8 00000000 */ nop +/* D76E68 80240AC8 00000000 */ nop /* D76E6C 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 /* D76E70 80240AD0 24040001 */ addiu $a0, $zero, 1 .L80240AD4: @@ -204,10 +204,10 @@ glabel func_80240870_D76C10 /* D76F00 80240B60 44812000 */ mtc1 $at, $f4 /* D76F04 80240B64 00021023 */ negu $v0, $v0 /* D76F08 80240B68 44820000 */ mtc1 $v0, $f0 -/* D76F0C 80240B6C 00000000 */ nop +/* D76F0C 80240B6C 00000000 */ nop /* D76F10 80240B70 46800020 */ cvt.s.w $f0, $f0 /* D76F14 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D76F18 80240B78 00000000 */ nop +/* D76F18 80240B78 00000000 */ nop /* D76F1C 80240B7C 4405B000 */ mfc1 $a1, $f22 /* D76F20 80240B80 4407B000 */ mfc1 $a3, $f22 /* D76F24 80240B84 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel func_80240870_D76C10 /* D76F94 80240BF4 3C013F00 */ lui $at, 0x3f00 /* D76F98 80240BF8 44812000 */ mtc1 $at, $f4 /* D76F9C 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D76FA0 80240C00 00000000 */ nop +/* D76FA0 80240C00 00000000 */ nop /* D76FA4 80240C04 46800020 */ cvt.s.w $f0, $f0 /* D76FA8 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D76FAC 80240C0C 00000000 */ nop +/* D76FAC 80240C0C 00000000 */ nop /* D76FB0 80240C10 4405B000 */ mfc1 $a1, $f22 /* D76FB4 80240C14 4407B000 */ mfc1 $a3, $f22 /* D76FB8 80240C18 44062000 */ mfc1 $a2, $f4 @@ -280,16 +280,16 @@ glabel func_80240870_D76C10 /* D77030 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D77034 80240C94 3C0142B4 */ lui $at, 0x42b4 /* D77038 80240C98 44810000 */ mtc1 $at, $f0 -/* D7703C 80240C9C 00000000 */ nop +/* D7703C 80240C9C 00000000 */ nop /* D77040 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D77044 80240CA4 00000000 */ nop +/* D77044 80240CA4 00000000 */ nop /* D77048 80240CA8 4500000A */ bc1f .L80240CD4 /* D7704C 80240CAC 24040001 */ addiu $a0, $zero, 1 /* D77050 80240CB0 3C014387 */ lui $at, 0x4387 /* D77054 80240CB4 44812000 */ mtc1 $at, $f4 -/* D77058 80240CB8 00000000 */ nop +/* D77058 80240CB8 00000000 */ nop /* D7705C 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D77060 80240CC0 00000000 */ nop +/* D77060 80240CC0 00000000 */ nop /* D77064 80240CC4 45000004 */ bc1f .L80240CD8 /* D77068 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 /* D7706C 80240CCC 3C041000 */ lui $a0, 0x1000 @@ -305,7 +305,7 @@ glabel func_80240870_D76C10 /* D7708C 80240CEC 26730001 */ addiu $s3, $s3, 1 /* D77090 80240CF0 2A620002 */ slti $v0, $s3, 2 /* D77094 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D77098 80240CF8 00000000 */ nop +/* D77098 80240CF8 00000000 */ nop /* D7709C 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) /* D770A0 80240D00 8FB60148 */ lw $s6, 0x148($sp) /* D770A4 80240D04 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240D3C_D770DC.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240D3C_D770DC.s index 41128f0d47..155e973979 100644 --- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240D3C_D770DC.s +++ b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240D3C_D770DC.s @@ -11,36 +11,36 @@ glabel func_80240D3C_D770DC /* D770F4 80240D54 24020001 */ addiu $v0, $zero, 1 /* D770F8 80240D58 8E030084 */ lw $v1, 0x84($s0) /* D770FC 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D77100 80240D60 00000000 */ nop +/* D77100 80240D60 00000000 */ nop /* D77104 80240D64 28620002 */ slti $v0, $v1, 2 /* D77108 80240D68 50400005 */ beql $v0, $zero, .L80240D80 /* D7710C 80240D6C 24020002 */ addiu $v0, $zero, 2 /* D77110 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D77114 80240D74 00000000 */ nop +/* D77114 80240D74 00000000 */ nop /* D77118 80240D78 08090378 */ j .L80240DE0 -/* D7711C 80240D7C 00000000 */ nop +/* D7711C 80240D7C 00000000 */ nop .L80240D80: /* D77120 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D77124 80240D84 00000000 */ nop +/* D77124 80240D84 00000000 */ nop /* D77128 80240D88 08090378 */ j .L80240DE0 -/* D7712C 80240D8C 00000000 */ nop +/* D7712C 80240D8C 00000000 */ nop .L80240D90: /* D77130 80240D90 3C048024 */ lui $a0, %hi(pra_20_SetPartnerFlagsA0000) /* D77134 80240D94 24840E84 */ addiu $a0, $a0, %lo(pra_20_SetPartnerFlagsA0000) /* D77138 80240D98 08090374 */ j .L80240DD0 -/* D7713C 80240D9C 00000000 */ nop +/* D7713C 80240D9C 00000000 */ nop .L80240DA0: /* D77140 80240DA0 3C048024 */ lui $a0, %hi(pra_20_SetPartnerFlags20000) /* D77144 80240DA4 24840EEC */ addiu $a0, $a0, %lo(pra_20_SetPartnerFlags20000) /* D77148 80240DA8 08090374 */ j .L80240DD0 -/* D7714C 80240DAC 00000000 */ nop +/* D7714C 80240DAC 00000000 */ nop .L80240DB0: /* D77150 80240DB0 8E020084 */ lw $v0, 0x84($s0) /* D77154 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D77158 80240DB8 00000000 */ nop +/* D77158 80240DB8 00000000 */ nop /* D7715C 80240DBC 28420002 */ slti $v0, $v0, 2 /* D77160 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D77164 80240DC4 00000000 */ nop +/* D77164 80240DC4 00000000 */ nop .L80240DC8: /* D77168 80240DC8 3C048024 */ lui $a0, %hi(pra_20_SetPartnerFlags80000) /* D7716C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(pra_20_SetPartnerFlags80000) @@ -64,14 +64,14 @@ glabel func_80240D3C_D770DC /* D771AC 80240E0C 10400005 */ beqz $v0, .L80240E24 /* D771B0 80240E10 24020002 */ addiu $v0, $zero, 2 /* D771B4 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D771B8 80240E18 00000000 */ nop +/* D771B8 80240E18 00000000 */ nop /* D771BC 80240E1C 0809039D */ j .L80240E74 -/* D771C0 80240E20 00000000 */ nop +/* D771C0 80240E20 00000000 */ nop .L80240E24: /* D771C4 80240E24 10820006 */ beq $a0, $v0, .L80240E40 /* D771C8 80240E28 24020002 */ addiu $v0, $zero, 2 /* D771CC 80240E2C 0809039D */ j .L80240E74 -/* D771D0 80240E30 00000000 */ nop +/* D771D0 80240E30 00000000 */ nop .L80240E34: /* D771D4 80240E34 8CA20000 */ lw $v0, ($a1) /* D771D8 80240E38 0809039A */ j .L80240E68 diff --git a/asm/nonmatchings/world/area_pra/pra_21/D77F40/func_80240020_D77F40.s b/asm/nonmatchings/world/area_pra/pra_21/D77F40/func_80240020_D77F40.s index 994f1b401f..626071cd4a 100644 --- a/asm/nonmatchings/world/area_pra/pra_21/D77F40/func_80240020_D77F40.s +++ b/asm/nonmatchings/world/area_pra/pra_21/D77F40/func_80240020_D77F40.s @@ -6,16 +6,16 @@ glabel func_80240020_D77F40 /* D77F44 80240024 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) /* D77F48 80240028 C4620080 */ lwc1 $f2, 0x80($v1) /* D77F4C 8024002C 44800000 */ mtc1 $zero, $f0 -/* D77F50 80240030 00000000 */ nop +/* D77F50 80240030 00000000 */ nop /* D77F54 80240034 4602003E */ c.le.s $f0, $f2 -/* D77F58 80240038 00000000 */ nop +/* D77F58 80240038 00000000 */ nop /* D77F5C 8024003C 4500000A */ bc1f .L80240068 -/* D77F60 80240040 00000000 */ nop +/* D77F60 80240040 00000000 */ nop /* D77F64 80240044 3C014334 */ lui $at, 0x4334 /* D77F68 80240048 44810000 */ mtc1 $at, $f0 -/* D77F6C 8024004C 00000000 */ nop +/* D77F6C 8024004C 00000000 */ nop /* D77F70 80240050 4600103C */ c.lt.s $f2, $f0 -/* D77F74 80240054 00000000 */ nop +/* D77F74 80240054 00000000 */ nop /* D77F78 80240058 45000006 */ bc1f .L80240074 /* D77F7C 8024005C 240201A9 */ addiu $v0, $zero, 0x1a9 /* D77F80 80240060 AC820084 */ sw $v0, 0x84($a0) @@ -23,17 +23,17 @@ glabel func_80240020_D77F40 .L80240068: /* D77F88 80240068 3C014334 */ lui $at, 0x4334 /* D77F8C 8024006C 44810000 */ mtc1 $at, $f0 -/* D77F90 80240070 00000000 */ nop +/* D77F90 80240070 00000000 */ nop .L80240074: /* D77F94 80240074 4602003E */ c.le.s $f0, $f2 -/* D77F98 80240078 00000000 */ nop +/* D77F98 80240078 00000000 */ nop /* D77F9C 8024007C 45000009 */ bc1f .L802400A4 -/* D77FA0 80240080 00000000 */ nop +/* D77FA0 80240080 00000000 */ nop /* D77FA4 80240084 3C0143B4 */ lui $at, 0x43b4 /* D77FA8 80240088 44810000 */ mtc1 $at, $f0 -/* D77FAC 8024008C 00000000 */ nop +/* D77FAC 8024008C 00000000 */ nop /* D77FB0 80240090 4600103C */ c.lt.s $f2, $f0 -/* D77FB4 80240094 00000000 */ nop +/* D77FB4 80240094 00000000 */ nop /* D77FB8 80240098 45000002 */ bc1f .L802400A4 /* D77FBC 8024009C 24020145 */ addiu $v0, $zero, 0x145 /* D77FC0 802400A0 AC820084 */ sw $v0, 0x84($a0) diff --git a/asm/nonmatchings/world/area_pra/pra_21/D77F40/func_802400AC_D77FCC.s b/asm/nonmatchings/world/area_pra/pra_21/D77F40/func_802400AC_D77FCC.s index 1a7b3060dd..42eb56d473 100644 --- a/asm/nonmatchings/world/area_pra/pra_21/D77F40/func_802400AC_D77FCC.s +++ b/asm/nonmatchings/world/area_pra/pra_21/D77F40/func_802400AC_D77FCC.s @@ -32,4 +32,4 @@ glabel func_802400AC_D77FCC /* D78030 80240110 0000102D */ daddu $v0, $zero, $zero /* D78034 80240114 03E00008 */ jr $ra /* D78038 80240118 27BD0020 */ addiu $sp, $sp, 0x20 -/* D7803C 8024011C 00000000 */ nop +/* D7803C 8024011C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_80240020_D788A0.s b/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_80240020_D788A0.s index de7b707978..26549d6d18 100644 --- a/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_80240020_D788A0.s +++ b/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_80240020_D788A0.s @@ -18,13 +18,13 @@ glabel func_80240020_D788A0 /* D788D4 80240054 24020014 */ addiu $v0, $zero, 0x14 /* D788D8 80240058 808300B4 */ lb $v1, 0xb4($a0) /* D788DC 8024005C 10620006 */ beq $v1, $v0, .L80240078 -/* D788E0 80240060 00000000 */ nop +/* D788E0 80240060 00000000 */ nop .L80240064: /* D788E4 80240064 8C820014 */ lw $v0, 0x14($a0) /* D788E8 80240068 3C03FFFF */ lui $v1, 0xffff /* D788EC 8024006C 00431024 */ and $v0, $v0, $v1 /* D788F0 80240070 10400005 */ beqz $v0, .L80240088 -/* D788F4 80240074 00000000 */ nop +/* D788F4 80240074 00000000 */ nop .L80240078: /* D788F8 80240078 0C039769 */ jal set_action_state /* D788FC 8024007C 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_802400DC_D7895C.s b/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_802400DC_D7895C.s index 7581d52b25..0b650b3bd1 100644 --- a/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_802400DC_D7895C.s +++ b/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_802400DC_D7895C.s @@ -34,7 +34,7 @@ glabel func_802400DC_D7895C /* D789D0 80240150 AFA20010 */ sw $v0, 0x10($sp) /* D789D4 80240154 E7A00014 */ swc1 $f0, 0x14($sp) /* D789D8 80240158 44830000 */ mtc1 $v1, $f0 -/* D789DC 8024015C 00000000 */ nop +/* D789DC 8024015C 00000000 */ nop /* D789E0 80240160 46800020 */ cvt.s.w $f0, $f0 /* D789E4 80240164 0C0371DE */ jal func_800DC778 /* D789E8 80240168 E7A00018 */ swc1 $f0, 0x18($sp) @@ -46,9 +46,9 @@ glabel func_802400DC_D7895C /* D78A00 80240180 C602002C */ lwc1 $f2, 0x2c($s0) /* D78A04 80240184 C7A00024 */ lwc1 $f0, 0x24($sp) /* D78A08 80240188 46001032 */ c.eq.s $f2, $f0 -/* D78A0C 8024018C 00000000 */ nop +/* D78A0C 8024018C 00000000 */ nop /* D78A10 80240190 45010009 */ bc1t .L802401B8 -/* D78A14 80240194 00000000 */ nop +/* D78A14 80240194 00000000 */ nop /* D78A18 80240198 AE00002C */ sw $zero, 0x2c($s0) /* D78A1C 8024019C 8E220090 */ lw $v0, 0x90($s1) /* D78A20 802401A0 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_802401D0_D78A50.s b/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_802401D0_D78A50.s index 16feeddad4..befa6a4e49 100644 --- a/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_802401D0_D78A50.s +++ b/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_802401D0_D78A50.s @@ -6,16 +6,16 @@ glabel func_802401D0_D78A50 /* D78A54 802401D4 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) /* D78A58 802401D8 C4620080 */ lwc1 $f2, 0x80($v1) /* D78A5C 802401DC 44800000 */ mtc1 $zero, $f0 -/* D78A60 802401E0 00000000 */ nop +/* D78A60 802401E0 00000000 */ nop /* D78A64 802401E4 4602003E */ c.le.s $f0, $f2 -/* D78A68 802401E8 00000000 */ nop +/* D78A68 802401E8 00000000 */ nop /* D78A6C 802401EC 4500000A */ bc1f .L80240218 -/* D78A70 802401F0 00000000 */ nop +/* D78A70 802401F0 00000000 */ nop /* D78A74 802401F4 3C014334 */ lui $at, 0x4334 /* D78A78 802401F8 44810000 */ mtc1 $at, $f0 -/* D78A7C 802401FC 00000000 */ nop +/* D78A7C 802401FC 00000000 */ nop /* D78A80 80240200 4600103C */ c.lt.s $f2, $f0 -/* D78A84 80240204 00000000 */ nop +/* D78A84 80240204 00000000 */ nop /* D78A88 80240208 45000006 */ bc1f .L80240224 /* D78A8C 8024020C 240201A9 */ addiu $v0, $zero, 0x1a9 /* D78A90 80240210 AC820084 */ sw $v0, 0x84($a0) @@ -23,17 +23,17 @@ glabel func_802401D0_D78A50 .L80240218: /* D78A98 80240218 3C014334 */ lui $at, 0x4334 /* D78A9C 8024021C 44810000 */ mtc1 $at, $f0 -/* D78AA0 80240220 00000000 */ nop +/* D78AA0 80240220 00000000 */ nop .L80240224: /* D78AA4 80240224 4602003E */ c.le.s $f0, $f2 -/* D78AA8 80240228 00000000 */ nop +/* D78AA8 80240228 00000000 */ nop /* D78AAC 8024022C 45000009 */ bc1f .L80240254 -/* D78AB0 80240230 00000000 */ nop +/* D78AB0 80240230 00000000 */ nop /* D78AB4 80240234 3C0143B4 */ lui $at, 0x43b4 /* D78AB8 80240238 44810000 */ mtc1 $at, $f0 -/* D78ABC 8024023C 00000000 */ nop +/* D78ABC 8024023C 00000000 */ nop /* D78AC0 80240240 4600103C */ c.lt.s $f2, $f0 -/* D78AC4 80240244 00000000 */ nop +/* D78AC4 80240244 00000000 */ nop /* D78AC8 80240248 45000002 */ bc1f .L80240254 /* D78ACC 8024024C 24020145 */ addiu $v0, $zero, 0x145 /* D78AD0 80240250 AC820084 */ sw $v0, 0x84($a0) diff --git a/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_8024025C_D78ADC.s b/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_8024025C_D78ADC.s index 0ed6bad049..8fd1183a0f 100644 --- a/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_8024025C_D78ADC.s +++ b/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_8024025C_D78ADC.s @@ -32,4 +32,4 @@ glabel func_8024025C_D78ADC /* D78B40 802402C0 0000102D */ daddu $v0, $zero, $zero /* D78B44 802402C4 03E00008 */ jr $ra /* D78B48 802402C8 27BD0020 */ addiu $sp, $sp, 0x20 -/* D78B4C 802402CC 00000000 */ nop +/* D78B4C 802402CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240084_D79A74.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240084_D79A74.s index 19824b0e70..2ddbfdb746 100644 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240084_D79A74.s +++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240084_D79A74.s @@ -40,7 +40,7 @@ glabel func_80240084_D79A74 /* D79AF0 80240100 1440FFF7 */ bnez $v0, .L802400E0 /* D79AF4 80240104 24820001 */ addiu $v0, $a0, 1 /* D79AF8 80240108 03E00008 */ jr $ra -/* D79AFC 8024010C 00000000 */ nop +/* D79AFC 8024010C 00000000 */ nop .L80240110: /* D79B00 80240110 3C020100 */ lui $v0, 0x100 .L80240114: diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s index 433e93d6ec..fe668904c1 100644 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s +++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s @@ -16,7 +16,7 @@ glabel func_80240158_D79B48 /* D79B74 80240184 27B20020 */ addiu $s2, $sp, 0x20 /* D79B78 80240188 8E0400CC */ lw $a0, 0xcc($s0) /* D79B7C 8024018C 0C044181 */ jal get_shadow_by_index -/* D79B80 80240190 00000000 */ nop +/* D79B80 80240190 00000000 */ nop /* D79B84 80240194 0C048B77 */ jal func_80122DDC /* D79B88 80240198 84440008 */ lh $a0, 8($v0) /* D79B8C 8024019C 8C430000 */ lw $v1, ($v0) @@ -38,22 +38,22 @@ glabel func_80240158_D79B48 /* D79BCC 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D79BD0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) /* D79BD4 802401E4 0C090014 */ jal pra_27_UnkFunc2 -/* D79BD8 802401E8 00000000 */ nop +/* D79BD8 802401E8 00000000 */ nop /* D79BDC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D79BE0 802401F0 3C014307 */ lui $at, 0x4307 /* D79BE4 802401F4 44810000 */ mtc1 $at, $f0 -/* D79BE8 802401F8 00000000 */ nop +/* D79BE8 802401F8 00000000 */ nop /* D79BEC 802401FC 4602003C */ c.lt.s $f0, $f2 -/* D79BF0 80240200 00000000 */ nop +/* D79BF0 80240200 00000000 */ nop /* D79BF4 80240204 4500000B */ bc1f .L80240234 /* D79BF8 80240208 24040002 */ addiu $a0, $zero, 2 /* D79BFC 8024020C 3C014361 */ lui $at, 0x4361 /* D79C00 80240210 44810000 */ mtc1 $at, $f0 -/* D79C04 80240214 00000000 */ nop +/* D79C04 80240214 00000000 */ nop /* D79C08 80240218 4600103C */ c.lt.s $f2, $f0 -/* D79C0C 8024021C 00000000 */ nop +/* D79C0C 8024021C 00000000 */ nop /* D79C10 80240220 45000004 */ bc1f .L80240234 -/* D79C14 80240224 00000000 */ nop +/* D79C14 80240224 00000000 */ nop /* D79C18 80240228 0C090021 */ jal func_80240084_D79A74 /* D79C1C 8024022C 0040202D */ daddu $a0, $v0, $zero /* D79C20 80240230 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240158_D79B48 /* D79CA8 802402B8 AFA0001C */ sw $zero, 0x1c($sp) .L802402BC: /* D79CAC 802402BC 0C0B77B9 */ jal func_802DDEE4 -/* D79CB0 802402C0 00000000 */ nop +/* D79CB0 802402C0 00000000 */ nop .L802402C4: /* D79CB4 802402C4 9202000E */ lbu $v0, 0xe($s0) /* D79CB8 802402C8 3C01802E */ lui $at, %hi(D_802D9D70) diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240320_D79D10.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240320_D79D10.s index d67a14d809..6128957e84 100644 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240320_D79D10.s +++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240320_D79D10.s @@ -33,7 +33,7 @@ glabel func_80240320_D79D10 /* D79D80 80240390 E7B40010 */ swc1 $f20, 0x10($sp) /* D79D84 80240394 C62C008C */ lwc1 $f12, 0x8c($s1) /* D79D88 80240398 0C00A6C9 */ jal clamp_angle -/* D79D8C 8024039C 00000000 */ nop +/* D79D8C 8024039C 00000000 */ nop /* D79D90 802403A0 44050000 */ mfc1 $a1, $f0 /* D79D94 802403A4 4406A000 */ mfc1 $a2, $f20 /* D79D98 802403A8 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802404CC_D79EBC.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802404CC_D79EBC.s index ad3226573a..73e8aec25a 100644 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802404CC_D79EBC.s +++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802404CC_D79EBC.s @@ -10,7 +10,7 @@ glabel func_802404CC_D79EBC /* D79ED0 802404E0 0440000E */ bltz $v0, .L8024051C /* D79ED4 802404E4 28420002 */ slti $v0, $v0, 2 /* D79ED8 802404E8 1040000C */ beqz $v0, .L8024051C -/* D79EDC 802404EC 00000000 */ nop +/* D79EDC 802404EC 00000000 */ nop /* D79EE0 802404F0 3C058024 */ lui $a1, %hi(func_80240530_D79F20) /* D79EE4 802404F4 24A50530 */ addiu $a1, $a1, %lo(func_80240530_D79F20) /* D79EE8 802404F8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240530_D79F20.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240530_D79F20.s index a8ad49dc71..8bf4cae2e2 100644 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240530_D79F20.s +++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240530_D79F20.s @@ -16,7 +16,7 @@ glabel func_80240530_D79F20 /* D79F4C 8024055C 27B10020 */ addiu $s1, $sp, 0x20 /* D79F50 80240560 8E0400CC */ lw $a0, 0xcc($s0) /* D79F54 80240564 0C044181 */ jal get_shadow_by_index -/* D79F58 80240568 00000000 */ nop +/* D79F58 80240568 00000000 */ nop /* D79F5C 8024056C 0C048B77 */ jal func_80122DDC /* D79F60 80240570 84440008 */ lh $a0, 8($v0) /* D79F64 80240574 8E050028 */ lw $a1, 0x28($s0) @@ -33,7 +33,7 @@ glabel func_80240530_D79F20 /* D79F90 802405A0 46000007 */ neg.s $f0, $f0 /* D79F94 802405A4 44060000 */ mfc1 $a2, $f0 /* D79F98 802405A8 0C00B94E */ jal get_screen_coords -/* D79F9C 802405AC 00000000 */ nop +/* D79F9C 802405AC 00000000 */ nop /* D79FA0 802405B0 8E0500A4 */ lw $a1, 0xa4($s0) /* D79FA4 802405B4 3C063F80 */ lui $a2, 0x3f80 /* D79FA8 802405B8 0C0B76A3 */ jal func_802DDA8C @@ -72,13 +72,13 @@ glabel func_80240530_D79F20 /* D7A028 80240638 AFA0001C */ sw $zero, 0x1c($sp) .L8024063C: /* D7A02C 8024063C 0C0B77B9 */ jal func_802DDEE4 -/* D7A030 80240640 00000000 */ nop +/* D7A030 80240640 00000000 */ nop .L80240644: /* D7A034 80240644 9202000E */ lbu $v0, 0xe($s0) /* D7A038 80240648 3C01802E */ lui $at, %hi(D_802D9D71) /* D7A03C 8024064C A0229D71 */ sb $v0, %lo(D_802D9D71)($at) /* D7A040 80240650 08090198 */ j .L80240660 -/* D7A044 80240654 00000000 */ nop +/* D7A044 80240654 00000000 */ nop .L80240658: /* D7A048 80240658 3C01802E */ lui $at, %hi(D_802D9D71) /* D7A04C 8024065C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802406BC_D7A0AC.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802406BC_D7A0AC.s index 46c899feec..c356bf3344 100644 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802406BC_D7A0AC.s +++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802406BC_D7A0AC.s @@ -33,7 +33,7 @@ glabel func_802406BC_D7A0AC /* D7A11C 8024072C E7B40010 */ swc1 $f20, 0x10($sp) /* D7A120 80240730 C62C008C */ lwc1 $f12, 0x8c($s1) /* D7A124 80240734 0C00A6C9 */ jal clamp_angle -/* D7A128 80240738 00000000 */ nop +/* D7A128 80240738 00000000 */ nop /* D7A12C 8024073C 44050000 */ mfc1 $a1, $f0 /* D7A130 80240740 4406A000 */ mfc1 $a2, $f20 /* D7A134 80240744 4407A000 */ mfc1 $a3, $f20 @@ -95,16 +95,16 @@ glabel func_802406BC_D7A0AC /* D7A214 80240824 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D7A218 80240828 3C0142B4 */ lui $at, 0x42b4 /* D7A21C 8024082C 44810000 */ mtc1 $at, $f0 -/* D7A220 80240830 00000000 */ nop +/* D7A220 80240830 00000000 */ nop /* D7A224 80240834 4602003E */ c.le.s $f0, $f2 -/* D7A228 80240838 00000000 */ nop +/* D7A228 80240838 00000000 */ nop /* D7A22C 8024083C 4500000A */ bc1f .L80240868 /* D7A230 80240840 24040001 */ addiu $a0, $zero, 1 /* D7A234 80240844 3C014387 */ lui $at, 0x4387 /* D7A238 80240848 44810000 */ mtc1 $at, $f0 -/* D7A23C 8024084C 00000000 */ nop +/* D7A23C 8024084C 00000000 */ nop /* D7A240 80240850 4600103C */ c.lt.s $f2, $f0 -/* D7A244 80240854 00000000 */ nop +/* D7A244 80240854 00000000 */ nop /* D7A248 80240858 45000004 */ bc1f .L8024086C /* D7A24C 8024085C 27A20018 */ addiu $v0, $sp, 0x18 /* D7A250 80240860 3C041000 */ lui $a0, 0x1000 diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802408A0_D7A290.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802408A0_D7A290.s index 3d0ddf9bdc..47203b573a 100644 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802408A0_D7A290.s +++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802408A0_D7A290.s @@ -43,36 +43,36 @@ glabel func_802408A0_D7A290 /* D7A324 80240934 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D7A328 80240938 3C0142B4 */ lui $at, 0x42b4 /* D7A32C 8024093C 44810000 */ mtc1 $at, $f0 -/* D7A330 80240940 00000000 */ nop +/* D7A330 80240940 00000000 */ nop /* D7A334 80240944 4602003C */ c.lt.s $f0, $f2 -/* D7A338 80240948 00000000 */ nop +/* D7A338 80240948 00000000 */ nop /* D7A33C 8024094C 4500000A */ bc1f .L80240978 -/* D7A340 80240950 00000000 */ nop +/* D7A340 80240950 00000000 */ nop /* D7A344 80240954 3C014334 */ lui $at, 0x4334 /* D7A348 80240958 44812000 */ mtc1 $at, $f4 -/* D7A34C 8024095C 00000000 */ nop +/* D7A34C 8024095C 00000000 */ nop /* D7A350 80240960 4604103E */ c.le.s $f2, $f4 -/* D7A354 80240964 00000000 */ nop +/* D7A354 80240964 00000000 */ nop /* D7A358 80240968 45000003 */ bc1f .L80240978 -/* D7A35C 8024096C 00000000 */ nop +/* D7A35C 8024096C 00000000 */ nop /* D7A360 80240970 08090282 */ j .L80240A08 /* D7A364 80240974 46022501 */ sub.s $f20, $f4, $f2 .L80240978: /* D7A368 80240978 C62000A8 */ lwc1 $f0, 0xa8($s1) /* D7A36C 8024097C 3C014334 */ lui $at, 0x4334 /* D7A370 80240980 44812000 */ mtc1 $at, $f4 -/* D7A374 80240984 00000000 */ nop +/* D7A374 80240984 00000000 */ nop /* D7A378 80240988 4600203C */ c.lt.s $f4, $f0 -/* D7A37C 8024098C 00000000 */ nop +/* D7A37C 8024098C 00000000 */ nop /* D7A380 80240990 4500000C */ bc1f .L802409C4 -/* D7A384 80240994 00000000 */ nop +/* D7A384 80240994 00000000 */ nop /* D7A388 80240998 3C014387 */ lui $at, 0x4387 /* D7A38C 8024099C 44812000 */ mtc1 $at, $f4 -/* D7A390 802409A0 00000000 */ nop +/* D7A390 802409A0 00000000 */ nop /* D7A394 802409A4 4604003E */ c.le.s $f0, $f4 -/* D7A398 802409A8 00000000 */ nop +/* D7A398 802409A8 00000000 */ nop /* D7A39C 802409AC 45000008 */ bc1f .L802409D0 -/* D7A3A0 802409B0 00000000 */ nop +/* D7A3A0 802409B0 00000000 */ nop /* D7A3A4 802409B4 3C014334 */ lui $at, 0x4334 /* D7A3A8 802409B8 44812000 */ mtc1 $at, $f4 /* D7A3AC 802409BC 08090282 */ j .L80240A08 @@ -80,19 +80,19 @@ glabel func_802408A0_D7A290 .L802409C4: /* D7A3B4 802409C4 3C014387 */ lui $at, 0x4387 /* D7A3B8 802409C8 44812000 */ mtc1 $at, $f4 -/* D7A3BC 802409CC 00000000 */ nop +/* D7A3BC 802409CC 00000000 */ nop .L802409D0: /* D7A3C0 802409D0 4600203C */ c.lt.s $f4, $f0 -/* D7A3C4 802409D4 00000000 */ nop +/* D7A3C4 802409D4 00000000 */ nop /* D7A3C8 802409D8 4500000A */ bc1f .L80240A04 -/* D7A3CC 802409DC 00000000 */ nop +/* D7A3CC 802409DC 00000000 */ nop /* D7A3D0 802409E0 3C0143B4 */ lui $at, 0x43b4 /* D7A3D4 802409E4 44811000 */ mtc1 $at, $f2 -/* D7A3D8 802409E8 00000000 */ nop +/* D7A3D8 802409E8 00000000 */ nop /* D7A3DC 802409EC 4602003E */ c.le.s $f0, $f2 -/* D7A3E0 802409F0 00000000 */ nop +/* D7A3E0 802409F0 00000000 */ nop /* D7A3E4 802409F4 45000003 */ bc1f .L80240A04 -/* D7A3E8 802409F8 00000000 */ nop +/* D7A3E8 802409F8 00000000 */ nop /* D7A3EC 802409FC 08090282 */ j .L80240A08 /* D7A3F0 80240A00 46001501 */ sub.s $f20, $f2, $f0 .L80240A04: @@ -100,11 +100,11 @@ glabel func_802408A0_D7A290 .L80240A08: /* D7A3F8 80240A08 3C0141C8 */ lui $at, 0x41c8 /* D7A3FC 80240A0C 44810000 */ mtc1 $at, $f0 -/* D7A400 80240A10 00000000 */ nop +/* D7A400 80240A10 00000000 */ nop /* D7A404 80240A14 4600A003 */ div.s $f0, $f20, $f0 /* D7A408 80240A18 4600010D */ trunc.w.s $f4, $f0 /* D7A40C 80240A1C 44072000 */ mfc1 $a3, $f4 -/* D7A410 80240A20 00000000 */ nop +/* D7A410 80240A20 00000000 */ nop /* D7A414 80240A24 00071100 */ sll $v0, $a3, 4 /* D7A418 80240A28 00471023 */ subu $v0, $v0, $a3 /* D7A41C 80240A2C 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel func_802408A0_D7A290 /* D7A464 80240A74 E7B60010 */ swc1 $f22, 0x10($sp) /* D7A468 80240A78 C62C008C */ lwc1 $f12, 0x8c($s1) /* D7A46C 80240A7C 0C00A6C9 */ jal clamp_angle -/* D7A470 80240A80 00000000 */ nop +/* D7A470 80240A80 00000000 */ nop /* D7A474 80240A84 44050000 */ mfc1 $a1, $f0 /* D7A478 80240A88 4406B000 */ mfc1 $a2, $f22 /* D7A47C 80240A8C 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel func_802408A0_D7A290 /* D7A4E0 80240AF0 24040001 */ addiu $a0, $zero, 1 .L80240AF4: /* D7A4E4 80240AF4 4486D000 */ mtc1 $a2, $f26 -/* D7A4E8 80240AF8 00000000 */ nop +/* D7A4E8 80240AF8 00000000 */ nop /* D7A4EC 80240AFC 4680D6A0 */ cvt.s.w $f26, $f26 /* D7A4F0 80240B00 24040001 */ addiu $a0, $zero, 1 .L80240B04: @@ -204,10 +204,10 @@ glabel func_802408A0_D7A290 /* D7A580 80240B90 44812000 */ mtc1 $at, $f4 /* D7A584 80240B94 00021023 */ negu $v0, $v0 /* D7A588 80240B98 44820000 */ mtc1 $v0, $f0 -/* D7A58C 80240B9C 00000000 */ nop +/* D7A58C 80240B9C 00000000 */ nop /* D7A590 80240BA0 46800020 */ cvt.s.w $f0, $f0 /* D7A594 80240BA4 46040102 */ mul.s $f4, $f0, $f4 -/* D7A598 80240BA8 00000000 */ nop +/* D7A598 80240BA8 00000000 */ nop /* D7A59C 80240BAC 4405B000 */ mfc1 $a1, $f22 /* D7A5A0 80240BB0 4407B000 */ mfc1 $a3, $f22 /* D7A5A4 80240BB4 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel func_802408A0_D7A290 /* D7A614 80240C24 3C013F00 */ lui $at, 0x3f00 /* D7A618 80240C28 44812000 */ mtc1 $at, $f4 /* D7A61C 80240C2C 44820000 */ mtc1 $v0, $f0 -/* D7A620 80240C30 00000000 */ nop +/* D7A620 80240C30 00000000 */ nop /* D7A624 80240C34 46800020 */ cvt.s.w $f0, $f0 /* D7A628 80240C38 46040102 */ mul.s $f4, $f0, $f4 -/* D7A62C 80240C3C 00000000 */ nop +/* D7A62C 80240C3C 00000000 */ nop /* D7A630 80240C40 4405B000 */ mfc1 $a1, $f22 /* D7A634 80240C44 4407B000 */ mfc1 $a3, $f22 /* D7A638 80240C48 44062000 */ mfc1 $a2, $f4 @@ -280,16 +280,16 @@ glabel func_802408A0_D7A290 /* D7A6B0 80240CC0 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D7A6B4 80240CC4 3C0142B4 */ lui $at, 0x42b4 /* D7A6B8 80240CC8 44810000 */ mtc1 $at, $f0 -/* D7A6BC 80240CCC 00000000 */ nop +/* D7A6BC 80240CCC 00000000 */ nop /* D7A6C0 80240CD0 4602003E */ c.le.s $f0, $f2 -/* D7A6C4 80240CD4 00000000 */ nop +/* D7A6C4 80240CD4 00000000 */ nop /* D7A6C8 80240CD8 4500000A */ bc1f .L80240D04 /* D7A6CC 80240CDC 24040001 */ addiu $a0, $zero, 1 /* D7A6D0 80240CE0 3C014387 */ lui $at, 0x4387 /* D7A6D4 80240CE4 44812000 */ mtc1 $at, $f4 -/* D7A6D8 80240CE8 00000000 */ nop +/* D7A6D8 80240CE8 00000000 */ nop /* D7A6DC 80240CEC 4604103C */ c.lt.s $f2, $f4 -/* D7A6E0 80240CF0 00000000 */ nop +/* D7A6E0 80240CF0 00000000 */ nop /* D7A6E4 80240CF4 45000004 */ bc1f .L80240D08 /* D7A6E8 80240CF8 27A20020 */ addiu $v0, $sp, 0x20 /* D7A6EC 80240CFC 3C041000 */ lui $a0, 0x1000 @@ -305,7 +305,7 @@ glabel func_802408A0_D7A290 /* D7A70C 80240D1C 26730001 */ addiu $s3, $s3, 1 /* D7A710 80240D20 2A620002 */ slti $v0, $s3, 2 /* D7A714 80240D24 1440FEF6 */ bnez $v0, .L80240900 -/* D7A718 80240D28 00000000 */ nop +/* D7A718 80240D28 00000000 */ nop /* D7A71C 80240D2C 8FBF014C */ lw $ra, 0x14c($sp) /* D7A720 80240D30 8FB60148 */ lw $s6, 0x148($sp) /* D7A724 80240D34 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240D6C_D7A75C.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240D6C_D7A75C.s index e92a88853d..0b5246d57c 100644 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240D6C_D7A75C.s +++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240D6C_D7A75C.s @@ -11,36 +11,36 @@ glabel func_80240D6C_D7A75C /* D7A774 80240D84 24020001 */ addiu $v0, $zero, 1 /* D7A778 80240D88 8E030084 */ lw $v1, 0x84($s0) /* D7A77C 80240D8C 1062001A */ beq $v1, $v0, .L80240DF8 -/* D7A780 80240D90 00000000 */ nop +/* D7A780 80240D90 00000000 */ nop /* D7A784 80240D94 28620002 */ slti $v0, $v1, 2 /* D7A788 80240D98 50400005 */ beql $v0, $zero, .L80240DB0 /* D7A78C 80240D9C 24020002 */ addiu $v0, $zero, 2 /* D7A790 80240DA0 10600007 */ beqz $v1, .L80240DC0 -/* D7A794 80240DA4 00000000 */ nop +/* D7A794 80240DA4 00000000 */ nop /* D7A798 80240DA8 08090384 */ j .L80240E10 -/* D7A79C 80240DAC 00000000 */ nop +/* D7A79C 80240DAC 00000000 */ nop .L80240DB0: /* D7A7A0 80240DB0 10620007 */ beq $v1, $v0, .L80240DD0 -/* D7A7A4 80240DB4 00000000 */ nop +/* D7A7A4 80240DB4 00000000 */ nop /* D7A7A8 80240DB8 08090384 */ j .L80240E10 -/* D7A7AC 80240DBC 00000000 */ nop +/* D7A7AC 80240DBC 00000000 */ nop .L80240DC0: /* D7A7B0 80240DC0 3C048024 */ lui $a0, %hi(pra_27_SetPartnerFlagsA0000) /* D7A7B4 80240DC4 24840EB4 */ addiu $a0, $a0, %lo(pra_27_SetPartnerFlagsA0000) /* D7A7B8 80240DC8 08090380 */ j .L80240E00 -/* D7A7BC 80240DCC 00000000 */ nop +/* D7A7BC 80240DCC 00000000 */ nop .L80240DD0: /* D7A7C0 80240DD0 3C048024 */ lui $a0, %hi(pra_27_SetPartnerFlags20000) /* D7A7C4 80240DD4 24840F1C */ addiu $a0, $a0, %lo(pra_27_SetPartnerFlags20000) /* D7A7C8 80240DD8 08090380 */ j .L80240E00 -/* D7A7CC 80240DDC 00000000 */ nop +/* D7A7CC 80240DDC 00000000 */ nop .L80240DE0: /* D7A7D0 80240DE0 8E020084 */ lw $v0, 0x84($s0) /* D7A7D4 80240DE4 0440000A */ bltz $v0, .L80240E10 -/* D7A7D8 80240DE8 00000000 */ nop +/* D7A7D8 80240DE8 00000000 */ nop /* D7A7DC 80240DEC 28420002 */ slti $v0, $v0, 2 /* D7A7E0 80240DF0 10400007 */ beqz $v0, .L80240E10 -/* D7A7E4 80240DF4 00000000 */ nop +/* D7A7E4 80240DF4 00000000 */ nop .L80240DF8: /* D7A7E8 80240DF8 3C048024 */ lui $a0, %hi(pra_27_SetPartnerFlags80000) /* D7A7EC 80240DFC 24840EE8 */ addiu $a0, $a0, %lo(pra_27_SetPartnerFlags80000) @@ -64,14 +64,14 @@ glabel func_80240D6C_D7A75C /* D7A82C 80240E3C 10400005 */ beqz $v0, .L80240E54 /* D7A830 80240E40 24020002 */ addiu $v0, $zero, 2 /* D7A834 80240E44 10800007 */ beqz $a0, .L80240E64 -/* D7A838 80240E48 00000000 */ nop +/* D7A838 80240E48 00000000 */ nop /* D7A83C 80240E4C 080903A9 */ j .L80240EA4 -/* D7A840 80240E50 00000000 */ nop +/* D7A840 80240E50 00000000 */ nop .L80240E54: /* D7A844 80240E54 10820006 */ beq $a0, $v0, .L80240E70 /* D7A848 80240E58 24020002 */ addiu $v0, $zero, 2 /* D7A84C 80240E5C 080903A9 */ j .L80240EA4 -/* D7A850 80240E60 00000000 */ nop +/* D7A850 80240E60 00000000 */ nop .L80240E64: /* D7A854 80240E64 8CA20000 */ lw $v0, ($a1) /* D7A858 80240E68 080903A6 */ j .L80240E98 diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240F50_D7A940.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240F50_D7A940.s index 8ede3bd7a5..ee9001220e 100644 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240F50_D7A940.s +++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240F50_D7A940.s @@ -26,7 +26,7 @@ glabel func_80240F50_D7A940 /* D7A990 80240FA0 1440FFFA */ bnez $v0, .L80240F8C /* D7A994 80240FA4 24A50004 */ addiu $a1, $a1, 4 /* D7A998 80240FA8 080903FB */ j .L80240FEC -/* D7A99C 80240FAC 00000000 */ nop +/* D7A99C 80240FAC 00000000 */ nop .L80240FB0: /* D7A9A0 80240FB0 0000182D */ daddu $v1, $zero, $zero /* D7A9A4 80240FB4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240084_D7B324.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240084_D7B324.s index 7c47deeb40..c2f3e59e38 100644 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240084_D7B324.s +++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240084_D7B324.s @@ -40,7 +40,7 @@ glabel func_80240084_D7B324 /* D7B3A0 80240100 1440FFF7 */ bnez $v0, .L802400E0 /* D7B3A4 80240104 24820001 */ addiu $v0, $a0, 1 /* D7B3A8 80240108 03E00008 */ jr $ra -/* D7B3AC 8024010C 00000000 */ nop +/* D7B3AC 8024010C 00000000 */ nop .L80240110: /* D7B3B0 80240110 3C020100 */ lui $v0, 0x100 .L80240114: diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s index 5c33b323cb..239a52cada 100644 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s +++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s @@ -16,7 +16,7 @@ glabel func_80240158_D7B3F8 /* D7B424 80240184 27B20020 */ addiu $s2, $sp, 0x20 /* D7B428 80240188 8E0400CC */ lw $a0, 0xcc($s0) /* D7B42C 8024018C 0C044181 */ jal get_shadow_by_index -/* D7B430 80240190 00000000 */ nop +/* D7B430 80240190 00000000 */ nop /* D7B434 80240194 0C048B77 */ jal func_80122DDC /* D7B438 80240198 84440008 */ lh $a0, 8($v0) /* D7B43C 8024019C 8C430000 */ lw $v1, ($v0) @@ -38,22 +38,22 @@ glabel func_80240158_D7B3F8 /* D7B47C 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D7B480 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) /* D7B484 802401E4 0C090014 */ jal pra_28_UnkFunc2 -/* D7B488 802401E8 00000000 */ nop +/* D7B488 802401E8 00000000 */ nop /* D7B48C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D7B490 802401F0 3C014307 */ lui $at, 0x4307 /* D7B494 802401F4 44810000 */ mtc1 $at, $f0 -/* D7B498 802401F8 00000000 */ nop +/* D7B498 802401F8 00000000 */ nop /* D7B49C 802401FC 4602003C */ c.lt.s $f0, $f2 -/* D7B4A0 80240200 00000000 */ nop +/* D7B4A0 80240200 00000000 */ nop /* D7B4A4 80240204 4500000B */ bc1f .L80240234 /* D7B4A8 80240208 24040002 */ addiu $a0, $zero, 2 /* D7B4AC 8024020C 3C014361 */ lui $at, 0x4361 /* D7B4B0 80240210 44810000 */ mtc1 $at, $f0 -/* D7B4B4 80240214 00000000 */ nop +/* D7B4B4 80240214 00000000 */ nop /* D7B4B8 80240218 4600103C */ c.lt.s $f2, $f0 -/* D7B4BC 8024021C 00000000 */ nop +/* D7B4BC 8024021C 00000000 */ nop /* D7B4C0 80240220 45000004 */ bc1f .L80240234 -/* D7B4C4 80240224 00000000 */ nop +/* D7B4C4 80240224 00000000 */ nop /* D7B4C8 80240228 0C090021 */ jal func_80240084_D7B324 /* D7B4CC 8024022C 0040202D */ daddu $a0, $v0, $zero /* D7B4D0 80240230 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240158_D7B3F8 /* D7B558 802402B8 AFA0001C */ sw $zero, 0x1c($sp) .L802402BC: /* D7B55C 802402BC 0C0B77B9 */ jal func_802DDEE4 -/* D7B560 802402C0 00000000 */ nop +/* D7B560 802402C0 00000000 */ nop .L802402C4: /* D7B564 802402C4 9202000E */ lbu $v0, 0xe($s0) /* D7B568 802402C8 3C01802E */ lui $at, %hi(D_802D9D70) diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240320_D7B5C0.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240320_D7B5C0.s index 05bf1cc9b2..dec3fcd3c6 100644 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240320_D7B5C0.s +++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240320_D7B5C0.s @@ -33,7 +33,7 @@ glabel func_80240320_D7B5C0 /* D7B630 80240390 E7B40010 */ swc1 $f20, 0x10($sp) /* D7B634 80240394 C62C008C */ lwc1 $f12, 0x8c($s1) /* D7B638 80240398 0C00A6C9 */ jal clamp_angle -/* D7B63C 8024039C 00000000 */ nop +/* D7B63C 8024039C 00000000 */ nop /* D7B640 802403A0 44050000 */ mfc1 $a1, $f0 /* D7B644 802403A4 4406A000 */ mfc1 $a2, $f20 /* D7B648 802403A8 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802404CC_D7B76C.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802404CC_D7B76C.s index d1af63b208..71601098f5 100644 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802404CC_D7B76C.s +++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802404CC_D7B76C.s @@ -10,7 +10,7 @@ glabel func_802404CC_D7B76C /* D7B780 802404E0 0440000E */ bltz $v0, .L8024051C /* D7B784 802404E4 28420002 */ slti $v0, $v0, 2 /* D7B788 802404E8 1040000C */ beqz $v0, .L8024051C -/* D7B78C 802404EC 00000000 */ nop +/* D7B78C 802404EC 00000000 */ nop /* D7B790 802404F0 3C058024 */ lui $a1, %hi(func_80240530_D7B7D0) /* D7B794 802404F4 24A50530 */ addiu $a1, $a1, %lo(func_80240530_D7B7D0) /* D7B798 802404F8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240530_D7B7D0.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240530_D7B7D0.s index 16d6807175..4e09b58aab 100644 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240530_D7B7D0.s +++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240530_D7B7D0.s @@ -16,7 +16,7 @@ glabel func_80240530_D7B7D0 /* D7B7FC 8024055C 27B10020 */ addiu $s1, $sp, 0x20 /* D7B800 80240560 8E0400CC */ lw $a0, 0xcc($s0) /* D7B804 80240564 0C044181 */ jal get_shadow_by_index -/* D7B808 80240568 00000000 */ nop +/* D7B808 80240568 00000000 */ nop /* D7B80C 8024056C 0C048B77 */ jal func_80122DDC /* D7B810 80240570 84440008 */ lh $a0, 8($v0) /* D7B814 80240574 8E050028 */ lw $a1, 0x28($s0) @@ -33,7 +33,7 @@ glabel func_80240530_D7B7D0 /* D7B840 802405A0 46000007 */ neg.s $f0, $f0 /* D7B844 802405A4 44060000 */ mfc1 $a2, $f0 /* D7B848 802405A8 0C00B94E */ jal get_screen_coords -/* D7B84C 802405AC 00000000 */ nop +/* D7B84C 802405AC 00000000 */ nop /* D7B850 802405B0 8E0500A4 */ lw $a1, 0xa4($s0) /* D7B854 802405B4 3C063F80 */ lui $a2, 0x3f80 /* D7B858 802405B8 0C0B76A3 */ jal func_802DDA8C @@ -72,13 +72,13 @@ glabel func_80240530_D7B7D0 /* D7B8D8 80240638 AFA0001C */ sw $zero, 0x1c($sp) .L8024063C: /* D7B8DC 8024063C 0C0B77B9 */ jal func_802DDEE4 -/* D7B8E0 80240640 00000000 */ nop +/* D7B8E0 80240640 00000000 */ nop .L80240644: /* D7B8E4 80240644 9202000E */ lbu $v0, 0xe($s0) /* D7B8E8 80240648 3C01802E */ lui $at, %hi(D_802D9D71) /* D7B8EC 8024064C A0229D71 */ sb $v0, %lo(D_802D9D71)($at) /* D7B8F0 80240650 08090198 */ j .L80240660 -/* D7B8F4 80240654 00000000 */ nop +/* D7B8F4 80240654 00000000 */ nop .L80240658: /* D7B8F8 80240658 3C01802E */ lui $at, %hi(D_802D9D71) /* D7B8FC 8024065C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802406BC_D7B95C.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802406BC_D7B95C.s index cb43cd3912..4f810ca666 100644 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802406BC_D7B95C.s +++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802406BC_D7B95C.s @@ -33,7 +33,7 @@ glabel func_802406BC_D7B95C /* D7B9CC 8024072C E7B40010 */ swc1 $f20, 0x10($sp) /* D7B9D0 80240730 C62C008C */ lwc1 $f12, 0x8c($s1) /* D7B9D4 80240734 0C00A6C9 */ jal clamp_angle -/* D7B9D8 80240738 00000000 */ nop +/* D7B9D8 80240738 00000000 */ nop /* D7B9DC 8024073C 44050000 */ mfc1 $a1, $f0 /* D7B9E0 80240740 4406A000 */ mfc1 $a2, $f20 /* D7B9E4 80240744 4407A000 */ mfc1 $a3, $f20 @@ -95,16 +95,16 @@ glabel func_802406BC_D7B95C /* D7BAC4 80240824 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D7BAC8 80240828 3C0142B4 */ lui $at, 0x42b4 /* D7BACC 8024082C 44810000 */ mtc1 $at, $f0 -/* D7BAD0 80240830 00000000 */ nop +/* D7BAD0 80240830 00000000 */ nop /* D7BAD4 80240834 4602003E */ c.le.s $f0, $f2 -/* D7BAD8 80240838 00000000 */ nop +/* D7BAD8 80240838 00000000 */ nop /* D7BADC 8024083C 4500000A */ bc1f .L80240868 /* D7BAE0 80240840 24040001 */ addiu $a0, $zero, 1 /* D7BAE4 80240844 3C014387 */ lui $at, 0x4387 /* D7BAE8 80240848 44810000 */ mtc1 $at, $f0 -/* D7BAEC 8024084C 00000000 */ nop +/* D7BAEC 8024084C 00000000 */ nop /* D7BAF0 80240850 4600103C */ c.lt.s $f2, $f0 -/* D7BAF4 80240854 00000000 */ nop +/* D7BAF4 80240854 00000000 */ nop /* D7BAF8 80240858 45000004 */ bc1f .L8024086C /* D7BAFC 8024085C 27A20018 */ addiu $v0, $sp, 0x18 /* D7BB00 80240860 3C041000 */ lui $a0, 0x1000 diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802408A0_D7BB40.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802408A0_D7BB40.s index 27ec9cbaeb..4a39549688 100644 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802408A0_D7BB40.s +++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802408A0_D7BB40.s @@ -43,36 +43,36 @@ glabel func_802408A0_D7BB40 /* D7BBD4 80240934 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D7BBD8 80240938 3C0142B4 */ lui $at, 0x42b4 /* D7BBDC 8024093C 44810000 */ mtc1 $at, $f0 -/* D7BBE0 80240940 00000000 */ nop +/* D7BBE0 80240940 00000000 */ nop /* D7BBE4 80240944 4602003C */ c.lt.s $f0, $f2 -/* D7BBE8 80240948 00000000 */ nop +/* D7BBE8 80240948 00000000 */ nop /* D7BBEC 8024094C 4500000A */ bc1f .L80240978 -/* D7BBF0 80240950 00000000 */ nop +/* D7BBF0 80240950 00000000 */ nop /* D7BBF4 80240954 3C014334 */ lui $at, 0x4334 /* D7BBF8 80240958 44812000 */ mtc1 $at, $f4 -/* D7BBFC 8024095C 00000000 */ nop +/* D7BBFC 8024095C 00000000 */ nop /* D7BC00 80240960 4604103E */ c.le.s $f2, $f4 -/* D7BC04 80240964 00000000 */ nop +/* D7BC04 80240964 00000000 */ nop /* D7BC08 80240968 45000003 */ bc1f .L80240978 -/* D7BC0C 8024096C 00000000 */ nop +/* D7BC0C 8024096C 00000000 */ nop /* D7BC10 80240970 08090282 */ j .L80240A08 /* D7BC14 80240974 46022501 */ sub.s $f20, $f4, $f2 .L80240978: /* D7BC18 80240978 C62000A8 */ lwc1 $f0, 0xa8($s1) /* D7BC1C 8024097C 3C014334 */ lui $at, 0x4334 /* D7BC20 80240980 44812000 */ mtc1 $at, $f4 -/* D7BC24 80240984 00000000 */ nop +/* D7BC24 80240984 00000000 */ nop /* D7BC28 80240988 4600203C */ c.lt.s $f4, $f0 -/* D7BC2C 8024098C 00000000 */ nop +/* D7BC2C 8024098C 00000000 */ nop /* D7BC30 80240990 4500000C */ bc1f .L802409C4 -/* D7BC34 80240994 00000000 */ nop +/* D7BC34 80240994 00000000 */ nop /* D7BC38 80240998 3C014387 */ lui $at, 0x4387 /* D7BC3C 8024099C 44812000 */ mtc1 $at, $f4 -/* D7BC40 802409A0 00000000 */ nop +/* D7BC40 802409A0 00000000 */ nop /* D7BC44 802409A4 4604003E */ c.le.s $f0, $f4 -/* D7BC48 802409A8 00000000 */ nop +/* D7BC48 802409A8 00000000 */ nop /* D7BC4C 802409AC 45000008 */ bc1f .L802409D0 -/* D7BC50 802409B0 00000000 */ nop +/* D7BC50 802409B0 00000000 */ nop /* D7BC54 802409B4 3C014334 */ lui $at, 0x4334 /* D7BC58 802409B8 44812000 */ mtc1 $at, $f4 /* D7BC5C 802409BC 08090282 */ j .L80240A08 @@ -80,19 +80,19 @@ glabel func_802408A0_D7BB40 .L802409C4: /* D7BC64 802409C4 3C014387 */ lui $at, 0x4387 /* D7BC68 802409C8 44812000 */ mtc1 $at, $f4 -/* D7BC6C 802409CC 00000000 */ nop +/* D7BC6C 802409CC 00000000 */ nop .L802409D0: /* D7BC70 802409D0 4600203C */ c.lt.s $f4, $f0 -/* D7BC74 802409D4 00000000 */ nop +/* D7BC74 802409D4 00000000 */ nop /* D7BC78 802409D8 4500000A */ bc1f .L80240A04 -/* D7BC7C 802409DC 00000000 */ nop +/* D7BC7C 802409DC 00000000 */ nop /* D7BC80 802409E0 3C0143B4 */ lui $at, 0x43b4 /* D7BC84 802409E4 44811000 */ mtc1 $at, $f2 -/* D7BC88 802409E8 00000000 */ nop +/* D7BC88 802409E8 00000000 */ nop /* D7BC8C 802409EC 4602003E */ c.le.s $f0, $f2 -/* D7BC90 802409F0 00000000 */ nop +/* D7BC90 802409F0 00000000 */ nop /* D7BC94 802409F4 45000003 */ bc1f .L80240A04 -/* D7BC98 802409F8 00000000 */ nop +/* D7BC98 802409F8 00000000 */ nop /* D7BC9C 802409FC 08090282 */ j .L80240A08 /* D7BCA0 80240A00 46001501 */ sub.s $f20, $f2, $f0 .L80240A04: @@ -100,11 +100,11 @@ glabel func_802408A0_D7BB40 .L80240A08: /* D7BCA8 80240A08 3C0141C8 */ lui $at, 0x41c8 /* D7BCAC 80240A0C 44810000 */ mtc1 $at, $f0 -/* D7BCB0 80240A10 00000000 */ nop +/* D7BCB0 80240A10 00000000 */ nop /* D7BCB4 80240A14 4600A003 */ div.s $f0, $f20, $f0 /* D7BCB8 80240A18 4600010D */ trunc.w.s $f4, $f0 /* D7BCBC 80240A1C 44072000 */ mfc1 $a3, $f4 -/* D7BCC0 80240A20 00000000 */ nop +/* D7BCC0 80240A20 00000000 */ nop /* D7BCC4 80240A24 00071100 */ sll $v0, $a3, 4 /* D7BCC8 80240A28 00471023 */ subu $v0, $v0, $a3 /* D7BCCC 80240A2C 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel func_802408A0_D7BB40 /* D7BD14 80240A74 E7B60010 */ swc1 $f22, 0x10($sp) /* D7BD18 80240A78 C62C008C */ lwc1 $f12, 0x8c($s1) /* D7BD1C 80240A7C 0C00A6C9 */ jal clamp_angle -/* D7BD20 80240A80 00000000 */ nop +/* D7BD20 80240A80 00000000 */ nop /* D7BD24 80240A84 44050000 */ mfc1 $a1, $f0 /* D7BD28 80240A88 4406B000 */ mfc1 $a2, $f22 /* D7BD2C 80240A8C 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel func_802408A0_D7BB40 /* D7BD90 80240AF0 24040001 */ addiu $a0, $zero, 1 .L80240AF4: /* D7BD94 80240AF4 4486D000 */ mtc1 $a2, $f26 -/* D7BD98 80240AF8 00000000 */ nop +/* D7BD98 80240AF8 00000000 */ nop /* D7BD9C 80240AFC 4680D6A0 */ cvt.s.w $f26, $f26 /* D7BDA0 80240B00 24040001 */ addiu $a0, $zero, 1 .L80240B04: @@ -204,10 +204,10 @@ glabel func_802408A0_D7BB40 /* D7BE30 80240B90 44812000 */ mtc1 $at, $f4 /* D7BE34 80240B94 00021023 */ negu $v0, $v0 /* D7BE38 80240B98 44820000 */ mtc1 $v0, $f0 -/* D7BE3C 80240B9C 00000000 */ nop +/* D7BE3C 80240B9C 00000000 */ nop /* D7BE40 80240BA0 46800020 */ cvt.s.w $f0, $f0 /* D7BE44 80240BA4 46040102 */ mul.s $f4, $f0, $f4 -/* D7BE48 80240BA8 00000000 */ nop +/* D7BE48 80240BA8 00000000 */ nop /* D7BE4C 80240BAC 4405B000 */ mfc1 $a1, $f22 /* D7BE50 80240BB0 4407B000 */ mfc1 $a3, $f22 /* D7BE54 80240BB4 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel func_802408A0_D7BB40 /* D7BEC4 80240C24 3C013F00 */ lui $at, 0x3f00 /* D7BEC8 80240C28 44812000 */ mtc1 $at, $f4 /* D7BECC 80240C2C 44820000 */ mtc1 $v0, $f0 -/* D7BED0 80240C30 00000000 */ nop +/* D7BED0 80240C30 00000000 */ nop /* D7BED4 80240C34 46800020 */ cvt.s.w $f0, $f0 /* D7BED8 80240C38 46040102 */ mul.s $f4, $f0, $f4 -/* D7BEDC 80240C3C 00000000 */ nop +/* D7BEDC 80240C3C 00000000 */ nop /* D7BEE0 80240C40 4405B000 */ mfc1 $a1, $f22 /* D7BEE4 80240C44 4407B000 */ mfc1 $a3, $f22 /* D7BEE8 80240C48 44062000 */ mfc1 $a2, $f4 @@ -280,16 +280,16 @@ glabel func_802408A0_D7BB40 /* D7BF60 80240CC0 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D7BF64 80240CC4 3C0142B4 */ lui $at, 0x42b4 /* D7BF68 80240CC8 44810000 */ mtc1 $at, $f0 -/* D7BF6C 80240CCC 00000000 */ nop +/* D7BF6C 80240CCC 00000000 */ nop /* D7BF70 80240CD0 4602003E */ c.le.s $f0, $f2 -/* D7BF74 80240CD4 00000000 */ nop +/* D7BF74 80240CD4 00000000 */ nop /* D7BF78 80240CD8 4500000A */ bc1f .L80240D04 /* D7BF7C 80240CDC 24040001 */ addiu $a0, $zero, 1 /* D7BF80 80240CE0 3C014387 */ lui $at, 0x4387 /* D7BF84 80240CE4 44812000 */ mtc1 $at, $f4 -/* D7BF88 80240CE8 00000000 */ nop +/* D7BF88 80240CE8 00000000 */ nop /* D7BF8C 80240CEC 4604103C */ c.lt.s $f2, $f4 -/* D7BF90 80240CF0 00000000 */ nop +/* D7BF90 80240CF0 00000000 */ nop /* D7BF94 80240CF4 45000004 */ bc1f .L80240D08 /* D7BF98 80240CF8 27A20020 */ addiu $v0, $sp, 0x20 /* D7BF9C 80240CFC 3C041000 */ lui $a0, 0x1000 @@ -305,7 +305,7 @@ glabel func_802408A0_D7BB40 /* D7BFBC 80240D1C 26730001 */ addiu $s3, $s3, 1 /* D7BFC0 80240D20 2A620002 */ slti $v0, $s3, 2 /* D7BFC4 80240D24 1440FEF6 */ bnez $v0, .L80240900 -/* D7BFC8 80240D28 00000000 */ nop +/* D7BFC8 80240D28 00000000 */ nop /* D7BFCC 80240D2C 8FBF014C */ lw $ra, 0x14c($sp) /* D7BFD0 80240D30 8FB60148 */ lw $s6, 0x148($sp) /* D7BFD4 80240D34 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240D6C_D7C00C.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240D6C_D7C00C.s index 5795d5322c..3bcec24f89 100644 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240D6C_D7C00C.s +++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240D6C_D7C00C.s @@ -11,36 +11,36 @@ glabel func_80240D6C_D7C00C /* D7C024 80240D84 24020001 */ addiu $v0, $zero, 1 /* D7C028 80240D88 8E030084 */ lw $v1, 0x84($s0) /* D7C02C 80240D8C 1062001A */ beq $v1, $v0, .L80240DF8 -/* D7C030 80240D90 00000000 */ nop +/* D7C030 80240D90 00000000 */ nop /* D7C034 80240D94 28620002 */ slti $v0, $v1, 2 /* D7C038 80240D98 50400005 */ beql $v0, $zero, .L80240DB0 /* D7C03C 80240D9C 24020002 */ addiu $v0, $zero, 2 /* D7C040 80240DA0 10600007 */ beqz $v1, .L80240DC0 -/* D7C044 80240DA4 00000000 */ nop +/* D7C044 80240DA4 00000000 */ nop /* D7C048 80240DA8 08090384 */ j .L80240E10 -/* D7C04C 80240DAC 00000000 */ nop +/* D7C04C 80240DAC 00000000 */ nop .L80240DB0: /* D7C050 80240DB0 10620007 */ beq $v1, $v0, .L80240DD0 -/* D7C054 80240DB4 00000000 */ nop +/* D7C054 80240DB4 00000000 */ nop /* D7C058 80240DB8 08090384 */ j .L80240E10 -/* D7C05C 80240DBC 00000000 */ nop +/* D7C05C 80240DBC 00000000 */ nop .L80240DC0: /* D7C060 80240DC0 3C048024 */ lui $a0, %hi(pra_28_SetPartnerFlagsA0000) /* D7C064 80240DC4 24840EB4 */ addiu $a0, $a0, %lo(pra_28_SetPartnerFlagsA0000) /* D7C068 80240DC8 08090380 */ j .L80240E00 -/* D7C06C 80240DCC 00000000 */ nop +/* D7C06C 80240DCC 00000000 */ nop .L80240DD0: /* D7C070 80240DD0 3C048024 */ lui $a0, %hi(pra_28_SetPartnerFlags20000) /* D7C074 80240DD4 24840F1C */ addiu $a0, $a0, %lo(pra_28_SetPartnerFlags20000) /* D7C078 80240DD8 08090380 */ j .L80240E00 -/* D7C07C 80240DDC 00000000 */ nop +/* D7C07C 80240DDC 00000000 */ nop .L80240DE0: /* D7C080 80240DE0 8E020084 */ lw $v0, 0x84($s0) /* D7C084 80240DE4 0440000A */ bltz $v0, .L80240E10 -/* D7C088 80240DE8 00000000 */ nop +/* D7C088 80240DE8 00000000 */ nop /* D7C08C 80240DEC 28420002 */ slti $v0, $v0, 2 /* D7C090 80240DF0 10400007 */ beqz $v0, .L80240E10 -/* D7C094 80240DF4 00000000 */ nop +/* D7C094 80240DF4 00000000 */ nop .L80240DF8: /* D7C098 80240DF8 3C048024 */ lui $a0, %hi(pra_28_SetPartnerFlags80000) /* D7C09C 80240DFC 24840EE8 */ addiu $a0, $a0, %lo(pra_28_SetPartnerFlags80000) @@ -64,14 +64,14 @@ glabel func_80240D6C_D7C00C /* D7C0DC 80240E3C 10400005 */ beqz $v0, .L80240E54 /* D7C0E0 80240E40 24020002 */ addiu $v0, $zero, 2 /* D7C0E4 80240E44 10800007 */ beqz $a0, .L80240E64 -/* D7C0E8 80240E48 00000000 */ nop +/* D7C0E8 80240E48 00000000 */ nop /* D7C0EC 80240E4C 080903A9 */ j .L80240EA4 -/* D7C0F0 80240E50 00000000 */ nop +/* D7C0F0 80240E50 00000000 */ nop .L80240E54: /* D7C0F4 80240E54 10820006 */ beq $a0, $v0, .L80240E70 /* D7C0F8 80240E58 24020002 */ addiu $v0, $zero, 2 /* D7C0FC 80240E5C 080903A9 */ j .L80240EA4 -/* D7C100 80240E60 00000000 */ nop +/* D7C100 80240E60 00000000 */ nop .L80240E64: /* D7C104 80240E64 8CA20000 */ lw $v0, ($a1) /* D7C108 80240E68 080903A6 */ j .L80240E98 diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240F50_D7C1F0.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240F50_D7C1F0.s index 6a09d36288..27608fc840 100644 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240F50_D7C1F0.s +++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240F50_D7C1F0.s @@ -26,7 +26,7 @@ glabel func_80240F50_D7C1F0 /* D7C240 80240FA0 1440FFFA */ bnez $v0, .L80240F8C /* D7C244 80240FA4 24A50004 */ addiu $a1, $a1, 4 /* D7C248 80240FA8 080903FB */ j .L80240FEC -/* D7C24C 80240FAC 00000000 */ nop +/* D7C24C 80240FAC 00000000 */ nop .L80240FB0: /* D7C250 80240FB0 0000182D */ daddu $v1, $zero, $zero /* D7C254 80240FB4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240054_D7CBA4.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240054_D7CBA4.s index dc4979427d..912e155cec 100644 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240054_D7CBA4.s +++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240054_D7CBA4.s @@ -40,7 +40,7 @@ glabel func_80240054_D7CBA4 /* D7CC20 802400D0 1440FFF7 */ bnez $v0, .L802400B0 /* D7CC24 802400D4 24820001 */ addiu $v0, $a0, 1 /* D7CC28 802400D8 03E00008 */ jr $ra -/* D7CC2C 802400DC 00000000 */ nop +/* D7CC2C 802400DC 00000000 */ nop .L802400E0: /* D7CC30 802400E0 3C020100 */ lui $v0, 0x100 .L802400E4: diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s index 35e9df5da3..153b9380cd 100644 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s +++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s @@ -16,7 +16,7 @@ glabel func_80240128_D7CC78 /* D7CCA4 80240154 27B20020 */ addiu $s2, $sp, 0x20 /* D7CCA8 80240158 8E0400CC */ lw $a0, 0xcc($s0) /* D7CCAC 8024015C 0C044181 */ jal get_shadow_by_index -/* D7CCB0 80240160 00000000 */ nop +/* D7CCB0 80240160 00000000 */ nop /* D7CCB4 80240164 0C048B77 */ jal func_80122DDC /* D7CCB8 80240168 84440008 */ lh $a0, 8($v0) /* D7CCBC 8024016C 8C430000 */ lw $v1, ($v0) @@ -38,22 +38,22 @@ glabel func_80240128_D7CC78 /* D7CCFC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D7CD00 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) /* D7CD04 802401B4 0C090008 */ jal pra_29_UnkFunc2 -/* D7CD08 802401B8 00000000 */ nop +/* D7CD08 802401B8 00000000 */ nop /* D7CD0C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D7CD10 802401C0 3C014307 */ lui $at, 0x4307 /* D7CD14 802401C4 44810000 */ mtc1 $at, $f0 -/* D7CD18 802401C8 00000000 */ nop +/* D7CD18 802401C8 00000000 */ nop /* D7CD1C 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D7CD20 802401D0 00000000 */ nop +/* D7CD20 802401D0 00000000 */ nop /* D7CD24 802401D4 4500000B */ bc1f .L80240204 /* D7CD28 802401D8 24040002 */ addiu $a0, $zero, 2 /* D7CD2C 802401DC 3C014361 */ lui $at, 0x4361 /* D7CD30 802401E0 44810000 */ mtc1 $at, $f0 -/* D7CD34 802401E4 00000000 */ nop +/* D7CD34 802401E4 00000000 */ nop /* D7CD38 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D7CD3C 802401EC 00000000 */ nop +/* D7CD3C 802401EC 00000000 */ nop /* D7CD40 802401F0 45000004 */ bc1f .L80240204 -/* D7CD44 802401F4 00000000 */ nop +/* D7CD44 802401F4 00000000 */ nop /* D7CD48 802401F8 0C090015 */ jal func_80240054_D7CBA4 /* D7CD4C 802401FC 0040202D */ daddu $a0, $v0, $zero /* D7CD50 80240200 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240128_D7CC78 /* D7CDD8 80240288 AFA0001C */ sw $zero, 0x1c($sp) .L8024028C: /* D7CDDC 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D7CDE0 80240290 00000000 */ nop +/* D7CDE0 80240290 00000000 */ nop .L80240294: /* D7CDE4 80240294 9202000E */ lbu $v0, 0xe($s0) /* D7CDE8 80240298 3C01802E */ lui $at, %hi(D_802D9D70) diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802402F0_D7CE40.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802402F0_D7CE40.s index d810201e43..55b8cab06c 100644 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802402F0_D7CE40.s +++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802402F0_D7CE40.s @@ -33,7 +33,7 @@ glabel func_802402F0_D7CE40 /* D7CEB0 80240360 E7B40010 */ swc1 $f20, 0x10($sp) /* D7CEB4 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) /* D7CEB8 80240368 0C00A6C9 */ jal clamp_angle -/* D7CEBC 8024036C 00000000 */ nop +/* D7CEBC 8024036C 00000000 */ nop /* D7CEC0 80240370 44050000 */ mfc1 $a1, $f0 /* D7CEC4 80240374 4406A000 */ mfc1 $a2, $f20 /* D7CEC8 80240378 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_8024049C_D7CFEC.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_8024049C_D7CFEC.s index 4f6643e757..e29f16f146 100644 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_8024049C_D7CFEC.s +++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_8024049C_D7CFEC.s @@ -10,7 +10,7 @@ glabel func_8024049C_D7CFEC /* D7D000 802404B0 0440000E */ bltz $v0, .L802404EC /* D7D004 802404B4 28420002 */ slti $v0, $v0, 2 /* D7D008 802404B8 1040000C */ beqz $v0, .L802404EC -/* D7D00C 802404BC 00000000 */ nop +/* D7D00C 802404BC 00000000 */ nop /* D7D010 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D7D050) /* D7D014 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D7D050) /* D7D018 802404C8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240500_D7D050.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240500_D7D050.s index ab42ee271e..36afc77cff 100644 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240500_D7D050.s +++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240500_D7D050.s @@ -16,7 +16,7 @@ glabel func_80240500_D7D050 /* D7D07C 8024052C 27B10020 */ addiu $s1, $sp, 0x20 /* D7D080 80240530 8E0400CC */ lw $a0, 0xcc($s0) /* D7D084 80240534 0C044181 */ jal get_shadow_by_index -/* D7D088 80240538 00000000 */ nop +/* D7D088 80240538 00000000 */ nop /* D7D08C 8024053C 0C048B77 */ jal func_80122DDC /* D7D090 80240540 84440008 */ lh $a0, 8($v0) /* D7D094 80240544 8E050028 */ lw $a1, 0x28($s0) @@ -33,7 +33,7 @@ glabel func_80240500_D7D050 /* D7D0C0 80240570 46000007 */ neg.s $f0, $f0 /* D7D0C4 80240574 44060000 */ mfc1 $a2, $f0 /* D7D0C8 80240578 0C00B94E */ jal get_screen_coords -/* D7D0CC 8024057C 00000000 */ nop +/* D7D0CC 8024057C 00000000 */ nop /* D7D0D0 80240580 8E0500A4 */ lw $a1, 0xa4($s0) /* D7D0D4 80240584 3C063F80 */ lui $a2, 0x3f80 /* D7D0D8 80240588 0C0B76A3 */ jal func_802DDA8C @@ -72,13 +72,13 @@ glabel func_80240500_D7D050 /* D7D158 80240608 AFA0001C */ sw $zero, 0x1c($sp) .L8024060C: /* D7D15C 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D7D160 80240610 00000000 */ nop +/* D7D160 80240610 00000000 */ nop .L80240614: /* D7D164 80240614 9202000E */ lbu $v0, 0xe($s0) /* D7D168 80240618 3C01802E */ lui $at, %hi(D_802D9D71) /* D7D16C 8024061C A0229D71 */ sb $v0, %lo(D_802D9D71)($at) /* D7D170 80240620 0809018C */ j .L80240630 -/* D7D174 80240624 00000000 */ nop +/* D7D174 80240624 00000000 */ nop .L80240628: /* D7D178 80240628 3C01802E */ lui $at, %hi(D_802D9D71) /* D7D17C 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_8024068C_D7D1DC.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_8024068C_D7D1DC.s index cce7a0310a..ba3352a79c 100644 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_8024068C_D7D1DC.s +++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_8024068C_D7D1DC.s @@ -33,7 +33,7 @@ glabel func_8024068C_D7D1DC /* D7D24C 802406FC E7B40010 */ swc1 $f20, 0x10($sp) /* D7D250 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) /* D7D254 80240704 0C00A6C9 */ jal clamp_angle -/* D7D258 80240708 00000000 */ nop +/* D7D258 80240708 00000000 */ nop /* D7D25C 8024070C 44050000 */ mfc1 $a1, $f0 /* D7D260 80240710 4406A000 */ mfc1 $a2, $f20 /* D7D264 80240714 4407A000 */ mfc1 $a3, $f20 @@ -95,16 +95,16 @@ glabel func_8024068C_D7D1DC /* D7D344 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D7D348 802407F8 3C0142B4 */ lui $at, 0x42b4 /* D7D34C 802407FC 44810000 */ mtc1 $at, $f0 -/* D7D350 80240800 00000000 */ nop +/* D7D350 80240800 00000000 */ nop /* D7D354 80240804 4602003E */ c.le.s $f0, $f2 -/* D7D358 80240808 00000000 */ nop +/* D7D358 80240808 00000000 */ nop /* D7D35C 8024080C 4500000A */ bc1f .L80240838 /* D7D360 80240810 24040001 */ addiu $a0, $zero, 1 /* D7D364 80240814 3C014387 */ lui $at, 0x4387 /* D7D368 80240818 44810000 */ mtc1 $at, $f0 -/* D7D36C 8024081C 00000000 */ nop +/* D7D36C 8024081C 00000000 */ nop /* D7D370 80240820 4600103C */ c.lt.s $f2, $f0 -/* D7D374 80240824 00000000 */ nop +/* D7D374 80240824 00000000 */ nop /* D7D378 80240828 45000004 */ bc1f .L8024083C /* D7D37C 8024082C 27A20018 */ addiu $v0, $sp, 0x18 /* D7D380 80240830 3C041000 */ lui $a0, 0x1000 diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240870_D7D3C0.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240870_D7D3C0.s index 87c0e1eb6f..9f55ef22db 100644 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240870_D7D3C0.s +++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240870_D7D3C0.s @@ -43,36 +43,36 @@ glabel func_80240870_D7D3C0 /* D7D454 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D7D458 80240908 3C0142B4 */ lui $at, 0x42b4 /* D7D45C 8024090C 44810000 */ mtc1 $at, $f0 -/* D7D460 80240910 00000000 */ nop +/* D7D460 80240910 00000000 */ nop /* D7D464 80240914 4602003C */ c.lt.s $f0, $f2 -/* D7D468 80240918 00000000 */ nop +/* D7D468 80240918 00000000 */ nop /* D7D46C 8024091C 4500000A */ bc1f .L80240948 -/* D7D470 80240920 00000000 */ nop +/* D7D470 80240920 00000000 */ nop /* D7D474 80240924 3C014334 */ lui $at, 0x4334 /* D7D478 80240928 44812000 */ mtc1 $at, $f4 -/* D7D47C 8024092C 00000000 */ nop +/* D7D47C 8024092C 00000000 */ nop /* D7D480 80240930 4604103E */ c.le.s $f2, $f4 -/* D7D484 80240934 00000000 */ nop +/* D7D484 80240934 00000000 */ nop /* D7D488 80240938 45000003 */ bc1f .L80240948 -/* D7D48C 8024093C 00000000 */ nop +/* D7D48C 8024093C 00000000 */ nop /* D7D490 80240940 08090276 */ j .L802409D8 /* D7D494 80240944 46022501 */ sub.s $f20, $f4, $f2 .L80240948: /* D7D498 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) /* D7D49C 8024094C 3C014334 */ lui $at, 0x4334 /* D7D4A0 80240950 44812000 */ mtc1 $at, $f4 -/* D7D4A4 80240954 00000000 */ nop +/* D7D4A4 80240954 00000000 */ nop /* D7D4A8 80240958 4600203C */ c.lt.s $f4, $f0 -/* D7D4AC 8024095C 00000000 */ nop +/* D7D4AC 8024095C 00000000 */ nop /* D7D4B0 80240960 4500000C */ bc1f .L80240994 -/* D7D4B4 80240964 00000000 */ nop +/* D7D4B4 80240964 00000000 */ nop /* D7D4B8 80240968 3C014387 */ lui $at, 0x4387 /* D7D4BC 8024096C 44812000 */ mtc1 $at, $f4 -/* D7D4C0 80240970 00000000 */ nop +/* D7D4C0 80240970 00000000 */ nop /* D7D4C4 80240974 4604003E */ c.le.s $f0, $f4 -/* D7D4C8 80240978 00000000 */ nop +/* D7D4C8 80240978 00000000 */ nop /* D7D4CC 8024097C 45000008 */ bc1f .L802409A0 -/* D7D4D0 80240980 00000000 */ nop +/* D7D4D0 80240980 00000000 */ nop /* D7D4D4 80240984 3C014334 */ lui $at, 0x4334 /* D7D4D8 80240988 44812000 */ mtc1 $at, $f4 /* D7D4DC 8024098C 08090276 */ j .L802409D8 @@ -80,19 +80,19 @@ glabel func_80240870_D7D3C0 .L80240994: /* D7D4E4 80240994 3C014387 */ lui $at, 0x4387 /* D7D4E8 80240998 44812000 */ mtc1 $at, $f4 -/* D7D4EC 8024099C 00000000 */ nop +/* D7D4EC 8024099C 00000000 */ nop .L802409A0: /* D7D4F0 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D7D4F4 802409A4 00000000 */ nop +/* D7D4F4 802409A4 00000000 */ nop /* D7D4F8 802409A8 4500000A */ bc1f .L802409D4 -/* D7D4FC 802409AC 00000000 */ nop +/* D7D4FC 802409AC 00000000 */ nop /* D7D500 802409B0 3C0143B4 */ lui $at, 0x43b4 /* D7D504 802409B4 44811000 */ mtc1 $at, $f2 -/* D7D508 802409B8 00000000 */ nop +/* D7D508 802409B8 00000000 */ nop /* D7D50C 802409BC 4602003E */ c.le.s $f0, $f2 -/* D7D510 802409C0 00000000 */ nop +/* D7D510 802409C0 00000000 */ nop /* D7D514 802409C4 45000003 */ bc1f .L802409D4 -/* D7D518 802409C8 00000000 */ nop +/* D7D518 802409C8 00000000 */ nop /* D7D51C 802409CC 08090276 */ j .L802409D8 /* D7D520 802409D0 46001501 */ sub.s $f20, $f2, $f0 .L802409D4: @@ -100,11 +100,11 @@ glabel func_80240870_D7D3C0 .L802409D8: /* D7D528 802409D8 3C0141C8 */ lui $at, 0x41c8 /* D7D52C 802409DC 44810000 */ mtc1 $at, $f0 -/* D7D530 802409E0 00000000 */ nop +/* D7D530 802409E0 00000000 */ nop /* D7D534 802409E4 4600A003 */ div.s $f0, $f20, $f0 /* D7D538 802409E8 4600010D */ trunc.w.s $f4, $f0 /* D7D53C 802409EC 44072000 */ mfc1 $a3, $f4 -/* D7D540 802409F0 00000000 */ nop +/* D7D540 802409F0 00000000 */ nop /* D7D544 802409F4 00071100 */ sll $v0, $a3, 4 /* D7D548 802409F8 00471023 */ subu $v0, $v0, $a3 /* D7D54C 802409FC 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel func_80240870_D7D3C0 /* D7D594 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) /* D7D598 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) /* D7D59C 80240A4C 0C00A6C9 */ jal clamp_angle -/* D7D5A0 80240A50 00000000 */ nop +/* D7D5A0 80240A50 00000000 */ nop /* D7D5A4 80240A54 44050000 */ mfc1 $a1, $f0 /* D7D5A8 80240A58 4406B000 */ mfc1 $a2, $f22 /* D7D5AC 80240A5C 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel func_80240870_D7D3C0 /* D7D610 80240AC0 24040001 */ addiu $a0, $zero, 1 .L80240AC4: /* D7D614 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D7D618 80240AC8 00000000 */ nop +/* D7D618 80240AC8 00000000 */ nop /* D7D61C 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 /* D7D620 80240AD0 24040001 */ addiu $a0, $zero, 1 .L80240AD4: @@ -204,10 +204,10 @@ glabel func_80240870_D7D3C0 /* D7D6B0 80240B60 44812000 */ mtc1 $at, $f4 /* D7D6B4 80240B64 00021023 */ negu $v0, $v0 /* D7D6B8 80240B68 44820000 */ mtc1 $v0, $f0 -/* D7D6BC 80240B6C 00000000 */ nop +/* D7D6BC 80240B6C 00000000 */ nop /* D7D6C0 80240B70 46800020 */ cvt.s.w $f0, $f0 /* D7D6C4 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D7D6C8 80240B78 00000000 */ nop +/* D7D6C8 80240B78 00000000 */ nop /* D7D6CC 80240B7C 4405B000 */ mfc1 $a1, $f22 /* D7D6D0 80240B80 4407B000 */ mfc1 $a3, $f22 /* D7D6D4 80240B84 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel func_80240870_D7D3C0 /* D7D744 80240BF4 3C013F00 */ lui $at, 0x3f00 /* D7D748 80240BF8 44812000 */ mtc1 $at, $f4 /* D7D74C 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D7D750 80240C00 00000000 */ nop +/* D7D750 80240C00 00000000 */ nop /* D7D754 80240C04 46800020 */ cvt.s.w $f0, $f0 /* D7D758 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D7D75C 80240C0C 00000000 */ nop +/* D7D75C 80240C0C 00000000 */ nop /* D7D760 80240C10 4405B000 */ mfc1 $a1, $f22 /* D7D764 80240C14 4407B000 */ mfc1 $a3, $f22 /* D7D768 80240C18 44062000 */ mfc1 $a2, $f4 @@ -280,16 +280,16 @@ glabel func_80240870_D7D3C0 /* D7D7E0 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D7D7E4 80240C94 3C0142B4 */ lui $at, 0x42b4 /* D7D7E8 80240C98 44810000 */ mtc1 $at, $f0 -/* D7D7EC 80240C9C 00000000 */ nop +/* D7D7EC 80240C9C 00000000 */ nop /* D7D7F0 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D7D7F4 80240CA4 00000000 */ nop +/* D7D7F4 80240CA4 00000000 */ nop /* D7D7F8 80240CA8 4500000A */ bc1f .L80240CD4 /* D7D7FC 80240CAC 24040001 */ addiu $a0, $zero, 1 /* D7D800 80240CB0 3C014387 */ lui $at, 0x4387 /* D7D804 80240CB4 44812000 */ mtc1 $at, $f4 -/* D7D808 80240CB8 00000000 */ nop +/* D7D808 80240CB8 00000000 */ nop /* D7D80C 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D7D810 80240CC0 00000000 */ nop +/* D7D810 80240CC0 00000000 */ nop /* D7D814 80240CC4 45000004 */ bc1f .L80240CD8 /* D7D818 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 /* D7D81C 80240CCC 3C041000 */ lui $a0, 0x1000 @@ -305,7 +305,7 @@ glabel func_80240870_D7D3C0 /* D7D83C 80240CEC 26730001 */ addiu $s3, $s3, 1 /* D7D840 80240CF0 2A620002 */ slti $v0, $s3, 2 /* D7D844 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D7D848 80240CF8 00000000 */ nop +/* D7D848 80240CF8 00000000 */ nop /* D7D84C 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) /* D7D850 80240D00 8FB60148 */ lw $s6, 0x148($sp) /* D7D854 80240D04 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240D3C_D7D88C.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240D3C_D7D88C.s index 2ba6aa2b10..6cec4b7e08 100644 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240D3C_D7D88C.s +++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240D3C_D7D88C.s @@ -11,36 +11,36 @@ glabel func_80240D3C_D7D88C /* D7D8A4 80240D54 24020001 */ addiu $v0, $zero, 1 /* D7D8A8 80240D58 8E030084 */ lw $v1, 0x84($s0) /* D7D8AC 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D7D8B0 80240D60 00000000 */ nop +/* D7D8B0 80240D60 00000000 */ nop /* D7D8B4 80240D64 28620002 */ slti $v0, $v1, 2 /* D7D8B8 80240D68 50400005 */ beql $v0, $zero, .L80240D80 /* D7D8BC 80240D6C 24020002 */ addiu $v0, $zero, 2 /* D7D8C0 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D7D8C4 80240D74 00000000 */ nop +/* D7D8C4 80240D74 00000000 */ nop /* D7D8C8 80240D78 08090378 */ j .L80240DE0 -/* D7D8CC 80240D7C 00000000 */ nop +/* D7D8CC 80240D7C 00000000 */ nop .L80240D80: /* D7D8D0 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D7D8D4 80240D84 00000000 */ nop +/* D7D8D4 80240D84 00000000 */ nop /* D7D8D8 80240D88 08090378 */ j .L80240DE0 -/* D7D8DC 80240D8C 00000000 */ nop +/* D7D8DC 80240D8C 00000000 */ nop .L80240D90: /* D7D8E0 80240D90 3C048024 */ lui $a0, %hi(pra_29_SetPartnerFlagsA0000) /* D7D8E4 80240D94 24840E84 */ addiu $a0, $a0, %lo(pra_29_SetPartnerFlagsA0000) /* D7D8E8 80240D98 08090374 */ j .L80240DD0 -/* D7D8EC 80240D9C 00000000 */ nop +/* D7D8EC 80240D9C 00000000 */ nop .L80240DA0: /* D7D8F0 80240DA0 3C048024 */ lui $a0, %hi(pra_29_SetPartnerFlags20000) /* D7D8F4 80240DA4 24840EEC */ addiu $a0, $a0, %lo(pra_29_SetPartnerFlags20000) /* D7D8F8 80240DA8 08090374 */ j .L80240DD0 -/* D7D8FC 80240DAC 00000000 */ nop +/* D7D8FC 80240DAC 00000000 */ nop .L80240DB0: /* D7D900 80240DB0 8E020084 */ lw $v0, 0x84($s0) /* D7D904 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D7D908 80240DB8 00000000 */ nop +/* D7D908 80240DB8 00000000 */ nop /* D7D90C 80240DBC 28420002 */ slti $v0, $v0, 2 /* D7D910 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D7D914 80240DC4 00000000 */ nop +/* D7D914 80240DC4 00000000 */ nop .L80240DC8: /* D7D918 80240DC8 3C048024 */ lui $a0, %hi(pra_29_SetPartnerFlags80000) /* D7D91C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(pra_29_SetPartnerFlags80000) @@ -64,14 +64,14 @@ glabel func_80240D3C_D7D88C /* D7D95C 80240E0C 10400005 */ beqz $v0, .L80240E24 /* D7D960 80240E10 24020002 */ addiu $v0, $zero, 2 /* D7D964 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D7D968 80240E18 00000000 */ nop +/* D7D968 80240E18 00000000 */ nop /* D7D96C 80240E1C 0809039D */ j .L80240E74 -/* D7D970 80240E20 00000000 */ nop +/* D7D970 80240E20 00000000 */ nop .L80240E24: /* D7D974 80240E24 10820006 */ beq $a0, $v0, .L80240E40 /* D7D978 80240E28 24020002 */ addiu $v0, $zero, 2 /* D7D97C 80240E2C 0809039D */ j .L80240E74 -/* D7D980 80240E30 00000000 */ nop +/* D7D980 80240E30 00000000 */ nop .L80240E34: /* D7D984 80240E34 8CA20000 */ lw $v0, ($a1) /* D7D988 80240E38 0809039A */ j .L80240E68 diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240F20_D7DA70.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240F20_D7DA70.s index b877f01518..7188ff32ec 100644 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240F20_D7DA70.s +++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240F20_D7DA70.s @@ -20,11 +20,11 @@ glabel func_80240F20_D7DA70 /* D7DAA4 80240F54 004B0018 */ mult $v0, $t3 /* D7DAA8 80240F58 00001812 */ mflo $v1 /* D7DAAC 80240F5C 84A20000 */ lh $v0, ($a1) -/* D7DAB0 80240F60 00000000 */ nop +/* D7DAB0 80240F60 00000000 */ nop /* D7DAB4 80240F64 004C0018 */ mult $v0, $t4 /* D7DAB8 80240F68 00001012 */ mflo $v0 /* D7DABC 80240F6C 00621821 */ addu $v1, $v1, $v0 -/* D7DAC0 80240F70 00000000 */ nop +/* D7DAC0 80240F70 00000000 */ nop /* D7DAC4 80240F74 00680018 */ mult $v1, $t0 /* D7DAC8 80240F78 00001010 */ mfhi $v0 /* D7DACC 80240F7C 00431021 */ addu $v0, $v0, $v1 @@ -36,11 +36,11 @@ glabel func_80240F20_D7DA70 /* D7DAE4 80240F94 004B0018 */ mult $v0, $t3 /* D7DAE8 80240F98 00001812 */ mflo $v1 /* D7DAEC 80240F9C 84A20002 */ lh $v0, 2($a1) -/* D7DAF0 80240FA0 00000000 */ nop +/* D7DAF0 80240FA0 00000000 */ nop /* D7DAF4 80240FA4 004C0018 */ mult $v0, $t4 /* D7DAF8 80240FA8 00001012 */ mflo $v0 /* D7DAFC 80240FAC 00621821 */ addu $v1, $v1, $v0 -/* D7DB00 80240FB0 00000000 */ nop +/* D7DB00 80240FB0 00000000 */ nop /* D7DB04 80240FB4 00680018 */ mult $v1, $t0 /* D7DB08 80240FB8 00001010 */ mfhi $v0 /* D7DB0C 80240FBC 00431021 */ addu $v0, $v0, $v1 @@ -52,11 +52,11 @@ glabel func_80240F20_D7DA70 /* D7DB24 80240FD4 004B0018 */ mult $v0, $t3 /* D7DB28 80240FD8 00001812 */ mflo $v1 /* D7DB2C 80240FDC 84A20004 */ lh $v0, 4($a1) -/* D7DB30 80240FE0 00000000 */ nop +/* D7DB30 80240FE0 00000000 */ nop /* D7DB34 80240FE4 004C0018 */ mult $v0, $t4 /* D7DB38 80240FE8 00001012 */ mflo $v0 /* D7DB3C 80240FEC 00621821 */ addu $v1, $v1, $v0 -/* D7DB40 80240FF0 00000000 */ nop +/* D7DB40 80240FF0 00000000 */ nop /* D7DB44 80240FF4 00680018 */ mult $v1, $t0 /* D7DB48 80240FF8 00001010 */ mfhi $v0 /* D7DB4C 80240FFC 00431021 */ addu $v0, $v0, $v1 @@ -68,11 +68,11 @@ glabel func_80240F20_D7DA70 /* D7DB64 80241014 004D0018 */ mult $v0, $t5 /* D7DB68 80241018 00001812 */ mflo $v1 /* D7DB6C 8024101C 84A20008 */ lh $v0, 8($a1) -/* D7DB70 80241020 00000000 */ nop +/* D7DB70 80241020 00000000 */ nop /* D7DB74 80241024 004A0018 */ mult $v0, $t2 /* D7DB78 80241028 00001012 */ mflo $v0 /* D7DB7C 8024102C 00621821 */ addu $v1, $v1, $v0 -/* D7DB80 80241030 00000000 */ nop +/* D7DB80 80241030 00000000 */ nop /* D7DB84 80241034 00680018 */ mult $v1, $t0 /* D7DB88 80241038 00001010 */ mfhi $v0 /* D7DB8C 8024103C 00431021 */ addu $v0, $v0, $v1 @@ -84,11 +84,11 @@ glabel func_80240F20_D7DA70 /* D7DBA4 80241054 004D0018 */ mult $v0, $t5 /* D7DBA8 80241058 00001812 */ mflo $v1 /* D7DBAC 8024105C 84A2000A */ lh $v0, 0xa($a1) -/* D7DBB0 80241060 00000000 */ nop +/* D7DBB0 80241060 00000000 */ nop /* D7DBB4 80241064 004A0018 */ mult $v0, $t2 /* D7DBB8 80241068 00001012 */ mflo $v0 /* D7DBBC 8024106C 00621821 */ addu $v1, $v1, $v0 -/* D7DBC0 80241070 00000000 */ nop +/* D7DBC0 80241070 00000000 */ nop /* D7DBC4 80241074 00680018 */ mult $v1, $t0 /* D7DBC8 80241078 25290001 */ addiu $t1, $t1, 1 /* D7DBCC 8024107C 24840010 */ addiu $a0, $a0, 0x10 @@ -104,4 +104,4 @@ glabel func_80240F20_D7DA70 /* D7DBF4 802410A4 24C60010 */ addiu $a2, $a2, 0x10 .L802410A8: /* D7DBF8 802410A8 03E00008 */ jr $ra -/* D7DBFC 802410AC 00000000 */ nop +/* D7DBFC 802410AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802411D4_D7DD24.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802411D4_D7DD24.s index ecf52834cd..38f124ade5 100644 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802411D4_D7DD24.s +++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802411D4_D7DD24.s @@ -22,15 +22,15 @@ glabel func_802411D4_D7DD24 /* D7DD68 80241218 0C0B1EAF */ jal get_variable /* D7DD6C 8024121C 0040802D */ daddu $s0, $v0, $zero /* D7DD70 80241220 44920000 */ mtc1 $s2, $f0 -/* D7DD74 80241224 00000000 */ nop +/* D7DD74 80241224 00000000 */ nop /* D7DD78 80241228 46800020 */ cvt.s.w $f0, $f0 /* D7DD7C 8024122C 44050000 */ mfc1 $a1, $f0 /* D7DD80 80241230 44900000 */ mtc1 $s0, $f0 -/* D7DD84 80241234 00000000 */ nop +/* D7DD84 80241234 00000000 */ nop /* D7DD88 80241238 46800020 */ cvt.s.w $f0, $f0 /* D7DD8C 8024123C 44060000 */ mfc1 $a2, $f0 /* D7DD90 80241240 44820000 */ mtc1 $v0, $f0 -/* D7DD94 80241244 00000000 */ nop +/* D7DD94 80241244 00000000 */ nop /* D7DD98 80241248 46800020 */ cvt.s.w $f0, $f0 /* D7DD9C 8024124C 44070000 */ mfc1 $a3, $f0 /* D7DDA0 80241250 0000202D */ daddu $a0, $zero, $zero @@ -43,5 +43,5 @@ glabel func_802411D4_D7DD24 /* D7DDBC 8024126C 24020002 */ addiu $v0, $zero, 2 /* D7DDC0 80241270 03E00008 */ jr $ra /* D7DDC4 80241274 27BD0028 */ addiu $sp, $sp, 0x28 -/* D7DDC8 80241278 00000000 */ nop -/* D7DDCC 8024127C 00000000 */ nop +/* D7DDC8 80241278 00000000 */ nop +/* D7DDCC 8024127C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7ED60/func_80240000_D7ED60.s b/asm/nonmatchings/world/area_pra/pra_31/D7ED60/func_80240000_D7ED60.s index adad13c24e..a386944593 100644 --- a/asm/nonmatchings/world/area_pra/pra_31/D7ED60/func_80240000_D7ED60.s +++ b/asm/nonmatchings/world/area_pra/pra_31/D7ED60/func_80240000_D7ED60.s @@ -8,5 +8,5 @@ glabel func_80240000_D7ED60 /* D7ED6C 8024000C A0620084 */ sb $v0, 0x84($v1) /* D7ED70 80240010 03E00008 */ jr $ra /* D7ED74 80240014 0000102D */ daddu $v0, $zero, $zero -/* D7ED78 80240018 00000000 */ nop -/* D7ED7C 8024001C 00000000 */ nop +/* D7ED78 80240018 00000000 */ nop +/* D7ED7C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402D8_D7F038.s b/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402D8_D7F038.s index c65575327c..cb2a504541 100644 --- a/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402D8_D7F038.s +++ b/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402D8_D7F038.s @@ -28,7 +28,7 @@ glabel func_802402D8_D7F038 /* D7F08C 8024032C 00220821 */ addu $at, $at, $v0 /* D7F090 80240330 AC207CA0 */ sw $zero, %lo(D_80247CA0)($at) /* D7F094 80240334 080900D9 */ j .L80240364 -/* D7F098 80240338 00000000 */ nop +/* D7F098 80240338 00000000 */ nop .L8024033C: /* D7F09C 8024033C 3C038024 */ lui $v1, %hi(D_80247CA0) /* D7F0A0 80240340 24637CA0 */ addiu $v1, $v1, %lo(D_80247CA0) diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_80240374_D7F0D4.s b/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_80240374_D7F0D4.s index f4ff685962..73ed4e155f 100644 --- a/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_80240374_D7F0D4.s +++ b/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_80240374_D7F0D4.s @@ -28,7 +28,7 @@ glabel func_80240374_D7F0D4 /* D7F128 802403C8 00220821 */ addu $at, $at, $v0 /* D7F12C 802403CC AC207E68 */ sw $zero, %lo(D_80247E68)($at) /* D7F130 802403D0 08090100 */ j .L80240400 -/* D7F134 802403D4 00000000 */ nop +/* D7F134 802403D4 00000000 */ nop .L802403D8: /* D7F138 802403D8 3C038024 */ lui $v1, %hi(D_80247E68) /* D7F13C 802403DC 24637E68 */ addiu $v1, $v1, %lo(D_80247E68) diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_80240468_D7F1C8.s b/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_80240468_D7F1C8.s index 31ba28cb2c..e0b40ab569 100644 --- a/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_80240468_D7F1C8.s +++ b/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_80240468_D7F1C8.s @@ -44,6 +44,6 @@ glabel func_80240468_D7F1C8 /* D7F258 802404F8 AC8200A4 */ sw $v0, 0xa4($a0) /* D7F25C 802404FC 03E00008 */ jr $ra /* D7F260 80240500 24020002 */ addiu $v0, $zero, 2 -/* D7F264 80240504 00000000 */ nop -/* D7F268 80240508 00000000 */ nop -/* D7F26C 8024050C 00000000 */ nop +/* D7F264 80240504 00000000 */ nop +/* D7F268 80240508 00000000 */ nop +/* D7F26C 8024050C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7F270/delete_actor_D7F91C.s b/asm/nonmatchings/world/area_pra/pra_31/D7F270/delete_actor_D7F91C.s index 4b0d41a8d0..1d70a9f79f 100644 --- a/asm/nonmatchings/world/area_pra/pra_31/D7F270/delete_actor_D7F91C.s +++ b/asm/nonmatchings/world/area_pra/pra_31/D7F270/delete_actor_D7F91C.s @@ -23,7 +23,7 @@ glabel delete_actor_D7F91C /* D7F964 80240C04 2402005A */ addiu $v0, $zero, 0x5a /* D7F968 80240C08 4600008D */ trunc.w.s $f2, $f0 /* D7F96C 80240C0C 44031000 */ mfc1 $v1, $f2 -/* D7F970 80240C10 00000000 */ nop +/* D7F970 80240C10 00000000 */ nop /* D7F974 80240C14 1062000F */ beq $v1, $v0, .L80240C54 /* D7F978 80240C18 2862005B */ slti $v0, $v1, 0x5b /* D7F97C 80240C1C 10400005 */ beqz $v0, .L80240C34 @@ -31,14 +31,14 @@ glabel delete_actor_D7F91C /* D7F984 80240C24 5060000C */ beql $v1, $zero, .L80240C58 /* D7F988 80240C28 AE220084 */ sw $v0, 0x84($s1) /* D7F98C 80240C2C 08090316 */ j .L80240C58 -/* D7F990 80240C30 00000000 */ nop +/* D7F990 80240C30 00000000 */ nop .L80240C34: /* D7F994 80240C34 10620005 */ beq $v1, $v0, .L80240C4C /* D7F998 80240C38 2402010E */ addiu $v0, $zero, 0x10e /* D7F99C 80240C3C 50620006 */ beql $v1, $v0, .L80240C58 /* D7F9A0 80240C40 AE230084 */ sw $v1, 0x84($s1) /* D7F9A4 80240C44 08090316 */ j .L80240C58 -/* D7F9A8 80240C48 00000000 */ nop +/* D7F9A8 80240C48 00000000 */ nop .L80240C4C: /* D7F9AC 80240C4C 08090316 */ j .L80240C58 /* D7F9B0 80240C50 AE200084 */ sw $zero, 0x84($s1) diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240510_D7F270.s b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240510_D7F270.s index a7e6a16afd..7bfe974c79 100644 --- a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240510_D7F270.s +++ b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240510_D7F270.s @@ -48,7 +48,7 @@ glabel func_80240510_D7F270 /* D7F314 802405B4 250824F0 */ addiu $t0, $t0, %lo(func_802424F0_C38A20) .L802405B8: /* D7F318 802405B8 11400009 */ beqz $t2, .L802405E0 -/* D7F31C 802405BC 00000000 */ nop +/* D7F31C 802405BC 00000000 */ nop /* D7F320 802405C0 95020002 */ lhu $v0, 2($t0) /* D7F324 802405C4 A4E20000 */ sh $v0, ($a3) /* D7F328 802405C8 95020006 */ lhu $v0, 6($t0) @@ -78,7 +78,7 @@ glabel func_80240510_D7F270 /* D7F380 80240620 24420032 */ addiu $v0, $v0, 0x32 /* D7F384 80240624 84A30000 */ lh $v1, ($a1) /* D7F388 80240628 44820000 */ mtc1 $v0, $f0 -/* D7F38C 8024062C 00000000 */ nop +/* D7F38C 8024062C 00000000 */ nop /* D7F390 80240630 46800020 */ cvt.s.w $f0, $f0 /* D7F394 80240634 E4A0000A */ swc1 $f0, 0xa($a1) /* D7F398 80240638 E4A00002 */ swc1 $f0, 2($a1) @@ -89,7 +89,7 @@ glabel func_80240510_D7F270 /* D7F3AC 8024064C 00021040 */ sll $v0, $v0, 1 /* D7F3B0 80240650 2442004B */ addiu $v0, $v0, 0x4b /* D7F3B4 80240654 44820000 */ mtc1 $v0, $f0 -/* D7F3B8 80240658 00000000 */ nop +/* D7F3B8 80240658 00000000 */ nop /* D7F3BC 8024065C 46800020 */ cvt.s.w $f0, $f0 /* D7F3C0 80240660 E4A0000E */ swc1 $f0, 0xe($a1) /* D7F3C4 80240664 E4A00006 */ swc1 $f0, 6($a1) @@ -133,34 +133,34 @@ glabel func_80240510_D7F270 /* D7F454 802406F4 C462FFFC */ lwc1 $f2, -4($v1) /* D7F458 802406F8 C4600004 */ lwc1 $f0, 4($v1) /* D7F45C 802406FC 4600103C */ c.lt.s $f2, $f0 -/* D7F460 80240700 00000000 */ nop +/* D7F460 80240700 00000000 */ nop /* D7F464 80240704 45000005 */ bc1f .L8024071C -/* D7F468 80240708 00000000 */ nop +/* D7F468 80240708 00000000 */ nop /* D7F46C 8024070C 46041000 */ add.s $f0, $f2, $f4 /* D7F470 80240710 E460FFFC */ swc1 $f0, -4($v1) /* D7F474 80240714 C462FFFC */ lwc1 $f2, -4($v1) /* D7F478 80240718 C4600004 */ lwc1 $f0, 4($v1) .L8024071C: /* D7F47C 8024071C 4602003C */ c.lt.s $f0, $f2 -/* D7F480 80240720 00000000 */ nop +/* D7F480 80240720 00000000 */ nop /* D7F484 80240724 45000003 */ bc1f .L80240734 -/* D7F488 80240728 00000000 */ nop +/* D7F488 80240728 00000000 */ nop /* D7F48C 8024072C 46041001 */ sub.s $f0, $f2, $f4 /* D7F490 80240730 E460FFFC */ swc1 $f0, -4($v1) .L80240734: /* D7F494 80240734 C4620000 */ lwc1 $f2, ($v1) /* D7F498 80240738 C4600008 */ lwc1 $f0, 8($v1) /* D7F49C 8024073C 4600103C */ c.lt.s $f2, $f0 -/* D7F4A0 80240740 00000000 */ nop +/* D7F4A0 80240740 00000000 */ nop /* D7F4A4 80240744 45000005 */ bc1f .L8024075C -/* D7F4A8 80240748 00000000 */ nop +/* D7F4A8 80240748 00000000 */ nop /* D7F4AC 8024074C 46041000 */ add.s $f0, $f2, $f4 /* D7F4B0 80240750 E4600000 */ swc1 $f0, ($v1) /* D7F4B4 80240754 C4620000 */ lwc1 $f2, ($v1) /* D7F4B8 80240758 C4600008 */ lwc1 $f0, 8($v1) .L8024075C: /* D7F4BC 8024075C 4602003C */ c.lt.s $f0, $f2 -/* D7F4C0 80240760 00000000 */ nop +/* D7F4C0 80240760 00000000 */ nop /* D7F4C4 80240764 45000003 */ bc1f .L80240774 /* D7F4C8 80240768 24C60001 */ addiu $a2, $a2, 1 /* D7F4CC 8024076C 46041001 */ sub.s $f0, $f2, $f4 diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240894_D7F5F4.s b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240894_D7F5F4.s index 1f11151fdc..f16ae21345 100644 --- a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240894_D7F5F4.s +++ b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240894_D7F5F4.s @@ -27,7 +27,7 @@ glabel func_80240894_D7F5F4 /* D7F64C 802408EC 2402005A */ addiu $v0, $zero, 0x5a /* D7F650 802408F0 4600008D */ trunc.w.s $f2, $f0 /* D7F654 802408F4 44041000 */ mfc1 $a0, $f2 -/* D7F658 802408F8 00000000 */ nop +/* D7F658 802408F8 00000000 */ nop /* D7F65C 802408FC 10820011 */ beq $a0, $v0, .L80240944 /* D7F660 80240900 2882005B */ slti $v0, $a0, 0x5b /* D7F664 80240904 50400005 */ beql $v0, $zero, .L8024091C @@ -105,13 +105,13 @@ glabel func_80240894_D7F5F4 /* D7F74C 802409EC 8E430084 */ lw $v1, 0x84($s2) /* D7F750 802409F0 24020001 */ addiu $v0, $zero, 1 /* D7F754 802409F4 14620009 */ bne $v1, $v0, .L80240A1C -/* D7F758 802409F8 00000000 */ nop +/* D7F758 802409F8 00000000 */ nop /* D7F75C 802409FC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* D7F760 80240A00 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* D7F764 80240A04 804300B4 */ lb $v1, 0xb4($v0) /* D7F768 80240A08 24020014 */ addiu $v0, $zero, 0x14 /* D7F76C 80240A0C 14620003 */ bne $v1, $v0, .L80240A1C -/* D7F770 80240A10 00000000 */ nop +/* D7F770 80240A10 00000000 */ nop /* D7F774 80240A14 0C039769 */ jal set_action_state /* D7F778 80240A18 0000202D */ daddu $a0, $zero, $zero .L80240A1C: diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240A3C_D7F79C.s b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240A3C_D7F79C.s index 47e2f8415c..3c0ba2f5a8 100644 --- a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240A3C_D7F79C.s +++ b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240A3C_D7F79C.s @@ -32,23 +32,23 @@ glabel func_80240A3C_D7F79C /* D7F808 80240AA8 2402005A */ addiu $v0, $zero, 0x5a /* D7F80C 80240AAC 4600008D */ trunc.w.s $f2, $f0 /* D7F810 80240AB0 44031000 */ mfc1 $v1, $f2 -/* D7F814 80240AB4 00000000 */ nop +/* D7F814 80240AB4 00000000 */ nop /* D7F818 80240AB8 10620012 */ beq $v1, $v0, .L80240B04 -/* D7F81C 80240ABC 00000000 */ nop +/* D7F81C 80240ABC 00000000 */ nop /* D7F820 80240AC0 2862005B */ slti $v0, $v1, 0x5b /* D7F824 80240AC4 10400005 */ beqz $v0, .L80240ADC /* D7F828 80240AC8 240200B4 */ addiu $v0, $zero, 0xb4 /* D7F82C 80240ACC 10600009 */ beqz $v1, .L80240AF4 -/* D7F830 80240AD0 00000000 */ nop +/* D7F830 80240AD0 00000000 */ nop /* D7F834 80240AD4 080902CB */ j .L80240B2C -/* D7F838 80240AD8 00000000 */ nop +/* D7F838 80240AD8 00000000 */ nop .L80240ADC: /* D7F83C 80240ADC 1062000C */ beq $v1, $v0, .L80240B10 /* D7F840 80240AE0 2402010E */ addiu $v0, $zero, 0x10e /* D7F844 80240AE4 1062000E */ beq $v1, $v0, .L80240B20 -/* D7F848 80240AE8 00000000 */ nop +/* D7F848 80240AE8 00000000 */ nop /* D7F84C 80240AEC 080902CB */ j .L80240B2C -/* D7F850 80240AF0 00000000 */ nop +/* D7F850 80240AF0 00000000 */ nop .L80240AF4: /* D7F854 80240AF4 94A20002 */ lhu $v0, 2($a1) /* D7F858 80240AF8 2442FFFF */ addiu $v0, $v0, -1 @@ -87,7 +87,7 @@ glabel func_80240A3C_D7F79C /* D7F8C8 80240B68 24630032 */ addiu $v1, $v1, 0x32 /* D7F8CC 80240B6C 84A40002 */ lh $a0, 2($a1) /* D7F8D0 80240B70 44830000 */ mtc1 $v1, $f0 -/* D7F8D4 80240B74 00000000 */ nop +/* D7F8D4 80240B74 00000000 */ nop /* D7F8D8 80240B78 46800020 */ cvt.s.w $f0, $f0 /* D7F8DC 80240B7C E4A0000C */ swc1 $f0, 0xc($a1) /* D7F8E0 80240B80 00041840 */ sll $v1, $a0, 1 @@ -97,7 +97,7 @@ glabel func_80240A3C_D7F79C /* D7F8F0 80240B90 00031840 */ sll $v1, $v1, 1 /* D7F8F4 80240B94 2463004B */ addiu $v1, $v1, 0x4b /* D7F8F8 80240B98 44830000 */ mtc1 $v1, $f0 -/* D7F8FC 80240B9C 00000000 */ nop +/* D7F8FC 80240B9C 00000000 */ nop /* D7F900 80240BA0 46800020 */ cvt.s.w $f0, $f0 /* D7F904 80240BA4 E4A00010 */ swc1 $f0, 0x10($a1) /* D7F908 80240BA8 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240C70_D7F9D0.s b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240C70_D7F9D0.s index 0e3d67f2cf..6d347fce2e 100644 --- a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240C70_D7F9D0.s +++ b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240C70_D7F9D0.s @@ -25,22 +25,22 @@ glabel func_80240C70_D7F9D0 /* D7FA20 80240CC0 2402005A */ addiu $v0, $zero, 0x5a /* D7FA24 80240CC4 4600010D */ trunc.w.s $f4, $f0 /* D7FA28 80240CC8 44032000 */ mfc1 $v1, $f4 -/* D7FA2C 80240CCC 00000000 */ nop +/* D7FA2C 80240CCC 00000000 */ nop /* D7FA30 80240CD0 10620015 */ beq $v1, $v0, .L80240D28 /* D7FA34 80240CD4 2862005B */ slti $v0, $v1, 0x5b /* D7FA38 80240CD8 10400005 */ beqz $v0, .L80240CF0 /* D7FA3C 80240CDC 240200B4 */ addiu $v0, $zero, 0xb4 /* D7FA40 80240CE0 10600009 */ beqz $v1, .L80240D08 -/* D7FA44 80240CE4 00000000 */ nop +/* D7FA44 80240CE4 00000000 */ nop /* D7FA48 80240CE8 08090369 */ j .L80240DA4 -/* D7FA4C 80240CEC 00000000 */ nop +/* D7FA4C 80240CEC 00000000 */ nop .L80240CF0: /* D7FA50 80240CF0 10620015 */ beq $v1, $v0, .L80240D48 /* D7FA54 80240CF4 2402010E */ addiu $v0, $zero, 0x10e /* D7FA58 80240CF8 10620020 */ beq $v1, $v0, .L80240D7C -/* D7FA5C 80240CFC 00000000 */ nop +/* D7FA5C 80240CFC 00000000 */ nop /* D7FA60 80240D00 08090369 */ j .L80240DA4 -/* D7FA64 80240D04 00000000 */ nop +/* D7FA64 80240D04 00000000 */ nop .L80240D08: /* D7FA68 80240D08 C6000030 */ lwc1 $f0, 0x30($s0) /* D7FA6C 80240D0C 4600010D */ trunc.w.s $f4, $f0 @@ -66,7 +66,7 @@ glabel func_80240C70_D7F9D0 /* D7FAB4 80240D54 C6020030 */ lwc1 $f2, 0x30($s0) /* D7FAB8 80240D58 3C014248 */ lui $at, 0x4248 /* D7FABC 80240D5C 44810000 */ mtc1 $at, $f0 -/* D7FAC0 80240D60 00000000 */ nop +/* D7FAC0 80240D60 00000000 */ nop /* D7FAC4 80240D64 46001081 */ sub.s $f2, $f2, $f0 .L80240D68: /* D7FAC8 80240D68 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240DBC_D7FB1C.s b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240DBC_D7FB1C.s index 08fa65e7c4..071babf26c 100644 --- a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240DBC_D7FB1C.s +++ b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240DBC_D7FB1C.s @@ -9,7 +9,7 @@ glabel func_80240DBC_D7FB1C /* D7FB2C 80240DCC 3C108011 */ lui $s0, %hi(gPlayerStatus) /* D7FB30 80240DD0 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* D7FB34 80240DD4 14400005 */ bnez $v0, .L80240DEC -/* D7FB38 80240DD8 00000000 */ nop +/* D7FB38 80240DD8 00000000 */ nop /* D7FB3C 80240DDC C4800084 */ lwc1 $f0, 0x84($a0) /* D7FB40 80240DE0 46800020 */ cvt.s.w $f0, $f0 /* D7FB44 80240DE4 0809037E */ j .L80240DF8 diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240F2C_D7FC8C.s b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240F2C_D7FC8C.s index e0d117924b..87f5a67243 100644 --- a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240F2C_D7FC8C.s +++ b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240F2C_D7FC8C.s @@ -31,7 +31,7 @@ glabel func_80240F2C_D7FC8C /* D7FCF4 80240F94 34A53C81 */ ori $a1, $a1, 0x3c81 /* D7FCF8 80240F98 C60C0014 */ lwc1 $f12, 0x14($s0) /* D7FCFC 80240F9C 0C00A6C9 */ jal clamp_angle -/* D7FD00 80240FA0 00000000 */ nop +/* D7FD00 80240FA0 00000000 */ nop /* D7FD04 80240FA4 0220202D */ daddu $a0, $s1, $zero /* D7FD08 80240FA8 3C05FE36 */ lui $a1, 0xfe36 /* D7FD0C 80240FAC 44060000 */ mfc1 $a2, $f0 diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240FF0_D7FD50.s b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240FF0_D7FD50.s index 4098c34351..a3b1797a56 100644 --- a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240FF0_D7FD50.s +++ b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240FF0_D7FD50.s @@ -18,13 +18,13 @@ glabel func_80240FF0_D7FD50 /* D7FD84 80241024 24020014 */ addiu $v0, $zero, 0x14 /* D7FD88 80241028 808300B4 */ lb $v1, 0xb4($a0) /* D7FD8C 8024102C 10620006 */ beq $v1, $v0, .L80241048 -/* D7FD90 80241030 00000000 */ nop +/* D7FD90 80241030 00000000 */ nop .L80241034: /* D7FD94 80241034 8C820014 */ lw $v0, 0x14($a0) /* D7FD98 80241038 3C03FFFF */ lui $v1, 0xffff /* D7FD9C 8024103C 00431024 */ and $v0, $v0, $v1 /* D7FDA0 80241040 10400005 */ beqz $v0, .L80241058 -/* D7FDA4 80241044 00000000 */ nop +/* D7FDA4 80241044 00000000 */ nop .L80241048: /* D7FDA8 80241048 0C039769 */ jal set_action_state /* D7FDAC 8024104C 0000202D */ daddu $a0, $zero, $zero @@ -55,4 +55,4 @@ glabel func_80240FF0_D7FD50 /* D7FE00 802410A0 8FB00010 */ lw $s0, 0x10($sp) /* D7FE04 802410A4 03E00008 */ jr $ra /* D7FE08 802410A8 27BD0018 */ addiu $sp, $sp, 0x18 -/* D7FE0C 802410AC 00000000 */ nop +/* D7FE0C 802410AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_802401CC_D86BCC.s b/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_802401CC_D86BCC.s index cd8c515be0..88a1655716 100644 --- a/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_802401CC_D86BCC.s +++ b/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_802401CC_D86BCC.s @@ -13,11 +13,12 @@ glabel func_802401CC_D86BCC /* D86BEC 802401EC 2C620005 */ sltiu $v0, $v1, 5 /* D86BF0 802401F0 1040008A */ beqz $v0, .L8024041C /* D86BF4 802401F4 00031080 */ sll $v0, $v1, 2 -/* D86BF8 802401F8 3C018024 */ lui $at, %hi(D_80242CB0) +/* D86BF8 802401F8 3C018024 */ lui $at, %hi(jtbl_80242CB0_D896B0) /* D86BFC 802401FC 00220821 */ addu $at, $at, $v0 -/* D86C00 80240200 8C222CB0 */ lw $v0, %lo(D_80242CB0)($at) +/* D86C00 80240200 8C222CB0 */ lw $v0, %lo(jtbl_80242CB0_D896B0)($at) /* D86C04 80240204 00400008 */ jr $v0 -/* D86C08 80240208 00000000 */ nop +/* D86C08 80240208 00000000 */ nop +glabel L8024020C_D86C0C /* D86C0C 8024020C 8E22003C */ lw $v0, 0x3c($s1) /* D86C10 80240210 86270046 */ lh $a3, 0x46($s1) /* D86C14 80240214 AFA20010 */ sw $v0, 0x10($sp) @@ -66,6 +67,7 @@ glabel func_802401CC_D86BCC /* D86CC0 802402C0 A6220044 */ sh $v0, 0x44($s1) /* D86CC4 802402C4 08090107 */ j .L8024041C /* D86CC8 802402C8 A6200046 */ sh $zero, 0x46($s1) +glabel L802402CC_D86CCC /* D86CCC 802402CC 96220046 */ lhu $v0, 0x46($s1) /* D86CD0 802402D0 24420001 */ addiu $v0, $v0, 1 /* D86CD4 802402D4 A6220046 */ sh $v0, 0x46($s1) @@ -84,6 +86,7 @@ glabel func_802401CC_D86BCC /* D86D08 80240308 8C42000C */ lw $v0, 0xc($v0) /* D86D0C 8024030C 08090107 */ j .L8024041C /* D86D10 80240310 AC400074 */ sw $zero, 0x74($v0) +glabel L80240314_D86D14 /* D86D14 80240314 96220046 */ lhu $v0, 0x46($s1) /* D86D18 80240318 24420001 */ addiu $v0, $v0, 1 /* D86D1C 8024031C A6220046 */ sh $v0, 0x46($s1) @@ -91,7 +94,7 @@ glabel func_802401CC_D86BCC /* D86D24 80240324 00021403 */ sra $v0, $v0, 0x10 /* D86D28 80240328 2842003C */ slti $v0, $v0, 0x3c /* D86D2C 8024032C 1440003B */ bnez $v0, .L8024041C -/* D86D30 80240330 00000000 */ nop +/* D86D30 80240330 00000000 */ nop /* D86D34 80240334 3C013F80 */ lui $at, 0x3f80 /* D86D38 80240338 44810000 */ mtc1 $at, $f0 /* D86D3C 8024033C AFA00014 */ sw $zero, 0x14($sp) @@ -124,6 +127,7 @@ glabel func_802401CC_D86BCC /* D86DA8 802403A8 A6220048 */ sh $v0, 0x48($s1) /* D86DAC 802403AC 08090107 */ j .L8024041C /* D86DB0 802403B0 E6200030 */ swc1 $f0, 0x30($s1) +glabel L802403B4_D86DB4 /* D86DB4 802403B4 0000202D */ daddu $a0, $zero, $zero /* D86DB8 802403B8 3C054210 */ lui $a1, 0x4210 /* D86DBC 802403BC 3C064198 */ lui $a2, 0x4198 @@ -151,14 +155,15 @@ glabel func_802401CC_D86BCC /* D86E14 80240414 A6200046 */ sh $zero, 0x46($s1) /* D86E18 80240418 E6200034 */ swc1 $f0, 0x34($s1) .L8024041C: +glabel L8024041C_D86E1C /* D86E1C 8024041C 8623004A */ lh $v1, 0x4a($s1) /* D86E20 80240420 24020001 */ addiu $v0, $zero, 1 /* D86E24 80240424 10620005 */ beq $v1, $v0, .L8024043C /* D86E28 80240428 24020002 */ addiu $v0, $zero, 2 /* D86E2C 8024042C 1062001E */ beq $v1, $v0, .L802404A8 -/* D86E30 80240430 00000000 */ nop +/* D86E30 80240430 00000000 */ nop /* D86E34 80240434 08090154 */ j .L80240550 -/* D86E38 80240438 00000000 */ nop +/* D86E38 80240438 00000000 */ nop .L8024043C: /* D86E3C 8024043C 8627004C */ lh $a3, 0x4c($s1) /* D86E40 80240440 24100078 */ addiu $s0, $zero, 0x78 @@ -190,12 +195,12 @@ glabel func_802401CC_D86BCC .L802404A8: /* D86EA8 802404A8 8622004C */ lh $v0, 0x4c($s1) /* D86EAC 802404AC 44826000 */ mtc1 $v0, $f12 -/* D86EB0 802404B0 00000000 */ nop +/* D86EB0 802404B0 00000000 */ nop /* D86EB4 802404B4 0C00A8BB */ jal sin_deg /* D86EB8 802404B8 46806320 */ cvt.s.w $f12, $f12 /* D86EBC 802404BC 3C013F80 */ lui $at, 0x3f80 /* D86EC0 802404C0 44811000 */ mtc1 $at, $f2 -/* D86EC4 802404C4 00000000 */ nop +/* D86EC4 802404C4 00000000 */ nop /* D86EC8 802404C8 46020000 */ add.s $f0, $f0, $f2 /* D86ECC 802404CC 46000000 */ add.s $f0, $f0, $f0 /* D86ED0 802404D0 C6220024 */ lwc1 $f2, 0x24($s1) @@ -203,7 +208,7 @@ glabel func_802401CC_D86BCC /* D86ED8 802404D8 46001080 */ add.s $f2, $f2, $f0 /* D86EDC 802404DC 24420008 */ addiu $v0, $v0, 8 /* D86EE0 802404E0 44826000 */ mtc1 $v0, $f12 -/* D86EE4 802404E4 00000000 */ nop +/* D86EE4 802404E4 00000000 */ nop /* D86EE8 802404E8 46806320 */ cvt.s.w $f12, $f12 /* D86EEC 802404EC 0C00A6C9 */ jal clamp_angle /* D86EF0 802404F0 E6220004 */ swc1 $f2, 4($s1) @@ -224,9 +229,9 @@ glabel func_802401CC_D86BCC /* D86F2C 8024052C 460E1380 */ add.s $f14, $f2, $f14 /* D86F30 80240530 3C0141F0 */ lui $at, 0x41f0 /* D86F34 80240534 44811000 */ mtc1 $at, $f2 -/* D86F38 80240538 00000000 */ nop +/* D86F38 80240538 00000000 */ nop /* D86F3C 8024053C 4600103C */ c.lt.s $f2, $f0 -/* D86F40 80240540 00000000 */ nop +/* D86F40 80240540 00000000 */ nop /* D86F44 80240544 45010002 */ bc1t .L80240550 /* D86F48 80240548 24020003 */ addiu $v0, $zero, 3 .L8024054C: @@ -237,9 +242,9 @@ glabel func_802401CC_D86BCC /* D86F58 80240558 10620005 */ beq $v1, $v0, .L80240570 /* D86F5C 8024055C 24020002 */ addiu $v0, $zero, 2 /* D86F60 80240560 10620008 */ beq $v1, $v0, .L80240584 -/* D86F64 80240564 00000000 */ nop +/* D86F64 80240564 00000000 */ nop /* D86F68 80240568 08090171 */ j .L802405C4 -/* D86F6C 8024056C 00000000 */ nop +/* D86F6C 8024056C 00000000 */ nop .L80240570: /* D86F70 80240570 C620002C */ lwc1 $f0, 0x2c($s1) /* D86F74 80240574 C62C0030 */ lwc1 $f12, 0x30($s1) diff --git a/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_80240728_D87128.s b/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_80240728_D87128.s index de3b642613..e73d932e5a 100644 --- a/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_80240728_D87128.s +++ b/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_80240728_D87128.s @@ -8,12 +8,12 @@ glabel func_80240728_D87128 /* D87134 80240734 8C900084 */ lw $s0, 0x84($a0) /* D87138 80240738 8602004C */ lh $v0, 0x4c($s0) /* D8713C 8024073C 44826000 */ mtc1 $v0, $f12 -/* D87140 80240740 00000000 */ nop +/* D87140 80240740 00000000 */ nop /* D87144 80240744 0C00A8BB */ jal sin_deg /* D87148 80240748 46806320 */ cvt.s.w $f12, $f12 /* D8714C 8024074C 3C013F80 */ lui $at, 0x3f80 /* D87150 80240750 44811000 */ mtc1 $at, $f2 -/* D87154 80240754 00000000 */ nop +/* D87154 80240754 00000000 */ nop /* D87158 80240758 46020000 */ add.s $f0, $f0, $f2 /* D8715C 8024075C 46000000 */ add.s $f0, $f0, $f0 /* D87160 80240760 C6020024 */ lwc1 $f2, 0x24($s0) @@ -21,13 +21,13 @@ glabel func_80240728_D87128 /* D87168 80240768 46001080 */ add.s $f2, $f2, $f0 /* D8716C 8024076C 24420008 */ addiu $v0, $v0, 8 /* D87170 80240770 44826000 */ mtc1 $v0, $f12 -/* D87174 80240774 00000000 */ nop +/* D87174 80240774 00000000 */ nop /* D87178 80240778 46806320 */ cvt.s.w $f12, $f12 /* D8717C 8024077C 0C00A6C9 */ jal clamp_angle /* D87180 80240780 E6020004 */ swc1 $f2, 4($s0) /* D87184 80240784 4600010D */ trunc.w.s $f4, $f0 /* D87188 80240788 44022000 */ mfc1 $v0, $f4 -/* D8718C 8024078C 00000000 */ nop +/* D8718C 8024078C 00000000 */ nop /* D87190 80240790 A602004C */ sh $v0, 0x4c($s0) /* D87194 80240794 3C028011 */ lui $v0, %hi(gPlayerStatus) /* D87198 80240798 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) @@ -38,9 +38,9 @@ glabel func_80240728_D87128 /* D871AC 802407AC 8E070020 */ lw $a3, 0x20($s0) /* D871B0 802407B0 3C0141F0 */ lui $at, 0x41f0 /* D871B4 802407B4 44811000 */ mtc1 $at, $f2 -/* D871B8 802407B8 00000000 */ nop +/* D871B8 802407B8 00000000 */ nop /* D871BC 802407BC 4602003E */ c.le.s $f0, $f2 -/* D871C0 802407C0 00000000 */ nop +/* D871C0 802407C0 00000000 */ nop /* D871C4 802407C4 45000002 */ bc1f .L802407D0 /* D871C8 802407C8 24020003 */ addiu $v0, $zero, 3 /* D871CC 802407CC A602004E */ sh $v0, 0x4e($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_80240814_D87214.s b/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_80240814_D87214.s index e68d8b267a..c8a0a5f94d 100644 --- a/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_80240814_D87214.s +++ b/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_80240814_D87214.s @@ -10,6 +10,6 @@ glabel func_80240814_D87214 /* D87228 80240828 AC430000 */ sw $v1, ($v0) /* D8722C 8024082C 03E00008 */ jr $ra /* D87230 80240830 24020002 */ addiu $v0, $zero, 2 -/* D87234 80240834 00000000 */ nop -/* D87238 80240838 00000000 */ nop -/* D8723C 8024083C 00000000 */ nop +/* D87234 80240834 00000000 */ nop +/* D87238 80240838 00000000 */ nop +/* D8723C 8024083C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240054_D89734.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240054_D89734.s index 2437f0e579..d758cffa2d 100644 --- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240054_D89734.s +++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240054_D89734.s @@ -40,7 +40,7 @@ glabel func_80240054_D89734 /* D897B0 802400D0 1440FFF7 */ bnez $v0, .L802400B0 /* D897B4 802400D4 24820001 */ addiu $v0, $a0, 1 /* D897B8 802400D8 03E00008 */ jr $ra -/* D897BC 802400DC 00000000 */ nop +/* D897BC 802400DC 00000000 */ nop .L802400E0: /* D897C0 802400E0 3C020100 */ lui $v0, 0x100 .L802400E4: diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s index 3a1cedd256..71a59fb1dc 100644 --- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s +++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s @@ -16,7 +16,7 @@ glabel func_80240128_D89808 /* D89834 80240154 27B20020 */ addiu $s2, $sp, 0x20 /* D89838 80240158 8E0400CC */ lw $a0, 0xcc($s0) /* D8983C 8024015C 0C044181 */ jal get_shadow_by_index -/* D89840 80240160 00000000 */ nop +/* D89840 80240160 00000000 */ nop /* D89844 80240164 0C048B77 */ jal func_80122DDC /* D89848 80240168 84440008 */ lh $a0, 8($v0) /* D8984C 8024016C 8C430000 */ lw $v1, ($v0) @@ -38,22 +38,22 @@ glabel func_80240128_D89808 /* D8988C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D89890 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) /* D89894 802401B4 0C090008 */ jal pra_33_UnkFunc2 -/* D89898 802401B8 00000000 */ nop +/* D89898 802401B8 00000000 */ nop /* D8989C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D898A0 802401C0 3C014307 */ lui $at, 0x4307 /* D898A4 802401C4 44810000 */ mtc1 $at, $f0 -/* D898A8 802401C8 00000000 */ nop +/* D898A8 802401C8 00000000 */ nop /* D898AC 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D898B0 802401D0 00000000 */ nop +/* D898B0 802401D0 00000000 */ nop /* D898B4 802401D4 4500000B */ bc1f .L80240204 /* D898B8 802401D8 24040002 */ addiu $a0, $zero, 2 /* D898BC 802401DC 3C014361 */ lui $at, 0x4361 /* D898C0 802401E0 44810000 */ mtc1 $at, $f0 -/* D898C4 802401E4 00000000 */ nop +/* D898C4 802401E4 00000000 */ nop /* D898C8 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D898CC 802401EC 00000000 */ nop +/* D898CC 802401EC 00000000 */ nop /* D898D0 802401F0 45000004 */ bc1f .L80240204 -/* D898D4 802401F4 00000000 */ nop +/* D898D4 802401F4 00000000 */ nop /* D898D8 802401F8 0C090015 */ jal func_80240054_D89734 /* D898DC 802401FC 0040202D */ daddu $a0, $v0, $zero /* D898E0 80240200 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240128_D89808 /* D89968 80240288 AFA0001C */ sw $zero, 0x1c($sp) .L8024028C: /* D8996C 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D89970 80240290 00000000 */ nop +/* D89970 80240290 00000000 */ nop .L80240294: /* D89974 80240294 9202000E */ lbu $v0, 0xe($s0) /* D89978 80240298 3C01802E */ lui $at, %hi(D_802D9D70) diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_802402F0_D899D0.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_802402F0_D899D0.s index a42d325789..a7c5b42f8d 100644 --- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_802402F0_D899D0.s +++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_802402F0_D899D0.s @@ -33,7 +33,7 @@ glabel func_802402F0_D899D0 /* D89A40 80240360 E7B40010 */ swc1 $f20, 0x10($sp) /* D89A44 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) /* D89A48 80240368 0C00A6C9 */ jal clamp_angle -/* D89A4C 8024036C 00000000 */ nop +/* D89A4C 8024036C 00000000 */ nop /* D89A50 80240370 44050000 */ mfc1 $a1, $f0 /* D89A54 80240374 4406A000 */ mfc1 $a2, $f20 /* D89A58 80240378 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_8024049C_D89B7C.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_8024049C_D89B7C.s index fa262eea3d..2ac0fe5b64 100644 --- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_8024049C_D89B7C.s +++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_8024049C_D89B7C.s @@ -10,7 +10,7 @@ glabel func_8024049C_D89B7C /* D89B90 802404B0 0440000E */ bltz $v0, .L802404EC /* D89B94 802404B4 28420002 */ slti $v0, $v0, 2 /* D89B98 802404B8 1040000C */ beqz $v0, .L802404EC -/* D89B9C 802404BC 00000000 */ nop +/* D89B9C 802404BC 00000000 */ nop /* D89BA0 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D89BE0) /* D89BA4 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D89BE0) /* D89BA8 802404C8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240500_D89BE0.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240500_D89BE0.s index 8ec37cb9ed..28efb24d40 100644 --- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240500_D89BE0.s +++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240500_D89BE0.s @@ -16,7 +16,7 @@ glabel func_80240500_D89BE0 /* D89C0C 8024052C 27B10020 */ addiu $s1, $sp, 0x20 /* D89C10 80240530 8E0400CC */ lw $a0, 0xcc($s0) /* D89C14 80240534 0C044181 */ jal get_shadow_by_index -/* D89C18 80240538 00000000 */ nop +/* D89C18 80240538 00000000 */ nop /* D89C1C 8024053C 0C048B77 */ jal func_80122DDC /* D89C20 80240540 84440008 */ lh $a0, 8($v0) /* D89C24 80240544 8E050028 */ lw $a1, 0x28($s0) @@ -33,7 +33,7 @@ glabel func_80240500_D89BE0 /* D89C50 80240570 46000007 */ neg.s $f0, $f0 /* D89C54 80240574 44060000 */ mfc1 $a2, $f0 /* D89C58 80240578 0C00B94E */ jal get_screen_coords -/* D89C5C 8024057C 00000000 */ nop +/* D89C5C 8024057C 00000000 */ nop /* D89C60 80240580 8E0500A4 */ lw $a1, 0xa4($s0) /* D89C64 80240584 3C063F80 */ lui $a2, 0x3f80 /* D89C68 80240588 0C0B76A3 */ jal func_802DDA8C @@ -72,13 +72,13 @@ glabel func_80240500_D89BE0 /* D89CE8 80240608 AFA0001C */ sw $zero, 0x1c($sp) .L8024060C: /* D89CEC 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D89CF0 80240610 00000000 */ nop +/* D89CF0 80240610 00000000 */ nop .L80240614: /* D89CF4 80240614 9202000E */ lbu $v0, 0xe($s0) /* D89CF8 80240618 3C01802E */ lui $at, %hi(D_802D9D71) /* D89CFC 8024061C A0229D71 */ sb $v0, %lo(D_802D9D71)($at) /* D89D00 80240620 0809018C */ j .L80240630 -/* D89D04 80240624 00000000 */ nop +/* D89D04 80240624 00000000 */ nop .L80240628: /* D89D08 80240628 3C01802E */ lui $at, %hi(D_802D9D71) /* D89D0C 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_8024068C_D89D6C.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_8024068C_D89D6C.s index 262c72d6a7..3d8a0f2899 100644 --- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_8024068C_D89D6C.s +++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_8024068C_D89D6C.s @@ -33,7 +33,7 @@ glabel func_8024068C_D89D6C /* D89DDC 802406FC E7B40010 */ swc1 $f20, 0x10($sp) /* D89DE0 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) /* D89DE4 80240704 0C00A6C9 */ jal clamp_angle -/* D89DE8 80240708 00000000 */ nop +/* D89DE8 80240708 00000000 */ nop /* D89DEC 8024070C 44050000 */ mfc1 $a1, $f0 /* D89DF0 80240710 4406A000 */ mfc1 $a2, $f20 /* D89DF4 80240714 4407A000 */ mfc1 $a3, $f20 @@ -95,16 +95,16 @@ glabel func_8024068C_D89D6C /* D89ED4 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D89ED8 802407F8 3C0142B4 */ lui $at, 0x42b4 /* D89EDC 802407FC 44810000 */ mtc1 $at, $f0 -/* D89EE0 80240800 00000000 */ nop +/* D89EE0 80240800 00000000 */ nop /* D89EE4 80240804 4602003E */ c.le.s $f0, $f2 -/* D89EE8 80240808 00000000 */ nop +/* D89EE8 80240808 00000000 */ nop /* D89EEC 8024080C 4500000A */ bc1f .L80240838 /* D89EF0 80240810 24040001 */ addiu $a0, $zero, 1 /* D89EF4 80240814 3C014387 */ lui $at, 0x4387 /* D89EF8 80240818 44810000 */ mtc1 $at, $f0 -/* D89EFC 8024081C 00000000 */ nop +/* D89EFC 8024081C 00000000 */ nop /* D89F00 80240820 4600103C */ c.lt.s $f2, $f0 -/* D89F04 80240824 00000000 */ nop +/* D89F04 80240824 00000000 */ nop /* D89F08 80240828 45000004 */ bc1f .L8024083C /* D89F0C 8024082C 27A20018 */ addiu $v0, $sp, 0x18 /* D89F10 80240830 3C041000 */ lui $a0, 0x1000 diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240870_D89F50.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240870_D89F50.s index cc8fe64b73..d280591ffb 100644 --- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240870_D89F50.s +++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240870_D89F50.s @@ -43,36 +43,36 @@ glabel func_80240870_D89F50 /* D89FE4 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D89FE8 80240908 3C0142B4 */ lui $at, 0x42b4 /* D89FEC 8024090C 44810000 */ mtc1 $at, $f0 -/* D89FF0 80240910 00000000 */ nop +/* D89FF0 80240910 00000000 */ nop /* D89FF4 80240914 4602003C */ c.lt.s $f0, $f2 -/* D89FF8 80240918 00000000 */ nop +/* D89FF8 80240918 00000000 */ nop /* D89FFC 8024091C 4500000A */ bc1f .L80240948 -/* D8A000 80240920 00000000 */ nop +/* D8A000 80240920 00000000 */ nop /* D8A004 80240924 3C014334 */ lui $at, 0x4334 /* D8A008 80240928 44812000 */ mtc1 $at, $f4 -/* D8A00C 8024092C 00000000 */ nop +/* D8A00C 8024092C 00000000 */ nop /* D8A010 80240930 4604103E */ c.le.s $f2, $f4 -/* D8A014 80240934 00000000 */ nop +/* D8A014 80240934 00000000 */ nop /* D8A018 80240938 45000003 */ bc1f .L80240948 -/* D8A01C 8024093C 00000000 */ nop +/* D8A01C 8024093C 00000000 */ nop /* D8A020 80240940 08090276 */ j .L802409D8 /* D8A024 80240944 46022501 */ sub.s $f20, $f4, $f2 .L80240948: /* D8A028 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) /* D8A02C 8024094C 3C014334 */ lui $at, 0x4334 /* D8A030 80240950 44812000 */ mtc1 $at, $f4 -/* D8A034 80240954 00000000 */ nop +/* D8A034 80240954 00000000 */ nop /* D8A038 80240958 4600203C */ c.lt.s $f4, $f0 -/* D8A03C 8024095C 00000000 */ nop +/* D8A03C 8024095C 00000000 */ nop /* D8A040 80240960 4500000C */ bc1f .L80240994 -/* D8A044 80240964 00000000 */ nop +/* D8A044 80240964 00000000 */ nop /* D8A048 80240968 3C014387 */ lui $at, 0x4387 /* D8A04C 8024096C 44812000 */ mtc1 $at, $f4 -/* D8A050 80240970 00000000 */ nop +/* D8A050 80240970 00000000 */ nop /* D8A054 80240974 4604003E */ c.le.s $f0, $f4 -/* D8A058 80240978 00000000 */ nop +/* D8A058 80240978 00000000 */ nop /* D8A05C 8024097C 45000008 */ bc1f .L802409A0 -/* D8A060 80240980 00000000 */ nop +/* D8A060 80240980 00000000 */ nop /* D8A064 80240984 3C014334 */ lui $at, 0x4334 /* D8A068 80240988 44812000 */ mtc1 $at, $f4 /* D8A06C 8024098C 08090276 */ j .L802409D8 @@ -80,19 +80,19 @@ glabel func_80240870_D89F50 .L80240994: /* D8A074 80240994 3C014387 */ lui $at, 0x4387 /* D8A078 80240998 44812000 */ mtc1 $at, $f4 -/* D8A07C 8024099C 00000000 */ nop +/* D8A07C 8024099C 00000000 */ nop .L802409A0: /* D8A080 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D8A084 802409A4 00000000 */ nop +/* D8A084 802409A4 00000000 */ nop /* D8A088 802409A8 4500000A */ bc1f .L802409D4 -/* D8A08C 802409AC 00000000 */ nop +/* D8A08C 802409AC 00000000 */ nop /* D8A090 802409B0 3C0143B4 */ lui $at, 0x43b4 /* D8A094 802409B4 44811000 */ mtc1 $at, $f2 -/* D8A098 802409B8 00000000 */ nop +/* D8A098 802409B8 00000000 */ nop /* D8A09C 802409BC 4602003E */ c.le.s $f0, $f2 -/* D8A0A0 802409C0 00000000 */ nop +/* D8A0A0 802409C0 00000000 */ nop /* D8A0A4 802409C4 45000003 */ bc1f .L802409D4 -/* D8A0A8 802409C8 00000000 */ nop +/* D8A0A8 802409C8 00000000 */ nop /* D8A0AC 802409CC 08090276 */ j .L802409D8 /* D8A0B0 802409D0 46001501 */ sub.s $f20, $f2, $f0 .L802409D4: @@ -100,11 +100,11 @@ glabel func_80240870_D89F50 .L802409D8: /* D8A0B8 802409D8 3C0141C8 */ lui $at, 0x41c8 /* D8A0BC 802409DC 44810000 */ mtc1 $at, $f0 -/* D8A0C0 802409E0 00000000 */ nop +/* D8A0C0 802409E0 00000000 */ nop /* D8A0C4 802409E4 4600A003 */ div.s $f0, $f20, $f0 /* D8A0C8 802409E8 4600010D */ trunc.w.s $f4, $f0 /* D8A0CC 802409EC 44072000 */ mfc1 $a3, $f4 -/* D8A0D0 802409F0 00000000 */ nop +/* D8A0D0 802409F0 00000000 */ nop /* D8A0D4 802409F4 00071100 */ sll $v0, $a3, 4 /* D8A0D8 802409F8 00471023 */ subu $v0, $v0, $a3 /* D8A0DC 802409FC 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel func_80240870_D89F50 /* D8A124 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) /* D8A128 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) /* D8A12C 80240A4C 0C00A6C9 */ jal clamp_angle -/* D8A130 80240A50 00000000 */ nop +/* D8A130 80240A50 00000000 */ nop /* D8A134 80240A54 44050000 */ mfc1 $a1, $f0 /* D8A138 80240A58 4406B000 */ mfc1 $a2, $f22 /* D8A13C 80240A5C 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel func_80240870_D89F50 /* D8A1A0 80240AC0 24040001 */ addiu $a0, $zero, 1 .L80240AC4: /* D8A1A4 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D8A1A8 80240AC8 00000000 */ nop +/* D8A1A8 80240AC8 00000000 */ nop /* D8A1AC 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 /* D8A1B0 80240AD0 24040001 */ addiu $a0, $zero, 1 .L80240AD4: @@ -204,10 +204,10 @@ glabel func_80240870_D89F50 /* D8A240 80240B60 44812000 */ mtc1 $at, $f4 /* D8A244 80240B64 00021023 */ negu $v0, $v0 /* D8A248 80240B68 44820000 */ mtc1 $v0, $f0 -/* D8A24C 80240B6C 00000000 */ nop +/* D8A24C 80240B6C 00000000 */ nop /* D8A250 80240B70 46800020 */ cvt.s.w $f0, $f0 /* D8A254 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D8A258 80240B78 00000000 */ nop +/* D8A258 80240B78 00000000 */ nop /* D8A25C 80240B7C 4405B000 */ mfc1 $a1, $f22 /* D8A260 80240B80 4407B000 */ mfc1 $a3, $f22 /* D8A264 80240B84 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel func_80240870_D89F50 /* D8A2D4 80240BF4 3C013F00 */ lui $at, 0x3f00 /* D8A2D8 80240BF8 44812000 */ mtc1 $at, $f4 /* D8A2DC 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D8A2E0 80240C00 00000000 */ nop +/* D8A2E0 80240C00 00000000 */ nop /* D8A2E4 80240C04 46800020 */ cvt.s.w $f0, $f0 /* D8A2E8 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D8A2EC 80240C0C 00000000 */ nop +/* D8A2EC 80240C0C 00000000 */ nop /* D8A2F0 80240C10 4405B000 */ mfc1 $a1, $f22 /* D8A2F4 80240C14 4407B000 */ mfc1 $a3, $f22 /* D8A2F8 80240C18 44062000 */ mfc1 $a2, $f4 @@ -280,16 +280,16 @@ glabel func_80240870_D89F50 /* D8A370 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D8A374 80240C94 3C0142B4 */ lui $at, 0x42b4 /* D8A378 80240C98 44810000 */ mtc1 $at, $f0 -/* D8A37C 80240C9C 00000000 */ nop +/* D8A37C 80240C9C 00000000 */ nop /* D8A380 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D8A384 80240CA4 00000000 */ nop +/* D8A384 80240CA4 00000000 */ nop /* D8A388 80240CA8 4500000A */ bc1f .L80240CD4 /* D8A38C 80240CAC 24040001 */ addiu $a0, $zero, 1 /* D8A390 80240CB0 3C014387 */ lui $at, 0x4387 /* D8A394 80240CB4 44812000 */ mtc1 $at, $f4 -/* D8A398 80240CB8 00000000 */ nop +/* D8A398 80240CB8 00000000 */ nop /* D8A39C 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D8A3A0 80240CC0 00000000 */ nop +/* D8A3A0 80240CC0 00000000 */ nop /* D8A3A4 80240CC4 45000004 */ bc1f .L80240CD8 /* D8A3A8 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 /* D8A3AC 80240CCC 3C041000 */ lui $a0, 0x1000 @@ -305,7 +305,7 @@ glabel func_80240870_D89F50 /* D8A3CC 80240CEC 26730001 */ addiu $s3, $s3, 1 /* D8A3D0 80240CF0 2A620002 */ slti $v0, $s3, 2 /* D8A3D4 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D8A3D8 80240CF8 00000000 */ nop +/* D8A3D8 80240CF8 00000000 */ nop /* D8A3DC 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) /* D8A3E0 80240D00 8FB60148 */ lw $s6, 0x148($sp) /* D8A3E4 80240D04 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240D3C_D8A41C.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240D3C_D8A41C.s index 7a992e95f9..de7d82e21d 100644 --- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240D3C_D8A41C.s +++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240D3C_D8A41C.s @@ -11,36 +11,36 @@ glabel func_80240D3C_D8A41C /* D8A434 80240D54 24020001 */ addiu $v0, $zero, 1 /* D8A438 80240D58 8E030084 */ lw $v1, 0x84($s0) /* D8A43C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D8A440 80240D60 00000000 */ nop +/* D8A440 80240D60 00000000 */ nop /* D8A444 80240D64 28620002 */ slti $v0, $v1, 2 /* D8A448 80240D68 50400005 */ beql $v0, $zero, .L80240D80 /* D8A44C 80240D6C 24020002 */ addiu $v0, $zero, 2 /* D8A450 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D8A454 80240D74 00000000 */ nop +/* D8A454 80240D74 00000000 */ nop /* D8A458 80240D78 08090378 */ j .L80240DE0 -/* D8A45C 80240D7C 00000000 */ nop +/* D8A45C 80240D7C 00000000 */ nop .L80240D80: /* D8A460 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D8A464 80240D84 00000000 */ nop +/* D8A464 80240D84 00000000 */ nop /* D8A468 80240D88 08090378 */ j .L80240DE0 -/* D8A46C 80240D8C 00000000 */ nop +/* D8A46C 80240D8C 00000000 */ nop .L80240D90: /* D8A470 80240D90 3C048024 */ lui $a0, %hi(pra_33_SetPartnerFlagsA0000) /* D8A474 80240D94 24840E84 */ addiu $a0, $a0, %lo(pra_33_SetPartnerFlagsA0000) /* D8A478 80240D98 08090374 */ j .L80240DD0 -/* D8A47C 80240D9C 00000000 */ nop +/* D8A47C 80240D9C 00000000 */ nop .L80240DA0: /* D8A480 80240DA0 3C048024 */ lui $a0, %hi(pra_33_SetPartnerFlags20000) /* D8A484 80240DA4 24840EEC */ addiu $a0, $a0, %lo(pra_33_SetPartnerFlags20000) /* D8A488 80240DA8 08090374 */ j .L80240DD0 -/* D8A48C 80240DAC 00000000 */ nop +/* D8A48C 80240DAC 00000000 */ nop .L80240DB0: /* D8A490 80240DB0 8E020084 */ lw $v0, 0x84($s0) /* D8A494 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D8A498 80240DB8 00000000 */ nop +/* D8A498 80240DB8 00000000 */ nop /* D8A49C 80240DBC 28420002 */ slti $v0, $v0, 2 /* D8A4A0 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D8A4A4 80240DC4 00000000 */ nop +/* D8A4A4 80240DC4 00000000 */ nop .L80240DC8: /* D8A4A8 80240DC8 3C048024 */ lui $a0, %hi(pra_33_SetPartnerFlags80000) /* D8A4AC 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(pra_33_SetPartnerFlags80000) @@ -64,14 +64,14 @@ glabel func_80240D3C_D8A41C /* D8A4EC 80240E0C 10400005 */ beqz $v0, .L80240E24 /* D8A4F0 80240E10 24020002 */ addiu $v0, $zero, 2 /* D8A4F4 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D8A4F8 80240E18 00000000 */ nop +/* D8A4F8 80240E18 00000000 */ nop /* D8A4FC 80240E1C 0809039D */ j .L80240E74 -/* D8A500 80240E20 00000000 */ nop +/* D8A500 80240E20 00000000 */ nop .L80240E24: /* D8A504 80240E24 10820006 */ beq $a0, $v0, .L80240E40 /* D8A508 80240E28 24020002 */ addiu $v0, $zero, 2 /* D8A50C 80240E2C 0809039D */ j .L80240E74 -/* D8A510 80240E30 00000000 */ nop +/* D8A510 80240E30 00000000 */ nop .L80240E34: /* D8A514 80240E34 8CA20000 */ lw $v0, ($a1) /* D8A518 80240E38 0809039A */ j .L80240E68 diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240F58_D8A638.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240F58_D8A638.s index d6b78af8ae..1339fbefd2 100644 --- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240F58_D8A638.s +++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240F58_D8A638.s @@ -28,9 +28,9 @@ glabel func_80240F58_D8A638 /* D8A694 80240FB4 4600B386 */ mov.s $f14, $f22 /* D8A698 80240FB8 4600008D */ trunc.w.s $f2, $f0 /* D8A69C 80240FBC 44021000 */ mfc1 $v0, $f2 -/* D8A6A0 80240FC0 00000000 */ nop +/* D8A6A0 80240FC0 00000000 */ nop /* D8A6A4 80240FC4 44826000 */ mtc1 $v0, $f12 -/* D8A6A8 80240FC8 00000000 */ nop +/* D8A6A8 80240FC8 00000000 */ nop /* D8A6AC 80240FCC 46806320 */ cvt.s.w $f12, $f12 /* D8A6B0 80240FD0 0C00A6C9 */ jal clamp_angle /* D8A6B4 80240FD4 AE2200A0 */ sw $v0, 0xa0($s1) diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80241000_D8A6E0.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80241000_D8A6E0.s index 6758116f29..f491bd96ac 100644 --- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80241000_D8A6E0.s +++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80241000_D8A6E0.s @@ -15,10 +15,10 @@ glabel func_80241000_D8A6E0 /* D8A708 80241028 C600009C */ lwc1 $f0, 0x9c($s0) /* D8A70C 8024102C 46800020 */ cvt.s.w $f0, $f0 /* D8A710 80241030 46020002 */ mul.s $f0, $f0, $f2 -/* D8A714 80241034 00000000 */ nop +/* D8A714 80241034 00000000 */ nop /* D8A718 80241038 3C014348 */ lui $at, 0x4348 /* D8A71C 8024103C 44811000 */ mtc1 $at, $f2 -/* D8A720 80241040 00000000 */ nop +/* D8A720 80241040 00000000 */ nop /* D8A724 80241044 46020000 */ add.s $f0, $f0, $f2 /* D8A728 80241048 3C028011 */ lui $v0, %hi(gPlayerStatus) /* D8A72C 8024104C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) @@ -28,9 +28,9 @@ glabel func_80241000_D8A6E0 /* D8A73C 8024105C 468010A0 */ cvt.s.w $f2, $f2 /* D8A740 80241060 46000007 */ neg.s $f0, $f0 /* D8A744 80241064 46001082 */ mul.s $f2, $f2, $f0 -/* D8A748 80241068 00000000 */ nop +/* D8A748 80241068 00000000 */ nop /* D8A74C 8024106C 44800000 */ mtc1 $zero, $f0 -/* D8A750 80241070 00000000 */ nop +/* D8A750 80241070 00000000 */ nop /* D8A754 80241074 46001080 */ add.s $f2, $f2, $f0 /* D8A758 80241078 E4420030 */ swc1 $f2, 0x30($v0) /* D8A75C 8024107C 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240054_D8B404.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240054_D8B404.s index 4794166151..03dc08a57e 100644 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240054_D8B404.s +++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240054_D8B404.s @@ -40,7 +40,7 @@ glabel func_80240054_D8B404 /* D8B480 802400D0 1440FFF7 */ bnez $v0, .L802400B0 /* D8B484 802400D4 24820001 */ addiu $v0, $a0, 1 /* D8B488 802400D8 03E00008 */ jr $ra -/* D8B48C 802400DC 00000000 */ nop +/* D8B48C 802400DC 00000000 */ nop .L802400E0: /* D8B490 802400E0 3C020100 */ lui $v0, 0x100 .L802400E4: diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s index bdfd1bdbd3..e18acde1f7 100644 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s +++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s @@ -16,7 +16,7 @@ glabel func_80240128_D8B4D8 /* D8B504 80240154 27B20020 */ addiu $s2, $sp, 0x20 /* D8B508 80240158 8E0400CC */ lw $a0, 0xcc($s0) /* D8B50C 8024015C 0C044181 */ jal get_shadow_by_index -/* D8B510 80240160 00000000 */ nop +/* D8B510 80240160 00000000 */ nop /* D8B514 80240164 0C048B77 */ jal func_80122DDC /* D8B518 80240168 84440008 */ lh $a0, 8($v0) /* D8B51C 8024016C 8C430000 */ lw $v1, ($v0) @@ -38,22 +38,22 @@ glabel func_80240128_D8B4D8 /* D8B55C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D8B560 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) /* D8B564 802401B4 0C090008 */ jal pra_34_UnkFunc2 -/* D8B568 802401B8 00000000 */ nop +/* D8B568 802401B8 00000000 */ nop /* D8B56C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D8B570 802401C0 3C014307 */ lui $at, 0x4307 /* D8B574 802401C4 44810000 */ mtc1 $at, $f0 -/* D8B578 802401C8 00000000 */ nop +/* D8B578 802401C8 00000000 */ nop /* D8B57C 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D8B580 802401D0 00000000 */ nop +/* D8B580 802401D0 00000000 */ nop /* D8B584 802401D4 4500000B */ bc1f .L80240204 /* D8B588 802401D8 24040002 */ addiu $a0, $zero, 2 /* D8B58C 802401DC 3C014361 */ lui $at, 0x4361 /* D8B590 802401E0 44810000 */ mtc1 $at, $f0 -/* D8B594 802401E4 00000000 */ nop +/* D8B594 802401E4 00000000 */ nop /* D8B598 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D8B59C 802401EC 00000000 */ nop +/* D8B59C 802401EC 00000000 */ nop /* D8B5A0 802401F0 45000004 */ bc1f .L80240204 -/* D8B5A4 802401F4 00000000 */ nop +/* D8B5A4 802401F4 00000000 */ nop /* D8B5A8 802401F8 0C090015 */ jal func_80240054_D8B404 /* D8B5AC 802401FC 0040202D */ daddu $a0, $v0, $zero /* D8B5B0 80240200 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240128_D8B4D8 /* D8B638 80240288 AFA0001C */ sw $zero, 0x1c($sp) .L8024028C: /* D8B63C 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D8B640 80240290 00000000 */ nop +/* D8B640 80240290 00000000 */ nop .L80240294: /* D8B644 80240294 9202000E */ lbu $v0, 0xe($s0) /* D8B648 80240298 3C01802E */ lui $at, %hi(D_802D9D70) diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_802402F0_D8B6A0.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_802402F0_D8B6A0.s index 9dfbab3564..cff66ed592 100644 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_802402F0_D8B6A0.s +++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_802402F0_D8B6A0.s @@ -33,7 +33,7 @@ glabel func_802402F0_D8B6A0 /* D8B710 80240360 E7B40010 */ swc1 $f20, 0x10($sp) /* D8B714 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) /* D8B718 80240368 0C00A6C9 */ jal clamp_angle -/* D8B71C 8024036C 00000000 */ nop +/* D8B71C 8024036C 00000000 */ nop /* D8B720 80240370 44050000 */ mfc1 $a1, $f0 /* D8B724 80240374 4406A000 */ mfc1 $a2, $f20 /* D8B728 80240378 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_8024049C_D8B84C.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_8024049C_D8B84C.s index 379314d64b..e113cc9322 100644 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_8024049C_D8B84C.s +++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_8024049C_D8B84C.s @@ -10,7 +10,7 @@ glabel func_8024049C_D8B84C /* D8B860 802404B0 0440000E */ bltz $v0, .L802404EC /* D8B864 802404B4 28420002 */ slti $v0, $v0, 2 /* D8B868 802404B8 1040000C */ beqz $v0, .L802404EC -/* D8B86C 802404BC 00000000 */ nop +/* D8B86C 802404BC 00000000 */ nop /* D8B870 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D8B8B0) /* D8B874 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D8B8B0) /* D8B878 802404C8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240500_D8B8B0.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240500_D8B8B0.s index 70f57791b4..cb5d3aafcc 100644 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240500_D8B8B0.s +++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240500_D8B8B0.s @@ -16,7 +16,7 @@ glabel func_80240500_D8B8B0 /* D8B8DC 8024052C 27B10020 */ addiu $s1, $sp, 0x20 /* D8B8E0 80240530 8E0400CC */ lw $a0, 0xcc($s0) /* D8B8E4 80240534 0C044181 */ jal get_shadow_by_index -/* D8B8E8 80240538 00000000 */ nop +/* D8B8E8 80240538 00000000 */ nop /* D8B8EC 8024053C 0C048B77 */ jal func_80122DDC /* D8B8F0 80240540 84440008 */ lh $a0, 8($v0) /* D8B8F4 80240544 8E050028 */ lw $a1, 0x28($s0) @@ -33,7 +33,7 @@ glabel func_80240500_D8B8B0 /* D8B920 80240570 46000007 */ neg.s $f0, $f0 /* D8B924 80240574 44060000 */ mfc1 $a2, $f0 /* D8B928 80240578 0C00B94E */ jal get_screen_coords -/* D8B92C 8024057C 00000000 */ nop +/* D8B92C 8024057C 00000000 */ nop /* D8B930 80240580 8E0500A4 */ lw $a1, 0xa4($s0) /* D8B934 80240584 3C063F80 */ lui $a2, 0x3f80 /* D8B938 80240588 0C0B76A3 */ jal func_802DDA8C @@ -72,13 +72,13 @@ glabel func_80240500_D8B8B0 /* D8B9B8 80240608 AFA0001C */ sw $zero, 0x1c($sp) .L8024060C: /* D8B9BC 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D8B9C0 80240610 00000000 */ nop +/* D8B9C0 80240610 00000000 */ nop .L80240614: /* D8B9C4 80240614 9202000E */ lbu $v0, 0xe($s0) /* D8B9C8 80240618 3C01802E */ lui $at, %hi(D_802D9D71) /* D8B9CC 8024061C A0229D71 */ sb $v0, %lo(D_802D9D71)($at) /* D8B9D0 80240620 0809018C */ j .L80240630 -/* D8B9D4 80240624 00000000 */ nop +/* D8B9D4 80240624 00000000 */ nop .L80240628: /* D8B9D8 80240628 3C01802E */ lui $at, %hi(D_802D9D71) /* D8B9DC 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_8024068C_D8BA3C.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_8024068C_D8BA3C.s index ac819e83ce..7e7a796192 100644 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_8024068C_D8BA3C.s +++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_8024068C_D8BA3C.s @@ -33,7 +33,7 @@ glabel func_8024068C_D8BA3C /* D8BAAC 802406FC E7B40010 */ swc1 $f20, 0x10($sp) /* D8BAB0 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) /* D8BAB4 80240704 0C00A6C9 */ jal clamp_angle -/* D8BAB8 80240708 00000000 */ nop +/* D8BAB8 80240708 00000000 */ nop /* D8BABC 8024070C 44050000 */ mfc1 $a1, $f0 /* D8BAC0 80240710 4406A000 */ mfc1 $a2, $f20 /* D8BAC4 80240714 4407A000 */ mfc1 $a3, $f20 @@ -95,16 +95,16 @@ glabel func_8024068C_D8BA3C /* D8BBA4 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D8BBA8 802407F8 3C0142B4 */ lui $at, 0x42b4 /* D8BBAC 802407FC 44810000 */ mtc1 $at, $f0 -/* D8BBB0 80240800 00000000 */ nop +/* D8BBB0 80240800 00000000 */ nop /* D8BBB4 80240804 4602003E */ c.le.s $f0, $f2 -/* D8BBB8 80240808 00000000 */ nop +/* D8BBB8 80240808 00000000 */ nop /* D8BBBC 8024080C 4500000A */ bc1f .L80240838 /* D8BBC0 80240810 24040001 */ addiu $a0, $zero, 1 /* D8BBC4 80240814 3C014387 */ lui $at, 0x4387 /* D8BBC8 80240818 44810000 */ mtc1 $at, $f0 -/* D8BBCC 8024081C 00000000 */ nop +/* D8BBCC 8024081C 00000000 */ nop /* D8BBD0 80240820 4600103C */ c.lt.s $f2, $f0 -/* D8BBD4 80240824 00000000 */ nop +/* D8BBD4 80240824 00000000 */ nop /* D8BBD8 80240828 45000004 */ bc1f .L8024083C /* D8BBDC 8024082C 27A20018 */ addiu $v0, $sp, 0x18 /* D8BBE0 80240830 3C041000 */ lui $a0, 0x1000 diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240870_D8BC20.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240870_D8BC20.s index ff5cedc24b..76314e24cc 100644 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240870_D8BC20.s +++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240870_D8BC20.s @@ -43,36 +43,36 @@ glabel func_80240870_D8BC20 /* D8BCB4 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D8BCB8 80240908 3C0142B4 */ lui $at, 0x42b4 /* D8BCBC 8024090C 44810000 */ mtc1 $at, $f0 -/* D8BCC0 80240910 00000000 */ nop +/* D8BCC0 80240910 00000000 */ nop /* D8BCC4 80240914 4602003C */ c.lt.s $f0, $f2 -/* D8BCC8 80240918 00000000 */ nop +/* D8BCC8 80240918 00000000 */ nop /* D8BCCC 8024091C 4500000A */ bc1f .L80240948 -/* D8BCD0 80240920 00000000 */ nop +/* D8BCD0 80240920 00000000 */ nop /* D8BCD4 80240924 3C014334 */ lui $at, 0x4334 /* D8BCD8 80240928 44812000 */ mtc1 $at, $f4 -/* D8BCDC 8024092C 00000000 */ nop +/* D8BCDC 8024092C 00000000 */ nop /* D8BCE0 80240930 4604103E */ c.le.s $f2, $f4 -/* D8BCE4 80240934 00000000 */ nop +/* D8BCE4 80240934 00000000 */ nop /* D8BCE8 80240938 45000003 */ bc1f .L80240948 -/* D8BCEC 8024093C 00000000 */ nop +/* D8BCEC 8024093C 00000000 */ nop /* D8BCF0 80240940 08090276 */ j .L802409D8 /* D8BCF4 80240944 46022501 */ sub.s $f20, $f4, $f2 .L80240948: /* D8BCF8 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) /* D8BCFC 8024094C 3C014334 */ lui $at, 0x4334 /* D8BD00 80240950 44812000 */ mtc1 $at, $f4 -/* D8BD04 80240954 00000000 */ nop +/* D8BD04 80240954 00000000 */ nop /* D8BD08 80240958 4600203C */ c.lt.s $f4, $f0 -/* D8BD0C 8024095C 00000000 */ nop +/* D8BD0C 8024095C 00000000 */ nop /* D8BD10 80240960 4500000C */ bc1f .L80240994 -/* D8BD14 80240964 00000000 */ nop +/* D8BD14 80240964 00000000 */ nop /* D8BD18 80240968 3C014387 */ lui $at, 0x4387 /* D8BD1C 8024096C 44812000 */ mtc1 $at, $f4 -/* D8BD20 80240970 00000000 */ nop +/* D8BD20 80240970 00000000 */ nop /* D8BD24 80240974 4604003E */ c.le.s $f0, $f4 -/* D8BD28 80240978 00000000 */ nop +/* D8BD28 80240978 00000000 */ nop /* D8BD2C 8024097C 45000008 */ bc1f .L802409A0 -/* D8BD30 80240980 00000000 */ nop +/* D8BD30 80240980 00000000 */ nop /* D8BD34 80240984 3C014334 */ lui $at, 0x4334 /* D8BD38 80240988 44812000 */ mtc1 $at, $f4 /* D8BD3C 8024098C 08090276 */ j .L802409D8 @@ -80,19 +80,19 @@ glabel func_80240870_D8BC20 .L80240994: /* D8BD44 80240994 3C014387 */ lui $at, 0x4387 /* D8BD48 80240998 44812000 */ mtc1 $at, $f4 -/* D8BD4C 8024099C 00000000 */ nop +/* D8BD4C 8024099C 00000000 */ nop .L802409A0: /* D8BD50 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D8BD54 802409A4 00000000 */ nop +/* D8BD54 802409A4 00000000 */ nop /* D8BD58 802409A8 4500000A */ bc1f .L802409D4 -/* D8BD5C 802409AC 00000000 */ nop +/* D8BD5C 802409AC 00000000 */ nop /* D8BD60 802409B0 3C0143B4 */ lui $at, 0x43b4 /* D8BD64 802409B4 44811000 */ mtc1 $at, $f2 -/* D8BD68 802409B8 00000000 */ nop +/* D8BD68 802409B8 00000000 */ nop /* D8BD6C 802409BC 4602003E */ c.le.s $f0, $f2 -/* D8BD70 802409C0 00000000 */ nop +/* D8BD70 802409C0 00000000 */ nop /* D8BD74 802409C4 45000003 */ bc1f .L802409D4 -/* D8BD78 802409C8 00000000 */ nop +/* D8BD78 802409C8 00000000 */ nop /* D8BD7C 802409CC 08090276 */ j .L802409D8 /* D8BD80 802409D0 46001501 */ sub.s $f20, $f2, $f0 .L802409D4: @@ -100,11 +100,11 @@ glabel func_80240870_D8BC20 .L802409D8: /* D8BD88 802409D8 3C0141C8 */ lui $at, 0x41c8 /* D8BD8C 802409DC 44810000 */ mtc1 $at, $f0 -/* D8BD90 802409E0 00000000 */ nop +/* D8BD90 802409E0 00000000 */ nop /* D8BD94 802409E4 4600A003 */ div.s $f0, $f20, $f0 /* D8BD98 802409E8 4600010D */ trunc.w.s $f4, $f0 /* D8BD9C 802409EC 44072000 */ mfc1 $a3, $f4 -/* D8BDA0 802409F0 00000000 */ nop +/* D8BDA0 802409F0 00000000 */ nop /* D8BDA4 802409F4 00071100 */ sll $v0, $a3, 4 /* D8BDA8 802409F8 00471023 */ subu $v0, $v0, $a3 /* D8BDAC 802409FC 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel func_80240870_D8BC20 /* D8BDF4 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) /* D8BDF8 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) /* D8BDFC 80240A4C 0C00A6C9 */ jal clamp_angle -/* D8BE00 80240A50 00000000 */ nop +/* D8BE00 80240A50 00000000 */ nop /* D8BE04 80240A54 44050000 */ mfc1 $a1, $f0 /* D8BE08 80240A58 4406B000 */ mfc1 $a2, $f22 /* D8BE0C 80240A5C 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel func_80240870_D8BC20 /* D8BE70 80240AC0 24040001 */ addiu $a0, $zero, 1 .L80240AC4: /* D8BE74 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D8BE78 80240AC8 00000000 */ nop +/* D8BE78 80240AC8 00000000 */ nop /* D8BE7C 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 /* D8BE80 80240AD0 24040001 */ addiu $a0, $zero, 1 .L80240AD4: @@ -204,10 +204,10 @@ glabel func_80240870_D8BC20 /* D8BF10 80240B60 44812000 */ mtc1 $at, $f4 /* D8BF14 80240B64 00021023 */ negu $v0, $v0 /* D8BF18 80240B68 44820000 */ mtc1 $v0, $f0 -/* D8BF1C 80240B6C 00000000 */ nop +/* D8BF1C 80240B6C 00000000 */ nop /* D8BF20 80240B70 46800020 */ cvt.s.w $f0, $f0 /* D8BF24 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D8BF28 80240B78 00000000 */ nop +/* D8BF28 80240B78 00000000 */ nop /* D8BF2C 80240B7C 4405B000 */ mfc1 $a1, $f22 /* D8BF30 80240B80 4407B000 */ mfc1 $a3, $f22 /* D8BF34 80240B84 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel func_80240870_D8BC20 /* D8BFA4 80240BF4 3C013F00 */ lui $at, 0x3f00 /* D8BFA8 80240BF8 44812000 */ mtc1 $at, $f4 /* D8BFAC 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D8BFB0 80240C00 00000000 */ nop +/* D8BFB0 80240C00 00000000 */ nop /* D8BFB4 80240C04 46800020 */ cvt.s.w $f0, $f0 /* D8BFB8 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D8BFBC 80240C0C 00000000 */ nop +/* D8BFBC 80240C0C 00000000 */ nop /* D8BFC0 80240C10 4405B000 */ mfc1 $a1, $f22 /* D8BFC4 80240C14 4407B000 */ mfc1 $a3, $f22 /* D8BFC8 80240C18 44062000 */ mfc1 $a2, $f4 @@ -280,16 +280,16 @@ glabel func_80240870_D8BC20 /* D8C040 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D8C044 80240C94 3C0142B4 */ lui $at, 0x42b4 /* D8C048 80240C98 44810000 */ mtc1 $at, $f0 -/* D8C04C 80240C9C 00000000 */ nop +/* D8C04C 80240C9C 00000000 */ nop /* D8C050 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D8C054 80240CA4 00000000 */ nop +/* D8C054 80240CA4 00000000 */ nop /* D8C058 80240CA8 4500000A */ bc1f .L80240CD4 /* D8C05C 80240CAC 24040001 */ addiu $a0, $zero, 1 /* D8C060 80240CB0 3C014387 */ lui $at, 0x4387 /* D8C064 80240CB4 44812000 */ mtc1 $at, $f4 -/* D8C068 80240CB8 00000000 */ nop +/* D8C068 80240CB8 00000000 */ nop /* D8C06C 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D8C070 80240CC0 00000000 */ nop +/* D8C070 80240CC0 00000000 */ nop /* D8C074 80240CC4 45000004 */ bc1f .L80240CD8 /* D8C078 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 /* D8C07C 80240CCC 3C041000 */ lui $a0, 0x1000 @@ -305,7 +305,7 @@ glabel func_80240870_D8BC20 /* D8C09C 80240CEC 26730001 */ addiu $s3, $s3, 1 /* D8C0A0 80240CF0 2A620002 */ slti $v0, $s3, 2 /* D8C0A4 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D8C0A8 80240CF8 00000000 */ nop +/* D8C0A8 80240CF8 00000000 */ nop /* D8C0AC 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) /* D8C0B0 80240D00 8FB60148 */ lw $s6, 0x148($sp) /* D8C0B4 80240D04 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240D3C_D8C0EC.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240D3C_D8C0EC.s index 2d6aa868e1..9cbf401cfd 100644 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240D3C_D8C0EC.s +++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240D3C_D8C0EC.s @@ -11,36 +11,36 @@ glabel func_80240D3C_D8C0EC /* D8C104 80240D54 24020001 */ addiu $v0, $zero, 1 /* D8C108 80240D58 8E030084 */ lw $v1, 0x84($s0) /* D8C10C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D8C110 80240D60 00000000 */ nop +/* D8C110 80240D60 00000000 */ nop /* D8C114 80240D64 28620002 */ slti $v0, $v1, 2 /* D8C118 80240D68 50400005 */ beql $v0, $zero, .L80240D80 /* D8C11C 80240D6C 24020002 */ addiu $v0, $zero, 2 /* D8C120 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D8C124 80240D74 00000000 */ nop +/* D8C124 80240D74 00000000 */ nop /* D8C128 80240D78 08090378 */ j .L80240DE0 -/* D8C12C 80240D7C 00000000 */ nop +/* D8C12C 80240D7C 00000000 */ nop .L80240D80: /* D8C130 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D8C134 80240D84 00000000 */ nop +/* D8C134 80240D84 00000000 */ nop /* D8C138 80240D88 08090378 */ j .L80240DE0 -/* D8C13C 80240D8C 00000000 */ nop +/* D8C13C 80240D8C 00000000 */ nop .L80240D90: /* D8C140 80240D90 3C048024 */ lui $a0, %hi(pra_34_SetPartnerFlagsA0000) /* D8C144 80240D94 24840E84 */ addiu $a0, $a0, %lo(pra_34_SetPartnerFlagsA0000) /* D8C148 80240D98 08090374 */ j .L80240DD0 -/* D8C14C 80240D9C 00000000 */ nop +/* D8C14C 80240D9C 00000000 */ nop .L80240DA0: /* D8C150 80240DA0 3C048024 */ lui $a0, %hi(pra_34_SetPartnerFlags20000) /* D8C154 80240DA4 24840EEC */ addiu $a0, $a0, %lo(pra_34_SetPartnerFlags20000) /* D8C158 80240DA8 08090374 */ j .L80240DD0 -/* D8C15C 80240DAC 00000000 */ nop +/* D8C15C 80240DAC 00000000 */ nop .L80240DB0: /* D8C160 80240DB0 8E020084 */ lw $v0, 0x84($s0) /* D8C164 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D8C168 80240DB8 00000000 */ nop +/* D8C168 80240DB8 00000000 */ nop /* D8C16C 80240DBC 28420002 */ slti $v0, $v0, 2 /* D8C170 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D8C174 80240DC4 00000000 */ nop +/* D8C174 80240DC4 00000000 */ nop .L80240DC8: /* D8C178 80240DC8 3C048024 */ lui $a0, %hi(pra_34_SetPartnerFlags80000) /* D8C17C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(pra_34_SetPartnerFlags80000) @@ -64,14 +64,14 @@ glabel func_80240D3C_D8C0EC /* D8C1BC 80240E0C 10400005 */ beqz $v0, .L80240E24 /* D8C1C0 80240E10 24020002 */ addiu $v0, $zero, 2 /* D8C1C4 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D8C1C8 80240E18 00000000 */ nop +/* D8C1C8 80240E18 00000000 */ nop /* D8C1CC 80240E1C 0809039D */ j .L80240E74 -/* D8C1D0 80240E20 00000000 */ nop +/* D8C1D0 80240E20 00000000 */ nop .L80240E24: /* D8C1D4 80240E24 10820006 */ beq $a0, $v0, .L80240E40 /* D8C1D8 80240E28 24020002 */ addiu $v0, $zero, 2 /* D8C1DC 80240E2C 0809039D */ j .L80240E74 -/* D8C1E0 80240E30 00000000 */ nop +/* D8C1E0 80240E30 00000000 */ nop .L80240E34: /* D8C1E4 80240E34 8CA20000 */ lw $v0, ($a1) /* D8C1E8 80240E38 0809039A */ j .L80240E68 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240054_D8D2A4.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240054_D8D2A4.s index 224370cf53..da21dfdd28 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240054_D8D2A4.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240054_D8D2A4.s @@ -40,7 +40,7 @@ glabel func_80240054_D8D2A4 /* D8D320 802400D0 1440FFF7 */ bnez $v0, .L802400B0 /* D8D324 802400D4 24820001 */ addiu $v0, $a0, 1 /* D8D328 802400D8 03E00008 */ jr $ra -/* D8D32C 802400DC 00000000 */ nop +/* D8D32C 802400DC 00000000 */ nop .L802400E0: /* D8D330 802400E0 3C020100 */ lui $v0, 0x100 .L802400E4: diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s index f9d15b19da..4a847538d8 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s @@ -16,7 +16,7 @@ glabel func_80240128_D8D378 /* D8D3A4 80240154 27B20020 */ addiu $s2, $sp, 0x20 /* D8D3A8 80240158 8E0400CC */ lw $a0, 0xcc($s0) /* D8D3AC 8024015C 0C044181 */ jal get_shadow_by_index -/* D8D3B0 80240160 00000000 */ nop +/* D8D3B0 80240160 00000000 */ nop /* D8D3B4 80240164 0C048B77 */ jal func_80122DDC /* D8D3B8 80240168 84440008 */ lh $a0, 8($v0) /* D8D3BC 8024016C 8C430000 */ lw $v1, ($v0) @@ -38,22 +38,22 @@ glabel func_80240128_D8D378 /* D8D3FC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D8D400 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) /* D8D404 802401B4 0C090008 */ jal pra_35_UnkFunc2 -/* D8D408 802401B8 00000000 */ nop +/* D8D408 802401B8 00000000 */ nop /* D8D40C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D8D410 802401C0 3C014307 */ lui $at, 0x4307 /* D8D414 802401C4 44810000 */ mtc1 $at, $f0 -/* D8D418 802401C8 00000000 */ nop +/* D8D418 802401C8 00000000 */ nop /* D8D41C 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D8D420 802401D0 00000000 */ nop +/* D8D420 802401D0 00000000 */ nop /* D8D424 802401D4 4500000B */ bc1f .L80240204 /* D8D428 802401D8 24040002 */ addiu $a0, $zero, 2 /* D8D42C 802401DC 3C014361 */ lui $at, 0x4361 /* D8D430 802401E0 44810000 */ mtc1 $at, $f0 -/* D8D434 802401E4 00000000 */ nop +/* D8D434 802401E4 00000000 */ nop /* D8D438 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D8D43C 802401EC 00000000 */ nop +/* D8D43C 802401EC 00000000 */ nop /* D8D440 802401F0 45000004 */ bc1f .L80240204 -/* D8D444 802401F4 00000000 */ nop +/* D8D444 802401F4 00000000 */ nop /* D8D448 802401F8 0C090015 */ jal func_80240054_D8D2A4 /* D8D44C 802401FC 0040202D */ daddu $a0, $v0, $zero /* D8D450 80240200 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240128_D8D378 /* D8D4D8 80240288 AFA0001C */ sw $zero, 0x1c($sp) .L8024028C: /* D8D4DC 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D8D4E0 80240290 00000000 */ nop +/* D8D4E0 80240290 00000000 */ nop .L80240294: /* D8D4E4 80240294 9202000E */ lbu $v0, 0xe($s0) /* D8D4E8 80240298 3C01802E */ lui $at, %hi(D_802D9D70) diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802402F0_D8D540.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802402F0_D8D540.s index 648673cc39..7f733b58e8 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802402F0_D8D540.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802402F0_D8D540.s @@ -33,7 +33,7 @@ glabel func_802402F0_D8D540 /* D8D5B0 80240360 E7B40010 */ swc1 $f20, 0x10($sp) /* D8D5B4 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) /* D8D5B8 80240368 0C00A6C9 */ jal clamp_angle -/* D8D5BC 8024036C 00000000 */ nop +/* D8D5BC 8024036C 00000000 */ nop /* D8D5C0 80240370 44050000 */ mfc1 $a1, $f0 /* D8D5C4 80240374 4406A000 */ mfc1 $a2, $f20 /* D8D5C8 80240378 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024049C_D8D6EC.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024049C_D8D6EC.s index 539c61f10c..7985c2c1ee 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024049C_D8D6EC.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024049C_D8D6EC.s @@ -10,7 +10,7 @@ glabel func_8024049C_D8D6EC /* D8D700 802404B0 0440000E */ bltz $v0, .L802404EC /* D8D704 802404B4 28420002 */ slti $v0, $v0, 2 /* D8D708 802404B8 1040000C */ beqz $v0, .L802404EC -/* D8D70C 802404BC 00000000 */ nop +/* D8D70C 802404BC 00000000 */ nop /* D8D710 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D8D750) /* D8D714 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D8D750) /* D8D718 802404C8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240500_D8D750.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240500_D8D750.s index 4d0821e886..b6827693c9 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240500_D8D750.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240500_D8D750.s @@ -16,7 +16,7 @@ glabel func_80240500_D8D750 /* D8D77C 8024052C 27B10020 */ addiu $s1, $sp, 0x20 /* D8D780 80240530 8E0400CC */ lw $a0, 0xcc($s0) /* D8D784 80240534 0C044181 */ jal get_shadow_by_index -/* D8D788 80240538 00000000 */ nop +/* D8D788 80240538 00000000 */ nop /* D8D78C 8024053C 0C048B77 */ jal func_80122DDC /* D8D790 80240540 84440008 */ lh $a0, 8($v0) /* D8D794 80240544 8E050028 */ lw $a1, 0x28($s0) @@ -33,7 +33,7 @@ glabel func_80240500_D8D750 /* D8D7C0 80240570 46000007 */ neg.s $f0, $f0 /* D8D7C4 80240574 44060000 */ mfc1 $a2, $f0 /* D8D7C8 80240578 0C00B94E */ jal get_screen_coords -/* D8D7CC 8024057C 00000000 */ nop +/* D8D7CC 8024057C 00000000 */ nop /* D8D7D0 80240580 8E0500A4 */ lw $a1, 0xa4($s0) /* D8D7D4 80240584 3C063F80 */ lui $a2, 0x3f80 /* D8D7D8 80240588 0C0B76A3 */ jal func_802DDA8C @@ -72,13 +72,13 @@ glabel func_80240500_D8D750 /* D8D858 80240608 AFA0001C */ sw $zero, 0x1c($sp) .L8024060C: /* D8D85C 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D8D860 80240610 00000000 */ nop +/* D8D860 80240610 00000000 */ nop .L80240614: /* D8D864 80240614 9202000E */ lbu $v0, 0xe($s0) /* D8D868 80240618 3C01802E */ lui $at, %hi(D_802D9D71) /* D8D86C 8024061C A0229D71 */ sb $v0, %lo(D_802D9D71)($at) /* D8D870 80240620 0809018C */ j .L80240630 -/* D8D874 80240624 00000000 */ nop +/* D8D874 80240624 00000000 */ nop .L80240628: /* D8D878 80240628 3C01802E */ lui $at, %hi(D_802D9D71) /* D8D87C 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024068C_D8D8DC.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024068C_D8D8DC.s index 83a9405bcf..d3cbb38c09 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024068C_D8D8DC.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024068C_D8D8DC.s @@ -33,7 +33,7 @@ glabel func_8024068C_D8D8DC /* D8D94C 802406FC E7B40010 */ swc1 $f20, 0x10($sp) /* D8D950 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) /* D8D954 80240704 0C00A6C9 */ jal clamp_angle -/* D8D958 80240708 00000000 */ nop +/* D8D958 80240708 00000000 */ nop /* D8D95C 8024070C 44050000 */ mfc1 $a1, $f0 /* D8D960 80240710 4406A000 */ mfc1 $a2, $f20 /* D8D964 80240714 4407A000 */ mfc1 $a3, $f20 @@ -95,16 +95,16 @@ glabel func_8024068C_D8D8DC /* D8DA44 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D8DA48 802407F8 3C0142B4 */ lui $at, 0x42b4 /* D8DA4C 802407FC 44810000 */ mtc1 $at, $f0 -/* D8DA50 80240800 00000000 */ nop +/* D8DA50 80240800 00000000 */ nop /* D8DA54 80240804 4602003E */ c.le.s $f0, $f2 -/* D8DA58 80240808 00000000 */ nop +/* D8DA58 80240808 00000000 */ nop /* D8DA5C 8024080C 4500000A */ bc1f .L80240838 /* D8DA60 80240810 24040001 */ addiu $a0, $zero, 1 /* D8DA64 80240814 3C014387 */ lui $at, 0x4387 /* D8DA68 80240818 44810000 */ mtc1 $at, $f0 -/* D8DA6C 8024081C 00000000 */ nop +/* D8DA6C 8024081C 00000000 */ nop /* D8DA70 80240820 4600103C */ c.lt.s $f2, $f0 -/* D8DA74 80240824 00000000 */ nop +/* D8DA74 80240824 00000000 */ nop /* D8DA78 80240828 45000004 */ bc1f .L8024083C /* D8DA7C 8024082C 27A20018 */ addiu $v0, $sp, 0x18 /* D8DA80 80240830 3C041000 */ lui $a0, 0x1000 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240870_D8DAC0.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240870_D8DAC0.s index a3c4fed4b8..ac96f39c7b 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240870_D8DAC0.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240870_D8DAC0.s @@ -43,36 +43,36 @@ glabel func_80240870_D8DAC0 /* D8DB54 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D8DB58 80240908 3C0142B4 */ lui $at, 0x42b4 /* D8DB5C 8024090C 44810000 */ mtc1 $at, $f0 -/* D8DB60 80240910 00000000 */ nop +/* D8DB60 80240910 00000000 */ nop /* D8DB64 80240914 4602003C */ c.lt.s $f0, $f2 -/* D8DB68 80240918 00000000 */ nop +/* D8DB68 80240918 00000000 */ nop /* D8DB6C 8024091C 4500000A */ bc1f .L80240948 -/* D8DB70 80240920 00000000 */ nop +/* D8DB70 80240920 00000000 */ nop /* D8DB74 80240924 3C014334 */ lui $at, 0x4334 /* D8DB78 80240928 44812000 */ mtc1 $at, $f4 -/* D8DB7C 8024092C 00000000 */ nop +/* D8DB7C 8024092C 00000000 */ nop /* D8DB80 80240930 4604103E */ c.le.s $f2, $f4 -/* D8DB84 80240934 00000000 */ nop +/* D8DB84 80240934 00000000 */ nop /* D8DB88 80240938 45000003 */ bc1f .L80240948 -/* D8DB8C 8024093C 00000000 */ nop +/* D8DB8C 8024093C 00000000 */ nop /* D8DB90 80240940 08090276 */ j .L802409D8 /* D8DB94 80240944 46022501 */ sub.s $f20, $f4, $f2 .L80240948: /* D8DB98 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) /* D8DB9C 8024094C 3C014334 */ lui $at, 0x4334 /* D8DBA0 80240950 44812000 */ mtc1 $at, $f4 -/* D8DBA4 80240954 00000000 */ nop +/* D8DBA4 80240954 00000000 */ nop /* D8DBA8 80240958 4600203C */ c.lt.s $f4, $f0 -/* D8DBAC 8024095C 00000000 */ nop +/* D8DBAC 8024095C 00000000 */ nop /* D8DBB0 80240960 4500000C */ bc1f .L80240994 -/* D8DBB4 80240964 00000000 */ nop +/* D8DBB4 80240964 00000000 */ nop /* D8DBB8 80240968 3C014387 */ lui $at, 0x4387 /* D8DBBC 8024096C 44812000 */ mtc1 $at, $f4 -/* D8DBC0 80240970 00000000 */ nop +/* D8DBC0 80240970 00000000 */ nop /* D8DBC4 80240974 4604003E */ c.le.s $f0, $f4 -/* D8DBC8 80240978 00000000 */ nop +/* D8DBC8 80240978 00000000 */ nop /* D8DBCC 8024097C 45000008 */ bc1f .L802409A0 -/* D8DBD0 80240980 00000000 */ nop +/* D8DBD0 80240980 00000000 */ nop /* D8DBD4 80240984 3C014334 */ lui $at, 0x4334 /* D8DBD8 80240988 44812000 */ mtc1 $at, $f4 /* D8DBDC 8024098C 08090276 */ j .L802409D8 @@ -80,19 +80,19 @@ glabel func_80240870_D8DAC0 .L80240994: /* D8DBE4 80240994 3C014387 */ lui $at, 0x4387 /* D8DBE8 80240998 44812000 */ mtc1 $at, $f4 -/* D8DBEC 8024099C 00000000 */ nop +/* D8DBEC 8024099C 00000000 */ nop .L802409A0: /* D8DBF0 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D8DBF4 802409A4 00000000 */ nop +/* D8DBF4 802409A4 00000000 */ nop /* D8DBF8 802409A8 4500000A */ bc1f .L802409D4 -/* D8DBFC 802409AC 00000000 */ nop +/* D8DBFC 802409AC 00000000 */ nop /* D8DC00 802409B0 3C0143B4 */ lui $at, 0x43b4 /* D8DC04 802409B4 44811000 */ mtc1 $at, $f2 -/* D8DC08 802409B8 00000000 */ nop +/* D8DC08 802409B8 00000000 */ nop /* D8DC0C 802409BC 4602003E */ c.le.s $f0, $f2 -/* D8DC10 802409C0 00000000 */ nop +/* D8DC10 802409C0 00000000 */ nop /* D8DC14 802409C4 45000003 */ bc1f .L802409D4 -/* D8DC18 802409C8 00000000 */ nop +/* D8DC18 802409C8 00000000 */ nop /* D8DC1C 802409CC 08090276 */ j .L802409D8 /* D8DC20 802409D0 46001501 */ sub.s $f20, $f2, $f0 .L802409D4: @@ -100,11 +100,11 @@ glabel func_80240870_D8DAC0 .L802409D8: /* D8DC28 802409D8 3C0141C8 */ lui $at, 0x41c8 /* D8DC2C 802409DC 44810000 */ mtc1 $at, $f0 -/* D8DC30 802409E0 00000000 */ nop +/* D8DC30 802409E0 00000000 */ nop /* D8DC34 802409E4 4600A003 */ div.s $f0, $f20, $f0 /* D8DC38 802409E8 4600010D */ trunc.w.s $f4, $f0 /* D8DC3C 802409EC 44072000 */ mfc1 $a3, $f4 -/* D8DC40 802409F0 00000000 */ nop +/* D8DC40 802409F0 00000000 */ nop /* D8DC44 802409F4 00071100 */ sll $v0, $a3, 4 /* D8DC48 802409F8 00471023 */ subu $v0, $v0, $a3 /* D8DC4C 802409FC 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel func_80240870_D8DAC0 /* D8DC94 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) /* D8DC98 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) /* D8DC9C 80240A4C 0C00A6C9 */ jal clamp_angle -/* D8DCA0 80240A50 00000000 */ nop +/* D8DCA0 80240A50 00000000 */ nop /* D8DCA4 80240A54 44050000 */ mfc1 $a1, $f0 /* D8DCA8 80240A58 4406B000 */ mfc1 $a2, $f22 /* D8DCAC 80240A5C 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel func_80240870_D8DAC0 /* D8DD10 80240AC0 24040001 */ addiu $a0, $zero, 1 .L80240AC4: /* D8DD14 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D8DD18 80240AC8 00000000 */ nop +/* D8DD18 80240AC8 00000000 */ nop /* D8DD1C 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 /* D8DD20 80240AD0 24040001 */ addiu $a0, $zero, 1 .L80240AD4: @@ -204,10 +204,10 @@ glabel func_80240870_D8DAC0 /* D8DDB0 80240B60 44812000 */ mtc1 $at, $f4 /* D8DDB4 80240B64 00021023 */ negu $v0, $v0 /* D8DDB8 80240B68 44820000 */ mtc1 $v0, $f0 -/* D8DDBC 80240B6C 00000000 */ nop +/* D8DDBC 80240B6C 00000000 */ nop /* D8DDC0 80240B70 46800020 */ cvt.s.w $f0, $f0 /* D8DDC4 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D8DDC8 80240B78 00000000 */ nop +/* D8DDC8 80240B78 00000000 */ nop /* D8DDCC 80240B7C 4405B000 */ mfc1 $a1, $f22 /* D8DDD0 80240B80 4407B000 */ mfc1 $a3, $f22 /* D8DDD4 80240B84 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel func_80240870_D8DAC0 /* D8DE44 80240BF4 3C013F00 */ lui $at, 0x3f00 /* D8DE48 80240BF8 44812000 */ mtc1 $at, $f4 /* D8DE4C 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D8DE50 80240C00 00000000 */ nop +/* D8DE50 80240C00 00000000 */ nop /* D8DE54 80240C04 46800020 */ cvt.s.w $f0, $f0 /* D8DE58 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D8DE5C 80240C0C 00000000 */ nop +/* D8DE5C 80240C0C 00000000 */ nop /* D8DE60 80240C10 4405B000 */ mfc1 $a1, $f22 /* D8DE64 80240C14 4407B000 */ mfc1 $a3, $f22 /* D8DE68 80240C18 44062000 */ mfc1 $a2, $f4 @@ -280,16 +280,16 @@ glabel func_80240870_D8DAC0 /* D8DEE0 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D8DEE4 80240C94 3C0142B4 */ lui $at, 0x42b4 /* D8DEE8 80240C98 44810000 */ mtc1 $at, $f0 -/* D8DEEC 80240C9C 00000000 */ nop +/* D8DEEC 80240C9C 00000000 */ nop /* D8DEF0 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D8DEF4 80240CA4 00000000 */ nop +/* D8DEF4 80240CA4 00000000 */ nop /* D8DEF8 80240CA8 4500000A */ bc1f .L80240CD4 /* D8DEFC 80240CAC 24040001 */ addiu $a0, $zero, 1 /* D8DF00 80240CB0 3C014387 */ lui $at, 0x4387 /* D8DF04 80240CB4 44812000 */ mtc1 $at, $f4 -/* D8DF08 80240CB8 00000000 */ nop +/* D8DF08 80240CB8 00000000 */ nop /* D8DF0C 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D8DF10 80240CC0 00000000 */ nop +/* D8DF10 80240CC0 00000000 */ nop /* D8DF14 80240CC4 45000004 */ bc1f .L80240CD8 /* D8DF18 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 /* D8DF1C 80240CCC 3C041000 */ lui $a0, 0x1000 @@ -305,7 +305,7 @@ glabel func_80240870_D8DAC0 /* D8DF3C 80240CEC 26730001 */ addiu $s3, $s3, 1 /* D8DF40 80240CF0 2A620002 */ slti $v0, $s3, 2 /* D8DF44 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D8DF48 80240CF8 00000000 */ nop +/* D8DF48 80240CF8 00000000 */ nop /* D8DF4C 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) /* D8DF50 80240D00 8FB60148 */ lw $s6, 0x148($sp) /* D8DF54 80240D04 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240D3C_D8DF8C.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240D3C_D8DF8C.s index f771a5efcb..3606a10e6f 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240D3C_D8DF8C.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240D3C_D8DF8C.s @@ -11,36 +11,36 @@ glabel func_80240D3C_D8DF8C /* D8DFA4 80240D54 24020001 */ addiu $v0, $zero, 1 /* D8DFA8 80240D58 8E030084 */ lw $v1, 0x84($s0) /* D8DFAC 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D8DFB0 80240D60 00000000 */ nop +/* D8DFB0 80240D60 00000000 */ nop /* D8DFB4 80240D64 28620002 */ slti $v0, $v1, 2 /* D8DFB8 80240D68 50400005 */ beql $v0, $zero, .L80240D80 /* D8DFBC 80240D6C 24020002 */ addiu $v0, $zero, 2 /* D8DFC0 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D8DFC4 80240D74 00000000 */ nop +/* D8DFC4 80240D74 00000000 */ nop /* D8DFC8 80240D78 08090378 */ j .L80240DE0 -/* D8DFCC 80240D7C 00000000 */ nop +/* D8DFCC 80240D7C 00000000 */ nop .L80240D80: /* D8DFD0 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D8DFD4 80240D84 00000000 */ nop +/* D8DFD4 80240D84 00000000 */ nop /* D8DFD8 80240D88 08090378 */ j .L80240DE0 -/* D8DFDC 80240D8C 00000000 */ nop +/* D8DFDC 80240D8C 00000000 */ nop .L80240D90: /* D8DFE0 80240D90 3C048024 */ lui $a0, %hi(pra_35_SetPartnerFlagsA0000) /* D8DFE4 80240D94 24840E84 */ addiu $a0, $a0, %lo(pra_35_SetPartnerFlagsA0000) /* D8DFE8 80240D98 08090374 */ j .L80240DD0 -/* D8DFEC 80240D9C 00000000 */ nop +/* D8DFEC 80240D9C 00000000 */ nop .L80240DA0: /* D8DFF0 80240DA0 3C048024 */ lui $a0, %hi(pra_35_SetPartnerFlags20000) /* D8DFF4 80240DA4 24840EEC */ addiu $a0, $a0, %lo(pra_35_SetPartnerFlags20000) /* D8DFF8 80240DA8 08090374 */ j .L80240DD0 -/* D8DFFC 80240DAC 00000000 */ nop +/* D8DFFC 80240DAC 00000000 */ nop .L80240DB0: /* D8E000 80240DB0 8E020084 */ lw $v0, 0x84($s0) /* D8E004 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D8E008 80240DB8 00000000 */ nop +/* D8E008 80240DB8 00000000 */ nop /* D8E00C 80240DBC 28420002 */ slti $v0, $v0, 2 /* D8E010 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D8E014 80240DC4 00000000 */ nop +/* D8E014 80240DC4 00000000 */ nop .L80240DC8: /* D8E018 80240DC8 3C048024 */ lui $a0, %hi(pra_35_SetPartnerFlags80000) /* D8E01C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(pra_35_SetPartnerFlags80000) @@ -64,14 +64,14 @@ glabel func_80240D3C_D8DF8C /* D8E05C 80240E0C 10400005 */ beqz $v0, .L80240E24 /* D8E060 80240E10 24020002 */ addiu $v0, $zero, 2 /* D8E064 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D8E068 80240E18 00000000 */ nop +/* D8E068 80240E18 00000000 */ nop /* D8E06C 80240E1C 0809039D */ j .L80240E74 -/* D8E070 80240E20 00000000 */ nop +/* D8E070 80240E20 00000000 */ nop .L80240E24: /* D8E074 80240E24 10820006 */ beq $a0, $v0, .L80240E40 /* D8E078 80240E28 24020002 */ addiu $v0, $zero, 2 /* D8E07C 80240E2C 0809039D */ j .L80240E74 -/* D8E080 80240E30 00000000 */ nop +/* D8E080 80240E30 00000000 */ nop .L80240E34: /* D8E084 80240E34 8CA20000 */ lw $v0, ($a1) /* D8E088 80240E38 0809039A */ j .L80240E68 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240F20_D8E170.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240F20_D8E170.s index 56877f24ba..5ddaac4552 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240F20_D8E170.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240F20_D8E170.s @@ -45,7 +45,7 @@ glabel func_80240F20_D8E170 /* D8E20C 80240FBC 0C00A7B5 */ jal dist2D /* D8E210 80240FC0 4600B386 */ mov.s $f14, $f22 /* D8E214 80240FC4 4614003C */ c.lt.s $f0, $f20 -/* D8E218 80240FC8 00000000 */ nop +/* D8E218 80240FC8 00000000 */ nop /* D8E21C 80240FCC 45000003 */ bc1f .L80240FDC /* D8E220 80240FD0 2631000C */ addiu $s1, $s1, 0xc /* D8E224 80240FD4 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_80240F20_D8E170 /* D8E250 80241000 8E6200D0 */ lw $v0, 0xd0($s3) /* D8E254 80241004 8C42007C */ lw $v0, 0x7c($v0) /* D8E258 80241008 04410004 */ bgez $v0, .L8024101C -/* D8E25C 8024100C 00000000 */ nop +/* D8E25C 8024100C 00000000 */ nop /* D8E260 80241010 C6C00000 */ lwc1 $f0, ($s6) /* D8E264 80241014 0809040F */ j .L8024103C /* D8E268 80241018 E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_80240F20_D8E170 /* D8E26C 8024101C 3C018024 */ lui $at, %hi(D_80243FE0) /* D8E270 80241020 D4223FE0 */ ldc1 $f2, %lo(D_80243FE0)($at) /* D8E274 80241024 44820000 */ mtc1 $v0, $f0 -/* D8E278 80241028 00000000 */ nop +/* D8E278 80241028 00000000 */ nop /* D8E27C 8024102C 46800021 */ cvt.d.w $f0, $f0 /* D8E280 80241030 46220003 */ div.d $f0, $f0, $f2 /* D8E284 80241034 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241078_D8E2C8.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241078_D8E2C8.s index 7c6e1add80..fbf45a3051 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241078_D8E2C8.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241078_D8E2C8.s @@ -44,7 +44,7 @@ glabel func_80241078_D8E2C8 /* D8E364 80241114 2402000F */ addiu $v0, $zero, 0xf /* D8E368 80241118 AFA2001C */ sw $v0, 0x1c($sp) /* D8E36C 8024111C 44833000 */ mtc1 $v1, $f6 -/* D8E370 80241120 00000000 */ nop +/* D8E370 80241120 00000000 */ nop /* D8E374 80241124 468031A0 */ cvt.s.w $f6, $f6 /* D8E378 80241128 44073000 */ mfc1 $a3, $f6 /* D8E37C 8024112C 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_80241078_D8E2C8 .L8024117C: /* D8E3CC 8024117C 8602008C */ lh $v0, 0x8c($s0) /* D8E3D0 80241180 1440005D */ bnez $v0, .L802412F8 -/* D8E3D4 80241184 00000000 */ nop +/* D8E3D4 80241184 00000000 */ nop /* D8E3D8 80241188 C6000018 */ lwc1 $f0, 0x18($s0) /* D8E3DC 8024118C 3C014010 */ lui $at, 0x4010 /* D8E3E0 80241190 44811800 */ mtc1 $at, $f3 /* D8E3E4 80241194 44801000 */ mtc1 $zero, $f2 /* D8E3E8 80241198 46000021 */ cvt.d.s $f0, $f0 /* D8E3EC 8024119C 4622003C */ c.lt.d $f0, $f2 -/* D8E3F0 802411A0 00000000 */ nop +/* D8E3F0 802411A0 00000000 */ nop /* D8E3F4 802411A4 45000003 */ bc1f .L802411B4 /* D8E3F8 802411A8 0200202D */ daddu $a0, $s0, $zero /* D8E3FC 802411AC 0809046E */ j .L802411B8 @@ -88,7 +88,7 @@ glabel func_80241078_D8E2C8 /* D8E404 802411B4 24050001 */ addiu $a1, $zero, 1 .L802411B8: /* D8E408 802411B8 0C00F598 */ jal func_8003D660 -/* D8E40C 802411BC 00000000 */ nop +/* D8E40C 802411BC 00000000 */ nop /* D8E410 802411C0 C60C0038 */ lwc1 $f12, 0x38($s0) /* D8E414 802411C4 8E430078 */ lw $v1, 0x78($s2) /* D8E418 802411C8 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_80241078_D8E2C8 /* D8E440 802411F0 4406B000 */ mfc1 $a2, $f22 /* D8E444 802411F4 4407A000 */ mfc1 $a3, $f20 /* D8E448 802411F8 0C00A720 */ jal atan2 -/* D8E44C 802411FC 00000000 */ nop +/* D8E44C 802411FC 00000000 */ nop /* D8E450 80241200 8E050018 */ lw $a1, 0x18($s0) /* D8E454 80241204 44060000 */ mfc1 $a2, $f0 /* D8E458 80241208 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_80241078_D8E2C8 /* D8E46C 8024121C 4406B000 */ mfc1 $a2, $f22 /* D8E470 80241220 4407A000 */ mfc1 $a3, $f20 /* D8E474 80241224 0C00A7B5 */ jal dist2D -/* D8E478 80241228 00000000 */ nop +/* D8E478 80241228 00000000 */ nop /* D8E47C 8024122C C6020018 */ lwc1 $f2, 0x18($s0) /* D8E480 80241230 4602003E */ c.le.s $f0, $f2 -/* D8E484 80241234 00000000 */ nop +/* D8E484 80241234 00000000 */ nop /* D8E488 80241238 4500002F */ bc1f .L802412F8 /* D8E48C 8024123C 240403E8 */ addiu $a0, $zero, 0x3e8 /* D8E490 80241240 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_80241078_D8E2C8 /* D8E4E4 80241294 18400003 */ blez $v0, .L802412A4 /* D8E4E8 80241298 24020004 */ addiu $v0, $zero, 4 /* D8E4EC 8024129C 14600002 */ bnez $v1, .L802412A8 -/* D8E4F0 802412A0 00000000 */ nop +/* D8E4F0 802412A0 00000000 */ nop .L802412A4: /* D8E4F4 802412A4 AE420070 */ sw $v0, 0x70($s2) .L802412A8: diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802413E0_D8E630.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802413E0_D8E630.s index 4f57541f47..f4d9e78ce5 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802413E0_D8E630.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802413E0_D8E630.s @@ -38,7 +38,7 @@ glabel func_802413E0_D8E630 /* D8E6B4 80241464 2402000F */ addiu $v0, $zero, 0xf /* D8E6B8 80241468 AFA2001C */ sw $v0, 0x1c($sp) /* D8E6BC 8024146C 44833000 */ mtc1 $v1, $f6 -/* D8E6C0 80241470 00000000 */ nop +/* D8E6C0 80241470 00000000 */ nop /* D8E6C4 80241474 468031A0 */ cvt.s.w $f6, $f6 /* D8E6C8 80241478 44073000 */ mfc1 $a3, $f6 /* D8E6CC 8024147C 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_802413E0_D8E630 .L802414E0: /* D8E730 802414E0 8602008C */ lh $v0, 0x8c($s0) /* D8E734 802414E4 14400025 */ bnez $v0, .L8024157C -/* D8E738 802414E8 00000000 */ nop +/* D8E738 802414E8 00000000 */ nop /* D8E73C 802414EC 9602008E */ lhu $v0, 0x8e($s0) /* D8E740 802414F0 2442FFFF */ addiu $v0, $v0, -1 /* D8E744 802414F4 A602008E */ sh $v0, 0x8e($s0) /* D8E748 802414F8 00021400 */ sll $v0, $v0, 0x10 /* D8E74C 802414FC 1440001F */ bnez $v0, .L8024157C -/* D8E750 80241500 00000000 */ nop +/* D8E750 80241500 00000000 */ nop /* D8E754 80241504 8E820074 */ lw $v0, 0x74($s4) /* D8E758 80241508 2442FFFF */ addiu $v0, $v0, -1 /* D8E75C 8024150C 10400019 */ beqz $v0, .L80241574 @@ -84,7 +84,7 @@ glabel func_802413E0_D8E630 /* D8E768 80241518 9442002A */ lhu $v0, 0x2a($v0) /* D8E76C 8024151C 30420010 */ andi $v0, $v0, 0x10 /* D8E770 80241520 14400007 */ bnez $v0, .L80241540 -/* D8E774 80241524 00000000 */ nop +/* D8E774 80241524 00000000 */ nop /* D8E778 80241528 C600000C */ lwc1 $f0, 0xc($s0) /* D8E77C 8024152C 3C014334 */ lui $at, 0x4334 /* D8E780 80241530 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024159C_D8E7EC.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024159C_D8E7EC.s index 5ed7bfba4d..591ee19657 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024159C_D8E7EC.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024159C_D8E7EC.s @@ -28,7 +28,7 @@ glabel func_8024159C_D8E7EC /* D8E844 802415F4 8E0200D0 */ lw $v0, 0xd0($s0) /* D8E848 802415F8 8C42007C */ lw $v0, 0x7c($v0) /* D8E84C 802415FC 04410004 */ bgez $v0, .L80241610 -/* D8E850 80241600 00000000 */ nop +/* D8E850 80241600 00000000 */ nop /* D8E854 80241604 C6400000 */ lwc1 $f0, ($s2) /* D8E858 80241608 0809058C */ j .L80241630 /* D8E85C 8024160C E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_8024159C_D8E7EC /* D8E860 80241610 3C018024 */ lui $at, %hi(D_80243FE8) /* D8E864 80241614 D4223FE8 */ ldc1 $f2, %lo(D_80243FE8)($at) /* D8E868 80241618 44820000 */ mtc1 $v0, $f0 -/* D8E86C 8024161C 00000000 */ nop +/* D8E86C 8024161C 00000000 */ nop /* D8E870 80241620 46800021 */ cvt.d.w $f0, $f0 /* D8E874 80241624 46220003 */ div.d $f0, $f0, $f2 /* D8E878 80241628 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024173C_D8E98C.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024173C_D8E98C.s index ba7e40e58d..3519ce3c0b 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024173C_D8E98C.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024173C_D8E98C.s @@ -47,20 +47,20 @@ glabel func_8024173C_D8E98C /* D8EA34 802417E4 8E02001C */ lw $v0, 0x1c($s0) /* D8EA38 802417E8 46001005 */ abs.s $f0, $f2 /* D8EA3C 802417EC 44822000 */ mtc1 $v0, $f4 -/* D8EA40 802417F0 00000000 */ nop +/* D8EA40 802417F0 00000000 */ nop /* D8EA44 802417F4 46802120 */ cvt.s.w $f4, $f4 /* D8EA48 802417F8 4600203C */ c.lt.s $f4, $f0 -/* D8EA4C 802417FC 00000000 */ nop +/* D8EA4C 802417FC 00000000 */ nop /* D8EA50 80241800 4500000D */ bc1f .L80241838 -/* D8EA54 80241804 00000000 */ nop +/* D8EA54 80241804 00000000 */ nop /* D8EA58 80241808 44800000 */ mtc1 $zero, $f0 /* D8EA5C 8024180C C654000C */ lwc1 $f20, 0xc($s2) /* D8EA60 80241810 4600103C */ c.lt.s $f2, $f0 -/* D8EA64 80241814 00000000 */ nop +/* D8EA64 80241814 00000000 */ nop /* D8EA68 80241818 45000006 */ bc1f .L80241834 /* D8EA6C 8024181C 00021023 */ negu $v0, $v0 /* D8EA70 80241820 44820000 */ mtc1 $v0, $f0 -/* D8EA74 80241824 00000000 */ nop +/* D8EA74 80241824 00000000 */ nop /* D8EA78 80241828 46800020 */ cvt.s.w $f0, $f0 /* D8EA7C 8024182C 0809060E */ j .L80241838 /* D8EA80 80241830 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024186C_D8EABC.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024186C_D8EABC.s index 20824c5382..fa3516226d 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024186C_D8EABC.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024186C_D8EABC.s @@ -37,7 +37,7 @@ glabel func_8024186C_D8EABC /* D8EB3C 802418EC 2402000F */ addiu $v0, $zero, 0xf /* D8EB40 802418F0 AFA2001C */ sw $v0, 0x1c($sp) /* D8EB44 802418F4 44833000 */ mtc1 $v1, $f6 -/* D8EB48 802418F8 00000000 */ nop +/* D8EB48 802418F8 00000000 */ nop /* D8EB4C 802418FC 468031A0 */ cvt.s.w $f6, $f6 /* D8EB50 80241900 44073000 */ mfc1 $a3, $f6 /* D8EB54 80241904 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802419F4_D8EC44.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802419F4_D8EC44.s index f22765049a..980068bf1c 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802419F4_D8EC44.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802419F4_D8EC44.s @@ -28,7 +28,7 @@ glabel func_802419F4_D8EC44 /* D8EC9C 80241A4C C4400008 */ lwc1 $f0, 8($v0) /* D8ECA0 80241A50 46800020 */ cvt.s.w $f0, $f0 /* D8ECA4 80241A54 4602003E */ c.le.s $f0, $f2 -/* D8ECA8 80241A58 00000000 */ nop +/* D8ECA8 80241A58 00000000 */ nop /* D8ECAC 80241A5C 45020003 */ bc1fl .L80241A6C /* D8ECB0 80241A60 24840001 */ addiu $a0, $a0, 1 /* D8ECB4 80241A64 0809069F */ j .L80241A7C diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s index 3bfe2d61e8..a010835933 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s @@ -46,7 +46,7 @@ glabel func_80241AB4_D8ED04 /* D8EDA8 80241B58 8E2200B0 */ lw $v0, 0xb0($s1) /* D8EDAC 80241B5C 30420004 */ andi $v0, $v0, 4 /* D8EDB0 80241B60 10400044 */ beqz $v0, .L80241C74 -/* D8EDB4 80241B64 00000000 */ nop +/* D8EDB4 80241B64 00000000 */ nop .L80241B68: /* D8EDB8 80241B68 2404F7FF */ addiu $a0, $zero, -0x801 /* D8EDBC 80241B6C AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80241AB4_D8ED04 /* D8EE70 80241C20 3C0142C8 */ lui $at, 0x42c8 /* D8EE74 80241C24 44812000 */ mtc1 $at, $f4 /* D8EE78 80241C28 44823000 */ mtc1 $v0, $f6 -/* D8EE7C 80241C2C 00000000 */ nop +/* D8EE7C 80241C2C 00000000 */ nop /* D8EE80 80241C30 468031A0 */ cvt.s.w $f6, $f6 /* D8EE84 80241C34 27A20044 */ addiu $v0, $sp, 0x44 /* D8EE88 80241C38 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80241AB4_D8ED04 /* D8EEAC 80241C5C 0C0372DF */ jal func_800DCB7C /* D8EEB0 80241C60 27A70040 */ addiu $a3, $sp, 0x40 /* D8EEB4 80241C64 10400003 */ beqz $v0, .L80241C74 -/* D8EEB8 80241C68 00000000 */ nop +/* D8EEB8 80241C68 00000000 */ nop /* D8EEBC 80241C6C C7A0003C */ lwc1 $f0, 0x3c($sp) /* D8EEC0 80241C70 E640003C */ swc1 $f0, 0x3c($s2) .L80241C74: @@ -124,72 +124,85 @@ glabel func_80241AB4_D8ED04 /* D8EEC8 80241C78 2C620064 */ sltiu $v0, $v1, 0x64 /* D8EECC 80241C7C 10400042 */ beqz $v0, .L80241D88 /* D8EED0 80241C80 00031080 */ sll $v0, $v1, 2 -/* D8EED4 80241C84 3C018024 */ lui $at, %hi(D_80243FF0) +/* D8EED4 80241C84 3C018024 */ lui $at, %hi(jtbl_80243FF0_D91240) /* D8EED8 80241C88 00220821 */ addu $at, $at, $v0 -/* D8EEDC 80241C8C 8C223FF0 */ lw $v0, %lo(D_80243FF0)($at) +/* D8EEDC 80241C8C 8C223FF0 */ lw $v0, %lo(jtbl_80243FF0_D91240)($at) /* D8EEE0 80241C90 00400008 */ jr $v0 -/* D8EEE4 80241C94 00000000 */ nop +/* D8EEE4 80241C94 00000000 */ nop +glabel L80241C98_D8EEE8 /* D8EEE8 80241C98 0280202D */ daddu $a0, $s4, $zero /* D8EEEC 80241C9C 0260282D */ daddu $a1, $s3, $zero /* D8EEF0 80241CA0 0C0903C8 */ jal func_80240F20_D8E170 /* D8EEF4 80241CA4 02A0302D */ daddu $a2, $s5, $zero +glabel L80241CA8_D8EEF8 /* D8EEF8 80241CA8 0280202D */ daddu $a0, $s4, $zero /* D8EEFC 80241CAC 0260282D */ daddu $a1, $s3, $zero /* D8EF00 80241CB0 0C09041E */ jal func_80241078_D8E2C8 /* D8EF04 80241CB4 02A0302D */ daddu $a2, $s5, $zero /* D8EF08 80241CB8 08090762 */ j .L80241D88 -/* D8EF0C 80241CBC 00000000 */ nop +/* D8EF0C 80241CBC 00000000 */ nop +glabel L80241CC0_D8EF10 /* D8EF10 80241CC0 0280202D */ daddu $a0, $s4, $zero /* D8EF14 80241CC4 0260282D */ daddu $a1, $s3, $zero /* D8EF18 80241CC8 0C0904C8 */ jal pra_35_UnkNpcAIFunc1 /* D8EF1C 80241CCC 02A0302D */ daddu $a2, $s5, $zero +glabel L80241CD0_D8EF20 /* D8EF20 80241CD0 0280202D */ daddu $a0, $s4, $zero /* D8EF24 80241CD4 0260282D */ daddu $a1, $s3, $zero /* D8EF28 80241CD8 0C0904F8 */ jal func_802413E0_D8E630 /* D8EF2C 80241CDC 02A0302D */ daddu $a2, $s5, $zero /* D8EF30 80241CE0 08090762 */ j .L80241D88 -/* D8EF34 80241CE4 00000000 */ nop +/* D8EF34 80241CE4 00000000 */ nop +glabel L80241CE8_D8EF38 /* D8EF38 80241CE8 0280202D */ daddu $a0, $s4, $zero /* D8EF3C 80241CEC 0260282D */ daddu $a1, $s3, $zero /* D8EF40 80241CF0 0C090567 */ jal func_8024159C_D8E7EC /* D8EF44 80241CF4 02A0302D */ daddu $a2, $s5, $zero /* D8EF48 80241CF8 08090762 */ j .L80241D88 -/* D8EF4C 80241CFC 00000000 */ nop +/* D8EF4C 80241CFC 00000000 */ nop +glabel L80241D00_D8EF50 /* D8EF50 80241D00 0280202D */ daddu $a0, $s4, $zero /* D8EF54 80241D04 0260282D */ daddu $a1, $s3, $zero /* D8EF58 80241D08 0C090594 */ jal pra_35_NpcJumpFunc2 /* D8EF5C 80241D0C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241D10_D8EF60 /* D8EF60 80241D10 0280202D */ daddu $a0, $s4, $zero /* D8EF64 80241D14 0260282D */ daddu $a1, $s3, $zero /* D8EF68 80241D18 0C0905B1 */ jal pra_35_NpcJumpFunc /* D8EF6C 80241D1C 02A0302D */ daddu $a2, $s5, $zero /* D8EF70 80241D20 08090762 */ j .L80241D88 -/* D8EF74 80241D24 00000000 */ nop +/* D8EF74 80241D24 00000000 */ nop +glabel L80241D28_D8EF78 /* D8EF78 80241D28 0280202D */ daddu $a0, $s4, $zero /* D8EF7C 80241D2C 0260282D */ daddu $a1, $s3, $zero /* D8EF80 80241D30 0C0905CF */ jal func_8024173C_D8E98C /* D8EF84 80241D34 02A0302D */ daddu $a2, $s5, $zero +glabel L80241D38_D8EF88 /* D8EF88 80241D38 0280202D */ daddu $a0, $s4, $zero /* D8EF8C 80241D3C 0260282D */ daddu $a1, $s3, $zero /* D8EF90 80241D40 0C09061B */ jal func_8024186C_D8EABC /* D8EF94 80241D44 02A0302D */ daddu $a2, $s5, $zero /* D8EF98 80241D48 08090762 */ j .L80241D88 -/* D8EF9C 80241D4C 00000000 */ nop +/* D8EF9C 80241D4C 00000000 */ nop +glabel L80241D50_D8EFA0 /* D8EFA0 80241D50 0280202D */ daddu $a0, $s4, $zero /* D8EFA4 80241D54 0260282D */ daddu $a1, $s3, $zero /* D8EFA8 80241D58 0C090663 */ jal pra_35_UnkNpcDurationFlagFunc /* D8EFAC 80241D5C 02A0302D */ daddu $a2, $s5, $zero /* D8EFB0 80241D60 08090762 */ j .L80241D88 -/* D8EFB4 80241D64 00000000 */ nop +/* D8EFB4 80241D64 00000000 */ nop +glabel L80241D68_D8EFB8 /* D8EFB8 80241D68 0280202D */ daddu $a0, $s4, $zero /* D8EFBC 80241D6C 0260282D */ daddu $a1, $s3, $zero /* D8EFC0 80241D70 0C09067D */ jal func_802419F4_D8EC44 /* D8EFC4 80241D74 02A0302D */ daddu $a2, $s5, $zero /* D8EFC8 80241D78 08090762 */ j .L80241D88 -/* D8EFCC 80241D7C 00000000 */ nop +/* D8EFCC 80241D7C 00000000 */ nop +glabel L80241D80_D8EFD0 /* D8EFD0 80241D80 0C0129CF */ jal func_8004A73C /* D8EFD4 80241D84 0280202D */ daddu $a0, $s4, $zero .L80241D88: +glabel L80241D88_D8EFD8 /* D8EFD8 80241D88 8FBF0060 */ lw $ra, 0x60($sp) /* D8EFDC 80241D8C 8FB5005C */ lw $s5, 0x5c($sp) /* D8EFE0 80241D90 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241FB8_D8F208.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241FB8_D8F208.s index 101a04f84f..212e6e4dec 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241FB8_D8F208.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241FB8_D8F208.s @@ -42,7 +42,7 @@ glabel func_80241FB8_D8F208 /* D8F29C 8024204C C6620074 */ lwc1 $f2, 0x74($s3) /* D8F2A0 80242050 468010A0 */ cvt.s.w $f2, $f2 /* D8F2A4 80242054 4600103C */ c.lt.s $f2, $f0 -/* D8F2A8 80242058 00000000 */ nop +/* D8F2A8 80242058 00000000 */ nop /* D8F2AC 8024205C 45030001 */ bc1tl .L80242064 /* D8F2B0 80242060 0000882D */ daddu $s1, $zero, $zero .L80242064: @@ -51,16 +51,16 @@ glabel func_80241FB8_D8F208 /* D8F2BC 8024206C 3C014387 */ lui $at, 0x4387 /* D8F2C0 80242070 4481A000 */ mtc1 $at, $f20 /* D8F2C4 80242074 0C00A70A */ jal get_clamped_angle_diff -/* D8F2C8 80242078 00000000 */ nop +/* D8F2C8 80242078 00000000 */ nop /* D8F2CC 8024207C 0C00A6C9 */ jal clamp_angle /* D8F2D0 80242080 46000306 */ mov.s $f12, $f0 /* D8F2D4 80242084 3C018024 */ lui $at, %hi(D_80244180) /* D8F2D8 80242088 D4224180 */ ldc1 $f2, %lo(D_80244180)($at) /* D8F2DC 8024208C 46000021 */ cvt.d.s $f0, $f0 /* D8F2E0 80242090 4622003C */ c.lt.d $f0, $f2 -/* D8F2E4 80242094 00000000 */ nop +/* D8F2E4 80242094 00000000 */ nop /* D8F2E8 80242098 45000003 */ bc1f .L802420A8 -/* D8F2EC 8024209C 00000000 */ nop +/* D8F2EC 8024209C 00000000 */ nop /* D8F2F0 802420A0 3C0142B4 */ lui $at, 0x42b4 /* D8F2F4 802420A4 4481A000 */ mtc1 $at, $f20 .L802420A8: @@ -77,7 +77,7 @@ glabel func_80241FB8_D8F208 /* D8F320 802420D0 468010A0 */ cvt.s.w $f2, $f2 /* D8F324 802420D4 46000005 */ abs.s $f0, $f0 /* D8F328 802420D8 4600103C */ c.lt.s $f2, $f0 -/* D8F32C 802420DC 00000000 */ nop +/* D8F32C 802420DC 00000000 */ nop /* D8F330 802420E0 45030001 */ bc1tl .L802420E8 /* D8F334 802420E4 0000882D */ daddu $s1, $zero, $zero .L802420E8: @@ -87,13 +87,13 @@ glabel func_80241FB8_D8F208 /* D8F344 802420F4 860200A8 */ lh $v0, 0xa8($s0) /* D8F348 802420F8 46020001 */ sub.s $f0, $f0, $f2 /* D8F34C 802420FC 44821000 */ mtc1 $v0, $f2 -/* D8F350 80242100 00000000 */ nop +/* D8F350 80242100 00000000 */ nop /* D8F354 80242104 468010A1 */ cvt.d.w $f2, $f2 /* D8F358 80242108 46221080 */ add.d $f2, $f2, $f2 /* D8F35C 8024210C 46000005 */ abs.s $f0, $f0 /* D8F360 80242110 46000021 */ cvt.d.s $f0, $f0 /* D8F364 80242114 4620103E */ c.le.d $f2, $f0 -/* D8F368 80242118 00000000 */ nop +/* D8F368 80242118 00000000 */ nop /* D8F36C 8024211C 45030001 */ bc1tl .L80242124 /* D8F370 80242120 0000882D */ daddu $s1, $zero, $zero .L80242124: diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024216C_D8F3BC.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024216C_D8F3BC.s index 35d2c3c879..d4ae0a256d 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024216C_D8F3BC.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024216C_D8F3BC.s @@ -19,7 +19,7 @@ glabel func_8024216C_D8F3BC /* D8F3F4 802421A4 8E2200B0 */ lw $v0, 0xb0($s1) /* D8F3F8 802421A8 30420004 */ andi $v0, $v0, 4 /* D8F3FC 802421AC 10400015 */ beqz $v0, .L80242204 -/* D8F400 802421B0 00000000 */ nop +/* D8F400 802421B0 00000000 */ nop .L802421B4: /* D8F404 802421B4 AE800070 */ sw $zero, 0x70($s4) /* D8F408 802421B8 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel func_8024216C_D8F3BC /* D8F458 80242208 12600005 */ beqz $s3, .L80242220 /* D8F45C 8024220C 24020001 */ addiu $v0, $zero, 1 /* D8F460 80242210 12620048 */ beq $s3, $v0, .L80242334 -/* D8F464 80242214 00000000 */ nop +/* D8F464 80242214 00000000 */ nop /* D8F468 80242218 080908EA */ j .L802423A8 -/* D8F46C 8024221C 00000000 */ nop +/* D8F46C 8024221C 00000000 */ nop .L80242220: /* D8F470 80242220 86240008 */ lh $a0, 8($s1) /* D8F474 80242224 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel func_8024216C_D8F3BC /* D8F494 80242244 8E03006C */ lw $v1, 0x6c($s0) /* D8F498 80242248 24020003 */ addiu $v0, $zero, 3 /* D8F49C 8024224C 14620056 */ bne $v1, $v0, .L802423A8 -/* D8F4A0 80242250 00000000 */ nop +/* D8F4A0 80242250 00000000 */ nop /* D8F4A4 80242254 8E2500A8 */ lw $a1, 0xa8($s1) /* D8F4A8 80242258 10A00003 */ beqz $a1, .L80242268 /* D8F4AC 8024225C 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel func_8024216C_D8F3BC /* D8F524 802422D4 C7A20014 */ lwc1 $f2, 0x14($sp) /* D8F528 802422D8 4600020D */ trunc.w.s $f8, $f0 /* D8F52C 802422DC 44024000 */ mfc1 $v0, $f8 -/* D8F530 802422E0 00000000 */ nop +/* D8F530 802422E0 00000000 */ nop /* D8F534 802422E4 A6220012 */ sh $v0, 0x12($s1) /* D8F538 802422E8 4600120D */ trunc.w.s $f8, $f2 /* D8F53C 802422EC 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s index 5fbb3c03af..736e6b538c 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s @@ -46,7 +46,7 @@ glabel func_802423CC_D8F61C /* D8F6C0 80242470 8E2200B0 */ lw $v0, 0xb0($s1) /* D8F6C4 80242474 30420004 */ andi $v0, $v0, 4 /* D8F6C8 80242478 10400020 */ beqz $v0, .L802424FC -/* D8F6CC 8024247C 00000000 */ nop +/* D8F6CC 8024247C 00000000 */ nop .L80242480: /* D8F6D0 80242480 2404F7FF */ addiu $a0, $zero, -0x801 /* D8F6D4 80242484 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_802423CC_D8F61C /* D8F74C 802424FC 8E420070 */ lw $v0, 0x70($s2) /* D8F750 80242500 2842001E */ slti $v0, $v0, 0x1e /* D8F754 80242504 10400009 */ beqz $v0, .L8024252C -/* D8F758 80242508 00000000 */ nop +/* D8F758 80242508 00000000 */ nop /* D8F75C 8024250C 8E22006C */ lw $v0, 0x6c($s1) /* D8F760 80242510 14400006 */ bnez $v0, .L8024252C -/* D8F764 80242514 00000000 */ nop +/* D8F764 80242514 00000000 */ nop /* D8F768 80242518 0C0907EE */ jal func_80241FB8_D8F208 /* D8F76C 8024251C 0240202D */ daddu $a0, $s2, $zero /* D8F770 80242520 10400002 */ beqz $v0, .L8024252C @@ -100,84 +100,100 @@ glabel func_802423CC_D8F61C /* D8F780 80242530 2C620064 */ sltiu $v0, $v1, 0x64 /* D8F784 80242534 1040004E */ beqz $v0, .L80242670 /* D8F788 80242538 00031080 */ sll $v0, $v1, 2 -/* D8F78C 8024253C 3C018024 */ lui $at, %hi(D_80244188) +/* D8F78C 8024253C 3C018024 */ lui $at, %hi(jtbl_80244188_D913D8) /* D8F790 80242540 00220821 */ addu $at, $at, $v0 -/* D8F794 80242544 8C224188 */ lw $v0, %lo(D_80244188)($at) +/* D8F794 80242544 8C224188 */ lw $v0, %lo(jtbl_80244188_D913D8)($at) /* D8F798 80242548 00400008 */ jr $v0 -/* D8F79C 8024254C 00000000 */ nop +/* D8F79C 8024254C 00000000 */ nop +glabel L80242550_D8F7A0 /* D8F7A0 80242550 0240202D */ daddu $a0, $s2, $zero /* D8F7A4 80242554 0260282D */ daddu $a1, $s3, $zero /* D8F7A8 80242558 0C0903C8 */ jal func_80240F20_D8E170 /* D8F7AC 8024255C 0280302D */ daddu $a2, $s4, $zero +glabel L80242560_D8F7B0 /* D8F7B0 80242560 0240202D */ daddu $a0, $s2, $zero /* D8F7B4 80242564 0260282D */ daddu $a1, $s3, $zero /* D8F7B8 80242568 0C09041E */ jal func_80241078_D8E2C8 /* D8F7BC 8024256C 0280302D */ daddu $a2, $s4, $zero /* D8F7C0 80242570 0809099C */ j .L80242670 -/* D8F7C4 80242574 00000000 */ nop +/* D8F7C4 80242574 00000000 */ nop +glabel L80242578_D8F7C8 /* D8F7C8 80242578 0240202D */ daddu $a0, $s2, $zero /* D8F7CC 8024257C 0260282D */ daddu $a1, $s3, $zero /* D8F7D0 80242580 0C0904C8 */ jal pra_35_UnkNpcAIFunc1 /* D8F7D4 80242584 0280302D */ daddu $a2, $s4, $zero +glabel L80242588_D8F7D8 /* D8F7D8 80242588 0240202D */ daddu $a0, $s2, $zero /* D8F7DC 8024258C 0260282D */ daddu $a1, $s3, $zero /* D8F7E0 80242590 0C0904F8 */ jal func_802413E0_D8E630 /* D8F7E4 80242594 0280302D */ daddu $a2, $s4, $zero /* D8F7E8 80242598 0809099C */ j .L80242670 -/* D8F7EC 8024259C 00000000 */ nop +/* D8F7EC 8024259C 00000000 */ nop +glabel L802425A0_D8F7F0 /* D8F7F0 802425A0 0240202D */ daddu $a0, $s2, $zero /* D8F7F4 802425A4 0260282D */ daddu $a1, $s3, $zero /* D8F7F8 802425A8 0C090567 */ jal func_8024159C_D8E7EC /* D8F7FC 802425AC 0280302D */ daddu $a2, $s4, $zero /* D8F800 802425B0 0809099C */ j .L80242670 -/* D8F804 802425B4 00000000 */ nop +/* D8F804 802425B4 00000000 */ nop +glabel L802425B8_D8F808 /* D8F808 802425B8 0240202D */ daddu $a0, $s2, $zero /* D8F80C 802425BC 0260282D */ daddu $a1, $s3, $zero /* D8F810 802425C0 0C090594 */ jal pra_35_NpcJumpFunc2 /* D8F814 802425C4 0280302D */ daddu $a2, $s4, $zero +glabel L802425C8_D8F818 /* D8F818 802425C8 0240202D */ daddu $a0, $s2, $zero /* D8F81C 802425CC 0260282D */ daddu $a1, $s3, $zero /* D8F820 802425D0 0C0905B1 */ jal pra_35_NpcJumpFunc /* D8F824 802425D4 0280302D */ daddu $a2, $s4, $zero /* D8F828 802425D8 0809099C */ j .L80242670 -/* D8F82C 802425DC 00000000 */ nop +/* D8F82C 802425DC 00000000 */ nop +glabel L802425E0_D8F830 /* D8F830 802425E0 0240202D */ daddu $a0, $s2, $zero /* D8F834 802425E4 0260282D */ daddu $a1, $s3, $zero /* D8F838 802425E8 0C0905CF */ jal func_8024173C_D8E98C /* D8F83C 802425EC 0280302D */ daddu $a2, $s4, $zero +glabel L802425F0_D8F840 /* D8F840 802425F0 0240202D */ daddu $a0, $s2, $zero /* D8F844 802425F4 0260282D */ daddu $a1, $s3, $zero /* D8F848 802425F8 0C09061B */ jal func_8024186C_D8EABC /* D8F84C 802425FC 0280302D */ daddu $a2, $s4, $zero /* D8F850 80242600 0809099C */ j .L80242670 -/* D8F854 80242604 00000000 */ nop +/* D8F854 80242604 00000000 */ nop +glabel L80242608_D8F858 /* D8F858 80242608 0240202D */ daddu $a0, $s2, $zero /* D8F85C 8024260C 0260282D */ daddu $a1, $s3, $zero /* D8F860 80242610 0C090663 */ jal pra_35_UnkNpcDurationFlagFunc /* D8F864 80242614 0280302D */ daddu $a2, $s4, $zero /* D8F868 80242618 0809099C */ j .L80242670 -/* D8F86C 8024261C 00000000 */ nop +/* D8F86C 8024261C 00000000 */ nop +glabel L80242620_D8F870 /* D8F870 80242620 0C09076C */ jal pra_35_UnkNpcAIFunc6 /* D8F874 80242624 0240202D */ daddu $a0, $s2, $zero +glabel L80242628_D8F878 /* D8F878 80242628 0C090787 */ jal pra_35_UnkNpcAIFunc7 /* D8F87C 8024262C 0240202D */ daddu $a0, $s2, $zero /* D8F880 80242630 8E430070 */ lw $v1, 0x70($s2) /* D8F884 80242634 24020020 */ addiu $v0, $zero, 0x20 /* D8F888 80242638 1462000D */ bne $v1, $v0, .L80242670 -/* D8F88C 8024263C 00000000 */ nop +/* D8F88C 8024263C 00000000 */ nop +glabel L80242640_D8F890 /* D8F890 80242640 0C0907A3 */ jal pra_35_UnkNpcAIFunc8 /* D8F894 80242644 0240202D */ daddu $a0, $s2, $zero /* D8F898 80242648 8E430070 */ lw $v1, 0x70($s2) /* D8F89C 8024264C 24020021 */ addiu $v0, $zero, 0x21 /* D8F8A0 80242650 14620007 */ bne $v1, $v0, .L80242670 -/* D8F8A4 80242654 00000000 */ nop +/* D8F8A4 80242654 00000000 */ nop +glabel L80242658_D8F8A8 /* D8F8A8 80242658 0C0907D9 */ jal pra_35_UnkNpcAIFunc5 /* D8F8AC 8024265C 0240202D */ daddu $a0, $s2, $zero /* D8F8B0 80242660 0809099C */ j .L80242670 -/* D8F8B4 80242664 00000000 */ nop +/* D8F8B4 80242664 00000000 */ nop +glabel L80242668_D8F8B8 /* D8F8B8 80242668 0C0129CF */ jal func_8004A73C /* D8F8BC 8024266C 0240202D */ daddu $a0, $s2, $zero .L80242670: +glabel L80242670_D8F8C0 /* D8F8C0 80242670 8FBF0048 */ lw $ra, 0x48($sp) /* D8F8C4 80242674 8FB50044 */ lw $s5, 0x44($sp) /* D8F8C8 80242678 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s index 5f7b82026d..c963ab7f53 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s @@ -100,78 +100,93 @@ glabel func_80242698_D8F8E8 /* D8FA4C 802427FC 2C620064 */ sltiu $v0, $v1, 0x64 /* D8FA50 80242800 10400048 */ beqz $v0, .L80242924 /* D8FA54 80242804 00031080 */ sll $v0, $v1, 2 -/* D8FA58 80242808 3C018024 */ lui $at, %hi(D_80244318) +/* D8FA58 80242808 3C018024 */ lui $at, %hi(jtbl_80244318_D91568) /* D8FA5C 8024280C 00220821 */ addu $at, $at, $v0 -/* D8FA60 80242810 8C224318 */ lw $v0, %lo(D_80244318)($at) +/* D8FA60 80242810 8C224318 */ lw $v0, %lo(jtbl_80244318_D91568)($at) /* D8FA64 80242814 00400008 */ jr $v0 /* D8FA68 80242818 00000000 */ nop +glabel L8024281C_D8FA6C /* D8FA6C 8024281C 0240202D */ daddu $a0, $s2, $zero /* D8FA70 80242820 0260282D */ daddu $a1, $s3, $zero /* D8FA74 80242824 0C012568 */ jal func_800495A0 /* D8FA78 80242828 0280302D */ daddu $a2, $s4, $zero +glabel L8024282C_D8FA7C /* D8FA7C 8024282C 0240202D */ daddu $a0, $s2, $zero /* D8FA80 80242830 0260282D */ daddu $a1, $s3, $zero /* D8FA84 80242834 0C0125AE */ jal func_800496B8 /* D8FA88 80242838 0280302D */ daddu $a2, $s4, $zero /* D8FA8C 8024283C 08090A49 */ j .L80242924 /* D8FA90 80242840 00000000 */ nop +glabel L80242844_D8FA94 /* D8FA94 80242844 0240202D */ daddu $a0, $s2, $zero /* D8FA98 80242848 0260282D */ daddu $a1, $s3, $zero /* D8FA9C 8024284C 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D8FAA0 80242850 0280302D */ daddu $a2, $s4, $zero +glabel L80242854_D8FAA4 /* D8FAA4 80242854 0240202D */ daddu $a0, $s2, $zero /* D8FAA8 80242858 0260282D */ daddu $a1, $s3, $zero /* D8FAAC 8024285C 0C012701 */ jal func_80049C04 /* D8FAB0 80242860 0280302D */ daddu $a2, $s4, $zero /* D8FAB4 80242864 08090A49 */ j .L80242924 /* D8FAB8 80242868 00000000 */ nop +glabel L8024286C_D8FABC /* D8FABC 8024286C 0240202D */ daddu $a0, $s2, $zero /* D8FAC0 80242870 0260282D */ daddu $a1, $s3, $zero /* D8FAC4 80242874 0C01278F */ jal func_80049E3C /* D8FAC8 80242878 0280302D */ daddu $a2, $s4, $zero +glabel L8024287C_D8FACC /* D8FACC 8024287C 0240202D */ daddu $a0, $s2, $zero /* D8FAD0 80242880 0260282D */ daddu $a1, $s3, $zero /* D8FAD4 80242884 0C0127B3 */ jal func_80049ECC /* D8FAD8 80242888 0280302D */ daddu $a2, $s4, $zero /* D8FADC 8024288C 08090A49 */ j .L80242924 /* D8FAE0 80242890 00000000 */ nop +glabel L80242894_D8FAE4 /* D8FAE4 80242894 0240202D */ daddu $a0, $s2, $zero /* D8FAE8 80242898 0260282D */ daddu $a1, $s3, $zero /* D8FAEC 8024289C 0C0127DF */ jal func_80049F7C /* D8FAF0 802428A0 0280302D */ daddu $a2, $s4, $zero +glabel L802428A4_D8FAF4 /* D8FAF4 802428A4 0240202D */ daddu $a0, $s2, $zero /* D8FAF8 802428A8 0260282D */ daddu $a1, $s3, $zero /* D8FAFC 802428AC 0C012849 */ jal func_8004A124 /* D8FB00 802428B0 0280302D */ daddu $a2, $s4, $zero /* D8FB04 802428B4 08090A49 */ j .L80242924 /* D8FB08 802428B8 00000000 */ nop +glabel L802428BC_D8FB0C /* D8FB0C 802428BC 0240202D */ daddu $a0, $s2, $zero /* D8FB10 802428C0 0260282D */ daddu $a1, $s3, $zero /* D8FB14 802428C4 0C0128FA */ jal func_8004A3E8 /* D8FB18 802428C8 0280302D */ daddu $a2, $s4, $zero /* D8FB1C 802428CC 08090A49 */ j .L80242924 /* D8FB20 802428D0 00000000 */ nop +glabel L802428D4_D8FB24 /* D8FB24 802428D4 0C09076C */ jal pra_35_UnkNpcAIFunc6 /* D8FB28 802428D8 0240202D */ daddu $a0, $s2, $zero +glabel L802428DC_D8FB2C /* D8FB2C 802428DC 0C090787 */ jal pra_35_UnkNpcAIFunc7 /* D8FB30 802428E0 0240202D */ daddu $a0, $s2, $zero /* D8FB34 802428E4 8E430070 */ lw $v1, 0x70($s2) /* D8FB38 802428E8 24020020 */ addiu $v0, $zero, 0x20 /* D8FB3C 802428EC 1462000D */ bne $v1, $v0, .L80242924 /* D8FB40 802428F0 00000000 */ nop +glabel L802428F4_D8FB44 /* D8FB44 802428F4 0C0907A3 */ jal pra_35_UnkNpcAIFunc8 /* D8FB48 802428F8 0240202D */ daddu $a0, $s2, $zero /* D8FB4C 802428FC 8E430070 */ lw $v1, 0x70($s2) /* D8FB50 80242900 24020021 */ addiu $v0, $zero, 0x21 /* D8FB54 80242904 14620007 */ bne $v1, $v0, .L80242924 /* D8FB58 80242908 00000000 */ nop +glabel L8024290C_D8FB5C /* D8FB5C 8024290C 0C0907D9 */ jal pra_35_UnkNpcAIFunc5 /* D8FB60 80242910 0240202D */ daddu $a0, $s2, $zero /* D8FB64 80242914 08090A49 */ j .L80242924 /* D8FB68 80242918 00000000 */ nop +glabel L8024291C_D8FB6C /* D8FB6C 8024291C 0C0129CF */ jal func_8004A73C /* D8FB70 80242920 0240202D */ daddu $a0, $s2, $zero .L80242924: +glabel L80242924_D8FB74 /* D8FB74 80242924 8FBF0048 */ lw $ra, 0x48($sp) /* D8FB78 80242928 8FB50044 */ lw $s5, 0x44($sp) /* D8FB7C 8024292C 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242950_D8FBA0.s b/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242950_D8FBA0.s index 216a72c9c8..0776b5db89 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242950_D8FBA0.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242950_D8FBA0.s @@ -26,7 +26,7 @@ glabel func_80242950_D8FBA0 /* D8FBF0 802429A0 1440FFFA */ bnez $v0, .L8024298C /* D8FBF4 802429A4 24A50004 */ addiu $a1, $a1, 4 /* D8FBF8 802429A8 08090A7B */ j .L802429EC -/* D8FBFC 802429AC 00000000 */ nop +/* D8FBFC 802429AC 00000000 */ nop .L802429B0: /* D8FC00 802429B0 0000182D */ daddu $v1, $zero, $zero /* D8FC04 802429B4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240084_D91784.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240084_D91784.s index f761e06e13..057cef3179 100644 --- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240084_D91784.s +++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240084_D91784.s @@ -40,7 +40,7 @@ glabel func_80240084_D91784 /* D91800 80240100 1440FFF7 */ bnez $v0, .L802400E0 /* D91804 80240104 24820001 */ addiu $v0, $a0, 1 /* D91808 80240108 03E00008 */ jr $ra -/* D9180C 8024010C 00000000 */ nop +/* D9180C 8024010C 00000000 */ nop .L80240110: /* D91810 80240110 3C020100 */ lui $v0, 0x100 .L80240114: diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s index ac383cf124..59b69be249 100644 --- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s +++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s @@ -16,7 +16,7 @@ glabel func_80240158_D91858 /* D91884 80240184 27B20020 */ addiu $s2, $sp, 0x20 /* D91888 80240188 8E0400CC */ lw $a0, 0xcc($s0) /* D9188C 8024018C 0C044181 */ jal get_shadow_by_index -/* D91890 80240190 00000000 */ nop +/* D91890 80240190 00000000 */ nop /* D91894 80240194 0C048B77 */ jal func_80122DDC /* D91898 80240198 84440008 */ lh $a0, 8($v0) /* D9189C 8024019C 8C430000 */ lw $v1, ($v0) @@ -38,22 +38,22 @@ glabel func_80240158_D91858 /* D918DC 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D918E0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) /* D918E4 802401E4 0C090014 */ jal pra_36_UnkFunc2 -/* D918E8 802401E8 00000000 */ nop +/* D918E8 802401E8 00000000 */ nop /* D918EC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D918F0 802401F0 3C014307 */ lui $at, 0x4307 /* D918F4 802401F4 44810000 */ mtc1 $at, $f0 -/* D918F8 802401F8 00000000 */ nop +/* D918F8 802401F8 00000000 */ nop /* D918FC 802401FC 4602003C */ c.lt.s $f0, $f2 -/* D91900 80240200 00000000 */ nop +/* D91900 80240200 00000000 */ nop /* D91904 80240204 4500000B */ bc1f .L80240234 /* D91908 80240208 24040002 */ addiu $a0, $zero, 2 /* D9190C 8024020C 3C014361 */ lui $at, 0x4361 /* D91910 80240210 44810000 */ mtc1 $at, $f0 -/* D91914 80240214 00000000 */ nop +/* D91914 80240214 00000000 */ nop /* D91918 80240218 4600103C */ c.lt.s $f2, $f0 -/* D9191C 8024021C 00000000 */ nop +/* D9191C 8024021C 00000000 */ nop /* D91920 80240220 45000004 */ bc1f .L80240234 -/* D91924 80240224 00000000 */ nop +/* D91924 80240224 00000000 */ nop /* D91928 80240228 0C090021 */ jal func_80240084_D91784 /* D9192C 8024022C 0040202D */ daddu $a0, $v0, $zero /* D91930 80240230 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240158_D91858 /* D919B8 802402B8 AFA0001C */ sw $zero, 0x1c($sp) .L802402BC: /* D919BC 802402BC 0C0B77B9 */ jal func_802DDEE4 -/* D919C0 802402C0 00000000 */ nop +/* D919C0 802402C0 00000000 */ nop .L802402C4: /* D919C4 802402C4 9202000E */ lbu $v0, 0xe($s0) /* D919C8 802402C8 3C01802E */ lui $at, %hi(D_802D9D70) diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240320_D91A20.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240320_D91A20.s index aafef2f47b..cb2b94c017 100644 --- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240320_D91A20.s +++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240320_D91A20.s @@ -33,7 +33,7 @@ glabel func_80240320_D91A20 /* D91A90 80240390 E7B40010 */ swc1 $f20, 0x10($sp) /* D91A94 80240394 C62C008C */ lwc1 $f12, 0x8c($s1) /* D91A98 80240398 0C00A6C9 */ jal clamp_angle -/* D91A9C 8024039C 00000000 */ nop +/* D91A9C 8024039C 00000000 */ nop /* D91AA0 802403A0 44050000 */ mfc1 $a1, $f0 /* D91AA4 802403A4 4406A000 */ mfc1 $a2, $f20 /* D91AA8 802403A8 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802404CC_D91BCC.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802404CC_D91BCC.s index ca3e82557a..04d81cbf2c 100644 --- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802404CC_D91BCC.s +++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802404CC_D91BCC.s @@ -10,7 +10,7 @@ glabel func_802404CC_D91BCC /* D91BE0 802404E0 0440000E */ bltz $v0, .L8024051C /* D91BE4 802404E4 28420002 */ slti $v0, $v0, 2 /* D91BE8 802404E8 1040000C */ beqz $v0, .L8024051C -/* D91BEC 802404EC 00000000 */ nop +/* D91BEC 802404EC 00000000 */ nop /* D91BF0 802404F0 3C058024 */ lui $a1, %hi(func_80240530_D91C30) /* D91BF4 802404F4 24A50530 */ addiu $a1, $a1, %lo(func_80240530_D91C30) /* D91BF8 802404F8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240530_D91C30.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240530_D91C30.s index bcf3c724d8..676635ed4e 100644 --- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240530_D91C30.s +++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240530_D91C30.s @@ -16,7 +16,7 @@ glabel func_80240530_D91C30 /* D91C5C 8024055C 27B10020 */ addiu $s1, $sp, 0x20 /* D91C60 80240560 8E0400CC */ lw $a0, 0xcc($s0) /* D91C64 80240564 0C044181 */ jal get_shadow_by_index -/* D91C68 80240568 00000000 */ nop +/* D91C68 80240568 00000000 */ nop /* D91C6C 8024056C 0C048B77 */ jal func_80122DDC /* D91C70 80240570 84440008 */ lh $a0, 8($v0) /* D91C74 80240574 8E050028 */ lw $a1, 0x28($s0) @@ -33,7 +33,7 @@ glabel func_80240530_D91C30 /* D91CA0 802405A0 46000007 */ neg.s $f0, $f0 /* D91CA4 802405A4 44060000 */ mfc1 $a2, $f0 /* D91CA8 802405A8 0C00B94E */ jal get_screen_coords -/* D91CAC 802405AC 00000000 */ nop +/* D91CAC 802405AC 00000000 */ nop /* D91CB0 802405B0 8E0500A4 */ lw $a1, 0xa4($s0) /* D91CB4 802405B4 3C063F80 */ lui $a2, 0x3f80 /* D91CB8 802405B8 0C0B76A3 */ jal func_802DDA8C @@ -72,13 +72,13 @@ glabel func_80240530_D91C30 /* D91D38 80240638 AFA0001C */ sw $zero, 0x1c($sp) .L8024063C: /* D91D3C 8024063C 0C0B77B9 */ jal func_802DDEE4 -/* D91D40 80240640 00000000 */ nop +/* D91D40 80240640 00000000 */ nop .L80240644: /* D91D44 80240644 9202000E */ lbu $v0, 0xe($s0) /* D91D48 80240648 3C01802E */ lui $at, %hi(D_802D9D71) /* D91D4C 8024064C A0229D71 */ sb $v0, %lo(D_802D9D71)($at) /* D91D50 80240650 08090198 */ j .L80240660 -/* D91D54 80240654 00000000 */ nop +/* D91D54 80240654 00000000 */ nop .L80240658: /* D91D58 80240658 3C01802E */ lui $at, %hi(D_802D9D71) /* D91D5C 8024065C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802406BC_D91DBC.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802406BC_D91DBC.s index 19bd7ee747..2584deef82 100644 --- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802406BC_D91DBC.s +++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802406BC_D91DBC.s @@ -33,7 +33,7 @@ glabel func_802406BC_D91DBC /* D91E2C 8024072C E7B40010 */ swc1 $f20, 0x10($sp) /* D91E30 80240730 C62C008C */ lwc1 $f12, 0x8c($s1) /* D91E34 80240734 0C00A6C9 */ jal clamp_angle -/* D91E38 80240738 00000000 */ nop +/* D91E38 80240738 00000000 */ nop /* D91E3C 8024073C 44050000 */ mfc1 $a1, $f0 /* D91E40 80240740 4406A000 */ mfc1 $a2, $f20 /* D91E44 80240744 4407A000 */ mfc1 $a3, $f20 @@ -95,16 +95,16 @@ glabel func_802406BC_D91DBC /* D91F24 80240824 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D91F28 80240828 3C0142B4 */ lui $at, 0x42b4 /* D91F2C 8024082C 44810000 */ mtc1 $at, $f0 -/* D91F30 80240830 00000000 */ nop +/* D91F30 80240830 00000000 */ nop /* D91F34 80240834 4602003E */ c.le.s $f0, $f2 -/* D91F38 80240838 00000000 */ nop +/* D91F38 80240838 00000000 */ nop /* D91F3C 8024083C 4500000A */ bc1f .L80240868 /* D91F40 80240840 24040001 */ addiu $a0, $zero, 1 /* D91F44 80240844 3C014387 */ lui $at, 0x4387 /* D91F48 80240848 44810000 */ mtc1 $at, $f0 -/* D91F4C 8024084C 00000000 */ nop +/* D91F4C 8024084C 00000000 */ nop /* D91F50 80240850 4600103C */ c.lt.s $f2, $f0 -/* D91F54 80240854 00000000 */ nop +/* D91F54 80240854 00000000 */ nop /* D91F58 80240858 45000004 */ bc1f .L8024086C /* D91F5C 8024085C 27A20018 */ addiu $v0, $sp, 0x18 /* D91F60 80240860 3C041000 */ lui $a0, 0x1000 diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802408A0_D91FA0.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802408A0_D91FA0.s index 0e71ef4ee6..aa1ddb16c9 100644 --- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802408A0_D91FA0.s +++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802408A0_D91FA0.s @@ -43,36 +43,36 @@ glabel func_802408A0_D91FA0 /* D92034 80240934 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D92038 80240938 3C0142B4 */ lui $at, 0x42b4 /* D9203C 8024093C 44810000 */ mtc1 $at, $f0 -/* D92040 80240940 00000000 */ nop +/* D92040 80240940 00000000 */ nop /* D92044 80240944 4602003C */ c.lt.s $f0, $f2 -/* D92048 80240948 00000000 */ nop +/* D92048 80240948 00000000 */ nop /* D9204C 8024094C 4500000A */ bc1f .L80240978 -/* D92050 80240950 00000000 */ nop +/* D92050 80240950 00000000 */ nop /* D92054 80240954 3C014334 */ lui $at, 0x4334 /* D92058 80240958 44812000 */ mtc1 $at, $f4 -/* D9205C 8024095C 00000000 */ nop +/* D9205C 8024095C 00000000 */ nop /* D92060 80240960 4604103E */ c.le.s $f2, $f4 -/* D92064 80240964 00000000 */ nop +/* D92064 80240964 00000000 */ nop /* D92068 80240968 45000003 */ bc1f .L80240978 -/* D9206C 8024096C 00000000 */ nop +/* D9206C 8024096C 00000000 */ nop /* D92070 80240970 08090282 */ j .L80240A08 /* D92074 80240974 46022501 */ sub.s $f20, $f4, $f2 .L80240978: /* D92078 80240978 C62000A8 */ lwc1 $f0, 0xa8($s1) /* D9207C 8024097C 3C014334 */ lui $at, 0x4334 /* D92080 80240980 44812000 */ mtc1 $at, $f4 -/* D92084 80240984 00000000 */ nop +/* D92084 80240984 00000000 */ nop /* D92088 80240988 4600203C */ c.lt.s $f4, $f0 -/* D9208C 8024098C 00000000 */ nop +/* D9208C 8024098C 00000000 */ nop /* D92090 80240990 4500000C */ bc1f .L802409C4 -/* D92094 80240994 00000000 */ nop +/* D92094 80240994 00000000 */ nop /* D92098 80240998 3C014387 */ lui $at, 0x4387 /* D9209C 8024099C 44812000 */ mtc1 $at, $f4 -/* D920A0 802409A0 00000000 */ nop +/* D920A0 802409A0 00000000 */ nop /* D920A4 802409A4 4604003E */ c.le.s $f0, $f4 -/* D920A8 802409A8 00000000 */ nop +/* D920A8 802409A8 00000000 */ nop /* D920AC 802409AC 45000008 */ bc1f .L802409D0 -/* D920B0 802409B0 00000000 */ nop +/* D920B0 802409B0 00000000 */ nop /* D920B4 802409B4 3C014334 */ lui $at, 0x4334 /* D920B8 802409B8 44812000 */ mtc1 $at, $f4 /* D920BC 802409BC 08090282 */ j .L80240A08 @@ -80,19 +80,19 @@ glabel func_802408A0_D91FA0 .L802409C4: /* D920C4 802409C4 3C014387 */ lui $at, 0x4387 /* D920C8 802409C8 44812000 */ mtc1 $at, $f4 -/* D920CC 802409CC 00000000 */ nop +/* D920CC 802409CC 00000000 */ nop .L802409D0: /* D920D0 802409D0 4600203C */ c.lt.s $f4, $f0 -/* D920D4 802409D4 00000000 */ nop +/* D920D4 802409D4 00000000 */ nop /* D920D8 802409D8 4500000A */ bc1f .L80240A04 -/* D920DC 802409DC 00000000 */ nop +/* D920DC 802409DC 00000000 */ nop /* D920E0 802409E0 3C0143B4 */ lui $at, 0x43b4 /* D920E4 802409E4 44811000 */ mtc1 $at, $f2 -/* D920E8 802409E8 00000000 */ nop +/* D920E8 802409E8 00000000 */ nop /* D920EC 802409EC 4602003E */ c.le.s $f0, $f2 -/* D920F0 802409F0 00000000 */ nop +/* D920F0 802409F0 00000000 */ nop /* D920F4 802409F4 45000003 */ bc1f .L80240A04 -/* D920F8 802409F8 00000000 */ nop +/* D920F8 802409F8 00000000 */ nop /* D920FC 802409FC 08090282 */ j .L80240A08 /* D92100 80240A00 46001501 */ sub.s $f20, $f2, $f0 .L80240A04: @@ -100,11 +100,11 @@ glabel func_802408A0_D91FA0 .L80240A08: /* D92108 80240A08 3C0141C8 */ lui $at, 0x41c8 /* D9210C 80240A0C 44810000 */ mtc1 $at, $f0 -/* D92110 80240A10 00000000 */ nop +/* D92110 80240A10 00000000 */ nop /* D92114 80240A14 4600A003 */ div.s $f0, $f20, $f0 /* D92118 80240A18 4600010D */ trunc.w.s $f4, $f0 /* D9211C 80240A1C 44072000 */ mfc1 $a3, $f4 -/* D92120 80240A20 00000000 */ nop +/* D92120 80240A20 00000000 */ nop /* D92124 80240A24 00071100 */ sll $v0, $a3, 4 /* D92128 80240A28 00471023 */ subu $v0, $v0, $a3 /* D9212C 80240A2C 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel func_802408A0_D91FA0 /* D92174 80240A74 E7B60010 */ swc1 $f22, 0x10($sp) /* D92178 80240A78 C62C008C */ lwc1 $f12, 0x8c($s1) /* D9217C 80240A7C 0C00A6C9 */ jal clamp_angle -/* D92180 80240A80 00000000 */ nop +/* D92180 80240A80 00000000 */ nop /* D92184 80240A84 44050000 */ mfc1 $a1, $f0 /* D92188 80240A88 4406B000 */ mfc1 $a2, $f22 /* D9218C 80240A8C 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel func_802408A0_D91FA0 /* D921F0 80240AF0 24040001 */ addiu $a0, $zero, 1 .L80240AF4: /* D921F4 80240AF4 4486D000 */ mtc1 $a2, $f26 -/* D921F8 80240AF8 00000000 */ nop +/* D921F8 80240AF8 00000000 */ nop /* D921FC 80240AFC 4680D6A0 */ cvt.s.w $f26, $f26 /* D92200 80240B00 24040001 */ addiu $a0, $zero, 1 .L80240B04: @@ -204,10 +204,10 @@ glabel func_802408A0_D91FA0 /* D92290 80240B90 44812000 */ mtc1 $at, $f4 /* D92294 80240B94 00021023 */ negu $v0, $v0 /* D92298 80240B98 44820000 */ mtc1 $v0, $f0 -/* D9229C 80240B9C 00000000 */ nop +/* D9229C 80240B9C 00000000 */ nop /* D922A0 80240BA0 46800020 */ cvt.s.w $f0, $f0 /* D922A4 80240BA4 46040102 */ mul.s $f4, $f0, $f4 -/* D922A8 80240BA8 00000000 */ nop +/* D922A8 80240BA8 00000000 */ nop /* D922AC 80240BAC 4405B000 */ mfc1 $a1, $f22 /* D922B0 80240BB0 4407B000 */ mfc1 $a3, $f22 /* D922B4 80240BB4 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel func_802408A0_D91FA0 /* D92324 80240C24 3C013F00 */ lui $at, 0x3f00 /* D92328 80240C28 44812000 */ mtc1 $at, $f4 /* D9232C 80240C2C 44820000 */ mtc1 $v0, $f0 -/* D92330 80240C30 00000000 */ nop +/* D92330 80240C30 00000000 */ nop /* D92334 80240C34 46800020 */ cvt.s.w $f0, $f0 /* D92338 80240C38 46040102 */ mul.s $f4, $f0, $f4 -/* D9233C 80240C3C 00000000 */ nop +/* D9233C 80240C3C 00000000 */ nop /* D92340 80240C40 4405B000 */ mfc1 $a1, $f22 /* D92344 80240C44 4407B000 */ mfc1 $a3, $f22 /* D92348 80240C48 44062000 */ mfc1 $a2, $f4 @@ -280,16 +280,16 @@ glabel func_802408A0_D91FA0 /* D923C0 80240CC0 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D923C4 80240CC4 3C0142B4 */ lui $at, 0x42b4 /* D923C8 80240CC8 44810000 */ mtc1 $at, $f0 -/* D923CC 80240CCC 00000000 */ nop +/* D923CC 80240CCC 00000000 */ nop /* D923D0 80240CD0 4602003E */ c.le.s $f0, $f2 -/* D923D4 80240CD4 00000000 */ nop +/* D923D4 80240CD4 00000000 */ nop /* D923D8 80240CD8 4500000A */ bc1f .L80240D04 /* D923DC 80240CDC 24040001 */ addiu $a0, $zero, 1 /* D923E0 80240CE0 3C014387 */ lui $at, 0x4387 /* D923E4 80240CE4 44812000 */ mtc1 $at, $f4 -/* D923E8 80240CE8 00000000 */ nop +/* D923E8 80240CE8 00000000 */ nop /* D923EC 80240CEC 4604103C */ c.lt.s $f2, $f4 -/* D923F0 80240CF0 00000000 */ nop +/* D923F0 80240CF0 00000000 */ nop /* D923F4 80240CF4 45000004 */ bc1f .L80240D08 /* D923F8 80240CF8 27A20020 */ addiu $v0, $sp, 0x20 /* D923FC 80240CFC 3C041000 */ lui $a0, 0x1000 @@ -305,7 +305,7 @@ glabel func_802408A0_D91FA0 /* D9241C 80240D1C 26730001 */ addiu $s3, $s3, 1 /* D92420 80240D20 2A620002 */ slti $v0, $s3, 2 /* D92424 80240D24 1440FEF6 */ bnez $v0, .L80240900 -/* D92428 80240D28 00000000 */ nop +/* D92428 80240D28 00000000 */ nop /* D9242C 80240D2C 8FBF014C */ lw $ra, 0x14c($sp) /* D92430 80240D30 8FB60148 */ lw $s6, 0x148($sp) /* D92434 80240D34 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240D6C_D9246C.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240D6C_D9246C.s index 2adfe6038b..5834723b86 100644 --- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240D6C_D9246C.s +++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240D6C_D9246C.s @@ -11,36 +11,36 @@ glabel func_80240D6C_D9246C /* D92484 80240D84 24020001 */ addiu $v0, $zero, 1 /* D92488 80240D88 8E030084 */ lw $v1, 0x84($s0) /* D9248C 80240D8C 1062001A */ beq $v1, $v0, .L80240DF8 -/* D92490 80240D90 00000000 */ nop +/* D92490 80240D90 00000000 */ nop /* D92494 80240D94 28620002 */ slti $v0, $v1, 2 /* D92498 80240D98 50400005 */ beql $v0, $zero, .L80240DB0 /* D9249C 80240D9C 24020002 */ addiu $v0, $zero, 2 /* D924A0 80240DA0 10600007 */ beqz $v1, .L80240DC0 -/* D924A4 80240DA4 00000000 */ nop +/* D924A4 80240DA4 00000000 */ nop /* D924A8 80240DA8 08090384 */ j .L80240E10 -/* D924AC 80240DAC 00000000 */ nop +/* D924AC 80240DAC 00000000 */ nop .L80240DB0: /* D924B0 80240DB0 10620007 */ beq $v1, $v0, .L80240DD0 -/* D924B4 80240DB4 00000000 */ nop +/* D924B4 80240DB4 00000000 */ nop /* D924B8 80240DB8 08090384 */ j .L80240E10 -/* D924BC 80240DBC 00000000 */ nop +/* D924BC 80240DBC 00000000 */ nop .L80240DC0: /* D924C0 80240DC0 3C048024 */ lui $a0, %hi(pra_36_SetPartnerFlagsA0000) /* D924C4 80240DC4 24840EB4 */ addiu $a0, $a0, %lo(pra_36_SetPartnerFlagsA0000) /* D924C8 80240DC8 08090380 */ j .L80240E00 -/* D924CC 80240DCC 00000000 */ nop +/* D924CC 80240DCC 00000000 */ nop .L80240DD0: /* D924D0 80240DD0 3C048024 */ lui $a0, %hi(pra_36_SetPartnerFlags20000) /* D924D4 80240DD4 24840F1C */ addiu $a0, $a0, %lo(pra_36_SetPartnerFlags20000) /* D924D8 80240DD8 08090380 */ j .L80240E00 -/* D924DC 80240DDC 00000000 */ nop +/* D924DC 80240DDC 00000000 */ nop .L80240DE0: /* D924E0 80240DE0 8E020084 */ lw $v0, 0x84($s0) /* D924E4 80240DE4 0440000A */ bltz $v0, .L80240E10 -/* D924E8 80240DE8 00000000 */ nop +/* D924E8 80240DE8 00000000 */ nop /* D924EC 80240DEC 28420002 */ slti $v0, $v0, 2 /* D924F0 80240DF0 10400007 */ beqz $v0, .L80240E10 -/* D924F4 80240DF4 00000000 */ nop +/* D924F4 80240DF4 00000000 */ nop .L80240DF8: /* D924F8 80240DF8 3C048024 */ lui $a0, %hi(pra_36_SetPartnerFlags80000) /* D924FC 80240DFC 24840EE8 */ addiu $a0, $a0, %lo(pra_36_SetPartnerFlags80000) @@ -64,14 +64,14 @@ glabel func_80240D6C_D9246C /* D9253C 80240E3C 10400005 */ beqz $v0, .L80240E54 /* D92540 80240E40 24020002 */ addiu $v0, $zero, 2 /* D92544 80240E44 10800007 */ beqz $a0, .L80240E64 -/* D92548 80240E48 00000000 */ nop +/* D92548 80240E48 00000000 */ nop /* D9254C 80240E4C 080903A9 */ j .L80240EA4 -/* D92550 80240E50 00000000 */ nop +/* D92550 80240E50 00000000 */ nop .L80240E54: /* D92554 80240E54 10820006 */ beq $a0, $v0, .L80240E70 /* D92558 80240E58 24020002 */ addiu $v0, $zero, 2 /* D9255C 80240E5C 080903A9 */ j .L80240EA4 -/* D92560 80240E60 00000000 */ nop +/* D92560 80240E60 00000000 */ nop .L80240E64: /* D92564 80240E64 8CA20000 */ lw $v0, ($a1) /* D92568 80240E68 080903A6 */ j .L80240E98 diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240084_D92FC4.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240084_D92FC4.s index adfb8279e8..896f4ceaf0 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240084_D92FC4.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240084_D92FC4.s @@ -40,7 +40,7 @@ glabel func_80240084_D92FC4 /* D93040 80240100 1440FFF7 */ bnez $v0, .L802400E0 /* D93044 80240104 24820001 */ addiu $v0, $a0, 1 /* D93048 80240108 03E00008 */ jr $ra -/* D9304C 8024010C 00000000 */ nop +/* D9304C 8024010C 00000000 */ nop .L80240110: /* D93050 80240110 3C020100 */ lui $v0, 0x100 .L80240114: diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s index e9cf4147ce..8bd926684f 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s @@ -16,7 +16,7 @@ glabel func_80240158_D93098 /* D930C4 80240184 27B20020 */ addiu $s2, $sp, 0x20 /* D930C8 80240188 8E0400CC */ lw $a0, 0xcc($s0) /* D930CC 8024018C 0C044181 */ jal get_shadow_by_index -/* D930D0 80240190 00000000 */ nop +/* D930D0 80240190 00000000 */ nop /* D930D4 80240194 0C048B77 */ jal func_80122DDC /* D930D8 80240198 84440008 */ lh $a0, 8($v0) /* D930DC 8024019C 8C430000 */ lw $v1, ($v0) @@ -38,22 +38,22 @@ glabel func_80240158_D93098 /* D9311C 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D93120 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) /* D93124 802401E4 0C090014 */ jal pra_37_UnkFunc2 -/* D93128 802401E8 00000000 */ nop +/* D93128 802401E8 00000000 */ nop /* D9312C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D93130 802401F0 3C014307 */ lui $at, 0x4307 /* D93134 802401F4 44810000 */ mtc1 $at, $f0 -/* D93138 802401F8 00000000 */ nop +/* D93138 802401F8 00000000 */ nop /* D9313C 802401FC 4602003C */ c.lt.s $f0, $f2 -/* D93140 80240200 00000000 */ nop +/* D93140 80240200 00000000 */ nop /* D93144 80240204 4500000B */ bc1f .L80240234 /* D93148 80240208 24040002 */ addiu $a0, $zero, 2 /* D9314C 8024020C 3C014361 */ lui $at, 0x4361 /* D93150 80240210 44810000 */ mtc1 $at, $f0 -/* D93154 80240214 00000000 */ nop +/* D93154 80240214 00000000 */ nop /* D93158 80240218 4600103C */ c.lt.s $f2, $f0 -/* D9315C 8024021C 00000000 */ nop +/* D9315C 8024021C 00000000 */ nop /* D93160 80240220 45000004 */ bc1f .L80240234 -/* D93164 80240224 00000000 */ nop +/* D93164 80240224 00000000 */ nop /* D93168 80240228 0C090021 */ jal func_80240084_D92FC4 /* D9316C 8024022C 0040202D */ daddu $a0, $v0, $zero /* D93170 80240230 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240158_D93098 /* D931F8 802402B8 AFA0001C */ sw $zero, 0x1c($sp) .L802402BC: /* D931FC 802402BC 0C0B77B9 */ jal func_802DDEE4 -/* D93200 802402C0 00000000 */ nop +/* D93200 802402C0 00000000 */ nop .L802402C4: /* D93204 802402C4 9202000E */ lbu $v0, 0xe($s0) /* D93208 802402C8 3C01802E */ lui $at, %hi(D_802D9D70) diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240320_D93260.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240320_D93260.s index 40d352f07f..a9bd40b40d 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240320_D93260.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240320_D93260.s @@ -33,7 +33,7 @@ glabel func_80240320_D93260 /* D932D0 80240390 E7B40010 */ swc1 $f20, 0x10($sp) /* D932D4 80240394 C62C008C */ lwc1 $f12, 0x8c($s1) /* D932D8 80240398 0C00A6C9 */ jal clamp_angle -/* D932DC 8024039C 00000000 */ nop +/* D932DC 8024039C 00000000 */ nop /* D932E0 802403A0 44050000 */ mfc1 $a1, $f0 /* D932E4 802403A4 4406A000 */ mfc1 $a2, $f20 /* D932E8 802403A8 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802404CC_D9340C.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802404CC_D9340C.s index 44731c4386..c9b88fbf08 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802404CC_D9340C.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802404CC_D9340C.s @@ -10,7 +10,7 @@ glabel func_802404CC_D9340C /* D93420 802404E0 0440000E */ bltz $v0, .L8024051C /* D93424 802404E4 28420002 */ slti $v0, $v0, 2 /* D93428 802404E8 1040000C */ beqz $v0, .L8024051C -/* D9342C 802404EC 00000000 */ nop +/* D9342C 802404EC 00000000 */ nop /* D93430 802404F0 3C058024 */ lui $a1, %hi(func_80240530_D93470) /* D93434 802404F4 24A50530 */ addiu $a1, $a1, %lo(func_80240530_D93470) /* D93438 802404F8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240530_D93470.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240530_D93470.s index cbba18f64a..298d57fcca 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240530_D93470.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240530_D93470.s @@ -16,7 +16,7 @@ glabel func_80240530_D93470 /* D9349C 8024055C 27B10020 */ addiu $s1, $sp, 0x20 /* D934A0 80240560 8E0400CC */ lw $a0, 0xcc($s0) /* D934A4 80240564 0C044181 */ jal get_shadow_by_index -/* D934A8 80240568 00000000 */ nop +/* D934A8 80240568 00000000 */ nop /* D934AC 8024056C 0C048B77 */ jal func_80122DDC /* D934B0 80240570 84440008 */ lh $a0, 8($v0) /* D934B4 80240574 8E050028 */ lw $a1, 0x28($s0) @@ -33,7 +33,7 @@ glabel func_80240530_D93470 /* D934E0 802405A0 46000007 */ neg.s $f0, $f0 /* D934E4 802405A4 44060000 */ mfc1 $a2, $f0 /* D934E8 802405A8 0C00B94E */ jal get_screen_coords -/* D934EC 802405AC 00000000 */ nop +/* D934EC 802405AC 00000000 */ nop /* D934F0 802405B0 8E0500A4 */ lw $a1, 0xa4($s0) /* D934F4 802405B4 3C063F80 */ lui $a2, 0x3f80 /* D934F8 802405B8 0C0B76A3 */ jal func_802DDA8C @@ -72,13 +72,13 @@ glabel func_80240530_D93470 /* D93578 80240638 AFA0001C */ sw $zero, 0x1c($sp) .L8024063C: /* D9357C 8024063C 0C0B77B9 */ jal func_802DDEE4 -/* D93580 80240640 00000000 */ nop +/* D93580 80240640 00000000 */ nop .L80240644: /* D93584 80240644 9202000E */ lbu $v0, 0xe($s0) /* D93588 80240648 3C01802E */ lui $at, %hi(D_802D9D71) /* D9358C 8024064C A0229D71 */ sb $v0, %lo(D_802D9D71)($at) /* D93590 80240650 08090198 */ j .L80240660 -/* D93594 80240654 00000000 */ nop +/* D93594 80240654 00000000 */ nop .L80240658: /* D93598 80240658 3C01802E */ lui $at, %hi(D_802D9D71) /* D9359C 8024065C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802406BC_D935FC.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802406BC_D935FC.s index bd3c98ce66..623d8581a3 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802406BC_D935FC.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802406BC_D935FC.s @@ -33,7 +33,7 @@ glabel func_802406BC_D935FC /* D9366C 8024072C E7B40010 */ swc1 $f20, 0x10($sp) /* D93670 80240730 C62C008C */ lwc1 $f12, 0x8c($s1) /* D93674 80240734 0C00A6C9 */ jal clamp_angle -/* D93678 80240738 00000000 */ nop +/* D93678 80240738 00000000 */ nop /* D9367C 8024073C 44050000 */ mfc1 $a1, $f0 /* D93680 80240740 4406A000 */ mfc1 $a2, $f20 /* D93684 80240744 4407A000 */ mfc1 $a3, $f20 @@ -95,16 +95,16 @@ glabel func_802406BC_D935FC /* D93764 80240824 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D93768 80240828 3C0142B4 */ lui $at, 0x42b4 /* D9376C 8024082C 44810000 */ mtc1 $at, $f0 -/* D93770 80240830 00000000 */ nop +/* D93770 80240830 00000000 */ nop /* D93774 80240834 4602003E */ c.le.s $f0, $f2 -/* D93778 80240838 00000000 */ nop +/* D93778 80240838 00000000 */ nop /* D9377C 8024083C 4500000A */ bc1f .L80240868 /* D93780 80240840 24040001 */ addiu $a0, $zero, 1 /* D93784 80240844 3C014387 */ lui $at, 0x4387 /* D93788 80240848 44810000 */ mtc1 $at, $f0 -/* D9378C 8024084C 00000000 */ nop +/* D9378C 8024084C 00000000 */ nop /* D93790 80240850 4600103C */ c.lt.s $f2, $f0 -/* D93794 80240854 00000000 */ nop +/* D93794 80240854 00000000 */ nop /* D93798 80240858 45000004 */ bc1f .L8024086C /* D9379C 8024085C 27A20018 */ addiu $v0, $sp, 0x18 /* D937A0 80240860 3C041000 */ lui $a0, 0x1000 diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802408A0_D937E0.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802408A0_D937E0.s index 76e4a31ce1..a6731a442b 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802408A0_D937E0.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802408A0_D937E0.s @@ -43,36 +43,36 @@ glabel func_802408A0_D937E0 /* D93874 80240934 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D93878 80240938 3C0142B4 */ lui $at, 0x42b4 /* D9387C 8024093C 44810000 */ mtc1 $at, $f0 -/* D93880 80240940 00000000 */ nop +/* D93880 80240940 00000000 */ nop /* D93884 80240944 4602003C */ c.lt.s $f0, $f2 -/* D93888 80240948 00000000 */ nop +/* D93888 80240948 00000000 */ nop /* D9388C 8024094C 4500000A */ bc1f .L80240978 -/* D93890 80240950 00000000 */ nop +/* D93890 80240950 00000000 */ nop /* D93894 80240954 3C014334 */ lui $at, 0x4334 /* D93898 80240958 44812000 */ mtc1 $at, $f4 -/* D9389C 8024095C 00000000 */ nop +/* D9389C 8024095C 00000000 */ nop /* D938A0 80240960 4604103E */ c.le.s $f2, $f4 -/* D938A4 80240964 00000000 */ nop +/* D938A4 80240964 00000000 */ nop /* D938A8 80240968 45000003 */ bc1f .L80240978 -/* D938AC 8024096C 00000000 */ nop +/* D938AC 8024096C 00000000 */ nop /* D938B0 80240970 08090282 */ j .L80240A08 /* D938B4 80240974 46022501 */ sub.s $f20, $f4, $f2 .L80240978: /* D938B8 80240978 C62000A8 */ lwc1 $f0, 0xa8($s1) /* D938BC 8024097C 3C014334 */ lui $at, 0x4334 /* D938C0 80240980 44812000 */ mtc1 $at, $f4 -/* D938C4 80240984 00000000 */ nop +/* D938C4 80240984 00000000 */ nop /* D938C8 80240988 4600203C */ c.lt.s $f4, $f0 -/* D938CC 8024098C 00000000 */ nop +/* D938CC 8024098C 00000000 */ nop /* D938D0 80240990 4500000C */ bc1f .L802409C4 -/* D938D4 80240994 00000000 */ nop +/* D938D4 80240994 00000000 */ nop /* D938D8 80240998 3C014387 */ lui $at, 0x4387 /* D938DC 8024099C 44812000 */ mtc1 $at, $f4 -/* D938E0 802409A0 00000000 */ nop +/* D938E0 802409A0 00000000 */ nop /* D938E4 802409A4 4604003E */ c.le.s $f0, $f4 -/* D938E8 802409A8 00000000 */ nop +/* D938E8 802409A8 00000000 */ nop /* D938EC 802409AC 45000008 */ bc1f .L802409D0 -/* D938F0 802409B0 00000000 */ nop +/* D938F0 802409B0 00000000 */ nop /* D938F4 802409B4 3C014334 */ lui $at, 0x4334 /* D938F8 802409B8 44812000 */ mtc1 $at, $f4 /* D938FC 802409BC 08090282 */ j .L80240A08 @@ -80,19 +80,19 @@ glabel func_802408A0_D937E0 .L802409C4: /* D93904 802409C4 3C014387 */ lui $at, 0x4387 /* D93908 802409C8 44812000 */ mtc1 $at, $f4 -/* D9390C 802409CC 00000000 */ nop +/* D9390C 802409CC 00000000 */ nop .L802409D0: /* D93910 802409D0 4600203C */ c.lt.s $f4, $f0 -/* D93914 802409D4 00000000 */ nop +/* D93914 802409D4 00000000 */ nop /* D93918 802409D8 4500000A */ bc1f .L80240A04 -/* D9391C 802409DC 00000000 */ nop +/* D9391C 802409DC 00000000 */ nop /* D93920 802409E0 3C0143B4 */ lui $at, 0x43b4 /* D93924 802409E4 44811000 */ mtc1 $at, $f2 -/* D93928 802409E8 00000000 */ nop +/* D93928 802409E8 00000000 */ nop /* D9392C 802409EC 4602003E */ c.le.s $f0, $f2 -/* D93930 802409F0 00000000 */ nop +/* D93930 802409F0 00000000 */ nop /* D93934 802409F4 45000003 */ bc1f .L80240A04 -/* D93938 802409F8 00000000 */ nop +/* D93938 802409F8 00000000 */ nop /* D9393C 802409FC 08090282 */ j .L80240A08 /* D93940 80240A00 46001501 */ sub.s $f20, $f2, $f0 .L80240A04: @@ -100,11 +100,11 @@ glabel func_802408A0_D937E0 .L80240A08: /* D93948 80240A08 3C0141C8 */ lui $at, 0x41c8 /* D9394C 80240A0C 44810000 */ mtc1 $at, $f0 -/* D93950 80240A10 00000000 */ nop +/* D93950 80240A10 00000000 */ nop /* D93954 80240A14 4600A003 */ div.s $f0, $f20, $f0 /* D93958 80240A18 4600010D */ trunc.w.s $f4, $f0 /* D9395C 80240A1C 44072000 */ mfc1 $a3, $f4 -/* D93960 80240A20 00000000 */ nop +/* D93960 80240A20 00000000 */ nop /* D93964 80240A24 00071100 */ sll $v0, $a3, 4 /* D93968 80240A28 00471023 */ subu $v0, $v0, $a3 /* D9396C 80240A2C 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel func_802408A0_D937E0 /* D939B4 80240A74 E7B60010 */ swc1 $f22, 0x10($sp) /* D939B8 80240A78 C62C008C */ lwc1 $f12, 0x8c($s1) /* D939BC 80240A7C 0C00A6C9 */ jal clamp_angle -/* D939C0 80240A80 00000000 */ nop +/* D939C0 80240A80 00000000 */ nop /* D939C4 80240A84 44050000 */ mfc1 $a1, $f0 /* D939C8 80240A88 4406B000 */ mfc1 $a2, $f22 /* D939CC 80240A8C 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel func_802408A0_D937E0 /* D93A30 80240AF0 24040001 */ addiu $a0, $zero, 1 .L80240AF4: /* D93A34 80240AF4 4486D000 */ mtc1 $a2, $f26 -/* D93A38 80240AF8 00000000 */ nop +/* D93A38 80240AF8 00000000 */ nop /* D93A3C 80240AFC 4680D6A0 */ cvt.s.w $f26, $f26 /* D93A40 80240B00 24040001 */ addiu $a0, $zero, 1 .L80240B04: @@ -204,10 +204,10 @@ glabel func_802408A0_D937E0 /* D93AD0 80240B90 44812000 */ mtc1 $at, $f4 /* D93AD4 80240B94 00021023 */ negu $v0, $v0 /* D93AD8 80240B98 44820000 */ mtc1 $v0, $f0 -/* D93ADC 80240B9C 00000000 */ nop +/* D93ADC 80240B9C 00000000 */ nop /* D93AE0 80240BA0 46800020 */ cvt.s.w $f0, $f0 /* D93AE4 80240BA4 46040102 */ mul.s $f4, $f0, $f4 -/* D93AE8 80240BA8 00000000 */ nop +/* D93AE8 80240BA8 00000000 */ nop /* D93AEC 80240BAC 4405B000 */ mfc1 $a1, $f22 /* D93AF0 80240BB0 4407B000 */ mfc1 $a3, $f22 /* D93AF4 80240BB4 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel func_802408A0_D937E0 /* D93B64 80240C24 3C013F00 */ lui $at, 0x3f00 /* D93B68 80240C28 44812000 */ mtc1 $at, $f4 /* D93B6C 80240C2C 44820000 */ mtc1 $v0, $f0 -/* D93B70 80240C30 00000000 */ nop +/* D93B70 80240C30 00000000 */ nop /* D93B74 80240C34 46800020 */ cvt.s.w $f0, $f0 /* D93B78 80240C38 46040102 */ mul.s $f4, $f0, $f4 -/* D93B7C 80240C3C 00000000 */ nop +/* D93B7C 80240C3C 00000000 */ nop /* D93B80 80240C40 4405B000 */ mfc1 $a1, $f22 /* D93B84 80240C44 4407B000 */ mfc1 $a3, $f22 /* D93B88 80240C48 44062000 */ mfc1 $a2, $f4 @@ -280,16 +280,16 @@ glabel func_802408A0_D937E0 /* D93C00 80240CC0 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D93C04 80240CC4 3C0142B4 */ lui $at, 0x42b4 /* D93C08 80240CC8 44810000 */ mtc1 $at, $f0 -/* D93C0C 80240CCC 00000000 */ nop +/* D93C0C 80240CCC 00000000 */ nop /* D93C10 80240CD0 4602003E */ c.le.s $f0, $f2 -/* D93C14 80240CD4 00000000 */ nop +/* D93C14 80240CD4 00000000 */ nop /* D93C18 80240CD8 4500000A */ bc1f .L80240D04 /* D93C1C 80240CDC 24040001 */ addiu $a0, $zero, 1 /* D93C20 80240CE0 3C014387 */ lui $at, 0x4387 /* D93C24 80240CE4 44812000 */ mtc1 $at, $f4 -/* D93C28 80240CE8 00000000 */ nop +/* D93C28 80240CE8 00000000 */ nop /* D93C2C 80240CEC 4604103C */ c.lt.s $f2, $f4 -/* D93C30 80240CF0 00000000 */ nop +/* D93C30 80240CF0 00000000 */ nop /* D93C34 80240CF4 45000004 */ bc1f .L80240D08 /* D93C38 80240CF8 27A20020 */ addiu $v0, $sp, 0x20 /* D93C3C 80240CFC 3C041000 */ lui $a0, 0x1000 @@ -305,7 +305,7 @@ glabel func_802408A0_D937E0 /* D93C5C 80240D1C 26730001 */ addiu $s3, $s3, 1 /* D93C60 80240D20 2A620002 */ slti $v0, $s3, 2 /* D93C64 80240D24 1440FEF6 */ bnez $v0, .L80240900 -/* D93C68 80240D28 00000000 */ nop +/* D93C68 80240D28 00000000 */ nop /* D93C6C 80240D2C 8FBF014C */ lw $ra, 0x14c($sp) /* D93C70 80240D30 8FB60148 */ lw $s6, 0x148($sp) /* D93C74 80240D34 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240D6C_D93CAC.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240D6C_D93CAC.s index d9e97ea2d7..ac45915cef 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240D6C_D93CAC.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240D6C_D93CAC.s @@ -11,36 +11,36 @@ glabel func_80240D6C_D93CAC /* D93CC4 80240D84 24020001 */ addiu $v0, $zero, 1 /* D93CC8 80240D88 8E030084 */ lw $v1, 0x84($s0) /* D93CCC 80240D8C 1062001A */ beq $v1, $v0, .L80240DF8 -/* D93CD0 80240D90 00000000 */ nop +/* D93CD0 80240D90 00000000 */ nop /* D93CD4 80240D94 28620002 */ slti $v0, $v1, 2 /* D93CD8 80240D98 50400005 */ beql $v0, $zero, .L80240DB0 /* D93CDC 80240D9C 24020002 */ addiu $v0, $zero, 2 /* D93CE0 80240DA0 10600007 */ beqz $v1, .L80240DC0 -/* D93CE4 80240DA4 00000000 */ nop +/* D93CE4 80240DA4 00000000 */ nop /* D93CE8 80240DA8 08090384 */ j .L80240E10 -/* D93CEC 80240DAC 00000000 */ nop +/* D93CEC 80240DAC 00000000 */ nop .L80240DB0: /* D93CF0 80240DB0 10620007 */ beq $v1, $v0, .L80240DD0 -/* D93CF4 80240DB4 00000000 */ nop +/* D93CF4 80240DB4 00000000 */ nop /* D93CF8 80240DB8 08090384 */ j .L80240E10 -/* D93CFC 80240DBC 00000000 */ nop +/* D93CFC 80240DBC 00000000 */ nop .L80240DC0: /* D93D00 80240DC0 3C048024 */ lui $a0, %hi(pra_37_SetPartnerFlagsA0000) /* D93D04 80240DC4 24840EB4 */ addiu $a0, $a0, %lo(pra_37_SetPartnerFlagsA0000) /* D93D08 80240DC8 08090380 */ j .L80240E00 -/* D93D0C 80240DCC 00000000 */ nop +/* D93D0C 80240DCC 00000000 */ nop .L80240DD0: /* D93D10 80240DD0 3C048024 */ lui $a0, %hi(pra_37_SetPartnerFlags20000) /* D93D14 80240DD4 24840F1C */ addiu $a0, $a0, %lo(pra_37_SetPartnerFlags20000) /* D93D18 80240DD8 08090380 */ j .L80240E00 -/* D93D1C 80240DDC 00000000 */ nop +/* D93D1C 80240DDC 00000000 */ nop .L80240DE0: /* D93D20 80240DE0 8E020084 */ lw $v0, 0x84($s0) /* D93D24 80240DE4 0440000A */ bltz $v0, .L80240E10 -/* D93D28 80240DE8 00000000 */ nop +/* D93D28 80240DE8 00000000 */ nop /* D93D2C 80240DEC 28420002 */ slti $v0, $v0, 2 /* D93D30 80240DF0 10400007 */ beqz $v0, .L80240E10 -/* D93D34 80240DF4 00000000 */ nop +/* D93D34 80240DF4 00000000 */ nop .L80240DF8: /* D93D38 80240DF8 3C048024 */ lui $a0, %hi(pra_37_SetPartnerFlags80000) /* D93D3C 80240DFC 24840EE8 */ addiu $a0, $a0, %lo(pra_37_SetPartnerFlags80000) @@ -64,14 +64,14 @@ glabel func_80240D6C_D93CAC /* D93D7C 80240E3C 10400005 */ beqz $v0, .L80240E54 /* D93D80 80240E40 24020002 */ addiu $v0, $zero, 2 /* D93D84 80240E44 10800007 */ beqz $a0, .L80240E64 -/* D93D88 80240E48 00000000 */ nop +/* D93D88 80240E48 00000000 */ nop /* D93D8C 80240E4C 080903A9 */ j .L80240EA4 -/* D93D90 80240E50 00000000 */ nop +/* D93D90 80240E50 00000000 */ nop .L80240E54: /* D93D94 80240E54 10820006 */ beq $a0, $v0, .L80240E70 /* D93D98 80240E58 24020002 */ addiu $v0, $zero, 2 /* D93D9C 80240E5C 080903A9 */ j .L80240EA4 -/* D93DA0 80240E60 00000000 */ nop +/* D93DA0 80240E60 00000000 */ nop .L80240E64: /* D93DA4 80240E64 8CA20000 */ lw $v0, ($a1) /* D93DA8 80240E68 080903A6 */ j .L80240E98 diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80241158_D94098.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80241158_D94098.s index 228d6b5ab4..1190540bef 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80241158_D94098.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80241158_D94098.s @@ -42,7 +42,7 @@ glabel func_80241158_D94098 /* D9412C 802411EC C6620074 */ lwc1 $f2, 0x74($s3) /* D94130 802411F0 468010A0 */ cvt.s.w $f2, $f2 /* D94134 802411F4 4600103C */ c.lt.s $f2, $f0 -/* D94138 802411F8 00000000 */ nop +/* D94138 802411F8 00000000 */ nop /* D9413C 802411FC 45030001 */ bc1tl .L80241204 /* D94140 80241200 0000882D */ daddu $s1, $zero, $zero .L80241204: @@ -51,16 +51,16 @@ glabel func_80241158_D94098 /* D9414C 8024120C 3C014387 */ lui $at, 0x4387 /* D94150 80241210 4481A000 */ mtc1 $at, $f20 /* D94154 80241214 0C00A70A */ jal get_clamped_angle_diff -/* D94158 80241218 00000000 */ nop +/* D94158 80241218 00000000 */ nop /* D9415C 8024121C 0C00A6C9 */ jal clamp_angle /* D94160 80241220 46000306 */ mov.s $f12, $f0 /* D94164 80241224 3C018024 */ lui $at, %hi(D_80242510) /* D94168 80241228 D4222510 */ ldc1 $f2, %lo(D_80242510)($at) /* D9416C 8024122C 46000021 */ cvt.d.s $f0, $f0 /* D94170 80241230 4622003C */ c.lt.d $f0, $f2 -/* D94174 80241234 00000000 */ nop +/* D94174 80241234 00000000 */ nop /* D94178 80241238 45000003 */ bc1f .L80241248 -/* D9417C 8024123C 00000000 */ nop +/* D9417C 8024123C 00000000 */ nop /* D94180 80241240 3C0142B4 */ lui $at, 0x42b4 /* D94184 80241244 4481A000 */ mtc1 $at, $f20 .L80241248: @@ -77,7 +77,7 @@ glabel func_80241158_D94098 /* D941B0 80241270 468010A0 */ cvt.s.w $f2, $f2 /* D941B4 80241274 46000005 */ abs.s $f0, $f0 /* D941B8 80241278 4600103C */ c.lt.s $f2, $f0 -/* D941BC 8024127C 00000000 */ nop +/* D941BC 8024127C 00000000 */ nop /* D941C0 80241280 45030001 */ bc1tl .L80241288 /* D941C4 80241284 0000882D */ daddu $s1, $zero, $zero .L80241288: @@ -87,13 +87,13 @@ glabel func_80241158_D94098 /* D941D4 80241294 860200A8 */ lh $v0, 0xa8($s0) /* D941D8 80241298 46020001 */ sub.s $f0, $f0, $f2 /* D941DC 8024129C 44821000 */ mtc1 $v0, $f2 -/* D941E0 802412A0 00000000 */ nop +/* D941E0 802412A0 00000000 */ nop /* D941E4 802412A4 468010A1 */ cvt.d.w $f2, $f2 /* D941E8 802412A8 46221080 */ add.d $f2, $f2, $f2 /* D941EC 802412AC 46000005 */ abs.s $f0, $f0 /* D941F0 802412B0 46000021 */ cvt.d.s $f0, $f0 /* D941F4 802412B4 4620103E */ c.le.d $f2, $f0 -/* D941F8 802412B8 00000000 */ nop +/* D941F8 802412B8 00000000 */ nop /* D941FC 802412BC 45030001 */ bc1tl .L802412C4 /* D94200 802412C0 0000882D */ daddu $s1, $zero, $zero .L802412C4: diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024130C_D9424C.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024130C_D9424C.s index aa413b55ff..d52efc7ba0 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024130C_D9424C.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024130C_D9424C.s @@ -19,7 +19,7 @@ glabel func_8024130C_D9424C /* D94284 80241344 8E2200B0 */ lw $v0, 0xb0($s1) /* D94288 80241348 30420004 */ andi $v0, $v0, 4 /* D9428C 8024134C 10400015 */ beqz $v0, .L802413A4 -/* D94290 80241350 00000000 */ nop +/* D94290 80241350 00000000 */ nop .L80241354: /* D94294 80241354 AE800070 */ sw $zero, 0x70($s4) /* D94298 80241358 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel func_8024130C_D9424C /* D942E8 802413A8 12600005 */ beqz $s3, .L802413C0 /* D942EC 802413AC 24020001 */ addiu $v0, $zero, 1 /* D942F0 802413B0 12620048 */ beq $s3, $v0, .L802414D4 -/* D942F4 802413B4 00000000 */ nop +/* D942F4 802413B4 00000000 */ nop /* D942F8 802413B8 08090552 */ j .L80241548 -/* D942FC 802413BC 00000000 */ nop +/* D942FC 802413BC 00000000 */ nop .L802413C0: /* D94300 802413C0 86240008 */ lh $a0, 8($s1) /* D94304 802413C4 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel func_8024130C_D9424C /* D94324 802413E4 8E03006C */ lw $v1, 0x6c($s0) /* D94328 802413E8 24020003 */ addiu $v0, $zero, 3 /* D9432C 802413EC 14620056 */ bne $v1, $v0, .L80241548 -/* D94330 802413F0 00000000 */ nop +/* D94330 802413F0 00000000 */ nop /* D94334 802413F4 8E2500A8 */ lw $a1, 0xa8($s1) /* D94338 802413F8 10A00003 */ beqz $a1, .L80241408 /* D9433C 802413FC 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel func_8024130C_D9424C /* D943B4 80241474 C7A20014 */ lwc1 $f2, 0x14($sp) /* D943B8 80241478 4600020D */ trunc.w.s $f8, $f0 /* D943BC 8024147C 44024000 */ mfc1 $v0, $f8 -/* D943C0 80241480 00000000 */ nop +/* D943C0 80241480 00000000 */ nop /* D943C4 80241484 A6220012 */ sh $v0, 0x12($s1) /* D943C8 80241488 4600120D */ trunc.w.s $f8, $f2 /* D943CC 8024148C 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s index 147187671f..9d3ab2e0df 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s @@ -100,78 +100,93 @@ glabel func_8024156C_D944AC /* D94610 802416D0 2C620064 */ sltiu $v0, $v1, 0x64 /* D94614 802416D4 10400048 */ beqz $v0, .L802417F8 /* D94618 802416D8 00031080 */ sll $v0, $v1, 2 -/* D9461C 802416DC 3C018024 */ lui $at, %hi(D_80242518) +/* D9461C 802416DC 3C018024 */ lui $at, %hi(jtbl_80242518_D95458) /* D94620 802416E0 00220821 */ addu $at, $at, $v0 -/* D94624 802416E4 8C222518 */ lw $v0, %lo(D_80242518)($at) +/* D94624 802416E4 8C222518 */ lw $v0, %lo(jtbl_80242518_D95458)($at) /* D94628 802416E8 00400008 */ jr $v0 /* D9462C 802416EC 00000000 */ nop +glabel L802416F0_D94630 /* D94630 802416F0 0240202D */ daddu $a0, $s2, $zero /* D94634 802416F4 0260282D */ daddu $a1, $s3, $zero /* D94638 802416F8 0C012568 */ jal func_800495A0 /* D9463C 802416FC 0280302D */ daddu $a2, $s4, $zero +glabel L80241700_D94640 /* D94640 80241700 0240202D */ daddu $a0, $s2, $zero /* D94644 80241704 0260282D */ daddu $a1, $s3, $zero /* D94648 80241708 0C0125AE */ jal func_800496B8 /* D9464C 8024170C 0280302D */ daddu $a2, $s4, $zero /* D94650 80241710 080905FE */ j .L802417F8 /* D94654 80241714 00000000 */ nop +glabel L80241718_D94658 /* D94658 80241718 0240202D */ daddu $a0, $s2, $zero /* D9465C 8024171C 0260282D */ daddu $a1, $s3, $zero /* D94660 80241720 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D94664 80241724 0280302D */ daddu $a2, $s4, $zero +glabel L80241728_D94668 /* D94668 80241728 0240202D */ daddu $a0, $s2, $zero /* D9466C 8024172C 0260282D */ daddu $a1, $s3, $zero /* D94670 80241730 0C012701 */ jal func_80049C04 /* D94674 80241734 0280302D */ daddu $a2, $s4, $zero /* D94678 80241738 080905FE */ j .L802417F8 /* D9467C 8024173C 00000000 */ nop +glabel L80241740_D94680 /* D94680 80241740 0240202D */ daddu $a0, $s2, $zero /* D94684 80241744 0260282D */ daddu $a1, $s3, $zero /* D94688 80241748 0C01278F */ jal func_80049E3C /* D9468C 8024174C 0280302D */ daddu $a2, $s4, $zero +glabel L80241750_D94690 /* D94690 80241750 0240202D */ daddu $a0, $s2, $zero /* D94694 80241754 0260282D */ daddu $a1, $s3, $zero /* D94698 80241758 0C0127B3 */ jal func_80049ECC /* D9469C 8024175C 0280302D */ daddu $a2, $s4, $zero /* D946A0 80241760 080905FE */ j .L802417F8 /* D946A4 80241764 00000000 */ nop +glabel L80241768_D946A8 /* D946A8 80241768 0240202D */ daddu $a0, $s2, $zero /* D946AC 8024176C 0260282D */ daddu $a1, $s3, $zero /* D946B0 80241770 0C0127DF */ jal func_80049F7C /* D946B4 80241774 0280302D */ daddu $a2, $s4, $zero +glabel L80241778_D946B8 /* D946B8 80241778 0240202D */ daddu $a0, $s2, $zero /* D946BC 8024177C 0260282D */ daddu $a1, $s3, $zero /* D946C0 80241780 0C012849 */ jal func_8004A124 /* D946C4 80241784 0280302D */ daddu $a2, $s4, $zero /* D946C8 80241788 080905FE */ j .L802417F8 /* D946CC 8024178C 00000000 */ nop +glabel L80241790_D946D0 /* D946D0 80241790 0240202D */ daddu $a0, $s2, $zero /* D946D4 80241794 0260282D */ daddu $a1, $s3, $zero /* D946D8 80241798 0C0128FA */ jal func_8004A3E8 /* D946DC 8024179C 0280302D */ daddu $a2, $s4, $zero /* D946E0 802417A0 080905FE */ j .L802417F8 /* D946E4 802417A4 00000000 */ nop +glabel L802417A8_D946E8 /* D946E8 802417A8 0C0903D4 */ jal pra_37_UnkNpcAIFunc6 /* D946EC 802417AC 0240202D */ daddu $a0, $s2, $zero +glabel L802417B0_D946F0 /* D946F0 802417B0 0C0903EF */ jal pra_37_UnkNpcAIFunc7 /* D946F4 802417B4 0240202D */ daddu $a0, $s2, $zero /* D946F8 802417B8 8E430070 */ lw $v1, 0x70($s2) /* D946FC 802417BC 24020020 */ addiu $v0, $zero, 0x20 /* D94700 802417C0 1462000D */ bne $v1, $v0, .L802417F8 /* D94704 802417C4 00000000 */ nop +glabel L802417C8_D94708 /* D94708 802417C8 0C09040B */ jal pra_37_UnkNpcAIFunc8 /* D9470C 802417CC 0240202D */ daddu $a0, $s2, $zero /* D94710 802417D0 8E430070 */ lw $v1, 0x70($s2) /* D94714 802417D4 24020021 */ addiu $v0, $zero, 0x21 /* D94718 802417D8 14620007 */ bne $v1, $v0, .L802417F8 /* D9471C 802417DC 00000000 */ nop +glabel L802417E0_D94720 /* D94720 802417E0 0C090441 */ jal pra_37_UnkNpcAIFunc5 /* D94724 802417E4 0240202D */ daddu $a0, $s2, $zero /* D94728 802417E8 080905FE */ j .L802417F8 /* D9472C 802417EC 00000000 */ nop +glabel L802417F0_D94730 /* D94730 802417F0 0C0129CF */ jal func_8004A73C /* D94734 802417F4 0240202D */ daddu $a0, $s2, $zero .L802417F8: +glabel L802417F8_D94738 /* D94738 802417F8 8FBF0048 */ lw $ra, 0x48($sp) /* D9473C 802417FC 8FB50044 */ lw $s5, 0x44($sp) /* D94740 80241800 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240084_D95674.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240084_D95674.s index b81c4bb999..e583fd09fa 100644 --- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240084_D95674.s +++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240084_D95674.s @@ -40,7 +40,7 @@ glabel func_80240084_D95674 /* D956F0 80240100 1440FFF7 */ bnez $v0, .L802400E0 /* D956F4 80240104 24820001 */ addiu $v0, $a0, 1 /* D956F8 80240108 03E00008 */ jr $ra -/* D956FC 8024010C 00000000 */ nop +/* D956FC 8024010C 00000000 */ nop .L80240110: /* D95700 80240110 3C020100 */ lui $v0, 0x100 .L80240114: diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s index 26194bcf20..085cdfe1d6 100644 --- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s +++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s @@ -16,7 +16,7 @@ glabel func_80240158_D95748 /* D95774 80240184 27B20020 */ addiu $s2, $sp, 0x20 /* D95778 80240188 8E0400CC */ lw $a0, 0xcc($s0) /* D9577C 8024018C 0C044181 */ jal get_shadow_by_index -/* D95780 80240190 00000000 */ nop +/* D95780 80240190 00000000 */ nop /* D95784 80240194 0C048B77 */ jal func_80122DDC /* D95788 80240198 84440008 */ lh $a0, 8($v0) /* D9578C 8024019C 8C430000 */ lw $v1, ($v0) @@ -38,22 +38,22 @@ glabel func_80240158_D95748 /* D957CC 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D957D0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) /* D957D4 802401E4 0C090014 */ jal pra_38_UnkFunc2 -/* D957D8 802401E8 00000000 */ nop +/* D957D8 802401E8 00000000 */ nop /* D957DC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D957E0 802401F0 3C014307 */ lui $at, 0x4307 /* D957E4 802401F4 44810000 */ mtc1 $at, $f0 -/* D957E8 802401F8 00000000 */ nop +/* D957E8 802401F8 00000000 */ nop /* D957EC 802401FC 4602003C */ c.lt.s $f0, $f2 -/* D957F0 80240200 00000000 */ nop +/* D957F0 80240200 00000000 */ nop /* D957F4 80240204 4500000B */ bc1f .L80240234 /* D957F8 80240208 24040002 */ addiu $a0, $zero, 2 /* D957FC 8024020C 3C014361 */ lui $at, 0x4361 /* D95800 80240210 44810000 */ mtc1 $at, $f0 -/* D95804 80240214 00000000 */ nop +/* D95804 80240214 00000000 */ nop /* D95808 80240218 4600103C */ c.lt.s $f2, $f0 -/* D9580C 8024021C 00000000 */ nop +/* D9580C 8024021C 00000000 */ nop /* D95810 80240220 45000004 */ bc1f .L80240234 -/* D95814 80240224 00000000 */ nop +/* D95814 80240224 00000000 */ nop /* D95818 80240228 0C090021 */ jal func_80240084_D95674 /* D9581C 8024022C 0040202D */ daddu $a0, $v0, $zero /* D95820 80240230 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240158_D95748 /* D958A8 802402B8 AFA0001C */ sw $zero, 0x1c($sp) .L802402BC: /* D958AC 802402BC 0C0B77B9 */ jal func_802DDEE4 -/* D958B0 802402C0 00000000 */ nop +/* D958B0 802402C0 00000000 */ nop .L802402C4: /* D958B4 802402C4 9202000E */ lbu $v0, 0xe($s0) /* D958B8 802402C8 3C01802E */ lui $at, %hi(D_802D9D70) diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240320_D95910.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240320_D95910.s index 7ab44cfe38..2f944cf801 100644 --- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240320_D95910.s +++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240320_D95910.s @@ -33,7 +33,7 @@ glabel func_80240320_D95910 /* D95980 80240390 E7B40010 */ swc1 $f20, 0x10($sp) /* D95984 80240394 C62C008C */ lwc1 $f12, 0x8c($s1) /* D95988 80240398 0C00A6C9 */ jal clamp_angle -/* D9598C 8024039C 00000000 */ nop +/* D9598C 8024039C 00000000 */ nop /* D95990 802403A0 44050000 */ mfc1 $a1, $f0 /* D95994 802403A4 4406A000 */ mfc1 $a2, $f20 /* D95998 802403A8 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802404CC_D95ABC.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802404CC_D95ABC.s index 6aef9735d4..d7c8954bce 100644 --- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802404CC_D95ABC.s +++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802404CC_D95ABC.s @@ -10,7 +10,7 @@ glabel func_802404CC_D95ABC /* D95AD0 802404E0 0440000E */ bltz $v0, .L8024051C /* D95AD4 802404E4 28420002 */ slti $v0, $v0, 2 /* D95AD8 802404E8 1040000C */ beqz $v0, .L8024051C -/* D95ADC 802404EC 00000000 */ nop +/* D95ADC 802404EC 00000000 */ nop /* D95AE0 802404F0 3C058024 */ lui $a1, %hi(func_80240530_D95B20) /* D95AE4 802404F4 24A50530 */ addiu $a1, $a1, %lo(func_80240530_D95B20) /* D95AE8 802404F8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240530_D95B20.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240530_D95B20.s index 324ab3868a..2a873e2a9a 100644 --- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240530_D95B20.s +++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240530_D95B20.s @@ -16,7 +16,7 @@ glabel func_80240530_D95B20 /* D95B4C 8024055C 27B10020 */ addiu $s1, $sp, 0x20 /* D95B50 80240560 8E0400CC */ lw $a0, 0xcc($s0) /* D95B54 80240564 0C044181 */ jal get_shadow_by_index -/* D95B58 80240568 00000000 */ nop +/* D95B58 80240568 00000000 */ nop /* D95B5C 8024056C 0C048B77 */ jal func_80122DDC /* D95B60 80240570 84440008 */ lh $a0, 8($v0) /* D95B64 80240574 8E050028 */ lw $a1, 0x28($s0) @@ -33,7 +33,7 @@ glabel func_80240530_D95B20 /* D95B90 802405A0 46000007 */ neg.s $f0, $f0 /* D95B94 802405A4 44060000 */ mfc1 $a2, $f0 /* D95B98 802405A8 0C00B94E */ jal get_screen_coords -/* D95B9C 802405AC 00000000 */ nop +/* D95B9C 802405AC 00000000 */ nop /* D95BA0 802405B0 8E0500A4 */ lw $a1, 0xa4($s0) /* D95BA4 802405B4 3C063F80 */ lui $a2, 0x3f80 /* D95BA8 802405B8 0C0B76A3 */ jal func_802DDA8C @@ -72,13 +72,13 @@ glabel func_80240530_D95B20 /* D95C28 80240638 AFA0001C */ sw $zero, 0x1c($sp) .L8024063C: /* D95C2C 8024063C 0C0B77B9 */ jal func_802DDEE4 -/* D95C30 80240640 00000000 */ nop +/* D95C30 80240640 00000000 */ nop .L80240644: /* D95C34 80240644 9202000E */ lbu $v0, 0xe($s0) /* D95C38 80240648 3C01802E */ lui $at, %hi(D_802D9D71) /* D95C3C 8024064C A0229D71 */ sb $v0, %lo(D_802D9D71)($at) /* D95C40 80240650 08090198 */ j .L80240660 -/* D95C44 80240654 00000000 */ nop +/* D95C44 80240654 00000000 */ nop .L80240658: /* D95C48 80240658 3C01802E */ lui $at, %hi(D_802D9D71) /* D95C4C 8024065C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802406BC_D95CAC.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802406BC_D95CAC.s index 45290b04e0..9e4169617d 100644 --- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802406BC_D95CAC.s +++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802406BC_D95CAC.s @@ -33,7 +33,7 @@ glabel func_802406BC_D95CAC /* D95D1C 8024072C E7B40010 */ swc1 $f20, 0x10($sp) /* D95D20 80240730 C62C008C */ lwc1 $f12, 0x8c($s1) /* D95D24 80240734 0C00A6C9 */ jal clamp_angle -/* D95D28 80240738 00000000 */ nop +/* D95D28 80240738 00000000 */ nop /* D95D2C 8024073C 44050000 */ mfc1 $a1, $f0 /* D95D30 80240740 4406A000 */ mfc1 $a2, $f20 /* D95D34 80240744 4407A000 */ mfc1 $a3, $f20 @@ -95,16 +95,16 @@ glabel func_802406BC_D95CAC /* D95E14 80240824 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D95E18 80240828 3C0142B4 */ lui $at, 0x42b4 /* D95E1C 8024082C 44810000 */ mtc1 $at, $f0 -/* D95E20 80240830 00000000 */ nop +/* D95E20 80240830 00000000 */ nop /* D95E24 80240834 4602003E */ c.le.s $f0, $f2 -/* D95E28 80240838 00000000 */ nop +/* D95E28 80240838 00000000 */ nop /* D95E2C 8024083C 4500000A */ bc1f .L80240868 /* D95E30 80240840 24040001 */ addiu $a0, $zero, 1 /* D95E34 80240844 3C014387 */ lui $at, 0x4387 /* D95E38 80240848 44810000 */ mtc1 $at, $f0 -/* D95E3C 8024084C 00000000 */ nop +/* D95E3C 8024084C 00000000 */ nop /* D95E40 80240850 4600103C */ c.lt.s $f2, $f0 -/* D95E44 80240854 00000000 */ nop +/* D95E44 80240854 00000000 */ nop /* D95E48 80240858 45000004 */ bc1f .L8024086C /* D95E4C 8024085C 27A20018 */ addiu $v0, $sp, 0x18 /* D95E50 80240860 3C041000 */ lui $a0, 0x1000 diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802408A0_D95E90.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802408A0_D95E90.s index 6ad4059a75..a77090ff96 100644 --- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802408A0_D95E90.s +++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802408A0_D95E90.s @@ -43,36 +43,36 @@ glabel func_802408A0_D95E90 /* D95F24 80240934 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D95F28 80240938 3C0142B4 */ lui $at, 0x42b4 /* D95F2C 8024093C 44810000 */ mtc1 $at, $f0 -/* D95F30 80240940 00000000 */ nop +/* D95F30 80240940 00000000 */ nop /* D95F34 80240944 4602003C */ c.lt.s $f0, $f2 -/* D95F38 80240948 00000000 */ nop +/* D95F38 80240948 00000000 */ nop /* D95F3C 8024094C 4500000A */ bc1f .L80240978 -/* D95F40 80240950 00000000 */ nop +/* D95F40 80240950 00000000 */ nop /* D95F44 80240954 3C014334 */ lui $at, 0x4334 /* D95F48 80240958 44812000 */ mtc1 $at, $f4 -/* D95F4C 8024095C 00000000 */ nop +/* D95F4C 8024095C 00000000 */ nop /* D95F50 80240960 4604103E */ c.le.s $f2, $f4 -/* D95F54 80240964 00000000 */ nop +/* D95F54 80240964 00000000 */ nop /* D95F58 80240968 45000003 */ bc1f .L80240978 -/* D95F5C 8024096C 00000000 */ nop +/* D95F5C 8024096C 00000000 */ nop /* D95F60 80240970 08090282 */ j .L80240A08 /* D95F64 80240974 46022501 */ sub.s $f20, $f4, $f2 .L80240978: /* D95F68 80240978 C62000A8 */ lwc1 $f0, 0xa8($s1) /* D95F6C 8024097C 3C014334 */ lui $at, 0x4334 /* D95F70 80240980 44812000 */ mtc1 $at, $f4 -/* D95F74 80240984 00000000 */ nop +/* D95F74 80240984 00000000 */ nop /* D95F78 80240988 4600203C */ c.lt.s $f4, $f0 -/* D95F7C 8024098C 00000000 */ nop +/* D95F7C 8024098C 00000000 */ nop /* D95F80 80240990 4500000C */ bc1f .L802409C4 -/* D95F84 80240994 00000000 */ nop +/* D95F84 80240994 00000000 */ nop /* D95F88 80240998 3C014387 */ lui $at, 0x4387 /* D95F8C 8024099C 44812000 */ mtc1 $at, $f4 -/* D95F90 802409A0 00000000 */ nop +/* D95F90 802409A0 00000000 */ nop /* D95F94 802409A4 4604003E */ c.le.s $f0, $f4 -/* D95F98 802409A8 00000000 */ nop +/* D95F98 802409A8 00000000 */ nop /* D95F9C 802409AC 45000008 */ bc1f .L802409D0 -/* D95FA0 802409B0 00000000 */ nop +/* D95FA0 802409B0 00000000 */ nop /* D95FA4 802409B4 3C014334 */ lui $at, 0x4334 /* D95FA8 802409B8 44812000 */ mtc1 $at, $f4 /* D95FAC 802409BC 08090282 */ j .L80240A08 @@ -80,19 +80,19 @@ glabel func_802408A0_D95E90 .L802409C4: /* D95FB4 802409C4 3C014387 */ lui $at, 0x4387 /* D95FB8 802409C8 44812000 */ mtc1 $at, $f4 -/* D95FBC 802409CC 00000000 */ nop +/* D95FBC 802409CC 00000000 */ nop .L802409D0: /* D95FC0 802409D0 4600203C */ c.lt.s $f4, $f0 -/* D95FC4 802409D4 00000000 */ nop +/* D95FC4 802409D4 00000000 */ nop /* D95FC8 802409D8 4500000A */ bc1f .L80240A04 -/* D95FCC 802409DC 00000000 */ nop +/* D95FCC 802409DC 00000000 */ nop /* D95FD0 802409E0 3C0143B4 */ lui $at, 0x43b4 /* D95FD4 802409E4 44811000 */ mtc1 $at, $f2 -/* D95FD8 802409E8 00000000 */ nop +/* D95FD8 802409E8 00000000 */ nop /* D95FDC 802409EC 4602003E */ c.le.s $f0, $f2 -/* D95FE0 802409F0 00000000 */ nop +/* D95FE0 802409F0 00000000 */ nop /* D95FE4 802409F4 45000003 */ bc1f .L80240A04 -/* D95FE8 802409F8 00000000 */ nop +/* D95FE8 802409F8 00000000 */ nop /* D95FEC 802409FC 08090282 */ j .L80240A08 /* D95FF0 80240A00 46001501 */ sub.s $f20, $f2, $f0 .L80240A04: @@ -100,11 +100,11 @@ glabel func_802408A0_D95E90 .L80240A08: /* D95FF8 80240A08 3C0141C8 */ lui $at, 0x41c8 /* D95FFC 80240A0C 44810000 */ mtc1 $at, $f0 -/* D96000 80240A10 00000000 */ nop +/* D96000 80240A10 00000000 */ nop /* D96004 80240A14 4600A003 */ div.s $f0, $f20, $f0 /* D96008 80240A18 4600010D */ trunc.w.s $f4, $f0 /* D9600C 80240A1C 44072000 */ mfc1 $a3, $f4 -/* D96010 80240A20 00000000 */ nop +/* D96010 80240A20 00000000 */ nop /* D96014 80240A24 00071100 */ sll $v0, $a3, 4 /* D96018 80240A28 00471023 */ subu $v0, $v0, $a3 /* D9601C 80240A2C 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel func_802408A0_D95E90 /* D96064 80240A74 E7B60010 */ swc1 $f22, 0x10($sp) /* D96068 80240A78 C62C008C */ lwc1 $f12, 0x8c($s1) /* D9606C 80240A7C 0C00A6C9 */ jal clamp_angle -/* D96070 80240A80 00000000 */ nop +/* D96070 80240A80 00000000 */ nop /* D96074 80240A84 44050000 */ mfc1 $a1, $f0 /* D96078 80240A88 4406B000 */ mfc1 $a2, $f22 /* D9607C 80240A8C 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel func_802408A0_D95E90 /* D960E0 80240AF0 24040001 */ addiu $a0, $zero, 1 .L80240AF4: /* D960E4 80240AF4 4486D000 */ mtc1 $a2, $f26 -/* D960E8 80240AF8 00000000 */ nop +/* D960E8 80240AF8 00000000 */ nop /* D960EC 80240AFC 4680D6A0 */ cvt.s.w $f26, $f26 /* D960F0 80240B00 24040001 */ addiu $a0, $zero, 1 .L80240B04: @@ -204,10 +204,10 @@ glabel func_802408A0_D95E90 /* D96180 80240B90 44812000 */ mtc1 $at, $f4 /* D96184 80240B94 00021023 */ negu $v0, $v0 /* D96188 80240B98 44820000 */ mtc1 $v0, $f0 -/* D9618C 80240B9C 00000000 */ nop +/* D9618C 80240B9C 00000000 */ nop /* D96190 80240BA0 46800020 */ cvt.s.w $f0, $f0 /* D96194 80240BA4 46040102 */ mul.s $f4, $f0, $f4 -/* D96198 80240BA8 00000000 */ nop +/* D96198 80240BA8 00000000 */ nop /* D9619C 80240BAC 4405B000 */ mfc1 $a1, $f22 /* D961A0 80240BB0 4407B000 */ mfc1 $a3, $f22 /* D961A4 80240BB4 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel func_802408A0_D95E90 /* D96214 80240C24 3C013F00 */ lui $at, 0x3f00 /* D96218 80240C28 44812000 */ mtc1 $at, $f4 /* D9621C 80240C2C 44820000 */ mtc1 $v0, $f0 -/* D96220 80240C30 00000000 */ nop +/* D96220 80240C30 00000000 */ nop /* D96224 80240C34 46800020 */ cvt.s.w $f0, $f0 /* D96228 80240C38 46040102 */ mul.s $f4, $f0, $f4 -/* D9622C 80240C3C 00000000 */ nop +/* D9622C 80240C3C 00000000 */ nop /* D96230 80240C40 4405B000 */ mfc1 $a1, $f22 /* D96234 80240C44 4407B000 */ mfc1 $a3, $f22 /* D96238 80240C48 44062000 */ mfc1 $a2, $f4 @@ -280,16 +280,16 @@ glabel func_802408A0_D95E90 /* D962B0 80240CC0 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D962B4 80240CC4 3C0142B4 */ lui $at, 0x42b4 /* D962B8 80240CC8 44810000 */ mtc1 $at, $f0 -/* D962BC 80240CCC 00000000 */ nop +/* D962BC 80240CCC 00000000 */ nop /* D962C0 80240CD0 4602003E */ c.le.s $f0, $f2 -/* D962C4 80240CD4 00000000 */ nop +/* D962C4 80240CD4 00000000 */ nop /* D962C8 80240CD8 4500000A */ bc1f .L80240D04 /* D962CC 80240CDC 24040001 */ addiu $a0, $zero, 1 /* D962D0 80240CE0 3C014387 */ lui $at, 0x4387 /* D962D4 80240CE4 44812000 */ mtc1 $at, $f4 -/* D962D8 80240CE8 00000000 */ nop +/* D962D8 80240CE8 00000000 */ nop /* D962DC 80240CEC 4604103C */ c.lt.s $f2, $f4 -/* D962E0 80240CF0 00000000 */ nop +/* D962E0 80240CF0 00000000 */ nop /* D962E4 80240CF4 45000004 */ bc1f .L80240D08 /* D962E8 80240CF8 27A20020 */ addiu $v0, $sp, 0x20 /* D962EC 80240CFC 3C041000 */ lui $a0, 0x1000 @@ -305,7 +305,7 @@ glabel func_802408A0_D95E90 /* D9630C 80240D1C 26730001 */ addiu $s3, $s3, 1 /* D96310 80240D20 2A620002 */ slti $v0, $s3, 2 /* D96314 80240D24 1440FEF6 */ bnez $v0, .L80240900 -/* D96318 80240D28 00000000 */ nop +/* D96318 80240D28 00000000 */ nop /* D9631C 80240D2C 8FBF014C */ lw $ra, 0x14c($sp) /* D96320 80240D30 8FB60148 */ lw $s6, 0x148($sp) /* D96324 80240D34 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240D6C_D9635C.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240D6C_D9635C.s index f162fff0dd..dcc3cea8fe 100644 --- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240D6C_D9635C.s +++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240D6C_D9635C.s @@ -11,36 +11,36 @@ glabel func_80240D6C_D9635C /* D96374 80240D84 24020001 */ addiu $v0, $zero, 1 /* D96378 80240D88 8E030084 */ lw $v1, 0x84($s0) /* D9637C 80240D8C 1062001A */ beq $v1, $v0, .L80240DF8 -/* D96380 80240D90 00000000 */ nop +/* D96380 80240D90 00000000 */ nop /* D96384 80240D94 28620002 */ slti $v0, $v1, 2 /* D96388 80240D98 50400005 */ beql $v0, $zero, .L80240DB0 /* D9638C 80240D9C 24020002 */ addiu $v0, $zero, 2 /* D96390 80240DA0 10600007 */ beqz $v1, .L80240DC0 -/* D96394 80240DA4 00000000 */ nop +/* D96394 80240DA4 00000000 */ nop /* D96398 80240DA8 08090384 */ j .L80240E10 -/* D9639C 80240DAC 00000000 */ nop +/* D9639C 80240DAC 00000000 */ nop .L80240DB0: /* D963A0 80240DB0 10620007 */ beq $v1, $v0, .L80240DD0 -/* D963A4 80240DB4 00000000 */ nop +/* D963A4 80240DB4 00000000 */ nop /* D963A8 80240DB8 08090384 */ j .L80240E10 -/* D963AC 80240DBC 00000000 */ nop +/* D963AC 80240DBC 00000000 */ nop .L80240DC0: /* D963B0 80240DC0 3C048024 */ lui $a0, %hi(pra_38_SetPartnerFlagsA0000) /* D963B4 80240DC4 24840EB4 */ addiu $a0, $a0, %lo(pra_38_SetPartnerFlagsA0000) /* D963B8 80240DC8 08090380 */ j .L80240E00 -/* D963BC 80240DCC 00000000 */ nop +/* D963BC 80240DCC 00000000 */ nop .L80240DD0: /* D963C0 80240DD0 3C048024 */ lui $a0, %hi(pra_38_SetPartnerFlags20000) /* D963C4 80240DD4 24840F1C */ addiu $a0, $a0, %lo(pra_38_SetPartnerFlags20000) /* D963C8 80240DD8 08090380 */ j .L80240E00 -/* D963CC 80240DDC 00000000 */ nop +/* D963CC 80240DDC 00000000 */ nop .L80240DE0: /* D963D0 80240DE0 8E020084 */ lw $v0, 0x84($s0) /* D963D4 80240DE4 0440000A */ bltz $v0, .L80240E10 -/* D963D8 80240DE8 00000000 */ nop +/* D963D8 80240DE8 00000000 */ nop /* D963DC 80240DEC 28420002 */ slti $v0, $v0, 2 /* D963E0 80240DF0 10400007 */ beqz $v0, .L80240E10 -/* D963E4 80240DF4 00000000 */ nop +/* D963E4 80240DF4 00000000 */ nop .L80240DF8: /* D963E8 80240DF8 3C048024 */ lui $a0, %hi(pra_38_SetPartnerFlags80000) /* D963EC 80240DFC 24840EE8 */ addiu $a0, $a0, %lo(pra_38_SetPartnerFlags80000) @@ -64,14 +64,14 @@ glabel func_80240D6C_D9635C /* D9642C 80240E3C 10400005 */ beqz $v0, .L80240E54 /* D96430 80240E40 24020002 */ addiu $v0, $zero, 2 /* D96434 80240E44 10800007 */ beqz $a0, .L80240E64 -/* D96438 80240E48 00000000 */ nop +/* D96438 80240E48 00000000 */ nop /* D9643C 80240E4C 080903A9 */ j .L80240EA4 -/* D96440 80240E50 00000000 */ nop +/* D96440 80240E50 00000000 */ nop .L80240E54: /* D96444 80240E54 10820006 */ beq $a0, $v0, .L80240E70 /* D96448 80240E58 24020002 */ addiu $v0, $zero, 2 /* D9644C 80240E5C 080903A9 */ j .L80240EA4 -/* D96450 80240E60 00000000 */ nop +/* D96450 80240E60 00000000 */ nop .L80240E64: /* D96454 80240E64 8CA20000 */ lw $v0, ($a1) /* D96458 80240E68 080903A6 */ j .L80240E98 diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240F50_D96540.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240F50_D96540.s index 04706bcb17..e032cd488f 100644 --- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240F50_D96540.s +++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240F50_D96540.s @@ -75,7 +75,7 @@ glabel func_80240F50_D96540 /* D96654 80241064 8E4300B0 */ lw $v1, 0xb0($s2) /* D96658 80241068 30620004 */ andi $v0, $v1, 4 /* D9665C 8024106C 10400007 */ beqz $v0, .L8024108C -/* D96660 80241070 00000000 */ nop +/* D96660 80241070 00000000 */ nop /* D96664 80241074 824200B4 */ lb $v0, 0xb4($s2) /* D96668 80241078 1440018D */ bnez $v0, .L802416B0 /* D9666C 8024107C 0000102D */ daddu $v0, $zero, $zero @@ -87,11 +87,12 @@ glabel func_80240F50_D96540 /* D96680 80241090 2C620010 */ sltiu $v0, $v1, 0x10 /* D96684 80241094 10400185 */ beqz $v0, .L802416AC /* D96688 80241098 00031080 */ sll $v0, $v1, 2 -/* D9668C 8024109C 3C018024 */ lui $at, %hi(func_80242250_7ECF60) +/* D9668C 8024109C 3C018024 */ lui $at, %hi(jtbl_80242250_D97840) /* D96690 802410A0 00220821 */ addu $at, $at, $v0 -/* D96694 802410A4 8C222250 */ lw $v0, %lo(func_80242250_7ECF60)($at) +/* D96694 802410A4 8C222250 */ lw $v0, %lo(jtbl_80242250_D97840)($at) /* D96698 802410A8 00400008 */ jr $v0 -/* D9669C 802410AC 00000000 */ nop +/* D9669C 802410AC 00000000 */ nop +glabel L802410B0_D966A0 /* D966A0 802410B0 8E4200CC */ lw $v0, 0xcc($s2) /* D966A4 802410B4 922300A9 */ lbu $v1, 0xa9($s1) /* D966A8 802410B8 8C440000 */ lw $a0, ($v0) @@ -103,9 +104,10 @@ glabel func_80240F50_D96540 /* D966C0 802410D0 AE240028 */ sw $a0, 0x28($s1) /* D966C4 802410D4 AE600074 */ sw $zero, 0x74($s3) /* D966C8 802410D8 AE620070 */ sw $v0, 0x70($s3) +glabel L802410DC_D966CC /* D966CC 802410DC 8E830014 */ lw $v1, 0x14($s4) /* D966D0 802410E0 04600015 */ bltz $v1, .L80241138 -/* D966D4 802410E4 00000000 */ nop +/* D966D4 802410E4 00000000 */ nop /* D966D8 802410E8 8E620074 */ lw $v0, 0x74($s3) /* D966DC 802410EC 1C400011 */ bgtz $v0, .L80241134 /* D966E0 802410F0 2442FFFF */ addiu $v0, $v0, -1 @@ -133,6 +135,7 @@ glabel func_80240F50_D96540 /* D9672C 8024113C 2402000A */ addiu $v0, $zero, 0xa /* D96730 80241140 1462015B */ bne $v1, $v0, .L802416B0 /* D96734 80241144 0000102D */ daddu $v0, $zero, $zero +glabel L80241148_D96738 /* D96738 80241148 C62C0038 */ lwc1 $f12, 0x38($s1) /* D9673C 8024114C 8E4200CC */ lw $v0, 0xcc($s2) /* D96740 80241150 C62E0040 */ lwc1 $f14, 0x40($s1) @@ -166,7 +169,7 @@ glabel func_80240F50_D96540 /* D967B0 802411C0 0C0372DF */ jal func_800DCB7C /* D967B4 802411C4 27A70048 */ addiu $a3, $sp, 0x48 /* D967B8 802411C8 10400010 */ beqz $v0, .L8024120C -/* D967BC 802411CC 00000000 */ nop +/* D967BC 802411CC 00000000 */ nop /* D967C0 802411D0 C620003C */ lwc1 $f0, 0x3c($s1) /* D967C4 802411D4 C6440070 */ lwc1 $f4, 0x70($s2) /* D967C8 802411D8 46802120 */ cvt.s.w $f4, $f4 @@ -175,7 +178,7 @@ glabel func_80240F50_D96540 /* D967D4 802411E4 D4222290 */ ldc1 $f2, %lo(D_80242290)($at) /* D967D8 802411E8 46000021 */ cvt.d.s $f0, $f0 /* D967DC 802411EC 46220002 */ mul.d $f0, $f0, $f2 -/* D967E0 802411F0 00000000 */ nop +/* D967E0 802411F0 00000000 */ nop /* D967E4 802411F4 460020A1 */ cvt.d.s $f2, $f4 /* D967E8 802411F8 46201080 */ add.d $f2, $f2, $f0 /* D967EC 802411FC E7A40044 */ swc1 $f4, 0x44($sp) @@ -190,7 +193,7 @@ glabel func_80240F50_D96540 /* D9680C 8024121C D4242298 */ ldc1 $f4, %lo(func_80242298_CC5AA8)($at) /* D96810 80241220 460010A1 */ cvt.d.s $f2, $f2 /* D96814 80241224 46241082 */ mul.d $f2, $f2, $f4 -/* D96818 80241228 00000000 */ nop +/* D96818 80241228 00000000 */ nop /* D9681C 8024122C 46000021 */ cvt.d.s $f0, $f0 /* D96820 80241230 46220000 */ add.d $f0, $f0, $f2 /* D96824 80241234 46200020 */ cvt.s.d $f0, $f0 @@ -200,12 +203,13 @@ glabel func_80240F50_D96540 /* D96830 80241240 2402000B */ addiu $v0, $zero, 0xb /* D96834 80241244 E6200068 */ swc1 $f0, 0x68($s1) /* D96838 80241248 AE620070 */ sw $v0, 0x70($s3) +glabel L8024124C_D9683C /* D9683C 8024124C C6200018 */ lwc1 $f0, 0x18($s1) /* D96840 80241250 44801000 */ mtc1 $zero, $f2 /* D96844 80241254 44801800 */ mtc1 $zero, $f3 /* D96848 80241258 46000021 */ cvt.d.s $f0, $f0 /* D9684C 8024125C 4620103C */ c.lt.d $f2, $f0 -/* D96850 80241260 00000000 */ nop +/* D96850 80241260 00000000 */ nop /* D96854 80241264 45000025 */ bc1f .L802412FC /* D96858 80241268 27A50040 */ addiu $a1, $sp, 0x40 /* D9685C 8024126C C6200038 */ lwc1 $f0, 0x38($s1) @@ -220,13 +224,13 @@ glabel func_80240F50_D96540 /* D96880 80241290 E7A00014 */ swc1 $f0, 0x14($sp) /* D96884 80241294 862200A8 */ lh $v0, 0xa8($s1) /* D96888 80241298 44820000 */ mtc1 $v0, $f0 -/* D9688C 8024129C 00000000 */ nop +/* D9688C 8024129C 00000000 */ nop /* D96890 802412A0 46800020 */ cvt.s.w $f0, $f0 /* D96894 802412A4 E7A00018 */ swc1 $f0, 0x18($sp) /* D96898 802412A8 862200A6 */ lh $v0, 0xa6($s1) /* D9689C 802412AC 27A60044 */ addiu $a2, $sp, 0x44 /* D968A0 802412B0 44820000 */ mtc1 $v0, $f0 -/* D968A4 802412B4 00000000 */ nop +/* D968A4 802412B4 00000000 */ nop /* D968A8 802412B8 46800020 */ cvt.s.w $f0, $f0 /* D968AC 802412BC E7A0001C */ swc1 $f0, 0x1c($sp) /* D968B0 802412C0 8E240080 */ lw $a0, 0x80($s1) @@ -254,12 +258,13 @@ glabel func_80240F50_D96540 /* D96900 80241310 46001080 */ add.s $f2, $f2, $f0 /* D96904 80241314 E620001C */ swc1 $f0, 0x1c($s1) /* D96908 80241318 4604103C */ c.lt.s $f2, $f4 -/* D9690C 8024131C 00000000 */ nop +/* D9690C 8024131C 00000000 */ nop /* D96910 80241320 450000E2 */ bc1f .L802416AC /* D96914 80241324 E622003C */ swc1 $f2, 0x3c($s1) /* D96918 80241328 2402000C */ addiu $v0, $zero, 0xc /* D9691C 8024132C E624003C */ swc1 $f4, 0x3c($s1) /* D96920 80241330 AE620070 */ sw $v0, 0x70($s3) +glabel L80241334_D96924 /* D96924 80241334 C62C0038 */ lwc1 $f12, 0x38($s1) /* D96928 80241338 C62E0040 */ lwc1 $f14, 0x40($s1) /* D9692C 8024133C 8EA60028 */ lw $a2, 0x28($s5) @@ -267,9 +272,9 @@ glabel func_80240F50_D96540 /* D96934 80241344 8EA70030 */ lw $a3, 0x30($s5) /* D96938 80241348 3C014270 */ lui $at, 0x4270 /* D9693C 8024134C 44811000 */ mtc1 $at, $f2 -/* D96940 80241350 00000000 */ nop +/* D96940 80241350 00000000 */ nop /* D96944 80241354 4602003C */ c.lt.s $f0, $f2 -/* D96948 80241358 00000000 */ nop +/* D96948 80241358 00000000 */ nop /* D9694C 8024135C 45000002 */ bc1f .L80241368 /* D96950 80241360 E6200010 */ swc1 $f0, 0x10($s1) /* D96954 80241364 E6220010 */ swc1 $f2, 0x10($s1) @@ -288,7 +293,7 @@ glabel func_80240F50_D96540 /* D96984 80241394 C622003C */ lwc1 $f2, 0x3c($s1) /* D96988 80241398 4600228D */ trunc.w.s $f10, $f4 /* D9698C 8024139C 44025000 */ mfc1 $v0, $f10 -/* D96990 802413A0 00000000 */ nop +/* D96990 802413A0 00000000 */ nop /* D96994 802413A4 A622008E */ sh $v0, 0x8e($s1) /* D96998 802413A8 460010A1 */ cvt.d.s $f2, $f2 /* D9699C 802413AC 46220001 */ sub.d $f0, $f0, $f2 @@ -302,11 +307,11 @@ glabel func_80240F50_D96540 /* D969B8 802413C8 8622008E */ lh $v0, 0x8e($s1) /* D969BC 802413CC C620001C */ lwc1 $f0, 0x1c($s1) /* D969C0 802413D0 44821000 */ mtc1 $v0, $f2 -/* D969C4 802413D4 00000000 */ nop +/* D969C4 802413D4 00000000 */ nop /* D969C8 802413D8 468010A0 */ cvt.s.w $f2, $f2 /* D969CC 802413DC 46000007 */ neg.s $f0, $f0 /* D969D0 802413E0 46020002 */ mul.s $f0, $f0, $f2 -/* D969D4 802413E4 00000000 */ nop +/* D969D4 802413E4 00000000 */ nop /* D969D8 802413E8 00420018 */ mult $v0, $v0 /* D969DC 802413EC 8E230000 */ lw $v1, ($s1) /* D969E0 802413F0 46040000 */ add.s $f0, $f0, $f4 @@ -318,7 +323,7 @@ glabel func_80240F50_D96540 /* D969F8 80241408 46000000 */ add.s $f0, $f0, $f0 /* D969FC 8024140C AE230000 */ sw $v1, ($s1) /* D96A00 80241410 44881000 */ mtc1 $t0, $f2 -/* D96A04 80241414 00000000 */ nop +/* D96A04 80241414 00000000 */ nop /* D96A08 80241418 468010A0 */ cvt.s.w $f2, $f2 /* D96A0C 8024141C 46000007 */ neg.s $f0, $f0 /* D96A10 80241420 46020003 */ div.s $f0, $f0, $f2 @@ -329,13 +334,14 @@ glabel func_80240F50_D96540 /* D96A24 80241434 2402000D */ addiu $v0, $zero, 0xd /* D96A28 80241438 A620008E */ sh $zero, 0x8e($s1) /* D96A2C 8024143C AE620070 */ sw $v0, 0x70($s3) +glabel L80241440_D96A30 /* D96A30 80241440 C620001C */ lwc1 $f0, 0x1c($s1) /* D96A34 80241444 C6220014 */ lwc1 $f2, 0x14($s1) /* D96A38 80241448 46020001 */ sub.s $f0, $f0, $f2 /* D96A3C 8024144C 4480A000 */ mtc1 $zero, $f20 -/* D96A40 80241450 00000000 */ nop +/* D96A40 80241450 00000000 */ nop /* D96A44 80241454 4614003C */ c.lt.s $f0, $f20 -/* D96A48 80241458 00000000 */ nop +/* D96A48 80241458 00000000 */ nop /* D96A4C 8024145C 45000012 */ bc1f .L802414A8 /* D96A50 80241460 E620001C */ swc1 $f0, 0x1c($s1) /* D96A54 80241464 27A50040 */ addiu $a1, $sp, 0x40 @@ -364,7 +370,7 @@ glabel func_80240F50_D96540 /* D96AAC 802414BC 44801800 */ mtc1 $zero, $f3 /* D96AB0 802414C0 46000021 */ cvt.d.s $f0, $f0 /* D96AB4 802414C4 4620103C */ c.lt.d $f2, $f0 -/* D96AB8 802414C8 00000000 */ nop +/* D96AB8 802414C8 00000000 */ nop /* D96ABC 802414CC 45000057 */ bc1f .L8024162C /* D96AC0 802414D0 E624003C */ swc1 $f4, 0x3c($s1) /* D96AC4 802414D4 46002086 */ mov.s $f2, $f4 @@ -380,20 +386,20 @@ glabel func_80240F50_D96540 /* D96AEC 802414FC 862200A8 */ lh $v0, 0xa8($s1) /* D96AF0 80241500 27A50040 */ addiu $a1, $sp, 0x40 /* D96AF4 80241504 44820000 */ mtc1 $v0, $f0 -/* D96AF8 80241508 00000000 */ nop +/* D96AF8 80241508 00000000 */ nop /* D96AFC 8024150C 46800020 */ cvt.s.w $f0, $f0 /* D96B00 80241510 E7A00018 */ swc1 $f0, 0x18($sp) /* D96B04 80241514 862200A6 */ lh $v0, 0xa6($s1) /* D96B08 80241518 27A60044 */ addiu $a2, $sp, 0x44 /* D96B0C 8024151C 44820000 */ mtc1 $v0, $f0 -/* D96B10 80241520 00000000 */ nop +/* D96B10 80241520 00000000 */ nop /* D96B14 80241524 46800020 */ cvt.s.w $f0, $f0 /* D96B18 80241528 E7A0001C */ swc1 $f0, 0x1c($sp) /* D96B1C 8024152C 8E240080 */ lw $a0, 0x80($s1) /* D96B20 80241530 0C037711 */ jal func_800DDC44 /* D96B24 80241534 27A70048 */ addiu $a3, $sp, 0x48 /* D96B28 80241538 10400003 */ beqz $v0, .L80241548 -/* D96B2C 8024153C 00000000 */ nop +/* D96B2C 8024153C 00000000 */ nop /* D96B30 80241540 08090587 */ j .L8024161C /* D96B34 80241544 AE200018 */ sw $zero, 0x18($s1) .L80241548: @@ -403,9 +409,9 @@ glabel func_80240F50_D96540 /* D96B44 80241554 44801000 */ mtc1 $zero, $f2 /* D96B48 80241558 46000021 */ cvt.d.s $f0, $f0 /* D96B4C 8024155C 4622003C */ c.lt.d $f0, $f2 -/* D96B50 80241560 00000000 */ nop +/* D96B50 80241560 00000000 */ nop /* D96B54 80241564 4500002D */ bc1f .L8024161C -/* D96B58 80241568 00000000 */ nop +/* D96B58 80241568 00000000 */ nop /* D96B5C 8024156C 9622008E */ lhu $v0, 0x8e($s1) /* D96B60 80241570 24420001 */ addiu $v0, $v0, 1 /* D96B64 80241574 A622008E */ sh $v0, 0x8e($s1) @@ -414,7 +420,7 @@ glabel func_80240F50_D96540 /* D96B70 80241580 00021403 */ sra $v0, $v0, 0x10 /* D96B74 80241584 0043102A */ slt $v0, $v0, $v1 /* D96B78 80241588 14400024 */ bnez $v0, .L8024161C -/* D96B7C 8024158C 00000000 */ nop +/* D96B7C 8024158C 00000000 */ nop /* D96B80 80241590 C62C0038 */ lwc1 $f12, 0x38($s1) /* D96B84 80241594 C62E0040 */ lwc1 $f14, 0x40($s1) /* D96B88 80241598 8EA60028 */ lw $a2, 0x28($s5) @@ -428,20 +434,20 @@ glabel func_80240F50_D96540 /* D96BA8 802415B8 8E82001C */ lw $v0, 0x1c($s4) /* D96BAC 802415BC 46001005 */ abs.s $f0, $f2 /* D96BB0 802415C0 44822000 */ mtc1 $v0, $f4 -/* D96BB4 802415C4 00000000 */ nop +/* D96BB4 802415C4 00000000 */ nop /* D96BB8 802415C8 46802120 */ cvt.s.w $f4, $f4 /* D96BBC 802415CC 4600203C */ c.lt.s $f4, $f0 -/* D96BC0 802415D0 00000000 */ nop +/* D96BC0 802415D0 00000000 */ nop /* D96BC4 802415D4 4500000D */ bc1f .L8024160C -/* D96BC8 802415D8 00000000 */ nop +/* D96BC8 802415D8 00000000 */ nop /* D96BCC 802415DC 44800000 */ mtc1 $zero, $f0 /* D96BD0 802415E0 C634000C */ lwc1 $f20, 0xc($s1) /* D96BD4 802415E4 4600103C */ c.lt.s $f2, $f0 -/* D96BD8 802415E8 00000000 */ nop +/* D96BD8 802415E8 00000000 */ nop /* D96BDC 802415EC 45000006 */ bc1f .L80241608 /* D96BE0 802415F0 00021023 */ negu $v0, $v0 /* D96BE4 802415F4 44820000 */ mtc1 $v0, $f0 -/* D96BE8 802415F8 00000000 */ nop +/* D96BE8 802415F8 00000000 */ nop /* D96BEC 802415FC 46800020 */ cvt.s.w $f0, $f0 /* D96BF0 80241600 08090583 */ j .L8024160C /* D96BF4 80241604 4600A500 */ add.s $f20, $f20, $f0 @@ -468,11 +474,12 @@ glabel func_80240F50_D96540 /* D96C34 80241644 C620003C */ lwc1 $f0, 0x3c($s1) /* D96C38 80241648 C6220068 */ lwc1 $f2, 0x68($s1) /* D96C3C 8024164C 4600103C */ c.lt.s $f2, $f0 -/* D96C40 80241650 00000000 */ nop +/* D96C40 80241650 00000000 */ nop /* D96C44 80241654 45000015 */ bc1f .L802416AC /* D96C48 80241658 2402000E */ addiu $v0, $zero, 0xe /* D96C4C 8024165C E622003C */ swc1 $f2, 0x3c($s1) /* D96C50 80241660 AE620070 */ sw $v0, 0x70($s3) +glabel L80241664_D96C54 /* D96C54 80241664 8E4200CC */ lw $v0, 0xcc($s2) /* D96C58 80241668 922300A9 */ lbu $v1, 0xa9($s1) /* D96C5C 8024166C 8C440020 */ lw $a0, 0x20($v0) @@ -485,6 +492,7 @@ glabel func_80240F50_D96540 /* D96C78 80241688 2402000F */ addiu $v0, $zero, 0xf /* D96C7C 8024168C AE240028 */ sw $a0, 0x28($s1) /* D96C80 80241690 AE620070 */ sw $v0, 0x70($s3) +glabel L80241694_D96C84 /* D96C84 80241694 9622008E */ lhu $v0, 0x8e($s1) /* D96C88 80241698 2442FFFF */ addiu $v0, $v0, -1 /* D96C8C 8024169C A622008E */ sh $v0, 0x8e($s1) @@ -492,6 +500,7 @@ glabel func_80240F50_D96540 /* D96C94 802416A4 58400001 */ blezl $v0, .L802416AC /* D96C98 802416A8 AE600070 */ sw $zero, 0x70($s3) .L802416AC: +glabel L802416AC_D96C9C /* D96C9C 802416AC 0000102D */ daddu $v0, $zero, $zero .L802416B0: /* D96CA0 802416B0 8FBF006C */ lw $ra, 0x6c($sp) @@ -505,4 +514,4 @@ glabel func_80240F50_D96540 /* D96CC0 802416D0 D7B40070 */ ldc1 $f20, 0x70($sp) /* D96CC4 802416D4 03E00008 */ jr $ra /* D96CC8 802416D8 27BD0078 */ addiu $sp, $sp, 0x78 -/* D96CCC 802416DC 00000000 */ nop +/* D96CCC 802416DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240084_D97914.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240084_D97914.s index adce6c4cba..0ca8170fc5 100644 --- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240084_D97914.s +++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240084_D97914.s @@ -40,7 +40,7 @@ glabel func_80240084_D97914 /* D97990 80240100 1440FFF7 */ bnez $v0, .L802400E0 /* D97994 80240104 24820001 */ addiu $v0, $a0, 1 /* D97998 80240108 03E00008 */ jr $ra -/* D9799C 8024010C 00000000 */ nop +/* D9799C 8024010C 00000000 */ nop .L80240110: /* D979A0 80240110 3C020100 */ lui $v0, 0x100 .L80240114: diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s index 35f6083346..30ef7a6ac8 100644 --- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s +++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s @@ -16,7 +16,7 @@ glabel func_80240158_D979E8 /* D97A14 80240184 27B20020 */ addiu $s2, $sp, 0x20 /* D97A18 80240188 8E0400CC */ lw $a0, 0xcc($s0) /* D97A1C 8024018C 0C044181 */ jal get_shadow_by_index -/* D97A20 80240190 00000000 */ nop +/* D97A20 80240190 00000000 */ nop /* D97A24 80240194 0C048B77 */ jal func_80122DDC /* D97A28 80240198 84440008 */ lh $a0, 8($v0) /* D97A2C 8024019C 8C430000 */ lw $v1, ($v0) @@ -38,22 +38,22 @@ glabel func_80240158_D979E8 /* D97A6C 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D97A70 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) /* D97A74 802401E4 0C090014 */ jal pra_39_UnkFunc2 -/* D97A78 802401E8 00000000 */ nop +/* D97A78 802401E8 00000000 */ nop /* D97A7C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D97A80 802401F0 3C014307 */ lui $at, 0x4307 /* D97A84 802401F4 44810000 */ mtc1 $at, $f0 -/* D97A88 802401F8 00000000 */ nop +/* D97A88 802401F8 00000000 */ nop /* D97A8C 802401FC 4602003C */ c.lt.s $f0, $f2 -/* D97A90 80240200 00000000 */ nop +/* D97A90 80240200 00000000 */ nop /* D97A94 80240204 4500000B */ bc1f .L80240234 /* D97A98 80240208 24040002 */ addiu $a0, $zero, 2 /* D97A9C 8024020C 3C014361 */ lui $at, 0x4361 /* D97AA0 80240210 44810000 */ mtc1 $at, $f0 -/* D97AA4 80240214 00000000 */ nop +/* D97AA4 80240214 00000000 */ nop /* D97AA8 80240218 4600103C */ c.lt.s $f2, $f0 -/* D97AAC 8024021C 00000000 */ nop +/* D97AAC 8024021C 00000000 */ nop /* D97AB0 80240220 45000004 */ bc1f .L80240234 -/* D97AB4 80240224 00000000 */ nop +/* D97AB4 80240224 00000000 */ nop /* D97AB8 80240228 0C090021 */ jal func_80240084_D97914 /* D97ABC 8024022C 0040202D */ daddu $a0, $v0, $zero /* D97AC0 80240230 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240158_D979E8 /* D97B48 802402B8 AFA0001C */ sw $zero, 0x1c($sp) .L802402BC: /* D97B4C 802402BC 0C0B77B9 */ jal func_802DDEE4 -/* D97B50 802402C0 00000000 */ nop +/* D97B50 802402C0 00000000 */ nop .L802402C4: /* D97B54 802402C4 9202000E */ lbu $v0, 0xe($s0) /* D97B58 802402C8 3C01802E */ lui $at, %hi(D_802D9D70) diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240320_D97BB0.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240320_D97BB0.s index aee169a4c4..86ae82ad9d 100644 --- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240320_D97BB0.s +++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240320_D97BB0.s @@ -33,7 +33,7 @@ glabel func_80240320_D97BB0 /* D97C20 80240390 E7B40010 */ swc1 $f20, 0x10($sp) /* D97C24 80240394 C62C008C */ lwc1 $f12, 0x8c($s1) /* D97C28 80240398 0C00A6C9 */ jal clamp_angle -/* D97C2C 8024039C 00000000 */ nop +/* D97C2C 8024039C 00000000 */ nop /* D97C30 802403A0 44050000 */ mfc1 $a1, $f0 /* D97C34 802403A4 4406A000 */ mfc1 $a2, $f20 /* D97C38 802403A8 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802404CC_D97D5C.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802404CC_D97D5C.s index fb74502eba..72b92aa634 100644 --- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802404CC_D97D5C.s +++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802404CC_D97D5C.s @@ -10,7 +10,7 @@ glabel func_802404CC_D97D5C /* D97D70 802404E0 0440000E */ bltz $v0, .L8024051C /* D97D74 802404E4 28420002 */ slti $v0, $v0, 2 /* D97D78 802404E8 1040000C */ beqz $v0, .L8024051C -/* D97D7C 802404EC 00000000 */ nop +/* D97D7C 802404EC 00000000 */ nop /* D97D80 802404F0 3C058024 */ lui $a1, %hi(func_80240530_D97DC0) /* D97D84 802404F4 24A50530 */ addiu $a1, $a1, %lo(func_80240530_D97DC0) /* D97D88 802404F8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240530_D97DC0.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240530_D97DC0.s index de0cde616e..17922d1e3e 100644 --- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240530_D97DC0.s +++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240530_D97DC0.s @@ -16,7 +16,7 @@ glabel func_80240530_D97DC0 /* D97DEC 8024055C 27B10020 */ addiu $s1, $sp, 0x20 /* D97DF0 80240560 8E0400CC */ lw $a0, 0xcc($s0) /* D97DF4 80240564 0C044181 */ jal get_shadow_by_index -/* D97DF8 80240568 00000000 */ nop +/* D97DF8 80240568 00000000 */ nop /* D97DFC 8024056C 0C048B77 */ jal func_80122DDC /* D97E00 80240570 84440008 */ lh $a0, 8($v0) /* D97E04 80240574 8E050028 */ lw $a1, 0x28($s0) @@ -33,7 +33,7 @@ glabel func_80240530_D97DC0 /* D97E30 802405A0 46000007 */ neg.s $f0, $f0 /* D97E34 802405A4 44060000 */ mfc1 $a2, $f0 /* D97E38 802405A8 0C00B94E */ jal get_screen_coords -/* D97E3C 802405AC 00000000 */ nop +/* D97E3C 802405AC 00000000 */ nop /* D97E40 802405B0 8E0500A4 */ lw $a1, 0xa4($s0) /* D97E44 802405B4 3C063F80 */ lui $a2, 0x3f80 /* D97E48 802405B8 0C0B76A3 */ jal func_802DDA8C @@ -72,13 +72,13 @@ glabel func_80240530_D97DC0 /* D97EC8 80240638 AFA0001C */ sw $zero, 0x1c($sp) .L8024063C: /* D97ECC 8024063C 0C0B77B9 */ jal func_802DDEE4 -/* D97ED0 80240640 00000000 */ nop +/* D97ED0 80240640 00000000 */ nop .L80240644: /* D97ED4 80240644 9202000E */ lbu $v0, 0xe($s0) /* D97ED8 80240648 3C01802E */ lui $at, %hi(D_802D9D71) /* D97EDC 8024064C A0229D71 */ sb $v0, %lo(D_802D9D71)($at) /* D97EE0 80240650 08090198 */ j .L80240660 -/* D97EE4 80240654 00000000 */ nop +/* D97EE4 80240654 00000000 */ nop .L80240658: /* D97EE8 80240658 3C01802E */ lui $at, %hi(D_802D9D71) /* D97EEC 8024065C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802406BC_D97F4C.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802406BC_D97F4C.s index 3be023dbee..b223738e5c 100644 --- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802406BC_D97F4C.s +++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802406BC_D97F4C.s @@ -33,7 +33,7 @@ glabel func_802406BC_D97F4C /* D97FBC 8024072C E7B40010 */ swc1 $f20, 0x10($sp) /* D97FC0 80240730 C62C008C */ lwc1 $f12, 0x8c($s1) /* D97FC4 80240734 0C00A6C9 */ jal clamp_angle -/* D97FC8 80240738 00000000 */ nop +/* D97FC8 80240738 00000000 */ nop /* D97FCC 8024073C 44050000 */ mfc1 $a1, $f0 /* D97FD0 80240740 4406A000 */ mfc1 $a2, $f20 /* D97FD4 80240744 4407A000 */ mfc1 $a3, $f20 @@ -95,16 +95,16 @@ glabel func_802406BC_D97F4C /* D980B4 80240824 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D980B8 80240828 3C0142B4 */ lui $at, 0x42b4 /* D980BC 8024082C 44810000 */ mtc1 $at, $f0 -/* D980C0 80240830 00000000 */ nop +/* D980C0 80240830 00000000 */ nop /* D980C4 80240834 4602003E */ c.le.s $f0, $f2 -/* D980C8 80240838 00000000 */ nop +/* D980C8 80240838 00000000 */ nop /* D980CC 8024083C 4500000A */ bc1f .L80240868 /* D980D0 80240840 24040001 */ addiu $a0, $zero, 1 /* D980D4 80240844 3C014387 */ lui $at, 0x4387 /* D980D8 80240848 44810000 */ mtc1 $at, $f0 -/* D980DC 8024084C 00000000 */ nop +/* D980DC 8024084C 00000000 */ nop /* D980E0 80240850 4600103C */ c.lt.s $f2, $f0 -/* D980E4 80240854 00000000 */ nop +/* D980E4 80240854 00000000 */ nop /* D980E8 80240858 45000004 */ bc1f .L8024086C /* D980EC 8024085C 27A20018 */ addiu $v0, $sp, 0x18 /* D980F0 80240860 3C041000 */ lui $a0, 0x1000 diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802408A0_D98130.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802408A0_D98130.s index f981ff4a2c..1ea28f4148 100644 --- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802408A0_D98130.s +++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802408A0_D98130.s @@ -43,36 +43,36 @@ glabel func_802408A0_D98130 /* D981C4 80240934 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D981C8 80240938 3C0142B4 */ lui $at, 0x42b4 /* D981CC 8024093C 44810000 */ mtc1 $at, $f0 -/* D981D0 80240940 00000000 */ nop +/* D981D0 80240940 00000000 */ nop /* D981D4 80240944 4602003C */ c.lt.s $f0, $f2 -/* D981D8 80240948 00000000 */ nop +/* D981D8 80240948 00000000 */ nop /* D981DC 8024094C 4500000A */ bc1f .L80240978 -/* D981E0 80240950 00000000 */ nop +/* D981E0 80240950 00000000 */ nop /* D981E4 80240954 3C014334 */ lui $at, 0x4334 /* D981E8 80240958 44812000 */ mtc1 $at, $f4 -/* D981EC 8024095C 00000000 */ nop +/* D981EC 8024095C 00000000 */ nop /* D981F0 80240960 4604103E */ c.le.s $f2, $f4 -/* D981F4 80240964 00000000 */ nop +/* D981F4 80240964 00000000 */ nop /* D981F8 80240968 45000003 */ bc1f .L80240978 -/* D981FC 8024096C 00000000 */ nop +/* D981FC 8024096C 00000000 */ nop /* D98200 80240970 08090282 */ j .L80240A08 /* D98204 80240974 46022501 */ sub.s $f20, $f4, $f2 .L80240978: /* D98208 80240978 C62000A8 */ lwc1 $f0, 0xa8($s1) /* D9820C 8024097C 3C014334 */ lui $at, 0x4334 /* D98210 80240980 44812000 */ mtc1 $at, $f4 -/* D98214 80240984 00000000 */ nop +/* D98214 80240984 00000000 */ nop /* D98218 80240988 4600203C */ c.lt.s $f4, $f0 -/* D9821C 8024098C 00000000 */ nop +/* D9821C 8024098C 00000000 */ nop /* D98220 80240990 4500000C */ bc1f .L802409C4 -/* D98224 80240994 00000000 */ nop +/* D98224 80240994 00000000 */ nop /* D98228 80240998 3C014387 */ lui $at, 0x4387 /* D9822C 8024099C 44812000 */ mtc1 $at, $f4 -/* D98230 802409A0 00000000 */ nop +/* D98230 802409A0 00000000 */ nop /* D98234 802409A4 4604003E */ c.le.s $f0, $f4 -/* D98238 802409A8 00000000 */ nop +/* D98238 802409A8 00000000 */ nop /* D9823C 802409AC 45000008 */ bc1f .L802409D0 -/* D98240 802409B0 00000000 */ nop +/* D98240 802409B0 00000000 */ nop /* D98244 802409B4 3C014334 */ lui $at, 0x4334 /* D98248 802409B8 44812000 */ mtc1 $at, $f4 /* D9824C 802409BC 08090282 */ j .L80240A08 @@ -80,19 +80,19 @@ glabel func_802408A0_D98130 .L802409C4: /* D98254 802409C4 3C014387 */ lui $at, 0x4387 /* D98258 802409C8 44812000 */ mtc1 $at, $f4 -/* D9825C 802409CC 00000000 */ nop +/* D9825C 802409CC 00000000 */ nop .L802409D0: /* D98260 802409D0 4600203C */ c.lt.s $f4, $f0 -/* D98264 802409D4 00000000 */ nop +/* D98264 802409D4 00000000 */ nop /* D98268 802409D8 4500000A */ bc1f .L80240A04 -/* D9826C 802409DC 00000000 */ nop +/* D9826C 802409DC 00000000 */ nop /* D98270 802409E0 3C0143B4 */ lui $at, 0x43b4 /* D98274 802409E4 44811000 */ mtc1 $at, $f2 -/* D98278 802409E8 00000000 */ nop +/* D98278 802409E8 00000000 */ nop /* D9827C 802409EC 4602003E */ c.le.s $f0, $f2 -/* D98280 802409F0 00000000 */ nop +/* D98280 802409F0 00000000 */ nop /* D98284 802409F4 45000003 */ bc1f .L80240A04 -/* D98288 802409F8 00000000 */ nop +/* D98288 802409F8 00000000 */ nop /* D9828C 802409FC 08090282 */ j .L80240A08 /* D98290 80240A00 46001501 */ sub.s $f20, $f2, $f0 .L80240A04: @@ -100,11 +100,11 @@ glabel func_802408A0_D98130 .L80240A08: /* D98298 80240A08 3C0141C8 */ lui $at, 0x41c8 /* D9829C 80240A0C 44810000 */ mtc1 $at, $f0 -/* D982A0 80240A10 00000000 */ nop +/* D982A0 80240A10 00000000 */ nop /* D982A4 80240A14 4600A003 */ div.s $f0, $f20, $f0 /* D982A8 80240A18 4600010D */ trunc.w.s $f4, $f0 /* D982AC 80240A1C 44072000 */ mfc1 $a3, $f4 -/* D982B0 80240A20 00000000 */ nop +/* D982B0 80240A20 00000000 */ nop /* D982B4 80240A24 00071100 */ sll $v0, $a3, 4 /* D982B8 80240A28 00471023 */ subu $v0, $v0, $a3 /* D982BC 80240A2C 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel func_802408A0_D98130 /* D98304 80240A74 E7B60010 */ swc1 $f22, 0x10($sp) /* D98308 80240A78 C62C008C */ lwc1 $f12, 0x8c($s1) /* D9830C 80240A7C 0C00A6C9 */ jal clamp_angle -/* D98310 80240A80 00000000 */ nop +/* D98310 80240A80 00000000 */ nop /* D98314 80240A84 44050000 */ mfc1 $a1, $f0 /* D98318 80240A88 4406B000 */ mfc1 $a2, $f22 /* D9831C 80240A8C 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel func_802408A0_D98130 /* D98380 80240AF0 24040001 */ addiu $a0, $zero, 1 .L80240AF4: /* D98384 80240AF4 4486D000 */ mtc1 $a2, $f26 -/* D98388 80240AF8 00000000 */ nop +/* D98388 80240AF8 00000000 */ nop /* D9838C 80240AFC 4680D6A0 */ cvt.s.w $f26, $f26 /* D98390 80240B00 24040001 */ addiu $a0, $zero, 1 .L80240B04: @@ -204,10 +204,10 @@ glabel func_802408A0_D98130 /* D98420 80240B90 44812000 */ mtc1 $at, $f4 /* D98424 80240B94 00021023 */ negu $v0, $v0 /* D98428 80240B98 44820000 */ mtc1 $v0, $f0 -/* D9842C 80240B9C 00000000 */ nop +/* D9842C 80240B9C 00000000 */ nop /* D98430 80240BA0 46800020 */ cvt.s.w $f0, $f0 /* D98434 80240BA4 46040102 */ mul.s $f4, $f0, $f4 -/* D98438 80240BA8 00000000 */ nop +/* D98438 80240BA8 00000000 */ nop /* D9843C 80240BAC 4405B000 */ mfc1 $a1, $f22 /* D98440 80240BB0 4407B000 */ mfc1 $a3, $f22 /* D98444 80240BB4 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel func_802408A0_D98130 /* D984B4 80240C24 3C013F00 */ lui $at, 0x3f00 /* D984B8 80240C28 44812000 */ mtc1 $at, $f4 /* D984BC 80240C2C 44820000 */ mtc1 $v0, $f0 -/* D984C0 80240C30 00000000 */ nop +/* D984C0 80240C30 00000000 */ nop /* D984C4 80240C34 46800020 */ cvt.s.w $f0, $f0 /* D984C8 80240C38 46040102 */ mul.s $f4, $f0, $f4 -/* D984CC 80240C3C 00000000 */ nop +/* D984CC 80240C3C 00000000 */ nop /* D984D0 80240C40 4405B000 */ mfc1 $a1, $f22 /* D984D4 80240C44 4407B000 */ mfc1 $a3, $f22 /* D984D8 80240C48 44062000 */ mfc1 $a2, $f4 @@ -280,16 +280,16 @@ glabel func_802408A0_D98130 /* D98550 80240CC0 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D98554 80240CC4 3C0142B4 */ lui $at, 0x42b4 /* D98558 80240CC8 44810000 */ mtc1 $at, $f0 -/* D9855C 80240CCC 00000000 */ nop +/* D9855C 80240CCC 00000000 */ nop /* D98560 80240CD0 4602003E */ c.le.s $f0, $f2 -/* D98564 80240CD4 00000000 */ nop +/* D98564 80240CD4 00000000 */ nop /* D98568 80240CD8 4500000A */ bc1f .L80240D04 /* D9856C 80240CDC 24040001 */ addiu $a0, $zero, 1 /* D98570 80240CE0 3C014387 */ lui $at, 0x4387 /* D98574 80240CE4 44812000 */ mtc1 $at, $f4 -/* D98578 80240CE8 00000000 */ nop +/* D98578 80240CE8 00000000 */ nop /* D9857C 80240CEC 4604103C */ c.lt.s $f2, $f4 -/* D98580 80240CF0 00000000 */ nop +/* D98580 80240CF0 00000000 */ nop /* D98584 80240CF4 45000004 */ bc1f .L80240D08 /* D98588 80240CF8 27A20020 */ addiu $v0, $sp, 0x20 /* D9858C 80240CFC 3C041000 */ lui $a0, 0x1000 @@ -305,7 +305,7 @@ glabel func_802408A0_D98130 /* D985AC 80240D1C 26730001 */ addiu $s3, $s3, 1 /* D985B0 80240D20 2A620002 */ slti $v0, $s3, 2 /* D985B4 80240D24 1440FEF6 */ bnez $v0, .L80240900 -/* D985B8 80240D28 00000000 */ nop +/* D985B8 80240D28 00000000 */ nop /* D985BC 80240D2C 8FBF014C */ lw $ra, 0x14c($sp) /* D985C0 80240D30 8FB60148 */ lw $s6, 0x148($sp) /* D985C4 80240D34 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240D6C_D985FC.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240D6C_D985FC.s index 723c17feb3..10b7ee8705 100644 --- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240D6C_D985FC.s +++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240D6C_D985FC.s @@ -11,36 +11,36 @@ glabel func_80240D6C_D985FC /* D98614 80240D84 24020001 */ addiu $v0, $zero, 1 /* D98618 80240D88 8E030084 */ lw $v1, 0x84($s0) /* D9861C 80240D8C 1062001A */ beq $v1, $v0, .L80240DF8 -/* D98620 80240D90 00000000 */ nop +/* D98620 80240D90 00000000 */ nop /* D98624 80240D94 28620002 */ slti $v0, $v1, 2 /* D98628 80240D98 50400005 */ beql $v0, $zero, .L80240DB0 /* D9862C 80240D9C 24020002 */ addiu $v0, $zero, 2 /* D98630 80240DA0 10600007 */ beqz $v1, .L80240DC0 -/* D98634 80240DA4 00000000 */ nop +/* D98634 80240DA4 00000000 */ nop /* D98638 80240DA8 08090384 */ j .L80240E10 -/* D9863C 80240DAC 00000000 */ nop +/* D9863C 80240DAC 00000000 */ nop .L80240DB0: /* D98640 80240DB0 10620007 */ beq $v1, $v0, .L80240DD0 -/* D98644 80240DB4 00000000 */ nop +/* D98644 80240DB4 00000000 */ nop /* D98648 80240DB8 08090384 */ j .L80240E10 -/* D9864C 80240DBC 00000000 */ nop +/* D9864C 80240DBC 00000000 */ nop .L80240DC0: /* D98650 80240DC0 3C048024 */ lui $a0, %hi(pra_39_SetPartnerFlagsA0000) /* D98654 80240DC4 24840EB4 */ addiu $a0, $a0, %lo(pra_39_SetPartnerFlagsA0000) /* D98658 80240DC8 08090380 */ j .L80240E00 -/* D9865C 80240DCC 00000000 */ nop +/* D9865C 80240DCC 00000000 */ nop .L80240DD0: /* D98660 80240DD0 3C048024 */ lui $a0, %hi(pra_39_SetPartnerFlags20000) /* D98664 80240DD4 24840F1C */ addiu $a0, $a0, %lo(pra_39_SetPartnerFlags20000) /* D98668 80240DD8 08090380 */ j .L80240E00 -/* D9866C 80240DDC 00000000 */ nop +/* D9866C 80240DDC 00000000 */ nop .L80240DE0: /* D98670 80240DE0 8E020084 */ lw $v0, 0x84($s0) /* D98674 80240DE4 0440000A */ bltz $v0, .L80240E10 -/* D98678 80240DE8 00000000 */ nop +/* D98678 80240DE8 00000000 */ nop /* D9867C 80240DEC 28420002 */ slti $v0, $v0, 2 /* D98680 80240DF0 10400007 */ beqz $v0, .L80240E10 -/* D98684 80240DF4 00000000 */ nop +/* D98684 80240DF4 00000000 */ nop .L80240DF8: /* D98688 80240DF8 3C048024 */ lui $a0, %hi(pra_39_SetPartnerFlags80000) /* D9868C 80240DFC 24840EE8 */ addiu $a0, $a0, %lo(pra_39_SetPartnerFlags80000) @@ -64,14 +64,14 @@ glabel func_80240D6C_D985FC /* D986CC 80240E3C 10400005 */ beqz $v0, .L80240E54 /* D986D0 80240E40 24020002 */ addiu $v0, $zero, 2 /* D986D4 80240E44 10800007 */ beqz $a0, .L80240E64 -/* D986D8 80240E48 00000000 */ nop +/* D986D8 80240E48 00000000 */ nop /* D986DC 80240E4C 080903A9 */ j .L80240EA4 -/* D986E0 80240E50 00000000 */ nop +/* D986E0 80240E50 00000000 */ nop .L80240E54: /* D986E4 80240E54 10820006 */ beq $a0, $v0, .L80240E70 /* D986E8 80240E58 24020002 */ addiu $v0, $zero, 2 /* D986EC 80240E5C 080903A9 */ j .L80240EA4 -/* D986F0 80240E60 00000000 */ nop +/* D986F0 80240E60 00000000 */ nop .L80240E64: /* D986F4 80240E64 8CA20000 */ lw $v0, ($a1) /* D986F8 80240E68 080903A6 */ j .L80240E98 diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240F50_D987E0.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240F50_D987E0.s index 2f82030f15..f58c92c0fd 100644 --- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240F50_D987E0.s +++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240F50_D987E0.s @@ -75,7 +75,7 @@ glabel func_80240F50_D987E0 /* D988F4 80241064 8E4300B0 */ lw $v1, 0xb0($s2) /* D988F8 80241068 30620004 */ andi $v0, $v1, 4 /* D988FC 8024106C 10400007 */ beqz $v0, .L8024108C -/* D98900 80241070 00000000 */ nop +/* D98900 80241070 00000000 */ nop /* D98904 80241074 824200B4 */ lb $v0, 0xb4($s2) /* D98908 80241078 1440018D */ bnez $v0, .L802416B0 /* D9890C 8024107C 0000102D */ daddu $v0, $zero, $zero @@ -87,11 +87,12 @@ glabel func_80240F50_D987E0 /* D98920 80241090 2C620010 */ sltiu $v0, $v1, 0x10 /* D98924 80241094 10400185 */ beqz $v0, .L802416AC /* D98928 80241098 00031080 */ sll $v0, $v1, 2 -/* D9892C 8024109C 3C018024 */ lui $at, %hi(D_802420D0) +/* D9892C 8024109C 3C018024 */ lui $at, %hi(jtbl_802420D0_D99960) /* D98930 802410A0 00220821 */ addu $at, $at, $v0 -/* D98934 802410A4 8C2220D0 */ lw $v0, %lo(D_802420D0)($at) +/* D98934 802410A4 8C2220D0 */ lw $v0, %lo(jtbl_802420D0_D99960)($at) /* D98938 802410A8 00400008 */ jr $v0 -/* D9893C 802410AC 00000000 */ nop +/* D9893C 802410AC 00000000 */ nop +glabel L802410B0_D98940 /* D98940 802410B0 8E4200CC */ lw $v0, 0xcc($s2) /* D98944 802410B4 922300A9 */ lbu $v1, 0xa9($s1) /* D98948 802410B8 8C440000 */ lw $a0, ($v0) @@ -103,9 +104,10 @@ glabel func_80240F50_D987E0 /* D98960 802410D0 AE240028 */ sw $a0, 0x28($s1) /* D98964 802410D4 AE600074 */ sw $zero, 0x74($s3) /* D98968 802410D8 AE620070 */ sw $v0, 0x70($s3) +glabel L802410DC_D9896C /* D9896C 802410DC 8E830014 */ lw $v1, 0x14($s4) /* D98970 802410E0 04600015 */ bltz $v1, .L80241138 -/* D98974 802410E4 00000000 */ nop +/* D98974 802410E4 00000000 */ nop /* D98978 802410E8 8E620074 */ lw $v0, 0x74($s3) /* D9897C 802410EC 1C400011 */ bgtz $v0, .L80241134 /* D98980 802410F0 2442FFFF */ addiu $v0, $v0, -1 @@ -133,6 +135,7 @@ glabel func_80240F50_D987E0 /* D989CC 8024113C 2402000A */ addiu $v0, $zero, 0xa /* D989D0 80241140 1462015B */ bne $v1, $v0, .L802416B0 /* D989D4 80241144 0000102D */ daddu $v0, $zero, $zero +glabel L80241148_D989D8 /* D989D8 80241148 C62C0038 */ lwc1 $f12, 0x38($s1) /* D989DC 8024114C 8E4200CC */ lw $v0, 0xcc($s2) /* D989E0 80241150 C62E0040 */ lwc1 $f14, 0x40($s1) @@ -166,7 +169,7 @@ glabel func_80240F50_D987E0 /* D98A50 802411C0 0C0372DF */ jal func_800DCB7C /* D98A54 802411C4 27A70048 */ addiu $a3, $sp, 0x48 /* D98A58 802411C8 10400010 */ beqz $v0, .L8024120C -/* D98A5C 802411CC 00000000 */ nop +/* D98A5C 802411CC 00000000 */ nop /* D98A60 802411D0 C620003C */ lwc1 $f0, 0x3c($s1) /* D98A64 802411D4 C6440070 */ lwc1 $f4, 0x70($s2) /* D98A68 802411D8 46802120 */ cvt.s.w $f4, $f4 @@ -175,7 +178,7 @@ glabel func_80240F50_D987E0 /* D98A74 802411E4 D4222110 */ ldc1 $f2, %lo(func_80242110_D21FA0)($at) /* D98A78 802411E8 46000021 */ cvt.d.s $f0, $f0 /* D98A7C 802411EC 46220002 */ mul.d $f0, $f0, $f2 -/* D98A80 802411F0 00000000 */ nop +/* D98A80 802411F0 00000000 */ nop /* D98A84 802411F4 460020A1 */ cvt.d.s $f2, $f4 /* D98A88 802411F8 46201080 */ add.d $f2, $f2, $f0 /* D98A8C 802411FC E7A40044 */ swc1 $f4, 0x44($sp) @@ -190,7 +193,7 @@ glabel func_80240F50_D987E0 /* D98AAC 8024121C D4242118 */ ldc1 $f4, %lo(D_80242118)($at) /* D98AB0 80241220 460010A1 */ cvt.d.s $f2, $f2 /* D98AB4 80241224 46241082 */ mul.d $f2, $f2, $f4 -/* D98AB8 80241228 00000000 */ nop +/* D98AB8 80241228 00000000 */ nop /* D98ABC 8024122C 46000021 */ cvt.d.s $f0, $f0 /* D98AC0 80241230 46220000 */ add.d $f0, $f0, $f2 /* D98AC4 80241234 46200020 */ cvt.s.d $f0, $f0 @@ -200,12 +203,13 @@ glabel func_80240F50_D987E0 /* D98AD0 80241240 2402000B */ addiu $v0, $zero, 0xb /* D98AD4 80241244 E6200068 */ swc1 $f0, 0x68($s1) /* D98AD8 80241248 AE620070 */ sw $v0, 0x70($s3) +glabel L8024124C_D98ADC /* D98ADC 8024124C C6200018 */ lwc1 $f0, 0x18($s1) /* D98AE0 80241250 44801000 */ mtc1 $zero, $f2 /* D98AE4 80241254 44801800 */ mtc1 $zero, $f3 /* D98AE8 80241258 46000021 */ cvt.d.s $f0, $f0 /* D98AEC 8024125C 4620103C */ c.lt.d $f2, $f0 -/* D98AF0 80241260 00000000 */ nop +/* D98AF0 80241260 00000000 */ nop /* D98AF4 80241264 45000025 */ bc1f .L802412FC /* D98AF8 80241268 27A50040 */ addiu $a1, $sp, 0x40 /* D98AFC 8024126C C6200038 */ lwc1 $f0, 0x38($s1) @@ -220,13 +224,13 @@ glabel func_80240F50_D987E0 /* D98B20 80241290 E7A00014 */ swc1 $f0, 0x14($sp) /* D98B24 80241294 862200A8 */ lh $v0, 0xa8($s1) /* D98B28 80241298 44820000 */ mtc1 $v0, $f0 -/* D98B2C 8024129C 00000000 */ nop +/* D98B2C 8024129C 00000000 */ nop /* D98B30 802412A0 46800020 */ cvt.s.w $f0, $f0 /* D98B34 802412A4 E7A00018 */ swc1 $f0, 0x18($sp) /* D98B38 802412A8 862200A6 */ lh $v0, 0xa6($s1) /* D98B3C 802412AC 27A60044 */ addiu $a2, $sp, 0x44 /* D98B40 802412B0 44820000 */ mtc1 $v0, $f0 -/* D98B44 802412B4 00000000 */ nop +/* D98B44 802412B4 00000000 */ nop /* D98B48 802412B8 46800020 */ cvt.s.w $f0, $f0 /* D98B4C 802412BC E7A0001C */ swc1 $f0, 0x1c($sp) /* D98B50 802412C0 8E240080 */ lw $a0, 0x80($s1) @@ -254,12 +258,13 @@ glabel func_80240F50_D987E0 /* D98BA0 80241310 46001080 */ add.s $f2, $f2, $f0 /* D98BA4 80241314 E620001C */ swc1 $f0, 0x1c($s1) /* D98BA8 80241318 4604103C */ c.lt.s $f2, $f4 -/* D98BAC 8024131C 00000000 */ nop +/* D98BAC 8024131C 00000000 */ nop /* D98BB0 80241320 450000E2 */ bc1f .L802416AC /* D98BB4 80241324 E622003C */ swc1 $f2, 0x3c($s1) /* D98BB8 80241328 2402000C */ addiu $v0, $zero, 0xc /* D98BBC 8024132C E624003C */ swc1 $f4, 0x3c($s1) /* D98BC0 80241330 AE620070 */ sw $v0, 0x70($s3) +glabel L80241334_D98BC4 /* D98BC4 80241334 C62C0038 */ lwc1 $f12, 0x38($s1) /* D98BC8 80241338 C62E0040 */ lwc1 $f14, 0x40($s1) /* D98BCC 8024133C 8EA60028 */ lw $a2, 0x28($s5) @@ -267,9 +272,9 @@ glabel func_80240F50_D987E0 /* D98BD4 80241344 8EA70030 */ lw $a3, 0x30($s5) /* D98BD8 80241348 3C014270 */ lui $at, 0x4270 /* D98BDC 8024134C 44811000 */ mtc1 $at, $f2 -/* D98BE0 80241350 00000000 */ nop +/* D98BE0 80241350 00000000 */ nop /* D98BE4 80241354 4602003C */ c.lt.s $f0, $f2 -/* D98BE8 80241358 00000000 */ nop +/* D98BE8 80241358 00000000 */ nop /* D98BEC 8024135C 45000002 */ bc1f .L80241368 /* D98BF0 80241360 E6200010 */ swc1 $f0, 0x10($s1) /* D98BF4 80241364 E6220010 */ swc1 $f2, 0x10($s1) @@ -288,7 +293,7 @@ glabel func_80240F50_D987E0 /* D98C24 80241394 C622003C */ lwc1 $f2, 0x3c($s1) /* D98C28 80241398 4600228D */ trunc.w.s $f10, $f4 /* D98C2C 8024139C 44025000 */ mfc1 $v0, $f10 -/* D98C30 802413A0 00000000 */ nop +/* D98C30 802413A0 00000000 */ nop /* D98C34 802413A4 A622008E */ sh $v0, 0x8e($s1) /* D98C38 802413A8 460010A1 */ cvt.d.s $f2, $f2 /* D98C3C 802413AC 46220001 */ sub.d $f0, $f0, $f2 @@ -302,11 +307,11 @@ glabel func_80240F50_D987E0 /* D98C58 802413C8 8622008E */ lh $v0, 0x8e($s1) /* D98C5C 802413CC C620001C */ lwc1 $f0, 0x1c($s1) /* D98C60 802413D0 44821000 */ mtc1 $v0, $f2 -/* D98C64 802413D4 00000000 */ nop +/* D98C64 802413D4 00000000 */ nop /* D98C68 802413D8 468010A0 */ cvt.s.w $f2, $f2 /* D98C6C 802413DC 46000007 */ neg.s $f0, $f0 /* D98C70 802413E0 46020002 */ mul.s $f0, $f0, $f2 -/* D98C74 802413E4 00000000 */ nop +/* D98C74 802413E4 00000000 */ nop /* D98C78 802413E8 00420018 */ mult $v0, $v0 /* D98C7C 802413EC 8E230000 */ lw $v1, ($s1) /* D98C80 802413F0 46040000 */ add.s $f0, $f0, $f4 @@ -318,7 +323,7 @@ glabel func_80240F50_D987E0 /* D98C98 80241408 46000000 */ add.s $f0, $f0, $f0 /* D98C9C 8024140C AE230000 */ sw $v1, ($s1) /* D98CA0 80241410 44881000 */ mtc1 $t0, $f2 -/* D98CA4 80241414 00000000 */ nop +/* D98CA4 80241414 00000000 */ nop /* D98CA8 80241418 468010A0 */ cvt.s.w $f2, $f2 /* D98CAC 8024141C 46000007 */ neg.s $f0, $f0 /* D98CB0 80241420 46020003 */ div.s $f0, $f0, $f2 @@ -329,13 +334,14 @@ glabel func_80240F50_D987E0 /* D98CC4 80241434 2402000D */ addiu $v0, $zero, 0xd /* D98CC8 80241438 A620008E */ sh $zero, 0x8e($s1) /* D98CCC 8024143C AE620070 */ sw $v0, 0x70($s3) +glabel L80241440_D98CD0 /* D98CD0 80241440 C620001C */ lwc1 $f0, 0x1c($s1) /* D98CD4 80241444 C6220014 */ lwc1 $f2, 0x14($s1) /* D98CD8 80241448 46020001 */ sub.s $f0, $f0, $f2 /* D98CDC 8024144C 4480A000 */ mtc1 $zero, $f20 -/* D98CE0 80241450 00000000 */ nop +/* D98CE0 80241450 00000000 */ nop /* D98CE4 80241454 4614003C */ c.lt.s $f0, $f20 -/* D98CE8 80241458 00000000 */ nop +/* D98CE8 80241458 00000000 */ nop /* D98CEC 8024145C 45000012 */ bc1f .L802414A8 /* D98CF0 80241460 E620001C */ swc1 $f0, 0x1c($s1) /* D98CF4 80241464 27A50040 */ addiu $a1, $sp, 0x40 @@ -364,7 +370,7 @@ glabel func_80240F50_D987E0 /* D98D4C 802414BC 44801800 */ mtc1 $zero, $f3 /* D98D50 802414C0 46000021 */ cvt.d.s $f0, $f0 /* D98D54 802414C4 4620103C */ c.lt.d $f2, $f0 -/* D98D58 802414C8 00000000 */ nop +/* D98D58 802414C8 00000000 */ nop /* D98D5C 802414CC 45000057 */ bc1f .L8024162C /* D98D60 802414D0 E624003C */ swc1 $f4, 0x3c($s1) /* D98D64 802414D4 46002086 */ mov.s $f2, $f4 @@ -380,20 +386,20 @@ glabel func_80240F50_D987E0 /* D98D8C 802414FC 862200A8 */ lh $v0, 0xa8($s1) /* D98D90 80241500 27A50040 */ addiu $a1, $sp, 0x40 /* D98D94 80241504 44820000 */ mtc1 $v0, $f0 -/* D98D98 80241508 00000000 */ nop +/* D98D98 80241508 00000000 */ nop /* D98D9C 8024150C 46800020 */ cvt.s.w $f0, $f0 /* D98DA0 80241510 E7A00018 */ swc1 $f0, 0x18($sp) /* D98DA4 80241514 862200A6 */ lh $v0, 0xa6($s1) /* D98DA8 80241518 27A60044 */ addiu $a2, $sp, 0x44 /* D98DAC 8024151C 44820000 */ mtc1 $v0, $f0 -/* D98DB0 80241520 00000000 */ nop +/* D98DB0 80241520 00000000 */ nop /* D98DB4 80241524 46800020 */ cvt.s.w $f0, $f0 /* D98DB8 80241528 E7A0001C */ swc1 $f0, 0x1c($sp) /* D98DBC 8024152C 8E240080 */ lw $a0, 0x80($s1) /* D98DC0 80241530 0C037711 */ jal func_800DDC44 /* D98DC4 80241534 27A70048 */ addiu $a3, $sp, 0x48 /* D98DC8 80241538 10400003 */ beqz $v0, .L80241548 -/* D98DCC 8024153C 00000000 */ nop +/* D98DCC 8024153C 00000000 */ nop /* D98DD0 80241540 08090587 */ j .L8024161C /* D98DD4 80241544 AE200018 */ sw $zero, 0x18($s1) .L80241548: @@ -403,9 +409,9 @@ glabel func_80240F50_D987E0 /* D98DE4 80241554 44801000 */ mtc1 $zero, $f2 /* D98DE8 80241558 46000021 */ cvt.d.s $f0, $f0 /* D98DEC 8024155C 4622003C */ c.lt.d $f0, $f2 -/* D98DF0 80241560 00000000 */ nop +/* D98DF0 80241560 00000000 */ nop /* D98DF4 80241564 4500002D */ bc1f .L8024161C -/* D98DF8 80241568 00000000 */ nop +/* D98DF8 80241568 00000000 */ nop /* D98DFC 8024156C 9622008E */ lhu $v0, 0x8e($s1) /* D98E00 80241570 24420001 */ addiu $v0, $v0, 1 /* D98E04 80241574 A622008E */ sh $v0, 0x8e($s1) @@ -414,7 +420,7 @@ glabel func_80240F50_D987E0 /* D98E10 80241580 00021403 */ sra $v0, $v0, 0x10 /* D98E14 80241584 0043102A */ slt $v0, $v0, $v1 /* D98E18 80241588 14400024 */ bnez $v0, .L8024161C -/* D98E1C 8024158C 00000000 */ nop +/* D98E1C 8024158C 00000000 */ nop /* D98E20 80241590 C62C0038 */ lwc1 $f12, 0x38($s1) /* D98E24 80241594 C62E0040 */ lwc1 $f14, 0x40($s1) /* D98E28 80241598 8EA60028 */ lw $a2, 0x28($s5) @@ -428,20 +434,20 @@ glabel func_80240F50_D987E0 /* D98E48 802415B8 8E82001C */ lw $v0, 0x1c($s4) /* D98E4C 802415BC 46001005 */ abs.s $f0, $f2 /* D98E50 802415C0 44822000 */ mtc1 $v0, $f4 -/* D98E54 802415C4 00000000 */ nop +/* D98E54 802415C4 00000000 */ nop /* D98E58 802415C8 46802120 */ cvt.s.w $f4, $f4 /* D98E5C 802415CC 4600203C */ c.lt.s $f4, $f0 -/* D98E60 802415D0 00000000 */ nop +/* D98E60 802415D0 00000000 */ nop /* D98E64 802415D4 4500000D */ bc1f .L8024160C -/* D98E68 802415D8 00000000 */ nop +/* D98E68 802415D8 00000000 */ nop /* D98E6C 802415DC 44800000 */ mtc1 $zero, $f0 /* D98E70 802415E0 C634000C */ lwc1 $f20, 0xc($s1) /* D98E74 802415E4 4600103C */ c.lt.s $f2, $f0 -/* D98E78 802415E8 00000000 */ nop +/* D98E78 802415E8 00000000 */ nop /* D98E7C 802415EC 45000006 */ bc1f .L80241608 /* D98E80 802415F0 00021023 */ negu $v0, $v0 /* D98E84 802415F4 44820000 */ mtc1 $v0, $f0 -/* D98E88 802415F8 00000000 */ nop +/* D98E88 802415F8 00000000 */ nop /* D98E8C 802415FC 46800020 */ cvt.s.w $f0, $f0 /* D98E90 80241600 08090583 */ j .L8024160C /* D98E94 80241604 4600A500 */ add.s $f20, $f20, $f0 @@ -468,11 +474,12 @@ glabel func_80240F50_D987E0 /* D98ED4 80241644 C620003C */ lwc1 $f0, 0x3c($s1) /* D98ED8 80241648 C6220068 */ lwc1 $f2, 0x68($s1) /* D98EDC 8024164C 4600103C */ c.lt.s $f2, $f0 -/* D98EE0 80241650 00000000 */ nop +/* D98EE0 80241650 00000000 */ nop /* D98EE4 80241654 45000015 */ bc1f .L802416AC /* D98EE8 80241658 2402000E */ addiu $v0, $zero, 0xe /* D98EEC 8024165C E622003C */ swc1 $f2, 0x3c($s1) /* D98EF0 80241660 AE620070 */ sw $v0, 0x70($s3) +glabel L80241664_D98EF4 /* D98EF4 80241664 8E4200CC */ lw $v0, 0xcc($s2) /* D98EF8 80241668 922300A9 */ lbu $v1, 0xa9($s1) /* D98EFC 8024166C 8C440020 */ lw $a0, 0x20($v0) @@ -485,6 +492,7 @@ glabel func_80240F50_D987E0 /* D98F18 80241688 2402000F */ addiu $v0, $zero, 0xf /* D98F1C 8024168C AE240028 */ sw $a0, 0x28($s1) /* D98F20 80241690 AE620070 */ sw $v0, 0x70($s3) +glabel L80241694_D98F24 /* D98F24 80241694 9622008E */ lhu $v0, 0x8e($s1) /* D98F28 80241698 2442FFFF */ addiu $v0, $v0, -1 /* D98F2C 8024169C A622008E */ sh $v0, 0x8e($s1) @@ -492,6 +500,7 @@ glabel func_80240F50_D987E0 /* D98F34 802416A4 58400001 */ blezl $v0, .L802416AC /* D98F38 802416A8 AE600070 */ sw $zero, 0x70($s3) .L802416AC: +glabel L802416AC_D98F3C /* D98F3C 802416AC 0000102D */ daddu $v0, $zero, $zero .L802416B0: /* D98F40 802416B0 8FBF006C */ lw $ra, 0x6c($sp) @@ -505,4 +514,4 @@ glabel func_80240F50_D987E0 /* D98F60 802416D0 D7B40070 */ ldc1 $f20, 0x70($sp) /* D98F64 802416D4 03E00008 */ jr $ra /* D98F68 802416D8 27BD0078 */ addiu $sp, $sp, 0x78 -/* D98F6C 802416DC 00000000 */ nop +/* D98F6C 802416DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240054_D99A04.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240054_D99A04.s index fb3432309e..83b0e636a2 100644 --- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240054_D99A04.s +++ b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240054_D99A04.s @@ -40,7 +40,7 @@ glabel func_80240054_D99A04 /* D99A80 802400D0 1440FFF7 */ bnez $v0, .L802400B0 /* D99A84 802400D4 24820001 */ addiu $v0, $a0, 1 /* D99A88 802400D8 03E00008 */ jr $ra -/* D99A8C 802400DC 00000000 */ nop +/* D99A8C 802400DC 00000000 */ nop .L802400E0: /* D99A90 802400E0 3C020100 */ lui $v0, 0x100 .L802400E4: diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s index 2755afbe4d..d9c20856a9 100644 --- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s +++ b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s @@ -16,7 +16,7 @@ glabel func_80240128_D99AD8 /* D99B04 80240154 27B20020 */ addiu $s2, $sp, 0x20 /* D99B08 80240158 8E0400CC */ lw $a0, 0xcc($s0) /* D99B0C 8024015C 0C044181 */ jal get_shadow_by_index -/* D99B10 80240160 00000000 */ nop +/* D99B10 80240160 00000000 */ nop /* D99B14 80240164 0C048B77 */ jal func_80122DDC /* D99B18 80240168 84440008 */ lh $a0, 8($v0) /* D99B1C 8024016C 8C430000 */ lw $v1, ($v0) @@ -38,22 +38,22 @@ glabel func_80240128_D99AD8 /* D99B5C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D99B60 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) /* D99B64 802401B4 0C090008 */ jal pra_40_UnkFunc2 -/* D99B68 802401B8 00000000 */ nop +/* D99B68 802401B8 00000000 */ nop /* D99B6C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D99B70 802401C0 3C014307 */ lui $at, 0x4307 /* D99B74 802401C4 44810000 */ mtc1 $at, $f0 -/* D99B78 802401C8 00000000 */ nop +/* D99B78 802401C8 00000000 */ nop /* D99B7C 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D99B80 802401D0 00000000 */ nop +/* D99B80 802401D0 00000000 */ nop /* D99B84 802401D4 4500000B */ bc1f .L80240204 /* D99B88 802401D8 24040002 */ addiu $a0, $zero, 2 /* D99B8C 802401DC 3C014361 */ lui $at, 0x4361 /* D99B90 802401E0 44810000 */ mtc1 $at, $f0 -/* D99B94 802401E4 00000000 */ nop +/* D99B94 802401E4 00000000 */ nop /* D99B98 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D99B9C 802401EC 00000000 */ nop +/* D99B9C 802401EC 00000000 */ nop /* D99BA0 802401F0 45000004 */ bc1f .L80240204 -/* D99BA4 802401F4 00000000 */ nop +/* D99BA4 802401F4 00000000 */ nop /* D99BA8 802401F8 0C090015 */ jal func_80240054_D99A04 /* D99BAC 802401FC 0040202D */ daddu $a0, $v0, $zero /* D99BB0 80240200 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240128_D99AD8 /* D99C38 80240288 AFA0001C */ sw $zero, 0x1c($sp) .L8024028C: /* D99C3C 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D99C40 80240290 00000000 */ nop +/* D99C40 80240290 00000000 */ nop .L80240294: /* D99C44 80240294 9202000E */ lbu $v0, 0xe($s0) /* D99C48 80240298 3C01802E */ lui $at, %hi(D_802D9D70) diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_802402F0_D99CA0.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_802402F0_D99CA0.s index 6c1585927c..2e36124d85 100644 --- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_802402F0_D99CA0.s +++ b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_802402F0_D99CA0.s @@ -33,7 +33,7 @@ glabel func_802402F0_D99CA0 /* D99D10 80240360 E7B40010 */ swc1 $f20, 0x10($sp) /* D99D14 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) /* D99D18 80240368 0C00A6C9 */ jal clamp_angle -/* D99D1C 8024036C 00000000 */ nop +/* D99D1C 8024036C 00000000 */ nop /* D99D20 80240370 44050000 */ mfc1 $a1, $f0 /* D99D24 80240374 4406A000 */ mfc1 $a2, $f20 /* D99D28 80240378 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_8024049C_D99E4C.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_8024049C_D99E4C.s index f4e2a01c74..d138bc9bb9 100644 --- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_8024049C_D99E4C.s +++ b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_8024049C_D99E4C.s @@ -10,7 +10,7 @@ glabel func_8024049C_D99E4C /* D99E60 802404B0 0440000E */ bltz $v0, .L802404EC /* D99E64 802404B4 28420002 */ slti $v0, $v0, 2 /* D99E68 802404B8 1040000C */ beqz $v0, .L802404EC -/* D99E6C 802404BC 00000000 */ nop +/* D99E6C 802404BC 00000000 */ nop /* D99E70 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D99EB0) /* D99E74 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D99EB0) /* D99E78 802404C8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240500_D99EB0.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240500_D99EB0.s index a602c340e1..081bbc3210 100644 --- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240500_D99EB0.s +++ b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240500_D99EB0.s @@ -16,7 +16,7 @@ glabel func_80240500_D99EB0 /* D99EDC 8024052C 27B10020 */ addiu $s1, $sp, 0x20 /* D99EE0 80240530 8E0400CC */ lw $a0, 0xcc($s0) /* D99EE4 80240534 0C044181 */ jal get_shadow_by_index -/* D99EE8 80240538 00000000 */ nop +/* D99EE8 80240538 00000000 */ nop /* D99EEC 8024053C 0C048B77 */ jal func_80122DDC /* D99EF0 80240540 84440008 */ lh $a0, 8($v0) /* D99EF4 80240544 8E050028 */ lw $a1, 0x28($s0) @@ -33,7 +33,7 @@ glabel func_80240500_D99EB0 /* D99F20 80240570 46000007 */ neg.s $f0, $f0 /* D99F24 80240574 44060000 */ mfc1 $a2, $f0 /* D99F28 80240578 0C00B94E */ jal get_screen_coords -/* D99F2C 8024057C 00000000 */ nop +/* D99F2C 8024057C 00000000 */ nop /* D99F30 80240580 8E0500A4 */ lw $a1, 0xa4($s0) /* D99F34 80240584 3C063F80 */ lui $a2, 0x3f80 /* D99F38 80240588 0C0B76A3 */ jal func_802DDA8C @@ -72,13 +72,13 @@ glabel func_80240500_D99EB0 /* D99FB8 80240608 AFA0001C */ sw $zero, 0x1c($sp) .L8024060C: /* D99FBC 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D99FC0 80240610 00000000 */ nop +/* D99FC0 80240610 00000000 */ nop .L80240614: /* D99FC4 80240614 9202000E */ lbu $v0, 0xe($s0) /* D99FC8 80240618 3C01802E */ lui $at, %hi(D_802D9D71) /* D99FCC 8024061C A0229D71 */ sb $v0, %lo(D_802D9D71)($at) /* D99FD0 80240620 0809018C */ j .L80240630 -/* D99FD4 80240624 00000000 */ nop +/* D99FD4 80240624 00000000 */ nop .L80240628: /* D99FD8 80240628 3C01802E */ lui $at, %hi(D_802D9D71) /* D99FDC 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_8024068C_D9A03C.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_8024068C_D9A03C.s index 4f3aefc3a0..68ed78102f 100644 --- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_8024068C_D9A03C.s +++ b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_8024068C_D9A03C.s @@ -33,7 +33,7 @@ glabel func_8024068C_D9A03C /* D9A0AC 802406FC E7B40010 */ swc1 $f20, 0x10($sp) /* D9A0B0 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) /* D9A0B4 80240704 0C00A6C9 */ jal clamp_angle -/* D9A0B8 80240708 00000000 */ nop +/* D9A0B8 80240708 00000000 */ nop /* D9A0BC 8024070C 44050000 */ mfc1 $a1, $f0 /* D9A0C0 80240710 4406A000 */ mfc1 $a2, $f20 /* D9A0C4 80240714 4407A000 */ mfc1 $a3, $f20 @@ -95,16 +95,16 @@ glabel func_8024068C_D9A03C /* D9A1A4 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D9A1A8 802407F8 3C0142B4 */ lui $at, 0x42b4 /* D9A1AC 802407FC 44810000 */ mtc1 $at, $f0 -/* D9A1B0 80240800 00000000 */ nop +/* D9A1B0 80240800 00000000 */ nop /* D9A1B4 80240804 4602003E */ c.le.s $f0, $f2 -/* D9A1B8 80240808 00000000 */ nop +/* D9A1B8 80240808 00000000 */ nop /* D9A1BC 8024080C 4500000A */ bc1f .L80240838 /* D9A1C0 80240810 24040001 */ addiu $a0, $zero, 1 /* D9A1C4 80240814 3C014387 */ lui $at, 0x4387 /* D9A1C8 80240818 44810000 */ mtc1 $at, $f0 -/* D9A1CC 8024081C 00000000 */ nop +/* D9A1CC 8024081C 00000000 */ nop /* D9A1D0 80240820 4600103C */ c.lt.s $f2, $f0 -/* D9A1D4 80240824 00000000 */ nop +/* D9A1D4 80240824 00000000 */ nop /* D9A1D8 80240828 45000004 */ bc1f .L8024083C /* D9A1DC 8024082C 27A20018 */ addiu $v0, $sp, 0x18 /* D9A1E0 80240830 3C041000 */ lui $a0, 0x1000 diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240870_D9A220.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240870_D9A220.s index 1222d2b0da..8026ea8c56 100644 --- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240870_D9A220.s +++ b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240870_D9A220.s @@ -43,36 +43,36 @@ glabel func_80240870_D9A220 /* D9A2B4 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D9A2B8 80240908 3C0142B4 */ lui $at, 0x42b4 /* D9A2BC 8024090C 44810000 */ mtc1 $at, $f0 -/* D9A2C0 80240910 00000000 */ nop +/* D9A2C0 80240910 00000000 */ nop /* D9A2C4 80240914 4602003C */ c.lt.s $f0, $f2 -/* D9A2C8 80240918 00000000 */ nop +/* D9A2C8 80240918 00000000 */ nop /* D9A2CC 8024091C 4500000A */ bc1f .L80240948 -/* D9A2D0 80240920 00000000 */ nop +/* D9A2D0 80240920 00000000 */ nop /* D9A2D4 80240924 3C014334 */ lui $at, 0x4334 /* D9A2D8 80240928 44812000 */ mtc1 $at, $f4 -/* D9A2DC 8024092C 00000000 */ nop +/* D9A2DC 8024092C 00000000 */ nop /* D9A2E0 80240930 4604103E */ c.le.s $f2, $f4 -/* D9A2E4 80240934 00000000 */ nop +/* D9A2E4 80240934 00000000 */ nop /* D9A2E8 80240938 45000003 */ bc1f .L80240948 -/* D9A2EC 8024093C 00000000 */ nop +/* D9A2EC 8024093C 00000000 */ nop /* D9A2F0 80240940 08090276 */ j .L802409D8 /* D9A2F4 80240944 46022501 */ sub.s $f20, $f4, $f2 .L80240948: /* D9A2F8 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) /* D9A2FC 8024094C 3C014334 */ lui $at, 0x4334 /* D9A300 80240950 44812000 */ mtc1 $at, $f4 -/* D9A304 80240954 00000000 */ nop +/* D9A304 80240954 00000000 */ nop /* D9A308 80240958 4600203C */ c.lt.s $f4, $f0 -/* D9A30C 8024095C 00000000 */ nop +/* D9A30C 8024095C 00000000 */ nop /* D9A310 80240960 4500000C */ bc1f .L80240994 -/* D9A314 80240964 00000000 */ nop +/* D9A314 80240964 00000000 */ nop /* D9A318 80240968 3C014387 */ lui $at, 0x4387 /* D9A31C 8024096C 44812000 */ mtc1 $at, $f4 -/* D9A320 80240970 00000000 */ nop +/* D9A320 80240970 00000000 */ nop /* D9A324 80240974 4604003E */ c.le.s $f0, $f4 -/* D9A328 80240978 00000000 */ nop +/* D9A328 80240978 00000000 */ nop /* D9A32C 8024097C 45000008 */ bc1f .L802409A0 -/* D9A330 80240980 00000000 */ nop +/* D9A330 80240980 00000000 */ nop /* D9A334 80240984 3C014334 */ lui $at, 0x4334 /* D9A338 80240988 44812000 */ mtc1 $at, $f4 /* D9A33C 8024098C 08090276 */ j .L802409D8 @@ -80,19 +80,19 @@ glabel func_80240870_D9A220 .L80240994: /* D9A344 80240994 3C014387 */ lui $at, 0x4387 /* D9A348 80240998 44812000 */ mtc1 $at, $f4 -/* D9A34C 8024099C 00000000 */ nop +/* D9A34C 8024099C 00000000 */ nop .L802409A0: /* D9A350 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D9A354 802409A4 00000000 */ nop +/* D9A354 802409A4 00000000 */ nop /* D9A358 802409A8 4500000A */ bc1f .L802409D4 -/* D9A35C 802409AC 00000000 */ nop +/* D9A35C 802409AC 00000000 */ nop /* D9A360 802409B0 3C0143B4 */ lui $at, 0x43b4 /* D9A364 802409B4 44811000 */ mtc1 $at, $f2 -/* D9A368 802409B8 00000000 */ nop +/* D9A368 802409B8 00000000 */ nop /* D9A36C 802409BC 4602003E */ c.le.s $f0, $f2 -/* D9A370 802409C0 00000000 */ nop +/* D9A370 802409C0 00000000 */ nop /* D9A374 802409C4 45000003 */ bc1f .L802409D4 -/* D9A378 802409C8 00000000 */ nop +/* D9A378 802409C8 00000000 */ nop /* D9A37C 802409CC 08090276 */ j .L802409D8 /* D9A380 802409D0 46001501 */ sub.s $f20, $f2, $f0 .L802409D4: @@ -100,11 +100,11 @@ glabel func_80240870_D9A220 .L802409D8: /* D9A388 802409D8 3C0141C8 */ lui $at, 0x41c8 /* D9A38C 802409DC 44810000 */ mtc1 $at, $f0 -/* D9A390 802409E0 00000000 */ nop +/* D9A390 802409E0 00000000 */ nop /* D9A394 802409E4 4600A003 */ div.s $f0, $f20, $f0 /* D9A398 802409E8 4600010D */ trunc.w.s $f4, $f0 /* D9A39C 802409EC 44072000 */ mfc1 $a3, $f4 -/* D9A3A0 802409F0 00000000 */ nop +/* D9A3A0 802409F0 00000000 */ nop /* D9A3A4 802409F4 00071100 */ sll $v0, $a3, 4 /* D9A3A8 802409F8 00471023 */ subu $v0, $v0, $a3 /* D9A3AC 802409FC 00021080 */ sll $v0, $v0, 2 @@ -129,7 +129,7 @@ glabel func_80240870_D9A220 /* D9A3F4 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) /* D9A3F8 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) /* D9A3FC 80240A4C 0C00A6C9 */ jal clamp_angle -/* D9A400 80240A50 00000000 */ nop +/* D9A400 80240A50 00000000 */ nop /* D9A404 80240A54 44050000 */ mfc1 $a1, $f0 /* D9A408 80240A58 4406B000 */ mfc1 $a2, $f22 /* D9A40C 80240A5C 4407B000 */ mfc1 $a3, $f22 @@ -161,7 +161,7 @@ glabel func_80240870_D9A220 /* D9A470 80240AC0 24040001 */ addiu $a0, $zero, 1 .L80240AC4: /* D9A474 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D9A478 80240AC8 00000000 */ nop +/* D9A478 80240AC8 00000000 */ nop /* D9A47C 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 /* D9A480 80240AD0 24040001 */ addiu $a0, $zero, 1 .L80240AD4: @@ -204,10 +204,10 @@ glabel func_80240870_D9A220 /* D9A510 80240B60 44812000 */ mtc1 $at, $f4 /* D9A514 80240B64 00021023 */ negu $v0, $v0 /* D9A518 80240B68 44820000 */ mtc1 $v0, $f0 -/* D9A51C 80240B6C 00000000 */ nop +/* D9A51C 80240B6C 00000000 */ nop /* D9A520 80240B70 46800020 */ cvt.s.w $f0, $f0 /* D9A524 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D9A528 80240B78 00000000 */ nop +/* D9A528 80240B78 00000000 */ nop /* D9A52C 80240B7C 4405B000 */ mfc1 $a1, $f22 /* D9A530 80240B80 4407B000 */ mfc1 $a3, $f22 /* D9A534 80240B84 44062000 */ mfc1 $a2, $f4 @@ -241,10 +241,10 @@ glabel func_80240870_D9A220 /* D9A5A4 80240BF4 3C013F00 */ lui $at, 0x3f00 /* D9A5A8 80240BF8 44812000 */ mtc1 $at, $f4 /* D9A5AC 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D9A5B0 80240C00 00000000 */ nop +/* D9A5B0 80240C00 00000000 */ nop /* D9A5B4 80240C04 46800020 */ cvt.s.w $f0, $f0 /* D9A5B8 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D9A5BC 80240C0C 00000000 */ nop +/* D9A5BC 80240C0C 00000000 */ nop /* D9A5C0 80240C10 4405B000 */ mfc1 $a1, $f22 /* D9A5C4 80240C14 4407B000 */ mfc1 $a3, $f22 /* D9A5C8 80240C18 44062000 */ mfc1 $a2, $f4 @@ -280,16 +280,16 @@ glabel func_80240870_D9A220 /* D9A640 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) /* D9A644 80240C94 3C0142B4 */ lui $at, 0x42b4 /* D9A648 80240C98 44810000 */ mtc1 $at, $f0 -/* D9A64C 80240C9C 00000000 */ nop +/* D9A64C 80240C9C 00000000 */ nop /* D9A650 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D9A654 80240CA4 00000000 */ nop +/* D9A654 80240CA4 00000000 */ nop /* D9A658 80240CA8 4500000A */ bc1f .L80240CD4 /* D9A65C 80240CAC 24040001 */ addiu $a0, $zero, 1 /* D9A660 80240CB0 3C014387 */ lui $at, 0x4387 /* D9A664 80240CB4 44812000 */ mtc1 $at, $f4 -/* D9A668 80240CB8 00000000 */ nop +/* D9A668 80240CB8 00000000 */ nop /* D9A66C 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D9A670 80240CC0 00000000 */ nop +/* D9A670 80240CC0 00000000 */ nop /* D9A674 80240CC4 45000004 */ bc1f .L80240CD8 /* D9A678 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 /* D9A67C 80240CCC 3C041000 */ lui $a0, 0x1000 @@ -305,7 +305,7 @@ glabel func_80240870_D9A220 /* D9A69C 80240CEC 26730001 */ addiu $s3, $s3, 1 /* D9A6A0 80240CF0 2A620002 */ slti $v0, $s3, 2 /* D9A6A4 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D9A6A8 80240CF8 00000000 */ nop +/* D9A6A8 80240CF8 00000000 */ nop /* D9A6AC 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) /* D9A6B0 80240D00 8FB60148 */ lw $s6, 0x148($sp) /* D9A6B4 80240D04 8FB50144 */ lw $s5, 0x144($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240D3C_D9A6EC.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240D3C_D9A6EC.s index aa275bf9c3..89a31df84b 100644 --- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240D3C_D9A6EC.s +++ b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240D3C_D9A6EC.s @@ -11,36 +11,36 @@ glabel func_80240D3C_D9A6EC /* D9A704 80240D54 24020001 */ addiu $v0, $zero, 1 /* D9A708 80240D58 8E030084 */ lw $v1, 0x84($s0) /* D9A70C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D9A710 80240D60 00000000 */ nop +/* D9A710 80240D60 00000000 */ nop /* D9A714 80240D64 28620002 */ slti $v0, $v1, 2 /* D9A718 80240D68 50400005 */ beql $v0, $zero, .L80240D80 /* D9A71C 80240D6C 24020002 */ addiu $v0, $zero, 2 /* D9A720 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D9A724 80240D74 00000000 */ nop +/* D9A724 80240D74 00000000 */ nop /* D9A728 80240D78 08090378 */ j .L80240DE0 -/* D9A72C 80240D7C 00000000 */ nop +/* D9A72C 80240D7C 00000000 */ nop .L80240D80: /* D9A730 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D9A734 80240D84 00000000 */ nop +/* D9A734 80240D84 00000000 */ nop /* D9A738 80240D88 08090378 */ j .L80240DE0 -/* D9A73C 80240D8C 00000000 */ nop +/* D9A73C 80240D8C 00000000 */ nop .L80240D90: /* D9A740 80240D90 3C048024 */ lui $a0, %hi(pra_40_SetPartnerFlagsA0000) /* D9A744 80240D94 24840E84 */ addiu $a0, $a0, %lo(pra_40_SetPartnerFlagsA0000) /* D9A748 80240D98 08090374 */ j .L80240DD0 -/* D9A74C 80240D9C 00000000 */ nop +/* D9A74C 80240D9C 00000000 */ nop .L80240DA0: /* D9A750 80240DA0 3C048024 */ lui $a0, %hi(pra_40_SetPartnerFlags20000) /* D9A754 80240DA4 24840EEC */ addiu $a0, $a0, %lo(pra_40_SetPartnerFlags20000) /* D9A758 80240DA8 08090374 */ j .L80240DD0 -/* D9A75C 80240DAC 00000000 */ nop +/* D9A75C 80240DAC 00000000 */ nop .L80240DB0: /* D9A760 80240DB0 8E020084 */ lw $v0, 0x84($s0) /* D9A764 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D9A768 80240DB8 00000000 */ nop +/* D9A768 80240DB8 00000000 */ nop /* D9A76C 80240DBC 28420002 */ slti $v0, $v0, 2 /* D9A770 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D9A774 80240DC4 00000000 */ nop +/* D9A774 80240DC4 00000000 */ nop .L80240DC8: /* D9A778 80240DC8 3C048024 */ lui $a0, %hi(pra_40_SetPartnerFlags80000) /* D9A77C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(pra_40_SetPartnerFlags80000) @@ -64,14 +64,14 @@ glabel func_80240D3C_D9A6EC /* D9A7BC 80240E0C 10400005 */ beqz $v0, .L80240E24 /* D9A7C0 80240E10 24020002 */ addiu $v0, $zero, 2 /* D9A7C4 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D9A7C8 80240E18 00000000 */ nop +/* D9A7C8 80240E18 00000000 */ nop /* D9A7CC 80240E1C 0809039D */ j .L80240E74 -/* D9A7D0 80240E20 00000000 */ nop +/* D9A7D0 80240E20 00000000 */ nop .L80240E24: /* D9A7D4 80240E24 10820006 */ beq $a0, $v0, .L80240E40 /* D9A7D8 80240E28 24020002 */ addiu $v0, $zero, 2 /* D9A7DC 80240E2C 0809039D */ j .L80240E74 -/* D9A7E0 80240E30 00000000 */ nop +/* D9A7E0 80240E30 00000000 */ nop .L80240E34: /* D9A7E4 80240E34 8CA20000 */ lw $v0, ($a1) /* D9A7E8 80240E38 0809039A */ j .L80240E68 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802405C8_CF8138.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802405C8_CF8138.s index 754d57c1ee..91a34ad4a5 100644 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802405C8_CF8138.s +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802405C8_CF8138.s @@ -28,7 +28,7 @@ glabel func_802405C8_CF8138 /* CF818C 8024061C 00220821 */ addu $at, $at, $v0 /* CF8190 80240620 AC20DBC0 */ sw $zero, %lo(D_8024DBC0)($at) /* CF8194 80240624 08090195 */ j .L80240654 -/* CF8198 80240628 00000000 */ nop +/* CF8198 80240628 00000000 */ nop .L8024062C: /* CF819C 8024062C 3C038025 */ lui $v1, %hi(D_8024DBC0) /* CF81A0 80240630 2463DBC0 */ addiu $v1, $v1, %lo(D_8024DBC0) diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240664_CF81D4.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240664_CF81D4.s index e94ca619c2..c2fd4f6288 100644 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240664_CF81D4.s +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240664_CF81D4.s @@ -28,7 +28,7 @@ glabel func_80240664_CF81D4 /* CF8228 802406B8 00220821 */ addu $at, $at, $v0 /* CF822C 802406BC AC20DD88 */ sw $zero, %lo(D_8024DD88)($at) /* CF8230 802406C0 080901BC */ j .L802406F0 -/* CF8234 802406C4 00000000 */ nop +/* CF8234 802406C4 00000000 */ nop .L802406C8: /* CF8238 802406C8 3C038025 */ lui $v1, %hi(D_8024DD88) /* CF823C 802406CC 2463DD88 */ addiu $v1, $v1, %lo(D_8024DD88) diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240700_CF8270.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240700_CF8270.s index 77fae4b4df..d6587b100e 100644 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240700_CF8270.s +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240700_CF8270.s @@ -26,7 +26,7 @@ glabel func_80240700_CF8270 /* CF82C0 80240750 1440FFFA */ bnez $v0, .L8024073C /* CF82C4 80240754 24A50004 */ addiu $a1, $a1, 4 /* CF82C8 80240758 080901E7 */ j .L8024079C -/* CF82CC 8024075C 00000000 */ nop +/* CF82CC 8024075C 00000000 */ nop .L80240760: /* CF82D0 80240760 0000182D */ daddu $v1, $zero, $zero /* CF82D4 80240764 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024083C_CF83AC.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024083C_CF83AC.s index 48f6757534..5b9f33e270 100644 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024083C_CF83AC.s +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024083C_CF83AC.s @@ -115,7 +115,7 @@ glabel func_8024083C_CF83AC /* CF8554 802409E4 14E20005 */ bne $a3, $v0, .L802409FC /* CF8558 802409E8 32E2FFFF */ andi $v0, $s7, 0xffff /* CF855C 802409EC 14400003 */ bnez $v0, .L802409FC -/* CF8560 802409F0 00000000 */ nop +/* CF8560 802409F0 00000000 */ nop /* CF8564 802409F4 14800008 */ bnez $a0, .L80240A18 /* CF8568 802409F8 24020001 */ addiu $v0, $zero, 1 .L802409FC: @@ -123,7 +123,7 @@ glabel func_8024083C_CF83AC /* CF8570 80240A00 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* CF8574 80240A04 80420075 */ lb $v0, 0x75($v0) /* CF8578 80240A08 10400005 */ beqz $v0, .L80240A20 -/* CF857C 80240A0C 00000000 */ nop +/* CF857C 80240A0C 00000000 */ nop /* CF8580 80240A10 10800003 */ beqz $a0, .L80240A20 /* CF8584 80240A14 24020001 */ addiu $v0, $zero, 1 .L80240A18: diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240B2C_CF869C.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240B2C_CF869C.s index eb0da5befc..d2d1049de7 100644 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240B2C_CF869C.s +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240B2C_CF869C.s @@ -39,13 +39,13 @@ glabel func_80240B2C_CF869C /* CF8720 80240BB0 10740005 */ beq $v1, $s4, .L80240BC8 /* CF8724 80240BB4 26100001 */ addiu $s0, $s0, 1 /* CF8728 80240BB8 10730003 */ beq $v1, $s3, .L80240BC8 -/* CF872C 80240BBC 00000000 */ nop +/* CF872C 80240BBC 00000000 */ nop /* CF8730 80240BC0 00521025 */ or $v0, $v0, $s2 /* CF8734 80240BC4 AC820000 */ sw $v0, ($a0) .L80240BC8: /* CF8738 80240BC8 2A020040 */ slti $v0, $s0, 0x40 /* CF873C 80240BCC 1440FFEF */ bnez $v0, .L80240B8C -/* CF8740 80240BD0 00000000 */ nop +/* CF8740 80240BD0 00000000 */ nop /* CF8744 80240BD4 0000802D */ daddu $s0, $zero, $zero /* CF8748 80240BD8 3C120800 */ lui $s2, 0x800 .L80240BDC: @@ -57,13 +57,13 @@ glabel func_80240B2C_CF869C /* CF8760 80240BF0 8C640000 */ lw $a0, ($v1) /* CF8764 80240BF4 30820010 */ andi $v0, $a0, 0x10 /* CF8768 80240BF8 10400003 */ beqz $v0, .L80240C08 -/* CF876C 80240BFC 00000000 */ nop +/* CF876C 80240BFC 00000000 */ nop /* CF8770 80240C00 00921025 */ or $v0, $a0, $s2 /* CF8774 80240C04 AC620000 */ sw $v0, ($v1) .L80240C08: /* CF8778 80240C08 2A020100 */ slti $v0, $s0, 0x100 /* CF877C 80240C0C 1440FFF3 */ bnez $v0, .L80240BDC -/* CF8780 80240C10 00000000 */ nop +/* CF8780 80240C10 00000000 */ nop /* CF8784 80240C14 AE200070 */ sw $zero, 0x70($s1) .L80240C18: /* CF8788 80240C18 8E220070 */ lw $v0, 0x70($s1) diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240C78_CF87E8.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240C78_CF87E8.s index 377447e524..fa611e4e93 100644 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240C78_CF87E8.s +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240C78_CF87E8.s @@ -32,7 +32,7 @@ glabel func_80240C78_CF87E8 /* CF884C 80240CDC 0080302D */ daddu $a2, $a0, $zero /* CF8850 80240CE0 8E020070 */ lw $v0, 0x70($s0) /* CF8854 80240CE4 14400006 */ bnez $v0, .L80240D00 -/* CF8858 80240CE8 00000000 */ nop +/* CF8858 80240CE8 00000000 */ nop /* CF885C 80240CEC 8E020074 */ lw $v0, 0x74($s0) /* CF8860 80240CF0 14400003 */ bnez $v0, .L80240D00 /* CF8864 80240CF4 24020001 */ addiu $v0, $zero, 1 @@ -66,13 +66,13 @@ glabel func_80240C78_CF87E8 /* CF88CC 80240D5C 10730005 */ beq $v1, $s3, .L80240D74 /* CF88D0 80240D60 26100001 */ addiu $s0, $s0, 1 /* CF88D4 80240D64 10720003 */ beq $v1, $s2, .L80240D74 -/* CF88D8 80240D68 00000000 */ nop +/* CF88D8 80240D68 00000000 */ nop /* CF88DC 80240D6C 00511024 */ and $v0, $v0, $s1 /* CF88E0 80240D70 AC820000 */ sw $v0, ($a0) .L80240D74: /* CF88E4 80240D74 2A020040 */ slti $v0, $s0, 0x40 /* CF88E8 80240D78 1440FFEF */ bnez $v0, .L80240D38 -/* CF88EC 80240D7C 00000000 */ nop +/* CF88EC 80240D7C 00000000 */ nop /* CF88F0 80240D80 0000802D */ daddu $s0, $zero, $zero /* CF88F4 80240D84 3C11F7FF */ lui $s1, 0xf7ff /* CF88F8 80240D88 3631FFFF */ ori $s1, $s1, 0xffff @@ -85,7 +85,7 @@ glabel func_80240C78_CF87E8 /* CF8910 80240DA0 8C640000 */ lw $a0, ($v1) /* CF8914 80240DA4 30820010 */ andi $v0, $a0, 0x10 /* CF8918 80240DA8 10400003 */ beqz $v0, .L80240DB8 -/* CF891C 80240DAC 00000000 */ nop +/* CF891C 80240DAC 00000000 */ nop /* CF8920 80240DB0 00911024 */ and $v0, $a0, $s1 /* CF8924 80240DB4 AC620000 */ sw $v0, ($v1) .L80240DB8: @@ -93,7 +93,7 @@ glabel func_80240C78_CF87E8 /* CF892C 80240DBC 1440FFF3 */ bnez $v0, .L80240D8C /* CF8930 80240DC0 24020002 */ addiu $v0, $zero, 2 /* CF8934 80240DC4 08090374 */ j .L80240DD0 -/* CF8938 80240DC8 00000000 */ nop +/* CF8938 80240DC8 00000000 */ nop .L80240DCC: /* CF893C 80240DCC 0000102D */ daddu $v0, $zero, $zero .L80240DD0: diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240E70_CF89E0.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240E70_CF89E0.s index 4d4d57de2a..ca921be1ba 100644 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240E70_CF89E0.s +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240E70_CF89E0.s @@ -16,19 +16,19 @@ glabel func_80240E70_CF89E0 /* CF8A0C 80240E9C 0220202D */ daddu $a0, $s1, $zero /* CF8A10 80240EA0 3C05F4AC */ lui $a1, 0xf4ac /* CF8A14 80240EA4 4482B000 */ mtc1 $v0, $f22 -/* CF8A18 80240EA8 00000000 */ nop +/* CF8A18 80240EA8 00000000 */ nop /* CF8A1C 80240EAC 4680B5A0 */ cvt.s.w $f22, $f22 /* CF8A20 80240EB0 0C0B1EAF */ jal get_variable /* CF8A24 80240EB4 34A5D482 */ ori $a1, $a1, 0xd482 /* CF8A28 80240EB8 0220202D */ daddu $a0, $s1, $zero /* CF8A2C 80240EBC 3C05F4AC */ lui $a1, 0xf4ac /* CF8A30 80240EC0 4482A000 */ mtc1 $v0, $f20 -/* CF8A34 80240EC4 00000000 */ nop +/* CF8A34 80240EC4 00000000 */ nop /* CF8A38 80240EC8 4680A520 */ cvt.s.w $f20, $f20 /* CF8A3C 80240ECC 0C0B1EAF */ jal get_variable /* CF8A40 80240ED0 34A5D483 */ ori $a1, $a1, 0xd483 /* CF8A44 80240ED4 44821000 */ mtc1 $v0, $f2 -/* CF8A48 80240ED8 00000000 */ nop +/* CF8A48 80240ED8 00000000 */ nop /* CF8A4C 80240EDC 468010A0 */ cvt.s.w $f2, $f2 /* CF8A50 80240EE0 4405B000 */ mfc1 $a1, $f22 /* CF8A54 80240EE4 4406A000 */ mfc1 $a2, $f20 @@ -45,19 +45,19 @@ glabel func_80240E70_CF89E0 /* CF8A80 80240F10 0220202D */ daddu $a0, $s1, $zero /* CF8A84 80240F14 3C05F4AC */ lui $a1, 0xf4ac /* CF8A88 80240F18 4482B000 */ mtc1 $v0, $f22 -/* CF8A8C 80240F1C 00000000 */ nop +/* CF8A8C 80240F1C 00000000 */ nop /* CF8A90 80240F20 4680B5A0 */ cvt.s.w $f22, $f22 /* CF8A94 80240F24 0C0B1EAF */ jal get_variable /* CF8A98 80240F28 34A5D482 */ ori $a1, $a1, 0xd482 /* CF8A9C 80240F2C 0220202D */ daddu $a0, $s1, $zero /* CF8AA0 80240F30 3C05F4AC */ lui $a1, 0xf4ac /* CF8AA4 80240F34 4482A000 */ mtc1 $v0, $f20 -/* CF8AA8 80240F38 00000000 */ nop +/* CF8AA8 80240F38 00000000 */ nop /* CF8AAC 80240F3C 4680A520 */ cvt.s.w $f20, $f20 /* CF8AB0 80240F40 0C0B1EAF */ jal get_variable /* CF8AB4 80240F44 34A5D483 */ ori $a1, $a1, 0xd483 /* CF8AB8 80240F48 44821000 */ mtc1 $v0, $f2 -/* CF8ABC 80240F4C 00000000 */ nop +/* CF8ABC 80240F4C 00000000 */ nop /* CF8AC0 80240F50 468010A0 */ cvt.s.w $f2, $f2 /* CF8AC4 80240F54 4405B000 */ mfc1 $a1, $f22 /* CF8AC8 80240F58 4406A000 */ mfc1 $a2, $f20 @@ -73,19 +73,19 @@ glabel func_80240E70_CF89E0 /* CF8AF0 80240F80 0220202D */ daddu $a0, $s1, $zero /* CF8AF4 80240F84 3C05F4AC */ lui $a1, 0xf4ac /* CF8AF8 80240F88 4482B000 */ mtc1 $v0, $f22 -/* CF8AFC 80240F8C 00000000 */ nop +/* CF8AFC 80240F8C 00000000 */ nop /* CF8B00 80240F90 4680B5A0 */ cvt.s.w $f22, $f22 /* CF8B04 80240F94 0C0B1EAF */ jal get_variable /* CF8B08 80240F98 34A5D482 */ ori $a1, $a1, 0xd482 /* CF8B0C 80240F9C 0220202D */ daddu $a0, $s1, $zero /* CF8B10 80240FA0 3C05F4AC */ lui $a1, 0xf4ac /* CF8B14 80240FA4 4482A000 */ mtc1 $v0, $f20 -/* CF8B18 80240FA8 00000000 */ nop +/* CF8B18 80240FA8 00000000 */ nop /* CF8B1C 80240FAC 4680A520 */ cvt.s.w $f20, $f20 /* CF8B20 80240FB0 0C0B1EAF */ jal get_variable /* CF8B24 80240FB4 34A5D483 */ ori $a1, $a1, 0xd483 /* CF8B28 80240FB8 44821000 */ mtc1 $v0, $f2 -/* CF8B2C 80240FBC 00000000 */ nop +/* CF8B2C 80240FBC 00000000 */ nop /* CF8B30 80240FC0 468010A0 */ cvt.s.w $f2, $f2 /* CF8B34 80240FC4 4405B000 */ mfc1 $a1, $f22 /* CF8B38 80240FC8 4406A000 */ mfc1 $a2, $f20 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241088_CF8BF8.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241088_CF8BF8.s index 6d1a62130e..6ea84367b8 100644 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241088_CF8BF8.s +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241088_CF8BF8.s @@ -44,7 +44,7 @@ glabel func_80241088_CF8BF8 /* CF8C8C 8024111C 3C048025 */ lui $a0, %hi(D_8024DEF8) /* CF8C90 80241120 8C84DEF8 */ lw $a0, %lo(D_8024DEF8)($a0) /* CF8C94 80241124 0C048D70 */ jal func_801235C0 -/* CF8C98 80241128 00000000 */ nop +/* CF8C98 80241128 00000000 */ nop /* CF8C9C 8024112C 24020002 */ addiu $v0, $zero, 2 .L80241130: /* CF8CA0 80241130 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802416F8_CF9268.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802416F8_CF9268.s index 0cb5c2e9c6..b8b0ee8e1c 100644 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802416F8_CF9268.s +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802416F8_CF9268.s @@ -13,7 +13,7 @@ glabel func_802416F8_CF9268 /* CF9288 80241718 14620006 */ bne $v1, $v0, .L80241734 /* CF928C 8024171C 24020002 */ addiu $v0, $zero, 2 /* CF9290 80241720 44800000 */ mtc1 $zero, $f0 -/* CF9294 80241724 00000000 */ nop +/* CF9294 80241724 00000000 */ nop /* CF9298 80241728 44050000 */ mfc1 $a1, $f0 /* CF929C 8024172C 080905D3 */ j .L8024174C /* CF92A0 80241730 0000202D */ daddu $a0, $zero, $zero @@ -21,9 +21,9 @@ glabel func_802416F8_CF9268 /* CF92A4 80241734 14620008 */ bne $v1, $v0, .L80241758 /* CF92A8 80241738 24040001 */ addiu $a0, $zero, 1 /* CF92AC 8024173C 44800000 */ mtc1 $zero, $f0 -/* CF92B0 80241740 00000000 */ nop +/* CF92B0 80241740 00000000 */ nop /* CF92B4 80241744 44050000 */ mfc1 $a1, $f0 -/* CF92B8 80241748 00000000 */ nop +/* CF92B8 80241748 00000000 */ nop .L8024174C: /* CF92BC 8024174C 00A0302D */ daddu $a2, $a1, $zero /* CF92C0 80241750 0C01C5A4 */ jal func_80071690 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241B20_CF9690.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241B20_CF9690.s index 3a129746a4..9edcbf78db 100644 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241B20_CF9690.s +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241B20_CF9690.s @@ -32,19 +32,19 @@ glabel func_80241B20_CF9690 /* CF96FC 80241B8C C60C006C */ lwc1 $f12, 0x6c($s0) /* CF9700 80241B90 3C014387 */ lui $at, 0x4387 /* CF9704 80241B94 4481B000 */ mtc1 $at, $f22 -/* CF9708 80241B98 00000000 */ nop +/* CF9708 80241B98 00000000 */ nop /* CF970C 80241B9C 46166300 */ add.s $f12, $f12, $f22 /* CF9710 80241BA0 4482C000 */ mtc1 $v0, $f24 -/* CF9714 80241BA4 00000000 */ nop +/* CF9714 80241BA4 00000000 */ nop /* CF9718 80241BA8 4680C620 */ cvt.s.w $f24, $f24 /* CF971C 80241BAC 3C0142C8 */ lui $at, 0x42c8 /* CF9720 80241BB0 4481D000 */ mtc1 $at, $f26 /* CF9724 80241BB4 0C00A8BB */ jal sin_deg /* CF9728 80241BB8 46186300 */ add.s $f12, $f12, $f24 /* CF972C 80241BBC 461A0002 */ mul.s $f0, $f0, $f26 -/* CF9730 80241BC0 00000000 */ nop +/* CF9730 80241BC0 00000000 */ nop /* CF9734 80241BC4 4492A000 */ mtc1 $s2, $f20 -/* CF9738 80241BC8 00000000 */ nop +/* CF9738 80241BC8 00000000 */ nop /* CF973C 80241BCC 4680A520 */ cvt.s.w $f20, $f20 /* CF9740 80241BD0 4600A000 */ add.s $f0, $f20, $f0 /* CF9744 80241BD4 4600008D */ trunc.w.s $f2, $f0 @@ -54,9 +54,9 @@ glabel func_80241B20_CF9690 /* CF9754 80241BE4 0C00A8D4 */ jal cos_deg /* CF9758 80241BE8 46186300 */ add.s $f12, $f12, $f24 /* CF975C 80241BEC 461A0002 */ mul.s $f0, $f0, $f26 -/* CF9760 80241BF0 00000000 */ nop +/* CF9760 80241BF0 00000000 */ nop /* CF9764 80241BF4 4493B000 */ mtc1 $s3, $f22 -/* CF9768 80241BF8 00000000 */ nop +/* CF9768 80241BF8 00000000 */ nop /* CF976C 80241BFC 4680B5A0 */ cvt.s.w $f22, $f22 /* CF9770 80241C00 4600B001 */ sub.s $f0, $f22, $f0 /* CF9774 80241C04 3C0142B4 */ lui $at, 0x42b4 @@ -68,7 +68,7 @@ glabel func_80241B20_CF9690 /* CF978C 80241C1C 0C00A8BB */ jal sin_deg /* CF9790 80241C20 46186300 */ add.s $f12, $f12, $f24 /* CF9794 80241C24 461A0002 */ mul.s $f0, $f0, $f26 -/* CF9798 80241C28 00000000 */ nop +/* CF9798 80241C28 00000000 */ nop /* CF979C 80241C2C 4600A500 */ add.s $f20, $f20, $f0 /* CF97A0 80241C30 4600A08D */ trunc.w.s $f2, $f20 /* CF97A4 80241C34 E622008C */ swc1 $f2, 0x8c($s1) @@ -77,7 +77,7 @@ glabel func_80241B20_CF9690 /* CF97B0 80241C40 0C00A8D4 */ jal cos_deg /* CF97B4 80241C44 46186300 */ add.s $f12, $f12, $f24 /* CF97B8 80241C48 461A0002 */ mul.s $f0, $f0, $f26 -/* CF97BC 80241C4C 00000000 */ nop +/* CF97BC 80241C4C 00000000 */ nop /* CF97C0 80241C50 4600B581 */ sub.s $f22, $f22, $f0 /* CF97C4 80241C54 4600B08D */ trunc.w.s $f2, $f22 /* CF97C8 80241C58 E6220090 */ swc1 $f2, 0x90($s1) diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241C90_CF9800.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241C90_CF9800.s index a1df8b9f11..e908a2d72a 100644 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241C90_CF9800.s +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241C90_CF9800.s @@ -26,7 +26,7 @@ glabel func_80241C90_CF9800 /* CF9850 80241CE0 1440FFFA */ bnez $v0, .L80241CCC /* CF9854 80241CE4 24A50004 */ addiu $a1, $a1, 4 /* CF9858 80241CE8 0809074B */ j .L80241D2C -/* CF985C 80241CEC 00000000 */ nop +/* CF985C 80241CEC 00000000 */ nop .L80241CF0: /* CF9860 80241CF0 0000182D */ daddu $v1, $zero, $zero /* CF9864 80241CF4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05730/func_80240034_D05764.s b/asm/nonmatchings/world/area_sam/sam_02/D05730/func_80240034_D05764.s index 5ccea9227d..dead250d1d 100644 --- a/asm/nonmatchings/world/area_sam/sam_02/D05730/func_80240034_D05764.s +++ b/asm/nonmatchings/world/area_sam/sam_02/D05730/func_80240034_D05764.s @@ -22,16 +22,16 @@ glabel func_80240034_D05764 /* D057A4 80240074 00021023 */ negu $v0, $v0 .L80240078: /* D057A8 80240078 14400003 */ bnez $v0, .L80240088 -/* D057AC 8024007C 00000000 */ nop +/* D057AC 8024007C 00000000 */ nop /* D057B0 80240080 50E00017 */ beql $a3, $zero, .L802400E0 /* D057B4 80240084 0000102D */ daddu $v0, $zero, $zero .L80240088: /* D057B8 80240088 44822000 */ mtc1 $v0, $f4 -/* D057BC 8024008C 00000000 */ nop +/* D057BC 8024008C 00000000 */ nop /* D057C0 80240090 46802120 */ cvt.s.w $f4, $f4 /* D057C4 80240094 44062000 */ mfc1 $a2, $f4 /* D057C8 80240098 44872000 */ mtc1 $a3, $f4 -/* D057CC 8024009C 00000000 */ nop +/* D057CC 8024009C 00000000 */ nop /* D057D0 802400A0 46802120 */ cvt.s.w $f4, $f4 /* D057D4 802400A4 44806000 */ mtc1 $zero, $f12 /* D057D8 802400A8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240034_D05764 /* D057E0 802400B0 46006386 */ mov.s $f14, $f12 /* D057E4 802400B4 3C014270 */ lui $at, 0x4270 /* D057E8 802400B8 44811000 */ mtc1 $at, $f2 -/* D057EC 802400BC 00000000 */ nop +/* D057EC 802400BC 00000000 */ nop /* D057F0 802400C0 4602003C */ c.lt.s $f0, $f2 -/* D057F4 802400C4 00000000 */ nop +/* D057F4 802400C4 00000000 */ nop /* D057F8 802400C8 45000004 */ bc1f .L802400DC /* D057FC 802400CC 24020001 */ addiu $v0, $zero, 1 /* D05800 802400D0 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05730/func_80240404_D05B34.s b/asm/nonmatchings/world/area_sam/sam_02/D05730/func_80240404_D05B34.s index 98782aed29..65eafa207c 100644 --- a/asm/nonmatchings/world/area_sam/sam_02/D05730/func_80240404_D05B34.s +++ b/asm/nonmatchings/world/area_sam/sam_02/D05730/func_80240404_D05B34.s @@ -14,7 +14,7 @@ glabel func_80240404_D05B34 .L80240428: /* D05B58 80240428 8E020070 */ lw $v0, 0x70($s0) /* D05B5C 8024042C 1440000E */ bnez $v0, .L80240468 -/* D05B60 80240430 00000000 */ nop +/* D05B60 80240430 00000000 */ nop /* D05B64 80240434 8E0300A8 */ lw $v1, 0xa8($s0) /* D05B68 80240438 8E020088 */ lw $v0, 0x88($s0) /* D05B6C 8024043C 00621821 */ addu $v1, $v1, $v0 @@ -33,7 +33,7 @@ glabel func_80240404_D05B34 .L80240468: /* D05B98 80240468 8E020074 */ lw $v0, 0x74($s0) /* D05B9C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* D05BA0 80240470 00000000 */ nop +/* D05BA0 80240470 00000000 */ nop /* D05BA4 80240474 8E0300AC */ lw $v1, 0xac($s0) /* D05BA8 80240478 8E02008C */ lw $v0, 0x8c($s0) /* D05BAC 8024047C 00621821 */ addu $v1, $v1, $v0 @@ -52,7 +52,7 @@ glabel func_80240404_D05B34 .L802404A8: /* D05BD8 802404A8 8E020078 */ lw $v0, 0x78($s0) /* D05BDC 802404AC 1440000E */ bnez $v0, .L802404E8 -/* D05BE0 802404B0 00000000 */ nop +/* D05BE0 802404B0 00000000 */ nop /* D05BE4 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) /* D05BE8 802404B8 8E020090 */ lw $v0, 0x90($s0) /* D05BEC 802404BC 00621821 */ addu $v1, $v1, $v0 @@ -71,7 +71,7 @@ glabel func_80240404_D05B34 .L802404E8: /* D05C18 802404E8 8E02007C */ lw $v0, 0x7c($s0) /* D05C1C 802404EC 1440000E */ bnez $v0, .L80240528 -/* D05C20 802404F0 00000000 */ nop +/* D05C20 802404F0 00000000 */ nop /* D05C24 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) /* D05C28 802404F8 8E020094 */ lw $v0, 0x94($s0) /* D05C2C 802404FC 00621821 */ addu $v1, $v1, $v0 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240878_D05FA8.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240878_D05FA8.s index 3b4a9ca74f..c4c5f984ef 100644 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240878_D05FA8.s +++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240878_D05FA8.s @@ -22,7 +22,7 @@ glabel func_80240878_D05FA8 /* D05FEC 802408BC 0C04DF93 */ jal func_80137E4C /* D05FF0 802408C0 24070091 */ addiu $a3, $zero, 0x91 /* D05FF4 802408C4 44900000 */ mtc1 $s0, $f0 -/* D05FF8 802408C8 00000000 */ nop +/* D05FF8 802408C8 00000000 */ nop /* D05FFC 802408CC 46800020 */ cvt.s.w $f0, $f0 /* D06000 802408D0 44050000 */ mfc1 $a1, $f0 /* D06004 802408D4 0C04DF62 */ jal func_80137D88 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802408F4_D06024.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802408F4_D06024.s index 66671c0400..99a214d50c 100644 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802408F4_D06024.s +++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802408F4_D06024.s @@ -16,7 +16,7 @@ glabel func_802408F4_D06024 /* D06050 80240920 0C0B1EAF */ jal get_variable /* D06054 80240924 0040802D */ daddu $s0, $v0, $zero /* D06058 80240928 44820000 */ mtc1 $v0, $f0 -/* D0605C 8024092C 00000000 */ nop +/* D0605C 8024092C 00000000 */ nop /* D06060 80240930 46800020 */ cvt.s.w $f0, $f0 /* D06064 80240934 24020002 */ addiu $v0, $zero, 2 /* D06068 80240938 00501804 */ sllv $v1, $s0, $v0 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409F0_D06120.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409F0_D06120.s index 7e9acbcc65..750e77f96d 100644 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409F0_D06120.s +++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409F0_D06120.s @@ -12,7 +12,7 @@ glabel func_802409F0_D06120 /* D0613C 80240A0C 80A30006 */ lb $v1, 6($a1) /* D06140 80240A10 80A20005 */ lb $v0, 5($a1) /* D06144 80240A14 14620007 */ bne $v1, $v0, .L80240A34 -/* D06148 80240A18 00000000 */ nop +/* D06148 80240A18 00000000 */ nop /* D0614C 80240A1C 80C2028E */ lb $v0, 0x28e($a2) /* D06150 80240A20 84C30290 */ lh $v1, 0x290($a2) /* D06154 80240A24 00021200 */ sll $v0, $v0, 8 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240B2C_D0625C.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240B2C_D0625C.s index c4ee1a9d4b..835ed09e26 100644 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240B2C_D0625C.s +++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240B2C_D0625C.s @@ -26,7 +26,7 @@ glabel func_80240B2C_D0625C /* D062AC 80240B7C 1440FFFA */ bnez $v0, .L80240B68 /* D062B0 80240B80 24A50004 */ addiu $a1, $a1, 4 /* D062B4 80240B84 080902F2 */ j .L80240BC8 -/* D062B8 80240B88 00000000 */ nop +/* D062B8 80240B88 00000000 */ nop .L80240B8C: /* D062BC 80240B8C 0000182D */ daddu $v1, $zero, $zero /* D062C0 80240B90 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C68_D06398.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C68_D06398.s index 9691e02625..1b0bacca34 100644 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C68_D06398.s +++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C68_D06398.s @@ -115,7 +115,7 @@ glabel func_80240C68_D06398 /* D06540 80240E10 14E20005 */ bne $a3, $v0, .L80240E28 /* D06544 80240E14 32E2FFFF */ andi $v0, $s7, 0xffff /* D06548 80240E18 14400003 */ bnez $v0, .L80240E28 -/* D0654C 80240E1C 00000000 */ nop +/* D0654C 80240E1C 00000000 */ nop /* D06550 80240E20 14800008 */ bnez $a0, .L80240E44 /* D06554 80240E24 24020001 */ addiu $v0, $zero, 1 .L80240E28: @@ -123,7 +123,7 @@ glabel func_80240C68_D06398 /* D0655C 80240E2C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* D06560 80240E30 80420075 */ lb $v0, 0x75($v0) /* D06564 80240E34 10400005 */ beqz $v0, .L80240E4C -/* D06568 80240E38 00000000 */ nop +/* D06568 80240E38 00000000 */ nop /* D0656C 80240E3C 10800003 */ beqz $a0, .L80240E4C /* D06570 80240E40 24020001 */ addiu $v0, $zero, 1 .L80240E44: diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240F58_D06688.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240F58_D06688.s index 8dc8e415e8..81318d4d84 100644 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240F58_D06688.s +++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240F58_D06688.s @@ -39,13 +39,13 @@ glabel func_80240F58_D06688 /* D0670C 80240FDC 10740005 */ beq $v1, $s4, .L80240FF4 /* D06710 80240FE0 26100001 */ addiu $s0, $s0, 1 /* D06714 80240FE4 10730003 */ beq $v1, $s3, .L80240FF4 -/* D06718 80240FE8 00000000 */ nop +/* D06718 80240FE8 00000000 */ nop /* D0671C 80240FEC 00521025 */ or $v0, $v0, $s2 /* D06720 80240FF0 AC820000 */ sw $v0, ($a0) .L80240FF4: /* D06724 80240FF4 2A020040 */ slti $v0, $s0, 0x40 /* D06728 80240FF8 1440FFEF */ bnez $v0, .L80240FB8 -/* D0672C 80240FFC 00000000 */ nop +/* D0672C 80240FFC 00000000 */ nop /* D06730 80241000 0000802D */ daddu $s0, $zero, $zero /* D06734 80241004 3C120800 */ lui $s2, 0x800 .L80241008: @@ -57,13 +57,13 @@ glabel func_80240F58_D06688 /* D0674C 8024101C 8C640000 */ lw $a0, ($v1) /* D06750 80241020 30820010 */ andi $v0, $a0, 0x10 /* D06754 80241024 10400003 */ beqz $v0, .L80241034 -/* D06758 80241028 00000000 */ nop +/* D06758 80241028 00000000 */ nop /* D0675C 8024102C 00921025 */ or $v0, $a0, $s2 /* D06760 80241030 AC620000 */ sw $v0, ($v1) .L80241034: /* D06764 80241034 2A020100 */ slti $v0, $s0, 0x100 /* D06768 80241038 1440FFF3 */ bnez $v0, .L80241008 -/* D0676C 8024103C 00000000 */ nop +/* D0676C 8024103C 00000000 */ nop /* D06770 80241040 AE200070 */ sw $zero, 0x70($s1) .L80241044: /* D06774 80241044 8E220070 */ lw $v0, 0x70($s1) diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802410A4_D067D4.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802410A4_D067D4.s index 2d10796fd1..d660b84b79 100644 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802410A4_D067D4.s +++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802410A4_D067D4.s @@ -32,7 +32,7 @@ glabel func_802410A4_D067D4 /* D06838 80241108 0080302D */ daddu $a2, $a0, $zero /* D0683C 8024110C 8E020070 */ lw $v0, 0x70($s0) /* D06840 80241110 14400006 */ bnez $v0, .L8024112C -/* D06844 80241114 00000000 */ nop +/* D06844 80241114 00000000 */ nop /* D06848 80241118 8E020074 */ lw $v0, 0x74($s0) /* D0684C 8024111C 14400003 */ bnez $v0, .L8024112C /* D06850 80241120 24020001 */ addiu $v0, $zero, 1 @@ -66,13 +66,13 @@ glabel func_802410A4_D067D4 /* D068B8 80241188 10730005 */ beq $v1, $s3, .L802411A0 /* D068BC 8024118C 26100001 */ addiu $s0, $s0, 1 /* D068C0 80241190 10720003 */ beq $v1, $s2, .L802411A0 -/* D068C4 80241194 00000000 */ nop +/* D068C4 80241194 00000000 */ nop /* D068C8 80241198 00511024 */ and $v0, $v0, $s1 /* D068CC 8024119C AC820000 */ sw $v0, ($a0) .L802411A0: /* D068D0 802411A0 2A020040 */ slti $v0, $s0, 0x40 /* D068D4 802411A4 1440FFEF */ bnez $v0, .L80241164 -/* D068D8 802411A8 00000000 */ nop +/* D068D8 802411A8 00000000 */ nop /* D068DC 802411AC 0000802D */ daddu $s0, $zero, $zero /* D068E0 802411B0 3C11F7FF */ lui $s1, 0xf7ff /* D068E4 802411B4 3631FFFF */ ori $s1, $s1, 0xffff @@ -85,7 +85,7 @@ glabel func_802410A4_D067D4 /* D068FC 802411CC 8C640000 */ lw $a0, ($v1) /* D06900 802411D0 30820010 */ andi $v0, $a0, 0x10 /* D06904 802411D4 10400003 */ beqz $v0, .L802411E4 -/* D06908 802411D8 00000000 */ nop +/* D06908 802411D8 00000000 */ nop /* D0690C 802411DC 00911024 */ and $v0, $a0, $s1 /* D06910 802411E0 AC620000 */ sw $v0, ($v1) .L802411E4: @@ -93,7 +93,7 @@ glabel func_802410A4_D067D4 /* D06918 802411E8 1440FFF3 */ bnez $v0, .L802411B8 /* D0691C 802411EC 24020002 */ addiu $v0, $zero, 2 /* D06920 802411F0 0809047F */ j .L802411FC -/* D06924 802411F4 00000000 */ nop +/* D06924 802411F4 00000000 */ nop .L802411F8: /* D06928 802411F8 0000102D */ daddu $v0, $zero, $zero .L802411FC: diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024129C_D069CC.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024129C_D069CC.s index e12e0854b8..bc51a91a54 100644 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024129C_D069CC.s +++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024129C_D069CC.s @@ -16,19 +16,19 @@ glabel func_8024129C_D069CC /* D069F8 802412C8 0220202D */ daddu $a0, $s1, $zero /* D069FC 802412CC 3C05F4AC */ lui $a1, 0xf4ac /* D06A00 802412D0 4482B000 */ mtc1 $v0, $f22 -/* D06A04 802412D4 00000000 */ nop +/* D06A04 802412D4 00000000 */ nop /* D06A08 802412D8 4680B5A0 */ cvt.s.w $f22, $f22 /* D06A0C 802412DC 0C0B1EAF */ jal get_variable /* D06A10 802412E0 34A5D482 */ ori $a1, $a1, 0xd482 /* D06A14 802412E4 0220202D */ daddu $a0, $s1, $zero /* D06A18 802412E8 3C05F4AC */ lui $a1, 0xf4ac /* D06A1C 802412EC 4482A000 */ mtc1 $v0, $f20 -/* D06A20 802412F0 00000000 */ nop +/* D06A20 802412F0 00000000 */ nop /* D06A24 802412F4 4680A520 */ cvt.s.w $f20, $f20 /* D06A28 802412F8 0C0B1EAF */ jal get_variable /* D06A2C 802412FC 34A5D483 */ ori $a1, $a1, 0xd483 /* D06A30 80241300 44821000 */ mtc1 $v0, $f2 -/* D06A34 80241304 00000000 */ nop +/* D06A34 80241304 00000000 */ nop /* D06A38 80241308 468010A0 */ cvt.s.w $f2, $f2 /* D06A3C 8024130C 4405B000 */ mfc1 $a1, $f22 /* D06A40 80241310 4406A000 */ mfc1 $a2, $f20 @@ -45,19 +45,19 @@ glabel func_8024129C_D069CC /* D06A6C 8024133C 0220202D */ daddu $a0, $s1, $zero /* D06A70 80241340 3C05F4AC */ lui $a1, 0xf4ac /* D06A74 80241344 4482B000 */ mtc1 $v0, $f22 -/* D06A78 80241348 00000000 */ nop +/* D06A78 80241348 00000000 */ nop /* D06A7C 8024134C 4680B5A0 */ cvt.s.w $f22, $f22 /* D06A80 80241350 0C0B1EAF */ jal get_variable /* D06A84 80241354 34A5D482 */ ori $a1, $a1, 0xd482 /* D06A88 80241358 0220202D */ daddu $a0, $s1, $zero /* D06A8C 8024135C 3C05F4AC */ lui $a1, 0xf4ac /* D06A90 80241360 4482A000 */ mtc1 $v0, $f20 -/* D06A94 80241364 00000000 */ nop +/* D06A94 80241364 00000000 */ nop /* D06A98 80241368 4680A520 */ cvt.s.w $f20, $f20 /* D06A9C 8024136C 0C0B1EAF */ jal get_variable /* D06AA0 80241370 34A5D483 */ ori $a1, $a1, 0xd483 /* D06AA4 80241374 44821000 */ mtc1 $v0, $f2 -/* D06AA8 80241378 00000000 */ nop +/* D06AA8 80241378 00000000 */ nop /* D06AAC 8024137C 468010A0 */ cvt.s.w $f2, $f2 /* D06AB0 80241380 4405B000 */ mfc1 $a1, $f22 /* D06AB4 80241384 4406A000 */ mfc1 $a2, $f20 @@ -73,19 +73,19 @@ glabel func_8024129C_D069CC /* D06ADC 802413AC 0220202D */ daddu $a0, $s1, $zero /* D06AE0 802413B0 3C05F4AC */ lui $a1, 0xf4ac /* D06AE4 802413B4 4482B000 */ mtc1 $v0, $f22 -/* D06AE8 802413B8 00000000 */ nop +/* D06AE8 802413B8 00000000 */ nop /* D06AEC 802413BC 4680B5A0 */ cvt.s.w $f22, $f22 /* D06AF0 802413C0 0C0B1EAF */ jal get_variable /* D06AF4 802413C4 34A5D482 */ ori $a1, $a1, 0xd482 /* D06AF8 802413C8 0220202D */ daddu $a0, $s1, $zero /* D06AFC 802413CC 3C05F4AC */ lui $a1, 0xf4ac /* D06B00 802413D0 4482A000 */ mtc1 $v0, $f20 -/* D06B04 802413D4 00000000 */ nop +/* D06B04 802413D4 00000000 */ nop /* D06B08 802413D8 4680A520 */ cvt.s.w $f20, $f20 /* D06B0C 802413DC 0C0B1EAF */ jal get_variable /* D06B10 802413E0 34A5D483 */ ori $a1, $a1, 0xd483 /* D06B14 802413E4 44821000 */ mtc1 $v0, $f2 -/* D06B18 802413E8 00000000 */ nop +/* D06B18 802413E8 00000000 */ nop /* D06B1C 802413EC 468010A0 */ cvt.s.w $f2, $f2 /* D06B20 802413F0 4405B000 */ mfc1 $a1, $f22 /* D06B24 802413F4 4406A000 */ mfc1 $a2, $f20 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802414B4_D06BE4.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802414B4_D06BE4.s index f4a8c65a7f..19e1f61960 100644 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802414B4_D06BE4.s +++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802414B4_D06BE4.s @@ -44,7 +44,7 @@ glabel func_802414B4_D06BE4 /* D06C78 80241548 3C048025 */ lui $a0, %hi(D_8024B990) /* D06C7C 8024154C 8C84B990 */ lw $a0, %lo(D_8024B990)($a0) /* D06C80 80241550 0C048D70 */ jal func_801235C0 -/* D06C84 80241554 00000000 */ nop +/* D06C84 80241554 00000000 */ nop /* D06C88 80241558 24020002 */ addiu $v0, $zero, 2 .L8024155C: /* D06C8C 8024155C 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B24_D07254.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B24_D07254.s index 9c3ff0eb17..a3c6eec036 100644 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B24_D07254.s +++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B24_D07254.s @@ -13,7 +13,7 @@ glabel func_80241B24_D07254 /* D07274 80241B44 14620006 */ bne $v1, $v0, .L80241B60 /* D07278 80241B48 24020002 */ addiu $v0, $zero, 2 /* D0727C 80241B4C 44800000 */ mtc1 $zero, $f0 -/* D07280 80241B50 00000000 */ nop +/* D07280 80241B50 00000000 */ nop /* D07284 80241B54 44050000 */ mfc1 $a1, $f0 /* D07288 80241B58 080906DE */ j .L80241B78 /* D0728C 80241B5C 0000202D */ daddu $a0, $zero, $zero @@ -21,9 +21,9 @@ glabel func_80241B24_D07254 /* D07290 80241B60 14620008 */ bne $v1, $v0, .L80241B84 /* D07294 80241B64 24040001 */ addiu $a0, $zero, 1 /* D07298 80241B68 44800000 */ mtc1 $zero, $f0 -/* D0729C 80241B6C 00000000 */ nop +/* D0729C 80241B6C 00000000 */ nop /* D072A0 80241B70 44050000 */ mfc1 $a1, $f0 -/* D072A4 80241B74 00000000 */ nop +/* D072A4 80241B74 00000000 */ nop .L80241B78: /* D072A8 80241B78 00A0302D */ daddu $a2, $a1, $zero /* D072AC 80241B7C 0C01C5A4 */ jal func_80071690 diff --git a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240258_D11318.s b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240258_D11318.s index 441f5aafe0..87f8ad770e 100644 --- a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240258_D11318.s +++ b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240258_D11318.s @@ -42,7 +42,7 @@ glabel func_80240258_D11318 /* D113AC 802402EC C6620074 */ lwc1 $f2, 0x74($s3) /* D113B0 802402F0 468010A0 */ cvt.s.w $f2, $f2 /* D113B4 802402F4 4600103C */ c.lt.s $f2, $f0 -/* D113B8 802402F8 00000000 */ nop +/* D113B8 802402F8 00000000 */ nop /* D113BC 802402FC 45030001 */ bc1tl .L80240304 /* D113C0 80240300 0000882D */ daddu $s1, $zero, $zero .L80240304: @@ -51,16 +51,16 @@ glabel func_80240258_D11318 /* D113CC 8024030C 3C014387 */ lui $at, 0x4387 /* D113D0 80240310 4481A000 */ mtc1 $at, $f20 /* D113D4 80240314 0C00A70A */ jal get_clamped_angle_diff -/* D113D8 80240318 00000000 */ nop +/* D113D8 80240318 00000000 */ nop /* D113DC 8024031C 0C00A6C9 */ jal clamp_angle /* D113E0 80240320 46000306 */ mov.s $f12, $f0 /* D113E4 80240324 3C018024 */ lui $at, %hi(D_80242370) /* D113E8 80240328 D4222370 */ ldc1 $f2, %lo(D_80242370)($at) /* D113EC 8024032C 46000021 */ cvt.d.s $f0, $f0 /* D113F0 80240330 4622003C */ c.lt.d $f0, $f2 -/* D113F4 80240334 00000000 */ nop +/* D113F4 80240334 00000000 */ nop /* D113F8 80240338 45000003 */ bc1f .L80240348 -/* D113FC 8024033C 00000000 */ nop +/* D113FC 8024033C 00000000 */ nop /* D11400 80240340 3C0142B4 */ lui $at, 0x42b4 /* D11404 80240344 4481A000 */ mtc1 $at, $f20 .L80240348: @@ -77,7 +77,7 @@ glabel func_80240258_D11318 /* D11430 80240370 468010A0 */ cvt.s.w $f2, $f2 /* D11434 80240374 46000005 */ abs.s $f0, $f0 /* D11438 80240378 4600103C */ c.lt.s $f2, $f0 -/* D1143C 8024037C 00000000 */ nop +/* D1143C 8024037C 00000000 */ nop /* D11440 80240380 45030001 */ bc1tl .L80240388 /* D11444 80240384 0000882D */ daddu $s1, $zero, $zero .L80240388: @@ -87,13 +87,13 @@ glabel func_80240258_D11318 /* D11454 80240394 860200A8 */ lh $v0, 0xa8($s0) /* D11458 80240398 46020001 */ sub.s $f0, $f0, $f2 /* D1145C 8024039C 44821000 */ mtc1 $v0, $f2 -/* D11460 802403A0 00000000 */ nop +/* D11460 802403A0 00000000 */ nop /* D11464 802403A4 468010A1 */ cvt.d.w $f2, $f2 /* D11468 802403A8 46221080 */ add.d $f2, $f2, $f2 /* D1146C 802403AC 46000005 */ abs.s $f0, $f0 /* D11470 802403B0 46000021 */ cvt.d.s $f0, $f0 /* D11474 802403B4 4620103E */ c.le.d $f2, $f0 -/* D11478 802403B8 00000000 */ nop +/* D11478 802403B8 00000000 */ nop /* D1147C 802403BC 45030001 */ bc1tl .L802403C4 /* D11480 802403C0 0000882D */ daddu $s1, $zero, $zero .L802403C4: diff --git a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024040C_D114CC.s b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024040C_D114CC.s index d28c35f589..1682d391a3 100644 --- a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024040C_D114CC.s +++ b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024040C_D114CC.s @@ -19,7 +19,7 @@ glabel func_8024040C_D114CC /* D11504 80240444 8E2200B0 */ lw $v0, 0xb0($s1) /* D11508 80240448 30420004 */ andi $v0, $v0, 4 /* D1150C 8024044C 10400015 */ beqz $v0, .L802404A4 -/* D11510 80240450 00000000 */ nop +/* D11510 80240450 00000000 */ nop .L80240454: /* D11514 80240454 AE800070 */ sw $zero, 0x70($s4) /* D11518 80240458 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel func_8024040C_D114CC /* D11568 802404A8 12600005 */ beqz $s3, .L802404C0 /* D1156C 802404AC 24020001 */ addiu $v0, $zero, 1 /* D11570 802404B0 12620048 */ beq $s3, $v0, .L802405D4 -/* D11574 802404B4 00000000 */ nop +/* D11574 802404B4 00000000 */ nop /* D11578 802404B8 08090192 */ j .L80240648 -/* D1157C 802404BC 00000000 */ nop +/* D1157C 802404BC 00000000 */ nop .L802404C0: /* D11580 802404C0 86240008 */ lh $a0, 8($s1) /* D11584 802404C4 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel func_8024040C_D114CC /* D115A4 802404E4 8E03006C */ lw $v1, 0x6c($s0) /* D115A8 802404E8 24020003 */ addiu $v0, $zero, 3 /* D115AC 802404EC 14620056 */ bne $v1, $v0, .L80240648 -/* D115B0 802404F0 00000000 */ nop +/* D115B0 802404F0 00000000 */ nop /* D115B4 802404F4 8E2500A8 */ lw $a1, 0xa8($s1) /* D115B8 802404F8 10A00003 */ beqz $a1, .L80240508 /* D115BC 802404FC 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel func_8024040C_D114CC /* D11634 80240574 C7A20014 */ lwc1 $f2, 0x14($sp) /* D11638 80240578 4600020D */ trunc.w.s $f8, $f0 /* D1163C 8024057C 44024000 */ mfc1 $v0, $f8 -/* D11640 80240580 00000000 */ nop +/* D11640 80240580 00000000 */ nop /* D11644 80240584 A6220012 */ sh $v0, 0x12($s1) /* D11648 80240588 4600120D */ trunc.w.s $f8, $f2 /* D1164C 8024058C 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s index 8e6611b3c7..e99e5010e0 100644 --- a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s +++ b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s @@ -100,78 +100,93 @@ glabel func_8024066C_D1172C /* D11890 802407D0 2C620064 */ sltiu $v0, $v1, 0x64 /* D11894 802407D4 10400048 */ beqz $v0, .L802408F8 /* D11898 802407D8 00031080 */ sll $v0, $v1, 2 -/* D1189C 802407DC 3C018024 */ lui $at, %hi(D_80242378) +/* D1189C 802407DC 3C018024 */ lui $at, %hi(jtbl_80242378_D13438) /* D118A0 802407E0 00220821 */ addu $at, $at, $v0 -/* D118A4 802407E4 8C222378 */ lw $v0, %lo(D_80242378)($at) +/* D118A4 802407E4 8C222378 */ lw $v0, %lo(jtbl_80242378_D13438)($at) /* D118A8 802407E8 00400008 */ jr $v0 /* D118AC 802407EC 00000000 */ nop +glabel L802407F0_D118B0 /* D118B0 802407F0 0240202D */ daddu $a0, $s2, $zero /* D118B4 802407F4 0260282D */ daddu $a1, $s3, $zero /* D118B8 802407F8 0C012568 */ jal func_800495A0 /* D118BC 802407FC 0280302D */ daddu $a2, $s4, $zero +glabel L80240800_D118C0 /* D118C0 80240800 0240202D */ daddu $a0, $s2, $zero /* D118C4 80240804 0260282D */ daddu $a1, $s3, $zero /* D118C8 80240808 0C0125AE */ jal func_800496B8 /* D118CC 8024080C 0280302D */ daddu $a2, $s4, $zero /* D118D0 80240810 0809023E */ j .L802408F8 /* D118D4 80240814 00000000 */ nop +glabel L80240818_D118D8 /* D118D8 80240818 0240202D */ daddu $a0, $s2, $zero /* D118DC 8024081C 0260282D */ daddu $a1, $s3, $zero /* D118E0 80240820 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D118E4 80240824 0280302D */ daddu $a2, $s4, $zero +glabel L80240828_D118E8 /* D118E8 80240828 0240202D */ daddu $a0, $s2, $zero /* D118EC 8024082C 0260282D */ daddu $a1, $s3, $zero /* D118F0 80240830 0C012701 */ jal func_80049C04 /* D118F4 80240834 0280302D */ daddu $a2, $s4, $zero /* D118F8 80240838 0809023E */ j .L802408F8 /* D118FC 8024083C 00000000 */ nop +glabel L80240840_D11900 /* D11900 80240840 0240202D */ daddu $a0, $s2, $zero /* D11904 80240844 0260282D */ daddu $a1, $s3, $zero /* D11908 80240848 0C01278F */ jal func_80049E3C /* D1190C 8024084C 0280302D */ daddu $a2, $s4, $zero +glabel L80240850_D11910 /* D11910 80240850 0240202D */ daddu $a0, $s2, $zero /* D11914 80240854 0260282D */ daddu $a1, $s3, $zero /* D11918 80240858 0C0127B3 */ jal func_80049ECC /* D1191C 8024085C 0280302D */ daddu $a2, $s4, $zero /* D11920 80240860 0809023E */ j .L802408F8 /* D11924 80240864 00000000 */ nop +glabel L80240868_D11928 /* D11928 80240868 0240202D */ daddu $a0, $s2, $zero /* D1192C 8024086C 0260282D */ daddu $a1, $s3, $zero /* D11930 80240870 0C0127DF */ jal func_80049F7C /* D11934 80240874 0280302D */ daddu $a2, $s4, $zero +glabel L80240878_D11938 /* D11938 80240878 0240202D */ daddu $a0, $s2, $zero /* D1193C 8024087C 0260282D */ daddu $a1, $s3, $zero /* D11940 80240880 0C012849 */ jal func_8004A124 /* D11944 80240884 0280302D */ daddu $a2, $s4, $zero /* D11948 80240888 0809023E */ j .L802408F8 /* D1194C 8024088C 00000000 */ nop +glabel L80240890_D11950 /* D11950 80240890 0240202D */ daddu $a0, $s2, $zero /* D11954 80240894 0260282D */ daddu $a1, $s3, $zero /* D11958 80240898 0C0128FA */ jal func_8004A3E8 /* D1195C 8024089C 0280302D */ daddu $a2, $s4, $zero /* D11960 802408A0 0809023E */ j .L802408F8 /* D11964 802408A4 00000000 */ nop +glabel L802408A8_D11968 /* D11968 802408A8 0C090014 */ jal sam_03_UnkNpcAIFunc6 /* D1196C 802408AC 0240202D */ daddu $a0, $s2, $zero +glabel L802408B0_D11970 /* D11970 802408B0 0C09002F */ jal sam_03_UnkNpcAIFunc7 /* D11974 802408B4 0240202D */ daddu $a0, $s2, $zero /* D11978 802408B8 8E430070 */ lw $v1, 0x70($s2) /* D1197C 802408BC 24020020 */ addiu $v0, $zero, 0x20 /* D11980 802408C0 1462000D */ bne $v1, $v0, .L802408F8 /* D11984 802408C4 00000000 */ nop +glabel L802408C8_D11988 /* D11988 802408C8 0C09004B */ jal sam_03_UnkNpcAIFunc8 /* D1198C 802408CC 0240202D */ daddu $a0, $s2, $zero /* D11990 802408D0 8E430070 */ lw $v1, 0x70($s2) /* D11994 802408D4 24020021 */ addiu $v0, $zero, 0x21 /* D11998 802408D8 14620007 */ bne $v1, $v0, .L802408F8 /* D1199C 802408DC 00000000 */ nop +glabel L802408E0_D119A0 /* D119A0 802408E0 0C090081 */ jal sam_03_UnkNpcAIFunc5 /* D119A4 802408E4 0240202D */ daddu $a0, $s2, $zero /* D119A8 802408E8 0809023E */ j .L802408F8 /* D119AC 802408EC 00000000 */ nop +glabel L802408F0_D119B0 /* D119B0 802408F0 0C0129CF */ jal func_8004A73C /* D119B4 802408F4 0240202D */ daddu $a0, $s2, $zero .L802408F8: +glabel L802408F8_D119B8 /* D119B8 802408F8 8FBF0048 */ lw $ra, 0x48($sp) /* D119BC 802408FC 8FB50044 */ lw $s5, 0x44($sp) /* D119C0 80240900 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_sam/sam_04/D13810/func_80240240_D13810.s b/asm/nonmatchings/world/area_sam/sam_04/D13810/func_80240240_D13810.s index bdec32d8fd..53b336ad09 100644 --- a/asm/nonmatchings/world/area_sam/sam_04/D13810/func_80240240_D13810.s +++ b/asm/nonmatchings/world/area_sam/sam_04/D13810/func_80240240_D13810.s @@ -52,5 +52,5 @@ glabel func_80240240_D13810 /* D138CC 802402FC 24020002 */ addiu $v0, $zero, 2 /* D138D0 80240300 03E00008 */ jr $ra /* D138D4 80240304 27BD0038 */ addiu $sp, $sp, 0x38 -/* D138D8 80240308 00000000 */ nop -/* D138DC 8024030C 00000000 */ nop +/* D138D8 80240308 00000000 */ nop +/* D138DC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_802405C8_D13B98.s b/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_802405C8_D13B98.s index db0297b4c3..1ff8f93850 100644 --- a/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_802405C8_D13B98.s +++ b/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_802405C8_D13B98.s @@ -28,7 +28,7 @@ glabel func_802405C8_D13B98 /* D13BEC 8024061C 00220821 */ addu $at, $at, $v0 /* D13BF0 80240620 AC205210 */ sw $zero, %lo(D_80245210)($at) /* D13BF4 80240624 08090195 */ j .L80240654 -/* D13BF8 80240628 00000000 */ nop +/* D13BF8 80240628 00000000 */ nop .L8024062C: /* D13BFC 8024062C 3C038024 */ lui $v1, %hi(D_80245210) /* D13C00 80240630 24635210 */ addiu $v1, $v1, %lo(D_80245210) diff --git a/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240664_D13C34.s b/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240664_D13C34.s index 1691e68a2d..2d75df510e 100644 --- a/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240664_D13C34.s +++ b/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240664_D13C34.s @@ -28,7 +28,7 @@ glabel func_80240664_D13C34 /* D13C88 802406B8 00220821 */ addu $at, $at, $v0 /* D13C8C 802406BC AC2053D8 */ sw $zero, %lo(D_802453D8)($at) /* D13C90 802406C0 080901BC */ j .L802406F0 -/* D13C94 802406C4 00000000 */ nop +/* D13C94 802406C4 00000000 */ nop .L802406C8: /* D13C98 802406C8 3C038024 */ lui $v1, %hi(D_802453D8) /* D13C9C 802406CC 246353D8 */ addiu $v1, $v1, %lo(D_802453D8) diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80240208_D189E8.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80240208_D189E8.s index 8fe17cac32..2cc571fd6b 100644 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80240208_D189E8.s +++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80240208_D189E8.s @@ -42,7 +42,7 @@ glabel func_80240208_D189E8 /* D18A7C 8024029C C6620074 */ lwc1 $f2, 0x74($s3) /* D18A80 802402A0 468010A0 */ cvt.s.w $f2, $f2 /* D18A84 802402A4 4600103C */ c.lt.s $f2, $f0 -/* D18A88 802402A8 00000000 */ nop +/* D18A88 802402A8 00000000 */ nop /* D18A8C 802402AC 45030001 */ bc1tl .L802402B4 /* D18A90 802402B0 0000882D */ daddu $s1, $zero, $zero .L802402B4: @@ -51,16 +51,16 @@ glabel func_80240208_D189E8 /* D18A9C 802402BC 3C014387 */ lui $at, 0x4387 /* D18AA0 802402C0 4481A000 */ mtc1 $at, $f20 /* D18AA4 802402C4 0C00A70A */ jal get_clamped_angle_diff -/* D18AA8 802402C8 00000000 */ nop +/* D18AA8 802402C8 00000000 */ nop /* D18AAC 802402CC 0C00A6C9 */ jal clamp_angle /* D18AB0 802402D0 46000306 */ mov.s $f12, $f0 /* D18AB4 802402D4 3C018024 */ lui $at, %hi(D_802474E0) /* D18AB8 802402D8 D42274E0 */ ldc1 $f2, %lo(D_802474E0)($at) /* D18ABC 802402DC 46000021 */ cvt.d.s $f0, $f0 /* D18AC0 802402E0 4622003C */ c.lt.d $f0, $f2 -/* D18AC4 802402E4 00000000 */ nop +/* D18AC4 802402E4 00000000 */ nop /* D18AC8 802402E8 45000003 */ bc1f .L802402F8 -/* D18ACC 802402EC 00000000 */ nop +/* D18ACC 802402EC 00000000 */ nop /* D18AD0 802402F0 3C0142B4 */ lui $at, 0x42b4 /* D18AD4 802402F4 4481A000 */ mtc1 $at, $f20 .L802402F8: @@ -77,7 +77,7 @@ glabel func_80240208_D189E8 /* D18B00 80240320 468010A0 */ cvt.s.w $f2, $f2 /* D18B04 80240324 46000005 */ abs.s $f0, $f0 /* D18B08 80240328 4600103C */ c.lt.s $f2, $f0 -/* D18B0C 8024032C 00000000 */ nop +/* D18B0C 8024032C 00000000 */ nop /* D18B10 80240330 45030001 */ bc1tl .L80240338 /* D18B14 80240334 0000882D */ daddu $s1, $zero, $zero .L80240338: @@ -87,13 +87,13 @@ glabel func_80240208_D189E8 /* D18B24 80240344 860200A8 */ lh $v0, 0xa8($s0) /* D18B28 80240348 46020001 */ sub.s $f0, $f0, $f2 /* D18B2C 8024034C 44821000 */ mtc1 $v0, $f2 -/* D18B30 80240350 00000000 */ nop +/* D18B30 80240350 00000000 */ nop /* D18B34 80240354 468010A1 */ cvt.d.w $f2, $f2 /* D18B38 80240358 46221080 */ add.d $f2, $f2, $f2 /* D18B3C 8024035C 46000005 */ abs.s $f0, $f0 /* D18B40 80240360 46000021 */ cvt.d.s $f0, $f0 /* D18B44 80240364 4620103E */ c.le.d $f2, $f0 -/* D18B48 80240368 00000000 */ nop +/* D18B48 80240368 00000000 */ nop /* D18B4C 8024036C 45030001 */ bc1tl .L80240374 /* D18B50 80240370 0000882D */ daddu $s1, $zero, $zero .L80240374: diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s index 62c9a72cd2..2830d91f1e 100644 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s +++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s @@ -100,78 +100,93 @@ glabel func_8024061C_D18DFC /* D18F60 80240780 2C620064 */ sltiu $v0, $v1, 0x64 /* D18F64 80240784 10400048 */ beqz $v0, .L802408A8 /* D18F68 80240788 00031080 */ sll $v0, $v1, 2 -/* D18F6C 8024078C 3C018024 */ lui $at, %hi(D_802474E8) +/* D18F6C 8024078C 3C018024 */ lui $at, %hi(jtbl_802474E8_D1FCC8) /* D18F70 80240790 00220821 */ addu $at, $at, $v0 -/* D18F74 80240794 8C2274E8 */ lw $v0, %lo(D_802474E8)($at) +/* D18F74 80240794 8C2274E8 */ lw $v0, %lo(jtbl_802474E8_D1FCC8)($at) /* D18F78 80240798 00400008 */ jr $v0 /* D18F7C 8024079C 00000000 */ nop +glabel L802407A0_D18F80 /* D18F80 802407A0 0240202D */ daddu $a0, $s2, $zero /* D18F84 802407A4 0260282D */ daddu $a1, $s3, $zero /* D18F88 802407A8 0C012568 */ jal func_800495A0 /* D18F8C 802407AC 0280302D */ daddu $a2, $s4, $zero +glabel L802407B0_D18F90 /* D18F90 802407B0 0240202D */ daddu $a0, $s2, $zero /* D18F94 802407B4 0260282D */ daddu $a1, $s3, $zero /* D18F98 802407B8 0C0125AE */ jal func_800496B8 /* D18F9C 802407BC 0280302D */ daddu $a2, $s4, $zero /* D18FA0 802407C0 0809022A */ j .L802408A8 /* D18FA4 802407C4 00000000 */ nop +glabel L802407C8_D18FA8 /* D18FA8 802407C8 0240202D */ daddu $a0, $s2, $zero /* D18FAC 802407CC 0260282D */ daddu $a1, $s3, $zero /* D18FB0 802407D0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D18FB4 802407D4 0280302D */ daddu $a2, $s4, $zero +glabel L802407D8_D18FB8 /* D18FB8 802407D8 0240202D */ daddu $a0, $s2, $zero /* D18FBC 802407DC 0260282D */ daddu $a1, $s3, $zero /* D18FC0 802407E0 0C012701 */ jal func_80049C04 /* D18FC4 802407E4 0280302D */ daddu $a2, $s4, $zero /* D18FC8 802407E8 0809022A */ j .L802408A8 /* D18FCC 802407EC 00000000 */ nop +glabel L802407F0_D18FD0 /* D18FD0 802407F0 0240202D */ daddu $a0, $s2, $zero /* D18FD4 802407F4 0260282D */ daddu $a1, $s3, $zero /* D18FD8 802407F8 0C01278F */ jal func_80049E3C /* D18FDC 802407FC 0280302D */ daddu $a2, $s4, $zero +glabel L80240800_D18FE0 /* D18FE0 80240800 0240202D */ daddu $a0, $s2, $zero /* D18FE4 80240804 0260282D */ daddu $a1, $s3, $zero /* D18FE8 80240808 0C0127B3 */ jal func_80049ECC /* D18FEC 8024080C 0280302D */ daddu $a2, $s4, $zero /* D18FF0 80240810 0809022A */ j .L802408A8 /* D18FF4 80240814 00000000 */ nop +glabel L80240818_D18FF8 /* D18FF8 80240818 0240202D */ daddu $a0, $s2, $zero /* D18FFC 8024081C 0260282D */ daddu $a1, $s3, $zero /* D19000 80240820 0C0127DF */ jal func_80049F7C /* D19004 80240824 0280302D */ daddu $a2, $s4, $zero +glabel L80240828_D19008 /* D19008 80240828 0240202D */ daddu $a0, $s2, $zero /* D1900C 8024082C 0260282D */ daddu $a1, $s3, $zero /* D19010 80240830 0C012849 */ jal func_8004A124 /* D19014 80240834 0280302D */ daddu $a2, $s4, $zero /* D19018 80240838 0809022A */ j .L802408A8 /* D1901C 8024083C 00000000 */ nop +glabel L80240840_D19020 /* D19020 80240840 0240202D */ daddu $a0, $s2, $zero /* D19024 80240844 0260282D */ daddu $a1, $s3, $zero /* D19028 80240848 0C0128FA */ jal func_8004A3E8 /* D1902C 8024084C 0280302D */ daddu $a2, $s4, $zero /* D19030 80240850 0809022A */ j .L802408A8 /* D19034 80240854 00000000 */ nop +glabel L80240858_D19038 /* D19038 80240858 0C090000 */ jal sam_05_UnkNpcAIFunc6 /* D1903C 8024085C 0240202D */ daddu $a0, $s2, $zero +glabel L80240860_D19040 /* D19040 80240860 0C09001B */ jal sam_05_UnkNpcAIFunc7 /* D19044 80240864 0240202D */ daddu $a0, $s2, $zero /* D19048 80240868 8E430070 */ lw $v1, 0x70($s2) /* D1904C 8024086C 24020020 */ addiu $v0, $zero, 0x20 /* D19050 80240870 1462000D */ bne $v1, $v0, .L802408A8 /* D19054 80240874 00000000 */ nop +glabel L80240878_D19058 /* D19058 80240878 0C090037 */ jal sam_05_UnkNpcAIFunc8 /* D1905C 8024087C 0240202D */ daddu $a0, $s2, $zero /* D19060 80240880 8E430070 */ lw $v1, 0x70($s2) /* D19064 80240884 24020021 */ addiu $v0, $zero, 0x21 /* D19068 80240888 14620007 */ bne $v1, $v0, .L802408A8 /* D1906C 8024088C 00000000 */ nop +glabel L80240890_D19070 /* D19070 80240890 0C09006D */ jal sam_05_UnkNpcAIFunc5 /* D19074 80240894 0240202D */ daddu $a0, $s2, $zero /* D19078 80240898 0809022A */ j .L802408A8 /* D1907C 8024089C 00000000 */ nop +glabel L802408A0_D19080 /* D19080 802408A0 0C0129CF */ jal func_8004A73C /* D19084 802408A4 0240202D */ daddu $a0, $s2, $zero .L802408A8: +glabel L802408A8_D19088 /* D19088 802408A8 8FBF0048 */ lw $ra, 0x48($sp) /* D1908C 802408AC 8FB50044 */ lw $s5, 0x44($sp) /* D19090 802408B0 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024093C_D1911C.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024093C_D1911C.s index 4077dc0bc4..06908c9e46 100644 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024093C_D1911C.s +++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024093C_D1911C.s @@ -38,7 +38,7 @@ glabel func_8024093C_D1911C /* D191A0 802409C0 3C01C1A0 */ lui $at, 0xc1a0 /* D191A4 802409C4 44812000 */ mtc1 $at, $f4 /* D191A8 802409C8 44833000 */ mtc1 $v1, $f6 -/* D191AC 802409CC 00000000 */ nop +/* D191AC 802409CC 00000000 */ nop /* D191B0 802409D0 468031A0 */ cvt.s.w $f6, $f6 /* D191B4 802409D4 44073000 */ mfc1 $a3, $f6 /* D191B8 802409D8 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80240A38_D19218.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80240A38_D19218.s index 4d7a224c83..51cd0c7e32 100644 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80240A38_D19218.s +++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80240A38_D19218.s @@ -39,18 +39,18 @@ glabel func_80240A38_D19218 .L80240AC0: /* D192A0 80240AC0 8622008E */ lh $v0, 0x8e($s1) /* D192A4 80240AC4 1440025D */ bnez $v0, .L8024143C -/* D192A8 80240AC8 00000000 */ nop +/* D192A8 80240AC8 00000000 */ nop /* D192AC 80240ACC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* D192B0 80240AD0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* D192B4 80240AD4 0C00A6C9 */ jal clamp_angle /* D192B8 80240AD8 C44C00A8 */ lwc1 $f12, 0xa8($v0) /* D192BC 80240ADC 3C014334 */ lui $at, 0x4334 /* D192C0 80240AE0 44811000 */ mtc1 $at, $f2 -/* D192C4 80240AE4 00000000 */ nop +/* D192C4 80240AE4 00000000 */ nop /* D192C8 80240AE8 4602003C */ c.lt.s $f0, $f2 -/* D192CC 80240AEC 00000000 */ nop +/* D192CC 80240AEC 00000000 */ nop /* D192D0 80240AF0 45000011 */ bc1f .L80240B38 -/* D192D4 80240AF4 00000000 */ nop +/* D192D4 80240AF4 00000000 */ nop /* D192D8 80240AF8 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* D192DC 80240AFC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* D192E0 80240B00 3C0142B4 */ lui $at, 0x42b4 @@ -85,7 +85,7 @@ glabel func_80240A38_D19218 /* D19350 80240B70 460C0300 */ add.s $f12, $f0, $f12 .L80240B74: /* D19354 80240B74 0C00A6C9 */ jal clamp_angle -/* D19358 80240B78 00000000 */ nop +/* D19358 80240B78 00000000 */ nop /* D1935C 80240B7C 46000586 */ mov.s $f22, $f0 /* D19360 80240B80 3C014334 */ lui $at, 0x4334 /* D19364 80240B84 44816000 */ mtc1 $at, $f12 @@ -134,7 +134,7 @@ glabel func_80240A38_D19218 /* D19400 80240C20 862200A6 */ lh $v0, 0xa6($s1) /* D19404 80240C24 8EA30000 */ lw $v1, ($s5) /* D19408 80240C28 44824000 */ mtc1 $v0, $f8 -/* D1940C 80240C2C 00000000 */ nop +/* D1940C 80240C2C 00000000 */ nop /* D19410 80240C30 46804220 */ cvt.s.w $f8, $f8 /* D19414 80240C34 C4600028 */ lwc1 $f0, 0x28($v1) /* D19418 80240C38 44064000 */ mfc1 $a2, $f8 @@ -146,7 +146,7 @@ glabel func_80240A38_D19218 /* D19430 80240C50 E6200040 */ swc1 $f0, 0x40($s1) /* D19434 80240C54 862200A6 */ lh $v0, 0xa6($s1) /* D19438 80240C58 44820000 */ mtc1 $v0, $f0 -/* D1943C 80240C5C 00000000 */ nop +/* D1943C 80240C5C 00000000 */ nop /* D19440 80240C60 46800020 */ cvt.s.w $f0, $f0 /* D19444 80240C64 4600A000 */ add.s $f0, $f20, $f0 /* D19448 80240C68 4406B000 */ mfc1 $a2, $f22 @@ -155,18 +155,18 @@ glabel func_80240A38_D19218 /* D19454 80240C74 0220202D */ daddu $a0, $s1, $zero /* D19458 80240C78 8EC20088 */ lw $v0, 0x88($s6) /* D1945C 80240C7C 1440005D */ bnez $v0, .L80240DF4 -/* D19460 80240C80 00000000 */ nop +/* D19460 80240C80 00000000 */ nop /* D19464 80240C84 C6200038 */ lwc1 $f0, 0x38($s1) /* D19468 80240C88 3C018024 */ lui $at, %hi(D_80247678) /* D1946C 80240C8C D4247678 */ ldc1 $f4, %lo(D_80247678)($at) /* D19470 80240C90 46000021 */ cvt.d.s $f0, $f0 /* D19474 80240C94 4620203C */ c.lt.d $f4, $f0 -/* D19478 80240C98 00000000 */ nop +/* D19478 80240C98 00000000 */ nop /* D1947C 80240C9C 45000005 */ bc1f .L80240CB4 -/* D19480 80240CA0 00000000 */ nop +/* D19480 80240CA0 00000000 */ nop /* D19484 80240CA4 3C0143BE */ lui $at, 0x43be /* D19488 80240CA8 44810000 */ mtc1 $at, $f0 -/* D1948C 80240CAC 00000000 */ nop +/* D1948C 80240CAC 00000000 */ nop /* D19490 80240CB0 E6200038 */ swc1 $f0, 0x38($s1) .L80240CB4: /* D19494 80240CB4 C6200038 */ lwc1 $f0, 0x38($s1) @@ -174,50 +174,50 @@ glabel func_80240A38_D19218 /* D1949C 80240CBC D4227680 */ ldc1 $f2, %lo(D_80247680)($at) /* D194A0 80240CC0 46000021 */ cvt.d.s $f0, $f0 /* D194A4 80240CC4 4622003C */ c.lt.d $f0, $f2 -/* D194A8 80240CC8 00000000 */ nop +/* D194A8 80240CC8 00000000 */ nop /* D194AC 80240CCC 45000005 */ bc1f .L80240CE4 -/* D194B0 80240CD0 00000000 */ nop +/* D194B0 80240CD0 00000000 */ nop /* D194B4 80240CD4 3C01C3BE */ lui $at, 0xc3be /* D194B8 80240CD8 44810000 */ mtc1 $at, $f0 -/* D194BC 80240CDC 00000000 */ nop +/* D194BC 80240CDC 00000000 */ nop /* D194C0 80240CE0 E6200038 */ swc1 $f0, 0x38($s1) .L80240CE4: /* D194C4 80240CE4 C6200040 */ lwc1 $f0, 0x40($s1) /* D194C8 80240CE8 46000021 */ cvt.d.s $f0, $f0 /* D194CC 80240CEC 4620203C */ c.lt.d $f4, $f0 -/* D194D0 80240CF0 00000000 */ nop +/* D194D0 80240CF0 00000000 */ nop /* D194D4 80240CF4 45000005 */ bc1f .L80240D0C -/* D194D8 80240CF8 00000000 */ nop +/* D194D8 80240CF8 00000000 */ nop /* D194DC 80240CFC 3C0143BE */ lui $at, 0x43be /* D194E0 80240D00 44810000 */ mtc1 $at, $f0 -/* D194E4 80240D04 00000000 */ nop +/* D194E4 80240D04 00000000 */ nop /* D194E8 80240D08 E6200040 */ swc1 $f0, 0x40($s1) .L80240D0C: /* D194EC 80240D0C C6200040 */ lwc1 $f0, 0x40($s1) /* D194F0 80240D10 46000021 */ cvt.d.s $f0, $f0 /* D194F4 80240D14 4622003C */ c.lt.d $f0, $f2 -/* D194F8 80240D18 00000000 */ nop +/* D194F8 80240D18 00000000 */ nop /* D194FC 80240D1C 45000005 */ bc1f .L80240D34 -/* D19500 80240D20 00000000 */ nop +/* D19500 80240D20 00000000 */ nop /* D19504 80240D24 3C01C3BE */ lui $at, 0xc3be /* D19508 80240D28 44810000 */ mtc1 $at, $f0 -/* D1950C 80240D2C 00000000 */ nop +/* D1950C 80240D2C 00000000 */ nop /* D19510 80240D30 E6200040 */ swc1 $f0, 0x40($s1) .L80240D34: /* D19514 80240D34 C6220038 */ lwc1 $f2, 0x38($s1) /* D19518 80240D38 46021082 */ mul.s $f2, $f2, $f2 -/* D1951C 80240D3C 00000000 */ nop +/* D1951C 80240D3C 00000000 */ nop /* D19520 80240D40 C6200040 */ lwc1 $f0, 0x40($s1) /* D19524 80240D44 46000002 */ mul.s $f0, $f0, $f0 -/* D19528 80240D48 00000000 */ nop +/* D19528 80240D48 00000000 */ nop /* D1952C 80240D4C 46001300 */ add.s $f12, $f2, $f0 /* D19530 80240D50 46006004 */ sqrt.s $f0, $f12 /* D19534 80240D54 46000032 */ c.eq.s $f0, $f0 -/* D19538 80240D58 00000000 */ nop +/* D19538 80240D58 00000000 */ nop /* D1953C 80240D5C 45010003 */ bc1t .L80240D6C -/* D19540 80240D60 00000000 */ nop +/* D19540 80240D60 00000000 */ nop /* D19544 80240D64 0C0187BC */ jal sqrtf -/* D19548 80240D68 00000000 */ nop +/* D19548 80240D68 00000000 */ nop .L80240D6C: /* D1954C 80240D6C 8E260038 */ lw $a2, 0x38($s1) /* D19550 80240D70 8E270040 */ lw $a3, 0x40($s1) @@ -232,7 +232,7 @@ glabel func_80240A38_D19218 /* D19574 80240D94 D4207688 */ ldc1 $f0, %lo(D_80247688)($at) /* D19578 80240D98 460010A1 */ cvt.d.s $f2, $f2 /* D1957C 80240D9C 4620103C */ c.lt.d $f2, $f0 -/* D19580 80240DA0 00000000 */ nop +/* D19580 80240DA0 00000000 */ nop /* D19584 80240DA4 45000004 */ bc1f .L80240DB8 /* D19588 80240DA8 0200202D */ daddu $a0, $s0, $zero /* D1958C 80240DAC 3C064398 */ lui $a2, 0x4398 @@ -242,9 +242,9 @@ glabel func_80240A38_D19218 /* D19598 80240DB8 3C018024 */ lui $at, %hi(D_80247690) /* D1959C 80240DBC D4207690 */ ldc1 $f0, %lo(D_80247690)($at) /* D195A0 80240DC0 4622003C */ c.lt.d $f0, $f2 -/* D195A4 80240DC4 00000000 */ nop +/* D195A4 80240DC4 00000000 */ nop /* D195A8 80240DC8 450000FA */ bc1f .L802411B4 -/* D195AC 80240DCC 00000000 */ nop +/* D195AC 80240DCC 00000000 */ nop /* D195B0 80240DD0 3C0643BB */ lui $a2, 0x43bb /* D195B4 80240DD4 34C68000 */ ori $a2, $a2, 0x8000 .L80240DD8: @@ -254,7 +254,7 @@ glabel func_80240A38_D19218 /* D195C4 80240DE4 0C00A7E7 */ jal add_vec2D_polar /* D195C8 80240DE8 E6340040 */ swc1 $f20, 0x40($s1) /* D195CC 80240DEC 0809046D */ j .L802411B4 -/* D195D0 80240DF0 00000000 */ nop +/* D195D0 80240DF0 00000000 */ nop .L80240DF4: /* D195D4 80240DF4 8E220000 */ lw $v0, ($s1) /* D195D8 80240DF8 30420040 */ andi $v0, $v0, 0x40 @@ -281,13 +281,13 @@ glabel func_80240A38_D19218 /* D1962C 80240E4C 862200A8 */ lh $v0, 0xa8($s1) /* D19630 80240E50 0260302D */ daddu $a2, $s3, $zero /* D19634 80240E54 44820000 */ mtc1 $v0, $f0 -/* D19638 80240E58 00000000 */ nop +/* D19638 80240E58 00000000 */ nop /* D1963C 80240E5C 46800020 */ cvt.s.w $f0, $f0 /* D19640 80240E60 E7A00018 */ swc1 $f0, 0x18($sp) /* D19644 80240E64 862200A6 */ lh $v0, 0xa6($s1) /* D19648 80240E68 27B00028 */ addiu $s0, $sp, 0x28 /* D1964C 80240E6C 44820000 */ mtc1 $v0, $f0 -/* D19650 80240E70 00000000 */ nop +/* D19650 80240E70 00000000 */ nop /* D19654 80240E74 46800020 */ cvt.s.w $f0, $f0 /* D19658 80240E78 E7A0001C */ swc1 $f0, 0x1c($sp) /* D1965C 80240E7C 8E240080 */ lw $a0, 0x80($s1) @@ -311,13 +311,13 @@ glabel func_80240A38_D19218 /* D196A4 80240EC4 E7B60014 */ swc1 $f22, 0x14($sp) /* D196A8 80240EC8 862200A8 */ lh $v0, 0xa8($s1) /* D196AC 80240ECC 44820000 */ mtc1 $v0, $f0 -/* D196B0 80240ED0 00000000 */ nop +/* D196B0 80240ED0 00000000 */ nop /* D196B4 80240ED4 46800020 */ cvt.s.w $f0, $f0 /* D196B8 80240ED8 E7A00018 */ swc1 $f0, 0x18($sp) /* D196BC 80240EDC 862200A6 */ lh $v0, 0xa6($s1) /* D196C0 80240EE0 0260302D */ daddu $a2, $s3, $zero /* D196C4 80240EE4 44820000 */ mtc1 $v0, $f0 -/* D196C8 80240EE8 00000000 */ nop +/* D196C8 80240EE8 00000000 */ nop /* D196CC 80240EEC 46800020 */ cvt.s.w $f0, $f0 /* D196D0 80240EF0 E7A0001C */ swc1 $f0, 0x1c($sp) /* D196D4 80240EF4 8E240080 */ lw $a0, 0x80($s1) @@ -347,32 +347,32 @@ glabel func_80240A38_D19218 /* D19734 80240F54 0C0372DF */ jal func_800DCB7C /* D19738 80240F58 0040802D */ daddu $s0, $v0, $zero /* D1973C 80240F5C 1600001C */ bnez $s0, .L80240FD0 -/* D19740 80240F60 00000000 */ nop +/* D19740 80240F60 00000000 */ nop /* D19744 80240F64 1040001A */ beqz $v0, .L80240FD0 -/* D19748 80240F68 00000000 */ nop +/* D19748 80240F68 00000000 */ nop /* D1974C 80240F6C C7A20038 */ lwc1 $f2, 0x38($sp) /* D19750 80240F70 3C014054 */ lui $at, 0x4054 /* D19754 80240F74 44810800 */ mtc1 $at, $f1 /* D19758 80240F78 44800000 */ mtc1 $zero, $f0 /* D1975C 80240F7C 460010A1 */ cvt.d.s $f2, $f2 /* D19760 80240F80 4622003C */ c.lt.d $f0, $f2 -/* D19764 80240F84 00000000 */ nop +/* D19764 80240F84 00000000 */ nop /* D19768 80240F88 45000011 */ bc1f .L80240FD0 -/* D1976C 80240F8C 00000000 */ nop +/* D1976C 80240F8C 00000000 */ nop /* D19770 80240F90 3C01405E */ lui $at, 0x405e /* D19774 80240F94 44810800 */ mtc1 $at, $f1 /* D19778 80240F98 44800000 */ mtc1 $zero, $f0 -/* D1977C 80240F9C 00000000 */ nop +/* D1977C 80240F9C 00000000 */ nop /* D19780 80240FA0 4620103C */ c.lt.d $f2, $f0 -/* D19784 80240FA4 00000000 */ nop +/* D19784 80240FA4 00000000 */ nop /* D19788 80240FA8 45000009 */ bc1f .L80240FD0 -/* D1978C 80240FAC 00000000 */ nop +/* D1978C 80240FAC 00000000 */ nop /* D19790 80240FB0 C622003C */ lwc1 $f2, 0x3c($s1) /* D19794 80240FB4 C7A00030 */ lwc1 $f0, 0x30($sp) /* D19798 80240FB8 46001032 */ c.eq.s $f2, $f0 -/* D1979C 80240FBC 00000000 */ nop +/* D1979C 80240FBC 00000000 */ nop /* D197A0 80240FC0 45010003 */ bc1t .L80240FD0 -/* D197A4 80240FC4 00000000 */ nop +/* D197A4 80240FC4 00000000 */ nop /* D197A8 80240FC8 0809046D */ j .L802411B4 /* D197AC 80240FCC 241E0001 */ addiu $fp, $zero, 1 .L80240FD0: @@ -396,13 +396,13 @@ glabel func_80240A38_D19218 /* D197F4 80241014 862200A8 */ lh $v0, 0xa8($s1) /* D197F8 80241018 27A50020 */ addiu $a1, $sp, 0x20 /* D197FC 8024101C 44820000 */ mtc1 $v0, $f0 -/* D19800 80241020 00000000 */ nop +/* D19800 80241020 00000000 */ nop /* D19804 80241024 46800020 */ cvt.s.w $f0, $f0 /* D19808 80241028 E7A00018 */ swc1 $f0, 0x18($sp) /* D1980C 8024102C 862200A6 */ lh $v0, 0xa6($s1) /* D19810 80241030 27A60024 */ addiu $a2, $sp, 0x24 /* D19814 80241034 44820000 */ mtc1 $v0, $f0 -/* D19818 80241038 00000000 */ nop +/* D19818 80241038 00000000 */ nop /* D1981C 8024103C 46800020 */ cvt.s.w $f0, $f0 /* D19820 80241040 E7A0001C */ swc1 $f0, 0x1c($sp) /* D19824 80241044 8E240080 */ lw $a0, 0x80($s1) @@ -420,7 +420,7 @@ glabel func_80240A38_D19218 /* D19854 80241074 862200A6 */ lh $v0, 0xa6($s1) /* D19858 80241078 4407C000 */ mfc1 $a3, $f24 /* D1985C 8024107C 44824000 */ mtc1 $v0, $f8 -/* D19860 80241080 00000000 */ nop +/* D19860 80241080 00000000 */ nop /* D19864 80241084 46804220 */ cvt.s.w $f8, $f8 /* D19868 80241088 C4600028 */ lwc1 $f0, 0x28($v1) /* D1986C 8024108C 44064000 */ mfc1 $a2, $f8 @@ -432,7 +432,7 @@ glabel func_80240A38_D19218 /* D19884 802410A4 E6200040 */ swc1 $f0, 0x40($s1) /* D19888 802410A8 862200A6 */ lh $v0, 0xa6($s1) /* D1988C 802410AC 44820000 */ mtc1 $v0, $f0 -/* D19890 802410B0 00000000 */ nop +/* D19890 802410B0 00000000 */ nop /* D19894 802410B4 46800020 */ cvt.s.w $f0, $f0 /* D19898 802410B8 08090469 */ j .L802411A4 /* D1989C 802410BC 4600A500 */ add.s $f20, $f20, $f0 @@ -454,20 +454,20 @@ glabel func_80240A38_D19218 /* D198D8 802410F8 E7B60014 */ swc1 $f22, 0x14($sp) /* D198DC 802410FC 862200A8 */ lh $v0, 0xa8($s1) /* D198E0 80241100 44820000 */ mtc1 $v0, $f0 -/* D198E4 80241104 00000000 */ nop +/* D198E4 80241104 00000000 */ nop /* D198E8 80241108 46800020 */ cvt.s.w $f0, $f0 /* D198EC 8024110C E7A00018 */ swc1 $f0, 0x18($sp) /* D198F0 80241110 862200A6 */ lh $v0, 0xa6($s1) /* D198F4 80241114 27A60024 */ addiu $a2, $sp, 0x24 /* D198F8 80241118 44820000 */ mtc1 $v0, $f0 -/* D198FC 8024111C 00000000 */ nop +/* D198FC 8024111C 00000000 */ nop /* D19900 80241120 46800020 */ cvt.s.w $f0, $f0 /* D19904 80241124 E7A0001C */ swc1 $f0, 0x1c($sp) /* D19908 80241128 8E240080 */ lw $a0, 0x80($s1) /* D1990C 8024112C 0C037711 */ jal func_800DDC44 /* D19910 80241130 27A70028 */ addiu $a3, $sp, 0x28 /* D19914 80241134 1040001F */ beqz $v0, .L802411B4 -/* D19918 80241138 00000000 */ nop +/* D19918 80241138 00000000 */ nop /* D1991C 8024113C 8FA60020 */ lw $a2, 0x20($sp) /* D19920 80241140 8EA20000 */ lw $v0, ($s5) /* D19924 80241144 8FA70028 */ lw $a3, 0x28($sp) @@ -479,7 +479,7 @@ glabel func_80240A38_D19218 /* D1993C 8024115C 862200A6 */ lh $v0, 0xa6($s1) /* D19940 80241160 4407C000 */ mfc1 $a3, $f24 /* D19944 80241164 44824000 */ mtc1 $v0, $f8 -/* D19948 80241168 00000000 */ nop +/* D19948 80241168 00000000 */ nop /* D1994C 8024116C 46804220 */ cvt.s.w $f8, $f8 /* D19950 80241170 C4600028 */ lwc1 $f0, 0x28($v1) /* D19954 80241174 44064000 */ mfc1 $a2, $f8 @@ -491,7 +491,7 @@ glabel func_80240A38_D19218 /* D1996C 8024118C E6200040 */ swc1 $f0, 0x40($s1) /* D19970 80241190 862200A6 */ lh $v0, 0xa6($s1) /* D19974 80241194 44820000 */ mtc1 $v0, $f0 -/* D19978 80241198 00000000 */ nop +/* D19978 80241198 00000000 */ nop /* D1997C 8024119C 46800020 */ cvt.s.w $f0, $f0 /* D19980 802411A0 4600A500 */ add.s $f20, $f20, $f0 .L802411A4: @@ -520,14 +520,14 @@ glabel func_80240A38_D19218 /* D199D8 802411F8 0C0123F5 */ jal is_point_within_region /* D199DC 802411FC 26330040 */ addiu $s3, $s1, 0x40 /* D199E0 80241200 1040005A */ beqz $v0, .L8024136C -/* D199E4 80241204 00000000 */ nop +/* D199E4 80241204 00000000 */ nop /* D199E8 80241208 8E430004 */ lw $v1, 4($s2) /* D199EC 8024120C 10600005 */ beqz $v1, .L80241224 /* D199F0 80241210 24020001 */ addiu $v0, $zero, 1 /* D199F4 80241214 10620029 */ beq $v1, $v0, .L802412BC -/* D199F8 80241218 00000000 */ nop +/* D199F8 80241218 00000000 */ nop /* D199FC 8024121C 080904DB */ j .L8024136C -/* D19A00 80241220 00000000 */ nop +/* D19A00 80241220 00000000 */ nop .L80241224: /* D19A04 80241224 C6480008 */ lwc1 $f8, 8($s2) /* D19A08 80241228 46804220 */ cvt.s.w $f8, $f8 @@ -538,11 +538,11 @@ glabel func_80240A38_D19218 /* D19A1C 8024123C C62E0040 */ lwc1 $f14, 0x40($s1) /* D19A20 80241240 44074000 */ mfc1 $a3, $f8 /* D19A24 80241244 0C00A7B5 */ jal dist2D -/* D19A28 80241248 00000000 */ nop +/* D19A28 80241248 00000000 */ nop /* D19A2C 8024124C C6420010 */ lwc1 $f2, 0x10($s2) /* D19A30 80241250 468010A0 */ cvt.s.w $f2, $f2 /* D19A34 80241254 4600103C */ c.lt.s $f2, $f0 -/* D19A38 80241258 00000000 */ nop +/* D19A38 80241258 00000000 */ nop /* D19A3C 8024125C 45000043 */ bc1f .L8024136C /* D19A40 80241260 E7A00038 */ swc1 $f0, 0x38($sp) /* D19A44 80241264 C64C0008 */ lwc1 $f12, 8($s2) @@ -566,17 +566,17 @@ glabel func_80240A38_D19218 /* D19A8C 802412AC 0C00A7E7 */ jal add_vec2D_polar /* D19A90 802412B0 0260282D */ daddu $a1, $s3, $zero /* D19A94 802412B4 080904DB */ j .L8024136C -/* D19A98 802412B8 00000000 */ nop +/* D19A98 802412B8 00000000 */ nop .L802412BC: /* D19A9C 802412BC 8E420008 */ lw $v0, 8($s2) /* D19AA0 802412C0 8E430010 */ lw $v1, 0x10($s2) /* D19AA4 802412C4 C6200038 */ lwc1 $f0, 0x38($s1) /* D19AA8 802412C8 00431021 */ addu $v0, $v0, $v1 /* D19AAC 802412CC 44821000 */ mtc1 $v0, $f2 -/* D19AB0 802412D0 00000000 */ nop +/* D19AB0 802412D0 00000000 */ nop /* D19AB4 802412D4 468010A0 */ cvt.s.w $f2, $f2 /* D19AB8 802412D8 4600103C */ c.lt.s $f2, $f0 -/* D19ABC 802412DC 00000000 */ nop +/* D19ABC 802412DC 00000000 */ nop /* D19AC0 802412E0 45030001 */ bc1tl .L802412E8 /* D19AC4 802412E4 E6220038 */ swc1 $f2, 0x38($s1) .L802412E8: @@ -585,10 +585,10 @@ glabel func_80240A38_D19218 /* D19AD0 802412F0 C6200038 */ lwc1 $f0, 0x38($s1) /* D19AD4 802412F4 00431023 */ subu $v0, $v0, $v1 /* D19AD8 802412F8 44821000 */ mtc1 $v0, $f2 -/* D19ADC 802412FC 00000000 */ nop +/* D19ADC 802412FC 00000000 */ nop /* D19AE0 80241300 468010A0 */ cvt.s.w $f2, $f2 /* D19AE4 80241304 4602003C */ c.lt.s $f0, $f2 -/* D19AE8 80241308 00000000 */ nop +/* D19AE8 80241308 00000000 */ nop /* D19AEC 8024130C 45030001 */ bc1tl .L80241314 /* D19AF0 80241310 E6220038 */ swc1 $f2, 0x38($s1) .L80241314: @@ -597,10 +597,10 @@ glabel func_80240A38_D19218 /* D19AFC 8024131C C6200040 */ lwc1 $f0, 0x40($s1) /* D19B00 80241320 00431021 */ addu $v0, $v0, $v1 /* D19B04 80241324 44821000 */ mtc1 $v0, $f2 -/* D19B08 80241328 00000000 */ nop +/* D19B08 80241328 00000000 */ nop /* D19B0C 8024132C 468010A0 */ cvt.s.w $f2, $f2 /* D19B10 80241330 4600103C */ c.lt.s $f2, $f0 -/* D19B14 80241334 00000000 */ nop +/* D19B14 80241334 00000000 */ nop /* D19B18 80241338 45030001 */ bc1tl .L80241340 /* D19B1C 8024133C E6220040 */ swc1 $f2, 0x40($s1) .L80241340: @@ -609,21 +609,21 @@ glabel func_80240A38_D19218 /* D19B28 80241348 C6200040 */ lwc1 $f0, 0x40($s1) /* D19B2C 8024134C 00431023 */ subu $v0, $v0, $v1 /* D19B30 80241350 44821000 */ mtc1 $v0, $f2 -/* D19B34 80241354 00000000 */ nop +/* D19B34 80241354 00000000 */ nop /* D19B38 80241358 468010A0 */ cvt.s.w $f2, $f2 /* D19B3C 8024135C 4602003C */ c.lt.s $f0, $f2 -/* D19B40 80241360 00000000 */ nop +/* D19B40 80241360 00000000 */ nop /* D19B44 80241364 45030001 */ bc1tl .L8024136C /* D19B48 80241368 E6220040 */ swc1 $f2, 0x40($s1) .L8024136C: /* D19B4C 8024136C 16E0001F */ bnez $s7, .L802413EC -/* D19B50 80241370 00000000 */ nop +/* D19B50 80241370 00000000 */ nop /* D19B54 80241374 8E220000 */ lw $v0, ($s1) /* D19B58 80241378 30420008 */ andi $v0, $v0, 8 /* D19B5C 8024137C 10400003 */ beqz $v0, .L8024138C /* D19B60 80241380 27A50020 */ addiu $a1, $sp, 0x20 /* D19B64 80241384 13C00019 */ beqz $fp, .L802413EC -/* D19B68 80241388 00000000 */ nop +/* D19B68 80241388 00000000 */ nop .L8024138C: /* D19B6C 8024138C 27A60024 */ addiu $a2, $sp, 0x24 /* D19B70 80241390 27A20038 */ addiu $v0, $sp, 0x38 @@ -646,7 +646,7 @@ glabel func_80240A38_D19218 /* D19BB4 802413D4 0C0372DF */ jal func_800DCB7C /* D19BB8 802413D8 27A70028 */ addiu $a3, $sp, 0x28 /* D19BBC 802413DC 10400003 */ beqz $v0, .L802413EC -/* D19BC0 802413E0 00000000 */ nop +/* D19BC0 802413E0 00000000 */ nop /* D19BC4 802413E4 C7A00024 */ lwc1 $f0, 0x24($sp) /* D19BC8 802413E8 E620003C */ swc1 $f0, 0x3c($s1) .L802413EC: diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241478_D19C58.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241478_D19C58.s index 05340b316c..3f7a2a7803 100644 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241478_D19C58.s +++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241478_D19C58.s @@ -27,7 +27,7 @@ glabel func_80241478_D19C58 .L802414D0: /* D19CB0 802414D0 8482008E */ lh $v0, 0x8e($a0) /* D19CB4 802414D4 14400007 */ bnez $v0, .L802414F4 -/* D19CB8 802414D8 00000000 */ nop +/* D19CB8 802414D8 00000000 */ nop /* D19CBC 802414DC 8E0200CC */ lw $v0, 0xcc($s0) /* D19CC0 802414E0 8C420028 */ lw $v0, 0x28($v0) /* D19CC4 802414E4 A480008E */ sh $zero, 0x8e($a0) diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241508_D19CE8.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241508_D19CE8.s index 557922c18e..fdf8fe8c68 100644 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241508_D19CE8.s +++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241508_D19CE8.s @@ -18,7 +18,7 @@ glabel func_80241508_D19CE8 /* D19D1C 8024153C 8E0300A0 */ lw $v1, 0xa0($s0) /* D19D20 80241540 00021403 */ sra $v0, $v0, 0x10 /* D19D24 80241544 14430004 */ bne $v0, $v1, .L80241558 -/* D19D28 80241548 00000000 */ nop +/* D19D28 80241548 00000000 */ nop /* D19D2C 8024154C 8E0200CC */ lw $v0, 0xcc($s0) /* D19D30 80241550 8C42002C */ lw $v0, 0x2c($v0) /* D19D34 80241554 ACA20028 */ sw $v0, 0x28($a1) @@ -47,7 +47,7 @@ glabel func_80241508_D19CE8 /* D19D88 802415A8 3C01C1A0 */ lui $at, 0xc1a0 /* D19D8C 802415AC 44812000 */ mtc1 $at, $f4 /* D19D90 802415B0 44833000 */ mtc1 $v1, $f6 -/* D19D94 802415B4 00000000 */ nop +/* D19D94 802415B4 00000000 */ nop /* D19D98 802415B8 468031A0 */ cvt.s.w $f6, $f6 /* D19D9C 802415BC 8C420000 */ lw $v0, ($v0) /* D19DA0 802415C0 44073000 */ mfc1 $a3, $f6 diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241608_D19DE8.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241608_D19DE8.s index ffeaf17dd7..a153d0d703 100644 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241608_D19DE8.s +++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241608_D19DE8.s @@ -16,7 +16,7 @@ glabel func_80241608_D19DE8 /* D19E14 80241634 A462008E */ sh $v0, 0x8e($v1) /* D19E18 80241638 00021400 */ sll $v0, $v0, 0x10 /* D19E1C 8024163C 14400005 */ bnez $v0, .L80241654 -/* D19E20 80241640 00000000 */ nop +/* D19E20 80241640 00000000 */ nop /* D19E24 80241644 960200AA */ lhu $v0, 0xaa($s0) /* D19E28 80241648 A462008E */ sh $v0, 0x8e($v1) /* D19E2C 8024164C 2402000E */ addiu $v0, $zero, 0xe diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241668_D19E48.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241668_D19E48.s index 4b392ff6ee..1becaa2c0c 100644 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241668_D19E48.s +++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241668_D19E48.s @@ -42,7 +42,7 @@ glabel func_80241668_D19E48 /* D19EDC 802416FC 2402000F */ addiu $v0, $zero, 0xf /* D19EE0 80241700 AFA2001C */ sw $v0, 0x1c($sp) /* D19EE4 80241704 44833000 */ mtc1 $v1, $f6 -/* D19EE8 80241708 00000000 */ nop +/* D19EE8 80241708 00000000 */ nop /* D19EEC 8024170C 468031A0 */ cvt.s.w $f6, $f6 /* D19EF0 80241710 44073000 */ mfc1 $a3, $f6 /* D19EF4 80241714 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241754_D19F34.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241754_D19F34.s index caa865859c..f905b181ba 100644 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241754_D19F34.s +++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241754_D19F34.s @@ -46,7 +46,7 @@ glabel func_80241754_D19F34 /* D19FD8 802417F8 8E2200B0 */ lw $v0, 0xb0($s1) /* D19FDC 802417FC 30420004 */ andi $v0, $v0, 4 /* D19FE0 80241800 10400011 */ beqz $v0, .L80241848 -/* D19FE4 80241804 00000000 */ nop +/* D19FE4 80241804 00000000 */ nop .L80241808: /* D19FE8 80241808 AE400070 */ sw $zero, 0x70($s2) /* D19FEC 8024180C A6A0008E */ sh $zero, 0x8e($s5) @@ -78,12 +78,12 @@ glabel func_80241754_D19F34 /* D1A050 80241870 10600013 */ beqz $v1, .L802418C0 /* D1A054 80241874 0240202D */ daddu $a0, $s2, $zero /* D1A058 80241878 0809065F */ j .L8024197C -/* D1A05C 8024187C 00000000 */ nop +/* D1A05C 8024187C 00000000 */ nop .L80241880: /* D1A060 80241880 10620018 */ beq $v1, $v0, .L802418E4 /* D1A064 80241884 0240202D */ daddu $a0, $s2, $zero /* D1A068 80241888 0809065F */ j .L8024197C -/* D1A06C 8024188C 00000000 */ nop +/* D1A06C 8024188C 00000000 */ nop .L80241890: /* D1A070 80241890 2402000D */ addiu $v0, $zero, 0xd /* D1A074 80241894 10620029 */ beq $v1, $v0, .L8024193C @@ -94,9 +94,9 @@ glabel func_80241754_D19F34 /* D1A088 802418A8 1062002D */ beq $v1, $v0, .L80241960 /* D1A08C 802418AC 24020063 */ addiu $v0, $zero, 0x63 /* D1A090 802418B0 10620030 */ beq $v1, $v0, .L80241974 -/* D1A094 802418B4 00000000 */ nop +/* D1A094 802418B4 00000000 */ nop /* D1A098 802418B8 0809065F */ j .L8024197C -/* D1A09C 802418BC 00000000 */ nop +/* D1A09C 802418BC 00000000 */ nop .L802418C0: /* D1A0A0 802418C0 0260282D */ daddu $a1, $s3, $zero /* D1A0A4 802418C4 0C090234 */ jal func_802408D0_D190B0 @@ -107,14 +107,14 @@ glabel func_80241754_D19F34 /* D1A0B4 802418D4 0C09024F */ jal func_8024093C_D1911C /* D1A0B8 802418D8 0280302D */ daddu $a2, $s4, $zero /* D1A0BC 802418DC 0809065F */ j .L8024197C -/* D1A0C0 802418E0 00000000 */ nop +/* D1A0C0 802418E0 00000000 */ nop .L802418E4: /* D1A0C4 802418E4 0260282D */ daddu $a1, $s3, $zero /* D1A0C8 802418E8 0C09028E */ jal func_80240A38_D19218 /* D1A0CC 802418EC 0280302D */ daddu $a2, $s4, $zero /* D1A0D0 802418F0 8E420070 */ lw $v0, 0x70($s2) /* D1A0D4 802418F4 14500021 */ bne $v0, $s0, .L8024197C -/* D1A0D8 802418F8 00000000 */ nop +/* D1A0D8 802418F8 00000000 */ nop .L802418FC: /* D1A0DC 802418FC 0240202D */ daddu $a0, $s2, $zero /* D1A0E0 80241900 0260282D */ daddu $a1, $s3, $zero @@ -123,7 +123,7 @@ glabel func_80241754_D19F34 /* D1A0EC 8024190C 8E430070 */ lw $v1, 0x70($s2) /* D1A0F0 80241910 2402000C */ addiu $v0, $zero, 0xc /* D1A0F4 80241914 14620019 */ bne $v1, $v0, .L8024197C -/* D1A0F8 80241918 00000000 */ nop +/* D1A0F8 80241918 00000000 */ nop /* D1A0FC 8024191C 0240202D */ daddu $a0, $s2, $zero .L80241920: /* D1A100 80241920 0260282D */ daddu $a1, $s3, $zero @@ -132,7 +132,7 @@ glabel func_80241754_D19F34 /* D1A10C 8024192C 8E430070 */ lw $v1, 0x70($s2) /* D1A110 80241930 2402000D */ addiu $v0, $zero, 0xd /* D1A114 80241934 14620011 */ bne $v1, $v0, .L8024197C -/* D1A118 80241938 00000000 */ nop +/* D1A118 80241938 00000000 */ nop .L8024193C: /* D1A11C 8024193C 0240202D */ daddu $a0, $s2, $zero /* D1A120 80241940 0260282D */ daddu $a1, $s3, $zero @@ -141,14 +141,14 @@ glabel func_80241754_D19F34 /* D1A12C 8024194C 8E430070 */ lw $v1, 0x70($s2) /* D1A130 80241950 2402000E */ addiu $v0, $zero, 0xe /* D1A134 80241954 14620009 */ bne $v1, $v0, .L8024197C -/* D1A138 80241958 00000000 */ nop +/* D1A138 80241958 00000000 */ nop /* D1A13C 8024195C 0240202D */ daddu $a0, $s2, $zero .L80241960: /* D1A140 80241960 0260282D */ daddu $a1, $s3, $zero /* D1A144 80241964 0C09059A */ jal func_80241668_D19E48 /* D1A148 80241968 0280302D */ daddu $a2, $s4, $zero /* D1A14C 8024196C 0809065F */ j .L8024197C -/* D1A150 80241970 00000000 */ nop +/* D1A150 80241970 00000000 */ nop .L80241974: /* D1A154 80241974 0C0129CF */ jal func_8004A73C /* D1A158 80241978 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802419A4_D1A184.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802419A4_D1A184.s index ce118e0b37..a15f0e4945 100644 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802419A4_D1A184.s +++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802419A4_D1A184.s @@ -93,9 +93,9 @@ glabel func_802419A4_D1A184 /* D1A2D4 80241AF4 46000021 */ cvt.d.s $f0, $f0 /* D1A2D8 80241AF8 46380000 */ add.d $f0, $f0, $f24 /* D1A2DC 80241AFC 46360002 */ mul.d $f0, $f0, $f22 -/* D1A2E0 80241B00 00000000 */ nop +/* D1A2E0 80241B00 00000000 */ nop /* D1A2E4 80241B04 4620A03E */ c.le.d $f20, $f0 -/* D1A2E8 80241B08 00000000 */ nop +/* D1A2E8 80241B08 00000000 */ nop /* D1A2EC 80241B0C 45030005 */ bc1tl .L80241B24 /* D1A2F0 80241B10 46340001 */ sub.d $f0, $f0, $f20 /* D1A2F4 80241B14 4620008D */ trunc.w.d $f2, $f0 @@ -118,9 +118,9 @@ glabel func_802419A4_D1A184 /* D1A330 80241B50 46000021 */ cvt.d.s $f0, $f0 /* D1A334 80241B54 46380000 */ add.d $f0, $f0, $f24 /* D1A338 80241B58 46360002 */ mul.d $f0, $f0, $f22 -/* D1A33C 80241B5C 00000000 */ nop +/* D1A33C 80241B5C 00000000 */ nop /* D1A340 80241B60 4620A03E */ c.le.d $f20, $f0 -/* D1A344 80241B64 00000000 */ nop +/* D1A344 80241B64 00000000 */ nop /* D1A348 80241B68 45010005 */ bc1t .L80241B80 /* D1A34C 80241B6C 0280182D */ daddu $v1, $s4, $zero /* D1A350 80241B70 4620008D */ trunc.w.d $f2, $f0 @@ -144,9 +144,9 @@ glabel func_802419A4_D1A184 /* D1A390 80241BB0 46000021 */ cvt.d.s $f0, $f0 /* D1A394 80241BB4 46380000 */ add.d $f0, $f0, $f24 /* D1A398 80241BB8 46360002 */ mul.d $f0, $f0, $f22 -/* D1A39C 80241BBC 00000000 */ nop +/* D1A39C 80241BBC 00000000 */ nop /* D1A3A0 80241BC0 4620A03E */ c.le.d $f20, $f0 -/* D1A3A4 80241BC4 00000000 */ nop +/* D1A3A4 80241BC4 00000000 */ nop /* D1A3A8 80241BC8 45010005 */ bc1t .L80241BE0 /* D1A3AC 80241BCC 02A0182D */ daddu $v1, $s5, $zero /* D1A3B0 80241BD0 4620008D */ trunc.w.d $f2, $f0 @@ -192,7 +192,7 @@ glabel func_802419A4_D1A184 /* D1A448 80241C68 26520001 */ addiu $s2, $s2, 1 /* D1A44C 80241C6C 2A220014 */ slti $v0, $s1, 0x14 /* D1A450 80241C70 1440FF9B */ bnez $v0, .L80241AE0 -/* D1A454 80241C74 00000000 */ nop +/* D1A454 80241C74 00000000 */ nop /* D1A458 80241C78 8EE30078 */ lw $v1, 0x78($s7) /* D1A45C 80241C7C 1473000A */ bne $v1, $s3, .L80241CA8 /* D1A460 80241C80 24020016 */ addiu $v0, $zero, 0x16 @@ -221,7 +221,7 @@ glabel func_802419A4_D1A184 /* D1A4B4 80241CD4 24E72F90 */ addiu $a3, $a3, %lo(func_80242F90) .L80241CD8: /* D1A4B8 80241CD8 0C0B79E0 */ jal func_802DE780 -/* D1A4BC 80241CDC 00000000 */ nop +/* D1A4BC 80241CDC 00000000 */ nop /* D1A4C0 80241CE0 0000102D */ daddu $v0, $zero, $zero /* D1A4C4 80241CE4 8FBF00A4 */ lw $ra, 0xa4($sp) /* D1A4C8 80241CE8 8FBE00A0 */ lw $fp, 0xa0($sp) diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241D20_D1A500.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241D20_D1A500.s index e9b6d146ea..61cb90d78e 100644 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241D20_D1A500.s +++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241D20_D1A500.s @@ -8,5 +8,5 @@ glabel func_80241D20_D1A500 /* D1A50C 80241D2C 000211C2 */ srl $v0, $v0, 7 /* D1A510 80241D30 03E00008 */ jr $ra /* D1A514 80241D34 00021040 */ sll $v0, $v0, 1 -/* D1A518 80241D38 00000000 */ nop -/* D1A51C 80241D3C 00000000 */ nop +/* D1A518 80241D38 00000000 */ nop +/* D1A51C 80241D3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/update_starpoints_display_D18B9C.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/update_starpoints_display_D18B9C.s index 473a53e3bc..30bc8ef92b 100644 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/update_starpoints_display_D18B9C.s +++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/update_starpoints_display_D18B9C.s @@ -19,7 +19,7 @@ glabel update_starpoints_display_D18B9C /* D18BD4 802403F4 8E2200B0 */ lw $v0, 0xb0($s1) /* D18BD8 802403F8 30420004 */ andi $v0, $v0, 4 /* D18BDC 802403FC 10400015 */ beqz $v0, .L80240454 -/* D18BE0 80240400 00000000 */ nop +/* D18BE0 80240400 00000000 */ nop .L80240404: /* D18BE4 80240404 AE800070 */ sw $zero, 0x70($s4) /* D18BE8 80240408 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel update_starpoints_display_D18B9C /* D18C38 80240458 12600005 */ beqz $s3, .L80240470 /* D18C3C 8024045C 24020001 */ addiu $v0, $zero, 1 /* D18C40 80240460 12620048 */ beq $s3, $v0, .L80240584 -/* D18C44 80240464 00000000 */ nop +/* D18C44 80240464 00000000 */ nop /* D18C48 80240468 0809017E */ j .L802405F8 -/* D18C4C 8024046C 00000000 */ nop +/* D18C4C 8024046C 00000000 */ nop .L80240470: /* D18C50 80240470 86240008 */ lh $a0, 8($s1) /* D18C54 80240474 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel update_starpoints_display_D18B9C /* D18C74 80240494 8E03006C */ lw $v1, 0x6c($s0) /* D18C78 80240498 24020003 */ addiu $v0, $zero, 3 /* D18C7C 8024049C 14620056 */ bne $v1, $v0, .L802405F8 -/* D18C80 802404A0 00000000 */ nop +/* D18C80 802404A0 00000000 */ nop /* D18C84 802404A4 8E2500A8 */ lw $a1, 0xa8($s1) /* D18C88 802404A8 10A00003 */ beqz $a1, .L802404B8 /* D18C8C 802404AC 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel update_starpoints_display_D18B9C /* D18D04 80240524 C7A20014 */ lwc1 $f2, 0x14($sp) /* D18D08 80240528 4600020D */ trunc.w.s $f8, $f0 /* D18D0C 8024052C 44024000 */ mfc1 $v0, $f8 -/* D18D10 80240530 00000000 */ nop +/* D18D10 80240530 00000000 */ nop /* D18D14 80240534 A6220012 */ sh $v0, 0x12($s1) /* D18D18 80240538 4600120D */ trunc.w.s $f8, $f2 /* D18D1C 8024053C 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240550_D203E0.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240550_D203E0.s index aca0335c85..63fd96db1f 100644 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240550_D203E0.s +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240550_D203E0.s @@ -47,7 +47,7 @@ glabel func_80240550_D203E0 /* D20488 802405F8 0C0123F5 */ jal is_point_within_region /* D2048C 802405FC 8E070038 */ lw $a3, 0x38($s0) /* D20490 80240600 1040000E */ beqz $v0, .L8024063C -/* D20494 80240604 00000000 */ nop +/* D20494 80240604 00000000 */ nop /* D20498 80240608 8E2200D0 */ lw $v0, 0xd0($s1) /* D2049C 8024060C C60C0038 */ lwc1 $f12, 0x38($s0) /* D204A0 80240610 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240550_D203E0 /* D204B4 80240624 468031A0 */ cvt.s.w $f6, $f6 /* D204B8 80240628 44073000 */ mfc1 $a3, $f6 /* D204BC 8024062C 0C00A720 */ jal atan2 -/* D204C0 80240630 00000000 */ nop +/* D204C0 80240630 00000000 */ nop /* D204C4 80240634 0809019B */ j .L8024066C /* D204C8 80240638 E600000C */ swc1 $f0, 0xc($s0) .L8024063C: @@ -66,7 +66,7 @@ glabel func_80240550_D203E0 /* D204D0 80240640 2404003C */ addiu $a0, $zero, 0x3c /* D204D4 80240644 C60C000C */ lwc1 $f12, 0xc($s0) /* D204D8 80240648 44820000 */ mtc1 $v0, $f0 -/* D204DC 8024064C 00000000 */ nop +/* D204DC 8024064C 00000000 */ nop /* D204E0 80240650 46800020 */ cvt.s.w $f0, $f0 /* D204E4 80240654 46006300 */ add.s $f12, $f12, $f0 /* D204E8 80240658 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240550_D203E0 /* D2050C 8024067C 8E2200D0 */ lw $v0, 0xd0($s1) /* D20510 80240680 8C420014 */ lw $v0, 0x14($v0) /* D20514 80240684 04410004 */ bgez $v0, .L80240698 -/* D20518 80240688 00000000 */ nop +/* D20518 80240688 00000000 */ nop /* D2051C 8024068C C6400000 */ lwc1 $f0, ($s2) /* D20520 80240690 080901AE */ j .L802406B8 /* D20524 80240694 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240550_D203E0 /* D20528 80240698 3C018025 */ lui $at, %hi(D_8024BE40) /* D2052C 8024069C D422BE40 */ ldc1 $f2, %lo(D_8024BE40)($at) /* D20530 802406A0 44820000 */ mtc1 $v0, $f0 -/* D20534 802406A4 00000000 */ nop +/* D20534 802406A4 00000000 */ nop /* D20538 802406A8 46800021 */ cvt.d.w $f0, $f0 /* D2053C 802406AC 46220003 */ div.d $f0, $f0, $f2 /* D20540 802406B0 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240550_D203E0 /* D20554 802406C4 44801000 */ mtc1 $zero, $f2 /* D20558 802406C8 46000021 */ cvt.d.s $f0, $f0 /* D2055C 802406CC 46220002 */ mul.d $f0, $f0, $f2 -/* D20560 802406D0 00000000 */ nop +/* D20560 802406D0 00000000 */ nop /* D20564 802406D4 24020001 */ addiu $v0, $zero, 1 /* D20568 802406D8 4620018D */ trunc.w.d $f6, $f0 /* D2056C 802406DC E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240700_D20590.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240700_D20590.s index e0020a296a..c70427178a 100644 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240700_D20590.s +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240700_D20590.s @@ -34,7 +34,7 @@ glabel func_80240700_D20590 /* D20604 80240774 44803000 */ mtc1 $zero, $f6 /* D20608 80240778 46000021 */ cvt.d.s $f0, $f0 /* D2060C 8024077C 46260002 */ mul.d $f0, $f0, $f6 -/* D20610 80240780 00000000 */ nop +/* D20610 80240780 00000000 */ nop /* D20614 80240784 24020001 */ addiu $v0, $zero, 1 /* D20618 80240788 8E24006C */ lw $a0, 0x6c($s1) /* D2061C 8024078C 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80240700_D20590 /* D20678 802407E8 C600003C */ lwc1 $f0, 0x3c($s0) /* D2067C 802407EC 4600C001 */ sub.s $f0, $f24, $f0 /* D20680 802407F0 4600B03C */ c.lt.s $f22, $f0 -/* D20684 802407F4 00000000 */ nop +/* D20684 802407F4 00000000 */ nop /* D20688 802407F8 4500001B */ bc1f .L80240868 /* D2068C 802407FC 34820010 */ ori $v0, $a0, 0x10 /* D20690 80240800 0809021A */ j .L80240868 @@ -87,9 +87,9 @@ glabel func_80240700_D20590 /* D206D4 80240844 C7A00034 */ lwc1 $f0, 0x34($sp) /* D206D8 80240848 4600D001 */ sub.s $f0, $f26, $f0 /* D206DC 8024084C 4600B03C */ c.lt.s $f22, $f0 -/* D206E0 80240850 00000000 */ nop +/* D206E0 80240850 00000000 */ nop /* D206E4 80240854 45000004 */ bc1f .L80240868 -/* D206E8 80240858 00000000 */ nop +/* D206E8 80240858 00000000 */ nop /* D206EC 8024085C 8E22006C */ lw $v0, 0x6c($s1) /* D206F0 80240860 34420010 */ ori $v0, $v0, 0x10 /* D206F4 80240864 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80240700_D20590 /* D206FC 8024086C 24030011 */ addiu $v1, $zero, 0x11 /* D20700 80240870 30420011 */ andi $v0, $v0, 0x11 /* D20704 80240874 14430039 */ bne $v0, $v1, .L8024095C -/* D20708 80240878 00000000 */ nop +/* D20708 80240878 00000000 */ nop /* D2070C 8024087C 8E020000 */ lw $v0, ($s0) /* D20710 80240880 30420008 */ andi $v0, $v0, 8 /* D20714 80240884 1040000A */ beqz $v0, .L802408B0 @@ -108,7 +108,7 @@ glabel func_80240700_D20590 /* D20724 80240894 D420BE48 */ ldc1 $f0, %lo(D_8024BE48)($at) /* D20728 80240898 460010A1 */ cvt.d.s $f2, $f2 /* D2072C 8024089C 46201082 */ mul.d $f2, $f2, $f0 -/* D20730 802408A0 00000000 */ nop +/* D20730 802408A0 00000000 */ nop /* D20734 802408A4 4600A021 */ cvt.d.s $f0, $f20 /* D20738 802408A8 08090245 */ j .L80240914 /* D2073C 802408AC 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80240700_D20590 /* D2078C 802408FC D420BE50 */ ldc1 $f0, %lo(D_8024BE50)($at) /* D20790 80240900 460010A1 */ cvt.d.s $f2, $f2 /* D20794 80240904 46201082 */ mul.d $f2, $f2, $f0 -/* D20798 80240908 00000000 */ nop +/* D20798 80240908 00000000 */ nop /* D2079C 8024090C 4600A021 */ cvt.d.s $f0, $f20 /* D207A0 80240910 46220000 */ add.d $f0, $f0, $f2 .L80240914: @@ -149,7 +149,7 @@ glabel func_80240700_D20590 /* D207C0 80240930 46000005 */ abs.s $f0, $f0 /* D207C4 80240934 46000021 */ cvt.d.s $f0, $f0 /* D207C8 80240938 4622003C */ c.lt.d $f0, $f2 -/* D207CC 8024093C 00000000 */ nop +/* D207CC 8024093C 00000000 */ nop /* D207D0 80240940 45000036 */ bc1f .L80240A1C /* D207D4 80240944 2403FFEF */ addiu $v1, $zero, -0x11 /* D207D8 80240948 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80240700_D20590 .L8024095C: /* D207EC 8024095C 8E220070 */ lw $v0, 0x70($s1) /* D207F0 80240960 1840002E */ blez $v0, .L80240A1C -/* D207F4 80240964 00000000 */ nop +/* D207F4 80240964 00000000 */ nop /* D207F8 80240968 C62C0074 */ lwc1 $f12, 0x74($s1) /* D207FC 8024096C 0C00A8BB */ jal sin_deg /* D20800 80240970 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80240700_D20590 /* D20858 802409C8 27A70030 */ addiu $a3, $sp, 0x30 .L802409CC: /* D2085C 802409CC 10400007 */ beqz $v0, .L802409EC -/* D20860 802409D0 00000000 */ nop +/* D20860 802409D0 00000000 */ nop /* D20864 802409D4 4616A082 */ mul.s $f2, $f20, $f22 -/* D20868 802409D8 00000000 */ nop +/* D20868 802409D8 00000000 */ nop /* D2086C 802409DC C7A0002C */ lwc1 $f0, 0x2c($sp) /* D20870 802409E0 461A0000 */ add.s $f0, $f0, $f26 /* D20874 802409E4 0809027E */ j .L802409F8 /* D20878 802409E8 46020000 */ add.s $f0, $f0, $f2 .L802409EC: /* D2087C 802409EC 4616A002 */ mul.s $f0, $f20, $f22 -/* D20880 802409F0 00000000 */ nop +/* D20880 802409F0 00000000 */ nop /* D20884 802409F4 4600C000 */ add.s $f0, $f24, $f0 .L802409F8: /* D20888 802409F8 E600003C */ swc1 $f0, 0x3c($s0) /* D2088C 802409FC 8E220074 */ lw $v0, 0x74($s1) /* D20890 80240A00 2442000A */ addiu $v0, $v0, 0xa /* D20894 80240A04 44826000 */ mtc1 $v0, $f12 -/* D20898 80240A08 00000000 */ nop +/* D20898 80240A08 00000000 */ nop /* D2089C 80240A0C 0C00A6C9 */ jal clamp_angle /* D208A0 80240A10 46806320 */ cvt.s.w $f12, $f12 /* D208A4 80240A14 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80240700_D20590 /* D208B4 80240A24 2442FFFF */ addiu $v0, $v0, -1 /* D208B8 80240A28 8E430014 */ lw $v1, 0x14($s2) /* D208BC 80240A2C 04600048 */ bltz $v1, .L80240B50 -/* D208C0 80240A30 00000000 */ nop +/* D208C0 80240A30 00000000 */ nop /* D208C4 80240A34 8E620074 */ lw $v0, 0x74($s3) /* D208C8 80240A38 1C400042 */ bgtz $v0, .L80240B44 /* D208CC 80240A3C 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80240700_D20590 /* D208D4 80240A44 860200A8 */ lh $v0, 0xa8($s0) /* D208D8 80240A48 C602003C */ lwc1 $f2, 0x3c($s0) /* D208DC 80240A4C 44820000 */ mtc1 $v0, $f0 -/* D208E0 80240A50 00000000 */ nop +/* D208E0 80240A50 00000000 */ nop /* D208E4 80240A54 46800020 */ cvt.s.w $f0, $f0 /* D208E8 80240A58 46001080 */ add.s $f2, $f2, $f0 /* D208EC 80240A5C 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80240700_D20590 /* D20908 80240A78 C440002C */ lwc1 $f0, 0x2c($v0) /* D2090C 80240A7C 46000021 */ cvt.d.s $f0, $f0 /* D20910 80240A80 4622003C */ c.lt.d $f0, $f2 -/* D20914 80240A84 00000000 */ nop +/* D20914 80240A84 00000000 */ nop /* D20918 80240A88 4500002C */ bc1f .L80240B3C /* D2091C 80240A8C 02A0202D */ daddu $a0, $s5, $zero /* D20920 80240A90 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80240700_D20590 /* D2095C 80240ACC 3C01C1A0 */ lui $at, 0xc1a0 /* D20960 80240AD0 44812000 */ mtc1 $at, $f4 /* D20964 80240AD4 44834000 */ mtc1 $v1, $f8 -/* D20968 80240AD8 00000000 */ nop +/* D20968 80240AD8 00000000 */ nop /* D2096C 80240ADC 46804220 */ cvt.s.w $f8, $f8 /* D20970 80240AE0 44074000 */ mfc1 $a3, $f8 /* D20974 80240AE4 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80240700_D20590 /* D20A28 80240B98 0C0123F5 */ jal is_point_within_region /* D20A2C 80240B9C 8E070038 */ lw $a3, 0x38($s0) /* D20A30 80240BA0 1040001A */ beqz $v0, .L80240C0C -/* D20A34 80240BA4 00000000 */ nop +/* D20A34 80240BA4 00000000 */ nop /* D20A38 80240BA8 8E060038 */ lw $a2, 0x38($s0) /* D20A3C 80240BAC 8E2200D0 */ lw $v0, 0xd0($s1) /* D20A40 80240BB0 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80240700_D20590 /* D20A54 80240BC4 468073A0 */ cvt.s.w $f14, $f14 /* D20A58 80240BC8 C6020018 */ lwc1 $f2, 0x18($s0) /* D20A5C 80240BCC 4600103C */ c.lt.s $f2, $f0 -/* D20A60 80240BD0 00000000 */ nop +/* D20A60 80240BD0 00000000 */ nop /* D20A64 80240BD4 4500000D */ bc1f .L80240C0C /* D20A68 80240BD8 E7A00034 */ swc1 $f0, 0x34($sp) /* D20A6C 80240BDC C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80240700_D20590 /* D20AA8 80240C18 00621825 */ or $v1, $v1, $v0 /* D20AAC 80240C1C 00741825 */ or $v1, $v1, $s4 /* D20AB0 80240C20 10600008 */ beqz $v1, .L80240C44 -/* D20AB4 80240C24 00000000 */ nop +/* D20AB4 80240C24 00000000 */ nop /* D20AB8 80240C28 8602008C */ lh $v0, 0x8c($s0) /* D20ABC 80240C2C 14400031 */ bnez $v0, .L80240CF4 -/* D20AC0 80240C30 00000000 */ nop +/* D20AC0 80240C30 00000000 */ nop /* D20AC4 80240C34 8E050018 */ lw $a1, 0x18($s0) /* D20AC8 80240C38 8E06000C */ lw $a2, 0xc($s0) /* D20ACC 80240C3C 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_80240700_D20590 /* D20AE0 80240C50 44801000 */ mtc1 $zero, $f2 /* D20AE4 80240C54 46000021 */ cvt.d.s $f0, $f0 /* D20AE8 80240C58 46220002 */ mul.d $f0, $f0, $f2 -/* D20AEC 80240C5C 00000000 */ nop +/* D20AEC 80240C5C 00000000 */ nop /* D20AF0 80240C60 4620020D */ trunc.w.d $f8, $f0 /* D20AF4 80240C64 E628007C */ swc1 $f8, 0x7c($s1) /* D20AF8 80240C68 8E420004 */ lw $v0, 4($s2) /* D20AFC 80240C6C 18400021 */ blez $v0, .L80240CF4 -/* D20B00 80240C70 00000000 */ nop +/* D20B00 80240C70 00000000 */ nop /* D20B04 80240C74 8602008E */ lh $v0, 0x8e($s0) /* D20B08 80240C78 9603008E */ lhu $v1, 0x8e($s0) /* D20B0C 80240C7C 18400005 */ blez $v0, .L80240C94 @@ -375,7 +375,7 @@ glabel func_80240700_D20590 /* D20B14 80240C84 A602008E */ sh $v0, 0x8e($s0) /* D20B18 80240C88 00021400 */ sll $v0, $v0, 0x10 /* D20B1C 80240C8C 1C400019 */ bgtz $v0, .L80240CF4 -/* D20B20 80240C90 00000000 */ nop +/* D20B20 80240C90 00000000 */ nop .L80240C94: /* D20B24 80240C94 240403E8 */ addiu $a0, $zero, 0x3e8 /* D20B28 80240C98 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80240700_D20590 /* D20B70 80240CE0 18400003 */ blez $v0, .L80240CF0 /* D20B74 80240CE4 28620003 */ slti $v0, $v1, 3 /* D20B78 80240CE8 10400002 */ beqz $v0, .L80240CF4 -/* D20B7C 80240CEC 00000000 */ nop +/* D20B7C 80240CEC 00000000 */ nop .L80240CF0: /* D20B80 80240CF0 AE600070 */ sw $zero, 0x70($s3) .L80240CF4: diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240DE8_D20C78.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240DE8_D20C78.s index 7aed923221..1b60e1ceac 100644 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240DE8_D20C78.s +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240DE8_D20C78.s @@ -42,11 +42,11 @@ glabel func_80240DE8_D20C78 .L80240E7C: /* D20D0C 80240E7C 8E220070 */ lw $v0, 0x70($s1) /* D20D10 80240E80 18400034 */ blez $v0, .L80240F54 -/* D20D14 80240E84 00000000 */ nop +/* D20D14 80240E84 00000000 */ nop /* D20D18 80240E88 C62C0074 */ lwc1 $f12, 0x74($s1) /* D20D1C 80240E8C 46806320 */ cvt.s.w $f12, $f12 /* D20D20 80240E90 44820000 */ mtc1 $v0, $f0 -/* D20D24 80240E94 00000000 */ nop +/* D20D24 80240E94 00000000 */ nop /* D20D28 80240E98 46800020 */ cvt.s.w $f0, $f0 /* D20D2C 80240E9C 46000021 */ cvt.d.s $f0, $f0 /* D20D30 80240EA0 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_80240DE8_D20C78 /* D20D90 80240F00 27A70030 */ addiu $a3, $sp, 0x30 .L80240F04: /* D20D94 80240F04 10400007 */ beqz $v0, .L80240F24 -/* D20D98 80240F08 00000000 */ nop +/* D20D98 80240F08 00000000 */ nop /* D20D9C 80240F0C 4616A082 */ mul.s $f2, $f20, $f22 -/* D20DA0 80240F10 00000000 */ nop +/* D20DA0 80240F10 00000000 */ nop /* D20DA4 80240F14 C7A0002C */ lwc1 $f0, 0x2c($sp) /* D20DA8 80240F18 46180000 */ add.s $f0, $f0, $f24 /* D20DAC 80240F1C 080903CC */ j .L80240F30 /* D20DB0 80240F20 46020000 */ add.s $f0, $f0, $f2 .L80240F24: /* D20DB4 80240F24 4616A002 */ mul.s $f0, $f20, $f22 -/* D20DB8 80240F28 00000000 */ nop +/* D20DB8 80240F28 00000000 */ nop /* D20DBC 80240F2C 4600D000 */ add.s $f0, $f26, $f0 .L80240F30: /* D20DC0 80240F30 E600003C */ swc1 $f0, 0x3c($s0) /* D20DC4 80240F34 8E220074 */ lw $v0, 0x74($s1) /* D20DC8 80240F38 2442000A */ addiu $v0, $v0, 0xa /* D20DCC 80240F3C 44826000 */ mtc1 $v0, $f12 -/* D20DD0 80240F40 00000000 */ nop +/* D20DD0 80240F40 00000000 */ nop /* D20DD4 80240F44 0C00A6C9 */ jal clamp_angle /* D20DD8 80240F48 46806320 */ cvt.s.w $f12, $f12 /* D20DDC 80240F4C 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_80240DE8_D20C78 /* D20DF0 80240F60 860200A8 */ lh $v0, 0xa8($s0) /* D20DF4 80240F64 C600003C */ lwc1 $f0, 0x3c($s0) /* D20DF8 80240F68 44821000 */ mtc1 $v0, $f2 -/* D20DFC 80240F6C 00000000 */ nop +/* D20DFC 80240F6C 00000000 */ nop /* D20E00 80240F70 468010A0 */ cvt.s.w $f2, $f2 /* D20E04 80240F74 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* D20E08 80240F78 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_80240DE8_D20C78 /* D20E24 80240F94 46240000 */ add.d $f0, $f0, $f4 /* D20E28 80240F98 460010A1 */ cvt.d.s $f2, $f2 /* D20E2C 80240F9C 4620103C */ c.lt.d $f2, $f0 -/* D20E30 80240FA0 00000000 */ nop +/* D20E30 80240FA0 00000000 */ nop /* D20E34 80240FA4 4500002E */ bc1f .L80241060 /* D20E38 80240FA8 0280202D */ daddu $a0, $s4, $zero /* D20E3C 80240FAC 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_80240DE8_D20C78 /* D20E7C 80240FEC 3C01C1A0 */ lui $at, 0xc1a0 /* D20E80 80240FF0 44812000 */ mtc1 $at, $f4 /* D20E84 80240FF4 44834000 */ mtc1 $v1, $f8 -/* D20E88 80240FF8 00000000 */ nop +/* D20E88 80240FF8 00000000 */ nop /* D20E8C 80240FFC 46804220 */ cvt.s.w $f8, $f8 /* D20E90 80241000 44074000 */ mfc1 $a3, $f8 /* D20E94 80241004 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_80240DE8_D20C78 .L80241060: /* D20EF0 80241060 8602008C */ lh $v0, 0x8c($s0) /* D20EF4 80241064 14400025 */ bnez $v0, .L802410FC -/* D20EF8 80241068 00000000 */ nop +/* D20EF8 80241068 00000000 */ nop /* D20EFC 8024106C 8602008E */ lh $v0, 0x8e($s0) /* D20F00 80241070 1C400022 */ bgtz $v0, .L802410FC -/* D20F04 80241074 00000000 */ nop +/* D20F04 80241074 00000000 */ nop /* D20F08 80241078 8E620074 */ lw $v0, 0x74($s3) /* D20F0C 8024107C 2442FFFF */ addiu $v0, $v0, -1 /* D20F10 80241080 1840001D */ blez $v0, .L802410F8 @@ -183,7 +183,7 @@ glabel func_80240DE8_D20C78 /* D20F1C 8024108C 9442002A */ lhu $v0, 0x2a($v0) /* D20F20 80241090 30420010 */ andi $v0, $v0, 0x10 /* D20F24 80241094 14400007 */ bnez $v0, .L802410B4 -/* D20F28 80241098 00000000 */ nop +/* D20F28 80241098 00000000 */ nop /* D20F2C 8024109C C600000C */ lwc1 $f0, 0xc($s0) /* D20F30 802410A0 3C014334 */ lui $at, 0x4334 /* D20F34 802410A4 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241210_D210A0.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241210_D210A0.s index 459efb56b8..1ff458ee4f 100644 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241210_D210A0.s +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241210_D210A0.s @@ -60,18 +60,18 @@ glabel func_80241210_D210A0 /* D21178 802412E8 C6200038 */ lwc1 $f0, 0x38($s1) /* D2117C 802412EC 4600018D */ trunc.w.s $f6, $f0 /* D21180 802412F0 44023000 */ mfc1 $v0, $f6 -/* D21184 802412F4 00000000 */ nop +/* D21184 802412F4 00000000 */ nop /* D21188 802412F8 A6420010 */ sh $v0, 0x10($s2) /* D2118C 802412FC C620003C */ lwc1 $f0, 0x3c($s1) /* D21190 80241300 4600018D */ trunc.w.s $f6, $f0 /* D21194 80241304 44023000 */ mfc1 $v0, $f6 -/* D21198 80241308 00000000 */ nop +/* D21198 80241308 00000000 */ nop /* D2119C 8024130C A6420012 */ sh $v0, 0x12($s2) /* D211A0 80241310 C6200040 */ lwc1 $f0, 0x40($s1) /* D211A4 80241314 A2430007 */ sb $v1, 7($s2) /* D211A8 80241318 4600018D */ trunc.w.s $f6, $f0 /* D211AC 8024131C 44023000 */ mfc1 $v0, $f6 -/* D211B0 80241320 00000000 */ nop +/* D211B0 80241320 00000000 */ nop /* D211B4 80241324 A6420014 */ sh $v0, 0x14($s2) .L80241328: /* D211B8 80241328 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802413A8_D21238.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802413A8_D21238.s index 59b56cb36c..48a1660f12 100644 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802413A8_D21238.s +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802413A8_D21238.s @@ -42,9 +42,9 @@ glabel func_802413A8_D21238 /* D212CC 8024143C 44801800 */ mtc1 $zero, $f3 /* D212D0 80241440 46002021 */ cvt.d.s $f0, $f4 /* D212D4 80241444 4620103E */ c.le.d $f2, $f0 -/* D212D8 80241448 00000000 */ nop +/* D212D8 80241448 00000000 */ nop /* D212DC 8024144C 45000030 */ bc1f .L80241510 -/* D212E0 80241450 00000000 */ nop +/* D212E0 80241450 00000000 */ nop /* D212E4 80241454 C600003C */ lwc1 $f0, 0x3c($s0) /* D212E8 80241458 46040000 */ add.s $f0, $f0, $f4 /* D212EC 8024145C E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_802413A8_D21238 /* D2134C 802414BC 27A70020 */ addiu $a3, $sp, 0x20 .L802414C0: /* D21350 802414C0 1040000B */ beqz $v0, .L802414F0 -/* D21354 802414C4 00000000 */ nop +/* D21354 802414C4 00000000 */ nop /* D21358 802414C8 C7A0001C */ lwc1 $f0, 0x1c($sp) /* D2135C 802414CC 46140080 */ add.s $f2, $f0, $f20 /* D21360 802414D0 C600003C */ lwc1 $f0, 0x3c($s0) /* D21364 802414D4 4600103E */ c.le.s $f2, $f0 -/* D21368 802414D8 00000000 */ nop +/* D21368 802414D8 00000000 */ nop /* D2136C 802414DC 4500008D */ bc1f .L80241714 -/* D21370 802414E0 00000000 */ nop +/* D21370 802414E0 00000000 */ nop /* D21374 802414E4 E602003C */ swc1 $f2, 0x3c($s0) /* D21378 802414E8 080905C5 */ j .L80241714 /* D2137C 802414EC AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_802413A8_D21238 /* D21380 802414F0 C602003C */ lwc1 $f2, 0x3c($s0) /* D21384 802414F4 C6000064 */ lwc1 $f0, 0x64($s0) /* D21388 802414F8 4602003E */ c.le.s $f0, $f2 -/* D2138C 802414FC 00000000 */ nop +/* D2138C 802414FC 00000000 */ nop /* D21390 80241500 45030084 */ bc1tl .L80241714 /* D21394 80241504 AE400070 */ sw $zero, 0x70($s2) /* D21398 80241508 080905C5 */ j .L80241714 -/* D2139C 8024150C 00000000 */ nop +/* D2139C 8024150C 00000000 */ nop .L80241510: /* D213A0 80241510 4622003C */ c.lt.d $f0, $f2 -/* D213A4 80241514 00000000 */ nop +/* D213A4 80241514 00000000 */ nop /* D213A8 80241518 4500007E */ bc1f .L80241714 -/* D213AC 8024151C 00000000 */ nop +/* D213AC 8024151C 00000000 */ nop /* D213B0 80241520 9602008E */ lhu $v0, 0x8e($s0) /* D213B4 80241524 24420001 */ addiu $v0, $v0, 1 /* D213B8 80241528 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_802413A8_D21238 /* D213C4 80241534 00021403 */ sra $v0, $v0, 0x10 /* D213C8 80241538 0043102A */ slt $v0, $v0, $v1 /* D213CC 8024153C 14400026 */ bnez $v0, .L802415D8 -/* D213D0 80241540 00000000 */ nop +/* D213D0 80241540 00000000 */ nop /* D213D4 80241544 C60C0038 */ lwc1 $f12, 0x38($s0) /* D213D8 80241548 C60E0040 */ lwc1 $f14, 0x40($s0) /* D213DC 8024154C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_802413A8_D21238 /* D21408 80241578 8E62001C */ lw $v0, 0x1c($s3) /* D2140C 8024157C 46001005 */ abs.s $f0, $f2 /* D21410 80241580 44822000 */ mtc1 $v0, $f4 -/* D21414 80241584 00000000 */ nop +/* D21414 80241584 00000000 */ nop /* D21418 80241588 46802120 */ cvt.s.w $f4, $f4 /* D2141C 8024158C 4600203C */ c.lt.s $f4, $f0 -/* D21420 80241590 00000000 */ nop +/* D21420 80241590 00000000 */ nop /* D21424 80241594 4500000D */ bc1f .L802415CC -/* D21428 80241598 00000000 */ nop +/* D21428 80241598 00000000 */ nop /* D2142C 8024159C 44800000 */ mtc1 $zero, $f0 /* D21430 802415A0 C614000C */ lwc1 $f20, 0xc($s0) /* D21434 802415A4 4600103C */ c.lt.s $f2, $f0 -/* D21438 802415A8 00000000 */ nop +/* D21438 802415A8 00000000 */ nop /* D2143C 802415AC 45000006 */ bc1f .L802415C8 /* D21440 802415B0 00021023 */ negu $v0, $v0 /* D21444 802415B4 44820000 */ mtc1 $v0, $f0 -/* D21448 802415B8 00000000 */ nop +/* D21448 802415B8 00000000 */ nop /* D2144C 802415BC 46800020 */ cvt.s.w $f0, $f0 /* D21450 802415C0 08090573 */ j .L802415CC /* D21454 802415C4 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_802413A8_D21238 /* D2147C 802415EC C600001C */ lwc1 $f0, 0x1c($s0) /* D21480 802415F0 46001080 */ add.s $f2, $f2, $f0 /* D21484 802415F4 4616103C */ c.lt.s $f2, $f22 -/* D21488 802415F8 00000000 */ nop +/* D21488 802415F8 00000000 */ nop /* D2148C 802415FC 45020045 */ bc1fl .L80241714 /* D21490 80241600 E602003C */ swc1 $f2, 0x3c($s0) /* D21494 80241604 080905C4 */ j .L80241710 @@ -169,7 +169,7 @@ glabel func_802413A8_D21238 /* D214AC 8024161C C600001C */ lwc1 $f0, 0x1c($s0) /* D214B0 80241620 C604003C */ lwc1 $f4, 0x3c($s0) /* D214B4 80241624 44821000 */ mtc1 $v0, $f2 -/* D214B8 80241628 00000000 */ nop +/* D214B8 80241628 00000000 */ nop /* D214BC 8024162C 468010A0 */ cvt.s.w $f2, $f2 /* D214C0 80241630 46000005 */ abs.s $f0, $f0 /* D214C4 80241634 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_802413A8_D21238 /* D21500 80241670 0C0372DF */ jal func_800DCB7C /* D21504 80241674 27A70020 */ addiu $a3, $sp, 0x20 /* D21508 80241678 10400015 */ beqz $v0, .L802416D0 -/* D2150C 8024167C 00000000 */ nop +/* D2150C 8024167C 00000000 */ nop /* D21510 80241680 860200A8 */ lh $v0, 0xa8($s0) /* D21514 80241684 C604001C */ lwc1 $f4, 0x1c($s0) /* D21518 80241688 44820000 */ mtc1 $v0, $f0 -/* D2151C 8024168C 00000000 */ nop +/* D2151C 8024168C 00000000 */ nop /* D21520 80241690 46800020 */ cvt.s.w $f0, $f0 /* D21524 80241694 46002085 */ abs.s $f2, $f4 /* D21528 80241698 46020000 */ add.s $f0, $f0, $f2 /* D2152C 8024169C C7A20024 */ lwc1 $f2, 0x24($sp) /* D21530 802416A0 4600103E */ c.le.s $f2, $f0 -/* D21534 802416A4 00000000 */ nop +/* D21534 802416A4 00000000 */ nop /* D21538 802416A8 45000005 */ bc1f .L802416C0 -/* D2153C 802416AC 00000000 */ nop +/* D2153C 802416AC 00000000 */ nop /* D21540 802416B0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* D21544 802416B4 AE00001C */ sw $zero, 0x1c($s0) /* D21548 802416B8 080905C5 */ j .L80241714 @@ -217,13 +217,13 @@ glabel func_802413A8_D21238 /* D21564 802416D4 860200A8 */ lh $v0, 0xa8($s0) /* D21568 802416D8 46163081 */ sub.s $f2, $f6, $f22 /* D2156C 802416DC 44820000 */ mtc1 $v0, $f0 -/* D21570 802416E0 00000000 */ nop +/* D21570 802416E0 00000000 */ nop /* D21574 802416E4 46800020 */ cvt.s.w $f0, $f0 /* D21578 802416E8 46001080 */ add.s $f2, $f2, $f0 /* D2157C 802416EC C604001C */ lwc1 $f4, 0x1c($s0) /* D21580 802416F0 46002005 */ abs.s $f0, $f4 /* D21584 802416F4 4602003C */ c.lt.s $f0, $f2 -/* D21588 802416F8 00000000 */ nop +/* D21588 802416F8 00000000 */ nop /* D2158C 802416FC 45020005 */ bc1fl .L80241714 /* D21590 80241700 AE00001C */ sw $zero, 0x1c($s0) /* D21594 80241704 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241738_D215C8.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241738_D215C8.s index 203d77551f..03898c663f 100644 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241738_D215C8.s +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241738_D215C8.s @@ -49,15 +49,15 @@ glabel func_80241738_D215C8 /* D21670 802417E0 44802000 */ mtc1 $zero, $f4 /* D21674 802417E4 460010A1 */ cvt.d.s $f2, $f2 /* D21678 802417E8 46241082 */ mul.d $f2, $f2, $f4 -/* D2167C 802417EC 00000000 */ nop +/* D2167C 802417EC 00000000 */ nop /* D21680 802417F0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* D21684 802417F4 46000021 */ cvt.d.s $f0, $f0 /* D21688 802417F8 46240002 */ mul.d $f0, $f0, $f4 -/* D2168C 802417FC 00000000 */ nop +/* D2168C 802417FC 00000000 */ nop /* D21690 80241800 3C013FE0 */ lui $at, 0x3fe0 /* D21694 80241804 44812800 */ mtc1 $at, $f5 /* D21698 80241808 44802000 */ mtc1 $zero, $f4 -/* D2169C 8024180C 00000000 */ nop +/* D2169C 8024180C 00000000 */ nop /* D216A0 80241810 46241080 */ add.d $f2, $f2, $f4 /* D216A4 80241814 AE000074 */ sw $zero, 0x74($s0) /* D216A8 80241818 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s index b84dd5d954..f3bfac5e43 100644 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s @@ -54,7 +54,7 @@ glabel func_8024185C_D216EC /* D217AC 8024191C 8E4300B0 */ lw $v1, 0xb0($s2) /* D217B0 80241920 30620004 */ andi $v0, $v1, 4 /* D217B4 80241924 10400007 */ beqz $v0, .L80241944 -/* D217B8 80241928 00000000 */ nop +/* D217B8 80241928 00000000 */ nop /* D217BC 8024192C 824200B4 */ lb $v0, 0xb4($s2) /* D217C0 80241930 1440003C */ bnez $v0, .L80241A24 /* D217C4 80241934 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_8024185C_D216EC /* D217D8 80241948 2C62000F */ sltiu $v0, $v1, 0xf /* D217DC 8024194C 10400034 */ beqz $v0, .L80241A20 /* D217E0 80241950 00031080 */ sll $v0, $v1, 2 -/* D217E4 80241954 3C018025 */ lui $at, %hi(D_8024BE58) +/* D217E4 80241954 3C018025 */ lui $at, %hi(jtbl_8024BE58_D2BCE8) /* D217E8 80241958 00220821 */ addu $at, $at, $v0 -/* D217EC 8024195C 8C22BE58 */ lw $v0, %lo(D_8024BE58)($at) +/* D217EC 8024195C 8C22BE58 */ lw $v0, %lo(jtbl_8024BE58_D2BCE8)($at) /* D217F0 80241960 00400008 */ jr $v0 -/* D217F4 80241964 00000000 */ nop +/* D217F4 80241964 00000000 */ nop +glabel L80241968_D217F8 /* D217F8 80241968 0280202D */ daddu $a0, $s4, $zero /* D217FC 8024196C 0200282D */ daddu $a1, $s0, $zero /* D21800 80241970 0C090154 */ jal func_80240550_D203E0 /* D21804 80241974 0260302D */ daddu $a2, $s3, $zero +glabel L80241978_D21808 /* D21808 80241978 0280202D */ daddu $a0, $s4, $zero /* D2180C 8024197C 0200282D */ daddu $a1, $s0, $zero /* D21810 80241980 0C0901C0 */ jal func_80240700_D20590 /* D21814 80241984 0260302D */ daddu $a2, $s3, $zero /* D21818 80241988 08090689 */ j .L80241A24 /* D2181C 8024198C 0000102D */ daddu $v0, $zero, $zero +glabel L80241990_D21820 /* D21820 80241990 0280202D */ daddu $a0, $s4, $zero /* D21824 80241994 0200282D */ daddu $a1, $s0, $zero /* D21828 80241998 0C09034A */ jal sam_06_UnkNpcAIFunc1 /* D2182C 8024199C 0260302D */ daddu $a2, $s3, $zero +glabel L802419A0_D21830 /* D21830 802419A0 0280202D */ daddu $a0, $s4, $zero /* D21834 802419A4 0200282D */ daddu $a1, $s0, $zero /* D21838 802419A8 0C09037A */ jal func_80240DE8_D20C78 /* D2183C 802419AC 0260302D */ daddu $a2, $s3, $zero /* D21840 802419B0 08090689 */ j .L80241A24 /* D21844 802419B4 0000102D */ daddu $v0, $zero, $zero +glabel L802419B8_D21848 /* D21848 802419B8 0280202D */ daddu $a0, $s4, $zero /* D2184C 802419BC 0200282D */ daddu $a1, $s0, $zero /* D21850 802419C0 0C09044B */ jal sam_06_UnkNpcAIFunc2 /* D21854 802419C4 0260302D */ daddu $a2, $s3, $zero +glabel L802419C8_D21858 /* D21858 802419C8 0280202D */ daddu $a0, $s4, $zero /* D2185C 802419CC 0200282D */ daddu $a1, $s0, $zero /* D21860 802419D0 0C090469 */ jal func_802411A4_D21034 /* D21864 802419D4 0260302D */ daddu $a2, $s3, $zero /* D21868 802419D8 08090689 */ j .L80241A24 /* D2186C 802419DC 0000102D */ daddu $v0, $zero, $zero +glabel L802419E0_D21870 /* D21870 802419E0 0280202D */ daddu $a0, $s4, $zero /* D21874 802419E4 0200282D */ daddu $a1, $s0, $zero /* D21878 802419E8 0C090484 */ jal func_80241210_D210A0 /* D2187C 802419EC 0260302D */ daddu $a2, $s3, $zero /* D21880 802419F0 08090689 */ j .L80241A24 /* D21884 802419F4 0000102D */ daddu $v0, $zero, $zero +glabel L802419F8_D21888 /* D21888 802419F8 0280202D */ daddu $a0, $s4, $zero /* D2188C 802419FC 0200282D */ daddu $a1, $s0, $zero /* D21890 80241A00 0C0904D1 */ jal sam_06_UnkNpcAIFunc3 /* D21894 80241A04 0260302D */ daddu $a2, $s3, $zero /* D21898 80241A08 08090689 */ j .L80241A24 /* D2189C 80241A0C 0000102D */ daddu $v0, $zero, $zero +glabel L80241A10_D218A0 /* D218A0 80241A10 0280202D */ daddu $a0, $s4, $zero /* D218A4 80241A14 0200282D */ daddu $a1, $s0, $zero /* D218A8 80241A18 0C0904EA */ jal func_802413A8_D21238 /* D218AC 80241A1C 0260302D */ daddu $a2, $s3, $zero .L80241A20: +glabel L80241A20_D218B0 /* D218B0 80241A20 0000102D */ daddu $v0, $zero, $zero .L80241A24: /* D218B4 80241A24 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241A48_D218D8.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241A48_D218D8.s index a5ad542b83..25f18ef4dc 100644 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241A48_D218D8.s +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241A48_D218D8.s @@ -26,7 +26,7 @@ glabel func_80241A48_D218D8 /* D21928 80241A98 1440FFFA */ bnez $v0, .L80241A84 /* D2192C 80241A9C 24A50004 */ addiu $a1, $a1, 4 /* D21930 80241AA0 080906B9 */ j .L80241AE4 -/* D21934 80241AA4 00000000 */ nop +/* D21934 80241AA4 00000000 */ nop .L80241AA8: /* D21938 80241AA8 0000182D */ daddu $v1, $zero, $zero /* D2193C 80241AAC 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241E18_D21CA8.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241E18_D21CA8.s index 86f4214c44..625fa6684e 100644 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241E18_D21CA8.s +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241E18_D21CA8.s @@ -28,7 +28,7 @@ glabel func_80241E18_D21CA8 /* D21CFC 80241E6C 00220821 */ addu $at, $at, $v0 /* D21D00 80241E70 AC20BEA0 */ sw $zero, %lo(D_8024BEA0)($at) /* D21D04 80241E74 080907A9 */ j .L80241EA4 -/* D21D08 80241E78 00000000 */ nop +/* D21D08 80241E78 00000000 */ nop .L80241E7C: /* D21D0C 80241E7C 3C038025 */ lui $v1, %hi(D_8024BEA0) /* D21D10 80241E80 2463BEA0 */ addiu $v1, $v1, %lo(D_8024BEA0) diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241EB4_D21D44.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241EB4_D21D44.s index 067578307c..0b8b9f7980 100644 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241EB4_D21D44.s +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241EB4_D21D44.s @@ -28,7 +28,7 @@ glabel func_80241EB4_D21D44 /* D21D98 80241F08 00220821 */ addu $at, $at, $v0 /* D21D9C 80241F0C AC20C068 */ sw $zero, %lo(D_8024C068)($at) /* D21DA0 80241F10 080907D0 */ j .L80241F40 -/* D21DA4 80241F14 00000000 */ nop +/* D21DA4 80241F14 00000000 */ nop .L80241F18: /* D21DA8 80241F18 3C038025 */ lui $v1, %hi(D_8024C068) /* D21DAC 80241F1C 2463C068 */ addiu $v1, $v1, %lo(D_8024C068) diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F98_D21E28.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F98_D21E28.s index df06c2432d..de6dcb7b04 100644 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F98_D21E28.s +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F98_D21E28.s @@ -22,7 +22,7 @@ glabel func_80241F98_D21E28 /* D21E6C 80241FDC 0C04DF93 */ jal func_80137E4C /* D21E70 80241FE0 24070091 */ addiu $a3, $zero, 0x91 /* D21E74 80241FE4 44900000 */ mtc1 $s0, $f0 -/* D21E78 80241FE8 00000000 */ nop +/* D21E78 80241FE8 00000000 */ nop /* D21E7C 80241FEC 46800020 */ cvt.s.w $f0, $f0 /* D21E80 80241FF0 44050000 */ mfc1 $a1, $f0 /* D21E84 80241FF4 0C04DF62 */ jal func_80137D88 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242014_D21EA4.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242014_D21EA4.s index 5b25e18c12..937ba26ced 100644 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242014_D21EA4.s +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242014_D21EA4.s @@ -16,7 +16,7 @@ glabel func_80242014_D21EA4 /* D21ED0 80242040 0C0B1EAF */ jal get_variable /* D21ED4 80242044 0040802D */ daddu $s0, $v0, $zero /* D21ED8 80242048 44820000 */ mtc1 $v0, $f0 -/* D21EDC 8024204C 00000000 */ nop +/* D21EDC 8024204C 00000000 */ nop /* D21EE0 80242050 46800020 */ cvt.s.w $f0, $f0 /* D21EE4 80242054 24020002 */ addiu $v0, $zero, 2 /* D21EE8 80242058 00501804 */ sllv $v1, $s0, $v0 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242110_D21FA0.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242110_D21FA0.s index 2617f7be65..e9855183ad 100644 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242110_D21FA0.s +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242110_D21FA0.s @@ -12,7 +12,7 @@ glabel func_80242110_D21FA0 /* D21FBC 8024212C 80A30006 */ lb $v1, 6($a1) /* D21FC0 80242130 80A20005 */ lb $v0, 5($a1) /* D21FC4 80242134 14620007 */ bne $v1, $v0, .L80242154 -/* D21FC8 80242138 00000000 */ nop +/* D21FC8 80242138 00000000 */ nop /* D21FCC 8024213C 80C2028E */ lb $v0, 0x28e($a2) /* D21FD0 80242140 84C30290 */ lh $v1, 0x290($a2) /* D21FD4 80242144 00021200 */ sll $v0, $v0, 8 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242538_D223C8.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242538_D223C8.s index 04618e56b0..15fcbeb13d 100644 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242538_D223C8.s +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242538_D223C8.s @@ -64,4 +64,4 @@ glabel func_80242538_D223C8 /* D224A0 80242610 8FB00010 */ lw $s0, 0x10($sp) /* D224A4 80242614 03E00008 */ jr $ra /* D224A8 80242618 27BD0018 */ addiu $sp, $sp, 0x18 -/* D224AC 8024261C 00000000 */ nop +/* D224AC 8024261C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240000_D2BD30.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240000_D2BD30.s index 0af76feb75..0a128c27dd 100644 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240000_D2BD30.s +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240000_D2BD30.s @@ -55,28 +55,28 @@ glabel func_80240000_D2BD30 /* D2BDF4 802400C4 24040014 */ addiu $a0, $zero, 0x14 /* D2BDF8 802400C8 2442FFF6 */ addiu $v0, $v0, -0xa /* D2BDFC 802400CC 44820000 */ mtc1 $v0, $f0 -/* D2BE00 802400D0 00000000 */ nop +/* D2BE00 802400D0 00000000 */ nop /* D2BE04 802400D4 46800020 */ cvt.s.w $f0, $f0 /* D2BE08 802400D8 0C00A67F */ jal rand_int /* D2BE0C 802400DC E600FFEC */ swc1 $f0, -0x14($s0) /* D2BE10 802400E0 24040014 */ addiu $a0, $zero, 0x14 /* D2BE14 802400E4 2442FFF6 */ addiu $v0, $v0, -0xa /* D2BE18 802400E8 44820000 */ mtc1 $v0, $f0 -/* D2BE1C 802400EC 00000000 */ nop +/* D2BE1C 802400EC 00000000 */ nop /* D2BE20 802400F0 46800020 */ cvt.s.w $f0, $f0 /* D2BE24 802400F4 0C00A67F */ jal rand_int /* D2BE28 802400F8 E600FFF0 */ swc1 $f0, -0x10($s0) /* D2BE2C 802400FC 24040005 */ addiu $a0, $zero, 5 /* D2BE30 80240100 2442FFF6 */ addiu $v0, $v0, -0xa /* D2BE34 80240104 44820000 */ mtc1 $v0, $f0 -/* D2BE38 80240108 00000000 */ nop +/* D2BE38 80240108 00000000 */ nop /* D2BE3C 8024010C 46800020 */ cvt.s.w $f0, $f0 /* D2BE40 80240110 0C00A67F */ jal rand_int /* D2BE44 80240114 E600FFF4 */ swc1 $f0, -0xc($s0) /* D2BE48 80240118 3C0140A0 */ lui $at, 0x40a0 /* D2BE4C 8024011C 44811000 */ mtc1 $at, $f2 /* D2BE50 80240120 44820000 */ mtc1 $v0, $f0 -/* D2BE54 80240124 00000000 */ nop +/* D2BE54 80240124 00000000 */ nop /* D2BE58 80240128 46800020 */ cvt.s.w $f0, $f0 /* D2BE5C 8024012C 46020000 */ add.s $f0, $f0, $f2 /* D2BE60 80240130 24040003 */ addiu $a0, $zero, 3 @@ -85,7 +85,7 @@ glabel func_80240000_D2BD30 /* D2BE6C 8024013C 3C013F80 */ lui $at, 0x3f80 /* D2BE70 80240140 44811000 */ mtc1 $at, $f2 /* D2BE74 80240144 44820000 */ mtc1 $v0, $f0 -/* D2BE78 80240148 00000000 */ nop +/* D2BE78 80240148 00000000 */ nop /* D2BE7C 8024014C 46800020 */ cvt.s.w $f0, $f0 /* D2BE80 80240150 46020000 */ add.s $f0, $f0, $f2 /* D2BE84 80240154 24040168 */ addiu $a0, $zero, 0x168 @@ -93,7 +93,7 @@ glabel func_80240000_D2BD30 /* D2BE8C 8024015C E600FFFC */ swc1 $f0, -4($s0) /* D2BE90 80240160 0000302D */ daddu $a2, $zero, $zero /* D2BE94 80240164 44820000 */ mtc1 $v0, $f0 -/* D2BE98 80240168 00000000 */ nop +/* D2BE98 80240168 00000000 */ nop /* D2BE9C 8024016C 46800020 */ cvt.s.w $f0, $f0 /* D2BEA0 80240170 E6000000 */ swc1 $f0, ($s0) /* D2BEA4 80240174 0000282D */ daddu $a1, $zero, $zero @@ -155,10 +155,10 @@ glabel func_80240000_D2BD30 /* D2BF74 80240244 C7C0002C */ lwc1 $f0, 0x2c($fp) /* D2BF78 80240248 3C014316 */ lui $at, 0x4316 /* D2BF7C 8024024C 44811000 */ mtc1 $at, $f2 -/* D2BF80 80240250 00000000 */ nop +/* D2BF80 80240250 00000000 */ nop /* D2BF84 80240254 46020001 */ sub.s $f0, $f0, $f2 /* D2BF88 80240258 4600203C */ c.lt.s $f4, $f0 -/* D2BF8C 8024025C 00000000 */ nop +/* D2BF8C 8024025C 00000000 */ nop /* D2BF90 80240260 45000007 */ bc1f .L80240280 /* D2BF94 80240264 0000302D */ daddu $a2, $zero, $zero /* D2BF98 80240268 8EE20074 */ lw $v0, 0x74($s7) @@ -269,7 +269,7 @@ glabel func_80240000_D2BD30 /* D2C12C 802403FC 0000102D */ daddu $v0, $zero, $zero /* D2C130 80240400 8EE40070 */ lw $a0, 0x70($s7) /* D2C134 80240404 0C00AB4B */ jal heap_free -/* D2C138 80240408 00000000 */ nop +/* D2C138 80240408 00000000 */ nop /* D2C13C 8024040C 24020002 */ addiu $v0, $zero, 2 .L80240410: /* D2C140 80240410 8FBF013C */ lw $ra, 0x13c($sp) diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240448_D2C178.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240448_D2C178.s index 1b17689e94..4f24804cb3 100644 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240448_D2C178.s +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240448_D2C178.s @@ -23,18 +23,18 @@ glabel func_80240448_D2C178 /* D2C1C0 80240490 8E050000 */ lw $a1, ($s0) /* D2C1C4 80240494 26100004 */ addiu $s0, $s0, 4 /* D2C1C8 80240498 4482C000 */ mtc1 $v0, $f24 -/* D2C1CC 8024049C 00000000 */ nop +/* D2C1CC 8024049C 00000000 */ nop /* D2C1D0 802404A0 4680C620 */ cvt.s.w $f24, $f24 /* D2C1D4 802404A4 0C0B1EAF */ jal get_variable /* D2C1D8 802404A8 0220202D */ daddu $a0, $s1, $zero /* D2C1DC 802404AC 8E050000 */ lw $a1, ($s0) /* D2C1E0 802404B0 4482B000 */ mtc1 $v0, $f22 -/* D2C1E4 802404B4 00000000 */ nop +/* D2C1E4 802404B4 00000000 */ nop /* D2C1E8 802404B8 4680B5A0 */ cvt.s.w $f22, $f22 /* D2C1EC 802404BC 0C0B1EAF */ jal get_variable /* D2C1F0 802404C0 0220202D */ daddu $a0, $s1, $zero /* D2C1F4 802404C4 4482A000 */ mtc1 $v0, $f20 -/* D2C1F8 802404C8 00000000 */ nop +/* D2C1F8 802404C8 00000000 */ nop /* D2C1FC 802404CC 4680A520 */ cvt.s.w $f20, $f20 /* D2C200 802404D0 0C04417A */ jal get_entity_by_index /* D2C204 802404D4 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_802405B0_D2C2E0.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_802405B0_D2C2E0.s index 499f52f430..11683fd10c 100644 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_802405B0_D2C2E0.s +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_802405B0_D2C2E0.s @@ -18,7 +18,7 @@ glabel func_802405B0_D2C2E0 /* D2C314 802405E4 3C038016 */ lui $v1, %hi(gCollisionStatus+0x2) /* D2C318 802405E8 8463A552 */ lh $v1, %lo(gCollisionStatus+0x2)($v1) /* D2C31C 802405EC 10700003 */ beq $v1, $s0, .L802405FC -/* D2C320 802405F0 00000000 */ nop +/* D2C320 802405F0 00000000 */ nop /* D2C324 802405F4 1462000A */ bne $v1, $v0, .L80240620 /* D2C328 802405F8 24020002 */ addiu $v0, $zero, 2 .L802405FC: diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240858_D2C588.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240858_D2C588.s index de44d33000..96f98723b9 100644 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240858_D2C588.s +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240858_D2C588.s @@ -42,7 +42,7 @@ glabel func_80240858_D2C588 /* D2C61C 802408EC C6620074 */ lwc1 $f2, 0x74($s3) /* D2C620 802408F0 468010A0 */ cvt.s.w $f2, $f2 /* D2C624 802408F4 4600103C */ c.lt.s $f2, $f0 -/* D2C628 802408F8 00000000 */ nop +/* D2C628 802408F8 00000000 */ nop /* D2C62C 802408FC 45030001 */ bc1tl .L80240904 /* D2C630 80240900 0000882D */ daddu $s1, $zero, $zero .L80240904: @@ -51,16 +51,16 @@ glabel func_80240858_D2C588 /* D2C63C 8024090C 3C014387 */ lui $at, 0x4387 /* D2C640 80240910 4481A000 */ mtc1 $at, $f20 /* D2C644 80240914 0C00A70A */ jal get_clamped_angle_diff -/* D2C648 80240918 00000000 */ nop +/* D2C648 80240918 00000000 */ nop /* D2C64C 8024091C 0C00A6C9 */ jal clamp_angle /* D2C650 80240920 46000306 */ mov.s $f12, $f0 /* D2C654 80240924 3C018024 */ lui $at, %hi(D_80243D80) /* D2C658 80240928 D4223D80 */ ldc1 $f2, %lo(D_80243D80)($at) /* D2C65C 8024092C 46000021 */ cvt.d.s $f0, $f0 /* D2C660 80240930 4622003C */ c.lt.d $f0, $f2 -/* D2C664 80240934 00000000 */ nop +/* D2C664 80240934 00000000 */ nop /* D2C668 80240938 45000003 */ bc1f .L80240948 -/* D2C66C 8024093C 00000000 */ nop +/* D2C66C 8024093C 00000000 */ nop /* D2C670 80240940 3C0142B4 */ lui $at, 0x42b4 /* D2C674 80240944 4481A000 */ mtc1 $at, $f20 .L80240948: @@ -77,7 +77,7 @@ glabel func_80240858_D2C588 /* D2C6A0 80240970 468010A0 */ cvt.s.w $f2, $f2 /* D2C6A4 80240974 46000005 */ abs.s $f0, $f0 /* D2C6A8 80240978 4600103C */ c.lt.s $f2, $f0 -/* D2C6AC 8024097C 00000000 */ nop +/* D2C6AC 8024097C 00000000 */ nop /* D2C6B0 80240980 45030001 */ bc1tl .L80240988 /* D2C6B4 80240984 0000882D */ daddu $s1, $zero, $zero .L80240988: @@ -87,13 +87,13 @@ glabel func_80240858_D2C588 /* D2C6C4 80240994 860200A8 */ lh $v0, 0xa8($s0) /* D2C6C8 80240998 46020001 */ sub.s $f0, $f0, $f2 /* D2C6CC 8024099C 44821000 */ mtc1 $v0, $f2 -/* D2C6D0 802409A0 00000000 */ nop +/* D2C6D0 802409A0 00000000 */ nop /* D2C6D4 802409A4 468010A1 */ cvt.d.w $f2, $f2 /* D2C6D8 802409A8 46221080 */ add.d $f2, $f2, $f2 /* D2C6DC 802409AC 46000005 */ abs.s $f0, $f0 /* D2C6E0 802409B0 46000021 */ cvt.d.s $f0, $f0 /* D2C6E4 802409B4 4620103E */ c.le.d $f2, $f0 -/* D2C6E8 802409B8 00000000 */ nop +/* D2C6E8 802409B8 00000000 */ nop /* D2C6EC 802409BC 45030001 */ bc1tl .L802409C4 /* D2C6F0 802409C0 0000882D */ daddu $s1, $zero, $zero .L802409C4: diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240A0C_D2C73C.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240A0C_D2C73C.s index cf8f9a27fb..6c9e1afdb1 100644 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240A0C_D2C73C.s +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240A0C_D2C73C.s @@ -19,7 +19,7 @@ glabel func_80240A0C_D2C73C /* D2C774 80240A44 8E2200B0 */ lw $v0, 0xb0($s1) /* D2C778 80240A48 30420004 */ andi $v0, $v0, 4 /* D2C77C 80240A4C 10400015 */ beqz $v0, .L80240AA4 -/* D2C780 80240A50 00000000 */ nop +/* D2C780 80240A50 00000000 */ nop .L80240A54: /* D2C784 80240A54 AE800070 */ sw $zero, 0x70($s4) /* D2C788 80240A58 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel func_80240A0C_D2C73C /* D2C7D8 80240AA8 12600005 */ beqz $s3, .L80240AC0 /* D2C7DC 80240AAC 24020001 */ addiu $v0, $zero, 1 /* D2C7E0 80240AB0 12620048 */ beq $s3, $v0, .L80240BD4 -/* D2C7E4 80240AB4 00000000 */ nop +/* D2C7E4 80240AB4 00000000 */ nop /* D2C7E8 80240AB8 08090312 */ j .L80240C48 -/* D2C7EC 80240ABC 00000000 */ nop +/* D2C7EC 80240ABC 00000000 */ nop .L80240AC0: /* D2C7F0 80240AC0 86240008 */ lh $a0, 8($s1) /* D2C7F4 80240AC4 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel func_80240A0C_D2C73C /* D2C814 80240AE4 8E03006C */ lw $v1, 0x6c($s0) /* D2C818 80240AE8 24020003 */ addiu $v0, $zero, 3 /* D2C81C 80240AEC 14620056 */ bne $v1, $v0, .L80240C48 -/* D2C820 80240AF0 00000000 */ nop +/* D2C820 80240AF0 00000000 */ nop /* D2C824 80240AF4 8E2500A8 */ lw $a1, 0xa8($s1) /* D2C828 80240AF8 10A00003 */ beqz $a1, .L80240B08 /* D2C82C 80240AFC 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel func_80240A0C_D2C73C /* D2C8A4 80240B74 C7A20014 */ lwc1 $f2, 0x14($sp) /* D2C8A8 80240B78 4600020D */ trunc.w.s $f8, $f0 /* D2C8AC 80240B7C 44024000 */ mfc1 $v0, $f8 -/* D2C8B0 80240B80 00000000 */ nop +/* D2C8B0 80240B80 00000000 */ nop /* D2C8B4 80240B84 A6220012 */ sh $v0, 0x12($s1) /* D2C8B8 80240B88 4600120D */ trunc.w.s $f8, $f2 /* D2C8BC 80240B8C 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s index 19347d235e..7541079b41 100644 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s @@ -100,78 +100,93 @@ glabel func_80240C6C_D2C99C /* D2CB00 80240DD0 2C620064 */ sltiu $v0, $v1, 0x64 /* D2CB04 80240DD4 10400048 */ beqz $v0, .L80240EF8 /* D2CB08 80240DD8 00031080 */ sll $v0, $v1, 2 -/* D2CB0C 80240DDC 3C018024 */ lui $at, %hi(D_80243D88) +/* D2CB0C 80240DDC 3C018024 */ lui $at, %hi(jtbl_80243D88_D2FAB8) /* D2CB10 80240DE0 00220821 */ addu $at, $at, $v0 -/* D2CB14 80240DE4 8C223D88 */ lw $v0, %lo(D_80243D88)($at) +/* D2CB14 80240DE4 8C223D88 */ lw $v0, %lo(jtbl_80243D88_D2FAB8)($at) /* D2CB18 80240DE8 00400008 */ jr $v0 /* D2CB1C 80240DEC 00000000 */ nop +glabel L80240DF0_D2CB20 /* D2CB20 80240DF0 0240202D */ daddu $a0, $s2, $zero /* D2CB24 80240DF4 0260282D */ daddu $a1, $s3, $zero /* D2CB28 80240DF8 0C012568 */ jal func_800495A0 /* D2CB2C 80240DFC 0280302D */ daddu $a2, $s4, $zero +glabel L80240E00_D2CB30 /* D2CB30 80240E00 0240202D */ daddu $a0, $s2, $zero /* D2CB34 80240E04 0260282D */ daddu $a1, $s3, $zero /* D2CB38 80240E08 0C0125AE */ jal func_800496B8 /* D2CB3C 80240E0C 0280302D */ daddu $a2, $s4, $zero /* D2CB40 80240E10 080903BE */ j .L80240EF8 /* D2CB44 80240E14 00000000 */ nop +glabel L80240E18_D2CB48 /* D2CB48 80240E18 0240202D */ daddu $a0, $s2, $zero /* D2CB4C 80240E1C 0260282D */ daddu $a1, $s3, $zero /* D2CB50 80240E20 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D2CB54 80240E24 0280302D */ daddu $a2, $s4, $zero +glabel L80240E28_D2CB58 /* D2CB58 80240E28 0240202D */ daddu $a0, $s2, $zero /* D2CB5C 80240E2C 0260282D */ daddu $a1, $s3, $zero /* D2CB60 80240E30 0C012701 */ jal func_80049C04 /* D2CB64 80240E34 0280302D */ daddu $a2, $s4, $zero /* D2CB68 80240E38 080903BE */ j .L80240EF8 /* D2CB6C 80240E3C 00000000 */ nop +glabel L80240E40_D2CB70 /* D2CB70 80240E40 0240202D */ daddu $a0, $s2, $zero /* D2CB74 80240E44 0260282D */ daddu $a1, $s3, $zero /* D2CB78 80240E48 0C01278F */ jal func_80049E3C /* D2CB7C 80240E4C 0280302D */ daddu $a2, $s4, $zero +glabel L80240E50_D2CB80 /* D2CB80 80240E50 0240202D */ daddu $a0, $s2, $zero /* D2CB84 80240E54 0260282D */ daddu $a1, $s3, $zero /* D2CB88 80240E58 0C0127B3 */ jal func_80049ECC /* D2CB8C 80240E5C 0280302D */ daddu $a2, $s4, $zero /* D2CB90 80240E60 080903BE */ j .L80240EF8 /* D2CB94 80240E64 00000000 */ nop +glabel L80240E68_D2CB98 /* D2CB98 80240E68 0240202D */ daddu $a0, $s2, $zero /* D2CB9C 80240E6C 0260282D */ daddu $a1, $s3, $zero /* D2CBA0 80240E70 0C0127DF */ jal func_80049F7C /* D2CBA4 80240E74 0280302D */ daddu $a2, $s4, $zero +glabel L80240E78_D2CBA8 /* D2CBA8 80240E78 0240202D */ daddu $a0, $s2, $zero /* D2CBAC 80240E7C 0260282D */ daddu $a1, $s3, $zero /* D2CBB0 80240E80 0C012849 */ jal func_8004A124 /* D2CBB4 80240E84 0280302D */ daddu $a2, $s4, $zero /* D2CBB8 80240E88 080903BE */ j .L80240EF8 /* D2CBBC 80240E8C 00000000 */ nop +glabel L80240E90_D2CBC0 /* D2CBC0 80240E90 0240202D */ daddu $a0, $s2, $zero /* D2CBC4 80240E94 0260282D */ daddu $a1, $s3, $zero /* D2CBC8 80240E98 0C0128FA */ jal func_8004A3E8 /* D2CBCC 80240E9C 0280302D */ daddu $a2, $s4, $zero /* D2CBD0 80240EA0 080903BE */ j .L80240EF8 /* D2CBD4 80240EA4 00000000 */ nop +glabel L80240EA8_D2CBD8 /* D2CBD8 80240EA8 0C090194 */ jal sam_07_UnkNpcAIFunc6 /* D2CBDC 80240EAC 0240202D */ daddu $a0, $s2, $zero +glabel L80240EB0_D2CBE0 /* D2CBE0 80240EB0 0C0901AF */ jal sam_07_UnkNpcAIFunc7 /* D2CBE4 80240EB4 0240202D */ daddu $a0, $s2, $zero /* D2CBE8 80240EB8 8E430070 */ lw $v1, 0x70($s2) /* D2CBEC 80240EBC 24020020 */ addiu $v0, $zero, 0x20 /* D2CBF0 80240EC0 1462000D */ bne $v1, $v0, .L80240EF8 /* D2CBF4 80240EC4 00000000 */ nop +glabel L80240EC8_D2CBF8 /* D2CBF8 80240EC8 0C0901CB */ jal sam_07_UnkNpcAIFunc8 /* D2CBFC 80240ECC 0240202D */ daddu $a0, $s2, $zero /* D2CC00 80240ED0 8E430070 */ lw $v1, 0x70($s2) /* D2CC04 80240ED4 24020021 */ addiu $v0, $zero, 0x21 /* D2CC08 80240ED8 14620007 */ bne $v1, $v0, .L80240EF8 /* D2CC0C 80240EDC 00000000 */ nop +glabel L80240EE0_D2CC10 /* D2CC10 80240EE0 0C090201 */ jal sam_07_UnkNpcAIFunc5 /* D2CC14 80240EE4 0240202D */ daddu $a0, $s2, $zero /* D2CC18 80240EE8 080903BE */ j .L80240EF8 /* D2CC1C 80240EEC 00000000 */ nop +glabel L80240EF0_D2CC20 /* D2CC20 80240EF0 0C0129CF */ jal func_8004A73C /* D2CC24 80240EF4 0240202D */ daddu $a0, $s2, $zero .L80240EF8: +glabel L80240EF8_D2CC28 /* D2CC28 80240EF8 8FBF0048 */ lw $ra, 0x48($sp) /* D2CC2C 80240EFC 8FB50044 */ lw $s5, 0x44($sp) /* D2CC30 80240F00 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240F8C_D2CCBC.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240F8C_D2CCBC.s index 2a61d6746c..1d5f7a74b7 100644 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240F8C_D2CCBC.s +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240F8C_D2CCBC.s @@ -38,7 +38,7 @@ glabel func_80240F8C_D2CCBC /* D2CD40 80241010 3C01C1A0 */ lui $at, 0xc1a0 /* D2CD44 80241014 44812000 */ mtc1 $at, $f4 /* D2CD48 80241018 44833000 */ mtc1 $v1, $f6 -/* D2CD4C 8024101C 00000000 */ nop +/* D2CD4C 8024101C 00000000 */ nop /* D2CD50 80241020 468031A0 */ cvt.s.w $f6, $f6 /* D2CD54 80241024 44073000 */ mfc1 $a3, $f6 /* D2CD58 80241028 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241088_D2CDB8.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241088_D2CDB8.s index d6523be847..8512236db4 100644 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241088_D2CDB8.s +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241088_D2CDB8.s @@ -39,18 +39,18 @@ glabel func_80241088_D2CDB8 .L80241110: /* D2CE40 80241110 8622008E */ lh $v0, 0x8e($s1) /* D2CE44 80241114 1440025D */ bnez $v0, .L80241A8C -/* D2CE48 80241118 00000000 */ nop +/* D2CE48 80241118 00000000 */ nop /* D2CE4C 8024111C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* D2CE50 80241120 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* D2CE54 80241124 0C00A6C9 */ jal clamp_angle /* D2CE58 80241128 C44C00A8 */ lwc1 $f12, 0xa8($v0) /* D2CE5C 8024112C 3C014334 */ lui $at, 0x4334 /* D2CE60 80241130 44811000 */ mtc1 $at, $f2 -/* D2CE64 80241134 00000000 */ nop +/* D2CE64 80241134 00000000 */ nop /* D2CE68 80241138 4602003C */ c.lt.s $f0, $f2 -/* D2CE6C 8024113C 00000000 */ nop +/* D2CE6C 8024113C 00000000 */ nop /* D2CE70 80241140 45000011 */ bc1f .L80241188 -/* D2CE74 80241144 00000000 */ nop +/* D2CE74 80241144 00000000 */ nop /* D2CE78 80241148 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* D2CE7C 8024114C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* D2CE80 80241150 3C0142B4 */ lui $at, 0x42b4 @@ -85,7 +85,7 @@ glabel func_80241088_D2CDB8 /* D2CEF0 802411C0 460C0300 */ add.s $f12, $f0, $f12 .L802411C4: /* D2CEF4 802411C4 0C00A6C9 */ jal clamp_angle -/* D2CEF8 802411C8 00000000 */ nop +/* D2CEF8 802411C8 00000000 */ nop /* D2CEFC 802411CC 46000586 */ mov.s $f22, $f0 /* D2CF00 802411D0 3C014334 */ lui $at, 0x4334 /* D2CF04 802411D4 44816000 */ mtc1 $at, $f12 @@ -134,7 +134,7 @@ glabel func_80241088_D2CDB8 /* D2CFA0 80241270 862200A6 */ lh $v0, 0xa6($s1) /* D2CFA4 80241274 8EA30000 */ lw $v1, ($s5) /* D2CFA8 80241278 44824000 */ mtc1 $v0, $f8 -/* D2CFAC 8024127C 00000000 */ nop +/* D2CFAC 8024127C 00000000 */ nop /* D2CFB0 80241280 46804220 */ cvt.s.w $f8, $f8 /* D2CFB4 80241284 C4600028 */ lwc1 $f0, 0x28($v1) /* D2CFB8 80241288 44064000 */ mfc1 $a2, $f8 @@ -146,7 +146,7 @@ glabel func_80241088_D2CDB8 /* D2CFD0 802412A0 E6200040 */ swc1 $f0, 0x40($s1) /* D2CFD4 802412A4 862200A6 */ lh $v0, 0xa6($s1) /* D2CFD8 802412A8 44820000 */ mtc1 $v0, $f0 -/* D2CFDC 802412AC 00000000 */ nop +/* D2CFDC 802412AC 00000000 */ nop /* D2CFE0 802412B0 46800020 */ cvt.s.w $f0, $f0 /* D2CFE4 802412B4 4600A000 */ add.s $f0, $f20, $f0 /* D2CFE8 802412B8 4406B000 */ mfc1 $a2, $f22 @@ -155,18 +155,18 @@ glabel func_80241088_D2CDB8 /* D2CFF4 802412C4 0220202D */ daddu $a0, $s1, $zero /* D2CFF8 802412C8 8EC20088 */ lw $v0, 0x88($s6) /* D2CFFC 802412CC 1440005D */ bnez $v0, .L80241444 -/* D2D000 802412D0 00000000 */ nop +/* D2D000 802412D0 00000000 */ nop /* D2D004 802412D4 C6200038 */ lwc1 $f0, 0x38($s1) /* D2D008 802412D8 3C018024 */ lui $at, %hi(D_80243F18) /* D2D00C 802412DC D4243F18 */ ldc1 $f4, %lo(D_80243F18)($at) /* D2D010 802412E0 46000021 */ cvt.d.s $f0, $f0 /* D2D014 802412E4 4620203C */ c.lt.d $f4, $f0 -/* D2D018 802412E8 00000000 */ nop +/* D2D018 802412E8 00000000 */ nop /* D2D01C 802412EC 45000005 */ bc1f .L80241304 -/* D2D020 802412F0 00000000 */ nop +/* D2D020 802412F0 00000000 */ nop /* D2D024 802412F4 3C0143BE */ lui $at, 0x43be /* D2D028 802412F8 44810000 */ mtc1 $at, $f0 -/* D2D02C 802412FC 00000000 */ nop +/* D2D02C 802412FC 00000000 */ nop /* D2D030 80241300 E6200038 */ swc1 $f0, 0x38($s1) .L80241304: /* D2D034 80241304 C6200038 */ lwc1 $f0, 0x38($s1) @@ -174,50 +174,50 @@ glabel func_80241088_D2CDB8 /* D2D03C 8024130C D4223F20 */ ldc1 $f2, %lo(D_80243F20)($at) /* D2D040 80241310 46000021 */ cvt.d.s $f0, $f0 /* D2D044 80241314 4622003C */ c.lt.d $f0, $f2 -/* D2D048 80241318 00000000 */ nop +/* D2D048 80241318 00000000 */ nop /* D2D04C 8024131C 45000005 */ bc1f .L80241334 -/* D2D050 80241320 00000000 */ nop +/* D2D050 80241320 00000000 */ nop /* D2D054 80241324 3C01C3BE */ lui $at, 0xc3be /* D2D058 80241328 44810000 */ mtc1 $at, $f0 -/* D2D05C 8024132C 00000000 */ nop +/* D2D05C 8024132C 00000000 */ nop /* D2D060 80241330 E6200038 */ swc1 $f0, 0x38($s1) .L80241334: /* D2D064 80241334 C6200040 */ lwc1 $f0, 0x40($s1) /* D2D068 80241338 46000021 */ cvt.d.s $f0, $f0 /* D2D06C 8024133C 4620203C */ c.lt.d $f4, $f0 -/* D2D070 80241340 00000000 */ nop +/* D2D070 80241340 00000000 */ nop /* D2D074 80241344 45000005 */ bc1f .L8024135C -/* D2D078 80241348 00000000 */ nop +/* D2D078 80241348 00000000 */ nop /* D2D07C 8024134C 3C0143BE */ lui $at, 0x43be /* D2D080 80241350 44810000 */ mtc1 $at, $f0 -/* D2D084 80241354 00000000 */ nop +/* D2D084 80241354 00000000 */ nop /* D2D088 80241358 E6200040 */ swc1 $f0, 0x40($s1) .L8024135C: /* D2D08C 8024135C C6200040 */ lwc1 $f0, 0x40($s1) /* D2D090 80241360 46000021 */ cvt.d.s $f0, $f0 /* D2D094 80241364 4622003C */ c.lt.d $f0, $f2 -/* D2D098 80241368 00000000 */ nop +/* D2D098 80241368 00000000 */ nop /* D2D09C 8024136C 45000005 */ bc1f .L80241384 -/* D2D0A0 80241370 00000000 */ nop +/* D2D0A0 80241370 00000000 */ nop /* D2D0A4 80241374 3C01C3BE */ lui $at, 0xc3be /* D2D0A8 80241378 44810000 */ mtc1 $at, $f0 -/* D2D0AC 8024137C 00000000 */ nop +/* D2D0AC 8024137C 00000000 */ nop /* D2D0B0 80241380 E6200040 */ swc1 $f0, 0x40($s1) .L80241384: /* D2D0B4 80241384 C6220038 */ lwc1 $f2, 0x38($s1) /* D2D0B8 80241388 46021082 */ mul.s $f2, $f2, $f2 -/* D2D0BC 8024138C 00000000 */ nop +/* D2D0BC 8024138C 00000000 */ nop /* D2D0C0 80241390 C6200040 */ lwc1 $f0, 0x40($s1) /* D2D0C4 80241394 46000002 */ mul.s $f0, $f0, $f0 -/* D2D0C8 80241398 00000000 */ nop +/* D2D0C8 80241398 00000000 */ nop /* D2D0CC 8024139C 46001300 */ add.s $f12, $f2, $f0 /* D2D0D0 802413A0 46006004 */ sqrt.s $f0, $f12 /* D2D0D4 802413A4 46000032 */ c.eq.s $f0, $f0 -/* D2D0D8 802413A8 00000000 */ nop +/* D2D0D8 802413A8 00000000 */ nop /* D2D0DC 802413AC 45010003 */ bc1t .L802413BC -/* D2D0E0 802413B0 00000000 */ nop +/* D2D0E0 802413B0 00000000 */ nop /* D2D0E4 802413B4 0C0187BC */ jal sqrtf -/* D2D0E8 802413B8 00000000 */ nop +/* D2D0E8 802413B8 00000000 */ nop .L802413BC: /* D2D0EC 802413BC 8E260038 */ lw $a2, 0x38($s1) /* D2D0F0 802413C0 8E270040 */ lw $a3, 0x40($s1) @@ -232,7 +232,7 @@ glabel func_80241088_D2CDB8 /* D2D114 802413E4 D4203F28 */ ldc1 $f0, %lo(D_80243F28)($at) /* D2D118 802413E8 460010A1 */ cvt.d.s $f2, $f2 /* D2D11C 802413EC 4620103C */ c.lt.d $f2, $f0 -/* D2D120 802413F0 00000000 */ nop +/* D2D120 802413F0 00000000 */ nop /* D2D124 802413F4 45000004 */ bc1f .L80241408 /* D2D128 802413F8 0200202D */ daddu $a0, $s0, $zero /* D2D12C 802413FC 3C064398 */ lui $a2, 0x4398 @@ -242,9 +242,9 @@ glabel func_80241088_D2CDB8 /* D2D138 80241408 3C018024 */ lui $at, %hi(D_80243F30) /* D2D13C 8024140C D4203F30 */ ldc1 $f0, %lo(D_80243F30)($at) /* D2D140 80241410 4622003C */ c.lt.d $f0, $f2 -/* D2D144 80241414 00000000 */ nop +/* D2D144 80241414 00000000 */ nop /* D2D148 80241418 450000FA */ bc1f .L80241804 -/* D2D14C 8024141C 00000000 */ nop +/* D2D14C 8024141C 00000000 */ nop /* D2D150 80241420 3C0643BB */ lui $a2, 0x43bb /* D2D154 80241424 34C68000 */ ori $a2, $a2, 0x8000 .L80241428: @@ -254,7 +254,7 @@ glabel func_80241088_D2CDB8 /* D2D164 80241434 0C00A7E7 */ jal add_vec2D_polar /* D2D168 80241438 E6340040 */ swc1 $f20, 0x40($s1) /* D2D16C 8024143C 08090601 */ j .L80241804 -/* D2D170 80241440 00000000 */ nop +/* D2D170 80241440 00000000 */ nop .L80241444: /* D2D174 80241444 8E220000 */ lw $v0, ($s1) /* D2D178 80241448 30420040 */ andi $v0, $v0, 0x40 @@ -281,13 +281,13 @@ glabel func_80241088_D2CDB8 /* D2D1CC 8024149C 862200A8 */ lh $v0, 0xa8($s1) /* D2D1D0 802414A0 0260302D */ daddu $a2, $s3, $zero /* D2D1D4 802414A4 44820000 */ mtc1 $v0, $f0 -/* D2D1D8 802414A8 00000000 */ nop +/* D2D1D8 802414A8 00000000 */ nop /* D2D1DC 802414AC 46800020 */ cvt.s.w $f0, $f0 /* D2D1E0 802414B0 E7A00018 */ swc1 $f0, 0x18($sp) /* D2D1E4 802414B4 862200A6 */ lh $v0, 0xa6($s1) /* D2D1E8 802414B8 27B00028 */ addiu $s0, $sp, 0x28 /* D2D1EC 802414BC 44820000 */ mtc1 $v0, $f0 -/* D2D1F0 802414C0 00000000 */ nop +/* D2D1F0 802414C0 00000000 */ nop /* D2D1F4 802414C4 46800020 */ cvt.s.w $f0, $f0 /* D2D1F8 802414C8 E7A0001C */ swc1 $f0, 0x1c($sp) /* D2D1FC 802414CC 8E240080 */ lw $a0, 0x80($s1) @@ -311,13 +311,13 @@ glabel func_80241088_D2CDB8 /* D2D244 80241514 E7B60014 */ swc1 $f22, 0x14($sp) /* D2D248 80241518 862200A8 */ lh $v0, 0xa8($s1) /* D2D24C 8024151C 44820000 */ mtc1 $v0, $f0 -/* D2D250 80241520 00000000 */ nop +/* D2D250 80241520 00000000 */ nop /* D2D254 80241524 46800020 */ cvt.s.w $f0, $f0 /* D2D258 80241528 E7A00018 */ swc1 $f0, 0x18($sp) /* D2D25C 8024152C 862200A6 */ lh $v0, 0xa6($s1) /* D2D260 80241530 0260302D */ daddu $a2, $s3, $zero /* D2D264 80241534 44820000 */ mtc1 $v0, $f0 -/* D2D268 80241538 00000000 */ nop +/* D2D268 80241538 00000000 */ nop /* D2D26C 8024153C 46800020 */ cvt.s.w $f0, $f0 /* D2D270 80241540 E7A0001C */ swc1 $f0, 0x1c($sp) /* D2D274 80241544 8E240080 */ lw $a0, 0x80($s1) @@ -347,32 +347,32 @@ glabel func_80241088_D2CDB8 /* D2D2D4 802415A4 0C0372DF */ jal func_800DCB7C /* D2D2D8 802415A8 0040802D */ daddu $s0, $v0, $zero /* D2D2DC 802415AC 1600001C */ bnez $s0, .L80241620 -/* D2D2E0 802415B0 00000000 */ nop +/* D2D2E0 802415B0 00000000 */ nop /* D2D2E4 802415B4 1040001A */ beqz $v0, .L80241620 -/* D2D2E8 802415B8 00000000 */ nop +/* D2D2E8 802415B8 00000000 */ nop /* D2D2EC 802415BC C7A20038 */ lwc1 $f2, 0x38($sp) /* D2D2F0 802415C0 3C014054 */ lui $at, 0x4054 /* D2D2F4 802415C4 44810800 */ mtc1 $at, $f1 /* D2D2F8 802415C8 44800000 */ mtc1 $zero, $f0 /* D2D2FC 802415CC 460010A1 */ cvt.d.s $f2, $f2 /* D2D300 802415D0 4622003C */ c.lt.d $f0, $f2 -/* D2D304 802415D4 00000000 */ nop +/* D2D304 802415D4 00000000 */ nop /* D2D308 802415D8 45000011 */ bc1f .L80241620 -/* D2D30C 802415DC 00000000 */ nop +/* D2D30C 802415DC 00000000 */ nop /* D2D310 802415E0 3C01405E */ lui $at, 0x405e /* D2D314 802415E4 44810800 */ mtc1 $at, $f1 /* D2D318 802415E8 44800000 */ mtc1 $zero, $f0 -/* D2D31C 802415EC 00000000 */ nop +/* D2D31C 802415EC 00000000 */ nop /* D2D320 802415F0 4620103C */ c.lt.d $f2, $f0 -/* D2D324 802415F4 00000000 */ nop +/* D2D324 802415F4 00000000 */ nop /* D2D328 802415F8 45000009 */ bc1f .L80241620 -/* D2D32C 802415FC 00000000 */ nop +/* D2D32C 802415FC 00000000 */ nop /* D2D330 80241600 C622003C */ lwc1 $f2, 0x3c($s1) /* D2D334 80241604 C7A00030 */ lwc1 $f0, 0x30($sp) /* D2D338 80241608 46001032 */ c.eq.s $f2, $f0 -/* D2D33C 8024160C 00000000 */ nop +/* D2D33C 8024160C 00000000 */ nop /* D2D340 80241610 45010003 */ bc1t .L80241620 -/* D2D344 80241614 00000000 */ nop +/* D2D344 80241614 00000000 */ nop /* D2D348 80241618 08090601 */ j .L80241804 /* D2D34C 8024161C 241E0001 */ addiu $fp, $zero, 1 .L80241620: @@ -396,13 +396,13 @@ glabel func_80241088_D2CDB8 /* D2D394 80241664 862200A8 */ lh $v0, 0xa8($s1) /* D2D398 80241668 27A50020 */ addiu $a1, $sp, 0x20 /* D2D39C 8024166C 44820000 */ mtc1 $v0, $f0 -/* D2D3A0 80241670 00000000 */ nop +/* D2D3A0 80241670 00000000 */ nop /* D2D3A4 80241674 46800020 */ cvt.s.w $f0, $f0 /* D2D3A8 80241678 E7A00018 */ swc1 $f0, 0x18($sp) /* D2D3AC 8024167C 862200A6 */ lh $v0, 0xa6($s1) /* D2D3B0 80241680 27A60024 */ addiu $a2, $sp, 0x24 /* D2D3B4 80241684 44820000 */ mtc1 $v0, $f0 -/* D2D3B8 80241688 00000000 */ nop +/* D2D3B8 80241688 00000000 */ nop /* D2D3BC 8024168C 46800020 */ cvt.s.w $f0, $f0 /* D2D3C0 80241690 E7A0001C */ swc1 $f0, 0x1c($sp) /* D2D3C4 80241694 8E240080 */ lw $a0, 0x80($s1) @@ -420,7 +420,7 @@ glabel func_80241088_D2CDB8 /* D2D3F4 802416C4 862200A6 */ lh $v0, 0xa6($s1) /* D2D3F8 802416C8 4407C000 */ mfc1 $a3, $f24 /* D2D3FC 802416CC 44824000 */ mtc1 $v0, $f8 -/* D2D400 802416D0 00000000 */ nop +/* D2D400 802416D0 00000000 */ nop /* D2D404 802416D4 46804220 */ cvt.s.w $f8, $f8 /* D2D408 802416D8 C4600028 */ lwc1 $f0, 0x28($v1) /* D2D40C 802416DC 44064000 */ mfc1 $a2, $f8 @@ -432,7 +432,7 @@ glabel func_80241088_D2CDB8 /* D2D424 802416F4 E6200040 */ swc1 $f0, 0x40($s1) /* D2D428 802416F8 862200A6 */ lh $v0, 0xa6($s1) /* D2D42C 802416FC 44820000 */ mtc1 $v0, $f0 -/* D2D430 80241700 00000000 */ nop +/* D2D430 80241700 00000000 */ nop /* D2D434 80241704 46800020 */ cvt.s.w $f0, $f0 /* D2D438 80241708 080905FD */ j .L802417F4 /* D2D43C 8024170C 4600A500 */ add.s $f20, $f20, $f0 @@ -454,20 +454,20 @@ glabel func_80241088_D2CDB8 /* D2D478 80241748 E7B60014 */ swc1 $f22, 0x14($sp) /* D2D47C 8024174C 862200A8 */ lh $v0, 0xa8($s1) /* D2D480 80241750 44820000 */ mtc1 $v0, $f0 -/* D2D484 80241754 00000000 */ nop +/* D2D484 80241754 00000000 */ nop /* D2D488 80241758 46800020 */ cvt.s.w $f0, $f0 /* D2D48C 8024175C E7A00018 */ swc1 $f0, 0x18($sp) /* D2D490 80241760 862200A6 */ lh $v0, 0xa6($s1) /* D2D494 80241764 27A60024 */ addiu $a2, $sp, 0x24 /* D2D498 80241768 44820000 */ mtc1 $v0, $f0 -/* D2D49C 8024176C 00000000 */ nop +/* D2D49C 8024176C 00000000 */ nop /* D2D4A0 80241770 46800020 */ cvt.s.w $f0, $f0 /* D2D4A4 80241774 E7A0001C */ swc1 $f0, 0x1c($sp) /* D2D4A8 80241778 8E240080 */ lw $a0, 0x80($s1) /* D2D4AC 8024177C 0C037711 */ jal func_800DDC44 /* D2D4B0 80241780 27A70028 */ addiu $a3, $sp, 0x28 /* D2D4B4 80241784 1040001F */ beqz $v0, .L80241804 -/* D2D4B8 80241788 00000000 */ nop +/* D2D4B8 80241788 00000000 */ nop /* D2D4BC 8024178C 8FA60020 */ lw $a2, 0x20($sp) /* D2D4C0 80241790 8EA20000 */ lw $v0, ($s5) /* D2D4C4 80241794 8FA70028 */ lw $a3, 0x28($sp) @@ -479,7 +479,7 @@ glabel func_80241088_D2CDB8 /* D2D4DC 802417AC 862200A6 */ lh $v0, 0xa6($s1) /* D2D4E0 802417B0 4407C000 */ mfc1 $a3, $f24 /* D2D4E4 802417B4 44824000 */ mtc1 $v0, $f8 -/* D2D4E8 802417B8 00000000 */ nop +/* D2D4E8 802417B8 00000000 */ nop /* D2D4EC 802417BC 46804220 */ cvt.s.w $f8, $f8 /* D2D4F0 802417C0 C4600028 */ lwc1 $f0, 0x28($v1) /* D2D4F4 802417C4 44064000 */ mfc1 $a2, $f8 @@ -491,7 +491,7 @@ glabel func_80241088_D2CDB8 /* D2D50C 802417DC E6200040 */ swc1 $f0, 0x40($s1) /* D2D510 802417E0 862200A6 */ lh $v0, 0xa6($s1) /* D2D514 802417E4 44820000 */ mtc1 $v0, $f0 -/* D2D518 802417E8 00000000 */ nop +/* D2D518 802417E8 00000000 */ nop /* D2D51C 802417EC 46800020 */ cvt.s.w $f0, $f0 /* D2D520 802417F0 4600A500 */ add.s $f20, $f20, $f0 .L802417F4: @@ -520,14 +520,14 @@ glabel func_80241088_D2CDB8 /* D2D578 80241848 0C0123F5 */ jal is_point_within_region /* D2D57C 8024184C 26330040 */ addiu $s3, $s1, 0x40 /* D2D580 80241850 1040005A */ beqz $v0, .L802419BC -/* D2D584 80241854 00000000 */ nop +/* D2D584 80241854 00000000 */ nop /* D2D588 80241858 8E430004 */ lw $v1, 4($s2) /* D2D58C 8024185C 10600005 */ beqz $v1, .L80241874 /* D2D590 80241860 24020001 */ addiu $v0, $zero, 1 /* D2D594 80241864 10620029 */ beq $v1, $v0, .L8024190C -/* D2D598 80241868 00000000 */ nop +/* D2D598 80241868 00000000 */ nop /* D2D59C 8024186C 0809066F */ j .L802419BC -/* D2D5A0 80241870 00000000 */ nop +/* D2D5A0 80241870 00000000 */ nop .L80241874: /* D2D5A4 80241874 C6480008 */ lwc1 $f8, 8($s2) /* D2D5A8 80241878 46804220 */ cvt.s.w $f8, $f8 @@ -538,11 +538,11 @@ glabel func_80241088_D2CDB8 /* D2D5BC 8024188C C62E0040 */ lwc1 $f14, 0x40($s1) /* D2D5C0 80241890 44074000 */ mfc1 $a3, $f8 /* D2D5C4 80241894 0C00A7B5 */ jal dist2D -/* D2D5C8 80241898 00000000 */ nop +/* D2D5C8 80241898 00000000 */ nop /* D2D5CC 8024189C C6420010 */ lwc1 $f2, 0x10($s2) /* D2D5D0 802418A0 468010A0 */ cvt.s.w $f2, $f2 /* D2D5D4 802418A4 4600103C */ c.lt.s $f2, $f0 -/* D2D5D8 802418A8 00000000 */ nop +/* D2D5D8 802418A8 00000000 */ nop /* D2D5DC 802418AC 45000043 */ bc1f .L802419BC /* D2D5E0 802418B0 E7A00038 */ swc1 $f0, 0x38($sp) /* D2D5E4 802418B4 C64C0008 */ lwc1 $f12, 8($s2) @@ -566,17 +566,17 @@ glabel func_80241088_D2CDB8 /* D2D62C 802418FC 0C00A7E7 */ jal add_vec2D_polar /* D2D630 80241900 0260282D */ daddu $a1, $s3, $zero /* D2D634 80241904 0809066F */ j .L802419BC -/* D2D638 80241908 00000000 */ nop +/* D2D638 80241908 00000000 */ nop .L8024190C: /* D2D63C 8024190C 8E420008 */ lw $v0, 8($s2) /* D2D640 80241910 8E430010 */ lw $v1, 0x10($s2) /* D2D644 80241914 C6200038 */ lwc1 $f0, 0x38($s1) /* D2D648 80241918 00431021 */ addu $v0, $v0, $v1 /* D2D64C 8024191C 44821000 */ mtc1 $v0, $f2 -/* D2D650 80241920 00000000 */ nop +/* D2D650 80241920 00000000 */ nop /* D2D654 80241924 468010A0 */ cvt.s.w $f2, $f2 /* D2D658 80241928 4600103C */ c.lt.s $f2, $f0 -/* D2D65C 8024192C 00000000 */ nop +/* D2D65C 8024192C 00000000 */ nop /* D2D660 80241930 45030001 */ bc1tl .L80241938 /* D2D664 80241934 E6220038 */ swc1 $f2, 0x38($s1) .L80241938: @@ -585,10 +585,10 @@ glabel func_80241088_D2CDB8 /* D2D670 80241940 C6200038 */ lwc1 $f0, 0x38($s1) /* D2D674 80241944 00431023 */ subu $v0, $v0, $v1 /* D2D678 80241948 44821000 */ mtc1 $v0, $f2 -/* D2D67C 8024194C 00000000 */ nop +/* D2D67C 8024194C 00000000 */ nop /* D2D680 80241950 468010A0 */ cvt.s.w $f2, $f2 /* D2D684 80241954 4602003C */ c.lt.s $f0, $f2 -/* D2D688 80241958 00000000 */ nop +/* D2D688 80241958 00000000 */ nop /* D2D68C 8024195C 45030001 */ bc1tl .L80241964 /* D2D690 80241960 E6220038 */ swc1 $f2, 0x38($s1) .L80241964: @@ -597,10 +597,10 @@ glabel func_80241088_D2CDB8 /* D2D69C 8024196C C6200040 */ lwc1 $f0, 0x40($s1) /* D2D6A0 80241970 00431021 */ addu $v0, $v0, $v1 /* D2D6A4 80241974 44821000 */ mtc1 $v0, $f2 -/* D2D6A8 80241978 00000000 */ nop +/* D2D6A8 80241978 00000000 */ nop /* D2D6AC 8024197C 468010A0 */ cvt.s.w $f2, $f2 /* D2D6B0 80241980 4600103C */ c.lt.s $f2, $f0 -/* D2D6B4 80241984 00000000 */ nop +/* D2D6B4 80241984 00000000 */ nop /* D2D6B8 80241988 45030001 */ bc1tl .L80241990 /* D2D6BC 8024198C E6220040 */ swc1 $f2, 0x40($s1) .L80241990: @@ -609,21 +609,21 @@ glabel func_80241088_D2CDB8 /* D2D6C8 80241998 C6200040 */ lwc1 $f0, 0x40($s1) /* D2D6CC 8024199C 00431023 */ subu $v0, $v0, $v1 /* D2D6D0 802419A0 44821000 */ mtc1 $v0, $f2 -/* D2D6D4 802419A4 00000000 */ nop +/* D2D6D4 802419A4 00000000 */ nop /* D2D6D8 802419A8 468010A0 */ cvt.s.w $f2, $f2 /* D2D6DC 802419AC 4602003C */ c.lt.s $f0, $f2 -/* D2D6E0 802419B0 00000000 */ nop +/* D2D6E0 802419B0 00000000 */ nop /* D2D6E4 802419B4 45030001 */ bc1tl .L802419BC /* D2D6E8 802419B8 E6220040 */ swc1 $f2, 0x40($s1) .L802419BC: /* D2D6EC 802419BC 16E0001F */ bnez $s7, .L80241A3C -/* D2D6F0 802419C0 00000000 */ nop +/* D2D6F0 802419C0 00000000 */ nop /* D2D6F4 802419C4 8E220000 */ lw $v0, ($s1) /* D2D6F8 802419C8 30420008 */ andi $v0, $v0, 8 /* D2D6FC 802419CC 10400003 */ beqz $v0, .L802419DC /* D2D700 802419D0 27A50020 */ addiu $a1, $sp, 0x20 /* D2D704 802419D4 13C00019 */ beqz $fp, .L80241A3C -/* D2D708 802419D8 00000000 */ nop +/* D2D708 802419D8 00000000 */ nop .L802419DC: /* D2D70C 802419DC 27A60024 */ addiu $a2, $sp, 0x24 /* D2D710 802419E0 27A20038 */ addiu $v0, $sp, 0x38 @@ -646,7 +646,7 @@ glabel func_80241088_D2CDB8 /* D2D754 80241A24 0C0372DF */ jal func_800DCB7C /* D2D758 80241A28 27A70028 */ addiu $a3, $sp, 0x28 /* D2D75C 80241A2C 10400003 */ beqz $v0, .L80241A3C -/* D2D760 80241A30 00000000 */ nop +/* D2D760 80241A30 00000000 */ nop /* D2D764 80241A34 C7A00024 */ lwc1 $f0, 0x24($sp) /* D2D768 80241A38 E620003C */ swc1 $f0, 0x3c($s1) .L80241A3C: diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241AC8_D2D7F8.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241AC8_D2D7F8.s index db6b53d168..cb8df19999 100644 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241AC8_D2D7F8.s +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241AC8_D2D7F8.s @@ -27,7 +27,7 @@ glabel func_80241AC8_D2D7F8 .L80241B20: /* D2D850 80241B20 8482008E */ lh $v0, 0x8e($a0) /* D2D854 80241B24 14400007 */ bnez $v0, .L80241B44 -/* D2D858 80241B28 00000000 */ nop +/* D2D858 80241B28 00000000 */ nop /* D2D85C 80241B2C 8E0200CC */ lw $v0, 0xcc($s0) /* D2D860 80241B30 8C420028 */ lw $v0, 0x28($v0) /* D2D864 80241B34 A480008E */ sh $zero, 0x8e($a0) diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241B58_D2D888.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241B58_D2D888.s index e8a3e156d7..61afb843b0 100644 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241B58_D2D888.s +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241B58_D2D888.s @@ -18,7 +18,7 @@ glabel func_80241B58_D2D888 /* D2D8BC 80241B8C 8E0300A0 */ lw $v1, 0xa0($s0) /* D2D8C0 80241B90 00021403 */ sra $v0, $v0, 0x10 /* D2D8C4 80241B94 14430004 */ bne $v0, $v1, .L80241BA8 -/* D2D8C8 80241B98 00000000 */ nop +/* D2D8C8 80241B98 00000000 */ nop /* D2D8CC 80241B9C 8E0200CC */ lw $v0, 0xcc($s0) /* D2D8D0 80241BA0 8C42002C */ lw $v0, 0x2c($v0) /* D2D8D4 80241BA4 ACA20028 */ sw $v0, 0x28($a1) @@ -47,7 +47,7 @@ glabel func_80241B58_D2D888 /* D2D928 80241BF8 3C01C1A0 */ lui $at, 0xc1a0 /* D2D92C 80241BFC 44812000 */ mtc1 $at, $f4 /* D2D930 80241C00 44833000 */ mtc1 $v1, $f6 -/* D2D934 80241C04 00000000 */ nop +/* D2D934 80241C04 00000000 */ nop /* D2D938 80241C08 468031A0 */ cvt.s.w $f6, $f6 /* D2D93C 80241C0C 8C420000 */ lw $v0, ($v0) /* D2D940 80241C10 44073000 */ mfc1 $a3, $f6 diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241C58_D2D988.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241C58_D2D988.s index a2f8edc533..dc07486d1c 100644 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241C58_D2D988.s +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241C58_D2D988.s @@ -16,7 +16,7 @@ glabel func_80241C58_D2D988 /* D2D9B4 80241C84 A462008E */ sh $v0, 0x8e($v1) /* D2D9B8 80241C88 00021400 */ sll $v0, $v0, 0x10 /* D2D9BC 80241C8C 14400005 */ bnez $v0, .L80241CA4 -/* D2D9C0 80241C90 00000000 */ nop +/* D2D9C0 80241C90 00000000 */ nop /* D2D9C4 80241C94 960200AA */ lhu $v0, 0xaa($s0) /* D2D9C8 80241C98 A462008E */ sh $v0, 0x8e($v1) /* D2D9CC 80241C9C 2402000E */ addiu $v0, $zero, 0xe diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241CB8_D2D9E8.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241CB8_D2D9E8.s index 6465994110..c24ec3df94 100644 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241CB8_D2D9E8.s +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241CB8_D2D9E8.s @@ -42,7 +42,7 @@ glabel func_80241CB8_D2D9E8 /* D2DA7C 80241D4C 2402000F */ addiu $v0, $zero, 0xf /* D2DA80 80241D50 AFA2001C */ sw $v0, 0x1c($sp) /* D2DA84 80241D54 44833000 */ mtc1 $v1, $f6 -/* D2DA88 80241D58 00000000 */ nop +/* D2DA88 80241D58 00000000 */ nop /* D2DA8C 80241D5C 468031A0 */ cvt.s.w $f6, $f6 /* D2DA90 80241D60 44073000 */ mfc1 $a3, $f6 /* D2DA94 80241D64 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241DA4_D2DAD4.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241DA4_D2DAD4.s index f27020c1bb..0bb2d4bed8 100644 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241DA4_D2DAD4.s +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241DA4_D2DAD4.s @@ -46,7 +46,7 @@ glabel func_80241DA4_D2DAD4 /* D2DB78 80241E48 8E2200B0 */ lw $v0, 0xb0($s1) /* D2DB7C 80241E4C 30420004 */ andi $v0, $v0, 4 /* D2DB80 80241E50 10400011 */ beqz $v0, .L80241E98 -/* D2DB84 80241E54 00000000 */ nop +/* D2DB84 80241E54 00000000 */ nop .L80241E58: /* D2DB88 80241E58 AE400070 */ sw $zero, 0x70($s2) /* D2DB8C 80241E5C A6A0008E */ sh $zero, 0x8e($s5) @@ -78,12 +78,12 @@ glabel func_80241DA4_D2DAD4 /* D2DBF0 80241EC0 10600013 */ beqz $v1, .L80241F10 /* D2DBF4 80241EC4 0240202D */ daddu $a0, $s2, $zero /* D2DBF8 80241EC8 080907F3 */ j .L80241FCC -/* D2DBFC 80241ECC 00000000 */ nop +/* D2DBFC 80241ECC 00000000 */ nop .L80241ED0: /* D2DC00 80241ED0 10620018 */ beq $v1, $v0, .L80241F34 /* D2DC04 80241ED4 0240202D */ daddu $a0, $s2, $zero /* D2DC08 80241ED8 080907F3 */ j .L80241FCC -/* D2DC0C 80241EDC 00000000 */ nop +/* D2DC0C 80241EDC 00000000 */ nop .L80241EE0: /* D2DC10 80241EE0 2402000D */ addiu $v0, $zero, 0xd /* D2DC14 80241EE4 10620029 */ beq $v1, $v0, .L80241F8C @@ -94,9 +94,9 @@ glabel func_80241DA4_D2DAD4 /* D2DC28 80241EF8 1062002D */ beq $v1, $v0, .L80241FB0 /* D2DC2C 80241EFC 24020063 */ addiu $v0, $zero, 0x63 /* D2DC30 80241F00 10620030 */ beq $v1, $v0, .L80241FC4 -/* D2DC34 80241F04 00000000 */ nop +/* D2DC34 80241F04 00000000 */ nop /* D2DC38 80241F08 080907F3 */ j .L80241FCC -/* D2DC3C 80241F0C 00000000 */ nop +/* D2DC3C 80241F0C 00000000 */ nop .L80241F10: /* D2DC40 80241F10 0260282D */ daddu $a1, $s3, $zero /* D2DC44 80241F14 0C0903C8 */ jal func_80240F20_D2CC50 @@ -107,14 +107,14 @@ glabel func_80241DA4_D2DAD4 /* D2DC54 80241F24 0C0903E3 */ jal func_80240F8C_D2CCBC /* D2DC58 80241F28 0280302D */ daddu $a2, $s4, $zero /* D2DC5C 80241F2C 080907F3 */ j .L80241FCC -/* D2DC60 80241F30 00000000 */ nop +/* D2DC60 80241F30 00000000 */ nop .L80241F34: /* D2DC64 80241F34 0260282D */ daddu $a1, $s3, $zero /* D2DC68 80241F38 0C090422 */ jal func_80241088_D2CDB8 /* D2DC6C 80241F3C 0280302D */ daddu $a2, $s4, $zero /* D2DC70 80241F40 8E420070 */ lw $v0, 0x70($s2) /* D2DC74 80241F44 14500021 */ bne $v0, $s0, .L80241FCC -/* D2DC78 80241F48 00000000 */ nop +/* D2DC78 80241F48 00000000 */ nop .L80241F4C: /* D2DC7C 80241F4C 0240202D */ daddu $a0, $s2, $zero /* D2DC80 80241F50 0260282D */ daddu $a1, $s3, $zero @@ -123,7 +123,7 @@ glabel func_80241DA4_D2DAD4 /* D2DC8C 80241F5C 8E430070 */ lw $v1, 0x70($s2) /* D2DC90 80241F60 2402000C */ addiu $v0, $zero, 0xc /* D2DC94 80241F64 14620019 */ bne $v1, $v0, .L80241FCC -/* D2DC98 80241F68 00000000 */ nop +/* D2DC98 80241F68 00000000 */ nop /* D2DC9C 80241F6C 0240202D */ daddu $a0, $s2, $zero .L80241F70: /* D2DCA0 80241F70 0260282D */ daddu $a1, $s3, $zero @@ -132,7 +132,7 @@ glabel func_80241DA4_D2DAD4 /* D2DCAC 80241F7C 8E430070 */ lw $v1, 0x70($s2) /* D2DCB0 80241F80 2402000D */ addiu $v0, $zero, 0xd /* D2DCB4 80241F84 14620011 */ bne $v1, $v0, .L80241FCC -/* D2DCB8 80241F88 00000000 */ nop +/* D2DCB8 80241F88 00000000 */ nop .L80241F8C: /* D2DCBC 80241F8C 0240202D */ daddu $a0, $s2, $zero /* D2DCC0 80241F90 0260282D */ daddu $a1, $s3, $zero @@ -141,14 +141,14 @@ glabel func_80241DA4_D2DAD4 /* D2DCCC 80241F9C 8E430070 */ lw $v1, 0x70($s2) /* D2DCD0 80241FA0 2402000E */ addiu $v0, $zero, 0xe /* D2DCD4 80241FA4 14620009 */ bne $v1, $v0, .L80241FCC -/* D2DCD8 80241FA8 00000000 */ nop +/* D2DCD8 80241FA8 00000000 */ nop /* D2DCDC 80241FAC 0240202D */ daddu $a0, $s2, $zero .L80241FB0: /* D2DCE0 80241FB0 0260282D */ daddu $a1, $s3, $zero /* D2DCE4 80241FB4 0C09072E */ jal func_80241CB8_D2D9E8 /* D2DCE8 80241FB8 0280302D */ daddu $a2, $s4, $zero /* D2DCEC 80241FBC 080907F3 */ j .L80241FCC -/* D2DCF0 80241FC0 00000000 */ nop +/* D2DCF0 80241FC0 00000000 */ nop .L80241FC4: /* D2DCF4 80241FC4 0C0129CF */ jal func_8004A73C /* D2DCF8 80241FC8 0240202D */ daddu $a0, $s2, $zero @@ -163,6 +163,6 @@ glabel func_80241DA4_D2DAD4 /* D2DD18 80241FE8 0000102D */ daddu $v0, $zero, $zero /* D2DD1C 80241FEC 03E00008 */ jr $ra /* D2DD20 80241FF0 27BD0050 */ addiu $sp, $sp, 0x50 -/* D2DD24 80241FF4 00000000 */ nop -/* D2DD28 80241FF8 00000000 */ nop -/* D2DD2C 80241FFC 00000000 */ nop +/* D2DD24 80241FF4 00000000 */ nop +/* D2DD28 80241FF8 00000000 */ nop +/* D2DD2C 80241FFC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802400D4_D2FD54.s b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802400D4_D2FD54.s index a12e923552..908c1f2f39 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802400D4_D2FD54.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802400D4_D2FD54.s @@ -8,7 +8,7 @@ glabel func_802400D4_D2FD54 /* D2FD60 802400E0 00822021 */ addu $a0, $a0, $v0 /* D2FD64 802400E4 90820014 */ lbu $v0, 0x14($a0) /* D2FD68 802400E8 10400009 */ beqz $v0, .L80240110 -/* D2FD6C 802400EC 00000000 */ nop +/* D2FD6C 802400EC 00000000 */ nop /* D2FD70 802400F0 90820015 */ lbu $v0, 0x15($a0) /* D2FD74 802400F4 00022600 */ sll $a0, $v0, 0x18 /* D2FD78 802400F8 00041E03 */ sra $v1, $a0, 0x18 @@ -16,7 +16,7 @@ glabel func_802400D4_D2FD54 /* D2FD80 80240100 00021403 */ sra $v0, $v0, 0x10 /* D2FD84 80240104 0043102A */ slt $v0, $v0, $v1 /* D2FD88 80240108 10400003 */ beqz $v0, .L80240118 -/* D2FD8C 8024010C 00000000 */ nop +/* D2FD8C 8024010C 00000000 */ nop .L80240110: /* D2FD90 80240110 03E00008 */ jr $ra /* D2FD94 80240114 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s index 631ab0eb8b..3ba474d710 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s @@ -108,20 +108,20 @@ glabel func_802401CC_D2FE4C /* D2FFD4 80240354 10400009 */ beqz $v0, .L8024037C /* D2FFD8 80240358 AEA20074 */ sw $v0, 0x74($s5) /* D2FFDC 8024035C 0C03C4EC */ jal func_800F13B0 -/* D2FFE0 80240360 00000000 */ nop +/* D2FFE0 80240360 00000000 */ nop /* D2FFE4 80240364 8EA20070 */ lw $v0, 0x70($s5) /* D2FFE8 80240368 24420001 */ addiu $v0, $v0, 1 .L8024036C: /* D2FFEC 8024036C AEA20070 */ sw $v0, 0x70($s5) /* D2FFF0 80240370 2842000F */ slti $v0, $v0, 0xf /* D2FFF4 80240374 10400003 */ beqz $v0, .L80240384 -/* D2FFF8 80240378 00000000 */ nop +/* D2FFF8 80240378 00000000 */ nop .L8024037C: /* D2FFFC 8024037C 080900FB */ j .L802403EC /* D30000 80240380 0000102D */ daddu $v0, $zero, $zero .L80240384: /* D30004 80240384 0C03C54E */ jal func_800F1538 -/* D30008 80240388 00000000 */ nop +/* D30008 80240388 00000000 */ nop /* D3000C 8024038C 8EA30074 */ lw $v1, 0x74($s5) /* D30010 80240390 240200FF */ addiu $v0, $zero, 0xff /* D30014 80240394 10620010 */ beq $v1, $v0, .L802403D8 diff --git a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240600_D30280.s b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240600_D30280.s index dfb665afcf..710b1d368e 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240600_D30280.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240600_D30280.s @@ -36,7 +36,7 @@ glabel func_80240600_D30280 /* D302FC 8024067C 0C00A88D */ jal sin_cos_deg /* D30300 80240680 0040A82D */ daddu $s5, $v0, $zero /* D30304 80240684 1200005D */ beqz $s0, .L802407FC -/* D30308 80240688 00000000 */ nop +/* D30308 80240688 00000000 */ nop /* D3030C 8024068C 0C00AB0A */ jal general_heap_malloc /* D30310 80240690 24040068 */ addiu $a0, $zero, 0x68 /* D30314 80240694 0040902D */ daddu $s2, $v0, $zero @@ -98,10 +98,10 @@ glabel func_80240600_D30280 /* D303EC 8024076C C7A2001C */ lwc1 $f2, 0x1c($sp) /* D303F0 80240770 C7A40020 */ lwc1 $f4, 0x20($sp) /* D303F4 80240774 46041082 */ mul.s $f2, $f2, $f4 -/* D303F8 80240778 00000000 */ nop +/* D303F8 80240778 00000000 */ nop /* D303FC 8024077C C7A00018 */ lwc1 $f0, 0x18($sp) /* D30400 80240780 46040002 */ mul.s $f0, $f0, $f4 -/* D30404 80240784 00000000 */ nop +/* D30404 80240784 00000000 */ nop /* D30408 80240788 E6020038 */ swc1 $f2, 0x38($s0) /* D3040C 8024078C E6000050 */ swc1 $f0, 0x50($s0) /* D30410 80240790 8E42005C */ lw $v0, 0x5c($s2) @@ -142,12 +142,12 @@ glabel func_80240600_D30280 /* D30498 80240818 10600007 */ beqz $v1, .L80240838 /* D3049C 8024081C 24040005 */ addiu $a0, $zero, 5 /* D304A0 80240820 08090274 */ j .L802409D0 -/* D304A4 80240824 00000000 */ nop +/* D304A4 80240824 00000000 */ nop .L80240828: /* D304A8 80240828 10620058 */ beq $v1, $v0, .L8024098C -/* D304AC 8024082C 00000000 */ nop +/* D304AC 8024082C 00000000 */ nop /* D304B0 80240830 08090274 */ j .L802409D0 -/* D304B4 80240834 00000000 */ nop +/* D304B4 80240834 00000000 */ nop .L80240838: /* D304B8 80240838 0000882D */ daddu $s1, $zero, $zero /* D304BC 8024083C 3C148024 */ lui $s4, %hi(func_80241B38_BEE928) @@ -174,11 +174,11 @@ glabel func_80240600_D30280 /* D3050C 8024088C C7A4001C */ lwc1 $f4, 0x1c($sp) /* D30510 80240890 C7A00020 */ lwc1 $f0, 0x20($sp) /* D30514 80240894 46002102 */ mul.s $f4, $f4, $f0 -/* D30518 80240898 00000000 */ nop +/* D30518 80240898 00000000 */ nop /* D3051C 8024089C C7A20018 */ lwc1 $f2, 0x18($sp) /* D30520 802408A0 26940004 */ addiu $s4, $s4, 4 /* D30524 802408A4 46001082 */ mul.s $f2, $f2, $f0 -/* D30528 802408A8 00000000 */ nop +/* D30528 802408A8 00000000 */ nop /* D3052C 802408AC 26730004 */ addiu $s3, $s3, 4 /* D30530 802408B0 26310001 */ addiu $s1, $s1, 1 /* D30534 802408B4 2A220003 */ slti $v0, $s1, 3 @@ -215,11 +215,11 @@ glabel func_80240600_D30280 /* D305A8 80240928 C7A4001C */ lwc1 $f4, 0x1c($sp) /* D305AC 8024092C C7A00020 */ lwc1 $f0, 0x20($sp) /* D305B0 80240930 46002102 */ mul.s $f4, $f4, $f0 -/* D305B4 80240934 00000000 */ nop +/* D305B4 80240934 00000000 */ nop /* D305B8 80240938 C7A20018 */ lwc1 $f2, 0x18($sp) /* D305BC 8024093C 26940004 */ addiu $s4, $s4, 4 /* D305C0 80240940 46001082 */ mul.s $f2, $f2, $f0 -/* D305C4 80240944 00000000 */ nop +/* D305C4 80240944 00000000 */ nop /* D305C8 80240948 26730004 */ addiu $s3, $s3, 4 /* D305CC 8024094C 26310001 */ addiu $s1, $s1, 1 /* D305D0 80240950 2A220003 */ slti $v0, $s1, 3 diff --git a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240B38_D307B8.s b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240B38_D307B8.s index b80c77e16b..305d38fb89 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240B38_D307B8.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240B38_D307B8.s @@ -36,16 +36,16 @@ glabel func_80240B38_D307B8 /* D30830 80240BB0 10600007 */ beqz $v1, .L80240BD0 /* D30834 80240BB4 240500FF */ addiu $a1, $zero, 0xff /* D30838 80240BB8 08090312 */ j .L80240C48 -/* D3083C 80240BBC 00000000 */ nop +/* D3083C 80240BBC 00000000 */ nop .L80240BC0: /* D30840 80240BC0 10620019 */ beq $v1, $v0, .L80240C28 -/* D30844 80240BC4 00000000 */ nop +/* D30844 80240BC4 00000000 */ nop /* D30848 80240BC8 08090312 */ j .L80240C48 -/* D3084C 80240BCC 00000000 */ nop +/* D3084C 80240BCC 00000000 */ nop .L80240BD0: /* D30850 80240BD0 8E220074 */ lw $v0, 0x74($s1) /* D30854 80240BD4 14450004 */ bne $v0, $a1, .L80240BE8 -/* D30858 80240BD8 00000000 */ nop +/* D30858 80240BD8 00000000 */ nop /* D3085C 80240BDC AE240070 */ sw $a0, 0x70($s1) /* D30860 80240BE0 AE200078 */ sw $zero, 0x78($s1) /* D30864 80240BE4 8E220074 */ lw $v0, 0x74($s1) @@ -57,7 +57,7 @@ glabel func_80240B38_D307B8 /* D30878 80240BF8 50400013 */ beql $v0, $zero, .L80240C48 /* D3087C 80240BFC AE250074 */ sw $a1, 0x74($s1) /* D30880 80240C00 08090312 */ j .L80240C48 -/* D30884 80240C04 00000000 */ nop +/* D30884 80240C04 00000000 */ nop .L80240C08: /* D30888 80240C08 8E220078 */ lw $v0, 0x78($s1) /* D3088C 80240C0C 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240D08_D30988.s b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240D08_D30988.s index 132e2073df..1cb34cda2c 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240D08_D30988.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240D08_D30988.s @@ -15,5 +15,5 @@ glabel func_80240D08_D30988 .L80240D30: /* D309B0 80240D30 03E00008 */ jr $ra /* D309B4 80240D34 24020002 */ addiu $v0, $zero, 2 -/* D309B8 80240D38 00000000 */ nop -/* D309BC 80240D3C 00000000 */ nop +/* D309B8 80240D38 00000000 */ nop +/* D309BC 80240D3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240F48_D30BC8.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240F48_D30BC8.s index d1141492fe..c6dfb03868 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240F48_D30BC8.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240F48_D30BC8.s @@ -42,7 +42,7 @@ glabel func_80240F48_D30BC8 /* D30C5C 80240FDC C6620074 */ lwc1 $f2, 0x74($s3) /* D30C60 80240FE0 468010A0 */ cvt.s.w $f2, $f2 /* D30C64 80240FE4 4600103C */ c.lt.s $f2, $f0 -/* D30C68 80240FE8 00000000 */ nop +/* D30C68 80240FE8 00000000 */ nop /* D30C6C 80240FEC 45030001 */ bc1tl .L80240FF4 /* D30C70 80240FF0 0000882D */ daddu $s1, $zero, $zero .L80240FF4: @@ -51,16 +51,16 @@ glabel func_80240F48_D30BC8 /* D30C7C 80240FFC 3C014387 */ lui $at, 0x4387 /* D30C80 80241000 4481A000 */ mtc1 $at, $f20 /* D30C84 80241004 0C00A70A */ jal get_clamped_angle_diff -/* D30C88 80241008 00000000 */ nop +/* D30C88 80241008 00000000 */ nop /* D30C8C 8024100C 0C00A6C9 */ jal clamp_angle /* D30C90 80241010 46000306 */ mov.s $f12, $f0 /* D30C94 80241014 3C018024 */ lui $at, %hi(D_802464D0) /* D30C98 80241018 D42264D0 */ ldc1 $f2, %lo(D_802464D0)($at) /* D30C9C 8024101C 46000021 */ cvt.d.s $f0, $f0 /* D30CA0 80241020 4622003C */ c.lt.d $f0, $f2 -/* D30CA4 80241024 00000000 */ nop +/* D30CA4 80241024 00000000 */ nop /* D30CA8 80241028 45000003 */ bc1f .L80241038 -/* D30CAC 8024102C 00000000 */ nop +/* D30CAC 8024102C 00000000 */ nop /* D30CB0 80241030 3C0142B4 */ lui $at, 0x42b4 /* D30CB4 80241034 4481A000 */ mtc1 $at, $f20 .L80241038: @@ -77,7 +77,7 @@ glabel func_80240F48_D30BC8 /* D30CE0 80241060 468010A0 */ cvt.s.w $f2, $f2 /* D30CE4 80241064 46000005 */ abs.s $f0, $f0 /* D30CE8 80241068 4600103C */ c.lt.s $f2, $f0 -/* D30CEC 8024106C 00000000 */ nop +/* D30CEC 8024106C 00000000 */ nop /* D30CF0 80241070 45030001 */ bc1tl .L80241078 /* D30CF4 80241074 0000882D */ daddu $s1, $zero, $zero .L80241078: @@ -87,13 +87,13 @@ glabel func_80240F48_D30BC8 /* D30D04 80241084 860200A8 */ lh $v0, 0xa8($s0) /* D30D08 80241088 46020001 */ sub.s $f0, $f0, $f2 /* D30D0C 8024108C 44821000 */ mtc1 $v0, $f2 -/* D30D10 80241090 00000000 */ nop +/* D30D10 80241090 00000000 */ nop /* D30D14 80241094 468010A1 */ cvt.d.w $f2, $f2 /* D30D18 80241098 46221080 */ add.d $f2, $f2, $f2 /* D30D1C 8024109C 46000005 */ abs.s $f0, $f0 /* D30D20 802410A0 46000021 */ cvt.d.s $f0, $f0 /* D30D24 802410A4 4620103E */ c.le.d $f2, $f0 -/* D30D28 802410A8 00000000 */ nop +/* D30D28 802410A8 00000000 */ nop /* D30D2C 802410AC 45030001 */ bc1tl .L802410B4 /* D30D30 802410B0 0000882D */ daddu $s1, $zero, $zero .L802410B4: diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_802410FC_D30D7C.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_802410FC_D30D7C.s index b411560812..b0c2e2df2b 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_802410FC_D30D7C.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_802410FC_D30D7C.s @@ -19,7 +19,7 @@ glabel func_802410FC_D30D7C /* D30DB4 80241134 8E2200B0 */ lw $v0, 0xb0($s1) /* D30DB8 80241138 30420004 */ andi $v0, $v0, 4 /* D30DBC 8024113C 10400015 */ beqz $v0, .L80241194 -/* D30DC0 80241140 00000000 */ nop +/* D30DC0 80241140 00000000 */ nop .L80241144: /* D30DC4 80241144 AE800070 */ sw $zero, 0x70($s4) /* D30DC8 80241148 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel func_802410FC_D30D7C /* D30E18 80241198 12600005 */ beqz $s3, .L802411B0 /* D30E1C 8024119C 24020001 */ addiu $v0, $zero, 1 /* D30E20 802411A0 12620048 */ beq $s3, $v0, .L802412C4 -/* D30E24 802411A4 00000000 */ nop +/* D30E24 802411A4 00000000 */ nop /* D30E28 802411A8 080904CE */ j .L80241338 -/* D30E2C 802411AC 00000000 */ nop +/* D30E2C 802411AC 00000000 */ nop .L802411B0: /* D30E30 802411B0 86240008 */ lh $a0, 8($s1) /* D30E34 802411B4 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel func_802410FC_D30D7C /* D30E54 802411D4 8E03006C */ lw $v1, 0x6c($s0) /* D30E58 802411D8 24020003 */ addiu $v0, $zero, 3 /* D30E5C 802411DC 14620056 */ bne $v1, $v0, .L80241338 -/* D30E60 802411E0 00000000 */ nop +/* D30E60 802411E0 00000000 */ nop /* D30E64 802411E4 8E2500A8 */ lw $a1, 0xa8($s1) /* D30E68 802411E8 10A00003 */ beqz $a1, .L802411F8 /* D30E6C 802411EC 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel func_802410FC_D30D7C /* D30EE4 80241264 C7A20014 */ lwc1 $f2, 0x14($sp) /* D30EE8 80241268 4600020D */ trunc.w.s $f8, $f0 /* D30EEC 8024126C 44024000 */ mfc1 $v0, $f8 -/* D30EF0 80241270 00000000 */ nop +/* D30EF0 80241270 00000000 */ nop /* D30EF4 80241274 A6220012 */ sh $v0, 0x12($s1) /* D30EF8 80241278 4600120D */ trunc.w.s $f8, $f2 /* D30EFC 8024127C 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s index 5e775f29db..85fba8d7b2 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s @@ -100,78 +100,93 @@ glabel func_8024135C_D30FDC /* D31140 802414C0 2C620064 */ sltiu $v0, $v1, 0x64 /* D31144 802414C4 10400048 */ beqz $v0, .L802415E8 /* D31148 802414C8 00031080 */ sll $v0, $v1, 2 -/* D3114C 802414CC 3C018024 */ lui $at, %hi(D_802464D8) +/* D3114C 802414CC 3C018024 */ lui $at, %hi(jtbl_802464D8_D36158) /* D31150 802414D0 00220821 */ addu $at, $at, $v0 -/* D31154 802414D4 8C2264D8 */ lw $v0, %lo(D_802464D8)($at) +/* D31154 802414D4 8C2264D8 */ lw $v0, %lo(jtbl_802464D8_D36158)($at) /* D31158 802414D8 00400008 */ jr $v0 /* D3115C 802414DC 00000000 */ nop +glabel L802414E0_D31160 /* D31160 802414E0 0240202D */ daddu $a0, $s2, $zero /* D31164 802414E4 0260282D */ daddu $a1, $s3, $zero /* D31168 802414E8 0C012568 */ jal func_800495A0 /* D3116C 802414EC 0280302D */ daddu $a2, $s4, $zero +glabel L802414F0_D31170 /* D31170 802414F0 0240202D */ daddu $a0, $s2, $zero /* D31174 802414F4 0260282D */ daddu $a1, $s3, $zero /* D31178 802414F8 0C0125AE */ jal func_800496B8 /* D3117C 802414FC 0280302D */ daddu $a2, $s4, $zero /* D31180 80241500 0809057A */ j .L802415E8 /* D31184 80241504 00000000 */ nop +glabel L80241508_D31188 /* D31188 80241508 0240202D */ daddu $a0, $s2, $zero /* D3118C 8024150C 0260282D */ daddu $a1, $s3, $zero /* D31190 80241510 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D31194 80241514 0280302D */ daddu $a2, $s4, $zero +glabel L80241518_D31198 /* D31198 80241518 0240202D */ daddu $a0, $s2, $zero /* D3119C 8024151C 0260282D */ daddu $a1, $s3, $zero /* D311A0 80241520 0C012701 */ jal func_80049C04 /* D311A4 80241524 0280302D */ daddu $a2, $s4, $zero /* D311A8 80241528 0809057A */ j .L802415E8 /* D311AC 8024152C 00000000 */ nop +glabel L80241530_D311B0 /* D311B0 80241530 0240202D */ daddu $a0, $s2, $zero /* D311B4 80241534 0260282D */ daddu $a1, $s3, $zero /* D311B8 80241538 0C01278F */ jal func_80049E3C /* D311BC 8024153C 0280302D */ daddu $a2, $s4, $zero +glabel L80241540_D311C0 /* D311C0 80241540 0240202D */ daddu $a0, $s2, $zero /* D311C4 80241544 0260282D */ daddu $a1, $s3, $zero /* D311C8 80241548 0C0127B3 */ jal func_80049ECC /* D311CC 8024154C 0280302D */ daddu $a2, $s4, $zero /* D311D0 80241550 0809057A */ j .L802415E8 /* D311D4 80241554 00000000 */ nop +glabel L80241558_D311D8 /* D311D8 80241558 0240202D */ daddu $a0, $s2, $zero /* D311DC 8024155C 0260282D */ daddu $a1, $s3, $zero /* D311E0 80241560 0C0127DF */ jal func_80049F7C /* D311E4 80241564 0280302D */ daddu $a2, $s4, $zero +glabel L80241568_D311E8 /* D311E8 80241568 0240202D */ daddu $a0, $s2, $zero /* D311EC 8024156C 0260282D */ daddu $a1, $s3, $zero /* D311F0 80241570 0C012849 */ jal func_8004A124 /* D311F4 80241574 0280302D */ daddu $a2, $s4, $zero /* D311F8 80241578 0809057A */ j .L802415E8 /* D311FC 8024157C 00000000 */ nop +glabel L80241580_D31200 /* D31200 80241580 0240202D */ daddu $a0, $s2, $zero /* D31204 80241584 0260282D */ daddu $a1, $s3, $zero /* D31208 80241588 0C0128FA */ jal func_8004A3E8 /* D3120C 8024158C 0280302D */ daddu $a2, $s4, $zero /* D31210 80241590 0809057A */ j .L802415E8 /* D31214 80241594 00000000 */ nop +glabel L80241598_D31218 /* D31218 80241598 0C090350 */ jal sam_08_UnkNpcAIFunc6 /* D3121C 8024159C 0240202D */ daddu $a0, $s2, $zero +glabel L802415A0_D31220 /* D31220 802415A0 0C09036B */ jal sam_08_UnkNpcAIFunc7 /* D31224 802415A4 0240202D */ daddu $a0, $s2, $zero /* D31228 802415A8 8E430070 */ lw $v1, 0x70($s2) /* D3122C 802415AC 24020020 */ addiu $v0, $zero, 0x20 /* D31230 802415B0 1462000D */ bne $v1, $v0, .L802415E8 /* D31234 802415B4 00000000 */ nop +glabel L802415B8_D31238 /* D31238 802415B8 0C090387 */ jal sam_08_UnkNpcAIFunc8 /* D3123C 802415BC 0240202D */ daddu $a0, $s2, $zero /* D31240 802415C0 8E430070 */ lw $v1, 0x70($s2) /* D31244 802415C4 24020021 */ addiu $v0, $zero, 0x21 /* D31248 802415C8 14620007 */ bne $v1, $v0, .L802415E8 /* D3124C 802415CC 00000000 */ nop +glabel L802415D0_D31250 /* D31250 802415D0 0C0903BD */ jal sam_08_UnkNpcAIFunc5 /* D31254 802415D4 0240202D */ daddu $a0, $s2, $zero /* D31258 802415D8 0809057A */ j .L802415E8 /* D3125C 802415DC 00000000 */ nop +glabel L802415E0_D31260 /* D31260 802415E0 0C0129CF */ jal func_8004A73C /* D31264 802415E4 0240202D */ daddu $a0, $s2, $zero .L802415E8: +glabel L802415E8_D31268 /* D31268 802415E8 8FBF0048 */ lw $ra, 0x48($sp) /* D3126C 802415EC 8FB50044 */ lw $s5, 0x44($sp) /* D31270 802415F0 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80241610_D31290.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80241610_D31290.s index 56fae37e68..fb68514fb0 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80241610_D31290.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80241610_D31290.s @@ -22,14 +22,14 @@ glabel func_80241610_D31290 /* D312D4 80241654 0C0B1EAF */ jal get_variable /* D312D8 80241658 0040802D */ daddu $s0, $v0, $zero /* D312DC 8024165C 44926000 */ mtc1 $s2, $f12 -/* D312E0 80241660 00000000 */ nop +/* D312E0 80241660 00000000 */ nop /* D312E4 80241664 46806320 */ cvt.s.w $f12, $f12 /* D312E8 80241668 44820000 */ mtc1 $v0, $f0 -/* D312EC 8024166C 00000000 */ nop +/* D312EC 8024166C 00000000 */ nop /* D312F0 80241670 46800020 */ cvt.s.w $f0, $f0 /* D312F4 80241674 44060000 */ mfc1 $a2, $f0 /* D312F8 80241678 44907000 */ mtc1 $s0, $f14 -/* D312FC 8024167C 00000000 */ nop +/* D312FC 8024167C 00000000 */ nop /* D31300 80241680 0C01BE3C */ jal func_8006F8F0 /* D31304 80241684 468073A0 */ cvt.s.w $f14, $f14 /* D31308 80241688 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_802416A4_D31324.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_802416A4_D31324.s index d9dc21fc49..480aead3c9 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_802416A4_D31324.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_802416A4_D31324.s @@ -25,15 +25,15 @@ glabel func_802416A4_D31324 /* D31374 802416F4 3484006C */ ori $a0, $a0, 0x6c /* D31378 802416F8 0000282D */ daddu $a1, $zero, $zero /* D3137C 802416FC 44921000 */ mtc1 $s2, $f2 -/* D31380 80241700 00000000 */ nop +/* D31380 80241700 00000000 */ nop /* D31384 80241704 468010A0 */ cvt.s.w $f2, $f2 /* D31388 80241708 44061000 */ mfc1 $a2, $f2 /* D3138C 8024170C 44901000 */ mtc1 $s0, $f2 -/* D31390 80241710 00000000 */ nop +/* D31390 80241710 00000000 */ nop /* D31394 80241714 468010A0 */ cvt.s.w $f2, $f2 /* D31398 80241718 44071000 */ mfc1 $a3, $f2 /* D3139C 8024171C 44820000 */ mtc1 $v0, $f0 -/* D313A0 80241720 00000000 */ nop +/* D313A0 80241720 00000000 */ nop /* D313A4 80241724 46800020 */ cvt.s.w $f0, $f0 /* D313A8 80241728 0C05267B */ jal func_801499EC /* D313AC 8024172C E7A00010 */ swc1 $f0, 0x10($sp) diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024174C_D313CC.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024174C_D313CC.s index 214631f347..3ad1f6b03b 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024174C_D313CC.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024174C_D313CC.s @@ -24,6 +24,6 @@ glabel func_8024174C_D313CC /* D31418 80241798 24020002 */ addiu $v0, $zero, 2 /* D3141C 8024179C 03E00008 */ jr $ra /* D31420 802417A0 27BD0020 */ addiu $sp, $sp, 0x20 -/* D31424 802417A4 00000000 */ nop -/* D31428 802417A8 00000000 */ nop -/* D3142C 802417AC 00000000 */ nop +/* D31424 802417A4 00000000 */ nop +/* D31428 802417A8 00000000 */ nop +/* D3142C 802417AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240000_D362F0.s b/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240000_D362F0.s index 5045acba9d..4d7262a31c 100644 --- a/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240000_D362F0.s +++ b/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240000_D362F0.s @@ -26,7 +26,7 @@ glabel func_80240000_D362F0 /* D36340 80240050 1440FFFA */ bnez $v0, .L8024003C /* D36344 80240054 24A50004 */ addiu $a1, $a1, 4 /* D36348 80240058 08090027 */ j .L8024009C -/* D3634C 8024005C 00000000 */ nop +/* D3634C 8024005C 00000000 */ nop .L80240060: /* D36350 80240060 0000182D */ daddu $v1, $zero, $zero /* D36354 80240064 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240264_D36554.s b/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240264_D36554.s index db2a60e214..b956833009 100644 --- a/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240264_D36554.s +++ b/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240264_D36554.s @@ -30,7 +30,7 @@ glabel func_80240264_D36554 /* D365B4 802402C4 2406FFFF */ addiu $a2, $zero, -1 .L802402C8: /* D365B8 802402C8 0C0B2026 */ jal set_variable -/* D365BC 802402CC 00000000 */ nop +/* D365BC 802402CC 00000000 */ nop /* D365C0 802402D0 0220202D */ daddu $a0, $s1, $zero /* D365C4 802402D4 3C05F5DE */ lui $a1, 0xf5de /* D365C8 802402D8 0C0B1EAF */ jal get_variable @@ -55,7 +55,7 @@ glabel func_80240264_D36554 /* D36610 80240320 2406FFFF */ addiu $a2, $zero, -1 .L80240324: /* D36614 80240324 0C0B2026 */ jal set_variable -/* D36618 80240328 00000000 */ nop +/* D36618 80240328 00000000 */ nop /* D3661C 8024032C 0220202D */ daddu $a0, $s1, $zero /* D36620 80240330 3C05F5DE */ lui $a1, 0xf5de /* D36624 80240334 0C0B1EAF */ jal get_variable @@ -80,7 +80,7 @@ glabel func_80240264_D36554 /* D3666C 8024037C 2406FFFF */ addiu $a2, $zero, -1 .L80240380: /* D36670 80240380 0C0B2026 */ jal set_variable -/* D36674 80240384 00000000 */ nop +/* D36674 80240384 00000000 */ nop /* D36678 80240388 8FBF0018 */ lw $ra, 0x18($sp) /* D3667C 8024038C 8FB10014 */ lw $s1, 0x14($sp) /* D36680 80240390 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_802403A0_D36690.s b/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_802403A0_D36690.s index 06474a753f..15f261ef87 100644 --- a/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_802403A0_D36690.s +++ b/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_802403A0_D36690.s @@ -24,6 +24,6 @@ glabel func_802403A0_D36690 /* D366D8 802403E8 24020002 */ addiu $v0, $zero, 2 /* D366DC 802403EC 03E00008 */ jr $ra /* D366E0 802403F0 27BD0018 */ addiu $sp, $sp, 0x18 -/* D366E4 802403F4 00000000 */ nop -/* D366E8 802403F8 00000000 */ nop -/* D366EC 802403FC 00000000 */ nop +/* D366E4 802403F4 00000000 */ nop +/* D366E8 802403F8 00000000 */ nop +/* D366EC 802403FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240000_D37800.s b/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240000_D37800.s index d46df7607b..1c11b3a059 100644 --- a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240000_D37800.s +++ b/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240000_D37800.s @@ -26,7 +26,7 @@ glabel func_80240000_D37800 /* D37850 80240050 1440FFFA */ bnez $v0, .L8024003C /* D37854 80240054 24A50004 */ addiu $a1, $a1, 4 /* D37858 80240058 08090027 */ j .L8024009C -/* D3785C 8024005C 00000000 */ nop +/* D3785C 8024005C 00000000 */ nop .L80240060: /* D37860 80240060 0000182D */ daddu $v1, $zero, $zero /* D37864 80240064 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_802402BC_D37ABC.s b/asm/nonmatchings/world/area_sam/sam_10/D37800/func_802402BC_D37ABC.s index 5652ebd8b7..0361e1c583 100644 --- a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_802402BC_D37ABC.s +++ b/asm/nonmatchings/world/area_sam/sam_10/D37800/func_802402BC_D37ABC.s @@ -9,7 +9,7 @@ glabel func_802402BC_D37ABC /* D37ACC 802402CC 3C013F4C */ lui $at, 0x3f4c /* D37AD0 802402D0 3421CCCD */ ori $at, $at, 0xcccd /* D37AD4 802402D4 44810000 */ mtc1 $at, $f0 -/* D37AD8 802402D8 00000000 */ nop +/* D37AD8 802402D8 00000000 */ nop /* D37ADC 802402DC E4400030 */ swc1 $f0, 0x30($v0) /* D37AE0 802402E0 8FBF0010 */ lw $ra, 0x10($sp) /* D37AE4 802402E4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_802402F0_D37AF0.s b/asm/nonmatchings/world/area_sam/sam_10/D37800/func_802402F0_D37AF0.s index ca02c82632..805ae72c19 100644 --- a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_802402F0_D37AF0.s +++ b/asm/nonmatchings/world/area_sam/sam_10/D37800/func_802402F0_D37AF0.s @@ -16,7 +16,7 @@ glabel func_802402F0_D37AF0 /* D37B1C 8024031C 0C00A8BB */ jal sin_deg /* D37B20 80240320 4600B306 */ mov.s $f12, $f22 /* D37B24 80240324 46140002 */ mul.s $f0, $f0, $f20 -/* D37B28 80240328 00000000 */ nop +/* D37B28 80240328 00000000 */ nop /* D37B2C 8024032C 3C108011 */ lui $s0, %hi(gPlayerStatus) /* D37B30 80240330 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* D37B34 80240334 C6020028 */ lwc1 $f2, 0x28($s0) @@ -26,7 +26,7 @@ glabel func_802402F0_D37AF0 /* D37B44 80240344 0C00A8D4 */ jal cos_deg /* D37B48 80240348 4600B306 */ mov.s $f12, $f22 /* D37B4C 8024034C 46140002 */ mul.s $f0, $f0, $f20 -/* D37B50 80240350 00000000 */ nop +/* D37B50 80240350 00000000 */ nop /* D37B54 80240354 C6020030 */ lwc1 $f2, 0x30($s0) /* D37B58 80240358 3C014302 */ lui $at, 0x4302 /* D37B5C 8024035C 4481B000 */ mtc1 $at, $f22 @@ -36,7 +36,7 @@ glabel func_802402F0_D37AF0 /* D37B6C 8024036C 0C00A8BB */ jal sin_deg /* D37B70 80240370 4600B306 */ mov.s $f12, $f22 /* D37B74 80240374 46140002 */ mul.s $f0, $f0, $f20 -/* D37B78 80240378 00000000 */ nop +/* D37B78 80240378 00000000 */ nop /* D37B7C 8024037C C6020028 */ lwc1 $f2, 0x28($s0) /* D37B80 80240380 46001080 */ add.s $f2, $f2, $f0 /* D37B84 80240384 4600110D */ trunc.w.s $f4, $f2 @@ -44,7 +44,7 @@ glabel func_802402F0_D37AF0 /* D37B8C 8024038C 0C00A8D4 */ jal cos_deg /* D37B90 80240390 4600B306 */ mov.s $f12, $f22 /* D37B94 80240394 46140002 */ mul.s $f0, $f0, $f20 -/* D37B98 80240398 00000000 */ nop +/* D37B98 80240398 00000000 */ nop /* D37B9C 8024039C C6020030 */ lwc1 $f2, 0x30($s0) /* D37BA0 802403A0 46001081 */ sub.s $f2, $f2, $f0 /* D37BA4 802403A4 4600110D */ trunc.w.s $f4, $f2 @@ -57,4 +57,4 @@ glabel func_802402F0_D37AF0 /* D37BC0 802403C0 24020002 */ addiu $v0, $zero, 2 /* D37BC4 802403C4 03E00008 */ jr $ra /* D37BC8 802403C8 27BD0030 */ addiu $sp, $sp, 0x30 -/* D37BCC 802403CC 00000000 */ nop +/* D37BCC 802403CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802405D8_D37DD8.s b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802405D8_D37DD8.s index edaccb4ec9..1c9deccf80 100644 --- a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802405D8_D37DD8.s +++ b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802405D8_D37DD8.s @@ -42,7 +42,7 @@ glabel func_802405D8_D37DD8 /* D37E6C 8024066C C6620074 */ lwc1 $f2, 0x74($s3) /* D37E70 80240670 468010A0 */ cvt.s.w $f2, $f2 /* D37E74 80240674 4600103C */ c.lt.s $f2, $f0 -/* D37E78 80240678 00000000 */ nop +/* D37E78 80240678 00000000 */ nop /* D37E7C 8024067C 45030001 */ bc1tl .L80240684 /* D37E80 80240680 0000882D */ daddu $s1, $zero, $zero .L80240684: @@ -51,16 +51,16 @@ glabel func_802405D8_D37DD8 /* D37E8C 8024068C 3C014387 */ lui $at, 0x4387 /* D37E90 80240690 4481A000 */ mtc1 $at, $f20 /* D37E94 80240694 0C00A70A */ jal get_clamped_angle_diff -/* D37E98 80240698 00000000 */ nop +/* D37E98 80240698 00000000 */ nop /* D37E9C 8024069C 0C00A6C9 */ jal clamp_angle /* D37EA0 802406A0 46000306 */ mov.s $f12, $f0 /* D37EA4 802406A4 3C018024 */ lui $at, %hi(func_80242C30_B37800) /* D37EA8 802406A8 D4222C30 */ ldc1 $f2, %lo(func_80242C30_B37800)($at) /* D37EAC 802406AC 46000021 */ cvt.d.s $f0, $f0 /* D37EB0 802406B0 4622003C */ c.lt.d $f0, $f2 -/* D37EB4 802406B4 00000000 */ nop +/* D37EB4 802406B4 00000000 */ nop /* D37EB8 802406B8 45000003 */ bc1f .L802406C8 -/* D37EBC 802406BC 00000000 */ nop +/* D37EBC 802406BC 00000000 */ nop /* D37EC0 802406C0 3C0142B4 */ lui $at, 0x42b4 /* D37EC4 802406C4 4481A000 */ mtc1 $at, $f20 .L802406C8: @@ -77,7 +77,7 @@ glabel func_802405D8_D37DD8 /* D37EF0 802406F0 468010A0 */ cvt.s.w $f2, $f2 /* D37EF4 802406F4 46000005 */ abs.s $f0, $f0 /* D37EF8 802406F8 4600103C */ c.lt.s $f2, $f0 -/* D37EFC 802406FC 00000000 */ nop +/* D37EFC 802406FC 00000000 */ nop /* D37F00 80240700 45030001 */ bc1tl .L80240708 /* D37F04 80240704 0000882D */ daddu $s1, $zero, $zero .L80240708: @@ -87,13 +87,13 @@ glabel func_802405D8_D37DD8 /* D37F14 80240714 860200A8 */ lh $v0, 0xa8($s0) /* D37F18 80240718 46020001 */ sub.s $f0, $f0, $f2 /* D37F1C 8024071C 44821000 */ mtc1 $v0, $f2 -/* D37F20 80240720 00000000 */ nop +/* D37F20 80240720 00000000 */ nop /* D37F24 80240724 468010A1 */ cvt.d.w $f2, $f2 /* D37F28 80240728 46221080 */ add.d $f2, $f2, $f2 /* D37F2C 8024072C 46000005 */ abs.s $f0, $f0 /* D37F30 80240730 46000021 */ cvt.d.s $f0, $f0 /* D37F34 80240734 4620103E */ c.le.d $f2, $f0 -/* D37F38 80240738 00000000 */ nop +/* D37F38 80240738 00000000 */ nop /* D37F3C 8024073C 45030001 */ bc1tl .L80240744 /* D37F40 80240740 0000882D */ daddu $s1, $zero, $zero .L80240744: diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_8024078C_D37F8C.s b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_8024078C_D37F8C.s index ceeb63226c..3f76c8186f 100644 --- a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_8024078C_D37F8C.s +++ b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_8024078C_D37F8C.s @@ -19,7 +19,7 @@ glabel func_8024078C_D37F8C /* D37FC4 802407C4 8E2200B0 */ lw $v0, 0xb0($s1) /* D37FC8 802407C8 30420004 */ andi $v0, $v0, 4 /* D37FCC 802407CC 10400015 */ beqz $v0, .L80240824 -/* D37FD0 802407D0 00000000 */ nop +/* D37FD0 802407D0 00000000 */ nop .L802407D4: /* D37FD4 802407D4 AE800070 */ sw $zero, 0x70($s4) /* D37FD8 802407D8 8E420000 */ lw $v0, ($s2) @@ -46,9 +46,9 @@ glabel func_8024078C_D37F8C /* D38028 80240828 12600005 */ beqz $s3, .L80240840 /* D3802C 8024082C 24020001 */ addiu $v0, $zero, 1 /* D38030 80240830 12620048 */ beq $s3, $v0, .L80240954 -/* D38034 80240834 00000000 */ nop +/* D38034 80240834 00000000 */ nop /* D38038 80240838 08090272 */ j .L802409C8 -/* D3803C 8024083C 00000000 */ nop +/* D3803C 8024083C 00000000 */ nop .L80240840: /* D38040 80240840 86240008 */ lh $a0, 8($s1) /* D38044 80240844 0C00FB3A */ jal get_enemy @@ -62,7 +62,7 @@ glabel func_8024078C_D37F8C /* D38064 80240864 8E03006C */ lw $v1, 0x6c($s0) /* D38068 80240868 24020003 */ addiu $v0, $zero, 3 /* D3806C 8024086C 14620056 */ bne $v1, $v0, .L802409C8 -/* D38070 80240870 00000000 */ nop +/* D38070 80240870 00000000 */ nop /* D38074 80240874 8E2500A8 */ lw $a1, 0xa8($s1) /* D38078 80240878 10A00003 */ beqz $a1, .L80240888 /* D3807C 8024087C 0260202D */ daddu $a0, $s3, $zero @@ -99,7 +99,7 @@ glabel func_8024078C_D37F8C /* D380F4 802408F4 C7A20014 */ lwc1 $f2, 0x14($sp) /* D380F8 802408F8 4600020D */ trunc.w.s $f8, $f0 /* D380FC 802408FC 44024000 */ mfc1 $v0, $f8 -/* D38100 80240900 00000000 */ nop +/* D38100 80240900 00000000 */ nop /* D38104 80240904 A6220012 */ sh $v0, 0x12($s1) /* D38108 80240908 4600120D */ trunc.w.s $f8, $f2 /* D3810C 8024090C 44024000 */ mfc1 $v0, $f8 diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s index ae999a71d0..e1258af101 100644 --- a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s +++ b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s @@ -100,78 +100,93 @@ glabel func_802409EC_D381EC /* D38350 80240B50 2C620064 */ sltiu $v0, $v1, 0x64 /* D38354 80240B54 10400048 */ beqz $v0, .L80240C78 /* D38358 80240B58 00031080 */ sll $v0, $v1, 2 -/* D3835C 80240B5C 3C018024 */ lui $at, %hi(D_80242C38) +/* D3835C 80240B5C 3C018024 */ lui $at, %hi(jtbl_80242C38_D3A438) /* D38360 80240B60 00220821 */ addu $at, $at, $v0 -/* D38364 80240B64 8C222C38 */ lw $v0, %lo(D_80242C38)($at) +/* D38364 80240B64 8C222C38 */ lw $v0, %lo(jtbl_80242C38_D3A438)($at) /* D38368 80240B68 00400008 */ jr $v0 /* D3836C 80240B6C 00000000 */ nop +glabel L80240B70_D38370 /* D38370 80240B70 0240202D */ daddu $a0, $s2, $zero /* D38374 80240B74 0260282D */ daddu $a1, $s3, $zero /* D38378 80240B78 0C012568 */ jal func_800495A0 /* D3837C 80240B7C 0280302D */ daddu $a2, $s4, $zero +glabel L80240B80_D38380 /* D38380 80240B80 0240202D */ daddu $a0, $s2, $zero /* D38384 80240B84 0260282D */ daddu $a1, $s3, $zero /* D38388 80240B88 0C0125AE */ jal func_800496B8 /* D3838C 80240B8C 0280302D */ daddu $a2, $s4, $zero /* D38390 80240B90 0809031E */ j .L80240C78 /* D38394 80240B94 00000000 */ nop +glabel L80240B98_D38398 /* D38398 80240B98 0240202D */ daddu $a0, $s2, $zero /* D3839C 80240B9C 0260282D */ daddu $a1, $s3, $zero /* D383A0 80240BA0 0C0126D1 */ jal base_UnkNpcAIFunc1 /* D383A4 80240BA4 0280302D */ daddu $a2, $s4, $zero +glabel L80240BA8_D383A8 /* D383A8 80240BA8 0240202D */ daddu $a0, $s2, $zero /* D383AC 80240BAC 0260282D */ daddu $a1, $s3, $zero /* D383B0 80240BB0 0C012701 */ jal func_80049C04 /* D383B4 80240BB4 0280302D */ daddu $a2, $s4, $zero /* D383B8 80240BB8 0809031E */ j .L80240C78 /* D383BC 80240BBC 00000000 */ nop +glabel L80240BC0_D383C0 /* D383C0 80240BC0 0240202D */ daddu $a0, $s2, $zero /* D383C4 80240BC4 0260282D */ daddu $a1, $s3, $zero /* D383C8 80240BC8 0C01278F */ jal func_80049E3C /* D383CC 80240BCC 0280302D */ daddu $a2, $s4, $zero +glabel L80240BD0_D383D0 /* D383D0 80240BD0 0240202D */ daddu $a0, $s2, $zero /* D383D4 80240BD4 0260282D */ daddu $a1, $s3, $zero /* D383D8 80240BD8 0C0127B3 */ jal func_80049ECC /* D383DC 80240BDC 0280302D */ daddu $a2, $s4, $zero /* D383E0 80240BE0 0809031E */ j .L80240C78 /* D383E4 80240BE4 00000000 */ nop +glabel L80240BE8_D383E8 /* D383E8 80240BE8 0240202D */ daddu $a0, $s2, $zero /* D383EC 80240BEC 0260282D */ daddu $a1, $s3, $zero /* D383F0 80240BF0 0C0127DF */ jal func_80049F7C /* D383F4 80240BF4 0280302D */ daddu $a2, $s4, $zero +glabel L80240BF8_D383F8 /* D383F8 80240BF8 0240202D */ daddu $a0, $s2, $zero /* D383FC 80240BFC 0260282D */ daddu $a1, $s3, $zero /* D38400 80240C00 0C012849 */ jal func_8004A124 /* D38404 80240C04 0280302D */ daddu $a2, $s4, $zero /* D38408 80240C08 0809031E */ j .L80240C78 /* D3840C 80240C0C 00000000 */ nop +glabel L80240C10_D38410 /* D38410 80240C10 0240202D */ daddu $a0, $s2, $zero /* D38414 80240C14 0260282D */ daddu $a1, $s3, $zero /* D38418 80240C18 0C0128FA */ jal func_8004A3E8 /* D3841C 80240C1C 0280302D */ daddu $a2, $s4, $zero /* D38420 80240C20 0809031E */ j .L80240C78 /* D38424 80240C24 00000000 */ nop +glabel L80240C28_D38428 /* D38428 80240C28 0C0900F4 */ jal sam_10_UnkNpcAIFunc6 /* D3842C 80240C2C 0240202D */ daddu $a0, $s2, $zero +glabel L80240C30_D38430 /* D38430 80240C30 0C09010F */ jal sam_10_UnkNpcAIFunc7 /* D38434 80240C34 0240202D */ daddu $a0, $s2, $zero /* D38438 80240C38 8E430070 */ lw $v1, 0x70($s2) /* D3843C 80240C3C 24020020 */ addiu $v0, $zero, 0x20 /* D38440 80240C40 1462000D */ bne $v1, $v0, .L80240C78 /* D38444 80240C44 00000000 */ nop +glabel L80240C48_D38448 /* D38448 80240C48 0C09012B */ jal sam_10_UnkNpcAIFunc8 /* D3844C 80240C4C 0240202D */ daddu $a0, $s2, $zero /* D38450 80240C50 8E430070 */ lw $v1, 0x70($s2) /* D38454 80240C54 24020021 */ addiu $v0, $zero, 0x21 /* D38458 80240C58 14620007 */ bne $v1, $v0, .L80240C78 /* D3845C 80240C5C 00000000 */ nop +glabel L80240C60_D38460 /* D38460 80240C60 0C090161 */ jal sam_10_UnkNpcAIFunc5 /* D38464 80240C64 0240202D */ daddu $a0, $s2, $zero /* D38468 80240C68 0809031E */ j .L80240C78 /* D3846C 80240C6C 00000000 */ nop +glabel L80240C70_D38470 /* D38470 80240C70 0C0129CF */ jal func_8004A73C /* D38474 80240C74 0240202D */ daddu $a0, $s2, $zero .L80240C78: +glabel L80240C78_D38478 /* D38478 80240C78 8FBF0048 */ lw $ra, 0x48($sp) /* D3847C 80240C7C 8FB50044 */ lw $s5, 0x44($sp) /* D38480 80240C80 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3A5D0/func_80240000_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/D3A5D0/func_80240000_D3A5D0.s index 2687a7b9a7..5959e2b1d5 100644 --- a/asm/nonmatchings/world/area_sam/sam_11/D3A5D0/func_80240000_D3A5D0.s +++ b/asm/nonmatchings/world/area_sam/sam_11/D3A5D0/func_80240000_D3A5D0.s @@ -18,4 +18,4 @@ glabel func_80240000_D3A5D0 /* D3A600 80240030 8FBF0010 */ lw $ra, 0x10($sp) /* D3A604 80240034 03E00008 */ jr $ra /* D3A608 80240038 27BD0018 */ addiu $sp, $sp, 0x18 -/* D3A60C 8024003C 00000000 */ nop +/* D3A60C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240360_D3A930.s b/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240360_D3A930.s index 6ee01e0186..a7ae338a2c 100644 --- a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240360_D3A930.s +++ b/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240360_D3A930.s @@ -27,7 +27,7 @@ glabel func_80240360_D3A930 /* D3A988 802403B8 24020001 */ addiu $v0, $zero, 1 .L802403BC: /* D3A98C 802403BC 14820004 */ bne $a0, $v0, .L802403D0 -/* D3A990 802403C0 00000000 */ nop +/* D3A990 802403C0 00000000 */ nop /* D3A994 802403C4 93A20013 */ lbu $v0, 0x13($sp) /* D3A998 802403C8 10400054 */ beqz $v0, .L8024051C /* D3A99C 802403CC 24020002 */ addiu $v0, $zero, 2 @@ -71,8 +71,8 @@ glabel func_80240360_D3A930 /* D3AA24 80240454 34E78081 */ ori $a3, $a3, 0x8081 /* D3AA28 80240458 00670018 */ mult $v1, $a3 /* D3AA2C 8024045C 00005010 */ mfhi $t2 -/* D3AA30 80240460 00000000 */ nop -/* D3AA34 80240464 00000000 */ nop +/* D3AA30 80240460 00000000 */ nop +/* D3AA34 80240464 00000000 */ nop /* D3AA38 80240468 00A70018 */ mult $a1, $a3 /* D3AA3C 8024046C 00004010 */ mfhi $t0 /* D3AA40 80240470 3C048024 */ lui $a0, %hi(D_80243CC8) diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_8024059C_D3AB6C.s b/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_8024059C_D3AB6C.s index d897c0f084..54afb41bbe 100644 --- a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_8024059C_D3AB6C.s +++ b/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_8024059C_D3AB6C.s @@ -17,7 +17,7 @@ glabel func_8024059C_D3AB6C .L802405CC: /* D3AB9C 802405CC 3C014387 */ lui $at, 0x4387 /* D3ABA0 802405D0 44810000 */ mtc1 $at, $f0 -/* D3ABA4 802405D4 00000000 */ nop +/* D3ABA4 802405D4 00000000 */ nop /* D3ABA8 802405D8 E6400080 */ swc1 $f0, 0x80($s2) /* D3ABAC 802405DC 8E220074 */ lw $v0, 0x74($s1) /* D3ABB0 802405E0 24420004 */ addiu $v0, $v0, 4 @@ -34,11 +34,11 @@ glabel func_8024059C_D3AB6C /* D3ABDC 8024060C 00081083 */ sra $v0, $t0, 2 /* D3ABE0 80240610 00431023 */ subu $v0, $v0, $v1 /* D3ABE4 80240614 4482A000 */ mtc1 $v0, $f20 -/* D3ABE8 80240618 00000000 */ nop +/* D3ABE8 80240618 00000000 */ nop /* D3ABEC 8024061C 4680A520 */ cvt.s.w $f20, $f20 /* D3ABF0 80240620 4600A502 */ mul.s $f20, $f20, $f0 /* D3ABF4 80240624 0C00A8D4 */ jal cos_deg -/* D3ABF8 80240628 00000000 */ nop +/* D3ABF8 80240628 00000000 */ nop /* D3ABFC 8024062C 8E230074 */ lw $v1, 0x74($s1) /* D3AC00 80240630 00700018 */ mult $v1, $s0 /* D3AC04 80240634 46000007 */ neg.s $f0, $f0 @@ -47,19 +47,19 @@ glabel func_8024059C_D3AB6C /* D3AC10 80240640 00081083 */ sra $v0, $t0, 2 /* D3AC14 80240644 00431023 */ subu $v0, $v0, $v1 /* D3AC18 80240648 44824000 */ mtc1 $v0, $f8 -/* D3AC1C 8024064C 00000000 */ nop +/* D3AC1C 8024064C 00000000 */ nop /* D3AC20 80240650 46804220 */ cvt.s.w $f8, $f8 /* D3AC24 80240654 46004202 */ mul.s $f8, $f8, $f0 -/* D3AC28 80240658 00000000 */ nop +/* D3AC28 80240658 00000000 */ nop /* D3AC2C 8024065C 0000202D */ daddu $a0, $zero, $zero /* D3AC30 80240660 864200B0 */ lh $v0, 0xb0($s2) /* D3AC34 80240664 3C013F00 */ lui $at, 0x3f00 /* D3AC38 80240668 44811000 */ mtc1 $at, $f2 /* D3AC3C 8024066C 44820000 */ mtc1 $v0, $f0 -/* D3AC40 80240670 00000000 */ nop +/* D3AC40 80240670 00000000 */ nop /* D3AC44 80240674 46800020 */ cvt.s.w $f0, $f0 /* D3AC48 80240678 46020002 */ mul.s $f0, $f0, $f2 -/* D3AC4C 8024067C 00000000 */ nop +/* D3AC4C 8024067C 00000000 */ nop /* D3AC50 80240680 27A50018 */ addiu $a1, $sp, 0x18 /* D3AC54 80240684 27A6001C */ addiu $a2, $sp, 0x1c /* D3AC58 80240688 C6440028 */ lwc1 $f4, 0x28($s2) @@ -83,9 +83,9 @@ glabel func_8024059C_D3AB6C /* D3ACA0 802406D0 C7A20024 */ lwc1 $f2, 0x24($sp) /* D3ACA4 802406D4 3C0142C8 */ lui $at, 0x42c8 /* D3ACA8 802406D8 44810000 */ mtc1 $at, $f0 -/* D3ACAC 802406DC 00000000 */ nop +/* D3ACAC 802406DC 00000000 */ nop /* D3ACB0 802406E0 4600103C */ c.lt.s $f2, $f0 -/* D3ACB4 802406E4 00000000 */ nop +/* D3ACB4 802406E4 00000000 */ nop /* D3ACB8 802406E8 45000008 */ bc1f .L8024070C /* D3ACBC 802406EC 0000102D */ daddu $v0, $zero, $zero /* D3ACC0 802406F0 C7A00018 */ lwc1 $f0, 0x18($sp) diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240754_D3AD24.s b/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240754_D3AD24.s index 82b6f3ba68..0bca5cc192 100644 --- a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240754_D3AD24.s +++ b/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240754_D3AD24.s @@ -33,5 +33,5 @@ glabel func_80240754_D3AD24 /* D3AD8C 802407BC 0000102D */ daddu $v0, $zero, $zero /* D3AD90 802407C0 03E00008 */ jr $ra /* D3AD94 802407C4 27BD0020 */ addiu $sp, $sp, 0x20 -/* D3AD98 802407C8 00000000 */ nop -/* D3AD9C 802407CC 00000000 */ nop +/* D3AD98 802407C8 00000000 */ nop +/* D3AD9C 802407CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802407D0_D3ADA0.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802407D0_D3ADA0.s index 81ffd39f80..2966d4726d 100644 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802407D0_D3ADA0.s +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802407D0_D3ADA0.s @@ -26,7 +26,7 @@ glabel func_802407D0_D3ADA0 /* D3ADF0 80240820 1440FFFA */ bnez $v0, .L8024080C /* D3ADF4 80240824 24A50004 */ addiu $a1, $a1, 4 /* D3ADF8 80240828 0809021B */ j .L8024086C -/* D3ADFC 8024082C 00000000 */ nop +/* D3ADFC 8024082C 00000000 */ nop .L80240830: /* D3AE00 80240830 0000182D */ daddu $v1, $zero, $zero /* D3AE04 80240834 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024090C_D3AEDC.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024090C_D3AEDC.s index 4ac63a3a14..3bfc87393a 100644 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024090C_D3AEDC.s +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024090C_D3AEDC.s @@ -115,7 +115,7 @@ glabel func_8024090C_D3AEDC /* D3B084 80240AB4 14E20005 */ bne $a3, $v0, .L80240ACC /* D3B088 80240AB8 32E2FFFF */ andi $v0, $s7, 0xffff /* D3B08C 80240ABC 14400003 */ bnez $v0, .L80240ACC -/* D3B090 80240AC0 00000000 */ nop +/* D3B090 80240AC0 00000000 */ nop /* D3B094 80240AC4 14800008 */ bnez $a0, .L80240AE8 /* D3B098 80240AC8 24020001 */ addiu $v0, $zero, 1 .L80240ACC: @@ -123,7 +123,7 @@ glabel func_8024090C_D3AEDC /* D3B0A0 80240AD0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* D3B0A4 80240AD4 80420075 */ lb $v0, 0x75($v0) /* D3B0A8 80240AD8 10400005 */ beqz $v0, .L80240AF0 -/* D3B0AC 80240ADC 00000000 */ nop +/* D3B0AC 80240ADC 00000000 */ nop /* D3B0B0 80240AE0 10800003 */ beqz $a0, .L80240AF0 /* D3B0B4 80240AE4 24020001 */ addiu $v0, $zero, 1 .L80240AE8: diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240BFC_D3B1CC.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240BFC_D3B1CC.s index 4d6f6288f7..0c42cf1b63 100644 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240BFC_D3B1CC.s +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240BFC_D3B1CC.s @@ -39,13 +39,13 @@ glabel func_80240BFC_D3B1CC /* D3B250 80240C80 10740005 */ beq $v1, $s4, .L80240C98 /* D3B254 80240C84 26100001 */ addiu $s0, $s0, 1 /* D3B258 80240C88 10730003 */ beq $v1, $s3, .L80240C98 -/* D3B25C 80240C8C 00000000 */ nop +/* D3B25C 80240C8C 00000000 */ nop /* D3B260 80240C90 00521025 */ or $v0, $v0, $s2 /* D3B264 80240C94 AC820000 */ sw $v0, ($a0) .L80240C98: /* D3B268 80240C98 2A020040 */ slti $v0, $s0, 0x40 /* D3B26C 80240C9C 1440FFEF */ bnez $v0, .L80240C5C -/* D3B270 80240CA0 00000000 */ nop +/* D3B270 80240CA0 00000000 */ nop /* D3B274 80240CA4 0000802D */ daddu $s0, $zero, $zero /* D3B278 80240CA8 3C120800 */ lui $s2, 0x800 .L80240CAC: @@ -57,13 +57,13 @@ glabel func_80240BFC_D3B1CC /* D3B290 80240CC0 8C640000 */ lw $a0, ($v1) /* D3B294 80240CC4 30820010 */ andi $v0, $a0, 0x10 /* D3B298 80240CC8 10400003 */ beqz $v0, .L80240CD8 -/* D3B29C 80240CCC 00000000 */ nop +/* D3B29C 80240CCC 00000000 */ nop /* D3B2A0 80240CD0 00921025 */ or $v0, $a0, $s2 /* D3B2A4 80240CD4 AC620000 */ sw $v0, ($v1) .L80240CD8: /* D3B2A8 80240CD8 2A020100 */ slti $v0, $s0, 0x100 /* D3B2AC 80240CDC 1440FFF3 */ bnez $v0, .L80240CAC -/* D3B2B0 80240CE0 00000000 */ nop +/* D3B2B0 80240CE0 00000000 */ nop /* D3B2B4 80240CE4 AE200070 */ sw $zero, 0x70($s1) .L80240CE8: /* D3B2B8 80240CE8 8E220070 */ lw $v0, 0x70($s1) diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240D48_D3B318.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240D48_D3B318.s index f5b6e0983d..df292e43ba 100644 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240D48_D3B318.s +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240D48_D3B318.s @@ -32,7 +32,7 @@ glabel func_80240D48_D3B318 /* D3B37C 80240DAC 0080302D */ daddu $a2, $a0, $zero /* D3B380 80240DB0 8E020070 */ lw $v0, 0x70($s0) /* D3B384 80240DB4 14400006 */ bnez $v0, .L80240DD0 -/* D3B388 80240DB8 00000000 */ nop +/* D3B388 80240DB8 00000000 */ nop /* D3B38C 80240DBC 8E020074 */ lw $v0, 0x74($s0) /* D3B390 80240DC0 14400003 */ bnez $v0, .L80240DD0 /* D3B394 80240DC4 24020001 */ addiu $v0, $zero, 1 @@ -66,13 +66,13 @@ glabel func_80240D48_D3B318 /* D3B3FC 80240E2C 10730005 */ beq $v1, $s3, .L80240E44 /* D3B400 80240E30 26100001 */ addiu $s0, $s0, 1 /* D3B404 80240E34 10720003 */ beq $v1, $s2, .L80240E44 -/* D3B408 80240E38 00000000 */ nop +/* D3B408 80240E38 00000000 */ nop /* D3B40C 80240E3C 00511024 */ and $v0, $v0, $s1 /* D3B410 80240E40 AC820000 */ sw $v0, ($a0) .L80240E44: /* D3B414 80240E44 2A020040 */ slti $v0, $s0, 0x40 /* D3B418 80240E48 1440FFEF */ bnez $v0, .L80240E08 -/* D3B41C 80240E4C 00000000 */ nop +/* D3B41C 80240E4C 00000000 */ nop /* D3B420 80240E50 0000802D */ daddu $s0, $zero, $zero /* D3B424 80240E54 3C11F7FF */ lui $s1, 0xf7ff /* D3B428 80240E58 3631FFFF */ ori $s1, $s1, 0xffff @@ -85,7 +85,7 @@ glabel func_80240D48_D3B318 /* D3B440 80240E70 8C640000 */ lw $a0, ($v1) /* D3B444 80240E74 30820010 */ andi $v0, $a0, 0x10 /* D3B448 80240E78 10400003 */ beqz $v0, .L80240E88 -/* D3B44C 80240E7C 00000000 */ nop +/* D3B44C 80240E7C 00000000 */ nop /* D3B450 80240E80 00911024 */ and $v0, $a0, $s1 /* D3B454 80240E84 AC620000 */ sw $v0, ($v1) .L80240E88: @@ -93,7 +93,7 @@ glabel func_80240D48_D3B318 /* D3B45C 80240E8C 1440FFF3 */ bnez $v0, .L80240E5C /* D3B460 80240E90 24020002 */ addiu $v0, $zero, 2 /* D3B464 80240E94 080903A8 */ j .L80240EA0 -/* D3B468 80240E98 00000000 */ nop +/* D3B468 80240E98 00000000 */ nop .L80240E9C: /* D3B46C 80240E9C 0000102D */ daddu $v0, $zero, $zero .L80240EA0: diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240F40_D3B510.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240F40_D3B510.s index c524248c1a..4b88b6afeb 100644 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240F40_D3B510.s +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240F40_D3B510.s @@ -16,19 +16,19 @@ glabel func_80240F40_D3B510 /* D3B53C 80240F6C 0220202D */ daddu $a0, $s1, $zero /* D3B540 80240F70 3C05F4AC */ lui $a1, 0xf4ac /* D3B544 80240F74 4482B000 */ mtc1 $v0, $f22 -/* D3B548 80240F78 00000000 */ nop +/* D3B548 80240F78 00000000 */ nop /* D3B54C 80240F7C 4680B5A0 */ cvt.s.w $f22, $f22 /* D3B550 80240F80 0C0B1EAF */ jal get_variable /* D3B554 80240F84 34A5D482 */ ori $a1, $a1, 0xd482 /* D3B558 80240F88 0220202D */ daddu $a0, $s1, $zero /* D3B55C 80240F8C 3C05F4AC */ lui $a1, 0xf4ac /* D3B560 80240F90 4482A000 */ mtc1 $v0, $f20 -/* D3B564 80240F94 00000000 */ nop +/* D3B564 80240F94 00000000 */ nop /* D3B568 80240F98 4680A520 */ cvt.s.w $f20, $f20 /* D3B56C 80240F9C 0C0B1EAF */ jal get_variable /* D3B570 80240FA0 34A5D483 */ ori $a1, $a1, 0xd483 /* D3B574 80240FA4 44821000 */ mtc1 $v0, $f2 -/* D3B578 80240FA8 00000000 */ nop +/* D3B578 80240FA8 00000000 */ nop /* D3B57C 80240FAC 468010A0 */ cvt.s.w $f2, $f2 /* D3B580 80240FB0 4405B000 */ mfc1 $a1, $f22 /* D3B584 80240FB4 4406A000 */ mfc1 $a2, $f20 @@ -45,19 +45,19 @@ glabel func_80240F40_D3B510 /* D3B5B0 80240FE0 0220202D */ daddu $a0, $s1, $zero /* D3B5B4 80240FE4 3C05F4AC */ lui $a1, 0xf4ac /* D3B5B8 80240FE8 4482B000 */ mtc1 $v0, $f22 -/* D3B5BC 80240FEC 00000000 */ nop +/* D3B5BC 80240FEC 00000000 */ nop /* D3B5C0 80240FF0 4680B5A0 */ cvt.s.w $f22, $f22 /* D3B5C4 80240FF4 0C0B1EAF */ jal get_variable /* D3B5C8 80240FF8 34A5D482 */ ori $a1, $a1, 0xd482 /* D3B5CC 80240FFC 0220202D */ daddu $a0, $s1, $zero /* D3B5D0 80241000 3C05F4AC */ lui $a1, 0xf4ac /* D3B5D4 80241004 4482A000 */ mtc1 $v0, $f20 -/* D3B5D8 80241008 00000000 */ nop +/* D3B5D8 80241008 00000000 */ nop /* D3B5DC 8024100C 4680A520 */ cvt.s.w $f20, $f20 /* D3B5E0 80241010 0C0B1EAF */ jal get_variable /* D3B5E4 80241014 34A5D483 */ ori $a1, $a1, 0xd483 /* D3B5E8 80241018 44821000 */ mtc1 $v0, $f2 -/* D3B5EC 8024101C 00000000 */ nop +/* D3B5EC 8024101C 00000000 */ nop /* D3B5F0 80241020 468010A0 */ cvt.s.w $f2, $f2 /* D3B5F4 80241024 4405B000 */ mfc1 $a1, $f22 /* D3B5F8 80241028 4406A000 */ mfc1 $a2, $f20 @@ -73,19 +73,19 @@ glabel func_80240F40_D3B510 /* D3B620 80241050 0220202D */ daddu $a0, $s1, $zero /* D3B624 80241054 3C05F4AC */ lui $a1, 0xf4ac /* D3B628 80241058 4482B000 */ mtc1 $v0, $f22 -/* D3B62C 8024105C 00000000 */ nop +/* D3B62C 8024105C 00000000 */ nop /* D3B630 80241060 4680B5A0 */ cvt.s.w $f22, $f22 /* D3B634 80241064 0C0B1EAF */ jal get_variable /* D3B638 80241068 34A5D482 */ ori $a1, $a1, 0xd482 /* D3B63C 8024106C 0220202D */ daddu $a0, $s1, $zero /* D3B640 80241070 3C05F4AC */ lui $a1, 0xf4ac /* D3B644 80241074 4482A000 */ mtc1 $v0, $f20 -/* D3B648 80241078 00000000 */ nop +/* D3B648 80241078 00000000 */ nop /* D3B64C 8024107C 4680A520 */ cvt.s.w $f20, $f20 /* D3B650 80241080 0C0B1EAF */ jal get_variable /* D3B654 80241084 34A5D483 */ ori $a1, $a1, 0xd483 /* D3B658 80241088 44821000 */ mtc1 $v0, $f2 -/* D3B65C 8024108C 00000000 */ nop +/* D3B65C 8024108C 00000000 */ nop /* D3B660 80241090 468010A0 */ cvt.s.w $f2, $f2 /* D3B664 80241094 4405B000 */ mfc1 $a1, $f22 /* D3B668 80241098 4406A000 */ mfc1 $a2, $f20 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241158_D3B728.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241158_D3B728.s index 3acf225817..cc22d34f1e 100644 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241158_D3B728.s +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241158_D3B728.s @@ -44,7 +44,7 @@ glabel func_80241158_D3B728 /* D3B7BC 802411EC 3C048025 */ lui $a0, %hi(D_80251450) /* D3B7C0 802411F0 8C841450 */ lw $a0, %lo(D_80251450)($a0) /* D3B7C4 802411F4 0C048D70 */ jal func_801235C0 -/* D3B7C8 802411F8 00000000 */ nop +/* D3B7C8 802411F8 00000000 */ nop /* D3B7CC 802411FC 24020002 */ addiu $v0, $zero, 2 .L80241200: /* D3B7D0 80241200 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802417C8_D3BD98.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802417C8_D3BD98.s index 5066e106e5..f5c4e6ddca 100644 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802417C8_D3BD98.s +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802417C8_D3BD98.s @@ -13,7 +13,7 @@ glabel func_802417C8_D3BD98 /* D3BDB8 802417E8 14620006 */ bne $v1, $v0, .L80241804 /* D3BDBC 802417EC 24020002 */ addiu $v0, $zero, 2 /* D3BDC0 802417F0 44800000 */ mtc1 $zero, $f0 -/* D3BDC4 802417F4 00000000 */ nop +/* D3BDC4 802417F4 00000000 */ nop /* D3BDC8 802417F8 44050000 */ mfc1 $a1, $f0 /* D3BDCC 802417FC 08090607 */ j .L8024181C /* D3BDD0 80241800 0000202D */ daddu $a0, $zero, $zero @@ -21,9 +21,9 @@ glabel func_802417C8_D3BD98 /* D3BDD4 80241804 14620008 */ bne $v1, $v0, .L80241828 /* D3BDD8 80241808 24040001 */ addiu $a0, $zero, 1 /* D3BDDC 8024180C 44800000 */ mtc1 $zero, $f0 -/* D3BDE0 80241810 00000000 */ nop +/* D3BDE0 80241810 00000000 */ nop /* D3BDE4 80241814 44050000 */ mfc1 $a1, $f0 -/* D3BDE8 80241818 00000000 */ nop +/* D3BDE8 80241818 00000000 */ nop .L8024181C: /* D3BDEC 8024181C 00A0302D */ daddu $a2, $a1, $zero /* D3BDF0 80241820 0C01C5A4 */ jal func_80071690 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802418B4_D3BE84.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802418B4_D3BE84.s index e12bfe21b8..edae544207 100644 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802418B4_D3BE84.s +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802418B4_D3BE84.s @@ -16,7 +16,7 @@ glabel func_802418B4_D3BE84 /* D3BEB0 802418E0 C60200AC */ lwc1 $f2, 0xac($s0) /* D3BEB4 802418E4 C6200040 */ lwc1 $f0, 0x40($s1) /* D3BEB8 802418E8 46001032 */ c.eq.s $f2, $f0 -/* D3BEBC 802418EC 00000000 */ nop +/* D3BEBC 802418EC 00000000 */ nop /* D3BEC0 802418F0 45000006 */ bc1f .L8024190C /* D3BEC4 802418F4 261000AC */ addiu $s0, $s0, 0xac /* D3BEC8 802418F8 3C03009A */ lui $v1, 0x9a @@ -28,7 +28,7 @@ glabel func_802418B4_D3BE84 /* D3BEDC 8024190C C6020000 */ lwc1 $f2, ($s0) /* D3BEE0 80241910 C6200040 */ lwc1 $f0, 0x40($s1) /* D3BEE4 80241914 46001032 */ c.eq.s $f2, $f0 -/* D3BEE8 80241918 00000000 */ nop +/* D3BEE8 80241918 00000000 */ nop /* D3BEEC 8024191C 45030008 */ bc1tl .L80241940 /* D3BEF0 80241920 E6000000 */ swc1 $f0, ($s0) /* D3BEF4 80241924 3C03009A */ lui $v1, 0x9a @@ -47,9 +47,9 @@ glabel func_802418B4_D3BE84 /* D3BF20 80241950 8E470030 */ lw $a3, 0x30($s2) /* D3BF24 80241954 3C0141F0 */ lui $at, 0x41f0 /* D3BF28 80241958 44811000 */ mtc1 $at, $f2 -/* D3BF2C 8024195C 00000000 */ nop +/* D3BF2C 8024195C 00000000 */ nop /* D3BF30 80241960 4602003C */ c.lt.s $f0, $f2 -/* D3BF34 80241964 00000000 */ nop +/* D3BF34 80241964 00000000 */ nop /* D3BF38 80241968 4501003A */ bc1t .L80241A54 /* D3BF3C 8024196C 24020002 */ addiu $v0, $zero, 2 /* D3BF40 80241970 C62C0038 */ lwc1 $f12, 0x38($s1) @@ -59,40 +59,40 @@ glabel func_802418B4_D3BE84 /* D3BF50 80241980 8E470030 */ lw $a3, 0x30($s2) /* D3BF54 80241984 3C014302 */ lui $at, 0x4302 /* D3BF58 80241988 44811000 */ mtc1 $at, $f2 -/* D3BF5C 8024198C 00000000 */ nop +/* D3BF5C 8024198C 00000000 */ nop /* D3BF60 80241990 4600103C */ c.lt.s $f2, $f0 -/* D3BF64 80241994 00000000 */ nop +/* D3BF64 80241994 00000000 */ nop /* D3BF68 80241998 4501002E */ bc1t .L80241A54 /* D3BF6C 8024199C 24020002 */ addiu $v0, $zero, 2 /* D3BF70 802419A0 C6420030 */ lwc1 $f2, 0x30($s2) /* D3BF74 802419A4 3C014248 */ lui $at, 0x4248 /* D3BF78 802419A8 44812000 */ mtc1 $at, $f4 -/* D3BF7C 802419AC 00000000 */ nop +/* D3BF7C 802419AC 00000000 */ nop /* D3BF80 802419B0 4602203C */ c.lt.s $f4, $f2 -/* D3BF84 802419B4 00000000 */ nop +/* D3BF84 802419B4 00000000 */ nop /* D3BF88 802419B8 45000002 */ bc1f .L802419C4 /* D3BF8C 802419BC 46001006 */ mov.s $f0, $f2 /* D3BF90 802419C0 46002086 */ mov.s $f2, $f4 .L802419C4: /* D3BF94 802419C4 3C01C220 */ lui $at, 0xc220 /* D3BF98 802419C8 44812000 */ mtc1 $at, $f4 -/* D3BF9C 802419CC 00000000 */ nop +/* D3BF9C 802419CC 00000000 */ nop /* D3BFA0 802419D0 4604003C */ c.lt.s $f0, $f4 -/* D3BFA4 802419D4 00000000 */ nop +/* D3BFA4 802419D4 00000000 */ nop /* D3BFA8 802419D8 45030001 */ bc1tl .L802419E0 /* D3BFAC 802419DC 46002086 */ mov.s $f2, $f4 .L802419E0: /* D3BFB0 802419E0 C6240040 */ lwc1 $f4, 0x40($s1) /* D3BFB4 802419E4 4602203E */ c.le.s $f4, $f2 -/* D3BFB8 802419E8 00000000 */ nop +/* D3BFB8 802419E8 00000000 */ nop /* D3BFBC 802419EC 4500000B */ bc1f .L80241A1C -/* D3BFC0 802419F0 00000000 */ nop +/* D3BFC0 802419F0 00000000 */ nop /* D3BFC4 802419F4 3C014080 */ lui $at, 0x4080 /* D3BFC8 802419F8 44810000 */ mtc1 $at, $f0 -/* D3BFCC 802419FC 00000000 */ nop +/* D3BFCC 802419FC 00000000 */ nop /* D3BFD0 80241A00 46002000 */ add.s $f0, $f4, $f0 /* D3BFD4 80241A04 4600103C */ c.lt.s $f2, $f0 -/* D3BFD8 80241A08 00000000 */ nop +/* D3BFD8 80241A08 00000000 */ nop /* D3BFDC 80241A0C 45000002 */ bc1f .L80241A18 /* D3BFE0 80241A10 E6200040 */ swc1 $f0, 0x40($s1) /* D3BFE4 80241A14 E6220040 */ swc1 $f2, 0x40($s1) @@ -100,15 +100,15 @@ glabel func_802418B4_D3BE84 /* D3BFE8 80241A18 C6240040 */ lwc1 $f4, 0x40($s1) .L80241A1C: /* D3BFEC 80241A1C 4604103C */ c.lt.s $f2, $f4 -/* D3BFF0 80241A20 00000000 */ nop +/* D3BFF0 80241A20 00000000 */ nop /* D3BFF4 80241A24 4500000B */ bc1f .L80241A54 /* D3BFF8 80241A28 24020002 */ addiu $v0, $zero, 2 /* D3BFFC 80241A2C 3C014080 */ lui $at, 0x4080 /* D3C000 80241A30 44810000 */ mtc1 $at, $f0 -/* D3C004 80241A34 00000000 */ nop +/* D3C004 80241A34 00000000 */ nop /* D3C008 80241A38 46002001 */ sub.s $f0, $f4, $f0 /* D3C00C 80241A3C 4602003E */ c.le.s $f0, $f2 -/* D3C010 80241A40 00000000 */ nop +/* D3C010 80241A40 00000000 */ nop /* D3C014 80241A44 45000003 */ bc1f .L80241A54 /* D3C018 80241A48 E6200040 */ swc1 $f0, 0x40($s1) /* D3C01C 80241A4C E6220040 */ swc1 $f2, 0x40($s1) diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241A6C_D3C03C.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241A6C_D3C03C.s index 8b4e3a82f6..ea1d0fb61b 100644 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241A6C_D3C03C.s +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241A6C_D3C03C.s @@ -9,7 +9,7 @@ glabel func_80241A6C_D3C03C /* D3C04C 80241A7C 3C013F19 */ lui $at, 0x3f19 /* D3C050 80241A80 3421999A */ ori $at, $at, 0x999a /* D3C054 80241A84 44810000 */ mtc1 $at, $f0 -/* D3C058 80241A88 00000000 */ nop +/* D3C058 80241A88 00000000 */ nop /* D3C05C 80241A8C E4400030 */ swc1 $f0, 0x30($v0) /* D3C060 80241A90 8FBF0010 */ lw $ra, 0x10($sp) /* D3C064 80241A94 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241DAC_D3C37C.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241DAC_D3C37C.s index f99ee12d0a..08ae737871 100644 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241DAC_D3C37C.s +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241DAC_D3C37C.s @@ -33,27 +33,27 @@ glabel func_80241DAC_D3C37C /* D3C3E8 80241E18 000210C0 */ sll $v0, $v0, 3 /* D3C3EC 80241E1C 2442FF9C */ addiu $v0, $v0, -0x64 /* D3C3F0 80241E20 4482C000 */ mtc1 $v0, $f24 -/* D3C3F4 80241E24 00000000 */ nop +/* D3C3F4 80241E24 00000000 */ nop /* D3C3F8 80241E28 4680C620 */ cvt.s.w $f24, $f24 /* D3C3FC 80241E2C 4600C1A1 */ cvt.d.s $f6, $f24 /* D3C400 80241E30 463A3182 */ mul.d $f6, $f6, $f26 -/* D3C404 80241E34 00000000 */ nop +/* D3C404 80241E34 00000000 */ nop /* D3C408 80241E38 00041080 */ sll $v0, $a0, 2 /* D3C40C 80241E3C 00441021 */ addu $v0, $v0, $a0 /* D3C410 80241E40 000210C0 */ sll $v0, $v0, 3 /* D3C414 80241E44 2442FF9C */ addiu $v0, $v0, -0x64 /* D3C418 80241E48 4482B000 */ mtc1 $v0, $f22 -/* D3C41C 80241E4C 00000000 */ nop +/* D3C41C 80241E4C 00000000 */ nop /* D3C420 80241E50 4680B5A0 */ cvt.s.w $f22, $f22 /* D3C424 80241E54 4600B121 */ cvt.d.s $f4, $f22 /* D3C428 80241E58 463A2102 */ mul.d $f4, $f4, $f26 -/* D3C42C 80241E5C 00000000 */ nop +/* D3C42C 80241E5C 00000000 */ nop /* D3C430 80241E60 3C013FF0 */ lui $at, 0x3ff0 /* D3C434 80241E64 44811800 */ mtc1 $at, $f3 /* D3C438 80241E68 44801000 */ mtc1 $zero, $f2 /* D3C43C 80241E6C 32220003 */ andi $v0, $s1, 3 /* D3C440 80241E70 44820000 */ mtc1 $v0, $f0 -/* D3C444 80241E74 00000000 */ nop +/* D3C444 80241E74 00000000 */ nop /* D3C448 80241E78 46800021 */ cvt.d.w $f0, $f0 /* D3C44C 80241E7C 46220000 */ add.d $f0, $f0, $f2 /* D3C450 80241E80 4480A000 */ mtc1 $zero, $f20 @@ -82,10 +82,10 @@ glabel func_80241DAC_D3C37C /* D3C4AC 80241EDC 3C018025 */ lui $at, %hi(D_80251438) /* D3C4B0 80241EE0 D4221438 */ ldc1 $f2, %lo(D_80251438)($at) /* D3C4B4 80241EE4 44820000 */ mtc1 $v0, $f0 -/* D3C4B8 80241EE8 00000000 */ nop +/* D3C4B8 80241EE8 00000000 */ nop /* D3C4BC 80241EEC 46800021 */ cvt.d.w $f0, $f0 /* D3C4C0 80241EF0 46220002 */ mul.d $f0, $f0, $f2 -/* D3C4C4 80241EF4 00000000 */ nop +/* D3C4C4 80241EF4 00000000 */ nop /* D3C4C8 80241EF8 2404000A */ addiu $a0, $zero, 0xa /* D3C4CC 80241EFC 463A0000 */ add.d $f0, $f0, $f26 /* D3C4D0 80241F00 3C014080 */ lui $at, 0x4080 @@ -95,14 +95,14 @@ glabel func_80241DAC_D3C37C /* D3C4E0 80241F10 E4400048 */ swc1 $f0, 0x48($v0) /* D3C4E4 80241F14 8E02000C */ lw $v0, 0xc($s0) /* D3C4E8 80241F18 44920000 */ mtc1 $s2, $f0 -/* D3C4EC 80241F1C 00000000 */ nop +/* D3C4EC 80241F1C 00000000 */ nop /* D3C4F0 80241F20 46800020 */ cvt.s.w $f0, $f0 /* D3C4F4 80241F24 0C00A67F */ jal rand_int /* D3C4F8 80241F28 E440003C */ swc1 $f0, 0x3c($v0) /* D3C4FC 80241F2C 2442FFFB */ addiu $v0, $v0, -5 /* D3C500 80241F30 8E03000C */ lw $v1, 0xc($s0) /* D3C504 80241F34 44820000 */ mtc1 $v0, $f0 -/* D3C508 80241F38 00000000 */ nop +/* D3C508 80241F38 00000000 */ nop /* D3C50C 80241F3C 46800020 */ cvt.s.w $f0, $f0 /* D3C510 80241F40 E4600040 */ swc1 $f0, 0x40($v1) /* D3C514 80241F44 8E02000C */ lw $v0, 0xc($s0) diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80242074_D3C644.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80242074_D3C644.s index 0aa185918a..becb4c6425 100644 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80242074_D3C644.s +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80242074_D3C644.s @@ -38,7 +38,7 @@ glabel func_80242074_D3C644 /* D3C6C8 802420F8 848200A6 */ lh $v0, 0xa6($a0) /* D3C6CC 802420FC 27A60024 */ addiu $a2, $sp, 0x24 /* D3C6D0 80242100 44820000 */ mtc1 $v0, $f0 -/* D3C6D4 80242104 00000000 */ nop +/* D3C6D4 80242104 00000000 */ nop /* D3C6D8 80242108 46800020 */ cvt.s.w $f0, $f0 /* D3C6DC 8024210C E7A00018 */ swc1 $f0, 0x18($sp) /* D3C6E0 80242110 8C840080 */ lw $a0, 0x80($a0) @@ -48,9 +48,9 @@ glabel func_80242074_D3C644 /* D3C6F0 80242120 0240202D */ daddu $a0, $s2, $zero /* D3C6F4 80242124 C7A0002C */ lwc1 $f0, 0x2c($sp) /* D3C6F8 80242128 4614003E */ c.le.s $f0, $f20 -/* D3C6FC 8024212C 00000000 */ nop +/* D3C6FC 8024212C 00000000 */ nop /* D3C700 80242130 45000004 */ bc1f .L80242144 -/* D3C704 80242134 00000000 */ nop +/* D3C704 80242134 00000000 */ nop /* D3C708 80242138 3C108011 */ lui $s0, %hi(D_8010C978) /* D3C70C 8024213C 8E10C978 */ lw $s0, %lo(D_8010C978)($s0) .L80242140: diff --git a/asm/nonmatchings/world/area_sam/sam_12/D4BA20/func_80240000_D4BA20.s b/asm/nonmatchings/world/area_sam/sam_12/D4BA20/func_80240000_D4BA20.s index 31c47af315..e1f3987fc9 100644 --- a/asm/nonmatchings/world/area_sam/sam_12/D4BA20/func_80240000_D4BA20.s +++ b/asm/nonmatchings/world/area_sam/sam_12/D4BA20/func_80240000_D4BA20.s @@ -18,14 +18,14 @@ glabel func_80240000_D4BA20 /* D4BA50 80240030 8E300078 */ lw $s0, 0x78($s1) /* D4BA54 80240034 3C0140A0 */ lui $at, 0x40a0 /* D4BA58 80240038 44811000 */ mtc1 $at, $f2 -/* D4BA5C 8024003C 00000000 */ nop +/* D4BA5C 8024003C 00000000 */ nop /* D4BA60 80240040 46020002 */ mul.s $f0, $f0, $f2 -/* D4BA64 80240044 00000000 */ nop +/* D4BA64 80240044 00000000 */ nop /* D4BA68 80240048 3C014090 */ lui $at, 0x4090 /* D4BA6C 8024004C 44816000 */ mtc1 $at, $f12 /* D4BA70 80240050 4600010D */ trunc.w.s $f4, $f0 /* D4BA74 80240054 44022000 */ mfc1 $v0, $f4 -/* D4BA78 80240058 00000000 */ nop +/* D4BA78 80240058 00000000 */ nop /* D4BA7C 8024005C A20200AB */ sb $v0, 0xab($s0) /* D4BA80 80240060 C6200074 */ lwc1 $f0, 0x74($s1) /* D4BA84 80240064 0C00A6C9 */ jal clamp_angle @@ -37,5 +37,5 @@ glabel func_80240000_D4BA20 /* D4BA9C 8024007C 0000102D */ daddu $v0, $zero, $zero /* D4BAA0 80240080 03E00008 */ jr $ra /* D4BAA4 80240084 27BD0020 */ addiu $sp, $sp, 0x20 -/* D4BAA8 80240088 00000000 */ nop -/* D4BAAC 8024008C 00000000 */ nop +/* D4BAA8 80240088 00000000 */ nop +/* D4BAAC 8024008C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_802400C0_D4BAE0.s b/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_802400C0_D4BAE0.s index 6de785ae0e..aa499bd286 100644 --- a/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_802400C0_D4BAE0.s +++ b/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_802400C0_D4BAE0.s @@ -29,22 +29,22 @@ glabel func_802400C0_D4BAE0 /* D4BB40 80240120 4600008D */ trunc.w.s $f2, $f0 /* D4BB44 80240124 44111000 */ mfc1 $s1, $f2 /* D4BB48 80240128 0C0B210B */ jal get_float_variable -/* D4BB4C 8024012C 00000000 */ nop +/* D4BB4C 8024012C 00000000 */ nop /* D4BB50 80240130 4600008D */ trunc.w.s $f2, $f0 /* D4BB54 80240134 44101000 */ mfc1 $s0, $f2 /* D4BB58 80240138 0C04C3D6 */ jal get_item_entity /* D4BB5C 8024013C 0260202D */ daddu $a0, $s3, $zero /* D4BB60 80240140 0040182D */ daddu $v1, $v0, $zero /* D4BB64 80240144 44920000 */ mtc1 $s2, $f0 -/* D4BB68 80240148 00000000 */ nop +/* D4BB68 80240148 00000000 */ nop /* D4BB6C 8024014C 46800020 */ cvt.s.w $f0, $f0 /* D4BB70 80240150 E4600008 */ swc1 $f0, 8($v1) /* D4BB74 80240154 44910000 */ mtc1 $s1, $f0 -/* D4BB78 80240158 00000000 */ nop +/* D4BB78 80240158 00000000 */ nop /* D4BB7C 8024015C 46800020 */ cvt.s.w $f0, $f0 /* D4BB80 80240160 E460000C */ swc1 $f0, 0xc($v1) /* D4BB84 80240164 44900000 */ mtc1 $s0, $f0 -/* D4BB88 80240168 00000000 */ nop +/* D4BB88 80240168 00000000 */ nop /* D4BB8C 8024016C 46800020 */ cvt.s.w $f0, $f0 /* D4BB90 80240170 E4600010 */ swc1 $f0, 0x10($v1) /* D4BB94 80240174 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240194_D4BBB4.s b/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240194_D4BBB4.s index 6935f1dd2a..b7762aa589 100644 --- a/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240194_D4BBB4.s +++ b/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240194_D4BBB4.s @@ -22,15 +22,15 @@ glabel func_80240194_D4BBB4 /* D4BBF8 802401D8 0C0B1EAF */ jal get_variable /* D4BBFC 802401DC 0040802D */ daddu $s0, $v0, $zero /* D4BC00 802401E0 44920000 */ mtc1 $s2, $f0 -/* D4BC04 802401E4 00000000 */ nop +/* D4BC04 802401E4 00000000 */ nop /* D4BC08 802401E8 46800020 */ cvt.s.w $f0, $f0 /* D4BC0C 802401EC 44050000 */ mfc1 $a1, $f0 /* D4BC10 802401F0 44900000 */ mtc1 $s0, $f0 -/* D4BC14 802401F4 00000000 */ nop +/* D4BC14 802401F4 00000000 */ nop /* D4BC18 802401F8 46800020 */ cvt.s.w $f0, $f0 /* D4BC1C 802401FC 44060000 */ mfc1 $a2, $f0 /* D4BC20 80240200 44820000 */ mtc1 $v0, $f0 -/* D4BC24 80240204 00000000 */ nop +/* D4BC24 80240204 00000000 */ nop /* D4BC28 80240208 46800020 */ cvt.s.w $f0, $f0 /* D4BC2C 8024020C 44070000 */ mfc1 $a3, $f0 /* D4BC30 80240210 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240238_D4BC58.s b/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240238_D4BC58.s index 9d69d526ad..f2e1e1b340 100644 --- a/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240238_D4BC58.s +++ b/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240238_D4BC58.s @@ -47,13 +47,13 @@ glabel func_80240238_D4BC58 /* D4BD00 802402E0 46141080 */ add.s $f2, $f2, $f20 /* D4BD04 802402E4 00005010 */ mfhi $t2 /* D4BD08 802402E8 C4E4002C */ lwc1 $f4, 0x2c($a3) -/* D4BD0C 802402EC 00000000 */ nop +/* D4BD0C 802402EC 00000000 */ nop /* D4BD10 802402F0 00860018 */ mult $a0, $a2 /* D4BD14 802402F4 00031FC3 */ sra $v1, $v1, 0x1f /* D4BD18 802402F8 44051000 */ mfc1 $a1, $f2 /* D4BD1C 802402FC 01431823 */ subu $v1, $t2, $v1 /* D4BD20 80240300 44831000 */ mtc1 $v1, $f2 -/* D4BD24 80240304 00000000 */ nop +/* D4BD24 80240304 00000000 */ nop /* D4BD28 80240308 468010A0 */ cvt.s.w $f2, $f2 /* D4BD2C 8024030C 46022100 */ add.s $f4, $f4, $f2 /* D4BD30 80240310 26100004 */ addiu $s0, $s0, 4 @@ -66,7 +66,7 @@ glabel func_80240238_D4BC58 /* D4BD4C 8024032C 00021400 */ sll $v0, $v0, 0x10 /* D4BD50 80240330 00021403 */ sra $v0, $v0, 0x10 /* D4BD54 80240334 44821000 */ mtc1 $v0, $f2 -/* D4BD58 80240338 00000000 */ nop +/* D4BD58 80240338 00000000 */ nop /* D4BD5C 8024033C 468010A0 */ cvt.s.w $f2, $f2 /* D4BD60 80240340 46001080 */ add.s $f2, $f2, $f0 /* D4BD64 80240344 C4E00030 */ lwc1 $f0, 0x30($a3) diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240040_92A2F0.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240040_92A2F0.s index c4626053f8..b54745cd99 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240040_92A2F0.s +++ b/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240040_92A2F0.s @@ -37,12 +37,12 @@ glabel func_80240040_92A2F0 /* 92A36C 802400BC 12400007 */ beqz $s2, .L802400DC /* 92A370 802400C0 3412FFFF */ ori $s2, $zero, 0xffff /* 92A374 802400C4 08090053 */ j .L8024014C -/* 92A378 802400C8 00000000 */ nop +/* 92A378 802400C8 00000000 */ nop .L802400CC: /* 92A37C 802400CC 1242001B */ beq $s2, $v0, .L8024013C /* 92A380 802400D0 24020002 */ addiu $v0, $zero, 2 /* 92A384 802400D4 08090053 */ j .L8024014C -/* 92A388 802400D8 00000000 */ nop +/* 92A388 802400D8 00000000 */ nop .L802400DC: /* 92A38C 802400DC 8E040000 */ lw $a0, ($s0) /* 92A390 802400E0 1092001A */ beq $a0, $s2, .L8024014C @@ -56,7 +56,7 @@ glabel func_80240040_92A2F0 /* 92A3B0 80240100 0C046F1F */ jal func_8011BC7C /* 92A3B4 80240104 0220302D */ daddu $a2, $s1, $zero /* 92A3B8 80240108 08090037 */ j .L802400DC -/* 92A3BC 8024010C 00000000 */ nop +/* 92A3BC 8024010C 00000000 */ nop .L80240110: /* 92A3C0 80240110 3412FFFF */ ori $s2, $zero, 0xffff .L80240114: @@ -69,7 +69,7 @@ glabel func_80240040_92A2F0 /* 92A3DC 8024012C 0C046E54 */ jal func_8011B950 /* 92A3E0 80240130 0000382D */ daddu $a3, $zero, $zero /* 92A3E4 80240134 08090045 */ j .L80240114 -/* 92A3E8 80240138 00000000 */ nop +/* 92A3E8 80240138 00000000 */ nop .L8024013C: /* 92A3EC 8024013C 3C028015 */ lui $v0, %hi(D_801512F0) /* 92A3F0 80240140 8C4212F0 */ lw $v0, %lo(D_801512F0)($v0) diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240164_92A414.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240164_92A414.s index 113b72dc4a..5445265745 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240164_92A414.s +++ b/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240164_92A414.s @@ -71,20 +71,20 @@ glabel func_80240164_92A414 /* 92A51C 8024026C 12620008 */ beq $s3, $v0, .L80240290 /* 92A520 80240270 32C400FF */ andi $a0, $s6, 0xff /* 92A524 80240274 080900C1 */ j .L80240304 -/* 92A528 80240278 00000000 */ nop +/* 92A528 80240278 00000000 */ nop .L8024027C: /* 92A52C 8024027C 24020003 */ addiu $v0, $zero, 3 /* 92A530 80240280 12620018 */ beq $s3, $v0, .L802402E4 /* 92A534 80240284 32C400FF */ andi $a0, $s6, 0xff /* 92A538 80240288 080900C1 */ j .L80240304 -/* 92A53C 8024028C 00000000 */ nop +/* 92A53C 8024028C 00000000 */ nop .L80240290: /* 92A540 80240290 32A500FF */ andi $a1, $s5, 0xff /* 92A544 80240294 328600FF */ andi $a2, $s4, 0xff /* 92A548 80240298 0C046F97 */ jal set_background_color_blend /* 92A54C 8024029C 324700FF */ andi $a3, $s2, 0xff /* 92A550 802402A0 080900C1 */ j .L80240304 -/* 92A554 802402A4 00000000 */ nop +/* 92A554 802402A4 00000000 */ nop .L802402A8: /* 92A558 802402A8 32C400FF */ andi $a0, $s6, 0xff /* 92A55C 802402AC 32A500FF */ andi $a1, $s5, 0xff @@ -100,7 +100,7 @@ glabel func_80240164_92A414 /* 92A584 802402D4 0C046FAD */ jal func_8011BEB4 /* 92A588 802402D8 AFA20018 */ sw $v0, 0x18($sp) /* 92A58C 802402DC 080900C1 */ j .L80240304 -/* 92A590 802402E0 00000000 */ nop +/* 92A590 802402E0 00000000 */ nop .L802402E4: /* 92A594 802402E4 32A500FF */ andi $a1, $s5, 0xff /* 92A598 802402E8 328600FF */ andi $a2, $s4, 0xff diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240364_92A614.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240364_92A614.s index a1df45ebc2..e8cf29ac10 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240364_92A614.s +++ b/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240364_92A614.s @@ -72,7 +72,7 @@ glabel func_80240364_92A614 /* 92A71C 8024046C 26315620 */ addiu $s1, $s1, %lo(D_80245620) /* 92A720 80240470 8E2F0000 */ lw $t7, ($s1) /* 92A724 80240474 19E00088 */ blez $t7, .L80240698 -/* 92A728 80240478 00000000 */ nop +/* 92A728 80240478 00000000 */ nop /* 92A72C 8024047C 3C108024 */ lui $s0, %hi(D_80245624) /* 92A730 80240480 26105624 */ addiu $s0, $s0, %lo(D_80245624) /* 92A734 80240484 8E030000 */ lw $v1, ($s0) @@ -84,7 +84,7 @@ glabel func_80240364_92A614 /* 92A74C 8024049C 00441023 */ subu $v0, $v0, $a0 /* 92A750 802404A0 00430018 */ mult $v0, $v1 /* 92A754 802404A4 00004012 */ mflo $t0 -/* 92A758 802404A8 00000000 */ nop +/* 92A758 802404A8 00000000 */ nop /* 92A75C 802404AC 15E00002 */ bnez $t7, .L802404B8 /* 92A760 802404B0 010F001A */ div $zero, $t0, $t7 /* 92A764 802404B4 0007000D */ break 7 @@ -93,7 +93,7 @@ glabel func_80240364_92A614 /* 92A76C 802404BC 15E10004 */ bne $t7, $at, .L802404D0 /* 92A770 802404C0 3C018000 */ lui $at, 0x8000 /* 92A774 802404C4 15010002 */ bne $t0, $at, .L802404D0 -/* 92A778 802404C8 00000000 */ nop +/* 92A778 802404C8 00000000 */ nop /* 92A77C 802404CC 0006000D */ break 6 .L802404D0: /* 92A780 802404D0 00007012 */ mflo $t6 @@ -104,7 +104,7 @@ glabel func_80240364_92A614 /* 92A794 802404E4 00451023 */ subu $v0, $v0, $a1 /* 92A798 802404E8 00430018 */ mult $v0, $v1 /* 92A79C 802404EC 00004012 */ mflo $t0 -/* 92A7A0 802404F0 00000000 */ nop +/* 92A7A0 802404F0 00000000 */ nop /* 92A7A4 802404F4 15E00002 */ bnez $t7, .L80240500 /* 92A7A8 802404F8 010F001A */ div $zero, $t0, $t7 /* 92A7AC 802404FC 0007000D */ break 7 @@ -113,7 +113,7 @@ glabel func_80240364_92A614 /* 92A7B4 80240504 15E10004 */ bne $t7, $at, .L80240518 /* 92A7B8 80240508 3C018000 */ lui $at, 0x8000 /* 92A7BC 8024050C 15010002 */ bne $t0, $at, .L80240518 -/* 92A7C0 80240510 00000000 */ nop +/* 92A7C0 80240510 00000000 */ nop /* 92A7C4 80240514 0006000D */ break 6 .L80240518: /* 92A7C8 80240518 00006812 */ mflo $t5 @@ -124,7 +124,7 @@ glabel func_80240364_92A614 /* 92A7DC 8024052C 00461023 */ subu $v0, $v0, $a2 /* 92A7E0 80240530 00430018 */ mult $v0, $v1 /* 92A7E4 80240534 00004012 */ mflo $t0 -/* 92A7E8 80240538 00000000 */ nop +/* 92A7E8 80240538 00000000 */ nop /* 92A7EC 8024053C 15E00002 */ bnez $t7, .L80240548 /* 92A7F0 80240540 010F001A */ div $zero, $t0, $t7 /* 92A7F4 80240544 0007000D */ break 7 @@ -133,7 +133,7 @@ glabel func_80240364_92A614 /* 92A7FC 8024054C 15E10004 */ bne $t7, $at, .L80240560 /* 92A800 80240550 3C018000 */ lui $at, 0x8000 /* 92A804 80240554 15010002 */ bne $t0, $at, .L80240560 -/* 92A808 80240558 00000000 */ nop +/* 92A808 80240558 00000000 */ nop /* 92A80C 8024055C 0006000D */ break 6 .L80240560: /* 92A810 80240560 00006012 */ mflo $t4 @@ -144,7 +144,7 @@ glabel func_80240364_92A614 /* 92A824 80240574 00471023 */ subu $v0, $v0, $a3 /* 92A828 80240578 00430018 */ mult $v0, $v1 /* 92A82C 8024057C 00004012 */ mflo $t0 -/* 92A830 80240580 00000000 */ nop +/* 92A830 80240580 00000000 */ nop /* 92A834 80240584 15E00002 */ bnez $t7, .L80240590 /* 92A838 80240588 010F001A */ div $zero, $t0, $t7 /* 92A83C 8024058C 0007000D */ break 7 @@ -153,7 +153,7 @@ glabel func_80240364_92A614 /* 92A844 80240594 15E10004 */ bne $t7, $at, .L802405A8 /* 92A848 80240598 3C018000 */ lui $at, 0x8000 /* 92A84C 8024059C 15010002 */ bne $t0, $at, .L802405A8 -/* 92A850 802405A0 00000000 */ nop +/* 92A850 802405A0 00000000 */ nop /* 92A854 802405A4 0006000D */ break 6 .L802405A8: /* 92A858 802405A8 00005812 */ mflo $t3 @@ -164,7 +164,7 @@ glabel func_80240364_92A614 /* 92A86C 802405BC 00491023 */ subu $v0, $v0, $t1 /* 92A870 802405C0 00430018 */ mult $v0, $v1 /* 92A874 802405C4 00004012 */ mflo $t0 -/* 92A878 802405C8 00000000 */ nop +/* 92A878 802405C8 00000000 */ nop /* 92A87C 802405CC 15E00002 */ bnez $t7, .L802405D8 /* 92A880 802405D0 010F001A */ div $zero, $t0, $t7 /* 92A884 802405D4 0007000D */ break 7 @@ -173,7 +173,7 @@ glabel func_80240364_92A614 /* 92A88C 802405DC 15E10004 */ bne $t7, $at, .L802405F0 /* 92A890 802405E0 3C018000 */ lui $at, 0x8000 /* 92A894 802405E4 15010002 */ bne $t0, $at, .L802405F0 -/* 92A898 802405E8 00000000 */ nop +/* 92A898 802405E8 00000000 */ nop /* 92A89C 802405EC 0006000D */ break 6 .L802405F0: /* 92A8A0 802405F0 00005012 */ mflo $t2 @@ -184,7 +184,7 @@ glabel func_80240364_92A614 /* 92A8B4 80240604 00481023 */ subu $v0, $v0, $t0 /* 92A8B8 80240608 00430018 */ mult $v0, $v1 /* 92A8BC 8024060C 0000C812 */ mflo $t9 -/* 92A8C0 80240610 00000000 */ nop +/* 92A8C0 80240610 00000000 */ nop /* 92A8C4 80240614 15E00002 */ bnez $t7, .L80240620 /* 92A8C8 80240618 032F001A */ div $zero, $t9, $t7 /* 92A8CC 8024061C 0007000D */ break 7 @@ -193,7 +193,7 @@ glabel func_80240364_92A614 /* 92A8D4 80240624 15E10004 */ bne $t7, $at, .L80240638 /* 92A8D8 80240628 3C018000 */ lui $at, 0x8000 /* 92A8DC 8024062C 17210002 */ bne $t9, $at, .L80240638 -/* 92A8E0 80240630 00000000 */ nop +/* 92A8E0 80240630 00000000 */ nop /* 92A8E4 80240634 0006000D */ break 6 .L80240638: /* 92A8E8 80240638 00001012 */ mflo $v0 @@ -243,4 +243,4 @@ glabel func_80240364_92A614 /* 92A990 802406E0 8FB00018 */ lw $s0, 0x18($sp) /* 92A994 802406E4 03E00008 */ jr $ra /* 92A998 802406E8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 92A99C 802406EC 00000000 */ nop +/* 92A99C 802406EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_802409A8_92AC58.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_802409A8_92AC58.s index 7003b9ad1a..9d47a33a58 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_802409A8_92AC58.s +++ b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_802409A8_92AC58.s @@ -28,7 +28,7 @@ glabel func_802409A8_92AC58 /* 92ACAC 802409FC 00220821 */ addu $at, $at, $v0 /* 92ACB0 80240A00 AC205630 */ sw $zero, %lo(D_80245630)($at) /* 92ACB4 80240A04 0809028D */ j .L80240A34 -/* 92ACB8 80240A08 00000000 */ nop +/* 92ACB8 80240A08 00000000 */ nop .L80240A0C: /* 92ACBC 80240A0C 3C038024 */ lui $v1, %hi(D_80245630) /* 92ACC0 80240A10 24635630 */ addiu $v1, $v1, %lo(D_80245630) diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240A44_92ACF4.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240A44_92ACF4.s index e8de7b8787..3c00817f06 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240A44_92ACF4.s +++ b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240A44_92ACF4.s @@ -26,7 +26,7 @@ glabel func_80240A44_92ACF4 /* 92AD44 80240A94 1440FFFA */ bnez $v0, .L80240A80 /* 92AD48 80240A98 24A50004 */ addiu $a1, $a1, 4 /* 92AD4C 80240A9C 080902B8 */ j .L80240AE0 -/* 92AD50 80240AA0 00000000 */ nop +/* 92AD50 80240AA0 00000000 */ nop .L80240AA4: /* 92AD54 80240AA4 0000182D */ daddu $v1, $zero, $zero /* 92AD58 80240AA8 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240040_93F5F0.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240040_93F5F0.s index d137a327bd..79132e18f0 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240040_93F5F0.s +++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240040_93F5F0.s @@ -37,12 +37,12 @@ glabel func_80240040_93F5F0 /* 93F66C 802400BC 12400007 */ beqz $s2, .L802400DC /* 93F670 802400C0 3412FFFF */ ori $s2, $zero, 0xffff /* 93F674 802400C4 08090053 */ j .L8024014C -/* 93F678 802400C8 00000000 */ nop +/* 93F678 802400C8 00000000 */ nop .L802400CC: /* 93F67C 802400CC 1242001B */ beq $s2, $v0, .L8024013C /* 93F680 802400D0 24020002 */ addiu $v0, $zero, 2 /* 93F684 802400D4 08090053 */ j .L8024014C -/* 93F688 802400D8 00000000 */ nop +/* 93F688 802400D8 00000000 */ nop .L802400DC: /* 93F68C 802400DC 8E040000 */ lw $a0, ($s0) /* 93F690 802400E0 1092001A */ beq $a0, $s2, .L8024014C @@ -56,7 +56,7 @@ glabel func_80240040_93F5F0 /* 93F6B0 80240100 0C046F1F */ jal func_8011BC7C /* 93F6B4 80240104 0220302D */ daddu $a2, $s1, $zero /* 93F6B8 80240108 08090037 */ j .L802400DC -/* 93F6BC 8024010C 00000000 */ nop +/* 93F6BC 8024010C 00000000 */ nop .L80240110: /* 93F6C0 80240110 3412FFFF */ ori $s2, $zero, 0xffff .L80240114: @@ -69,7 +69,7 @@ glabel func_80240040_93F5F0 /* 93F6DC 8024012C 0C046E54 */ jal func_8011B950 /* 93F6E0 80240130 0000382D */ daddu $a3, $zero, $zero /* 93F6E4 80240134 08090045 */ j .L80240114 -/* 93F6E8 80240138 00000000 */ nop +/* 93F6E8 80240138 00000000 */ nop .L8024013C: /* 93F6EC 8024013C 3C028015 */ lui $v0, %hi(D_801512F0) /* 93F6F0 80240140 8C4212F0 */ lw $v0, %lo(D_801512F0)($v0) diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240164_93F714.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240164_93F714.s index bf7a421977..6dc627f9eb 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240164_93F714.s +++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240164_93F714.s @@ -71,20 +71,20 @@ glabel func_80240164_93F714 /* 93F81C 8024026C 12620008 */ beq $s3, $v0, .L80240290 /* 93F820 80240270 32C400FF */ andi $a0, $s6, 0xff /* 93F824 80240274 080900C1 */ j .L80240304 -/* 93F828 80240278 00000000 */ nop +/* 93F828 80240278 00000000 */ nop .L8024027C: /* 93F82C 8024027C 24020003 */ addiu $v0, $zero, 3 /* 93F830 80240280 12620018 */ beq $s3, $v0, .L802402E4 /* 93F834 80240284 32C400FF */ andi $a0, $s6, 0xff /* 93F838 80240288 080900C1 */ j .L80240304 -/* 93F83C 8024028C 00000000 */ nop +/* 93F83C 8024028C 00000000 */ nop .L80240290: /* 93F840 80240290 32A500FF */ andi $a1, $s5, 0xff /* 93F844 80240294 328600FF */ andi $a2, $s4, 0xff /* 93F848 80240298 0C046F97 */ jal set_background_color_blend /* 93F84C 8024029C 324700FF */ andi $a3, $s2, 0xff /* 93F850 802402A0 080900C1 */ j .L80240304 -/* 93F854 802402A4 00000000 */ nop +/* 93F854 802402A4 00000000 */ nop .L802402A8: /* 93F858 802402A8 32C400FF */ andi $a0, $s6, 0xff /* 93F85C 802402AC 32A500FF */ andi $a1, $s5, 0xff @@ -100,7 +100,7 @@ glabel func_80240164_93F714 /* 93F884 802402D4 0C046FAD */ jal func_8011BEB4 /* 93F888 802402D8 AFA20018 */ sw $v0, 0x18($sp) /* 93F88C 802402DC 080900C1 */ j .L80240304 -/* 93F890 802402E0 00000000 */ nop +/* 93F890 802402E0 00000000 */ nop .L802402E4: /* 93F894 802402E4 32A500FF */ andi $a1, $s5, 0xff /* 93F898 802402E8 328600FF */ andi $a2, $s4, 0xff diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240370_93F920.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240370_93F920.s index 90fe3cb1bd..f0dd290416 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240370_93F920.s +++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240370_93F920.s @@ -22,7 +22,7 @@ glabel func_80240370_93F920 /* 93F964 802403B4 3C030010 */ lui $v1, 0x10 /* 93F968 802403B8 00431024 */ and $v0, $v0, $v1 /* 93F96C 802403BC 10400004 */ beqz $v0, .L802403D0 -/* 93F970 802403C0 00000000 */ nop +/* 93F970 802403C0 00000000 */ nop /* 93F974 802403C4 C620006C */ lwc1 $f0, 0x6c($s1) /* 93F978 802403C8 46800020 */ cvt.s.w $f0, $f0 /* 93F97C 802403CC E480000C */ swc1 $f0, 0xc($a0) @@ -30,7 +30,7 @@ glabel func_80240370_93F920 /* 93F980 802403D0 8E2200D0 */ lw $v0, 0xd0($s1) /* 93F984 802403D4 8C420014 */ lw $v0, 0x14($v0) /* 93F988 802403D8 1C400004 */ bgtz $v0, .L802403EC -/* 93F98C 802403DC 00000000 */ nop +/* 93F98C 802403DC 00000000 */ nop /* 93F990 802403E0 C640000C */ lwc1 $f0, 0xc($s2) /* 93F994 802403E4 08090103 */ j .L8024040C /* 93F998 802403E8 E4800018 */ swc1 $f0, 0x18($a0) @@ -38,7 +38,7 @@ glabel func_80240370_93F920 /* 93F99C 802403EC 3C018024 */ lui $at, %hi(func_802448A0_805120) /* 93F9A0 802403F0 D42248A0 */ ldc1 $f2, %lo(func_802448A0_805120)($at) /* 93F9A4 802403F4 44820000 */ mtc1 $v0, $f0 -/* 93F9A8 802403F8 00000000 */ nop +/* 93F9A8 802403F8 00000000 */ nop /* 93F9AC 802403FC 46800021 */ cvt.d.w $f0, $f0 /* 93F9B0 80240400 46220003 */ div.d $f0, $f0, $f2 /* 93F9B4 80240404 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240424_93F9D4.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240424_93F9D4.s index ad1de167a7..a44c47cb5c 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240424_93F9D4.s +++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240424_93F9D4.s @@ -38,7 +38,7 @@ glabel func_80240424_93F9D4 /* 93FA58 802404A8 2402000F */ addiu $v0, $zero, 0xf /* 93FA5C 802404AC AFA2001C */ sw $v0, 0x1c($sp) /* 93FA60 802404B0 44833000 */ mtc1 $v1, $f6 -/* 93FA64 802404B4 00000000 */ nop +/* 93FA64 802404B4 00000000 */ nop /* 93FA68 802404B8 468031A0 */ cvt.s.w $f6, $f6 /* 93FA6C 802404BC 44073000 */ mfc1 $a3, $f6 /* 93FA70 802404C0 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_8024061C_93FBCC.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_8024061C_93FBCC.s index 48de71fe96..5b2bae419a 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_8024061C_93FBCC.s +++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_8024061C_93FBCC.s @@ -47,20 +47,20 @@ glabel func_8024061C_93FBCC /* 93FC74 802406C4 8E020010 */ lw $v0, 0x10($s0) /* 93FC78 802406C8 46001005 */ abs.s $f0, $f2 /* 93FC7C 802406CC 44822000 */ mtc1 $v0, $f4 -/* 93FC80 802406D0 00000000 */ nop +/* 93FC80 802406D0 00000000 */ nop /* 93FC84 802406D4 46802120 */ cvt.s.w $f4, $f4 /* 93FC88 802406D8 4600203C */ c.lt.s $f4, $f0 -/* 93FC8C 802406DC 00000000 */ nop +/* 93FC8C 802406DC 00000000 */ nop /* 93FC90 802406E0 4500000D */ bc1f .L80240718 -/* 93FC94 802406E4 00000000 */ nop +/* 93FC94 802406E4 00000000 */ nop /* 93FC98 802406E8 44800000 */ mtc1 $zero, $f0 /* 93FC9C 802406EC C654000C */ lwc1 $f20, 0xc($s2) /* 93FCA0 802406F0 4600103C */ c.lt.s $f2, $f0 -/* 93FCA4 802406F4 00000000 */ nop +/* 93FCA4 802406F4 00000000 */ nop /* 93FCA8 802406F8 45000006 */ bc1f .L80240714 /* 93FCAC 802406FC 00021023 */ negu $v0, $v0 /* 93FCB0 80240700 44820000 */ mtc1 $v0, $f0 -/* 93FCB4 80240704 00000000 */ nop +/* 93FCB4 80240704 00000000 */ nop /* 93FCB8 80240708 46800020 */ cvt.s.w $f0, $f0 /* 93FCBC 8024070C 080901C6 */ j .L80240718 /* 93FCC0 80240710 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802408B0_93FE60.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802408B0_93FE60.s index 0cee1449f0..ff84983bc4 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802408B0_93FE60.s +++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802408B0_93FE60.s @@ -19,20 +19,20 @@ glabel func_802408B0_93FE60 /* 93FE98 802408E8 8E0200D0 */ lw $v0, 0xd0($s0) /* 93FE9C 802408EC 8C420014 */ lw $v0, 0x14($v0) /* 93FEA0 802408F0 04410009 */ bgez $v0, .L80240918 -/* 93FEA4 802408F4 00000000 */ nop +/* 93FEA4 802408F4 00000000 */ nop /* 93FEA8 802408F8 C640000C */ lwc1 $f0, 0xc($s2) /* 93FEAC 802408FC 3C018024 */ lui $at, %hi(D_802448A8) /* 93FEB0 80240900 D42248A8 */ ldc1 $f2, %lo(D_802448A8)($at) /* 93FEB4 80240904 46000021 */ cvt.d.s $f0, $f0 /* 93FEB8 80240908 46220002 */ mul.d $f0, $f0, $f2 -/* 93FEBC 8024090C 00000000 */ nop +/* 93FEBC 8024090C 00000000 */ nop /* 93FEC0 80240910 0809024D */ j .L80240934 /* 93FEC4 80240914 46200020 */ cvt.s.d $f0, $f0 .L80240918: /* 93FEC8 80240918 3C018024 */ lui $at, %hi(D_802448B0) /* 93FECC 8024091C D42248B0 */ ldc1 $f2, %lo(D_802448B0)($at) /* 93FED0 80240920 44820000 */ mtc1 $v0, $f0 -/* 93FED4 80240924 00000000 */ nop +/* 93FED4 80240924 00000000 */ nop /* 93FED8 80240928 46800021 */ cvt.d.w $f0, $f0 /* 93FEDC 8024092C 46220003 */ div.d $f0, $f0, $f2 /* 93FEE0 80240930 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_8024095C_93FF0C.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_8024095C_93FF0C.s index b5292ec218..413bf7fc77 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_8024095C_93FF0C.s +++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_8024095C_93FF0C.s @@ -42,7 +42,7 @@ glabel func_8024095C_93FF0C /* 93FFA0 802409F0 2402000F */ addiu $v0, $zero, 0xf /* 93FFA4 802409F4 AFA2001C */ sw $v0, 0x1c($sp) /* 93FFA8 802409F8 44833000 */ mtc1 $v1, $f6 -/* 93FFAC 802409FC 00000000 */ nop +/* 93FFAC 802409FC 00000000 */ nop /* 93FFB0 80240A00 468031A0 */ cvt.s.w $f6, $f6 /* 93FFB4 80240A04 44073000 */ mfc1 $a3, $f6 /* 93FFB8 80240A08 27A20028 */ addiu $v0, $sp, 0x28 @@ -90,12 +90,12 @@ glabel func_8024095C_93FF0C /* 940050 80240AA0 468031A0 */ cvt.s.w $f6, $f6 /* 940054 80240AA4 44073000 */ mfc1 $a3, $f6 /* 940058 80240AA8 0C00A7B5 */ jal dist2D -/* 94005C 80240AAC 00000000 */ nop +/* 94005C 80240AAC 00000000 */ nop /* 940060 80240AB0 C6020018 */ lwc1 $f2, 0x18($s0) /* 940064 80240AB4 4602003C */ c.lt.s $f0, $f2 -/* 940068 80240AB8 00000000 */ nop +/* 940068 80240AB8 00000000 */ nop /* 94006C 80240ABC 4500000E */ bc1f .L80240AF8 -/* 940070 80240AC0 00000000 */ nop +/* 940070 80240AC0 00000000 */ nop /* 940074 80240AC4 8E2200D0 */ lw $v0, 0xd0($s1) /* 940078 80240AC8 C4400000 */ lwc1 $f0, ($v0) /* 94007C 80240ACC 46800020 */ cvt.s.w $f0, $f0 @@ -112,7 +112,7 @@ glabel func_8024095C_93FF0C .L80240AF8: /* 9400A8 80240AF8 8602008C */ lh $v0, 0x8c($s0) /* 9400AC 80240AFC 14400011 */ bnez $v0, .L80240B44 -/* 9400B0 80240B00 00000000 */ nop +/* 9400B0 80240B00 00000000 */ nop /* 9400B4 80240B04 C60C0038 */ lwc1 $f12, 0x38($s0) /* 9400B8 80240B08 8E2200D0 */ lw $v0, 0xd0($s1) /* 9400BC 80240B0C C60E0040 */ lwc1 $f14, 0x40($s0) @@ -123,7 +123,7 @@ glabel func_8024095C_93FF0C /* 9400D0 80240B20 468031A0 */ cvt.s.w $f6, $f6 /* 9400D4 80240B24 44073000 */ mfc1 $a3, $f6 /* 9400D8 80240B28 0C00A720 */ jal atan2 -/* 9400DC 80240B2C 00000000 */ nop +/* 9400DC 80240B2C 00000000 */ nop /* 9400E0 80240B30 8E050018 */ lw $a1, 0x18($s0) /* 9400E4 80240B34 44060000 */ mfc1 $a2, $f0 /* 9400E8 80240B38 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s index f516102c51..0ddd9af4ba 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s +++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s @@ -46,7 +46,7 @@ glabel func_80240B64_940114 /* 9401B8 80240C08 8E4200B0 */ lw $v0, 0xb0($s2) /* 9401BC 80240C0C 30420004 */ andi $v0, $v0, 4 /* 9401C0 80240C10 1040002F */ beqz $v0, .L80240CD0 -/* 9401C4 80240C14 00000000 */ nop +/* 9401C4 80240C14 00000000 */ nop .L80240C18: /* 9401C8 80240C18 AE800070 */ sw $zero, 0x70($s4) /* 9401CC 80240C1C C600000C */ lwc1 $f0, 0xc($s0) @@ -102,60 +102,71 @@ glabel func_80240B64_940114 /* 940284 80240CD4 2C620064 */ sltiu $v0, $v1, 0x64 /* 940288 80240CD8 10400036 */ beqz $v0, .L80240DB4 /* 94028C 80240CDC 00031080 */ sll $v0, $v1, 2 -/* 940290 80240CE0 3C018024 */ lui $at, %hi(D_802448B8) +/* 940290 80240CE0 3C018024 */ lui $at, %hi(jtbl_802448B8_943E68) /* 940294 80240CE4 00220821 */ addu $at, $at, $v0 -/* 940298 80240CE8 8C2248B8 */ lw $v0, %lo(D_802448B8)($at) +/* 940298 80240CE8 8C2248B8 */ lw $v0, %lo(jtbl_802448B8_943E68)($at) /* 94029C 80240CEC 00400008 */ jr $v0 -/* 9402A0 80240CF0 00000000 */ nop +/* 9402A0 80240CF0 00000000 */ nop +glabel L80240CF4_9402A4 /* 9402A4 80240CF4 0280202D */ daddu $a0, $s4, $zero /* 9402A8 80240CF8 0260282D */ daddu $a1, $s3, $zero /* 9402AC 80240CFC 0C0900DC */ jal func_80240370_93F920 /* 9402B0 80240D00 02A0302D */ daddu $a2, $s5, $zero +glabel L80240D04_9402B4 /* 9402B4 80240D04 0280202D */ daddu $a0, $s4, $zero /* 9402B8 80240D08 0260282D */ daddu $a1, $s3, $zero /* 9402BC 80240D0C 0C090109 */ jal func_80240424_93F9D4 /* 9402C0 80240D10 02A0302D */ daddu $a2, $s5, $zero /* 9402C4 80240D14 0809036D */ j .L80240DB4 -/* 9402C8 80240D18 00000000 */ nop +/* 9402C8 80240D18 00000000 */ nop +glabel L80240D1C_9402CC /* 9402CC 80240D1C 0280202D */ daddu $a0, $s4, $zero /* 9402D0 80240D20 0260282D */ daddu $a1, $s3, $zero /* 9402D4 80240D24 0C090151 */ jal sbk_30_NpcJumpFunc3 /* 9402D8 80240D28 02A0302D */ daddu $a2, $s5, $zero +glabel L80240D2C_9402DC /* 9402DC 80240D2C 0280202D */ daddu $a0, $s4, $zero /* 9402E0 80240D30 0260282D */ daddu $a1, $s3, $zero /* 9402E4 80240D34 0C090169 */ jal sbk_30_NpcJumpFunc /* 9402E8 80240D38 02A0302D */ daddu $a2, $s5, $zero /* 9402EC 80240D3C 0809036D */ j .L80240DB4 -/* 9402F0 80240D40 00000000 */ nop +/* 9402F0 80240D40 00000000 */ nop +glabel L80240D44_9402F4 /* 9402F4 80240D44 0280202D */ daddu $a0, $s4, $zero /* 9402F8 80240D48 0260282D */ daddu $a1, $s3, $zero /* 9402FC 80240D4C 0C090187 */ jal func_8024061C_93FBCC /* 940300 80240D50 02A0302D */ daddu $a2, $s5, $zero +glabel L80240D54_940304 /* 940304 80240D54 0280202D */ daddu $a0, $s4, $zero /* 940308 80240D58 0260282D */ daddu $a1, $s3, $zero /* 94030C 80240D5C 0C0901D3 */ jal sbk_30_UnkNpcAIFunc11 /* 940310 80240D60 02A0302D */ daddu $a2, $s5, $zero /* 940314 80240D64 0809036D */ j .L80240DB4 -/* 940318 80240D68 00000000 */ nop +/* 940318 80240D68 00000000 */ nop +glabel L80240D6C_94031C /* 94031C 80240D6C 0280202D */ daddu $a0, $s4, $zero /* 940320 80240D70 0260282D */ daddu $a1, $s3, $zero /* 940324 80240D74 0C09021A */ jal sbk_30_UnkNpcAIFunc10 /* 940328 80240D78 02A0302D */ daddu $a2, $s5, $zero /* 94032C 80240D7C 0809036D */ j .L80240DB4 -/* 940330 80240D80 00000000 */ nop +/* 940330 80240D80 00000000 */ nop +glabel L80240D84_940334 /* 940334 80240D84 0280202D */ daddu $a0, $s4, $zero /* 940338 80240D88 0260282D */ daddu $a1, $s3, $zero /* 94033C 80240D8C 0C09022C */ jal func_802408B0_93FE60 /* 940340 80240D90 02A0302D */ daddu $a2, $s5, $zero +glabel L80240D94_940344 /* 940344 80240D94 0280202D */ daddu $a0, $s4, $zero /* 940348 80240D98 0260282D */ daddu $a1, $s3, $zero /* 94034C 80240D9C 0C090257 */ jal func_8024095C_93FF0C /* 940350 80240DA0 02A0302D */ daddu $a2, $s5, $zero /* 940354 80240DA4 0809036D */ j .L80240DB4 -/* 940358 80240DA8 00000000 */ nop +/* 940358 80240DA8 00000000 */ nop +glabel L80240DAC_94035C /* 94035C 80240DAC 0C0129CF */ jal func_8004A73C /* 940360 80240DB0 0280202D */ daddu $a0, $s4, $zero .L80240DB4: +glabel L80240DB4_940364 /* 940364 80240DB4 8FBF0048 */ lw $ra, 0x48($sp) /* 940368 80240DB8 8FB50044 */ lw $s5, 0x44($sp) /* 94036C 80240DBC 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240DDC_94038C.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240DDC_94038C.s index 81ba434c98..bc873d4a61 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240DDC_94038C.s +++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240DDC_94038C.s @@ -26,7 +26,7 @@ glabel func_80240DDC_94038C /* 9403DC 80240E2C 1440FFFA */ bnez $v0, .L80240E18 /* 9403E0 80240E30 24A50004 */ addiu $a1, $a1, 4 /* 9403E4 80240E34 0809039E */ j .L80240E78 -/* 9403E8 80240E38 00000000 */ nop +/* 9403E8 80240E38 00000000 */ nop .L80240E3C: /* 9403EC 80240E3C 0000182D */ daddu $v1, $zero, $zero /* 9403F0 80240E40 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802411AC_94075C.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802411AC_94075C.s index 59cd7d5fdd..9bb355b5f9 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802411AC_94075C.s +++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802411AC_94075C.s @@ -28,7 +28,7 @@ glabel func_802411AC_94075C /* 9407B0 80241200 00220821 */ addu $at, $at, $v0 /* 9407B4 80241204 AC204A50 */ sw $zero, %lo(end_battle)($at) /* 9407B8 80241208 0809048E */ j .L80241238 -/* 9407BC 8024120C 00000000 */ nop +/* 9407BC 8024120C 00000000 */ nop .L80241210: /* 9407C0 80241210 3C038024 */ lui $v1, %hi(end_battle) /* 9407C4 80241214 24634A50 */ addiu $v1, $v1, %lo(end_battle) diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241248_9407F8.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241248_9407F8.s index fc2b93a385..2abe42f305 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241248_9407F8.s +++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241248_9407F8.s @@ -28,7 +28,7 @@ glabel func_80241248_9407F8 /* 94084C 8024129C 00220821 */ addu $at, $at, $v0 /* 940850 802412A0 AC204C18 */ sw $zero, %lo(D_80244C18)($at) /* 940854 802412A4 080904B5 */ j .L802412D4 -/* 940858 802412A8 00000000 */ nop +/* 940858 802412A8 00000000 */ nop .L802412AC: /* 94085C 802412AC 3C038024 */ lui $v1, %hi(D_80244C18) /* 940860 802412B0 24634C18 */ addiu $v1, $v1, %lo(D_80244C18) diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240040_945F10.s b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240040_945F10.s index 67b0d9eee3..84c0ee72be 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240040_945F10.s +++ b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240040_945F10.s @@ -26,7 +26,7 @@ glabel func_80240040_945F10 /* 945F60 80240090 1440FFFA */ bnez $v0, .L8024007C /* 945F64 80240094 24A50004 */ addiu $a1, $a1, 4 /* 945F68 80240098 08090037 */ j .L802400DC -/* 945F6C 8024009C 00000000 */ nop +/* 945F6C 8024009C 00000000 */ nop .L802400A0: /* 945F70 802400A0 0000182D */ daddu $v1, $zero, $zero /* 945F74 802400A4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240410_9462E0.s b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240410_9462E0.s index 4d24628ecb..5148f94887 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240410_9462E0.s +++ b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240410_9462E0.s @@ -28,7 +28,7 @@ glabel func_80240410_9462E0 /* 946334 80240464 00220821 */ addu $at, $at, $v0 /* 946338 80240468 AC2027E0 */ sw $zero, %lo(D_802427E0)($at) /* 94633C 8024046C 08090127 */ j .L8024049C -/* 946340 80240470 00000000 */ nop +/* 946340 80240470 00000000 */ nop .L80240474: /* 946344 80240474 3C038024 */ lui $v1, %hi(D_802427E0) /* 946348 80240478 246327E0 */ addiu $v1, $v1, %lo(D_802427E0) diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_8024076C_94663C.s b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_8024076C_94663C.s index 083196709c..40c4590f88 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_8024076C_94663C.s +++ b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_8024076C_94663C.s @@ -13,5 +13,5 @@ glabel func_8024076C_94663C /* 94665C 8024078C 24020002 */ addiu $v0, $zero, 2 /* 946660 80240790 03E00008 */ jr $ra /* 946664 80240794 27BD0018 */ addiu $sp, $sp, 0x18 -/* 946668 80240798 00000000 */ nop -/* 94666C 8024079C 00000000 */ nop +/* 946668 80240798 00000000 */ nop +/* 94666C 8024079C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240154_954114.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240154_954114.s index 16a014dbd8..45b45df988 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240154_954114.s +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240154_954114.s @@ -8,7 +8,7 @@ glabel func_80240154_954114 /* 954120 80240160 00822021 */ addu $a0, $a0, $v0 /* 954124 80240164 90820014 */ lbu $v0, 0x14($a0) /* 954128 80240168 10400009 */ beqz $v0, .L80240190 -/* 95412C 8024016C 00000000 */ nop +/* 95412C 8024016C 00000000 */ nop /* 954130 80240170 90820015 */ lbu $v0, 0x15($a0) /* 954134 80240174 00022600 */ sll $a0, $v0, 0x18 /* 954138 80240178 00041E03 */ sra $v1, $a0, 0x18 @@ -16,7 +16,7 @@ glabel func_80240154_954114 /* 954140 80240180 00021403 */ sra $v0, $v0, 0x10 /* 954144 80240184 0043102A */ slt $v0, $v0, $v1 /* 954148 80240188 10400003 */ beqz $v0, .L80240198 -/* 95414C 8024018C 00000000 */ nop +/* 95414C 8024018C 00000000 */ nop .L80240190: /* 954150 80240190 03E00008 */ jr $ra /* 954154 80240194 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s index 186bc07488..d8fac9860a 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s @@ -108,20 +108,20 @@ glabel func_8024024C_95420C /* 954394 802403D4 10400009 */ beqz $v0, .L802403FC /* 954398 802403D8 AEA20074 */ sw $v0, 0x74($s5) /* 95439C 802403DC 0C03C4EC */ jal func_800F13B0 -/* 9543A0 802403E0 00000000 */ nop +/* 9543A0 802403E0 00000000 */ nop /* 9543A4 802403E4 8EA20070 */ lw $v0, 0x70($s5) /* 9543A8 802403E8 24420001 */ addiu $v0, $v0, 1 .L802403EC: /* 9543AC 802403EC AEA20070 */ sw $v0, 0x70($s5) /* 9543B0 802403F0 2842000F */ slti $v0, $v0, 0xf /* 9543B4 802403F4 10400003 */ beqz $v0, .L80240404 -/* 9543B8 802403F8 00000000 */ nop +/* 9543B8 802403F8 00000000 */ nop .L802403FC: /* 9543BC 802403FC 0809011B */ j .L8024046C /* 9543C0 80240400 0000102D */ daddu $v0, $zero, $zero .L80240404: /* 9543C4 80240404 0C03C54E */ jal func_800F1538 -/* 9543C8 80240408 00000000 */ nop +/* 9543C8 80240408 00000000 */ nop /* 9543CC 8024040C 8EA30074 */ lw $v1, 0x74($s5) /* 9543D0 80240410 240200FF */ addiu $v0, $zero, 0xff /* 9543D4 80240414 10620010 */ beq $v1, $v0, .L80240458 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240680_954640.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240680_954640.s index 685ce2022f..5e585218b1 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240680_954640.s +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240680_954640.s @@ -36,7 +36,7 @@ glabel func_80240680_954640 /* 9546BC 802406FC 0C00A88D */ jal sin_cos_deg /* 9546C0 80240700 0040A82D */ daddu $s5, $v0, $zero /* 9546C4 80240704 1200005D */ beqz $s0, .L8024087C -/* 9546C8 80240708 00000000 */ nop +/* 9546C8 80240708 00000000 */ nop /* 9546CC 8024070C 0C00AB0A */ jal general_heap_malloc /* 9546D0 80240710 24040068 */ addiu $a0, $zero, 0x68 /* 9546D4 80240714 0040902D */ daddu $s2, $v0, $zero @@ -98,10 +98,10 @@ glabel func_80240680_954640 /* 9547AC 802407EC C7A2001C */ lwc1 $f2, 0x1c($sp) /* 9547B0 802407F0 C7A40020 */ lwc1 $f4, 0x20($sp) /* 9547B4 802407F4 46041082 */ mul.s $f2, $f2, $f4 -/* 9547B8 802407F8 00000000 */ nop +/* 9547B8 802407F8 00000000 */ nop /* 9547BC 802407FC C7A00018 */ lwc1 $f0, 0x18($sp) /* 9547C0 80240800 46040002 */ mul.s $f0, $f0, $f4 -/* 9547C4 80240804 00000000 */ nop +/* 9547C4 80240804 00000000 */ nop /* 9547C8 80240808 E6020038 */ swc1 $f2, 0x38($s0) /* 9547CC 8024080C E6000050 */ swc1 $f0, 0x50($s0) /* 9547D0 80240810 8E42005C */ lw $v0, 0x5c($s2) @@ -142,12 +142,12 @@ glabel func_80240680_954640 /* 954858 80240898 10600007 */ beqz $v1, .L802408B8 /* 95485C 8024089C 24040005 */ addiu $a0, $zero, 5 /* 954860 802408A0 08090294 */ j .L80240A50 -/* 954864 802408A4 00000000 */ nop +/* 954864 802408A4 00000000 */ nop .L802408A8: /* 954868 802408A8 10620058 */ beq $v1, $v0, .L80240A0C -/* 95486C 802408AC 00000000 */ nop +/* 95486C 802408AC 00000000 */ nop /* 954870 802408B0 08090294 */ j .L80240A50 -/* 954874 802408B4 00000000 */ nop +/* 954874 802408B4 00000000 */ nop .L802408B8: /* 954878 802408B8 0000882D */ daddu $s1, $zero, $zero /* 95487C 802408BC 3C148024 */ lui $s4, %hi(D_80241488) @@ -174,11 +174,11 @@ glabel func_80240680_954640 /* 9548CC 8024090C C7A4001C */ lwc1 $f4, 0x1c($sp) /* 9548D0 80240910 C7A00020 */ lwc1 $f0, 0x20($sp) /* 9548D4 80240914 46002102 */ mul.s $f4, $f4, $f0 -/* 9548D8 80240918 00000000 */ nop +/* 9548D8 80240918 00000000 */ nop /* 9548DC 8024091C C7A20018 */ lwc1 $f2, 0x18($sp) /* 9548E0 80240920 26940004 */ addiu $s4, $s4, 4 /* 9548E4 80240924 46001082 */ mul.s $f2, $f2, $f0 -/* 9548E8 80240928 00000000 */ nop +/* 9548E8 80240928 00000000 */ nop /* 9548EC 8024092C 26730004 */ addiu $s3, $s3, 4 /* 9548F0 80240930 26310001 */ addiu $s1, $s1, 1 /* 9548F4 80240934 2A220003 */ slti $v0, $s1, 3 @@ -215,11 +215,11 @@ glabel func_80240680_954640 /* 954968 802409A8 C7A4001C */ lwc1 $f4, 0x1c($sp) /* 95496C 802409AC C7A00020 */ lwc1 $f0, 0x20($sp) /* 954970 802409B0 46002102 */ mul.s $f4, $f4, $f0 -/* 954974 802409B4 00000000 */ nop +/* 954974 802409B4 00000000 */ nop /* 954978 802409B8 C7A20018 */ lwc1 $f2, 0x18($sp) /* 95497C 802409BC 26940004 */ addiu $s4, $s4, 4 /* 954980 802409C0 46001082 */ mul.s $f2, $f2, $f0 -/* 954984 802409C4 00000000 */ nop +/* 954984 802409C4 00000000 */ nop /* 954988 802409C8 26730004 */ addiu $s3, $s3, 4 /* 95498C 802409CC 26310001 */ addiu $s1, $s1, 1 /* 954990 802409D0 2A220003 */ slti $v0, $s1, 3 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240BB8_954B78.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240BB8_954B78.s index 0838212cfc..cccec80766 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240BB8_954B78.s +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240BB8_954B78.s @@ -36,16 +36,16 @@ glabel func_80240BB8_954B78 /* 954BF0 80240C30 10600007 */ beqz $v1, .L80240C50 /* 954BF4 80240C34 240500FF */ addiu $a1, $zero, 0xff /* 954BF8 80240C38 08090332 */ j .L80240CC8 -/* 954BFC 80240C3C 00000000 */ nop +/* 954BFC 80240C3C 00000000 */ nop .L80240C40: /* 954C00 80240C40 10620019 */ beq $v1, $v0, .L80240CA8 -/* 954C04 80240C44 00000000 */ nop +/* 954C04 80240C44 00000000 */ nop /* 954C08 80240C48 08090332 */ j .L80240CC8 -/* 954C0C 80240C4C 00000000 */ nop +/* 954C0C 80240C4C 00000000 */ nop .L80240C50: /* 954C10 80240C50 8E220074 */ lw $v0, 0x74($s1) /* 954C14 80240C54 14450004 */ bne $v0, $a1, .L80240C68 -/* 954C18 80240C58 00000000 */ nop +/* 954C18 80240C58 00000000 */ nop /* 954C1C 80240C5C AE240070 */ sw $a0, 0x70($s1) /* 954C20 80240C60 AE200078 */ sw $zero, 0x78($s1) /* 954C24 80240C64 8E220074 */ lw $v0, 0x74($s1) @@ -57,7 +57,7 @@ glabel func_80240BB8_954B78 /* 954C38 80240C78 50400013 */ beql $v0, $zero, .L80240CC8 /* 954C3C 80240C7C AE250074 */ sw $a1, 0x74($s1) /* 954C40 80240C80 08090332 */ j .L80240CC8 -/* 954C44 80240C84 00000000 */ nop +/* 954C44 80240C84 00000000 */ nop .L80240C88: /* 954C48 80240C88 8E220078 */ lw $v0, 0x78($s1) /* 954C4C 80240C8C 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240D88_954D48.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240D88_954D48.s index bbf6e450b4..ab112a1ea8 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240D88_954D48.s +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240D88_954D48.s @@ -15,5 +15,5 @@ glabel func_80240D88_954D48 .L80240DB0: /* 954D70 80240DB0 03E00008 */ jr $ra /* 954D74 80240DB4 24020002 */ addiu $v0, $zero, 2 -/* 954D78 80240DB8 00000000 */ nop -/* 954D7C 80240DBC 00000000 */ nop +/* 954D78 80240DB8 00000000 */ nop +/* 954D7C 80240DBC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240340_8697F0.s b/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240340_8697F0.s index e4bfb06fbe..adf516b74f 100644 --- a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240340_8697F0.s +++ b/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240340_8697F0.s @@ -22,16 +22,16 @@ glabel func_80240340_8697F0 /* 869830 80240380 00021023 */ negu $v0, $v0 .L80240384: /* 869834 80240384 14400003 */ bnez $v0, .L80240394 -/* 869838 80240388 00000000 */ nop +/* 869838 80240388 00000000 */ nop /* 86983C 8024038C 50E00017 */ beql $a3, $zero, .L802403EC /* 869840 80240390 0000102D */ daddu $v0, $zero, $zero .L80240394: /* 869844 80240394 44822000 */ mtc1 $v0, $f4 -/* 869848 80240398 00000000 */ nop +/* 869848 80240398 00000000 */ nop /* 86984C 8024039C 46802120 */ cvt.s.w $f4, $f4 /* 869850 802403A0 44062000 */ mfc1 $a2, $f4 /* 869854 802403A4 44872000 */ mtc1 $a3, $f4 -/* 869858 802403A8 00000000 */ nop +/* 869858 802403A8 00000000 */ nop /* 86985C 802403AC 46802120 */ cvt.s.w $f4, $f4 /* 869860 802403B0 44806000 */ mtc1 $zero, $f12 /* 869864 802403B4 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240340_8697F0 /* 86986C 802403BC 46006386 */ mov.s $f14, $f12 /* 869870 802403C0 3C014270 */ lui $at, 0x4270 /* 869874 802403C4 44811000 */ mtc1 $at, $f2 -/* 869878 802403C8 00000000 */ nop +/* 869878 802403C8 00000000 */ nop /* 86987C 802403CC 4602003C */ c.lt.s $f0, $f2 -/* 869880 802403D0 00000000 */ nop +/* 869880 802403D0 00000000 */ nop /* 869884 802403D4 45000004 */ bc1f .L802403E8 /* 869888 802403D8 24020001 */ addiu $v0, $zero, 1 /* 86988C 802403DC AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_tik/tik_01/869AA0/func_802405F0_869AA0.s b/asm/nonmatchings/world/area_tik/tik_01/869AA0/func_802405F0_869AA0.s index 569e8bb93d..0e59aa19b4 100644 --- a/asm/nonmatchings/world/area_tik/tik_01/869AA0/func_802405F0_869AA0.s +++ b/asm/nonmatchings/world/area_tik/tik_01/869AA0/func_802405F0_869AA0.s @@ -32,58 +32,58 @@ glabel func_802405F0_869AA0 /* 869B0C 8024065C C6400098 */ lwc1 $f0, 0x98($s2) /* 869B10 80240660 46001081 */ sub.s $f2, $f2, $f0 /* 869B14 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 869B18 80240668 00000000 */ nop +/* 869B18 80240668 00000000 */ nop /* 869B1C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) /* 869B20 80240670 C4620030 */ lwc1 $f2, 0x30($v1) /* 869B24 80240674 46001081 */ sub.s $f2, $f2, $f0 /* 869B28 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 869B2C 8024067C 00000000 */ nop +/* 869B2C 8024067C 00000000 */ nop /* 869B30 80240680 846200B0 */ lh $v0, 0xb0($v1) /* 869B34 80240684 C462002C */ lwc1 $f2, 0x2c($v1) /* 869B38 80240688 44820000 */ mtc1 $v0, $f0 -/* 869B3C 8024068C 00000000 */ nop +/* 869B3C 8024068C 00000000 */ nop /* 869B40 80240690 46800020 */ cvt.s.w $f0, $f0 /* 869B44 80240694 46001080 */ add.s $f2, $f2, $f0 /* 869B48 80240698 3C013FC0 */ lui $at, 0x3fc0 /* 869B4C 8024069C 44810000 */ mtc1 $at, $f0 -/* 869B50 802406A0 00000000 */ nop +/* 869B50 802406A0 00000000 */ nop /* 869B54 802406A4 46001081 */ sub.s $f2, $f2, $f0 /* 869B58 802406A8 46043300 */ add.s $f12, $f6, $f4 /* 869B5C 802406AC C640009C */ lwc1 $f0, 0x9c($s2) /* 869B60 802406B0 46001501 */ sub.s $f20, $f2, $f0 /* 869B64 802406B4 46006084 */ sqrt.s $f2, $f12 /* 869B68 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 869B6C 802406BC 00000000 */ nop +/* 869B6C 802406BC 00000000 */ nop /* 869B70 802406C0 45010004 */ bc1t .L802406D4 /* 869B74 802406C4 0060882D */ daddu $s1, $v1, $zero /* 869B78 802406C8 0C0187BC */ jal sqrtf -/* 869B7C 802406CC 00000000 */ nop +/* 869B7C 802406CC 00000000 */ nop /* 869B80 802406D0 46000086 */ mov.s $f2, $f0 .L802406D4: /* 869B84 802406D4 44800000 */ mtc1 $zero, $f0 -/* 869B88 802406D8 00000000 */ nop +/* 869B88 802406D8 00000000 */ nop /* 869B8C 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 869B90 802406E0 00000000 */ nop +/* 869B90 802406E0 00000000 */ nop /* 869B94 802406E4 45000016 */ bc1f .L80240740 /* 869B98 802406E8 46001106 */ mov.s $f4, $f2 /* 869B9C 802406EC 862200B0 */ lh $v0, 0xb0($s1) /* 869BA0 802406F0 44820000 */ mtc1 $v0, $f0 -/* 869BA4 802406F4 00000000 */ nop +/* 869BA4 802406F4 00000000 */ nop /* 869BA8 802406F8 46800020 */ cvt.s.w $f0, $f0 /* 869BAC 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 869BB0 80240700 00000000 */ nop +/* 869BB0 80240700 00000000 */ nop /* 869BB4 80240704 4500000E */ bc1f .L80240740 -/* 869BB8 80240708 00000000 */ nop +/* 869BB8 80240708 00000000 */ nop /* 869BBC 8024070C 862200B2 */ lh $v0, 0xb2($s1) /* 869BC0 80240710 3C013F00 */ lui $at, 0x3f00 /* 869BC4 80240714 44811000 */ mtc1 $at, $f2 /* 869BC8 80240718 44820000 */ mtc1 $v0, $f0 -/* 869BCC 8024071C 00000000 */ nop +/* 869BCC 8024071C 00000000 */ nop /* 869BD0 80240720 46800020 */ cvt.s.w $f0, $f0 /* 869BD4 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 869BD8 80240728 00000000 */ nop +/* 869BD8 80240728 00000000 */ nop /* 869BDC 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 869BE0 80240730 00000000 */ nop +/* 869BE0 80240730 00000000 */ nop /* 869BE4 80240734 45000002 */ bc1f .L80240740 /* 869BE8 80240738 24020001 */ addiu $v0, $zero, 1 /* 869BEC 8024073C AE62008C */ sw $v0, 0x8c($s3) @@ -92,58 +92,58 @@ glabel func_802405F0_869AA0 /* 869BF4 80240744 C6400098 */ lwc1 $f0, 0x98($s2) /* 869BF8 80240748 46001081 */ sub.s $f2, $f2, $f0 /* 869BFC 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 869C00 80240750 00000000 */ nop +/* 869C00 80240750 00000000 */ nop /* 869C04 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 869C08 80240758 C6020040 */ lwc1 $f2, 0x40($s0) /* 869C0C 8024075C 46001081 */ sub.s $f2, $f2, $f0 /* 869C10 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 869C14 80240764 00000000 */ nop +/* 869C14 80240764 00000000 */ nop /* 869C18 80240768 860200A8 */ lh $v0, 0xa8($s0) /* 869C1C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) /* 869C20 80240770 44820000 */ mtc1 $v0, $f0 -/* 869C24 80240774 00000000 */ nop +/* 869C24 80240774 00000000 */ nop /* 869C28 80240778 46800020 */ cvt.s.w $f0, $f0 /* 869C2C 8024077C 46001080 */ add.s $f2, $f2, $f0 /* 869C30 80240780 3C013FC0 */ lui $at, 0x3fc0 /* 869C34 80240784 44810000 */ mtc1 $at, $f0 -/* 869C38 80240788 00000000 */ nop +/* 869C38 80240788 00000000 */ nop /* 869C3C 8024078C 46001081 */ sub.s $f2, $f2, $f0 /* 869C40 80240790 46043300 */ add.s $f12, $f6, $f4 /* 869C44 80240794 C640009C */ lwc1 $f0, 0x9c($s2) /* 869C48 80240798 46001501 */ sub.s $f20, $f2, $f0 /* 869C4C 8024079C 46006084 */ sqrt.s $f2, $f12 /* 869C50 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 869C54 802407A4 00000000 */ nop +/* 869C54 802407A4 00000000 */ nop /* 869C58 802407A8 45010004 */ bc1t .L802407BC -/* 869C5C 802407AC 00000000 */ nop +/* 869C5C 802407AC 00000000 */ nop /* 869C60 802407B0 0C0187BC */ jal sqrtf -/* 869C64 802407B4 00000000 */ nop +/* 869C64 802407B4 00000000 */ nop /* 869C68 802407B8 46000086 */ mov.s $f2, $f0 .L802407BC: /* 869C6C 802407BC 44800000 */ mtc1 $zero, $f0 -/* 869C70 802407C0 00000000 */ nop +/* 869C70 802407C0 00000000 */ nop /* 869C74 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 869C78 802407C8 00000000 */ nop +/* 869C78 802407C8 00000000 */ nop /* 869C7C 802407CC 45000016 */ bc1f .L80240828 /* 869C80 802407D0 46001106 */ mov.s $f4, $f2 /* 869C84 802407D4 860200A8 */ lh $v0, 0xa8($s0) /* 869C88 802407D8 44820000 */ mtc1 $v0, $f0 -/* 869C8C 802407DC 00000000 */ nop +/* 869C8C 802407DC 00000000 */ nop /* 869C90 802407E0 46800020 */ cvt.s.w $f0, $f0 /* 869C94 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 869C98 802407E8 00000000 */ nop +/* 869C98 802407E8 00000000 */ nop /* 869C9C 802407EC 4500000F */ bc1f .L8024082C /* 869CA0 802407F0 0000882D */ daddu $s1, $zero, $zero /* 869CA4 802407F4 860200A6 */ lh $v0, 0xa6($s0) /* 869CA8 802407F8 3C013F00 */ lui $at, 0x3f00 /* 869CAC 802407FC 44811000 */ mtc1 $at, $f2 /* 869CB0 80240800 44820000 */ mtc1 $v0, $f0 -/* 869CB4 80240804 00000000 */ nop +/* 869CB4 80240804 00000000 */ nop /* 869CB8 80240808 46800020 */ cvt.s.w $f0, $f0 /* 869CBC 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 869CC0 80240810 00000000 */ nop +/* 869CC0 80240810 00000000 */ nop /* 869CC4 80240814 4600203C */ c.lt.s $f4, $f0 -/* 869CC8 80240818 00000000 */ nop +/* 869CC8 80240818 00000000 */ nop /* 869CCC 8024081C 45000003 */ bc1f .L8024082C /* 869CD0 80240820 24020001 */ addiu $v0, $zero, 1 /* 869CD4 80240824 AE62008C */ sw $v0, 0x8c($s3) @@ -165,16 +165,16 @@ glabel func_802405F0_869AA0 /* 869D08 80240858 C6400098 */ lwc1 $f0, 0x98($s2) /* 869D0C 8024085C 46001081 */ sub.s $f2, $f2, $f0 /* 869D10 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 869D14 80240864 00000000 */ nop +/* 869D14 80240864 00000000 */ nop /* 869D18 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 869D1C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) /* 869D20 80240870 46001081 */ sub.s $f2, $f2, $f0 /* 869D24 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 869D28 80240878 00000000 */ nop +/* 869D28 80240878 00000000 */ nop /* 869D2C 8024087C 860200A8 */ lh $v0, 0xa8($s0) /* 869D30 80240880 C602003C */ lwc1 $f2, 0x3c($s0) /* 869D34 80240884 44820000 */ mtc1 $v0, $f0 -/* 869D38 80240888 00000000 */ nop +/* 869D38 80240888 00000000 */ nop /* 869D3C 8024088C 46800020 */ cvt.s.w $f0, $f0 /* 869D40 80240890 46001080 */ add.s $f2, $f2, $f0 /* 869D44 80240894 461A1081 */ sub.s $f2, $f2, $f26 @@ -183,32 +183,32 @@ glabel func_802405F0_869AA0 /* 869D50 802408A0 46001501 */ sub.s $f20, $f2, $f0 /* 869D54 802408A4 46006004 */ sqrt.s $f0, $f12 /* 869D58 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 869D5C 802408AC 00000000 */ nop +/* 869D5C 802408AC 00000000 */ nop /* 869D60 802408B0 45010003 */ bc1t .L802408C0 -/* 869D64 802408B4 00000000 */ nop +/* 869D64 802408B4 00000000 */ nop /* 869D68 802408B8 0C0187BC */ jal sqrtf -/* 869D6C 802408BC 00000000 */ nop +/* 869D6C 802408BC 00000000 */ nop .L802408C0: /* 869D70 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 869D74 802408C4 00000000 */ nop +/* 869D74 802408C4 00000000 */ nop /* 869D78 802408C8 45000015 */ bc1f .L80240920 /* 869D7C 802408CC 46000106 */ mov.s $f4, $f0 /* 869D80 802408D0 860200A8 */ lh $v0, 0xa8($s0) /* 869D84 802408D4 44820000 */ mtc1 $v0, $f0 -/* 869D88 802408D8 00000000 */ nop +/* 869D88 802408D8 00000000 */ nop /* 869D8C 802408DC 46800020 */ cvt.s.w $f0, $f0 /* 869D90 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 869D94 802408E4 00000000 */ nop +/* 869D94 802408E4 00000000 */ nop /* 869D98 802408E8 4500000E */ bc1f .L80240924 /* 869D9C 802408EC 26310001 */ addiu $s1, $s1, 1 /* 869DA0 802408F0 860200A6 */ lh $v0, 0xa6($s0) /* 869DA4 802408F4 44820000 */ mtc1 $v0, $f0 -/* 869DA8 802408F8 00000000 */ nop +/* 869DA8 802408F8 00000000 */ nop /* 869DAC 802408FC 46800020 */ cvt.s.w $f0, $f0 /* 869DB0 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 869DB4 80240904 00000000 */ nop +/* 869DB4 80240904 00000000 */ nop /* 869DB8 80240908 4600203C */ c.lt.s $f4, $f0 -/* 869DBC 8024090C 00000000 */ nop +/* 869DBC 8024090C 00000000 */ nop /* 869DC0 80240910 45000004 */ bc1f .L80240924 /* 869DC4 80240914 24020001 */ addiu $v0, $zero, 1 /* 869DC8 80240918 0809024C */ j .L80240930 @@ -218,7 +218,7 @@ glabel func_802405F0_869AA0 .L80240924: /* 869DD4 80240924 2A220040 */ slti $v0, $s1, 0x40 /* 869DD8 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 869DDC 8024092C 00000000 */ nop +/* 869DDC 8024092C 00000000 */ nop .L80240930: /* 869DE0 80240930 8FBF0020 */ lw $ra, 0x20($sp) /* 869DE4 80240934 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_01/869AA0/func_80240960_869E10.s b/asm/nonmatchings/world/area_tik/tik_01/869AA0/func_80240960_869E10.s index f265a354c9..63c3c8b5bc 100644 --- a/asm/nonmatchings/world/area_tik/tik_01/869AA0/func_80240960_869E10.s +++ b/asm/nonmatchings/world/area_tik/tik_01/869AA0/func_80240960_869E10.s @@ -32,15 +32,15 @@ glabel func_80240960_869E10 /* 869E7C 802409CC 0040802D */ daddu $s0, $v0, $zero /* 869E80 802409D0 0040182D */ daddu $v1, $v0, $zero /* 869E84 802409D4 44920000 */ mtc1 $s2, $f0 -/* 869E88 802409D8 00000000 */ nop +/* 869E88 802409D8 00000000 */ nop /* 869E8C 802409DC 46800020 */ cvt.s.w $f0, $f0 /* 869E90 802409E0 E4600048 */ swc1 $f0, 0x48($v1) /* 869E94 802409E4 44910000 */ mtc1 $s1, $f0 -/* 869E98 802409E8 00000000 */ nop +/* 869E98 802409E8 00000000 */ nop /* 869E9C 802409EC 46800020 */ cvt.s.w $f0, $f0 /* 869EA0 802409F0 E460004C */ swc1 $f0, 0x4c($v1) /* 869EA4 802409F4 44900000 */ mtc1 $s0, $f0 -/* 869EA8 802409F8 00000000 */ nop +/* 869EA8 802409F8 00000000 */ nop /* 869EAC 802409FC 46800020 */ cvt.s.w $f0, $f0 /* 869EB0 80240A00 E4600050 */ swc1 $f0, 0x50($v1) /* 869EB4 80240A04 8FBF0020 */ lw $ra, 0x20($sp) @@ -51,6 +51,6 @@ glabel func_80240960_869E10 /* 869EC8 80240A18 24020002 */ addiu $v0, $zero, 2 /* 869ECC 80240A1C 03E00008 */ jr $ra /* 869ED0 80240A20 27BD0028 */ addiu $sp, $sp, 0x28 -/* 869ED4 80240A24 00000000 */ nop -/* 869ED8 80240A28 00000000 */ nop -/* 869EDC 80240A2C 00000000 */ nop +/* 869ED4 80240A24 00000000 */ nop +/* 869ED8 80240A28 00000000 */ nop +/* 869EDC 80240A2C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_01/869EE0/func_80240A30_869EE0.s b/asm/nonmatchings/world/area_tik/tik_01/869EE0/func_80240A30_869EE0.s index 91edf12f6f..207e10e7c3 100644 --- a/asm/nonmatchings/world/area_tik/tik_01/869EE0/func_80240A30_869EE0.s +++ b/asm/nonmatchings/world/area_tik/tik_01/869EE0/func_80240A30_869EE0.s @@ -24,5 +24,5 @@ glabel func_80240A30_869EE0 /* 869F2C 80240A7C 24020002 */ addiu $v0, $zero, 2 /* 869F30 80240A80 03E00008 */ jr $ra /* 869F34 80240A84 27BD0018 */ addiu $sp, $sp, 0x18 -/* 869F38 80240A88 00000000 */ nop -/* 869F3C 80240A8C 00000000 */ nop +/* 869F38 80240A88 00000000 */ nop +/* 869F3C 80240A8C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240310_86CA50.s b/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240310_86CA50.s index 0d8e2e6bb1..98889092fa 100644 --- a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240310_86CA50.s +++ b/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240310_86CA50.s @@ -26,7 +26,7 @@ glabel func_80240310_86CA50 /* 86CAA0 80240360 1440FFFA */ bnez $v0, .L8024034C /* 86CAA4 80240364 24A50004 */ addiu $a1, $a1, 4 /* 86CAA8 80240368 080900EB */ j .L802403AC -/* 86CAAC 8024036C 00000000 */ nop +/* 86CAAC 8024036C 00000000 */ nop .L80240370: /* 86CAB0 80240370 0000182D */ daddu $v1, $zero, $zero /* 86CAB4 80240374 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_802405D0_86CD10.s b/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_802405D0_86CD10.s index 23cb8188ce..f843e0b57f 100644 --- a/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_802405D0_86CD10.s +++ b/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_802405D0_86CD10.s @@ -32,58 +32,58 @@ glabel func_802405D0_86CD10 /* 86CD7C 8024063C C6400098 */ lwc1 $f0, 0x98($s2) /* 86CD80 80240640 46001081 */ sub.s $f2, $f2, $f0 /* 86CD84 80240644 46021182 */ mul.s $f6, $f2, $f2 -/* 86CD88 80240648 00000000 */ nop +/* 86CD88 80240648 00000000 */ nop /* 86CD8C 8024064C C64000A0 */ lwc1 $f0, 0xa0($s2) /* 86CD90 80240650 C4620030 */ lwc1 $f2, 0x30($v1) /* 86CD94 80240654 46001081 */ sub.s $f2, $f2, $f0 /* 86CD98 80240658 46021102 */ mul.s $f4, $f2, $f2 -/* 86CD9C 8024065C 00000000 */ nop +/* 86CD9C 8024065C 00000000 */ nop /* 86CDA0 80240660 846200B0 */ lh $v0, 0xb0($v1) /* 86CDA4 80240664 C462002C */ lwc1 $f2, 0x2c($v1) /* 86CDA8 80240668 44820000 */ mtc1 $v0, $f0 -/* 86CDAC 8024066C 00000000 */ nop +/* 86CDAC 8024066C 00000000 */ nop /* 86CDB0 80240670 46800020 */ cvt.s.w $f0, $f0 /* 86CDB4 80240674 46001080 */ add.s $f2, $f2, $f0 /* 86CDB8 80240678 3C013FC0 */ lui $at, 0x3fc0 /* 86CDBC 8024067C 44810000 */ mtc1 $at, $f0 -/* 86CDC0 80240680 00000000 */ nop +/* 86CDC0 80240680 00000000 */ nop /* 86CDC4 80240684 46001081 */ sub.s $f2, $f2, $f0 /* 86CDC8 80240688 46043300 */ add.s $f12, $f6, $f4 /* 86CDCC 8024068C C640009C */ lwc1 $f0, 0x9c($s2) /* 86CDD0 80240690 46001501 */ sub.s $f20, $f2, $f0 /* 86CDD4 80240694 46006084 */ sqrt.s $f2, $f12 /* 86CDD8 80240698 46021032 */ c.eq.s $f2, $f2 -/* 86CDDC 8024069C 00000000 */ nop +/* 86CDDC 8024069C 00000000 */ nop /* 86CDE0 802406A0 45010004 */ bc1t .L802406B4 /* 86CDE4 802406A4 0060882D */ daddu $s1, $v1, $zero /* 86CDE8 802406A8 0C0187BC */ jal sqrtf -/* 86CDEC 802406AC 00000000 */ nop +/* 86CDEC 802406AC 00000000 */ nop /* 86CDF0 802406B0 46000086 */ mov.s $f2, $f0 .L802406B4: /* 86CDF4 802406B4 44800000 */ mtc1 $zero, $f0 -/* 86CDF8 802406B8 00000000 */ nop +/* 86CDF8 802406B8 00000000 */ nop /* 86CDFC 802406BC 4614003C */ c.lt.s $f0, $f20 -/* 86CE00 802406C0 00000000 */ nop +/* 86CE00 802406C0 00000000 */ nop /* 86CE04 802406C4 45000016 */ bc1f .L80240720 /* 86CE08 802406C8 46001106 */ mov.s $f4, $f2 /* 86CE0C 802406CC 862200B0 */ lh $v0, 0xb0($s1) /* 86CE10 802406D0 44820000 */ mtc1 $v0, $f0 -/* 86CE14 802406D4 00000000 */ nop +/* 86CE14 802406D4 00000000 */ nop /* 86CE18 802406D8 46800020 */ cvt.s.w $f0, $f0 /* 86CE1C 802406DC 4600A03C */ c.lt.s $f20, $f0 -/* 86CE20 802406E0 00000000 */ nop +/* 86CE20 802406E0 00000000 */ nop /* 86CE24 802406E4 4500000E */ bc1f .L80240720 -/* 86CE28 802406E8 00000000 */ nop +/* 86CE28 802406E8 00000000 */ nop /* 86CE2C 802406EC 862200B2 */ lh $v0, 0xb2($s1) /* 86CE30 802406F0 3C013F00 */ lui $at, 0x3f00 /* 86CE34 802406F4 44811000 */ mtc1 $at, $f2 /* 86CE38 802406F8 44820000 */ mtc1 $v0, $f0 -/* 86CE3C 802406FC 00000000 */ nop +/* 86CE3C 802406FC 00000000 */ nop /* 86CE40 80240700 46800020 */ cvt.s.w $f0, $f0 /* 86CE44 80240704 46020002 */ mul.s $f0, $f0, $f2 -/* 86CE48 80240708 00000000 */ nop +/* 86CE48 80240708 00000000 */ nop /* 86CE4C 8024070C 4600203C */ c.lt.s $f4, $f0 -/* 86CE50 80240710 00000000 */ nop +/* 86CE50 80240710 00000000 */ nop /* 86CE54 80240714 45000002 */ bc1f .L80240720 /* 86CE58 80240718 24020001 */ addiu $v0, $zero, 1 /* 86CE5C 8024071C AE62008C */ sw $v0, 0x8c($s3) @@ -92,58 +92,58 @@ glabel func_802405D0_86CD10 /* 86CE64 80240724 C6400098 */ lwc1 $f0, 0x98($s2) /* 86CE68 80240728 46001081 */ sub.s $f2, $f2, $f0 /* 86CE6C 8024072C 46021182 */ mul.s $f6, $f2, $f2 -/* 86CE70 80240730 00000000 */ nop +/* 86CE70 80240730 00000000 */ nop /* 86CE74 80240734 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 86CE78 80240738 C6020040 */ lwc1 $f2, 0x40($s0) /* 86CE7C 8024073C 46001081 */ sub.s $f2, $f2, $f0 /* 86CE80 80240740 46021102 */ mul.s $f4, $f2, $f2 -/* 86CE84 80240744 00000000 */ nop +/* 86CE84 80240744 00000000 */ nop /* 86CE88 80240748 860200A8 */ lh $v0, 0xa8($s0) /* 86CE8C 8024074C C602003C */ lwc1 $f2, 0x3c($s0) /* 86CE90 80240750 44820000 */ mtc1 $v0, $f0 -/* 86CE94 80240754 00000000 */ nop +/* 86CE94 80240754 00000000 */ nop /* 86CE98 80240758 46800020 */ cvt.s.w $f0, $f0 /* 86CE9C 8024075C 46001080 */ add.s $f2, $f2, $f0 /* 86CEA0 80240760 3C013FC0 */ lui $at, 0x3fc0 /* 86CEA4 80240764 44810000 */ mtc1 $at, $f0 -/* 86CEA8 80240768 00000000 */ nop +/* 86CEA8 80240768 00000000 */ nop /* 86CEAC 8024076C 46001081 */ sub.s $f2, $f2, $f0 /* 86CEB0 80240770 46043300 */ add.s $f12, $f6, $f4 /* 86CEB4 80240774 C640009C */ lwc1 $f0, 0x9c($s2) /* 86CEB8 80240778 46001501 */ sub.s $f20, $f2, $f0 /* 86CEBC 8024077C 46006084 */ sqrt.s $f2, $f12 /* 86CEC0 80240780 46021032 */ c.eq.s $f2, $f2 -/* 86CEC4 80240784 00000000 */ nop +/* 86CEC4 80240784 00000000 */ nop /* 86CEC8 80240788 45010004 */ bc1t .L8024079C -/* 86CECC 8024078C 00000000 */ nop +/* 86CECC 8024078C 00000000 */ nop /* 86CED0 80240790 0C0187BC */ jal sqrtf -/* 86CED4 80240794 00000000 */ nop +/* 86CED4 80240794 00000000 */ nop /* 86CED8 80240798 46000086 */ mov.s $f2, $f0 .L8024079C: /* 86CEDC 8024079C 44800000 */ mtc1 $zero, $f0 -/* 86CEE0 802407A0 00000000 */ nop +/* 86CEE0 802407A0 00000000 */ nop /* 86CEE4 802407A4 4614003C */ c.lt.s $f0, $f20 -/* 86CEE8 802407A8 00000000 */ nop +/* 86CEE8 802407A8 00000000 */ nop /* 86CEEC 802407AC 45000016 */ bc1f .L80240808 /* 86CEF0 802407B0 46001106 */ mov.s $f4, $f2 /* 86CEF4 802407B4 860200A8 */ lh $v0, 0xa8($s0) /* 86CEF8 802407B8 44820000 */ mtc1 $v0, $f0 -/* 86CEFC 802407BC 00000000 */ nop +/* 86CEFC 802407BC 00000000 */ nop /* 86CF00 802407C0 46800020 */ cvt.s.w $f0, $f0 /* 86CF04 802407C4 4600A03C */ c.lt.s $f20, $f0 -/* 86CF08 802407C8 00000000 */ nop +/* 86CF08 802407C8 00000000 */ nop /* 86CF0C 802407CC 4500000F */ bc1f .L8024080C /* 86CF10 802407D0 0000882D */ daddu $s1, $zero, $zero /* 86CF14 802407D4 860200A6 */ lh $v0, 0xa6($s0) /* 86CF18 802407D8 3C013F00 */ lui $at, 0x3f00 /* 86CF1C 802407DC 44811000 */ mtc1 $at, $f2 /* 86CF20 802407E0 44820000 */ mtc1 $v0, $f0 -/* 86CF24 802407E4 00000000 */ nop +/* 86CF24 802407E4 00000000 */ nop /* 86CF28 802407E8 46800020 */ cvt.s.w $f0, $f0 /* 86CF2C 802407EC 46020002 */ mul.s $f0, $f0, $f2 -/* 86CF30 802407F0 00000000 */ nop +/* 86CF30 802407F0 00000000 */ nop /* 86CF34 802407F4 4600203C */ c.lt.s $f4, $f0 -/* 86CF38 802407F8 00000000 */ nop +/* 86CF38 802407F8 00000000 */ nop /* 86CF3C 802407FC 45000003 */ bc1f .L8024080C /* 86CF40 80240800 24020001 */ addiu $v0, $zero, 1 /* 86CF44 80240804 AE62008C */ sw $v0, 0x8c($s3) @@ -165,16 +165,16 @@ glabel func_802405D0_86CD10 /* 86CF78 80240838 C6400098 */ lwc1 $f0, 0x98($s2) /* 86CF7C 8024083C 46001081 */ sub.s $f2, $f2, $f0 /* 86CF80 80240840 46021182 */ mul.s $f6, $f2, $f2 -/* 86CF84 80240844 00000000 */ nop +/* 86CF84 80240844 00000000 */ nop /* 86CF88 80240848 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 86CF8C 8024084C C6020040 */ lwc1 $f2, 0x40($s0) /* 86CF90 80240850 46001081 */ sub.s $f2, $f2, $f0 /* 86CF94 80240854 46021102 */ mul.s $f4, $f2, $f2 -/* 86CF98 80240858 00000000 */ nop +/* 86CF98 80240858 00000000 */ nop /* 86CF9C 8024085C 860200A8 */ lh $v0, 0xa8($s0) /* 86CFA0 80240860 C602003C */ lwc1 $f2, 0x3c($s0) /* 86CFA4 80240864 44820000 */ mtc1 $v0, $f0 -/* 86CFA8 80240868 00000000 */ nop +/* 86CFA8 80240868 00000000 */ nop /* 86CFAC 8024086C 46800020 */ cvt.s.w $f0, $f0 /* 86CFB0 80240870 46001080 */ add.s $f2, $f2, $f0 /* 86CFB4 80240874 461A1081 */ sub.s $f2, $f2, $f26 @@ -183,32 +183,32 @@ glabel func_802405D0_86CD10 /* 86CFC0 80240880 46001501 */ sub.s $f20, $f2, $f0 /* 86CFC4 80240884 46006004 */ sqrt.s $f0, $f12 /* 86CFC8 80240888 46000032 */ c.eq.s $f0, $f0 -/* 86CFCC 8024088C 00000000 */ nop +/* 86CFCC 8024088C 00000000 */ nop /* 86CFD0 80240890 45010003 */ bc1t .L802408A0 -/* 86CFD4 80240894 00000000 */ nop +/* 86CFD4 80240894 00000000 */ nop /* 86CFD8 80240898 0C0187BC */ jal sqrtf -/* 86CFDC 8024089C 00000000 */ nop +/* 86CFDC 8024089C 00000000 */ nop .L802408A0: /* 86CFE0 802408A0 4614C03C */ c.lt.s $f24, $f20 -/* 86CFE4 802408A4 00000000 */ nop +/* 86CFE4 802408A4 00000000 */ nop /* 86CFE8 802408A8 45000015 */ bc1f .L80240900 /* 86CFEC 802408AC 46000106 */ mov.s $f4, $f0 /* 86CFF0 802408B0 860200A8 */ lh $v0, 0xa8($s0) /* 86CFF4 802408B4 44820000 */ mtc1 $v0, $f0 -/* 86CFF8 802408B8 00000000 */ nop +/* 86CFF8 802408B8 00000000 */ nop /* 86CFFC 802408BC 46800020 */ cvt.s.w $f0, $f0 /* 86D000 802408C0 4600A03C */ c.lt.s $f20, $f0 -/* 86D004 802408C4 00000000 */ nop +/* 86D004 802408C4 00000000 */ nop /* 86D008 802408C8 4500000E */ bc1f .L80240904 /* 86D00C 802408CC 26310001 */ addiu $s1, $s1, 1 /* 86D010 802408D0 860200A6 */ lh $v0, 0xa6($s0) /* 86D014 802408D4 44820000 */ mtc1 $v0, $f0 -/* 86D018 802408D8 00000000 */ nop +/* 86D018 802408D8 00000000 */ nop /* 86D01C 802408DC 46800020 */ cvt.s.w $f0, $f0 /* 86D020 802408E0 46160002 */ mul.s $f0, $f0, $f22 -/* 86D024 802408E4 00000000 */ nop +/* 86D024 802408E4 00000000 */ nop /* 86D028 802408E8 4600203C */ c.lt.s $f4, $f0 -/* 86D02C 802408EC 00000000 */ nop +/* 86D02C 802408EC 00000000 */ nop /* 86D030 802408F0 45000004 */ bc1f .L80240904 /* 86D034 802408F4 24020001 */ addiu $v0, $zero, 1 /* 86D038 802408F8 08090244 */ j .L80240910 @@ -218,7 +218,7 @@ glabel func_802405D0_86CD10 .L80240904: /* 86D044 80240904 2A220040 */ slti $v0, $s1, 0x40 /* 86D048 80240908 1440FFC5 */ bnez $v0, .L80240820 -/* 86D04C 8024090C 00000000 */ nop +/* 86D04C 8024090C 00000000 */ nop .L80240910: /* 86D050 80240910 8FBF0020 */ lw $ra, 0x20($sp) /* 86D054 80240914 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_80240940_86D080.s b/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_80240940_86D080.s index 6bc73f2401..b8d6a73b46 100644 --- a/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_80240940_86D080.s +++ b/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_80240940_86D080.s @@ -24,5 +24,5 @@ glabel func_80240940_86D080 /* 86D0CC 8024098C 24020002 */ addiu $v0, $zero, 2 /* 86D0D0 80240990 03E00008 */ jr $ra /* 86D0D4 80240994 27BD0018 */ addiu $sp, $sp, 0x18 -/* 86D0D8 80240998 00000000 */ nop -/* 86D0DC 8024099C 00000000 */ nop +/* 86D0D8 80240998 00000000 */ nop +/* 86D0DC 8024099C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_80240034_86EB34.s b/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_80240034_86EB34.s index 8a7cdf019f..194f683259 100644 --- a/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_80240034_86EB34.s +++ b/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_80240034_86EB34.s @@ -22,16 +22,16 @@ glabel func_80240034_86EB34 /* 86EB74 80240074 00021023 */ negu $v0, $v0 .L80240078: /* 86EB78 80240078 14400003 */ bnez $v0, .L80240088 -/* 86EB7C 8024007C 00000000 */ nop +/* 86EB7C 8024007C 00000000 */ nop /* 86EB80 80240080 50E00017 */ beql $a3, $zero, .L802400E0 /* 86EB84 80240084 0000102D */ daddu $v0, $zero, $zero .L80240088: /* 86EB88 80240088 44822000 */ mtc1 $v0, $f4 -/* 86EB8C 8024008C 00000000 */ nop +/* 86EB8C 8024008C 00000000 */ nop /* 86EB90 80240090 46802120 */ cvt.s.w $f4, $f4 /* 86EB94 80240094 44062000 */ mfc1 $a2, $f4 /* 86EB98 80240098 44872000 */ mtc1 $a3, $f4 -/* 86EB9C 8024009C 00000000 */ nop +/* 86EB9C 8024009C 00000000 */ nop /* 86EBA0 802400A0 46802120 */ cvt.s.w $f4, $f4 /* 86EBA4 802400A4 44806000 */ mtc1 $zero, $f12 /* 86EBA8 802400A8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240034_86EB34 /* 86EBB0 802400B0 46006386 */ mov.s $f14, $f12 /* 86EBB4 802400B4 3C014270 */ lui $at, 0x4270 /* 86EBB8 802400B8 44811000 */ mtc1 $at, $f2 -/* 86EBBC 802400BC 00000000 */ nop +/* 86EBBC 802400BC 00000000 */ nop /* 86EBC0 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 86EBC4 802400C4 00000000 */ nop +/* 86EBC4 802400C4 00000000 */ nop /* 86EBC8 802400C8 45000004 */ bc1f .L802400DC /* 86EBCC 802400CC 24020001 */ addiu $v0, $zero, 1 /* 86EBD0 802400D0 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802405F0_86F0F0.s b/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802405F0_86F0F0.s index 9ba1670b85..10fd75e631 100644 --- a/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802405F0_86F0F0.s +++ b/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802405F0_86F0F0.s @@ -32,58 +32,58 @@ glabel func_802405F0_86F0F0 /* 86F15C 8024065C C6400098 */ lwc1 $f0, 0x98($s2) /* 86F160 80240660 46001081 */ sub.s $f2, $f2, $f0 /* 86F164 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 86F168 80240668 00000000 */ nop +/* 86F168 80240668 00000000 */ nop /* 86F16C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) /* 86F170 80240670 C4620030 */ lwc1 $f2, 0x30($v1) /* 86F174 80240674 46001081 */ sub.s $f2, $f2, $f0 /* 86F178 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 86F17C 8024067C 00000000 */ nop +/* 86F17C 8024067C 00000000 */ nop /* 86F180 80240680 846200B0 */ lh $v0, 0xb0($v1) /* 86F184 80240684 C462002C */ lwc1 $f2, 0x2c($v1) /* 86F188 80240688 44820000 */ mtc1 $v0, $f0 -/* 86F18C 8024068C 00000000 */ nop +/* 86F18C 8024068C 00000000 */ nop /* 86F190 80240690 46800020 */ cvt.s.w $f0, $f0 /* 86F194 80240694 46001080 */ add.s $f2, $f2, $f0 /* 86F198 80240698 3C013FC0 */ lui $at, 0x3fc0 /* 86F19C 8024069C 44810000 */ mtc1 $at, $f0 -/* 86F1A0 802406A0 00000000 */ nop +/* 86F1A0 802406A0 00000000 */ nop /* 86F1A4 802406A4 46001081 */ sub.s $f2, $f2, $f0 /* 86F1A8 802406A8 46043300 */ add.s $f12, $f6, $f4 /* 86F1AC 802406AC C640009C */ lwc1 $f0, 0x9c($s2) /* 86F1B0 802406B0 46001501 */ sub.s $f20, $f2, $f0 /* 86F1B4 802406B4 46006084 */ sqrt.s $f2, $f12 /* 86F1B8 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 86F1BC 802406BC 00000000 */ nop +/* 86F1BC 802406BC 00000000 */ nop /* 86F1C0 802406C0 45010004 */ bc1t .L802406D4 /* 86F1C4 802406C4 0060882D */ daddu $s1, $v1, $zero /* 86F1C8 802406C8 0C0187BC */ jal sqrtf -/* 86F1CC 802406CC 00000000 */ nop +/* 86F1CC 802406CC 00000000 */ nop /* 86F1D0 802406D0 46000086 */ mov.s $f2, $f0 .L802406D4: /* 86F1D4 802406D4 44800000 */ mtc1 $zero, $f0 -/* 86F1D8 802406D8 00000000 */ nop +/* 86F1D8 802406D8 00000000 */ nop /* 86F1DC 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 86F1E0 802406E0 00000000 */ nop +/* 86F1E0 802406E0 00000000 */ nop /* 86F1E4 802406E4 45000016 */ bc1f .L80240740 /* 86F1E8 802406E8 46001106 */ mov.s $f4, $f2 /* 86F1EC 802406EC 862200B0 */ lh $v0, 0xb0($s1) /* 86F1F0 802406F0 44820000 */ mtc1 $v0, $f0 -/* 86F1F4 802406F4 00000000 */ nop +/* 86F1F4 802406F4 00000000 */ nop /* 86F1F8 802406F8 46800020 */ cvt.s.w $f0, $f0 /* 86F1FC 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 86F200 80240700 00000000 */ nop +/* 86F200 80240700 00000000 */ nop /* 86F204 80240704 4500000E */ bc1f .L80240740 -/* 86F208 80240708 00000000 */ nop +/* 86F208 80240708 00000000 */ nop /* 86F20C 8024070C 862200B2 */ lh $v0, 0xb2($s1) /* 86F210 80240710 3C013F00 */ lui $at, 0x3f00 /* 86F214 80240714 44811000 */ mtc1 $at, $f2 /* 86F218 80240718 44820000 */ mtc1 $v0, $f0 -/* 86F21C 8024071C 00000000 */ nop +/* 86F21C 8024071C 00000000 */ nop /* 86F220 80240720 46800020 */ cvt.s.w $f0, $f0 /* 86F224 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 86F228 80240728 00000000 */ nop +/* 86F228 80240728 00000000 */ nop /* 86F22C 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 86F230 80240730 00000000 */ nop +/* 86F230 80240730 00000000 */ nop /* 86F234 80240734 45000002 */ bc1f .L80240740 /* 86F238 80240738 24020001 */ addiu $v0, $zero, 1 /* 86F23C 8024073C AE62008C */ sw $v0, 0x8c($s3) @@ -92,58 +92,58 @@ glabel func_802405F0_86F0F0 /* 86F244 80240744 C6400098 */ lwc1 $f0, 0x98($s2) /* 86F248 80240748 46001081 */ sub.s $f2, $f2, $f0 /* 86F24C 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 86F250 80240750 00000000 */ nop +/* 86F250 80240750 00000000 */ nop /* 86F254 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 86F258 80240758 C6020040 */ lwc1 $f2, 0x40($s0) /* 86F25C 8024075C 46001081 */ sub.s $f2, $f2, $f0 /* 86F260 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 86F264 80240764 00000000 */ nop +/* 86F264 80240764 00000000 */ nop /* 86F268 80240768 860200A8 */ lh $v0, 0xa8($s0) /* 86F26C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) /* 86F270 80240770 44820000 */ mtc1 $v0, $f0 -/* 86F274 80240774 00000000 */ nop +/* 86F274 80240774 00000000 */ nop /* 86F278 80240778 46800020 */ cvt.s.w $f0, $f0 /* 86F27C 8024077C 46001080 */ add.s $f2, $f2, $f0 /* 86F280 80240780 3C013FC0 */ lui $at, 0x3fc0 /* 86F284 80240784 44810000 */ mtc1 $at, $f0 -/* 86F288 80240788 00000000 */ nop +/* 86F288 80240788 00000000 */ nop /* 86F28C 8024078C 46001081 */ sub.s $f2, $f2, $f0 /* 86F290 80240790 46043300 */ add.s $f12, $f6, $f4 /* 86F294 80240794 C640009C */ lwc1 $f0, 0x9c($s2) /* 86F298 80240798 46001501 */ sub.s $f20, $f2, $f0 /* 86F29C 8024079C 46006084 */ sqrt.s $f2, $f12 /* 86F2A0 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 86F2A4 802407A4 00000000 */ nop +/* 86F2A4 802407A4 00000000 */ nop /* 86F2A8 802407A8 45010004 */ bc1t .L802407BC -/* 86F2AC 802407AC 00000000 */ nop +/* 86F2AC 802407AC 00000000 */ nop /* 86F2B0 802407B0 0C0187BC */ jal sqrtf -/* 86F2B4 802407B4 00000000 */ nop +/* 86F2B4 802407B4 00000000 */ nop /* 86F2B8 802407B8 46000086 */ mov.s $f2, $f0 .L802407BC: /* 86F2BC 802407BC 44800000 */ mtc1 $zero, $f0 -/* 86F2C0 802407C0 00000000 */ nop +/* 86F2C0 802407C0 00000000 */ nop /* 86F2C4 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 86F2C8 802407C8 00000000 */ nop +/* 86F2C8 802407C8 00000000 */ nop /* 86F2CC 802407CC 45000016 */ bc1f .L80240828 /* 86F2D0 802407D0 46001106 */ mov.s $f4, $f2 /* 86F2D4 802407D4 860200A8 */ lh $v0, 0xa8($s0) /* 86F2D8 802407D8 44820000 */ mtc1 $v0, $f0 -/* 86F2DC 802407DC 00000000 */ nop +/* 86F2DC 802407DC 00000000 */ nop /* 86F2E0 802407E0 46800020 */ cvt.s.w $f0, $f0 /* 86F2E4 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 86F2E8 802407E8 00000000 */ nop +/* 86F2E8 802407E8 00000000 */ nop /* 86F2EC 802407EC 4500000F */ bc1f .L8024082C /* 86F2F0 802407F0 0000882D */ daddu $s1, $zero, $zero /* 86F2F4 802407F4 860200A6 */ lh $v0, 0xa6($s0) /* 86F2F8 802407F8 3C013F00 */ lui $at, 0x3f00 /* 86F2FC 802407FC 44811000 */ mtc1 $at, $f2 /* 86F300 80240800 44820000 */ mtc1 $v0, $f0 -/* 86F304 80240804 00000000 */ nop +/* 86F304 80240804 00000000 */ nop /* 86F308 80240808 46800020 */ cvt.s.w $f0, $f0 /* 86F30C 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 86F310 80240810 00000000 */ nop +/* 86F310 80240810 00000000 */ nop /* 86F314 80240814 4600203C */ c.lt.s $f4, $f0 -/* 86F318 80240818 00000000 */ nop +/* 86F318 80240818 00000000 */ nop /* 86F31C 8024081C 45000003 */ bc1f .L8024082C /* 86F320 80240820 24020001 */ addiu $v0, $zero, 1 /* 86F324 80240824 AE62008C */ sw $v0, 0x8c($s3) @@ -165,16 +165,16 @@ glabel func_802405F0_86F0F0 /* 86F358 80240858 C6400098 */ lwc1 $f0, 0x98($s2) /* 86F35C 8024085C 46001081 */ sub.s $f2, $f2, $f0 /* 86F360 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 86F364 80240864 00000000 */ nop +/* 86F364 80240864 00000000 */ nop /* 86F368 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 86F36C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) /* 86F370 80240870 46001081 */ sub.s $f2, $f2, $f0 /* 86F374 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 86F378 80240878 00000000 */ nop +/* 86F378 80240878 00000000 */ nop /* 86F37C 8024087C 860200A8 */ lh $v0, 0xa8($s0) /* 86F380 80240880 C602003C */ lwc1 $f2, 0x3c($s0) /* 86F384 80240884 44820000 */ mtc1 $v0, $f0 -/* 86F388 80240888 00000000 */ nop +/* 86F388 80240888 00000000 */ nop /* 86F38C 8024088C 46800020 */ cvt.s.w $f0, $f0 /* 86F390 80240890 46001080 */ add.s $f2, $f2, $f0 /* 86F394 80240894 461A1081 */ sub.s $f2, $f2, $f26 @@ -183,32 +183,32 @@ glabel func_802405F0_86F0F0 /* 86F3A0 802408A0 46001501 */ sub.s $f20, $f2, $f0 /* 86F3A4 802408A4 46006004 */ sqrt.s $f0, $f12 /* 86F3A8 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 86F3AC 802408AC 00000000 */ nop +/* 86F3AC 802408AC 00000000 */ nop /* 86F3B0 802408B0 45010003 */ bc1t .L802408C0 -/* 86F3B4 802408B4 00000000 */ nop +/* 86F3B4 802408B4 00000000 */ nop /* 86F3B8 802408B8 0C0187BC */ jal sqrtf -/* 86F3BC 802408BC 00000000 */ nop +/* 86F3BC 802408BC 00000000 */ nop .L802408C0: /* 86F3C0 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 86F3C4 802408C4 00000000 */ nop +/* 86F3C4 802408C4 00000000 */ nop /* 86F3C8 802408C8 45000015 */ bc1f .L80240920 /* 86F3CC 802408CC 46000106 */ mov.s $f4, $f0 /* 86F3D0 802408D0 860200A8 */ lh $v0, 0xa8($s0) /* 86F3D4 802408D4 44820000 */ mtc1 $v0, $f0 -/* 86F3D8 802408D8 00000000 */ nop +/* 86F3D8 802408D8 00000000 */ nop /* 86F3DC 802408DC 46800020 */ cvt.s.w $f0, $f0 /* 86F3E0 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 86F3E4 802408E4 00000000 */ nop +/* 86F3E4 802408E4 00000000 */ nop /* 86F3E8 802408E8 4500000E */ bc1f .L80240924 /* 86F3EC 802408EC 26310001 */ addiu $s1, $s1, 1 /* 86F3F0 802408F0 860200A6 */ lh $v0, 0xa6($s0) /* 86F3F4 802408F4 44820000 */ mtc1 $v0, $f0 -/* 86F3F8 802408F8 00000000 */ nop +/* 86F3F8 802408F8 00000000 */ nop /* 86F3FC 802408FC 46800020 */ cvt.s.w $f0, $f0 /* 86F400 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 86F404 80240904 00000000 */ nop +/* 86F404 80240904 00000000 */ nop /* 86F408 80240908 4600203C */ c.lt.s $f4, $f0 -/* 86F40C 8024090C 00000000 */ nop +/* 86F40C 8024090C 00000000 */ nop /* 86F410 80240910 45000004 */ bc1f .L80240924 /* 86F414 80240914 24020001 */ addiu $v0, $zero, 1 /* 86F418 80240918 0809024C */ j .L80240930 @@ -218,7 +218,7 @@ glabel func_802405F0_86F0F0 .L80240924: /* 86F424 80240924 2A220040 */ slti $v0, $s1, 0x40 /* 86F428 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 86F42C 8024092C 00000000 */ nop +/* 86F42C 8024092C 00000000 */ nop .L80240930: /* 86F430 80240930 8FBF0020 */ lw $ra, 0x20($sp) /* 86F434 80240934 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_80240960_86F460.s b/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_80240960_86F460.s index ef6942c696..f5ef5e42dd 100644 --- a/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_80240960_86F460.s +++ b/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_80240960_86F460.s @@ -17,7 +17,7 @@ glabel func_80240960_86F460 /* 86F48C 8024098C 24840001 */ addiu $a0, $a0, 1 /* 86F490 80240990 810200B4 */ lb $v0, 0xb4($t0) /* 86F494 80240994 10470003 */ beq $v0, $a3, .L802409A4 -/* 86F498 80240998 00000000 */ nop +/* 86F498 80240998 00000000 */ nop /* 86F49C 8024099C 14460003 */ bne $v0, $a2, .L802409AC /* 86F4A0 802409A0 24840001 */ addiu $a0, $a0, 1 .L802409A4: diff --git a/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409C0_86F4C0.s b/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409C0_86F4C0.s index cb699edf2d..2747b4e205 100644 --- a/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409C0_86F4C0.s +++ b/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409C0_86F4C0.s @@ -5,7 +5,7 @@ glabel func_802409C0_86F4C0 /* 86F4C0 802409C0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 86F4C4 802409C4 AFBF0010 */ sw $ra, 0x10($sp) /* 86F4C8 802409C8 0C03BCC0 */ jal func_800EF300 -/* 86F4CC 802409CC 00000000 */ nop +/* 86F4CC 802409CC 00000000 */ nop /* 86F4D0 802409D0 8FBF0010 */ lw $ra, 0x10($sp) /* 86F4D4 802409D4 24020002 */ addiu $v0, $zero, 2 /* 86F4D8 802409D8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409E0_86F4E0.s b/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409E0_86F4E0.s index 140f53ade8..4d6297edbd 100644 --- a/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409E0_86F4E0.s +++ b/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409E0_86F4E0.s @@ -19,12 +19,12 @@ glabel func_802409E0_86F4E0 /* 86F518 80240A18 10600007 */ beqz $v1, .L80240A38 /* 86F51C 80240A1C 0000102D */ daddu $v0, $zero, $zero /* 86F520 80240A20 080902AD */ j .L80240AB4 -/* 86F524 80240A24 00000000 */ nop +/* 86F524 80240A24 00000000 */ nop .L80240A28: /* 86F528 80240A28 10620008 */ beq $v1, $v0, .L80240A4C /* 86F52C 80240A2C 0000102D */ daddu $v0, $zero, $zero /* 86F530 80240A30 080902AD */ j .L80240AB4 -/* 86F534 80240A34 00000000 */ nop +/* 86F534 80240A34 00000000 */ nop .L80240A38: /* 86F538 80240A38 24020001 */ addiu $v0, $zero, 1 /* 86F53C 80240A3C 080902AC */ j .L80240AB0 @@ -44,7 +44,7 @@ glabel func_802409E0_86F4E0 /* 86F56C 80240A6C 4600110D */ trunc.w.s $f4, $f2 /* 86F570 80240A70 44052000 */ mfc1 $a1, $f4 /* 86F574 80240A74 0C03BCF0 */ jal func_800EF3C0 -/* 86F578 80240A78 00000000 */ nop +/* 86F578 80240A78 00000000 */ nop /* 86F57C 80240A7C 0C03BCF5 */ jal func_800EF3D4 /* 86F580 80240A80 0000202D */ daddu $a0, $zero, $zero /* 86F584 80240A84 8E030000 */ lw $v1, ($s0) @@ -66,5 +66,5 @@ glabel func_802409E0_86F4E0 /* 86F5BC 80240ABC 8FB00010 */ lw $s0, 0x10($sp) /* 86F5C0 80240AC0 03E00008 */ jr $ra /* 86F5C4 80240AC4 27BD0020 */ addiu $sp, $sp, 0x20 -/* 86F5C8 80240AC8 00000000 */ nop -/* 86F5CC 80240ACC 00000000 */ nop +/* 86F5C8 80240AC8 00000000 */ nop +/* 86F5CC 80240ACC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_04/871A30/func_80240340_871D70.s b/asm/nonmatchings/world/area_tik/tik_04/871A30/func_80240340_871D70.s index 00a5fda3ac..25dc2d36c4 100644 --- a/asm/nonmatchings/world/area_tik/tik_04/871A30/func_80240340_871D70.s +++ b/asm/nonmatchings/world/area_tik/tik_04/871A30/func_80240340_871D70.s @@ -22,16 +22,16 @@ glabel func_80240340_871D70 /* 871DB0 80240380 00021023 */ negu $v0, $v0 .L80240384: /* 871DB4 80240384 14400003 */ bnez $v0, .L80240394 -/* 871DB8 80240388 00000000 */ nop +/* 871DB8 80240388 00000000 */ nop /* 871DBC 8024038C 50E00017 */ beql $a3, $zero, .L802403EC /* 871DC0 80240390 0000102D */ daddu $v0, $zero, $zero .L80240394: /* 871DC4 80240394 44822000 */ mtc1 $v0, $f4 -/* 871DC8 80240398 00000000 */ nop +/* 871DC8 80240398 00000000 */ nop /* 871DCC 8024039C 46802120 */ cvt.s.w $f4, $f4 /* 871DD0 802403A0 44062000 */ mfc1 $a2, $f4 /* 871DD4 802403A4 44872000 */ mtc1 $a3, $f4 -/* 871DD8 802403A8 00000000 */ nop +/* 871DD8 802403A8 00000000 */ nop /* 871DDC 802403AC 46802120 */ cvt.s.w $f4, $f4 /* 871DE0 802403B0 44806000 */ mtc1 $zero, $f12 /* 871DE4 802403B4 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240340_871D70 /* 871DEC 802403BC 46006386 */ mov.s $f14, $f12 /* 871DF0 802403C0 3C014270 */ lui $at, 0x4270 /* 871DF4 802403C4 44811000 */ mtc1 $at, $f2 -/* 871DF8 802403C8 00000000 */ nop +/* 871DF8 802403C8 00000000 */ nop /* 871DFC 802403CC 4602003C */ c.lt.s $f0, $f2 -/* 871E00 802403D0 00000000 */ nop +/* 871E00 802403D0 00000000 */ nop /* 871E04 802403D4 45000004 */ bc1f .L802403E8 /* 871E08 802403D8 24020001 */ addiu $v0, $zero, 1 /* 871E0C 802403DC AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_tik/tik_04/872020/func_802405F0_872020.s b/asm/nonmatchings/world/area_tik/tik_04/872020/func_802405F0_872020.s index 5ebab5ca87..0caed80f8b 100644 --- a/asm/nonmatchings/world/area_tik/tik_04/872020/func_802405F0_872020.s +++ b/asm/nonmatchings/world/area_tik/tik_04/872020/func_802405F0_872020.s @@ -32,58 +32,58 @@ glabel func_802405F0_872020 /* 87208C 8024065C C6400098 */ lwc1 $f0, 0x98($s2) /* 872090 80240660 46001081 */ sub.s $f2, $f2, $f0 /* 872094 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 872098 80240668 00000000 */ nop +/* 872098 80240668 00000000 */ nop /* 87209C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) /* 8720A0 80240670 C4620030 */ lwc1 $f2, 0x30($v1) /* 8720A4 80240674 46001081 */ sub.s $f2, $f2, $f0 /* 8720A8 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 8720AC 8024067C 00000000 */ nop +/* 8720AC 8024067C 00000000 */ nop /* 8720B0 80240680 846200B0 */ lh $v0, 0xb0($v1) /* 8720B4 80240684 C462002C */ lwc1 $f2, 0x2c($v1) /* 8720B8 80240688 44820000 */ mtc1 $v0, $f0 -/* 8720BC 8024068C 00000000 */ nop +/* 8720BC 8024068C 00000000 */ nop /* 8720C0 80240690 46800020 */ cvt.s.w $f0, $f0 /* 8720C4 80240694 46001080 */ add.s $f2, $f2, $f0 /* 8720C8 80240698 3C013FC0 */ lui $at, 0x3fc0 /* 8720CC 8024069C 44810000 */ mtc1 $at, $f0 -/* 8720D0 802406A0 00000000 */ nop +/* 8720D0 802406A0 00000000 */ nop /* 8720D4 802406A4 46001081 */ sub.s $f2, $f2, $f0 /* 8720D8 802406A8 46043300 */ add.s $f12, $f6, $f4 /* 8720DC 802406AC C640009C */ lwc1 $f0, 0x9c($s2) /* 8720E0 802406B0 46001501 */ sub.s $f20, $f2, $f0 /* 8720E4 802406B4 46006084 */ sqrt.s $f2, $f12 /* 8720E8 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 8720EC 802406BC 00000000 */ nop +/* 8720EC 802406BC 00000000 */ nop /* 8720F0 802406C0 45010004 */ bc1t .L802406D4 /* 8720F4 802406C4 0060882D */ daddu $s1, $v1, $zero /* 8720F8 802406C8 0C0187BC */ jal sqrtf -/* 8720FC 802406CC 00000000 */ nop +/* 8720FC 802406CC 00000000 */ nop /* 872100 802406D0 46000086 */ mov.s $f2, $f0 .L802406D4: /* 872104 802406D4 44800000 */ mtc1 $zero, $f0 -/* 872108 802406D8 00000000 */ nop +/* 872108 802406D8 00000000 */ nop /* 87210C 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 872110 802406E0 00000000 */ nop +/* 872110 802406E0 00000000 */ nop /* 872114 802406E4 45000016 */ bc1f .L80240740 /* 872118 802406E8 46001106 */ mov.s $f4, $f2 /* 87211C 802406EC 862200B0 */ lh $v0, 0xb0($s1) /* 872120 802406F0 44820000 */ mtc1 $v0, $f0 -/* 872124 802406F4 00000000 */ nop +/* 872124 802406F4 00000000 */ nop /* 872128 802406F8 46800020 */ cvt.s.w $f0, $f0 /* 87212C 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 872130 80240700 00000000 */ nop +/* 872130 80240700 00000000 */ nop /* 872134 80240704 4500000E */ bc1f .L80240740 -/* 872138 80240708 00000000 */ nop +/* 872138 80240708 00000000 */ nop /* 87213C 8024070C 862200B2 */ lh $v0, 0xb2($s1) /* 872140 80240710 3C013F00 */ lui $at, 0x3f00 /* 872144 80240714 44811000 */ mtc1 $at, $f2 /* 872148 80240718 44820000 */ mtc1 $v0, $f0 -/* 87214C 8024071C 00000000 */ nop +/* 87214C 8024071C 00000000 */ nop /* 872150 80240720 46800020 */ cvt.s.w $f0, $f0 /* 872154 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 872158 80240728 00000000 */ nop +/* 872158 80240728 00000000 */ nop /* 87215C 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 872160 80240730 00000000 */ nop +/* 872160 80240730 00000000 */ nop /* 872164 80240734 45000002 */ bc1f .L80240740 /* 872168 80240738 24020001 */ addiu $v0, $zero, 1 /* 87216C 8024073C AE62008C */ sw $v0, 0x8c($s3) @@ -92,58 +92,58 @@ glabel func_802405F0_872020 /* 872174 80240744 C6400098 */ lwc1 $f0, 0x98($s2) /* 872178 80240748 46001081 */ sub.s $f2, $f2, $f0 /* 87217C 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 872180 80240750 00000000 */ nop +/* 872180 80240750 00000000 */ nop /* 872184 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 872188 80240758 C6020040 */ lwc1 $f2, 0x40($s0) /* 87218C 8024075C 46001081 */ sub.s $f2, $f2, $f0 /* 872190 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 872194 80240764 00000000 */ nop +/* 872194 80240764 00000000 */ nop /* 872198 80240768 860200A8 */ lh $v0, 0xa8($s0) /* 87219C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) /* 8721A0 80240770 44820000 */ mtc1 $v0, $f0 -/* 8721A4 80240774 00000000 */ nop +/* 8721A4 80240774 00000000 */ nop /* 8721A8 80240778 46800020 */ cvt.s.w $f0, $f0 /* 8721AC 8024077C 46001080 */ add.s $f2, $f2, $f0 /* 8721B0 80240780 3C013FC0 */ lui $at, 0x3fc0 /* 8721B4 80240784 44810000 */ mtc1 $at, $f0 -/* 8721B8 80240788 00000000 */ nop +/* 8721B8 80240788 00000000 */ nop /* 8721BC 8024078C 46001081 */ sub.s $f2, $f2, $f0 /* 8721C0 80240790 46043300 */ add.s $f12, $f6, $f4 /* 8721C4 80240794 C640009C */ lwc1 $f0, 0x9c($s2) /* 8721C8 80240798 46001501 */ sub.s $f20, $f2, $f0 /* 8721CC 8024079C 46006084 */ sqrt.s $f2, $f12 /* 8721D0 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 8721D4 802407A4 00000000 */ nop +/* 8721D4 802407A4 00000000 */ nop /* 8721D8 802407A8 45010004 */ bc1t .L802407BC -/* 8721DC 802407AC 00000000 */ nop +/* 8721DC 802407AC 00000000 */ nop /* 8721E0 802407B0 0C0187BC */ jal sqrtf -/* 8721E4 802407B4 00000000 */ nop +/* 8721E4 802407B4 00000000 */ nop /* 8721E8 802407B8 46000086 */ mov.s $f2, $f0 .L802407BC: /* 8721EC 802407BC 44800000 */ mtc1 $zero, $f0 -/* 8721F0 802407C0 00000000 */ nop +/* 8721F0 802407C0 00000000 */ nop /* 8721F4 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 8721F8 802407C8 00000000 */ nop +/* 8721F8 802407C8 00000000 */ nop /* 8721FC 802407CC 45000016 */ bc1f .L80240828 /* 872200 802407D0 46001106 */ mov.s $f4, $f2 /* 872204 802407D4 860200A8 */ lh $v0, 0xa8($s0) /* 872208 802407D8 44820000 */ mtc1 $v0, $f0 -/* 87220C 802407DC 00000000 */ nop +/* 87220C 802407DC 00000000 */ nop /* 872210 802407E0 46800020 */ cvt.s.w $f0, $f0 /* 872214 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 872218 802407E8 00000000 */ nop +/* 872218 802407E8 00000000 */ nop /* 87221C 802407EC 4500000F */ bc1f .L8024082C /* 872220 802407F0 0000882D */ daddu $s1, $zero, $zero /* 872224 802407F4 860200A6 */ lh $v0, 0xa6($s0) /* 872228 802407F8 3C013F00 */ lui $at, 0x3f00 /* 87222C 802407FC 44811000 */ mtc1 $at, $f2 /* 872230 80240800 44820000 */ mtc1 $v0, $f0 -/* 872234 80240804 00000000 */ nop +/* 872234 80240804 00000000 */ nop /* 872238 80240808 46800020 */ cvt.s.w $f0, $f0 /* 87223C 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 872240 80240810 00000000 */ nop +/* 872240 80240810 00000000 */ nop /* 872244 80240814 4600203C */ c.lt.s $f4, $f0 -/* 872248 80240818 00000000 */ nop +/* 872248 80240818 00000000 */ nop /* 87224C 8024081C 45000003 */ bc1f .L8024082C /* 872250 80240820 24020001 */ addiu $v0, $zero, 1 /* 872254 80240824 AE62008C */ sw $v0, 0x8c($s3) @@ -165,16 +165,16 @@ glabel func_802405F0_872020 /* 872288 80240858 C6400098 */ lwc1 $f0, 0x98($s2) /* 87228C 8024085C 46001081 */ sub.s $f2, $f2, $f0 /* 872290 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 872294 80240864 00000000 */ nop +/* 872294 80240864 00000000 */ nop /* 872298 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 87229C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) /* 8722A0 80240870 46001081 */ sub.s $f2, $f2, $f0 /* 8722A4 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 8722A8 80240878 00000000 */ nop +/* 8722A8 80240878 00000000 */ nop /* 8722AC 8024087C 860200A8 */ lh $v0, 0xa8($s0) /* 8722B0 80240880 C602003C */ lwc1 $f2, 0x3c($s0) /* 8722B4 80240884 44820000 */ mtc1 $v0, $f0 -/* 8722B8 80240888 00000000 */ nop +/* 8722B8 80240888 00000000 */ nop /* 8722BC 8024088C 46800020 */ cvt.s.w $f0, $f0 /* 8722C0 80240890 46001080 */ add.s $f2, $f2, $f0 /* 8722C4 80240894 461A1081 */ sub.s $f2, $f2, $f26 @@ -183,32 +183,32 @@ glabel func_802405F0_872020 /* 8722D0 802408A0 46001501 */ sub.s $f20, $f2, $f0 /* 8722D4 802408A4 46006004 */ sqrt.s $f0, $f12 /* 8722D8 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 8722DC 802408AC 00000000 */ nop +/* 8722DC 802408AC 00000000 */ nop /* 8722E0 802408B0 45010003 */ bc1t .L802408C0 -/* 8722E4 802408B4 00000000 */ nop +/* 8722E4 802408B4 00000000 */ nop /* 8722E8 802408B8 0C0187BC */ jal sqrtf -/* 8722EC 802408BC 00000000 */ nop +/* 8722EC 802408BC 00000000 */ nop .L802408C0: /* 8722F0 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 8722F4 802408C4 00000000 */ nop +/* 8722F4 802408C4 00000000 */ nop /* 8722F8 802408C8 45000015 */ bc1f .L80240920 /* 8722FC 802408CC 46000106 */ mov.s $f4, $f0 /* 872300 802408D0 860200A8 */ lh $v0, 0xa8($s0) /* 872304 802408D4 44820000 */ mtc1 $v0, $f0 -/* 872308 802408D8 00000000 */ nop +/* 872308 802408D8 00000000 */ nop /* 87230C 802408DC 46800020 */ cvt.s.w $f0, $f0 /* 872310 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 872314 802408E4 00000000 */ nop +/* 872314 802408E4 00000000 */ nop /* 872318 802408E8 4500000E */ bc1f .L80240924 /* 87231C 802408EC 26310001 */ addiu $s1, $s1, 1 /* 872320 802408F0 860200A6 */ lh $v0, 0xa6($s0) /* 872324 802408F4 44820000 */ mtc1 $v0, $f0 -/* 872328 802408F8 00000000 */ nop +/* 872328 802408F8 00000000 */ nop /* 87232C 802408FC 46800020 */ cvt.s.w $f0, $f0 /* 872330 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 872334 80240904 00000000 */ nop +/* 872334 80240904 00000000 */ nop /* 872338 80240908 4600203C */ c.lt.s $f4, $f0 -/* 87233C 8024090C 00000000 */ nop +/* 87233C 8024090C 00000000 */ nop /* 872340 80240910 45000004 */ bc1f .L80240924 /* 872344 80240914 24020001 */ addiu $v0, $zero, 1 /* 872348 80240918 0809024C */ j .L80240930 @@ -218,7 +218,7 @@ glabel func_802405F0_872020 .L80240924: /* 872354 80240924 2A220040 */ slti $v0, $s1, 0x40 /* 872358 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 87235C 8024092C 00000000 */ nop +/* 87235C 8024092C 00000000 */ nop .L80240930: /* 872360 80240930 8FBF0020 */ lw $ra, 0x20($sp) /* 872364 80240934 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240960_872390.s b/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240960_872390.s index 3efd951a1e..c9f4b4ad34 100644 --- a/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240960_872390.s +++ b/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240960_872390.s @@ -14,7 +14,7 @@ glabel func_80240960_872390 /* 8723B4 80240984 C440009C */ lwc1 $f0, 0x9c($v0) /* 8723B8 80240988 3C0142C8 */ lui $at, 0x42c8 /* 8723BC 8024098C 4481A000 */ mtc1 $at, $f20 -/* 8723C0 80240990 00000000 */ nop +/* 8723C0 80240990 00000000 */ nop /* 8723C4 80240994 46140001 */ sub.s $f0, $f0, $f20 /* 8723C8 80240998 8C450098 */ lw $a1, 0x98($v0) /* 8723CC 8024099C 8C4700A0 */ lw $a3, 0xa0($v0) diff --git a/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240A00_872430.s b/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240A00_872430.s index 7c5bc1a1af..8ea27ac117 100644 --- a/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240A00_872430.s +++ b/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240A00_872430.s @@ -55,7 +55,7 @@ glabel func_80240A00_872430 /* 8724F8 80240AC8 4481A000 */ mtc1 $at, $f20 /* 8724FC 80240ACC AEE0002C */ sw $zero, 0x2c($s7) /* 872500 80240AD0 46141082 */ mul.s $f2, $f2, $f20 -/* 872504 80240AD4 00000000 */ nop +/* 872504 80240AD4 00000000 */ nop /* 872508 80240AD8 E6E00010 */ swc1 $f0, 0x10($s7) /* 87250C 80240ADC E6E40014 */ swc1 $f4, 0x14($s7) /* 872510 80240AE0 C7A60020 */ lwc1 $f6, 0x20($sp) @@ -63,7 +63,7 @@ glabel func_80240A00_872430 /* 872518 80240AE8 C6E00024 */ lwc1 $f0, 0x24($s7) /* 87251C 80240AEC C7A40028 */ lwc1 $f4, 0x28($sp) /* 872520 80240AF0 46140002 */ mul.s $f0, $f0, $f20 -/* 872524 80240AF4 00000000 */ nop +/* 872524 80240AF4 00000000 */ nop /* 872528 80240AF8 E6E60018 */ swc1 $f6, 0x18($s7) /* 87252C 80240AFC E6E80028 */ swc1 $f8, 0x28($s7) /* 872530 80240B00 E6E40030 */ swc1 $f4, 0x30($s7) @@ -99,7 +99,7 @@ glabel func_80240A00_872430 /* 8725A8 80240B78 C6E2001C */ lwc1 $f2, 0x1c($s7) /* 8725AC 80240B7C AEE0002C */ sw $zero, 0x2c($s7) /* 8725B0 80240B80 46141082 */ mul.s $f2, $f2, $f20 -/* 8725B4 80240B84 00000000 */ nop +/* 8725B4 80240B84 00000000 */ nop /* 8725B8 80240B88 E6E00010 */ swc1 $f0, 0x10($s7) /* 8725BC 80240B8C E6E40014 */ swc1 $f4, 0x14($s7) /* 8725C0 80240B90 C7A60020 */ lwc1 $f6, 0x20($sp) @@ -107,7 +107,7 @@ glabel func_80240A00_872430 /* 8725C8 80240B98 C6E00024 */ lwc1 $f0, 0x24($s7) /* 8725CC 80240B9C C7A40028 */ lwc1 $f4, 0x28($sp) /* 8725D0 80240BA0 46140002 */ mul.s $f0, $f0, $f20 -/* 8725D4 80240BA4 00000000 */ nop +/* 8725D4 80240BA4 00000000 */ nop /* 8725D8 80240BA8 E6E60018 */ swc1 $f6, 0x18($s7) /* 8725DC 80240BAC E6E80028 */ swc1 $f8, 0x28($s7) /* 8725E0 80240BB0 E6E40030 */ swc1 $f4, 0x30($s7) diff --git a/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240C20_872650.s b/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240C20_872650.s index 431ad84270..0da7a1ff11 100644 --- a/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240C20_872650.s +++ b/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240C20_872650.s @@ -8,7 +8,7 @@ glabel func_80240C20_872650 /* 87265C 80240C2C 10620003 */ beq $v1, $v0, .L80240C3C /* 872660 80240C30 2402000B */ addiu $v0, $zero, 0xb /* 872664 80240C34 1462000B */ bne $v1, $v0, .L80240C64 -/* 872668 80240C38 00000000 */ nop +/* 872668 80240C38 00000000 */ nop .L80240C3C: /* 87266C 80240C3C 3C028011 */ lui $v0, %hi(gPlayerStatus) /* 872670 80240C40 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) @@ -17,11 +17,11 @@ glabel func_80240C20_872650 /* 87267C 80240C4C 10620003 */ beq $v1, $v0, .L80240C5C /* 872680 80240C50 24020010 */ addiu $v0, $zero, 0x10 /* 872684 80240C54 14620003 */ bne $v1, $v0, .L80240C64 -/* 872688 80240C58 00000000 */ nop +/* 872688 80240C58 00000000 */ nop .L80240C5C: /* 87268C 80240C5C 03E00008 */ jr $ra /* 872690 80240C60 0000102D */ daddu $v0, $zero, $zero .L80240C64: /* 872694 80240C64 03E00008 */ jr $ra /* 872698 80240C68 24020002 */ addiu $v0, $zero, 2 -/* 87269C 80240C6C 00000000 */ nop +/* 87269C 80240C6C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240310_8750D0.s b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240310_8750D0.s index efc06a5c4e..d413b29d6d 100644 --- a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240310_8750D0.s +++ b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240310_8750D0.s @@ -32,58 +32,58 @@ glabel func_80240310_8750D0 /* 87513C 8024037C C6400098 */ lwc1 $f0, 0x98($s2) /* 875140 80240380 46001081 */ sub.s $f2, $f2, $f0 /* 875144 80240384 46021182 */ mul.s $f6, $f2, $f2 -/* 875148 80240388 00000000 */ nop +/* 875148 80240388 00000000 */ nop /* 87514C 8024038C C64000A0 */ lwc1 $f0, 0xa0($s2) /* 875150 80240390 C4620030 */ lwc1 $f2, 0x30($v1) /* 875154 80240394 46001081 */ sub.s $f2, $f2, $f0 /* 875158 80240398 46021102 */ mul.s $f4, $f2, $f2 -/* 87515C 8024039C 00000000 */ nop +/* 87515C 8024039C 00000000 */ nop /* 875160 802403A0 846200B0 */ lh $v0, 0xb0($v1) /* 875164 802403A4 C462002C */ lwc1 $f2, 0x2c($v1) /* 875168 802403A8 44820000 */ mtc1 $v0, $f0 -/* 87516C 802403AC 00000000 */ nop +/* 87516C 802403AC 00000000 */ nop /* 875170 802403B0 46800020 */ cvt.s.w $f0, $f0 /* 875174 802403B4 46001080 */ add.s $f2, $f2, $f0 /* 875178 802403B8 3C013FC0 */ lui $at, 0x3fc0 /* 87517C 802403BC 44810000 */ mtc1 $at, $f0 -/* 875180 802403C0 00000000 */ nop +/* 875180 802403C0 00000000 */ nop /* 875184 802403C4 46001081 */ sub.s $f2, $f2, $f0 /* 875188 802403C8 46043300 */ add.s $f12, $f6, $f4 /* 87518C 802403CC C640009C */ lwc1 $f0, 0x9c($s2) /* 875190 802403D0 46001501 */ sub.s $f20, $f2, $f0 /* 875194 802403D4 46006084 */ sqrt.s $f2, $f12 /* 875198 802403D8 46021032 */ c.eq.s $f2, $f2 -/* 87519C 802403DC 00000000 */ nop +/* 87519C 802403DC 00000000 */ nop /* 8751A0 802403E0 45010004 */ bc1t .L802403F4 /* 8751A4 802403E4 0060882D */ daddu $s1, $v1, $zero /* 8751A8 802403E8 0C0187BC */ jal sqrtf -/* 8751AC 802403EC 00000000 */ nop +/* 8751AC 802403EC 00000000 */ nop /* 8751B0 802403F0 46000086 */ mov.s $f2, $f0 .L802403F4: /* 8751B4 802403F4 44800000 */ mtc1 $zero, $f0 -/* 8751B8 802403F8 00000000 */ nop +/* 8751B8 802403F8 00000000 */ nop /* 8751BC 802403FC 4614003C */ c.lt.s $f0, $f20 -/* 8751C0 80240400 00000000 */ nop +/* 8751C0 80240400 00000000 */ nop /* 8751C4 80240404 45000016 */ bc1f .L80240460 /* 8751C8 80240408 46001106 */ mov.s $f4, $f2 /* 8751CC 8024040C 862200B0 */ lh $v0, 0xb0($s1) /* 8751D0 80240410 44820000 */ mtc1 $v0, $f0 -/* 8751D4 80240414 00000000 */ nop +/* 8751D4 80240414 00000000 */ nop /* 8751D8 80240418 46800020 */ cvt.s.w $f0, $f0 /* 8751DC 8024041C 4600A03C */ c.lt.s $f20, $f0 -/* 8751E0 80240420 00000000 */ nop +/* 8751E0 80240420 00000000 */ nop /* 8751E4 80240424 4500000E */ bc1f .L80240460 -/* 8751E8 80240428 00000000 */ nop +/* 8751E8 80240428 00000000 */ nop /* 8751EC 8024042C 862200B2 */ lh $v0, 0xb2($s1) /* 8751F0 80240430 3C013F00 */ lui $at, 0x3f00 /* 8751F4 80240434 44811000 */ mtc1 $at, $f2 /* 8751F8 80240438 44820000 */ mtc1 $v0, $f0 -/* 8751FC 8024043C 00000000 */ nop +/* 8751FC 8024043C 00000000 */ nop /* 875200 80240440 46800020 */ cvt.s.w $f0, $f0 /* 875204 80240444 46020002 */ mul.s $f0, $f0, $f2 -/* 875208 80240448 00000000 */ nop +/* 875208 80240448 00000000 */ nop /* 87520C 8024044C 4600203C */ c.lt.s $f4, $f0 -/* 875210 80240450 00000000 */ nop +/* 875210 80240450 00000000 */ nop /* 875214 80240454 45000002 */ bc1f .L80240460 /* 875218 80240458 24020001 */ addiu $v0, $zero, 1 /* 87521C 8024045C AE62008C */ sw $v0, 0x8c($s3) @@ -92,58 +92,58 @@ glabel func_80240310_8750D0 /* 875224 80240464 C6400098 */ lwc1 $f0, 0x98($s2) /* 875228 80240468 46001081 */ sub.s $f2, $f2, $f0 /* 87522C 8024046C 46021182 */ mul.s $f6, $f2, $f2 -/* 875230 80240470 00000000 */ nop +/* 875230 80240470 00000000 */ nop /* 875234 80240474 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 875238 80240478 C6020040 */ lwc1 $f2, 0x40($s0) /* 87523C 8024047C 46001081 */ sub.s $f2, $f2, $f0 /* 875240 80240480 46021102 */ mul.s $f4, $f2, $f2 -/* 875244 80240484 00000000 */ nop +/* 875244 80240484 00000000 */ nop /* 875248 80240488 860200A8 */ lh $v0, 0xa8($s0) /* 87524C 8024048C C602003C */ lwc1 $f2, 0x3c($s0) /* 875250 80240490 44820000 */ mtc1 $v0, $f0 -/* 875254 80240494 00000000 */ nop +/* 875254 80240494 00000000 */ nop /* 875258 80240498 46800020 */ cvt.s.w $f0, $f0 /* 87525C 8024049C 46001080 */ add.s $f2, $f2, $f0 /* 875260 802404A0 3C013FC0 */ lui $at, 0x3fc0 /* 875264 802404A4 44810000 */ mtc1 $at, $f0 -/* 875268 802404A8 00000000 */ nop +/* 875268 802404A8 00000000 */ nop /* 87526C 802404AC 46001081 */ sub.s $f2, $f2, $f0 /* 875270 802404B0 46043300 */ add.s $f12, $f6, $f4 /* 875274 802404B4 C640009C */ lwc1 $f0, 0x9c($s2) /* 875278 802404B8 46001501 */ sub.s $f20, $f2, $f0 /* 87527C 802404BC 46006084 */ sqrt.s $f2, $f12 /* 875280 802404C0 46021032 */ c.eq.s $f2, $f2 -/* 875284 802404C4 00000000 */ nop +/* 875284 802404C4 00000000 */ nop /* 875288 802404C8 45010004 */ bc1t .L802404DC -/* 87528C 802404CC 00000000 */ nop +/* 87528C 802404CC 00000000 */ nop /* 875290 802404D0 0C0187BC */ jal sqrtf -/* 875294 802404D4 00000000 */ nop +/* 875294 802404D4 00000000 */ nop /* 875298 802404D8 46000086 */ mov.s $f2, $f0 .L802404DC: /* 87529C 802404DC 44800000 */ mtc1 $zero, $f0 -/* 8752A0 802404E0 00000000 */ nop +/* 8752A0 802404E0 00000000 */ nop /* 8752A4 802404E4 4614003C */ c.lt.s $f0, $f20 -/* 8752A8 802404E8 00000000 */ nop +/* 8752A8 802404E8 00000000 */ nop /* 8752AC 802404EC 45000016 */ bc1f .L80240548 /* 8752B0 802404F0 46001106 */ mov.s $f4, $f2 /* 8752B4 802404F4 860200A8 */ lh $v0, 0xa8($s0) /* 8752B8 802404F8 44820000 */ mtc1 $v0, $f0 -/* 8752BC 802404FC 00000000 */ nop +/* 8752BC 802404FC 00000000 */ nop /* 8752C0 80240500 46800020 */ cvt.s.w $f0, $f0 /* 8752C4 80240504 4600A03C */ c.lt.s $f20, $f0 -/* 8752C8 80240508 00000000 */ nop +/* 8752C8 80240508 00000000 */ nop /* 8752CC 8024050C 4500000F */ bc1f .L8024054C /* 8752D0 80240510 0000882D */ daddu $s1, $zero, $zero /* 8752D4 80240514 860200A6 */ lh $v0, 0xa6($s0) /* 8752D8 80240518 3C013F00 */ lui $at, 0x3f00 /* 8752DC 8024051C 44811000 */ mtc1 $at, $f2 /* 8752E0 80240520 44820000 */ mtc1 $v0, $f0 -/* 8752E4 80240524 00000000 */ nop +/* 8752E4 80240524 00000000 */ nop /* 8752E8 80240528 46800020 */ cvt.s.w $f0, $f0 /* 8752EC 8024052C 46020002 */ mul.s $f0, $f0, $f2 -/* 8752F0 80240530 00000000 */ nop +/* 8752F0 80240530 00000000 */ nop /* 8752F4 80240534 4600203C */ c.lt.s $f4, $f0 -/* 8752F8 80240538 00000000 */ nop +/* 8752F8 80240538 00000000 */ nop /* 8752FC 8024053C 45000003 */ bc1f .L8024054C /* 875300 80240540 24020001 */ addiu $v0, $zero, 1 /* 875304 80240544 AE62008C */ sw $v0, 0x8c($s3) @@ -165,16 +165,16 @@ glabel func_80240310_8750D0 /* 875338 80240578 C6400098 */ lwc1 $f0, 0x98($s2) /* 87533C 8024057C 46001081 */ sub.s $f2, $f2, $f0 /* 875340 80240580 46021182 */ mul.s $f6, $f2, $f2 -/* 875344 80240584 00000000 */ nop +/* 875344 80240584 00000000 */ nop /* 875348 80240588 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 87534C 8024058C C6020040 */ lwc1 $f2, 0x40($s0) /* 875350 80240590 46001081 */ sub.s $f2, $f2, $f0 /* 875354 80240594 46021102 */ mul.s $f4, $f2, $f2 -/* 875358 80240598 00000000 */ nop +/* 875358 80240598 00000000 */ nop /* 87535C 8024059C 860200A8 */ lh $v0, 0xa8($s0) /* 875360 802405A0 C602003C */ lwc1 $f2, 0x3c($s0) /* 875364 802405A4 44820000 */ mtc1 $v0, $f0 -/* 875368 802405A8 00000000 */ nop +/* 875368 802405A8 00000000 */ nop /* 87536C 802405AC 46800020 */ cvt.s.w $f0, $f0 /* 875370 802405B0 46001080 */ add.s $f2, $f2, $f0 /* 875374 802405B4 461A1081 */ sub.s $f2, $f2, $f26 @@ -183,32 +183,32 @@ glabel func_80240310_8750D0 /* 875380 802405C0 46001501 */ sub.s $f20, $f2, $f0 /* 875384 802405C4 46006004 */ sqrt.s $f0, $f12 /* 875388 802405C8 46000032 */ c.eq.s $f0, $f0 -/* 87538C 802405CC 00000000 */ nop +/* 87538C 802405CC 00000000 */ nop /* 875390 802405D0 45010003 */ bc1t .L802405E0 -/* 875394 802405D4 00000000 */ nop +/* 875394 802405D4 00000000 */ nop /* 875398 802405D8 0C0187BC */ jal sqrtf -/* 87539C 802405DC 00000000 */ nop +/* 87539C 802405DC 00000000 */ nop .L802405E0: /* 8753A0 802405E0 4614C03C */ c.lt.s $f24, $f20 -/* 8753A4 802405E4 00000000 */ nop +/* 8753A4 802405E4 00000000 */ nop /* 8753A8 802405E8 45000015 */ bc1f .L80240640 /* 8753AC 802405EC 46000106 */ mov.s $f4, $f0 /* 8753B0 802405F0 860200A8 */ lh $v0, 0xa8($s0) /* 8753B4 802405F4 44820000 */ mtc1 $v0, $f0 -/* 8753B8 802405F8 00000000 */ nop +/* 8753B8 802405F8 00000000 */ nop /* 8753BC 802405FC 46800020 */ cvt.s.w $f0, $f0 /* 8753C0 80240600 4600A03C */ c.lt.s $f20, $f0 -/* 8753C4 80240604 00000000 */ nop +/* 8753C4 80240604 00000000 */ nop /* 8753C8 80240608 4500000E */ bc1f .L80240644 /* 8753CC 8024060C 26310001 */ addiu $s1, $s1, 1 /* 8753D0 80240610 860200A6 */ lh $v0, 0xa6($s0) /* 8753D4 80240614 44820000 */ mtc1 $v0, $f0 -/* 8753D8 80240618 00000000 */ nop +/* 8753D8 80240618 00000000 */ nop /* 8753DC 8024061C 46800020 */ cvt.s.w $f0, $f0 /* 8753E0 80240620 46160002 */ mul.s $f0, $f0, $f22 -/* 8753E4 80240624 00000000 */ nop +/* 8753E4 80240624 00000000 */ nop /* 8753E8 80240628 4600203C */ c.lt.s $f4, $f0 -/* 8753EC 8024062C 00000000 */ nop +/* 8753EC 8024062C 00000000 */ nop /* 8753F0 80240630 45000004 */ bc1f .L80240644 /* 8753F4 80240634 24020001 */ addiu $v0, $zero, 1 /* 8753F8 80240638 08090194 */ j .L80240650 @@ -218,7 +218,7 @@ glabel func_80240310_8750D0 .L80240644: /* 875404 80240644 2A220040 */ slti $v0, $s1, 0x40 /* 875408 80240648 1440FFC5 */ bnez $v0, .L80240560 -/* 87540C 8024064C 00000000 */ nop +/* 87540C 8024064C 00000000 */ nop .L80240650: /* 875410 80240650 8FBF0020 */ lw $ra, 0x20($sp) /* 875414 80240654 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240680_875440.s b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240680_875440.s index 14f9aa1f2c..3f072145ba 100644 --- a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240680_875440.s +++ b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240680_875440.s @@ -26,7 +26,7 @@ glabel func_80240680_875440 /* 875490 802406D0 1440FFFA */ bnez $v0, .L802406BC /* 875494 802406D4 24A50004 */ addiu $a1, $a1, 4 /* 875498 802406D8 080901C7 */ j .L8024071C -/* 87549C 802406DC 00000000 */ nop +/* 87549C 802406DC 00000000 */ nop .L802406E0: /* 8754A0 802406E0 0000182D */ daddu $v1, $zero, $zero /* 8754A4 802406E4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_8024093C_8756FC.s b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_8024093C_8756FC.s index 4815e7d91c..a32f1b9557 100644 --- a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_8024093C_8756FC.s +++ b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_8024093C_8756FC.s @@ -15,7 +15,7 @@ glabel func_8024093C_8756FC /* 875724 80240964 3C050000 */ lui $a1, 0 /* 875728 80240968 24A501E4 */ addiu $a1, $a1, 0x1e4 /* 87572C 8024096C 0C048052 */ jal play_model_animation -/* 875730 80240970 00000000 */ nop +/* 875730 80240970 00000000 */ nop /* 875734 80240974 24020002 */ addiu $v0, $zero, 2 .L80240978: /* 875738 80240978 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240984_875744.s b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240984_875744.s index 4e45c28b13..31e47f9948 100644 --- a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240984_875744.s +++ b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240984_875744.s @@ -32,15 +32,15 @@ glabel func_80240984_875744 /* 8757B0 802409F0 0040802D */ daddu $s0, $v0, $zero /* 8757B4 802409F4 0040182D */ daddu $v1, $v0, $zero /* 8757B8 802409F8 44920000 */ mtc1 $s2, $f0 -/* 8757BC 802409FC 00000000 */ nop +/* 8757BC 802409FC 00000000 */ nop /* 8757C0 80240A00 46800020 */ cvt.s.w $f0, $f0 /* 8757C4 80240A04 E4600048 */ swc1 $f0, 0x48($v1) /* 8757C8 80240A08 44910000 */ mtc1 $s1, $f0 -/* 8757CC 80240A0C 00000000 */ nop +/* 8757CC 80240A0C 00000000 */ nop /* 8757D0 80240A10 46800020 */ cvt.s.w $f0, $f0 /* 8757D4 80240A14 E460004C */ swc1 $f0, 0x4c($v1) /* 8757D8 80240A18 44900000 */ mtc1 $s0, $f0 -/* 8757DC 80240A1C 00000000 */ nop +/* 8757DC 80240A1C 00000000 */ nop /* 8757E0 80240A20 46800020 */ cvt.s.w $f0, $f0 /* 8757E4 80240A24 E4600050 */ swc1 $f0, 0x50($v1) /* 8757E8 80240A28 8FBF0020 */ lw $ra, 0x20($sp) @@ -51,5 +51,5 @@ glabel func_80240984_875744 /* 8757FC 80240A3C 24020002 */ addiu $v0, $zero, 2 /* 875800 80240A40 03E00008 */ jr $ra /* 875804 80240A44 27BD0028 */ addiu $sp, $sp, 0x28 -/* 875808 80240A48 00000000 */ nop -/* 87580C 80240A4C 00000000 */ nop +/* 875808 80240A48 00000000 */ nop +/* 87580C 80240A4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_80240034_876F14.s b/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_80240034_876F14.s index 59a8a7a8c3..890b6d2f6f 100644 --- a/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_80240034_876F14.s +++ b/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_80240034_876F14.s @@ -22,16 +22,16 @@ glabel func_80240034_876F14 /* 876F54 80240074 00021023 */ negu $v0, $v0 .L80240078: /* 876F58 80240078 14400003 */ bnez $v0, .L80240088 -/* 876F5C 8024007C 00000000 */ nop +/* 876F5C 8024007C 00000000 */ nop /* 876F60 80240080 50E00017 */ beql $a3, $zero, .L802400E0 /* 876F64 80240084 0000102D */ daddu $v0, $zero, $zero .L80240088: /* 876F68 80240088 44822000 */ mtc1 $v0, $f4 -/* 876F6C 8024008C 00000000 */ nop +/* 876F6C 8024008C 00000000 */ nop /* 876F70 80240090 46802120 */ cvt.s.w $f4, $f4 /* 876F74 80240094 44062000 */ mfc1 $a2, $f4 /* 876F78 80240098 44872000 */ mtc1 $a3, $f4 -/* 876F7C 8024009C 00000000 */ nop +/* 876F7C 8024009C 00000000 */ nop /* 876F80 802400A0 46802120 */ cvt.s.w $f4, $f4 /* 876F84 802400A4 44806000 */ mtc1 $zero, $f12 /* 876F88 802400A8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240034_876F14 /* 876F90 802400B0 46006386 */ mov.s $f14, $f12 /* 876F94 802400B4 3C014270 */ lui $at, 0x4270 /* 876F98 802400B8 44811000 */ mtc1 $at, $f2 -/* 876F9C 802400BC 00000000 */ nop +/* 876F9C 802400BC 00000000 */ nop /* 876FA0 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 876FA4 802400C4 00000000 */ nop +/* 876FA4 802400C4 00000000 */ nop /* 876FA8 802400C8 45000004 */ bc1f .L802400DC /* 876FAC 802400CC 24020001 */ addiu $v0, $zero, 1 /* 876FB0 802400D0 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_tik/tik_06/8774D0/func_802405F0_8774D0.s b/asm/nonmatchings/world/area_tik/tik_06/8774D0/func_802405F0_8774D0.s index b57bd78fdd..dc1e2dfe75 100644 --- a/asm/nonmatchings/world/area_tik/tik_06/8774D0/func_802405F0_8774D0.s +++ b/asm/nonmatchings/world/area_tik/tik_06/8774D0/func_802405F0_8774D0.s @@ -32,58 +32,58 @@ glabel func_802405F0_8774D0 /* 87753C 8024065C C6400098 */ lwc1 $f0, 0x98($s2) /* 877540 80240660 46001081 */ sub.s $f2, $f2, $f0 /* 877544 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 877548 80240668 00000000 */ nop +/* 877548 80240668 00000000 */ nop /* 87754C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) /* 877550 80240670 C4620030 */ lwc1 $f2, 0x30($v1) /* 877554 80240674 46001081 */ sub.s $f2, $f2, $f0 /* 877558 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 87755C 8024067C 00000000 */ nop +/* 87755C 8024067C 00000000 */ nop /* 877560 80240680 846200B0 */ lh $v0, 0xb0($v1) /* 877564 80240684 C462002C */ lwc1 $f2, 0x2c($v1) /* 877568 80240688 44820000 */ mtc1 $v0, $f0 -/* 87756C 8024068C 00000000 */ nop +/* 87756C 8024068C 00000000 */ nop /* 877570 80240690 46800020 */ cvt.s.w $f0, $f0 /* 877574 80240694 46001080 */ add.s $f2, $f2, $f0 /* 877578 80240698 3C013FC0 */ lui $at, 0x3fc0 /* 87757C 8024069C 44810000 */ mtc1 $at, $f0 -/* 877580 802406A0 00000000 */ nop +/* 877580 802406A0 00000000 */ nop /* 877584 802406A4 46001081 */ sub.s $f2, $f2, $f0 /* 877588 802406A8 46043300 */ add.s $f12, $f6, $f4 /* 87758C 802406AC C640009C */ lwc1 $f0, 0x9c($s2) /* 877590 802406B0 46001501 */ sub.s $f20, $f2, $f0 /* 877594 802406B4 46006084 */ sqrt.s $f2, $f12 /* 877598 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 87759C 802406BC 00000000 */ nop +/* 87759C 802406BC 00000000 */ nop /* 8775A0 802406C0 45010004 */ bc1t .L802406D4 /* 8775A4 802406C4 0060882D */ daddu $s1, $v1, $zero /* 8775A8 802406C8 0C0187BC */ jal sqrtf -/* 8775AC 802406CC 00000000 */ nop +/* 8775AC 802406CC 00000000 */ nop /* 8775B0 802406D0 46000086 */ mov.s $f2, $f0 .L802406D4: /* 8775B4 802406D4 44800000 */ mtc1 $zero, $f0 -/* 8775B8 802406D8 00000000 */ nop +/* 8775B8 802406D8 00000000 */ nop /* 8775BC 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 8775C0 802406E0 00000000 */ nop +/* 8775C0 802406E0 00000000 */ nop /* 8775C4 802406E4 45000016 */ bc1f .L80240740 /* 8775C8 802406E8 46001106 */ mov.s $f4, $f2 /* 8775CC 802406EC 862200B0 */ lh $v0, 0xb0($s1) /* 8775D0 802406F0 44820000 */ mtc1 $v0, $f0 -/* 8775D4 802406F4 00000000 */ nop +/* 8775D4 802406F4 00000000 */ nop /* 8775D8 802406F8 46800020 */ cvt.s.w $f0, $f0 /* 8775DC 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 8775E0 80240700 00000000 */ nop +/* 8775E0 80240700 00000000 */ nop /* 8775E4 80240704 4500000E */ bc1f .L80240740 -/* 8775E8 80240708 00000000 */ nop +/* 8775E8 80240708 00000000 */ nop /* 8775EC 8024070C 862200B2 */ lh $v0, 0xb2($s1) /* 8775F0 80240710 3C013F00 */ lui $at, 0x3f00 /* 8775F4 80240714 44811000 */ mtc1 $at, $f2 /* 8775F8 80240718 44820000 */ mtc1 $v0, $f0 -/* 8775FC 8024071C 00000000 */ nop +/* 8775FC 8024071C 00000000 */ nop /* 877600 80240720 46800020 */ cvt.s.w $f0, $f0 /* 877604 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 877608 80240728 00000000 */ nop +/* 877608 80240728 00000000 */ nop /* 87760C 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 877610 80240730 00000000 */ nop +/* 877610 80240730 00000000 */ nop /* 877614 80240734 45000002 */ bc1f .L80240740 /* 877618 80240738 24020001 */ addiu $v0, $zero, 1 /* 87761C 8024073C AE62008C */ sw $v0, 0x8c($s3) @@ -92,58 +92,58 @@ glabel func_802405F0_8774D0 /* 877624 80240744 C6400098 */ lwc1 $f0, 0x98($s2) /* 877628 80240748 46001081 */ sub.s $f2, $f2, $f0 /* 87762C 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 877630 80240750 00000000 */ nop +/* 877630 80240750 00000000 */ nop /* 877634 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 877638 80240758 C6020040 */ lwc1 $f2, 0x40($s0) /* 87763C 8024075C 46001081 */ sub.s $f2, $f2, $f0 /* 877640 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 877644 80240764 00000000 */ nop +/* 877644 80240764 00000000 */ nop /* 877648 80240768 860200A8 */ lh $v0, 0xa8($s0) /* 87764C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) /* 877650 80240770 44820000 */ mtc1 $v0, $f0 -/* 877654 80240774 00000000 */ nop +/* 877654 80240774 00000000 */ nop /* 877658 80240778 46800020 */ cvt.s.w $f0, $f0 /* 87765C 8024077C 46001080 */ add.s $f2, $f2, $f0 /* 877660 80240780 3C013FC0 */ lui $at, 0x3fc0 /* 877664 80240784 44810000 */ mtc1 $at, $f0 -/* 877668 80240788 00000000 */ nop +/* 877668 80240788 00000000 */ nop /* 87766C 8024078C 46001081 */ sub.s $f2, $f2, $f0 /* 877670 80240790 46043300 */ add.s $f12, $f6, $f4 /* 877674 80240794 C640009C */ lwc1 $f0, 0x9c($s2) /* 877678 80240798 46001501 */ sub.s $f20, $f2, $f0 /* 87767C 8024079C 46006084 */ sqrt.s $f2, $f12 /* 877680 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 877684 802407A4 00000000 */ nop +/* 877684 802407A4 00000000 */ nop /* 877688 802407A8 45010004 */ bc1t .L802407BC -/* 87768C 802407AC 00000000 */ nop +/* 87768C 802407AC 00000000 */ nop /* 877690 802407B0 0C0187BC */ jal sqrtf -/* 877694 802407B4 00000000 */ nop +/* 877694 802407B4 00000000 */ nop /* 877698 802407B8 46000086 */ mov.s $f2, $f0 .L802407BC: /* 87769C 802407BC 44800000 */ mtc1 $zero, $f0 -/* 8776A0 802407C0 00000000 */ nop +/* 8776A0 802407C0 00000000 */ nop /* 8776A4 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 8776A8 802407C8 00000000 */ nop +/* 8776A8 802407C8 00000000 */ nop /* 8776AC 802407CC 45000016 */ bc1f .L80240828 /* 8776B0 802407D0 46001106 */ mov.s $f4, $f2 /* 8776B4 802407D4 860200A8 */ lh $v0, 0xa8($s0) /* 8776B8 802407D8 44820000 */ mtc1 $v0, $f0 -/* 8776BC 802407DC 00000000 */ nop +/* 8776BC 802407DC 00000000 */ nop /* 8776C0 802407E0 46800020 */ cvt.s.w $f0, $f0 /* 8776C4 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 8776C8 802407E8 00000000 */ nop +/* 8776C8 802407E8 00000000 */ nop /* 8776CC 802407EC 4500000F */ bc1f .L8024082C /* 8776D0 802407F0 0000882D */ daddu $s1, $zero, $zero /* 8776D4 802407F4 860200A6 */ lh $v0, 0xa6($s0) /* 8776D8 802407F8 3C013F00 */ lui $at, 0x3f00 /* 8776DC 802407FC 44811000 */ mtc1 $at, $f2 /* 8776E0 80240800 44820000 */ mtc1 $v0, $f0 -/* 8776E4 80240804 00000000 */ nop +/* 8776E4 80240804 00000000 */ nop /* 8776E8 80240808 46800020 */ cvt.s.w $f0, $f0 /* 8776EC 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 8776F0 80240810 00000000 */ nop +/* 8776F0 80240810 00000000 */ nop /* 8776F4 80240814 4600203C */ c.lt.s $f4, $f0 -/* 8776F8 80240818 00000000 */ nop +/* 8776F8 80240818 00000000 */ nop /* 8776FC 8024081C 45000003 */ bc1f .L8024082C /* 877700 80240820 24020001 */ addiu $v0, $zero, 1 /* 877704 80240824 AE62008C */ sw $v0, 0x8c($s3) @@ -165,16 +165,16 @@ glabel func_802405F0_8774D0 /* 877738 80240858 C6400098 */ lwc1 $f0, 0x98($s2) /* 87773C 8024085C 46001081 */ sub.s $f2, $f2, $f0 /* 877740 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 877744 80240864 00000000 */ nop +/* 877744 80240864 00000000 */ nop /* 877748 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 87774C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) /* 877750 80240870 46001081 */ sub.s $f2, $f2, $f0 /* 877754 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 877758 80240878 00000000 */ nop +/* 877758 80240878 00000000 */ nop /* 87775C 8024087C 860200A8 */ lh $v0, 0xa8($s0) /* 877760 80240880 C602003C */ lwc1 $f2, 0x3c($s0) /* 877764 80240884 44820000 */ mtc1 $v0, $f0 -/* 877768 80240888 00000000 */ nop +/* 877768 80240888 00000000 */ nop /* 87776C 8024088C 46800020 */ cvt.s.w $f0, $f0 /* 877770 80240890 46001080 */ add.s $f2, $f2, $f0 /* 877774 80240894 461A1081 */ sub.s $f2, $f2, $f26 @@ -183,32 +183,32 @@ glabel func_802405F0_8774D0 /* 877780 802408A0 46001501 */ sub.s $f20, $f2, $f0 /* 877784 802408A4 46006004 */ sqrt.s $f0, $f12 /* 877788 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 87778C 802408AC 00000000 */ nop +/* 87778C 802408AC 00000000 */ nop /* 877790 802408B0 45010003 */ bc1t .L802408C0 -/* 877794 802408B4 00000000 */ nop +/* 877794 802408B4 00000000 */ nop /* 877798 802408B8 0C0187BC */ jal sqrtf -/* 87779C 802408BC 00000000 */ nop +/* 87779C 802408BC 00000000 */ nop .L802408C0: /* 8777A0 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 8777A4 802408C4 00000000 */ nop +/* 8777A4 802408C4 00000000 */ nop /* 8777A8 802408C8 45000015 */ bc1f .L80240920 /* 8777AC 802408CC 46000106 */ mov.s $f4, $f0 /* 8777B0 802408D0 860200A8 */ lh $v0, 0xa8($s0) /* 8777B4 802408D4 44820000 */ mtc1 $v0, $f0 -/* 8777B8 802408D8 00000000 */ nop +/* 8777B8 802408D8 00000000 */ nop /* 8777BC 802408DC 46800020 */ cvt.s.w $f0, $f0 /* 8777C0 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 8777C4 802408E4 00000000 */ nop +/* 8777C4 802408E4 00000000 */ nop /* 8777C8 802408E8 4500000E */ bc1f .L80240924 /* 8777CC 802408EC 26310001 */ addiu $s1, $s1, 1 /* 8777D0 802408F0 860200A6 */ lh $v0, 0xa6($s0) /* 8777D4 802408F4 44820000 */ mtc1 $v0, $f0 -/* 8777D8 802408F8 00000000 */ nop +/* 8777D8 802408F8 00000000 */ nop /* 8777DC 802408FC 46800020 */ cvt.s.w $f0, $f0 /* 8777E0 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 8777E4 80240904 00000000 */ nop +/* 8777E4 80240904 00000000 */ nop /* 8777E8 80240908 4600203C */ c.lt.s $f4, $f0 -/* 8777EC 8024090C 00000000 */ nop +/* 8777EC 8024090C 00000000 */ nop /* 8777F0 80240910 45000004 */ bc1f .L80240924 /* 8777F4 80240914 24020001 */ addiu $v0, $zero, 1 /* 8777F8 80240918 0809024C */ j .L80240930 @@ -218,7 +218,7 @@ glabel func_802405F0_8774D0 .L80240924: /* 877804 80240924 2A220040 */ slti $v0, $s1, 0x40 /* 877808 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 87780C 8024092C 00000000 */ nop +/* 87780C 8024092C 00000000 */ nop .L80240930: /* 877810 80240930 8FBF0020 */ lw $ra, 0x20($sp) /* 877814 80240934 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240034_879C14.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240034_879C14.s index cd734ddd90..65edb32f72 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240034_879C14.s +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240034_879C14.s @@ -22,16 +22,16 @@ glabel func_80240034_879C14 /* 879C54 80240074 00021023 */ negu $v0, $v0 .L80240078: /* 879C58 80240078 14400003 */ bnez $v0, .L80240088 -/* 879C5C 8024007C 00000000 */ nop +/* 879C5C 8024007C 00000000 */ nop /* 879C60 80240080 50E00017 */ beql $a3, $zero, .L802400E0 /* 879C64 80240084 0000102D */ daddu $v0, $zero, $zero .L80240088: /* 879C68 80240088 44822000 */ mtc1 $v0, $f4 -/* 879C6C 8024008C 00000000 */ nop +/* 879C6C 8024008C 00000000 */ nop /* 879C70 80240090 46802120 */ cvt.s.w $f4, $f4 /* 879C74 80240094 44062000 */ mfc1 $a2, $f4 /* 879C78 80240098 44872000 */ mtc1 $a3, $f4 -/* 879C7C 8024009C 00000000 */ nop +/* 879C7C 8024009C 00000000 */ nop /* 879C80 802400A0 46802120 */ cvt.s.w $f4, $f4 /* 879C84 802400A4 44806000 */ mtc1 $zero, $f12 /* 879C88 802400A8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240034_879C14 /* 879C90 802400B0 46006386 */ mov.s $f14, $f12 /* 879C94 802400B4 3C014270 */ lui $at, 0x4270 /* 879C98 802400B8 44811000 */ mtc1 $at, $f2 -/* 879C9C 802400BC 00000000 */ nop +/* 879C9C 802400BC 00000000 */ nop /* 879CA0 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 879CA4 802400C4 00000000 */ nop +/* 879CA4 802400C4 00000000 */ nop /* 879CA8 802400C8 45000004 */ bc1f .L802400DC /* 879CAC 802400CC 24020001 */ addiu $v0, $zero, 1 /* 879CB0 802400D0 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802403B4_879F94.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802403B4_879F94.s index b45ce95b76..a31dba1273 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802403B4_879F94.s +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802403B4_879F94.s @@ -8,7 +8,7 @@ glabel func_802403B4_879F94 /* 879FA0 802403C0 00822021 */ addu $a0, $a0, $v0 /* 879FA4 802403C4 90820014 */ lbu $v0, 0x14($a0) /* 879FA8 802403C8 10400009 */ beqz $v0, .L802403F0 -/* 879FAC 802403CC 00000000 */ nop +/* 879FAC 802403CC 00000000 */ nop /* 879FB0 802403D0 90820015 */ lbu $v0, 0x15($a0) /* 879FB4 802403D4 00022600 */ sll $a0, $v0, 0x18 /* 879FB8 802403D8 00041E03 */ sra $v1, $a0, 0x18 @@ -16,7 +16,7 @@ glabel func_802403B4_879F94 /* 879FC0 802403E0 00021403 */ sra $v0, $v0, 0x10 /* 879FC4 802403E4 0043102A */ slt $v0, $v0, $v1 /* 879FC8 802403E8 10400003 */ beqz $v0, .L802403F8 -/* 879FCC 802403EC 00000000 */ nop +/* 879FCC 802403EC 00000000 */ nop .L802403F0: /* 879FD0 802403F0 03E00008 */ jr $ra /* 879FD4 802403F4 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802404AC_87A08C.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802404AC_87A08C.s index 77a9ab90a3..48ae100416 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802404AC_87A08C.s +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802404AC_87A08C.s @@ -108,20 +108,20 @@ glabel func_802404AC_87A08C /* 87A214 80240634 10400009 */ beqz $v0, .L8024065C /* 87A218 80240638 AEA20074 */ sw $v0, 0x74($s5) /* 87A21C 8024063C 0C03C4EC */ jal func_800F13B0 -/* 87A220 80240640 00000000 */ nop +/* 87A220 80240640 00000000 */ nop /* 87A224 80240644 8EA20070 */ lw $v0, 0x70($s5) /* 87A228 80240648 24420001 */ addiu $v0, $v0, 1 .L8024064C: /* 87A22C 8024064C AEA20070 */ sw $v0, 0x70($s5) /* 87A230 80240650 2842000F */ slti $v0, $v0, 0xf /* 87A234 80240654 10400003 */ beqz $v0, .L80240664 -/* 87A238 80240658 00000000 */ nop +/* 87A238 80240658 00000000 */ nop .L8024065C: /* 87A23C 8024065C 080901B3 */ j .L802406CC /* 87A240 80240660 0000102D */ daddu $v0, $zero, $zero .L80240664: /* 87A244 80240664 0C03C54E */ jal func_800F1538 -/* 87A248 80240668 00000000 */ nop +/* 87A248 80240668 00000000 */ nop /* 87A24C 8024066C 8EA30074 */ lw $v1, 0x74($s5) /* 87A250 80240670 240200FF */ addiu $v0, $zero, 0xff /* 87A254 80240674 10620010 */ beq $v1, $v0, .L802406B8 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802408E0_87A4C0.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802408E0_87A4C0.s index 5657cb6c88..56044ba288 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802408E0_87A4C0.s +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802408E0_87A4C0.s @@ -36,7 +36,7 @@ glabel func_802408E0_87A4C0 /* 87A53C 8024095C 0C00A88D */ jal sin_cos_deg /* 87A540 80240960 0040A82D */ daddu $s5, $v0, $zero /* 87A544 80240964 1200005D */ beqz $s0, .L80240ADC -/* 87A548 80240968 00000000 */ nop +/* 87A548 80240968 00000000 */ nop /* 87A54C 8024096C 0C00AB0A */ jal general_heap_malloc /* 87A550 80240970 24040068 */ addiu $a0, $zero, 0x68 /* 87A554 80240974 0040902D */ daddu $s2, $v0, $zero @@ -98,10 +98,10 @@ glabel func_802408E0_87A4C0 /* 87A62C 80240A4C C7A2001C */ lwc1 $f2, 0x1c($sp) /* 87A630 80240A50 C7A40020 */ lwc1 $f4, 0x20($sp) /* 87A634 80240A54 46041082 */ mul.s $f2, $f2, $f4 -/* 87A638 80240A58 00000000 */ nop +/* 87A638 80240A58 00000000 */ nop /* 87A63C 80240A5C C7A00018 */ lwc1 $f0, 0x18($sp) /* 87A640 80240A60 46040002 */ mul.s $f0, $f0, $f4 -/* 87A644 80240A64 00000000 */ nop +/* 87A644 80240A64 00000000 */ nop /* 87A648 80240A68 E6020038 */ swc1 $f2, 0x38($s0) /* 87A64C 80240A6C E6000050 */ swc1 $f0, 0x50($s0) /* 87A650 80240A70 8E42005C */ lw $v0, 0x5c($s2) @@ -142,12 +142,12 @@ glabel func_802408E0_87A4C0 /* 87A6D8 80240AF8 10600007 */ beqz $v1, .L80240B18 /* 87A6DC 80240AFC 24040005 */ addiu $a0, $zero, 5 /* 87A6E0 80240B00 0809032C */ j .L80240CB0 -/* 87A6E4 80240B04 00000000 */ nop +/* 87A6E4 80240B04 00000000 */ nop .L80240B08: /* 87A6E8 80240B08 10620058 */ beq $v1, $v0, .L80240C6C -/* 87A6EC 80240B0C 00000000 */ nop +/* 87A6EC 80240B0C 00000000 */ nop /* 87A6F0 80240B10 0809032C */ j .L80240CB0 -/* 87A6F4 80240B14 00000000 */ nop +/* 87A6F4 80240B14 00000000 */ nop .L80240B18: /* 87A6F8 80240B18 0000882D */ daddu $s1, $zero, $zero /* 87A6FC 80240B1C 3C148024 */ lui $s4, %hi(D_80243A48) @@ -174,11 +174,11 @@ glabel func_802408E0_87A4C0 /* 87A74C 80240B6C C7A4001C */ lwc1 $f4, 0x1c($sp) /* 87A750 80240B70 C7A00020 */ lwc1 $f0, 0x20($sp) /* 87A754 80240B74 46002102 */ mul.s $f4, $f4, $f0 -/* 87A758 80240B78 00000000 */ nop +/* 87A758 80240B78 00000000 */ nop /* 87A75C 80240B7C C7A20018 */ lwc1 $f2, 0x18($sp) /* 87A760 80240B80 26940004 */ addiu $s4, $s4, 4 /* 87A764 80240B84 46001082 */ mul.s $f2, $f2, $f0 -/* 87A768 80240B88 00000000 */ nop +/* 87A768 80240B88 00000000 */ nop /* 87A76C 80240B8C 26730004 */ addiu $s3, $s3, 4 /* 87A770 80240B90 26310001 */ addiu $s1, $s1, 1 /* 87A774 80240B94 2A220003 */ slti $v0, $s1, 3 @@ -215,11 +215,11 @@ glabel func_802408E0_87A4C0 /* 87A7E8 80240C08 C7A4001C */ lwc1 $f4, 0x1c($sp) /* 87A7EC 80240C0C C7A00020 */ lwc1 $f0, 0x20($sp) /* 87A7F0 80240C10 46002102 */ mul.s $f4, $f4, $f0 -/* 87A7F4 80240C14 00000000 */ nop +/* 87A7F4 80240C14 00000000 */ nop /* 87A7F8 80240C18 C7A20018 */ lwc1 $f2, 0x18($sp) /* 87A7FC 80240C1C 26940004 */ addiu $s4, $s4, 4 /* 87A800 80240C20 46001082 */ mul.s $f2, $f2, $f0 -/* 87A804 80240C24 00000000 */ nop +/* 87A804 80240C24 00000000 */ nop /* 87A808 80240C28 26730004 */ addiu $s3, $s3, 4 /* 87A80C 80240C2C 26310001 */ addiu $s1, $s1, 1 /* 87A810 80240C30 2A220003 */ slti $v0, $s1, 3 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240E18_87A9F8.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240E18_87A9F8.s index 38bebb2963..4be78582b8 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240E18_87A9F8.s +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240E18_87A9F8.s @@ -36,16 +36,16 @@ glabel func_80240E18_87A9F8 /* 87AA70 80240E90 10600007 */ beqz $v1, .L80240EB0 /* 87AA74 80240E94 240500FF */ addiu $a1, $zero, 0xff /* 87AA78 80240E98 080903CA */ j .L80240F28 -/* 87AA7C 80240E9C 00000000 */ nop +/* 87AA7C 80240E9C 00000000 */ nop .L80240EA0: /* 87AA80 80240EA0 10620019 */ beq $v1, $v0, .L80240F08 -/* 87AA84 80240EA4 00000000 */ nop +/* 87AA84 80240EA4 00000000 */ nop /* 87AA88 80240EA8 080903CA */ j .L80240F28 -/* 87AA8C 80240EAC 00000000 */ nop +/* 87AA8C 80240EAC 00000000 */ nop .L80240EB0: /* 87AA90 80240EB0 8E220074 */ lw $v0, 0x74($s1) /* 87AA94 80240EB4 14450004 */ bne $v0, $a1, .L80240EC8 -/* 87AA98 80240EB8 00000000 */ nop +/* 87AA98 80240EB8 00000000 */ nop /* 87AA9C 80240EBC AE240070 */ sw $a0, 0x70($s1) /* 87AAA0 80240EC0 AE200078 */ sw $zero, 0x78($s1) /* 87AAA4 80240EC4 8E220074 */ lw $v0, 0x74($s1) @@ -57,7 +57,7 @@ glabel func_80240E18_87A9F8 /* 87AAB8 80240ED8 50400013 */ beql $v0, $zero, .L80240F28 /* 87AABC 80240EDC AE250074 */ sw $a1, 0x74($s1) /* 87AAC0 80240EE0 080903CA */ j .L80240F28 -/* 87AAC4 80240EE4 00000000 */ nop +/* 87AAC4 80240EE4 00000000 */ nop .L80240EE8: /* 87AAC8 80240EE8 8E220078 */ lw $v0, 0x78($s1) /* 87AACC 80240EEC 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240FE8_87ABC8.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240FE8_87ABC8.s index 1bb4feac14..5bf7384ffd 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240FE8_87ABC8.s +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240FE8_87ABC8.s @@ -15,5 +15,5 @@ glabel func_80240FE8_87ABC8 .L80241010: /* 87ABF0 80241010 03E00008 */ jr $ra /* 87ABF4 80241014 24020002 */ addiu $v0, $zero, 2 -/* 87ABF8 80241018 00000000 */ nop -/* 87ABFC 8024101C 00000000 */ nop +/* 87ABF8 80241018 00000000 */ nop +/* 87ABFC 8024101C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241020_87AC00.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241020_87AC00.s index 647d4611ba..058c191bf7 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241020_87AC00.s +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241020_87AC00.s @@ -32,58 +32,58 @@ glabel func_80241020_87AC00 /* 87AC6C 8024108C C6400098 */ lwc1 $f0, 0x98($s2) /* 87AC70 80241090 46001081 */ sub.s $f2, $f2, $f0 /* 87AC74 80241094 46021182 */ mul.s $f6, $f2, $f2 -/* 87AC78 80241098 00000000 */ nop +/* 87AC78 80241098 00000000 */ nop /* 87AC7C 8024109C C64000A0 */ lwc1 $f0, 0xa0($s2) /* 87AC80 802410A0 C4620030 */ lwc1 $f2, 0x30($v1) /* 87AC84 802410A4 46001081 */ sub.s $f2, $f2, $f0 /* 87AC88 802410A8 46021102 */ mul.s $f4, $f2, $f2 -/* 87AC8C 802410AC 00000000 */ nop +/* 87AC8C 802410AC 00000000 */ nop /* 87AC90 802410B0 846200B0 */ lh $v0, 0xb0($v1) /* 87AC94 802410B4 C462002C */ lwc1 $f2, 0x2c($v1) /* 87AC98 802410B8 44820000 */ mtc1 $v0, $f0 -/* 87AC9C 802410BC 00000000 */ nop +/* 87AC9C 802410BC 00000000 */ nop /* 87ACA0 802410C0 46800020 */ cvt.s.w $f0, $f0 /* 87ACA4 802410C4 46001080 */ add.s $f2, $f2, $f0 /* 87ACA8 802410C8 3C013FC0 */ lui $at, 0x3fc0 /* 87ACAC 802410CC 44810000 */ mtc1 $at, $f0 -/* 87ACB0 802410D0 00000000 */ nop +/* 87ACB0 802410D0 00000000 */ nop /* 87ACB4 802410D4 46001081 */ sub.s $f2, $f2, $f0 /* 87ACB8 802410D8 46043300 */ add.s $f12, $f6, $f4 /* 87ACBC 802410DC C640009C */ lwc1 $f0, 0x9c($s2) /* 87ACC0 802410E0 46001501 */ sub.s $f20, $f2, $f0 /* 87ACC4 802410E4 46006084 */ sqrt.s $f2, $f12 /* 87ACC8 802410E8 46021032 */ c.eq.s $f2, $f2 -/* 87ACCC 802410EC 00000000 */ nop +/* 87ACCC 802410EC 00000000 */ nop /* 87ACD0 802410F0 45010004 */ bc1t .L80241104 /* 87ACD4 802410F4 0060882D */ daddu $s1, $v1, $zero /* 87ACD8 802410F8 0C0187BC */ jal sqrtf -/* 87ACDC 802410FC 00000000 */ nop +/* 87ACDC 802410FC 00000000 */ nop /* 87ACE0 80241100 46000086 */ mov.s $f2, $f0 .L80241104: /* 87ACE4 80241104 44800000 */ mtc1 $zero, $f0 -/* 87ACE8 80241108 00000000 */ nop +/* 87ACE8 80241108 00000000 */ nop /* 87ACEC 8024110C 4614003C */ c.lt.s $f0, $f20 -/* 87ACF0 80241110 00000000 */ nop +/* 87ACF0 80241110 00000000 */ nop /* 87ACF4 80241114 45000016 */ bc1f .L80241170 /* 87ACF8 80241118 46001106 */ mov.s $f4, $f2 /* 87ACFC 8024111C 862200B0 */ lh $v0, 0xb0($s1) /* 87AD00 80241120 44820000 */ mtc1 $v0, $f0 -/* 87AD04 80241124 00000000 */ nop +/* 87AD04 80241124 00000000 */ nop /* 87AD08 80241128 46800020 */ cvt.s.w $f0, $f0 /* 87AD0C 8024112C 4600A03C */ c.lt.s $f20, $f0 -/* 87AD10 80241130 00000000 */ nop +/* 87AD10 80241130 00000000 */ nop /* 87AD14 80241134 4500000E */ bc1f .L80241170 -/* 87AD18 80241138 00000000 */ nop +/* 87AD18 80241138 00000000 */ nop /* 87AD1C 8024113C 862200B2 */ lh $v0, 0xb2($s1) /* 87AD20 80241140 3C013F00 */ lui $at, 0x3f00 /* 87AD24 80241144 44811000 */ mtc1 $at, $f2 /* 87AD28 80241148 44820000 */ mtc1 $v0, $f0 -/* 87AD2C 8024114C 00000000 */ nop +/* 87AD2C 8024114C 00000000 */ nop /* 87AD30 80241150 46800020 */ cvt.s.w $f0, $f0 /* 87AD34 80241154 46020002 */ mul.s $f0, $f0, $f2 -/* 87AD38 80241158 00000000 */ nop +/* 87AD38 80241158 00000000 */ nop /* 87AD3C 8024115C 4600203C */ c.lt.s $f4, $f0 -/* 87AD40 80241160 00000000 */ nop +/* 87AD40 80241160 00000000 */ nop /* 87AD44 80241164 45000002 */ bc1f .L80241170 /* 87AD48 80241168 24020001 */ addiu $v0, $zero, 1 /* 87AD4C 8024116C AE62008C */ sw $v0, 0x8c($s3) @@ -92,58 +92,58 @@ glabel func_80241020_87AC00 /* 87AD54 80241174 C6400098 */ lwc1 $f0, 0x98($s2) /* 87AD58 80241178 46001081 */ sub.s $f2, $f2, $f0 /* 87AD5C 8024117C 46021182 */ mul.s $f6, $f2, $f2 -/* 87AD60 80241180 00000000 */ nop +/* 87AD60 80241180 00000000 */ nop /* 87AD64 80241184 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 87AD68 80241188 C6020040 */ lwc1 $f2, 0x40($s0) /* 87AD6C 8024118C 46001081 */ sub.s $f2, $f2, $f0 /* 87AD70 80241190 46021102 */ mul.s $f4, $f2, $f2 -/* 87AD74 80241194 00000000 */ nop +/* 87AD74 80241194 00000000 */ nop /* 87AD78 80241198 860200A8 */ lh $v0, 0xa8($s0) /* 87AD7C 8024119C C602003C */ lwc1 $f2, 0x3c($s0) /* 87AD80 802411A0 44820000 */ mtc1 $v0, $f0 -/* 87AD84 802411A4 00000000 */ nop +/* 87AD84 802411A4 00000000 */ nop /* 87AD88 802411A8 46800020 */ cvt.s.w $f0, $f0 /* 87AD8C 802411AC 46001080 */ add.s $f2, $f2, $f0 /* 87AD90 802411B0 3C013FC0 */ lui $at, 0x3fc0 /* 87AD94 802411B4 44810000 */ mtc1 $at, $f0 -/* 87AD98 802411B8 00000000 */ nop +/* 87AD98 802411B8 00000000 */ nop /* 87AD9C 802411BC 46001081 */ sub.s $f2, $f2, $f0 /* 87ADA0 802411C0 46043300 */ add.s $f12, $f6, $f4 /* 87ADA4 802411C4 C640009C */ lwc1 $f0, 0x9c($s2) /* 87ADA8 802411C8 46001501 */ sub.s $f20, $f2, $f0 /* 87ADAC 802411CC 46006084 */ sqrt.s $f2, $f12 /* 87ADB0 802411D0 46021032 */ c.eq.s $f2, $f2 -/* 87ADB4 802411D4 00000000 */ nop +/* 87ADB4 802411D4 00000000 */ nop /* 87ADB8 802411D8 45010004 */ bc1t .L802411EC -/* 87ADBC 802411DC 00000000 */ nop +/* 87ADBC 802411DC 00000000 */ nop /* 87ADC0 802411E0 0C0187BC */ jal sqrtf -/* 87ADC4 802411E4 00000000 */ nop +/* 87ADC4 802411E4 00000000 */ nop /* 87ADC8 802411E8 46000086 */ mov.s $f2, $f0 .L802411EC: /* 87ADCC 802411EC 44800000 */ mtc1 $zero, $f0 -/* 87ADD0 802411F0 00000000 */ nop +/* 87ADD0 802411F0 00000000 */ nop /* 87ADD4 802411F4 4614003C */ c.lt.s $f0, $f20 -/* 87ADD8 802411F8 00000000 */ nop +/* 87ADD8 802411F8 00000000 */ nop /* 87ADDC 802411FC 45000016 */ bc1f .L80241258 /* 87ADE0 80241200 46001106 */ mov.s $f4, $f2 /* 87ADE4 80241204 860200A8 */ lh $v0, 0xa8($s0) /* 87ADE8 80241208 44820000 */ mtc1 $v0, $f0 -/* 87ADEC 8024120C 00000000 */ nop +/* 87ADEC 8024120C 00000000 */ nop /* 87ADF0 80241210 46800020 */ cvt.s.w $f0, $f0 /* 87ADF4 80241214 4600A03C */ c.lt.s $f20, $f0 -/* 87ADF8 80241218 00000000 */ nop +/* 87ADF8 80241218 00000000 */ nop /* 87ADFC 8024121C 4500000F */ bc1f .L8024125C /* 87AE00 80241220 0000882D */ daddu $s1, $zero, $zero /* 87AE04 80241224 860200A6 */ lh $v0, 0xa6($s0) /* 87AE08 80241228 3C013F00 */ lui $at, 0x3f00 /* 87AE0C 8024122C 44811000 */ mtc1 $at, $f2 /* 87AE10 80241230 44820000 */ mtc1 $v0, $f0 -/* 87AE14 80241234 00000000 */ nop +/* 87AE14 80241234 00000000 */ nop /* 87AE18 80241238 46800020 */ cvt.s.w $f0, $f0 /* 87AE1C 8024123C 46020002 */ mul.s $f0, $f0, $f2 -/* 87AE20 80241240 00000000 */ nop +/* 87AE20 80241240 00000000 */ nop /* 87AE24 80241244 4600203C */ c.lt.s $f4, $f0 -/* 87AE28 80241248 00000000 */ nop +/* 87AE28 80241248 00000000 */ nop /* 87AE2C 8024124C 45000003 */ bc1f .L8024125C /* 87AE30 80241250 24020001 */ addiu $v0, $zero, 1 /* 87AE34 80241254 AE62008C */ sw $v0, 0x8c($s3) @@ -165,16 +165,16 @@ glabel func_80241020_87AC00 /* 87AE68 80241288 C6400098 */ lwc1 $f0, 0x98($s2) /* 87AE6C 8024128C 46001081 */ sub.s $f2, $f2, $f0 /* 87AE70 80241290 46021182 */ mul.s $f6, $f2, $f2 -/* 87AE74 80241294 00000000 */ nop +/* 87AE74 80241294 00000000 */ nop /* 87AE78 80241298 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 87AE7C 8024129C C6020040 */ lwc1 $f2, 0x40($s0) /* 87AE80 802412A0 46001081 */ sub.s $f2, $f2, $f0 /* 87AE84 802412A4 46021102 */ mul.s $f4, $f2, $f2 -/* 87AE88 802412A8 00000000 */ nop +/* 87AE88 802412A8 00000000 */ nop /* 87AE8C 802412AC 860200A8 */ lh $v0, 0xa8($s0) /* 87AE90 802412B0 C602003C */ lwc1 $f2, 0x3c($s0) /* 87AE94 802412B4 44820000 */ mtc1 $v0, $f0 -/* 87AE98 802412B8 00000000 */ nop +/* 87AE98 802412B8 00000000 */ nop /* 87AE9C 802412BC 46800020 */ cvt.s.w $f0, $f0 /* 87AEA0 802412C0 46001080 */ add.s $f2, $f2, $f0 /* 87AEA4 802412C4 461A1081 */ sub.s $f2, $f2, $f26 @@ -183,32 +183,32 @@ glabel func_80241020_87AC00 /* 87AEB0 802412D0 46001501 */ sub.s $f20, $f2, $f0 /* 87AEB4 802412D4 46006004 */ sqrt.s $f0, $f12 /* 87AEB8 802412D8 46000032 */ c.eq.s $f0, $f0 -/* 87AEBC 802412DC 00000000 */ nop +/* 87AEBC 802412DC 00000000 */ nop /* 87AEC0 802412E0 45010003 */ bc1t .L802412F0 -/* 87AEC4 802412E4 00000000 */ nop +/* 87AEC4 802412E4 00000000 */ nop /* 87AEC8 802412E8 0C0187BC */ jal sqrtf -/* 87AECC 802412EC 00000000 */ nop +/* 87AECC 802412EC 00000000 */ nop .L802412F0: /* 87AED0 802412F0 4614C03C */ c.lt.s $f24, $f20 -/* 87AED4 802412F4 00000000 */ nop +/* 87AED4 802412F4 00000000 */ nop /* 87AED8 802412F8 45000015 */ bc1f .L80241350 /* 87AEDC 802412FC 46000106 */ mov.s $f4, $f0 /* 87AEE0 80241300 860200A8 */ lh $v0, 0xa8($s0) /* 87AEE4 80241304 44820000 */ mtc1 $v0, $f0 -/* 87AEE8 80241308 00000000 */ nop +/* 87AEE8 80241308 00000000 */ nop /* 87AEEC 8024130C 46800020 */ cvt.s.w $f0, $f0 /* 87AEF0 80241310 4600A03C */ c.lt.s $f20, $f0 -/* 87AEF4 80241314 00000000 */ nop +/* 87AEF4 80241314 00000000 */ nop /* 87AEF8 80241318 4500000E */ bc1f .L80241354 /* 87AEFC 8024131C 26310001 */ addiu $s1, $s1, 1 /* 87AF00 80241320 860200A6 */ lh $v0, 0xa6($s0) /* 87AF04 80241324 44820000 */ mtc1 $v0, $f0 -/* 87AF08 80241328 00000000 */ nop +/* 87AF08 80241328 00000000 */ nop /* 87AF0C 8024132C 46800020 */ cvt.s.w $f0, $f0 /* 87AF10 80241330 46160002 */ mul.s $f0, $f0, $f22 -/* 87AF14 80241334 00000000 */ nop +/* 87AF14 80241334 00000000 */ nop /* 87AF18 80241338 4600203C */ c.lt.s $f4, $f0 -/* 87AF1C 8024133C 00000000 */ nop +/* 87AF1C 8024133C 00000000 */ nop /* 87AF20 80241340 45000004 */ bc1f .L80241354 /* 87AF24 80241344 24020001 */ addiu $v0, $zero, 1 /* 87AF28 80241348 080904D8 */ j .L80241360 @@ -218,7 +218,7 @@ glabel func_80241020_87AC00 .L80241354: /* 87AF34 80241354 2A220040 */ slti $v0, $s1, 0x40 /* 87AF38 80241358 1440FFC5 */ bnez $v0, .L80241270 -/* 87AF3C 8024135C 00000000 */ nop +/* 87AF3C 8024135C 00000000 */ nop .L80241360: /* 87AF40 80241360 8FBF0020 */ lw $ra, 0x20($sp) /* 87AF44 80241364 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241390_87AF70.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241390_87AF70.s index 5030fbb90c..5b953db0fa 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241390_87AF70.s +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241390_87AF70.s @@ -17,7 +17,7 @@ glabel func_80241390_87AF70 /* 87AF9C 802413BC 24840001 */ addiu $a0, $a0, 1 /* 87AFA0 802413C0 810200B4 */ lb $v0, 0xb4($t0) /* 87AFA4 802413C4 10470003 */ beq $v0, $a3, .L802413D4 -/* 87AFA8 802413C8 00000000 */ nop +/* 87AFA8 802413C8 00000000 */ nop /* 87AFAC 802413CC 14460003 */ bne $v0, $a2, .L802413DC /* 87AFB0 802413D0 24840001 */ addiu $a0, $a0, 1 .L802413D4: diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802413F0_87AFD0.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802413F0_87AFD0.s index d197481477..ac00e43358 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802413F0_87AFD0.s +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802413F0_87AFD0.s @@ -47,7 +47,7 @@ glabel func_802413F0_87AFD0 /* 87B078 80241498 0C0123F5 */ jal is_point_within_region /* 87B07C 8024149C 8E070038 */ lw $a3, 0x38($s0) /* 87B080 802414A0 1040000E */ beqz $v0, .L802414DC -/* 87B084 802414A4 00000000 */ nop +/* 87B084 802414A4 00000000 */ nop /* 87B088 802414A8 8E2200D0 */ lw $v0, 0xd0($s1) /* 87B08C 802414AC C60C0038 */ lwc1 $f12, 0x38($s0) /* 87B090 802414B0 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_802413F0_87AFD0 /* 87B0A4 802414C4 468031A0 */ cvt.s.w $f6, $f6 /* 87B0A8 802414C8 44073000 */ mfc1 $a3, $f6 /* 87B0AC 802414CC 0C00A720 */ jal atan2 -/* 87B0B0 802414D0 00000000 */ nop +/* 87B0B0 802414D0 00000000 */ nop /* 87B0B4 802414D4 08090543 */ j .L8024150C /* 87B0B8 802414D8 E600000C */ swc1 $f0, 0xc($s0) .L802414DC: @@ -66,7 +66,7 @@ glabel func_802413F0_87AFD0 /* 87B0C0 802414E0 2404003C */ addiu $a0, $zero, 0x3c /* 87B0C4 802414E4 C60C000C */ lwc1 $f12, 0xc($s0) /* 87B0C8 802414E8 44820000 */ mtc1 $v0, $f0 -/* 87B0CC 802414EC 00000000 */ nop +/* 87B0CC 802414EC 00000000 */ nop /* 87B0D0 802414F0 46800020 */ cvt.s.w $f0, $f0 /* 87B0D4 802414F4 46006300 */ add.s $f12, $f12, $f0 /* 87B0D8 802414F8 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_802413F0_87AFD0 /* 87B0FC 8024151C 8E2200D0 */ lw $v0, 0xd0($s1) /* 87B100 80241520 8C420014 */ lw $v0, 0x14($v0) /* 87B104 80241524 04410004 */ bgez $v0, .L80241538 -/* 87B108 80241528 00000000 */ nop +/* 87B108 80241528 00000000 */ nop /* 87B10C 8024152C C6400000 */ lwc1 $f0, ($s2) /* 87B110 80241530 08090556 */ j .L80241558 /* 87B114 80241534 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_802413F0_87AFD0 /* 87B118 80241538 3C018024 */ lui $at, %hi(D_802451B0) /* 87B11C 8024153C D42251B0 */ ldc1 $f2, %lo(D_802451B0)($at) /* 87B120 80241540 44820000 */ mtc1 $v0, $f0 -/* 87B124 80241544 00000000 */ nop +/* 87B124 80241544 00000000 */ nop /* 87B128 80241548 46800021 */ cvt.d.w $f0, $f0 /* 87B12C 8024154C 46220003 */ div.d $f0, $f0, $f2 /* 87B130 80241550 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_802413F0_87AFD0 /* 87B144 80241564 44801000 */ mtc1 $zero, $f2 /* 87B148 80241568 46000021 */ cvt.d.s $f0, $f0 /* 87B14C 8024156C 46220002 */ mul.d $f0, $f0, $f2 -/* 87B150 80241570 00000000 */ nop +/* 87B150 80241570 00000000 */ nop /* 87B154 80241574 24020001 */ addiu $v0, $zero, 1 /* 87B158 80241578 4620018D */ trunc.w.d $f6, $f0 /* 87B15C 8024157C E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802415A0_87B180.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802415A0_87B180.s index ecd848dbb4..613b739fad 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802415A0_87B180.s +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802415A0_87B180.s @@ -34,7 +34,7 @@ glabel func_802415A0_87B180 /* 87B1F4 80241614 44803000 */ mtc1 $zero, $f6 /* 87B1F8 80241618 46000021 */ cvt.d.s $f0, $f0 /* 87B1FC 8024161C 46260002 */ mul.d $f0, $f0, $f6 -/* 87B200 80241620 00000000 */ nop +/* 87B200 80241620 00000000 */ nop /* 87B204 80241624 24020001 */ addiu $v0, $zero, 1 /* 87B208 80241628 8E24006C */ lw $a0, 0x6c($s1) /* 87B20C 8024162C 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_802415A0_87B180 /* 87B268 80241688 C600003C */ lwc1 $f0, 0x3c($s0) /* 87B26C 8024168C 4600C001 */ sub.s $f0, $f24, $f0 /* 87B270 80241690 4600B03C */ c.lt.s $f22, $f0 -/* 87B274 80241694 00000000 */ nop +/* 87B274 80241694 00000000 */ nop /* 87B278 80241698 4500001B */ bc1f .L80241708 /* 87B27C 8024169C 34820010 */ ori $v0, $a0, 0x10 /* 87B280 802416A0 080905C2 */ j .L80241708 @@ -87,9 +87,9 @@ glabel func_802415A0_87B180 /* 87B2C4 802416E4 C7A00034 */ lwc1 $f0, 0x34($sp) /* 87B2C8 802416E8 4600D001 */ sub.s $f0, $f26, $f0 /* 87B2CC 802416EC 4600B03C */ c.lt.s $f22, $f0 -/* 87B2D0 802416F0 00000000 */ nop +/* 87B2D0 802416F0 00000000 */ nop /* 87B2D4 802416F4 45000004 */ bc1f .L80241708 -/* 87B2D8 802416F8 00000000 */ nop +/* 87B2D8 802416F8 00000000 */ nop /* 87B2DC 802416FC 8E22006C */ lw $v0, 0x6c($s1) /* 87B2E0 80241700 34420010 */ ori $v0, $v0, 0x10 /* 87B2E4 80241704 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_802415A0_87B180 /* 87B2EC 8024170C 24030011 */ addiu $v1, $zero, 0x11 /* 87B2F0 80241710 30420011 */ andi $v0, $v0, 0x11 /* 87B2F4 80241714 14430039 */ bne $v0, $v1, .L802417FC -/* 87B2F8 80241718 00000000 */ nop +/* 87B2F8 80241718 00000000 */ nop /* 87B2FC 8024171C 8E020000 */ lw $v0, ($s0) /* 87B300 80241720 30420008 */ andi $v0, $v0, 8 /* 87B304 80241724 1040000A */ beqz $v0, .L80241750 @@ -108,7 +108,7 @@ glabel func_802415A0_87B180 /* 87B314 80241734 D42051B8 */ ldc1 $f0, %lo(D_802451B8)($at) /* 87B318 80241738 460010A1 */ cvt.d.s $f2, $f2 /* 87B31C 8024173C 46201082 */ mul.d $f2, $f2, $f0 -/* 87B320 80241740 00000000 */ nop +/* 87B320 80241740 00000000 */ nop /* 87B324 80241744 4600A021 */ cvt.d.s $f0, $f20 /* 87B328 80241748 080905ED */ j .L802417B4 /* 87B32C 8024174C 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_802415A0_87B180 /* 87B37C 8024179C D42051C0 */ ldc1 $f0, %lo(D_802451C0)($at) /* 87B380 802417A0 460010A1 */ cvt.d.s $f2, $f2 /* 87B384 802417A4 46201082 */ mul.d $f2, $f2, $f0 -/* 87B388 802417A8 00000000 */ nop +/* 87B388 802417A8 00000000 */ nop /* 87B38C 802417AC 4600A021 */ cvt.d.s $f0, $f20 /* 87B390 802417B0 46220000 */ add.d $f0, $f0, $f2 .L802417B4: @@ -149,7 +149,7 @@ glabel func_802415A0_87B180 /* 87B3B0 802417D0 46000005 */ abs.s $f0, $f0 /* 87B3B4 802417D4 46000021 */ cvt.d.s $f0, $f0 /* 87B3B8 802417D8 4622003C */ c.lt.d $f0, $f2 -/* 87B3BC 802417DC 00000000 */ nop +/* 87B3BC 802417DC 00000000 */ nop /* 87B3C0 802417E0 45000036 */ bc1f .L802418BC /* 87B3C4 802417E4 2403FFEF */ addiu $v1, $zero, -0x11 /* 87B3C8 802417E8 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_802415A0_87B180 .L802417FC: /* 87B3DC 802417FC 8E220070 */ lw $v0, 0x70($s1) /* 87B3E0 80241800 1840002E */ blez $v0, .L802418BC -/* 87B3E4 80241804 00000000 */ nop +/* 87B3E4 80241804 00000000 */ nop /* 87B3E8 80241808 C62C0074 */ lwc1 $f12, 0x74($s1) /* 87B3EC 8024180C 0C00A8BB */ jal sin_deg /* 87B3F0 80241810 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_802415A0_87B180 /* 87B448 80241868 27A70030 */ addiu $a3, $sp, 0x30 .L8024186C: /* 87B44C 8024186C 10400007 */ beqz $v0, .L8024188C -/* 87B450 80241870 00000000 */ nop +/* 87B450 80241870 00000000 */ nop /* 87B454 80241874 4616A082 */ mul.s $f2, $f20, $f22 -/* 87B458 80241878 00000000 */ nop +/* 87B458 80241878 00000000 */ nop /* 87B45C 8024187C C7A0002C */ lwc1 $f0, 0x2c($sp) /* 87B460 80241880 461A0000 */ add.s $f0, $f0, $f26 /* 87B464 80241884 08090626 */ j .L80241898 /* 87B468 80241888 46020000 */ add.s $f0, $f0, $f2 .L8024188C: /* 87B46C 8024188C 4616A002 */ mul.s $f0, $f20, $f22 -/* 87B470 80241890 00000000 */ nop +/* 87B470 80241890 00000000 */ nop /* 87B474 80241894 4600C000 */ add.s $f0, $f24, $f0 .L80241898: /* 87B478 80241898 E600003C */ swc1 $f0, 0x3c($s0) /* 87B47C 8024189C 8E220074 */ lw $v0, 0x74($s1) /* 87B480 802418A0 2442000A */ addiu $v0, $v0, 0xa /* 87B484 802418A4 44826000 */ mtc1 $v0, $f12 -/* 87B488 802418A8 00000000 */ nop +/* 87B488 802418A8 00000000 */ nop /* 87B48C 802418AC 0C00A6C9 */ jal clamp_angle /* 87B490 802418B0 46806320 */ cvt.s.w $f12, $f12 /* 87B494 802418B4 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_802415A0_87B180 /* 87B4A4 802418C4 2442FFFF */ addiu $v0, $v0, -1 /* 87B4A8 802418C8 8E430014 */ lw $v1, 0x14($s2) /* 87B4AC 802418CC 04600048 */ bltz $v1, .L802419F0 -/* 87B4B0 802418D0 00000000 */ nop +/* 87B4B0 802418D0 00000000 */ nop /* 87B4B4 802418D4 8E620074 */ lw $v0, 0x74($s3) /* 87B4B8 802418D8 1C400042 */ bgtz $v0, .L802419E4 /* 87B4BC 802418DC 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_802415A0_87B180 /* 87B4C4 802418E4 860200A8 */ lh $v0, 0xa8($s0) /* 87B4C8 802418E8 C602003C */ lwc1 $f2, 0x3c($s0) /* 87B4CC 802418EC 44820000 */ mtc1 $v0, $f0 -/* 87B4D0 802418F0 00000000 */ nop +/* 87B4D0 802418F0 00000000 */ nop /* 87B4D4 802418F4 46800020 */ cvt.s.w $f0, $f0 /* 87B4D8 802418F8 46001080 */ add.s $f2, $f2, $f0 /* 87B4DC 802418FC 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_802415A0_87B180 /* 87B4F8 80241918 C440002C */ lwc1 $f0, 0x2c($v0) /* 87B4FC 8024191C 46000021 */ cvt.d.s $f0, $f0 /* 87B500 80241920 4622003C */ c.lt.d $f0, $f2 -/* 87B504 80241924 00000000 */ nop +/* 87B504 80241924 00000000 */ nop /* 87B508 80241928 4500002C */ bc1f .L802419DC /* 87B50C 8024192C 02A0202D */ daddu $a0, $s5, $zero /* 87B510 80241930 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_802415A0_87B180 /* 87B54C 8024196C 3C01C1A0 */ lui $at, 0xc1a0 /* 87B550 80241970 44812000 */ mtc1 $at, $f4 /* 87B554 80241974 44834000 */ mtc1 $v1, $f8 -/* 87B558 80241978 00000000 */ nop +/* 87B558 80241978 00000000 */ nop /* 87B55C 8024197C 46804220 */ cvt.s.w $f8, $f8 /* 87B560 80241980 44074000 */ mfc1 $a3, $f8 /* 87B564 80241984 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_802415A0_87B180 /* 87B618 80241A38 0C0123F5 */ jal is_point_within_region /* 87B61C 80241A3C 8E070038 */ lw $a3, 0x38($s0) /* 87B620 80241A40 1040001A */ beqz $v0, .L80241AAC -/* 87B624 80241A44 00000000 */ nop +/* 87B624 80241A44 00000000 */ nop /* 87B628 80241A48 8E060038 */ lw $a2, 0x38($s0) /* 87B62C 80241A4C 8E2200D0 */ lw $v0, 0xd0($s1) /* 87B630 80241A50 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_802415A0_87B180 /* 87B644 80241A64 468073A0 */ cvt.s.w $f14, $f14 /* 87B648 80241A68 C6020018 */ lwc1 $f2, 0x18($s0) /* 87B64C 80241A6C 4600103C */ c.lt.s $f2, $f0 -/* 87B650 80241A70 00000000 */ nop +/* 87B650 80241A70 00000000 */ nop /* 87B654 80241A74 4500000D */ bc1f .L80241AAC /* 87B658 80241A78 E7A00034 */ swc1 $f0, 0x34($sp) /* 87B65C 80241A7C C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_802415A0_87B180 /* 87B698 80241AB8 00621825 */ or $v1, $v1, $v0 /* 87B69C 80241ABC 00741825 */ or $v1, $v1, $s4 /* 87B6A0 80241AC0 10600008 */ beqz $v1, .L80241AE4 -/* 87B6A4 80241AC4 00000000 */ nop +/* 87B6A4 80241AC4 00000000 */ nop /* 87B6A8 80241AC8 8602008C */ lh $v0, 0x8c($s0) /* 87B6AC 80241ACC 14400031 */ bnez $v0, .L80241B94 -/* 87B6B0 80241AD0 00000000 */ nop +/* 87B6B0 80241AD0 00000000 */ nop /* 87B6B4 80241AD4 8E050018 */ lw $a1, 0x18($s0) /* 87B6B8 80241AD8 8E06000C */ lw $a2, 0xc($s0) /* 87B6BC 80241ADC 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_802415A0_87B180 /* 87B6D0 80241AF0 44801000 */ mtc1 $zero, $f2 /* 87B6D4 80241AF4 46000021 */ cvt.d.s $f0, $f0 /* 87B6D8 80241AF8 46220002 */ mul.d $f0, $f0, $f2 -/* 87B6DC 80241AFC 00000000 */ nop +/* 87B6DC 80241AFC 00000000 */ nop /* 87B6E0 80241B00 4620020D */ trunc.w.d $f8, $f0 /* 87B6E4 80241B04 E628007C */ swc1 $f8, 0x7c($s1) /* 87B6E8 80241B08 8E420004 */ lw $v0, 4($s2) /* 87B6EC 80241B0C 18400021 */ blez $v0, .L80241B94 -/* 87B6F0 80241B10 00000000 */ nop +/* 87B6F0 80241B10 00000000 */ nop /* 87B6F4 80241B14 8602008E */ lh $v0, 0x8e($s0) /* 87B6F8 80241B18 9603008E */ lhu $v1, 0x8e($s0) /* 87B6FC 80241B1C 18400005 */ blez $v0, .L80241B34 @@ -375,7 +375,7 @@ glabel func_802415A0_87B180 /* 87B704 80241B24 A602008E */ sh $v0, 0x8e($s0) /* 87B708 80241B28 00021400 */ sll $v0, $v0, 0x10 /* 87B70C 80241B2C 1C400019 */ bgtz $v0, .L80241B94 -/* 87B710 80241B30 00000000 */ nop +/* 87B710 80241B30 00000000 */ nop .L80241B34: /* 87B714 80241B34 240403E8 */ addiu $a0, $zero, 0x3e8 /* 87B718 80241B38 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_802415A0_87B180 /* 87B760 80241B80 18400003 */ blez $v0, .L80241B90 /* 87B764 80241B84 28620003 */ slti $v0, $v1, 3 /* 87B768 80241B88 10400002 */ beqz $v0, .L80241B94 -/* 87B76C 80241B8C 00000000 */ nop +/* 87B76C 80241B8C 00000000 */ nop .L80241B90: /* 87B770 80241B90 AE600070 */ sw $zero, 0x70($s3) .L80241B94: diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241C88_87B868.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241C88_87B868.s index 77868bd916..479280f112 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241C88_87B868.s +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241C88_87B868.s @@ -42,11 +42,11 @@ glabel func_80241C88_87B868 .L80241D1C: /* 87B8FC 80241D1C 8E220070 */ lw $v0, 0x70($s1) /* 87B900 80241D20 18400034 */ blez $v0, .L80241DF4 -/* 87B904 80241D24 00000000 */ nop +/* 87B904 80241D24 00000000 */ nop /* 87B908 80241D28 C62C0074 */ lwc1 $f12, 0x74($s1) /* 87B90C 80241D2C 46806320 */ cvt.s.w $f12, $f12 /* 87B910 80241D30 44820000 */ mtc1 $v0, $f0 -/* 87B914 80241D34 00000000 */ nop +/* 87B914 80241D34 00000000 */ nop /* 87B918 80241D38 46800020 */ cvt.s.w $f0, $f0 /* 87B91C 80241D3C 46000021 */ cvt.d.s $f0, $f0 /* 87B920 80241D40 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_80241C88_87B868 /* 87B980 80241DA0 27A70030 */ addiu $a3, $sp, 0x30 .L80241DA4: /* 87B984 80241DA4 10400007 */ beqz $v0, .L80241DC4 -/* 87B988 80241DA8 00000000 */ nop +/* 87B988 80241DA8 00000000 */ nop /* 87B98C 80241DAC 4616A082 */ mul.s $f2, $f20, $f22 -/* 87B990 80241DB0 00000000 */ nop +/* 87B990 80241DB0 00000000 */ nop /* 87B994 80241DB4 C7A0002C */ lwc1 $f0, 0x2c($sp) /* 87B998 80241DB8 46180000 */ add.s $f0, $f0, $f24 /* 87B99C 80241DBC 08090774 */ j .L80241DD0 /* 87B9A0 80241DC0 46020000 */ add.s $f0, $f0, $f2 .L80241DC4: /* 87B9A4 80241DC4 4616A002 */ mul.s $f0, $f20, $f22 -/* 87B9A8 80241DC8 00000000 */ nop +/* 87B9A8 80241DC8 00000000 */ nop /* 87B9AC 80241DCC 4600D000 */ add.s $f0, $f26, $f0 .L80241DD0: /* 87B9B0 80241DD0 E600003C */ swc1 $f0, 0x3c($s0) /* 87B9B4 80241DD4 8E220074 */ lw $v0, 0x74($s1) /* 87B9B8 80241DD8 2442000A */ addiu $v0, $v0, 0xa /* 87B9BC 80241DDC 44826000 */ mtc1 $v0, $f12 -/* 87B9C0 80241DE0 00000000 */ nop +/* 87B9C0 80241DE0 00000000 */ nop /* 87B9C4 80241DE4 0C00A6C9 */ jal clamp_angle /* 87B9C8 80241DE8 46806320 */ cvt.s.w $f12, $f12 /* 87B9CC 80241DEC 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_80241C88_87B868 /* 87B9E0 80241E00 860200A8 */ lh $v0, 0xa8($s0) /* 87B9E4 80241E04 C600003C */ lwc1 $f0, 0x3c($s0) /* 87B9E8 80241E08 44821000 */ mtc1 $v0, $f2 -/* 87B9EC 80241E0C 00000000 */ nop +/* 87B9EC 80241E0C 00000000 */ nop /* 87B9F0 80241E10 468010A0 */ cvt.s.w $f2, $f2 /* 87B9F4 80241E14 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 87B9F8 80241E18 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_80241C88_87B868 /* 87BA14 80241E34 46240000 */ add.d $f0, $f0, $f4 /* 87BA18 80241E38 460010A1 */ cvt.d.s $f2, $f2 /* 87BA1C 80241E3C 4620103C */ c.lt.d $f2, $f0 -/* 87BA20 80241E40 00000000 */ nop +/* 87BA20 80241E40 00000000 */ nop /* 87BA24 80241E44 4500002E */ bc1f .L80241F00 /* 87BA28 80241E48 0280202D */ daddu $a0, $s4, $zero /* 87BA2C 80241E4C 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_80241C88_87B868 /* 87BA6C 80241E8C 3C01C1A0 */ lui $at, 0xc1a0 /* 87BA70 80241E90 44812000 */ mtc1 $at, $f4 /* 87BA74 80241E94 44834000 */ mtc1 $v1, $f8 -/* 87BA78 80241E98 00000000 */ nop +/* 87BA78 80241E98 00000000 */ nop /* 87BA7C 80241E9C 46804220 */ cvt.s.w $f8, $f8 /* 87BA80 80241EA0 44074000 */ mfc1 $a3, $f8 /* 87BA84 80241EA4 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_80241C88_87B868 .L80241F00: /* 87BAE0 80241F00 8602008C */ lh $v0, 0x8c($s0) /* 87BAE4 80241F04 14400025 */ bnez $v0, .L80241F9C -/* 87BAE8 80241F08 00000000 */ nop +/* 87BAE8 80241F08 00000000 */ nop /* 87BAEC 80241F0C 8602008E */ lh $v0, 0x8e($s0) /* 87BAF0 80241F10 1C400022 */ bgtz $v0, .L80241F9C -/* 87BAF4 80241F14 00000000 */ nop +/* 87BAF4 80241F14 00000000 */ nop /* 87BAF8 80241F18 8E620074 */ lw $v0, 0x74($s3) /* 87BAFC 80241F1C 2442FFFF */ addiu $v0, $v0, -1 /* 87BB00 80241F20 1840001D */ blez $v0, .L80241F98 @@ -183,7 +183,7 @@ glabel func_80241C88_87B868 /* 87BB0C 80241F2C 9442002A */ lhu $v0, 0x2a($v0) /* 87BB10 80241F30 30420010 */ andi $v0, $v0, 0x10 /* 87BB14 80241F34 14400007 */ bnez $v0, .L80241F54 -/* 87BB18 80241F38 00000000 */ nop +/* 87BB18 80241F38 00000000 */ nop /* 87BB1C 80241F3C C600000C */ lwc1 $f0, 0xc($s0) /* 87BB20 80241F40 3C014334 */ lui $at, 0x4334 /* 87BB24 80241F44 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802420B0_87BC90.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802420B0_87BC90.s index cba4da0cee..6acc1c962e 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802420B0_87BC90.s +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802420B0_87BC90.s @@ -60,18 +60,18 @@ glabel func_802420B0_87BC90 /* 87BD68 80242188 C6200038 */ lwc1 $f0, 0x38($s1) /* 87BD6C 8024218C 4600018D */ trunc.w.s $f6, $f0 /* 87BD70 80242190 44023000 */ mfc1 $v0, $f6 -/* 87BD74 80242194 00000000 */ nop +/* 87BD74 80242194 00000000 */ nop /* 87BD78 80242198 A6420010 */ sh $v0, 0x10($s2) /* 87BD7C 8024219C C620003C */ lwc1 $f0, 0x3c($s1) /* 87BD80 802421A0 4600018D */ trunc.w.s $f6, $f0 /* 87BD84 802421A4 44023000 */ mfc1 $v0, $f6 -/* 87BD88 802421A8 00000000 */ nop +/* 87BD88 802421A8 00000000 */ nop /* 87BD8C 802421AC A6420012 */ sh $v0, 0x12($s2) /* 87BD90 802421B0 C6200040 */ lwc1 $f0, 0x40($s1) /* 87BD94 802421B4 A2430007 */ sb $v1, 7($s2) /* 87BD98 802421B8 4600018D */ trunc.w.s $f6, $f0 /* 87BD9C 802421BC 44023000 */ mfc1 $v0, $f6 -/* 87BDA0 802421C0 00000000 */ nop +/* 87BDA0 802421C0 00000000 */ nop /* 87BDA4 802421C4 A6420014 */ sh $v0, 0x14($s2) .L802421C8: /* 87BDA8 802421C8 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242248_87BE28.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242248_87BE28.s index 5ad59d1bf7..a270270a11 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242248_87BE28.s +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242248_87BE28.s @@ -42,9 +42,9 @@ glabel func_80242248_87BE28 /* 87BEBC 802422DC 44801800 */ mtc1 $zero, $f3 /* 87BEC0 802422E0 46002021 */ cvt.d.s $f0, $f4 /* 87BEC4 802422E4 4620103E */ c.le.d $f2, $f0 -/* 87BEC8 802422E8 00000000 */ nop +/* 87BEC8 802422E8 00000000 */ nop /* 87BECC 802422EC 45000030 */ bc1f .L802423B0 -/* 87BED0 802422F0 00000000 */ nop +/* 87BED0 802422F0 00000000 */ nop /* 87BED4 802422F4 C600003C */ lwc1 $f0, 0x3c($s0) /* 87BED8 802422F8 46040000 */ add.s $f0, $f0, $f4 /* 87BEDC 802422FC E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_80242248_87BE28 /* 87BF3C 8024235C 27A70020 */ addiu $a3, $sp, 0x20 .L80242360: /* 87BF40 80242360 1040000B */ beqz $v0, .L80242390 -/* 87BF44 80242364 00000000 */ nop +/* 87BF44 80242364 00000000 */ nop /* 87BF48 80242368 C7A0001C */ lwc1 $f0, 0x1c($sp) /* 87BF4C 8024236C 46140080 */ add.s $f2, $f0, $f20 /* 87BF50 80242370 C600003C */ lwc1 $f0, 0x3c($s0) /* 87BF54 80242374 4600103E */ c.le.s $f2, $f0 -/* 87BF58 80242378 00000000 */ nop +/* 87BF58 80242378 00000000 */ nop /* 87BF5C 8024237C 4500008D */ bc1f .L802425B4 -/* 87BF60 80242380 00000000 */ nop +/* 87BF60 80242380 00000000 */ nop /* 87BF64 80242384 E602003C */ swc1 $f2, 0x3c($s0) /* 87BF68 80242388 0809096D */ j .L802425B4 /* 87BF6C 8024238C AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_80242248_87BE28 /* 87BF70 80242390 C602003C */ lwc1 $f2, 0x3c($s0) /* 87BF74 80242394 C6000064 */ lwc1 $f0, 0x64($s0) /* 87BF78 80242398 4602003E */ c.le.s $f0, $f2 -/* 87BF7C 8024239C 00000000 */ nop +/* 87BF7C 8024239C 00000000 */ nop /* 87BF80 802423A0 45030084 */ bc1tl .L802425B4 /* 87BF84 802423A4 AE400070 */ sw $zero, 0x70($s2) /* 87BF88 802423A8 0809096D */ j .L802425B4 -/* 87BF8C 802423AC 00000000 */ nop +/* 87BF8C 802423AC 00000000 */ nop .L802423B0: /* 87BF90 802423B0 4622003C */ c.lt.d $f0, $f2 -/* 87BF94 802423B4 00000000 */ nop +/* 87BF94 802423B4 00000000 */ nop /* 87BF98 802423B8 4500007E */ bc1f .L802425B4 -/* 87BF9C 802423BC 00000000 */ nop +/* 87BF9C 802423BC 00000000 */ nop /* 87BFA0 802423C0 9602008E */ lhu $v0, 0x8e($s0) /* 87BFA4 802423C4 24420001 */ addiu $v0, $v0, 1 /* 87BFA8 802423C8 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_80242248_87BE28 /* 87BFB4 802423D4 00021403 */ sra $v0, $v0, 0x10 /* 87BFB8 802423D8 0043102A */ slt $v0, $v0, $v1 /* 87BFBC 802423DC 14400026 */ bnez $v0, .L80242478 -/* 87BFC0 802423E0 00000000 */ nop +/* 87BFC0 802423E0 00000000 */ nop /* 87BFC4 802423E4 C60C0038 */ lwc1 $f12, 0x38($s0) /* 87BFC8 802423E8 C60E0040 */ lwc1 $f14, 0x40($s0) /* 87BFCC 802423EC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_80242248_87BE28 /* 87BFF8 80242418 8E62001C */ lw $v0, 0x1c($s3) /* 87BFFC 8024241C 46001005 */ abs.s $f0, $f2 /* 87C000 80242420 44822000 */ mtc1 $v0, $f4 -/* 87C004 80242424 00000000 */ nop +/* 87C004 80242424 00000000 */ nop /* 87C008 80242428 46802120 */ cvt.s.w $f4, $f4 /* 87C00C 8024242C 4600203C */ c.lt.s $f4, $f0 -/* 87C010 80242430 00000000 */ nop +/* 87C010 80242430 00000000 */ nop /* 87C014 80242434 4500000D */ bc1f .L8024246C -/* 87C018 80242438 00000000 */ nop +/* 87C018 80242438 00000000 */ nop /* 87C01C 8024243C 44800000 */ mtc1 $zero, $f0 /* 87C020 80242440 C614000C */ lwc1 $f20, 0xc($s0) /* 87C024 80242444 4600103C */ c.lt.s $f2, $f0 -/* 87C028 80242448 00000000 */ nop +/* 87C028 80242448 00000000 */ nop /* 87C02C 8024244C 45000006 */ bc1f .L80242468 /* 87C030 80242450 00021023 */ negu $v0, $v0 /* 87C034 80242454 44820000 */ mtc1 $v0, $f0 -/* 87C038 80242458 00000000 */ nop +/* 87C038 80242458 00000000 */ nop /* 87C03C 8024245C 46800020 */ cvt.s.w $f0, $f0 /* 87C040 80242460 0809091B */ j .L8024246C /* 87C044 80242464 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_80242248_87BE28 /* 87C06C 8024248C C600001C */ lwc1 $f0, 0x1c($s0) /* 87C070 80242490 46001080 */ add.s $f2, $f2, $f0 /* 87C074 80242494 4616103C */ c.lt.s $f2, $f22 -/* 87C078 80242498 00000000 */ nop +/* 87C078 80242498 00000000 */ nop /* 87C07C 8024249C 45020045 */ bc1fl .L802425B4 /* 87C080 802424A0 E602003C */ swc1 $f2, 0x3c($s0) /* 87C084 802424A4 0809096C */ j .L802425B0 @@ -169,7 +169,7 @@ glabel func_80242248_87BE28 /* 87C09C 802424BC C600001C */ lwc1 $f0, 0x1c($s0) /* 87C0A0 802424C0 C604003C */ lwc1 $f4, 0x3c($s0) /* 87C0A4 802424C4 44821000 */ mtc1 $v0, $f2 -/* 87C0A8 802424C8 00000000 */ nop +/* 87C0A8 802424C8 00000000 */ nop /* 87C0AC 802424CC 468010A0 */ cvt.s.w $f2, $f2 /* 87C0B0 802424D0 46000005 */ abs.s $f0, $f0 /* 87C0B4 802424D4 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_80242248_87BE28 /* 87C0F0 80242510 0C0372DF */ jal func_800DCB7C /* 87C0F4 80242514 27A70020 */ addiu $a3, $sp, 0x20 /* 87C0F8 80242518 10400015 */ beqz $v0, .L80242570 -/* 87C0FC 8024251C 00000000 */ nop +/* 87C0FC 8024251C 00000000 */ nop /* 87C100 80242520 860200A8 */ lh $v0, 0xa8($s0) /* 87C104 80242524 C604001C */ lwc1 $f4, 0x1c($s0) /* 87C108 80242528 44820000 */ mtc1 $v0, $f0 -/* 87C10C 8024252C 00000000 */ nop +/* 87C10C 8024252C 00000000 */ nop /* 87C110 80242530 46800020 */ cvt.s.w $f0, $f0 /* 87C114 80242534 46002085 */ abs.s $f2, $f4 /* 87C118 80242538 46020000 */ add.s $f0, $f0, $f2 /* 87C11C 8024253C C7A20024 */ lwc1 $f2, 0x24($sp) /* 87C120 80242540 4600103E */ c.le.s $f2, $f0 -/* 87C124 80242544 00000000 */ nop +/* 87C124 80242544 00000000 */ nop /* 87C128 80242548 45000005 */ bc1f .L80242560 -/* 87C12C 8024254C 00000000 */ nop +/* 87C12C 8024254C 00000000 */ nop /* 87C130 80242550 C7A0001C */ lwc1 $f0, 0x1c($sp) /* 87C134 80242554 AE00001C */ sw $zero, 0x1c($s0) /* 87C138 80242558 0809096D */ j .L802425B4 @@ -217,13 +217,13 @@ glabel func_80242248_87BE28 /* 87C154 80242574 860200A8 */ lh $v0, 0xa8($s0) /* 87C158 80242578 46163081 */ sub.s $f2, $f6, $f22 /* 87C15C 8024257C 44820000 */ mtc1 $v0, $f0 -/* 87C160 80242580 00000000 */ nop +/* 87C160 80242580 00000000 */ nop /* 87C164 80242584 46800020 */ cvt.s.w $f0, $f0 /* 87C168 80242588 46001080 */ add.s $f2, $f2, $f0 /* 87C16C 8024258C C604001C */ lwc1 $f4, 0x1c($s0) /* 87C170 80242590 46002005 */ abs.s $f0, $f4 /* 87C174 80242594 4602003C */ c.lt.s $f0, $f2 -/* 87C178 80242598 00000000 */ nop +/* 87C178 80242598 00000000 */ nop /* 87C17C 8024259C 45020005 */ bc1fl .L802425B4 /* 87C180 802425A0 AE00001C */ sw $zero, 0x1c($s0) /* 87C184 802425A4 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802425D8_87C1B8.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802425D8_87C1B8.s index 531f481a1e..627f8abb30 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802425D8_87C1B8.s +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802425D8_87C1B8.s @@ -49,15 +49,15 @@ glabel func_802425D8_87C1B8 /* 87C260 80242680 44802000 */ mtc1 $zero, $f4 /* 87C264 80242684 460010A1 */ cvt.d.s $f2, $f2 /* 87C268 80242688 46241082 */ mul.d $f2, $f2, $f4 -/* 87C26C 8024268C 00000000 */ nop +/* 87C26C 8024268C 00000000 */ nop /* 87C270 80242690 C7A0001C */ lwc1 $f0, 0x1c($sp) /* 87C274 80242694 46000021 */ cvt.d.s $f0, $f0 /* 87C278 80242698 46240002 */ mul.d $f0, $f0, $f4 -/* 87C27C 8024269C 00000000 */ nop +/* 87C27C 8024269C 00000000 */ nop /* 87C280 802426A0 3C013FE0 */ lui $at, 0x3fe0 /* 87C284 802426A4 44812800 */ mtc1 $at, $f5 /* 87C288 802426A8 44802000 */ mtc1 $zero, $f4 -/* 87C28C 802426AC 00000000 */ nop +/* 87C28C 802426AC 00000000 */ nop /* 87C290 802426B0 46241080 */ add.d $f2, $f2, $f4 /* 87C294 802426B4 AE000074 */ sw $zero, 0x74($s0) /* 87C298 802426B8 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s index f2534c3754..e8f466f08a 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s @@ -54,7 +54,7 @@ glabel func_802426FC_87C2DC /* 87C39C 802427BC 8E4300B0 */ lw $v1, 0xb0($s2) /* 87C3A0 802427C0 30620004 */ andi $v0, $v1, 4 /* 87C3A4 802427C4 10400007 */ beqz $v0, .L802427E4 -/* 87C3A8 802427C8 00000000 */ nop +/* 87C3A8 802427C8 00000000 */ nop /* 87C3AC 802427CC 824200B4 */ lb $v0, 0xb4($s2) /* 87C3B0 802427D0 1440003C */ bnez $v0, .L802428C4 /* 87C3B4 802427D4 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_802426FC_87C2DC /* 87C3C8 802427E8 2C62000F */ sltiu $v0, $v1, 0xf /* 87C3CC 802427EC 10400034 */ beqz $v0, .L802428C0 /* 87C3D0 802427F0 00031080 */ sll $v0, $v1, 2 -/* 87C3D4 802427F4 3C018024 */ lui $at, %hi(D_802451C8) +/* 87C3D4 802427F4 3C018024 */ lui $at, %hi(jtbl_802451C8_87EDA8) /* 87C3D8 802427F8 00220821 */ addu $at, $at, $v0 -/* 87C3DC 802427FC 8C2251C8 */ lw $v0, %lo(D_802451C8)($at) +/* 87C3DC 802427FC 8C2251C8 */ lw $v0, %lo(jtbl_802451C8_87EDA8)($at) /* 87C3E0 80242800 00400008 */ jr $v0 -/* 87C3E4 80242804 00000000 */ nop +/* 87C3E4 80242804 00000000 */ nop +glabel L80242808_87C3E8 /* 87C3E8 80242808 0280202D */ daddu $a0, $s4, $zero /* 87C3EC 8024280C 0200282D */ daddu $a1, $s0, $zero /* 87C3F0 80242810 0C0904FC */ jal func_802413F0_87AFD0 /* 87C3F4 80242814 0260302D */ daddu $a2, $s3, $zero +glabel L80242818_87C3F8 /* 87C3F8 80242818 0280202D */ daddu $a0, $s4, $zero /* 87C3FC 8024281C 0200282D */ daddu $a1, $s0, $zero /* 87C400 80242820 0C090568 */ jal func_802415A0_87B180 /* 87C404 80242824 0260302D */ daddu $a2, $s3, $zero /* 87C408 80242828 08090A31 */ j .L802428C4 /* 87C40C 8024282C 0000102D */ daddu $v0, $zero, $zero +glabel L80242830_87C410 /* 87C410 80242830 0280202D */ daddu $a0, $s4, $zero /* 87C414 80242834 0200282D */ daddu $a1, $s0, $zero /* 87C418 80242838 0C0906F2 */ jal tik_07_UnkNpcAIFunc1 /* 87C41C 8024283C 0260302D */ daddu $a2, $s3, $zero +glabel L80242840_87C420 /* 87C420 80242840 0280202D */ daddu $a0, $s4, $zero /* 87C424 80242844 0200282D */ daddu $a1, $s0, $zero /* 87C428 80242848 0C090722 */ jal func_80241C88_87B868 /* 87C42C 8024284C 0260302D */ daddu $a2, $s3, $zero /* 87C430 80242850 08090A31 */ j .L802428C4 /* 87C434 80242854 0000102D */ daddu $v0, $zero, $zero +glabel L80242858_87C438 /* 87C438 80242858 0280202D */ daddu $a0, $s4, $zero /* 87C43C 8024285C 0200282D */ daddu $a1, $s0, $zero /* 87C440 80242860 0C0907F3 */ jal tik_07_UnkNpcAIFunc2 /* 87C444 80242864 0260302D */ daddu $a2, $s3, $zero +glabel L80242868_87C448 /* 87C448 80242868 0280202D */ daddu $a0, $s4, $zero /* 87C44C 8024286C 0200282D */ daddu $a1, $s0, $zero /* 87C450 80242870 0C090811 */ jal func_80242044_87BC24 /* 87C454 80242874 0260302D */ daddu $a2, $s3, $zero /* 87C458 80242878 08090A31 */ j .L802428C4 /* 87C45C 8024287C 0000102D */ daddu $v0, $zero, $zero +glabel L80242880_87C460 /* 87C460 80242880 0280202D */ daddu $a0, $s4, $zero /* 87C464 80242884 0200282D */ daddu $a1, $s0, $zero /* 87C468 80242888 0C09082C */ jal func_802420B0_87BC90 /* 87C46C 8024288C 0260302D */ daddu $a2, $s3, $zero /* 87C470 80242890 08090A31 */ j .L802428C4 /* 87C474 80242894 0000102D */ daddu $v0, $zero, $zero +glabel L80242898_87C478 /* 87C478 80242898 0280202D */ daddu $a0, $s4, $zero /* 87C47C 8024289C 0200282D */ daddu $a1, $s0, $zero /* 87C480 802428A0 0C090879 */ jal tik_07_UnkNpcAIFunc3 /* 87C484 802428A4 0260302D */ daddu $a2, $s3, $zero /* 87C488 802428A8 08090A31 */ j .L802428C4 /* 87C48C 802428AC 0000102D */ daddu $v0, $zero, $zero +glabel L802428B0_87C490 /* 87C490 802428B0 0280202D */ daddu $a0, $s4, $zero /* 87C494 802428B4 0200282D */ daddu $a1, $s0, $zero /* 87C498 802428B8 0C090892 */ jal func_80242248_87BE28 /* 87C49C 802428BC 0260302D */ daddu $a2, $s3, $zero .L802428C0: +glabel L802428C0_87C4A0 /* 87C4A0 802428C0 0000102D */ daddu $v0, $zero, $zero .L802428C4: /* 87C4A4 802428C4 8FBF0048 */ lw $ra, 0x48($sp) @@ -129,5 +139,5 @@ glabel func_802426FC_87C2DC /* 87C4BC 802428DC 8FB00030 */ lw $s0, 0x30($sp) /* 87C4C0 802428E0 03E00008 */ jr $ra /* 87C4C4 802428E4 27BD0050 */ addiu $sp, $sp, 0x50 -/* 87C4C8 802428E8 00000000 */ nop -/* 87C4CC 802428EC 00000000 */ nop +/* 87C4C8 802428E8 00000000 */ nop +/* 87C4CC 802428EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_80240034_87EE24.s b/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_80240034_87EE24.s index 36e60eaeb7..b6d89ad2fb 100644 --- a/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_80240034_87EE24.s +++ b/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_80240034_87EE24.s @@ -22,16 +22,16 @@ glabel func_80240034_87EE24 /* 87EE64 80240074 00021023 */ negu $v0, $v0 .L80240078: /* 87EE68 80240078 14400003 */ bnez $v0, .L80240088 -/* 87EE6C 8024007C 00000000 */ nop +/* 87EE6C 8024007C 00000000 */ nop /* 87EE70 80240080 50E00017 */ beql $a3, $zero, .L802400E0 /* 87EE74 80240084 0000102D */ daddu $v0, $zero, $zero .L80240088: /* 87EE78 80240088 44822000 */ mtc1 $v0, $f4 -/* 87EE7C 8024008C 00000000 */ nop +/* 87EE7C 8024008C 00000000 */ nop /* 87EE80 80240090 46802120 */ cvt.s.w $f4, $f4 /* 87EE84 80240094 44062000 */ mfc1 $a2, $f4 /* 87EE88 80240098 44872000 */ mtc1 $a3, $f4 -/* 87EE8C 8024009C 00000000 */ nop +/* 87EE8C 8024009C 00000000 */ nop /* 87EE90 802400A0 46802120 */ cvt.s.w $f4, $f4 /* 87EE94 802400A4 44806000 */ mtc1 $zero, $f12 /* 87EE98 802400A8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240034_87EE24 /* 87EEA0 802400B0 46006386 */ mov.s $f14, $f12 /* 87EEA4 802400B4 3C014270 */ lui $at, 0x4270 /* 87EEA8 802400B8 44811000 */ mtc1 $at, $f2 -/* 87EEAC 802400BC 00000000 */ nop +/* 87EEAC 802400BC 00000000 */ nop /* 87EEB0 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 87EEB4 802400C4 00000000 */ nop +/* 87EEB4 802400C4 00000000 */ nop /* 87EEB8 802400C8 45000004 */ bc1f .L802400DC /* 87EEBC 802400CC 24020001 */ addiu $v0, $zero, 1 /* 87EEC0 802400D0 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_tik/tik_08/87F3E0/func_802405F0_87F3E0.s b/asm/nonmatchings/world/area_tik/tik_08/87F3E0/func_802405F0_87F3E0.s index 1c5fa016e8..05fc3f4acd 100644 --- a/asm/nonmatchings/world/area_tik/tik_08/87F3E0/func_802405F0_87F3E0.s +++ b/asm/nonmatchings/world/area_tik/tik_08/87F3E0/func_802405F0_87F3E0.s @@ -32,58 +32,58 @@ glabel func_802405F0_87F3E0 /* 87F44C 8024065C C6400098 */ lwc1 $f0, 0x98($s2) /* 87F450 80240660 46001081 */ sub.s $f2, $f2, $f0 /* 87F454 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 87F458 80240668 00000000 */ nop +/* 87F458 80240668 00000000 */ nop /* 87F45C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) /* 87F460 80240670 C4620030 */ lwc1 $f2, 0x30($v1) /* 87F464 80240674 46001081 */ sub.s $f2, $f2, $f0 /* 87F468 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 87F46C 8024067C 00000000 */ nop +/* 87F46C 8024067C 00000000 */ nop /* 87F470 80240680 846200B0 */ lh $v0, 0xb0($v1) /* 87F474 80240684 C462002C */ lwc1 $f2, 0x2c($v1) /* 87F478 80240688 44820000 */ mtc1 $v0, $f0 -/* 87F47C 8024068C 00000000 */ nop +/* 87F47C 8024068C 00000000 */ nop /* 87F480 80240690 46800020 */ cvt.s.w $f0, $f0 /* 87F484 80240694 46001080 */ add.s $f2, $f2, $f0 /* 87F488 80240698 3C013FC0 */ lui $at, 0x3fc0 /* 87F48C 8024069C 44810000 */ mtc1 $at, $f0 -/* 87F490 802406A0 00000000 */ nop +/* 87F490 802406A0 00000000 */ nop /* 87F494 802406A4 46001081 */ sub.s $f2, $f2, $f0 /* 87F498 802406A8 46043300 */ add.s $f12, $f6, $f4 /* 87F49C 802406AC C640009C */ lwc1 $f0, 0x9c($s2) /* 87F4A0 802406B0 46001501 */ sub.s $f20, $f2, $f0 /* 87F4A4 802406B4 46006084 */ sqrt.s $f2, $f12 /* 87F4A8 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 87F4AC 802406BC 00000000 */ nop +/* 87F4AC 802406BC 00000000 */ nop /* 87F4B0 802406C0 45010004 */ bc1t .L802406D4 /* 87F4B4 802406C4 0060882D */ daddu $s1, $v1, $zero /* 87F4B8 802406C8 0C0187BC */ jal sqrtf -/* 87F4BC 802406CC 00000000 */ nop +/* 87F4BC 802406CC 00000000 */ nop /* 87F4C0 802406D0 46000086 */ mov.s $f2, $f0 .L802406D4: /* 87F4C4 802406D4 44800000 */ mtc1 $zero, $f0 -/* 87F4C8 802406D8 00000000 */ nop +/* 87F4C8 802406D8 00000000 */ nop /* 87F4CC 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 87F4D0 802406E0 00000000 */ nop +/* 87F4D0 802406E0 00000000 */ nop /* 87F4D4 802406E4 45000016 */ bc1f .L80240740 /* 87F4D8 802406E8 46001106 */ mov.s $f4, $f2 /* 87F4DC 802406EC 862200B0 */ lh $v0, 0xb0($s1) /* 87F4E0 802406F0 44820000 */ mtc1 $v0, $f0 -/* 87F4E4 802406F4 00000000 */ nop +/* 87F4E4 802406F4 00000000 */ nop /* 87F4E8 802406F8 46800020 */ cvt.s.w $f0, $f0 /* 87F4EC 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 87F4F0 80240700 00000000 */ nop +/* 87F4F0 80240700 00000000 */ nop /* 87F4F4 80240704 4500000E */ bc1f .L80240740 -/* 87F4F8 80240708 00000000 */ nop +/* 87F4F8 80240708 00000000 */ nop /* 87F4FC 8024070C 862200B2 */ lh $v0, 0xb2($s1) /* 87F500 80240710 3C013F00 */ lui $at, 0x3f00 /* 87F504 80240714 44811000 */ mtc1 $at, $f2 /* 87F508 80240718 44820000 */ mtc1 $v0, $f0 -/* 87F50C 8024071C 00000000 */ nop +/* 87F50C 8024071C 00000000 */ nop /* 87F510 80240720 46800020 */ cvt.s.w $f0, $f0 /* 87F514 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 87F518 80240728 00000000 */ nop +/* 87F518 80240728 00000000 */ nop /* 87F51C 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 87F520 80240730 00000000 */ nop +/* 87F520 80240730 00000000 */ nop /* 87F524 80240734 45000002 */ bc1f .L80240740 /* 87F528 80240738 24020001 */ addiu $v0, $zero, 1 /* 87F52C 8024073C AE62008C */ sw $v0, 0x8c($s3) @@ -92,58 +92,58 @@ glabel func_802405F0_87F3E0 /* 87F534 80240744 C6400098 */ lwc1 $f0, 0x98($s2) /* 87F538 80240748 46001081 */ sub.s $f2, $f2, $f0 /* 87F53C 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 87F540 80240750 00000000 */ nop +/* 87F540 80240750 00000000 */ nop /* 87F544 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 87F548 80240758 C6020040 */ lwc1 $f2, 0x40($s0) /* 87F54C 8024075C 46001081 */ sub.s $f2, $f2, $f0 /* 87F550 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 87F554 80240764 00000000 */ nop +/* 87F554 80240764 00000000 */ nop /* 87F558 80240768 860200A8 */ lh $v0, 0xa8($s0) /* 87F55C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) /* 87F560 80240770 44820000 */ mtc1 $v0, $f0 -/* 87F564 80240774 00000000 */ nop +/* 87F564 80240774 00000000 */ nop /* 87F568 80240778 46800020 */ cvt.s.w $f0, $f0 /* 87F56C 8024077C 46001080 */ add.s $f2, $f2, $f0 /* 87F570 80240780 3C013FC0 */ lui $at, 0x3fc0 /* 87F574 80240784 44810000 */ mtc1 $at, $f0 -/* 87F578 80240788 00000000 */ nop +/* 87F578 80240788 00000000 */ nop /* 87F57C 8024078C 46001081 */ sub.s $f2, $f2, $f0 /* 87F580 80240790 46043300 */ add.s $f12, $f6, $f4 /* 87F584 80240794 C640009C */ lwc1 $f0, 0x9c($s2) /* 87F588 80240798 46001501 */ sub.s $f20, $f2, $f0 /* 87F58C 8024079C 46006084 */ sqrt.s $f2, $f12 /* 87F590 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 87F594 802407A4 00000000 */ nop +/* 87F594 802407A4 00000000 */ nop /* 87F598 802407A8 45010004 */ bc1t .L802407BC -/* 87F59C 802407AC 00000000 */ nop +/* 87F59C 802407AC 00000000 */ nop /* 87F5A0 802407B0 0C0187BC */ jal sqrtf -/* 87F5A4 802407B4 00000000 */ nop +/* 87F5A4 802407B4 00000000 */ nop /* 87F5A8 802407B8 46000086 */ mov.s $f2, $f0 .L802407BC: /* 87F5AC 802407BC 44800000 */ mtc1 $zero, $f0 -/* 87F5B0 802407C0 00000000 */ nop +/* 87F5B0 802407C0 00000000 */ nop /* 87F5B4 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 87F5B8 802407C8 00000000 */ nop +/* 87F5B8 802407C8 00000000 */ nop /* 87F5BC 802407CC 45000016 */ bc1f .L80240828 /* 87F5C0 802407D0 46001106 */ mov.s $f4, $f2 /* 87F5C4 802407D4 860200A8 */ lh $v0, 0xa8($s0) /* 87F5C8 802407D8 44820000 */ mtc1 $v0, $f0 -/* 87F5CC 802407DC 00000000 */ nop +/* 87F5CC 802407DC 00000000 */ nop /* 87F5D0 802407E0 46800020 */ cvt.s.w $f0, $f0 /* 87F5D4 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 87F5D8 802407E8 00000000 */ nop +/* 87F5D8 802407E8 00000000 */ nop /* 87F5DC 802407EC 4500000F */ bc1f .L8024082C /* 87F5E0 802407F0 0000882D */ daddu $s1, $zero, $zero /* 87F5E4 802407F4 860200A6 */ lh $v0, 0xa6($s0) /* 87F5E8 802407F8 3C013F00 */ lui $at, 0x3f00 /* 87F5EC 802407FC 44811000 */ mtc1 $at, $f2 /* 87F5F0 80240800 44820000 */ mtc1 $v0, $f0 -/* 87F5F4 80240804 00000000 */ nop +/* 87F5F4 80240804 00000000 */ nop /* 87F5F8 80240808 46800020 */ cvt.s.w $f0, $f0 /* 87F5FC 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 87F600 80240810 00000000 */ nop +/* 87F600 80240810 00000000 */ nop /* 87F604 80240814 4600203C */ c.lt.s $f4, $f0 -/* 87F608 80240818 00000000 */ nop +/* 87F608 80240818 00000000 */ nop /* 87F60C 8024081C 45000003 */ bc1f .L8024082C /* 87F610 80240820 24020001 */ addiu $v0, $zero, 1 /* 87F614 80240824 AE62008C */ sw $v0, 0x8c($s3) @@ -165,16 +165,16 @@ glabel func_802405F0_87F3E0 /* 87F648 80240858 C6400098 */ lwc1 $f0, 0x98($s2) /* 87F64C 8024085C 46001081 */ sub.s $f2, $f2, $f0 /* 87F650 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 87F654 80240864 00000000 */ nop +/* 87F654 80240864 00000000 */ nop /* 87F658 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 87F65C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) /* 87F660 80240870 46001081 */ sub.s $f2, $f2, $f0 /* 87F664 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 87F668 80240878 00000000 */ nop +/* 87F668 80240878 00000000 */ nop /* 87F66C 8024087C 860200A8 */ lh $v0, 0xa8($s0) /* 87F670 80240880 C602003C */ lwc1 $f2, 0x3c($s0) /* 87F674 80240884 44820000 */ mtc1 $v0, $f0 -/* 87F678 80240888 00000000 */ nop +/* 87F678 80240888 00000000 */ nop /* 87F67C 8024088C 46800020 */ cvt.s.w $f0, $f0 /* 87F680 80240890 46001080 */ add.s $f2, $f2, $f0 /* 87F684 80240894 461A1081 */ sub.s $f2, $f2, $f26 @@ -183,32 +183,32 @@ glabel func_802405F0_87F3E0 /* 87F690 802408A0 46001501 */ sub.s $f20, $f2, $f0 /* 87F694 802408A4 46006004 */ sqrt.s $f0, $f12 /* 87F698 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 87F69C 802408AC 00000000 */ nop +/* 87F69C 802408AC 00000000 */ nop /* 87F6A0 802408B0 45010003 */ bc1t .L802408C0 -/* 87F6A4 802408B4 00000000 */ nop +/* 87F6A4 802408B4 00000000 */ nop /* 87F6A8 802408B8 0C0187BC */ jal sqrtf -/* 87F6AC 802408BC 00000000 */ nop +/* 87F6AC 802408BC 00000000 */ nop .L802408C0: /* 87F6B0 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 87F6B4 802408C4 00000000 */ nop +/* 87F6B4 802408C4 00000000 */ nop /* 87F6B8 802408C8 45000015 */ bc1f .L80240920 /* 87F6BC 802408CC 46000106 */ mov.s $f4, $f0 /* 87F6C0 802408D0 860200A8 */ lh $v0, 0xa8($s0) /* 87F6C4 802408D4 44820000 */ mtc1 $v0, $f0 -/* 87F6C8 802408D8 00000000 */ nop +/* 87F6C8 802408D8 00000000 */ nop /* 87F6CC 802408DC 46800020 */ cvt.s.w $f0, $f0 /* 87F6D0 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 87F6D4 802408E4 00000000 */ nop +/* 87F6D4 802408E4 00000000 */ nop /* 87F6D8 802408E8 4500000E */ bc1f .L80240924 /* 87F6DC 802408EC 26310001 */ addiu $s1, $s1, 1 /* 87F6E0 802408F0 860200A6 */ lh $v0, 0xa6($s0) /* 87F6E4 802408F4 44820000 */ mtc1 $v0, $f0 -/* 87F6E8 802408F8 00000000 */ nop +/* 87F6E8 802408F8 00000000 */ nop /* 87F6EC 802408FC 46800020 */ cvt.s.w $f0, $f0 /* 87F6F0 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 87F6F4 80240904 00000000 */ nop +/* 87F6F4 80240904 00000000 */ nop /* 87F6F8 80240908 4600203C */ c.lt.s $f4, $f0 -/* 87F6FC 8024090C 00000000 */ nop +/* 87F6FC 8024090C 00000000 */ nop /* 87F700 80240910 45000004 */ bc1f .L80240924 /* 87F704 80240914 24020001 */ addiu $v0, $zero, 1 /* 87F708 80240918 0809024C */ j .L80240930 @@ -218,7 +218,7 @@ glabel func_802405F0_87F3E0 .L80240924: /* 87F714 80240924 2A220040 */ slti $v0, $s1, 0x40 /* 87F718 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 87F71C 8024092C 00000000 */ nop +/* 87F71C 8024092C 00000000 */ nop .L80240930: /* 87F720 80240930 8FBF0020 */ lw $ra, 0x20($sp) /* 87F724 80240934 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_08/87F3E0/func_80240960_87F750.s b/asm/nonmatchings/world/area_tik/tik_08/87F3E0/func_80240960_87F750.s index 810720d96d..4f07d728f9 100644 --- a/asm/nonmatchings/world/area_tik/tik_08/87F3E0/func_80240960_87F750.s +++ b/asm/nonmatchings/world/area_tik/tik_08/87F3E0/func_80240960_87F750.s @@ -32,15 +32,15 @@ glabel func_80240960_87F750 /* 87F7BC 802409CC 0040802D */ daddu $s0, $v0, $zero /* 87F7C0 802409D0 0040182D */ daddu $v1, $v0, $zero /* 87F7C4 802409D4 44920000 */ mtc1 $s2, $f0 -/* 87F7C8 802409D8 00000000 */ nop +/* 87F7C8 802409D8 00000000 */ nop /* 87F7CC 802409DC 46800020 */ cvt.s.w $f0, $f0 /* 87F7D0 802409E0 E4600048 */ swc1 $f0, 0x48($v1) /* 87F7D4 802409E4 44910000 */ mtc1 $s1, $f0 -/* 87F7D8 802409E8 00000000 */ nop +/* 87F7D8 802409E8 00000000 */ nop /* 87F7DC 802409EC 46800020 */ cvt.s.w $f0, $f0 /* 87F7E0 802409F0 E460004C */ swc1 $f0, 0x4c($v1) /* 87F7E4 802409F4 44900000 */ mtc1 $s0, $f0 -/* 87F7E8 802409F8 00000000 */ nop +/* 87F7E8 802409F8 00000000 */ nop /* 87F7EC 802409FC 46800020 */ cvt.s.w $f0, $f0 /* 87F7F0 80240A00 E4600050 */ swc1 $f0, 0x50($v1) /* 87F7F4 80240A04 8FBF0020 */ lw $ra, 0x20($sp) @@ -51,6 +51,6 @@ glabel func_80240960_87F750 /* 87F808 80240A18 24020002 */ addiu $v0, $zero, 2 /* 87F80C 80240A1C 03E00008 */ jr $ra /* 87F810 80240A20 27BD0028 */ addiu $sp, $sp, 0x28 -/* 87F814 80240A24 00000000 */ nop -/* 87F818 80240A28 00000000 */ nop -/* 87F81C 80240A2C 00000000 */ nop +/* 87F814 80240A24 00000000 */ nop +/* 87F818 80240A28 00000000 */ nop +/* 87F81C 80240A2C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_08/87F820/func_80240A5C_87F84C.s b/asm/nonmatchings/world/area_tik/tik_08/87F820/func_80240A5C_87F84C.s index 9987688d9c..92ef7c2999 100644 --- a/asm/nonmatchings/world/area_tik/tik_08/87F820/func_80240A5C_87F84C.s +++ b/asm/nonmatchings/world/area_tik/tik_08/87F820/func_80240A5C_87F84C.s @@ -24,6 +24,6 @@ glabel func_80240A5C_87F84C /* 87F898 80240AA8 24020002 */ addiu $v0, $zero, 2 /* 87F89C 80240AAC 03E00008 */ jr $ra /* 87F8A0 80240AB0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 87F8A4 80240AB4 00000000 */ nop -/* 87F8A8 80240AB8 00000000 */ nop -/* 87F8AC 80240ABC 00000000 */ nop +/* 87F8A4 80240AB4 00000000 */ nop +/* 87F8A8 80240AB8 00000000 */ nop +/* 87F8AC 80240ABC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_80240034_8821F4.s b/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_80240034_8821F4.s index 6d5a1065c7..4c58a44b77 100644 --- a/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_80240034_8821F4.s +++ b/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_80240034_8821F4.s @@ -22,16 +22,16 @@ glabel func_80240034_8821F4 /* 882234 80240074 00021023 */ negu $v0, $v0 .L80240078: /* 882238 80240078 14400003 */ bnez $v0, .L80240088 -/* 88223C 8024007C 00000000 */ nop +/* 88223C 8024007C 00000000 */ nop /* 882240 80240080 50E00017 */ beql $a3, $zero, .L802400E0 /* 882244 80240084 0000102D */ daddu $v0, $zero, $zero .L80240088: /* 882248 80240088 44822000 */ mtc1 $v0, $f4 -/* 88224C 8024008C 00000000 */ nop +/* 88224C 8024008C 00000000 */ nop /* 882250 80240090 46802120 */ cvt.s.w $f4, $f4 /* 882254 80240094 44062000 */ mfc1 $a2, $f4 /* 882258 80240098 44872000 */ mtc1 $a3, $f4 -/* 88225C 8024009C 00000000 */ nop +/* 88225C 8024009C 00000000 */ nop /* 882260 802400A0 46802120 */ cvt.s.w $f4, $f4 /* 882264 802400A4 44806000 */ mtc1 $zero, $f12 /* 882268 802400A8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240034_8821F4 /* 882270 802400B0 46006386 */ mov.s $f14, $f12 /* 882274 802400B4 3C014270 */ lui $at, 0x4270 /* 882278 802400B8 44811000 */ mtc1 $at, $f2 -/* 88227C 802400BC 00000000 */ nop +/* 88227C 802400BC 00000000 */ nop /* 882280 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 882284 802400C4 00000000 */ nop +/* 882284 802400C4 00000000 */ nop /* 882288 802400C8 45000004 */ bc1f .L802400DC /* 88228C 802400CC 24020001 */ addiu $v0, $zero, 1 /* 882290 802400D0 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_tik/tik_09/8827B0/func_802405F0_8827B0.s b/asm/nonmatchings/world/area_tik/tik_09/8827B0/func_802405F0_8827B0.s index b0650dbfe0..51472f70de 100644 --- a/asm/nonmatchings/world/area_tik/tik_09/8827B0/func_802405F0_8827B0.s +++ b/asm/nonmatchings/world/area_tik/tik_09/8827B0/func_802405F0_8827B0.s @@ -32,58 +32,58 @@ glabel func_802405F0_8827B0 /* 88281C 8024065C C6400098 */ lwc1 $f0, 0x98($s2) /* 882820 80240660 46001081 */ sub.s $f2, $f2, $f0 /* 882824 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 882828 80240668 00000000 */ nop +/* 882828 80240668 00000000 */ nop /* 88282C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) /* 882830 80240670 C4620030 */ lwc1 $f2, 0x30($v1) /* 882834 80240674 46001081 */ sub.s $f2, $f2, $f0 /* 882838 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 88283C 8024067C 00000000 */ nop +/* 88283C 8024067C 00000000 */ nop /* 882840 80240680 846200B0 */ lh $v0, 0xb0($v1) /* 882844 80240684 C462002C */ lwc1 $f2, 0x2c($v1) /* 882848 80240688 44820000 */ mtc1 $v0, $f0 -/* 88284C 8024068C 00000000 */ nop +/* 88284C 8024068C 00000000 */ nop /* 882850 80240690 46800020 */ cvt.s.w $f0, $f0 /* 882854 80240694 46001080 */ add.s $f2, $f2, $f0 /* 882858 80240698 3C013FC0 */ lui $at, 0x3fc0 /* 88285C 8024069C 44810000 */ mtc1 $at, $f0 -/* 882860 802406A0 00000000 */ nop +/* 882860 802406A0 00000000 */ nop /* 882864 802406A4 46001081 */ sub.s $f2, $f2, $f0 /* 882868 802406A8 46043300 */ add.s $f12, $f6, $f4 /* 88286C 802406AC C640009C */ lwc1 $f0, 0x9c($s2) /* 882870 802406B0 46001501 */ sub.s $f20, $f2, $f0 /* 882874 802406B4 46006084 */ sqrt.s $f2, $f12 /* 882878 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 88287C 802406BC 00000000 */ nop +/* 88287C 802406BC 00000000 */ nop /* 882880 802406C0 45010004 */ bc1t .L802406D4 /* 882884 802406C4 0060882D */ daddu $s1, $v1, $zero /* 882888 802406C8 0C0187BC */ jal sqrtf -/* 88288C 802406CC 00000000 */ nop +/* 88288C 802406CC 00000000 */ nop /* 882890 802406D0 46000086 */ mov.s $f2, $f0 .L802406D4: /* 882894 802406D4 44800000 */ mtc1 $zero, $f0 -/* 882898 802406D8 00000000 */ nop +/* 882898 802406D8 00000000 */ nop /* 88289C 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 8828A0 802406E0 00000000 */ nop +/* 8828A0 802406E0 00000000 */ nop /* 8828A4 802406E4 45000016 */ bc1f .L80240740 /* 8828A8 802406E8 46001106 */ mov.s $f4, $f2 /* 8828AC 802406EC 862200B0 */ lh $v0, 0xb0($s1) /* 8828B0 802406F0 44820000 */ mtc1 $v0, $f0 -/* 8828B4 802406F4 00000000 */ nop +/* 8828B4 802406F4 00000000 */ nop /* 8828B8 802406F8 46800020 */ cvt.s.w $f0, $f0 /* 8828BC 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 8828C0 80240700 00000000 */ nop +/* 8828C0 80240700 00000000 */ nop /* 8828C4 80240704 4500000E */ bc1f .L80240740 -/* 8828C8 80240708 00000000 */ nop +/* 8828C8 80240708 00000000 */ nop /* 8828CC 8024070C 862200B2 */ lh $v0, 0xb2($s1) /* 8828D0 80240710 3C013F00 */ lui $at, 0x3f00 /* 8828D4 80240714 44811000 */ mtc1 $at, $f2 /* 8828D8 80240718 44820000 */ mtc1 $v0, $f0 -/* 8828DC 8024071C 00000000 */ nop +/* 8828DC 8024071C 00000000 */ nop /* 8828E0 80240720 46800020 */ cvt.s.w $f0, $f0 /* 8828E4 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 8828E8 80240728 00000000 */ nop +/* 8828E8 80240728 00000000 */ nop /* 8828EC 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 8828F0 80240730 00000000 */ nop +/* 8828F0 80240730 00000000 */ nop /* 8828F4 80240734 45000002 */ bc1f .L80240740 /* 8828F8 80240738 24020001 */ addiu $v0, $zero, 1 /* 8828FC 8024073C AE62008C */ sw $v0, 0x8c($s3) @@ -92,58 +92,58 @@ glabel func_802405F0_8827B0 /* 882904 80240744 C6400098 */ lwc1 $f0, 0x98($s2) /* 882908 80240748 46001081 */ sub.s $f2, $f2, $f0 /* 88290C 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 882910 80240750 00000000 */ nop +/* 882910 80240750 00000000 */ nop /* 882914 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 882918 80240758 C6020040 */ lwc1 $f2, 0x40($s0) /* 88291C 8024075C 46001081 */ sub.s $f2, $f2, $f0 /* 882920 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 882924 80240764 00000000 */ nop +/* 882924 80240764 00000000 */ nop /* 882928 80240768 860200A8 */ lh $v0, 0xa8($s0) /* 88292C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) /* 882930 80240770 44820000 */ mtc1 $v0, $f0 -/* 882934 80240774 00000000 */ nop +/* 882934 80240774 00000000 */ nop /* 882938 80240778 46800020 */ cvt.s.w $f0, $f0 /* 88293C 8024077C 46001080 */ add.s $f2, $f2, $f0 /* 882940 80240780 3C013FC0 */ lui $at, 0x3fc0 /* 882944 80240784 44810000 */ mtc1 $at, $f0 -/* 882948 80240788 00000000 */ nop +/* 882948 80240788 00000000 */ nop /* 88294C 8024078C 46001081 */ sub.s $f2, $f2, $f0 /* 882950 80240790 46043300 */ add.s $f12, $f6, $f4 /* 882954 80240794 C640009C */ lwc1 $f0, 0x9c($s2) /* 882958 80240798 46001501 */ sub.s $f20, $f2, $f0 /* 88295C 8024079C 46006084 */ sqrt.s $f2, $f12 /* 882960 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 882964 802407A4 00000000 */ nop +/* 882964 802407A4 00000000 */ nop /* 882968 802407A8 45010004 */ bc1t .L802407BC -/* 88296C 802407AC 00000000 */ nop +/* 88296C 802407AC 00000000 */ nop /* 882970 802407B0 0C0187BC */ jal sqrtf -/* 882974 802407B4 00000000 */ nop +/* 882974 802407B4 00000000 */ nop /* 882978 802407B8 46000086 */ mov.s $f2, $f0 .L802407BC: /* 88297C 802407BC 44800000 */ mtc1 $zero, $f0 -/* 882980 802407C0 00000000 */ nop +/* 882980 802407C0 00000000 */ nop /* 882984 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 882988 802407C8 00000000 */ nop +/* 882988 802407C8 00000000 */ nop /* 88298C 802407CC 45000016 */ bc1f .L80240828 /* 882990 802407D0 46001106 */ mov.s $f4, $f2 /* 882994 802407D4 860200A8 */ lh $v0, 0xa8($s0) /* 882998 802407D8 44820000 */ mtc1 $v0, $f0 -/* 88299C 802407DC 00000000 */ nop +/* 88299C 802407DC 00000000 */ nop /* 8829A0 802407E0 46800020 */ cvt.s.w $f0, $f0 /* 8829A4 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 8829A8 802407E8 00000000 */ nop +/* 8829A8 802407E8 00000000 */ nop /* 8829AC 802407EC 4500000F */ bc1f .L8024082C /* 8829B0 802407F0 0000882D */ daddu $s1, $zero, $zero /* 8829B4 802407F4 860200A6 */ lh $v0, 0xa6($s0) /* 8829B8 802407F8 3C013F00 */ lui $at, 0x3f00 /* 8829BC 802407FC 44811000 */ mtc1 $at, $f2 /* 8829C0 80240800 44820000 */ mtc1 $v0, $f0 -/* 8829C4 80240804 00000000 */ nop +/* 8829C4 80240804 00000000 */ nop /* 8829C8 80240808 46800020 */ cvt.s.w $f0, $f0 /* 8829CC 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 8829D0 80240810 00000000 */ nop +/* 8829D0 80240810 00000000 */ nop /* 8829D4 80240814 4600203C */ c.lt.s $f4, $f0 -/* 8829D8 80240818 00000000 */ nop +/* 8829D8 80240818 00000000 */ nop /* 8829DC 8024081C 45000003 */ bc1f .L8024082C /* 8829E0 80240820 24020001 */ addiu $v0, $zero, 1 /* 8829E4 80240824 AE62008C */ sw $v0, 0x8c($s3) @@ -165,16 +165,16 @@ glabel func_802405F0_8827B0 /* 882A18 80240858 C6400098 */ lwc1 $f0, 0x98($s2) /* 882A1C 8024085C 46001081 */ sub.s $f2, $f2, $f0 /* 882A20 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 882A24 80240864 00000000 */ nop +/* 882A24 80240864 00000000 */ nop /* 882A28 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 882A2C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) /* 882A30 80240870 46001081 */ sub.s $f2, $f2, $f0 /* 882A34 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 882A38 80240878 00000000 */ nop +/* 882A38 80240878 00000000 */ nop /* 882A3C 8024087C 860200A8 */ lh $v0, 0xa8($s0) /* 882A40 80240880 C602003C */ lwc1 $f2, 0x3c($s0) /* 882A44 80240884 44820000 */ mtc1 $v0, $f0 -/* 882A48 80240888 00000000 */ nop +/* 882A48 80240888 00000000 */ nop /* 882A4C 8024088C 46800020 */ cvt.s.w $f0, $f0 /* 882A50 80240890 46001080 */ add.s $f2, $f2, $f0 /* 882A54 80240894 461A1081 */ sub.s $f2, $f2, $f26 @@ -183,32 +183,32 @@ glabel func_802405F0_8827B0 /* 882A60 802408A0 46001501 */ sub.s $f20, $f2, $f0 /* 882A64 802408A4 46006004 */ sqrt.s $f0, $f12 /* 882A68 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 882A6C 802408AC 00000000 */ nop +/* 882A6C 802408AC 00000000 */ nop /* 882A70 802408B0 45010003 */ bc1t .L802408C0 -/* 882A74 802408B4 00000000 */ nop +/* 882A74 802408B4 00000000 */ nop /* 882A78 802408B8 0C0187BC */ jal sqrtf -/* 882A7C 802408BC 00000000 */ nop +/* 882A7C 802408BC 00000000 */ nop .L802408C0: /* 882A80 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 882A84 802408C4 00000000 */ nop +/* 882A84 802408C4 00000000 */ nop /* 882A88 802408C8 45000015 */ bc1f .L80240920 /* 882A8C 802408CC 46000106 */ mov.s $f4, $f0 /* 882A90 802408D0 860200A8 */ lh $v0, 0xa8($s0) /* 882A94 802408D4 44820000 */ mtc1 $v0, $f0 -/* 882A98 802408D8 00000000 */ nop +/* 882A98 802408D8 00000000 */ nop /* 882A9C 802408DC 46800020 */ cvt.s.w $f0, $f0 /* 882AA0 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 882AA4 802408E4 00000000 */ nop +/* 882AA4 802408E4 00000000 */ nop /* 882AA8 802408E8 4500000E */ bc1f .L80240924 /* 882AAC 802408EC 26310001 */ addiu $s1, $s1, 1 /* 882AB0 802408F0 860200A6 */ lh $v0, 0xa6($s0) /* 882AB4 802408F4 44820000 */ mtc1 $v0, $f0 -/* 882AB8 802408F8 00000000 */ nop +/* 882AB8 802408F8 00000000 */ nop /* 882ABC 802408FC 46800020 */ cvt.s.w $f0, $f0 /* 882AC0 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 882AC4 80240904 00000000 */ nop +/* 882AC4 80240904 00000000 */ nop /* 882AC8 80240908 4600203C */ c.lt.s $f4, $f0 -/* 882ACC 8024090C 00000000 */ nop +/* 882ACC 8024090C 00000000 */ nop /* 882AD0 80240910 45000004 */ bc1f .L80240924 /* 882AD4 80240914 24020001 */ addiu $v0, $zero, 1 /* 882AD8 80240918 0809024C */ j .L80240930 @@ -218,7 +218,7 @@ glabel func_802405F0_8827B0 .L80240924: /* 882AE4 80240924 2A220040 */ slti $v0, $s1, 0x40 /* 882AE8 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 882AEC 8024092C 00000000 */ nop +/* 882AEC 8024092C 00000000 */ nop .L80240930: /* 882AF0 80240930 8FBF0020 */ lw $ra, 0x20($sp) /* 882AF4 80240934 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_09/8827B0/func_80240960_882B20.s b/asm/nonmatchings/world/area_tik/tik_09/8827B0/func_80240960_882B20.s index 0c304e9ee5..b7398672a0 100644 --- a/asm/nonmatchings/world/area_tik/tik_09/8827B0/func_80240960_882B20.s +++ b/asm/nonmatchings/world/area_tik/tik_09/8827B0/func_80240960_882B20.s @@ -32,15 +32,15 @@ glabel func_80240960_882B20 /* 882B8C 802409CC 0040802D */ daddu $s0, $v0, $zero /* 882B90 802409D0 0040182D */ daddu $v1, $v0, $zero /* 882B94 802409D4 44920000 */ mtc1 $s2, $f0 -/* 882B98 802409D8 00000000 */ nop +/* 882B98 802409D8 00000000 */ nop /* 882B9C 802409DC 46800020 */ cvt.s.w $f0, $f0 /* 882BA0 802409E0 E4600048 */ swc1 $f0, 0x48($v1) /* 882BA4 802409E4 44910000 */ mtc1 $s1, $f0 -/* 882BA8 802409E8 00000000 */ nop +/* 882BA8 802409E8 00000000 */ nop /* 882BAC 802409EC 46800020 */ cvt.s.w $f0, $f0 /* 882BB0 802409F0 E460004C */ swc1 $f0, 0x4c($v1) /* 882BB4 802409F4 44900000 */ mtc1 $s0, $f0 -/* 882BB8 802409F8 00000000 */ nop +/* 882BB8 802409F8 00000000 */ nop /* 882BBC 802409FC 46800020 */ cvt.s.w $f0, $f0 /* 882BC0 80240A00 E4600050 */ swc1 $f0, 0x50($v1) /* 882BC4 80240A04 8FBF0020 */ lw $ra, 0x20($sp) @@ -51,6 +51,6 @@ glabel func_80240960_882B20 /* 882BD8 80240A18 24020002 */ addiu $v0, $zero, 2 /* 882BDC 80240A1C 03E00008 */ jr $ra /* 882BE0 80240A20 27BD0028 */ addiu $sp, $sp, 0x28 -/* 882BE4 80240A24 00000000 */ nop -/* 882BE8 80240A28 00000000 */ nop -/* 882BEC 80240A2C 00000000 */ nop +/* 882BE4 80240A24 00000000 */ nop +/* 882BE8 80240A28 00000000 */ nop +/* 882BEC 80240A2C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240AAC_882C6C.s b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240AAC_882C6C.s index d98733ac71..841c2d28a5 100644 --- a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240AAC_882C6C.s +++ b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240AAC_882C6C.s @@ -21,11 +21,11 @@ glabel func_80240AAC_882C6C /* 882CAC 80240AEC A602008E */ sh $v0, 0x8e($s0) /* 882CB0 80240AF0 00021400 */ sll $v0, $v0, 0x10 /* 882CB4 80240AF4 1C400033 */ bgtz $v0, .L80240BC4 -/* 882CB8 80240AF8 00000000 */ nop +/* 882CB8 80240AF8 00000000 */ nop .L80240AFC: /* 882CBC 80240AFC 8602008C */ lh $v0, 0x8c($s0) /* 882CC0 80240B00 14400030 */ bnez $v0, .L80240BC4 -/* 882CC4 80240B04 00000000 */ nop +/* 882CC4 80240B04 00000000 */ nop /* 882CC8 80240B08 8E2200CC */ lw $v0, 0xcc($s1) /* 882CCC 80240B0C 8C420024 */ lw $v0, 0x24($v0) /* 882CD0 80240B10 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_80240AAC_882C6C /* 882CDC 80240B1C 8E230088 */ lw $v1, 0x88($s1) /* 882CE0 80240B20 24020005 */ addiu $v0, $zero, 5 /* 882CE4 80240B24 10620005 */ beq $v1, $v0, .L80240B3C -/* 882CE8 80240B28 00000000 */ nop +/* 882CE8 80240B28 00000000 */ nop /* 882CEC 80240B2C 10600003 */ beqz $v1, .L80240B3C /* 882CF0 80240B30 24020001 */ addiu $v0, $zero, 1 /* 882CF4 80240B34 14620006 */ bne $v1, $v0, .L80240B50 -/* 882CF8 80240B38 00000000 */ nop +/* 882CF8 80240B38 00000000 */ nop .L80240B3C: /* 882CFC 80240B3C 8E220084 */ lw $v0, 0x84($s1) /* 882D00 80240B40 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_80240AAC_882C6C /* 882D40 80240B80 46220000 */ add.d $f0, $f0, $f2 /* 882D44 80240B84 4620010D */ trunc.w.d $f4, $f0 /* 882D48 80240B88 44022000 */ mfc1 $v0, $f4 -/* 882D4C 80240B8C 00000000 */ nop +/* 882D4C 80240B8C 00000000 */ nop /* 882D50 80240B90 A602008E */ sh $v0, 0x8e($s0) /* 882D54 80240B94 00021400 */ sll $v0, $v0, 0x10 /* 882D58 80240B98 8E230078 */ lw $v1, 0x78($s1) /* 882D5C 80240B9C 00021403 */ sra $v0, $v0, 0x10 /* 882D60 80240BA0 0043102A */ slt $v0, $v0, $v1 /* 882D64 80240BA4 10400003 */ beqz $v0, .L80240BB4 -/* 882D68 80240BA8 00000000 */ nop +/* 882D68 80240BA8 00000000 */ nop /* 882D6C 80240BAC 9622007A */ lhu $v0, 0x7a($s1) /* 882D70 80240BB0 A602008E */ sh $v0, 0x8e($s0) .L80240BB4: diff --git a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s index 64650fce5e..185ffd2ab3 100644 --- a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s +++ b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s @@ -279,15 +279,17 @@ glabel func_80240DC4_882F84 /* 883370 802411B0 2C620015 */ sltiu $v0, $v1, 0x15 /* 883374 802411B4 10400009 */ beqz $v0, .L802411DC /* 883378 802411B8 00031080 */ sll $v0, $v1, 2 -/* 88337C 802411BC 3C018024 */ lui $at, %hi(D_802441A8) +/* 88337C 802411BC 3C018024 */ lui $at, %hi(jtbl_802441A8_886368) /* 883380 802411C0 00220821 */ addu $at, $at, $v0 -/* 883384 802411C4 8C2241A8 */ lw $v0, %lo(D_802441A8)($at) +/* 883384 802411C4 8C2241A8 */ lw $v0, %lo(jtbl_802441A8_886368)($at) /* 883388 802411C8 00400008 */ jr $v0 /* 88338C 802411CC 00000000 */ nop +glabel L802411D0_883390 /* 883390 802411D0 8E420028 */ lw $v0, 0x28($s2) /* 883394 802411D4 24420001 */ addiu $v0, $v0, 1 /* 883398 802411D8 AE420028 */ sw $v0, 0x28($s2) .L802411DC: +glabel L802411DC_88339C /* 88339C 802411DC 0000102D */ daddu $v0, $zero, $zero .L802411E0: /* 8833A0 802411E0 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80241204_8833C4.s b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80241204_8833C4.s index 89e38c207d..d74f6c610d 100644 --- a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80241204_8833C4.s +++ b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80241204_8833C4.s @@ -40,10 +40,10 @@ glabel func_80241204_8833C4 .L8024127C: /* 88343C 8024127C 8CA50000 */ lw $a1, ($a1) /* 883440 80241280 0C0B2026 */ jal set_variable -/* 883444 80241284 00000000 */ nop +/* 883444 80241284 00000000 */ nop /* 883448 80241288 8FBF0010 */ lw $ra, 0x10($sp) /* 88344C 8024128C 24020002 */ addiu $v0, $zero, 2 /* 883450 80241290 03E00008 */ jr $ra /* 883454 80241294 27BD0018 */ addiu $sp, $sp, 0x18 -/* 883458 80241298 00000000 */ nop -/* 88345C 8024129C 00000000 */ nop +/* 883458 80241298 00000000 */ nop +/* 88345C 8024129C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240310_8866D0.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240310_8866D0.s index d5fb718de3..80ffb4049c 100644 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240310_8866D0.s +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240310_8866D0.s @@ -32,58 +32,58 @@ glabel func_80240310_8866D0 /* 88673C 8024037C C6400098 */ lwc1 $f0, 0x98($s2) /* 886740 80240380 46001081 */ sub.s $f2, $f2, $f0 /* 886744 80240384 46021182 */ mul.s $f6, $f2, $f2 -/* 886748 80240388 00000000 */ nop +/* 886748 80240388 00000000 */ nop /* 88674C 8024038C C64000A0 */ lwc1 $f0, 0xa0($s2) /* 886750 80240390 C4620030 */ lwc1 $f2, 0x30($v1) /* 886754 80240394 46001081 */ sub.s $f2, $f2, $f0 /* 886758 80240398 46021102 */ mul.s $f4, $f2, $f2 -/* 88675C 8024039C 00000000 */ nop +/* 88675C 8024039C 00000000 */ nop /* 886760 802403A0 846200B0 */ lh $v0, 0xb0($v1) /* 886764 802403A4 C462002C */ lwc1 $f2, 0x2c($v1) /* 886768 802403A8 44820000 */ mtc1 $v0, $f0 -/* 88676C 802403AC 00000000 */ nop +/* 88676C 802403AC 00000000 */ nop /* 886770 802403B0 46800020 */ cvt.s.w $f0, $f0 /* 886774 802403B4 46001080 */ add.s $f2, $f2, $f0 /* 886778 802403B8 3C013FC0 */ lui $at, 0x3fc0 /* 88677C 802403BC 44810000 */ mtc1 $at, $f0 -/* 886780 802403C0 00000000 */ nop +/* 886780 802403C0 00000000 */ nop /* 886784 802403C4 46001081 */ sub.s $f2, $f2, $f0 /* 886788 802403C8 46043300 */ add.s $f12, $f6, $f4 /* 88678C 802403CC C640009C */ lwc1 $f0, 0x9c($s2) /* 886790 802403D0 46001501 */ sub.s $f20, $f2, $f0 /* 886794 802403D4 46006084 */ sqrt.s $f2, $f12 /* 886798 802403D8 46021032 */ c.eq.s $f2, $f2 -/* 88679C 802403DC 00000000 */ nop +/* 88679C 802403DC 00000000 */ nop /* 8867A0 802403E0 45010004 */ bc1t .L802403F4 /* 8867A4 802403E4 0060882D */ daddu $s1, $v1, $zero /* 8867A8 802403E8 0C0187BC */ jal sqrtf -/* 8867AC 802403EC 00000000 */ nop +/* 8867AC 802403EC 00000000 */ nop /* 8867B0 802403F0 46000086 */ mov.s $f2, $f0 .L802403F4: /* 8867B4 802403F4 44800000 */ mtc1 $zero, $f0 -/* 8867B8 802403F8 00000000 */ nop +/* 8867B8 802403F8 00000000 */ nop /* 8867BC 802403FC 4614003C */ c.lt.s $f0, $f20 -/* 8867C0 80240400 00000000 */ nop +/* 8867C0 80240400 00000000 */ nop /* 8867C4 80240404 45000016 */ bc1f .L80240460 /* 8867C8 80240408 46001106 */ mov.s $f4, $f2 /* 8867CC 8024040C 862200B0 */ lh $v0, 0xb0($s1) /* 8867D0 80240410 44820000 */ mtc1 $v0, $f0 -/* 8867D4 80240414 00000000 */ nop +/* 8867D4 80240414 00000000 */ nop /* 8867D8 80240418 46800020 */ cvt.s.w $f0, $f0 /* 8867DC 8024041C 4600A03C */ c.lt.s $f20, $f0 -/* 8867E0 80240420 00000000 */ nop +/* 8867E0 80240420 00000000 */ nop /* 8867E4 80240424 4500000E */ bc1f .L80240460 -/* 8867E8 80240428 00000000 */ nop +/* 8867E8 80240428 00000000 */ nop /* 8867EC 8024042C 862200B2 */ lh $v0, 0xb2($s1) /* 8867F0 80240430 3C013F00 */ lui $at, 0x3f00 /* 8867F4 80240434 44811000 */ mtc1 $at, $f2 /* 8867F8 80240438 44820000 */ mtc1 $v0, $f0 -/* 8867FC 8024043C 00000000 */ nop +/* 8867FC 8024043C 00000000 */ nop /* 886800 80240440 46800020 */ cvt.s.w $f0, $f0 /* 886804 80240444 46020002 */ mul.s $f0, $f0, $f2 -/* 886808 80240448 00000000 */ nop +/* 886808 80240448 00000000 */ nop /* 88680C 8024044C 4600203C */ c.lt.s $f4, $f0 -/* 886810 80240450 00000000 */ nop +/* 886810 80240450 00000000 */ nop /* 886814 80240454 45000002 */ bc1f .L80240460 /* 886818 80240458 24020001 */ addiu $v0, $zero, 1 /* 88681C 8024045C AE62008C */ sw $v0, 0x8c($s3) @@ -92,58 +92,58 @@ glabel func_80240310_8866D0 /* 886824 80240464 C6400098 */ lwc1 $f0, 0x98($s2) /* 886828 80240468 46001081 */ sub.s $f2, $f2, $f0 /* 88682C 8024046C 46021182 */ mul.s $f6, $f2, $f2 -/* 886830 80240470 00000000 */ nop +/* 886830 80240470 00000000 */ nop /* 886834 80240474 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 886838 80240478 C6020040 */ lwc1 $f2, 0x40($s0) /* 88683C 8024047C 46001081 */ sub.s $f2, $f2, $f0 /* 886840 80240480 46021102 */ mul.s $f4, $f2, $f2 -/* 886844 80240484 00000000 */ nop +/* 886844 80240484 00000000 */ nop /* 886848 80240488 860200A8 */ lh $v0, 0xa8($s0) /* 88684C 8024048C C602003C */ lwc1 $f2, 0x3c($s0) /* 886850 80240490 44820000 */ mtc1 $v0, $f0 -/* 886854 80240494 00000000 */ nop +/* 886854 80240494 00000000 */ nop /* 886858 80240498 46800020 */ cvt.s.w $f0, $f0 /* 88685C 8024049C 46001080 */ add.s $f2, $f2, $f0 /* 886860 802404A0 3C013FC0 */ lui $at, 0x3fc0 /* 886864 802404A4 44810000 */ mtc1 $at, $f0 -/* 886868 802404A8 00000000 */ nop +/* 886868 802404A8 00000000 */ nop /* 88686C 802404AC 46001081 */ sub.s $f2, $f2, $f0 /* 886870 802404B0 46043300 */ add.s $f12, $f6, $f4 /* 886874 802404B4 C640009C */ lwc1 $f0, 0x9c($s2) /* 886878 802404B8 46001501 */ sub.s $f20, $f2, $f0 /* 88687C 802404BC 46006084 */ sqrt.s $f2, $f12 /* 886880 802404C0 46021032 */ c.eq.s $f2, $f2 -/* 886884 802404C4 00000000 */ nop +/* 886884 802404C4 00000000 */ nop /* 886888 802404C8 45010004 */ bc1t .L802404DC -/* 88688C 802404CC 00000000 */ nop +/* 88688C 802404CC 00000000 */ nop /* 886890 802404D0 0C0187BC */ jal sqrtf -/* 886894 802404D4 00000000 */ nop +/* 886894 802404D4 00000000 */ nop /* 886898 802404D8 46000086 */ mov.s $f2, $f0 .L802404DC: /* 88689C 802404DC 44800000 */ mtc1 $zero, $f0 -/* 8868A0 802404E0 00000000 */ nop +/* 8868A0 802404E0 00000000 */ nop /* 8868A4 802404E4 4614003C */ c.lt.s $f0, $f20 -/* 8868A8 802404E8 00000000 */ nop +/* 8868A8 802404E8 00000000 */ nop /* 8868AC 802404EC 45000016 */ bc1f .L80240548 /* 8868B0 802404F0 46001106 */ mov.s $f4, $f2 /* 8868B4 802404F4 860200A8 */ lh $v0, 0xa8($s0) /* 8868B8 802404F8 44820000 */ mtc1 $v0, $f0 -/* 8868BC 802404FC 00000000 */ nop +/* 8868BC 802404FC 00000000 */ nop /* 8868C0 80240500 46800020 */ cvt.s.w $f0, $f0 /* 8868C4 80240504 4600A03C */ c.lt.s $f20, $f0 -/* 8868C8 80240508 00000000 */ nop +/* 8868C8 80240508 00000000 */ nop /* 8868CC 8024050C 4500000F */ bc1f .L8024054C /* 8868D0 80240510 0000882D */ daddu $s1, $zero, $zero /* 8868D4 80240514 860200A6 */ lh $v0, 0xa6($s0) /* 8868D8 80240518 3C013F00 */ lui $at, 0x3f00 /* 8868DC 8024051C 44811000 */ mtc1 $at, $f2 /* 8868E0 80240520 44820000 */ mtc1 $v0, $f0 -/* 8868E4 80240524 00000000 */ nop +/* 8868E4 80240524 00000000 */ nop /* 8868E8 80240528 46800020 */ cvt.s.w $f0, $f0 /* 8868EC 8024052C 46020002 */ mul.s $f0, $f0, $f2 -/* 8868F0 80240530 00000000 */ nop +/* 8868F0 80240530 00000000 */ nop /* 8868F4 80240534 4600203C */ c.lt.s $f4, $f0 -/* 8868F8 80240538 00000000 */ nop +/* 8868F8 80240538 00000000 */ nop /* 8868FC 8024053C 45000003 */ bc1f .L8024054C /* 886900 80240540 24020001 */ addiu $v0, $zero, 1 /* 886904 80240544 AE62008C */ sw $v0, 0x8c($s3) @@ -165,16 +165,16 @@ glabel func_80240310_8866D0 /* 886938 80240578 C6400098 */ lwc1 $f0, 0x98($s2) /* 88693C 8024057C 46001081 */ sub.s $f2, $f2, $f0 /* 886940 80240580 46021182 */ mul.s $f6, $f2, $f2 -/* 886944 80240584 00000000 */ nop +/* 886944 80240584 00000000 */ nop /* 886948 80240588 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 88694C 8024058C C6020040 */ lwc1 $f2, 0x40($s0) /* 886950 80240590 46001081 */ sub.s $f2, $f2, $f0 /* 886954 80240594 46021102 */ mul.s $f4, $f2, $f2 -/* 886958 80240598 00000000 */ nop +/* 886958 80240598 00000000 */ nop /* 88695C 8024059C 860200A8 */ lh $v0, 0xa8($s0) /* 886960 802405A0 C602003C */ lwc1 $f2, 0x3c($s0) /* 886964 802405A4 44820000 */ mtc1 $v0, $f0 -/* 886968 802405A8 00000000 */ nop +/* 886968 802405A8 00000000 */ nop /* 88696C 802405AC 46800020 */ cvt.s.w $f0, $f0 /* 886970 802405B0 46001080 */ add.s $f2, $f2, $f0 /* 886974 802405B4 461A1081 */ sub.s $f2, $f2, $f26 @@ -183,32 +183,32 @@ glabel func_80240310_8866D0 /* 886980 802405C0 46001501 */ sub.s $f20, $f2, $f0 /* 886984 802405C4 46006004 */ sqrt.s $f0, $f12 /* 886988 802405C8 46000032 */ c.eq.s $f0, $f0 -/* 88698C 802405CC 00000000 */ nop +/* 88698C 802405CC 00000000 */ nop /* 886990 802405D0 45010003 */ bc1t .L802405E0 -/* 886994 802405D4 00000000 */ nop +/* 886994 802405D4 00000000 */ nop /* 886998 802405D8 0C0187BC */ jal sqrtf -/* 88699C 802405DC 00000000 */ nop +/* 88699C 802405DC 00000000 */ nop .L802405E0: /* 8869A0 802405E0 4614C03C */ c.lt.s $f24, $f20 -/* 8869A4 802405E4 00000000 */ nop +/* 8869A4 802405E4 00000000 */ nop /* 8869A8 802405E8 45000015 */ bc1f .L80240640 /* 8869AC 802405EC 46000106 */ mov.s $f4, $f0 /* 8869B0 802405F0 860200A8 */ lh $v0, 0xa8($s0) /* 8869B4 802405F4 44820000 */ mtc1 $v0, $f0 -/* 8869B8 802405F8 00000000 */ nop +/* 8869B8 802405F8 00000000 */ nop /* 8869BC 802405FC 46800020 */ cvt.s.w $f0, $f0 /* 8869C0 80240600 4600A03C */ c.lt.s $f20, $f0 -/* 8869C4 80240604 00000000 */ nop +/* 8869C4 80240604 00000000 */ nop /* 8869C8 80240608 4500000E */ bc1f .L80240644 /* 8869CC 8024060C 26310001 */ addiu $s1, $s1, 1 /* 8869D0 80240610 860200A6 */ lh $v0, 0xa6($s0) /* 8869D4 80240614 44820000 */ mtc1 $v0, $f0 -/* 8869D8 80240618 00000000 */ nop +/* 8869D8 80240618 00000000 */ nop /* 8869DC 8024061C 46800020 */ cvt.s.w $f0, $f0 /* 8869E0 80240620 46160002 */ mul.s $f0, $f0, $f22 -/* 8869E4 80240624 00000000 */ nop +/* 8869E4 80240624 00000000 */ nop /* 8869E8 80240628 4600203C */ c.lt.s $f4, $f0 -/* 8869EC 8024062C 00000000 */ nop +/* 8869EC 8024062C 00000000 */ nop /* 8869F0 80240630 45000004 */ bc1f .L80240644 /* 8869F4 80240634 24020001 */ addiu $v0, $zero, 1 /* 8869F8 80240638 08090194 */ j .L80240650 @@ -218,7 +218,7 @@ glabel func_80240310_8866D0 .L80240644: /* 886A04 80240644 2A220040 */ slti $v0, $s1, 0x40 /* 886A08 80240648 1440FFC5 */ bnez $v0, .L80240560 -/* 886A0C 8024064C 00000000 */ nop +/* 886A0C 8024064C 00000000 */ nop .L80240650: /* 886A10 80240650 8FBF0020 */ lw $ra, 0x20($sp) /* 886A14 80240654 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240754_886B14.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240754_886B14.s index 6ccbabdc74..d456e0334d 100644 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240754_886B14.s +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240754_886B14.s @@ -8,7 +8,7 @@ glabel func_80240754_886B14 /* 886B20 80240760 00822021 */ addu $a0, $a0, $v0 /* 886B24 80240764 90820014 */ lbu $v0, 0x14($a0) /* 886B28 80240768 10400009 */ beqz $v0, .L80240790 -/* 886B2C 8024076C 00000000 */ nop +/* 886B2C 8024076C 00000000 */ nop /* 886B30 80240770 90820015 */ lbu $v0, 0x15($a0) /* 886B34 80240774 00022600 */ sll $a0, $v0, 0x18 /* 886B38 80240778 00041E03 */ sra $v1, $a0, 0x18 @@ -16,7 +16,7 @@ glabel func_80240754_886B14 /* 886B40 80240780 00021403 */ sra $v0, $v0, 0x10 /* 886B44 80240784 0043102A */ slt $v0, $v0, $v1 /* 886B48 80240788 10400003 */ beqz $v0, .L80240798 -/* 886B4C 8024078C 00000000 */ nop +/* 886B4C 8024078C 00000000 */ nop .L80240790: /* 886B50 80240790 03E00008 */ jr $ra /* 886B54 80240794 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024084C_886C0C.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024084C_886C0C.s index 2efbaa9705..7891716b10 100644 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024084C_886C0C.s +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024084C_886C0C.s @@ -108,20 +108,20 @@ glabel func_8024084C_886C0C /* 886D94 802409D4 10400009 */ beqz $v0, .L802409FC /* 886D98 802409D8 AEA20074 */ sw $v0, 0x74($s5) /* 886D9C 802409DC 0C03C4EC */ jal func_800F13B0 -/* 886DA0 802409E0 00000000 */ nop +/* 886DA0 802409E0 00000000 */ nop /* 886DA4 802409E4 8EA20070 */ lw $v0, 0x70($s5) /* 886DA8 802409E8 24420001 */ addiu $v0, $v0, 1 .L802409EC: /* 886DAC 802409EC AEA20070 */ sw $v0, 0x70($s5) /* 886DB0 802409F0 2842000F */ slti $v0, $v0, 0xf /* 886DB4 802409F4 10400003 */ beqz $v0, .L80240A04 -/* 886DB8 802409F8 00000000 */ nop +/* 886DB8 802409F8 00000000 */ nop .L802409FC: /* 886DBC 802409FC 0809029B */ j .L80240A6C /* 886DC0 80240A00 0000102D */ daddu $v0, $zero, $zero .L80240A04: /* 886DC4 80240A04 0C03C54E */ jal func_800F1538 -/* 886DC8 80240A08 00000000 */ nop +/* 886DC8 80240A08 00000000 */ nop /* 886DCC 80240A0C 8EA30074 */ lw $v1, 0x74($s5) /* 886DD0 80240A10 240200FF */ addiu $v0, $zero, 0xff /* 886DD4 80240A14 10620010 */ beq $v1, $v0, .L80240A58 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C80_887040.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C80_887040.s index 97d22df069..0cc97dd034 100644 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C80_887040.s +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C80_887040.s @@ -36,7 +36,7 @@ glabel func_80240C80_887040 /* 8870BC 80240CFC 0C00A88D */ jal sin_cos_deg /* 8870C0 80240D00 0040A82D */ daddu $s5, $v0, $zero /* 8870C4 80240D04 1200005D */ beqz $s0, .L80240E7C -/* 8870C8 80240D08 00000000 */ nop +/* 8870C8 80240D08 00000000 */ nop /* 8870CC 80240D0C 0C00AB0A */ jal general_heap_malloc /* 8870D0 80240D10 24040068 */ addiu $a0, $zero, 0x68 /* 8870D4 80240D14 0040902D */ daddu $s2, $v0, $zero @@ -98,10 +98,10 @@ glabel func_80240C80_887040 /* 8871AC 80240DEC C7A2001C */ lwc1 $f2, 0x1c($sp) /* 8871B0 80240DF0 C7A40020 */ lwc1 $f4, 0x20($sp) /* 8871B4 80240DF4 46041082 */ mul.s $f2, $f2, $f4 -/* 8871B8 80240DF8 00000000 */ nop +/* 8871B8 80240DF8 00000000 */ nop /* 8871BC 80240DFC C7A00018 */ lwc1 $f0, 0x18($sp) /* 8871C0 80240E00 46040002 */ mul.s $f0, $f0, $f4 -/* 8871C4 80240E04 00000000 */ nop +/* 8871C4 80240E04 00000000 */ nop /* 8871C8 80240E08 E6020038 */ swc1 $f2, 0x38($s0) /* 8871CC 80240E0C E6000050 */ swc1 $f0, 0x50($s0) /* 8871D0 80240E10 8E42005C */ lw $v0, 0x5c($s2) @@ -142,12 +142,12 @@ glabel func_80240C80_887040 /* 887258 80240E98 10600007 */ beqz $v1, .L80240EB8 /* 88725C 80240E9C 24040005 */ addiu $a0, $zero, 5 /* 887260 80240EA0 08090414 */ j .L80241050 -/* 887264 80240EA4 00000000 */ nop +/* 887264 80240EA4 00000000 */ nop .L80240EA8: /* 887268 80240EA8 10620058 */ beq $v1, $v0, .L8024100C -/* 88726C 80240EAC 00000000 */ nop +/* 88726C 80240EAC 00000000 */ nop /* 887270 80240EB0 08090414 */ j .L80241050 -/* 887274 80240EB4 00000000 */ nop +/* 887274 80240EB4 00000000 */ nop .L80240EB8: /* 887278 80240EB8 0000882D */ daddu $s1, $zero, $zero /* 88727C 80240EBC 3C148024 */ lui $s4, %hi(D_80242088) @@ -174,11 +174,11 @@ glabel func_80240C80_887040 /* 8872CC 80240F0C C7A4001C */ lwc1 $f4, 0x1c($sp) /* 8872D0 80240F10 C7A00020 */ lwc1 $f0, 0x20($sp) /* 8872D4 80240F14 46002102 */ mul.s $f4, $f4, $f0 -/* 8872D8 80240F18 00000000 */ nop +/* 8872D8 80240F18 00000000 */ nop /* 8872DC 80240F1C C7A20018 */ lwc1 $f2, 0x18($sp) /* 8872E0 80240F20 26940004 */ addiu $s4, $s4, 4 /* 8872E4 80240F24 46001082 */ mul.s $f2, $f2, $f0 -/* 8872E8 80240F28 00000000 */ nop +/* 8872E8 80240F28 00000000 */ nop /* 8872EC 80240F2C 26730004 */ addiu $s3, $s3, 4 /* 8872F0 80240F30 26310001 */ addiu $s1, $s1, 1 /* 8872F4 80240F34 2A220003 */ slti $v0, $s1, 3 @@ -215,11 +215,11 @@ glabel func_80240C80_887040 /* 887368 80240FA8 C7A4001C */ lwc1 $f4, 0x1c($sp) /* 88736C 80240FAC C7A00020 */ lwc1 $f0, 0x20($sp) /* 887370 80240FB0 46002102 */ mul.s $f4, $f4, $f0 -/* 887374 80240FB4 00000000 */ nop +/* 887374 80240FB4 00000000 */ nop /* 887378 80240FB8 C7A20018 */ lwc1 $f2, 0x18($sp) /* 88737C 80240FBC 26940004 */ addiu $s4, $s4, 4 /* 887380 80240FC0 46001082 */ mul.s $f2, $f2, $f0 -/* 887384 80240FC4 00000000 */ nop +/* 887384 80240FC4 00000000 */ nop /* 887388 80240FC8 26730004 */ addiu $s3, $s3, 4 /* 88738C 80240FCC 26310001 */ addiu $s1, $s1, 1 /* 887390 80240FD0 2A220003 */ slti $v0, $s1, 3 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802411B8_887578.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802411B8_887578.s index 6e0b488569..7390da6541 100644 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802411B8_887578.s +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802411B8_887578.s @@ -36,16 +36,16 @@ glabel func_802411B8_887578 /* 8875F0 80241230 10600007 */ beqz $v1, .L80241250 /* 8875F4 80241234 240500FF */ addiu $a1, $zero, 0xff /* 8875F8 80241238 080904B2 */ j .L802412C8 -/* 8875FC 8024123C 00000000 */ nop +/* 8875FC 8024123C 00000000 */ nop .L80241240: /* 887600 80241240 10620019 */ beq $v1, $v0, .L802412A8 -/* 887604 80241244 00000000 */ nop +/* 887604 80241244 00000000 */ nop /* 887608 80241248 080904B2 */ j .L802412C8 -/* 88760C 8024124C 00000000 */ nop +/* 88760C 8024124C 00000000 */ nop .L80241250: /* 887610 80241250 8E220074 */ lw $v0, 0x74($s1) /* 887614 80241254 14450004 */ bne $v0, $a1, .L80241268 -/* 887618 80241258 00000000 */ nop +/* 887618 80241258 00000000 */ nop /* 88761C 8024125C AE240070 */ sw $a0, 0x70($s1) /* 887620 80241260 AE200078 */ sw $zero, 0x78($s1) /* 887624 80241264 8E220074 */ lw $v0, 0x74($s1) @@ -57,7 +57,7 @@ glabel func_802411B8_887578 /* 887638 80241278 50400013 */ beql $v0, $zero, .L802412C8 /* 88763C 8024127C AE250074 */ sw $a1, 0x74($s1) /* 887640 80241280 080904B2 */ j .L802412C8 -/* 887644 80241284 00000000 */ nop +/* 887644 80241284 00000000 */ nop .L80241288: /* 887648 80241288 8E220078 */ lw $v0, 0x78($s1) /* 88764C 8024128C 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80241388_887748.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80241388_887748.s index 0e0300eb14..e5a1156443 100644 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80241388_887748.s +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80241388_887748.s @@ -15,5 +15,5 @@ glabel func_80241388_887748 .L802413B0: /* 887770 802413B0 03E00008 */ jr $ra /* 887774 802413B4 24020002 */ addiu $v0, $zero, 2 -/* 887778 802413B8 00000000 */ nop -/* 88777C 802413BC 00000000 */ nop +/* 887778 802413B8 00000000 */ nop +/* 88777C 802413BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_80240034_888C04.s b/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_80240034_888C04.s index a1a8bcafd7..711ed27b7d 100644 --- a/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_80240034_888C04.s +++ b/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_80240034_888C04.s @@ -22,16 +22,16 @@ glabel func_80240034_888C04 /* 888C44 80240074 00021023 */ negu $v0, $v0 .L80240078: /* 888C48 80240078 14400003 */ bnez $v0, .L80240088 -/* 888C4C 8024007C 00000000 */ nop +/* 888C4C 8024007C 00000000 */ nop /* 888C50 80240080 50E00017 */ beql $a3, $zero, .L802400E0 /* 888C54 80240084 0000102D */ daddu $v0, $zero, $zero .L80240088: /* 888C58 80240088 44822000 */ mtc1 $v0, $f4 -/* 888C5C 8024008C 00000000 */ nop +/* 888C5C 8024008C 00000000 */ nop /* 888C60 80240090 46802120 */ cvt.s.w $f4, $f4 /* 888C64 80240094 44062000 */ mfc1 $a2, $f4 /* 888C68 80240098 44872000 */ mtc1 $a3, $f4 -/* 888C6C 8024009C 00000000 */ nop +/* 888C6C 8024009C 00000000 */ nop /* 888C70 802400A0 46802120 */ cvt.s.w $f4, $f4 /* 888C74 802400A4 44806000 */ mtc1 $zero, $f12 /* 888C78 802400A8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240034_888C04 /* 888C80 802400B0 46006386 */ mov.s $f14, $f12 /* 888C84 802400B4 3C014270 */ lui $at, 0x4270 /* 888C88 802400B8 44811000 */ mtc1 $at, $f2 -/* 888C8C 802400BC 00000000 */ nop +/* 888C8C 802400BC 00000000 */ nop /* 888C90 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 888C94 802400C4 00000000 */ nop +/* 888C94 802400C4 00000000 */ nop /* 888C98 802400C8 45000004 */ bc1f .L802400DC /* 888C9C 802400CC 24020001 */ addiu $v0, $zero, 1 /* 888CA0 802400D0 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802405F0_8891C0.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802405F0_8891C0.s index d633b41648..21fd3d5905 100644 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802405F0_8891C0.s +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802405F0_8891C0.s @@ -32,58 +32,58 @@ glabel func_802405F0_8891C0 /* 88922C 8024065C C6400098 */ lwc1 $f0, 0x98($s2) /* 889230 80240660 46001081 */ sub.s $f2, $f2, $f0 /* 889234 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 889238 80240668 00000000 */ nop +/* 889238 80240668 00000000 */ nop /* 88923C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) /* 889240 80240670 C4620030 */ lwc1 $f2, 0x30($v1) /* 889244 80240674 46001081 */ sub.s $f2, $f2, $f0 /* 889248 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 88924C 8024067C 00000000 */ nop +/* 88924C 8024067C 00000000 */ nop /* 889250 80240680 846200B0 */ lh $v0, 0xb0($v1) /* 889254 80240684 C462002C */ lwc1 $f2, 0x2c($v1) /* 889258 80240688 44820000 */ mtc1 $v0, $f0 -/* 88925C 8024068C 00000000 */ nop +/* 88925C 8024068C 00000000 */ nop /* 889260 80240690 46800020 */ cvt.s.w $f0, $f0 /* 889264 80240694 46001080 */ add.s $f2, $f2, $f0 /* 889268 80240698 3C013FC0 */ lui $at, 0x3fc0 /* 88926C 8024069C 44810000 */ mtc1 $at, $f0 -/* 889270 802406A0 00000000 */ nop +/* 889270 802406A0 00000000 */ nop /* 889274 802406A4 46001081 */ sub.s $f2, $f2, $f0 /* 889278 802406A8 46043300 */ add.s $f12, $f6, $f4 /* 88927C 802406AC C640009C */ lwc1 $f0, 0x9c($s2) /* 889280 802406B0 46001501 */ sub.s $f20, $f2, $f0 /* 889284 802406B4 46006084 */ sqrt.s $f2, $f12 /* 889288 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 88928C 802406BC 00000000 */ nop +/* 88928C 802406BC 00000000 */ nop /* 889290 802406C0 45010004 */ bc1t .L802406D4 /* 889294 802406C4 0060882D */ daddu $s1, $v1, $zero /* 889298 802406C8 0C0187BC */ jal sqrtf -/* 88929C 802406CC 00000000 */ nop +/* 88929C 802406CC 00000000 */ nop /* 8892A0 802406D0 46000086 */ mov.s $f2, $f0 .L802406D4: /* 8892A4 802406D4 44800000 */ mtc1 $zero, $f0 -/* 8892A8 802406D8 00000000 */ nop +/* 8892A8 802406D8 00000000 */ nop /* 8892AC 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 8892B0 802406E0 00000000 */ nop +/* 8892B0 802406E0 00000000 */ nop /* 8892B4 802406E4 45000016 */ bc1f .L80240740 /* 8892B8 802406E8 46001106 */ mov.s $f4, $f2 /* 8892BC 802406EC 862200B0 */ lh $v0, 0xb0($s1) /* 8892C0 802406F0 44820000 */ mtc1 $v0, $f0 -/* 8892C4 802406F4 00000000 */ nop +/* 8892C4 802406F4 00000000 */ nop /* 8892C8 802406F8 46800020 */ cvt.s.w $f0, $f0 /* 8892CC 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 8892D0 80240700 00000000 */ nop +/* 8892D0 80240700 00000000 */ nop /* 8892D4 80240704 4500000E */ bc1f .L80240740 -/* 8892D8 80240708 00000000 */ nop +/* 8892D8 80240708 00000000 */ nop /* 8892DC 8024070C 862200B2 */ lh $v0, 0xb2($s1) /* 8892E0 80240710 3C013F00 */ lui $at, 0x3f00 /* 8892E4 80240714 44811000 */ mtc1 $at, $f2 /* 8892E8 80240718 44820000 */ mtc1 $v0, $f0 -/* 8892EC 8024071C 00000000 */ nop +/* 8892EC 8024071C 00000000 */ nop /* 8892F0 80240720 46800020 */ cvt.s.w $f0, $f0 /* 8892F4 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 8892F8 80240728 00000000 */ nop +/* 8892F8 80240728 00000000 */ nop /* 8892FC 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 889300 80240730 00000000 */ nop +/* 889300 80240730 00000000 */ nop /* 889304 80240734 45000002 */ bc1f .L80240740 /* 889308 80240738 24020001 */ addiu $v0, $zero, 1 /* 88930C 8024073C AE62008C */ sw $v0, 0x8c($s3) @@ -92,58 +92,58 @@ glabel func_802405F0_8891C0 /* 889314 80240744 C6400098 */ lwc1 $f0, 0x98($s2) /* 889318 80240748 46001081 */ sub.s $f2, $f2, $f0 /* 88931C 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 889320 80240750 00000000 */ nop +/* 889320 80240750 00000000 */ nop /* 889324 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 889328 80240758 C6020040 */ lwc1 $f2, 0x40($s0) /* 88932C 8024075C 46001081 */ sub.s $f2, $f2, $f0 /* 889330 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 889334 80240764 00000000 */ nop +/* 889334 80240764 00000000 */ nop /* 889338 80240768 860200A8 */ lh $v0, 0xa8($s0) /* 88933C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) /* 889340 80240770 44820000 */ mtc1 $v0, $f0 -/* 889344 80240774 00000000 */ nop +/* 889344 80240774 00000000 */ nop /* 889348 80240778 46800020 */ cvt.s.w $f0, $f0 /* 88934C 8024077C 46001080 */ add.s $f2, $f2, $f0 /* 889350 80240780 3C013FC0 */ lui $at, 0x3fc0 /* 889354 80240784 44810000 */ mtc1 $at, $f0 -/* 889358 80240788 00000000 */ nop +/* 889358 80240788 00000000 */ nop /* 88935C 8024078C 46001081 */ sub.s $f2, $f2, $f0 /* 889360 80240790 46043300 */ add.s $f12, $f6, $f4 /* 889364 80240794 C640009C */ lwc1 $f0, 0x9c($s2) /* 889368 80240798 46001501 */ sub.s $f20, $f2, $f0 /* 88936C 8024079C 46006084 */ sqrt.s $f2, $f12 /* 889370 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 889374 802407A4 00000000 */ nop +/* 889374 802407A4 00000000 */ nop /* 889378 802407A8 45010004 */ bc1t .L802407BC -/* 88937C 802407AC 00000000 */ nop +/* 88937C 802407AC 00000000 */ nop /* 889380 802407B0 0C0187BC */ jal sqrtf -/* 889384 802407B4 00000000 */ nop +/* 889384 802407B4 00000000 */ nop /* 889388 802407B8 46000086 */ mov.s $f2, $f0 .L802407BC: /* 88938C 802407BC 44800000 */ mtc1 $zero, $f0 -/* 889390 802407C0 00000000 */ nop +/* 889390 802407C0 00000000 */ nop /* 889394 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 889398 802407C8 00000000 */ nop +/* 889398 802407C8 00000000 */ nop /* 88939C 802407CC 45000016 */ bc1f .L80240828 /* 8893A0 802407D0 46001106 */ mov.s $f4, $f2 /* 8893A4 802407D4 860200A8 */ lh $v0, 0xa8($s0) /* 8893A8 802407D8 44820000 */ mtc1 $v0, $f0 -/* 8893AC 802407DC 00000000 */ nop +/* 8893AC 802407DC 00000000 */ nop /* 8893B0 802407E0 46800020 */ cvt.s.w $f0, $f0 /* 8893B4 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 8893B8 802407E8 00000000 */ nop +/* 8893B8 802407E8 00000000 */ nop /* 8893BC 802407EC 4500000F */ bc1f .L8024082C /* 8893C0 802407F0 0000882D */ daddu $s1, $zero, $zero /* 8893C4 802407F4 860200A6 */ lh $v0, 0xa6($s0) /* 8893C8 802407F8 3C013F00 */ lui $at, 0x3f00 /* 8893CC 802407FC 44811000 */ mtc1 $at, $f2 /* 8893D0 80240800 44820000 */ mtc1 $v0, $f0 -/* 8893D4 80240804 00000000 */ nop +/* 8893D4 80240804 00000000 */ nop /* 8893D8 80240808 46800020 */ cvt.s.w $f0, $f0 /* 8893DC 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 8893E0 80240810 00000000 */ nop +/* 8893E0 80240810 00000000 */ nop /* 8893E4 80240814 4600203C */ c.lt.s $f4, $f0 -/* 8893E8 80240818 00000000 */ nop +/* 8893E8 80240818 00000000 */ nop /* 8893EC 8024081C 45000003 */ bc1f .L8024082C /* 8893F0 80240820 24020001 */ addiu $v0, $zero, 1 /* 8893F4 80240824 AE62008C */ sw $v0, 0x8c($s3) @@ -165,16 +165,16 @@ glabel func_802405F0_8891C0 /* 889428 80240858 C6400098 */ lwc1 $f0, 0x98($s2) /* 88942C 8024085C 46001081 */ sub.s $f2, $f2, $f0 /* 889430 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 889434 80240864 00000000 */ nop +/* 889434 80240864 00000000 */ nop /* 889438 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 88943C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) /* 889440 80240870 46001081 */ sub.s $f2, $f2, $f0 /* 889444 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 889448 80240878 00000000 */ nop +/* 889448 80240878 00000000 */ nop /* 88944C 8024087C 860200A8 */ lh $v0, 0xa8($s0) /* 889450 80240880 C602003C */ lwc1 $f2, 0x3c($s0) /* 889454 80240884 44820000 */ mtc1 $v0, $f0 -/* 889458 80240888 00000000 */ nop +/* 889458 80240888 00000000 */ nop /* 88945C 8024088C 46800020 */ cvt.s.w $f0, $f0 /* 889460 80240890 46001080 */ add.s $f2, $f2, $f0 /* 889464 80240894 461A1081 */ sub.s $f2, $f2, $f26 @@ -183,32 +183,32 @@ glabel func_802405F0_8891C0 /* 889470 802408A0 46001501 */ sub.s $f20, $f2, $f0 /* 889474 802408A4 46006004 */ sqrt.s $f0, $f12 /* 889478 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 88947C 802408AC 00000000 */ nop +/* 88947C 802408AC 00000000 */ nop /* 889480 802408B0 45010003 */ bc1t .L802408C0 -/* 889484 802408B4 00000000 */ nop +/* 889484 802408B4 00000000 */ nop /* 889488 802408B8 0C0187BC */ jal sqrtf -/* 88948C 802408BC 00000000 */ nop +/* 88948C 802408BC 00000000 */ nop .L802408C0: /* 889490 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 889494 802408C4 00000000 */ nop +/* 889494 802408C4 00000000 */ nop /* 889498 802408C8 45000015 */ bc1f .L80240920 /* 88949C 802408CC 46000106 */ mov.s $f4, $f0 /* 8894A0 802408D0 860200A8 */ lh $v0, 0xa8($s0) /* 8894A4 802408D4 44820000 */ mtc1 $v0, $f0 -/* 8894A8 802408D8 00000000 */ nop +/* 8894A8 802408D8 00000000 */ nop /* 8894AC 802408DC 46800020 */ cvt.s.w $f0, $f0 /* 8894B0 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 8894B4 802408E4 00000000 */ nop +/* 8894B4 802408E4 00000000 */ nop /* 8894B8 802408E8 4500000E */ bc1f .L80240924 /* 8894BC 802408EC 26310001 */ addiu $s1, $s1, 1 /* 8894C0 802408F0 860200A6 */ lh $v0, 0xa6($s0) /* 8894C4 802408F4 44820000 */ mtc1 $v0, $f0 -/* 8894C8 802408F8 00000000 */ nop +/* 8894C8 802408F8 00000000 */ nop /* 8894CC 802408FC 46800020 */ cvt.s.w $f0, $f0 /* 8894D0 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 8894D4 80240904 00000000 */ nop +/* 8894D4 80240904 00000000 */ nop /* 8894D8 80240908 4600203C */ c.lt.s $f4, $f0 -/* 8894DC 8024090C 00000000 */ nop +/* 8894DC 8024090C 00000000 */ nop /* 8894E0 80240910 45000004 */ bc1f .L80240924 /* 8894E4 80240914 24020001 */ addiu $v0, $zero, 1 /* 8894E8 80240918 0809024C */ j .L80240930 @@ -218,7 +218,7 @@ glabel func_802405F0_8891C0 .L80240924: /* 8894F4 80240924 2A220040 */ slti $v0, $s1, 0x40 /* 8894F8 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 8894FC 8024092C 00000000 */ nop +/* 8894FC 8024092C 00000000 */ nop .L80240930: /* 889500 80240930 8FBF0020 */ lw $ra, 0x20($sp) /* 889504 80240934 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240960_889530.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240960_889530.s index c339d01cf8..7711a48446 100644 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240960_889530.s +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240960_889530.s @@ -26,7 +26,7 @@ glabel func_80240960_889530 /* 889580 802409B0 1440FFFA */ bnez $v0, .L8024099C /* 889584 802409B4 24A50004 */ addiu $a1, $a1, 4 /* 889588 802409B8 0809027F */ j .L802409FC -/* 88958C 802409BC 00000000 */ nop +/* 88958C 802409BC 00000000 */ nop .L802409C0: /* 889590 802409C0 0000182D */ daddu $v1, $zero, $zero /* 889594 802409C4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240CF0_8898C0.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240CF0_8898C0.s index 0124312a83..0027852ead 100644 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240CF0_8898C0.s +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240CF0_8898C0.s @@ -8,7 +8,7 @@ glabel func_80240CF0_8898C0 /* 8898CC 80240CFC 00822021 */ addu $a0, $a0, $v0 /* 8898D0 80240D00 90820014 */ lbu $v0, 0x14($a0) /* 8898D4 80240D04 10400009 */ beqz $v0, .L80240D2C -/* 8898D8 80240D08 00000000 */ nop +/* 8898D8 80240D08 00000000 */ nop /* 8898DC 80240D0C 90820015 */ lbu $v0, 0x15($a0) /* 8898E0 80240D10 00022600 */ sll $a0, $v0, 0x18 /* 8898E4 80240D14 00041E03 */ sra $v1, $a0, 0x18 @@ -16,7 +16,7 @@ glabel func_80240CF0_8898C0 /* 8898EC 80240D1C 00021403 */ sra $v0, $v0, 0x10 /* 8898F0 80240D20 0043102A */ slt $v0, $v0, $v1 /* 8898F4 80240D24 10400003 */ beqz $v0, .L80240D34 -/* 8898F8 80240D28 00000000 */ nop +/* 8898F8 80240D28 00000000 */ nop .L80240D2C: /* 8898FC 80240D2C 03E00008 */ jr $ra /* 889900 80240D30 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240DE8_8899B8.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240DE8_8899B8.s index f66f74fd3b..23e0a0d0b7 100644 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240DE8_8899B8.s +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240DE8_8899B8.s @@ -108,20 +108,20 @@ glabel func_80240DE8_8899B8 /* 889B40 80240F70 10400009 */ beqz $v0, .L80240F98 /* 889B44 80240F74 AEA20074 */ sw $v0, 0x74($s5) /* 889B48 80240F78 0C03C4EC */ jal func_800F13B0 -/* 889B4C 80240F7C 00000000 */ nop +/* 889B4C 80240F7C 00000000 */ nop /* 889B50 80240F80 8EA20070 */ lw $v0, 0x70($s5) /* 889B54 80240F84 24420001 */ addiu $v0, $v0, 1 .L80240F88: /* 889B58 80240F88 AEA20070 */ sw $v0, 0x70($s5) /* 889B5C 80240F8C 2842000F */ slti $v0, $v0, 0xf /* 889B60 80240F90 10400003 */ beqz $v0, .L80240FA0 -/* 889B64 80240F94 00000000 */ nop +/* 889B64 80240F94 00000000 */ nop .L80240F98: /* 889B68 80240F98 08090402 */ j .L80241008 /* 889B6C 80240F9C 0000102D */ daddu $v0, $zero, $zero .L80240FA0: /* 889B70 80240FA0 0C03C54E */ jal func_800F1538 -/* 889B74 80240FA4 00000000 */ nop +/* 889B74 80240FA4 00000000 */ nop /* 889B78 80240FA8 8EA30074 */ lw $v1, 0x74($s5) /* 889B7C 80240FAC 240200FF */ addiu $v0, $zero, 0xff /* 889B80 80240FB0 10620010 */ beq $v1, $v0, .L80240FF4 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024121C_889DEC.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024121C_889DEC.s index a32af41332..b28e1b2a60 100644 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024121C_889DEC.s +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024121C_889DEC.s @@ -36,7 +36,7 @@ glabel func_8024121C_889DEC /* 889E68 80241298 0C00A88D */ jal sin_cos_deg /* 889E6C 8024129C 0040A82D */ daddu $s5, $v0, $zero /* 889E70 802412A0 1200005D */ beqz $s0, .L80241418 -/* 889E74 802412A4 00000000 */ nop +/* 889E74 802412A4 00000000 */ nop /* 889E78 802412A8 0C00AB0A */ jal general_heap_malloc /* 889E7C 802412AC 24040068 */ addiu $a0, $zero, 0x68 /* 889E80 802412B0 0040902D */ daddu $s2, $v0, $zero @@ -98,10 +98,10 @@ glabel func_8024121C_889DEC /* 889F58 80241388 C7A2001C */ lwc1 $f2, 0x1c($sp) /* 889F5C 8024138C C7A40020 */ lwc1 $f4, 0x20($sp) /* 889F60 80241390 46041082 */ mul.s $f2, $f2, $f4 -/* 889F64 80241394 00000000 */ nop +/* 889F64 80241394 00000000 */ nop /* 889F68 80241398 C7A00018 */ lwc1 $f0, 0x18($sp) /* 889F6C 8024139C 46040002 */ mul.s $f0, $f0, $f4 -/* 889F70 802413A0 00000000 */ nop +/* 889F70 802413A0 00000000 */ nop /* 889F74 802413A4 E6020038 */ swc1 $f2, 0x38($s0) /* 889F78 802413A8 E6000050 */ swc1 $f0, 0x50($s0) /* 889F7C 802413AC 8E42005C */ lw $v0, 0x5c($s2) @@ -142,12 +142,12 @@ glabel func_8024121C_889DEC /* 88A004 80241434 10600007 */ beqz $v1, .L80241454 /* 88A008 80241438 24040005 */ addiu $a0, $zero, 5 /* 88A00C 8024143C 0809057B */ j .L802415EC -/* 88A010 80241440 00000000 */ nop +/* 88A010 80241440 00000000 */ nop .L80241444: /* 88A014 80241444 10620058 */ beq $v1, $v0, .L802415A8 -/* 88A018 80241448 00000000 */ nop +/* 88A018 80241448 00000000 */ nop /* 88A01C 8024144C 0809057B */ j .L802415EC -/* 88A020 80241450 00000000 */ nop +/* 88A020 80241450 00000000 */ nop .L80241454: /* 88A024 80241454 0000882D */ daddu $s1, $zero, $zero /* 88A028 80241458 3C148024 */ lui $s4, %hi(D_80243D04) @@ -174,11 +174,11 @@ glabel func_8024121C_889DEC /* 88A078 802414A8 C7A4001C */ lwc1 $f4, 0x1c($sp) /* 88A07C 802414AC C7A00020 */ lwc1 $f0, 0x20($sp) /* 88A080 802414B0 46002102 */ mul.s $f4, $f4, $f0 -/* 88A084 802414B4 00000000 */ nop +/* 88A084 802414B4 00000000 */ nop /* 88A088 802414B8 C7A20018 */ lwc1 $f2, 0x18($sp) /* 88A08C 802414BC 26940004 */ addiu $s4, $s4, 4 /* 88A090 802414C0 46001082 */ mul.s $f2, $f2, $f0 -/* 88A094 802414C4 00000000 */ nop +/* 88A094 802414C4 00000000 */ nop /* 88A098 802414C8 26730004 */ addiu $s3, $s3, 4 /* 88A09C 802414CC 26310001 */ addiu $s1, $s1, 1 /* 88A0A0 802414D0 2A220003 */ slti $v0, $s1, 3 @@ -215,11 +215,11 @@ glabel func_8024121C_889DEC /* 88A114 80241544 C7A4001C */ lwc1 $f4, 0x1c($sp) /* 88A118 80241548 C7A00020 */ lwc1 $f0, 0x20($sp) /* 88A11C 8024154C 46002102 */ mul.s $f4, $f4, $f0 -/* 88A120 80241550 00000000 */ nop +/* 88A120 80241550 00000000 */ nop /* 88A124 80241554 C7A20018 */ lwc1 $f2, 0x18($sp) /* 88A128 80241558 26940004 */ addiu $s4, $s4, 4 /* 88A12C 8024155C 46001082 */ mul.s $f2, $f2, $f0 -/* 88A130 80241560 00000000 */ nop +/* 88A130 80241560 00000000 */ nop /* 88A134 80241564 26730004 */ addiu $s3, $s3, 4 /* 88A138 80241568 26310001 */ addiu $s1, $s1, 1 /* 88A13C 8024156C 2A220003 */ slti $v0, $s1, 3 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241754_88A324.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241754_88A324.s index 28570d15b7..44ca8de161 100644 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241754_88A324.s +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241754_88A324.s @@ -36,16 +36,16 @@ glabel func_80241754_88A324 /* 88A39C 802417CC 10600007 */ beqz $v1, .L802417EC /* 88A3A0 802417D0 240500FF */ addiu $a1, $zero, 0xff /* 88A3A4 802417D4 08090619 */ j .L80241864 -/* 88A3A8 802417D8 00000000 */ nop +/* 88A3A8 802417D8 00000000 */ nop .L802417DC: /* 88A3AC 802417DC 10620019 */ beq $v1, $v0, .L80241844 -/* 88A3B0 802417E0 00000000 */ nop +/* 88A3B0 802417E0 00000000 */ nop /* 88A3B4 802417E4 08090619 */ j .L80241864 -/* 88A3B8 802417E8 00000000 */ nop +/* 88A3B8 802417E8 00000000 */ nop .L802417EC: /* 88A3BC 802417EC 8E220074 */ lw $v0, 0x74($s1) /* 88A3C0 802417F0 14450004 */ bne $v0, $a1, .L80241804 -/* 88A3C4 802417F4 00000000 */ nop +/* 88A3C4 802417F4 00000000 */ nop /* 88A3C8 802417F8 AE240070 */ sw $a0, 0x70($s1) /* 88A3CC 802417FC AE200078 */ sw $zero, 0x78($s1) /* 88A3D0 80241800 8E220074 */ lw $v0, 0x74($s1) @@ -57,7 +57,7 @@ glabel func_80241754_88A324 /* 88A3E4 80241814 50400013 */ beql $v0, $zero, .L80241864 /* 88A3E8 80241818 AE250074 */ sw $a1, 0x74($s1) /* 88A3EC 8024181C 08090619 */ j .L80241864 -/* 88A3F0 80241820 00000000 */ nop +/* 88A3F0 80241820 00000000 */ nop .L80241824: /* 88A3F4 80241824 8E220078 */ lw $v0, 0x78($s1) /* 88A3F8 80241828 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241924_88A4F4.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241924_88A4F4.s index 4f2fed304d..9e55c96760 100644 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241924_88A4F4.s +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241924_88A4F4.s @@ -15,6 +15,6 @@ glabel func_80241924_88A4F4 .L8024194C: /* 88A51C 8024194C 03E00008 */ jr $ra /* 88A520 80241950 24020002 */ addiu $v0, $zero, 2 -/* 88A524 80241954 00000000 */ nop -/* 88A528 80241958 00000000 */ nop -/* 88A52C 8024195C 00000000 */ nop +/* 88A524 80241954 00000000 */ nop +/* 88A528 80241958 00000000 */ nop +/* 88A52C 8024195C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_802419DC_88A5AC.s b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_802419DC_88A5AC.s index 68c402a3e5..3d7d4e19b5 100644 --- a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_802419DC_88A5AC.s +++ b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_802419DC_88A5AC.s @@ -21,11 +21,11 @@ glabel func_802419DC_88A5AC /* 88A5EC 80241A1C A602008E */ sh $v0, 0x8e($s0) /* 88A5F0 80241A20 00021400 */ sll $v0, $v0, 0x10 /* 88A5F4 80241A24 1C400033 */ bgtz $v0, .L80241AF4 -/* 88A5F8 80241A28 00000000 */ nop +/* 88A5F8 80241A28 00000000 */ nop .L80241A2C: /* 88A5FC 80241A2C 8602008C */ lh $v0, 0x8c($s0) /* 88A600 80241A30 14400030 */ bnez $v0, .L80241AF4 -/* 88A604 80241A34 00000000 */ nop +/* 88A604 80241A34 00000000 */ nop /* 88A608 80241A38 8E2200CC */ lw $v0, 0xcc($s1) /* 88A60C 80241A3C 8C420024 */ lw $v0, 0x24($v0) /* 88A610 80241A40 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_802419DC_88A5AC /* 88A61C 80241A4C 8E230088 */ lw $v1, 0x88($s1) /* 88A620 80241A50 24020005 */ addiu $v0, $zero, 5 /* 88A624 80241A54 10620005 */ beq $v1, $v0, .L80241A6C -/* 88A628 80241A58 00000000 */ nop +/* 88A628 80241A58 00000000 */ nop /* 88A62C 80241A5C 10600003 */ beqz $v1, .L80241A6C /* 88A630 80241A60 24020001 */ addiu $v0, $zero, 1 /* 88A634 80241A64 14620006 */ bne $v1, $v0, .L80241A80 -/* 88A638 80241A68 00000000 */ nop +/* 88A638 80241A68 00000000 */ nop .L80241A6C: /* 88A63C 80241A6C 8E220084 */ lw $v0, 0x84($s1) /* 88A640 80241A70 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_802419DC_88A5AC /* 88A680 80241AB0 46220000 */ add.d $f0, $f0, $f2 /* 88A684 80241AB4 4620010D */ trunc.w.d $f4, $f0 /* 88A688 80241AB8 44022000 */ mfc1 $v0, $f4 -/* 88A68C 80241ABC 00000000 */ nop +/* 88A68C 80241ABC 00000000 */ nop /* 88A690 80241AC0 A602008E */ sh $v0, 0x8e($s0) /* 88A694 80241AC4 00021400 */ sll $v0, $v0, 0x10 /* 88A698 80241AC8 8E230078 */ lw $v1, 0x78($s1) /* 88A69C 80241ACC 00021403 */ sra $v0, $v0, 0x10 /* 88A6A0 80241AD0 0043102A */ slt $v0, $v0, $v1 /* 88A6A4 80241AD4 10400003 */ beqz $v0, .L80241AE4 -/* 88A6A8 80241AD8 00000000 */ nop +/* 88A6A8 80241AD8 00000000 */ nop /* 88A6AC 80241ADC 9622007A */ lhu $v0, 0x7a($s1) /* 88A6B0 80241AE0 A602008E */ sh $v0, 0x8e($s0) .L80241AE4: diff --git a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s index 2b13b53c9f..2597cd9e6d 100644 --- a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s +++ b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s @@ -279,15 +279,17 @@ glabel func_80241CF4_88A8C4 /* 88ACB0 802420E0 2C620015 */ sltiu $v0, $v1, 0x15 /* 88ACB4 802420E4 10400009 */ beqz $v0, .L8024210C /* 88ACB8 802420E8 00031080 */ sll $v0, $v1, 2 -/* 88ACBC 802420EC 3C018024 */ lui $at, %hi(D_802449D8) +/* 88ACBC 802420EC 3C018024 */ lui $at, %hi(jtbl_802449D8_88D5A8) /* 88ACC0 802420F0 00220821 */ addu $at, $at, $v0 -/* 88ACC4 802420F4 8C2249D8 */ lw $v0, %lo(D_802449D8)($at) +/* 88ACC4 802420F4 8C2249D8 */ lw $v0, %lo(jtbl_802449D8_88D5A8)($at) /* 88ACC8 802420F8 00400008 */ jr $v0 /* 88ACCC 802420FC 00000000 */ nop +glabel L80242100_88ACD0 /* 88ACD0 80242100 8E420028 */ lw $v0, 0x28($s2) /* 88ACD4 80242104 24420001 */ addiu $v0, $v0, 1 /* 88ACD8 80242108 AE420028 */ sw $v0, 0x28($s2) .L8024210C: +glabel L8024210C_88ACDC /* 88ACDC 8024210C 0000102D */ daddu $v0, $zero, $zero .L80242110: /* 88ACE0 80242110 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_14/88D600/func_80240034_88D634.s b/asm/nonmatchings/world/area_tik/tik_14/88D600/func_80240034_88D634.s index 076adfb64e..ea07ecd60b 100644 --- a/asm/nonmatchings/world/area_tik/tik_14/88D600/func_80240034_88D634.s +++ b/asm/nonmatchings/world/area_tik/tik_14/88D600/func_80240034_88D634.s @@ -22,16 +22,16 @@ glabel func_80240034_88D634 /* 88D674 80240074 00021023 */ negu $v0, $v0 .L80240078: /* 88D678 80240078 14400003 */ bnez $v0, .L80240088 -/* 88D67C 8024007C 00000000 */ nop +/* 88D67C 8024007C 00000000 */ nop /* 88D680 80240080 50E00017 */ beql $a3, $zero, .L802400E0 /* 88D684 80240084 0000102D */ daddu $v0, $zero, $zero .L80240088: /* 88D688 80240088 44822000 */ mtc1 $v0, $f4 -/* 88D68C 8024008C 00000000 */ nop +/* 88D68C 8024008C 00000000 */ nop /* 88D690 80240090 46802120 */ cvt.s.w $f4, $f4 /* 88D694 80240094 44062000 */ mfc1 $a2, $f4 /* 88D698 80240098 44872000 */ mtc1 $a3, $f4 -/* 88D69C 8024009C 00000000 */ nop +/* 88D69C 8024009C 00000000 */ nop /* 88D6A0 802400A0 46802120 */ cvt.s.w $f4, $f4 /* 88D6A4 802400A4 44806000 */ mtc1 $zero, $f12 /* 88D6A8 802400A8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240034_88D634 /* 88D6B0 802400B0 46006386 */ mov.s $f14, $f12 /* 88D6B4 802400B4 3C014270 */ lui $at, 0x4270 /* 88D6B8 802400B8 44811000 */ mtc1 $at, $f2 -/* 88D6BC 802400BC 00000000 */ nop +/* 88D6BC 802400BC 00000000 */ nop /* 88D6C0 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 88D6C4 802400C4 00000000 */ nop +/* 88D6C4 802400C4 00000000 */ nop /* 88D6C8 802400C8 45000004 */ bc1f .L802400DC /* 88D6CC 802400CC 24020001 */ addiu $v0, $zero, 1 /* 88D6D0 802400D0 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_tik/tik_14/88DBF0/func_802405F0_88DBF0.s b/asm/nonmatchings/world/area_tik/tik_14/88DBF0/func_802405F0_88DBF0.s index f86baccfc8..accc056179 100644 --- a/asm/nonmatchings/world/area_tik/tik_14/88DBF0/func_802405F0_88DBF0.s +++ b/asm/nonmatchings/world/area_tik/tik_14/88DBF0/func_802405F0_88DBF0.s @@ -32,58 +32,58 @@ glabel func_802405F0_88DBF0 /* 88DC5C 8024065C C6400098 */ lwc1 $f0, 0x98($s2) /* 88DC60 80240660 46001081 */ sub.s $f2, $f2, $f0 /* 88DC64 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 88DC68 80240668 00000000 */ nop +/* 88DC68 80240668 00000000 */ nop /* 88DC6C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) /* 88DC70 80240670 C4620030 */ lwc1 $f2, 0x30($v1) /* 88DC74 80240674 46001081 */ sub.s $f2, $f2, $f0 /* 88DC78 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 88DC7C 8024067C 00000000 */ nop +/* 88DC7C 8024067C 00000000 */ nop /* 88DC80 80240680 846200B0 */ lh $v0, 0xb0($v1) /* 88DC84 80240684 C462002C */ lwc1 $f2, 0x2c($v1) /* 88DC88 80240688 44820000 */ mtc1 $v0, $f0 -/* 88DC8C 8024068C 00000000 */ nop +/* 88DC8C 8024068C 00000000 */ nop /* 88DC90 80240690 46800020 */ cvt.s.w $f0, $f0 /* 88DC94 80240694 46001080 */ add.s $f2, $f2, $f0 /* 88DC98 80240698 3C013FC0 */ lui $at, 0x3fc0 /* 88DC9C 8024069C 44810000 */ mtc1 $at, $f0 -/* 88DCA0 802406A0 00000000 */ nop +/* 88DCA0 802406A0 00000000 */ nop /* 88DCA4 802406A4 46001081 */ sub.s $f2, $f2, $f0 /* 88DCA8 802406A8 46043300 */ add.s $f12, $f6, $f4 /* 88DCAC 802406AC C640009C */ lwc1 $f0, 0x9c($s2) /* 88DCB0 802406B0 46001501 */ sub.s $f20, $f2, $f0 /* 88DCB4 802406B4 46006084 */ sqrt.s $f2, $f12 /* 88DCB8 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 88DCBC 802406BC 00000000 */ nop +/* 88DCBC 802406BC 00000000 */ nop /* 88DCC0 802406C0 45010004 */ bc1t .L802406D4 /* 88DCC4 802406C4 0060882D */ daddu $s1, $v1, $zero /* 88DCC8 802406C8 0C0187BC */ jal sqrtf -/* 88DCCC 802406CC 00000000 */ nop +/* 88DCCC 802406CC 00000000 */ nop /* 88DCD0 802406D0 46000086 */ mov.s $f2, $f0 .L802406D4: /* 88DCD4 802406D4 44800000 */ mtc1 $zero, $f0 -/* 88DCD8 802406D8 00000000 */ nop +/* 88DCD8 802406D8 00000000 */ nop /* 88DCDC 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 88DCE0 802406E0 00000000 */ nop +/* 88DCE0 802406E0 00000000 */ nop /* 88DCE4 802406E4 45000016 */ bc1f .L80240740 /* 88DCE8 802406E8 46001106 */ mov.s $f4, $f2 /* 88DCEC 802406EC 862200B0 */ lh $v0, 0xb0($s1) /* 88DCF0 802406F0 44820000 */ mtc1 $v0, $f0 -/* 88DCF4 802406F4 00000000 */ nop +/* 88DCF4 802406F4 00000000 */ nop /* 88DCF8 802406F8 46800020 */ cvt.s.w $f0, $f0 /* 88DCFC 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 88DD00 80240700 00000000 */ nop +/* 88DD00 80240700 00000000 */ nop /* 88DD04 80240704 4500000E */ bc1f .L80240740 -/* 88DD08 80240708 00000000 */ nop +/* 88DD08 80240708 00000000 */ nop /* 88DD0C 8024070C 862200B2 */ lh $v0, 0xb2($s1) /* 88DD10 80240710 3C013F00 */ lui $at, 0x3f00 /* 88DD14 80240714 44811000 */ mtc1 $at, $f2 /* 88DD18 80240718 44820000 */ mtc1 $v0, $f0 -/* 88DD1C 8024071C 00000000 */ nop +/* 88DD1C 8024071C 00000000 */ nop /* 88DD20 80240720 46800020 */ cvt.s.w $f0, $f0 /* 88DD24 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 88DD28 80240728 00000000 */ nop +/* 88DD28 80240728 00000000 */ nop /* 88DD2C 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 88DD30 80240730 00000000 */ nop +/* 88DD30 80240730 00000000 */ nop /* 88DD34 80240734 45000002 */ bc1f .L80240740 /* 88DD38 80240738 24020001 */ addiu $v0, $zero, 1 /* 88DD3C 8024073C AE62008C */ sw $v0, 0x8c($s3) @@ -92,58 +92,58 @@ glabel func_802405F0_88DBF0 /* 88DD44 80240744 C6400098 */ lwc1 $f0, 0x98($s2) /* 88DD48 80240748 46001081 */ sub.s $f2, $f2, $f0 /* 88DD4C 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 88DD50 80240750 00000000 */ nop +/* 88DD50 80240750 00000000 */ nop /* 88DD54 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 88DD58 80240758 C6020040 */ lwc1 $f2, 0x40($s0) /* 88DD5C 8024075C 46001081 */ sub.s $f2, $f2, $f0 /* 88DD60 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 88DD64 80240764 00000000 */ nop +/* 88DD64 80240764 00000000 */ nop /* 88DD68 80240768 860200A8 */ lh $v0, 0xa8($s0) /* 88DD6C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) /* 88DD70 80240770 44820000 */ mtc1 $v0, $f0 -/* 88DD74 80240774 00000000 */ nop +/* 88DD74 80240774 00000000 */ nop /* 88DD78 80240778 46800020 */ cvt.s.w $f0, $f0 /* 88DD7C 8024077C 46001080 */ add.s $f2, $f2, $f0 /* 88DD80 80240780 3C013FC0 */ lui $at, 0x3fc0 /* 88DD84 80240784 44810000 */ mtc1 $at, $f0 -/* 88DD88 80240788 00000000 */ nop +/* 88DD88 80240788 00000000 */ nop /* 88DD8C 8024078C 46001081 */ sub.s $f2, $f2, $f0 /* 88DD90 80240790 46043300 */ add.s $f12, $f6, $f4 /* 88DD94 80240794 C640009C */ lwc1 $f0, 0x9c($s2) /* 88DD98 80240798 46001501 */ sub.s $f20, $f2, $f0 /* 88DD9C 8024079C 46006084 */ sqrt.s $f2, $f12 /* 88DDA0 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 88DDA4 802407A4 00000000 */ nop +/* 88DDA4 802407A4 00000000 */ nop /* 88DDA8 802407A8 45010004 */ bc1t .L802407BC -/* 88DDAC 802407AC 00000000 */ nop +/* 88DDAC 802407AC 00000000 */ nop /* 88DDB0 802407B0 0C0187BC */ jal sqrtf -/* 88DDB4 802407B4 00000000 */ nop +/* 88DDB4 802407B4 00000000 */ nop /* 88DDB8 802407B8 46000086 */ mov.s $f2, $f0 .L802407BC: /* 88DDBC 802407BC 44800000 */ mtc1 $zero, $f0 -/* 88DDC0 802407C0 00000000 */ nop +/* 88DDC0 802407C0 00000000 */ nop /* 88DDC4 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 88DDC8 802407C8 00000000 */ nop +/* 88DDC8 802407C8 00000000 */ nop /* 88DDCC 802407CC 45000016 */ bc1f .L80240828 /* 88DDD0 802407D0 46001106 */ mov.s $f4, $f2 /* 88DDD4 802407D4 860200A8 */ lh $v0, 0xa8($s0) /* 88DDD8 802407D8 44820000 */ mtc1 $v0, $f0 -/* 88DDDC 802407DC 00000000 */ nop +/* 88DDDC 802407DC 00000000 */ nop /* 88DDE0 802407E0 46800020 */ cvt.s.w $f0, $f0 /* 88DDE4 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 88DDE8 802407E8 00000000 */ nop +/* 88DDE8 802407E8 00000000 */ nop /* 88DDEC 802407EC 4500000F */ bc1f .L8024082C /* 88DDF0 802407F0 0000882D */ daddu $s1, $zero, $zero /* 88DDF4 802407F4 860200A6 */ lh $v0, 0xa6($s0) /* 88DDF8 802407F8 3C013F00 */ lui $at, 0x3f00 /* 88DDFC 802407FC 44811000 */ mtc1 $at, $f2 /* 88DE00 80240800 44820000 */ mtc1 $v0, $f0 -/* 88DE04 80240804 00000000 */ nop +/* 88DE04 80240804 00000000 */ nop /* 88DE08 80240808 46800020 */ cvt.s.w $f0, $f0 /* 88DE0C 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 88DE10 80240810 00000000 */ nop +/* 88DE10 80240810 00000000 */ nop /* 88DE14 80240814 4600203C */ c.lt.s $f4, $f0 -/* 88DE18 80240818 00000000 */ nop +/* 88DE18 80240818 00000000 */ nop /* 88DE1C 8024081C 45000003 */ bc1f .L8024082C /* 88DE20 80240820 24020001 */ addiu $v0, $zero, 1 /* 88DE24 80240824 AE62008C */ sw $v0, 0x8c($s3) @@ -165,16 +165,16 @@ glabel func_802405F0_88DBF0 /* 88DE58 80240858 C6400098 */ lwc1 $f0, 0x98($s2) /* 88DE5C 8024085C 46001081 */ sub.s $f2, $f2, $f0 /* 88DE60 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 88DE64 80240864 00000000 */ nop +/* 88DE64 80240864 00000000 */ nop /* 88DE68 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 88DE6C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) /* 88DE70 80240870 46001081 */ sub.s $f2, $f2, $f0 /* 88DE74 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 88DE78 80240878 00000000 */ nop +/* 88DE78 80240878 00000000 */ nop /* 88DE7C 8024087C 860200A8 */ lh $v0, 0xa8($s0) /* 88DE80 80240880 C602003C */ lwc1 $f2, 0x3c($s0) /* 88DE84 80240884 44820000 */ mtc1 $v0, $f0 -/* 88DE88 80240888 00000000 */ nop +/* 88DE88 80240888 00000000 */ nop /* 88DE8C 8024088C 46800020 */ cvt.s.w $f0, $f0 /* 88DE90 80240890 46001080 */ add.s $f2, $f2, $f0 /* 88DE94 80240894 461A1081 */ sub.s $f2, $f2, $f26 @@ -183,32 +183,32 @@ glabel func_802405F0_88DBF0 /* 88DEA0 802408A0 46001501 */ sub.s $f20, $f2, $f0 /* 88DEA4 802408A4 46006004 */ sqrt.s $f0, $f12 /* 88DEA8 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 88DEAC 802408AC 00000000 */ nop +/* 88DEAC 802408AC 00000000 */ nop /* 88DEB0 802408B0 45010003 */ bc1t .L802408C0 -/* 88DEB4 802408B4 00000000 */ nop +/* 88DEB4 802408B4 00000000 */ nop /* 88DEB8 802408B8 0C0187BC */ jal sqrtf -/* 88DEBC 802408BC 00000000 */ nop +/* 88DEBC 802408BC 00000000 */ nop .L802408C0: /* 88DEC0 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 88DEC4 802408C4 00000000 */ nop +/* 88DEC4 802408C4 00000000 */ nop /* 88DEC8 802408C8 45000015 */ bc1f .L80240920 /* 88DECC 802408CC 46000106 */ mov.s $f4, $f0 /* 88DED0 802408D0 860200A8 */ lh $v0, 0xa8($s0) /* 88DED4 802408D4 44820000 */ mtc1 $v0, $f0 -/* 88DED8 802408D8 00000000 */ nop +/* 88DED8 802408D8 00000000 */ nop /* 88DEDC 802408DC 46800020 */ cvt.s.w $f0, $f0 /* 88DEE0 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 88DEE4 802408E4 00000000 */ nop +/* 88DEE4 802408E4 00000000 */ nop /* 88DEE8 802408E8 4500000E */ bc1f .L80240924 /* 88DEEC 802408EC 26310001 */ addiu $s1, $s1, 1 /* 88DEF0 802408F0 860200A6 */ lh $v0, 0xa6($s0) /* 88DEF4 802408F4 44820000 */ mtc1 $v0, $f0 -/* 88DEF8 802408F8 00000000 */ nop +/* 88DEF8 802408F8 00000000 */ nop /* 88DEFC 802408FC 46800020 */ cvt.s.w $f0, $f0 /* 88DF00 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 88DF04 80240904 00000000 */ nop +/* 88DF04 80240904 00000000 */ nop /* 88DF08 80240908 4600203C */ c.lt.s $f4, $f0 -/* 88DF0C 8024090C 00000000 */ nop +/* 88DF0C 8024090C 00000000 */ nop /* 88DF10 80240910 45000004 */ bc1f .L80240924 /* 88DF14 80240914 24020001 */ addiu $v0, $zero, 1 /* 88DF18 80240918 0809024C */ j .L80240930 @@ -218,7 +218,7 @@ glabel func_802405F0_88DBF0 .L80240924: /* 88DF24 80240924 2A220040 */ slti $v0, $s1, 0x40 /* 88DF28 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 88DF2C 8024092C 00000000 */ nop +/* 88DF2C 8024092C 00000000 */ nop .L80240930: /* 88DF30 80240930 8FBF0020 */ lw $ra, 0x20($sp) /* 88DF34 80240934 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_80240034_88FBD4.s b/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_80240034_88FBD4.s index 41e0de490c..a6a14d1c4c 100644 --- a/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_80240034_88FBD4.s +++ b/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_80240034_88FBD4.s @@ -22,16 +22,16 @@ glabel func_80240034_88FBD4 /* 88FC14 80240074 00021023 */ negu $v0, $v0 .L80240078: /* 88FC18 80240078 14400003 */ bnez $v0, .L80240088 -/* 88FC1C 8024007C 00000000 */ nop +/* 88FC1C 8024007C 00000000 */ nop /* 88FC20 80240080 50E00017 */ beql $a3, $zero, .L802400E0 /* 88FC24 80240084 0000102D */ daddu $v0, $zero, $zero .L80240088: /* 88FC28 80240088 44822000 */ mtc1 $v0, $f4 -/* 88FC2C 8024008C 00000000 */ nop +/* 88FC2C 8024008C 00000000 */ nop /* 88FC30 80240090 46802120 */ cvt.s.w $f4, $f4 /* 88FC34 80240094 44062000 */ mfc1 $a2, $f4 /* 88FC38 80240098 44872000 */ mtc1 $a3, $f4 -/* 88FC3C 8024009C 00000000 */ nop +/* 88FC3C 8024009C 00000000 */ nop /* 88FC40 802400A0 46802120 */ cvt.s.w $f4, $f4 /* 88FC44 802400A4 44806000 */ mtc1 $zero, $f12 /* 88FC48 802400A8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240034_88FBD4 /* 88FC50 802400B0 46006386 */ mov.s $f14, $f12 /* 88FC54 802400B4 3C014270 */ lui $at, 0x4270 /* 88FC58 802400B8 44811000 */ mtc1 $at, $f2 -/* 88FC5C 802400BC 00000000 */ nop +/* 88FC5C 802400BC 00000000 */ nop /* 88FC60 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 88FC64 802400C4 00000000 */ nop +/* 88FC64 802400C4 00000000 */ nop /* 88FC68 802400C8 45000004 */ bc1f .L802400DC /* 88FC6C 802400CC 24020001 */ addiu $v0, $zero, 1 /* 88FC70 802400D0 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_tik/tik_15/890190/func_802405F0_890190.s b/asm/nonmatchings/world/area_tik/tik_15/890190/func_802405F0_890190.s index 15e71c11ee..32e7d0cef7 100644 --- a/asm/nonmatchings/world/area_tik/tik_15/890190/func_802405F0_890190.s +++ b/asm/nonmatchings/world/area_tik/tik_15/890190/func_802405F0_890190.s @@ -32,58 +32,58 @@ glabel func_802405F0_890190 /* 8901FC 8024065C C6400098 */ lwc1 $f0, 0x98($s2) /* 890200 80240660 46001081 */ sub.s $f2, $f2, $f0 /* 890204 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 890208 80240668 00000000 */ nop +/* 890208 80240668 00000000 */ nop /* 89020C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) /* 890210 80240670 C4620030 */ lwc1 $f2, 0x30($v1) /* 890214 80240674 46001081 */ sub.s $f2, $f2, $f0 /* 890218 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 89021C 8024067C 00000000 */ nop +/* 89021C 8024067C 00000000 */ nop /* 890220 80240680 846200B0 */ lh $v0, 0xb0($v1) /* 890224 80240684 C462002C */ lwc1 $f2, 0x2c($v1) /* 890228 80240688 44820000 */ mtc1 $v0, $f0 -/* 89022C 8024068C 00000000 */ nop +/* 89022C 8024068C 00000000 */ nop /* 890230 80240690 46800020 */ cvt.s.w $f0, $f0 /* 890234 80240694 46001080 */ add.s $f2, $f2, $f0 /* 890238 80240698 3C013FC0 */ lui $at, 0x3fc0 /* 89023C 8024069C 44810000 */ mtc1 $at, $f0 -/* 890240 802406A0 00000000 */ nop +/* 890240 802406A0 00000000 */ nop /* 890244 802406A4 46001081 */ sub.s $f2, $f2, $f0 /* 890248 802406A8 46043300 */ add.s $f12, $f6, $f4 /* 89024C 802406AC C640009C */ lwc1 $f0, 0x9c($s2) /* 890250 802406B0 46001501 */ sub.s $f20, $f2, $f0 /* 890254 802406B4 46006084 */ sqrt.s $f2, $f12 /* 890258 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 89025C 802406BC 00000000 */ nop +/* 89025C 802406BC 00000000 */ nop /* 890260 802406C0 45010004 */ bc1t .L802406D4 /* 890264 802406C4 0060882D */ daddu $s1, $v1, $zero /* 890268 802406C8 0C0187BC */ jal sqrtf -/* 89026C 802406CC 00000000 */ nop +/* 89026C 802406CC 00000000 */ nop /* 890270 802406D0 46000086 */ mov.s $f2, $f0 .L802406D4: /* 890274 802406D4 44800000 */ mtc1 $zero, $f0 -/* 890278 802406D8 00000000 */ nop +/* 890278 802406D8 00000000 */ nop /* 89027C 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 890280 802406E0 00000000 */ nop +/* 890280 802406E0 00000000 */ nop /* 890284 802406E4 45000016 */ bc1f .L80240740 /* 890288 802406E8 46001106 */ mov.s $f4, $f2 /* 89028C 802406EC 862200B0 */ lh $v0, 0xb0($s1) /* 890290 802406F0 44820000 */ mtc1 $v0, $f0 -/* 890294 802406F4 00000000 */ nop +/* 890294 802406F4 00000000 */ nop /* 890298 802406F8 46800020 */ cvt.s.w $f0, $f0 /* 89029C 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 8902A0 80240700 00000000 */ nop +/* 8902A0 80240700 00000000 */ nop /* 8902A4 80240704 4500000E */ bc1f .L80240740 -/* 8902A8 80240708 00000000 */ nop +/* 8902A8 80240708 00000000 */ nop /* 8902AC 8024070C 862200B2 */ lh $v0, 0xb2($s1) /* 8902B0 80240710 3C013F00 */ lui $at, 0x3f00 /* 8902B4 80240714 44811000 */ mtc1 $at, $f2 /* 8902B8 80240718 44820000 */ mtc1 $v0, $f0 -/* 8902BC 8024071C 00000000 */ nop +/* 8902BC 8024071C 00000000 */ nop /* 8902C0 80240720 46800020 */ cvt.s.w $f0, $f0 /* 8902C4 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 8902C8 80240728 00000000 */ nop +/* 8902C8 80240728 00000000 */ nop /* 8902CC 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 8902D0 80240730 00000000 */ nop +/* 8902D0 80240730 00000000 */ nop /* 8902D4 80240734 45000002 */ bc1f .L80240740 /* 8902D8 80240738 24020001 */ addiu $v0, $zero, 1 /* 8902DC 8024073C AE62008C */ sw $v0, 0x8c($s3) @@ -92,58 +92,58 @@ glabel func_802405F0_890190 /* 8902E4 80240744 C6400098 */ lwc1 $f0, 0x98($s2) /* 8902E8 80240748 46001081 */ sub.s $f2, $f2, $f0 /* 8902EC 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 8902F0 80240750 00000000 */ nop +/* 8902F0 80240750 00000000 */ nop /* 8902F4 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 8902F8 80240758 C6020040 */ lwc1 $f2, 0x40($s0) /* 8902FC 8024075C 46001081 */ sub.s $f2, $f2, $f0 /* 890300 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 890304 80240764 00000000 */ nop +/* 890304 80240764 00000000 */ nop /* 890308 80240768 860200A8 */ lh $v0, 0xa8($s0) /* 89030C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) /* 890310 80240770 44820000 */ mtc1 $v0, $f0 -/* 890314 80240774 00000000 */ nop +/* 890314 80240774 00000000 */ nop /* 890318 80240778 46800020 */ cvt.s.w $f0, $f0 /* 89031C 8024077C 46001080 */ add.s $f2, $f2, $f0 /* 890320 80240780 3C013FC0 */ lui $at, 0x3fc0 /* 890324 80240784 44810000 */ mtc1 $at, $f0 -/* 890328 80240788 00000000 */ nop +/* 890328 80240788 00000000 */ nop /* 89032C 8024078C 46001081 */ sub.s $f2, $f2, $f0 /* 890330 80240790 46043300 */ add.s $f12, $f6, $f4 /* 890334 80240794 C640009C */ lwc1 $f0, 0x9c($s2) /* 890338 80240798 46001501 */ sub.s $f20, $f2, $f0 /* 89033C 8024079C 46006084 */ sqrt.s $f2, $f12 /* 890340 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 890344 802407A4 00000000 */ nop +/* 890344 802407A4 00000000 */ nop /* 890348 802407A8 45010004 */ bc1t .L802407BC -/* 89034C 802407AC 00000000 */ nop +/* 89034C 802407AC 00000000 */ nop /* 890350 802407B0 0C0187BC */ jal sqrtf -/* 890354 802407B4 00000000 */ nop +/* 890354 802407B4 00000000 */ nop /* 890358 802407B8 46000086 */ mov.s $f2, $f0 .L802407BC: /* 89035C 802407BC 44800000 */ mtc1 $zero, $f0 -/* 890360 802407C0 00000000 */ nop +/* 890360 802407C0 00000000 */ nop /* 890364 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 890368 802407C8 00000000 */ nop +/* 890368 802407C8 00000000 */ nop /* 89036C 802407CC 45000016 */ bc1f .L80240828 /* 890370 802407D0 46001106 */ mov.s $f4, $f2 /* 890374 802407D4 860200A8 */ lh $v0, 0xa8($s0) /* 890378 802407D8 44820000 */ mtc1 $v0, $f0 -/* 89037C 802407DC 00000000 */ nop +/* 89037C 802407DC 00000000 */ nop /* 890380 802407E0 46800020 */ cvt.s.w $f0, $f0 /* 890384 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 890388 802407E8 00000000 */ nop +/* 890388 802407E8 00000000 */ nop /* 89038C 802407EC 4500000F */ bc1f .L8024082C /* 890390 802407F0 0000882D */ daddu $s1, $zero, $zero /* 890394 802407F4 860200A6 */ lh $v0, 0xa6($s0) /* 890398 802407F8 3C013F00 */ lui $at, 0x3f00 /* 89039C 802407FC 44811000 */ mtc1 $at, $f2 /* 8903A0 80240800 44820000 */ mtc1 $v0, $f0 -/* 8903A4 80240804 00000000 */ nop +/* 8903A4 80240804 00000000 */ nop /* 8903A8 80240808 46800020 */ cvt.s.w $f0, $f0 /* 8903AC 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 8903B0 80240810 00000000 */ nop +/* 8903B0 80240810 00000000 */ nop /* 8903B4 80240814 4600203C */ c.lt.s $f4, $f0 -/* 8903B8 80240818 00000000 */ nop +/* 8903B8 80240818 00000000 */ nop /* 8903BC 8024081C 45000003 */ bc1f .L8024082C /* 8903C0 80240820 24020001 */ addiu $v0, $zero, 1 /* 8903C4 80240824 AE62008C */ sw $v0, 0x8c($s3) @@ -165,16 +165,16 @@ glabel func_802405F0_890190 /* 8903F8 80240858 C6400098 */ lwc1 $f0, 0x98($s2) /* 8903FC 8024085C 46001081 */ sub.s $f2, $f2, $f0 /* 890400 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 890404 80240864 00000000 */ nop +/* 890404 80240864 00000000 */ nop /* 890408 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 89040C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) /* 890410 80240870 46001081 */ sub.s $f2, $f2, $f0 /* 890414 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 890418 80240878 00000000 */ nop +/* 890418 80240878 00000000 */ nop /* 89041C 8024087C 860200A8 */ lh $v0, 0xa8($s0) /* 890420 80240880 C602003C */ lwc1 $f2, 0x3c($s0) /* 890424 80240884 44820000 */ mtc1 $v0, $f0 -/* 890428 80240888 00000000 */ nop +/* 890428 80240888 00000000 */ nop /* 89042C 8024088C 46800020 */ cvt.s.w $f0, $f0 /* 890430 80240890 46001080 */ add.s $f2, $f2, $f0 /* 890434 80240894 461A1081 */ sub.s $f2, $f2, $f26 @@ -183,32 +183,32 @@ glabel func_802405F0_890190 /* 890440 802408A0 46001501 */ sub.s $f20, $f2, $f0 /* 890444 802408A4 46006004 */ sqrt.s $f0, $f12 /* 890448 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 89044C 802408AC 00000000 */ nop +/* 89044C 802408AC 00000000 */ nop /* 890450 802408B0 45010003 */ bc1t .L802408C0 -/* 890454 802408B4 00000000 */ nop +/* 890454 802408B4 00000000 */ nop /* 890458 802408B8 0C0187BC */ jal sqrtf -/* 89045C 802408BC 00000000 */ nop +/* 89045C 802408BC 00000000 */ nop .L802408C0: /* 890460 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 890464 802408C4 00000000 */ nop +/* 890464 802408C4 00000000 */ nop /* 890468 802408C8 45000015 */ bc1f .L80240920 /* 89046C 802408CC 46000106 */ mov.s $f4, $f0 /* 890470 802408D0 860200A8 */ lh $v0, 0xa8($s0) /* 890474 802408D4 44820000 */ mtc1 $v0, $f0 -/* 890478 802408D8 00000000 */ nop +/* 890478 802408D8 00000000 */ nop /* 89047C 802408DC 46800020 */ cvt.s.w $f0, $f0 /* 890480 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 890484 802408E4 00000000 */ nop +/* 890484 802408E4 00000000 */ nop /* 890488 802408E8 4500000E */ bc1f .L80240924 /* 89048C 802408EC 26310001 */ addiu $s1, $s1, 1 /* 890490 802408F0 860200A6 */ lh $v0, 0xa6($s0) /* 890494 802408F4 44820000 */ mtc1 $v0, $f0 -/* 890498 802408F8 00000000 */ nop +/* 890498 802408F8 00000000 */ nop /* 89049C 802408FC 46800020 */ cvt.s.w $f0, $f0 /* 8904A0 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 8904A4 80240904 00000000 */ nop +/* 8904A4 80240904 00000000 */ nop /* 8904A8 80240908 4600203C */ c.lt.s $f4, $f0 -/* 8904AC 8024090C 00000000 */ nop +/* 8904AC 8024090C 00000000 */ nop /* 8904B0 80240910 45000004 */ bc1f .L80240924 /* 8904B4 80240914 24020001 */ addiu $v0, $zero, 1 /* 8904B8 80240918 0809024C */ j .L80240930 @@ -218,7 +218,7 @@ glabel func_802405F0_890190 .L80240924: /* 8904C4 80240924 2A220040 */ slti $v0, $s1, 0x40 /* 8904C8 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 8904CC 8024092C 00000000 */ nop +/* 8904CC 8024092C 00000000 */ nop .L80240930: /* 8904D0 80240930 8FBF0020 */ lw $ra, 0x20($sp) /* 8904D4 80240934 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240960_890500.s b/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240960_890500.s index 6d981e2596..ed20990427 100644 --- a/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240960_890500.s +++ b/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240960_890500.s @@ -26,7 +26,7 @@ glabel func_80240960_890500 /* 890550 802409B0 1440FFFA */ bnez $v0, .L8024099C /* 890554 802409B4 24A50004 */ addiu $a1, $a1, 4 /* 890558 802409B8 0809027F */ j .L802409FC -/* 89055C 802409BC 00000000 */ nop +/* 89055C 802409BC 00000000 */ nop .L802409C0: /* 890560 802409C0 0000182D */ daddu $v1, $zero, $zero /* 890564 802409C4 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s b/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s index 71b84ffbed..f53382cf1c 100644 --- a/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s +++ b/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s @@ -15,6 +15,6 @@ glabel func_80240AD0_890670 /* 890698 80240AF8 24020002 */ addiu $v0, $zero, 2 /* 89069C 80240AFC 03E00008 */ jr $ra /* 8906A0 80240B00 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8906A4 80240B04 00000000 */ nop -/* 8906A8 80240B08 00000000 */ nop -/* 8906AC 80240B0C 00000000 */ nop +/* 8906A4 80240B04 00000000 */ nop +/* 8906A8 80240B08 00000000 */ nop +/* 8906AC 80240B0C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A20/func_80240000_892A20.s b/asm/nonmatchings/world/area_tik/tik_17/892A20/func_80240000_892A20.s index 0b5f20e2e7..a36f7c5558 100644 --- a/asm/nonmatchings/world/area_tik/tik_17/892A20/func_80240000_892A20.s +++ b/asm/nonmatchings/world/area_tik/tik_17/892A20/func_80240000_892A20.s @@ -11,6 +11,6 @@ glabel func_80240000_892A20 /* 892A38 80240018 24020002 */ addiu $v0, $zero, 2 /* 892A3C 8024001C 03E00008 */ jr $ra /* 892A40 80240020 27BD0018 */ addiu $sp, $sp, 0x18 -/* 892A44 80240024 00000000 */ nop -/* 892A48 80240028 00000000 */ nop -/* 892A4C 8024002C 00000000 */ nop +/* 892A44 80240024 00000000 */ nop +/* 892A48 80240028 00000000 */ nop +/* 892A4C 8024002C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240104_892B24.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240104_892B24.s index a959b8427d..93e500a28b 100644 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240104_892B24.s +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240104_892B24.s @@ -8,7 +8,7 @@ glabel func_80240104_892B24 /* 892B30 80240110 00822021 */ addu $a0, $a0, $v0 /* 892B34 80240114 90820014 */ lbu $v0, 0x14($a0) /* 892B38 80240118 10400009 */ beqz $v0, .L80240140 -/* 892B3C 8024011C 00000000 */ nop +/* 892B3C 8024011C 00000000 */ nop /* 892B40 80240120 90820015 */ lbu $v0, 0x15($a0) /* 892B44 80240124 00022600 */ sll $a0, $v0, 0x18 /* 892B48 80240128 00041E03 */ sra $v1, $a0, 0x18 @@ -16,7 +16,7 @@ glabel func_80240104_892B24 /* 892B50 80240130 00021403 */ sra $v0, $v0, 0x10 /* 892B54 80240134 0043102A */ slt $v0, $v0, $v1 /* 892B58 80240138 10400003 */ beqz $v0, .L80240148 -/* 892B5C 8024013C 00000000 */ nop +/* 892B5C 8024013C 00000000 */ nop .L80240140: /* 892B60 80240140 03E00008 */ jr $ra /* 892B64 80240144 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s index 8798444061..c28486265b 100644 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s @@ -108,20 +108,20 @@ glabel func_802401FC_892C1C /* 892DA4 80240384 10400009 */ beqz $v0, .L802403AC /* 892DA8 80240388 AEA20074 */ sw $v0, 0x74($s5) /* 892DAC 8024038C 0C03C4EC */ jal func_800F13B0 -/* 892DB0 80240390 00000000 */ nop +/* 892DB0 80240390 00000000 */ nop /* 892DB4 80240394 8EA20070 */ lw $v0, 0x70($s5) /* 892DB8 80240398 24420001 */ addiu $v0, $v0, 1 .L8024039C: /* 892DBC 8024039C AEA20070 */ sw $v0, 0x70($s5) /* 892DC0 802403A0 2842000F */ slti $v0, $v0, 0xf /* 892DC4 802403A4 10400003 */ beqz $v0, .L802403B4 -/* 892DC8 802403A8 00000000 */ nop +/* 892DC8 802403A8 00000000 */ nop .L802403AC: /* 892DCC 802403AC 08090107 */ j .L8024041C /* 892DD0 802403B0 0000102D */ daddu $v0, $zero, $zero .L802403B4: /* 892DD4 802403B4 0C03C54E */ jal func_800F1538 -/* 892DD8 802403B8 00000000 */ nop +/* 892DD8 802403B8 00000000 */ nop /* 892DDC 802403BC 8EA30074 */ lw $v1, 0x74($s5) /* 892DE0 802403C0 240200FF */ addiu $v0, $zero, 0xff /* 892DE4 802403C4 10620010 */ beq $v1, $v0, .L80240408 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240630_893050.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240630_893050.s index ce0915f2f4..a59b242fa1 100644 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240630_893050.s +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240630_893050.s @@ -36,7 +36,7 @@ glabel func_80240630_893050 /* 8930CC 802406AC 0C00A88D */ jal sin_cos_deg /* 8930D0 802406B0 0040A82D */ daddu $s5, $v0, $zero /* 8930D4 802406B4 1200005D */ beqz $s0, .L8024082C -/* 8930D8 802406B8 00000000 */ nop +/* 8930D8 802406B8 00000000 */ nop /* 8930DC 802406BC 0C00AB0A */ jal general_heap_malloc /* 8930E0 802406C0 24040068 */ addiu $a0, $zero, 0x68 /* 8930E4 802406C4 0040902D */ daddu $s2, $v0, $zero @@ -98,10 +98,10 @@ glabel func_80240630_893050 /* 8931BC 8024079C C7A2001C */ lwc1 $f2, 0x1c($sp) /* 8931C0 802407A0 C7A40020 */ lwc1 $f4, 0x20($sp) /* 8931C4 802407A4 46041082 */ mul.s $f2, $f2, $f4 -/* 8931C8 802407A8 00000000 */ nop +/* 8931C8 802407A8 00000000 */ nop /* 8931CC 802407AC C7A00018 */ lwc1 $f0, 0x18($sp) /* 8931D0 802407B0 46040002 */ mul.s $f0, $f0, $f4 -/* 8931D4 802407B4 00000000 */ nop +/* 8931D4 802407B4 00000000 */ nop /* 8931D8 802407B8 E6020038 */ swc1 $f2, 0x38($s0) /* 8931DC 802407BC E6000050 */ swc1 $f0, 0x50($s0) /* 8931E0 802407C0 8E42005C */ lw $v0, 0x5c($s2) @@ -142,12 +142,12 @@ glabel func_80240630_893050 /* 893268 80240848 10600007 */ beqz $v1, .L80240868 /* 89326C 8024084C 24040005 */ addiu $a0, $zero, 5 /* 893270 80240850 08090280 */ j .L80240A00 -/* 893274 80240854 00000000 */ nop +/* 893274 80240854 00000000 */ nop .L80240858: /* 893278 80240858 10620058 */ beq $v1, $v0, .L802409BC -/* 89327C 8024085C 00000000 */ nop +/* 89327C 8024085C 00000000 */ nop /* 893280 80240860 08090280 */ j .L80240A00 -/* 893284 80240864 00000000 */ nop +/* 893284 80240864 00000000 */ nop .L80240868: /* 893288 80240868 0000882D */ daddu $s1, $zero, $zero /* 89328C 8024086C 3C148024 */ lui $s4, %hi(D_80241478) @@ -174,11 +174,11 @@ glabel func_80240630_893050 /* 8932DC 802408BC C7A4001C */ lwc1 $f4, 0x1c($sp) /* 8932E0 802408C0 C7A00020 */ lwc1 $f0, 0x20($sp) /* 8932E4 802408C4 46002102 */ mul.s $f4, $f4, $f0 -/* 8932E8 802408C8 00000000 */ nop +/* 8932E8 802408C8 00000000 */ nop /* 8932EC 802408CC C7A20018 */ lwc1 $f2, 0x18($sp) /* 8932F0 802408D0 26940004 */ addiu $s4, $s4, 4 /* 8932F4 802408D4 46001082 */ mul.s $f2, $f2, $f0 -/* 8932F8 802408D8 00000000 */ nop +/* 8932F8 802408D8 00000000 */ nop /* 8932FC 802408DC 26730004 */ addiu $s3, $s3, 4 /* 893300 802408E0 26310001 */ addiu $s1, $s1, 1 /* 893304 802408E4 2A220003 */ slti $v0, $s1, 3 @@ -215,11 +215,11 @@ glabel func_80240630_893050 /* 893378 80240958 C7A4001C */ lwc1 $f4, 0x1c($sp) /* 89337C 8024095C C7A00020 */ lwc1 $f0, 0x20($sp) /* 893380 80240960 46002102 */ mul.s $f4, $f4, $f0 -/* 893384 80240964 00000000 */ nop +/* 893384 80240964 00000000 */ nop /* 893388 80240968 C7A20018 */ lwc1 $f2, 0x18($sp) /* 89338C 8024096C 26940004 */ addiu $s4, $s4, 4 /* 893390 80240970 46001082 */ mul.s $f2, $f2, $f0 -/* 893394 80240974 00000000 */ nop +/* 893394 80240974 00000000 */ nop /* 893398 80240978 26730004 */ addiu $s3, $s3, 4 /* 89339C 8024097C 26310001 */ addiu $s1, $s1, 1 /* 8933A0 80240980 2A220003 */ slti $v0, $s1, 3 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240B68_893588.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240B68_893588.s index 5ca072b19f..5d5317341b 100644 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240B68_893588.s +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240B68_893588.s @@ -36,16 +36,16 @@ glabel func_80240B68_893588 /* 893600 80240BE0 10600007 */ beqz $v1, .L80240C00 /* 893604 80240BE4 240500FF */ addiu $a1, $zero, 0xff /* 893608 80240BE8 0809031E */ j .L80240C78 -/* 89360C 80240BEC 00000000 */ nop +/* 89360C 80240BEC 00000000 */ nop .L80240BF0: /* 893610 80240BF0 10620019 */ beq $v1, $v0, .L80240C58 -/* 893614 80240BF4 00000000 */ nop +/* 893614 80240BF4 00000000 */ nop /* 893618 80240BF8 0809031E */ j .L80240C78 -/* 89361C 80240BFC 00000000 */ nop +/* 89361C 80240BFC 00000000 */ nop .L80240C00: /* 893620 80240C00 8E220074 */ lw $v0, 0x74($s1) /* 893624 80240C04 14450004 */ bne $v0, $a1, .L80240C18 -/* 893628 80240C08 00000000 */ nop +/* 893628 80240C08 00000000 */ nop /* 89362C 80240C0C AE240070 */ sw $a0, 0x70($s1) /* 893630 80240C10 AE200078 */ sw $zero, 0x78($s1) /* 893634 80240C14 8E220074 */ lw $v0, 0x74($s1) @@ -57,7 +57,7 @@ glabel func_80240B68_893588 /* 893648 80240C28 50400013 */ beql $v0, $zero, .L80240C78 /* 89364C 80240C2C AE250074 */ sw $a1, 0x74($s1) /* 893650 80240C30 0809031E */ j .L80240C78 -/* 893654 80240C34 00000000 */ nop +/* 893654 80240C34 00000000 */ nop .L80240C38: /* 893658 80240C38 8E220078 */ lw $v0, 0x78($s1) /* 89365C 80240C3C 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240D38_893758.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240D38_893758.s index 28e50e60e3..80628c822e 100644 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240D38_893758.s +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240D38_893758.s @@ -15,5 +15,5 @@ glabel func_80240D38_893758 .L80240D60: /* 893780 80240D60 03E00008 */ jr $ra /* 893784 80240D64 24020002 */ addiu $v0, $zero, 2 -/* 893788 80240D68 00000000 */ nop -/* 89378C 80240D6C 00000000 */ nop +/* 893788 80240D68 00000000 */ nop +/* 89378C 80240D6C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240DA4_8937C4.s b/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240DA4_8937C4.s index 45e8465865..21265db8e5 100644 --- a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240DA4_8937C4.s +++ b/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240DA4_8937C4.s @@ -22,16 +22,16 @@ glabel func_80240DA4_8937C4 /* 893804 80240DE4 00021023 */ negu $v0, $v0 .L80240DE8: /* 893808 80240DE8 14400003 */ bnez $v0, .L80240DF8 -/* 89380C 80240DEC 00000000 */ nop +/* 89380C 80240DEC 00000000 */ nop /* 893810 80240DF0 50E00017 */ beql $a3, $zero, .L80240E50 /* 893814 80240DF4 0000102D */ daddu $v0, $zero, $zero .L80240DF8: /* 893818 80240DF8 44822000 */ mtc1 $v0, $f4 -/* 89381C 80240DFC 00000000 */ nop +/* 89381C 80240DFC 00000000 */ nop /* 893820 80240E00 46802120 */ cvt.s.w $f4, $f4 /* 893824 80240E04 44062000 */ mfc1 $a2, $f4 /* 893828 80240E08 44872000 */ mtc1 $a3, $f4 -/* 89382C 80240E0C 00000000 */ nop +/* 89382C 80240E0C 00000000 */ nop /* 893830 80240E10 46802120 */ cvt.s.w $f4, $f4 /* 893834 80240E14 44806000 */ mtc1 $zero, $f12 /* 893838 80240E18 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240DA4_8937C4 /* 893840 80240E20 46006386 */ mov.s $f14, $f12 /* 893844 80240E24 3C014270 */ lui $at, 0x4270 /* 893848 80240E28 44811000 */ mtc1 $at, $f2 -/* 89384C 80240E2C 00000000 */ nop +/* 89384C 80240E2C 00000000 */ nop /* 893850 80240E30 4602003C */ c.lt.s $f0, $f2 -/* 893854 80240E34 00000000 */ nop +/* 893854 80240E34 00000000 */ nop /* 893858 80240E38 45000004 */ bc1f .L80240E4C /* 89385C 80240E3C 24020001 */ addiu $v0, $zero, 1 /* 893860 80240E40 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_tik/tik_18/8959F0/func_80240310_8959F0.s b/asm/nonmatchings/world/area_tik/tik_18/8959F0/func_80240310_8959F0.s index baff492cc7..3d6796b5c7 100644 --- a/asm/nonmatchings/world/area_tik/tik_18/8959F0/func_80240310_8959F0.s +++ b/asm/nonmatchings/world/area_tik/tik_18/8959F0/func_80240310_8959F0.s @@ -32,58 +32,58 @@ glabel func_80240310_8959F0 /* 895A5C 8024037C C6400098 */ lwc1 $f0, 0x98($s2) /* 895A60 80240380 46001081 */ sub.s $f2, $f2, $f0 /* 895A64 80240384 46021182 */ mul.s $f6, $f2, $f2 -/* 895A68 80240388 00000000 */ nop +/* 895A68 80240388 00000000 */ nop /* 895A6C 8024038C C64000A0 */ lwc1 $f0, 0xa0($s2) /* 895A70 80240390 C4620030 */ lwc1 $f2, 0x30($v1) /* 895A74 80240394 46001081 */ sub.s $f2, $f2, $f0 /* 895A78 80240398 46021102 */ mul.s $f4, $f2, $f2 -/* 895A7C 8024039C 00000000 */ nop +/* 895A7C 8024039C 00000000 */ nop /* 895A80 802403A0 846200B0 */ lh $v0, 0xb0($v1) /* 895A84 802403A4 C462002C */ lwc1 $f2, 0x2c($v1) /* 895A88 802403A8 44820000 */ mtc1 $v0, $f0 -/* 895A8C 802403AC 00000000 */ nop +/* 895A8C 802403AC 00000000 */ nop /* 895A90 802403B0 46800020 */ cvt.s.w $f0, $f0 /* 895A94 802403B4 46001080 */ add.s $f2, $f2, $f0 /* 895A98 802403B8 3C013FC0 */ lui $at, 0x3fc0 /* 895A9C 802403BC 44810000 */ mtc1 $at, $f0 -/* 895AA0 802403C0 00000000 */ nop +/* 895AA0 802403C0 00000000 */ nop /* 895AA4 802403C4 46001081 */ sub.s $f2, $f2, $f0 /* 895AA8 802403C8 46043300 */ add.s $f12, $f6, $f4 /* 895AAC 802403CC C640009C */ lwc1 $f0, 0x9c($s2) /* 895AB0 802403D0 46001501 */ sub.s $f20, $f2, $f0 /* 895AB4 802403D4 46006084 */ sqrt.s $f2, $f12 /* 895AB8 802403D8 46021032 */ c.eq.s $f2, $f2 -/* 895ABC 802403DC 00000000 */ nop +/* 895ABC 802403DC 00000000 */ nop /* 895AC0 802403E0 45010004 */ bc1t .L802403F4 /* 895AC4 802403E4 0060882D */ daddu $s1, $v1, $zero /* 895AC8 802403E8 0C0187BC */ jal sqrtf -/* 895ACC 802403EC 00000000 */ nop +/* 895ACC 802403EC 00000000 */ nop /* 895AD0 802403F0 46000086 */ mov.s $f2, $f0 .L802403F4: /* 895AD4 802403F4 44800000 */ mtc1 $zero, $f0 -/* 895AD8 802403F8 00000000 */ nop +/* 895AD8 802403F8 00000000 */ nop /* 895ADC 802403FC 4614003C */ c.lt.s $f0, $f20 -/* 895AE0 80240400 00000000 */ nop +/* 895AE0 80240400 00000000 */ nop /* 895AE4 80240404 45000016 */ bc1f .L80240460 /* 895AE8 80240408 46001106 */ mov.s $f4, $f2 /* 895AEC 8024040C 862200B0 */ lh $v0, 0xb0($s1) /* 895AF0 80240410 44820000 */ mtc1 $v0, $f0 -/* 895AF4 80240414 00000000 */ nop +/* 895AF4 80240414 00000000 */ nop /* 895AF8 80240418 46800020 */ cvt.s.w $f0, $f0 /* 895AFC 8024041C 4600A03C */ c.lt.s $f20, $f0 -/* 895B00 80240420 00000000 */ nop +/* 895B00 80240420 00000000 */ nop /* 895B04 80240424 4500000E */ bc1f .L80240460 -/* 895B08 80240428 00000000 */ nop +/* 895B08 80240428 00000000 */ nop /* 895B0C 8024042C 862200B2 */ lh $v0, 0xb2($s1) /* 895B10 80240430 3C013F00 */ lui $at, 0x3f00 /* 895B14 80240434 44811000 */ mtc1 $at, $f2 /* 895B18 80240438 44820000 */ mtc1 $v0, $f0 -/* 895B1C 8024043C 00000000 */ nop +/* 895B1C 8024043C 00000000 */ nop /* 895B20 80240440 46800020 */ cvt.s.w $f0, $f0 /* 895B24 80240444 46020002 */ mul.s $f0, $f0, $f2 -/* 895B28 80240448 00000000 */ nop +/* 895B28 80240448 00000000 */ nop /* 895B2C 8024044C 4600203C */ c.lt.s $f4, $f0 -/* 895B30 80240450 00000000 */ nop +/* 895B30 80240450 00000000 */ nop /* 895B34 80240454 45000002 */ bc1f .L80240460 /* 895B38 80240458 24020001 */ addiu $v0, $zero, 1 /* 895B3C 8024045C AE62008C */ sw $v0, 0x8c($s3) @@ -92,58 +92,58 @@ glabel func_80240310_8959F0 /* 895B44 80240464 C6400098 */ lwc1 $f0, 0x98($s2) /* 895B48 80240468 46001081 */ sub.s $f2, $f2, $f0 /* 895B4C 8024046C 46021182 */ mul.s $f6, $f2, $f2 -/* 895B50 80240470 00000000 */ nop +/* 895B50 80240470 00000000 */ nop /* 895B54 80240474 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 895B58 80240478 C6020040 */ lwc1 $f2, 0x40($s0) /* 895B5C 8024047C 46001081 */ sub.s $f2, $f2, $f0 /* 895B60 80240480 46021102 */ mul.s $f4, $f2, $f2 -/* 895B64 80240484 00000000 */ nop +/* 895B64 80240484 00000000 */ nop /* 895B68 80240488 860200A8 */ lh $v0, 0xa8($s0) /* 895B6C 8024048C C602003C */ lwc1 $f2, 0x3c($s0) /* 895B70 80240490 44820000 */ mtc1 $v0, $f0 -/* 895B74 80240494 00000000 */ nop +/* 895B74 80240494 00000000 */ nop /* 895B78 80240498 46800020 */ cvt.s.w $f0, $f0 /* 895B7C 8024049C 46001080 */ add.s $f2, $f2, $f0 /* 895B80 802404A0 3C013FC0 */ lui $at, 0x3fc0 /* 895B84 802404A4 44810000 */ mtc1 $at, $f0 -/* 895B88 802404A8 00000000 */ nop +/* 895B88 802404A8 00000000 */ nop /* 895B8C 802404AC 46001081 */ sub.s $f2, $f2, $f0 /* 895B90 802404B0 46043300 */ add.s $f12, $f6, $f4 /* 895B94 802404B4 C640009C */ lwc1 $f0, 0x9c($s2) /* 895B98 802404B8 46001501 */ sub.s $f20, $f2, $f0 /* 895B9C 802404BC 46006084 */ sqrt.s $f2, $f12 /* 895BA0 802404C0 46021032 */ c.eq.s $f2, $f2 -/* 895BA4 802404C4 00000000 */ nop +/* 895BA4 802404C4 00000000 */ nop /* 895BA8 802404C8 45010004 */ bc1t .L802404DC -/* 895BAC 802404CC 00000000 */ nop +/* 895BAC 802404CC 00000000 */ nop /* 895BB0 802404D0 0C0187BC */ jal sqrtf -/* 895BB4 802404D4 00000000 */ nop +/* 895BB4 802404D4 00000000 */ nop /* 895BB8 802404D8 46000086 */ mov.s $f2, $f0 .L802404DC: /* 895BBC 802404DC 44800000 */ mtc1 $zero, $f0 -/* 895BC0 802404E0 00000000 */ nop +/* 895BC0 802404E0 00000000 */ nop /* 895BC4 802404E4 4614003C */ c.lt.s $f0, $f20 -/* 895BC8 802404E8 00000000 */ nop +/* 895BC8 802404E8 00000000 */ nop /* 895BCC 802404EC 45000016 */ bc1f .L80240548 /* 895BD0 802404F0 46001106 */ mov.s $f4, $f2 /* 895BD4 802404F4 860200A8 */ lh $v0, 0xa8($s0) /* 895BD8 802404F8 44820000 */ mtc1 $v0, $f0 -/* 895BDC 802404FC 00000000 */ nop +/* 895BDC 802404FC 00000000 */ nop /* 895BE0 80240500 46800020 */ cvt.s.w $f0, $f0 /* 895BE4 80240504 4600A03C */ c.lt.s $f20, $f0 -/* 895BE8 80240508 00000000 */ nop +/* 895BE8 80240508 00000000 */ nop /* 895BEC 8024050C 4500000F */ bc1f .L8024054C /* 895BF0 80240510 0000882D */ daddu $s1, $zero, $zero /* 895BF4 80240514 860200A6 */ lh $v0, 0xa6($s0) /* 895BF8 80240518 3C013F00 */ lui $at, 0x3f00 /* 895BFC 8024051C 44811000 */ mtc1 $at, $f2 /* 895C00 80240520 44820000 */ mtc1 $v0, $f0 -/* 895C04 80240524 00000000 */ nop +/* 895C04 80240524 00000000 */ nop /* 895C08 80240528 46800020 */ cvt.s.w $f0, $f0 /* 895C0C 8024052C 46020002 */ mul.s $f0, $f0, $f2 -/* 895C10 80240530 00000000 */ nop +/* 895C10 80240530 00000000 */ nop /* 895C14 80240534 4600203C */ c.lt.s $f4, $f0 -/* 895C18 80240538 00000000 */ nop +/* 895C18 80240538 00000000 */ nop /* 895C1C 8024053C 45000003 */ bc1f .L8024054C /* 895C20 80240540 24020001 */ addiu $v0, $zero, 1 /* 895C24 80240544 AE62008C */ sw $v0, 0x8c($s3) @@ -165,16 +165,16 @@ glabel func_80240310_8959F0 /* 895C58 80240578 C6400098 */ lwc1 $f0, 0x98($s2) /* 895C5C 8024057C 46001081 */ sub.s $f2, $f2, $f0 /* 895C60 80240580 46021182 */ mul.s $f6, $f2, $f2 -/* 895C64 80240584 00000000 */ nop +/* 895C64 80240584 00000000 */ nop /* 895C68 80240588 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 895C6C 8024058C C6020040 */ lwc1 $f2, 0x40($s0) /* 895C70 80240590 46001081 */ sub.s $f2, $f2, $f0 /* 895C74 80240594 46021102 */ mul.s $f4, $f2, $f2 -/* 895C78 80240598 00000000 */ nop +/* 895C78 80240598 00000000 */ nop /* 895C7C 8024059C 860200A8 */ lh $v0, 0xa8($s0) /* 895C80 802405A0 C602003C */ lwc1 $f2, 0x3c($s0) /* 895C84 802405A4 44820000 */ mtc1 $v0, $f0 -/* 895C88 802405A8 00000000 */ nop +/* 895C88 802405A8 00000000 */ nop /* 895C8C 802405AC 46800020 */ cvt.s.w $f0, $f0 /* 895C90 802405B0 46001080 */ add.s $f2, $f2, $f0 /* 895C94 802405B4 461A1081 */ sub.s $f2, $f2, $f26 @@ -183,32 +183,32 @@ glabel func_80240310_8959F0 /* 895CA0 802405C0 46001501 */ sub.s $f20, $f2, $f0 /* 895CA4 802405C4 46006004 */ sqrt.s $f0, $f12 /* 895CA8 802405C8 46000032 */ c.eq.s $f0, $f0 -/* 895CAC 802405CC 00000000 */ nop +/* 895CAC 802405CC 00000000 */ nop /* 895CB0 802405D0 45010003 */ bc1t .L802405E0 -/* 895CB4 802405D4 00000000 */ nop +/* 895CB4 802405D4 00000000 */ nop /* 895CB8 802405D8 0C0187BC */ jal sqrtf -/* 895CBC 802405DC 00000000 */ nop +/* 895CBC 802405DC 00000000 */ nop .L802405E0: /* 895CC0 802405E0 4614C03C */ c.lt.s $f24, $f20 -/* 895CC4 802405E4 00000000 */ nop +/* 895CC4 802405E4 00000000 */ nop /* 895CC8 802405E8 45000015 */ bc1f .L80240640 /* 895CCC 802405EC 46000106 */ mov.s $f4, $f0 /* 895CD0 802405F0 860200A8 */ lh $v0, 0xa8($s0) /* 895CD4 802405F4 44820000 */ mtc1 $v0, $f0 -/* 895CD8 802405F8 00000000 */ nop +/* 895CD8 802405F8 00000000 */ nop /* 895CDC 802405FC 46800020 */ cvt.s.w $f0, $f0 /* 895CE0 80240600 4600A03C */ c.lt.s $f20, $f0 -/* 895CE4 80240604 00000000 */ nop +/* 895CE4 80240604 00000000 */ nop /* 895CE8 80240608 4500000E */ bc1f .L80240644 /* 895CEC 8024060C 26310001 */ addiu $s1, $s1, 1 /* 895CF0 80240610 860200A6 */ lh $v0, 0xa6($s0) /* 895CF4 80240614 44820000 */ mtc1 $v0, $f0 -/* 895CF8 80240618 00000000 */ nop +/* 895CF8 80240618 00000000 */ nop /* 895CFC 8024061C 46800020 */ cvt.s.w $f0, $f0 /* 895D00 80240620 46160002 */ mul.s $f0, $f0, $f22 -/* 895D04 80240624 00000000 */ nop +/* 895D04 80240624 00000000 */ nop /* 895D08 80240628 4600203C */ c.lt.s $f4, $f0 -/* 895D0C 8024062C 00000000 */ nop +/* 895D0C 8024062C 00000000 */ nop /* 895D10 80240630 45000004 */ bc1f .L80240644 /* 895D14 80240634 24020001 */ addiu $v0, $zero, 1 /* 895D18 80240638 08090194 */ j .L80240650 @@ -218,7 +218,7 @@ glabel func_80240310_8959F0 .L80240644: /* 895D24 80240644 2A220040 */ slti $v0, $s1, 0x40 /* 895D28 80240648 1440FFC5 */ bnez $v0, .L80240560 -/* 895D2C 8024064C 00000000 */ nop +/* 895D2C 8024064C 00000000 */ nop .L80240650: /* 895D30 80240650 8FBF0020 */ lw $ra, 0x20($sp) /* 895D34 80240654 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_80240034_897614.s b/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_80240034_897614.s index af2c22e7e5..37fbf79dbf 100644 --- a/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_80240034_897614.s +++ b/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_80240034_897614.s @@ -22,16 +22,16 @@ glabel func_80240034_897614 /* 897654 80240074 00021023 */ negu $v0, $v0 .L80240078: /* 897658 80240078 14400003 */ bnez $v0, .L80240088 -/* 89765C 8024007C 00000000 */ nop +/* 89765C 8024007C 00000000 */ nop /* 897660 80240080 50E00017 */ beql $a3, $zero, .L802400E0 /* 897664 80240084 0000102D */ daddu $v0, $zero, $zero .L80240088: /* 897668 80240088 44822000 */ mtc1 $v0, $f4 -/* 89766C 8024008C 00000000 */ nop +/* 89766C 8024008C 00000000 */ nop /* 897670 80240090 46802120 */ cvt.s.w $f4, $f4 /* 897674 80240094 44062000 */ mfc1 $a2, $f4 /* 897678 80240098 44872000 */ mtc1 $a3, $f4 -/* 89767C 8024009C 00000000 */ nop +/* 89767C 8024009C 00000000 */ nop /* 897680 802400A0 46802120 */ cvt.s.w $f4, $f4 /* 897684 802400A4 44806000 */ mtc1 $zero, $f12 /* 897688 802400A8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240034_897614 /* 897690 802400B0 46006386 */ mov.s $f14, $f12 /* 897694 802400B4 3C014270 */ lui $at, 0x4270 /* 897698 802400B8 44811000 */ mtc1 $at, $f2 -/* 89769C 802400BC 00000000 */ nop +/* 89769C 802400BC 00000000 */ nop /* 8976A0 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 8976A4 802400C4 00000000 */ nop +/* 8976A4 802400C4 00000000 */ nop /* 8976A8 802400C8 45000004 */ bc1f .L802400DC /* 8976AC 802400CC 24020001 */ addiu $v0, $zero, 1 /* 8976B0 802400D0 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802406C4_897CA4.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802406C4_897CA4.s index 69a8449650..7c36a03853 100644 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802406C4_897CA4.s +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802406C4_897CA4.s @@ -8,7 +8,7 @@ glabel func_802406C4_897CA4 /* 897CB0 802406D0 00822021 */ addu $a0, $a0, $v0 /* 897CB4 802406D4 90820014 */ lbu $v0, 0x14($a0) /* 897CB8 802406D8 10400009 */ beqz $v0, .L80240700 -/* 897CBC 802406DC 00000000 */ nop +/* 897CBC 802406DC 00000000 */ nop /* 897CC0 802406E0 90820015 */ lbu $v0, 0x15($a0) /* 897CC4 802406E4 00022600 */ sll $a0, $v0, 0x18 /* 897CC8 802406E8 00041E03 */ sra $v1, $a0, 0x18 @@ -16,7 +16,7 @@ glabel func_802406C4_897CA4 /* 897CD0 802406F0 00021403 */ sra $v0, $v0, 0x10 /* 897CD4 802406F4 0043102A */ slt $v0, $v0, $v1 /* 897CD8 802406F8 10400003 */ beqz $v0, .L80240708 -/* 897CDC 802406FC 00000000 */ nop +/* 897CDC 802406FC 00000000 */ nop .L80240700: /* 897CE0 80240700 03E00008 */ jr $ra /* 897CE4 80240704 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s index 22ad4581eb..040d93ebb8 100644 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s @@ -108,20 +108,20 @@ glabel func_802407BC_897D9C /* 897F24 80240944 10400009 */ beqz $v0, .L8024096C /* 897F28 80240948 AEA20074 */ sw $v0, 0x74($s5) /* 897F2C 8024094C 0C03C4EC */ jal func_800F13B0 -/* 897F30 80240950 00000000 */ nop +/* 897F30 80240950 00000000 */ nop /* 897F34 80240954 8EA20070 */ lw $v0, 0x70($s5) /* 897F38 80240958 24420001 */ addiu $v0, $v0, 1 .L8024095C: /* 897F3C 8024095C AEA20070 */ sw $v0, 0x70($s5) /* 897F40 80240960 2842000F */ slti $v0, $v0, 0xf /* 897F44 80240964 10400003 */ beqz $v0, .L80240974 -/* 897F48 80240968 00000000 */ nop +/* 897F48 80240968 00000000 */ nop .L8024096C: /* 897F4C 8024096C 08090277 */ j .L802409DC /* 897F50 80240970 0000102D */ daddu $v0, $zero, $zero .L80240974: /* 897F54 80240974 0C03C54E */ jal func_800F1538 -/* 897F58 80240978 00000000 */ nop +/* 897F58 80240978 00000000 */ nop /* 897F5C 8024097C 8EA30074 */ lw $v1, 0x74($s5) /* 897F60 80240980 240200FF */ addiu $v0, $zero, 0xff /* 897F64 80240984 10620010 */ beq $v1, $v0, .L802409C8 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0_8981D0.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0_8981D0.s index 2e78be19e3..def4483135 100644 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0_8981D0.s +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0_8981D0.s @@ -36,7 +36,7 @@ glabel func_80240BF0_8981D0 /* 89824C 80240C6C 0C00A88D */ jal sin_cos_deg /* 898250 80240C70 0040A82D */ daddu $s5, $v0, $zero /* 898254 80240C74 1200005D */ beqz $s0, .L80240DEC -/* 898258 80240C78 00000000 */ nop +/* 898258 80240C78 00000000 */ nop /* 89825C 80240C7C 0C00AB0A */ jal general_heap_malloc /* 898260 80240C80 24040068 */ addiu $a0, $zero, 0x68 /* 898264 80240C84 0040902D */ daddu $s2, $v0, $zero @@ -98,10 +98,10 @@ glabel func_80240BF0_8981D0 /* 89833C 80240D5C C7A2001C */ lwc1 $f2, 0x1c($sp) /* 898340 80240D60 C7A40020 */ lwc1 $f4, 0x20($sp) /* 898344 80240D64 46041082 */ mul.s $f2, $f2, $f4 -/* 898348 80240D68 00000000 */ nop +/* 898348 80240D68 00000000 */ nop /* 89834C 80240D6C C7A00018 */ lwc1 $f0, 0x18($sp) /* 898350 80240D70 46040002 */ mul.s $f0, $f0, $f4 -/* 898354 80240D74 00000000 */ nop +/* 898354 80240D74 00000000 */ nop /* 898358 80240D78 E6020038 */ swc1 $f2, 0x38($s0) /* 89835C 80240D7C E6000050 */ swc1 $f0, 0x50($s0) /* 898360 80240D80 8E42005C */ lw $v0, 0x5c($s2) @@ -142,12 +142,12 @@ glabel func_80240BF0_8981D0 /* 8983E8 80240E08 10600007 */ beqz $v1, .L80240E28 /* 8983EC 80240E0C 24040005 */ addiu $a0, $zero, 5 /* 8983F0 80240E10 080903F0 */ j .L80240FC0 -/* 8983F4 80240E14 00000000 */ nop +/* 8983F4 80240E14 00000000 */ nop .L80240E18: /* 8983F8 80240E18 10620058 */ beq $v1, $v0, .L80240F7C -/* 8983FC 80240E1C 00000000 */ nop +/* 8983FC 80240E1C 00000000 */ nop /* 898400 80240E20 080903F0 */ j .L80240FC0 -/* 898404 80240E24 00000000 */ nop +/* 898404 80240E24 00000000 */ nop .L80240E28: /* 898408 80240E28 0000882D */ daddu $s1, $zero, $zero /* 89840C 80240E2C 3C148024 */ lui $s4, %hi(func_80242708_854878) @@ -174,11 +174,11 @@ glabel func_80240BF0_8981D0 /* 89845C 80240E7C C7A4001C */ lwc1 $f4, 0x1c($sp) /* 898460 80240E80 C7A00020 */ lwc1 $f0, 0x20($sp) /* 898464 80240E84 46002102 */ mul.s $f4, $f4, $f0 -/* 898468 80240E88 00000000 */ nop +/* 898468 80240E88 00000000 */ nop /* 89846C 80240E8C C7A20018 */ lwc1 $f2, 0x18($sp) /* 898470 80240E90 26940004 */ addiu $s4, $s4, 4 /* 898474 80240E94 46001082 */ mul.s $f2, $f2, $f0 -/* 898478 80240E98 00000000 */ nop +/* 898478 80240E98 00000000 */ nop /* 89847C 80240E9C 26730004 */ addiu $s3, $s3, 4 /* 898480 80240EA0 26310001 */ addiu $s1, $s1, 1 /* 898484 80240EA4 2A220003 */ slti $v0, $s1, 3 @@ -215,11 +215,11 @@ glabel func_80240BF0_8981D0 /* 8984F8 80240F18 C7A4001C */ lwc1 $f4, 0x1c($sp) /* 8984FC 80240F1C C7A00020 */ lwc1 $f0, 0x20($sp) /* 898500 80240F20 46002102 */ mul.s $f4, $f4, $f0 -/* 898504 80240F24 00000000 */ nop +/* 898504 80240F24 00000000 */ nop /* 898508 80240F28 C7A20018 */ lwc1 $f2, 0x18($sp) /* 89850C 80240F2C 26940004 */ addiu $s4, $s4, 4 /* 898510 80240F30 46001082 */ mul.s $f2, $f2, $f0 -/* 898514 80240F34 00000000 */ nop +/* 898514 80240F34 00000000 */ nop /* 898518 80240F38 26730004 */ addiu $s3, $s3, 4 /* 89851C 80240F3C 26310001 */ addiu $s1, $s1, 1 /* 898520 80240F40 2A220003 */ slti $v0, $s1, 3 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241128_898708.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241128_898708.s index 4cd105bf26..f3c7070286 100644 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241128_898708.s +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241128_898708.s @@ -36,16 +36,16 @@ glabel func_80241128_898708 /* 898780 802411A0 10600007 */ beqz $v1, .L802411C0 /* 898784 802411A4 240500FF */ addiu $a1, $zero, 0xff /* 898788 802411A8 0809048E */ j .L80241238 -/* 89878C 802411AC 00000000 */ nop +/* 89878C 802411AC 00000000 */ nop .L802411B0: /* 898790 802411B0 10620019 */ beq $v1, $v0, .L80241218 -/* 898794 802411B4 00000000 */ nop +/* 898794 802411B4 00000000 */ nop /* 898798 802411B8 0809048E */ j .L80241238 -/* 89879C 802411BC 00000000 */ nop +/* 89879C 802411BC 00000000 */ nop .L802411C0: /* 8987A0 802411C0 8E220074 */ lw $v0, 0x74($s1) /* 8987A4 802411C4 14450004 */ bne $v0, $a1, .L802411D8 -/* 8987A8 802411C8 00000000 */ nop +/* 8987A8 802411C8 00000000 */ nop /* 8987AC 802411CC AE240070 */ sw $a0, 0x70($s1) /* 8987B0 802411D0 AE200078 */ sw $zero, 0x78($s1) /* 8987B4 802411D4 8E220074 */ lw $v0, 0x74($s1) @@ -57,7 +57,7 @@ glabel func_80241128_898708 /* 8987C8 802411E8 50400013 */ beql $v0, $zero, .L80241238 /* 8987CC 802411EC AE250074 */ sw $a1, 0x74($s1) /* 8987D0 802411F0 0809048E */ j .L80241238 -/* 8987D4 802411F4 00000000 */ nop +/* 8987D4 802411F4 00000000 */ nop .L802411F8: /* 8987D8 802411F8 8E220078 */ lw $v0, 0x78($s1) /* 8987DC 802411FC 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802412F8_8988D8.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802412F8_8988D8.s index 105f81ce75..2f928503a5 100644 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802412F8_8988D8.s +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802412F8_8988D8.s @@ -15,5 +15,5 @@ glabel func_802412F8_8988D8 .L80241320: /* 898900 80241320 03E00008 */ jr $ra /* 898904 80241324 24020002 */ addiu $v0, $zero, 2 -/* 898908 80241328 00000000 */ nop -/* 89890C 8024132C 00000000 */ nop +/* 898908 80241328 00000000 */ nop +/* 89890C 8024132C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_20/89A350/func_80240340_89A690.s b/asm/nonmatchings/world/area_tik/tik_20/89A350/func_80240340_89A690.s index 29e3b4f2dd..1a8869062b 100644 --- a/asm/nonmatchings/world/area_tik/tik_20/89A350/func_80240340_89A690.s +++ b/asm/nonmatchings/world/area_tik/tik_20/89A350/func_80240340_89A690.s @@ -22,16 +22,16 @@ glabel func_80240340_89A690 /* 89A6D0 80240380 00021023 */ negu $v0, $v0 .L80240384: /* 89A6D4 80240384 14400003 */ bnez $v0, .L80240394 -/* 89A6D8 80240388 00000000 */ nop +/* 89A6D8 80240388 00000000 */ nop /* 89A6DC 8024038C 50E00017 */ beql $a3, $zero, .L802403EC /* 89A6E0 80240390 0000102D */ daddu $v0, $zero, $zero .L80240394: /* 89A6E4 80240394 44822000 */ mtc1 $v0, $f4 -/* 89A6E8 80240398 00000000 */ nop +/* 89A6E8 80240398 00000000 */ nop /* 89A6EC 8024039C 46802120 */ cvt.s.w $f4, $f4 /* 89A6F0 802403A0 44062000 */ mfc1 $a2, $f4 /* 89A6F4 802403A4 44872000 */ mtc1 $a3, $f4 -/* 89A6F8 802403A8 00000000 */ nop +/* 89A6F8 802403A8 00000000 */ nop /* 89A6FC 802403AC 46802120 */ cvt.s.w $f4, $f4 /* 89A700 802403B0 44806000 */ mtc1 $zero, $f12 /* 89A704 802403B4 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240340_89A690 /* 89A70C 802403BC 46006386 */ mov.s $f14, $f12 /* 89A710 802403C0 3C014270 */ lui $at, 0x4270 /* 89A714 802403C4 44811000 */ mtc1 $at, $f2 -/* 89A718 802403C8 00000000 */ nop +/* 89A718 802403C8 00000000 */ nop /* 89A71C 802403CC 4602003C */ c.lt.s $f0, $f2 -/* 89A720 802403D0 00000000 */ nop +/* 89A720 802403D0 00000000 */ nop /* 89A724 802403D4 45000004 */ bc1f .L802403E8 /* 89A728 802403D8 24020001 */ addiu $v0, $zero, 1 /* 89A72C 802403DC AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_tik/tik_20/89A350/func_802405EC_89A93C.s b/asm/nonmatchings/world/area_tik/tik_20/89A350/func_802405EC_89A93C.s index 1f48f6d7da..b01408d82e 100644 --- a/asm/nonmatchings/world/area_tik/tik_20/89A350/func_802405EC_89A93C.s +++ b/asm/nonmatchings/world/area_tik/tik_20/89A350/func_802405EC_89A93C.s @@ -32,58 +32,58 @@ glabel func_802405EC_89A93C /* 89A9A8 80240658 C6400098 */ lwc1 $f0, 0x98($s2) /* 89A9AC 8024065C 46001081 */ sub.s $f2, $f2, $f0 /* 89A9B0 80240660 46021182 */ mul.s $f6, $f2, $f2 -/* 89A9B4 80240664 00000000 */ nop +/* 89A9B4 80240664 00000000 */ nop /* 89A9B8 80240668 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 89A9BC 8024066C C4620030 */ lwc1 $f2, 0x30($v1) /* 89A9C0 80240670 46001081 */ sub.s $f2, $f2, $f0 /* 89A9C4 80240674 46021102 */ mul.s $f4, $f2, $f2 -/* 89A9C8 80240678 00000000 */ nop +/* 89A9C8 80240678 00000000 */ nop /* 89A9CC 8024067C 846200B0 */ lh $v0, 0xb0($v1) /* 89A9D0 80240680 C462002C */ lwc1 $f2, 0x2c($v1) /* 89A9D4 80240684 44820000 */ mtc1 $v0, $f0 -/* 89A9D8 80240688 00000000 */ nop +/* 89A9D8 80240688 00000000 */ nop /* 89A9DC 8024068C 46800020 */ cvt.s.w $f0, $f0 /* 89A9E0 80240690 46001080 */ add.s $f2, $f2, $f0 /* 89A9E4 80240694 3C013FC0 */ lui $at, 0x3fc0 /* 89A9E8 80240698 44810000 */ mtc1 $at, $f0 -/* 89A9EC 8024069C 00000000 */ nop +/* 89A9EC 8024069C 00000000 */ nop /* 89A9F0 802406A0 46001081 */ sub.s $f2, $f2, $f0 /* 89A9F4 802406A4 46043300 */ add.s $f12, $f6, $f4 /* 89A9F8 802406A8 C640009C */ lwc1 $f0, 0x9c($s2) /* 89A9FC 802406AC 46001501 */ sub.s $f20, $f2, $f0 /* 89AA00 802406B0 46006084 */ sqrt.s $f2, $f12 /* 89AA04 802406B4 46021032 */ c.eq.s $f2, $f2 -/* 89AA08 802406B8 00000000 */ nop +/* 89AA08 802406B8 00000000 */ nop /* 89AA0C 802406BC 45010004 */ bc1t .L802406D0 /* 89AA10 802406C0 0060882D */ daddu $s1, $v1, $zero /* 89AA14 802406C4 0C0187BC */ jal sqrtf -/* 89AA18 802406C8 00000000 */ nop +/* 89AA18 802406C8 00000000 */ nop /* 89AA1C 802406CC 46000086 */ mov.s $f2, $f0 .L802406D0: /* 89AA20 802406D0 44800000 */ mtc1 $zero, $f0 -/* 89AA24 802406D4 00000000 */ nop +/* 89AA24 802406D4 00000000 */ nop /* 89AA28 802406D8 4614003C */ c.lt.s $f0, $f20 -/* 89AA2C 802406DC 00000000 */ nop +/* 89AA2C 802406DC 00000000 */ nop /* 89AA30 802406E0 45000016 */ bc1f .L8024073C /* 89AA34 802406E4 46001106 */ mov.s $f4, $f2 /* 89AA38 802406E8 862200B0 */ lh $v0, 0xb0($s1) /* 89AA3C 802406EC 44820000 */ mtc1 $v0, $f0 -/* 89AA40 802406F0 00000000 */ nop +/* 89AA40 802406F0 00000000 */ nop /* 89AA44 802406F4 46800020 */ cvt.s.w $f0, $f0 /* 89AA48 802406F8 4600A03C */ c.lt.s $f20, $f0 -/* 89AA4C 802406FC 00000000 */ nop +/* 89AA4C 802406FC 00000000 */ nop /* 89AA50 80240700 4500000E */ bc1f .L8024073C -/* 89AA54 80240704 00000000 */ nop +/* 89AA54 80240704 00000000 */ nop /* 89AA58 80240708 862200B2 */ lh $v0, 0xb2($s1) /* 89AA5C 8024070C 3C013F00 */ lui $at, 0x3f00 /* 89AA60 80240710 44811000 */ mtc1 $at, $f2 /* 89AA64 80240714 44820000 */ mtc1 $v0, $f0 -/* 89AA68 80240718 00000000 */ nop +/* 89AA68 80240718 00000000 */ nop /* 89AA6C 8024071C 46800020 */ cvt.s.w $f0, $f0 /* 89AA70 80240720 46020002 */ mul.s $f0, $f0, $f2 -/* 89AA74 80240724 00000000 */ nop +/* 89AA74 80240724 00000000 */ nop /* 89AA78 80240728 4600203C */ c.lt.s $f4, $f0 -/* 89AA7C 8024072C 00000000 */ nop +/* 89AA7C 8024072C 00000000 */ nop /* 89AA80 80240730 45000002 */ bc1f .L8024073C /* 89AA84 80240734 24020001 */ addiu $v0, $zero, 1 /* 89AA88 80240738 AE62008C */ sw $v0, 0x8c($s3) @@ -92,58 +92,58 @@ glabel func_802405EC_89A93C /* 89AA90 80240740 C6400098 */ lwc1 $f0, 0x98($s2) /* 89AA94 80240744 46001081 */ sub.s $f2, $f2, $f0 /* 89AA98 80240748 46021182 */ mul.s $f6, $f2, $f2 -/* 89AA9C 8024074C 00000000 */ nop +/* 89AA9C 8024074C 00000000 */ nop /* 89AAA0 80240750 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 89AAA4 80240754 C6020040 */ lwc1 $f2, 0x40($s0) /* 89AAA8 80240758 46001081 */ sub.s $f2, $f2, $f0 /* 89AAAC 8024075C 46021102 */ mul.s $f4, $f2, $f2 -/* 89AAB0 80240760 00000000 */ nop +/* 89AAB0 80240760 00000000 */ nop /* 89AAB4 80240764 860200A8 */ lh $v0, 0xa8($s0) /* 89AAB8 80240768 C602003C */ lwc1 $f2, 0x3c($s0) /* 89AABC 8024076C 44820000 */ mtc1 $v0, $f0 -/* 89AAC0 80240770 00000000 */ nop +/* 89AAC0 80240770 00000000 */ nop /* 89AAC4 80240774 46800020 */ cvt.s.w $f0, $f0 /* 89AAC8 80240778 46001080 */ add.s $f2, $f2, $f0 /* 89AACC 8024077C 3C013FC0 */ lui $at, 0x3fc0 /* 89AAD0 80240780 44810000 */ mtc1 $at, $f0 -/* 89AAD4 80240784 00000000 */ nop +/* 89AAD4 80240784 00000000 */ nop /* 89AAD8 80240788 46001081 */ sub.s $f2, $f2, $f0 /* 89AADC 8024078C 46043300 */ add.s $f12, $f6, $f4 /* 89AAE0 80240790 C640009C */ lwc1 $f0, 0x9c($s2) /* 89AAE4 80240794 46001501 */ sub.s $f20, $f2, $f0 /* 89AAE8 80240798 46006084 */ sqrt.s $f2, $f12 /* 89AAEC 8024079C 46021032 */ c.eq.s $f2, $f2 -/* 89AAF0 802407A0 00000000 */ nop +/* 89AAF0 802407A0 00000000 */ nop /* 89AAF4 802407A4 45010004 */ bc1t .L802407B8 -/* 89AAF8 802407A8 00000000 */ nop +/* 89AAF8 802407A8 00000000 */ nop /* 89AAFC 802407AC 0C0187BC */ jal sqrtf -/* 89AB00 802407B0 00000000 */ nop +/* 89AB00 802407B0 00000000 */ nop /* 89AB04 802407B4 46000086 */ mov.s $f2, $f0 .L802407B8: /* 89AB08 802407B8 44800000 */ mtc1 $zero, $f0 -/* 89AB0C 802407BC 00000000 */ nop +/* 89AB0C 802407BC 00000000 */ nop /* 89AB10 802407C0 4614003C */ c.lt.s $f0, $f20 -/* 89AB14 802407C4 00000000 */ nop +/* 89AB14 802407C4 00000000 */ nop /* 89AB18 802407C8 45000016 */ bc1f .L80240824 /* 89AB1C 802407CC 46001106 */ mov.s $f4, $f2 /* 89AB20 802407D0 860200A8 */ lh $v0, 0xa8($s0) /* 89AB24 802407D4 44820000 */ mtc1 $v0, $f0 -/* 89AB28 802407D8 00000000 */ nop +/* 89AB28 802407D8 00000000 */ nop /* 89AB2C 802407DC 46800020 */ cvt.s.w $f0, $f0 /* 89AB30 802407E0 4600A03C */ c.lt.s $f20, $f0 -/* 89AB34 802407E4 00000000 */ nop +/* 89AB34 802407E4 00000000 */ nop /* 89AB38 802407E8 4500000F */ bc1f .L80240828 /* 89AB3C 802407EC 0000882D */ daddu $s1, $zero, $zero /* 89AB40 802407F0 860200A6 */ lh $v0, 0xa6($s0) /* 89AB44 802407F4 3C013F00 */ lui $at, 0x3f00 /* 89AB48 802407F8 44811000 */ mtc1 $at, $f2 /* 89AB4C 802407FC 44820000 */ mtc1 $v0, $f0 -/* 89AB50 80240800 00000000 */ nop +/* 89AB50 80240800 00000000 */ nop /* 89AB54 80240804 46800020 */ cvt.s.w $f0, $f0 /* 89AB58 80240808 46020002 */ mul.s $f0, $f0, $f2 -/* 89AB5C 8024080C 00000000 */ nop +/* 89AB5C 8024080C 00000000 */ nop /* 89AB60 80240810 4600203C */ c.lt.s $f4, $f0 -/* 89AB64 80240814 00000000 */ nop +/* 89AB64 80240814 00000000 */ nop /* 89AB68 80240818 45000003 */ bc1f .L80240828 /* 89AB6C 8024081C 24020001 */ addiu $v0, $zero, 1 /* 89AB70 80240820 AE62008C */ sw $v0, 0x8c($s3) @@ -165,16 +165,16 @@ glabel func_802405EC_89A93C /* 89ABA4 80240854 C6400098 */ lwc1 $f0, 0x98($s2) /* 89ABA8 80240858 46001081 */ sub.s $f2, $f2, $f0 /* 89ABAC 8024085C 46021182 */ mul.s $f6, $f2, $f2 -/* 89ABB0 80240860 00000000 */ nop +/* 89ABB0 80240860 00000000 */ nop /* 89ABB4 80240864 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 89ABB8 80240868 C6020040 */ lwc1 $f2, 0x40($s0) /* 89ABBC 8024086C 46001081 */ sub.s $f2, $f2, $f0 /* 89ABC0 80240870 46021102 */ mul.s $f4, $f2, $f2 -/* 89ABC4 80240874 00000000 */ nop +/* 89ABC4 80240874 00000000 */ nop /* 89ABC8 80240878 860200A8 */ lh $v0, 0xa8($s0) /* 89ABCC 8024087C C602003C */ lwc1 $f2, 0x3c($s0) /* 89ABD0 80240880 44820000 */ mtc1 $v0, $f0 -/* 89ABD4 80240884 00000000 */ nop +/* 89ABD4 80240884 00000000 */ nop /* 89ABD8 80240888 46800020 */ cvt.s.w $f0, $f0 /* 89ABDC 8024088C 46001080 */ add.s $f2, $f2, $f0 /* 89ABE0 80240890 461A1081 */ sub.s $f2, $f2, $f26 @@ -183,32 +183,32 @@ glabel func_802405EC_89A93C /* 89ABEC 8024089C 46001501 */ sub.s $f20, $f2, $f0 /* 89ABF0 802408A0 46006004 */ sqrt.s $f0, $f12 /* 89ABF4 802408A4 46000032 */ c.eq.s $f0, $f0 -/* 89ABF8 802408A8 00000000 */ nop +/* 89ABF8 802408A8 00000000 */ nop /* 89ABFC 802408AC 45010003 */ bc1t .L802408BC -/* 89AC00 802408B0 00000000 */ nop +/* 89AC00 802408B0 00000000 */ nop /* 89AC04 802408B4 0C0187BC */ jal sqrtf -/* 89AC08 802408B8 00000000 */ nop +/* 89AC08 802408B8 00000000 */ nop .L802408BC: /* 89AC0C 802408BC 4614C03C */ c.lt.s $f24, $f20 -/* 89AC10 802408C0 00000000 */ nop +/* 89AC10 802408C0 00000000 */ nop /* 89AC14 802408C4 45000015 */ bc1f .L8024091C /* 89AC18 802408C8 46000106 */ mov.s $f4, $f0 /* 89AC1C 802408CC 860200A8 */ lh $v0, 0xa8($s0) /* 89AC20 802408D0 44820000 */ mtc1 $v0, $f0 -/* 89AC24 802408D4 00000000 */ nop +/* 89AC24 802408D4 00000000 */ nop /* 89AC28 802408D8 46800020 */ cvt.s.w $f0, $f0 /* 89AC2C 802408DC 4600A03C */ c.lt.s $f20, $f0 -/* 89AC30 802408E0 00000000 */ nop +/* 89AC30 802408E0 00000000 */ nop /* 89AC34 802408E4 4500000E */ bc1f .L80240920 /* 89AC38 802408E8 26310001 */ addiu $s1, $s1, 1 /* 89AC3C 802408EC 860200A6 */ lh $v0, 0xa6($s0) /* 89AC40 802408F0 44820000 */ mtc1 $v0, $f0 -/* 89AC44 802408F4 00000000 */ nop +/* 89AC44 802408F4 00000000 */ nop /* 89AC48 802408F8 46800020 */ cvt.s.w $f0, $f0 /* 89AC4C 802408FC 46160002 */ mul.s $f0, $f0, $f22 -/* 89AC50 80240900 00000000 */ nop +/* 89AC50 80240900 00000000 */ nop /* 89AC54 80240904 4600203C */ c.lt.s $f4, $f0 -/* 89AC58 80240908 00000000 */ nop +/* 89AC58 80240908 00000000 */ nop /* 89AC5C 8024090C 45000004 */ bc1f .L80240920 /* 89AC60 80240910 24020001 */ addiu $v0, $zero, 1 /* 89AC64 80240914 0809024B */ j .L8024092C @@ -218,7 +218,7 @@ glabel func_802405EC_89A93C .L80240920: /* 89AC70 80240920 2A220040 */ slti $v0, $s1, 0x40 /* 89AC74 80240924 1440FFC5 */ bnez $v0, .L8024083C -/* 89AC78 80240928 00000000 */ nop +/* 89AC78 80240928 00000000 */ nop .L8024092C: /* 89AC7C 8024092C 8FBF0020 */ lw $ra, 0x20($sp) /* 89AC80 80240930 8FB3001C */ lw $s3, 0x1c($sp) @@ -232,4 +232,4 @@ glabel func_802405EC_89A93C /* 89ACA0 80240950 24020002 */ addiu $v0, $zero, 2 /* 89ACA4 80240954 03E00008 */ jr $ra /* 89ACA8 80240958 27BD0048 */ addiu $sp, $sp, 0x48 -/* 89ACAC 8024095C 00000000 */ nop +/* 89ACAC 8024095C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_802409DC_89AD2C.s b/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_802409DC_89AD2C.s index 8b2d5c1a91..38c52e11d4 100644 --- a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_802409DC_89AD2C.s +++ b/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_802409DC_89AD2C.s @@ -21,11 +21,11 @@ glabel func_802409DC_89AD2C /* 89AD6C 80240A1C A602008E */ sh $v0, 0x8e($s0) /* 89AD70 80240A20 00021400 */ sll $v0, $v0, 0x10 /* 89AD74 80240A24 1C400033 */ bgtz $v0, .L80240AF4 -/* 89AD78 80240A28 00000000 */ nop +/* 89AD78 80240A28 00000000 */ nop .L80240A2C: /* 89AD7C 80240A2C 8602008C */ lh $v0, 0x8c($s0) /* 89AD80 80240A30 14400030 */ bnez $v0, .L80240AF4 -/* 89AD84 80240A34 00000000 */ nop +/* 89AD84 80240A34 00000000 */ nop /* 89AD88 80240A38 8E2200CC */ lw $v0, 0xcc($s1) /* 89AD8C 80240A3C 8C420024 */ lw $v0, 0x24($v0) /* 89AD90 80240A40 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_802409DC_89AD2C /* 89AD9C 80240A4C 8E230088 */ lw $v1, 0x88($s1) /* 89ADA0 80240A50 24020005 */ addiu $v0, $zero, 5 /* 89ADA4 80240A54 10620005 */ beq $v1, $v0, .L80240A6C -/* 89ADA8 80240A58 00000000 */ nop +/* 89ADA8 80240A58 00000000 */ nop /* 89ADAC 80240A5C 10600003 */ beqz $v1, .L80240A6C /* 89ADB0 80240A60 24020001 */ addiu $v0, $zero, 1 /* 89ADB4 80240A64 14620006 */ bne $v1, $v0, .L80240A80 -/* 89ADB8 80240A68 00000000 */ nop +/* 89ADB8 80240A68 00000000 */ nop .L80240A6C: /* 89ADBC 80240A6C 8E220084 */ lw $v0, 0x84($s1) /* 89ADC0 80240A70 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_802409DC_89AD2C /* 89AE00 80240AB0 46220000 */ add.d $f0, $f0, $f2 /* 89AE04 80240AB4 4620010D */ trunc.w.d $f4, $f0 /* 89AE08 80240AB8 44022000 */ mfc1 $v0, $f4 -/* 89AE0C 80240ABC 00000000 */ nop +/* 89AE0C 80240ABC 00000000 */ nop /* 89AE10 80240AC0 A602008E */ sh $v0, 0x8e($s0) /* 89AE14 80240AC4 00021400 */ sll $v0, $v0, 0x10 /* 89AE18 80240AC8 8E230078 */ lw $v1, 0x78($s1) /* 89AE1C 80240ACC 00021403 */ sra $v0, $v0, 0x10 /* 89AE20 80240AD0 0043102A */ slt $v0, $v0, $v1 /* 89AE24 80240AD4 10400003 */ beqz $v0, .L80240AE4 -/* 89AE28 80240AD8 00000000 */ nop +/* 89AE28 80240AD8 00000000 */ nop /* 89AE2C 80240ADC 9622007A */ lhu $v0, 0x7a($s1) /* 89AE30 80240AE0 A602008E */ sh $v0, 0x8e($s0) .L80240AE4: diff --git a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s b/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s index df3a6325fd..87177f3229 100644 --- a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s +++ b/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s @@ -279,15 +279,17 @@ glabel func_80240CF4_89B044 /* 89B430 802410E0 2C620015 */ sltiu $v0, $v1, 0x15 /* 89B434 802410E4 10400009 */ beqz $v0, .L8024110C /* 89B438 802410E8 00031080 */ sll $v0, $v1, 2 -/* 89B43C 802410EC 3C018024 */ lui $at, %hi(D_802433F8) +/* 89B43C 802410EC 3C018024 */ lui $at, %hi(jtbl_802433F8_89D748) /* 89B440 802410F0 00220821 */ addu $at, $at, $v0 -/* 89B444 802410F4 8C2233F8 */ lw $v0, %lo(D_802433F8)($at) +/* 89B444 802410F4 8C2233F8 */ lw $v0, %lo(jtbl_802433F8_89D748)($at) /* 89B448 802410F8 00400008 */ jr $v0 /* 89B44C 802410FC 00000000 */ nop +glabel L80241100_89B450 /* 89B450 80241100 8E420028 */ lw $v0, 0x28($s2) /* 89B454 80241104 24420001 */ addiu $v0, $v0, 1 /* 89B458 80241108 AE420028 */ sw $v0, 0x28($s2) .L8024110C: +glabel L8024110C_89B45C /* 89B45C 8024110C 0000102D */ daddu $v0, $zero, $zero .L80241110: /* 89B460 80241110 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_80240340_89DAE0.s b/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_80240340_89DAE0.s index 285c8a5cc7..59e36aca2b 100644 --- a/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_80240340_89DAE0.s +++ b/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_80240340_89DAE0.s @@ -22,16 +22,16 @@ glabel func_80240340_89DAE0 /* 89DB20 80240380 00021023 */ negu $v0, $v0 .L80240384: /* 89DB24 80240384 14400003 */ bnez $v0, .L80240394 -/* 89DB28 80240388 00000000 */ nop +/* 89DB28 80240388 00000000 */ nop /* 89DB2C 8024038C 50E00017 */ beql $a3, $zero, .L802403EC /* 89DB30 80240390 0000102D */ daddu $v0, $zero, $zero .L80240394: /* 89DB34 80240394 44822000 */ mtc1 $v0, $f4 -/* 89DB38 80240398 00000000 */ nop +/* 89DB38 80240398 00000000 */ nop /* 89DB3C 8024039C 46802120 */ cvt.s.w $f4, $f4 /* 89DB40 802403A0 44062000 */ mfc1 $a2, $f4 /* 89DB44 802403A4 44872000 */ mtc1 $a3, $f4 -/* 89DB48 802403A8 00000000 */ nop +/* 89DB48 802403A8 00000000 */ nop /* 89DB4C 802403AC 46802120 */ cvt.s.w $f4, $f4 /* 89DB50 802403B0 44806000 */ mtc1 $zero, $f12 /* 89DB54 802403B4 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240340_89DAE0 /* 89DB5C 802403BC 46006386 */ mov.s $f14, $f12 /* 89DB60 802403C0 3C014270 */ lui $at, 0x4270 /* 89DB64 802403C4 44811000 */ mtc1 $at, $f2 -/* 89DB68 802403C8 00000000 */ nop +/* 89DB68 802403C8 00000000 */ nop /* 89DB6C 802403CC 4602003C */ c.lt.s $f0, $f2 -/* 89DB70 802403D0 00000000 */ nop +/* 89DB70 802403D0 00000000 */ nop /* 89DB74 802403D4 45000004 */ bc1f .L802403E8 /* 89DB78 802403D8 24020001 */ addiu $v0, $zero, 1 /* 89DB7C 802403DC AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_802405EC_89DD8C.s b/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_802405EC_89DD8C.s index e8be0cedaa..caf707f2af 100644 --- a/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_802405EC_89DD8C.s +++ b/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_802405EC_89DD8C.s @@ -32,58 +32,58 @@ glabel func_802405EC_89DD8C /* 89DDF8 80240658 C6400098 */ lwc1 $f0, 0x98($s2) /* 89DDFC 8024065C 46001081 */ sub.s $f2, $f2, $f0 /* 89DE00 80240660 46021182 */ mul.s $f6, $f2, $f2 -/* 89DE04 80240664 00000000 */ nop +/* 89DE04 80240664 00000000 */ nop /* 89DE08 80240668 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 89DE0C 8024066C C4620030 */ lwc1 $f2, 0x30($v1) /* 89DE10 80240670 46001081 */ sub.s $f2, $f2, $f0 /* 89DE14 80240674 46021102 */ mul.s $f4, $f2, $f2 -/* 89DE18 80240678 00000000 */ nop +/* 89DE18 80240678 00000000 */ nop /* 89DE1C 8024067C 846200B0 */ lh $v0, 0xb0($v1) /* 89DE20 80240680 C462002C */ lwc1 $f2, 0x2c($v1) /* 89DE24 80240684 44820000 */ mtc1 $v0, $f0 -/* 89DE28 80240688 00000000 */ nop +/* 89DE28 80240688 00000000 */ nop /* 89DE2C 8024068C 46800020 */ cvt.s.w $f0, $f0 /* 89DE30 80240690 46001080 */ add.s $f2, $f2, $f0 /* 89DE34 80240694 3C013FC0 */ lui $at, 0x3fc0 /* 89DE38 80240698 44810000 */ mtc1 $at, $f0 -/* 89DE3C 8024069C 00000000 */ nop +/* 89DE3C 8024069C 00000000 */ nop /* 89DE40 802406A0 46001081 */ sub.s $f2, $f2, $f0 /* 89DE44 802406A4 46043300 */ add.s $f12, $f6, $f4 /* 89DE48 802406A8 C640009C */ lwc1 $f0, 0x9c($s2) /* 89DE4C 802406AC 46001501 */ sub.s $f20, $f2, $f0 /* 89DE50 802406B0 46006084 */ sqrt.s $f2, $f12 /* 89DE54 802406B4 46021032 */ c.eq.s $f2, $f2 -/* 89DE58 802406B8 00000000 */ nop +/* 89DE58 802406B8 00000000 */ nop /* 89DE5C 802406BC 45010004 */ bc1t .L802406D0 /* 89DE60 802406C0 0060882D */ daddu $s1, $v1, $zero /* 89DE64 802406C4 0C0187BC */ jal sqrtf -/* 89DE68 802406C8 00000000 */ nop +/* 89DE68 802406C8 00000000 */ nop /* 89DE6C 802406CC 46000086 */ mov.s $f2, $f0 .L802406D0: /* 89DE70 802406D0 44800000 */ mtc1 $zero, $f0 -/* 89DE74 802406D4 00000000 */ nop +/* 89DE74 802406D4 00000000 */ nop /* 89DE78 802406D8 4614003C */ c.lt.s $f0, $f20 -/* 89DE7C 802406DC 00000000 */ nop +/* 89DE7C 802406DC 00000000 */ nop /* 89DE80 802406E0 45000016 */ bc1f .L8024073C /* 89DE84 802406E4 46001106 */ mov.s $f4, $f2 /* 89DE88 802406E8 862200B0 */ lh $v0, 0xb0($s1) /* 89DE8C 802406EC 44820000 */ mtc1 $v0, $f0 -/* 89DE90 802406F0 00000000 */ nop +/* 89DE90 802406F0 00000000 */ nop /* 89DE94 802406F4 46800020 */ cvt.s.w $f0, $f0 /* 89DE98 802406F8 4600A03C */ c.lt.s $f20, $f0 -/* 89DE9C 802406FC 00000000 */ nop +/* 89DE9C 802406FC 00000000 */ nop /* 89DEA0 80240700 4500000E */ bc1f .L8024073C -/* 89DEA4 80240704 00000000 */ nop +/* 89DEA4 80240704 00000000 */ nop /* 89DEA8 80240708 862200B2 */ lh $v0, 0xb2($s1) /* 89DEAC 8024070C 3C013F00 */ lui $at, 0x3f00 /* 89DEB0 80240710 44811000 */ mtc1 $at, $f2 /* 89DEB4 80240714 44820000 */ mtc1 $v0, $f0 -/* 89DEB8 80240718 00000000 */ nop +/* 89DEB8 80240718 00000000 */ nop /* 89DEBC 8024071C 46800020 */ cvt.s.w $f0, $f0 /* 89DEC0 80240720 46020002 */ mul.s $f0, $f0, $f2 -/* 89DEC4 80240724 00000000 */ nop +/* 89DEC4 80240724 00000000 */ nop /* 89DEC8 80240728 4600203C */ c.lt.s $f4, $f0 -/* 89DECC 8024072C 00000000 */ nop +/* 89DECC 8024072C 00000000 */ nop /* 89DED0 80240730 45000002 */ bc1f .L8024073C /* 89DED4 80240734 24020001 */ addiu $v0, $zero, 1 /* 89DED8 80240738 AE62008C */ sw $v0, 0x8c($s3) @@ -92,58 +92,58 @@ glabel func_802405EC_89DD8C /* 89DEE0 80240740 C6400098 */ lwc1 $f0, 0x98($s2) /* 89DEE4 80240744 46001081 */ sub.s $f2, $f2, $f0 /* 89DEE8 80240748 46021182 */ mul.s $f6, $f2, $f2 -/* 89DEEC 8024074C 00000000 */ nop +/* 89DEEC 8024074C 00000000 */ nop /* 89DEF0 80240750 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 89DEF4 80240754 C6020040 */ lwc1 $f2, 0x40($s0) /* 89DEF8 80240758 46001081 */ sub.s $f2, $f2, $f0 /* 89DEFC 8024075C 46021102 */ mul.s $f4, $f2, $f2 -/* 89DF00 80240760 00000000 */ nop +/* 89DF00 80240760 00000000 */ nop /* 89DF04 80240764 860200A8 */ lh $v0, 0xa8($s0) /* 89DF08 80240768 C602003C */ lwc1 $f2, 0x3c($s0) /* 89DF0C 8024076C 44820000 */ mtc1 $v0, $f0 -/* 89DF10 80240770 00000000 */ nop +/* 89DF10 80240770 00000000 */ nop /* 89DF14 80240774 46800020 */ cvt.s.w $f0, $f0 /* 89DF18 80240778 46001080 */ add.s $f2, $f2, $f0 /* 89DF1C 8024077C 3C013FC0 */ lui $at, 0x3fc0 /* 89DF20 80240780 44810000 */ mtc1 $at, $f0 -/* 89DF24 80240784 00000000 */ nop +/* 89DF24 80240784 00000000 */ nop /* 89DF28 80240788 46001081 */ sub.s $f2, $f2, $f0 /* 89DF2C 8024078C 46043300 */ add.s $f12, $f6, $f4 /* 89DF30 80240790 C640009C */ lwc1 $f0, 0x9c($s2) /* 89DF34 80240794 46001501 */ sub.s $f20, $f2, $f0 /* 89DF38 80240798 46006084 */ sqrt.s $f2, $f12 /* 89DF3C 8024079C 46021032 */ c.eq.s $f2, $f2 -/* 89DF40 802407A0 00000000 */ nop +/* 89DF40 802407A0 00000000 */ nop /* 89DF44 802407A4 45010004 */ bc1t .L802407B8 -/* 89DF48 802407A8 00000000 */ nop +/* 89DF48 802407A8 00000000 */ nop /* 89DF4C 802407AC 0C0187BC */ jal sqrtf -/* 89DF50 802407B0 00000000 */ nop +/* 89DF50 802407B0 00000000 */ nop /* 89DF54 802407B4 46000086 */ mov.s $f2, $f0 .L802407B8: /* 89DF58 802407B8 44800000 */ mtc1 $zero, $f0 -/* 89DF5C 802407BC 00000000 */ nop +/* 89DF5C 802407BC 00000000 */ nop /* 89DF60 802407C0 4614003C */ c.lt.s $f0, $f20 -/* 89DF64 802407C4 00000000 */ nop +/* 89DF64 802407C4 00000000 */ nop /* 89DF68 802407C8 45000016 */ bc1f .L80240824 /* 89DF6C 802407CC 46001106 */ mov.s $f4, $f2 /* 89DF70 802407D0 860200A8 */ lh $v0, 0xa8($s0) /* 89DF74 802407D4 44820000 */ mtc1 $v0, $f0 -/* 89DF78 802407D8 00000000 */ nop +/* 89DF78 802407D8 00000000 */ nop /* 89DF7C 802407DC 46800020 */ cvt.s.w $f0, $f0 /* 89DF80 802407E0 4600A03C */ c.lt.s $f20, $f0 -/* 89DF84 802407E4 00000000 */ nop +/* 89DF84 802407E4 00000000 */ nop /* 89DF88 802407E8 4500000F */ bc1f .L80240828 /* 89DF8C 802407EC 0000882D */ daddu $s1, $zero, $zero /* 89DF90 802407F0 860200A6 */ lh $v0, 0xa6($s0) /* 89DF94 802407F4 3C013F00 */ lui $at, 0x3f00 /* 89DF98 802407F8 44811000 */ mtc1 $at, $f2 /* 89DF9C 802407FC 44820000 */ mtc1 $v0, $f0 -/* 89DFA0 80240800 00000000 */ nop +/* 89DFA0 80240800 00000000 */ nop /* 89DFA4 80240804 46800020 */ cvt.s.w $f0, $f0 /* 89DFA8 80240808 46020002 */ mul.s $f0, $f0, $f2 -/* 89DFAC 8024080C 00000000 */ nop +/* 89DFAC 8024080C 00000000 */ nop /* 89DFB0 80240810 4600203C */ c.lt.s $f4, $f0 -/* 89DFB4 80240814 00000000 */ nop +/* 89DFB4 80240814 00000000 */ nop /* 89DFB8 80240818 45000003 */ bc1f .L80240828 /* 89DFBC 8024081C 24020001 */ addiu $v0, $zero, 1 /* 89DFC0 80240820 AE62008C */ sw $v0, 0x8c($s3) @@ -165,16 +165,16 @@ glabel func_802405EC_89DD8C /* 89DFF4 80240854 C6400098 */ lwc1 $f0, 0x98($s2) /* 89DFF8 80240858 46001081 */ sub.s $f2, $f2, $f0 /* 89DFFC 8024085C 46021182 */ mul.s $f6, $f2, $f2 -/* 89E000 80240860 00000000 */ nop +/* 89E000 80240860 00000000 */ nop /* 89E004 80240864 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 89E008 80240868 C6020040 */ lwc1 $f2, 0x40($s0) /* 89E00C 8024086C 46001081 */ sub.s $f2, $f2, $f0 /* 89E010 80240870 46021102 */ mul.s $f4, $f2, $f2 -/* 89E014 80240874 00000000 */ nop +/* 89E014 80240874 00000000 */ nop /* 89E018 80240878 860200A8 */ lh $v0, 0xa8($s0) /* 89E01C 8024087C C602003C */ lwc1 $f2, 0x3c($s0) /* 89E020 80240880 44820000 */ mtc1 $v0, $f0 -/* 89E024 80240884 00000000 */ nop +/* 89E024 80240884 00000000 */ nop /* 89E028 80240888 46800020 */ cvt.s.w $f0, $f0 /* 89E02C 8024088C 46001080 */ add.s $f2, $f2, $f0 /* 89E030 80240890 461A1081 */ sub.s $f2, $f2, $f26 @@ -183,32 +183,32 @@ glabel func_802405EC_89DD8C /* 89E03C 8024089C 46001501 */ sub.s $f20, $f2, $f0 /* 89E040 802408A0 46006004 */ sqrt.s $f0, $f12 /* 89E044 802408A4 46000032 */ c.eq.s $f0, $f0 -/* 89E048 802408A8 00000000 */ nop +/* 89E048 802408A8 00000000 */ nop /* 89E04C 802408AC 45010003 */ bc1t .L802408BC -/* 89E050 802408B0 00000000 */ nop +/* 89E050 802408B0 00000000 */ nop /* 89E054 802408B4 0C0187BC */ jal sqrtf -/* 89E058 802408B8 00000000 */ nop +/* 89E058 802408B8 00000000 */ nop .L802408BC: /* 89E05C 802408BC 4614C03C */ c.lt.s $f24, $f20 -/* 89E060 802408C0 00000000 */ nop +/* 89E060 802408C0 00000000 */ nop /* 89E064 802408C4 45000015 */ bc1f .L8024091C /* 89E068 802408C8 46000106 */ mov.s $f4, $f0 /* 89E06C 802408CC 860200A8 */ lh $v0, 0xa8($s0) /* 89E070 802408D0 44820000 */ mtc1 $v0, $f0 -/* 89E074 802408D4 00000000 */ nop +/* 89E074 802408D4 00000000 */ nop /* 89E078 802408D8 46800020 */ cvt.s.w $f0, $f0 /* 89E07C 802408DC 4600A03C */ c.lt.s $f20, $f0 -/* 89E080 802408E0 00000000 */ nop +/* 89E080 802408E0 00000000 */ nop /* 89E084 802408E4 4500000E */ bc1f .L80240920 /* 89E088 802408E8 26310001 */ addiu $s1, $s1, 1 /* 89E08C 802408EC 860200A6 */ lh $v0, 0xa6($s0) /* 89E090 802408F0 44820000 */ mtc1 $v0, $f0 -/* 89E094 802408F4 00000000 */ nop +/* 89E094 802408F4 00000000 */ nop /* 89E098 802408F8 46800020 */ cvt.s.w $f0, $f0 /* 89E09C 802408FC 46160002 */ mul.s $f0, $f0, $f22 -/* 89E0A0 80240900 00000000 */ nop +/* 89E0A0 80240900 00000000 */ nop /* 89E0A4 80240904 4600203C */ c.lt.s $f4, $f0 -/* 89E0A8 80240908 00000000 */ nop +/* 89E0A8 80240908 00000000 */ nop /* 89E0AC 8024090C 45000004 */ bc1f .L80240920 /* 89E0B0 80240910 24020001 */ addiu $v0, $zero, 1 /* 89E0B4 80240914 0809024B */ j .L8024092C @@ -218,7 +218,7 @@ glabel func_802405EC_89DD8C .L80240920: /* 89E0C0 80240920 2A220040 */ slti $v0, $s1, 0x40 /* 89E0C4 80240924 1440FFC5 */ bnez $v0, .L8024083C -/* 89E0C8 80240928 00000000 */ nop +/* 89E0C8 80240928 00000000 */ nop .L8024092C: /* 89E0CC 8024092C 8FBF0020 */ lw $ra, 0x20($sp) /* 89E0D0 80240930 8FB3001C */ lw $s3, 0x1c($sp) @@ -232,4 +232,4 @@ glabel func_802405EC_89DD8C /* 89E0F0 80240950 24020002 */ addiu $v0, $zero, 2 /* 89E0F4 80240954 03E00008 */ jr $ra /* 89E0F8 80240958 27BD0048 */ addiu $sp, $sp, 0x48 -/* 89E0FC 8024095C 00000000 */ nop +/* 89E0FC 8024095C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_22/89FEC0/func_80240000_89FEC0.s b/asm/nonmatchings/world/area_tik/tik_22/89FEC0/func_80240000_89FEC0.s index a37da8a38d..61e9e233bf 100644 --- a/asm/nonmatchings/world/area_tik/tik_22/89FEC0/func_80240000_89FEC0.s +++ b/asm/nonmatchings/world/area_tik/tik_22/89FEC0/func_80240000_89FEC0.s @@ -11,6 +11,6 @@ glabel func_80240000_89FEC0 /* 89FED8 80240018 24020002 */ addiu $v0, $zero, 2 /* 89FEDC 8024001C 03E00008 */ jr $ra /* 89FEE0 80240020 27BD0018 */ addiu $sp, $sp, 0x18 -/* 89FEE4 80240024 00000000 */ nop -/* 89FEE8 80240028 00000000 */ nop -/* 89FEEC 8024002C 00000000 */ nop +/* 89FEE4 80240024 00000000 */ nop +/* 89FEE8 80240028 00000000 */ nop +/* 89FEEC 8024002C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240370_8A0230.s b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240370_8A0230.s index 3e83bd6b86..58900717d5 100644 --- a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240370_8A0230.s +++ b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240370_8A0230.s @@ -22,16 +22,16 @@ glabel func_80240370_8A0230 /* 8A0270 802403B0 00021023 */ negu $v0, $v0 .L802403B4: /* 8A0274 802403B4 14400003 */ bnez $v0, .L802403C4 -/* 8A0278 802403B8 00000000 */ nop +/* 8A0278 802403B8 00000000 */ nop /* 8A027C 802403BC 50E00017 */ beql $a3, $zero, .L8024041C /* 8A0280 802403C0 0000102D */ daddu $v0, $zero, $zero .L802403C4: /* 8A0284 802403C4 44822000 */ mtc1 $v0, $f4 -/* 8A0288 802403C8 00000000 */ nop +/* 8A0288 802403C8 00000000 */ nop /* 8A028C 802403CC 46802120 */ cvt.s.w $f4, $f4 /* 8A0290 802403D0 44062000 */ mfc1 $a2, $f4 /* 8A0294 802403D4 44872000 */ mtc1 $a3, $f4 -/* 8A0298 802403D8 00000000 */ nop +/* 8A0298 802403D8 00000000 */ nop /* 8A029C 802403DC 46802120 */ cvt.s.w $f4, $f4 /* 8A02A0 802403E0 44806000 */ mtc1 $zero, $f12 /* 8A02A4 802403E4 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240370_8A0230 /* 8A02AC 802403EC 46006386 */ mov.s $f14, $f12 /* 8A02B0 802403F0 3C014270 */ lui $at, 0x4270 /* 8A02B4 802403F4 44811000 */ mtc1 $at, $f2 -/* 8A02B8 802403F8 00000000 */ nop +/* 8A02B8 802403F8 00000000 */ nop /* 8A02BC 802403FC 4602003C */ c.lt.s $f0, $f2 -/* 8A02C0 80240400 00000000 */ nop +/* 8A02C0 80240400 00000000 */ nop /* 8A02C4 80240404 45000004 */ bc1f .L80240418 /* 8A02C8 80240408 24020001 */ addiu $v0, $zero, 1 /* 8A02CC 8024040C AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240640_8A0500.s b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240640_8A0500.s index ef320f7063..c9c6236765 100644 --- a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240640_8A0500.s +++ b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240640_8A0500.s @@ -32,58 +32,58 @@ glabel func_80240640_8A0500 /* 8A056C 802406AC C6400098 */ lwc1 $f0, 0x98($s2) /* 8A0570 802406B0 46001081 */ sub.s $f2, $f2, $f0 /* 8A0574 802406B4 46021182 */ mul.s $f6, $f2, $f2 -/* 8A0578 802406B8 00000000 */ nop +/* 8A0578 802406B8 00000000 */ nop /* 8A057C 802406BC C64000A0 */ lwc1 $f0, 0xa0($s2) /* 8A0580 802406C0 C4620030 */ lwc1 $f2, 0x30($v1) /* 8A0584 802406C4 46001081 */ sub.s $f2, $f2, $f0 /* 8A0588 802406C8 46021102 */ mul.s $f4, $f2, $f2 -/* 8A058C 802406CC 00000000 */ nop +/* 8A058C 802406CC 00000000 */ nop /* 8A0590 802406D0 846200B0 */ lh $v0, 0xb0($v1) /* 8A0594 802406D4 C462002C */ lwc1 $f2, 0x2c($v1) /* 8A0598 802406D8 44820000 */ mtc1 $v0, $f0 -/* 8A059C 802406DC 00000000 */ nop +/* 8A059C 802406DC 00000000 */ nop /* 8A05A0 802406E0 46800020 */ cvt.s.w $f0, $f0 /* 8A05A4 802406E4 46001080 */ add.s $f2, $f2, $f0 /* 8A05A8 802406E8 3C013FC0 */ lui $at, 0x3fc0 /* 8A05AC 802406EC 44810000 */ mtc1 $at, $f0 -/* 8A05B0 802406F0 00000000 */ nop +/* 8A05B0 802406F0 00000000 */ nop /* 8A05B4 802406F4 46001081 */ sub.s $f2, $f2, $f0 /* 8A05B8 802406F8 46043300 */ add.s $f12, $f6, $f4 /* 8A05BC 802406FC C640009C */ lwc1 $f0, 0x9c($s2) /* 8A05C0 80240700 46001501 */ sub.s $f20, $f2, $f0 /* 8A05C4 80240704 46006084 */ sqrt.s $f2, $f12 /* 8A05C8 80240708 46021032 */ c.eq.s $f2, $f2 -/* 8A05CC 8024070C 00000000 */ nop +/* 8A05CC 8024070C 00000000 */ nop /* 8A05D0 80240710 45010004 */ bc1t .L80240724 /* 8A05D4 80240714 0060882D */ daddu $s1, $v1, $zero /* 8A05D8 80240718 0C0187BC */ jal sqrtf -/* 8A05DC 8024071C 00000000 */ nop +/* 8A05DC 8024071C 00000000 */ nop /* 8A05E0 80240720 46000086 */ mov.s $f2, $f0 .L80240724: /* 8A05E4 80240724 44800000 */ mtc1 $zero, $f0 -/* 8A05E8 80240728 00000000 */ nop +/* 8A05E8 80240728 00000000 */ nop /* 8A05EC 8024072C 4614003C */ c.lt.s $f0, $f20 -/* 8A05F0 80240730 00000000 */ nop +/* 8A05F0 80240730 00000000 */ nop /* 8A05F4 80240734 45000016 */ bc1f .L80240790 /* 8A05F8 80240738 46001106 */ mov.s $f4, $f2 /* 8A05FC 8024073C 862200B0 */ lh $v0, 0xb0($s1) /* 8A0600 80240740 44820000 */ mtc1 $v0, $f0 -/* 8A0604 80240744 00000000 */ nop +/* 8A0604 80240744 00000000 */ nop /* 8A0608 80240748 46800020 */ cvt.s.w $f0, $f0 /* 8A060C 8024074C 4600A03C */ c.lt.s $f20, $f0 -/* 8A0610 80240750 00000000 */ nop +/* 8A0610 80240750 00000000 */ nop /* 8A0614 80240754 4500000E */ bc1f .L80240790 -/* 8A0618 80240758 00000000 */ nop +/* 8A0618 80240758 00000000 */ nop /* 8A061C 8024075C 862200B2 */ lh $v0, 0xb2($s1) /* 8A0620 80240760 3C013F00 */ lui $at, 0x3f00 /* 8A0624 80240764 44811000 */ mtc1 $at, $f2 /* 8A0628 80240768 44820000 */ mtc1 $v0, $f0 -/* 8A062C 8024076C 00000000 */ nop +/* 8A062C 8024076C 00000000 */ nop /* 8A0630 80240770 46800020 */ cvt.s.w $f0, $f0 /* 8A0634 80240774 46020002 */ mul.s $f0, $f0, $f2 -/* 8A0638 80240778 00000000 */ nop +/* 8A0638 80240778 00000000 */ nop /* 8A063C 8024077C 4600203C */ c.lt.s $f4, $f0 -/* 8A0640 80240780 00000000 */ nop +/* 8A0640 80240780 00000000 */ nop /* 8A0644 80240784 45000002 */ bc1f .L80240790 /* 8A0648 80240788 24020001 */ addiu $v0, $zero, 1 /* 8A064C 8024078C AE62008C */ sw $v0, 0x8c($s3) @@ -92,58 +92,58 @@ glabel func_80240640_8A0500 /* 8A0654 80240794 C6400098 */ lwc1 $f0, 0x98($s2) /* 8A0658 80240798 46001081 */ sub.s $f2, $f2, $f0 /* 8A065C 8024079C 46021182 */ mul.s $f6, $f2, $f2 -/* 8A0660 802407A0 00000000 */ nop +/* 8A0660 802407A0 00000000 */ nop /* 8A0664 802407A4 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 8A0668 802407A8 C6020040 */ lwc1 $f2, 0x40($s0) /* 8A066C 802407AC 46001081 */ sub.s $f2, $f2, $f0 /* 8A0670 802407B0 46021102 */ mul.s $f4, $f2, $f2 -/* 8A0674 802407B4 00000000 */ nop +/* 8A0674 802407B4 00000000 */ nop /* 8A0678 802407B8 860200A8 */ lh $v0, 0xa8($s0) /* 8A067C 802407BC C602003C */ lwc1 $f2, 0x3c($s0) /* 8A0680 802407C0 44820000 */ mtc1 $v0, $f0 -/* 8A0684 802407C4 00000000 */ nop +/* 8A0684 802407C4 00000000 */ nop /* 8A0688 802407C8 46800020 */ cvt.s.w $f0, $f0 /* 8A068C 802407CC 46001080 */ add.s $f2, $f2, $f0 /* 8A0690 802407D0 3C013FC0 */ lui $at, 0x3fc0 /* 8A0694 802407D4 44810000 */ mtc1 $at, $f0 -/* 8A0698 802407D8 00000000 */ nop +/* 8A0698 802407D8 00000000 */ nop /* 8A069C 802407DC 46001081 */ sub.s $f2, $f2, $f0 /* 8A06A0 802407E0 46043300 */ add.s $f12, $f6, $f4 /* 8A06A4 802407E4 C640009C */ lwc1 $f0, 0x9c($s2) /* 8A06A8 802407E8 46001501 */ sub.s $f20, $f2, $f0 /* 8A06AC 802407EC 46006084 */ sqrt.s $f2, $f12 /* 8A06B0 802407F0 46021032 */ c.eq.s $f2, $f2 -/* 8A06B4 802407F4 00000000 */ nop +/* 8A06B4 802407F4 00000000 */ nop /* 8A06B8 802407F8 45010004 */ bc1t .L8024080C -/* 8A06BC 802407FC 00000000 */ nop +/* 8A06BC 802407FC 00000000 */ nop /* 8A06C0 80240800 0C0187BC */ jal sqrtf -/* 8A06C4 80240804 00000000 */ nop +/* 8A06C4 80240804 00000000 */ nop /* 8A06C8 80240808 46000086 */ mov.s $f2, $f0 .L8024080C: /* 8A06CC 8024080C 44800000 */ mtc1 $zero, $f0 -/* 8A06D0 80240810 00000000 */ nop +/* 8A06D0 80240810 00000000 */ nop /* 8A06D4 80240814 4614003C */ c.lt.s $f0, $f20 -/* 8A06D8 80240818 00000000 */ nop +/* 8A06D8 80240818 00000000 */ nop /* 8A06DC 8024081C 45000016 */ bc1f .L80240878 /* 8A06E0 80240820 46001106 */ mov.s $f4, $f2 /* 8A06E4 80240824 860200A8 */ lh $v0, 0xa8($s0) /* 8A06E8 80240828 44820000 */ mtc1 $v0, $f0 -/* 8A06EC 8024082C 00000000 */ nop +/* 8A06EC 8024082C 00000000 */ nop /* 8A06F0 80240830 46800020 */ cvt.s.w $f0, $f0 /* 8A06F4 80240834 4600A03C */ c.lt.s $f20, $f0 -/* 8A06F8 80240838 00000000 */ nop +/* 8A06F8 80240838 00000000 */ nop /* 8A06FC 8024083C 4500000F */ bc1f .L8024087C /* 8A0700 80240840 0000882D */ daddu $s1, $zero, $zero /* 8A0704 80240844 860200A6 */ lh $v0, 0xa6($s0) /* 8A0708 80240848 3C013F00 */ lui $at, 0x3f00 /* 8A070C 8024084C 44811000 */ mtc1 $at, $f2 /* 8A0710 80240850 44820000 */ mtc1 $v0, $f0 -/* 8A0714 80240854 00000000 */ nop +/* 8A0714 80240854 00000000 */ nop /* 8A0718 80240858 46800020 */ cvt.s.w $f0, $f0 /* 8A071C 8024085C 46020002 */ mul.s $f0, $f0, $f2 -/* 8A0720 80240860 00000000 */ nop +/* 8A0720 80240860 00000000 */ nop /* 8A0724 80240864 4600203C */ c.lt.s $f4, $f0 -/* 8A0728 80240868 00000000 */ nop +/* 8A0728 80240868 00000000 */ nop /* 8A072C 8024086C 45000003 */ bc1f .L8024087C /* 8A0730 80240870 24020001 */ addiu $v0, $zero, 1 /* 8A0734 80240874 AE62008C */ sw $v0, 0x8c($s3) @@ -165,16 +165,16 @@ glabel func_80240640_8A0500 /* 8A0768 802408A8 C6400098 */ lwc1 $f0, 0x98($s2) /* 8A076C 802408AC 46001081 */ sub.s $f2, $f2, $f0 /* 8A0770 802408B0 46021182 */ mul.s $f6, $f2, $f2 -/* 8A0774 802408B4 00000000 */ nop +/* 8A0774 802408B4 00000000 */ nop /* 8A0778 802408B8 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 8A077C 802408BC C6020040 */ lwc1 $f2, 0x40($s0) /* 8A0780 802408C0 46001081 */ sub.s $f2, $f2, $f0 /* 8A0784 802408C4 46021102 */ mul.s $f4, $f2, $f2 -/* 8A0788 802408C8 00000000 */ nop +/* 8A0788 802408C8 00000000 */ nop /* 8A078C 802408CC 860200A8 */ lh $v0, 0xa8($s0) /* 8A0790 802408D0 C602003C */ lwc1 $f2, 0x3c($s0) /* 8A0794 802408D4 44820000 */ mtc1 $v0, $f0 -/* 8A0798 802408D8 00000000 */ nop +/* 8A0798 802408D8 00000000 */ nop /* 8A079C 802408DC 46800020 */ cvt.s.w $f0, $f0 /* 8A07A0 802408E0 46001080 */ add.s $f2, $f2, $f0 /* 8A07A4 802408E4 461A1081 */ sub.s $f2, $f2, $f26 @@ -183,32 +183,32 @@ glabel func_80240640_8A0500 /* 8A07B0 802408F0 46001501 */ sub.s $f20, $f2, $f0 /* 8A07B4 802408F4 46006004 */ sqrt.s $f0, $f12 /* 8A07B8 802408F8 46000032 */ c.eq.s $f0, $f0 -/* 8A07BC 802408FC 00000000 */ nop +/* 8A07BC 802408FC 00000000 */ nop /* 8A07C0 80240900 45010003 */ bc1t .L80240910 -/* 8A07C4 80240904 00000000 */ nop +/* 8A07C4 80240904 00000000 */ nop /* 8A07C8 80240908 0C0187BC */ jal sqrtf -/* 8A07CC 8024090C 00000000 */ nop +/* 8A07CC 8024090C 00000000 */ nop .L80240910: /* 8A07D0 80240910 4614C03C */ c.lt.s $f24, $f20 -/* 8A07D4 80240914 00000000 */ nop +/* 8A07D4 80240914 00000000 */ nop /* 8A07D8 80240918 45000015 */ bc1f .L80240970 /* 8A07DC 8024091C 46000106 */ mov.s $f4, $f0 /* 8A07E0 80240920 860200A8 */ lh $v0, 0xa8($s0) /* 8A07E4 80240924 44820000 */ mtc1 $v0, $f0 -/* 8A07E8 80240928 00000000 */ nop +/* 8A07E8 80240928 00000000 */ nop /* 8A07EC 8024092C 46800020 */ cvt.s.w $f0, $f0 /* 8A07F0 80240930 4600A03C */ c.lt.s $f20, $f0 -/* 8A07F4 80240934 00000000 */ nop +/* 8A07F4 80240934 00000000 */ nop /* 8A07F8 80240938 4500000E */ bc1f .L80240974 /* 8A07FC 8024093C 26310001 */ addiu $s1, $s1, 1 /* 8A0800 80240940 860200A6 */ lh $v0, 0xa6($s0) /* 8A0804 80240944 44820000 */ mtc1 $v0, $f0 -/* 8A0808 80240948 00000000 */ nop +/* 8A0808 80240948 00000000 */ nop /* 8A080C 8024094C 46800020 */ cvt.s.w $f0, $f0 /* 8A0810 80240950 46160002 */ mul.s $f0, $f0, $f22 -/* 8A0814 80240954 00000000 */ nop +/* 8A0814 80240954 00000000 */ nop /* 8A0818 80240958 4600203C */ c.lt.s $f4, $f0 -/* 8A081C 8024095C 00000000 */ nop +/* 8A081C 8024095C 00000000 */ nop /* 8A0820 80240960 45000004 */ bc1f .L80240974 /* 8A0824 80240964 24020001 */ addiu $v0, $zero, 1 /* 8A0828 80240968 08090260 */ j .L80240980 @@ -218,7 +218,7 @@ glabel func_80240640_8A0500 .L80240974: /* 8A0834 80240974 2A220040 */ slti $v0, $s1, 0x40 /* 8A0838 80240978 1440FFC5 */ bnez $v0, .L80240890 -/* 8A083C 8024097C 00000000 */ nop +/* 8A083C 8024097C 00000000 */ nop .L80240980: /* 8A0840 80240980 8FBF0020 */ lw $ra, 0x20($sp) /* 8A0844 80240984 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_80240034_8A2404.s b/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_80240034_8A2404.s index 86c70c6e70..ff5056d83c 100644 --- a/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_80240034_8A2404.s +++ b/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_80240034_8A2404.s @@ -22,16 +22,16 @@ glabel func_80240034_8A2404 /* 8A2444 80240074 00021023 */ negu $v0, $v0 .L80240078: /* 8A2448 80240078 14400003 */ bnez $v0, .L80240088 -/* 8A244C 8024007C 00000000 */ nop +/* 8A244C 8024007C 00000000 */ nop /* 8A2450 80240080 50E00017 */ beql $a3, $zero, .L802400E0 /* 8A2454 80240084 0000102D */ daddu $v0, $zero, $zero .L80240088: /* 8A2458 80240088 44822000 */ mtc1 $v0, $f4 -/* 8A245C 8024008C 00000000 */ nop +/* 8A245C 8024008C 00000000 */ nop /* 8A2460 80240090 46802120 */ cvt.s.w $f4, $f4 /* 8A2464 80240094 44062000 */ mfc1 $a2, $f4 /* 8A2468 80240098 44872000 */ mtc1 $a3, $f4 -/* 8A246C 8024009C 00000000 */ nop +/* 8A246C 8024009C 00000000 */ nop /* 8A2470 802400A0 46802120 */ cvt.s.w $f4, $f4 /* 8A2474 802400A4 44806000 */ mtc1 $zero, $f12 /* 8A2478 802400A8 44072000 */ mfc1 $a3, $f4 @@ -39,9 +39,9 @@ glabel func_80240034_8A2404 /* 8A2480 802400B0 46006386 */ mov.s $f14, $f12 /* 8A2484 802400B4 3C014270 */ lui $at, 0x4270 /* 8A2488 802400B8 44811000 */ mtc1 $at, $f2 -/* 8A248C 802400BC 00000000 */ nop +/* 8A248C 802400BC 00000000 */ nop /* 8A2490 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 8A2494 802400C4 00000000 */ nop +/* 8A2494 802400C4 00000000 */ nop /* 8A2498 802400C8 45000004 */ bc1f .L802400DC /* 8A249C 802400CC 24020001 */ addiu $v0, $zero, 1 /* 8A24A0 802400D0 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_802405EC_8A29BC.s b/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_802405EC_8A29BC.s index 8fa57fa9fe..b463e9b77b 100644 --- a/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_802405EC_8A29BC.s +++ b/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_802405EC_8A29BC.s @@ -32,58 +32,58 @@ glabel func_802405EC_8A29BC /* 8A2A28 80240658 C6400098 */ lwc1 $f0, 0x98($s2) /* 8A2A2C 8024065C 46001081 */ sub.s $f2, $f2, $f0 /* 8A2A30 80240660 46021182 */ mul.s $f6, $f2, $f2 -/* 8A2A34 80240664 00000000 */ nop +/* 8A2A34 80240664 00000000 */ nop /* 8A2A38 80240668 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 8A2A3C 8024066C C4620030 */ lwc1 $f2, 0x30($v1) /* 8A2A40 80240670 46001081 */ sub.s $f2, $f2, $f0 /* 8A2A44 80240674 46021102 */ mul.s $f4, $f2, $f2 -/* 8A2A48 80240678 00000000 */ nop +/* 8A2A48 80240678 00000000 */ nop /* 8A2A4C 8024067C 846200B0 */ lh $v0, 0xb0($v1) /* 8A2A50 80240680 C462002C */ lwc1 $f2, 0x2c($v1) /* 8A2A54 80240684 44820000 */ mtc1 $v0, $f0 -/* 8A2A58 80240688 00000000 */ nop +/* 8A2A58 80240688 00000000 */ nop /* 8A2A5C 8024068C 46800020 */ cvt.s.w $f0, $f0 /* 8A2A60 80240690 46001080 */ add.s $f2, $f2, $f0 /* 8A2A64 80240694 3C013FC0 */ lui $at, 0x3fc0 /* 8A2A68 80240698 44810000 */ mtc1 $at, $f0 -/* 8A2A6C 8024069C 00000000 */ nop +/* 8A2A6C 8024069C 00000000 */ nop /* 8A2A70 802406A0 46001081 */ sub.s $f2, $f2, $f0 /* 8A2A74 802406A4 46043300 */ add.s $f12, $f6, $f4 /* 8A2A78 802406A8 C640009C */ lwc1 $f0, 0x9c($s2) /* 8A2A7C 802406AC 46001501 */ sub.s $f20, $f2, $f0 /* 8A2A80 802406B0 46006084 */ sqrt.s $f2, $f12 /* 8A2A84 802406B4 46021032 */ c.eq.s $f2, $f2 -/* 8A2A88 802406B8 00000000 */ nop +/* 8A2A88 802406B8 00000000 */ nop /* 8A2A8C 802406BC 45010004 */ bc1t .L802406D0 /* 8A2A90 802406C0 0060882D */ daddu $s1, $v1, $zero /* 8A2A94 802406C4 0C0187BC */ jal sqrtf -/* 8A2A98 802406C8 00000000 */ nop +/* 8A2A98 802406C8 00000000 */ nop /* 8A2A9C 802406CC 46000086 */ mov.s $f2, $f0 .L802406D0: /* 8A2AA0 802406D0 44800000 */ mtc1 $zero, $f0 -/* 8A2AA4 802406D4 00000000 */ nop +/* 8A2AA4 802406D4 00000000 */ nop /* 8A2AA8 802406D8 4614003C */ c.lt.s $f0, $f20 -/* 8A2AAC 802406DC 00000000 */ nop +/* 8A2AAC 802406DC 00000000 */ nop /* 8A2AB0 802406E0 45000016 */ bc1f .L8024073C /* 8A2AB4 802406E4 46001106 */ mov.s $f4, $f2 /* 8A2AB8 802406E8 862200B0 */ lh $v0, 0xb0($s1) /* 8A2ABC 802406EC 44820000 */ mtc1 $v0, $f0 -/* 8A2AC0 802406F0 00000000 */ nop +/* 8A2AC0 802406F0 00000000 */ nop /* 8A2AC4 802406F4 46800020 */ cvt.s.w $f0, $f0 /* 8A2AC8 802406F8 4600A03C */ c.lt.s $f20, $f0 -/* 8A2ACC 802406FC 00000000 */ nop +/* 8A2ACC 802406FC 00000000 */ nop /* 8A2AD0 80240700 4500000E */ bc1f .L8024073C -/* 8A2AD4 80240704 00000000 */ nop +/* 8A2AD4 80240704 00000000 */ nop /* 8A2AD8 80240708 862200B2 */ lh $v0, 0xb2($s1) /* 8A2ADC 8024070C 3C013F00 */ lui $at, 0x3f00 /* 8A2AE0 80240710 44811000 */ mtc1 $at, $f2 /* 8A2AE4 80240714 44820000 */ mtc1 $v0, $f0 -/* 8A2AE8 80240718 00000000 */ nop +/* 8A2AE8 80240718 00000000 */ nop /* 8A2AEC 8024071C 46800020 */ cvt.s.w $f0, $f0 /* 8A2AF0 80240720 46020002 */ mul.s $f0, $f0, $f2 -/* 8A2AF4 80240724 00000000 */ nop +/* 8A2AF4 80240724 00000000 */ nop /* 8A2AF8 80240728 4600203C */ c.lt.s $f4, $f0 -/* 8A2AFC 8024072C 00000000 */ nop +/* 8A2AFC 8024072C 00000000 */ nop /* 8A2B00 80240730 45000002 */ bc1f .L8024073C /* 8A2B04 80240734 24020001 */ addiu $v0, $zero, 1 /* 8A2B08 80240738 AE62008C */ sw $v0, 0x8c($s3) @@ -92,58 +92,58 @@ glabel func_802405EC_8A29BC /* 8A2B10 80240740 C6400098 */ lwc1 $f0, 0x98($s2) /* 8A2B14 80240744 46001081 */ sub.s $f2, $f2, $f0 /* 8A2B18 80240748 46021182 */ mul.s $f6, $f2, $f2 -/* 8A2B1C 8024074C 00000000 */ nop +/* 8A2B1C 8024074C 00000000 */ nop /* 8A2B20 80240750 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 8A2B24 80240754 C6020040 */ lwc1 $f2, 0x40($s0) /* 8A2B28 80240758 46001081 */ sub.s $f2, $f2, $f0 /* 8A2B2C 8024075C 46021102 */ mul.s $f4, $f2, $f2 -/* 8A2B30 80240760 00000000 */ nop +/* 8A2B30 80240760 00000000 */ nop /* 8A2B34 80240764 860200A8 */ lh $v0, 0xa8($s0) /* 8A2B38 80240768 C602003C */ lwc1 $f2, 0x3c($s0) /* 8A2B3C 8024076C 44820000 */ mtc1 $v0, $f0 -/* 8A2B40 80240770 00000000 */ nop +/* 8A2B40 80240770 00000000 */ nop /* 8A2B44 80240774 46800020 */ cvt.s.w $f0, $f0 /* 8A2B48 80240778 46001080 */ add.s $f2, $f2, $f0 /* 8A2B4C 8024077C 3C013FC0 */ lui $at, 0x3fc0 /* 8A2B50 80240780 44810000 */ mtc1 $at, $f0 -/* 8A2B54 80240784 00000000 */ nop +/* 8A2B54 80240784 00000000 */ nop /* 8A2B58 80240788 46001081 */ sub.s $f2, $f2, $f0 /* 8A2B5C 8024078C 46043300 */ add.s $f12, $f6, $f4 /* 8A2B60 80240790 C640009C */ lwc1 $f0, 0x9c($s2) /* 8A2B64 80240794 46001501 */ sub.s $f20, $f2, $f0 /* 8A2B68 80240798 46006084 */ sqrt.s $f2, $f12 /* 8A2B6C 8024079C 46021032 */ c.eq.s $f2, $f2 -/* 8A2B70 802407A0 00000000 */ nop +/* 8A2B70 802407A0 00000000 */ nop /* 8A2B74 802407A4 45010004 */ bc1t .L802407B8 -/* 8A2B78 802407A8 00000000 */ nop +/* 8A2B78 802407A8 00000000 */ nop /* 8A2B7C 802407AC 0C0187BC */ jal sqrtf -/* 8A2B80 802407B0 00000000 */ nop +/* 8A2B80 802407B0 00000000 */ nop /* 8A2B84 802407B4 46000086 */ mov.s $f2, $f0 .L802407B8: /* 8A2B88 802407B8 44800000 */ mtc1 $zero, $f0 -/* 8A2B8C 802407BC 00000000 */ nop +/* 8A2B8C 802407BC 00000000 */ nop /* 8A2B90 802407C0 4614003C */ c.lt.s $f0, $f20 -/* 8A2B94 802407C4 00000000 */ nop +/* 8A2B94 802407C4 00000000 */ nop /* 8A2B98 802407C8 45000016 */ bc1f .L80240824 /* 8A2B9C 802407CC 46001106 */ mov.s $f4, $f2 /* 8A2BA0 802407D0 860200A8 */ lh $v0, 0xa8($s0) /* 8A2BA4 802407D4 44820000 */ mtc1 $v0, $f0 -/* 8A2BA8 802407D8 00000000 */ nop +/* 8A2BA8 802407D8 00000000 */ nop /* 8A2BAC 802407DC 46800020 */ cvt.s.w $f0, $f0 /* 8A2BB0 802407E0 4600A03C */ c.lt.s $f20, $f0 -/* 8A2BB4 802407E4 00000000 */ nop +/* 8A2BB4 802407E4 00000000 */ nop /* 8A2BB8 802407E8 4500000F */ bc1f .L80240828 /* 8A2BBC 802407EC 0000882D */ daddu $s1, $zero, $zero /* 8A2BC0 802407F0 860200A6 */ lh $v0, 0xa6($s0) /* 8A2BC4 802407F4 3C013F00 */ lui $at, 0x3f00 /* 8A2BC8 802407F8 44811000 */ mtc1 $at, $f2 /* 8A2BCC 802407FC 44820000 */ mtc1 $v0, $f0 -/* 8A2BD0 80240800 00000000 */ nop +/* 8A2BD0 80240800 00000000 */ nop /* 8A2BD4 80240804 46800020 */ cvt.s.w $f0, $f0 /* 8A2BD8 80240808 46020002 */ mul.s $f0, $f0, $f2 -/* 8A2BDC 8024080C 00000000 */ nop +/* 8A2BDC 8024080C 00000000 */ nop /* 8A2BE0 80240810 4600203C */ c.lt.s $f4, $f0 -/* 8A2BE4 80240814 00000000 */ nop +/* 8A2BE4 80240814 00000000 */ nop /* 8A2BE8 80240818 45000003 */ bc1f .L80240828 /* 8A2BEC 8024081C 24020001 */ addiu $v0, $zero, 1 /* 8A2BF0 80240820 AE62008C */ sw $v0, 0x8c($s3) @@ -165,16 +165,16 @@ glabel func_802405EC_8A29BC /* 8A2C24 80240854 C6400098 */ lwc1 $f0, 0x98($s2) /* 8A2C28 80240858 46001081 */ sub.s $f2, $f2, $f0 /* 8A2C2C 8024085C 46021182 */ mul.s $f6, $f2, $f2 -/* 8A2C30 80240860 00000000 */ nop +/* 8A2C30 80240860 00000000 */ nop /* 8A2C34 80240864 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 8A2C38 80240868 C6020040 */ lwc1 $f2, 0x40($s0) /* 8A2C3C 8024086C 46001081 */ sub.s $f2, $f2, $f0 /* 8A2C40 80240870 46021102 */ mul.s $f4, $f2, $f2 -/* 8A2C44 80240874 00000000 */ nop +/* 8A2C44 80240874 00000000 */ nop /* 8A2C48 80240878 860200A8 */ lh $v0, 0xa8($s0) /* 8A2C4C 8024087C C602003C */ lwc1 $f2, 0x3c($s0) /* 8A2C50 80240880 44820000 */ mtc1 $v0, $f0 -/* 8A2C54 80240884 00000000 */ nop +/* 8A2C54 80240884 00000000 */ nop /* 8A2C58 80240888 46800020 */ cvt.s.w $f0, $f0 /* 8A2C5C 8024088C 46001080 */ add.s $f2, $f2, $f0 /* 8A2C60 80240890 461A1081 */ sub.s $f2, $f2, $f26 @@ -183,32 +183,32 @@ glabel func_802405EC_8A29BC /* 8A2C6C 8024089C 46001501 */ sub.s $f20, $f2, $f0 /* 8A2C70 802408A0 46006004 */ sqrt.s $f0, $f12 /* 8A2C74 802408A4 46000032 */ c.eq.s $f0, $f0 -/* 8A2C78 802408A8 00000000 */ nop +/* 8A2C78 802408A8 00000000 */ nop /* 8A2C7C 802408AC 45010003 */ bc1t .L802408BC -/* 8A2C80 802408B0 00000000 */ nop +/* 8A2C80 802408B0 00000000 */ nop /* 8A2C84 802408B4 0C0187BC */ jal sqrtf -/* 8A2C88 802408B8 00000000 */ nop +/* 8A2C88 802408B8 00000000 */ nop .L802408BC: /* 8A2C8C 802408BC 4614C03C */ c.lt.s $f24, $f20 -/* 8A2C90 802408C0 00000000 */ nop +/* 8A2C90 802408C0 00000000 */ nop /* 8A2C94 802408C4 45000015 */ bc1f .L8024091C /* 8A2C98 802408C8 46000106 */ mov.s $f4, $f0 /* 8A2C9C 802408CC 860200A8 */ lh $v0, 0xa8($s0) /* 8A2CA0 802408D0 44820000 */ mtc1 $v0, $f0 -/* 8A2CA4 802408D4 00000000 */ nop +/* 8A2CA4 802408D4 00000000 */ nop /* 8A2CA8 802408D8 46800020 */ cvt.s.w $f0, $f0 /* 8A2CAC 802408DC 4600A03C */ c.lt.s $f20, $f0 -/* 8A2CB0 802408E0 00000000 */ nop +/* 8A2CB0 802408E0 00000000 */ nop /* 8A2CB4 802408E4 4500000E */ bc1f .L80240920 /* 8A2CB8 802408E8 26310001 */ addiu $s1, $s1, 1 /* 8A2CBC 802408EC 860200A6 */ lh $v0, 0xa6($s0) /* 8A2CC0 802408F0 44820000 */ mtc1 $v0, $f0 -/* 8A2CC4 802408F4 00000000 */ nop +/* 8A2CC4 802408F4 00000000 */ nop /* 8A2CC8 802408F8 46800020 */ cvt.s.w $f0, $f0 /* 8A2CCC 802408FC 46160002 */ mul.s $f0, $f0, $f22 -/* 8A2CD0 80240900 00000000 */ nop +/* 8A2CD0 80240900 00000000 */ nop /* 8A2CD4 80240904 4600203C */ c.lt.s $f4, $f0 -/* 8A2CD8 80240908 00000000 */ nop +/* 8A2CD8 80240908 00000000 */ nop /* 8A2CDC 8024090C 45000004 */ bc1f .L80240920 /* 8A2CE0 80240910 24020001 */ addiu $v0, $zero, 1 /* 8A2CE4 80240914 0809024B */ j .L8024092C @@ -218,7 +218,7 @@ glabel func_802405EC_8A29BC .L80240920: /* 8A2CF0 80240920 2A220040 */ slti $v0, $s1, 0x40 /* 8A2CF4 80240924 1440FFC5 */ bnez $v0, .L8024083C -/* 8A2CF8 80240928 00000000 */ nop +/* 8A2CF8 80240928 00000000 */ nop .L8024092C: /* 8A2CFC 8024092C 8FBF0020 */ lw $ra, 0x20($sp) /* 8A2D00 80240930 8FB3001C */ lw $s3, 0x1c($sp) @@ -232,4 +232,4 @@ glabel func_802405EC_8A29BC /* 8A2D20 80240950 24020002 */ addiu $v0, $zero, 2 /* 8A2D24 80240954 03E00008 */ jr $ra /* 8A2D28 80240958 27BD0048 */ addiu $sp, $sp, 0x48 -/* 8A2D2C 8024095C 00000000 */ nop +/* 8A2D2C 8024095C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_802409DC_8A2DAC.s b/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_802409DC_8A2DAC.s index 4adace309a..e03ce6360a 100644 --- a/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_802409DC_8A2DAC.s +++ b/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_802409DC_8A2DAC.s @@ -21,11 +21,11 @@ glabel func_802409DC_8A2DAC /* 8A2DEC 80240A1C A602008E */ sh $v0, 0x8e($s0) /* 8A2DF0 80240A20 00021400 */ sll $v0, $v0, 0x10 /* 8A2DF4 80240A24 1C400033 */ bgtz $v0, .L80240AF4 -/* 8A2DF8 80240A28 00000000 */ nop +/* 8A2DF8 80240A28 00000000 */ nop .L80240A2C: /* 8A2DFC 80240A2C 8602008C */ lh $v0, 0x8c($s0) /* 8A2E00 80240A30 14400030 */ bnez $v0, .L80240AF4 -/* 8A2E04 80240A34 00000000 */ nop +/* 8A2E04 80240A34 00000000 */ nop /* 8A2E08 80240A38 8E2200CC */ lw $v0, 0xcc($s1) /* 8A2E0C 80240A3C 8C420024 */ lw $v0, 0x24($v0) /* 8A2E10 80240A40 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_802409DC_8A2DAC /* 8A2E1C 80240A4C 8E230088 */ lw $v1, 0x88($s1) /* 8A2E20 80240A50 24020005 */ addiu $v0, $zero, 5 /* 8A2E24 80240A54 10620005 */ beq $v1, $v0, .L80240A6C -/* 8A2E28 80240A58 00000000 */ nop +/* 8A2E28 80240A58 00000000 */ nop /* 8A2E2C 80240A5C 10600003 */ beqz $v1, .L80240A6C /* 8A2E30 80240A60 24020001 */ addiu $v0, $zero, 1 /* 8A2E34 80240A64 14620006 */ bne $v1, $v0, .L80240A80 -/* 8A2E38 80240A68 00000000 */ nop +/* 8A2E38 80240A68 00000000 */ nop .L80240A6C: /* 8A2E3C 80240A6C 8E220084 */ lw $v0, 0x84($s1) /* 8A2E40 80240A70 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_802409DC_8A2DAC /* 8A2E80 80240AB0 46220000 */ add.d $f0, $f0, $f2 /* 8A2E84 80240AB4 4620010D */ trunc.w.d $f4, $f0 /* 8A2E88 80240AB8 44022000 */ mfc1 $v0, $f4 -/* 8A2E8C 80240ABC 00000000 */ nop +/* 8A2E8C 80240ABC 00000000 */ nop /* 8A2E90 80240AC0 A602008E */ sh $v0, 0x8e($s0) /* 8A2E94 80240AC4 00021400 */ sll $v0, $v0, 0x10 /* 8A2E98 80240AC8 8E230078 */ lw $v1, 0x78($s1) /* 8A2E9C 80240ACC 00021403 */ sra $v0, $v0, 0x10 /* 8A2EA0 80240AD0 0043102A */ slt $v0, $v0, $v1 /* 8A2EA4 80240AD4 10400003 */ beqz $v0, .L80240AE4 -/* 8A2EA8 80240AD8 00000000 */ nop +/* 8A2EA8 80240AD8 00000000 */ nop /* 8A2EAC 80240ADC 9622007A */ lhu $v0, 0x7a($s1) /* 8A2EB0 80240AE0 A602008E */ sh $v0, 0x8e($s0) .L80240AE4: diff --git a/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s b/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s index b56fe0495d..dff66ab8a9 100644 --- a/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s +++ b/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s @@ -279,15 +279,17 @@ glabel func_80240CF4_8A30C4 /* 8A34B0 802410E0 2C620015 */ sltiu $v0, $v1, 0x15 /* 8A34B4 802410E4 10400009 */ beqz $v0, .L8024110C /* 8A34B8 802410E8 00031080 */ sll $v0, $v1, 2 -/* 8A34BC 802410EC 3C018024 */ lui $at, %hi(D_80243658) +/* 8A34BC 802410EC 3C018024 */ lui $at, %hi(jtbl_80243658_8A5A28) /* 8A34C0 802410F0 00220821 */ addu $at, $at, $v0 -/* 8A34C4 802410F4 8C223658 */ lw $v0, %lo(D_80243658)($at) +/* 8A34C4 802410F4 8C223658 */ lw $v0, %lo(jtbl_80243658_8A5A28)($at) /* 8A34C8 802410F8 00400008 */ jr $v0 /* 8A34CC 802410FC 00000000 */ nop +glabel L80241100_8A34D0 /* 8A34D0 80241100 8E420028 */ lw $v0, 0x28($s2) /* 8A34D4 80241104 24420001 */ addiu $v0, $v0, 1 /* 8A34D8 80241108 AE420028 */ sw $v0, 0x28($s2) .L8024110C: +glabel L8024110C_8A34DC /* 8A34DC 8024110C 0000102D */ daddu $v0, $zero, $zero .L80241110: /* 8A34E0 80241110 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5A80/func_80240000_8A5A80.s b/asm/nonmatchings/world/area_tik/tik_24/8A5A80/func_80240000_8A5A80.s index eb1b82d75d..0dde6dba4b 100644 --- a/asm/nonmatchings/world/area_tik/tik_24/8A5A80/func_80240000_8A5A80.s +++ b/asm/nonmatchings/world/area_tik/tik_24/8A5A80/func_80240000_8A5A80.s @@ -9,7 +9,7 @@ glabel func_80240000_8A5A80 /* 8A5A90 80240010 24A52470 */ addiu $a1, $a1, %lo(D_80242470) /* 8A5A94 80240014 AFBF0010 */ sw $ra, 0x10($sp) /* 8A5A98 80240018 0C01953C */ jal sprintf -/* 8A5A9C 8024001C 00000000 */ nop +/* 8A5A9C 8024001C 00000000 */ nop /* 8A5AA0 80240020 3C04800E */ lui $a0, %hi(D_800D91E0) /* 8A5AA4 80240024 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) /* 8A5AA8 80240028 3C058024 */ lui $a1, %hi(D_80242480) @@ -19,6 +19,6 @@ glabel func_80240000_8A5A80 /* 8A5AB8 80240038 0000102D */ daddu $v0, $zero, $zero /* 8A5ABC 8024003C 03E00008 */ jr $ra /* 8A5AC0 80240040 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8A5AC4 80240044 00000000 */ nop -/* 8A5AC8 80240048 00000000 */ nop -/* 8A5ACC 8024004C 00000000 */ nop +/* 8A5AC4 80240044 00000000 */ nop +/* 8A5AC8 80240048 00000000 */ nop +/* 8A5ACC 8024004C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240360_8A5DE0.s b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240360_8A5DE0.s index aa5dcb47fc..c1098d1b86 100644 --- a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240360_8A5DE0.s +++ b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240360_8A5DE0.s @@ -32,58 +32,58 @@ glabel func_80240360_8A5DE0 /* 8A5E4C 802403CC C6400098 */ lwc1 $f0, 0x98($s2) /* 8A5E50 802403D0 46001081 */ sub.s $f2, $f2, $f0 /* 8A5E54 802403D4 46021182 */ mul.s $f6, $f2, $f2 -/* 8A5E58 802403D8 00000000 */ nop +/* 8A5E58 802403D8 00000000 */ nop /* 8A5E5C 802403DC C64000A0 */ lwc1 $f0, 0xa0($s2) /* 8A5E60 802403E0 C4620030 */ lwc1 $f2, 0x30($v1) /* 8A5E64 802403E4 46001081 */ sub.s $f2, $f2, $f0 /* 8A5E68 802403E8 46021102 */ mul.s $f4, $f2, $f2 -/* 8A5E6C 802403EC 00000000 */ nop +/* 8A5E6C 802403EC 00000000 */ nop /* 8A5E70 802403F0 846200B0 */ lh $v0, 0xb0($v1) /* 8A5E74 802403F4 C462002C */ lwc1 $f2, 0x2c($v1) /* 8A5E78 802403F8 44820000 */ mtc1 $v0, $f0 -/* 8A5E7C 802403FC 00000000 */ nop +/* 8A5E7C 802403FC 00000000 */ nop /* 8A5E80 80240400 46800020 */ cvt.s.w $f0, $f0 /* 8A5E84 80240404 46001080 */ add.s $f2, $f2, $f0 /* 8A5E88 80240408 3C013FC0 */ lui $at, 0x3fc0 /* 8A5E8C 8024040C 44810000 */ mtc1 $at, $f0 -/* 8A5E90 80240410 00000000 */ nop +/* 8A5E90 80240410 00000000 */ nop /* 8A5E94 80240414 46001081 */ sub.s $f2, $f2, $f0 /* 8A5E98 80240418 46043300 */ add.s $f12, $f6, $f4 /* 8A5E9C 8024041C C640009C */ lwc1 $f0, 0x9c($s2) /* 8A5EA0 80240420 46001501 */ sub.s $f20, $f2, $f0 /* 8A5EA4 80240424 46006084 */ sqrt.s $f2, $f12 /* 8A5EA8 80240428 46021032 */ c.eq.s $f2, $f2 -/* 8A5EAC 8024042C 00000000 */ nop +/* 8A5EAC 8024042C 00000000 */ nop /* 8A5EB0 80240430 45010004 */ bc1t .L80240444 /* 8A5EB4 80240434 0060882D */ daddu $s1, $v1, $zero /* 8A5EB8 80240438 0C0187BC */ jal sqrtf -/* 8A5EBC 8024043C 00000000 */ nop +/* 8A5EBC 8024043C 00000000 */ nop /* 8A5EC0 80240440 46000086 */ mov.s $f2, $f0 .L80240444: /* 8A5EC4 80240444 44800000 */ mtc1 $zero, $f0 -/* 8A5EC8 80240448 00000000 */ nop +/* 8A5EC8 80240448 00000000 */ nop /* 8A5ECC 8024044C 4614003C */ c.lt.s $f0, $f20 -/* 8A5ED0 80240450 00000000 */ nop +/* 8A5ED0 80240450 00000000 */ nop /* 8A5ED4 80240454 45000016 */ bc1f .L802404B0 /* 8A5ED8 80240458 46001106 */ mov.s $f4, $f2 /* 8A5EDC 8024045C 862200B0 */ lh $v0, 0xb0($s1) /* 8A5EE0 80240460 44820000 */ mtc1 $v0, $f0 -/* 8A5EE4 80240464 00000000 */ nop +/* 8A5EE4 80240464 00000000 */ nop /* 8A5EE8 80240468 46800020 */ cvt.s.w $f0, $f0 /* 8A5EEC 8024046C 4600A03C */ c.lt.s $f20, $f0 -/* 8A5EF0 80240470 00000000 */ nop +/* 8A5EF0 80240470 00000000 */ nop /* 8A5EF4 80240474 4500000E */ bc1f .L802404B0 -/* 8A5EF8 80240478 00000000 */ nop +/* 8A5EF8 80240478 00000000 */ nop /* 8A5EFC 8024047C 862200B2 */ lh $v0, 0xb2($s1) /* 8A5F00 80240480 3C013F00 */ lui $at, 0x3f00 /* 8A5F04 80240484 44811000 */ mtc1 $at, $f2 /* 8A5F08 80240488 44820000 */ mtc1 $v0, $f0 -/* 8A5F0C 8024048C 00000000 */ nop +/* 8A5F0C 8024048C 00000000 */ nop /* 8A5F10 80240490 46800020 */ cvt.s.w $f0, $f0 /* 8A5F14 80240494 46020002 */ mul.s $f0, $f0, $f2 -/* 8A5F18 80240498 00000000 */ nop +/* 8A5F18 80240498 00000000 */ nop /* 8A5F1C 8024049C 4600203C */ c.lt.s $f4, $f0 -/* 8A5F20 802404A0 00000000 */ nop +/* 8A5F20 802404A0 00000000 */ nop /* 8A5F24 802404A4 45000002 */ bc1f .L802404B0 /* 8A5F28 802404A8 24020001 */ addiu $v0, $zero, 1 /* 8A5F2C 802404AC AE62008C */ sw $v0, 0x8c($s3) @@ -92,58 +92,58 @@ glabel func_80240360_8A5DE0 /* 8A5F34 802404B4 C6400098 */ lwc1 $f0, 0x98($s2) /* 8A5F38 802404B8 46001081 */ sub.s $f2, $f2, $f0 /* 8A5F3C 802404BC 46021182 */ mul.s $f6, $f2, $f2 -/* 8A5F40 802404C0 00000000 */ nop +/* 8A5F40 802404C0 00000000 */ nop /* 8A5F44 802404C4 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 8A5F48 802404C8 C6020040 */ lwc1 $f2, 0x40($s0) /* 8A5F4C 802404CC 46001081 */ sub.s $f2, $f2, $f0 /* 8A5F50 802404D0 46021102 */ mul.s $f4, $f2, $f2 -/* 8A5F54 802404D4 00000000 */ nop +/* 8A5F54 802404D4 00000000 */ nop /* 8A5F58 802404D8 860200A8 */ lh $v0, 0xa8($s0) /* 8A5F5C 802404DC C602003C */ lwc1 $f2, 0x3c($s0) /* 8A5F60 802404E0 44820000 */ mtc1 $v0, $f0 -/* 8A5F64 802404E4 00000000 */ nop +/* 8A5F64 802404E4 00000000 */ nop /* 8A5F68 802404E8 46800020 */ cvt.s.w $f0, $f0 /* 8A5F6C 802404EC 46001080 */ add.s $f2, $f2, $f0 /* 8A5F70 802404F0 3C013FC0 */ lui $at, 0x3fc0 /* 8A5F74 802404F4 44810000 */ mtc1 $at, $f0 -/* 8A5F78 802404F8 00000000 */ nop +/* 8A5F78 802404F8 00000000 */ nop /* 8A5F7C 802404FC 46001081 */ sub.s $f2, $f2, $f0 /* 8A5F80 80240500 46043300 */ add.s $f12, $f6, $f4 /* 8A5F84 80240504 C640009C */ lwc1 $f0, 0x9c($s2) /* 8A5F88 80240508 46001501 */ sub.s $f20, $f2, $f0 /* 8A5F8C 8024050C 46006084 */ sqrt.s $f2, $f12 /* 8A5F90 80240510 46021032 */ c.eq.s $f2, $f2 -/* 8A5F94 80240514 00000000 */ nop +/* 8A5F94 80240514 00000000 */ nop /* 8A5F98 80240518 45010004 */ bc1t .L8024052C -/* 8A5F9C 8024051C 00000000 */ nop +/* 8A5F9C 8024051C 00000000 */ nop /* 8A5FA0 80240520 0C0187BC */ jal sqrtf -/* 8A5FA4 80240524 00000000 */ nop +/* 8A5FA4 80240524 00000000 */ nop /* 8A5FA8 80240528 46000086 */ mov.s $f2, $f0 .L8024052C: /* 8A5FAC 8024052C 44800000 */ mtc1 $zero, $f0 -/* 8A5FB0 80240530 00000000 */ nop +/* 8A5FB0 80240530 00000000 */ nop /* 8A5FB4 80240534 4614003C */ c.lt.s $f0, $f20 -/* 8A5FB8 80240538 00000000 */ nop +/* 8A5FB8 80240538 00000000 */ nop /* 8A5FBC 8024053C 45000016 */ bc1f .L80240598 /* 8A5FC0 80240540 46001106 */ mov.s $f4, $f2 /* 8A5FC4 80240544 860200A8 */ lh $v0, 0xa8($s0) /* 8A5FC8 80240548 44820000 */ mtc1 $v0, $f0 -/* 8A5FCC 8024054C 00000000 */ nop +/* 8A5FCC 8024054C 00000000 */ nop /* 8A5FD0 80240550 46800020 */ cvt.s.w $f0, $f0 /* 8A5FD4 80240554 4600A03C */ c.lt.s $f20, $f0 -/* 8A5FD8 80240558 00000000 */ nop +/* 8A5FD8 80240558 00000000 */ nop /* 8A5FDC 8024055C 4500000F */ bc1f .L8024059C /* 8A5FE0 80240560 0000882D */ daddu $s1, $zero, $zero /* 8A5FE4 80240564 860200A6 */ lh $v0, 0xa6($s0) /* 8A5FE8 80240568 3C013F00 */ lui $at, 0x3f00 /* 8A5FEC 8024056C 44811000 */ mtc1 $at, $f2 /* 8A5FF0 80240570 44820000 */ mtc1 $v0, $f0 -/* 8A5FF4 80240574 00000000 */ nop +/* 8A5FF4 80240574 00000000 */ nop /* 8A5FF8 80240578 46800020 */ cvt.s.w $f0, $f0 /* 8A5FFC 8024057C 46020002 */ mul.s $f0, $f0, $f2 -/* 8A6000 80240580 00000000 */ nop +/* 8A6000 80240580 00000000 */ nop /* 8A6004 80240584 4600203C */ c.lt.s $f4, $f0 -/* 8A6008 80240588 00000000 */ nop +/* 8A6008 80240588 00000000 */ nop /* 8A600C 8024058C 45000003 */ bc1f .L8024059C /* 8A6010 80240590 24020001 */ addiu $v0, $zero, 1 /* 8A6014 80240594 AE62008C */ sw $v0, 0x8c($s3) @@ -165,16 +165,16 @@ glabel func_80240360_8A5DE0 /* 8A6048 802405C8 C6400098 */ lwc1 $f0, 0x98($s2) /* 8A604C 802405CC 46001081 */ sub.s $f2, $f2, $f0 /* 8A6050 802405D0 46021182 */ mul.s $f6, $f2, $f2 -/* 8A6054 802405D4 00000000 */ nop +/* 8A6054 802405D4 00000000 */ nop /* 8A6058 802405D8 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 8A605C 802405DC C6020040 */ lwc1 $f2, 0x40($s0) /* 8A6060 802405E0 46001081 */ sub.s $f2, $f2, $f0 /* 8A6064 802405E4 46021102 */ mul.s $f4, $f2, $f2 -/* 8A6068 802405E8 00000000 */ nop +/* 8A6068 802405E8 00000000 */ nop /* 8A606C 802405EC 860200A8 */ lh $v0, 0xa8($s0) /* 8A6070 802405F0 C602003C */ lwc1 $f2, 0x3c($s0) /* 8A6074 802405F4 44820000 */ mtc1 $v0, $f0 -/* 8A6078 802405F8 00000000 */ nop +/* 8A6078 802405F8 00000000 */ nop /* 8A607C 802405FC 46800020 */ cvt.s.w $f0, $f0 /* 8A6080 80240600 46001080 */ add.s $f2, $f2, $f0 /* 8A6084 80240604 461A1081 */ sub.s $f2, $f2, $f26 @@ -183,32 +183,32 @@ glabel func_80240360_8A5DE0 /* 8A6090 80240610 46001501 */ sub.s $f20, $f2, $f0 /* 8A6094 80240614 46006004 */ sqrt.s $f0, $f12 /* 8A6098 80240618 46000032 */ c.eq.s $f0, $f0 -/* 8A609C 8024061C 00000000 */ nop +/* 8A609C 8024061C 00000000 */ nop /* 8A60A0 80240620 45010003 */ bc1t .L80240630 -/* 8A60A4 80240624 00000000 */ nop +/* 8A60A4 80240624 00000000 */ nop /* 8A60A8 80240628 0C0187BC */ jal sqrtf -/* 8A60AC 8024062C 00000000 */ nop +/* 8A60AC 8024062C 00000000 */ nop .L80240630: /* 8A60B0 80240630 4614C03C */ c.lt.s $f24, $f20 -/* 8A60B4 80240634 00000000 */ nop +/* 8A60B4 80240634 00000000 */ nop /* 8A60B8 80240638 45000015 */ bc1f .L80240690 /* 8A60BC 8024063C 46000106 */ mov.s $f4, $f0 /* 8A60C0 80240640 860200A8 */ lh $v0, 0xa8($s0) /* 8A60C4 80240644 44820000 */ mtc1 $v0, $f0 -/* 8A60C8 80240648 00000000 */ nop +/* 8A60C8 80240648 00000000 */ nop /* 8A60CC 8024064C 46800020 */ cvt.s.w $f0, $f0 /* 8A60D0 80240650 4600A03C */ c.lt.s $f20, $f0 -/* 8A60D4 80240654 00000000 */ nop +/* 8A60D4 80240654 00000000 */ nop /* 8A60D8 80240658 4500000E */ bc1f .L80240694 /* 8A60DC 8024065C 26310001 */ addiu $s1, $s1, 1 /* 8A60E0 80240660 860200A6 */ lh $v0, 0xa6($s0) /* 8A60E4 80240664 44820000 */ mtc1 $v0, $f0 -/* 8A60E8 80240668 00000000 */ nop +/* 8A60E8 80240668 00000000 */ nop /* 8A60EC 8024066C 46800020 */ cvt.s.w $f0, $f0 /* 8A60F0 80240670 46160002 */ mul.s $f0, $f0, $f22 -/* 8A60F4 80240674 00000000 */ nop +/* 8A60F4 80240674 00000000 */ nop /* 8A60F8 80240678 4600203C */ c.lt.s $f4, $f0 -/* 8A60FC 8024067C 00000000 */ nop +/* 8A60FC 8024067C 00000000 */ nop /* 8A6100 80240680 45000004 */ bc1f .L80240694 /* 8A6104 80240684 24020001 */ addiu $v0, $zero, 1 /* 8A6108 80240688 080901A8 */ j .L802406A0 @@ -218,7 +218,7 @@ glabel func_80240360_8A5DE0 .L80240694: /* 8A6114 80240694 2A220040 */ slti $v0, $s1, 0x40 /* 8A6118 80240698 1440FFC5 */ bnez $v0, .L802405B0 -/* 8A611C 8024069C 00000000 */ nop +/* 8A611C 8024069C 00000000 */ nop .L802406A0: /* 8A6120 802406A0 8FBF0020 */ lw $ra, 0x20($sp) /* 8A6124 802406A4 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_8024074C_8A61CC.s b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_8024074C_8A61CC.s index cd3cc7b540..6e0cc0795c 100644 --- a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_8024074C_8A61CC.s +++ b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_8024074C_8A61CC.s @@ -21,11 +21,11 @@ glabel func_8024074C_8A61CC /* 8A620C 8024078C A602008E */ sh $v0, 0x8e($s0) /* 8A6210 80240790 00021400 */ sll $v0, $v0, 0x10 /* 8A6214 80240794 1C400033 */ bgtz $v0, .L80240864 -/* 8A6218 80240798 00000000 */ nop +/* 8A6218 80240798 00000000 */ nop .L8024079C: /* 8A621C 8024079C 8602008C */ lh $v0, 0x8c($s0) /* 8A6220 802407A0 14400030 */ bnez $v0, .L80240864 -/* 8A6224 802407A4 00000000 */ nop +/* 8A6224 802407A4 00000000 */ nop /* 8A6228 802407A8 8E2200CC */ lw $v0, 0xcc($s1) /* 8A622C 802407AC 8C420024 */ lw $v0, 0x24($v0) /* 8A6230 802407B0 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_8024074C_8A61CC /* 8A623C 802407BC 8E230088 */ lw $v1, 0x88($s1) /* 8A6240 802407C0 24020005 */ addiu $v0, $zero, 5 /* 8A6244 802407C4 10620005 */ beq $v1, $v0, .L802407DC -/* 8A6248 802407C8 00000000 */ nop +/* 8A6248 802407C8 00000000 */ nop /* 8A624C 802407CC 10600003 */ beqz $v1, .L802407DC /* 8A6250 802407D0 24020001 */ addiu $v0, $zero, 1 /* 8A6254 802407D4 14620006 */ bne $v1, $v0, .L802407F0 -/* 8A6258 802407D8 00000000 */ nop +/* 8A6258 802407D8 00000000 */ nop .L802407DC: /* 8A625C 802407DC 8E220084 */ lw $v0, 0x84($s1) /* 8A6260 802407E0 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_8024074C_8A61CC /* 8A62A0 80240820 46220000 */ add.d $f0, $f0, $f2 /* 8A62A4 80240824 4620010D */ trunc.w.d $f4, $f0 /* 8A62A8 80240828 44022000 */ mfc1 $v0, $f4 -/* 8A62AC 8024082C 00000000 */ nop +/* 8A62AC 8024082C 00000000 */ nop /* 8A62B0 80240830 A602008E */ sh $v0, 0x8e($s0) /* 8A62B4 80240834 00021400 */ sll $v0, $v0, 0x10 /* 8A62B8 80240838 8E230078 */ lw $v1, 0x78($s1) /* 8A62BC 8024083C 00021403 */ sra $v0, $v0, 0x10 /* 8A62C0 80240840 0043102A */ slt $v0, $v0, $v1 /* 8A62C4 80240844 10400003 */ beqz $v0, .L80240854 -/* 8A62C8 80240848 00000000 */ nop +/* 8A62C8 80240848 00000000 */ nop /* 8A62CC 8024084C 9622007A */ lhu $v0, 0x7a($s1) /* 8A62D0 80240850 A602008E */ sh $v0, 0x8e($s0) .L80240854: diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s index 65c42afce4..7d9d48087b 100644 --- a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s +++ b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s @@ -279,15 +279,17 @@ glabel func_80240A64_8A64E4 /* 8A68D0 80240E50 2C620015 */ sltiu $v0, $v1, 0x15 /* 8A68D4 80240E54 10400009 */ beqz $v0, .L80240E7C /* 8A68D8 80240E58 00031080 */ sll $v0, $v1, 2 -/* 8A68DC 80240E5C 3C018024 */ lui $at, %hi(D_802424A8) +/* 8A68DC 80240E5C 3C018024 */ lui $at, %hi(jtbl_802424A8_8A7F28) /* 8A68E0 80240E60 00220821 */ addu $at, $at, $v0 -/* 8A68E4 80240E64 8C2224A8 */ lw $v0, %lo(D_802424A8)($at) +/* 8A68E4 80240E64 8C2224A8 */ lw $v0, %lo(jtbl_802424A8_8A7F28)($at) /* 8A68E8 80240E68 00400008 */ jr $v0 /* 8A68EC 80240E6C 00000000 */ nop +glabel L80240E70_8A68F0 /* 8A68F0 80240E70 8E420028 */ lw $v0, 0x28($s2) /* 8A68F4 80240E74 24420001 */ addiu $v0, $v0, 1 /* 8A68F8 80240E78 AE420028 */ sw $v0, 0x28($s2) .L80240E7C: +glabel L80240E7C_8A68FC /* 8A68FC 80240E7C 0000102D */ daddu $v0, $zero, $zero .L80240E80: /* 8A6900 80240E80 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_25/8A7F80/func_8024030C_8A828C.s b/asm/nonmatchings/world/area_tik/tik_25/8A7F80/func_8024030C_8A828C.s index b17f224ceb..0bbecc322d 100644 --- a/asm/nonmatchings/world/area_tik/tik_25/8A7F80/func_8024030C_8A828C.s +++ b/asm/nonmatchings/world/area_tik/tik_25/8A7F80/func_8024030C_8A828C.s @@ -32,58 +32,58 @@ glabel func_8024030C_8A828C /* 8A82F8 80240378 C6400098 */ lwc1 $f0, 0x98($s2) /* 8A82FC 8024037C 46001081 */ sub.s $f2, $f2, $f0 /* 8A8300 80240380 46021182 */ mul.s $f6, $f2, $f2 -/* 8A8304 80240384 00000000 */ nop +/* 8A8304 80240384 00000000 */ nop /* 8A8308 80240388 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 8A830C 8024038C C4620030 */ lwc1 $f2, 0x30($v1) /* 8A8310 80240390 46001081 */ sub.s $f2, $f2, $f0 /* 8A8314 80240394 46021102 */ mul.s $f4, $f2, $f2 -/* 8A8318 80240398 00000000 */ nop +/* 8A8318 80240398 00000000 */ nop /* 8A831C 8024039C 846200B0 */ lh $v0, 0xb0($v1) /* 8A8320 802403A0 C462002C */ lwc1 $f2, 0x2c($v1) /* 8A8324 802403A4 44820000 */ mtc1 $v0, $f0 -/* 8A8328 802403A8 00000000 */ nop +/* 8A8328 802403A8 00000000 */ nop /* 8A832C 802403AC 46800020 */ cvt.s.w $f0, $f0 /* 8A8330 802403B0 46001080 */ add.s $f2, $f2, $f0 /* 8A8334 802403B4 3C013FC0 */ lui $at, 0x3fc0 /* 8A8338 802403B8 44810000 */ mtc1 $at, $f0 -/* 8A833C 802403BC 00000000 */ nop +/* 8A833C 802403BC 00000000 */ nop /* 8A8340 802403C0 46001081 */ sub.s $f2, $f2, $f0 /* 8A8344 802403C4 46043300 */ add.s $f12, $f6, $f4 /* 8A8348 802403C8 C640009C */ lwc1 $f0, 0x9c($s2) /* 8A834C 802403CC 46001501 */ sub.s $f20, $f2, $f0 /* 8A8350 802403D0 46006084 */ sqrt.s $f2, $f12 /* 8A8354 802403D4 46021032 */ c.eq.s $f2, $f2 -/* 8A8358 802403D8 00000000 */ nop +/* 8A8358 802403D8 00000000 */ nop /* 8A835C 802403DC 45010004 */ bc1t .L802403F0 /* 8A8360 802403E0 0060882D */ daddu $s1, $v1, $zero /* 8A8364 802403E4 0C0187BC */ jal sqrtf -/* 8A8368 802403E8 00000000 */ nop +/* 8A8368 802403E8 00000000 */ nop /* 8A836C 802403EC 46000086 */ mov.s $f2, $f0 .L802403F0: /* 8A8370 802403F0 44800000 */ mtc1 $zero, $f0 -/* 8A8374 802403F4 00000000 */ nop +/* 8A8374 802403F4 00000000 */ nop /* 8A8378 802403F8 4614003C */ c.lt.s $f0, $f20 -/* 8A837C 802403FC 00000000 */ nop +/* 8A837C 802403FC 00000000 */ nop /* 8A8380 80240400 45000016 */ bc1f .L8024045C /* 8A8384 80240404 46001106 */ mov.s $f4, $f2 /* 8A8388 80240408 862200B0 */ lh $v0, 0xb0($s1) /* 8A838C 8024040C 44820000 */ mtc1 $v0, $f0 -/* 8A8390 80240410 00000000 */ nop +/* 8A8390 80240410 00000000 */ nop /* 8A8394 80240414 46800020 */ cvt.s.w $f0, $f0 /* 8A8398 80240418 4600A03C */ c.lt.s $f20, $f0 -/* 8A839C 8024041C 00000000 */ nop +/* 8A839C 8024041C 00000000 */ nop /* 8A83A0 80240420 4500000E */ bc1f .L8024045C -/* 8A83A4 80240424 00000000 */ nop +/* 8A83A4 80240424 00000000 */ nop /* 8A83A8 80240428 862200B2 */ lh $v0, 0xb2($s1) /* 8A83AC 8024042C 3C013F00 */ lui $at, 0x3f00 /* 8A83B0 80240430 44811000 */ mtc1 $at, $f2 /* 8A83B4 80240434 44820000 */ mtc1 $v0, $f0 -/* 8A83B8 80240438 00000000 */ nop +/* 8A83B8 80240438 00000000 */ nop /* 8A83BC 8024043C 46800020 */ cvt.s.w $f0, $f0 /* 8A83C0 80240440 46020002 */ mul.s $f0, $f0, $f2 -/* 8A83C4 80240444 00000000 */ nop +/* 8A83C4 80240444 00000000 */ nop /* 8A83C8 80240448 4600203C */ c.lt.s $f4, $f0 -/* 8A83CC 8024044C 00000000 */ nop +/* 8A83CC 8024044C 00000000 */ nop /* 8A83D0 80240450 45000002 */ bc1f .L8024045C /* 8A83D4 80240454 24020001 */ addiu $v0, $zero, 1 /* 8A83D8 80240458 AE62008C */ sw $v0, 0x8c($s3) @@ -92,58 +92,58 @@ glabel func_8024030C_8A828C /* 8A83E0 80240460 C6400098 */ lwc1 $f0, 0x98($s2) /* 8A83E4 80240464 46001081 */ sub.s $f2, $f2, $f0 /* 8A83E8 80240468 46021182 */ mul.s $f6, $f2, $f2 -/* 8A83EC 8024046C 00000000 */ nop +/* 8A83EC 8024046C 00000000 */ nop /* 8A83F0 80240470 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 8A83F4 80240474 C6020040 */ lwc1 $f2, 0x40($s0) /* 8A83F8 80240478 46001081 */ sub.s $f2, $f2, $f0 /* 8A83FC 8024047C 46021102 */ mul.s $f4, $f2, $f2 -/* 8A8400 80240480 00000000 */ nop +/* 8A8400 80240480 00000000 */ nop /* 8A8404 80240484 860200A8 */ lh $v0, 0xa8($s0) /* 8A8408 80240488 C602003C */ lwc1 $f2, 0x3c($s0) /* 8A840C 8024048C 44820000 */ mtc1 $v0, $f0 -/* 8A8410 80240490 00000000 */ nop +/* 8A8410 80240490 00000000 */ nop /* 8A8414 80240494 46800020 */ cvt.s.w $f0, $f0 /* 8A8418 80240498 46001080 */ add.s $f2, $f2, $f0 /* 8A841C 8024049C 3C013FC0 */ lui $at, 0x3fc0 /* 8A8420 802404A0 44810000 */ mtc1 $at, $f0 -/* 8A8424 802404A4 00000000 */ nop +/* 8A8424 802404A4 00000000 */ nop /* 8A8428 802404A8 46001081 */ sub.s $f2, $f2, $f0 /* 8A842C 802404AC 46043300 */ add.s $f12, $f6, $f4 /* 8A8430 802404B0 C640009C */ lwc1 $f0, 0x9c($s2) /* 8A8434 802404B4 46001501 */ sub.s $f20, $f2, $f0 /* 8A8438 802404B8 46006084 */ sqrt.s $f2, $f12 /* 8A843C 802404BC 46021032 */ c.eq.s $f2, $f2 -/* 8A8440 802404C0 00000000 */ nop +/* 8A8440 802404C0 00000000 */ nop /* 8A8444 802404C4 45010004 */ bc1t .L802404D8 -/* 8A8448 802404C8 00000000 */ nop +/* 8A8448 802404C8 00000000 */ nop /* 8A844C 802404CC 0C0187BC */ jal sqrtf -/* 8A8450 802404D0 00000000 */ nop +/* 8A8450 802404D0 00000000 */ nop /* 8A8454 802404D4 46000086 */ mov.s $f2, $f0 .L802404D8: /* 8A8458 802404D8 44800000 */ mtc1 $zero, $f0 -/* 8A845C 802404DC 00000000 */ nop +/* 8A845C 802404DC 00000000 */ nop /* 8A8460 802404E0 4614003C */ c.lt.s $f0, $f20 -/* 8A8464 802404E4 00000000 */ nop +/* 8A8464 802404E4 00000000 */ nop /* 8A8468 802404E8 45000016 */ bc1f .L80240544 /* 8A846C 802404EC 46001106 */ mov.s $f4, $f2 /* 8A8470 802404F0 860200A8 */ lh $v0, 0xa8($s0) /* 8A8474 802404F4 44820000 */ mtc1 $v0, $f0 -/* 8A8478 802404F8 00000000 */ nop +/* 8A8478 802404F8 00000000 */ nop /* 8A847C 802404FC 46800020 */ cvt.s.w $f0, $f0 /* 8A8480 80240500 4600A03C */ c.lt.s $f20, $f0 -/* 8A8484 80240504 00000000 */ nop +/* 8A8484 80240504 00000000 */ nop /* 8A8488 80240508 4500000F */ bc1f .L80240548 /* 8A848C 8024050C 0000882D */ daddu $s1, $zero, $zero /* 8A8490 80240510 860200A6 */ lh $v0, 0xa6($s0) /* 8A8494 80240514 3C013F00 */ lui $at, 0x3f00 /* 8A8498 80240518 44811000 */ mtc1 $at, $f2 /* 8A849C 8024051C 44820000 */ mtc1 $v0, $f0 -/* 8A84A0 80240520 00000000 */ nop +/* 8A84A0 80240520 00000000 */ nop /* 8A84A4 80240524 46800020 */ cvt.s.w $f0, $f0 /* 8A84A8 80240528 46020002 */ mul.s $f0, $f0, $f2 -/* 8A84AC 8024052C 00000000 */ nop +/* 8A84AC 8024052C 00000000 */ nop /* 8A84B0 80240530 4600203C */ c.lt.s $f4, $f0 -/* 8A84B4 80240534 00000000 */ nop +/* 8A84B4 80240534 00000000 */ nop /* 8A84B8 80240538 45000003 */ bc1f .L80240548 /* 8A84BC 8024053C 24020001 */ addiu $v0, $zero, 1 /* 8A84C0 80240540 AE62008C */ sw $v0, 0x8c($s3) @@ -165,16 +165,16 @@ glabel func_8024030C_8A828C /* 8A84F4 80240574 C6400098 */ lwc1 $f0, 0x98($s2) /* 8A84F8 80240578 46001081 */ sub.s $f2, $f2, $f0 /* 8A84FC 8024057C 46021182 */ mul.s $f6, $f2, $f2 -/* 8A8500 80240580 00000000 */ nop +/* 8A8500 80240580 00000000 */ nop /* 8A8504 80240584 C64000A0 */ lwc1 $f0, 0xa0($s2) /* 8A8508 80240588 C6020040 */ lwc1 $f2, 0x40($s0) /* 8A850C 8024058C 46001081 */ sub.s $f2, $f2, $f0 /* 8A8510 80240590 46021102 */ mul.s $f4, $f2, $f2 -/* 8A8514 80240594 00000000 */ nop +/* 8A8514 80240594 00000000 */ nop /* 8A8518 80240598 860200A8 */ lh $v0, 0xa8($s0) /* 8A851C 8024059C C602003C */ lwc1 $f2, 0x3c($s0) /* 8A8520 802405A0 44820000 */ mtc1 $v0, $f0 -/* 8A8524 802405A4 00000000 */ nop +/* 8A8524 802405A4 00000000 */ nop /* 8A8528 802405A8 46800020 */ cvt.s.w $f0, $f0 /* 8A852C 802405AC 46001080 */ add.s $f2, $f2, $f0 /* 8A8530 802405B0 461A1081 */ sub.s $f2, $f2, $f26 @@ -183,32 +183,32 @@ glabel func_8024030C_8A828C /* 8A853C 802405BC 46001501 */ sub.s $f20, $f2, $f0 /* 8A8540 802405C0 46006004 */ sqrt.s $f0, $f12 /* 8A8544 802405C4 46000032 */ c.eq.s $f0, $f0 -/* 8A8548 802405C8 00000000 */ nop +/* 8A8548 802405C8 00000000 */ nop /* 8A854C 802405CC 45010003 */ bc1t .L802405DC -/* 8A8550 802405D0 00000000 */ nop +/* 8A8550 802405D0 00000000 */ nop /* 8A8554 802405D4 0C0187BC */ jal sqrtf -/* 8A8558 802405D8 00000000 */ nop +/* 8A8558 802405D8 00000000 */ nop .L802405DC: /* 8A855C 802405DC 4614C03C */ c.lt.s $f24, $f20 -/* 8A8560 802405E0 00000000 */ nop +/* 8A8560 802405E0 00000000 */ nop /* 8A8564 802405E4 45000015 */ bc1f .L8024063C /* 8A8568 802405E8 46000106 */ mov.s $f4, $f0 /* 8A856C 802405EC 860200A8 */ lh $v0, 0xa8($s0) /* 8A8570 802405F0 44820000 */ mtc1 $v0, $f0 -/* 8A8574 802405F4 00000000 */ nop +/* 8A8574 802405F4 00000000 */ nop /* 8A8578 802405F8 46800020 */ cvt.s.w $f0, $f0 /* 8A857C 802405FC 4600A03C */ c.lt.s $f20, $f0 -/* 8A8580 80240600 00000000 */ nop +/* 8A8580 80240600 00000000 */ nop /* 8A8584 80240604 4500000E */ bc1f .L80240640 /* 8A8588 80240608 26310001 */ addiu $s1, $s1, 1 /* 8A858C 8024060C 860200A6 */ lh $v0, 0xa6($s0) /* 8A8590 80240610 44820000 */ mtc1 $v0, $f0 -/* 8A8594 80240614 00000000 */ nop +/* 8A8594 80240614 00000000 */ nop /* 8A8598 80240618 46800020 */ cvt.s.w $f0, $f0 /* 8A859C 8024061C 46160002 */ mul.s $f0, $f0, $f22 -/* 8A85A0 80240620 00000000 */ nop +/* 8A85A0 80240620 00000000 */ nop /* 8A85A4 80240624 4600203C */ c.lt.s $f4, $f0 -/* 8A85A8 80240628 00000000 */ nop +/* 8A85A8 80240628 00000000 */ nop /* 8A85AC 8024062C 45000004 */ bc1f .L80240640 /* 8A85B0 80240630 24020001 */ addiu $v0, $zero, 1 /* 8A85B4 80240634 08090193 */ j .L8024064C @@ -218,7 +218,7 @@ glabel func_8024030C_8A828C .L80240640: /* 8A85C0 80240640 2A220040 */ slti $v0, $s1, 0x40 /* 8A85C4 80240644 1440FFC5 */ bnez $v0, .L8024055C -/* 8A85C8 80240648 00000000 */ nop +/* 8A85C8 80240648 00000000 */ nop .L8024064C: /* 8A85CC 8024064C 8FBF0020 */ lw $ra, 0x20($sp) /* 8A85D0 80240650 8FB3001C */ lw $s3, 0x1c($sp) @@ -232,4 +232,4 @@ glabel func_8024030C_8A828C /* 8A85F0 80240670 24020002 */ addiu $v0, $zero, 2 /* 8A85F4 80240674 03E00008 */ jr $ra /* 8A85F8 80240678 27BD0048 */ addiu $sp, $sp, 0x48 -/* 8A85FC 8024067C 00000000 */ nop +/* 8A85FC 8024067C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_802406AC_8A862C.s b/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_802406AC_8A862C.s index 9ef97098b3..d5b4ddba22 100644 --- a/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_802406AC_8A862C.s +++ b/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_802406AC_8A862C.s @@ -32,15 +32,15 @@ glabel func_802406AC_8A862C /* 8A8698 80240718 0040802D */ daddu $s0, $v0, $zero /* 8A869C 8024071C 0040182D */ daddu $v1, $v0, $zero /* 8A86A0 80240720 44920000 */ mtc1 $s2, $f0 -/* 8A86A4 80240724 00000000 */ nop +/* 8A86A4 80240724 00000000 */ nop /* 8A86A8 80240728 46800020 */ cvt.s.w $f0, $f0 /* 8A86AC 8024072C E4600048 */ swc1 $f0, 0x48($v1) /* 8A86B0 80240730 44910000 */ mtc1 $s1, $f0 -/* 8A86B4 80240734 00000000 */ nop +/* 8A86B4 80240734 00000000 */ nop /* 8A86B8 80240738 46800020 */ cvt.s.w $f0, $f0 /* 8A86BC 8024073C E460004C */ swc1 $f0, 0x4c($v1) /* 8A86C0 80240740 44900000 */ mtc1 $s0, $f0 -/* 8A86C4 80240744 00000000 */ nop +/* 8A86C4 80240744 00000000 */ nop /* 8A86C8 80240748 46800020 */ cvt.s.w $f0, $f0 /* 8A86CC 8024074C E4600050 */ swc1 $f0, 0x50($v1) /* 8A86D0 80240750 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_80240770_8A86F0.s b/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_80240770_8A86F0.s index fd2a77f672..89516648b3 100644 --- a/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_80240770_8A86F0.s +++ b/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_80240770_8A86F0.s @@ -15,11 +15,11 @@ glabel func_80240770_8A86F0 /* 8A8718 80240798 3C050000 */ lui $a1, 0 /* 8A871C 8024079C 24A501E4 */ addiu $a1, $a1, 0x1e4 /* 8A8720 802407A0 0C048052 */ jal play_model_animation -/* 8A8724 802407A4 00000000 */ nop +/* 8A8724 802407A4 00000000 */ nop /* 8A8728 802407A8 24020002 */ addiu $v0, $zero, 2 .L802407AC: /* 8A872C 802407AC 8FBF0010 */ lw $ra, 0x10($sp) /* 8A8730 802407B0 03E00008 */ jr $ra /* 8A8734 802407B4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8A8738 802407B8 00000000 */ nop -/* 8A873C 802407BC 00000000 */ nop +/* 8A8738 802407B8 00000000 */ nop +/* 8A873C 802407BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240310_999F80.s b/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240310_999F80.s index 2fb91d7d93..7715d2ebf2 100644 --- a/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240310_999F80.s +++ b/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240310_999F80.s @@ -26,7 +26,7 @@ glabel func_80240310_999F80 /* 999FD0 80240360 1440FFFA */ bnez $v0, .L8024034C /* 999FD4 80240364 24A50004 */ addiu $a1, $a1, 4 /* 999FD8 80240368 080900EB */ j .L802403AC -/* 999FDC 8024036C 00000000 */ nop +/* 999FDC 8024036C 00000000 */ nop .L80240370: /* 999FE0 80240370 0000182D */ daddu $v1, $zero, $zero /* 999FE4 80240374 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_8024046C_99CDFC.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_8024046C_99CDFC.s index 95f899d59e..3b12162bf2 100644 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_8024046C_99CDFC.s +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_8024046C_99CDFC.s @@ -21,11 +21,11 @@ glabel func_8024046C_99CDFC /* 99CE3C 802404AC A602008E */ sh $v0, 0x8e($s0) /* 99CE40 802404B0 00021400 */ sll $v0, $v0, 0x10 /* 99CE44 802404B4 1C400033 */ bgtz $v0, .L80240584 -/* 99CE48 802404B8 00000000 */ nop +/* 99CE48 802404B8 00000000 */ nop .L802404BC: /* 99CE4C 802404BC 8602008C */ lh $v0, 0x8c($s0) /* 99CE50 802404C0 14400030 */ bnez $v0, .L80240584 -/* 99CE54 802404C4 00000000 */ nop +/* 99CE54 802404C4 00000000 */ nop /* 99CE58 802404C8 8E2200CC */ lw $v0, 0xcc($s1) /* 99CE5C 802404CC 8C420024 */ lw $v0, 0x24($v0) /* 99CE60 802404D0 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_8024046C_99CDFC /* 99CE6C 802404DC 8E230088 */ lw $v1, 0x88($s1) /* 99CE70 802404E0 24020005 */ addiu $v0, $zero, 5 /* 99CE74 802404E4 10620005 */ beq $v1, $v0, .L802404FC -/* 99CE78 802404E8 00000000 */ nop +/* 99CE78 802404E8 00000000 */ nop /* 99CE7C 802404EC 10600003 */ beqz $v1, .L802404FC /* 99CE80 802404F0 24020001 */ addiu $v0, $zero, 1 /* 99CE84 802404F4 14620006 */ bne $v1, $v0, .L80240510 -/* 99CE88 802404F8 00000000 */ nop +/* 99CE88 802404F8 00000000 */ nop .L802404FC: /* 99CE8C 802404FC 8E220084 */ lw $v0, 0x84($s1) /* 99CE90 80240500 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_8024046C_99CDFC /* 99CED0 80240540 46220000 */ add.d $f0, $f0, $f2 /* 99CED4 80240544 4620010D */ trunc.w.d $f4, $f0 /* 99CED8 80240548 44022000 */ mfc1 $v0, $f4 -/* 99CEDC 8024054C 00000000 */ nop +/* 99CEDC 8024054C 00000000 */ nop /* 99CEE0 80240550 A602008E */ sh $v0, 0x8e($s0) /* 99CEE4 80240554 00021400 */ sll $v0, $v0, 0x10 /* 99CEE8 80240558 8E230078 */ lw $v1, 0x78($s1) /* 99CEEC 8024055C 00021403 */ sra $v0, $v0, 0x10 /* 99CEF0 80240560 0043102A */ slt $v0, $v0, $v1 /* 99CEF4 80240564 10400003 */ beqz $v0, .L80240574 -/* 99CEF8 80240568 00000000 */ nop +/* 99CEF8 80240568 00000000 */ nop /* 99CEFC 8024056C 9622007A */ lhu $v0, 0x7a($s1) /* 99CF00 80240570 A602008E */ sh $v0, 0x8e($s0) .L80240574: diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s index fb3f2394d3..cb9d88d830 100644 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s @@ -279,15 +279,17 @@ glabel func_80240784_99D114 /* 99D500 80240B70 2C620015 */ sltiu $v0, $v1, 0x15 /* 99D504 80240B74 10400009 */ beqz $v0, .L80240B9C /* 99D508 80240B78 00031080 */ sll $v0, $v1, 2 -/* 99D50C 80240B7C 3C018024 */ lui $at, %hi(D_80244448) +/* 99D50C 80240B7C 3C018024 */ lui $at, %hi(jtbl_80244448_9A0DD8) /* 99D510 80240B80 00220821 */ addu $at, $at, $v0 -/* 99D514 80240B84 8C224448 */ lw $v0, %lo(D_80244448)($at) +/* 99D514 80240B84 8C224448 */ lw $v0, %lo(jtbl_80244448_9A0DD8)($at) /* 99D518 80240B88 00400008 */ jr $v0 /* 99D51C 80240B8C 00000000 */ nop +glabel L80240B90_99D520 /* 99D520 80240B90 8E420028 */ lw $v0, 0x28($s2) /* 99D524 80240B94 24420001 */ addiu $v0, $v0, 1 /* 99D528 80240B98 AE420028 */ sw $v0, 0x28($s2) .L80240B9C: +glabel L80240B9C_99D52C /* 99D52C 80240B9C 0000102D */ daddu $v0, $zero, $zero .L80240BA0: /* 99D530 80240BA0 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240BC4_99D554.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240BC4_99D554.s index f14a35ebc8..90f5305eec 100644 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240BC4_99D554.s +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240BC4_99D554.s @@ -22,7 +22,7 @@ glabel func_80240BC4_99D554 /* 99D598 80240C08 3C030010 */ lui $v1, 0x10 /* 99D59C 80240C0C 00431024 */ and $v0, $v0, $v1 /* 99D5A0 80240C10 10400004 */ beqz $v0, .L80240C24 -/* 99D5A4 80240C14 00000000 */ nop +/* 99D5A4 80240C14 00000000 */ nop /* 99D5A8 80240C18 C620006C */ lwc1 $f0, 0x6c($s1) /* 99D5AC 80240C1C 46800020 */ cvt.s.w $f0, $f0 /* 99D5B0 80240C20 E480000C */ swc1 $f0, 0xc($a0) @@ -30,7 +30,7 @@ glabel func_80240BC4_99D554 /* 99D5B4 80240C24 8E2200D0 */ lw $v0, 0xd0($s1) /* 99D5B8 80240C28 8C420014 */ lw $v0, 0x14($v0) /* 99D5BC 80240C2C 1C400004 */ bgtz $v0, .L80240C40 -/* 99D5C0 80240C30 00000000 */ nop +/* 99D5C0 80240C30 00000000 */ nop /* 99D5C4 80240C34 C640000C */ lwc1 $f0, 0xc($s2) /* 99D5C8 80240C38 08090318 */ j .L80240C60 /* 99D5CC 80240C3C E4800018 */ swc1 $f0, 0x18($a0) @@ -38,7 +38,7 @@ glabel func_80240BC4_99D554 /* 99D5D0 80240C40 3C018024 */ lui $at, %hi(D_802444A0) /* 99D5D4 80240C44 D42244A0 */ ldc1 $f2, %lo(D_802444A0)($at) /* 99D5D8 80240C48 44820000 */ mtc1 $v0, $f0 -/* 99D5DC 80240C4C 00000000 */ nop +/* 99D5DC 80240C4C 00000000 */ nop /* 99D5E0 80240C50 46800021 */ cvt.d.w $f0, $f0 /* 99D5E4 80240C54 46220003 */ div.d $f0, $f0, $f2 /* 99D5E8 80240C58 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240C78_99D608.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240C78_99D608.s index d29fccb9c3..69ed24a0ec 100644 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240C78_99D608.s +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240C78_99D608.s @@ -38,7 +38,7 @@ glabel func_80240C78_99D608 /* 99D68C 80240CFC 2402000F */ addiu $v0, $zero, 0xf /* 99D690 80240D00 AFA2001C */ sw $v0, 0x1c($sp) /* 99D694 80240D04 44833000 */ mtc1 $v1, $f6 -/* 99D698 80240D08 00000000 */ nop +/* 99D698 80240D08 00000000 */ nop /* 99D69C 80240D0C 468031A0 */ cvt.s.w $f6, $f6 /* 99D6A0 80240D10 44073000 */ mfc1 $a3, $f6 /* 99D6A4 80240D14 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240E70_99D800.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240E70_99D800.s index 0e83573505..6a29e3b01f 100644 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240E70_99D800.s +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240E70_99D800.s @@ -47,20 +47,20 @@ glabel func_80240E70_99D800 /* 99D8A8 80240F18 8E020010 */ lw $v0, 0x10($s0) /* 99D8AC 80240F1C 46001005 */ abs.s $f0, $f2 /* 99D8B0 80240F20 44822000 */ mtc1 $v0, $f4 -/* 99D8B4 80240F24 00000000 */ nop +/* 99D8B4 80240F24 00000000 */ nop /* 99D8B8 80240F28 46802120 */ cvt.s.w $f4, $f4 /* 99D8BC 80240F2C 4600203C */ c.lt.s $f4, $f0 -/* 99D8C0 80240F30 00000000 */ nop +/* 99D8C0 80240F30 00000000 */ nop /* 99D8C4 80240F34 4500000D */ bc1f .L80240F6C -/* 99D8C8 80240F38 00000000 */ nop +/* 99D8C8 80240F38 00000000 */ nop /* 99D8CC 80240F3C 44800000 */ mtc1 $zero, $f0 /* 99D8D0 80240F40 C654000C */ lwc1 $f20, 0xc($s2) /* 99D8D4 80240F44 4600103C */ c.lt.s $f2, $f0 -/* 99D8D8 80240F48 00000000 */ nop +/* 99D8D8 80240F48 00000000 */ nop /* 99D8DC 80240F4C 45000006 */ bc1f .L80240F68 /* 99D8E0 80240F50 00021023 */ negu $v0, $v0 /* 99D8E4 80240F54 44820000 */ mtc1 $v0, $f0 -/* 99D8E8 80240F58 00000000 */ nop +/* 99D8E8 80240F58 00000000 */ nop /* 99D8EC 80240F5C 46800020 */ cvt.s.w $f0, $f0 /* 99D8F0 80240F60 080903DB */ j .L80240F6C /* 99D8F4 80240F64 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241104_99DA94.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241104_99DA94.s index 235a3bc7ea..355b76172c 100644 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241104_99DA94.s +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241104_99DA94.s @@ -19,20 +19,20 @@ glabel func_80241104_99DA94 /* 99DACC 8024113C 8E0200D0 */ lw $v0, 0xd0($s0) /* 99DAD0 80241140 8C420014 */ lw $v0, 0x14($v0) /* 99DAD4 80241144 04410009 */ bgez $v0, .L8024116C -/* 99DAD8 80241148 00000000 */ nop +/* 99DAD8 80241148 00000000 */ nop /* 99DADC 8024114C C640000C */ lwc1 $f0, 0xc($s2) /* 99DAE0 80241150 3C018024 */ lui $at, %hi(D_802444A8) /* 99DAE4 80241154 D42244A8 */ ldc1 $f2, %lo(D_802444A8)($at) /* 99DAE8 80241158 46000021 */ cvt.d.s $f0, $f0 /* 99DAEC 8024115C 46220002 */ mul.d $f0, $f0, $f2 -/* 99DAF0 80241160 00000000 */ nop +/* 99DAF0 80241160 00000000 */ nop /* 99DAF4 80241164 08090462 */ j .L80241188 /* 99DAF8 80241168 46200020 */ cvt.s.d $f0, $f0 .L8024116C: /* 99DAFC 8024116C 3C018024 */ lui $at, %hi(D_802444B0) /* 99DB00 80241170 D42244B0 */ ldc1 $f2, %lo(D_802444B0)($at) /* 99DB04 80241174 44820000 */ mtc1 $v0, $f0 -/* 99DB08 80241178 00000000 */ nop +/* 99DB08 80241178 00000000 */ nop /* 99DB0C 8024117C 46800021 */ cvt.d.w $f0, $f0 /* 99DB10 80241180 46220003 */ div.d $f0, $f0, $f2 /* 99DB14 80241184 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802411B0_99DB40.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802411B0_99DB40.s index 3131e0006a..a2781af5e3 100644 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802411B0_99DB40.s +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802411B0_99DB40.s @@ -42,7 +42,7 @@ glabel func_802411B0_99DB40 /* 99DBD4 80241244 2402000F */ addiu $v0, $zero, 0xf /* 99DBD8 80241248 AFA2001C */ sw $v0, 0x1c($sp) /* 99DBDC 8024124C 44833000 */ mtc1 $v1, $f6 -/* 99DBE0 80241250 00000000 */ nop +/* 99DBE0 80241250 00000000 */ nop /* 99DBE4 80241254 468031A0 */ cvt.s.w $f6, $f6 /* 99DBE8 80241258 44073000 */ mfc1 $a3, $f6 /* 99DBEC 8024125C 27A20028 */ addiu $v0, $sp, 0x28 @@ -90,12 +90,12 @@ glabel func_802411B0_99DB40 /* 99DC84 802412F4 468031A0 */ cvt.s.w $f6, $f6 /* 99DC88 802412F8 44073000 */ mfc1 $a3, $f6 /* 99DC8C 802412FC 0C00A7B5 */ jal dist2D -/* 99DC90 80241300 00000000 */ nop +/* 99DC90 80241300 00000000 */ nop /* 99DC94 80241304 C6020018 */ lwc1 $f2, 0x18($s0) /* 99DC98 80241308 4602003C */ c.lt.s $f0, $f2 -/* 99DC9C 8024130C 00000000 */ nop +/* 99DC9C 8024130C 00000000 */ nop /* 99DCA0 80241310 4500000E */ bc1f .L8024134C -/* 99DCA4 80241314 00000000 */ nop +/* 99DCA4 80241314 00000000 */ nop /* 99DCA8 80241318 8E2200D0 */ lw $v0, 0xd0($s1) /* 99DCAC 8024131C C4400000 */ lwc1 $f0, ($v0) /* 99DCB0 80241320 46800020 */ cvt.s.w $f0, $f0 @@ -112,7 +112,7 @@ glabel func_802411B0_99DB40 .L8024134C: /* 99DCDC 8024134C 8602008C */ lh $v0, 0x8c($s0) /* 99DCE0 80241350 14400011 */ bnez $v0, .L80241398 -/* 99DCE4 80241354 00000000 */ nop +/* 99DCE4 80241354 00000000 */ nop /* 99DCE8 80241358 C60C0038 */ lwc1 $f12, 0x38($s0) /* 99DCEC 8024135C 8E2200D0 */ lw $v0, 0xd0($s1) /* 99DCF0 80241360 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -123,7 +123,7 @@ glabel func_802411B0_99DB40 /* 99DD04 80241374 468031A0 */ cvt.s.w $f6, $f6 /* 99DD08 80241378 44073000 */ mfc1 $a3, $f6 /* 99DD0C 8024137C 0C00A720 */ jal atan2 -/* 99DD10 80241380 00000000 */ nop +/* 99DD10 80241380 00000000 */ nop /* 99DD14 80241384 8E050018 */ lw $a1, 0x18($s0) /* 99DD18 80241388 44060000 */ mfc1 $a2, $f0 /* 99DD1C 8024138C 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s index 0dd92b6bca..f699019e38 100644 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s @@ -46,7 +46,7 @@ glabel func_802413B8_99DD48 /* 99DDEC 8024145C 8E4200B0 */ lw $v0, 0xb0($s2) /* 99DDF0 80241460 30420004 */ andi $v0, $v0, 4 /* 99DDF4 80241464 1040002F */ beqz $v0, .L80241524 -/* 99DDF8 80241468 00000000 */ nop +/* 99DDF8 80241468 00000000 */ nop .L8024146C: /* 99DDFC 8024146C AE800070 */ sw $zero, 0x70($s4) /* 99DE00 80241470 C600000C */ lwc1 $f0, 0xc($s0) @@ -102,60 +102,71 @@ glabel func_802413B8_99DD48 /* 99DEB8 80241528 2C620064 */ sltiu $v0, $v1, 0x64 /* 99DEBC 8024152C 10400036 */ beqz $v0, .L80241608 /* 99DEC0 80241530 00031080 */ sll $v0, $v1, 2 -/* 99DEC4 80241534 3C018024 */ lui $at, %hi(D_802444B8) +/* 99DEC4 80241534 3C018024 */ lui $at, %hi(jtbl_802444B8_9A0E48) /* 99DEC8 80241538 00220821 */ addu $at, $at, $v0 -/* 99DECC 8024153C 8C2244B8 */ lw $v0, %lo(D_802444B8)($at) +/* 99DECC 8024153C 8C2244B8 */ lw $v0, %lo(jtbl_802444B8_9A0E48)($at) /* 99DED0 80241540 00400008 */ jr $v0 -/* 99DED4 80241544 00000000 */ nop +/* 99DED4 80241544 00000000 */ nop +glabel L80241548_99DED8 /* 99DED8 80241548 0280202D */ daddu $a0, $s4, $zero /* 99DEDC 8024154C 0260282D */ daddu $a1, $s3, $zero /* 99DEE0 80241550 0C0902F1 */ jal func_80240BC4_99D554 /* 99DEE4 80241554 02A0302D */ daddu $a2, $s5, $zero +glabel L80241558_99DEE8 /* 99DEE8 80241558 0280202D */ daddu $a0, $s4, $zero /* 99DEEC 8024155C 0260282D */ daddu $a1, $s3, $zero /* 99DEF0 80241560 0C09031E */ jal func_80240C78_99D608 /* 99DEF4 80241564 02A0302D */ daddu $a2, $s5, $zero /* 99DEF8 80241568 08090582 */ j .L80241608 -/* 99DEFC 8024156C 00000000 */ nop +/* 99DEFC 8024156C 00000000 */ nop +glabel L80241570_99DF00 /* 99DF00 80241570 0280202D */ daddu $a0, $s4, $zero /* 99DF04 80241574 0260282D */ daddu $a1, $s3, $zero /* 99DF08 80241578 0C090366 */ jal func_80240D98_99D728 /* 99DF0C 8024157C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241580_99DF10 /* 99DF10 80241580 0280202D */ daddu $a0, $s4, $zero /* 99DF14 80241584 0260282D */ daddu $a1, $s3, $zero /* 99DF18 80241588 0C09037E */ jal trd_01_NpcJumpFunc /* 99DF1C 8024158C 02A0302D */ daddu $a2, $s5, $zero /* 99DF20 80241590 08090582 */ j .L80241608 -/* 99DF24 80241594 00000000 */ nop +/* 99DF24 80241594 00000000 */ nop +glabel L80241598_99DF28 /* 99DF28 80241598 0280202D */ daddu $a0, $s4, $zero /* 99DF2C 8024159C 0260282D */ daddu $a1, $s3, $zero /* 99DF30 802415A0 0C09039C */ jal func_80240E70_99D800 /* 99DF34 802415A4 02A0302D */ daddu $a2, $s5, $zero +glabel L802415A8_99DF38 /* 99DF38 802415A8 0280202D */ daddu $a0, $s4, $zero /* 99DF3C 802415AC 0260282D */ daddu $a1, $s3, $zero /* 99DF40 802415B0 0C0903E8 */ jal trd_01_UnkNpcAIFunc11 /* 99DF44 802415B4 02A0302D */ daddu $a2, $s5, $zero /* 99DF48 802415B8 08090582 */ j .L80241608 -/* 99DF4C 802415BC 00000000 */ nop +/* 99DF4C 802415BC 00000000 */ nop +glabel L802415C0_99DF50 /* 99DF50 802415C0 0280202D */ daddu $a0, $s4, $zero /* 99DF54 802415C4 0260282D */ daddu $a1, $s3, $zero /* 99DF58 802415C8 0C09042F */ jal trd_01_UnkNpcAIFunc10 /* 99DF5C 802415CC 02A0302D */ daddu $a2, $s5, $zero /* 99DF60 802415D0 08090582 */ j .L80241608 -/* 99DF64 802415D4 00000000 */ nop +/* 99DF64 802415D4 00000000 */ nop +glabel L802415D8_99DF68 /* 99DF68 802415D8 0280202D */ daddu $a0, $s4, $zero /* 99DF6C 802415DC 0260282D */ daddu $a1, $s3, $zero /* 99DF70 802415E0 0C090441 */ jal func_80241104_99DA94 /* 99DF74 802415E4 02A0302D */ daddu $a2, $s5, $zero +glabel L802415E8_99DF78 /* 99DF78 802415E8 0280202D */ daddu $a0, $s4, $zero /* 99DF7C 802415EC 0260282D */ daddu $a1, $s3, $zero /* 99DF80 802415F0 0C09046C */ jal func_802411B0_99DB40 /* 99DF84 802415F4 02A0302D */ daddu $a2, $s5, $zero /* 99DF88 802415F8 08090582 */ j .L80241608 -/* 99DF8C 802415FC 00000000 */ nop +/* 99DF8C 802415FC 00000000 */ nop +glabel L80241600_99DF90 /* 99DF90 80241600 0C0129CF */ jal func_8004A73C /* 99DF94 80241604 0280202D */ daddu $a0, $s4, $zero .L80241608: +glabel L80241608_99DF98 /* 99DF98 80241608 8FBF0048 */ lw $ra, 0x48($sp) /* 99DF9C 8024160C 8FB50044 */ lw $s5, 0x44($sp) /* 99DFA0 80241610 8FB40040 */ lw $s4, 0x40($sp) diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_8024015C_9A113C.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_8024015C_9A113C.s index ef5b8cc5c1..1f244c5977 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_8024015C_9A113C.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_8024015C_9A113C.s @@ -21,11 +21,11 @@ glabel func_8024015C_9A113C /* 9A117C 8024019C A602008E */ sh $v0, 0x8e($s0) /* 9A1180 802401A0 00021400 */ sll $v0, $v0, 0x10 /* 9A1184 802401A4 1C400033 */ bgtz $v0, .L80240274 -/* 9A1188 802401A8 00000000 */ nop +/* 9A1188 802401A8 00000000 */ nop .L802401AC: /* 9A118C 802401AC 8602008C */ lh $v0, 0x8c($s0) /* 9A1190 802401B0 14400030 */ bnez $v0, .L80240274 -/* 9A1194 802401B4 00000000 */ nop +/* 9A1194 802401B4 00000000 */ nop /* 9A1198 802401B8 8E2200CC */ lw $v0, 0xcc($s1) /* 9A119C 802401BC 8C420024 */ lw $v0, 0x24($v0) /* 9A11A0 802401C0 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_8024015C_9A113C /* 9A11AC 802401CC 8E230088 */ lw $v1, 0x88($s1) /* 9A11B0 802401D0 24020005 */ addiu $v0, $zero, 5 /* 9A11B4 802401D4 10620005 */ beq $v1, $v0, .L802401EC -/* 9A11B8 802401D8 00000000 */ nop +/* 9A11B8 802401D8 00000000 */ nop /* 9A11BC 802401DC 10600003 */ beqz $v1, .L802401EC /* 9A11C0 802401E0 24020001 */ addiu $v0, $zero, 1 /* 9A11C4 802401E4 14620006 */ bne $v1, $v0, .L80240200 -/* 9A11C8 802401E8 00000000 */ nop +/* 9A11C8 802401E8 00000000 */ nop .L802401EC: /* 9A11CC 802401EC 8E220084 */ lw $v0, 0x84($s1) /* 9A11D0 802401F0 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_8024015C_9A113C /* 9A1210 80240230 46220000 */ add.d $f0, $f0, $f2 /* 9A1214 80240234 4620010D */ trunc.w.d $f4, $f0 /* 9A1218 80240238 44022000 */ mfc1 $v0, $f4 -/* 9A121C 8024023C 00000000 */ nop +/* 9A121C 8024023C 00000000 */ nop /* 9A1220 80240240 A602008E */ sh $v0, 0x8e($s0) /* 9A1224 80240244 00021400 */ sll $v0, $v0, 0x10 /* 9A1228 80240248 8E230078 */ lw $v1, 0x78($s1) /* 9A122C 8024024C 00021403 */ sra $v0, $v0, 0x10 /* 9A1230 80240250 0043102A */ slt $v0, $v0, $v1 /* 9A1234 80240254 10400003 */ beqz $v0, .L80240264 -/* 9A1238 80240258 00000000 */ nop +/* 9A1238 80240258 00000000 */ nop /* 9A123C 8024025C 9622007A */ lhu $v0, 0x7a($s1) /* 9A1240 80240260 A602008E */ sh $v0, 0x8e($s0) .L80240264: diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s index e389ae73c7..55ab968459 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s @@ -279,15 +279,17 @@ glabel func_80240474_9A1454 /* 9A1840 80240860 2C620015 */ sltiu $v0, $v1, 0x15 /* 9A1844 80240864 10400009 */ beqz $v0, .L8024088C /* 9A1848 80240868 00031080 */ sll $v0, $v1, 2 -/* 9A184C 8024086C 3C018024 */ lui $at, %hi(func_802432E8) +/* 9A184C 8024086C 3C018024 */ lui $at, %hi(jtbl_802432E8_9A42C8) /* 9A1850 80240870 00220821 */ addu $at, $at, $v0 -/* 9A1854 80240874 8C2232E8 */ lw $v0, %lo(func_802432E8)($at) +/* 9A1854 80240874 8C2232E8 */ lw $v0, %lo(jtbl_802432E8_9A42C8)($at) /* 9A1858 80240878 00400008 */ jr $v0 /* 9A185C 8024087C 00000000 */ nop +glabel L80240880_9A1860 /* 9A1860 80240880 8E420028 */ lw $v0, 0x28($s2) /* 9A1864 80240884 24420001 */ addiu $v0, $v0, 1 /* 9A1868 80240888 AE420028 */ sw $v0, 0x28($s2) .L8024088C: +glabel L8024088C_9A186C /* 9A186C 8024088C 0000102D */ daddu $v0, $zero, $zero .L80240890: /* 9A1870 80240890 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802408B4_9A1894.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802408B4_9A1894.s index 79c8d82f67..eb976b0e0c 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802408B4_9A1894.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802408B4_9A1894.s @@ -45,7 +45,7 @@ glabel func_802408B4_9A1894 /* 9A1930 80240950 0C00A7B5 */ jal dist2D /* 9A1934 80240954 4600B386 */ mov.s $f14, $f22 /* 9A1938 80240958 4614003C */ c.lt.s $f0, $f20 -/* 9A193C 8024095C 00000000 */ nop +/* 9A193C 8024095C 00000000 */ nop /* 9A1940 80240960 45000003 */ bc1f .L80240970 /* 9A1944 80240964 2631000C */ addiu $s1, $s1, 0xc /* 9A1948 80240968 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_802408B4_9A1894 /* 9A1974 80240994 8E6200D0 */ lw $v0, 0xd0($s3) /* 9A1978 80240998 8C42007C */ lw $v0, 0x7c($v0) /* 9A197C 8024099C 04410004 */ bgez $v0, .L802409B0 -/* 9A1980 802409A0 00000000 */ nop +/* 9A1980 802409A0 00000000 */ nop /* 9A1984 802409A4 C6C00000 */ lwc1 $f0, ($s6) /* 9A1988 802409A8 08090274 */ j .L802409D0 /* 9A198C 802409AC E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_802408B4_9A1894 /* 9A1990 802409B0 3C018024 */ lui $at, %hi(D_80243340) /* 9A1994 802409B4 D4223340 */ ldc1 $f2, %lo(D_80243340)($at) /* 9A1998 802409B8 44820000 */ mtc1 $v0, $f0 -/* 9A199C 802409BC 00000000 */ nop +/* 9A199C 802409BC 00000000 */ nop /* 9A19A0 802409C0 46800021 */ cvt.d.w $f0, $f0 /* 9A19A4 802409C4 46220003 */ div.d $f0, $f0, $f2 /* 9A19A8 802409C8 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240A0C_9A19EC.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240A0C_9A19EC.s index ab8c0faf9f..6d393ca893 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240A0C_9A19EC.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240A0C_9A19EC.s @@ -44,7 +44,7 @@ glabel func_80240A0C_9A19EC /* 9A1A88 80240AA8 2402000F */ addiu $v0, $zero, 0xf /* 9A1A8C 80240AAC AFA2001C */ sw $v0, 0x1c($sp) /* 9A1A90 80240AB0 44833000 */ mtc1 $v1, $f6 -/* 9A1A94 80240AB4 00000000 */ nop +/* 9A1A94 80240AB4 00000000 */ nop /* 9A1A98 80240AB8 468031A0 */ cvt.s.w $f6, $f6 /* 9A1A9C 80240ABC 44073000 */ mfc1 $a3, $f6 /* 9A1AA0 80240AC0 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_80240A0C_9A19EC .L80240B10: /* 9A1AF0 80240B10 8602008C */ lh $v0, 0x8c($s0) /* 9A1AF4 80240B14 1440005D */ bnez $v0, .L80240C8C -/* 9A1AF8 80240B18 00000000 */ nop +/* 9A1AF8 80240B18 00000000 */ nop /* 9A1AFC 80240B1C C6000018 */ lwc1 $f0, 0x18($s0) /* 9A1B00 80240B20 3C014010 */ lui $at, 0x4010 /* 9A1B04 80240B24 44811800 */ mtc1 $at, $f3 /* 9A1B08 80240B28 44801000 */ mtc1 $zero, $f2 /* 9A1B0C 80240B2C 46000021 */ cvt.d.s $f0, $f0 /* 9A1B10 80240B30 4622003C */ c.lt.d $f0, $f2 -/* 9A1B14 80240B34 00000000 */ nop +/* 9A1B14 80240B34 00000000 */ nop /* 9A1B18 80240B38 45000003 */ bc1f .L80240B48 /* 9A1B1C 80240B3C 0200202D */ daddu $a0, $s0, $zero /* 9A1B20 80240B40 080902D3 */ j .L80240B4C @@ -88,7 +88,7 @@ glabel func_80240A0C_9A19EC /* 9A1B28 80240B48 24050001 */ addiu $a1, $zero, 1 .L80240B4C: /* 9A1B2C 80240B4C 0C00F598 */ jal func_8003D660 -/* 9A1B30 80240B50 00000000 */ nop +/* 9A1B30 80240B50 00000000 */ nop /* 9A1B34 80240B54 C60C0038 */ lwc1 $f12, 0x38($s0) /* 9A1B38 80240B58 8E430078 */ lw $v1, 0x78($s2) /* 9A1B3C 80240B5C C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_80240A0C_9A19EC /* 9A1B64 80240B84 4406B000 */ mfc1 $a2, $f22 /* 9A1B68 80240B88 4407A000 */ mfc1 $a3, $f20 /* 9A1B6C 80240B8C 0C00A720 */ jal atan2 -/* 9A1B70 80240B90 00000000 */ nop +/* 9A1B70 80240B90 00000000 */ nop /* 9A1B74 80240B94 8E050018 */ lw $a1, 0x18($s0) /* 9A1B78 80240B98 44060000 */ mfc1 $a2, $f0 /* 9A1B7C 80240B9C 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_80240A0C_9A19EC /* 9A1B90 80240BB0 4406B000 */ mfc1 $a2, $f22 /* 9A1B94 80240BB4 4407A000 */ mfc1 $a3, $f20 /* 9A1B98 80240BB8 0C00A7B5 */ jal dist2D -/* 9A1B9C 80240BBC 00000000 */ nop +/* 9A1B9C 80240BBC 00000000 */ nop /* 9A1BA0 80240BC0 C6020018 */ lwc1 $f2, 0x18($s0) /* 9A1BA4 80240BC4 4602003E */ c.le.s $f0, $f2 -/* 9A1BA8 80240BC8 00000000 */ nop +/* 9A1BA8 80240BC8 00000000 */ nop /* 9A1BAC 80240BCC 4500002F */ bc1f .L80240C8C /* 9A1BB0 80240BD0 240403E8 */ addiu $a0, $zero, 0x3e8 /* 9A1BB4 80240BD4 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_80240A0C_9A19EC /* 9A1C08 80240C28 18400003 */ blez $v0, .L80240C38 /* 9A1C0C 80240C2C 24020004 */ addiu $v0, $zero, 4 /* 9A1C10 80240C30 14600002 */ bnez $v1, .L80240C3C -/* 9A1C14 80240C34 00000000 */ nop +/* 9A1C14 80240C34 00000000 */ nop .L80240C38: /* 9A1C18 80240C38 AE420070 */ sw $v0, 0x70($s2) .L80240C3C: diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240D74_9A1D54.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240D74_9A1D54.s index 9d6d5f7418..a96a9dd400 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240D74_9A1D54.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240D74_9A1D54.s @@ -38,7 +38,7 @@ glabel func_80240D74_9A1D54 /* 9A1DD8 80240DF8 2402000F */ addiu $v0, $zero, 0xf /* 9A1DDC 80240DFC AFA2001C */ sw $v0, 0x1c($sp) /* 9A1DE0 80240E00 44833000 */ mtc1 $v1, $f6 -/* 9A1DE4 80240E04 00000000 */ nop +/* 9A1DE4 80240E04 00000000 */ nop /* 9A1DE8 80240E08 468031A0 */ cvt.s.w $f6, $f6 /* 9A1DEC 80240E0C 44073000 */ mfc1 $a3, $f6 /* 9A1DF0 80240E10 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_80240D74_9A1D54 .L80240E74: /* 9A1E54 80240E74 8602008C */ lh $v0, 0x8c($s0) /* 9A1E58 80240E78 14400025 */ bnez $v0, .L80240F10 -/* 9A1E5C 80240E7C 00000000 */ nop +/* 9A1E5C 80240E7C 00000000 */ nop /* 9A1E60 80240E80 9602008E */ lhu $v0, 0x8e($s0) /* 9A1E64 80240E84 2442FFFF */ addiu $v0, $v0, -1 /* 9A1E68 80240E88 A602008E */ sh $v0, 0x8e($s0) /* 9A1E6C 80240E8C 00021400 */ sll $v0, $v0, 0x10 /* 9A1E70 80240E90 1440001F */ bnez $v0, .L80240F10 -/* 9A1E74 80240E94 00000000 */ nop +/* 9A1E74 80240E94 00000000 */ nop /* 9A1E78 80240E98 8E820074 */ lw $v0, 0x74($s4) /* 9A1E7C 80240E9C 2442FFFF */ addiu $v0, $v0, -1 /* 9A1E80 80240EA0 10400019 */ beqz $v0, .L80240F08 @@ -84,7 +84,7 @@ glabel func_80240D74_9A1D54 /* 9A1E8C 80240EAC 9442002A */ lhu $v0, 0x2a($v0) /* 9A1E90 80240EB0 30420010 */ andi $v0, $v0, 0x10 /* 9A1E94 80240EB4 14400007 */ bnez $v0, .L80240ED4 -/* 9A1E98 80240EB8 00000000 */ nop +/* 9A1E98 80240EB8 00000000 */ nop /* 9A1E9C 80240EBC C600000C */ lwc1 $f0, 0xc($s0) /* 9A1EA0 80240EC0 3C014334 */ lui $at, 0x4334 /* 9A1EA4 80240EC4 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240F30_9A1F10.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240F30_9A1F10.s index 995213335b..b065b5154a 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240F30_9A1F10.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240F30_9A1F10.s @@ -28,7 +28,7 @@ glabel func_80240F30_9A1F10 /* 9A1F68 80240F88 8E0200D0 */ lw $v0, 0xd0($s0) /* 9A1F6C 80240F8C 8C42007C */ lw $v0, 0x7c($v0) /* 9A1F70 80240F90 04410004 */ bgez $v0, .L80240FA4 -/* 9A1F74 80240F94 00000000 */ nop +/* 9A1F74 80240F94 00000000 */ nop /* 9A1F78 80240F98 C6400000 */ lwc1 $f0, ($s2) /* 9A1F7C 80240F9C 080903F1 */ j .L80240FC4 /* 9A1F80 80240FA0 E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_80240F30_9A1F10 /* 9A1F84 80240FA4 3C018024 */ lui $at, %hi(D_80243348) /* 9A1F88 80240FA8 D4223348 */ ldc1 $f2, %lo(D_80243348)($at) /* 9A1F8C 80240FAC 44820000 */ mtc1 $v0, $f0 -/* 9A1F90 80240FB0 00000000 */ nop +/* 9A1F90 80240FB0 00000000 */ nop /* 9A1F94 80240FB4 46800021 */ cvt.d.w $f0, $f0 /* 9A1F98 80240FB8 46220003 */ div.d $f0, $f0, $f2 /* 9A1F9C 80240FBC 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802410D0_9A20B0.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802410D0_9A20B0.s index 19ed53b10e..5413633382 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802410D0_9A20B0.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802410D0_9A20B0.s @@ -47,20 +47,20 @@ glabel func_802410D0_9A20B0 /* 9A2158 80241178 8E02001C */ lw $v0, 0x1c($s0) /* 9A215C 8024117C 46001005 */ abs.s $f0, $f2 /* 9A2160 80241180 44822000 */ mtc1 $v0, $f4 -/* 9A2164 80241184 00000000 */ nop +/* 9A2164 80241184 00000000 */ nop /* 9A2168 80241188 46802120 */ cvt.s.w $f4, $f4 /* 9A216C 8024118C 4600203C */ c.lt.s $f4, $f0 -/* 9A2170 80241190 00000000 */ nop +/* 9A2170 80241190 00000000 */ nop /* 9A2174 80241194 4500000D */ bc1f .L802411CC -/* 9A2178 80241198 00000000 */ nop +/* 9A2178 80241198 00000000 */ nop /* 9A217C 8024119C 44800000 */ mtc1 $zero, $f0 /* 9A2180 802411A0 C654000C */ lwc1 $f20, 0xc($s2) /* 9A2184 802411A4 4600103C */ c.lt.s $f2, $f0 -/* 9A2188 802411A8 00000000 */ nop +/* 9A2188 802411A8 00000000 */ nop /* 9A218C 802411AC 45000006 */ bc1f .L802411C8 /* 9A2190 802411B0 00021023 */ negu $v0, $v0 /* 9A2194 802411B4 44820000 */ mtc1 $v0, $f0 -/* 9A2198 802411B8 00000000 */ nop +/* 9A2198 802411B8 00000000 */ nop /* 9A219C 802411BC 46800020 */ cvt.s.w $f0, $f0 /* 9A21A0 802411C0 08090473 */ j .L802411CC /* 9A21A4 802411C4 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241200_9A21E0.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241200_9A21E0.s index 5ed3246bd4..e06c8ef3eb 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241200_9A21E0.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241200_9A21E0.s @@ -37,7 +37,7 @@ glabel func_80241200_9A21E0 /* 9A2260 80241280 2402000F */ addiu $v0, $zero, 0xf /* 9A2264 80241284 AFA2001C */ sw $v0, 0x1c($sp) /* 9A2268 80241288 44833000 */ mtc1 $v1, $f6 -/* 9A226C 8024128C 00000000 */ nop +/* 9A226C 8024128C 00000000 */ nop /* 9A2270 80241290 468031A0 */ cvt.s.w $f6, $f6 /* 9A2274 80241294 44073000 */ mfc1 $a3, $f6 /* 9A2278 80241298 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241388_9A2368.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241388_9A2368.s index 0301c66c67..54e1d1219d 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241388_9A2368.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241388_9A2368.s @@ -28,7 +28,7 @@ glabel func_80241388_9A2368 /* 9A23C0 802413E0 C4400008 */ lwc1 $f0, 8($v0) /* 9A23C4 802413E4 46800020 */ cvt.s.w $f0, $f0 /* 9A23C8 802413E8 4602003E */ c.le.s $f0, $f2 -/* 9A23CC 802413EC 00000000 */ nop +/* 9A23CC 802413EC 00000000 */ nop /* 9A23D0 802413F0 45020003 */ bc1fl .L80241400 /* 9A23D4 802413F4 24840001 */ addiu $a0, $a0, 1 /* 9A23D8 802413F8 08090504 */ j .L80241410 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s index 41f49cf353..f7cb9a529c 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s @@ -46,7 +46,7 @@ glabel func_80241448_9A2428 /* 9A24CC 802414EC 8E2200B0 */ lw $v0, 0xb0($s1) /* 9A24D0 802414F0 30420004 */ andi $v0, $v0, 4 /* 9A24D4 802414F4 10400044 */ beqz $v0, .L80241608 -/* 9A24D8 802414F8 00000000 */ nop +/* 9A24D8 802414F8 00000000 */ nop .L802414FC: /* 9A24DC 802414FC 2404F7FF */ addiu $a0, $zero, -0x801 /* 9A24E0 80241500 AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80241448_9A2428 /* 9A2594 802415B4 3C0142C8 */ lui $at, 0x42c8 /* 9A2598 802415B8 44812000 */ mtc1 $at, $f4 /* 9A259C 802415BC 44823000 */ mtc1 $v0, $f6 -/* 9A25A0 802415C0 00000000 */ nop +/* 9A25A0 802415C0 00000000 */ nop /* 9A25A4 802415C4 468031A0 */ cvt.s.w $f6, $f6 /* 9A25A8 802415C8 27A20044 */ addiu $v0, $sp, 0x44 /* 9A25AC 802415CC E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80241448_9A2428 /* 9A25D0 802415F0 0C0372DF */ jal func_800DCB7C /* 9A25D4 802415F4 27A70040 */ addiu $a3, $sp, 0x40 /* 9A25D8 802415F8 10400003 */ beqz $v0, .L80241608 -/* 9A25DC 802415FC 00000000 */ nop +/* 9A25DC 802415FC 00000000 */ nop /* 9A25E0 80241600 C7A0003C */ lwc1 $f0, 0x3c($sp) /* 9A25E4 80241604 E640003C */ swc1 $f0, 0x3c($s2) .L80241608: @@ -124,72 +124,85 @@ glabel func_80241448_9A2428 /* 9A25EC 8024160C 2C620064 */ sltiu $v0, $v1, 0x64 /* 9A25F0 80241610 10400042 */ beqz $v0, .L8024171C /* 9A25F4 80241614 00031080 */ sll $v0, $v1, 2 -/* 9A25F8 80241618 3C018024 */ lui $at, %hi(func_80243350_95E550) +/* 9A25F8 80241618 3C018024 */ lui $at, %hi(jtbl_80243350_9A4330) /* 9A25FC 8024161C 00220821 */ addu $at, $at, $v0 -/* 9A2600 80241620 8C223350 */ lw $v0, %lo(func_80243350_95E550)($at) +/* 9A2600 80241620 8C223350 */ lw $v0, %lo(jtbl_80243350_9A4330)($at) /* 9A2604 80241624 00400008 */ jr $v0 -/* 9A2608 80241628 00000000 */ nop +/* 9A2608 80241628 00000000 */ nop +glabel L8024162C_9A260C /* 9A260C 8024162C 0280202D */ daddu $a0, $s4, $zero /* 9A2610 80241630 0260282D */ daddu $a1, $s3, $zero /* 9A2614 80241634 0C09022D */ jal func_802408B4_9A1894 /* 9A2618 80241638 02A0302D */ daddu $a2, $s5, $zero +glabel L8024163C_9A261C /* 9A261C 8024163C 0280202D */ daddu $a0, $s4, $zero /* 9A2620 80241640 0260282D */ daddu $a1, $s3, $zero /* 9A2624 80241644 0C090283 */ jal func_80240A0C_9A19EC /* 9A2628 80241648 02A0302D */ daddu $a2, $s5, $zero /* 9A262C 8024164C 080905C7 */ j .L8024171C -/* 9A2630 80241650 00000000 */ nop +/* 9A2630 80241650 00000000 */ nop +glabel L80241654_9A2634 /* 9A2634 80241654 0280202D */ daddu $a0, $s4, $zero /* 9A2638 80241658 0260282D */ daddu $a1, $s3, $zero /* 9A263C 8024165C 0C09032D */ jal trd_02_UnkNpcAIFunc1 /* 9A2640 80241660 02A0302D */ daddu $a2, $s5, $zero +glabel L80241664_9A2644 /* 9A2644 80241664 0280202D */ daddu $a0, $s4, $zero /* 9A2648 80241668 0260282D */ daddu $a1, $s3, $zero /* 9A264C 8024166C 0C09035D */ jal func_80240D74_9A1D54 /* 9A2650 80241670 02A0302D */ daddu $a2, $s5, $zero /* 9A2654 80241674 080905C7 */ j .L8024171C -/* 9A2658 80241678 00000000 */ nop +/* 9A2658 80241678 00000000 */ nop +glabel L8024167C_9A265C /* 9A265C 8024167C 0280202D */ daddu $a0, $s4, $zero /* 9A2660 80241680 0260282D */ daddu $a1, $s3, $zero /* 9A2664 80241684 0C0903CC */ jal func_80240F30_9A1F10 /* 9A2668 80241688 02A0302D */ daddu $a2, $s5, $zero /* 9A266C 8024168C 080905C7 */ j .L8024171C -/* 9A2670 80241690 00000000 */ nop +/* 9A2670 80241690 00000000 */ nop +glabel L80241694_9A2674 /* 9A2674 80241694 0280202D */ daddu $a0, $s4, $zero /* 9A2678 80241698 0260282D */ daddu $a1, $s3, $zero /* 9A267C 8024169C 0C0903F9 */ jal trd_02_NpcJumpFunc2 /* 9A2680 802416A0 02A0302D */ daddu $a2, $s5, $zero +glabel L802416A4_9A2684 /* 9A2684 802416A4 0280202D */ daddu $a0, $s4, $zero /* 9A2688 802416A8 0260282D */ daddu $a1, $s3, $zero /* 9A268C 802416AC 0C090416 */ jal trd_02_NpcJumpFunc /* 9A2690 802416B0 02A0302D */ daddu $a2, $s5, $zero /* 9A2694 802416B4 080905C7 */ j .L8024171C -/* 9A2698 802416B8 00000000 */ nop +/* 9A2698 802416B8 00000000 */ nop +glabel L802416BC_9A269C /* 9A269C 802416BC 0280202D */ daddu $a0, $s4, $zero /* 9A26A0 802416C0 0260282D */ daddu $a1, $s3, $zero /* 9A26A4 802416C4 0C090434 */ jal func_802410D0_9A20B0 /* 9A26A8 802416C8 02A0302D */ daddu $a2, $s5, $zero +glabel L802416CC_9A26AC /* 9A26AC 802416CC 0280202D */ daddu $a0, $s4, $zero /* 9A26B0 802416D0 0260282D */ daddu $a1, $s3, $zero /* 9A26B4 802416D4 0C090480 */ jal func_80241200_9A21E0 /* 9A26B8 802416D8 02A0302D */ daddu $a2, $s5, $zero /* 9A26BC 802416DC 080905C7 */ j .L8024171C -/* 9A26C0 802416E0 00000000 */ nop +/* 9A26C0 802416E0 00000000 */ nop +glabel L802416E4_9A26C4 /* 9A26C4 802416E4 0280202D */ daddu $a0, $s4, $zero /* 9A26C8 802416E8 0260282D */ daddu $a1, $s3, $zero /* 9A26CC 802416EC 0C0904C8 */ jal trd_02_UnkNpcDurationFlagFunc /* 9A26D0 802416F0 02A0302D */ daddu $a2, $s5, $zero /* 9A26D4 802416F4 080905C7 */ j .L8024171C -/* 9A26D8 802416F8 00000000 */ nop +/* 9A26D8 802416F8 00000000 */ nop +glabel L802416FC_9A26DC /* 9A26DC 802416FC 0280202D */ daddu $a0, $s4, $zero /* 9A26E0 80241700 0260282D */ daddu $a1, $s3, $zero /* 9A26E4 80241704 0C0904E2 */ jal func_80241388_9A2368 /* 9A26E8 80241708 02A0302D */ daddu $a2, $s5, $zero /* 9A26EC 8024170C 080905C7 */ j .L8024171C -/* 9A26F0 80241710 00000000 */ nop +/* 9A26F0 80241710 00000000 */ nop +glabel L80241714_9A26F4 /* 9A26F4 80241714 0C0129CF */ jal func_8004A73C /* 9A26F8 80241718 0280202D */ daddu $a0, $s4, $zero .L8024171C: +glabel L8024171C_9A26FC /* 9A26FC 8024171C 8FBF0060 */ lw $ra, 0x60($sp) /* 9A2700 80241720 8FB5005C */ lw $s5, 0x5c($sp) /* 9A2704 80241724 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s index 461f4f7f38..496d540179 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s @@ -53,7 +53,7 @@ glabel func_80241744_9A2724 /* 9A27E0 80241800 8E2200B0 */ lw $v0, 0xb0($s1) /* 9A27E4 80241804 30420004 */ andi $v0, $v0, 4 /* 9A27E8 80241808 10400048 */ beqz $v0, .L8024192C -/* 9A27EC 8024180C 00000000 */ nop +/* 9A27EC 8024180C 00000000 */ nop .L80241810: /* 9A27F0 80241810 A640008E */ sh $zero, 0x8e($s2) /* 9A27F4 80241814 AE600070 */ sw $zero, 0x70($s3) @@ -103,7 +103,7 @@ glabel func_80241744_9A2724 /* 9A289C 802418BC 24020028 */ addiu $v0, $zero, 0x28 /* 9A28A0 802418C0 AFA2001C */ sw $v0, 0x1c($sp) /* 9A28A4 802418C4 44833000 */ mtc1 $v1, $f6 -/* 9A28A8 802418C8 00000000 */ nop +/* 9A28A8 802418C8 00000000 */ nop /* 9A28AC 802418CC 468031A0 */ cvt.s.w $f6, $f6 /* 9A28B0 802418D0 44073000 */ mfc1 $a3, $f6 /* 9A28B4 802418D4 27A20048 */ addiu $v0, $sp, 0x48 @@ -134,64 +134,75 @@ glabel func_80241744_9A2724 /* 9A2910 80241930 2C620064 */ sltiu $v0, $v1, 0x64 /* 9A2914 80241934 1040003A */ beqz $v0, .L80241A20 /* 9A2918 80241938 00031080 */ sll $v0, $v1, 2 -/* 9A291C 8024193C 3C018024 */ lui $at, %hi(D_802434E0) +/* 9A291C 8024193C 3C018024 */ lui $at, %hi(jtbl_802434E0_9A44C0) /* 9A2920 80241940 00220821 */ addu $at, $at, $v0 -/* 9A2924 80241944 8C2234E0 */ lw $v0, %lo(D_802434E0)($at) +/* 9A2924 80241944 8C2234E0 */ lw $v0, %lo(jtbl_802434E0_9A44C0)($at) /* 9A2928 80241948 00400008 */ jr $v0 -/* 9A292C 8024194C 00000000 */ nop +/* 9A292C 8024194C 00000000 */ nop +glabel L80241950_9A2930 /* 9A2930 80241950 0260202D */ daddu $a0, $s3, $zero /* 9A2934 80241954 0280282D */ daddu $a1, $s4, $zero /* 9A2938 80241958 0C09022D */ jal func_802408B4_9A1894 /* 9A293C 8024195C 02A0302D */ daddu $a2, $s5, $zero /* 9A2940 80241960 96220086 */ lhu $v0, 0x86($s1) /* 9A2944 80241964 A64200A8 */ sh $v0, 0xa8($s2) +glabel L80241968_9A2948 /* 9A2948 80241968 0260202D */ daddu $a0, $s3, $zero /* 9A294C 8024196C 0280282D */ daddu $a1, $s4, $zero /* 9A2950 80241970 0C090283 */ jal func_80240A0C_9A19EC /* 9A2954 80241974 02A0302D */ daddu $a2, $s5, $zero /* 9A2958 80241978 08090688 */ j .L80241A20 -/* 9A295C 8024197C 00000000 */ nop +/* 9A295C 8024197C 00000000 */ nop +glabel L80241980_9A2960 /* 9A2960 80241980 0260202D */ daddu $a0, $s3, $zero /* 9A2964 80241984 0280282D */ daddu $a1, $s4, $zero /* 9A2968 80241988 0C09032D */ jal trd_02_UnkNpcAIFunc1 /* 9A296C 8024198C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241990_9A2970 /* 9A2970 80241990 0260202D */ daddu $a0, $s3, $zero /* 9A2974 80241994 0280282D */ daddu $a1, $s4, $zero /* 9A2978 80241998 0C09035D */ jal func_80240D74_9A1D54 /* 9A297C 8024199C 02A0302D */ daddu $a2, $s5, $zero /* 9A2980 802419A0 08090688 */ j .L80241A20 -/* 9A2984 802419A4 00000000 */ nop +/* 9A2984 802419A4 00000000 */ nop +glabel L802419A8_9A2988 /* 9A2988 802419A8 0260202D */ daddu $a0, $s3, $zero /* 9A298C 802419AC 0280282D */ daddu $a1, $s4, $zero /* 9A2990 802419B0 0C0903CC */ jal func_80240F30_9A1F10 /* 9A2994 802419B4 02A0302D */ daddu $a2, $s5, $zero /* 9A2998 802419B8 08090688 */ j .L80241A20 -/* 9A299C 802419BC 00000000 */ nop +/* 9A299C 802419BC 00000000 */ nop +glabel L802419C0_9A29A0 /* 9A29A0 802419C0 0260202D */ daddu $a0, $s3, $zero /* 9A29A4 802419C4 0280282D */ daddu $a1, $s4, $zero /* 9A29A8 802419C8 0C090038 */ jal trd_02_set_script_owner_npc_anim /* 9A29AC 802419CC 02A0302D */ daddu $a2, $s5, $zero +glabel L802419D0_9A29B0 /* 9A29B0 802419D0 0260202D */ daddu $a0, $s3, $zero /* 9A29B4 802419D4 0280282D */ daddu $a1, $s4, $zero /* 9A29B8 802419D8 0C090057 */ jal func_8024015C_9A113C /* 9A29BC 802419DC 02A0302D */ daddu $a2, $s5, $zero /* 9A29C0 802419E0 08090688 */ j .L80241A20 -/* 9A29C4 802419E4 00000000 */ nop +/* 9A29C4 802419E4 00000000 */ nop +glabel L802419E8_9A29C8 /* 9A29C8 802419E8 0260202D */ daddu $a0, $s3, $zero /* 9A29CC 802419EC 0280282D */ daddu $a1, $s4, $zero /* 9A29D0 802419F0 0C0900A4 */ jal trd_02_UnkNpcAIFunc12 /* 9A29D4 802419F4 02A0302D */ daddu $a2, $s5, $zero /* 9A29D8 802419F8 08090688 */ j .L80241A20 -/* 9A29DC 802419FC 00000000 */ nop +/* 9A29DC 802419FC 00000000 */ nop +glabel L80241A00_9A29E0 /* 9A29E0 80241A00 0260202D */ daddu $a0, $s3, $zero /* 9A29E4 80241A04 0280282D */ daddu $a1, $s4, $zero /* 9A29E8 80241A08 0C0900FD */ jal trd_02_set_script_owner_npc_col_height /* 9A29EC 80241A0C 02A0302D */ daddu $a2, $s5, $zero /* 9A29F0 80241A10 08090688 */ j .L80241A20 -/* 9A29F4 80241A14 00000000 */ nop +/* 9A29F4 80241A14 00000000 */ nop +glabel L80241A18_9A29F8 /* 9A29F8 80241A18 0C0129CF */ jal func_8004A73C /* 9A29FC 80241A1C 0260202D */ daddu $a0, $s3, $zero .L80241A20: +glabel L80241A20_9A2A00 /* 9A2A00 80241A20 8FBF0068 */ lw $ra, 0x68($sp) /* 9A2A04 80241A24 8FB50064 */ lw $s5, 0x64($sp) /* 9A2A08 80241A28 8FB40060 */ lw $s4, 0x60($sp) @@ -202,5 +213,5 @@ glabel func_80241744_9A2724 /* 9A2A1C 80241A3C 0000102D */ daddu $v0, $zero, $zero /* 9A2A20 80241A40 03E00008 */ jr $ra /* 9A2A24 80241A44 27BD0070 */ addiu $sp, $sp, 0x70 -/* 9A2A28 80241A48 00000000 */ nop -/* 9A2A2C 80241A4C 00000000 */ nop +/* 9A2A28 80241A48 00000000 */ nop +/* 9A2A2C 80241A4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_8024011C_9A476C.s b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_8024011C_9A476C.s index e569c337e1..8784ddc4d2 100644 --- a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_8024011C_9A476C.s +++ b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_8024011C_9A476C.s @@ -21,11 +21,11 @@ glabel func_8024011C_9A476C /* 9A47AC 8024015C A602008E */ sh $v0, 0x8e($s0) /* 9A47B0 80240160 00021400 */ sll $v0, $v0, 0x10 /* 9A47B4 80240164 1C400033 */ bgtz $v0, .L80240234 -/* 9A47B8 80240168 00000000 */ nop +/* 9A47B8 80240168 00000000 */ nop .L8024016C: /* 9A47BC 8024016C 8602008C */ lh $v0, 0x8c($s0) /* 9A47C0 80240170 14400030 */ bnez $v0, .L80240234 -/* 9A47C4 80240174 00000000 */ nop +/* 9A47C4 80240174 00000000 */ nop /* 9A47C8 80240178 8E2200CC */ lw $v0, 0xcc($s1) /* 9A47CC 8024017C 8C420024 */ lw $v0, 0x24($v0) /* 9A47D0 80240180 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_8024011C_9A476C /* 9A47DC 8024018C 8E230088 */ lw $v1, 0x88($s1) /* 9A47E0 80240190 24020005 */ addiu $v0, $zero, 5 /* 9A47E4 80240194 10620005 */ beq $v1, $v0, .L802401AC -/* 9A47E8 80240198 00000000 */ nop +/* 9A47E8 80240198 00000000 */ nop /* 9A47EC 8024019C 10600003 */ beqz $v1, .L802401AC /* 9A47F0 802401A0 24020001 */ addiu $v0, $zero, 1 /* 9A47F4 802401A4 14620006 */ bne $v1, $v0, .L802401C0 -/* 9A47F8 802401A8 00000000 */ nop +/* 9A47F8 802401A8 00000000 */ nop .L802401AC: /* 9A47FC 802401AC 8E220084 */ lw $v0, 0x84($s1) /* 9A4800 802401B0 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_8024011C_9A476C /* 9A4840 802401F0 46220000 */ add.d $f0, $f0, $f2 /* 9A4844 802401F4 4620010D */ trunc.w.d $f4, $f0 /* 9A4848 802401F8 44022000 */ mfc1 $v0, $f4 -/* 9A484C 802401FC 00000000 */ nop +/* 9A484C 802401FC 00000000 */ nop /* 9A4850 80240200 A602008E */ sh $v0, 0x8e($s0) /* 9A4854 80240204 00021400 */ sll $v0, $v0, 0x10 /* 9A4858 80240208 8E230078 */ lw $v1, 0x78($s1) /* 9A485C 8024020C 00021403 */ sra $v0, $v0, 0x10 /* 9A4860 80240210 0043102A */ slt $v0, $v0, $v1 /* 9A4864 80240214 10400003 */ beqz $v0, .L80240224 -/* 9A4868 80240218 00000000 */ nop +/* 9A4868 80240218 00000000 */ nop /* 9A486C 8024021C 9622007A */ lhu $v0, 0x7a($s1) /* 9A4870 80240220 A602008E */ sh $v0, 0x8e($s0) .L80240224: diff --git a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s index 7260016571..ea325b9cdd 100644 --- a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s +++ b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s @@ -279,15 +279,17 @@ glabel func_80240434_9A4A84 /* 9A4E70 80240820 2C620015 */ sltiu $v0, $v1, 0x15 /* 9A4E74 80240824 10400009 */ beqz $v0, .L8024084C /* 9A4E78 80240828 00031080 */ sll $v0, $v1, 2 -/* 9A4E7C 8024082C 3C018024 */ lui $at, %hi(D_80243D48) +/* 9A4E7C 8024082C 3C018024 */ lui $at, %hi(jtbl_80243D48_9A8398) /* 9A4E80 80240830 00220821 */ addu $at, $at, $v0 -/* 9A4E84 80240834 8C223D48 */ lw $v0, %lo(D_80243D48)($at) +/* 9A4E84 80240834 8C223D48 */ lw $v0, %lo(jtbl_80243D48_9A8398)($at) /* 9A4E88 80240838 00400008 */ jr $v0 /* 9A4E8C 8024083C 00000000 */ nop +glabel L80240840_9A4E90 /* 9A4E90 80240840 8E420028 */ lw $v0, 0x28($s2) /* 9A4E94 80240844 24420001 */ addiu $v0, $v0, 1 /* 9A4E98 80240848 AE420028 */ sw $v0, 0x28($s2) .L8024084C: +glabel L8024084C_9A4E9C /* 9A4E9C 8024084C 0000102D */ daddu $v0, $zero, $zero .L80240850: /* 9A4EA0 80240850 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_trd/trd_03/9A4ED0/func_80240880_9A4ED0.s b/asm/nonmatchings/world/area_trd/trd_03/9A4ED0/func_80240880_9A4ED0.s index bba6fc7587..0e65856847 100644 --- a/asm/nonmatchings/world/area_trd/trd_03/9A4ED0/func_80240880_9A4ED0.s +++ b/asm/nonmatchings/world/area_trd/trd_03/9A4ED0/func_80240880_9A4ED0.s @@ -32,19 +32,19 @@ glabel func_80240880_9A4ED0 /* 9A4F3C 802408EC C60C006C */ lwc1 $f12, 0x6c($s0) /* 9A4F40 802408F0 3C014387 */ lui $at, 0x4387 /* 9A4F44 802408F4 4481B000 */ mtc1 $at, $f22 -/* 9A4F48 802408F8 00000000 */ nop +/* 9A4F48 802408F8 00000000 */ nop /* 9A4F4C 802408FC 46166300 */ add.s $f12, $f12, $f22 /* 9A4F50 80240900 4482C000 */ mtc1 $v0, $f24 -/* 9A4F54 80240904 00000000 */ nop +/* 9A4F54 80240904 00000000 */ nop /* 9A4F58 80240908 4680C620 */ cvt.s.w $f24, $f24 /* 9A4F5C 8024090C 3C0142C8 */ lui $at, 0x42c8 /* 9A4F60 80240910 4481D000 */ mtc1 $at, $f26 /* 9A4F64 80240914 0C00A8BB */ jal sin_deg /* 9A4F68 80240918 46186300 */ add.s $f12, $f12, $f24 /* 9A4F6C 8024091C 461A0002 */ mul.s $f0, $f0, $f26 -/* 9A4F70 80240920 00000000 */ nop +/* 9A4F70 80240920 00000000 */ nop /* 9A4F74 80240924 4492A000 */ mtc1 $s2, $f20 -/* 9A4F78 80240928 00000000 */ nop +/* 9A4F78 80240928 00000000 */ nop /* 9A4F7C 8024092C 4680A520 */ cvt.s.w $f20, $f20 /* 9A4F80 80240930 4600A000 */ add.s $f0, $f20, $f0 /* 9A4F84 80240934 4600008D */ trunc.w.s $f2, $f0 @@ -54,9 +54,9 @@ glabel func_80240880_9A4ED0 /* 9A4F94 80240944 0C00A8D4 */ jal cos_deg /* 9A4F98 80240948 46186300 */ add.s $f12, $f12, $f24 /* 9A4F9C 8024094C 461A0002 */ mul.s $f0, $f0, $f26 -/* 9A4FA0 80240950 00000000 */ nop +/* 9A4FA0 80240950 00000000 */ nop /* 9A4FA4 80240954 4493B000 */ mtc1 $s3, $f22 -/* 9A4FA8 80240958 00000000 */ nop +/* 9A4FA8 80240958 00000000 */ nop /* 9A4FAC 8024095C 4680B5A0 */ cvt.s.w $f22, $f22 /* 9A4FB0 80240960 4600B001 */ sub.s $f0, $f22, $f0 /* 9A4FB4 80240964 3C0142B4 */ lui $at, 0x42b4 @@ -68,7 +68,7 @@ glabel func_80240880_9A4ED0 /* 9A4FCC 8024097C 0C00A8BB */ jal sin_deg /* 9A4FD0 80240980 46186300 */ add.s $f12, $f12, $f24 /* 9A4FD4 80240984 461A0002 */ mul.s $f0, $f0, $f26 -/* 9A4FD8 80240988 00000000 */ nop +/* 9A4FD8 80240988 00000000 */ nop /* 9A4FDC 8024098C 4600A500 */ add.s $f20, $f20, $f0 /* 9A4FE0 80240990 4600A08D */ trunc.w.s $f2, $f20 /* 9A4FE4 80240994 E622008C */ swc1 $f2, 0x8c($s1) @@ -77,7 +77,7 @@ glabel func_80240880_9A4ED0 /* 9A4FF0 802409A0 0C00A8D4 */ jal cos_deg /* 9A4FF4 802409A4 46186300 */ add.s $f12, $f12, $f24 /* 9A4FF8 802409A8 461A0002 */ mul.s $f0, $f0, $f26 -/* 9A4FFC 802409AC 00000000 */ nop +/* 9A4FFC 802409AC 00000000 */ nop /* 9A5000 802409B0 4600B581 */ sub.s $f22, $f22, $f0 /* 9A5004 802409B4 4600B08D */ trunc.w.s $f2, $f22 /* 9A5008 802409B8 E6220090 */ swc1 $f2, 0x90($s1) diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024052C_9A891C.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024052C_9A891C.s index c23641f507..b890d01d1b 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024052C_9A891C.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024052C_9A891C.s @@ -21,11 +21,11 @@ glabel func_8024052C_9A891C /* 9A895C 8024056C A602008E */ sh $v0, 0x8e($s0) /* 9A8960 80240570 00021400 */ sll $v0, $v0, 0x10 /* 9A8964 80240574 1C400033 */ bgtz $v0, .L80240644 -/* 9A8968 80240578 00000000 */ nop +/* 9A8968 80240578 00000000 */ nop .L8024057C: /* 9A896C 8024057C 8602008C */ lh $v0, 0x8c($s0) /* 9A8970 80240580 14400030 */ bnez $v0, .L80240644 -/* 9A8974 80240584 00000000 */ nop +/* 9A8974 80240584 00000000 */ nop /* 9A8978 80240588 8E2200CC */ lw $v0, 0xcc($s1) /* 9A897C 8024058C 8C420024 */ lw $v0, 0x24($v0) /* 9A8980 80240590 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_8024052C_9A891C /* 9A898C 8024059C 8E230088 */ lw $v1, 0x88($s1) /* 9A8990 802405A0 24020005 */ addiu $v0, $zero, 5 /* 9A8994 802405A4 10620005 */ beq $v1, $v0, .L802405BC -/* 9A8998 802405A8 00000000 */ nop +/* 9A8998 802405A8 00000000 */ nop /* 9A899C 802405AC 10600003 */ beqz $v1, .L802405BC /* 9A89A0 802405B0 24020001 */ addiu $v0, $zero, 1 /* 9A89A4 802405B4 14620006 */ bne $v1, $v0, .L802405D0 -/* 9A89A8 802405B8 00000000 */ nop +/* 9A89A8 802405B8 00000000 */ nop .L802405BC: /* 9A89AC 802405BC 8E220084 */ lw $v0, 0x84($s1) /* 9A89B0 802405C0 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_8024052C_9A891C /* 9A89F0 80240600 46220000 */ add.d $f0, $f0, $f2 /* 9A89F4 80240604 4620010D */ trunc.w.d $f4, $f0 /* 9A89F8 80240608 44022000 */ mfc1 $v0, $f4 -/* 9A89FC 8024060C 00000000 */ nop +/* 9A89FC 8024060C 00000000 */ nop /* 9A8A00 80240610 A602008E */ sh $v0, 0x8e($s0) /* 9A8A04 80240614 00021400 */ sll $v0, $v0, 0x10 /* 9A8A08 80240618 8E230078 */ lw $v1, 0x78($s1) /* 9A8A0C 8024061C 00021403 */ sra $v0, $v0, 0x10 /* 9A8A10 80240620 0043102A */ slt $v0, $v0, $v1 /* 9A8A14 80240624 10400003 */ beqz $v0, .L80240634 -/* 9A8A18 80240628 00000000 */ nop +/* 9A8A18 80240628 00000000 */ nop /* 9A8A1C 8024062C 9622007A */ lhu $v0, 0x7a($s1) /* 9A8A20 80240630 A602008E */ sh $v0, 0x8e($s0) .L80240634: diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s index 9fde73625f..842648e8fd 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s @@ -279,15 +279,17 @@ glabel func_80240844_9A8C34 /* 9A9020 80240C30 2C620015 */ sltiu $v0, $v1, 0x15 /* 9A9024 80240C34 10400009 */ beqz $v0, .L80240C5C /* 9A9028 80240C38 00031080 */ sll $v0, $v1, 2 -/* 9A902C 80240C3C 3C018024 */ lui $at, %hi(D_80245EE8) +/* 9A902C 80240C3C 3C018024 */ lui $at, %hi(jtbl_80245EE8_9AE2D8) /* 9A9030 80240C40 00220821 */ addu $at, $at, $v0 -/* 9A9034 80240C44 8C225EE8 */ lw $v0, %lo(D_80245EE8)($at) +/* 9A9034 80240C44 8C225EE8 */ lw $v0, %lo(jtbl_80245EE8_9AE2D8)($at) /* 9A9038 80240C48 00400008 */ jr $v0 /* 9A903C 80240C4C 00000000 */ nop +glabel L80240C50_9A9040 /* 9A9040 80240C50 8E420028 */ lw $v0, 0x28($s2) /* 9A9044 80240C54 24420001 */ addiu $v0, $v0, 1 /* 9A9048 80240C58 AE420028 */ sw $v0, 0x28($s2) .L80240C5C: +glabel L80240C5C_9A904C /* 9A904C 80240C5C 0000102D */ daddu $v0, $zero, $zero .L80240C60: /* 9A9050 80240C60 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240C84_9A9074.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240C84_9A9074.s index 42a72a60e2..e538d695d6 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240C84_9A9074.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240C84_9A9074.s @@ -45,7 +45,7 @@ glabel func_80240C84_9A9074 /* 9A9110 80240D20 0C00A7B5 */ jal dist2D /* 9A9114 80240D24 4600B386 */ mov.s $f14, $f22 /* 9A9118 80240D28 4614003C */ c.lt.s $f0, $f20 -/* 9A911C 80240D2C 00000000 */ nop +/* 9A911C 80240D2C 00000000 */ nop /* 9A9120 80240D30 45000003 */ bc1f .L80240D40 /* 9A9124 80240D34 2631000C */ addiu $s1, $s1, 0xc /* 9A9128 80240D38 46000506 */ mov.s $f20, $f0 @@ -64,7 +64,7 @@ glabel func_80240C84_9A9074 /* 9A9154 80240D64 8E6200D0 */ lw $v0, 0xd0($s3) /* 9A9158 80240D68 8C42007C */ lw $v0, 0x7c($v0) /* 9A915C 80240D6C 04410004 */ bgez $v0, .L80240D80 -/* 9A9160 80240D70 00000000 */ nop +/* 9A9160 80240D70 00000000 */ nop /* 9A9164 80240D74 C6C00000 */ lwc1 $f0, ($s6) /* 9A9168 80240D78 08090368 */ j .L80240DA0 /* 9A916C 80240D7C E6800018 */ swc1 $f0, 0x18($s4) @@ -72,7 +72,7 @@ glabel func_80240C84_9A9074 /* 9A9170 80240D80 3C018024 */ lui $at, %hi(D_80245F40) /* 9A9174 80240D84 D4225F40 */ ldc1 $f2, %lo(D_80245F40)($at) /* 9A9178 80240D88 44820000 */ mtc1 $v0, $f0 -/* 9A917C 80240D8C 00000000 */ nop +/* 9A917C 80240D8C 00000000 */ nop /* 9A9180 80240D90 46800021 */ cvt.d.w $f0, $f0 /* 9A9184 80240D94 46220003 */ div.d $f0, $f0, $f2 /* 9A9188 80240D98 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240DDC_9A91CC.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240DDC_9A91CC.s index ee83d429b0..8c0a8da54f 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240DDC_9A91CC.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240DDC_9A91CC.s @@ -44,7 +44,7 @@ glabel func_80240DDC_9A91CC /* 9A9268 80240E78 2402000F */ addiu $v0, $zero, 0xf /* 9A926C 80240E7C AFA2001C */ sw $v0, 0x1c($sp) /* 9A9270 80240E80 44833000 */ mtc1 $v1, $f6 -/* 9A9274 80240E84 00000000 */ nop +/* 9A9274 80240E84 00000000 */ nop /* 9A9278 80240E88 468031A0 */ cvt.s.w $f6, $f6 /* 9A927C 80240E8C 44073000 */ mfc1 $a3, $f6 /* 9A9280 80240E90 27A20028 */ addiu $v0, $sp, 0x28 @@ -72,14 +72,14 @@ glabel func_80240DDC_9A91CC .L80240EE0: /* 9A92D0 80240EE0 8602008C */ lh $v0, 0x8c($s0) /* 9A92D4 80240EE4 1440005D */ bnez $v0, .L8024105C -/* 9A92D8 80240EE8 00000000 */ nop +/* 9A92D8 80240EE8 00000000 */ nop /* 9A92DC 80240EEC C6000018 */ lwc1 $f0, 0x18($s0) /* 9A92E0 80240EF0 3C014010 */ lui $at, 0x4010 /* 9A92E4 80240EF4 44811800 */ mtc1 $at, $f3 /* 9A92E8 80240EF8 44801000 */ mtc1 $zero, $f2 /* 9A92EC 80240EFC 46000021 */ cvt.d.s $f0, $f0 /* 9A92F0 80240F00 4622003C */ c.lt.d $f0, $f2 -/* 9A92F4 80240F04 00000000 */ nop +/* 9A92F4 80240F04 00000000 */ nop /* 9A92F8 80240F08 45000003 */ bc1f .L80240F18 /* 9A92FC 80240F0C 0200202D */ daddu $a0, $s0, $zero /* 9A9300 80240F10 080903C7 */ j .L80240F1C @@ -88,7 +88,7 @@ glabel func_80240DDC_9A91CC /* 9A9308 80240F18 24050001 */ addiu $a1, $zero, 1 .L80240F1C: /* 9A930C 80240F1C 0C00F598 */ jal func_8003D660 -/* 9A9310 80240F20 00000000 */ nop +/* 9A9310 80240F20 00000000 */ nop /* 9A9314 80240F24 C60C0038 */ lwc1 $f12, 0x38($s0) /* 9A9318 80240F28 8E430078 */ lw $v1, 0x78($s2) /* 9A931C 80240F2C C60E0040 */ lwc1 $f14, 0x40($s0) @@ -104,7 +104,7 @@ glabel func_80240DDC_9A91CC /* 9A9344 80240F54 4406B000 */ mfc1 $a2, $f22 /* 9A9348 80240F58 4407A000 */ mfc1 $a3, $f20 /* 9A934C 80240F5C 0C00A720 */ jal atan2 -/* 9A9350 80240F60 00000000 */ nop +/* 9A9350 80240F60 00000000 */ nop /* 9A9354 80240F64 8E050018 */ lw $a1, 0x18($s0) /* 9A9358 80240F68 44060000 */ mfc1 $a2, $f0 /* 9A935C 80240F6C 0200202D */ daddu $a0, $s0, $zero @@ -115,10 +115,10 @@ glabel func_80240DDC_9A91CC /* 9A9370 80240F80 4406B000 */ mfc1 $a2, $f22 /* 9A9374 80240F84 4407A000 */ mfc1 $a3, $f20 /* 9A9378 80240F88 0C00A7B5 */ jal dist2D -/* 9A937C 80240F8C 00000000 */ nop +/* 9A937C 80240F8C 00000000 */ nop /* 9A9380 80240F90 C6020018 */ lwc1 $f2, 0x18($s0) /* 9A9384 80240F94 4602003E */ c.le.s $f0, $f2 -/* 9A9388 80240F98 00000000 */ nop +/* 9A9388 80240F98 00000000 */ nop /* 9A938C 80240F9C 4500002F */ bc1f .L8024105C /* 9A9390 80240FA0 240403E8 */ addiu $a0, $zero, 0x3e8 /* 9A9394 80240FA4 24020002 */ addiu $v0, $zero, 2 @@ -145,7 +145,7 @@ glabel func_80240DDC_9A91CC /* 9A93E8 80240FF8 18400003 */ blez $v0, .L80241008 /* 9A93EC 80240FFC 24020004 */ addiu $v0, $zero, 4 /* 9A93F0 80241000 14600002 */ bnez $v1, .L8024100C -/* 9A93F4 80241004 00000000 */ nop +/* 9A93F4 80241004 00000000 */ nop .L80241008: /* 9A93F8 80241008 AE420070 */ sw $v0, 0x70($s2) .L8024100C: diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241144_9A9534.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241144_9A9534.s index 210d466521..e579b97328 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241144_9A9534.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241144_9A9534.s @@ -38,7 +38,7 @@ glabel func_80241144_9A9534 /* 9A95B8 802411C8 2402000F */ addiu $v0, $zero, 0xf /* 9A95BC 802411CC AFA2001C */ sw $v0, 0x1c($sp) /* 9A95C0 802411D0 44833000 */ mtc1 $v1, $f6 -/* 9A95C4 802411D4 00000000 */ nop +/* 9A95C4 802411D4 00000000 */ nop /* 9A95C8 802411D8 468031A0 */ cvt.s.w $f6, $f6 /* 9A95CC 802411DC 44073000 */ mfc1 $a3, $f6 /* 9A95D0 802411E0 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,13 +69,13 @@ glabel func_80241144_9A9534 .L80241244: /* 9A9634 80241244 8602008C */ lh $v0, 0x8c($s0) /* 9A9638 80241248 14400025 */ bnez $v0, .L802412E0 -/* 9A963C 8024124C 00000000 */ nop +/* 9A963C 8024124C 00000000 */ nop /* 9A9640 80241250 9602008E */ lhu $v0, 0x8e($s0) /* 9A9644 80241254 2442FFFF */ addiu $v0, $v0, -1 /* 9A9648 80241258 A602008E */ sh $v0, 0x8e($s0) /* 9A964C 8024125C 00021400 */ sll $v0, $v0, 0x10 /* 9A9650 80241260 1440001F */ bnez $v0, .L802412E0 -/* 9A9654 80241264 00000000 */ nop +/* 9A9654 80241264 00000000 */ nop /* 9A9658 80241268 8E820074 */ lw $v0, 0x74($s4) /* 9A965C 8024126C 2442FFFF */ addiu $v0, $v0, -1 /* 9A9660 80241270 10400019 */ beqz $v0, .L802412D8 @@ -84,7 +84,7 @@ glabel func_80241144_9A9534 /* 9A966C 8024127C 9442002A */ lhu $v0, 0x2a($v0) /* 9A9670 80241280 30420010 */ andi $v0, $v0, 0x10 /* 9A9674 80241284 14400007 */ bnez $v0, .L802412A4 -/* 9A9678 80241288 00000000 */ nop +/* 9A9678 80241288 00000000 */ nop /* 9A967C 8024128C C600000C */ lwc1 $f0, 0xc($s0) /* 9A9680 80241290 3C014334 */ lui $at, 0x4334 /* 9A9684 80241294 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241300_9A96F0.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241300_9A96F0.s index 7617d24979..f5f998287a 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241300_9A96F0.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241300_9A96F0.s @@ -28,7 +28,7 @@ glabel func_80241300_9A96F0 /* 9A9748 80241358 8E0200D0 */ lw $v0, 0xd0($s0) /* 9A974C 8024135C 8C42007C */ lw $v0, 0x7c($v0) /* 9A9750 80241360 04410004 */ bgez $v0, .L80241374 -/* 9A9754 80241364 00000000 */ nop +/* 9A9754 80241364 00000000 */ nop /* 9A9758 80241368 C6400000 */ lwc1 $f0, ($s2) /* 9A975C 8024136C 080904E5 */ j .L80241394 /* 9A9760 80241370 E4A00018 */ swc1 $f0, 0x18($a1) @@ -36,7 +36,7 @@ glabel func_80241300_9A96F0 /* 9A9764 80241374 3C018024 */ lui $at, %hi(D_80245F48) /* 9A9768 80241378 D4225F48 */ ldc1 $f2, %lo(D_80245F48)($at) /* 9A976C 8024137C 44820000 */ mtc1 $v0, $f0 -/* 9A9770 80241380 00000000 */ nop +/* 9A9770 80241380 00000000 */ nop /* 9A9774 80241384 46800021 */ cvt.d.w $f0, $f0 /* 9A9778 80241388 46220003 */ div.d $f0, $f0, $f2 /* 9A977C 8024138C 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802414A0_9A9890.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802414A0_9A9890.s index ac3d24498b..a7598254c6 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802414A0_9A9890.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802414A0_9A9890.s @@ -47,20 +47,20 @@ glabel func_802414A0_9A9890 /* 9A9938 80241548 8E02001C */ lw $v0, 0x1c($s0) /* 9A993C 8024154C 46001005 */ abs.s $f0, $f2 /* 9A9940 80241550 44822000 */ mtc1 $v0, $f4 -/* 9A9944 80241554 00000000 */ nop +/* 9A9944 80241554 00000000 */ nop /* 9A9948 80241558 46802120 */ cvt.s.w $f4, $f4 /* 9A994C 8024155C 4600203C */ c.lt.s $f4, $f0 -/* 9A9950 80241560 00000000 */ nop +/* 9A9950 80241560 00000000 */ nop /* 9A9954 80241564 4500000D */ bc1f .L8024159C -/* 9A9958 80241568 00000000 */ nop +/* 9A9958 80241568 00000000 */ nop /* 9A995C 8024156C 44800000 */ mtc1 $zero, $f0 /* 9A9960 80241570 C654000C */ lwc1 $f20, 0xc($s2) /* 9A9964 80241574 4600103C */ c.lt.s $f2, $f0 -/* 9A9968 80241578 00000000 */ nop +/* 9A9968 80241578 00000000 */ nop /* 9A996C 8024157C 45000006 */ bc1f .L80241598 /* 9A9970 80241580 00021023 */ negu $v0, $v0 /* 9A9974 80241584 44820000 */ mtc1 $v0, $f0 -/* 9A9978 80241588 00000000 */ nop +/* 9A9978 80241588 00000000 */ nop /* 9A997C 8024158C 46800020 */ cvt.s.w $f0, $f0 /* 9A9980 80241590 08090567 */ j .L8024159C /* 9A9984 80241594 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802415D0_9A99C0.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802415D0_9A99C0.s index 63a821621f..e3e59afd61 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802415D0_9A99C0.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802415D0_9A99C0.s @@ -37,7 +37,7 @@ glabel func_802415D0_9A99C0 /* 9A9A40 80241650 2402000F */ addiu $v0, $zero, 0xf /* 9A9A44 80241654 AFA2001C */ sw $v0, 0x1c($sp) /* 9A9A48 80241658 44833000 */ mtc1 $v1, $f6 -/* 9A9A4C 8024165C 00000000 */ nop +/* 9A9A4C 8024165C 00000000 */ nop /* 9A9A50 80241660 468031A0 */ cvt.s.w $f6, $f6 /* 9A9A54 80241664 44073000 */ mfc1 $a3, $f6 /* 9A9A58 80241668 27A20028 */ addiu $v0, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241758_9A9B48.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241758_9A9B48.s index d3c0e93bf0..eb13f48069 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241758_9A9B48.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241758_9A9B48.s @@ -28,7 +28,7 @@ glabel func_80241758_9A9B48 /* 9A9BA0 802417B0 C4400008 */ lwc1 $f0, 8($v0) /* 9A9BA4 802417B4 46800020 */ cvt.s.w $f0, $f0 /* 9A9BA8 802417B8 4602003E */ c.le.s $f0, $f2 -/* 9A9BAC 802417BC 00000000 */ nop +/* 9A9BAC 802417BC 00000000 */ nop /* 9A9BB0 802417C0 45020003 */ bc1fl .L802417D0 /* 9A9BB4 802417C4 24840001 */ addiu $a0, $a0, 1 /* 9A9BB8 802417C8 080905F8 */ j .L802417E0 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s index 2ea07311f2..fc8de87a36 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s @@ -124,72 +124,85 @@ glabel func_80241818_9A9C08 /* 9A9DCC 802419DC 2C620064 */ sltiu $v0, $v1, 0x64 /* 9A9DD0 802419E0 10400042 */ beqz $v0, .L80241AEC /* 9A9DD4 802419E4 00031080 */ sll $v0, $v1, 2 -/* 9A9DD8 802419E8 3C018024 */ lui $at, %hi(D_80245F50) +/* 9A9DD8 802419E8 3C018024 */ lui $at, %hi(jtbl_80245F50_9AE340) /* 9A9DDC 802419EC 00220821 */ addu $at, $at, $v0 -/* 9A9DE0 802419F0 8C225F50 */ lw $v0, %lo(D_80245F50)($at) +/* 9A9DE0 802419F0 8C225F50 */ lw $v0, %lo(jtbl_80245F50_9AE340)($at) /* 9A9DE4 802419F4 00400008 */ jr $v0 /* 9A9DE8 802419F8 00000000 */ nop +glabel L802419FC_9A9DEC /* 9A9DEC 802419FC 0280202D */ daddu $a0, $s4, $zero /* 9A9DF0 80241A00 0260282D */ daddu $a1, $s3, $zero /* 9A9DF4 80241A04 0C090321 */ jal func_80240C84_9A9074 /* 9A9DF8 80241A08 02A0302D */ daddu $a2, $s5, $zero +glabel L80241A0C_9A9DFC /* 9A9DFC 80241A0C 0280202D */ daddu $a0, $s4, $zero /* 9A9E00 80241A10 0260282D */ daddu $a1, $s3, $zero /* 9A9E04 80241A14 0C090377 */ jal func_80240DDC_9A91CC /* 9A9E08 80241A18 02A0302D */ daddu $a2, $s5, $zero /* 9A9E0C 80241A1C 080906BB */ j .L80241AEC /* 9A9E10 80241A20 00000000 */ nop +glabel L80241A24_9A9E14 /* 9A9E14 80241A24 0280202D */ daddu $a0, $s4, $zero /* 9A9E18 80241A28 0260282D */ daddu $a1, $s3, $zero /* 9A9E1C 80241A2C 0C090421 */ jal trd_04_UnkNpcAIFunc1 /* 9A9E20 80241A30 02A0302D */ daddu $a2, $s5, $zero +glabel L80241A34_9A9E24 /* 9A9E24 80241A34 0280202D */ daddu $a0, $s4, $zero /* 9A9E28 80241A38 0260282D */ daddu $a1, $s3, $zero /* 9A9E2C 80241A3C 0C090451 */ jal func_80241144_9A9534 /* 9A9E30 80241A40 02A0302D */ daddu $a2, $s5, $zero /* 9A9E34 80241A44 080906BB */ j .L80241AEC /* 9A9E38 80241A48 00000000 */ nop +glabel L80241A4C_9A9E3C /* 9A9E3C 80241A4C 0280202D */ daddu $a0, $s4, $zero /* 9A9E40 80241A50 0260282D */ daddu $a1, $s3, $zero /* 9A9E44 80241A54 0C0904C0 */ jal func_80241300_9A96F0 /* 9A9E48 80241A58 02A0302D */ daddu $a2, $s5, $zero /* 9A9E4C 80241A5C 080906BB */ j .L80241AEC /* 9A9E50 80241A60 00000000 */ nop +glabel L80241A64_9A9E54 /* 9A9E54 80241A64 0280202D */ daddu $a0, $s4, $zero /* 9A9E58 80241A68 0260282D */ daddu $a1, $s3, $zero /* 9A9E5C 80241A6C 0C0904ED */ jal trd_04_NpcJumpFunc2 /* 9A9E60 80241A70 02A0302D */ daddu $a2, $s5, $zero +glabel L80241A74_9A9E64 /* 9A9E64 80241A74 0280202D */ daddu $a0, $s4, $zero /* 9A9E68 80241A78 0260282D */ daddu $a1, $s3, $zero /* 9A9E6C 80241A7C 0C09050A */ jal trd_04_NpcJumpFunc /* 9A9E70 80241A80 02A0302D */ daddu $a2, $s5, $zero /* 9A9E74 80241A84 080906BB */ j .L80241AEC /* 9A9E78 80241A88 00000000 */ nop +glabel L80241A8C_9A9E7C /* 9A9E7C 80241A8C 0280202D */ daddu $a0, $s4, $zero /* 9A9E80 80241A90 0260282D */ daddu $a1, $s3, $zero /* 9A9E84 80241A94 0C090528 */ jal func_802414A0_9A9890 /* 9A9E88 80241A98 02A0302D */ daddu $a2, $s5, $zero +glabel L80241A9C_9A9E8C /* 9A9E8C 80241A9C 0280202D */ daddu $a0, $s4, $zero /* 9A9E90 80241AA0 0260282D */ daddu $a1, $s3, $zero /* 9A9E94 80241AA4 0C090574 */ jal func_802415D0_9A99C0 /* 9A9E98 80241AA8 02A0302D */ daddu $a2, $s5, $zero /* 9A9E9C 80241AAC 080906BB */ j .L80241AEC /* 9A9EA0 80241AB0 00000000 */ nop +glabel L80241AB4_9A9EA4 /* 9A9EA4 80241AB4 0280202D */ daddu $a0, $s4, $zero /* 9A9EA8 80241AB8 0260282D */ daddu $a1, $s3, $zero /* 9A9EAC 80241ABC 0C0905BC */ jal trd_04_UnkNpcDurationFlagFunc /* 9A9EB0 80241AC0 02A0302D */ daddu $a2, $s5, $zero /* 9A9EB4 80241AC4 080906BB */ j .L80241AEC /* 9A9EB8 80241AC8 00000000 */ nop +glabel L80241ACC_9A9EBC /* 9A9EBC 80241ACC 0280202D */ daddu $a0, $s4, $zero /* 9A9EC0 80241AD0 0260282D */ daddu $a1, $s3, $zero /* 9A9EC4 80241AD4 0C0905D6 */ jal func_80241758_9A9B48 /* 9A9EC8 80241AD8 02A0302D */ daddu $a2, $s5, $zero /* 9A9ECC 80241ADC 080906BB */ j .L80241AEC /* 9A9ED0 80241AE0 00000000 */ nop +glabel L80241AE4_9A9ED4 /* 9A9ED4 80241AE4 0C0129CF */ jal func_8004A73C /* 9A9ED8 80241AE8 0280202D */ daddu $a0, $s4, $zero .L80241AEC: +glabel L80241AEC_9A9EDC /* 9A9EDC 80241AEC 8FBF0060 */ lw $ra, 0x60($sp) /* 9A9EE0 80241AF0 8FB5005C */ lw $s5, 0x5c($sp) /* 9A9EE4 80241AF4 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s index af46fe3030..8f77a7bb49 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s @@ -53,7 +53,7 @@ glabel func_80241B14_9A9F04 /* 9A9FC0 80241BD0 8E2200B0 */ lw $v0, 0xb0($s1) /* 9A9FC4 80241BD4 30420004 */ andi $v0, $v0, 4 /* 9A9FC8 80241BD8 10400048 */ beqz $v0, .L80241CFC -/* 9A9FCC 80241BDC 00000000 */ nop +/* 9A9FCC 80241BDC 00000000 */ nop .L80241BE0: /* 9A9FD0 80241BE0 A640008E */ sh $zero, 0x8e($s2) /* 9A9FD4 80241BE4 AE600070 */ sw $zero, 0x70($s3) @@ -103,7 +103,7 @@ glabel func_80241B14_9A9F04 /* 9AA07C 80241C8C 24020028 */ addiu $v0, $zero, 0x28 /* 9AA080 80241C90 AFA2001C */ sw $v0, 0x1c($sp) /* 9AA084 80241C94 44833000 */ mtc1 $v1, $f6 -/* 9AA088 80241C98 00000000 */ nop +/* 9AA088 80241C98 00000000 */ nop /* 9AA08C 80241C9C 468031A0 */ cvt.s.w $f6, $f6 /* 9AA090 80241CA0 44073000 */ mfc1 $a3, $f6 /* 9AA094 80241CA4 27A20048 */ addiu $v0, $sp, 0x48 @@ -134,64 +134,75 @@ glabel func_80241B14_9A9F04 /* 9AA0F0 80241D00 2C620064 */ sltiu $v0, $v1, 0x64 /* 9AA0F4 80241D04 1040003A */ beqz $v0, .L80241DF0 /* 9AA0F8 80241D08 00031080 */ sll $v0, $v1, 2 -/* 9AA0FC 80241D0C 3C018024 */ lui $at, %hi(D_802460E0) +/* 9AA0FC 80241D0C 3C018024 */ lui $at, %hi(jtbl_802460E0_9AE4D0) /* 9AA100 80241D10 00220821 */ addu $at, $at, $v0 -/* 9AA104 80241D14 8C2260E0 */ lw $v0, %lo(D_802460E0)($at) +/* 9AA104 80241D14 8C2260E0 */ lw $v0, %lo(jtbl_802460E0_9AE4D0)($at) /* 9AA108 80241D18 00400008 */ jr $v0 -/* 9AA10C 80241D1C 00000000 */ nop +/* 9AA10C 80241D1C 00000000 */ nop +glabel L80241D20_9AA110 /* 9AA110 80241D20 0260202D */ daddu $a0, $s3, $zero /* 9AA114 80241D24 0280282D */ daddu $a1, $s4, $zero /* 9AA118 80241D28 0C090321 */ jal func_80240C84_9A9074 /* 9AA11C 80241D2C 02A0302D */ daddu $a2, $s5, $zero /* 9AA120 80241D30 96220086 */ lhu $v0, 0x86($s1) /* 9AA124 80241D34 A64200A8 */ sh $v0, 0xa8($s2) +glabel L80241D38_9AA128 /* 9AA128 80241D38 0260202D */ daddu $a0, $s3, $zero /* 9AA12C 80241D3C 0280282D */ daddu $a1, $s4, $zero /* 9AA130 80241D40 0C090377 */ jal func_80240DDC_9A91CC /* 9AA134 80241D44 02A0302D */ daddu $a2, $s5, $zero /* 9AA138 80241D48 0809077C */ j .L80241DF0 -/* 9AA13C 80241D4C 00000000 */ nop +/* 9AA13C 80241D4C 00000000 */ nop +glabel L80241D50_9AA140 /* 9AA140 80241D50 0260202D */ daddu $a0, $s3, $zero /* 9AA144 80241D54 0280282D */ daddu $a1, $s4, $zero /* 9AA148 80241D58 0C090421 */ jal trd_04_UnkNpcAIFunc1 /* 9AA14C 80241D5C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241D60_9AA150 /* 9AA150 80241D60 0260202D */ daddu $a0, $s3, $zero /* 9AA154 80241D64 0280282D */ daddu $a1, $s4, $zero /* 9AA158 80241D68 0C090451 */ jal func_80241144_9A9534 /* 9AA15C 80241D6C 02A0302D */ daddu $a2, $s5, $zero /* 9AA160 80241D70 0809077C */ j .L80241DF0 -/* 9AA164 80241D74 00000000 */ nop +/* 9AA164 80241D74 00000000 */ nop +glabel L80241D78_9AA168 /* 9AA168 80241D78 0260202D */ daddu $a0, $s3, $zero /* 9AA16C 80241D7C 0280282D */ daddu $a1, $s4, $zero /* 9AA170 80241D80 0C0904C0 */ jal func_80241300_9A96F0 /* 9AA174 80241D84 02A0302D */ daddu $a2, $s5, $zero /* 9AA178 80241D88 0809077C */ j .L80241DF0 -/* 9AA17C 80241D8C 00000000 */ nop +/* 9AA17C 80241D8C 00000000 */ nop +glabel L80241D90_9AA180 /* 9AA180 80241D90 0260202D */ daddu $a0, $s3, $zero /* 9AA184 80241D94 0280282D */ daddu $a1, $s4, $zero /* 9AA188 80241D98 0C09012C */ jal trd_04_set_script_owner_npc_anim /* 9AA18C 80241D9C 02A0302D */ daddu $a2, $s5, $zero +glabel L80241DA0_9AA190 /* 9AA190 80241DA0 0260202D */ daddu $a0, $s3, $zero /* 9AA194 80241DA4 0280282D */ daddu $a1, $s4, $zero /* 9AA198 80241DA8 0C09014B */ jal func_8024052C_9A891C /* 9AA19C 80241DAC 02A0302D */ daddu $a2, $s5, $zero /* 9AA1A0 80241DB0 0809077C */ j .L80241DF0 -/* 9AA1A4 80241DB4 00000000 */ nop +/* 9AA1A4 80241DB4 00000000 */ nop +glabel L80241DB8_9AA1A8 /* 9AA1A8 80241DB8 0260202D */ daddu $a0, $s3, $zero /* 9AA1AC 80241DBC 0280282D */ daddu $a1, $s4, $zero /* 9AA1B0 80241DC0 0C090198 */ jal trd_04_UnkNpcAIFunc12 /* 9AA1B4 80241DC4 02A0302D */ daddu $a2, $s5, $zero /* 9AA1B8 80241DC8 0809077C */ j .L80241DF0 -/* 9AA1BC 80241DCC 00000000 */ nop +/* 9AA1BC 80241DCC 00000000 */ nop +glabel L80241DD0_9AA1C0 /* 9AA1C0 80241DD0 0260202D */ daddu $a0, $s3, $zero /* 9AA1C4 80241DD4 0280282D */ daddu $a1, $s4, $zero /* 9AA1C8 80241DD8 0C0901F1 */ jal trd_04_set_script_owner_npc_col_height /* 9AA1CC 80241DDC 02A0302D */ daddu $a2, $s5, $zero /* 9AA1D0 80241DE0 0809077C */ j .L80241DF0 -/* 9AA1D4 80241DE4 00000000 */ nop +/* 9AA1D4 80241DE4 00000000 */ nop +glabel L80241DE8_9AA1D8 /* 9AA1D8 80241DE8 0C0129CF */ jal func_8004A73C /* 9AA1DC 80241DEC 0260202D */ daddu $a0, $s3, $zero .L80241DF0: +glabel L80241DF0_9AA1E0 /* 9AA1E0 80241DF0 8FBF0068 */ lw $ra, 0x68($sp) /* 9AA1E4 80241DF4 8FB50064 */ lw $s5, 0x64($sp) /* 9AA1E8 80241DF8 8FB40060 */ lw $s4, 0x60($sp) diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241E18_9AA208.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241E18_9AA208.s index 2c125d40de..62aaa6568d 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241E18_9AA208.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241E18_9AA208.s @@ -47,7 +47,7 @@ glabel func_80241E18_9AA208 /* 9AA2B0 80241EC0 0C0123F5 */ jal is_point_within_region /* 9AA2B4 80241EC4 8E070038 */ lw $a3, 0x38($s0) /* 9AA2B8 80241EC8 1040000E */ beqz $v0, .L80241F04 -/* 9AA2BC 80241ECC 00000000 */ nop +/* 9AA2BC 80241ECC 00000000 */ nop /* 9AA2C0 80241ED0 8E2200D0 */ lw $v0, 0xd0($s1) /* 9AA2C4 80241ED4 C60C0038 */ lwc1 $f12, 0x38($s0) /* 9AA2C8 80241ED8 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80241E18_9AA208 /* 9AA2DC 80241EEC 468031A0 */ cvt.s.w $f6, $f6 /* 9AA2E0 80241EF0 44073000 */ mfc1 $a3, $f6 /* 9AA2E4 80241EF4 0C00A720 */ jal atan2 -/* 9AA2E8 80241EF8 00000000 */ nop +/* 9AA2E8 80241EF8 00000000 */ nop /* 9AA2EC 80241EFC 080907CD */ j .L80241F34 /* 9AA2F0 80241F00 E600000C */ swc1 $f0, 0xc($s0) .L80241F04: @@ -66,7 +66,7 @@ glabel func_80241E18_9AA208 /* 9AA2F8 80241F08 2404003C */ addiu $a0, $zero, 0x3c /* 9AA2FC 80241F0C C60C000C */ lwc1 $f12, 0xc($s0) /* 9AA300 80241F10 44820000 */ mtc1 $v0, $f0 -/* 9AA304 80241F14 00000000 */ nop +/* 9AA304 80241F14 00000000 */ nop /* 9AA308 80241F18 46800020 */ cvt.s.w $f0, $f0 /* 9AA30C 80241F1C 46006300 */ add.s $f12, $f12, $f0 /* 9AA310 80241F20 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80241E18_9AA208 /* 9AA334 80241F44 8E2200D0 */ lw $v0, 0xd0($s1) /* 9AA338 80241F48 8C420014 */ lw $v0, 0x14($v0) /* 9AA33C 80241F4C 04410004 */ bgez $v0, .L80241F60 -/* 9AA340 80241F50 00000000 */ nop +/* 9AA340 80241F50 00000000 */ nop /* 9AA344 80241F54 C6400000 */ lwc1 $f0, ($s2) /* 9AA348 80241F58 080907E0 */ j .L80241F80 /* 9AA34C 80241F5C E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80241E18_9AA208 /* 9AA350 80241F60 3C018024 */ lui $at, %hi(D_80246270) /* 9AA354 80241F64 D4226270 */ ldc1 $f2, %lo(D_80246270)($at) /* 9AA358 80241F68 44820000 */ mtc1 $v0, $f0 -/* 9AA35C 80241F6C 00000000 */ nop +/* 9AA35C 80241F6C 00000000 */ nop /* 9AA360 80241F70 46800021 */ cvt.d.w $f0, $f0 /* 9AA364 80241F74 46220003 */ div.d $f0, $f0, $f2 /* 9AA368 80241F78 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80241E18_9AA208 /* 9AA37C 80241F8C 44801000 */ mtc1 $zero, $f2 /* 9AA380 80241F90 46000021 */ cvt.d.s $f0, $f0 /* 9AA384 80241F94 46220002 */ mul.d $f0, $f0, $f2 -/* 9AA388 80241F98 00000000 */ nop +/* 9AA388 80241F98 00000000 */ nop /* 9AA38C 80241F9C 24020001 */ addiu $v0, $zero, 1 /* 9AA390 80241FA0 4620018D */ trunc.w.d $f6, $f0 /* 9AA394 80241FA4 E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241FC8_9AA3B8.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241FC8_9AA3B8.s index cb22764b0b..12e153df54 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241FC8_9AA3B8.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241FC8_9AA3B8.s @@ -34,7 +34,7 @@ glabel func_80241FC8_9AA3B8 /* 9AA42C 8024203C 44803000 */ mtc1 $zero, $f6 /* 9AA430 80242040 46000021 */ cvt.d.s $f0, $f0 /* 9AA434 80242044 46260002 */ mul.d $f0, $f0, $f6 -/* 9AA438 80242048 00000000 */ nop +/* 9AA438 80242048 00000000 */ nop /* 9AA43C 8024204C 24020001 */ addiu $v0, $zero, 1 /* 9AA440 80242050 8E24006C */ lw $a0, 0x6c($s1) /* 9AA444 80242054 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80241FC8_9AA3B8 /* 9AA4A0 802420B0 C600003C */ lwc1 $f0, 0x3c($s0) /* 9AA4A4 802420B4 4600C001 */ sub.s $f0, $f24, $f0 /* 9AA4A8 802420B8 4600B03C */ c.lt.s $f22, $f0 -/* 9AA4AC 802420BC 00000000 */ nop +/* 9AA4AC 802420BC 00000000 */ nop /* 9AA4B0 802420C0 4500001B */ bc1f .L80242130 /* 9AA4B4 802420C4 34820010 */ ori $v0, $a0, 0x10 /* 9AA4B8 802420C8 0809084C */ j .L80242130 @@ -87,9 +87,9 @@ glabel func_80241FC8_9AA3B8 /* 9AA4FC 8024210C C7A00034 */ lwc1 $f0, 0x34($sp) /* 9AA500 80242110 4600D001 */ sub.s $f0, $f26, $f0 /* 9AA504 80242114 4600B03C */ c.lt.s $f22, $f0 -/* 9AA508 80242118 00000000 */ nop +/* 9AA508 80242118 00000000 */ nop /* 9AA50C 8024211C 45000004 */ bc1f .L80242130 -/* 9AA510 80242120 00000000 */ nop +/* 9AA510 80242120 00000000 */ nop /* 9AA514 80242124 8E22006C */ lw $v0, 0x6c($s1) /* 9AA518 80242128 34420010 */ ori $v0, $v0, 0x10 /* 9AA51C 8024212C AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80241FC8_9AA3B8 /* 9AA524 80242134 24030011 */ addiu $v1, $zero, 0x11 /* 9AA528 80242138 30420011 */ andi $v0, $v0, 0x11 /* 9AA52C 8024213C 14430039 */ bne $v0, $v1, .L80242224 -/* 9AA530 80242140 00000000 */ nop +/* 9AA530 80242140 00000000 */ nop /* 9AA534 80242144 8E020000 */ lw $v0, ($s0) /* 9AA538 80242148 30420008 */ andi $v0, $v0, 8 /* 9AA53C 8024214C 1040000A */ beqz $v0, .L80242178 @@ -108,7 +108,7 @@ glabel func_80241FC8_9AA3B8 /* 9AA54C 8024215C D4206278 */ ldc1 $f0, %lo(D_80246278)($at) /* 9AA550 80242160 460010A1 */ cvt.d.s $f2, $f2 /* 9AA554 80242164 46201082 */ mul.d $f2, $f2, $f0 -/* 9AA558 80242168 00000000 */ nop +/* 9AA558 80242168 00000000 */ nop /* 9AA55C 8024216C 4600A021 */ cvt.d.s $f0, $f20 /* 9AA560 80242170 08090877 */ j .L802421DC /* 9AA564 80242174 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80241FC8_9AA3B8 /* 9AA5B4 802421C4 D4206280 */ ldc1 $f0, %lo(D_80246280)($at) /* 9AA5B8 802421C8 460010A1 */ cvt.d.s $f2, $f2 /* 9AA5BC 802421CC 46201082 */ mul.d $f2, $f2, $f0 -/* 9AA5C0 802421D0 00000000 */ nop +/* 9AA5C0 802421D0 00000000 */ nop /* 9AA5C4 802421D4 4600A021 */ cvt.d.s $f0, $f20 /* 9AA5C8 802421D8 46220000 */ add.d $f0, $f0, $f2 .L802421DC: @@ -149,7 +149,7 @@ glabel func_80241FC8_9AA3B8 /* 9AA5E8 802421F8 46000005 */ abs.s $f0, $f0 /* 9AA5EC 802421FC 46000021 */ cvt.d.s $f0, $f0 /* 9AA5F0 80242200 4622003C */ c.lt.d $f0, $f2 -/* 9AA5F4 80242204 00000000 */ nop +/* 9AA5F4 80242204 00000000 */ nop /* 9AA5F8 80242208 45000036 */ bc1f .L802422E4 /* 9AA5FC 8024220C 2403FFEF */ addiu $v1, $zero, -0x11 /* 9AA600 80242210 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80241FC8_9AA3B8 .L80242224: /* 9AA614 80242224 8E220070 */ lw $v0, 0x70($s1) /* 9AA618 80242228 1840002E */ blez $v0, .L802422E4 -/* 9AA61C 8024222C 00000000 */ nop +/* 9AA61C 8024222C 00000000 */ nop /* 9AA620 80242230 C62C0074 */ lwc1 $f12, 0x74($s1) /* 9AA624 80242234 0C00A8BB */ jal sin_deg /* 9AA628 80242238 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80241FC8_9AA3B8 /* 9AA680 80242290 27A70030 */ addiu $a3, $sp, 0x30 .L80242294: /* 9AA684 80242294 10400007 */ beqz $v0, .L802422B4 -/* 9AA688 80242298 00000000 */ nop +/* 9AA688 80242298 00000000 */ nop /* 9AA68C 8024229C 4616A082 */ mul.s $f2, $f20, $f22 -/* 9AA690 802422A0 00000000 */ nop +/* 9AA690 802422A0 00000000 */ nop /* 9AA694 802422A4 C7A0002C */ lwc1 $f0, 0x2c($sp) /* 9AA698 802422A8 461A0000 */ add.s $f0, $f0, $f26 /* 9AA69C 802422AC 080908B0 */ j .L802422C0 /* 9AA6A0 802422B0 46020000 */ add.s $f0, $f0, $f2 .L802422B4: /* 9AA6A4 802422B4 4616A002 */ mul.s $f0, $f20, $f22 -/* 9AA6A8 802422B8 00000000 */ nop +/* 9AA6A8 802422B8 00000000 */ nop /* 9AA6AC 802422BC 4600C000 */ add.s $f0, $f24, $f0 .L802422C0: /* 9AA6B0 802422C0 E600003C */ swc1 $f0, 0x3c($s0) /* 9AA6B4 802422C4 8E220074 */ lw $v0, 0x74($s1) /* 9AA6B8 802422C8 2442000A */ addiu $v0, $v0, 0xa /* 9AA6BC 802422CC 44826000 */ mtc1 $v0, $f12 -/* 9AA6C0 802422D0 00000000 */ nop +/* 9AA6C0 802422D0 00000000 */ nop /* 9AA6C4 802422D4 0C00A6C9 */ jal clamp_angle /* 9AA6C8 802422D8 46806320 */ cvt.s.w $f12, $f12 /* 9AA6CC 802422DC 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80241FC8_9AA3B8 /* 9AA6DC 802422EC 2442FFFF */ addiu $v0, $v0, -1 /* 9AA6E0 802422F0 8E430014 */ lw $v1, 0x14($s2) /* 9AA6E4 802422F4 04600048 */ bltz $v1, .L80242418 -/* 9AA6E8 802422F8 00000000 */ nop +/* 9AA6E8 802422F8 00000000 */ nop /* 9AA6EC 802422FC 8E620074 */ lw $v0, 0x74($s3) /* 9AA6F0 80242300 1C400042 */ bgtz $v0, .L8024240C /* 9AA6F4 80242304 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80241FC8_9AA3B8 /* 9AA6FC 8024230C 860200A8 */ lh $v0, 0xa8($s0) /* 9AA700 80242310 C602003C */ lwc1 $f2, 0x3c($s0) /* 9AA704 80242314 44820000 */ mtc1 $v0, $f0 -/* 9AA708 80242318 00000000 */ nop +/* 9AA708 80242318 00000000 */ nop /* 9AA70C 8024231C 46800020 */ cvt.s.w $f0, $f0 /* 9AA710 80242320 46001080 */ add.s $f2, $f2, $f0 /* 9AA714 80242324 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80241FC8_9AA3B8 /* 9AA730 80242340 C440002C */ lwc1 $f0, 0x2c($v0) /* 9AA734 80242344 46000021 */ cvt.d.s $f0, $f0 /* 9AA738 80242348 4622003C */ c.lt.d $f0, $f2 -/* 9AA73C 8024234C 00000000 */ nop +/* 9AA73C 8024234C 00000000 */ nop /* 9AA740 80242350 4500002C */ bc1f .L80242404 /* 9AA744 80242354 02A0202D */ daddu $a0, $s5, $zero /* 9AA748 80242358 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80241FC8_9AA3B8 /* 9AA784 80242394 3C01C1A0 */ lui $at, 0xc1a0 /* 9AA788 80242398 44812000 */ mtc1 $at, $f4 /* 9AA78C 8024239C 44834000 */ mtc1 $v1, $f8 -/* 9AA790 802423A0 00000000 */ nop +/* 9AA790 802423A0 00000000 */ nop /* 9AA794 802423A4 46804220 */ cvt.s.w $f8, $f8 /* 9AA798 802423A8 44074000 */ mfc1 $a3, $f8 /* 9AA79C 802423AC 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80241FC8_9AA3B8 /* 9AA850 80242460 0C0123F5 */ jal is_point_within_region /* 9AA854 80242464 8E070038 */ lw $a3, 0x38($s0) /* 9AA858 80242468 1040001A */ beqz $v0, .L802424D4 -/* 9AA85C 8024246C 00000000 */ nop +/* 9AA85C 8024246C 00000000 */ nop /* 9AA860 80242470 8E060038 */ lw $a2, 0x38($s0) /* 9AA864 80242474 8E2200D0 */ lw $v0, 0xd0($s1) /* 9AA868 80242478 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80241FC8_9AA3B8 /* 9AA87C 8024248C 468073A0 */ cvt.s.w $f14, $f14 /* 9AA880 80242490 C6020018 */ lwc1 $f2, 0x18($s0) /* 9AA884 80242494 4600103C */ c.lt.s $f2, $f0 -/* 9AA888 80242498 00000000 */ nop +/* 9AA888 80242498 00000000 */ nop /* 9AA88C 8024249C 4500000D */ bc1f .L802424D4 /* 9AA890 802424A0 E7A00034 */ swc1 $f0, 0x34($sp) /* 9AA894 802424A4 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80241FC8_9AA3B8 /* 9AA8D0 802424E0 00621825 */ or $v1, $v1, $v0 /* 9AA8D4 802424E4 00741825 */ or $v1, $v1, $s4 /* 9AA8D8 802424E8 10600008 */ beqz $v1, .L8024250C -/* 9AA8DC 802424EC 00000000 */ nop +/* 9AA8DC 802424EC 00000000 */ nop /* 9AA8E0 802424F0 8602008C */ lh $v0, 0x8c($s0) /* 9AA8E4 802424F4 14400031 */ bnez $v0, .L802425BC -/* 9AA8E8 802424F8 00000000 */ nop +/* 9AA8E8 802424F8 00000000 */ nop /* 9AA8EC 802424FC 8E050018 */ lw $a1, 0x18($s0) /* 9AA8F0 80242500 8E06000C */ lw $a2, 0xc($s0) /* 9AA8F4 80242504 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_80241FC8_9AA3B8 /* 9AA908 80242518 44801000 */ mtc1 $zero, $f2 /* 9AA90C 8024251C 46000021 */ cvt.d.s $f0, $f0 /* 9AA910 80242520 46220002 */ mul.d $f0, $f0, $f2 -/* 9AA914 80242524 00000000 */ nop +/* 9AA914 80242524 00000000 */ nop /* 9AA918 80242528 4620020D */ trunc.w.d $f8, $f0 /* 9AA91C 8024252C E628007C */ swc1 $f8, 0x7c($s1) /* 9AA920 80242530 8E420004 */ lw $v0, 4($s2) /* 9AA924 80242534 18400021 */ blez $v0, .L802425BC -/* 9AA928 80242538 00000000 */ nop +/* 9AA928 80242538 00000000 */ nop /* 9AA92C 8024253C 8602008E */ lh $v0, 0x8e($s0) /* 9AA930 80242540 9603008E */ lhu $v1, 0x8e($s0) /* 9AA934 80242544 18400005 */ blez $v0, .L8024255C @@ -375,7 +375,7 @@ glabel func_80241FC8_9AA3B8 /* 9AA93C 8024254C A602008E */ sh $v0, 0x8e($s0) /* 9AA940 80242550 00021400 */ sll $v0, $v0, 0x10 /* 9AA944 80242554 1C400019 */ bgtz $v0, .L802425BC -/* 9AA948 80242558 00000000 */ nop +/* 9AA948 80242558 00000000 */ nop .L8024255C: /* 9AA94C 8024255C 240403E8 */ addiu $a0, $zero, 0x3e8 /* 9AA950 80242560 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80241FC8_9AA3B8 /* 9AA998 802425A8 18400003 */ blez $v0, .L802425B8 /* 9AA99C 802425AC 28620003 */ slti $v0, $v1, 3 /* 9AA9A0 802425B0 10400002 */ beqz $v0, .L802425BC -/* 9AA9A4 802425B4 00000000 */ nop +/* 9AA9A4 802425B4 00000000 */ nop .L802425B8: /* 9AA9A8 802425B8 AE600070 */ sw $zero, 0x70($s3) .L802425BC: diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802426B0_9AAAA0.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802426B0_9AAAA0.s index a5b567956a..3207060b82 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802426B0_9AAAA0.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802426B0_9AAAA0.s @@ -42,11 +42,11 @@ glabel func_802426B0_9AAAA0 .L80242744: /* 9AAB34 80242744 8E220070 */ lw $v0, 0x70($s1) /* 9AAB38 80242748 18400034 */ blez $v0, .L8024281C -/* 9AAB3C 8024274C 00000000 */ nop +/* 9AAB3C 8024274C 00000000 */ nop /* 9AAB40 80242750 C62C0074 */ lwc1 $f12, 0x74($s1) /* 9AAB44 80242754 46806320 */ cvt.s.w $f12, $f12 /* 9AAB48 80242758 44820000 */ mtc1 $v0, $f0 -/* 9AAB4C 8024275C 00000000 */ nop +/* 9AAB4C 8024275C 00000000 */ nop /* 9AAB50 80242760 46800020 */ cvt.s.w $f0, $f0 /* 9AAB54 80242764 46000021 */ cvt.d.s $f0, $f0 /* 9AAB58 80242768 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_802426B0_9AAAA0 /* 9AABB8 802427C8 27A70030 */ addiu $a3, $sp, 0x30 .L802427CC: /* 9AABBC 802427CC 10400007 */ beqz $v0, .L802427EC -/* 9AABC0 802427D0 00000000 */ nop +/* 9AABC0 802427D0 00000000 */ nop /* 9AABC4 802427D4 4616A082 */ mul.s $f2, $f20, $f22 -/* 9AABC8 802427D8 00000000 */ nop +/* 9AABC8 802427D8 00000000 */ nop /* 9AABCC 802427DC C7A0002C */ lwc1 $f0, 0x2c($sp) /* 9AABD0 802427E0 46180000 */ add.s $f0, $f0, $f24 /* 9AABD4 802427E4 080909FE */ j .L802427F8 /* 9AABD8 802427E8 46020000 */ add.s $f0, $f0, $f2 .L802427EC: /* 9AABDC 802427EC 4616A002 */ mul.s $f0, $f20, $f22 -/* 9AABE0 802427F0 00000000 */ nop +/* 9AABE0 802427F0 00000000 */ nop /* 9AABE4 802427F4 4600D000 */ add.s $f0, $f26, $f0 .L802427F8: /* 9AABE8 802427F8 E600003C */ swc1 $f0, 0x3c($s0) /* 9AABEC 802427FC 8E220074 */ lw $v0, 0x74($s1) /* 9AABF0 80242800 2442000A */ addiu $v0, $v0, 0xa /* 9AABF4 80242804 44826000 */ mtc1 $v0, $f12 -/* 9AABF8 80242808 00000000 */ nop +/* 9AABF8 80242808 00000000 */ nop /* 9AABFC 8024280C 0C00A6C9 */ jal clamp_angle /* 9AAC00 80242810 46806320 */ cvt.s.w $f12, $f12 /* 9AAC04 80242814 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_802426B0_9AAAA0 /* 9AAC18 80242828 860200A8 */ lh $v0, 0xa8($s0) /* 9AAC1C 8024282C C600003C */ lwc1 $f0, 0x3c($s0) /* 9AAC20 80242830 44821000 */ mtc1 $v0, $f2 -/* 9AAC24 80242834 00000000 */ nop +/* 9AAC24 80242834 00000000 */ nop /* 9AAC28 80242838 468010A0 */ cvt.s.w $f2, $f2 /* 9AAC2C 8024283C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 9AAC30 80242840 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_802426B0_9AAAA0 /* 9AAC4C 8024285C 46240000 */ add.d $f0, $f0, $f4 /* 9AAC50 80242860 460010A1 */ cvt.d.s $f2, $f2 /* 9AAC54 80242864 4620103C */ c.lt.d $f2, $f0 -/* 9AAC58 80242868 00000000 */ nop +/* 9AAC58 80242868 00000000 */ nop /* 9AAC5C 8024286C 4500002E */ bc1f .L80242928 /* 9AAC60 80242870 0280202D */ daddu $a0, $s4, $zero /* 9AAC64 80242874 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_802426B0_9AAAA0 /* 9AACA4 802428B4 3C01C1A0 */ lui $at, 0xc1a0 /* 9AACA8 802428B8 44812000 */ mtc1 $at, $f4 /* 9AACAC 802428BC 44834000 */ mtc1 $v1, $f8 -/* 9AACB0 802428C0 00000000 */ nop +/* 9AACB0 802428C0 00000000 */ nop /* 9AACB4 802428C4 46804220 */ cvt.s.w $f8, $f8 /* 9AACB8 802428C8 44074000 */ mfc1 $a3, $f8 /* 9AACBC 802428CC 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_802426B0_9AAAA0 .L80242928: /* 9AAD18 80242928 8602008C */ lh $v0, 0x8c($s0) /* 9AAD1C 8024292C 14400025 */ bnez $v0, .L802429C4 -/* 9AAD20 80242930 00000000 */ nop +/* 9AAD20 80242930 00000000 */ nop /* 9AAD24 80242934 8602008E */ lh $v0, 0x8e($s0) /* 9AAD28 80242938 1C400022 */ bgtz $v0, .L802429C4 -/* 9AAD2C 8024293C 00000000 */ nop +/* 9AAD2C 8024293C 00000000 */ nop /* 9AAD30 80242940 8E620074 */ lw $v0, 0x74($s3) /* 9AAD34 80242944 2442FFFF */ addiu $v0, $v0, -1 /* 9AAD38 80242948 1840001D */ blez $v0, .L802429C0 @@ -183,7 +183,7 @@ glabel func_802426B0_9AAAA0 /* 9AAD44 80242954 9442002A */ lhu $v0, 0x2a($v0) /* 9AAD48 80242958 30420010 */ andi $v0, $v0, 0x10 /* 9AAD4C 8024295C 14400007 */ bnez $v0, .L8024297C -/* 9AAD50 80242960 00000000 */ nop +/* 9AAD50 80242960 00000000 */ nop /* 9AAD54 80242964 C600000C */ lwc1 $f0, 0xc($s0) /* 9AAD58 80242968 3C014334 */ lui $at, 0x4334 /* 9AAD5C 8024296C 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242AD8_9AAEC8.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242AD8_9AAEC8.s index 2829b0d086..9c52bca49b 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242AD8_9AAEC8.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242AD8_9AAEC8.s @@ -60,18 +60,18 @@ glabel func_80242AD8_9AAEC8 /* 9AAFA0 80242BB0 C6200038 */ lwc1 $f0, 0x38($s1) /* 9AAFA4 80242BB4 4600018D */ trunc.w.s $f6, $f0 /* 9AAFA8 80242BB8 44023000 */ mfc1 $v0, $f6 -/* 9AAFAC 80242BBC 00000000 */ nop +/* 9AAFAC 80242BBC 00000000 */ nop /* 9AAFB0 80242BC0 A6420010 */ sh $v0, 0x10($s2) /* 9AAFB4 80242BC4 C620003C */ lwc1 $f0, 0x3c($s1) /* 9AAFB8 80242BC8 4600018D */ trunc.w.s $f6, $f0 /* 9AAFBC 80242BCC 44023000 */ mfc1 $v0, $f6 -/* 9AAFC0 80242BD0 00000000 */ nop +/* 9AAFC0 80242BD0 00000000 */ nop /* 9AAFC4 80242BD4 A6420012 */ sh $v0, 0x12($s2) /* 9AAFC8 80242BD8 C6200040 */ lwc1 $f0, 0x40($s1) /* 9AAFCC 80242BDC A2430007 */ sb $v1, 7($s2) /* 9AAFD0 80242BE0 4600018D */ trunc.w.s $f6, $f0 /* 9AAFD4 80242BE4 44023000 */ mfc1 $v0, $f6 -/* 9AAFD8 80242BE8 00000000 */ nop +/* 9AAFD8 80242BE8 00000000 */ nop /* 9AAFDC 80242BEC A6420014 */ sh $v0, 0x14($s2) .L80242BF0: /* 9AAFE0 80242BF0 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C70_9AB060.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C70_9AB060.s index 005a1261cf..56369a877e 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C70_9AB060.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C70_9AB060.s @@ -42,9 +42,9 @@ glabel func_80242C70_9AB060 /* 9AB0F4 80242D04 44801800 */ mtc1 $zero, $f3 /* 9AB0F8 80242D08 46002021 */ cvt.d.s $f0, $f4 /* 9AB0FC 80242D0C 4620103E */ c.le.d $f2, $f0 -/* 9AB100 80242D10 00000000 */ nop +/* 9AB100 80242D10 00000000 */ nop /* 9AB104 80242D14 45000030 */ bc1f .L80242DD8 -/* 9AB108 80242D18 00000000 */ nop +/* 9AB108 80242D18 00000000 */ nop /* 9AB10C 80242D1C C600003C */ lwc1 $f0, 0x3c($s0) /* 9AB110 80242D20 46040000 */ add.s $f0, $f0, $f4 /* 9AB114 80242D24 E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_80242C70_9AB060 /* 9AB174 80242D84 27A70020 */ addiu $a3, $sp, 0x20 .L80242D88: /* 9AB178 80242D88 1040000B */ beqz $v0, .L80242DB8 -/* 9AB17C 80242D8C 00000000 */ nop +/* 9AB17C 80242D8C 00000000 */ nop /* 9AB180 80242D90 C7A0001C */ lwc1 $f0, 0x1c($sp) /* 9AB184 80242D94 46140080 */ add.s $f2, $f0, $f20 /* 9AB188 80242D98 C600003C */ lwc1 $f0, 0x3c($s0) /* 9AB18C 80242D9C 4600103E */ c.le.s $f2, $f0 -/* 9AB190 80242DA0 00000000 */ nop +/* 9AB190 80242DA0 00000000 */ nop /* 9AB194 80242DA4 4500008D */ bc1f .L80242FDC -/* 9AB198 80242DA8 00000000 */ nop +/* 9AB198 80242DA8 00000000 */ nop /* 9AB19C 80242DAC E602003C */ swc1 $f2, 0x3c($s0) /* 9AB1A0 80242DB0 08090BF7 */ j .L80242FDC /* 9AB1A4 80242DB4 AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_80242C70_9AB060 /* 9AB1A8 80242DB8 C602003C */ lwc1 $f2, 0x3c($s0) /* 9AB1AC 80242DBC C6000064 */ lwc1 $f0, 0x64($s0) /* 9AB1B0 80242DC0 4602003E */ c.le.s $f0, $f2 -/* 9AB1B4 80242DC4 00000000 */ nop +/* 9AB1B4 80242DC4 00000000 */ nop /* 9AB1B8 80242DC8 45030084 */ bc1tl .L80242FDC /* 9AB1BC 80242DCC AE400070 */ sw $zero, 0x70($s2) /* 9AB1C0 80242DD0 08090BF7 */ j .L80242FDC -/* 9AB1C4 80242DD4 00000000 */ nop +/* 9AB1C4 80242DD4 00000000 */ nop .L80242DD8: /* 9AB1C8 80242DD8 4622003C */ c.lt.d $f0, $f2 -/* 9AB1CC 80242DDC 00000000 */ nop +/* 9AB1CC 80242DDC 00000000 */ nop /* 9AB1D0 80242DE0 4500007E */ bc1f .L80242FDC -/* 9AB1D4 80242DE4 00000000 */ nop +/* 9AB1D4 80242DE4 00000000 */ nop /* 9AB1D8 80242DE8 9602008E */ lhu $v0, 0x8e($s0) /* 9AB1DC 80242DEC 24420001 */ addiu $v0, $v0, 1 /* 9AB1E0 80242DF0 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_80242C70_9AB060 /* 9AB1EC 80242DFC 00021403 */ sra $v0, $v0, 0x10 /* 9AB1F0 80242E00 0043102A */ slt $v0, $v0, $v1 /* 9AB1F4 80242E04 14400026 */ bnez $v0, .L80242EA0 -/* 9AB1F8 80242E08 00000000 */ nop +/* 9AB1F8 80242E08 00000000 */ nop /* 9AB1FC 80242E0C C60C0038 */ lwc1 $f12, 0x38($s0) /* 9AB200 80242E10 C60E0040 */ lwc1 $f14, 0x40($s0) /* 9AB204 80242E14 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_80242C70_9AB060 /* 9AB230 80242E40 8E62001C */ lw $v0, 0x1c($s3) /* 9AB234 80242E44 46001005 */ abs.s $f0, $f2 /* 9AB238 80242E48 44822000 */ mtc1 $v0, $f4 -/* 9AB23C 80242E4C 00000000 */ nop +/* 9AB23C 80242E4C 00000000 */ nop /* 9AB240 80242E50 46802120 */ cvt.s.w $f4, $f4 /* 9AB244 80242E54 4600203C */ c.lt.s $f4, $f0 -/* 9AB248 80242E58 00000000 */ nop +/* 9AB248 80242E58 00000000 */ nop /* 9AB24C 80242E5C 4500000D */ bc1f .L80242E94 -/* 9AB250 80242E60 00000000 */ nop +/* 9AB250 80242E60 00000000 */ nop /* 9AB254 80242E64 44800000 */ mtc1 $zero, $f0 /* 9AB258 80242E68 C614000C */ lwc1 $f20, 0xc($s0) /* 9AB25C 80242E6C 4600103C */ c.lt.s $f2, $f0 -/* 9AB260 80242E70 00000000 */ nop +/* 9AB260 80242E70 00000000 */ nop /* 9AB264 80242E74 45000006 */ bc1f .L80242E90 /* 9AB268 80242E78 00021023 */ negu $v0, $v0 /* 9AB26C 80242E7C 44820000 */ mtc1 $v0, $f0 -/* 9AB270 80242E80 00000000 */ nop +/* 9AB270 80242E80 00000000 */ nop /* 9AB274 80242E84 46800020 */ cvt.s.w $f0, $f0 /* 9AB278 80242E88 08090BA5 */ j .L80242E94 /* 9AB27C 80242E8C 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_80242C70_9AB060 /* 9AB2A4 80242EB4 C600001C */ lwc1 $f0, 0x1c($s0) /* 9AB2A8 80242EB8 46001080 */ add.s $f2, $f2, $f0 /* 9AB2AC 80242EBC 4616103C */ c.lt.s $f2, $f22 -/* 9AB2B0 80242EC0 00000000 */ nop +/* 9AB2B0 80242EC0 00000000 */ nop /* 9AB2B4 80242EC4 45020045 */ bc1fl .L80242FDC /* 9AB2B8 80242EC8 E602003C */ swc1 $f2, 0x3c($s0) /* 9AB2BC 80242ECC 08090BF6 */ j .L80242FD8 @@ -169,7 +169,7 @@ glabel func_80242C70_9AB060 /* 9AB2D4 80242EE4 C600001C */ lwc1 $f0, 0x1c($s0) /* 9AB2D8 80242EE8 C604003C */ lwc1 $f4, 0x3c($s0) /* 9AB2DC 80242EEC 44821000 */ mtc1 $v0, $f2 -/* 9AB2E0 80242EF0 00000000 */ nop +/* 9AB2E0 80242EF0 00000000 */ nop /* 9AB2E4 80242EF4 468010A0 */ cvt.s.w $f2, $f2 /* 9AB2E8 80242EF8 46000005 */ abs.s $f0, $f0 /* 9AB2EC 80242EFC 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_80242C70_9AB060 /* 9AB328 80242F38 0C0372DF */ jal func_800DCB7C /* 9AB32C 80242F3C 27A70020 */ addiu $a3, $sp, 0x20 /* 9AB330 80242F40 10400015 */ beqz $v0, .L80242F98 -/* 9AB334 80242F44 00000000 */ nop +/* 9AB334 80242F44 00000000 */ nop /* 9AB338 80242F48 860200A8 */ lh $v0, 0xa8($s0) /* 9AB33C 80242F4C C604001C */ lwc1 $f4, 0x1c($s0) /* 9AB340 80242F50 44820000 */ mtc1 $v0, $f0 -/* 9AB344 80242F54 00000000 */ nop +/* 9AB344 80242F54 00000000 */ nop /* 9AB348 80242F58 46800020 */ cvt.s.w $f0, $f0 /* 9AB34C 80242F5C 46002085 */ abs.s $f2, $f4 /* 9AB350 80242F60 46020000 */ add.s $f0, $f0, $f2 /* 9AB354 80242F64 C7A20024 */ lwc1 $f2, 0x24($sp) /* 9AB358 80242F68 4600103E */ c.le.s $f2, $f0 -/* 9AB35C 80242F6C 00000000 */ nop +/* 9AB35C 80242F6C 00000000 */ nop /* 9AB360 80242F70 45000005 */ bc1f .L80242F88 -/* 9AB364 80242F74 00000000 */ nop +/* 9AB364 80242F74 00000000 */ nop /* 9AB368 80242F78 C7A0001C */ lwc1 $f0, 0x1c($sp) /* 9AB36C 80242F7C AE00001C */ sw $zero, 0x1c($s0) /* 9AB370 80242F80 08090BF7 */ j .L80242FDC @@ -217,13 +217,13 @@ glabel func_80242C70_9AB060 /* 9AB38C 80242F9C 860200A8 */ lh $v0, 0xa8($s0) /* 9AB390 80242FA0 46163081 */ sub.s $f2, $f6, $f22 /* 9AB394 80242FA4 44820000 */ mtc1 $v0, $f0 -/* 9AB398 80242FA8 00000000 */ nop +/* 9AB398 80242FA8 00000000 */ nop /* 9AB39C 80242FAC 46800020 */ cvt.s.w $f0, $f0 /* 9AB3A0 80242FB0 46001080 */ add.s $f2, $f2, $f0 /* 9AB3A4 80242FB4 C604001C */ lwc1 $f4, 0x1c($s0) /* 9AB3A8 80242FB8 46002005 */ abs.s $f0, $f4 /* 9AB3AC 80242FBC 4602003C */ c.lt.s $f0, $f2 -/* 9AB3B0 80242FC0 00000000 */ nop +/* 9AB3B0 80242FC0 00000000 */ nop /* 9AB3B4 80242FC4 45020005 */ bc1fl .L80242FDC /* 9AB3B8 80242FC8 AE00001C */ sw $zero, 0x1c($s0) /* 9AB3BC 80242FCC 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243000_9AB3F0.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243000_9AB3F0.s index 4bf792f037..e54b16bc69 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243000_9AB3F0.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243000_9AB3F0.s @@ -49,15 +49,15 @@ glabel func_80243000_9AB3F0 /* 9AB498 802430A8 44802000 */ mtc1 $zero, $f4 /* 9AB49C 802430AC 460010A1 */ cvt.d.s $f2, $f2 /* 9AB4A0 802430B0 46241082 */ mul.d $f2, $f2, $f4 -/* 9AB4A4 802430B4 00000000 */ nop +/* 9AB4A4 802430B4 00000000 */ nop /* 9AB4A8 802430B8 C7A0001C */ lwc1 $f0, 0x1c($sp) /* 9AB4AC 802430BC 46000021 */ cvt.d.s $f0, $f0 /* 9AB4B0 802430C0 46240002 */ mul.d $f0, $f0, $f4 -/* 9AB4B4 802430C4 00000000 */ nop +/* 9AB4B4 802430C4 00000000 */ nop /* 9AB4B8 802430C8 3C013FE0 */ lui $at, 0x3fe0 /* 9AB4BC 802430CC 44812800 */ mtc1 $at, $f5 /* 9AB4C0 802430D0 44802000 */ mtc1 $zero, $f4 -/* 9AB4C4 802430D4 00000000 */ nop +/* 9AB4C4 802430D4 00000000 */ nop /* 9AB4C8 802430D8 46241080 */ add.d $f2, $f2, $f4 /* 9AB4CC 802430DC AE000074 */ sw $zero, 0x74($s0) /* 9AB4D0 802430E0 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s index 3817bbdd21..df803c7283 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s @@ -54,7 +54,7 @@ glabel func_80243124_9AB514 /* 9AB5D4 802431E4 8E4300B0 */ lw $v1, 0xb0($s2) /* 9AB5D8 802431E8 30620004 */ andi $v0, $v1, 4 /* 9AB5DC 802431EC 10400007 */ beqz $v0, .L8024320C -/* 9AB5E0 802431F0 00000000 */ nop +/* 9AB5E0 802431F0 00000000 */ nop /* 9AB5E4 802431F4 824200B4 */ lb $v0, 0xb4($s2) /* 9AB5E8 802431F8 1440003C */ bnez $v0, .L802432EC /* 9AB5EC 802431FC 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_80243124_9AB514 /* 9AB600 80243210 2C62000F */ sltiu $v0, $v1, 0xf /* 9AB604 80243214 10400034 */ beqz $v0, .L802432E8 /* 9AB608 80243218 00031080 */ sll $v0, $v1, 2 -/* 9AB60C 8024321C 3C018024 */ lui $at, %hi(D_80246288) +/* 9AB60C 8024321C 3C018024 */ lui $at, %hi(jtbl_80246288_9AE678) /* 9AB610 80243220 00220821 */ addu $at, $at, $v0 -/* 9AB614 80243224 8C226288 */ lw $v0, %lo(D_80246288)($at) +/* 9AB614 80243224 8C226288 */ lw $v0, %lo(jtbl_80246288_9AE678)($at) /* 9AB618 80243228 00400008 */ jr $v0 -/* 9AB61C 8024322C 00000000 */ nop +/* 9AB61C 8024322C 00000000 */ nop +glabel L80243230_9AB620 /* 9AB620 80243230 0280202D */ daddu $a0, $s4, $zero /* 9AB624 80243234 0200282D */ daddu $a1, $s0, $zero /* 9AB628 80243238 0C090786 */ jal func_80241E18_9AA208 /* 9AB62C 8024323C 0260302D */ daddu $a2, $s3, $zero +glabel L80243240_9AB630 /* 9AB630 80243240 0280202D */ daddu $a0, $s4, $zero /* 9AB634 80243244 0200282D */ daddu $a1, $s0, $zero /* 9AB638 80243248 0C0907F2 */ jal func_80241FC8_9AA3B8 /* 9AB63C 8024324C 0260302D */ daddu $a2, $s3, $zero /* 9AB640 80243250 08090CBB */ j .L802432EC /* 9AB644 80243254 0000102D */ daddu $v0, $zero, $zero +glabel L80243258_9AB648 /* 9AB648 80243258 0280202D */ daddu $a0, $s4, $zero /* 9AB64C 8024325C 0200282D */ daddu $a1, $s0, $zero /* 9AB650 80243260 0C09097C */ jal dup_trd_04_UnkNpcAIFunc1 /* 9AB654 80243264 0260302D */ daddu $a2, $s3, $zero +glabel L80243268_9AB658 /* 9AB658 80243268 0280202D */ daddu $a0, $s4, $zero /* 9AB65C 8024326C 0200282D */ daddu $a1, $s0, $zero /* 9AB660 80243270 0C0909AC */ jal func_802426B0_9AAAA0 /* 9AB664 80243274 0260302D */ daddu $a2, $s3, $zero /* 9AB668 80243278 08090CBB */ j .L802432EC /* 9AB66C 8024327C 0000102D */ daddu $v0, $zero, $zero +glabel L80243280_9AB670 /* 9AB670 80243280 0280202D */ daddu $a0, $s4, $zero /* 9AB674 80243284 0200282D */ daddu $a1, $s0, $zero /* 9AB678 80243288 0C090A7D */ jal trd_04_UnkNpcAIFunc2 /* 9AB67C 8024328C 0260302D */ daddu $a2, $s3, $zero +glabel L80243290_9AB680 /* 9AB680 80243290 0280202D */ daddu $a0, $s4, $zero /* 9AB684 80243294 0200282D */ daddu $a1, $s0, $zero /* 9AB688 80243298 0C090A9B */ jal func_80242A6C_9AAE5C /* 9AB68C 8024329C 0260302D */ daddu $a2, $s3, $zero /* 9AB690 802432A0 08090CBB */ j .L802432EC /* 9AB694 802432A4 0000102D */ daddu $v0, $zero, $zero +glabel L802432A8_9AB698 /* 9AB698 802432A8 0280202D */ daddu $a0, $s4, $zero /* 9AB69C 802432AC 0200282D */ daddu $a1, $s0, $zero /* 9AB6A0 802432B0 0C090AB6 */ jal func_80242AD8_9AAEC8 /* 9AB6A4 802432B4 0260302D */ daddu $a2, $s3, $zero /* 9AB6A8 802432B8 08090CBB */ j .L802432EC /* 9AB6AC 802432BC 0000102D */ daddu $v0, $zero, $zero +glabel L802432C0_9AB6B0 /* 9AB6B0 802432C0 0280202D */ daddu $a0, $s4, $zero /* 9AB6B4 802432C4 0200282D */ daddu $a1, $s0, $zero /* 9AB6B8 802432C8 0C090B03 */ jal trd_04_UnkNpcAIFunc3 /* 9AB6BC 802432CC 0260302D */ daddu $a2, $s3, $zero /* 9AB6C0 802432D0 08090CBB */ j .L802432EC /* 9AB6C4 802432D4 0000102D */ daddu $v0, $zero, $zero +glabel L802432D8_9AB6C8 /* 9AB6C8 802432D8 0280202D */ daddu $a0, $s4, $zero /* 9AB6CC 802432DC 0200282D */ daddu $a1, $s0, $zero /* 9AB6D0 802432E0 0C090B1C */ jal func_80242C70_9AB060 /* 9AB6D4 802432E4 0260302D */ daddu $a2, $s3, $zero .L802432E8: +glabel L802432E8_9AB6D8 /* 9AB6D8 802432E8 0000102D */ daddu $v0, $zero, $zero .L802432EC: /* 9AB6DC 802432EC 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243310_9AB700.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243310_9AB700.s index 029ad14ea5..bd473b80da 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243310_9AB700.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243310_9AB700.s @@ -49,7 +49,7 @@ glabel func_80243310_9AB700 /* 9AB7B0 802433C0 240502C1 */ addiu $a1, $zero, 0x2c1 /* 9AB7B4 802433C4 4600010D */ trunc.w.s $f4, $f0 /* 9AB7B8 802433C8 44022000 */ mfc1 $v0, $f4 -/* 9AB7BC 802433CC 00000000 */ nop +/* 9AB7BC 802433CC 00000000 */ nop /* 9AB7C0 802433D0 A6220012 */ sh $v0, 0x12($s1) /* 9AB7C4 802433D4 C6000040 */ lwc1 $f0, 0x40($s0) /* 9AB7C8 802433D8 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243438_9AB828.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243438_9AB828.s index 39618f1d67..e6027a4eaf 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243438_9AB828.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243438_9AB828.s @@ -28,7 +28,7 @@ glabel func_80243438_9AB828 /* 9AB884 80243494 A602008E */ sh $v0, 0x8e($s0) /* 9AB888 80243498 00021400 */ sll $v0, $v0, 0x10 /* 9AB88C 8024349C 1C40000F */ bgtz $v0, .L802434DC -/* 9AB890 802434A0 00000000 */ nop +/* 9AB890 802434A0 00000000 */ nop /* 9AB894 802434A4 3C013E99 */ lui $at, 0x3e99 /* 9AB898 802434A8 3421999A */ ori $at, $at, 0x999a /* 9AB89C 802434AC 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802434F4_9AB8E4.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802434F4_9AB8E4.s index d2856a56fc..0e27a5bbbf 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802434F4_9AB8E4.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802434F4_9AB8E4.s @@ -55,7 +55,7 @@ glabel func_802434F4_9AB8E4 .L802435BC: /* 9AB9AC 802435BC C600003C */ lwc1 $f0, 0x3c($s0) /* 9AB9B0 802435C0 4602003C */ c.lt.s $f0, $f2 -/* 9AB9B4 802435C4 00000000 */ nop +/* 9AB9B4 802435C4 00000000 */ nop /* 9AB9B8 802435C8 45010009 */ bc1t .L802435F0 /* 9AB9BC 802435CC 2402000A */ addiu $v0, $zero, 0xa /* 9AB9C0 802435D0 A602008E */ sh $v0, 0x8e($s0) diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s index 3704c30f7c..a81e1a9b56 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s @@ -57,7 +57,7 @@ glabel func_80243650_9ABA40 /* 9ABB0C 8024371C 8E4300B0 */ lw $v1, 0xb0($s2) /* 9ABB10 80243720 30620004 */ andi $v0, $v1, 4 /* 9ABB14 80243724 10400007 */ beqz $v0, .L80243744 -/* 9ABB18 80243728 00000000 */ nop +/* 9ABB18 80243728 00000000 */ nop /* 9ABB1C 8024372C 824200B4 */ lb $v0, 0xb4($s2) /* 9ABB20 80243730 14400052 */ bnez $v0, .L8024387C /* 9ABB24 80243734 0000102D */ daddu $v0, $zero, $zero @@ -69,15 +69,17 @@ glabel func_80243650_9ABA40 /* 9ABB38 80243748 2C620010 */ sltiu $v0, $v1, 0x10 /* 9ABB3C 8024374C 1040004A */ beqz $v0, .L80243878 /* 9ABB40 80243750 00031080 */ sll $v0, $v1, 2 -/* 9ABB44 80243754 3C018024 */ lui $at, %hi(D_802462C8) +/* 9ABB44 80243754 3C018024 */ lui $at, %hi(jtbl_802462C8_9AE6B8) /* 9ABB48 80243758 00220821 */ addu $at, $at, $v0 -/* 9ABB4C 8024375C 8C2262C8 */ lw $v0, %lo(D_802462C8)($at) +/* 9ABB4C 8024375C 8C2262C8 */ lw $v0, %lo(jtbl_802462C8_9AE6B8)($at) /* 9ABB50 80243760 00400008 */ jr $v0 -/* 9ABB54 80243764 00000000 */ nop +/* 9ABB54 80243764 00000000 */ nop +glabel L80243768_9ABB58 /* 9ABB58 80243768 0260202D */ daddu $a0, $s3, $zero /* 9ABB5C 8024376C 0200282D */ daddu $a1, $s0, $zero /* 9ABB60 80243770 0C090786 */ jal func_80241E18_9AA208 /* 9ABB64 80243774 0280302D */ daddu $a2, $s4, $zero +glabel L80243778_9ABB68 /* 9ABB68 80243778 0260202D */ daddu $a0, $s3, $zero /* 9ABB6C 8024377C 0200282D */ daddu $a1, $s0, $zero /* 9ABB70 80243780 0C0907F2 */ jal func_80241FC8_9AA3B8 @@ -86,10 +88,12 @@ glabel func_80243650_9ABA40 /* 9ABB7C 8024378C 24020002 */ addiu $v0, $zero, 2 /* 9ABB80 80243790 1462003A */ bne $v1, $v0, .L8024387C /* 9ABB84 80243794 0000102D */ daddu $v0, $zero, $zero +glabel L80243798_9ABB88 /* 9ABB88 80243798 0260202D */ daddu $a0, $s3, $zero /* 9ABB8C 8024379C 0200282D */ daddu $a1, $s0, $zero /* 9ABB90 802437A0 0C09097C */ jal dup_trd_04_UnkNpcAIFunc1 /* 9ABB94 802437A4 0280302D */ daddu $a2, $s4, $zero +glabel L802437A8_9ABB98 /* 9ABB98 802437A8 0260202D */ daddu $a0, $s3, $zero /* 9ABB9C 802437AC 0200282D */ daddu $a1, $s0, $zero /* 9ABBA0 802437B0 0C0909AC */ jal func_802426B0_9AAAA0 @@ -98,6 +102,7 @@ glabel func_80243650_9ABA40 /* 9ABBAC 802437BC 2402000A */ addiu $v0, $zero, 0xa /* 9ABBB0 802437C0 1462002E */ bne $v1, $v0, .L8024387C /* 9ABBB4 802437C4 0000102D */ daddu $v0, $zero, $zero +glabel L802437C8_9ABBB8 /* 9ABBB8 802437C8 0260202D */ daddu $a0, $s3, $zero /* 9ABBBC 802437CC 0200282D */ daddu $a1, $s0, $zero /* 9ABBC0 802437D0 0C090A7D */ jal trd_04_UnkNpcAIFunc2 @@ -106,6 +111,7 @@ glabel func_80243650_9ABA40 /* 9ABBCC 802437DC 2402000B */ addiu $v0, $zero, 0xb /* 9ABBD0 802437E0 14620026 */ bne $v1, $v0, .L8024387C /* 9ABBD4 802437E4 0000102D */ daddu $v0, $zero, $zero +glabel L802437E8_9ABBD8 /* 9ABBD8 802437E8 0260202D */ daddu $a0, $s3, $zero /* 9ABBDC 802437EC 0200282D */ daddu $a1, $s0, $zero /* 9ABBE0 802437F0 0C090A9B */ jal func_80242A6C_9AAE5C @@ -114,6 +120,7 @@ glabel func_80243650_9ABA40 /* 9ABBEC 802437FC 2402000C */ addiu $v0, $zero, 0xc /* 9ABBF0 80243800 1462001E */ bne $v1, $v0, .L8024387C /* 9ABBF4 80243804 0000102D */ daddu $v0, $zero, $zero +glabel L80243808_9ABBF8 /* 9ABBF8 80243808 0260202D */ daddu $a0, $s3, $zero /* 9ABBFC 8024380C 0200282D */ daddu $a1, $s0, $zero /* 9ABC00 80243810 0C090CC4 */ jal func_80243310_9AB700 @@ -122,6 +129,7 @@ glabel func_80243650_9ABA40 /* 9ABC0C 8024381C 2402000D */ addiu $v0, $zero, 0xd /* 9ABC10 80243820 14620016 */ bne $v1, $v0, .L8024387C /* 9ABC14 80243824 0000102D */ daddu $v0, $zero, $zero +glabel L80243828_9ABC18 /* 9ABC18 80243828 0260202D */ daddu $a0, $s3, $zero /* 9ABC1C 8024382C 0200282D */ daddu $a1, $s0, $zero /* 9ABC20 80243830 0C090D0E */ jal func_80243438_9AB828 @@ -130,6 +138,7 @@ glabel func_80243650_9ABA40 /* 9ABC2C 8024383C 2402000E */ addiu $v0, $zero, 0xe /* 9ABC30 80243840 1462000E */ bne $v1, $v0, .L8024387C /* 9ABC34 80243844 0000102D */ daddu $v0, $zero, $zero +glabel L80243848_9ABC38 /* 9ABC38 80243848 0260202D */ daddu $a0, $s3, $zero /* 9ABC3C 8024384C 0200282D */ daddu $a1, $s0, $zero /* 9ABC40 80243850 0C090D3D */ jal func_802434F4_9AB8E4 @@ -138,11 +147,13 @@ glabel func_80243650_9ABA40 /* 9ABC4C 8024385C 2402000F */ addiu $v0, $zero, 0xf /* 9ABC50 80243860 14620006 */ bne $v1, $v0, .L8024387C /* 9ABC54 80243864 0000102D */ daddu $v0, $zero, $zero +glabel L80243868_9ABC58 /* 9ABC58 80243868 0260202D */ daddu $a0, $s3, $zero /* 9ABC5C 8024386C 0200282D */ daddu $a1, $s0, $zero /* 9ABC60 80243870 0C090D83 */ jal trd_04_UnkDurationCheck /* 9ABC64 80243874 0280302D */ daddu $a2, $s4, $zero .L80243878: +glabel L80243878_9ABC68 /* 9ABC68 80243878 0000102D */ daddu $v0, $zero, $zero .L8024387C: /* 9ABC6C 8024387C 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240404_9AEB04.s b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240404_9AEB04.s index 69b36e1a90..0c8b9d97f3 100644 --- a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240404_9AEB04.s +++ b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240404_9AEB04.s @@ -11,10 +11,10 @@ glabel func_80240404_9AEB04 /* 9AEB1C 8024041C 3C018024 */ lui $at, %hi(func_80243070_8B30E0) /* 9AEB20 80240420 D4203070 */ ldc1 $f0, %lo(func_80243070_8B30E0)($at) /* 9AEB24 80240424 44831000 */ mtc1 $v1, $f2 -/* 9AEB28 80240428 00000000 */ nop +/* 9AEB28 80240428 00000000 */ nop /* 9AEB2C 8024042C 468010A1 */ cvt.d.w $f2, $f2 /* 9AEB30 80240430 46201082 */ mul.d $f2, $f2, $f0 -/* 9AEB34 80240434 00000000 */ nop +/* 9AEB34 80240434 00000000 */ nop /* 9AEB38 80240438 24040001 */ addiu $a0, $zero, 1 /* 9AEB3C 8024043C 3C108024 */ lui $s0, %hi(func_80243090_8B3100) /* 9AEB40 80240440 26103090 */ addiu $s0, $s0, %lo(func_80243090_8B3100) @@ -28,7 +28,7 @@ glabel func_80240404_9AEB04 /* 9AEB60 80240460 44813000 */ mtc1 $at, $f6 /* 9AEB64 80240464 C440002C */ lwc1 $f0, 0x2c($v0) /* 9AEB68 80240468 46241082 */ mul.d $f2, $f2, $f4 -/* 9AEB6C 8024046C 00000000 */ nop +/* 9AEB6C 8024046C 00000000 */ nop /* 9AEB70 80240470 AE00001C */ sw $zero, 0x1c($s0) /* 9AEB74 80240474 AE000020 */ sw $zero, 0x20($s0) /* 9AEB78 80240478 AE000024 */ sw $zero, 0x24($s0) diff --git a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s index ebb186455d..e905fb5fea 100644 --- a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s +++ b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s @@ -28,30 +28,30 @@ glabel func_80240508_9AEC08 /* 9AEC64 80240564 3C018024 */ lui $at, %hi(D_80243078) /* 9AEC68 80240568 D4223078 */ ldc1 $f2, %lo(D_80243078)($at) /* 9AEC6C 8024056C 44822000 */ mtc1 $v0, $f4 -/* 9AEC70 80240570 00000000 */ nop +/* 9AEC70 80240570 00000000 */ nop /* 9AEC74 80240574 46802121 */ cvt.d.w $f4, $f4 /* 9AEC78 80240578 46222102 */ mul.d $f4, $f4, $f2 -/* 9AEC7C 8024057C 00000000 */ nop +/* 9AEC7C 8024057C 00000000 */ nop /* 9AEC80 80240580 3C013FE0 */ lui $at, 0x3fe0 /* 9AEC84 80240584 44811800 */ mtc1 $at, $f3 /* 9AEC88 80240588 44801000 */ mtc1 $zero, $f2 -/* 9AEC8C 8024058C 00000000 */ nop +/* 9AEC8C 8024058C 00000000 */ nop /* 9AEC90 80240590 46222102 */ mul.d $f4, $f4, $f2 -/* 9AEC94 80240594 00000000 */ nop +/* 9AEC94 80240594 00000000 */ nop /* 9AEC98 80240598 4600018D */ trunc.w.s $f6, $f0 /* 9AEC9C 8024059C 44033000 */ mfc1 $v1, $f6 /* 9AECA0 802405A0 44900000 */ mtc1 $s0, $f0 -/* 9AECA4 802405A4 00000000 */ nop +/* 9AECA4 802405A4 00000000 */ nop /* 9AECA8 802405A8 46800021 */ cvt.d.w $f0, $f0 /* 9AECAC 802405AC 3C028024 */ lui $v0, %hi(func_80243090_8B3100) /* 9AECB0 802405B0 24423090 */ addiu $v0, $v0, %lo(func_80243090_8B3100) /* 9AECB4 802405B4 44921000 */ mtc1 $s2, $f2 -/* 9AECB8 802405B8 00000000 */ nop +/* 9AECB8 802405B8 00000000 */ nop /* 9AECBC 802405BC 468010A0 */ cvt.s.w $f2, $f2 /* 9AECC0 802405C0 E4420010 */ swc1 $f2, 0x10($v0) /* 9AECC4 802405C4 46240000 */ add.d $f0, $f0, $f4 /* 9AECC8 802405C8 44831000 */ mtc1 $v1, $f2 -/* 9AECCC 802405CC 00000000 */ nop +/* 9AECCC 802405CC 00000000 */ nop /* 9AECD0 802405D0 468010A0 */ cvt.s.w $f2, $f2 /* 9AECD4 802405D4 E4420018 */ swc1 $f2, 0x18($v0) /* 9AECD8 802405D8 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802405FC_9AECFC.s b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802405FC_9AECFC.s index 8db3192f28..3b221d753b 100644 --- a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802405FC_9AECFC.s +++ b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802405FC_9AECFC.s @@ -36,32 +36,32 @@ glabel func_802405FC_9AECFC /* 9AED78 80240678 1640000E */ bnez $s2, .L802406B4 /* 9AED7C 8024067C 0040182D */ daddu $v1, $v0, $zero /* 9AED80 80240680 44930000 */ mtc1 $s3, $f0 -/* 9AED84 80240684 00000000 */ nop +/* 9AED84 80240684 00000000 */ nop /* 9AED88 80240688 46800020 */ cvt.s.w $f0, $f0 /* 9AED8C 8024068C E440001C */ swc1 $f0, 0x1c($v0) /* 9AED90 80240690 44900000 */ mtc1 $s0, $f0 -/* 9AED94 80240694 00000000 */ nop +/* 9AED94 80240694 00000000 */ nop /* 9AED98 80240698 46800020 */ cvt.s.w $f0, $f0 /* 9AED9C 8024069C E4400020 */ swc1 $f0, 0x20($v0) /* 9AEDA0 802406A0 44840000 */ mtc1 $a0, $f0 -/* 9AEDA4 802406A4 00000000 */ nop +/* 9AEDA4 802406A4 00000000 */ nop /* 9AEDA8 802406A8 46800020 */ cvt.s.w $f0, $f0 /* 9AEDAC 802406AC 080901BF */ j .L802406FC /* 9AEDB0 802406B0 E4400024 */ swc1 $f0, 0x24($v0) .L802406B4: /* 9AEDB4 802406B4 C466001C */ lwc1 $f6, 0x1c($v1) /* 9AEDB8 802406B8 44930000 */ mtc1 $s3, $f0 -/* 9AEDBC 802406BC 00000000 */ nop +/* 9AEDBC 802406BC 00000000 */ nop /* 9AEDC0 802406C0 46800020 */ cvt.s.w $f0, $f0 /* 9AEDC4 802406C4 46003180 */ add.s $f6, $f6, $f0 /* 9AEDC8 802406C8 C4640020 */ lwc1 $f4, 0x20($v1) /* 9AEDCC 802406CC 44900000 */ mtc1 $s0, $f0 -/* 9AEDD0 802406D0 00000000 */ nop +/* 9AEDD0 802406D0 00000000 */ nop /* 9AEDD4 802406D4 46800020 */ cvt.s.w $f0, $f0 /* 9AEDD8 802406D8 46002100 */ add.s $f4, $f4, $f0 /* 9AEDDC 802406DC C4620024 */ lwc1 $f2, 0x24($v1) /* 9AEDE0 802406E0 44840000 */ mtc1 $a0, $f0 -/* 9AEDE4 802406E4 00000000 */ nop +/* 9AEDE4 802406E4 00000000 */ nop /* 9AEDE8 802406E8 46800020 */ cvt.s.w $f0, $f0 /* 9AEDEC 802406EC 46001080 */ add.s $f2, $f2, $f0 /* 9AEDF0 802406F0 E466001C */ swc1 $f6, 0x1c($v1) @@ -76,4 +76,4 @@ glabel func_802405FC_9AECFC /* 9AEE10 80240710 24020002 */ addiu $v0, $zero, 2 /* 9AEE14 80240714 03E00008 */ jr $ra /* 9AEE18 80240718 27BD0028 */ addiu $sp, $sp, 0x28 -/* 9AEE1C 8024071C 00000000 */ nop +/* 9AEE1C 8024071C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240724_9B1EB4.s b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240724_9B1EB4.s index 4caf453a7b..4281652aa7 100644 --- a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240724_9B1EB4.s +++ b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240724_9B1EB4.s @@ -21,11 +21,11 @@ glabel func_80240724_9B1EB4 /* 9B1EF4 80240764 AE000020 */ sw $zero, 0x20($s0) /* 9B1EF8 80240768 AE000024 */ sw $zero, 0x24($s0) /* 9B1EFC 8024076C 44826000 */ mtc1 $v0, $f12 -/* 9B1F00 80240770 00000000 */ nop +/* 9B1F00 80240770 00000000 */ nop /* 9B1F04 80240774 46806320 */ cvt.s.w $f12, $f12 /* 9B1F08 80240778 46006121 */ cvt.d.s $f4, $f12 /* 9B1F0C 8024077C 46202102 */ mul.d $f4, $f4, $f0 -/* 9B1F10 80240780 00000000 */ nop +/* 9B1F10 80240780 00000000 */ nop /* 9B1F14 80240784 AE000028 */ sw $zero, 0x28($s0) /* 9B1F18 80240788 3C013FE0 */ lui $at, 0x3fe0 /* 9B1F1C 8024078C 44810800 */ mtc1 $at, $f1 @@ -36,10 +36,10 @@ glabel func_80240724_9B1EB4 /* 9B1F30 802407A0 C46A0028 */ lwc1 $f10, 0x28($v1) /* 9B1F34 802407A4 C4680030 */ lwc1 $f8, 0x30($v1) /* 9B1F38 802407A8 46202102 */ mul.d $f4, $f4, $f0 -/* 9B1F3C 802407AC 00000000 */ nop +/* 9B1F3C 802407AC 00000000 */ nop /* 9B1F40 802407B0 C460002C */ lwc1 $f0, 0x2c($v1) /* 9B1F44 802407B4 44821000 */ mtc1 $v0, $f2 -/* 9B1F48 802407B8 00000000 */ nop +/* 9B1F48 802407B8 00000000 */ nop /* 9B1F4C 802407BC 468010A0 */ cvt.s.w $f2, $f2 /* 9B1F50 802407C0 E6020038 */ swc1 $f2, 0x38($s0) /* 9B1F54 802407C4 E60C003C */ swc1 $f12, 0x3c($s0) diff --git a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240854_9B1FE4.s b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240854_9B1FE4.s index a1018a63a0..1ab6a9fa91 100644 --- a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240854_9B1FE4.s +++ b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240854_9B1FE4.s @@ -30,25 +30,25 @@ glabel func_80240854_9B1FE4 /* 9B2048 802408B8 D42451C8 */ ldc1 $f4, %lo(D_802451C8)($at) /* 9B204C 802408BC 460010A1 */ cvt.d.s $f2, $f2 /* 9B2050 802408C0 46241082 */ mul.d $f2, $f2, $f4 -/* 9B2054 802408C4 00000000 */ nop +/* 9B2054 802408C4 00000000 */ nop /* 9B2058 802408C8 3C013FE0 */ lui $at, 0x3fe0 /* 9B205C 802408CC 44812800 */ mtc1 $at, $f5 /* 9B2060 802408D0 44802000 */ mtc1 $zero, $f4 -/* 9B2064 802408D4 00000000 */ nop +/* 9B2064 802408D4 00000000 */ nop /* 9B2068 802408D8 46241082 */ mul.d $f2, $f2, $f4 -/* 9B206C 802408DC 00000000 */ nop +/* 9B206C 802408DC 00000000 */ nop /* 9B2070 802408E0 4600018D */ trunc.w.s $f6, $f0 /* 9B2074 802408E4 44033000 */ mfc1 $v1, $f6 /* 9B2078 802408E8 44900000 */ mtc1 $s0, $f0 -/* 9B207C 802408EC 00000000 */ nop +/* 9B207C 802408EC 00000000 */ nop /* 9B2080 802408F0 46800021 */ cvt.d.w $f0, $f0 /* 9B2084 802408F4 44922000 */ mtc1 $s2, $f4 -/* 9B2088 802408F8 00000000 */ nop +/* 9B2088 802408F8 00000000 */ nop /* 9B208C 802408FC 46802120 */ cvt.s.w $f4, $f4 /* 9B2090 80240900 E4440014 */ swc1 $f4, 0x14($v0) /* 9B2094 80240904 46220000 */ add.d $f0, $f0, $f2 /* 9B2098 80240908 44831000 */ mtc1 $v1, $f2 -/* 9B209C 8024090C 00000000 */ nop +/* 9B209C 8024090C 00000000 */ nop /* 9B20A0 80240910 468010A0 */ cvt.s.w $f2, $f2 /* 9B20A4 80240914 E442001C */ swc1 $f2, 0x1c($v0) /* 9B20A8 80240918 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_8024093C_9B20CC.s b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_8024093C_9B20CC.s index 4510deb740..4f850b1fde 100644 --- a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_8024093C_9B20CC.s +++ b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_8024093C_9B20CC.s @@ -36,32 +36,32 @@ glabel func_8024093C_9B20CC /* 9B2148 802409B8 1640000E */ bnez $s2, .L802409F4 /* 9B214C 802409BC 0040182D */ daddu $v1, $v0, $zero /* 9B2150 802409C0 44930000 */ mtc1 $s3, $f0 -/* 9B2154 802409C4 00000000 */ nop +/* 9B2154 802409C4 00000000 */ nop /* 9B2158 802409C8 46800020 */ cvt.s.w $f0, $f0 /* 9B215C 802409CC E4400020 */ swc1 $f0, 0x20($v0) /* 9B2160 802409D0 44900000 */ mtc1 $s0, $f0 -/* 9B2164 802409D4 00000000 */ nop +/* 9B2164 802409D4 00000000 */ nop /* 9B2168 802409D8 46800020 */ cvt.s.w $f0, $f0 /* 9B216C 802409DC E4400024 */ swc1 $f0, 0x24($v0) /* 9B2170 802409E0 44840000 */ mtc1 $a0, $f0 -/* 9B2174 802409E4 00000000 */ nop +/* 9B2174 802409E4 00000000 */ nop /* 9B2178 802409E8 46800020 */ cvt.s.w $f0, $f0 /* 9B217C 802409EC 0809028F */ j .L80240A3C /* 9B2180 802409F0 E4400028 */ swc1 $f0, 0x28($v0) .L802409F4: /* 9B2184 802409F4 C4660020 */ lwc1 $f6, 0x20($v1) /* 9B2188 802409F8 44930000 */ mtc1 $s3, $f0 -/* 9B218C 802409FC 00000000 */ nop +/* 9B218C 802409FC 00000000 */ nop /* 9B2190 80240A00 46800020 */ cvt.s.w $f0, $f0 /* 9B2194 80240A04 46003180 */ add.s $f6, $f6, $f0 /* 9B2198 80240A08 C4640024 */ lwc1 $f4, 0x24($v1) /* 9B219C 80240A0C 44900000 */ mtc1 $s0, $f0 -/* 9B21A0 80240A10 00000000 */ nop +/* 9B21A0 80240A10 00000000 */ nop /* 9B21A4 80240A14 46800020 */ cvt.s.w $f0, $f0 /* 9B21A8 80240A18 46002100 */ add.s $f4, $f4, $f0 /* 9B21AC 80240A1C C4620028 */ lwc1 $f2, 0x28($v1) /* 9B21B0 80240A20 44840000 */ mtc1 $a0, $f0 -/* 9B21B4 80240A24 00000000 */ nop +/* 9B21B4 80240A24 00000000 */ nop /* 9B21B8 80240A28 46800020 */ cvt.s.w $f0, $f0 /* 9B21BC 80240A2C 46001080 */ add.s $f2, $f2, $f0 /* 9B21C0 80240A30 E4660020 */ swc1 $f6, 0x20($v1) diff --git a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240AD0_9B2260.s b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240AD0_9B2260.s index 4fbe4f1fc7..dfac85a104 100644 --- a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240AD0_9B2260.s +++ b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240AD0_9B2260.s @@ -9,4 +9,4 @@ glabel func_80240AD0_9B2260 /* 9B2270 80240AE0 24020002 */ addiu $v0, $zero, 2 /* 9B2274 80240AE4 03E00008 */ jr $ra /* 9B2278 80240AE8 AC600010 */ sw $zero, 0x10($v1) -/* 9B227C 80240AEC 00000000 */ nop +/* 9B227C 80240AEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_06/9B2280/func_80240AF0_9B2280.s b/asm/nonmatchings/world/area_trd/trd_06/9B2280/func_80240AF0_9B2280.s index 56643c7af2..2f3e02ad47 100644 --- a/asm/nonmatchings/world/area_trd/trd_06/9B2280/func_80240AF0_9B2280.s +++ b/asm/nonmatchings/world/area_trd/trd_06/9B2280/func_80240AF0_9B2280.s @@ -41,14 +41,14 @@ glabel func_80240AF0_9B2280 /* 9B230C 80240B7C 10600009 */ beqz $v1, .L80240BA4 /* 9B2310 80240B80 0000102D */ daddu $v0, $zero, $zero /* 9B2314 80240B84 08090315 */ j .L80240C54 -/* 9B2318 80240B88 00000000 */ nop +/* 9B2318 80240B88 00000000 */ nop .L80240B8C: /* 9B231C 80240B8C 10620013 */ beq $v1, $v0, .L80240BDC /* 9B2320 80240B90 24020003 */ addiu $v0, $zero, 3 /* 9B2324 80240B94 1062001E */ beq $v1, $v0, .L80240C10 /* 9B2328 80240B98 0000102D */ daddu $v0, $zero, $zero /* 9B232C 80240B9C 08090315 */ j .L80240C54 -/* 9B2330 80240BA0 00000000 */ nop +/* 9B2330 80240BA0 00000000 */ nop .L80240BA4: /* 9B2334 80240BA4 0C03AC5A */ jal func_800EB168 /* 9B2338 80240BA8 0000202D */ daddu $a0, $zero, $zero @@ -75,7 +75,7 @@ glabel func_80240AF0_9B2280 /* 9B2384 80240BF4 A0510014 */ sb $s1, 0x14($v0) /* 9B2388 80240BF8 82640012 */ lb $a0, 0x12($s3) /* 9B238C 80240BFC 0C03ACA9 */ jal func_800EB2A4 -/* 9B2390 80240C00 00000000 */ nop +/* 9B2390 80240C00 00000000 */ nop /* 9B2394 80240C04 24020003 */ addiu $v0, $zero, 3 /* 9B2398 80240C08 08090314 */ j .L80240C50 /* 9B239C 80240C0C AE420070 */ sw $v0, 0x70($s2) @@ -107,6 +107,6 @@ glabel func_80240AF0_9B2280 /* 9B23F8 80240C68 8FB00010 */ lw $s0, 0x10($sp) /* 9B23FC 80240C6C 03E00008 */ jr $ra /* 9B2400 80240C70 27BD0028 */ addiu $sp, $sp, 0x28 -/* 9B2404 80240C74 00000000 */ nop -/* 9B2408 80240C78 00000000 */ nop -/* 9B240C 80240C7C 00000000 */ nop +/* 9B2404 80240C74 00000000 */ nop +/* 9B2408 80240C78 00000000 */ nop +/* 9B240C 80240C7C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_06/9B2410/func_80240C80_9B2410.s b/asm/nonmatchings/world/area_trd/trd_06/9B2410/func_80240C80_9B2410.s index 04eee42fb9..8d6733424c 100644 --- a/asm/nonmatchings/world/area_trd/trd_06/9B2410/func_80240C80_9B2410.s +++ b/asm/nonmatchings/world/area_trd/trd_06/9B2410/func_80240C80_9B2410.s @@ -39,6 +39,6 @@ glabel func_80240C80_9B2410 /* 9B2498 80240D08 24020002 */ addiu $v0, $zero, 2 /* 9B249C 80240D0C 03E00008 */ jr $ra /* 9B24A0 80240D10 27BD0028 */ addiu $sp, $sp, 0x28 -/* 9B24A4 80240D14 00000000 */ nop -/* 9B24A8 80240D18 00000000 */ nop -/* 9B24AC 80240D1C 00000000 */ nop +/* 9B24A4 80240D14 00000000 */ nop +/* 9B24A8 80240D18 00000000 */ nop +/* 9B24AC 80240D1C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024038C_9B6D0C.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024038C_9B6D0C.s index 7f57f7218a..0924ec87d8 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024038C_9B6D0C.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024038C_9B6D0C.s @@ -21,11 +21,11 @@ glabel func_8024038C_9B6D0C /* 9B6D4C 802403CC A602008E */ sh $v0, 0x8e($s0) /* 9B6D50 802403D0 00021400 */ sll $v0, $v0, 0x10 /* 9B6D54 802403D4 1C400033 */ bgtz $v0, .L802404A4 -/* 9B6D58 802403D8 00000000 */ nop +/* 9B6D58 802403D8 00000000 */ nop .L802403DC: /* 9B6D5C 802403DC 8602008C */ lh $v0, 0x8c($s0) /* 9B6D60 802403E0 14400030 */ bnez $v0, .L802404A4 -/* 9B6D64 802403E4 00000000 */ nop +/* 9B6D64 802403E4 00000000 */ nop /* 9B6D68 802403E8 8E2200CC */ lw $v0, 0xcc($s1) /* 9B6D6C 802403EC 8C420024 */ lw $v0, 0x24($v0) /* 9B6D70 802403F0 AE020028 */ sw $v0, 0x28($s0) @@ -34,11 +34,11 @@ glabel func_8024038C_9B6D0C /* 9B6D7C 802403FC 8E230088 */ lw $v1, 0x88($s1) /* 9B6D80 80240400 24020005 */ addiu $v0, $zero, 5 /* 9B6D84 80240404 10620005 */ beq $v1, $v0, .L8024041C -/* 9B6D88 80240408 00000000 */ nop +/* 9B6D88 80240408 00000000 */ nop /* 9B6D8C 8024040C 10600003 */ beqz $v1, .L8024041C /* 9B6D90 80240410 24020001 */ addiu $v0, $zero, 1 /* 9B6D94 80240414 14620006 */ bne $v1, $v0, .L80240430 -/* 9B6D98 80240418 00000000 */ nop +/* 9B6D98 80240418 00000000 */ nop .L8024041C: /* 9B6D9C 8024041C 8E220084 */ lw $v0, 0x84($s1) /* 9B6DA0 80240420 00021FC2 */ srl $v1, $v0, 0x1f @@ -61,14 +61,14 @@ glabel func_8024038C_9B6D0C /* 9B6DE0 80240460 46220000 */ add.d $f0, $f0, $f2 /* 9B6DE4 80240464 4620010D */ trunc.w.d $f4, $f0 /* 9B6DE8 80240468 44022000 */ mfc1 $v0, $f4 -/* 9B6DEC 8024046C 00000000 */ nop +/* 9B6DEC 8024046C 00000000 */ nop /* 9B6DF0 80240470 A602008E */ sh $v0, 0x8e($s0) /* 9B6DF4 80240474 00021400 */ sll $v0, $v0, 0x10 /* 9B6DF8 80240478 8E230078 */ lw $v1, 0x78($s1) /* 9B6DFC 8024047C 00021403 */ sra $v0, $v0, 0x10 /* 9B6E00 80240480 0043102A */ slt $v0, $v0, $v1 /* 9B6E04 80240484 10400003 */ beqz $v0, .L80240494 -/* 9B6E08 80240488 00000000 */ nop +/* 9B6E08 80240488 00000000 */ nop /* 9B6E0C 8024048C 9622007A */ lhu $v0, 0x7a($s1) /* 9B6E10 80240490 A602008E */ sh $v0, 0x8e($s0) .L80240494: diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s index a3fa68dca6..cf58ba93e4 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s @@ -279,15 +279,17 @@ glabel func_802406A4_9B7024 /* 9B7410 80240A90 2C620015 */ sltiu $v0, $v1, 0x15 /* 9B7414 80240A94 10400009 */ beqz $v0, .L80240ABC /* 9B7418 80240A98 00031080 */ sll $v0, $v1, 2 -/* 9B741C 80240A9C 3C018024 */ lui $at, %hi(D_80244828) +/* 9B741C 80240A9C 3C018024 */ lui $at, %hi(jtbl_80244828_9BB1A8) /* 9B7420 80240AA0 00220821 */ addu $at, $at, $v0 -/* 9B7424 80240AA4 8C224828 */ lw $v0, %lo(D_80244828)($at) +/* 9B7424 80240AA4 8C224828 */ lw $v0, %lo(jtbl_80244828_9BB1A8)($at) /* 9B7428 80240AA8 00400008 */ jr $v0 /* 9B742C 80240AAC 00000000 */ nop +glabel L80240AB0_9B7430 /* 9B7430 80240AB0 8E420028 */ lw $v0, 0x28($s2) /* 9B7434 80240AB4 24420001 */ addiu $v0, $v0, 1 /* 9B7438 80240AB8 AE420028 */ sw $v0, 0x28($s2) .L80240ABC: +glabel L80240ABC_9B743C /* 9B743C 80240ABC 0000102D */ daddu $v0, $zero, $zero .L80240AC0: /* 9B7440 80240AC0 8FBF0068 */ lw $ra, 0x68($sp) diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240AE4_9B7464.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240AE4_9B7464.s index 9a38df1232..5b4e7a50af 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240AE4_9B7464.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240AE4_9B7464.s @@ -47,7 +47,7 @@ glabel func_80240AE4_9B7464 /* 9B750C 80240B8C 0C0123F5 */ jal is_point_within_region /* 9B7510 80240B90 8E070038 */ lw $a3, 0x38($s0) /* 9B7514 80240B94 1040000E */ beqz $v0, .L80240BD0 -/* 9B7518 80240B98 00000000 */ nop +/* 9B7518 80240B98 00000000 */ nop /* 9B751C 80240B9C 8E2200D0 */ lw $v0, 0xd0($s1) /* 9B7520 80240BA0 C60C0038 */ lwc1 $f12, 0x38($s0) /* 9B7524 80240BA4 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240AE4_9B7464 /* 9B7538 80240BB8 468031A0 */ cvt.s.w $f6, $f6 /* 9B753C 80240BBC 44073000 */ mfc1 $a3, $f6 /* 9B7540 80240BC0 0C00A720 */ jal atan2 -/* 9B7544 80240BC4 00000000 */ nop +/* 9B7544 80240BC4 00000000 */ nop /* 9B7548 80240BC8 08090300 */ j .L80240C00 /* 9B754C 80240BCC E600000C */ swc1 $f0, 0xc($s0) .L80240BD0: @@ -66,7 +66,7 @@ glabel func_80240AE4_9B7464 /* 9B7554 80240BD4 2404003C */ addiu $a0, $zero, 0x3c /* 9B7558 80240BD8 C60C000C */ lwc1 $f12, 0xc($s0) /* 9B755C 80240BDC 44820000 */ mtc1 $v0, $f0 -/* 9B7560 80240BE0 00000000 */ nop +/* 9B7560 80240BE0 00000000 */ nop /* 9B7564 80240BE4 46800020 */ cvt.s.w $f0, $f0 /* 9B7568 80240BE8 46006300 */ add.s $f12, $f12, $f0 /* 9B756C 80240BEC 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240AE4_9B7464 /* 9B7590 80240C10 8E2200D0 */ lw $v0, 0xd0($s1) /* 9B7594 80240C14 8C420014 */ lw $v0, 0x14($v0) /* 9B7598 80240C18 04410004 */ bgez $v0, .L80240C2C -/* 9B759C 80240C1C 00000000 */ nop +/* 9B759C 80240C1C 00000000 */ nop /* 9B75A0 80240C20 C6400000 */ lwc1 $f0, ($s2) /* 9B75A4 80240C24 08090313 */ j .L80240C4C /* 9B75A8 80240C28 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240AE4_9B7464 /* 9B75AC 80240C2C 3C018024 */ lui $at, %hi(D_80244880) /* 9B75B0 80240C30 D4224880 */ ldc1 $f2, %lo(D_80244880)($at) /* 9B75B4 80240C34 44820000 */ mtc1 $v0, $f0 -/* 9B75B8 80240C38 00000000 */ nop +/* 9B75B8 80240C38 00000000 */ nop /* 9B75BC 80240C3C 46800021 */ cvt.d.w $f0, $f0 /* 9B75C0 80240C40 46220003 */ div.d $f0, $f0, $f2 /* 9B75C4 80240C44 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240AE4_9B7464 /* 9B75D8 80240C58 44801000 */ mtc1 $zero, $f2 /* 9B75DC 80240C5C 46000021 */ cvt.d.s $f0, $f0 /* 9B75E0 80240C60 46220002 */ mul.d $f0, $f0, $f2 -/* 9B75E4 80240C64 00000000 */ nop +/* 9B75E4 80240C64 00000000 */ nop /* 9B75E8 80240C68 24020001 */ addiu $v0, $zero, 1 /* 9B75EC 80240C6C 4620018D */ trunc.w.d $f6, $f0 /* 9B75F0 80240C70 E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240C94_9B7614.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240C94_9B7614.s index 67fc954fd8..8b486b575e 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240C94_9B7614.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240C94_9B7614.s @@ -34,7 +34,7 @@ glabel func_80240C94_9B7614 /* 9B7688 80240D08 44803000 */ mtc1 $zero, $f6 /* 9B768C 80240D0C 46000021 */ cvt.d.s $f0, $f0 /* 9B7690 80240D10 46260002 */ mul.d $f0, $f0, $f6 -/* 9B7694 80240D14 00000000 */ nop +/* 9B7694 80240D14 00000000 */ nop /* 9B7698 80240D18 24020001 */ addiu $v0, $zero, 1 /* 9B769C 80240D1C 8E24006C */ lw $a0, 0x6c($s1) /* 9B76A0 80240D20 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80240C94_9B7614 /* 9B76FC 80240D7C C600003C */ lwc1 $f0, 0x3c($s0) /* 9B7700 80240D80 4600C001 */ sub.s $f0, $f24, $f0 /* 9B7704 80240D84 4600B03C */ c.lt.s $f22, $f0 -/* 9B7708 80240D88 00000000 */ nop +/* 9B7708 80240D88 00000000 */ nop /* 9B770C 80240D8C 4500001B */ bc1f .L80240DFC /* 9B7710 80240D90 34820010 */ ori $v0, $a0, 0x10 /* 9B7714 80240D94 0809037F */ j .L80240DFC @@ -87,9 +87,9 @@ glabel func_80240C94_9B7614 /* 9B7758 80240DD8 C7A00034 */ lwc1 $f0, 0x34($sp) /* 9B775C 80240DDC 4600D001 */ sub.s $f0, $f26, $f0 /* 9B7760 80240DE0 4600B03C */ c.lt.s $f22, $f0 -/* 9B7764 80240DE4 00000000 */ nop +/* 9B7764 80240DE4 00000000 */ nop /* 9B7768 80240DE8 45000004 */ bc1f .L80240DFC -/* 9B776C 80240DEC 00000000 */ nop +/* 9B776C 80240DEC 00000000 */ nop /* 9B7770 80240DF0 8E22006C */ lw $v0, 0x6c($s1) /* 9B7774 80240DF4 34420010 */ ori $v0, $v0, 0x10 /* 9B7778 80240DF8 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80240C94_9B7614 /* 9B7780 80240E00 24030011 */ addiu $v1, $zero, 0x11 /* 9B7784 80240E04 30420011 */ andi $v0, $v0, 0x11 /* 9B7788 80240E08 14430039 */ bne $v0, $v1, .L80240EF0 -/* 9B778C 80240E0C 00000000 */ nop +/* 9B778C 80240E0C 00000000 */ nop /* 9B7790 80240E10 8E020000 */ lw $v0, ($s0) /* 9B7794 80240E14 30420008 */ andi $v0, $v0, 8 /* 9B7798 80240E18 1040000A */ beqz $v0, .L80240E44 @@ -108,7 +108,7 @@ glabel func_80240C94_9B7614 /* 9B77A8 80240E28 D4204888 */ ldc1 $f0, %lo(D_80244888)($at) /* 9B77AC 80240E2C 460010A1 */ cvt.d.s $f2, $f2 /* 9B77B0 80240E30 46201082 */ mul.d $f2, $f2, $f0 -/* 9B77B4 80240E34 00000000 */ nop +/* 9B77B4 80240E34 00000000 */ nop /* 9B77B8 80240E38 4600A021 */ cvt.d.s $f0, $f20 /* 9B77BC 80240E3C 080903AA */ j .L80240EA8 /* 9B77C0 80240E40 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80240C94_9B7614 /* 9B7810 80240E90 D4204890 */ ldc1 $f0, %lo(D_80244890)($at) /* 9B7814 80240E94 460010A1 */ cvt.d.s $f2, $f2 /* 9B7818 80240E98 46201082 */ mul.d $f2, $f2, $f0 -/* 9B781C 80240E9C 00000000 */ nop +/* 9B781C 80240E9C 00000000 */ nop /* 9B7820 80240EA0 4600A021 */ cvt.d.s $f0, $f20 /* 9B7824 80240EA4 46220000 */ add.d $f0, $f0, $f2 .L80240EA8: @@ -149,7 +149,7 @@ glabel func_80240C94_9B7614 /* 9B7844 80240EC4 46000005 */ abs.s $f0, $f0 /* 9B7848 80240EC8 46000021 */ cvt.d.s $f0, $f0 /* 9B784C 80240ECC 4622003C */ c.lt.d $f0, $f2 -/* 9B7850 80240ED0 00000000 */ nop +/* 9B7850 80240ED0 00000000 */ nop /* 9B7854 80240ED4 45000036 */ bc1f .L80240FB0 /* 9B7858 80240ED8 2403FFEF */ addiu $v1, $zero, -0x11 /* 9B785C 80240EDC E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80240C94_9B7614 .L80240EF0: /* 9B7870 80240EF0 8E220070 */ lw $v0, 0x70($s1) /* 9B7874 80240EF4 1840002E */ blez $v0, .L80240FB0 -/* 9B7878 80240EF8 00000000 */ nop +/* 9B7878 80240EF8 00000000 */ nop /* 9B787C 80240EFC C62C0074 */ lwc1 $f12, 0x74($s1) /* 9B7880 80240F00 0C00A8BB */ jal sin_deg /* 9B7884 80240F04 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80240C94_9B7614 /* 9B78DC 80240F5C 27A70030 */ addiu $a3, $sp, 0x30 .L80240F60: /* 9B78E0 80240F60 10400007 */ beqz $v0, .L80240F80 -/* 9B78E4 80240F64 00000000 */ nop +/* 9B78E4 80240F64 00000000 */ nop /* 9B78E8 80240F68 4616A082 */ mul.s $f2, $f20, $f22 -/* 9B78EC 80240F6C 00000000 */ nop +/* 9B78EC 80240F6C 00000000 */ nop /* 9B78F0 80240F70 C7A0002C */ lwc1 $f0, 0x2c($sp) /* 9B78F4 80240F74 461A0000 */ add.s $f0, $f0, $f26 /* 9B78F8 80240F78 080903E3 */ j .L80240F8C /* 9B78FC 80240F7C 46020000 */ add.s $f0, $f0, $f2 .L80240F80: /* 9B7900 80240F80 4616A002 */ mul.s $f0, $f20, $f22 -/* 9B7904 80240F84 00000000 */ nop +/* 9B7904 80240F84 00000000 */ nop /* 9B7908 80240F88 4600C000 */ add.s $f0, $f24, $f0 .L80240F8C: /* 9B790C 80240F8C E600003C */ swc1 $f0, 0x3c($s0) /* 9B7910 80240F90 8E220074 */ lw $v0, 0x74($s1) /* 9B7914 80240F94 2442000A */ addiu $v0, $v0, 0xa /* 9B7918 80240F98 44826000 */ mtc1 $v0, $f12 -/* 9B791C 80240F9C 00000000 */ nop +/* 9B791C 80240F9C 00000000 */ nop /* 9B7920 80240FA0 0C00A6C9 */ jal clamp_angle /* 9B7924 80240FA4 46806320 */ cvt.s.w $f12, $f12 /* 9B7928 80240FA8 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80240C94_9B7614 /* 9B7938 80240FB8 2442FFFF */ addiu $v0, $v0, -1 /* 9B793C 80240FBC 8E430014 */ lw $v1, 0x14($s2) /* 9B7940 80240FC0 04600048 */ bltz $v1, .L802410E4 -/* 9B7944 80240FC4 00000000 */ nop +/* 9B7944 80240FC4 00000000 */ nop /* 9B7948 80240FC8 8E620074 */ lw $v0, 0x74($s3) /* 9B794C 80240FCC 1C400042 */ bgtz $v0, .L802410D8 /* 9B7950 80240FD0 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80240C94_9B7614 /* 9B7958 80240FD8 860200A8 */ lh $v0, 0xa8($s0) /* 9B795C 80240FDC C602003C */ lwc1 $f2, 0x3c($s0) /* 9B7960 80240FE0 44820000 */ mtc1 $v0, $f0 -/* 9B7964 80240FE4 00000000 */ nop +/* 9B7964 80240FE4 00000000 */ nop /* 9B7968 80240FE8 46800020 */ cvt.s.w $f0, $f0 /* 9B796C 80240FEC 46001080 */ add.s $f2, $f2, $f0 /* 9B7970 80240FF0 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80240C94_9B7614 /* 9B798C 8024100C C440002C */ lwc1 $f0, 0x2c($v0) /* 9B7990 80241010 46000021 */ cvt.d.s $f0, $f0 /* 9B7994 80241014 4622003C */ c.lt.d $f0, $f2 -/* 9B7998 80241018 00000000 */ nop +/* 9B7998 80241018 00000000 */ nop /* 9B799C 8024101C 4500002C */ bc1f .L802410D0 /* 9B79A0 80241020 02A0202D */ daddu $a0, $s5, $zero /* 9B79A4 80241024 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80240C94_9B7614 /* 9B79E0 80241060 3C01C1A0 */ lui $at, 0xc1a0 /* 9B79E4 80241064 44812000 */ mtc1 $at, $f4 /* 9B79E8 80241068 44834000 */ mtc1 $v1, $f8 -/* 9B79EC 8024106C 00000000 */ nop +/* 9B79EC 8024106C 00000000 */ nop /* 9B79F0 80241070 46804220 */ cvt.s.w $f8, $f8 /* 9B79F4 80241074 44074000 */ mfc1 $a3, $f8 /* 9B79F8 80241078 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80240C94_9B7614 /* 9B7AAC 8024112C 0C0123F5 */ jal is_point_within_region /* 9B7AB0 80241130 8E070038 */ lw $a3, 0x38($s0) /* 9B7AB4 80241134 1040001A */ beqz $v0, .L802411A0 -/* 9B7AB8 80241138 00000000 */ nop +/* 9B7AB8 80241138 00000000 */ nop /* 9B7ABC 8024113C 8E060038 */ lw $a2, 0x38($s0) /* 9B7AC0 80241140 8E2200D0 */ lw $v0, 0xd0($s1) /* 9B7AC4 80241144 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80240C94_9B7614 /* 9B7AD8 80241158 468073A0 */ cvt.s.w $f14, $f14 /* 9B7ADC 8024115C C6020018 */ lwc1 $f2, 0x18($s0) /* 9B7AE0 80241160 4600103C */ c.lt.s $f2, $f0 -/* 9B7AE4 80241164 00000000 */ nop +/* 9B7AE4 80241164 00000000 */ nop /* 9B7AE8 80241168 4500000D */ bc1f .L802411A0 /* 9B7AEC 8024116C E7A00034 */ swc1 $f0, 0x34($sp) /* 9B7AF0 80241170 C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80240C94_9B7614 /* 9B7B2C 802411AC 00621825 */ or $v1, $v1, $v0 /* 9B7B30 802411B0 00741825 */ or $v1, $v1, $s4 /* 9B7B34 802411B4 10600008 */ beqz $v1, .L802411D8 -/* 9B7B38 802411B8 00000000 */ nop +/* 9B7B38 802411B8 00000000 */ nop /* 9B7B3C 802411BC 8602008C */ lh $v0, 0x8c($s0) /* 9B7B40 802411C0 14400031 */ bnez $v0, .L80241288 -/* 9B7B44 802411C4 00000000 */ nop +/* 9B7B44 802411C4 00000000 */ nop /* 9B7B48 802411C8 8E050018 */ lw $a1, 0x18($s0) /* 9B7B4C 802411CC 8E06000C */ lw $a2, 0xc($s0) /* 9B7B50 802411D0 0C00EA95 */ jal npc_move_heading @@ -362,12 +362,12 @@ glabel func_80240C94_9B7614 /* 9B7B64 802411E4 44801000 */ mtc1 $zero, $f2 /* 9B7B68 802411E8 46000021 */ cvt.d.s $f0, $f0 /* 9B7B6C 802411EC 46220002 */ mul.d $f0, $f0, $f2 -/* 9B7B70 802411F0 00000000 */ nop +/* 9B7B70 802411F0 00000000 */ nop /* 9B7B74 802411F4 4620020D */ trunc.w.d $f8, $f0 /* 9B7B78 802411F8 E628007C */ swc1 $f8, 0x7c($s1) /* 9B7B7C 802411FC 8E420004 */ lw $v0, 4($s2) /* 9B7B80 80241200 18400021 */ blez $v0, .L80241288 -/* 9B7B84 80241204 00000000 */ nop +/* 9B7B84 80241204 00000000 */ nop /* 9B7B88 80241208 8602008E */ lh $v0, 0x8e($s0) /* 9B7B8C 8024120C 9603008E */ lhu $v1, 0x8e($s0) /* 9B7B90 80241210 18400005 */ blez $v0, .L80241228 @@ -375,7 +375,7 @@ glabel func_80240C94_9B7614 /* 9B7B98 80241218 A602008E */ sh $v0, 0x8e($s0) /* 9B7B9C 8024121C 00021400 */ sll $v0, $v0, 0x10 /* 9B7BA0 80241220 1C400019 */ bgtz $v0, .L80241288 -/* 9B7BA4 80241224 00000000 */ nop +/* 9B7BA4 80241224 00000000 */ nop .L80241228: /* 9B7BA8 80241228 240403E8 */ addiu $a0, $zero, 0x3e8 /* 9B7BAC 8024122C 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80240C94_9B7614 /* 9B7BF4 80241274 18400003 */ blez $v0, .L80241284 /* 9B7BF8 80241278 28620003 */ slti $v0, $v1, 3 /* 9B7BFC 8024127C 10400002 */ beqz $v0, .L80241288 -/* 9B7C00 80241280 00000000 */ nop +/* 9B7C00 80241280 00000000 */ nop .L80241284: /* 9B7C04 80241284 AE600070 */ sw $zero, 0x70($s3) .L80241288: diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024137C_9B7CFC.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024137C_9B7CFC.s index 1a9c938f23..8f5cb02021 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024137C_9B7CFC.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024137C_9B7CFC.s @@ -42,11 +42,11 @@ glabel func_8024137C_9B7CFC .L80241410: /* 9B7D90 80241410 8E220070 */ lw $v0, 0x70($s1) /* 9B7D94 80241414 18400034 */ blez $v0, .L802414E8 -/* 9B7D98 80241418 00000000 */ nop +/* 9B7D98 80241418 00000000 */ nop /* 9B7D9C 8024141C C62C0074 */ lwc1 $f12, 0x74($s1) /* 9B7DA0 80241420 46806320 */ cvt.s.w $f12, $f12 /* 9B7DA4 80241424 44820000 */ mtc1 $v0, $f0 -/* 9B7DA8 80241428 00000000 */ nop +/* 9B7DA8 80241428 00000000 */ nop /* 9B7DAC 8024142C 46800020 */ cvt.s.w $f0, $f0 /* 9B7DB0 80241430 46000021 */ cvt.d.s $f0, $f0 /* 9B7DB4 80241434 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_8024137C_9B7CFC /* 9B7E14 80241494 27A70030 */ addiu $a3, $sp, 0x30 .L80241498: /* 9B7E18 80241498 10400007 */ beqz $v0, .L802414B8 -/* 9B7E1C 8024149C 00000000 */ nop +/* 9B7E1C 8024149C 00000000 */ nop /* 9B7E20 802414A0 4616A082 */ mul.s $f2, $f20, $f22 -/* 9B7E24 802414A4 00000000 */ nop +/* 9B7E24 802414A4 00000000 */ nop /* 9B7E28 802414A8 C7A0002C */ lwc1 $f0, 0x2c($sp) /* 9B7E2C 802414AC 46180000 */ add.s $f0, $f0, $f24 /* 9B7E30 802414B0 08090531 */ j .L802414C4 /* 9B7E34 802414B4 46020000 */ add.s $f0, $f0, $f2 .L802414B8: /* 9B7E38 802414B8 4616A002 */ mul.s $f0, $f20, $f22 -/* 9B7E3C 802414BC 00000000 */ nop +/* 9B7E3C 802414BC 00000000 */ nop /* 9B7E40 802414C0 4600D000 */ add.s $f0, $f26, $f0 .L802414C4: /* 9B7E44 802414C4 E600003C */ swc1 $f0, 0x3c($s0) /* 9B7E48 802414C8 8E220074 */ lw $v0, 0x74($s1) /* 9B7E4C 802414CC 2442000A */ addiu $v0, $v0, 0xa /* 9B7E50 802414D0 44826000 */ mtc1 $v0, $f12 -/* 9B7E54 802414D4 00000000 */ nop +/* 9B7E54 802414D4 00000000 */ nop /* 9B7E58 802414D8 0C00A6C9 */ jal clamp_angle /* 9B7E5C 802414DC 46806320 */ cvt.s.w $f12, $f12 /* 9B7E60 802414E0 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_8024137C_9B7CFC /* 9B7E74 802414F4 860200A8 */ lh $v0, 0xa8($s0) /* 9B7E78 802414F8 C600003C */ lwc1 $f0, 0x3c($s0) /* 9B7E7C 802414FC 44821000 */ mtc1 $v0, $f2 -/* 9B7E80 80241500 00000000 */ nop +/* 9B7E80 80241500 00000000 */ nop /* 9B7E84 80241504 468010A0 */ cvt.s.w $f2, $f2 /* 9B7E88 80241508 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 9B7E8C 8024150C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) @@ -118,7 +118,7 @@ glabel func_8024137C_9B7CFC /* 9B7EA8 80241528 46240000 */ add.d $f0, $f0, $f4 /* 9B7EAC 8024152C 460010A1 */ cvt.d.s $f2, $f2 /* 9B7EB0 80241530 4620103C */ c.lt.d $f2, $f0 -/* 9B7EB4 80241534 00000000 */ nop +/* 9B7EB4 80241534 00000000 */ nop /* 9B7EB8 80241538 4500002E */ bc1f .L802415F4 /* 9B7EBC 8024153C 0280202D */ daddu $a0, $s4, $zero /* 9B7EC0 80241540 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_8024137C_9B7CFC /* 9B7F00 80241580 3C01C1A0 */ lui $at, 0xc1a0 /* 9B7F04 80241584 44812000 */ mtc1 $at, $f4 /* 9B7F08 80241588 44834000 */ mtc1 $v1, $f8 -/* 9B7F0C 8024158C 00000000 */ nop +/* 9B7F0C 8024158C 00000000 */ nop /* 9B7F10 80241590 46804220 */ cvt.s.w $f8, $f8 /* 9B7F14 80241594 44074000 */ mfc1 $a3, $f8 /* 9B7F18 80241598 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_8024137C_9B7CFC .L802415F4: /* 9B7F74 802415F4 8602008C */ lh $v0, 0x8c($s0) /* 9B7F78 802415F8 14400025 */ bnez $v0, .L80241690 -/* 9B7F7C 802415FC 00000000 */ nop +/* 9B7F7C 802415FC 00000000 */ nop /* 9B7F80 80241600 8602008E */ lh $v0, 0x8e($s0) /* 9B7F84 80241604 1C400022 */ bgtz $v0, .L80241690 -/* 9B7F88 80241608 00000000 */ nop +/* 9B7F88 80241608 00000000 */ nop /* 9B7F8C 8024160C 8E620074 */ lw $v0, 0x74($s3) /* 9B7F90 80241610 2442FFFF */ addiu $v0, $v0, -1 /* 9B7F94 80241614 1840001D */ blez $v0, .L8024168C @@ -183,7 +183,7 @@ glabel func_8024137C_9B7CFC /* 9B7FA0 80241620 9442002A */ lhu $v0, 0x2a($v0) /* 9B7FA4 80241624 30420010 */ andi $v0, $v0, 0x10 /* 9B7FA8 80241628 14400007 */ bnez $v0, .L80241648 -/* 9B7FAC 8024162C 00000000 */ nop +/* 9B7FAC 8024162C 00000000 */ nop /* 9B7FB0 80241630 C600000C */ lwc1 $f0, 0xc($s0) /* 9B7FB4 80241634 3C014334 */ lui $at, 0x4334 /* 9B7FB8 80241638 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802417A4_9B8124.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802417A4_9B8124.s index 032e868772..b2314519dc 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802417A4_9B8124.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802417A4_9B8124.s @@ -60,18 +60,18 @@ glabel func_802417A4_9B8124 /* 9B81FC 8024187C C6200038 */ lwc1 $f0, 0x38($s1) /* 9B8200 80241880 4600018D */ trunc.w.s $f6, $f0 /* 9B8204 80241884 44023000 */ mfc1 $v0, $f6 -/* 9B8208 80241888 00000000 */ nop +/* 9B8208 80241888 00000000 */ nop /* 9B820C 8024188C A6420010 */ sh $v0, 0x10($s2) /* 9B8210 80241890 C620003C */ lwc1 $f0, 0x3c($s1) /* 9B8214 80241894 4600018D */ trunc.w.s $f6, $f0 /* 9B8218 80241898 44023000 */ mfc1 $v0, $f6 -/* 9B821C 8024189C 00000000 */ nop +/* 9B821C 8024189C 00000000 */ nop /* 9B8220 802418A0 A6420012 */ sh $v0, 0x12($s2) /* 9B8224 802418A4 C6200040 */ lwc1 $f0, 0x40($s1) /* 9B8228 802418A8 A2430007 */ sb $v1, 7($s2) /* 9B822C 802418AC 4600018D */ trunc.w.s $f6, $f0 /* 9B8230 802418B0 44023000 */ mfc1 $v0, $f6 -/* 9B8234 802418B4 00000000 */ nop +/* 9B8234 802418B4 00000000 */ nop /* 9B8238 802418B8 A6420014 */ sh $v0, 0x14($s2) .L802418BC: /* 9B823C 802418BC 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024193C_9B82BC.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024193C_9B82BC.s index 1c716d1648..787df6f87d 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024193C_9B82BC.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024193C_9B82BC.s @@ -42,9 +42,9 @@ glabel func_8024193C_9B82BC /* 9B8350 802419D0 44801800 */ mtc1 $zero, $f3 /* 9B8354 802419D4 46002021 */ cvt.d.s $f0, $f4 /* 9B8358 802419D8 4620103E */ c.le.d $f2, $f0 -/* 9B835C 802419DC 00000000 */ nop +/* 9B835C 802419DC 00000000 */ nop /* 9B8360 802419E0 45000030 */ bc1f .L80241AA4 -/* 9B8364 802419E4 00000000 */ nop +/* 9B8364 802419E4 00000000 */ nop /* 9B8368 802419E8 C600003C */ lwc1 $f0, 0x3c($s0) /* 9B836C 802419EC 46040000 */ add.s $f0, $f0, $f4 /* 9B8370 802419F0 E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_8024193C_9B82BC /* 9B83D0 80241A50 27A70020 */ addiu $a3, $sp, 0x20 .L80241A54: /* 9B83D4 80241A54 1040000B */ beqz $v0, .L80241A84 -/* 9B83D8 80241A58 00000000 */ nop +/* 9B83D8 80241A58 00000000 */ nop /* 9B83DC 80241A5C C7A0001C */ lwc1 $f0, 0x1c($sp) /* 9B83E0 80241A60 46140080 */ add.s $f2, $f0, $f20 /* 9B83E4 80241A64 C600003C */ lwc1 $f0, 0x3c($s0) /* 9B83E8 80241A68 4600103E */ c.le.s $f2, $f0 -/* 9B83EC 80241A6C 00000000 */ nop +/* 9B83EC 80241A6C 00000000 */ nop /* 9B83F0 80241A70 4500008D */ bc1f .L80241CA8 -/* 9B83F4 80241A74 00000000 */ nop +/* 9B83F4 80241A74 00000000 */ nop /* 9B83F8 80241A78 E602003C */ swc1 $f2, 0x3c($s0) /* 9B83FC 80241A7C 0809072A */ j .L80241CA8 /* 9B8400 80241A80 AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_8024193C_9B82BC /* 9B8404 80241A84 C602003C */ lwc1 $f2, 0x3c($s0) /* 9B8408 80241A88 C6000064 */ lwc1 $f0, 0x64($s0) /* 9B840C 80241A8C 4602003E */ c.le.s $f0, $f2 -/* 9B8410 80241A90 00000000 */ nop +/* 9B8410 80241A90 00000000 */ nop /* 9B8414 80241A94 45030084 */ bc1tl .L80241CA8 /* 9B8418 80241A98 AE400070 */ sw $zero, 0x70($s2) /* 9B841C 80241A9C 0809072A */ j .L80241CA8 -/* 9B8420 80241AA0 00000000 */ nop +/* 9B8420 80241AA0 00000000 */ nop .L80241AA4: /* 9B8424 80241AA4 4622003C */ c.lt.d $f0, $f2 -/* 9B8428 80241AA8 00000000 */ nop +/* 9B8428 80241AA8 00000000 */ nop /* 9B842C 80241AAC 4500007E */ bc1f .L80241CA8 -/* 9B8430 80241AB0 00000000 */ nop +/* 9B8430 80241AB0 00000000 */ nop /* 9B8434 80241AB4 9602008E */ lhu $v0, 0x8e($s0) /* 9B8438 80241AB8 24420001 */ addiu $v0, $v0, 1 /* 9B843C 80241ABC A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_8024193C_9B82BC /* 9B8448 80241AC8 00021403 */ sra $v0, $v0, 0x10 /* 9B844C 80241ACC 0043102A */ slt $v0, $v0, $v1 /* 9B8450 80241AD0 14400026 */ bnez $v0, .L80241B6C -/* 9B8454 80241AD4 00000000 */ nop +/* 9B8454 80241AD4 00000000 */ nop /* 9B8458 80241AD8 C60C0038 */ lwc1 $f12, 0x38($s0) /* 9B845C 80241ADC C60E0040 */ lwc1 $f14, 0x40($s0) /* 9B8460 80241AE0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -124,20 +124,20 @@ glabel func_8024193C_9B82BC /* 9B848C 80241B0C 8E62001C */ lw $v0, 0x1c($s3) /* 9B8490 80241B10 46001005 */ abs.s $f0, $f2 /* 9B8494 80241B14 44822000 */ mtc1 $v0, $f4 -/* 9B8498 80241B18 00000000 */ nop +/* 9B8498 80241B18 00000000 */ nop /* 9B849C 80241B1C 46802120 */ cvt.s.w $f4, $f4 /* 9B84A0 80241B20 4600203C */ c.lt.s $f4, $f0 -/* 9B84A4 80241B24 00000000 */ nop +/* 9B84A4 80241B24 00000000 */ nop /* 9B84A8 80241B28 4500000D */ bc1f .L80241B60 -/* 9B84AC 80241B2C 00000000 */ nop +/* 9B84AC 80241B2C 00000000 */ nop /* 9B84B0 80241B30 44800000 */ mtc1 $zero, $f0 /* 9B84B4 80241B34 C614000C */ lwc1 $f20, 0xc($s0) /* 9B84B8 80241B38 4600103C */ c.lt.s $f2, $f0 -/* 9B84BC 80241B3C 00000000 */ nop +/* 9B84BC 80241B3C 00000000 */ nop /* 9B84C0 80241B40 45000006 */ bc1f .L80241B5C /* 9B84C4 80241B44 00021023 */ negu $v0, $v0 /* 9B84C8 80241B48 44820000 */ mtc1 $v0, $f0 -/* 9B84CC 80241B4C 00000000 */ nop +/* 9B84CC 80241B4C 00000000 */ nop /* 9B84D0 80241B50 46800020 */ cvt.s.w $f0, $f0 /* 9B84D4 80241B54 080906D8 */ j .L80241B60 /* 9B84D8 80241B58 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_8024193C_9B82BC /* 9B8500 80241B80 C600001C */ lwc1 $f0, 0x1c($s0) /* 9B8504 80241B84 46001080 */ add.s $f2, $f2, $f0 /* 9B8508 80241B88 4616103C */ c.lt.s $f2, $f22 -/* 9B850C 80241B8C 00000000 */ nop +/* 9B850C 80241B8C 00000000 */ nop /* 9B8510 80241B90 45020045 */ bc1fl .L80241CA8 /* 9B8514 80241B94 E602003C */ swc1 $f2, 0x3c($s0) /* 9B8518 80241B98 08090729 */ j .L80241CA4 @@ -169,7 +169,7 @@ glabel func_8024193C_9B82BC /* 9B8530 80241BB0 C600001C */ lwc1 $f0, 0x1c($s0) /* 9B8534 80241BB4 C604003C */ lwc1 $f4, 0x3c($s0) /* 9B8538 80241BB8 44821000 */ mtc1 $v0, $f2 -/* 9B853C 80241BBC 00000000 */ nop +/* 9B853C 80241BBC 00000000 */ nop /* 9B8540 80241BC0 468010A0 */ cvt.s.w $f2, $f2 /* 9B8544 80241BC4 46000005 */ abs.s $f0, $f0 /* 9B8548 80241BC8 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_8024193C_9B82BC /* 9B8584 80241C04 0C0372DF */ jal func_800DCB7C /* 9B8588 80241C08 27A70020 */ addiu $a3, $sp, 0x20 /* 9B858C 80241C0C 10400015 */ beqz $v0, .L80241C64 -/* 9B8590 80241C10 00000000 */ nop +/* 9B8590 80241C10 00000000 */ nop /* 9B8594 80241C14 860200A8 */ lh $v0, 0xa8($s0) /* 9B8598 80241C18 C604001C */ lwc1 $f4, 0x1c($s0) /* 9B859C 80241C1C 44820000 */ mtc1 $v0, $f0 -/* 9B85A0 80241C20 00000000 */ nop +/* 9B85A0 80241C20 00000000 */ nop /* 9B85A4 80241C24 46800020 */ cvt.s.w $f0, $f0 /* 9B85A8 80241C28 46002085 */ abs.s $f2, $f4 /* 9B85AC 80241C2C 46020000 */ add.s $f0, $f0, $f2 /* 9B85B0 80241C30 C7A20024 */ lwc1 $f2, 0x24($sp) /* 9B85B4 80241C34 4600103E */ c.le.s $f2, $f0 -/* 9B85B8 80241C38 00000000 */ nop +/* 9B85B8 80241C38 00000000 */ nop /* 9B85BC 80241C3C 45000005 */ bc1f .L80241C54 -/* 9B85C0 80241C40 00000000 */ nop +/* 9B85C0 80241C40 00000000 */ nop /* 9B85C4 80241C44 C7A0001C */ lwc1 $f0, 0x1c($sp) /* 9B85C8 80241C48 AE00001C */ sw $zero, 0x1c($s0) /* 9B85CC 80241C4C 0809072A */ j .L80241CA8 @@ -217,13 +217,13 @@ glabel func_8024193C_9B82BC /* 9B85E8 80241C68 860200A8 */ lh $v0, 0xa8($s0) /* 9B85EC 80241C6C 46163081 */ sub.s $f2, $f6, $f22 /* 9B85F0 80241C70 44820000 */ mtc1 $v0, $f0 -/* 9B85F4 80241C74 00000000 */ nop +/* 9B85F4 80241C74 00000000 */ nop /* 9B85F8 80241C78 46800020 */ cvt.s.w $f0, $f0 /* 9B85FC 80241C7C 46001080 */ add.s $f2, $f2, $f0 /* 9B8600 80241C80 C604001C */ lwc1 $f4, 0x1c($s0) /* 9B8604 80241C84 46002005 */ abs.s $f0, $f4 /* 9B8608 80241C88 4602003C */ c.lt.s $f0, $f2 -/* 9B860C 80241C8C 00000000 */ nop +/* 9B860C 80241C8C 00000000 */ nop /* 9B8610 80241C90 45020005 */ bc1fl .L80241CA8 /* 9B8614 80241C94 AE00001C */ sw $zero, 0x1c($s0) /* 9B8618 80241C98 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241CCC_9B864C.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241CCC_9B864C.s index 6d1cb5bded..1fd5160fdd 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241CCC_9B864C.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241CCC_9B864C.s @@ -49,15 +49,15 @@ glabel func_80241CCC_9B864C /* 9B86F4 80241D74 44802000 */ mtc1 $zero, $f4 /* 9B86F8 80241D78 460010A1 */ cvt.d.s $f2, $f2 /* 9B86FC 80241D7C 46241082 */ mul.d $f2, $f2, $f4 -/* 9B8700 80241D80 00000000 */ nop +/* 9B8700 80241D80 00000000 */ nop /* 9B8704 80241D84 C7A0001C */ lwc1 $f0, 0x1c($sp) /* 9B8708 80241D88 46000021 */ cvt.d.s $f0, $f0 /* 9B870C 80241D8C 46240002 */ mul.d $f0, $f0, $f4 -/* 9B8710 80241D90 00000000 */ nop +/* 9B8710 80241D90 00000000 */ nop /* 9B8714 80241D94 3C013FE0 */ lui $at, 0x3fe0 /* 9B8718 80241D98 44812800 */ mtc1 $at, $f5 /* 9B871C 80241D9C 44802000 */ mtc1 $zero, $f4 -/* 9B8720 80241DA0 00000000 */ nop +/* 9B8720 80241DA0 00000000 */ nop /* 9B8724 80241DA4 46241080 */ add.d $f2, $f2, $f4 /* 9B8728 80241DA8 AE000074 */ sw $zero, 0x74($s0) /* 9B872C 80241DAC 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s index 44c3f3baf6..f8062caa1d 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s @@ -54,7 +54,7 @@ glabel func_80241DF0_9B8770 /* 9B8830 80241EB0 8E4300B0 */ lw $v1, 0xb0($s2) /* 9B8834 80241EB4 30620004 */ andi $v0, $v1, 4 /* 9B8838 80241EB8 10400007 */ beqz $v0, .L80241ED8 -/* 9B883C 80241EBC 00000000 */ nop +/* 9B883C 80241EBC 00000000 */ nop /* 9B8840 80241EC0 824200B4 */ lb $v0, 0xb4($s2) /* 9B8844 80241EC4 1440003C */ bnez $v0, .L80241FB8 /* 9B8848 80241EC8 0000102D */ daddu $v0, $zero, $zero @@ -66,58 +66,68 @@ glabel func_80241DF0_9B8770 /* 9B885C 80241EDC 2C62000F */ sltiu $v0, $v1, 0xf /* 9B8860 80241EE0 10400034 */ beqz $v0, .L80241FB4 /* 9B8864 80241EE4 00031080 */ sll $v0, $v1, 2 -/* 9B8868 80241EE8 3C018024 */ lui $at, %hi(D_80244898) +/* 9B8868 80241EE8 3C018024 */ lui $at, %hi(jtbl_80244898_9BB218) /* 9B886C 80241EEC 00220821 */ addu $at, $at, $v0 -/* 9B8870 80241EF0 8C224898 */ lw $v0, %lo(D_80244898)($at) +/* 9B8870 80241EF0 8C224898 */ lw $v0, %lo(jtbl_80244898_9BB218)($at) /* 9B8874 80241EF4 00400008 */ jr $v0 -/* 9B8878 80241EF8 00000000 */ nop +/* 9B8878 80241EF8 00000000 */ nop +glabel L80241EFC_9B887C /* 9B887C 80241EFC 0280202D */ daddu $a0, $s4, $zero /* 9B8880 80241F00 0200282D */ daddu $a1, $s0, $zero /* 9B8884 80241F04 0C0902B9 */ jal func_80240AE4_9B7464 /* 9B8888 80241F08 0260302D */ daddu $a2, $s3, $zero +glabel L80241F0C_9B888C /* 9B888C 80241F0C 0280202D */ daddu $a0, $s4, $zero /* 9B8890 80241F10 0200282D */ daddu $a1, $s0, $zero /* 9B8894 80241F14 0C090325 */ jal func_80240C94_9B7614 /* 9B8898 80241F18 0260302D */ daddu $a2, $s3, $zero /* 9B889C 80241F1C 080907EE */ j .L80241FB8 /* 9B88A0 80241F20 0000102D */ daddu $v0, $zero, $zero +glabel L80241F24_9B88A4 /* 9B88A4 80241F24 0280202D */ daddu $a0, $s4, $zero /* 9B88A8 80241F28 0200282D */ daddu $a1, $s0, $zero /* 9B88AC 80241F2C 0C0904AF */ jal trd_07_UnkNpcAIFunc1 /* 9B88B0 80241F30 0260302D */ daddu $a2, $s3, $zero +glabel L80241F34_9B88B4 /* 9B88B4 80241F34 0280202D */ daddu $a0, $s4, $zero /* 9B88B8 80241F38 0200282D */ daddu $a1, $s0, $zero /* 9B88BC 80241F3C 0C0904DF */ jal func_8024137C_9B7CFC /* 9B88C0 80241F40 0260302D */ daddu $a2, $s3, $zero /* 9B88C4 80241F44 080907EE */ j .L80241FB8 /* 9B88C8 80241F48 0000102D */ daddu $v0, $zero, $zero +glabel L80241F4C_9B88CC /* 9B88CC 80241F4C 0280202D */ daddu $a0, $s4, $zero /* 9B88D0 80241F50 0200282D */ daddu $a1, $s0, $zero /* 9B88D4 80241F54 0C0905B0 */ jal trd_07_UnkNpcAIFunc2 /* 9B88D8 80241F58 0260302D */ daddu $a2, $s3, $zero +glabel L80241F5C_9B88DC /* 9B88DC 80241F5C 0280202D */ daddu $a0, $s4, $zero /* 9B88E0 80241F60 0200282D */ daddu $a1, $s0, $zero /* 9B88E4 80241F64 0C0905CE */ jal func_80241738_9B80B8 /* 9B88E8 80241F68 0260302D */ daddu $a2, $s3, $zero /* 9B88EC 80241F6C 080907EE */ j .L80241FB8 /* 9B88F0 80241F70 0000102D */ daddu $v0, $zero, $zero +glabel L80241F74_9B88F4 /* 9B88F4 80241F74 0280202D */ daddu $a0, $s4, $zero /* 9B88F8 80241F78 0200282D */ daddu $a1, $s0, $zero /* 9B88FC 80241F7C 0C0905E9 */ jal func_802417A4_9B8124 /* 9B8900 80241F80 0260302D */ daddu $a2, $s3, $zero /* 9B8904 80241F84 080907EE */ j .L80241FB8 /* 9B8908 80241F88 0000102D */ daddu $v0, $zero, $zero +glabel L80241F8C_9B890C /* 9B890C 80241F8C 0280202D */ daddu $a0, $s4, $zero /* 9B8910 80241F90 0200282D */ daddu $a1, $s0, $zero /* 9B8914 80241F94 0C090636 */ jal trd_07_UnkNpcAIFunc3 /* 9B8918 80241F98 0260302D */ daddu $a2, $s3, $zero /* 9B891C 80241F9C 080907EE */ j .L80241FB8 /* 9B8920 80241FA0 0000102D */ daddu $v0, $zero, $zero +glabel L80241FA4_9B8924 /* 9B8924 80241FA4 0280202D */ daddu $a0, $s4, $zero /* 9B8928 80241FA8 0200282D */ daddu $a1, $s0, $zero /* 9B892C 80241FAC 0C09064F */ jal func_8024193C_9B82BC /* 9B8930 80241FB0 0260302D */ daddu $a2, $s3, $zero .L80241FB4: +glabel L80241FB4_9B8934 /* 9B8934 80241FB4 0000102D */ daddu $v0, $zero, $zero .L80241FB8: /* 9B8938 80241FB8 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241FDC_9B895C.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241FDC_9B895C.s index b620364114..c31a5b286d 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241FDC_9B895C.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241FDC_9B895C.s @@ -49,7 +49,7 @@ glabel func_80241FDC_9B895C /* 9B8A0C 8024208C 240502C1 */ addiu $a1, $zero, 0x2c1 /* 9B8A10 80242090 4600010D */ trunc.w.s $f4, $f0 /* 9B8A14 80242094 44022000 */ mfc1 $v0, $f4 -/* 9B8A18 80242098 00000000 */ nop +/* 9B8A18 80242098 00000000 */ nop /* 9B8A1C 8024209C A6220012 */ sh $v0, 0x12($s1) /* 9B8A20 802420A0 C6000040 */ lwc1 $f0, 0x40($s0) /* 9B8A24 802420A4 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242104_9B8A84.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242104_9B8A84.s index 8baa289204..c865b2bb2c 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242104_9B8A84.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242104_9B8A84.s @@ -28,7 +28,7 @@ glabel func_80242104_9B8A84 /* 9B8AE0 80242160 A602008E */ sh $v0, 0x8e($s0) /* 9B8AE4 80242164 00021400 */ sll $v0, $v0, 0x10 /* 9B8AE8 80242168 1C40000F */ bgtz $v0, .L802421A8 -/* 9B8AEC 8024216C 00000000 */ nop +/* 9B8AEC 8024216C 00000000 */ nop /* 9B8AF0 80242170 3C013E99 */ lui $at, 0x3e99 /* 9B8AF4 80242174 3421999A */ ori $at, $at, 0x999a /* 9B8AF8 80242178 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802421C0_9B8B40.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802421C0_9B8B40.s index c02ef98ad9..c2e1846e48 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802421C0_9B8B40.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802421C0_9B8B40.s @@ -55,7 +55,7 @@ glabel func_802421C0_9B8B40 .L80242288: /* 9B8C08 80242288 C600003C */ lwc1 $f0, 0x3c($s0) /* 9B8C0C 8024228C 4602003C */ c.lt.s $f0, $f2 -/* 9B8C10 80242290 00000000 */ nop +/* 9B8C10 80242290 00000000 */ nop /* 9B8C14 80242294 45010009 */ bc1t .L802422BC /* 9B8C18 80242298 2402000A */ addiu $v0, $zero, 0xa /* 9B8C1C 8024229C A602008E */ sh $v0, 0x8e($s0) diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s index 1280ab68af..e58d7e3ae0 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s @@ -57,7 +57,7 @@ glabel func_8024231C_9B8C9C /* 9B8D68 802423E8 8E4300B0 */ lw $v1, 0xb0($s2) /* 9B8D6C 802423EC 30620004 */ andi $v0, $v1, 4 /* 9B8D70 802423F0 10400007 */ beqz $v0, .L80242410 -/* 9B8D74 802423F4 00000000 */ nop +/* 9B8D74 802423F4 00000000 */ nop /* 9B8D78 802423F8 824200B4 */ lb $v0, 0xb4($s2) /* 9B8D7C 802423FC 14400052 */ bnez $v0, .L80242548 /* 9B8D80 80242400 0000102D */ daddu $v0, $zero, $zero @@ -69,15 +69,17 @@ glabel func_8024231C_9B8C9C /* 9B8D94 80242414 2C620010 */ sltiu $v0, $v1, 0x10 /* 9B8D98 80242418 1040004A */ beqz $v0, .L80242544 /* 9B8D9C 8024241C 00031080 */ sll $v0, $v1, 2 -/* 9B8DA0 80242420 3C018024 */ lui $at, %hi(D_802448D8) +/* 9B8DA0 80242420 3C018024 */ lui $at, %hi(jtbl_802448D8_9BB258) /* 9B8DA4 80242424 00220821 */ addu $at, $at, $v0 -/* 9B8DA8 80242428 8C2248D8 */ lw $v0, %lo(D_802448D8)($at) +/* 9B8DA8 80242428 8C2248D8 */ lw $v0, %lo(jtbl_802448D8_9BB258)($at) /* 9B8DAC 8024242C 00400008 */ jr $v0 -/* 9B8DB0 80242430 00000000 */ nop +/* 9B8DB0 80242430 00000000 */ nop +glabel L80242434_9B8DB4 /* 9B8DB4 80242434 0260202D */ daddu $a0, $s3, $zero /* 9B8DB8 80242438 0200282D */ daddu $a1, $s0, $zero /* 9B8DBC 8024243C 0C0902B9 */ jal func_80240AE4_9B7464 /* 9B8DC0 80242440 0280302D */ daddu $a2, $s4, $zero +glabel L80242444_9B8DC4 /* 9B8DC4 80242444 0260202D */ daddu $a0, $s3, $zero /* 9B8DC8 80242448 0200282D */ daddu $a1, $s0, $zero /* 9B8DCC 8024244C 0C090325 */ jal func_80240C94_9B7614 @@ -86,10 +88,12 @@ glabel func_8024231C_9B8C9C /* 9B8DD8 80242458 24020002 */ addiu $v0, $zero, 2 /* 9B8DDC 8024245C 1462003A */ bne $v1, $v0, .L80242548 /* 9B8DE0 80242460 0000102D */ daddu $v0, $zero, $zero +glabel L80242464_9B8DE4 /* 9B8DE4 80242464 0260202D */ daddu $a0, $s3, $zero /* 9B8DE8 80242468 0200282D */ daddu $a1, $s0, $zero /* 9B8DEC 8024246C 0C0904AF */ jal trd_07_UnkNpcAIFunc1 /* 9B8DF0 80242470 0280302D */ daddu $a2, $s4, $zero +glabel L80242474_9B8DF4 /* 9B8DF4 80242474 0260202D */ daddu $a0, $s3, $zero /* 9B8DF8 80242478 0200282D */ daddu $a1, $s0, $zero /* 9B8DFC 8024247C 0C0904DF */ jal func_8024137C_9B7CFC @@ -98,6 +102,7 @@ glabel func_8024231C_9B8C9C /* 9B8E08 80242488 2402000A */ addiu $v0, $zero, 0xa /* 9B8E0C 8024248C 1462002E */ bne $v1, $v0, .L80242548 /* 9B8E10 80242490 0000102D */ daddu $v0, $zero, $zero +glabel L80242494_9B8E14 /* 9B8E14 80242494 0260202D */ daddu $a0, $s3, $zero /* 9B8E18 80242498 0200282D */ daddu $a1, $s0, $zero /* 9B8E1C 8024249C 0C0905B0 */ jal trd_07_UnkNpcAIFunc2 @@ -106,6 +111,7 @@ glabel func_8024231C_9B8C9C /* 9B8E28 802424A8 2402000B */ addiu $v0, $zero, 0xb /* 9B8E2C 802424AC 14620026 */ bne $v1, $v0, .L80242548 /* 9B8E30 802424B0 0000102D */ daddu $v0, $zero, $zero +glabel L802424B4_9B8E34 /* 9B8E34 802424B4 0260202D */ daddu $a0, $s3, $zero /* 9B8E38 802424B8 0200282D */ daddu $a1, $s0, $zero /* 9B8E3C 802424BC 0C0905CE */ jal func_80241738_9B80B8 @@ -114,6 +120,7 @@ glabel func_8024231C_9B8C9C /* 9B8E48 802424C8 2402000C */ addiu $v0, $zero, 0xc /* 9B8E4C 802424CC 1462001E */ bne $v1, $v0, .L80242548 /* 9B8E50 802424D0 0000102D */ daddu $v0, $zero, $zero +glabel L802424D4_9B8E54 /* 9B8E54 802424D4 0260202D */ daddu $a0, $s3, $zero /* 9B8E58 802424D8 0200282D */ daddu $a1, $s0, $zero /* 9B8E5C 802424DC 0C0907F7 */ jal func_80241FDC_9B895C @@ -122,6 +129,7 @@ glabel func_8024231C_9B8C9C /* 9B8E68 802424E8 2402000D */ addiu $v0, $zero, 0xd /* 9B8E6C 802424EC 14620016 */ bne $v1, $v0, .L80242548 /* 9B8E70 802424F0 0000102D */ daddu $v0, $zero, $zero +glabel L802424F4_9B8E74 /* 9B8E74 802424F4 0260202D */ daddu $a0, $s3, $zero /* 9B8E78 802424F8 0200282D */ daddu $a1, $s0, $zero /* 9B8E7C 802424FC 0C090841 */ jal func_80242104_9B8A84 @@ -130,6 +138,7 @@ glabel func_8024231C_9B8C9C /* 9B8E88 80242508 2402000E */ addiu $v0, $zero, 0xe /* 9B8E8C 8024250C 1462000E */ bne $v1, $v0, .L80242548 /* 9B8E90 80242510 0000102D */ daddu $v0, $zero, $zero +glabel L80242514_9B8E94 /* 9B8E94 80242514 0260202D */ daddu $a0, $s3, $zero /* 9B8E98 80242518 0200282D */ daddu $a1, $s0, $zero /* 9B8E9C 8024251C 0C090870 */ jal func_802421C0_9B8B40 @@ -138,11 +147,13 @@ glabel func_8024231C_9B8C9C /* 9B8EA8 80242528 2402000F */ addiu $v0, $zero, 0xf /* 9B8EAC 8024252C 14620006 */ bne $v1, $v0, .L80242548 /* 9B8EB0 80242530 0000102D */ daddu $v0, $zero, $zero +glabel L80242534_9B8EB4 /* 9B8EB4 80242534 0260202D */ daddu $a0, $s3, $zero /* 9B8EB8 80242538 0200282D */ daddu $a1, $s0, $zero /* 9B8EBC 8024253C 0C0908B6 */ jal trd_07_UnkDurationCheck /* 9B8EC0 80242540 0280302D */ daddu $a2, $s4, $zero .L80242544: +glabel L80242544_9B8EC4 /* 9B8EC4 80242544 0000102D */ daddu $v0, $zero, $zero .L80242548: /* 9B8EC8 80242548 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024256C_9B8EEC.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024256C_9B8EEC.s index a45ff40bc5..4931b59121 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024256C_9B8EEC.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024256C_9B8EEC.s @@ -40,7 +40,7 @@ glabel func_8024256C_9B8EEC .L802425E4: /* 9B8F64 802425E4 8CA50000 */ lw $a1, ($a1) /* 9B8F68 802425E8 0C0B2026 */ jal set_variable -/* 9B8F6C 802425EC 00000000 */ nop +/* 9B8F6C 802425EC 00000000 */ nop /* 9B8F70 802425F0 8FBF0010 */ lw $ra, 0x10($sp) /* 9B8F74 802425F4 24020002 */ addiu $v0, $zero, 2 /* 9B8F78 802425F8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242600_9B8F80.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242600_9B8F80.s index ef6eec6ae6..db8ee2f70a 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242600_9B8F80.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242600_9B8F80.s @@ -39,19 +39,19 @@ glabel func_80242600_9B8F80 /* 9B9008 80242688 46000306 */ mov.s $f12, $f0 /* 9B900C 8024268C 3C01447A */ lui $at, 0x447a /* 9B9010 80242690 44811000 */ mtc1 $at, $f2 -/* 9B9014 80242694 00000000 */ nop +/* 9B9014 80242694 00000000 */ nop /* 9B9018 80242698 46020002 */ mul.s $f0, $f0, $f2 -/* 9B901C 8024269C 00000000 */ nop +/* 9B901C 8024269C 00000000 */ nop /* 9B9020 802426A0 4600A000 */ add.s $f0, $f20, $f0 /* 9B9024 802426A4 3C014480 */ lui $at, 0x4480 /* 9B9028 802426A8 44811000 */ mtc1 $at, $f2 -/* 9B902C 802426AC 00000000 */ nop +/* 9B902C 802426AC 00000000 */ nop /* 9B9030 802426B0 46020002 */ mul.s $f0, $f0, $f2 -/* 9B9034 802426B4 00000000 */ nop +/* 9B9034 802426B4 00000000 */ nop /* 9B9038 802426B8 3C01CD5B */ lui $at, 0xcd5b /* 9B903C 802426BC 34215858 */ ori $at, $at, 0x5858 /* 9B9040 802426C0 4481C000 */ mtc1 $at, $f24 -/* 9B9044 802426C4 00000000 */ nop +/* 9B9044 802426C4 00000000 */ nop /* 9B9048 802426C8 46180000 */ add.s $f0, $f0, $f24 /* 9B904C 802426CC 4600008D */ trunc.w.s $f2, $f0 /* 9B9050 802426D0 E6220084 */ swc1 $f2, 0x84($s1) @@ -63,15 +63,15 @@ glabel func_80242600_9B8F80 /* 9B9068 802426E8 46000306 */ mov.s $f12, $f0 /* 9B906C 802426EC 3C01447A */ lui $at, 0x447a /* 9B9070 802426F0 44811000 */ mtc1 $at, $f2 -/* 9B9074 802426F4 00000000 */ nop +/* 9B9074 802426F4 00000000 */ nop /* 9B9078 802426F8 46020002 */ mul.s $f0, $f0, $f2 -/* 9B907C 802426FC 00000000 */ nop +/* 9B907C 802426FC 00000000 */ nop /* 9B9080 80242700 4600B001 */ sub.s $f0, $f22, $f0 /* 9B9084 80242704 3C014480 */ lui $at, 0x4480 /* 9B9088 80242708 44811000 */ mtc1 $at, $f2 -/* 9B908C 8024270C 00000000 */ nop +/* 9B908C 8024270C 00000000 */ nop /* 9B9090 80242710 46020002 */ mul.s $f0, $f0, $f2 -/* 9B9094 80242714 00000000 */ nop +/* 9B9094 80242714 00000000 */ nop /* 9B9098 80242718 46180000 */ add.s $f0, $f0, $f24 /* 9B909C 8024271C 4600008D */ trunc.w.s $f2, $f0 /* 9B90A0 80242720 E6220088 */ swc1 $f2, 0x88($s1) @@ -85,15 +85,15 @@ glabel func_80242600_9B8F80 /* 9B90C0 80242740 46000306 */ mov.s $f12, $f0 /* 9B90C4 80242744 3C01447A */ lui $at, 0x447a /* 9B90C8 80242748 44811000 */ mtc1 $at, $f2 -/* 9B90CC 8024274C 00000000 */ nop +/* 9B90CC 8024274C 00000000 */ nop /* 9B90D0 80242750 46020002 */ mul.s $f0, $f0, $f2 -/* 9B90D4 80242754 00000000 */ nop +/* 9B90D4 80242754 00000000 */ nop /* 9B90D8 80242758 4600A500 */ add.s $f20, $f20, $f0 /* 9B90DC 8024275C 3C014480 */ lui $at, 0x4480 /* 9B90E0 80242760 44811000 */ mtc1 $at, $f2 -/* 9B90E4 80242764 00000000 */ nop +/* 9B90E4 80242764 00000000 */ nop /* 9B90E8 80242768 4602A502 */ mul.s $f20, $f20, $f2 -/* 9B90EC 8024276C 00000000 */ nop +/* 9B90EC 8024276C 00000000 */ nop /* 9B90F0 80242770 4618A500 */ add.s $f20, $f20, $f24 /* 9B90F4 80242774 4600A08D */ trunc.w.s $f2, $f20 /* 9B90F8 80242778 E622008C */ swc1 $f2, 0x8c($s1) @@ -105,15 +105,15 @@ glabel func_80242600_9B8F80 /* 9B9110 80242790 46000306 */ mov.s $f12, $f0 /* 9B9114 80242794 3C01447A */ lui $at, 0x447a /* 9B9118 80242798 44811000 */ mtc1 $at, $f2 -/* 9B911C 8024279C 00000000 */ nop +/* 9B911C 8024279C 00000000 */ nop /* 9B9120 802427A0 46020002 */ mul.s $f0, $f0, $f2 -/* 9B9124 802427A4 00000000 */ nop +/* 9B9124 802427A4 00000000 */ nop /* 9B9128 802427A8 4600B581 */ sub.s $f22, $f22, $f0 /* 9B912C 802427AC 3C014480 */ lui $at, 0x4480 /* 9B9130 802427B0 44811000 */ mtc1 $at, $f2 -/* 9B9134 802427B4 00000000 */ nop +/* 9B9134 802427B4 00000000 */ nop /* 9B9138 802427B8 4602B582 */ mul.s $f22, $f22, $f2 -/* 9B913C 802427BC 00000000 */ nop +/* 9B913C 802427BC 00000000 */ nop /* 9B9140 802427C0 4618B580 */ add.s $f22, $f22, $f24 /* 9B9144 802427C4 4600B08D */ trunc.w.s $f2, $f22 /* 9B9148 802427C8 E6220090 */ swc1 $f2, 0x90($s1) diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802427FC_9B917C.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802427FC_9B917C.s index bad2869e8d..f146011d20 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802427FC_9B917C.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802427FC_9B917C.s @@ -29,7 +29,7 @@ glabel func_802427FC_9B917C /* 9B91DC 8024285C 0C0B1EAF */ jal get_variable /* 9B91E0 80242860 0040802D */ daddu $s0, $v0, $zero /* 9B91E4 80242864 4482A000 */ mtc1 $v0, $f20 -/* 9B91E8 80242868 00000000 */ nop +/* 9B91E8 80242868 00000000 */ nop /* 9B91EC 8024286C 4680A520 */ cvt.s.w $f20, $f20 /* 9B91F0 80242870 0C00A8BB */ jal sin_deg /* 9B91F4 80242874 4600A306 */ mov.s $f12, $f20 @@ -38,16 +38,16 @@ glabel func_802427FC_9B917C /* 9B9200 80242880 46000506 */ mov.s $f20, $f0 /* 9B9204 80242884 24040001 */ addiu $a0, $zero, 1 /* 9B9208 80242888 44931000 */ mtc1 $s3, $f2 -/* 9B920C 8024288C 00000000 */ nop +/* 9B920C 8024288C 00000000 */ nop /* 9B9210 80242890 468010A0 */ cvt.s.w $f2, $f2 /* 9B9214 80242894 2652000A */ addiu $s2, $s2, 0xa /* 9B9218 80242898 44051000 */ mfc1 $a1, $f2 /* 9B921C 8024289C 44921000 */ mtc1 $s2, $f2 -/* 9B9220 802428A0 00000000 */ nop +/* 9B9220 802428A0 00000000 */ nop /* 9B9224 802428A4 468010A0 */ cvt.s.w $f2, $f2 /* 9B9228 802428A8 44061000 */ mfc1 $a2, $f2 /* 9B922C 802428AC 44901000 */ mtc1 $s0, $f2 -/* 9B9230 802428B0 00000000 */ nop +/* 9B9230 802428B0 00000000 */ nop /* 9B9234 802428B4 468010A0 */ cvt.s.w $f2, $f2 /* 9B9238 802428B8 44071000 */ mfc1 $a3, $f2 /* 9B923C 802428BC 46000007 */ neg.s $f0, $f0 diff --git a/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240310_9BB5B0.s b/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240310_9BB5B0.s index cecdcedd4e..5fc9985b0a 100644 --- a/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240310_9BB5B0.s +++ b/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240310_9BB5B0.s @@ -63,7 +63,7 @@ glabel func_80240310_9BB5B0 /* 9BB698 802403F8 AE02001C */ sw $v0, 0x1c($s0) .L802403FC: /* 9BB69C 802403FC 0C009C64 */ jal func_80027190 -/* 9BB6A0 80240400 00000000 */ nop +/* 9BB6A0 80240400 00000000 */ nop /* 9BB6A4 80240404 14400131 */ bnez $v0, .L802408CC /* 9BB6A8 80240408 0000102D */ daddu $v0, $zero, $zero /* 9BB6AC 8024040C 8E900074 */ lw $s0, 0x74($s4) @@ -86,21 +86,21 @@ glabel func_80240310_9BB5B0 /* 9BB6EC 8024044C 00004012 */ mflo $t0 /* 9BB6F0 80240450 C6200054 */ lwc1 $f0, 0x54($s1) /* 9BB6F4 80240454 4488A000 */ mtc1 $t0, $f20 -/* 9BB6F8 80240458 00000000 */ nop +/* 9BB6F8 80240458 00000000 */ nop /* 9BB6FC 8024045C 4680A520 */ cvt.s.w $f20, $f20 /* 9BB700 80240460 4600A502 */ mul.s $f20, $f20, $f0 -/* 9BB704 80240464 00000000 */ nop +/* 9BB704 80240464 00000000 */ nop /* 9BB708 80240468 0C00A8BB */ jal sin_deg /* 9BB70C 8024046C C60C0028 */ lwc1 $f12, 0x28($s0) /* 9BB710 80240470 C60C0028 */ lwc1 $f12, 0x28($s0) /* 9BB714 80240474 4600A582 */ mul.s $f22, $f20, $f0 /* 9BB718 80240478 0C00A8D4 */ jal cos_deg -/* 9BB71C 8024047C 00000000 */ nop +/* 9BB71C 8024047C 00000000 */ nop /* 9BB720 80240480 C6020004 */ lwc1 $f2, 4($s0) /* 9BB724 80240484 46161080 */ add.s $f2, $f2, $f22 /* 9BB728 80240488 4600A507 */ neg.s $f20, $f20 /* 9BB72C 8024048C 4600A502 */ mul.s $f20, $f20, $f0 -/* 9BB730 80240490 00000000 */ nop +/* 9BB730 80240490 00000000 */ nop /* 9BB734 80240494 E6220038 */ swc1 $f2, 0x38($s1) /* 9BB738 80240498 C6000008 */ lwc1 $f0, 8($s0) /* 9BB73C 8024049C E620003C */ swc1 $f0, 0x3c($s1) @@ -116,7 +116,7 @@ glabel func_80240310_9BB5B0 /* 9BB760 802404C0 8E020000 */ lw $v0, ($s0) /* 9BB764 802404C4 30420002 */ andi $v0, $v0, 2 /* 9BB768 802404C8 14400051 */ bnez $v0, .L80240610 -/* 9BB76C 802404CC 00000000 */ nop +/* 9BB76C 802404CC 00000000 */ nop /* 9BB770 802404D0 8E620000 */ lw $v0, ($s3) /* 9BB774 802404D4 30428000 */ andi $v0, $v0, 0x8000 /* 9BB778 802404D8 1440004D */ bnez $v0, .L80240610 @@ -135,10 +135,10 @@ glabel func_80240310_9BB5B0 /* 9BB7AC 8024050C 46020181 */ sub.s $f6, $f0, $f2 .L80240510: /* 9BB7B0 80240510 14620006 */ bne $v1, $v0, .L8024052C -/* 9BB7B4 80240514 00000000 */ nop +/* 9BB7B4 80240514 00000000 */ nop /* 9BB7B8 80240518 3C014120 */ lui $at, 0x4120 /* 9BB7BC 8024051C 44810000 */ mtc1 $at, $f0 -/* 9BB7C0 80240520 00000000 */ nop +/* 9BB7C0 80240520 00000000 */ nop /* 9BB7C4 80240524 46002001 */ sub.s $f0, $f4, $f0 /* 9BB7C8 80240528 46020181 */ sub.s $f6, $f0, $f2 .L8024052C: @@ -147,10 +147,10 @@ glabel func_80240310_9BB5B0 /* 9BB7D4 80240534 3421CCCD */ ori $at, $at, 0xcccd /* 9BB7D8 80240538 44810000 */ mtc1 $at, $f0 /* 9BB7DC 8024053C 44822000 */ mtc1 $v0, $f4 -/* 9BB7E0 80240540 00000000 */ nop +/* 9BB7E0 80240540 00000000 */ nop /* 9BB7E4 80240544 46802120 */ cvt.s.w $f4, $f4 /* 9BB7E8 80240548 46002102 */ mul.s $f4, $f4, $f0 -/* 9BB7EC 8024054C 00000000 */ nop +/* 9BB7EC 8024054C 00000000 */ nop /* 9BB7F0 80240550 C6620028 */ lwc1 $f2, 0x28($s3) /* 9BB7F4 80240554 C6200038 */ lwc1 $f0, 0x38($s1) /* 9BB7F8 80240558 46001581 */ sub.s $f22, $f2, $f0 @@ -159,45 +159,45 @@ glabel func_80240310_9BB5B0 /* 9BB804 80240564 46001501 */ sub.s $f20, $f2, $f0 /* 9BB808 80240568 46003005 */ abs.s $f0, $f6 /* 9BB80C 8024056C 4604003C */ c.lt.s $f0, $f4 -/* 9BB810 80240570 00000000 */ nop +/* 9BB810 80240570 00000000 */ nop /* 9BB814 80240574 45000026 */ bc1f .L80240610 -/* 9BB818 80240578 00000000 */ nop +/* 9BB818 80240578 00000000 */ nop /* 9BB81C 8024057C 4616B082 */ mul.s $f2, $f22, $f22 -/* 9BB820 80240580 00000000 */ nop +/* 9BB820 80240580 00000000 */ nop /* 9BB824 80240584 4614A002 */ mul.s $f0, $f20, $f20 -/* 9BB828 80240588 00000000 */ nop +/* 9BB828 80240588 00000000 */ nop /* 9BB82C 8024058C 46001300 */ add.s $f12, $f2, $f0 /* 9BB830 80240590 46006104 */ sqrt.s $f4, $f12 /* 9BB834 80240594 46042032 */ c.eq.s $f4, $f4 -/* 9BB838 80240598 00000000 */ nop +/* 9BB838 80240598 00000000 */ nop /* 9BB83C 8024059C 45010004 */ bc1t .L802405B0 -/* 9BB840 802405A0 00000000 */ nop +/* 9BB840 802405A0 00000000 */ nop /* 9BB844 802405A4 0C0187BC */ jal sqrtf -/* 9BB848 802405A8 00000000 */ nop +/* 9BB848 802405A8 00000000 */ nop /* 9BB84C 802405AC 46000106 */ mov.s $f4, $f0 .L802405B0: /* 9BB850 802405B0 862200A6 */ lh $v0, 0xa6($s1) /* 9BB854 802405B4 44821000 */ mtc1 $v0, $f2 -/* 9BB858 802405B8 00000000 */ nop +/* 9BB858 802405B8 00000000 */ nop /* 9BB85C 802405BC 468010A0 */ cvt.s.w $f2, $f2 /* 9BB860 802405C0 46181082 */ mul.s $f2, $f2, $f24 -/* 9BB864 802405C4 00000000 */ nop +/* 9BB864 802405C4 00000000 */ nop /* 9BB868 802405C8 C6200054 */ lwc1 $f0, 0x54($s1) /* 9BB86C 802405CC 46001082 */ mul.s $f2, $f2, $f0 -/* 9BB870 802405D0 00000000 */ nop +/* 9BB870 802405D0 00000000 */ nop /* 9BB874 802405D4 866200B2 */ lh $v0, 0xb2($s3) /* 9BB878 802405D8 44820000 */ mtc1 $v0, $f0 -/* 9BB87C 802405DC 00000000 */ nop +/* 9BB87C 802405DC 00000000 */ nop /* 9BB880 802405E0 46800020 */ cvt.s.w $f0, $f0 /* 9BB884 802405E4 46180002 */ mul.s $f0, $f0, $f24 -/* 9BB888 802405E8 00000000 */ nop +/* 9BB888 802405E8 00000000 */ nop /* 9BB88C 802405EC 46181082 */ mul.s $f2, $f2, $f24 -/* 9BB890 802405F0 00000000 */ nop +/* 9BB890 802405F0 00000000 */ nop /* 9BB894 802405F4 46180002 */ mul.s $f0, $f0, $f24 -/* 9BB898 802405F8 00000000 */ nop +/* 9BB898 802405F8 00000000 */ nop /* 9BB89C 802405FC 46001080 */ add.s $f2, $f2, $f0 /* 9BB8A0 80240600 4602203E */ c.le.s $f4, $f2 -/* 9BB8A4 80240604 00000000 */ nop +/* 9BB8A4 80240604 00000000 */ nop /* 9BB8A8 80240608 45030001 */ bc1tl .L80240610 /* 9BB8AC 8024060C 24150001 */ addiu $s5, $zero, 1 .L80240610: @@ -205,7 +205,7 @@ glabel func_80240310_9BB5B0 /* 9BB8B4 80240614 26520001 */ addiu $s2, $s2, 1 /* 9BB8B8 80240618 0242102A */ slt $v0, $s2, $v0 /* 9BB8BC 8024061C 1440FF82 */ bnez $v0, .L80240428 -/* 9BB8C0 80240620 00000000 */ nop +/* 9BB8C0 80240620 00000000 */ nop .L80240624: /* 9BB8C4 80240624 8E620000 */ lw $v0, ($s3) /* 9BB8C8 80240628 30428000 */ andi $v0, $v0, 0x8000 @@ -220,9 +220,9 @@ glabel func_80240310_9BB5B0 /* 9BB8E8 80240648 C6020028 */ lwc1 $f2, 0x28($s0) /* 9BB8EC 8024064C 46000106 */ mov.s $f4, $f0 /* 9BB8F0 80240650 46022032 */ c.eq.s $f4, $f2 -/* 9BB8F4 80240654 00000000 */ nop +/* 9BB8F4 80240654 00000000 */ nop /* 9BB8F8 80240658 4501000D */ bc1t .L80240690 -/* 9BB8FC 8024065C 00000000 */ nop +/* 9BB8FC 8024065C 00000000 */ nop /* 9BB900 80240660 8E020020 */ lw $v0, 0x20($s0) /* 9BB904 80240664 C600000C */ lwc1 $f0, 0xc($s0) /* 9BB908 80240668 E6040028 */ swc1 $f4, 0x28($s0) @@ -251,23 +251,23 @@ glabel func_80240310_9BB5B0 /* 9BB960 802406C0 3C013F00 */ lui $at, 0x3f00 /* 9BB964 802406C4 44813000 */ mtc1 $at, $f6 /* 9BB968 802406C8 44821000 */ mtc1 $v0, $f2 -/* 9BB96C 802406CC 00000000 */ nop +/* 9BB96C 802406CC 00000000 */ nop /* 9BB970 802406D0 468010A0 */ cvt.s.w $f2, $f2 /* 9BB974 802406D4 46061082 */ mul.s $f2, $f2, $f6 -/* 9BB978 802406D8 00000000 */ nop +/* 9BB978 802406D8 00000000 */ nop /* 9BB97C 802406DC C6240054 */ lwc1 $f4, 0x54($s1) /* 9BB980 802406E0 46041082 */ mul.s $f2, $f2, $f4 -/* 9BB984 802406E4 00000000 */ nop +/* 9BB984 802406E4 00000000 */ nop /* 9BB988 802406E8 866200B2 */ lh $v0, 0xb2($s3) /* 9BB98C 802406EC 44822000 */ mtc1 $v0, $f4 -/* 9BB990 802406F0 00000000 */ nop +/* 9BB990 802406F0 00000000 */ nop /* 9BB994 802406F4 46802120 */ cvt.s.w $f4, $f4 /* 9BB998 802406F8 46062102 */ mul.s $f4, $f4, $f6 -/* 9BB99C 802406FC 00000000 */ nop +/* 9BB99C 802406FC 00000000 */ nop /* 9BB9A0 80240700 46061082 */ mul.s $f2, $f2, $f6 -/* 9BB9A4 80240704 00000000 */ nop +/* 9BB9A4 80240704 00000000 */ nop /* 9BB9A8 80240708 46062102 */ mul.s $f4, $f4, $f6 -/* 9BB9AC 8024070C 00000000 */ nop +/* 9BB9AC 8024070C 00000000 */ nop /* 9BB9B0 80240710 C60C0004 */ lwc1 $f12, 4($s0) /* 9BB9B4 80240714 C60E000C */ lwc1 $f14, 0xc($s0) /* 9BB9B8 80240718 46020000 */ add.s $f0, $f0, $f2 @@ -313,11 +313,11 @@ glabel func_80240310_9BB5B0 /* 9BBA58 802407B8 A6620016 */ sh $v0, 0x16($s3) /* 9BBA5C 802407BC 4600020D */ trunc.w.s $f8, $f0 /* 9BBA60 802407C0 44024000 */ mfc1 $v0, $f8 -/* 9BBA64 802407C4 00000000 */ nop +/* 9BBA64 802407C4 00000000 */ nop /* 9BBA68 802407C8 A6620018 */ sh $v0, 0x18($s3) /* 9BBA6C 802407CC 4600120D */ trunc.w.s $f8, $f2 /* 9BBA70 802407D0 44024000 */ mfc1 $v0, $f8 -/* 9BBA74 802407D4 00000000 */ nop +/* 9BBA74 802407D4 00000000 */ nop /* 9BBA78 802407D8 A662001A */ sh $v0, 0x1a($s3) /* 9BBA7C 802407DC 8E02001C */ lw $v0, 0x1c($s0) /* 9BBA80 802407E0 10400033 */ beqz $v0, .L802408B0 @@ -326,47 +326,47 @@ glabel func_80240310_9BB5B0 /* 9BBA8C 802407EC 0040F809 */ jalr $v0 /* 9BBA90 802407F0 24050002 */ addiu $a1, $zero, 2 /* 9BBA94 802407F4 0809022C */ j .L802408B0 -/* 9BBA98 802407F8 00000000 */ nop +/* 9BBA98 802407F8 00000000 */ nop .L802407FC: /* 9BBA9C 802407FC 4618B03C */ c.lt.s $f22, $f24 -/* 9BBAA0 80240800 00000000 */ nop +/* 9BBAA0 80240800 00000000 */ nop /* 9BBAA4 80240804 4500002A */ bc1f .L802408B0 -/* 9BBAA8 80240808 00000000 */ nop +/* 9BBAA8 80240808 00000000 */ nop /* 9BBAAC 8024080C 8E020000 */ lw $v0, ($s0) /* 9BBAB0 80240810 30420002 */ andi $v0, $v0, 2 /* 9BBAB4 80240814 14400026 */ bnez $v0, .L802408B0 -/* 9BBAB8 80240818 00000000 */ nop +/* 9BBAB8 80240818 00000000 */ nop /* 9BBABC 8024081C 16A00024 */ bnez $s5, .L802408B0 /* 9BBAC0 80240820 24020015 */ addiu $v0, $zero, 0x15 /* 9BBAC4 80240824 826300B4 */ lb $v1, 0xb4($s3) /* 9BBAC8 80240828 10620021 */ beq $v1, $v0, .L802408B0 -/* 9BBACC 8024082C 00000000 */ nop +/* 9BBACC 8024082C 00000000 */ nop /* 9BBAD0 80240830 C6000010 */ lwc1 $f0, 0x10($s0) /* 9BBAD4 80240834 44801000 */ mtc1 $zero, $f2 -/* 9BBAD8 80240838 00000000 */ nop +/* 9BBAD8 80240838 00000000 */ nop /* 9BBADC 8024083C 4600103C */ c.lt.s $f2, $f0 -/* 9BBAE0 80240840 00000000 */ nop +/* 9BBAE0 80240840 00000000 */ nop /* 9BBAE4 80240844 45000009 */ bc1f .L8024086C -/* 9BBAE8 80240848 00000000 */ nop +/* 9BBAE8 80240848 00000000 */ nop /* 9BBAEC 8024084C C6000024 */ lwc1 $f0, 0x24($s0) /* 9BBAF0 80240850 4602003C */ c.lt.s $f0, $f2 -/* 9BBAF4 80240854 00000000 */ nop +/* 9BBAF4 80240854 00000000 */ nop /* 9BBAF8 80240858 45000015 */ bc1f .L802408B0 -/* 9BBAFC 8024085C 00000000 */ nop +/* 9BBAFC 8024085C 00000000 */ nop /* 9BBB00 80240860 4614103C */ c.lt.s $f2, $f20 /* 9BBB04 80240864 08090222 */ j .L80240888 -/* 9BBB08 80240868 00000000 */ nop +/* 9BBB08 80240868 00000000 */ nop .L8024086C: /* 9BBB0C 8024086C C6000024 */ lwc1 $f0, 0x24($s0) /* 9BBB10 80240870 4600103C */ c.lt.s $f2, $f0 -/* 9BBB14 80240874 00000000 */ nop +/* 9BBB14 80240874 00000000 */ nop /* 9BBB18 80240878 4500000D */ bc1f .L802408B0 -/* 9BBB1C 8024087C 00000000 */ nop +/* 9BBB1C 8024087C 00000000 */ nop /* 9BBB20 80240880 4602A03C */ c.lt.s $f20, $f2 -/* 9BBB24 80240884 00000000 */ nop +/* 9BBB24 80240884 00000000 */ nop .L80240888: /* 9BBB28 80240888 45000009 */ bc1f .L802408B0 -/* 9BBB2C 8024088C 00000000 */ nop +/* 9BBB2C 8024088C 00000000 */ nop /* 9BBB30 80240890 8E020020 */ lw $v0, 0x20($s0) /* 9BBB34 80240894 8E03001C */ lw $v1, 0x1c($s0) /* 9BBB38 80240898 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240904_9BBBA4.s b/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240904_9BBBA4.s index 4214195bef..bb3d0f3c6b 100644 --- a/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240904_9BBBA4.s +++ b/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240904_9BBBA4.s @@ -12,26 +12,26 @@ glabel func_80240904_9BBBA4 /* 9BBBC0 80240920 50400005 */ beql $v0, $zero, .L80240938 /* 9BBBC4 80240924 24020002 */ addiu $v0, $zero, 2 /* 9BBBC8 80240928 10A00007 */ beqz $a1, .L80240948 -/* 9BBBCC 8024092C 00000000 */ nop +/* 9BBBCC 8024092C 00000000 */ nop /* 9BBBD0 80240930 08090284 */ j .L80240A10 -/* 9BBBD4 80240934 00000000 */ nop +/* 9BBBD4 80240934 00000000 */ nop .L80240938: /* 9BBBD8 80240938 10A20028 */ beq $a1, $v0, .L802409DC -/* 9BBBDC 8024093C 00000000 */ nop +/* 9BBBDC 8024093C 00000000 */ nop /* 9BBBE0 80240940 08090284 */ j .L80240A10 -/* 9BBBE4 80240944 00000000 */ nop +/* 9BBBE4 80240944 00000000 */ nop .L80240948: /* 9BBBE8 80240948 8E020000 */ lw $v0, ($s0) /* 9BBBEC 8024094C 30420002 */ andi $v0, $v0, 2 /* 9BBBF0 80240950 1040002F */ beqz $v0, .L80240A10 -/* 9BBBF4 80240954 00000000 */ nop +/* 9BBBF4 80240954 00000000 */ nop /* 9BBBF8 80240958 C6000010 */ lwc1 $f0, 0x10($s0) /* 9BBBFC 8024095C 3C013F73 */ lui $at, 0x3f73 /* 9BBC00 80240960 34213333 */ ori $at, $at, 0x3333 /* 9BBC04 80240964 44811000 */ mtc1 $at, $f2 -/* 9BBC08 80240968 00000000 */ nop +/* 9BBC08 80240968 00000000 */ nop /* 9BBC0C 8024096C 46020002 */ mul.s $f0, $f0, $f2 -/* 9BBC10 80240970 00000000 */ nop +/* 9BBC10 80240970 00000000 */ nop /* 9BBC14 80240974 08090284 */ j .L80240A10 /* 9BBC18 80240978 E6000010 */ swc1 $f0, 0x10($s0) .L8024097C: @@ -39,9 +39,9 @@ glabel func_80240904_9BBBA4 /* 9BBC20 80240980 3C013F8F */ lui $at, 0x3f8f /* 9BBC24 80240984 34215C29 */ ori $at, $at, 0x5c29 /* 9BBC28 80240988 44811000 */ mtc1 $at, $f2 -/* 9BBC2C 8024098C 00000000 */ nop +/* 9BBC2C 8024098C 00000000 */ nop /* 9BBC30 80240990 46020002 */ mul.s $f0, $f0, $f2 -/* 9BBC34 80240994 00000000 */ nop +/* 9BBC34 80240994 00000000 */ nop /* 9BBC38 80240998 8E030020 */ lw $v1, 0x20($s0) /* 9BBC3C 8024099C 2402000A */ addiu $v0, $zero, 0xa /* 9BBC40 802409A0 1462001B */ bne $v1, $v0, .L80240A10 @@ -69,10 +69,10 @@ glabel func_80240904_9BBBA4 /* 9BBC94 802409F4 00021023 */ negu $v0, $v0 .L802409F8: /* 9BBC98 802409F8 44821000 */ mtc1 $v0, $f2 -/* 9BBC9C 802409FC 00000000 */ nop +/* 9BBC9C 802409FC 00000000 */ nop /* 9BBCA0 80240A00 468010A0 */ cvt.s.w $f2, $f2 /* 9BBCA4 80240A04 46001082 */ mul.s $f2, $f2, $f0 -/* 9BBCA8 80240A08 00000000 */ nop +/* 9BBCA8 80240A08 00000000 */ nop /* 9BBCAC 80240A0C E6020010 */ swc1 $f2, 0x10($s0) .L80240A10: /* 9BBCB0 80240A10 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/world/area_trd/trd_09/9BD660/func_80240000_9BD660.s b/asm/nonmatchings/world/area_trd/trd_09/9BD660/func_80240000_9BD660.s index a5a9323fd6..799aac64d9 100644 --- a/asm/nonmatchings/world/area_trd/trd_09/9BD660/func_80240000_9BD660.s +++ b/asm/nonmatchings/world/area_trd/trd_09/9BD660/func_80240000_9BD660.s @@ -41,7 +41,7 @@ glabel func_80240000_9BD660 /* 9BD6E8 80240088 2406FFFF */ addiu $a2, $zero, -1 .L8024008C: /* 9BD6EC 8024008C 0C0B2026 */ jal set_variable -/* 9BD6F0 80240090 00000000 */ nop +/* 9BD6F0 80240090 00000000 */ nop /* 9BD6F4 80240094 8FBF0024 */ lw $ra, 0x24($sp) /* 9BD6F8 80240098 8FB40020 */ lw $s4, 0x20($sp) /* 9BD6FC 8024009C 8FB3001C */ lw $s3, 0x1c($sp) @@ -51,5 +51,5 @@ glabel func_80240000_9BD660 /* 9BD70C 802400AC 24020002 */ addiu $v0, $zero, 2 /* 9BD710 802400B0 03E00008 */ jr $ra /* 9BD714 802400B4 27BD0028 */ addiu $sp, $sp, 0x28 -/* 9BD718 802400B8 00000000 */ nop -/* 9BD71C 802400BC 00000000 */ nop +/* 9BD718 802400B8 00000000 */ nop +/* 9BD71C 802400BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_09/9BD720/func_802400C0_9BD720.s b/asm/nonmatchings/world/area_trd/trd_09/9BD720/func_802400C0_9BD720.s index 9a052a9552..48ed983ea2 100644 --- a/asm/nonmatchings/world/area_trd/trd_09/9BD720/func_802400C0_9BD720.s +++ b/asm/nonmatchings/world/area_trd/trd_09/9BD720/func_802400C0_9BD720.s @@ -20,12 +20,12 @@ glabel func_802400C0_9BD720 /* 9BD75C 802400FC 10600007 */ beqz $v1, .L8024011C /* 9BD760 80240100 0000102D */ daddu $v0, $zero, $zero /* 9BD764 80240104 0809006E */ j .L802401B8 -/* 9BD768 80240108 00000000 */ nop +/* 9BD768 80240108 00000000 */ nop .L8024010C: /* 9BD76C 8024010C 10620008 */ beq $v1, $v0, .L80240130 /* 9BD770 80240110 0000102D */ daddu $v0, $zero, $zero /* 9BD774 80240114 0809006E */ j .L802401B8 -/* 9BD778 80240118 00000000 */ nop +/* 9BD778 80240118 00000000 */ nop .L8024011C: /* 9BD77C 8024011C 24020001 */ addiu $v0, $zero, 1 /* 9BD780 80240120 0809006D */ j .L802401B4 @@ -53,7 +53,7 @@ glabel func_802400C0_9BD720 /* 9BD7D0 80240170 4600110D */ trunc.w.s $f4, $f2 /* 9BD7D4 80240174 44052000 */ mfc1 $a1, $f4 /* 9BD7D8 80240178 0C03BCF0 */ jal func_800EF3C0 -/* 9BD7DC 8024017C 00000000 */ nop +/* 9BD7DC 8024017C 00000000 */ nop /* 9BD7E0 80240180 0C03BCF5 */ jal func_800EF3D4 /* 9BD7E4 80240184 0000202D */ daddu $a0, $zero, $zero /* 9BD7E8 80240188 3C0142B4 */ lui $at, 0x42b4 @@ -61,7 +61,7 @@ glabel func_802400C0_9BD720 /* 9BD7F0 80240190 8E040000 */ lw $a0, ($s0) /* 9BD7F4 80240194 4405A000 */ mfc1 $a1, $f20 /* 9BD7F8 80240198 0C00ECD0 */ jal set_npc_yaw -/* 9BD7FC 8024019C 00000000 */ nop +/* 9BD7FC 8024019C 00000000 */ nop /* 9BD800 802401A0 24020002 */ addiu $v0, $zero, 2 /* 9BD804 802401A4 E6340080 */ swc1 $f20, 0x80($s1) /* 9BD808 802401A8 E6340084 */ swc1 $f20, 0x84($s1) diff --git a/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802401AC_9C2ABC.s b/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802401AC_9C2ABC.s index fd33529807..f031cc4842 100644 --- a/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802401AC_9C2ABC.s +++ b/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802401AC_9C2ABC.s @@ -13,11 +13,12 @@ glabel func_802401AC_9C2ABC /* 9C2ADC 802401CC 2C620005 */ sltiu $v0, $v1, 5 /* 9C2AE0 802401D0 1040008A */ beqz $v0, .L802403FC /* 9C2AE4 802401D4 00031080 */ sll $v0, $v1, 2 -/* 9C2AE8 802401D8 3C018024 */ lui $at, %hi(D_80242AA0) +/* 9C2AE8 802401D8 3C018024 */ lui $at, %hi(jtbl_80242AA0_9C53B0) /* 9C2AEC 802401DC 00220821 */ addu $at, $at, $v0 -/* 9C2AF0 802401E0 8C222AA0 */ lw $v0, %lo(D_80242AA0)($at) +/* 9C2AF0 802401E0 8C222AA0 */ lw $v0, %lo(jtbl_80242AA0_9C53B0)($at) /* 9C2AF4 802401E4 00400008 */ jr $v0 -/* 9C2AF8 802401E8 00000000 */ nop +/* 9C2AF8 802401E8 00000000 */ nop +glabel L802401EC_9C2AFC /* 9C2AFC 802401EC 8E22003C */ lw $v0, 0x3c($s1) /* 9C2B00 802401F0 86270046 */ lh $a3, 0x46($s1) /* 9C2B04 802401F4 AFA20010 */ sw $v0, 0x10($sp) @@ -66,6 +67,7 @@ glabel func_802401AC_9C2ABC /* 9C2BB0 802402A0 A6220044 */ sh $v0, 0x44($s1) /* 9C2BB4 802402A4 080900FF */ j .L802403FC /* 9C2BB8 802402A8 A6200046 */ sh $zero, 0x46($s1) +glabel L802402AC_9C2BBC /* 9C2BBC 802402AC 96220046 */ lhu $v0, 0x46($s1) /* 9C2BC0 802402B0 24420001 */ addiu $v0, $v0, 1 /* 9C2BC4 802402B4 A6220046 */ sh $v0, 0x46($s1) @@ -84,6 +86,7 @@ glabel func_802401AC_9C2ABC /* 9C2BF8 802402E8 8C42000C */ lw $v0, 0xc($v0) /* 9C2BFC 802402EC 080900FF */ j .L802403FC /* 9C2C00 802402F0 AC400074 */ sw $zero, 0x74($v0) +glabel L802402F4_9C2C04 /* 9C2C04 802402F4 96220046 */ lhu $v0, 0x46($s1) /* 9C2C08 802402F8 24420001 */ addiu $v0, $v0, 1 /* 9C2C0C 802402FC A6220046 */ sh $v0, 0x46($s1) @@ -91,7 +94,7 @@ glabel func_802401AC_9C2ABC /* 9C2C14 80240304 00021403 */ sra $v0, $v0, 0x10 /* 9C2C18 80240308 2842003C */ slti $v0, $v0, 0x3c /* 9C2C1C 8024030C 1440003B */ bnez $v0, .L802403FC -/* 9C2C20 80240310 00000000 */ nop +/* 9C2C20 80240310 00000000 */ nop /* 9C2C24 80240314 3C013F80 */ lui $at, 0x3f80 /* 9C2C28 80240318 44810000 */ mtc1 $at, $f0 /* 9C2C2C 8024031C AFA00014 */ sw $zero, 0x14($sp) @@ -124,6 +127,7 @@ glabel func_802401AC_9C2ABC /* 9C2C98 80240388 A6220048 */ sh $v0, 0x48($s1) /* 9C2C9C 8024038C 080900FF */ j .L802403FC /* 9C2CA0 80240390 E6200030 */ swc1 $f0, 0x30($s1) +glabel L80240394_9C2CA4 /* 9C2CA4 80240394 0000202D */ daddu $a0, $zero, $zero /* 9C2CA8 80240398 3C054210 */ lui $a1, 0x4210 /* 9C2CAC 8024039C 3C064198 */ lui $a2, 0x4198 @@ -151,14 +155,15 @@ glabel func_802401AC_9C2ABC /* 9C2D04 802403F4 A6200046 */ sh $zero, 0x46($s1) /* 9C2D08 802403F8 E6200034 */ swc1 $f0, 0x34($s1) .L802403FC: +glabel L802403FC_9C2D0C /* 9C2D0C 802403FC 8623004A */ lh $v1, 0x4a($s1) /* 9C2D10 80240400 24020001 */ addiu $v0, $zero, 1 /* 9C2D14 80240404 10620005 */ beq $v1, $v0, .L8024041C /* 9C2D18 80240408 24020002 */ addiu $v0, $zero, 2 /* 9C2D1C 8024040C 1062001E */ beq $v1, $v0, .L80240488 -/* 9C2D20 80240410 00000000 */ nop +/* 9C2D20 80240410 00000000 */ nop /* 9C2D24 80240414 0809014C */ j .L80240530 -/* 9C2D28 80240418 00000000 */ nop +/* 9C2D28 80240418 00000000 */ nop .L8024041C: /* 9C2D2C 8024041C 8627004C */ lh $a3, 0x4c($s1) /* 9C2D30 80240420 24100078 */ addiu $s0, $zero, 0x78 @@ -190,12 +195,12 @@ glabel func_802401AC_9C2ABC .L80240488: /* 9C2D98 80240488 8622004C */ lh $v0, 0x4c($s1) /* 9C2D9C 8024048C 44826000 */ mtc1 $v0, $f12 -/* 9C2DA0 80240490 00000000 */ nop +/* 9C2DA0 80240490 00000000 */ nop /* 9C2DA4 80240494 0C00A8BB */ jal sin_deg /* 9C2DA8 80240498 46806320 */ cvt.s.w $f12, $f12 /* 9C2DAC 8024049C 3C013F80 */ lui $at, 0x3f80 /* 9C2DB0 802404A0 44811000 */ mtc1 $at, $f2 -/* 9C2DB4 802404A4 00000000 */ nop +/* 9C2DB4 802404A4 00000000 */ nop /* 9C2DB8 802404A8 46020000 */ add.s $f0, $f0, $f2 /* 9C2DBC 802404AC 46000000 */ add.s $f0, $f0, $f0 /* 9C2DC0 802404B0 C6220024 */ lwc1 $f2, 0x24($s1) @@ -203,7 +208,7 @@ glabel func_802401AC_9C2ABC /* 9C2DC8 802404B8 46001080 */ add.s $f2, $f2, $f0 /* 9C2DCC 802404BC 24420008 */ addiu $v0, $v0, 8 /* 9C2DD0 802404C0 44826000 */ mtc1 $v0, $f12 -/* 9C2DD4 802404C4 00000000 */ nop +/* 9C2DD4 802404C4 00000000 */ nop /* 9C2DD8 802404C8 46806320 */ cvt.s.w $f12, $f12 /* 9C2DDC 802404CC 0C00A6C9 */ jal clamp_angle /* 9C2DE0 802404D0 E6220004 */ swc1 $f2, 4($s1) @@ -224,9 +229,9 @@ glabel func_802401AC_9C2ABC /* 9C2E1C 8024050C 460E1380 */ add.s $f14, $f2, $f14 /* 9C2E20 80240510 3C0141F0 */ lui $at, 0x41f0 /* 9C2E24 80240514 44811000 */ mtc1 $at, $f2 -/* 9C2E28 80240518 00000000 */ nop +/* 9C2E28 80240518 00000000 */ nop /* 9C2E2C 8024051C 4600103C */ c.lt.s $f2, $f0 -/* 9C2E30 80240520 00000000 */ nop +/* 9C2E30 80240520 00000000 */ nop /* 9C2E34 80240524 45010002 */ bc1t .L80240530 /* 9C2E38 80240528 24020003 */ addiu $v0, $zero, 3 .L8024052C: @@ -237,9 +242,9 @@ glabel func_802401AC_9C2ABC /* 9C2E48 80240538 10620005 */ beq $v1, $v0, .L80240550 /* 9C2E4C 8024053C 24020002 */ addiu $v0, $zero, 2 /* 9C2E50 80240540 10620008 */ beq $v1, $v0, .L80240564 -/* 9C2E54 80240544 00000000 */ nop +/* 9C2E54 80240544 00000000 */ nop /* 9C2E58 80240548 08090169 */ j .L802405A4 -/* 9C2E5C 8024054C 00000000 */ nop +/* 9C2E5C 8024054C 00000000 */ nop .L80240550: /* 9C2E60 80240550 C620002C */ lwc1 $f0, 0x2c($s1) /* 9C2E64 80240554 C62C0030 */ lwc1 $f12, 0x30($s1) diff --git a/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_80240708_9C3018.s b/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_80240708_9C3018.s index 47dfb9684e..903e412868 100644 --- a/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_80240708_9C3018.s +++ b/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_80240708_9C3018.s @@ -8,12 +8,12 @@ glabel func_80240708_9C3018 /* 9C3024 80240714 8C900084 */ lw $s0, 0x84($a0) /* 9C3028 80240718 8602004C */ lh $v0, 0x4c($s0) /* 9C302C 8024071C 44826000 */ mtc1 $v0, $f12 -/* 9C3030 80240720 00000000 */ nop +/* 9C3030 80240720 00000000 */ nop /* 9C3034 80240724 0C00A8BB */ jal sin_deg /* 9C3038 80240728 46806320 */ cvt.s.w $f12, $f12 /* 9C303C 8024072C 3C013F80 */ lui $at, 0x3f80 /* 9C3040 80240730 44811000 */ mtc1 $at, $f2 -/* 9C3044 80240734 00000000 */ nop +/* 9C3044 80240734 00000000 */ nop /* 9C3048 80240738 46020000 */ add.s $f0, $f0, $f2 /* 9C304C 8024073C 46000000 */ add.s $f0, $f0, $f0 /* 9C3050 80240740 C6020024 */ lwc1 $f2, 0x24($s0) @@ -21,13 +21,13 @@ glabel func_80240708_9C3018 /* 9C3058 80240748 46001080 */ add.s $f2, $f2, $f0 /* 9C305C 8024074C 24420008 */ addiu $v0, $v0, 8 /* 9C3060 80240750 44826000 */ mtc1 $v0, $f12 -/* 9C3064 80240754 00000000 */ nop +/* 9C3064 80240754 00000000 */ nop /* 9C3068 80240758 46806320 */ cvt.s.w $f12, $f12 /* 9C306C 8024075C 0C00A6C9 */ jal clamp_angle /* 9C3070 80240760 E6020004 */ swc1 $f2, 4($s0) /* 9C3074 80240764 4600010D */ trunc.w.s $f4, $f0 /* 9C3078 80240768 44022000 */ mfc1 $v0, $f4 -/* 9C307C 8024076C 00000000 */ nop +/* 9C307C 8024076C 00000000 */ nop /* 9C3080 80240770 A602004C */ sh $v0, 0x4c($s0) /* 9C3084 80240774 3C028011 */ lui $v0, %hi(gPlayerStatus) /* 9C3088 80240778 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) @@ -38,9 +38,9 @@ glabel func_80240708_9C3018 /* 9C309C 8024078C 8E070020 */ lw $a3, 0x20($s0) /* 9C30A0 80240790 3C0141F0 */ lui $at, 0x41f0 /* 9C30A4 80240794 44811000 */ mtc1 $at, $f2 -/* 9C30A8 80240798 00000000 */ nop +/* 9C30A8 80240798 00000000 */ nop /* 9C30AC 8024079C 4602003E */ c.le.s $f0, $f2 -/* 9C30B0 802407A0 00000000 */ nop +/* 9C30B0 802407A0 00000000 */ nop /* 9C30B4 802407A4 45000002 */ bc1f .L802407B0 /* 9C30B8 802407A8 24020003 */ addiu $v0, $zero, 3 /* 9C30BC 802407AC A602004E */ sh $v0, 0x4e($s0) diff --git a/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802407F4_9C3104.s b/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802407F4_9C3104.s index b7d6d7ec68..f78f71c881 100644 --- a/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802407F4_9C3104.s +++ b/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802407F4_9C3104.s @@ -10,6 +10,6 @@ glabel func_802407F4_9C3104 /* 9C3118 80240808 24020002 */ addiu $v0, $zero, 2 /* 9C311C 8024080C 03E00008 */ jr $ra /* 9C3120 80240810 27BD0018 */ addiu $sp, $sp, 0x18 -/* 9C3124 80240814 00000000 */ nop -/* 9C3128 80240818 00000000 */ nop -/* 9C312C 8024081C 00000000 */ nop +/* 9C3124 80240814 00000000 */ nop +/* 9C3128 80240818 00000000 */ nop +/* 9C312C 8024081C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s b/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s index b9206ebf5f..855e7462e9 100644 --- a/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s +++ b/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s @@ -12,6 +12,6 @@ glabel func_80240820_9C3130 .L8024083C: /* 9C314C 8024083C 03E00008 */ jr $ra /* 9C3150 80240840 24020002 */ addiu $v0, $zero, 2 -/* 9C3154 80240844 00000000 */ nop -/* 9C3158 80240848 00000000 */ nop -/* 9C315C 8024084C 00000000 */ nop +/* 9C3154 80240844 00000000 */ nop +/* 9C3158 80240848 00000000 */ nop +/* 9C315C 8024084C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240000_B1B570.s b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240000_B1B570.s index ff4dec9e3c..a71ce61456 100644 --- a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240000_B1B570.s +++ b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240000_B1B570.s @@ -27,7 +27,7 @@ glabel func_80240000_B1B570 /* B1B5C8 80240058 3421FA2E */ ori $at, $at, 0xfa2e /* B1B5CC 8024005C 4481A000 */ mtc1 $at, $f20 /* B1B5D0 80240060 0C00A7B5 */ jal dist2D -/* B1B5D4 80240064 00000000 */ nop +/* B1B5D4 80240064 00000000 */ nop /* B1B5D8 80240068 0C00A85B */ jal sin_rad /* B1B5DC 8024006C 4600A306 */ mov.s $f12, $f20 /* B1B5E0 80240070 4600A306 */ mov.s $f12, $f20 @@ -36,16 +36,16 @@ glabel func_80240000_B1B570 /* B1B5EC 8024007C C6060038 */ lwc1 $f6, 0x38($s0) /* B1B5F0 80240080 46163581 */ sub.s $f22, $f6, $f22 /* B1B5F4 80240084 46160082 */ mul.s $f2, $f0, $f22 -/* B1B5F8 80240088 00000000 */ nop +/* B1B5F8 80240088 00000000 */ nop /* B1B5FC 8024008C C6040040 */ lwc1 $f4, 0x40($s0) /* B1B600 80240090 46182101 */ sub.s $f4, $f4, $f24 /* B1B604 80240094 4604A202 */ mul.s $f8, $f20, $f4 -/* B1B608 80240098 00000000 */ nop +/* B1B608 80240098 00000000 */ nop /* B1B60C 8024009C 4600A507 */ neg.s $f20, $f20 /* B1B610 802400A0 4616A502 */ mul.s $f20, $f20, $f22 -/* B1B614 802400A4 00000000 */ nop +/* B1B614 802400A4 00000000 */ nop /* B1B618 802400A8 46040002 */ mul.s $f0, $f0, $f4 -/* B1B61C 802400AC 00000000 */ nop +/* B1B61C 802400AC 00000000 */ nop /* B1B620 802400B0 46081080 */ add.s $f2, $f2, $f8 /* B1B624 802400B4 4600A500 */ add.s $f20, $f20, $f0 /* B1B628 802400B8 46161081 */ sub.s $f2, $f2, $f22 diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802400FC_B1B66C.s b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802400FC_B1B66C.s index cf6055836f..0d4abdc1a3 100644 --- a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802400FC_B1B66C.s +++ b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802400FC_B1B66C.s @@ -33,13 +33,13 @@ glabel func_802400FC_B1B66C /* B1B6DC 8024016C 34210FD0 */ ori $at, $at, 0xfd0 /* B1B6E0 80240170 4481B000 */ mtc1 $at, $f22 /* B1B6E4 80240174 44820000 */ mtc1 $v0, $f0 -/* B1B6E8 80240178 00000000 */ nop +/* B1B6E8 80240178 00000000 */ nop /* B1B6EC 8024017C 46800020 */ cvt.s.w $f0, $f0 /* B1B6F0 80240180 46160502 */ mul.s $f20, $f0, $f22 -/* B1B6F4 80240184 00000000 */ nop +/* B1B6F4 80240184 00000000 */ nop /* B1B6F8 80240188 3C0143B4 */ lui $at, 0x43b4 /* B1B6FC 8024018C 4481D000 */ mtc1 $at, $f26 -/* B1B700 80240190 00000000 */ nop +/* B1B700 80240190 00000000 */ nop /* B1B704 80240194 461AA503 */ div.s $f20, $f20, $f26 /* B1B708 80240198 0C00A85B */ jal sin_rad /* B1B70C 8024019C 4600A306 */ mov.s $f12, $f20 @@ -47,19 +47,19 @@ glabel func_802400FC_B1B66C /* B1B714 802401A4 0C00A874 */ jal cos_rad /* B1B718 802401A8 4600A306 */ mov.s $f12, $f20 /* B1B71C 802401AC 4600C702 */ mul.s $f28, $f24, $f0 -/* B1B720 802401B0 00000000 */ nop +/* B1B720 802401B0 00000000 */ nop /* B1B724 802401B4 0220202D */ daddu $a0, $s1, $zero /* B1B728 802401B8 4600F507 */ neg.s $f20, $f30 /* B1B72C 802401BC 4614C502 */ mul.s $f20, $f24, $f20 -/* B1B730 802401C0 00000000 */ nop +/* B1B730 802401C0 00000000 */ nop /* B1B734 802401C4 3C05FE36 */ lui $a1, 0xfe36 /* B1B738 802401C8 0C0B1EAF */ jal get_variable /* B1B73C 802401CC 34A53C80 */ ori $a1, $a1, 0x3c80 /* B1B740 802401D0 44820000 */ mtc1 $v0, $f0 -/* B1B744 802401D4 00000000 */ nop +/* B1B744 802401D4 00000000 */ nop /* B1B748 802401D8 46800020 */ cvt.s.w $f0, $f0 /* B1B74C 802401DC 46160582 */ mul.s $f22, $f0, $f22 -/* B1B750 802401E0 00000000 */ nop +/* B1B750 802401E0 00000000 */ nop /* B1B754 802401E4 461AB583 */ div.s $f22, $f22, $f26 /* B1B758 802401E8 0C00A85B */ jal sin_rad /* B1B75C 802401EC 4600B306 */ mov.s $f12, $f22 @@ -67,10 +67,10 @@ glabel func_802400FC_B1B66C /* B1B764 802401F4 0C00A874 */ jal cos_rad /* B1B768 802401F8 4600B306 */ mov.s $f12, $f22 /* B1B76C 802401FC 4600C002 */ mul.s $f0, $f24, $f0 -/* B1B770 80240200 00000000 */ nop +/* B1B770 80240200 00000000 */ nop /* B1B774 80240204 4600F087 */ neg.s $f2, $f30 /* B1B778 80240208 4602C602 */ mul.s $f24, $f24, $f2 -/* B1B77C 8024020C 00000000 */ nop +/* B1B77C 8024020C 00000000 */ nop /* B1B780 80240210 461C0001 */ sub.s $f0, $f0, $f28 /* B1B784 80240214 4614C601 */ sub.s $f24, $f24, $f20 /* B1B788 80240218 C6020038 */ lwc1 $f2, 0x38($s0) diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_8024029C_B1B80C.s b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_8024029C_B1B80C.s index 026f8e079a..6931ac219d 100644 --- a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_8024029C_B1B80C.s +++ b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_8024029C_B1B80C.s @@ -14,7 +14,7 @@ glabel func_8024029C_B1B80C /* B1B830 802402C0 27B10020 */ addiu $s1, $sp, 0x20 /* B1B834 802402C4 8E0400CC */ lw $a0, 0xcc($s0) /* B1B838 802402C8 0C044181 */ jal get_shadow_by_index -/* B1B83C 802402CC 00000000 */ nop +/* B1B83C 802402CC 00000000 */ nop /* B1B840 802402D0 0C048B77 */ jal func_80122DDC /* B1B844 802402D4 84440008 */ lh $a0, 8($v0) /* B1B848 802402D8 8C430000 */ lw $v1, ($v0) @@ -34,7 +34,7 @@ glabel func_8024029C_B1B80C /* B1B880 80240310 46000007 */ neg.s $f0, $f0 /* B1B884 80240314 44070000 */ mfc1 $a3, $f0 /* B1B888 80240318 0C00B94E */ jal get_screen_coords -/* B1B88C 8024031C 00000000 */ nop +/* B1B88C 8024031C 00000000 */ nop /* B1B890 80240320 0220202D */ daddu $a0, $s1, $zero /* B1B894 80240324 AFB00028 */ sw $s0, 0x28($sp) /* B1B898 80240328 820500BE */ lb $a1, 0xbe($s0) diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240360_B1B8D0.s b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240360_B1B8D0.s index aab5e1fb87..339e3819da 100644 --- a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240360_B1B8D0.s +++ b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240360_B1B8D0.s @@ -33,7 +33,7 @@ glabel func_80240360_B1B8D0 /* B1B940 802403D0 E7B40010 */ swc1 $f20, 0x10($sp) /* B1B944 802403D4 C62C008C */ lwc1 $f12, 0x8c($s1) /* B1B948 802403D8 0C00A6C9 */ jal clamp_angle -/* B1B94C 802403DC 00000000 */ nop +/* B1B94C 802403DC 00000000 */ nop /* B1B950 802403E0 44050000 */ mfc1 $a1, $f0 /* B1B954 802403E4 4406A000 */ mfc1 $a2, $f20 /* B1B958 802403E8 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405B0_B1BB20.s b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405B0_B1BB20.s index 04de2ac00e..94546b1b7d 100644 --- a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405B0_B1BB20.s +++ b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405B0_B1BB20.s @@ -7,7 +7,7 @@ glabel func_802405B0_B1BB20 /* B1BB28 802405B8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B1BB2C 802405BC AFBF0010 */ sw $ra, 0x10($sp) /* B1BB30 802405C0 0C047A2F */ jal func_8011E8BC -/* B1BB34 802405C4 00000000 */ nop +/* B1BB34 802405C4 00000000 */ nop /* B1BB38 802405C8 8FBF0010 */ lw $ra, 0x10($sp) /* B1BB3C 802405CC 03E00008 */ jr $ra /* B1BB40 802405D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240628_B1BB98.s b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240628_B1BB98.s index d0be17a4f1..9f1426ac85 100644 --- a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240628_B1BB98.s +++ b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240628_B1BB98.s @@ -9,10 +9,10 @@ glabel func_80240628_B1BB98 /* B1BBA8 80240638 24A505D4 */ addiu $a1, $a1, %lo(func_802405D4_B1BB44) /* B1BBAC 8024063C AFBF0010 */ sw $ra, 0x10($sp) /* B1BBB0 80240640 0C048C56 */ jal bind_dynamic_entity_3 -/* B1BBB4 80240644 00000000 */ nop +/* B1BBB4 80240644 00000000 */ nop /* B1BBB8 80240648 8FBF0010 */ lw $ra, 0x10($sp) /* B1BBBC 8024064C 24020002 */ addiu $v0, $zero, 2 /* B1BBC0 80240650 03E00008 */ jr $ra /* B1BBC4 80240654 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1BBC8 80240658 00000000 */ nop -/* B1BBCC 8024065C 00000000 */ nop +/* B1BBC8 80240658 00000000 */ nop +/* B1BBCC 8024065C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1BBD0/func_80240660_B1BBD0.s b/asm/nonmatchings/world/area_tst/tst_04/B1BBD0/func_80240660_B1BBD0.s index c9f8efbf6e..15e3565157 100644 --- a/asm/nonmatchings/world/area_tst/tst_04/B1BBD0/func_80240660_B1BBD0.s +++ b/asm/nonmatchings/world/area_tst/tst_04/B1BBD0/func_80240660_B1BBD0.s @@ -13,4 +13,4 @@ glabel func_80240660_B1BBD0 /* B1BBF0 80240680 24020002 */ addiu $v0, $zero, 2 /* B1BBF4 80240684 03E00008 */ jr $ra /* B1BBF8 80240688 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1BBFC 8024068C 00000000 */ nop +/* B1BBFC 8024068C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_8024003C_B1CA8C.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_8024003C_B1CA8C.s index 00a7291b32..6ebded1a1f 100644 --- a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_8024003C_B1CA8C.s +++ b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_8024003C_B1CA8C.s @@ -14,7 +14,7 @@ glabel func_8024003C_B1CA8C /* B1CAB0 80240060 27B10020 */ addiu $s1, $sp, 0x20 /* B1CAB4 80240064 8E0400CC */ lw $a0, 0xcc($s0) /* B1CAB8 80240068 0C044181 */ jal get_shadow_by_index -/* B1CABC 8024006C 00000000 */ nop +/* B1CABC 8024006C 00000000 */ nop /* B1CAC0 80240070 0C048B77 */ jal func_80122DDC /* B1CAC4 80240074 84440008 */ lh $a0, 8($v0) /* B1CAC8 80240078 8C430000 */ lw $v1, ($v0) @@ -34,7 +34,7 @@ glabel func_8024003C_B1CA8C /* B1CB00 802400B0 46000007 */ neg.s $f0, $f0 /* B1CB04 802400B4 44070000 */ mfc1 $a3, $f0 /* B1CB08 802400B8 0C00B94E */ jal get_screen_coords -/* B1CB0C 802400BC 00000000 */ nop +/* B1CB0C 802400BC 00000000 */ nop /* B1CB10 802400C0 0220202D */ daddu $a0, $s1, $zero /* B1CB14 802400C4 AFB00028 */ sw $s0, 0x28($sp) /* B1CB18 802400C8 820500BE */ lb $a1, 0xbe($s0) diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240100_B1CB50.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240100_B1CB50.s index 5ba6cc7d12..b3fef248c3 100644 --- a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240100_B1CB50.s +++ b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240100_B1CB50.s @@ -33,7 +33,7 @@ glabel func_80240100_B1CB50 /* B1CBC0 80240170 E7B40010 */ swc1 $f20, 0x10($sp) /* B1CBC4 80240174 C62C008C */ lwc1 $f12, 0x8c($s1) /* B1CBC8 80240178 0C00A6C9 */ jal clamp_angle -/* B1CBCC 8024017C 00000000 */ nop +/* B1CBCC 8024017C 00000000 */ nop /* B1CBD0 80240180 44050000 */ mfc1 $a1, $f0 /* B1CBD4 80240184 4406A000 */ mfc1 $a2, $f20 /* B1CBD8 80240188 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402F4_B1CD44.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402F4_B1CD44.s index 03898c5ec1..e2fa44cc05 100644 --- a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402F4_B1CD44.s +++ b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402F4_B1CD44.s @@ -14,7 +14,7 @@ glabel func_802402F4_B1CD44 /* B1CD68 80240318 27B10020 */ addiu $s1, $sp, 0x20 /* B1CD6C 8024031C 8E0400CC */ lw $a0, 0xcc($s0) /* B1CD70 80240320 0C044181 */ jal get_shadow_by_index -/* B1CD74 80240324 00000000 */ nop +/* B1CD74 80240324 00000000 */ nop /* B1CD78 80240328 0C048B77 */ jal func_80122DDC /* B1CD7C 8024032C 84440008 */ lh $a0, 8($v0) /* B1CD80 80240330 8C430000 */ lw $v1, ($v0) @@ -34,7 +34,7 @@ glabel func_802402F4_B1CD44 /* B1CDB8 80240368 46000007 */ neg.s $f0, $f0 /* B1CDBC 8024036C 44060000 */ mfc1 $a2, $f0 /* B1CDC0 80240370 0C00B94E */ jal get_screen_coords -/* B1CDC4 80240374 00000000 */ nop +/* B1CDC4 80240374 00000000 */ nop /* B1CDC8 80240378 0220202D */ daddu $a0, $s1, $zero /* B1CDCC 8024037C AFB00028 */ sw $s0, 0x28($sp) /* B1CDD0 80240380 820500BE */ lb $a1, 0xbe($s0) diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802403B8_B1CE08.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802403B8_B1CE08.s index 8c67c7925a..7a692e5760 100644 --- a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802403B8_B1CE08.s +++ b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802403B8_B1CE08.s @@ -40,7 +40,7 @@ glabel func_802403B8_B1CE08 /* B1CE94 80240444 E7B40010 */ swc1 $f20, 0x10($sp) /* B1CE98 80240448 C64C008C */ lwc1 $f12, 0x8c($s2) /* B1CE9C 8024044C 0C00A6C9 */ jal clamp_angle -/* B1CEA0 80240450 00000000 */ nop +/* B1CEA0 80240450 00000000 */ nop /* B1CEA4 80240454 44050000 */ mfc1 $a1, $f0 /* B1CEA8 80240458 4406A000 */ mfc1 $a2, $f20 /* B1CEAC 8024045C 4407A000 */ mfc1 $a3, $f20 @@ -114,7 +114,7 @@ glabel func_802403B8_B1CE08 /* B1CFBC 8024056C E7B40010 */ swc1 $f20, 0x10($sp) /* B1CFC0 80240570 C64C008C */ lwc1 $f12, 0x8c($s2) /* B1CFC4 80240574 0C00A6C9 */ jal clamp_angle -/* B1CFC8 80240578 00000000 */ nop +/* B1CFC8 80240578 00000000 */ nop /* B1CFCC 8024057C 44050000 */ mfc1 $a1, $f0 /* B1CFD0 80240580 4406A000 */ mfc1 $a2, $f20 /* B1CFD4 80240584 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_80240000_B1D760.s b/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_80240000_B1D760.s index 0f41374f08..304cfcc6c3 100644 --- a/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_80240000_B1D760.s +++ b/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_80240000_B1D760.s @@ -19,7 +19,7 @@ glabel func_80240000_B1D760 /* B1D798 80240038 46802120 */ cvt.s.w $f4, $f4 /* B1D79C 8024003C 44072000 */ mfc1 $a3, $f4 /* B1D7A0 80240040 0C00A7B5 */ jal dist2D -/* B1D7A4 80240044 00000000 */ nop +/* B1D7A4 80240044 00000000 */ nop /* B1D7A8 80240048 24020001 */ addiu $v0, $zero, 1 /* B1D7AC 8024004C AE220084 */ sw $v0, 0x84($s1) /* B1D7B0 80240050 820300B4 */ lb $v1, 0xb4($s0) @@ -34,7 +34,7 @@ glabel func_80240000_B1D760 /* B1D7D0 80240070 C4400010 */ lwc1 $f0, 0x10($v0) /* B1D7D4 80240074 46800020 */ cvt.s.w $f0, $f0 /* B1D7D8 80240078 4602003E */ c.le.s $f0, $f2 -/* B1D7DC 8024007C 00000000 */ nop +/* B1D7DC 8024007C 00000000 */ nop /* B1D7E0 80240080 45030001 */ bc1tl .L80240088 /* B1D7E4 80240084 AE200084 */ sw $zero, 0x84($s1) .L80240088: diff --git a/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_802400A0_B1D800.s b/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_802400A0_B1D800.s index fe0797ec86..1be0daa472 100644 --- a/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_802400A0_B1D800.s +++ b/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_802400A0_B1D800.s @@ -18,12 +18,12 @@ glabel func_802400A0_B1D800 /* B1D834 802400D4 468031A0 */ cvt.s.w $f6, $f6 /* B1D838 802400D8 44073000 */ mfc1 $a3, $f6 /* B1D83C 802400DC 0C00A7B5 */ jal dist2D -/* B1D840 802400E0 00000000 */ nop +/* B1D840 802400E0 00000000 */ nop /* B1D844 802400E4 3C0142E1 */ lui $at, 0x42e1 /* B1D848 802400E8 44811000 */ mtc1 $at, $f2 /* B1D84C 802400EC 46000106 */ mov.s $f4, $f0 /* B1D850 802400F0 4602203C */ c.lt.s $f4, $f2 -/* B1D854 802400F4 00000000 */ nop +/* B1D854 802400F4 00000000 */ nop /* B1D858 802400F8 45000003 */ bc1f .L80240108 /* B1D85C 802400FC AE000084 */ sw $zero, 0x84($s0) /* B1D860 80240100 24020002 */ addiu $v0, $zero, 2 @@ -31,9 +31,9 @@ glabel func_802400A0_B1D800 .L80240108: /* B1D868 80240108 3C014216 */ lui $at, 0x4216 /* B1D86C 8024010C 44810000 */ mtc1 $at, $f0 -/* B1D870 80240110 00000000 */ nop +/* B1D870 80240110 00000000 */ nop /* B1D874 80240114 4600203C */ c.lt.s $f4, $f0 -/* B1D878 80240118 00000000 */ nop +/* B1D878 80240118 00000000 */ nop /* B1D87C 8024011C 45000002 */ bc1f .L80240128 /* B1D880 80240120 24020001 */ addiu $v0, $zero, 1 /* B1D884 80240124 AE020084 */ sw $v0, 0x84($s0) diff --git a/asm/nonmatchings/world/partner/bombette/func_802BD100_317E50.s b/asm/nonmatchings/world/partner/bombette/func_802BD100_317E50.s index 28cb0d460b..c5b7c71f39 100644 --- a/asm/nonmatchings/world/partner/bombette/func_802BD100_317E50.s +++ b/asm/nonmatchings/world/partner/bombette/func_802BD100_317E50.s @@ -34,31 +34,31 @@ glabel func_802BD100_317E50 /* 317EC0 802BD170 860200A8 */ lh $v0, 0xa8($s0) /* 317EC4 802BD174 27A60024 */ addiu $a2, $sp, 0x24 /* 317EC8 802BD178 44820000 */ mtc1 $v0, $f0 -/* 317ECC 802BD17C 00000000 */ nop +/* 317ECC 802BD17C 00000000 */ nop /* 317ED0 802BD180 46800020 */ cvt.s.w $f0, $f0 /* 317ED4 802BD184 E7A00018 */ swc1 $f0, 0x18($sp) /* 317ED8 802BD188 860200A6 */ lh $v0, 0xa6($s0) /* 317EDC 802BD18C 27A70028 */ addiu $a3, $sp, 0x28 /* 317EE0 802BD190 44820000 */ mtc1 $v0, $f0 -/* 317EE4 802BD194 00000000 */ nop +/* 317EE4 802BD194 00000000 */ nop /* 317EE8 802BD198 46800020 */ cvt.s.w $f0, $f0 /* 317EEC 802BD19C 0C0376B9 */ jal func_800DDAE4 /* 317EF0 802BD1A0 E7A0001C */ swc1 $f0, 0x1c($sp) /* 317EF4 802BD1A4 14400006 */ bnez $v0, .L802BD1C0 -/* 317EF8 802BD1A8 00000000 */ nop +/* 317EF8 802BD1A8 00000000 */ nop /* 317EFC 802BD1AC 4618A500 */ add.s $f20, $f20, $f24 /* 317F00 802BD1B0 4616A03C */ c.lt.s $f20, $f22 -/* 317F04 802BD1B4 00000000 */ nop +/* 317F04 802BD1B4 00000000 */ nop /* 317F08 802BD1B8 4501FFE0 */ bc1t .L802BD13C -/* 317F0C 802BD1BC 00000000 */ nop +/* 317F0C 802BD1BC 00000000 */ nop .L802BD1C0: /* 317F10 802BD1C0 3C0143B4 */ lui $at, 0x43b4 /* 317F14 802BD1C4 44810000 */ mtc1 $at, $f0 -/* 317F18 802BD1C8 00000000 */ nop +/* 317F18 802BD1C8 00000000 */ nop /* 317F1C 802BD1CC 4614003E */ c.le.s $f0, $f20 -/* 317F20 802BD1D0 00000000 */ nop +/* 317F20 802BD1D0 00000000 */ nop /* 317F24 802BD1D4 4500002F */ bc1f .L802BD294 -/* 317F28 802BD1D8 00000000 */ nop +/* 317F28 802BD1D8 00000000 */ nop /* 317F2C 802BD1DC 46000686 */ mov.s $f26, $f0 /* 317F30 802BD1E0 4480A000 */ mtc1 $zero, $f20 /* 317F34 802BD1E4 3C0141F0 */ lui $at, 0x41f0 @@ -82,38 +82,38 @@ glabel func_802BD100_317E50 /* 317F78 802BD228 860200A8 */ lh $v0, 0xa8($s0) /* 317F7C 802BD22C 27A60024 */ addiu $a2, $sp, 0x24 /* 317F80 802BD230 44820000 */ mtc1 $v0, $f0 -/* 317F84 802BD234 00000000 */ nop +/* 317F84 802BD234 00000000 */ nop /* 317F88 802BD238 46800020 */ cvt.s.w $f0, $f0 /* 317F8C 802BD23C E7A00018 */ swc1 $f0, 0x18($sp) /* 317F90 802BD240 860200A6 */ lh $v0, 0xa6($s0) /* 317F94 802BD244 27A70028 */ addiu $a3, $sp, 0x28 /* 317F98 802BD248 44820000 */ mtc1 $v0, $f0 -/* 317F9C 802BD24C 00000000 */ nop +/* 317F9C 802BD24C 00000000 */ nop /* 317FA0 802BD250 46800020 */ cvt.s.w $f0, $f0 /* 317FA4 802BD254 0C0376B9 */ jal func_800DDAE4 /* 317FA8 802BD258 E7A0001C */ swc1 $f0, 0x1c($sp) /* 317FAC 802BD25C 14400006 */ bnez $v0, .L802BD278 -/* 317FB0 802BD260 00000000 */ nop +/* 317FB0 802BD260 00000000 */ nop /* 317FB4 802BD264 4616A500 */ add.s $f20, $f20, $f22 /* 317FB8 802BD268 461AA03C */ c.lt.s $f20, $f26 -/* 317FBC 802BD26C 00000000 */ nop +/* 317FBC 802BD26C 00000000 */ nop /* 317FC0 802BD270 4501FFE0 */ bc1t .L802BD1F4 -/* 317FC4 802BD274 00000000 */ nop +/* 317FC4 802BD274 00000000 */ nop .L802BD278: /* 317FC8 802BD278 3C0143B4 */ lui $at, 0x43b4 /* 317FCC 802BD27C 44810000 */ mtc1 $at, $f0 -/* 317FD0 802BD280 00000000 */ nop +/* 317FD0 802BD280 00000000 */ nop /* 317FD4 802BD284 4614003E */ c.le.s $f0, $f20 -/* 317FD8 802BD288 00000000 */ nop +/* 317FD8 802BD288 00000000 */ nop /* 317FDC 802BD28C 4501000A */ bc1t .L802BD2B8 -/* 317FE0 802BD290 00000000 */ nop +/* 317FE0 802BD290 00000000 */ nop .L802BD294: /* 317FE4 802BD294 3C038011 */ lui $v1, %hi(D_8010C978) /* 317FE8 802BD298 8C63C978 */ lw $v1, %lo(D_8010C978)($v1) /* 317FEC 802BD29C 04600006 */ bltz $v1, .L802BD2B8 /* 317FF0 802BD2A0 30624000 */ andi $v0, $v1, 0x4000 /* 317FF4 802BD2A4 10400004 */ beqz $v0, .L802BD2B8 -/* 317FF8 802BD2A8 00000000 */ nop +/* 317FF8 802BD2A8 00000000 */ nop /* 317FFC 802BD2AC 2404BFFF */ addiu $a0, $zero, -0x4001 /* 318000 802BD2B0 0C044277 */ jal func_801109DC /* 318004 802BD2B4 00642024 */ and $a0, $v1, $a0 diff --git a/asm/nonmatchings/world/partner/bow/func_802BD100_323A50.s b/asm/nonmatchings/world/partner/bow/func_802BD100_323A50.s index 0d9df228e0..8c46261e30 100644 --- a/asm/nonmatchings/world/partner/bow/func_802BD100_323A50.s +++ b/asm/nonmatchings/world/partner/bow/func_802BD100_323A50.s @@ -13,4 +13,4 @@ glabel func_802BD100_323A50 /* 323A70 802BD120 3C01802C */ lui $at, %hi(D_802BE0C0) /* 323A74 802BD124 AC20E0C0 */ sw $zero, %lo(D_802BE0C0)($at) /* 323A78 802BD128 03E00008 */ jr $ra -/* 323A7C 802BD12C 00000000 */ nop +/* 323A7C 802BD12C 00000000 */ nop diff --git a/asm/nonmatchings/world/partner/kooper/func_802BD100_31B120.s b/asm/nonmatchings/world/partner/kooper/func_802BD100_31B120.s index dcc09b7781..86df2e795a 100644 --- a/asm/nonmatchings/world/partner/kooper/func_802BD100_31B120.s +++ b/asm/nonmatchings/world/partner/kooper/func_802BD100_31B120.s @@ -14,7 +14,7 @@ glabel func_802BD100_31B120 /* 31B144 802BD124 0C044277 */ jal func_801109DC /* 31B148 802BD128 00642024 */ and $a0, $v1, $a0 /* 31B14C 802BD12C 080AF44E */ j .L802BD138 -/* 31B150 802BD130 00000000 */ nop +/* 31B150 802BD130 00000000 */ nop .L802BD134: /* 31B154 802BD134 0000102D */ daddu $v0, $zero, $zero .L802BD138: diff --git a/asm/nonmatchings/world/partner/lakilester/func_802BD100_320C50.s b/asm/nonmatchings/world/partner/lakilester/func_802BD100_320C50.s index a1700de647..b14fca2093 100644 --- a/asm/nonmatchings/world/partner/lakilester/func_802BD100_320C50.s +++ b/asm/nonmatchings/world/partner/lakilester/func_802BD100_320C50.s @@ -21,9 +21,9 @@ glabel func_802BD100_320C50 /* 320C90 802BD140 26040038 */ addiu $a0, $s0, 0x38 /* 320C94 802BD144 3C013F00 */ lui $at, 0x3f00 /* 320C98 802BD148 44810000 */ mtc1 $at, $f0 -/* 320C9C 802BD14C 00000000 */ nop +/* 320C9C 802BD14C 00000000 */ nop /* 320CA0 802BD150 46001082 */ mul.s $f2, $f2, $f0 -/* 320CA4 802BD154 00000000 */ nop +/* 320CA4 802BD154 00000000 */ nop .L802BD158: /* 320CA8 802BD158 44061000 */ mfc1 $a2, $f2 /* 320CAC 802BD15C 8E2700A0 */ lw $a3, 0xa0($s1) @@ -46,11 +46,11 @@ glabel func_802BD100_320C50 /* 320CEC 802BD19C 00021023 */ negu $v0, $v0 .L802BD1A0: /* 320CF0 802BD1A0 44822000 */ mtc1 $v0, $f4 -/* 320CF4 802BD1A4 00000000 */ nop +/* 320CF4 802BD1A4 00000000 */ nop /* 320CF8 802BD1A8 46802120 */ cvt.s.w $f4, $f4 /* 320CFC 802BD1AC 00031080 */ sll $v0, $v1, 2 /* 320D00 802BD1B0 46002102 */ mul.s $f4, $f4, $f0 -/* 320D04 802BD1B4 00000000 */ nop +/* 320D04 802BD1B4 00000000 */ nop /* 320D08 802BD1B8 E6220028 */ swc1 $f2, 0x28($s1) /* 320D0C 802BD1BC C600003C */ lwc1 $f0, 0x3c($s0) /* 320D10 802BD1C0 3C014120 */ lui $at, 0x4120 diff --git a/asm/nonmatchings/world/partner/parakarry/func_802BD100_319670.s b/asm/nonmatchings/world/partner/parakarry/func_802BD100_319670.s index 6d55f0ad9d..e93abf3065 100644 --- a/asm/nonmatchings/world/partner/parakarry/func_802BD100_319670.s +++ b/asm/nonmatchings/world/partner/parakarry/func_802BD100_319670.s @@ -19,4 +19,4 @@ glabel func_802BD100_319670 /* 3196A8 802BD138 3C01802C */ lui $at, %hi(D_802BEBC4) /* 3196AC 802BD13C AC20EBC4 */ sw $zero, %lo(D_802BEBC4)($at) /* 3196B0 802BD140 03E00008 */ jr $ra -/* 3196B4 802BD144 00000000 */ nop +/* 3196B4 802BD144 00000000 */ nop diff --git a/asm/nonmatchings/world/partner/sushie/func_802BD100_31DE70.s b/asm/nonmatchings/world/partner/sushie/func_802BD100_31DE70.s index 39160cce39..77e865aa99 100644 --- a/asm/nonmatchings/world/partner/sushie/func_802BD100_31DE70.s +++ b/asm/nonmatchings/world/partner/sushie/func_802BD100_31DE70.s @@ -23,14 +23,14 @@ glabel func_802BD100_31DE70 /* 31DEB8 802BD148 44810000 */ mtc1 $at, $f0 /* 31DEBC 802BD14C C442000C */ lwc1 $f2, 0xc($v0) /* 31DEC0 802BD150 4600203C */ c.lt.s $f4, $f0 -/* 31DEC4 802BD154 00000000 */ nop +/* 31DEC4 802BD154 00000000 */ nop /* 31DEC8 802BD158 45010008 */ bc1t .L802BD17C /* 31DECC 802BD15C E6020080 */ swc1 $f2, 0x80($s0) /* 31DED0 802BD160 3C014387 */ lui $at, 0x4387 /* 31DED4 802BD164 44810000 */ mtc1 $at, $f0 -/* 31DED8 802BD168 00000000 */ nop +/* 31DED8 802BD168 00000000 */ nop /* 31DEDC 802BD16C 4604003C */ c.lt.s $f0, $f4 -/* 31DEE0 802BD170 00000000 */ nop +/* 31DEE0 802BD170 00000000 */ nop /* 31DEE4 802BD174 45000002 */ bc1f .L802BD180 /* 31DEE8 802BD178 24030008 */ addiu $v1, $zero, 8 .L802BD17C: @@ -43,27 +43,27 @@ glabel func_802BD100_31DE70 /* 31DF00 802BD190 46006300 */ add.s $f12, $f12, $f0 /* 31DF04 802BD194 3C0142B4 */ lui $at, 0x42b4 /* 31DF08 802BD198 44810000 */ mtc1 $at, $f0 -/* 31DF0C 802BD19C 00000000 */ nop +/* 31DF0C 802BD19C 00000000 */ nop /* 31DF10 802BD1A0 46006301 */ sub.s $f12, $f12, $f0 /* 31DF14 802BD1A4 44830000 */ mtc1 $v1, $f0 -/* 31DF18 802BD1A8 00000000 */ nop +/* 31DF18 802BD1A8 00000000 */ nop /* 31DF1C 802BD1AC 46800020 */ cvt.s.w $f0, $f0 /* 31DF20 802BD1B0 46006300 */ add.s $f12, $f12, $f0 /* 31DF24 802BD1B4 3C0140C9 */ lui $at, 0x40c9 /* 31DF28 802BD1B8 34210FD0 */ ori $at, $at, 0xfd0 /* 31DF2C 802BD1BC 44810000 */ mtc1 $at, $f0 -/* 31DF30 802BD1C0 00000000 */ nop +/* 31DF30 802BD1C0 00000000 */ nop /* 31DF34 802BD1C4 46006302 */ mul.s $f12, $f12, $f0 -/* 31DF38 802BD1C8 00000000 */ nop +/* 31DF38 802BD1C8 00000000 */ nop /* 31DF3C 802BD1CC 3C0143B4 */ lui $at, 0x43b4 /* 31DF40 802BD1D0 44810000 */ mtc1 $at, $f0 /* 31DF44 802BD1D4 0C00A874 */ jal cos_rad /* 31DF48 802BD1D8 46006303 */ div.s $f12, $f12, $f0 /* 31DF4C 802BD1DC 3C01C080 */ lui $at, 0xc080 /* 31DF50 802BD1E0 44811000 */ mtc1 $at, $f2 -/* 31DF54 802BD1E4 00000000 */ nop +/* 31DF54 802BD1E4 00000000 */ nop /* 31DF58 802BD1E8 46020002 */ mul.s $f0, $f0, $f2 -/* 31DF5C 802BD1EC 00000000 */ nop +/* 31DF5C 802BD1EC 00000000 */ nop /* 31DF60 802BD1F0 C6020030 */ lwc1 $f2, 0x30($s0) /* 31DF64 802BD1F4 46001081 */ sub.s $f2, $f2, $f0 /* 31DF68 802BD1F8 E6020030 */ swc1 $f2, 0x30($s0) diff --git a/asm/nonmatchings/world/partner/watt/func_802BD100_31CC70.s b/asm/nonmatchings/world/partner/watt/func_802BD100_31CC70.s index 3c49856577..48843d9228 100644 --- a/asm/nonmatchings/world/partner/watt/func_802BD100_31CC70.s +++ b/asm/nonmatchings/world/partner/watt/func_802BD100_31CC70.s @@ -8,7 +8,7 @@ glabel func_802BD100_31CC70 /* 31CC7C 802BD10C 8C820000 */ lw $v0, ($a0) /* 31CC80 802BD110 30420002 */ andi $v0, $v0, 2 /* 31CC84 802BD114 14400016 */ bnez $v0, .L802BD170 -/* 31CC88 802BD118 00000000 */ nop +/* 31CC88 802BD118 00000000 */ nop /* 31CC8C 802BD11C 3C10802C */ lui $s0, %hi(D_802BE310) /* 31CC90 802BD120 2610E310 */ addiu $s0, $s0, %lo(D_802BE310) /* 31CC94 802BD124 8E020000 */ lw $v0, ($s0) diff --git a/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s b/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s index e2a9cf7898..1bdec272e9 100644 --- a/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s +++ b/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s @@ -57,7 +57,7 @@ glabel MakeShop /* 7E27A8 80281928 0000902D */ daddu $s2, $zero, $zero /* 7E27AC 8028192C 8E220000 */ lw $v0, ($s1) /* 7E27B0 80281930 10400005 */ beqz $v0, .L80281948 -/* 7E27B4 80281934 00000000 */ nop +/* 7E27B4 80281934 00000000 */ nop .L80281938: /* 7E27B8 80281938 2631000C */ addiu $s1, $s1, 0xc /* 7E27BC 8028193C 8E220000 */ lw $v0, ($s1) diff --git a/asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s b/asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s index d31f39ed67..6b61ea4043 100644 --- a/asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s +++ b/asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s @@ -25,7 +25,7 @@ glabel draw_shop_items /* 7E23F4 80281574 3C108014 */ lui $s0, %hi(func_80147474) /* 7E23F8 80281578 26107474 */ addiu $s0, $s0, %lo(func_80147474) /* 7E23FC 8028157C 080A0563 */ j .L8028158C -/* 7E2400 80281580 00000000 */ nop +/* 7E2400 80281580 00000000 */ nop .L80281584: /* 7E2404 80281584 3C108014 */ lui $s0, %hi(func_80147574) /* 7E2408 80281588 26107574 */ addiu $s0, $s0, %lo(func_80147574) @@ -38,7 +38,7 @@ glabel draw_shop_items /* 7E2420 802815A0 96420000 */ lhu $v0, ($s2) /* 7E2424 802815A4 30420001 */ andi $v0, $v0, 1 /* 7E2428 802815A8 10400096 */ beqz $v0, .L80281804 -/* 7E242C 802815AC 00000000 */ nop +/* 7E242C 802815AC 00000000 */ nop /* 7E2430 802815B0 3C04800B */ lui $a0, %hi(gCameras) /* 7E2434 802815B4 24841D80 */ addiu $a0, $a0, %lo(gCameras) /* 7E2438 802815B8 3C028007 */ lui $v0, %hi(gGameStatusPtr) @@ -90,59 +90,59 @@ glabel draw_shop_items /* 7E24EC 8028166C C7A00030 */ lwc1 $f0, 0x30($sp) /* 7E24F0 80281670 4606B183 */ div.s $f6, $f22, $f6 /* 7E24F4 80281674 46060002 */ mul.s $f0, $f0, $f6 -/* 7E24F8 80281678 00000000 */ nop +/* 7E24F8 80281678 00000000 */ nop /* 7E24FC 8028167C 46160000 */ add.s $f0, $f0, $f22 /* 7E2500 80281680 46000021 */ cvt.d.s $f0, $f0 /* 7E2504 80281684 46340002 */ mul.d $f0, $f0, $f20 -/* 7E2508 80281688 00000000 */ nop +/* 7E2508 80281688 00000000 */ nop /* 7E250C 8028168C C7A20028 */ lwc1 $f2, 0x28($sp) /* 7E2510 80281690 46061202 */ mul.s $f8, $f2, $f6 -/* 7E2514 80281694 00000000 */ nop +/* 7E2514 80281694 00000000 */ nop /* 7E2518 80281698 C7A4002C */ lwc1 $f4, 0x2c($sp) /* 7E251C 8028169C 46003087 */ neg.s $f2, $f6 /* 7E2520 802816A0 46022282 */ mul.s $f10, $f4, $f2 -/* 7E2524 802816A4 00000000 */ nop +/* 7E2524 802816A4 00000000 */ nop /* 7E2528 802816A8 44801000 */ mtc1 $zero, $f2 /* 7E252C 802816AC E7A60034 */ swc1 $f6, 0x34($sp) /* 7E2530 802816B0 E7A80028 */ swc1 $f8, 0x28($sp) /* 7E2534 802816B4 E7AA002C */ swc1 $f10, 0x2c($sp) /* 7E2538 802816B8 46200020 */ cvt.s.d $f0, $f0 /* 7E253C 802816BC 4600103C */ c.lt.s $f2, $f0 -/* 7E2540 802816C0 00000000 */ nop +/* 7E2540 802816C0 00000000 */ nop /* 7E2544 802816C4 45000048 */ bc1f .L802817E8 /* 7E2548 802816C8 E7A00030 */ swc1 $f0, 0x30($sp) /* 7E254C 802816CC 4616003C */ c.lt.s $f0, $f22 -/* 7E2550 802816D0 00000000 */ nop +/* 7E2550 802816D0 00000000 */ nop /* 7E2554 802816D4 45020045 */ bc1fl .L802817EC /* 7E2558 802816D8 26F70001 */ addiu $s7, $s7, 1 /* 7E255C 802816DC 86A2000A */ lh $v0, 0xa($s5) /* 7E2560 802816E0 44820000 */ mtc1 $v0, $f0 -/* 7E2564 802816E4 00000000 */ nop +/* 7E2564 802816E4 00000000 */ nop /* 7E2568 802816E8 46800020 */ cvt.s.w $f0, $f0 /* 7E256C 802816EC 46004102 */ mul.s $f4, $f8, $f0 -/* 7E2570 802816F0 00000000 */ nop +/* 7E2570 802816F0 00000000 */ nop /* 7E2574 802816F4 46002100 */ add.s $f4, $f4, $f0 /* 7E2578 802816F8 46002121 */ cvt.d.s $f4, $f4 /* 7E257C 802816FC 46342102 */ mul.d $f4, $f4, $f20 -/* 7E2580 80281700 00000000 */ nop +/* 7E2580 80281700 00000000 */ nop /* 7E2584 80281704 86A2000C */ lh $v0, 0xc($s5) /* 7E2588 80281708 44820000 */ mtc1 $v0, $f0 -/* 7E258C 8028170C 00000000 */ nop +/* 7E258C 8028170C 00000000 */ nop /* 7E2590 80281710 46800020 */ cvt.s.w $f0, $f0 /* 7E2594 80281714 46005082 */ mul.s $f2, $f10, $f0 -/* 7E2598 80281718 00000000 */ nop +/* 7E2598 80281718 00000000 */ nop /* 7E259C 8028171C 46001080 */ add.s $f2, $f2, $f0 /* 7E25A0 80281720 460010A1 */ cvt.d.s $f2, $f2 /* 7E25A4 80281724 46341082 */ mul.d $f2, $f2, $f20 -/* 7E25A8 80281728 00000000 */ nop +/* 7E25A8 80281728 00000000 */ nop /* 7E25AC 8028172C 86A2000E */ lh $v0, 0xe($s5) /* 7E25B0 80281730 44820000 */ mtc1 $v0, $f0 -/* 7E25B4 80281734 00000000 */ nop +/* 7E25B4 80281734 00000000 */ nop /* 7E25B8 80281738 46800021 */ cvt.d.w $f0, $f0 /* 7E25BC 8028173C 86A20010 */ lh $v0, 0x10($s5) /* 7E25C0 80281740 46202100 */ add.d $f4, $f4, $f0 /* 7E25C4 80281744 44820000 */ mtc1 $v0, $f0 -/* 7E25C8 80281748 00000000 */ nop +/* 7E25C8 80281748 00000000 */ nop /* 7E25CC 8028174C 46800021 */ cvt.d.w $f0, $f0 /* 7E25D0 80281750 8EC20000 */ lw $v0, ($s6) /* 7E25D4 80281754 46201080 */ add.d $f2, $f2, $f0 diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280088.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280088.s index 44972cacf0..e465b9a3d9 100644 --- a/asm/nonmatchings/world/script_api/7E0E80/func_80280088.s +++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280088.s @@ -29,13 +29,13 @@ glabel func_80280088 /* 7E0F68 802800E8 0C0496FA */ jal set_message_value /* 7E0F6C 802800EC 24050002 */ addiu $a1, $zero, 2 /* 7E0F70 802800F0 080A0047 */ j .L8028011C -/* 7E0F74 802800F4 00000000 */ nop +/* 7E0F74 802800F4 00000000 */ nop .L802800F8: /* 7E0F78 802800F8 3C048015 */ lui $a0, %hi(D_8014C290) /* 7E0F7C 802800FC 2484C290 */ addiu $a0, $a0, %lo(D_8014C290) /* 7E0F80 80280100 24020001 */ addiu $v0, $zero, 1 /* 7E0F84 80280104 16420003 */ bne $s2, $v0, .L80280114 -/* 7E0F88 80280108 00000000 */ nop +/* 7E0F88 80280108 00000000 */ nop /* 7E0F8C 8028010C 3C048015 */ lui $a0, %hi(D_8014C294) /* 7E0F90 80280110 2484C294 */ addiu $a0, $a0, %lo(D_8014C294) .L80280114: diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280208.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280208.s index 65f958b307..4327f55c16 100644 --- a/asm/nonmatchings/world/script_api/7E0E80/func_80280208.s +++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280208.s @@ -23,7 +23,7 @@ glabel func_80280208 /* 7E10D0 80280250 2484C290 */ addiu $a0, $a0, %lo(D_8014C290) /* 7E10D4 80280254 24020001 */ addiu $v0, $zero, 1 /* 7E10D8 80280258 16020003 */ bne $s0, $v0, .L80280268 -/* 7E10DC 8028025C 00000000 */ nop +/* 7E10DC 8028025C 00000000 */ nop /* 7E10E0 80280260 3C048015 */ lui $a0, %hi(D_8014C294) /* 7E10E4 80280264 2484C294 */ addiu $a0, $a0, %lo(D_8014C294) .L80280268: diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280410.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280410.s index 6ac8d45441..bad855842f 100644 --- a/asm/nonmatchings/world/script_api/7E0E80/func_80280410.s +++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280410.s @@ -31,9 +31,9 @@ glabel func_80280410 /* 7E12F8 80280478 10400022 */ beqz $v0, .L80280504 /* 7E12FC 8028047C 24020002 */ addiu $v0, $zero, 2 /* 7E1300 80280480 0C03805E */ jal disable_player_input -/* 7E1304 80280484 00000000 */ nop +/* 7E1304 80280484 00000000 */ nop /* 7E1308 80280488 0C038045 */ jal disable_player_static_collisions -/* 7E130C 8028048C 00000000 */ nop +/* 7E130C 8028048C 00000000 */ nop /* 7E1310 80280490 3C048028 */ lui $a0, %hi(D_80284034) /* 7E1314 80280494 24844034 */ addiu $a0, $a0, %lo(D_80284034) /* 7E1318 80280498 24050001 */ addiu $a1, $zero, 1 @@ -62,7 +62,7 @@ glabel func_80280410 /* 7E1370 802804F0 0C038050 */ jal enable_player_static_collisions /* 7E1374 802804F4 A6020000 */ sh $v0, ($s0) /* 7E1378 802804F8 0C038069 */ jal enable_player_input -/* 7E137C 802804FC 00000000 */ nop +/* 7E137C 802804FC 00000000 */ nop /* 7E1380 80280500 24020002 */ addiu $v0, $zero, 2 .L80280504: /* 7E1384 80280504 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_8028051C.s b/asm/nonmatchings/world/script_api/7E0E80/func_8028051C.s index a37d80c9c6..98845b6982 100644 --- a/asm/nonmatchings/world/script_api/7E0E80/func_8028051C.s +++ b/asm/nonmatchings/world/script_api/7E0E80/func_8028051C.s @@ -34,7 +34,7 @@ glabel func_8028051C /* 7E1410 80280590 0C03A640 */ jal func_800E9900 /* 7E1414 80280594 00628821 */ addu $s1, $v1, $v0 /* 7E1418 80280598 1200001B */ beqz $s0, .L80280608 -/* 7E141C 8028059C 00000000 */ nop +/* 7E141C 8028059C 00000000 */ nop /* 7E1420 802805A0 96220018 */ lhu $v0, 0x18($s1) /* 7E1424 802805A4 3C018028 */ lui $at, %hi(D_80286530) /* 7E1428 802805A8 AC206530 */ sw $zero, %lo(D_80286530)($at) @@ -59,9 +59,9 @@ glabel func_8028051C /* 7E1470 802805F0 0C03A6D5 */ jal increment_status_menu_disabled /* 7E1474 802805F4 AE600070 */ sw $zero, 0x70($s3) /* 7E1478 802805F8 0C03A640 */ jal func_800E9900 -/* 7E147C 802805FC 00000000 */ nop +/* 7E147C 802805FC 00000000 */ nop /* 7E1480 80280600 0C03A546 */ jal show_coin_counter -/* 7E1484 80280604 00000000 */ nop +/* 7E1484 80280604 00000000 */ nop .L80280608: /* 7E1488 80280608 8E630070 */ lw $v1, 0x70($s3) /* 7E148C 8028060C 24100005 */ addiu $s0, $zero, 5 @@ -76,12 +76,12 @@ glabel func_8028051C /* 7E14B0 80280630 10600017 */ beqz $v1, .L80280690 /* 7E14B4 80280634 0000102D */ daddu $v0, $zero, $zero /* 7E14B8 80280638 080A024B */ j .L8028092C -/* 7E14BC 8028063C 00000000 */ nop +/* 7E14BC 8028063C 00000000 */ nop .L80280640: /* 7E14C0 80280640 1062006F */ beq $v1, $v0, .L80280800 /* 7E14C4 80280644 0000102D */ daddu $v0, $zero, $zero /* 7E14C8 80280648 080A024B */ j .L8028092C -/* 7E14CC 8028064C 00000000 */ nop +/* 7E14CC 8028064C 00000000 */ nop .L80280650: /* 7E14D0 80280650 2410000A */ addiu $s0, $zero, 0xa /* 7E14D4 80280654 10700091 */ beq $v1, $s0, .L8028089C @@ -91,7 +91,7 @@ glabel func_8028051C /* 7E14E4 80280664 1062007F */ beq $v1, $v0, .L80280864 /* 7E14E8 80280668 0000102D */ daddu $v0, $zero, $zero /* 7E14EC 8028066C 080A024B */ j .L8028092C -/* 7E14F0 80280670 00000000 */ nop +/* 7E14F0 80280670 00000000 */ nop .L80280674: /* 7E14F4 80280674 2402000B */ addiu $v0, $zero, 0xb /* 7E14F8 80280678 1062009D */ beq $v1, $v0, .L802808F0 @@ -99,7 +99,7 @@ glabel func_8028051C /* 7E1500 80280680 10620012 */ beq $v1, $v0, .L802806CC /* 7E1504 80280684 0000102D */ daddu $v0, $zero, $zero /* 7E1508 80280688 080A024B */ j .L8028092C -/* 7E150C 8028068C 00000000 */ nop +/* 7E150C 8028068C 00000000 */ nop .L80280690: /* 7E1510 80280690 0C0B1059 */ jal does_script_exist /* 7E1514 80280694 8E640074 */ lw $a0, 0x74($s3) @@ -125,12 +125,12 @@ glabel func_8028051C /* 7E1560 802806E0 8C426528 */ lw $v0, %lo(D_80286528)($v0) /* 7E1564 802806E4 904204E8 */ lbu $v0, 0x4e8($v0) /* 7E1568 802806E8 14400035 */ bnez $v0, .L802807C0 -/* 7E156C 802806EC 00000000 */ nop +/* 7E156C 802806EC 00000000 */ nop /* 7E1570 802806F0 86C2000C */ lh $v0, 0xc($s6) /* 7E1574 802806F4 8E430004 */ lw $v1, 4($s2) /* 7E1578 802806F8 0043102A */ slt $v0, $v0, $v1 /* 7E157C 802806FC 10400006 */ beqz $v0, .L80280718 -/* 7E1580 80280700 00000000 */ nop +/* 7E1580 80280700 00000000 */ nop /* 7E1584 80280704 0C0A005F */ jal func_8028017C /* 7E1588 80280708 24040001 */ addiu $a0, $zero, 1 /* 7E158C 8028070C AE620074 */ sw $v0, 0x74($s3) @@ -141,12 +141,12 @@ glabel func_8028051C /* 7E159C 8028071C 2442FF20 */ addiu $v0, $v0, -0xe0 /* 7E15A0 80280720 2C420075 */ sltiu $v0, $v0, 0x75 /* 7E15A4 80280724 1440000C */ bnez $v0, .L80280758 -/* 7E15A8 80280728 00000000 */ nop +/* 7E15A8 80280728 00000000 */ nop /* 7E15AC 8028072C 0C039D5D */ jal add_item /* 7E15B0 80280730 0000202D */ daddu $a0, $zero, $zero /* 7E15B4 80280734 2403FFFF */ addiu $v1, $zero, -1 /* 7E15B8 80280738 14430007 */ bne $v0, $v1, .L80280758 -/* 7E15BC 8028073C 00000000 */ nop +/* 7E15BC 8028073C 00000000 */ nop /* 7E15C0 80280740 0C0A005F */ jal func_8028017C /* 7E15C4 80280744 24040002 */ addiu $a0, $zero, 2 /* 7E15C8 80280748 AE620074 */ sw $v0, 0x74($s3) @@ -162,19 +162,19 @@ glabel func_8028051C /* 7E15EC 8028076C 2482FF20 */ addiu $v0, $a0, -0xe0 /* 7E15F0 80280770 2C420075 */ sltiu $v0, $v0, 0x75 /* 7E15F4 80280774 1040000A */ beqz $v0, .L802807A0 -/* 7E15F8 80280778 00000000 */ nop +/* 7E15F8 80280778 00000000 */ nop /* 7E15FC 8028077C 0C039DCF */ jal add_badge -/* 7E1600 80280780 00000000 */ nop +/* 7E1600 80280780 00000000 */ nop /* 7E1604 80280784 0000202D */ daddu $a0, $zero, $zero /* 7E1608 80280788 3C05F840 */ lui $a1, 0xf840 /* 7E160C 8028078C 34A55CF0 */ ori $a1, $a1, 0x5cf0 /* 7E1610 80280790 0C0B2026 */ jal set_variable /* 7E1614 80280794 24060001 */ addiu $a2, $zero, 1 /* 7E1618 80280798 080A01EA */ j .L802807A8 -/* 7E161C 8028079C 00000000 */ nop +/* 7E161C 8028079C 00000000 */ nop .L802807A0: /* 7E1620 802807A0 0C039D5D */ jal add_item -/* 7E1624 802807A4 00000000 */ nop +/* 7E1624 802807A4 00000000 */ nop .L802807A8: /* 7E1628 802807A8 0C0A005F */ jal func_8028017C /* 7E162C 802807AC 24040003 */ addiu $a0, $zero, 3 @@ -192,7 +192,7 @@ glabel func_8028051C .L802807D8: /* 7E1658 802807D8 8E640074 */ lw $a0, 0x74($s3) /* 7E165C 802807DC 0C0B1059 */ jal does_script_exist -/* 7E1660 802807E0 00000000 */ nop +/* 7E1660 802807E0 00000000 */ nop /* 7E1664 802807E4 14400051 */ bnez $v0, .L8028092C /* 7E1668 802807E8 0000102D */ daddu $v0, $zero, $zero /* 7E166C 802807EC 8E430000 */ lw $v1, ($s2) @@ -203,7 +203,7 @@ glabel func_8028051C .L80280800: /* 7E1680 80280800 8E640074 */ lw $a0, 0x74($s3) /* 7E1684 80280804 0C0B1059 */ jal does_script_exist -/* 7E1688 80280808 00000000 */ nop +/* 7E1688 80280808 00000000 */ nop /* 7E168C 8028080C 14400047 */ bnez $v0, .L8028092C /* 7E1690 80280810 0000102D */ daddu $v0, $zero, $zero /* 7E1694 80280814 8E430000 */ lw $v1, ($s2) @@ -214,7 +214,7 @@ glabel func_8028051C .L80280828: /* 7E16A8 80280828 8E640074 */ lw $a0, 0x74($s3) /* 7E16AC 8028082C 0C0B1059 */ jal does_script_exist -/* 7E16B0 80280830 00000000 */ nop +/* 7E16B0 80280830 00000000 */ nop /* 7E16B4 80280834 1440003D */ bnez $v0, .L8028092C /* 7E16B8 80280838 0000102D */ daddu $v0, $zero, $zero /* 7E16BC 8028083C 8E430000 */ lw $v1, ($s2) @@ -231,7 +231,7 @@ glabel func_8028051C .L80280864: /* 7E16E4 80280864 8E640074 */ lw $a0, 0x74($s3) /* 7E16E8 80280868 0C0B1059 */ jal does_script_exist -/* 7E16EC 8028086C 00000000 */ nop +/* 7E16EC 8028086C 00000000 */ nop /* 7E16F0 80280870 1440002E */ bnez $v0, .L8028092C /* 7E16F4 80280874 0000102D */ daddu $v0, $zero, $zero /* 7E16F8 80280878 8E430000 */ lw $v1, ($s2) @@ -270,16 +270,16 @@ glabel func_8028051C /* 7E1770 802808F0 3C028028 */ lui $v0, %hi(D_8028652C) /* 7E1774 802808F4 8C42652C */ lw $v0, %lo(D_8028652C)($v0) /* 7E1778 802808F8 10400005 */ beqz $v0, .L80280910 -/* 7E177C 802808FC 00000000 */ nop +/* 7E177C 802808FC 00000000 */ nop /* 7E1780 80280900 0C0B1059 */ jal does_script_exist /* 7E1784 80280904 8C440144 */ lw $a0, 0x144($v0) /* 7E1788 80280908 14400008 */ bnez $v0, .L8028092C /* 7E178C 8028090C 0000102D */ daddu $v0, $zero, $zero .L80280910: /* 7E1790 80280910 0C03A6CC */ jal decrement_status_menu_disabled -/* 7E1794 80280914 00000000 */ nop +/* 7E1794 80280914 00000000 */ nop /* 7E1798 80280918 0C03A5B2 */ jal func_800E96C8 -/* 7E179C 8028091C 00000000 */ nop +/* 7E179C 8028091C 00000000 */ nop /* 7E17A0 80280920 080A024B */ j .L8028092C /* 7E17A4 80280924 24020001 */ addiu $v0, $zero, 1 .L80280928: diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280954.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280954.s index 3d4b36a6da..f5c127b36c 100644 --- a/asm/nonmatchings/world/script_api/7E0E80/func_80280954.s +++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280954.s @@ -44,9 +44,9 @@ glabel func_80280954 /* 7E1864 802809E4 8FB00010 */ lw $s0, 0x10($sp) .L802809E8: /* 7E1868 802809E8 13C00005 */ beqz $fp, .L80280A00 -/* 7E186C 802809EC 00000000 */ nop +/* 7E186C 802809EC 00000000 */ nop /* 7E1870 802809F0 06E00003 */ bltz $s7, .L80280A00 -/* 7E1874 802809F4 00000000 */ nop +/* 7E1874 802809F4 00000000 */ nop /* 7E1878 802809F8 080A0281 */ j .L80280A04 /* 7E187C 802809FC 862401B4 */ lh $a0, 0x1b4($s1) .L80280A00: @@ -85,11 +85,11 @@ glabel func_80280954 /* 7E18F4 80280A74 0C03D3F1 */ jal func_800F4FC4 /* 7E18F8 80280A78 AC800328 */ sw $zero, 0x328($a0) /* 7E18FC 80280A7C 0C03A625 */ jal func_800E9894 -/* 7E1900 80280A80 00000000 */ nop +/* 7E1900 80280A80 00000000 */ nop /* 7E1904 80280A84 0C03A63B */ jal func_800E98EC -/* 7E1908 80280A88 00000000 */ nop +/* 7E1908 80280A88 00000000 */ nop /* 7E190C 80280A8C 0C03A5E3 */ jal open_status_menu_short -/* 7E1910 80280A90 00000000 */ nop +/* 7E1910 80280A90 00000000 */ nop /* 7E1914 80280A94 8FBF003C */ lw $ra, 0x3c($sp) /* 7E1918 80280A98 8FBE0038 */ lw $fp, 0x38($sp) /* 7E191C 80280A9C 8FB70034 */ lw $s7, 0x34($sp) diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280AC4.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280AC4.s index d2636a902e..99e2ac9f4c 100644 --- a/asm/nonmatchings/world/script_api/7E0E80/func_80280AC4.s +++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280AC4.s @@ -18,7 +18,7 @@ glabel func_80280AC4 /* 7E1978 80280AF8 0000102D */ daddu $v0, $zero, $zero .L80280AFC: /* 7E197C 80280AFC 0C03C4EC */ jal func_800F13B0 -/* 7E1980 80280B00 00000000 */ nop +/* 7E1980 80280B00 00000000 */ nop /* 7E1984 80280B04 240200FF */ addiu $v0, $zero, 0xff /* 7E1988 80280B08 16020003 */ bne $s0, $v0, .L80280B18 /* 7E198C 80280B0C 2602FFFF */ addiu $v0, $s0, -1 diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280B44.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280B44.s index 7f6e120ee0..9ecd3b1187 100644 --- a/asm/nonmatchings/world/script_api/7E0E80/func_80280B44.s +++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280B44.s @@ -5,13 +5,13 @@ glabel func_80280B44 /* 7E19C4 80280B44 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 7E19C8 80280B48 AFBF0010 */ sw $ra, 0x10($sp) /* 7E19CC 80280B4C 0C03C54E */ jal func_800F1538 -/* 7E19D0 80280B50 00000000 */ nop +/* 7E19D0 80280B50 00000000 */ nop /* 7E19D4 80280B54 0C03A640 */ jal func_800E9900 -/* 7E19D8 80280B58 00000000 */ nop +/* 7E19D8 80280B58 00000000 */ nop /* 7E19DC 80280B5C 0C03A631 */ jal func_800E98C4 -/* 7E19E0 80280B60 00000000 */ nop +/* 7E19E0 80280B60 00000000 */ nop /* 7E19E4 80280B64 0C03A5EE */ jal func_800E97B8 -/* 7E19E8 80280B68 00000000 */ nop +/* 7E19E8 80280B68 00000000 */ nop /* 7E19EC 80280B6C 8FBF0010 */ lw $ra, 0x10($sp) /* 7E19F0 80280B70 03E00008 */ jr $ra /* 7E19F4 80280B74 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280B78.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280B78.s index 52a7392921..735cb95e94 100644 --- a/asm/nonmatchings/world/script_api/7E0E80/func_80280B78.s +++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280B78.s @@ -15,7 +15,7 @@ glabel func_80280B78 /* 7E1A1C 80280B9C 24A50001 */ addiu $a1, $a1, 1 /* 7E1A20 80280BA0 8C620004 */ lw $v0, 4($v1) /* 7E1A24 80280BA4 03E00008 */ jr $ra -/* 7E1A28 80280BA8 00000000 */ nop +/* 7E1A28 80280BA8 00000000 */ nop .L80280BAC: /* 7E1A2C 80280BAC 00A6102A */ slt $v0, $a1, $a2 /* 7E1A30 80280BB0 1440FFF8 */ bnez $v0, .L80280B94 @@ -26,4 +26,4 @@ glabel func_80280B78 /* 7E1A40 80280BC0 00220821 */ addu $at, $at, $v0 /* 7E1A44 80280BC4 842278EC */ lh $v0, %lo(gItemTable+0xC)($at) /* 7E1A48 80280BC8 03E00008 */ jr $ra -/* 7E1A4C 80280BCC 00000000 */ nop +/* 7E1A4C 80280BCC 00000000 */ nop diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280BD0.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280BD0.s index 392a23a792..c640a62d19 100644 --- a/asm/nonmatchings/world/script_api/7E0E80/func_80280BD0.s +++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280BD0.s @@ -40,14 +40,14 @@ glabel func_80280BD0 /* 7E1AD8 80280C58 106200AF */ beq $v1, $v0, .L80280F18 /* 7E1ADC 80280C5C 0000102D */ daddu $v0, $zero, $zero /* 7E1AE0 80280C60 080A0506 */ j .L80281418 -/* 7E1AE4 80280C64 00000000 */ nop +/* 7E1AE4 80280C64 00000000 */ nop .L80280C68: /* 7E1AE8 80280C68 1062003F */ beq $v1, $v0, .L80280D68 /* 7E1AEC 80280C6C 24020005 */ addiu $v0, $zero, 5 /* 7E1AF0 80280C70 1062012B */ beq $v1, $v0, .L80281120 /* 7E1AF4 80280C74 0000102D */ daddu $v0, $zero, $zero /* 7E1AF8 80280C78 080A0506 */ j .L80281418 -/* 7E1AFC 80280C7C 00000000 */ nop +/* 7E1AFC 80280C7C 00000000 */ nop .L80280C80: /* 7E1B00 80280C80 2402000C */ addiu $v0, $zero, 0xc /* 7E1B04 80280C84 10620108 */ beq $v1, $v0, .L802810A8 @@ -59,7 +59,7 @@ glabel func_80280BD0 /* 7E1B1C 80280C9C 106201D1 */ beq $v1, $v0, .L802813E4 /* 7E1B20 80280CA0 0000102D */ daddu $v0, $zero, $zero /* 7E1B24 80280CA4 080A0506 */ j .L80281418 -/* 7E1B28 80280CA8 00000000 */ nop +/* 7E1B28 80280CA8 00000000 */ nop .L80280CAC: /* 7E1B2C 80280CAC 24020015 */ addiu $v0, $zero, 0x15 /* 7E1B30 80280CB0 106200A0 */ beq $v1, $v0, .L80280F34 @@ -67,7 +67,7 @@ glabel func_80280BD0 /* 7E1B38 80280CB8 106200C5 */ beq $v1, $v0, .L80280FD0 /* 7E1B3C 80280CBC 0000102D */ daddu $v0, $zero, $zero /* 7E1B40 80280CC0 080A0506 */ j .L80281418 -/* 7E1B44 80280CC4 00000000 */ nop +/* 7E1B44 80280CC4 00000000 */ nop .L80280CC8: /* 7E1B48 80280CC8 24020047 */ addiu $v0, $zero, 0x47 /* 7E1B4C 80280CCC 1062016F */ beq $v1, $v0, .L8028128C @@ -83,7 +83,7 @@ glabel func_80280BD0 /* 7E1B74 80280CF4 106201B3 */ beq $v1, $v0, .L802813C4 /* 7E1B78 80280CF8 0000102D */ daddu $v0, $zero, $zero /* 7E1B7C 80280CFC 080A0506 */ j .L80281418 -/* 7E1B80 80280D00 00000000 */ nop +/* 7E1B80 80280D00 00000000 */ nop .L80280D04: /* 7E1B84 80280D04 24020034 */ addiu $v0, $zero, 0x34 /* 7E1B88 80280D08 10620133 */ beq $v1, $v0, .L802811D8 @@ -91,7 +91,7 @@ glabel func_80280BD0 /* 7E1B90 80280D10 1062013B */ beq $v1, $v0, .L80281200 /* 7E1B94 80280D14 0000102D */ daddu $v0, $zero, $zero /* 7E1B98 80280D18 080A0506 */ j .L80281418 -/* 7E1B9C 80280D1C 00000000 */ nop +/* 7E1B9C 80280D1C 00000000 */ nop .L80280D20: /* 7E1BA0 80280D20 240200C9 */ addiu $v0, $zero, 0xc9 /* 7E1BA4 80280D24 10620072 */ beq $v1, $v0, .L80280EF0 @@ -103,7 +103,7 @@ glabel func_80280BD0 /* 7E1BBC 80280D3C 1062018C */ beq $v1, $v0, .L80281370 /* 7E1BC0 80280D40 0000102D */ daddu $v0, $zero, $zero /* 7E1BC4 80280D44 080A0506 */ j .L80281418 -/* 7E1BC8 80280D48 00000000 */ nop +/* 7E1BC8 80280D48 00000000 */ nop .L80280D4C: /* 7E1BCC 80280D4C 240201F5 */ addiu $v0, $zero, 0x1f5 /* 7E1BD0 80280D50 106200EA */ beq $v1, $v0, .L802810FC @@ -111,7 +111,7 @@ glabel func_80280BD0 /* 7E1BD8 80280D58 10620138 */ beq $v1, $v0, .L8028123C /* 7E1BDC 80280D5C 0000102D */ daddu $v0, $zero, $zero /* 7E1BE0 80280D60 080A0506 */ j .L80281418 -/* 7E1BE4 80280D64 00000000 */ nop +/* 7E1BE4 80280D64 00000000 */ nop .L80280D68: /* 7E1BE8 80280D68 0C0B1059 */ jal does_script_exist /* 7E1BEC 80280D6C 8E240074 */ lw $a0, 0x74($s1) @@ -135,16 +135,16 @@ glabel func_80280BD0 /* 7E1C30 80280DB0 10400005 */ beqz $v0, .L80280DC8 /* 7E1C34 80280DB4 24020002 */ addiu $v0, $zero, 2 /* 7E1C38 80280DB8 10600009 */ beqz $v1, .L80280DE0 -/* 7E1C3C 80280DBC 00000000 */ nop +/* 7E1C3C 80280DBC 00000000 */ nop /* 7E1C40 80280DC0 080A03B6 */ j .L80280ED8 -/* 7E1C44 80280DC4 00000000 */ nop +/* 7E1C44 80280DC4 00000000 */ nop .L80280DC8: /* 7E1C48 80280DC8 10620018 */ beq $v1, $v0, .L80280E2C /* 7E1C4C 80280DCC 24020003 */ addiu $v0, $zero, 3 /* 7E1C50 80280DD0 1062002D */ beq $v1, $v0, .L80280E88 -/* 7E1C54 80280DD4 00000000 */ nop +/* 7E1C54 80280DD4 00000000 */ nop /* 7E1C58 80280DD8 080A03B6 */ j .L80280ED8 -/* 7E1C5C 80280DDC 00000000 */ nop +/* 7E1C5C 80280DDC 00000000 */ nop .L80280DE0: /* 7E1C60 80280DE0 0C0A005F */ jal func_8028017C /* 7E1C64 80280DE4 24040005 */ addiu $a0, $zero, 5 @@ -153,9 +153,9 @@ glabel func_80280BD0 /* 7E1C70 80280DF0 AE200070 */ sw $zero, 0x70($s1) .L80280DF4: /* 7E1C74 80280DF4 0C039D7B */ jal get_item_count -/* 7E1C78 80280DF8 00000000 */ nop +/* 7E1C78 80280DF8 00000000 */ nop /* 7E1C7C 80280DFC 14400005 */ bnez $v0, .L80280E14 -/* 7E1C80 80280E00 00000000 */ nop +/* 7E1C80 80280E00 00000000 */ nop /* 7E1C84 80280E04 0C0A005F */ jal func_8028017C /* 7E1C88 80280E08 24040006 */ addiu $a0, $zero, 6 /* 7E1C8C 80280E0C 080A04EE */ j .L802813B8 @@ -169,25 +169,25 @@ glabel func_80280BD0 /* 7E1CA8 80280E28 AE220070 */ sw $v0, 0x70($s1) .L80280E2C: /* 7E1CAC 80280E2C 0C039D7B */ jal get_item_count -/* 7E1CB0 80280E30 00000000 */ nop +/* 7E1CB0 80280E30 00000000 */ nop /* 7E1CB4 80280E34 14400005 */ bnez $v0, .L80280E4C -/* 7E1CB8 80280E38 00000000 */ nop +/* 7E1CB8 80280E38 00000000 */ nop /* 7E1CBC 80280E3C 0C0A005F */ jal func_8028017C /* 7E1CC0 80280E40 2404000C */ addiu $a0, $zero, 0xc /* 7E1CC4 80280E44 080A04EE */ j .L802813B8 /* 7E1CC8 80280E48 AE220074 */ sw $v0, 0x74($s1) .L80280E4C: /* 7E1CCC 80280E4C 0C039E12 */ jal get_stored_empty_count -/* 7E1CD0 80280E50 00000000 */ nop +/* 7E1CD0 80280E50 00000000 */ nop /* 7E1CD4 80280E54 14400005 */ bnez $v0, .L80280E6C -/* 7E1CD8 80280E58 00000000 */ nop +/* 7E1CD8 80280E58 00000000 */ nop /* 7E1CDC 80280E5C 0C0A005F */ jal func_8028017C /* 7E1CE0 80280E60 2404000D */ addiu $a0, $zero, 0xd /* 7E1CE4 80280E64 080A04EE */ j .L802813B8 /* 7E1CE8 80280E68 AE220074 */ sw $v0, 0x74($s1) .L80280E6C: /* 7E1CEC 80280E6C 0C039E12 */ jal get_stored_empty_count -/* 7E1CF0 80280E70 00000000 */ nop +/* 7E1CF0 80280E70 00000000 */ nop /* 7E1CF4 80280E74 2404000E */ addiu $a0, $zero, 0xe /* 7E1CF8 80280E78 0C0A0082 */ jal func_80280208 /* 7E1CFC 80280E7C 0040282D */ daddu $a1, $v0, $zero @@ -195,18 +195,18 @@ glabel func_80280BD0 /* 7E1D04 80280E84 AE220074 */ sw $v0, 0x74($s1) .L80280E88: /* 7E1D08 80280E88 0C039E05 */ jal get_stored_count -/* 7E1D0C 80280E8C 00000000 */ nop +/* 7E1D0C 80280E8C 00000000 */ nop /* 7E1D10 80280E90 14400005 */ bnez $v0, .L80280EA8 -/* 7E1D14 80280E94 00000000 */ nop +/* 7E1D14 80280E94 00000000 */ nop /* 7E1D18 80280E98 0C0A005F */ jal func_8028017C /* 7E1D1C 80280E9C 24040011 */ addiu $a0, $zero, 0x11 /* 7E1D20 80280EA0 080A04EE */ j .L802813B8 /* 7E1D24 80280EA4 AE220074 */ sw $v0, 0x74($s1) .L80280EA8: /* 7E1D28 80280EA8 0C039D88 */ jal get_item_empty_count -/* 7E1D2C 80280EAC 00000000 */ nop +/* 7E1D2C 80280EAC 00000000 */ nop /* 7E1D30 80280EB0 14400005 */ bnez $v0, .L80280EC8 -/* 7E1D34 80280EB4 00000000 */ nop +/* 7E1D34 80280EB4 00000000 */ nop /* 7E1D38 80280EB8 0C0A005F */ jal func_8028017C /* 7E1D3C 80280EBC 24040012 */ addiu $a0, $zero, 0x12 /* 7E1D40 80280EC0 080A04EE */ j .L802813B8 @@ -218,7 +218,7 @@ glabel func_80280BD0 /* 7E1D54 80280ED4 AE220074 */ sw $v0, 0x74($s1) .L80280ED8: /* 7E1D58 80280ED8 0C0A00D7 */ jal func_8028035C -/* 7E1D5C 80280EDC 00000000 */ nop +/* 7E1D5C 80280EDC 00000000 */ nop /* 7E1D60 80280EE0 AE220074 */ sw $v0, 0x74($s1) /* 7E1D64 80280EE4 2402002A */ addiu $v0, $zero, 0x2a /* 7E1D68 80280EE8 080A0505 */ j .L80281414 @@ -226,7 +226,7 @@ glabel func_80280BD0 .L80280EF0: /* 7E1D70 80280EF0 8E240074 */ lw $a0, 0x74($s1) /* 7E1D74 80280EF4 0C0B1059 */ jal does_script_exist -/* 7E1D78 80280EF8 00000000 */ nop +/* 7E1D78 80280EF8 00000000 */ nop /* 7E1D7C 80280EFC 14400146 */ bnez $v0, .L80281418 /* 7E1D80 80280F00 0000102D */ daddu $v0, $zero, $zero /* 7E1D84 80280F04 0C0A0255 */ jal func_80280954 @@ -247,7 +247,7 @@ glabel func_80280BD0 /* 7E1DB8 80280F38 1C4000D7 */ bgtz $v0, .L80281298 /* 7E1DBC 80280F3C 2442FFFF */ addiu $v0, $v0, -1 /* 7E1DC0 80280F40 0C0A02D1 */ jal func_80280B44 -/* 7E1DC4 80280F44 00000000 */ nop +/* 7E1DC4 80280F44 00000000 */ nop /* 7E1DC8 80280F48 8E02000C */ lw $v0, 0xc($s0) /* 7E1DCC 80280F4C 04400012 */ bltz $v0, .L80280F98 /* 7E1DD0 80280F50 00021040 */ sll $v0, $v0, 1 @@ -276,7 +276,7 @@ glabel func_80280BD0 .L80280FA8: /* 7E1E28 80280FA8 8E240074 */ lw $a0, 0x74($s1) /* 7E1E2C 80280FAC 0C0B1059 */ jal does_script_exist -/* 7E1E30 80280FB0 00000000 */ nop +/* 7E1E30 80280FB0 00000000 */ nop /* 7E1E34 80280FB4 14400118 */ bnez $v0, .L80281418 /* 7E1E38 80280FB8 0000102D */ daddu $v0, $zero, $zero /* 7E1E3C 80280FBC 3C04001E */ lui $a0, 0x1e @@ -293,7 +293,7 @@ glabel func_80280BD0 /* 7E1E64 80280FE4 8C426538 */ lw $v0, %lo(D_80286538)($v0) /* 7E1E68 80280FE8 904204E8 */ lbu $v0, 0x4e8($v0) /* 7E1E6C 80280FEC 1440001D */ bnez $v0, .L80281064 -/* 7E1E70 80280FF0 00000000 */ nop +/* 7E1E70 80280FF0 00000000 */ nop /* 7E1E74 80280FF4 8E02000C */ lw $v0, 0xc($s0) /* 7E1E78 80280FF8 00021040 */ sll $v0, $v0, 1 /* 7E1E7C 80280FFC 00521021 */ addu $v0, $v0, $s2 @@ -307,7 +307,7 @@ glabel func_80280BD0 /* 7E1E9C 8028101C 0C039D7B */ jal get_item_count /* 7E1EA0 80281020 A44001B4 */ sh $zero, 0x1b4($v0) /* 7E1EA4 80281024 14400009 */ bnez $v0, .L8028104C -/* 7E1EA8 80281028 00000000 */ nop +/* 7E1EA8 80281028 00000000 */ nop /* 7E1EAC 8028102C 0C0A00B4 */ jal func_802802D0 /* 7E1EB0 80281030 2404000B */ addiu $a0, $zero, 0xb /* 7E1EB4 80281034 AE220074 */ sw $v0, 0x74($s1) @@ -334,7 +334,7 @@ glabel func_80280BD0 .L80281080: /* 7E1F00 80281080 8E240074 */ lw $a0, 0x74($s1) /* 7E1F04 80281084 0C0B1059 */ jal does_script_exist -/* 7E1F08 80281088 00000000 */ nop +/* 7E1F08 80281088 00000000 */ nop /* 7E1F0C 8028108C 144000E2 */ bnez $v0, .L80281418 /* 7E1F10 80281090 0000102D */ daddu $v0, $zero, $zero /* 7E1F14 80281094 3C04001E */ lui $a0, 0x1e @@ -351,9 +351,9 @@ glabel func_80280BD0 /* 7E1F3C 802810BC 8C426538 */ lw $v0, %lo(D_80286538)($v0) /* 7E1F40 802810C0 904204E8 */ lbu $v0, 0x4e8($v0) /* 7E1F44 802810C4 14400009 */ bnez $v0, .L802810EC -/* 7E1F48 802810C8 00000000 */ nop +/* 7E1F48 802810C8 00000000 */ nop /* 7E1F4C 802810CC 0C0A00D7 */ jal func_8028035C -/* 7E1F50 802810D0 00000000 */ nop +/* 7E1F50 802810D0 00000000 */ nop /* 7E1F54 802810D4 AE220074 */ sw $v0, 0x74($s1) /* 7E1F58 802810D8 240200C9 */ addiu $v0, $zero, 0xc9 /* 7E1F5C 802810DC 0C03A5B2 */ jal func_800E96C8 @@ -362,9 +362,9 @@ glabel func_80280BD0 /* 7E1F68 802810E8 0000102D */ daddu $v0, $zero, $zero .L802810EC: /* 7E1F6C 802810EC 0C03A5B2 */ jal func_800E96C8 -/* 7E1F70 802810F0 00000000 */ nop +/* 7E1F70 802810F0 00000000 */ nop /* 7E1F74 802810F4 080A04EB */ j .L802813AC -/* 7E1F78 802810F8 00000000 */ nop +/* 7E1F78 802810F8 00000000 */ nop .L802810FC: /* 7E1F7C 802810FC 0C0B1059 */ jal does_script_exist /* 7E1F80 80281100 8E240074 */ lw $a0, 0x74($s1) @@ -388,7 +388,7 @@ glabel func_80280BD0 /* 7E1FC0 80281140 1C400055 */ bgtz $v0, .L80281298 /* 7E1FC4 80281144 2442FFFF */ addiu $v0, $v0, -1 /* 7E1FC8 80281148 0C0A02D1 */ jal func_80280B44 -/* 7E1FCC 8028114C 00000000 */ nop +/* 7E1FCC 8028114C 00000000 */ nop /* 7E1FD0 80281150 8E02000C */ lw $v0, 0xc($s0) /* 7E1FD4 80281154 0440001C */ bltz $v0, .L802811C8 /* 7E1FD8 80281158 00021040 */ sll $v0, $v0, 1 @@ -396,20 +396,20 @@ glabel func_80280BD0 /* 7E1FE0 80281160 0C039DF1 */ jal store_item /* 7E1FE4 80281164 844401B4 */ lh $a0, 0x1b4($v0) /* 7E1FE8 80281168 04400005 */ bltz $v0, .L80281180 -/* 7E1FEC 8028116C 00000000 */ nop +/* 7E1FEC 8028116C 00000000 */ nop /* 7E1FF0 80281170 8E02000C */ lw $v0, 0xc($s0) /* 7E1FF4 80281174 00021040 */ sll $v0, $v0, 1 /* 7E1FF8 80281178 00521021 */ addu $v0, $v0, $s2 /* 7E1FFC 8028117C A44001B4 */ sh $zero, 0x1b4($v0) .L80281180: /* 7E2000 80281180 0C039D7B */ jal get_item_count -/* 7E2004 80281184 00000000 */ nop +/* 7E2004 80281184 00000000 */ nop /* 7E2008 80281188 10400005 */ beqz $v0, .L802811A0 -/* 7E200C 8028118C 00000000 */ nop +/* 7E200C 8028118C 00000000 */ nop /* 7E2010 80281190 0C039E12 */ jal get_stored_empty_count -/* 7E2014 80281194 00000000 */ nop +/* 7E2014 80281194 00000000 */ nop /* 7E2018 80281198 14400005 */ bnez $v0, .L802811B0 -/* 7E201C 8028119C 00000000 */ nop +/* 7E201C 8028119C 00000000 */ nop .L802811A0: /* 7E2020 802811A0 0C0A0000 */ jal func_80280000 /* 7E2024 802811A4 2404000F */ addiu $a0, $zero, 0xf @@ -430,7 +430,7 @@ glabel func_80280BD0 .L802811D8: /* 7E2058 802811D8 8E240074 */ lw $a0, 0x74($s1) /* 7E205C 802811DC 0C0B1059 */ jal does_script_exist -/* 7E2060 802811E0 00000000 */ nop +/* 7E2060 802811E0 00000000 */ nop /* 7E2064 802811E4 1440008C */ bnez $v0, .L80281418 /* 7E2068 802811E8 0000102D */ daddu $v0, $zero, $zero /* 7E206C 802811EC 3C04001E */ lui $a0, 0x1e @@ -447,9 +447,9 @@ glabel func_80280BD0 /* 7E2094 80281214 8C426538 */ lw $v0, %lo(D_80286538)($v0) /* 7E2098 80281218 904204E8 */ lbu $v0, 0x4e8($v0) /* 7E209C 8028121C 14400063 */ bnez $v0, .L802813AC -/* 7E20A0 80281220 00000000 */ nop +/* 7E20A0 80281220 00000000 */ nop /* 7E20A4 80281224 0C0A00D7 */ jal func_8028035C -/* 7E20A8 80281228 00000000 */ nop +/* 7E20A8 80281228 00000000 */ nop /* 7E20AC 8028122C AE220074 */ sw $v0, 0x74($s1) .L80281230: /* 7E20B0 80281230 240201F5 */ addiu $v0, $zero, 0x1f5 @@ -458,7 +458,7 @@ glabel func_80280BD0 .L8028123C: /* 7E20BC 8028123C 8E240074 */ lw $a0, 0x74($s1) /* 7E20C0 80281240 0C0B1059 */ jal does_script_exist -/* 7E20C4 80281244 00000000 */ nop +/* 7E20C4 80281244 00000000 */ nop /* 7E20C8 80281248 14400073 */ bnez $v0, .L80281418 /* 7E20CC 8028124C 0000102D */ daddu $v0, $zero, $zero /* 7E20D0 80281250 0C0A0255 */ jal func_80280954 @@ -487,7 +487,7 @@ glabel func_80280BD0 /* 7E211C 8028129C AE220074 */ sw $v0, 0x74($s1) .L802812A0: /* 7E2120 802812A0 0C0A02D1 */ jal func_80280B44 -/* 7E2124 802812A4 00000000 */ nop +/* 7E2124 802812A4 00000000 */ nop /* 7E2128 802812A8 8E02000C */ lw $v0, 0xc($s0) /* 7E212C 802812AC 0440001C */ bltz $v0, .L80281320 /* 7E2130 802812B0 00021040 */ sll $v0, $v0, 1 @@ -495,20 +495,20 @@ glabel func_80280BD0 /* 7E2138 802812B8 0C039D5D */ jal add_item /* 7E213C 802812BC 844401C8 */ lh $a0, 0x1c8($v0) /* 7E2140 802812C0 04400005 */ bltz $v0, .L802812D8 -/* 7E2144 802812C4 00000000 */ nop +/* 7E2144 802812C4 00000000 */ nop /* 7E2148 802812C8 8E02000C */ lw $v0, 0xc($s0) /* 7E214C 802812CC 00021040 */ sll $v0, $v0, 1 /* 7E2150 802812D0 00521021 */ addu $v0, $v0, $s2 /* 7E2154 802812D4 A44001C8 */ sh $zero, 0x1c8($v0) .L802812D8: /* 7E2158 802812D8 0C039D88 */ jal get_item_empty_count -/* 7E215C 802812DC 00000000 */ nop +/* 7E215C 802812DC 00000000 */ nop /* 7E2160 802812E0 10400005 */ beqz $v0, .L802812F8 -/* 7E2164 802812E4 00000000 */ nop +/* 7E2164 802812E4 00000000 */ nop /* 7E2168 802812E8 0C039E05 */ jal get_stored_count -/* 7E216C 802812EC 00000000 */ nop +/* 7E216C 802812EC 00000000 */ nop /* 7E2170 802812F0 14400005 */ bnez $v0, .L80281308 -/* 7E2174 802812F4 00000000 */ nop +/* 7E2174 802812F4 00000000 */ nop .L802812F8: /* 7E2178 802812F8 0C0A0000 */ jal func_80280000 /* 7E217C 802812FC 24040014 */ addiu $a0, $zero, 0x14 @@ -529,7 +529,7 @@ glabel func_80280BD0 .L80281330: /* 7E21B0 80281330 8E240074 */ lw $a0, 0x74($s1) /* 7E21B4 80281334 0C0B1059 */ jal does_script_exist -/* 7E21B8 80281338 00000000 */ nop +/* 7E21B8 80281338 00000000 */ nop /* 7E21BC 8028133C 14400036 */ bnez $v0, .L80281418 /* 7E21C0 80281340 0000102D */ daddu $v0, $zero, $zero /* 7E21C4 80281344 3C04001E */ lui $a0, 0x1e @@ -553,9 +553,9 @@ glabel func_80280BD0 /* 7E2204 80281384 8C426538 */ lw $v0, %lo(D_80286538)($v0) /* 7E2208 80281388 904204E8 */ lbu $v0, 0x4e8($v0) /* 7E220C 8028138C 14400007 */ bnez $v0, .L802813AC -/* 7E2210 80281390 00000000 */ nop +/* 7E2210 80281390 00000000 */ nop /* 7E2214 80281394 0C0A00D7 */ jal func_8028035C -/* 7E2218 80281398 00000000 */ nop +/* 7E2218 80281398 00000000 */ nop /* 7E221C 8028139C AE220074 */ sw $v0, 0x74($s1) .L802813A0: /* 7E2220 802813A0 240202BD */ addiu $v0, $zero, 0x2bd @@ -572,7 +572,7 @@ glabel func_80280BD0 .L802813C4: /* 7E2244 802813C4 8E240074 */ lw $a0, 0x74($s1) /* 7E2248 802813C8 0C0B1059 */ jal does_script_exist -/* 7E224C 802813CC 00000000 */ nop +/* 7E224C 802813CC 00000000 */ nop /* 7E2250 802813D0 14400011 */ bnez $v0, .L80281418 /* 7E2254 802813D4 0000102D */ daddu $v0, $zero, $zero /* 7E2258 802813D8 2402000A */ addiu $v0, $zero, 0xa @@ -581,7 +581,7 @@ glabel func_80280BD0 .L802813E4: /* 7E2264 802813E4 8E020010 */ lw $v0, 0x10($s0) /* 7E2268 802813E8 10400006 */ beqz $v0, .L80281404 -/* 7E226C 802813EC 00000000 */ nop +/* 7E226C 802813EC 00000000 */ nop /* 7E2270 802813F0 8C440014 */ lw $a0, 0x14($v0) /* 7E2274 802813F4 10800003 */ beqz $a0, .L80281404 /* 7E2278 802813F8 24050001 */ addiu $a1, $zero, 1 @@ -589,7 +589,7 @@ glabel func_80280BD0 /* 7E2280 80281400 0000302D */ daddu $a2, $zero, $zero .L80281404: /* 7E2284 80281404 0C03A5E3 */ jal open_status_menu_short -/* 7E2288 80281408 00000000 */ nop +/* 7E2288 80281408 00000000 */ nop /* 7E228C 8028140C 080A0506 */ j .L80281418 /* 7E2290 80281410 24020001 */ addiu $v0, $zero, 1 .L80281414: diff --git a/asm/nonmatchings/world/script_api/7E2AA0/MakeDoorAdvanced.s b/asm/nonmatchings/world/script_api/7E2AA0/MakeDoorAdvanced.s index 41ae1e2be9..5cc1869150 100644 --- a/asm/nonmatchings/world/script_api/7E2AA0/MakeDoorAdvanced.s +++ b/asm/nonmatchings/world/script_api/7E2AA0/MakeDoorAdvanced.s @@ -89,27 +89,28 @@ glabel MakeDoorAdvanced /* 7E2C78 80281DF8 2C620008 */ sltiu $v0, $v1, 8 /* 7E2C7C 80281DFC 104000F0 */ beqz $v0, .L802821C0 /* 7E2C80 80281E00 00031080 */ sll $v0, $v1, 2 -/* 7E2C84 80281E04 3C018028 */ lui $at, %hi(D_80286500) +/* 7E2C84 80281E04 3C018028 */ lui $at, %hi(jtbl_80286500_7E7380) /* 7E2C88 80281E08 00220821 */ addu $at, $at, $v0 -/* 7E2C8C 80281E0C 8C226500 */ lw $v0, %lo(D_80286500)($at) +/* 7E2C8C 80281E0C 8C226500 */ lw $v0, %lo(jtbl_80286500_7E7380)($at) /* 7E2C90 80281E10 00400008 */ jr $v0 -/* 7E2C94 80281E14 00000000 */ nop +/* 7E2C94 80281E14 00000000 */ nop +glabel L80281E18_7E2C98 /* 7E2C98 80281E18 C7AA0024 */ lwc1 $f10, 0x24($sp) /* 7E2C9C 80281E1C 3C0141F0 */ lui $at, 0x41f0 /* 7E2CA0 80281E20 44811000 */ mtc1 $at, $f2 -/* 7E2CA4 80281E24 00000000 */ nop +/* 7E2CA4 80281E24 00000000 */ nop /* 7E2CA8 80281E28 46025302 */ mul.s $f12, $f10, $f2 -/* 7E2CAC 80281E2C 00000000 */ nop +/* 7E2CAC 80281E2C 00000000 */ nop /* 7E2CB0 80281E30 C7A60028 */ lwc1 $f6, 0x28($sp) /* 7E2CB4 80281E34 3C0141A0 */ lui $at, 0x41a0 /* 7E2CB8 80281E38 44810000 */ mtc1 $at, $f0 -/* 7E2CBC 80281E3C 00000000 */ nop +/* 7E2CBC 80281E3C 00000000 */ nop /* 7E2CC0 80281E40 46003102 */ mul.s $f4, $f6, $f0 -/* 7E2CC4 80281E44 00000000 */ nop +/* 7E2CC4 80281E44 00000000 */ nop /* 7E2CC8 80281E48 46023182 */ mul.s $f6, $f6, $f2 -/* 7E2CCC 80281E4C 00000000 */ nop +/* 7E2CCC 80281E4C 00000000 */ nop /* 7E2CD0 80281E50 46005282 */ mul.s $f10, $f10, $f0 -/* 7E2CD4 80281E54 00000000 */ nop +/* 7E2CD4 80281E54 00000000 */ nop /* 7E2CD8 80281E58 C7A20018 */ lwc1 $f2, 0x18($sp) /* 7E2CDC 80281E5C 460C1200 */ add.s $f8, $f2, $f12 /* 7E2CE0 80281E60 460C1081 */ sub.s $f2, $f2, $f12 @@ -120,29 +121,30 @@ glabel MakeDoorAdvanced /* 7E2CF4 80281E74 E6420014 */ swc1 $f2, 0x14($s2) /* 7E2CF8 80281E78 080A0819 */ j .L80282064 /* 7E2CFC 80281E7C 460A2100 */ add.s $f4, $f4, $f10 +glabel L80281E80_7E2D00 /* 7E2D00 80281E80 C7A80024 */ lwc1 $f8, 0x24($sp) /* 7E2D04 80281E84 3C014270 */ lui $at, 0x4270 /* 7E2D08 80281E88 44812000 */ mtc1 $at, $f4 -/* 7E2D0C 80281E8C 00000000 */ nop +/* 7E2D0C 80281E8C 00000000 */ nop /* 7E2D10 80281E90 46044302 */ mul.s $f12, $f8, $f4 -/* 7E2D14 80281E94 00000000 */ nop +/* 7E2D14 80281E94 00000000 */ nop /* 7E2D18 80281E98 C7A60028 */ lwc1 $f6, 0x28($sp) /* 7E2D1C 80281E9C 3C0141A0 */ lui $at, 0x41a0 /* 7E2D20 80281EA0 44815000 */ mtc1 $at, $f10 -/* 7E2D24 80281EA4 00000000 */ nop +/* 7E2D24 80281EA4 00000000 */ nop /* 7E2D28 80281EA8 460A3382 */ mul.s $f14, $f6, $f10 -/* 7E2D2C 80281EAC 00000000 */ nop +/* 7E2D2C 80281EAC 00000000 */ nop /* 7E2D30 80281EB0 46043102 */ mul.s $f4, $f6, $f4 -/* 7E2D34 80281EB4 00000000 */ nop +/* 7E2D34 80281EB4 00000000 */ nop /* 7E2D38 80281EB8 460A4282 */ mul.s $f10, $f8, $f10 -/* 7E2D3C 80281EBC 00000000 */ nop +/* 7E2D3C 80281EBC 00000000 */ nop /* 7E2D40 80281EC0 3C0141F0 */ lui $at, 0x41f0 /* 7E2D44 80281EC4 44810000 */ mtc1 $at, $f0 -/* 7E2D48 80281EC8 00000000 */ nop +/* 7E2D48 80281EC8 00000000 */ nop /* 7E2D4C 80281ECC 46004202 */ mul.s $f8, $f8, $f0 -/* 7E2D50 80281ED0 00000000 */ nop +/* 7E2D50 80281ED0 00000000 */ nop /* 7E2D54 80281ED4 46003182 */ mul.s $f6, $f6, $f0 -/* 7E2D58 80281ED8 00000000 */ nop +/* 7E2D58 80281ED8 00000000 */ nop /* 7E2D5C 80281EDC C7A20018 */ lwc1 $f2, 0x18($sp) /* 7E2D60 80281EE0 460C1300 */ add.s $f12, $f2, $f12 /* 7E2D64 80281EE4 C7A00020 */ lwc1 $f0, 0x20($sp) @@ -153,22 +155,23 @@ glabel MakeDoorAdvanced /* 7E2D78 80281EF8 E6420014 */ swc1 $f2, 0x14($s2) /* 7E2D7C 80281EFC 080A083D */ j .L802820F4 /* 7E2D80 80281F00 460A2100 */ add.s $f4, $f4, $f10 +glabel L80281F04_7E2D84 /* 7E2D84 80281F04 C7A80024 */ lwc1 $f8, 0x24($sp) /* 7E2D88 80281F08 3C0141F0 */ lui $at, 0x41f0 /* 7E2D8C 80281F0C 44813000 */ mtc1 $at, $f6 -/* 7E2D90 80281F10 00000000 */ nop +/* 7E2D90 80281F10 00000000 */ nop /* 7E2D94 80281F14 46064282 */ mul.s $f10, $f8, $f6 -/* 7E2D98 80281F18 00000000 */ nop +/* 7E2D98 80281F18 00000000 */ nop /* 7E2D9C 80281F1C C7A40028 */ lwc1 $f4, 0x28($sp) /* 7E2DA0 80281F20 46062182 */ mul.s $f6, $f4, $f6 -/* 7E2DA4 80281F24 00000000 */ nop +/* 7E2DA4 80281F24 00000000 */ nop /* 7E2DA8 80281F28 3C0141A0 */ lui $at, 0x41a0 /* 7E2DAC 80281F2C 44810000 */ mtc1 $at, $f0 -/* 7E2DB0 80281F30 00000000 */ nop +/* 7E2DB0 80281F30 00000000 */ nop /* 7E2DB4 80281F34 46002102 */ mul.s $f4, $f4, $f0 -/* 7E2DB8 80281F38 00000000 */ nop +/* 7E2DB8 80281F38 00000000 */ nop /* 7E2DBC 80281F3C 46004202 */ mul.s $f8, $f8, $f0 -/* 7E2DC0 80281F40 00000000 */ nop +/* 7E2DC0 80281F40 00000000 */ nop /* 7E2DC4 80281F44 C7A20018 */ lwc1 $f2, 0x18($sp) /* 7E2DC8 80281F48 460A1300 */ add.s $f12, $f2, $f10 /* 7E2DCC 80281F4C 460A1081 */ sub.s $f2, $f2, $f10 @@ -181,29 +184,30 @@ glabel MakeDoorAdvanced /* 7E2DE8 80281F68 E64A0010 */ swc1 $f10, 0x10($s2) /* 7E2DEC 80281F6C 080A086F */ j .L802821BC /* 7E2DF0 80281F70 E6420014 */ swc1 $f2, 0x14($s2) +glabel L80281F74_7E2DF4 /* 7E2DF4 80281F74 C7A80024 */ lwc1 $f8, 0x24($sp) /* 7E2DF8 80281F78 3C0141F0 */ lui $at, 0x41f0 /* 7E2DFC 80281F7C 44813000 */ mtc1 $at, $f6 -/* 7E2E00 80281F80 00000000 */ nop +/* 7E2E00 80281F80 00000000 */ nop /* 7E2E04 80281F84 46064282 */ mul.s $f10, $f8, $f6 -/* 7E2E08 80281F88 00000000 */ nop +/* 7E2E08 80281F88 00000000 */ nop /* 7E2E0C 80281F8C C7A40028 */ lwc1 $f4, 0x28($sp) /* 7E2E10 80281F90 46062182 */ mul.s $f6, $f4, $f6 -/* 7E2E14 80281F94 00000000 */ nop +/* 7E2E14 80281F94 00000000 */ nop /* 7E2E18 80281F98 3C014270 */ lui $at, 0x4270 /* 7E2E1C 80281F9C 44811000 */ mtc1 $at, $f2 -/* 7E2E20 80281FA0 00000000 */ nop +/* 7E2E20 80281FA0 00000000 */ nop /* 7E2E24 80281FA4 46024302 */ mul.s $f12, $f8, $f2 -/* 7E2E28 80281FA8 00000000 */ nop +/* 7E2E28 80281FA8 00000000 */ nop /* 7E2E2C 80281FAC 3C0141A0 */ lui $at, 0x41a0 /* 7E2E30 80281FB0 44810000 */ mtc1 $at, $f0 -/* 7E2E34 80281FB4 00000000 */ nop +/* 7E2E34 80281FB4 00000000 */ nop /* 7E2E38 80281FB8 46002382 */ mul.s $f14, $f4, $f0 -/* 7E2E3C 80281FBC 00000000 */ nop +/* 7E2E3C 80281FBC 00000000 */ nop /* 7E2E40 80281FC0 46022102 */ mul.s $f4, $f4, $f2 -/* 7E2E44 80281FC4 00000000 */ nop +/* 7E2E44 80281FC4 00000000 */ nop /* 7E2E48 80281FC8 46004202 */ mul.s $f8, $f8, $f0 -/* 7E2E4C 80281FCC 00000000 */ nop +/* 7E2E4C 80281FCC 00000000 */ nop /* 7E2E50 80281FD0 C7A20018 */ lwc1 $f2, 0x18($sp) /* 7E2E54 80281FD4 460A1280 */ add.s $f10, $f2, $f10 /* 7E2E58 80281FD8 460C1081 */ sub.s $f2, $f2, $f12 @@ -216,22 +220,23 @@ glabel MakeDoorAdvanced /* 7E2E74 80281FF4 E6460010 */ swc1 $f6, 0x10($s2) /* 7E2E78 80281FF8 080A086F */ j .L802821BC /* 7E2E7C 80281FFC E6420014 */ swc1 $f2, 0x14($s2) +glabel L80282000_7E2E80 /* 7E2E80 80282000 C7AA0024 */ lwc1 $f10, 0x24($sp) /* 7E2E84 80282004 3C0141F0 */ lui $at, 0x41f0 /* 7E2E88 80282008 44811000 */ mtc1 $at, $f2 -/* 7E2E8C 8028200C 00000000 */ nop +/* 7E2E8C 8028200C 00000000 */ nop /* 7E2E90 80282010 46025302 */ mul.s $f12, $f10, $f2 -/* 7E2E94 80282014 00000000 */ nop +/* 7E2E94 80282014 00000000 */ nop /* 7E2E98 80282018 C7A60028 */ lwc1 $f6, 0x28($sp) /* 7E2E9C 8028201C 3C0141A0 */ lui $at, 0x41a0 /* 7E2EA0 80282020 44810000 */ mtc1 $at, $f0 -/* 7E2EA4 80282024 00000000 */ nop +/* 7E2EA4 80282024 00000000 */ nop /* 7E2EA8 80282028 46003102 */ mul.s $f4, $f6, $f0 -/* 7E2EAC 8028202C 00000000 */ nop +/* 7E2EAC 8028202C 00000000 */ nop /* 7E2EB0 80282030 46023182 */ mul.s $f6, $f6, $f2 -/* 7E2EB4 80282034 00000000 */ nop +/* 7E2EB4 80282034 00000000 */ nop /* 7E2EB8 80282038 46005282 */ mul.s $f10, $f10, $f0 -/* 7E2EBC 8028203C 00000000 */ nop +/* 7E2EBC 8028203C 00000000 */ nop /* 7E2EC0 80282040 C7A20018 */ lwc1 $f2, 0x18($sp) /* 7E2EC4 80282044 460C1200 */ add.s $f8, $f2, $f12 /* 7E2EC8 80282048 460C1081 */ sub.s $f2, $f2, $f12 @@ -246,29 +251,30 @@ glabel MakeDoorAdvanced /* 7E2EE8 80282068 E648000C */ swc1 $f8, 0xc($s2) /* 7E2EEC 8028206C 080A0870 */ j .L802821C0 /* 7E2EF0 80282070 E6440010 */ swc1 $f4, 0x10($s2) +glabel L80282074_7E2EF4 /* 7E2EF4 80282074 C7A80024 */ lwc1 $f8, 0x24($sp) /* 7E2EF8 80282078 3C014270 */ lui $at, 0x4270 /* 7E2EFC 8028207C 44812000 */ mtc1 $at, $f4 -/* 7E2F00 80282080 00000000 */ nop +/* 7E2F00 80282080 00000000 */ nop /* 7E2F04 80282084 46044302 */ mul.s $f12, $f8, $f4 -/* 7E2F08 80282088 00000000 */ nop +/* 7E2F08 80282088 00000000 */ nop /* 7E2F0C 8028208C C7A60028 */ lwc1 $f6, 0x28($sp) /* 7E2F10 80282090 3C0141A0 */ lui $at, 0x41a0 /* 7E2F14 80282094 44815000 */ mtc1 $at, $f10 -/* 7E2F18 80282098 00000000 */ nop +/* 7E2F18 80282098 00000000 */ nop /* 7E2F1C 8028209C 460A3382 */ mul.s $f14, $f6, $f10 -/* 7E2F20 802820A0 00000000 */ nop +/* 7E2F20 802820A0 00000000 */ nop /* 7E2F24 802820A4 46043102 */ mul.s $f4, $f6, $f4 -/* 7E2F28 802820A8 00000000 */ nop +/* 7E2F28 802820A8 00000000 */ nop /* 7E2F2C 802820AC 460A4282 */ mul.s $f10, $f8, $f10 -/* 7E2F30 802820B0 00000000 */ nop +/* 7E2F30 802820B0 00000000 */ nop /* 7E2F34 802820B4 3C0141F0 */ lui $at, 0x41f0 /* 7E2F38 802820B8 44810000 */ mtc1 $at, $f0 -/* 7E2F3C 802820BC 00000000 */ nop +/* 7E2F3C 802820BC 00000000 */ nop /* 7E2F40 802820C0 46004202 */ mul.s $f8, $f8, $f0 -/* 7E2F44 802820C4 00000000 */ nop +/* 7E2F44 802820C4 00000000 */ nop /* 7E2F48 802820C8 46003182 */ mul.s $f6, $f6, $f0 -/* 7E2F4C 802820CC 00000000 */ nop +/* 7E2F4C 802820CC 00000000 */ nop /* 7E2F50 802820D0 C7A20018 */ lwc1 $f2, 0x18($sp) /* 7E2F54 802820D4 460C1300 */ add.s $f12, $f2, $f12 /* 7E2F58 802820D8 C7A00020 */ lwc1 $f0, 0x20($sp) @@ -283,22 +289,23 @@ glabel MakeDoorAdvanced /* 7E2F78 802820F8 E64C000C */ swc1 $f12, 0xc($s2) /* 7E2F7C 802820FC 080A0870 */ j .L802821C0 /* 7E2F80 80282100 E6440010 */ swc1 $f4, 0x10($s2) +glabel L80282104_7E2F84 /* 7E2F84 80282104 C7A80024 */ lwc1 $f8, 0x24($sp) /* 7E2F88 80282108 3C0141F0 */ lui $at, 0x41f0 /* 7E2F8C 8028210C 44813000 */ mtc1 $at, $f6 -/* 7E2F90 80282110 00000000 */ nop +/* 7E2F90 80282110 00000000 */ nop /* 7E2F94 80282114 46064282 */ mul.s $f10, $f8, $f6 -/* 7E2F98 80282118 00000000 */ nop +/* 7E2F98 80282118 00000000 */ nop /* 7E2F9C 8028211C C7A40028 */ lwc1 $f4, 0x28($sp) /* 7E2FA0 80282120 46062182 */ mul.s $f6, $f4, $f6 -/* 7E2FA4 80282124 00000000 */ nop +/* 7E2FA4 80282124 00000000 */ nop /* 7E2FA8 80282128 3C0141A0 */ lui $at, 0x41a0 /* 7E2FAC 8028212C 44810000 */ mtc1 $at, $f0 -/* 7E2FB0 80282130 00000000 */ nop +/* 7E2FB0 80282130 00000000 */ nop /* 7E2FB4 80282134 46002102 */ mul.s $f4, $f4, $f0 -/* 7E2FB8 80282138 00000000 */ nop +/* 7E2FB8 80282138 00000000 */ nop /* 7E2FBC 8028213C 46004202 */ mul.s $f8, $f8, $f0 -/* 7E2FC0 80282140 00000000 */ nop +/* 7E2FC0 80282140 00000000 */ nop /* 7E2FC4 80282144 C7A20018 */ lwc1 $f2, 0x18($sp) /* 7E2FC8 80282148 460A1300 */ add.s $f12, $f2, $f10 /* 7E2FCC 8028214C 460A1081 */ sub.s $f2, $f2, $f10 @@ -311,15 +318,16 @@ glabel MakeDoorAdvanced /* 7E2FE8 80282168 E64A0010 */ swc1 $f10, 0x10($s2) /* 7E2FEC 8028216C 080A086F */ j .L802821BC /* 7E2FF0 80282170 E6420014 */ swc1 $f2, 0x14($s2) +glabel L80282174_7E2FF4 /* 7E2FF4 80282174 C7A60024 */ lwc1 $f6, 0x24($sp) /* 7E2FF8 80282178 3C0141F0 */ lui $at, 0x41f0 /* 7E2FFC 8028217C 44810000 */ mtc1 $at, $f0 -/* 7E3000 80282180 00000000 */ nop +/* 7E3000 80282180 00000000 */ nop /* 7E3004 80282184 46003182 */ mul.s $f6, $f6, $f0 -/* 7E3008 80282188 00000000 */ nop +/* 7E3008 80282188 00000000 */ nop /* 7E300C 8028218C C7A20028 */ lwc1 $f2, 0x28($sp) /* 7E3010 80282190 46001082 */ mul.s $f2, $f2, $f0 -/* 7E3014 80282194 00000000 */ nop +/* 7E3014 80282194 00000000 */ nop /* 7E3018 80282198 C7A40018 */ lwc1 $f4, 0x18($sp) /* 7E301C 8028219C 46062200 */ add.s $f8, $f4, $f6 /* 7E3020 802821A0 C7A00020 */ lwc1 $f0, 0x20($sp) diff --git a/asm/nonmatchings/world/script_api/7E2AA0/func_80282414.s b/asm/nonmatchings/world/script_api/7E2AA0/func_80282414.s index b59342864a..ad322df684 100644 --- a/asm/nonmatchings/world/script_api/7E2AA0/func_80282414.s +++ b/asm/nonmatchings/world/script_api/7E2AA0/func_80282414.s @@ -49,15 +49,15 @@ glabel func_80282414 /* 7E3334 802824B4 00460018 */ mult $v0, $a2 /* 7E3338 802824B8 00001012 */ mflo $v0 /* 7E333C 802824BC 8E450044 */ lw $a1, 0x44($s2) -/* 7E3340 802824C0 00000000 */ nop +/* 7E3340 802824C0 00000000 */ nop /* 7E3344 802824C4 00A60018 */ mult $a1, $a2 /* 7E3348 802824C8 00002812 */ mflo $a1 /* 7E334C 802824CC 3C078080 */ lui $a3, 0x8080 /* 7E3350 802824D0 34E78081 */ ori $a3, $a3, 0x8081 /* 7E3354 802824D4 00470018 */ mult $v0, $a3 /* 7E3358 802824D8 00001810 */ mfhi $v1 -/* 7E335C 802824DC 00000000 */ nop -/* 7E3360 802824E0 00000000 */ nop +/* 7E335C 802824DC 00000000 */ nop +/* 7E3360 802824E0 00000000 */ nop /* 7E3364 802824E4 00A70018 */ mult $a1, $a3 /* 7E3368 802824E8 00004010 */ mfhi $t0 /* 7E336C 802824EC 8E440048 */ lw $a0, 0x48($s2) diff --git a/asm/nonmatchings/world/script_api/7E2AA0/func_80282634.s b/asm/nonmatchings/world/script_api/7E2AA0/func_80282634.s index b6ca262f0c..515a1a72d9 100644 --- a/asm/nonmatchings/world/script_api/7E2AA0/func_80282634.s +++ b/asm/nonmatchings/world/script_api/7E2AA0/func_80282634.s @@ -25,13 +25,13 @@ glabel func_80282634 /* 7E3500 80282680 26100001 */ addiu $s0, $s0, 1 /* 7E3504 80282684 806200A4 */ lb $v0, 0xa4($v1) /* 7E3508 80282688 10530003 */ beq $v0, $s3, .L80282698 -/* 7E350C 8028268C 00000000 */ nop +/* 7E350C 8028268C 00000000 */ nop /* 7E3510 80282690 00921025 */ or $v0, $a0, $s2 /* 7E3514 80282694 AC620000 */ sw $v0, ($v1) .L80282698: /* 7E3518 80282698 2A020040 */ slti $v0, $s0, 0x40 /* 7E351C 8028269C 1440FFF1 */ bnez $v0, .L80282664 -/* 7E3520 802826A0 00000000 */ nop +/* 7E3520 802826A0 00000000 */ nop /* 7E3524 802826A4 2412FFFF */ addiu $s2, $zero, -1 /* 7E3528 802826A8 3C10FF7F */ lui $s0, 0xff7f /* 7E352C 802826AC 3610FFFF */ ori $s0, $s0, 0xffff @@ -43,7 +43,7 @@ glabel func_80282634 /* 7E3540 802826C0 26310004 */ addiu $s1, $s1, 4 /* 7E3544 802826C4 0040182D */ daddu $v1, $v0, $zero /* 7E3548 802826C8 1060FFF9 */ beqz $v1, .L802826B0 -/* 7E354C 802826CC 00000000 */ nop +/* 7E354C 802826CC 00000000 */ nop /* 7E3550 802826D0 8C620000 */ lw $v0, ($v1) /* 7E3554 802826D4 00501024 */ and $v0, $v0, $s0 /* 7E3558 802826D8 080A09AC */ j .L802826B0 diff --git a/asm/nonmatchings/world/script_api/7E2AA0/func_80282700.s b/asm/nonmatchings/world/script_api/7E2AA0/func_80282700.s index 43648b447a..ea777a2f21 100644 --- a/asm/nonmatchings/world/script_api/7E2AA0/func_80282700.s +++ b/asm/nonmatchings/world/script_api/7E2AA0/func_80282700.s @@ -20,13 +20,13 @@ glabel func_80282700 /* 7E35B8 80282738 26100001 */ addiu $s0, $s0, 1 /* 7E35BC 8028273C 8C620000 */ lw $v0, ($v1) /* 7E35C0 80282740 10400003 */ beqz $v0, .L80282750 -/* 7E35C4 80282744 00000000 */ nop +/* 7E35C4 80282744 00000000 */ nop /* 7E35C8 80282748 00511024 */ and $v0, $v0, $s1 /* 7E35CC 8028274C AC620000 */ sw $v0, ($v1) .L80282750: /* 7E35D0 80282750 2A020040 */ slti $v0, $s0, 0x40 /* 7E35D4 80282754 1440FFF4 */ bnez $v0, .L80282728 -/* 7E35D8 80282758 00000000 */ nop +/* 7E35D8 80282758 00000000 */ nop .L8028275C: /* 7E35DC 8028275C 24020002 */ addiu $v0, $zero, 2 /* 7E35E0 80282760 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/asm/nonmatchings/world/script_api/7E3700/CreatePushBlockGrid.s b/asm/nonmatchings/world/script_api/7E3700/CreatePushBlockGrid.s index fd4f2a094f..cba8b013b2 100644 --- a/asm/nonmatchings/world/script_api/7E3700/CreatePushBlockGrid.s +++ b/asm/nonmatchings/world/script_api/7E3700/CreatePushBlockGrid.s @@ -71,7 +71,7 @@ glabel CreatePushBlockGrid /* 7E4264 802833E4 A0400000 */ sb $zero, ($v0) /* 7E4268 802833E8 00A4102A */ slt $v0, $a1, $a0 /* 7E426C 802833EC 1440FFFA */ bnez $v0, .L802833D8 -/* 7E4270 802833F0 00000000 */ nop +/* 7E4270 802833F0 00000000 */ nop /* 7E4274 802833F4 080A0D0D */ j .L80283434 /* 7E4278 802833F8 A2150004 */ sb $s5, 4($s0) .L802833FC: diff --git a/asm/nonmatchings/world/script_api/7E3700/GetPushBlock.s b/asm/nonmatchings/world/script_api/7E3700/GetPushBlock.s index bec54e5dc5..b538e62d85 100644 --- a/asm/nonmatchings/world/script_api/7E3700/GetPushBlock.s +++ b/asm/nonmatchings/world/script_api/7E3700/GetPushBlock.s @@ -40,7 +40,7 @@ glabel GetPushBlock /* 7E44CC 8028364C 10400005 */ beqz $v0, .L80283664 /* 7E44D0 80283650 0200282D */ daddu $a1, $s0, $zero /* 7E44D4 80283654 06210005 */ bgez $s1, .L8028366C -/* 7E44D8 80283658 00000000 */ nop +/* 7E44D8 80283658 00000000 */ nop .L8028365C: /* 7E44DC 8028365C 0280202D */ daddu $a0, $s4, $zero .L80283660: diff --git a/asm/nonmatchings/world/script_api/7E3700/SetPushBlockFallEffect.s b/asm/nonmatchings/world/script_api/7E3700/SetPushBlockFallEffect.s index ae724f7a9c..d42bdcfd3b 100644 --- a/asm/nonmatchings/world/script_api/7E3700/SetPushBlockFallEffect.s +++ b/asm/nonmatchings/world/script_api/7E3700/SetPushBlockFallEffect.s @@ -26,4 +26,4 @@ glabel SetPushBlockFallEffect /* 7E4680 80283800 24020002 */ addiu $v0, $zero, 2 /* 7E4684 80283804 03E00008 */ jr $ra /* 7E4688 80283808 27BD0020 */ addiu $sp, $sp, 0x20 -/* 7E468C 8028380C 00000000 */ nop +/* 7E468C 8028380C 00000000 */ nop diff --git a/asm/nonmatchings/world/script_api/7E3700/func_802828DC.s b/asm/nonmatchings/world/script_api/7E3700/func_802828DC.s index 874ef40a5f..1bb72cce53 100644 --- a/asm/nonmatchings/world/script_api/7E3700/func_802828DC.s +++ b/asm/nonmatchings/world/script_api/7E3700/func_802828DC.s @@ -53,12 +53,12 @@ glabel func_802828DC /* 7E3818 80282998 C642009C */ lwc1 $f2, 0x9c($s2) /* 7E381C 8028299C 468010A0 */ cvt.s.w $f2, $f2 /* 7E3820 802829A0 46041082 */ mul.s $f2, $f2, $f4 -/* 7E3824 802829A4 00000000 */ nop +/* 7E3824 802829A4 00000000 */ nop /* 7E3828 802829A8 3C0141C8 */ lui $at, 0x41c8 /* 7E382C 802829AC 4481C000 */ mtc1 $at, $f24 -/* 7E3830 802829B0 00000000 */ nop +/* 7E3830 802829B0 00000000 */ nop /* 7E3834 802829B4 46181082 */ mul.s $f2, $f2, $f24 -/* 7E3838 802829B8 00000000 */ nop +/* 7E3838 802829B8 00000000 */ nop /* 7E383C 802829BC C6400084 */ lwc1 $f0, 0x84($s2) /* 7E3840 802829C0 46800020 */ cvt.s.w $f0, $f0 /* 7E3844 802829C4 46020000 */ add.s $f0, $f0, $f2 @@ -66,9 +66,9 @@ glabel func_802828DC /* 7E384C 802829CC C64200A0 */ lwc1 $f2, 0xa0($s2) /* 7E3850 802829D0 468010A0 */ cvt.s.w $f2, $f2 /* 7E3854 802829D4 46041082 */ mul.s $f2, $f2, $f4 -/* 7E3858 802829D8 00000000 */ nop +/* 7E3858 802829D8 00000000 */ nop /* 7E385C 802829DC 46181082 */ mul.s $f2, $f2, $f24 -/* 7E3860 802829E0 00000000 */ nop +/* 7E3860 802829E0 00000000 */ nop /* 7E3864 802829E4 C6400088 */ lwc1 $f0, 0x88($s2) /* 7E3868 802829E8 46800020 */ cvt.s.w $f0, $f0 /* 7E386C 802829EC 46020000 */ add.s $f0, $f0, $f2 @@ -76,9 +76,9 @@ glabel func_802828DC /* 7E3874 802829F4 C64200A4 */ lwc1 $f2, 0xa4($s2) /* 7E3878 802829F8 468010A0 */ cvt.s.w $f2, $f2 /* 7E387C 802829FC 46041082 */ mul.s $f2, $f2, $f4 -/* 7E3880 80282A00 00000000 */ nop +/* 7E3880 80282A00 00000000 */ nop /* 7E3884 80282A04 46181082 */ mul.s $f2, $f2, $f24 -/* 7E3888 80282A08 00000000 */ nop +/* 7E3888 80282A08 00000000 */ nop /* 7E388C 80282A0C C640008C */ lwc1 $f0, 0x8c($s2) /* 7E3890 80282A10 46800020 */ cvt.s.w $f0, $f0 /* 7E3894 80282A14 46020000 */ add.s $f0, $f0, $f2 @@ -86,9 +86,9 @@ glabel func_802828DC /* 7E389C 80282A1C C642009C */ lwc1 $f2, 0x9c($s2) /* 7E38A0 80282A20 468010A0 */ cvt.s.w $f2, $f2 /* 7E38A4 80282A24 46041082 */ mul.s $f2, $f2, $f4 -/* 7E38A8 80282A28 00000000 */ nop +/* 7E38A8 80282A28 00000000 */ nop /* 7E38AC 80282A2C 46181082 */ mul.s $f2, $f2, $f24 -/* 7E38B0 80282A30 00000000 */ nop +/* 7E38B0 80282A30 00000000 */ nop /* 7E38B4 80282A34 C6400090 */ lwc1 $f0, 0x90($s2) /* 7E38B8 80282A38 46800020 */ cvt.s.w $f0, $f0 /* 7E38BC 80282A3C 46020000 */ add.s $f0, $f0, $f2 @@ -96,9 +96,9 @@ glabel func_802828DC /* 7E38C4 80282A44 C64200A0 */ lwc1 $f2, 0xa0($s2) /* 7E38C8 80282A48 468010A0 */ cvt.s.w $f2, $f2 /* 7E38CC 80282A4C 46041082 */ mul.s $f2, $f2, $f4 -/* 7E38D0 80282A50 00000000 */ nop +/* 7E38D0 80282A50 00000000 */ nop /* 7E38D4 80282A54 46181082 */ mul.s $f2, $f2, $f24 -/* 7E38D8 80282A58 00000000 */ nop +/* 7E38D8 80282A58 00000000 */ nop /* 7E38DC 80282A5C C6400094 */ lwc1 $f0, 0x94($s2) /* 7E38E0 80282A60 46800020 */ cvt.s.w $f0, $f0 /* 7E38E4 80282A64 46020000 */ add.s $f0, $f0, $f2 @@ -106,9 +106,9 @@ glabel func_802828DC /* 7E38EC 80282A6C C64200A4 */ lwc1 $f2, 0xa4($s2) /* 7E38F0 80282A70 468010A0 */ cvt.s.w $f2, $f2 /* 7E38F4 80282A74 46041082 */ mul.s $f2, $f2, $f4 -/* 7E38F8 80282A78 00000000 */ nop +/* 7E38F8 80282A78 00000000 */ nop /* 7E38FC 80282A7C 46181082 */ mul.s $f2, $f2, $f24 -/* 7E3900 80282A80 00000000 */ nop +/* 7E3900 80282A80 00000000 */ nop /* 7E3904 80282A84 C6400098 */ lwc1 $f0, 0x98($s2) /* 7E3908 80282A88 46800020 */ cvt.s.w $f0, $f0 /* 7E390C 80282A8C 46020000 */ add.s $f0, $f0, $f2 @@ -116,16 +116,16 @@ glabel func_802828DC /* 7E3914 80282A94 8E420070 */ lw $v0, 0x70($s2) /* 7E3918 80282A98 2842000C */ slti $v0, $v0, 0xc /* 7E391C 80282A9C 1040004D */ beqz $v0, .L80282BD4 -/* 7E3920 80282AA0 00000000 */ nop +/* 7E3920 80282AA0 00000000 */ nop /* 7E3924 80282AA4 C642009C */ lwc1 $f2, 0x9c($s2) /* 7E3928 80282AA8 468010A0 */ cvt.s.w $f2, $f2 /* 7E392C 80282AAC 46041082 */ mul.s $f2, $f2, $f4 -/* 7E3930 80282AB0 00000000 */ nop +/* 7E3930 80282AB0 00000000 */ nop /* 7E3934 80282AB4 3C01C2B4 */ lui $at, 0xc2b4 /* 7E3938 80282AB8 44810000 */ mtc1 $at, $f0 -/* 7E393C 80282ABC 00000000 */ nop +/* 7E393C 80282ABC 00000000 */ nop /* 7E3940 80282AC0 46001082 */ mul.s $f2, $f2, $f0 -/* 7E3944 80282AC4 00000000 */ nop +/* 7E3944 80282AC4 00000000 */ nop /* 7E3948 80282AC8 C64000B4 */ lwc1 $f0, 0xb4($s2) /* 7E394C 80282ACC 46800020 */ cvt.s.w $f0, $f0 /* 7E3950 80282AD0 46020000 */ add.s $f0, $f0, $f2 @@ -133,14 +133,14 @@ glabel func_802828DC /* 7E3958 80282AD8 C64200A4 */ lwc1 $f2, 0xa4($s2) /* 7E395C 80282ADC 468010A0 */ cvt.s.w $f2, $f2 /* 7E3960 80282AE0 46041082 */ mul.s $f2, $f2, $f4 -/* 7E3964 80282AE4 00000000 */ nop +/* 7E3964 80282AE4 00000000 */ nop /* 7E3968 80282AE8 3C0142B4 */ lui $at, 0x42b4 /* 7E396C 80282AEC 4481B000 */ mtc1 $at, $f22 -/* 7E3970 80282AF0 00000000 */ nop +/* 7E3970 80282AF0 00000000 */ nop /* 7E3974 80282AF4 46161082 */ mul.s $f2, $f2, $f22 -/* 7E3978 80282AF8 00000000 */ nop +/* 7E3978 80282AF8 00000000 */ nop /* 7E397C 80282AFC 46162582 */ mul.s $f22, $f4, $f22 -/* 7E3980 80282B00 00000000 */ nop +/* 7E3980 80282B00 00000000 */ nop /* 7E3984 80282B04 C64000A8 */ lwc1 $f0, 0xa8($s2) /* 7E3988 80282B08 46800020 */ cvt.s.w $f0, $f0 /* 7E398C 80282B0C 46020000 */ add.s $f0, $f0, $f2 @@ -148,13 +148,13 @@ glabel func_802828DC /* 7E3994 80282B14 0C00A8BB */ jal sin_deg /* 7E3998 80282B18 E6200060 */ swc1 $f0, 0x60($s1) /* 7E399C 80282B1C 46180002 */ mul.s $f0, $f0, $f24 -/* 7E39A0 80282B20 00000000 */ nop +/* 7E39A0 80282B20 00000000 */ nop /* 7E39A4 80282B24 3C013FE0 */ lui $at, 0x3fe0 /* 7E39A8 80282B28 4481A800 */ mtc1 $at, $f21 /* 7E39AC 80282B2C 4480A000 */ mtc1 $zero, $f20 /* 7E39B0 80282B30 46000021 */ cvt.d.s $f0, $f0 /* 7E39B4 80282B34 46340002 */ mul.d $f0, $f0, $f20 -/* 7E39B8 80282B38 00000000 */ nop +/* 7E39B8 80282B38 00000000 */ nop /* 7E39BC 80282B3C C622004C */ lwc1 $f2, 0x4c($s1) /* 7E39C0 80282B40 460010A1 */ cvt.d.s $f2, $f2 /* 7E39C4 80282B44 46201080 */ add.d $f2, $f2, $f0 @@ -165,12 +165,12 @@ glabel func_802828DC /* 7E39D8 80282B58 C642009C */ lwc1 $f2, 0x9c($s2) /* 7E39DC 80282B5C 468010A0 */ cvt.s.w $f2, $f2 /* 7E39E0 80282B60 46001082 */ mul.s $f2, $f2, $f0 -/* 7E39E4 80282B64 00000000 */ nop +/* 7E39E4 80282B64 00000000 */ nop /* 7E39E8 80282B68 46181082 */ mul.s $f2, $f2, $f24 -/* 7E39EC 80282B6C 00000000 */ nop +/* 7E39EC 80282B6C 00000000 */ nop /* 7E39F0 80282B70 460010A1 */ cvt.d.s $f2, $f2 /* 7E39F4 80282B74 46341082 */ mul.d $f2, $f2, $f20 -/* 7E39F8 80282B78 00000000 */ nop +/* 7E39F8 80282B78 00000000 */ nop /* 7E39FC 80282B7C C6200048 */ lwc1 $f0, 0x48($s1) /* 7E3A00 80282B80 46000021 */ cvt.d.s $f0, $f0 /* 7E3A04 80282B84 46220001 */ sub.d $f0, $f0, $f2 @@ -181,12 +181,12 @@ glabel func_802828DC /* 7E3A18 80282B98 C64200A4 */ lwc1 $f2, 0xa4($s2) /* 7E3A1C 80282B9C 468010A0 */ cvt.s.w $f2, $f2 /* 7E3A20 80282BA0 46001082 */ mul.s $f2, $f2, $f0 -/* 7E3A24 80282BA4 00000000 */ nop +/* 7E3A24 80282BA4 00000000 */ nop /* 7E3A28 80282BA8 46181082 */ mul.s $f2, $f2, $f24 -/* 7E3A2C 80282BAC 00000000 */ nop +/* 7E3A2C 80282BAC 00000000 */ nop /* 7E3A30 80282BB0 460010A1 */ cvt.d.s $f2, $f2 /* 7E3A34 80282BB4 46341082 */ mul.d $f2, $f2, $f20 -/* 7E3A38 80282BB8 00000000 */ nop +/* 7E3A38 80282BB8 00000000 */ nop /* 7E3A3C 80282BBC C6200050 */ lwc1 $f0, 0x50($s1) /* 7E3A40 80282BC0 46000021 */ cvt.d.s $f0, $f0 /* 7E3A44 80282BC4 46220001 */ sub.d $f0, $f0, $f2 @@ -195,7 +195,7 @@ glabel func_802828DC /* 7E3A50 80282BD0 E6200050 */ swc1 $f0, 0x50($s1) .L80282BD4: /* 7E3A54 80282BD4 44800000 */ mtc1 $zero, $f0 -/* 7E3A58 80282BD8 00000000 */ nop +/* 7E3A58 80282BD8 00000000 */ nop /* 7E3A5C 80282BDC E6200060 */ swc1 $f0, 0x60($s1) /* 7E3A60 80282BE0 E6200068 */ swc1 $f0, 0x68($s1) .L80282BE4: diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80282C40.s b/asm/nonmatchings/world/script_api/7E3700/func_80282C40.s index 4dffae6e7f..e907d6a3e8 100644 --- a/asm/nonmatchings/world/script_api/7E3700/func_80282C40.s +++ b/asm/nonmatchings/world/script_api/7E3700/func_80282C40.s @@ -44,9 +44,9 @@ glabel func_80282C40 /* 7E3B5C 80282CDC E6680074 */ swc1 $f8, 0x74($s3) /* 7E3B60 80282CE0 3C0140C0 */ lui $at, 0x40c0 /* 7E3B64 80282CE4 44810000 */ mtc1 $at, $f0 -/* 7E3B68 80282CE8 00000000 */ nop +/* 7E3B68 80282CE8 00000000 */ nop /* 7E3B6C 80282CEC 4600103E */ c.le.s $f2, $f0 -/* 7E3B70 80282CF0 00000000 */ nop +/* 7E3B70 80282CF0 00000000 */ nop /* 7E3B74 80282CF4 45010047 */ bc1t .L80282E14 /* 7E3B78 80282CF8 24020002 */ addiu $v0, $zero, 2 .L80282CFC: @@ -71,7 +71,7 @@ glabel func_80282C40 /* 7E3BC4 80282D44 46041083 */ div.s $f2, $f2, $f4 /* 7E3BC8 80282D48 4600120D */ trunc.w.s $f8, $f2 /* 7E3BCC 80282D4C 44034000 */ mfc1 $v1, $f8 -/* 7E3BD0 80282D50 00000000 */ nop +/* 7E3BD0 80282D50 00000000 */ nop /* 7E3BD4 80282D54 00620018 */ mult $v1, $v0 /* 7E3BD8 80282D58 24020001 */ addiu $v0, $zero, 1 /* 7E3BDC 80282D5C 8E430000 */ lw $v1, ($s2) @@ -86,7 +86,7 @@ glabel func_80282C40 /* 7E3BFC 80282D7C 00220821 */ addu $at, $at, $v0 /* 7E3C00 80282D80 C4225640 */ lwc1 $f2, %lo(D_80285640)($at) /* 7E3C04 80282D84 46061082 */ mul.s $f2, $f2, $f6 -/* 7E3C08 80282D88 00000000 */ nop +/* 7E3C08 80282D88 00000000 */ nop /* 7E3C0C 80282D8C C6600084 */ lwc1 $f0, 0x84($s3) /* 7E3C10 80282D90 46800020 */ cvt.s.w $f0, $f0 /* 7E3C14 80282D94 46020001 */ sub.s $f0, $f0, $f2 @@ -108,7 +108,7 @@ glabel func_80282C40 /* 7E3C54 80282DD4 46061083 */ div.s $f2, $f2, $f6 /* 7E3C58 80282DD8 4600120D */ trunc.w.s $f8, $f2 /* 7E3C5C 80282DDC 44034000 */ mfc1 $v1, $f8 -/* 7E3C60 80282DE0 00000000 */ nop +/* 7E3C60 80282DE0 00000000 */ nop /* 7E3C64 80282DE4 00620018 */ mult $v1, $v0 /* 7E3C68 80282DE8 24020001 */ addiu $v0, $zero, 1 /* 7E3C6C 80282DEC 8E430000 */ lw $v1, ($s2) diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80282E30.s b/asm/nonmatchings/world/script_api/7E3700/func_80282E30.s index c76b40eceb..63f2989a66 100644 --- a/asm/nonmatchings/world/script_api/7E3700/func_80282E30.s +++ b/asm/nonmatchings/world/script_api/7E3700/func_80282E30.s @@ -38,8 +38,8 @@ glabel func_80282E30 /* 7E3D2C 80282EAC 34A5851F */ ori $a1, $a1, 0x851f /* 7E3D30 80282EB0 00850018 */ mult $a0, $a1 /* 7E3D34 80282EB4 00001810 */ mfhi $v1 -/* 7E3D38 80282EB8 00000000 */ nop -/* 7E3D3C 80282EBC 00000000 */ nop +/* 7E3D38 80282EB8 00000000 */ nop +/* 7E3D3C 80282EBC 00000000 */ nop /* 7E3D40 80282EC0 01250018 */ mult $t1, $a1 /* 7E3D44 80282EC4 000417C3 */ sra $v0, $a0, 0x1f /* 7E3D48 80282EC8 00003010 */ mfhi $a2 @@ -78,7 +78,7 @@ glabel func_80282E30 /* 7E3DCC 80282F4C C5400048 */ lwc1 $f0, 0x48($t2) /* 7E3DD0 80282F50 4600010D */ trunc.w.s $f4, $f0 /* 7E3DD4 80282F54 44042000 */ mfc1 $a0, $f4 -/* 7E3DD8 80282F58 00000000 */ nop +/* 7E3DD8 80282F58 00000000 */ nop /* 7E3DDC 80282F5C AE040090 */ sw $a0, 0x90($s0) /* 7E3DE0 80282F60 C540004C */ lwc1 $f0, 0x4c($t2) /* 7E3DE4 80282F64 4600010D */ trunc.w.s $f4, $f0 @@ -86,7 +86,7 @@ glabel func_80282E30 /* 7E3DEC 80282F6C C5400050 */ lwc1 $f0, 0x50($t2) /* 7E3DF0 80282F70 4600010D */ trunc.w.s $f4, $f0 /* 7E3DF4 80282F74 44032000 */ mfc1 $v1, $f4 -/* 7E3DF8 80282F78 00000000 */ nop +/* 7E3DF8 80282F78 00000000 */ nop /* 7E3DFC 80282F7C AE030098 */ sw $v1, 0x98($s0) /* 7E3E00 80282F80 8E220008 */ lw $v0, 8($s1) /* 7E3E04 80282F84 00822023 */ subu $a0, $a0, $v0 diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283080.s b/asm/nonmatchings/world/script_api/7E3700/func_80283080.s index f3ad6ab99a..139a467fb1 100644 --- a/asm/nonmatchings/world/script_api/7E3700/func_80283080.s +++ b/asm/nonmatchings/world/script_api/7E3700/func_80283080.s @@ -16,7 +16,7 @@ glabel func_80283080 /* 7E3F2C 802830AC 8E240010 */ lw $a0, 0x10($s1) /* 7E3F30 802830B0 4600008D */ trunc.w.s $f2, $f0 /* 7E3F34 802830B4 44031000 */ mfc1 $v1, $f2 -/* 7E3F38 802830B8 00000000 */ nop +/* 7E3F38 802830B8 00000000 */ nop /* 7E3F3C 802830BC 00641823 */ subu $v1, $v1, $a0 /* 7E3F40 802830C0 00650018 */ mult $v1, $a1 /* 7E3F44 802830C4 C4400048 */ lwc1 $f0, 0x48($v0) @@ -24,7 +24,7 @@ glabel func_80283080 /* 7E3F4C 802830CC 00003810 */ mfhi $a3 /* 7E3F50 802830D0 4600008D */ trunc.w.s $f2, $f0 /* 7E3F54 802830D4 44061000 */ mfc1 $a2, $f2 -/* 7E3F58 802830D8 00000000 */ nop +/* 7E3F58 802830D8 00000000 */ nop /* 7E3F5C 802830DC 00C23023 */ subu $a2, $a2, $v0 /* 7E3F60 802830E0 00C50018 */ mult $a2, $a1 /* 7E3F64 802830E4 00031FC3 */ sra $v1, $v1, 0x1f diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283174.s b/asm/nonmatchings/world/script_api/7E3700/func_80283174.s index 9ba84c5043..fe43427d4c 100644 --- a/asm/nonmatchings/world/script_api/7E3700/func_80283174.s +++ b/asm/nonmatchings/world/script_api/7E3700/func_80283174.s @@ -30,4 +30,4 @@ glabel func_80283174 /* 7E4050 802831D0 24020002 */ addiu $v0, $zero, 2 .L802831D4: /* 7E4054 802831D4 03E00008 */ jr $ra -/* 7E4058 802831D8 00000000 */ nop +/* 7E4058 802831D8 00000000 */ nop diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283240.s b/asm/nonmatchings/world/script_api/7E3700/func_80283240.s index 9ed41dd265..5eba70cf38 100644 --- a/asm/nonmatchings/world/script_api/7E3700/func_80283240.s +++ b/asm/nonmatchings/world/script_api/7E3700/func_80283240.s @@ -31,7 +31,7 @@ glabel func_80283240 /* 7E4120 802832A0 2A020080 */ slti $v0, $s0, 0x80 .L802832A4: /* 7E4124 802832A4 1440FFF5 */ bnez $v0, .L8028327C -/* 7E4128 802832A8 00000000 */ nop +/* 7E4128 802832A8 00000000 */ nop .L802832AC: /* 7E412C 802832AC 0260202D */ daddu $a0, $s3, $zero /* 7E4130 802832B0 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283A50.s b/asm/nonmatchings/world/script_api/7E3700/func_80283A50.s index 6fbf4c9b88..aef985ad16 100644 --- a/asm/nonmatchings/world/script_api/7E3700/func_80283A50.s +++ b/asm/nonmatchings/world/script_api/7E3700/func_80283A50.s @@ -36,11 +36,11 @@ glabel func_80283A50 /* 7E494C 80283ACC C4400004 */ lwc1 $f0, 4($v0) /* 7E4950 80283AD0 4600018D */ trunc.w.s $f6, $f0 /* 7E4954 80283AD4 44023000 */ mfc1 $v0, $f6 -/* 7E4958 80283AD8 00000000 */ nop +/* 7E4958 80283AD8 00000000 */ nop /* 7E495C 80283ADC AE42008C */ sw $v0, 0x8c($s2) /* 7E4960 80283AE0 2442FFD8 */ addiu $v0, $v0, -0x28 /* 7E4964 80283AE4 44820000 */ mtc1 $v0, $f0 -/* 7E4968 80283AE8 00000000 */ nop +/* 7E4968 80283AE8 00000000 */ nop /* 7E496C 80283AEC 46800020 */ cvt.s.w $f0, $f0 /* 7E4970 80283AF0 8E220000 */ lw $v0, ($s1) /* 7E4974 80283AF4 3C030400 */ lui $v1, 0x400 @@ -51,13 +51,13 @@ glabel func_80283A50 /* 7E4984 80283B04 C622002C */ lwc1 $f2, 0x2c($s1) /* 7E4988 80283B08 3C013F80 */ lui $at, 0x3f80 /* 7E498C 80283B0C 44810000 */ mtc1 $at, $f0 -/* 7E4990 80283B10 00000000 */ nop +/* 7E4990 80283B10 00000000 */ nop /* 7E4994 80283B14 46001080 */ add.s $f2, $f2, $f0 /* 7E4998 80283B18 E622002C */ swc1 $f2, 0x2c($s1) /* 7E499C 80283B1C C640008C */ lwc1 $f0, 0x8c($s2) /* 7E49A0 80283B20 46800020 */ cvt.s.w $f0, $f0 /* 7E49A4 80283B24 4600103C */ c.lt.s $f2, $f0 -/* 7E49A8 80283B28 00000000 */ nop +/* 7E49A8 80283B28 00000000 */ nop /* 7E49AC 80283B2C 45010007 */ bc1t .L80283B4C /* 7E49B0 80283B30 3C03FBFF */ lui $v1, 0xfbff /* 7E49B4 80283B34 3463FFFF */ ori $v1, $v1, 0xffff diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283D6C.s b/asm/nonmatchings/world/script_api/7E3700/func_80283D6C.s index 13505495ba..a6bd5f5ceb 100644 --- a/asm/nonmatchings/world/script_api/7E3700/func_80283D6C.s +++ b/asm/nonmatchings/world/script_api/7E3700/func_80283D6C.s @@ -5,7 +5,7 @@ glabel func_80283D6C /* 7E4BEC 80283D6C 0080282D */ daddu $a1, $a0, $zero /* 7E4BF0 80283D70 8CA20090 */ lw $v0, 0x90($a1) /* 7E4BF4 80283D74 0440000C */ bltz $v0, .L80283DA8 -/* 7E4BF8 80283D78 00000000 */ nop +/* 7E4BF8 80283D78 00000000 */ nop /* 7E4BFC 80283D7C 8CA2008C */ lw $v0, 0x8c($a1) /* 7E4C00 80283D80 3C03802E */ lui $v1, %hi(D_802DBD28) /* 7E4C04 80283D84 2463BD28 */ addiu $v1, $v1, %lo(D_802DBD28) diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283E2C.s b/asm/nonmatchings/world/script_api/7E3700/func_80283E2C.s index 86f1fe08fd..112a117c58 100644 --- a/asm/nonmatchings/world/script_api/7E3700/func_80283E2C.s +++ b/asm/nonmatchings/world/script_api/7E3700/func_80283E2C.s @@ -21,5 +21,5 @@ glabel func_80283E2C /* 7E4CEC 80283E6C 24020002 */ addiu $v0, $zero, 2 /* 7E4CF0 80283E70 03E00008 */ jr $ra /* 7E4CF4 80283E74 AC85008C */ sw $a1, 0x8c($a0) -/* 7E4CF8 80283E78 00000000 */ nop -/* 7E4CFC 80283E7C 00000000 */ nop +/* 7E4CF8 80283E78 00000000 */ nop +/* 7E4CFC 80283E7C 00000000 */ nop diff --git a/asm/nonmatchings/world/world/func_80058DD0.s b/asm/nonmatchings/world/world/func_80058DD0.s index aeabcebb6e..f648c4a19f 100644 --- a/asm/nonmatchings/world/world/func_80058DD0.s +++ b/asm/nonmatchings/world/world/func_80058DD0.s @@ -23,10 +23,10 @@ glabel func_80058DD0 /* 34214 80058E14 44811800 */ mtc1 $at, $f3 /* 34218 80058E18 44801000 */ mtc1 $zero, $f2 /* 3421C 80058E1C 44820000 */ mtc1 $v0, $f0 -/* 34220 80058E20 00000000 */ nop +/* 34220 80058E20 00000000 */ nop /* 34224 80058E24 46800021 */ cvt.d.w $f0, $f0 /* 34228 80058E28 46220082 */ mul.d $f2, $f0, $f2 -/* 3422C 80058E2C 00000000 */ nop +/* 3422C 80058E2C 00000000 */ nop /* 34230 80058E30 24050009 */ addiu $a1, $zero, 9 /* 34234 80058E34 3C0140D0 */ lui $at, 0x40d0 /* 34238 80058E38 44813800 */ mtc1 $at, $f7 @@ -36,16 +36,16 @@ glabel func_80058DD0 /* 34248 80058E48 46201106 */ mov.d $f4, $f2 .L80058E4C: /* 3424C 80058E4C 46241082 */ mul.d $f2, $f2, $f4 -/* 34250 80058E50 00000000 */ nop +/* 34250 80058E50 00000000 */ nop /* 34254 80058E54 46261002 */ mul.d $f0, $f2, $f6 -/* 34258 80058E58 00000000 */ nop +/* 34258 80058E58 00000000 */ nop /* 3425C 80058E5C 24A50001 */ addiu $a1, $a1, 1 /* 34260 80058E60 4620020D */ trunc.w.d $f8, $f0 /* 34264 80058E64 44024000 */ mfc1 $v0, $f8 -/* 34268 80058E68 00000000 */ nop +/* 34268 80058E68 00000000 */ nop /* 3426C 80058E6C A4620008 */ sh $v0, 8($v1) /* 34270 80058E70 28A20010 */ slti $v0, $a1, 0x10 /* 34274 80058E74 1440FFF5 */ bnez $v0, .L80058E4C /* 34278 80058E78 24630002 */ addiu $v1, $v1, 2 /* 3427C 80058E7C 03E00008 */ jr $ra -/* 34280 80058E80 00000000 */ nop +/* 34280 80058E80 00000000 */ nop diff --git a/asm/nonmatchings/world/world/func_80059008.s b/asm/nonmatchings/world/world/func_80059008.s index b4094302e5..5513348ef0 100644 --- a/asm/nonmatchings/world/world/func_80059008.s +++ b/asm/nonmatchings/world/world/func_80059008.s @@ -14,7 +14,7 @@ glabel func_80059008 /* 3442C 8005902C 0C016374 */ jal func_80058DD0 /* 34430 80059030 8C84000C */ lw $a0, 0xc($a0) /* 34434 80059034 08016410 */ j .L80059040 -/* 34438 80059038 00000000 */ nop +/* 34438 80059038 00000000 */ nop .L8005903C: /* 3443C 8005903C AC80000C */ sw $zero, 0xc($a0) .L80059040: diff --git a/asm/nonmatchings/world/world/func_8005904C.s b/asm/nonmatchings/world/world/func_8005904C.s index fb8d8578e8..6516b9461e 100644 --- a/asm/nonmatchings/world/world/func_8005904C.s +++ b/asm/nonmatchings/world/world/func_8005904C.s @@ -15,35 +15,44 @@ glabel func_8005904C /* 34474 80059074 8E660000 */ lw $a2, ($s3) /* 34478 80059078 10400021 */ beqz $v0, .L80059100 /* 3447C 8005907C 00051080 */ sll $v0, $a1, 2 -/* 34480 80059080 3C01800A */ lui $at, %hi(D_80098940) +/* 34480 80059080 3C01800A */ lui $at, %hi(jtbl_80098940_73D40) /* 34484 80059084 00220821 */ addu $at, $at, $v0 -/* 34488 80059088 8C228940 */ lw $v0, %lo(D_80098940)($at) +/* 34488 80059088 8C228940 */ lw $v0, %lo(jtbl_80098940_73D40)($at) /* 3448C 8005908C 00400008 */ jr $v0 -/* 34490 80059090 00000000 */ nop +/* 34490 80059090 00000000 */ nop +glabel L80059094_34494 /* 34494 80059094 3C048008 */ lui $a0, %hi(D_8007EFE0) /* 34498 80059098 08016442 */ j .L80059108 /* 3449C 8005909C 2484EFE0 */ addiu $a0, $a0, %lo(D_8007EFE0) +glabel L800590A0_344A0 /* 344A0 800590A0 3C048008 */ lui $a0, %hi(D_8007F158) /* 344A4 800590A4 08016442 */ j .L80059108 /* 344A8 800590A8 2484F158 */ addiu $a0, $a0, %lo(D_8007F158) +glabel L800590AC_344AC /* 344AC 800590AC 3C048008 */ lui $a0, %hi(D_8007F180) /* 344B0 800590B0 08016442 */ j .L80059108 /* 344B4 800590B4 2484F180 */ addiu $a0, $a0, %lo(D_8007F180) +glabel L800590B8_344B8 /* 344B8 800590B8 3C048008 */ lui $a0, %hi(D_8007F1A8) /* 344BC 800590BC 08016442 */ j .L80059108 /* 344C0 800590C0 2484F1A8 */ addiu $a0, $a0, %lo(D_8007F1A8) +glabel L800590C4_344C4 /* 344C4 800590C4 3C048008 */ lui $a0, %hi(D_8007F1F8) /* 344C8 800590C8 08016442 */ j .L80059108 /* 344CC 800590CC 8C84F1F8 */ lw $a0, %lo(D_8007F1F8)($a0) +glabel L800590D0_344D0 /* 344D0 800590D0 3C048008 */ lui $a0, %hi(D_8007F1FC) /* 344D4 800590D4 08016442 */ j .L80059108 /* 344D8 800590D8 8C84F1FC */ lw $a0, %lo(D_8007F1FC)($a0) +glabel L800590DC_344DC /* 344DC 800590DC 3C048008 */ lui $a0, %hi(D_8007F200) /* 344E0 800590E0 08016442 */ j .L80059108 /* 344E4 800590E4 8C84F200 */ lw $a0, %lo(D_8007F200)($a0) +glabel L800590E8_344E8 /* 344E8 800590E8 3C048008 */ lui $a0, %hi(D_8007F204) /* 344EC 800590EC 08016442 */ j .L80059108 /* 344F0 800590F0 8C84F204 */ lw $a0, %lo(D_8007F204)($a0) +glabel L800590F4_344F4 /* 344F4 800590F4 3C048008 */ lui $a0, %hi(D_8007F048) /* 344F8 800590F8 08016442 */ j .L80059108 /* 344FC 800590FC 2484F048 */ addiu $a0, $a0, %lo(D_8007F048) @@ -108,7 +117,7 @@ glabel func_8005904C /* 345D8 800591D8 AC800028 */ sw $zero, 0x28($a0) /* 345DC 800591DC 26100004 */ addiu $s0, $s0, 4 /* 345E0 800591E0 44820000 */ mtc1 $v0, $f0 -/* 345E4 800591E4 00000000 */ nop +/* 345E4 800591E4 00000000 */ nop /* 345E8 800591E8 46800020 */ cvt.s.w $f0, $f0 /* 345EC 800591EC 3C01447A */ lui $at, 0x447a /* 345F0 800591F0 44811000 */ mtc1 $at, $f2 @@ -121,7 +130,7 @@ glabel func_8005904C /* 3460C 8005920C 3C028008 */ lui $v0, %hi(D_80078E50) /* 34610 80059210 8C428E50 */ lw $v0, %lo(D_80078E50)($v0) /* 34614 80059214 44832000 */ mtc1 $v1, $f4 -/* 34618 80059218 00000000 */ nop +/* 34618 80059218 00000000 */ nop /* 3461C 8005921C 46802121 */ cvt.d.w $f4, $f4 /* 34620 80059220 C4420008 */ lwc1 $f2, 8($v0) /* 34624 80059224 468010A1 */ cvt.d.w $f2, $f2 @@ -139,11 +148,11 @@ glabel func_8005904C /* 34654 80059254 3C0141F0 */ lui $at, 0x41f0 /* 34658 80059258 44810800 */ mtc1 $at, $f1 /* 3465C 8005925C 44800000 */ mtc1 $zero, $f0 -/* 34660 80059260 00000000 */ nop +/* 34660 80059260 00000000 */ nop /* 34664 80059264 46202100 */ add.d $f4, $f4, $f0 .L80059268: /* 34668 80059268 46241002 */ mul.d $f0, $f2, $f4 -/* 3466C 8005926C 00000000 */ nop +/* 3466C 8005926C 00000000 */ nop /* 34670 80059270 3C013F80 */ lui $at, 0x3f80 /* 34674 80059274 44811000 */ mtc1 $at, $f2 /* 34678 80059278 8C82002C */ lw $v0, 0x2c($a0) @@ -180,7 +189,7 @@ glabel func_8005904C /* 346E4 800592E4 26310001 */ addiu $s1, $s1, 1 /* 346E8 800592E8 0222102A */ slt $v0, $s1, $v0 /* 346EC 800592EC 1440FF9D */ bnez $v0, .L80059164 -/* 346F0 800592F0 00000000 */ nop +/* 346F0 800592F0 00000000 */ nop .L800592F4: /* 346F4 800592F4 8FBF0020 */ lw $ra, 0x20($sp) /* 346F8 800592F8 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/world/world/func_80059310.s b/asm/nonmatchings/world/world/func_80059310.s index c21b3f1924..f7a1cacf0c 100644 --- a/asm/nonmatchings/world/world/func_80059310.s +++ b/asm/nonmatchings/world/world/func_80059310.s @@ -70,7 +70,7 @@ glabel func_80059310 /* 34810 80059410 0082B823 */ subu $s7, $a0, $v0 /* 34814 80059414 02E3102B */ sltu $v0, $s7, $v1 /* 34818 80059418 10400004 */ beqz $v0, .L8005942C -/* 3481C 8005941C 00000000 */ nop +/* 3481C 8005941C 00000000 */ nop /* 34820 80059420 8D020008 */ lw $v0, 8($t0) /* 34824 80059424 00021040 */ sll $v0, $v0, 1 /* 34828 80059428 02E2B821 */ addu $s7, $s7, $v0 @@ -80,7 +80,7 @@ glabel func_80059310 /* 34834 80059434 0082F023 */ subu $fp, $a0, $v0 /* 34838 80059438 03C3102B */ sltu $v0, $fp, $v1 /* 3483C 8005943C 10400005 */ beqz $v0, .L80059454 -/* 34840 80059440 00000000 */ nop +/* 34840 80059440 00000000 */ nop /* 34844 80059444 8FA80068 */ lw $t0, 0x68($sp) /* 34848 80059448 8D020008 */ lw $v0, 8($t0) /* 3484C 8005944C 00021040 */ sll $v0, $v0, 1 @@ -112,20 +112,20 @@ glabel func_80059310 /* 348A8 800594A8 0C0166F5 */ jal func_80059BD4 /* 348AC 800594AC 02028023 */ subu $s0, $s0, $v0 /* 348B0 800594B0 44901000 */ mtc1 $s0, $f2 -/* 348B4 800594B4 00000000 */ nop +/* 348B4 800594B4 00000000 */ nop /* 348B8 800594B8 468010A0 */ cvt.s.w $f2, $f2 /* 348BC 800594BC 46020103 */ div.s $f4, $f0, $f2 /* 348C0 800594C0 46162002 */ mul.s $f0, $f4, $f22 -/* 348C4 800594C4 00000000 */ nop +/* 348C4 800594C4 00000000 */ nop /* 348C8 800594C8 4600018D */ trunc.w.s $f6, $f0 /* 348CC 800594CC 44023000 */ mfc1 $v0, $f6 /* 348D0 800594D0 3C013800 */ lui $at, 0x3800 /* 348D4 800594D4 44810000 */ mtc1 $at, $f0 /* 348D8 800594D8 44822000 */ mtc1 $v0, $f4 -/* 348DC 800594DC 00000000 */ nop +/* 348DC 800594DC 00000000 */ nop /* 348E0 800594E0 46802120 */ cvt.s.w $f4, $f4 /* 348E4 800594E4 46002102 */ mul.s $f4, $f4, $f0 -/* 348E8 800594E8 00000000 */ nop +/* 348E8 800594E8 00000000 */ nop /* 348EC 800594EC 3C013FF0 */ lui $at, 0x3ff0 /* 348F0 800594F0 44811800 */ mtc1 $at, $f3 /* 348F4 800594F4 44801000 */ mtc1 $zero, $f2 @@ -135,15 +135,15 @@ glabel func_80059310 /* 34904 80059504 44812000 */ mtc1 $at, $f4 /* 34908 80059508 46201520 */ cvt.s.d $f20, $f2 /* 3490C 8005950C 4604A102 */ mul.s $f4, $f20, $f4 -/* 34910 80059510 00000000 */ nop +/* 34910 80059510 00000000 */ nop /* 34914 80059514 8E620028 */ lw $v0, 0x28($s3) /* 34918 80059518 C4400008 */ lwc1 $f0, 8($v0) /* 3491C 8005951C 46040000 */ add.s $f0, $f0, $f4 /* 34920 80059520 4600018D */ trunc.w.s $f6, $f0 /* 34924 80059524 44143000 */ mfc1 $s4, $f6 -/* 34928 80059528 00000000 */ nop +/* 34928 80059528 00000000 */ nop /* 3492C 8005952C 44941000 */ mtc1 $s4, $f2 -/* 34930 80059530 00000000 */ nop +/* 34930 80059530 00000000 */ nop /* 34934 80059534 468010A0 */ cvt.s.w $f2, $f2 /* 34938 80059538 46020001 */ sub.s $f0, $f0, $f2 /* 3493C 8005953C E4400008 */ swc1 $f0, 8($v0) @@ -161,7 +161,7 @@ glabel func_80059310 /* 3496C 8005956C 00B52823 */ subu $a1, $a1, $s5 /* 34970 80059570 00A2102B */ sltu $v0, $a1, $v0 /* 34974 80059574 10400004 */ beqz $v0, .L80059588 -/* 34978 80059578 00000000 */ nop +/* 34978 80059578 00000000 */ nop /* 3497C 8005957C 8D020008 */ lw $v0, 8($t0) /* 34980 80059580 00021040 */ sll $v0, $v0, 1 /* 34984 80059584 00A22821 */ addu $a1, $a1, $v0 @@ -173,7 +173,7 @@ glabel func_80059310 /* 34998 80059598 AFB20010 */ sw $s2, 0x10($sp) /* 3499C 8005959C 0040902D */ daddu $s2, $v0, $zero /* 349A0 800595A0 4616A002 */ mul.s $f0, $f20, $f22 -/* 349A4 800595A4 00000000 */ nop +/* 349A4 800595A4 00000000 */ nop /* 349A8 800595A8 00168C00 */ sll $s1, $s6, 0x10 /* 349AC 800595AC 8E630028 */ lw $v1, 0x28($s3) /* 349B0 800595B0 8C640000 */ lw $a0, ($v1) @@ -344,7 +344,7 @@ glabel func_80059310 /* 34C28 80059828 00031C03 */ sra $v1, $v1, 0x10 /* 34C2C 8005982C 0062182A */ slt $v1, $v1, $v0 /* 34C30 80059830 1460FEEA */ bnez $v1, .L800593DC -/* 34C34 80059834 00000000 */ nop +/* 34C34 80059834 00000000 */ nop .L80059838: /* 34C38 80059838 8FA80068 */ lw $t0, 0x68($sp) /* 34C3C 8005983C 8D030004 */ lw $v1, 4($t0) diff --git a/asm/nonmatchings/world/world/func_800598A0.s b/asm/nonmatchings/world/world/func_800598A0.s index 6707f16fc2..b279678bc8 100644 --- a/asm/nonmatchings/world/world/func_800598A0.s +++ b/asm/nonmatchings/world/world/func_800598A0.s @@ -9,11 +9,12 @@ glabel func_800598A0 /* 34CB0 800598B0 1040007D */ beqz $v0, .L80059AA8 /* 34CB4 800598B4 AFBF0010 */ sw $ra, 0x10($sp) /* 34CB8 800598B8 00061080 */ sll $v0, $a2, 2 -/* 34CBC 800598BC 3C01800A */ lui $at, %hi(D_80098970) +/* 34CBC 800598BC 3C01800A */ lui $at, %hi(jtbl_80098970_73D70) /* 34CC0 800598C0 00220821 */ addu $at, $at, $v0 -/* 34CC4 800598C4 8C228970 */ lw $v0, %lo(D_80098970)($at) +/* 34CC4 800598C4 8C228970 */ lw $v0, %lo(jtbl_80098970_73D70)($at) /* 34CC8 800598C8 00400008 */ jr $v0 -/* 34CCC 800598CC 00000000 */ nop +/* 34CCC 800598CC 00000000 */ nop +glabel L800598D0_34CD0 /* 34CD0 800598D0 00051400 */ sll $v0, $a1, 0x10 /* 34CD4 800598D4 00021403 */ sra $v0, $v0, 0x10 /* 34CD8 800598D8 00021840 */ sll $v1, $v0, 1 @@ -25,6 +26,7 @@ glabel func_800598A0 /* 34CF0 800598F0 00E21024 */ and $v0, $a3, $v0 /* 34CF4 800598F4 080166AA */ j .L80059AA8 /* 34CF8 800598F8 AC620000 */ sw $v0, ($v1) +glabel L800598FC_34CFC /* 34CFC 800598FC 00051400 */ sll $v0, $a1, 0x10 /* 34D00 80059900 00021403 */ sra $v0, $v0, 0x10 /* 34D04 80059904 00021840 */ sll $v1, $v0, 1 @@ -36,6 +38,7 @@ glabel func_800598A0 /* 34D1C 8005991C 00E21024 */ and $v0, $a3, $v0 /* 34D20 80059920 080166AA */ j .L80059AA8 /* 34D24 80059924 AC620004 */ sw $v0, 4($v1) +glabel L80059928_34D28 /* 34D28 80059928 00051400 */ sll $v0, $a1, 0x10 /* 34D2C 8005992C 00021403 */ sra $v0, $v0, 0x10 /* 34D30 80059930 00021840 */ sll $v1, $v0, 1 @@ -45,6 +48,7 @@ glabel func_800598A0 /* 34D40 80059940 00621821 */ addu $v1, $v1, $v0 /* 34D44 80059944 080166AA */ j .L80059AA8 /* 34D48 80059948 A4670008 */ sh $a3, 8($v1) +glabel L8005994C_34D4C /* 34D4C 8005994C 00051400 */ sll $v0, $a1, 0x10 /* 34D50 80059950 00021403 */ sra $v0, $v0, 0x10 /* 34D54 80059954 00021840 */ sll $v1, $v0, 1 @@ -54,6 +58,7 @@ glabel func_800598A0 /* 34D64 80059964 00621821 */ addu $v1, $v1, $v0 /* 34D68 80059968 080166AA */ j .L80059AA8 /* 34D6C 8005996C A467000A */ sh $a3, 0xa($v1) +glabel L80059970_34D70 /* 34D70 80059970 00051400 */ sll $v0, $a1, 0x10 /* 34D74 80059974 00021403 */ sra $v0, $v0, 0x10 /* 34D78 80059978 00021840 */ sll $v1, $v0, 1 @@ -63,13 +68,14 @@ glabel func_800598A0 /* 34D88 80059988 00621821 */ addu $v1, $v1, $v0 /* 34D8C 8005998C 080166AA */ j .L80059AA8 /* 34D90 80059990 A467000C */ sh $a3, 0xc($v1) +glabel L80059994_34D94 /* 34D94 80059994 00051400 */ sll $v0, $a1, 0x10 /* 34D98 80059998 00021403 */ sra $v0, $v0, 0x10 /* 34D9C 8005999C 00021840 */ sll $v1, $v0, 1 /* 34DA0 800599A0 00621821 */ addu $v1, $v1, $v0 /* 34DA4 800599A4 00031900 */ sll $v1, $v1, 4 /* 34DA8 800599A8 44870000 */ mtc1 $a3, $f0 -/* 34DAC 800599AC 00000000 */ nop +/* 34DAC 800599AC 00000000 */ nop /* 34DB0 800599B0 46800020 */ cvt.s.w $f0, $f0 /* 34DB4 800599B4 3C01447A */ lui $at, 0x447a /* 34DB8 800599B8 44811000 */ mtc1 $at, $f2 @@ -86,13 +92,14 @@ glabel func_800598A0 /* 34DE4 800599E4 46200020 */ cvt.s.d $f0, $f0 /* 34DE8 800599E8 080166AA */ j .L80059AA8 /* 34DEC 800599EC E4600010 */ swc1 $f0, 0x10($v1) +glabel L800599F0_34DF0 /* 34DF0 800599F0 00051400 */ sll $v0, $a1, 0x10 /* 34DF4 800599F4 00021403 */ sra $v0, $v0, 0x10 /* 34DF8 800599F8 00021840 */ sll $v1, $v0, 1 /* 34DFC 800599FC 00621821 */ addu $v1, $v1, $v0 /* 34E00 80059A00 00031900 */ sll $v1, $v1, 4 /* 34E04 80059A04 44870000 */ mtc1 $a3, $f0 -/* 34E08 80059A08 00000000 */ nop +/* 34E08 80059A08 00000000 */ nop /* 34E0C 80059A0C 46800020 */ cvt.s.w $f0, $f0 /* 34E10 80059A10 46000021 */ cvt.d.s $f0, $f0 /* 34E14 80059A14 8C82000C */ lw $v0, 0xc($a0) @@ -103,21 +110,22 @@ glabel func_800598A0 /* 34E28 80059A28 8C820000 */ lw $v0, ($a0) /* 34E2C 80059A2C 00621823 */ subu $v1, $v1, $v0 /* 34E30 80059A30 44832000 */ mtc1 $v1, $f4 -/* 34E34 80059A34 00000000 */ nop +/* 34E34 80059A34 00000000 */ nop /* 34E38 80059A38 46802121 */ cvt.d.w $f4, $f4 /* 34E3C 80059A3C 04610006 */ bgez $v1, .L80059A58 /* 34E40 80059A40 46220083 */ div.d $f2, $f0, $f2 /* 34E44 80059A44 3C0141F0 */ lui $at, 0x41f0 /* 34E48 80059A48 44810800 */ mtc1 $at, $f1 /* 34E4C 80059A4C 44800000 */ mtc1 $zero, $f0 -/* 34E50 80059A50 00000000 */ nop +/* 34E50 80059A50 00000000 */ nop /* 34E54 80059A54 46202100 */ add.d $f4, $f4, $f0 .L80059A58: /* 34E58 80059A58 46241002 */ mul.d $f0, $f2, $f4 -/* 34E5C 80059A5C 00000000 */ nop +/* 34E5C 80059A5C 00000000 */ nop /* 34E60 80059A60 46200020 */ cvt.s.d $f0, $f0 /* 34E64 80059A64 080166AA */ j .L80059AA8 /* 34E68 80059A68 E480001C */ swc1 $f0, 0x1c($a0) +glabel L80059A6C_34E6C /* 34E6C 80059A6C 00051400 */ sll $v0, $a1, 0x10 /* 34E70 80059A70 00021403 */ sra $v0, $v0, 0x10 /* 34E74 80059A74 00021840 */ sll $v1, $v0, 1 @@ -127,7 +135,7 @@ glabel func_800598A0 /* 34E84 80059A84 00621021 */ addu $v0, $v1, $v0 /* 34E88 80059A88 8C420020 */ lw $v0, 0x20($v0) /* 34E8C 80059A8C 10400006 */ beqz $v0, .L80059AA8 -/* 34E90 80059A90 00000000 */ nop +/* 34E90 80059A90 00000000 */ nop /* 34E94 80059A94 A4470000 */ sh $a3, ($v0) /* 34E98 80059A98 8C82000C */ lw $v0, 0xc($a0) /* 34E9C 80059A9C 00621021 */ addu $v0, $v1, $v0 diff --git a/asm/nonmatchings/world/world/func_80059AB8.s b/asm/nonmatchings/world/world/func_80059AB8.s index 52a8841a34..9cac4b6bae 100644 --- a/asm/nonmatchings/world/world/func_80059AB8.s +++ b/asm/nonmatchings/world/world/func_80059AB8.s @@ -62,7 +62,7 @@ glabel func_80059AB8 /* 34F98 80059B98 AE420000 */ sw $v0, ($s2) .L80059B9C: /* 34F9C 80059B9C 0C0187A4 */ jal osVirtualToPhysical -/* 34FA0 80059BA0 00000000 */ nop +/* 34FA0 80059BA0 00000000 */ nop /* 34FA4 80059BA4 AE420004 */ sw $v0, 4($s2) /* 34FA8 80059BA8 0280102D */ daddu $v0, $s4, $zero /* 34FAC 80059BAC 8FBF002C */ lw $ra, 0x2c($sp) diff --git a/asm/nonmatchings/world/world/func_80059BD4.s b/asm/nonmatchings/world/world/func_80059BD4.s index b15be47501..7a4c0126ba 100644 --- a/asm/nonmatchings/world/world/func_80059BD4.s +++ b/asm/nonmatchings/world/world/func_80059BD4.s @@ -4,10 +4,10 @@ glabel func_80059BD4 /* 34FD4 80059BD4 C4800010 */ lwc1 $f0, 0x10($a0) /* 34FD8 80059BD8 44851000 */ mtc1 $a1, $f2 -/* 34FDC 80059BDC 00000000 */ nop +/* 34FDC 80059BDC 00000000 */ nop /* 34FE0 80059BE0 468010A0 */ cvt.s.w $f2, $f2 /* 34FE4 80059BE4 46020002 */ mul.s $f0, $f0, $f2 -/* 34FE8 80059BE8 00000000 */ nop +/* 34FE8 80059BE8 00000000 */ nop /* 34FEC 80059BEC C4820014 */ lwc1 $f2, 0x14($a0) /* 34FF0 80059BF0 46001080 */ add.s $f2, $f2, $f0 /* 34FF4 80059BF4 24820014 */ addiu $v0, $a0, 0x14 @@ -16,13 +16,13 @@ glabel func_80059BD4 /* 35000 80059C00 44800000 */ mtc1 $zero, $f0 /* 35004 80059C04 46001121 */ cvt.d.s $f4, $f2 /* 35008 80059C08 4624003C */ c.lt.d $f0, $f4 -/* 3500C 80059C0C 00000000 */ nop +/* 3500C 80059C0C 00000000 */ nop /* 35010 80059C10 45000008 */ bc1f .L80059C34 /* 35014 80059C14 E4820014 */ swc1 $f2, 0x14($a0) /* 35018 80059C18 3C014010 */ lui $at, 0x4010 /* 3501C 80059C1C 44810800 */ mtc1 $at, $f1 /* 35020 80059C20 44800000 */ mtc1 $zero, $f0 -/* 35024 80059C24 00000000 */ nop +/* 35024 80059C24 00000000 */ nop /* 35028 80059C28 46202001 */ sub.d $f0, $f4, $f0 /* 3502C 80059C2C 0801670E */ j .L80059C38 /* 35030 80059C30 46200020 */ cvt.s.d $f0, $f0 @@ -32,9 +32,9 @@ glabel func_80059BD4 /* 35038 80059C38 E4400000 */ swc1 $f0, ($v0) /* 3503C 80059C3C C4820014 */ lwc1 $f2, 0x14($a0) /* 35040 80059C40 44800000 */ mtc1 $zero, $f0 -/* 35044 80059C44 00000000 */ nop +/* 35044 80059C44 00000000 */ nop /* 35048 80059C48 4600103C */ c.lt.s $f2, $f0 -/* 3504C 80059C4C 00000000 */ nop +/* 3504C 80059C4C 00000000 */ nop /* 35050 80059C50 45030001 */ bc1tl .L80059C58 /* 35054 80059C54 46001087 */ neg.s $f2, $f2 .L80059C58: @@ -47,4 +47,4 @@ glabel func_80059BD4 /* 35070 80059C70 462010A0 */ cvt.s.d $f2, $f2 /* 35074 80059C74 46020002 */ mul.s $f0, $f0, $f2 /* 35078 80059C78 03E00008 */ jr $ra -/* 3507C 80059C7C 00000000 */ nop +/* 3507C 80059C7C 00000000 */ nop diff --git a/asm/nonmatchings/world/world/func_80059C9C.s b/asm/nonmatchings/world/world/func_80059C9C.s index a5e062eb01..547edff6b0 100644 --- a/asm/nonmatchings/world/world/func_80059C9C.s +++ b/asm/nonmatchings/world/world/func_80059C9C.s @@ -22,7 +22,7 @@ glabel func_80059C9C /* 350D8 80059CD8 0441FFFD */ bgez $v0, .L80059CD0 /* 350DC 80059CDC 2463FFFC */ addiu $v1, $v1, -4 /* 350E0 80059CE0 0C019A58 */ jal osUnmapTLBAll -/* 350E4 80059CE4 00000000 */ nop +/* 350E4 80059CE4 00000000 */ nop /* 350E8 80059CE8 3C0300FF */ lui $v1, 0xff /* 350EC 80059CEC 3463FFFF */ ori $v1, $v1, 0xffff /* 350F0 80059CF0 24040010 */ addiu $a0, $zero, 0x10 diff --git a/asm/nonmatchings/world/world/func_80059D50.s b/asm/nonmatchings/world/world/func_80059D50.s index d2db04a3b5..7a37758600 100644 --- a/asm/nonmatchings/world/world/func_80059D50.s +++ b/asm/nonmatchings/world/world/func_80059D50.s @@ -23,7 +23,7 @@ glabel func_80059D50 /* 35194 80059D94 26520001 */ addiu $s2, $s2, 1 /* 35198 80059D98 30620002 */ andi $v0, $v1, 2 /* 3519C 80059D9C 14400004 */ bnez $v0, .L80059DB0 -/* 351A0 80059DA0 00000000 */ nop +/* 351A0 80059DA0 00000000 */ nop /* 351A4 80059DA4 34620002 */ ori $v0, $v1, 2 /* 351A8 80059DA8 AE020000 */ sw $v0, ($s0) /* 351AC 80059DAC AE04000C */ sw $a0, 0xc($s0) @@ -51,13 +51,13 @@ glabel func_80059D50 /* 351FC 80059DFC AC620000 */ sw $v0, ($v1) /* 35200 80059E00 80820070 */ lb $v0, 0x70($a0) /* 35204 80059E04 10400007 */ beqz $v0, .L80059E24 -/* 35208 80059E08 00000000 */ nop +/* 35208 80059E08 00000000 */ nop /* 3520C 80059E0C 8E020000 */ lw $v0, ($s0) /* 35210 80059E10 30420004 */ andi $v0, $v0, 4 /* 35214 80059E14 5040000F */ beql $v0, $zero, .L80059E54 /* 35218 80059E18 26520001 */ addiu $s2, $s2, 1 /* 3521C 80059E1C 0801678D */ j .L80059E34 -/* 35220 80059E20 00000000 */ nop +/* 35220 80059E20 00000000 */ nop .L80059E24: /* 35224 80059E24 8E020000 */ lw $v0, ($s0) /* 35228 80059E28 30420004 */ andi $v0, $v0, 4 @@ -98,7 +98,7 @@ glabel func_80059D50 /* 352A4 80059EA4 50800005 */ beql $a0, $zero, .L80059EBC /* 352A8 80059EA8 AE000000 */ sw $zero, ($s0) /* 352AC 80059EAC 0C00AB1E */ jal general_heap_free -/* 352B0 80059EB0 00000000 */ nop +/* 352B0 80059EB0 00000000 */ nop /* 352B4 80059EB4 AE200000 */ sw $zero, ($s1) /* 352B8 80059EB8 AE000000 */ sw $zero, ($s0) .L80059EBC: diff --git a/asm/nonmatchings/world/world/func_8005A2BC.s b/asm/nonmatchings/world/world/func_8005A2BC.s index e56f23037e..99f72c0fe9 100644 --- a/asm/nonmatchings/world/world/func_8005A2BC.s +++ b/asm/nonmatchings/world/world/func_8005A2BC.s @@ -22,10 +22,10 @@ glabel func_8005A2BC /* 356FC 8005A2FC 2A020060 */ slti $v0, $s0, 0x60 .L8005A300: /* 35700 8005A300 14400003 */ bnez $v0, .L8005A310 -/* 35704 8005A304 00000000 */ nop +/* 35704 8005A304 00000000 */ nop .L8005A308: /* 35708 8005A308 080168C2 */ j .L8005A308 -/* 3570C 8005A30C 00000000 */ nop +/* 3570C 8005A30C 00000000 */ nop .L8005A310: /* 35710 8005A310 0C00AB0A */ jal general_heap_malloc /* 35714 8005A314 24040014 */ addiu $a0, $zero, 0x14 @@ -38,7 +38,7 @@ glabel func_8005A2BC /* 35730 8005A330 0000802D */ daddu $s0, $zero, $zero .L8005A334: /* 35734 8005A334 080168CD */ j .L8005A334 -/* 35738 8005A338 00000000 */ nop +/* 35738 8005A338 00000000 */ nop .L8005A33C: /* 3573C 8005A33C 3C04800A */ lui $a0, %hi(D_800A4000) /* 35740 8005A340 24844000 */ addiu $a0, $a0, %lo(D_800A4000) @@ -63,10 +63,10 @@ glabel func_8005A2BC /* 35784 8005A384 2A02000F */ slti $v0, $s0, 0xf .L8005A388: /* 35788 8005A388 14400003 */ bnez $v0, .L8005A398 -/* 3578C 8005A38C 00000000 */ nop +/* 3578C 8005A38C 00000000 */ nop .L8005A390: /* 35790 8005A390 080168E4 */ j .L8005A390 -/* 35794 8005A394 00000000 */ nop +/* 35794 8005A394 00000000 */ nop .L8005A398: /* 35798 8005A398 8C820008 */ lw $v0, 8($a0) /* 3579C 8005A39C 14400016 */ bnez $v0, .L8005A3F8 @@ -100,7 +100,7 @@ glabel func_8005A2BC /* 357FC 8005A3FC AE240010 */ sw $a0, 0x10($s1) /* 35800 8005A400 8E420008 */ lw $v0, 8($s2) /* 35804 8005A404 10400003 */ beqz $v0, .L8005A414 -/* 35808 8005A408 00000000 */ nop +/* 35808 8005A408 00000000 */ nop /* 3580C 8005A40C 0040F809 */ jalr $v0 /* 35810 8005A410 0220202D */ daddu $a0, $s1, $zero .L8005A414: diff --git a/asm/nonmatchings/world/world/get_asset_offset.s b/asm/nonmatchings/world/world/get_asset_offset.s index fcb7cc7f75..0a49a9537c 100644 --- a/asm/nonmatchings/world/world/get_asset_offset.s +++ b/asm/nonmatchings/world/world/get_asset_offset.s @@ -18,7 +18,7 @@ glabel get_asset_offset /* 36204 8005AE04 AFB00030 */ sw $s0, 0x30($sp) /* 36208 8005AE08 8FA40020 */ lw $a0, 0x20($sp) /* 3620C 8005AE0C 0C00AB39 */ jal heap_malloc -/* 36210 8005AE10 00000000 */ nop +/* 36210 8005AE10 00000000 */ nop /* 36214 8005AE14 0040882D */ daddu $s1, $v0, $zero /* 36218 8005AE18 0220802D */ daddu $s0, $s1, $zero /* 3621C 8005AE1C 3C0201E4 */ lui $v0, 0x1e4 @@ -53,6 +53,6 @@ glabel get_asset_offset /* 36288 8005AE88 8FB00030 */ lw $s0, 0x30($sp) /* 3628C 8005AE8C 03E00008 */ jr $ra /* 36290 8005AE90 27BD0048 */ addiu $sp, $sp, 0x48 -/* 36294 8005AE94 00000000 */ nop -/* 36298 8005AE98 00000000 */ nop -/* 3629C 8005AE9C 00000000 */ nop +/* 36294 8005AE94 00000000 */ nop +/* 36298 8005AE98 00000000 */ nop +/* 3629C 8005AE9C 00000000 */ nop diff --git a/asm/nonmatchings/world/world/get_current_map_config.s b/asm/nonmatchings/world/world/get_current_map_config.s index a9bc5fadea..8691583a0d 100644 --- a/asm/nonmatchings/world/world/get_current_map_config.s +++ b/asm/nonmatchings/world/world/get_current_map_config.s @@ -5,4 +5,4 @@ glabel get_current_map_config /* 35FD8 8005ABD8 3C02800A */ lui $v0, %hi(D_800A41E0) /* 35FDC 8005ABDC 8C4241E0 */ lw $v0, %lo(D_800A41E0)($v0) /* 35FE0 8005ABE0 03E00008 */ jr $ra -/* 35FE4 8005ABE4 00000000 */ nop +/* 35FE4 8005ABE4 00000000 */ nop diff --git a/asm/nonmatchings/world/world/get_current_map_header.s b/asm/nonmatchings/world/world/get_current_map_header.s index 3255bbb935..e740c2160a 100644 --- a/asm/nonmatchings/world/world/get_current_map_header.s +++ b/asm/nonmatchings/world/world/get_current_map_header.s @@ -5,4 +5,4 @@ glabel get_current_map_header /* 35FE8 8005ABE8 3C02800A */ lui $v0, %hi(D_800A41E8) /* 35FEC 8005ABEC 244241E8 */ addiu $v0, $v0, %lo(D_800A41E8) /* 35FF0 8005ABF0 03E00008 */ jr $ra -/* 35FF4 8005ABF4 00000000 */ nop +/* 35FF4 8005ABF4 00000000 */ nop diff --git a/asm/nonmatchings/world/world/load_asset_by_name.s b/asm/nonmatchings/world/world/load_asset_by_name.s index 97be367b37..4e64bb52ca 100644 --- a/asm/nonmatchings/world/world/load_asset_by_name.s +++ b/asm/nonmatchings/world/world/load_asset_by_name.s @@ -18,7 +18,7 @@ glabel load_asset_by_name /* 3611C 8005AD1C AFB10034 */ sw $s1, 0x34($sp) /* 36120 8005AD20 8FA40020 */ lw $a0, 0x20($sp) /* 36124 8005AD24 0C00AB39 */ jal heap_malloc -/* 36128 8005AD28 00000000 */ nop +/* 36128 8005AD28 00000000 */ nop /* 3612C 8005AD2C 0040902D */ daddu $s2, $v0, $zero /* 36130 8005AD30 0240882D */ daddu $s1, $s2, $zero /* 36134 8005AD34 3C0201E4 */ lui $v0, 0x1e4 @@ -34,7 +34,7 @@ glabel load_asset_by_name /* 36158 8005AD58 0C01BB5C */ jal strcmp /* 3615C 8005AD5C 0200282D */ daddu $a1, $s0, $zero /* 36160 8005AD60 10400003 */ beqz $v0, .L8005AD70 -/* 36164 8005AD64 00000000 */ nop +/* 36164 8005AD64 00000000 */ nop /* 36168 8005AD68 08016B55 */ j .L8005AD54 /* 3616C 8005AD6C 2631001C */ addiu $s1, $s1, 0x1c .L8005AD70: diff --git a/asm/nonmatchings/world/world/load_map_by_IDs.s b/asm/nonmatchings/world/world/load_map_by_IDs.s index 5f7911e055..e10e93847f 100644 --- a/asm/nonmatchings/world/world/load_map_by_IDs.s +++ b/asm/nonmatchings/world/world/load_map_by_IDs.s @@ -32,24 +32,24 @@ glabel load_map_by_IDs /* 35B60 8005A760 0C047624 */ jal func_8011D890 /* 35B64 8005A764 00108403 */ sra $s0, $s0, 0x10 /* 35B68 8005A768 0C048C2E */ jal clear_dynamic_entity_list -/* 35B6C 8005A76C 00000000 */ nop +/* 35B6C 8005A76C 00000000 */ nop /* 35B70 8005A770 0C0B0C77 */ jal clear_script_list -/* 35B74 8005A774 00000000 */ nop +/* 35B74 8005A774 00000000 */ nop /* 35B78 8005A778 12000005 */ beqz $s0, .L8005A790 /* 35B7C 8005A77C 24020001 */ addiu $v0, $zero, 1 /* 35B80 8005A780 12020008 */ beq $s0, $v0, .L8005A7A4 -/* 35B84 8005A784 00000000 */ nop +/* 35B84 8005A784 00000000 */ nop /* 35B88 8005A788 080169F0 */ j .L8005A7C0 -/* 35B8C 8005A78C 00000000 */ nop +/* 35B8C 8005A78C 00000000 */ nop .L8005A790: /* 35B90 8005A790 0C0514E4 */ jal clear_area_flags -/* 35B94 8005A794 00000000 */ nop +/* 35B94 8005A794 00000000 */ nop /* 35B98 8005A798 8E420000 */ lw $v0, ($s2) /* 35B9C 8005A79C 080169F0 */ j .L8005A7C0 /* 35BA0 8005A7A0 A0400167 */ sb $zero, 0x167($v0) .L8005A7A4: /* 35BA4 8005A7A4 0C00AD24 */ jal fio_deserialize_state -/* 35BA8 8005A7A8 00000000 */ nop +/* 35BA8 8005A7A8 00000000 */ nop /* 35BAC 8005A7AC 8E420000 */ lw $v0, ($s2) /* 35BB0 8005A7B0 94510086 */ lhu $s1, 0x86($v0) /* 35BB4 8005A7B4 9453008C */ lhu $s3, 0x8c($v0) @@ -93,17 +93,17 @@ glabel load_map_by_IDs /* 35C48 8005A848 3C01800A */ lui $at, %hi(D_800A41E0) /* 35C4C 8005A84C AC3241E0 */ sw $s2, %lo(D_800A41E0)($at) /* 35C50 8005A850 10A00005 */ beqz $a1, .L8005A868 -/* 35C54 8005A854 00000000 */ nop +/* 35C54 8005A854 00000000 */ nop /* 35C58 8005A858 3C04800E */ lui $a0, %hi(D_800D9668) /* 35C5C 8005A85C 24849668 */ addiu $a0, $a0, %lo(D_800D9668) /* 35C60 8005A860 0C01BB50 */ jal strcpy -/* 35C64 8005A864 00000000 */ nop +/* 35C64 8005A864 00000000 */ nop .L8005A868: /* 35C68 8005A868 0C0169B0 */ jal load_world_script_api -/* 35C6C 8005A86C 00000000 */ nop +/* 35C6C 8005A86C 00000000 */ nop /* 35C70 8005A870 8E440008 */ lw $a0, 8($s2) /* 35C74 8005A874 10800004 */ beqz $a0, .L8005A888 -/* 35C78 8005A878 00000000 */ nop +/* 35C78 8005A878 00000000 */ nop /* 35C7C 8005A87C 8E45000C */ lw $a1, 0xc($s2) /* 35C80 8005A880 0C00A5CF */ jal dma_copy /* 35C84 8005A884 8E460010 */ lw $a2, 0x10($s2) @@ -128,13 +128,13 @@ glabel load_map_by_IDs /* 35CC8 8005A8C8 3C13800A */ lui $s3, %hi(D_800A41E8) /* 35CCC 8005A8CC 267341E8 */ addiu $s3, $s3, %lo(D_800A41E8) /* 35CD0 8005A8D0 10400004 */ beqz $v0, .L8005A8E4 -/* 35CD4 8005A8D4 00000000 */ nop +/* 35CD4 8005A8D4 00000000 */ nop /* 35CD8 8005A8D8 0040F809 */ jalr $v0 -/* 35CDC 8005A8DC 00000000 */ nop +/* 35CDC 8005A8DC 00000000 */ nop /* 35CE0 8005A8E0 0040A02D */ daddu $s4, $v0, $zero .L8005A8E4: /* 35CE4 8005A8E4 16800015 */ bnez $s4, .L8005A93C -/* 35CE8 8005A8E8 00000000 */ nop +/* 35CE8 8005A8E8 00000000 */ nop /* 35CEC 8005A8EC 3C04800E */ lui $a0, %hi(D_800D9230) /* 35CF0 8005A8F0 24849230 */ addiu $a0, $a0, %lo(D_800D9230) /* 35CF4 8005A8F4 0C016B3A */ jal load_asset_by_name @@ -158,78 +158,78 @@ glabel load_map_by_IDs .L8005A93C: /* 35D3C 8005A93C 8E420014 */ lw $v0, 0x14($s2) /* 35D40 8005A940 10400005 */ beqz $v0, .L8005A958 -/* 35D44 8005A944 00000000 */ nop +/* 35D44 8005A944 00000000 */ nop /* 35D48 8005A948 3C04800E */ lui $a0, %hi(D_800D9668) /* 35D4C 8005A94C 24849668 */ addiu $a0, $a0, %lo(D_800D9668) /* 35D50 8005A950 0C05175C */ jal load_map_bg -/* 35D54 8005A954 00000000 */ nop +/* 35D54 8005A954 00000000 */ nop .L8005A958: /* 35D58 8005A958 0C00B458 */ jal func_8002D160 -/* 35D5C 8005A95C 00000000 */ nop +/* 35D5C 8005A95C 00000000 */ nop /* 35D60 8005A960 0C0AC81E */ jal func_802B2078 -/* 35D64 8005A964 00000000 */ nop +/* 35D64 8005A964 00000000 */ nop /* 35D68 8005A968 0C05259C */ jal func_80149670 /* 35D6C 8005A96C 0000202D */ daddu $a0, $zero, $zero /* 35D70 8005A970 0C048C2E */ jal clear_dynamic_entity_list -/* 35D74 8005A974 00000000 */ nop +/* 35D74 8005A974 00000000 */ nop /* 35D78 8005A978 0C0B0C77 */ jal clear_script_list -/* 35D7C 8005A97C 00000000 */ nop +/* 35D7C 8005A97C 00000000 */ nop /* 35D80 8005A980 0C00B7BD */ jal create_cameras_a -/* 35D84 8005A984 00000000 */ nop +/* 35D84 8005A984 00000000 */ nop /* 35D88 8005A988 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* 35D8C 8005A98C 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 35D90 8005A990 8E020000 */ lw $v0, ($s0) /* 35D94 8005A994 0C0B763E */ jal func_802DD8F8 /* 35D98 8005A998 80440084 */ lb $a0, 0x84($v0) /* 35D9C 8005A99C 0C047889 */ jal func_8011E224 -/* 35DA0 8005A9A0 00000000 */ nop +/* 35DA0 8005A9A0 00000000 */ nop /* 35DA4 8005A9A4 0C0482EC */ jal clear_virtual_models -/* 35DA8 8005A9A8 00000000 */ nop +/* 35DA8 8005A9A8 00000000 */ nop /* 35DAC 8005A9AC 0C00E12F */ jal clear_npcs -/* 35DB0 8005A9B0 00000000 */ nop +/* 35DB0 8005A9B0 00000000 */ nop /* 35DB4 8005A9B4 0C050440 */ jal func_80141100 -/* 35DB8 8005A9B8 00000000 */ nop +/* 35DB8 8005A9B8 00000000 */ nop /* 35DBC 8005A9BC 0C0515A0 */ jal clear_trigger_data -/* 35DC0 8005A9C0 00000000 */ nop +/* 35DC0 8005A9C0 00000000 */ nop /* 35DC4 8005A9C4 0C045751 */ jal clear_model_data -/* 35DC8 8005A9C8 00000000 */ nop +/* 35DC8 8005A9C8 00000000 */ nop /* 35DCC 8005A9CC 0C052010 */ jal func_80148040 -/* 35DD0 8005A9D0 00000000 */ nop +/* 35DD0 8005A9D0 00000000 */ nop /* 35DD4 8005A9D4 0C05177E */ jal func_80145DF8 -/* 35DD8 8005A9D8 00000000 */ nop +/* 35DD8 8005A9D8 00000000 */ nop /* 35DDC 8005A9DC 8E020000 */ lw $v0, ($s0) /* 35DE0 8005A9E0 804300A8 */ lb $v1, 0xa8($v0) /* 35DE4 8005A9E4 2402FFFF */ addiu $v0, $zero, -1 /* 35DE8 8005A9E8 14620003 */ bne $v1, $v0, .L8005A9F8 -/* 35DEC 8005A9EC 00000000 */ nop +/* 35DEC 8005A9EC 00000000 */ nop /* 35DF0 8005A9F0 0C04E062 */ jal func_80138188 -/* 35DF4 8005A9F4 00000000 */ nop +/* 35DF4 8005A9F4 00000000 */ nop .L8005A9F8: /* 35DF8 8005A9F8 16800005 */ bnez $s4, .L8005AA10 -/* 35DFC 8005A9FC 00000000 */ nop +/* 35DFC 8005A9FC 00000000 */ nop /* 35E00 8005AA00 0C016BE5 */ jal initialize_collision -/* 35E04 8005AA04 00000000 */ nop +/* 35E04 8005AA04 00000000 */ nop /* 35E08 8005AA08 0C016BF0 */ jal load_hit_asset -/* 35E0C 8005AA0C 00000000 */ nop +/* 35E0C 8005AA0C 00000000 */ nop .L8005AA10: /* 35E10 8005AA10 0C01CACC */ jal func_80072B30 -/* 35E14 8005AA14 00000000 */ nop +/* 35E14 8005AA14 00000000 */ nop /* 35E18 8005AA18 0C00F900 */ jal clear_encounter_status -/* 35E1C 8005AA1C 00000000 */ nop +/* 35E1C 8005AA1C 00000000 */ nop /* 35E20 8005AA20 0C04432E */ jal clear_entity_data /* 35E24 8005AA24 24040001 */ addiu $a0, $zero, 1 /* 35E28 8005AA28 0C016727 */ jal func_80059C9C -/* 35E2C 8005AA2C 00000000 */ nop +/* 35E2C 8005AA2C 00000000 */ nop /* 35E30 8005AA30 0C037F14 */ jal clear_player_status -/* 35E34 8005AA34 00000000 */ nop +/* 35E34 8005AA34 00000000 */ nop /* 35E38 8005AA38 0C037F1D */ jal func_800DFC74 -/* 35E3C 8005AA3C 00000000 */ nop +/* 35E3C 8005AA3C 00000000 */ nop /* 35E40 8005AA40 0C03AD1D */ jal partner_reset_data -/* 35E44 8005AA44 00000000 */ nop +/* 35E44 8005AA44 00000000 */ nop /* 35E48 8005AA48 0C048D9D */ jal clear_printers -/* 35E4C 8005AA4C 00000000 */ nop +/* 35E4C 8005AA4C 00000000 */ nop /* 35E50 8005AA50 0C04C3FC */ jal clear_item_entity_data -/* 35E54 8005AA54 00000000 */ nop +/* 35E54 8005AA54 00000000 */ nop /* 35E58 8005AA58 3C028011 */ lui $v0, %hi(gPlayerStatus) /* 35E5C 8005AA5C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) /* 35E60 8005AA60 C4400084 */ lwc1 $f0, 0x84($v0) @@ -242,16 +242,16 @@ glabel load_map_by_IDs /* 35E7C 8005AA7C 0C0525FF */ jal func_801497FC /* 35E80 8005AA80 8C84FF60 */ lw $a0, %lo(D_8008FF60)($a0) /* 35E84 8005AA84 0C052580 */ jal func_80149600 -/* 35E88 8005AA88 00000000 */ nop +/* 35E88 8005AA88 00000000 */ nop /* 35E8C 8005AA8C 1680000B */ bnez $s4, .L8005AABC -/* 35E90 8005AA90 00000000 */ nop +/* 35E90 8005AA90 00000000 */ nop /* 35E94 8005AA94 3C04800B */ lui $a0, %hi(D_800B0CF0) /* 35E98 8005AA98 24840CF0 */ addiu $a0, $a0, %lo(D_800B0CF0) /* 35E9C 8005AA9C 0C016B74 */ jal get_asset_offset /* 35EA0 8005AAA0 27A50030 */ addiu $a1, $sp, 0x30 /* 35EA4 8005AAA4 8E640000 */ lw $a0, ($s3) /* 35EA8 8005AAA8 10800004 */ beqz $a0, .L8005AABC -/* 35EAC 8005AAAC 00000000 */ nop +/* 35EAC 8005AAAC 00000000 */ nop /* 35EB0 8005AAB0 8FA60030 */ lw $a2, 0x30($sp) /* 35EB4 8005AAB4 0C046B52 */ jal load_data_for_models /* 35EB8 8005AAB8 0040282D */ daddu $a1, $v0, $zero @@ -260,9 +260,9 @@ glabel load_map_by_IDs /* 35EC0 8005AAC0 50800005 */ beql $a0, $zero, .L8005AAD8 /* 35EC4 8005AAC4 24040128 */ addiu $a0, $zero, 0x128 /* 35EC8 8005AAC8 0C05178A */ jal read_background_size -/* 35ECC 8005AACC 00000000 */ nop +/* 35ECC 8005AACC 00000000 */ nop /* 35ED0 8005AAD0 08016ABA */ j .L8005AAE8 -/* 35ED4 8005AAD4 00000000 */ nop +/* 35ED4 8005AAD4 00000000 */ nop .L8005AAD8: /* 35ED8 8005AAD8 240500C8 */ addiu $a1, $zero, 0xc8 /* 35EDC 8005AADC 2406000C */ addiu $a2, $zero, 0xc @@ -306,9 +306,9 @@ glabel load_map_by_IDs /* 35F6C 8005AB6C 24070106 */ addiu $a3, $zero, 0x106 .L8005AB70: /* 35F70 8005AB70 0C00B8C5 */ jal set_cam_viewport -/* 35F74 8005AB74 00000000 */ nop +/* 35F74 8005AB74 00000000 */ nop /* 35F78 8005AB78 0C039E4D */ jal initialize_status_menu -/* 35F7C 8005AB7C 00000000 */ nop +/* 35F7C 8005AB7C 00000000 */ nop /* 35F80 8005AB80 0000282D */ daddu $a1, $zero, $zero /* 35F84 8005AB84 00A0302D */ daddu $a2, $a1, $zero /* 35F88 8005AB88 3C108007 */ lui $s0, %hi(gGameStatusPtr) diff --git a/asm/nonmatchings/world/world/play_effect.s b/asm/nonmatchings/world/world/play_effect.s index cc63851a7e..6934b218ac 100644 --- a/asm/nonmatchings/world/world/play_effect.s +++ b/asm/nonmatchings/world/world/play_effect.s @@ -52,7 +52,7 @@ glabel play_effect /* 35A0C 8005A60C 3C0700FF */ lui $a3, 0xff .L8005A610: /* 35A10 8005A610 08016984 */ j .L8005A610 -/* 35A14 8005A614 00000000 */ nop +/* 35A14 8005A614 00000000 */ nop .L8005A618: /* 35A18 8005A618 34E7FFFF */ ori $a3, $a3, 0xffff /* 35A1C 8005A61C 0000282D */ daddu $a1, $zero, $zero @@ -80,7 +80,7 @@ glabel play_effect /* 35A74 8005A674 AE02001C */ sw $v0, 0x1c($s0) .L8005A678: /* 35A78 8005A678 0801699E */ j .L8005A678 -/* 35A7C 8005A67C 00000000 */ nop +/* 35A7C 8005A67C 00000000 */ nop .L8005A680: /* 35A80 8005A680 8E240010 */ lw $a0, 0x10($s1) /* 35A84 8005A684 8E250014 */ lw $a1, 0x14($s1) @@ -98,4 +98,4 @@ glabel play_effect /* 35AB0 8005A6B0 8FB00018 */ lw $s0, 0x18($sp) /* 35AB4 8005A6B4 03E00008 */ jr $ra /* 35AB8 8005A6B8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 35ABC 8005A6BC 00000000 */ nop +/* 35ABC 8005A6BC 00000000 */ nop diff --git a/asm/nonmatchings/world/world/remove_all_effects.s b/asm/nonmatchings/world/world/remove_all_effects.s index 0e274c1846..6583c9b49f 100644 --- a/asm/nonmatchings/world/world/remove_all_effects.s +++ b/asm/nonmatchings/world/world/remove_all_effects.s @@ -20,9 +20,9 @@ glabel remove_all_effects /* 35918 8005A518 26520001 */ addiu $s2, $s2, 1 /* 3591C 8005A51C 8E04000C */ lw $a0, 0xc($s0) /* 35920 8005A520 10800003 */ beqz $a0, .L8005A530 -/* 35924 8005A524 00000000 */ nop +/* 35924 8005A524 00000000 */ nop /* 35928 8005A528 0C00AB1E */ jal general_heap_free -/* 3592C 8005A52C 00000000 */ nop +/* 3592C 8005A52C 00000000 */ nop .L8005A530: /* 35930 8005A530 0C00AB1E */ jal general_heap_free /* 35934 8005A534 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/world/world/remove_effect.s b/asm/nonmatchings/world/world/remove_effect.s index 95805f9738..d9098b0b60 100644 --- a/asm/nonmatchings/world/world/remove_effect.s +++ b/asm/nonmatchings/world/world/remove_effect.s @@ -21,16 +21,16 @@ glabel remove_effect /* 3588C 8005A48C 2A020060 */ slti $v0, $s0, 0x60 .L8005A490: /* 35890 8005A490 14400003 */ bnez $v0, .L8005A4A0 -/* 35894 8005A494 00000000 */ nop +/* 35894 8005A494 00000000 */ nop .L8005A498: /* 35898 8005A498 08016926 */ j .L8005A498 -/* 3589C 8005A49C 00000000 */ nop +/* 3589C 8005A49C 00000000 */ nop .L8005A4A0: /* 358A0 8005A4A0 8E24000C */ lw $a0, 0xc($s1) /* 358A4 8005A4A4 10800003 */ beqz $a0, .L8005A4B4 -/* 358A8 8005A4A8 00000000 */ nop +/* 358A8 8005A4A8 00000000 */ nop /* 358AC 8005A4AC 0C00AB1E */ jal general_heap_free -/* 358B0 8005A4B0 00000000 */ nop +/* 358B0 8005A4B0 00000000 */ nop .L8005A4B4: /* 358B4 8005A4B4 0C00AB1E */ jal general_heap_free /* 358B8 8005A4B8 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/world/world/render_effects.s b/asm/nonmatchings/world/world/render_effects.s index 0985cbdd6f..5382c7b2cf 100644 --- a/asm/nonmatchings/world/world/render_effects.s +++ b/asm/nonmatchings/world/world/render_effects.s @@ -28,7 +28,7 @@ glabel render_effects /* 3534C 80059F4C 50400009 */ beql $v0, $zero, .L80059F74 /* 35350 80059F50 26310001 */ addiu $s1, $s1, 1 /* 35354 80059F54 080167D9 */ j .L80059F64 -/* 35358 80059F58 00000000 */ nop +/* 35358 80059F58 00000000 */ nop .L80059F5C: /* 3535C 80059F5C 54400005 */ bnel $v0, $zero, .L80059F74 /* 35360 80059F60 26310001 */ addiu $s1, $s1, 1 diff --git a/asm/os/code_45df0_len_970.s b/asm/os/code_45df0_len_970.s index 02169734e1..ed36936725 100644 --- a/asm/os/code_45df0_len_970.s +++ b/asm/os/code_45df0_len_970.s @@ -12,6 +12,7 @@ glabel func_8006A9F0 /* 45DF4 8006A9F4 275AAA00 */ addiu $k0, $k0, %lo(osExceptionPreamble) /* 45DF8 8006A9F8 03400008 */ jr $k0 /* 45DFC 8006A9FC 00000000 */ nop + glabel osExceptionPreamble /* 45E00 8006AA00 3C1A800B */ lui $k0, %hi(D_800B0D08) /* 45E04 8006AA04 275A0D08 */ addiu $k0, $k0, %lo(D_800B0D08) @@ -157,20 +158,23 @@ glabel func_8006AA34 /* 4601C 8006AC1C 00095202 */ srl $t2, $t1, 8 /* 46020 8006AC20 214A0010 */ addi $t2, $t2, 0x10 .L8006AC24: -/* 46024 8006AC24 3C01800A */ lui $at, %hi(D_80099D80) +/* 46024 8006AC24 3C01800A */ lui $at, %hi(jtbl_80099D80_75180) /* 46028 8006AC28 002A0821 */ addu $at, $at, $t2 -/* 4602C 8006AC2C 902A9D80 */ lbu $t2, %lo(D_80099D80)($at) -/* 46030 8006AC30 3C01800A */ lui $at, %hi(D_80099DA0) +/* 4602C 8006AC2C 902A9D80 */ lbu $t2, %lo(jtbl_80099D80_75180)($at) +/* 46030 8006AC30 3C01800A */ lui $at, %hi(jtbl_80099DA0_751A0) /* 46034 8006AC34 002A0821 */ addu $at, $at, $t2 -/* 46038 8006AC38 8C2A9DA0 */ lw $t2, %lo(D_80099DA0)($at) +/* 46038 8006AC38 8C2A9DA0 */ lw $t2, %lo(jtbl_80099DA0_751A0)($at) /* 4603C 8006AC3C 01400008 */ jr $t2 /* 46040 8006AC40 00000000 */ nop +glabel L8006AC44_46044 /* 46044 8006AC44 2401DFFF */ addiu $at, $zero, -0x2001 /* 46048 8006AC48 1000FFF0 */ b .L8006AC0C /* 4604C 8006AC4C 02018024 */ and $s0, $s0, $at +glabel L8006AC50_46050 /* 46050 8006AC50 2401BFFF */ addiu $at, $zero, -0x4001 /* 46054 8006AC54 1000FFED */ b .L8006AC0C /* 46058 8006AC58 02018024 */ and $s0, $s0, $at +glabel L8006AC5C_4605C /* 4605C 8006AC5C 40095800 */ mfc0 $t1, $11 /* 46060 8006AC60 40895800 */ mtc0 $t1, $11 /* 46064 8006AC64 24040018 */ addiu $a0, $zero, 0x18 @@ -180,6 +184,7 @@ glabel func_8006AA34 /* 46074 8006AC74 34217FFF */ ori $at, $at, 0x7fff /* 46078 8006AC78 1000FFE4 */ b .L8006AC0C /* 4607C 8006AC7C 02018024 */ and $s0, $s0, $at +glabel L8006AC80_46080 /* 46080 8006AC80 2401F7FF */ addiu $at, $zero, -0x801 /* 46084 8006AC84 02018024 */ and $s0, $s0, $at /* 46088 8006AC88 3C098009 */ lui $t1, %hi(D_80095910) @@ -199,6 +204,7 @@ glabel func_8006AA34 /* 460BC 8006ACBC 24040010 */ addiu $a0, $zero, 0x10 /* 460C0 8006ACC0 1000FFD2 */ b .L8006AC0C /* 460C4 8006ACC4 00000000 */ nop +glabel L8006ACC8_460C8 /* 460C8 8006ACC8 3C11A430 */ lui $s1, %hi(D_A4300008) /* 460CC 8006ACCC 8E310008 */ lw $s1, %lo(D_A4300008)($s1) /* 460D0 8006ACD0 3C088009 */ lui $t0, %hi(D_80095900) @@ -301,6 +307,7 @@ glabel func_8006AA34 /* 46230 8006AE30 2401FBFF */ addiu $at, $zero, -0x401 /* 46234 8006AE34 1000FF75 */ b .L8006AC0C /* 46238 8006AE38 02018024 */ and $s0, $s0, $at +glabel L8006AE3C_4623C /* 4623C 8006AE3C 8F5B0118 */ lw $k1, 0x118($k0) /* 46240 8006AE40 2401EFFF */ addiu $at, $zero, -0x1001 /* 46244 8006AE44 0361D824 */ and $k1, $k1, $at @@ -327,6 +334,7 @@ glabel func_8006AA34 /* 46294 8006AE94 0361D824 */ and $k1, $k1, $at /* 46298 8006AE98 10000019 */ b .L8006AF00 /* 4629C 8006AE9C AD5B0118 */ sw $k1, 0x118($t2) +glabel L8006AEA0_462A0 /* 462A0 8006AEA0 2401FDFF */ addiu $at, $zero, -0x201 /* 462A4 8006AEA4 01014024 */ and $t0, $t0, $at /* 462A8 8006AEA8 40886800 */ mtc0 $t0, $13 @@ -336,6 +344,7 @@ glabel func_8006AA34 /* 462B8 8006AEB8 2401FDFF */ addiu $at, $zero, -0x201 /* 462BC 8006AEBC 1000FF53 */ b .L8006AC0C /* 462C0 8006AEC0 02018024 */ and $s0, $s0, $at +glabel L8006AEC4_462C4 /* 462C4 8006AEC4 2401FEFF */ addiu $at, $zero, -0x101 /* 462C8 8006AEC8 01014024 */ and $t0, $t0, $at /* 462CC 8006AECC 40886800 */ mtc0 $t0, $13 @@ -353,6 +362,7 @@ glabel func_8006AA34 /* 462F8 8006AEF8 10000001 */ b .L8006AF00 /* 462FC 8006AEFC 00000000 */ nop .L8006AF00: +glabel L8006AF00_46300 /* 46300 8006AF00 8F490004 */ lw $t1, 4($k0) /* 46304 8006AF04 3C0A8009 */ lui $t2, %hi(D_80094658) /* 46308 8006AF08 8D4A4658 */ lw $t2, %lo(D_80094658)($t2) @@ -386,6 +396,7 @@ glabel func_8006AA34 /* 46370 8006AF70 24040060 */ addiu $a0, $zero, 0x60 /* 46374 8006AF74 0801AC75 */ j osDispatchThread /* 46378 8006AF78 00000000 */ nop + glabel send_mesg /* 4637C 8006AF7C 03E09021 */ addu $s2, $ra, $zero /* 46380 8006AF80 3C0A800E */ lui $t2, %hi(D_800D9F80) @@ -437,6 +448,7 @@ glabel send_mesg .L8006B030: /* 46430 8006B030 02400008 */ jr $s2 /* 46434 8006B034 00000000 */ nop + glabel handle_CPU /* 46438 8006B038 3C013000 */ lui $at, 0x3000 /* 4643C 8006B03C 01014824 */ and $t1, $t0, $at @@ -523,6 +535,7 @@ glabel osEnqueueAndYield .L8006B16C: /* 4656C 8006B16C 0801AC75 */ j osDispatchThread /* 46570 8006B170 00000000 */ nop + glabel osEnqueueThread /* 46574 8006B174 0080C821 */ addu $t9, $a0, $zero /* 46578 8006B178 8C980000 */ lw $t8, ($a0) @@ -552,6 +565,7 @@ glabel osPopThread /* 465C8 8006B1C8 AC990000 */ sw $t9, ($a0) /* 465CC 8006B1CC 03E00008 */ jr $ra /* 465D0 8006B1D0 00000000 */ nop + glabel osDispatchThread /* 465D4 8006B1D4 3C048009 */ lui $a0, %hi(D_80094658) /* 465D8 8006B1D8 0C01AC6F */ jal osPopThread diff --git a/create_renames.py b/create_renames.py old mode 100644 new mode 100755 diff --git a/docker-sync.yml b/docker-sync.yml deleted file mode 100644 index f6d17727bf..0000000000 --- a/docker-sync.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "2" - -syncs: - pm-sync: - src: '.' diff --git a/src/code_4219F0.c b/src/code_4219F0.c index 1f7560491f..68ae79a739 100644 --- a/src/code_4219F0.c +++ b/src/code_4219F0.c @@ -1,11 +1,11 @@ #include "common.h" -INCLUDE_ASM(s32, "code_4219F0", func_802A9000); +INCLUDE_ASM(s32, "code_4219F0", func_802A9000_4219F0); -INCLUDE_ASM(s32, "code_4219F0", func_802A9120); +INCLUDE_ASM(s32, "code_4219F0", func_802A9120_421B10); -INCLUDE_ASM(s32, "code_4219F0", func_802A9234); +INCLUDE_ASM(s32, "code_4219F0", func_802A9234_421C24); -INCLUDE_ASM(s32, "code_4219F0", func_802A9544); +INCLUDE_ASM(s32, "code_4219F0", func_802A9544_421F34); -INCLUDE_ASM(s32, "code_4219F0", func_802A9590); +INCLUDE_ASM(s32, "code_4219F0", func_802A9590_421F80); diff --git a/tools/duplicate_renames.txt b/tools/duplicate_renames.txt index 9bb7b4b6ee..a3d18fca86 100644 --- a/tools/duplicate_renames.txt +++ b/tools/duplicate_renames.txt @@ -515,6 +515,7 @@ func_80241628_CD3458,flo_16_UnkNpcAIFunc1 func_8024162C_C72AAC,kzn_08_UnkNpcAIFunc2 func_80241630_DB38F0,omo_05_UnkNpcAIFunc2 func_80241650_D8E8A0,pra_35_NpcJumpFunc2 +func_80241658_8B16C8,kmr_02_NpcJumpFunc func_80241668_B5F918,jan_08_UnkNpcAIFunc6 func_80241668_BE4E18,dup_arn_04_UnkNpcAIFunc1 func_80241674_BAEFB4,mim_08_UnkNpcAIFunc8 @@ -589,6 +590,7 @@ func_802422A8_A091A8,nok_15_UnkDurationCheck func_802422D8_9B8C58,trd_07_UnkDurationCheck func_802422F4_CD95D4,flo_17_UnkNpcAIFunc12 func_8024233C_C420EC,dgb_08_UnkNpcAIFunc2 +func_80242448_CC5C58,flo_13_UnkNpcAIFunc12 func_80242458_CD9738,flo_17_set_script_owner_npc_col_height func_8024247C_BA6BFC,mim_06_UnkNpcAIFunc1 func_8024253C_C739BC,kzn_08_UnkNpcAIFunc6 diff --git a/tools/splat.yaml b/tools/splat.yaml index 02d1f02731..d2f8b1f052 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -7,8 +7,6 @@ options: ld_o_replace_extension: False ld_addrs_header: include/ld_addrs.h extensions: splat_ext - symbol_debug_info: False - create_detected_syms: True symbol_addrs: tools/symbol_addrs.txt segments: - name: header @@ -430,7 +428,7 @@ segments: files: - [0x317020, c, world/partner/goombario] - [0x317b60, .data, world/partner/goombario] - - [0x317DA0, bin, world/partner/goombario] # rodata containing a double and a jumptable + - [0x317DA0, rodata, world/partner/goombario] # rodata containing a double and a jumptable - type: code ld_name: world_partner_bombette start: 0x317e50 @@ -438,7 +436,7 @@ segments: overlay: True files: - [0x317e50, c, world/partner/bombette] - - [0x3195d0, bin] + - [0x3195d0, data] - type: code ld_name: world_partner_parakarry start: 0x319670 @@ -446,7 +444,7 @@ segments: overlay: True files: - [0x319670, c, world/partner/parakarry] - - [0x31b000, bin] + - [0x31b000, data] - type: code ld_name: world_partner_kooper start: 0x31b120 @@ -454,7 +452,7 @@ segments: overlay: True files: - [0x31b120, c, world/partner/kooper] - - [0x31cb60, bin] + - [0x31cb60, data] - type: code ld_name: world_partner_watt start: 0x31cc70 @@ -462,7 +460,7 @@ segments: overlay: True files: - [0x31cc70, c, world/partner/watt] - - [0x31ddc0, bin] + - [0x31ddc0, data] - type: code ld_name: world_partner_sushie start: 0x31de70 @@ -470,7 +468,7 @@ segments: overlay: True files: - [0x31de70, c, world/partner/sushie] - - [0x320b20, bin] + - [0x320b20, data] - type: code ld_name: world_partner_lakilester start: 0x320c50 @@ -478,7 +476,7 @@ segments: overlay: True files: - [0x320c50, c, world/partner/lakilester] - - [0x3239b0, bin] + - [0x3239b0, data] - type: code ld_name: world_partner_bow start: 0x323A50 @@ -486,7 +484,7 @@ segments: overlay: True files: - [0x323A50, c, world/partner/bow] - - [0x324930, bin] + - [0x324930, data] - type: code ld_name: world_partner_goompa start: 0x324a10 @@ -495,7 +493,7 @@ segments: files: - [0x324a10, c, world/partner/goompa] - [0x324e80, .data, world/partner/goompa] - - [0x324F00, bin, world/partner/goompa] # rodata with single f64 0.8 + - [0x324F00, rodata, world/partner/goompa] # rodata with single f64 0.8 - type: code ld_name: world_partner_goombaria start: 0x324f10 @@ -1353,7 +1351,7 @@ segments: overlay: True files: - [0x4219F0, c] - - [0x421FC0, bin] + - [0x421FC0, data] - type: code start: 0x422000 vram: 0x802A9000 diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt index 531f086712..97b3848afc 100644 --- a/tools/symbol_addrs.txt +++ b/tools/symbol_addrs.txt @@ -222,6 +222,7 @@ SetTattleString = 0x80045A58; spawn_drops = 0x80048280; get_coin_drop_amount = 0x80048D50; is_point_within_region = 0x80048FD4; +base_UnkNpcAIFunc1 = 0x80049B44; DoBasicAI = 0x8004A47C; nuAuPreNMIFuncSet = 0x8004ADD0; nuAuDmaCallBack = 0x8004B074; // ! diff --git a/undefined_syms_auto.txt b/undefined_syms_auto.txt index 5f589fd842..cc0b642c7d 100644 --- a/undefined_syms_auto.txt +++ b/undefined_syms_auto.txt @@ -1,17 +1,11 @@ D_80000000 = 0x80000000; -osTvType = 0x80000300; D_80000308 = 0x80000308; D_8000030C = 0x8000030C; D_80000318 = 0x80000318; D_8000031C = 0x8000031C; D_80026AC7 = 0x80026AC7; D_8004AA85 = 0x8004AA85; -osEPiReadIo = 0x80060DC0; -gGameStatusPtr = 0x8007419C; -gMatrixListPos = 0x800741F0; -gCurrentDisplayContextIndex = 0x800741F4; D_800773F0 = 0x800773F0; -gCurrentCameraID = 0x80077410; D_800779B0 = 0x800779B0; D_800779C4 = 0x800779C4; D_800779CB = 0x800779CB; @@ -36,7 +30,6 @@ D_800822F8 = 0x800822F8; D_80082328 = 0x80082328; D_80082358 = 0x80082358; D_80082388 = 0x80082388; -gItemTable = 0x800878E0; D_8008A680 = 0x8008A680; D_8008D2C0 = 0x8008D2C0; D_8008DDD4 = 0x8008DDD4; @@ -65,7 +58,6 @@ D_8008FA78 = 0x8008FA78; D_8008FA8C = 0x8008FA8C; D_8008FC44 = 0x8008FC44; D_8008FEE0 = 0x8008FEE0; -gAreas = 0x800934F0; D_800934F4 = 0x800934F4; D_80094900 = 0x80094900; D_80095A30 = 0x80095A30; @@ -78,30 +70,25 @@ D_8009A5CC = 0x8009A5CC; D_8009A5D0 = 0x8009A5D0; D_8009A5D4 = 0x8009A5D4; D_8009A5D8 = 0x8009A5D8; -nuGfxZBuffer = 0x8009A5DC; D_8009A5E0 = 0x8009A5E0; D_8009A5E4 = 0x8009A5E4; D_8009A5E8 = 0x8009A5E8; D_8009A5EC = 0x8009A5EC; D_8009A5F0 = 0x8009A5F0; D_8009A5F4 = 0x8009A5F4; -nuGfxDisplay = 0x8009A5F8; D_8009A5FC = 0x8009A5FC; -gGameState = 0x8009A600; D_8009A604 = 0x8009A604; D_8009A606 = 0x8009A606; D_8009A608 = 0x8009A608; D_8009A60C = 0x8009A60C; D_8009A610 = 0x8009A610; D_8009A614 = 0x8009A614; -nuGfxTaskSpool = 0x8009A618; D_8009A61C = 0x8009A61C; D_8009A620 = 0x8009A620; D_8009A628 = 0x8009A628; D_8009A62C = 0x8009A62C; D_8009A630 = 0x8009A630; D_8009A634 = 0x8009A634; -carthandle = 0x8009A638; D_8009A63C = 0x8009A63C; D_8009A640 = 0x8009A640; D_8009A64C = 0x8009A64C; @@ -111,9 +98,7 @@ D_8009A658 = 0x8009A658; D_8009A660 = 0x8009A660; D_8009A664 = 0x8009A664; D_8009A668 = 0x8009A668; -gMasterGfxPos = 0x8009A66C; D_8009A670 = 0x8009A670; -gDisplayContext = 0x8009A674; D_8009A678 = 0x8009A678; D_8009A680 = 0x8009A680; D_8009A690 = 0x8009A690; @@ -125,11 +110,6 @@ D_8009A6B0 = 0x8009A6B0; D_8009BA30 = 0x8009BA30; D_8009BA50 = 0x8009BA50; D_8009BA80 = 0x8009BA80; -gCurtainScale = 0x8009BA90; -gCurtainScaleGoal = 0x8009BA94; -gCurtainFade = 0x8009BA98; -gCurtainFadeGoal = 0x8009BA9C; -gCurtainDrawCallback = 0x8009BAA0; D_8009BAA8 = 0x8009BAA8; D_8009BB30 = 0x8009BB30; D_8009C4E0 = 0x8009C4E0; @@ -162,7 +142,6 @@ D_800A0924 = 0x800A0924; D_800A0930 = 0x800A0930; D_800A0931 = 0x800A0931; D_800A0932 = 0x800A0932; -gMapTransitionAlpha = 0x800A0940; D_800A0942 = 0x800A0942; D_800A0944 = 0x800A0944; D_800A0946 = 0x800A0946; @@ -186,9 +165,6 @@ D_800A0978 = 0x800A0978; D_800A097C = 0x800A097C; D_800A0980 = 0x800A0980; D_800A0988 = 0x800A0988; -gWorldNpcList = 0x800A0990; -gBattleNpcList = 0x800A0A90; -gCurrentNpcListPtr = 0x800A0B90; D_800A0B94 = 0x800A0B94; D_800A0BA0 = 0x800A0BA0; D_800A0BA4 = 0x800A0BA4; @@ -216,9 +192,7 @@ D_800A3638 = 0x800A3638; D_800A3640 = 0x800A3640; D_800A3658 = 0x800A3658; D_800A3720 = 0x800A3720; -nuAuDmaState = 0x800A3BD0; D_800A3BD4 = 0x800A3BD4; -nuAuDmaBuf = 0x800A3BE0; D_800A3BF0 = 0x800A3BF0; D_800A3FD0 = 0x800A3FD0; D_800A3FE0 = 0x800A3FE0; @@ -248,9 +222,6 @@ D_800A4264 = 0x800A4264; D_800A4268 = 0x800A4268; D_800A4270 = 0x800A4270; D_800A4420 = 0x800A4420; -nuScStack = 0x800A65D0; -nuScAudioStack = 0x800A85D0; -nuScGraphicsStack = 0x800AA5D0; D_800AC5D0 = 0x800AC5D0; D_800AC5E8 = 0x800AC5E8; D_800AC6B0 = 0x800AC6B0; @@ -309,7 +280,6 @@ D_800B0EB8 = 0x800B0EB8; D_800B0ED0 = 0x800B0ED0; D_800B0F08 = 0x800B0F08; D_800B0F0C = 0x800B0F0C; -gCurrentEncounter = 0x800B0F10; D_800B1B0C = 0x800B1B0C; D_800B1B0D = 0x800B1B0D; D_800B1B0E = 0x800B1B0E; @@ -318,15 +288,12 @@ D_800B1B10 = 0x800B1B10; D_800B1B7C = 0x800B1B7C; D_800B1B7F = 0x800B1B7F; D_800B1B90 = 0x800B1B90; -nuContRmbCtl = 0x800B1D40; D_800B1D42 = 0x800B1D42; D_800B1D44 = 0x800B1D44; D_800B1D46 = 0x800B1D46; D_800B1D47 = 0x800B1D47; D_800B1D48 = 0x800B1D48; D_800B1D49 = 0x800B1D49; -nuContData = 0x800B1D68; -gCameras = 0x800B1D80; D_800B1D98 = 0x800B1D98; D_800B1DEC = 0x800B1DEC; D_800B1E54 = 0x800B1E54; @@ -395,11 +362,8 @@ D_800DAAB8 = 0x800DAAB8; D_800DAABC = 0x800DAABC; D_800DAABD = 0x800DAABD; D_800DAAC0 = 0x800DAAC0; -nuContPfs = 0x800DAAD8; -nuSiMesgQ = 0x800DAC78; D_800DAC90 = 0x800DAC90; D_800DACA8 = 0x800DACA8; -gCurrentSaveFile = 0x800DACC0; D_800DBC70 = 0x800DBC70; D_800DBD70 = 0x800DBD70; D_800DBF70 = 0x800DBF70; @@ -407,10 +371,7 @@ D_800DBF90 = 0x800DBF90; D_800DC040 = 0x800DC040; D_800DC060 = 0x800DC060; D_800DC064 = 0x800DC064; -gBattleState = 0x800DC068; -gBattleStatus = 0x800DC070; D_800DC500 = 0x800DC500; -gPlayerStatusPtr = 0x800F7B30; D_800F7B40 = 0x800F7B40; D_800F7B44 = 0x800F7B44; D_800F7C1C = 0x800F7C1C; @@ -422,7 +383,6 @@ D_800F7F40 = 0x800F7F40; D_800F833C = 0x800F833C; D_800F8340 = 0x800F8340; D_800F8344 = 0x800F8344; -gPartnerAnimations = 0x800F8348; D_800F84F8 = 0x800F84F8; D_800FBB60 = 0x800FBB60; D_800FBBE0 = 0x800FBBE0; @@ -694,18 +654,12 @@ D_8010EF08 = 0x8010EF08; D_8010EF10 = 0x8010EF10; D_8010EF28 = 0x8010EF28; D_8010EF40 = 0x8010EF40; -gUIStatus = 0x8010EF58; D_8010EF92 = 0x8010EF92; D_8010EF9C = 0x8010EF9C; D_8010EF9D = 0x8010EF9D; D_8010EF9E = 0x8010EF9E; -gPlayerStatus = 0x8010EFC8; -gPlayerActionState = 0x8010F07C; -gPlayerAnimation = 0x8010F080; D_8010F250 = 0x8010F250; -gPlayerData = 0x8010F290; D_8010F6B8 = 0x8010F6B8; -update_entities = 0x8010F6D0; D_80117160 = 0x80117160; D_80117163 = 0x80117163; D_80117578 = 0x80117578; @@ -715,10 +669,7 @@ D_80117840 = 0x80117840; D_80117848 = 0x80117848; D_80117852 = 0x80117852; D_80147474 = 0x80147474; -func_80147474 = 0x80147474; D_80147574 = 0x80147574; -func_80147574 = 0x80147574; -func_80147650 = 0x80147650; D_8014B7F0 = 0x8014B7F0; D_8014C248 = 0x8014C248; D_8014C290 = 0x8014C290; @@ -731,15 +682,12 @@ D_801512BC = 0x801512BC; D_801512C0 = 0x801512C0; D_801512C4 = 0x801512C4; D_801512C8 = 0x801512C8; -gCurrentModelListPtr = 0x801512CC; D_801512D0 = 0x801512D0; D_801512D4 = 0x801512D4; D_801512D8 = 0x801512D8; D_801512DA = 0x801512DA; D_801512E0 = 0x801512E0; D_801512E4 = 0x801512E4; -gCurrentModelSpecialDlsPtr = 0x801512E8; -gLastCreatedEntityIndex = 0x801512EC; D_801512F0 = 0x801512F0; D_801512F4 = 0x801512F4; D_801512F8 = 0x801512F8; @@ -757,17 +705,9 @@ D_80151324 = 0x80151324; D_80151328 = 0x80151328; D_8015132C = 0x8015132C; D_80151330 = 0x80151330; -gTriggerCount = 0x80151334; D_80151338 = 0x80151338; D_8015133C = 0x8015133C; -gCurrentDoorSoundsSet = 0x80151340; D_80151344 = 0x80151344; -gWorldEntityList = 0x80151380; -gBattleEntityList = 0x801513F8; -gCurrentEntityListPtr = 0x80151470; -gWorldShadowList = 0x80151478; -gBattleShadowList = 0x80151568; -gCurrentShadowListPtr = 0x80151658; D_8015165C = 0x8015165C; D_80151660 = 0x80151660; D_80151668 = 0x80151668; @@ -775,14 +715,9 @@ D_801516DC = 0x801516DC; D_801516E8 = 0x801516E8; D_801516F4 = 0x801516F4; D_801516FC = 0x801516FC; -gMainGameState = 0x80151700; D_80151740 = 0x80151740; -gWorldModelList = 0x80151770; -gBattleModelList = 0x80151B70; D_80151F70 = 0x80151F70; D_80151F80 = 0x80151F80; -gWorldModelSpecialDls = 0x80151F90; -gBattleModelSpecialDls = 0x80152010; D_80152090 = 0x80152090; D_80152110 = 0x80152110; D_80152190 = 0x80152190; @@ -820,7 +755,6 @@ D_801536C0 = 0x801536C0; D_801539B8 = 0x801539B8; D_801539C0 = 0x801539C0; D_80153A00 = 0x80153A00; -gCurrentAnimMeshListPtr = 0x80153A40; D_80153A44 = 0x80153A44; D_80153A48 = 0x80153A48; D_80153A4B = 0x80153A4B; @@ -853,9 +787,6 @@ D_80154388 = 0x80154388; D_8015438B = 0x8015438B; D_8015438C = 0x8015438C; D_80154390 = 0x80154390; -gWorldDynamicEntityList = 0x801543A0; -gBattleDynamicEntityList = 0x801543E0; -gCurrentDynamicEntityListPtr = 0x80154420; D_80154430 = 0x80154430; D_80154C30 = 0x80154C30; D_80155C38 = 0x80155C38; @@ -911,9 +842,6 @@ D_80158574 = 0x80158574; D_80158580 = 0x80158580; D_80158B80 = 0x80158B80; D_80159180 = 0x80159180; -gTriggerList1 = 0x80159190; -gTriggerList2 = 0x80159290; -gCurrentTriggerListPtr = 0x80159390; D_801593A0 = 0x801593A0; D_8015959E = 0x8015959E; D_801595A0 = 0x801595A0; @@ -926,14 +854,8 @@ D_801598A0 = 0x801598A0; D_801599B8 = 0x801599B8; D_80159AD0 = 0x80159AD0; D_80159AD4 = 0x80159AD4; -gMusicUnkVolume = 0x80159AE0; -gMusicTargetVolume = 0x80159AE2; -gMusicUnkVolume2 = 0x80159AE4; -gMusicCurrentVolume = 0x80159AE6; -gMusicPlayers = 0x80159AF0; D_80159B08 = 0x80159B08; D_80159B50 = 0x80159B50; -gUIPanels = 0x80159D50; D_80159D54 = 0x80159D54; D_80159E7E = 0x80159E7E; D_8015A010 = 0x8015A010; @@ -944,7 +866,6 @@ D_8015A2BC = 0x8015A2BC; D_8015A2BE = 0x8015A2BE; D_8015A2D0 = 0x8015A2D0; D_8015A370 = 0x8015A370; -gCollisionStatus = 0x8015A550; D_8015A578 = 0x8015A578; D_8015A57A = 0x8015A57A; D_8015A590 = 0x8015A590; @@ -964,11 +885,8 @@ D_80197000 = 0x80197000; D_801A6000 = 0x801A6000; D_801A7000 = 0x801A7000; D_801AA000 = 0x801AA000; -gBackgroundImage = 0x80200000; -func_80200080 = 0x80200080; D_80210000 = 0x80210000; D_802187E4 = 0x802187E4; -func_80218DF4_465284 = 0x80218DF4; D_80219040 = 0x80219040; D_8021A2B8 = 0x8021A2B8; D_8021A2D4 = 0x8021A2D4; @@ -1080,7 +998,6 @@ D_80228430 = 0x80228430; D_80228438 = 0x80228438; D_80228440 = 0x80228440; D_80228448 = 0x80228448; -D_80228450 = 0x80228450; D_80228748 = 0x80228748; D_80228754 = 0x80228754; D_80228760 = 0x80228760; @@ -1097,7 +1014,6 @@ D_8022DA30 = 0x8022DA30; D_8022DA34 = 0x8022DA34; D_8022EB70 = 0x8022EB70; D_8022EB78 = 0x8022EB78; -D_8022EB80 = 0x8022EB80; D_8022EFD0 = 0x8022EFD0; D_8022F3E0 = 0x8022F3E0; D_8022F820 = 0x8022F820; @@ -1122,7 +1038,6 @@ D_80231300 = 0x80231300; D_80231308 = 0x80231308; D_80231310 = 0x80231310; D_80231318 = 0x80231318; -D_80231320 = 0x80231320; D_80231678 = 0x80231678; D_80231B08 = 0x80231B08; D_80231FA8 = 0x80231FA8; @@ -1138,7 +1053,6 @@ D_80232A00 = 0x80232A00; D_80232A08 = 0x80232A08; D_80232A10 = 0x80232A10; D_80232A18 = 0x80232A18; -D_80232A20 = 0x80232A20; D_80232AF0 = 0x80232AF0; D_80232AF8 = 0x80232AF8; D_80232B00 = 0x80232B00; @@ -1149,7 +1063,6 @@ D_80232B20 = 0x80232B20; D_80232B28 = 0x80232B28; D_80232B30 = 0x80232B30; D_80232B38 = 0x80232B38; -D_80232B40 = 0x80232B40; D_80232BE8 = 0x80232BE8; D_80232C20 = 0x80232C20; D_80232C4C = 0x80232C4C; @@ -1280,136 +1193,73 @@ D_8023D2D0 = 0x8023D2D0; D_8023D330 = 0x8023D330; D_8023D334 = 0x8023D334; D_8023D338 = 0x8023D338; -get_dpad_input_radial = 0x8023E000; -func_802402B0_90CEF0 = 0x802402B0; D_802402C0 = 0x802402C0; -func_802402D0_A7A7D0 = 0x802402D0; -func_802402E0_A071E0 = 0x802402E0; -func_80240330_8EC150 = 0x80240330; D_80240333 = 0x80240333; D_80240334 = 0x80240334; D_80240338 = 0x80240338; -func_80240390_8B0400 = 0x80240390; -func_802403A0_9FAB90 = 0x802403A0; -func_80240480_8C8410 = 0x80240480; -func_80240620_B351F0 = 0x80240620; D_802406C0 = 0x802406C0; -func_802406F0_92A9A0 = 0x802406F0; -func_802407C0_843390 = 0x802407C0; D_802407D0 = 0x802407D0; D_802407E0 = 0x802407E0; -func_802407F0_87A3D0 = 0x802407F0; -func_802407F4_8D45B4 = 0x802407F4; -func_80240850_AEDC60 = 0x80240850; -func_80240870_BED660 = 0x80240870; -func_80240880_A2AAC0 = 0x80240880; D_802408C0 = 0x802408C0; D_8024092C = 0x8024092C; D_80240970 = 0x80240970; D_802409F0 = 0x802409F0; -func_80240A30_882BF0 = 0x80240A30; -func_80240A38_898018 = 0x80240A38; -func_80240AA0_95BCA0 = 0x80240AA0; -func_80240B00_900170 = 0x80240B00; D_80240C0C = 0x80240C0C; D_80240C0F = 0x80240C0F; -func_80240C20_872650 = 0x80240C20; D_80240C24 = 0x80240C24; D_80240CBC = 0x80240CBC; -func_80240D98_99D728 = 0x80240D98; D_80240D9C = 0x80240D9C; D_80240DE0 = 0x80240DE0; -func_80240E00_8B0E70 = 0x80240E00; D_80240E04 = 0x80240E04; D_80240E10 = 0x80240E10; D_80240E88 = 0x80240E88; D_80240E8C = 0x80240E8C; -func_80240E90_A878E0 = 0x80240E90; -func_80240E94_9C6274 = 0x80240E94; D_80240EF0 = 0x80240EF0; D_80240F00 = 0x80240F00; D_80240F08 = 0x80240F08; D_80240F28 = 0x80240F28; -func_80240F2C_95C12C = 0x80240F2C; -func_80240FD0_A3A4B0 = 0x80240FD0; D_80240FF8 = 0x80240FF8; D_8024100C = 0x8024100C; -func_80241040_BE47F0 = 0x80241040; D_802410C0 = 0x802410C0; D_80241100 = 0x80241100; -func_80241108_97EBD8 = 0x80241108; D_80241118 = 0x80241118; -func_80241120_A8DBA0 = 0x80241120; D_80241158 = 0x80241158; D_80241180 = 0x80241180; D_80241188 = 0x80241188; -func_8024119C_C3267C = 0x8024119C; -func_802411A0_D6FB50 = 0x802411A0; -func_802411B8_887578 = 0x802411B8; -func_8024121C_889DEC = 0x8024121C; D_80241220 = 0x80241220; -func_802412A0_CBA4A0 = 0x802412A0; -func_8024130C_C3783C = 0x8024130C; D_80241310 = 0x80241310; -func_80241340_887700 = 0x80241340; -func_80241370_843F40 = 0x80241370; D_802413F8 = 0x802413F8; D_80241420 = 0x80241420; D_80241428 = 0x80241428; D_80241430 = 0x80241430; -func_80241438_8535A8 = 0x80241438; D_8024143C = 0x8024143C; -func_80241440_8ED260 = 0x80241440; -func_80241440_B855C0 = 0x80241440; D_80241448 = 0x80241448; -func_80241470_95C670 = 0x80241470; D_80241478 = 0x80241478; D_80241488 = 0x80241488; -func_802414D0_CC4CE0 = 0x802414D0; -func_80241510_91FA80 = 0x80241510; -func_80241518_BD0108 = 0x80241518; -func_80241530_8ED350 = 0x80241530; D_80241534 = 0x80241534; D_80241538 = 0x80241538; D_8024153B = 0x8024153B; D_80241600 = 0x80241600; -D_80241608 = 0x80241608; D_8024160C = 0x8024160C; -func_80241610_D31290 = 0x80241610; D_8024161C = 0x8024161C; -func_8024162C_9F606C = 0x8024162C; D_80241650 = 0x80241650; -func_80241658_8B16C8 = 0x80241658; -func_80241680_BE0410 = 0x80241680; -func_80241680_8537F0 = 0x80241680; D_80241684 = 0x80241684; D_80241688 = 0x80241688; D_8024168B = 0x8024168B; D_8024168C = 0x8024168C; -func_80241690_A08590 = 0x80241690; D_802416AC = 0x802416AC; -func_802416B0_A49C70 = 0x802416B0; -func_802416F0_9C6AD0 = 0x802416F0; -func_80241740_B36310 = 0x80241740; D_80241748 = 0x80241748; -func_80241760_C50C70 = 0x80241760; D_80241768 = 0x80241768; -func_80241770_832F70 = 0x80241770; D_80241778 = 0x80241778; -func_80241780_E13EE0 = 0x80241780; -func_80241780_8ED5A0 = 0x80241780; D_802417C8 = 0x802417C8; D_802417CC = 0x802417CC; D_802417D0 = 0x802417D0; D_802417D8 = 0x802417D8; D_802417E4 = 0x802417E4; D_802417E8 = 0x802417E8; -func_802417EC_C5BF2C = 0x802417EC; -func_80241800_8B1870 = 0x80241800; D_80241800 = 0x80241800; D_80241810 = 0x80241810; D_80241820 = 0x80241820; -func_80241850_A2BA90 = 0x80241850; D_80241854 = 0x80241854; D_8024186C = 0x8024186C; D_80241880 = 0x80241880; @@ -1419,34 +1269,16 @@ D_802418B0 = 0x802418B0; D_80241900 = 0x80241900; D_80241930 = 0x80241930; D_80241A00 = 0x80241A00; -func_80241A78_BA61F8 = 0x80241A78; -func_80241AC8_D2D7F8 = 0x80241AC8; -func_80241AD4_B4C544 = 0x80241AD4; -func_80241AE0_DCE7B0 = 0x80241AE0; -func_80241AE0_9F6520 = 0x80241AE0; D_80241AE8 = 0x80241AE8; -func_80241AEC_80236C = 0x80241AEC; -func_80241AF0_A6FED0 = 0x80241AF0; D_80241AF8 = 0x80241AF8; -func_80241B00_B366D0 = 0x80241B00; -func_80241B08_B94F48 = 0x80241B08; -func_80241B10_88A6E0 = 0x80241B10; -func_80241B14_9A9F04 = 0x80241B14; D_80241B18 = 0x80241B18; D_80241B2C = 0x80241B2C; -func_80241B38_BEE928 = 0x80241B38; -func_80241B44_E06EA4 = 0x80241B44; -func_80241B54_8023D4 = 0x80241B54; D_80241B60 = 0x80241B60; D_80241B64 = 0x80241B64; D_80241B68 = 0x80241B68; D_80241B70 = 0x80241B70; -func_80241B74_911224 = 0x80241B74; -func_80241B7C_A043BC = 0x80241B7C; D_80241B80 = 0x80241B80; -func_80241B84_9C6F64 = 0x80241B84; D_80241B88 = 0x80241B88; -func_80241B9C_B3676C = 0x80241B9C; D_80241BAE = 0x80241BAE; D_80241BB0 = 0x80241BB0; D_80241BF0 = 0x80241BF0; @@ -1457,238 +1289,128 @@ D_80241C2C = 0x80241C2C; D_80241C2F = 0x80241C2F; D_80241C30 = 0x80241C30; D_80241C33 = 0x80241C33; -func_80241C40_844810 = 0x80241C40; D_80241C48 = 0x80241C48; D_80241C58 = 0x80241C58; D_80241C68 = 0x80241C68; D_80241C98 = 0x80241C98; -func_80241CB0_A17ED0 = 0x80241CB0; -func_80241CCC_A3B1AC = 0x80241CCC; D_80241CD0 = 0x80241CD0; -func_80241CF0_9113A0 = 0x80241CF0; -func_80241CF4_88A8C4 = 0x80241CF4; D_80241CF8 = 0x80241CF8; -func_80241D38_991518 = 0x80241D38; D_80241D3B = 0x80241D3B; D_80241D98 = 0x80241D98; D_80241D9C = 0x80241D9C; -func_80241DA0_7ECAB0 = 0x80241DA0; D_80241DA8 = 0x80241DA8; D_80241DD0 = 0x80241DD0; D_80241E20 = 0x80241E20; -func_80241E28_853F98 = 0x80241E28; D_80241E30 = 0x80241E30; -func_80241E40_DAF240 = 0x80241E40; -func_80241E48_C70178 = 0x80241E48; -func_80241E50_A4A410 = 0x80241E50; -func_80241E58_9C7238 = 0x80241E58; -func_80241E90_8B1F00 = 0x80241E90; -func_80241E98_A1CF98 = 0x80241E98; D_80241E98 = 0x80241E98; D_80241EA0 = 0x80241EA0; D_80241EA8 = 0x80241EA8; D_80241ECC = 0x80241ECC; -func_80241F00_854070 = 0x80241F00; -func_80241F10_802790 = 0x80241F10; D_80241F14 = 0x80241F14; -func_80241F94_95D194 = 0x80241F94; -func_80241F98_D21E28 = 0x80241F98; D_80241FB0 = 0x80241FB0; D_80241FB8 = 0x80241FB8; D_80241FC0 = 0x80241FC0; -func_80241FC8_C87A78 = 0x80241FC8; D_80241FE0 = 0x80241FE0; -func_80241FE8_D3C5B8 = 0x80241FE8; D_80241FF4 = 0x80241FF4; -func_80241FF8_C41DA8 = 0x80241FF8; -func_80242000_C48BE0 = 0x80242000; D_80242000 = 0x80242000; D_80242008 = 0x80242008; D_80242010 = 0x80242010; -func_80242030_8EDE50 = 0x80242030; D_80242030 = 0x80242030; -func_80242038_CD3E68 = 0x80242038; D_80242038 = 0x80242038; -func_80242040_8B20B0 = 0x80242040; D_80242048 = 0x80242048; -func_80242050_95D250 = 0x80242050; D_80242054 = 0x80242054; D_80242058 = 0x80242058; D_8024205C = 0x8024205C; D_80242070 = 0x80242070; D_80242088 = 0x80242088; D_802420A0 = 0x802420A0; -func_802420B0_87BC90 = 0x802420B0; D_802420BC = 0x802420BC; -D_802420D0 = 0x802420D0; -func_80242110_D21FA0 = 0x80242110; D_80242118 = 0x80242118; -func_80242134_88AD04 = 0x80242134; -func_80242148_825408 = 0x80242148; D_80242160 = 0x80242160; D_80242180 = 0x80242180; -func_8024219C_BE594C = 0x8024219C; -func_802421A0_8EDFC0 = 0x802421A0; -func_802421D0_7ECEE0 = 0x802421D0; -D_802421D8 = 0x802421D8; -func_80242200_C62F10 = 0x80242200; D_80242208 = 0x80242208; D_80242220 = 0x80242220; -func_80242230_CF4E00 = 0x80242230; -func_80242240_9C7620 = 0x80242240; -func_80242248_87BE28 = 0x80242248; -func_80242250_7ECF60 = 0x80242250; D_80242288 = 0x80242288; D_80242290 = 0x80242290; -func_80242298_CC5AA8 = 0x80242298; D_802422CC = 0x802422CC; D_802422D0 = 0x802422D0; -func_802422F0_A706D0 = 0x802422F0; -func_8024231C_A1D41C = 0x8024231C; D_80242340 = 0x80242340; D_80242344 = 0x80242344; -func_80242348_A1D448 = 0x80242348; -D_80242350 = 0x80242350; D_80242370 = 0x80242370; -D_80242378 = 0x80242378; D_802423B0 = 0x802423B0; -D_802423B8 = 0x802423B8; D_802423C8 = 0x802423C8; D_802423E0 = 0x802423E0; D_8024242C = 0x8024242C; D_80242430 = 0x80242430; -D_80242438 = 0x80242438; -func_80242448_CC5C58 = 0x80242448; D_80242470 = 0x80242470; D_80242480 = 0x80242480; -func_802424A0_833CA0 = 0x802424A0; -D_802424A8 = 0x802424A8; -func_802424C0_B4CF30 = 0x802424C0; D_802424E0 = 0x802424E0; -func_802424F0_C38A20 = 0x802424F0; D_80242510 = 0x80242510; -func_80242514_9C78F4 = 0x80242514; -D_80242518 = 0x80242518; D_80242520 = 0x80242520; D_80242528 = 0x80242528; D_80242530 = 0x80242530; -func_80242538_D223C8 = 0x80242538; D_80242538 = 0x80242538; D_8024253C = 0x8024253C; -func_80242540_A09440 = 0x80242540; -func_80242558_A1D658 = 0x80242558; -func_80242560_95D760 = 0x80242560; D_80242568 = 0x80242568; -func_80242570_7ED280 = 0x80242570; -func_802425BC_A1D6BC = 0x802425BC; -func_802425E0_A1D6E0 = 0x802425E0; D_802425E4 = 0x802425E4; D_802425E8 = 0x802425E8; D_80242610 = 0x80242610; D_80242614 = 0x80242614; -func_80242618_A18838 = 0x80242618; D_80242618 = 0x80242618; D_80242630 = 0x80242630; D_8024264C = 0x8024264C; D_80242670 = 0x80242670; D_80242678 = 0x80242678; -func_80242680_802F00 = 0x80242680; -D_80242688 = 0x80242688; -func_80242688_C79368 = 0x80242688; D_802426B0 = 0x802426B0; D_802426B8 = 0x802426B8; -func_802426C8_7ED3D8 = 0x802426C8; -func_802426E0_BA6E60 = 0x802426E0; -func_80242708_854878 = 0x80242708; D_8024273C = 0x8024273C; D_80242758 = 0x80242758; D_802427A8 = 0x802427A8; -func_802427B0_BE5F60 = 0x802427B0; D_802427BC = 0x802427BC; -func_802427C0_9C7BA0 = 0x802427C0; D_802427C8 = 0x802427C8; -func_802427D0_833FD0 = 0x802427D0; D_802427D8 = 0x802427D8; D_802427E0 = 0x802427E0; -D_802427E8 = 0x802427E8; D_80242850 = 0x80242850; D_80242858 = 0x80242858; -func_80242860_8B28D0 = 0x80242860; -D_80242868 = 0x80242868; D_80242888 = 0x80242888; D_802428E0_DF1780 = 0x802428E0; -func_8024291C_C494FC = 0x8024291C; D_8024292C = 0x8024292C; D_80242930 = 0x80242930; -func_80242930_9C7D10 = 0x80242930; D_8024296C_C8841C = 0x8024296C; -func_80242970_7ED680 = 0x80242970; D_802429A4 = 0x802429A4; -func_802429B8_B37588 = 0x802429B8; D_802429BC = 0x802429BC; D_802429E0 = 0x802429E0; D_802429E8 = 0x802429E8; D_802429F4 = 0x802429F4; D_802429F8 = 0x802429F8; -func_80242A00_9D9A20 = 0x80242A00; -func_80242A30_7ED740 = 0x80242A30; -D_80242A38 = 0x80242A38; D_80242A3C_8EE85C = 0x80242A3C; -D_80242A78 = 0x80242A78; -D_80242AA0 = 0x80242AA0; -func_80242AC0 = 0x80242AC0; D_80242AC4 = 0x80242AC4; D_80242ACC = 0x80242ACC; D_80242AD0 = 0x80242AD0; D_80242B7E = 0x80242B7E; -func_80242B90_803410 = 0x80242B90; -func_80242B90_A1DC90 = 0x80242B90; D_80242B98 = 0x80242B98; D_80242B9C = 0x80242B9C; -pause_set_cursor_opacity = 0x80242BA0; -func_80242BA8_8B2C18 = 0x80242BA8; -update_end_player_turn = 0x80242BB0; -D_80242BB8 = 0x80242BB8; D_80242BD8 = 0x80242BD8; D_80242BF8 = 0x80242BF8; -func_80242C00_BB0540 = 0x80242C00; D_80242C08 = 0x80242C08; D_80242C0E = 0x80242C0E; -func_80242C30_B37800 = 0x80242C30; D_80242C30 = 0x80242C30; D_80242C38 = 0x80242C38; D_80242C40 = 0x80242C40; -func_80242C48_9122F8 = 0x80242C48; D_80242C50 = 0x80242C50; -D_80242C58 = 0x80242C58; D_80242C6C = 0x80242C6C; -func_80242C70_9AB060 = 0x80242C70; -D_80242CB0 = 0x80242CB0; -func_80242CD8_C799B8 = 0x80242CD8; D_80242CF0 = 0x80242CF0; -func_80242CF8_9D9D18 = 0x80242CF8; -func_80242D00_A96440 = 0x80242D00; D_80242D40 = 0x80242D40; D_80242D48 = 0x80242D48; D_80242D50 = 0x80242D50; D_80242D58 = 0x80242D58; D_80242D60 = 0x80242D60; -D_80242D68 = 0x80242D68; D_80242D70 = 0x80242D70; D_80242D80 = 0x80242D80; -D_80242D88 = 0x80242D88; -func_80242E88_95E088 = 0x80242E88; D_80242E90 = 0x80242E90; -D_80242E98 = 0x80242E98; -func_80242EAC_96C06C = 0x80242EAC; D_80242EB0 = 0x80242EB0; -D_80242EB8 = 0x80242EB8; -func_80242EBC_7EDBCC = 0x80242EBC; D_80242ECC = 0x80242ECC; -func_80242EE0_A1DFE0 = 0x80242EE0; D_80242EE8 = 0x80242EE8; -func_80242EF0_BE66A0 = 0x80242EF0; -func_80242EF8 = 0x80242EF8; D_80242F20 = 0x80242F20; D_80242F30 = 0x80242F30; D_80242F34 = 0x80242F34; @@ -1696,117 +1418,69 @@ D_80242F38 = 0x80242F38; D_80242F40 = 0x80242F40; D_80242F50 = 0x80242F50; D_80242F58 = 0x80242F58; -func_80242F60_826220 = 0x80242F60; -func_80242F68 = 0x80242F68; -D_80242F70 = 0x80242F70; D_80242F88 = 0x80242F88; -func_80242F90 = 0x80242F90; D_80242F98 = 0x80242F98; -D_80242FA0 = 0x80242FA0; D_80242FB0 = 0x80242FB0; -func_80242FE0_A1E0E0 = 0x80242FE0; D_80242FE8 = 0x80242FE8; D_80242FF0 = 0x80242FF0; D_80242FF8 = 0x80242FF8; -func_80243000_9AB3F0 = 0x80243000; D_80243008 = 0x80243008; -func_80243010_A1E110 = 0x80243010; D_80243048 = 0x80243048; D_8024304C = 0x8024304C; -func_80243070_8B30E0 = 0x80243070; D_80243078 = 0x80243078; D_80243080 = 0x80243080; -func_80243088_8551F8 = 0x80243088; D_8024308C = 0x8024308C; -func_80243090_8B3100 = 0x80243090; -func_80243090_C395C0 = 0x80243090; D_80243098 = 0x80243098; -func_8024309C_95E29C = 0x8024309C; D_802430A0 = 0x802430A0; -func_802430A8_A967E8 = 0x802430A8; D_802430B0 = 0x802430B0; -func_802430B8_8B3128 = 0x802430B8; D_802430BC = 0x802430BC; -func_802430C0_B37C90 = 0x802430C0; D_802430E8 = 0x802430E8; -func_802430F0_C49CD0 = 0x802430F0; D_80243110 = 0x80243110; D_80243168 = 0x80243168; D_80243170 = 0x80243170; D_80243178 = 0x80243178; D_80243190 = 0x80243190; D_802431CC = 0x802431CC; -func_802431E4_8B3254 = 0x802431E4; D_802431F0 = 0x802431F0; D_802431F8 = 0x802431F8; -func_802431FC_95E3FC = 0x802431FC; D_80243200 = 0x80243200; -func_80243210_8B3280 = 0x80243210; -func_80243220_DC04D0 = 0x80243220; D_80243240 = 0x80243240; D_80243248 = 0x80243248; D_80243250 = 0x80243250; -func_80243254_8553C4 = 0x80243254; D_80243258 = 0x80243258; D_80243260 = 0x80243260; -D_80243268 = 0x80243268; -func_80243284_8B32F4 = 0x80243284; D_80243288 = 0x80243288; D_802432D0 = 0x802432D0; D_802432D4 = 0x802432D4; D_802432E0 = 0x802432E0; -func_802432E8 = 0x802432E8; D_802432F0 = 0x802432F0; -func_80243300_8B3370 = 0x80243300; -func_80243310_9AB700 = 0x80243310; D_80243328 = 0x80243328; D_80243340 = 0x80243340; D_80243348 = 0x80243348; -func_80243350_95E550 = 0x80243350; -D_80243358 = 0x80243358; -func_80243370_8B33E0 = 0x80243370; D_80243374 = 0x80243374; -func_80243380_8554F0 = 0x80243380; D_80243390 = 0x80243390; -func_802433AC_8B341C = 0x802433AC; D_802433AE = 0x802433AE; D_802433B0 = 0x802433B0; D_802433B2 = 0x802433B2; D_802433B4 = 0x802433B4; -D_802433C0 = 0x802433C0; D_802433D8 = 0x802433D8; -D_802433E0 = 0x802433E0; -func_802433F0_855560 = 0x802433F0; -D_802433F8 = 0x802433F8; D_80243434 = 0x80243434; D_80243438 = 0x80243438; -func_8024343C_8555AC = 0x8024343C; D_80243440 = 0x80243440; D_80243448 = 0x80243448; D_80243450 = 0x80243450; -D_80243458 = 0x80243458; D_802434A0 = 0x802434A0; D_802434A8 = 0x802434A8; D_802434B0 = 0x802434B0; D_802434B8 = 0x802434B8; D_802434C0 = 0x802434C0; -D_802434C8 = 0x802434C8; -D_802434E0 = 0x802434E0; D_802434F8 = 0x802434F8; D_80243560 = 0x80243560; -pause_textbox_draw_contents = 0x80243570; D_80243580 = 0x80243580; D_802435B0 = 0x802435B0; -func_802435B8_DD0288 = 0x802435B8; -func_802435C0_95E7C0 = 0x802435C0; -func_802435C8_96C788 = 0x802435C8; -func_802435D0_CC6DE0 = 0x802435D0; -func_802435D8_C43388 = 0x802435D8; D_802435E0 = 0x802435E0; D_802435E8 = 0x802435E8; -func_802435E8_DD02B8 = 0x802435E8; D_802435EC = 0x802435EC; -func_802435F0_C7A2D0 = 0x802435F0; D_802435F0 = 0x802435F0; D_80243600 = 0x80243600; D_80243608 = 0x80243608; @@ -1816,48 +1490,29 @@ D_8024362C = 0x8024362C; D_80243650 = 0x80243650; D_80243658 = 0x80243658; D_8024365C = 0x8024365C; -D_80243660 = 0x80243660; D_802436D0 = 0x802436D0; D_802436DC = 0x802436DC; D_802436E0 = 0x802436E0; -func_802436FC_8B376C = 0x802436FC; D_80243700 = 0x80243700; D_80243708 = 0x80243708; -func_80243718_C7A3F8 = 0x80243718; D_80243720 = 0x80243720; -D_80243730 = 0x80243730; D_8024373C = 0x8024373C; -func_80243758_A2D998 = 0x80243758; -func_80243760_8B37D0 = 0x80243760; D_80243768 = 0x80243768; D_80243770 = 0x80243770; -func_80243778_96C938 = 0x80243778; D_802437A0 = 0x802437A0; D_802437B0 = 0x802437B0; D_802437B4 = 0x802437B4; -func_802437B8 = 0x802437B8; D_802437BC = 0x802437BC; D_802437C0 = 0x802437C0; D_802437E0 = 0x802437E0; -D_802437F0 = 0x802437F0; D_80243830 = 0x80243830; -D_80243838 = 0x80243838; -func_80243870_96CA30 = 0x80243870; D_8024387C = 0x8024387C; -func_80243880_95EA80 = 0x80243880; D_80243888 = 0x80243888; D_80243890 = 0x80243890; -func_80243898 = 0x80243898; D_802438E0 = 0x802438E0; D_802438E8 = 0x802438E8; -func_802438F0_95EAF0 = 0x802438F0; -func_802438F0_C436A0 = 0x802438F0; D_802438F8 = 0x802438F8; -D_80243900 = 0x80243900; -switch_order = 0x80243918; -func_80243920_8041A0 = 0x80243920; D_80243928 = 0x80243928; -D_80243930 = 0x80243930; D_80243960 = 0x80243960; D_802439E0 = 0x802439E0; D_802439E8 = 0x802439E8; @@ -1868,14 +1523,12 @@ D_80243A08 = 0x80243A08; D_80243A10 = 0x80243A10; D_80243A14 = 0x80243A14; D_80243A18 = 0x80243A18; -D_80243A20 = 0x80243A20; D_80243A48 = 0x80243A48; D_80243A80 = 0x80243A80; D_80243A90 = 0x80243A90; D_80243AD8 = 0x80243AD8; D_80243B14 = 0x80243B14; D_80243B18 = 0x80243B18; -func_80243B44_C74FC4 = 0x80243B44; D_80243B48 = 0x80243B48; D_80243BB8 = 0x80243BB8; D_80243BC0 = 0x80243BC0; @@ -1887,12 +1540,9 @@ D_80243BD4 = 0x80243BD4; D_80243BD8 = 0x80243BD8; D_80243BE0 = 0x80243BE0; D_80243BF0 = 0x80243BF0; -D_80243BF8 = 0x80243BF8; D_80243C40 = 0x80243C40; -func_80243C50_C43A00 = 0x80243C50; D_80243CAC = 0x80243CAC; D_80243CB4 = 0x80243CB4; -func_80243CC0_A2DF00 = 0x80243CC0; D_80243CC4 = 0x80243CC4; D_80243CC8 = 0x80243CC8; D_80243CD0 = 0x80243CD0; @@ -1906,17 +1556,14 @@ D_80243D30 = 0x80243D30; D_80243D38 = 0x80243D38; D_80243D40 = 0x80243D40; D_80243D48 = 0x80243D48; -D_80243D50 = 0x80243D50; D_80243D58 = 0x80243D58; D_80243D5C = 0x80243D5C; D_80243D68 = 0x80243D68; D_80243D70 = 0x80243D70; D_80243D74 = 0x80243D74; -func_80243D78_855EE8 = 0x80243D78; D_80243D80 = 0x80243D80; D_80243D88 = 0x80243D88; D_80243D90 = 0x80243D90; -D_80243D98 = 0x80243D98; D_80243DA4 = 0x80243DA4; D_80243DD8 = 0x80243DD8; D_80243DDC = 0x80243DDC; @@ -1937,15 +1584,12 @@ D_80243F38 = 0x80243F38; D_80243F40 = 0x80243F40; D_80243F90 = 0x80243F90; D_80243F98 = 0x80243F98; -D_80243FA0 = 0x80243FA0; D_80243FE0 = 0x80243FE0; D_80243FE8 = 0x80243FE8; -D_80243FF0 = 0x80243FF0; D_80244010 = 0x80244010; D_80244018 = 0x80244018; D_80244020 = 0x80244020; D_80244028 = 0x80244028; -func_80244030 = 0x80244030; D_80244038 = 0x80244038; D_80244040 = 0x80244040; D_8024404C = 0x8024404C; @@ -1961,7 +1605,6 @@ D_802440E2 = 0x802440E2; D_802440E3 = 0x802440E3; D_802440E4 = 0x802440E4; D_802440E5 = 0x802440E5; -func_802440E8_804968 = 0x802440E8; D_802440EB = 0x802440EB; D_802440EC = 0x802440EC; D_802440EF = 0x802440EF; @@ -1971,20 +1614,17 @@ D_802440F4 = 0x802440F4; D_802440F7 = 0x802440F7; D_802440F8 = 0x802440F8; D_802440FB = 0x802440FB; -func_802440FC_80497C = 0x802440FC; D_802440FF = 0x802440FF; D_80244100 = 0x80244100; D_80244104 = 0x80244104; D_8024412C = 0x8024412C; D_80244130 = 0x80244130; D_80244138 = 0x80244138; -D_80244140 = 0x80244140; D_80244154 = 0x80244154; D_80244158 = 0x80244158; D_80244160 = 0x80244160; D_80244170 = 0x80244170; D_80244180 = 0x80244180; -D_80244188 = 0x80244188; D_802441A0 = 0x802441A0; D_802441A8 = 0x802441A8; D_802441B0 = 0x802441B0; @@ -1994,64 +1634,48 @@ D_802441D0 = 0x802441D0; D_802441D8 = 0x802441D8; D_802441DC = 0x802441DC; D_802441E0 = 0x802441E0; -D_802441E8 = 0x802441E8; D_802441F0 = 0x802441F0; D_80244204 = 0x80244204; D_80244208 = 0x80244208; D_802442D0 = 0x802442D0; D_802442D8 = 0x802442D8; -func_802442E0_9DB300 = 0x802442E0; -D_802442E8 = 0x802442E8; -D_80244318 = 0x80244318; D_80244328 = 0x80244328; D_80244330 = 0x80244330; D_80244338 = 0x80244338; D_80244340 = 0x80244340; D_80244348 = 0x80244348; -D_80244350 = 0x80244350; D_80244358 = 0x80244358; D_802443C0 = 0x802443C0; -func_802443D0_9DB3F0 = 0x802443D0; D_802443F0 = 0x802443F0; D_802443F8 = 0x802443F8; D_80244400 = 0x80244400; -D_80244408 = 0x80244408; D_8024440C = 0x8024440C; D_80244434 = 0x80244434; D_80244438 = 0x80244438; D_80244440 = 0x80244440; D_80244448 = 0x80244448; D_80244450 = 0x80244450; -D_80244458 = 0x80244458; D_80244460 = 0x80244460; D_80244480 = 0x80244480; -D_80244488 = 0x80244488; D_80244490 = 0x80244490; D_80244494 = 0x80244494; D_802444A0 = 0x802444A0; D_802444A8 = 0x802444A8; D_802444B0 = 0x802444B0; -D_802444B8 = 0x802444B8; D_802444BC = 0x802444BC; D_802444C0 = 0x802444C0; D_802444F0 = 0x802444F0; D_802445C0 = 0x802445C0; -D_802445C8 = 0x802445C8; D_802445D0 = 0x802445D0; D_802445D4 = 0x802445D4; D_802445F0 = 0x802445F0; -D_802445F8 = 0x802445F8; D_802445FC = 0x802445FC; D_80244600 = 0x80244600; D_80244620 = 0x80244620; D_80244628 = 0x80244628; D_8024462C = 0x8024462C; D_80244630 = 0x80244630; -D_80244638 = 0x80244638; -D_80244678 = 0x80244678; -D_80244700 = 0x80244700; D_80244718 = 0x80244718; -D_80244720 = 0x80244720; D_80244750 = 0x80244750; D_80244758 = 0x80244758; D_8024476C = 0x8024476C; @@ -2068,34 +1692,22 @@ D_802447D8 = 0x802447D8; D_80244810 = 0x80244810; D_80244818 = 0x80244818; D_80244820 = 0x80244820; -D_80244828 = 0x80244828; D_80244830 = 0x80244830; D_80244838 = 0x80244838; D_80244840 = 0x80244840; D_80244860 = 0x80244860; D_80244868 = 0x80244868; -D_80244870 = 0x80244870; D_80244880 = 0x80244880; D_80244888 = 0x80244888; D_80244890 = 0x80244890; -D_80244898 = 0x80244898; -func_802448A0_805120 = 0x802448A0; D_802448A8 = 0x802448A8; D_802448B0 = 0x802448B0; -D_802448B8 = 0x802448B8; -D_802448D8 = 0x802448D8; D_80244900 = 0x80244900; -D_80244910 = 0x80244910; D_80244968 = 0x80244968; D_802449B0 = 0x802449B0; D_802449D0 = 0x802449D0; -D_802449D8 = 0x802449D8; -func_802449F0_A2EC30 = 0x802449F0; -func_802449F8_805278 = 0x802449F8; -D_80244A00 = 0x80244A00; D_80244A10 = 0x80244A10; D_80244A20 = 0x80244A20; -end_battle = 0x80244A50; D_80244A54 = 0x80244A54; D_80244A74 = 0x80244A74; D_80244A78 = 0x80244A78; @@ -2106,8 +1718,6 @@ D_80244B48 = 0x80244B48; D_80244B50 = 0x80244B50; D_80244B88 = 0x80244B88; D_80244B8C = 0x80244B8C; -pause_tabs_draw_invis = 0x80244B90; -pause_tabs_draw_stats_805418 = 0x80244B98; D_80244BB0 = 0x80244BB0; D_80244BB8 = 0x80244BB8; D_80244BEC = 0x80244BEC; @@ -2117,51 +1727,36 @@ D_80244C4C = 0x80244C4C; D_80244CA0 = 0x80244CA0; D_80244CB0 = 0x80244CB0; D_80244CB8 = 0x80244CB8; -pause_tabs_draw_badges_A2EF00 = 0x80244CC0; -D_80244CC8 = 0x80244CC8; D_80244CD0 = 0x80244CD0; D_80244CF0 = 0x80244CF0; -D_80244CF8 = 0x80244CF8; D_80244D08 = 0x80244D08; D_80244D10 = 0x80244D10; -D_80244D18 = 0x80244D18; D_80244D24 = 0x80244D24; -D_80244D28 = 0x80244D28; D_80244D50 = 0x80244D50; D_80244D54 = 0x80244D54; D_80244D58 = 0x80244D58; -func_80244D60 = 0x80244D60; -func_80244D68_8055E8 = 0x80244D68; D_80244D74 = 0x80244D74; D_80244D84 = 0x80244D84; D_80244D88 = 0x80244D88; D_80244DA0 = 0x80244DA0; -D_80244DA8 = 0x80244DA8; D_80244DB4 = 0x80244DB4; D_80244DE0 = 0x80244DE0; -pause_tabs_draw_items = 0x80244DE8; D_80244DF0 = 0x80244DF0; D_80244DF8 = 0x80244DF8; D_80244E00 = 0x80244E00; D_80244E08 = 0x80244E08; -func_80244E10_805690 = 0x80244E10; D_80244E18 = 0x80244E18; D_80244E20 = 0x80244E20; D_80244E28 = 0x80244E28; D_80244E30 = 0x80244E30; -func_80244E38 = 0x80244E38; D_80244E44 = 0x80244E44; D_80244E78 = 0x80244E78; -D_80244E80 = 0x80244E80; D_80244E84 = 0x80244E84; D_80244EB8 = 0x80244EB8; -D_80244EC0 = 0x80244EC0; D_80244EE0 = 0x80244EE0; D_80244EE8 = 0x80244EE8; D_80244EF0 = 0x80244EF0; -func_80244EF8 = 0x80244EF8; D_80244F38 = 0x80244F38; -D_80244F40 = 0x80244F40; D_80244F48 = 0x80244F48; D_80244F78 = 0x80244F78; D_80244F88 = 0x80244F88; @@ -2169,14 +1764,12 @@ D_80244F90 = 0x80244F90; D_80244FA0 = 0x80244FA0; D_80244FA8 = 0x80244FA8; D_80244FB0 = 0x80244FB0; -func_80244FB8_A2F1F8 = 0x80244FB8; D_80244FD0 = 0x80244FD0; D_80244FDC = 0x80244FDC; D_80244FEC = 0x80244FEC; D_8024501C = 0x8024501C; D_80245050 = 0x80245050; D_80245058 = 0x80245058; -D_80245060 = 0x80245060; D_802450B0 = 0x802450B0; D_80245114 = 0x80245114; D_80245154 = 0x80245154; @@ -2200,12 +1793,10 @@ D_802452A8 = 0x802452A8; D_802452B0 = 0x802452B0; D_802452B4 = 0x802452B4; D_802452B8 = 0x802452B8; -D_802452C0 = 0x802452C0; D_802452F8 = 0x802452F8; D_80245300 = 0x80245300; D_80245308 = 0x80245308; D_80245310 = 0x80245310; -D_80245318 = 0x80245318; D_80245320 = 0x80245320; D_80245328 = 0x80245328; D_80245330 = 0x80245330; @@ -2221,11 +1812,9 @@ D_80245378 = 0x80245378; D_80245380 = 0x80245380; D_80245388 = 0x80245388; D_80245390 = 0x80245390; -D_80245398 = 0x80245398; D_802453B0 = 0x802453B0; D_802453B8 = 0x802453B8; D_802453C0 = 0x802453C0; -D_802453C8 = 0x802453C8; D_802453D0 = 0x802453D0; D_802453D8 = 0x802453D8; D_802453E0 = 0x802453E0; @@ -2233,10 +1822,8 @@ D_802453F0 = 0x802453F0; D_802453F8 = 0x802453F8; D_80245400 = 0x80245400; D_80245408 = 0x80245408; -D_80245410 = 0x80245410; D_80245430 = 0x80245430; D_80245434 = 0x80245434; -func_80245438 = 0x80245438; D_80245448 = 0x80245448; D_80245450 = 0x80245450; D_80245458 = 0x80245458; @@ -2249,7 +1836,6 @@ D_802454A8 = 0x802454A8; D_802454B0 = 0x802454B0; D_802454B8 = 0x802454B8; D_80245528 = 0x80245528; -D_80245530 = 0x80245530; D_802455D0 = 0x802455D0; D_802455E0 = 0x802455E0; D_802455E8 = 0x802455E8; @@ -2278,22 +1864,15 @@ D_80245624 = 0x80245624; D_80245630 = 0x80245630; D_80245634 = 0x80245634; D_80245638 = 0x80245638; -D_80245640 = 0x80245640; D_80245648 = 0x80245648; D_80245650 = 0x80245650; D_80245674 = 0x80245674; D_80245698 = 0x80245698; -D_802456A0 = 0x802456A0; D_802456C0 = 0x802456C0; -func_802456C8_A2F908 = 0x802456C8; D_802456D0 = 0x802456D0; -DisablePartnerBlur = 0x802456D8; D_802456F4 = 0x802456F4; -func_80245718_A2F958 = 0x80245718; D_80245720 = 0x80245720; -D_80245728 = 0x80245728; D_802457B0 = 0x802457B0; -func_802457B8 = 0x802457B8; D_802457F4 = 0x802457F4; D_80245830 = 0x80245830; D_80245838 = 0x80245838; @@ -2302,56 +1881,40 @@ D_80245848 = 0x80245848; D_80245850 = 0x80245850; D_80245858 = 0x80245858; D_80245860 = 0x80245860; -D_80245868 = 0x80245868; D_802458A8 = 0x802458A8; -D_802458B0 = 0x802458B0; -D_802458C0 = 0x802458C0; D_802458F0 = 0x802458F0; D_80245928 = 0x80245928; D_8024592C = 0x8024592C; D_80245948 = 0x80245948; -func_80245950_8061D0 = 0x80245950; D_80245954 = 0x80245954; D_80245958 = 0x80245958; D_80245960 = 0x80245960; D_80245968 = 0x80245968; D_80245970 = 0x80245970; D_80245978 = 0x80245978; -pause_stats_draw_contents = 0x80245980; D_802459C0 = 0x802459C0; D_802459CC = 0x802459CC; D_80245A00 = 0x80245A00; D_80245A08 = 0x80245A08; -func_80245A10_806290 = 0x80245A10; D_80245A14 = 0x80245A14; D_80245A30 = 0x80245A30; D_80245A38 = 0x80245A38; -func_80245A40 = 0x80245A40; D_80245A60 = 0x80245A60; D_80245A68 = 0x80245A68; D_80245A70 = 0x80245A70; D_80245A78 = 0x80245A78; D_80245AB4 = 0x80245AB4; D_80245AB8 = 0x80245AB8; -update_player_action = 0x80245AD0; D_80245AD8 = 0x80245AD8; -D_80245AE0 = 0x80245AE0; -D_80245B10 = 0x80245B10; D_80245B20 = 0x80245B20; D_80245B28 = 0x80245B28; D_80245B30 = 0x80245B30; D_80245B38 = 0x80245B38; D_80245B40 = 0x80245B40; -D_80245B48 = 0x80245B48; D_80245BA0 = 0x80245BA0; -D_80245BA8 = 0x80245BA8; D_80245BD0 = 0x80245BD0; -D_80245BD8 = 0x80245BD8; -D_80245C70 = 0x80245C70; D_80245CD8 = 0x80245CD8; -D_80245CE0 = 0x80245CE0; D_80245CF0 = 0x80245CF0; -D_80245CF8 = 0x80245CF8; D_80245D34 = 0x80245D34; D_80245D37 = 0x80245D37; D_80245D38 = 0x80245D38; @@ -2360,21 +1923,18 @@ D_80245D48 = 0x80245D48; D_80245D50 = 0x80245D50; D_80245D58 = 0x80245D58; D_80245D60 = 0x80245D60; -D_80245D68 = 0x80245D68; D_80245D70 = 0x80245D70; D_80245D78 = 0x80245D78; D_80245D80 = 0x80245D80; D_80245D88 = 0x80245D88; D_80245D90 = 0x80245D90; D_80245D98 = 0x80245D98; -D_80245DA0 = 0x80245DA0; D_80245DC0 = 0x80245DC0; D_80245E00 = 0x80245E00; D_80245E24 = 0x80245E24; D_80245E64 = 0x80245E64; D_80245E80 = 0x80245E80; D_80245EE0 = 0x80245EE0; -D_80245EE8 = 0x80245EE8; D_80245EEC = 0x80245EEC; D_80245F10 = 0x80245F10; D_80245F18 = 0x80245F18; @@ -2384,15 +1944,10 @@ D_80245F38 = 0x80245F38; D_80245F40 = 0x80245F40; D_80245F44 = 0x80245F44; D_80245F48 = 0x80245F48; -D_80245F50 = 0x80245F50; D_80245FA8 = 0x80245FA8; D_80245FE8 = 0x80245FE8; -D_802460E0 = 0x802460E0; -D_80246130 = 0x80246130; D_80246150 = 0x80246150; -D_80246160 = 0x80246160; D_80246184 = 0x80246184; -D_802461B0 = 0x802461B0; D_802461B4 = 0x802461B4; D_802461F0 = 0x802461F0; D_802461F4 = 0x802461F4; @@ -2402,9 +1957,7 @@ D_8024626C = 0x8024626C; D_80246270 = 0x80246270; D_80246278 = 0x80246278; D_80246280 = 0x80246280; -D_80246288 = 0x80246288; D_802462C0 = 0x802462C0; -D_802462C8 = 0x802462C8; D_802462E0 = 0x802462E0; D_802462F0 = 0x802462F0; D_80246300 = 0x80246300; @@ -2421,18 +1974,13 @@ D_802463B8 = 0x802463B8; D_802463C0 = 0x802463C0; D_802463C8 = 0x802463C8; D_802463D0 = 0x802463D0; -D_802463D8 = 0x802463D8; D_80246424 = 0x80246424; D_80246430 = 0x80246430; D_80246480 = 0x80246480; -D_80246488 = 0x80246488; D_802464A4 = 0x802464A4; D_802464D0 = 0x802464D0; -D_802464D8 = 0x802464D8; -func_80246500_806D80 = 0x80246500; D_80246508 = 0x80246508; D_80246510 = 0x80246510; -D_80246518 = 0x80246518; D_80246528 = 0x80246528; D_8024652C = 0x8024652C; D_80246530 = 0x80246530; @@ -2446,7 +1994,6 @@ D_80246558 = 0x80246558; D_8024655C = 0x8024655C; D_80246560 = 0x80246560; D_80246568 = 0x80246568; -D_80246570 = 0x80246570; D_80246578 = 0x80246578; D_80246590 = 0x80246590; D_80246598 = 0x80246598; @@ -2471,7 +2018,6 @@ D_80246638 = 0x80246638; D_80246640 = 0x80246640; D_80246644 = 0x80246644; D_80246648 = 0x80246648; -D_80246650 = 0x80246650; D_802466A8 = 0x802466A8; D_802466B0 = 0x802466B0; D_802466B8 = 0x802466B8; @@ -2479,53 +2025,37 @@ D_802466C0 = 0x802466C0; D_802466C8 = 0x802466C8; D_802466D0 = 0x802466D0; D_802466E8 = 0x802466E8; -D_80246750 = 0x80246750; D_80246794 = 0x80246794; D_802467B4 = 0x802467B4; D_80246894 = 0x80246894; D_80246990 = 0x80246990; D_80246A00 = 0x80246A00; D_80246A08 = 0x80246A08; -D_80246A10 = 0x80246A10; D_80246A20 = 0x80246A20; D_80246B60 = 0x80246B60; D_80246BA0 = 0x80246BA0; -D_80246BA8 = 0x80246BA8; D_80246BC4 = 0x80246BC4; D_80246BD0 = 0x80246BD0; D_80246BD8 = 0x80246BD8; -D_80246BE0 = 0x80246BE0; D_80246BE8 = 0x80246BE8; D_80246C04 = 0x80246C04; D_80246CB0 = 0x80246CB0; -D_80246CB8 = 0x80246CB8; -D_80246CF8 = 0x80246CF8; -func_80246D10 = 0x80246D10; -D_80246D18 = 0x80246D18; D_80246D38 = 0x80246D38; D_80246D40 = 0x80246D40; D_80246D48 = 0x80246D48; -D_80246D50 = 0x80246D50; D_80246D70 = 0x80246D70; D_80246D78 = 0x80246D78; -D_80246D80 = 0x80246D80; D_80246D90 = 0x80246D90; D_80246D98 = 0x80246D98; -D_80246DA0 = 0x80246DA0; D_80246E20 = 0x80246E20; D_80246E28 = 0x80246E28; D_80246E30 = 0x80246E30; D_80246E40 = 0x80246E40; D_80246E50 = 0x80246E50; -D_80246EA8 = 0x80246EA8; -D_80246EC8 = 0x80246EC8; -D_80246F00 = 0x80246F00; D_80246F10 = 0x80246F10; D_80246F18 = 0x80246F18; -D_80246F20 = 0x80246F20; D_80247010 = 0x80247010; D_80247050 = 0x80247050; -pause_badges_count_equipped = 0x802470B0; D_802470B8 = 0x802470B8; D_802470C0 = 0x802470C0; D_802470C8 = 0x802470C8; @@ -2533,11 +2063,7 @@ D_80247120 = 0x80247120; D_8024712C = 0x8024712C; D_8024716C = 0x8024716C; D_802471E0 = 0x802471E0; -D_802471E8 = 0x802471E8; D_80247240 = 0x80247240; -D_80247248 = 0x80247248; -pause_badges_is_visible = 0x80247270; -D_80247278 = 0x80247278; D_802473D8 = 0x802473D8; D_802473E0 = 0x802473E0; D_802473E8 = 0x802473E8; @@ -2551,24 +2077,19 @@ D_80247420 = 0x80247420; D_80247428 = 0x80247428; D_80247430 = 0x80247430; D_80247438 = 0x80247438; -D_80247440 = 0x80247440; D_80247444 = 0x80247444; D_80247448 = 0x80247448; D_802474A0 = 0x802474A0; D_802474B0 = 0x802474B0; -D_802474C0 = 0x802474C0; D_802474D8 = 0x802474D8; D_802474E0 = 0x802474E0; -D_802474E8 = 0x802474E8; D_80247548 = 0x80247548; D_802475DC = 0x802475DC; D_802475E0 = 0x802475E0; D_802475E4 = 0x802475E4; D_80247610 = 0x80247610; D_80247618 = 0x80247618; -D_80247620 = 0x80247620; D_80247664 = 0x80247664; -D_80247670 = 0x80247670; D_80247678 = 0x80247678; D_80247680 = 0x80247680; D_80247688 = 0x80247688; @@ -2581,48 +2102,36 @@ D_80247750 = 0x80247750; D_80247764 = 0x80247764; D_802477B0 = 0x802477B0; D_802477B8 = 0x802477B8; -D_802477C0 = 0x802477C0; D_802477C8 = 0x802477C8; D_802477E0 = 0x802477E0; D_802477E4 = 0x802477E4; D_80247808 = 0x80247808; D_80247870 = 0x80247870; D_80247878 = 0x80247878; -D_80247880 = 0x80247880; D_802478C8 = 0x802478C8; -D_80247900 = 0x80247900; D_80247940 = 0x80247940; D_80247950 = 0x80247950; D_80247958 = 0x80247958; D_80247960 = 0x80247960; -D_80247968 = 0x80247968; D_802479A8 = 0x802479A8; D_802479B0 = 0x802479B0; D_802479B8 = 0x802479B8; D_802479C0 = 0x802479C0; D_802479C8 = 0x802479C8; -D_802479D0 = 0x802479D0; D_802479F0 = 0x802479F0; D_80247A10 = 0x80247A10; D_80247A18 = 0x80247A18; D_80247A20 = 0x80247A20; -D_80247A28 = 0x80247A28; D_80247A30 = 0x80247A30; D_80247A38 = 0x80247A38; D_80247A40 = 0x80247A40; -D_80247A48 = 0x80247A48; -D_80247A78 = 0x80247A78; D_80247A88 = 0x80247A88; D_80247A90 = 0x80247A90; -D_80247A98 = 0x80247A98; -D_80247AB8 = 0x80247AB8; D_80247AE8 = 0x80247AE8; D_80247AF0 = 0x80247AF0; D_80247AF8 = 0x80247AF8; D_80247B00 = 0x80247B00; -D_80247B08 = 0x80247B08; D_80247B50 = 0x80247B50; -D_80247B58 = 0x80247B58; D_80247BB0 = 0x80247BB0; D_80247BB8 = 0x80247BB8; D_80247BC0 = 0x80247BC0; @@ -2631,7 +2140,6 @@ D_80247BD0 = 0x80247BD0; D_80247BD8 = 0x80247BD8; D_80247BE0 = 0x80247BE0; D_80247BF0 = 0x80247BF0; -D_80247C28 = 0x80247C28; D_80247C90 = 0x80247C90; D_80247CA0 = 0x80247CA0; D_80247CB4 = 0x80247CB4; @@ -2646,7 +2154,6 @@ D_80248080 = 0x80248080; D_802480AC = 0x802480AC; D_802480C0 = 0x802480C0; D_802482A0 = 0x802482A0; -D_80248340 = 0x80248340; D_80248370 = 0x80248370; D_80248380 = 0x80248380; D_80248388 = 0x80248388; @@ -2662,14 +2169,12 @@ D_80248480 = 0x80248480; D_802484A0 = 0x802484A0; D_802484C0 = 0x802484C0; D_802484E0 = 0x802484E0; -D_802484E8 = 0x802484E8; D_80248504 = 0x80248504; D_8024854C = 0x8024854C; D_8024856C = 0x8024856C; D_80248570 = 0x80248570; D_802485C0 = 0x802485C0; D_802485C8 = 0x802485C8; -D_802485D0 = 0x802485D0; D_802485E8 = 0x802485E8; D_80248600 = 0x80248600; D_80248624 = 0x80248624; @@ -2677,7 +2182,6 @@ D_80248650 = 0x80248650; D_80248714 = 0x80248714; D_80248760 = 0x80248760; D_80248768 = 0x80248768; -D_80248770 = 0x80248770; D_80248778 = 0x80248778; D_8024877C = 0x8024877C; D_80248780 = 0x80248780; @@ -2709,13 +2213,9 @@ D_8024909C = 0x8024909C; D_80249158 = 0x80249158; D_802491C0 = 0x802491C0; D_802491C8 = 0x802491C8; -D_802491D0 = 0x802491D0; D_802491F0 = 0x802491F0; D_802491F8 = 0x802491F8; -D_80249200 = 0x80249200; D_802493A0 = 0x802493A0; -D_802493E0 = 0x802493E0; -D_80249420 = 0x80249420; D_80249440 = 0x80249440; D_802495DC = 0x802495DC; D_802495E0 = 0x802495E0; @@ -2728,7 +2228,6 @@ D_802498D0 = 0x802498D0; D_802498D4 = 0x802498D4; D_802498D8 = 0x802498D8; D_802498DC = 0x802498DC; -pause_items_get_row = 0x802498E0; D_802498E4 = 0x802498E4; D_802498E8 = 0x802498E8; D_802498EC = 0x802498EC; @@ -2765,10 +2264,8 @@ D_80249A94 = 0x80249A94; D_80249A98 = 0x80249A98; D_80249A9C = 0x80249A9C; D_80249AA0 = 0x80249AA0; -func_80249AA4 = 0x80249AA4; D_80249D30 = 0x80249D30; D_80249D38 = 0x80249D38; -D_80249D40 = 0x80249D40; D_80249D60 = 0x80249D60; D_8024A290 = 0x8024A290; D_8024A2A0 = 0x8024A2A0; @@ -2778,15 +2275,11 @@ D_8024A5AC = 0x8024A5AC; D_8024A630 = 0x8024A630; D_8024A632 = 0x8024A632; D_8024A638 = 0x8024A638; -D_8024A640 = 0x8024A640; D_8024A6B0 = 0x8024A6B0; D_8024A7D0 = 0x8024A7D0; -pause_items_handle_input = 0x8024A7D8; -D_8024A7E0 = 0x8024A7E0; D_8024A908 = 0x8024A908; D_8024A970 = 0x8024A970; D_8024A978 = 0x8024A978; -D_8024A980 = 0x8024A980; D_8024A9C8 = 0x8024A9C8; D_8024A9CC = 0x8024A9CC; D_8024AA20 = 0x8024AA20; @@ -2802,18 +2295,15 @@ D_8024AB18 = 0x8024AB18; D_8024AB20 = 0x8024AB20; D_8024AB28 = 0x8024AB28; D_8024AB30 = 0x8024AB30; -D_8024AB38 = 0x8024AB38; D_8024AB3C = 0x8024AB3C; D_8024AC7B = 0x8024AC7B; D_8024AC7C = 0x8024AC7C; D_8024AC9C = 0x8024AC9C; D_8024ACB8 = 0x8024ACB8; -pause_partners_load_portrait = 0x8024ADE0; D_8024AEC4 = 0x8024AEC4; D_8024AEC8 = 0x8024AEC8; D_8024B5B0 = 0x8024B5B0; D_8024B990 = 0x8024B990; -func_8024B9A0 = 0x8024B9A0; D_8024B9A8 = 0x8024B9A8; D_8024B9B0 = 0x8024B9B0; D_8024B9B4 = 0x8024B9B4; @@ -2826,7 +2316,6 @@ D_8024BD60 = 0x8024BD60; D_8024BD70 = 0x8024BD70; D_8024BD78 = 0x8024BD78; D_8024BD80 = 0x8024BD80; -D_8024BD88 = 0x8024BD88; D_8024BDD0 = 0x8024BDD0; D_8024BDE8 = 0x8024BDE8; D_8024BDF0 = 0x8024BDF0; @@ -2835,7 +2324,6 @@ D_8024BDF8 = 0x8024BDF8; D_8024BE40 = 0x8024BE40; D_8024BE48 = 0x8024BE48; D_8024BE50 = 0x8024BE50; -D_8024BE58 = 0x8024BE58; D_8024BEA0 = 0x8024BEA0; D_8024C068 = 0x8024C068; D_8024C080 = 0x8024C080; @@ -2845,7 +2333,6 @@ D_8024C08C = 0x8024C08C; D_8024C090 = 0x8024C090; D_8024C094 = 0x8024C094; D_8024C098 = 0x8024C098; -pause_partners_draw_movelist_flower = 0x8024C0A0; D_8024C0B0 = 0x8024C0B0; D_8024C100 = 0x8024C100; D_8024C108 = 0x8024C108; @@ -2868,15 +2355,12 @@ D_8024DCD3 = 0x8024DCD3; D_8024DD88 = 0x8024DD88; D_8024DDE0 = 0x8024DDE0; D_8024DDE8 = 0x8024DDE8; -D_8024DDF0 = 0x8024DDF0; D_8024DEF8 = 0x8024DEF8; D_8024DF10 = 0x8024DF10; D_8024DF18 = 0x8024DF18; D_8024DF1C = 0x8024DF1C; D_8024DF20 = 0x8024DF20; D_8024DF24 = 0x8024DF24; -D_8024DF80 = 0x8024DF80; -D_8024DF98 = 0x8024DF98; D_8024DFC0 = 0x8024DFC0; D_8024DFD8 = 0x8024DFD8; D_8024DFE0 = 0x8024DFE0; @@ -2886,7 +2370,6 @@ D_8024DFF0 = 0x8024DFF0; D_8024E1B4 = 0x8024E1B4; D_8024E200 = 0x8024E200; D_8024E208 = 0x8024E208; -D_8024E210 = 0x8024E210; D_8024E3A0 = 0x8024E3A0; D_8024E470 = 0x8024E470; D_8024E538 = 0x8024E538; @@ -2898,8 +2381,6 @@ D_8024E568 = 0x8024E568; D_8024E570 = 0x8024E570; D_8024E738 = 0x8024E738; D_8024E8C0 = 0x8024E8C0; -D_8024E900 = 0x8024E900; -D_8024E940 = 0x8024E940; D_8024E960 = 0x8024E960; D_8024EA10 = 0x8024EA10; D_8024EA14 = 0x8024EA14; @@ -2907,17 +2388,12 @@ D_8024EA18 = 0x8024EA18; D_8024ECE8 = 0x8024ECE8; D_8024ED4C = 0x8024ED4C; D_8024ED50 = 0x8024ED50; -D_8024EF20 = 0x8024EF20; D_8024EF58 = 0x8024EF58; -gPauseMenuIconScripts = 0x8024EF60; -create_popup = 0x8024EF68; D_8024EF70 = 0x8024EF70; D_8024EF78 = 0x8024EF78; -gPauseMenuTabs = 0x8024EF80; D_8024EF84 = 0x8024EF84; D_8024EF88 = 0x8024EF88; D_8024EF90 = 0x8024EF90; -gPauseMenuCursorPosY = 0x8024EFA0; D_8024EFB8 = 0x8024EFB8; D_8024EFC0 = 0x8024EFC0; D_8024EFC4 = 0x8024EFC4; @@ -2929,7 +2405,6 @@ D_8024F1D0 = 0x8024F1D0; D_8024F1D8 = 0x8024F1D8; D_8024F1E0 = 0x8024F1E0; D_8024F1E8 = 0x8024F1E8; -D_8024F1F0 = 0x8024F1F0; D_8024F208 = 0x8024F208; D_8024F210 = 0x8024F210; D_8024F218 = 0x8024F218; @@ -2937,9 +2412,7 @@ D_8024F220 = 0x8024F220; D_8024F228 = 0x8024F228; D_8024F230 = 0x8024F230; D_8024F238 = 0x8024F238; -D_8024F240 = 0x8024F240; D_8024F248 = 0x8024F248; -D_8024F260 = 0x8024F260; D_8024F280 = 0x8024F280; D_8024F2A0 = 0x8024F2A0; D_8024F2A1 = 0x8024F2A1; @@ -3023,7 +2496,6 @@ D_8024F7F0 = 0x8024F7F0; D_8024F800 = 0x8024F800; D_8024F9F0 = 0x8024F9F0; D_8024F9F8 = 0x8024F9F8; -D_8024FA00 = 0x8024FA00; D_8024FBA0 = 0x8024FBA0; D_8024FD68 = 0x8024FD68; D_8024FED8 = 0x8024FED8; @@ -3040,10 +2512,8 @@ D_80250EF0 = 0x80250EF0; D_802510B0 = 0x802510B0; D_802510B8 = 0x802510B8; D_802510C0 = 0x802510C0; -D_802510C8 = 0x802510C8; D_802513D0 = 0x802513D0; D_802513E8 = 0x802513E8; -ForceCloseMessageBox = 0x802513F0; D_802513F4 = 0x802513F4; D_802513F8 = 0x802513F8; D_80251400 = 0x80251400; @@ -3052,13 +2522,11 @@ D_80251438 = 0x80251438; D_80251450 = 0x80251450; D_80251468 = 0x80251468; D_80251470 = 0x80251470; -func_80251474 = 0x80251474; D_80251478 = 0x80251478; D_802515C4 = 0x802515C4; D_80251A90 = 0x80251A90; D_80251A98 = 0x80251A98; D_80251AA0 = 0x80251AA0; -D_80251AA8 = 0x80251AA8; D_80251C40 = 0x80251C40; D_80251C58 = 0x80251C58; D_80251C60 = 0x80251C60; @@ -3077,10 +2545,6 @@ D_80252798 = 0x80252798; D_8025279C = 0x8025279C; D_802527B0 = 0x802527B0; D_802527B8 = 0x802527B8; -D_802527C0 = 0x802527C0; -D_80252950 = 0x80252950; -D_80252970 = 0x80252970; -D_802529B0 = 0x802529B0; D_802529B4 = 0x802529B4; D_802529C8 = 0x802529C8; D_802529D0 = 0x802529D0; @@ -3095,7 +2559,6 @@ D_80252D50 = 0x80252D50; D_80252DC0 = 0x80252DC0; D_80253030 = 0x80253030; D_80253038 = 0x80253038; -D_80253040 = 0x80253040; D_80253060 = 0x80253060; D_80253378 = 0x80253378; D_80253384 = 0x80253384; @@ -3103,11 +2566,8 @@ D_8025338C = 0x8025338C; D_80253390 = 0x80253390; D_80254620 = 0x80254620; D_80254628 = 0x80254628; -D_80254630 = 0x80254630; D_802547D0 = 0x802547D0; -func_802549A0 = 0x802549A0; D_802549B8 = 0x802549B8; -func_802549C0 = 0x802549C0; D_802549C4 = 0x802549C4; D_802549C8 = 0x802549C8; D_802549D0 = 0x802549D0; @@ -3117,7 +2577,6 @@ D_80254D68 = 0x80254D68; D_8025578C = 0x8025578C; D_802559C0 = 0x802559C0; D_802559C8 = 0x802559C8; -D_802559D0 = 0x802559D0; D_80255B70 = 0x80255B70; D_80255B88 = 0x80255B88; D_80255B90 = 0x80255B90; @@ -3137,7 +2596,6 @@ D_80257D00 = 0x80257D00; D_80257D40 = 0x80257D40; D_80257D48 = 0x80257D48; D_80257D50 = 0x80257D50; -D_80257D58 = 0x80257D58; D_80257F08 = 0x80257F08; D_80257F10 = 0x80257F10; D_80257F20 = 0x80257F20; @@ -3169,10 +2627,8 @@ D_8025B2B0 = 0x8025B2B0; D_8025C0D0 = 0x8025C0D0; D_802626E0 = 0x802626E0; D_802626E8 = 0x802626E8; -D_802626F0 = 0x802626F0; D_80262890 = 0x80262890; D_80262898 = 0x80262898; -D_802628A0 = 0x802628A0; D_80262A40 = 0x80262A40; D_80262A58 = 0x80262A58; D_80262A60 = 0x80262A60; @@ -3185,13 +2641,10 @@ D_80262F68 = 0x80262F68; D_80263420 = 0x80263420; D_80263428 = 0x80263428; D_80263430 = 0x80263430; -D_80263438 = 0x80263438; D_80263478 = 0x80263478; D_80263480 = 0x80263480; -D_80263488 = 0x80263488; D_80263510 = 0x80263510; D_80263518 = 0x80263518; -D_80263520 = 0x80263520; D_80268000 = 0x80268000; D_8026A2B0 = 0x8026A2B0; D_8026F118 = 0x8026F118; @@ -3199,7 +2652,6 @@ D_8026F1B8 = 0x8026F1B8; D_8026F2A0 = 0x8026F2A0; D_8026F348 = 0x8026F348; D_8026F5A0 = 0x8026F5A0; -gPauseMenuStrings = 0x8026F778; D_8026F8D4 = 0x8026F8D4; D_8026FB30 = 0x8026FB30; D_8026FBD8 = 0x8026FBD8; @@ -3233,57 +2685,28 @@ D_802700A0 = 0x802700A0; D_802700A8 = 0x802700A8; D_802700B0 = 0x802700B0; D_802700B8 = 0x802700B8; -gPauseMenuHeldButtons = 0x802700C0; -gPauseMenuPressedButtons = 0x802700C4; -gPauseMenuCurrentDescString = 0x802700C8; -gPauseMenuCurrentDescIconScript = 0x802700CC; D_802700D0 = 0x802700D0; -gPauseMenuCurrentTab = 0x802700D4; D_802700E0 = 0x802700E0; -gPauseMenuCommonIconIDs = 0x802700E8; D_80270108 = 0x80270108; D_8027010C = 0x8027010C; D_80270110 = 0x80270110; D_80270114 = 0x80270114; D_80270118 = 0x80270118; D_8027011C = 0x8027011C; -gPauseMenuTabIconIDs = 0x80270130; D_80270148 = 0x80270148; D_8027014C = 0x8027014C; -gStatsMenuIconIDs = 0x80270150; -gBadgeMenuItemIDs = 0x80270180; -gBadgeMenuCurrentPage = 0x80270280; -gBadgeMenuPages = 0x80270288; D_80270289 = 0x80270289; D_8027028A = 0x8027028A; -gBadgeMenuSelectedIndex = 0x80270378; D_8027037C = 0x8027037C; -gBadgeMenuSelectedItemID = 0x80270380; -gBadgeMenuNumItems = 0x80270384; D_80270388 = 0x80270388; -gBadgeMenuCurrentScrollPos = 0x8027038C; -gBadgeMenuTargetScrollPos = 0x80270390; D_80270394 = 0x80270394; -gBadgeMenuLevel = 0x80270398; -gBadgeMenuCurrentTab = 0x8027039C; -gBadgeMenuBShowNotEnoughBP = 0x802703A0; D_802703A8 = 0x802703A8; D_802703FC = 0x802703FC; -gItemMenuItemIDs = 0x80270400; -gItemMenuCurrentPage = 0x802704C8; -gItemMenuPages = 0x802704D0; D_802704D1 = 0x802704D1; D_802704D2 = 0x802704D2; -gItemMenuSelectedIndex = 0x802705C0; D_802705C4 = 0x802705C4; -gItemMenuSelectedItemID = 0x802705C8; -gItemMenuNumItems = 0x802705CC; D_802705D0 = 0x802705D0; -gItemMenuCurrentScrollPos = 0x802705D4; -gItemMenuTargetScrollPos = 0x802705D8; D_802705DC = 0x802705DC; -gItemMenuLevel = 0x802705E0; -gItemMenuCurrentTab = 0x802705E4; D_802705E8 = 0x802705E8; D_80270634 = 0x80270634; D_80270640 = 0x80270640; @@ -3326,7 +2749,6 @@ D_802847D4 = 0x802847D4; D_80284F80 = 0x80284F80; D_80285640 = 0x80285640; D_80285674 = 0x80285674; -D_80286500 = 0x80286500; D_80286520 = 0x80286520; D_80286524 = 0x80286524; D_80286528 = 0x80286528; @@ -3462,13 +2884,7 @@ D_8029F64A = 0x8029F64A; D_8029F64C = 0x8029F64C; D_8029F64E = 0x8029F64E; D_8029F650 = 0x8029F650; -gSpeakingActorPrintCtx = 0x8029FA60; D_8029FA64 = 0x8029FA64; -gSpeakingActorPrintIsDone = 0x8029FA68; -gSpeakingActorTalkAnim = 0x8029FA6C; -gSpeakingActorIdleAnim = 0x8029FA70; -gSpeakingActor = 0x8029FA74; -gSpeakingActorPart = 0x8029FA78; D_8029FA80 = 0x8029FA80; D_8029FA88 = 0x8029FA88; D_8029FA90 = 0x8029FA90; @@ -3537,7 +2953,6 @@ D_802A2280 = 0x802A2280; D_802A229C = 0x802A229C; D_802A2410 = 0x802A2410; D_802A24D0 = 0x802A24D0; -D_802A25A0 = 0x802A25A0; D_802A25C0 = 0x802A25C0; D_802A25C8 = 0x802A25C8; D_802A25E4 = 0x802A25E4; @@ -3556,7 +2971,6 @@ D_802A2890 = 0x802A2890; D_802A2C20 = 0x802A2C20; D_802A2C50 = 0x802A2C50; D_802A2CC0 = 0x802A2CC0; -D_802A2DB0 = 0x802A2DB0; D_802A2DD0 = 0x802A2DD0; D_802A2DD8 = 0x802A2DD8; D_802A2DEC = 0x802A2DEC; @@ -3569,7 +2983,6 @@ D_802A33A8 = 0x802A33A8; D_802A3514 = 0x802A3514; D_802A3534 = 0x802A3534; D_802A3554 = 0x802A3554; -D_802A3790 = 0x802A3790; D_802A37F0 = 0x802A37F0; D_802A37F8 = 0x802A37F8; D_802A3818 = 0x802A3818; @@ -3584,37 +2997,19 @@ D_802A3F88 = 0x802A3F88; D_802A4020 = 0x802A4020; D_802A4350 = 0x802A4350; D_802A43D0 = 0x802A43D0; -D_802A9580 = 0x802A9580; -D_802A95D0 = 0x802A95D0; -D_802A95E0 = 0x802A95E0; D_802A9620 = 0x802A9620; -D_802A9680 = 0x802A9680; -D_802A9750 = 0x802A9750; D_802A9762 = 0x802A9762; D_802A9778 = 0x802A9778; -D_802A9790 = 0x802A9790; D_802A97C0 = 0x802A97C0; -func_802A97CC_42823C = 0x802A97CC; -D_802A97E0 = 0x802A97E0; D_802A9802 = 0x802A9802; D_802A9812 = 0x802A9812; -D_802A9820 = 0x802A9820; -D_802A9830 = 0x802A9830; -D_802A9840 = 0x802A9840; D_802A9852 = 0x802A9852; D_802A9862 = 0x802A9862; -D_802A9870 = 0x802A9870; -D_802A9880 = 0x802A9880; -func_802A98B0 = 0x802A98B0; D_802A98C0 = 0x802A98C0; -func_802A98E0 = 0x802A98E0; D_802A98E2 = 0x802A98E2; -D_802A9900 = 0x802A9900; D_802A9920 = 0x802A9920; D_802A9922 = 0x802A9922; D_802A9932 = 0x802A9932; -D_802A9940 = 0x802A9940; -D_802A9950 = 0x802A9950; D_802A9952 = 0x802A9952; D_802A9964 = 0x802A9964; D_802A9972 = 0x802A9972; @@ -3622,18 +3017,13 @@ D_802A9974 = 0x802A9974; D_802A9984 = 0x802A9984; D_802A9988 = 0x802A9988; D_802A9994 = 0x802A9994; -D_802A99A0 = 0x802A99A0; D_802A99A8 = 0x802A99A8; -D_802A99C0 = 0x802A99C0; D_802A99D2 = 0x802A99D2; D_802A99E4 = 0x802A99E4; D_802A99F4 = 0x802A99F4; D_802A9A08 = 0x802A9A08; D_802A9A20 = 0x802A9A20; -D_802A9A40 = 0x802A9A40; -D_802A9A90 = 0x802A9A90; D_802A9AA2 = 0x802A9AA2; -D_802A9AC0 = 0x802A9AC0; D_802A9B00 = 0x802A9B00; D_802A9F0C = 0x802A9F0C; D_802A9F34 = 0x802A9F34; @@ -3649,7 +3039,6 @@ D_802AA85C = 0x802AA85C; D_802AA888 = 0x802AA888; D_802AA8A0 = 0x802AA8A0; D_802AA8B7 = 0x802AA8B7; -D_802AA8E0 = 0x802AA8E0; D_802AAA08 = 0x802AAA08; D_802AAA30 = 0x802AAA30; D_802AB108 = 0x802AB108; @@ -3657,7 +3046,6 @@ D_802AB130 = 0x802AB130; D_802AB158 = 0x802AB158; D_802AB180 = 0x802AB180; D_802AB184 = 0x802AB184; -D_802AB1B0 = 0x802AB1B0; D_802AB340 = 0x802AB340; D_802AB344 = 0x802AB344; D_802AB348 = 0x802AB348; @@ -3688,23 +3076,12 @@ D_802AB728 = 0x802AB728; D_802AB72C = 0x802AB72C; D_802AB734 = 0x802AB734; D_802AB738 = 0x802AB738; -D_802AB770 = 0x802AB770; D_802AB7F0 = 0x802AB7F0; D_802AB7F8 = 0x802AB7F8; D_802AB800 = 0x802AB800; -D_802AB808 = 0x802AB808; -D_802AB8C0 = 0x802AB8C0; -D_802AB970 = 0x802AB970; -D_802AB9F0 = 0x802AB9F0; -D_802ABAA8 = 0x802ABAA8; -D_802ABB58 = 0x802ABB58; -D_802ABBD8 = 0x802ABBD8; D_802AC090 = 0x802AC090; -D_802AC3C8 = 0x802AC3C8; D_802AC880 = 0x802AC880; -D_802ACBB0 = 0x802ACBB0; D_802ACBE0 = 0x802ACBE0; -D_802ACC08 = 0x802ACC08; D_802ACC38 = 0x802ACC38; D_802ACC60 = 0x802ACC60; D_802ACC64 = 0x802ACC64; @@ -3833,7 +3210,6 @@ D_802AD6A8 = 0x802AD6A8; D_802AD6AA = 0x802AD6AA; D_802AD6C0 = 0x802AD6C0; D_802AD6D4 = 0x802AD6D4; -func_802AE000_316D90 = 0x802AE000; D_802B6240 = 0x802B6240; D_802B62B0 = 0x802B62B0; D_802B62D0 = 0x802B62D0; @@ -3842,16 +3218,12 @@ D_802B62D8 = 0x802B62D8; D_802B62DC = 0x802B62DC; D_802B62E0 = 0x802B62E0; D_802B6300 = 0x802B6300; -func_802B6350_E28D80 = 0x802B6350; D_802B6360 = 0x802B6360; D_802B6430 = 0x802B6430; -D_802B6690 = 0x802B6690; -D_802B66E0 = 0x802B66E0; D_802B6718 = 0x802B6718; D_802B6720 = 0x802B6720; D_802B6728 = 0x802B6728; D_802B6730 = 0x802B6730; -D_802B6740 = 0x802B6740; D_802B6760 = 0x802B6760; D_802B6768 = 0x802B6768; D_802B6770 = 0x802B6770; @@ -3863,7 +3235,6 @@ D_802B6790 = 0x802B6790; D_802B6794 = 0x802B6794; D_802B6798 = 0x802B6798; D_802B679C = 0x802B679C; -D_802B6850 = 0x802B6850; D_802B68B0 = 0x802B68B0; D_802B68B4 = 0x802B68B4; D_802B68B8 = 0x802B68B8; @@ -3871,11 +3242,8 @@ D_802B68BC = 0x802B68BC; D_802B6910 = 0x802B6910; D_802B69A0 = 0x802B69A0; D_802B69A8 = 0x802B69A8; -D_802B6D90 = 0x802B6D90; D_802B6DB0 = 0x802B6DB0; D_802B6DC0 = 0x802B6DC0; -D_802B6DF0 = 0x802B6DF0; -D_802B6E08 = 0x802B6E08; D_802B6E60 = 0x802B6E60; D_802B6E68 = 0x802B6E68; D_802B6E70 = 0x802B6E70; @@ -3884,7 +3252,6 @@ D_802B6E80 = 0x802B6E80; D_802B6E90 = 0x802B6E90; D_802B6E98 = 0x802B6E98; D_802B6EA0 = 0x802B6EA0; -D_802B6EA8 = 0x802B6EA8; D_802B6ED0 = 0x802B6ED0; D_802B6ED4 = 0x802B6ED4; D_802B6ED8 = 0x802B6ED8; @@ -3918,9 +3285,7 @@ D_802B7C78 = 0x802B7C78; D_802B7C80 = 0x802B7C80; D_802B7CA0 = 0x802B7CA0; D_802B7CB8 = 0x802B7CB8; -D_802B7CC0 = 0x802B7CC0; D_802B7D18 = 0x802B7D18; -D_802B7D20 = 0x802B7D20; D_802B7D88 = 0x802B7D88; D_802B7D90 = 0x802B7D90; D_802B9E00 = 0x802B9E00; @@ -3932,7 +3297,6 @@ D_802BCB78 = 0x802BCB78; D_802BCB80 = 0x802BCB80; D_802BCB88 = 0x802BCB88; D_802BCB90 = 0x802BCB90; -D_802BCBA0 = 0x802BCBA0; D_802BCBC0 = 0x802BCBC0; D_802BCBC8 = 0x802BCBC8; D_802BCBD0 = 0x802BCBD0; @@ -3950,14 +3314,12 @@ D_802BCDC8 = 0x802BCDC8; D_802BCDD0 = 0x802BCDD0; D_802BCDD8 = 0x802BCDD8; D_802BCDE0 = 0x802BCDE0; -D_802BCDE8 = 0x802BCDE8; D_802BCE10 = 0x802BCE10; D_802BCE1C = 0x802BCE1C; D_802BCE20 = 0x802BCE20; D_802BCE30 = 0x802BCE30; D_802BCE32 = 0x802BCE32; D_802BCE34 = 0x802BCE34; -D_802BCF50 = 0x802BCF50; D_802BCF78 = 0x802BCF78; D_802BCF80 = 0x802BCF80; D_802BCF88 = 0x802BCF88; @@ -3966,40 +3328,25 @@ D_802BCFA0 = 0x802BCFA0; D_802BCFA8 = 0x802BCFA8; D_802BCFB0 = 0x802BCFB0; D_802BCFB8 = 0x802BCFB8; -D_802BCFC0 = 0x802BCFC0; D_802BCFD8 = 0x802BCFD8; D_802BCFE0 = 0x802BCFE0; D_802BCFE8 = 0x802BCFE8; D_802BCFF0 = 0x802BCFF0; -D_802BD5F0 = 0x802BD5F0; -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; D_802BE0C0 = 0x802BE0C0; D_802BE0C4 = 0x802BE0C4; D_802BE0E4 = 0x802BE0E4; D_802BE0E8 = 0x802BE0E8; D_802BE0EC = 0x802BE0EC; -D_802BE250 = 0x802BE250; -D_802BE274 = 0x802BE274; -D_802BE278 = 0x802BE278; -D_802BE2F0 = 0x802BE2F0; D_802BE300 = 0x802BE300; D_802BE304 = 0x802BE304; D_802BE308 = 0x802BE308; D_802BE30C = 0x802BE30C; D_802BE310 = 0x802BE310; -D_802BE89C = 0x802BE89C; -D_802BE900 = 0x802BE900; -D_802BE908 = 0x802BE908; -D_802BE910 = 0x802BE910; D_802BE920 = 0x802BE920; D_802BE924 = 0x802BE924; D_802BE928 = 0x802BE928; @@ -4007,27 +3354,12 @@ D_802BE92C = 0x802BE92C; D_802BE930 = 0x802BE930; D_802BE934 = 0x802BE934; D_802BE938 = 0x802BE938; -D_802BEAAC = 0x802BEAAC; -D_802BEB10 = 0x802BEB10; -D_802BEB18 = 0x802BEB18; -D_802BEB40 = 0x802BEB40; -D_802BEB60 = 0x802BEB60; -D_802BEB98 = 0x802BEB98; -D_802BEBA0 = 0x802BEBA0; -D_802BEBA8 = 0x802BEBA8; D_802BEBB0 = 0x802BEBB0; D_802BEBB4 = 0x802BEBB4; D_802BEBB8 = 0x802BEBB8; D_802BEBBC = 0x802BEBBC; D_802BEBC0 = 0x802BEBC0; D_802BEBC4 = 0x802BEBC4; -D_802BEBC8 = 0x802BEBC8; -D_802BEC18 = 0x802BEC18; -D_802BEC20 = 0x802BEC20; -D_802BEC28 = 0x802BEC28; -D_802BEC30 = 0x802BEC30; -D_802BEC38 = 0x802BEC38; -D_802BEC40 = 0x802BEC40; D_802BEC50 = 0x802BEC50; D_802BEC54 = 0x802BEC54; D_802BEC58 = 0x802BEC58; @@ -4039,18 +3371,6 @@ D_802BEC6C = 0x802BEC6C; D_802BEC70 = 0x802BEC70; D_802BEC74 = 0x802BEC74; D_802BEC78 = 0x802BEC78; -D_802BFDB0 = 0x802BFDB0; -D_802BFDB4 = 0x802BFDB4; -D_802BFDB8 = 0x802BFDB8; -D_802BFDBC = 0x802BFDBC; -D_802BFDF8 = 0x802BFDF8; -D_802BFE50 = 0x802BFE50; -D_802BFE58 = 0x802BFE58; -D_802BFE60 = 0x802BFE60; -D_802BFE68 = 0x802BFE68; -D_802BFE7C = 0x802BFE7C; -D_802BFED0 = 0x802BFED0; -D_802BFED8 = 0x802BFED8; D_802BFEE0 = 0x802BFEE0; D_802BFEE4 = 0x802BFEE4; D_802BFEE8 = 0x802BFEE8; @@ -4071,31 +3391,17 @@ D_802BFF20 = 0x802BFF20; D_802BFF24 = 0x802BFF24; D_802BFF28 = 0x802BFF28; D_802C0000 = 0x802C0000; -sort_scripts = 0x802C3000; D_802D9D70 = 0x802D9D70; D_802D9D71 = 0x802D9D71; D_802D9D72 = 0x802D9D72; D_802D9D73 = 0x802D9D73; -gMapFlags = 0x802DA480; -gMapVars = 0x802DA484; -gNumScripts = 0x802DA488; -gWorldScriptList = 0x802DA490; -gBattleScriptList = 0x802DA690; -gCurrentScriptListPtr = 0x802DA890; -gScriptIndexList = 0x802DA898; -gScriptIdList = 0x802DAA98; -gScriptListCount = 0x802DAC98; D_802DACA0 = 0x802DACA0; D_802DADA0 = 0x802DADA0; D_802DADA4 = 0x802DADA4; -gBattleMeshAnimationList = 0x802DADB0; -gWorldMeshAnimationList = 0x802DADF0; -gCurrentMeshAnimationListPtr = 0x802DAE30; D_802DAE40 = 0x802DAE40; D_802DAE44 = 0x802DAE44; D_802DAE50 = 0x802DAE50; D_802DAE54 = 0x802DAE54; -gCurrentPrintContext = 0x802DB260; D_802DB264 = 0x802DB264; D_802DB268 = 0x802DB268; D_802DB5B0 = 0x802DB5B0; @@ -4108,13 +3414,9 @@ D_802DB800 = 0x802DB800; D_802DB830 = 0x802DB830; D_802DBB60 = 0x802DBB60; D_802DBB68 = 0x802DBB68; -gWorldMapFlags = 0x802DBC70; D_802DBC7C = 0x802DBC7C; D_802DBC88 = 0x802DBC88; -gWorldMapVars = 0x802DBCA8; -gBattleMapVars = 0x802DBCE8; D_802DBD28 = 0x802DBD28; -gBattleMapFlags = 0x802DBD34; D_802DBD40 = 0x802DBD40; D_802DF524 = 0x802DF524; D_802DF530 = 0x802DF530; @@ -4151,7 +3453,6 @@ D_802E0C60 = 0x802E0C60; D_802E0C64 = 0x802E0C64; D_802E0C68 = 0x802E0C68; D_802E0C70 = 0x802E0C70; -create_shadow_callback = 0x802E0D90; D_802E98BC = 0x802E98BC; D_802E98E0 = 0x802E98E0; D_802E9904 = 0x802E9904; @@ -4329,8 +3630,6 @@ D_E0002800 = 0xE0002800; D_E000CC10 = 0xE000CC10; D_E000CC24 = 0xE000CC24; D_E000CD24 = 0xE000CD24; -D_E000CD40 = 0xE000CD40; -D_E000CD58 = 0xE000CD58; D_E000CD70 = 0xE000CD70; D_E000E684 = 0xE000E684; D_E0010710 = 0xE0010710; @@ -4478,7 +3777,6 @@ D_E0044E68 = 0xE0044E68; D_E0044E70 = 0xE0044E70; D_E0044E78 = 0xE0044E78; D_E0044EF8 = 0xE0044EF8; -D_E0044F00 = 0xE0044F00; D_E0046600 = 0xE0046600; D_E0046604 = 0xE0046604; D_E0046614 = 0xE0046614; @@ -4492,7 +3790,6 @@ D_E0048A00 = 0xE0048A00; D_E0048A08 = 0xE0048A08; D_E0048A10 = 0xE0048A10; D_E004AE60 = 0xE004AE60; -D_E004AE80 = 0xE004AE80; D_E004AE98 = 0xE004AE98; D_E004AEA0 = 0xE004AEA0; D_E004AEA8 = 0xE004AEA8; @@ -4573,7 +3870,6 @@ D_E0064A88 = 0xE0064A88; D_E0064A90 = 0xE0064A90; D_E0066C50 = 0xE0066C50; D_E0066C8C = 0xE0066C8C; -D_E0066CE0 = 0xE0066CE0; D_E0066D20 = 0xE0066D20; D_E00685B0 = 0xE00685B0; D_E00685BC = 0xE00685BC; @@ -4635,7 +3931,6 @@ D_E007AC28 = 0xE007AC28; D_E007AC30 = 0xE007AC30; D_E007C510 = 0xE007C510; D_E007EC40 = 0xE007EC40; -D_E007EC48 = 0xE007EC48; D_E007EC68 = 0xE007EC68; D_E007EC70 = 0xE007EC70; D_E0080AC0 = 0xE0080AC0; @@ -4674,8 +3969,6 @@ D_E0088D10 = 0xE0088D10; D_E0088D18 = 0xE0088D18; D_E0088D20 = 0xE0088D20; D_E0088D28 = 0xE0088D28; -D_E0088D30 = 0xE0088D30; -D_E0088D50 = 0xE0088D50; D_E0088D70 = 0xE0088D70; D_E0088D90 = 0xE0088D90; D_E0088D98 = 0xE0088D98; @@ -4718,7 +4011,6 @@ D_E00947C8 = 0xE00947C8; D_E00963E0 = 0xE00963E0; D_E0098510 = 0xE0098510; D_E0098530 = 0xE0098530; -D_E009AA60 = 0xE009AA60; D_E009AA78 = 0xE009AA78; D_E009AA80 = 0xE009AA80; D_E009EDF0 = 0xE009EDF0; @@ -4736,9 +4028,7 @@ D_E009EE38 = 0xE009EE38; D_E00A29D0 = 0xE00A29D0; D_E00A29DC = 0xE00A29DC; D_E00A2A24 = 0xE00A2A24; -D_E00A4AD0 = 0xE00A4AD0; D_E00A4AF0 = 0xE00A4AF0; -D_E00A4AF8 = 0xE00A4AF8; D_E00A4B20 = 0xE00A4B20; D_E00A4B28 = 0xE00A4B28; D_E00A4B30 = 0xE00A4B30; @@ -4797,10 +4087,8 @@ D_E00C0C00 = 0xE00C0C00; D_E00C0C08 = 0xE00C0C08; D_E00C0C10 = 0xE00C0C10; D_E00C0C18 = 0xE00C0C18; -D_E00C0C20 = 0xE00C0C20; D_E00C2990 = 0xE00C2990; D_E00C29A0 = 0xE00C29A0; -D_E00C29A8 = 0xE00C29A8; D_E00C49D0 = 0xE00C49D0; D_E00C49D4 = 0xE00C49D4; D_E00C49E8 = 0xE00C49E8; @@ -4837,7 +4125,6 @@ D_E00CCDF0 = 0xE00CCDF0; D_E00CCE04 = 0xE00CCE04; D_E00CCE4C = 0xE00CCE4C; D_E00CCE70 = 0xE00CCE70; -D_E00CCE78 = 0xE00CCE78; D_E00CCED0 = 0xE00CCED0; D_E00CCED8 = 0xE00CCED8; D_E00CCEE0 = 0xE00CCEE0; @@ -4861,7 +4148,6 @@ D_E00D6E84 = 0xE00D6E84; D_E00D6EA0 = 0xE00D6EA0; D_E00D6EA8 = 0xE00D6EA8; D_E00D6EB0 = 0xE00D6EB0; -D_E00D6EB8 = 0xE00D6EB8; D_E00D6EF0 = 0xE00D6EF0; D_E00D6EF8 = 0xE00D6EF8; D_E00D6F00 = 0xE00D6F00; @@ -4942,7 +4228,6 @@ D_E010E7D8 = 0xE010E7D8; D_E010E7FC = 0xE010E7FC; D_E010E838 = 0xE010E838; D_E010E868 = 0xE010E868; -D_E010E930 = 0xE010E930; D_E01108B0 = 0xE01108B0; D_E01108B4 = 0xE01108B4; D_E01108C0 = 0xE01108C0; @@ -4953,7 +4238,6 @@ D_E0112640 = 0xE0112640; D_E01146A0 = 0xE01146A0; D_E0114718 = 0xE0114718; D_E0114740 = 0xE0114740; -D_E0114750 = 0xE0114750; D_E0116C60 = 0xE0116C60; D_E0116C64 = 0xE0116C64; D_E0116C68 = 0xE0116C68; @@ -4970,7 +4254,6 @@ D_E0116D6B = 0xE0116D6B; D_E0116D6C = 0xE0116D6C; D_E0116D83 = 0xE0116D83; D_E0116D90 = 0xE0116D90; -D_E0116D98 = 0xE0116D98; D_E0116DB0 = 0xE0116DB0; D_E0116DB8 = 0xE0116DB8; D_E01187B0 = 0xE01187B0; @@ -4983,7 +4266,6 @@ D_E011AC24 = 0xE011AC24; D_E011AC4C = 0xE011AC4C; D_E011AC58 = 0xE011AC58; D_E011AC64 = 0xE011AC64; -D_E011AC70 = 0xE011AC70; D_E011C500 = 0xE011C500; D_E011C514 = 0xE011C514; D_E011C518 = 0xE011C518; @@ -5095,3 +4377,747 @@ D_F5000007 = 0xF5000007; D_F79DDD0F = 0xF79DDD0F; D_FA000028 = 0xFA000028; D_FD100008 = 0xFD100008; +ForceCloseMessageBox = 0x802513F0; +carthandle = 0x8009A638; +create_popup = 0x8024EF68; +create_shadow_callback = 0x802E0D90; +end_battle = 0x80244A50; +func_80147474 = 0x80147474; +func_80147574 = 0x80147574; +func_80147650 = 0x80147650; +func_80200080 = 0x80200080; +func_80218DF4_465284 = 0x80218DF4; +func_802402B0_90CEF0 = 0x802402B0; +func_802402D0_A7A7D0 = 0x802402D0; +func_802402E0_A071E0 = 0x802402E0; +func_80240330_8EC150 = 0x80240330; +func_80240390_8B0400 = 0x80240390; +func_802403A0_9FAB90 = 0x802403A0; +func_80240480_8C8410 = 0x80240480; +func_80240620_B351F0 = 0x80240620; +func_802406F0_92A9A0 = 0x802406F0; +func_802407C0_843390 = 0x802407C0; +func_802407F0_87A3D0 = 0x802407F0; +func_802407F4_8D45B4 = 0x802407F4; +func_80240850_AEDC60 = 0x80240850; +func_80240870_BED660 = 0x80240870; +func_80240880_A2AAC0 = 0x80240880; +func_80240A30_882BF0 = 0x80240A30; +func_80240A38_898018 = 0x80240A38; +func_80240AA0_95BCA0 = 0x80240AA0; +func_80240B00_900170 = 0x80240B00; +func_80240C20_872650 = 0x80240C20; +func_80240D98_99D728 = 0x80240D98; +func_80240E00_8B0E70 = 0x80240E00; +func_80240E90_A878E0 = 0x80240E90; +func_80240E94_9C6274 = 0x80240E94; +func_80240F2C_95C12C = 0x80240F2C; +func_80240FD0_A3A4B0 = 0x80240FD0; +func_80241040_BE47F0 = 0x80241040; +func_80241108_97EBD8 = 0x80241108; +func_80241120_A8DBA0 = 0x80241120; +func_8024119C_C3267C = 0x8024119C; +func_802411A0_D6FB50 = 0x802411A0; +func_802411B8_887578 = 0x802411B8; +func_8024121C_889DEC = 0x8024121C; +func_802412A0_CBA4A0 = 0x802412A0; +func_8024130C_C3783C = 0x8024130C; +func_80241340_887700 = 0x80241340; +func_80241370_843F40 = 0x80241370; +func_80241438_8535A8 = 0x80241438; +func_80241440_8ED260 = 0x80241440; +func_80241440_B855C0 = 0x80241440; +func_80241470_95C670 = 0x80241470; +func_80241510_91FA80 = 0x80241510; +func_80241518_BD0108 = 0x80241518; +func_80241530_8ED350 = 0x80241530; +func_80241610_D31290 = 0x80241610; +func_8024162C_9F606C = 0x8024162C; +func_80241680_8537F0 = 0x80241680; +func_80241680_BE0410 = 0x80241680; +func_80241690_A08590 = 0x80241690; +func_802416B0_A49C70 = 0x802416B0; +func_802416F0_9C6AD0 = 0x802416F0; +func_80241740_B36310 = 0x80241740; +func_80241760_C50C70 = 0x80241760; +func_80241770_832F70 = 0x80241770; +func_80241780_8ED5A0 = 0x80241780; +func_80241780_E13EE0 = 0x80241780; +func_802417EC_C5BF2C = 0x802417EC; +func_80241800_8B1870 = 0x80241800; +func_80241850_A2BA90 = 0x80241850; +func_80241A78_BA61F8 = 0x80241A78; +func_80241AC8_D2D7F8 = 0x80241AC8; +func_80241AD4_B4C544 = 0x80241AD4; +func_80241AE0_9F6520 = 0x80241AE0; +func_80241AE0_DCE7B0 = 0x80241AE0; +func_80241AEC_80236C = 0x80241AEC; +func_80241AF0_A6FED0 = 0x80241AF0; +func_80241B00_B366D0 = 0x80241B00; +func_80241B10_88A6E0 = 0x80241B10; +func_80241B14_9A9F04 = 0x80241B14; +func_80241B38_BEE928 = 0x80241B38; +func_80241B44_E06EA4 = 0x80241B44; +func_80241B54_8023D4 = 0x80241B54; +func_80241B74_911224 = 0x80241B74; +func_80241B7C_A043BC = 0x80241B7C; +func_80241B84_9C6F64 = 0x80241B84; +func_80241B9C_B3676C = 0x80241B9C; +func_80241C40_844810 = 0x80241C40; +func_80241CB0_A17ED0 = 0x80241CB0; +func_80241CCC_A3B1AC = 0x80241CCC; +func_80241CF0_9113A0 = 0x80241CF0; +func_80241CF4_88A8C4 = 0x80241CF4; +func_80241D38_991518 = 0x80241D38; +func_80241DA0_7ECAB0 = 0x80241DA0; +func_80241E28_853F98 = 0x80241E28; +func_80241E40_DAF240 = 0x80241E40; +func_80241E48_C70178 = 0x80241E48; +func_80241E50_A4A410 = 0x80241E50; +func_80241E58_9C7238 = 0x80241E58; +func_80241E90_8B1F00 = 0x80241E90; +func_80241E98_A1CF98 = 0x80241E98; +func_80241F00_854070 = 0x80241F00; +func_80241F10_802790 = 0x80241F10; +func_80241F94_95D194 = 0x80241F94; +func_80241F98_D21E28 = 0x80241F98; +func_80241FC8_C87A78 = 0x80241FC8; +func_80241FE8_D3C5B8 = 0x80241FE8; +func_80241FF8_C41DA8 = 0x80241FF8; +func_80242000_C48BE0 = 0x80242000; +func_80242030_8EDE50 = 0x80242030; +func_80242038_CD3E68 = 0x80242038; +func_80242040_8B20B0 = 0x80242040; +func_80242050_95D250 = 0x80242050; +func_802420B0_87BC90 = 0x802420B0; +func_80242110_D21FA0 = 0x80242110; +func_80242134_88AD04 = 0x80242134; +func_80242148_825408 = 0x80242148; +func_8024219C_BE594C = 0x8024219C; +func_802421A0_8EDFC0 = 0x802421A0; +func_802421D0_7ECEE0 = 0x802421D0; +func_80242230_CF4E00 = 0x80242230; +func_80242240_9C7620 = 0x80242240; +func_80242248_87BE28 = 0x80242248; +func_80242298_CC5AA8 = 0x80242298; +func_802422F0_A706D0 = 0x802422F0; +func_8024231C_A1D41C = 0x8024231C; +func_80242348_A1D448 = 0x80242348; +func_802424A0_833CA0 = 0x802424A0; +func_802424C0_B4CF30 = 0x802424C0; +func_802424F0_C38A20 = 0x802424F0; +func_80242514_9C78F4 = 0x80242514; +func_80242538_D223C8 = 0x80242538; +func_80242558_A1D658 = 0x80242558; +func_80242560_95D760 = 0x80242560; +func_802425BC_A1D6BC = 0x802425BC; +func_802425E0_A1D6E0 = 0x802425E0; +func_80242680_802F00 = 0x80242680; +func_802426C8_7ED3D8 = 0x802426C8; +func_802426E0_BA6E60 = 0x802426E0; +func_80242708_854878 = 0x80242708; +func_802427C0_9C7BA0 = 0x802427C0; +func_802427D0_833FD0 = 0x802427D0; +func_80242860_8B28D0 = 0x80242860; +func_8024291C_C494FC = 0x8024291C; +func_80242930_9C7D10 = 0x80242930; +func_80242970_7ED680 = 0x80242970; +func_802429B8_B37588 = 0x802429B8; +func_80242A00_9D9A20 = 0x80242A00; +func_80242A30_7ED740 = 0x80242A30; +func_80242AC0 = 0x80242AC0; +func_80242B90_803410 = 0x80242B90; +func_80242B90_A1DC90 = 0x80242B90; +func_80242BA8_8B2C18 = 0x80242BA8; +func_80242C00_BB0540 = 0x80242C00; +func_80242C30_B37800 = 0x80242C30; +func_80242C48_9122F8 = 0x80242C48; +func_80242C70_9AB060 = 0x80242C70; +func_80242CD8_C799B8 = 0x80242CD8; +func_80242D00_A96440 = 0x80242D00; +func_80242E88_95E088 = 0x80242E88; +func_80242EAC_96C06C = 0x80242EAC; +func_80242EBC_7EDBCC = 0x80242EBC; +func_80242EE0_A1DFE0 = 0x80242EE0; +func_80242EF0_BE66A0 = 0x80242EF0; +func_80242F60_826220 = 0x80242F60; +func_80242F68 = 0x80242F68; +func_80242F90 = 0x80242F90; +func_80242FE0_A1E0E0 = 0x80242FE0; +func_80243000_9AB3F0 = 0x80243000; +func_80243070_8B30E0 = 0x80243070; +func_80243088_8551F8 = 0x80243088; +func_80243090_8B3100 = 0x80243090; +func_80243090_C395C0 = 0x80243090; +func_8024309C_95E29C = 0x8024309C; +func_802430B8_8B3128 = 0x802430B8; +func_802430C0_B37C90 = 0x802430C0; +func_802431E4_8B3254 = 0x802431E4; +func_802431FC_95E3FC = 0x802431FC; +func_80243210_8B3280 = 0x80243210; +func_80243220_DC04D0 = 0x80243220; +func_80243254_8553C4 = 0x80243254; +func_80243284_8B32F4 = 0x80243284; +func_80243300_8B3370 = 0x80243300; +func_80243370_8B33E0 = 0x80243370; +func_80243380_8554F0 = 0x80243380; +func_802433AC_8B341C = 0x802433AC; +func_802433F0_855560 = 0x802433F0; +func_8024343C_8555AC = 0x8024343C; +func_802435B8_DD0288 = 0x802435B8; +func_802435C0_95E7C0 = 0x802435C0; +func_802435C8_96C788 = 0x802435C8; +func_802435D0_CC6DE0 = 0x802435D0; +func_802435D8_C43388 = 0x802435D8; +func_802435E8_DD02B8 = 0x802435E8; +func_802435F0_C7A2D0 = 0x802435F0; +func_802436FC_8B376C = 0x802436FC; +func_80243718_C7A3F8 = 0x80243718; +func_80243758_A2D998 = 0x80243758; +func_80243760_8B37D0 = 0x80243760; +func_80243778_96C938 = 0x80243778; +func_802437B8 = 0x802437B8; +func_80243870_96CA30 = 0x80243870; +func_80243880_95EA80 = 0x80243880; +func_80243898 = 0x80243898; +func_802438F0_95EAF0 = 0x802438F0; +func_80243920_8041A0 = 0x80243920; +func_80243B44_C74FC4 = 0x80243B44; +func_80243C50_C43A00 = 0x80243C50; +func_80243CC0_A2DF00 = 0x80243CC0; +func_80243D78_855EE8 = 0x80243D78; +func_80244030 = 0x80244030; +func_802440E8_804968 = 0x802440E8; +func_802440FC_80497C = 0x802440FC; +func_802442E0_9DB300 = 0x802442E0; +func_802443D0_9DB3F0 = 0x802443D0; +func_802448A0_805120 = 0x802448A0; +func_802449F0_A2EC30 = 0x802449F0; +func_80244D60 = 0x80244D60; +func_80244E10_805690 = 0x80244E10; +func_80244FB8_A2F1F8 = 0x80244FB8; +func_80245438 = 0x80245438; +func_802456C8_A2F908 = 0x802456C8; +func_80245718_A2F958 = 0x80245718; +func_80245950_8061D0 = 0x80245950; +func_80246500_806D80 = 0x80246500; +func_80246D10 = 0x80246D10; +func_80249AA4 = 0x80249AA4; +func_8024B9A0 = 0x8024B9A0; +func_80251474 = 0x80251474; +func_802549A0 = 0x802549A0; +func_802549C0 = 0x802549C0; +func_802A97CC_42823C = 0x802A97CC; +func_802A98B0 = 0x802A98B0; +func_802AE000_316D90 = 0x802AE000; +func_802B6350_E28D80 = 0x802B6350; +gAreas = 0x800934F0; +gBackgroundImage = 0x80200000; +gBadgeMenuBShowNotEnoughBP = 0x802703A0; +gBadgeMenuCurrentPage = 0x80270280; +gBadgeMenuCurrentScrollPos = 0x8027038C; +gBadgeMenuCurrentTab = 0x8027039C; +gBadgeMenuItemIDs = 0x80270180; +gBadgeMenuLevel = 0x80270398; +gBadgeMenuNumItems = 0x80270384; +gBadgeMenuPages = 0x80270288; +gBadgeMenuSelectedIndex = 0x80270378; +gBadgeMenuSelectedItemID = 0x80270380; +gBadgeMenuTargetScrollPos = 0x80270390; +gBattleDynamicEntityList = 0x801543E0; +gBattleEntityList = 0x801513F8; +gBattleMapFlags = 0x802DBD34; +gBattleMapVars = 0x802DBCE8; +gBattleMeshAnimationList = 0x802DADB0; +gBattleModelList = 0x80151B70; +gBattleModelSpecialDls = 0x80152010; +gBattleNpcList = 0x800A0A90; +gBattleScriptList = 0x802DA690; +gBattleShadowList = 0x80151568; +gBattleState = 0x800DC068; +gBattleStatus = 0x800DC070; +gCameras = 0x800B1D80; +gCollisionStatus = 0x8015A550; +gCurrentAnimMeshListPtr = 0x80153A40; +gCurrentCameraID = 0x80077410; +gCurrentDisplayContextIndex = 0x800741F4; +gCurrentDoorSoundsSet = 0x80151340; +gCurrentDynamicEntityListPtr = 0x80154420; +gCurrentEncounter = 0x800B0F10; +gCurrentEntityListPtr = 0x80151470; +gCurrentMeshAnimationListPtr = 0x802DAE30; +gCurrentModelListPtr = 0x801512CC; +gCurrentModelSpecialDlsPtr = 0x801512E8; +gCurrentNpcListPtr = 0x800A0B90; +gCurrentPrintContext = 0x802DB260; +gCurrentSaveFile = 0x800DACC0; +gCurrentScriptListPtr = 0x802DA890; +gCurrentShadowListPtr = 0x80151658; +gCurrentTriggerListPtr = 0x80159390; +gCurtainDrawCallback = 0x8009BAA0; +gCurtainFade = 0x8009BA98; +gCurtainFadeGoal = 0x8009BA9C; +gCurtainScale = 0x8009BA90; +gCurtainScaleGoal = 0x8009BA94; +gDisplayContext = 0x8009A674; +gGameState = 0x8009A600; +gGameStatusPtr = 0x8007419C; +gItemMenuCurrentPage = 0x802704C8; +gItemMenuCurrentScrollPos = 0x802705D4; +gItemMenuCurrentTab = 0x802705E4; +gItemMenuItemIDs = 0x80270400; +gItemMenuLevel = 0x802705E0; +gItemMenuNumItems = 0x802705CC; +gItemMenuPages = 0x802704D0; +gItemMenuSelectedIndex = 0x802705C0; +gItemMenuSelectedItemID = 0x802705C8; +gItemMenuTargetScrollPos = 0x802705D8; +gItemTable = 0x800878E0; +gLastCreatedEntityIndex = 0x801512EC; +gMainGameState = 0x80151700; +gMapFlags = 0x802DA480; +gMapTransitionAlpha = 0x800A0940; +gMapVars = 0x802DA484; +gMasterGfxPos = 0x8009A66C; +gMatrixListPos = 0x800741F0; +gMusicCurrentVolume = 0x80159AE6; +gMusicPlayers = 0x80159AF0; +gMusicTargetVolume = 0x80159AE2; +gMusicUnkVolume = 0x80159AE0; +gMusicUnkVolume2 = 0x80159AE4; +gNumScripts = 0x802DA488; +gPartnerAnimations = 0x800F8348; +gPauseMenuCommonIconIDs = 0x802700E8; +gPauseMenuCurrentDescIconScript = 0x802700CC; +gPauseMenuCurrentDescString = 0x802700C8; +gPauseMenuCurrentTab = 0x802700D4; +gPauseMenuCursorPosY = 0x8024EFA0; +gPauseMenuHeldButtons = 0x802700C0; +gPauseMenuIconScripts = 0x8024EF60; +gPauseMenuPressedButtons = 0x802700C4; +gPauseMenuStrings = 0x8026F778; +gPauseMenuTabIconIDs = 0x80270130; +gPauseMenuTabs = 0x8024EF80; +gPlayerActionState = 0x8010F07C; +gPlayerAnimation = 0x8010F080; +gPlayerData = 0x8010F290; +gPlayerStatus = 0x8010EFC8; +gPlayerStatusPtr = 0x800F7B30; +gScriptIdList = 0x802DAA98; +gScriptIndexList = 0x802DA898; +gScriptListCount = 0x802DAC98; +gSpeakingActor = 0x8029FA74; +gSpeakingActorIdleAnim = 0x8029FA70; +gSpeakingActorPart = 0x8029FA78; +gSpeakingActorPrintCtx = 0x8029FA60; +gSpeakingActorPrintIsDone = 0x8029FA68; +gSpeakingActorTalkAnim = 0x8029FA6C; +gStatsMenuIconIDs = 0x80270150; +gTriggerCount = 0x80151334; +gTriggerList1 = 0x80159190; +gTriggerList2 = 0x80159290; +gUIPanels = 0x80159D50; +gUIStatus = 0x8010EF58; +gWorldDynamicEntityList = 0x801543A0; +gWorldEntityList = 0x80151380; +gWorldMapFlags = 0x802DBC70; +gWorldMapVars = 0x802DBCA8; +gWorldMeshAnimationList = 0x802DADF0; +gWorldModelList = 0x80151770; +gWorldModelSpecialDls = 0x80151F90; +gWorldNpcList = 0x800A0990; +gWorldScriptList = 0x802DA490; +gWorldShadowList = 0x80151478; +get_dpad_input_radial = 0x8023E000; +jtbl_80228450_6CBFE0 = 0x80228450; +jtbl_8022EB80_56DF60 = 0x8022EB80; +jtbl_80231320_63CEC0 = 0x80231320; +jtbl_80232A20_6847A0 = 0x80232A20; +jtbl_80232B40_47EFD0 = 0x80232B40; +jtbl_802414D0_D55B60 = 0x802414D0; +jtbl_80241608_A48568 = 0x80241608; +jtbl_80241658_986488 = 0x80241658; +jtbl_80241778_9996E8 = 0x80241778; +jtbl_80241B08_BDECB8 = 0x80241B08; +jtbl_80241CF8_A9E928 = 0x80241CF8; +jtbl_80241EA0_C3FA90 = 0x80241EA0; +jtbl_80241EA8_8D5C68 = 0x80241EA8; +jtbl_80242030_C3FC20 = 0x80242030; +jtbl_80242038_A548F8 = 0x80242038; +jtbl_802420D0_D99960 = 0x802420D0; +jtbl_802421D8_A027D8 = 0x802421D8; +jtbl_80242200_D614B0 = 0x80242200; +jtbl_80242220_A02820 = 0x80242220; +jtbl_80242250_D97840 = 0x80242250; +jtbl_80242350_C3CD60 = 0x80242350; +jtbl_80242378_D13438 = 0x80242378; +jtbl_802423B8_9EDBA8 = 0x802423B8; +jtbl_80242438_97DA68 = 0x80242438; +jtbl_80242448_D9D338 = 0x80242448; +jtbl_802424A8_8A7F28 = 0x802424A8; +jtbl_802424E0_C3CEF0 = 0x802424E0; +jtbl_80242518_D95458 = 0x80242518; +jtbl_80242540_A4EF60 = 0x80242540; +jtbl_80242570_A4EF90 = 0x80242570; +jtbl_80242618_C311B8 = 0x80242618; +jtbl_80242688_8D8488 = 0x80242688; +jtbl_80242688_CF08E8 = 0x80242688; +jtbl_802427B0_C31350 = 0x802427B0; +jtbl_802427E8_A517E8 = 0x802427E8; +jtbl_80242868_8D3D78 = 0x80242868; +jtbl_80242A38_995168 = 0x80242A38; +jtbl_80242A78_9951A8 = 0x80242A78; +jtbl_80242AA0_9C53B0 = 0x80242AA0; +jtbl_80242B98_BB5998 = 0x80242B98; +jtbl_80242BB8_91E498 = 0x80242BB8; +jtbl_80242C38_D3A438 = 0x80242C38; +jtbl_80242C58_91B808 = 0x80242C58; +jtbl_80242CB0_D896B0 = 0x80242CB0; +jtbl_80242CF8_C52208 = 0x80242CF8; +jtbl_80242D50_997F40 = 0x80242D50; +jtbl_80242D68_918AD8 = 0x80242D68; +jtbl_80242D88_BA06E8 = 0x80242D88; +jtbl_80242E98_C523A8 = 0x80242E98; +jtbl_80242EB8_980988 = 0x80242EB8; +jtbl_80242EB8_992698 = 0x80242EB8; +jtbl_80242EF0_DE5380 = 0x80242EF0; +jtbl_80242EF8_9809C8 = 0x80242EF8; +jtbl_80242EF8_9926D8 = 0x80242EF8; +jtbl_80242F70_A67000 = 0x80242F70; +jtbl_80242FA0_A67030 = 0x80242FA0; +jtbl_80243008_AA1D48 = 0x80243008; +jtbl_80243010_A670A0 = 0x80243010; +jtbl_80243090_DE5520 = 0x80243090; +jtbl_802430A8_C713D8 = 0x802430A8; +jtbl_802430F0_C71420 = 0x802430F0; +jtbl_80243200_C55740 = 0x80243200; +jtbl_80243268_A9C7F8 = 0x80243268; +jtbl_802432E8_9A42C8 = 0x802432E8; +jtbl_80243310_A2A1E0 = 0x80243310; +jtbl_80243350_9A4330 = 0x80243350; +jtbl_80243358_A2A228 = 0x80243358; +jtbl_80243390_C558D0 = 0x80243390; +jtbl_802433C0_B76470 = 0x802433C0; +jtbl_802433E0_B76490 = 0x802433E0; +jtbl_802433F8_89D748 = 0x802433F8; +jtbl_80243458_8D14C8 = 0x80243458; +jtbl_802434C8_A63E98 = 0x802434C8; +jtbl_802434E0_9A44C0 = 0x802434E0; +jtbl_80243570_B76620 = 0x80243570; +jtbl_80243658_8A5A28 = 0x80243658; +jtbl_80243660_A64030 = 0x80243660; +jtbl_80243730_DEBEA0 = 0x80243730; +jtbl_802437B8_BAD8F8 = 0x802437B8; +jtbl_802437F0_90B220 = 0x802437F0; +jtbl_80243838_B9B438 = 0x80243838; +jtbl_80243888_A4BE48 = 0x80243888; +jtbl_80243888_B7D8D8 = 0x80243888; +jtbl_802438F0_C59830 = 0x802438F0; +jtbl_80243900_A4BEC0 = 0x80243900; +jtbl_80243930_A4BEF0 = 0x80243930; +jtbl_80243A08_A6AB08 = 0x80243A08; +jtbl_80243A20_AC8B90 = 0x80243A20; +jtbl_80243BF8_A78468 = 0x80243BF8; +jtbl_80243CD8_A720B8 = 0x80243CD8; +jtbl_80243D48_9A8398 = 0x80243D48; +jtbl_80243D50_A72130 = 0x80243D50; +jtbl_80243D88_D2FAB8 = 0x80243D88; +jtbl_80243D98_A72178 = 0x80243D98; +jtbl_80243E00_E125A0 = 0x80243E00; +jtbl_80243E88_BA45B8 = 0x80243E88; +jtbl_80243FA0_E12740 = 0x80243FA0; +jtbl_80243FF0_D91240 = 0x80243FF0; +jtbl_80244140_BE78F0 = 0x80244140; +jtbl_80244188_D913D8 = 0x80244188; +jtbl_802441A8_886368 = 0x802441A8; +jtbl_802441B8_CB91B8 = 0x802441B8; +jtbl_802441E8_ED41D8 = 0x802441E8; +jtbl_802442E8_BE7A98 = 0x802442E8; +jtbl_80244318_D91568 = 0x80244318; +jtbl_80244350_BE7B00 = 0x80244350; +jtbl_802443F8_B2C428 = 0x802443F8; +jtbl_80244408_C3A938 = 0x80244408; +jtbl_80244448_9A0DD8 = 0x80244448; +jtbl_80244458_C3A988 = 0x80244458; +jtbl_80244488_B70818 = 0x80244488; +jtbl_802444B8_9A0E48 = 0x802444B8; +jtbl_802445C8_A06E08 = 0x802445C8; +jtbl_802445F8_B97A38 = 0x802445F8; +jtbl_80244638_A06E78 = 0x80244638; +jtbl_80244678_A06EB8 = 0x80244678; +jtbl_80244700_B5DF70 = 0x80244700; +jtbl_80244720_B5DF90 = 0x80244720; +jtbl_80244828_9BB1A8 = 0x80244828; +jtbl_80244870_BE3600 = 0x80244870; +jtbl_80244898_9BB218 = 0x80244898; +jtbl_802448B0_B5E120 = 0x802448B0; +jtbl_802448B8_943E68 = 0x802448B8; +jtbl_802448D8_9BB258 = 0x802448D8; +jtbl_80244910_869450 = 0x80244910; +jtbl_802449D8_88D5A8 = 0x802449D8; +jtbl_802449F8_C35ED8 = 0x802449F8; +jtbl_80244A00_BE3790 = 0x80244A00; +jtbl_80244B98_C36078 = 0x80244B98; +jtbl_80244CC8_DB20C8 = 0x80244CC8; +jtbl_80244CF8_A0BBF8 = 0x80244CF8; +jtbl_80244D18_DB2118 = 0x80244D18; +jtbl_80244D28_C36208 = 0x80244D28; +jtbl_80244D68_A0BC68 = 0x80244D68; +jtbl_80244DA8_A0BCA8 = 0x80244DA8; +jtbl_80244E38_A1B058 = 0x80244E38; +jtbl_80244E80_A1B0A0 = 0x80244E80; +jtbl_80244EC0_C363A0 = 0x80244EC0; +jtbl_80244EF8_CF7AC8 = 0x80244EF8; +jtbl_80244F40_CF7B10 = 0x80244F40; +jtbl_80245060_BECC40 = 0x80245060; +jtbl_802451C8_87EDA8 = 0x802451C8; +jtbl_802451D8_BCD038 = 0x802451D8; +jtbl_802451F0_BECDD0 = 0x802451F0; +jtbl_802452B8_BB2BF8 = 0x802452B8; +jtbl_802452C0_DB7580 = 0x802452C0; +jtbl_80245300_BB2C40 = 0x80245300; +jtbl_80245318_CDC5F8 = 0x80245318; +jtbl_80245360_CDC640 = 0x80245360; +jtbl_80245368_CD0678 = 0x80245368; +jtbl_80245398_C4BF78 = 0x80245398; +jtbl_80245398_EEB948 = 0x80245398; +jtbl_802453C8_EF79D8 = 0x802453C8; +jtbl_80245408_CD7238 = 0x80245408; +jtbl_80245410_EF7A20 = 0x80245410; +jtbl_80245450_CD7280 = 0x80245450; +jtbl_80245460_DB7720 = 0x80245460; +jtbl_80245468_EF2568 = 0x80245468; +jtbl_802454B0_EF25B0 = 0x802454B0; +jtbl_80245530_C4C110 = 0x80245530; +jtbl_802455F8_C76A78 = 0x802455F8; +jtbl_80245608_DB78C8 = 0x80245608; +jtbl_80245640_C76AC0 = 0x80245640; +jtbl_802456A0_C76B20 = 0x802456A0; +jtbl_802456D8_C4C2B8 = 0x802456D8; +jtbl_80245728_C4C308 = 0x80245728; +jtbl_802457B8_BA9F38 = 0x802457B8; +jtbl_80245868_C85A08 = 0x80245868; +jtbl_802458B0_C85A50 = 0x802458B0; +jtbl_802458C0_BC2A60 = 0x802458C0; +jtbl_80245980_BAA100 = 0x80245980; +jtbl_80245A10_A92490 = 0x80245A10; +jtbl_80245A40_A8C490 = 0x80245A40; +jtbl_80245A78_A00268 = 0x80245A78; +jtbl_80245AE0_A002D0 = 0x80245AE0; +jtbl_80245B10_CEC210 = 0x80245B10; +jtbl_80245B48_A99288 = 0x80245B48; +jtbl_80245BA8_A92628 = 0x80245BA8; +jtbl_80245BD8_A8C628 = 0x80245BD8; +jtbl_80245C70_A00460 = 0x80245C70; +jtbl_80245CE0_A99420 = 0x80245CE0; +jtbl_80245CF8_9FA738 = 0x80245CF8; +jtbl_80245D58_A99498 = 0x80245D58; +jtbl_80245D68_9FA7A8 = 0x80245D68; +jtbl_80245DA0_A994E0 = 0x80245DA0; +jtbl_80245EE8_9AE2D8 = 0x80245EE8; +jtbl_80245F50_9AE340 = 0x80245F50; +jtbl_802460E0_9AE4D0 = 0x802460E0; +jtbl_80246130_CB4E70 = 0x80246130; +jtbl_80246160_ECFE60 = 0x80246160; +jtbl_802461B0_AFDB00 = 0x802461B0; +jtbl_80246288_9AE678 = 0x80246288; +jtbl_802462C8_9AE6B8 = 0x802462C8; +jtbl_802463A8_C8BE58 = 0x802463A8; +jtbl_802463D8_915A88 = 0x802463D8; +jtbl_80246430_915AE0 = 0x80246430; +jtbl_80246488_EA6D88 = 0x80246488; +jtbl_802464D8_D36158 = 0x802464D8; +jtbl_80246518_C60C58 = 0x80246518; +jtbl_80246560_C60CA0 = 0x80246560; +jtbl_80246570_C8C020 = 0x80246570; +jtbl_802465A0_B6C050 = 0x802465A0; +jtbl_802465C0_B6C070 = 0x802465C0; +jtbl_802465E8_915C98 = 0x802465E8; +jtbl_80246650_EA6F50 = 0x80246650; +jtbl_80246750_B6C200 = 0x80246750; +jtbl_80246A10_C467C0 = 0x80246A10; +jtbl_80246BA8_C46958 = 0x80246BA8; +jtbl_80246BE0_DC3E90 = 0x80246BE0; +jtbl_80246CB8_B594E8 = 0x80246CB8; +jtbl_80246CF8_B59528 = 0x80246CF8; +jtbl_80246D18_B59548 = 0x80246D18; +jtbl_80246D50_C46B00 = 0x80246D50; +jtbl_80246D80_DC4030 = 0x80246D80; +jtbl_80246DA0_C46B50 = 0x80246DA0; +jtbl_80246EA8_B596D8 = 0x80246EA8; +jtbl_80246EC8_BDA738 = 0x80246EC8; +jtbl_80246F00_BDA770 = 0x80246F00; +jtbl_80246F20_DC41D0 = 0x80246F20; +jtbl_802470C8_DC4378 = 0x802470C8; +jtbl_802471E8_C67EF8 = 0x802471E8; +jtbl_80247248_C67F58 = 0x80247248; +jtbl_80247278_C7DF58 = 0x80247278; +jtbl_80247440_C7E120 = 0x80247440; +jtbl_802474C0_B65770 = 0x802474C0; +jtbl_802474E0_B65790 = 0x802474E0; +jtbl_802474E8_D1FCC8 = 0x802474E8; +jtbl_80247620_DF64C0 = 0x80247620; +jtbl_80247670_B65920 = 0x80247670; +jtbl_802477C0_DF6660 = 0x802477C0; +jtbl_80247880_DA4D50 = 0x80247880; +jtbl_80247900_BF46F0 = 0x80247900; +jtbl_80247968_BF4758 = 0x80247968; +jtbl_80247968_DF6808 = 0x80247968; +jtbl_802479D0_DF6870 = 0x802479D0; +jtbl_80247A28_DA4EF8 = 0x80247A28; +jtbl_80247A38_B524A8 = 0x80247A38; +jtbl_80247A48_CCB258 = 0x80247A48; +jtbl_80247A78_B524E8 = 0x80247A78; +jtbl_80247A90_CCB2A0 = 0x80247A90; +jtbl_80247A98_B52508 = 0x80247A98; +jtbl_80247AB8_B27FF8 = 0x80247AB8; +jtbl_80247B08_EE64C8 = 0x80247B08; +jtbl_80247B58_EE6518 = 0x80247B58; +jtbl_80247BE0_DA50B0 = 0x80247BE0; +jtbl_80247C28_B52698 = 0x80247C28; +jtbl_80248340_C95EF0 = 0x80248340; +jtbl_80248340_EB0E20 = 0x80248340; +jtbl_802484E8_E1E268 = 0x802484E8; +jtbl_802485D0_B34A40 = 0x802485D0; +jtbl_80248770_DCCB40 = 0x80248770; +jtbl_802491D0_CA70F0 = 0x802491D0; +jtbl_80249200_EC2050 = 0x80249200; +jtbl_802493E0_E0E740 = 0x802493E0; +jtbl_80249420_E0E780 = 0x80249420; +jtbl_80249D40_AC4FD0 = 0x80249D40; +jtbl_8024A640_DD7310 = 0x8024A640; +jtbl_8024A7E0_DD74B0 = 0x8024A7E0; +jtbl_8024A980_DD7650 = 0x8024A980; +jtbl_8024AB38_DD7808 = 0x8024AB38; +jtbl_8024B9B0_B8FB30 = 0x8024B9B0; +jtbl_8024BD88_A26E88 = 0x8024BD88; +jtbl_8024BE58_D2BCE8 = 0x8024BE58; +jtbl_8024DDF0_968FF0 = 0x8024DDF0; +jtbl_8024DF80_969180 = 0x8024DF80; +jtbl_8024DF98_969198 = 0x8024DF98; +jtbl_8024E210_8314D0 = 0x8024E210; +jtbl_8024E900_E05300 = 0x8024E900; +jtbl_8024E940_E05340 = 0x8024E940; +jtbl_8024EF20_9780E0 = 0x8024EF20; +jtbl_8024F1F0_A39430 = 0x8024F1F0; +jtbl_8024F240_A39480 = 0x8024F240; +jtbl_8024F260_A394A0 = 0x8024F260; +jtbl_8024FA00_B445D0 = 0x8024FA00; +jtbl_802510C8_8EB1C8 = 0x802510C8; +jtbl_80251AA8_9D6E88 = 0x80251AA8; +jtbl_802527C0_864930 = 0x802527C0; +jtbl_80252950_864AC0 = 0x80252950; +jtbl_80252970_864AE0 = 0x80252970; +jtbl_802529B0_864B20 = 0x802529B0; +jtbl_80253040_8FEE60 = 0x80253040; +jtbl_80254630_9EB650 = 0x80254630; +jtbl_802559D0_8006E0 = 0x802559D0; +jtbl_80257D58_8C7DC8 = 0x80257D58; +jtbl_802626F0_822F70 = 0x802626F0; +jtbl_802628A0_823120 = 0x802628A0; +jtbl_80263438_C20CB8 = 0x80263438; +jtbl_80263488_C20D08 = 0x80263488; +jtbl_80263520_C20DA0 = 0x80263520; +jtbl_80286500_7E7380 = 0x80286500; +jtbl_802A25A0_72DB50 = 0x802A25A0; +jtbl_802A2DB0_7330B0 = 0x802A2DB0; +jtbl_802A3790_799750 = 0x802A3790; +jtbl_802A3790_79BF40 = 0x802A3790; +jtbl_802A9580_425B10 = 0x802A9580; +jtbl_802A95E0_426130 = 0x802A95E0; +jtbl_802A9680_427A30 = 0x802A9680; +jtbl_802A9750_428A30 = 0x802A9750; +jtbl_802A9790_42A4B0 = 0x802A9790; +jtbl_802A97E0_42CED0 = 0x802A97E0; +jtbl_802A9820_426990 = 0x802A9820; +jtbl_802A9830_4282A0 = 0x802A9830; +jtbl_802A9840_423C30 = 0x802A9840; +jtbl_802A9870_4292E0 = 0x802A9870; +jtbl_802A9880_42F6A0 = 0x802A9880; +jtbl_802A98E0_4233B0 = 0x802A98E0; +jtbl_802A9900_42FFE0 = 0x802A9900; +jtbl_802A9940_430960 = 0x802A9940; +jtbl_802A9950_42E360 = 0x802A9950; +jtbl_802A99A0_427370 = 0x802A99A0; +jtbl_802A99C0_429CE0 = 0x802A99C0; +jtbl_802A9A40_42EDE0 = 0x802A9A40; +jtbl_802A9A90_422A90 = 0x802A9A90; +jtbl_802A9AC0_42D9D0 = 0x802A9AC0; +jtbl_802AA8E0_425550 = 0x802AA8E0; +jtbl_802AB1B0_42C6A0 = 0x802AB1B0; +jtbl_802AB770_420500 = 0x802AB770; +jtbl_802AB808_420598 = 0x802AB808; +jtbl_802AB8C0_420650 = 0x802AB8C0; +jtbl_802AB970_420700 = 0x802AB970; +jtbl_802AB9F0_420780 = 0x802AB9F0; +jtbl_802ABAA8_420838 = 0x802ABAA8; +jtbl_802ABB58_4208E8 = 0x802ABB58; +jtbl_802ABBD8_420968 = 0x802ABBD8; +jtbl_802AC3C8_421158 = 0x802AC3C8; +jtbl_802ACBB0_421940 = 0x802ACBB0; +jtbl_802ACC08_421998 = 0x802ACC08; +jtbl_802B62B0_E29450 = 0x802B62B0; +jtbl_802B6690_E26DA0 = 0x802B6690; +jtbl_802B66E0_E274C0 = 0x802B66E0; +jtbl_802B6740_E27C50 = 0x802B6740; +jtbl_802B6850_E28790 = 0x802B6850; +jtbl_802B6D90_E2B440 = 0x802B6D90; +jtbl_802B6DF0_E25CC0 = 0x802B6DF0; +jtbl_802B6E08_E25CD8 = 0x802B6E08; +jtbl_802B6EA8_E2A318 = 0x802B6EA8; +jtbl_802B7C80_E23230 = 0x802B7C80; +jtbl_802B7CC0_E20DD0 = 0x802B7CC0; +jtbl_802B7D20_E22590 = 0x802B7D20; +jtbl_802BCBA0_E314F0 = 0x802BCBA0; +jtbl_802BCDE8_E2F718 = 0x802BCDE8; +jtbl_802BCF50_E2D680 = 0x802BCF50; +jtbl_802BCFC0_E2D6F0 = 0x802BCFC0; +jtbl_E000CD40_328E50 = 0xE000CD40; +jtbl_E000CD58_328E68 = 0xE000CD58; +jtbl_E0044F00_355E60 = 0xE0044F00; +jtbl_E004AE80_359340 = 0xE004AE80; +jtbl_E0066CE0_366D10 = 0xE0066CE0; +jtbl_E007EC48_380368 = 0xE007EC48; +jtbl_E0088D30_38BB20 = 0xE0088D30; +jtbl_E0088D50_38BB40 = 0xE0088D50; +jtbl_E009AA60_397010 = 0xE009AA60; +jtbl_E00A4AD0_3A42B0 = 0xE00A4AD0; +jtbl_E00A4AF8_3A42D8 = 0xE00A4AF8; +jtbl_E00C0C20_3BD980 = 0xE00C0C20; +jtbl_E00C29A8_3C1B78 = 0xE00C29A8; +jtbl_E00CCE78_3D2508 = 0xE00CCE78; +jtbl_E00D6EB8_3D5ED8 = 0xE00D6EB8; +jtbl_E010E930_3EBE10 = 0xE010E930; +jtbl_E0114750_3FF230 = 0xE0114750; +jtbl_E0116D98_4033D8 = 0xE0116D98; +jtbl_E011AC70_404E90 = 0xE011AC70; +nuAuDmaBuf = 0x800A3BE0; +nuAuDmaState = 0x800A3BD0; +nuContData = 0x800B1D68; +nuContPfs = 0x800DAAD8; +nuContRmbCtl = 0x800B1D40; +nuGfxDisplay = 0x8009A5F8; +nuGfxTaskSpool = 0x8009A618; +nuGfxZBuffer = 0x8009A5DC; +nuScAudioStack = 0x800A85D0; +nuScGraphicsStack = 0x800AA5D0; +nuScStack = 0x800A65D0; +nuSiMesgQ = 0x800DAC78; +osEPiReadIo = 0x80060DC0; +osTvType = 0x80000300; +pause_badges_count_equipped = 0x802470B0; +pause_badges_is_visible = 0x80247270; +pause_items_get_row = 0x802498E0; +pause_items_handle_input = 0x8024A7D8; +pause_partners_draw_movelist_flower = 0x8024C0A0; +pause_partners_load_portrait = 0x8024ADE0; +pause_set_cursor_opacity = 0x80242BA0; +pause_stats_draw_contents = 0x80245980; +pause_tabs_draw_badges_A2EF00 = 0x80244CC0; +pause_tabs_draw_invis = 0x80244B90; +pause_tabs_draw_items = 0x80244DE8; +sort_scripts = 0x802C3000; +switch_order = 0x80243918; +update_end_player_turn = 0x80242BB0; +update_entities = 0x8010F6D0; +update_player_action = 0x80245AD0;